From a0e569de8715ebdb51c8dc7498b3dc77bcd22b81 Mon Sep 17 00:00:00 2001 From: Dibir Magomedsaygitov <61747324+dibir-magomedsaygitov@users.noreply.github.com> Date: Fri, 19 Feb 2021 10:17:51 +0300 Subject: [PATCH 0001/3485] [Ubuntu] Precache PyPy 3.7 (#2739) * precache pypy 3.7 * small change --- images/linux/toolsets/toolset-2004.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index a6ba2bcf18aa..90d606e58bd9 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -21,7 +21,8 @@ "platform" : "linux", "versions": [ "2.7", - "3.6" + "3.6", + "3.7" ] }, { From 8916d1764092853407216ffa75dbc9ab3938902d Mon Sep 17 00:00:00 2001 From: Dibir Magomedsaygitov <61747324+dibir-magomedsaygitov@users.noreply.github.com> Date: Fri, 19 Feb 2021 10:19:00 +0300 Subject: [PATCH 0002/3485] [macOS] Precache PyPy 3.7 (#2738) * precache pypy 3.7 * remove pypy 3.7 from hs and mojave --- images/macos/toolsets/toolset-10.15.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index 64ce15058eae..7467330e21a3 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -226,7 +226,8 @@ "platform" : "darwin", "versions": [ "2.7", - "3.6" + "3.6", + "3.7" ] }, { From c881c3cab7f36035bf44b47b1abad7217bfad87e Mon Sep 17 00:00:00 2001 From: Dibir Magomedsaygitov <61747324+dibir-magomedsaygitov@users.noreply.github.com> Date: Fri, 19 Feb 2021 10:19:11 +0300 Subject: [PATCH 0003/3485] precache pypy 3.7 (#2737) --- images/win/toolsets/toolset-2016.json | 3 ++- images/win/toolsets/toolset-2019.json | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/images/win/toolsets/toolset-2016.json b/images/win/toolsets/toolset-2016.json index c43976ce07ad..63843fee14dc 100644 --- a/images/win/toolsets/toolset-2016.json +++ b/images/win/toolsets/toolset-2016.json @@ -48,7 +48,8 @@ "platform" : "win32", "versions": [ "2.7", - "3.6" + "3.6", + "3.7" ] }, { diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index b6e4d1471510..1c9edeb6f6f4 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -48,7 +48,8 @@ "platform" : "win32", "versions": [ "2.7", - "3.6" + "3.6", + "3.7" ] }, { From 2c96d280ed473e18e6aca9f3fe4945ba5695ebd5 Mon Sep 17 00:00:00 2001 From: Nikita Bykov <49442273+nikita-bykov@users.noreply.github.com> Date: Fri, 19 Feb 2021 10:20:15 +0300 Subject: [PATCH 0004/3485] [Ubuntu] Rework haskell.sh to install Cabal using GHCup (#2636) * reworked haskell installation * added comment * resolved comments and added symlink * fixed haskell.sh * update haskell.sh * update installation * added error suppressing * reverted ghc intallation * added comments Co-authored-by: Nikita Bykov --- .../SoftwareReport/SoftwareReport.Common.psm1 | 6 +++++ .../SoftwareReport.Generator.ps1 | 1 + images/linux/scripts/installers/haskell.sh | 26 ++++++++++++++----- images/linux/scripts/tests/Haskell.Tests.ps1 | 4 +++ 4 files changed, 30 insertions(+), 7 deletions(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 index 0d5a0d04e53f..62d47590ccda 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 @@ -219,6 +219,12 @@ function Get-GHCVersion { return "GHC $ghcVersion" } +function Get-GHCupVersion { + $(ghcup --version) -match "version v(?\d+(\.\d+){2,})" | Out-Null + $ghcVersion = $Matches.version + return "GHCup $ghcVersion" +} + function Get-CabalVersion { $(cabal --version | Out-String) -match "cabal-install version (?\d+\.\d+\.\d+\.\d+)" | Out-Null $cabalVersion = $Matches.version diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index c1d8af0c5f19..a8654cb7e5ce 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -181,6 +181,7 @@ $markdown += New-MDNewLine $markdown += New-MDHeader "Haskell" -Level 3 $markdown += New-MDList -Style Unordered -Lines (@( (Get-GHCVersion), + (Get-GHCupVersion), (Get-CabalVersion), (Get-StackVersion) ) | Sort-Object diff --git a/images/linux/scripts/installers/haskell.sh b/images/linux/scripts/installers/haskell.sh index 206bfe5676a6..725ab8bc50d9 100644 --- a/images/linux/scripts/installers/haskell.sh +++ b/images/linux/scripts/installers/haskell.sh @@ -7,16 +7,30 @@ # Source the helpers for use with the script source $HELPER_SCRIPTS/etc-environment.sh +# Any nonzero value for noninteractive installation +export BOOTSTRAP_HASKELL_NONINTERACTIVE=1 +export GHCUP_INSTALL_BASE_PREFIX=/usr/local +export BOOTSTRAP_HASKELL_GHC_VERSION=0 +ghcup_bin=$GHCUP_INSTALL_BASE_PREFIX/.ghcup/bin +setEtcEnvironmentVariable "BOOTSTRAP_HASKELL_NONINTERACTIVE" $BOOTSTRAP_HASKELL_NONINTERACTIVE + # Install Herbert V. Riedel's PPA for managing multiple version of ghc on ubuntu. # https://launchpad.net/~hvr/+archive/ubuntu/ghc apt-get install -y software-properties-common add-apt-repository -y ppa:hvr/ghc apt-get update +# Install GHCup +curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | sh > /dev/null 2>&1 || true +export PATH="$ghcup_bin:$PATH" +prependEtcEnvironmentPath $ghcup_bin + # Get 2 latest Haskell Major.Minor versions allGhcVersions=$(apt-cache search "^ghc-" | grep -Po '(\d*\.){2}\d*' | sort --unique --version-sort) ghcMajorMinorVersions=$(echo "$allGhcVersions" | cut -d "." -f 1,2 | sort --unique --version-sort | tail -2) +# We are using apt-get to install ghc, not ghcup, +# because ghc installed through ghcup takes up too much disk space (2GB versus 1GB through apt-get) for version in $ghcMajorMinorVersions; do # Get latest patch version for given Major.Minor one (ex. 8.6.5 for 8.6) and install it exactVersion=$(echo "$allGhcVersions" | grep $version | sort --unique --version-sort | tail -1) @@ -25,16 +39,14 @@ for version in $ghcMajorMinorVersions; do defaultGHCVersion=$exactVersion done -# Get latest cabal version -cabalVersion=$(apt-cache search cabal-install-[0-9] | grep -Po '\d*\.\d*' | sort --unique --version-sort | tail -1) +echo "install cabal..." +ghcup install cabal -apt-get install -y cabal-install-$cabalVersion +chmod -R 777 $GHCUP_INSTALL_BASE_PREFIX/.ghcup +ln -s $GHCUP_INSTALL_BASE_PREFIX/.ghcup /etc/skel/.ghcup +ln -s "/opt/ghc/$defaultGHCVersion/bin/ghc" "/usr/bin/ghc" # Install the latest stable release of haskell stack curl -sSL https://get.haskellstack.org/ | sh -# Create symlink for ghc and cabal in /usr/bin -ln -s "/opt/ghc/$defaultGHCVersion/bin/ghc" "/usr/bin/ghc" -ln -s "/opt/cabal/$cabalVersion/bin/cabal" "/usr/bin/cabal" - invoke_tests "Haskell" \ No newline at end of file diff --git a/images/linux/scripts/tests/Haskell.Tests.ps1 b/images/linux/scripts/tests/Haskell.Tests.ps1 index 45cc2be3ed84..b271cf726470 100644 --- a/images/linux/scripts/tests/Haskell.Tests.ps1 +++ b/images/linux/scripts/tests/Haskell.Tests.ps1 @@ -17,6 +17,10 @@ Describe "Haskell" { "$GHCPath --version" | Should -ReturnZeroExitCode } + It "GHCup" { + "ghcup --version" | Should -ReturnZeroExitCode + } + It "Default GHC" { "ghc --version" | Should -ReturnZeroExitCode } From 18effcdd2691ffa8f37f6cb15b8657d457a0d5ec Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Fri, 19 Feb 2021 14:18:13 +0300 Subject: [PATCH 0005/3485] [Ubuntu] Fix Android tests to work with platform version S and remove Cmake 3.6 (#2755) * fix tests * get rid of build-tools letter list * Remove Cmake 3.6, fix platforms test --- images/linux/scripts/tests/Android.Tests.ps1 | 15 ++++++++------- images/linux/toolsets/toolset-1604.json | 1 - images/linux/toolsets/toolset-1804.json | 1 - 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/images/linux/scripts/tests/Android.Tests.ps1 b/images/linux/scripts/tests/Android.Tests.ps1 index 3097e2b9ffac..0069c9e1c914 100644 --- a/images/linux/scripts/tests/Android.Tests.ps1 +++ b/images/linux/scripts/tests/Android.Tests.ps1 @@ -5,13 +5,14 @@ Describe "Android" { [string]$ndkLTSVersion = Get-ToolsetValue "android.ndk.lts" $ndkLTSFullVersion = (Get-ChildItem "/usr/local/lib/android/sdk/ndk/$ndkLTSVersion.*" | Select-Object -Last 1).Name - $platforms = (($androidSdkManagerPackages | Where-Object { "$_".StartsWith("platforms;") }) -replace 'platforms;', '' | - Where-Object { [int]$_.Split("-")[1] -ge $platformMinVersion } | Sort-Object { [int]$_.Split("-")[1] } -Unique | - ForEach-Object { "platforms/${_}" }) + $platformVersionsList = ($androidSdkManagerPackages | Where-Object { "$_".StartsWith("platforms;") }) -replace 'platforms;android-', '' + $platformNumericList = $platformVersionsList | Where-Object { $_ -match "\d+" } | Where-Object { [int]$_ -ge $platformMinVersion } | Sort-Object -Unique + $platformLetterList = $platformVersionsList | Where-Object { $_ -match "\D+" } | Sort-Object -Unique + $platforms = $platformNumericList + $platformLetterList | ForEach-Object { "platforms/android-${_}" } - $buildTools = (($androidSdkManagerPackages | Where-Object { "$_".StartsWith("build-tools;") }) -replace 'build-tools;', '' | - Where-Object { [version]$_ -ge $buildToolsMinVersion } | Sort-Object { [version]$_ } -Unique | - ForEach-Object { "build-tools/${_}" }) + $buildToolsList = ($androidSdkManagerPackages | Where-Object { "$_".StartsWith("build-tools;") }) -replace 'build-tools;', '' + $buildTools = $buildToolsList | Where-Object { $_ -match "\d+(\.\d+){2,}$"} | Where-Object { [version]$_ -ge $buildToolsMinVersion } | Sort-Object -Unique | + ForEach-Object { "build-tools/${_}" } $androidPackages = @( $platforms, @@ -23,7 +24,7 @@ Describe "Android" { ) [string]$ndkLatestVersion = Get-ToolsetValue "android.ndk.latest" - if ($ndkLatestVersion) { + if ($ndkLatestVersion) { $ndkLatestFullVersion = (Get-ChildItem "/usr/local/lib/android/sdk/ndk/$ndkLatestVersion.*" | Select-Object -Last 1).Name $androidPackages += @("ndk/$ndkLatestFullVersion") } diff --git a/images/linux/toolsets/toolset-1604.json b/images/linux/toolsets/toolset-1604.json index 39e3949a6453..6985369b78c2 100644 --- a/images/linux/toolsets/toolset-1604.json +++ b/images/linux/toolsets/toolset-1604.json @@ -103,7 +103,6 @@ "addon-google_apis-google-21" ], "additional_tools": [ - "cmake;3.6.4111459", "cmake;3.10.2.4988404", "patcher;v4", "platform-tools", diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index bc8cbe30f206..13158650ac83 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -99,7 +99,6 @@ "addon-google_apis-google-21" ], "additional_tools": [ - "cmake;3.6.4111459", "cmake;3.10.2.4988404", "patcher;v4", "platform-tools", From d76f3274f82f0c1d8b2520290e5176e397931d52 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Fri, 19 Feb 2021 14:52:13 +0300 Subject: [PATCH 0006/3485] [macOS] Fix Android tests to work with platform version S and remove Cmake 3.6 (#2757) * Fix tests, move cmake to toolset * add -L to curl --- images/macos/provision/core/android-toolsets.sh | 3 --- images/macos/provision/core/dotnet.sh | 2 +- images/macos/tests/Android.Tests.ps1 | 13 +++++++------ images/macos/toolsets/toolset-10.13.json | 3 +++ images/macos/toolsets/toolset-10.14.json | 1 + images/macos/toolsets/toolset-10.15.json | 1 + images/macos/toolsets/toolset-11.0.json | 1 + 7 files changed, 14 insertions(+), 10 deletions(-) diff --git a/images/macos/provision/core/android-toolsets.sh b/images/macos/provision/core/android-toolsets.sh index 6b8f4ef58ea6..5a08278b9c70 100755 --- a/images/macos/provision/core/android-toolsets.sh +++ b/images/macos/provision/core/android-toolsets.sh @@ -69,9 +69,6 @@ echo "84831b9409646a918e30573bab4c9c91346d8abd" >> $ANDROID_HOME/licenses/androi echo "Installing latest tools & platform tools..." echo y | $SDKMANAGER "tools" "platform-tools" -echo "Installing latest CMake..." -echo y | $SDKMANAGER "cmake;3.6.4111459" - echo "Installing latest ndk..." ndkLtsLatest=$(get_full_ndk_version $ANDROID_NDK_MAJOR_LTS) ndkLatest=$(get_full_ndk_version $ANDROID_NDK_MAJOR_LATEST) diff --git a/images/macos/provision/core/dotnet.sh b/images/macos/provision/core/dotnet.sh index 0be71b823dc6..0102264fb38a 100755 --- a/images/macos/provision/core/dotnet.sh +++ b/images/macos/provision/core/dotnet.sh @@ -12,7 +12,7 @@ export DOTNET_CLI_TELEMETRY_OPTOUT=1 # Download installer from dot.net and keep it locally DOTNET_INSTALL_SCRIPT="https://dotnet.microsoft.com/download/dotnet-core/scripts/v1/dotnet-install.sh" -curl -o "dotnet-install.sh" "$DOTNET_INSTALL_SCRIPT" +curl -L -o "dotnet-install.sh" "$DOTNET_INSTALL_SCRIPT" chmod +x ./dotnet-install.sh ARGS_LIST=() diff --git a/images/macos/tests/Android.Tests.ps1 b/images/macos/tests/Android.Tests.ps1 index eb18461cccbc..c14c89f22e09 100644 --- a/images/macos/tests/Android.Tests.ps1 +++ b/images/macos/tests/Android.Tests.ps1 @@ -13,13 +13,14 @@ Describe "Android" { $ndkLatestFullVersion = (Get-ChildItem "$env:ANDROID_HOME/ndk/$ndkLatestVersion.*" | Select-Object -Last 1).Name $ndkLtsFullVersion = (Get-ChildItem "$env:ANDROID_HOME/ndk/$ndkLtsVersion.*" | Select-Object -Last 1).Name - $platforms = (($androidSdkManagerPackages | Where-Object { "$_".StartsWith("platforms;") }) -replace 'platforms;', '' | - Where-Object { [int]$_.Split("-")[1] -ge $platformMinVersion } | Sort-Object { [int]$_.Split("-")[1] } -Unique | - ForEach-Object { "platforms/${_}" }) + $platformVersionsList = ($androidSdkManagerPackages | Where-Object { "$_".StartsWith("platforms;") }) -replace 'platforms;android-', '' + $platformNumericList = $platformVersionsList | Where-Object { $_ -match "\d+" } | Where-Object { [int]$_ -ge $platformMinVersion } | Sort-Object -Unique + $platformLetterList = $platformVersionsList | Where-Object { $_ -match "\D+" } | Sort-Object -Unique + $platforms = $platformNumericList + $platformLetterList | ForEach-Object { "platforms/android-${_}" } - $buildTools = (($androidSdkManagerPackages | Where-Object { "$_".StartsWith("build-tools;") }) -replace 'build-tools;', '' | - Where-Object { [version]$_ -ge $buildToolsMinVersion } | Sort-Object { [version]$_ } -Unique | - ForEach-Object { "build-tools/${_}" }) + $buildToolsList = ($androidSdkManagerPackages | Where-Object { "$_".StartsWith("build-tools;") }) -replace 'build-tools;', '' + $buildTools = $buildToolsList | Where-Object { $_ -match "\d+(\.\d+){2,}$"} | Where-Object { [version]$_ -ge $buildToolsMinVersion } | Sort-Object -Unique | + ForEach-Object { "build-tools/${_}" } $androidPackages = @( "tools", diff --git a/images/macos/toolsets/toolset-10.13.json b/images/macos/toolsets/toolset-10.13.json index 81f2d68ef59f..b1ca23be2f9c 100644 --- a/images/macos/toolsets/toolset-10.13.json +++ b/images/macos/toolsets/toolset-10.13.json @@ -190,6 +190,9 @@ "addon-list": [ "addon-google_apis-google-24", "addon-google_apis-google-23", "addon-google_apis-google-22", "addon-google_apis-google-21" ], + "additional-tools": [ + "cmake;3.10.2.4988404" + ], "ndk": { "lts": "21", "latest": "22" diff --git a/images/macos/toolsets/toolset-10.14.json b/images/macos/toolsets/toolset-10.14.json index 3caa5b94a817..acc4085175c6 100644 --- a/images/macos/toolsets/toolset-10.14.json +++ b/images/macos/toolsets/toolset-10.14.json @@ -211,6 +211,7 @@ "addon-google_apis-google-24", "addon-google_apis-google-23", "addon-google_apis-google-22", "addon-google_apis-google-21" ], "additional-tools": [ + "cmake;3.10.2.4988404", "cmdline-tools;latest" ], "ndk": { diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index 7467330e21a3..6f4c2c9ba234 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -156,6 +156,7 @@ "addon-google_apis-google-24", "addon-google_apis-google-23", "addon-google_apis-google-22", "addon-google_apis-google-21" ], "additional-tools": [ + "cmake;3.10.2.4988404", "cmdline-tools;latest" ], "ndk": { diff --git a/images/macos/toolsets/toolset-11.0.json b/images/macos/toolsets/toolset-11.0.json index 95ff11e32d94..fd94cc88364c 100644 --- a/images/macos/toolsets/toolset-11.0.json +++ b/images/macos/toolsets/toolset-11.0.json @@ -90,6 +90,7 @@ ], "addon-list": [], "additional-tools": [ + "cmake;3.10.2.4988404", "cmdline-tools;latest" ], "ndk": { From c4d66c8dc7574c9ee7337414a182564ac8371250 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Fri, 19 Feb 2021 18:33:28 +0300 Subject: [PATCH 0007/3485] [Ubuntu] Add Fastlane (#2751) --- .../SoftwareReport/SoftwareReport.Common.psm1 | 2 +- .../SoftwareReport.Generator.ps1 | 4 ++++ .../SoftwareReport/SoftwareReport.Tools.psm1 | 5 ++++ images/linux/scripts/installers/ruby.sh | 19 +++++++++++---- images/linux/scripts/tests/Tools.Tests.ps1 | 23 +++++++++++++++++++ images/linux/toolsets/toolset-1604.json | 3 ++- images/linux/toolsets/toolset-1804.json | 3 ++- images/linux/toolsets/toolset-2004.json | 5 +++- 8 files changed, 56 insertions(+), 8 deletions(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 index 62d47590ccda..e8a98317faf5 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 @@ -102,7 +102,7 @@ function Get-GemVersion { $result = Get-CommandResult "gem --version" $result.Output -match "(?\d+\.\d+\.\d+)" | Out-Null $gemVersion = $Matches.version - return "Gem $gemVersion" + return "RubyGems $gemVersion" } function Get-MinicondaVersion { diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index a8654cb7e5ce..ee7dc994886b 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -144,6 +144,10 @@ if (-not (Test-IsUbuntu16)) { ) } +if (Test-IsUbuntu20) { + $toolsList += (Get-FastlaneVersion) +} + $markdown += New-MDList -Style Unordered -Lines ($toolsList | Sort-Object) $markdown += New-MDHeader "CLI Tools" -Level 3 diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 index be10c2facff1..e6650fca26c9 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 @@ -264,6 +264,11 @@ function Get-AWSSAMVersion { return "AWS SAM CLI $(sam --version | Take-OutputPart -Part -1)" } +function Get-FastlaneVersion { + $fastlaneVersion = fastlane --version | Select-String "^fastlane [0-9]" | Take-OutputPart -Part 1 + return "Fastlane $fastlaneVersion" +} + function Get-HubCliVersion { $hubVersion = hub --version | Select-String "hub version" | Take-OutputPart -Part 2 return "Hub CLI $hubVersion" diff --git a/images/linux/scripts/installers/ruby.sh b/images/linux/scripts/installers/ruby.sh index 06583260e4b0..bd260a55d5b2 100644 --- a/images/linux/scripts/installers/ruby.sh +++ b/images/linux/scripts/installers/ruby.sh @@ -1,13 +1,22 @@ #!/bin/bash -e ################################################################################ ## File: ruby.sh -## Desc: Installs Ruby requirements +## Desc: Installs Ruby requirements and ruby gems ################################################################################ source $HELPER_SCRIPTS/install.sh -sudo apt-get install ruby-full -sudo gem update --system +apt-get install ruby-full +gem update + +# Install ruby gems from toolset +gemsToInstall=$(get_toolset_value ".rubygems[] .name") +if [ -n "$gemsToInstall" ]; then + for gem in $gemsToInstall; do + echo "Installing gem $gem" + gem install $gem + done +fi # Install Ruby requirements apt-get install -y libz-dev openssl libssl-dev @@ -43,4 +52,6 @@ for TOOLSET_VERSION in ${TOOLSET_VERSIONS[@]}; do echo "Create complete file" touch $COMPLETE_FILE_PATH fi -done \ No newline at end of file +done + +invoke_tests "Tools" "Ruby" \ No newline at end of file diff --git a/images/linux/scripts/tests/Tools.Tests.ps1 b/images/linux/scripts/tests/Tools.Tests.ps1 index 8b2447307842..e17b21d65868 100644 --- a/images/linux/scripts/tests/Tools.Tests.ps1 +++ b/images/linux/scripts/tests/Tools.Tests.ps1 @@ -344,3 +344,26 @@ Describe "Python" { "$PythonCommand --version" | Should -ReturnZeroExitCode } } + +Describe "Ruby" { + $testCases = @("ruby", "gem") | ForEach-Object { @{RubyCommand = $_} } + + It "" -TestCases $testCases { + param ( + [string] $RubyCommand + ) + + "$RubyCommand --version" | Should -ReturnZeroExitCode + } + + $gemTestCases = (Get-ToolsetContent).rubygems | ForEach-Object { + @{gemName = $_.name} + } + + if ($gemTestCases) + { + It "Gem is installed" -TestCases $gemTestCases { + "gem list -i '^$gemName$'" | Should -MatchCommandOutput "true" + } + } +} \ No newline at end of file diff --git a/images/linux/toolsets/toolset-1604.json b/images/linux/toolsets/toolset-1604.json index 6985369b78c2..615570aed8e5 100644 --- a/images/linux/toolsets/toolset-1604.json +++ b/images/linux/toolsets/toolset-1604.json @@ -278,5 +278,6 @@ "7.4", "8.0" ] - } + }, + "rubygems": [] } diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index 13158650ac83..c4c0fe7a2479 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -281,5 +281,6 @@ "7.4", "8.0" ] - } + }, + "rubygems": [] } diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index 90d606e58bd9..0566dc16e2ac 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -255,5 +255,8 @@ "7.4", "8.0" ] - } + }, + "rubygems": [ + {"name": "fastlane"} + ] } From 2a0829d7e5caf3c7422ef83b09ec87b69d7d3ba9 Mon Sep 17 00:00:00 2001 From: Leonid Lapshin Date: Fri, 19 Feb 2021 21:26:22 +0300 Subject: [PATCH 0008/3485] [macOS] Software updates week 8 2021 (#2749) --- images/macos/toolsets/toolset-10.15.json | 6 +++--- images/macos/toolsets/toolset-11.0.json | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index 6f4c2c9ba234..bc7520cf4aa4 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -1,6 +1,6 @@ { "xcode": { - "default": "12.3", + "default": "12.4", "versions": [ { "link": "12.4", "version": "12.4.0"}, { "link": "12.3", "version": "12.3.0"}, @@ -20,7 +20,7 @@ "xamarin": { "vsmac": "latest", "mono-versions": [ - "6.12.0.113", "6.10.0.106", "6.8.0.123", "6.6.0.166", "6.4.0.208" + "6.12.0.122", "6.10.0.106", "6.8.0.123", "6.6.0.166", "6.4.0.208" ], "ios-versions": [ "14.10.0.4", "14.8.0.3", "14.6.0.15", "14.4.1.3", "14.2.0.12", "14.0.0.0", "13.20.2.2", "13.18.2.1", "13.16.0.13", "13.14.1.39", "13.10.0.21", "13.8.3.0", "13.6.0.12", "13.4.0.2", "13.2.0.47" @@ -31,7 +31,7 @@ "android-versions": [ "11.1.0.26", "11.0.2.0", "10.3.1.4", "10.2.0.100", "10.1.3.7", "10.0.6.2" ], - "bundle-default": "6_12_5", + "bundle-default": "6_12_6", "bundles": [ { "symlink": "6_12_6", diff --git a/images/macos/toolsets/toolset-11.0.json b/images/macos/toolsets/toolset-11.0.json index fd94cc88364c..d718fd0e47c8 100644 --- a/images/macos/toolsets/toolset-11.0.json +++ b/images/macos/toolsets/toolset-11.0.json @@ -1,6 +1,6 @@ { "xcode": { - "default": "12.3", + "default": "12.4", "versions": [ { "link": "12.5", "version": "12.5.0"}, { "link": "12.4", "version": "12.4.0"}, @@ -12,7 +12,7 @@ "xamarin": { "vsmac": "latest", "mono-versions": [ - "6.12.0.113" + "6.12.0.122" ], "ios-versions": [ "14.10.0.4", "14.8.0.3", "14.6.0.15", "14.4.1.3", "14.2.0.12", "14.0.0.0", "13.20.2.2" @@ -23,7 +23,7 @@ "android-versions": [ "11.1.0.26", "11.0.2.0" ], - "bundle-default": "6_12_5", + "bundle-default": "6_12_6", "bundles": [ { "symlink": "6_12_6", From ee314d4c78b1ee44f28b813461aa8c10b2e96631 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Fri, 19 Feb 2021 21:27:58 +0300 Subject: [PATCH 0009/3485] [windows] Fix tests, remove cmake 3.6 (#2758) --- images/win/scripts/Installers/Update-AndroidSDK.ps1 | 5 ++++- images/win/scripts/Tests/Android.Tests.ps1 | 5 ++++- images/win/toolsets/toolset-2016.json | 1 - images/win/toolsets/toolset-2019.json | 1 - 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/images/win/scripts/Installers/Update-AndroidSDK.ps1 b/images/win/scripts/Installers/Update-AndroidSDK.ps1 index 9d9d2f5f75f3..f20c22cea919 100644 --- a/images/win/scripts/Installers/Update-AndroidSDK.ps1 +++ b/images/win/scripts/Installers/Update-AndroidSDK.ps1 @@ -39,11 +39,14 @@ $androidPackages = Get-AndroidPackages -AndroidSDKManagerPath $sdkManager # platforms [int]$platformMinVersion = $androidToolset.platform_min_version -$platformList = Get-AndroidPackagesByVersion -AndroidPackages $androidPackages ` +$platformListByVersion = Get-AndroidPackagesByVersion -AndroidPackages $androidPackages ` -PrefixPackageName "platforms;" ` -MinimumVersion $platformMinVersion ` -Delimiter "-" ` -Index 1 +$platformListByName = Get-AndroidPackagesByName -AndroidPackages $androidPackages ` + -PrefixPackageName "platforms;" | Where-Object {$_ -match "-\D+$"} +$platformList = $platformListByVersion + $platformListByName # build-tools [version]$buildToolsMinVersion = $androidToolset.build_tools_min_version diff --git a/images/win/scripts/Tests/Android.Tests.ps1 b/images/win/scripts/Tests/Android.Tests.ps1 index 02f0f4b5301d..3a56c0396408 100644 --- a/images/win/scripts/Tests/Android.Tests.ps1 +++ b/images/win/scripts/Tests/Android.Tests.ps1 @@ -10,11 +10,14 @@ Describe "Android SDK" { $platformTestCases = @() [int]$platformMinVersion = $androidToolset.platform_min_version - $platformList = Get-AndroidPackagesByVersion -AndroidPackages $androidPackages ` + $platformListByVersion = Get-AndroidPackagesByVersion -AndroidPackages $androidPackages ` -PrefixPackageName "platforms;" ` -MinimumVersion $platformMinVersion ` -Delimiter "-" ` -Index 1 + $platformListByName = Get-AndroidPackagesByName -AndroidPackages $androidPackages ` + -PrefixPackageName "platforms;" | Where-Object {$_ -match "-\D+$"} + $platformList = $platformListByVersion + $platformListByName $platformList | ForEach-Object { $platformTestCases += @{ platformVersion = $_; installedPackages = $androidInstalledPackages } } diff --git a/images/win/toolsets/toolset-2016.json b/images/win/toolsets/toolset-2016.json index 63843fee14dc..f65b87e9fb45 100644 --- a/images/win/toolsets/toolset-2016.json +++ b/images/win/toolsets/toolset-2016.json @@ -163,7 +163,6 @@ "addon-google_apis-google-21" ], "additional_tools": [ - "cmake;3.6.4111459", "cmake;3.10.2.4988404", "patcher;v4", "cmdline-tools;latest" diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index 1c9edeb6f6f4..8a1de5df1612 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -163,7 +163,6 @@ "addon-google_apis-google-21" ], "additional_tools": [ - "cmake;3.6.4111459", "cmake;3.10.2.4988404", "patcher;v4", "cmdline-tools;latest" From a871273c9d186fd1568541a3b3e8dce05e394f93 Mon Sep 17 00:00:00 2001 From: Leonid Lapshin Date: Fri, 19 Feb 2021 21:34:08 +0300 Subject: [PATCH 0010/3485] Added Go 1.16 to all OSes toolsets (#2730) * added Go 1.16 to all OSes toolsets * removed Go 1.16 from Ubuntu 16 and 18 due to image capacity Co-authored-by: Leonid Lapshin --- images/linux/toolsets/toolset-2004.json | 3 ++- images/macos/toolsets/toolset-10.14.json | 3 ++- images/macos/toolsets/toolset-10.15.json | 3 ++- images/macos/toolsets/toolset-11.0.json | 3 ++- images/win/toolsets/toolset-2016.json | 3 ++- images/win/toolsets/toolset-2019.json | 3 ++- 6 files changed, 12 insertions(+), 6 deletions(-) diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index 0566dc16e2ac..67f1c31fad9c 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -43,7 +43,8 @@ "platform" : "linux", "versions": [ "1.14.*", - "1.15.*" + "1.15.*", + "1.16.*" ], "default": "1.15.*" }, diff --git a/images/macos/toolsets/toolset-10.14.json b/images/macos/toolsets/toolset-10.14.json index acc4085175c6..b8272a20f088 100644 --- a/images/macos/toolsets/toolset-10.14.json +++ b/images/macos/toolsets/toolset-10.14.json @@ -304,7 +304,8 @@ "versions": [ "1.13.*", "1.14.*", - "1.15.*" + "1.15.*", + "1.16.*" ] }, { diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index bc7520cf4aa4..6ddf5486b3de 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -250,7 +250,8 @@ "versions": [ "1.13.*", "1.14.*", - "1.15.*" + "1.15.*", + "1.16.*" ] }, { diff --git a/images/macos/toolsets/toolset-11.0.json b/images/macos/toolsets/toolset-11.0.json index d718fd0e47c8..ad2f2846cf69 100644 --- a/images/macos/toolsets/toolset-11.0.json +++ b/images/macos/toolsets/toolset-11.0.json @@ -163,7 +163,8 @@ "arch": "x64", "platform" : "darwin", "versions": [ - "1.15.*" + "1.15.*", + "1.16.*" ] }, { diff --git a/images/win/toolsets/toolset-2016.json b/images/win/toolsets/toolset-2016.json index f65b87e9fb45..f9ed706b4ebd 100644 --- a/images/win/toolsets/toolset-2016.json +++ b/images/win/toolsets/toolset-2016.json @@ -71,7 +71,8 @@ "versions": [ "1.13.*", "1.14.*", - "1.15.*" + "1.15.*", + "1.16.*" ], "default": "1.15.*" }, diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index 8a1de5df1612..7fc010994b10 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -71,7 +71,8 @@ "versions": [ "1.13.*", "1.14.*", - "1.15.*" + "1.15.*", + "1.16.*" ], "default": "1.15.*" }, From 0c6a730e34f05d6c48d93a737778455a9596ccb0 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 20 Feb 2021 08:02:58 +0000 Subject: [PATCH 0011/3485] Updating readme file for macOS-11.0 version 20210219.1 (#2762) Co-authored-by: Image generation service account --- images/macos/macos-11.0-Readme.md | 41 ++++++++++++++++--------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/images/macos/macos-11.0-Readme.md b/images/macos/macos-11.0-Readme.md index 718ac62ab2eb..d11ebfdef076 100644 --- a/images/macos/macos-11.0-Readme.md +++ b/images/macos/macos-11.0-Readme.md @@ -7,13 +7,13 @@ # macOS 11.2 info - System Version: macOS 11.2 (20D64) - Kernel Version: Darwin 20.3.0 -- Image Version: 20210216.3 +- Image Version: 20210219.1 ## Installed Software ### Language and Runtime - .NET SDK 2.1.300 2.1.301 2.1.302 2.1.401 2.1.402 2.1.403 2.1.500 2.1.502 2.1.503 2.1.504 2.1.505 2.1.506 2.1.507 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 2.1.811 2.1.812 2.1.813 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 3.1.403 3.1.404 3.1.405 3.1.406 5.0.100 5.0.101 5.0.102 5.0.103 - Bash 3.2.57(1)-release -- Clang/LLVM 11.0.1 is available on `'$(brew --prefix llvm)/bin/clang'` +- Clang/LLVM 11.1.0 is available on `'$(brew --prefix llvm)/bin/clang'` - Clang/LLVM 12.0.0 is default - gcc-10 (Homebrew GCC 10.2.0_4) 10.2.0 - available by `gcc-10` alias - gcc-8 (Homebrew GCC 8.4.0_2) 8.4.0 - available by `gcc-8` alias @@ -33,7 +33,7 @@ - Ruby 2.7.2p137 ### Package Management -- Bundler version 2.2.10 +- Bundler version 2.2.11 - Carthage 0.37.0 - CocoaPods 1.10.1 - Composer 2.0.9 @@ -44,8 +44,8 @@ - Pip 20.3.4 (python 2.7) - Pip 21.0.1 (python 3.9) - Pipx 0.16.0.0 -- RubyGems 3.2.10 -- Vcpkg 2021 (build from master \) +- RubyGems 3.2.11 +- Vcpkg 2021 (build from master \<8ede7e8>) - Yarn 1.22.5 #### Environment variables @@ -69,7 +69,7 @@ - Curl 7.75.0 - Git LFS: 2.13.2 - Git: 2.30.1 -- GitHub CLI: 1.5.0 +- GitHub CLI: 1.6.1 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.1 - gpg (GnuPG) 2.2.27 @@ -79,8 +79,8 @@ - mongo v4.4.3 - mongod v4.4.3 - Newman 5.2.2 -- OpenSSL 1.1.1i 8 Dec 2020 `(/usr/local/opt/openssl -> /usr/local/Cellar/openssl@1.1/1.1.1i)` -- Packer 1.6.6 +- OpenSSL 1.1.1j 16 Feb 2021 `(/usr/local/opt/openssl -> /usr/local/Cellar/openssl@1.1/1.1.1j)` +- Packer 1.7.0 - PostgreSQL 13.2 - psql (PostgreSQL) 13.2 - Subversion (SVN) 1.14.1 @@ -88,7 +88,7 @@ ### Tools -- Aliyun CLI 3.0.72 +- Aliyun CLI 3.0.73 - App Center CLI 2.7.4 - AWS CLI 2.1.27 - AWS SAM CLI 1.18.1 @@ -96,7 +96,7 @@ - Azure CLI 2.19.1 - Cabal 3.2.0.0 - Cmake 3.19.5 -- Fastlane 2.174.0 +- Fastlane 2.175.0 - GHC 9.0.1 - GHCup v0.1.12 - Stack 2.5.1 @@ -111,8 +111,8 @@ - SafariDriver 14.0.3 (16610.4.3.1.4) - Google Chrome 88.0.4324.182 - ChromeDriver 88.0.4324.96 -- Microsoft Edge 88.0.705.68 -- MSEdgeDriver 88.0.705.68 +- Microsoft Edge 88.0.705.74 +- MSEdgeDriver 88.0.705.74 - Mozilla Firefox 85.0.2 - geckodriver 0.29.0 @@ -149,6 +149,7 @@ #### Go - 1.15.8 +- 1.16.0 ### Rust Tools - Cargo 1.50.0 @@ -179,14 +180,14 @@ | Name | Version | ConfigFile | ServiceStatus | ListenPort | | ----- | -------- | ------------------------------- | ------------- | ---------- | | httpd | 2.4.46_2 | /usr/local/etc/httpd/httpd.conf | stopped | 80 | -| nginx | 1.19.6 | /usr/local/etc/nginx/nginx.conf | stopped | 80 | +| nginx | 1.19.7 | /usr/local/etc/nginx/nginx.conf | stopped | 80 | ### Xamarin #### Visual Studio for Mac -- 8.8.8.12 +- 8.8.9.10 #### Mono -- 6.12.0.113 +- 6.12.0.122 #### Xamarin.iOS - 14.10.0.4 @@ -215,8 +216,8 @@ | Version | Build | Path | | -------------- | -------- | ---------------------------- | | 12.5 (beta) | 12E5234g | /Applications/Xcode_12.5.app | -| 12.4 | 12D4e | /Applications/Xcode_12.4.app | -| 12.3 (default) | 12C33 | /Applications/Xcode_12.3.app | +| 12.4 (default) | 12D4e | /Applications/Xcode_12.4.app | +| 12.3 | 12C33 | /Applications/Xcode_12.3.app | | 12.2 | 12B45b | /Applications/Xcode_12.2.app | | 11.7 | 11E801a | /Applications/Xcode_11.7.app | @@ -285,11 +286,11 @@ | Android Command Line Tools | 3.0 | | Android Emulator | 30.3.5 | | Android SDK Build-tools | 30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3 | -| Android SDK Platforms | android-30 (rev 3)
android-29 (rev 5)
android-28 (rev 6)
android-27 (rev 3) | -| Android SDK Platform-Tools | 30.0.5 | +| Android SDK Platforms | android-S (rev 1)
android-30 (rev 3)
android-29 (rev 5)
android-28 (rev 6)
android-27 (rev 3) | +| Android SDK Platform-Tools | 31.0.0 | | Android SDK Tools | 26.1.1 | | Android Support Repository | 47.0.0 | -| CMake | 3.6.4111459 | +| CMake | 3.10.2 | | Google Play services | 49 | | Google Repository | 58 | | NDK | 21.4.7075529
22.0.7026061 | From d0e2b96b20555255bd23988b4f3b5d5596d99d04 Mon Sep 17 00:00:00 2001 From: Sergey Dolin Date: Sat, 20 Feb 2021 13:51:32 +0500 Subject: [PATCH 0012/3485] Remove PyPy symlink workaround from Windows images (#2744) --- images/win/scripts/Installers/Install-PyPy.ps1 | 9 --------- 1 file changed, 9 deletions(-) diff --git a/images/win/scripts/Installers/Install-PyPy.ps1 b/images/win/scripts/Installers/Install-PyPy.ps1 index aaae1b35aa86..401dbcac6763 100644 --- a/images/win/scripts/Installers/Install-PyPy.ps1 +++ b/images/win/scripts/Installers/Install-PyPy.ps1 @@ -67,15 +67,6 @@ function Install-PyPy exit 1 } - # https://github.com/actions/setup-python/blob/master/src/find-python.ts - # https://github.com/microsoft/azure-pipelines-tasks/blob/master/Tasks/UsePythonVersionV0/usepythonversion.ts - # // For PyPy, Windows uses 'bin', not 'Scripts'. - # const _binDir = path.join(installDir, 'bin'); - # PyPy v7.3.1 or higher creates only Scripts folder therefore to preserve back compatibility with UsePythonVersionV0 task - # We should create a Scripts -> bin symlink - Write-Host "Symbolic link created for '$pypyArchPath\Scripts' <<===>> '$pypyArchPath\bin'" - New-Item -Path "$pypyArchPath\bin" -ItemType SymbolicLink -Value "$pypyArchPath\Scripts" | Out-Null - Write-Host "Create complete file" New-Item -ItemType File -Path $pypyVersionPath -Name "$architecture.complete" | Out-Null } From b42272d743d6d86483375b609b555ecab900e0dd Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Sat, 20 Feb 2021 14:24:39 +0300 Subject: [PATCH 0013/3485] [ubuntu] Change PyPy pattern (#2767) --- .../scripts/SoftwareReport/SoftwareReport.CachedTools.psm1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.CachedTools.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.CachedTools.psm1 index 6f7f9d071edd..a801fa22b5da 100755 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.CachedTools.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.CachedTools.psm1 @@ -13,7 +13,7 @@ function Get-ToolcachePyPyVersions { Get-ChildItem -Path $toolcachePath -Name | Sort-Object { [Version] $_ } | ForEach-Object { $pypyRootPath = Join-Path $toolcachePath $_ "x64" [string]$pypyVersionOutput = & "$pypyRootPath/bin/python" -c "import sys;print(sys.version)" - $pypyVersionOutput -match "^([\d\.]+) \(.+\) \[PyPy ([\d\.]+) .+]$" | Out-Null + $pypyVersionOutput -match "^([\d\.]+) \(.+\) \[PyPy ([\d\.]+\S*) .+]$" | Out-Null return "{0} [PyPy {1}]" -f $Matches[1], $Matches[2] } } From 990889bcf0571d8e7023b256da3d87d0017a9810 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Sat, 20 Feb 2021 15:40:18 +0300 Subject: [PATCH 0014/3485] [macOS] Improve select-datastore script (#2771) * select last one * Fix comment --- images.CI/macos/select-datastore.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images.CI/macos/select-datastore.ps1 b/images.CI/macos/select-datastore.ps1 index 4714bb6d3d5e..cb04945e24d9 100644 --- a/images.CI/macos/select-datastore.ps1 +++ b/images.CI/macos/select-datastore.ps1 @@ -78,8 +78,8 @@ function Select-DataStore { # Wait for 60 seconds to check if any other tags are assigned to the same datastore Start-Sleep -Seconds 60 - # Take only first 2 tags, all the others will go to the next round - $tagAssignments = (Get-TagAssignment -Entity $buildDatastore).Tag.Name | Select-Object -First 2 + # Take the last tag (Last in, first out), all the others will go to the next round + $tagAssignments = (Get-TagAssignment -Entity $buildDatastore).Tag.Name | Select-Object -Last 1 $isAllow = $tagAssignments -contains $VMName if ($isAllow) From e773a0c743ed249777691014b18d9f071782dcdf Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Sat, 20 Feb 2021 16:34:08 +0300 Subject: [PATCH 0015/3485] [macOS] Improve select-datastore script rev2 (#2772) * select last one * Fix comment * Change logic * change name * fix comment --- images.CI/macos/select-datastore.ps1 | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/images.CI/macos/select-datastore.ps1 b/images.CI/macos/select-datastore.ps1 index cb04945e24d9..1d9a898adce1 100644 --- a/images.CI/macos/select-datastore.ps1 +++ b/images.CI/macos/select-datastore.ps1 @@ -58,15 +58,15 @@ function Select-DataStore { Write-Host "Start Datastore selection process..." $allDatastores = Get-Datastore -Name $templateDatastore | Where-Object { $_.State -eq "Available" } - $buildDatastore = $allDatastores ` + $availableDatastores = $allDatastores ` | Where-Object { $_.FreeSpaceGB -ge $thresholdInGb } ` | Where-Object { $vmOnDatastore = @((Get-ChildItem -Path $_.DatastoreBrowserPath).Name -notmatch "^\.").Count $vmOnDatastore -lt $vmCount } ` - | Group-Object -Property { $vmOnDatastore } ` - | Select-Object -First 1 -ExpandProperty Group ` - | Get-Random ` - | Select-Object -ExpandProperty Name + | Group-Object -Property { $vmOnDatastore } + + $datastore = $availableDatastores | Select-Object @{n="VmCount";e={$_.Name}},@{n="DatastoreName";e={$_.Group | Get-Random}} -First 1 + $buildDatastore = $datastore.DatastoreName $tag = Get-Tag -Category $TagCategory -Name $VMName -ErrorAction Ignore if (-not $tag) @@ -78,8 +78,9 @@ function Select-DataStore { # Wait for 60 seconds to check if any other tags are assigned to the same datastore Start-Sleep -Seconds 60 - # Take the last tag (Last in, first out), all the others will go to the next round - $tagAssignments = (Get-TagAssignment -Entity $buildDatastore).Tag.Name | Select-Object -Last 1 + # If there are no datastores with 0 VMs, take a datastore with 1 VM (index 1 if datastore has 0 VMs and 2 if 1 VM) + $index = 1 + [int]$datastore.VmCount + $tagAssignments = (Get-TagAssignment -Entity $buildDatastore).Tag.Name | Select-Object -First $index $isAllow = $tagAssignments -contains $VMName if ($isAllow) From 3cfeb58d2403a369a165fc25755cb789e6721c17 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 24 Feb 2021 08:27:14 +0000 Subject: [PATCH 0016/3485] Updating readme file for ubuntu18 version 20210219.1 (#2766) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/linux/Ubuntu1804-README.md | 159 +++++++++++++++++------------- 1 file changed, 93 insertions(+), 66 deletions(-) diff --git a/images/linux/Ubuntu1804-README.md b/images/linux/Ubuntu1804-README.md index e9d1d02c35ac..59eb813e9ed8 100644 --- a/images/linux/Ubuntu1804-README.md +++ b/images/linux/Ubuntu1804-README.md @@ -1,16 +1,15 @@ | Announcements | |-| +| [[Ubuntu] AzCopy 7 will be removed from Ubuntu images on March, 2](https://github.com/actions/virtual-environments/issues/2724) | | [[ubuntu, windows] GOROOT environment variable will be removed on March, 1](https://github.com/actions/virtual-environments/issues/2683) | | [[Ubuntu] Android SDK Platforms and Build-tools that are less than version 23 will be removed on March, 1](https://github.com/actions/virtual-environments/issues/2673) | | [[Windows, Ubuntu] Boost 1.72.0 will be removed from images on March, 8](https://github.com/actions/virtual-environments/issues/2667) | -| [[Ubuntu] M2_HOME variable will be removed on February, 15](https://github.com/actions/virtual-environments/issues/2600) | +| [[Ubuntu, windows] M2_HOME variable will be removed on February, 15](https://github.com/actions/virtual-environments/issues/2600) | | [[Ubuntu, macOS] .NET 3.0 will be removed from images on March, 1](https://github.com/actions/virtual-environments/issues/2558) | -| [[ubuntu, windows] Default Go version will be set to 1.15 on February, 8](https://github.com/actions/virtual-environments/issues/2447) | -| [[all OSs] Java 7 will be removed from images on February, 8.](https://github.com/actions/virtual-environments/issues/2446) | | [Ubuntu-latest workflows will use Ubuntu-20.04](https://github.com/actions/virtual-environments/issues/1816) | *** # Ubuntu 18.04.5 LTS -- Image Version: 20210211.1 +- Image Version: 20210219.1 ## Installed Software ### Language and Runtime @@ -30,17 +29,23 @@ ### Package Management - cpan 1.64 -- Gem 2.7.6 - Helm 3.5.2 -- Homebrew 3.0.0 +- Homebrew 3.0.1 - Miniconda 4.9.2 - Npm 6.14.11 - Pip 9.0.1 - Pip3 9.0.1 - Pipx 0.16.0.0 -- Vcpkg (build from master \<8d7cd1d>) +- RubyGems 2.7.6 +- Vcpkg (build from master \<99dc49d>) - Yarn 1.22.5 +#### Environment variables +| Name | Value | +| ----------------------- | ---------------------- | +| CONDA | /usr/share/miniconda | +| VCPKG_INSTALLATION_ROOT | /usr/local/share/vcpkg | + ### Project Management - Ant 1.10.5 - Gradle 6.8.2 @@ -49,32 +54,32 @@ ### Tools - 7-Zip 16.02 -- Ansible 2.9.17 +- Ansible 2.9.18 - apt-fast 1.9.10 - AzCopy10 10.8.0 (available by `azcopy10` alias) - AzCopy7 7.3.0 (available by `azcopy` alias) - Bazel 4.0.0 -- Bazelisk 1.7.3 +- Bazelisk 1.7.5 - binutils 2.30 -- Buildah 1.19.2 -- CMake 3.19.4 +- Buildah 1.19.4 +- CMake 3.19.5 - CodeQL Action Bundle 2.4.2 - coreutils 8.28 - curl 7.58.0 -- Docker Compose 1.28.2 +- Docker Compose 1.28.4 - Docker-Buildx 0.5.1 -- Docker-Moby Client 19.03.15+azure -- Docker-Moby Server 20.10.2+azure +- Docker-Moby Client 20.10.3+azure +- Docker-Moby Server 20.10.3+azure - Git 2.30.0 - Git LFS 2.13.2 - Git-ftp 1.3.1 - Haveged 1.9.1 -- Heroku 7.47.12 -- HHVM (HipHop VM) 4.96.0 +- Heroku 7.47.13 +- HHVM (HipHop VM) 4.97.0 - jq 1.5 - Kind 0.10.0 - Kubectl 1.19.0 -- Kustomize 3.10.0 +- Kustomize 4.0.1 - Leiningen 2.9.5 - m4 1.4.18 - MediaInfo 17.12 @@ -82,17 +87,17 @@ - Minikube 1.17.1 - Newman 5.2.2 - nvm 0.37.2 -- Packer 1.6.6 +- Packer 1.7.0 - pass 1.7.1 - PhantomJS 2.1.1 -- Podman 2.2.1 -- Pulumi 2.20.0 -- R 4.0.3 +- Podman 3.0.0 +- Pulumi 2.21.1 +- R 4.0.4 - Skopeo 1.2.1 - Sphinx Open Source Search Server 2.2.11 - SVN 1.9.7 - Swig 3.0.12 -- Terraform 0.14.6 +- Terraform 0.14.7 - unzip 6.00 - wget 1.19.4 - yamllint 1.26.0 @@ -100,17 +105,17 @@ - zstd 1.3.3 ### CLI Tools -- Alibaba Cloud CLI 3.0.72 -- AWS CLI 1.19.5 +- Alibaba Cloud CLI 3.0.73 +- AWS CLI 1.19.12 - AWS CLI Session manager plugin 1.2.54.0 -- AWS SAM CLI 1.18.0 +- AWS SAM CLI 1.18.2 - Azure CLI (azure-cli) 2.19.1 - Azure CLI (azure-devops) 0.18.0 -- GitHub CLI 1.5.0 -- Google Cloud SDK 327.0.0 +- GitHub CLI 1.6.1 +- Google Cloud SDK 328.0.0 - Hub CLI 2.14.2 -- Netlify CLI 3.7.1 -- oc CLI 4.6.16 +- Netlify CLI 3.8.4 +- oc CLI 4.6.17 - ORAS CLI 0.10.0 - Vercel CLI 21.2.3 @@ -129,14 +134,15 @@ | PHPUnit | 8.5.14 | ### Haskell -- Cabal 3.4.0.0 +- Cabal 3.2.0.0 - GHC 8.10.3 +- GHCup 0.1.12 - Stack 2.5.1 ### Rust Tools -- Cargo 1.49.0 -- Rust 1.49.0 -- Rustdoc 1.49.0 +- Cargo 1.50.0 +- Rust 1.50.0 +- Rustdoc 1.50.0 - Rustup 1.23.1 #### Packages @@ -145,14 +151,20 @@ - Cargo clippy 0.0.212 - Cargo outdated 0.9.14 - Cbindgen 0.17.0 -- Rustfmt 1.4.25 +- Rustfmt 1.4.30 ### Browsers and Drivers -- Google Chrome 88.0.4324.150 +- Google Chrome 88.0.4324.182 - ChromeDriver 88.0.4324.96 - Mozilla Firefox 85.0.1 - Geckodriver 0.29.0 +#### Environment variables +| Name | Value | +| --------------- | ------------------------------ | +| CHROMEWEBDRIVER | /usr/local/share/chrome_driver | +| GECKOWEBDRIVER | /usr/local/share/gecko_driver | + ### .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.519 2.1.520 2.1.521 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.616 2.1.617 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 2.1.811 2.1.812 2.1.813 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.109 3.1.110 3.1.111 3.1.112 3.1.200 3.1.201 3.1.202 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402 3.1.403 3.1.404 3.1.405 3.1.406 5.0.100 5.0.101 5.0.102 5.0.103 @@ -160,8 +172,8 @@ - 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 -- MongoDB 4.4.3 -- Postgre SQL 13.1 +- MongoDB 4.4.4 +- Postgre SQL 13.2 - sqlite3 3.22.0 #### MySQL @@ -188,7 +200,7 @@ #### Node.js - 10.23.3 -- 12.20.1 +- 12.20.2 - 14.15.5 #### PyPy @@ -198,8 +210,8 @@ #### Python - 2.7.18 - 3.5.10 -- 3.6.12 -- 3.7.9 +- 3.6.13 +- 3.7.10 - 3.8.7 - 3.9.1 @@ -210,8 +222,15 @@ - 2.7.2 - 3.0.0 +#### Environment variables +| Name | Value | Architecture | +| --------------- | ----------------------------------- | ------------ | +| GOROOT_1_13_X64 | /opt/hostedtoolcache/go/1.13.15/x64 | x64 | +| GOROOT_1_14_X64 | /opt/hostedtoolcache/go/1.14.15/x64 | x64 | +| GOROOT_1_15_X64 | /opt/hostedtoolcache/go/1.15.8/x64 | x64 | + ### PowerShell Tools -- PowerShell 7.1.1 +- PowerShell 7.1.2 #### PowerShell Modules | Module | Version | @@ -226,39 +245,47 @@ | nginx | 1.14.0 | /etc/nginx/nginx.conf | inactive | 80 | ### Android -| Package Name | Version | -| -------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 3.0 | -| Android SDK Build-tools | 30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3
26.0.0 26.0.1 26.0.2 26.0.3
25.0.0 25.0.1 25.0.2 25.0.3
24.0.0 24.0.1 24.0.2 24.0.3
23.0.1 23.0.2 23.0.3
22.0.1
21.1.2
20.0.0
19.1.0 | -| Android SDK Platform-Tools | 30.0.5 | -| 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-18 (rev 3)
android-17 (rev 3) | -| Android SDK Tools | 26.1.1 | -| Android Support Repository | 47.0.0 | -| CMake | 3.10.2
3.6.4111459 | -| Google APIs | addon-google_apis-google-21
addon-google_apis-google-22
addon-google_apis-google-23
addon-google_apis-google-24 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 21.4.7075529 | -| SDK Patch Applier v4 | 1 | +| Package Name | Version | +| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 3.0 | +| Android SDK Build-tools | 30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3
26.0.0 26.0.1 26.0.2 26.0.3
25.0.0 25.0.1 25.0.2 25.0.3
24.0.0 24.0.1 24.0.2 24.0.3
23.0.1 23.0.2 23.0.3
22.0.1
21.1.2
20.0.0
19.1.0 | +| Android SDK Platform-Tools | 31.0.0 | +| Android SDK Platforms | android-S (rev 1)
android-30 (rev 3)
android-29 (rev 5)
android-28 (rev 6)
android-27 (rev 3)
android-26 (rev 2)
android-25 (rev 3)
android-24 (rev 2)
android-23 (rev 3)
android-22 (rev 2)
android-21 (rev 2)
android-20 (rev 2)
android-19 (rev 4)
android-18 (rev 3)
android-17 (rev 3) | +| Android SDK Tools | 26.1.1 | +| Android Support Repository | 47.0.0 | +| CMake | 3.10.2 | +| Google APIs | addon-google_apis-google-21
addon-google_apis-google-22
addon-google_apis-google-23
addon-google_apis-google-24 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 21.4.7075529 | +| SDK Patch Applier v4 | 1 | + +#### Environment variables +| Name | Value | +| ---------------- | ------------------------------------------------------------------------------------ | +| ANDROID_HOME | /usr/local/lib/android/sdk | +| ANDROID_NDK_HOME | /usr/local/lib/android/sdk/ndk-bundle -> /usr/local/lib/android/sdk/ndk/21.4.7075529 | +| ANDROID_NDK_ROOT | /usr/local/lib/android/sdk/ndk-bundle -> /usr/local/lib/android/sdk/ndk/21.4.7075529 | +| ANDROID_SDK_ROOT | /usr/local/lib/android/sdk | ### Cached Docker images | Repository:Tag | Digest | Created | | --------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| node:10 | sha256:005a6876db18f172d301ceee7d72895c11f9bfe72300f017d8637ca2121d9468 | 2021-02-09 | -| node:12 | sha256:13a74c2a4838da95ab8ea56bc3bbb47f3f0dbf6492b3e4fb372ba3bac8dc8694 | 2021-02-09 | -| buildpack-deps:stretch | sha256:97f102be9829fa96039a6113e0f053ffdadf2b2ccb67e8838294aee8a2dd947f | 2021-02-09 | +| alpine:3.10 | sha256:f0e9534a598e501320957059cb2a23774b4d4072e37c7b2cf7e95b241f019e35 | 2020-04-24 | +| alpine:3.7 | sha256:8421d9a84432575381bfabd248f1eb56f3aa21d9d7cd2511583c68c9b7511d10 | 2019-03-07 | +| alpine:3.8 | sha256:2bb501e6173d9d006e56de5bce2720eb06396803300fe1687b58a7ff32bf4c14 | 2020-01-23 | +| alpine:3.9 | sha256:414e0518bb9228d35e4cd5165567fb91d26c6a214e9c95899e1e056fcd349011 | 2020-04-24 | | buildpack-deps:buster | sha256:b42568b32a4dff4f1f378fd0685aa2a8e6931e744798a481fd6ed6672d7f0c47 | 2021-02-09 | -| debian:9 | sha256:d0b7b71db141cedc48e1c2807d12b199ffd7ffe75baf272a34c37480dc2159d1 | 2021-02-09 | +| buildpack-deps:stretch | sha256:97f102be9829fa96039a6113e0f053ffdadf2b2ccb67e8838294aee8a2dd947f | 2021-02-09 | | debian:8 | sha256:40d6faa8c33e8ab03428ad97fc109c369fb510d99f4700df9058940ac9944f09 | 2021-02-09 | -| node:10-alpine | sha256:7351c71024245bd1133674ce2a0869c80926712a9e03004a93cf58a066a8ad68 | 2021-01-27 | -| node:12-alpine | sha256:41ae2b38e38e387517c59ca50498eac0537a2ff2316552c3df3b406d31414d78 | 2021-01-05 | +| debian:9 | sha256:d0b7b71db141cedc48e1c2807d12b199ffd7ffe75baf272a34c37480dc2159d1 | 2021-02-09 | | jekyll/builder:latest | sha256:b918b81939a1076dce89d142c0764c2c3cb93858f56ecf4f04ad0387338e77aa | 2020-12-21 | -| ubuntu:14.04 | sha256:63fce984528cec8714c365919882f8fb64c8a3edf23fdfa0b218a2756125456f | 2020-09-16 | -| alpine:3.9 | sha256:414e0518bb9228d35e4cd5165567fb91d26c6a214e9c95899e1e056fcd349011 | 2020-04-24 | -| alpine:3.10 | sha256:f0e9534a598e501320957059cb2a23774b4d4072e37c7b2cf7e95b241f019e35 | 2020-04-24 | -| alpine:3.8 | sha256:2bb501e6173d9d006e56de5bce2720eb06396803300fe1687b58a7ff32bf4c14 | 2020-01-23 | -| alpine:3.7 | sha256:8421d9a84432575381bfabd248f1eb56f3aa21d9d7cd2511583c68c9b7511d10 | 2019-03-07 | | mcr.microsoft.com/azure-pipelines/node8-typescript:latest | sha256:e52e60b9f71183969830a3664279b5d8c799b4b0ec2c25a0686f7c02f6a9669a | 2018-10-09 | +| node:10 | sha256:4fafd9b63fdfb15112775847a10b2917760c720c8c28cef5167ff40f36b3cd93 | 2021-02-12 | +| node:10-alpine | sha256:dae0a441e1b5201e074312e44b35571bed4a39b5bc07c26c1bfab9f18017ff54 | 2021-02-12 | +| node:12 | sha256:0140c4e17aa1f3fd78b939e3c7ac45accdd5274d0194046b484029a5e46b9db6 | 2021-02-12 | +| node:12-alpine | sha256:77fe10dbc042121e94db7f43b4b912a52514759b847978588eec4d5d0eb5282c | 2021-02-12 | +| ubuntu:14.04 | sha256:63fce984528cec8714c365919882f8fb64c8a3edf23fdfa0b218a2756125456f | 2020-09-16 | ### Installed apt packages - binutils, bison, brotli, build-essential, bzip2, coreutils, curl, dbus, dnsutils, dpkg, fakeroot, file, flex, ftp, gnupg2, haveged, imagemagick, iproute2, iputils-ping, jq, lib32z1, libc++-dev, libc++abi-dev, libcurl3, libgbm-dev, libgconf-2-4, libgsl-dev, libgtk-3-0, libmagic-dev, libmagickcore-dev, libmagickwand-dev, libsecret-1-dev, libsqlite3-dev, libunwind8, libxkbfile-dev, libxss1, locales, m4, mediainfo, netcat, openssh-client, p7zip-full, p7zip-rar, parallel, pass, patchelf, pkg-config, pollinate, rpm, rsync, shellcheck, sphinxsearch, sqlite3, ssh, subversion, sudo, swig, telnet, texinfo, time, tk, tzdata, unzip, upx, wget, xorriso, xvfb, xz-utils, zip, zstd, zsync From bc981f3aab0b24a4191f1d35b57e450003f48a7c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 24 Feb 2021 09:42:12 +0000 Subject: [PATCH 0017/3485] Updating readme file for ubuntu16 version 20210219.1 (#2765) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/linux/Ubuntu1604-README.md | 100 +++++++++++++++--------------- 1 file changed, 50 insertions(+), 50 deletions(-) diff --git a/images/linux/Ubuntu1604-README.md b/images/linux/Ubuntu1604-README.md index 7ca529411b98..efb59eee47a9 100644 --- a/images/linux/Ubuntu1604-README.md +++ b/images/linux/Ubuntu1604-README.md @@ -1,16 +1,15 @@ | Announcements | |-| +| [[Ubuntu] AzCopy 7 will be removed from Ubuntu images on March, 2](https://github.com/actions/virtual-environments/issues/2724) | | [[ubuntu, windows] GOROOT environment variable will be removed on March, 1](https://github.com/actions/virtual-environments/issues/2683) | | [[Ubuntu] Android SDK Platforms and Build-tools that are less than version 23 will be removed on March, 1](https://github.com/actions/virtual-environments/issues/2673) | | [[Windows, Ubuntu] Boost 1.72.0 will be removed from images on March, 8](https://github.com/actions/virtual-environments/issues/2667) | | [[Ubuntu, windows] M2_HOME variable will be removed on February, 15](https://github.com/actions/virtual-environments/issues/2600) | | [[Ubuntu, macOS] .NET 3.0 will be removed from images on March, 1](https://github.com/actions/virtual-environments/issues/2558) | -| [[ubuntu, windows] Default Go version will be set to 1.15 on February, 8](https://github.com/actions/virtual-environments/issues/2447) | -| [[all OSs] Java 7 will be removed from images on February, 8.](https://github.com/actions/virtual-environments/issues/2446) | | [Ubuntu-latest workflows will use Ubuntu-20.04](https://github.com/actions/virtual-environments/issues/1816) | *** # Ubuntu 16.04.7 LTS -- Image Version: 20210216.1 +- Image Version: 20210219.1 ## Installed Software ### Language and Runtime @@ -30,14 +29,14 @@ ### Package Management - cpan 1.61 -- Gem 2.5.2 - Helm 3.5.2 - Homebrew 3.0.1 - Miniconda 4.9.2 - Npm 6.14.11 - Pip 8.1.1 - Pip3 8.1.1 -- Vcpkg (build from master \<6166e75>) +- RubyGems 2.5.2 +- Vcpkg (build from master \<99dc49d>) - Yarn 1.22.5 #### Environment variables @@ -54,7 +53,7 @@ ### Tools - 7-Zip 9.20 -- Ansible 2.9.17 +- Ansible 2.9.18 - apt-fast 1.9.10 - AzCopy10 10.8.0 (available by `azcopy10` alias) - AzCopy7 7.3.0 (available by `azcopy` alias) @@ -65,15 +64,15 @@ - CodeQL Action Bundle 2.4.2 - coreutils 8.25 - curl 7.47.0 -- Docker Compose 1.28.2 +- Docker Compose 1.28.4 - Docker-Buildx 0.5.1 -- Docker-Moby Client 19.03.15+azure -- Docker-Moby Server 20.10.2+azure +- Docker-Moby Client 20.10.3+azure +- Docker-Moby Server 20.10.3+azure - Git 2.29.0 - Git LFS 2.13.2 - Git-ftp 1.0.2 - Haveged 1.9.1 -- Heroku 7.47.12 +- Heroku 7.47.13 - HHVM (HipHop VM) 4.56.2 - jq 1.5 - Kind 0.10.0 @@ -86,15 +85,15 @@ - Minikube 1.17.1 - Newman 5.2.2 - nvm 0.37.2 -- Packer 1.6.6 +- Packer 1.7.0 - pass 1.6.5 - PhantomJS 2.1.1 -- Pulumi 2.20.0 +- Pulumi 2.21.1 - R 4.0.4 - Sphinx Open Source Search Server 2.2.9 - SVN 1.9.3 - Swig 3.0.8 -- Terraform 0.14.6 +- Terraform 0.14.7 - unzip 6.00 - wget 1.17.1 - yamllint 1.2.1 @@ -102,17 +101,17 @@ - zstd 1.3.1 ### CLI Tools -- Alibaba Cloud CLI 3.0.72 -- AWS CLI 1.19.8 +- Alibaba Cloud CLI 3.0.73 +- AWS CLI 1.19.12 - AWS CLI Session manager plugin 1.2.54.0 -- AWS SAM CLI 1.18.1 +- AWS SAM CLI 1.18.2 - Azure CLI (azure-cli) 2.19.1 - Azure CLI (azure-devops) 0.18.0 -- GitHub CLI 1.5.0 -- Google Cloud SDK 327.0.0 +- GitHub CLI 1.6.1 +- Google Cloud SDK 328.0.0 - Hub CLI 2.14.2 -- Netlify CLI 3.8.1 -- oc CLI 4.6.16 +- Netlify CLI 3.8.4 +- oc CLI 4.6.17 - ORAS CLI 0.10.0 - Vercel CLI 21.2.3 @@ -131,8 +130,9 @@ | PHPUnit | 8.5.14 | ### Haskell -- Cabal 3.4.0.0 -- GHC 8.10.3 +- Cabal 3.2.0.0 +- GHC 8.10.4 +- GHCup 0.1.12 - Stack 2.5.1 ### Rust Tools @@ -150,7 +150,7 @@ - Rustfmt 1.4.30 ### Browsers and Drivers -- Google Chrome 88.0.4324.150 +- Google Chrome 88.0.4324.182 - ChromeDriver 88.0.4324.96 - Mozilla Firefox 85.0.1 - Geckodriver 0.29.0 @@ -168,7 +168,7 @@ - 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 -- MongoDB 4.4.3 +- MongoDB 4.4.4 - Postgre SQL 13.2 - sqlite3 3.11.0 @@ -206,8 +206,8 @@ #### Python - 2.7.18 - 3.5.10 -- 3.6.12 -- 3.7.9 +- 3.6.13 +- 3.7.10 - 3.8.7 - 3.9.1 @@ -241,20 +241,20 @@ | nginx | 1.10.3 | /etc/nginx/nginx.conf | inactive | 80 | ### Android -| Package Name | Version | -| -------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 3.0 | -| Android SDK Build-tools | 30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3
26.0.0 26.0.1 26.0.2 26.0.3
25.0.0 25.0.1 25.0.2 25.0.3
24.0.0 24.0.1 24.0.2 24.0.3
23.0.1 23.0.2 23.0.3
22.0.1
21.1.2
20.0.0
19.1.0 | -| Android SDK Platform-Tools | 30.0.5 | -| 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-18 (rev 3)
android-17 (rev 3)
android-16 (rev 5)
android-15 (rev 5)
android-14 (rev 4)
android-13 (rev 1)
android-12 (rev 3)
android-11 (rev 2)
android-10 (rev 2) | -| Android SDK Tools | 26.1.1 | -| Android Support Repository | 47.0.0 | -| CMake | 3.10.2
3.6.4111459 | -| Google APIs | addon-google_apis-google-21
addon-google_apis-google-22
addon-google_apis-google-23
addon-google_apis-google-24 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 21.4.7075529 | -| SDK Patch Applier v4 | 1 | +| Package Name | Version | +| -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 3.0 | +| Android SDK Build-tools | 30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3
26.0.0 26.0.1 26.0.2 26.0.3
25.0.0 25.0.1 25.0.2 25.0.3
24.0.0 24.0.1 24.0.2 24.0.3
23.0.1 23.0.2 23.0.3
22.0.1
21.1.2
20.0.0
19.1.0 | +| Android SDK Platform-Tools | 31.0.0 | +| Android SDK Platforms | android-S (rev 1)
android-30 (rev 3)
android-29 (rev 5)
android-28 (rev 6)
android-27 (rev 3)
android-26 (rev 2)
android-25 (rev 3)
android-24 (rev 2)
android-23 (rev 3)
android-22 (rev 2)
android-21 (rev 2)
android-20 (rev 2)
android-19 (rev 4)
android-18 (rev 3)
android-17 (rev 3)
android-16 (rev 5)
android-15 (rev 5)
android-14 (rev 4)
android-13 (rev 1)
android-12 (rev 3)
android-11 (rev 2)
android-10 (rev 2) | +| Android SDK Tools | 26.1.1 | +| Android Support Repository | 47.0.0 | +| CMake | 3.10.2 | +| Google APIs | addon-google_apis-google-21
addon-google_apis-google-22
addon-google_apis-google-23
addon-google_apis-google-24 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 21.4.7075529 | +| SDK Patch Applier v4 | 1 | #### Environment variables | Name | Value | @@ -267,21 +267,21 @@ ### Cached Docker images | Repository:Tag | Digest | Created | | --------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | +| alpine:3.10 | sha256:f0e9534a598e501320957059cb2a23774b4d4072e37c7b2cf7e95b241f019e35 | 2020-04-24 | +| alpine:3.7 | sha256:8421d9a84432575381bfabd248f1eb56f3aa21d9d7cd2511583c68c9b7511d10 | 2019-03-07 | +| alpine:3.8 | sha256:2bb501e6173d9d006e56de5bce2720eb06396803300fe1687b58a7ff32bf4c14 | 2020-01-23 | +| alpine:3.9 | sha256:414e0518bb9228d35e4cd5165567fb91d26c6a214e9c95899e1e056fcd349011 | 2020-04-24 | +| buildpack-deps:buster | sha256:b42568b32a4dff4f1f378fd0685aa2a8e6931e744798a481fd6ed6672d7f0c47 | 2021-02-09 | +| buildpack-deps:stretch | sha256:97f102be9829fa96039a6113e0f053ffdadf2b2ccb67e8838294aee8a2dd947f | 2021-02-09 | +| debian:8 | sha256:40d6faa8c33e8ab03428ad97fc109c369fb510d99f4700df9058940ac9944f09 | 2021-02-09 | +| debian:9 | sha256:d0b7b71db141cedc48e1c2807d12b199ffd7ffe75baf272a34c37480dc2159d1 | 2021-02-09 | +| jekyll/builder:latest | sha256:b918b81939a1076dce89d142c0764c2c3cb93858f56ecf4f04ad0387338e77aa | 2020-12-21 | +| mcr.microsoft.com/azure-pipelines/node8-typescript:latest | sha256:e52e60b9f71183969830a3664279b5d8c799b4b0ec2c25a0686f7c02f6a9669a | 2018-10-09 | | node:10 | sha256:4fafd9b63fdfb15112775847a10b2917760c720c8c28cef5167ff40f36b3cd93 | 2021-02-12 | | node:10-alpine | sha256:dae0a441e1b5201e074312e44b35571bed4a39b5bc07c26c1bfab9f18017ff54 | 2021-02-12 | | node:12 | sha256:0140c4e17aa1f3fd78b939e3c7ac45accdd5274d0194046b484029a5e46b9db6 | 2021-02-12 | | node:12-alpine | sha256:77fe10dbc042121e94db7f43b4b912a52514759b847978588eec4d5d0eb5282c | 2021-02-12 | -| buildpack-deps:stretch | sha256:97f102be9829fa96039a6113e0f053ffdadf2b2ccb67e8838294aee8a2dd947f | 2021-02-09 | -| buildpack-deps:buster | sha256:b42568b32a4dff4f1f378fd0685aa2a8e6931e744798a481fd6ed6672d7f0c47 | 2021-02-09 | -| debian:9 | sha256:d0b7b71db141cedc48e1c2807d12b199ffd7ffe75baf272a34c37480dc2159d1 | 2021-02-09 | -| debian:8 | sha256:40d6faa8c33e8ab03428ad97fc109c369fb510d99f4700df9058940ac9944f09 | 2021-02-09 | -| jekyll/builder:latest | sha256:b918b81939a1076dce89d142c0764c2c3cb93858f56ecf4f04ad0387338e77aa | 2020-12-21 | | ubuntu:14.04 | sha256:63fce984528cec8714c365919882f8fb64c8a3edf23fdfa0b218a2756125456f | 2020-09-16 | -| alpine:3.9 | sha256:414e0518bb9228d35e4cd5165567fb91d26c6a214e9c95899e1e056fcd349011 | 2020-04-24 | -| alpine:3.10 | sha256:f0e9534a598e501320957059cb2a23774b4d4072e37c7b2cf7e95b241f019e35 | 2020-04-24 | -| alpine:3.8 | sha256:2bb501e6173d9d006e56de5bce2720eb06396803300fe1687b58a7ff32bf4c14 | 2020-01-23 | -| alpine:3.7 | sha256:8421d9a84432575381bfabd248f1eb56f3aa21d9d7cd2511583c68c9b7511d10 | 2019-03-07 | -| mcr.microsoft.com/azure-pipelines/node8-typescript:latest | sha256:e52e60b9f71183969830a3664279b5d8c799b4b0ec2c25a0686f7c02f6a9669a | 2018-10-09 | ### Installed apt packages - binutils, bison, brotli, build-essential, bzip2, coreutils, curl, dbus, dnsutils, dpkg, fakeroot, file, flex, ftp, gnupg2, haveged, imagemagick, iproute2, iputils-ping, jq, lib32z1, libc++-dev, libc++abi-dev, libcurl3, libgbm-dev, libgconf-2-4, libgsl-dev, libgtk-3-0, libicu55, libmagic-dev, libmagickcore-dev, libmagickwand-dev, libsecret-1-dev, libsqlite3-dev, libunwind8, libxkbfile-dev, libxss1, locales, m4, mediainfo, netcat, openssh-client, p7zip, p7zip-full, p7zip-rar, parallel, pass, patchelf, pkg-config, pollinate, rpm, rsync, shellcheck, sphinxsearch, sqlite3, ssh, subversion, sudo, swig, telnet, texinfo, time, tk, tzdata, unzip, upx, wget, xorriso, xvfb, xz-utils, yamllint, zip, zstd, zsync From 6fb455bd33e57715cacd81dc39c9d21db2cbe2de Mon Sep 17 00:00:00 2001 From: Sergey Dolin Date: Wed, 24 Feb 2021 14:46:40 +0500 Subject: [PATCH 0018/3485] [ubuntu] Remove GOROOT (#2668) --- images/linux/scripts/installers/Configure-Toolset.ps1 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/images/linux/scripts/installers/Configure-Toolset.ps1 b/images/linux/scripts/installers/Configure-Toolset.ps1 index 1b30dad309b0..f819eda9b3ed 100644 --- a/images/linux/scripts/installers/Configure-Toolset.ps1 +++ b/images/linux/scripts/installers/Configure-Toolset.ps1 @@ -44,7 +44,6 @@ $toolsEnvironment = @{ } go = @{ command = "ln -s {0}/bin/* /usr/bin/" - defaultVariable = "GOROOT" variableTemplate = "GOROOT_{0}_{1}_X64" } } @@ -96,4 +95,4 @@ foreach ($tool in $toolset.toolcache) } } -Invoke-PesterTests -TestFile "Toolset" -TestName "Toolset" \ No newline at end of file +Invoke-PesterTests -TestFile "Toolset" -TestName "Toolset" From 60b01b3d306d73318cb38e4f7db5757aed1d07bb Mon Sep 17 00:00:00 2001 From: Sergey Dolin Date: Wed, 24 Feb 2021 14:47:16 +0500 Subject: [PATCH 0019/3485] [windows] remove GOROOT (#2710) --- images/win/scripts/Installers/Configure-Toolset.ps1 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/images/win/scripts/Installers/Configure-Toolset.ps1 b/images/win/scripts/Installers/Configure-Toolset.ps1 index 9e067ade29be..584122d7b24f 100644 --- a/images/win/scripts/Installers/Configure-Toolset.ps1 +++ b/images/win/scripts/Installers/Configure-Toolset.ps1 @@ -42,7 +42,6 @@ $toolsEnvironmentVariables = @{ pathTemplates = @( "{0}\bin" ) - defaultVariable = "GOROOT" variableTemplate = "GOROOT_{0}_{1}_X64" } } @@ -79,4 +78,4 @@ foreach ($tool in $tools) } } -Invoke-PesterTests -TestFile "Toolset" \ No newline at end of file +Invoke-PesterTests -TestFile "Toolset" From 13fbc5337eb7130ca99bc6c1931a1dde578a9dd6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 24 Feb 2021 11:37:22 +0000 Subject: [PATCH 0020/3485] Ubuntu 2004 (20210219 update) (#2764) * Updating readme file for ubuntu20 version 20210219.1 * fixed PyPy version Co-authored-by: Image generation service account Co-authored-by: Alena Sviridenko 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 41e34eac3f24..22b8f9a6dd9f 100644 --- a/images/linux/Ubuntu2004-README.md +++ b/images/linux/Ubuntu2004-README.md @@ -1,16 +1,15 @@ | Announcements | |-| +| [[Ubuntu] AzCopy 7 will be removed from Ubuntu images on March, 2](https://github.com/actions/virtual-environments/issues/2724) | | [[ubuntu, windows] GOROOT environment variable will be removed on March, 1](https://github.com/actions/virtual-environments/issues/2683) | | [[Ubuntu] Android SDK Platforms and Build-tools that are less than version 23 will be removed on March, 1](https://github.com/actions/virtual-environments/issues/2673) | | [[Windows, Ubuntu] Boost 1.72.0 will be removed from images on March, 8](https://github.com/actions/virtual-environments/issues/2667) | | [[Ubuntu, windows] M2_HOME variable will be removed on February, 15](https://github.com/actions/virtual-environments/issues/2600) | | [[Ubuntu, macOS] .NET 3.0 will be removed from images on March, 1](https://github.com/actions/virtual-environments/issues/2558) | -| [[ubuntu, windows] Default Go version will be set to 1.15 on February, 8](https://github.com/actions/virtual-environments/issues/2447) | -| [[all OSs] Java 7 will be removed from images on February, 8.](https://github.com/actions/virtual-environments/issues/2446) | | [Ubuntu-latest workflows will use Ubuntu-20.04](https://github.com/actions/virtual-environments/issues/1816) | *** # Ubuntu 20.04.2 LTS -- Image Version: 20210216.1 +- Image Version: 20210219.1 ## Installed Software ### Language and Runtime @@ -30,7 +29,6 @@ ### Package Management - cpan 1.64 -- Gem 3.1.2 - Helm 3.5.2 - Homebrew 3.0.1 - Miniconda 4.9.2 @@ -38,7 +36,8 @@ - Pip 20.0.2 - Pip3 20.0.2 - Pipx 0.16.0.0 -- Vcpkg (build from master \<6166e75>) +- RubyGems 3.1.2 +- Vcpkg (build from master \<99dc49d>) - Yarn 1.22.5 #### Environment variables @@ -67,16 +66,17 @@ - CodeQL Action Bundle 2.4.2 - coreutils 8.30 - curl 7.68.0 -- Docker Compose 1.28.2 +- Docker Compose 1.28.4 - Docker-Buildx 0.5.1 -- Docker-Moby Client 19.03.15+azure -- Docker-Moby Server 20.10.2+azure +- Docker-Moby Client 20.10.3+azure +- Docker-Moby Server 20.10.3+azure +- Fastlane 2.175.0 - Git 2.30.0 - Git LFS 2.13.2 - Git-ftp 1.6.0 - Haveged 1.9.1 -- Heroku 7.47.12 -- HHVM (HipHop VM) 4.96.0 +- Heroku 7.47.13 +- HHVM (HipHop VM) 4.97.0 - jq 1.6 - Kind 0.10.0 - Kubectl 1.19.0 @@ -88,17 +88,17 @@ - Minikube 1.17.1 - Newman 5.2.2 - nvm 0.37.2 -- Packer 1.6.6 +- Packer 1.7.0 - pass 1.7.3 - PhantomJS 2.1.1 -- Podman 3.0.0 -- Pulumi 2.20.0 -- R 3.6.3 +- Podman 3.0.1 +- Pulumi 2.21.1 +- R 4.0.4 - Skopeo 1.2.1 - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 - Swig 4.0.1 -- Terraform 0.14.6 +- Terraform 0.14.7 - unzip 6.00 - wget 1.20.3 - yamllint 1.26.0 @@ -106,17 +106,17 @@ - zstd 1.4.4 ### CLI Tools -- Alibaba Cloud CLI 3.0.72 -- AWS CLI 2.1.26 +- Alibaba Cloud CLI 3.0.73 +- AWS CLI 2.1.27 - AWS CLI Session manager plugin 1.2.54.0 -- AWS SAM CLI 1.18.1 +- AWS SAM CLI 1.18.2 - Azure CLI (azure-cli) 2.19.1 - Azure CLI (azure-devops) 0.18.0 -- GitHub CLI 1.5.0 -- Google Cloud SDK 327.0.0 +- GitHub CLI 1.6.1 +- Google Cloud SDK 328.0.0 - Hub CLI 2.14.2 -- Netlify CLI 3.8.1 -- oc CLI 4.6.16 +- Netlify CLI 3.8.4 +- oc CLI 4.6.17 - ORAS CLI 0.10.0 - Vercel CLI 21.2.3 @@ -139,8 +139,9 @@ | PHPUnit | 8.5.14 | ### Haskell -- Cabal 3.4.0.0 +- Cabal 3.2.0.0 - GHC 8.10.3 +- GHCup 0.1.12 - Stack 2.5.1 ### Rust Tools @@ -158,8 +159,8 @@ - Rustfmt 1.4.30 ### Browsers and Drivers -- Chromium 88.0.4324.150 -- Google Chrome 88.0.4324.150 +- Chromium 88.0.4324.182 +- Google Chrome 88.0.4324.182 - ChromeDriver 88.0.4324.96 - Mozilla Firefox 85.0.1 - Geckodriver 0.29.0 @@ -177,7 +178,7 @@ - 3.8.0 4.8.0 ### Databases -- MongoDB 4.4.3 +- MongoDB 4.4.4 - Postgre SQL 13.2 - sqlite3 3.31.1 @@ -195,6 +196,7 @@ #### Go - 1.14.15 - 1.15.8 +- 1.16.0 #### Node.js - 10.23.3 @@ -204,12 +206,13 @@ #### PyPy - 2.7.18 [PyPy 7.3.3] - 3.6.12 [PyPy 7.3.3] +- 3.7.9 [PyPy 7.3.3-beta0] #### Python - 2.7.18 - 3.5.10 -- 3.6.12 -- 3.7.9 +- 3.6.13 +- 3.7.10 - 3.8.7 - 3.9.1 @@ -224,6 +227,7 @@ | --------------- | ----------------------------------- | ------------ | | GOROOT_1_14_X64 | /opt/hostedtoolcache/go/1.14.15/x64 | x64 | | GOROOT_1_15_X64 | /opt/hostedtoolcache/go/1.15.8/x64 | x64 | +| GOROOT_1_16_X64 | /opt/hostedtoolcache/go/1.16.0/x64 | x64 | ### PowerShell Tools - PowerShell 7.1.2 @@ -246,8 +250,8 @@ | -------------------------- | ------------------------------------------------------------------------------------------------------------------------ | | Android Command Line Tools | 3.0 | | Android SDK Build-tools | 30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3 | -| Android SDK Platform-Tools | 30.0.5 | -| Android SDK Platforms | android-30 (rev 3)
android-29 (rev 5)
android-28 (rev 6)
android-27 (rev 3) | +| Android SDK Platform-Tools | 31.0.0 | +| Android SDK Platforms | android-S (rev 1)
android-30 (rev 3)
android-29 (rev 5)
android-28 (rev 6)
android-27 (rev 3) | | Android SDK Tools | 26.1.1 | | Android Support Repository | 47.0.0 | | CMake | 3.10.2 | @@ -268,21 +272,21 @@ ### Cached Docker images | Repository:Tag | Digest | Created | | --------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | +| alpine:3.10 | sha256:f0e9534a598e501320957059cb2a23774b4d4072e37c7b2cf7e95b241f019e35 | 2020-04-24 | +| alpine:3.7 | sha256:8421d9a84432575381bfabd248f1eb56f3aa21d9d7cd2511583c68c9b7511d10 | 2019-03-07 | +| alpine:3.8 | sha256:2bb501e6173d9d006e56de5bce2720eb06396803300fe1687b58a7ff32bf4c14 | 2020-01-23 | +| alpine:3.9 | sha256:414e0518bb9228d35e4cd5165567fb91d26c6a214e9c95899e1e056fcd349011 | 2020-04-24 | +| buildpack-deps:buster | sha256:b42568b32a4dff4f1f378fd0685aa2a8e6931e744798a481fd6ed6672d7f0c47 | 2021-02-09 | +| buildpack-deps:stretch | sha256:97f102be9829fa96039a6113e0f053ffdadf2b2ccb67e8838294aee8a2dd947f | 2021-02-09 | +| debian:8 | sha256:40d6faa8c33e8ab03428ad97fc109c369fb510d99f4700df9058940ac9944f09 | 2021-02-09 | +| debian:9 | sha256:d0b7b71db141cedc48e1c2807d12b199ffd7ffe75baf272a34c37480dc2159d1 | 2021-02-09 | +| jekyll/builder:latest | sha256:b918b81939a1076dce89d142c0764c2c3cb93858f56ecf4f04ad0387338e77aa | 2020-12-21 | +| mcr.microsoft.com/azure-pipelines/node8-typescript:latest | sha256:e52e60b9f71183969830a3664279b5d8c799b4b0ec2c25a0686f7c02f6a9669a | 2018-10-09 | | node:10 | sha256:4fafd9b63fdfb15112775847a10b2917760c720c8c28cef5167ff40f36b3cd93 | 2021-02-12 | | node:10-alpine | sha256:dae0a441e1b5201e074312e44b35571bed4a39b5bc07c26c1bfab9f18017ff54 | 2021-02-12 | | node:12 | sha256:0140c4e17aa1f3fd78b939e3c7ac45accdd5274d0194046b484029a5e46b9db6 | 2021-02-12 | | node:12-alpine | sha256:77fe10dbc042121e94db7f43b4b912a52514759b847978588eec4d5d0eb5282c | 2021-02-12 | -| buildpack-deps:stretch | sha256:97f102be9829fa96039a6113e0f053ffdadf2b2ccb67e8838294aee8a2dd947f | 2021-02-09 | -| buildpack-deps:buster | sha256:b42568b32a4dff4f1f378fd0685aa2a8e6931e744798a481fd6ed6672d7f0c47 | 2021-02-09 | -| debian:9 | sha256:d0b7b71db141cedc48e1c2807d12b199ffd7ffe75baf272a34c37480dc2159d1 | 2021-02-09 | -| debian:8 | sha256:40d6faa8c33e8ab03428ad97fc109c369fb510d99f4700df9058940ac9944f09 | 2021-02-09 | -| jekyll/builder:latest | sha256:b918b81939a1076dce89d142c0764c2c3cb93858f56ecf4f04ad0387338e77aa | 2020-12-21 | | ubuntu:14.04 | sha256:63fce984528cec8714c365919882f8fb64c8a3edf23fdfa0b218a2756125456f | 2020-09-16 | -| alpine:3.9 | sha256:414e0518bb9228d35e4cd5165567fb91d26c6a214e9c95899e1e056fcd349011 | 2020-04-24 | -| alpine:3.10 | sha256:f0e9534a598e501320957059cb2a23774b4d4072e37c7b2cf7e95b241f019e35 | 2020-04-24 | -| alpine:3.8 | sha256:2bb501e6173d9d006e56de5bce2720eb06396803300fe1687b58a7ff32bf4c14 | 2020-01-23 | -| alpine:3.7 | sha256:8421d9a84432575381bfabd248f1eb56f3aa21d9d7cd2511583c68c9b7511d10 | 2019-03-07 | -| mcr.microsoft.com/azure-pipelines/node8-typescript:latest | sha256:e52e60b9f71183969830a3664279b5d8c799b4b0ec2c25a0686f7c02f6a9669a | 2018-10-09 | ### Installed apt packages - binutils, bison, brotli, build-essential, bzip2, chromium-browser, coreutils, curl, dbus, dnsutils, dpkg, fakeroot, file, flex, ftp, gnupg2, haveged, imagemagick, iproute2, iputils-ping, jq, lib32z1, libc++-dev, libc++abi-dev, libcurl4, libgbm-dev, libgconf-2-4, libgsl-dev, libgtk-3-0, libmagic-dev, libmagickcore-dev, libmagickwand-dev, libsecret-1-dev, libsqlite3-dev, libunwind8, libxkbfile-dev, libxss1, locales, m4, mediainfo, netcat, openssh-client, p7zip-full, p7zip-rar, parallel, pass, patchelf, pkg-config, pollinate, python-is-python3, rpm, rsync, shellcheck, sphinxsearch, sqlite3, ssh, subversion, sudo, swig, telnet, texinfo, time, tk, tzdata, unzip, upx, wget, xorriso, xvfb, xz-utils, zip, zstd, zsync From 5bf71738f0eb27564590cc68e9e119772f3892cd Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Wed, 24 Feb 2021 16:55:49 +0300 Subject: [PATCH 0021/3485] Start platform and build tools with version 23 (#2781) --- images/linux/toolsets/toolset-1604.json | 4 ++-- images/linux/toolsets/toolset-1804.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/images/linux/toolsets/toolset-1604.json b/images/linux/toolsets/toolset-1604.json index 615570aed8e5..c771df25044a 100644 --- a/images/linux/toolsets/toolset-1604.json +++ b/images/linux/toolsets/toolset-1604.json @@ -85,8 +85,8 @@ ] }, "android": { - "platform_min_version": "10", - "build_tools_min_version": "19.1.0", + "platform_min_version": "23", + "build_tools_min_version": "23.0.1", "extra_list": [ "android;m2repository", "google;m2repository", diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index c4c0fe7a2479..221d3518e7cb 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -85,8 +85,8 @@ ] }, "android": { - "platform_min_version": "17", - "build_tools_min_version": "19.1.0", + "platform_min_version": "23", + "build_tools_min_version": "23.0.1", "extra_list": [ "android;m2repository", "google;m2repository", From 5afe6fcc4e2ebdc9dd89ce453c9c7b4167c3955e Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Wed, 24 Feb 2021 18:21:51 +0300 Subject: [PATCH 0022/3485] [Ubuntu] Remove azcopy 7 (#2779) * remove azcopy 7 installation * Fix software report generator * fix variable name * add install helper --- .../SoftwareReport/SoftwareReport.Generator.ps1 | 3 +-- .../SoftwareReport/SoftwareReport.Tools.psm1 | 11 +++-------- images/linux/scripts/installers/azcopy.sh | 14 ++++++-------- images/linux/scripts/tests/Tools.Tests.ps1 | 6 ++---- 4 files changed, 12 insertions(+), 22 deletions(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index ee7dc994886b..a66994962bf6 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -90,8 +90,7 @@ $toolsList = @( (Get-7zipVersion), (Get-AnsibleVersion), (Get-AptFastVersion), - (Get-AzCopy7Version), - (Get-AzCopy10Version), + (Get-AzCopyVersion), (Get-BazelVersion), (Get-BazeliskVersion), (Get-BinUtilsVersion), diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 index e6650fca26c9..ef663547764a 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 @@ -13,14 +13,9 @@ function Get-AptFastVersion { return "apt-fast $aptFastVersion" } -function Get-AzCopy7Version { - $azcopy7Version = azcopy --version | Take-OutputPart -Part 1 | Take-OutputPart -Part 0 -Delimiter "-" - return "AzCopy7 $azcopy7Version (available by ``azcopy`` alias)" -} - -function Get-AzCopy10Version { - $azcopy10Version = azcopy10 --version | Take-OutputPart -Part 2 - return "AzCopy10 $azcopy10Version (available by ``azcopy10`` alias)" +function Get-AzCopyVersion { + $azcopyVersion = azcopy --version | Take-OutputPart -Part 2 + return "AzCopy $azcopyVersion (available by ``azcopy`` and ``azcopy10`` aliases)" } function Get-BazelVersion { diff --git a/images/linux/scripts/installers/azcopy.sh b/images/linux/scripts/installers/azcopy.sh index 58dfdf658693..af5e5916f1c7 100644 --- a/images/linux/scripts/installers/azcopy.sh +++ b/images/linux/scripts/installers/azcopy.sh @@ -4,16 +4,14 @@ ## Desc: Installs AzCopy ################################################################################ -# Install AzCopy7 -wget -O azcopy.tar.gz https://aka.ms/downloadazcopylinux64 -tar -xf azcopy.tar.gz -rm azcopy.tar.gz -./install.sh +source $HELPER_SCRIPTS/install.sh # Install AzCopy10 -wget -O /tmp/azcopy.tar.gz https://aka.ms/downloadazcopy-v10-linux +download_with_retries "https://aka.ms/downloadazcopy-v10-linux" "/tmp" "azcopy.tar.gz" tar zxvf /tmp/azcopy.tar.gz --strip-components=1 -C /tmp -mv /tmp/azcopy /usr/local/bin/azcopy10 -chmod +x /usr/local/bin/azcopy10 +mv /tmp/azcopy /usr/local/bin/azcopy +chmod +x /usr/local/bin/azcopy +# Create azcopy 10 alias for backward compatibility +ln -sf /usr/local/bin/azcopy /usr/local/bin/azcopy10 invoke_tests "Tools" "azcopy" \ No newline at end of file diff --git a/images/linux/scripts/tests/Tools.Tests.ps1 b/images/linux/scripts/tests/Tools.Tests.ps1 index e17b21d65868..60372d9cc8b7 100644 --- a/images/linux/scripts/tests/Tools.Tests.ps1 +++ b/images/linux/scripts/tests/Tools.Tests.ps1 @@ -1,11 +1,9 @@ Describe "azcopy" { It "azcopy" { - #(azcopy --version) command returns exit code 1 (see details: https://github.com/Azure/azure-storage-azcopy/releases) - $azcopyVersion = (Get-CommandResult "azcopy --version").Output - $azcopyVersion | Should -BeLike "*azcopy*" + "azcopy --version" | Should -ReturnZeroExitCode } - It "azcopy10" { + It "azcopy10 link exists" { "azcopy10 --version" | Should -ReturnZeroExitCode } } From 09ea8edb54af32894b7a7384882817656f03086a Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Wed, 24 Feb 2021 18:48:49 +0300 Subject: [PATCH 0023/3485] change GDIProcessHandleQuota to 20000 (#2780) --- .../Installers/Configure-GDIProcessHandleQuota.ps1 | 9 +++++++++ images/win/scripts/Tests/WindowsFeatures.Tests.ps1 | 11 ++++++++++- images/win/windows2016.json | 1 + images/win/windows2019.json | 1 + 4 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 images/win/scripts/Installers/Configure-GDIProcessHandleQuota.ps1 diff --git a/images/win/scripts/Installers/Configure-GDIProcessHandleQuota.ps1 b/images/win/scripts/Installers/Configure-GDIProcessHandleQuota.ps1 new file mode 100644 index 000000000000..8f1ab0d94abc --- /dev/null +++ b/images/win/scripts/Installers/Configure-GDIProcessHandleQuota.ps1 @@ -0,0 +1,9 @@ +# https://docs.microsoft.com/en-us/windows/win32/sysinfo/gdi-objects +# This value can be set to a number between 256 and 65,536 + +$defaultValue = 20000 +Write-Host "Set the GDIProcessHandleQuota value to $defaultValue" +Set-ItemProperty -Path "HKLM:\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Windows" -Name GDIProcessHandleQuota -Value $defaultValue +Set-ItemProperty -Path "HKLM:\SOFTWARE\WOW6432Node\Microsoft\Windows NT\CurrentVersion\Windows" -Name GDIProcessHandleQuota -Value $defaultValue + +Invoke-PesterTests -TestFile "WindowsFeatures" -TestName "GDIProcessHandleQuota" diff --git a/images/win/scripts/Tests/WindowsFeatures.Tests.ps1 b/images/win/scripts/Tests/WindowsFeatures.Tests.ps1 index f4c955e3a602..96e45301875c 100644 --- a/images/win/scripts/Tests/WindowsFeatures.Tests.ps1 +++ b/images/win/scripts/Tests/WindowsFeatures.Tests.ps1 @@ -56,4 +56,13 @@ Describe "DynamicPorts" { $udpPorts | Should -BeNullOrEmpty } -} \ No newline at end of file +} + +Describe "GDIProcessHandleQuota" { + It "The GDIProcessHandleQuota value is 20000" { + $regPath = "HKLM:\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Windows" + $regPath32 = "HKLM:\SOFTWARE\WOW6432Node\Microsoft\Windows NT\CurrentVersion\Windows" + (Get-ItemProperty $regPath).GDIProcessHandleQuota | Should -BeExactly 20000 + (Get-ItemProperty $regPath32).GDIProcessHandleQuota | Should -BeExactly 20000 + } +} diff --git a/images/win/windows2016.json b/images/win/windows2016.json index ad4876dd88b1..f090f12bce9e 100644 --- a/images/win/windows2016.json +++ b/images/win/windows2016.json @@ -329,6 +329,7 @@ "scripts": [ "{{ template_dir }}/scripts/Installers/Install-WindowsUpdates.ps1", "{{ template_dir }}/scripts/Installers/Configure-DynamicPort.ps1", + "{{ template_dir }}/scripts/Installers/Configure-GDIProcessHandleQuota.ps1", "{{ template_dir }}/scripts/Installers/Configure-Shell.ps1" ], "elevated_user": "{{user `install_user`}}", diff --git a/images/win/windows2019.json b/images/win/windows2019.json index 268bcce032c7..b98ea750ee62 100644 --- a/images/win/windows2019.json +++ b/images/win/windows2019.json @@ -322,6 +322,7 @@ "scripts": [ "{{ template_dir }}/scripts/Installers/Install-WindowsUpdates.ps1", "{{ template_dir }}/scripts/Installers/Configure-DynamicPort.ps1", + "{{ template_dir }}/scripts/Installers/Configure-GDIProcessHandleQuota.ps1", "{{ template_dir }}/scripts/Installers/Configure-Shell.ps1" ], "elevated_user": "{{user `install_user`}}", From d707864e45271717d8d39929219553c8b54fb60f Mon Sep 17 00:00:00 2001 From: Vladimir Safonkin Date: Wed, 24 Feb 2021 19:34:54 +0300 Subject: [PATCH 0024/3485] [ubuntu, macos] Remove dotnet 3.0 (#2782) --- images/linux/toolsets/toolset-1604.json | 2 -- images/linux/toolsets/toolset-1804.json | 2 -- images/macos/toolsets/toolset-10.15.json | 1 - 3 files changed, 5 deletions(-) diff --git a/images/linux/toolsets/toolset-1604.json b/images/linux/toolsets/toolset-1604.json index c771df25044a..9774f6566a8d 100644 --- a/images/linux/toolsets/toolset-1604.json +++ b/images/linux/toolsets/toolset-1604.json @@ -236,13 +236,11 @@ }, "dotnet": { "aptPackages": [ - "dotnet-sdk-3.0", "dotnet-sdk-3.1", "dotnet-sdk-5.0" ], "versions": [ "2.1", - "3.0", "3.1", "5.0" ] diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index 221d3518e7cb..2259d938637d 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -239,13 +239,11 @@ ], "dotnet": { "aptPackages": [ - "dotnet-sdk-3.0", "dotnet-sdk-3.1", "dotnet-sdk-5.0" ], "versions": [ "2.1", - "3.0", "3.1", "5.0" ] diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index 6ddf5486b3de..3e6ec710fb0d 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -275,7 +275,6 @@ "dotnet": { "versions": [ "2.1", - "3.0", "3.1", "5.0" ] From fdea69d18fe7ca7feb45a2b88ca287070f716932 Mon Sep 17 00:00:00 2001 From: Dibir Magomedsaygitov <61747324+dibir-magomedsaygitov@users.noreply.github.com> Date: Thu, 25 Feb 2021 14:22:57 +0300 Subject: [PATCH 0025/3485] add link to image release (#2783) --- images/linux/scripts/installers/preimagedata.sh | 5 ++++- images/macos/provision/configuration/preimagedata.sh | 3 ++- images/win/scripts/Installers/Update-ImageData.ps1 | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/images/linux/scripts/installers/preimagedata.sh b/images/linux/scripts/installers/preimagedata.sh index d9f7b22fe2f1..39af51787f1a 100644 --- a/images/linux/scripts/installers/preimagedata.sh +++ b/images/linux/scripts/installers/preimagedata.sh @@ -8,14 +8,17 @@ github_url="https://github.com/actions/virtual-environments/blob" if [[ "$image_label" =~ "ubuntu-20" ]]; then software_url="${github_url}/ubuntu20/${image_version}/images/linux/Ubuntu2004-README.md" + releaseUrl="https://github.com/actions/virtual-environments/releases/tag/ubuntu20%2F${imageVersion}" fi if [[ "$image_label" =~ "ubuntu-18" ]]; then software_url="${github_url}/ubuntu18/${image_version}/images/linux/Ubuntu1804-README.md" + releaseUrl="https://github.com/actions/virtual-environments/releases/tag/ubuntu18%2F${imageVersion}" fi if [[ "$image_label" =~ "ubuntu-16" ]]; then software_url="${github_url}/ubuntu16/${image_version}/images/linux/Ubuntu1604-README.md" + releaseUrl="https://github.com/actions/virtual-environments/releases/tag/ubuntu16%2F${imageVersion}" fi cat < $imagedata_file @@ -26,7 +29,7 @@ cat < $imagedata_file }, { "group": "Virtual Environment", - "detail": "Environment: ${image_label}\nVersion: ${image_version}\nIncluded Software: ${software_url}" + "detail": "Environment: ${image_label}\nVersion: ${image_version}\nIncluded Software: ${software_url}\nImage Release: ${releaseUrl}" } ] EOF diff --git a/images/macos/provision/configuration/preimagedata.sh b/images/macos/provision/configuration/preimagedata.sh index 92873d9d9921..20220886751b 100644 --- a/images/macos/provision/configuration/preimagedata.sh +++ b/images/macos/provision/configuration/preimagedata.sh @@ -11,6 +11,7 @@ label_version=$(echo $os_version | cut -d. -f1,2) image_label="macos-${label_version}" release_label="macOS-${label_version}" software_url="https://github.com/actions/virtual-environments/blob/${release_label}/${image_version}/images/macos/${image_label}-Readme.md" +releaseUrl="https://github.com/actions/virtual-environments/releases/tag/${release_label}%2F${image_version}" cat < $imagedata_file [ @@ -20,7 +21,7 @@ cat < $imagedata_file }, { "group": "Virtual Environment", - "detail": "Environment: ${image_label}\nVersion: ${image_version}\nIncluded Software: ${software_url}" + "detail": "Environment: ${image_label}\nVersion: ${image_version}\nIncluded Software: ${software_url}\nImage Release: ${releaseUrl}" } ] EOF diff --git a/images/win/scripts/Installers/Update-ImageData.ps1 b/images/win/scripts/Installers/Update-ImageData.ps1 index 7cbffec0d0be..e8b809748a92 100644 --- a/images/win/scripts/Installers/Update-ImageData.ps1 +++ b/images/win/scripts/Installers/Update-ImageData.ps1 @@ -11,12 +11,14 @@ if ($caption -match "2019") { $imageLabel = "windows-2019" $softwareUrl = "${githubUrl}/win19/${imageVersion}/images/win/Windows2019-Readme.md" + $releaseUrl="https://github.com/actions/virtual-environments/releases/tag/win19%2F${imageVersion}" } if ($caption -match "2016") { $imageLabel = "windows-2016" $softwareUrl = "${githubUrl}/win16/${imageVersion}/images/win/Windows2016-Readme.md" + $releaseUrl="https://github.com/actions/virtual-environments/releases/tag/win16%2F${imageVersion}" } $json = @" @@ -27,7 +29,7 @@ $json = @" }, { "group": "Virtual Environment", - "detail": "Environment: ${imageLabel}\nVersion: ${imageVersion}\nIncluded Software: ${softwareUrl}" + "detail": "Environment: ${imageLabel}\nVersion: ${imageVersion}\nIncluded Software: ${softwareUrl}\nImage Release: ${releaseUrl}" } ] "@ From d7cbdff57e786b7ac064b08b0a3e9b404e0f52c8 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Thu, 25 Feb 2021 16:29:15 +0300 Subject: [PATCH 0026/3485] [macOS] Software updates Week 9 (#2786) --- images/macos/toolsets/toolset-10.15.json | 2 +- images/macos/toolsets/toolset-11.0.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index 3e6ec710fb0d..cd498aebe9fd 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -26,7 +26,7 @@ "14.10.0.4", "14.8.0.3", "14.6.0.15", "14.4.1.3", "14.2.0.12", "14.0.0.0", "13.20.2.2", "13.18.2.1", "13.16.0.13", "13.14.1.39", "13.10.0.21", "13.8.3.0", "13.6.0.12", "13.4.0.2", "13.2.0.47" ], "mac-versions": [ - "7.4.0.4", "7.2.0.3", "7.0.0.15", "6.22.1.26", "6.20.2.2", "6.18.3.2", "6.16.0.13", "6.14.1.39", "6.10.0.21", "6.8.3.0", "6.6.0.12", "6.4.0.2", "6.2.0.47" + "7.4.0.10", "7.2.0.3", "7.0.0.15", "6.22.1.26", "6.20.2.2", "6.18.3.2", "6.16.0.13", "6.14.1.39", "6.10.0.21", "6.8.3.0", "6.6.0.12", "6.4.0.2", "6.2.0.47" ], "android-versions": [ "11.1.0.26", "11.0.2.0", "10.3.1.4", "10.2.0.100", "10.1.3.7", "10.0.6.2" diff --git a/images/macos/toolsets/toolset-11.0.json b/images/macos/toolsets/toolset-11.0.json index ad2f2846cf69..f5d52f77138a 100644 --- a/images/macos/toolsets/toolset-11.0.json +++ b/images/macos/toolsets/toolset-11.0.json @@ -18,7 +18,7 @@ "14.10.0.4", "14.8.0.3", "14.6.0.15", "14.4.1.3", "14.2.0.12", "14.0.0.0", "13.20.2.2" ], "mac-versions": [ - "7.4.0.4", "7.2.0.3", "7.0.0.15", "6.22.1.26", "6.20.2.2" + "7.4.0.10", "7.2.0.3", "7.0.0.15", "6.22.1.26", "6.20.2.2" ], "android-versions": [ "11.1.0.26", "11.0.2.0" From 238c623deff939b5c00bf2fe94b6d44fdb89a5cd Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 26 Feb 2021 06:39:56 +0000 Subject: [PATCH 0027/3485] Updating readme file for macOS-10.15 version 20210220.1 (#2773) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/macos/macos-10.15-Readme.md | 75 +++++++++++++++--------------- 1 file changed, 38 insertions(+), 37 deletions(-) diff --git a/images/macos/macos-10.15-Readme.md b/images/macos/macos-10.15-Readme.md index 8350b7acbc10..a8e4e1994350 100644 --- a/images/macos/macos-10.15-Readme.md +++ b/images/macos/macos-10.15-Readme.md @@ -3,39 +3,38 @@ | [[macOS] Default Xcode will be set to Xcode 12.4 on February, 22](https://github.com/actions/virtual-environments/issues/2685) | | [[Ubuntu, macOS] .NET 3.0 will be removed from images on March, 1](https://github.com/actions/virtual-environments/issues/2558) | | [macOS 11.0 pools will be transited to private preview.](https://github.com/actions/virtual-environments/issues/2486) | -| [[all OSs] Java 7 will be removed from images on February, 8.](https://github.com/actions/virtual-environments/issues/2446) | *** # macOS 10.15 info - System Version: macOS 10.15.7 (19H512) - Kernel Version: Darwin 19.6.0 -- Image Version: 20210213.1 +- Image Version: 20210220.1 ## Installed Software ### Language and Runtime - .NET SDK 2.1.300 2.1.301 2.1.302 2.1.401 2.1.402 2.1.403 2.1.500 2.1.502 2.1.503 2.1.504 2.1.505 2.1.506 2.1.507 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 2.1.811 2.1.812 2.1.813 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 3.1.403 3.1.404 3.1.405 3.1.406 5.0.100 5.0.101 5.0.102 5.0.103 - Bash 3.2.57(1)-release -- Clang/LLVM 11.0.1 is available on `'$(brew --prefix llvm)/bin/clang'` +- Clang/LLVM 11.1.0 is available on `'$(brew --prefix llvm)/bin/clang'` - Clang/LLVM 12.0.0 is default -- gcc-10 (Homebrew GCC 10.2.0_3) 10.2.0 - available by `gcc-10` alias +- gcc-10 (Homebrew GCC 10.2.0_4) 10.2.0 - available by `gcc-10` alias - gcc-8 (Homebrew GCC 8.4.0_2) 8.4.0 - available by `gcc-8` alias - gcc-9 (Homebrew GCC 9.3.0_1) 9.3.0 - available by `gcc-9` alias -- GNU Fortran (Homebrew GCC 10.2.0_3) 10.2.0 - available by `gfortran-10` alias +- GNU Fortran (Homebrew GCC 10.2.0_4) 10.2.0 - available by `gfortran-10` alias - GNU Fortran (Homebrew GCC 8.4.0_2) 8.4.0 - available by `gfortran-8` alias - GNU Fortran (Homebrew GCC 9.3.0_1) 9.3.0 - available by `gfortran-9` alias -- Go 1.15.7 +- Go 1.15.8 - julia 1.5.3 - Node.js v14.15.5 -- NVM - Cached node versions: v6.17.1 v8.17.0 v10.23.3 v12.20.2 v13.14.0 v14.15.5 +- NVM - Cached node versions: v10.23.3 v12.20.2 v14.15.5 - NVM 0.37.2 - Perl 5.32.1 - PHP 8.0.2 - Python 2.7.18 - Python 3.9.1 -- R 4.0.3 +- R 4.0.4 - Ruby 2.7.2p137 ### Package Management -- Bundler version 2.2.9 +- Bundler version 2.2.11 - Carthage 0.37.0 - CocoaPods 1.10.1 - Composer 2.0.9 @@ -46,8 +45,8 @@ - Pip 20.3.4 (python 2.7) - Pip 21.0.1 (python 3.9) - Pipx 0.16.0.0 -- RubyGems 3.2.9 -- Vcpkg 2021 (build from master \) +- RubyGems 3.2.11 +- Vcpkg 2021 (build from master \<99dc49d>) - Yarn 1.22.5 #### Environment variables @@ -71,9 +70,9 @@ - Curl 7.75.0 - Git LFS: 2.13.2 - Git: 2.30.1 -- GitHub CLI: 1.5.0 +- GitHub CLI: 1.6.1 - GNU parallel 20201122 -- GNU Tar 1.33 - available by 'gtar' alias +- GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.1 - gpg (GnuPG) 2.2.27 - helm v3.5.2+g167aac7 @@ -82,8 +81,8 @@ - mongo v4.4.3 - mongod v4.4.3 - Newman 5.2.2 -- OpenSSL 1.1.1i 8 Dec 2020 `(/usr/local/opt/openssl -> /usr/local/Cellar/openssl@1.1/1.1.1i)` -- Packer 1.6.6 +- OpenSSL 1.1.1j 16 Feb 2021 `(/usr/local/opt/openssl -> /usr/local/Cellar/openssl@1.1/1.1.1j)` +- Packer 1.7.0 - PostgreSQL 13.2 - psql (PostgreSQL) 13.2 - Subversion (SVN) 1.14.1 @@ -93,15 +92,15 @@ ### Tools -- Aliyun CLI 3.0.72 +- Aliyun CLI 3.0.73 - App Center CLI 2.7.4 -- AWS CLI 2.1.26 -- AWS SAM CLI 1.18.1 +- AWS CLI 2.1.27 +- AWS SAM CLI 1.18.2 - AWS Session Manager CLI 1.2.30.0 - Azure CLI 2.19.1 -- Cabal 3.2.0.0 -- Cmake 3.19.4 -- Fastlane 2.174.0 +- Cabal 3.4.0.0 +- Cmake 3.19.5 +- Fastlane 2.175.0 - GHC 9.0.1 - GHCup v0.1.12 - Stack 2.5.1 @@ -114,10 +113,10 @@ ### Browsers - Safari 14.0.3 (15610.4.3.1.6) - SafariDriver 14.0.3 (15610.4.3.1.6) -- Google Chrome 88.0.4324.150 +- Google Chrome 88.0.4324.182 - ChromeDriver 88.0.4324.96 -- Microsoft Edge 88.0.705.68 -- MSEdgeDriver 88.0.705.68 +- Microsoft Edge 88.0.705.74 +- MSEdgeDriver 88.0.705.74 - Mozilla Firefox 85.0.2 - geckodriver 0.29.0 @@ -148,14 +147,15 @@ #### Python - 2.7.18 - 3.5.10 -- 3.6.12 -- 3.7.9 -- 3.8.7 -- 3.9.1 +- 3.6.13 +- 3.7.10 +- 3.8.8 +- 3.9.2 #### PyPy - 2.7.18 [PyPy 7.3.3] - 3.6.12 [PyPy 7.3.3] +- 3.7.9 [PyPy 7.3.3-beta0] #### Node.js - 10.23.3 @@ -166,6 +166,7 @@ - 1.13.15 - 1.14.15 - 1.15.8 +- 1.16.0 ### Rust Tools - Cargo 1.50.0 @@ -196,14 +197,14 @@ | Name | Version | ConfigFile | ServiceStatus | ListenPort | | ----- | -------- | ------------------------------- | ------------- | ---------- | | httpd | 2.4.46_2 | /usr/local/etc/httpd/httpd.conf | stopped | 80 | -| nginx | 1.19.6 | /usr/local/etc/nginx/nginx.conf | stopped | 80 | +| nginx | 1.19.7 | /usr/local/etc/nginx/nginx.conf | stopped | 80 | ### Xamarin #### Visual Studio for Mac -- 8.8.8.12 +- 8.8.9.10 #### Mono -- 6.12.0.113 +- 6.12.0.122 - 6.10.0.106 - 6.8.0.123 - 6.6.0.166 @@ -255,8 +256,8 @@ ### Xcode | Version | Build | Path | | -------------- | -------- | ------------------------------ | -| 12.4 | 12D4e | /Applications/Xcode_12.4.app | -| 12.3 (default) | 12C33 | /Applications/Xcode_12.3.app | +| 12.4 (default) | 12D4e | /Applications/Xcode_12.4.app | +| 12.3 | 12C33 | /Applications/Xcode_12.3.app | | 12.2 | 12B45b | /Applications/Xcode_12.2.app | | 12.1.1 | 12A7605b | /Applications/Xcode_12.1.1.app | | 12.1 | 12A7403 | /Applications/Xcode_12.1.app | @@ -272,7 +273,7 @@ #### Xcode Support Tools - xcpretty 0.3.0 - xcversion 2.6.8 -- Nomad CLI 3.2.9 +- Nomad CLI 3.2.11 - Nomad CLI IPA ipa 0.14.3 - xctool 0.3.7 @@ -368,11 +369,11 @@ | Android Command Line Tools | 3.0 | | Android Emulator | 30.3.5 | | Android SDK Build-tools | 30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3
26.0.0 26.0.1 26.0.2 26.0.3
25.0.0 25.0.1 25.0.2 25.0.3
24.0.0 24.0.1 24.0.2 24.0.3 | -| 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 Platform-Tools | 30.0.5 | +| Android SDK Platforms | android-S (rev 1)
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 Platform-Tools | 31.0.0 | | Android SDK Tools | 26.1.1 | | Android Support Repository | 47.0.0 | -| CMake | 3.6.4111459 | +| CMake | 3.10.2 | | Google APIs | addon-google_apis-google-21
addon-google_apis-google-22
addon-google_apis-google-23
addon-google_apis-google-24 | | Google Play services | 49 | | Google Repository | 58 | From 12ba3061216043b298cc10d165c718647482f7b8 Mon Sep 17 00:00:00 2001 From: Sergey Dolin Date: Fri, 26 Feb 2021 20:06:24 +0500 Subject: [PATCH 0028/3485] [ubuntu] Add lerna (#2763) * Add lerna to linux images * Add a comment about netlify-cli * remove Node.js tests from Tools.Tests.ps1 * fix tabs * revert empty lines * fix code style --- images/linux/scripts/installers/nodejs.sh | 24 ++++++++--- images/linux/scripts/tests/Node.Tests.ps1 | 14 +++++++ images/linux/scripts/tests/Tools.Tests.ps1 | 14 +------ images/linux/toolsets/toolset-1604.json | 44 ++++++++++++++++++++- images/linux/toolsets/toolset-1804.json | 44 ++++++++++++++++++++- images/linux/toolsets/toolset-2004.json | 46 ++++++++++++++++++++++ 6 files changed, 166 insertions(+), 20 deletions(-) create mode 100644 images/linux/scripts/tests/Node.Tests.ps1 diff --git a/images/linux/scripts/installers/nodejs.sh b/images/linux/scripts/installers/nodejs.sh index 3bee08f1f31e..020662f3b61b 100644 --- a/images/linux/scripts/installers/nodejs.sh +++ b/images/linux/scripts/installers/nodejs.sh @@ -4,14 +4,28 @@ ## Desc: Installs Node.js LTS and related tooling (Gulp, Grunt) ################################################################################ +# Source the helpers for use with the script +source $HELPER_SCRIPTS/install.sh + # Install LTS Node.js and related build tools curl -sL https://raw.githubusercontent.com/mklement0/n-install/stable/bin/n-install | bash -s -- -ny - ~/n/bin/n lts -npm install -g grunt gulp n parcel-bundler typescript newman vercel -npm install -g --save-dev webpack webpack-cli +# Install node modules +node_modules=$(get_toolset_value '.node_modules[].name') + +# remove commenting out of this line as nmp migrated to v7 +# npm install -g $node_modules -# Install the Netlify CLI using --unsafe-perm=true options to avoid permission issues -npm install -g --unsafe-perm=true netlify-cli +# TODO: workaround for Netlify CLI with npm6. Remove 19-28 and uncomment 17 if migration to npm7 compelted +for module in $node_modules; do + echo "Installing node module $module" + if [ $module = "netlify-cli" ];then + # Install the Netlify CLI using --unsafe-perm=true options to avoid permission issues + npm install -g --unsafe-perm=true $module + else + npm install -g $module + fi +done echo "Creating the symlink for [now] command to vercel CLI" ln -s /usr/local/bin/vercel /usr/local/bin/now @@ -26,4 +40,4 @@ apt-get update # Install yarn apt-get install -y --no-install-recommends yarn -invoke_tests "Tools" "Node.js" +invoke_tests "Node" "Node.js" diff --git a/images/linux/scripts/tests/Node.Tests.ps1 b/images/linux/scripts/tests/Node.Tests.ps1 new file mode 100644 index 000000000000..06790bdf1867 --- /dev/null +++ b/images/linux/scripts/tests/Node.Tests.ps1 @@ -0,0 +1,14 @@ +Describe "Node.js" { + $binaries = @("node") + $module_commands = (Get-ToolsetContent).node_modules | ForEach-Object { $_.command } + $testCases = $binaries + $module_commands | ForEach-Object { @{NodeCommand = $_} } + + It "" -TestCases $testCases { + param ( + [string] $NodeCommand + ) + + "$NodeCommand --version" | Should -ReturnZeroExitCode + } +} + diff --git a/images/linux/scripts/tests/Tools.Tests.ps1 b/images/linux/scripts/tests/Tools.Tests.ps1 index 60372d9cc8b7..d35c7f634978 100644 --- a/images/linux/scripts/tests/Tools.Tests.ps1 +++ b/images/linux/scripts/tests/Tools.Tests.ps1 @@ -313,18 +313,6 @@ Describe "Containers" -Skip:(Test-IsUbuntu16) { } } -Describe "Node.js" { - $testCases = @("node", "grunt", "gulp", "webpack", "parcel", "yarn", "newman", "netlify", "vercel", "now") | ForEach-Object { @{NodeCommand = $_} } - - It "" -TestCases $testCases { - param ( - [string] $NodeCommand - ) - - "$NodeCommand --version" | Should -ReturnZeroExitCode - } -} - Describe "nvm" { It "nvm" { "source /etc/skel/.nvm/nvm.sh && nvm --version" | Should -ReturnZeroExitCode @@ -364,4 +352,4 @@ Describe "Ruby" { "gem list -i '^$gemName$'" | Should -MatchCommandOutput "true" } } -} \ No newline at end of file +} diff --git a/images/linux/toolsets/toolset-1604.json b/images/linux/toolsets/toolset-1604.json index 9774f6566a8d..8c93b4ee89b8 100644 --- a/images/linux/toolsets/toolset-1604.json +++ b/images/linux/toolsets/toolset-1604.json @@ -277,5 +277,47 @@ "8.0" ] }, - "rubygems": [] + "rubygems": [], + "node_modules": [ + { + "name": "grunt", + "command": "grunt" + }, + { + "name": "gulp", + "command": "gulp" + }, + { + "name": "n", + "command": "n" + }, + { + "name": "parcel-bundler", + "command": "parcel" + }, + { + "name": "typescript", + "command": "tsc" + }, + { + "name": "newman", + "command": "newman" + }, + { + "name": "vercel", + "command": "vercel" + }, + { + "name": "webpack", + "command": "webpack" + }, + { + "name": "webpack-cli", + "command": "webpack-cli" + }, + { + "name": "netlify-cli", + "command": "netlify" + } + ] } diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index 2259d938637d..f001f1a2cee5 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -280,5 +280,47 @@ "8.0" ] }, - "rubygems": [] + "rubygems": [], + "node_modules": [ + { + "name": "grunt", + "command": "grunt" + }, + { + "name": "gulp", + "command": "gulp" + }, + { + "name": "n", + "command": "n" + }, + { + "name": "parcel-bundler", + "command": "parcel" + }, + { + "name": "typescript", + "command": "tsc" + }, + { + "name": "newman", + "command": "newman" + }, + { + "name": "vercel", + "command": "vercel" + }, + { + "name": "webpack", + "command": "webpack" + }, + { + "name": "webpack-cli", + "command": "webpack-cli" + }, + { + "name": "netlify-cli", + "command": "netlify" + } + ] } diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index 67f1c31fad9c..3766233dcf09 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -259,5 +259,51 @@ }, "rubygems": [ {"name": "fastlane"} + ], + "node_modules": [ + { + "name": "grunt", + "command": "grunt" + }, + { + "name": "gulp", + "command": "gulp" + }, + { + "name": "n", + "command": "n" + }, + { + "name": "parcel-bundler", + "command": "parcel" + }, + { + "name": "typescript", + "command": "tsc" + }, + { + "name": "newman", + "command": "newman" + }, + { + "name": "vercel", + "command": "vercel" + }, + { + "name": "webpack", + "command": "webpack" + }, + { + "name": "webpack-cli", + "command": "webpack-cli" + }, + { + "name": "netlify-cli", + "command": "netlify" + }, + { + "name": "lerna", + "command": "lerna" + } ] } From 9378641fb453aeb73eacede788040bdabe84ae05 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Sat, 27 Feb 2021 11:45:49 +0300 Subject: [PATCH 0029/3485] [macOS] Stick to go 1.15 (#2795) --- images/macos/provision/configuration/environment/bashrc | 1 - images/macos/provision/core/commonutils.sh | 3 +++ images/macos/toolsets/toolset-10.14.json | 2 +- images/macos/toolsets/toolset-10.15.json | 2 +- images/macos/toolsets/toolset-11.0.json | 2 +- 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/images/macos/provision/configuration/environment/bashrc b/images/macos/provision/configuration/environment/bashrc index 41479806e864..bea64c7e2e8e 100644 --- a/images/macos/provision/configuration/environment/bashrc +++ b/images/macos/provision/configuration/environment/bashrc @@ -16,7 +16,6 @@ export RUNNER_TOOL_CACHE=$HOME/hostedtoolcache export PATH=/Library/Frameworks/Mono.framework/Versions/Current/Commands:$PATH export PATH=$ANDROID_HOME/tools:$ANDROID_HOME/platform-tools:$ANDROID_NDK_HOME:$PATH -export PATH=/usr/local/go/bin:$PATH export PATH=/usr/local/bin:/usr/local/sbin:~/bin:~/.yarn/bin:$PATH export PATH="/usr/local/opt/curl/bin:$PATH" export PATH="/usr/local/opt/ruby@2.7/bin:$PATH" diff --git a/images/macos/provision/core/commonutils.sh b/images/macos/provision/core/commonutils.sh index a13f6a7d167b..9a0376923bb8 100644 --- a/images/macos/provision/core/commonutils.sh +++ b/images/macos/provision/core/commonutils.sh @@ -19,6 +19,9 @@ if is_Less_Catalina; then echo "export USE_BAZEL_VERSION=${USE_BAZEL_VERSION}" >> "${HOME}/.bashrc" fi +# Create a symlink for Go 1.15 to preserve backward compatibility +ln -sf $(brew --prefix go@1.15)/bin/go /usr/local/bin/go + # Invoke bazel to download bazel version via bazelisk bazel diff --git a/images/macos/toolsets/toolset-10.14.json b/images/macos/toolsets/toolset-10.14.json index b8272a20f088..317f7add562e 100644 --- a/images/macos/toolsets/toolset-10.14.json +++ b/images/macos/toolsets/toolset-10.14.json @@ -242,7 +242,7 @@ "gh", "gnupg", "gnu-tar", - "go", + "go@1.15", "helm", "libpq", "llvm", diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index cd498aebe9fd..36b27e6c1fab 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -187,7 +187,7 @@ "gh", "gnupg", "gnu-tar", - "go", + "go@1.15", "helm", "libpq", "llvm", diff --git a/images/macos/toolsets/toolset-11.0.json b/images/macos/toolsets/toolset-11.0.json index f5d52f77138a..e91513c37bbc 100644 --- a/images/macos/toolsets/toolset-11.0.json +++ b/images/macos/toolsets/toolset-11.0.json @@ -120,7 +120,7 @@ "gh", "gnupg", "gnu-tar", - "go", + "go@1.15", "helm", "libpq", "llvm", From 7cb767267ae497874f7b8100342b0d2f0e8e61d0 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Sun, 28 Feb 2021 10:36:00 +0300 Subject: [PATCH 0030/3485] add all Go symlinks (#2798) --- images/macos/provision/core/commonutils.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/macos/provision/core/commonutils.sh b/images/macos/provision/core/commonutils.sh index 9a0376923bb8..550e1abe0832 100644 --- a/images/macos/provision/core/commonutils.sh +++ b/images/macos/provision/core/commonutils.sh @@ -19,8 +19,8 @@ if is_Less_Catalina; then echo "export USE_BAZEL_VERSION=${USE_BAZEL_VERSION}" >> "${HOME}/.bashrc" fi -# Create a symlink for Go 1.15 to preserve backward compatibility -ln -sf $(brew --prefix go@1.15)/bin/go /usr/local/bin/go +# Create symlinks for Go 1.15 to preserve backward compatibility +ln -sf $(brew --prefix go@1.15)/bin/* /usr/local/bin/ # Invoke bazel to download bazel version via bazelisk bazel From 7aabb126ab3ef48054d7f5d20f36758b2c1940cf Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Mon, 1 Mar 2021 10:57:28 +0300 Subject: [PATCH 0031/3485] Revert "[windows] add ip substitution to update-dockerimages (#2611)" (#2805) This reverts commit aa0de6b9cce54cd0e0e3cc12e0276859931e1d92. --- images/win/scripts/Installers/Update-DockerImages.ps1 | 5 ----- 1 file changed, 5 deletions(-) diff --git a/images/win/scripts/Installers/Update-DockerImages.ps1 b/images/win/scripts/Installers/Update-DockerImages.ps1 index 73b9e66c0a80..39279e4f93c3 100644 --- a/images/win/scripts/Installers/Update-DockerImages.ps1 +++ b/images/win/scripts/Installers/Update-DockerImages.ps1 @@ -16,14 +16,9 @@ function DockerPull { } } -# Temporary replace ip for download server to the more stable one -Copy-Item -Path "$env:windir\System32\drivers\etc\hosts" -Destination "C:\hosts_backup" -Verbose -"40.71.10.214 mcr.microsoft.com" >> "$env:windir\System32\drivers\etc\hosts" - $dockerToolset = (Get-ToolsetContent).docker foreach($dockerImage in $dockerToolset.images) { DockerPull $dockerImage } -Move-Item -Path "C:\hosts_backup" -Destination "$env:windir\System32\drivers\etc\hosts" -Force -Verbose Invoke-PesterTests -TestFile "Docker" -TestName "DockerImages" \ No newline at end of file From 56674f9e57dd6cdef55365ddea2d3c60a9672b08 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 1 Mar 2021 10:52:07 +0000 Subject: [PATCH 0032/3485] Updating readme file for win19 version 20210219.1 (#2768) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/win/Windows2019-Readme.md | 99 ++++++++++++++++---------------- 1 file changed, 50 insertions(+), 49 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index 243c24abd498..53e0468b427d 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -1,13 +1,12 @@ | Announcements | |-| +| [[ubuntu, windows] GOROOT environment variable will be removed on March, 1](https://github.com/actions/virtual-environments/issues/2683) | | [[Windows, Ubuntu] Boost 1.72.0 will be removed from images on March, 8](https://github.com/actions/virtual-environments/issues/2667) | -| [[ubuntu, windows] Default Go version will be set to 1.15 on February, 8](https://github.com/actions/virtual-environments/issues/2447) | -| [[all OSs] Java 7 will be removed from images on February, 8.](https://github.com/actions/virtual-environments/issues/2446) | -| [[Windows] Default PHP is set to 8.0](https://github.com/actions/virtual-environments/issues/2416) | +| [[Ubuntu, windows] M2_HOME variable will be removed on February, 15](https://github.com/actions/virtual-environments/issues/2600) | *** # Microsoft Windows Server 2019 Datacenter - OS Version: 10.0.17763 Build 1757 -- Image Version: 20210211.1 +- Image Version: 20210219.1 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -33,7 +32,7 @@ - pip 21.0.1 (python 3.7) - Pipx 0.16.0.0 - RubyGems 2.7.6.2 -- Vcpkg (build from master \<56136ff>) +- Vcpkg (build from master \<99dc49d>) - Yarn 1.22.10 #### Environment variables @@ -52,28 +51,28 @@ - 7zip 19.00 - azcopy 10.8.0 - Bazel 4.0.0 -- Bazelisk 1.7.3 +- Bazelisk 1.7.5 - Cabal 3.2.0.0 -- CMake 3.19.4 +- CMake 3.19.5 - CodeQL Action Bundle 2.4.2 - Docker 19.03.14 - Docker-compose 1.27.4 -- ghc 8.10.4 +- ghc 8.10.3 - Git 2.30.1 - Git LFS 2.13.2 -- Google Cloud SDK 327.0.0 +- Google Cloud SDK 328.0.0 - InnoSetup 6.1.2 - jq 1.6 - Kind 0.10.0 -- Kubectl 1.20.2 +- Kubectl 1.20.4 - Mercurial 5.0 - Mingw-w64 8.1.0 - Newman 5.2.2 - NSIS v3.06.1 - OpenSSL 1.1.1 -- Packer 1.6.6 -- Pulumi v2.20.0 -- R 4.0.3 +- Packer 1.7.0 +- Pulumi v2.21.1 +- R 4.0.4 - Stack 2.5.1 - Subversion (SVN) 1.14.1 - VSWhere 2.8.4 @@ -82,21 +81,21 @@ - zstd 1.4.5 ### CLI Tools -- Alibaba Cloud CLI 3.0.72 -- AWS CLI 2.1.25 -- AWS SAM CLI 1.18.0 +- Alibaba Cloud CLI 3.0.73 +- AWS CLI 2.1.27 +- AWS SAM CLI 1.18.2 - AWS Session Manager CLI 1.2.54.0 - Azure CLI 2.19.1 - Azure Dev Spaces CLI 1.0.20201219.2 - Azure DevOps CLI extension 0.18.0 - Cloud Foundry CLI 6.53.0 -- GitHub CLI 1.5.0 +- GitHub CLI 1.6.1 - Hub CLI 2.14.2 ### Rust Tools -- Cargo 1.49.0 -- Rust 1.49.0 -- Rustdoc 1.49.0 +- Cargo 1.50.0 +- Rust 1.50.0 +- Rustdoc 1.50.0 - Rustup 1.23.1 #### Packages @@ -105,13 +104,13 @@ - cargo-outdated v0.9.14 - cbindgen 0.17.0 - Clippy 0.0.212 -- Rustfmt 1.4.25 +- Rustfmt 1.4.30 ### Browsers and webdrivers -- Google Chrome 88.0.4324.150 +- Google Chrome 88.0.4324.182 - Chrome Driver 88.0.4324.96 -- Microsoft Edge 88.0.705.63 -- Microsoft Edge Driver 88.0.705.63 +- Microsoft Edge 88.0.705.74 +- Microsoft Edge Driver 88.0.705.74 - Mozilla Firefox 85.0.2 - Gecko Driver 0.29.0 - IE Driver 3.150.1.0 @@ -173,13 +172,14 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | 1.13.15 | x64 | GOROOT_1_13_X64 | | 1.14.15 | x64 | GOROOT_1_14_X64 | | 1.15.8 (Default) | x64 | GOROOT_1_15_X64 | +| 1.16.0 | x64 | GOROOT_1_16_X64 | #### Node | Version | Architecture | | ------- | ------------ | | 10.23.3 | x64 | -| 12.20.1 | x64 | +| 12.20.2 | x64 | | 14.15.5 | x64 | @@ -209,6 +209,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | -------------- | ------------ | ------------ | | 2.7.18 | x86 | PyPy 7.3.3 with MSC v.1927 32 bit | | 3.6.12 | x86 | PyPy 7.3.3 with MSC v.1927 32 bit | +| 3.7.9 | x86 | PyPy 7.3.3-beta0 with MSC v.1927 32 bit | @@ -217,7 +218,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Property | Value | | -------------------- | ------------------------------------------------------------------------------------------------------------------------------------ | | ServiceName | postgresql-x64-13 | -| Version | 13.1 | +| Version | 13.2 | | ServiceStatus | Stopped | | ServiceStartType | Disabled | | EnvironmentVariables | PGBIN=C:\Program Files\PostgreSQL\13\bin
PGDATA=C:\Program Files\PostgreSQL\13\data
PGROOT=C:\Program Files\PostgreSQL\13 | @@ -229,7 +230,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### MongoDB | Version | ServiceName | ServiceStatus | ServiceStartType | | ------- | ----------- | ------------- | ---------------- | -| 4.4.3.0 | MongoDB | Running | Automatic | +| 4.4.4.0 | MongoDB | Running | Automatic | @@ -244,7 +245,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Name | Version | ConfigFile | ServiceName | ServiceStatus | ListenPort | | ------ | ------- | ------------------------------------- | ----------- | ------------- | ---------- | | Apache | 2.4.46 | C:\tools\Apache24\conf\httpd.conf | Apache | Stopped | 80 | -| Nginx | 1.19.6 | C:\tools\nginx-1.19.6\conf\nginx.conf | nginx | Stopped | 80 | +| Nginx | 1.19.7 | C:\tools\nginx-1.19.7\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2019 | Name | Version | Path | @@ -522,14 +523,14 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 4.7.2 4.8 ### PowerShell Tools -- PowerShell 7.1.1 +- PowerShell 7.1.2 #### 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
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_\ | +| 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
5.5.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'. @@ -548,20 +549,20 @@ All other versions are saved but not installed. | VSSetup | 2.2.16 | ### Android -| Package Name | Version | -| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 3.0 | -| Android SDK Build-tools | 30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3
26.0.0 26.0.1 26.0.2 26.0.3
25.0.0 25.0.1 25.0.2 25.0.3
24.0.0 24.0.1 24.0.2 24.0.3
23.0.1 23.0.2 23.0.3
22.0.1
21.1.2
20.0.0
19.1.0 | -| 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 Platform-Tools | 30.0.5 | -| Android SDK Tools | 26.1.1 | -| Android Support Repository | 47.0.0 | -| CMake | 3.10.2
3.6.4111459 | -| Google APIs | addon-google_apis-google-21
addon-google_apis-google-22
addon-google_apis-google-23
addon-google_apis-google-24 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 21.4.7075529
22.0.7026061 | -| SDK Patch Applier v4 | 1 | +| Package Name | Version | +| -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 3.0 | +| Android SDK Build-tools | 30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3
26.0.0 26.0.1 26.0.2 26.0.3
25.0.0 25.0.1 25.0.2 25.0.3
24.0.0 24.0.1 24.0.2 24.0.3
23.0.1 23.0.2 23.0.3
22.0.1
21.1.2
20.0.0
19.1.0 | +| Android SDK Platforms | android-S (rev 1)
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 Platform-Tools | 31.0.0 | +| Android SDK Tools | 26.1.1 | +| Android Support Repository | 47.0.0 | +| CMake | 3.10.2 | +| Google APIs | addon-google_apis-google-21
addon-google_apis-google-22
addon-google_apis-google-23
addon-google_apis-google-24 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 21.4.7075529
22.0.7026061 | +| SDK Patch Applier v4 | 1 | #### Environment variables | Name | Value | @@ -578,8 +579,8 @@ All other versions are saved but not installed. | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | | mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:9dc74a74989c1ffd1af73a4eccc5ddeda00622c1ee52bdca4f3722c3dc3f2753 | 2021-02-09 | | mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:ba9d68e558eef54f00978e70e8adcae4e68a15681227d466fc6d148fa3a927c1 | 2021-02-09 | -| mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:1ed72e74ffe1fd07eef2df3eb9a5d57f64fdac099329a4a63aa1a99b4139ce5a | 2021-02-06 | | mcr.microsoft.com/windows/nanoserver:1809 | sha256:a359daf59359fa1d1b7eb105aaa9508a779d942381d7b7329655bb58ce9f9101 | 2021-02-02 | +| mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:1ed72e74ffe1fd07eef2df3eb9a5d57f64fdac099329a4a63aa1a99b4139ce5a | 2021-02-06 | | microsoft/aspnetcore-build:1.0-2.0 | sha256:9ecc7c5a8a7a11dca5f08c860165646cb30d084606360a3a72b9cbe447241c0c | 2018-08-15 | From f534484cccc12e73d3a8108329e90d3d93e61b05 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 1 Mar 2021 14:34:18 +0000 Subject: [PATCH 0033/3485] Updating readme file for win16 version 20210219.1 (#2769) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/win/Windows2016-Readme.md | 136 ++++++++++++++++--------------- 1 file changed, 69 insertions(+), 67 deletions(-) diff --git a/images/win/Windows2016-Readme.md b/images/win/Windows2016-Readme.md index e128faa7622d..d1318350d4c9 100644 --- a/images/win/Windows2016-Readme.md +++ b/images/win/Windows2016-Readme.md @@ -1,20 +1,19 @@ | Announcements | |-| +| [[ubuntu, windows] GOROOT environment variable will be removed on March, 1](https://github.com/actions/virtual-environments/issues/2683) | | [[Windows, Ubuntu] Boost 1.72.0 will be removed from images on March, 8](https://github.com/actions/virtual-environments/issues/2667) | -| [[ubuntu, windows] Default Go version will be set to 1.15 on February, 8](https://github.com/actions/virtual-environments/issues/2447) | -| [[all OSs] Java 7 will be removed from images on February, 8.](https://github.com/actions/virtual-environments/issues/2446) | -| [[Windows] Default PHP is set to 8.0](https://github.com/actions/virtual-environments/issues/2416) | +| [[Ubuntu, windows] M2_HOME variable will be removed on February, 15](https://github.com/actions/virtual-environments/issues/2600) | *** # Microsoft Windows Server 2016 Datacenter -- OS Version: 10.0.14393 Build 4169 -- Image Version: 20210209.1 +- OS Version: 10.0.14393 Build 4225 +- Image Version: 20210219.1 ## Installed Software ### Language and Runtime - Bash 4.4.23(1)-release - Go 1.15.8 - Julia 1.5.3 -- Node 14.15.4 +- Node 14.15.5 - Perl 5.32.1 - PHP 8.0.1 - Python 3.7.9 @@ -25,12 +24,12 @@ - Composer 2.0.9 - Helm 3.5.2 - Miniconda 4.9.2 -- NPM 6.14.10 +- NPM 6.14.11 - NuGet 5.8.1.7021 - pip 21.0.1 (python 3.7) - Pipx 0.16.0.0 - RubyGems 2.7.6.2 -- Vcpkg (build from master \) +- Vcpkg (build from master \<99dc49d>) - Yarn 1.22.10 #### Environment variables @@ -49,51 +48,51 @@ - 7zip 19.00 - azcopy 10.8.0 - Bazel 4.0.0 -- Bazelisk 1.7.3 +- Bazelisk 1.7.5 - Cabal 3.2.0.0 -- CMake 3.19.4 +- CMake 3.19.5 - CodeQL Action Bundle 2.4.2 - Docker 19.03.14 - Docker-compose 1.27.4 -- ghc 8.10.4 -- Git 2.30.0 +- ghc 8.10.3 +- Git 2.30.1 - Git LFS 2.13.2 -- Google Cloud SDK 326.0.0 +- Google Cloud SDK 328.0.0 - InnoSetup 6.1.2 - jq 1.6 - Kind 0.10.0 -- Kubectl 1.20.2 +- Kubectl 1.20.4 - Mercurial 5.0 - Mingw-w64 8.1.0 - Newman 5.2.2 - NSIS v3.06.1 - OpenSSL 1.1.1 -- Packer 1.6.6 -- Pulumi v2.20.0 -- R 4.0.3 +- Packer 1.7.0 +- Pulumi v2.21.1 +- R 4.0.4 - Stack 2.5.1 -- Subversion (SVN) 1.14.0 +- Subversion (SVN) 1.14.1 - VSWhere 2.8.4 - WinAppDriver 1.2.2009.02003 - yamllint 1.26.0 - zstd 1.4.5 ### CLI Tools -- Alibaba Cloud CLI 3.0.71 -- AWS CLI 2.1.24 -- AWS SAM CLI 1.17.0 +- Alibaba Cloud CLI 3.0.73 +- AWS CLI 2.1.27 +- AWS SAM CLI 1.18.2 - AWS Session Manager CLI 1.2.54.0 -- Azure CLI 2.18.0 +- Azure CLI 2.19.1 - Azure Dev Spaces CLI 1.0.20201219.2 - Azure DevOps CLI extension 0.18.0 - Cloud Foundry CLI 6.53.0 -- GitHub CLI 1.5.0 +- GitHub CLI 1.6.1 - Hub CLI 2.14.2 ### Rust Tools -- Cargo 1.49.0 -- Rust 1.49.0 -- Rustdoc 1.49.0 +- Cargo 1.50.0 +- Rust 1.50.0 +- Rustdoc 1.50.0 - Rustup 1.23.1 #### Packages @@ -102,14 +101,14 @@ - cargo-outdated v0.9.14 - cbindgen 0.17.0 - Clippy 0.0.212 -- Rustfmt 1.4.25 +- Rustfmt 1.4.30 ### Browsers and webdrivers -- Google Chrome 88.0.4324.150 +- Google Chrome 88.0.4324.182 - Chrome Driver 88.0.4324.96 -- Microsoft Edge 88.0.705.63 -- Microsoft Edge Driver 88.0.705.63 -- Mozilla Firefox 85.0.1 +- Microsoft Edge 88.0.705.74 +- Microsoft Edge Driver 88.0.705.74 +- Mozilla Firefox 85.0.2 - Gecko Driver 0.29.0 - IE Driver 3.150.1.0 @@ -167,14 +166,15 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | 1.13.15 | x64 | GOROOT_1_13_X64 | | 1.14.15 | x64 | GOROOT_1_14_X64 | | 1.15.8 (Default) | x64 | GOROOT_1_15_X64 | +| 1.16.0 | x64 | GOROOT_1_16_X64 | #### Node | Version | Architecture | | ------- | ------------ | -| 10.23.2 | x64 | -| 12.20.1 | x64 | -| 14.15.4 | x64 | +| 10.23.3 | x64 | +| 12.20.2 | x64 | +| 14.15.5 | x64 | #### Python @@ -203,6 +203,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | -------------- | ------------ | ------------ | | 2.7.18 | x86 | PyPy 7.3.3 with MSC v.1927 32 bit | | 3.6.12 | x86 | PyPy 7.3.3 with MSC v.1927 32 bit | +| 3.7.9 | x86 | PyPy 7.3.3-beta0 with MSC v.1927 32 bit | @@ -211,7 +212,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Property | Value | | -------------------- | ------------------------------------------------------------------------------------------------------------------------------------ | | ServiceName | postgresql-x64-13 | -| Version | 13.1 | +| Version | 13.2 | | ServiceStatus | Stopped | | ServiceStartType | Disabled | | EnvironmentVariables | PGBIN=C:\Program Files\PostgreSQL\13\bin
PGDATA=C:\Program Files\PostgreSQL\13\data
PGROOT=C:\Program Files\PostgreSQL\13 | @@ -223,7 +224,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### MongoDB | Version | ServiceName | ServiceStatus | ServiceStartType | | ------- | ----------- | ------------- | ---------------- | -| 4.4.3.0 | MongoDB | Running | Automatic | +| 4.4.4.0 | MongoDB | Running | Automatic | @@ -238,12 +239,12 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Name | Version | ConfigFile | ServiceName | ServiceStatus | ListenPort | | ------ | ------- | ------------------------------------- | ----------- | ------------- | ---------- | | Apache | 2.4.46 | C:\tools\Apache24\conf\httpd.conf | Apache | Stopped | 80 | -| Nginx | 1.19.6 | C:\tools\nginx-1.19.6\conf\nginx.conf | nginx | Stopped | 80 | +| Nginx | 1.19.7 | C:\tools\nginx-1.19.7\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2017 | Name | Version | Path | | ----------------------------- | --------------- | -------------------------------------------------------------- | -| Visual Studio Enterprise 2017 | 15.9.28307.1342 | C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise | +| Visual Studio Enterprise 2017 | 15.9.28307.1401 | C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise | #### Workloads, components and extensions: @@ -512,20 +513,20 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### .NET Core SDK `Location C:\Program Files\dotnet\sdk` -- 1.1.14 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.519 2.1.520 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.616 2.1.617 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 2.1.811 2.1.812 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.109 3.1.110 3.1.111 3.1.200 3.1.201 3.1.202 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402 3.1.403 3.1.404 3.1.405 5.0.100 5.0.101 5.0.102 +- 1.1.14 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.519 2.1.520 2.1.521 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.616 2.1.617 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 2.1.811 2.1.812 2.1.813 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.109 3.1.110 3.1.111 3.1.112 3.1.200 3.1.201 3.1.202 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402 3.1.403 3.1.404 3.1.405 3.1.406 5.0.100 5.0.101 5.0.102 5.0.103 ### .NET Core Runtime `Location: C:\Program Files\dotnet\shared\Microsoft.AspNetCore.All` -- 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23 2.1.24 +- 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23 2.1.24 2.1.25 `Location: C:\Program Files\dotnet\shared\Microsoft.AspNetCore.App` -- 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23 2.1.24 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9 3.1.10 3.1.11 5.0.0 5.0.1 5.0.2 +- 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23 2.1.24 2.1.25 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9 3.1.10 3.1.11 3.1.12 5.0.0 5.0.1 5.0.2 5.0.3 `Location: C:\Program Files\dotnet\shared\Microsoft.NETCore.App` -- 1.0.16 1.1.13 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23 2.1.24 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9 3.1.10 3.1.11 5.0.0 5.0.1 5.0.2 +- 1.0.16 1.1.13 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23 2.1.24 2.1.25 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9 3.1.10 3.1.11 3.1.12 5.0.0 5.0.1 5.0.2 5.0.3 `Location: C:\Program Files\dotnet\shared\Microsoft.WindowsDesktop.App` -- 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9 3.1.10 3.1.11 5.0.0 5.0.1 5.0.2 +- 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9 3.1.10 3.1.11 3.1.12 5.0.0 5.0.1 5.0.2 5.0.3 ### .NET Framework `Type: Developer Pack` @@ -533,14 +534,14 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 4.6.1 4.6.2 4.7 4.7.1 4.7.2 4.8 ### PowerShell Tools -- PowerShell 7.1.1 +- PowerShell 7.1.2 #### 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
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_\ | +| 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
5.5.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'. @@ -553,25 +554,26 @@ All other versions are saved but not installed. | MarkdownPS | 1.9 | | Pester | 3.4.0
5.1.1 | | PowerShellGet | 1.0.0.1
2.2.5 | +| PSScriptAnalyzer | 1.19.1 | | PSWindowsUpdate | 2.2.0.2 | | SqlServer | 21.1.18235 | | VSSetup | 2.2.16 | ### Android -| Package Name | Version | -| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 3.0 | -| Android SDK Build-tools | 30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3
26.0.0 26.0.1 26.0.2 26.0.3
25.0.0 25.0.1 25.0.2 25.0.3
24.0.0 24.0.1 24.0.2 24.0.3
23.0.1 23.0.2 23.0.3
22.0.1
21.1.2
20.0.0
19.1.0 | -| 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 Platform-Tools | 30.0.5 | -| Android SDK Tools | 25.2.5 | -| Android Support Repository | 47.0.0 | -| CMake | 3.10.2
3.6.4111459 | -| Google APIs | addon-g..._apis-google-21
addon-g..._apis-google-22
addon-g..._apis-google-23
addon-g..._apis-google-24
a...google_apis | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 21.4.7075529
22.0.7026061 | -| SDK Patch Applier v4 | 1 | +| Package Name | Version | +| -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 3.0 | +| Android SDK Build-tools | 30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3
26.0.0 26.0.1 26.0.2 26.0.3
25.0.0 25.0.1 25.0.2 25.0.3
24.0.0 24.0.1 24.0.2 24.0.3
23.0.1 23.0.2 23.0.3
22.0.1
21.1.2
20.0.0
19.1.0 | +| Android SDK Platforms | android-S (rev 1)
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 Platform-Tools | 31.0.0 | +| Android SDK Tools | 25.2.5 | +| Android Support Repository | 47.0.0 | +| CMake | 3.10.2 | +| Google APIs | addon-g..._apis-google-21
addon-g..._apis-google-22
addon-g..._apis-google-23
addon-g..._apis-google-24
a...google_apis | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 21.4.7075529
22.0.7026061 | +| SDK Patch Applier v4 | 1 | #### Environment variables | Name | Value | @@ -586,11 +588,11 @@ All other versions are saved but not installed. ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2016 | sha256:a9788334a8de8d1f3c099252e7894e7606dcc70101674bd89324fa434fbdf002 | 2021-01-12 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2016 | sha256:07a9ff94ca6ebe868a7b39d65ab6a14ac8bb362cb7b0699db4c92a7f7b01b081 | 2021-01-12 | -| mcr.microsoft.com/windows/servercore:ltsc2016 | sha256:dba071bba037bd9f04e3d2c8f1412b78f7578b81aab4791f7a3efdbda5a7b667 | 2021-01-07 | -| microsoft/aspnetcore-build:1.0-2.0 | sha256:9ecc7c5a8a7a11dca5f08c860165646cb30d084606360a3a72b9cbe447241c0c | 2018-08-15 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2016 | sha256:43b16c243b0f800dad496e54115d3f8ef292b8dd8b6a2228c59c1d8d44d40b10 | 2021-02-09 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2016 | sha256:32bf9e7181883f328e4ab3ff62430565676429ee81f503a6470fc5d5ab2e6997 | 2021-02-09 | | mcr.microsoft.com/windows/nanoserver:10.0.14393.953 | sha256:fc60bd5ae0e61b334ce1cf1bcbf20c10c36b4c5482a01da319c9c989f9e6e268 | 2017-03-08 | +| mcr.microsoft.com/windows/servercore:ltsc2016 | sha256:544eb9c255a6cbc5b4121217462c4dcb20fb95cd666d132ee72d5cf35cfa1fc8 | 2021-01-27 | +| microsoft/aspnetcore-build:1.0-2.0 | sha256:9ecc7c5a8a7a11dca5f08c860165646cb30d084606360a3a72b9cbe447241c0c | 2018-08-15 | From ff72158a2a30de91c925a392694e8195c1ae994f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 3 Mar 2021 09:17:10 +0000 Subject: [PATCH 0034/3485] Updating readme file for macOS-11.0 version 20210302.1 (#2824) Co-authored-by: Image generation service account --- images/macos/macos-11.0-Readme.md | 73 +++++++++++++++---------------- 1 file changed, 36 insertions(+), 37 deletions(-) diff --git a/images/macos/macos-11.0-Readme.md b/images/macos/macos-11.0-Readme.md index d11ebfdef076..188f00c5a9b5 100644 --- a/images/macos/macos-11.0-Readme.md +++ b/images/macos/macos-11.0-Readme.md @@ -1,17 +1,16 @@ | Announcements | |-| -| [[macOS] Default Xcode will be set to Xcode 12.4 on February, 22](https://github.com/actions/virtual-environments/issues/2685) | | [[Ubuntu, macOS] .NET 3.0 will be removed from images on March, 1](https://github.com/actions/virtual-environments/issues/2558) | | [macOS 11.0 pools will be transited to private preview.](https://github.com/actions/virtual-environments/issues/2486) | *** # macOS 11.2 info - System Version: macOS 11.2 (20D64) - Kernel Version: Darwin 20.3.0 -- Image Version: 20210219.1 +- Image Version: 20210302.1 ## Installed Software ### Language and Runtime -- .NET SDK 2.1.300 2.1.301 2.1.302 2.1.401 2.1.402 2.1.403 2.1.500 2.1.502 2.1.503 2.1.504 2.1.505 2.1.506 2.1.507 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 2.1.811 2.1.812 2.1.813 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 3.1.403 3.1.404 3.1.405 3.1.406 5.0.100 5.0.101 5.0.102 5.0.103 +- .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 2.1.811 2.1.812 2.1.813 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 3.1.403 3.1.404 3.1.405 3.1.406 5.0.100 5.0.101 5.0.102 5.0.200 - Bash 3.2.57(1)-release - Clang/LLVM 11.1.0 is available on `'$(brew --prefix llvm)/bin/clang'` - Clang/LLVM 12.0.0 is default @@ -23,29 +22,29 @@ - GNU Fortran (Homebrew GCC 9.3.0_1) 9.3.0 - available by `gfortran-9` alias - Go 1.15.8 - julia 1.5.3 -- Node.js v14.15.5 -- NVM - Cached node versions: v10.23.3 v12.20.2 v14.15.5 +- Node.js v14.16.0 +- NVM - Cached node versions: v10.24.0 v12.21.0 v14.16.0 - NVM 0.37.2 - Perl 5.32.1 - PHP 8.0.2 - Python 2.7.18 -- Python 3.9.1 +- Python 3.9.2 - Ruby 2.7.2p137 ### Package Management -- Bundler version 2.2.11 +- Bundler version 2.2.12 - Carthage 0.37.0 - CocoaPods 1.10.1 -- Composer 2.0.9 -- Homebrew 3.0.1 +- Composer 2.0.11 +- Homebrew 3.0.4 - Miniconda 4.9.2 - NPM 6.14.11 - NuGet 5.6.0.6489 - Pip 20.3.4 (python 2.7) - Pip 21.0.1 (python 3.9) -- Pipx 0.16.0.0 -- RubyGems 3.2.11 -- Vcpkg 2021 (build from master \<8ede7e8>) +- Pipx 0.16.1.0 +- RubyGems 3.2.12 +- Vcpkg 2021 (build from master \<395cb68>) - Yarn 1.22.5 #### Environment variables @@ -57,19 +56,19 @@ ### Project Management - Apache Ant(TM) 1.10.9 - Apache Maven 3.6.3 -- Gradle 6.8.2 +- Gradle 6.8.3 ### Utilities -- 7-Zip 16.02 +- 7-Zip 17.03 - aria2 1.35.0 -- azcopy 10.8.0 +- azcopy 10.9.0 - bazel 4.0.0 - bazelisk 1.7.5 - bsdtar 3.3.2 - available by 'tar' alias - Curl 7.75.0 - Git LFS: 2.13.2 - Git: 2.30.1 -- GitHub CLI: 1.6.1 +- GitHub CLI: 1.6.2 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.1 - gpg (GnuPG) 2.2.27 @@ -90,15 +89,15 @@ ### Tools - Aliyun CLI 3.0.73 - App Center CLI 2.7.4 -- AWS CLI 2.1.27 -- AWS SAM CLI 1.18.1 +- AWS CLI 2.1.29 +- AWS SAM CLI 1.19.1 - AWS Session Manager CLI 1.2.30.0 -- Azure CLI 2.19.1 -- Cabal 3.2.0.0 -- Cmake 3.19.5 -- Fastlane 2.175.0 +- Azure CLI 2.20.0 +- Cabal 3.4.0.0 +- Cmake 3.19.6 +- Fastlane 2.176.0 - GHC 9.0.1 -- GHCup v0.1.12 +- GHCup v0.1.13 - Stack 2.5.1 - Xcode Command Line Tools 12.4.0.0.1.1610135815 @@ -109,11 +108,11 @@ ### Browsers - Safari 14.0.3 (16610.4.3.1.4) - SafariDriver 14.0.3 (16610.4.3.1.4) -- Google Chrome 88.0.4324.182 +- Google Chrome 89.0.4389.72 - ChromeDriver 88.0.4324.96 -- Microsoft Edge 88.0.705.74 -- MSEdgeDriver 88.0.705.74 -- Mozilla Firefox 85.0.2 +- Microsoft Edge 88.0.705.81 +- MSEdgeDriver 88.0.705.81 +- Mozilla Firefox 86.0 - geckodriver 0.29.0 #### Environment variables @@ -139,13 +138,13 @@ #### Python - 3.7.10 -- 3.8.7 -- 3.9.1 +- 3.8.8 +- 3.9.2 #### Node.js -- 10.23.3 -- 12.20.2 -- 14.15.5 +- 10.24.0 +- 12.21.0 +- 14.16.0 #### Go - 1.15.8 @@ -161,7 +160,7 @@ - Bindgen 0.57.0 - Cargo-audit 0.13.1 - Cargo-outdated v0.9.14 -- Cbindgen 0.17.0 +- Cbindgen 0.18.0 - Clippy 0.0.212 - Rustfmt 1.4.30-stable @@ -184,7 +183,7 @@ ### Xamarin #### Visual Studio for Mac -- 8.8.9.10 +- 8.8.10.2 #### Mono - 6.12.0.122 @@ -199,7 +198,7 @@ - 13.20.2.2 #### Xamarin.Mac -- 7.4.0.4 +- 7.4.0.10 - 7.2.0.3 - 7.0.0.15 - 6.22.1.26 @@ -215,7 +214,7 @@ ### Xcode | Version | Build | Path | | -------------- | -------- | ---------------------------- | -| 12.5 (beta) | 12E5234g | /Applications/Xcode_12.5.app | +| 12.5 (beta) | 12E5244e | /Applications/Xcode_12.5.app | | 12.4 (default) | 12D4e | /Applications/Xcode_12.4.app | | 12.3 | 12C33 | /Applications/Xcode_12.3.app | | 12.2 | 12B45b | /Applications/Xcode_12.2.app | @@ -284,7 +283,7 @@ | Package Name | Version | | -------------------------- | ------------------------------------------------------------------------------------------------------------------------ | | Android Command Line Tools | 3.0 | -| Android Emulator | 30.3.5 | +| Android Emulator | 30.4.5 | | Android SDK Build-tools | 30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3 | | Android SDK Platforms | android-S (rev 1)
android-30 (rev 3)
android-29 (rev 5)
android-28 (rev 6)
android-27 (rev 3) | | Android SDK Platform-Tools | 31.0.0 | From e7e66bec698639dd23599e311acc3dd82b3c9948 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Wed, 3 Mar 2021 17:45:01 +0300 Subject: [PATCH 0035/3485] [Ubuntu] Add a file with global user-related variables and point BASH_ENV variable to it (#2826) * Add global vars to profile.d * set BASH_ENV var * fix comment * remove extra quotes --- images/linux/scripts/installers/configure-environment.sh | 7 ++++++- images/linux/scripts/installers/dotnetcore-sdk.sh | 3 +-- images/linux/scripts/installers/nvm.sh | 2 +- images/linux/scripts/installers/php.sh | 5 +---- images/linux/scripts/installers/python.sh | 2 +- 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/images/linux/scripts/installers/configure-environment.sh b/images/linux/scripts/installers/configure-environment.sh index 9ce7fe9fa14d..e1cc0a0f2e10 100644 --- a/images/linux/scripts/installers/configure-environment.sh +++ b/images/linux/scripts/installers/configure-environment.sh @@ -4,9 +4,14 @@ echo ImageVersion=$IMAGE_VERSION | tee -a /etc/environment echo ImageOS=$IMAGE_OS | tee -a /etc/environment +# Create a file to store user-related global environment variables +touch /etc/profile.d/env_vars.sh +# Set BASH_ENV variable pointed to the file with user-related global environment variables for non-interactive sessions +echo "BASH_ENV=/etc/profile.d/env_vars.sh" | tee -a /etc/environment + # This directory is supposed to be created in $HOME and owned by user(https://github.com/actions/virtual-environments/issues/491) mkdir -p /etc/skel/.config/configstore -echo 'export XDG_CONFIG_HOME=$HOME/.config' | tee -a /etc/skel/.bashrc +echo 'export XDG_CONFIG_HOME=$HOME/.config' | tee -a /etc/profile.d/env_vars.sh # Change waagent entries to use /mnt for swapfile sed -i 's/ResourceDisk.Format=n/ResourceDisk.Format=y/g' /etc/waagent.conf diff --git a/images/linux/scripts/installers/dotnetcore-sdk.sh b/images/linux/scripts/installers/dotnetcore-sdk.sh index 5acae9c2767e..e187d9fa70f9 100644 --- a/images/linux/scripts/installers/dotnetcore-sdk.sh +++ b/images/linux/scripts/installers/dotnetcore-sdk.sh @@ -89,7 +89,6 @@ done setEtcEnvironmentVariable DOTNET_SKIP_FIRST_TIME_EXPERIENCE 1 setEtcEnvironmentVariable DOTNET_NOLOGO 1 setEtcEnvironmentVariable DOTNET_MULTILEVEL_LOOKUP 0 -prependEtcEnvironmentPath /home/runner/.dotnet/tools -echo 'export PATH="$PATH:$HOME/.dotnet/tools"' | tee -a /etc/skel/.bashrc +echo 'export PATH=$PATH:$HOME/.dotnet/tools' | tee -a /etc/profile.d/env_vars.sh invoke_tests "DotnetSDK" \ No newline at end of file diff --git a/images/linux/scripts/installers/nvm.sh b/images/linux/scripts/installers/nvm.sh index 36b5e7916a5e..4962ea8190d6 100644 --- a/images/linux/scripts/installers/nvm.sh +++ b/images/linux/scripts/installers/nvm.sh @@ -8,7 +8,7 @@ export NVM_DIR="/etc/skel/.nvm" mkdir $NVM_DIR VERSION=$(curl -s https://api.github.com/repos/nvm-sh/nvm/releases/latest | jq -r '.tag_name') curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/$VERSION/install.sh | bash -echo 'export NVM_DIR=$HOME/.nvm' | tee -a /etc/skel/.bash_profile +echo 'export NVM_DIR=$HOME/.nvm' | tee -a /etc/profile.d/env_vars.sh echo '[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm' | tee -a /etc/skel/.bash_profile [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" diff --git a/images/linux/scripts/installers/php.sh b/images/linux/scripts/installers/php.sh index 10c6a2938c0d..4fa0936db930 100644 --- a/images/linux/scripts/installers/php.sh +++ b/images/linux/scripts/installers/php.sh @@ -88,11 +88,8 @@ php composer-setup.php sudo mv composer.phar /usr/bin/composer php -r "unlink('composer-setup.php');" -# Update /etc/environment -prependEtcEnvironmentPath /home/runner/.config/composer/vendor/bin - # Add composer bin folder to path -echo 'export PATH="$PATH:$HOME/.config/composer/vendor/bin"' >> /etc/skel/.bashrc +echo 'export PATH=$PATH:$HOME/.config/composer/vendor/bin' | tee -a /etc/profile.d/env_vars.sh #Create composer folder for user to preserve folder permissions mkdir -p /etc/skel/.composer diff --git a/images/linux/scripts/installers/python.sh b/images/linux/scripts/installers/python.sh index 193d810b8bbc..1cd705d8b9a4 100644 --- a/images/linux/scripts/installers/python.sh +++ b/images/linux/scripts/installers/python.sh @@ -41,6 +41,6 @@ if isUbuntu18 || isUbuntu20 ; then fi # Adding this dir to PATH will make installed pip commands are immediately available. -echo 'export PATH="$PATH:$HOME/.local/bin"' | tee -a /etc/skel/.bashrc +echo 'export PATH=$PATH:$HOME/.local/bin' | tee -a /etc/profile.d/env_vars.sh invoke_tests "Tools" "Python" From b0e4215cfab0e36f966f857fc11b5423e2b65cf9 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 4 Mar 2021 10:10:45 +0000 Subject: [PATCH 0036/3485] Updating readme file for ubuntu16 version 20210302.0 (#2813) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/linux/Ubuntu1604-README.md | 110 +++++++++++++++--------------- 1 file changed, 54 insertions(+), 56 deletions(-) diff --git a/images/linux/Ubuntu1604-README.md b/images/linux/Ubuntu1604-README.md index efb59eee47a9..4dbdafb269dc 100644 --- a/images/linux/Ubuntu1604-README.md +++ b/images/linux/Ubuntu1604-README.md @@ -4,12 +4,11 @@ | [[ubuntu, windows] GOROOT environment variable will be removed on March, 1](https://github.com/actions/virtual-environments/issues/2683) | | [[Ubuntu] Android SDK Platforms and Build-tools that are less than version 23 will be removed on March, 1](https://github.com/actions/virtual-environments/issues/2673) | | [[Windows, Ubuntu] Boost 1.72.0 will be removed from images on March, 8](https://github.com/actions/virtual-environments/issues/2667) | -| [[Ubuntu, windows] M2_HOME variable will be removed on February, 15](https://github.com/actions/virtual-environments/issues/2600) | | [[Ubuntu, macOS] .NET 3.0 will be removed from images on March, 1](https://github.com/actions/virtual-environments/issues/2558) | | [Ubuntu-latest workflows will use Ubuntu-20.04](https://github.com/actions/virtual-environments/issues/1816) | *** # Ubuntu 16.04.7 LTS -- Image Version: 20210219.1 +- Image Version: 20210302.0 ## Installed Software ### Language and Runtime @@ -19,8 +18,8 @@ - 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 - Julia 1.5.3 -- Mono 6.12.0.107 -- Node 14.15.5 +- Mono 6.12.0.122 +- Node 14.16.0 - Perl 5.22.1 - Python 2.7.12 - Python3 3.5.2 @@ -30,13 +29,13 @@ ### Package Management - cpan 1.61 - Helm 3.5.2 -- Homebrew 3.0.1 +- Homebrew 3.0.3 - Miniconda 4.9.2 - Npm 6.14.11 - Pip 8.1.1 - Pip3 8.1.1 - RubyGems 2.5.2 -- Vcpkg (build from master \<99dc49d>) +- Vcpkg (build from master \<307ac18>) - Yarn 1.22.5 #### Environment variables @@ -47,7 +46,7 @@ ### Project Management - Ant 1.9.6 -- Gradle 6.8.2 +- Gradle 6.8.3 - Maven 3.6.3 - Sbt 1.4.7 @@ -55,16 +54,15 @@ - 7-Zip 9.20 - Ansible 2.9.18 - apt-fast 1.9.10 -- AzCopy10 10.8.0 (available by `azcopy10` alias) -- AzCopy7 7.3.0 (available by `azcopy` alias) +- AzCopy 10.9.0 (available by `azcopy` and `azcopy10` aliases) - Bazel 4.0.0 - Bazelisk 1.7.5 - binutils 2.26.1 -- CMake 3.19.5 +- CMake 3.19.6 - CodeQL Action Bundle 2.4.2 - coreutils 8.25 - curl 7.47.0 -- Docker Compose 1.28.4 +- Docker Compose 1.28.5 - Docker-Buildx 0.5.1 - Docker-Moby Client 20.10.3+azure - Docker-Moby Server 20.10.3+azure @@ -72,23 +70,23 @@ - Git LFS 2.13.2 - Git-ftp 1.0.2 - Haveged 1.9.1 -- Heroku 7.47.13 -- HHVM (HipHop VM) 4.56.2 +- Heroku 7.49.1 +- HHVM (HipHop VM) 4.56.4 - jq 1.5 - Kind 0.10.0 -- Kubectl 1.19.0 -- Kustomize 4.0.1 +- Kubectl 1.20.1-5-g76a04fc +- Kustomize 4.0.4 - Leiningen 2.9.5 - m4 1.4.17 - MediaInfo 0.7.82 - Mercurial 4.4.1 -- Minikube 1.17.1 +- Minikube 1.18.0 - Newman 5.2.2 - nvm 0.37.2 - Packer 1.7.0 - pass 1.6.5 - PhantomJS 2.1.1 -- Pulumi 2.21.1 +- Pulumi 2.21.2 - R 4.0.4 - Sphinx Open Source Search Server 2.2.9 - SVN 1.9.3 @@ -102,18 +100,18 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.73 -- AWS CLI 1.19.12 +- AWS CLI 1.19.18 - AWS CLI Session manager plugin 1.2.54.0 -- AWS SAM CLI 1.18.2 -- Azure CLI (azure-cli) 2.19.1 +- AWS SAM CLI 1.19.1 +- Azure CLI (azure-cli) 2.20.0 - Azure CLI (azure-devops) 0.18.0 -- GitHub CLI 1.6.1 -- Google Cloud SDK 328.0.0 +- GitHub CLI 1.6.2 +- Google Cloud SDK 329.0.0 - Hub CLI 2.14.2 -- Netlify CLI 3.8.4 -- oc CLI 4.6.17 +- Netlify CLI 3.10.2 +- oc CLI 4.7.0 - ORAS CLI 0.10.0 -- Vercel CLI 21.2.3 +- Vercel CLI 21.3.1 ### Java | Version | Vendor | Environment Variable | @@ -126,13 +124,13 @@ | Tool | Version | | -------- | ----------------------------------------------- | | PHP | 5.6.40 7.0.33 7.1.33 7.2.34 7.3.27 7.4.15 8.0.2 | -| Composer | 2.0.9 | +| Composer | 2.0.11 | | PHPUnit | 8.5.14 | ### Haskell -- Cabal 3.2.0.0 -- GHC 8.10.4 -- GHCup 0.1.12 +- Cabal 3.4.0.0 +- GHC 9.0.1 +- GHCup 0.1.13 - Stack 2.5.1 ### Rust Tools @@ -146,13 +144,13 @@ - Cargo audit 0.13.1 - Cargo clippy 0.0.212 - Cargo outdated 0.9.14 -- Cbindgen 0.17.0 +- Cbindgen 0.18.0 - Rustfmt 1.4.30 ### Browsers and Drivers - Google Chrome 88.0.4324.182 - ChromeDriver 88.0.4324.96 -- Mozilla Firefox 85.0.1 +- Mozilla Firefox 86.0 - Geckodriver 0.29.0 #### Environment variables @@ -162,7 +160,7 @@ | GECKOWEBDRIVER | /usr/local/share/gecko_driver | ### .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.519 2.1.520 2.1.521 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.616 2.1.617 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 2.1.811 2.1.812 2.1.813 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.109 3.1.110 3.1.111 3.1.112 3.1.200 3.1.201 3.1.202 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402 3.1.403 3.1.404 3.1.405 3.1.406 5.0.100 5.0.101 5.0.102 5.0.103 +- 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.519 2.1.520 2.1.521 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.616 2.1.617 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 2.1.811 2.1.812 2.1.813 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.109 3.1.110 3.1.111 3.1.112 3.1.200 3.1.201 3.1.202 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402 3.1.403 3.1.404 3.1.405 3.1.406 5.0.100 5.0.101 5.0.102 5.0.103 ### 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 4.7.0 @@ -195,9 +193,9 @@ - 1.15.8 #### Node.js -- 10.23.3 -- 12.20.2 -- 14.15.5 +- 10.24.0 +- 12.21.0 +- 14.16.0 #### PyPy - 2.7.18 [PyPy 7.3.3] @@ -208,8 +206,8 @@ - 3.5.10 - 3.6.13 - 3.7.10 -- 3.8.7 -- 3.9.1 +- 3.8.8 +- 3.9.2 #### Ruby - 2.4.10 @@ -241,20 +239,20 @@ | nginx | 1.10.3 | /etc/nginx/nginx.conf | inactive | 80 | ### Android -| Package Name | Version | -| -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 3.0 | -| Android SDK Build-tools | 30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3
26.0.0 26.0.1 26.0.2 26.0.3
25.0.0 25.0.1 25.0.2 25.0.3
24.0.0 24.0.1 24.0.2 24.0.3
23.0.1 23.0.2 23.0.3
22.0.1
21.1.2
20.0.0
19.1.0 | -| Android SDK Platform-Tools | 31.0.0 | -| Android SDK Platforms | android-S (rev 1)
android-30 (rev 3)
android-29 (rev 5)
android-28 (rev 6)
android-27 (rev 3)
android-26 (rev 2)
android-25 (rev 3)
android-24 (rev 2)
android-23 (rev 3)
android-22 (rev 2)
android-21 (rev 2)
android-20 (rev 2)
android-19 (rev 4)
android-18 (rev 3)
android-17 (rev 3)
android-16 (rev 5)
android-15 (rev 5)
android-14 (rev 4)
android-13 (rev 1)
android-12 (rev 3)
android-11 (rev 2)
android-10 (rev 2) | -| Android SDK Tools | 26.1.1 | -| Android Support Repository | 47.0.0 | -| CMake | 3.10.2 | -| Google APIs | addon-google_apis-google-21
addon-google_apis-google-22
addon-google_apis-google-23
addon-google_apis-google-24 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 21.4.7075529 | -| SDK Patch Applier v4 | 1 | +| Package Name | Version | +| -------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 3.0 | +| Android SDK Build-tools | 30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3
26.0.0 26.0.1 26.0.2 26.0.3
25.0.0 25.0.1 25.0.2 25.0.3
24.0.0 24.0.1 24.0.2 24.0.3
23.0.1 23.0.2 23.0.3 | +| Android SDK Platform-Tools | 31.0.0 | +| Android SDK Platforms | android-S (rev 1)
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 SDK Tools | 26.1.1 | +| Android Support Repository | 47.0.0 | +| CMake | 3.10.2 | +| Google APIs | addon-google_apis-google-21
addon-google_apis-google-22
addon-google_apis-google-23
addon-google_apis-google-24 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 21.4.7075529 | +| SDK Patch Applier v4 | 1 | #### Environment variables | Name | Value | @@ -267,7 +265,7 @@ ### Cached Docker images | Repository:Tag | Digest | Created | | --------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| alpine:3.10 | sha256:f0e9534a598e501320957059cb2a23774b4d4072e37c7b2cf7e95b241f019e35 | 2020-04-24 | +| alpine:3.10 | sha256:0b4d282d7ae7cf5ed91801654a918aea45d6c1de6df0db6a29d60619141fb8de | 2021-02-24 | | alpine:3.7 | sha256:8421d9a84432575381bfabd248f1eb56f3aa21d9d7cd2511583c68c9b7511d10 | 2019-03-07 | | alpine:3.8 | sha256:2bb501e6173d9d006e56de5bce2720eb06396803300fe1687b58a7ff32bf4c14 | 2020-01-23 | | alpine:3.9 | sha256:414e0518bb9228d35e4cd5165567fb91d26c6a214e9c95899e1e056fcd349011 | 2020-04-24 | @@ -277,10 +275,10 @@ | debian:9 | sha256:d0b7b71db141cedc48e1c2807d12b199ffd7ffe75baf272a34c37480dc2159d1 | 2021-02-09 | | jekyll/builder:latest | sha256:b918b81939a1076dce89d142c0764c2c3cb93858f56ecf4f04ad0387338e77aa | 2020-12-21 | | mcr.microsoft.com/azure-pipelines/node8-typescript:latest | sha256:e52e60b9f71183969830a3664279b5d8c799b4b0ec2c25a0686f7c02f6a9669a | 2018-10-09 | -| node:10 | sha256:4fafd9b63fdfb15112775847a10b2917760c720c8c28cef5167ff40f36b3cd93 | 2021-02-12 | -| node:10-alpine | sha256:dae0a441e1b5201e074312e44b35571bed4a39b5bc07c26c1bfab9f18017ff54 | 2021-02-12 | -| node:12 | sha256:0140c4e17aa1f3fd78b939e3c7ac45accdd5274d0194046b484029a5e46b9db6 | 2021-02-12 | -| node:12-alpine | sha256:77fe10dbc042121e94db7f43b4b912a52514759b847978588eec4d5d0eb5282c | 2021-02-12 | +| node:10 | sha256:426ce4b7e659e081413b739ec3c6a6dea22dfc1a53bfaa147117dfb0238013a2 | 2021-02-23 | +| node:10-alpine | sha256:47cfff9b9eda43e97f42d516ff66c5490ed1f71262a03f3348ea867f222c1a7e | 2021-02-24 | +| node:12 | sha256:7f961434ce9e96be7bf2455bbf362152787c529bb9cf86a15ab1499ea89bfa8c | 2021-02-23 | +| node:12-alpine | sha256:5d8b181a0738654bbe659a68879298f8d2d4256685282ee1c2330d97c33e3eee | 2021-02-24 | | ubuntu:14.04 | sha256:63fce984528cec8714c365919882f8fb64c8a3edf23fdfa0b218a2756125456f | 2020-09-16 | ### Installed apt packages From 8a17c5ea71c704420ad969dcfc477b999c687c24 Mon Sep 17 00:00:00 2001 From: Shivam Mathur Date: Thu, 4 Mar 2021 06:06:34 -0800 Subject: [PATCH 0037/3485] [Ubuntu] Fix PHP extensions (#2834) --- images/linux/scripts/installers/php.sh | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/images/linux/scripts/installers/php.sh b/images/linux/scripts/installers/php.sh index 4fa0936db930..9912c169d1d2 100644 --- a/images/linux/scripts/installers/php.sh +++ b/images/linux/scripts/installers/php.sh @@ -20,6 +20,8 @@ for version in $php_versions; do echo "Installing PHP $version" apt-fast install -y --no-install-recommends \ php$version \ + php$version-amqp \ + php$version-apcu \ php$version-bcmath \ php$version-bz2 \ php$version-cgi \ @@ -32,11 +34,15 @@ for version in $php_versions; do php$version-fpm \ php$version-gd \ php$version-gmp \ + php$version-igbinary \ php$version-imap \ php$version-interbase \ php$version-intl \ php$version-ldap \ php$version-mbstring \ + php$version-memcache \ + php$version-memcached \ + php$version-mongodb \ php$version-mysql \ php$version-odbc \ php$version-opcache \ @@ -44,14 +50,18 @@ for version in $php_versions; do php$version-phpdbg \ php$version-pspell \ php$version-readline \ + php$version-redis \ php$version-snmp \ php$version-soap \ php$version-sqlite3 \ php$version-sybase \ php$version-tidy \ + php$version-xdebug \ php$version-xml \ php$version-xsl \ - php$version-zip + php$version-yaml \ + php$version-zip \ + php$version-zmq if [[ $version == "5.6" || $version == "7.0" || $version == "7.1" ]]; then apt-fast install -y --no-install-recommends php$version-mcrypt php$version-recode @@ -66,18 +76,7 @@ for version in $php_versions; do fi done -apt-fast install -y --no-install-recommends \ - php-amqp \ - php-apcu \ - php-igbinary \ - php-memcache \ - php-memcached \ - php-mongodb \ - php-pear \ - php-redis \ - php-xdebug \ - php-yaml \ - php-zmq +apt-fast install -y --no-install-recommends php-pear apt-fast install -y --no-install-recommends snmp From 40f571a75396b5d9f6840def0ad50797e4447395 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Thu, 4 Mar 2021 18:30:40 +0300 Subject: [PATCH 0038/3485] [Ubuntu] Add net-tools (#2838) * add net-tools * fix output --- .../scripts/SoftwareReport/SoftwareReport.Generator.ps1 | 1 + .../linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 | 5 +++++ images/linux/scripts/tests/Apt.Tests.ps1 | 5 +++++ images/linux/toolsets/toolset-1604.json | 1 + images/linux/toolsets/toolset-1804.json | 1 + images/linux/toolsets/toolset-2004.json | 1 + 6 files changed, 14 insertions(+) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index a66994962bf6..766480894513 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -118,6 +118,7 @@ $toolsList = @( (Get-M4Version), (Get-HGVersion), (Get-MinikubeVersion), + (Get-NetToolsVersion), (Get-NewmanVersion), (Get-NvmVersion), (Get-PackerVersion), diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 index ef663547764a..b2dfa7ba873a 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 @@ -174,6 +174,11 @@ function Get-MediainfoVersion { return "MediaInfo $mediainfoVersion" } +function Get-NetToolsVersion { + $netToolsVersion = dpkg-query --showformat='${Version}' --show net-tools | Take-OutputPart -Part 0 -Delimiter '-' | Take-OutputPart -Part 0 -Delimiter '+' + return "net-tools $netToolsVersion" +} + function Get-NewmanVersion { return "Newman $(newman --version)" } diff --git a/images/linux/scripts/tests/Apt.Tests.ps1 b/images/linux/scripts/tests/Apt.Tests.ps1 index 3fc00f2c104b..0913ade5a138 100644 --- a/images/linux/scripts/tests/Apt.Tests.ps1 +++ b/images/linux/scripts/tests/Apt.Tests.ps1 @@ -34,6 +34,11 @@ Describe "Apt" { $toolName = "tr" } + if ($toolName -eq "net-tools") + { + $toolName = "netstat" + } + (Get-Command -Name $toolName).CommandType | Should -BeExactly "Application" } } \ No newline at end of file diff --git a/images/linux/toolsets/toolset-1604.json b/images/linux/toolsets/toolset-1604.json index 8c93b4ee89b8..889f1a350a83 100644 --- a/images/linux/toolsets/toolset-1604.json +++ b/images/linux/toolsets/toolset-1604.json @@ -194,6 +194,7 @@ "m4", "mediainfo", "netcat", + "net-tools", "p7zip-full", "parallel", "pass", diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index f001f1a2cee5..96ea84284baf 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -188,6 +188,7 @@ "m4", "mediainfo", "netcat", + "net-tools", "parallel", "pass", "p7zip-full", diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index 3766233dcf09..0fa6553812e7 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -168,6 +168,7 @@ "m4", "mediainfo", "netcat", + "net-tools", "p7zip-full", "parallel", "pass", From 6ec7e94c452ea12c3f03daa2270b5e7a413a181a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 4 Mar 2021 17:02:34 +0000 Subject: [PATCH 0039/3485] Updating readme file for ubuntu20 version 20210302.0 (#2815) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/linux/Ubuntu2004-README.md | 90 +++++++++++++++---------------- 1 file changed, 44 insertions(+), 46 deletions(-) diff --git a/images/linux/Ubuntu2004-README.md b/images/linux/Ubuntu2004-README.md index 22b8f9a6dd9f..386d33de0c4c 100644 --- a/images/linux/Ubuntu2004-README.md +++ b/images/linux/Ubuntu2004-README.md @@ -4,12 +4,11 @@ | [[ubuntu, windows] GOROOT environment variable will be removed on March, 1](https://github.com/actions/virtual-environments/issues/2683) | | [[Ubuntu] Android SDK Platforms and Build-tools that are less than version 23 will be removed on March, 1](https://github.com/actions/virtual-environments/issues/2673) | | [[Windows, Ubuntu] Boost 1.72.0 will be removed from images on March, 8](https://github.com/actions/virtual-environments/issues/2667) | -| [[Ubuntu, windows] M2_HOME variable will be removed on February, 15](https://github.com/actions/virtual-environments/issues/2600) | | [[Ubuntu, macOS] .NET 3.0 will be removed from images on March, 1](https://github.com/actions/virtual-environments/issues/2558) | | [Ubuntu-latest workflows will use Ubuntu-20.04](https://github.com/actions/virtual-environments/issues/1816) | *** # Ubuntu 20.04.2 LTS -- Image Version: 20210219.1 +- Image Version: 20210302.0 ## Installed Software ### Language and Runtime @@ -19,8 +18,8 @@ - GNU C++ 7.5.0, 8.4.0, 9.3.0, 10.2.0 - GNU Fortran 8.4.0, 9.3.0, 10.2.0 - Julia 1.5.3 -- Mono 6.12.0.107 -- Node 14.15.5 +- Mono 6.12.0.122 +- Node 14.16.0 - Perl 5.30.0 - Python 3.8.5 - Python3 3.8.5 @@ -30,14 +29,14 @@ ### Package Management - cpan 1.64 - Helm 3.5.2 -- Homebrew 3.0.1 +- Homebrew 3.0.3 - Miniconda 4.9.2 - Npm 6.14.11 - Pip 20.0.2 - Pip3 20.0.2 -- Pipx 0.16.0.0 +- Pipx 0.16.1.0 - RubyGems 3.1.2 -- Vcpkg (build from master \<99dc49d>) +- Vcpkg (build from master \<307ac18>) - Yarn 1.22.5 #### Environment variables @@ -48,7 +47,7 @@ ### Project Management - Ant 1.10.7 -- Gradle 6.8.2 +- Gradle 6.8.3 - Maven 3.6.3 - Sbt 1.4.7 @@ -56,45 +55,44 @@ - 7-Zip 16.02 - Ansible 2.9.6 - apt-fast 1.9.10 -- AzCopy10 10.8.0 (available by `azcopy10` alias) -- AzCopy7 7.3.0 (available by `azcopy` alias) +- AzCopy 10.9.0 (available by `azcopy` and `azcopy10` aliases) - Bazel 4.0.0 - Bazelisk 1.7.5 - binutils 2.34 -- Buildah 1.19.4 -- CMake 3.19.5 +- Buildah 1.19.6 +- CMake 3.19.6 - CodeQL Action Bundle 2.4.2 - coreutils 8.30 - curl 7.68.0 -- Docker Compose 1.28.4 +- Docker Compose 1.28.5 - Docker-Buildx 0.5.1 - Docker-Moby Client 20.10.3+azure - Docker-Moby Server 20.10.3+azure -- Fastlane 2.175.0 -- Git 2.30.0 +- Fastlane 2.176.0 +- Git 2.30.1 - Git LFS 2.13.2 - Git-ftp 1.6.0 - Haveged 1.9.1 -- Heroku 7.47.13 -- HHVM (HipHop VM) 4.97.0 +- Heroku 7.49.1 +- HHVM (HipHop VM) 4.99.0 - jq 1.6 - Kind 0.10.0 -- Kubectl 1.19.0 -- Kustomize 4.0.1 +- Kubectl 1.20.1-5-g76a04fc +- Kustomize 4.0.4 - Leiningen 2.9.5 - m4 1.4.18 - MediaInfo 19.09 - Mercurial 5.3.1 -- Minikube 1.17.1 +- Minikube 1.18.0 - Newman 5.2.2 - nvm 0.37.2 - Packer 1.7.0 - pass 1.7.3 - PhantomJS 2.1.1 - Podman 3.0.1 -- Pulumi 2.21.1 +- Pulumi 2.21.2 - R 4.0.4 -- Skopeo 1.2.1 +- Skopeo 1.2.2 - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 - Swig 4.0.1 @@ -107,18 +105,18 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.73 -- AWS CLI 2.1.27 +- AWS CLI 2.1.29 - AWS CLI Session manager plugin 1.2.54.0 -- AWS SAM CLI 1.18.2 -- Azure CLI (azure-cli) 2.19.1 +- AWS SAM CLI 1.19.1 +- Azure CLI (azure-cli) 2.20.0 - Azure CLI (azure-devops) 0.18.0 -- GitHub CLI 1.6.1 -- Google Cloud SDK 328.0.0 +- GitHub CLI 1.6.2 +- Google Cloud SDK 329.0.0 - Hub CLI 2.14.2 -- Netlify CLI 3.8.4 -- oc CLI 4.6.17 +- Netlify CLI 3.10.2 +- oc CLI 4.7.0 - ORAS CLI 0.10.0 -- Vercel CLI 21.2.3 +- Vercel CLI 21.3.1 ### Java | Version | Vendor | Environment Variable | @@ -135,13 +133,13 @@ | Tool | Version | | -------- | ------------ | | PHP | 7.4.15 8.0.2 | -| Composer | 2.0.9 | +| Composer | 2.0.11 | | PHPUnit | 8.5.14 | ### Haskell -- Cabal 3.2.0.0 -- GHC 8.10.3 -- GHCup 0.1.12 +- Cabal 3.4.0.0 +- GHC 9.0.1 +- GHCup 0.1.13 - Stack 2.5.1 ### Rust Tools @@ -155,14 +153,14 @@ - Cargo audit 0.13.1 - Cargo clippy 0.0.212 - Cargo outdated 0.9.14 -- Cbindgen 0.17.0 +- Cbindgen 0.18.0 - Rustfmt 1.4.30 ### Browsers and Drivers - Chromium 88.0.4324.182 - Google Chrome 88.0.4324.182 - ChromeDriver 88.0.4324.96 -- Mozilla Firefox 85.0.1 +- Mozilla Firefox 86.0 - Geckodriver 0.29.0 #### Environment variables @@ -199,9 +197,9 @@ - 1.16.0 #### Node.js -- 10.23.3 -- 12.20.2 -- 14.15.5 +- 10.24.0 +- 12.21.0 +- 14.16.0 #### PyPy - 2.7.18 [PyPy 7.3.3] @@ -213,8 +211,8 @@ - 3.5.10 - 3.6.13 - 3.7.10 -- 3.8.7 -- 3.9.1 +- 3.8.8 +- 3.9.2 #### Ruby - 2.5.8 @@ -272,7 +270,7 @@ ### Cached Docker images | Repository:Tag | Digest | Created | | --------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| alpine:3.10 | sha256:f0e9534a598e501320957059cb2a23774b4d4072e37c7b2cf7e95b241f019e35 | 2020-04-24 | +| alpine:3.10 | sha256:0b4d282d7ae7cf5ed91801654a918aea45d6c1de6df0db6a29d60619141fb8de | 2021-02-24 | | alpine:3.7 | sha256:8421d9a84432575381bfabd248f1eb56f3aa21d9d7cd2511583c68c9b7511d10 | 2019-03-07 | | alpine:3.8 | sha256:2bb501e6173d9d006e56de5bce2720eb06396803300fe1687b58a7ff32bf4c14 | 2020-01-23 | | alpine:3.9 | sha256:414e0518bb9228d35e4cd5165567fb91d26c6a214e9c95899e1e056fcd349011 | 2020-04-24 | @@ -282,10 +280,10 @@ | debian:9 | sha256:d0b7b71db141cedc48e1c2807d12b199ffd7ffe75baf272a34c37480dc2159d1 | 2021-02-09 | | jekyll/builder:latest | sha256:b918b81939a1076dce89d142c0764c2c3cb93858f56ecf4f04ad0387338e77aa | 2020-12-21 | | mcr.microsoft.com/azure-pipelines/node8-typescript:latest | sha256:e52e60b9f71183969830a3664279b5d8c799b4b0ec2c25a0686f7c02f6a9669a | 2018-10-09 | -| node:10 | sha256:4fafd9b63fdfb15112775847a10b2917760c720c8c28cef5167ff40f36b3cd93 | 2021-02-12 | -| node:10-alpine | sha256:dae0a441e1b5201e074312e44b35571bed4a39b5bc07c26c1bfab9f18017ff54 | 2021-02-12 | -| node:12 | sha256:0140c4e17aa1f3fd78b939e3c7ac45accdd5274d0194046b484029a5e46b9db6 | 2021-02-12 | -| node:12-alpine | sha256:77fe10dbc042121e94db7f43b4b912a52514759b847978588eec4d5d0eb5282c | 2021-02-12 | +| node:10 | sha256:426ce4b7e659e081413b739ec3c6a6dea22dfc1a53bfaa147117dfb0238013a2 | 2021-02-23 | +| node:10-alpine | sha256:47cfff9b9eda43e97f42d516ff66c5490ed1f71262a03f3348ea867f222c1a7e | 2021-02-24 | +| node:12 | sha256:7f961434ce9e96be7bf2455bbf362152787c529bb9cf86a15ab1499ea89bfa8c | 2021-02-23 | +| node:12-alpine | sha256:5d8b181a0738654bbe659a68879298f8d2d4256685282ee1c2330d97c33e3eee | 2021-02-24 | | ubuntu:14.04 | sha256:63fce984528cec8714c365919882f8fb64c8a3edf23fdfa0b218a2756125456f | 2020-09-16 | ### Installed apt packages From adcbf9592c5835e725bd696685df061806017a8f Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Fri, 5 Mar 2021 10:22:42 +0300 Subject: [PATCH 0040/3485] remove boost from ubuntu images (#2844) --- .../SoftwareReport.CachedTools.psm1 | 35 ------------------- .../helpers/SoftwareReport.Helpers.psm1 | 8 ----- .../scripts/installers/Configure-Toolset.ps1 | 3 -- .../scripts/installers/Install-Toolset.ps1 | 2 +- images/linux/toolsets/toolset-1604.json | 10 ------ images/linux/toolsets/toolset-1804.json | 10 ------ 6 files changed, 1 insertion(+), 67 deletions(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.CachedTools.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.CachedTools.psm1 index a801fa22b5da..66b85a38a205 100755 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.CachedTools.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.CachedTools.psm1 @@ -41,44 +41,9 @@ function Build-GoEnvironmentTable { } } -function Get-ToolcacheBoostVersions { - $Name = "Boost" - $toolcachePath = Join-Path $env:AGENT_TOOLSDIRECTORY "boost" - if (-not (Test-Path $toolcachePath)) { - return @() - } - - $BoostVersions = Get-ChildItem $toolcachePath -Name | Sort-Object { [Version]$_ } - $ToolInstances = $BoostVersions | ForEach-Object { - $VersionEnvVar = $_.replace(".", "_") - return @{ - Version = $_ - Architecture = "x64" - "Environment Variable" = "BOOST_ROOT_${VersionEnvVar}" - - } - } - $Content = $ToolInstances | New-MDTable -Columns ([ordered]@{ - Version = "left"; - Architecture = "left"; - "Environment Variable" = "left" - }) - - $markdown = "" - - if ($Content.Count -gt 0) { - $markdown += New-MDHeader $Name -Level 4 - $markdown += New-MDParagraph -Lines $Content - } - - return $markdown -} - function Build-CachedToolsSection { $output = "" - $output += Get-ToolcacheBoostVersions - $output += New-MDHeader "Go" -Level 4 $output += New-MDList -Lines (Get-ToolcacheGoVersions) -Style Unordered diff --git a/images/linux/scripts/helpers/SoftwareReport.Helpers.psm1 b/images/linux/scripts/helpers/SoftwareReport.Helpers.psm1 index c17236ba1a0d..a3ef19d1ca1a 100644 --- a/images/linux/scripts/helpers/SoftwareReport.Helpers.psm1 +++ b/images/linux/scripts/helpers/SoftwareReport.Helpers.psm1 @@ -80,14 +80,6 @@ function Get-CachedToolInstances [string]$instanceInfo.Path = Join-Path -Path $toolPath -ChildPath $version.Name [string]$instanceInfo.Version = $version.Name - ### Temporary workaround. Currently Boost instances don't have architecture subfolders. - if ($Name -eq "Boost") - { - [string]$instanceInfo.Architecture = "x64, x86" - $toolInstances += $instanceInfo - continue - } - # Get all architectures for current version [array]$instanceInfo.Architecture_Array = Get-ChildItem $version.FullName -Name -Directory | Where-Object { $_ -match "^x[0-9]{2}$" } [string]$instanceInfo.Architecture = $instanceInfo.Architecture_Array -Join ", " diff --git a/images/linux/scripts/installers/Configure-Toolset.ps1 b/images/linux/scripts/installers/Configure-Toolset.ps1 index f819eda9b3ed..dfef74e0cefd 100644 --- a/images/linux/scripts/installers/Configure-Toolset.ps1 +++ b/images/linux/scripts/installers/Configure-Toolset.ps1 @@ -39,9 +39,6 @@ $ErrorActionPreference = "Stop" Write-Host "Configure toolset tools environment..." $toolsEnvironment = @{ - boost = @{ - variableTemplate = "BOOST_ROOT_{0}_{1}_{2}" - } go = @{ command = "ln -s {0}/bin/* /usr/bin/" variableTemplate = "GOROOT_{0}_{1}_X64" diff --git a/images/linux/scripts/installers/Install-Toolset.ps1 b/images/linux/scripts/installers/Install-Toolset.ps1 index 1d261ff3fba9..313591598ae1 100644 --- a/images/linux/scripts/installers/Install-Toolset.ps1 +++ b/images/linux/scripts/installers/Install-Toolset.ps1 @@ -28,7 +28,7 @@ $ErrorActionPreference = "Stop" # Get toolset content $toolset = Get-Content -Path "$env:INSTALLER_SCRIPT_FOLDER/toolset.json" -Raw -$toolsToInstall = @("Python", "Node", "Boost", "Go") +$toolsToInstall = @("Python", "Node", "Go") $tools = ConvertFrom-Json -InputObject $toolset | Select-Object -ExpandProperty toolcache | Where-Object {$ToolsToInstall -contains $_.Name} diff --git a/images/linux/toolsets/toolset-1604.json b/images/linux/toolsets/toolset-1604.json index 889f1a350a83..2985e330f69d 100644 --- a/images/linux/toolsets/toolset-1604.json +++ b/images/linux/toolsets/toolset-1604.json @@ -47,16 +47,6 @@ ], "default": "1.15.*" }, - { - "name": "boost", - "url" : "https://raw.githubusercontent.com/actions/boost-versions/main/versions-manifest.json", - "platform" : "linux", - "platform_version": "16.04", - "arch": "x64", - "versions": [ - "1.72.0" - ] - }, { "name": "Ruby", "platform_version": "16.04", diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index 96ea84284baf..162159db623a 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -47,16 +47,6 @@ ], "default": "1.15.*" }, - { - "name": "boost", - "url" : "https://raw.githubusercontent.com/actions/boost-versions/main/versions-manifest.json", - "platform" : "linux", - "platform_version": "18.04", - "arch": "x64", - "versions": [ - "1.72.0" - ] - }, { "name": "Ruby", "platform_version": "18.04", From c6ba1f00dff73e2dc41ff6060baa8068800de280 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Fri, 5 Mar 2021 10:22:59 +0300 Subject: [PATCH 0041/3485] remove boost from windows images (#2843) --- .../scripts/Installers/Configure-Toolset.ps1 | 5 +-- .../SoftwareReport.CachedTools.psm1 | 36 ------------------- .../SoftwareReport.Helpers.psm1 | 8 ----- images/win/toolsets/toolset-2016.json | 10 ------ images/win/toolsets/toolset-2019.json | 10 ------ 5 files changed, 1 insertion(+), 68 deletions(-) diff --git a/images/win/scripts/Installers/Configure-Toolset.ps1 b/images/win/scripts/Installers/Configure-Toolset.ps1 index 584122d7b24f..c2e9e776f1fc 100644 --- a/images/win/scripts/Installers/Configure-Toolset.ps1 +++ b/images/win/scripts/Installers/Configure-Toolset.ps1 @@ -35,9 +35,6 @@ $toolsEnvironmentVariables = @{ "{0}\Scripts" ) } - Boost = @{ - variableTemplate = "BOOST_ROOT_{0}_{1}_{2}" - } go = @{ pathTemplates = @( "{0}\bin" @@ -46,7 +43,7 @@ $toolsEnvironmentVariables = @{ } } -$toolsToConfigure = @("Python", "Boost", "Go") +$toolsToConfigure = @("Python", "Go") $tools = Get-ToolsetContent | Select-Object -ExpandProperty toolcache ` | Where-Object { $toolsToConfigure -contains $_.name } diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.CachedTools.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.CachedTools.psm1 index b5e1e529506e..ea2eaed184c4 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.CachedTools.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.CachedTools.psm1 @@ -1,38 +1,3 @@ -function Get-BoostMarkdown -{ - $Name = "Boost" - $ToolInstances = Get-CachedToolInstances -Name $Name - foreach ($Instance in $ToolInstances) - { - $VersionEnvVar = $Instance.Version.replace(".", "_") - $Instance."Environment Variable" = "BOOST_ROOT_${VersionEnvVar}" - } - - $Content = $ToolInstances | New-MDTable -Columns ([ordered]@{ - Version = "left"; - Architecture = "left"; - "Environment Variable" = "left" - }) - $Content += New-MDHeader "Notes:" -Level 5 - $Content += @' -``` -1. Environment variable "BOOST_ROOT" is not set by default. - Please make sure you set this variable value to proper value - from table above depending on the Boost version you are using. -2. If Boost was built using the boost-cmake project or from Boost 1.70.0 - on it provides a package configuration file for use with find_package's config mode. - This module looks for the package configuration file called BoostConfig.cmake or boost-config.cmake - and stores the result in CACHE entry "Boost_DIR". If found, the package configuration file - is loaded and this module returns with no further action. - See documentation of the Boost CMake package configuration for details on what it provides. - Set Boost_NO_BOOST_CMAKE to ON, to disable the search for boost-cmake. - Link: https://cmake.org/cmake/help/latest/module/FindBoost.html -``` -'@ - - return Build-MarkdownElement -Head $Name -Content $Content -} - function Get-GoMarkdown { $Name = "Go" @@ -106,7 +71,6 @@ function Get-PyPyMarkdown function Build-CachedToolsMarkdown { $markdown = "" - $markdown += Get-BoostMarkdown $markdown += Get-GoMarkdown $markdown += Get-NodeMarkdown $markdown += Get-PythonMarkdown diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Helpers.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Helpers.psm1 index 7971f91e0a64..4620c3e70abe 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Helpers.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Helpers.psm1 @@ -65,14 +65,6 @@ function Get-CachedToolInstances [string]$instanceInfo.Path = Join-Path -Path $toolPath -ChildPath $version.Name [string]$instanceInfo.Version = $version.Name - ### Temporary workaround. Currently Boost instances don't have architecture subfolders. - if ($Name -eq "Boost") - { - [string]$instanceInfo.Architecture = "x64, x86" - $toolInstances += $instanceInfo - continue - } - # Get all architectures for current version [array]$instanceInfo.Architecture_Array = Get-ChildItem $version.FullName -Name -Directory | Where-Object { $_ -match "^x[0-9]{2}$" } [string]$instanceInfo.Architecture = $instanceInfo.Architecture_Array -Join ", " diff --git a/images/win/toolsets/toolset-2016.json b/images/win/toolsets/toolset-2016.json index f9ed706b4ebd..f69b1cbda250 100644 --- a/images/win/toolsets/toolset-2016.json +++ b/images/win/toolsets/toolset-2016.json @@ -75,16 +75,6 @@ "1.16.*" ], "default": "1.15.*" - }, - { - "name": "Boost", - "url" : "https://raw.githubusercontent.com/actions/boost-versions/main/versions-manifest.json", - "arch": "x86_64", - "platform" : "win32", - "toolset": "msvc14.1", - "versions": [ - "1.72.0" - ] } ], "powershellModules": [ diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index 7fc010994b10..6c4b577af456 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -75,16 +75,6 @@ "1.16.*" ], "default": "1.15.*" - }, - { - "name": "Boost", - "url" : "https://raw.githubusercontent.com/actions/boost-versions/main/versions-manifest.json", - "arch": "x86_64", - "platform" : "win32", - "toolset": "msvc14.2", - "versions": [ - "1.72.0" - ] } ], "powershellModules": [ From 5ad9793f2955e4d3cbd1ea183337776b44a51a57 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 5 Mar 2021 08:29:42 +0000 Subject: [PATCH 0042/3485] Updating readme file for macOS-10.15 version 20210302.1 (#2833) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/macos/macos-10.15-Readme.md | 67 +++++++++++++++--------------- 1 file changed, 33 insertions(+), 34 deletions(-) diff --git a/images/macos/macos-10.15-Readme.md b/images/macos/macos-10.15-Readme.md index a8e4e1994350..6b1a12ee00c7 100644 --- a/images/macos/macos-10.15-Readme.md +++ b/images/macos/macos-10.15-Readme.md @@ -1,17 +1,16 @@ | Announcements | |-| -| [[macOS] Default Xcode will be set to Xcode 12.4 on February, 22](https://github.com/actions/virtual-environments/issues/2685) | | [[Ubuntu, macOS] .NET 3.0 will be removed from images on March, 1](https://github.com/actions/virtual-environments/issues/2558) | | [macOS 11.0 pools will be transited to private preview.](https://github.com/actions/virtual-environments/issues/2486) | *** # macOS 10.15 info - System Version: macOS 10.15.7 (19H512) - Kernel Version: Darwin 19.6.0 -- Image Version: 20210220.1 +- Image Version: 20210302.1 ## Installed Software ### Language and Runtime -- .NET SDK 2.1.300 2.1.301 2.1.302 2.1.401 2.1.402 2.1.403 2.1.500 2.1.502 2.1.503 2.1.504 2.1.505 2.1.506 2.1.507 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 2.1.811 2.1.812 2.1.813 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 3.1.403 3.1.404 3.1.405 3.1.406 5.0.100 5.0.101 5.0.102 5.0.103 +- .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 2.1.811 2.1.812 2.1.813 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 3.1.403 3.1.404 3.1.405 3.1.406 5.0.100 5.0.101 5.0.102 5.0.200 - Bash 3.2.57(1)-release - Clang/LLVM 11.1.0 is available on `'$(brew --prefix llvm)/bin/clang'` - Clang/LLVM 12.0.0 is default @@ -23,30 +22,30 @@ - GNU Fortran (Homebrew GCC 9.3.0_1) 9.3.0 - available by `gfortran-9` alias - Go 1.15.8 - julia 1.5.3 -- Node.js v14.15.5 -- NVM - Cached node versions: v10.23.3 v12.20.2 v14.15.5 +- Node.js v14.16.0 +- NVM - Cached node versions: v10.24.0 v12.21.0 v14.16.0 - NVM 0.37.2 - Perl 5.32.1 - PHP 8.0.2 - Python 2.7.18 -- Python 3.9.1 +- Python 3.9.2 - R 4.0.4 - Ruby 2.7.2p137 ### Package Management -- Bundler version 2.2.11 +- Bundler version 2.2.12 - Carthage 0.37.0 - CocoaPods 1.10.1 -- Composer 2.0.9 -- Homebrew 3.0.1 +- Composer 2.0.11 +- Homebrew 3.0.4 - Miniconda 4.9.2 - NPM 6.14.11 - NuGet 5.6.0.6489 - Pip 20.3.4 (python 2.7) - Pip 21.0.1 (python 3.9) -- Pipx 0.16.0.0 -- RubyGems 3.2.11 -- Vcpkg 2021 (build from master \<99dc49d>) +- Pipx 0.16.1.0 +- RubyGems 3.2.12 +- Vcpkg 2021 (build from master \<395cb68>) - Yarn 1.22.5 #### Environment variables @@ -58,19 +57,19 @@ ### Project Management - Apache Ant(TM) 1.10.9 - Apache Maven 3.6.3 -- Gradle 6.8.2 +- Gradle 6.8.3 ### Utilities -- 7-Zip 16.02 +- 7-Zip 17.03 - aria2 1.35.0 -- azcopy 10.8.0 +- azcopy 10.9.0 - bazel 4.0.0 - bazelisk 1.7.5 - bsdtar 3.3.2 - available by 'tar' alias - Curl 7.75.0 - Git LFS: 2.13.2 - Git: 2.30.1 -- GitHub CLI: 1.6.1 +- GitHub CLI: 1.6.2 - GNU parallel 20201122 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.1 @@ -94,15 +93,15 @@ ### Tools - Aliyun CLI 3.0.73 - App Center CLI 2.7.4 -- AWS CLI 2.1.27 -- AWS SAM CLI 1.18.2 +- AWS CLI 2.1.29 +- AWS SAM CLI 1.19.1 - AWS Session Manager CLI 1.2.30.0 -- Azure CLI 2.19.1 +- Azure CLI 2.20.0 - Cabal 3.4.0.0 -- Cmake 3.19.5 -- Fastlane 2.175.0 +- Cmake 3.19.6 +- Fastlane 2.176.0 - GHC 9.0.1 -- GHCup v0.1.12 +- GHCup v0.1.13 - Stack 2.5.1 - Xcode Command Line Tools 12.4.0.0.1.1610135815 @@ -113,11 +112,11 @@ ### Browsers - Safari 14.0.3 (15610.4.3.1.6) - SafariDriver 14.0.3 (15610.4.3.1.6) -- Google Chrome 88.0.4324.182 +- Google Chrome 89.0.4389.72 - ChromeDriver 88.0.4324.96 -- Microsoft Edge 88.0.705.74 -- MSEdgeDriver 88.0.705.74 -- Mozilla Firefox 85.0.2 +- Microsoft Edge 88.0.705.81 +- MSEdgeDriver 88.0.705.81 +- Mozilla Firefox 86.0 - geckodriver 0.29.0 #### Environment variables @@ -158,9 +157,9 @@ - 3.7.9 [PyPy 7.3.3-beta0] #### Node.js -- 10.23.3 -- 12.20.2 -- 14.15.5 +- 10.24.0 +- 12.21.0 +- 14.16.0 #### Go - 1.13.15 @@ -178,7 +177,7 @@ - Bindgen 0.57.0 - Cargo-audit 0.13.1 - Cargo-outdated v0.9.14 -- Cbindgen 0.17.0 +- Cbindgen 0.18.0 - Clippy 0.0.212 - Rustfmt 1.4.30-stable @@ -201,7 +200,7 @@ ### Xamarin #### Visual Studio for Mac -- 8.8.9.10 +- 8.8.10.2 #### Mono - 6.12.0.122 @@ -228,7 +227,7 @@ - 13.2.0.47 #### Xamarin.Mac -- 7.4.0.4 +- 7.4.0.10 - 7.2.0.3 - 7.0.0.15 - 6.22.1.26 @@ -273,7 +272,7 @@ #### Xcode Support Tools - xcpretty 0.3.0 - xcversion 2.6.8 -- Nomad CLI 3.2.11 +- Nomad CLI 3.2.12 - Nomad CLI IPA ipa 0.14.3 - xctool 0.3.7 @@ -367,7 +366,7 @@ | Package Name | Version | | -------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 3.0 | -| Android Emulator | 30.3.5 | +| Android Emulator | 30.4.5 | | Android SDK Build-tools | 30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3
26.0.0 26.0.1 26.0.2 26.0.3
25.0.0 25.0.1 25.0.2 25.0.3
24.0.0 24.0.1 24.0.2 24.0.3 | | Android SDK Platforms | android-S (rev 1)
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 Platform-Tools | 31.0.0 | From 1cfb9a989fb95e236f57fa729ed2c22410c60d46 Mon Sep 17 00:00:00 2001 From: Dmitry Khominich Date: Fri, 5 Mar 2021 16:44:12 +0200 Subject: [PATCH 0043/3485] [Ubuntu] add clang-11 --- images/linux/toolsets/toolset-2004.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index 0fa6553812e7..63d623cc7a4e 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -123,7 +123,9 @@ "iputils-ping", "lib32z1", "libc++abi-dev", + "libc++abi-11-dev", "libc++-dev", + "libc++-11-dev", "libcurl4", "libgbm-dev", "libgconf-2-4", @@ -233,7 +235,8 @@ "versions": [ "8", "9", - "10" + "10", + "11" ], "default_version": "10" }, From 8cdcef0d0037ff32dc22c721d4b3835ccabc582f Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Mon, 8 Mar 2021 22:43:58 +0300 Subject: [PATCH 0044/3485] Initialize ChocolateyToolsLocation variable and fix tests (#2874) --- images/win/scripts/Installers/Initialize-VM.ps1 | 4 ++++ images/win/scripts/Installers/Install-Haskell.ps1 | 6 ++++++ images/win/scripts/Tests/Haskell.Tests.ps1 | 8 +++++++- 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/images/win/scripts/Installers/Initialize-VM.ps1 b/images/win/scripts/Installers/Initialize-VM.ps1 index 7623497e3264..ff02d065aa72 100644 --- a/images/win/scripts/Installers/Initialize-VM.ps1 +++ b/images/win/scripts/Installers/Initialize-VM.ps1 @@ -132,6 +132,10 @@ if (Test-IsWin19) { Choco-Install -PackageName vcredist2010 } +# Initialize environmental variable ChocolateyToolsLocation by invoking choco Get-ToolsLocation function +Import-Module "$env:ChocolateyInstall\helpers\chocolateyInstaller.psm1" -Force +Get-ToolsLocation + # Expand disk size of OS drive $driveLetter = "C" $size = Get-PartitionSupportedSize -DriveLetter $driveLetter diff --git a/images/win/scripts/Installers/Install-Haskell.ps1 b/images/win/scripts/Installers/Install-Haskell.ps1 index 18b256a3bc35..e34d930b2541 100644 --- a/images/win/scripts/Installers/Install-Haskell.ps1 +++ b/images/win/scripts/Installers/Install-Haskell.ps1 @@ -19,6 +19,12 @@ ForEach ($version in $VersionsList) $DefaultGhcVersion = $VersionsList | Select-Object -Last 1 $DefaultGhcShortVersion = ([version]$DefaultGhcVersion).ToString(3) $DefaultGhcPath = Join-Path $env:ChocolateyInstall "lib\ghc.$DefaultGhcVersion\tools\ghc-$DefaultGhcShortVersion\bin" +# Starting from version 9 haskell installation directory is $env:ChocolateyToolsLocation instead of $env:ChocolateyInstall\lib +if ($ghcVersion -notmatch "^[0-8]\.\d+.*") +{ + $DefaultGhcPath = Join-Path $env:ChocolateyToolsLocation "ghc-$DefaultGhcShortVersion\bin" +} + Add-MachinePathItem -PathItem $DefaultGhcPath Write-Host "Installing cabal..." diff --git a/images/win/scripts/Tests/Haskell.Tests.ps1 b/images/win/scripts/Tests/Haskell.Tests.ps1 index 826dc16d8c12..4bddc57afea9 100644 --- a/images/win/scripts/Tests/Haskell.Tests.ps1 +++ b/images/win/scripts/Tests/Haskell.Tests.ps1 @@ -11,10 +11,16 @@ Describe "Haskell" { $ghcTestCases = $ghcVersionList | ForEach-Object { $ghcVersion = $_ $ghcShortVersion = ([version]$ghcVersion).ToString(3) + $binGhcPath = Join-Path $chocoPackagesPath "ghc.$ghcVersion\tools\ghc-$ghcShortVersion\bin\ghc.exe" + # Starting from version 9 haskell installation directory is $env:ChocolateyToolsLocation instead of $env:ChocolateyInstall\lib + if ($ghcVersion -notmatch "^[0-8]\.\d+.*") + { + $binGhcPath = Join-Path $env:ChocolateyToolsLocation "ghc-$ghcShortVersion\bin\ghc.exe" + } @{ ghcVersion = $ghcVersion ghcShortVersion = $ghcShortVersion - binGhcPath = Join-Path $chocoPackagesPath "ghc.$ghcVersion\tools\ghc-$ghcShortVersion\bin\ghc.exe" + binGhcPath = $binGhcPath } } From 639fcca9e612976accda978da0cc6ff99bee8341 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 9 Mar 2021 10:36:08 +0000 Subject: [PATCH 0045/3485] Updating readme file for macOS-11.0 version 20210308.1 (#2880) Co-authored-by: Image generation service account --- images/macos/macos-11.0-Readme.md | 42 +++++++++++++++---------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/images/macos/macos-11.0-Readme.md b/images/macos/macos-11.0-Readme.md index 188f00c5a9b5..1cf30513bc0f 100644 --- a/images/macos/macos-11.0-Readme.md +++ b/images/macos/macos-11.0-Readme.md @@ -4,9 +4,9 @@ | [macOS 11.0 pools will be transited to private preview.](https://github.com/actions/virtual-environments/issues/2486) | *** # macOS 11.2 info -- System Version: macOS 11.2 (20D64) +- System Version: macOS 11.2.3 (20D91) - Kernel Version: Darwin 20.3.0 -- Image Version: 20210302.1 +- Image Version: 20210308.1 ## Installed Software ### Language and Runtime @@ -26,13 +26,13 @@ - NVM - Cached node versions: v10.24.0 v12.21.0 v14.16.0 - NVM 0.37.2 - Perl 5.32.1 -- PHP 8.0.2 +- PHP 8.0.3 - Python 2.7.18 - Python 3.9.2 - Ruby 2.7.2p137 ### Package Management -- Bundler version 2.2.12 +- Bundler version 2.2.14 - Carthage 0.37.0 - CocoaPods 1.10.1 - Composer 2.0.11 @@ -43,8 +43,8 @@ - Pip 20.3.4 (python 2.7) - Pip 21.0.1 (python 3.9) - Pipx 0.16.1.0 -- RubyGems 3.2.12 -- Vcpkg 2021 (build from master \<395cb68>) +- RubyGems 3.2.14 +- Vcpkg 2021 (build from master \<0dc27b9>) - Yarn 1.22.5 #### Environment variables @@ -68,7 +68,7 @@ - Curl 7.75.0 - Git LFS: 2.13.2 - Git: 2.30.1 -- GitHub CLI: 1.6.2 +- GitHub CLI: 1.7.0 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.1 - gpg (GnuPG) 2.2.27 @@ -83,42 +83,42 @@ - PostgreSQL 13.2 - psql (PostgreSQL) 13.2 - Subversion (SVN) 1.14.1 -- zstd 1.4.8 +- zstd 1.4.9 ### Tools - Aliyun CLI 3.0.73 - App Center CLI 2.7.4 - AWS CLI 2.1.29 -- AWS SAM CLI 1.19.1 +- AWS SAM CLI 1.20.0 - AWS Session Manager CLI 1.2.30.0 - Azure CLI 2.20.0 - Cabal 3.4.0.0 - Cmake 3.19.6 -- Fastlane 2.176.0 +- Fastlane 2.177.0 - GHC 9.0.1 -- GHCup v0.1.13 +- GHCup v0.1.14 - Stack 2.5.1 - Xcode Command Line Tools 12.4.0.0.1.1610135815 ### Linters -- SwiftLint 0.42.0 +- SwiftLint 0.43.0 - yamllint 1.26.0 ### Browsers -- Safari 14.0.3 (16610.4.3.1.4) -- SafariDriver 14.0.3 (16610.4.3.1.4) -- Google Chrome 89.0.4389.72 -- ChromeDriver 88.0.4324.96 -- Microsoft Edge 88.0.705.81 -- MSEdgeDriver 88.0.705.81 +- Safari 14.0.3 (16610.4.3.1.7) +- SafariDriver 14.0.3 (16610.4.3.1.7) +- Google Chrome 89.0.4389.82 +- ChromeDriver 89.0.4389.23 +- Microsoft Edge 89.0.774.45 +- MSEdgeDriver 89.0.774.48 - Mozilla Firefox 86.0 - geckodriver 0.29.0 #### Environment variables | Name | Value | | --------------- | --------------------------------------------- | -| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/88.0.4324.96 | +| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/89.0.4389.23 | | EDGEWEBDRIVER | /usr/local/share/edge_driver | | GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | @@ -158,7 +158,7 @@ #### Packages - Bindgen 0.57.0 -- Cargo-audit 0.13.1 +- Cargo-audit 0.14.0 - Cargo-outdated v0.9.14 - Cbindgen 0.18.0 - Clippy 0.0.212 @@ -183,7 +183,7 @@ ### Xamarin #### Visual Studio for Mac -- 8.8.10.2 +- 8.9.0.1651 #### Mono - 6.12.0.122 From 2c6eab40b54d7af2f62f56a8b7fe752cd8d07de8 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 9 Mar 2021 20:41:14 +0000 Subject: [PATCH 0046/3485] Updating readme file for ubuntu18 version 20210302.0 (#2814) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/linux/Ubuntu1804-README.md | 120 +++++++++++++++--------------- 1 file changed, 59 insertions(+), 61 deletions(-) diff --git a/images/linux/Ubuntu1804-README.md b/images/linux/Ubuntu1804-README.md index 59eb813e9ed8..56b0e26901ec 100644 --- a/images/linux/Ubuntu1804-README.md +++ b/images/linux/Ubuntu1804-README.md @@ -4,12 +4,11 @@ | [[ubuntu, windows] GOROOT environment variable will be removed on March, 1](https://github.com/actions/virtual-environments/issues/2683) | | [[Ubuntu] Android SDK Platforms and Build-tools that are less than version 23 will be removed on March, 1](https://github.com/actions/virtual-environments/issues/2673) | | [[Windows, Ubuntu] Boost 1.72.0 will be removed from images on March, 8](https://github.com/actions/virtual-environments/issues/2667) | -| [[Ubuntu, windows] M2_HOME variable will be removed on February, 15](https://github.com/actions/virtual-environments/issues/2600) | | [[Ubuntu, macOS] .NET 3.0 will be removed from images on March, 1](https://github.com/actions/virtual-environments/issues/2558) | | [Ubuntu-latest workflows will use Ubuntu-20.04](https://github.com/actions/virtual-environments/issues/1816) | *** # Ubuntu 18.04.5 LTS -- Image Version: 20210219.1 +- Image Version: 20210302.0 ## Installed Software ### Language and Runtime @@ -19,8 +18,8 @@ - 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, 10.1.0 - Julia 1.5.3 -- Mono 6.12.0.107 -- Node 14.15.5 +- Mono 6.12.0.122 +- Node 14.16.0 - Perl 5.26.1 - Python 2.7.17 - Python3 3.6.9 @@ -30,14 +29,14 @@ ### Package Management - cpan 1.64 - Helm 3.5.2 -- Homebrew 3.0.1 +- Homebrew 3.0.3 - Miniconda 4.9.2 - Npm 6.14.11 - Pip 9.0.1 - Pip3 9.0.1 -- Pipx 0.16.0.0 +- Pipx 0.16.1.0 - RubyGems 2.7.6 -- Vcpkg (build from master \<99dc49d>) +- Vcpkg (build from master \<307ac18>) - Yarn 1.22.5 #### Environment variables @@ -48,7 +47,7 @@ ### Project Management - Ant 1.10.5 -- Gradle 6.8.2 +- Gradle 6.8.3 - Maven 3.6.3 - Sbt 1.4.7 @@ -56,44 +55,43 @@ - 7-Zip 16.02 - Ansible 2.9.18 - apt-fast 1.9.10 -- AzCopy10 10.8.0 (available by `azcopy10` alias) -- AzCopy7 7.3.0 (available by `azcopy` alias) +- AzCopy 10.9.0 (available by `azcopy` and `azcopy10` aliases) - Bazel 4.0.0 - Bazelisk 1.7.5 - binutils 2.30 -- Buildah 1.19.4 -- CMake 3.19.5 +- Buildah 1.19.6 +- CMake 3.19.6 - CodeQL Action Bundle 2.4.2 - coreutils 8.28 - curl 7.58.0 -- Docker Compose 1.28.4 +- Docker Compose 1.28.5 - Docker-Buildx 0.5.1 - Docker-Moby Client 20.10.3+azure - Docker-Moby Server 20.10.3+azure -- Git 2.30.0 +- Git 2.30.1 - Git LFS 2.13.2 - Git-ftp 1.3.1 - Haveged 1.9.1 -- Heroku 7.47.13 -- HHVM (HipHop VM) 4.97.0 +- Heroku 7.49.1 +- HHVM (HipHop VM) 4.99.0 - jq 1.5 - Kind 0.10.0 -- Kubectl 1.19.0 -- Kustomize 4.0.1 +- Kubectl 1.20.1-5-g76a04fc +- Kustomize 4.0.4 - Leiningen 2.9.5 - m4 1.4.18 - MediaInfo 17.12 - Mercurial 4.5.3 -- Minikube 1.17.1 +- Minikube 1.18.0 - Newman 5.2.2 - nvm 0.37.2 - Packer 1.7.0 - pass 1.7.1 - PhantomJS 2.1.1 -- Podman 3.0.0 -- Pulumi 2.21.1 +- Podman 3.0.1 +- Pulumi 2.21.2 - R 4.0.4 -- Skopeo 1.2.1 +- Skopeo 1.2.2 - Sphinx Open Source Search Server 2.2.11 - SVN 1.9.7 - Swig 3.0.12 @@ -106,18 +104,18 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.73 -- AWS CLI 1.19.12 +- AWS CLI 1.19.18 - AWS CLI Session manager plugin 1.2.54.0 -- AWS SAM CLI 1.18.2 -- Azure CLI (azure-cli) 2.19.1 +- AWS SAM CLI 1.19.1 +- Azure CLI (azure-cli) 2.20.0 - Azure CLI (azure-devops) 0.18.0 -- GitHub CLI 1.6.1 -- Google Cloud SDK 328.0.0 +- GitHub CLI 1.6.2 +- Google Cloud SDK 329.0.0 - Hub CLI 2.14.2 -- Netlify CLI 3.8.4 -- oc CLI 4.6.17 +- Netlify CLI 3.10.2 +- oc CLI 4.7.0 - ORAS CLI 0.10.0 -- Vercel CLI 21.2.3 +- Vercel CLI 21.3.1 ### Java | Version | Vendor | Environment Variable | @@ -130,13 +128,13 @@ | Tool | Version | | -------- | --------------------------------- | | PHP | 7.1.33 7.2.34 7.3.27 7.4.15 8.0.2 | -| Composer | 2.0.9 | +| Composer | 2.0.11 | | PHPUnit | 8.5.14 | ### Haskell -- Cabal 3.2.0.0 -- GHC 8.10.3 -- GHCup 0.1.12 +- Cabal 3.4.0.0 +- GHC 9.0.1 +- GHCup 0.1.13 - Stack 2.5.1 ### Rust Tools @@ -150,13 +148,13 @@ - Cargo audit 0.13.1 - Cargo clippy 0.0.212 - Cargo outdated 0.9.14 -- Cbindgen 0.17.0 +- Cbindgen 0.18.0 - Rustfmt 1.4.30 ### Browsers and Drivers - Google Chrome 88.0.4324.182 - ChromeDriver 88.0.4324.96 -- Mozilla Firefox 85.0.1 +- Mozilla Firefox 86.0 - Geckodriver 0.29.0 #### Environment variables @@ -166,7 +164,7 @@ | GECKOWEBDRIVER | /usr/local/share/gecko_driver | ### .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.519 2.1.520 2.1.521 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.616 2.1.617 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 2.1.811 2.1.812 2.1.813 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.109 3.1.110 3.1.111 3.1.112 3.1.200 3.1.201 3.1.202 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402 3.1.403 3.1.404 3.1.405 3.1.406 5.0.100 5.0.101 5.0.102 5.0.103 +- 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.519 2.1.520 2.1.521 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.616 2.1.617 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 2.1.811 2.1.812 2.1.813 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.109 3.1.110 3.1.111 3.1.112 3.1.200 3.1.201 3.1.202 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402 3.1.403 3.1.404 3.1.405 3.1.406 5.0.100 5.0.101 5.0.102 5.0.103 ### 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 4.7.0 @@ -199,9 +197,9 @@ - 1.15.8 #### Node.js -- 10.23.3 -- 12.20.2 -- 14.15.5 +- 10.24.0 +- 12.21.0 +- 14.16.0 #### PyPy - 2.7.18 [PyPy 7.3.3] @@ -212,8 +210,8 @@ - 3.5.10 - 3.6.13 - 3.7.10 -- 3.8.7 -- 3.9.1 +- 3.8.8 +- 3.9.2 #### Ruby - 2.4.10 @@ -245,20 +243,20 @@ | nginx | 1.14.0 | /etc/nginx/nginx.conf | inactive | 80 | ### Android -| Package Name | Version | -| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 3.0 | -| Android SDK Build-tools | 30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3
26.0.0 26.0.1 26.0.2 26.0.3
25.0.0 25.0.1 25.0.2 25.0.3
24.0.0 24.0.1 24.0.2 24.0.3
23.0.1 23.0.2 23.0.3
22.0.1
21.1.2
20.0.0
19.1.0 | -| Android SDK Platform-Tools | 31.0.0 | -| Android SDK Platforms | android-S (rev 1)
android-30 (rev 3)
android-29 (rev 5)
android-28 (rev 6)
android-27 (rev 3)
android-26 (rev 2)
android-25 (rev 3)
android-24 (rev 2)
android-23 (rev 3)
android-22 (rev 2)
android-21 (rev 2)
android-20 (rev 2)
android-19 (rev 4)
android-18 (rev 3)
android-17 (rev 3) | -| Android SDK Tools | 26.1.1 | -| Android Support Repository | 47.0.0 | -| CMake | 3.10.2 | -| Google APIs | addon-google_apis-google-21
addon-google_apis-google-22
addon-google_apis-google-23
addon-google_apis-google-24 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 21.4.7075529 | -| SDK Patch Applier v4 | 1 | +| Package Name | Version | +| -------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 3.0 | +| Android SDK Build-tools | 30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3
26.0.0 26.0.1 26.0.2 26.0.3
25.0.0 25.0.1 25.0.2 25.0.3
24.0.0 24.0.1 24.0.2 24.0.3
23.0.1 23.0.2 23.0.3 | +| Android SDK Platform-Tools | 31.0.0 | +| Android SDK Platforms | android-S (rev 1)
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 SDK Tools | 26.1.1 | +| Android Support Repository | 47.0.0 | +| CMake | 3.10.2 | +| Google APIs | addon-google_apis-google-21
addon-google_apis-google-22
addon-google_apis-google-23
addon-google_apis-google-24 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 21.4.7075529 | +| SDK Patch Applier v4 | 1 | #### Environment variables | Name | Value | @@ -271,7 +269,7 @@ ### Cached Docker images | Repository:Tag | Digest | Created | | --------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| alpine:3.10 | sha256:f0e9534a598e501320957059cb2a23774b4d4072e37c7b2cf7e95b241f019e35 | 2020-04-24 | +| alpine:3.10 | sha256:0b4d282d7ae7cf5ed91801654a918aea45d6c1de6df0db6a29d60619141fb8de | 2021-02-24 | | alpine:3.7 | sha256:8421d9a84432575381bfabd248f1eb56f3aa21d9d7cd2511583c68c9b7511d10 | 2019-03-07 | | alpine:3.8 | sha256:2bb501e6173d9d006e56de5bce2720eb06396803300fe1687b58a7ff32bf4c14 | 2020-01-23 | | alpine:3.9 | sha256:414e0518bb9228d35e4cd5165567fb91d26c6a214e9c95899e1e056fcd349011 | 2020-04-24 | @@ -281,10 +279,10 @@ | debian:9 | sha256:d0b7b71db141cedc48e1c2807d12b199ffd7ffe75baf272a34c37480dc2159d1 | 2021-02-09 | | jekyll/builder:latest | sha256:b918b81939a1076dce89d142c0764c2c3cb93858f56ecf4f04ad0387338e77aa | 2020-12-21 | | mcr.microsoft.com/azure-pipelines/node8-typescript:latest | sha256:e52e60b9f71183969830a3664279b5d8c799b4b0ec2c25a0686f7c02f6a9669a | 2018-10-09 | -| node:10 | sha256:4fafd9b63fdfb15112775847a10b2917760c720c8c28cef5167ff40f36b3cd93 | 2021-02-12 | -| node:10-alpine | sha256:dae0a441e1b5201e074312e44b35571bed4a39b5bc07c26c1bfab9f18017ff54 | 2021-02-12 | -| node:12 | sha256:0140c4e17aa1f3fd78b939e3c7ac45accdd5274d0194046b484029a5e46b9db6 | 2021-02-12 | -| node:12-alpine | sha256:77fe10dbc042121e94db7f43b4b912a52514759b847978588eec4d5d0eb5282c | 2021-02-12 | +| node:10 | sha256:426ce4b7e659e081413b739ec3c6a6dea22dfc1a53bfaa147117dfb0238013a2 | 2021-02-23 | +| node:10-alpine | sha256:47cfff9b9eda43e97f42d516ff66c5490ed1f71262a03f3348ea867f222c1a7e | 2021-02-24 | +| node:12 | sha256:7f961434ce9e96be7bf2455bbf362152787c529bb9cf86a15ab1499ea89bfa8c | 2021-02-23 | +| node:12-alpine | sha256:5d8b181a0738654bbe659a68879298f8d2d4256685282ee1c2330d97c33e3eee | 2021-02-24 | | ubuntu:14.04 | sha256:63fce984528cec8714c365919882f8fb64c8a3edf23fdfa0b218a2756125456f | 2020-09-16 | ### Installed apt packages From 160f5bedb055c426997f67328bb6311390ea4a1d Mon Sep 17 00:00:00 2001 From: Daniel <56939361+seqdan@users.noreply.github.com> Date: Thu, 11 Mar 2021 09:21:35 +1300 Subject: [PATCH 0047/3485] Allow authentication of resource generator script via service principal (#2622) * Allow authentication of resource generator script via service principal * Re-use the given service principal in case of parametric authentication * Updated variable names * Renamed parameter and variable from AzureTenant to AzureTenantId * Added Azure DevOps pipeline to build an agent * Added link to azure pipeline to instructions * Fixed typo in link * Removed unnecessary / double brackets * Untangled credential instantiation to make it more readable * Removed example yaml file * Removed unnecessary variable assignment --- helpers/GenerateResourcesAndImage.ps1 | 67 ++++++++++++++++++++------- 1 file changed, 49 insertions(+), 18 deletions(-) diff --git a/helpers/GenerateResourcesAndImage.ps1 b/helpers/GenerateResourcesAndImage.ps1 index 67858841ff7c..d9693c516eb1 100644 --- a/helpers/GenerateResourcesAndImage.ps1 +++ b/helpers/GenerateResourcesAndImage.ps1 @@ -83,6 +83,15 @@ Function GenerateResourcesAndImage { .PARAMETER GithubFeedToken GitHub PAT to download tool packages from GitHub Package Registry + .PARAMETER AzureClientId + Client id needs to be provided for optional authentication via service principal. Example: "11111111-1111-1111-1111-111111111111" + + .PARAMETER AzureClientSecret + Client secret needs to be provided for optional authentication via service principal. Example: "11111111-1111-1111-1111-111111111111" + + .PARAMETER AzureTenantId + Tenant needs to be provided for optional authentication via service principal. Example: "11111111-1111-1111-1111-111111111111" + .EXAMPLE GenerateResourcesAndImage -SubscriptionId {YourSubscriptionId} -ResourceGroupName "shsamytest1" -ImageGenerationRepositoryRoot "C:\virtual-environments" -ImageType Ubuntu1604 -AzureLocation "East US" #> @@ -102,10 +111,16 @@ Function GenerateResourcesAndImage { [Parameter(Mandatory = $False)] [string] $GithubFeedToken, [Parameter(Mandatory = $False)] + [string] $AzureClientId, + [Parameter(Mandatory = $False)] + [string] $AzureClientSecret, + [Parameter(Mandatory = $False)] + [string] $AzureTenantId, + [Parameter(Mandatory = $False)] [Switch] $Force ) - if (([string]::IsNullOrEmpty($GithubFeedToken))) + if ([string]::IsNullOrEmpty($GithubFeedToken)) { Write-Error "'-GithubFeedToken' parameter is not specified. You have to specify valid GitHub PAT to download tool packages from GitHub Package Registry" exit 1 @@ -115,7 +130,14 @@ Function GenerateResourcesAndImage { $ServicePrincipalClientSecret = $env:UserName + [System.GUID]::NewGuid().ToString().ToUpper(); $InstallPassword = $env:UserName + [System.GUID]::NewGuid().ToString().ToUpper(); - Connect-AzAccount + if ([string]::IsNullOrEmpty($AzureClientId)) + { + Connect-AzAccount + } else { + $AzSecureSecret = ConvertTo-SecureString $AzureClientSecret -AsPlainText -Force + $AzureAppCred = New-Object System.Management.Automation.PSCredential($AzureClientId, $AzSecureSecret) + Connect-AzAccount -ServicePrincipal -Credential $AzureAppCred -Tenant $AzureTenantId + } Set-AzContext -SubscriptionId $SubscriptionId $alreadyExists = $true; @@ -171,21 +193,31 @@ Function GenerateResourcesAndImage { New-AzStorageAccount -ResourceGroupName $ResourceGroupName -AccountName $storageAccountName -Location $AzureLocation -SkuName "Standard_LRS" - $spDisplayName = [System.GUID]::NewGuid().ToString().ToUpper() - $credentialProperties = @{ StartDate=Get-Date; EndDate=Get-Date -Year 2024; Password=$ServicePrincipalClientSecret } - $credentials = New-Object -TypeName Microsoft.Azure.Commands.ActiveDirectory.PSADPasswordCredential -Property $credentialProperties - $sp = New-AzADServicePrincipal -DisplayName $spDisplayName -PasswordCredential $credentials - - $spAppId = $sp.ApplicationId - $spClientId = $sp.ApplicationId - $spObjectId = $sp.Id - Start-Sleep -Seconds $SecondsToWaitForServicePrincipalSetup - - New-AzRoleAssignment -RoleDefinitionName Contributor -ServicePrincipalName $spAppId - Start-Sleep -Seconds $SecondsToWaitForServicePrincipalSetup - $sub = Get-AzSubscription -SubscriptionId $SubscriptionId - $tenantId = $sub.TenantId - # "", "Note this variable-setting script for running Packer with these Azure resources in the future:", "==============================================================================================", "`$spClientId = `"$spClientId`"", "`$ServicePrincipalClientSecret = `"$ServicePrincipalClientSecret`"", "`$SubscriptionId = `"$SubscriptionId`"", "`$tenantId = `"$tenantId`"", "`$spObjectId = `"$spObjectId`"", "`$AzureLocation = `"$AzureLocation`"", "`$ResourceGroupName = `"$ResourceGroupName`"", "`$storageAccountName = `"$storageAccountName`"", "`$install_password = `"$install_password`"", "" + if ([string]::IsNullOrEmpty($AzureClientId)) { + # Interactive authentication: A service principal is created during runtime. + $spDisplayName = [System.GUID]::NewGuid().ToString().ToUpper() + $credentialProperties = @{ StartDate=Get-Date; EndDate=Get-Date -Year 2024; Password=$ServicePrincipalClientSecret } + $credentials = New-Object -TypeName Microsoft.Azure.Commands.ActiveDirectory.PSADPasswordCredential -Property $credentialProperties + $sp = New-AzADServicePrincipal -DisplayName $spDisplayName -PasswordCredential $credentials + + $spAppId = $sp.ApplicationId + $spClientId = $sp.ApplicationId + Start-Sleep -Seconds $SecondsToWaitForServicePrincipalSetup + + New-AzRoleAssignment -RoleDefinitionName Contributor -ServicePrincipalName $spAppId + Start-Sleep -Seconds $SecondsToWaitForServicePrincipalSetup + $sub = Get-AzSubscription -SubscriptionId $SubscriptionId + $tenantId = $sub.TenantId + # "", "Note this variable-setting script for running Packer with these Azure resources in the future:", "==============================================================================================", "`$spClientId = `"$spClientId`"", "`$ServicePrincipalClientSecret = `"$ServicePrincipalClientSecret`"", "`$SubscriptionId = `"$SubscriptionId`"", "`$tenantId = `"$tenantId`"", "`$spObjectId = `"$spObjectId`"", "`$AzureLocation = `"$AzureLocation`"", "`$ResourceGroupName = `"$ResourceGroupName`"", "`$storageAccountName = `"$storageAccountName`"", "`$install_password = `"$install_password`"", "" + } else { + # Parametrized Authentication via given service principal: The service principal with the data provided via the command line + # is used for all authentication purposes. + $spAppId = $AzureClientId + $spClientId = $AzureClientId + $credentials = $AzureAppCred + $ServicePrincipalClientSecret = $AzureClientSecret + $tenantId = $AzureTenantId + } Get-LatestCommit -ErrorAction SilentlyContinue @@ -199,7 +231,6 @@ Function GenerateResourcesAndImage { -var "client_secret=$($ServicePrincipalClientSecret)" ` -var "subscription_id=$($SubscriptionId)" ` -var "tenant_id=$($tenantId)" ` - -var "object_id=$($spObjectId)" ` -var "location=$($AzureLocation)" ` -var "resource_group=$($ResourceGroupName)" ` -var "storage_account=$($storageAccountName)" ` From 0d92dbb3bc905d21540e85c641e3798e4fe6f687 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 11 Mar 2021 13:02:36 +0000 Subject: [PATCH 0048/3485] Updating readme file for macOS-10.14 version 20210308.1 (#2884) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/macos/macos-10.14-Readme.md | 162 +++++++++++++++++------------ 1 file changed, 93 insertions(+), 69 deletions(-) diff --git a/images/macos/macos-10.14-Readme.md b/images/macos/macos-10.14-Readme.md index 3bd35a8d9037..145955e4b732 100644 --- a/images/macos/macos-10.14-Readme.md +++ b/images/macos/macos-10.14-Readme.md @@ -2,70 +2,75 @@ |-| | [[Ubuntu, macOS] .NET 3.0 will be removed from images on March, 1](https://github.com/actions/virtual-environments/issues/2558) | | [macOS 11.0 pools will be transited to private preview.](https://github.com/actions/virtual-environments/issues/2486) | -| [[all OSs] Java 7 will be removed from images on February, 8.](https://github.com/actions/virtual-environments/issues/2446) | *** # macOS 10.14 info -- System Version: macOS 10.14.6 (18G8012) +- System Version: macOS 10.14.6 (18G8022) - Kernel Version: Darwin 18.7.0 -- Image Version: 20210207.1 +- Image Version: 20210308.1 ## Installed Software ### Language and Runtime - .NET SDK 2.1.300 2.1.301 2.1.302 2.1.401 2.1.402 2.1.403 2.1.500 2.1.502 2.1.503 2.1.504 2.1.505 2.1.506 2.1.507 - Bash 3.2.57(1)-release - Clang/LLVM 11.0.0 is default -- Clang/LLVM 11.0.1 is available on `'$(brew --prefix llvm)/bin/clang'` -- gcc-10 (Homebrew GCC 10.2.0_3) 10.2.0 - available by `gcc-10` alias +- Clang/LLVM 11.1.0 is available on `'$(brew --prefix llvm)/bin/clang'` +- gcc-10 (Homebrew GCC 10.2.0_4) 10.2.0 - available by `gcc-10` alias - gcc-8 (Homebrew GCC 8.4.0_2) 8.4.0 - available by `gcc-8` alias - gcc-9 (Homebrew GCC 9.3.0_1) 9.3.0 - available by `gcc-9` alias -- GNU Fortran (Homebrew GCC 10.2.0_3) 10.2.0 - available by `gfortran-10` alias +- GNU Fortran (Homebrew GCC 10.2.0_4) 10.2.0 - available by `gfortran-10` alias - GNU Fortran (Homebrew GCC 8.4.0_2) 8.4.0 - available by `gfortran-8` alias - GNU Fortran (Homebrew GCC 9.3.0_1) 9.3.0 - available by `gfortran-9` alias -- Go 1.15.7 +- Go 1.15.8 - julia 1.5.3 - Node.js v8.17.0 -- NVM - Cached node versions: v6.17.1 v8.17.0 v10.23.2 v12.20.1 v13.14.0 v14.15.4 +- NVM - Cached node versions: v10.24.0 v12.21.0 v14.16.0 - NVM 0.37.2 - Perl 5.32.1 -- PHP 8.0.2 +- PHP 8.0.3 - Python 2.7.18 -- Python 3.9.1 -- R 4.0.3 +- Python 3.9.2 +- R 4.0.4 - Ruby 2.7.2p137 ### Package Management -- Bundler version 2.2.8 +- Bundler version 2.2.14 - Carthage 0.37.0 - CocoaPods 1.10.1 -- Composer 2.0.9 -- Homebrew 3.0.0 +- Composer 2.0.11 +- Homebrew 3.0.4 - Miniconda 4.9.2 - NPM 3.10.10 - NuGet 4.7.0.5148 - Pip 20.3.4 (python 2.7) - Pip 21.0.1 (python 3.9) -- Pipx 0.16.0.0 -- RubyGems 3.2.8 +- Pipx 0.16.1.0 +- RubyGems 3.2.14 - Yarn 1.22.5 +#### Environment variables +| Name | Value | +| ----------------------- | -------------------- | +| CONDA | /usr/local/miniconda | +| VCPKG_INSTALLATION_ROOT | | + ### Project Management - Apache Ant(TM) 1.10.9 - Apache Maven 3.6.3 -- Gradle 6.8.2 +- Gradle 6.8.3 ### Utilities -- 7-Zip 16.02 +- 7-Zip 17.03 - aria2 1.35.0 -- azcopy 10.8.0 +- azcopy 10.9.0 - bazel 3.7.1 -- bazelisk 1.7.4 +- bazelisk 1.7.5 - bsdtar 2.8.3 - available by 'tar' alias - Curl 7.75.0 - Git LFS: 2.13.2 -- Git: 2.30.0 -- GitHub CLI: 1.5.0 +- Git: 2.30.1 +- GitHub CLI: 1.7.0 - GNU parallel 20201122 -- GNU Tar 1.33 - available by 'gtar' alias +- GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.1 - gpg (GnuPG) 2.2.27 - helm v3.5.2+g167aac7 @@ -73,45 +78,52 @@ - jq 1.6 - mongo v4.4.3 - mongod v4.4.3 -- OpenSSL 1.1.1i 8 Dec 2020 `(/usr/local/opt/openssl -> /usr/local/Cellar/openssl@1.1/1.1.1i)` -- Packer 1.6.6 -- PostgreSQL 13.1 -- psql (PostgreSQL) 13.1 -- Subversion (SVN) 1.14.0 +- OpenSSL 1.1.1j 16 Feb 2021 `(/usr/local/opt/openssl -> /usr/local/Cellar/openssl@1.1/1.1.1j)` +- Packer 1.7.0 +- PostgreSQL 13.2 +- psql (PostgreSQL) 13.2 +- Subversion (SVN) 1.14.1 - Vagrant 2.2.14 - virtualbox 6.1.18r142142 -- zstd 1.4.8 +- zstd 1.4.9 ### Tools -- Aliyun CLI 3.0.70 +- Aliyun CLI 3.0.73 - App Center CLI 1.2.2 -- AWS CLI 2.1.24 -- AWS SAM CLI 1.17.0 +- AWS CLI 2.1.29 +- AWS SAM CLI 1.20.0 - AWS Session Manager CLI 1.2.30.0 -- Azure CLI 2.18.0 -- Cabal 3.2.0.0 -- Cmake 3.19.4 -- Fastlane 2.173.0 +- Azure CLI 2.20.0 +- Cabal 3.4.0.0 +- Cmake 3.19.6 +- Fastlane 2.177.0 - GHC 9.0.1 -- GHCup v0.1.12 +- GHCup v0.1.14 - Stack 2.5.1 - Xcode Command Line Tools 10.3.0.0.1.1562985497 ### Linters -- SwiftLint 0.42.0 +- SwiftLint 0.43.0 - yamllint 1.26.0 ### Browsers -- Safari 14.0.3 (14610.4.3.1.6) -- SafariDriver 14.0.3 (14610.4.3.1.6) -- Google Chrome 88.0.4324.150 -- ChromeDriver 88.0.4324.96 -- Microsoft Edge 88.0.705.63 -- MSEdgeDriver 88.0.705.63 -- Mozilla Firefox 85.0.1 +- Safari 14.0.3 (14610.4.3.1.7) +- SafariDriver 14.0.3 (14610.4.3.1.7) +- Google Chrome 89.0.4389.82 +- ChromeDriver 89.0.4389.23 +- Microsoft Edge 89.0.774.45 +- MSEdgeDriver 89.0.774.48 +- Mozilla Firefox 86.0 - geckodriver 0.29.0 +#### Environment variables +| Name | Value | +| --------------- | --------------------------------------------- | +| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/89.0.4389.23 | +| EDGEWEBDRIVER | /usr/local/share/edge_driver | +| GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | + ### Java | Version | Vendor | Environment Variable | | --------- | ------------ | -------------------- | @@ -132,48 +144,50 @@ #### Python - 2.7.18 - 3.5.10 -- 3.6.12 -- 3.7.9 -- 3.8.7 -- 3.9.1 +- 3.6.13 +- 3.7.10 +- 3.8.8 +- 3.9.2 #### PyPy - 2.7.18 [PyPy 7.3.3] - 3.6.12 [PyPy 7.3.3] #### Node.js -- 10.23.2 -- 12.20.1 -- 14.15.4 +- 10.24.0 +- 12.21.0 +- 14.16.0 #### Go - 1.13.15 - 1.14.15 - 1.15.8 +- 1.16.0 ### Rust Tools -- Cargo 1.49.0 -- Rust 1.49.0 -- Rustdoc 1.49.0 +- Cargo 1.50.0 +- Rust 1.50.0 +- Rustdoc 1.50.0 - Rustup 1.23.1 #### Packages - Bindgen 0.57.0 -- Cargo-audit 0.13.1 +- Cargo-audit 0.14.0 - Cargo-outdated v0.9.14 -- Cbindgen 0.17.0 +- Cbindgen 0.18.0 - Clippy 0.0.212 -- Rustfmt 1.4.25-stable +- Rustfmt 1.4.30-stable ### PowerShell Tools -- PowerShell 7.1.1 +- PowerShell 7.1.2 #### PowerShell Modules -| Module | Version | -| ---------- | ------- | -| Az | 4.8.0 | -| MarkdownPS | 1.9 | -| Pester | 5.1.1 | +| Module | Version | +| ---------------- | ------- | +| Az | 4.8.0 | +| MarkdownPS | 1.9 | +| Pester | 5.1.1 | +| PSScriptAnalyzer | 1.19.1 | ### Xamarin #### Visual Studio for Mac @@ -278,7 +292,7 @@ #### Xcode Support Tools - xcpretty 0.3.0 - xcversion 2.6.8 -- Nomad CLI 3.2.8 +- Nomad CLI 3.2.14 - Nomad CLI IPA ipa 0.14.3 - xctool 0.3.7 @@ -375,18 +389,28 @@ | Package Name | Version | | -------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 3.0 | -| Android Emulator | 30.3.5 | +| Android Emulator | 30.4.5 | | Android SDK Build-tools | 30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3
26.0.0 26.0.1 26.0.2 26.0.3
25.0.0 25.0.1 25.0.2 25.0.3
24.0.0 24.0.1 24.0.2 24.0.3
23.0.1 23.0.2 23.0.3 23.0.0
22.0.1 22.0.0
21.1.2 21.0.0 21.0.1 21.0.2 21.1.0 21.1.1
20.0.0
19.1.0 19.0.0 19.0.1 19.0.2 19.0.3
18.0.1 18.1.0 18.1.1
17.0.0 | -| Android SDK Platforms | android-30 (rev 3)
android-29 (rev 5)
android-28 (rev 6)
android-27 (rev 3)
android-26 (rev 2)
android-25 (rev 3)
android-24 (rev 2)
android-23 (rev 3)
android-22 (rev 2)
android-21 (rev 2)
android-20 (rev 2)
android-19 (rev 4)
android-18 (rev 3)
android-17 (rev 3)
android-16 (rev 5)
android-15 (rev 5) | -| Android SDK Platform-Tools | 30.0.5 | +| Android SDK Platforms | android-S (rev 1)
android-30 (rev 3)
android-29 (rev 5)
android-28 (rev 6)
android-27 (rev 3)
android-26 (rev 2)
android-25 (rev 3)
android-24 (rev 2)
android-23 (rev 3)
android-22 (rev 2)
android-21 (rev 2)
android-20 (rev 2)
android-19 (rev 4)
android-18 (rev 3)
android-17 (rev 3)
android-16 (rev 5)
android-15 (rev 5) | +| Android SDK Platform-Tools | 31.0.0 | | Android SDK Tools | 26.1.1 | | Android Support Repository | 47.0.0 | -| CMake | 3.6.4111459 | +| CMake | 3.10.2 | | Google APIs | addon-google_apis-google-21
addon-google_apis-google-22
addon-google_apis-google-23
addon-google_apis-google-24 | | Google Play services | 49 | | Google Repository | 58 | | NDK | 15.2.4203891
18.1.5063045
21.4.7075529
22.0.7026061 | | SDK Patch Applier v4 | 1 | +#### Environment variables +| Name | Value | +| ----------------------- | -------------------------------------------------------------------------------------------------- | +| ANDROID_HOME | /Users/runner/Library/Android/sdk | +| ANDROID_NDK_18R_PATH | /Users/runner/Library/Android/sdk/ndk/18.1.5063045 | +| ANDROID_NDK_HOME | /Users/runner/Library/Android/sdk/ndk-bundle -> /Users/runner/Library/Android/sdk/ndk/21.4.7075529 | +| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/22.0.7026061 | +| ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk-bundle -> /Users/runner/Library/Android/sdk/ndk/21.4.7075529 | +| ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | + From cb8c37dc0afbd3579ea74e4545b27d0944ec7218 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 11 Mar 2021 13:05:26 +0000 Subject: [PATCH 0049/3485] Updating readme file for macOS-10.15 version 20210307.1 (#2879) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/macos/macos-10.15-Readme.md | 34 +++++++++++++++--------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/images/macos/macos-10.15-Readme.md b/images/macos/macos-10.15-Readme.md index 6b1a12ee00c7..99ddf508bee1 100644 --- a/images/macos/macos-10.15-Readme.md +++ b/images/macos/macos-10.15-Readme.md @@ -6,7 +6,7 @@ # macOS 10.15 info - System Version: macOS 10.15.7 (19H512) - Kernel Version: Darwin 19.6.0 -- Image Version: 20210302.1 +- Image Version: 20210307.1 ## Installed Software ### Language and Runtime @@ -26,14 +26,14 @@ - NVM - Cached node versions: v10.24.0 v12.21.0 v14.16.0 - NVM 0.37.2 - Perl 5.32.1 -- PHP 8.0.2 +- PHP 8.0.3 - Python 2.7.18 - Python 3.9.2 - R 4.0.4 - Ruby 2.7.2p137 ### Package Management -- Bundler version 2.2.12 +- Bundler version 2.2.13 - Carthage 0.37.0 - CocoaPods 1.10.1 - Composer 2.0.11 @@ -44,8 +44,8 @@ - Pip 20.3.4 (python 2.7) - Pip 21.0.1 (python 3.9) - Pipx 0.16.1.0 -- RubyGems 3.2.12 -- Vcpkg 2021 (build from master \<395cb68>) +- RubyGems 3.2.13 +- Vcpkg 2021 (build from master \) - Yarn 1.22.5 #### Environment variables @@ -69,7 +69,7 @@ - Curl 7.75.0 - Git LFS: 2.13.2 - Git: 2.30.1 -- GitHub CLI: 1.6.2 +- GitHub CLI: 1.7.0 - GNU parallel 20201122 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.1 @@ -87,42 +87,42 @@ - Subversion (SVN) 1.14.1 - Vagrant 2.2.14 - virtualbox 6.1.18r142142 -- zstd 1.4.8 +- zstd 1.4.9 ### Tools - Aliyun CLI 3.0.73 - App Center CLI 2.7.4 - AWS CLI 2.1.29 -- AWS SAM CLI 1.19.1 +- AWS SAM CLI 1.20.0 - AWS Session Manager CLI 1.2.30.0 - Azure CLI 2.20.0 - Cabal 3.4.0.0 - Cmake 3.19.6 - Fastlane 2.176.0 - GHC 9.0.1 -- GHCup v0.1.13 +- GHCup v0.1.14 - Stack 2.5.1 - Xcode Command Line Tools 12.4.0.0.1.1610135815 ### Linters -- SwiftLint 0.42.0 +- SwiftLint 0.43.0 - yamllint 1.26.0 ### Browsers - Safari 14.0.3 (15610.4.3.1.6) - SafariDriver 14.0.3 (15610.4.3.1.6) -- Google Chrome 89.0.4389.72 -- ChromeDriver 88.0.4324.96 -- Microsoft Edge 88.0.705.81 -- MSEdgeDriver 88.0.705.81 +- Google Chrome 89.0.4389.82 +- ChromeDriver 89.0.4389.23 +- Microsoft Edge 89.0.774.45 +- MSEdgeDriver 89.0.774.45 - Mozilla Firefox 86.0 - geckodriver 0.29.0 #### Environment variables | Name | Value | | --------------- | --------------------------------------------- | -| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/88.0.4324.96 | +| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/89.0.4389.23 | | EDGEWEBDRIVER | /usr/local/share/edge_driver | | GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | @@ -200,7 +200,7 @@ ### Xamarin #### Visual Studio for Mac -- 8.8.10.2 +- 8.9.0.1651 #### Mono - 6.12.0.122 @@ -272,7 +272,7 @@ #### Xcode Support Tools - xcpretty 0.3.0 - xcversion 2.6.8 -- Nomad CLI 3.2.12 +- Nomad CLI 3.2.13 - Nomad CLI IPA ipa 0.14.3 - xctool 0.3.7 From d575d1bcc5c00d0ed07c64515cdd8bdb9036ab94 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Fri, 12 Mar 2021 09:36:35 +0300 Subject: [PATCH 0050/3485] set kern.maxfilesperproc=65536 (#2901) --- images/macos/provision/configuration/max-files.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/macos/provision/configuration/max-files.sh b/images/macos/provision/configuration/max-files.sh index cd1df451af4b..d788693551f8 100755 --- a/images/macos/provision/configuration/max-files.sh +++ b/images/macos/provision/configuration/max-files.sh @@ -17,7 +17,7 @@ cat > "${Launch_Daemons}/limit.maxfiles.plist" << EOF launchctl limit maxfiles - 52428 + 65536 524288 RunAtLoad From 24abe31369d43a689dc7504b700cdf9b64e6615f Mon Sep 17 00:00:00 2001 From: Darii Nurgaleev <50947177+Darleev@users.noreply.github.com> Date: Fri, 12 Mar 2021 14:41:21 +0700 Subject: [PATCH 0051/3485] [macOS] Software updates week 11 (#2900) * [macOS] Fail Pester tests on error * return it back * software update week 11 * 6.12.7 bundle default --- images/macos/toolsets/toolset-10.15.json | 15 +++++++++++---- images/macos/toolsets/toolset-11.0.json | 15 +++++++++++---- 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index 36b27e6c1fab..3c7c31b2781e 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -23,16 +23,23 @@ "6.12.0.122", "6.10.0.106", "6.8.0.123", "6.6.0.166", "6.4.0.208" ], "ios-versions": [ - "14.10.0.4", "14.8.0.3", "14.6.0.15", "14.4.1.3", "14.2.0.12", "14.0.0.0", "13.20.2.2", "13.18.2.1", "13.16.0.13", "13.14.1.39", "13.10.0.21", "13.8.3.0", "13.6.0.12", "13.4.0.2", "13.2.0.47" + "14.14.2.5", "14.10.0.4", "14.8.0.3", "14.6.0.15", "14.4.1.3", "14.2.0.12", "14.0.0.0", "13.20.2.2", "13.18.2.1", "13.16.0.13", "13.14.1.39", "13.10.0.21", "13.8.3.0", "13.6.0.12", "13.4.0.2", "13.2.0.47" ], "mac-versions": [ - "7.4.0.10", "7.2.0.3", "7.0.0.15", "6.22.1.26", "6.20.2.2", "6.18.3.2", "6.16.0.13", "6.14.1.39", "6.10.0.21", "6.8.3.0", "6.6.0.12", "6.4.0.2", "6.2.0.47" + "7.8.2.5", "7.4.0.10", "7.2.0.3", "7.0.0.15", "6.22.1.26", "6.20.2.2", "6.18.3.2", "6.16.0.13", "6.14.1.39", "6.10.0.21", "6.8.3.0", "6.6.0.12", "6.4.0.2", "6.2.0.47" ], "android-versions": [ - "11.1.0.26", "11.0.2.0", "10.3.1.4", "10.2.0.100", "10.1.3.7", "10.0.6.2" + "11.2.0.21", "11.1.0.26", "11.0.2.0", "10.3.1.4", "10.2.0.100", "10.1.3.7", "10.0.6.2" ], - "bundle-default": "6_12_6", + "bundle-default": "6_12_7", "bundles": [ + { + "symlink": "6_12_7", + "mono":"6.12", + "ios": "14.14", + "mac": "7.8", + "android": "11.2" + }, { "symlink": "6_12_6", "mono":"6.12", diff --git a/images/macos/toolsets/toolset-11.0.json b/images/macos/toolsets/toolset-11.0.json index e91513c37bbc..f49b8045897b 100644 --- a/images/macos/toolsets/toolset-11.0.json +++ b/images/macos/toolsets/toolset-11.0.json @@ -15,16 +15,23 @@ "6.12.0.122" ], "ios-versions": [ - "14.10.0.4", "14.8.0.3", "14.6.0.15", "14.4.1.3", "14.2.0.12", "14.0.0.0", "13.20.2.2" + "14.14.2.5", "14.10.0.4", "14.8.0.3", "14.6.0.15", "14.4.1.3", "14.2.0.12", "14.0.0.0", "13.20.2.2" ], "mac-versions": [ - "7.4.0.10", "7.2.0.3", "7.0.0.15", "6.22.1.26", "6.20.2.2" + "7.8.2.5", "7.4.0.10", "7.2.0.3", "7.0.0.15", "6.22.1.26", "6.20.2.2" ], "android-versions": [ - "11.1.0.26", "11.0.2.0" + "11.2.0.21", "11.1.0.26", "11.0.2.0" ], - "bundle-default": "6_12_6", + "bundle-default": "6_12_7", "bundles": [ + { + "symlink": "6_12_7", + "mono":"6.12", + "ios": "14.14", + "mac": "7.8", + "android": "11.2" + }, { "symlink": "6_12_6", "mono":"6.12", From 2f03a07621d46b4f7ed01b860cb3adc74b289353 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Fri, 12 Mar 2021 14:28:18 +0300 Subject: [PATCH 0052/3485] [Windows] Update zstd to 1.4.9 (#2899) * install from GitHub releases * rename zstd folder * change wildcard * cut messages --- images/win/scripts/Installers/Install-Zstd.ps1 | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/images/win/scripts/Installers/Install-Zstd.ps1 b/images/win/scripts/Installers/Install-Zstd.ps1 index 3770f0f1d445..cfbb94fb6bf5 100644 --- a/images/win/scripts/Installers/Install-Zstd.ps1 +++ b/images/win/scripts/Installers/Install-Zstd.ps1 @@ -3,6 +3,17 @@ ## Desc: Install zstd ################################################################################ -Choco-Install -PackageName zstandard +$url = "https://api.github.com/repos/facebook/zstd/releases/latest" +# Explicitly set type to string since match returns array by default +[System.String] $zstdLatest = (Invoke-RestMethod -Uri $url).assets.browser_download_url -match "zstd-.+-win64.zip$" +$zstdArchivePath = Start-DownloadWithRetry -Url $zstdLatest -Name "zstd-win64.zip" + +$toolPath = "C:\tools" +$zstdPath = Join-Path $toolPath zstd +Extract-7Zip -Path $zstdArchivePath -DestinationPath $toolPath +Move-Item -Path "${zstdPath}*" -Destination $zstdPath + +# Add zstd-win64 to PATH +Add-MachinePathItem $zstdPath Invoke-PesterTests -TestFile "Tools" -TestName "Zstd" From d285d2f7d395feb8853eca81bd0ae4d326be2444 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Mon, 15 Mar 2021 11:17:57 +0300 Subject: [PATCH 0053/3485] add ACCEPT_EULA=Y env var (#2908) --- images/linux/scripts/installers/configure-environment.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/images/linux/scripts/installers/configure-environment.sh b/images/linux/scripts/installers/configure-environment.sh index e1cc0a0f2e10..9b2c2c6e0f8f 100644 --- a/images/linux/scripts/installers/configure-environment.sh +++ b/images/linux/scripts/installers/configure-environment.sh @@ -1,10 +1,13 @@ #!/bin/bash -e -#Set ImageVersion and ImageOS env variables +# Set ImageVersion and ImageOS env variables echo ImageVersion=$IMAGE_VERSION | tee -a /etc/environment echo ImageOS=$IMAGE_OS | tee -a /etc/environment -# Create a file to store user-related global environment variables +# Set the ACCEPT_EULA variable to Y value to confirm your acceptance of the End-User Licensing Agreement +echo ACCEPT_EULA=Y | tee -a /etc/environment + +# Create a file to store user-related global environment variables touch /etc/profile.d/env_vars.sh # Set BASH_ENV variable pointed to the file with user-related global environment variables for non-interactive sessions echo "BASH_ENV=/etc/profile.d/env_vars.sh" | tee -a /etc/environment From dbd857624a1911570c1651efaf517f3ca44a97fc Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 15 Mar 2021 11:41:55 +0000 Subject: [PATCH 0054/3485] Updating readme file for macOS-11.0 version 20210314.1 (#2929) Co-authored-by: Image generation service account --- images/macos/macos-11.0-Readme.md | 42 ++++++++++++++++--------------- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/images/macos/macos-11.0-Readme.md b/images/macos/macos-11.0-Readme.md index 1cf30513bc0f..6b8e04781adb 100644 --- a/images/macos/macos-11.0-Readme.md +++ b/images/macos/macos-11.0-Readme.md @@ -1,16 +1,15 @@ | Announcements | |-| -| [[Ubuntu, macOS] .NET 3.0 will be removed from images on March, 1](https://github.com/actions/virtual-environments/issues/2558) | | [macOS 11.0 pools will be transited to private preview.](https://github.com/actions/virtual-environments/issues/2486) | *** # macOS 11.2 info - System Version: macOS 11.2.3 (20D91) - Kernel Version: Darwin 20.3.0 -- Image Version: 20210308.1 +- Image Version: 20210314.1 ## Installed Software ### Language and Runtime -- .NET SDK 2.1.300 2.1.301 2.1.302 2.1.401 2.1.402 2.1.403 2.1.500 2.1.502 2.1.503 2.1.504 2.1.505 2.1.506 2.1.507 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 2.1.811 2.1.812 2.1.813 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 3.1.403 3.1.404 3.1.405 3.1.406 5.0.100 5.0.101 5.0.102 5.0.200 +- .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 2.1.811 2.1.812 2.1.813 2.1.814 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 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 5.0.100 5.0.101 5.0.102 5.0.200 5.0.201 - Bash 3.2.57(1)-release - Clang/LLVM 11.1.0 is available on `'$(brew --prefix llvm)/bin/clang'` - Clang/LLVM 12.0.0 is default @@ -20,8 +19,8 @@ - GNU Fortran (Homebrew GCC 10.2.0_4) 10.2.0 - available by `gfortran-10` alias - GNU Fortran (Homebrew GCC 8.4.0_2) 8.4.0 - available by `gfortran-8` alias - GNU Fortran (Homebrew GCC 9.3.0_1) 9.3.0 - available by `gfortran-9` alias -- Go 1.15.8 -- julia 1.5.3 +- Go 1.15.10 +- julia 1.5.4 - Node.js v14.16.0 - NVM - Cached node versions: v10.24.0 v12.21.0 v14.16.0 - NVM 0.37.2 @@ -36,7 +35,7 @@ - Carthage 0.37.0 - CocoaPods 1.10.1 - Composer 2.0.11 -- Homebrew 3.0.4 +- Homebrew 3.0.5 - Miniconda 4.9.2 - NPM 6.14.11 - NuGet 5.6.0.6489 @@ -44,7 +43,7 @@ - Pip 21.0.1 (python 3.9) - Pipx 0.16.1.0 - RubyGems 3.2.14 -- Vcpkg 2021 (build from master \<0dc27b9>) +- Vcpkg 2021 (build from master \<75522bb>) - Yarn 1.22.5 #### Environment variables @@ -67,12 +66,12 @@ - bsdtar 3.3.2 - available by 'tar' alias - Curl 7.75.0 - Git LFS: 2.13.2 -- Git: 2.30.1 +- Git: 2.30.2 - GitHub CLI: 1.7.0 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.1 - gpg (GnuPG) 2.2.27 -- helm v3.5.2+g167aac7 +- helm v3.5.3+g041ce5a - Hub CLI: 2.14.2 - jq 1.6 - mongo v4.4.3 @@ -89,13 +88,13 @@ ### Tools - Aliyun CLI 3.0.73 - App Center CLI 2.7.4 -- AWS CLI 2.1.29 +- AWS CLI 2.1.30 - AWS SAM CLI 1.20.0 - AWS Session Manager CLI 1.2.30.0 - Azure CLI 2.20.0 - Cabal 3.4.0.0 - Cmake 3.19.6 -- Fastlane 2.177.0 +- Fastlane 2.178.0 - GHC 9.0.1 - GHCup v0.1.14 - Stack 2.5.1 @@ -108,11 +107,11 @@ ### Browsers - Safari 14.0.3 (16610.4.3.1.7) - SafariDriver 14.0.3 (16610.4.3.1.7) -- Google Chrome 89.0.4389.82 +- Google Chrome 89.0.4389.90 - ChromeDriver 89.0.4389.23 -- Microsoft Edge 89.0.774.45 -- MSEdgeDriver 89.0.774.48 -- Mozilla Firefox 86.0 +- Microsoft Edge 89.0.774.50 +- MSEdgeDriver 89.0.774.54 +- Mozilla Firefox 86.0.1 - geckodriver 0.29.0 #### Environment variables @@ -147,8 +146,8 @@ - 14.16.0 #### Go -- 1.15.8 -- 1.16.0 +- 1.15.10 +- 1.16.2 ### Rust Tools - Cargo 1.50.0 @@ -165,7 +164,7 @@ - Rustfmt 1.4.30-stable ### PowerShell Tools -- PowerShell 7.1.2 +- PowerShell 7.1.3 #### PowerShell Modules | Module | Version | @@ -179,16 +178,17 @@ | Name | Version | ConfigFile | ServiceStatus | ListenPort | | ----- | -------- | ------------------------------- | ------------- | ---------- | | httpd | 2.4.46_2 | /usr/local/etc/httpd/httpd.conf | stopped | 80 | -| nginx | 1.19.7 | /usr/local/etc/nginx/nginx.conf | stopped | 80 | +| nginx | 1.19.8 | /usr/local/etc/nginx/nginx.conf | stopped | 80 | ### Xamarin #### Visual Studio for Mac -- 8.9.0.1651 +- 8.9.1.34 #### Mono - 6.12.0.122 #### Xamarin.iOS +- 14.14.2.5 - 14.10.0.4 - 14.8.0.3 - 14.6.0.15 @@ -198,6 +198,7 @@ - 13.20.2.2 #### Xamarin.Mac +- 7.8.2.5 - 7.4.0.10 - 7.2.0.3 - 7.0.0.15 @@ -205,6 +206,7 @@ - 6.20.2.2 #### Xamarin.Android +- 11.2.0 - 11.1.0 - 11.0.2 From d6cc9d0e40149852adb4db9bee2916a1647d66ed Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 15 Mar 2021 12:07:06 +0000 Subject: [PATCH 0055/3485] Updating readme file for ubuntu16 version 20210309.1 (#2886) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/linux/Ubuntu1604-README.md | 53 ++++++++++++++----------------- 1 file changed, 24 insertions(+), 29 deletions(-) diff --git a/images/linux/Ubuntu1604-README.md b/images/linux/Ubuntu1604-README.md index 4dbdafb269dc..f008faa88b8e 100644 --- a/images/linux/Ubuntu1604-README.md +++ b/images/linux/Ubuntu1604-README.md @@ -8,7 +8,7 @@ | [Ubuntu-latest workflows will use Ubuntu-20.04](https://github.com/actions/virtual-environments/issues/1816) | *** # Ubuntu 16.04.7 LTS -- Image Version: 20210302.0 +- Image Version: 20210309.1 ## Installed Software ### Language and Runtime @@ -29,13 +29,13 @@ ### Package Management - cpan 1.61 - Helm 3.5.2 -- Homebrew 3.0.3 +- Homebrew 3.0.4 - Miniconda 4.9.2 - Npm 6.14.11 - Pip 8.1.1 - Pip3 8.1.1 - RubyGems 2.5.2 -- Vcpkg (build from master \<307ac18>) +- Vcpkg (build from master \<0dc27b9>) - Yarn 1.22.5 #### Environment variables @@ -59,34 +59,35 @@ - Bazelisk 1.7.5 - binutils 2.26.1 - CMake 3.19.6 -- CodeQL Action Bundle 2.4.2 +- CodeQL Action Bundle 2.4.4 - coreutils 8.25 - curl 7.47.0 - Docker Compose 1.28.5 - Docker-Buildx 0.5.1 -- Docker-Moby Client 20.10.3+azure -- Docker-Moby Server 20.10.3+azure +- Docker-Moby Client 20.10.5+azure +- Docker-Moby Server 20.10.5+azure - Git 2.29.0 - Git LFS 2.13.2 - Git-ftp 1.0.2 - Haveged 1.9.1 -- Heroku 7.49.1 +- Heroku 7.50.0 - HHVM (HipHop VM) 4.56.4 - jq 1.5 - Kind 0.10.0 - Kubectl 1.20.1-5-g76a04fc -- Kustomize 4.0.4 +- Kustomize 4.0.5 - Leiningen 2.9.5 - m4 1.4.17 - MediaInfo 0.7.82 - Mercurial 4.4.1 -- Minikube 1.18.0 +- Minikube 1.18.1 +- net-tools 1.60 - Newman 5.2.2 - nvm 0.37.2 - Packer 1.7.0 - pass 1.6.5 - PhantomJS 2.1.1 -- Pulumi 2.21.2 +- Pulumi 2.22.0 - R 4.0.4 - Sphinx Open Source Search Server 2.2.9 - SVN 1.9.3 @@ -100,18 +101,18 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.73 -- AWS CLI 1.19.18 +- AWS CLI 1.19.23 - AWS CLI Session manager plugin 1.2.54.0 -- AWS SAM CLI 1.19.1 +- AWS SAM CLI 1.20.0 - Azure CLI (azure-cli) 2.20.0 - Azure CLI (azure-devops) 0.18.0 -- GitHub CLI 1.6.2 -- Google Cloud SDK 329.0.0 +- GitHub CLI 1.7.0 +- Google Cloud SDK 330.0.0 - Hub CLI 2.14.2 -- Netlify CLI 3.10.2 +- Netlify CLI 3.10.6 - oc CLI 4.7.0 - ORAS CLI 0.10.0 -- Vercel CLI 21.3.1 +- Vercel CLI 21.3.3 ### Java | Version | Vendor | Environment Variable | @@ -123,14 +124,14 @@ ### PHP | Tool | Version | | -------- | ----------------------------------------------- | -| PHP | 5.6.40 7.0.33 7.1.33 7.2.34 7.3.27 7.4.15 8.0.2 | +| PHP | 5.6.40 7.0.33 7.1.33 7.2.34 7.3.27 7.4.16 8.0.3 | | Composer | 2.0.11 | | PHPUnit | 8.5.14 | ### Haskell - Cabal 3.4.0.0 - GHC 9.0.1 -- GHCup 0.1.13 +- GHCup 0.1.14 - Stack 2.5.1 ### Rust Tools @@ -141,15 +142,15 @@ #### Packages - Bindgen 0.57.0 -- Cargo audit 0.13.1 +- Cargo audit 0.14.0 - Cargo clippy 0.0.212 - Cargo outdated 0.9.14 - Cbindgen 0.18.0 - Rustfmt 1.4.30 ### Browsers and Drivers -- Google Chrome 88.0.4324.182 -- ChromeDriver 88.0.4324.96 +- Google Chrome 89.0.4389.82 +- ChromeDriver 89.0.4389.23 - Mozilla Firefox 86.0 - Geckodriver 0.29.0 @@ -160,7 +161,7 @@ | GECKOWEBDRIVER | /usr/local/share/gecko_driver | ### .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.519 2.1.520 2.1.521 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.616 2.1.617 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 2.1.811 2.1.812 2.1.813 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.109 3.1.110 3.1.111 3.1.112 3.1.200 3.1.201 3.1.202 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402 3.1.403 3.1.404 3.1.405 3.1.406 5.0.100 5.0.101 5.0.102 5.0.103 +- 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.519 2.1.520 2.1.521 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.616 2.1.617 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 2.1.811 2.1.812 2.1.813 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.109 3.1.110 3.1.111 3.1.112 3.1.200 3.1.201 3.1.202 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402 3.1.403 3.1.404 3.1.405 3.1.406 5.0.100 5.0.101 5.0.102 5.0.103 5.0.200 ### 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 4.7.0 @@ -181,12 +182,6 @@ - sqlcmd 17.7.0001.1 ### Cached Tools -#### Boost -| Version | Architecture | Environment Variable | -| ------- | ------------ | -------------------- | -| 1.72.0 | x64 | BOOST_ROOT_1_72_0 | - - #### Go - 1.13.15 - 1.14.15 @@ -282,7 +277,7 @@ | ubuntu:14.04 | sha256:63fce984528cec8714c365919882f8fb64c8a3edf23fdfa0b218a2756125456f | 2020-09-16 | ### Installed apt packages -- binutils, bison, brotli, build-essential, bzip2, coreutils, curl, dbus, dnsutils, dpkg, fakeroot, file, flex, ftp, gnupg2, haveged, imagemagick, iproute2, iputils-ping, jq, lib32z1, libc++-dev, libc++abi-dev, libcurl3, libgbm-dev, libgconf-2-4, libgsl-dev, libgtk-3-0, libicu55, libmagic-dev, libmagickcore-dev, libmagickwand-dev, libsecret-1-dev, libsqlite3-dev, libunwind8, libxkbfile-dev, libxss1, locales, m4, mediainfo, netcat, openssh-client, p7zip, p7zip-full, p7zip-rar, parallel, pass, patchelf, pkg-config, pollinate, rpm, rsync, shellcheck, sphinxsearch, sqlite3, ssh, subversion, sudo, swig, telnet, texinfo, time, tk, tzdata, unzip, upx, wget, xorriso, xvfb, xz-utils, yamllint, zip, zstd, zsync +- binutils, bison, brotli, build-essential, bzip2, coreutils, curl, dbus, dnsutils, dpkg, fakeroot, file, flex, ftp, gnupg2, haveged, imagemagick, iproute2, iputils-ping, jq, lib32z1, libc++-dev, libc++abi-dev, libcurl3, libgbm-dev, libgconf-2-4, libgsl-dev, libgtk-3-0, libicu55, libmagic-dev, libmagickcore-dev, libmagickwand-dev, libsecret-1-dev, libsqlite3-dev, libunwind8, libxkbfile-dev, libxss1, locales, m4, mediainfo, net-tools, netcat, openssh-client, p7zip, p7zip-full, p7zip-rar, parallel, pass, patchelf, pkg-config, pollinate, rpm, rsync, shellcheck, sphinxsearch, sqlite3, ssh, subversion, sudo, swig, telnet, texinfo, time, tk, tzdata, unzip, upx, wget, xorriso, xvfb, xz-utils, yamllint, zip, zstd, zsync From 51a9c11e33cdb5cba4a7852487a2fc15b6b6d597 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Mon, 15 Mar 2021 15:26:01 +0300 Subject: [PATCH 0056/3485] Add support for latest zstd (#2927) --- images/win/scripts/Installers/Install-Zstd.ps1 | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/images/win/scripts/Installers/Install-Zstd.ps1 b/images/win/scripts/Installers/Install-Zstd.ps1 index cfbb94fb6bf5..f29ea581383d 100644 --- a/images/win/scripts/Installers/Install-Zstd.ps1 +++ b/images/win/scripts/Installers/Install-Zstd.ps1 @@ -10,8 +10,15 @@ $zstdArchivePath = Start-DownloadWithRetry -Url $zstdLatest -Name "zstd-win64.zi $toolPath = "C:\tools" $zstdPath = Join-Path $toolPath zstd -Extract-7Zip -Path $zstdArchivePath -DestinationPath $toolPath -Move-Item -Path "${zstdPath}*" -Destination $zstdPath +$zstdParentName = [IO.Path]::GetFileNameWithoutExtension($zstdLatest) +$filesInArchive = 7z l $zstdArchivePath | Out-String + +if ($filesInArchive.Contains($zstdParentName)) { + Extract-7Zip -Path $zstdArchivePath -DestinationPath $toolPath + Move-Item -Path "${zstdPath}*" -Destination $zstdPath +} else { + Extract-7Zip -Path $zstdArchivePath -DestinationPath $zstdPath +} # Add zstd-win64 to PATH Add-MachinePathItem $zstdPath From 11437f2e63a12ccde3d03818c1248570a3b7bbb9 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Mon, 15 Mar 2021 15:33:50 +0300 Subject: [PATCH 0057/3485] set minimumFreeSpaceMB=15000 (#2934) --- images/linux/scripts/installers/validate-disk-space.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/linux/scripts/installers/validate-disk-space.sh b/images/linux/scripts/installers/validate-disk-space.sh index c81b9fa751a9..94962630b06e 100644 --- a/images/linux/scripts/installers/validate-disk-space.sh +++ b/images/linux/scripts/installers/validate-disk-space.sh @@ -5,7 +5,7 @@ ################################################################################ availableSpaceMB=$(df / -hm | sed 1d | awk '{ print $4}') -minimumFreeSpaceMB=16000 +minimumFreeSpaceMB=15000 echo "Available disk space: $availableSpaceMB MB" From e91d69a3fab8c7637cf666d643b2a2a7effde272 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 15 Mar 2021 14:26:07 +0000 Subject: [PATCH 0058/3485] Updating readme file for win19 version 20210309.0 (#2895) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/win/Windows2019-Readme.md | 285 +++++++++++++++---------------- 1 file changed, 133 insertions(+), 152 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index 53e0468b427d..513b2169a01b 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -2,11 +2,10 @@ |-| | [[ubuntu, windows] GOROOT environment variable will be removed on March, 1](https://github.com/actions/virtual-environments/issues/2683) | | [[Windows, Ubuntu] Boost 1.72.0 will be removed from images on March, 8](https://github.com/actions/virtual-environments/issues/2667) | -| [[Ubuntu, windows] M2_HOME variable will be removed on February, 15](https://github.com/actions/virtual-environments/issues/2600) | *** # Microsoft Windows Server 2019 Datacenter -- OS Version: 10.0.17763 Build 1757 -- Image Version: 20210219.1 +- OS Version: 10.0.17763 Build 1817 +- Image Version: 20210309.0 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -16,7 +15,7 @@ - Bash 4.4.23(1)-release - Go 1.15.8 - Julia 1.5.3 -- Node 14.15.5 +- Node 14.16.0 - Perl 5.32.1 - PHP 8.0.1 - Python 3.7.9 @@ -24,15 +23,15 @@ ### Package Management - Chocolatey 0.10.15 -- Composer 2.0.9 +- Composer 2.0.11 - Helm 3.5.2 - Miniconda 4.9.2 - NPM 6.14.11 - NuGet 5.8.1.7021 - pip 21.0.1 (python 3.7) -- Pipx 0.16.0.0 +- Pipx 0.16.1.0 - RubyGems 2.7.6.2 -- Vcpkg (build from master \<99dc49d>) +- Vcpkg (build from master \<0dc27b9>) - Yarn 1.22.10 #### Environment variables @@ -45,22 +44,22 @@ - Ant 1.10.9 - Gradle 6.8 - Maven 3.6.3 -- sbt 1.4.7 +- sbt 1.4.8 ### Tools - 7zip 19.00 -- azcopy 10.8.0 +- azcopy 10.9.0 - Bazel 4.0.0 - Bazelisk 1.7.5 -- Cabal 3.2.0.0 -- CMake 3.19.5 -- CodeQL Action Bundle 2.4.2 +- Cabal 3.4.0.0 +- CMake 3.19.6 +- CodeQL Action Bundle 2.4.5 - Docker 19.03.14 -- Docker-compose 1.27.4 -- ghc 8.10.3 +- Docker-compose 1.28.5 +- ghc 9.0.1 - Git 2.30.1 - Git LFS 2.13.2 -- Google Cloud SDK 328.0.0 +- Google Cloud SDK 331.0.0 - InnoSetup 6.1.2 - jq 1.6 - Kind 0.10.0 @@ -71,7 +70,7 @@ - NSIS v3.06.1 - OpenSSL 1.1.1 - Packer 1.7.0 -- Pulumi v2.21.1 +- Pulumi v2.22.0 - R 4.0.4 - Stack 2.5.1 - Subversion (SVN) 1.14.1 @@ -82,14 +81,14 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.73 -- AWS CLI 2.1.27 -- AWS SAM CLI 1.18.2 +- AWS CLI 2.1.28 +- AWS SAM CLI 1.20.0 - AWS Session Manager CLI 1.2.54.0 -- Azure CLI 2.19.1 +- Azure CLI 2.20.0 - Azure Dev Spaces CLI 1.0.20201219.2 - Azure DevOps CLI extension 0.18.0 - Cloud Foundry CLI 6.53.0 -- GitHub CLI 1.6.1 +- GitHub CLI 1.7.0 - Hub CLI 2.14.2 ### Rust Tools @@ -100,18 +99,18 @@ #### Packages - bindgen 0.57.0 -- cargo-audit 0.13.1 +- cargo-audit 0.14.0 - cargo-outdated v0.9.14 -- cbindgen 0.17.0 +- cbindgen 0.18.0 - Clippy 0.0.212 - Rustfmt 1.4.30 ### Browsers and webdrivers -- Google Chrome 88.0.4324.182 -- Chrome Driver 88.0.4324.96 -- Microsoft Edge 88.0.705.74 -- Microsoft Edge Driver 88.0.705.74 -- Mozilla Firefox 85.0.2 +- Google Chrome 89.0.4389.82 +- Chrome Driver 89.0.4389.23 +- Microsoft Edge 89.0.774.48 +- Microsoft Edge Driver 89.0.774.48 +- Mozilla Firefox 86.0 - Gecko Driver 0.29.0 - IE Driver 3.150.1.0 @@ -147,25 +146,6 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### BizTalk Server - BizTalk Server Project Build Component 3.13.765.0 ### Cached Tools -#### Boost -| Version | Architecture | Environment Variable | -| ------- | ------------ | -------------------- | -| 1.72.0 | x64, x86 | BOOST_ROOT_1_72_0 | -##### Notes: -``` -1. Environment variable "BOOST_ROOT" is not set by default. - Please make sure you set this variable value to proper value - from table above depending on the Boost version you are using. -2. If Boost was built using the boost-cmake project or from Boost 1.70.0 - on it provides a package configuration file for use with find_package's config mode. - This module looks for the package configuration file called BoostConfig.cmake or boost-config.cmake - and stores the result in CACHE entry "Boost_DIR". If found, the package configuration file - is loaded and this module returns with no further action. - See documentation of the Boost CMake package configuration for details on what it provides. - Set Boost_NO_BOOST_CMAKE to ON, to disable the search for boost-cmake. - Link: https://cmake.org/cmake/help/latest/module/FindBoost.html -``` - #### Go | Version | Architecture | Environment Variable | | ------- | ------------ | -------------------- | @@ -178,9 +158,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Node | Version | Architecture | | ------- | ------------ | -| 10.23.3 | x64 | -| 12.20.2 | x64 | -| 14.15.5 | x64 | +| 10.24.0 | x64 | +| 12.21.0 | x64 | +| 14.16.0 | x64 | #### Python @@ -190,8 +170,8 @@ 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.7 | x64, x86 | -| 3.9.1 | x64, x86 | +| 3.8.8 | x64, x86 | +| 3.9.2 | x64, x86 | #### Ruby @@ -235,7 +215,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Database tools -- Azure CosmosDb Emulator 2.11.10.0 +- Azure CosmosDb Emulator 2.11.11.0 - DacFx 15.0.4897.1 - MySQL 5.7.21.0 - SQLPS 1.0 @@ -245,52 +225,53 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Name | Version | ConfigFile | ServiceName | ServiceStatus | ListenPort | | ------ | ------- | ------------------------------------- | ----------- | ------------- | ---------- | | Apache | 2.4.46 | C:\tools\Apache24\conf\httpd.conf | Apache | Stopped | 80 | -| Nginx | 1.19.7 | C:\tools\nginx-1.19.7\conf\nginx.conf | nginx | Stopped | 80 | +| Nginx | 1.19.8 | C:\tools\nginx-1.19.8\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2019 | Name | Version | Path | | ----------------------------- | -------------- | -------------------------------------------------------------- | -| Visual Studio Enterprise 2019 | 16.8.31005.135 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | +| Visual Studio Enterprise 2019 | 16.9.31025.194 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | #### Workloads, components and extensions: | Package | Version | | ------------------------------------------------------------------------- | -------------- | -| Component.Android.NDK.R16B | 16.8.31004.167 | +| Component.Android.NDK.R16B | 16.9.31023.347 | | Component.Android.SDK25.Private | 16.0.28625.61 | -| Component.Android.SDK28 | 16.2.29003.222 | +| Component.Android.SDK30 | 16.9.31004.209 | | Component.Ant | 1.9.3.8 | | Component.Dotfuscator | 16.0.28528.71 | | Component.Linux.CMake | 16.2.29003.222 | | Component.MDD.Android | 16.0.28517.75 | | Component.MDD.Linux | 16.5.29515.121 | | Component.MDD.Linux.GCC.arm | 16.5.29515.121 | -| Component.Microsoft.VisualStudio.LiveShare | 1.0.3224 | -| Component.Microsoft.VisualStudio.RazorExtension | 16.0.28714.129 | +| Component.Microsoft.VisualStudio.LiveShare | 1.0.3587 | +| Component.Microsoft.VisualStudio.RazorExtension | 16.9.31004.209 | | Component.Microsoft.VisualStudio.Tools.Applications | 16.0.29425.2 | -| Component.Microsoft.VisualStudio.Web.AzureFunctions | 16.0.28714.129 | -| Component.Microsoft.Web.LibraryManager | 16.0.28315.86 | +| Component.Microsoft.VisualStudio.Web.AzureFunctions | 16.9.31004.209 | +| Component.Microsoft.Web.LibraryManager | 16.9.31004.209 | +| Component.Microsoft.WebTools.BrowserLink.WebLivePreview | 0.4.12.14637 | | Component.Microsoft.Windows.DriverKit | 10.0.19030.0 | | Component.OpenJDK | 16.1.28811.260 | -| Component.UnityEngine.x64 | 16.8.30509.167 | +| Component.UnityEngine.x64 | 16.9.31004.209 | | Component.Unreal | 16.1.28810.153 | | Component.Unreal.Android | 16.1.28810.153 | | Component.VSInstallerProjects | 0.9.9 | | Component.WixToolset.VisualStudioExtension.Dev16 | 1.0.0.4 | | Component.WixToolset.VisualStudioExtension.Schemas3 | 1.0.0.4 | | Component.WixToolset.VisualStudioExtension.Schemas4 | 1.0.0.4 | -| Component.Xamarin | 16.8.30509.167 | -| Component.Xamarin.RemotedSimulator | 16.8.30509.167 | -| Microsoft.Component.Azure.DataLake.Tools | 16.8.30509.167 | +| Component.Xamarin | 16.9.31004.209 | +| Component.Xamarin.RemotedSimulator | 16.9.31004.209 | +| Microsoft.Component.Azure.DataLake.Tools | 16.9.31004.209 | | Microsoft.Component.ClickOnce | 16.4.29409.204 | | Microsoft.Component.MSBuild | 16.5.29515.121 | | Microsoft.Component.NetFX.Native | 16.5.29515.121 | | Microsoft.Component.PythonTools | 16.5.29515.121 | | Microsoft.Component.PythonTools.Miniconda | 16.2.29003.222 | -| Microsoft.Component.PythonTools.Web | 16.0.28517.75 | +| Microsoft.Component.PythonTools.Web | 16.9.31004.209 | | Microsoft.Component.VC.Runtime.UCRTSDK | 16.0.28625.61 | | Microsoft.ComponentGroup.Blend | 16.0.28315.86 | -| Microsoft.ComponentGroup.ClickOnce.Publish | 16.8.30622.256 | +| Microsoft.ComponentGroup.ClickOnce.Publish | 16.9.31004.209 | | Microsoft.Net.Component.3.5.DeveloperTools | 16.0.28517.75 | | Microsoft.Net.Component.4.5.1.TargetingPack | 16.0.28517.75 | | Microsoft.Net.Component.4.5.2.TargetingPack | 16.0.28517.75 | @@ -298,10 +279,10 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.Net.Component.4.6.1.TargetingPack | 16.0.28517.75 | | Microsoft.Net.Component.4.6.2.TargetingPack | 16.0.28517.75 | | Microsoft.Net.Component.4.6.TargetingPack | 16.0.28517.75 | -| Microsoft.Net.Component.4.7.1.TargetingPack | 16.8.30509.167 | +| Microsoft.Net.Component.4.7.1.TargetingPack | 16.9.31004.209 | | Microsoft.Net.Component.4.7.2.SDK | 16.4.29409.204 | -| Microsoft.Net.Component.4.7.2.TargetingPack | 16.8.30509.167 | -| Microsoft.Net.Component.4.7.TargetingPack | 16.8.30509.167 | +| Microsoft.Net.Component.4.7.2.TargetingPack | 16.9.31004.209 | +| Microsoft.Net.Component.4.7.TargetingPack | 16.9.31004.209 | | Microsoft.Net.Component.4.8.SDK | 16.4.29313.120 | | Microsoft.Net.Component.4.TargetingPack | 16.0.28517.75 | | Microsoft.Net.ComponentGroup.4.6.2.DeveloperTools | 16.3.29207.166 | @@ -309,25 +290,25 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.Net.ComponentGroup.4.7.DeveloperTools | 16.3.29207.166 | | Microsoft.Net.ComponentGroup.DevelopmentPrerequisites | 16.3.29207.166 | | Microsoft.Net.ComponentGroup.TargetingPacks.Common | 16.0.28516.191 | -| Microsoft.Net.Core.Component.SDK.2.1 | 16.8.31004.167 | -| Microsoft.NetCore.Component.DevelopmentTools | 16.8.30607.99 | -| Microsoft.NetCore.Component.Runtime.3.1 | 16.8.31004.167 | -| Microsoft.NetCore.Component.Runtime.5.0 | 16.8.31004.167 | -| Microsoft.NetCore.Component.SDK | 16.8.31004.167 | -| Microsoft.NetCore.Component.Web | 16.5.29721.120 | +| Microsoft.Net.Core.Component.SDK.2.1 | 16.9.31024.58 | +| Microsoft.NetCore.Component.DevelopmentTools | 16.9.31004.209 | +| Microsoft.NetCore.Component.Runtime.3.1 | 16.9.31024.58 | +| Microsoft.NetCore.Component.Runtime.5.0 | 16.9.31024.58 | +| Microsoft.NetCore.Component.SDK | 16.9.31024.58 | +| Microsoft.NetCore.Component.Web | 16.9.31004.209 | | Microsoft.VisualStudio.Component.AppInsights.Tools | 16.5.29515.121 | -| Microsoft.VisualStudio.Component.AspNet45 | 16.0.28315.86 | +| Microsoft.VisualStudio.Component.AspNet45 | 16.9.31004.209 | | Microsoft.VisualStudio.Component.Azure.AuthoringTools | 16.0.28625.61 | | Microsoft.VisualStudio.Component.Azure.ClientLibs | 16.0.28315.86 | -| Microsoft.VisualStudio.Component.Azure.Compute.Emulator | 16.8.30509.167 | -| Microsoft.VisualStudio.Component.Azure.Kubernetes.Tools | 16.8.30509.167 | +| Microsoft.VisualStudio.Component.Azure.Compute.Emulator | 16.9.31004.209 | +| Microsoft.VisualStudio.Component.Azure.Kubernetes.Tools | 16.9.31004.209 | | Microsoft.VisualStudio.Component.Azure.Powershell | 16.5.29515.121 | | Microsoft.VisualStudio.Component.Azure.ResourceManager.Tools | 16.4.29409.204 | | Microsoft.VisualStudio.Component.Azure.ServiceFabric.Tools | 16.4.29313.120 | | Microsoft.VisualStudio.Component.Azure.Storage.AzCopy | 16.0.28517.75 | | Microsoft.VisualStudio.Component.Azure.Storage.Emulator | 16.4.29313.120 | -| Microsoft.VisualStudio.Component.Azure.Waverton | 16.4.29409.204 | -| Microsoft.VisualStudio.Component.Azure.Waverton.BuildTools | 16.3.29207.166 | +| Microsoft.VisualStudio.Component.Azure.Waverton | 16.9.31019.194 | +| Microsoft.VisualStudio.Component.Azure.Waverton.BuildTools | 16.9.31019.194 | | Microsoft.VisualStudio.Component.ClassDesigner | 16.0.28528.71 | | Microsoft.VisualStudio.Component.CloudExplorer | 16.0.28625.61 | | Microsoft.VisualStudio.Component.CodeMap | 16.0.28625.61 | @@ -336,26 +317,26 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Component.Debugger.JustInTime | 16.0.28517.75 | | Microsoft.VisualStudio.Component.Debugger.Snapshot | 16.5.29813.82 | | Microsoft.VisualStudio.Component.Debugger.TimeTravel | 16.5.29515.121 | -| Microsoft.VisualStudio.Component.DiagnosticTools | 16.8.30509.167 | +| Microsoft.VisualStudio.Component.DiagnosticTools | 16.9.31004.209 | | Microsoft.VisualStudio.Component.DockerTools | 16.4.29409.204 | -| Microsoft.VisualStudio.Component.DotNetModelBuilder | 16.8.30509.167 | +| Microsoft.VisualStudio.Component.DotNetModelBuilder | 16.9.31004.209 | | Microsoft.VisualStudio.Component.DslTools | 16.0.28315.86 | | Microsoft.VisualStudio.Component.EntityFramework | 16.0.28315.86 | | Microsoft.VisualStudio.Component.FSharp | 16.0.28315.86 | | Microsoft.VisualStudio.Component.FSharp.Desktop | 16.0.28315.86 | | Microsoft.VisualStudio.Component.FSharp.WebTemplates | 16.3.29207.166 | | Microsoft.VisualStudio.Component.GraphDocument | 16.0.28625.61 | -| Microsoft.VisualStudio.Component.Graphics | 16.0.28517.75 | +| Microsoft.VisualStudio.Component.Graphics | 16.9.31004.209 | | Microsoft.VisualStudio.Component.Graphics.Tools | 16.0.28625.61 | | Microsoft.VisualStudio.Component.IISExpress | 16.0.28315.86 | -| Microsoft.VisualStudio.Component.IntelliCode | 16.8.30907.39 | +| Microsoft.VisualStudio.Component.IntelliCode | 16.9.31019.194 | | Microsoft.VisualStudio.Component.IntelliTrace.FrontEnd | 16.5.29515.121 | | Microsoft.VisualStudio.Component.JavaScript.Diagnostics | 16.0.28517.75 | -| Microsoft.VisualStudio.Component.JavaScript.TypeScript | 16.8.30509.167 | +| Microsoft.VisualStudio.Component.JavaScript.TypeScript | 16.9.31004.209 | | Microsoft.VisualStudio.Component.LinqToSql | 16.0.28625.61 | -| Microsoft.VisualStudio.Component.LiveUnitTesting | 16.8.30509.167 | +| Microsoft.VisualStudio.Component.LiveUnitTesting | 16.9.31004.209 | | Microsoft.VisualStudio.Component.ManagedDesktop.Core | 16.4.29318.151 | -| Microsoft.VisualStudio.Component.ManagedDesktop.Prerequisites | 16.8.30607.99 | +| Microsoft.VisualStudio.Component.ManagedDesktop.Prerequisites | 16.9.31004.209 | | Microsoft.VisualStudio.Component.Merq | 16.2.29012.281 | | Microsoft.VisualStudio.Component.MonoDebugger | 16.0.28517.75 | | Microsoft.VisualStudio.Component.MSODBC.SQL | 16.0.28625.61 | @@ -363,9 +344,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Component.Node.Tools | 16.5.29515.121 | | Microsoft.VisualStudio.Component.NuGet | 16.1.28829.92 | | Microsoft.VisualStudio.Component.NuGet.BuildTools | 16.1.28829.92 | -| Microsoft.VisualStudio.Component.PortableLibrary | 16.8.30509.167 | +| Microsoft.VisualStudio.Component.PortableLibrary | 16.9.31004.209 | | Microsoft.VisualStudio.Component.Roslyn.Compiler | 16.0.28714.129 | -| Microsoft.VisualStudio.Component.Roslyn.LanguageServices | 16.8.30509.167 | +| Microsoft.VisualStudio.Component.Roslyn.LanguageServices | 16.9.31004.209 | | Microsoft.VisualStudio.Component.Sharepoint.Tools | 16.4.29409.204 | | Microsoft.VisualStudio.Component.SQL.ADAL | 16.0.28517.75 | | Microsoft.VisualStudio.Component.SQL.CLR | 16.0.28315.86 | @@ -376,12 +357,12 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Component.TestTools.CodedUITest | 16.0.28327.66 | | Microsoft.VisualStudio.Component.TestTools.WebLoadTest | 16.0.28625.61 | | Microsoft.VisualStudio.Component.TextTemplating | 16.0.28625.61 | -| Microsoft.VisualStudio.Component.TypeScript.4.0 | 16.0.30509.167 | +| Microsoft.VisualStudio.Component.TypeScript.4.1 | 16.0.31004.209 | | Microsoft.VisualStudio.Component.Unity | 16.0.28315.86 | | Microsoft.VisualStudio.Component.UWP.VC.ARM64 | 16.3.29207.166 | -| Microsoft.VisualStudio.Component.VC.14.25.x86.x64 | 16.8.30509.167 | -| Microsoft.VisualStudio.Component.VC.140 | 16.8.30509.167 | -| Microsoft.VisualStudio.Component.VC.ASAN | 16.5.29515.121 | +| Microsoft.VisualStudio.Component.VC.14.25.x86.x64 | 16.9.31004.209 | +| Microsoft.VisualStudio.Component.VC.140 | 16.9.31004.209 | +| Microsoft.VisualStudio.Component.VC.ASAN | 16.9.31004.209 | | Microsoft.VisualStudio.Component.VC.ATL | 16.4.29313.120 | | Microsoft.VisualStudio.Component.VC.ATL.ARM | 16.4.29313.120 | | Microsoft.VisualStudio.Component.VC.ATL.ARM.Spectre | 16.5.29721.120 | @@ -390,11 +371,11 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Component.VC.ATL.Spectre | 16.5.29515.121 | | Microsoft.VisualStudio.Component.VC.ATLMFC | 16.4.29313.120 | | Microsoft.VisualStudio.Component.VC.ATLMFC.Spectre | 16.5.29721.120 | -| Microsoft.VisualStudio.Component.VC.CLI.Support | 16.8.30509.167 | +| Microsoft.VisualStudio.Component.VC.CLI.Support | 16.9.31004.209 | | Microsoft.VisualStudio.Component.VC.CMake.Project | 16.3.29103.31 | -| Microsoft.VisualStudio.Component.VC.CoreIde | 16.8.30509.167 | +| Microsoft.VisualStudio.Component.VC.CoreIde | 16.9.31004.209 | | Microsoft.VisualStudio.Component.VC.DiagnosticTools | 16.5.29515.121 | -| Microsoft.VisualStudio.Component.VC.Llvm.Clang | 16.8.30509.167 | +| Microsoft.VisualStudio.Component.VC.Llvm.Clang | 16.9.31004.209 | | Microsoft.VisualStudio.Component.VC.Llvm.ClangToolset | 16.3.29207.166 | | Microsoft.VisualStudio.Component.VC.MFC.ARM | 16.4.29313.120 | | Microsoft.VisualStudio.Component.VC.MFC.ARM.Spectre | 16.5.29721.120 | @@ -402,17 +383,17 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Component.VC.MFC.ARM64.Spectre | 16.5.29721.120 | | Microsoft.VisualStudio.Component.VC.Redist.14.Latest | 16.5.29515.121 | | Microsoft.VisualStudio.Component.VC.Redist.MSM | 16.5.29515.121 | -| Microsoft.VisualStudio.Component.VC.Runtimes.ARM.Spectre | 16.8.30509.167 | -| Microsoft.VisualStudio.Component.VC.Runtimes.ARM64.Spectre | 16.8.30509.167 | -| Microsoft.VisualStudio.Component.VC.Runtimes.x86.x64.Spectre | 16.8.30509.167 | +| Microsoft.VisualStudio.Component.VC.Runtimes.ARM.Spectre | 16.9.31004.209 | +| Microsoft.VisualStudio.Component.VC.Runtimes.ARM64.Spectre | 16.9.31004.209 | +| Microsoft.VisualStudio.Component.VC.Runtimes.x86.x64.Spectre | 16.9.31004.209 | | Microsoft.VisualStudio.Component.VC.TestAdapterForBoostTest | 16.0.28517.75 | | Microsoft.VisualStudio.Component.VC.TestAdapterForGoogleTest | 16.0.28517.75 | -| Microsoft.VisualStudio.Component.VC.Tools.ARM | 16.8.30509.167 | -| Microsoft.VisualStudio.Component.VC.Tools.ARM64 | 16.8.30509.167 | -| Microsoft.VisualStudio.Component.VC.Tools.x86.x64 | 16.8.30712.155 | -| Microsoft.VisualStudio.Component.VC.v141.ARM | 16.8.30509.167 | +| Microsoft.VisualStudio.Component.VC.Tools.ARM | 16.9.31004.209 | +| Microsoft.VisualStudio.Component.VC.Tools.ARM64 | 16.9.31004.209 | +| Microsoft.VisualStudio.Component.VC.Tools.x86.x64 | 16.9.31004.209 | +| Microsoft.VisualStudio.Component.VC.v141.ARM | 16.9.31004.209 | | Microsoft.VisualStudio.Component.VC.v141.ARM.Spectre | 16.5.29515.121 | -| Microsoft.VisualStudio.Component.VC.v141.ARM64 | 16.8.30509.167 | +| Microsoft.VisualStudio.Component.VC.v141.ARM64 | 16.9.31004.209 | | Microsoft.VisualStudio.Component.VC.v141.ARM64.Spectre | 16.5.29515.121 | | Microsoft.VisualStudio.Component.VC.v141.ATL | 16.0.28625.61 | | Microsoft.VisualStudio.Component.VC.v141.ATL.ARM.Spectre | 16.5.29721.120 | @@ -422,57 +403,57 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Component.VC.v141.MFC.ARM.Spectre | 16.0.28625.61 | | Microsoft.VisualStudio.Component.VC.v141.MFC.ARM64.Spectre | 16.0.28625.61 | | Microsoft.VisualStudio.Component.VC.v141.MFC.Spectre | 16.0.28625.61 | -| Microsoft.VisualStudio.Component.VC.v141.x86.x64 | 16.8.30509.167 | +| Microsoft.VisualStudio.Component.VC.v141.x86.x64 | 16.9.31004.209 | | Microsoft.VisualStudio.Component.VC.v141.x86.x64.Spectre | 16.5.29515.121 | | Microsoft.VisualStudio.Component.VSSDK | 16.0.28315.86 | | Microsoft.VisualStudio.Component.Wcf.Tooling | 16.0.28625.61 | -| Microsoft.VisualStudio.Component.Web | 16.0.28517.75 | +| Microsoft.VisualStudio.Component.Web | 16.9.31004.209 | | Microsoft.VisualStudio.Component.WebDeploy | 16.0.28517.75 | | Microsoft.VisualStudio.Component.Windows10SDK | 16.4.29409.204 | -| Microsoft.VisualStudio.Component.Windows10SDK.16299 | 16.8.30509.167 | -| Microsoft.VisualStudio.Component.Windows10SDK.17134 | 16.8.30509.167 | +| Microsoft.VisualStudio.Component.Windows10SDK.16299 | 16.9.31004.209 | +| Microsoft.VisualStudio.Component.Windows10SDK.17134 | 16.9.31004.209 | | Microsoft.VisualStudio.Component.Windows10SDK.17763 | 16.0.28517.75 | | Microsoft.VisualStudio.Component.Windows10SDK.18362 | 16.1.28829.92 | -| Microsoft.VisualStudio.Component.Windows10SDK.19041 | 16.8.30509.167 | -| Microsoft.VisualStudio.Component.WinXP | 16.1.28811.260 | +| Microsoft.VisualStudio.Component.Windows10SDK.19041 | 16.9.31004.209 | +| Microsoft.VisualStudio.Component.WinXP | 16.9.31004.209 | | Microsoft.VisualStudio.Component.Workflow | 16.0.28315.86 | | Microsoft.VisualStudio.ComponentGroup.ArchitectureTools.Native | 16.0.28621.142 | -| Microsoft.VisualStudio.ComponentGroup.Azure.CloudServices | 16.4.29409.204 | -| Microsoft.VisualStudio.ComponentGroup.Azure.Prerequisites | 16.8.30509.167 | +| Microsoft.VisualStudio.ComponentGroup.Azure.CloudServices | 16.9.31019.194 | +| Microsoft.VisualStudio.ComponentGroup.Azure.Prerequisites | 16.9.31004.209 | | Microsoft.VisualStudio.ComponentGroup.Azure.ResourceManager.Tools | 16.0.28528.71 | -| Microsoft.VisualStudio.ComponentGroup.AzureFunctions | 16.0.28621.142 | -| Microsoft.VisualStudio.ComponentGroup.MSIX.Packaging | 16.8.30607.99 | +| Microsoft.VisualStudio.ComponentGroup.AzureFunctions | 16.9.31004.209 | +| Microsoft.VisualStudio.ComponentGroup.MSIX.Packaging | 16.9.31004.209 | | Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core | 16.2.29012.281 | -| Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Llvm.Clang | 16.8.30509.167 | +| Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Llvm.Clang | 16.9.31004.209 | | Microsoft.VisualStudio.ComponentGroup.UWP.NetCoreAndStandard | 16.3.29102.218 | -| Microsoft.VisualStudio.ComponentGroup.UWP.Support | 16.4.29409.204 | -| Microsoft.VisualStudio.ComponentGroup.UWP.VC | 16.8.30607.99 | -| Microsoft.VisualStudio.ComponentGroup.UWP.Xamarin | 16.8.30607.99 | -| Microsoft.VisualStudio.ComponentGroup.VisualStudioExtension.Prerequisites | 16.4.29318.151 | -| Microsoft.VisualStudio.ComponentGroup.Web | 16.4.29318.151 | -| Microsoft.VisualStudio.ComponentGroup.Web.Client | 16.8.30607.99 | -| Microsoft.VisualStudio.ComponentGroup.Web.CloudTools | 16.2.29003.222 | -| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions | 16.8.30509.167 | -| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.CMake | 16.3.29207.166 | -| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.TemplateEngine | 16.0.28315.86 | -| Microsoft.VisualStudio.Workload.Azure | 16.4.29409.204 | -| Microsoft.VisualStudio.Workload.CoreEditor | 16.0.28315.86 | +| Microsoft.VisualStudio.ComponentGroup.UWP.Support | 16.9.31004.209 | +| Microsoft.VisualStudio.ComponentGroup.UWP.VC | 16.9.31004.209 | +| Microsoft.VisualStudio.ComponentGroup.UWP.Xamarin | 16.9.31004.209 | +| Microsoft.VisualStudio.ComponentGroup.VisualStudioExtension.Prerequisites | 16.9.31004.209 | +| Microsoft.VisualStudio.ComponentGroup.Web | 16.9.31004.209 | +| Microsoft.VisualStudio.ComponentGroup.Web.Client | 16.9.31004.209 | +| Microsoft.VisualStudio.ComponentGroup.Web.CloudTools | 16.9.31004.209 | +| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions | 16.9.31004.209 | +| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.CMake | 16.9.31004.209 | +| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.TemplateEngine | 16.9.31004.209 | +| Microsoft.VisualStudio.Workload.Azure | 16.9.31004.209 | +| Microsoft.VisualStudio.Workload.CoreEditor | 16.9.31004.209 | | Microsoft.VisualStudio.Workload.Data | 16.0.28720.110 | -| Microsoft.VisualStudio.Workload.DataScience | 16.0.28720.110 | -| Microsoft.VisualStudio.Workload.ManagedDesktop | 16.8.30509.167 | -| Microsoft.VisualStudio.Workload.ManagedGame | 16.5.29514.35 | -| Microsoft.VisualStudio.Workload.NativeCrossPlat | 16.4.29409.204 | -| Microsoft.VisualStudio.Workload.NativeDesktop | 16.8.30530.185 | -| Microsoft.VisualStudio.Workload.NativeGame | 16.8.30530.185 | -| Microsoft.VisualStudio.Workload.NativeMobile | 16.5.29514.35 | -| Microsoft.VisualStudio.Workload.NetCoreTools | 16.8.30509.167 | -| Microsoft.VisualStudio.Workload.NetCrossPlat | 16.5.29514.35 | -| Microsoft.VisualStudio.Workload.NetWeb | 16.8.30509.167 | -| Microsoft.VisualStudio.Workload.Node | 16.1.28825.262 | -| Microsoft.VisualStudio.Workload.Office | 16.3.29207.166 | +| Microsoft.VisualStudio.Workload.DataScience | 16.9.31004.209 | +| Microsoft.VisualStudio.Workload.ManagedDesktop | 16.9.31004.209 | +| Microsoft.VisualStudio.Workload.ManagedGame | 16.9.31004.209 | +| Microsoft.VisualStudio.Workload.NativeCrossPlat | 16.9.31004.209 | +| Microsoft.VisualStudio.Workload.NativeDesktop | 16.9.31004.209 | +| Microsoft.VisualStudio.Workload.NativeGame | 16.9.31004.209 | +| Microsoft.VisualStudio.Workload.NativeMobile | 16.9.31004.209 | +| Microsoft.VisualStudio.Workload.NetCoreTools | 16.9.31004.209 | +| Microsoft.VisualStudio.Workload.NetCrossPlat | 16.9.31004.209 | +| Microsoft.VisualStudio.Workload.NetWeb | 16.9.31004.209 | +| Microsoft.VisualStudio.Workload.Node | 16.9.31004.209 | +| Microsoft.VisualStudio.Workload.Office | 16.9.31004.209 | | Microsoft.VisualStudio.Workload.Python | 16.0.28621.142 | -| Microsoft.VisualStudio.Workload.Universal | 16.8.30530.185 | -| Microsoft.VisualStudio.Workload.VisualStudioExtension | 16.4.29409.204 | +| Microsoft.VisualStudio.Workload.Universal | 16.9.31004.209 | +| Microsoft.VisualStudio.Workload.VisualStudioExtension | 16.9.31004.209 | | SSDT Microsoft Analysis Services Projects | 2.9.16 | | SSDT SQL Server Integration Services Projects | 3.12 | | SSDT Microsoft Reporting Services Projects | 2.6.7 | @@ -493,29 +474,29 @@ 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.28.29334 | -| Microsoft Visual C++ 2019 Debug Runtime | x64 | 14.28.29334 | -| Microsoft Visual C++ 2019 Minimum Runtime | x64 | 14.28.29334 | -| Microsoft Visual C++ 2019 Additional Runtime | x86 | 14.28.29334 | -| Microsoft Visual C++ 2019 Debug Runtime | x86 | 14.28.29334 | -| Microsoft Visual C++ 2019 Minimum Runtime | x86 | 14.28.29334 | +| Microsoft Visual C++ 2019 Additional Runtime | x64 | 14.28.29910 | +| Microsoft Visual C++ 2019 Debug Runtime | x64 | 14.28.29910 | +| Microsoft Visual C++ 2019 Minimum Runtime | x64 | 14.28.29910 | +| Microsoft Visual C++ 2019 Additional Runtime | x86 | 14.28.29910 | +| Microsoft Visual C++ 2019 Debug Runtime | x86 | 14.28.29910 | +| Microsoft Visual C++ 2019 Minimum Runtime | x86 | 14.28.29910 | ### .NET Core SDK `Location C:\Program Files\dotnet\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.519 2.1.520 2.1.521 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.616 2.1.617 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 2.1.811 2.1.812 2.1.813 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.109 3.1.110 3.1.111 3.1.112 3.1.200 3.1.201 3.1.202 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402 3.1.403 3.1.404 3.1.405 3.1.406 5.0.100 5.0.101 5.0.102 5.0.103 +- 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.519 2.1.520 2.1.521 2.1.522 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.616 2.1.617 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 2.1.811 2.1.812 2.1.813 2.1.814 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.109 3.1.110 3.1.111 3.1.112 3.1.113 3.1.200 3.1.201 3.1.202 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 5.0.100 5.0.101 5.0.102 5.0.103 5.0.104 5.0.200 5.0.201 ### .NET Core Runtime `Location: C:\Program Files\dotnet\shared\Microsoft.AspNetCore.All` -- 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23 2.1.24 2.1.25 +- 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23 2.1.24 2.1.25 2.1.26 `Location: C:\Program Files\dotnet\shared\Microsoft.AspNetCore.App` -- 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23 2.1.24 2.1.25 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9 3.1.10 3.1.11 3.1.12 5.0.0 5.0.1 5.0.2 5.0.3 +- 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23 2.1.24 2.1.25 2.1.26 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9 3.1.10 3.1.11 3.1.12 3.1.13 5.0.0 5.0.1 5.0.2 5.0.3 5.0.4 `Location: C:\Program Files\dotnet\shared\Microsoft.NETCore.App` -- 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23 2.1.24 2.1.25 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9 3.1.10 3.1.11 3.1.12 5.0.0 5.0.1 5.0.2 5.0.3 +- 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23 2.1.24 2.1.25 2.1.26 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9 3.1.10 3.1.11 3.1.12 3.1.13 5.0.0 5.0.1 5.0.2 5.0.3 5.0.4 `Location: C:\Program Files\dotnet\shared\Microsoft.WindowsDesktop.App` -- 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9 3.1.10 3.1.11 3.1.12 5.0.0 5.0.1 5.0.2 5.0.3 +- 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9 3.1.10 3.1.11 3.1.12 3.1.13 5.0.0 5.0.1 5.0.2 5.0.3 5.0.4 ### .NET Framework `Type: Developer Pack` From dc404cb9684004704ef9d0e3f5483a8b97a0d7ab Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 15 Mar 2021 14:32:08 +0000 Subject: [PATCH 0059/3485] Updating readme file for ubuntu18 version 20210309.1 (#2891) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/linux/Ubuntu1804-README.md | 53 ++++++++++++++----------------- 1 file changed, 24 insertions(+), 29 deletions(-) diff --git a/images/linux/Ubuntu1804-README.md b/images/linux/Ubuntu1804-README.md index 56b0e26901ec..dc2960e08a52 100644 --- a/images/linux/Ubuntu1804-README.md +++ b/images/linux/Ubuntu1804-README.md @@ -8,7 +8,7 @@ | [Ubuntu-latest workflows will use Ubuntu-20.04](https://github.com/actions/virtual-environments/issues/1816) | *** # Ubuntu 18.04.5 LTS -- Image Version: 20210302.0 +- Image Version: 20210309.1 ## Installed Software ### Language and Runtime @@ -29,14 +29,14 @@ ### Package Management - cpan 1.64 - Helm 3.5.2 -- Homebrew 3.0.3 +- Homebrew 3.0.4 - Miniconda 4.9.2 - Npm 6.14.11 - Pip 9.0.1 - Pip3 9.0.1 - Pipx 0.16.1.0 - RubyGems 2.7.6 -- Vcpkg (build from master \<307ac18>) +- Vcpkg (build from master \<0dc27b9>) - Yarn 1.22.5 #### Environment variables @@ -61,35 +61,36 @@ - binutils 2.30 - Buildah 1.19.6 - CMake 3.19.6 -- CodeQL Action Bundle 2.4.2 +- CodeQL Action Bundle 2.4.4 - coreutils 8.28 - curl 7.58.0 - Docker Compose 1.28.5 - Docker-Buildx 0.5.1 -- Docker-Moby Client 20.10.3+azure -- Docker-Moby Server 20.10.3+azure +- Docker-Moby Client 20.10.5+azure +- Docker-Moby Server 20.10.5+azure - Git 2.30.1 - Git LFS 2.13.2 - Git-ftp 1.3.1 - Haveged 1.9.1 -- Heroku 7.49.1 +- Heroku 7.50.0 - HHVM (HipHop VM) 4.99.0 - jq 1.5 - Kind 0.10.0 - Kubectl 1.20.1-5-g76a04fc -- Kustomize 4.0.4 +- Kustomize 4.0.5 - Leiningen 2.9.5 - m4 1.4.18 - MediaInfo 17.12 - Mercurial 4.5.3 -- Minikube 1.18.0 +- Minikube 1.18.1 +- net-tools 1.60 - Newman 5.2.2 - nvm 0.37.2 - Packer 1.7.0 - pass 1.7.1 - PhantomJS 2.1.1 - Podman 3.0.1 -- Pulumi 2.21.2 +- Pulumi 2.22.0 - R 4.0.4 - Skopeo 1.2.2 - Sphinx Open Source Search Server 2.2.11 @@ -104,18 +105,18 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.73 -- AWS CLI 1.19.18 +- AWS CLI 1.19.23 - AWS CLI Session manager plugin 1.2.54.0 -- AWS SAM CLI 1.19.1 +- AWS SAM CLI 1.20.0 - Azure CLI (azure-cli) 2.20.0 - Azure CLI (azure-devops) 0.18.0 -- GitHub CLI 1.6.2 -- Google Cloud SDK 329.0.0 +- GitHub CLI 1.7.0 +- Google Cloud SDK 330.0.0 - Hub CLI 2.14.2 -- Netlify CLI 3.10.2 +- Netlify CLI 3.10.6 - oc CLI 4.7.0 - ORAS CLI 0.10.0 -- Vercel CLI 21.3.1 +- Vercel CLI 21.3.3 ### Java | Version | Vendor | Environment Variable | @@ -127,14 +128,14 @@ ### PHP | Tool | Version | | -------- | --------------------------------- | -| PHP | 7.1.33 7.2.34 7.3.27 7.4.15 8.0.2 | +| PHP | 7.1.33 7.2.34 7.3.27 7.4.16 8.0.3 | | Composer | 2.0.11 | | PHPUnit | 8.5.14 | ### Haskell - Cabal 3.4.0.0 - GHC 9.0.1 -- GHCup 0.1.13 +- GHCup 0.1.14 - Stack 2.5.1 ### Rust Tools @@ -145,15 +146,15 @@ #### Packages - Bindgen 0.57.0 -- Cargo audit 0.13.1 +- Cargo audit 0.14.0 - Cargo clippy 0.0.212 - Cargo outdated 0.9.14 - Cbindgen 0.18.0 - Rustfmt 1.4.30 ### Browsers and Drivers -- Google Chrome 88.0.4324.182 -- ChromeDriver 88.0.4324.96 +- Google Chrome 89.0.4389.82 +- ChromeDriver 89.0.4389.23 - Mozilla Firefox 86.0 - Geckodriver 0.29.0 @@ -164,7 +165,7 @@ | GECKOWEBDRIVER | /usr/local/share/gecko_driver | ### .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.519 2.1.520 2.1.521 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.616 2.1.617 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 2.1.811 2.1.812 2.1.813 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.109 3.1.110 3.1.111 3.1.112 3.1.200 3.1.201 3.1.202 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402 3.1.403 3.1.404 3.1.405 3.1.406 5.0.100 5.0.101 5.0.102 5.0.103 +- 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.519 2.1.520 2.1.521 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.616 2.1.617 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 2.1.811 2.1.812 2.1.813 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.109 3.1.110 3.1.111 3.1.112 3.1.200 3.1.201 3.1.202 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402 3.1.403 3.1.404 3.1.405 3.1.406 5.0.100 5.0.101 5.0.102 5.0.103 5.0.200 ### 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 4.7.0 @@ -185,12 +186,6 @@ - sqlcmd 17.7.0001.1 ### Cached Tools -#### Boost -| Version | Architecture | Environment Variable | -| ------- | ------------ | -------------------- | -| 1.72.0 | x64 | BOOST_ROOT_1_72_0 | - - #### Go - 1.13.15 - 1.14.15 @@ -286,7 +281,7 @@ | ubuntu:14.04 | sha256:63fce984528cec8714c365919882f8fb64c8a3edf23fdfa0b218a2756125456f | 2020-09-16 | ### Installed apt packages -- binutils, bison, brotli, build-essential, bzip2, coreutils, curl, dbus, dnsutils, dpkg, fakeroot, file, flex, ftp, gnupg2, haveged, imagemagick, iproute2, iputils-ping, jq, lib32z1, libc++-dev, libc++abi-dev, libcurl3, libgbm-dev, libgconf-2-4, libgsl-dev, libgtk-3-0, libmagic-dev, libmagickcore-dev, libmagickwand-dev, libsecret-1-dev, libsqlite3-dev, libunwind8, libxkbfile-dev, libxss1, locales, m4, mediainfo, netcat, openssh-client, p7zip-full, p7zip-rar, parallel, pass, patchelf, pkg-config, pollinate, rpm, rsync, shellcheck, sphinxsearch, sqlite3, ssh, subversion, sudo, swig, telnet, texinfo, time, tk, tzdata, unzip, upx, wget, xorriso, xvfb, xz-utils, zip, zstd, zsync +- binutils, bison, brotli, build-essential, bzip2, coreutils, curl, dbus, dnsutils, dpkg, fakeroot, file, flex, ftp, gnupg2, haveged, imagemagick, iproute2, iputils-ping, jq, lib32z1, libc++-dev, libc++abi-dev, libcurl3, libgbm-dev, libgconf-2-4, libgsl-dev, libgtk-3-0, libmagic-dev, libmagickcore-dev, libmagickwand-dev, libsecret-1-dev, libsqlite3-dev, libunwind8, libxkbfile-dev, libxss1, locales, m4, mediainfo, net-tools, netcat, openssh-client, p7zip-full, p7zip-rar, parallel, pass, patchelf, pkg-config, pollinate, rpm, rsync, shellcheck, sphinxsearch, sqlite3, ssh, subversion, sudo, swig, telnet, texinfo, time, tk, tzdata, unzip, upx, wget, xorriso, xvfb, xz-utils, zip, zstd, zsync From 671348b62038fb4db39269d5071954b29051e412 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 15 Mar 2021 14:47:34 +0000 Subject: [PATCH 0060/3485] Updating readme file for ubuntu20 version 20210309.1 (#2887) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/linux/Ubuntu2004-README.md | 49 ++++++++++++++++--------------- 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/images/linux/Ubuntu2004-README.md b/images/linux/Ubuntu2004-README.md index 386d33de0c4c..eb81e45f6344 100644 --- a/images/linux/Ubuntu2004-README.md +++ b/images/linux/Ubuntu2004-README.md @@ -8,7 +8,7 @@ | [Ubuntu-latest workflows will use Ubuntu-20.04](https://github.com/actions/virtual-environments/issues/1816) | *** # Ubuntu 20.04.2 LTS -- Image Version: 20210302.0 +- Image Version: 20210309.1 ## Installed Software ### Language and Runtime @@ -29,14 +29,14 @@ ### Package Management - cpan 1.64 - Helm 3.5.2 -- Homebrew 3.0.3 +- Homebrew 3.0.4 - Miniconda 4.9.2 - Npm 6.14.11 - Pip 20.0.2 - Pip3 20.0.2 - Pipx 0.16.1.0 - RubyGems 3.1.2 -- Vcpkg (build from master \<307ac18>) +- Vcpkg (build from master \<0dc27b9>) - Yarn 1.22.5 #### Environment variables @@ -61,36 +61,37 @@ - binutils 2.34 - Buildah 1.19.6 - CMake 3.19.6 -- CodeQL Action Bundle 2.4.2 +- CodeQL Action Bundle 2.4.4 - coreutils 8.30 - curl 7.68.0 - Docker Compose 1.28.5 - Docker-Buildx 0.5.1 -- Docker-Moby Client 20.10.3+azure -- Docker-Moby Server 20.10.3+azure -- Fastlane 2.176.0 +- Docker-Moby Client 20.10.5+azure +- Docker-Moby Server 20.10.5+azure +- Fastlane 2.177.0 - Git 2.30.1 - Git LFS 2.13.2 - Git-ftp 1.6.0 - Haveged 1.9.1 -- Heroku 7.49.1 +- Heroku 7.50.0 - HHVM (HipHop VM) 4.99.0 - jq 1.6 - Kind 0.10.0 - Kubectl 1.20.1-5-g76a04fc -- Kustomize 4.0.4 +- Kustomize 4.0.5 - Leiningen 2.9.5 - m4 1.4.18 - MediaInfo 19.09 - Mercurial 5.3.1 -- Minikube 1.18.0 +- Minikube 1.18.1 +- net-tools 1.60 - Newman 5.2.2 - nvm 0.37.2 - Packer 1.7.0 - pass 1.7.3 - PhantomJS 2.1.1 - Podman 3.0.1 -- Pulumi 2.21.2 +- Pulumi 2.22.0 - R 4.0.4 - Skopeo 1.2.2 - Sphinx Open Source Search Server 2.2.11 @@ -107,16 +108,16 @@ - Alibaba Cloud CLI 3.0.73 - AWS CLI 2.1.29 - AWS CLI Session manager plugin 1.2.54.0 -- AWS SAM CLI 1.19.1 +- AWS SAM CLI 1.20.0 - Azure CLI (azure-cli) 2.20.0 - Azure CLI (azure-devops) 0.18.0 -- GitHub CLI 1.6.2 -- Google Cloud SDK 329.0.0 +- GitHub CLI 1.7.0 +- Google Cloud SDK 330.0.0 - Hub CLI 2.14.2 -- Netlify CLI 3.10.2 +- Netlify CLI 3.10.6 - oc CLI 4.7.0 - ORAS CLI 0.10.0 -- Vercel CLI 21.3.1 +- Vercel CLI 21.3.3 ### Java | Version | Vendor | Environment Variable | @@ -132,14 +133,14 @@ ### PHP | Tool | Version | | -------- | ------------ | -| PHP | 7.4.15 8.0.2 | +| PHP | 7.4.16 8.0.3 | | Composer | 2.0.11 | | PHPUnit | 8.5.14 | ### Haskell - Cabal 3.4.0.0 - GHC 9.0.1 -- GHCup 0.1.13 +- GHCup 0.1.14 - Stack 2.5.1 ### Rust Tools @@ -150,16 +151,16 @@ #### Packages - Bindgen 0.57.0 -- Cargo audit 0.13.1 +- Cargo audit 0.14.0 - Cargo clippy 0.0.212 - Cargo outdated 0.9.14 - Cbindgen 0.18.0 - Rustfmt 1.4.30 ### Browsers and Drivers -- Chromium 88.0.4324.182 -- Google Chrome 88.0.4324.182 -- ChromeDriver 88.0.4324.96 +- Chromium 89.0.4389.82 +- Google Chrome 89.0.4389.82 +- ChromeDriver 89.0.4389.23 - Mozilla Firefox 86.0 - Geckodriver 0.29.0 @@ -170,7 +171,7 @@ | GECKOWEBDRIVER | /usr/local/share/gecko_driver | ### .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.519 2.1.520 2.1.521 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.616 2.1.617 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 2.1.811 2.1.812 2.1.813 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.109 3.1.110 3.1.111 3.1.112 3.1.200 3.1.201 3.1.202 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402 3.1.403 3.1.404 3.1.405 3.1.406 5.0.100 5.0.101 5.0.102 5.0.103 +- 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.519 2.1.520 2.1.521 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.616 2.1.617 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 2.1.811 2.1.812 2.1.813 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.109 3.1.110 3.1.111 3.1.112 3.1.200 3.1.201 3.1.202 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402 3.1.403 3.1.404 3.1.405 3.1.406 5.0.100 5.0.101 5.0.102 5.0.103 5.0.200 ### Az Module - 3.8.0 4.8.0 @@ -287,7 +288,7 @@ | ubuntu:14.04 | sha256:63fce984528cec8714c365919882f8fb64c8a3edf23fdfa0b218a2756125456f | 2020-09-16 | ### Installed apt packages -- binutils, bison, brotli, build-essential, bzip2, chromium-browser, coreutils, curl, dbus, dnsutils, dpkg, fakeroot, file, flex, ftp, gnupg2, haveged, imagemagick, iproute2, iputils-ping, jq, lib32z1, libc++-dev, libc++abi-dev, libcurl4, libgbm-dev, libgconf-2-4, libgsl-dev, libgtk-3-0, libmagic-dev, libmagickcore-dev, libmagickwand-dev, libsecret-1-dev, libsqlite3-dev, libunwind8, libxkbfile-dev, libxss1, locales, m4, mediainfo, netcat, openssh-client, p7zip-full, p7zip-rar, parallel, pass, patchelf, pkg-config, pollinate, python-is-python3, rpm, rsync, shellcheck, sphinxsearch, sqlite3, ssh, subversion, sudo, swig, telnet, texinfo, time, tk, tzdata, unzip, upx, wget, xorriso, xvfb, xz-utils, zip, zstd, zsync +- binutils, bison, brotli, build-essential, bzip2, chromium-browser, coreutils, curl, dbus, dnsutils, dpkg, fakeroot, file, flex, ftp, gnupg2, haveged, imagemagick, iproute2, iputils-ping, jq, lib32z1, libc++-dev, libc++abi-dev, libcurl4, libgbm-dev, libgconf-2-4, libgsl-dev, libgtk-3-0, libmagic-dev, libmagickcore-dev, libmagickwand-dev, libsecret-1-dev, libsqlite3-dev, libunwind8, libxkbfile-dev, libxss1, locales, m4, mediainfo, net-tools, netcat, openssh-client, p7zip-full, p7zip-rar, parallel, pass, patchelf, pkg-config, pollinate, python-is-python3, rpm, rsync, shellcheck, sphinxsearch, sqlite3, ssh, subversion, sudo, swig, telnet, texinfo, time, tk, tzdata, unzip, upx, wget, xorriso, xvfb, xz-utils, zip, zstd, zsync From 758e6ef26792c0e9dbb653721389793ccfd9374d Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Mon, 15 Mar 2021 21:05:15 +0300 Subject: [PATCH 0061/3485] add lerna version (#2914) --- .../SoftwareReport/SoftwareReport.Common.psm1 | 5 +++++ .../SoftwareReport.Generator.ps1 | 18 ++++++++++++------ 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 index e8a98317faf5..d0fa915e2cd5 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 @@ -84,6 +84,11 @@ function Get-JuliaVersion { return "Julia $juliaVersion" } +function Get-LernaVersion { + $version = lerna -v + return "Lerna $version" +} + function Get-HomebrewVersion { $result = Get-CommandResult "brew -v" $result.Output -match "Homebrew (?\d+\.\d+\.\d+)" | Out-Null diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index 766480894513..e62c249beb17 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -77,14 +77,20 @@ $markdown += Build-PackageManagementEnvironmentTable | New-MDTable $markdown += New-MDNewLine $markdown += New-MDHeader "Project Management" -Level 3 -$markdown += New-MDList -Style Unordered -Lines (@( - (Get-AntVersion), - (Get-GradleVersion), - (Get-MavenVersion), - (Get-SbtVersion) - ) | Sort-Object +$projectManagementList = @( + (Get-AntVersion), + (Get-GradleVersion), + (Get-MavenVersion), + (Get-SbtVersion) ) +if (Test-IsUbuntu20) { + $projectManagementList += @( + (Get-LernaVersion) + ) +} +$markdown += New-MDList -Style Unordered -Lines ($projectManagementList | Sort-Object) + $markdown += New-MDHeader "Tools" -Level 3 $toolsList = @( (Get-7zipVersion), From ef6e8c905fa2da104731ae0d2145f4ac724774ed Mon Sep 17 00:00:00 2001 From: Nikita Bykov <49442273+nikita-bykov@users.noreply.github.com> Date: Tue, 16 Mar 2021 17:13:54 +0300 Subject: [PATCH 0062/3485] [MacOS] Move preinstalled java distributions to the toolcache directory (#2883) * Move java to the toolcache * resolved comments * added sudo for ln command * fixed versions and added symlink * fixed openjdk.sh * fixed typo * updated SoftwareReport * fixed SoftwareReport * fixed SoftwareReport * fixed tool name Co-authored-by: Nikita Bykov --- images/macos/provision/core/openjdk.sh | 47 ++++++++++++++----- .../software-report/SoftwareReport.Java.psm1 | 14 ++---- images/macos/tests/Java.Tests.ps1 | 10 +--- 3 files changed, 40 insertions(+), 31 deletions(-) diff --git a/images/macos/provision/core/openjdk.sh b/images/macos/provision/core/openjdk.sh index 7a4a967e3223..eb4034b2cb30 100644 --- a/images/macos/provision/core/openjdk.sh +++ b/images/macos/provision/core/openjdk.sh @@ -1,28 +1,53 @@ #!/bin/bash -e -o pipefail source ~/utils/utils.sh +JAVA_TOOLCACHE_PATH=$AGENT_TOOLSDIRECTORY/Java_Adopt_jdk + createEnvironmentVariable() { - local VARIABLE_NAME=$1 - local JAVA_VERSION=$2 - if [[ $JAVA_VERSION == "8" ]]; then - JAVA_VERSION="1.${JAVA_VERSION}" + local JAVA_VERSION=$1 + local JAVA_PATH=$2 + + local JAVA_HOME_PATH=$JAVA_PATH/Contents/Home + if [[ $JAVA_VERSION == $JAVA_DEFAULT ]]; then + echo "export JAVA_HOME=${JAVA_HOME_PATH}" >> "${HOME}/.bashrc" fi - local JAVA_PATH=$(/usr/libexec/java_home -v${JAVA_VERSION}) - echo "export ${VARIABLE_NAME}=${JAVA_PATH}" >> "${HOME}/.bashrc" + echo "export JAVA_HOME_${JAVA_VERSION}_X64=${JAVA_HOME_PATH}" >> "${HOME}/.bashrc" } -brew tap AdoptOpenJDK/openjdk +installJavaFromAdoptOpenJDK() { + local JAVA_VERSION=$1 + + # Get link for Java binaries and Java version + assetUrl=$(curl -s "https://api.adoptopenjdk.net/v3/assets/latest/${JAVA_VERSION}/hotspot") + asset=$(echo $assetUrl | jq -r '.[] | select(.binary.os=="mac" and .binary.image_type=="jdk" and .binary.architecture=="x64")') + archivePath=$(echo $asset | jq -r '.binary.package.link') + fullVersion=$(echo $asset | jq -r '.version.semver') + + javaToolcacheVersionPath=$JAVA_TOOLCACHE_PATH/$fullVersion + javaToolcacheVersionArchPath=$javaToolcacheVersionPath/x64 + + # Download and extract Java binaries + download_with_retries $archivePath /tmp OpenJDK${JAVA_VERSION}.tar.gz + mkdir -p $javaToolcacheVersionArchPath + tar -xzf /tmp/OpenJDK${JAVA_VERSION}.tar.gz -C $javaToolcacheVersionArchPath --strip-components=1 + # Create complete file + touch $javaToolcacheVersionPath/x64.complete + + createEnvironmentVariable $JAVA_VERSION $javaToolcacheVersionArchPath + + # Create a symlink to '/Library/Java/JavaVirtualMachines' + # so '/usr/libexec/java_home' will be able to find Java + sudo ln -sf $javaToolcacheVersionArchPath /Library/Java/JavaVirtualMachines/adoptopenjdk-${JAVA_VERSION}.jdk +} JAVA_VERSIONS_LIST=($(get_toolset_value '.java.versions | .[]')) JAVA_DEFAULT=$(get_toolset_value '.java.default') + for JAVA_VERSION in "${JAVA_VERSIONS_LIST[@]}" do - brew install --cask "adoptopenjdk${JAVA_VERSION}" - createEnvironmentVariable "JAVA_HOME_${JAVA_VERSION}_X64" $JAVA_VERSION + installJavaFromAdoptOpenJDK $JAVA_VERSION done -createEnvironmentVariable "JAVA_HOME" $JAVA_DEFAULT - echo Installing Maven... brew_smart_install "maven" diff --git a/images/macos/software-report/SoftwareReport.Java.psm1 b/images/macos/software-report/SoftwareReport.Java.psm1 index f9d928f8226e..29dc61dfc229 100644 --- a/images/macos/software-report/SoftwareReport.Java.psm1 +++ b/images/macos/software-report/SoftwareReport.Java.psm1 @@ -1,12 +1,3 @@ -function Get-JavaFullVersion { - param($JavaRootPath) - - $javaBinPath = Join-Path $javaRootPath "/bin/java" - $javaVersionOutput = (Get-CommandResult "$javaBinPath -version").Output - $matchResult = $javaVersionOutput | Select-String '^openjdk version \"([\d\._]+)\"' - return $matchResult.Matches.Groups[1].Value -} - function Get-JavaVersions { $defaultJavaPath = Get-Item env:JAVA_HOME $javaVersions = Get-Item env:JAVA_HOME_*_X64 @@ -17,12 +8,13 @@ function Get-JavaVersions { return $javaVersions | Sort-Object $sortRules | ForEach-Object { $javaPath = $_.Value - $version = Get-JavaFullVersion $javaPath + # Take semver from the java path + $version = $javaPath.split('/')[5] $defaultPostfix = ($javaPath -eq $defaultJavaPath) ? " (default)" : "" [PSCustomObject] @{ "Version" = $version + $defaultPostfix - "Vendor" = "AdoptOpenJDK" + "Vendor" = "Adopt OpenJDK" "Environment Variable" = $_.Name } } diff --git a/images/macos/tests/Java.Tests.ps1 b/images/macos/tests/Java.Tests.ps1 index f455cf731de2..340e0ef98b6c 100644 --- a/images/macos/tests/Java.Tests.ps1 +++ b/images/macos/tests/Java.Tests.ps1 @@ -35,15 +35,7 @@ Describe "Java" { "/usr/libexec/java_home -v${Version}" | Should -ReturnZeroExitCode } - if ($_.Title -ne "Default") { - It "Version is valid" -TestCases $_ { - $javaRootPath = "/Library/Java/JavaVirtualMachines/adoptopenjdk-${Title}.jdk/Contents/Home" - $javaBinPath = Join-Path $javaRootPath "/bin/java" - Validate-JavaVersion -JavaCommand "$javaBinPath -version" -ExpectedVersion $Version - } - } - - It "" -TestCases $_ { + It "Java " -TestCases $_ { $envVariablePath = Get-EnvironmentVariable $EnvVariable $javaBinPath = Join-Path $envVariablePath "/bin/java" Validate-JavaVersion -JavaCommand "$javaBinPath -version" -ExpectedVersion $Version From 0cf21e451224281a74a004ae22fd456b5bad0f2b Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Tue, 16 Mar 2021 17:16:16 +0300 Subject: [PATCH 0063/3485] [Windows] Move preinstalled java distributions to the toolcache directory (#2903) * Move installation to toolcache folder * Change Set-JavaPath function * remove old java report function * Change report function to output full semver * small improvments * nitpicks + remove java root path * Adoptium -> Adopt --- .../scripts/Installers/Install-JavaTools.ps1 | 53 +++++++++++++------ .../SoftwareReport/SoftwareReport.Common.psm1 | 24 --------- .../SoftwareReport/SoftwareReport.Java.psm1 | 12 +---- 3 files changed, 40 insertions(+), 49 deletions(-) diff --git a/images/win/scripts/Installers/Install-JavaTools.ps1 b/images/win/scripts/Installers/Install-JavaTools.ps1 index 2179008a060e..c571d34fc4a8 100644 --- a/images/win/scripts/Installers/Install-JavaTools.ps1 +++ b/images/win/scripts/Installers/Install-JavaTools.ps1 @@ -6,19 +6,19 @@ function Set-JavaPath { param ( [string] $Version, - [string] $JavaRootPath, + [string] $Architecture = "x64", [switch] $Default ) - $matchedString = "jdk-?$Version" - $javaPath = (Get-ChildItem -Path $JavaRootPath | Where-Object { $_ -match $matchedString}).FullName + $javaPathPattern = Join-Path -Path $env:AGENT_TOOLSDIRECTORY -ChildPath "Java_Adopt_jdk/${Version}*/${Architecture}" + $javaPath = (Get-Item -Path $javaPathPattern).FullName if ([string]::IsNullOrEmpty($javaPath)) { - Write-Host "Not found path to Java $Version" + Write-Host "Not found path to Java '${Version}'" exit 1 } - Write-Host "Set JAVA_HOME_${Version}_X64 environmental variable as $javaPath" + Write-Host "Set 'JAVA_HOME_${Version}_X64' environmental variable as $javaPath" setx JAVA_HOME_${Version}_X64 $javaPath /M if ($Default) @@ -50,31 +50,54 @@ function Set-JavaPath { function Install-JavaFromAdoptOpenJDK { param( [string] $JDKVersion, - [string] $DestinationPath + [string] $Architecture = "x64" ) - $assets = Invoke-RestMethod -Uri "https://api.adoptopenjdk.net/v3/assets/latest/$JDKVersion/hotspot" - $downloadUrl = ($assets | Where-Object { + # Get Java version from adopt openjdk api + $assetUrl = Invoke-RestMethod -Uri "https://api.adoptopenjdk.net/v3/assets/latest/${JDKVersion}/hotspot" + $asset = $assetUrl | Where-Object { $_.binary.os -eq "windows" ` - -and $_.binary.architecture -eq "x64" ` + -and $_.binary.architecture -eq $Architecture ` -and $_.binary.image_type -eq "jdk" - }).binary.package.link + } + $downloadUrl = $asset.binary.package.link + $fullJavaVersion = $asset.version.semver + # Download and extract java binaries to temporary folder $archivePath = Start-DownloadWithRetry -Url $downloadUrl -Name $([IO.Path]::GetFileName($downloadUrl)) - Extract-7Zip -Path $archivePath -DestinationPath $DestinationPath + $javaTempPath = Join-Path -Path $env:TEMP -ChildPath "Java_$fullJavaVersion" + Extract-7Zip -Path $archivePath -DestinationPath $javaTempPath + $javaTempBinariesPath = Join-Path -Path $javaTempPath -ChildPath "\jdk*\" + + # Create directories in toolcache path + $javaToolcachePath = Join-Path -Path $env:AGENT_TOOLSDIRECTORY -ChildPath "Java_Adopt_jdk" + $javaVersionPath = Join-Path -Path $javaToolcachePath -ChildPath $fullJavaVersion + $javaArchPath = Join-Path -Path $javaVersionPath -ChildPath $Architecture + + if (-not (Test-Path $javaToolcachePath)) + { + Write-Host "Creating Adopt openjdk toolcache folder" + New-Item -ItemType Directory -Path $javaToolcachePath | Out-Null + } + + Write-Host "Creating Java '${fullJavaVersion}' folder in '${javaVersionPath}'" + New-Item -ItemType Directory -Path $javaVersionPath -Force | Out-Null + + # Complete the installation by moving Java binaries from temporary directory to toolcache and creating the complete file + Move-Item -Path $javaTempBinariesPath -Destination $javaArchPath + New-Item -ItemType File -Path $javaVersionPath -Name "$Architecture.complete" | Out-Null } $jdkVersions = (Get-ToolsetContent).java.versions $defaultVersion = (Get-ToolsetContent).java.default -$javaRootPath = "C:\Program Files\Java\" foreach ($jdkVersion in $jdkVersions) { - Install-JavaFromAdoptOpenJDK -JDKVersion $jdkVersion -DestinationPath $javaRootPath + Install-JavaFromAdoptOpenJDK -JDKVersion $jdkVersion if ($jdkVersion -eq $defaultVersion) { - Set-JavaPath -Version $jdkVersion -JavaRootPath $javaRootPath -Default + Set-JavaPath -Version $jdkVersion -Default } else { - Set-JavaPath -Version $jdkVersion -JavaRootPath $javaRootPath + Set-JavaPath -Version $jdkVersion } } diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 index 71f315c02e16..91050716966e 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 @@ -13,30 +13,6 @@ function Get-BashVersion { return "Bash $version" } -function Get-JavaVersionsList { - param( - [string] $DefaultVersion - ) - - $postfix = "" - $javaDir = Join-Path $env:PROGRAMFILES "Java" - return Get-ChildItem $javaDir | ForEach-Object { - $javaBinPath = Join-Path $_ "bin" - $rawVersion = & cmd /c "`"$javaBinPath\java.exe`" -version 2>&1" | Out-String - $rawVersion -match 'openjdk version "(?.+)"' | Out-Null - $version = $Matches.Version - if ($version -match $DefaultVersion) { - $postfix = "(default)" - } else { - $postfix = "" - } - return "Java $version $postfix" - } | Sort-Object { - $version = ($_.Split(" ")[1]).Split("_")[0] - return [System.Version]$version - } -} - function Get-RustVersion { $rustVersion = [regex]::matches($(rustc --version), "\d+\.\d+\.\d+").Value return $rustVersion diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Java.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Java.psm1 index c319c5bea1e4..5998b33ef126 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Java.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Java.psm1 @@ -1,12 +1,3 @@ -function Get-JavaFullVersion { - param($JavaRootPath) - - $javaBinPath = Join-Path "$javaRootPath" "/bin/java" - $javaVersionOutput = (Get-CommandResult "`"$javaBinPath`" -version").Output - $matchResult = $javaVersionOutput | Select-String '^openjdk version \"([\d\._]+)\"' - return $matchResult.Matches.Groups[1].Value -} - function Get-JavaVersions { $defaultJavaPath = $env:JAVA_HOME $javaVersions = Get-Item env:JAVA_HOME_*_X64 @@ -17,7 +8,8 @@ function Get-JavaVersions { return $javaVersions | Sort-Object $sortRules | ForEach-Object { $javaPath = $_.Value - $version = Get-JavaFullVersion "$javaPath" + # Take semver from the java path + $version = (Split-Path $javaPath) -replace "\w:\\.*\\" $defaultPostfix = ($javaPath -eq $defaultJavaPath) ? " (default)" : "" [PSCustomObject] @{ From b04c65a83cca105ee2f7186e1c4d5b6e2a610d65 Mon Sep 17 00:00:00 2001 From: Patrick C Date: Wed, 17 Mar 2021 03:54:05 -0400 Subject: [PATCH 0064/3485] Update name for oc cli to OpenShift CLI (#2949) --- images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 index b2dfa7ba873a..739bfa8d85da 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 @@ -286,7 +286,7 @@ function Get-NetlifyCliVersion { function Get-OCCliVersion { $ocVersion = oc version | Take-OutputPart -Part 2 | Take-OutputPart -Part 0 -Delimiter "-" - return "oc CLI $ocVersion" + return "OpenShift CLI $ocVersion" } function Get-ORASCliVersion { @@ -316,4 +316,4 @@ function Get-SphinxVersion { function Get-YamllintVersion { return "$(yamllint --version)" -} \ No newline at end of file +} From 8c431db88448fcdfe70a8e239ae65397267f58fb Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 17 Mar 2021 16:26:40 +0000 Subject: [PATCH 0065/3485] Updating readme file for win16 version 20210309.0 (#2909) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/win/Windows2016-Readme.md | 130 +++++++++++++------------------ 1 file changed, 55 insertions(+), 75 deletions(-) diff --git a/images/win/Windows2016-Readme.md b/images/win/Windows2016-Readme.md index d1318350d4c9..fbac81292106 100644 --- a/images/win/Windows2016-Readme.md +++ b/images/win/Windows2016-Readme.md @@ -2,18 +2,17 @@ |-| | [[ubuntu, windows] GOROOT environment variable will be removed on March, 1](https://github.com/actions/virtual-environments/issues/2683) | | [[Windows, Ubuntu] Boost 1.72.0 will be removed from images on March, 8](https://github.com/actions/virtual-environments/issues/2667) | -| [[Ubuntu, windows] M2_HOME variable will be removed on February, 15](https://github.com/actions/virtual-environments/issues/2600) | *** # Microsoft Windows Server 2016 Datacenter - OS Version: 10.0.14393 Build 4225 -- Image Version: 20210219.1 +- Image Version: 20210309.0 ## Installed Software ### Language and Runtime - Bash 4.4.23(1)-release - Go 1.15.8 - Julia 1.5.3 -- Node 14.15.5 +- Node 14.16.0 - Perl 5.32.1 - PHP 8.0.1 - Python 3.7.9 @@ -21,15 +20,15 @@ ### Package Management - Chocolatey 0.10.15 -- Composer 2.0.9 +- Composer 2.0.11 - Helm 3.5.2 - Miniconda 4.9.2 - NPM 6.14.11 - NuGet 5.8.1.7021 - pip 21.0.1 (python 3.7) -- Pipx 0.16.0.0 +- Pipx 0.16.1.0 - RubyGems 2.7.6.2 -- Vcpkg (build from master \<99dc49d>) +- Vcpkg (build from master \<8010840>) - Yarn 1.22.10 #### Environment variables @@ -42,22 +41,22 @@ - Ant 1.10.9 - Gradle 6.8 - Maven 3.6.3 -- sbt 1.4.7 +- sbt 1.4.8 ### Tools - 7zip 19.00 -- azcopy 10.8.0 +- azcopy 10.9.0 - Bazel 4.0.0 - Bazelisk 1.7.5 -- Cabal 3.2.0.0 -- CMake 3.19.5 -- CodeQL Action Bundle 2.4.2 +- Cabal 3.4.0.0 +- CMake 3.19.6 +- CodeQL Action Bundle 2.4.5 - Docker 19.03.14 -- Docker-compose 1.27.4 -- ghc 8.10.3 -- Git 2.30.1 +- Docker-compose 1.28.5 +- ghc 9.0.1 +- Git 2.30.2 - Git LFS 2.13.2 -- Google Cloud SDK 328.0.0 +- Google Cloud SDK 331.0.0 - InnoSetup 6.1.2 - jq 1.6 - Kind 0.10.0 @@ -68,7 +67,7 @@ - NSIS v3.06.1 - OpenSSL 1.1.1 - Packer 1.7.0 -- Pulumi v2.21.1 +- Pulumi v2.22.0 - R 4.0.4 - Stack 2.5.1 - Subversion (SVN) 1.14.1 @@ -79,14 +78,14 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.73 -- AWS CLI 2.1.27 -- AWS SAM CLI 1.18.2 +- AWS CLI 2.1.28 +- AWS SAM CLI 1.20.0 - AWS Session Manager CLI 1.2.54.0 -- Azure CLI 2.19.1 +- Azure CLI 2.20.0 - Azure Dev Spaces CLI 1.0.20201219.2 - Azure DevOps CLI extension 0.18.0 - Cloud Foundry CLI 6.53.0 -- GitHub CLI 1.6.1 +- GitHub CLI 1.7.0 - Hub CLI 2.14.2 ### Rust Tools @@ -97,18 +96,18 @@ #### Packages - bindgen 0.57.0 -- cargo-audit 0.13.1 +- cargo-audit 0.14.0 - cargo-outdated v0.9.14 -- cbindgen 0.17.0 +- cbindgen 0.18.0 - Clippy 0.0.212 - Rustfmt 1.4.30 ### Browsers and webdrivers -- Google Chrome 88.0.4324.182 -- Chrome Driver 88.0.4324.96 -- Microsoft Edge 88.0.705.74 -- Microsoft Edge Driver 88.0.705.74 -- Mozilla Firefox 85.0.2 +- Google Chrome 89.0.4389.82 +- Chrome Driver 89.0.4389.23 +- Microsoft Edge 89.0.774.50 +- Microsoft Edge Driver 89.0.774.48 +- Mozilla Firefox 86.0 - Gecko Driver 0.29.0 - IE Driver 3.150.1.0 @@ -141,25 +140,6 @@ Location: C:\msys64 Note: MSYS2 is pre-installed on image but not added to PATH. ``` ### Cached Tools -#### Boost -| Version | Architecture | Environment Variable | -| ------- | ------------ | -------------------- | -| 1.72.0 | x64, x86 | BOOST_ROOT_1_72_0 | -##### Notes: -``` -1. Environment variable "BOOST_ROOT" is not set by default. - Please make sure you set this variable value to proper value - from table above depending on the Boost version you are using. -2. If Boost was built using the boost-cmake project or from Boost 1.70.0 - on it provides a package configuration file for use with find_package's config mode. - This module looks for the package configuration file called BoostConfig.cmake or boost-config.cmake - and stores the result in CACHE entry "Boost_DIR". If found, the package configuration file - is loaded and this module returns with no further action. - See documentation of the Boost CMake package configuration for details on what it provides. - Set Boost_NO_BOOST_CMAKE to ON, to disable the search for boost-cmake. - Link: https://cmake.org/cmake/help/latest/module/FindBoost.html -``` - #### Go | Version | Architecture | Environment Variable | | ------- | ------------ | -------------------- | @@ -172,9 +152,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Node | Version | Architecture | | ------- | ------------ | -| 10.23.3 | x64 | -| 12.20.2 | x64 | -| 14.15.5 | x64 | +| 10.24.0 | x64 | +| 12.21.0 | x64 | +| 14.16.0 | x64 | #### Python @@ -184,8 +164,8 @@ 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.7 | x64, x86 | -| 3.9.1 | x64, x86 | +| 3.8.8 | x64, x86 | +| 3.9.2 | x64, x86 | #### Ruby @@ -229,7 +209,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Database tools -- Azure CosmosDb Emulator 2.11.10.0 +- Azure CosmosDb Emulator 2.11.11.0 - DacFx 15.0.4897.1 - MySQL 5.7.21.0 - SQLPS 1.0 @@ -239,12 +219,12 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Name | Version | ConfigFile | ServiceName | ServiceStatus | ListenPort | | ------ | ------- | ------------------------------------- | ----------- | ------------- | ---------- | | Apache | 2.4.46 | C:\tools\Apache24\conf\httpd.conf | Apache | Stopped | 80 | -| Nginx | 1.19.7 | C:\tools\nginx-1.19.7\conf\nginx.conf | nginx | Stopped | 80 | +| Nginx | 1.19.8 | C:\tools\nginx-1.19.8\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2017 | Name | Version | Path | | ----------------------------- | --------------- | -------------------------------------------------------------- | -| Visual Studio Enterprise 2017 | 15.9.28307.1401 | C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise | +| Visual Studio Enterprise 2017 | 15.9.28307.1440 | C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise | #### Workloads, components and extensions: @@ -320,7 +300,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.Net.ComponentGroup.DevelopmentPrerequisites | 15.8.27825.0 | | Microsoft.Net.ComponentGroup.TargetingPacks.Common | 15.6.27406.0 | | Microsoft.Net.Core.Component.SDK.1x | 15.9.28307.1259 | -| Microsoft.Net.Core.Component.SDK.2.1 | 15.8.27924.0 | +| Microsoft.Net.Core.Component.SDK.2.1 | 15.9.28307.1439 | | Microsoft.NetCore.1x.ComponentGroup.Web | 15.9.28307.1259 | | Microsoft.NetCore.ComponentGroup.DevelopmentTools.2.1 | 15.8.27924.0 | | Microsoft.NetCore.ComponentGroup.Web.2.1 | 15.8.27924.0 | @@ -347,7 +327,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Component.Debugger.Snapshot | 15.8.28010.0 | | Microsoft.VisualStudio.Component.DependencyValidation.Enterprise | 15.0.26208.0 | | Microsoft.VisualStudio.Component.DiagnosticTools | 15.8.27729.1 | -| Microsoft.VisualStudio.Component.DockerTools | 15.8.27906.1 | +| Microsoft.VisualStudio.Component.DockerTools | 15.9.28307.1439 | | Microsoft.VisualStudio.Component.DockerTools.BuildTools | 15.7.27617.1 | | Microsoft.VisualStudio.Component.DslTools | 15.0.27005.2 | | Microsoft.VisualStudio.Component.EntityFramework | 15.6.27406.0 | @@ -456,7 +436,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Win81 | 15.6.27406.0 | | Microsoft.VisualStudio.ComponentGroup.NativeDesktop.WinXP | 15.8.27705.0 | | Microsoft.VisualStudio.ComponentGroup.UWP.Cordova | 15.9.28307.102 | -| Microsoft.VisualStudio.ComponentGroup.UWP.NetCoreAndStandard | 15.8.27906.1 | +| Microsoft.VisualStudio.ComponentGroup.UWP.NetCoreAndStandard | 15.9.28307.1439 | | Microsoft.VisualStudio.ComponentGroup.UWP.VC | 15.9.28307.102 | | Microsoft.VisualStudio.ComponentGroup.UWP.Xamarin | 15.9.28307.102 | | Microsoft.VisualStudio.ComponentGroup.VisualStudioExtension.Prerequisites | 15.7.27625.0 | @@ -465,9 +445,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions | 15.8.27825.0 | | Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.TemplateEngine | 15.8.27729.1 | | Microsoft.VisualStudio.Web.Mvc4.ComponentGroup | 15.6.27406.0 | -| Microsoft.VisualStudio.Workload.Azure | 15.8.27906.1 | +| Microsoft.VisualStudio.Workload.Azure | 15.9.28307.1439 | | Microsoft.VisualStudio.Workload.CoreEditor | 15.0.27205.0 | -| Microsoft.VisualStudio.Workload.Data | 15.6.27309.0 | +| Microsoft.VisualStudio.Workload.Data | 15.9.28307.1439 | | Microsoft.VisualStudio.Workload.DataScience | 15.9.28307.421 | | Microsoft.VisualStudio.Workload.ManagedDesktop | 15.9.28307.1062 | | Microsoft.VisualStudio.Workload.ManagedGame | 15.0.27005.2 | @@ -477,11 +457,11 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Workload.NativeMobile | 15.9.28107.0 | | Microsoft.VisualStudio.Workload.NetCoreTools | 15.8.27906.1 | | Microsoft.VisualStudio.Workload.NetCrossPlat | 15.9.28107.0 | -| Microsoft.VisualStudio.Workload.NetWeb | 15.8.27906.1 | +| Microsoft.VisualStudio.Workload.NetWeb | 15.9.28307.1439 | | Microsoft.VisualStudio.Workload.Node | 15.9.28107.0 | -| Microsoft.VisualStudio.Workload.Office | 15.8.27924.0 | -| Microsoft.VisualStudio.Workload.Python | 15.8.27825.0 | -| Microsoft.VisualStudio.Workload.Universal | 15.9.28307.102 | +| Microsoft.VisualStudio.Workload.Office | 15.9.28307.1439 | +| Microsoft.VisualStudio.Workload.Python | 15.9.28307.1439 | +| Microsoft.VisualStudio.Workload.Universal | 15.9.28307.1439 | | Microsoft.VisualStudio.Workload.VisualStudioExtension | 15.7.27625.0 | | Microsoft.VisualStudio.Workload.WebCrossPlat | 15.9.28307.341 | | SSDT Microsoft Analysis Services Projects | 2.9.6 | @@ -506,27 +486,27 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft Visual C++ 2013 Minimum Runtime | x86 | 12.0.21005 | | Microsoft Visual C++ 2017 Debug Runtime | x64 | 14.16.27033 | | Microsoft Visual C++ 2017 Debug Runtime | x86 | 14.16.27033 | -| Microsoft Visual C++ 2019 Additional Runtime | x64 | 14.28.29325 | -| Microsoft Visual C++ 2019 Minimum Runtime | x64 | 14.28.29325 | -| Microsoft Visual C++ 2019 Additional Runtime | x86 | 14.28.29325 | -| Microsoft Visual C++ 2019 Minimum Runtime | x86 | 14.28.29325 | +| Microsoft Visual C++ 2019 Additional Runtime | x64 | 14.28.29910 | +| Microsoft Visual C++ 2019 Minimum Runtime | x64 | 14.28.29910 | +| Microsoft Visual C++ 2019 Additional Runtime | x86 | 14.28.29910 | +| Microsoft Visual C++ 2019 Minimum Runtime | x86 | 14.28.29910 | ### .NET Core SDK `Location C:\Program Files\dotnet\sdk` -- 1.1.14 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.519 2.1.520 2.1.521 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.616 2.1.617 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 2.1.811 2.1.812 2.1.813 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.109 3.1.110 3.1.111 3.1.112 3.1.200 3.1.201 3.1.202 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402 3.1.403 3.1.404 3.1.405 3.1.406 5.0.100 5.0.101 5.0.102 5.0.103 +- 1.1.14 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.519 2.1.520 2.1.521 2.1.522 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.616 2.1.617 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 2.1.811 2.1.812 2.1.813 2.1.814 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.109 3.1.110 3.1.111 3.1.112 3.1.113 3.1.200 3.1.201 3.1.202 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 5.0.100 5.0.101 5.0.102 5.0.103 5.0.104 5.0.200 5.0.201 ### .NET Core Runtime `Location: C:\Program Files\dotnet\shared\Microsoft.AspNetCore.All` -- 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23 2.1.24 2.1.25 +- 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23 2.1.24 2.1.25 2.1.26 `Location: C:\Program Files\dotnet\shared\Microsoft.AspNetCore.App` -- 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23 2.1.24 2.1.25 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9 3.1.10 3.1.11 3.1.12 5.0.0 5.0.1 5.0.2 5.0.3 +- 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23 2.1.24 2.1.25 2.1.26 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9 3.1.10 3.1.11 3.1.12 3.1.13 5.0.0 5.0.1 5.0.2 5.0.3 5.0.4 `Location: C:\Program Files\dotnet\shared\Microsoft.NETCore.App` -- 1.0.16 1.1.13 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23 2.1.24 2.1.25 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9 3.1.10 3.1.11 3.1.12 5.0.0 5.0.1 5.0.2 5.0.3 +- 1.0.16 1.1.13 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23 2.1.24 2.1.25 2.1.26 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9 3.1.10 3.1.11 3.1.12 3.1.13 5.0.0 5.0.1 5.0.2 5.0.3 5.0.4 `Location: C:\Program Files\dotnet\shared\Microsoft.WindowsDesktop.App` -- 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9 3.1.10 3.1.11 3.1.12 5.0.0 5.0.1 5.0.2 5.0.3 +- 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9 3.1.10 3.1.11 3.1.12 3.1.13 5.0.0 5.0.1 5.0.2 5.0.3 5.0.4 ### .NET Framework `Type: Developer Pack` @@ -588,10 +568,10 @@ All other versions are saved but not installed. ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2016 | sha256:43b16c243b0f800dad496e54115d3f8ef292b8dd8b6a2228c59c1d8d44d40b10 | 2021-02-09 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2016 | sha256:32bf9e7181883f328e4ab3ff62430565676429ee81f503a6470fc5d5ab2e6997 | 2021-02-09 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2016 | sha256:d192997ca2b9e67cec497a8a8fc407fa9c10133d56e5f689ec69b5a9f9ef8abd | 2021-03-09 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2016 | sha256:f6b2f76e6c8140feee8342cabc6c61f6b7834aab7026a27aed264275948b383d | 2021-03-09 | | mcr.microsoft.com/windows/nanoserver:10.0.14393.953 | sha256:fc60bd5ae0e61b334ce1cf1bcbf20c10c36b4c5482a01da319c9c989f9e6e268 | 2017-03-08 | -| mcr.microsoft.com/windows/servercore:ltsc2016 | sha256:544eb9c255a6cbc5b4121217462c4dcb20fb95cd666d132ee72d5cf35cfa1fc8 | 2021-01-27 | +| mcr.microsoft.com/windows/servercore:ltsc2016 | sha256:e5bb86930669e23f4e098844c59ca75787214d6cac44c772a006261bdcd9473a | 2021-03-03 | | microsoft/aspnetcore-build:1.0-2.0 | sha256:9ecc7c5a8a7a11dca5f08c860165646cb30d084606360a3a72b9cbe447241c0c | 2018-08-15 | From 1dc087be2e282c3d8db8d9cb5d8a2d7647ab1444 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 17 Mar 2021 19:34:35 +0000 Subject: [PATCH 0066/3485] Updating readme file for macOS-10.15 version 20210314.1 (#2937) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/macos/macos-10.15-Readme.md | 56 ++++++++++++++++-------------- 1 file changed, 29 insertions(+), 27 deletions(-) diff --git a/images/macos/macos-10.15-Readme.md b/images/macos/macos-10.15-Readme.md index 99ddf508bee1..00ffd4cbadcb 100644 --- a/images/macos/macos-10.15-Readme.md +++ b/images/macos/macos-10.15-Readme.md @@ -1,16 +1,15 @@ | Announcements | |-| -| [[Ubuntu, macOS] .NET 3.0 will be removed from images on March, 1](https://github.com/actions/virtual-environments/issues/2558) | | [macOS 11.0 pools will be transited to private preview.](https://github.com/actions/virtual-environments/issues/2486) | *** # macOS 10.15 info -- System Version: macOS 10.15.7 (19H512) +- System Version: macOS 10.15.7 (19H524) - Kernel Version: Darwin 19.6.0 -- Image Version: 20210307.1 +- Image Version: 20210314.1 ## Installed Software ### Language and Runtime -- .NET SDK 2.1.300 2.1.301 2.1.302 2.1.401 2.1.402 2.1.403 2.1.500 2.1.502 2.1.503 2.1.504 2.1.505 2.1.506 2.1.507 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 2.1.811 2.1.812 2.1.813 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 3.1.403 3.1.404 3.1.405 3.1.406 5.0.100 5.0.101 5.0.102 5.0.200 +- .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 2.1.811 2.1.812 2.1.813 2.1.814 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 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 5.0.100 5.0.101 5.0.102 5.0.200 5.0.201 - Bash 3.2.57(1)-release - Clang/LLVM 11.1.0 is available on `'$(brew --prefix llvm)/bin/clang'` - Clang/LLVM 12.0.0 is default @@ -20,8 +19,8 @@ - GNU Fortran (Homebrew GCC 10.2.0_4) 10.2.0 - available by `gfortran-10` alias - GNU Fortran (Homebrew GCC 8.4.0_2) 8.4.0 - available by `gfortran-8` alias - GNU Fortran (Homebrew GCC 9.3.0_1) 9.3.0 - available by `gfortran-9` alias -- Go 1.15.8 -- julia 1.5.3 +- Go 1.15.10 +- julia 1.5.4 - Node.js v14.16.0 - NVM - Cached node versions: v10.24.0 v12.21.0 v14.16.0 - NVM 0.37.2 @@ -33,19 +32,19 @@ - Ruby 2.7.2p137 ### Package Management -- Bundler version 2.2.13 +- Bundler version 2.2.14 - Carthage 0.37.0 - CocoaPods 1.10.1 - Composer 2.0.11 -- Homebrew 3.0.4 +- Homebrew 3.0.5 - Miniconda 4.9.2 - NPM 6.14.11 - NuGet 5.6.0.6489 - Pip 20.3.4 (python 2.7) - Pip 21.0.1 (python 3.9) - Pipx 0.16.1.0 -- RubyGems 3.2.13 -- Vcpkg 2021 (build from master \) +- RubyGems 3.2.14 +- Vcpkg 2021 (build from master \<75522bb>) - Yarn 1.22.5 #### Environment variables @@ -68,13 +67,13 @@ - bsdtar 3.3.2 - available by 'tar' alias - Curl 7.75.0 - Git LFS: 2.13.2 -- Git: 2.30.1 +- Git: 2.30.2 - GitHub CLI: 1.7.0 - GNU parallel 20201122 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.1 - gpg (GnuPG) 2.2.27 -- helm v3.5.2+g167aac7 +- helm v3.5.3+g041ce5a - Hub CLI: 2.14.2 - jq 1.6 - mongo v4.4.3 @@ -93,13 +92,13 @@ ### Tools - Aliyun CLI 3.0.73 - App Center CLI 2.7.4 -- AWS CLI 2.1.29 +- AWS CLI 2.1.30 - AWS SAM CLI 1.20.0 - AWS Session Manager CLI 1.2.30.0 - Azure CLI 2.20.0 - Cabal 3.4.0.0 - Cmake 3.19.6 -- Fastlane 2.176.0 +- Fastlane 2.178.0 - GHC 9.0.1 - GHCup v0.1.14 - Stack 2.5.1 @@ -110,13 +109,13 @@ - yamllint 1.26.0 ### Browsers -- Safari 14.0.3 (15610.4.3.1.6) -- SafariDriver 14.0.3 (15610.4.3.1.6) -- Google Chrome 89.0.4389.82 +- Safari 14.0.3 (15610.4.3.1.7) +- SafariDriver 14.0.3 (15610.4.3.1.7) +- Google Chrome 89.0.4389.90 - ChromeDriver 89.0.4389.23 -- Microsoft Edge 89.0.774.45 -- MSEdgeDriver 89.0.774.45 -- Mozilla Firefox 86.0 +- Microsoft Edge 89.0.774.50 +- MSEdgeDriver 89.0.774.54 +- Mozilla Firefox 86.0.1 - geckodriver 0.29.0 #### Environment variables @@ -164,8 +163,8 @@ #### Go - 1.13.15 - 1.14.15 -- 1.15.8 -- 1.16.0 +- 1.15.10 +- 1.16.2 ### Rust Tools - Cargo 1.50.0 @@ -175,14 +174,14 @@ #### Packages - Bindgen 0.57.0 -- Cargo-audit 0.13.1 +- Cargo-audit 0.14.0 - Cargo-outdated v0.9.14 - Cbindgen 0.18.0 - Clippy 0.0.212 - Rustfmt 1.4.30-stable ### PowerShell Tools -- PowerShell 7.1.2 +- PowerShell 7.1.3 #### PowerShell Modules | Module | Version | @@ -196,11 +195,11 @@ | Name | Version | ConfigFile | ServiceStatus | ListenPort | | ----- | -------- | ------------------------------- | ------------- | ---------- | | httpd | 2.4.46_2 | /usr/local/etc/httpd/httpd.conf | stopped | 80 | -| nginx | 1.19.7 | /usr/local/etc/nginx/nginx.conf | stopped | 80 | +| nginx | 1.19.8 | /usr/local/etc/nginx/nginx.conf | stopped | 80 | ### Xamarin #### Visual Studio for Mac -- 8.9.0.1651 +- 8.9.1.34 #### Mono - 6.12.0.122 @@ -210,6 +209,7 @@ - 6.4.0.208 #### Xamarin.iOS +- 14.14.2.5 - 14.10.0.4 - 14.8.0.3 - 14.6.0.15 @@ -227,6 +227,7 @@ - 13.2.0.47 #### Xamarin.Mac +- 7.8.2.5 - 7.4.0.10 - 7.2.0.3 - 7.0.0.15 @@ -242,6 +243,7 @@ - 6.2.0.47 #### Xamarin.Android +- 11.2.0 - 11.1.0 - 11.0.2 - 10.3.1 @@ -272,7 +274,7 @@ #### Xcode Support Tools - xcpretty 0.3.0 - xcversion 2.6.8 -- Nomad CLI 3.2.13 +- Nomad CLI 3.2.14 - Nomad CLI IPA ipa 0.14.3 - xctool 0.3.7 From 4847468235952a25dde8734936b5502fe82c972a Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Thu, 18 Mar 2021 09:41:01 +0300 Subject: [PATCH 0067/3485] Add Linux kernel version to software report (#2959) --- .../scripts/SoftwareReport/SoftwareReport.Generator.ps1 | 2 ++ images/linux/scripts/helpers/Common.Helpers.psm1 | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index e62c249beb17..ebf3fa43967a 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -26,7 +26,9 @@ $markdown = "" $OSName = Get-OSName $markdown += New-MDHeader "$OSName" -Level 1 +$kernelVersion = Get-KernelVersion $markdown += New-MDList -Style Unordered -Lines @( + "$kernelVersion" "Image Version: $env:IMAGE_VERSION" ) diff --git a/images/linux/scripts/helpers/Common.Helpers.psm1 b/images/linux/scripts/helpers/Common.Helpers.psm1 index bcb9a250dded..04a79c46c18a 100644 --- a/images/linux/scripts/helpers/Common.Helpers.psm1 +++ b/images/linux/scripts/helpers/Common.Helpers.psm1 @@ -17,6 +17,11 @@ function Get-OSName { lsb_release -ds } +function Get-KernelVersion { + $kernelVersion = uname -r + return "Linux kernel version: $kernelVersion" +} + function Test-IsUbuntu16 { return (lsb_release -rs) -eq "16.04" } From e9fc3366a5a9e0e636ae07c01f4a323b86fa5082 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Thu, 18 Mar 2021 09:41:18 +0300 Subject: [PATCH 0068/3485] Deprecate jekyll/builder and node8-typescript (#2965) --- images/linux/toolsets/toolset-1604.json | 2 -- images/linux/toolsets/toolset-1804.json | 2 -- images/linux/toolsets/toolset-2004.json | 2 -- 3 files changed, 6 deletions(-) diff --git a/images/linux/toolsets/toolset-1604.json b/images/linux/toolsets/toolset-1604.json index 2985e330f69d..386668a34e4c 100644 --- a/images/linux/toolsets/toolset-1604.json +++ b/images/linux/toolsets/toolset-1604.json @@ -216,8 +216,6 @@ "buildpack-deps:buster", "debian:8", "debian:9", - "jekyll/builder", - "mcr.microsoft.com/azure-pipelines/node8-typescript", "node:10", "node:12", "node:10-alpine", diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index 162159db623a..f0a1d002b0cb 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -209,8 +209,6 @@ "buildpack-deps:buster", "debian:8", "debian:9", - "jekyll/builder", - "mcr.microsoft.com/azure-pipelines/node8-typescript", "node:10", "node:12", "node:10-alpine", diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index 63d623cc7a4e..773ba58ffd07 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -201,8 +201,6 @@ "buildpack-deps:buster", "debian:8", "debian:9", - "jekyll/builder", - "mcr.microsoft.com/azure-pipelines/node8-typescript", "node:10", "node:12", "node:10-alpine", From fa7347b7a07fecfcb24843702b6a8eb7564c4720 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Thu, 18 Mar 2021 09:41:47 +0300 Subject: [PATCH 0069/3485] Change approach to get the version from manifest (#2966) --- images/macos/provision/core/vsmac.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/macos/provision/core/vsmac.sh b/images/macos/provision/core/vsmac.sh index 3ee60852f53f..f4f914566b76 100644 --- a/images/macos/provision/core/vsmac.sh +++ b/images/macos/provision/core/vsmac.sh @@ -4,7 +4,7 @@ source ~/utils/xamarin-utils.sh VSMAC_VERSION=$(get_toolset_value '.xamarin.vsmac') if [ $VSMAC_VERSION == "latest" ]; then - VSMAC_VERSION=$(curl https://formulae.brew.sh/api/cask/visual-studio.json 2>/dev/null | jq .version | tr -d \") + VSMAC_VERSION=$(curl -L "http://aka.ms/manifest/stable" | jq -r ".items[] | select(.genericName==\"VisualStudioMac\").version") fi VSMAC_DOWNLOAD_URL=$(buildVSMacDownloadUrl $VSMAC_VERSION) From 5a68fb9658dc1916536ca3f4a7c371af4fdb1f3a Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Thu, 18 Mar 2021 09:42:04 +0300 Subject: [PATCH 0070/3485] fix variable name (#2964) --- images/linux/scripts/installers/preimagedata.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/images/linux/scripts/installers/preimagedata.sh b/images/linux/scripts/installers/preimagedata.sh index 39af51787f1a..126d6a95ec57 100644 --- a/images/linux/scripts/installers/preimagedata.sh +++ b/images/linux/scripts/installers/preimagedata.sh @@ -8,17 +8,17 @@ github_url="https://github.com/actions/virtual-environments/blob" if [[ "$image_label" =~ "ubuntu-20" ]]; then software_url="${github_url}/ubuntu20/${image_version}/images/linux/Ubuntu2004-README.md" - releaseUrl="https://github.com/actions/virtual-environments/releases/tag/ubuntu20%2F${imageVersion}" + releaseUrl="https://github.com/actions/virtual-environments/releases/tag/ubuntu20%2F${image_version}" fi if [[ "$image_label" =~ "ubuntu-18" ]]; then software_url="${github_url}/ubuntu18/${image_version}/images/linux/Ubuntu1804-README.md" - releaseUrl="https://github.com/actions/virtual-environments/releases/tag/ubuntu18%2F${imageVersion}" + releaseUrl="https://github.com/actions/virtual-environments/releases/tag/ubuntu18%2F${image_version}" fi if [[ "$image_label" =~ "ubuntu-16" ]]; then software_url="${github_url}/ubuntu16/${image_version}/images/linux/Ubuntu1604-README.md" - releaseUrl="https://github.com/actions/virtual-environments/releases/tag/ubuntu16%2F${imageVersion}" + releaseUrl="https://github.com/actions/virtual-environments/releases/tag/ubuntu16%2F${image_version}" fi cat < $imagedata_file From 57d8f5e0edd1ddf8b1fcf1a2882580a49e434c8c Mon Sep 17 00:00:00 2001 From: Arjun Madan <2348533+arjunmadan@users.noreply.github.com> Date: Thu, 18 Mar 2021 03:59:31 -0400 Subject: [PATCH 0071/3485] Update the ubuntu-latest tag to point to 20.04 (#2852) --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 585a297809c6..2bd7e0249b6e 100644 --- a/README.md +++ b/README.md @@ -10,8 +10,8 @@ For general questions about using the virtual environments or writing your Actio ## Available Environments | Environment | YAML Label | Included Software | Latest Release & Rollout Progress | | --------------------|---------------------|--------------------|---------------------| -| Ubuntu 20.04 | `ubuntu-20.04` | [ubuntu-20.04] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu20&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu20&redirect=1) -| Ubuntu 18.04 | `ubuntu-latest` or `ubuntu-18.04` | [ubuntu-18.04] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu18&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu18&redirect=1) +| Ubuntu 20.04 | `ubuntu-latest` or `ubuntu-20.04` | [ubuntu-20.04] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu20&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu20&redirect=1) +| Ubuntu 18.04 | `ubuntu-18.04` | [ubuntu-18.04] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu18&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu18&redirect=1) | Ubuntu 16.04 | `ubuntu-16.04` | [ubuntu-16.04] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu16&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu16&redirect=1) | | macOS 11.0 | `macos-11.0` | [macOS-11.0] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-11.0&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-11.0&redirect=1) | macOS 10.15 | `macos-latest` or `macos-10.15` | [macOS-10.15] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-10.15&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-10.15&redirect=1) From 46e5d502a6124e52518603edf6a3a38837534823 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 18 Mar 2021 12:16:19 +0000 Subject: [PATCH 0072/3485] Updating readme file for ubuntu18 version 20210315.1 (#2931) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/linux/Ubuntu1804-README.md | 58 +++++++++++++++---------------- 1 file changed, 28 insertions(+), 30 deletions(-) diff --git a/images/linux/Ubuntu1804-README.md b/images/linux/Ubuntu1804-README.md index dc2960e08a52..166158e9a8a3 100644 --- a/images/linux/Ubuntu1804-README.md +++ b/images/linux/Ubuntu1804-README.md @@ -1,14 +1,12 @@ | Announcements | |-| -| [[Ubuntu] AzCopy 7 will be removed from Ubuntu images on March, 2](https://github.com/actions/virtual-environments/issues/2724) | +| [[windows, ubuntu] Az, Azure and AzureRM module preinstallation policy will be changed on March, 29th](https://github.com/actions/virtual-environments/issues/2916) | | [[ubuntu, windows] GOROOT environment variable will be removed on March, 1](https://github.com/actions/virtual-environments/issues/2683) | -| [[Ubuntu] Android SDK Platforms and Build-tools that are less than version 23 will be removed on March, 1](https://github.com/actions/virtual-environments/issues/2673) | | [[Windows, Ubuntu] Boost 1.72.0 will be removed from images on March, 8](https://github.com/actions/virtual-environments/issues/2667) | -| [[Ubuntu, macOS] .NET 3.0 will be removed from images on March, 1](https://github.com/actions/virtual-environments/issues/2558) | | [Ubuntu-latest workflows will use Ubuntu-20.04](https://github.com/actions/virtual-environments/issues/1816) | *** # Ubuntu 18.04.5 LTS -- Image Version: 20210309.1 +- Image Version: 20210315.1 ## Installed Software ### Language and Runtime @@ -17,7 +15,7 @@ - Erlang 11.1.7 - 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, 10.1.0 -- Julia 1.5.3 +- Julia 1.5.4 - Mono 6.12.0.122 - Node 14.16.0 - Perl 5.26.1 @@ -28,15 +26,15 @@ ### Package Management - cpan 1.64 -- Helm 3.5.2 -- Homebrew 3.0.4 +- Helm 3.5.3 +- Homebrew 3.0.5 - Miniconda 4.9.2 - Npm 6.14.11 - Pip 9.0.1 - Pip3 9.0.1 - Pipx 0.16.1.0 - RubyGems 2.7.6 -- Vcpkg (build from master \<0dc27b9>) +- Vcpkg (build from master \<75522bb>) - Yarn 1.22.5 #### Environment variables @@ -49,7 +47,7 @@ - Ant 1.10.5 - Gradle 6.8.3 - Maven 3.6.3 -- Sbt 1.4.7 +- Sbt 1.4.9 ### Tools - 7-Zip 16.02 @@ -61,19 +59,19 @@ - binutils 2.30 - Buildah 1.19.6 - CMake 3.19.6 -- CodeQL Action Bundle 2.4.4 +- CodeQL Action Bundle 2.4.5 - coreutils 8.28 - curl 7.58.0 - Docker Compose 1.28.5 - Docker-Buildx 0.5.1 - Docker-Moby Client 20.10.5+azure - Docker-Moby Server 20.10.5+azure -- Git 2.30.1 +- Git 2.30.2 - Git LFS 2.13.2 - Git-ftp 1.3.1 - Haveged 1.9.1 - Heroku 7.50.0 -- HHVM (HipHop VM) 4.99.0 +- HHVM (HipHop VM) 4.100.0 - jq 1.5 - Kind 0.10.0 - Kubectl 1.20.1-5-g76a04fc @@ -96,7 +94,7 @@ - Sphinx Open Source Search Server 2.2.11 - SVN 1.9.7 - Swig 3.0.12 -- Terraform 0.14.7 +- Terraform 0.14.8 - unzip 6.00 - wget 1.19.4 - yamllint 1.26.0 @@ -105,16 +103,16 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.73 -- AWS CLI 1.19.23 +- AWS CLI 1.19.27 - AWS CLI Session manager plugin 1.2.54.0 - AWS SAM CLI 1.20.0 - Azure CLI (azure-cli) 2.20.0 - Azure CLI (azure-devops) 0.18.0 - GitHub CLI 1.7.0 -- Google Cloud SDK 330.0.0 +- Google Cloud SDK 331.0.0 - Hub CLI 2.14.2 -- Netlify CLI 3.10.6 -- oc CLI 4.7.0 +- Netlify CLI 3.10.12 +- oc CLI 4.7.1 - ORAS CLI 0.10.0 - Vercel CLI 21.3.3 @@ -153,7 +151,7 @@ - Rustfmt 1.4.30 ### Browsers and Drivers -- Google Chrome 89.0.4389.82 +- Google Chrome 89.0.4389.90 - ChromeDriver 89.0.4389.23 - Mozilla Firefox 86.0 - Geckodriver 0.29.0 @@ -165,7 +163,7 @@ | GECKOWEBDRIVER | /usr/local/share/gecko_driver | ### .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.519 2.1.520 2.1.521 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.616 2.1.617 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 2.1.811 2.1.812 2.1.813 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.109 3.1.110 3.1.111 3.1.112 3.1.200 3.1.201 3.1.202 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402 3.1.403 3.1.404 3.1.405 3.1.406 5.0.100 5.0.101 5.0.102 5.0.103 5.0.200 +- 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.519 2.1.520 2.1.521 2.1.522 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.616 2.1.617 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 2.1.811 2.1.812 2.1.813 2.1.814 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.109 3.1.110 3.1.111 3.1.112 3.1.113 3.1.200 3.1.201 3.1.202 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 5.0.100 5.0.101 5.0.102 5.0.103 5.0.104 5.0.200 5.0.201 ### 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 4.7.0 @@ -189,7 +187,7 @@ #### Go - 1.13.15 - 1.14.15 -- 1.15.8 +- 1.15.10 #### Node.js - 10.24.0 @@ -220,10 +218,10 @@ | --------------- | ----------------------------------- | ------------ | | GOROOT_1_13_X64 | /opt/hostedtoolcache/go/1.13.15/x64 | x64 | | GOROOT_1_14_X64 | /opt/hostedtoolcache/go/1.14.15/x64 | x64 | -| GOROOT_1_15_X64 | /opt/hostedtoolcache/go/1.15.8/x64 | x64 | +| GOROOT_1_15_X64 | /opt/hostedtoolcache/go/1.15.10/x64 | x64 | ### PowerShell Tools -- PowerShell 7.1.2 +- PowerShell 7.1.3 #### PowerShell Modules | Module | Version | @@ -268,16 +266,16 @@ | alpine:3.7 | sha256:8421d9a84432575381bfabd248f1eb56f3aa21d9d7cd2511583c68c9b7511d10 | 2019-03-07 | | alpine:3.8 | sha256:2bb501e6173d9d006e56de5bce2720eb06396803300fe1687b58a7ff32bf4c14 | 2020-01-23 | | alpine:3.9 | sha256:414e0518bb9228d35e4cd5165567fb91d26c6a214e9c95899e1e056fcd349011 | 2020-04-24 | -| buildpack-deps:buster | sha256:b42568b32a4dff4f1f378fd0685aa2a8e6931e744798a481fd6ed6672d7f0c47 | 2021-02-09 | -| buildpack-deps:stretch | sha256:97f102be9829fa96039a6113e0f053ffdadf2b2ccb67e8838294aee8a2dd947f | 2021-02-09 | -| debian:8 | sha256:40d6faa8c33e8ab03428ad97fc109c369fb510d99f4700df9058940ac9944f09 | 2021-02-09 | -| debian:9 | sha256:d0b7b71db141cedc48e1c2807d12b199ffd7ffe75baf272a34c37480dc2159d1 | 2021-02-09 | +| buildpack-deps:buster | sha256:a78316a3d9d366e8f5d80840a2c9ee361c66bf8a7d7d28edd9224ca70f32fd9c | 2021-03-12 | +| buildpack-deps:stretch | sha256:6f928e94e06da507f1d133c26acf70b3807e2bb6d584e5843507511574c3ad6e | 2021-03-12 | +| debian:8 | sha256:6b1960e0a149981c3c115abee6b9e035591fe55533a20a1cd912e636b8df8820 | 2021-03-12 | +| debian:9 | sha256:ca2af3c25b43f185cc86cc2038a217d9b4cdbb4d47adbcfe5d25e04c1d75e1d9 | 2021-03-12 | | jekyll/builder:latest | sha256:b918b81939a1076dce89d142c0764c2c3cb93858f56ecf4f04ad0387338e77aa | 2020-12-21 | | mcr.microsoft.com/azure-pipelines/node8-typescript:latest | sha256:e52e60b9f71183969830a3664279b5d8c799b4b0ec2c25a0686f7c02f6a9669a | 2018-10-09 | -| node:10 | sha256:426ce4b7e659e081413b739ec3c6a6dea22dfc1a53bfaa147117dfb0238013a2 | 2021-02-23 | -| node:10-alpine | sha256:47cfff9b9eda43e97f42d516ff66c5490ed1f71262a03f3348ea867f222c1a7e | 2021-02-24 | -| node:12 | sha256:7f961434ce9e96be7bf2455bbf362152787c529bb9cf86a15ab1499ea89bfa8c | 2021-02-23 | -| node:12-alpine | sha256:5d8b181a0738654bbe659a68879298f8d2d4256685282ee1c2330d97c33e3eee | 2021-02-24 | +| node:10 | sha256:e84df6f7647a1c3993f724c9a0cacdf6b9b2a4ee722b4face9b29f0013634f17 | 2021-03-12 | +| node:10-alpine | sha256:017b55be202b81bd6b4e9f841d5ddeb6df48467ca5cba0c4194015b987f48a60 | 2021-03-12 | +| node:12 | sha256:0ae1a6a3a8a61e2bcf7f826b2562eb865f9a3095acf41bc6f184773ab66f3007 | 2021-03-12 | +| node:12-alpine | sha256:81eec5b1cac69ff6af62097563737b40ac94b605b43d01466c0cf48e220494be | 2021-03-12 | | ubuntu:14.04 | sha256:63fce984528cec8714c365919882f8fb64c8a3edf23fdfa0b218a2756125456f | 2020-09-16 | ### Installed apt packages From 21d68f342f032a801fb847d74dabb78a7253c3a1 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 18 Mar 2021 12:52:57 +0000 Subject: [PATCH 0073/3485] Updating readme file for ubuntu16 version 20210317.1 (#2955) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/linux/Ubuntu1604-README.md | 65 +++++++++++++++---------------- 1 file changed, 32 insertions(+), 33 deletions(-) diff --git a/images/linux/Ubuntu1604-README.md b/images/linux/Ubuntu1604-README.md index f008faa88b8e..d5514d7dc69d 100644 --- a/images/linux/Ubuntu1604-README.md +++ b/images/linux/Ubuntu1604-README.md @@ -1,14 +1,13 @@ | Announcements | |-| -| [[Ubuntu] AzCopy 7 will be removed from Ubuntu images on March, 2](https://github.com/actions/virtual-environments/issues/2724) | +| [[Ubuntu] Clang, GCC and Gfortran versions less than 9.x will be removed from images on March, 29](https://github.com/actions/virtual-environments/issues/2950) | +| [[windows, ubuntu] Az, Azure and AzureRM module preinstallation policy will be changed on March, 29th](https://github.com/actions/virtual-environments/issues/2916) | | [[ubuntu, windows] GOROOT environment variable will be removed on March, 1](https://github.com/actions/virtual-environments/issues/2683) | -| [[Ubuntu] Android SDK Platforms and Build-tools that are less than version 23 will be removed on March, 1](https://github.com/actions/virtual-environments/issues/2673) | | [[Windows, Ubuntu] Boost 1.72.0 will be removed from images on March, 8](https://github.com/actions/virtual-environments/issues/2667) | -| [[Ubuntu, macOS] .NET 3.0 will be removed from images on March, 1](https://github.com/actions/virtual-environments/issues/2558) | | [Ubuntu-latest workflows will use Ubuntu-20.04](https://github.com/actions/virtual-environments/issues/1816) | *** # Ubuntu 16.04.7 LTS -- Image Version: 20210309.1 +- Image Version: 20210317.1 ## Installed Software ### Language and Runtime @@ -17,7 +16,7 @@ - Erlang 11.1.7 - 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 -- Julia 1.5.3 +- Julia 1.5.4 - Mono 6.12.0.122 - Node 14.16.0 - Perl 5.22.1 @@ -28,14 +27,14 @@ ### Package Management - cpan 1.61 -- Helm 3.5.2 -- Homebrew 3.0.4 +- Helm 3.5.3 +- Homebrew 3.0.7 - Miniconda 4.9.2 - Npm 6.14.11 - Pip 8.1.1 - Pip3 8.1.1 - RubyGems 2.5.2 -- Vcpkg (build from master \<0dc27b9>) +- Vcpkg (build from master \<9ab3baf>) - Yarn 1.22.5 #### Environment variables @@ -48,25 +47,25 @@ - Ant 1.9.6 - Gradle 6.8.3 - Maven 3.6.3 -- Sbt 1.4.7 +- Sbt 1.4.9 ### Tools - 7-Zip 9.20 -- Ansible 2.9.18 +- Ansible 2.9.19 - apt-fast 1.9.10 - AzCopy 10.9.0 (available by `azcopy` and `azcopy10` aliases) - Bazel 4.0.0 - Bazelisk 1.7.5 - binutils 2.26.1 -- CMake 3.19.6 -- CodeQL Action Bundle 2.4.4 +- CMake 3.19.7 +- CodeQL Action Bundle 2.4.5 - coreutils 8.25 - curl 7.47.0 - Docker Compose 1.28.5 - Docker-Buildx 0.5.1 - Docker-Moby Client 20.10.5+azure - Docker-Moby Server 20.10.5+azure -- Git 2.29.0 +- Git 2.31.0 - Git LFS 2.13.2 - Git-ftp 1.0.2 - Haveged 1.9.1 @@ -92,7 +91,7 @@ - Sphinx Open Source Search Server 2.2.9 - SVN 1.9.3 - Swig 3.0.8 -- Terraform 0.14.7 +- Terraform 0.14.8 - unzip 6.00 - wget 1.17.1 - yamllint 1.2.1 @@ -101,17 +100,17 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.73 -- AWS CLI 1.19.23 +- AWS CLI 1.19.29 - AWS CLI Session manager plugin 1.2.54.0 -- AWS SAM CLI 1.20.0 +- AWS SAM CLI 1.21.1 - Azure CLI (azure-cli) 2.20.0 - Azure CLI (azure-devops) 0.18.0 - GitHub CLI 1.7.0 -- Google Cloud SDK 330.0.0 +- Google Cloud SDK 332.0.0 - Hub CLI 2.14.2 -- Netlify CLI 3.10.6 -- oc CLI 4.7.0 -- ORAS CLI 0.10.0 +- Netlify CLI 3.13.0 +- oc CLI 4.7.2 +- ORAS CLI 0.11.0 - Vercel CLI 21.3.3 ### Java @@ -149,7 +148,7 @@ - Rustfmt 1.4.30 ### Browsers and Drivers -- Google Chrome 89.0.4389.82 +- Google Chrome 89.0.4389.90 - ChromeDriver 89.0.4389.23 - Mozilla Firefox 86.0 - Geckodriver 0.29.0 @@ -161,7 +160,7 @@ | GECKOWEBDRIVER | /usr/local/share/gecko_driver | ### .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.519 2.1.520 2.1.521 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.616 2.1.617 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 2.1.811 2.1.812 2.1.813 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.109 3.1.110 3.1.111 3.1.112 3.1.200 3.1.201 3.1.202 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402 3.1.403 3.1.404 3.1.405 3.1.406 5.0.100 5.0.101 5.0.102 5.0.103 5.0.200 +- 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.519 2.1.520 2.1.521 2.1.522 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.616 2.1.617 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 2.1.811 2.1.812 2.1.813 2.1.814 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.109 3.1.110 3.1.111 3.1.112 3.1.113 3.1.200 3.1.201 3.1.202 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 5.0.100 5.0.101 5.0.102 5.0.103 5.0.104 5.0.200 5.0.201 ### 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 4.7.0 @@ -185,7 +184,7 @@ #### Go - 1.13.15 - 1.14.15 -- 1.15.8 +- 1.15.10 #### Node.js - 10.24.0 @@ -216,10 +215,10 @@ | --------------- | ----------------------------------- | ------------ | | GOROOT_1_13_X64 | /opt/hostedtoolcache/go/1.13.15/x64 | x64 | | GOROOT_1_14_X64 | /opt/hostedtoolcache/go/1.14.15/x64 | x64 | -| GOROOT_1_15_X64 | /opt/hostedtoolcache/go/1.15.8/x64 | x64 | +| GOROOT_1_15_X64 | /opt/hostedtoolcache/go/1.15.10/x64 | x64 | ### PowerShell Tools -- PowerShell 7.1.2 +- PowerShell 7.1.3 #### PowerShell Modules | Module | Version | @@ -264,16 +263,16 @@ | alpine:3.7 | sha256:8421d9a84432575381bfabd248f1eb56f3aa21d9d7cd2511583c68c9b7511d10 | 2019-03-07 | | alpine:3.8 | sha256:2bb501e6173d9d006e56de5bce2720eb06396803300fe1687b58a7ff32bf4c14 | 2020-01-23 | | alpine:3.9 | sha256:414e0518bb9228d35e4cd5165567fb91d26c6a214e9c95899e1e056fcd349011 | 2020-04-24 | -| buildpack-deps:buster | sha256:b42568b32a4dff4f1f378fd0685aa2a8e6931e744798a481fd6ed6672d7f0c47 | 2021-02-09 | -| buildpack-deps:stretch | sha256:97f102be9829fa96039a6113e0f053ffdadf2b2ccb67e8838294aee8a2dd947f | 2021-02-09 | -| debian:8 | sha256:40d6faa8c33e8ab03428ad97fc109c369fb510d99f4700df9058940ac9944f09 | 2021-02-09 | -| debian:9 | sha256:d0b7b71db141cedc48e1c2807d12b199ffd7ffe75baf272a34c37480dc2159d1 | 2021-02-09 | +| buildpack-deps:buster | sha256:a78316a3d9d366e8f5d80840a2c9ee361c66bf8a7d7d28edd9224ca70f32fd9c | 2021-03-12 | +| buildpack-deps:stretch | sha256:6f928e94e06da507f1d133c26acf70b3807e2bb6d584e5843507511574c3ad6e | 2021-03-12 | +| debian:8 | sha256:6b1960e0a149981c3c115abee6b9e035591fe55533a20a1cd912e636b8df8820 | 2021-03-12 | +| debian:9 | sha256:ca2af3c25b43f185cc86cc2038a217d9b4cdbb4d47adbcfe5d25e04c1d75e1d9 | 2021-03-12 | | jekyll/builder:latest | sha256:b918b81939a1076dce89d142c0764c2c3cb93858f56ecf4f04ad0387338e77aa | 2020-12-21 | | mcr.microsoft.com/azure-pipelines/node8-typescript:latest | sha256:e52e60b9f71183969830a3664279b5d8c799b4b0ec2c25a0686f7c02f6a9669a | 2018-10-09 | -| node:10 | sha256:426ce4b7e659e081413b739ec3c6a6dea22dfc1a53bfaa147117dfb0238013a2 | 2021-02-23 | -| node:10-alpine | sha256:47cfff9b9eda43e97f42d516ff66c5490ed1f71262a03f3348ea867f222c1a7e | 2021-02-24 | -| node:12 | sha256:7f961434ce9e96be7bf2455bbf362152787c529bb9cf86a15ab1499ea89bfa8c | 2021-02-23 | -| node:12-alpine | sha256:5d8b181a0738654bbe659a68879298f8d2d4256685282ee1c2330d97c33e3eee | 2021-02-24 | +| node:10 | sha256:e84df6f7647a1c3993f724c9a0cacdf6b9b2a4ee722b4face9b29f0013634f17 | 2021-03-12 | +| node:10-alpine | sha256:017b55be202b81bd6b4e9f841d5ddeb6df48467ca5cba0c4194015b987f48a60 | 2021-03-12 | +| node:12 | sha256:0ae1a6a3a8a61e2bcf7f826b2562eb865f9a3095acf41bc6f184773ab66f3007 | 2021-03-12 | +| node:12-alpine | sha256:81eec5b1cac69ff6af62097563737b40ac94b605b43d01466c0cf48e220494be | 2021-03-12 | | ubuntu:14.04 | sha256:63fce984528cec8714c365919882f8fb64c8a3edf23fdfa0b218a2756125456f | 2020-09-16 | ### Installed apt packages From 8a34f3c527efbd4a2898071cd13f520d911fb8ae Mon Sep 17 00:00:00 2001 From: Dibir Magomedsaygitov <61747324+dibir-magomedsaygitov@users.noreply.github.com> Date: Thu, 18 Mar 2021 16:22:44 +0300 Subject: [PATCH 0074/3485] software updates week 12 (#2970) --- images/macos/toolsets/toolset-10.15.json | 4 ++-- images/macos/toolsets/toolset-11.0.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index 3c7c31b2781e..5c891e5f52d0 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -20,7 +20,7 @@ "xamarin": { "vsmac": "latest", "mono-versions": [ - "6.12.0.122", "6.10.0.106", "6.8.0.123", "6.6.0.166", "6.4.0.208" + "6.12.0.125", "6.10.0.106", "6.8.0.123", "6.6.0.166", "6.4.0.208" ], "ios-versions": [ "14.14.2.5", "14.10.0.4", "14.8.0.3", "14.6.0.15", "14.4.1.3", "14.2.0.12", "14.0.0.0", "13.20.2.2", "13.18.2.1", "13.16.0.13", "13.14.1.39", "13.10.0.21", "13.8.3.0", "13.6.0.12", "13.4.0.2", "13.2.0.47" @@ -29,7 +29,7 @@ "7.8.2.5", "7.4.0.10", "7.2.0.3", "7.0.0.15", "6.22.1.26", "6.20.2.2", "6.18.3.2", "6.16.0.13", "6.14.1.39", "6.10.0.21", "6.8.3.0", "6.6.0.12", "6.4.0.2", "6.2.0.47" ], "android-versions": [ - "11.2.0.21", "11.1.0.26", "11.0.2.0", "10.3.1.4", "10.2.0.100", "10.1.3.7", "10.0.6.2" + "11.2.2.1", "11.1.0.26", "11.0.2.0", "10.3.1.4", "10.2.0.100", "10.1.3.7", "10.0.6.2" ], "bundle-default": "6_12_7", "bundles": [ diff --git a/images/macos/toolsets/toolset-11.0.json b/images/macos/toolsets/toolset-11.0.json index f49b8045897b..27f6edbedc67 100644 --- a/images/macos/toolsets/toolset-11.0.json +++ b/images/macos/toolsets/toolset-11.0.json @@ -12,7 +12,7 @@ "xamarin": { "vsmac": "latest", "mono-versions": [ - "6.12.0.122" + "6.12.0.125" ], "ios-versions": [ "14.14.2.5", "14.10.0.4", "14.8.0.3", "14.6.0.15", "14.4.1.3", "14.2.0.12", "14.0.0.0", "13.20.2.2" @@ -21,7 +21,7 @@ "7.8.2.5", "7.4.0.10", "7.2.0.3", "7.0.0.15", "6.22.1.26", "6.20.2.2" ], "android-versions": [ - "11.2.0.21", "11.1.0.26", "11.0.2.0" + "11.2.2.1", "11.1.0.26", "11.0.2.0" ], "bundle-default": "6_12_7", "bundles": [ From 593aa6b100cb35351a19ea27c1b6b783e22febe6 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Thu, 18 Mar 2021 21:58:04 +0300 Subject: [PATCH 0075/3485] Revert $BASH_ENV (#2982) --- images/linux/scripts/installers/configure-environment.sh | 7 +------ images/linux/scripts/installers/dotnetcore-sdk.sh | 3 ++- images/linux/scripts/installers/nvm.sh | 2 +- images/linux/scripts/installers/php.sh | 6 +++++- images/linux/scripts/installers/python.sh | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/images/linux/scripts/installers/configure-environment.sh b/images/linux/scripts/installers/configure-environment.sh index 9b2c2c6e0f8f..03a39f1dc087 100644 --- a/images/linux/scripts/installers/configure-environment.sh +++ b/images/linux/scripts/installers/configure-environment.sh @@ -7,14 +7,9 @@ echo ImageOS=$IMAGE_OS | tee -a /etc/environment # Set the ACCEPT_EULA variable to Y value to confirm your acceptance of the End-User Licensing Agreement echo ACCEPT_EULA=Y | tee -a /etc/environment -# Create a file to store user-related global environment variables -touch /etc/profile.d/env_vars.sh -# Set BASH_ENV variable pointed to the file with user-related global environment variables for non-interactive sessions -echo "BASH_ENV=/etc/profile.d/env_vars.sh" | tee -a /etc/environment - # This directory is supposed to be created in $HOME and owned by user(https://github.com/actions/virtual-environments/issues/491) mkdir -p /etc/skel/.config/configstore -echo 'export XDG_CONFIG_HOME=$HOME/.config' | tee -a /etc/profile.d/env_vars.sh +echo 'export XDG_CONFIG_HOME=$HOME/.config' | tee -a /etc/skel/.bashrc # Change waagent entries to use /mnt for swapfile sed -i 's/ResourceDisk.Format=n/ResourceDisk.Format=y/g' /etc/waagent.conf diff --git a/images/linux/scripts/installers/dotnetcore-sdk.sh b/images/linux/scripts/installers/dotnetcore-sdk.sh index e187d9fa70f9..5acae9c2767e 100644 --- a/images/linux/scripts/installers/dotnetcore-sdk.sh +++ b/images/linux/scripts/installers/dotnetcore-sdk.sh @@ -89,6 +89,7 @@ done setEtcEnvironmentVariable DOTNET_SKIP_FIRST_TIME_EXPERIENCE 1 setEtcEnvironmentVariable DOTNET_NOLOGO 1 setEtcEnvironmentVariable DOTNET_MULTILEVEL_LOOKUP 0 -echo 'export PATH=$PATH:$HOME/.dotnet/tools' | tee -a /etc/profile.d/env_vars.sh +prependEtcEnvironmentPath /home/runner/.dotnet/tools +echo 'export PATH="$PATH:$HOME/.dotnet/tools"' | tee -a /etc/skel/.bashrc invoke_tests "DotnetSDK" \ No newline at end of file diff --git a/images/linux/scripts/installers/nvm.sh b/images/linux/scripts/installers/nvm.sh index 4962ea8190d6..36b5e7916a5e 100644 --- a/images/linux/scripts/installers/nvm.sh +++ b/images/linux/scripts/installers/nvm.sh @@ -8,7 +8,7 @@ export NVM_DIR="/etc/skel/.nvm" mkdir $NVM_DIR VERSION=$(curl -s https://api.github.com/repos/nvm-sh/nvm/releases/latest | jq -r '.tag_name') curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/$VERSION/install.sh | bash -echo 'export NVM_DIR=$HOME/.nvm' | tee -a /etc/profile.d/env_vars.sh +echo 'export NVM_DIR=$HOME/.nvm' | tee -a /etc/skel/.bash_profile echo '[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm' | tee -a /etc/skel/.bash_profile [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" diff --git a/images/linux/scripts/installers/php.sh b/images/linux/scripts/installers/php.sh index 9912c169d1d2..e305bc6eb160 100644 --- a/images/linux/scripts/installers/php.sh +++ b/images/linux/scripts/installers/php.sh @@ -87,8 +87,12 @@ php composer-setup.php sudo mv composer.phar /usr/bin/composer php -r "unlink('composer-setup.php');" +# Update /etc/environment +prependEtcEnvironmentPath /home/runner/.config/composer/vendor/bin + + # Add composer bin folder to path -echo 'export PATH=$PATH:$HOME/.config/composer/vendor/bin' | tee -a /etc/profile.d/env_vars.sh +echo 'export PATH="$PATH:$HOME/.config/composer/vendor/bin"' >> /etc/skel/.bashrc #Create composer folder for user to preserve folder permissions mkdir -p /etc/skel/.composer diff --git a/images/linux/scripts/installers/python.sh b/images/linux/scripts/installers/python.sh index 1cd705d8b9a4..193d810b8bbc 100644 --- a/images/linux/scripts/installers/python.sh +++ b/images/linux/scripts/installers/python.sh @@ -41,6 +41,6 @@ if isUbuntu18 || isUbuntu20 ; then fi # Adding this dir to PATH will make installed pip commands are immediately available. -echo 'export PATH=$PATH:$HOME/.local/bin' | tee -a /etc/profile.d/env_vars.sh +echo 'export PATH="$PATH:$HOME/.local/bin"' | tee -a /etc/skel/.bashrc invoke_tests "Tools" "Python" From f201ae012b3c3c280ce9c99123920c1e72307a35 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 19 Mar 2021 08:47:56 +0000 Subject: [PATCH 0076/3485] Updating readme file for ubuntu20 version 20210315.1 (#2930) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/linux/Ubuntu2004-README.md | 68 +++++++++++++++---------------- 1 file changed, 33 insertions(+), 35 deletions(-) diff --git a/images/linux/Ubuntu2004-README.md b/images/linux/Ubuntu2004-README.md index eb81e45f6344..6577fde00e68 100644 --- a/images/linux/Ubuntu2004-README.md +++ b/images/linux/Ubuntu2004-README.md @@ -1,23 +1,21 @@ | Announcements | |-| -| [[Ubuntu] AzCopy 7 will be removed from Ubuntu images on March, 2](https://github.com/actions/virtual-environments/issues/2724) | +| [[windows, ubuntu] Az, Azure and AzureRM module preinstallation policy will be changed on March, 29th](https://github.com/actions/virtual-environments/issues/2916) | | [[ubuntu, windows] GOROOT environment variable will be removed on March, 1](https://github.com/actions/virtual-environments/issues/2683) | -| [[Ubuntu] Android SDK Platforms and Build-tools that are less than version 23 will be removed on March, 1](https://github.com/actions/virtual-environments/issues/2673) | | [[Windows, Ubuntu] Boost 1.72.0 will be removed from images on March, 8](https://github.com/actions/virtual-environments/issues/2667) | -| [[Ubuntu, macOS] .NET 3.0 will be removed from images on March, 1](https://github.com/actions/virtual-environments/issues/2558) | | [Ubuntu-latest workflows will use Ubuntu-20.04](https://github.com/actions/virtual-environments/issues/1816) | *** # Ubuntu 20.04.2 LTS -- Image Version: 20210309.1 +- Image Version: 20210315.1 ## Installed Software ### Language and Runtime - Bash 5.0.17(1)-release -- Clang 8.0.1, 9.0.1, 10.0.0 +- Clang 8.0.1, 9.0.1, 10.0.0, 11.0.0 - Erlang 11.1.7 - GNU C++ 7.5.0, 8.4.0, 9.3.0, 10.2.0 - GNU Fortran 8.4.0, 9.3.0, 10.2.0 -- Julia 1.5.3 +- Julia 1.5.4 - Mono 6.12.0.122 - Node 14.16.0 - Perl 5.30.0 @@ -28,15 +26,15 @@ ### Package Management - cpan 1.64 -- Helm 3.5.2 -- Homebrew 3.0.4 +- Helm 3.5.3 +- Homebrew 3.0.5 - Miniconda 4.9.2 - Npm 6.14.11 - Pip 20.0.2 - Pip3 20.0.2 - Pipx 0.16.1.0 - RubyGems 3.1.2 -- Vcpkg (build from master \<0dc27b9>) +- Vcpkg (build from master \<75522bb>) - Yarn 1.22.5 #### Environment variables @@ -49,7 +47,7 @@ - Ant 1.10.7 - Gradle 6.8.3 - Maven 3.6.3 -- Sbt 1.4.7 +- Sbt 1.4.9 ### Tools - 7-Zip 16.02 @@ -61,20 +59,20 @@ - binutils 2.34 - Buildah 1.19.6 - CMake 3.19.6 -- CodeQL Action Bundle 2.4.4 +- CodeQL Action Bundle 2.4.5 - coreutils 8.30 - curl 7.68.0 - Docker Compose 1.28.5 - Docker-Buildx 0.5.1 - Docker-Moby Client 20.10.5+azure - Docker-Moby Server 20.10.5+azure -- Fastlane 2.177.0 -- Git 2.30.1 +- Fastlane 2.178.0 +- Git 2.30.2 - Git LFS 2.13.2 - Git-ftp 1.6.0 - Haveged 1.9.1 - Heroku 7.50.0 -- HHVM (HipHop VM) 4.99.0 +- HHVM (HipHop VM) 4.100.0 - jq 1.6 - Kind 0.10.0 - Kubectl 1.20.1-5-g76a04fc @@ -97,7 +95,7 @@ - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 - Swig 4.0.1 -- Terraform 0.14.7 +- Terraform 0.14.8 - unzip 6.00 - wget 1.20.3 - yamllint 1.26.0 @@ -106,16 +104,16 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.73 -- AWS CLI 2.1.29 +- AWS CLI 2.1.30 - AWS CLI Session manager plugin 1.2.54.0 - AWS SAM CLI 1.20.0 - Azure CLI (azure-cli) 2.20.0 - Azure CLI (azure-devops) 0.18.0 - GitHub CLI 1.7.0 -- Google Cloud SDK 330.0.0 +- Google Cloud SDK 331.0.0 - Hub CLI 2.14.2 -- Netlify CLI 3.10.6 -- oc CLI 4.7.0 +- Netlify CLI 3.10.12 +- oc CLI 4.7.1 - ORAS CLI 0.10.0 - Vercel CLI 21.3.3 @@ -159,7 +157,7 @@ ### Browsers and Drivers - Chromium 89.0.4389.82 -- Google Chrome 89.0.4389.82 +- Google Chrome 89.0.4389.90 - ChromeDriver 89.0.4389.23 - Mozilla Firefox 86.0 - Geckodriver 0.29.0 @@ -171,7 +169,7 @@ | GECKOWEBDRIVER | /usr/local/share/gecko_driver | ### .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.519 2.1.520 2.1.521 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.616 2.1.617 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 2.1.811 2.1.812 2.1.813 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.109 3.1.110 3.1.111 3.1.112 3.1.200 3.1.201 3.1.202 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402 3.1.403 3.1.404 3.1.405 3.1.406 5.0.100 5.0.101 5.0.102 5.0.103 5.0.200 +- 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.519 2.1.520 2.1.521 2.1.522 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.616 2.1.617 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 2.1.811 2.1.812 2.1.813 2.1.814 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.109 3.1.110 3.1.111 3.1.112 3.1.113 3.1.200 3.1.201 3.1.202 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 5.0.100 5.0.101 5.0.102 5.0.103 5.0.104 5.0.200 5.0.201 ### Az Module - 3.8.0 4.8.0 @@ -194,8 +192,8 @@ ### Cached Tools #### Go - 1.14.15 -- 1.15.8 -- 1.16.0 +- 1.15.10 +- 1.16.2 #### Node.js - 10.24.0 @@ -225,11 +223,11 @@ | Name | Value | Architecture | | --------------- | ----------------------------------- | ------------ | | GOROOT_1_14_X64 | /opt/hostedtoolcache/go/1.14.15/x64 | x64 | -| GOROOT_1_15_X64 | /opt/hostedtoolcache/go/1.15.8/x64 | x64 | -| GOROOT_1_16_X64 | /opt/hostedtoolcache/go/1.16.0/x64 | x64 | +| GOROOT_1_15_X64 | /opt/hostedtoolcache/go/1.15.10/x64 | x64 | +| GOROOT_1_16_X64 | /opt/hostedtoolcache/go/1.16.2/x64 | x64 | ### PowerShell Tools -- PowerShell 7.1.2 +- PowerShell 7.1.3 #### PowerShell Modules | Module | Version | @@ -275,20 +273,20 @@ | alpine:3.7 | sha256:8421d9a84432575381bfabd248f1eb56f3aa21d9d7cd2511583c68c9b7511d10 | 2019-03-07 | | alpine:3.8 | sha256:2bb501e6173d9d006e56de5bce2720eb06396803300fe1687b58a7ff32bf4c14 | 2020-01-23 | | alpine:3.9 | sha256:414e0518bb9228d35e4cd5165567fb91d26c6a214e9c95899e1e056fcd349011 | 2020-04-24 | -| buildpack-deps:buster | sha256:b42568b32a4dff4f1f378fd0685aa2a8e6931e744798a481fd6ed6672d7f0c47 | 2021-02-09 | -| buildpack-deps:stretch | sha256:97f102be9829fa96039a6113e0f053ffdadf2b2ccb67e8838294aee8a2dd947f | 2021-02-09 | -| debian:8 | sha256:40d6faa8c33e8ab03428ad97fc109c369fb510d99f4700df9058940ac9944f09 | 2021-02-09 | -| debian:9 | sha256:d0b7b71db141cedc48e1c2807d12b199ffd7ffe75baf272a34c37480dc2159d1 | 2021-02-09 | +| buildpack-deps:buster | sha256:a78316a3d9d366e8f5d80840a2c9ee361c66bf8a7d7d28edd9224ca70f32fd9c | 2021-03-12 | +| buildpack-deps:stretch | sha256:6f928e94e06da507f1d133c26acf70b3807e2bb6d584e5843507511574c3ad6e | 2021-03-12 | +| debian:8 | sha256:6b1960e0a149981c3c115abee6b9e035591fe55533a20a1cd912e636b8df8820 | 2021-03-12 | +| debian:9 | sha256:ca2af3c25b43f185cc86cc2038a217d9b4cdbb4d47adbcfe5d25e04c1d75e1d9 | 2021-03-12 | | jekyll/builder:latest | sha256:b918b81939a1076dce89d142c0764c2c3cb93858f56ecf4f04ad0387338e77aa | 2020-12-21 | | mcr.microsoft.com/azure-pipelines/node8-typescript:latest | sha256:e52e60b9f71183969830a3664279b5d8c799b4b0ec2c25a0686f7c02f6a9669a | 2018-10-09 | -| node:10 | sha256:426ce4b7e659e081413b739ec3c6a6dea22dfc1a53bfaa147117dfb0238013a2 | 2021-02-23 | -| node:10-alpine | sha256:47cfff9b9eda43e97f42d516ff66c5490ed1f71262a03f3348ea867f222c1a7e | 2021-02-24 | -| node:12 | sha256:7f961434ce9e96be7bf2455bbf362152787c529bb9cf86a15ab1499ea89bfa8c | 2021-02-23 | -| node:12-alpine | sha256:5d8b181a0738654bbe659a68879298f8d2d4256685282ee1c2330d97c33e3eee | 2021-02-24 | +| node:10 | sha256:e84df6f7647a1c3993f724c9a0cacdf6b9b2a4ee722b4face9b29f0013634f17 | 2021-03-12 | +| node:10-alpine | sha256:017b55be202b81bd6b4e9f841d5ddeb6df48467ca5cba0c4194015b987f48a60 | 2021-03-12 | +| node:12 | sha256:0ae1a6a3a8a61e2bcf7f826b2562eb865f9a3095acf41bc6f184773ab66f3007 | 2021-03-12 | +| node:12-alpine | sha256:81eec5b1cac69ff6af62097563737b40ac94b605b43d01466c0cf48e220494be | 2021-03-12 | | ubuntu:14.04 | sha256:63fce984528cec8714c365919882f8fb64c8a3edf23fdfa0b218a2756125456f | 2020-09-16 | ### Installed apt packages -- binutils, bison, brotli, build-essential, bzip2, chromium-browser, coreutils, curl, dbus, dnsutils, dpkg, fakeroot, file, flex, ftp, gnupg2, haveged, imagemagick, iproute2, iputils-ping, jq, lib32z1, libc++-dev, libc++abi-dev, libcurl4, libgbm-dev, libgconf-2-4, libgsl-dev, libgtk-3-0, libmagic-dev, libmagickcore-dev, libmagickwand-dev, libsecret-1-dev, libsqlite3-dev, libunwind8, libxkbfile-dev, libxss1, locales, m4, mediainfo, net-tools, netcat, openssh-client, p7zip-full, p7zip-rar, parallel, pass, patchelf, pkg-config, pollinate, python-is-python3, rpm, rsync, shellcheck, sphinxsearch, sqlite3, ssh, subversion, sudo, swig, telnet, texinfo, time, tk, tzdata, unzip, upx, wget, xorriso, xvfb, xz-utils, zip, zstd, zsync +- binutils, bison, brotli, build-essential, bzip2, chromium-browser, coreutils, curl, dbus, dnsutils, dpkg, fakeroot, file, flex, ftp, gnupg2, haveged, imagemagick, iproute2, iputils-ping, jq, lib32z1, libc++-11-dev, libc++-dev, libc++abi-11-dev, libc++abi-dev, libcurl4, libgbm-dev, libgconf-2-4, libgsl-dev, libgtk-3-0, libmagic-dev, libmagickcore-dev, libmagickwand-dev, libsecret-1-dev, libsqlite3-dev, libunwind8, libxkbfile-dev, libxss1, locales, m4, mediainfo, net-tools, netcat, openssh-client, p7zip-full, p7zip-rar, parallel, pass, patchelf, pkg-config, pollinate, python-is-python3, rpm, rsync, shellcheck, sphinxsearch, sqlite3, ssh, subversion, sudo, swig, telnet, texinfo, time, tk, tzdata, unzip, upx, wget, xorriso, xvfb, xz-utils, zip, zstd, zsync From e1ddcff2f00297d7a32e074188d1037d288a6212 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Fri, 19 Mar 2021 13:43:48 +0300 Subject: [PATCH 0077/3485] Add openssl to software readme (#2984) --- .../linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 | 4 ++++ .../linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 | 1 + 2 files changed, 5 insertions(+) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 index d0fa915e2cd5..6205569b5887 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 @@ -48,6 +48,10 @@ function Get-NodeVersion { return "Node $nodeVersion" } +function Get-OpensslVersion { + return $(openssl version) +} + function Get-PerlVersion { $version = $(perl -e 'print substr($^V,1)') return "Perl $version" diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index ebf3fa43967a..e439e237b824 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -129,6 +129,7 @@ $toolsList = @( (Get-NetToolsVersion), (Get-NewmanVersion), (Get-NvmVersion), + (Get-OpensslVersion), (Get-PackerVersion), (Get-PassVersion), (Get-PhantomJSVersion), From f178f0ec83f136647a01e01872a69d79b2af181d Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Fri, 19 Mar 2021 15:20:27 +0300 Subject: [PATCH 0078/3485] [Ubuntu] Install sbt from gh releases (#2983) * Change sbt installation method to gh releases * add source install.sh --- images/linux/scripts/installers/sbt.sh | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/images/linux/scripts/installers/sbt.sh b/images/linux/scripts/installers/sbt.sh index dd04f72a5032..65f9d00c2241 100644 --- a/images/linux/scripts/installers/sbt.sh +++ b/images/linux/scripts/installers/sbt.sh @@ -4,11 +4,12 @@ ## Desc: Installs sbt ################################################################################ -# Install sbt -# https://www.scala-sbt.org/1.x/docs/Installing-sbt-on-Linux.html -echo "deb https://dl.bintray.com/sbt/debian /" | sudo tee -a /etc/apt/sources.list.d/sbt.list -curl -sL "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x2EE0EA64E40A89B84B2DF73499E82A75642AC823" | apt-key add -apt-get -q update -apt-get -y install sbt +source $HELPER_SCRIPTS/install.sh + +# Install latest sbt release +sbtVersion=$(curl -s -L "https://api.github.com/repos/sbt/sbt/releases" | jq -r '.[] | select(.prerelease==false).name' | sort --unique --version-sort | grep -ve "-.*" | tail -1) +download_with_retries "https://github.com/sbt/sbt/releases/download/v${sbtVersion}/sbt-${sbtVersion}.tgz" "/tmp" "sbt.tgz" +tar zxf /tmp/sbt.tgz -C /usr/share +ln -s /usr/share/sbt/bin/sbt /usr/bin/sbt invoke_tests "Tools" "Sbt" \ No newline at end of file From 33b6bbe9465590b2719a2f05a7e56ddd86d25f87 Mon Sep 17 00:00:00 2001 From: Sergey Dolin Date: Mon, 22 Mar 2021 14:04:21 +0500 Subject: [PATCH 0079/3485] Update Ubuntu documentation to include mono web-server (#2892) * Update Ubuntu documentation to include mono web-server * apply to Ubuntu 20.04 only --- .../SoftwareReport.WebServers.psm1 | 32 +++++++++++++++---- 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.WebServers.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.WebServers.psm1 index 7cf38076690b..dce9f020e15c 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.WebServers.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.WebServers.psm1 @@ -28,14 +28,34 @@ function Get-NginxVersion { } } +function Get-Xsp4Version { + $name = "mono-xsp4" + $port = (grep '^port=' /etc/default/mono-xsp4).Split('=')[1] + $version = (dpkg-query --showformat='${Version}' --show mono-xsp4).Split('-')[0] + $serviceStatus = systemctl show -p ActiveState --value mono-xsp4 + $configFile = "/etc/default/mono-xsp4" + return [PsCustomObject]@{ + "Name" = $name + "Version" = $version + "ConfigFile" = $configFile + "ServiceStatus" = $serviceStatus + "ListenPort" = $port + } +} + function Build-WebServersSection { + $servers = @( + (Get-ApacheVersion), + (Get-NginxVersion) + ) + if (Test-IsUbuntu20) { + $servers += (Get-Xsp4Version) + } + $output = "" $output += New-MDHeader "Web Servers" -Level 3 - $output += @( - (Get-ApacheVersion), - (Get-NginxVersion) - ) | Sort-Object Name | New-MDTable - + $output += $servers | Sort-Object Name | New-MDTable $output += New-MDNewLine + return $output -} \ No newline at end of file +} From faee73e79a5bdbf2f9d9d79c81453dfcf3452485 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 22 Mar 2021 12:19:36 +0000 Subject: [PATCH 0080/3485] Updating readme file for win19 version 20210316.1 (#2948) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/win/Windows2019-Readme.md | 67 ++++++++++++++++---------------- 1 file changed, 34 insertions(+), 33 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index 513b2169a01b..770c0f0b13dc 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -1,11 +1,12 @@ | Announcements | |-| +| [[windows, ubuntu] Az, Azure and AzureRM module preinstallation policy will be changed on March, 29th](https://github.com/actions/virtual-environments/issues/2916) | | [[ubuntu, windows] GOROOT environment variable will be removed on March, 1](https://github.com/actions/virtual-environments/issues/2683) | | [[Windows, Ubuntu] Boost 1.72.0 will be removed from images on March, 8](https://github.com/actions/virtual-environments/issues/2667) | *** # Microsoft Windows Server 2019 Datacenter - OS Version: 10.0.17763 Build 1817 -- Image Version: 20210309.0 +- Image Version: 20210316.1 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -13,25 +14,25 @@ ## Installed Software ### Language and Runtime - Bash 4.4.23(1)-release -- Go 1.15.8 -- Julia 1.5.3 +- Go 1.15.10 +- Julia 1.5.4 - Node 14.16.0 - Perl 5.32.1 -- PHP 8.0.1 +- PHP 8.0.3 - Python 3.7.9 - Ruby 2.5.8p224 ### Package Management - Chocolatey 0.10.15 - Composer 2.0.11 -- Helm 3.5.2 +- Helm 3.5.3 - Miniconda 4.9.2 - NPM 6.14.11 - NuGet 5.8.1.7021 - pip 21.0.1 (python 3.7) - Pipx 0.16.1.0 - RubyGems 2.7.6.2 -- Vcpkg (build from master \<0dc27b9>) +- Vcpkg (build from master \<9431133>) - Yarn 1.22.10 #### Environment variables @@ -52,12 +53,12 @@ - Bazel 4.0.0 - Bazelisk 1.7.5 - Cabal 3.4.0.0 -- CMake 3.19.6 +- CMake 3.19.7 - CodeQL Action Bundle 2.4.5 -- Docker 19.03.14 +- Docker 20.10.0 - Docker-compose 1.28.5 - ghc 9.0.1 -- Git 2.30.1 +- Git 2.30.2 - Git LFS 2.13.2 - Google Cloud SDK 331.0.0 - InnoSetup 6.1.2 @@ -77,12 +78,12 @@ - VSWhere 2.8.4 - WinAppDriver 1.2.2009.02003 - yamllint 1.26.0 -- zstd 1.4.5 +- zstd 1.4.9 ### CLI Tools - Alibaba Cloud CLI 3.0.73 -- AWS CLI 2.1.28 -- AWS SAM CLI 1.20.0 +- AWS CLI 2.1.29 +- AWS SAM CLI 1.21.1 - AWS Session Manager CLI 1.2.54.0 - Azure CLI 2.20.0 - Azure Dev Spaces CLI 1.0.20201219.2 @@ -106,11 +107,11 @@ - Rustfmt 1.4.30 ### Browsers and webdrivers -- Google Chrome 89.0.4389.82 +- Google Chrome 89.0.4389.90 - Chrome Driver 89.0.4389.23 -- Microsoft Edge 89.0.774.48 -- Microsoft Edge Driver 89.0.774.48 -- Mozilla Firefox 86.0 +- Microsoft Edge 89.0.774.54 +- Microsoft Edge Driver 89.0.774.54 +- Mozilla Firefox 86.0.1 - Gecko Driver 0.29.0 - IE Driver 3.150.1.0 @@ -133,7 +134,7 @@ | ------------- | --------------------------------- | | gitbash.exe | C:\Program Files\Git\bin\bash.exe | | msys2bash.cmd | C:\msys64\usr\bin\bash.exe | -| wslbash.exe | C:\windows\System32\bash.exe | +| wslbash.exe | C:\Windows\System32\bash.exe | ### MSYS2 - Pacman 5.2.2 @@ -151,8 +152,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | ------- | ------------ | -------------------- | | 1.13.15 | x64 | GOROOT_1_13_X64 | | 1.14.15 | x64 | GOROOT_1_14_X64 | -| 1.15.8 (Default) | x64 | GOROOT_1_15_X64 | -| 1.16.0 | x64 | GOROOT_1_16_X64 | +| 1.15.10 (Default) | x64 | GOROOT_1_15_X64 | +| 1.16.2 | x64 | GOROOT_1_16_X64 | #### Node @@ -228,15 +229,15 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Nginx | 1.19.8 | C:\tools\nginx-1.19.8\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2019 -| Name | Version | Path | -| ----------------------------- | -------------- | -------------------------------------------------------------- | -| Visual Studio Enterprise 2019 | 16.9.31025.194 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | +| Name | Version | Path | +| ----------------------------- | ------------- | -------------------------------------------------------------- | +| Visual Studio Enterprise 2019 | 16.9.31105.61 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | #### Workloads, components and extensions: | Package | Version | | ------------------------------------------------------------------------- | -------------- | -| Component.Android.NDK.R16B | 16.9.31023.347 | +| Component.Android.NDK.R16B | 16.9.31105.61 | | Component.Android.SDK25.Private | 16.0.28625.61 | | Component.Android.SDK30 | 16.9.31004.209 | | Component.Ant | 1.9.3.8 | @@ -290,11 +291,11 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.Net.ComponentGroup.4.7.DeveloperTools | 16.3.29207.166 | | Microsoft.Net.ComponentGroup.DevelopmentPrerequisites | 16.3.29207.166 | | Microsoft.Net.ComponentGroup.TargetingPacks.Common | 16.0.28516.191 | -| Microsoft.Net.Core.Component.SDK.2.1 | 16.9.31024.58 | +| Microsoft.Net.Core.Component.SDK.2.1 | 16.9.31105.61 | | Microsoft.NetCore.Component.DevelopmentTools | 16.9.31004.209 | -| Microsoft.NetCore.Component.Runtime.3.1 | 16.9.31024.58 | -| Microsoft.NetCore.Component.Runtime.5.0 | 16.9.31024.58 | -| Microsoft.NetCore.Component.SDK | 16.9.31024.58 | +| Microsoft.NetCore.Component.Runtime.3.1 | 16.9.31105.61 | +| Microsoft.NetCore.Component.Runtime.5.0 | 16.9.31105.61 | +| Microsoft.NetCore.Component.SDK | 16.9.31105.61 | | Microsoft.NetCore.Component.Web | 16.9.31004.209 | | Microsoft.VisualStudio.Component.AppInsights.Tools | 16.5.29515.121 | | Microsoft.VisualStudio.Component.AspNet45 | 16.9.31004.209 | @@ -329,7 +330,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Component.Graphics | 16.9.31004.209 | | Microsoft.VisualStudio.Component.Graphics.Tools | 16.0.28625.61 | | Microsoft.VisualStudio.Component.IISExpress | 16.0.28315.86 | -| Microsoft.VisualStudio.Component.IntelliCode | 16.9.31019.194 | +| Microsoft.VisualStudio.Component.IntelliCode | 16.9.31105.61 | | Microsoft.VisualStudio.Component.IntelliTrace.FrontEnd | 16.5.29515.121 | | Microsoft.VisualStudio.Component.JavaScript.Diagnostics | 16.0.28517.75 | | Microsoft.VisualStudio.Component.JavaScript.TypeScript | 16.9.31004.209 | @@ -504,7 +505,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 4.7.2 4.8 ### PowerShell Tools -- PowerShell 7.1.2 +- PowerShell 7.1.3 #### Azure Powershell Modules | Module | Version | Path | @@ -558,10 +559,10 @@ All other versions are saved but not installed. ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:9dc74a74989c1ffd1af73a4eccc5ddeda00622c1ee52bdca4f3722c3dc3f2753 | 2021-02-09 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:ba9d68e558eef54f00978e70e8adcae4e68a15681227d466fc6d148fa3a927c1 | 2021-02-09 | -| mcr.microsoft.com/windows/nanoserver:1809 | sha256:a359daf59359fa1d1b7eb105aaa9508a779d942381d7b7329655bb58ce9f9101 | 2021-02-02 | -| mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:1ed72e74ffe1fd07eef2df3eb9a5d57f64fdac099329a4a63aa1a99b4139ce5a | 2021-02-06 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:953245d144c00acd448ae1d85814d95a7c3064a5c0675cadc78e9860a32a071b | 2021-03-09 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:4d5dc01599c02124bcd5f7778753ea6f8369c6fdd5c39da88f5ac91e37e352e6 | 2021-03-09 | +| mcr.microsoft.com/windows/nanoserver:1809 | sha256:def85061f840b63c4e45019ba716a4b35649ecba2e273621d6e80c8640ceff4c | 2021-02-26 | +| mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:acae9dedd8ce6fbc624e8c4b52555a9d3201eb47aacd45b4a00e0d81083b4cab | 2021-02-27 | | microsoft/aspnetcore-build:1.0-2.0 | sha256:9ecc7c5a8a7a11dca5f08c860165646cb30d084606360a3a72b9cbe447241c0c | 2018-08-15 | From b345f38fbec5356bf6c19807735d679e769a3adb Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 22 Mar 2021 12:49:17 +0000 Subject: [PATCH 0081/3485] Updating readme file for macOS-11.0 version 20210321.1 (#3000) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/macos/macos-11.0-Readme.md | 46 +++++++++++++++---------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/images/macos/macos-11.0-Readme.md b/images/macos/macos-11.0-Readme.md index 6b8e04781adb..431cbeefbdc1 100644 --- a/images/macos/macos-11.0-Readme.md +++ b/images/macos/macos-11.0-Readme.md @@ -5,7 +5,7 @@ # macOS 11.2 info - System Version: macOS 11.2.3 (20D91) - Kernel Version: Darwin 20.3.0 -- Image Version: 20210314.1 +- Image Version: 20210321.1 ## Installed Software ### Language and Runtime @@ -31,19 +31,19 @@ - Ruby 2.7.2p137 ### Package Management -- Bundler version 2.2.14 +- Bundler version 2.2.15 - Carthage 0.37.0 - CocoaPods 1.10.1 - Composer 2.0.11 -- Homebrew 3.0.5 +- Homebrew 3.0.7 - Miniconda 4.9.2 - NPM 6.14.11 - NuGet 5.6.0.6489 - Pip 20.3.4 (python 2.7) - Pip 21.0.1 (python 3.9) - Pipx 0.16.1.0 -- RubyGems 3.2.14 -- Vcpkg 2021 (build from master \<75522bb>) +- RubyGems 3.2.15 +- Vcpkg 2021 (build from master \<9986c28>) - Yarn 1.22.5 #### Environment variables @@ -66,7 +66,7 @@ - bsdtar 3.3.2 - available by 'tar' alias - Curl 7.75.0 - Git LFS: 2.13.2 -- Git: 2.30.2 +- Git: 2.31.0 - GitHub CLI: 1.7.0 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.1 @@ -87,13 +87,13 @@ ### Tools - Aliyun CLI 3.0.73 -- App Center CLI 2.7.4 -- AWS CLI 2.1.30 -- AWS SAM CLI 1.20.0 +- App Center CLI 2.8.1 +- AWS CLI 2.1.31 +- AWS SAM CLI 1.21.1 - AWS Session Manager CLI 1.2.30.0 - Azure CLI 2.20.0 - Cabal 3.4.0.0 -- Cmake 3.19.6 +- Cmake 3.19.7 - Fastlane 2.178.0 - GHC 9.0.1 - GHCup v0.1.14 @@ -101,7 +101,7 @@ - Xcode Command Line Tools 12.4.0.0.1.1610135815 ### Linters -- SwiftLint 0.43.0 +- SwiftLint 0.43.1 - yamllint 1.26.0 ### Browsers @@ -109,8 +109,8 @@ - SafariDriver 14.0.3 (16610.4.3.1.7) - Google Chrome 89.0.4389.90 - ChromeDriver 89.0.4389.23 -- Microsoft Edge 89.0.774.50 -- MSEdgeDriver 89.0.774.54 +- Microsoft Edge 89.0.774.57 +- MSEdgeDriver 89.0.774.57 - Mozilla Firefox 86.0.1 - geckodriver 0.29.0 @@ -122,10 +122,10 @@ | GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | ### Java -| Version | Vendor | Environment Variable | -| --------- | ------------ | -------------------- | -| 1.8.0_282 | AdoptOpenJDK | JAVA_HOME_8_X64 | -| 11.0.10 | AdoptOpenJDK | JAVA_HOME_11_X64 | +| Version | Vendor | Environment Variable | +| --------- | ------------- | -------------------- | +| 8.0.282+8 | Adopt OpenJDK | JAVA_HOME_8_X64 | +| 11.0.10+9 | Adopt OpenJDK | JAVA_HOME_11_X64 | ### Cached Tools #### Ruby @@ -182,10 +182,10 @@ ### Xamarin #### Visual Studio for Mac -- 8.9.1.34 +- 8.9.2.0 #### Mono -- 6.12.0.122 +- 6.12.0.125 #### Xamarin.iOS - 14.14.2.5 @@ -206,7 +206,7 @@ - 6.20.2.2 #### Xamarin.Android -- 11.2.0 +- 11.2.2 - 11.1.0 - 11.0.2 @@ -285,10 +285,10 @@ | Package Name | Version | | -------------------------- | ------------------------------------------------------------------------------------------------------------------------ | | Android Command Line Tools | 3.0 | -| Android Emulator | 30.4.5 | +| Android Emulator | 30.5.3 | | Android SDK Build-tools | 30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3 | -| Android SDK Platforms | android-S (rev 1)
android-30 (rev 3)
android-29 (rev 5)
android-28 (rev 6)
android-27 (rev 3) | -| Android SDK Platform-Tools | 31.0.0 | +| Android SDK Platforms | android-S (rev 2)
android-30 (rev 3)
android-29 (rev 5)
android-28 (rev 6)
android-27 (rev 3) | +| Android SDK Platform-Tools | 31.0.1 | | Android SDK Tools | 26.1.1 | | Android Support Repository | 47.0.0 | | CMake | 3.10.2 | From dee50eebffa60a7dd9149033675d44a027dd6b33 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Tue, 23 Mar 2021 10:48:35 +0300 Subject: [PATCH 0082/3485] add acl package to Ubuntu 20 (#3006) --- images/linux/scripts/tests/Apt.Tests.ps1 | 5 +++++ images/linux/toolsets/toolset-2004.json | 1 + 2 files changed, 6 insertions(+) diff --git a/images/linux/scripts/tests/Apt.Tests.ps1 b/images/linux/scripts/tests/Apt.Tests.ps1 index 0913ade5a138..e9e5ac6d31ed 100644 --- a/images/linux/scripts/tests/Apt.Tests.ps1 +++ b/images/linux/scripts/tests/Apt.Tests.ps1 @@ -9,6 +9,11 @@ Describe "Apt" { } It " is available" -TestCases $testCases { + if ($toolName -eq "acl") + { + $toolName = "getfacl" + } + if ($toolName -eq "p7zip-full") { $toolName = "p7zip" diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index 773ba58ffd07..bbe4f7ca6e20 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -156,6 +156,7 @@ "zsync" ], "cmd_packages": [ + "acl", "binutils", "bison", "brotli", From 37f0d72bbef8763534ad50c1a29563a5c5bdfe18 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 24 Mar 2021 09:51:05 +0000 Subject: [PATCH 0083/3485] Updating readme file for ubuntu18 version 20210318.0 (#2991) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/linux/Ubuntu1804-README.md | 74 +++++++++++++++---------------- 1 file changed, 36 insertions(+), 38 deletions(-) diff --git a/images/linux/Ubuntu1804-README.md b/images/linux/Ubuntu1804-README.md index 166158e9a8a3..fb4be3187f46 100644 --- a/images/linux/Ubuntu1804-README.md +++ b/images/linux/Ubuntu1804-README.md @@ -1,12 +1,12 @@ | Announcements | |-| +| [[Ubuntu] jekyll/builder and node8-typescript docker images will be removed from images on March, 22](https://github.com/actions/virtual-environments/issues/2958) | +| [[Ubuntu] Clang, GCC and Gfortran versions less than 9.x will be removed from images on March, 29](https://github.com/actions/virtual-environments/issues/2950) | | [[windows, ubuntu] Az, Azure and AzureRM module preinstallation policy will be changed on March, 29th](https://github.com/actions/virtual-environments/issues/2916) | -| [[ubuntu, windows] GOROOT environment variable will be removed on March, 1](https://github.com/actions/virtual-environments/issues/2683) | -| [[Windows, Ubuntu] Boost 1.72.0 will be removed from images on March, 8](https://github.com/actions/virtual-environments/issues/2667) | -| [Ubuntu-latest workflows will use Ubuntu-20.04](https://github.com/actions/virtual-environments/issues/1816) | *** # Ubuntu 18.04.5 LTS -- Image Version: 20210315.1 +- Linux kernel version: 5.4.0-1041-azure +- Image Version: 20210318.0 ## Installed Software ### Language and Runtime @@ -27,14 +27,14 @@ ### Package Management - cpan 1.64 - Helm 3.5.3 -- Homebrew 3.0.5 +- Homebrew 3.0.7 - Miniconda 4.9.2 - Npm 6.14.11 - Pip 9.0.1 - Pip3 9.0.1 - Pipx 0.16.1.0 - RubyGems 2.7.6 -- Vcpkg (build from master \<75522bb>) +- Vcpkg (build from master \) - Yarn 1.22.5 #### Environment variables @@ -51,14 +51,14 @@ ### Tools - 7-Zip 16.02 -- Ansible 2.9.18 +- Ansible 2.9.19 - apt-fast 1.9.10 - AzCopy 10.9.0 (available by `azcopy` and `azcopy10` aliases) - Bazel 4.0.0 - Bazelisk 1.7.5 - binutils 2.30 - Buildah 1.19.6 -- CMake 3.19.6 +- CMake 3.19.7 - CodeQL Action Bundle 2.4.5 - coreutils 8.28 - curl 7.58.0 @@ -66,12 +66,12 @@ - Docker-Buildx 0.5.1 - Docker-Moby Client 20.10.5+azure - Docker-Moby Server 20.10.5+azure -- Git 2.30.2 +- Git 2.31.0 - Git LFS 2.13.2 - Git-ftp 1.3.1 - Haveged 1.9.1 -- Heroku 7.50.0 -- HHVM (HipHop VM) 4.100.0 +- Heroku 7.51.0 +- HHVM (HipHop VM) 4.101.0 - jq 1.5 - Kind 0.10.0 - Kubectl 1.20.1-5-g76a04fc @@ -88,7 +88,7 @@ - pass 1.7.1 - PhantomJS 2.1.1 - Podman 3.0.1 -- Pulumi 2.22.0 +- Pulumi 2.23.1 - R 4.0.4 - Skopeo 1.2.2 - Sphinx Open Source Search Server 2.2.11 @@ -103,17 +103,17 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.73 -- AWS CLI 1.19.27 +- AWS CLI 1.19.30 - AWS CLI Session manager plugin 1.2.54.0 -- AWS SAM CLI 1.20.0 +- AWS SAM CLI 1.21.1 - Azure CLI (azure-cli) 2.20.0 - Azure CLI (azure-devops) 0.18.0 - GitHub CLI 1.7.0 -- Google Cloud SDK 331.0.0 +- Google Cloud SDK 332.0.0 - Hub CLI 2.14.2 -- Netlify CLI 3.10.12 -- oc CLI 4.7.1 -- ORAS CLI 0.10.0 +- Netlify CLI 3.13.3 +- OpenShift CLI 4.7.2 +- ORAS CLI 0.11.1 - Vercel CLI 21.3.3 ### Java @@ -128,7 +128,7 @@ | -------- | --------------------------------- | | PHP | 7.1.33 7.2.34 7.3.27 7.4.16 8.0.3 | | Composer | 2.0.11 | -| PHPUnit | 8.5.14 | +| PHPUnit | 8.5.15 | ### Haskell - Cabal 3.4.0.0 @@ -240,8 +240,8 @@ | -------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 3.0 | | Android SDK Build-tools | 30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3
26.0.0 26.0.1 26.0.2 26.0.3
25.0.0 25.0.1 25.0.2 25.0.3
24.0.0 24.0.1 24.0.2 24.0.3
23.0.1 23.0.2 23.0.3 | -| Android SDK Platform-Tools | 31.0.0 | -| Android SDK Platforms | android-S (rev 1)
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 SDK Platform-Tools | 31.0.1 | +| Android SDK Platforms | android-S (rev 2)
android-30 (rev 3)
android-29 (rev 5)
android-28 (rev 6)
android-27 (rev 3)
android-26 (rev 2)
android-25 (rev 3)
android-24 (rev 2)
android-23 (rev 3) | | Android SDK Tools | 26.1.1 | | Android Support Repository | 47.0.0 | | CMake | 3.10.2 | @@ -260,23 +260,21 @@ | ANDROID_SDK_ROOT | /usr/local/lib/android/sdk | ### Cached Docker images -| Repository:Tag | Digest | Created | -| --------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| alpine:3.10 | sha256:0b4d282d7ae7cf5ed91801654a918aea45d6c1de6df0db6a29d60619141fb8de | 2021-02-24 | -| alpine:3.7 | sha256:8421d9a84432575381bfabd248f1eb56f3aa21d9d7cd2511583c68c9b7511d10 | 2019-03-07 | -| alpine:3.8 | sha256:2bb501e6173d9d006e56de5bce2720eb06396803300fe1687b58a7ff32bf4c14 | 2020-01-23 | -| alpine:3.9 | sha256:414e0518bb9228d35e4cd5165567fb91d26c6a214e9c95899e1e056fcd349011 | 2020-04-24 | -| buildpack-deps:buster | sha256:a78316a3d9d366e8f5d80840a2c9ee361c66bf8a7d7d28edd9224ca70f32fd9c | 2021-03-12 | -| buildpack-deps:stretch | sha256:6f928e94e06da507f1d133c26acf70b3807e2bb6d584e5843507511574c3ad6e | 2021-03-12 | -| debian:8 | sha256:6b1960e0a149981c3c115abee6b9e035591fe55533a20a1cd912e636b8df8820 | 2021-03-12 | -| debian:9 | sha256:ca2af3c25b43f185cc86cc2038a217d9b4cdbb4d47adbcfe5d25e04c1d75e1d9 | 2021-03-12 | -| jekyll/builder:latest | sha256:b918b81939a1076dce89d142c0764c2c3cb93858f56ecf4f04ad0387338e77aa | 2020-12-21 | -| mcr.microsoft.com/azure-pipelines/node8-typescript:latest | sha256:e52e60b9f71183969830a3664279b5d8c799b4b0ec2c25a0686f7c02f6a9669a | 2018-10-09 | -| node:10 | sha256:e84df6f7647a1c3993f724c9a0cacdf6b9b2a4ee722b4face9b29f0013634f17 | 2021-03-12 | -| node:10-alpine | sha256:017b55be202b81bd6b4e9f841d5ddeb6df48467ca5cba0c4194015b987f48a60 | 2021-03-12 | -| node:12 | sha256:0ae1a6a3a8a61e2bcf7f826b2562eb865f9a3095acf41bc6f184773ab66f3007 | 2021-03-12 | -| node:12-alpine | sha256:81eec5b1cac69ff6af62097563737b40ac94b605b43d01466c0cf48e220494be | 2021-03-12 | -| ubuntu:14.04 | sha256:63fce984528cec8714c365919882f8fb64c8a3edf23fdfa0b218a2756125456f | 2020-09-16 | +| Repository:Tag | Digest | Created | +| ---------------------- | ------------------------------------------------------------------------ | ---------- | +| alpine:3.10 | sha256:0b4d282d7ae7cf5ed91801654a918aea45d6c1de6df0db6a29d60619141fb8de | 2021-02-24 | +| alpine:3.7 | sha256:8421d9a84432575381bfabd248f1eb56f3aa21d9d7cd2511583c68c9b7511d10 | 2019-03-07 | +| alpine:3.8 | sha256:2bb501e6173d9d006e56de5bce2720eb06396803300fe1687b58a7ff32bf4c14 | 2020-01-23 | +| alpine:3.9 | sha256:414e0518bb9228d35e4cd5165567fb91d26c6a214e9c95899e1e056fcd349011 | 2020-04-24 | +| buildpack-deps:buster | sha256:a78316a3d9d366e8f5d80840a2c9ee361c66bf8a7d7d28edd9224ca70f32fd9c | 2021-03-12 | +| buildpack-deps:stretch | sha256:6f928e94e06da507f1d133c26acf70b3807e2bb6d584e5843507511574c3ad6e | 2021-03-12 | +| debian:8 | sha256:6b1960e0a149981c3c115abee6b9e035591fe55533a20a1cd912e636b8df8820 | 2021-03-12 | +| debian:9 | sha256:ca2af3c25b43f185cc86cc2038a217d9b4cdbb4d47adbcfe5d25e04c1d75e1d9 | 2021-03-12 | +| node:10 | sha256:e84df6f7647a1c3993f724c9a0cacdf6b9b2a4ee722b4face9b29f0013634f17 | 2021-03-12 | +| node:10-alpine | sha256:017b55be202b81bd6b4e9f841d5ddeb6df48467ca5cba0c4194015b987f48a60 | 2021-03-12 | +| node:12 | sha256:0ae1a6a3a8a61e2bcf7f826b2562eb865f9a3095acf41bc6f184773ab66f3007 | 2021-03-12 | +| node:12-alpine | sha256:81eec5b1cac69ff6af62097563737b40ac94b605b43d01466c0cf48e220494be | 2021-03-12 | +| ubuntu:14.04 | sha256:63fce984528cec8714c365919882f8fb64c8a3edf23fdfa0b218a2756125456f | 2020-09-16 | ### Installed apt packages - binutils, bison, brotli, build-essential, bzip2, coreutils, curl, dbus, dnsutils, dpkg, fakeroot, file, flex, ftp, gnupg2, haveged, imagemagick, iproute2, iputils-ping, jq, lib32z1, libc++-dev, libc++abi-dev, libcurl3, libgbm-dev, libgconf-2-4, libgsl-dev, libgtk-3-0, libmagic-dev, libmagickcore-dev, libmagickwand-dev, libsecret-1-dev, libsqlite3-dev, libunwind8, libxkbfile-dev, libxss1, locales, m4, mediainfo, net-tools, netcat, openssh-client, p7zip-full, p7zip-rar, parallel, pass, patchelf, pkg-config, pollinate, rpm, rsync, shellcheck, sphinxsearch, sqlite3, ssh, subversion, sudo, swig, telnet, texinfo, time, tk, tzdata, unzip, upx, wget, xorriso, xvfb, xz-utils, zip, zstd, zsync From 46df370461f61a99e1274b8d0f4fe8203ced67d5 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 24 Mar 2021 09:53:05 +0000 Subject: [PATCH 0084/3485] Updating readme file for ubuntu16 version 20210318.0 (#2990) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/linux/Ubuntu1604-README.md | 59 +++++++++++++++---------------- 1 file changed, 28 insertions(+), 31 deletions(-) diff --git a/images/linux/Ubuntu1604-README.md b/images/linux/Ubuntu1604-README.md index d5514d7dc69d..6dc3fb2bf5e7 100644 --- a/images/linux/Ubuntu1604-README.md +++ b/images/linux/Ubuntu1604-README.md @@ -1,13 +1,12 @@ | Announcements | |-| +| [[Ubuntu] jekyll/builder and node8-typescript docker images will be removed from images on March, 22](https://github.com/actions/virtual-environments/issues/2958) | | [[Ubuntu] Clang, GCC and Gfortran versions less than 9.x will be removed from images on March, 29](https://github.com/actions/virtual-environments/issues/2950) | | [[windows, ubuntu] Az, Azure and AzureRM module preinstallation policy will be changed on March, 29th](https://github.com/actions/virtual-environments/issues/2916) | -| [[ubuntu, windows] GOROOT environment variable will be removed on March, 1](https://github.com/actions/virtual-environments/issues/2683) | -| [[Windows, Ubuntu] Boost 1.72.0 will be removed from images on March, 8](https://github.com/actions/virtual-environments/issues/2667) | -| [Ubuntu-latest workflows will use Ubuntu-20.04](https://github.com/actions/virtual-environments/issues/1816) | *** # Ubuntu 16.04.7 LTS -- Image Version: 20210317.1 +- Linux kernel version: 4.15.0-1109-azure +- Image Version: 20210318.0 ## Installed Software ### Language and Runtime @@ -34,7 +33,7 @@ - Pip 8.1.1 - Pip3 8.1.1 - RubyGems 2.5.2 -- Vcpkg (build from master \<9ab3baf>) +- Vcpkg (build from master \) - Yarn 1.22.5 #### Environment variables @@ -69,7 +68,7 @@ - Git LFS 2.13.2 - Git-ftp 1.0.2 - Haveged 1.9.1 -- Heroku 7.50.0 +- Heroku 7.51.0 - HHVM (HipHop VM) 4.56.4 - jq 1.5 - Kind 0.10.0 @@ -86,7 +85,7 @@ - Packer 1.7.0 - pass 1.6.5 - PhantomJS 2.1.1 -- Pulumi 2.22.0 +- Pulumi 2.23.1 - R 4.0.4 - Sphinx Open Source Search Server 2.2.9 - SVN 1.9.3 @@ -100,7 +99,7 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.73 -- AWS CLI 1.19.29 +- AWS CLI 1.19.32 - AWS CLI Session manager plugin 1.2.54.0 - AWS SAM CLI 1.21.1 - Azure CLI (azure-cli) 2.20.0 @@ -108,9 +107,9 @@ - GitHub CLI 1.7.0 - Google Cloud SDK 332.0.0 - Hub CLI 2.14.2 -- Netlify CLI 3.13.0 -- oc CLI 4.7.2 -- ORAS CLI 0.11.0 +- Netlify CLI 3.13.3 +- OpenShift CLI 4.7.2 +- ORAS CLI 0.11.1 - Vercel CLI 21.3.3 ### Java @@ -125,7 +124,7 @@ | -------- | ----------------------------------------------- | | PHP | 5.6.40 7.0.33 7.1.33 7.2.34 7.3.27 7.4.16 8.0.3 | | Composer | 2.0.11 | -| PHPUnit | 8.5.14 | +| PHPUnit | 8.5.15 | ### Haskell - Cabal 3.4.0.0 @@ -237,8 +236,8 @@ | -------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 3.0 | | Android SDK Build-tools | 30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3
26.0.0 26.0.1 26.0.2 26.0.3
25.0.0 25.0.1 25.0.2 25.0.3
24.0.0 24.0.1 24.0.2 24.0.3
23.0.1 23.0.2 23.0.3 | -| Android SDK Platform-Tools | 31.0.0 | -| Android SDK Platforms | android-S (rev 1)
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 SDK Platform-Tools | 31.0.1 | +| Android SDK Platforms | android-S (rev 2)
android-30 (rev 3)
android-29 (rev 5)
android-28 (rev 6)
android-27 (rev 3)
android-26 (rev 2)
android-25 (rev 3)
android-24 (rev 2)
android-23 (rev 3) | | Android SDK Tools | 26.1.1 | | Android Support Repository | 47.0.0 | | CMake | 3.10.2 | @@ -257,23 +256,21 @@ | ANDROID_SDK_ROOT | /usr/local/lib/android/sdk | ### Cached Docker images -| Repository:Tag | Digest | Created | -| --------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| alpine:3.10 | sha256:0b4d282d7ae7cf5ed91801654a918aea45d6c1de6df0db6a29d60619141fb8de | 2021-02-24 | -| alpine:3.7 | sha256:8421d9a84432575381bfabd248f1eb56f3aa21d9d7cd2511583c68c9b7511d10 | 2019-03-07 | -| alpine:3.8 | sha256:2bb501e6173d9d006e56de5bce2720eb06396803300fe1687b58a7ff32bf4c14 | 2020-01-23 | -| alpine:3.9 | sha256:414e0518bb9228d35e4cd5165567fb91d26c6a214e9c95899e1e056fcd349011 | 2020-04-24 | -| buildpack-deps:buster | sha256:a78316a3d9d366e8f5d80840a2c9ee361c66bf8a7d7d28edd9224ca70f32fd9c | 2021-03-12 | -| buildpack-deps:stretch | sha256:6f928e94e06da507f1d133c26acf70b3807e2bb6d584e5843507511574c3ad6e | 2021-03-12 | -| debian:8 | sha256:6b1960e0a149981c3c115abee6b9e035591fe55533a20a1cd912e636b8df8820 | 2021-03-12 | -| debian:9 | sha256:ca2af3c25b43f185cc86cc2038a217d9b4cdbb4d47adbcfe5d25e04c1d75e1d9 | 2021-03-12 | -| jekyll/builder:latest | sha256:b918b81939a1076dce89d142c0764c2c3cb93858f56ecf4f04ad0387338e77aa | 2020-12-21 | -| mcr.microsoft.com/azure-pipelines/node8-typescript:latest | sha256:e52e60b9f71183969830a3664279b5d8c799b4b0ec2c25a0686f7c02f6a9669a | 2018-10-09 | -| node:10 | sha256:e84df6f7647a1c3993f724c9a0cacdf6b9b2a4ee722b4face9b29f0013634f17 | 2021-03-12 | -| node:10-alpine | sha256:017b55be202b81bd6b4e9f841d5ddeb6df48467ca5cba0c4194015b987f48a60 | 2021-03-12 | -| node:12 | sha256:0ae1a6a3a8a61e2bcf7f826b2562eb865f9a3095acf41bc6f184773ab66f3007 | 2021-03-12 | -| node:12-alpine | sha256:81eec5b1cac69ff6af62097563737b40ac94b605b43d01466c0cf48e220494be | 2021-03-12 | -| ubuntu:14.04 | sha256:63fce984528cec8714c365919882f8fb64c8a3edf23fdfa0b218a2756125456f | 2020-09-16 | +| Repository:Tag | Digest | Created | +| ---------------------- | ------------------------------------------------------------------------ | ---------- | +| alpine:3.10 | sha256:0b4d282d7ae7cf5ed91801654a918aea45d6c1de6df0db6a29d60619141fb8de | 2021-02-24 | +| alpine:3.7 | sha256:8421d9a84432575381bfabd248f1eb56f3aa21d9d7cd2511583c68c9b7511d10 | 2019-03-07 | +| alpine:3.8 | sha256:2bb501e6173d9d006e56de5bce2720eb06396803300fe1687b58a7ff32bf4c14 | 2020-01-23 | +| alpine:3.9 | sha256:414e0518bb9228d35e4cd5165567fb91d26c6a214e9c95899e1e056fcd349011 | 2020-04-24 | +| buildpack-deps:buster | sha256:a78316a3d9d366e8f5d80840a2c9ee361c66bf8a7d7d28edd9224ca70f32fd9c | 2021-03-12 | +| buildpack-deps:stretch | sha256:6f928e94e06da507f1d133c26acf70b3807e2bb6d584e5843507511574c3ad6e | 2021-03-12 | +| debian:8 | sha256:6b1960e0a149981c3c115abee6b9e035591fe55533a20a1cd912e636b8df8820 | 2021-03-12 | +| debian:9 | sha256:ca2af3c25b43f185cc86cc2038a217d9b4cdbb4d47adbcfe5d25e04c1d75e1d9 | 2021-03-12 | +| node:10 | sha256:e84df6f7647a1c3993f724c9a0cacdf6b9b2a4ee722b4face9b29f0013634f17 | 2021-03-12 | +| node:10-alpine | sha256:017b55be202b81bd6b4e9f841d5ddeb6df48467ca5cba0c4194015b987f48a60 | 2021-03-12 | +| node:12 | sha256:0ae1a6a3a8a61e2bcf7f826b2562eb865f9a3095acf41bc6f184773ab66f3007 | 2021-03-12 | +| node:12-alpine | sha256:81eec5b1cac69ff6af62097563737b40ac94b605b43d01466c0cf48e220494be | 2021-03-12 | +| ubuntu:14.04 | sha256:63fce984528cec8714c365919882f8fb64c8a3edf23fdfa0b218a2756125456f | 2020-09-16 | ### Installed apt packages - binutils, bison, brotli, build-essential, bzip2, coreutils, curl, dbus, dnsutils, dpkg, fakeroot, file, flex, ftp, gnupg2, haveged, imagemagick, iproute2, iputils-ping, jq, lib32z1, libc++-dev, libc++abi-dev, libcurl3, libgbm-dev, libgconf-2-4, libgsl-dev, libgtk-3-0, libicu55, libmagic-dev, libmagickcore-dev, libmagickwand-dev, libsecret-1-dev, libsqlite3-dev, libunwind8, libxkbfile-dev, libxss1, locales, m4, mediainfo, net-tools, netcat, openssh-client, p7zip, p7zip-full, p7zip-rar, parallel, pass, patchelf, pkg-config, pollinate, rpm, rsync, shellcheck, sphinxsearch, sqlite3, ssh, subversion, sudo, swig, telnet, texinfo, time, tk, tzdata, unzip, upx, wget, xorriso, xvfb, xz-utils, yamllint, zip, zstd, zsync From ff9f3f0a8bc69e64fad8790abcc61ff266277b76 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 24 Mar 2021 10:06:33 +0000 Subject: [PATCH 0085/3485] Updating readme file for ubuntu20 version 20210318.0 (#2989) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/linux/Ubuntu2004-README.md | 75 +++++++++++++++---------------- 1 file changed, 37 insertions(+), 38 deletions(-) diff --git a/images/linux/Ubuntu2004-README.md b/images/linux/Ubuntu2004-README.md index 6577fde00e68..4611391bc621 100644 --- a/images/linux/Ubuntu2004-README.md +++ b/images/linux/Ubuntu2004-README.md @@ -1,12 +1,12 @@ | Announcements | |-| +| [[Ubuntu] jekyll/builder and node8-typescript docker images will be removed from images on March, 22](https://github.com/actions/virtual-environments/issues/2958) | +| [[Ubuntu] Clang, GCC and Gfortran versions less than 9.x will be removed from images on March, 29](https://github.com/actions/virtual-environments/issues/2950) | | [[windows, ubuntu] Az, Azure and AzureRM module preinstallation policy will be changed on March, 29th](https://github.com/actions/virtual-environments/issues/2916) | -| [[ubuntu, windows] GOROOT environment variable will be removed on March, 1](https://github.com/actions/virtual-environments/issues/2683) | -| [[Windows, Ubuntu] Boost 1.72.0 will be removed from images on March, 8](https://github.com/actions/virtual-environments/issues/2667) | -| [Ubuntu-latest workflows will use Ubuntu-20.04](https://github.com/actions/virtual-environments/issues/1816) | *** # Ubuntu 20.04.2 LTS -- Image Version: 20210315.1 +- Linux kernel version: 5.4.0-1041-azure +- Image Version: 20210318.0 ## Installed Software ### Language and Runtime @@ -27,14 +27,14 @@ ### Package Management - cpan 1.64 - Helm 3.5.3 -- Homebrew 3.0.5 +- Homebrew 3.0.7 - Miniconda 4.9.2 - Npm 6.14.11 - Pip 20.0.2 - Pip3 20.0.2 - Pipx 0.16.1.0 - RubyGems 3.1.2 -- Vcpkg (build from master \<75522bb>) +- Vcpkg (build from master \<4987faf>) - Yarn 1.22.5 #### Environment variables @@ -46,6 +46,7 @@ ### Project Management - Ant 1.10.7 - Gradle 6.8.3 +- Lerna 4.0.0 - Maven 3.6.3 - Sbt 1.4.9 @@ -57,8 +58,8 @@ - Bazel 4.0.0 - Bazelisk 1.7.5 - binutils 2.34 -- Buildah 1.19.6 -- CMake 3.19.6 +- Buildah 1.19.8 +- CMake 3.19.7 - CodeQL Action Bundle 2.4.5 - coreutils 8.30 - curl 7.68.0 @@ -67,12 +68,12 @@ - Docker-Moby Client 20.10.5+azure - Docker-Moby Server 20.10.5+azure - Fastlane 2.178.0 -- Git 2.30.2 +- Git 2.31.0 - Git LFS 2.13.2 - Git-ftp 1.6.0 - Haveged 1.9.1 -- Heroku 7.50.0 -- HHVM (HipHop VM) 4.100.0 +- Heroku 7.51.0 +- HHVM (HipHop VM) 4.101.0 - jq 1.6 - Kind 0.10.0 - Kubectl 1.20.1-5-g76a04fc @@ -89,7 +90,7 @@ - pass 1.7.3 - PhantomJS 2.1.1 - Podman 3.0.1 -- Pulumi 2.22.0 +- Pulumi 2.23.1 - R 4.0.4 - Skopeo 1.2.2 - Sphinx Open Source Search Server 2.2.11 @@ -106,15 +107,15 @@ - Alibaba Cloud CLI 3.0.73 - AWS CLI 2.1.30 - AWS CLI Session manager plugin 1.2.54.0 -- AWS SAM CLI 1.20.0 +- AWS SAM CLI 1.21.1 - Azure CLI (azure-cli) 2.20.0 - Azure CLI (azure-devops) 0.18.0 - GitHub CLI 1.7.0 -- Google Cloud SDK 331.0.0 +- Google Cloud SDK 332.0.0 - Hub CLI 2.14.2 -- Netlify CLI 3.10.12 -- oc CLI 4.7.1 -- ORAS CLI 0.10.0 +- Netlify CLI 3.13.3 +- OpenShift CLI 4.7.2 +- ORAS CLI 0.11.1 - Vercel CLI 21.3.3 ### Java @@ -133,7 +134,7 @@ | -------- | ------------ | | PHP | 7.4.16 8.0.3 | | Composer | 2.0.11 | -| PHPUnit | 8.5.14 | +| PHPUnit | 8.5.15 | ### Haskell - Cabal 3.4.0.0 @@ -156,7 +157,7 @@ - Rustfmt 1.4.30 ### Browsers and Drivers -- Chromium 89.0.4389.82 +- Chromium 89.0.4389.90 - Google Chrome 89.0.4389.90 - ChromeDriver 89.0.4389.23 - Mozilla Firefox 86.0 @@ -247,8 +248,8 @@ | -------------------------- | ------------------------------------------------------------------------------------------------------------------------ | | Android Command Line Tools | 3.0 | | Android SDK Build-tools | 30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3 | -| Android SDK Platform-Tools | 31.0.0 | -| Android SDK Platforms | android-S (rev 1)
android-30 (rev 3)
android-29 (rev 5)
android-28 (rev 6)
android-27 (rev 3) | +| Android SDK Platform-Tools | 31.0.1 | +| Android SDK Platforms | android-S (rev 2)
android-30 (rev 3)
android-29 (rev 5)
android-28 (rev 6)
android-27 (rev 3) | | Android SDK Tools | 26.1.1 | | Android Support Repository | 47.0.0 | | CMake | 3.10.2 | @@ -267,23 +268,21 @@ | ANDROID_SDK_ROOT | /usr/local/lib/android/sdk | ### Cached Docker images -| Repository:Tag | Digest | Created | -| --------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| alpine:3.10 | sha256:0b4d282d7ae7cf5ed91801654a918aea45d6c1de6df0db6a29d60619141fb8de | 2021-02-24 | -| alpine:3.7 | sha256:8421d9a84432575381bfabd248f1eb56f3aa21d9d7cd2511583c68c9b7511d10 | 2019-03-07 | -| alpine:3.8 | sha256:2bb501e6173d9d006e56de5bce2720eb06396803300fe1687b58a7ff32bf4c14 | 2020-01-23 | -| alpine:3.9 | sha256:414e0518bb9228d35e4cd5165567fb91d26c6a214e9c95899e1e056fcd349011 | 2020-04-24 | -| buildpack-deps:buster | sha256:a78316a3d9d366e8f5d80840a2c9ee361c66bf8a7d7d28edd9224ca70f32fd9c | 2021-03-12 | -| buildpack-deps:stretch | sha256:6f928e94e06da507f1d133c26acf70b3807e2bb6d584e5843507511574c3ad6e | 2021-03-12 | -| debian:8 | sha256:6b1960e0a149981c3c115abee6b9e035591fe55533a20a1cd912e636b8df8820 | 2021-03-12 | -| debian:9 | sha256:ca2af3c25b43f185cc86cc2038a217d9b4cdbb4d47adbcfe5d25e04c1d75e1d9 | 2021-03-12 | -| jekyll/builder:latest | sha256:b918b81939a1076dce89d142c0764c2c3cb93858f56ecf4f04ad0387338e77aa | 2020-12-21 | -| mcr.microsoft.com/azure-pipelines/node8-typescript:latest | sha256:e52e60b9f71183969830a3664279b5d8c799b4b0ec2c25a0686f7c02f6a9669a | 2018-10-09 | -| node:10 | sha256:e84df6f7647a1c3993f724c9a0cacdf6b9b2a4ee722b4face9b29f0013634f17 | 2021-03-12 | -| node:10-alpine | sha256:017b55be202b81bd6b4e9f841d5ddeb6df48467ca5cba0c4194015b987f48a60 | 2021-03-12 | -| node:12 | sha256:0ae1a6a3a8a61e2bcf7f826b2562eb865f9a3095acf41bc6f184773ab66f3007 | 2021-03-12 | -| node:12-alpine | sha256:81eec5b1cac69ff6af62097563737b40ac94b605b43d01466c0cf48e220494be | 2021-03-12 | -| ubuntu:14.04 | sha256:63fce984528cec8714c365919882f8fb64c8a3edf23fdfa0b218a2756125456f | 2020-09-16 | +| Repository:Tag | Digest | Created | +| ---------------------- | ------------------------------------------------------------------------ | ---------- | +| alpine:3.10 | sha256:0b4d282d7ae7cf5ed91801654a918aea45d6c1de6df0db6a29d60619141fb8de | 2021-02-24 | +| alpine:3.7 | sha256:8421d9a84432575381bfabd248f1eb56f3aa21d9d7cd2511583c68c9b7511d10 | 2019-03-07 | +| alpine:3.8 | sha256:2bb501e6173d9d006e56de5bce2720eb06396803300fe1687b58a7ff32bf4c14 | 2020-01-23 | +| alpine:3.9 | sha256:414e0518bb9228d35e4cd5165567fb91d26c6a214e9c95899e1e056fcd349011 | 2020-04-24 | +| buildpack-deps:buster | sha256:a78316a3d9d366e8f5d80840a2c9ee361c66bf8a7d7d28edd9224ca70f32fd9c | 2021-03-12 | +| buildpack-deps:stretch | sha256:6f928e94e06da507f1d133c26acf70b3807e2bb6d584e5843507511574c3ad6e | 2021-03-12 | +| debian:8 | sha256:6b1960e0a149981c3c115abee6b9e035591fe55533a20a1cd912e636b8df8820 | 2021-03-12 | +| debian:9 | sha256:ca2af3c25b43f185cc86cc2038a217d9b4cdbb4d47adbcfe5d25e04c1d75e1d9 | 2021-03-12 | +| node:10 | sha256:e84df6f7647a1c3993f724c9a0cacdf6b9b2a4ee722b4face9b29f0013634f17 | 2021-03-12 | +| node:10-alpine | sha256:017b55be202b81bd6b4e9f841d5ddeb6df48467ca5cba0c4194015b987f48a60 | 2021-03-12 | +| node:12 | sha256:0ae1a6a3a8a61e2bcf7f826b2562eb865f9a3095acf41bc6f184773ab66f3007 | 2021-03-12 | +| node:12-alpine | sha256:81eec5b1cac69ff6af62097563737b40ac94b605b43d01466c0cf48e220494be | 2021-03-12 | +| ubuntu:14.04 | sha256:63fce984528cec8714c365919882f8fb64c8a3edf23fdfa0b218a2756125456f | 2020-09-16 | ### Installed apt packages - binutils, bison, brotli, build-essential, bzip2, chromium-browser, coreutils, curl, dbus, dnsutils, dpkg, fakeroot, file, flex, ftp, gnupg2, haveged, imagemagick, iproute2, iputils-ping, jq, lib32z1, libc++-11-dev, libc++-dev, libc++abi-11-dev, libc++abi-dev, libcurl4, libgbm-dev, libgconf-2-4, libgsl-dev, libgtk-3-0, libmagic-dev, libmagickcore-dev, libmagickwand-dev, libsecret-1-dev, libsqlite3-dev, libunwind8, libxkbfile-dev, libxss1, locales, m4, mediainfo, net-tools, netcat, openssh-client, p7zip-full, p7zip-rar, parallel, pass, patchelf, pkg-config, pollinate, python-is-python3, rpm, rsync, shellcheck, sphinxsearch, sqlite3, ssh, subversion, sudo, swig, telnet, texinfo, time, tk, tzdata, unzip, upx, wget, xorriso, xvfb, xz-utils, zip, zstd, zsync From 55450840981c5c43828344548dfc51d429e6a796 Mon Sep 17 00:00:00 2001 From: Amruta Kawade <65217380+AmrutaKawade@users.noreply.github.com> Date: Thu, 25 Mar 2021 12:04:25 +0530 Subject: [PATCH 0086/3485] [Linux] Az Modules Size Reduction On Image (#2828) * [Linux] Az Modules Size Reduction On Image * addressing review comments * addressing review comments * Addressing review comments --- .../installers/Install-AzureModules.ps1 | 25 +++++++++++++------ images/linux/toolsets/toolset-1604.json | 16 ++++-------- images/linux/toolsets/toolset-1804.json | 16 ++++-------- images/linux/toolsets/toolset-2004.json | 8 ++++-- 4 files changed, 33 insertions(+), 32 deletions(-) diff --git a/images/linux/scripts/installers/Install-AzureModules.ps1 b/images/linux/scripts/installers/Install-AzureModules.ps1 index ca95efa4e0dd..5a22ee69c437 100644 --- a/images/linux/scripts/installers/Install-AzureModules.ps1 +++ b/images/linux/scripts/installers/Install-AzureModules.ps1 @@ -17,15 +17,24 @@ foreach ($module in $modules) Write-Host " - $version [$modulePath]" Save-Module -Path $modulePath -Name $moduleName -RequiredVersion $version -Force -Verbose } -} -# If Az.Accounts > 1.0.0 unable to load module with error: Assembly with same name is already loaded -# Force install Az.Accounts 1.0.0 -$azAccountsPath = "/usr/share/az_1.0.0/Az.Accounts" -if (Test-Path $azAccountsPath) -{ - Remove-Item -Path $azAccountsPath -Force -Recurse - Save-Module -Name Az.Accounts -Path "/usr/share/az_1.0.0" -RequiredVersion 1.0.0 -Force + $assets = Invoke-RestMethod $module.url + + # Get github release asset for each version + foreach ($toolVersion in $module.zip_versions) { + $asset = $assets | Where-Object version -eq $toolVersion ` + | Select-Object -ExpandProperty files ` + | Select-Object -First 1 + + Write-Host "Installing $($module.name) $toolVersion ..." + if ($null -ne $asset) { + Write-Host "Download $($asset.filename)" + wget $asset.download_url -nv --retry-connrefused --tries=10 -P $installPSModulePath + } else { + Write-Host "Asset was not found in versions manifest" + exit 1 + } + } } Invoke-PesterTests -TestFile "PowerShellModules" -TestName "AzureModules" diff --git a/images/linux/toolsets/toolset-1604.json b/images/linux/toolsets/toolset-1604.json index 386668a34e4c..3b2247dbd8ef 100644 --- a/images/linux/toolsets/toolset-1604.json +++ b/images/linux/toolsets/toolset-1604.json @@ -109,19 +109,13 @@ "azureModules": [ { "name": "az", + "url" : "https://raw.githubusercontent.com/Azure/az-ps-module-versions/main/versions-manifest.json", "versions": [ - "1.0.0", - "1.6.0", - "2.3.2", - "2.6.0", - "2.8.0", + "5.5.0" + ], + "zip_versions": [ "3.1.0", - "3.5.0", - "3.8.0", - "4.3.0", - "4.4.0", - "4.6.0", - "4.7.0" + "4.4.0" ] } ], diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index f0a1d002b0cb..0e82254c7cc8 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -105,19 +105,13 @@ "azureModules": [ { "name": "az", + "url" : "https://raw.githubusercontent.com/Azure/az-ps-module-versions/main/versions-manifest.json", "versions": [ - "1.0.0", - "1.6.0", - "2.3.2", - "2.6.0", - "2.8.0", + "5.5.0" + ], + "zip_versions": [ "3.1.0", - "3.5.0", - "3.8.0", - "4.3.0", - "4.4.0", - "4.6.0", - "4.7.0" + "4.4.0" ] } ], diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index bbe4f7ca6e20..9540033977f7 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -103,9 +103,13 @@ "azureModules": [ { "name": "az", + "url" : "https://raw.githubusercontent.com/Azure/az-ps-module-versions/main/versions-manifest.json", "versions": [ - "3.8.0", - "4.8.0" + "5.5.0" + ], + "zip_versions": [ + "3.1.0", + "4.4.0" ] } ], From ecfee9c8ec7af74801c46a13e6eda0cfbabb5f57 Mon Sep 17 00:00:00 2001 From: hackercat Date: Thu, 25 Mar 2021 09:05:08 +0100 Subject: [PATCH 0087/3485] Remove Clang 11 dependencies (#3007) --- images/linux/toolsets/toolset-2004.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index 9540033977f7..2e644c1fb0fc 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -127,9 +127,7 @@ "iputils-ping", "lib32z1", "libc++abi-dev", - "libc++abi-11-dev", "libc++-dev", - "libc++-11-dev", "libcurl4", "libgbm-dev", "libgconf-2-4", From 436d9baa951c231d688ad1dc258dd966fc2347b3 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Thu, 25 Mar 2021 12:40:36 +0300 Subject: [PATCH 0088/3485] [Ubuntu] use pipx to install ansible (#3015) * use pipx to install ansible * update info --- images/linux/scripts/installers/ansible.sh | 13 ++++--------- images/linux/scripts/tests/Common.Tests.ps1 | 2 +- images/linux/toolsets/toolset-1804.json | 4 ++++ images/linux/toolsets/toolset-2004.json | 4 ++++ images/linux/ubuntu1804.json | 1 - images/linux/ubuntu2004.json | 1 - 6 files changed, 13 insertions(+), 12 deletions(-) diff --git a/images/linux/scripts/installers/ansible.sh b/images/linux/scripts/installers/ansible.sh index d566e5b77262..cf63f5073883 100644 --- a/images/linux/scripts/installers/ansible.sh +++ b/images/linux/scripts/installers/ansible.sh @@ -4,16 +4,11 @@ ## Desc: Installs Ansible ################################################################################ -# Source the helpers for use with the script -source $HELPER_SCRIPTS/os.sh - -# ppa:ansible/ansible doesn't contain packages for Ubuntu20.04 -if isUbuntu16 || isUbuntu18 ; then - add-apt-repository ppa:ansible/ansible - apt-get update -fi - +# this script is used only on Ubuntu 16.04 +# for Ubuntu 18.04 and 20.04 we use pipx ansible-base package # Install latest Ansible +add-apt-repository ppa:ansible/ansible +apt-get update apt-get install -y --no-install-recommends ansible invoke_tests "Tools" "Ansible" diff --git a/images/linux/scripts/tests/Common.Tests.ps1 b/images/linux/scripts/tests/Common.Tests.ps1 index b65a18c38ccf..4a0c16f8c230 100644 --- a/images/linux/scripts/tests/Common.Tests.ps1 +++ b/images/linux/scripts/tests/Common.Tests.ps1 @@ -43,6 +43,6 @@ Describe "PipxPackages" -Skip:(Test-IsUbuntu16) { [array]$testCases = (Get-ToolsetContent).pipx | ForEach-Object { @{cmd = $_.cmd} } It "" -TestCases $testCases { - "$cmd --version" | Should -ReturnZeroExitCode + "$cmd --version" | Should -ReturnZeroExitCode } } diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index 0e82254c7cc8..cc65f1cf50b7 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -218,6 +218,10 @@ { "package": "aws-sam-cli", "cmd": "sam" + }, + { + "package": "ansible-base", + "cmd": "ansible" } ], "dotnet": { diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index 2e644c1fb0fc..125c00f172f0 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -219,6 +219,10 @@ { "package": "aws-sam-cli", "cmd": "sam" + }, + { + "package": "ansible-base", + "cmd": "ansible" } ], "dotnet": { diff --git a/images/linux/ubuntu1804.json b/images/linux/ubuntu1804.json index faa2fe3bf700..b4a54f47a972 100644 --- a/images/linux/ubuntu1804.json +++ b/images/linux/ubuntu1804.json @@ -188,7 +188,6 @@ { "type": "shell", "scripts": [ - "{{template_dir}}/scripts/installers/ansible.sh", "{{template_dir}}/scripts/installers/azcopy.sh", "{{template_dir}}/scripts/installers/azure-cli.sh", "{{template_dir}}/scripts/installers/azure-devops-cli.sh", diff --git a/images/linux/ubuntu2004.json b/images/linux/ubuntu2004.json index 2b52f1c18e3d..7c0ca2b570a4 100644 --- a/images/linux/ubuntu2004.json +++ b/images/linux/ubuntu2004.json @@ -188,7 +188,6 @@ { "type": "shell", "scripts": [ - "{{template_dir}}/scripts/installers/ansible.sh", "{{template_dir}}/scripts/installers/azcopy.sh", "{{template_dir}}/scripts/installers/azure-cli.sh", "{{template_dir}}/scripts/installers/azure-devops-cli.sh", From 6168b56552e5c4f6e4d884865e5f2454a8a4f94b Mon Sep 17 00:00:00 2001 From: Sergey Dolin Date: Thu, 25 Mar 2021 14:55:24 +0500 Subject: [PATCH 0089/3485] Apply fix from https://github.com/github/super-linter/issues/1397 (#3024) --- .github/workflows/linter.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml index 48ec7dd65104..2b47f4cd7a95 100644 --- a/.github/workflows/linter.yml +++ b/.github/workflows/linter.yml @@ -14,6 +14,8 @@ jobs: steps: - name: Checkout Code uses: actions/checkout@v2 + with: + fetch-depth: 0 - name: Lint Code Base uses: github/super-linter@v3 From abbad83bb1719fce7d4da36566d10165667d1664 Mon Sep 17 00:00:00 2001 From: hackercat Date: Fri, 26 Mar 2021 06:28:15 +0100 Subject: [PATCH 0090/3485] feat: Return `apt` packages with their installed versions (#2939) --- .../SoftwareReport/SoftwareReport.Common.psm1 | 18 ++++++++++++++---- .../SoftwareReport.Generator.ps1 | 2 +- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 index 6205569b5887..fabcc498924d 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 @@ -295,10 +295,20 @@ function Get-CachedDockerImagesTableData { } function Get-AptPackages { - $toolsetJson = Get-ToolsetContent - $apt = $toolsetJson.apt - $pkgs = ($apt.common_packages + $apt.cmd_packages | Sort-Object) -join ", " - return $pkgs + $apt = (Get-ToolsetContent).Apt + $output = @() + ForEach ($pkg in ($apt.common_packages + $apt.cmd_packages)) { + $version = $(dpkg-query -W -f '${Version}' $pkg) + if ($Null -eq $version) { + $version = $(dpkg-query -W -f '${Version}' "$pkg*") + } + + $output += [PSCustomObject] @{ + Name = $pkg + Version = $version + } + } + return ($output | Sort-Object Name) } function Get-PipxVersion { diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index e439e237b824..9d68370c7047 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -286,6 +286,6 @@ $markdown += Get-CachedDockerImagesTableData | New-MDTable $markdown += New-MDNewLine $markdown += New-MDHeader "Installed apt packages" -Level 3 -$markdown += New-MDList -Style Unordered -Lines @(Get-AptPackages) +$markdown += Get-AptPackages | New-MDTable $markdown | Out-File -FilePath "${OutputDirectory}/Ubuntu-Readme.md" From 54fa1d6658ac69773fdc2e79d82f6358cbfe37f7 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Fri, 26 Mar 2021 08:28:54 +0300 Subject: [PATCH 0091/3485] Remove versions less than 9 from toolsets (#3023) --- images/linux/toolsets/toolset-1604.json | 5 ----- images/linux/toolsets/toolset-1804.json | 5 ----- images/linux/toolsets/toolset-2004.json | 4 ---- 3 files changed, 14 deletions(-) diff --git a/images/linux/toolsets/toolset-1604.json b/images/linux/toolsets/toolset-1604.json index 3b2247dbd8ef..1bacd5e2368b 100644 --- a/images/linux/toolsets/toolset-1604.json +++ b/images/linux/toolsets/toolset-1604.json @@ -230,22 +230,17 @@ }, "clang": { "versions": [ - "6.0", - "8", "9" ], "default_version": "9" }, "gcc": { "versions": [ - "g++-7", - "g++-8", "g++-9" ] }, "gfortran": { "versions": [ - "gfortran-8", "gfortran-9" ] }, diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index cc65f1cf50b7..cc96345bf215 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -237,23 +237,18 @@ }, "clang": { "versions": [ - "6.0", - "8", "9" ], "default_version": "9" }, "gcc": { "versions": [ - "g++-7", - "g++-8", "g++-9", "g++-10" ] }, "gfortran": { "versions": [ - "gfortran-8", "gfortran-9", "gfortran-10" ] diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index 125c00f172f0..e1499a2e5f7f 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -238,7 +238,6 @@ }, "clang": { "versions": [ - "8", "9", "10", "11" @@ -247,15 +246,12 @@ }, "gcc": { "versions": [ - "g++-7", - "g++-8", "g++-9", "g++-10" ] }, "gfortran": { "versions": [ - "gfortran-8", "gfortran-9", "gfortran-10" ] From 4c606d887dc8f400ac3b89969244dd59e49e1cff Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Fri, 26 Mar 2021 13:13:29 +0300 Subject: [PATCH 0092/3485] [Ubuntu] get julia version from julialang.org (#3025) * get version from julialang.org * add helpers * add curl flag -L --- images/linux/scripts/installers/julia.sh | 32 ++++++++++++------------ 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/images/linux/scripts/installers/julia.sh b/images/linux/scripts/installers/julia.sh index 5ac91dda7d8b..90bbfeb12238 100644 --- a/images/linux/scripts/installers/julia.sh +++ b/images/linux/scripts/installers/julia.sh @@ -4,24 +4,24 @@ ## Desc: Installs Julia, and adds Julia to the path ################################################################################ -# This function fetches the latest Julia release from the GitHub API -# Based on https://gist.github.com/lukechilds/a83e1d7127b78fef38c2914c4ececc3c -function GetLatestJuliaRelease () { - curl --silent "https://api.github.com/repos/julialang/julia/releases/latest" | - grep '"tag_name":' | - sed -E 's/.*"([^"]+)".*/\1/' | - sed 's/v//' # remove v prefix -} +# Source the helpers for use with the script +source $HELPER_SCRIPTS/install.sh -juliaVersion="$(GetLatestJuliaRelease)" -juliaMajorAndMinorVersion="$(cut -d. -f1,2 <<< $juliaVersion)" -juliaInstallationPath="/usr/local/julia$juliaVersion" +# get the latest julia version +json=$(curl -sL "https://julialang-s3.julialang.org/bin/versions.json") +julia_version=$(echo $json | jq -r '.[].files[] | select(.triplet=="x86_64-linux-gnu" and (.version | contains("-") | not)).version' | sort -V | tail -n1) -curl -sL "https://julialang-s3.julialang.org/bin/linux/x64/$juliaMajorAndMinorVersion/julia-$juliaVersion-linux-x86_64.tar.gz" -o "julia-$juliaVersion-linux-x86_64.tar.gz" -mkdir -p "$juliaInstallationPath" -tar -C "$juliaInstallationPath" -xzf "julia-$juliaVersion-linux-x86_64.tar.gz" --strip-components=1 -rm "julia-$juliaVersion-linux-x86_64.tar.gz" +# download julia archive +julia_tar_url=$(echo $json | jq -r ".[].files[].url | select(endswith(\"julia-${julia_version}-linux-x86_64.tar.gz\"))") +julia_tar_name="julia-${julia_version}-linux-x86_64.tar.gz" +download_with_retries $julia_tar_url "/tmp" "${julia_tar_name}" -ln -s "$juliaInstallationPath/bin/julia" /usr/bin/julia +# extract files and make symlink +julia_tar_tmp="/tmp/${julia_tar_name}" +julia_installation_path="/usr/local/julia${julia_version}" +mkdir -p "${julia_installation_path}" +tar -C "${julia_installation_path}" -xzf "${julia_tar_tmp}" --strip-components=1 +ln -s "${julia_installation_path}/bin/julia" /usr/bin/julia +rm "${julia_tar_tmp}" invoke_tests "Tools" "Julia" From f6f2e3681e9e43ad92d8c275d6142848efbfb8cb Mon Sep 17 00:00:00 2001 From: Amruta Kawade <65217380+AmrutaKawade@users.noreply.github.com> Date: Fri, 26 Mar 2021 20:51:12 +0530 Subject: [PATCH 0093/3485] [Windows] Az Modules Size Reduction On Image (#2827) * [Windows] Az Modules Size Reduction On Image * Addressing review comments * Downloading azure and azurerm from blob storage --- .../Installers/Install-AzureModules.ps1 | 40 +++++++++++++++++++ images/win/toolsets/toolset-2016.json | 21 +++++++--- images/win/toolsets/toolset-2019.json | 21 +++++++--- 3 files changed, 70 insertions(+), 12 deletions(-) diff --git a/images/win/scripts/Installers/Install-AzureModules.ps1 b/images/win/scripts/Installers/Install-AzureModules.ps1 index a12dec60c753..ec36fe6ff86d 100644 --- a/images/win/scripts/Installers/Install-AzureModules.ps1 +++ b/images/win/scripts/Installers/Install-AzureModules.ps1 @@ -36,6 +36,46 @@ foreach ($module in $modules) } } + if($null -ne $module.url) + { + $assets = Invoke-RestMethod $module.url + } + + foreach ($version in $module.zip_versions) + { + # Install modules from GH Release + if($null -ne $assets) + { + $asset = $assets | Where-Object version -eq $version ` + | Select-Object -ExpandProperty files ` + | Select-Object -First 1 + + Write-Host "Installing $($module.name) $version ..." + if ($null -ne $asset) { + Start-DownloadWithRetry -Url $asset.download_url -Name $asset.filename -DownloadPath $installPSModulePath + } else { + Write-Host "Asset was not found in versions manifest" + exit 1 + } + } + # Install modules from vsts blob + else + { + $modulePath = Join-Path -Path $installPSModulePath -ChildPath "${moduleName}_${version}" + $filename = "${moduleName}_${version}.zip" + $download_url = [System.String]::Concat($module.blob_url,$filename) + Write-Host " - $version [$modulePath]" + try + { + Start-DownloadWithRetry -Url $download_url -Name $filename -DownloadPath $installPSModulePath + } + catch + { + Write-Host "Error: $_" + exit 1 + } + } + } # Append default tool version to machine path if ($null -ne $module.default) { diff --git a/images/win/toolsets/toolset-2016.json b/images/win/toolsets/toolset-2016.json index f69b1cbda250..9a1d2e5f560d 100644 --- a/images/win/toolsets/toolset-2016.json +++ b/images/win/toolsets/toolset-2016.json @@ -90,30 +90,40 @@ "azureModules": [ { "name": "azurerm", + "blob_url": "https://vstsagenttools.blob.core.windows.net/tools/azurepowershellmodules/", "versions": [ "2.1.0", + "6.13.1" + ], + "zip_versions": [ "3.8.0", "4.2.1", "5.1.1", - "6.7.0", - "6.13.1" + "6.7.0" ], "default": "2.1.0" }, { "name": "azure", + "blob_url": "https://vstsagenttools.blob.core.windows.net/tools/azurepowershellmodules/", "versions": [ "2.1.0", + "5.3.0" + ], + "zip_versions": [ "3.8.0", "4.2.1", - "5.1.1", - "5.3.0" + "5.1.1" ], "default": "2.1.0" }, { "name": "az", + "url" : "https://raw.githubusercontent.com/Azure/az-ps-module-versions/main/versions-manifest.json", "versions": [ + "5.5.0" + ], + "zip_versions": [ "1.0.0", "1.6.0", "2.3.2", @@ -124,8 +134,7 @@ "4.3.0", "4.4.0", "4.6.0", - "4.7.0", - "5.5.0" + "4.7.0" ] } ], diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index 6c4b577af456..6d1260559216 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -90,30 +90,40 @@ "azureModules": [ { "name": "azurerm", + "blob_url": "https://vstsagenttools.blob.core.windows.net/tools/azurepowershellmodules/", "versions": [ "2.1.0", + "6.13.1" + ], + "zip_versions": [ "3.8.0", "4.2.1", "5.1.1", - "6.7.0", - "6.13.1" + "6.7.0" ], "default": "2.1.0" }, { "name": "azure", + "blob_url": "https://vstsagenttools.blob.core.windows.net/tools/azurepowershellmodules/", "versions": [ "2.1.0", + "5.3.0" + ], + "zip_versions": [ "3.8.0", "4.2.1", - "5.1.1", - "5.3.0" + "5.1.1" ], "default": "2.1.0" }, { "name": "az", + "url" : "https://raw.githubusercontent.com/Azure/az-ps-module-versions/main/versions-manifest.json", "versions": [ + "5.5.0" + ], + "zip_versions": [ "1.0.0", "1.6.0", "2.3.2", @@ -124,8 +134,7 @@ "4.3.0", "4.4.0", "4.6.0", - "4.7.0", - "5.5.0" + "4.7.0" ] } ], From a769b068725b56bbab59114c54e87b7999229cf9 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Fri, 26 Mar 2021 18:21:42 +0300 Subject: [PATCH 0094/3485] Switch Azure CLI installation to GitHub Releases (#3035) --- images/win/scripts/Installers/Install-AzureCli.ps1 | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/images/win/scripts/Installers/Install-AzureCli.ps1 b/images/win/scripts/Installers/Install-AzureCli.ps1 index 8247956c0bbe..81b6988acd1d 100644 --- a/images/win/scripts/Installers/Install-AzureCli.ps1 +++ b/images/win/scripts/Installers/Install-AzureCli.ps1 @@ -3,11 +3,15 @@ ## Desc: Install Azure CLI ################################################################################ -Choco-Install -PackageName azure-cli +Write-Host "Install the latest Azure CLI release" +$assets = Invoke-RestMethod -Uri 'https://api.github.com/repos/Azure/azure-cli/releases/latest' +$azCliUrl = $assets.assets.browser_download_url +$azCliName = [IO.Path]::GetFileName($azCliUrl) +Install-Binary -Url $azCliUrl -Name $azCliName -ArgumentList ("/qn", "/norestart") -$AzureCliExtensionPath = Join-Path $Env:CommonProgramFiles 'AzureCliExtensionDirectory' -New-Item -ItemType "directory" -Path $AzureCliExtensionPath +$azureCliExtensionPath = Join-Path $Env:CommonProgramFiles 'AzureCliExtensionDirectory' +$null = New-Item -ItemType "Directory" -Path $azureCliExtensionPath -[Environment]::SetEnvironmentVariable("AZURE_EXTENSION_DIR", $AzureCliExtensionPath, [System.EnvironmentVariableTarget]::Machine) +[Environment]::SetEnvironmentVariable("AZURE_EXTENSION_DIR", $azureCliExtensionPath, [System.EnvironmentVariableTarget]::Machine) Invoke-PesterTests -TestFile "CLI.Tools" -TestName "Azure CLI" \ No newline at end of file From dd506183e274ba377426cf4fb4a0d701309fd903 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Fri, 26 Mar 2021 18:33:51 +0300 Subject: [PATCH 0095/3485] [Ubuntu] Set user-related environmental variables and PATH via post deployment script (#3030) * Move home directory vars to post-deploy scripts * Remove "export" word * Move home directory vars to post-deploy scripts * Remove "export" word * add variables via post-deployment file * remove quotes around PATH * remove quotes * Replace $HOME in /etc/environment in post-deployment script * rename variable * get rid of extra variable --- images/linux/post-generation/environment-variables.sh | 6 ++++++ images/linux/scripts/installers/configure-environment.sh | 2 +- images/linux/scripts/installers/dotnetcore-sdk.sh | 3 +-- images/linux/scripts/installers/nvm.sh | 2 +- images/linux/scripts/installers/php.sh | 6 +----- images/linux/scripts/installers/python.sh | 2 +- 6 files changed, 11 insertions(+), 10 deletions(-) create mode 100644 images/linux/post-generation/environment-variables.sh diff --git a/images/linux/post-generation/environment-variables.sh b/images/linux/post-generation/environment-variables.sh new file mode 100644 index 000000000000..975c8a4aff47 --- /dev/null +++ b/images/linux/post-generation/environment-variables.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +# Replace $HOME with the default user's home directory for environmental variables related to the default user home directory + +homeDir=$(cut -d: -f6 /etc/passwd | tail -1) +sed -i "s|\$HOME|$homeDir|g" /etc/environment \ No newline at end of file diff --git a/images/linux/scripts/installers/configure-environment.sh b/images/linux/scripts/installers/configure-environment.sh index 03a39f1dc087..d3c99fcf4033 100644 --- a/images/linux/scripts/installers/configure-environment.sh +++ b/images/linux/scripts/installers/configure-environment.sh @@ -9,7 +9,7 @@ echo ACCEPT_EULA=Y | tee -a /etc/environment # This directory is supposed to be created in $HOME and owned by user(https://github.com/actions/virtual-environments/issues/491) mkdir -p /etc/skel/.config/configstore -echo 'export XDG_CONFIG_HOME=$HOME/.config' | tee -a /etc/skel/.bashrc +echo 'XDG_CONFIG_HOME=$HOME/.config' | tee -a /etc/environment # Change waagent entries to use /mnt for swapfile sed -i 's/ResourceDisk.Format=n/ResourceDisk.Format=y/g' /etc/waagent.conf diff --git a/images/linux/scripts/installers/dotnetcore-sdk.sh b/images/linux/scripts/installers/dotnetcore-sdk.sh index 5acae9c2767e..229bfb8e6940 100644 --- a/images/linux/scripts/installers/dotnetcore-sdk.sh +++ b/images/linux/scripts/installers/dotnetcore-sdk.sh @@ -89,7 +89,6 @@ done setEtcEnvironmentVariable DOTNET_SKIP_FIRST_TIME_EXPERIENCE 1 setEtcEnvironmentVariable DOTNET_NOLOGO 1 setEtcEnvironmentVariable DOTNET_MULTILEVEL_LOOKUP 0 -prependEtcEnvironmentPath /home/runner/.dotnet/tools -echo 'export PATH="$PATH:$HOME/.dotnet/tools"' | tee -a /etc/skel/.bashrc +prependEtcEnvironmentPath '$HOME/.dotnet/tools' invoke_tests "DotnetSDK" \ No newline at end of file diff --git a/images/linux/scripts/installers/nvm.sh b/images/linux/scripts/installers/nvm.sh index 36b5e7916a5e..ddb146119833 100644 --- a/images/linux/scripts/installers/nvm.sh +++ b/images/linux/scripts/installers/nvm.sh @@ -8,7 +8,7 @@ export NVM_DIR="/etc/skel/.nvm" mkdir $NVM_DIR VERSION=$(curl -s https://api.github.com/repos/nvm-sh/nvm/releases/latest | jq -r '.tag_name') curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/$VERSION/install.sh | bash -echo 'export NVM_DIR=$HOME/.nvm' | tee -a /etc/skel/.bash_profile +echo 'NVM_DIR=$HOME/.nvm' | tee -a /etc/environment echo '[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm' | tee -a /etc/skel/.bash_profile [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" diff --git a/images/linux/scripts/installers/php.sh b/images/linux/scripts/installers/php.sh index e305bc6eb160..5391e2cb37b5 100644 --- a/images/linux/scripts/installers/php.sh +++ b/images/linux/scripts/installers/php.sh @@ -87,12 +87,8 @@ php composer-setup.php sudo mv composer.phar /usr/bin/composer php -r "unlink('composer-setup.php');" -# Update /etc/environment -prependEtcEnvironmentPath /home/runner/.config/composer/vendor/bin - - # Add composer bin folder to path -echo 'export PATH="$PATH:$HOME/.config/composer/vendor/bin"' >> /etc/skel/.bashrc +prependEtcEnvironmentPath '$HOME/.config/composer/vendor/bin' #Create composer folder for user to preserve folder permissions mkdir -p /etc/skel/.composer diff --git a/images/linux/scripts/installers/python.sh b/images/linux/scripts/installers/python.sh index 193d810b8bbc..bd78087c2b46 100644 --- a/images/linux/scripts/installers/python.sh +++ b/images/linux/scripts/installers/python.sh @@ -41,6 +41,6 @@ if isUbuntu18 || isUbuntu20 ; then fi # Adding this dir to PATH will make installed pip commands are immediately available. -echo 'export PATH="$PATH:$HOME/.local/bin"' | tee -a /etc/skel/.bashrc +prependEtcEnvironmentPath '$HOME/.local/bin' invoke_tests "Tools" "Python" From b56d115a16dfba8744c63f514efc3d67087bb5c9 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Sat, 27 Mar 2021 10:50:50 +0300 Subject: [PATCH 0096/3485] [Windows] Replace '+' to '-' in java path (#3028) * Replace + to - in Java path * Fix comment * fix vendor name in software report --- images/win/scripts/Installers/Install-JavaTools.ps1 | 3 ++- images/win/scripts/SoftwareReport/SoftwareReport.Java.psm1 | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/images/win/scripts/Installers/Install-JavaTools.ps1 b/images/win/scripts/Installers/Install-JavaTools.ps1 index c571d34fc4a8..085be394c59c 100644 --- a/images/win/scripts/Installers/Install-JavaTools.ps1 +++ b/images/win/scripts/Installers/Install-JavaTools.ps1 @@ -61,7 +61,8 @@ function Install-JavaFromAdoptOpenJDK { -and $_.binary.image_type -eq "jdk" } $downloadUrl = $asset.binary.package.link - $fullJavaVersion = $asset.version.semver + # We have to replace '+' sign in the version to '-' due to the issue with incorrect path in Android builds https://github.com/actions/virtual-environments/issues/3014 + $fullJavaVersion = $asset.version.semver -replace '\+', '-' # Download and extract java binaries to temporary folder $archivePath = Start-DownloadWithRetry -Url $downloadUrl -Name $([IO.Path]::GetFileName($downloadUrl)) diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Java.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Java.psm1 index 5998b33ef126..3e9d7ada3a5e 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Java.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Java.psm1 @@ -9,12 +9,14 @@ function Get-JavaVersions { return $javaVersions | Sort-Object $sortRules | ForEach-Object { $javaPath = $_.Value # Take semver from the java path - $version = (Split-Path $javaPath) -replace "\w:\\.*\\" + # The path contains '-' sign in the version number instead of '+' due to the following issue, need to substitute it back https://github.com/actions/virtual-environments/issues/3014 + $versionInPath = (Split-Path $javaPath) -replace "\w:\\.*\\" + $version = $versionInPath -replace '-', '+' $defaultPostfix = ($javaPath -eq $defaultJavaPath) ? " (default)" : "" [PSCustomObject] @{ "Version" = $version + $defaultPostfix - "Vendor" = "AdoptOpenJDK" + "Vendor" = "Adopt OpenJDK" "Environment Variable" = $_.Name } } From 60459a5b046c82c8a2061eb10024920370cf0bd4 Mon Sep 17 00:00:00 2001 From: Dmitry Shibanov Date: Sat, 27 Mar 2021 10:51:01 +0300 Subject: [PATCH 0097/3485] add replace from '+' to '-' (#3027) --- images/macos/provision/core/openjdk.sh | 2 +- images/macos/software-report/SoftwareReport.Java.psm1 | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/images/macos/provision/core/openjdk.sh b/images/macos/provision/core/openjdk.sh index eb4034b2cb30..72504f2fdd6d 100644 --- a/images/macos/provision/core/openjdk.sh +++ b/images/macos/provision/core/openjdk.sh @@ -21,7 +21,7 @@ installJavaFromAdoptOpenJDK() { assetUrl=$(curl -s "https://api.adoptopenjdk.net/v3/assets/latest/${JAVA_VERSION}/hotspot") asset=$(echo $assetUrl | jq -r '.[] | select(.binary.os=="mac" and .binary.image_type=="jdk" and .binary.architecture=="x64")') archivePath=$(echo $asset | jq -r '.binary.package.link') - fullVersion=$(echo $asset | jq -r '.version.semver') + fullVersion=$(echo $asset | jq -r '.version.semver' | tr '+' '-') javaToolcacheVersionPath=$JAVA_TOOLCACHE_PATH/$fullVersion javaToolcacheVersionArchPath=$javaToolcacheVersionPath/x64 diff --git a/images/macos/software-report/SoftwareReport.Java.psm1 b/images/macos/software-report/SoftwareReport.Java.psm1 index 29dc61dfc229..b0d73b792be5 100644 --- a/images/macos/software-report/SoftwareReport.Java.psm1 +++ b/images/macos/software-report/SoftwareReport.Java.psm1 @@ -10,10 +10,11 @@ function Get-JavaVersions { $javaPath = $_.Value # Take semver from the java path $version = $javaPath.split('/')[5] + $fullVersion = $version.Replace('-', '+') $defaultPostfix = ($javaPath -eq $defaultJavaPath) ? " (default)" : "" [PSCustomObject] @{ - "Version" = $version + $defaultPostfix + "Version" = $fullVersion + $defaultPostfix "Vendor" = "Adopt OpenJDK" "Environment Variable" = $_.Name } From 48f3c3e9b7b6f69e370e27d542ca3d70d2eb256a Mon Sep 17 00:00:00 2001 From: Dibir Magomedsaygitov <61747324+dibir-magomedsaygitov@users.noreply.github.com> Date: Sat, 27 Mar 2021 10:51:50 +0300 Subject: [PATCH 0098/3485] [Ubuntu] Move preinstalled Java distributions to the toolcache directory (#2915) * move preinstalled java to toolcache * rework installation and fix software report --- .../SoftwareReport/SoftwareReport.Java.psm1 | 34 +++++++------------ images/linux/scripts/installers/java-tools.sh | 23 +++++++++++-- 2 files changed, 33 insertions(+), 24 deletions(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Java.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Java.psm1 index ed094d65f146..5be0e8f97bd4 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Java.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Java.psm1 @@ -1,29 +1,19 @@ -function Get-JavaFullVersion { - param($JavaRootPath) - - $javaBinPath = Join-Path $javaRootPath "/bin/java" - $javaVersionOutput = (Get-CommandResult "$javaBinPath -version").Output - $matchResult = $javaVersionOutput | Select-String '^openjdk version \"([\d\._]+)\"' - return $matchResult.Matches.Groups[1].Value -} - function Get-JavaVersions { - $defaultJavaPath = $env:JAVA_HOME - $javaVersions = Get-Item env:JAVA_HOME_*_X64 - $sortRules = @{ - Expression = { [Int32]$_.Name.Split("_")[2] } - Descending = $false - } + $toolcachePath = Join-Path $env:AGENT_TOOLSDIRECTORY "Java_Adopt_jdk" + $javaToolcacheVersions = Get-ChildItem $toolcachePath -Name | Sort-Object -Descending + + return $javaToolcacheVersions | ForEach-Object { + $majorVersion = $_.split(".")[0] + $fullVersion = $_.Replace("-", "+") + $defaultJavaPath = $env:JAVA_HOME + $javaPath = Get-Item env:JAVA_HOME_${majorVersion}_X64 - return $javaVersions | Sort-Object $sortRules | ForEach-Object { - $javaPath = $_.Value - $version = Get-JavaFullVersion $javaPath - $defaultPostfix = ($javaPath -eq $defaultJavaPath) ? " (default)" : "" + $defaultPostfix = ($javaPath.Value -eq $defaultJavaPath) ? " (default)" : "" [PSCustomObject] @{ - "Version" = $version + $defaultPostfix - "Vendor" = "AdoptOpenJDK" - "Environment Variable" = $_.Name + "Version" = $fullVersion + $defaultPostfix + "Vendor" = "Adopt OpenJDK" + "Environment Variable" = $javaPath.Name } } } \ No newline at end of file diff --git a/images/linux/scripts/installers/java-tools.sh b/images/linux/scripts/installers/java-tools.sh index 27b53fa84a5f..79c0677bf93d 100644 --- a/images/linux/scripts/installers/java-tools.sh +++ b/images/linux/scripts/installers/java-tools.sh @@ -9,6 +9,7 @@ source $HELPER_SCRIPTS/etc-environment.sh JAVA_VERSIONS_LIST=$(get_toolset_value '.java.versions | .[]') DEFAULT_JDK_VERSION=$(get_toolset_value '.java.default') +JAVA_TOOLCACHE_PATH="$AGENT_TOOLSDIRECTORY/Java_Adopt_jdk" # Install GPG Key for Adopt Open JDK. See https://adoptopenjdk.net/installation.html wget -qO - "https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public" | apt-key add - @@ -19,19 +20,37 @@ if isUbuntu16 || isUbuntu18 ; then apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0xB1998361219BD9C9 apt-add-repository "deb https://repos.azul.com/azure-only/zulu/apt stable main" fi + apt-get update for JAVA_VERSION in ${JAVA_VERSIONS_LIST[@]}; do apt-get -y install adoptopenjdk-$JAVA_VERSION-hotspot=\* - echo "JAVA_HOME_${JAVA_VERSION}_X64=/usr/lib/jvm/adoptopenjdk-${JAVA_VERSION}-hotspot-amd64" | tee -a /etc/environment + javaVersionPath="/usr/lib/jvm/adoptopenjdk-${JAVA_VERSION}-hotspot-amd64" + echo "JAVA_HOME_${JAVA_VERSION}_X64=$javaVersionPath" | tee -a /etc/environment + fullJavaVersion=$(cat "$javaVersionPath/release" | grep "^SEMANTIC" | cut -d "=" -f 2 | tr -d "\"" | tr "+" "-") + + # If there is no semver in java release, then extract java version from -fullversion + if [[ -z $fullJavaVersion ]]; then + fullJavaVersion=$(java -fullversion 2>&1 | tr -d "\"" | tr "+" "-" | awk '{print $4}') + fi + + javaToolcacheVersionPath="$JAVA_TOOLCACHE_PATH/$fullJavaVersion" + mkdir -p "$javaToolcacheVersionPath" + + # Create a complete file + touch "$javaToolcacheVersionPath/x64.complete" + + # Create symlink for Java + ln -s $javaVersionPath "$javaToolcacheVersionPath/x64" done -# Set Default Java version. +# Set Default Java version if isUbuntu16; then # issue: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=825987 # stackoverflow: https://askubuntu.com/questions/1187136/update-java-alternatives-only-java-but-not-javac-is-changed sed -i 's/(hl|jre|jdk|plugin|DUMMY) /(hl|jre|jdk|jdkhl|plugin|DUMMY) /g' /usr/sbin/update-java-alternatives fi + update-java-alternatives -s /usr/lib/jvm/adoptopenjdk-${DEFAULT_JDK_VERSION}-hotspot-amd64 echo "JAVA_HOME=/usr/lib/jvm/adoptopenjdk-${DEFAULT_JDK_VERSION}-hotspot-amd64" | tee -a /etc/environment From 6747127d83506523c730b99eaf10b7fb09077698 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Dunglas?= Date: Mon, 29 Mar 2021 14:46:21 +0200 Subject: [PATCH 0099/3485] [ubuntu] add emoji support in Chrome (#2699) * fix: emoji support in Chrome on Ubuntu * move package to toolset --- images/linux/toolsets/toolset-2004.json | 1 + 1 file changed, 1 insertion(+) diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index e1499a2e5f7f..1339c1649d16 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -121,6 +121,7 @@ "dnsutils", "dpkg", "fakeroot", + "fonts-noto-color-emoji", "gnupg2", "imagemagick", "iproute2", From 6ac16615573854af34bae891912bc5f29cbd684c Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Mon, 29 Mar 2021 16:29:12 +0300 Subject: [PATCH 0100/3485] [Ubuntu] inject ansible pkg (#3047) * inject ansible pkg * fix comment * fix comment --- images/linux/scripts/installers/pipx-packages.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/images/linux/scripts/installers/pipx-packages.sh b/images/linux/scripts/installers/pipx-packages.sh index e37f15393332..85763b7d499b 100644 --- a/images/linux/scripts/installers/pipx-packages.sh +++ b/images/linux/scripts/installers/pipx-packages.sh @@ -18,6 +18,11 @@ for package in $pipx_packages; do else echo "Install $package into default python" pipx install $package + + # Install ansible into an existing ansible-base Virtual Environment + if [[ $package == "ansible-base" ]]; then + pipx inject ansible-base ansible + fi fi done From b08f5f471b945e2edc2437d3cb22336c1b5f9528 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 29 Mar 2021 14:55:26 +0000 Subject: [PATCH 0101/3485] Updating readme file for macOS-11.0 version 20210328.1 (#3046) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/macos/macos-11.0-Readme.md | 44 +++++++++++++++---------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/images/macos/macos-11.0-Readme.md b/images/macos/macos-11.0-Readme.md index 431cbeefbdc1..fb6f340be902 100644 --- a/images/macos/macos-11.0-Readme.md +++ b/images/macos/macos-11.0-Readme.md @@ -5,7 +5,7 @@ # macOS 11.2 info - System Version: macOS 11.2.3 (20D91) - Kernel Version: Darwin 20.3.0 -- Image Version: 20210321.1 +- Image Version: 20210328.1 ## Installed Software ### Language and Runtime @@ -20,7 +20,7 @@ - GNU Fortran (Homebrew GCC 8.4.0_2) 8.4.0 - available by `gfortran-8` alias - GNU Fortran (Homebrew GCC 9.3.0_1) 9.3.0 - available by `gfortran-9` alias - Go 1.15.10 -- julia 1.5.4 +- julia 1.6.0 - Node.js v14.16.0 - NVM - Cached node versions: v10.24.0 v12.21.0 v14.16.0 - NVM 0.37.2 @@ -35,7 +35,7 @@ - Carthage 0.37.0 - CocoaPods 1.10.1 - Composer 2.0.11 -- Homebrew 3.0.7 +- Homebrew 3.0.9 - Miniconda 4.9.2 - NPM 6.14.11 - NuGet 5.6.0.6489 @@ -43,7 +43,7 @@ - Pip 21.0.1 (python 3.9) - Pipx 0.16.1.0 - RubyGems 3.2.15 -- Vcpkg 2021 (build from master \<9986c28>) +- Vcpkg 2021 (build from master \<6d9ed56>) - Yarn 1.22.5 #### Environment variables @@ -65,8 +65,8 @@ - bazelisk 1.7.5 - bsdtar 3.3.2 - available by 'tar' alias - Curl 7.75.0 -- Git LFS: 2.13.2 -- Git: 2.31.0 +- Git LFS: 2.13.3 +- Git: 2.31.1 - GitHub CLI: 1.7.0 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.1 @@ -77,7 +77,7 @@ - mongo v4.4.3 - mongod v4.4.3 - Newman 5.2.2 -- OpenSSL 1.1.1j 16 Feb 2021 `(/usr/local/opt/openssl -> /usr/local/Cellar/openssl@1.1/1.1.1j)` +- OpenSSL 1.1.1k 25 Mar 2021 `(/usr/local/opt/openssl -> /usr/local/Cellar/openssl@1.1/1.1.1k)` - Packer 1.7.0 - PostgreSQL 13.2 - psql (PostgreSQL) 13.2 @@ -88,13 +88,13 @@ ### Tools - Aliyun CLI 3.0.73 - App Center CLI 2.8.1 -- AWS CLI 2.1.31 +- AWS CLI 2.1.32 - AWS SAM CLI 1.21.1 - AWS Session Manager CLI 1.2.30.0 -- Azure CLI 2.20.0 +- Azure CLI 2.21.0 - Cabal 3.4.0.0 -- Cmake 3.19.7 -- Fastlane 2.178.0 +- Cmake 3.20.0 +- Fastlane 2.179.0 - GHC 9.0.1 - GHCup v0.1.14 - Stack 2.5.1 @@ -109,9 +109,9 @@ - SafariDriver 14.0.3 (16610.4.3.1.7) - Google Chrome 89.0.4389.90 - ChromeDriver 89.0.4389.23 -- Microsoft Edge 89.0.774.57 -- MSEdgeDriver 89.0.774.57 -- Mozilla Firefox 86.0.1 +- Microsoft Edge 89.0.774.63 +- MSEdgeDriver 89.0.774.63 +- Mozilla Firefox 87.0 - geckodriver 0.29.0 #### Environment variables @@ -150,9 +150,9 @@ - 1.16.2 ### Rust Tools -- Cargo 1.50.0 -- Rust 1.50.0 -- Rustdoc 1.50.0 +- Cargo 1.51.0 +- Rust 1.51.0 +- Rustdoc 1.51.0 - Rustup 1.23.1 #### Packages @@ -160,8 +160,8 @@ - Cargo-audit 0.14.0 - Cargo-outdated v0.9.14 - Cbindgen 0.18.0 -- Clippy 0.0.212 -- Rustfmt 1.4.30-stable +- Clippy 0.1.51 +- Rustfmt 1.4.36-stable ### PowerShell Tools - PowerShell 7.1.3 @@ -182,7 +182,7 @@ ### Xamarin #### Visual Studio for Mac -- 8.9.2.0 +- 8.9.3.13 #### Mono - 6.12.0.125 @@ -294,7 +294,7 @@ | CMake | 3.10.2 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 21.4.7075529
22.0.7026061 | +| NDK | 21.4.7075529
22.1.7171670 | | SDK Patch Applier v4 | 1 | #### Environment variables @@ -302,7 +302,7 @@ | ----------------------- | -------------------------------------------------------------------------------------------------- | | ANDROID_HOME | /Users/runner/Library/Android/sdk | | ANDROID_NDK_HOME | /Users/runner/Library/Android/sdk/ndk-bundle -> /Users/runner/Library/Android/sdk/ndk/21.4.7075529 | -| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/22.0.7026061 | +| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/22.1.7171670 | | ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk-bundle -> /Users/runner/Library/Android/sdk/ndk/21.4.7075529 | | ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | From 826fed960459993d41c2f9310d220b7cf2c015e8 Mon Sep 17 00:00:00 2001 From: Dibir Magomedsaygitov <61747324+dibir-magomedsaygitov@users.noreply.github.com> Date: Mon, 29 Mar 2021 19:19:52 +0300 Subject: [PATCH 0102/3485] sort java versions (#3045) --- images/linux/scripts/SoftwareReport/SoftwareReport.Java.psm1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Java.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Java.psm1 index 5be0e8f97bd4..ae13eab9a229 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Java.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Java.psm1 @@ -1,6 +1,6 @@ function Get-JavaVersions { $toolcachePath = Join-Path $env:AGENT_TOOLSDIRECTORY "Java_Adopt_jdk" - $javaToolcacheVersions = Get-ChildItem $toolcachePath -Name | Sort-Object -Descending + $javaToolcacheVersions = Get-ChildItem $toolcachePath -Name | Sort-Object { [int]$_.Split(".")[0] } return $javaToolcacheVersions | ForEach-Object { $majorVersion = $_.split(".")[0] From 21f63fd57922f14e5ae23c3ef338005dd3050620 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Tue, 30 Mar 2021 10:17:56 +0300 Subject: [PATCH 0103/3485] Install Chrome without apt source (#3036) --- .../linux/scripts/installers/google-chrome.sh | 31 ++++++++++--------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/images/linux/scripts/installers/google-chrome.sh b/images/linux/scripts/installers/google-chrome.sh index 37a4af56f12d..c859b47421b5 100644 --- a/images/linux/scripts/installers/google-chrome.sh +++ b/images/linux/scripts/installers/google-chrome.sh @@ -4,34 +4,35 @@ ## Desc: Installs google-chrome and chromedriver ################################################################################ -LSB_RELEASE=$(lsb_release -rs) - -wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | sudo apt-key add - -echo "deb [arch=amd64] https://dl.google.com/linux/chrome/deb/ stable main" | sudo tee /etc/apt/sources.list.d/google-chrome.list -apt-get update -apt-get install -y google-chrome-stable +# Source the helpers for use with the script +source $HELPER_SCRIPTS/install.sh + +# Download and install Google Chrome +CHROME_DEB_URL="https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb" +CHROME_DEB_NAME="google-chrome-stable_current_amd64.deb" +download_with_retries $CHROME_DEB_URL "/tmp" "${CHROME_DEB_NAME}" +apt install "/tmp/${CHROME_DEB_NAME}" -f echo "CHROME_BIN=/usr/bin/google-chrome" | tee -a /etc/environment +# Parse Google Chrome version CHROME_VERSION=$(google-chrome --product-version) CHROME_VERSION=${CHROME_VERSION%.*} -# Determine latest release of chromedriver +# Determine the latest release of chromedriver # Compatibility of Google Chrome and Chromedriver: https://sites.google.com/a/chromium.org/chromedriver/downloads/version-selection -LATEST_CHROMEDRIVER_VERSION=$(curl "https://chromedriver.storage.googleapis.com/LATEST_RELEASE_$CHROME_VERSION") +LATEST_CHROMEDRIVER_VERSION=$(curl -sL "https://chromedriver.storage.googleapis.com/LATEST_RELEASE_$CHROME_VERSION") -# Download and unpack latest release of chromedriver +# Download and unpack the latest release of chromedriver echo "Downloading chromedriver v$LATEST_CHROMEDRIVER_VERSION..." -wget "https://chromedriver.storage.googleapis.com/$LATEST_CHROMEDRIVER_VERSION/chromedriver_linux64.zip" -unzip chromedriver_linux64.zip -rm chromedriver_linux64.zip - CHROMEDRIVER_DIR="/usr/local/share/chrome_driver" CHROMEDRIVER_BIN="$CHROMEDRIVER_DIR/chromedriver" +CHROMEDRIVER_URL="https://chromedriver.storage.googleapis.com/$LATEST_CHROMEDRIVER_VERSION/chromedriver_linux64.zip" +download_with_retries $CHROMEDRIVER_URL "/tmp" "chromedriver_linux64.zip" mkdir -p $CHROMEDRIVER_DIR -mv "chromedriver" $CHROMEDRIVER_BIN +unzip /tmp/chromedriver_linux64.zip -d $CHROMEDRIVER_DIR chmod +x $CHROMEDRIVER_BIN ln -s "$CHROMEDRIVER_BIN" /usr/bin/ echo "CHROMEWEBDRIVER=$CHROMEDRIVER_DIR" | tee -a /etc/environment -invoke_tests "Browsers" "Chrome" \ No newline at end of file +invoke_tests "Browsers" "Chrome" From a533011008363f687bef5477df85cad7714a5bd1 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Tue, 30 Mar 2021 15:23:57 +0300 Subject: [PATCH 0104/3485] use download_with_retries (#3054) --- images/linux/scripts/installers/swift.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/images/linux/scripts/installers/swift.sh b/images/linux/scripts/installers/swift.sh index 780b0836903b..d3b683f9e379 100644 --- a/images/linux/scripts/installers/swift.sh +++ b/images/linux/scripts/installers/swift.sh @@ -4,14 +4,18 @@ ## Desc: Installs Swift ################################################################################ +# Source the helpers for use with the script +source $HELPER_SCRIPTS/install.sh # Install image_label="$(lsb_release -rs)" swift_version=$(curl -s -L -N https://swift.org/download|awk -F"[ <]" '/id="swift-/ {print $4; exit}') -wget -P /tmp https://swift.org/builds/swift-$swift_version-release/ubuntu${image_label//./}/swift-$swift_version-RELEASE/swift-$swift_version-RELEASE-ubuntu$image_label.tar.gz +swift_tar_name="swift-$swift_version-RELEASE-ubuntu$image_label.tar.gz" +swift_tar_url="https://swift.org/builds/swift-$swift_version-release/ubuntu${image_label//./}/swift-$swift_version-RELEASE/$swift_tar_name" +download_with_retries $swift_tar_url "/tmp" "$swift_tar_name" -tar xzf /tmp/swift-$swift_version-RELEASE-ubuntu$image_label.tar.gz +tar xzf /tmp/$swift_tar_name mv swift-$swift_version-RELEASE-ubuntu$image_label /usr/share/swift SWIFT_PATH="/usr/share/swift/usr/bin" From 7d7b362d79ffc4291176369275cbef1ea1731a2d Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Wed, 31 Mar 2021 09:51:27 +0300 Subject: [PATCH 0105/3485] [Ubuntu] suppress unzip messages in aws.sh script (#3055) * suppress unzip messages * remove sudo * add /tmp --- images/linux/scripts/installers/aws.sh | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/images/linux/scripts/installers/aws.sh b/images/linux/scripts/installers/aws.sh index 3a81ae81a43d..cba85d7f9371 100644 --- a/images/linux/scripts/installers/aws.sh +++ b/images/linux/scripts/installers/aws.sh @@ -4,26 +4,24 @@ ## Desc: Installs the AWS CLI ################################################################################ +# Source the helpers for use with the script source $HELPER_SCRIPTS/os.sh +source $HELPER_SCRIPTS/install.sh # Install the AWS CLI v1 on Ubuntu16 and Ubuntu18, and AWS CLI v2 on Ubuntu20 if isUbuntu20 ; then - curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip" - unzip awscliv2.zip - ./aws/install -i /usr/local/aws-cli -b /usr/local/bin - rm awscliv2.zip - rm -rf aws + download_with_retries "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" "/tmp" "awscliv2.zip" + unzip -qq /tmp/awscliv2.zip -d /tmp + /tmp/aws/install -i /usr/local/aws-cli -b /usr/local/bin fi if isUbuntu16 || isUbuntu18 ; then - curl "https://s3.amazonaws.com/aws-cli/awscli-bundle.zip" -o "awscli-bundle.zip" - unzip awscli-bundle.zip - ./awscli-bundle/install -i /usr/local/aws -b /usr/local/bin/aws - rm awscli-bundle.zip - rm -rf awscli-bundle + download_with_retries "https://s3.amazonaws.com/aws-cli/awscli-bundle.zip" "/tmp" "awscli-bundle.zip" + unzip -qq /tmp/awscli-bundle.zip -d /tmp + /tmp/awscli-bundle/install -i /usr/local/aws -b /usr/local/bin/aws fi -curl "https://s3.amazonaws.com/session-manager-downloads/plugin/latest/ubuntu_64bit/session-manager-plugin.deb" -o "session-manager-plugin.deb" -sudo apt install ./session-manager-plugin.deb +download_with_retries "https://s3.amazonaws.com/session-manager-downloads/plugin/latest/ubuntu_64bit/session-manager-plugin.deb" "/tmp" "session-manager-plugin.deb" +apt install /tmp/session-manager-plugin.deb invoke_tests "CLI.Tools" "AWS" From b00dbe1036465c86ef56f780fe3456ca53f5581b Mon Sep 17 00:00:00 2001 From: Dmitry Shibanov Date: Wed, 31 Mar 2021 10:33:46 +0300 Subject: [PATCH 0106/3485] install yarn from npm (#3037) --- images/linux/scripts/installers/nodejs.sh | 8 -------- images/linux/toolsets/toolset-1604.json | 4 ++++ images/linux/toolsets/toolset-1804.json | 4 ++++ images/linux/toolsets/toolset-2004.json | 4 ++++ 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/images/linux/scripts/installers/nodejs.sh b/images/linux/scripts/installers/nodejs.sh index 020662f3b61b..a9a108235c0d 100644 --- a/images/linux/scripts/installers/nodejs.sh +++ b/images/linux/scripts/installers/nodejs.sh @@ -32,12 +32,4 @@ ln -s /usr/local/bin/vercel /usr/local/bin/now rm -rf ~/n -# Install Yarn repository and key -curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - -echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list -apt-get update - -# Install yarn -apt-get install -y --no-install-recommends yarn - invoke_tests "Node" "Node.js" diff --git a/images/linux/toolsets/toolset-1604.json b/images/linux/toolsets/toolset-1604.json index 1bacd5e2368b..c332a88d70ea 100644 --- a/images/linux/toolsets/toolset-1604.json +++ b/images/linux/toolsets/toolset-1604.json @@ -296,6 +296,10 @@ { "name": "netlify-cli", "command": "netlify" + }, + { + "name": "yarn", + "command": "yarn" } ] } diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index cc96345bf215..05c7ba6d3102 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -303,6 +303,10 @@ { "name": "netlify-cli", "command": "netlify" + }, + { + "name": "yarn", + "command": "yarn" } ] } diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index 1339c1649d16..238a21911fc5 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -310,6 +310,10 @@ { "name": "lerna", "command": "lerna" + }, + { + "name": "yarn", + "command": "yarn" } ] } From 726ef281c7f185fa8cc580a3d99c39be61f74892 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Wed, 31 Mar 2021 10:46:42 +0300 Subject: [PATCH 0107/3485] [ubuntu] disable verbose (#3063) --- images/linux/scripts/installers/Install-AzureModules.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/linux/scripts/installers/Install-AzureModules.ps1 b/images/linux/scripts/installers/Install-AzureModules.ps1 index 5a22ee69c437..e30c26f06096 100644 --- a/images/linux/scripts/installers/Install-AzureModules.ps1 +++ b/images/linux/scripts/installers/Install-AzureModules.ps1 @@ -15,7 +15,7 @@ foreach ($module in $modules) { $modulePath = Join-Path -Path $installPSModulePath -ChildPath "${moduleName}_${version}" Write-Host " - $version [$modulePath]" - Save-Module -Path $modulePath -Name $moduleName -RequiredVersion $version -Force -Verbose + Save-Module -Path $modulePath -Name $moduleName -RequiredVersion $version -Force } $assets = Invoke-RestMethod $module.url From be806579bb3c8fc4fd187f8c1d3c4234e7adb15f Mon Sep 17 00:00:00 2001 From: hackercat Date: Wed, 31 Mar 2021 11:38:11 +0200 Subject: [PATCH 0108/3485] [Ubuntu] Fix Erlang version in software report SoftwareReport collects wrong version for Erlang, it reports Eshell version rather than Erlang itself. reference: https://stackoverflow.com/questions/9560815/how-to-get-erlangs-release-version-number-from-a-shell 2nd answer `erl` doesn't have `-v` flag, only `-version` `erlc` `-v` flag is for verbose output `rebar3` reports it's version with flag `-v` Change `erl -v` to `erl -version` as it gets stuck in certain scenarios like using Docker as packer builder. reference: http://erlang.org/doc/man/erl.html --- .../linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 | 5 +++-- images/linux/scripts/tests/Tools.Tests.ps1 | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 index fabcc498924d..89a07dcff2af 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 @@ -34,8 +34,9 @@ function Get-ClangVersions { } function Get-ErlangVersion { - $version = (erl -eval 'erlang:display(erlang:system_info(version)), halt().' -noshell).Trim('"') - return "Erlang $version" + $erlangVersion = (erl -eval '{ok, Version} = file:read_file(filename:join([code:root_dir(), "releases", erlang:system_info(otp_release), ''OTP_VERSION''])), io:fwrite(Version), halt().' -noshell) + $shellVersion = (erl -eval 'erlang:display(erlang:system_info(version)), halt().' -noshell).Trim('"') + return "Erlang $erlangVersion (Eshell $shellVersion)" } function Get-MonoVersion { diff --git a/images/linux/scripts/tests/Tools.Tests.ps1 b/images/linux/scripts/tests/Tools.Tests.ps1 index d35c7f634978..8ec4deb313af 100644 --- a/images/linux/scripts/tests/Tools.Tests.ps1 +++ b/images/linux/scripts/tests/Tools.Tests.ps1 @@ -110,15 +110,15 @@ Describe "Cmake" { } Describe "erlang" { - $testCases = @("erl", "erlc", "rebar3") | ForEach-Object { @{ErlangCommand = $_} } + $testCases = @("erl -version", "erlc -v", "rebar3 -v") | ForEach-Object { @{ErlangCommand = $_} } It "erlang " -TestCases $testCases { param ( [string] $ErlangCommand ) - "$ErlangCommand -v" | Should -ReturnZeroExitCode - } + "$ErlangCommand" | Should -ReturnZeroExitCode + } } Describe "gcc" { From 1572c20af1d8710d09d22f3a9cbeb5623a1436fc Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Wed, 31 Mar 2021 15:50:39 +0300 Subject: [PATCH 0109/3485] [Ubuntu] Move Az modules to the PowerShell Tools section (#3067) * Move az section * Add new line between pwsh and az modules --- .../scripts/SoftwareReport/SoftwareReport.Generator.ps1 | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index 9d68370c7047..c607cd73535f 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -242,11 +242,6 @@ $markdown += New-MDList -Style Unordered -Lines @( (Get-DotNetCoreSdkVersions) ) -$markdown += New-MDHeader "Az Module" -Level 3 -$markdown += New-MDList -Style Unordered -Lines @( - (Get-AzModuleVersions) -) - $markdown += New-MDHeader "Databases" -Level 3 $markdown += New-MDList -Style Unordered -Lines (@( (Get-PostgreSqlVersion), @@ -271,6 +266,10 @@ $markdown += New-MDList -Lines (Get-PowershellVersion) -Style Unordered $markdown += New-MDHeader "PowerShell Modules" -Level 4 $markdown += Get-PowerShellModules | New-MDTable $markdown += New-MDNewLine +$markdown += New-MDHeader "Az PowerShell Modules" -Level 4 +$markdown += New-MDList -Style Unordered -Lines @( + (Get-AzModuleVersions) +) $markdown += Build-WebServersSection From 05fc867e8a695283dc6d8cf5d5ece17641ec4b0d Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Wed, 31 Mar 2021 16:07:25 +0300 Subject: [PATCH 0110/3485] Suppress unzip logs in Ubuntu image generation (#3068) --- images/linux/scripts/installers/android.sh | 2 +- images/linux/scripts/installers/google-chrome.sh | 2 +- images/linux/scripts/installers/java-tools.sh | 4 ++-- images/linux/scripts/installers/packer.sh | 2 +- images/linux/scripts/installers/terraform.sh | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/images/linux/scripts/installers/android.sh b/images/linux/scripts/installers/android.sh index 91d5e072c83f..b163d7a574ba 100644 --- a/images/linux/scripts/installers/android.sh +++ b/images/linux/scripts/installers/android.sh @@ -52,7 +52,7 @@ mkdir -p ${ANDROID_SDK_ROOT} # Download the latest command line tools so that we can accept all of the licenses. # See https://developer.android.com/studio/#command-tools wget -O android-sdk.zip https://dl.google.com/android/repository/sdk-tools-linux-4333796.zip -unzip android-sdk.zip -d ${ANDROID_SDK_ROOT} +unzip -qq android-sdk.zip -d ${ANDROID_SDK_ROOT} rm -f android-sdk.zip if isUbuntu20 ; then diff --git a/images/linux/scripts/installers/google-chrome.sh b/images/linux/scripts/installers/google-chrome.sh index c859b47421b5..0cc638f4e8a8 100644 --- a/images/linux/scripts/installers/google-chrome.sh +++ b/images/linux/scripts/installers/google-chrome.sh @@ -30,7 +30,7 @@ CHROMEDRIVER_URL="https://chromedriver.storage.googleapis.com/$LATEST_CHROMEDRIV download_with_retries $CHROMEDRIVER_URL "/tmp" "chromedriver_linux64.zip" mkdir -p $CHROMEDRIVER_DIR -unzip /tmp/chromedriver_linux64.zip -d $CHROMEDRIVER_DIR +unzip -qq /tmp/chromedriver_linux64.zip -d $CHROMEDRIVER_DIR chmod +x $CHROMEDRIVER_BIN ln -s "$CHROMEDRIVER_BIN" /usr/bin/ echo "CHROMEWEBDRIVER=$CHROMEDRIVER_DIR" | tee -a /etc/environment diff --git a/images/linux/scripts/installers/java-tools.sh b/images/linux/scripts/installers/java-tools.sh index 79c0677bf93d..8c97946db63b 100644 --- a/images/linux/scripts/installers/java-tools.sh +++ b/images/linux/scripts/installers/java-tools.sh @@ -61,7 +61,7 @@ echo "ANT_HOME=/usr/share/ant" | tee -a /etc/environment # Install Maven curl -sL https://www-eu.apache.org/dist/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.zip -o maven.zip -unzip -d /usr/share maven.zip +unzip -qq -d /usr/share maven.zip rm maven.zip ln -s /usr/share/apache-maven-3.6.3/bin/mvn /usr/bin/mvn @@ -78,7 +78,7 @@ rm gradleReleases.html echo "gradleUrl=$gradleUrl" echo "gradleVersion=$gradleVersion" curl -sL $gradleUrl -o gradleLatest.zip -unzip -d /usr/share gradleLatest.zip +unzip -qq -d /usr/share gradleLatest.zip rm gradleLatest.zip ln -s /usr/share/gradle-"${gradleVersion}"/bin/gradle /usr/bin/gradle echo "GRADLE_HOME=/usr/share/gradle" | tee -a /etc/environment diff --git a/images/linux/scripts/installers/packer.sh b/images/linux/scripts/installers/packer.sh index 6cf7d0eefd11..1a15ee4c3546 100644 --- a/images/linux/scripts/installers/packer.sh +++ b/images/linux/scripts/installers/packer.sh @@ -7,7 +7,7 @@ # Install Packer PACKER_VERSION=$(curl -s https://checkpoint-api.hashicorp.com/v1/check/packer | jq -r .current_version) curl -LO "https://releases.hashicorp.com/packer/${PACKER_VERSION}/packer_${PACKER_VERSION}_linux_amd64.zip" -unzip "packer_${PACKER_VERSION}_linux_amd64.zip" -d /usr/local/bin +unzip -qq "packer_${PACKER_VERSION}_linux_amd64.zip" -d /usr/local/bin rm -f "packer_${PACKER_VERSION}_linux_amd64.zip" invoke_tests "Tools" "Packer" \ No newline at end of file diff --git a/images/linux/scripts/installers/terraform.sh b/images/linux/scripts/installers/terraform.sh index f84474e63189..d2b621ae76e5 100644 --- a/images/linux/scripts/installers/terraform.sh +++ b/images/linux/scripts/installers/terraform.sh @@ -7,7 +7,7 @@ # Install Terraform TERRAFORM_VERSION=$(curl -s https://checkpoint-api.hashicorp.com/v1/check/terraform | jq -r .current_version) curl -LO "https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_linux_amd64.zip" -unzip "terraform_${TERRAFORM_VERSION}_linux_amd64.zip" -d /usr/local/bin +unzip -qq "terraform_${TERRAFORM_VERSION}_linux_amd64.zip" -d /usr/local/bin rm -f "terraform_${TERRAFORM_VERSION}_linux_amd64.zip" invoke_tests "Tools" "Terraform" \ No newline at end of file From 1436b723d5d1f3f9cd8481505e2ea289db1529db Mon Sep 17 00:00:00 2001 From: Vladimir Safonkin Date: Wed, 31 Mar 2021 19:16:44 +0300 Subject: [PATCH 0111/3485] Remove duplicates from Ubuntu docs (#3066) --- .../SoftwareReport.Generator.ps1 | 18 +----- .../SoftwareReport/SoftwareReport.Tools.psm1 | 62 ------------------- 2 files changed, 3 insertions(+), 77 deletions(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index c607cd73535f..2559ebc08078 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -95,17 +95,13 @@ $markdown += New-MDList -Style Unordered -Lines ($projectManagementList | Sort-O $markdown += New-MDHeader "Tools" -Level 3 $toolsList = @( - (Get-7zipVersion), (Get-AnsibleVersion), (Get-AptFastVersion), (Get-AzCopyVersion), (Get-BazelVersion), (Get-BazeliskVersion), - (Get-BinUtilsVersion), (Get-CodeQLBundleVersion), - (Get-CoreUtilsVersion), (Get-CMakeVersion), - (Get-CurlVersion), (Get-DockerMobyClientVersion), (Get-DockerMobyServerVersion), (Get-DockerComposeVersion), @@ -123,33 +119,25 @@ $toolsList = @( (Get-KustomizeVersion), (Get-LeiningenVersion), (Get-MediainfoVersion), - (Get-M4Version), (Get-HGVersion), (Get-MinikubeVersion), - (Get-NetToolsVersion), (Get-NewmanVersion), (Get-NvmVersion), (Get-OpensslVersion), (Get-PackerVersion), - (Get-PassVersion), (Get-PhantomJSVersion), (Get-PulumiVersion), (Get-RVersion), (Get-SphinxVersion), - (Get-SwigVersion), - (Get-TerraformVersion), - (Get-UnZipVersion), - (Get-WgetVersion), - (Get-YamllintVersion), - (Get-ZipVersion), - (Get-ZstdVersion) + (Get-TerraformVersion) ) if (-not (Test-IsUbuntu16)) { $toolsList += @( (Get-PodManVersion), (Get-BuildahVersion), - (Get-SkopeoVersion) + (Get-SkopeoVersion), + (Get-YamllintVersion) ) } diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 index 739bfa8d85da..9c333259de84 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 @@ -1,8 +1,3 @@ -function Get-7zipVersion { - $7zVersion = 7z i | Select-String "7-Zip" | Take-OutputPart -Part 2 - return "7-Zip $7zVersion" -} - function Get-AnsibleVersion { $ansibleVersion = ansible --version | Select-Object -First 1 | Take-OutputPart -Part 1 return "Ansible $ansibleVersion" @@ -29,12 +24,6 @@ function Get-BazeliskVersion { return "Bazelisk $bazeliskVersion" } -function Get-BinUtilsVersion { - $result = Get-CommandResult "dpkg-query --show binutils" - $binUtilsVersion = $result.Output| Take-OutputPart -Part 1 -Delimiter "`t" | Take-OutputPart -Part 0 -Delimiter "-" - return "binutils $binUtilsVersion" -} - function Get-CodeQLBundleVersion { $CodeQLVersionsWildcard = Join-Path $Env:AGENT_TOOLSDIRECTORY -ChildPath "CodeQL" | Join-Path -ChildPath "*" $CodeQLVersionPath = Get-ChildItem $CodeQLVersionsWildcard | Select-Object -First 1 -Expand FullName @@ -43,12 +32,6 @@ function Get-CodeQLBundleVersion { return "CodeQL Action Bundle $CodeQLVersion" } -function Get-CoreUtilsVersion { - $result = Get-CommandResult "dpkg-query --show coreutils" - $coreUtilsVersion = $result.Output | Take-OutputPart -Part 1 -Delimiter "`t" | Take-OutputPart -Part 0 -Delimiter "-" - return "coreutils $coreUtilsVersion" -} - function Get-PodManVersion { $podmanVersion = podman --version | Take-OutputPart -Part 2 return "Podman $podmanVersion" @@ -69,11 +52,6 @@ function Get-CMakeVersion { return "CMake $cmakeVersion" } -function Get-CurlVersion { - $curlVersion = curl --version | Select-Object -First 1 | Take-OutputPart -Part 0,1 - return $curlVersion -} - function Get-DockerComposeVersion { $composeVersion = docker-compose -v | Take-OutputPart -Part 2 | Take-OutputPart -Part 0 -Delimiter "," return "Docker Compose $composeVersion" @@ -160,11 +138,6 @@ function Get-HGVersion { return "Mercurial $hgVersion" } -function Get-M4Version { - $m4Version = m4 --version | Select-Object -First 1 | Take-OutputPart -Part -1 - return "m4 $m4Version" -} - function Get-LeiningenVersion { return "$(lein -v | Take-OutputPart -Part 0,1)" } @@ -174,11 +147,6 @@ function Get-MediainfoVersion { return "MediaInfo $mediainfoVersion" } -function Get-NetToolsVersion { - $netToolsVersion = dpkg-query --showformat='${Version}' --show net-tools | Take-OutputPart -Part 0 -Delimiter '-' | Take-OutputPart -Part 0 -Delimiter '+' - return "net-tools $netToolsVersion" -} - function Get-NewmanVersion { return "Newman $(newman --version)" } @@ -192,44 +160,14 @@ function Get-PackerVersion { return "Packer $(packer --version)" } -function Get-PassVersion { - $passVersion = (pass version | Select-String "^=\s+v").Line.Replace('v','') | Take-OutputPart -Part 1 - return "pass $passVersion" -} - function Get-PhantomJSVersion { return "PhantomJS $(phantomjs --version)" } -function Get-SwigVersion { - $swigVersion = swig -version | Select-String "SWIG Version" | Take-OutputPart -Part 2 - return "Swig $swigVersion" -} - function Get-TerraformVersion { return (terraform version | Select-String "^Terraform").Line.Replace('v','') } -function Get-UnZipVersion { - $unzipVersion = unzip -v | Select-Object -First 1 | Take-OutputPart -Part 1 - return "unzip $unzipVersion" -} - -function Get-WgetVersion { - $wgetVersion = wget --version | Select-Object -First 1 | Take-OutputPart -Part 2 - return "wget $wgetVersion" -} - -function Get-ZipVersion { - $zipVersion = zip -v | Select-String "This is Zip" | Take-OutputPart -Part 3 - return "zip $zipVersion" -} - -function Get-ZstdVersion { - $zstdVersion = (zstd --version).Split() -match "v\d+" | ForEach-Object {$_.Replace("v","").Replace(",","")} - return "zstd $zstdVersion" -} - function Get-JqVersion { $jqVersion = jq --version | Take-OutputPart -Part 1 -Delimiter "-" return "jq $jqVersion" From a687c4c7535aedbc4350f8866b4cf7e5d2034c97 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Wed, 31 Mar 2021 19:25:32 +0300 Subject: [PATCH 0112/3485] Add python-setuptools to Ubuntu16 & 18 toolset files (#3071) --- images/linux/toolsets/toolset-1604.json | 1 + images/linux/toolsets/toolset-1804.json | 1 + 2 files changed, 2 insertions(+) diff --git a/images/linux/toolsets/toolset-1604.json b/images/linux/toolsets/toolset-1604.json index c332a88d70ea..37b7603d8c03 100644 --- a/images/linux/toolsets/toolset-1604.json +++ b/images/linux/toolsets/toolset-1604.json @@ -152,6 +152,7 @@ "p7zip-rar", "p7zip", "pkg-config", + "python-setuptools", "rpm", "texinfo", "tk", diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index 05c7ba6d3102..9c82d2dd4dc8 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -146,6 +146,7 @@ "openssh-client", "p7zip-rar", "pkg-config", + "python-setuptools", "rpm", "texinfo", "tk", From 475453f2121f3e575d2f23c6ba4aa883f08de702 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 1 Apr 2021 09:04:35 +0000 Subject: [PATCH 0113/3485] Updating readme file for ubuntu18 version 20210330.1 (#3056) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/linux/Ubuntu1804-README.md | 168 +++++++++++++++++++++--------- 1 file changed, 120 insertions(+), 48 deletions(-) diff --git a/images/linux/Ubuntu1804-README.md b/images/linux/Ubuntu1804-README.md index fb4be3187f46..40bc9b667e26 100644 --- a/images/linux/Ubuntu1804-README.md +++ b/images/linux/Ubuntu1804-README.md @@ -1,21 +1,20 @@ | Announcements | |-| -| [[Ubuntu] jekyll/builder and node8-typescript docker images will be removed from images on March, 22](https://github.com/actions/virtual-environments/issues/2958) | | [[Ubuntu] Clang, GCC and Gfortran versions less than 9.x will be removed from images on March, 29](https://github.com/actions/virtual-environments/issues/2950) | | [[windows, ubuntu] Az, Azure and AzureRM module preinstallation policy will be changed on March, 29th](https://github.com/actions/virtual-environments/issues/2916) | *** # Ubuntu 18.04.5 LTS -- Linux kernel version: 5.4.0-1041-azure -- Image Version: 20210318.0 +- Linux kernel version: 5.4.0-1043-azure +- Image Version: 20210330.1 ## Installed Software ### Language and Runtime - Bash 4.4.20(1)-release -- Clang 6.0.0, 8.0.0, 9.0.0 +- Clang 9.0.0 - Erlang 11.1.7 -- 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, 10.1.0 -- Julia 1.5.4 +- GNU C++ 7.5.0, 9.3.0, 10.1.0 +- GNU Fortran 7.5.0, 9.3.0, 10.1.0 +- Julia 1.6.0 - Mono 6.12.0.122 - Node 14.16.0 - Perl 5.26.1 @@ -27,14 +26,14 @@ ### Package Management - cpan 1.64 - Helm 3.5.3 -- Homebrew 3.0.7 +- Homebrew 3.0.10 - Miniconda 4.9.2 - Npm 6.14.11 - Pip 9.0.1 - Pip3 9.0.1 - Pipx 0.16.1.0 - RubyGems 2.7.6 -- Vcpkg (build from master \) +- Vcpkg (build from master \<1054567>) - Yarn 1.22.5 #### Environment variables @@ -51,27 +50,27 @@ ### Tools - 7-Zip 16.02 -- Ansible 2.9.19 +- Ansible 2.10.7 - apt-fast 1.9.10 - AzCopy 10.9.0 (available by `azcopy` and `azcopy10` aliases) - Bazel 4.0.0 - Bazelisk 1.7.5 - binutils 2.30 - Buildah 1.19.6 -- CMake 3.19.7 -- CodeQL Action Bundle 2.4.5 +- CMake 3.20.0 +- CodeQL Action Bundle 2.5.0 - coreutils 8.28 - curl 7.58.0 -- Docker Compose 1.28.5 +- Docker Compose 1.28.6 - Docker-Buildx 0.5.1 - Docker-Moby Client 20.10.5+azure - Docker-Moby Server 20.10.5+azure -- Git 2.31.0 -- Git LFS 2.13.2 +- Git 2.31.1 +- Git LFS 2.13.3 - Git-ftp 1.3.1 - Haveged 1.9.1 - Heroku 7.51.0 -- HHVM (HipHop VM) 4.101.0 +- HHVM (HipHop VM) 4.102.0 - jq 1.5 - Kind 0.10.0 - Kubectl 1.20.1-5-g76a04fc @@ -83,18 +82,19 @@ - Minikube 1.18.1 - net-tools 1.60 - Newman 5.2.2 -- nvm 0.37.2 +- nvm 0.38.0 +- OpenSSL 1.1.1 11 Sep 2018 - Packer 1.7.0 - pass 1.7.1 - PhantomJS 2.1.1 - Podman 3.0.1 -- Pulumi 2.23.1 +- Pulumi 2.23.2 - R 4.0.4 - Skopeo 1.2.2 - Sphinx Open Source Search Server 2.2.11 - SVN 1.9.7 - Swig 3.0.12 -- Terraform 0.14.8 +- Terraform 0.14.9 - unzip 6.00 - wget 1.19.4 - yamllint 1.26.0 @@ -103,25 +103,25 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.73 -- AWS CLI 1.19.30 +- AWS CLI 1.19.40 - AWS CLI Session manager plugin 1.2.54.0 - AWS SAM CLI 1.21.1 -- Azure CLI (azure-cli) 2.20.0 +- Azure CLI (azure-cli) 2.21.0 - Azure CLI (azure-devops) 0.18.0 - GitHub CLI 1.7.0 -- Google Cloud SDK 332.0.0 +- Google Cloud SDK 333.0.0 - Hub CLI 2.14.2 -- Netlify CLI 3.13.3 -- OpenShift CLI 4.7.2 +- Netlify CLI 3.13.8 +- OpenShift CLI 4.7.4 - ORAS CLI 0.11.1 - Vercel CLI 21.3.3 ### Java -| Version | Vendor | Environment Variable | -| ------------------- | ------------ | -------------------- | -| 1.8.0_282 (default) | AdoptOpenJDK | JAVA_HOME_8_X64 | -| 11.0.10 | AdoptOpenJDK | JAVA_HOME_11_X64 | -| 12.0.2 | AdoptOpenJDK | JAVA_HOME_12_X64 | +| Version | Vendor | Environment Variable | +| ------------------- | ------------- | -------------------- | +| 8.0.282+8 (default) | Adopt OpenJDK | JAVA_HOME_8_X64 | +| 11.0.10+9 | Adopt OpenJDK | JAVA_HOME_11_X64 | +| 12.0.2+10 | Adopt OpenJDK | JAVA_HOME_12_X64 | ### PHP | Tool | Version | @@ -137,23 +137,23 @@ - Stack 2.5.1 ### Rust Tools -- Cargo 1.50.0 -- Rust 1.50.0 -- Rustdoc 1.50.0 +- Cargo 1.51.0 +- Rust 1.51.0 +- Rustdoc 1.51.0 - Rustup 1.23.1 #### Packages - Bindgen 0.57.0 - Cargo audit 0.14.0 -- Cargo clippy 0.0.212 +- Cargo clippy 0.1.51 - Cargo outdated 0.9.14 - Cbindgen 0.18.0 -- Rustfmt 1.4.30 +- Rustfmt 1.4.36 ### Browsers and Drivers - Google Chrome 89.0.4389.90 - ChromeDriver 89.0.4389.23 -- Mozilla Firefox 86.0 +- Mozilla Firefox 87.0 - Geckodriver 0.29.0 #### Environment variables @@ -166,7 +166,7 @@ - 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.519 2.1.520 2.1.521 2.1.522 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.616 2.1.617 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 2.1.811 2.1.812 2.1.813 2.1.814 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.109 3.1.110 3.1.111 3.1.112 3.1.113 3.1.200 3.1.201 3.1.202 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 5.0.100 5.0.101 5.0.102 5.0.103 5.0.104 5.0.200 5.0.201 ### 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 4.7.0 +- 5.5.0 3.1.0.zip 4.4.0.zip ### Databases - MongoDB 4.4.4 @@ -262,22 +262,94 @@ ### Cached Docker images | Repository:Tag | Digest | Created | | ---------------------- | ------------------------------------------------------------------------ | ---------- | -| alpine:3.10 | sha256:0b4d282d7ae7cf5ed91801654a918aea45d6c1de6df0db6a29d60619141fb8de | 2021-02-24 | +| alpine:3.10 | sha256:f2fa517acf6123318bc893c411f34570cea193367b33bd3be1d90c7fbefe72a5 | 2021-03-25 | | alpine:3.7 | sha256:8421d9a84432575381bfabd248f1eb56f3aa21d9d7cd2511583c68c9b7511d10 | 2019-03-07 | | alpine:3.8 | sha256:2bb501e6173d9d006e56de5bce2720eb06396803300fe1687b58a7ff32bf4c14 | 2020-01-23 | | alpine:3.9 | sha256:414e0518bb9228d35e4cd5165567fb91d26c6a214e9c95899e1e056fcd349011 | 2020-04-24 | -| buildpack-deps:buster | sha256:a78316a3d9d366e8f5d80840a2c9ee361c66bf8a7d7d28edd9224ca70f32fd9c | 2021-03-12 | -| buildpack-deps:stretch | sha256:6f928e94e06da507f1d133c26acf70b3807e2bb6d584e5843507511574c3ad6e | 2021-03-12 | -| debian:8 | sha256:6b1960e0a149981c3c115abee6b9e035591fe55533a20a1cd912e636b8df8820 | 2021-03-12 | -| debian:9 | sha256:ca2af3c25b43f185cc86cc2038a217d9b4cdbb4d47adbcfe5d25e04c1d75e1d9 | 2021-03-12 | -| node:10 | sha256:e84df6f7647a1c3993f724c9a0cacdf6b9b2a4ee722b4face9b29f0013634f17 | 2021-03-12 | -| node:10-alpine | sha256:017b55be202b81bd6b4e9f841d5ddeb6df48467ca5cba0c4194015b987f48a60 | 2021-03-12 | -| node:12 | sha256:0ae1a6a3a8a61e2bcf7f826b2562eb865f9a3095acf41bc6f184773ab66f3007 | 2021-03-12 | -| node:12-alpine | sha256:81eec5b1cac69ff6af62097563737b40ac94b605b43d01466c0cf48e220494be | 2021-03-12 | -| ubuntu:14.04 | sha256:63fce984528cec8714c365919882f8fb64c8a3edf23fdfa0b218a2756125456f | 2020-09-16 | +| buildpack-deps:buster | sha256:ff6c309ddf5b2021da0f1bbdde5020be3840113058c50863fc05ba840c4db4b3 | 2021-03-27 | +| buildpack-deps:stretch | sha256:74e5ae35428c523829353a156f34e44e3d9047d97eeb44cff883d7a654214064 | 2021-03-27 | +| debian:8 | sha256:32ad5050caffb2c7e969dac873bce2c370015c2256ff984b70c1c08b3a2816a0 | 2021-03-26 | +| debian:9 | sha256:20fb077345a1c2447b5746ffa3c9623a8eb87c15e8543e2e48387a7224366d88 | 2021-03-26 | +| node:10 | sha256:828fce99d975b94406af6b089ce44904eee7f61b4c9702c71068065472084848 | 2021-03-27 | +| node:10-alpine | sha256:999c6a67a36b8a682491124ddd49ff6585bd61d7c1d150ff2ce088d668250d4f | 2021-03-25 | +| node:12 | sha256:ad1c01aeb58e1fbfb5439eb2b954ab0fcdccd81202f90e6484915222a07d2528 | 2021-03-27 | +| node:12-alpine | sha256:b1b260826bea495c02f35228b37e7b63e50dffc9fca4f9c9a532787a5de978ea | 2021-03-25 | +| ubuntu:14.04 | sha256:4a8a6fa8810a3e01352981b35165b0b28403fe2a4e2535e315b23b4a69cd130a | 2021-03-25 | ### Installed apt packages -- binutils, bison, brotli, build-essential, bzip2, coreutils, curl, dbus, dnsutils, dpkg, fakeroot, file, flex, ftp, gnupg2, haveged, imagemagick, iproute2, iputils-ping, jq, lib32z1, libc++-dev, libc++abi-dev, libcurl3, libgbm-dev, libgconf-2-4, libgsl-dev, libgtk-3-0, libmagic-dev, libmagickcore-dev, libmagickwand-dev, libsecret-1-dev, libsqlite3-dev, libunwind8, libxkbfile-dev, libxss1, locales, m4, mediainfo, net-tools, netcat, openssh-client, p7zip-full, p7zip-rar, parallel, pass, patchelf, pkg-config, pollinate, rpm, rsync, shellcheck, sphinxsearch, sqlite3, ssh, subversion, sudo, swig, telnet, texinfo, time, tk, tzdata, unzip, upx, wget, xorriso, xvfb, xz-utils, zip, zstd, zsync - +| Name | Version | +| ----------------- | --------------------------------- | +| binutils | 2.30-21ubuntu1~18.04.5 | +| bison | 2:3.0.4.dfsg-1build1 | +| brotli | 1.0.3-1ubuntu1.3 | +| build-essential | 12.4ubuntu1 | +| bzip2 | 1.0.6-8.1ubuntu0.2 | +| coreutils | 8.28-1ubuntu1 | +| curl | 7.58.0-2ubuntu3.12 | +| dbus | 1.12.2-1ubuntu1.2 | +| dnsutils | 1:9.11.3+dfsg-1ubuntu1.14 | +| dpkg | 1.19.0.5ubuntu2.3 | +| fakeroot | 1.22-2ubuntu1 | +| file | 1:5.32-2ubuntu0.4 | +| flex | 2.6.4-6 | +| ftp | 0.17-34 | +| gnupg2 | 2.2.4-1ubuntu1.4 | +| haveged | 1.9.1-6 | +| imagemagick | 8:6.9.7.4+dfsg-16ubuntu6.9 | +| iproute2 | 4.15.0-2ubuntu1.3 | +| iputils-ping | 3:20161105-1ubuntu3 | +| jq | 1.5+dfsg-2 | +| lib32z1 | 1:1.2.11.dfsg-0ubuntu2 | +| libc++-dev | 6.0-2 | +| libc++abi-dev | 6.0-2 | +| libcurl3 | 7.58.0-2ubuntu3.12 | +| libgbm-dev | 20.0.8-0ubuntu1~18.04.1 | +| libgconf-2-4 | 3.2.6-4ubuntu1 | +| libgsl-dev | 2.4+dfsg-6 | +| libgtk-3-0 | 3.22.30-1ubuntu4 | +| libmagic-dev | 1:5.32-2ubuntu0.4 | +| libmagickcore-dev | 8:6.9.7.4+dfsg-16ubuntu6.9 | +| libmagickwand-dev | 8:6.9.7.4+dfsg-16ubuntu6.9 | +| libsecret-1-dev | 0.18.6-1 | +| libsqlite3-dev | 3.22.0-1ubuntu0.4 | +| libunwind8 | 1.2.1-8 | +| libxkbfile-dev | 1:1.0.9-2 | +| libxss1 | 1:1.2.2-1 | +| locales | 2.27-3ubuntu1.4 | +| m4 | 1.4.18-1 | +| mediainfo | 17.12-1 | +| net-tools | 1.60+git20161116.90da8a0-1ubuntu1 | +| netcat | 1.10-41.1 | +| openssh-client | 1:7.6p1-4ubuntu0.3 | +| p7zip-full | 16.02+dfsg-6 | +| p7zip-rar | 16.02-2 | +| parallel | 20161222-1 | +| pass | 1.7.1-3 | +| patchelf | 0.9-1 | +| pkg-config | 0.29.1-0ubuntu2 | +| pollinate | 4.33-0ubuntu1~18.04.2 | +| rpm | 4.14.1+dfsg1-2 | +| rsync | 3.1.2-2.1ubuntu1.1 | +| shellcheck | 0.4.6-1 | +| sphinxsearch | 2.2.11-2 | +| sqlite3 | 3.22.0-1ubuntu0.4 | +| ssh | 1:7.6p1-4ubuntu0.3 | +| subversion | 1.9.7-4ubuntu1 | +| sudo | 1.8.21p2-3ubuntu1.4 | +| swig | 3.0.12-1 | +| telnet | 0.17-41 | +| texinfo | 6.5.0.dfsg.1-2 | +| time | 1.7-25.1build1 | +| tk | 8.6.0+9 | +| tzdata | 2021a-0ubuntu0.18.04 | +| unzip | 6.0-21ubuntu1.1 | +| upx | 3.94-4 | +| wget | 1.19.4-1ubuntu2.2 | +| xorriso | 1.4.8-3 | +| xvfb | 2:1.19.6-1ubuntu4.8 | +| xz-utils | 5.2.2-1.3 | +| zip | 3.0-11build1 | +| zstd | 1.3.3+dfsg-2ubuntu1.2 | +| zsync | 0.6.2-3ubuntu1 | From 18062f1b881bbebac1e4fd958949420a5284c78e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 1 Apr 2021 09:19:09 +0000 Subject: [PATCH 0114/3485] Updating readme file for ubuntu16 version 20210327.1 (#3044) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/linux/Ubuntu1604-README.md | 165 ++++++++++++++++++++++-------- 1 file changed, 120 insertions(+), 45 deletions(-) diff --git a/images/linux/Ubuntu1604-README.md b/images/linux/Ubuntu1604-README.md index 6dc3fb2bf5e7..a54f3522dd43 100644 --- a/images/linux/Ubuntu1604-README.md +++ b/images/linux/Ubuntu1604-README.md @@ -1,21 +1,20 @@ | Announcements | |-| -| [[Ubuntu] jekyll/builder and node8-typescript docker images will be removed from images on March, 22](https://github.com/actions/virtual-environments/issues/2958) | | [[Ubuntu] Clang, GCC and Gfortran versions less than 9.x will be removed from images on March, 29](https://github.com/actions/virtual-environments/issues/2950) | | [[windows, ubuntu] Az, Azure and AzureRM module preinstallation policy will be changed on March, 29th](https://github.com/actions/virtual-environments/issues/2916) | *** # Ubuntu 16.04.7 LTS -- Linux kernel version: 4.15.0-1109-azure -- Image Version: 20210318.0 +- Linux kernel version: 4.15.0-1111-azure +- Image Version: 20210327.1 ## Installed Software ### Language and Runtime - Bash 4.3.48(1)-release -- Clang 6.0.0, 8.0.0, 9.0.1 +- Clang 9.0.1 - Erlang 11.1.7 -- 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 -- Julia 1.5.4 +- GNU C++ 5.5.0, 9.3.0 +- GNU Fortran 5.5.0, 9.3.0 +- Julia 1.6.0 - Mono 6.12.0.122 - Node 14.16.0 - Perl 5.22.1 @@ -27,13 +26,13 @@ ### Package Management - cpan 1.61 - Helm 3.5.3 -- Homebrew 3.0.7 +- Homebrew 3.0.9 - Miniconda 4.9.2 - Npm 6.14.11 - Pip 8.1.1 - Pip3 8.1.1 - RubyGems 2.5.2 -- Vcpkg (build from master \) +- Vcpkg (build from master \<9f6157a>) - Yarn 1.22.5 #### Environment variables @@ -56,16 +55,16 @@ - Bazel 4.0.0 - Bazelisk 1.7.5 - binutils 2.26.1 -- CMake 3.19.7 -- CodeQL Action Bundle 2.4.5 +- CMake 3.20.0 +- CodeQL Action Bundle 2.5.0 - coreutils 8.25 - curl 7.47.0 -- Docker Compose 1.28.5 +- Docker Compose 1.28.6 - Docker-Buildx 0.5.1 - Docker-Moby Client 20.10.5+azure - Docker-Moby Server 20.10.5+azure -- Git 2.31.0 -- Git LFS 2.13.2 +- Git 2.31.1 +- Git LFS 2.13.3 - Git-ftp 1.0.2 - Haveged 1.9.1 - Heroku 7.51.0 @@ -82,15 +81,16 @@ - net-tools 1.60 - Newman 5.2.2 - nvm 0.37.2 +- OpenSSL 1.0.2g 1 Mar 2016 - Packer 1.7.0 - pass 1.6.5 - PhantomJS 2.1.1 -- Pulumi 2.23.1 +- Pulumi 2.23.2 - R 4.0.4 - Sphinx Open Source Search Server 2.2.9 - SVN 1.9.3 - Swig 3.0.8 -- Terraform 0.14.8 +- Terraform 0.14.9 - unzip 6.00 - wget 1.17.1 - yamllint 1.2.1 @@ -99,25 +99,25 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.73 -- AWS CLI 1.19.32 +- AWS CLI 1.19.39 - AWS CLI Session manager plugin 1.2.54.0 - AWS SAM CLI 1.21.1 -- Azure CLI (azure-cli) 2.20.0 +- Azure CLI (azure-cli) 2.21.0 - Azure CLI (azure-devops) 0.18.0 - GitHub CLI 1.7.0 -- Google Cloud SDK 332.0.0 +- Google Cloud SDK 333.0.0 - Hub CLI 2.14.2 -- Netlify CLI 3.13.3 -- OpenShift CLI 4.7.2 +- Netlify CLI 3.13.7 +- OpenShift CLI 4.7.3 - ORAS CLI 0.11.1 - Vercel CLI 21.3.3 ### Java -| Version | Vendor | Environment Variable | -| ------------------- | ------------ | -------------------- | -| 1.8.0_282 (default) | AdoptOpenJDK | JAVA_HOME_8_X64 | -| 11.0.10 | AdoptOpenJDK | JAVA_HOME_11_X64 | -| 12.0.2 | AdoptOpenJDK | JAVA_HOME_12_X64 | +| Version | Vendor | Environment Variable | +| ------------------- | ------------- | -------------------- | +| 8.0.282+8 (default) | Adopt OpenJDK | JAVA_HOME_8_X64 | +| 12.0.2+10 | Adopt OpenJDK | JAVA_HOME_12_X64 | +| 11.0.10+9 | Adopt OpenJDK | JAVA_HOME_11_X64 | ### PHP | Tool | Version | @@ -133,23 +133,23 @@ - Stack 2.5.1 ### Rust Tools -- Cargo 1.50.0 -- Rust 1.50.0 -- Rustdoc 1.50.0 +- Cargo 1.51.0 +- Rust 1.51.0 +- Rustdoc 1.51.0 - Rustup 1.23.1 #### Packages - Bindgen 0.57.0 - Cargo audit 0.14.0 -- Cargo clippy 0.0.212 +- Cargo clippy 0.1.51 - Cargo outdated 0.9.14 - Cbindgen 0.18.0 -- Rustfmt 1.4.30 +- Rustfmt 1.4.36 ### Browsers and Drivers - Google Chrome 89.0.4389.90 - ChromeDriver 89.0.4389.23 -- Mozilla Firefox 86.0 +- Mozilla Firefox 87.0 - Geckodriver 0.29.0 #### Environment variables @@ -162,7 +162,7 @@ - 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.519 2.1.520 2.1.521 2.1.522 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.616 2.1.617 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 2.1.811 2.1.812 2.1.813 2.1.814 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.109 3.1.110 3.1.111 3.1.112 3.1.113 3.1.200 3.1.201 3.1.202 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 5.0.100 5.0.101 5.0.102 5.0.103 5.0.104 5.0.200 5.0.201 ### 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 4.7.0 +- 5.5.0 3.1.0.zip 4.4.0.zip ### Databases - MongoDB 4.4.4 @@ -258,22 +258,97 @@ ### Cached Docker images | Repository:Tag | Digest | Created | | ---------------------- | ------------------------------------------------------------------------ | ---------- | -| alpine:3.10 | sha256:0b4d282d7ae7cf5ed91801654a918aea45d6c1de6df0db6a29d60619141fb8de | 2021-02-24 | +| alpine:3.10 | sha256:f2fa517acf6123318bc893c411f34570cea193367b33bd3be1d90c7fbefe72a5 | 2021-03-25 | | alpine:3.7 | sha256:8421d9a84432575381bfabd248f1eb56f3aa21d9d7cd2511583c68c9b7511d10 | 2019-03-07 | | alpine:3.8 | sha256:2bb501e6173d9d006e56de5bce2720eb06396803300fe1687b58a7ff32bf4c14 | 2020-01-23 | | alpine:3.9 | sha256:414e0518bb9228d35e4cd5165567fb91d26c6a214e9c95899e1e056fcd349011 | 2020-04-24 | -| buildpack-deps:buster | sha256:a78316a3d9d366e8f5d80840a2c9ee361c66bf8a7d7d28edd9224ca70f32fd9c | 2021-03-12 | -| buildpack-deps:stretch | sha256:6f928e94e06da507f1d133c26acf70b3807e2bb6d584e5843507511574c3ad6e | 2021-03-12 | -| debian:8 | sha256:6b1960e0a149981c3c115abee6b9e035591fe55533a20a1cd912e636b8df8820 | 2021-03-12 | -| debian:9 | sha256:ca2af3c25b43f185cc86cc2038a217d9b4cdbb4d47adbcfe5d25e04c1d75e1d9 | 2021-03-12 | -| node:10 | sha256:e84df6f7647a1c3993f724c9a0cacdf6b9b2a4ee722b4face9b29f0013634f17 | 2021-03-12 | -| node:10-alpine | sha256:017b55be202b81bd6b4e9f841d5ddeb6df48467ca5cba0c4194015b987f48a60 | 2021-03-12 | -| node:12 | sha256:0ae1a6a3a8a61e2bcf7f826b2562eb865f9a3095acf41bc6f184773ab66f3007 | 2021-03-12 | -| node:12-alpine | sha256:81eec5b1cac69ff6af62097563737b40ac94b605b43d01466c0cf48e220494be | 2021-03-12 | -| ubuntu:14.04 | sha256:63fce984528cec8714c365919882f8fb64c8a3edf23fdfa0b218a2756125456f | 2020-09-16 | +| buildpack-deps:buster | sha256:ff6c309ddf5b2021da0f1bbdde5020be3840113058c50863fc05ba840c4db4b3 | 2021-03-27 | +| buildpack-deps:stretch | sha256:74e5ae35428c523829353a156f34e44e3d9047d97eeb44cff883d7a654214064 | 2021-03-27 | +| debian:8 | sha256:32ad5050caffb2c7e969dac873bce2c370015c2256ff984b70c1c08b3a2816a0 | 2021-03-26 | +| debian:9 | sha256:20fb077345a1c2447b5746ffa3c9623a8eb87c15e8543e2e48387a7224366d88 | 2021-03-26 | +| node:10 | sha256:c102472f61dc2ced4fa974ac7a4ef43ba801dd7221c612c69db086265489803f | 2021-03-12 | +| node:10-alpine | sha256:999c6a67a36b8a682491124ddd49ff6585bd61d7c1d150ff2ce088d668250d4f | 2021-03-25 | +| node:12 | sha256:a6b801a76c4bcbce39cf94bf2005d54ebdab4984ffdda335a46679c80fa6f54e | 2021-03-12 | +| node:12-alpine | sha256:b1b260826bea495c02f35228b37e7b63e50dffc9fca4f9c9a532787a5de978ea | 2021-03-25 | +| ubuntu:14.04 | sha256:4a8a6fa8810a3e01352981b35165b0b28403fe2a4e2535e315b23b4a69cd130a | 2021-03-25 | ### Installed apt packages -- binutils, bison, brotli, build-essential, bzip2, coreutils, curl, dbus, dnsutils, dpkg, fakeroot, file, flex, ftp, gnupg2, haveged, imagemagick, iproute2, iputils-ping, jq, lib32z1, libc++-dev, libc++abi-dev, libcurl3, libgbm-dev, libgconf-2-4, libgsl-dev, libgtk-3-0, libicu55, libmagic-dev, libmagickcore-dev, libmagickwand-dev, libsecret-1-dev, libsqlite3-dev, libunwind8, libxkbfile-dev, libxss1, locales, m4, mediainfo, net-tools, netcat, openssh-client, p7zip, p7zip-full, p7zip-rar, parallel, pass, patchelf, pkg-config, pollinate, rpm, rsync, shellcheck, sphinxsearch, sqlite3, ssh, subversion, sudo, swig, telnet, texinfo, time, tk, tzdata, unzip, upx, wget, xorriso, xvfb, xz-utils, yamllint, zip, zstd, zsync - +| Name | Version | +| ----------------- | ---------------------------- | +| binutils | 2.26.1-1ubuntu1~16.04.8 | +| bison | 2:3.0.4.dfsg-1 | +| brotli | 1.0.3-1ubuntu1~16.04.2 | +| build-essential | 12.1ubuntu2 | +| bzip2 | 1.0.6-8ubuntu0.2 | +| coreutils | 8.25-2ubuntu3~16.04 | +| curl | 7.47.0-1ubuntu2.18 | +| dbus | 1.10.6-1ubuntu3.6 | +| dnsutils | 1:9.10.3.dfsg.P4-8ubuntu1.18 | +| dpkg | 1.18.4ubuntu1.6 | +| fakeroot | 1.20.2-1ubuntu1 | +| file | 1:5.25-2ubuntu1.4 | +| flex | 2.6.0-11 | +| ftp | 0.17-33 | +| gnupg2 | 2.1.11-6ubuntu2.1 | +| haveged | 1.9.1-3 | +| imagemagick | 8:6.8.9.9-7ubuntu5.16 | +| iproute2 | 4.3.0-1ubuntu3.16.04.5 | +| iputils-ping | 3:20121221-5ubuntu2 | +| jq | 1.5+dfsg-1ubuntu0.1 | +| lib32z1 | 1:1.2.8.dfsg-2ubuntu4.3 | +| libc++-dev | 3.7.0-1ubuntu0.1 | +| libc++abi-dev | 3.7.0-1ubuntu0.1 | +| libcurl3 | 7.47.0-1ubuntu2.18 | +| libgbm-dev | 18.0.5-0ubuntu0~16.04.1 | +| libgconf-2-4 | 3.2.6-3ubuntu6 | +| libgsl-dev | 2.1+dfsg-2 | +| libgtk-3-0 | 3.18.9-1ubuntu3.3 | +| libicu55 | 55.1-7ubuntu0.5 | +| libmagic-dev | 1:5.25-2ubuntu1.4 | +| libmagickcore-dev | 8:6.8.9.9-7ubuntu5.16 | +| libmagickwand-dev | 8:6.8.9.9-7ubuntu5.16 | +| libsecret-1-dev | 0.18.4-1ubuntu2 | +| libsqlite3-dev | 3.11.0-1ubuntu1.5 | +| libunwind8 | 1.1-4.1 | +| libxkbfile-dev | 1:1.0.9-0ubuntu1 | +| libxss1 | 1:1.2.2-1 | +| locales | 2.23-0ubuntu11.2 | +| m4 | 1.4.17-5 | +| mediainfo | 0.7.82-1 | +| net-tools | 1.60-26ubuntu1 | +| netcat | 1.10-41 | +| openssh-client | 1:7.2p2-4ubuntu2.10 | +| p7zip | 9.20.1~dfsg.1-4.2ubuntu0.1 | +| p7zip-full | 9.20.1~dfsg.1-4.2ubuntu0.1 | +| p7zip-rar | 9.20.1~ds.1-4 | +| parallel | 20161222-1~ubuntu0.16.04.1 | +| pass | 1.6.5-3 | +| patchelf | 0.9-1~ubuntu16.04.3 | +| pkg-config | 0.29.1-0ubuntu1 | +| pollinate | 4.33-0ubuntu1~16.04.1 | +| rpm | 4.12.0.1+dfsg1-3build3 | +| rsync | 3.1.1-3ubuntu1.3 | +| shellcheck | 0.3.7-5 | +| sphinxsearch | 2.2.9-1build1 | +| sqlite3 | 3.11.0-1ubuntu1.5 | +| ssh | 1:7.2p2-4ubuntu2.10 | +| subversion | 1.9.3-2ubuntu1.3 | +| sudo | 1.8.16-0ubuntu1.10 | +| swig | 3.0.8-0ubuntu3 | +| telnet | 0.17-40 | +| texinfo | 6.1.0.dfsg.1-5 | +| time | 1.7-25.1 | +| tk | 8.6.0+9 | +| tzdata | 2021a-0ubuntu0.16.04 | +| unzip | 6.0-20ubuntu1.1 | +| upx | 3.91-1 | +| wget | 1.17.1-1ubuntu1.5 | +| xorriso | 1.4.2-4ubuntu1 | +| xvfb | 2:1.18.4-0ubuntu0.11 | +| xz-utils | 5.1.1alpha+20120614-2ubuntu2 | +| yamllint | 1.2.1-1 | +| zip | 3.0-11 | +| zstd | 1.3.1+dfsg-1~ubuntu0.16.04.1 | +| zsync | 0.6.2-1ubuntu1 | From cd5930b52b6bbcfbd28a00b8dd1131349048aba3 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Thu, 1 Apr 2021 15:15:59 +0300 Subject: [PATCH 0115/3485] [ubuntu] suppress tar verbose messages (#3075) --- images/linux/scripts/installers/aliyun-cli.sh | 2 +- images/linux/scripts/installers/aws-sam-cli.sh | 2 +- images/linux/scripts/installers/azcopy.sh | 2 +- images/linux/scripts/installers/git.sh | 2 +- images/linux/scripts/installers/oc.sh | 2 +- images/linux/scripts/installers/oras-cli.sh | 2 +- images/linux/scripts/installers/phantomjs.sh | 2 +- images/linux/scripts/installers/pulumi.sh | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/images/linux/scripts/installers/aliyun-cli.sh b/images/linux/scripts/installers/aliyun-cli.sh index 251834ec6cee..477fcffcb86d 100644 --- a/images/linux/scripts/installers/aliyun-cli.sh +++ b/images/linux/scripts/installers/aliyun-cli.sh @@ -7,7 +7,7 @@ # Install Alibaba Cloud CLI URL=$(curl -s https://api.github.com/repos/aliyun/aliyun-cli/releases/latest | jq -r '.assets[].browser_download_url | select(contains("aliyun-cli-linux"))') wget -P /tmp $URL -tar xzvf /tmp/aliyun-cli-linux-*-amd64.tgz +tar xzf /tmp/aliyun-cli-linux-*-amd64.tgz mv aliyun /usr/local/bin invoke_tests "CLI.Tools" "Aliyun CLI" diff --git a/images/linux/scripts/installers/aws-sam-cli.sh b/images/linux/scripts/installers/aws-sam-cli.sh index b6947ce2a506..cface58d42ee 100644 --- a/images/linux/scripts/installers/aws-sam-cli.sh +++ b/images/linux/scripts/installers/aws-sam-cli.sh @@ -9,7 +9,7 @@ TarballUrl=$(curl -s https://api.github.com/repos/aws/aws-sam-cli/releases/latest | jq -r '.tarball_url') TarballPath="/tmp/aws-sam-cli.tar.gz" wget $TarballUrl -O $TarballPath -tar -xzvf $TarballPath -C /tmp +tar -xzf $TarballPath -C /tmp cd /tmp/aws-aws-sam-cli* mkdir /opt/python-aws-sam-cli diff --git a/images/linux/scripts/installers/azcopy.sh b/images/linux/scripts/installers/azcopy.sh index af5e5916f1c7..e8fc5fe4b883 100644 --- a/images/linux/scripts/installers/azcopy.sh +++ b/images/linux/scripts/installers/azcopy.sh @@ -8,7 +8,7 @@ source $HELPER_SCRIPTS/install.sh # Install AzCopy10 download_with_retries "https://aka.ms/downloadazcopy-v10-linux" "/tmp" "azcopy.tar.gz" -tar zxvf /tmp/azcopy.tar.gz --strip-components=1 -C /tmp +tar xzf /tmp/azcopy.tar.gz --strip-components=1 -C /tmp mv /tmp/azcopy /usr/local/bin/azcopy chmod +x /usr/local/bin/azcopy # Create azcopy 10 alias for backward compatibility diff --git a/images/linux/scripts/installers/git.sh b/images/linux/scripts/installers/git.sh index 316fa08aa468..e620f68f7706 100644 --- a/images/linux/scripts/installers/git.sh +++ b/images/linux/scripts/installers/git.sh @@ -25,7 +25,7 @@ tmp_hub="/tmp/hub" mkdir -p "$tmp_hub" url=$(curl -s https://api.github.com/repos/github/hub/releases/latest | jq -r '.assets[].browser_download_url | select(contains("hub-linux-amd64"))') download_with_retries "$url" "$tmp_hub" -tar xzvf "$tmp_hub"/hub-linux-amd64-*.tgz --strip-components 1 -C "$tmp_hub" +tar xzf "$tmp_hub"/hub-linux-amd64-*.tgz --strip-components 1 -C "$tmp_hub" mv "$tmp_hub"/bin/hub /usr/local/bin # Add well-known SSH host keys to known_hosts diff --git a/images/linux/scripts/installers/oc.sh b/images/linux/scripts/installers/oc.sh index 8330f12fbcbc..0aa39f38f954 100644 --- a/images/linux/scripts/installers/oc.sh +++ b/images/linux/scripts/installers/oc.sh @@ -10,6 +10,6 @@ source $HELPER_SCRIPTS/install.sh DOWNLOAD_URL="https://mirror.openshift.com/pub/openshift-v4/clients/ocp/latest/openshift-client-linux.tar.gz" PACKAGE_TAR_NAME="oc.tar.gz" download_with_retries $DOWNLOAD_URL "/tmp" $PACKAGE_TAR_NAME -tar xvzf "/tmp/$PACKAGE_TAR_NAME" -C "/usr/local/bin" +tar xzf "/tmp/$PACKAGE_TAR_NAME" -C "/usr/local/bin" invoke_tests "CLI.Tools" "OC CLI" \ No newline at end of file diff --git a/images/linux/scripts/installers/oras-cli.sh b/images/linux/scripts/installers/oras-cli.sh index 024228a86f69..37b335594e7f 100644 --- a/images/linux/scripts/installers/oras-cli.sh +++ b/images/linux/scripts/installers/oras-cli.sh @@ -14,6 +14,6 @@ ORAS_CLI_ARCHIVE=$(basename $ORAS_CLI_DOWNLOAD_URL) # Install ORAS CLI cd /tmp download_with_retries $ORAS_CLI_DOWNLOAD_URL -tar -zxvf $ORAS_CLI_ARCHIVE -C /usr/local/bin oras +tar xzf $ORAS_CLI_ARCHIVE -C /usr/local/bin oras invoke_tests "CLI.Tools" "Oras CLI" diff --git a/images/linux/scripts/installers/phantomjs.sh b/images/linux/scripts/installers/phantomjs.sh index 5eb4b291d721..c8b23140871f 100644 --- a/images/linux/scripts/installers/phantomjs.sh +++ b/images/linux/scripts/installers/phantomjs.sh @@ -8,7 +8,7 @@ apt-get install -y chrpath libssl-dev libxft-dev libfreetype6 libfreetype6-dev libfontconfig1 libfontconfig1-dev PHANTOM_JS=phantomjs-2.1.1-linux-x86_64 wget https://bitbucket.org/ariya/phantomjs/downloads/$PHANTOM_JS.tar.bz2 -tar xvjf $PHANTOM_JS.tar.bz2 +tar xjf $PHANTOM_JS.tar.bz2 mv $PHANTOM_JS /usr/local/share ln -sf /usr/local/share/$PHANTOM_JS/bin/phantomjs /usr/local/bin diff --git a/images/linux/scripts/installers/pulumi.sh b/images/linux/scripts/installers/pulumi.sh index 12d5f9ce3e56..e0081349f9e7 100644 --- a/images/linux/scripts/installers/pulumi.sh +++ b/images/linux/scripts/installers/pulumi.sh @@ -11,6 +11,6 @@ source $HELPER_SCRIPTS/install.sh VERSION=$(curl --fail --silent -L "https://www.pulumi.com/latest-version") TARBALL_URL="https://get.pulumi.com/releases/sdk/pulumi-v${VERSION}-linux-x64.tar.gz" download_with_retries ${TARBALL_URL} "/tmp" pulumi-v${VERSION}.tar.gz -tar --strip=1 -xvf /tmp/pulumi-v${VERSION}.tar.gz -C /usr/local/bin +tar --strip=1 -xf /tmp/pulumi-v${VERSION}.tar.gz -C /usr/local/bin invoke_tests "Tools" "Pulumi" From 9e644fc21aa0329ae8ba8a1d7f8f6b204d703616 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 1 Apr 2021 13:44:08 +0000 Subject: [PATCH 0116/3485] Updating readme file for macOS-10.15 version 20210327.1 (#3051) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/macos/macos-10.15-Readme.md | 82 +++++++++++++++--------------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/images/macos/macos-10.15-Readme.md b/images/macos/macos-10.15-Readme.md index 00ffd4cbadcb..e671a9ca8ce7 100644 --- a/images/macos/macos-10.15-Readme.md +++ b/images/macos/macos-10.15-Readme.md @@ -5,7 +5,7 @@ # macOS 10.15 info - System Version: macOS 10.15.7 (19H524) - Kernel Version: Darwin 19.6.0 -- Image Version: 20210314.1 +- Image Version: 20210327.1 ## Installed Software ### Language and Runtime @@ -20,7 +20,7 @@ - GNU Fortran (Homebrew GCC 8.4.0_2) 8.4.0 - available by `gfortran-8` alias - GNU Fortran (Homebrew GCC 9.3.0_1) 9.3.0 - available by `gfortran-9` alias - Go 1.15.10 -- julia 1.5.4 +- julia 1.6.0 - Node.js v14.16.0 - NVM - Cached node versions: v10.24.0 v12.21.0 v14.16.0 - NVM 0.37.2 @@ -32,19 +32,19 @@ - Ruby 2.7.2p137 ### Package Management -- Bundler version 2.2.14 +- Bundler version 2.2.15 - Carthage 0.37.0 - CocoaPods 1.10.1 - Composer 2.0.11 -- Homebrew 3.0.5 +- Homebrew 3.0.9 - Miniconda 4.9.2 - NPM 6.14.11 - NuGet 5.6.0.6489 - Pip 20.3.4 (python 2.7) - Pip 21.0.1 (python 3.9) - Pipx 0.16.1.0 -- RubyGems 3.2.14 -- Vcpkg 2021 (build from master \<75522bb>) +- RubyGems 3.2.15 +- Vcpkg 2021 (build from master \<9f6157a>) - Yarn 1.22.5 #### Environment variables @@ -66,10 +66,10 @@ - bazelisk 1.7.5 - bsdtar 3.3.2 - available by 'tar' alias - Curl 7.75.0 -- Git LFS: 2.13.2 -- Git: 2.30.2 +- Git LFS: 2.13.3 +- Git: 2.31.1 - GitHub CLI: 1.7.0 -- GNU parallel 20201122 +- GNU parallel 20210322 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.1 - gpg (GnuPG) 2.2.27 @@ -79,7 +79,7 @@ - mongo v4.4.3 - mongod v4.4.3 - Newman 5.2.2 -- OpenSSL 1.1.1j 16 Feb 2021 `(/usr/local/opt/openssl -> /usr/local/Cellar/openssl@1.1/1.1.1j)` +- OpenSSL 1.1.1k 25 Mar 2021 `(/usr/local/opt/openssl -> /usr/local/Cellar/openssl@1.1/1.1.1k)` - Packer 1.7.0 - PostgreSQL 13.2 - psql (PostgreSQL) 13.2 @@ -91,21 +91,21 @@ ### Tools - Aliyun CLI 3.0.73 -- App Center CLI 2.7.4 -- AWS CLI 2.1.30 -- AWS SAM CLI 1.20.0 +- App Center CLI 2.8.1 +- AWS CLI 2.1.32 +- AWS SAM CLI 1.21.1 - AWS Session Manager CLI 1.2.30.0 -- Azure CLI 2.20.0 +- Azure CLI 2.21.0 - Cabal 3.4.0.0 -- Cmake 3.19.6 -- Fastlane 2.178.0 +- Cmake 3.20.0 +- Fastlane 2.179.0 - GHC 9.0.1 - GHCup v0.1.14 - Stack 2.5.1 - Xcode Command Line Tools 12.4.0.0.1.1610135815 ### Linters -- SwiftLint 0.43.0 +- SwiftLint 0.43.1 - yamllint 1.26.0 ### Browsers @@ -113,9 +113,9 @@ - SafariDriver 14.0.3 (15610.4.3.1.7) - Google Chrome 89.0.4389.90 - ChromeDriver 89.0.4389.23 -- Microsoft Edge 89.0.774.50 -- MSEdgeDriver 89.0.774.54 -- Mozilla Firefox 86.0.1 +- Microsoft Edge 89.0.774.63 +- MSEdgeDriver 89.0.774.63 +- Mozilla Firefox 87.0 - geckodriver 0.29.0 #### Environment variables @@ -126,13 +126,13 @@ | GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | ### Java -| Version | Vendor | Environment Variable | -| --------- | ------------ | -------------------- | -| 1.8.0_282 | AdoptOpenJDK | JAVA_HOME_8_X64 | -| 11.0.10 | AdoptOpenJDK | JAVA_HOME_11_X64 | -| 12.0.2 | AdoptOpenJDK | JAVA_HOME_12_X64 | -| 13.0.2 | AdoptOpenJDK | JAVA_HOME_13_X64 | -| 14.0.2 | AdoptOpenJDK | JAVA_HOME_14_X64 | +| Version | Vendor | Environment Variable | +| ----------- | ------------- | -------------------- | +| 8.0.282+8 | Adopt OpenJDK | JAVA_HOME_8_X64 | +| 11.0.10+9 | Adopt OpenJDK | JAVA_HOME_11_X64 | +| 12.0.2+10.3 | Adopt OpenJDK | JAVA_HOME_12_X64 | +| 13.0.2+8.1 | Adopt OpenJDK | JAVA_HOME_13_X64 | +| 14.0.2+12 | Adopt OpenJDK | JAVA_HOME_14_X64 | ### Cached Tools #### Ruby @@ -167,9 +167,9 @@ - 1.16.2 ### Rust Tools -- Cargo 1.50.0 -- Rust 1.50.0 -- Rustdoc 1.50.0 +- Cargo 1.51.0 +- Rust 1.51.0 +- Rustdoc 1.51.0 - Rustup 1.23.1 #### Packages @@ -177,8 +177,8 @@ - Cargo-audit 0.14.0 - Cargo-outdated v0.9.14 - Cbindgen 0.18.0 -- Clippy 0.0.212 -- Rustfmt 1.4.30-stable +- Clippy 0.1.51 +- Rustfmt 1.4.36-stable ### PowerShell Tools - PowerShell 7.1.3 @@ -199,10 +199,10 @@ ### Xamarin #### Visual Studio for Mac -- 8.9.1.34 +- 8.9.3.13 #### Mono -- 6.12.0.122 +- 6.12.0.125 - 6.10.0.106 - 6.8.0.123 - 6.6.0.166 @@ -243,7 +243,7 @@ - 6.2.0.47 #### Xamarin.Android -- 11.2.0 +- 11.2.2 - 11.1.0 - 11.0.2 - 10.3.1 @@ -274,7 +274,7 @@ #### Xcode Support Tools - xcpretty 0.3.0 - xcversion 2.6.8 -- Nomad CLI 3.2.14 +- Nomad CLI 3.2.15 - Nomad CLI IPA ipa 0.14.3 - xctool 0.3.7 @@ -368,17 +368,17 @@ | Package Name | Version | | -------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 3.0 | -| Android Emulator | 30.4.5 | +| Android Emulator | 30.5.3 | | Android SDK Build-tools | 30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3
26.0.0 26.0.1 26.0.2 26.0.3
25.0.0 25.0.1 25.0.2 25.0.3
24.0.0 24.0.1 24.0.2 24.0.3 | -| Android SDK Platforms | android-S (rev 1)
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 Platform-Tools | 31.0.0 | +| Android SDK Platforms | android-S (rev 2)
android-30 (rev 3)
android-29 (rev 5)
android-28 (rev 6)
android-27 (rev 3)
android-26 (rev 2)
android-25 (rev 3)
android-24 (rev 2) | +| Android SDK Platform-Tools | 31.0.1 | | Android SDK Tools | 26.1.1 | | Android Support Repository | 47.0.0 | | CMake | 3.10.2 | | Google APIs | addon-google_apis-google-21
addon-google_apis-google-22
addon-google_apis-google-23
addon-google_apis-google-24 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 15.2.4203891
18.1.5063045
21.4.7075529
22.0.7026061 | +| NDK | 15.2.4203891
18.1.5063045
21.4.7075529
22.1.7171670 | | SDK Patch Applier v4 | 1 | #### Environment variables @@ -387,7 +387,7 @@ | ANDROID_HOME | /Users/runner/Library/Android/sdk | | ANDROID_NDK_18R_PATH | /Users/runner/Library/Android/sdk/ndk/18.1.5063045 | | ANDROID_NDK_HOME | /Users/runner/Library/Android/sdk/ndk-bundle -> /Users/runner/Library/Android/sdk/ndk/21.4.7075529 | -| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/22.0.7026061 | +| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/22.1.7171670 | | ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk-bundle -> /Users/runner/Library/Android/sdk/ndk/21.4.7075529 | | ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | From 92c9e67b9fcc8c53cad5b179ad93715fb7cc91db Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 1 Apr 2021 14:37:59 +0000 Subject: [PATCH 0117/3485] Updating readme file for ubuntu20 version 20210330.1 (#3057) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/linux/Ubuntu2004-README.md | 187 +++++++++++++++++++++--------- 1 file changed, 132 insertions(+), 55 deletions(-) diff --git a/images/linux/Ubuntu2004-README.md b/images/linux/Ubuntu2004-README.md index 4611391bc621..43292a6b4366 100644 --- a/images/linux/Ubuntu2004-README.md +++ b/images/linux/Ubuntu2004-README.md @@ -1,21 +1,20 @@ | Announcements | |-| -| [[Ubuntu] jekyll/builder and node8-typescript docker images will be removed from images on March, 22](https://github.com/actions/virtual-environments/issues/2958) | | [[Ubuntu] Clang, GCC and Gfortran versions less than 9.x will be removed from images on March, 29](https://github.com/actions/virtual-environments/issues/2950) | | [[windows, ubuntu] Az, Azure and AzureRM module preinstallation policy will be changed on March, 29th](https://github.com/actions/virtual-environments/issues/2916) | *** # Ubuntu 20.04.2 LTS -- Linux kernel version: 5.4.0-1041-azure -- Image Version: 20210318.0 +- Linux kernel version: 5.4.0-1043-azure +- Image Version: 20210330.1 ## Installed Software ### Language and Runtime - Bash 5.0.17(1)-release -- Clang 8.0.1, 9.0.1, 10.0.0, 11.0.0 +- Clang 9.0.1, 10.0.0, 11.0.0 - Erlang 11.1.7 -- GNU C++ 7.5.0, 8.4.0, 9.3.0, 10.2.0 -- GNU Fortran 8.4.0, 9.3.0, 10.2.0 -- Julia 1.5.4 +- GNU C++ 9.3.0, 10.2.0 +- GNU Fortran 9.3.0, 10.2.0 +- Julia 1.6.0 - Mono 6.12.0.122 - Node 14.16.0 - Perl 5.30.0 @@ -27,14 +26,14 @@ ### Package Management - cpan 1.64 - Helm 3.5.3 -- Homebrew 3.0.7 +- Homebrew 3.0.10 - Miniconda 4.9.2 - Npm 6.14.11 - Pip 20.0.2 - Pip3 20.0.2 - Pipx 0.16.1.0 - RubyGems 3.1.2 -- Vcpkg (build from master \<4987faf>) +- Vcpkg (build from master \<1054567>) - Yarn 1.22.5 #### Environment variables @@ -52,28 +51,28 @@ ### Tools - 7-Zip 16.02 -- Ansible 2.9.6 +- Ansible 2.10.7 - apt-fast 1.9.10 - AzCopy 10.9.0 (available by `azcopy` and `azcopy10` aliases) - Bazel 4.0.0 - Bazelisk 1.7.5 - binutils 2.34 -- Buildah 1.19.8 -- CMake 3.19.7 -- CodeQL Action Bundle 2.4.5 +- Buildah 1.20.0 +- CMake 3.20.0 +- CodeQL Action Bundle 2.5.0 - coreutils 8.30 - curl 7.68.0 -- Docker Compose 1.28.5 +- Docker Compose 1.28.6 - Docker-Buildx 0.5.1 - Docker-Moby Client 20.10.5+azure - Docker-Moby Server 20.10.5+azure -- Fastlane 2.178.0 -- Git 2.31.0 -- Git LFS 2.13.2 +- Fastlane 2.179.0 +- Git 2.31.1 +- Git LFS 2.13.3 - Git-ftp 1.6.0 - Haveged 1.9.1 - Heroku 7.51.0 -- HHVM (HipHop VM) 4.101.0 +- HHVM (HipHop VM) 4.102.0 - jq 1.6 - Kind 0.10.0 - Kubectl 1.20.1-5-g76a04fc @@ -85,18 +84,19 @@ - Minikube 1.18.1 - net-tools 1.60 - Newman 5.2.2 -- nvm 0.37.2 +- nvm 0.38.0 +- OpenSSL 1.1.1f 31 Mar 2020 - Packer 1.7.0 - pass 1.7.3 - PhantomJS 2.1.1 - Podman 3.0.1 -- Pulumi 2.23.1 +- Pulumi 2.23.2 - R 4.0.4 - Skopeo 1.2.2 - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 - Swig 4.0.1 -- Terraform 0.14.8 +- Terraform 0.14.9 - unzip 6.00 - wget 1.20.3 - yamllint 1.26.0 @@ -105,24 +105,24 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.73 -- AWS CLI 2.1.30 +- AWS CLI 2.1.32 - AWS CLI Session manager plugin 1.2.54.0 - AWS SAM CLI 1.21.1 -- Azure CLI (azure-cli) 2.20.0 +- Azure CLI (azure-cli) 2.21.0 - Azure CLI (azure-devops) 0.18.0 - GitHub CLI 1.7.0 -- Google Cloud SDK 332.0.0 +- Google Cloud SDK 333.0.0 - Hub CLI 2.14.2 -- Netlify CLI 3.13.3 -- OpenShift CLI 4.7.2 +- Netlify CLI 3.13.8 +- OpenShift CLI 4.7.4 - ORAS CLI 0.11.1 - Vercel CLI 21.3.3 ### Java -| Version | Vendor | Environment Variable | -| ----------------- | ------------ | -------------------- | -| 1.8.0_282 | AdoptOpenJDK | JAVA_HOME_8_X64 | -| 11.0.10 (default) | AdoptOpenJDK | JAVA_HOME_11_X64 | +| Version | Vendor | Environment Variable | +| ------------------- | ------------- | -------------------- | +| 8.0.282+8 | Adopt OpenJDK | JAVA_HOME_8_X64 | +| 11.0.10+9 (default) | Adopt OpenJDK | JAVA_HOME_11_X64 | ### GraalVM | Version | Environment variables | @@ -143,24 +143,24 @@ - Stack 2.5.1 ### Rust Tools -- Cargo 1.50.0 -- Rust 1.50.0 -- Rustdoc 1.50.0 +- Cargo 1.51.0 +- Rust 1.51.0 +- Rustdoc 1.51.0 - Rustup 1.23.1 #### Packages - Bindgen 0.57.0 - Cargo audit 0.14.0 -- Cargo clippy 0.0.212 +- Cargo clippy 0.1.51 - Cargo outdated 0.9.14 - Cbindgen 0.18.0 -- Rustfmt 1.4.30 +- Rustfmt 1.4.36 ### Browsers and Drivers - Chromium 89.0.4389.90 - Google Chrome 89.0.4389.90 - ChromeDriver 89.0.4389.23 -- Mozilla Firefox 86.0 +- Mozilla Firefox 87.0 - Geckodriver 0.29.0 #### Environment variables @@ -173,7 +173,7 @@ - 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.519 2.1.520 2.1.521 2.1.522 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.616 2.1.617 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 2.1.811 2.1.812 2.1.813 2.1.814 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.109 3.1.110 3.1.111 3.1.112 3.1.113 3.1.200 3.1.201 3.1.202 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 5.0.100 5.0.101 5.0.102 5.0.103 5.0.104 5.0.200 5.0.201 ### Az Module -- 3.8.0 4.8.0 +- 5.5.0 3.1.0.zip 4.4.0.zip ### Databases - MongoDB 4.4.4 @@ -238,10 +238,11 @@ | PSScriptAnalyzer | 1.19.1 | ### Web Servers -| Name | Version | ConfigFile | ServiceStatus | ListenPort | -| ------- | ------- | ------------------------- | ------------- | ---------- | -| apache2 | 2.4.41 | /etc/apache2/apache2.conf | inactive | 80 | -| nginx | 1.18.0 | /etc/nginx/nginx.conf | inactive | 80 | +| Name | Version | ConfigFile | ServiceStatus | ListenPort | +| --------- | ------- | ------------------------- | ------------- | ---------- | +| apache2 | 2.4.41 | /etc/apache2/apache2.conf | inactive | 80 | +| mono-xsp4 | 4.7.1 | /etc/default/mono-xsp4 | active | 8084 | +| nginx | 1.18.0 | /etc/nginx/nginx.conf | inactive | 80 | ### Android | Package Name | Version | @@ -255,7 +256,7 @@ | CMake | 3.10.2 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 21.4.7075529
22.0.7026061 | +| NDK | 21.4.7075529
22.1.7171670 | | SDK Patch Applier v4 | 1 | #### Environment variables @@ -263,29 +264,105 @@ | ----------------------- | ------------------------------------------------------------------------------------ | | ANDROID_HOME | /usr/local/lib/android/sdk | | ANDROID_NDK_HOME | /usr/local/lib/android/sdk/ndk-bundle -> /usr/local/lib/android/sdk/ndk/21.4.7075529 | -| ANDROID_NDK_LATEST_HOME | /usr/local/lib/android/sdk/ndk/22.0.7026061 | +| ANDROID_NDK_LATEST_HOME | /usr/local/lib/android/sdk/ndk/22.1.7171670 | | ANDROID_NDK_ROOT | /usr/local/lib/android/sdk/ndk-bundle -> /usr/local/lib/android/sdk/ndk/21.4.7075529 | | ANDROID_SDK_ROOT | /usr/local/lib/android/sdk | ### Cached Docker images | Repository:Tag | Digest | Created | | ---------------------- | ------------------------------------------------------------------------ | ---------- | -| alpine:3.10 | sha256:0b4d282d7ae7cf5ed91801654a918aea45d6c1de6df0db6a29d60619141fb8de | 2021-02-24 | +| alpine:3.10 | sha256:f2fa517acf6123318bc893c411f34570cea193367b33bd3be1d90c7fbefe72a5 | 2021-03-25 | | alpine:3.7 | sha256:8421d9a84432575381bfabd248f1eb56f3aa21d9d7cd2511583c68c9b7511d10 | 2019-03-07 | | alpine:3.8 | sha256:2bb501e6173d9d006e56de5bce2720eb06396803300fe1687b58a7ff32bf4c14 | 2020-01-23 | | alpine:3.9 | sha256:414e0518bb9228d35e4cd5165567fb91d26c6a214e9c95899e1e056fcd349011 | 2020-04-24 | -| buildpack-deps:buster | sha256:a78316a3d9d366e8f5d80840a2c9ee361c66bf8a7d7d28edd9224ca70f32fd9c | 2021-03-12 | -| buildpack-deps:stretch | sha256:6f928e94e06da507f1d133c26acf70b3807e2bb6d584e5843507511574c3ad6e | 2021-03-12 | -| debian:8 | sha256:6b1960e0a149981c3c115abee6b9e035591fe55533a20a1cd912e636b8df8820 | 2021-03-12 | -| debian:9 | sha256:ca2af3c25b43f185cc86cc2038a217d9b4cdbb4d47adbcfe5d25e04c1d75e1d9 | 2021-03-12 | -| node:10 | sha256:e84df6f7647a1c3993f724c9a0cacdf6b9b2a4ee722b4face9b29f0013634f17 | 2021-03-12 | -| node:10-alpine | sha256:017b55be202b81bd6b4e9f841d5ddeb6df48467ca5cba0c4194015b987f48a60 | 2021-03-12 | -| node:12 | sha256:0ae1a6a3a8a61e2bcf7f826b2562eb865f9a3095acf41bc6f184773ab66f3007 | 2021-03-12 | -| node:12-alpine | sha256:81eec5b1cac69ff6af62097563737b40ac94b605b43d01466c0cf48e220494be | 2021-03-12 | -| ubuntu:14.04 | sha256:63fce984528cec8714c365919882f8fb64c8a3edf23fdfa0b218a2756125456f | 2020-09-16 | +| buildpack-deps:buster | sha256:ff6c309ddf5b2021da0f1bbdde5020be3840113058c50863fc05ba840c4db4b3 | 2021-03-27 | +| buildpack-deps:stretch | sha256:74e5ae35428c523829353a156f34e44e3d9047d97eeb44cff883d7a654214064 | 2021-03-27 | +| debian:8 | sha256:32ad5050caffb2c7e969dac873bce2c370015c2256ff984b70c1c08b3a2816a0 | 2021-03-26 | +| debian:9 | sha256:20fb077345a1c2447b5746ffa3c9623a8eb87c15e8543e2e48387a7224366d88 | 2021-03-26 | +| node:10 | sha256:828fce99d975b94406af6b089ce44904eee7f61b4c9702c71068065472084848 | 2021-03-27 | +| node:10-alpine | sha256:999c6a67a36b8a682491124ddd49ff6585bd61d7c1d150ff2ce088d668250d4f | 2021-03-25 | +| node:12 | sha256:ad1c01aeb58e1fbfb5439eb2b954ab0fcdccd81202f90e6484915222a07d2528 | 2021-03-27 | +| node:12-alpine | sha256:b1b260826bea495c02f35228b37e7b63e50dffc9fca4f9c9a532787a5de978ea | 2021-03-25 | +| ubuntu:14.04 | sha256:4a8a6fa8810a3e01352981b35165b0b28403fe2a4e2535e315b23b4a69cd130a | 2021-03-25 | ### Installed apt packages -- binutils, bison, brotli, build-essential, bzip2, chromium-browser, coreutils, curl, dbus, dnsutils, dpkg, fakeroot, file, flex, ftp, gnupg2, haveged, imagemagick, iproute2, iputils-ping, jq, lib32z1, libc++-11-dev, libc++-dev, libc++abi-11-dev, libc++abi-dev, libcurl4, libgbm-dev, libgconf-2-4, libgsl-dev, libgtk-3-0, libmagic-dev, libmagickcore-dev, libmagickwand-dev, libsecret-1-dev, libsqlite3-dev, libunwind8, libxkbfile-dev, libxss1, locales, m4, mediainfo, net-tools, netcat, openssh-client, p7zip-full, p7zip-rar, parallel, pass, patchelf, pkg-config, pollinate, python-is-python3, rpm, rsync, shellcheck, sphinxsearch, sqlite3, ssh, subversion, sudo, swig, telnet, texinfo, time, tk, tzdata, unzip, upx, wget, xorriso, xvfb, xz-utils, zip, zstd, zsync - +| Name | Version | +| ---------------------- | --------------------------------- | +| acl | 2.2.53-6 | +| binutils | 2.34-6ubuntu1.1 | +| bison | 2:3.5.1+dfsg-1 | +| brotli | 1.0.7-6ubuntu0.1 | +| build-essential | 12.8ubuntu1.1 | +| bzip2 | 1.0.8-2 | +| chromium-browser | 1:85.0.4183.83-0ubuntu0.20.04.2 | +| coreutils | 8.30-3ubuntu2 | +| curl | 7.68.0-1ubuntu2.4 | +| dbus | 1.12.16-2ubuntu2.1 | +| dnsutils | 1:9.16.1-0ubuntu2.7 | +| dpkg | 1.19.7ubuntu3 | +| fakeroot | 1.24-1 | +| file | 1:5.38-4 | +| flex | 2.6.4-6.2 | +| fonts-noto-color-emoji | 0~20200408-1 | +| ftp | 0.17-34.1 | +| gnupg2 | 2.2.19-3ubuntu2.1 | +| haveged | 1.9.1-6ubuntu1 | +| imagemagick | 8:6.9.10.23+dfsg-2.1ubuntu11.2 | +| iproute2 | 5.5.0-1ubuntu1 | +| iputils-ping | 3:20190709-3 | +| jq | 1.6-1ubuntu0.20.04.1 | +| lib32z1 | 1:1.2.11.dfsg-2ubuntu1.2 | +| libc++-dev | 1:10.0-50~exp1 | +| libc++abi-dev | 1:10.0-50~exp1 | +| libcurl4 | 7.68.0-1ubuntu2.4 | +| libgbm-dev | 20.2.6-0ubuntu0.20.04.1 | +| libgconf-2-4 | 3.2.6-6ubuntu1 | +| libgsl-dev | 2.5+dfsg-6build1 | +| libgtk-3-0 | 3.24.20-0ubuntu1 | +| libmagic-dev | 1:5.38-4 | +| libmagickcore-dev | 8:6.9.10.23+dfsg-2.1ubuntu11.2 | +| libmagickwand-dev | 8:6.9.10.23+dfsg-2.1ubuntu11.2 | +| libsecret-1-dev | 0.20.3-0ubuntu1 | +| libsqlite3-dev | 3.31.1-4ubuntu0.2 | +| libunwind8 | 1.2.1-9build1 | +| libxkbfile-dev | 1:1.1.0-1 | +| libxss1 | 1:1.2.3-1 | +| locales | 2.31-0ubuntu9.2 | +| m4 | 1.4.18-4 | +| mediainfo | 19.09-1build1 | +| net-tools | 1.60+git20180626.aebd88e-1ubuntu1 | +| netcat | 1.206-1ubuntu1 | +| openssh-client | 1:8.2p1-4ubuntu0.2 | +| p7zip-full | 16.02+dfsg-7build1 | +| p7zip-rar | 16.02-3build1 | +| parallel | 20161222-1.1 | +| pass | 1.7.3-2 | +| patchelf | 0.10-2build1 | +| pkg-config | 0.29.1-0ubuntu4 | +| pollinate | 4.33-3ubuntu1.20.04.1 | +| python-is-python3 | 3.8.2-4 | +| rpm | 4.14.2.1+dfsg1-1build2 | +| rsync | 3.1.3-8 | +| shellcheck | 0.7.0-2build2 | +| sphinxsearch | 2.2.11-2ubuntu2 | +| sqlite3 | 3.31.1-4ubuntu0.2 | +| ssh | 1:8.2p1-4ubuntu0.2 | +| subversion | 1.13.0-3 | +| sudo | 1.8.31-1ubuntu1.2 | +| swig | 4.0.1-5build1 | +| telnet | 0.17-41.2build1 | +| texinfo | 6.7.0.dfsg.2-5 | +| time | 1.7-25.1build1 | +| tk | 8.6.9+1 | +| tzdata | 2021a-0ubuntu0.20.04 | +| unzip | 6.0-25ubuntu1 | +| upx | 3.95-2build1 | +| wget | 1.20.3-1ubuntu1 | +| xorriso | 1.5.2-1 | +| xvfb | 2:1.20.9-2ubuntu1.2~20.04.1 | +| xz-utils | 5.2.4-1ubuntu1 | +| zip | 3.0-11build1 | +| zstd | 1.4.4+dfsg-3ubuntu0.1 | +| zsync | 0.6.2-3ubuntu1 | From b3c93d65df0b147e756234b376c898ef1be17452 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 2 Apr 2021 06:09:23 +0000 Subject: [PATCH 0118/3485] Updating readme file for win16 version 20210329.1 (#3059) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/win/Windows2016-Readme.md | 103 +++++++++++++++---------------- 1 file changed, 51 insertions(+), 52 deletions(-) diff --git a/images/win/Windows2016-Readme.md b/images/win/Windows2016-Readme.md index fbac81292106..fd995ef572ee 100644 --- a/images/win/Windows2016-Readme.md +++ b/images/win/Windows2016-Readme.md @@ -1,34 +1,33 @@ | Announcements | |-| -| [[ubuntu, windows] GOROOT environment variable will be removed on March, 1](https://github.com/actions/virtual-environments/issues/2683) | -| [[Windows, Ubuntu] Boost 1.72.0 will be removed from images on March, 8](https://github.com/actions/virtual-environments/issues/2667) | +| [[windows, ubuntu] Az, Azure and AzureRM module preinstallation policy will be changed on March, 29th](https://github.com/actions/virtual-environments/issues/2916) | *** # Microsoft Windows Server 2016 Datacenter -- OS Version: 10.0.14393 Build 4225 -- Image Version: 20210309.0 +- OS Version: 10.0.14393 Build 4283 +- Image Version: 20210329.1 ## Installed Software ### Language and Runtime - Bash 4.4.23(1)-release -- Go 1.15.8 -- Julia 1.5.3 +- Go 1.15.10 +- Julia 1.5.4 - Node 14.16.0 - Perl 5.32.1 -- PHP 8.0.1 +- PHP 8.0.3 - Python 3.7.9 - Ruby 2.5.8p224 ### Package Management - Chocolatey 0.10.15 - Composer 2.0.11 -- Helm 3.5.2 +- Helm 3.5.3 - Miniconda 4.9.2 - NPM 6.14.11 - NuGet 5.8.1.7021 - pip 21.0.1 (python 3.7) - Pipx 0.16.1.0 - RubyGems 2.7.6.2 -- Vcpkg (build from master \<8010840>) +- Vcpkg (build from master \<1054567>) - Yarn 1.22.10 #### Environment variables @@ -41,7 +40,7 @@ - Ant 1.10.9 - Gradle 6.8 - Maven 3.6.3 -- sbt 1.4.8 +- sbt 1.4.9 ### Tools - 7zip 19.00 @@ -49,39 +48,39 @@ - Bazel 4.0.0 - Bazelisk 1.7.5 - Cabal 3.4.0.0 -- CMake 3.19.6 -- CodeQL Action Bundle 2.4.5 -- Docker 19.03.14 +- CMake 3.20.0 +- CodeQL Action Bundle 2.5.0 +- Docker 20.10.0 - Docker-compose 1.28.5 - ghc 9.0.1 -- Git 2.30.2 +- Git 2.31.0 - Git LFS 2.13.2 -- Google Cloud SDK 331.0.0 +- Google Cloud SDK 333.0.0 - InnoSetup 6.1.2 - jq 1.6 - Kind 0.10.0 -- Kubectl 1.20.4 +- Kubectl 1.20.5 - Mercurial 5.0 - Mingw-w64 8.1.0 - Newman 5.2.2 - NSIS v3.06.1 - OpenSSL 1.1.1 - Packer 1.7.0 -- Pulumi v2.22.0 +- Pulumi 2.23.1 - R 4.0.4 - Stack 2.5.1 - Subversion (SVN) 1.14.1 - VSWhere 2.8.4 - WinAppDriver 1.2.2009.02003 - yamllint 1.26.0 -- zstd 1.4.5 +- zstd 1.4.9 ### CLI Tools - Alibaba Cloud CLI 3.0.73 -- AWS CLI 2.1.28 -- AWS SAM CLI 1.20.0 +- AWS CLI 2.1.29 +- AWS SAM CLI 1.21.1 - AWS Session Manager CLI 1.2.54.0 -- Azure CLI 2.20.0 +- Azure CLI 2.21.0 - Azure Dev Spaces CLI 1.0.20201219.2 - Azure DevOps CLI extension 0.18.0 - Cloud Foundry CLI 6.53.0 @@ -89,9 +88,9 @@ - Hub CLI 2.14.2 ### Rust Tools -- Cargo 1.50.0 -- Rust 1.50.0 -- Rustdoc 1.50.0 +- Cargo 1.51.0 +- Rust 1.51.0 +- Rustdoc 1.51.0 - Rustup 1.23.1 #### Packages @@ -99,15 +98,15 @@ - cargo-audit 0.14.0 - cargo-outdated v0.9.14 - cbindgen 0.18.0 -- Clippy 0.0.212 -- Rustfmt 1.4.30 +- Clippy 0.1.51 +- Rustfmt 1.4.36 ### Browsers and webdrivers -- Google Chrome 89.0.4389.82 +- Google Chrome 89.0.4389.90 - Chrome Driver 89.0.4389.23 -- Microsoft Edge 89.0.774.50 -- Microsoft Edge Driver 89.0.774.48 -- Mozilla Firefox 86.0 +- Microsoft Edge 89.0.774.63 +- Microsoft Edge Driver 89.0.774.63 +- Mozilla Firefox 87.0 - Gecko Driver 0.29.0 - IE Driver 3.150.1.0 @@ -119,11 +118,11 @@ | GECKOWEBDRIVER | C:\SeleniumWebDrivers\GeckoDriver | ### Java -| Version | Vendor | Environment Variable | -| ------------------- | ------------ | -------------------- | -| 1.8.0_282 (default) | AdoptOpenJDK | JAVA_HOME_8_X64 | -| 11.0.10 | AdoptOpenJDK | JAVA_HOME_11_X64 | -| 13.0.2 | AdoptOpenJDK | JAVA_HOME_13_X64 | +| Version | Vendor | Environment Variable | +| ------------------- | ------------- | -------------------- | +| 8.0.282+8 (default) | Adopt OpenJDK | JAVA_HOME_8_X64 | +| 11.0.10+9 | Adopt OpenJDK | JAVA_HOME_11_X64 | +| 13.0.2+8.1 | Adopt OpenJDK | JAVA_HOME_13_X64 | ### Shells | Name | Target | @@ -145,8 +144,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | ------- | ------------ | -------------------- | | 1.13.15 | x64 | GOROOT_1_13_X64 | | 1.14.15 | x64 | GOROOT_1_14_X64 | -| 1.15.8 (Default) | x64 | GOROOT_1_15_X64 | -| 1.16.0 | x64 | GOROOT_1_16_X64 | +| 1.15.10 (Default) | x64 | GOROOT_1_15_X64 | +| 1.16.2 | x64 | GOROOT_1_16_X64 | #### Node @@ -486,10 +485,10 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft Visual C++ 2013 Minimum Runtime | x86 | 12.0.21005 | | Microsoft Visual C++ 2017 Debug Runtime | x64 | 14.16.27033 | | Microsoft Visual C++ 2017 Debug Runtime | x86 | 14.16.27033 | -| Microsoft Visual C++ 2019 Additional Runtime | x64 | 14.28.29910 | -| Microsoft Visual C++ 2019 Minimum Runtime | x64 | 14.28.29910 | -| Microsoft Visual C++ 2019 Additional Runtime | x86 | 14.28.29910 | -| Microsoft Visual C++ 2019 Minimum Runtime | x86 | 14.28.29910 | +| Microsoft Visual C++ 2019 Additional Runtime | x64 | 14.28.29913 | +| Microsoft Visual C++ 2019 Minimum Runtime | x64 | 14.28.29913 | +| Microsoft Visual C++ 2019 Additional Runtime | x86 | 14.28.29913 | +| Microsoft Visual C++ 2019 Minimum Runtime | x86 | 14.28.29913 | ### .NET Core SDK `Location C:\Program Files\dotnet\sdk` @@ -514,14 +513,14 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 4.6.1 4.6.2 4.7 4.7.1 4.7.2 4.8 ### PowerShell Tools -- PowerShell 7.1.2 +- PowerShell 7.1.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
4.7.0
5.5.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.zip
1.6.0.zip
2.3.2.zip
2.6.0.zip
3.1.0.zip
3.5.0.zip
3.8.0.zip
4.3.0.zip
4.4.0.zip
4.6.0.zip
4.7.0.zip
5.5.0 | C:\Modules\az_\ | +| Azure | 3.8.0.zip
4.2.1.zip
5.1.1.zip
2.1.0 [Installed]
5.3.0 | C:\Modules\azure_\ | +| AzureRM | 3.8.0.zip
4.2.1.zip
5.1.1.zip
6.7.0.zip
2.1.0 [Installed]
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'. @@ -536,7 +535,7 @@ All other versions are saved but not installed. | PowerShellGet | 1.0.0.1
2.2.5 | | PSScriptAnalyzer | 1.19.1 | | PSWindowsUpdate | 2.2.0.2 | -| SqlServer | 21.1.18235 | +| SqlServer | 21.1.18245 | | VSSetup | 2.2.16 | ### Android @@ -544,15 +543,15 @@ All other versions are saved but not installed. | -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 3.0 | | Android SDK Build-tools | 30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3
26.0.0 26.0.1 26.0.2 26.0.3
25.0.0 25.0.1 25.0.2 25.0.3
24.0.0 24.0.1 24.0.2 24.0.3
23.0.1 23.0.2 23.0.3
22.0.1
21.1.2
20.0.0
19.1.0 | -| Android SDK Platforms | android-S (rev 1)
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 Platform-Tools | 31.0.0 | +| Android SDK Platforms | android-S (rev 2)
android-30 (rev 3)
android-29 (rev 5)
android-28 (rev 6)
android-27 (rev 3)
android-26 (rev 2)
android-25 (rev 3)
android-24 (rev 2)
android-23 (rev 3)
android-22 (rev 2)
android-21 (rev 2)
android-20 (rev 2)
android-19 (rev 4) | +| Android SDK Platform-Tools | 31.0.1 | | Android SDK Tools | 25.2.5 | | Android Support Repository | 47.0.0 | | CMake | 3.10.2 | | Google APIs | addon-g..._apis-google-21
addon-g..._apis-google-22
addon-g..._apis-google-23
addon-g..._apis-google-24
a...google_apis | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 21.4.7075529
22.0.7026061 | +| NDK | 21.4.7075529
22.1.7171670 | | SDK Patch Applier v4 | 1 | #### Environment variables @@ -560,7 +559,7 @@ All other versions are saved but not installed. | ----------------------- | ---------------------------------------------------------------------------- | | ANDROID_HOME | C:\Android\android-sdk | | ANDROID_NDK_HOME | C:\Android\android-sdk\ndk-bundle -> C:\Android\android-sdk\ndk\21.4.7075529 | -| ANDROID_NDK_LATEST_HOME | C:\Android\android-sdk\ndk\22.0.7026061 | +| ANDROID_NDK_LATEST_HOME | C:\Android\android-sdk\ndk\22.1.7171670 | | ANDROID_NDK_PATH | C:\Android\android-sdk\ndk-bundle -> C:\Android\android-sdk\ndk\21.4.7075529 | | ANDROID_NDK_ROOT | C:\Android\android-sdk\ndk-bundle -> C:\Android\android-sdk\ndk\21.4.7075529 | | ANDROID_SDK_ROOT | C:\Android\android-sdk | From 8472c0699be06f077a92a493c51317eacba787e4 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Fri, 2 Apr 2021 11:17:15 +0300 Subject: [PATCH 0119/3485] Remove warmup deprecation for Ubuntu images (#3076) --- .../scripts/installers/dotnetcore-sdk.sh | 25 ------------------- 1 file changed, 25 deletions(-) diff --git a/images/linux/scripts/installers/dotnetcore-sdk.sh b/images/linux/scripts/installers/dotnetcore-sdk.sh index 229bfb8e6940..b2b6d0e60575 100644 --- a/images/linux/scripts/installers/dotnetcore-sdk.sh +++ b/images/linux/scripts/installers/dotnetcore-sdk.sh @@ -12,21 +12,6 @@ source $HELPER_SCRIPTS/os.sh LATEST_DOTNET_PACKAGES=$(get_toolset_value '.dotnet.aptPackages[]') DOTNET_VERSIONS=$(get_toolset_value '.dotnet.versions[]') -mksamples() -{ - sdk=$1 - sample=$2 - mkdir "$sdk" - cd "$sdk" || exit - dotnet new globaljson --sdk-version "$sdk" - dotnet new "$sample" - dotnet restore - dotnet build - set +e - cd .. || exit - rm -rf "$sdk" -} - # Disable telemetry export DOTNET_CLI_TELEMETRY_OPTOUT=1 @@ -74,16 +59,6 @@ parallel --jobs 0 --halt soon,fail=1 \ find . -name "*.tar.gz" | parallel --halt soon,fail=1 'extract_dotnet_sdk {}' -# Smoke test each SDK -for sdk in $sortedSdks; do - mksamples "$sdk" "console" - mksamples "$sdk" "mstest" - mksamples "$sdk" "xunit" - mksamples "$sdk" "web" - mksamples "$sdk" "mvc" - mksamples "$sdk" "webapi" -done - # NuGetFallbackFolder at /usr/share/dotnet/sdk/NuGetFallbackFolder is warmed up by smoke test # Additional FTE will just copy to ~/.dotnet/NuGet which provides no benefit on a fungible machine setEtcEnvironmentVariable DOTNET_SKIP_FIRST_TIME_EXPERIENCE 1 From 3195add3cdc31759b7f2999b84192c703f2fb620 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Fri, 2 Apr 2021 14:38:54 +0300 Subject: [PATCH 0120/3485] [Ubuntu] Add clang-format to the readme (#3081) * Add clang-format to the readme * Create a function to retrieve clang tool versions * Add ClangFormatVersions to software report * Add new line * Resolve nitpicks --- .../SoftwareReport/SoftwareReport.Common.psm1 | 33 ++++++++++++++----- .../SoftwareReport.Generator.ps1 | 1 + 2 files changed, 26 insertions(+), 8 deletions(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 index 89a07dcff2af..55062b38a085 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 @@ -20,19 +20,36 @@ function Get-FortranVersions { return "GNU Fortran " + ($fortranVersions -Join ", ") } -function Get-ClangVersions { - $clangVersions = @() +function Get-ClangToolVersions { + param ( + [Parameter(Mandatory = $true)] + [string] $ToolName, + [string] $VersionPattern = "\d+\.\d+\.\d+)-" + ) + $result = Get-CommandResult "apt list --installed" -Multiline - $clangVersions = $result.Output | Where-Object { $_ -match "^clang-\d+"} | ForEach-Object { + $toolVersions = $result.Output | Where-Object { $_ -match "^${ToolName}-\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 + Invoke-Expression "$clangCommand --version" | Where-Object { $_ -match "${ToolName} version" } | ForEach-Object { + $_ -match "${ToolName} version (?${VersionPattern}" | Out-Null $Matches.version - } - } | Sort-Object {[Version]$_} - return "Clang " + ($clangVersions -Join ", ") + } + } | Sort-Object {[Version]$_} + + return $toolVersions -Join ", " } +function Get-ClangVersions { + $clangVersions = Get-ClangToolVersions -ToolName "clang" + return "Clang " + $clangVersions +} + +function Get-ClangFormatVersions { + $clangFormatVersions = Get-ClangToolVersions -ToolName "clang-format" + return "Clang-format " + $clangFormatVersions +} + + function Get-ErlangVersion { $erlangVersion = (erl -eval '{ok, Version} = file:read_file(filename:join([code:root_dir(), "releases", erlang:system_info(otp_release), ''OTP_VERSION''])), io:fwrite(Version), halt().' -noshell) $shellVersion = (erl -eval 'erlang:display(erlang:system_info(version)), halt().' -noshell).Trim('"') diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index 2559ebc08078..1af995541ba6 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -40,6 +40,7 @@ $markdown += New-MDList -Style Unordered -Lines (@( (Get-CPPVersions), (Get-FortranVersions), (Get-ClangVersions), + (Get-ClangFormatVersions), (Get-ErlangVersion), (Get-MonoVersion), (Get-NodeVersion), From 0917a07677fee891a92522d1c4f74f865d025dcb Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Fri, 2 Apr 2021 17:53:08 +0300 Subject: [PATCH 0121/3485] [windows] set ascii encoding (#3086) --- images/win/scripts/Installers/Configure-Shell.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/win/scripts/Installers/Configure-Shell.ps1 b/images/win/scripts/Installers/Configure-Shell.ps1 index 659ae0fd0ceb..f3487fe9e67c 100644 --- a/images/win/scripts/Installers/Configure-Shell.ps1 +++ b/images/win/scripts/Installers/Configure-Shell.ps1 @@ -10,7 +10,7 @@ IF NOT DEFINED MSYS2_PATH_TYPE set MSYS2_PATH_TYPE=strict IF NOT DEFINED MSYSTEM set MSYSTEM=mingw64 set CHERE_INVOKING=1 C:\msys64\usr\bin\bash.exe -leo pipefail %* -'@ | Out-File -FilePath "$shellPath\msys2bash.cmd" +'@ | Out-File -FilePath "$shellPath\msys2bash.cmd" -Encoding ascii # gitbash <--> C:\Program Files\Git\bin\bash.exe New-Item -ItemType SymbolicLink -Path "$shellPath\gitbash.exe" -Target "$env:ProgramFiles\Git\bin\bash.exe" | Out-Null From be27ebfdb31aece2c90fbe1984c1749cbd1b464c Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Fri, 2 Apr 2021 18:47:50 +0300 Subject: [PATCH 0122/3485] [ubuntu] replace wget to download_with_retries helper (#3087) --- images/linux/scripts/installers/aliyun-cli.sh | 5 ++++- images/linux/scripts/installers/android.sh | 2 +- images/linux/scripts/installers/aws-sam-cli.sh | 5 ++++- images/linux/scripts/installers/clang.sh | 2 +- images/linux/scripts/installers/containers.sh | 2 +- images/linux/scripts/installers/erlang.sh | 2 +- images/linux/scripts/installers/firefox.sh | 9 +++++---- images/linux/scripts/installers/github-cli.sh | 8 +++++--- images/linux/scripts/installers/java-tools.sh | 2 +- images/linux/scripts/installers/phantomjs.sh | 8 +++++--- images/linux/scripts/installers/selenium.sh | 5 ++++- 11 files changed, 32 insertions(+), 18 deletions(-) diff --git a/images/linux/scripts/installers/aliyun-cli.sh b/images/linux/scripts/installers/aliyun-cli.sh index 477fcffcb86d..fd9737caa73f 100644 --- a/images/linux/scripts/installers/aliyun-cli.sh +++ b/images/linux/scripts/installers/aliyun-cli.sh @@ -4,9 +4,12 @@ ## Desc: Installs Alibaba Cloud CLI ################################################################################ +# Source the helpers for use with the script +source $HELPER_SCRIPTS/install.sh + # Install Alibaba Cloud CLI URL=$(curl -s https://api.github.com/repos/aliyun/aliyun-cli/releases/latest | jq -r '.assets[].browser_download_url | select(contains("aliyun-cli-linux"))') -wget -P /tmp $URL +download_with_retries $URL "/tmp" tar xzf /tmp/aliyun-cli-linux-*-amd64.tgz mv aliyun /usr/local/bin diff --git a/images/linux/scripts/installers/android.sh b/images/linux/scripts/installers/android.sh index b163d7a574ba..af2a218ce0a5 100644 --- a/images/linux/scripts/installers/android.sh +++ b/images/linux/scripts/installers/android.sh @@ -51,7 +51,7 @@ mkdir -p ${ANDROID_SDK_ROOT} # Download the latest command line tools so that we can accept all of the licenses. # See https://developer.android.com/studio/#command-tools -wget -O android-sdk.zip https://dl.google.com/android/repository/sdk-tools-linux-4333796.zip +download_with_retries https://dl.google.com/android/repository/sdk-tools-linux-4333796.zip "." android-sdk.zip unzip -qq android-sdk.zip -d ${ANDROID_SDK_ROOT} rm -f android-sdk.zip diff --git a/images/linux/scripts/installers/aws-sam-cli.sh b/images/linux/scripts/installers/aws-sam-cli.sh index cface58d42ee..4fbaa36ec1bd 100644 --- a/images/linux/scripts/installers/aws-sam-cli.sh +++ b/images/linux/scripts/installers/aws-sam-cli.sh @@ -5,10 +5,13 @@ ## Requires Python >=3.6, must be run as non-root user after toolset installation ################################################################################ +# Source the helpers for use with the script +source $HELPER_SCRIPTS/install.sh + # Download latest aws sam cli sources TarballUrl=$(curl -s https://api.github.com/repos/aws/aws-sam-cli/releases/latest | jq -r '.tarball_url') TarballPath="/tmp/aws-sam-cli.tar.gz" -wget $TarballUrl -O $TarballPath +download_with_retries $TarballUrl "/tmp" "aws-sam-cli.tar.gz" tar -xzf $TarballPath -C /tmp cd /tmp/aws-aws-sam-cli* diff --git a/images/linux/scripts/installers/clang.sh b/images/linux/scripts/installers/clang.sh index 5f9138eba8ba..4e8ff01f1b1c 100644 --- a/images/linux/scripts/installers/clang.sh +++ b/images/linux/scripts/installers/clang.sh @@ -30,7 +30,7 @@ function SetDefaultClang { } # Download script for automatic installation -wget https://apt.llvm.org/llvm.sh +download_with_retries https://apt.llvm.org/llvm.sh chmod +x llvm.sh versions=$(get_toolset_value '.clang.versions[]') diff --git a/images/linux/scripts/installers/containers.sh b/images/linux/scripts/installers/containers.sh index 3ae559f68348..65adc22cefd1 100644 --- a/images/linux/scripts/installers/containers.sh +++ b/images/linux/scripts/installers/containers.sh @@ -8,7 +8,7 @@ install_packages=(podman buildah skopeo) source /etc/os-release sh -c "echo 'deb https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/x${NAME}_${VERSION_ID}/ /' > /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list" -wget -nv https://download.opensuse.org/repositories/devel:kubic:libcontainers:stable/x${NAME}_${VERSION_ID}/Release.key -O Release.key +wget -qnv https://download.opensuse.org/repositories/devel:kubic:libcontainers:stable/x${NAME}_${VERSION_ID}/Release.key -O Release.key apt-key add Release.key apt-get update -qq apt-get -qq -y install ${install_packages[@]} diff --git a/images/linux/scripts/installers/erlang.sh b/images/linux/scripts/installers/erlang.sh index 458f7fa00282..b65b545aeea0 100644 --- a/images/linux/scripts/installers/erlang.sh +++ b/images/linux/scripts/installers/erlang.sh @@ -8,7 +8,7 @@ source_list=/etc/apt/sources.list.d/eslerlang.list # Install Erlang echo "deb https://binaries.erlang-solutions.com/debian $(lsb_release -cs) contrib" > $source_list -wget -O - https://binaries.erlang-solutions.com/debian/erlang_solutions.asc | apt-key add - +wget -q -O - https://binaries.erlang-solutions.com/debian/erlang_solutions.asc | apt-key add - apt-get update apt-get install -y --no-install-recommends esl-erlang diff --git a/images/linux/scripts/installers/firefox.sh b/images/linux/scripts/installers/firefox.sh index 6c4c6c2839d4..d7fe92dce9de 100644 --- a/images/linux/scripts/installers/firefox.sh +++ b/images/linux/scripts/installers/firefox.sh @@ -4,6 +4,9 @@ ## Desc: Installs Firefox ################################################################################ +# Source the helpers for use with the script +source $HELPER_SCRIPTS/install.sh + # Install Firefox apt-get install -y firefox @@ -14,15 +17,13 @@ echo 'pref("intl.locale.requested","en_US");' >> "/usr/lib/firefox/browser/defau # Download and unpack latest release of geckodriver URL=$(curl -s https://api.github.com/repos/mozilla/geckodriver/releases/latest | jq -r '.assets[].browser_download_url | select(test("linux64.tar.gz$"))') echo "Downloading geckodriver $URL" -wget "$URL" -O geckodriver.tar.gz -tar -xzf geckodriver.tar.gz -rm geckodriver.tar.gz +download_with_retries "$URL" "/tmp" geckodriver.tar.gz GECKODRIVER_DIR="/usr/local/share/gecko_driver" GECKODRIVER_BIN="$GECKODRIVER_DIR/geckodriver" mkdir -p $GECKODRIVER_DIR -mv "geckodriver" $GECKODRIVER_BIN +tar -xzf /tmp/geckodriver.tar.gz -C $GECKODRIVER_DIR chmod +x $GECKODRIVER_BIN ln -s "$GECKODRIVER_BIN" /usr/bin/ diff --git a/images/linux/scripts/installers/github-cli.sh b/images/linux/scripts/installers/github-cli.sh index baa614bcc555..02f98daffe1a 100644 --- a/images/linux/scripts/installers/github-cli.sh +++ b/images/linux/scripts/installers/github-cli.sh @@ -5,10 +5,12 @@ ## Must be run as non-root user after homebrew ################################################################################ +# Source the helpers for use with the script +source $HELPER_SCRIPTS/install.sh + # Install GitHub CLI url=$(curl -s https://api.github.com/repos/cli/cli/releases/latest | jq -r '.assets[].browser_download_url|select(contains("linux") and contains("amd64") and contains(".deb"))') -wget $url -apt install ./gh_*_linux_amd64.deb -rm gh_*_linux_amd64.deb +download_with_retries $url "/tmp" +apt install /tmp/gh_*_linux_amd64.deb invoke_tests "CLI.Tools" "GitHub CLI" diff --git a/images/linux/scripts/installers/java-tools.sh b/images/linux/scripts/installers/java-tools.sh index 8c97946db63b..26ae16c1239d 100644 --- a/images/linux/scripts/installers/java-tools.sh +++ b/images/linux/scripts/installers/java-tools.sh @@ -71,7 +71,7 @@ ln -s /usr/share/apache-maven-3.6.3/bin/mvn /usr/bin/mvn # The release download URL looks like this: https://services.gradle.org/distributions/gradle-5.2.1-bin.zip # The release version is extracted from the download URL (i.e. 5.2.1). # After all of this, the release is downloaded, extracted, a symlink is created that points to it, and GRADLE_HOME is set. -wget -O gradleReleases.html https://gradle.org/releases/ +wget -qO gradleReleases.html https://gradle.org/releases/ gradleUrl=$(grep -m 1 -o "https:\/\/services.gradle.org\/distributions\/gradle-.*-bin\.zip" gradleReleases.html | head -1) gradleVersion=$(echo $gradleUrl | sed -nre 's/^[^0-9]*(([0-9]+\.)*[0-9]+).*/\1/p') rm gradleReleases.html diff --git a/images/linux/scripts/installers/phantomjs.sh b/images/linux/scripts/installers/phantomjs.sh index c8b23140871f..0708810f2b4c 100644 --- a/images/linux/scripts/installers/phantomjs.sh +++ b/images/linux/scripts/installers/phantomjs.sh @@ -4,12 +4,14 @@ ## Desc: Installs PhantomJS ################################################################################ +# Source the helpers for use with the script +source $HELPER_SCRIPTS/install.sh + # Install PhantomJS apt-get install -y chrpath libssl-dev libxft-dev libfreetype6 libfreetype6-dev libfontconfig1 libfontconfig1-dev PHANTOM_JS=phantomjs-2.1.1-linux-x86_64 -wget https://bitbucket.org/ariya/phantomjs/downloads/$PHANTOM_JS.tar.bz2 -tar xjf $PHANTOM_JS.tar.bz2 -mv $PHANTOM_JS /usr/local/share +download_with_retries https://bitbucket.org/ariya/phantomjs/downloads/$PHANTOM_JS.tar.bz2 "/tmp" +tar xjf /tmp/$PHANTOM_JS.tar.bz2 -C /usr/local/share ln -sf /usr/local/share/$PHANTOM_JS/bin/phantomjs /usr/local/bin invoke_tests "Tools" "Phantomjs" diff --git a/images/linux/scripts/installers/selenium.sh b/images/linux/scripts/installers/selenium.sh index 55d436a53f71..85330be66456 100644 --- a/images/linux/scripts/installers/selenium.sh +++ b/images/linux/scripts/installers/selenium.sh @@ -4,6 +4,9 @@ ## Desc: Installs selenium server ################################################################################ +# Source the helpers for use with the script +source $HELPER_SCRIPTS/install.sh + # Determine latest selenium standalone server version SELENIUM_LATEST_VERSION_URL=https://api.github.com/repos/SeleniumHQ/selenium/releases/latest SELENIUM_VERSION=$(curl $SELENIUM_LATEST_VERSION_URL | jq '.name' | tr -d '"' | cut -d ' ' -f 2) @@ -12,7 +15,7 @@ SELENIUM_VERSION_MAJOR_MINOR=$(echo $SELENIUM_VERSION | cut -d '.' -f 1,2) # Download selenium standalone server echo "Downloading selenium-server-standalone v$SELENIUM_VERSION..." SELENIUM_JAR_NAME="selenium-server-standalone-$SELENIUM_VERSION.jar" -wget https://selenium-release.storage.googleapis.com/$SELENIUM_VERSION_MAJOR_MINOR/$SELENIUM_JAR_NAME +download_with_retries https://selenium-release.storage.googleapis.com/$SELENIUM_VERSION_MAJOR_MINOR/$SELENIUM_JAR_NAME SELENIUM_JAR_PATH="/usr/share/java/selenium-server-standalone.jar" mv $SELENIUM_JAR_NAME $SELENIUM_JAR_PATH From b7f276c003aea42575b52247bdb2183e355fca2f Mon Sep 17 00:00:00 2001 From: Nikita Bykov <49442273+nikita-bykov@users.noreply.github.com> Date: Fri, 2 Apr 2021 19:21:33 +0300 Subject: [PATCH 0123/3485] =?UTF-8?q?[Ubuntu]=20Rework=20=D0=A1hromium=20i?= =?UTF-8?q?nstallation=20to=20avoid=20using=20snap=20(#3029)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * rework chromium installation * added GetChromiumRevision function * changed getting chrome version * fixed GetChromiumRevision function * fixed CHROME_VERSION variable * move chromium installation to google-chrome.sh * added -qq for unzip * added comments to GetChromiumRevision function * updated tests and sofware report Co-authored-by: Nikita Bykov --- .../SoftwareReport.Generator.ps1 | 6 +-- images/linux/scripts/installers/basic.sh | 3 +- .../linux/scripts/installers/google-chrome.sh | 52 +++++++++++++++++-- images/linux/scripts/tests/Browsers.Tests.ps1 | 4 +- images/linux/toolsets/toolset-2004.json | 1 - 5 files changed, 54 insertions(+), 12 deletions(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index 1af995541ba6..cc4a74a01cb7 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -215,11 +215,9 @@ $browsersAndDriversList = @( (Get-ChromeVersion), (Get-ChromeDriverVersion), (Get-FirefoxVersion), - (Get-GeckodriverVersion) + (Get-GeckodriverVersion), + (Get-ChromiumVersion) ) -if (Test-IsUbuntu20) { - $browsersAndDriversList = @(Get-ChromiumVersion) + $browsersAndDriversList -} $markdown += New-MDList -Style Unordered -Lines $browsersAndDriversList $markdown += New-MDHeader "Environment variables" -Level 4 diff --git a/images/linux/scripts/installers/basic.sh b/images/linux/scripts/installers/basic.sh index efac5bd44609..270cc75c837a 100644 --- a/images/linux/scripts/installers/basic.sh +++ b/images/linux/scripts/installers/basic.sh @@ -12,5 +12,4 @@ for package in $common_packages $cmd_packages; do apt-get install -y --no-install-recommends $package done -invoke_tests "Apt" -invoke_tests "Browsers" "Chromium" \ No newline at end of file +invoke_tests "Apt" \ No newline at end of file diff --git a/images/linux/scripts/installers/google-chrome.sh b/images/linux/scripts/installers/google-chrome.sh index 0cc638f4e8a8..569f490c1096 100644 --- a/images/linux/scripts/installers/google-chrome.sh +++ b/images/linux/scripts/installers/google-chrome.sh @@ -1,12 +1,40 @@ #!/bin/bash -e ################################################################################ ## File: google-chrome.sh -## Desc: Installs google-chrome and chromedriver +## Desc: Installs google-chrome, chromedriver and chromium ################################################################################ # Source the helpers for use with the script source $HELPER_SCRIPTS/install.sh +function GetChromiumRevision { + CHROME_VERSION=$1 + + # Get the required Chromium revision corresponding to the Chrome version + URL="https://omahaproxy.appspot.com/deps.json?version=${CHROME_VERSION}" + REVISION=$(curl -s $URL | jq -r '.chromium_base_position') + + # Take the first part of the revision variable to search not only for a specific version, + # but also for similar ones, so that we can get a previous one if the required revision is not found + FIRST_PART_OF_REVISION=${REVISION:0:${#REVISION}/2} + URL="https://www.googleapis.com/storage/v1/b/chromium-browser-snapshots/o?delimiter=/&prefix=Linux_x64/${FIRST_PART_OF_REVISION}" + VERSIONS=$(curl -s $URL | jq -r '.prefixes[]' | cut -d "/" -f 2 | sort --version-sort) + + # If required Chromium revision is not found in the list + # we should have to decrement the revision number until we find one. + # This is mentioned in the documentation we use for this installation: + # https://www.chromium.org/getting-involved/download-chromium + RIGHT_REVISION=$(echo $VERSIONS | cut -f 1 -d " ") + for version in $VERSIONS; do + if [ $REVISION -lt $version ]; then + echo $RIGHT_REVISION + return + fi + RIGHT_REVISION=$version + done + echo $RIGHT_REVISION +} + # Download and install Google Chrome CHROME_DEB_URL="https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb" CHROME_DEB_NAME="google-chrome-stable_current_amd64.deb" @@ -15,8 +43,8 @@ apt install "/tmp/${CHROME_DEB_NAME}" -f echo "CHROME_BIN=/usr/bin/google-chrome" | tee -a /etc/environment # Parse Google Chrome version -CHROME_VERSION=$(google-chrome --product-version) -CHROME_VERSION=${CHROME_VERSION%.*} +FULL_CHROME_VERSION=$(google-chrome --product-version) +CHROME_VERSION=${FULL_CHROME_VERSION%.*} # Determine the latest release of chromedriver # Compatibility of Google Chrome and Chromedriver: https://sites.google.com/a/chromium.org/chromedriver/downloads/version-selection @@ -35,4 +63,22 @@ chmod +x $CHROMEDRIVER_BIN ln -s "$CHROMEDRIVER_BIN" /usr/bin/ echo "CHROMEWEBDRIVER=$CHROMEDRIVER_DIR" | tee -a /etc/environment +# Download and unpack Chromium +# Get Chromium version corresponding to the Google Chrome version +REVISION=$(GetChromiumRevision $FULL_CHROME_VERSION) + +ZIP_URL="https://www.googleapis.com/download/storage/v1/b/chromium-browser-snapshots/o/Linux_x64%2F${REVISION}%2Fchrome-linux.zip?alt=media" +ZIP_FILE="${REVISION}-chromium-linux.zip" + +CHROMIUM_DIR="/usr/local/share/chromium" +CHROMIUM_BIN="$CHROMIUM_DIR/chrome-linux/chrome" + +# Download and unzip Chromium archive +download_with_retries $ZIP_URL "/tmp" $ZIP_FILE +mkdir $CHROMIUM_DIR +unzip -qq /tmp/${ZIP_FILE} -d $CHROMIUM_DIR + +ln -s $CHROMIUM_BIN /usr/bin/chromium + invoke_tests "Browsers" "Chrome" +invoke_tests "Browsers" "Chromium" \ No newline at end of file diff --git a/images/linux/scripts/tests/Browsers.Tests.ps1 b/images/linux/scripts/tests/Browsers.Tests.ps1 index 1efd163435a3..40296ec86fa8 100644 --- a/images/linux/scripts/tests/Browsers.Tests.ps1 +++ b/images/linux/scripts/tests/Browsers.Tests.ps1 @@ -18,8 +18,8 @@ Describe "Chrome" { } } -Describe "Chromium" -Skip:(-not (Test-IsUbuntu20)) { +Describe "Chromium" { It "Chromium" { "chromium --version" | Should -ReturnZeroExitCode } -} \ No newline at end of file +} diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index 238a21911fc5..4b8f127d4f2c 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -116,7 +116,6 @@ "apt": { "common_packages": [ "build-essential", - "chromium-browser", "dbus", "dnsutils", "dpkg", From 961495b5c7578a5741dfaf7a02926b51fe55cd08 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 5 Apr 2021 06:09:49 +0000 Subject: [PATCH 0124/3485] Updating readme file for win19 version 20210330.2 (#3072) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/win/Windows2019-Readme.md | 100 +++++++++++++++---------------- 1 file changed, 49 insertions(+), 51 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index 770c0f0b13dc..dac10e81046f 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -1,12 +1,10 @@ | Announcements | |-| | [[windows, ubuntu] Az, Azure and AzureRM module preinstallation policy will be changed on March, 29th](https://github.com/actions/virtual-environments/issues/2916) | -| [[ubuntu, windows] GOROOT environment variable will be removed on March, 1](https://github.com/actions/virtual-environments/issues/2683) | -| [[Windows, Ubuntu] Boost 1.72.0 will be removed from images on March, 8](https://github.com/actions/virtual-environments/issues/2667) | *** # Microsoft Windows Server 2019 Datacenter - OS Version: 10.0.17763 Build 1817 -- Image Version: 20210316.1 +- Image Version: 20210330.2 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -32,7 +30,7 @@ - pip 21.0.1 (python 3.7) - Pipx 0.16.1.0 - RubyGems 2.7.6.2 -- Vcpkg (build from master \<9431133>) +- Vcpkg (build from master \) - Yarn 1.22.10 #### Environment variables @@ -45,7 +43,7 @@ - Ant 1.10.9 - Gradle 6.8 - Maven 3.6.3 -- sbt 1.4.8 +- sbt 1.4.9 ### Tools - 7zip 19.00 @@ -53,25 +51,25 @@ - Bazel 4.0.0 - Bazelisk 1.7.5 - Cabal 3.4.0.0 -- CMake 3.19.7 -- CodeQL Action Bundle 2.4.5 +- CMake 3.20.0 +- CodeQL Action Bundle 2.5.0 - Docker 20.10.0 - Docker-compose 1.28.5 - ghc 9.0.1 -- Git 2.30.2 +- Git 2.31.0 - Git LFS 2.13.2 -- Google Cloud SDK 331.0.0 +- Google Cloud SDK 334.0.0 - InnoSetup 6.1.2 - jq 1.6 - Kind 0.10.0 -- Kubectl 1.20.4 +- Kubectl 1.20.5 - Mercurial 5.0 - Mingw-w64 8.1.0 - Newman 5.2.2 - NSIS v3.06.1 - OpenSSL 1.1.1 - Packer 1.7.0 -- Pulumi v2.22.0 +- Pulumi 2.23.1 - R 4.0.4 - Stack 2.5.1 - Subversion (SVN) 1.14.1 @@ -85,17 +83,17 @@ - AWS CLI 2.1.29 - AWS SAM CLI 1.21.1 - AWS Session Manager CLI 1.2.54.0 -- Azure CLI 2.20.0 +- Azure CLI 2.21.0 - Azure Dev Spaces CLI 1.0.20201219.2 - Azure DevOps CLI extension 0.18.0 - Cloud Foundry CLI 6.53.0 -- GitHub CLI 1.7.0 +- GitHub CLI 1.8.0 - Hub CLI 2.14.2 ### Rust Tools -- Cargo 1.50.0 -- Rust 1.50.0 -- Rustdoc 1.50.0 +- Cargo 1.51.0 +- Rust 1.51.0 +- Rustdoc 1.51.0 - Rustup 1.23.1 #### Packages @@ -103,15 +101,15 @@ - cargo-audit 0.14.0 - cargo-outdated v0.9.14 - cbindgen 0.18.0 -- Clippy 0.0.212 -- Rustfmt 1.4.30 +- Clippy 0.1.51 +- Rustfmt 1.4.36 ### Browsers and webdrivers -- Google Chrome 89.0.4389.90 +- Google Chrome 89.0.4389.114 - Chrome Driver 89.0.4389.23 -- Microsoft Edge 89.0.774.54 -- Microsoft Edge Driver 89.0.774.54 -- Mozilla Firefox 86.0.1 +- Microsoft Edge 89.0.774.63 +- Microsoft Edge Driver 89.0.774.63 +- Mozilla Firefox 87.0 - Gecko Driver 0.29.0 - IE Driver 3.150.1.0 @@ -123,11 +121,11 @@ | GECKOWEBDRIVER | C:\SeleniumWebDrivers\GeckoDriver | ### Java -| Version | Vendor | Environment Variable | -| ------------------- | ------------ | -------------------- | -| 1.8.0_282 (default) | AdoptOpenJDK | JAVA_HOME_8_X64 | -| 11.0.10 | AdoptOpenJDK | JAVA_HOME_11_X64 | -| 13.0.2 | AdoptOpenJDK | JAVA_HOME_13_X64 | +| Version | Vendor | Environment Variable | +| ------------------- | ------------- | -------------------- | +| 8.0.282+8 (default) | Adopt OpenJDK | JAVA_HOME_8_X64 | +| 11.0.10+9 | Adopt OpenJDK | JAVA_HOME_11_X64 | +| 13.0.2+8.1 | Adopt OpenJDK | JAVA_HOME_13_X64 | ### Shells | Name | Target | @@ -160,7 +158,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Version | Architecture | | ------- | ------------ | | 10.24.0 | x64 | -| 12.21.0 | x64 | +| 12.22.0 | x64 | | 14.16.0 | x64 | @@ -229,15 +227,15 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Nginx | 1.19.8 | C:\tools\nginx-1.19.8\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2019 -| Name | Version | Path | -| ----------------------------- | ------------- | -------------------------------------------------------------- | -| Visual Studio Enterprise 2019 | 16.9.31105.61 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | +| Name | Version | Path | +| ----------------------------- | -------------- | -------------------------------------------------------------- | +| Visual Studio Enterprise 2019 | 16.9.31129.286 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | #### Workloads, components and extensions: | Package | Version | | ------------------------------------------------------------------------- | -------------- | -| Component.Android.NDK.R16B | 16.9.31105.61 | +| Component.Android.NDK.R16B | 16.9.31129.215 | | Component.Android.SDK25.Private | 16.0.28625.61 | | Component.Android.SDK30 | 16.9.31004.209 | | Component.Ant | 1.9.3.8 | @@ -248,7 +246,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Component.MDD.Linux.GCC.arm | 16.5.29515.121 | | Component.Microsoft.VisualStudio.LiveShare | 1.0.3587 | | Component.Microsoft.VisualStudio.RazorExtension | 16.9.31004.209 | -| Component.Microsoft.VisualStudio.Tools.Applications | 16.0.29425.2 | +| Component.Microsoft.VisualStudio.Tools.Applications | 16.0.31110.1 | | Component.Microsoft.VisualStudio.Web.AzureFunctions | 16.9.31004.209 | | Component.Microsoft.Web.LibraryManager | 16.9.31004.209 | | Component.Microsoft.WebTools.BrowserLink.WebLivePreview | 0.4.12.14637 | @@ -456,8 +454,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Workload.Universal | 16.9.31004.209 | | Microsoft.VisualStudio.Workload.VisualStudioExtension | 16.9.31004.209 | | SSDT Microsoft Analysis Services Projects | 2.9.16 | -| SSDT SQL Server Integration Services Projects | 3.12 | -| SSDT Microsoft Reporting Services Projects | 2.6.7 | +| SSDT SQL Server Integration Services Projects | 3.12.1 | +| SSDT Microsoft Reporting Services Projects | 2.6.10 | | Windows Driver Kit | 3.11.4516 | | Windows Driver Kit Visual Studio Extension | 10.1.19041.685 | | WIX Toolset | 3.11.4516 | @@ -475,12 +473,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.28.29910 | -| Microsoft Visual C++ 2019 Debug Runtime | x64 | 14.28.29910 | -| Microsoft Visual C++ 2019 Minimum Runtime | x64 | 14.28.29910 | -| Microsoft Visual C++ 2019 Additional Runtime | x86 | 14.28.29910 | -| Microsoft Visual C++ 2019 Debug Runtime | x86 | 14.28.29910 | -| Microsoft Visual C++ 2019 Minimum Runtime | x86 | 14.28.29910 | +| Microsoft Visual C++ 2019 Additional Runtime | x64 | 14.28.29913 | +| Microsoft Visual C++ 2019 Debug Runtime | x64 | 14.28.29913 | +| Microsoft Visual C++ 2019 Minimum Runtime | x64 | 14.28.29913 | +| Microsoft Visual C++ 2019 Additional Runtime | x86 | 14.28.29913 | +| Microsoft Visual C++ 2019 Debug Runtime | x86 | 14.28.29913 | +| Microsoft Visual C++ 2019 Minimum Runtime | x86 | 14.28.29913 | ### .NET Core SDK `Location C:\Program Files\dotnet\sdk` @@ -508,11 +506,11 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - PowerShell 7.1.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
4.7.0
5.5.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.zip
1.6.0.zip
2.3.2.zip
2.6.0.zip
3.1.0.zip
3.5.0.zip
3.8.0.zip
4.3.0.zip
4.4.0.zip
4.6.0.zip
4.7.0.zip
5.5.0 | C:\Modules\az_\ | +| Azure | 3.8.0.zip
4.2.1.zip
5.1.1.zip
2.1.0 [Installed]
5.3.0 | C:\Modules\azure_\ | +| AzureRM | 3.8.0.zip
4.2.1.zip
5.1.1.zip
6.7.0.zip
2.1.0 [Installed]
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'. @@ -527,7 +525,7 @@ All other versions are saved but not installed. | PowerShellGet | 1.0.0.1
2.2.5 | | PSScriptAnalyzer | 1.19.1 | | PSWindowsUpdate | 2.2.0.2 | -| SqlServer | 21.1.18235 | +| SqlServer | 21.1.18245 | | VSSetup | 2.2.16 | ### Android @@ -535,15 +533,15 @@ All other versions are saved but not installed. | -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 3.0 | | Android SDK Build-tools | 30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3
26.0.0 26.0.1 26.0.2 26.0.3
25.0.0 25.0.1 25.0.2 25.0.3
24.0.0 24.0.1 24.0.2 24.0.3
23.0.1 23.0.2 23.0.3
22.0.1
21.1.2
20.0.0
19.1.0 | -| Android SDK Platforms | android-S (rev 1)
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 Platform-Tools | 31.0.0 | +| Android SDK Platforms | android-S (rev 2)
android-30 (rev 3)
android-29 (rev 5)
android-28 (rev 6)
android-27 (rev 3)
android-26 (rev 2)
android-25 (rev 3)
android-24 (rev 2)
android-23 (rev 3)
android-22 (rev 2)
android-21 (rev 2)
android-20 (rev 2)
android-19 (rev 4) | +| Android SDK Platform-Tools | 31.0.1 | | Android SDK Tools | 26.1.1 | | Android Support Repository | 47.0.0 | | CMake | 3.10.2 | | Google APIs | addon-google_apis-google-21
addon-google_apis-google-22
addon-google_apis-google-23
addon-google_apis-google-24 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 21.4.7075529
22.0.7026061 | +| NDK | 21.4.7075529
22.1.7171670 | | SDK Patch Applier v4 | 1 | #### Environment variables @@ -551,7 +549,7 @@ All other versions are saved but not installed. | ----------------------- | ---------------------------------------------------------------------------- | | ANDROID_HOME | C:\Android\android-sdk | | ANDROID_NDK_HOME | C:\Android\android-sdk\ndk-bundle -> C:\Android\android-sdk\ndk\21.4.7075529 | -| ANDROID_NDK_LATEST_HOME | C:\Android\android-sdk\ndk\22.0.7026061 | +| ANDROID_NDK_LATEST_HOME | C:\Android\android-sdk\ndk\22.1.7171670 | | ANDROID_NDK_PATH | C:\Android\android-sdk\ndk-bundle -> C:\Android\android-sdk\ndk\21.4.7075529 | | ANDROID_NDK_ROOT | C:\Android\android-sdk\ndk-bundle -> C:\Android\android-sdk\ndk\21.4.7075529 | | ANDROID_SDK_ROOT | C:\Android\android-sdk | From 0c064d0bdb6df746999c5184f3f5e008dbc1557b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 5 Apr 2021 11:48:21 +0000 Subject: [PATCH 0125/3485] macOS 11.0 (20210404 update) (#3096) * Updating readme file for macOS-11.0 version 20210404.2 * fixed packer version Co-authored-by: Image generation service account Co-authored-by: Alena Sviridenko --- images/macos/macos-11.0-Readme.md | 44 +++++++++++++++---------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/images/macos/macos-11.0-Readme.md b/images/macos/macos-11.0-Readme.md index fb6f340be902..e285eca6549a 100644 --- a/images/macos/macos-11.0-Readme.md +++ b/images/macos/macos-11.0-Readme.md @@ -5,7 +5,7 @@ # macOS 11.2 info - System Version: macOS 11.2.3 (20D91) - Kernel Version: Darwin 20.3.0 -- Image Version: 20210328.1 +- Image Version: 20210404.2 ## Installed Software ### Language and Runtime @@ -19,11 +19,11 @@ - GNU Fortran (Homebrew GCC 10.2.0_4) 10.2.0 - available by `gfortran-10` alias - GNU Fortran (Homebrew GCC 8.4.0_2) 8.4.0 - available by `gfortran-8` alias - GNU Fortran (Homebrew GCC 9.3.0_1) 9.3.0 - available by `gfortran-9` alias -- Go 1.15.10 +- Go 1.15.11 - julia 1.6.0 - Node.js v14.16.0 -- NVM - Cached node versions: v10.24.0 v12.21.0 v14.16.0 -- NVM 0.37.2 +- NVM - Cached node versions: v10.24.0 v12.22.0 v14.16.0 +- NVM 0.38.0 - Perl 5.32.1 - PHP 8.0.3 - Python 2.7.18 @@ -34,8 +34,8 @@ - Bundler version 2.2.15 - Carthage 0.37.0 - CocoaPods 1.10.1 -- Composer 2.0.11 -- Homebrew 3.0.9 +- Composer 2.0.12 +- Homebrew 3.0.10 - Miniconda 4.9.2 - NPM 6.14.11 - NuGet 5.6.0.6489 @@ -43,7 +43,7 @@ - Pip 21.0.1 (python 3.9) - Pipx 0.16.1.0 - RubyGems 3.2.15 -- Vcpkg 2021 (build from master \<6d9ed56>) +- Vcpkg 2021 (build from master \<030cfaa>) - Yarn 1.22.5 #### Environment variables @@ -54,20 +54,20 @@ ### Project Management - Apache Ant(TM) 1.10.9 -- Apache Maven 3.6.3 +- Apache Maven 3.8.1 - Gradle 6.8.3 ### Utilities -- 7-Zip 17.03 +- 7-Zip 17.04 - aria2 1.35.0 - azcopy 10.9.0 - bazel 4.0.0 - bazelisk 1.7.5 - bsdtar 3.3.2 - available by 'tar' alias -- Curl 7.75.0 +- Curl 7.76.0 - Git LFS: 2.13.3 - Git: 2.31.1 -- GitHub CLI: 1.7.0 +- GitHub CLI: 1.8.1 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.1 - gpg (GnuPG) 2.2.27 @@ -78,7 +78,7 @@ - mongod v4.4.3 - Newman 5.2.2 - OpenSSL 1.1.1k 25 Mar 2021 `(/usr/local/opt/openssl -> /usr/local/Cellar/openssl@1.1/1.1.1k)` -- Packer 1.7.0 +- Packer 1.7.1 - PostgreSQL 13.2 - psql (PostgreSQL) 13.2 - Subversion (SVN) 1.14.1 @@ -88,7 +88,7 @@ ### Tools - Aliyun CLI 3.0.73 - App Center CLI 2.8.1 -- AWS CLI 2.1.32 +- AWS CLI 2.1.34 - AWS SAM CLI 1.21.1 - AWS Session Manager CLI 1.2.30.0 - Azure CLI 2.21.0 @@ -107,10 +107,10 @@ ### Browsers - Safari 14.0.3 (16610.4.3.1.7) - SafariDriver 14.0.3 (16610.4.3.1.7) -- Google Chrome 89.0.4389.90 +- Google Chrome 89.0.4389.114 - ChromeDriver 89.0.4389.23 - Microsoft Edge 89.0.774.63 -- MSEdgeDriver 89.0.774.63 +- MSEdgeDriver 89.0.774.68 - Mozilla Firefox 87.0 - geckodriver 0.29.0 @@ -138,16 +138,16 @@ #### Python - 3.7.10 - 3.8.8 -- 3.9.2 +- 3.9.4 #### Node.js - 10.24.0 -- 12.21.0 +- 12.22.0 - 14.16.0 #### Go -- 1.15.10 -- 1.16.2 +- 1.15.11 +- 1.16.3 ### Rust Tools - Cargo 1.51.0 @@ -156,7 +156,7 @@ - Rustup 1.23.1 #### Packages -- Bindgen 0.57.0 +- Bindgen 0.58.0 - Cargo-audit 0.14.0 - Cargo-outdated v0.9.14 - Cbindgen 0.18.0 @@ -182,7 +182,7 @@ ### Xamarin #### Visual Studio for Mac -- 8.9.3.13 +- 8.9.4.25 #### Mono - 6.12.0.125 @@ -285,7 +285,7 @@ | Package Name | Version | | -------------------------- | ------------------------------------------------------------------------------------------------------------------------ | | Android Command Line Tools | 3.0 | -| Android Emulator | 30.5.3 | +| Android Emulator | 30.5.4 | | Android SDK Build-tools | 30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3 | | Android SDK Platforms | android-S (rev 2)
android-30 (rev 3)
android-29 (rev 5)
android-28 (rev 6)
android-27 (rev 3) | | Android SDK Platform-Tools | 31.0.1 | From 0c440c82caac7f57c9fc09c5e6e036222b394afd Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Mon, 5 Apr 2021 17:09:48 +0300 Subject: [PATCH 0126/3485] [ubuntu] Fix packer output for version 1.7.1 (#3098) --- .../linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 index 9c333259de84..deab9dcd7e08 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 @@ -157,7 +157,10 @@ function Get-NvmVersion { } function Get-PackerVersion { - return "Packer $(packer --version)" + # Packer 1.7.1 has a bug and outputs version to stderr instead of stdout https://github.com/hashicorp/packer/issues/10855 + $result = (Get-CommandResult -Command "packer --version").Output + $packerVersion = [regex]::matches($result, "(\d+.){2}\d+").Value + return "Packer $packerVersion" } function Get-PhantomJSVersion { From 210e9558ae4af7de565ee5e7bdcdc73d71b1fffb Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Mon, 5 Apr 2021 18:41:57 +0300 Subject: [PATCH 0127/3485] [macOS] Fix output for packer 1.7.1 (#3100) --- images/macos/software-report/SoftwareReport.Common.psm1 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/images/macos/software-report/SoftwareReport.Common.psm1 b/images/macos/software-report/SoftwareReport.Common.psm1 index 7786c7adee66..3aff25aff949 100644 --- a/images/macos/software-report/SoftwareReport.Common.psm1 +++ b/images/macos/software-report/SoftwareReport.Common.psm1 @@ -293,7 +293,9 @@ function Get-SVNVersion { } function Get-PackerVersion { - $packerVersion = Run-Command "packer --version" + # Packer 1.7.1 has a bug and outputs version to stderr instead of stdout https://github.com/hashicorp/packer/issues/10855 + $result = Run-Command -Command "packer --version" + $packerVersion = [regex]::matches($result, "(\d+.){2}\d+").Value return "Packer $packerVersion" } From 0d102a98d4cfceacb785d08ed185935b2654ff60 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Mon, 5 Apr 2021 20:27:14 +0300 Subject: [PATCH 0128/3485] add sshpass packages (#3103) --- images/linux/toolsets/toolset-1604.json | 1 + images/linux/toolsets/toolset-1804.json | 1 + images/linux/toolsets/toolset-2004.json | 1 + 3 files changed, 3 insertions(+) diff --git a/images/linux/toolsets/toolset-1604.json b/images/linux/toolsets/toolset-1604.json index 37b7603d8c03..92a200e5e9e7 100644 --- a/images/linux/toolsets/toolset-1604.json +++ b/images/linux/toolsets/toolset-1604.json @@ -190,6 +190,7 @@ "sphinxsearch", "sqlite3", "ssh", + "sshpass", "subversion", "sudo", "swig", diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index 9c82d2dd4dc8..bc5d8c53c517 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -184,6 +184,7 @@ "sqlite3", "sphinxsearch", "ssh", + "sshpass", "subversion", "sudo", "swig", diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index 4b8f127d4f2c..e6f499f7a428 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -184,6 +184,7 @@ "sphinxsearch", "sqlite3", "ssh", + "sshpass", "subversion", "sudo", "swig", From 6ede984b964bcc31124454c436da49e637b39ec0 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Tue, 6 Apr 2021 05:06:39 +0300 Subject: [PATCH 0129/3485] [windows] Fix output for packer 1.7.1 (#3104) --- images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 index 690f36764bbf..ec3213421ed9 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 @@ -112,7 +112,10 @@ function Get-OpenSSLVersion { } function Get-PackerVersion { - return "Packer $(packer --version)" + # Packer 1.7.1 has a bug and outputs version to stderr instead of stdout https://github.com/hashicorp/packer/issues/10855 + ($(cmd /c "packer --version 2>&1") | Out-String) -match "(?(\d+.){2}\d+)" | Out-Null + $packerVersion = $Matches.Version + return "Packer $packerVersion" } function Get-PulumiVersion { From 1a3945d52cebd90f7de2ff4e0e8068b6bcd6008b Mon Sep 17 00:00:00 2001 From: Darii Nurgaleev <50947177+Darleev@users.noreply.github.com> Date: Tue, 6 Apr 2021 20:22:28 +0700 Subject: [PATCH 0130/3485] Update documentation for post-deployment scripts. (#3070) --- help/CreateImageAndAzureResources.md | 37 ++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/help/CreateImageAndAzureResources.md b/help/CreateImageAndAzureResources.md index b3dd36e2040a..d9a4dacec187 100644 --- a/help/CreateImageAndAzureResources.md +++ b/help/CreateImageAndAzureResources.md @@ -124,3 +124,40 @@ Generated tool versions and details can be found in related projects: - [Go](https://github.com/actions/go-versions) - [Node](https://github.com/actions/node-versions) - [Boost](https://github.com/actions/boost-versions) + +### Post-generation scripts +The user, created during the image generation, does not exist in the result VHD hence some configuration files related to the user's home directory need to be changed as well as the file permissions for some directories. Scripts for that are located in the `post-generation` folder in the repository: +- Windows: https://github.com/actions/virtual-environments/tree/main/images/win/post-generation +- Linux: https://github.com/actions/virtual-environments/tree/main/images/linux/post-generation + +The scripts are copied to the VHD during the image generation process to the following paths: +- Windows: `C:\post-generation` +- Linux: `/opt/post-generation` + +#### Running scripts + +##### Ubuntu + + find /opt/post-generation -mindepth 1 -maxdepth 1 -type f -name '*.sh' -exec bash {} \; + +##### Windows + + Get-ChildItem C:\post-generation -Filter *.ps1 | ForEach-Object { & $_.FullName } + +#### Script details + +##### Ubuntu + +- **cleanup-logs.sh** - removes all build process logs from the machine +- **environment-variables.sh** - replaces `$HOME` with the default user's home directory for environmental variables related to the default user home directory +- **homebrew-permissions.sh** - Resets homebrew repository directory by running `git reset --hard` to make the working tree clean after chmoding /home and changes the repository directory owner to the current user +- **rust-permissions.sh** - fixes permissions for the Rust folder. Detailed issue explanation is provided in [virtual-environments/issues/572](https://github.com/actions/virtual-environments/issues/572). + +##### Windows + +- **Choco.ps1** - contains dummy command to cleanup orphaned packages to avoid initial delay for future choco commands +- **Dotnet.ps1** - adds `$env:USERPROFILE\.dotnet\tools` directory to the PATH +- **InternetExplorerConfiguration** - turns off the Internet Explorer Enhanced Security feature +- **Msys2FirstLaunch.ps1** - initializes bash user profile in MSYS2 +- **RustJunction.ps1** - creates Rust junction points to cargo and rustup folders +- **VSConfiguration.ps1** - performs initial Visual Studio configuration From f29cc02bef4dcd5d5132d59c1287cbe5a531278f Mon Sep 17 00:00:00 2001 From: Vladimir Safonkin Date: Wed, 7 Apr 2021 13:57:35 +0300 Subject: [PATCH 0131/3485] [Ubuntu] Remove apt sources for Postgresql, Mongodb, Heroku (#3091) --- .../scripts/SoftwareReport/SoftwareReport.Databases.psm1 | 6 ++++-- images/linux/scripts/helpers/SoftwareReport.Helpers.psm1 | 7 +++++++ images/linux/scripts/installers/heroku.sh | 2 +- images/linux/scripts/installers/mongodb.sh | 8 +++++++- images/linux/scripts/installers/postgresql.sh | 8 +++++++- 5 files changed, 26 insertions(+), 5 deletions(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Databases.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Databases.psm1 index 450bcfeb22f4..e80c1b2d9082 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Databases.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Databases.psm1 @@ -1,11 +1,13 @@ function Get-PostgreSqlVersion { $postgreSQLVersion = psql --version | Take-OutputPart -Part 2 - return "Postgre SQL $postgreSQLVersion" + $aptSourceRepo = Get-AptSourceRepository -PackageName "postgresql" + return "Postgre SQL $postgreSQLVersion (apt source repository: $aptSourceRepo)" } function Get-MongoDbVersion { $mongoDBVersion = mongod --version | Select-Object -First 1 | Take-OutputPart -Part 2 -Delimiter "v" - return "MongoDB $mongoDBVersion" + $aptSourceRepo = Get-AptSourceRepository -PackageName "mongodb" + return "MongoDB $mongoDBVersion (apt source repository: $aptSourceRepo)" } function Get-SqliteVersion { diff --git a/images/linux/scripts/helpers/SoftwareReport.Helpers.psm1 b/images/linux/scripts/helpers/SoftwareReport.Helpers.psm1 index a3ef19d1ca1a..dfecd423bec9 100644 --- a/images/linux/scripts/helpers/SoftwareReport.Helpers.psm1 +++ b/images/linux/scripts/helpers/SoftwareReport.Helpers.psm1 @@ -103,3 +103,10 @@ function Get-CachedToolInstances return $toolInstances } +function Get-AptSourceRepository { + param([String] $PackageName) + + $sourceUrl = Get-Content "$PSScriptRoot/../helpers/apt-sources.txt" | Select-String -Pattern $PackageName | Take-OutputPart -Part 1 + return $sourceUrl +} + diff --git a/images/linux/scripts/installers/heroku.sh b/images/linux/scripts/installers/heroku.sh index 2c8862092505..fa1e2d4bef45 100644 --- a/images/linux/scripts/installers/heroku.sh +++ b/images/linux/scripts/installers/heroku.sh @@ -5,6 +5,6 @@ ################################################################################ # Install Heroku CLI -curl https://cli-assets.heroku.com/install-ubuntu.sh | sh +curl https://cli-assets.heroku.com/install.sh | sh invoke_tests "Tools" "Heroku" \ No newline at end of file diff --git a/images/linux/scripts/installers/mongodb.sh b/images/linux/scripts/installers/mongodb.sh index ad140366847f..ea0b4f42629e 100644 --- a/images/linux/scripts/installers/mongodb.sh +++ b/images/linux/scripts/installers/mongodb.sh @@ -7,11 +7,17 @@ # Source the helpers source $HELPER_SCRIPTS/os.sh +REPO_URL="https://repo.mongodb.org/apt/ubuntu" + # Install Mongo DB wget -qO - https://www.mongodb.org/static/pgp/server-4.4.asc | sudo apt-key add - version=$(getOSVersionLabel) -echo "deb [ arch=amd64,arm64 ] https://repo.mongodb.org/apt/ubuntu $version/mongodb-org/4.4 multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-org-4.4.list +echo "deb [ arch=amd64,arm64 ] $REPO_URL $version/mongodb-org/4.4 multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-org-4.4.list sudo apt-get update sudo apt-get install -y mongodb-org +rm /etc/apt/sources.list.d/mongodb-org-4.4.list + +echo "mongodb $REPO_URL" >> $HELPER_SCRIPTS/apt-sources.txt + invoke_tests "Databases" "MongoDB" diff --git a/images/linux/scripts/installers/postgresql.sh b/images/linux/scripts/installers/postgresql.sh index 4424adbf8d64..85b7dec0d8ba 100644 --- a/images/linux/scripts/installers/postgresql.sh +++ b/images/linux/scripts/installers/postgresql.sh @@ -4,9 +4,11 @@ ## Desc: Installs Postgresql ################################################################################ +REPO_URL="https://apt.postgresql.org/pub/repos/apt/" + #Preparing repo for PostgreSQL 12. wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - -echo "deb https://apt.postgresql.org/pub/repos/apt/ `lsb_release -cs`-pgdg main" | tee /etc/apt/sources.list.d/pgdg.list +echo "deb $REPO_URL `lsb_release -cs`-pgdg main" | tee /etc/apt/sources.list.d/pgdg.list echo "Install PostgreSQL" apt update @@ -19,4 +21,8 @@ apt-get install libpq-dev systemctl is-active --quiet postgresql.service && systemctl stop postgresql.service systemctl disable postgresql.service +rm /etc/apt/sources.list.d/pgdg.list + +echo "postgresql $REPO_URL" >> $HELPER_SCRIPTS/apt-sources.txt + invoke_tests "Databases" "PostgreSQL" From 37a897095f6952ce45e49011084fe9efaa24e8e6 Mon Sep 17 00:00:00 2001 From: Dmitry Shibanov Date: Thu, 8 Apr 2021 10:43:59 +0300 Subject: [PATCH 0132/3485] add permissions for /usr/lib/jvm (#3105) --- images/linux/scripts/installers/java-tools.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/images/linux/scripts/installers/java-tools.sh b/images/linux/scripts/installers/java-tools.sh index 26ae16c1239d..3a75ef25f32a 100644 --- a/images/linux/scripts/installers/java-tools.sh +++ b/images/linux/scripts/installers/java-tools.sh @@ -55,6 +55,8 @@ update-java-alternatives -s /usr/lib/jvm/adoptopenjdk-${DEFAULT_JDK_VERSION}-hot echo "JAVA_HOME=/usr/lib/jvm/adoptopenjdk-${DEFAULT_JDK_VERSION}-hotspot-amd64" | tee -a /etc/environment +# add extra permissions to be able execute command without sudo +chmod -R 777 /usr/lib/jvm # Install Ant apt-fast install -y --no-install-recommends ant ant-optional echo "ANT_HOME=/usr/share/ant" | tee -a /etc/environment From ed0a37f3ab8c4178c13e1cd7e71cc5a9bbe29db6 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Thu, 8 Apr 2021 10:50:50 +0300 Subject: [PATCH 0133/3485] [Ubuntu] Change az 5.5.0 to 5.7.0 (#3126) --- images/linux/toolsets/toolset-1604.json | 2 +- images/linux/toolsets/toolset-1804.json | 2 +- images/linux/toolsets/toolset-2004.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/images/linux/toolsets/toolset-1604.json b/images/linux/toolsets/toolset-1604.json index 92a200e5e9e7..6fa43e58c883 100644 --- a/images/linux/toolsets/toolset-1604.json +++ b/images/linux/toolsets/toolset-1604.json @@ -111,7 +111,7 @@ "name": "az", "url" : "https://raw.githubusercontent.com/Azure/az-ps-module-versions/main/versions-manifest.json", "versions": [ - "5.5.0" + "5.7.0" ], "zip_versions": [ "3.1.0", diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index bc5d8c53c517..1e7b89f2778a 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -107,7 +107,7 @@ "name": "az", "url" : "https://raw.githubusercontent.com/Azure/az-ps-module-versions/main/versions-manifest.json", "versions": [ - "5.5.0" + "5.7.0" ], "zip_versions": [ "3.1.0", diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index e6f499f7a428..816146b1141a 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -105,7 +105,7 @@ "name": "az", "url" : "https://raw.githubusercontent.com/Azure/az-ps-module-versions/main/versions-manifest.json", "versions": [ - "5.5.0" + "5.7.0" ], "zip_versions": [ "3.1.0", From 6858b9232df262e06a417cc305ca7d623a92c30f Mon Sep 17 00:00:00 2001 From: Nikita Bykov <49442273+nikita-bykov@users.noreply.github.com> Date: Thu, 8 Apr 2021 12:55:47 +0300 Subject: [PATCH 0134/3485] [macOS] Rework Xamarin documentation (#3113) * reworked xamarin documentation * added condition for defaultSymlink variable * removed sorting of xamarin bundles Co-authored-by: Nikita Bykov --- .../SoftwareReport.Generator.ps1 | 14 +--- .../SoftwareReport.Xamarin.psm1 | 81 ++++--------------- 2 files changed, 20 insertions(+), 75 deletions(-) diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1 index d7a9bacfc442..48130392dbfa 100644 --- a/images/macos/software-report/SoftwareReport.Generator.ps1 +++ b/images/macos/software-report/SoftwareReport.Generator.ps1 @@ -236,17 +236,9 @@ $markdown += New-MDHeader "Xamarin" -Level 3 $markdown += New-MDHeader "Visual Studio for Mac" -Level 4 $markdown += New-MDList -Lines @(Get-VSMacVersion) -Style Unordered -$markdown += New-MDHeader "Mono" -Level 4 -$markdown += New-MDList -Lines (Build-MonoList) -Style Unordered - -$markdown += New-MDHeader "Xamarin.iOS" -Level 4 -$markdown += New-MDList -Lines (Build-XamarinIOSList) -Style Unordered - -$markdown += New-MDHeader "Xamarin.Mac" -Level 4 -$markdown += New-MDList -Lines (Build-XamarinMacList) -Style Unordered - -$markdown += New-MDHeader "Xamarin.Android" -Level 4 -$markdown += New-MDList -Lines (Build-XamarinAndroidList) -Style Unordered +$markdown += New-MDHeader "Xamarin bundles" -Level 4 +$markdown += Build-XamarinTable | New-MDTable +$markdown += New-MDNewLine $markdown += New-MDHeader "Unit Test Framework" -Level 4 $markdown += New-MDList -Lines @(Get-NUnitVersion) -Style Unordered diff --git a/images/macos/software-report/SoftwareReport.Xamarin.psm1 b/images/macos/software-report/SoftwareReport.Xamarin.psm1 index de1eca6cd05c..2bd1b54763ae 100644 --- a/images/macos/software-report/SoftwareReport.Xamarin.psm1 +++ b/images/macos/software-report/SoftwareReport.Xamarin.psm1 @@ -1,7 +1,4 @@ -$sortRulesByVersion = @{ - Expression = { [System.Version]::Parse($_) } - Descending = $true -} +Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" function Get-VSMacVersion { $plistPath = "/Applications/Visual Studio.app/Contents/Info.plist" @@ -13,66 +10,22 @@ function Get-NUnitVersion { return "NUnit ${version}" } -function Build-MonoList { - $monoVersionsPath = "/Library/Frameworks/Mono.framework/Versions" - $monoFolders = Get-ChildItemWithoutSymlinks $monoVersionsPath - - $monoVersionList = $monoFolders | ForEach-Object { - $versionFilePath = Join-Path $_.FullName "Version" - if (Test-Path $versionFilePath) { - return Get-Content -Raw $versionFilePath - } - - return $_.Name - } | ForEach-Object { $_.Trim() } - - return $monoVersionList | Sort-Object -Property $sortRulesByVersion -} - -function Build-XamarinIOSList { - $sdkVersionsPath = "/Library/Frameworks/Xamarin.iOS.framework/Versions" - $sdkFolders = Get-ChildItemWithoutSymlinks $sdkVersionsPath - - $sdkVersionList = $sdkFolders | ForEach-Object { - $versionFilePath = Join-Path $_.FullName "Version" - if (Test-Path $versionFilePath) { - return Get-Content -Raw $versionFilePath - } - - return $_.Name - } | ForEach-Object { $_.Trim() } - - return $sdkVersionList | Sort-Object -Property $sortRulesByVersion -} - -function Build-XamarinMacList { - $sdkVersionsPath = "/Library/Frameworks/Xamarin.Mac.framework/Versions" - $sdkFolders = Get-ChildItemWithoutSymlinks $sdkVersionsPath - - $sdkVersionList = $sdkFolders | ForEach-Object { - $versionFilePath = Join-Path $_.FullName "Version" - if (Test-Path $versionFilePath) { - return Get-Content -Raw $versionFilePath +function Build-XamarinTable { + $xamarinBundles = Get-ToolsetValue "xamarin.bundles" + $defaultSymlink = Get-ToolsetValue "xamarin.bundle-default" + if ($defaultSymlink -eq "latest") { + $defaultSymlink = $xamarinBundles[0].symlink + } + + return $xamarinBundles | ForEach-Object { + $defaultPostfix = ($_.symlink -eq $defaultSymlink ) ? " (default)" : "" + [PSCustomObject] @{ + "symlink" = $_.symlink + $defaultPostfix + "Xamarin.Mono" = $_.mono + "Xamarin.iOS" = $_.ios + "Xamarin.Mac" = $_.mac + "Xamarin.Android" = $_.android } - - return $_.Name - } | ForEach-Object { $_.Trim() } - - return $sdkVersionList | Sort-Object -Property $sortRulesByVersion + } } -function Build-XamarinAndroidList { - $sdkVersionsPath = "/Library/Frameworks/Xamarin.Android.framework/Versions" - $sdkFolders = Get-ChildItemWithoutSymlinks $sdkVersionsPath - - $sdkVersionList = $sdkFolders | ForEach-Object { - $versionFilePath = Join-Path $_.FullName "Version" - if (Test-Path $versionFilePath) { - return Get-Content -Raw $versionFilePath - } - - return $_.Name - } | ForEach-Object { $_.Trim() } - - return $sdkVersionList | Sort-Object -Property $sortRulesByVersion -} \ No newline at end of file From 21b8cadc2cf62fa7a0365a67eb7617bff6040743 Mon Sep 17 00:00:00 2001 From: Dibir Magomedsaygitov <61747324+dibir-magomedsaygitov@users.noreply.github.com> Date: Thu, 8 Apr 2021 14:13:21 +0300 Subject: [PATCH 0135/3485] [Ubuntu] Remove apt source for podman, buildah and skopeo (#3077) * remove apt source list * debug * document source repo and fix installation * small fix --- .../SoftwareReport/SoftwareReport.Tools.psm1 | 9 ++++++--- images/linux/scripts/installers/containers.sh | 14 ++++++++++++-- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 index deab9dcd7e08..7e8dcfe32c05 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 @@ -34,17 +34,20 @@ function Get-CodeQLBundleVersion { function Get-PodManVersion { $podmanVersion = podman --version | Take-OutputPart -Part 2 - return "Podman $podmanVersion" + $aptSourceRepo = Get-AptSourceRepository -PackageName "containers" + return "Podman $podmanVersion (apt source repository: $aptSourceRepo)" } function Get-BuildahVersion { $buildahVersion = buildah --version | Take-OutputPart -Part 2 - return "Buildah $buildahVersion" + $aptSourceRepo = Get-AptSourceRepository -PackageName "containers" + return "Buildah $buildahVersion (apt source repository: $aptSourceRepo)" } function Get-SkopeoVersion { $skopeoVersion = skopeo --version | Take-OutputPart -Part 2 - return "Skopeo $skopeoVersion" + $aptSourceRepo = Get-AptSourceRepository -PackageName "containers" + return "Skopeo $skopeoVersion (apt source repository: $aptSourceRepo)" } function Get-CMakeVersion { diff --git a/images/linux/scripts/installers/containers.sh b/images/linux/scripts/installers/containers.sh index 65adc22cefd1..edeb0f78b942 100644 --- a/images/linux/scripts/installers/containers.sh +++ b/images/linux/scripts/installers/containers.sh @@ -4,10 +4,14 @@ ## Desc: Installs container tools: podman, buildah and skopeo onto the image ################################################################################ -# Install podman, buildah, scopeo container's tools +source $HELPER_SCRIPTS/os.sh + install_packages=(podman buildah skopeo) +REPO_URL="https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable" + +# Install podman, buildah, scopeo container's tools (on Ubuntu20 these tools can be installed without adding new repository) source /etc/os-release -sh -c "echo 'deb https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/x${NAME}_${VERSION_ID}/ /' > /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list" +sh -c "echo 'deb ${REPO_URL}/x${NAME}_${VERSION_ID}/ /' > /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list" wget -qnv https://download.opensuse.org/repositories/devel:kubic:libcontainers:stable/x${NAME}_${VERSION_ID}/Release.key -O Release.key apt-key add Release.key apt-get update -qq @@ -15,4 +19,10 @@ apt-get -qq -y install ${install_packages[@]} mkdir -p /etc/containers echo -e "[registries.search]\nregistries = ['docker.io', 'quay.io']" | tee /etc/containers/registries.conf +# Remove source repo +rm /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list + +# Document source repo +echo "containers $REPO_URL" >> $HELPER_SCRIPTS/apt-sources.txt + invoke_tests "Tools" "Containers" From 5ee9fb397b014ff560e48c66bbf290eff911f02b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 8 Apr 2021 11:37:52 +0000 Subject: [PATCH 0136/3485] macOS 10.14 (20210405 update) (#3115) * Updating readme file for macOS-10.14 version 20210405.1 * fixed packer version Co-authored-by: Image generation service account Co-authored-by: Alena Sviridenko Co-authored-by: Actions service account --- images/macos/macos-10.14-Readme.md | 111 ++++++++++++++--------------- 1 file changed, 55 insertions(+), 56 deletions(-) diff --git a/images/macos/macos-10.14-Readme.md b/images/macos/macos-10.14-Readme.md index 145955e4b732..55c1137c2565 100644 --- a/images/macos/macos-10.14-Readme.md +++ b/images/macos/macos-10.14-Readme.md @@ -1,12 +1,11 @@ | Announcements | |-| -| [[Ubuntu, macOS] .NET 3.0 will be removed from images on March, 1](https://github.com/actions/virtual-environments/issues/2558) | | [macOS 11.0 pools will be transited to private preview.](https://github.com/actions/virtual-environments/issues/2486) | *** # macOS 10.14 info - System Version: macOS 10.14.6 (18G8022) - Kernel Version: Darwin 18.7.0 -- Image Version: 20210308.1 +- Image Version: 20210405.1 ## Installed Software ### Language and Runtime @@ -20,31 +19,31 @@ - GNU Fortran (Homebrew GCC 10.2.0_4) 10.2.0 - available by `gfortran-10` alias - GNU Fortran (Homebrew GCC 8.4.0_2) 8.4.0 - available by `gfortran-8` alias - GNU Fortran (Homebrew GCC 9.3.0_1) 9.3.0 - available by `gfortran-9` alias -- Go 1.15.8 -- julia 1.5.3 +- Go 1.15.11 +- julia 1.6.0 - Node.js v8.17.0 -- NVM - Cached node versions: v10.24.0 v12.21.0 v14.16.0 -- NVM 0.37.2 +- NVM - Cached node versions: v10.24.0 v12.22.0 v14.16.0 +- NVM 0.38.0 - Perl 5.32.1 - PHP 8.0.3 - Python 2.7.18 - Python 3.9.2 -- R 4.0.4 +- R 4.0.5 - Ruby 2.7.2p137 ### Package Management -- Bundler version 2.2.14 +- Bundler version 2.2.15 - Carthage 0.37.0 - CocoaPods 1.10.1 -- Composer 2.0.11 -- Homebrew 3.0.4 +- Composer 2.0.12 +- Homebrew 3.0.10 - Miniconda 4.9.2 - NPM 3.10.10 - NuGet 4.7.0.5148 - Pip 20.3.4 (python 2.7) - Pip 21.0.1 (python 3.9) - Pipx 0.16.1.0 -- RubyGems 3.2.14 +- RubyGems 3.2.15 - Yarn 1.22.5 #### Environment variables @@ -55,35 +54,35 @@ ### Project Management - Apache Ant(TM) 1.10.9 -- Apache Maven 3.6.3 +- Apache Maven 3.8.1 - Gradle 6.8.3 ### Utilities -- 7-Zip 17.03 +- 7-Zip 17.04 - aria2 1.35.0 - azcopy 10.9.0 - bazel 3.7.1 - bazelisk 1.7.5 - bsdtar 2.8.3 - available by 'tar' alias -- Curl 7.75.0 -- Git LFS: 2.13.2 -- Git: 2.30.1 -- GitHub CLI: 1.7.0 -- GNU parallel 20201122 +- Curl 7.76.0 +- Git LFS: 2.13.3 +- Git: 2.31.1 +- GitHub CLI: 1.8.1 +- GNU parallel 20210322 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.1 - gpg (GnuPG) 2.2.27 -- helm v3.5.2+g167aac7 +- helm v3.5.3+g041ce5a - Hub CLI: 2.14.2 - jq 1.6 - mongo v4.4.3 - mongod v4.4.3 -- OpenSSL 1.1.1j 16 Feb 2021 `(/usr/local/opt/openssl -> /usr/local/Cellar/openssl@1.1/1.1.1j)` -- Packer 1.7.0 +- OpenSSL 1.1.1k 25 Mar 2021 `(/usr/local/opt/openssl -> /usr/local/Cellar/openssl@1.1/1.1.1k)` +- Packer 1.7.1 - PostgreSQL 13.2 - psql (PostgreSQL) 13.2 - Subversion (SVN) 1.14.1 -- Vagrant 2.2.14 +- Vagrant 2.2.15 - virtualbox 6.1.18r142142 - zstd 1.4.9 @@ -91,30 +90,30 @@ ### Tools - Aliyun CLI 3.0.73 - App Center CLI 1.2.2 -- AWS CLI 2.1.29 -- AWS SAM CLI 1.20.0 +- AWS CLI 2.1.34 +- AWS SAM CLI 1.21.1 - AWS Session Manager CLI 1.2.30.0 -- Azure CLI 2.20.0 +- Azure CLI 2.21.0 - Cabal 3.4.0.0 -- Cmake 3.19.6 -- Fastlane 2.177.0 +- Cmake 3.20.0 +- Fastlane 2.179.0 - GHC 9.0.1 - GHCup v0.1.14 - Stack 2.5.1 - Xcode Command Line Tools 10.3.0.0.1.1562985497 ### Linters -- SwiftLint 0.43.0 +- SwiftLint 0.43.1 - yamllint 1.26.0 ### Browsers - Safari 14.0.3 (14610.4.3.1.7) - SafariDriver 14.0.3 (14610.4.3.1.7) -- Google Chrome 89.0.4389.82 +- Google Chrome 89.0.4389.114 - ChromeDriver 89.0.4389.23 -- Microsoft Edge 89.0.774.45 -- MSEdgeDriver 89.0.774.48 -- Mozilla Firefox 86.0 +- Microsoft Edge 89.0.774.63 +- MSEdgeDriver 89.0.774.68 +- Mozilla Firefox 87.0 - geckodriver 0.29.0 #### Environment variables @@ -125,13 +124,13 @@ | GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | ### Java -| Version | Vendor | Environment Variable | -| --------- | ------------ | -------------------- | -| 1.8.0_282 | AdoptOpenJDK | JAVA_HOME_8_X64 | -| 11.0.10 | AdoptOpenJDK | JAVA_HOME_11_X64 | -| 12.0.2 | AdoptOpenJDK | JAVA_HOME_12_X64 | -| 13.0.2 | AdoptOpenJDK | JAVA_HOME_13_X64 | -| 14.0.2 | AdoptOpenJDK | JAVA_HOME_14_X64 | +| Version | Vendor | Environment Variable | +| ----------- | ------------- | -------------------- | +| 8.0.282+8 | Adopt OpenJDK | JAVA_HOME_8_X64 | +| 11.0.10+9 | Adopt OpenJDK | JAVA_HOME_11_X64 | +| 12.0.2+10.3 | Adopt OpenJDK | JAVA_HOME_12_X64 | +| 13.0.2+8.1 | Adopt OpenJDK | JAVA_HOME_13_X64 | +| 14.0.2+12 | Adopt OpenJDK | JAVA_HOME_14_X64 | ### Cached Tools #### Ruby @@ -147,7 +146,7 @@ - 3.6.13 - 3.7.10 - 3.8.8 -- 3.9.2 +- 3.9.4 #### PyPy - 2.7.18 [PyPy 7.3.3] @@ -155,31 +154,31 @@ #### Node.js - 10.24.0 -- 12.21.0 +- 12.22.0 - 14.16.0 #### Go - 1.13.15 - 1.14.15 -- 1.15.8 -- 1.16.0 +- 1.15.11 +- 1.16.3 ### Rust Tools -- Cargo 1.50.0 -- Rust 1.50.0 -- Rustdoc 1.50.0 +- Cargo 1.51.0 +- Rust 1.51.0 +- Rustdoc 1.51.0 - Rustup 1.23.1 #### Packages -- Bindgen 0.57.0 +- Bindgen 0.58.0 - Cargo-audit 0.14.0 - Cargo-outdated v0.9.14 - Cbindgen 0.18.0 -- Clippy 0.0.212 -- Rustfmt 1.4.30-stable +- Clippy 0.1.51 +- Rustfmt 1.4.36-stable ### PowerShell Tools -- PowerShell 7.1.2 +- PowerShell 7.1.3 #### PowerShell Modules | Module | Version | @@ -292,7 +291,7 @@ #### Xcode Support Tools - xcpretty 0.3.0 - xcversion 2.6.8 -- Nomad CLI 3.2.14 +- Nomad CLI 3.2.15 - Nomad CLI IPA ipa 0.14.3 - xctool 0.3.7 @@ -389,17 +388,17 @@ | Package Name | Version | | -------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 3.0 | -| Android Emulator | 30.4.5 | +| Android Emulator | 30.5.4 | | Android SDK Build-tools | 30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3
26.0.0 26.0.1 26.0.2 26.0.3
25.0.0 25.0.1 25.0.2 25.0.3
24.0.0 24.0.1 24.0.2 24.0.3
23.0.1 23.0.2 23.0.3 23.0.0
22.0.1 22.0.0
21.1.2 21.0.0 21.0.1 21.0.2 21.1.0 21.1.1
20.0.0
19.1.0 19.0.0 19.0.1 19.0.2 19.0.3
18.0.1 18.1.0 18.1.1
17.0.0 | -| Android SDK Platforms | android-S (rev 1)
android-30 (rev 3)
android-29 (rev 5)
android-28 (rev 6)
android-27 (rev 3)
android-26 (rev 2)
android-25 (rev 3)
android-24 (rev 2)
android-23 (rev 3)
android-22 (rev 2)
android-21 (rev 2)
android-20 (rev 2)
android-19 (rev 4)
android-18 (rev 3)
android-17 (rev 3)
android-16 (rev 5)
android-15 (rev 5) | -| Android SDK Platform-Tools | 31.0.0 | +| Android SDK Platforms | android-S (rev 2)
android-30 (rev 3)
android-29 (rev 5)
android-28 (rev 6)
android-27 (rev 3)
android-26 (rev 2)
android-25 (rev 3)
android-24 (rev 2)
android-23 (rev 3)
android-22 (rev 2)
android-21 (rev 2)
android-20 (rev 2)
android-19 (rev 4)
android-18 (rev 3)
android-17 (rev 3)
android-16 (rev 5)
android-15 (rev 5) | +| Android SDK Platform-Tools | 31.0.1 | | Android SDK Tools | 26.1.1 | | Android Support Repository | 47.0.0 | | CMake | 3.10.2 | | Google APIs | addon-google_apis-google-21
addon-google_apis-google-22
addon-google_apis-google-23
addon-google_apis-google-24 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 15.2.4203891
18.1.5063045
21.4.7075529
22.0.7026061 | +| NDK | 15.2.4203891
18.1.5063045
21.4.7075529
22.1.7171670 | | SDK Patch Applier v4 | 1 | #### Environment variables @@ -408,7 +407,7 @@ | ANDROID_HOME | /Users/runner/Library/Android/sdk | | ANDROID_NDK_18R_PATH | /Users/runner/Library/Android/sdk/ndk/18.1.5063045 | | ANDROID_NDK_HOME | /Users/runner/Library/Android/sdk/ndk-bundle -> /Users/runner/Library/Android/sdk/ndk/21.4.7075529 | -| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/22.0.7026061 | +| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/22.1.7171670 | | ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk-bundle -> /Users/runner/Library/Android/sdk/ndk/21.4.7075529 | | ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | From 66088ce57745a6bdab7b7fd5a017363176073412 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 8 Apr 2021 11:41:35 +0000 Subject: [PATCH 0137/3485] Ubuntu 1804 (20210405 update) (#3094) * Updating readme file for ubuntu18 version 20210405.1 * Update Ubuntu1804-README.md Co-authored-by: Image generation service account Co-authored-by: Alena Sviridenko Co-authored-by: Actions service account --- images/linux/Ubuntu1804-README.md | 82 ++++++++++++++----------------- 1 file changed, 36 insertions(+), 46 deletions(-) diff --git a/images/linux/Ubuntu1804-README.md b/images/linux/Ubuntu1804-README.md index 40bc9b667e26..cbe0d7d6b8f4 100644 --- a/images/linux/Ubuntu1804-README.md +++ b/images/linux/Ubuntu1804-README.md @@ -1,17 +1,17 @@ | Announcements | |-| -| [[Ubuntu] Clang, GCC and Gfortran versions less than 9.x will be removed from images on March, 29](https://github.com/actions/virtual-environments/issues/2950) | | [[windows, ubuntu] Az, Azure and AzureRM module preinstallation policy will be changed on March, 29th](https://github.com/actions/virtual-environments/issues/2916) | *** # Ubuntu 18.04.5 LTS - Linux kernel version: 5.4.0-1043-azure -- Image Version: 20210330.1 +- Image Version: 20210405.1 ## Installed Software ### Language and Runtime - Bash 4.4.20(1)-release - Clang 9.0.0 -- Erlang 11.1.7 +- Clang-format 9.0.0 +- Erlang 23.2.3 (Eshell 11.1.7) - GNU C++ 7.5.0, 9.3.0, 10.1.0 - GNU Fortran 7.5.0, 9.3.0, 10.1.0 - Julia 1.6.0 @@ -33,8 +33,8 @@ - Pip3 9.0.1 - Pipx 0.16.1.0 - RubyGems 2.7.6 -- Vcpkg (build from master \<1054567>) -- Yarn 1.22.5 +- Vcpkg (build from master \<030cfaa>) +- Yarn 1.22.10 #### Environment variables | Name | Value | @@ -46,21 +46,17 @@ - Ant 1.10.5 - Gradle 6.8.3 - Maven 3.6.3 -- Sbt 1.4.9 +- Sbt 1.5.0 ### Tools -- 7-Zip 16.02 - Ansible 2.10.7 - apt-fast 1.9.10 - AzCopy 10.9.0 (available by `azcopy` and `azcopy10` aliases) - Bazel 4.0.0 - Bazelisk 1.7.5 -- binutils 2.30 - Buildah 1.19.6 - CMake 3.20.0 - CodeQL Action Bundle 2.5.0 -- coreutils 8.28 -- curl 7.58.0 - Docker Compose 1.28.6 - Docker-Buildx 0.5.1 - Docker-Moby Client 20.10.5+azure @@ -70,48 +66,40 @@ - Git-ftp 1.3.1 - Haveged 1.9.1 - Heroku 7.51.0 -- HHVM (HipHop VM) 4.102.0 +- HHVM (HipHop VM) 4.103.0 - jq 1.5 - Kind 0.10.0 - Kubectl 1.20.1-5-g76a04fc - Kustomize 4.0.5 - Leiningen 2.9.5 -- m4 1.4.18 - MediaInfo 17.12 - Mercurial 4.5.3 - Minikube 1.18.1 -- net-tools 1.60 - Newman 5.2.2 - nvm 0.38.0 - OpenSSL 1.1.1 11 Sep 2018 -- Packer 1.7.0 -- pass 1.7.1 +- Packer 1.7.1 - PhantomJS 2.1.1 - Podman 3.0.1 -- Pulumi 2.23.2 -- R 4.0.4 +- Pulumi 2.24.1 +- R 4.0.5 - Skopeo 1.2.2 - Sphinx Open Source Search Server 2.2.11 - SVN 1.9.7 -- Swig 3.0.12 - Terraform 0.14.9 -- unzip 6.00 -- wget 1.19.4 - yamllint 1.26.0 -- zip 3.0 -- zstd 1.3.3 ### CLI Tools - Alibaba Cloud CLI 3.0.73 -- AWS CLI 1.19.40 +- AWS CLI 1.19.44 - AWS CLI Session manager plugin 1.2.54.0 - AWS SAM CLI 1.21.1 - Azure CLI (azure-cli) 2.21.0 - Azure CLI (azure-devops) 0.18.0 -- GitHub CLI 1.7.0 -- Google Cloud SDK 333.0.0 +- GitHub CLI 1.8.1 +- Google Cloud SDK 334.0.0 - Hub CLI 2.14.2 -- Netlify CLI 3.13.8 +- Netlify CLI 3.14.0 - OpenShift CLI 4.7.4 - ORAS CLI 0.11.1 - Vercel CLI 21.3.3 @@ -127,7 +115,7 @@ | Tool | Version | | -------- | --------------------------------- | | PHP | 7.1.33 7.2.34 7.3.27 7.4.16 8.0.3 | -| Composer | 2.0.11 | +| Composer | 2.0.12 | | PHPUnit | 8.5.15 | ### Haskell @@ -143,7 +131,7 @@ - Rustup 1.23.1 #### Packages -- Bindgen 0.57.0 +- Bindgen 0.58.0 - Cargo audit 0.14.0 - Cargo clippy 0.1.51 - Cargo outdated 0.9.14 @@ -151,10 +139,11 @@ - Rustfmt 1.4.36 ### Browsers and Drivers -- Google Chrome 89.0.4389.90 +- Google Chrome 89.0.4389.114 - ChromeDriver 89.0.4389.23 - Mozilla Firefox 87.0 - Geckodriver 0.29.0 +- Chromium 89.0.4389.0 #### Environment variables | Name | Value | @@ -165,9 +154,6 @@ ### .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.519 2.1.520 2.1.521 2.1.522 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.616 2.1.617 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 2.1.811 2.1.812 2.1.813 2.1.814 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.109 3.1.110 3.1.111 3.1.112 3.1.113 3.1.200 3.1.201 3.1.202 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 5.0.100 5.0.101 5.0.102 5.0.103 5.0.104 5.0.200 5.0.201 -### Az Module -- 5.5.0 3.1.0.zip 4.4.0.zip - ### Databases - MongoDB 4.4.4 - Postgre SQL 13.2 @@ -187,11 +173,11 @@ #### Go - 1.13.15 - 1.14.15 -- 1.15.10 +- 1.15.11 #### Node.js - 10.24.0 -- 12.21.0 +- 12.22.0 - 14.16.0 #### PyPy @@ -204,7 +190,7 @@ - 3.6.13 - 3.7.10 - 3.8.8 -- 3.9.2 +- 3.9.4 #### Ruby - 2.4.10 @@ -218,7 +204,7 @@ | --------------- | ----------------------------------- | ------------ | | GOROOT_1_13_X64 | /opt/hostedtoolcache/go/1.13.15/x64 | x64 | | GOROOT_1_14_X64 | /opt/hostedtoolcache/go/1.14.15/x64 | x64 | -| GOROOT_1_15_X64 | /opt/hostedtoolcache/go/1.15.10/x64 | x64 | +| GOROOT_1_15_X64 | /opt/hostedtoolcache/go/1.15.11/x64 | x64 | ### PowerShell Tools - PowerShell 7.1.3 @@ -229,6 +215,9 @@ | MarkdownPS | 1.9 | | Pester | 5.1.1 | +#### Az PowerShell Modules +- 5.5.0 3.1.0.zip 4.4.0.zip + ### Web Servers | Name | Version | ConfigFile | ServiceStatus | ListenPort | | ------- | ------- | ------------------------- | ------------- | ---------- | @@ -262,18 +251,18 @@ ### Cached Docker images | Repository:Tag | Digest | Created | | ---------------------- | ------------------------------------------------------------------------ | ---------- | -| alpine:3.10 | sha256:f2fa517acf6123318bc893c411f34570cea193367b33bd3be1d90c7fbefe72a5 | 2021-03-25 | +| alpine:3.10 | sha256:4929878917a37edf0b7f69594552508a3432fe304335dd92be29bbaa839362ed | 2021-03-31 | | alpine:3.7 | sha256:8421d9a84432575381bfabd248f1eb56f3aa21d9d7cd2511583c68c9b7511d10 | 2019-03-07 | | alpine:3.8 | sha256:2bb501e6173d9d006e56de5bce2720eb06396803300fe1687b58a7ff32bf4c14 | 2020-01-23 | | alpine:3.9 | sha256:414e0518bb9228d35e4cd5165567fb91d26c6a214e9c95899e1e056fcd349011 | 2020-04-24 | -| buildpack-deps:buster | sha256:ff6c309ddf5b2021da0f1bbdde5020be3840113058c50863fc05ba840c4db4b3 | 2021-03-27 | -| buildpack-deps:stretch | sha256:74e5ae35428c523829353a156f34e44e3d9047d97eeb44cff883d7a654214064 | 2021-03-27 | +| buildpack-deps:buster | sha256:08e16a0f30c3b53918405bfec408efdc5f058136a9715ad6479e503100b1c8ff | 2021-03-30 | +| buildpack-deps:stretch | sha256:7e051954f6d8d951be2f555b111bec8835a8c3fc18ad23425a25c7ce141e06b0 | 2021-03-30 | | debian:8 | sha256:32ad5050caffb2c7e969dac873bce2c370015c2256ff984b70c1c08b3a2816a0 | 2021-03-26 | -| debian:9 | sha256:20fb077345a1c2447b5746ffa3c9623a8eb87c15e8543e2e48387a7224366d88 | 2021-03-26 | -| node:10 | sha256:828fce99d975b94406af6b089ce44904eee7f61b4c9702c71068065472084848 | 2021-03-27 | -| node:10-alpine | sha256:999c6a67a36b8a682491124ddd49ff6585bd61d7c1d150ff2ce088d668250d4f | 2021-03-25 | -| node:12 | sha256:ad1c01aeb58e1fbfb5439eb2b954ab0fcdccd81202f90e6484915222a07d2528 | 2021-03-27 | -| node:12-alpine | sha256:b1b260826bea495c02f35228b37e7b63e50dffc9fca4f9c9a532787a5de978ea | 2021-03-25 | +| debian:9 | sha256:4b9b2ef8de1f3e9531626e8eb3d19e104e9dfde0a2b0f42b763b38235773f48e | 2021-03-30 | +| node:10 | sha256:1e8c3b26a17b53b4faabccd886d262ed3c58ceb07b08795783c53ec9403432fa | 2021-03-31 | +| node:10-alpine | sha256:8876535a96d4a8a71b8899851824d93d9595f9a8ae75a534d0076636db4587b3 | 2021-04-01 | +| node:12 | sha256:1f7e77446431e580974828a59e55d08bcbdb3147e58d9f207215201e5e008258 | 2021-03-31 | +| node:12-alpine | sha256:c4e50b1f0f4f86b7f1a2315efc9dea7e2d4152975da6125d1f981d8d0bca09b5 | 2021-04-01 | | ubuntu:14.04 | sha256:4a8a6fa8810a3e01352981b35165b0b28403fe2a4e2535e315b23b4a69cd130a | 2021-03-25 | ### Installed apt packages @@ -285,7 +274,7 @@ | build-essential | 12.4ubuntu1 | | bzip2 | 1.0.6-8.1ubuntu0.2 | | coreutils | 8.28-1ubuntu1 | -| curl | 7.58.0-2ubuntu3.12 | +| curl | 7.58.0-2ubuntu3.13 | | dbus | 1.12.2-1ubuntu1.2 | | dnsutils | 1:9.11.3+dfsg-1ubuntu1.14 | | dpkg | 1.19.0.5ubuntu2.3 | @@ -302,7 +291,7 @@ | lib32z1 | 1:1.2.11.dfsg-0ubuntu2 | | libc++-dev | 6.0-2 | | libc++abi-dev | 6.0-2 | -| libcurl3 | 7.58.0-2ubuntu3.12 | +| libcurl3 | 7.58.0-2ubuntu3.13 | | libgbm-dev | 20.0.8-0ubuntu1~18.04.1 | | libgconf-2-4 | 3.2.6-4ubuntu1 | | libgsl-dev | 2.4+dfsg-6 | @@ -328,6 +317,7 @@ | patchelf | 0.9-1 | | pkg-config | 0.29.1-0ubuntu2 | | pollinate | 4.33-0ubuntu1~18.04.2 | +| python-setuptools | 39.0.1-2 | | rpm | 4.14.1+dfsg1-2 | | rsync | 3.1.2-2.1ubuntu1.1 | | shellcheck | 0.4.6-1 | From 76e1f282a1d19ef423dbb4b031ed9727873431af Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 8 Apr 2021 11:44:57 +0000 Subject: [PATCH 0138/3485] Ubuntu 1604 (20210405 update) (#3092) * Updating readme file for ubuntu16 version 20210405.1 * fixed packer version Co-authored-by: Image generation service account Co-authored-by: Alena Sviridenko Co-authored-by: Actions service account --- images/linux/Ubuntu1604-README.md | 89 ++++++++++++++----------------- 1 file changed, 39 insertions(+), 50 deletions(-) diff --git a/images/linux/Ubuntu1604-README.md b/images/linux/Ubuntu1604-README.md index a54f3522dd43..8a262521d063 100644 --- a/images/linux/Ubuntu1604-README.md +++ b/images/linux/Ubuntu1604-README.md @@ -1,17 +1,17 @@ | Announcements | |-| -| [[Ubuntu] Clang, GCC and Gfortran versions less than 9.x will be removed from images on March, 29](https://github.com/actions/virtual-environments/issues/2950) | | [[windows, ubuntu] Az, Azure and AzureRM module preinstallation policy will be changed on March, 29th](https://github.com/actions/virtual-environments/issues/2916) | *** # Ubuntu 16.04.7 LTS - Linux kernel version: 4.15.0-1111-azure -- Image Version: 20210327.1 +- Image Version: 20210405.1 ## Installed Software ### Language and Runtime - Bash 4.3.48(1)-release - Clang 9.0.1 -- Erlang 11.1.7 +- Clang-format 9.0.1 +- Erlang 23.2.3 (Eshell 11.1.7) - GNU C++ 5.5.0, 9.3.0 - GNU Fortran 5.5.0, 9.3.0 - Julia 1.6.0 @@ -26,14 +26,14 @@ ### Package Management - cpan 1.61 - Helm 3.5.3 -- Homebrew 3.0.9 +- Homebrew 3.0.10 - Miniconda 4.9.2 - Npm 6.14.11 - Pip 8.1.1 - Pip3 8.1.1 - RubyGems 2.5.2 -- Vcpkg (build from master \<9f6157a>) -- Yarn 1.22.5 +- Vcpkg (build from master \<030cfaa>) +- Yarn 1.22.10 #### Environment variables | Name | Value | @@ -45,20 +45,16 @@ - Ant 1.9.6 - Gradle 6.8.3 - Maven 3.6.3 -- Sbt 1.4.9 +- Sbt 1.5.0 ### Tools -- 7-Zip 9.20 - Ansible 2.9.19 - apt-fast 1.9.10 - AzCopy 10.9.0 (available by `azcopy` and `azcopy10` aliases) - Bazel 4.0.0 - Bazelisk 1.7.5 -- binutils 2.26.1 - CMake 3.20.0 - CodeQL Action Bundle 2.5.0 -- coreutils 8.25 -- curl 7.47.0 - Docker Compose 1.28.6 - Docker-Buildx 0.5.1 - Docker-Moby Client 20.10.5+azure @@ -74,41 +70,32 @@ - Kubectl 1.20.1-5-g76a04fc - Kustomize 4.0.5 - Leiningen 2.9.5 -- m4 1.4.17 - MediaInfo 0.7.82 - Mercurial 4.4.1 - Minikube 1.18.1 -- net-tools 1.60 - Newman 5.2.2 -- nvm 0.37.2 +- nvm 0.38.0 - OpenSSL 1.0.2g 1 Mar 2016 -- Packer 1.7.0 -- pass 1.6.5 +- Packer 1.7.1 - PhantomJS 2.1.1 -- Pulumi 2.23.2 -- R 4.0.4 +- Pulumi 2.24.1 +- R 4.0.5 - Sphinx Open Source Search Server 2.2.9 - SVN 1.9.3 -- Swig 3.0.8 - Terraform 0.14.9 -- unzip 6.00 -- wget 1.17.1 -- yamllint 1.2.1 -- zip 3.0 -- zstd 1.3.1 ### CLI Tools - Alibaba Cloud CLI 3.0.73 -- AWS CLI 1.19.39 +- AWS CLI 1.19.44 - AWS CLI Session manager plugin 1.2.54.0 - AWS SAM CLI 1.21.1 - Azure CLI (azure-cli) 2.21.0 - Azure CLI (azure-devops) 0.18.0 -- GitHub CLI 1.7.0 -- Google Cloud SDK 333.0.0 +- GitHub CLI 1.8.1 +- Google Cloud SDK 334.0.0 - Hub CLI 2.14.2 -- Netlify CLI 3.13.7 -- OpenShift CLI 4.7.3 +- Netlify CLI 3.14.0 +- OpenShift CLI 4.7.4 - ORAS CLI 0.11.1 - Vercel CLI 21.3.3 @@ -116,14 +103,14 @@ | Version | Vendor | Environment Variable | | ------------------- | ------------- | -------------------- | | 8.0.282+8 (default) | Adopt OpenJDK | JAVA_HOME_8_X64 | -| 12.0.2+10 | Adopt OpenJDK | JAVA_HOME_12_X64 | | 11.0.10+9 | Adopt OpenJDK | JAVA_HOME_11_X64 | +| 12.0.2+10 | Adopt OpenJDK | JAVA_HOME_12_X64 | ### PHP | Tool | Version | | -------- | ----------------------------------------------- | | PHP | 5.6.40 7.0.33 7.1.33 7.2.34 7.3.27 7.4.16 8.0.3 | -| Composer | 2.0.11 | +| Composer | 2.0.12 | | PHPUnit | 8.5.15 | ### Haskell @@ -139,7 +126,7 @@ - Rustup 1.23.1 #### Packages -- Bindgen 0.57.0 +- Bindgen 0.58.0 - Cargo audit 0.14.0 - Cargo clippy 0.1.51 - Cargo outdated 0.9.14 @@ -147,10 +134,11 @@ - Rustfmt 1.4.36 ### Browsers and Drivers -- Google Chrome 89.0.4389.90 +- Google Chrome 89.0.4389.114 - ChromeDriver 89.0.4389.23 - Mozilla Firefox 87.0 - Geckodriver 0.29.0 +- Chromium 89.0.4389.0 #### Environment variables | Name | Value | @@ -161,9 +149,6 @@ ### .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.519 2.1.520 2.1.521 2.1.522 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.616 2.1.617 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 2.1.811 2.1.812 2.1.813 2.1.814 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.109 3.1.110 3.1.111 3.1.112 3.1.113 3.1.200 3.1.201 3.1.202 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 5.0.100 5.0.101 5.0.102 5.0.103 5.0.104 5.0.200 5.0.201 -### Az Module -- 5.5.0 3.1.0.zip 4.4.0.zip - ### Databases - MongoDB 4.4.4 - Postgre SQL 13.2 @@ -183,11 +168,11 @@ #### Go - 1.13.15 - 1.14.15 -- 1.15.10 +- 1.15.11 #### Node.js - 10.24.0 -- 12.21.0 +- 12.22.0 - 14.16.0 #### PyPy @@ -200,7 +185,7 @@ - 3.6.13 - 3.7.10 - 3.8.8 -- 3.9.2 +- 3.9.4 #### Ruby - 2.4.10 @@ -214,7 +199,7 @@ | --------------- | ----------------------------------- | ------------ | | GOROOT_1_13_X64 | /opt/hostedtoolcache/go/1.13.15/x64 | x64 | | GOROOT_1_14_X64 | /opt/hostedtoolcache/go/1.14.15/x64 | x64 | -| GOROOT_1_15_X64 | /opt/hostedtoolcache/go/1.15.10/x64 | x64 | +| GOROOT_1_15_X64 | /opt/hostedtoolcache/go/1.15.11/x64 | x64 | ### PowerShell Tools - PowerShell 7.1.3 @@ -225,6 +210,9 @@ | MarkdownPS | 1.9 | | Pester | 5.1.1 | +#### Az PowerShell Modules +- 5.5.0 3.1.0.zip 4.4.0.zip + ### Web Servers | Name | Version | ConfigFile | ServiceStatus | ListenPort | | ------- | ------- | ------------------------- | ------------- | ---------- | @@ -258,18 +246,18 @@ ### Cached Docker images | Repository:Tag | Digest | Created | | ---------------------- | ------------------------------------------------------------------------ | ---------- | -| alpine:3.10 | sha256:f2fa517acf6123318bc893c411f34570cea193367b33bd3be1d90c7fbefe72a5 | 2021-03-25 | +| alpine:3.10 | sha256:4929878917a37edf0b7f69594552508a3432fe304335dd92be29bbaa839362ed | 2021-03-31 | | alpine:3.7 | sha256:8421d9a84432575381bfabd248f1eb56f3aa21d9d7cd2511583c68c9b7511d10 | 2019-03-07 | | alpine:3.8 | sha256:2bb501e6173d9d006e56de5bce2720eb06396803300fe1687b58a7ff32bf4c14 | 2020-01-23 | | alpine:3.9 | sha256:414e0518bb9228d35e4cd5165567fb91d26c6a214e9c95899e1e056fcd349011 | 2020-04-24 | -| buildpack-deps:buster | sha256:ff6c309ddf5b2021da0f1bbdde5020be3840113058c50863fc05ba840c4db4b3 | 2021-03-27 | -| buildpack-deps:stretch | sha256:74e5ae35428c523829353a156f34e44e3d9047d97eeb44cff883d7a654214064 | 2021-03-27 | +| buildpack-deps:buster | sha256:08e16a0f30c3b53918405bfec408efdc5f058136a9715ad6479e503100b1c8ff | 2021-03-30 | +| buildpack-deps:stretch | sha256:7e051954f6d8d951be2f555b111bec8835a8c3fc18ad23425a25c7ce141e06b0 | 2021-03-30 | | debian:8 | sha256:32ad5050caffb2c7e969dac873bce2c370015c2256ff984b70c1c08b3a2816a0 | 2021-03-26 | -| debian:9 | sha256:20fb077345a1c2447b5746ffa3c9623a8eb87c15e8543e2e48387a7224366d88 | 2021-03-26 | -| node:10 | sha256:c102472f61dc2ced4fa974ac7a4ef43ba801dd7221c612c69db086265489803f | 2021-03-12 | -| node:10-alpine | sha256:999c6a67a36b8a682491124ddd49ff6585bd61d7c1d150ff2ce088d668250d4f | 2021-03-25 | -| node:12 | sha256:a6b801a76c4bcbce39cf94bf2005d54ebdab4984ffdda335a46679c80fa6f54e | 2021-03-12 | -| node:12-alpine | sha256:b1b260826bea495c02f35228b37e7b63e50dffc9fca4f9c9a532787a5de978ea | 2021-03-25 | +| debian:9 | sha256:4b9b2ef8de1f3e9531626e8eb3d19e104e9dfde0a2b0f42b763b38235773f48e | 2021-03-30 | +| node:10 | sha256:1e8c3b26a17b53b4faabccd886d262ed3c58ceb07b08795783c53ec9403432fa | 2021-03-31 | +| node:10-alpine | sha256:8876535a96d4a8a71b8899851824d93d9595f9a8ae75a534d0076636db4587b3 | 2021-04-01 | +| node:12 | sha256:1f7e77446431e580974828a59e55d08bcbdb3147e58d9f207215201e5e008258 | 2021-03-31 | +| node:12-alpine | sha256:c4e50b1f0f4f86b7f1a2315efc9dea7e2d4152975da6125d1f981d8d0bca09b5 | 2021-04-01 | | ubuntu:14.04 | sha256:4a8a6fa8810a3e01352981b35165b0b28403fe2a4e2535e315b23b4a69cd130a | 2021-03-25 | ### Installed apt packages @@ -281,7 +269,7 @@ | build-essential | 12.1ubuntu2 | | bzip2 | 1.0.6-8ubuntu0.2 | | coreutils | 8.25-2ubuntu3~16.04 | -| curl | 7.47.0-1ubuntu2.18 | +| curl | 7.47.0-1ubuntu2.19 | | dbus | 1.10.6-1ubuntu3.6 | | dnsutils | 1:9.10.3.dfsg.P4-8ubuntu1.18 | | dpkg | 1.18.4ubuntu1.6 | @@ -298,7 +286,7 @@ | lib32z1 | 1:1.2.8.dfsg-2ubuntu4.3 | | libc++-dev | 3.7.0-1ubuntu0.1 | | libc++abi-dev | 3.7.0-1ubuntu0.1 | -| libcurl3 | 7.47.0-1ubuntu2.18 | +| libcurl3 | 7.47.0-1ubuntu2.19 | | libgbm-dev | 18.0.5-0ubuntu0~16.04.1 | | libgconf-2-4 | 3.2.6-3ubuntu6 | | libgsl-dev | 2.1+dfsg-2 | @@ -326,6 +314,7 @@ | patchelf | 0.9-1~ubuntu16.04.3 | | pkg-config | 0.29.1-0ubuntu1 | | pollinate | 4.33-0ubuntu1~16.04.1 | +| python-setuptools | 20.7.0-1 | | rpm | 4.12.0.1+dfsg1-3build3 | | rsync | 3.1.1-3ubuntu1.3 | | shellcheck | 0.3.7-5 | From cff32c9efeecec3d20efa64a202fef6526d7d918 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 8 Apr 2021 14:09:34 +0000 Subject: [PATCH 0139/3485] macOS 10.15 (20210404 update) (#3097) * Updating readme file for macOS-10.15 version 20210404.1 * updated packer version Co-authored-by: Image generation service account Co-authored-by: Alena Sviridenko Co-authored-by: Actions service account --- images/macos/macos-10.15-Readme.md | 48 +++++++++++++++--------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/images/macos/macos-10.15-Readme.md b/images/macos/macos-10.15-Readme.md index e671a9ca8ce7..1e5482169a4c 100644 --- a/images/macos/macos-10.15-Readme.md +++ b/images/macos/macos-10.15-Readme.md @@ -5,7 +5,7 @@ # macOS 10.15 info - System Version: macOS 10.15.7 (19H524) - Kernel Version: Darwin 19.6.0 -- Image Version: 20210327.1 +- Image Version: 20210404.1 ## Installed Software ### Language and Runtime @@ -19,24 +19,24 @@ - GNU Fortran (Homebrew GCC 10.2.0_4) 10.2.0 - available by `gfortran-10` alias - GNU Fortran (Homebrew GCC 8.4.0_2) 8.4.0 - available by `gfortran-8` alias - GNU Fortran (Homebrew GCC 9.3.0_1) 9.3.0 - available by `gfortran-9` alias -- Go 1.15.10 +- Go 1.15.11 - julia 1.6.0 - Node.js v14.16.0 -- NVM - Cached node versions: v10.24.0 v12.21.0 v14.16.0 -- NVM 0.37.2 +- NVM - Cached node versions: v10.24.0 v12.22.0 v14.16.0 +- NVM 0.38.0 - Perl 5.32.1 - PHP 8.0.3 - Python 2.7.18 - Python 3.9.2 -- R 4.0.4 +- R 4.0.5 - Ruby 2.7.2p137 ### Package Management - Bundler version 2.2.15 - Carthage 0.37.0 - CocoaPods 1.10.1 -- Composer 2.0.11 -- Homebrew 3.0.9 +- Composer 2.0.12 +- Homebrew 3.0.10 - Miniconda 4.9.2 - NPM 6.14.11 - NuGet 5.6.0.6489 @@ -44,7 +44,7 @@ - Pip 21.0.1 (python 3.9) - Pipx 0.16.1.0 - RubyGems 3.2.15 -- Vcpkg 2021 (build from master \<9f6157a>) +- Vcpkg 2021 (build from master \<030cfaa>) - Yarn 1.22.5 #### Environment variables @@ -55,20 +55,20 @@ ### Project Management - Apache Ant(TM) 1.10.9 -- Apache Maven 3.6.3 +- Apache Maven 3.8.1 - Gradle 6.8.3 ### Utilities -- 7-Zip 17.03 +- 7-Zip 17.04 - aria2 1.35.0 - azcopy 10.9.0 - bazel 4.0.0 - bazelisk 1.7.5 - bsdtar 3.3.2 - available by 'tar' alias -- Curl 7.75.0 +- Curl 7.76.0 - Git LFS: 2.13.3 - Git: 2.31.1 -- GitHub CLI: 1.7.0 +- GitHub CLI: 1.8.1 - GNU parallel 20210322 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.1 @@ -80,11 +80,11 @@ - mongod v4.4.3 - Newman 5.2.2 - OpenSSL 1.1.1k 25 Mar 2021 `(/usr/local/opt/openssl -> /usr/local/Cellar/openssl@1.1/1.1.1k)` -- Packer 1.7.0 +- Packer 1.7.1 - PostgreSQL 13.2 - psql (PostgreSQL) 13.2 - Subversion (SVN) 1.14.1 -- Vagrant 2.2.14 +- Vagrant 2.2.15 - virtualbox 6.1.18r142142 - zstd 1.4.9 @@ -92,7 +92,7 @@ ### Tools - Aliyun CLI 3.0.73 - App Center CLI 2.8.1 -- AWS CLI 2.1.32 +- AWS CLI 2.1.34 - AWS SAM CLI 1.21.1 - AWS Session Manager CLI 1.2.30.0 - Azure CLI 2.21.0 @@ -111,10 +111,10 @@ ### Browsers - Safari 14.0.3 (15610.4.3.1.7) - SafariDriver 14.0.3 (15610.4.3.1.7) -- Google Chrome 89.0.4389.90 +- Google Chrome 89.0.4389.114 - ChromeDriver 89.0.4389.23 - Microsoft Edge 89.0.774.63 -- MSEdgeDriver 89.0.774.63 +- MSEdgeDriver 89.0.774.68 - Mozilla Firefox 87.0 - geckodriver 0.29.0 @@ -148,7 +148,7 @@ - 3.6.13 - 3.7.10 - 3.8.8 -- 3.9.2 +- 3.9.4 #### PyPy - 2.7.18 [PyPy 7.3.3] @@ -157,14 +157,14 @@ #### Node.js - 10.24.0 -- 12.21.0 +- 12.22.0 - 14.16.0 #### Go - 1.13.15 - 1.14.15 -- 1.15.10 -- 1.16.2 +- 1.15.11 +- 1.16.3 ### Rust Tools - Cargo 1.51.0 @@ -173,7 +173,7 @@ - Rustup 1.23.1 #### Packages -- Bindgen 0.57.0 +- Bindgen 0.58.0 - Cargo-audit 0.14.0 - Cargo-outdated v0.9.14 - Cbindgen 0.18.0 @@ -199,7 +199,7 @@ ### Xamarin #### Visual Studio for Mac -- 8.9.3.13 +- 8.9.4.25 #### Mono - 6.12.0.125 @@ -368,7 +368,7 @@ | Package Name | Version | | -------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 3.0 | -| Android Emulator | 30.5.3 | +| Android Emulator | 30.5.4 | | Android SDK Build-tools | 30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3
26.0.0 26.0.1 26.0.2 26.0.3
25.0.0 25.0.1 25.0.2 25.0.3
24.0.0 24.0.1 24.0.2 24.0.3 | | Android SDK Platforms | android-S (rev 2)
android-30 (rev 3)
android-29 (rev 5)
android-28 (rev 6)
android-27 (rev 3)
android-26 (rev 2)
android-25 (rev 3)
android-24 (rev 2) | | Android SDK Platform-Tools | 31.0.1 | From 0da5da7f578a406c10b021472866a3e15c31f2ec Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 8 Apr 2021 16:12:24 +0000 Subject: [PATCH 0140/3485] Ubuntu 2004 (20210405 update) (#3093) * Updating readme file for ubuntu20 version 20210405.1 * fixed packer version Co-authored-by: Image generation service account Co-authored-by: Alena Sviridenko Co-authored-by: Actions service account --- images/linux/Ubuntu2004-README.md | 87 +++++++++++++------------------ 1 file changed, 37 insertions(+), 50 deletions(-) diff --git a/images/linux/Ubuntu2004-README.md b/images/linux/Ubuntu2004-README.md index 43292a6b4366..f4de3535dd71 100644 --- a/images/linux/Ubuntu2004-README.md +++ b/images/linux/Ubuntu2004-README.md @@ -1,17 +1,17 @@ | Announcements | |-| -| [[Ubuntu] Clang, GCC and Gfortran versions less than 9.x will be removed from images on March, 29](https://github.com/actions/virtual-environments/issues/2950) | | [[windows, ubuntu] Az, Azure and AzureRM module preinstallation policy will be changed on March, 29th](https://github.com/actions/virtual-environments/issues/2916) | *** # Ubuntu 20.04.2 LTS - Linux kernel version: 5.4.0-1043-azure -- Image Version: 20210330.1 +- Image Version: 20210405.1 ## Installed Software ### Language and Runtime - Bash 5.0.17(1)-release - Clang 9.0.1, 10.0.0, 11.0.0 -- Erlang 11.1.7 +- Clang-format 9.0.1, 10.0.0, 11.0.0 +- Erlang 23.2.3 (Eshell 11.1.7) - GNU C++ 9.3.0, 10.2.0 - GNU Fortran 9.3.0, 10.2.0 - Julia 1.6.0 @@ -33,8 +33,8 @@ - Pip3 20.0.2 - Pipx 0.16.1.0 - RubyGems 3.1.2 -- Vcpkg (build from master \<1054567>) -- Yarn 1.22.5 +- Vcpkg (build from master \<030cfaa>) +- Yarn 1.22.10 #### Environment variables | Name | Value | @@ -47,21 +47,17 @@ - Gradle 6.8.3 - Lerna 4.0.0 - Maven 3.6.3 -- Sbt 1.4.9 +- Sbt 1.5.0 ### Tools -- 7-Zip 16.02 - Ansible 2.10.7 - apt-fast 1.9.10 - AzCopy 10.9.0 (available by `azcopy` and `azcopy10` aliases) - Bazel 4.0.0 - Bazelisk 1.7.5 -- binutils 2.34 - Buildah 1.20.0 - CMake 3.20.0 - CodeQL Action Bundle 2.5.0 -- coreutils 8.30 -- curl 7.68.0 - Docker Compose 1.28.6 - Docker-Buildx 0.5.1 - Docker-Moby Client 20.10.5+azure @@ -72,48 +68,40 @@ - Git-ftp 1.6.0 - Haveged 1.9.1 - Heroku 7.51.0 -- HHVM (HipHop VM) 4.102.0 +- HHVM (HipHop VM) 4.103.0 - jq 1.6 - Kind 0.10.0 - Kubectl 1.20.1-5-g76a04fc - Kustomize 4.0.5 - Leiningen 2.9.5 -- m4 1.4.18 - MediaInfo 19.09 - Mercurial 5.3.1 - Minikube 1.18.1 -- net-tools 1.60 - Newman 5.2.2 - nvm 0.38.0 - OpenSSL 1.1.1f 31 Mar 2020 -- Packer 1.7.0 -- pass 1.7.3 +- Packer 1.7.1 - PhantomJS 2.1.1 - Podman 3.0.1 -- Pulumi 2.23.2 -- R 4.0.4 +- Pulumi 2.24.1 +- R 4.0.5 - Skopeo 1.2.2 - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 -- Swig 4.0.1 - Terraform 0.14.9 -- unzip 6.00 -- wget 1.20.3 - yamllint 1.26.0 -- zip 3.0 -- zstd 1.4.4 ### CLI Tools - Alibaba Cloud CLI 3.0.73 -- AWS CLI 2.1.32 +- AWS CLI 2.1.34 - AWS CLI Session manager plugin 1.2.54.0 - AWS SAM CLI 1.21.1 - Azure CLI (azure-cli) 2.21.0 - Azure CLI (azure-devops) 0.18.0 -- GitHub CLI 1.7.0 -- Google Cloud SDK 333.0.0 +- GitHub CLI 1.8.1 +- Google Cloud SDK 334.0.0 - Hub CLI 2.14.2 -- Netlify CLI 3.13.8 +- Netlify CLI 3.14.0 - OpenShift CLI 4.7.4 - ORAS CLI 0.11.1 - Vercel CLI 21.3.3 @@ -133,7 +121,7 @@ | Tool | Version | | -------- | ------------ | | PHP | 7.4.16 8.0.3 | -| Composer | 2.0.11 | +| Composer | 2.0.12 | | PHPUnit | 8.5.15 | ### Haskell @@ -149,7 +137,7 @@ - Rustup 1.23.1 #### Packages -- Bindgen 0.57.0 +- Bindgen 0.58.0 - Cargo audit 0.14.0 - Cargo clippy 0.1.51 - Cargo outdated 0.9.14 @@ -157,11 +145,11 @@ - Rustfmt 1.4.36 ### Browsers and Drivers -- Chromium 89.0.4389.90 -- Google Chrome 89.0.4389.90 +- Google Chrome 89.0.4389.114 - ChromeDriver 89.0.4389.23 - Mozilla Firefox 87.0 - Geckodriver 0.29.0 +- Chromium 89.0.4389.0 #### Environment variables | Name | Value | @@ -172,9 +160,6 @@ ### .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.519 2.1.520 2.1.521 2.1.522 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.616 2.1.617 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 2.1.811 2.1.812 2.1.813 2.1.814 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.109 3.1.110 3.1.111 3.1.112 3.1.113 3.1.200 3.1.201 3.1.202 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 5.0.100 5.0.101 5.0.102 5.0.103 5.0.104 5.0.200 5.0.201 -### Az Module -- 5.5.0 3.1.0.zip 4.4.0.zip - ### Databases - MongoDB 4.4.4 - Postgre SQL 13.2 @@ -193,12 +178,12 @@ ### Cached Tools #### Go - 1.14.15 -- 1.15.10 -- 1.16.2 +- 1.15.11 +- 1.16.3 #### Node.js - 10.24.0 -- 12.21.0 +- 12.22.0 - 14.16.0 #### PyPy @@ -212,7 +197,7 @@ - 3.6.13 - 3.7.10 - 3.8.8 -- 3.9.2 +- 3.9.4 #### Ruby - 2.5.8 @@ -224,8 +209,8 @@ | Name | Value | Architecture | | --------------- | ----------------------------------- | ------------ | | GOROOT_1_14_X64 | /opt/hostedtoolcache/go/1.14.15/x64 | x64 | -| GOROOT_1_15_X64 | /opt/hostedtoolcache/go/1.15.10/x64 | x64 | -| GOROOT_1_16_X64 | /opt/hostedtoolcache/go/1.16.2/x64 | x64 | +| GOROOT_1_15_X64 | /opt/hostedtoolcache/go/1.15.11/x64 | x64 | +| GOROOT_1_16_X64 | /opt/hostedtoolcache/go/1.16.3/x64 | x64 | ### PowerShell Tools - PowerShell 7.1.3 @@ -237,6 +222,9 @@ | Pester | 5.1.1 | | PSScriptAnalyzer | 1.19.1 | +#### Az PowerShell Modules +- 5.5.0 3.1.0.zip 4.4.0.zip + ### Web Servers | Name | Version | ConfigFile | ServiceStatus | ListenPort | | --------- | ------- | ------------------------- | ------------- | ---------- | @@ -271,18 +259,18 @@ ### Cached Docker images | Repository:Tag | Digest | Created | | ---------------------- | ------------------------------------------------------------------------ | ---------- | -| alpine:3.10 | sha256:f2fa517acf6123318bc893c411f34570cea193367b33bd3be1d90c7fbefe72a5 | 2021-03-25 | +| alpine:3.10 | sha256:4929878917a37edf0b7f69594552508a3432fe304335dd92be29bbaa839362ed | 2021-03-31 | | alpine:3.7 | sha256:8421d9a84432575381bfabd248f1eb56f3aa21d9d7cd2511583c68c9b7511d10 | 2019-03-07 | | alpine:3.8 | sha256:2bb501e6173d9d006e56de5bce2720eb06396803300fe1687b58a7ff32bf4c14 | 2020-01-23 | | alpine:3.9 | sha256:414e0518bb9228d35e4cd5165567fb91d26c6a214e9c95899e1e056fcd349011 | 2020-04-24 | -| buildpack-deps:buster | sha256:ff6c309ddf5b2021da0f1bbdde5020be3840113058c50863fc05ba840c4db4b3 | 2021-03-27 | -| buildpack-deps:stretch | sha256:74e5ae35428c523829353a156f34e44e3d9047d97eeb44cff883d7a654214064 | 2021-03-27 | +| buildpack-deps:buster | sha256:08e16a0f30c3b53918405bfec408efdc5f058136a9715ad6479e503100b1c8ff | 2021-03-30 | +| buildpack-deps:stretch | sha256:7e051954f6d8d951be2f555b111bec8835a8c3fc18ad23425a25c7ce141e06b0 | 2021-03-30 | | debian:8 | sha256:32ad5050caffb2c7e969dac873bce2c370015c2256ff984b70c1c08b3a2816a0 | 2021-03-26 | -| debian:9 | sha256:20fb077345a1c2447b5746ffa3c9623a8eb87c15e8543e2e48387a7224366d88 | 2021-03-26 | -| node:10 | sha256:828fce99d975b94406af6b089ce44904eee7f61b4c9702c71068065472084848 | 2021-03-27 | -| node:10-alpine | sha256:999c6a67a36b8a682491124ddd49ff6585bd61d7c1d150ff2ce088d668250d4f | 2021-03-25 | -| node:12 | sha256:ad1c01aeb58e1fbfb5439eb2b954ab0fcdccd81202f90e6484915222a07d2528 | 2021-03-27 | -| node:12-alpine | sha256:b1b260826bea495c02f35228b37e7b63e50dffc9fca4f9c9a532787a5de978ea | 2021-03-25 | +| debian:9 | sha256:4b9b2ef8de1f3e9531626e8eb3d19e104e9dfde0a2b0f42b763b38235773f48e | 2021-03-30 | +| node:10 | sha256:1e8c3b26a17b53b4faabccd886d262ed3c58ceb07b08795783c53ec9403432fa | 2021-03-31 | +| node:10-alpine | sha256:8876535a96d4a8a71b8899851824d93d9595f9a8ae75a534d0076636db4587b3 | 2021-04-01 | +| node:12 | sha256:1f7e77446431e580974828a59e55d08bcbdb3147e58d9f207215201e5e008258 | 2021-03-31 | +| node:12-alpine | sha256:c4e50b1f0f4f86b7f1a2315efc9dea7e2d4152975da6125d1f981d8d0bca09b5 | 2021-04-01 | | ubuntu:14.04 | sha256:4a8a6fa8810a3e01352981b35165b0b28403fe2a4e2535e315b23b4a69cd130a | 2021-03-25 | ### Installed apt packages @@ -294,9 +282,8 @@ | brotli | 1.0.7-6ubuntu0.1 | | build-essential | 12.8ubuntu1.1 | | bzip2 | 1.0.8-2 | -| chromium-browser | 1:85.0.4183.83-0ubuntu0.20.04.2 | | coreutils | 8.30-3ubuntu2 | -| curl | 7.68.0-1ubuntu2.4 | +| curl | 7.68.0-1ubuntu2.5 | | dbus | 1.12.16-2ubuntu2.1 | | dnsutils | 1:9.16.1-0ubuntu2.7 | | dpkg | 1.19.7ubuntu3 | @@ -314,7 +301,7 @@ | lib32z1 | 1:1.2.11.dfsg-2ubuntu1.2 | | libc++-dev | 1:10.0-50~exp1 | | libc++abi-dev | 1:10.0-50~exp1 | -| libcurl4 | 7.68.0-1ubuntu2.4 | +| libcurl4 | 7.68.0-1ubuntu2.5 | | libgbm-dev | 20.2.6-0ubuntu0.20.04.1 | | libgconf-2-4 | 3.2.6-6ubuntu1 | | libgsl-dev | 2.5+dfsg-6build1 | From e8f899d57c69a43ef21fd6319691f256e0d4830d Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Thu, 8 Apr 2021 20:10:40 +0300 Subject: [PATCH 0141/3485] Don't create symlinks for PyPy 7.3.4 (#3134) --- images/linux/scripts/installers/pypy.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/images/linux/scripts/installers/pypy.sh b/images/linux/scripts/installers/pypy.sh index 826912c682cd..dc3f0a485ef0 100644 --- a/images/linux/scripts/installers/pypy.sh +++ b/images/linux/scripts/installers/pypy.sh @@ -56,8 +56,9 @@ function InstallPyPy echo "Create additional symlinks (Required for UsePythonVersion Azure DevOps task)" cd $PYPY_TOOLCACHE_VERSION_ARCH_PATH/bin - ln -s $PYPY_MAJOR $PYTHON_MAJOR - ln -s $PYTHON_MAJOR python + # Starting from PyPy 7.3.4 these links are already included in the package + [ -f ./$PYTHON_MAJOR ] || ln -s $PYPY_MAJOR $PYTHON_MAJOR + [ -f ./python ] || ln -s $PYTHON_MAJOR python chmod +x ./python ./$PYTHON_MAJOR From 1c76e14336f9841c8ac8a30881035e29d5ada980 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Thu, 8 Apr 2021 21:00:50 +0300 Subject: [PATCH 0142/3485] [Windows] Upgrade az powershell module from 5.5.0 to 5.7.0 (#3128) * Change Az from 5.5.0 to 5.7.0 * Remove 4.6.0, add 5.5.0 to zip --- images/win/toolsets/toolset-2016.json | 6 +++--- images/win/toolsets/toolset-2019.json | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/images/win/toolsets/toolset-2016.json b/images/win/toolsets/toolset-2016.json index 9a1d2e5f560d..bb8d765bb0e6 100644 --- a/images/win/toolsets/toolset-2016.json +++ b/images/win/toolsets/toolset-2016.json @@ -121,7 +121,7 @@ "name": "az", "url" : "https://raw.githubusercontent.com/Azure/az-ps-module-versions/main/versions-manifest.json", "versions": [ - "5.5.0" + "5.7.0" ], "zip_versions": [ "1.0.0", @@ -133,8 +133,8 @@ "3.8.0", "4.3.0", "4.4.0", - "4.6.0", - "4.7.0" + "4.7.0", + "5.5.0" ] } ], diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index 6d1260559216..528e95be378a 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -121,7 +121,7 @@ "name": "az", "url" : "https://raw.githubusercontent.com/Azure/az-ps-module-versions/main/versions-manifest.json", "versions": [ - "5.5.0" + "5.7.0" ], "zip_versions": [ "1.0.0", @@ -133,8 +133,8 @@ "3.8.0", "4.3.0", "4.4.0", - "4.6.0", - "4.7.0" + "4.7.0", + "5.5.0" ] } ], From eecc7b86eb5258c8091f93f853447cc5cbd3c817 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Thu, 8 Apr 2021 21:01:52 +0300 Subject: [PATCH 0143/3485] [macOS] Upgrade az powershell module from 4.8.0 to 5.7.0 (#3132) * update az 4.8.0 -> 5.7.0 * revert HS --- images/macos/toolsets/toolset-10.14.json | 2 +- images/macos/toolsets/toolset-10.15.json | 2 +- images/macos/toolsets/toolset-11.0.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/images/macos/toolsets/toolset-10.14.json b/images/macos/toolsets/toolset-10.14.json index 317f7add562e..31963316b966 100644 --- a/images/macos/toolsets/toolset-10.14.json +++ b/images/macos/toolsets/toolset-10.14.json @@ -223,7 +223,7 @@ { "name": "Az", "versions": [ - "4.8.0" + "5.7.0" ] }, {"name": "MarkdownPS"}, diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index 5c891e5f52d0..94fe683cd8cc 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -175,7 +175,7 @@ { "name": "Az", "versions": [ - "4.8.0" + "5.7.0" ] }, {"name": "MarkdownPS"}, diff --git a/images/macos/toolsets/toolset-11.0.json b/images/macos/toolsets/toolset-11.0.json index 27f6edbedc67..e7cb51932fe6 100644 --- a/images/macos/toolsets/toolset-11.0.json +++ b/images/macos/toolsets/toolset-11.0.json @@ -109,7 +109,7 @@ { "name": "Az", "versions": [ - "4.8.0" + "5.7.0" ] }, {"name": "MarkdownPS"}, From afed2f5b3af0220d48204b6eb260562b87a7df68 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 8 Apr 2021 23:30:06 +0000 Subject: [PATCH 0144/3485] Updating readme file for win19 version 20210404.2 (#3110) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/win/Windows2019-Readme.md | 42 ++++++++++++++++---------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index dac10e81046f..69f1845d9deb 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 1817 -- Image Version: 20210330.2 +- Image Version: 20210404.2 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -12,8 +12,8 @@ ## Installed Software ### Language and Runtime - Bash 4.4.23(1)-release -- Go 1.15.10 -- Julia 1.5.4 +- Go 1.15.11 +- Julia 1.6.0 - Node 14.16.0 - Perl 5.32.1 - PHP 8.0.3 @@ -22,7 +22,7 @@ ### Package Management - Chocolatey 0.10.15 -- Composer 2.0.11 +- Composer 2.0.12 - Helm 3.5.3 - Miniconda 4.9.2 - NPM 6.14.11 @@ -30,7 +30,7 @@ - pip 21.0.1 (python 3.7) - Pipx 0.16.1.0 - RubyGems 2.7.6.2 -- Vcpkg (build from master \) +- Vcpkg (build from master \<030cfaa>) - Yarn 1.22.10 #### Environment variables @@ -43,7 +43,7 @@ - Ant 1.10.9 - Gradle 6.8 - Maven 3.6.3 -- sbt 1.4.9 +- sbt 1.5.0 ### Tools - 7zip 19.00 @@ -56,8 +56,8 @@ - Docker 20.10.0 - Docker-compose 1.28.5 - ghc 9.0.1 -- Git 2.31.0 -- Git LFS 2.13.2 +- Git 2.31.1 +- Git LFS 2.13.3 - Google Cloud SDK 334.0.0 - InnoSetup 6.1.2 - jq 1.6 @@ -69,8 +69,8 @@ - NSIS v3.06.1 - OpenSSL 1.1.1 - Packer 1.7.0 -- Pulumi 2.23.1 -- R 4.0.4 +- Pulumi v2.24.1 +- R 4.0.5 - Stack 2.5.1 - Subversion (SVN) 1.14.1 - VSWhere 2.8.4 @@ -80,14 +80,14 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.73 -- AWS CLI 2.1.29 +- AWS CLI 2.1.34 - AWS SAM CLI 1.21.1 - AWS Session Manager CLI 1.2.54.0 - Azure CLI 2.21.0 - Azure Dev Spaces CLI 1.0.20201219.2 - Azure DevOps CLI extension 0.18.0 - Cloud Foundry CLI 6.53.0 -- GitHub CLI 1.8.0 +- GitHub CLI 1.8.1 - Hub CLI 2.14.2 ### Rust Tools @@ -97,7 +97,7 @@ - Rustup 1.23.1 #### Packages -- bindgen 0.57.0 +- bindgen 0.58.0 - cargo-audit 0.14.0 - cargo-outdated v0.9.14 - cbindgen 0.18.0 @@ -107,8 +107,8 @@ ### Browsers and webdrivers - Google Chrome 89.0.4389.114 - Chrome Driver 89.0.4389.23 -- Microsoft Edge 89.0.774.63 -- Microsoft Edge Driver 89.0.774.63 +- Microsoft Edge 89.0.774.68 +- Microsoft Edge Driver 89.0.774.68 - Mozilla Firefox 87.0 - Gecko Driver 0.29.0 - IE Driver 3.150.1.0 @@ -150,8 +150,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | ------- | ------------ | -------------------- | | 1.13.15 | x64 | GOROOT_1_13_X64 | | 1.14.15 | x64 | GOROOT_1_14_X64 | -| 1.15.10 (Default) | x64 | GOROOT_1_15_X64 | -| 1.16.2 | x64 | GOROOT_1_16_X64 | +| 1.15.11 (Default) | x64 | GOROOT_1_15_X64 | +| 1.16.3 | x64 | GOROOT_1_16_X64 | #### Node @@ -170,7 +170,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | 3.6.8 | x64, x86 | | 3.7.9 (Default) | x64, x86 | | 3.8.8 | x64, x86 | -| 3.9.2 | x64, x86 | +| 3.9.4 | x64, x86 | #### Ruby @@ -224,7 +224,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Name | Version | ConfigFile | ServiceName | ServiceStatus | ListenPort | | ------ | ------- | ------------------------------------- | ----------- | ------------- | ---------- | | Apache | 2.4.46 | C:\tools\Apache24\conf\httpd.conf | Apache | Stopped | 80 | -| Nginx | 1.19.8 | C:\tools\nginx-1.19.8\conf\nginx.conf | nginx | Stopped | 80 | +| Nginx | 1.19.9 | C:\tools\nginx-1.19.9\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2019 | Name | Version | Path | @@ -453,9 +453,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Workload.Python | 16.0.28621.142 | | Microsoft.VisualStudio.Workload.Universal | 16.9.31004.209 | | Microsoft.VisualStudio.Workload.VisualStudioExtension | 16.9.31004.209 | -| SSDT Microsoft Analysis Services Projects | 2.9.16 | +| SSDT Microsoft Analysis Services Projects | 2.9.17 | | SSDT SQL Server Integration Services Projects | 3.12.1 | -| SSDT Microsoft Reporting Services Projects | 2.6.10 | +| SSDT Microsoft Reporting Services Projects | 2.6.11 | | Windows Driver Kit | 3.11.4516 | | Windows Driver Kit Visual Studio Extension | 10.1.19041.685 | | WIX Toolset | 3.11.4516 | From bf22901ec693c20826561f5bbcb6644d296a9101 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 8 Apr 2021 23:30:08 +0000 Subject: [PATCH 0145/3485] Updating readme file for win16 version 20210404.2 (#3109) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/win/Windows2016-Readme.md | 44 ++++++++++++++++---------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/images/win/Windows2016-Readme.md b/images/win/Windows2016-Readme.md index fd995ef572ee..26a375c84c79 100644 --- a/images/win/Windows2016-Readme.md +++ b/images/win/Windows2016-Readme.md @@ -4,13 +4,13 @@ *** # Microsoft Windows Server 2016 Datacenter - OS Version: 10.0.14393 Build 4283 -- Image Version: 20210329.1 +- Image Version: 20210404.2 ## Installed Software ### Language and Runtime - Bash 4.4.23(1)-release -- Go 1.15.10 -- Julia 1.5.4 +- Go 1.15.11 +- Julia 1.6.0 - Node 14.16.0 - Perl 5.32.1 - PHP 8.0.3 @@ -19,7 +19,7 @@ ### Package Management - Chocolatey 0.10.15 -- Composer 2.0.11 +- Composer 2.0.12 - Helm 3.5.3 - Miniconda 4.9.2 - NPM 6.14.11 @@ -27,7 +27,7 @@ - pip 21.0.1 (python 3.7) - Pipx 0.16.1.0 - RubyGems 2.7.6.2 -- Vcpkg (build from master \<1054567>) +- Vcpkg (build from master \<030cfaa>) - Yarn 1.22.10 #### Environment variables @@ -40,7 +40,7 @@ - Ant 1.10.9 - Gradle 6.8 - Maven 3.6.3 -- sbt 1.4.9 +- sbt 1.5.0 ### Tools - 7zip 19.00 @@ -53,9 +53,9 @@ - Docker 20.10.0 - Docker-compose 1.28.5 - ghc 9.0.1 -- Git 2.31.0 -- Git LFS 2.13.2 -- Google Cloud SDK 333.0.0 +- Git 2.31.1 +- Git LFS 2.13.3 +- Google Cloud SDK 334.0.0 - InnoSetup 6.1.2 - jq 1.6 - Kind 0.10.0 @@ -66,8 +66,8 @@ - NSIS v3.06.1 - OpenSSL 1.1.1 - Packer 1.7.0 -- Pulumi 2.23.1 -- R 4.0.4 +- Pulumi v2.24.1 +- R 4.0.5 - Stack 2.5.1 - Subversion (SVN) 1.14.1 - VSWhere 2.8.4 @@ -77,14 +77,14 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.73 -- AWS CLI 2.1.29 +- AWS CLI 2.1.34 - AWS SAM CLI 1.21.1 - AWS Session Manager CLI 1.2.54.0 - Azure CLI 2.21.0 - Azure Dev Spaces CLI 1.0.20201219.2 - Azure DevOps CLI extension 0.18.0 - Cloud Foundry CLI 6.53.0 -- GitHub CLI 1.7.0 +- GitHub CLI 1.8.1 - Hub CLI 2.14.2 ### Rust Tools @@ -94,7 +94,7 @@ - Rustup 1.23.1 #### Packages -- bindgen 0.57.0 +- bindgen 0.58.0 - cargo-audit 0.14.0 - cargo-outdated v0.9.14 - cbindgen 0.18.0 @@ -102,10 +102,10 @@ - Rustfmt 1.4.36 ### Browsers and webdrivers -- Google Chrome 89.0.4389.90 +- Google Chrome 89.0.4389.114 - Chrome Driver 89.0.4389.23 -- Microsoft Edge 89.0.774.63 -- Microsoft Edge Driver 89.0.774.63 +- Microsoft Edge 89.0.774.68 +- Microsoft Edge Driver 89.0.774.68 - Mozilla Firefox 87.0 - Gecko Driver 0.29.0 - IE Driver 3.150.1.0 @@ -144,15 +144,15 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | ------- | ------------ | -------------------- | | 1.13.15 | x64 | GOROOT_1_13_X64 | | 1.14.15 | x64 | GOROOT_1_14_X64 | -| 1.15.10 (Default) | x64 | GOROOT_1_15_X64 | -| 1.16.2 | x64 | GOROOT_1_16_X64 | +| 1.15.11 (Default) | x64 | GOROOT_1_15_X64 | +| 1.16.3 | x64 | GOROOT_1_16_X64 | #### Node | Version | Architecture | | ------- | ------------ | | 10.24.0 | x64 | -| 12.21.0 | x64 | +| 12.22.0 | x64 | | 14.16.0 | x64 | @@ -164,7 +164,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | 3.6.8 | x64, x86 | | 3.7.9 (Default) | x64, x86 | | 3.8.8 | x64, x86 | -| 3.9.2 | x64, x86 | +| 3.9.4 | x64, x86 | #### Ruby @@ -218,7 +218,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Name | Version | ConfigFile | ServiceName | ServiceStatus | ListenPort | | ------ | ------- | ------------------------------------- | ----------- | ------------- | ---------- | | Apache | 2.4.46 | C:\tools\Apache24\conf\httpd.conf | Apache | Stopped | 80 | -| Nginx | 1.19.8 | C:\tools\nginx-1.19.8\conf\nginx.conf | nginx | Stopped | 80 | +| Nginx | 1.19.9 | C:\tools\nginx-1.19.9\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2017 | Name | Version | Path | From 94a1c2770ce2e48410ccd592de7f6c68e15878f2 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Fri, 9 Apr 2021 11:04:11 +0300 Subject: [PATCH 0146/3485] [macOS] Avoid creating symlinks for PyPy 7.3.4 (#3135) --- images/macos/provision/core/pypy.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/images/macos/provision/core/pypy.sh b/images/macos/provision/core/pypy.sh index ffcbbed14d21..08dd221ae013 100644 --- a/images/macos/provision/core/pypy.sh +++ b/images/macos/provision/core/pypy.sh @@ -58,8 +58,9 @@ function InstallPyPy echo "PYPY_FULL_VERSION is $PYPY_FULL_VERSION" echo $PYPY_FULL_VERSION > "PYPY_VERSION" - ln -s $PYPY_MAJOR $PYTHON_MAJOR - ln -s $PYTHON_MAJOR python + # Starting from PyPy 7.3.4 these links are already included in the package + [ -f ./$PYTHON_MAJOR ] || ln -s $PYPY_MAJOR $PYTHON_MAJOR + [ -f ./python ] || ln -s $PYTHON_MAJOR python chmod +x ./python ./$PYTHON_MAJOR From 980d197a7a4f14469831d67ac6aa625a75f3ddeb Mon Sep 17 00:00:00 2001 From: Sergey Dolin Date: Fri, 9 Apr 2021 13:04:31 +0500 Subject: [PATCH 0147/3485] [windows] Replace the microsoft/aspnetcore-build Docker image with mcr.microsoft.com/dotnet/framework/sdk (#3101) --- images/win/toolsets/toolset-2016.json | 2 +- images/win/toolsets/toolset-2019.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/images/win/toolsets/toolset-2016.json b/images/win/toolsets/toolset-2016.json index bb8d765bb0e6..268f8cc91c1d 100644 --- a/images/win/toolsets/toolset-2016.json +++ b/images/win/toolsets/toolset-2016.json @@ -255,7 +255,7 @@ "mcr.microsoft.com/windows/nanoserver:10.0.14393.953", "mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2016", "mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2016", - "microsoft/aspnetcore-build:1.0-2.0" + "mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2016" ] }, "pipx": [ diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index 528e95be378a..1d27806036f9 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -303,7 +303,7 @@ "mcr.microsoft.com/windows/nanoserver:1809", "mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019", "mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019", - "microsoft/aspnetcore-build:1.0-2.0" + "mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019" ] }, "pipx": [ From fbcc41275becc2c37dc3bfb9c98e1ab879b0b125 Mon Sep 17 00:00:00 2001 From: Sergey Dolin Date: Fri, 9 Apr 2021 13:04:52 +0500 Subject: [PATCH 0148/3485] [ubuntu] Update the cached Docker images (#3099) --- images/linux/toolsets/toolset-1604.json | 13 +++++++------ images/linux/toolsets/toolset-1804.json | 13 +++++++------ images/linux/toolsets/toolset-2004.json | 13 +++++++------ 3 files changed, 21 insertions(+), 18 deletions(-) diff --git a/images/linux/toolsets/toolset-1604.json b/images/linux/toolsets/toolset-1604.json index 6fa43e58c883..6e2548278977 100644 --- a/images/linux/toolsets/toolset-1604.json +++ b/images/linux/toolsets/toolset-1604.json @@ -204,19 +204,20 @@ }, "docker": { "images": [ - "alpine:3.7", - "alpine:3.8", - "alpine:3.9", - "alpine:3.10", + "alpine:3.11", + "alpine:3.12", + "alpine:3.13", "buildpack-deps:stretch", "buildpack-deps:buster", - "debian:8", "debian:9", + "debian:10", "node:10", "node:12", "node:10-alpine", "node:12-alpine", - "ubuntu:14.04" + "ubuntu:16.04", + "ubuntu:18.04", + "ubuntu:20.04" ] }, "dotnet": { diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index 1e7b89f2778a..95acc8768b43 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -197,19 +197,20 @@ }, "docker": { "images": [ - "alpine:3.7", - "alpine:3.8", - "alpine:3.9", - "alpine:3.10", + "alpine:3.11", + "alpine:3.12", + "alpine:3.13", "buildpack-deps:stretch", "buildpack-deps:buster", - "debian:8", "debian:9", + "debian:10", "node:10", "node:12", "node:10-alpine", "node:12-alpine", - "ubuntu:14.04" + "ubuntu:16.04", + "ubuntu:18.04", + "ubuntu:20.04" ] }, "pipx": [ diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index 816146b1141a..bbd973b48bec 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -197,19 +197,20 @@ }, "docker": { "images": [ - "alpine:3.7", - "alpine:3.8", - "alpine:3.9", - "alpine:3.10", + "alpine:3.11", + "alpine:3.12", + "alpine:3.13", "buildpack-deps:stretch", "buildpack-deps:buster", - "debian:8", "debian:9", + "debian:10", "node:10", "node:12", "node:10-alpine", "node:12-alpine", - "ubuntu:14.04" + "ubuntu:16.04", + "ubuntu:18.04", + "ubuntu:20.04" ] }, "pipx": [ From d1de678b65e3c6f6adee1297afc90c18cd867198 Mon Sep 17 00:00:00 2001 From: Dibir Magomedsaygitov <61747324+dibir-magomedsaygitov@users.noreply.github.com> Date: Fri, 9 Apr 2021 11:57:40 +0300 Subject: [PATCH 0149/3485] [Ubuntu] Rework Git installation to avoid using apt repo (#3095) * rework git installation * simplify git installation * minor fix * document source repo's * small fix * debug --- .../SoftwareReport/SoftwareReport.Tools.psm1 | 6 ++++-- images/linux/scripts/installers/git.sh | 17 ++++++++++++++--- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 index 7e8dcfe32c05..c0b5de04cf08 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 @@ -78,13 +78,15 @@ function Get-DockerBuildxVersion { function Get-GitVersion { $result = Get-CommandResult "git --version" $gitVersion = $result.Output | Take-OutputPart -Part 2 - return "Git $gitVersion" + $aptSourceRepo = Get-AptSourceRepository -PackageName "git-core" + return "Git $gitVersion (apt source repository: $aptSourceRepo)" } function Get-GitLFSVersion { $result = Get-CommandResult "git-lfs --version" $gitlfsversion = $result.Output | Take-OutputPart -Part 0 | Take-OutputPart -Part 1 -Delimiter "/" - return "Git LFS $gitlfsversion" + $aptSourceRepo = Get-AptSourceRepository -PackageName "git-lfs" + return "Git LFS $gitlfsversion (apt source repository: $aptSourceRepo)" } function Get-GitFTPVersion { diff --git a/images/linux/scripts/installers/git.sh b/images/linux/scripts/installers/git.sh index e620f68f7706..d878862cbc93 100644 --- a/images/linux/scripts/installers/git.sh +++ b/images/linux/scripts/installers/git.sh @@ -7,19 +7,30 @@ # Source the helpers for use with the script source $HELPER_SCRIPTS/install.sh +GIT_REPO="ppa:git-core/ppa" +GIT_LFS_REPO="https://packagecloud.io/install/repositories/github/git-lfs" + ## Install git -add-apt-repository ppa:git-core/ppa -y +add-apt-repository $GIT_REPO -y apt-get update apt-get install git -y git --version # Install git-lfs -curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash -apt-get install -y --no-install-recommends git-lfs +curl -s $GIT_LFS_REPO/script.deb.sh | bash +apt-get install -y git-lfs # Install git-ftp apt-get install git-ftp -y +# Remove source repo's +add-apt-repository --remove $GIT_REPO +rm /etc/apt/sources.list.d/github_git-lfs.list + +# Document apt source repo's +echo "git-core $GIT_REPO" >> $HELPER_SCRIPTS/apt-sources.txt +echo "git-lfs $GIT_LFS_REPO" >> $HELPER_SCRIPTS/apt-sources.txt + #Install hub tmp_hub="/tmp/hub" mkdir -p "$tmp_hub" From bfd58535c233999bb5a68b76569f1e7b9be1d70a Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Fri, 9 Apr 2021 14:27:14 +0300 Subject: [PATCH 0150/3485] Add cleanup logic for the packer os disk (#3140) --- .../linux-and-win/azure-pipelines/image-generation.yml | 5 +++-- images.CI/linux-and-win/cleanup.ps1 | 7 ++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/images.CI/linux-and-win/azure-pipelines/image-generation.yml b/images.CI/linux-and-win/azure-pipelines/image-generation.yml index 9ca53ca0ef3f..8de6e036f0c2 100644 --- a/images.CI/linux-and-win/azure-pipelines/image-generation.yml +++ b/images.CI/linux-and-win/azure-pipelines/image-generation.yml @@ -92,8 +92,9 @@ jobs: targetType: filePath filePath: ./images.CI/linux-and-win/cleanup.ps1 arguments: -ResourcesNamePrefix $(Build.BuildId) ` - -ClientId $(CLIENT_ID) ` - -ClientSecret $(CLIENT_SECRET) ` -Image ${{ parameters.image_type }} ` + -StorageAccount $(AZURE_STORAGE_ACCOUNT) ` -SubscriptionId $(AZURE_SUBSCRIPTION) ` + -ClientId $(CLIENT_ID) ` + -ClientSecret $(CLIENT_SECRET) ` -TenantId $(AZURE_TENANT) diff --git a/images.CI/linux-and-win/cleanup.ps1 b/images.CI/linux-and-win/cleanup.ps1 index 31abcb56a7db..15dcee3ef271 100644 --- a/images.CI/linux-and-win/cleanup.ps1 +++ b/images.CI/linux-and-win/cleanup.ps1 @@ -1,6 +1,7 @@ param( [String] [Parameter (Mandatory=$true)] $Image, [String] [Parameter (Mandatory=$true)] $ResourcesNamePrefix, + [String] [Parameter (Mandatory=$true)] $StorageAccount, [String] [Parameter (Mandatory=$true)] $ClientId, [String] [Parameter (Mandatory=$true)] $ClientSecret, [String] [Parameter (Mandatory=$true)] $SubscriptionId, @@ -13,9 +14,13 @@ $TempResourceGroupName = "${ResourcesNamePrefix}_${Image}" $groupExist = az group exists --name $TempResourceGroupName --subscription $SubscriptionId if ($groupExist -eq "true") { + $osDiskName = az group deployment list --resource-group $TempResourceGroupName --query "[].properties.parameters.osDiskName.value" -o tsv Write-Host "Found a match, deleting temporary files" az group delete --name $TempResourceGroupName --subscription $SubscriptionId --yes | Out-Null - Write-Host "Temporary group was deleted succesfully" -ForegroundColor Green + Write-Host "Temporary group was deleted succesfully" + Write-Host "Deleting OS disk" + az storage remove --account-name $StorageAccount -c "images" -n "$osDiskName.vhd" | Out-Null + Write-Host "OS disk deleted" } else { Write-Host "No temporary groups found" } \ No newline at end of file From acdde715804ec3c5b31e3b3ef92d75ceba0c0089 Mon Sep 17 00:00:00 2001 From: Nikita Bykov <49442273+nikita-bykov@users.noreply.github.com> Date: Fri, 9 Apr 2021 14:50:48 +0300 Subject: [PATCH 0151/3485] [Ubuntu] Fix Chromium installation (#3136) * fix chromium installation * fix chromium * added symlink Co-authored-by: Nikita Bykov --- .../linux/scripts/SoftwareReport/SoftwareReport.Browsers.psm1 | 2 +- images/linux/scripts/installers/google-chrome.sh | 1 + images/linux/scripts/tests/Browsers.Tests.ps1 | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Browsers.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Browsers.psm1 index e4e44d6fdf49..8ba6cb7673b2 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Browsers.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Browsers.psm1 @@ -19,7 +19,7 @@ function Get-GeckodriverVersion { } function Get-ChromiumVersion { - $chromiumVersion = chromium --version | Take-OutputPart -Part 0,1 + $chromiumVersion = chromium-browser --version | Take-OutputPart -Part 0,1 return $chromiumVersion } diff --git a/images/linux/scripts/installers/google-chrome.sh b/images/linux/scripts/installers/google-chrome.sh index 569f490c1096..eeefa46a37e1 100644 --- a/images/linux/scripts/installers/google-chrome.sh +++ b/images/linux/scripts/installers/google-chrome.sh @@ -79,6 +79,7 @@ mkdir $CHROMIUM_DIR unzip -qq /tmp/${ZIP_FILE} -d $CHROMIUM_DIR ln -s $CHROMIUM_BIN /usr/bin/chromium +ln -s $CHROMIUM_BIN /usr/bin/chromium-browser invoke_tests "Browsers" "Chrome" invoke_tests "Browsers" "Chromium" \ No newline at end of file diff --git a/images/linux/scripts/tests/Browsers.Tests.ps1 b/images/linux/scripts/tests/Browsers.Tests.ps1 index 40296ec86fa8..11b523d94d5a 100644 --- a/images/linux/scripts/tests/Browsers.Tests.ps1 +++ b/images/linux/scripts/tests/Browsers.Tests.ps1 @@ -20,6 +20,6 @@ Describe "Chrome" { Describe "Chromium" { It "Chromium" { - "chromium --version" | Should -ReturnZeroExitCode + "chromium-browser --version" | Should -ReturnZeroExitCode } } From 3ab55ea5da3c35ec7671d33418851c3ee2c5301a Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Fri, 9 Apr 2021 16:22:52 +0300 Subject: [PATCH 0152/3485] Add stream redirection to hide log output (#3141) --- images.CI/linux-and-win/cleanup.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images.CI/linux-and-win/cleanup.ps1 b/images.CI/linux-and-win/cleanup.ps1 index 15dcee3ef271..45a388b3b3b9 100644 --- a/images.CI/linux-and-win/cleanup.ps1 +++ b/images.CI/linux-and-win/cleanup.ps1 @@ -19,7 +19,7 @@ if ($groupExist -eq "true") { az group delete --name $TempResourceGroupName --subscription $SubscriptionId --yes | Out-Null Write-Host "Temporary group was deleted succesfully" Write-Host "Deleting OS disk" - az storage remove --account-name $StorageAccount -c "images" -n "$osDiskName.vhd" | Out-Null + az storage remove --account-name $StorageAccount -c "images" -n "$osDiskName.vhd" 2>&1 | Out-Null Write-Host "OS disk deleted" } else { Write-Host "No temporary groups found" From 4006fabbdded2c03052d76e3bb4aa3a03c0c2282 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Fri, 9 Apr 2021 16:53:57 +0300 Subject: [PATCH 0153/3485] Add option only-show-errors (#3142) --- images.CI/linux-and-win/cleanup.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images.CI/linux-and-win/cleanup.ps1 b/images.CI/linux-and-win/cleanup.ps1 index 45a388b3b3b9..e83acafa22a5 100644 --- a/images.CI/linux-and-win/cleanup.ps1 +++ b/images.CI/linux-and-win/cleanup.ps1 @@ -19,7 +19,7 @@ if ($groupExist -eq "true") { az group delete --name $TempResourceGroupName --subscription $SubscriptionId --yes | Out-Null Write-Host "Temporary group was deleted succesfully" Write-Host "Deleting OS disk" - az storage remove --account-name $StorageAccount -c "images" -n "$osDiskName.vhd" 2>&1 | Out-Null + az storage remove --account-name $StorageAccount -c "images" -n "$osDiskName.vhd" --only-show-errors | Out-Null Write-Host "OS disk deleted" } else { Write-Host "No temporary groups found" From c58b0cfbfdb9d97a06e5d024f58b96a6db4e2ede Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Fri, 9 Apr 2021 19:07:59 +0300 Subject: [PATCH 0154/3485] Remove user-wide dotnet config (#3144) --- images/win/post-generation/Dotnet.ps1 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/images/win/post-generation/Dotnet.ps1 b/images/win/post-generation/Dotnet.ps1 index fd43757a6b2e..68467adba714 100644 --- a/images/win/post-generation/Dotnet.ps1 +++ b/images/win/post-generation/Dotnet.ps1 @@ -5,4 +5,7 @@ if (-not $latestPath.Contains($dotnetPath)) { $latestPath = "$dotnetPath;$latestPath" [System.Environment]::SetEnvironmentVariable('PATH', $latestPath, [System.EnvironmentVariableTarget]::Machine) -} \ No newline at end of file +} + +# Delete empty nuget.config file to prevent the issue with downloading packages from nuget.org https://github.com/actions/virtual-environments/issues/3038 +Remove-Item $env:APPDATA\NuGet\NuGet.Config -Force From 59997be01ae4da61faedbb48aa5d57f5a5e391c3 Mon Sep 17 00:00:00 2001 From: Marinus Pfund Date: Mon, 12 Apr 2021 09:50:39 +0200 Subject: [PATCH 0155/3485] Add retry to Install-RootCA.ps1 generateSSTFromWU (#3018) * Update Install-RootCA.ps1 added retry behaviour to certutil.exe -generateSSTFromWU * Update Install-RootCA.ps1 removed multi line * fixed pr comments in Install-RootCA.ps1 fixed PR comments --- .../win/scripts/Installers/Install-RootCA.ps1 | 23 ++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/images/win/scripts/Installers/Install-RootCA.ps1 b/images/win/scripts/Installers/Install-RootCA.ps1 index a5d678088a01..5b618b450b0b 100644 --- a/images/win/scripts/Installers/Install-RootCA.ps1 +++ b/images/win/scripts/Installers/Install-RootCA.ps1 @@ -42,11 +42,32 @@ function Get-CertificatesWithoutPropId { } $certsWithoutPropId } + +function Invoke-WithRetry { + <# + .SYNOPSIS + Runs $command block until $BreakCondition or $RetryCount is reached. + #> + + param([ScriptBlock]$Command, [ScriptBlock] $BreakCondition, [int] $RetryCount=5, [int] $Sleep=10) + + $c = 0 + while($c -lt $RetryCount){ + $result = & $Command + if(& $BreakCondition){ + break + } + Start-Sleep $Sleep + $c++ + } + $result +} + function Import-SSTFromWU { # Serialized Certificate Store File $sstFile = "$env:TEMP\roots.sst" # Generate SST from Windows Update - $result = certutil.exe -generateSSTFromWU $sstFile + $result = Invoke-WithRetry { certutil.exe -generateSSTFromWU $sstFile } {$LASTEXITCODE -eq 0} if ($LASTEXITCODE -ne 0) { Write-Host "[Error]: failed to generate $sstFile sst file`n$result" exit $LASTEXITCODE From 98070a66fca711ea3e18cef9d91e507349d4e575 Mon Sep 17 00:00:00 2001 From: Sergey Dolin Date: Mon, 12 Apr 2021 13:31:34 +0500 Subject: [PATCH 0156/3485] [ubuntu] Rework bazel installation to avoid using apt repos (#3088) --- images/linux/scripts/installers/bazel.sh | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/images/linux/scripts/installers/bazel.sh b/images/linux/scripts/installers/bazel.sh index 4158861c81e3..ac8bf096fbe9 100644 --- a/images/linux/scripts/installers/bazel.sh +++ b/images/linux/scripts/installers/bazel.sh @@ -4,13 +4,12 @@ ## Desc: Installs Bazel and Bazelisk (A user-friendly launcher for Bazel) ################################################################################ -# Install bazel -curl https://bazel.build/bazel-release.pub.gpg | sudo apt-key add - -echo "deb [arch=amd64] https://storage.googleapis.com/bazel-apt stable jdk1.8" | sudo tee /etc/apt/sources.list.d/bazel.list -apt-get update -y -apt-get install -y bazel +source $HELPER_SCRIPTS/install.sh # Install bazelisk npm install -g @bazel/bazelisk -invoke_tests "Tools" "Bazel" \ No newline at end of file +# run bazelisk once in order to instal /usr/local/bin/bazel binary +bazelisk + +invoke_tests "Tools" "Bazel" From 2eab75337b6d318aaa357179d75ef91d4615abce Mon Sep 17 00:00:00 2001 From: Vladimir Safonkin Date: Mon, 12 Apr 2021 17:58:58 +0300 Subject: [PATCH 0157/3485] [macOS] Remove gradle test (#3163) --- images/macos/tests/Java.Tests.ps1 | 4 ---- 1 file changed, 4 deletions(-) diff --git a/images/macos/tests/Java.Tests.ps1 b/images/macos/tests/Java.Tests.ps1 index 340e0ef98b6c..beeedf228c04 100644 --- a/images/macos/tests/Java.Tests.ps1 +++ b/images/macos/tests/Java.Tests.ps1 @@ -66,10 +66,6 @@ Describe "Java" { It "Gradle is installed to /usr/local/bin" { (Get-Command "gradle").Path | Should -BeExactly "/usr/local/bin/gradle" } - - It "Gradle is compatible with init.d plugins" { - "cd /tmp && gradle tasks" | Should -ReturnZeroExitCode - } } } } \ No newline at end of file From f3ffc1d9f34e89c52dd49323a4198ef022e5a3e1 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 13 Apr 2021 12:57:02 +0000 Subject: [PATCH 0158/3485] Updating readme file for macOS-11.0 version 20210412.3 (#3168) Co-authored-by: Image generation service account --- images/macos/macos-11.0-Readme.md | 123 +++++++++++++----------------- 1 file changed, 55 insertions(+), 68 deletions(-) diff --git a/images/macos/macos-11.0-Readme.md b/images/macos/macos-11.0-Readme.md index e285eca6549a..3b52e27758ba 100644 --- a/images/macos/macos-11.0-Readme.md +++ b/images/macos/macos-11.0-Readme.md @@ -1,49 +1,50 @@ | Announcements | |-| +| [[macOS] Az modules will be upgraded from 4.8.0 to 5.7.0 on April, 12](https://github.com/actions/virtual-environments/issues/3129) | | [macOS 11.0 pools will be transited to private preview.](https://github.com/actions/virtual-environments/issues/2486) | *** # macOS 11.2 info - System Version: macOS 11.2.3 (20D91) - Kernel Version: Darwin 20.3.0 -- Image Version: 20210404.2 +- Image Version: 20210412.3 ## Installed Software ### Language and Runtime -- .NET SDK 2.1.300 2.1.301 2.1.302 2.1.401 2.1.402 2.1.403 2.1.500 2.1.502 2.1.503 2.1.504 2.1.505 2.1.506 2.1.507 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 2.1.811 2.1.812 2.1.813 2.1.814 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 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 5.0.100 5.0.101 5.0.102 5.0.200 5.0.201 +- .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 2.1.811 2.1.812 2.1.813 2.1.814 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 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 5.0.100 5.0.101 5.0.102 5.0.200 5.0.201 5.0.202 - Bash 3.2.57(1)-release - Clang/LLVM 11.1.0 is available on `'$(brew --prefix llvm)/bin/clang'` - Clang/LLVM 12.0.0 is default - gcc-10 (Homebrew GCC 10.2.0_4) 10.2.0 - available by `gcc-10` alias -- gcc-8 (Homebrew GCC 8.4.0_2) 8.4.0 - available by `gcc-8` alias -- gcc-9 (Homebrew GCC 9.3.0_1) 9.3.0 - available by `gcc-9` alias +- gcc-8 (Homebrew GCC 8.4.0_3) 8.4.0 - available by `gcc-8` alias +- gcc-9 (Homebrew GCC 9.3.0_2) 9.3.0 - available by `gcc-9` alias - GNU Fortran (Homebrew GCC 10.2.0_4) 10.2.0 - available by `gfortran-10` alias -- GNU Fortran (Homebrew GCC 8.4.0_2) 8.4.0 - available by `gfortran-8` alias -- GNU Fortran (Homebrew GCC 9.3.0_1) 9.3.0 - available by `gfortran-9` alias +- GNU Fortran (Homebrew GCC 8.4.0_3) 8.4.0 - available by `gfortran-8` alias +- GNU Fortran (Homebrew GCC 9.3.0_2) 9.3.0 - available by `gfortran-9` alias - Go 1.15.11 - julia 1.6.0 -- Node.js v14.16.0 -- NVM - Cached node versions: v10.24.0 v12.22.0 v14.16.0 +- Node.js v14.16.1 +- NVM - Cached node versions: v10.24.1 v12.22.1 v14.16.1 - NVM 0.38.0 - Perl 5.32.1 - PHP 8.0.3 - Python 2.7.18 -- Python 3.9.2 -- Ruby 2.7.2p137 +- Python 3.9.4 +- Ruby 2.7.3p183 ### Package Management -- Bundler version 2.2.15 +- Bundler version 2.2.16 - Carthage 0.37.0 - CocoaPods 1.10.1 - Composer 2.0.12 -- Homebrew 3.0.10 +- Homebrew 3.1.1 - Miniconda 4.9.2 -- NPM 6.14.11 +- NPM 6.14.12 - NuGet 5.6.0.6489 - Pip 20.3.4 (python 2.7) - Pip 21.0.1 (python 3.9) - Pipx 0.16.1.0 -- RubyGems 3.2.15 -- Vcpkg 2021 (build from master \<030cfaa>) +- RubyGems 3.2.16 +- Vcpkg 2021 (build from master \<047525c>) - Yarn 1.22.5 #### Environment variables @@ -55,7 +56,7 @@ ### Project Management - Apache Ant(TM) 1.10.9 - Apache Maven 3.8.1 -- Gradle 6.8.3 +- Gradle 7.0 ### Utilities - 7-Zip 17.04 @@ -74,11 +75,11 @@ - helm v3.5.3+g041ce5a - Hub CLI: 2.14.2 - jq 1.6 -- mongo v4.4.3 -- mongod v4.4.3 +- mongo v4.4.4 +- mongod v4.4.4 - Newman 5.2.2 - OpenSSL 1.1.1k 25 Mar 2021 `(/usr/local/opt/openssl -> /usr/local/Cellar/openssl@1.1/1.1.1k)` -- Packer 1.7.1 +- Packer 1.7.2 - PostgreSQL 13.2 - psql (PostgreSQL) 13.2 - Subversion (SVN) 1.14.1 @@ -87,32 +88,32 @@ ### Tools - Aliyun CLI 3.0.73 -- App Center CLI 2.8.1 -- AWS CLI 2.1.34 -- AWS SAM CLI 1.21.1 +- App Center CLI 2.9.0 +- AWS CLI 2.1.36 +- AWS SAM CLI 1.22.0 - AWS Session Manager CLI 1.2.30.0 - Azure CLI 2.21.0 - Cabal 3.4.0.0 -- Cmake 3.20.0 -- Fastlane 2.179.0 +- Cmake 3.20.1 +- Fastlane 2.180.1 - GHC 9.0.1 -- GHCup v0.1.14 +- GHCup v0.1.14.1 - Stack 2.5.1 - Xcode Command Line Tools 12.4.0.0.1.1610135815 ### Linters - SwiftLint 0.43.1 -- yamllint 1.26.0 +- yamllint 1.26.1 ### Browsers - Safari 14.0.3 (16610.4.3.1.7) - SafariDriver 14.0.3 (16610.4.3.1.7) - Google Chrome 89.0.4389.114 - ChromeDriver 89.0.4389.23 -- Microsoft Edge 89.0.774.63 -- MSEdgeDriver 89.0.774.68 +- Microsoft Edge 89.0.774.75 +- MSEdgeDriver 89.0.774.75 - Mozilla Firefox 87.0 -- geckodriver 0.29.0 +- geckodriver 0.29.1 #### Environment variables | Name | Value | @@ -130,20 +131,20 @@ ### Cached Tools #### Ruby - 2.4.10 -- 2.5.8 -- 2.6.6 -- 2.7.2 -- 3.0.0 +- 2.5.9 +- 2.6.7 +- 2.7.3 +- 3.0.1 #### Python - 3.7.10 -- 3.8.8 +- 3.8.9 - 3.9.4 #### Node.js -- 10.24.0 -- 12.22.0 -- 14.16.0 +- 10.24.1 +- 12.22.1 +- 14.16.1 #### Go - 1.15.11 @@ -156,10 +157,10 @@ - Rustup 1.23.1 #### Packages -- Bindgen 0.58.0 +- Bindgen 0.58.1 - Cargo-audit 0.14.0 - Cargo-outdated v0.9.14 -- Cbindgen 0.18.0 +- Cbindgen 0.19.0 - Clippy 0.1.51 - Rustfmt 1.4.36-stable @@ -169,7 +170,7 @@ #### PowerShell Modules | Module | Version | | ---------------- | ------- | -| Az | 4.8.0 | +| Az | 5.7.0 | | MarkdownPS | 1.9 | | Pester | 5.1.1 | | PSScriptAnalyzer | 1.19.1 | @@ -178,37 +179,23 @@ | Name | Version | ConfigFile | ServiceStatus | ListenPort | | ----- | -------- | ------------------------------- | ------------- | ---------- | | httpd | 2.4.46_2 | /usr/local/etc/httpd/httpd.conf | stopped | 80 | -| nginx | 1.19.8 | /usr/local/etc/nginx/nginx.conf | stopped | 80 | +| nginx | 1.19.9 | /usr/local/etc/nginx/nginx.conf | stopped | 80 | ### Xamarin #### Visual Studio for Mac -- 8.9.4.25 - -#### Mono -- 6.12.0.125 - -#### Xamarin.iOS -- 14.14.2.5 -- 14.10.0.4 -- 14.8.0.3 -- 14.6.0.15 -- 14.4.1.3 -- 14.2.0.12 -- 14.0.0.0 -- 13.20.2.2 - -#### Xamarin.Mac -- 7.8.2.5 -- 7.4.0.10 -- 7.2.0.3 -- 7.0.0.15 -- 6.22.1.26 -- 6.20.2.2 - -#### Xamarin.Android -- 11.2.2 -- 11.1.0 -- 11.0.2 +- 8.9.5.4 + +#### Xamarin bundles +| symlink | Xamarin.Mono | Xamarin.iOS | Xamarin.Mac | Xamarin.Android | +| ---------------- | ------------ | ----------- | ----------- | --------------- | +| 6_12_7 (default) | 6.12 | 14.14 | 7.8 | 11.2 | +| 6_12_6 | 6.12 | 14.10 | 7.4 | 11.1 | +| 6_12_5 | 6.12 | 14.8 | 7.2 | 11.1 | +| 6_12_4 | 6.12 | 14.6 | 7.0 | 11.1 | +| 6_12_3 | 6.12 | 14.4 | 6.22 | 11.1 | +| 6_12_2 | 6.12 | 14.2 | 6.20 | 11.0 | +| 6_12_1 | 6.12 | 14.0 | 6.20 | 11.0 | +| 6_12_0 | 6.12 | 13.20 | 6.20 | 11.0 | #### Unit Test Framework - NUnit 3.6.1 From 487339fb77db74a27995588fbcb229b04770fcc5 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Tue, 13 Apr 2021 17:13:46 +0300 Subject: [PATCH 0159/3485] [ubuntu] provide package name (#3172) --- images/linux/scripts/tests/Common.Tests.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/linux/scripts/tests/Common.Tests.ps1 b/images/linux/scripts/tests/Common.Tests.ps1 index 4a0c16f8c230..b6ad0cacbf2c 100644 --- a/images/linux/scripts/tests/Common.Tests.ps1 +++ b/images/linux/scripts/tests/Common.Tests.ps1 @@ -40,7 +40,7 @@ Describe "Swift" { } Describe "PipxPackages" -Skip:(Test-IsUbuntu16) { - [array]$testCases = (Get-ToolsetContent).pipx | ForEach-Object { @{cmd = $_.cmd} } + [array]$testCases = (Get-ToolsetContent).pipx | ForEach-Object { @{package=$_.package; cmd = $_.cmd} } It "" -TestCases $testCases { "$cmd --version" | Should -ReturnZeroExitCode From b7520207f762b4878239b3968b249a2582f1fd93 Mon Sep 17 00:00:00 2001 From: Alena Sviridenko Date: Tue, 13 Apr 2021 17:32:58 +0300 Subject: [PATCH 0160/3485] Document OS and software support strategy for virtual-environments (#3127) --- CONTRIBUTING.md | 2 +- README.md | 22 ++----- .../create-image-and-azure-resources.md | 0 .../debugging-failed-builds.md | 54 +++++++++--------- {help => docs}/resources/askOnError.png | Bin .../resources/packerResourceGroup.png | Bin .../resources/resourceGroupName.png | Bin {help => docs}/resources/vmCredentials.png | Bin docs/software-and-images-guidelines.md | 37 ++++++++++++ 9 files changed, 70 insertions(+), 45 deletions(-) rename help/CreateImageAndAzureResources.md => docs/create-image-and-azure-resources.md (100%) rename help/debuggingFailedBuilds.md => docs/debugging-failed-builds.md (78%) rename {help => docs}/resources/askOnError.png (100%) rename {help => docs}/resources/packerResourceGroup.png (100%) rename {help => docs}/resources/resourceGroupName.png (100%) rename {help => docs}/resources/vmCredentials.png (100%) create mode 100644 docs/software-and-images-guidelines.md diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index cce174ef190b..56e49a81d36e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -15,7 +15,7 @@ Please note that this project is released with a [Contributor Code of Conduct][c 1. [Fork][fork] and clone the repository 1. Create a new branch: `git checkout -b my-branch-name` 1. Make your changes, ensure that they include steps to install, validate post-install and update software report (please see [How to add new tool](CONTRIBUTING.md#how-to-add-new-tool) for details). -1. Test your changes by [creating VHD and deploying a VM](help/CreateImageAndAzureResources.md). +1. Test your changes by [creating VHD and deploying a VM](docs/create-image-and-azure-resources.md). 1. Push to your fork and [submit a pull request][pr] Here are a few things you can do that will increase the likelihood of your pull request being accepted: diff --git a/README.md b/README.md index 2bd7e0249b6e..b349f8930733 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # GitHub Actions Virtual Environments -This repository contains the source used to create the [virtual environments](https://help.github.com/en/actions/reference/virtual-environments-for-github-hosted-runners) for GitHub Actions hosted runners, as well as the VM images of [Microsoft-hosted agents](https://docs.microsoft.com/en-us/azure/devops/pipelines/agents/hosted?view=azure-devops#use-a-microsoft-hosted-agent) used for Azure Pipelines. To build a VM machine from this repo's source, see the [instructions](./help/CreateImageAndAzureResources.md). +This repository contains the source used to create the [virtual environments](https://help.github.com/en/actions/reference/virtual-environments-for-github-hosted-runners) for GitHub Actions hosted runners, as well as the VM images of [Microsoft-hosted agents](https://docs.microsoft.com/en-us/azure/devops/pipelines/agents/hosted?view=azure-devops#use-a-microsoft-hosted-agent) used for Azure Pipelines. To build a VM machine from this repo's source, see the [instructions](docs/create-image-and-azure-resources.md). How to get in touch with us: - To file a bug report, or request tools to be added/updated, please [open an issue using the appropriate template](https://github.com/actions/virtual-environments/issues/new/choose) @@ -34,21 +34,6 @@ The availability of images for GitHub Actions and Azure DevOps is different. See ***How to contribute to macOS source?*** macOS source lives in this repository and available for everyone. However, MacOS image-generation CI doesn't support external contributions yet so we are not able to accept pull-requests for now. We are in the process of preparing MacOS CI to accept contributions. Until then, we appreciate your patience and ask you continue to make tool requests by filing issues. -## Software Guidelines -In general, these are the guidelines we consider when deciding what to pre-install: - -- Tools and ecosystems that are broadly popular and widely-used will be given priority. -- Recent versions of tools will be given priority over older versions. -- Tools and versions that are deprecated or have reached end-of-life will not be added. -- Tools and versions will typically be removed 6 months after they are deprecated or have reached end-of-life. -- If a tool can be installed during the build, we will evaluate how much time is saved - and how much space is used by having the tool pre-installed. -- MIT, Apache, and GNU licenses are ok, anything else we'll have to check with lawyers. -- If a tool takes much space we will evaluate space usage and provide a decision if this tool can be pre-installed. -- If a tool requires the support of more than one version, we will consider the cost of this maintenance, how often new versions bring dangerous updates. - -**Note:** For new tools, please, create an issue and get an approval from us to add this tool to the image before creating the pull request. - ## Updates to virtual environments *Cadence* @@ -68,6 +53,9 @@ You can also track upcoming changes using the [awaiting-deployment](https://gith [ubuntu-16.04]: https://github.com/actions/virtual-environments/blob/main/images/linux/Ubuntu1604-README.md [Windows-2019]: https://github.com/actions/virtual-environments/blob/main/images/win/Windows2019-Readme.md [windows-2016]: https://github.com/actions/virtual-environments/blob/main/images/win/Windows2016-Readme.md -[macOS-10.15]: https://github.com/actions/virtual-environments/blob/main/images/macos/macos-10.15-Readme.md [macOS-11.0]: https://github.com/actions/virtual-environments/blob/main/images/macos/macos-11.0-Readme.md +[macOS-10.15]: https://github.com/actions/virtual-environments/blob/main/images/macos/macos-10.15-Readme.md [self-hosted runners]: https://help.github.com/en/actions/hosting-your-own-runners + +## Software and image guidelines +To learn more about tools and images support policy, see the [guidelines](./docs/software-and-images-guidelines.md). \ No newline at end of file diff --git a/help/CreateImageAndAzureResources.md b/docs/create-image-and-azure-resources.md similarity index 100% rename from help/CreateImageAndAzureResources.md rename to docs/create-image-and-azure-resources.md diff --git a/help/debuggingFailedBuilds.md b/docs/debugging-failed-builds.md similarity index 78% rename from help/debuggingFailedBuilds.md rename to docs/debugging-failed-builds.md index 756531d25814..d8a4c2ed8910 100644 --- a/help/debuggingFailedBuilds.md +++ b/docs/debugging-failed-builds.md @@ -1,27 +1,27 @@ -# Debugging Failed Packer Builds - -## Step 1: Run packer build `-on-error=ask` -When you run the `packer build` command, give it the `-on-error=ask` flag. -By default, `packer build` will delete the resource group as soon as the build fails. -`-on-error=ask` will pause it and wait for your input so you have time to remote in to the VM and diagnose the failure. - -When the build fails, you will see this: - -![Ask on error screenshot](/help/resources/askOnError.png "Ask on error screenshot") - -## Step 2: Find the resource group name in the build log -At the beginning of the build log (written to console), find the resource group name for the VM: - -![Resource group from log screenshot](/help/resources/resourceGroupName.png "Resource group from log screenshot") - -Log into the Azure Portal. Find that resource group under `Resource groups`. You should see the resources for the Packer build: - -![Packer resource group in Azure screenshot](/help/resources/packerResourceGroup.png "Packer resource group in Azure screenshot") - -## Step 3: Connect to the VM -Select the VM in the resource group. Click `Connect:` - -This will download an RDP file. Open that and enter the credentials found in the JSON file you pass to `packer build`: - -![VM credentials screenshot](/help/resources/vmCredentials.png "VM credentials screenshot") - +# Debugging Failed Packer Builds + +## Step 1: Run packer build `-on-error=ask` +When you run the `packer build` command, give it the `-on-error=ask` flag. +By default, `packer build` will delete the resource group as soon as the build fails. +`-on-error=ask` will pause it and wait for your input so you have time to remote in to the VM and diagnose the failure. + +When the build fails, you will see this: + +![Ask on error screenshot](/docs/resources/askOnError.png "Ask on error screenshot") + +## Step 2: Find the resource group name in the build log +At the beginning of the build log (written to console), find the resource group name for the VM: + +![Resource group from log screenshot](/docs/resources/resourceGroupName.png "Resource group from log screenshot") + +Log into the Azure Portal. Find that resource group under `Resource groups`. You should see the resources for the Packer build: + +![Packer resource group in Azure screenshot](/docs/resources/packerResourceGroup.png "Packer resource group in Azure screenshot") + +## Step 3: Connect to the VM +Select the VM in the resource group. Click `Connect:` + +This will download an RDP file. Open that and enter the credentials found in the JSON file you pass to `packer build`: + +![VM credentials screenshot](/docs/resources/vmCredentials.png "VM credentials screenshot") + diff --git a/help/resources/askOnError.png b/docs/resources/askOnError.png similarity index 100% rename from help/resources/askOnError.png rename to docs/resources/askOnError.png diff --git a/help/resources/packerResourceGroup.png b/docs/resources/packerResourceGroup.png similarity index 100% rename from help/resources/packerResourceGroup.png rename to docs/resources/packerResourceGroup.png diff --git a/help/resources/resourceGroupName.png b/docs/resources/resourceGroupName.png similarity index 100% rename from help/resources/resourceGroupName.png rename to docs/resources/resourceGroupName.png diff --git a/help/resources/vmCredentials.png b/docs/resources/vmCredentials.png similarity index 100% rename from help/resources/vmCredentials.png rename to docs/resources/vmCredentials.png diff --git a/docs/software-and-images-guidelines.md b/docs/software-and-images-guidelines.md new file mode 100644 index 000000000000..27217d7edaa6 --- /dev/null +++ b/docs/software-and-images-guidelines.md @@ -0,0 +1,37 @@ +# Software and image guidelines + +## Software preinstallation policy +In general, these are the guidelines we consider when deciding what to pre-install: + +- Tools and ecosystems that are broadly popular and widely-used will be given priority. +- Recent versions of tools will be given priority over older versions. +- Tools and versions that are deprecated or have reached end-of-life will not be added. +- If a tool can be installed during the build, we will evaluate how much time is saved + and how much space is used by having the tool pre-installed. +- MIT, Apache, and GNU licenses are ok, anything else we'll have to check with lawyers. +- If a tool takes much space we will evaluate space usage and provide a decision if this tool can be pre-installed. +- If a tool requires the support of more than one version, we will consider the cost of this maintenance, how often new versions bring dangerous updates. + +**Note:** For new tools, please, create an issue and get an approval from us to add this tool to the image before creating the pull request. + +## Software and images support policy +These are the guidelines we follow in software and images supporting routine: +- Tools and versions will typically be removed 6 months after they are deprecated or have reached end-of-life. +- We support at least 2 latest OS versions (LTS only for Ubuntu) and initiate deprecation process for the oldest one when image usage drops below 5%. +- Most of the tools are preinstalled in the latest version only. +- Popular tools can have several versions installed side-by-side with the following strategy: + +| Tool name | Installation strategy | +|-----------|-----------------------| +| Java | all LTS versions | +| Node.js | 3 latest LTS versions | +| Go | 3 latest minor versions | +| Python
Ruby | 5 most popular `major.minor` versions | +| PyPy | 3 most popular `major.minor` versions | +| .NET Core | 2 latest LTS versions and 1 latest version. For each feature version only latest patch is installed | +| GCC
GNU Fortran
Clang
GNU C++ | 3 latest major versions | +| Android NDK | 1 latest, 1 LTS version | +| Xcode | all OS compatible versions, latest beta for each new version | + +## Software default versions update policy for tools with multiple versions installed +In general, once a new version is installed on the image, we announce the default version update 2 weeks prior to deploying it to give time to adapt to upcoming changes. For potentially dangerous updates, we can extend the timeline up to 1 month between the announcement and deployment. \ No newline at end of file From 274bb6507301ef0c6031322ce320ddbc7b33fbe4 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Tue, 13 Apr 2021 19:04:04 +0300 Subject: [PATCH 0161/3485] [ubuntu] Add node14 & node14-alpine docker images (#3171) --- images/linux/toolsets/toolset-1604.json | 2 ++ images/linux/toolsets/toolset-1804.json | 2 ++ images/linux/toolsets/toolset-2004.json | 2 ++ 3 files changed, 6 insertions(+) diff --git a/images/linux/toolsets/toolset-1604.json b/images/linux/toolsets/toolset-1604.json index 6e2548278977..4586c0ace692 100644 --- a/images/linux/toolsets/toolset-1604.json +++ b/images/linux/toolsets/toolset-1604.json @@ -213,8 +213,10 @@ "debian:10", "node:10", "node:12", + "node:14", "node:10-alpine", "node:12-alpine", + "node:14-alpine", "ubuntu:16.04", "ubuntu:18.04", "ubuntu:20.04" diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index 95acc8768b43..aca49af126d3 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -206,8 +206,10 @@ "debian:10", "node:10", "node:12", + "node:14", "node:10-alpine", "node:12-alpine", + "node:14-alpine", "ubuntu:16.04", "ubuntu:18.04", "ubuntu:20.04" diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index bbd973b48bec..c7ae0859bbed 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -206,8 +206,10 @@ "debian:10", "node:10", "node:12", + "node:14", "node:10-alpine", "node:12-alpine", + "node:14-alpine", "ubuntu:16.04", "ubuntu:18.04", "ubuntu:20.04" From 51d9ece7fe11fefbd02964da48870fcb37505122 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Wed, 14 Apr 2021 10:21:40 +0300 Subject: [PATCH 0162/3485] [macOS 10.13] Change Go in the toolset to 1.15 (#3178) --- images/macos/toolsets/toolset-10.13.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/macos/toolsets/toolset-10.13.json b/images/macos/toolsets/toolset-10.13.json index b1ca23be2f9c..e2af23669d55 100644 --- a/images/macos/toolsets/toolset-10.13.json +++ b/images/macos/toolsets/toolset-10.13.json @@ -221,7 +221,7 @@ "gh", "gnupg", "gnu-tar", - "go", + "go@1.15", "helm", "libpq", "llvm", From 579dea7415f7e5bb58ad8fab650dee6b86e4fe3a Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Wed, 14 Apr 2021 10:22:41 +0300 Subject: [PATCH 0163/3485] Add swiftformat for all macOS versions except HS (#3170) --- images/macos/software-report/SoftwareReport.Common.psm1 | 5 +++++ images/macos/software-report/SoftwareReport.Generator.ps1 | 3 ++- images/macos/tests/BasicTools.Tests.ps1 | 6 ++++++ images/macos/toolsets/toolset-10.14.json | 1 + images/macos/toolsets/toolset-10.15.json | 1 + images/macos/toolsets/toolset-11.0.json | 1 + 6 files changed, 16 insertions(+), 1 deletion(-) diff --git a/images/macos/software-report/SoftwareReport.Common.psm1 b/images/macos/software-report/SoftwareReport.Common.psm1 index 3aff25aff949..7f141687a554 100644 --- a/images/macos/software-report/SoftwareReport.Common.psm1 +++ b/images/macos/software-report/SoftwareReport.Common.psm1 @@ -459,6 +459,11 @@ function Get-StackVersion { return "Stack $stackVersion" } +function Get-SwiftFormatVersion { + $swiftFormatVersion = Run-Command "swiftformat --version" + return "SwiftFormat $swiftFormatVersion" +} + function Get-YamllintVersion { $yamllintVersion = Run-Command "yamllint --version" return $yamllintVersion diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1 index 48130392dbfa..a1c77fe9e4c0 100644 --- a/images/macos/software-report/SoftwareReport.Generator.ps1 +++ b/images/macos/software-report/SoftwareReport.Generator.ps1 @@ -164,7 +164,8 @@ if( -not $os.IsHighSierra) { (Get-GHCupVersion), (Get-GHCVersion), (Get-CabalVersion), - (Get-StackVersion) + (Get-StackVersion), + (Get-SwiftFormatVersion) ) } diff --git a/images/macos/tests/BasicTools.Tests.ps1 b/images/macos/tests/BasicTools.Tests.ps1 index 01ff9def6fe0..db36dbfdd79b 100644 --- a/images/macos/tests/BasicTools.Tests.ps1 +++ b/images/macos/tests/BasicTools.Tests.ps1 @@ -18,6 +18,12 @@ Describe "Subversion" { } } +Describe "SwiftFormat" { + It "SwiftFormat" { + "swiftformat --version" | Should -ReturnZeroExitCode + } +} + Describe "Go" { It "Go" { "go version" | Should -ReturnZeroExitCode diff --git a/images/macos/toolsets/toolset-10.14.json b/images/macos/toolsets/toolset-10.14.json index 31963316b966..55618dd9d441 100644 --- a/images/macos/toolsets/toolset-10.14.json +++ b/images/macos/toolsets/toolset-10.14.json @@ -251,6 +251,7 @@ "parallel", "perl", "subversion", + "swiftformat", "xctool", "zstd" ], diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index 94fe683cd8cc..c59206c84787 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -203,6 +203,7 @@ "parallel", "perl", "subversion", + "swiftformat", "xctool", "zstd" ], diff --git a/images/macos/toolsets/toolset-11.0.json b/images/macos/toolsets/toolset-11.0.json index e7cb51932fe6..ea557e8b0038 100644 --- a/images/macos/toolsets/toolset-11.0.json +++ b/images/macos/toolsets/toolset-11.0.json @@ -135,6 +135,7 @@ "packer", "perl", "subversion", + "swiftformat", "zstd" ], "cask_packages": [ From 16fd52136958434ea1614813bfa3108a08b41a49 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 14 Apr 2021 15:36:18 +0000 Subject: [PATCH 0164/3485] Updating readme file for win19 version 20210411.1 (#3156) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/win/Windows2019-Readme.md | 54 ++++++++++++++++---------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index 69f1845d9deb..00919d03befd 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -1,10 +1,10 @@ | Announcements | |-| -| [[windows, ubuntu] Az, Azure and AzureRM module preinstallation policy will be changed on March, 29th](https://github.com/actions/virtual-environments/issues/2916) | +| [[windows, ubuntu] Few outdated Docker images will be removed on April, 12](https://github.com/actions/virtual-environments/issues/3111) | *** # Microsoft Windows Server 2019 Datacenter - OS Version: 10.0.17763 Build 1817 -- Image Version: 20210404.2 +- Image Version: 20210411.1 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -14,7 +14,7 @@ - Bash 4.4.23(1)-release - Go 1.15.11 - Julia 1.6.0 -- Node 14.16.0 +- Node 14.16.1 - Perl 5.32.1 - PHP 8.0.3 - Python 3.7.9 @@ -25,12 +25,12 @@ - Composer 2.0.12 - Helm 3.5.3 - Miniconda 4.9.2 -- NPM 6.14.11 +- NPM 6.14.12 - NuGet 5.8.1.7021 - pip 21.0.1 (python 3.7) - Pipx 0.16.1.0 - RubyGems 2.7.6.2 -- Vcpkg (build from master \<030cfaa>) +- Vcpkg (build from master \) - Yarn 1.22.10 #### Environment variables @@ -51,18 +51,18 @@ - Bazel 4.0.0 - Bazelisk 1.7.5 - Cabal 3.4.0.0 -- CMake 3.20.0 +- CMake 3.20.1 - CodeQL Action Bundle 2.5.0 - Docker 20.10.0 - Docker-compose 1.28.5 - ghc 9.0.1 - Git 2.31.1 - Git LFS 2.13.3 -- Google Cloud SDK 334.0.0 +- Google Cloud SDK 335.0.0 - InnoSetup 6.1.2 - jq 1.6 - Kind 0.10.0 -- Kubectl 1.20.5 +- Kubectl 1.21.0 - Mercurial 5.0 - Mingw-w64 8.1.0 - Newman 5.2.2 @@ -75,13 +75,13 @@ - Subversion (SVN) 1.14.1 - VSWhere 2.8.4 - WinAppDriver 1.2.2009.02003 -- yamllint 1.26.0 +- yamllint 1.26.1 - zstd 1.4.9 ### CLI Tools - Alibaba Cloud CLI 3.0.73 -- AWS CLI 2.1.34 -- AWS SAM CLI 1.21.1 +- AWS CLI 2.1.36 +- AWS SAM CLI 1.22.0 - AWS Session Manager CLI 1.2.54.0 - Azure CLI 2.21.0 - Azure Dev Spaces CLI 1.0.20201219.2 @@ -97,20 +97,20 @@ - Rustup 1.23.1 #### Packages -- bindgen 0.58.0 +- bindgen 0.58.1 - cargo-audit 0.14.0 - cargo-outdated v0.9.14 -- cbindgen 0.18.0 +- cbindgen 0.19.0 - Clippy 0.1.51 - Rustfmt 1.4.36 ### Browsers and webdrivers - Google Chrome 89.0.4389.114 - Chrome Driver 89.0.4389.23 -- Microsoft Edge 89.0.774.68 -- Microsoft Edge Driver 89.0.774.68 +- Microsoft Edge 89.0.774.75 +- Microsoft Edge Driver 89.0.774.75 - Mozilla Firefox 87.0 -- Gecko Driver 0.29.0 +- Gecko Driver 0.29.1 - IE Driver 3.150.1.0 #### Environment variables @@ -157,9 +157,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Node | Version | Architecture | | ------- | ------------ | -| 10.24.0 | x64 | -| 12.22.0 | x64 | -| 14.16.0 | x64 | +| 10.24.1 | x64 | +| 12.22.1 | x64 | +| 14.16.1 | x64 | #### Python @@ -169,7 +169,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.8 | x64, x86 | +| 3.8.9 | x64, x86 | | 3.9.4 | x64, x86 | @@ -209,7 +209,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### MongoDB | Version | ServiceName | ServiceStatus | ServiceStartType | | ------- | ----------- | ------------- | ---------------- | -| 4.4.4.0 | MongoDB | Running | Automatic | +| 4.4.5.0 | MongoDB | Running | Automatic | @@ -482,20 +482,20 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### .NET Core SDK `Location C:\Program Files\dotnet\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.519 2.1.520 2.1.521 2.1.522 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.616 2.1.617 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 2.1.811 2.1.812 2.1.813 2.1.814 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.109 3.1.110 3.1.111 3.1.112 3.1.113 3.1.200 3.1.201 3.1.202 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 5.0.100 5.0.101 5.0.102 5.0.103 5.0.104 5.0.200 5.0.201 +- 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.519 2.1.520 2.1.521 2.1.522 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.616 2.1.617 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 2.1.811 2.1.812 2.1.813 2.1.814 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.109 3.1.110 3.1.111 3.1.112 3.1.113 3.1.200 3.1.201 3.1.202 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 5.0.100 5.0.101 5.0.102 5.0.103 5.0.104 5.0.200 5.0.201 5.0.202 ### .NET Core Runtime `Location: C:\Program Files\dotnet\shared\Microsoft.AspNetCore.All` - 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23 2.1.24 2.1.25 2.1.26 `Location: C:\Program Files\dotnet\shared\Microsoft.AspNetCore.App` -- 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23 2.1.24 2.1.25 2.1.26 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9 3.1.10 3.1.11 3.1.12 3.1.13 5.0.0 5.0.1 5.0.2 5.0.3 5.0.4 +- 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23 2.1.24 2.1.25 2.1.26 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9 3.1.10 3.1.11 3.1.12 3.1.13 5.0.0 5.0.1 5.0.2 5.0.3 5.0.4 5.0.5 `Location: C:\Program Files\dotnet\shared\Microsoft.NETCore.App` -- 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23 2.1.24 2.1.25 2.1.26 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9 3.1.10 3.1.11 3.1.12 3.1.13 5.0.0 5.0.1 5.0.2 5.0.3 5.0.4 +- 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23 2.1.24 2.1.25 2.1.26 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9 3.1.10 3.1.11 3.1.12 3.1.13 5.0.0 5.0.1 5.0.2 5.0.3 5.0.4 5.0.5 `Location: C:\Program Files\dotnet\shared\Microsoft.WindowsDesktop.App` -- 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9 3.1.10 3.1.11 3.1.12 3.1.13 5.0.0 5.0.1 5.0.2 5.0.3 5.0.4 +- 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9 3.1.10 3.1.11 3.1.12 3.1.13 5.0.0 5.0.1 5.0.2 5.0.3 5.0.4 5.0.5 ### .NET Framework `Type: Developer Pack` @@ -508,7 +508,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Azure Powershell Modules | Module | Version | Path | | ------- | ---------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------ | -| Az | 1.0.0.zip
1.6.0.zip
2.3.2.zip
2.6.0.zip
3.1.0.zip
3.5.0.zip
3.8.0.zip
4.3.0.zip
4.4.0.zip
4.6.0.zip
4.7.0.zip
5.5.0 | C:\Modules\az_\ | +| Az | 1.0.0.zip
1.6.0.zip
2.3.2.zip
2.6.0.zip
3.1.0.zip
3.5.0.zip
3.8.0.zip
4.3.0.zip
4.4.0.zip
4.7.0.zip
5.5.0.zip
5.7.0 | C:\Modules\az_\ | | Azure | 3.8.0.zip
4.2.1.zip
5.1.1.zip
2.1.0 [Installed]
5.3.0 | C:\Modules\azure_\ | | AzureRM | 3.8.0.zip
4.2.1.zip
5.1.1.zip
6.7.0.zip
2.1.0 [Installed]
6.13.1 | C:\Modules\azurerm_\ | ``` @@ -559,9 +559,9 @@ All other versions are saved but not installed. | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | | mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:953245d144c00acd448ae1d85814d95a7c3064a5c0675cadc78e9860a32a071b | 2021-03-09 | | mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:4d5dc01599c02124bcd5f7778753ea6f8369c6fdd5c39da88f5ac91e37e352e6 | 2021-03-09 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:a874ab90088183363e74257e163cf3c8494d35561bf074c64de4bac5566ebddd | 2021-03-09 | | mcr.microsoft.com/windows/nanoserver:1809 | sha256:def85061f840b63c4e45019ba716a4b35649ecba2e273621d6e80c8640ceff4c | 2021-02-26 | | mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:acae9dedd8ce6fbc624e8c4b52555a9d3201eb47aacd45b4a00e0d81083b4cab | 2021-02-27 | -| microsoft/aspnetcore-build:1.0-2.0 | sha256:9ecc7c5a8a7a11dca5f08c860165646cb30d084606360a3a72b9cbe447241c0c | 2018-08-15 | From b04de88f6ee512230813dc904cf813e55a927417 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Wed, 14 Apr 2021 19:34:49 +0300 Subject: [PATCH 0165/3485] [Ubuntu] Install zstd homebrew (#3181) * install zstd using brew * fix typo * remove Run-Command * replace to Take-OutputPart * create zstd symlinks --- .../SoftwareReport/SoftwareReport.Generator.ps1 | 3 ++- .../scripts/SoftwareReport/SoftwareReport.Tools.psm1 | 5 +++++ images/linux/scripts/installers/homebrew.sh | 12 ++++++++++++ images/linux/scripts/tests/Tools.Tests.ps1 | 8 ++++++++ images/linux/toolsets/toolset-1604.json | 4 +++- images/linux/toolsets/toolset-1804.json | 4 +++- images/linux/toolsets/toolset-2004.json | 4 +++- 7 files changed, 36 insertions(+), 4 deletions(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index cc4a74a01cb7..e597aa232710 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -130,7 +130,8 @@ $toolsList = @( (Get-PulumiVersion), (Get-RVersion), (Get-SphinxVersion), - (Get-TerraformVersion) + (Get-TerraformVersion), + (Get-ZstdVersion) ) if (-not (Test-IsUbuntu16)) { diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 index c0b5de04cf08..1473b09455f2 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 @@ -263,3 +263,8 @@ function Get-SphinxVersion { function Get-YamllintVersion { return "$(yamllint --version)" } + +function Get-ZstdVersion { + $zstdVersion = zstd --version | Take-OutputPart -Part 1 -Delimiter "v" | Take-OutputPart -Part 0 -Delimiter "," + return "zstd $zstdVersion (homebrew)" +} diff --git a/images/linux/scripts/installers/homebrew.sh b/images/linux/scripts/installers/homebrew.sh index 00d8157f5d27..3c325b1bb29a 100644 --- a/images/linux/scripts/installers/homebrew.sh +++ b/images/linux/scripts/installers/homebrew.sh @@ -7,6 +7,7 @@ # Source the helpers source $HELPER_SCRIPTS/etc-environment.sh +source $HELPER_SCRIPTS/install.sh # Install the Homebrew on Linux /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)" @@ -25,4 +26,15 @@ setEtcEnvironmentVariable HOMEBREW_CLEANUP_PERIODIC_FULL_DAYS 3650 echo "Validate the installation reloading /etc/environment" reloadEtcEnvironment +# Install additional brew packages +brew_packages=$(get_toolset_value .brew[].name) +for package in $brew_packages; do + echo "Install $package" + brew install $package + # create symlinks for zstd in /usr/local/bin + if [[ $package == "zstd" ]]; then + find $(brew --prefix)/bin -name *zstd* -exec sudo sh -c 'ln -s {} /usr/local/bin/$(basename {})' ';' + fi +done + invoke_tests "Tools" "Homebrew" diff --git a/images/linux/scripts/tests/Tools.Tests.ps1 b/images/linux/scripts/tests/Tools.Tests.ps1 index 8ec4deb313af..12d95b751944 100644 --- a/images/linux/scripts/tests/Tools.Tests.ps1 +++ b/images/linux/scripts/tests/Tools.Tests.ps1 @@ -225,6 +225,14 @@ Describe "Homebrew" { It "homebrew" { "brew --version" | Should -ReturnZeroExitCode } + + Context "Packages" { + $testCases = (Get-ToolsetContent).brew | ForEach-Object { @{ ToolName = $_.name } } + + It "" -TestCases $testCases { + "$ToolName --version" | Should -Not -BeNullOrEmpty + } + } } Describe "Julia" { diff --git a/images/linux/toolsets/toolset-1604.json b/images/linux/toolsets/toolset-1604.json index 4586c0ace692..1faaceb082b4 100644 --- a/images/linux/toolsets/toolset-1604.json +++ b/images/linux/toolsets/toolset-1604.json @@ -161,7 +161,6 @@ "xorriso", "xvfb", "xz-utils", - "zstd", "zsync" ], "cmd_packages": [ @@ -202,6 +201,9 @@ "zip" ] }, + "brew": [ + {"name": "zstd"} + ], "docker": { "images": [ "alpine:3.11", diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index aca49af126d3..3df858b0d774 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -155,7 +155,6 @@ "xorriso", "xvfb", "xz-utils", - "zstd", "zsync" ], "cmd_packages": [ @@ -195,6 +194,9 @@ "zip" ] }, + "brew": [ + {"name": "zstd"} + ], "docker": { "images": [ "alpine:3.11", diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index c7ae0859bbed..790509405a37 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -154,7 +154,6 @@ "xorriso", "xvfb", "xz-utils", - "zstd", "zsync" ], "cmd_packages": [ @@ -195,6 +194,9 @@ "zip" ] }, + "brew": [ + {"name": "zstd"} + ], "docker": { "images": [ "alpine:3.11", From 40ef7b1ba3939415957440be411a07d603bdaa64 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 14 Apr 2021 16:36:53 +0000 Subject: [PATCH 0166/3485] Updating readme file for macOS-10.15 version 20210412.2 (#3169) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/macos/macos-10.15-Readme.md | 161 ++++++++++++----------------- 1 file changed, 66 insertions(+), 95 deletions(-) diff --git a/images/macos/macos-10.15-Readme.md b/images/macos/macos-10.15-Readme.md index 1e5482169a4c..925d6aa87efd 100644 --- a/images/macos/macos-10.15-Readme.md +++ b/images/macos/macos-10.15-Readme.md @@ -1,50 +1,51 @@ | Announcements | |-| +| [[macOS] Az modules will be upgraded from 4.8.0 to 5.7.0 on April, 12](https://github.com/actions/virtual-environments/issues/3129) | | [macOS 11.0 pools will be transited to private preview.](https://github.com/actions/virtual-environments/issues/2486) | *** # macOS 10.15 info - System Version: macOS 10.15.7 (19H524) - Kernel Version: Darwin 19.6.0 -- Image Version: 20210404.1 +- Image Version: 20210412.2 ## Installed Software ### Language and Runtime -- .NET SDK 2.1.300 2.1.301 2.1.302 2.1.401 2.1.402 2.1.403 2.1.500 2.1.502 2.1.503 2.1.504 2.1.505 2.1.506 2.1.507 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 2.1.811 2.1.812 2.1.813 2.1.814 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 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 5.0.100 5.0.101 5.0.102 5.0.200 5.0.201 +- .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 2.1.811 2.1.812 2.1.813 2.1.814 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 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 5.0.100 5.0.101 5.0.102 5.0.200 5.0.201 5.0.202 - Bash 3.2.57(1)-release - Clang/LLVM 11.1.0 is available on `'$(brew --prefix llvm)/bin/clang'` - Clang/LLVM 12.0.0 is default - gcc-10 (Homebrew GCC 10.2.0_4) 10.2.0 - available by `gcc-10` alias -- gcc-8 (Homebrew GCC 8.4.0_2) 8.4.0 - available by `gcc-8` alias -- gcc-9 (Homebrew GCC 9.3.0_1) 9.3.0 - available by `gcc-9` alias +- gcc-8 (Homebrew GCC 8.4.0_3) 8.4.0 - available by `gcc-8` alias +- gcc-9 (Homebrew GCC 9.3.0_2) 9.3.0 - available by `gcc-9` alias - GNU Fortran (Homebrew GCC 10.2.0_4) 10.2.0 - available by `gfortran-10` alias -- GNU Fortran (Homebrew GCC 8.4.0_2) 8.4.0 - available by `gfortran-8` alias -- GNU Fortran (Homebrew GCC 9.3.0_1) 9.3.0 - available by `gfortran-9` alias +- GNU Fortran (Homebrew GCC 8.4.0_3) 8.4.0 - available by `gfortran-8` alias +- GNU Fortran (Homebrew GCC 9.3.0_2) 9.3.0 - available by `gfortran-9` alias - Go 1.15.11 - julia 1.6.0 -- Node.js v14.16.0 -- NVM - Cached node versions: v10.24.0 v12.22.0 v14.16.0 +- Node.js v14.16.1 +- NVM - Cached node versions: v10.24.1 v12.22.1 v14.16.1 - NVM 0.38.0 - Perl 5.32.1 - PHP 8.0.3 - Python 2.7.18 -- Python 3.9.2 +- Python 3.9.4 - R 4.0.5 -- Ruby 2.7.2p137 +- Ruby 2.7.3p183 ### Package Management -- Bundler version 2.2.15 +- Bundler version 2.2.16 - Carthage 0.37.0 - CocoaPods 1.10.1 - Composer 2.0.12 -- Homebrew 3.0.10 +- Homebrew 3.1.1 - Miniconda 4.9.2 -- NPM 6.14.11 +- NPM 6.14.12 - NuGet 5.6.0.6489 - Pip 20.3.4 (python 2.7) - Pip 21.0.1 (python 3.9) - Pipx 0.16.1.0 -- RubyGems 3.2.15 -- Vcpkg 2021 (build from master \<030cfaa>) +- RubyGems 3.2.16 +- Vcpkg 2021 (build from master \<00b218d>) - Yarn 1.22.5 #### Environment variables @@ -56,7 +57,7 @@ ### Project Management - Apache Ant(TM) 1.10.9 - Apache Maven 3.8.1 -- Gradle 6.8.3 +- Gradle 7.0 ### Utilities - 7-Zip 17.04 @@ -76,11 +77,11 @@ - helm v3.5.3+g041ce5a - Hub CLI: 2.14.2 - jq 1.6 -- mongo v4.4.3 -- mongod v4.4.3 +- mongo v4.4.4 +- mongod v4.4.4 - Newman 5.2.2 - OpenSSL 1.1.1k 25 Mar 2021 `(/usr/local/opt/openssl -> /usr/local/Cellar/openssl@1.1/1.1.1k)` -- Packer 1.7.1 +- Packer 1.7.2 - PostgreSQL 13.2 - psql (PostgreSQL) 13.2 - Subversion (SVN) 1.14.1 @@ -91,32 +92,32 @@ ### Tools - Aliyun CLI 3.0.73 -- App Center CLI 2.8.1 -- AWS CLI 2.1.34 -- AWS SAM CLI 1.21.1 +- App Center CLI 2.9.0 +- AWS CLI 2.1.36 +- AWS SAM CLI 1.22.0 - AWS Session Manager CLI 1.2.30.0 - Azure CLI 2.21.0 - Cabal 3.4.0.0 -- Cmake 3.20.0 -- Fastlane 2.179.0 +- Cmake 3.20.1 +- Fastlane 2.180.1 - GHC 9.0.1 -- GHCup v0.1.14 +- GHCup v0.1.14.1 - Stack 2.5.1 - Xcode Command Line Tools 12.4.0.0.1.1610135815 ### Linters - SwiftLint 0.43.1 -- yamllint 1.26.0 +- yamllint 1.26.1 ### Browsers - Safari 14.0.3 (15610.4.3.1.7) - SafariDriver 14.0.3 (15610.4.3.1.7) - Google Chrome 89.0.4389.114 - ChromeDriver 89.0.4389.23 -- Microsoft Edge 89.0.774.63 -- MSEdgeDriver 89.0.774.68 +- Microsoft Edge 89.0.774.75 +- MSEdgeDriver 89.0.774.75 - Mozilla Firefox 87.0 -- geckodriver 0.29.0 +- geckodriver 0.29.1 #### Environment variables | Name | Value | @@ -137,28 +138,28 @@ ### Cached Tools #### Ruby - 2.4.10 -- 2.5.8 -- 2.6.6 -- 2.7.2 -- 3.0.0 +- 2.5.9 +- 2.6.7 +- 2.7.3 +- 3.0.1 #### Python - 2.7.18 - 3.5.10 - 3.6.13 - 3.7.10 -- 3.8.8 +- 3.8.9 - 3.9.4 #### PyPy -- 2.7.18 [PyPy 7.3.3] +- 2.7.18 [PyPy 7.3.4] - 3.6.12 [PyPy 7.3.3] -- 3.7.9 [PyPy 7.3.3-beta0] +- 3.7.10 [PyPy 7.3.4] #### Node.js -- 10.24.0 -- 12.22.0 -- 14.16.0 +- 10.24.1 +- 12.22.1 +- 14.16.1 #### Go - 1.13.15 @@ -173,10 +174,10 @@ - Rustup 1.23.1 #### Packages -- Bindgen 0.58.0 +- Bindgen 0.58.1 - Cargo-audit 0.14.0 - Cargo-outdated v0.9.14 -- Cbindgen 0.18.0 +- Cbindgen 0.19.0 - Clippy 0.1.51 - Rustfmt 1.4.36-stable @@ -186,7 +187,7 @@ #### PowerShell Modules | Module | Version | | ---------------- | ------- | -| Az | 4.8.0 | +| Az | 5.7.0 | | MarkdownPS | 1.9 | | Pester | 5.1.1 | | PSScriptAnalyzer | 1.19.1 | @@ -195,61 +196,31 @@ | Name | Version | ConfigFile | ServiceStatus | ListenPort | | ----- | -------- | ------------------------------- | ------------- | ---------- | | httpd | 2.4.46_2 | /usr/local/etc/httpd/httpd.conf | stopped | 80 | -| nginx | 1.19.8 | /usr/local/etc/nginx/nginx.conf | stopped | 80 | +| nginx | 1.19.9 | /usr/local/etc/nginx/nginx.conf | stopped | 80 | ### Xamarin #### Visual Studio for Mac -- 8.9.4.25 - -#### Mono -- 6.12.0.125 -- 6.10.0.106 -- 6.8.0.123 -- 6.6.0.166 -- 6.4.0.208 - -#### Xamarin.iOS -- 14.14.2.5 -- 14.10.0.4 -- 14.8.0.3 -- 14.6.0.15 -- 14.4.1.3 -- 14.2.0.12 -- 14.0.0.0 -- 13.20.2.2 -- 13.18.2.1 -- 13.16.0.13 -- 13.14.1.39 -- 13.10.0.21 -- 13.8.3.0 -- 13.6.0.12 -- 13.4.0.2 -- 13.2.0.47 - -#### Xamarin.Mac -- 7.8.2.5 -- 7.4.0.10 -- 7.2.0.3 -- 7.0.0.15 -- 6.22.1.26 -- 6.20.2.2 -- 6.18.3.2 -- 6.16.0.13 -- 6.14.1.39 -- 6.10.0.21 -- 6.8.3.0 -- 6.6.0.12 -- 6.4.0.2 -- 6.2.0.47 - -#### Xamarin.Android -- 11.2.2 -- 11.1.0 -- 11.0.2 -- 10.3.1 -- 10.2.0 -- 10.1.3 -- 10.0.6 +- 8.9.5.4 + +#### Xamarin bundles +| symlink | Xamarin.Mono | Xamarin.iOS | Xamarin.Mac | Xamarin.Android | +| ---------------- | ------------ | ----------- | ----------- | --------------- | +| 6_12_7 (default) | 6.12 | 14.14 | 7.8 | 11.2 | +| 6_12_6 | 6.12 | 14.10 | 7.4 | 11.1 | +| 6_12_5 | 6.12 | 14.8 | 7.2 | 11.1 | +| 6_12_4 | 6.12 | 14.6 | 7.0 | 11.1 | +| 6_12_3 | 6.12 | 14.4 | 6.22 | 11.1 | +| 6_12_2 | 6.12 | 14.2 | 6.20 | 11.0 | +| 6_12_1 | 6.12 | 14.0 | 6.20 | 11.0 | +| 6_12_0 | 6.12 | 13.20 | 6.20 | 11.0 | +| 6_10_0 | 6.10 | 13.18 | 6.18 | 10.3 | +| 6_8_1 | 6.8 | 13.16 | 6.16 | 10.2 | +| 6_8_0 | 6.8 | 13.14 | 6.14 | 10.2 | +| 6_6_1 | 6.6 | 13.10 | 6.10 | 10.1 | +| 6_6_0 | 6.6 | 13.8 | 6.8 | 10.1 | +| 6_4_2 | 6.4 | 13.6 | 6.6 | 10.0 | +| 6_4_1 | 6.4 | 13.4 | 6.4 | 10.0 | +| 6_4_0 | 6.4 | 13.2 | 6.2 | 10.0 | #### Unit Test Framework - NUnit 3.6.1 @@ -274,7 +245,7 @@ #### Xcode Support Tools - xcpretty 0.3.0 - xcversion 2.6.8 -- Nomad CLI 3.2.15 +- Nomad CLI 3.2.16 - Nomad CLI IPA ipa 0.14.3 - xctool 0.3.7 From 682af818712036a9de1645361a393432e41e97be Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 14 Apr 2021 19:08:18 +0000 Subject: [PATCH 0167/3485] Updating readme file for win16 version 20210411.1 (#3157) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/win/Windows2016-Readme.md | 54 ++++++++++++++++---------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/images/win/Windows2016-Readme.md b/images/win/Windows2016-Readme.md index 26a375c84c79..d443d457e37e 100644 --- a/images/win/Windows2016-Readme.md +++ b/images/win/Windows2016-Readme.md @@ -1,17 +1,17 @@ | Announcements | |-| -| [[windows, ubuntu] Az, Azure and AzureRM module preinstallation policy will be changed on March, 29th](https://github.com/actions/virtual-environments/issues/2916) | +| [[windows, ubuntu] Few outdated Docker images will be removed on April, 12](https://github.com/actions/virtual-environments/issues/3111) | *** # Microsoft Windows Server 2016 Datacenter - OS Version: 10.0.14393 Build 4283 -- Image Version: 20210404.2 +- Image Version: 20210411.1 ## Installed Software ### Language and Runtime - Bash 4.4.23(1)-release - Go 1.15.11 - Julia 1.6.0 -- Node 14.16.0 +- Node 14.16.1 - Perl 5.32.1 - PHP 8.0.3 - Python 3.7.9 @@ -22,12 +22,12 @@ - Composer 2.0.12 - Helm 3.5.3 - Miniconda 4.9.2 -- NPM 6.14.11 +- NPM 6.14.12 - NuGet 5.8.1.7021 - pip 21.0.1 (python 3.7) - Pipx 0.16.1.0 - RubyGems 2.7.6.2 -- Vcpkg (build from master \<030cfaa>) +- Vcpkg (build from master \) - Yarn 1.22.10 #### Environment variables @@ -48,18 +48,18 @@ - Bazel 4.0.0 - Bazelisk 1.7.5 - Cabal 3.4.0.0 -- CMake 3.20.0 +- CMake 3.20.1 - CodeQL Action Bundle 2.5.0 - Docker 20.10.0 - Docker-compose 1.28.5 - ghc 9.0.1 - Git 2.31.1 - Git LFS 2.13.3 -- Google Cloud SDK 334.0.0 +- Google Cloud SDK 335.0.0 - InnoSetup 6.1.2 - jq 1.6 - Kind 0.10.0 -- Kubectl 1.20.5 +- Kubectl 1.21.0 - Mercurial 5.0 - Mingw-w64 8.1.0 - Newman 5.2.2 @@ -72,13 +72,13 @@ - Subversion (SVN) 1.14.1 - VSWhere 2.8.4 - WinAppDriver 1.2.2009.02003 -- yamllint 1.26.0 +- yamllint 1.26.1 - zstd 1.4.9 ### CLI Tools - Alibaba Cloud CLI 3.0.73 -- AWS CLI 2.1.34 -- AWS SAM CLI 1.21.1 +- AWS CLI 2.1.36 +- AWS SAM CLI 1.22.0 - AWS Session Manager CLI 1.2.54.0 - Azure CLI 2.21.0 - Azure Dev Spaces CLI 1.0.20201219.2 @@ -94,20 +94,20 @@ - Rustup 1.23.1 #### Packages -- bindgen 0.58.0 +- bindgen 0.58.1 - cargo-audit 0.14.0 - cargo-outdated v0.9.14 -- cbindgen 0.18.0 +- cbindgen 0.19.0 - Clippy 0.1.51 - Rustfmt 1.4.36 ### Browsers and webdrivers - Google Chrome 89.0.4389.114 - Chrome Driver 89.0.4389.23 -- Microsoft Edge 89.0.774.68 -- Microsoft Edge Driver 89.0.774.68 +- Microsoft Edge 89.0.774.75 +- Microsoft Edge Driver 89.0.774.75 - Mozilla Firefox 87.0 -- Gecko Driver 0.29.0 +- Gecko Driver 0.29.1 - IE Driver 3.150.1.0 #### Environment variables @@ -151,9 +151,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Node | Version | Architecture | | ------- | ------------ | -| 10.24.0 | x64 | -| 12.22.0 | x64 | -| 14.16.0 | x64 | +| 10.24.1 | x64 | +| 12.22.1 | x64 | +| 14.16.1 | x64 | #### Python @@ -163,7 +163,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.8 | x64, x86 | +| 3.8.9 | x64, x86 | | 3.9.4 | x64, x86 | @@ -203,7 +203,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### MongoDB | Version | ServiceName | ServiceStatus | ServiceStartType | | ------- | ----------- | ------------- | ---------------- | -| 4.4.4.0 | MongoDB | Running | Automatic | +| 4.4.5.0 | MongoDB | Running | Automatic | @@ -492,20 +492,20 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### .NET Core SDK `Location C:\Program Files\dotnet\sdk` -- 1.1.14 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.519 2.1.520 2.1.521 2.1.522 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.616 2.1.617 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 2.1.811 2.1.812 2.1.813 2.1.814 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.109 3.1.110 3.1.111 3.1.112 3.1.113 3.1.200 3.1.201 3.1.202 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 5.0.100 5.0.101 5.0.102 5.0.103 5.0.104 5.0.200 5.0.201 +- 1.1.14 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.519 2.1.520 2.1.521 2.1.522 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.616 2.1.617 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 2.1.811 2.1.812 2.1.813 2.1.814 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.109 3.1.110 3.1.111 3.1.112 3.1.113 3.1.200 3.1.201 3.1.202 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 5.0.100 5.0.101 5.0.102 5.0.103 5.0.104 5.0.200 5.0.201 5.0.202 ### .NET Core Runtime `Location: C:\Program Files\dotnet\shared\Microsoft.AspNetCore.All` - 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23 2.1.24 2.1.25 2.1.26 `Location: C:\Program Files\dotnet\shared\Microsoft.AspNetCore.App` -- 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23 2.1.24 2.1.25 2.1.26 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9 3.1.10 3.1.11 3.1.12 3.1.13 5.0.0 5.0.1 5.0.2 5.0.3 5.0.4 +- 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23 2.1.24 2.1.25 2.1.26 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9 3.1.10 3.1.11 3.1.12 3.1.13 5.0.0 5.0.1 5.0.2 5.0.3 5.0.4 5.0.5 `Location: C:\Program Files\dotnet\shared\Microsoft.NETCore.App` -- 1.0.16 1.1.13 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23 2.1.24 2.1.25 2.1.26 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9 3.1.10 3.1.11 3.1.12 3.1.13 5.0.0 5.0.1 5.0.2 5.0.3 5.0.4 +- 1.0.16 1.1.13 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23 2.1.24 2.1.25 2.1.26 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9 3.1.10 3.1.11 3.1.12 3.1.13 5.0.0 5.0.1 5.0.2 5.0.3 5.0.4 5.0.5 `Location: C:\Program Files\dotnet\shared\Microsoft.WindowsDesktop.App` -- 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9 3.1.10 3.1.11 3.1.12 3.1.13 5.0.0 5.0.1 5.0.2 5.0.3 5.0.4 +- 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9 3.1.10 3.1.11 3.1.12 3.1.13 5.0.0 5.0.1 5.0.2 5.0.3 5.0.4 5.0.5 ### .NET Framework `Type: Developer Pack` @@ -518,7 +518,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Azure Powershell Modules | Module | Version | Path | | ------- | ---------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------ | -| Az | 1.0.0.zip
1.6.0.zip
2.3.2.zip
2.6.0.zip
3.1.0.zip
3.5.0.zip
3.8.0.zip
4.3.0.zip
4.4.0.zip
4.6.0.zip
4.7.0.zip
5.5.0 | C:\Modules\az_\ | +| Az | 1.0.0.zip
1.6.0.zip
2.3.2.zip
2.6.0.zip
3.1.0.zip
3.5.0.zip
3.8.0.zip
4.3.0.zip
4.4.0.zip
4.7.0.zip
5.5.0.zip
5.7.0 | C:\Modules\az_\ | | Azure | 3.8.0.zip
4.2.1.zip
5.1.1.zip
2.1.0 [Installed]
5.3.0 | C:\Modules\azure_\ | | AzureRM | 3.8.0.zip
4.2.1.zip
5.1.1.zip
6.7.0.zip
2.1.0 [Installed]
6.13.1 | C:\Modules\azurerm_\ | ``` @@ -569,9 +569,9 @@ All other versions are saved but not installed. | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | | mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2016 | sha256:d192997ca2b9e67cec497a8a8fc407fa9c10133d56e5f689ec69b5a9f9ef8abd | 2021-03-09 | | mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2016 | sha256:f6b2f76e6c8140feee8342cabc6c61f6b7834aab7026a27aed264275948b383d | 2021-03-09 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2016 | sha256:c6070d5ccae1462c026f5af96e66743b27be70a7e5e0e05e841e51a4d7158525 | 2021-03-09 | | mcr.microsoft.com/windows/nanoserver:10.0.14393.953 | sha256:fc60bd5ae0e61b334ce1cf1bcbf20c10c36b4c5482a01da319c9c989f9e6e268 | 2017-03-08 | | mcr.microsoft.com/windows/servercore:ltsc2016 | sha256:e5bb86930669e23f4e098844c59ca75787214d6cac44c772a006261bdcd9473a | 2021-03-03 | -| microsoft/aspnetcore-build:1.0-2.0 | sha256:9ecc7c5a8a7a11dca5f08c860165646cb30d084606360a3a72b9cbe447241c0c | 2018-08-15 | From 0d88bc14e5caacd0b149d114dbf604a206d85fb2 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 15 Apr 2021 07:43:11 +0000 Subject: [PATCH 0168/3485] Updating readme file for macOS-10.13 version 20210413.1 (#3179) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/macos/macos-10.13-Readme.md | 252 +++++++++++++---------------- 1 file changed, 116 insertions(+), 136 deletions(-) diff --git a/images/macos/macos-10.13-Readme.md b/images/macos/macos-10.13-Readme.md index e5bf0bc7bb50..e49d7cb3109b 100644 --- a/images/macos/macos-10.13-Readme.md +++ b/images/macos/macos-10.13-Readme.md @@ -1,112 +1,124 @@ | Announcements | |-| -| [[Ubuntu, macOS] .NET 3.0 will be removed from images on March, 1](https://github.com/actions/virtual-environments/issues/2558) | +| [[macOS] Az modules will be upgraded from 4.8.0 to 5.7.0 on April, 12](https://github.com/actions/virtual-environments/issues/3129) | | [macOS 11.0 pools will be transited to private preview.](https://github.com/actions/virtual-environments/issues/2486) | -| [[all OSs] Java 7 will be removed from images on February, 8.](https://github.com/actions/virtual-environments/issues/2446) | *** # macOS 10.13 info - System Version: macOS 10.13.6 (17G14033) - Kernel Version: Darwin 17.7.0 -- Image Version: 20210207.2 +- Image Version: 20210413.1 ## Installed Software ### Language and Runtime - .NET SDK 2.1.300 2.1.301 2.1.302 2.1.401 2.1.402 2.1.403 2.1.500 2.1.502 2.1.503 2.1.504 2.1.505 2.1.506 2.1.507 - Bash 3.2.57(1)-release -- Go 1.15.7 -- julia 1.5.3 +- Go 1.15.11 +- julia 1.6.0 - Node.js v8.17.0 -- NVM - Cached node versions: v6.17.1 v8.17.0 v10.23.2 v12.20.1 v13.14.0 v14.15.4 -- NVM 0.37.2 +- NVM - Cached node versions: v10.24.1 v12.22.1 v14.16.1 +- NVM 0.38.0 - Perl 5.32.1 -- PHP 8.0.2 +- PHP 8.0.3 - Python 2.7.18 -- Python 3.9.1 -- R 4.0.3 -- Ruby 2.7.2p137 +- Python 3.9.4 +- R 4.0.5 +- Ruby 2.7.3p183 ### Package Management -- Bundler version 2.2.8 +- Bundler version 2.2.16 - Carthage 0.37.0 - CocoaPods 1.10.1 -- Composer 2.0.9 -- Homebrew 3.0.0 +- Composer 2.0.12 +- Homebrew 3.1.1 - Miniconda 4.9.2 - NPM 3.10.10 - NuGet 4.7.0.5148 - Pip 20.3.4 (python 2.7) - Pip 21.0.1 (python 3.9) -- Pipx 0.16.0.0 -- RubyGems 3.2.8 +- Pipx 0.16.1.0 +- RubyGems 3.2.16 - Yarn 1.22.5 +#### Environment variables +| Name | Value | +| ----------------------- | -------------------- | +| CONDA | /usr/local/miniconda | +| VCPKG_INSTALLATION_ROOT | | + ### Project Management - Apache Ant(TM) 1.10.9 -- Apache Maven 3.6.3 -- Gradle 6.8.2 +- Apache Maven 3.8.1 +- Gradle 7.0 ### Utilities -- 7-Zip 16.02 +- 7-Zip 17.04 - aria2 1.35.0 -- azcopy 10.8.0 +- azcopy 10.9.0 - bazel 3.7.1 -- bazelisk 1.7.4 +- bazelisk 1.7.5 - bsdtar 2.8.3 - available by 'tar' alias -- Curl 7.75.0 -- Git LFS: 2.13.2 -- Git: 2.30.0 -- GitHub CLI: 1.5.0 -- GNU parallel 20201122 -- GNU Tar 1.33 - available by 'gtar' alias +- Curl 7.76.0 +- Git LFS: 2.13.3 +- Git: 2.31.1 +- GitHub CLI: 1.8.1 +- GNU parallel 20210322 +- GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.1 - gpg (GnuPG) 2.2.27 -- helm v3.5.2+g167aac7 +- helm v3.5.3+g041ce5a - Hub CLI: 2.14.2 - jq 1.6 -- mongo v4.4.3 -- mongod v4.4.3 -- OpenSSL 1.1.1i 8 Dec 2020 `(/usr/local/opt/openssl -> /usr/local/Cellar/openssl@1.1/1.1.1i)` -- Packer 1.6.6 -- PostgreSQL 13.1 -- psql (PostgreSQL) 13.1 -- Subversion (SVN) 1.14.0 -- Vagrant 2.2.14 +- mongo v4.4.4 +- mongod v4.4.4 +- OpenSSL 1.1.1k 25 Mar 2021 `(/usr/local/opt/openssl -> /usr/local/Cellar/openssl@1.1/1.1.1k)` +- Packer 1.7.2 +- PostgreSQL 13.2 +- psql (PostgreSQL) 13.2 +- Subversion (SVN) 1.14.1 +- Vagrant 2.2.15 - virtualbox 6.1.18r142142 -- zstd 1.4.8 +- zstd 1.4.9 ### Tools -- Aliyun CLI 3.0.70 +- Aliyun CLI 3.0.73 - App Center CLI 1.2.2 -- AWS CLI 2.1.24 -- AWS SAM CLI 1.17.0 +- AWS CLI 2.1.37 +- AWS SAM CLI 1.22.0 - AWS Session Manager CLI 1.2.30.0 -- Azure CLI 2.18.0 -- Cmake 3.19.4 -- Fastlane 2.173.0 +- Azure CLI 2.22.0 +- Cmake 3.20.1 +- Fastlane 2.180.1 - Xcode Command Line Tools 10.1.0.0.1.1539992718 ### Linters -- yamllint 1.26.0 +- yamllint 1.26.1 ### Browsers - Safari 13.1.2 (13609.3.5.1.5) - SafariDriver 13.1.2 (13609.3.5.1.5) -- Google Chrome 88.0.4324.150 -- ChromeDriver 88.0.4324.96 -- Microsoft Edge 88.0.705.63 -- MSEdgeDriver 88.0.705.63 -- Mozilla Firefox 85.0.1 -- geckodriver 0.29.0 +- Google Chrome 89.0.4389.128 +- ChromeDriver 89.0.4389.23 +- Microsoft Edge 89.0.774.75 +- MSEdgeDriver 89.0.774.76 +- Mozilla Firefox 87.0 +- geckodriver 0.29.1 (970ef713fe58 2021-04-08 23:34 +0200) + +#### Environment variables +| Name | Value | +| --------------- | --------------------------------------------- | +| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/89.0.4389.23 | +| EDGEWEBDRIVER | /usr/local/share/edge_driver | +| GECKOWEBDRIVER | /usr/local/bin | ### Java -| Version | Vendor | Environment Variable | -| --------- | ------------ | -------------------- | -| 1.8.0_282 | AdoptOpenJDK | JAVA_HOME_8_X64 | -| 11.0.10 | AdoptOpenJDK | JAVA_HOME_11_X64 | -| 12.0.2 | AdoptOpenJDK | JAVA_HOME_12_X64 | -| 13.0.2 | AdoptOpenJDK | JAVA_HOME_13_X64 | -| 14.0.2 | AdoptOpenJDK | JAVA_HOME_14_X64 | +| Version | Vendor | Environment Variable | +| ----------- | ------------- | -------------------- | +| 8.0.282+8 | Adopt OpenJDK | JAVA_HOME_8_X64 | +| 11.0.10+9 | Adopt OpenJDK | JAVA_HOME_11_X64 | +| 12.0.2+10.3 | Adopt OpenJDK | JAVA_HOME_12_X64 | +| 13.0.2+8.1 | Adopt OpenJDK | JAVA_HOME_13_X64 | +| 14.0.2+12 | Adopt OpenJDK | JAVA_HOME_14_X64 | ### Cached Tools #### Ruby @@ -123,89 +135,47 @@ - 3.8.2 #### PyPy -- 2.7.18 [PyPy 7.3.3] +- 2.7.18 [PyPy 7.3.4] - 3.6.12 [PyPy 7.3.3] ### PowerShell Tools -- PowerShell 7.1.1 +- PowerShell 7.1.3 #### PowerShell Modules -| Module | Version | -| ---------- | ------- | -| Az | 4.8.0 | -| MarkdownPS | 1.9 | -| Pester | 5.1.1 | +| Module | Version | +| ---------------- | ------- | +| Az | 4.8.0 | +| MarkdownPS | 1.9 | +| Pester | 5.1.1 | +| PSScriptAnalyzer | 1.19.1 | ### Xamarin #### Visual Studio for Mac - 8.3.11.1 -#### Mono -- 6.4.0.208 -- 6.0.0.334 -- 5.18.1.3 -- 5.16.1.0 -- 5.12.0.309 -- 5.10.1.57 -- 5.8.1.0 -- 5.4.1.7 -- 5.2.0.224 -- 5.0.1.1 -- 4.8.1 - -#### Xamarin.iOS -- 13.6.0.12 -- 13.4.0.2 -- 13.2.0.47 -- 12.14.0.114 -- 12.10.0.157 -- 12.8.0.2 -- 12.6.0.25 -- 12.2.1.16 -- 12.0.0.15 -- 11.14.0.13 -- 11.12.0.4 -- 11.9.1.24 -- 11.8.0.20 -- 11.6.1.4 -- 11.2.0.11 -- 11.0.0.0 -- 10.10.0.36 -- 10.6.0.10 - -#### Xamarin.Mac -- 6.6.0.12 -- 6.4.0.2 -- 6.2.0.47 -- 5.16.1.24 -- 5.10.0.157 -- 5.8.0.0 -- 5.6.0.25 -- 5.3.1.28 -- 5.2.1.16 -- 4.6.0.13 -- 4.4.1.193 -- 4.2.1.28 -- 4.0.0.216 -- 3.8.0.49 -- 3.6.3.3 -- 3.4.0.36 -- 3.0.0.398 - -#### Xamarin.Android -- 10.0.6 -- 9.4.1 -- 9.3.0 -- 9.2.3 -- 9.1.8 -- 9.0.0 -- 8.3.3 -- 8.2.0 -- 8.1.5 -- 8.0.0 -- 7.4.5 -- 7.3.1 -- 7.1.0 +#### Xamarin bundles +| symlink | Xamarin.Mono | Xamarin.iOS | Xamarin.Mac | Xamarin.Android | +| ---------------- | ------------ | ----------- | ----------- | --------------- | +| 6_4_2 | 6.4 | 13.6 | 6.6 | 10.0 | +| 6_4_1 | 6.4 | 13.4 | 6.4 | 10.0 | +| 6_4_0 | 6.4 | 13.2 | 6.2 | 10.0 | +| 6_0_0 | 6.0 | 12.14 | 5.16 | 9.4 | +| 5_18_3 | 5.18 | 12.10 | 5.10 | 9.3 | +| 5_18_2 | 5.18 | 12.8 | 5.8 | 9.2 | +| 5_18_1 | 5.18 | 12.6 | 5.6 | 9.2 | +| 5_16_0_0 | 5.16 | 12.2 | 5.2 | 9.1 | +| 5_16_0 | 5.16 | 12.2 | 5.2 | 9.1 | +| 5_12_0_3 | 5.12 | 12.2 | 5.3 | 9.0 | +| 5_12_0_XC10_PRE | 5.12 | 12.0 | 5.2 | 9.0 | +| 5_12_0 (default) | 5.12 | 11.14 | 4.6 | 9.0 | +| 5_10_1 | 5.10 | 11.12 | 4.4 | 8.3 | +| 5_8_1 | 5.8 | 11.9 | 4.2 | 8.2 | +| 5_8_0 | 5.8 | 11.8 | 4.2 | 8.2 | +| 5_4_1 | 5.4 | 11.6 | 4.0 | 8.1 | +| 5_4_0 | 5.4 | 11.2 | 3.8 | 8.0 | +| 5_2_0 | 5.2 | 11.0 | 3.6 | 7.4 | +| Legacy_5_0_1 | 5.0 | 10.10 | 3.4 | 7.3 | +| Legacy_4_8_1 | 4.8 | 10.6 | 3.0 | 7.1 | #### Unit Test Framework - NUnit 3.6.1 @@ -230,7 +200,7 @@ #### Xcode Support Tools - xcpretty 0.3.0 - xcversion 2.6.8 -- Nomad CLI 3.2.8 +- Nomad CLI 3.2.16 - Nomad CLI IPA ipa 0.14.3 - xctool 0.3.7 @@ -343,18 +313,28 @@ ### Android | Package Name | Version | | -------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Emulator | 30.3.5 | +| Android Emulator | 30.5.4 | | Android SDK Build-tools | 30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3
26.0.0 26.0.1 26.0.2 26.0.3
25.0.0 25.0.1 25.0.2 25.0.3
24.0.0 24.0.1 24.0.2 24.0.3
23.0.1 23.0.2 23.0.3 23.0.0
22.0.1 22.0.0
21.1.2 21.0.0 21.0.1 21.0.2 21.1.0 21.1.1
20.0.0
19.1.0 19.0.0 19.0.1 19.0.2 19.0.3
18.0.1 18.1.0 18.1.1
17.0.0 | -| Android SDK Platforms | android-30 (rev 3)
android-29 (rev 5)
android-28 (rev 6)
android-27 (rev 3)
android-26 (rev 2)
android-25 (rev 3)
android-24 (rev 2)
android-23 (rev 3)
android-22 (rev 2)
android-21 (rev 2)
android-20 (rev 2)
android-19 (rev 4)
android-18 (rev 3)
android-17 (rev 3)
android-16 (rev 5)
android-15 (rev 5) | -| Android SDK Platform-Tools | 30.0.5 | +| Android SDK Platforms | android-S (rev 2)
android-30 (rev 3)
android-29 (rev 5)
android-28 (rev 6)
android-27 (rev 3)
android-26 (rev 2)
android-25 (rev 3)
android-24 (rev 2)
android-23 (rev 3)
android-22 (rev 2)
android-21 (rev 2)
android-20 (rev 2)
android-19 (rev 4)
android-18 (rev 3)
android-17 (rev 3)
android-16 (rev 5)
android-15 (rev 5) | +| Android SDK Platform-Tools | 31.0.1 | | Android SDK Tools | 26.1.1 | | Android Support Repository | 47.0.0 | -| CMake | 3.6.4111459 | +| CMake | 3.10.2 | | Google APIs | addon-google_apis-google-21
addon-google_apis-google-22
addon-google_apis-google-23
addon-google_apis-google-24 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 15.2.4203891
18.1.5063045
21.4.7075529
22.0.7026061 | +| NDK | 15.2.4203891
18.1.5063045
21.4.7075529
22.1.7171670 | | SDK Patch Applier v4 | 1 | +#### Environment variables +| Name | Value | +| ----------------------- | -------------------------------------------------------------------------------------------------- | +| ANDROID_HOME | /Users/runner/Library/Android/sdk | +| ANDROID_NDK_18R_PATH | /Users/runner/Library/Android/sdk/ndk/18.1.5063045 | +| ANDROID_NDK_HOME | /Users/runner/Library/Android/sdk/ndk-bundle -> /Users/runner/Library/Android/sdk/ndk/21.4.7075529 | +| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/22.1.7171670 | +| ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk-bundle -> /Users/runner/Library/Android/sdk/ndk/21.4.7075529 | +| ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | + From 24f91060acca29666b79ed8653d642dd96deffc1 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Thu, 15 Apr 2021 12:04:19 +0300 Subject: [PATCH 0169/3485] Remove google chrome repo on Ubuntu (#3188) --- images/linux/scripts/installers/google-chrome.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/images/linux/scripts/installers/google-chrome.sh b/images/linux/scripts/installers/google-chrome.sh index eeefa46a37e1..350a9f0f4928 100644 --- a/images/linux/scripts/installers/google-chrome.sh +++ b/images/linux/scripts/installers/google-chrome.sh @@ -42,6 +42,9 @@ download_with_retries $CHROME_DEB_URL "/tmp" "${CHROME_DEB_NAME}" apt install "/tmp/${CHROME_DEB_NAME}" -f echo "CHROME_BIN=/usr/bin/google-chrome" | tee -a /etc/environment +# Remove Google Chrome repo +rm -f /etc/cron.daily/google-chrome /etc/apt/sources.list.d/google-chrome.list /etc/apt/sources.list.d/google-chrome.list.save + # Parse Google Chrome version FULL_CHROME_VERSION=$(google-chrome --product-version) CHROME_VERSION=${FULL_CHROME_VERSION%.*} From 94fc8cc0ba353d3dd96c1e239481437d74cfb1d5 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 15 Apr 2021 09:47:37 +0000 Subject: [PATCH 0170/3485] Updating readme file for macOS-10.14 version 20210413.1 (#3187) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/macos/macos-10.14-Readme.md | 181 +++++++++++------------------ 1 file changed, 66 insertions(+), 115 deletions(-) diff --git a/images/macos/macos-10.14-Readme.md b/images/macos/macos-10.14-Readme.md index 55c1137c2565..249f45c3d51c 100644 --- a/images/macos/macos-10.14-Readme.md +++ b/images/macos/macos-10.14-Readme.md @@ -1,11 +1,12 @@ | Announcements | |-| +| [[macOS] Az modules will be upgraded from 4.8.0 to 5.7.0 on April, 12](https://github.com/actions/virtual-environments/issues/3129) | | [macOS 11.0 pools will be transited to private preview.](https://github.com/actions/virtual-environments/issues/2486) | *** # macOS 10.14 info - System Version: macOS 10.14.6 (18G8022) - Kernel Version: Darwin 18.7.0 -- Image Version: 20210405.1 +- Image Version: 20210413.1 ## Installed Software ### Language and Runtime @@ -14,36 +15,36 @@ - Clang/LLVM 11.0.0 is default - Clang/LLVM 11.1.0 is available on `'$(brew --prefix llvm)/bin/clang'` - gcc-10 (Homebrew GCC 10.2.0_4) 10.2.0 - available by `gcc-10` alias -- gcc-8 (Homebrew GCC 8.4.0_2) 8.4.0 - available by `gcc-8` alias -- gcc-9 (Homebrew GCC 9.3.0_1) 9.3.0 - available by `gcc-9` alias +- gcc-8 (Homebrew GCC 8.4.0_3) 8.4.0 - available by `gcc-8` alias +- gcc-9 (Homebrew GCC 9.3.0_2) 9.3.0 - available by `gcc-9` alias - GNU Fortran (Homebrew GCC 10.2.0_4) 10.2.0 - available by `gfortran-10` alias -- GNU Fortran (Homebrew GCC 8.4.0_2) 8.4.0 - available by `gfortran-8` alias -- GNU Fortran (Homebrew GCC 9.3.0_1) 9.3.0 - available by `gfortran-9` alias +- GNU Fortran (Homebrew GCC 8.4.0_3) 8.4.0 - available by `gfortran-8` alias +- GNU Fortran (Homebrew GCC 9.3.0_2) 9.3.0 - available by `gfortran-9` alias - Go 1.15.11 - julia 1.6.0 - Node.js v8.17.0 -- NVM - Cached node versions: v10.24.0 v12.22.0 v14.16.0 +- NVM - Cached node versions: v10.24.1 v12.22.1 v14.16.1 - NVM 0.38.0 - Perl 5.32.1 - PHP 8.0.3 - Python 2.7.18 -- Python 3.9.2 +- Python 3.9.4 - R 4.0.5 -- Ruby 2.7.2p137 +- Ruby 2.7.3p183 ### Package Management -- Bundler version 2.2.15 +- Bundler version 2.2.16 - Carthage 0.37.0 - CocoaPods 1.10.1 - Composer 2.0.12 -- Homebrew 3.0.10 +- Homebrew 3.1.1 - Miniconda 4.9.2 - NPM 3.10.10 - NuGet 4.7.0.5148 - Pip 20.3.4 (python 2.7) - Pip 21.0.1 (python 3.9) - Pipx 0.16.1.0 -- RubyGems 3.2.15 +- RubyGems 3.2.16 - Yarn 1.22.5 #### Environment variables @@ -55,7 +56,7 @@ ### Project Management - Apache Ant(TM) 1.10.9 - Apache Maven 3.8.1 -- Gradle 6.8.3 +- Gradle 7.0 ### Utilities - 7-Zip 17.04 @@ -75,10 +76,10 @@ - helm v3.5.3+g041ce5a - Hub CLI: 2.14.2 - jq 1.6 -- mongo v4.4.3 -- mongod v4.4.3 +- mongo v4.4.4 +- mongod v4.4.4 - OpenSSL 1.1.1k 25 Mar 2021 `(/usr/local/opt/openssl -> /usr/local/Cellar/openssl@1.1/1.1.1k)` -- Packer 1.7.1 +- Packer 1.7.2 - PostgreSQL 13.2 - psql (PostgreSQL) 13.2 - Subversion (SVN) 1.14.1 @@ -90,31 +91,31 @@ ### Tools - Aliyun CLI 3.0.73 - App Center CLI 1.2.2 -- AWS CLI 2.1.34 -- AWS SAM CLI 1.21.1 +- AWS CLI 2.1.37 +- AWS SAM CLI 1.22.0 - AWS Session Manager CLI 1.2.30.0 -- Azure CLI 2.21.0 +- Azure CLI 2.22.0 - Cabal 3.4.0.0 -- Cmake 3.20.0 -- Fastlane 2.179.0 +- Cmake 3.20.1 +- Fastlane 2.180.1 - GHC 9.0.1 -- GHCup v0.1.14 +- GHCup v0.1.14.1 - Stack 2.5.1 - Xcode Command Line Tools 10.3.0.0.1.1562985497 ### Linters - SwiftLint 0.43.1 -- yamllint 1.26.0 +- yamllint 1.26.1 ### Browsers - Safari 14.0.3 (14610.4.3.1.7) - SafariDriver 14.0.3 (14610.4.3.1.7) -- Google Chrome 89.0.4389.114 +- Google Chrome 89.0.4389.128 - ChromeDriver 89.0.4389.23 -- Microsoft Edge 89.0.774.63 -- MSEdgeDriver 89.0.774.68 +- Microsoft Edge 89.0.774.75 +- MSEdgeDriver 89.0.774.76 - Mozilla Firefox 87.0 -- geckodriver 0.29.0 +- geckodriver 0.29.1 #### Environment variables | Name | Value | @@ -135,27 +136,27 @@ ### Cached Tools #### Ruby - 2.4.10 -- 2.5.8 -- 2.6.6 -- 2.7.2 -- 3.0.0 +- 2.5.9 +- 2.6.7 +- 2.7.3 +- 3.0.1 #### Python - 2.7.18 - 3.5.10 - 3.6.13 - 3.7.10 -- 3.8.8 +- 3.8.9 - 3.9.4 #### PyPy -- 2.7.18 [PyPy 7.3.3] +- 2.7.18 [PyPy 7.3.4] - 3.6.12 [PyPy 7.3.3] #### Node.js -- 10.24.0 -- 12.22.0 -- 14.16.0 +- 10.24.1 +- 12.22.1 +- 14.16.1 #### Go - 1.13.15 @@ -170,10 +171,10 @@ - Rustup 1.23.1 #### Packages -- Bindgen 0.58.0 +- Bindgen 0.58.1 - Cargo-audit 0.14.0 - Cargo-outdated v0.9.14 -- Cbindgen 0.18.0 +- Cbindgen 0.19.0 - Clippy 0.1.51 - Rustfmt 1.4.36-stable @@ -183,7 +184,7 @@ #### PowerShell Modules | Module | Version | | ---------------- | ------- | -| Az | 4.8.0 | +| Az | 5.7.0 | | MarkdownPS | 1.9 | | Pester | 5.1.1 | | PSScriptAnalyzer | 1.19.1 | @@ -192,82 +193,32 @@ #### Visual Studio for Mac - 8.5.0.3183 -#### Mono -- 6.8.0.123 -- 6.6.0.166 -- 6.4.0.208 -- 6.0.0.334 -- 5.18.1.3 -- 5.16.1.0 -- 5.12.0.309 -- 5.10.1.57 -- 5.8.1.0 -- 5.4.1.7 -- 5.2.0.224 -- 5.0.1.1 -- 4.8.1 - -#### Xamarin.iOS -- 13.14.1.39 -- 13.10.0.21 -- 13.8.3.0 -- 13.6.0.12 -- 13.4.0.2 -- 13.2.0.47 -- 12.14.0.114 -- 12.10.0.157 -- 12.8.0.2 -- 12.6.0.25 -- 12.2.1.16 -- 12.0.0.15 -- 11.14.0.13 -- 11.12.0.4 -- 11.9.1.24 -- 11.8.0.20 -- 11.6.1.4 -- 11.2.0.11 -- 11.0.0.0 -- 10.10.0.36 -- 10.6.0.10 - -#### Xamarin.Mac -- 6.14.1.39 -- 6.10.0.21 -- 6.8.3.0 -- 6.6.0.12 -- 6.4.0.2 -- 6.2.0.47 -- 5.16.1.24 -- 5.10.0.157 -- 5.8.0.0 -- 5.6.0.25 -- 5.3.1.28 -- 5.2.1.16 -- 4.6.0.13 -- 4.4.1.193 -- 4.2.1.28 -- 4.0.0.216 -- 3.8.0.49 -- 3.6.3.3 -- 3.4.0.36 -- 3.0.0.398 - -#### Xamarin.Android -- 10.2.0 -- 10.1.3 -- 10.0.6 -- 9.4.1 -- 9.3.0 -- 9.2.3 -- 9.1.8 -- 9.0.0 -- 8.3.3 -- 8.2.0 -- 8.1.5 -- 8.0.0 -- 7.4.5 -- 7.3.1 -- 7.1.0 +#### Xamarin bundles +| symlink | Xamarin.Mono | Xamarin.iOS | Xamarin.Mac | Xamarin.Android | +| ---------------- | ------------ | ----------- | ----------- | --------------- | +| 6_8_0 | 6.8 | 13.14 | 6.14 | 10.2 | +| 6_6_1 | 6.6 | 13.10 | 6.10 | 10.1 | +| 6_6_0 | 6.6 | 13.8 | 6.8 | 10.1 | +| 6_4_2 | 6.4 | 13.6 | 6.6 | 10.0 | +| 6_4_1 | 6.4 | 13.4 | 6.4 | 10.0 | +| 6_4_0 | 6.4 | 13.2 | 6.2 | 10.0 | +| 6_0_0 | 6.0 | 12.14 | 5.16 | 9.4 | +| 5_18_3 | 5.18 | 12.10 | 5.10 | 9.3 | +| 5_18_2 | 5.18 | 12.8 | 5.8 | 9.2 | +| 5_18_1 | 5.18 | 12.6 | 5.6 | 9.2 | +| 5_16_0_0 | 5.16 | 12.2 | 5.2 | 9.1 | +| 5_16_0 | 5.16 | 12.2 | 5.2 | 9.1 | +| 5_12_0_3 | 5.12 | 12.2 | 5.3 | 9.0 | +| 5_12_0_XC10_PRE | 5.12 | 12.0 | 5.2 | 9.0 | +| 5_12_0 (default) | 5.12 | 11.14 | 4.6 | 9.0 | +| 5_10_1 | 5.10 | 11.12 | 4.4 | 8.3 | +| 5_8_1 | 5.8 | 11.9 | 4.2 | 8.2 | +| 5_8_0 | 5.8 | 11.8 | 4.2 | 8.2 | +| 5_4_1 | 5.4 | 11.6 | 4.0 | 8.1 | +| 5_4_0 | 5.4 | 11.2 | 3.8 | 8.0 | +| 5_2_0 | 5.2 | 11.0 | 3.6 | 7.4 | +| Legacy_5_0_1 | 5.0 | 10.10 | 3.4 | 7.3 | +| Legacy_4_8_1 | 4.8 | 10.6 | 3.0 | 7.1 | #### Unit Test Framework - NUnit 3.6.1 @@ -291,7 +242,7 @@ #### Xcode Support Tools - xcpretty 0.3.0 - xcversion 2.6.8 -- Nomad CLI 3.2.15 +- Nomad CLI 3.2.16 - Nomad CLI IPA ipa 0.14.3 - xctool 0.3.7 From 575108f5a180c08dca45914fe82458a726f67c08 Mon Sep 17 00:00:00 2001 From: Darii Nurgaleev <50947177+Darleev@users.noreply.github.com> Date: Thu, 15 Apr 2021 17:05:57 +0700 Subject: [PATCH 0171/3485] Remove GithubFeedToken build parameter (#3184) --- docs/create-image-and-azure-resources.md | 2 -- helpers/GenerateResourcesAndImage.ps1 | 12 ------------ .../azure-pipelines/image-generation.yml | 2 +- images.CI/linux-and-win/build-image.ps1 | 2 -- images.CI/macos/azure-pipelines/image-generation.yml | 1 - 5 files changed, 1 insertion(+), 18 deletions(-) diff --git a/docs/create-image-and-azure-resources.md b/docs/create-image-and-azure-resources.md index d9a4dacec187..342670d9cb04 100644 --- a/docs/create-image-and-azure-resources.md +++ b/docs/create-image-and-azure-resources.md @@ -105,7 +105,6 @@ The Packer template includes `variables` section containing user variables used - `virtual_network_resource_group_name` - If `virtual_network_name` is set, this value may also be set. If `virtual_network_name` is set, and this value is not set the builder attempts to determine the resource group containing the virtual network. If the resource group cannot be found, or it cannot be disambiguated, this value should be set. - `virtual_network_subnet_name` - If `virtual_network_name` is set, this value may also be set. If `virtual_network_name` is set, and this value is not set the builder attempts to determine the subnet to use with the virtual network. If the subnet cannot be found, or it cannot be disambiguated, this value should be set. - `capture_name_prefix` - VHD prefix. The final artifacts will be named PREFIX-osDisk.UUID and PREFIX-vmTemplate.UUID. -- `github_feed_token` - Github PAT. Required for NPM toolcache installation. Will be depricated soon. ### Builder variables The `builders` section contains variables for the `azure-arm` builder used in the project. Most of the builder variables are inherited from the `user variables` section, however, the variables can be overwritten to adjust image-generation performance. @@ -123,7 +122,6 @@ Generated tool versions and details can be found in related projects: - [Python](https://github.com/actions/python-versions/) - [Go](https://github.com/actions/go-versions) - [Node](https://github.com/actions/node-versions) -- [Boost](https://github.com/actions/boost-versions) ### Post-generation scripts The user, created during the image generation, does not exist in the result VHD hence some configuration files related to the user's home directory need to be changed as well as the file permissions for some directories. Scripts for that are located in the `post-generation` folder in the repository: diff --git a/helpers/GenerateResourcesAndImage.ps1 b/helpers/GenerateResourcesAndImage.ps1 index d9693c516eb1..681ff3877628 100644 --- a/helpers/GenerateResourcesAndImage.ps1 +++ b/helpers/GenerateResourcesAndImage.ps1 @@ -80,9 +80,6 @@ Function GenerateResourcesAndImage { .PARAMETER Force Delete the resource group if it exists without user confirmation. - .PARAMETER GithubFeedToken - GitHub PAT to download tool packages from GitHub Package Registry - .PARAMETER AzureClientId Client id needs to be provided for optional authentication via service principal. Example: "11111111-1111-1111-1111-111111111111" @@ -109,8 +106,6 @@ Function GenerateResourcesAndImage { [Parameter(Mandatory = $False)] [int] $SecondsToWaitForServicePrincipalSetup = 30, [Parameter(Mandatory = $False)] - [string] $GithubFeedToken, - [Parameter(Mandatory = $False)] [string] $AzureClientId, [Parameter(Mandatory = $False)] [string] $AzureClientSecret, @@ -120,12 +115,6 @@ Function GenerateResourcesAndImage { [Switch] $Force ) - if ([string]::IsNullOrEmpty($GithubFeedToken)) - { - Write-Error "'-GithubFeedToken' parameter is not specified. You have to specify valid GitHub PAT to download tool packages from GitHub Package Registry" - exit 1 - } - $builderScriptPath = Get-PackerTemplatePath -RepositoryRoot $ImageGenerationRepositoryRoot -ImageType $ImageType $ServicePrincipalClientSecret = $env:UserName + [System.GUID]::NewGuid().ToString().ToUpper(); $InstallPassword = $env:UserName + [System.GUID]::NewGuid().ToString().ToUpper(); @@ -235,6 +224,5 @@ Function GenerateResourcesAndImage { -var "resource_group=$($ResourceGroupName)" ` -var "storage_account=$($storageAccountName)" ` -var "install_password=$($InstallPassword)" ` - -var "github_feed_token=$($GithubFeedToken)" ` $builderScriptPath } diff --git a/images.CI/linux-and-win/azure-pipelines/image-generation.yml b/images.CI/linux-and-win/azure-pipelines/image-generation.yml index 8de6e036f0c2..2b4aae4f8dd0 100644 --- a/images.CI/linux-and-win/azure-pipelines/image-generation.yml +++ b/images.CI/linux-and-win/azure-pipelines/image-generation.yml @@ -52,7 +52,7 @@ jobs: -VirtualNetworkName $(BUILD_AGENT_VNET_NAME) ` -VirtualNetworkRG $(BUILD_AGENT_VNET_RESOURCE_GROUP) ` -VirtualNetworkSubnet $(BUILD_AGENT_SUBNET_NAME) ` - -GitHubFeedToken $(GITHUB_TOKEN) + env: PACKER_LOG: 1 PACKER_LOG_PATH: $(Build.ArtifactStagingDirectory)/packer-log.txt diff --git a/images.CI/linux-and-win/build-image.ps1 b/images.CI/linux-and-win/build-image.ps1 index 6203ec61693d..1ea82791c337 100644 --- a/images.CI/linux-and-win/build-image.ps1 +++ b/images.CI/linux-and-win/build-image.ps1 @@ -2,7 +2,6 @@ param( [String] [Parameter (Mandatory=$true)] $TemplatePath, [String] [Parameter (Mandatory=$true)] $ClientId, [String] [Parameter (Mandatory=$true)] $ClientSecret, - [String] [Parameter (Mandatory=$true)] $GitHubFeedToken, [String] [Parameter (Mandatory=$true)] $ResourcesNamePrefix, [String] [Parameter (Mandatory=$true)] $Location, [String] [Parameter (Mandatory=$true)] $ResourceGroup, @@ -44,7 +43,6 @@ packer build -var "capture_name_prefix=$ResourcesNamePrefix" ` -var "client_id=$ClientId" ` -var "client_secret=$ClientSecret" ` -var "install_password=$InstallPassword" ` - -var "github_feed_token=$GitHubFeedToken" ` -var "location=$Location" ` -var "resource_group=$ResourceGroup" ` -var "storage_account=$StorageAccount" ` diff --git a/images.CI/macos/azure-pipelines/image-generation.yml b/images.CI/macos/azure-pipelines/image-generation.yml index 1615116e7844..8c53af415c7a 100644 --- a/images.CI/macos/azure-pipelines/image-generation.yml +++ b/images.CI/macos/azure-pipelines/image-generation.yml @@ -75,7 +75,6 @@ jobs: -var="vm_password=$(vm-password)" ` -var="build_id=$(VirtualMachineName)" ` -var="baseimage_name=${{ parameters.base_image_name }}" ` - -var="github_feed_token=$(github-feed-token)" ` -var="xcode_install_user=$(xcode-installation-user)" ` -var="xcode_install_password=$(xcode-installation-password)" ` -color=false ` From 4ae0bde84093e17ffb8802c9cac060330d6cd7ea Mon Sep 17 00:00:00 2001 From: Darii Nurgaleev <50947177+Darleev@users.noreply.github.com> Date: Thu, 15 Apr 2021 18:59:28 +0700 Subject: [PATCH 0172/3485] Image generation fix: remove quote (#3191) * github_feed_token removal * remove file * GithubFeedToken remove from other files * remove boost from docs * added fix for img generation --- images.CI/linux-and-win/azure-pipelines/image-generation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images.CI/linux-and-win/azure-pipelines/image-generation.yml b/images.CI/linux-and-win/azure-pipelines/image-generation.yml index 2b4aae4f8dd0..30ce846f5326 100644 --- a/images.CI/linux-and-win/azure-pipelines/image-generation.yml +++ b/images.CI/linux-and-win/azure-pipelines/image-generation.yml @@ -51,7 +51,7 @@ jobs: -Location $(AZURE_LOCATION) ` -VirtualNetworkName $(BUILD_AGENT_VNET_NAME) ` -VirtualNetworkRG $(BUILD_AGENT_VNET_RESOURCE_GROUP) ` - -VirtualNetworkSubnet $(BUILD_AGENT_SUBNET_NAME) ` + -VirtualNetworkSubnet $(BUILD_AGENT_SUBNET_NAME) env: PACKER_LOG: 1 From 8de2ab49f91e31ed3beb87d479cde6693cadc6a3 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 15 Apr 2021 12:29:47 +0000 Subject: [PATCH 0173/3485] Updating readme file for ubuntu16 version 20210412.1 (#3155) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/linux/Ubuntu1604-README.md | 102 +++++++++++++++--------------- 1 file changed, 52 insertions(+), 50 deletions(-) diff --git a/images/linux/Ubuntu1604-README.md b/images/linux/Ubuntu1604-README.md index 8a262521d063..ce16b2d481bd 100644 --- a/images/linux/Ubuntu1604-README.md +++ b/images/linux/Ubuntu1604-README.md @@ -1,10 +1,10 @@ | Announcements | |-| -| [[windows, ubuntu] Az, Azure and AzureRM module preinstallation policy will be changed on March, 29th](https://github.com/actions/virtual-environments/issues/2916) | +| [[windows, ubuntu] Few outdated Docker images will be removed on April, 12](https://github.com/actions/virtual-environments/issues/3111) | *** # Ubuntu 16.04.7 LTS - Linux kernel version: 4.15.0-1111-azure -- Image Version: 20210405.1 +- Image Version: 20210412.1 ## Installed Software ### Language and Runtime @@ -16,7 +16,7 @@ - GNU Fortran 5.5.0, 9.3.0 - Julia 1.6.0 - Mono 6.12.0.122 -- Node 14.16.0 +- Node 14.16.1 - Perl 5.22.1 - Python 2.7.12 - Python3 3.5.2 @@ -26,13 +26,13 @@ ### Package Management - cpan 1.61 - Helm 3.5.3 -- Homebrew 3.0.10 +- Homebrew 3.0.11 - Miniconda 4.9.2 -- Npm 6.14.11 +- Npm 6.14.12 - Pip 8.1.1 - Pip3 8.1.1 - RubyGems 2.5.2 -- Vcpkg (build from master \<030cfaa>) +- Vcpkg (build from master \) - Yarn 1.22.10 #### Environment variables @@ -43,7 +43,7 @@ ### Project Management - Ant 1.9.6 -- Gradle 6.8.3 +- Gradle 7.0 - Maven 3.6.3 - Sbt 1.5.0 @@ -53,17 +53,17 @@ - AzCopy 10.9.0 (available by `azcopy` and `azcopy10` aliases) - Bazel 4.0.0 - Bazelisk 1.7.5 -- CMake 3.20.0 +- CMake 3.20.1 - CodeQL Action Bundle 2.5.0 -- Docker Compose 1.28.6 +- Docker Compose 1.29.0 - Docker-Buildx 0.5.1 - Docker-Moby Client 20.10.5+azure - Docker-Moby Server 20.10.5+azure -- Git 2.31.1 -- Git LFS 2.13.3 +- Git 2.31.1 (apt source repository: ppa:git-core/ppa) +- Git LFS 2.13.3 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.0.2 - Haveged 1.9.1 -- Heroku 7.51.0 +- Heroku 7.52.0 - HHVM (HipHop VM) 4.56.4 - jq 1.5 - Kind 0.10.0 @@ -72,30 +72,30 @@ - Leiningen 2.9.5 - MediaInfo 0.7.82 - Mercurial 4.4.1 -- Minikube 1.18.1 +- Minikube 1.19.0 - Newman 5.2.2 - nvm 0.38.0 - OpenSSL 1.0.2g 1 Mar 2016 -- Packer 1.7.1 +- Packer 1.7.2 - PhantomJS 2.1.1 - Pulumi 2.24.1 - R 4.0.5 - Sphinx Open Source Search Server 2.2.9 - SVN 1.9.3 -- Terraform 0.14.9 +- Terraform 0.14.10 ### CLI Tools - Alibaba Cloud CLI 3.0.73 -- AWS CLI 1.19.44 +- AWS CLI 1.19.49 - AWS CLI Session manager plugin 1.2.54.0 -- AWS SAM CLI 1.21.1 +- AWS SAM CLI 1.22.0 - Azure CLI (azure-cli) 2.21.0 - Azure CLI (azure-devops) 0.18.0 - GitHub CLI 1.8.1 -- Google Cloud SDK 334.0.0 +- Google Cloud SDK 335.0.0 - Hub CLI 2.14.2 -- Netlify CLI 3.14.0 -- OpenShift CLI 4.7.4 +- Netlify CLI 3.17.0 +- OpenShift CLI 4.7.5 - ORAS CLI 0.11.1 - Vercel CLI 21.3.3 @@ -116,7 +116,7 @@ ### Haskell - Cabal 3.4.0.0 - GHC 9.0.1 -- GHCup 0.1.14 +- GHCup 0.1.14.1 - Stack 2.5.1 ### Rust Tools @@ -126,18 +126,18 @@ - Rustup 1.23.1 #### Packages -- Bindgen 0.58.0 +- Bindgen 0.58.1 - Cargo audit 0.14.0 - Cargo clippy 0.1.51 - Cargo outdated 0.9.14 -- Cbindgen 0.18.0 +- Cbindgen 0.19.0 - Rustfmt 1.4.36 ### Browsers and Drivers - Google Chrome 89.0.4389.114 - ChromeDriver 89.0.4389.23 - Mozilla Firefox 87.0 -- Geckodriver 0.29.0 +- Geckodriver 0.29.1 - Chromium 89.0.4389.0 #### Environment variables @@ -147,11 +147,11 @@ | GECKOWEBDRIVER | /usr/local/share/gecko_driver | ### .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.519 2.1.520 2.1.521 2.1.522 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.616 2.1.617 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 2.1.811 2.1.812 2.1.813 2.1.814 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.109 3.1.110 3.1.111 3.1.112 3.1.113 3.1.200 3.1.201 3.1.202 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 5.0.100 5.0.101 5.0.102 5.0.103 5.0.104 5.0.200 5.0.201 +- 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.519 2.1.520 2.1.521 2.1.522 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.616 2.1.617 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 2.1.811 2.1.812 2.1.813 2.1.814 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.109 3.1.110 3.1.111 3.1.112 3.1.113 3.1.200 3.1.201 3.1.202 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 5.0.100 5.0.101 5.0.102 5.0.103 5.0.104 5.0.200 5.0.201 5.0.202 ### Databases -- MongoDB 4.4.4 -- Postgre SQL 13.2 +- MongoDB 4.4.5 (apt source repository: https://repo.mongodb.org/apt/ubuntu) +- Postgre SQL 13.2 (apt source repository: https://apt.postgresql.org/pub/repos/apt/) - sqlite3 3.11.0 #### MySQL @@ -171,12 +171,12 @@ - 1.15.11 #### Node.js -- 10.24.0 -- 12.22.0 -- 14.16.0 +- 10.24.1 +- 12.22.1 +- 14.16.1 #### PyPy -- 2.7.18 [PyPy 7.3.3] +- 2.7.18 [PyPy 7.3.4] - 3.6.12 [PyPy 7.3.3] #### Python @@ -184,15 +184,15 @@ - 3.5.10 - 3.6.13 - 3.7.10 -- 3.8.8 +- 3.8.9 - 3.9.4 #### Ruby - 2.4.10 -- 2.5.8 -- 2.6.6 -- 2.7.2 -- 3.0.0 +- 2.5.9 +- 2.6.7 +- 2.7.3 +- 3.0.1 #### Environment variables | Name | Value | Architecture | @@ -211,7 +211,7 @@ | Pester | 5.1.1 | #### Az PowerShell Modules -- 5.5.0 3.1.0.zip 4.4.0.zip +- 5.7.0 3.1.0.zip 4.4.0.zip ### Web Servers | Name | Version | ConfigFile | ServiceStatus | ListenPort | @@ -246,19 +246,20 @@ ### Cached Docker images | Repository:Tag | Digest | Created | | ---------------------- | ------------------------------------------------------------------------ | ---------- | -| alpine:3.10 | sha256:4929878917a37edf0b7f69594552508a3432fe304335dd92be29bbaa839362ed | 2021-03-31 | -| alpine:3.7 | sha256:8421d9a84432575381bfabd248f1eb56f3aa21d9d7cd2511583c68c9b7511d10 | 2019-03-07 | -| alpine:3.8 | sha256:2bb501e6173d9d006e56de5bce2720eb06396803300fe1687b58a7ff32bf4c14 | 2020-01-23 | -| alpine:3.9 | sha256:414e0518bb9228d35e4cd5165567fb91d26c6a214e9c95899e1e056fcd349011 | 2020-04-24 | -| buildpack-deps:buster | sha256:08e16a0f30c3b53918405bfec408efdc5f058136a9715ad6479e503100b1c8ff | 2021-03-30 | -| buildpack-deps:stretch | sha256:7e051954f6d8d951be2f555b111bec8835a8c3fc18ad23425a25c7ce141e06b0 | 2021-03-30 | -| debian:8 | sha256:32ad5050caffb2c7e969dac873bce2c370015c2256ff984b70c1c08b3a2816a0 | 2021-03-26 | -| debian:9 | sha256:4b9b2ef8de1f3e9531626e8eb3d19e104e9dfde0a2b0f42b763b38235773f48e | 2021-03-30 | -| node:10 | sha256:1e8c3b26a17b53b4faabccd886d262ed3c58ceb07b08795783c53ec9403432fa | 2021-03-31 | -| node:10-alpine | sha256:8876535a96d4a8a71b8899851824d93d9595f9a8ae75a534d0076636db4587b3 | 2021-04-01 | -| node:12 | sha256:1f7e77446431e580974828a59e55d08bcbdb3147e58d9f207215201e5e008258 | 2021-03-31 | -| node:12-alpine | sha256:c4e50b1f0f4f86b7f1a2315efc9dea7e2d4152975da6125d1f981d8d0bca09b5 | 2021-04-01 | -| ubuntu:14.04 | sha256:4a8a6fa8810a3e01352981b35165b0b28403fe2a4e2535e315b23b4a69cd130a | 2021-03-25 | +| alpine:3.11 | sha256:bf5fa774f08a9ed2cb301e522b769d43d48124315a4ec50eae3228d03b9dc558 | 2021-03-31 | +| alpine:3.12 | sha256:834e9309b5ef0f78d8d20ef0652e7b0272fe97b5baf45720e1b830eaf013cc1b | 2021-03-31 | +| alpine:3.13 | sha256:ec14c7992a97fc11425907e908340c6c3d6ff602f5f13d899e6b7027c9b4133a | 2021-03-31 | +| buildpack-deps:buster | sha256:da41958eb012d10ac2e9764885e02612dd515df1b455900f3eda81d81a574ca3 | 2021-04-10 | +| buildpack-deps:stretch | sha256:ea0e73d4d5c3341e1328b58a69f513067c79fd6effd9776fc2d2f8d46e2f6e78 | 2021-04-10 | +| debian:10 | sha256:ba4a437377a0c450ac9bb634c3754a17b1f814ce6fa3157c0dc9eef431b29d1f | 2021-04-10 | +| debian:9 | sha256:c0daa8e312c326ac15721712b8a1e68a5039d725ff47bc25c781921089de0a66 | 2021-04-10 | +| node:10 | sha256:59531d2835edd5161c8f9512f9e095b1836f7a1fcb0ab73e005ec46047384911 | 2021-04-10 | +| node:10-alpine | sha256:8459a952511f363fbb4db57b991608b8d10c0fbd1ed89176f5dce474df1d5db8 | 2021-04-07 | +| node:12 | sha256:609103746810535f5a3a987a26ba4ce95d96225d28e9d6228faa5aa331980f37 | 2021-04-10 | +| node:12-alpine | sha256:3423a5eea6a1151df079c5e94458dbd946cd53bcb75b47954a16af3137731ec7 | 2021-04-07 | +| ubuntu:16.04 | sha256:bb84bbf2ff36d46acaf0bb0c6bcb33dae64cd93cba8652d74c9aaf438fada438 | 2021-03-25 | +| ubuntu:18.04 | sha256:122f506735a26c0a1aff2363335412cfc4f84de38326356d31ee00c2cbe52171 | 2021-03-25 | +| ubuntu:20.04 | sha256:3c9c713e0979e9bd6061ed52ac1e9e1f246c9495aa063619d9d695fb8039aa1f | 2021-04-03 | ### Installed apt packages | Name | Version | @@ -321,6 +322,7 @@ | sphinxsearch | 2.2.9-1build1 | | sqlite3 | 3.11.0-1ubuntu1.5 | | ssh | 1:7.2p2-4ubuntu2.10 | +| sshpass | 1.05-1 | | subversion | 1.9.3-2ubuntu1.3 | | sudo | 1.8.16-0ubuntu1.10 | | swig | 3.0.8-0ubuntu3 | From 08a251f60421de816b95d901858066afb80d9538 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 15 Apr 2021 12:31:22 +0000 Subject: [PATCH 0174/3485] Updating readme file for ubuntu18 version 20210412.1 (#3153) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/linux/Ubuntu1804-README.md | 112 +++++++++++++++--------------- 1 file changed, 57 insertions(+), 55 deletions(-) diff --git a/images/linux/Ubuntu1804-README.md b/images/linux/Ubuntu1804-README.md index cbe0d7d6b8f4..0b454d0902fa 100644 --- a/images/linux/Ubuntu1804-README.md +++ b/images/linux/Ubuntu1804-README.md @@ -1,10 +1,10 @@ | Announcements | |-| -| [[windows, ubuntu] Az, Azure and AzureRM module preinstallation policy will be changed on March, 29th](https://github.com/actions/virtual-environments/issues/2916) | +| [[windows, ubuntu] Few outdated Docker images will be removed on April, 12](https://github.com/actions/virtual-environments/issues/3111) | *** # Ubuntu 18.04.5 LTS - Linux kernel version: 5.4.0-1043-azure -- Image Version: 20210405.1 +- Image Version: 20210412.1 ## Installed Software ### Language and Runtime @@ -16,7 +16,7 @@ - GNU Fortran 7.5.0, 9.3.0, 10.1.0 - Julia 1.6.0 - Mono 6.12.0.122 -- Node 14.16.0 +- Node 14.16.1 - Perl 5.26.1 - Python 2.7.17 - Python3 3.6.9 @@ -26,14 +26,14 @@ ### Package Management - cpan 1.64 - Helm 3.5.3 -- Homebrew 3.0.10 +- Homebrew 3.0.11 - Miniconda 4.9.2 -- Npm 6.14.11 +- Npm 6.14.12 - Pip 9.0.1 - Pip3 9.0.1 - Pipx 0.16.1.0 - RubyGems 2.7.6 -- Vcpkg (build from master \<030cfaa>) +- Vcpkg (build from master \) - Yarn 1.22.10 #### Environment variables @@ -44,7 +44,7 @@ ### Project Management - Ant 1.10.5 -- Gradle 6.8.3 +- Gradle 7.0 - Maven 3.6.3 - Sbt 1.5.0 @@ -54,19 +54,19 @@ - AzCopy 10.9.0 (available by `azcopy` and `azcopy10` aliases) - Bazel 4.0.0 - Bazelisk 1.7.5 -- Buildah 1.19.6 -- CMake 3.20.0 +- Buildah 1.19.6 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) +- CMake 3.20.1 - CodeQL Action Bundle 2.5.0 -- Docker Compose 1.28.6 +- Docker Compose 1.29.0 - Docker-Buildx 0.5.1 - Docker-Moby Client 20.10.5+azure - Docker-Moby Server 20.10.5+azure -- Git 2.31.1 -- Git LFS 2.13.3 +- Git 2.31.1 (apt source repository: ppa:git-core/ppa) +- Git LFS 2.13.3 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.3.1 - Haveged 1.9.1 -- Heroku 7.51.0 -- HHVM (HipHop VM) 4.103.0 +- Heroku 7.52.0 +- HHVM (HipHop VM) 4.104.0 - jq 1.5 - Kind 0.10.0 - Kubectl 1.20.1-5-g76a04fc @@ -74,33 +74,33 @@ - Leiningen 2.9.5 - MediaInfo 17.12 - Mercurial 4.5.3 -- Minikube 1.18.1 +- Minikube 1.19.0 - Newman 5.2.2 - nvm 0.38.0 - OpenSSL 1.1.1 11 Sep 2018 -- Packer 1.7.1 +- Packer 1.7.2 - PhantomJS 2.1.1 -- Podman 3.0.1 +- Podman 3.0.1 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Pulumi 2.24.1 - R 4.0.5 -- Skopeo 1.2.2 +- Skopeo 1.2.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 - SVN 1.9.7 -- Terraform 0.14.9 -- yamllint 1.26.0 +- Terraform 0.14.10 +- yamllint 1.26.1 ### CLI Tools - Alibaba Cloud CLI 3.0.73 -- AWS CLI 1.19.44 +- AWS CLI 1.19.49 - AWS CLI Session manager plugin 1.2.54.0 -- AWS SAM CLI 1.21.1 +- AWS SAM CLI 1.22.0 - Azure CLI (azure-cli) 2.21.0 - Azure CLI (azure-devops) 0.18.0 - GitHub CLI 1.8.1 -- Google Cloud SDK 334.0.0 +- Google Cloud SDK 335.0.0 - Hub CLI 2.14.2 -- Netlify CLI 3.14.0 -- OpenShift CLI 4.7.4 +- Netlify CLI 3.17.0 +- OpenShift CLI 4.7.5 - ORAS CLI 0.11.1 - Vercel CLI 21.3.3 @@ -121,7 +121,7 @@ ### Haskell - Cabal 3.4.0.0 - GHC 9.0.1 -- GHCup 0.1.14 +- GHCup 0.1.14.1 - Stack 2.5.1 ### Rust Tools @@ -131,18 +131,18 @@ - Rustup 1.23.1 #### Packages -- Bindgen 0.58.0 +- Bindgen 0.58.1 - Cargo audit 0.14.0 - Cargo clippy 0.1.51 - Cargo outdated 0.9.14 -- Cbindgen 0.18.0 +- Cbindgen 0.19.0 - Rustfmt 1.4.36 ### Browsers and Drivers - Google Chrome 89.0.4389.114 - ChromeDriver 89.0.4389.23 - Mozilla Firefox 87.0 -- Geckodriver 0.29.0 +- Geckodriver 0.29.1 - Chromium 89.0.4389.0 #### Environment variables @@ -152,11 +152,11 @@ | GECKOWEBDRIVER | /usr/local/share/gecko_driver | ### .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.519 2.1.520 2.1.521 2.1.522 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.616 2.1.617 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 2.1.811 2.1.812 2.1.813 2.1.814 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.109 3.1.110 3.1.111 3.1.112 3.1.113 3.1.200 3.1.201 3.1.202 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 5.0.100 5.0.101 5.0.102 5.0.103 5.0.104 5.0.200 5.0.201 +- 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.519 2.1.520 2.1.521 2.1.522 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.616 2.1.617 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 2.1.811 2.1.812 2.1.813 2.1.814 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.109 3.1.110 3.1.111 3.1.112 3.1.113 3.1.200 3.1.201 3.1.202 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 5.0.100 5.0.101 5.0.102 5.0.103 5.0.104 5.0.200 5.0.201 5.0.202 ### Databases -- MongoDB 4.4.4 -- Postgre SQL 13.2 +- MongoDB 4.4.5 (apt source repository: https://repo.mongodb.org/apt/ubuntu) +- Postgre SQL 13.2 (apt source repository: https://apt.postgresql.org/pub/repos/apt/) - sqlite3 3.22.0 #### MySQL @@ -176,12 +176,12 @@ - 1.15.11 #### Node.js -- 10.24.0 -- 12.22.0 -- 14.16.0 +- 10.24.1 +- 12.22.1 +- 14.16.1 #### PyPy -- 2.7.18 [PyPy 7.3.3] +- 2.7.18 [PyPy 7.3.4] - 3.6.12 [PyPy 7.3.3] #### Python @@ -189,15 +189,15 @@ - 3.5.10 - 3.6.13 - 3.7.10 -- 3.8.8 +- 3.8.9 - 3.9.4 #### Ruby - 2.4.10 -- 2.5.8 -- 2.6.6 -- 2.7.2 -- 3.0.0 +- 2.5.9 +- 2.6.7 +- 2.7.3 +- 3.0.1 #### Environment variables | Name | Value | Architecture | @@ -216,7 +216,7 @@ | Pester | 5.1.1 | #### Az PowerShell Modules -- 5.5.0 3.1.0.zip 4.4.0.zip +- 5.7.0 3.1.0.zip 4.4.0.zip ### Web Servers | Name | Version | ConfigFile | ServiceStatus | ListenPort | @@ -251,19 +251,20 @@ ### Cached Docker images | Repository:Tag | Digest | Created | | ---------------------- | ------------------------------------------------------------------------ | ---------- | -| alpine:3.10 | sha256:4929878917a37edf0b7f69594552508a3432fe304335dd92be29bbaa839362ed | 2021-03-31 | -| alpine:3.7 | sha256:8421d9a84432575381bfabd248f1eb56f3aa21d9d7cd2511583c68c9b7511d10 | 2019-03-07 | -| alpine:3.8 | sha256:2bb501e6173d9d006e56de5bce2720eb06396803300fe1687b58a7ff32bf4c14 | 2020-01-23 | -| alpine:3.9 | sha256:414e0518bb9228d35e4cd5165567fb91d26c6a214e9c95899e1e056fcd349011 | 2020-04-24 | -| buildpack-deps:buster | sha256:08e16a0f30c3b53918405bfec408efdc5f058136a9715ad6479e503100b1c8ff | 2021-03-30 | -| buildpack-deps:stretch | sha256:7e051954f6d8d951be2f555b111bec8835a8c3fc18ad23425a25c7ce141e06b0 | 2021-03-30 | -| debian:8 | sha256:32ad5050caffb2c7e969dac873bce2c370015c2256ff984b70c1c08b3a2816a0 | 2021-03-26 | -| debian:9 | sha256:4b9b2ef8de1f3e9531626e8eb3d19e104e9dfde0a2b0f42b763b38235773f48e | 2021-03-30 | -| node:10 | sha256:1e8c3b26a17b53b4faabccd886d262ed3c58ceb07b08795783c53ec9403432fa | 2021-03-31 | -| node:10-alpine | sha256:8876535a96d4a8a71b8899851824d93d9595f9a8ae75a534d0076636db4587b3 | 2021-04-01 | -| node:12 | sha256:1f7e77446431e580974828a59e55d08bcbdb3147e58d9f207215201e5e008258 | 2021-03-31 | -| node:12-alpine | sha256:c4e50b1f0f4f86b7f1a2315efc9dea7e2d4152975da6125d1f981d8d0bca09b5 | 2021-04-01 | -| ubuntu:14.04 | sha256:4a8a6fa8810a3e01352981b35165b0b28403fe2a4e2535e315b23b4a69cd130a | 2021-03-25 | +| alpine:3.11 | sha256:bf5fa774f08a9ed2cb301e522b769d43d48124315a4ec50eae3228d03b9dc558 | 2021-03-31 | +| alpine:3.12 | sha256:834e9309b5ef0f78d8d20ef0652e7b0272fe97b5baf45720e1b830eaf013cc1b | 2021-03-31 | +| alpine:3.13 | sha256:ec14c7992a97fc11425907e908340c6c3d6ff602f5f13d899e6b7027c9b4133a | 2021-03-31 | +| buildpack-deps:buster | sha256:da41958eb012d10ac2e9764885e02612dd515df1b455900f3eda81d81a574ca3 | 2021-04-10 | +| buildpack-deps:stretch | sha256:ea0e73d4d5c3341e1328b58a69f513067c79fd6effd9776fc2d2f8d46e2f6e78 | 2021-04-10 | +| debian:10 | sha256:ba4a437377a0c450ac9bb634c3754a17b1f814ce6fa3157c0dc9eef431b29d1f | 2021-04-10 | +| debian:9 | sha256:c0daa8e312c326ac15721712b8a1e68a5039d725ff47bc25c781921089de0a66 | 2021-04-10 | +| node:10 | sha256:59531d2835edd5161c8f9512f9e095b1836f7a1fcb0ab73e005ec46047384911 | 2021-04-10 | +| node:10-alpine | sha256:8459a952511f363fbb4db57b991608b8d10c0fbd1ed89176f5dce474df1d5db8 | 2021-04-07 | +| node:12 | sha256:609103746810535f5a3a987a26ba4ce95d96225d28e9d6228faa5aa331980f37 | 2021-04-10 | +| node:12-alpine | sha256:3423a5eea6a1151df079c5e94458dbd946cd53bcb75b47954a16af3137731ec7 | 2021-04-07 | +| ubuntu:16.04 | sha256:bb84bbf2ff36d46acaf0bb0c6bcb33dae64cd93cba8652d74c9aaf438fada438 | 2021-03-25 | +| ubuntu:18.04 | sha256:122f506735a26c0a1aff2363335412cfc4f84de38326356d31ee00c2cbe52171 | 2021-03-25 | +| ubuntu:20.04 | sha256:3c9c713e0979e9bd6061ed52ac1e9e1f246c9495aa063619d9d695fb8039aa1f | 2021-04-03 | ### Installed apt packages | Name | Version | @@ -324,6 +325,7 @@ | sphinxsearch | 2.2.11-2 | | sqlite3 | 3.22.0-1ubuntu0.4 | | ssh | 1:7.6p1-4ubuntu0.3 | +| sshpass | 1.06-1 | | subversion | 1.9.7-4ubuntu1 | | sudo | 1.8.21p2-3ubuntu1.4 | | swig | 3.0.12-1 | From ae60820a20b383662f9f9e630be3568724593f44 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 15 Apr 2021 12:38:05 +0000 Subject: [PATCH 0175/3485] Updating readme file for ubuntu20 version 20210412.1 (#3154) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/linux/Ubuntu2004-README.md | 116 +++++++++++++++--------------- 1 file changed, 59 insertions(+), 57 deletions(-) diff --git a/images/linux/Ubuntu2004-README.md b/images/linux/Ubuntu2004-README.md index f4de3535dd71..602f3daa5b37 100644 --- a/images/linux/Ubuntu2004-README.md +++ b/images/linux/Ubuntu2004-README.md @@ -1,10 +1,10 @@ | Announcements | |-| -| [[windows, ubuntu] Az, Azure and AzureRM module preinstallation policy will be changed on March, 29th](https://github.com/actions/virtual-environments/issues/2916) | +| [[windows, ubuntu] Few outdated Docker images will be removed on April, 12](https://github.com/actions/virtual-environments/issues/3111) | *** # Ubuntu 20.04.2 LTS - Linux kernel version: 5.4.0-1043-azure -- Image Version: 20210405.1 +- Image Version: 20210412.1 ## Installed Software ### Language and Runtime @@ -16,7 +16,7 @@ - GNU Fortran 9.3.0, 10.2.0 - Julia 1.6.0 - Mono 6.12.0.122 -- Node 14.16.0 +- Node 14.16.1 - Perl 5.30.0 - Python 3.8.5 - Python3 3.8.5 @@ -26,14 +26,14 @@ ### Package Management - cpan 1.64 - Helm 3.5.3 -- Homebrew 3.0.10 +- Homebrew 3.0.11 - Miniconda 4.9.2 -- Npm 6.14.11 +- Npm 6.14.12 - Pip 20.0.2 - Pip3 20.0.2 - Pipx 0.16.1.0 - RubyGems 3.1.2 -- Vcpkg (build from master \<030cfaa>) +- Vcpkg (build from master \) - Yarn 1.22.10 #### Environment variables @@ -44,7 +44,7 @@ ### Project Management - Ant 1.10.7 -- Gradle 6.8.3 +- Gradle 7.0 - Lerna 4.0.0 - Maven 3.6.3 - Sbt 1.5.0 @@ -55,20 +55,20 @@ - AzCopy 10.9.0 (available by `azcopy` and `azcopy10` aliases) - Bazel 4.0.0 - Bazelisk 1.7.5 -- Buildah 1.20.0 -- CMake 3.20.0 +- Buildah 1.20.0 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) +- CMake 3.20.1 - CodeQL Action Bundle 2.5.0 -- Docker Compose 1.28.6 +- Docker Compose 1.29.0 - Docker-Buildx 0.5.1 - Docker-Moby Client 20.10.5+azure - Docker-Moby Server 20.10.5+azure -- Fastlane 2.179.0 -- Git 2.31.1 -- Git LFS 2.13.3 +- Fastlane 2.180.1 +- Git 2.31.1 (apt source repository: ppa:git-core/ppa) +- Git LFS 2.13.3 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.6.0 - Haveged 1.9.1 -- Heroku 7.51.0 -- HHVM (HipHop VM) 4.103.0 +- Heroku 7.52.0 +- HHVM (HipHop VM) 4.104.0 - jq 1.6 - Kind 0.10.0 - Kubectl 1.20.1-5-g76a04fc @@ -76,33 +76,33 @@ - Leiningen 2.9.5 - MediaInfo 19.09 - Mercurial 5.3.1 -- Minikube 1.18.1 +- Minikube 1.19.0 - Newman 5.2.2 - nvm 0.38.0 - OpenSSL 1.1.1f 31 Mar 2020 -- Packer 1.7.1 +- Packer 1.7.2 - PhantomJS 2.1.1 -- Podman 3.0.1 +- Podman 3.0.1 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Pulumi 2.24.1 - R 4.0.5 -- Skopeo 1.2.2 +- Skopeo 1.2.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 -- Terraform 0.14.9 -- yamllint 1.26.0 +- Terraform 0.14.10 +- yamllint 1.26.1 ### CLI Tools - Alibaba Cloud CLI 3.0.73 -- AWS CLI 2.1.34 +- AWS CLI 2.1.36 - AWS CLI Session manager plugin 1.2.54.0 -- AWS SAM CLI 1.21.1 +- AWS SAM CLI 1.22.0 - Azure CLI (azure-cli) 2.21.0 - Azure CLI (azure-devops) 0.18.0 - GitHub CLI 1.8.1 -- Google Cloud SDK 334.0.0 +- Google Cloud SDK 335.0.0 - Hub CLI 2.14.2 -- Netlify CLI 3.14.0 -- OpenShift CLI 4.7.4 +- Netlify CLI 3.17.0 +- OpenShift CLI 4.7.5 - ORAS CLI 0.11.1 - Vercel CLI 21.3.3 @@ -127,7 +127,7 @@ ### Haskell - Cabal 3.4.0.0 - GHC 9.0.1 -- GHCup 0.1.14 +- GHCup 0.1.14.1 - Stack 2.5.1 ### Rust Tools @@ -137,18 +137,18 @@ - Rustup 1.23.1 #### Packages -- Bindgen 0.58.0 +- Bindgen 0.58.1 - Cargo audit 0.14.0 - Cargo clippy 0.1.51 - Cargo outdated 0.9.14 -- Cbindgen 0.18.0 +- Cbindgen 0.19.0 - Rustfmt 1.4.36 ### Browsers and Drivers - Google Chrome 89.0.4389.114 - ChromeDriver 89.0.4389.23 - Mozilla Firefox 87.0 -- Geckodriver 0.29.0 +- Geckodriver 0.29.1 - Chromium 89.0.4389.0 #### Environment variables @@ -158,11 +158,11 @@ | GECKOWEBDRIVER | /usr/local/share/gecko_driver | ### .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.519 2.1.520 2.1.521 2.1.522 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.616 2.1.617 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 2.1.811 2.1.812 2.1.813 2.1.814 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.109 3.1.110 3.1.111 3.1.112 3.1.113 3.1.200 3.1.201 3.1.202 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 5.0.100 5.0.101 5.0.102 5.0.103 5.0.104 5.0.200 5.0.201 +- 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.519 2.1.520 2.1.521 2.1.522 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.616 2.1.617 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 2.1.811 2.1.812 2.1.813 2.1.814 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.109 3.1.110 3.1.111 3.1.112 3.1.113 3.1.200 3.1.201 3.1.202 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 5.0.100 5.0.101 5.0.102 5.0.103 5.0.104 5.0.200 5.0.201 5.0.202 ### Databases -- MongoDB 4.4.4 -- Postgre SQL 13.2 +- MongoDB 4.4.5 (apt source repository: https://repo.mongodb.org/apt/ubuntu) +- Postgre SQL 13.2 (apt source repository: https://apt.postgresql.org/pub/repos/apt/) - sqlite3 3.31.1 #### MySQL @@ -182,28 +182,28 @@ - 1.16.3 #### Node.js -- 10.24.0 -- 12.22.0 -- 14.16.0 +- 10.24.1 +- 12.22.1 +- 14.16.1 #### PyPy -- 2.7.18 [PyPy 7.3.3] +- 2.7.18 [PyPy 7.3.4] - 3.6.12 [PyPy 7.3.3] -- 3.7.9 [PyPy 7.3.3-beta0] +- 3.7.10 [PyPy 7.3.4] #### Python - 2.7.18 - 3.5.10 - 3.6.13 - 3.7.10 -- 3.8.8 +- 3.8.9 - 3.9.4 #### Ruby -- 2.5.8 -- 2.6.6 -- 2.7.2 -- 3.0.0 +- 2.5.9 +- 2.6.7 +- 2.7.3 +- 3.0.1 #### Environment variables | Name | Value | Architecture | @@ -223,7 +223,7 @@ | PSScriptAnalyzer | 1.19.1 | #### Az PowerShell Modules -- 5.5.0 3.1.0.zip 4.4.0.zip +- 5.7.0 3.1.0.zip 4.4.0.zip ### Web Servers | Name | Version | ConfigFile | ServiceStatus | ListenPort | @@ -259,19 +259,20 @@ ### Cached Docker images | Repository:Tag | Digest | Created | | ---------------------- | ------------------------------------------------------------------------ | ---------- | -| alpine:3.10 | sha256:4929878917a37edf0b7f69594552508a3432fe304335dd92be29bbaa839362ed | 2021-03-31 | -| alpine:3.7 | sha256:8421d9a84432575381bfabd248f1eb56f3aa21d9d7cd2511583c68c9b7511d10 | 2019-03-07 | -| alpine:3.8 | sha256:2bb501e6173d9d006e56de5bce2720eb06396803300fe1687b58a7ff32bf4c14 | 2020-01-23 | -| alpine:3.9 | sha256:414e0518bb9228d35e4cd5165567fb91d26c6a214e9c95899e1e056fcd349011 | 2020-04-24 | -| buildpack-deps:buster | sha256:08e16a0f30c3b53918405bfec408efdc5f058136a9715ad6479e503100b1c8ff | 2021-03-30 | -| buildpack-deps:stretch | sha256:7e051954f6d8d951be2f555b111bec8835a8c3fc18ad23425a25c7ce141e06b0 | 2021-03-30 | -| debian:8 | sha256:32ad5050caffb2c7e969dac873bce2c370015c2256ff984b70c1c08b3a2816a0 | 2021-03-26 | -| debian:9 | sha256:4b9b2ef8de1f3e9531626e8eb3d19e104e9dfde0a2b0f42b763b38235773f48e | 2021-03-30 | -| node:10 | sha256:1e8c3b26a17b53b4faabccd886d262ed3c58ceb07b08795783c53ec9403432fa | 2021-03-31 | -| node:10-alpine | sha256:8876535a96d4a8a71b8899851824d93d9595f9a8ae75a534d0076636db4587b3 | 2021-04-01 | -| node:12 | sha256:1f7e77446431e580974828a59e55d08bcbdb3147e58d9f207215201e5e008258 | 2021-03-31 | -| node:12-alpine | sha256:c4e50b1f0f4f86b7f1a2315efc9dea7e2d4152975da6125d1f981d8d0bca09b5 | 2021-04-01 | -| ubuntu:14.04 | sha256:4a8a6fa8810a3e01352981b35165b0b28403fe2a4e2535e315b23b4a69cd130a | 2021-03-25 | +| alpine:3.11 | sha256:bf5fa774f08a9ed2cb301e522b769d43d48124315a4ec50eae3228d03b9dc558 | 2021-03-31 | +| alpine:3.12 | sha256:834e9309b5ef0f78d8d20ef0652e7b0272fe97b5baf45720e1b830eaf013cc1b | 2021-03-31 | +| alpine:3.13 | sha256:ec14c7992a97fc11425907e908340c6c3d6ff602f5f13d899e6b7027c9b4133a | 2021-03-31 | +| buildpack-deps:buster | sha256:da41958eb012d10ac2e9764885e02612dd515df1b455900f3eda81d81a574ca3 | 2021-04-10 | +| buildpack-deps:stretch | sha256:ea0e73d4d5c3341e1328b58a69f513067c79fd6effd9776fc2d2f8d46e2f6e78 | 2021-04-10 | +| debian:10 | sha256:ba4a437377a0c450ac9bb634c3754a17b1f814ce6fa3157c0dc9eef431b29d1f | 2021-04-10 | +| debian:9 | sha256:c0daa8e312c326ac15721712b8a1e68a5039d725ff47bc25c781921089de0a66 | 2021-04-10 | +| node:10 | sha256:59531d2835edd5161c8f9512f9e095b1836f7a1fcb0ab73e005ec46047384911 | 2021-04-10 | +| node:10-alpine | sha256:8459a952511f363fbb4db57b991608b8d10c0fbd1ed89176f5dce474df1d5db8 | 2021-04-07 | +| node:12 | sha256:609103746810535f5a3a987a26ba4ce95d96225d28e9d6228faa5aa331980f37 | 2021-04-10 | +| node:12-alpine | sha256:3423a5eea6a1151df079c5e94458dbd946cd53bcb75b47954a16af3137731ec7 | 2021-04-07 | +| ubuntu:16.04 | sha256:bb84bbf2ff36d46acaf0bb0c6bcb33dae64cd93cba8652d74c9aaf438fada438 | 2021-03-25 | +| ubuntu:18.04 | sha256:122f506735a26c0a1aff2363335412cfc4f84de38326356d31ee00c2cbe52171 | 2021-03-25 | +| ubuntu:20.04 | sha256:3c9c713e0979e9bd6061ed52ac1e9e1f246c9495aa063619d9d695fb8039aa1f | 2021-04-03 | ### Installed apt packages | Name | Version | @@ -334,6 +335,7 @@ | sphinxsearch | 2.2.11-2ubuntu2 | | sqlite3 | 3.31.1-4ubuntu0.2 | | ssh | 1:8.2p1-4ubuntu0.2 | +| sshpass | 1.06-1 | | subversion | 1.13.0-3 | | sudo | 1.8.31-1ubuntu1.2 | | swig | 4.0.1-5build1 | From 0c6c332678e0f512f204e3eb97b080c23cae6677 Mon Sep 17 00:00:00 2001 From: Alena Sviridenko Date: Fri, 16 Apr 2021 00:04:17 +0300 Subject: [PATCH 0176/3485] [macOS] Create VM_ASSETS environment variable (#3190) --- images/macos/provision/configuration/environment/bashrc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/images/macos/provision/configuration/environment/bashrc b/images/macos/provision/configuration/environment/bashrc index bea64c7e2e8e..224f000cdbee 100644 --- a/images/macos/provision/configuration/environment/bashrc +++ b/images/macos/provision/configuration/environment/bashrc @@ -7,6 +7,8 @@ export ANDROID_SDK_ROOT=${HOME}/Library/Android/sdk export ANDROID_NDK_HOME=${ANDROID_HOME}/ndk-bundle export ANDROID_NDK_ROOT=${ANDROID_HOME}/ndk-bundle +export VM_ASSETS=/usr/local/opt/$USER/scripts + export NUNIT_BASE_PATH=/Library/Developer/nunit export NUNIT3_PATH=/Library/Developer/nunit/3.6.0 From 4a2e5bca16d99dcf4f1ee58a4305bff7cf957fe5 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Fri, 16 Apr 2021 19:24:24 +0300 Subject: [PATCH 0177/3485] [ubuntu] Remove google-cloud-sdk repo (#3199) --- .../scripts/SoftwareReport/SoftwareReport.Tools.psm1 | 3 ++- images/linux/scripts/installers/google-cloud-sdk.sh | 11 ++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 index 1473b09455f2..e3f491ef8779 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 @@ -95,7 +95,8 @@ function Get-GitFTPVersion { } function Get-GoogleCloudSDKVersion { - return "$(gcloud --version | Select-Object -First 1)" + $aptSourceRepo = Get-AptSourceRepository -PackageName "google-cloud-sdk" + return "$(gcloud --version | Select-Object -First 1) (apt source repository: $aptSourceRepo)" } function Get-HavegedVersion { diff --git a/images/linux/scripts/installers/google-cloud-sdk.sh b/images/linux/scripts/installers/google-cloud-sdk.sh index c0ea469a2285..f2b826264f34 100644 --- a/images/linux/scripts/installers/google-cloud-sdk.sh +++ b/images/linux/scripts/installers/google-cloud-sdk.sh @@ -4,10 +4,19 @@ ## Desc: Installs the Google Cloud SDK ################################################################################ +REPO_URL="https://packages.cloud.google.com/apt" + # Install the Google Cloud SDK -echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] https://packages.cloud.google.com/apt cloud-sdk main" | sudo tee -a /etc/apt/sources.list.d/google-cloud-sdk.list +echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] $REPO_URL cloud-sdk main" | sudo tee -a /etc/apt/sources.list.d/google-cloud-sdk.list curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | sudo apt-key --keyring /usr/share/keyrings/cloud.google.gpg add - sudo apt-get update -y sudo apt-get install -y google-cloud-sdk +# remove apt +rm /etc/apt/sources.list.d/google-cloud-sdk.list +rm /usr/share/keyrings/cloud.google.gpg /usr/share/keyrings/cloud.google.gpg~ + +# add repo to the apt-sources.txt +echo "google-cloud-sdk $REPO_URL" >> $HELPER_SCRIPTS/apt-sources.txt + invoke_tests "CLI.Tools" "Google Cloud SDK" \ No newline at end of file From 5657dde4a0dfb453a1400e333989c559c3a092fc Mon Sep 17 00:00:00 2001 From: Maxim Lobanov Date: Mon, 19 Apr 2021 10:15:26 +0300 Subject: [PATCH 0178/3485] Update PyPy to 7.3.4 on Windows (change platform format) (#3189) * Update PyPy to 7.3.4 on Windows (change platform format) * Update SoftwareReport.CachedTools.psm1 * Update Install-PyPy.ps1 * Update SoftwareReport.CachedTools.psm1 --- images/win/scripts/Installers/Install-PyPy.ps1 | 4 +++- .../scripts/SoftwareReport/SoftwareReport.CachedTools.psm1 | 1 - images/win/toolsets/toolset-2016.json | 2 +- images/win/toolsets/toolset-2019.json | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/images/win/scripts/Installers/Install-PyPy.ps1 b/images/win/scripts/Installers/Install-PyPy.ps1 index 401dbcac6763..7f5cff226465 100644 --- a/images/win/scripts/Installers/Install-PyPy.ps1 +++ b/images/win/scripts/Installers/Install-PyPy.ps1 @@ -89,7 +89,9 @@ foreach($pypyTool in $pypyTools) foreach($pypyVersion in $pypyTool.versions) { # Query latest PyPy version - $filter = '{0}{1}-v\d+\.\d+\.\d+-{2}.zip' -f $pypyTool.name, $pypyVersion, $pypyTool.platform + # PyPy 3.6 is not updated anymore and win32 should be used + $platform = if ($pypyVersion -like "3.6*") { "win32" } else { $pypyTool.platform } + $filter = '{0}{1}-v\d+\.\d+\.\d+-{2}.zip' -f $pypyTool.name, $pypyVersion, $platform $latestMajorPyPyVersion = $pypyVersions | Where-Object {$_.name -match $filter} | Select-Object -First 1 if ($latestMajorPyPyVersion) diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.CachedTools.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.CachedTools.psm1 index ea2eaed184c4..90ba58015d81 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.CachedTools.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.CachedTools.psm1 @@ -61,7 +61,6 @@ function Get-PyPyMarkdown $Content = $ToolInstances | New-MDTable -Columns ([ordered]@{ "Python Version" = "left"; - Architecture = "left"; "PyPy Version" = "left" }) diff --git a/images/win/toolsets/toolset-2016.json b/images/win/toolsets/toolset-2016.json index 268f8cc91c1d..5a56636b6ca9 100644 --- a/images/win/toolsets/toolset-2016.json +++ b/images/win/toolsets/toolset-2016.json @@ -45,7 +45,7 @@ { "name": "PyPy", "arch": "x86", - "platform" : "win32", + "platform" : "win64", "versions": [ "2.7", "3.6", diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index 1d27806036f9..3a95d10f7804 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -45,7 +45,7 @@ { "name": "PyPy", "arch": "x86", - "platform" : "win32", + "platform" : "win64", "versions": [ "2.7", "3.6", From 98743bcf9cd51a429767516f8291c43bdd89ba4f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 19 Apr 2021 11:55:05 +0000 Subject: [PATCH 0179/3485] Updating readme file for macOS-11.0 version 20210418.1 (#3207) Co-authored-by: Image generation service account --- images/macos/macos-11.0-Readme.md | 39 ++++++++++++++++--------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/images/macos/macos-11.0-Readme.md b/images/macos/macos-11.0-Readme.md index 3b52e27758ba..332457db087f 100644 --- a/images/macos/macos-11.0-Readme.md +++ b/images/macos/macos-11.0-Readme.md @@ -6,11 +6,11 @@ # macOS 11.2 info - System Version: macOS 11.2.3 (20D91) - Kernel Version: Darwin 20.3.0 -- Image Version: 20210412.3 +- Image Version: 20210418.1 ## Installed Software ### Language and Runtime -- .NET SDK 2.1.300 2.1.301 2.1.302 2.1.401 2.1.402 2.1.403 2.1.500 2.1.502 2.1.503 2.1.504 2.1.505 2.1.506 2.1.507 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 2.1.811 2.1.812 2.1.813 2.1.814 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 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 5.0.100 5.0.101 5.0.102 5.0.200 5.0.201 5.0.202 +- .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 2.1.811 2.1.812 2.1.813 2.1.814 2.1.815 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 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 3.1.408 5.0.100 5.0.101 5.0.102 5.0.200 5.0.201 5.0.202 - Bash 3.2.57(1)-release - Clang/LLVM 11.1.0 is available on `'$(brew --prefix llvm)/bin/clang'` - Clang/LLVM 12.0.0 is default @@ -36,7 +36,7 @@ - Carthage 0.37.0 - CocoaPods 1.10.1 - Composer 2.0.12 -- Homebrew 3.1.1 +- Homebrew 3.1.2 - Miniconda 4.9.2 - NPM 6.14.12 - NuGet 5.6.0.6489 @@ -44,7 +44,7 @@ - Pip 21.0.1 (python 3.9) - Pipx 0.16.1.0 - RubyGems 3.2.16 -- Vcpkg 2021 (build from master \<047525c>) +- Vcpkg 2021 (build from master \<414bec0>) - Yarn 1.22.5 #### Environment variables @@ -54,25 +54,25 @@ | VCPKG_INSTALLATION_ROOT | /usr/local/share/vcpkg | ### Project Management -- Apache Ant(TM) 1.10.9 +- Apache Ant(TM) 1.10.10 - Apache Maven 3.8.1 - Gradle 7.0 ### Utilities - 7-Zip 17.04 - aria2 1.35.0 -- azcopy 10.9.0 +- azcopy 10.10.0 - bazel 4.0.0 - bazelisk 1.7.5 - bsdtar 3.3.2 - available by 'tar' alias -- Curl 7.76.0 +- Curl 7.76.1 - Git LFS: 2.13.3 - Git: 2.31.1 -- GitHub CLI: 1.8.1 +- GitHub CLI: 1.9.1 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.1 - gpg (GnuPG) 2.2.27 -- helm v3.5.3+g041ce5a +- helm v3.5.4+g1b5edb6 - Hub CLI: 2.14.2 - jq 1.6 - mongo v4.4.4 @@ -89,16 +89,17 @@ ### Tools - Aliyun CLI 3.0.73 - App Center CLI 2.9.0 -- AWS CLI 2.1.36 +- AWS CLI 2.1.38 - AWS SAM CLI 1.22.0 - AWS Session Manager CLI 1.2.30.0 -- Azure CLI 2.21.0 +- Azure CLI 2.22.0 - Cabal 3.4.0.0 - Cmake 3.20.1 - Fastlane 2.180.1 - GHC 9.0.1 - GHCup v0.1.14.1 - Stack 2.5.1 +- SwiftFormat 0.47.13 - Xcode Command Line Tools 12.4.0.0.1.1610135815 ### Linters @@ -108,17 +109,17 @@ ### Browsers - Safari 14.0.3 (16610.4.3.1.7) - SafariDriver 14.0.3 (16610.4.3.1.7) -- Google Chrome 89.0.4389.114 -- ChromeDriver 89.0.4389.23 -- Microsoft Edge 89.0.774.75 -- MSEdgeDriver 89.0.774.75 +- Google Chrome 90.0.4430.72 +- ChromeDriver 90.0.4430.24 +- Microsoft Edge 90.0.818.41 +- MSEdgeDriver 90.0.818.41 - Mozilla Firefox 87.0 - geckodriver 0.29.1 #### Environment variables | Name | Value | | --------------- | --------------------------------------------- | -| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/89.0.4389.23 | +| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/90.0.4430.24 | | EDGEWEBDRIVER | /usr/local/share/edge_driver | | GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | @@ -179,11 +180,11 @@ | Name | Version | ConfigFile | ServiceStatus | ListenPort | | ----- | -------- | ------------------------------- | ------------- | ---------- | | httpd | 2.4.46_2 | /usr/local/etc/httpd/httpd.conf | stopped | 80 | -| nginx | 1.19.9 | /usr/local/etc/nginx/nginx.conf | stopped | 80 | +| nginx | 1.19.10 | /usr/local/etc/nginx/nginx.conf | stopped | 80 | ### Xamarin #### Visual Studio for Mac -- 8.9.5.4 +- 8.9.6.6 #### Xamarin bundles | symlink | Xamarin.Mono | Xamarin.iOS | Xamarin.Mac | Xamarin.Android | @@ -275,7 +276,7 @@ | Android Emulator | 30.5.4 | | Android SDK Build-tools | 30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3 | | Android SDK Platforms | android-S (rev 2)
android-30 (rev 3)
android-29 (rev 5)
android-28 (rev 6)
android-27 (rev 3) | -| Android SDK Platform-Tools | 31.0.1 | +| Android SDK Platform-Tools | 31.0.2 | | Android SDK Tools | 26.1.1 | | Android Support Repository | 47.0.0 | | CMake | 3.10.2 | From a06f07dfb48019db4c7fd7e9ce24c96ce34eb448 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Mon, 19 Apr 2021 16:17:48 +0300 Subject: [PATCH 0180/3485] [Ubuntu] Add msbuild to software report (#3210) --- .../scripts/SoftwareReport/SoftwareReport.Common.psm1 | 8 ++++++++ .../scripts/SoftwareReport/SoftwareReport.Generator.ps1 | 1 + images/linux/scripts/tests/Tools.Tests.ps1 | 4 ++++ 3 files changed, 13 insertions(+) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 index 55062b38a085..9388ded03c4f 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 @@ -61,6 +61,14 @@ function Get-MonoVersion { return "Mono $monoVersion" } +function Get-MsbuildVersion { + $msbuildVersion = msbuild -version | Select-Object -Last 1 + $result = Select-String -Path (Get-Command msbuild).Source -Pattern "msbuild" + $result -match "(?\/\S*\.dll)" | Out-Null + $msbuildPath = $Matches.path + return "MSBuild $msbuildVersion (from $msbuildPath)" +} + function Get-NodeVersion { $nodeVersion = $(node --version).Substring(1) return "Node $nodeVersion" diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index e597aa232710..551569a1d582 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -43,6 +43,7 @@ $markdown += New-MDList -Style Unordered -Lines (@( (Get-ClangFormatVersions), (Get-ErlangVersion), (Get-MonoVersion), + (Get-MsbuildVersion), (Get-NodeVersion), (Get-PerlVersion), (Get-PythonVersion), diff --git a/images/linux/scripts/tests/Tools.Tests.ps1 b/images/linux/scripts/tests/Tools.Tests.ps1 index 12d95b751944..76f4ba4d3966 100644 --- a/images/linux/scripts/tests/Tools.Tests.ps1 +++ b/images/linux/scripts/tests/Tools.Tests.ps1 @@ -150,6 +150,10 @@ Describe "Mono" { "mono --version" | Should -ReturnZeroExitCode } + It "msbuild" { + "msbuild -version" | Should -ReturnZeroExitCode + } + It "nuget" { "nuget" | Should -ReturnZeroExitCode } From 83f2d7925432cae0529e0de8577d77ed035f6699 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Mon, 19 Apr 2021 17:18:32 +0300 Subject: [PATCH 0181/3485] [macOS] suppress pipefail pgrep exit code (#3208) --- images/macos/provision/core/edge.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/macos/provision/core/edge.sh b/images/macos/provision/core/edge.sh index 24ea8e95212b..6eaecbc8ac99 100644 --- a/images/macos/provision/core/edge.sh +++ b/images/macos/provision/core/edge.sh @@ -44,7 +44,7 @@ do done echo "kill autoupdate process" -ps -ef | grep [M]icrosoft | awk '{print $2}' | sudo xargs kill -9 +pgrep [M]icrosoft | sudo xargs kill -9 || true echo "remove autupdate service" sudo launchctl remove com.microsoft.autoupdate.helper From 4417214480acc038fbfe4fc802c0e27ecff7d8d6 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Tue, 20 Apr 2021 11:24:51 +0300 Subject: [PATCH 0182/3485] [macOS] Add MSBuild to docs (#3214) --- images/macos/software-report/SoftwareReport.Common.psm1 | 8 ++++++++ images/macos/software-report/SoftwareReport.Generator.ps1 | 1 + images/macos/tests/Xamarin.Tests.ps1 | 6 +++++- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/images/macos/software-report/SoftwareReport.Common.psm1 b/images/macos/software-report/SoftwareReport.Common.psm1 index 7f141687a554..a316ae175d04 100644 --- a/images/macos/software-report/SoftwareReport.Common.psm1 +++ b/images/macos/software-report/SoftwareReport.Common.psm1 @@ -156,6 +156,14 @@ function Get-PHPVersion { return $PHPVersion } +function Get-MSBuildVersion { + $msbuildVersion = msbuild -version | Select-Object -Last 1 + $result = Select-String -Path (Get-Command msbuild).Source -Pattern "msbuild" + $result -match "(?\/\S*\.dll)" | Out-Null + $msbuildPath = $Matches.path + return "MSBuild $msbuildVersion (from $msbuildPath)" +} + function Get-NodeVersion { $nodeVersion = Run-Command "node --version" return "Node.js $nodeVersion" diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1 index a1c77fe9e4c0..5860e5d3ebab 100644 --- a/images/macos/software-report/SoftwareReport.Generator.ps1 +++ b/images/macos/software-report/SoftwareReport.Generator.ps1 @@ -32,6 +32,7 @@ $markdown += New-MDHeader "Installed Software" -Level 2 $markdown += New-MDHeader "Language and Runtime" -Level 3 $languageAndRuntimeList = @( (Get-BashVersion), + (Get-MSBuildVersion), (Get-NodeVersion), (Get-NVMVersion), (Get-NVMNodeVersionList), diff --git a/images/macos/tests/Xamarin.Tests.ps1 b/images/macos/tests/Xamarin.Tests.ps1 index 745086f91e92..3d7a97ddeb0d 100644 --- a/images/macos/tests/Xamarin.Tests.ps1 +++ b/images/macos/tests/Xamarin.Tests.ps1 @@ -75,9 +75,13 @@ Describe "Mono" { } } } + + It "MSBuild is available" { + "msbuild -version" | Should -ReturnZeroExitCode + } } -Describe "Xamarin.iOS" { +Describe "Xamarin.iOS" { $XAMARIN_IOS_VERSIONS | ForEach-Object { Context "$_" { $XAMARIN_IOS_VERSIONS_PATH = "/Library/Frameworks/Xamarin.iOS.framework/Versions" From 4440cbd3f31518c43b719ac45cc1876dfd77414b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 21 Apr 2021 09:04:29 +0000 Subject: [PATCH 0183/3485] Updating readme file for macOS-11.0 version 20210420.1 (#3222) Co-authored-by: Image generation service account --- images/macos/macos-11.0-Readme.md | 65 ++++++++++++++++--------------- 1 file changed, 33 insertions(+), 32 deletions(-) diff --git a/images/macos/macos-11.0-Readme.md b/images/macos/macos-11.0-Readme.md index 332457db087f..cf78be156485 100644 --- a/images/macos/macos-11.0-Readme.md +++ b/images/macos/macos-11.0-Readme.md @@ -6,13 +6,13 @@ # macOS 11.2 info - System Version: macOS 11.2.3 (20D91) - Kernel Version: Darwin 20.3.0 -- Image Version: 20210418.1 +- Image Version: 20210420.1 ## Installed Software ### Language and Runtime - .NET SDK 2.1.300 2.1.301 2.1.302 2.1.401 2.1.402 2.1.403 2.1.500 2.1.502 2.1.503 2.1.504 2.1.505 2.1.506 2.1.507 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 2.1.811 2.1.812 2.1.813 2.1.814 2.1.815 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 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 3.1.408 5.0.100 5.0.101 5.0.102 5.0.200 5.0.201 5.0.202 - Bash 3.2.57(1)-release -- Clang/LLVM 11.1.0 is available on `'$(brew --prefix llvm)/bin/clang'` +- Clang/LLVM 12.0.0 is available on `'$(brew --prefix llvm)/bin/clang'` - Clang/LLVM 12.0.0 is default - gcc-10 (Homebrew GCC 10.2.0_4) 10.2.0 - available by `gcc-10` alias - gcc-8 (Homebrew GCC 8.4.0_3) 8.4.0 - available by `gcc-8` alias @@ -22,6 +22,7 @@ - GNU Fortran (Homebrew GCC 9.3.0_2) 9.3.0 - available by `gfortran-9` alias - Go 1.15.11 - julia 1.6.0 +- MSBuild 16.6.0.15801 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) - Node.js v14.16.1 - NVM - Cached node versions: v10.24.1 v12.22.1 v14.16.1 - NVM 0.38.0 @@ -36,7 +37,7 @@ - Carthage 0.37.0 - CocoaPods 1.10.1 - Composer 2.0.12 -- Homebrew 3.1.2 +- Homebrew 3.1.3 - Miniconda 4.9.2 - NPM 6.14.12 - NuGet 5.6.0.6489 @@ -44,7 +45,7 @@ - Pip 21.0.1 (python 3.9) - Pipx 0.16.1.0 - RubyGems 3.2.16 -- Vcpkg 2021 (build from master \<414bec0>) +- Vcpkg 2021 (build from master \<807a798>) - Yarn 1.22.5 #### Environment variables @@ -91,11 +92,11 @@ - App Center CLI 2.9.0 - AWS CLI 2.1.38 - AWS SAM CLI 1.22.0 -- AWS Session Manager CLI 1.2.30.0 -- Azure CLI 2.22.0 +- AWS Session Manager CLI 1.2.54.0 +- Azure CLI 2.22.1 - Cabal 3.4.0.0 - Cmake 3.20.1 -- Fastlane 2.180.1 +- Fastlane 2.181.0 - GHC 9.0.1 - GHCup v0.1.14.1 - Stack 2.5.1 @@ -109,11 +110,11 @@ ### Browsers - Safari 14.0.3 (16610.4.3.1.7) - SafariDriver 14.0.3 (16610.4.3.1.7) -- Google Chrome 90.0.4430.72 +- Google Chrome 90.0.4430.85 - ChromeDriver 90.0.4430.24 - Microsoft Edge 90.0.818.41 -- MSEdgeDriver 90.0.818.41 -- Mozilla Firefox 87.0 +- MSEdgeDriver 90.0.818.42 +- Mozilla Firefox 88.0 - geckodriver 0.29.1 #### Environment variables @@ -202,13 +203,13 @@ - NUnit 3.6.1 ### Xcode -| Version | Build | Path | -| -------------- | -------- | ---------------------------- | -| 12.5 (beta) | 12E5244e | /Applications/Xcode_12.5.app | -| 12.4 (default) | 12D4e | /Applications/Xcode_12.4.app | -| 12.3 | 12C33 | /Applications/Xcode_12.3.app | -| 12.2 | 12B45b | /Applications/Xcode_12.2.app | -| 11.7 | 11E801a | /Applications/Xcode_11.7.app | +| Version | Build | Path | +| -------------- | ------- | ---------------------------- | +| 12.5 | 12E262 | /Applications/Xcode_12.5.app | +| 12.4 (default) | 12D4e | /Applications/Xcode_12.4.app | +| 12.3 | 12C33 | /Applications/Xcode_12.3.app | +| 12.2 | 12B45b | /Applications/Xcode_12.2.app | +| 11.7 | 11E801a | /Applications/Xcode_11.7.app | #### Xcode Support Tools - xcpretty 0.3.0 @@ -253,21 +254,21 @@ | DriverKit 20.4 | driverkit.macosx20.4 | 12.5 | #### Installed Simulators -| OS | Xcode Version | Simulators | -| ----------- | ------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| 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.2 | 12.2 | iPod touch (7th generation)
iPhone 11
iPhone 11 Pro
iPhone 11 Pro Max
iPhone 12
iPhone 12 mini
iPhone 12 Pro
iPhone 12 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.3 | 12.3 | iPod touch (7th generation)
iPhone 11
iPhone 11 Pro
iPhone 11 Pro Max
iPhone 12
iPhone 12 mini
iPhone 12 Pro
iPhone 12 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.4 | 12.4 | iPod touch (7th generation)
iPhone 11
iPhone 11 Pro
iPhone 11 Pro Max
iPhone 12
iPhone 12 mini
iPhone 12 Pro
iPhone 12 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.5 | 12.5 | iPod touch (7th generation)
iPhone 11
iPhone 11 Pro
iPhone 11 Pro Max
iPhone 12
iPhone 12 mini
iPhone 12 Pro
iPhone 12 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 13.4 | 11.7 | 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) | -| tvOS 14.3 | 12.3
12.4 | Apple TV
Apple TV 4K
Apple TV 4K (at 1080p) | -| tvOS 14.5 | 12.5 | Apple TV
Apple TV 4K
Apple TV 4K (at 1080p) | -| watchOS 6.2 | 11.7 | Apple Watch Series 4 - 40mm
Apple Watch Series 4 - 44mm
Apple Watch Series 5 - 40mm
Apple Watch Series 5 - 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 | -| watchOS 7.2 | 12.3
12.4 | 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.4 | 12.5 | 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 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.2 | 12.2 | iPod touch (7th generation)
iPhone 11
iPhone 11 Pro
iPhone 11 Pro Max
iPhone 12
iPhone 12 mini
iPhone 12 Pro
iPhone 12 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.3 | 12.3 | iPod touch (7th generation)
iPhone 11
iPhone 11 Pro
iPhone 11 Pro Max
iPhone 12
iPhone 12 mini
iPhone 12 Pro
iPhone 12 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.4 | 12.4 | iPod touch (7th generation)
iPhone 11
iPhone 11 Pro
iPhone 11 Pro Max
iPhone 12
iPhone 12 mini
iPhone 12 Pro
iPhone 12 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.5 | 12.5 | iPod touch (7th generation)
iPhone 11
iPhone 11 Pro
iPhone 11 Pro Max
iPhone 12
iPhone 12 mini
iPhone 12 Pro
iPhone 12 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 (11-inch) (3rd generation)
iPad Pro (12.9-inch) (4th generation)
iPad Pro (12.9-inch) (5th generation)
iPad Pro (9.7-inch) | +| tvOS 13.4 | 11.7 | 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) | +| tvOS 14.3 | 12.3
12.4 | Apple TV
Apple TV 4K
Apple TV 4K (at 1080p) | +| tvOS 14.5 | 12.5 | Apple TV
Apple TV 4K
Apple TV 4K (2nd generation)
Apple TV 4K (at 1080p)
Apple TV 4K (at 1080p) (2nd generation) | +| watchOS 6.2 | 11.7 | Apple Watch Series 4 - 40mm
Apple Watch Series 4 - 44mm
Apple Watch Series 5 - 40mm
Apple Watch Series 5 - 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 | +| watchOS 7.2 | 12.3
12.4 | 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.4 | 12.5 | 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 | Package Name | Version | From 19537cbf0b7e07b41e99cc19577e66102405cad3 Mon Sep 17 00:00:00 2001 From: Dibir Magomedsaygitov <61747324+dibir-magomedsaygitov@users.noreply.github.com> Date: Wed, 21 Apr 2021 18:20:20 +0300 Subject: [PATCH 0184/3485] [Ubuntu] Fix GRADLE_HOME environment variable (#3225) * fix gradle_home env var * add gradle test and minor rework * debug --- images/linux/scripts/installers/java-tools.sh | 2 +- images/linux/scripts/tests/Java.Tests.ps1 | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/images/linux/scripts/installers/java-tools.sh b/images/linux/scripts/installers/java-tools.sh index 3a75ef25f32a..a5df5182d0c5 100644 --- a/images/linux/scripts/installers/java-tools.sh +++ b/images/linux/scripts/installers/java-tools.sh @@ -83,7 +83,7 @@ curl -sL $gradleUrl -o gradleLatest.zip unzip -qq -d /usr/share gradleLatest.zip rm gradleLatest.zip ln -s /usr/share/gradle-"${gradleVersion}"/bin/gradle /usr/bin/gradle -echo "GRADLE_HOME=/usr/share/gradle" | tee -a /etc/environment +echo "GRADLE_HOME=$(find /usr/share -depth -maxdepth 1 -name "gradle*")" | tee -a /etc/environment reloadEtcEnvironment invoke_tests "Java" diff --git a/images/linux/scripts/tests/Java.Tests.ps1 b/images/linux/scripts/tests/Java.Tests.ps1 index 177fafd15675..68caf17cb22e 100644 --- a/images/linux/scripts/tests/Java.Tests.ps1 +++ b/images/linux/scripts/tests/Java.Tests.ps1 @@ -18,11 +18,21 @@ Describe "Java" { @{ ToolName = "javac" } @{ ToolName = "mvn" } @{ ToolName = "ant" } - @{ ToolName = "gradle" } ) { "$ToolName -version" | Should -ReturnZeroExitCode } + It "Gradle" { + "gradle -version" | Should -ReturnZeroExitCode + + $gradleVariableValue = Get-EnvironmentVariable "GRADLE_HOME" + $gradleVariableValue | Should -BeLike "/usr/share/gradle-*" + + $gradlePath = Join-Path $env:GRADLE_HOME "bin/gradle" + $result = Get-CommandResult "`"$GradlePath`" -version" + $result.ExitCode | Should -Be 0 + } + It "Java " -TestCases $jdkVersions { $javaVariableValue = Get-EnvironmentVariable "JAVA_HOME_${Version}_X64" $javaVariableValue | Should -Not -BeNullOrEmpty From e662b19a30723ec7323ebacbdeebafbc59b07d8e Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Thu, 22 Apr 2021 09:54:12 +0300 Subject: [PATCH 0185/3485] Install vcredist 2010 for windows 2010 from direct links (#3230) --- images/win/scripts/Installers/Initialize-VM.ps1 | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/images/win/scripts/Installers/Initialize-VM.ps1 b/images/win/scripts/Installers/Initialize-VM.ps1 index ff02d065aa72..ed215ccdd186 100644 --- a/images/win/scripts/Installers/Initialize-VM.ps1 +++ b/images/win/scripts/Installers/Initialize-VM.ps1 @@ -129,7 +129,13 @@ if (Test-IsWin16) { if (Test-IsWin19) { # Install vcredist2010 - Choco-Install -PackageName vcredist2010 + $Vc2010x86Name = "vcredist_x86.exe" + $Vc2010x86URI = "https://download.microsoft.com/download/1/6/5/165255E7-1014-4D0A-B094-B6A430A6BFFC/${Vc2010x86Name}" + $Vc2010x64Name = "vcredist_x64.exe" + $Vc2010x64URI = "https://download.microsoft.com/download/1/6/5/165255E7-1014-4D0A-B094-B6A430A6BFFC/${Vc2010x64Name}" + $ArgumentList = ("/install", "/quiet", "/norestart") + Install-Binary -Url $Vc2010x86URI -Name $Vc2010x86Name -ArgumentList $ArgumentList + Install-Binary -Url $Vc2010x64URI -Name $Vc2010x64Name -ArgumentList $ArgumentList } # Initialize environmental variable ChocolateyToolsLocation by invoking choco Get-ToolsLocation function From d6fd680a3aff8a132cd9097ad1af5a9e92fdb3e4 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 22 Apr 2021 08:43:08 +0000 Subject: [PATCH 0186/3485] Updating readme file for ubuntu16 version 20210419.1 (#3212) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/linux/Ubuntu1604-README.md | 66 ++++++++++++++++--------------- 1 file changed, 34 insertions(+), 32 deletions(-) diff --git a/images/linux/Ubuntu1604-README.md b/images/linux/Ubuntu1604-README.md index ce16b2d481bd..7d6025d69eba 100644 --- a/images/linux/Ubuntu1604-README.md +++ b/images/linux/Ubuntu1604-README.md @@ -3,8 +3,8 @@ | [[windows, ubuntu] Few outdated Docker images will be removed on April, 12](https://github.com/actions/virtual-environments/issues/3111) | *** # Ubuntu 16.04.7 LTS -- Linux kernel version: 4.15.0-1111-azure -- Image Version: 20210412.1 +- Linux kernel version: 4.15.0-1113-azure +- Image Version: 20210419.1 ## Installed Software ### Language and Runtime @@ -25,14 +25,14 @@ ### Package Management - cpan 1.61 -- Helm 3.5.3 -- Homebrew 3.0.11 +- Helm 3.5.4 +- Homebrew 3.1.2 - Miniconda 4.9.2 - Npm 6.14.12 - Pip 8.1.1 - Pip3 8.1.1 - RubyGems 2.5.2 -- Vcpkg (build from master \) +- Vcpkg (build from master \<414bec0>) - Yarn 1.22.10 #### Environment variables @@ -48,17 +48,17 @@ - Sbt 1.5.0 ### Tools -- Ansible 2.9.19 +- Ansible 2.9.20 - apt-fast 1.9.10 -- AzCopy 10.9.0 (available by `azcopy` and `azcopy10` aliases) +- AzCopy 10.10.0 (available by `azcopy` and `azcopy10` aliases) - Bazel 4.0.0 - Bazelisk 1.7.5 - CMake 3.20.1 - CodeQL Action Bundle 2.5.0 -- Docker Compose 1.29.0 +- Docker Compose 1.29.1 - Docker-Buildx 0.5.1 -- Docker-Moby Client 20.10.5+azure -- Docker-Moby Server 20.10.5+azure +- Docker-Moby Client 20.10.6+azure +- Docker-Moby Server 20.10.6+azure - Git 2.31.1 (apt source repository: ppa:git-core/ppa) - Git LFS 2.13.3 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.0.2 @@ -68,8 +68,8 @@ - jq 1.5 - Kind 0.10.0 - Kubectl 1.20.1-5-g76a04fc -- Kustomize 4.0.5 -- Leiningen 2.9.5 +- Kustomize 4.1.2 +- Leiningen 2.9.6 - MediaInfo 0.7.82 - Mercurial 4.4.1 - Minikube 1.19.0 @@ -78,24 +78,25 @@ - OpenSSL 1.0.2g 1 Mar 2016 - Packer 1.7.2 - PhantomJS 2.1.1 -- Pulumi 2.24.1 +- Pulumi 2.25.2 - R 4.0.5 - Sphinx Open Source Search Server 2.2.9 - SVN 1.9.3 -- Terraform 0.14.10 +- Terraform 0.15.0 +- zstd 1.4.9 (homebrew) ### CLI Tools - Alibaba Cloud CLI 3.0.73 -- AWS CLI 1.19.49 +- AWS CLI 1.19.53 - AWS CLI Session manager plugin 1.2.54.0 - AWS SAM CLI 1.22.0 -- Azure CLI (azure-cli) 2.21.0 +- Azure CLI (azure-cli) 2.22.0 - Azure CLI (azure-devops) 0.18.0 -- GitHub CLI 1.8.1 -- Google Cloud SDK 335.0.0 +- GitHub CLI 1.9.1 +- Google Cloud SDK 336.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 3.17.0 -- OpenShift CLI 4.7.5 +- Netlify CLI 3.18.3 +- OpenShift CLI 4.7.6 - ORAS CLI 0.11.1 - Vercel CLI 21.3.3 @@ -134,11 +135,11 @@ - Rustfmt 1.4.36 ### Browsers and Drivers -- Google Chrome 89.0.4389.114 -- ChromeDriver 89.0.4389.23 +- Google Chrome 90.0.4430.72 +- ChromeDriver 90.0.4430.24 - Mozilla Firefox 87.0 - Geckodriver 0.29.1 -- Chromium 89.0.4389.0 +- Chromium 90.0.4430.0 #### Environment variables | Name | Value | @@ -147,7 +148,7 @@ | GECKOWEBDRIVER | /usr/local/share/gecko_driver | ### .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.519 2.1.520 2.1.521 2.1.522 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.616 2.1.617 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 2.1.811 2.1.812 2.1.813 2.1.814 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.109 3.1.110 3.1.111 3.1.112 3.1.113 3.1.200 3.1.201 3.1.202 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 5.0.100 5.0.101 5.0.102 5.0.103 5.0.104 5.0.200 5.0.201 5.0.202 +- 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.519 2.1.520 2.1.521 2.1.522 2.1.523 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.616 2.1.617 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 2.1.811 2.1.812 2.1.813 2.1.814 2.1.815 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.109 3.1.110 3.1.111 3.1.112 3.1.113 3.1.114 3.1.200 3.1.201 3.1.202 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 3.1.408 5.0.100 5.0.101 5.0.102 5.0.103 5.0.104 5.0.200 5.0.201 5.0.202 ### Databases - MongoDB 4.4.5 (apt source repository: https://repo.mongodb.org/apt/ubuntu) @@ -224,7 +225,7 @@ | -------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 3.0 | | Android SDK Build-tools | 30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3
26.0.0 26.0.1 26.0.2 26.0.3
25.0.0 25.0.1 25.0.2 25.0.3
24.0.0 24.0.1 24.0.2 24.0.3
23.0.1 23.0.2 23.0.3 | -| Android SDK Platform-Tools | 31.0.1 | +| Android SDK Platform-Tools | 31.0.2 | | Android SDK Platforms | android-S (rev 2)
android-30 (rev 3)
android-29 (rev 5)
android-28 (rev 6)
android-27 (rev 3)
android-26 (rev 2)
android-25 (rev 3)
android-24 (rev 2)
android-23 (rev 3) | | Android SDK Tools | 26.1.1 | | Android Support Repository | 47.0.0 | @@ -246,17 +247,19 @@ ### Cached Docker images | Repository:Tag | Digest | Created | | ---------------------- | ------------------------------------------------------------------------ | ---------- | -| alpine:3.11 | sha256:bf5fa774f08a9ed2cb301e522b769d43d48124315a4ec50eae3228d03b9dc558 | 2021-03-31 | -| alpine:3.12 | sha256:834e9309b5ef0f78d8d20ef0652e7b0272fe97b5baf45720e1b830eaf013cc1b | 2021-03-31 | -| alpine:3.13 | sha256:ec14c7992a97fc11425907e908340c6c3d6ff602f5f13d899e6b7027c9b4133a | 2021-03-31 | +| alpine:3.11 | sha256:18a918a714d1368847b67173d120ebd110fcfae208305412f3005a61cdc7c20e | 2021-04-14 | +| alpine:3.12 | sha256:36553b10a4947067b9fbb7d532951066293a68eae893beba1d9235f7d11a20ad | 2021-04-14 | +| alpine:3.13 | sha256:69e70a79f2d41ab5d637de98c1e0b055206ba40a8145e7bddb55ccc04e13cf8f | 2021-04-14 | | buildpack-deps:buster | sha256:da41958eb012d10ac2e9764885e02612dd515df1b455900f3eda81d81a574ca3 | 2021-04-10 | | buildpack-deps:stretch | sha256:ea0e73d4d5c3341e1328b58a69f513067c79fd6effd9776fc2d2f8d46e2f6e78 | 2021-04-10 | | debian:10 | sha256:ba4a437377a0c450ac9bb634c3754a17b1f814ce6fa3157c0dc9eef431b29d1f | 2021-04-10 | | debian:9 | sha256:c0daa8e312c326ac15721712b8a1e68a5039d725ff47bc25c781921089de0a66 | 2021-04-10 | | node:10 | sha256:59531d2835edd5161c8f9512f9e095b1836f7a1fcb0ab73e005ec46047384911 | 2021-04-10 | -| node:10-alpine | sha256:8459a952511f363fbb4db57b991608b8d10c0fbd1ed89176f5dce474df1d5db8 | 2021-04-07 | +| node:10-alpine | sha256:dc98dac24efd4254f75976c40bce46944697a110d06ce7fa47e7268470cf2e28 | 2021-04-14 | | node:12 | sha256:609103746810535f5a3a987a26ba4ce95d96225d28e9d6228faa5aa331980f37 | 2021-04-10 | -| node:12-alpine | sha256:3423a5eea6a1151df079c5e94458dbd946cd53bcb75b47954a16af3137731ec7 | 2021-04-07 | +| node:12-alpine | sha256:9923c9efb13cf7535f67e49b03010f0977a800068e4c8e0e2c93433a6bfa1e77 | 2021-04-14 | +| node:14 | sha256:8eb45f4677c813ad08cef8522254640aa6a1800e75a9c213a0a651f6f3564189 | 2021-04-10 | +| node:14-alpine | sha256:ed51af876dd7932ce5c1e3b16c2e83a3f58419d824e366de1f7b00f40c848c40 | 2021-04-14 | | ubuntu:16.04 | sha256:bb84bbf2ff36d46acaf0bb0c6bcb33dae64cd93cba8652d74c9aaf438fada438 | 2021-03-25 | | ubuntu:18.04 | sha256:122f506735a26c0a1aff2363335412cfc4f84de38326356d31ee00c2cbe52171 | 2021-03-25 | | ubuntu:20.04 | sha256:3c9c713e0979e9bd6061ed52ac1e9e1f246c9495aa063619d9d695fb8039aa1f | 2021-04-03 | @@ -335,11 +338,10 @@ | upx | 3.91-1 | | wget | 1.17.1-1ubuntu1.5 | | xorriso | 1.4.2-4ubuntu1 | -| xvfb | 2:1.18.4-0ubuntu0.11 | +| xvfb | 2:1.18.4-0ubuntu0.12 | | xz-utils | 5.1.1alpha+20120614-2ubuntu2 | | yamllint | 1.2.1-1 | | zip | 3.0-11 | -| zstd | 1.3.1+dfsg-1~ubuntu0.16.04.1 | | zsync | 0.6.2-1ubuntu1 | From 5472e8450619641b7174c587856df8a0ff920c2f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 22 Apr 2021 08:50:07 +0000 Subject: [PATCH 0187/3485] Updating readme file for ubuntu18 version 20210419.1 (#3211) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/linux/Ubuntu1804-README.md | 72 ++++++++++++++++--------------- 1 file changed, 37 insertions(+), 35 deletions(-) diff --git a/images/linux/Ubuntu1804-README.md b/images/linux/Ubuntu1804-README.md index 0b454d0902fa..c96ed67d3146 100644 --- a/images/linux/Ubuntu1804-README.md +++ b/images/linux/Ubuntu1804-README.md @@ -3,8 +3,8 @@ | [[windows, ubuntu] Few outdated Docker images will be removed on April, 12](https://github.com/actions/virtual-environments/issues/3111) | *** # Ubuntu 18.04.5 LTS -- Linux kernel version: 5.4.0-1043-azure -- Image Version: 20210412.1 +- Linux kernel version: 5.4.0-1046-azure +- Image Version: 20210419.1 ## Installed Software ### Language and Runtime @@ -12,8 +12,8 @@ - Clang 9.0.0 - Clang-format 9.0.0 - Erlang 23.2.3 (Eshell 11.1.7) -- GNU C++ 7.5.0, 9.3.0, 10.1.0 -- GNU Fortran 7.5.0, 9.3.0, 10.1.0 +- GNU C++ 7.5.0, 9.3.0, 10.3.0 +- GNU Fortran 7.5.0, 9.3.0, 10.3.0 - Julia 1.6.0 - Mono 6.12.0.122 - Node 14.16.1 @@ -25,15 +25,15 @@ ### Package Management - cpan 1.64 -- Helm 3.5.3 -- Homebrew 3.0.11 +- Helm 3.5.4 +- Homebrew 3.1.2 - Miniconda 4.9.2 - Npm 6.14.12 - Pip 9.0.1 - Pip3 9.0.1 - Pipx 0.16.1.0 - RubyGems 2.7.6 -- Vcpkg (build from master \) +- Vcpkg (build from master \<414bec0>) - Yarn 1.22.10 #### Environment variables @@ -49,29 +49,29 @@ - Sbt 1.5.0 ### Tools -- Ansible 2.10.7 +- Ansible 2.10.8 - apt-fast 1.9.10 -- AzCopy 10.9.0 (available by `azcopy` and `azcopy10` aliases) +- AzCopy 10.10.0 (available by `azcopy` and `azcopy10` aliases) - Bazel 4.0.0 - Bazelisk 1.7.5 - Buildah 1.19.6 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - CMake 3.20.1 - CodeQL Action Bundle 2.5.0 -- Docker Compose 1.29.0 +- Docker Compose 1.29.1 - Docker-Buildx 0.5.1 -- Docker-Moby Client 20.10.5+azure -- Docker-Moby Server 20.10.5+azure +- Docker-Moby Client 20.10.6+azure +- Docker-Moby Server 20.10.6+azure - Git 2.31.1 (apt source repository: ppa:git-core/ppa) - Git LFS 2.13.3 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.3.1 - Haveged 1.9.1 - Heroku 7.52.0 -- HHVM (HipHop VM) 4.104.0 +- HHVM (HipHop VM) 4.105.0 - jq 1.5 - Kind 0.10.0 - Kubectl 1.20.1-5-g76a04fc -- Kustomize 4.0.5 -- Leiningen 2.9.5 +- Kustomize 4.1.2 +- Leiningen 2.9.6 - MediaInfo 17.12 - Mercurial 4.5.3 - Minikube 1.19.0 @@ -81,26 +81,27 @@ - Packer 1.7.2 - PhantomJS 2.1.1 - Podman 3.0.1 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- Pulumi 2.24.1 +- Pulumi 2.25.2 - R 4.0.5 - Skopeo 1.2.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 - SVN 1.9.7 -- Terraform 0.14.10 +- Terraform 0.15.0 - yamllint 1.26.1 +- zstd 1.4.9 (homebrew) ### CLI Tools - Alibaba Cloud CLI 3.0.73 -- AWS CLI 1.19.49 +- AWS CLI 1.19.53 - AWS CLI Session manager plugin 1.2.54.0 - AWS SAM CLI 1.22.0 -- Azure CLI (azure-cli) 2.21.0 +- Azure CLI (azure-cli) 2.22.0 - Azure CLI (azure-devops) 0.18.0 -- GitHub CLI 1.8.1 -- Google Cloud SDK 335.0.0 +- GitHub CLI 1.9.1 +- Google Cloud SDK 336.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 3.17.0 -- OpenShift CLI 4.7.5 +- Netlify CLI 3.18.3 +- OpenShift CLI 4.7.6 - ORAS CLI 0.11.1 - Vercel CLI 21.3.3 @@ -139,11 +140,11 @@ - Rustfmt 1.4.36 ### Browsers and Drivers -- Google Chrome 89.0.4389.114 -- ChromeDriver 89.0.4389.23 +- Google Chrome 90.0.4430.72 +- ChromeDriver 90.0.4430.24 - Mozilla Firefox 87.0 - Geckodriver 0.29.1 -- Chromium 89.0.4389.0 +- Chromium 90.0.4430.0 #### Environment variables | Name | Value | @@ -152,7 +153,7 @@ | GECKOWEBDRIVER | /usr/local/share/gecko_driver | ### .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.519 2.1.520 2.1.521 2.1.522 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.616 2.1.617 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 2.1.811 2.1.812 2.1.813 2.1.814 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.109 3.1.110 3.1.111 3.1.112 3.1.113 3.1.200 3.1.201 3.1.202 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 5.0.100 5.0.101 5.0.102 5.0.103 5.0.104 5.0.200 5.0.201 5.0.202 +- 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.519 2.1.520 2.1.521 2.1.522 2.1.523 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.616 2.1.617 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 2.1.811 2.1.812 2.1.813 2.1.814 2.1.815 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.109 3.1.110 3.1.111 3.1.112 3.1.113 3.1.114 3.1.200 3.1.201 3.1.202 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 3.1.408 5.0.100 5.0.101 5.0.102 5.0.103 5.0.104 5.0.200 5.0.201 5.0.202 ### Databases - MongoDB 4.4.5 (apt source repository: https://repo.mongodb.org/apt/ubuntu) @@ -229,7 +230,7 @@ | -------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 3.0 | | Android SDK Build-tools | 30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3
26.0.0 26.0.1 26.0.2 26.0.3
25.0.0 25.0.1 25.0.2 25.0.3
24.0.0 24.0.1 24.0.2 24.0.3
23.0.1 23.0.2 23.0.3 | -| Android SDK Platform-Tools | 31.0.1 | +| Android SDK Platform-Tools | 31.0.2 | | Android SDK Platforms | android-S (rev 2)
android-30 (rev 3)
android-29 (rev 5)
android-28 (rev 6)
android-27 (rev 3)
android-26 (rev 2)
android-25 (rev 3)
android-24 (rev 2)
android-23 (rev 3) | | Android SDK Tools | 26.1.1 | | Android Support Repository | 47.0.0 | @@ -251,17 +252,19 @@ ### Cached Docker images | Repository:Tag | Digest | Created | | ---------------------- | ------------------------------------------------------------------------ | ---------- | -| alpine:3.11 | sha256:bf5fa774f08a9ed2cb301e522b769d43d48124315a4ec50eae3228d03b9dc558 | 2021-03-31 | -| alpine:3.12 | sha256:834e9309b5ef0f78d8d20ef0652e7b0272fe97b5baf45720e1b830eaf013cc1b | 2021-03-31 | -| alpine:3.13 | sha256:ec14c7992a97fc11425907e908340c6c3d6ff602f5f13d899e6b7027c9b4133a | 2021-03-31 | +| alpine:3.11 | sha256:18a918a714d1368847b67173d120ebd110fcfae208305412f3005a61cdc7c20e | 2021-04-14 | +| alpine:3.12 | sha256:36553b10a4947067b9fbb7d532951066293a68eae893beba1d9235f7d11a20ad | 2021-04-14 | +| alpine:3.13 | sha256:69e70a79f2d41ab5d637de98c1e0b055206ba40a8145e7bddb55ccc04e13cf8f | 2021-04-14 | | buildpack-deps:buster | sha256:da41958eb012d10ac2e9764885e02612dd515df1b455900f3eda81d81a574ca3 | 2021-04-10 | | buildpack-deps:stretch | sha256:ea0e73d4d5c3341e1328b58a69f513067c79fd6effd9776fc2d2f8d46e2f6e78 | 2021-04-10 | | debian:10 | sha256:ba4a437377a0c450ac9bb634c3754a17b1f814ce6fa3157c0dc9eef431b29d1f | 2021-04-10 | | debian:9 | sha256:c0daa8e312c326ac15721712b8a1e68a5039d725ff47bc25c781921089de0a66 | 2021-04-10 | | node:10 | sha256:59531d2835edd5161c8f9512f9e095b1836f7a1fcb0ab73e005ec46047384911 | 2021-04-10 | -| node:10-alpine | sha256:8459a952511f363fbb4db57b991608b8d10c0fbd1ed89176f5dce474df1d5db8 | 2021-04-07 | +| node:10-alpine | sha256:dc98dac24efd4254f75976c40bce46944697a110d06ce7fa47e7268470cf2e28 | 2021-04-14 | | node:12 | sha256:609103746810535f5a3a987a26ba4ce95d96225d28e9d6228faa5aa331980f37 | 2021-04-10 | -| node:12-alpine | sha256:3423a5eea6a1151df079c5e94458dbd946cd53bcb75b47954a16af3137731ec7 | 2021-04-07 | +| node:12-alpine | sha256:9923c9efb13cf7535f67e49b03010f0977a800068e4c8e0e2c93433a6bfa1e77 | 2021-04-14 | +| node:14 | sha256:8eb45f4677c813ad08cef8522254640aa6a1800e75a9c213a0a651f6f3564189 | 2021-04-10 | +| node:14-alpine | sha256:ed51af876dd7932ce5c1e3b16c2e83a3f58419d824e366de1f7b00f40c848c40 | 2021-04-14 | | ubuntu:16.04 | sha256:bb84bbf2ff36d46acaf0bb0c6bcb33dae64cd93cba8652d74c9aaf438fada438 | 2021-03-25 | | ubuntu:18.04 | sha256:122f506735a26c0a1aff2363335412cfc4f84de38326356d31ee00c2cbe52171 | 2021-03-25 | | ubuntu:20.04 | sha256:3c9c713e0979e9bd6061ed52ac1e9e1f246c9495aa063619d9d695fb8039aa1f | 2021-04-03 | @@ -338,10 +341,9 @@ | upx | 3.94-4 | | wget | 1.19.4-1ubuntu2.2 | | xorriso | 1.4.8-3 | -| xvfb | 2:1.19.6-1ubuntu4.8 | +| xvfb | 2:1.19.6-1ubuntu4.9 | | xz-utils | 5.2.2-1.3 | | zip | 3.0-11build1 | -| zstd | 1.3.3+dfsg-2ubuntu1.2 | | zsync | 0.6.2-3ubuntu1 | From 6752ddb1f486d2f53b81413c413bc0371d1e8462 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 22 Apr 2021 09:05:26 +0000 Subject: [PATCH 0188/3485] Updating readme file for ubuntu20 version 20210419.1 (#3213) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/linux/Ubuntu2004-README.md | 74 ++++++++++++++++--------------- 1 file changed, 38 insertions(+), 36 deletions(-) diff --git a/images/linux/Ubuntu2004-README.md b/images/linux/Ubuntu2004-README.md index 602f3daa5b37..bd90767e788e 100644 --- a/images/linux/Ubuntu2004-README.md +++ b/images/linux/Ubuntu2004-README.md @@ -3,8 +3,8 @@ | [[windows, ubuntu] Few outdated Docker images will be removed on April, 12](https://github.com/actions/virtual-environments/issues/3111) | *** # Ubuntu 20.04.2 LTS -- Linux kernel version: 5.4.0-1043-azure -- Image Version: 20210412.1 +- Linux kernel version: 5.4.0-1046-azure +- Image Version: 20210419.1 ## Installed Software ### Language and Runtime @@ -25,15 +25,15 @@ ### Package Management - cpan 1.64 -- Helm 3.5.3 -- Homebrew 3.0.11 +- Helm 3.5.4 +- Homebrew 3.1.2 - Miniconda 4.9.2 - Npm 6.14.12 - Pip 20.0.2 - Pip3 20.0.2 - Pipx 0.16.1.0 - RubyGems 3.1.2 -- Vcpkg (build from master \) +- Vcpkg (build from master \<414bec0>) - Yarn 1.22.10 #### Environment variables @@ -50,30 +50,30 @@ - Sbt 1.5.0 ### Tools -- Ansible 2.10.7 +- Ansible 2.10.8 - apt-fast 1.9.10 -- AzCopy 10.9.0 (available by `azcopy` and `azcopy10` aliases) +- AzCopy 10.10.0 (available by `azcopy` and `azcopy10` aliases) - Bazel 4.0.0 - Bazelisk 1.7.5 -- Buildah 1.20.0 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) +- Buildah 1.20.1 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - CMake 3.20.1 - CodeQL Action Bundle 2.5.0 -- Docker Compose 1.29.0 +- Docker Compose 1.29.1 - Docker-Buildx 0.5.1 -- Docker-Moby Client 20.10.5+azure -- Docker-Moby Server 20.10.5+azure +- Docker-Moby Client 20.10.6+azure +- Docker-Moby Server 20.10.6+azure - Fastlane 2.180.1 - Git 2.31.1 (apt source repository: ppa:git-core/ppa) - Git LFS 2.13.3 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.6.0 - Haveged 1.9.1 - Heroku 7.52.0 -- HHVM (HipHop VM) 4.104.0 +- HHVM (HipHop VM) 4.105.0 - jq 1.6 - Kind 0.10.0 - Kubectl 1.20.1-5-g76a04fc -- Kustomize 4.0.5 -- Leiningen 2.9.5 +- Kustomize 4.1.2 +- Leiningen 2.9.6 - MediaInfo 19.09 - Mercurial 5.3.1 - Minikube 1.19.0 @@ -82,27 +82,28 @@ - OpenSSL 1.1.1f 31 Mar 2020 - Packer 1.7.2 - PhantomJS 2.1.1 -- Podman 3.0.1 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- Pulumi 2.24.1 +- Podman 3.1.0 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) +- Pulumi 2.25.2 - R 4.0.5 -- Skopeo 1.2.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) +- Skopeo 1.2.3 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 -- Terraform 0.14.10 +- Terraform 0.15.0 - yamllint 1.26.1 +- zstd 1.4.9 (homebrew) ### CLI Tools - Alibaba Cloud CLI 3.0.73 -- AWS CLI 2.1.36 +- AWS CLI 2.1.38 - AWS CLI Session manager plugin 1.2.54.0 - AWS SAM CLI 1.22.0 -- Azure CLI (azure-cli) 2.21.0 +- Azure CLI (azure-cli) 2.22.0 - Azure CLI (azure-devops) 0.18.0 -- GitHub CLI 1.8.1 -- Google Cloud SDK 335.0.0 +- GitHub CLI 1.9.1 +- Google Cloud SDK 336.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 3.17.0 -- OpenShift CLI 4.7.5 +- Netlify CLI 3.18.3 +- OpenShift CLI 4.7.6 - ORAS CLI 0.11.1 - Vercel CLI 21.3.3 @@ -145,11 +146,11 @@ - Rustfmt 1.4.36 ### Browsers and Drivers -- Google Chrome 89.0.4389.114 -- ChromeDriver 89.0.4389.23 +- Google Chrome 90.0.4430.72 +- ChromeDriver 90.0.4430.24 - Mozilla Firefox 87.0 - Geckodriver 0.29.1 -- Chromium 89.0.4389.0 +- Chromium 90.0.4430.0 #### Environment variables | Name | Value | @@ -158,7 +159,7 @@ | GECKOWEBDRIVER | /usr/local/share/gecko_driver | ### .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.519 2.1.520 2.1.521 2.1.522 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.616 2.1.617 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 2.1.811 2.1.812 2.1.813 2.1.814 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.109 3.1.110 3.1.111 3.1.112 3.1.113 3.1.200 3.1.201 3.1.202 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 5.0.100 5.0.101 5.0.102 5.0.103 5.0.104 5.0.200 5.0.201 5.0.202 +- 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.519 2.1.520 2.1.521 2.1.522 2.1.523 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.616 2.1.617 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 2.1.811 2.1.812 2.1.813 2.1.814 2.1.815 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.109 3.1.110 3.1.111 3.1.112 3.1.113 3.1.114 3.1.200 3.1.201 3.1.202 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 3.1.408 5.0.100 5.0.101 5.0.102 5.0.103 5.0.104 5.0.200 5.0.201 5.0.202 ### Databases - MongoDB 4.4.5 (apt source repository: https://repo.mongodb.org/apt/ubuntu) @@ -237,7 +238,7 @@ | -------------------------- | ------------------------------------------------------------------------------------------------------------------------ | | Android Command Line Tools | 3.0 | | Android SDK Build-tools | 30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3 | -| Android SDK Platform-Tools | 31.0.1 | +| Android SDK Platform-Tools | 31.0.2 | | Android SDK Platforms | android-S (rev 2)
android-30 (rev 3)
android-29 (rev 5)
android-28 (rev 6)
android-27 (rev 3) | | Android SDK Tools | 26.1.1 | | Android Support Repository | 47.0.0 | @@ -259,17 +260,19 @@ ### Cached Docker images | Repository:Tag | Digest | Created | | ---------------------- | ------------------------------------------------------------------------ | ---------- | -| alpine:3.11 | sha256:bf5fa774f08a9ed2cb301e522b769d43d48124315a4ec50eae3228d03b9dc558 | 2021-03-31 | -| alpine:3.12 | sha256:834e9309b5ef0f78d8d20ef0652e7b0272fe97b5baf45720e1b830eaf013cc1b | 2021-03-31 | -| alpine:3.13 | sha256:ec14c7992a97fc11425907e908340c6c3d6ff602f5f13d899e6b7027c9b4133a | 2021-03-31 | +| alpine:3.11 | sha256:18a918a714d1368847b67173d120ebd110fcfae208305412f3005a61cdc7c20e | 2021-04-14 | +| alpine:3.12 | sha256:36553b10a4947067b9fbb7d532951066293a68eae893beba1d9235f7d11a20ad | 2021-04-14 | +| alpine:3.13 | sha256:69e70a79f2d41ab5d637de98c1e0b055206ba40a8145e7bddb55ccc04e13cf8f | 2021-04-14 | | buildpack-deps:buster | sha256:da41958eb012d10ac2e9764885e02612dd515df1b455900f3eda81d81a574ca3 | 2021-04-10 | | buildpack-deps:stretch | sha256:ea0e73d4d5c3341e1328b58a69f513067c79fd6effd9776fc2d2f8d46e2f6e78 | 2021-04-10 | | debian:10 | sha256:ba4a437377a0c450ac9bb634c3754a17b1f814ce6fa3157c0dc9eef431b29d1f | 2021-04-10 | | debian:9 | sha256:c0daa8e312c326ac15721712b8a1e68a5039d725ff47bc25c781921089de0a66 | 2021-04-10 | | node:10 | sha256:59531d2835edd5161c8f9512f9e095b1836f7a1fcb0ab73e005ec46047384911 | 2021-04-10 | -| node:10-alpine | sha256:8459a952511f363fbb4db57b991608b8d10c0fbd1ed89176f5dce474df1d5db8 | 2021-04-07 | +| node:10-alpine | sha256:dc98dac24efd4254f75976c40bce46944697a110d06ce7fa47e7268470cf2e28 | 2021-04-14 | | node:12 | sha256:609103746810535f5a3a987a26ba4ce95d96225d28e9d6228faa5aa331980f37 | 2021-04-10 | -| node:12-alpine | sha256:3423a5eea6a1151df079c5e94458dbd946cd53bcb75b47954a16af3137731ec7 | 2021-04-07 | +| node:12-alpine | sha256:9923c9efb13cf7535f67e49b03010f0977a800068e4c8e0e2c93433a6bfa1e77 | 2021-04-14 | +| node:14 | sha256:8eb45f4677c813ad08cef8522254640aa6a1800e75a9c213a0a651f6f3564189 | 2021-04-10 | +| node:14-alpine | sha256:ed51af876dd7932ce5c1e3b16c2e83a3f58419d824e366de1f7b00f40c848c40 | 2021-04-14 | | ubuntu:16.04 | sha256:bb84bbf2ff36d46acaf0bb0c6bcb33dae64cd93cba8652d74c9aaf438fada438 | 2021-03-25 | | ubuntu:18.04 | sha256:122f506735a26c0a1aff2363335412cfc4f84de38326356d31ee00c2cbe52171 | 2021-03-25 | | ubuntu:20.04 | sha256:3c9c713e0979e9bd6061ed52ac1e9e1f246c9495aa063619d9d695fb8039aa1f | 2021-04-03 | @@ -348,10 +351,9 @@ | upx | 3.95-2build1 | | wget | 1.20.3-1ubuntu1 | | xorriso | 1.5.2-1 | -| xvfb | 2:1.20.9-2ubuntu1.2~20.04.1 | +| xvfb | 2:1.20.9-2ubuntu1.2~20.04.2 | | xz-utils | 5.2.4-1ubuntu1 | | zip | 3.0-11build1 | -| zstd | 1.4.4+dfsg-3ubuntu0.1 | | zsync | 0.6.2-3ubuntu1 | From fd4350f27c0f9876818b9040a1c041cc150dc955 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 22 Apr 2021 10:02:28 +0000 Subject: [PATCH 0189/3485] Updating readme file for win16 version 20210419.1 (#3216) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/win/Windows2016-Readme.md | 82 ++++++++++++++++---------------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/images/win/Windows2016-Readme.md b/images/win/Windows2016-Readme.md index d443d457e37e..a310e7d2b6a0 100644 --- a/images/win/Windows2016-Readme.md +++ b/images/win/Windows2016-Readme.md @@ -3,8 +3,8 @@ | [[windows, ubuntu] Few outdated Docker images will be removed on April, 12](https://github.com/actions/virtual-environments/issues/3111) | *** # Microsoft Windows Server 2016 Datacenter -- OS Version: 10.0.14393 Build 4283 -- Image Version: 20210411.1 +- OS Version: 10.0.14393 Build 4350 +- Image Version: 20210419.1 ## Installed Software ### Language and Runtime @@ -23,11 +23,11 @@ - Helm 3.5.3 - Miniconda 4.9.2 - NPM 6.14.12 -- NuGet 5.8.1.7021 +- NuGet 5.9.1.11 - pip 21.0.1 (python 3.7) - Pipx 0.16.1.0 - RubyGems 2.7.6.2 -- Vcpkg (build from master \) +- Vcpkg (build from master \<414bec0>) - Yarn 1.22.10 #### Environment variables @@ -37,25 +37,25 @@ | VCPKG_INSTALLATION_ROOT | C:\vcpkg | ### Project Management -- Ant 1.10.9 -- Gradle 6.8 +- Ant 1.10.10 +- Gradle 7.0 - Maven 3.6.3 - sbt 1.5.0 ### Tools - 7zip 19.00 -- azcopy 10.9.0 +- azcopy 10.10.0 - Bazel 4.0.0 - Bazelisk 1.7.5 - Cabal 3.4.0.0 - CMake 3.20.1 - CodeQL Action Bundle 2.5.0 -- Docker 20.10.0 -- Docker-compose 1.28.5 +- Docker 20.10.4 +- Docker-compose 1.29.1 - ghc 9.0.1 - Git 2.31.1 - Git LFS 2.13.3 -- Google Cloud SDK 335.0.0 +- Google Cloud SDK 336.0.0 - InnoSetup 6.1.2 - jq 1.6 - Kind 0.10.0 @@ -65,8 +65,8 @@ - Newman 5.2.2 - NSIS v3.06.1 - OpenSSL 1.1.1 -- Packer 1.7.0 -- Pulumi v2.24.1 +- Packer 1.7.2 +- Pulumi v2.25.2 - R 4.0.5 - Stack 2.5.1 - Subversion (SVN) 1.14.1 @@ -77,14 +77,14 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.73 -- AWS CLI 2.1.36 +- AWS CLI 2.1.38 - AWS SAM CLI 1.22.0 - AWS Session Manager CLI 1.2.54.0 -- Azure CLI 2.21.0 +- Azure CLI 2.22.0 - Azure Dev Spaces CLI 1.0.20201219.2 - Azure DevOps CLI extension 0.18.0 - Cloud Foundry CLI 6.53.0 -- GitHub CLI 1.8.1 +- GitHub CLI 1.9.1 - Hub CLI 2.14.2 ### Rust Tools @@ -102,10 +102,10 @@ - Rustfmt 1.4.36 ### Browsers and webdrivers -- Google Chrome 89.0.4389.114 -- Chrome Driver 89.0.4389.23 -- Microsoft Edge 89.0.774.75 -- Microsoft Edge Driver 89.0.774.75 +- Google Chrome 90.0.4430.72 +- Chrome Driver 90.0.4430.24 +- Microsoft Edge 90.0.818.41 +- Microsoft Edge Driver 90.0.818.41 - Mozilla Firefox 87.0 - Gecko Driver 0.29.1 - IE Driver 3.150.1.0 @@ -215,15 +215,15 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Web Servers -| Name | Version | ConfigFile | ServiceName | ServiceStatus | ListenPort | -| ------ | ------- | ------------------------------------- | ----------- | ------------- | ---------- | -| Apache | 2.4.46 | C:\tools\Apache24\conf\httpd.conf | Apache | Stopped | 80 | -| Nginx | 1.19.9 | C:\tools\nginx-1.19.9\conf\nginx.conf | nginx | Stopped | 80 | +| Name | Version | ConfigFile | ServiceName | ServiceStatus | ListenPort | +| ------ | ------- | -------------------------------------- | ----------- | ------------- | ---------- | +| Apache | 2.4.46 | C:\tools\Apache24\conf\httpd.conf | Apache | Stopped | 80 | +| Nginx | 1.19.10 | C:\tools\nginx-1.19.10\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2017 | Name | Version | Path | | ----------------------------- | --------------- | -------------------------------------------------------------- | -| Visual Studio Enterprise 2017 | 15.9.28307.1440 | C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise | +| Visual Studio Enterprise 2017 | 15.9.28307.1500 | C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise | #### Workloads, components and extensions: @@ -266,11 +266,11 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.Component.Azure.DataLake.Tools | 15.9.28107.0 | | Microsoft.Component.Blend.SDK.WPF | 15.6.27406.0 | | Microsoft.Component.ClickOnce | 15.8.27825.0 | -| Microsoft.Component.CookiecutterTools | 15.0.26621.2 | +| Microsoft.Component.CookiecutterTools | 15.9.28307.1500 | | Microsoft.Component.MSBuild | 15.7.27520.0 | | Microsoft.Component.NetFX.Core.Runtime | 15.0.26208.0 | | Microsoft.Component.NetFX.Native | 15.0.26208.0 | -| Microsoft.Component.PythonTools | 15.0.26823.1 | +| Microsoft.Component.PythonTools | 15.9.28307.1500 | | Microsoft.Component.PythonTools.UWP | 15.0.26606.0 | | Microsoft.Component.PythonTools.Web | 15.9.28107.0 | | Microsoft.Component.VC.Runtime.OSSupport | 15.6.27406.0 | @@ -459,7 +459,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Workload.NetWeb | 15.9.28307.1439 | | Microsoft.VisualStudio.Workload.Node | 15.9.28107.0 | | Microsoft.VisualStudio.Workload.Office | 15.9.28307.1439 | -| Microsoft.VisualStudio.Workload.Python | 15.9.28307.1439 | +| Microsoft.VisualStudio.Workload.Python | 15.9.28307.1500 | | Microsoft.VisualStudio.Workload.Universal | 15.9.28307.1439 | | Microsoft.VisualStudio.Workload.VisualStudioExtension | 15.7.27625.0 | | Microsoft.VisualStudio.Workload.WebCrossPlat | 15.9.28307.341 | @@ -485,27 +485,27 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft Visual C++ 2013 Minimum Runtime | x86 | 12.0.21005 | | Microsoft Visual C++ 2017 Debug Runtime | x64 | 14.16.27033 | | Microsoft Visual C++ 2017 Debug Runtime | x86 | 14.16.27033 | -| Microsoft Visual C++ 2019 Additional Runtime | x64 | 14.28.29913 | -| Microsoft Visual C++ 2019 Minimum Runtime | x64 | 14.28.29913 | -| Microsoft Visual C++ 2019 Additional Runtime | x86 | 14.28.29913 | -| Microsoft Visual C++ 2019 Minimum Runtime | x86 | 14.28.29913 | +| Microsoft Visual C++ 2019 Additional Runtime | x64 | 14.28.29914 | +| Microsoft Visual C++ 2019 Minimum Runtime | x64 | 14.28.29914 | +| Microsoft Visual C++ 2019 Additional Runtime | x86 | 14.28.29914 | +| Microsoft Visual C++ 2019 Minimum Runtime | x86 | 14.28.29914 | ### .NET Core SDK `Location C:\Program Files\dotnet\sdk` -- 1.1.14 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.519 2.1.520 2.1.521 2.1.522 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.616 2.1.617 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 2.1.811 2.1.812 2.1.813 2.1.814 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.109 3.1.110 3.1.111 3.1.112 3.1.113 3.1.200 3.1.201 3.1.202 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 5.0.100 5.0.101 5.0.102 5.0.103 5.0.104 5.0.200 5.0.201 5.0.202 +- 1.1.14 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.519 2.1.520 2.1.521 2.1.522 2.1.523 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.616 2.1.617 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 2.1.811 2.1.812 2.1.813 2.1.814 2.1.815 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.109 3.1.110 3.1.111 3.1.112 3.1.113 3.1.114 3.1.200 3.1.201 3.1.202 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 3.1.408 5.0.100 5.0.101 5.0.102 5.0.103 5.0.104 5.0.200 5.0.201 5.0.202 ### .NET Core Runtime `Location: C:\Program Files\dotnet\shared\Microsoft.AspNetCore.All` -- 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23 2.1.24 2.1.25 2.1.26 +- 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23 2.1.24 2.1.25 2.1.26 2.1.27 `Location: C:\Program Files\dotnet\shared\Microsoft.AspNetCore.App` -- 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23 2.1.24 2.1.25 2.1.26 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9 3.1.10 3.1.11 3.1.12 3.1.13 5.0.0 5.0.1 5.0.2 5.0.3 5.0.4 5.0.5 +- 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23 2.1.24 2.1.25 2.1.26 2.1.27 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9 3.1.10 3.1.11 3.1.12 3.1.13 3.1.14 5.0.0 5.0.1 5.0.2 5.0.3 5.0.4 5.0.5 `Location: C:\Program Files\dotnet\shared\Microsoft.NETCore.App` -- 1.0.16 1.1.13 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23 2.1.24 2.1.25 2.1.26 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9 3.1.10 3.1.11 3.1.12 3.1.13 5.0.0 5.0.1 5.0.2 5.0.3 5.0.4 5.0.5 +- 1.0.16 1.1.13 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23 2.1.24 2.1.25 2.1.26 2.1.27 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9 3.1.10 3.1.11 3.1.12 3.1.13 3.1.14 5.0.0 5.0.1 5.0.2 5.0.3 5.0.4 5.0.5 `Location: C:\Program Files\dotnet\shared\Microsoft.WindowsDesktop.App` -- 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9 3.1.10 3.1.11 3.1.12 3.1.13 5.0.0 5.0.1 5.0.2 5.0.3 5.0.4 5.0.5 +- 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9 3.1.10 3.1.11 3.1.12 3.1.13 3.1.14 5.0.0 5.0.1 5.0.2 5.0.3 5.0.4 5.0.5 ### .NET Framework `Type: Developer Pack` @@ -544,7 +544,7 @@ All other versions are saved but not installed. | Android Command Line Tools | 3.0 | | Android SDK Build-tools | 30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3
26.0.0 26.0.1 26.0.2 26.0.3
25.0.0 25.0.1 25.0.2 25.0.3
24.0.0 24.0.1 24.0.2 24.0.3
23.0.1 23.0.2 23.0.3
22.0.1
21.1.2
20.0.0
19.1.0 | | Android SDK Platforms | android-S (rev 2)
android-30 (rev 3)
android-29 (rev 5)
android-28 (rev 6)
android-27 (rev 3)
android-26 (rev 2)
android-25 (rev 3)
android-24 (rev 2)
android-23 (rev 3)
android-22 (rev 2)
android-21 (rev 2)
android-20 (rev 2)
android-19 (rev 4) | -| Android SDK Platform-Tools | 31.0.1 | +| Android SDK Platform-Tools | 31.0.2 | | Android SDK Tools | 25.2.5 | | Android Support Repository | 47.0.0 | | CMake | 3.10.2 | @@ -567,11 +567,11 @@ All other versions are saved but not installed. ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2016 | sha256:d192997ca2b9e67cec497a8a8fc407fa9c10133d56e5f689ec69b5a9f9ef8abd | 2021-03-09 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2016 | sha256:f6b2f76e6c8140feee8342cabc6c61f6b7834aab7026a27aed264275948b383d | 2021-03-09 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2016 | sha256:c6070d5ccae1462c026f5af96e66743b27be70a7e5e0e05e841e51a4d7158525 | 2021-03-09 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2016 | sha256:1925732dc0f67cd2e40241cbf2c18c59e751b5132d913d7c0cf5bced27a0592e | 2021-04-13 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2016 | sha256:36925b012184012782bb1972743f57b60bcc16064927af1f0b6e1e75424c3130 | 2021-04-13 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2016 | sha256:9efd758e3e23321e904e4996e506dbe73ced588e68fac7e386b7f88a2486f527 | 2021-04-13 | | mcr.microsoft.com/windows/nanoserver:10.0.14393.953 | sha256:fc60bd5ae0e61b334ce1cf1bcbf20c10c36b4c5482a01da319c9c989f9e6e268 | 2017-03-08 | -| mcr.microsoft.com/windows/servercore:ltsc2016 | sha256:e5bb86930669e23f4e098844c59ca75787214d6cac44c772a006261bdcd9473a | 2021-03-03 | +| mcr.microsoft.com/windows/servercore:ltsc2016 | sha256:4fbb0b699320a37ad904f31aff8bf1858e89b6c93b4d517b58d9516e3df9c24b | 2021-04-07 | From 6475fd06d57c1de10ccfccb6889726356cbcb683 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 22 Apr 2021 10:34:32 +0000 Subject: [PATCH 0190/3485] Updating readme file for win19 version 20210419.1 (#3215) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/win/Windows2019-Readme.md | 98 ++++++++++++++++---------------- 1 file changed, 49 insertions(+), 49 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index 00919d03befd..1041ab684bcf 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -3,8 +3,8 @@ | [[windows, ubuntu] Few outdated Docker images will be removed on April, 12](https://github.com/actions/virtual-environments/issues/3111) | *** # Microsoft Windows Server 2019 Datacenter -- OS Version: 10.0.17763 Build 1817 -- Image Version: 20210411.1 +- OS Version: 10.0.17763 Build 1879 +- Image Version: 20210419.1 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -26,11 +26,11 @@ - Helm 3.5.3 - Miniconda 4.9.2 - NPM 6.14.12 -- NuGet 5.8.1.7021 +- NuGet 5.9.1.11 - pip 21.0.1 (python 3.7) - Pipx 0.16.1.0 - RubyGems 2.7.6.2 -- Vcpkg (build from master \) +- Vcpkg (build from master \<414bec0>) - Yarn 1.22.10 #### Environment variables @@ -40,25 +40,25 @@ | VCPKG_INSTALLATION_ROOT | C:\vcpkg | ### Project Management -- Ant 1.10.9 -- Gradle 6.8 +- Ant 1.10.10 +- Gradle 7.0 - Maven 3.6.3 - sbt 1.5.0 ### Tools - 7zip 19.00 -- azcopy 10.9.0 +- azcopy 10.10.0 - Bazel 4.0.0 - Bazelisk 1.7.5 - Cabal 3.4.0.0 - CMake 3.20.1 - CodeQL Action Bundle 2.5.0 -- Docker 20.10.0 -- Docker-compose 1.28.5 +- Docker 20.10.4 +- Docker-compose 1.29.1 - ghc 9.0.1 - Git 2.31.1 - Git LFS 2.13.3 -- Google Cloud SDK 335.0.0 +- Google Cloud SDK 336.0.0 - InnoSetup 6.1.2 - jq 1.6 - Kind 0.10.0 @@ -68,8 +68,8 @@ - Newman 5.2.2 - NSIS v3.06.1 - OpenSSL 1.1.1 -- Packer 1.7.0 -- Pulumi v2.24.1 +- Packer 1.7.2 +- Pulumi v2.25.2 - R 4.0.5 - Stack 2.5.1 - Subversion (SVN) 1.14.1 @@ -80,14 +80,14 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.73 -- AWS CLI 2.1.36 +- AWS CLI 2.1.38 - AWS SAM CLI 1.22.0 - AWS Session Manager CLI 1.2.54.0 -- Azure CLI 2.21.0 +- Azure CLI 2.22.0 - Azure Dev Spaces CLI 1.0.20201219.2 - Azure DevOps CLI extension 0.18.0 - Cloud Foundry CLI 6.53.0 -- GitHub CLI 1.8.1 +- GitHub CLI 1.9.1 - Hub CLI 2.14.2 ### Rust Tools @@ -105,10 +105,10 @@ - Rustfmt 1.4.36 ### Browsers and webdrivers -- Google Chrome 89.0.4389.114 -- Chrome Driver 89.0.4389.23 -- Microsoft Edge 89.0.774.75 -- Microsoft Edge Driver 89.0.774.75 +- Google Chrome 90.0.4430.72 +- Chrome Driver 90.0.4430.24 +- Microsoft Edge 90.0.818.41 +- Microsoft Edge Driver 90.0.818.41 - Mozilla Firefox 87.0 - Gecko Driver 0.29.1 - IE Driver 3.150.1.0 @@ -221,21 +221,21 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Web Servers -| Name | Version | ConfigFile | ServiceName | ServiceStatus | ListenPort | -| ------ | ------- | ------------------------------------- | ----------- | ------------- | ---------- | -| Apache | 2.4.46 | C:\tools\Apache24\conf\httpd.conf | Apache | Stopped | 80 | -| Nginx | 1.19.9 | C:\tools\nginx-1.19.9\conf\nginx.conf | nginx | Stopped | 80 | +| Name | Version | ConfigFile | ServiceName | ServiceStatus | ListenPort | +| ------ | ------- | -------------------------------------- | ----------- | ------------- | ---------- | +| Apache | 2.4.46 | C:\tools\Apache24\conf\httpd.conf | Apache | Stopped | 80 | +| Nginx | 1.19.10 | C:\tools\nginx-1.19.10\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2019 | Name | Version | Path | | ----------------------------- | -------------- | -------------------------------------------------------------- | -| Visual Studio Enterprise 2019 | 16.9.31129.286 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | +| Visual Studio Enterprise 2019 | 16.9.31205.134 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | #### Workloads, components and extensions: | Package | Version | | ------------------------------------------------------------------------- | -------------- | -| Component.Android.NDK.R16B | 16.9.31129.215 | +| Component.Android.NDK.R16B | 16.9.31130.442 | | Component.Android.SDK25.Private | 16.0.28625.61 | | Component.Android.SDK30 | 16.9.31004.209 | | Component.Ant | 1.9.3.8 | @@ -265,7 +265,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.Component.ClickOnce | 16.4.29409.204 | | Microsoft.Component.MSBuild | 16.5.29515.121 | | Microsoft.Component.NetFX.Native | 16.5.29515.121 | -| Microsoft.Component.PythonTools | 16.5.29515.121 | +| Microsoft.Component.PythonTools | 16.9.31201.172 | | Microsoft.Component.PythonTools.Miniconda | 16.2.29003.222 | | Microsoft.Component.PythonTools.Web | 16.9.31004.209 | | Microsoft.Component.VC.Runtime.UCRTSDK | 16.0.28625.61 | @@ -289,11 +289,11 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.Net.ComponentGroup.4.7.DeveloperTools | 16.3.29207.166 | | Microsoft.Net.ComponentGroup.DevelopmentPrerequisites | 16.3.29207.166 | | Microsoft.Net.ComponentGroup.TargetingPacks.Common | 16.0.28516.191 | -| Microsoft.Net.Core.Component.SDK.2.1 | 16.9.31105.61 | +| Microsoft.Net.Core.Component.SDK.2.1 | 16.9.31202.62 | | Microsoft.NetCore.Component.DevelopmentTools | 16.9.31004.209 | -| Microsoft.NetCore.Component.Runtime.3.1 | 16.9.31105.61 | -| Microsoft.NetCore.Component.Runtime.5.0 | 16.9.31105.61 | -| Microsoft.NetCore.Component.SDK | 16.9.31105.61 | +| Microsoft.NetCore.Component.Runtime.3.1 | 16.9.31202.62 | +| Microsoft.NetCore.Component.Runtime.5.0 | 16.9.31202.62 | +| Microsoft.NetCore.Component.SDK | 16.9.31202.62 | | Microsoft.NetCore.Component.Web | 16.9.31004.209 | | Microsoft.VisualStudio.Component.AppInsights.Tools | 16.5.29515.121 | | Microsoft.VisualStudio.Component.AspNet45 | 16.9.31004.209 | @@ -328,7 +328,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Component.Graphics | 16.9.31004.209 | | Microsoft.VisualStudio.Component.Graphics.Tools | 16.0.28625.61 | | Microsoft.VisualStudio.Component.IISExpress | 16.0.28315.86 | -| Microsoft.VisualStudio.Component.IntelliCode | 16.9.31105.61 | +| Microsoft.VisualStudio.Component.IntelliCode | 16.9.31201.172 | | Microsoft.VisualStudio.Component.IntelliTrace.FrontEnd | 16.5.29515.121 | | Microsoft.VisualStudio.Component.JavaScript.Diagnostics | 16.0.28517.75 | | Microsoft.VisualStudio.Component.JavaScript.TypeScript | 16.9.31004.209 | @@ -450,7 +450,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Workload.NetWeb | 16.9.31004.209 | | Microsoft.VisualStudio.Workload.Node | 16.9.31004.209 | | Microsoft.VisualStudio.Workload.Office | 16.9.31004.209 | -| Microsoft.VisualStudio.Workload.Python | 16.0.28621.142 | +| Microsoft.VisualStudio.Workload.Python | 16.9.31201.172 | | Microsoft.VisualStudio.Workload.Universal | 16.9.31004.209 | | Microsoft.VisualStudio.Workload.VisualStudioExtension | 16.9.31004.209 | | SSDT Microsoft Analysis Services Projects | 2.9.17 | @@ -473,29 +473,29 @@ 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.28.29913 | -| Microsoft Visual C++ 2019 Debug Runtime | x64 | 14.28.29913 | -| Microsoft Visual C++ 2019 Minimum Runtime | x64 | 14.28.29913 | -| Microsoft Visual C++ 2019 Additional Runtime | x86 | 14.28.29913 | -| Microsoft Visual C++ 2019 Debug Runtime | x86 | 14.28.29913 | -| Microsoft Visual C++ 2019 Minimum Runtime | x86 | 14.28.29913 | +| Microsoft Visual C++ 2019 Additional Runtime | x64 | 14.28.29914 | +| Microsoft Visual C++ 2019 Debug Runtime | x64 | 14.28.29914 | +| Microsoft Visual C++ 2019 Minimum Runtime | x64 | 14.28.29914 | +| Microsoft Visual C++ 2019 Additional Runtime | x86 | 14.28.29914 | +| Microsoft Visual C++ 2019 Debug Runtime | x86 | 14.28.29914 | +| Microsoft Visual C++ 2019 Minimum Runtime | x86 | 14.28.29914 | ### .NET Core SDK `Location C:\Program Files\dotnet\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.519 2.1.520 2.1.521 2.1.522 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.616 2.1.617 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 2.1.811 2.1.812 2.1.813 2.1.814 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.109 3.1.110 3.1.111 3.1.112 3.1.113 3.1.200 3.1.201 3.1.202 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 5.0.100 5.0.101 5.0.102 5.0.103 5.0.104 5.0.200 5.0.201 5.0.202 +- 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.519 2.1.520 2.1.521 2.1.522 2.1.523 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.616 2.1.617 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 2.1.811 2.1.812 2.1.813 2.1.814 2.1.815 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.109 3.1.110 3.1.111 3.1.112 3.1.113 3.1.114 3.1.200 3.1.201 3.1.202 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 3.1.408 5.0.100 5.0.101 5.0.102 5.0.103 5.0.104 5.0.200 5.0.201 5.0.202 ### .NET Core Runtime `Location: C:\Program Files\dotnet\shared\Microsoft.AspNetCore.All` -- 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23 2.1.24 2.1.25 2.1.26 +- 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23 2.1.24 2.1.25 2.1.26 2.1.27 `Location: C:\Program Files\dotnet\shared\Microsoft.AspNetCore.App` -- 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23 2.1.24 2.1.25 2.1.26 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9 3.1.10 3.1.11 3.1.12 3.1.13 5.0.0 5.0.1 5.0.2 5.0.3 5.0.4 5.0.5 +- 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23 2.1.24 2.1.25 2.1.26 2.1.27 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9 3.1.10 3.1.11 3.1.12 3.1.13 3.1.14 5.0.0 5.0.1 5.0.2 5.0.3 5.0.4 5.0.5 `Location: C:\Program Files\dotnet\shared\Microsoft.NETCore.App` -- 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23 2.1.24 2.1.25 2.1.26 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9 3.1.10 3.1.11 3.1.12 3.1.13 5.0.0 5.0.1 5.0.2 5.0.3 5.0.4 5.0.5 +- 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23 2.1.24 2.1.25 2.1.26 2.1.27 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9 3.1.10 3.1.11 3.1.12 3.1.13 3.1.14 5.0.0 5.0.1 5.0.2 5.0.3 5.0.4 5.0.5 `Location: C:\Program Files\dotnet\shared\Microsoft.WindowsDesktop.App` -- 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9 3.1.10 3.1.11 3.1.12 3.1.13 5.0.0 5.0.1 5.0.2 5.0.3 5.0.4 5.0.5 +- 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9 3.1.10 3.1.11 3.1.12 3.1.13 3.1.14 5.0.0 5.0.1 5.0.2 5.0.3 5.0.4 5.0.5 ### .NET Framework `Type: Developer Pack` @@ -534,7 +534,7 @@ All other versions are saved but not installed. | Android Command Line Tools | 3.0 | | Android SDK Build-tools | 30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3
26.0.0 26.0.1 26.0.2 26.0.3
25.0.0 25.0.1 25.0.2 25.0.3
24.0.0 24.0.1 24.0.2 24.0.3
23.0.1 23.0.2 23.0.3
22.0.1
21.1.2
20.0.0
19.1.0 | | Android SDK Platforms | android-S (rev 2)
android-30 (rev 3)
android-29 (rev 5)
android-28 (rev 6)
android-27 (rev 3)
android-26 (rev 2)
android-25 (rev 3)
android-24 (rev 2)
android-23 (rev 3)
android-22 (rev 2)
android-21 (rev 2)
android-20 (rev 2)
android-19 (rev 4) | -| Android SDK Platform-Tools | 31.0.1 | +| Android SDK Platform-Tools | 31.0.2 | | Android SDK Tools | 26.1.1 | | Android Support Repository | 47.0.0 | | CMake | 3.10.2 | @@ -557,11 +557,11 @@ All other versions are saved but not installed. ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:953245d144c00acd448ae1d85814d95a7c3064a5c0675cadc78e9860a32a071b | 2021-03-09 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:4d5dc01599c02124bcd5f7778753ea6f8369c6fdd5c39da88f5ac91e37e352e6 | 2021-03-09 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:a874ab90088183363e74257e163cf3c8494d35561bf074c64de4bac5566ebddd | 2021-03-09 | -| mcr.microsoft.com/windows/nanoserver:1809 | sha256:def85061f840b63c4e45019ba716a4b35649ecba2e273621d6e80c8640ceff4c | 2021-02-26 | -| mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:acae9dedd8ce6fbc624e8c4b52555a9d3201eb47aacd45b4a00e0d81083b4cab | 2021-02-27 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:e1475e80eb3cbdfd81f542ee473ba1e5a39f918a856f506bb510aa86985c04a5 | 2021-04-13 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:c0255fb4963ceaa3f1e9bdfd13f17c4947645abaaf9f362154ec7259b56e7ba2 | 2021-04-13 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:c298b710b4e1a2687bce3f88492f9e8bd812f31bfd7473a1880992a87722d83a | 2021-04-13 | +| mcr.microsoft.com/windows/nanoserver:1809 | sha256:8746dc8b6726d53ba7176332580712c2c5622290b2b44345ded8e302356203ac | 2021-04-08 | +| mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:1bb6543a7fe87bb95d9adfa4c53ea3469c1c846ad63baf32729078062e8c1127 | 2021-04-09 | From f2852367e528f703dab69942798b9fbc6a7fbb66 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 22 Apr 2021 11:05:27 +0000 Subject: [PATCH 0191/3485] Updating readme file for macOS-10.15 version 20210419.2 (#3217) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/macos/macos-10.15-Readme.md | 39 +++++++++++++++--------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/images/macos/macos-10.15-Readme.md b/images/macos/macos-10.15-Readme.md index 925d6aa87efd..c201cddf07b2 100644 --- a/images/macos/macos-10.15-Readme.md +++ b/images/macos/macos-10.15-Readme.md @@ -6,11 +6,11 @@ # macOS 10.15 info - System Version: macOS 10.15.7 (19H524) - Kernel Version: Darwin 19.6.0 -- Image Version: 20210412.2 +- Image Version: 20210419.2 ## Installed Software ### Language and Runtime -- .NET SDK 2.1.300 2.1.301 2.1.302 2.1.401 2.1.402 2.1.403 2.1.500 2.1.502 2.1.503 2.1.504 2.1.505 2.1.506 2.1.507 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 2.1.811 2.1.812 2.1.813 2.1.814 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 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 5.0.100 5.0.101 5.0.102 5.0.200 5.0.201 5.0.202 +- .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 2.1.811 2.1.812 2.1.813 2.1.814 2.1.815 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 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 3.1.408 5.0.100 5.0.101 5.0.102 5.0.200 5.0.201 5.0.202 - Bash 3.2.57(1)-release - Clang/LLVM 11.1.0 is available on `'$(brew --prefix llvm)/bin/clang'` - Clang/LLVM 12.0.0 is default @@ -37,7 +37,7 @@ - Carthage 0.37.0 - CocoaPods 1.10.1 - Composer 2.0.12 -- Homebrew 3.1.1 +- Homebrew 3.1.2 - Miniconda 4.9.2 - NPM 6.14.12 - NuGet 5.6.0.6489 @@ -45,7 +45,7 @@ - Pip 21.0.1 (python 3.9) - Pipx 0.16.1.0 - RubyGems 3.2.16 -- Vcpkg 2021 (build from master \<00b218d>) +- Vcpkg 2021 (build from master \<414bec0>) - Yarn 1.22.5 #### Environment variables @@ -55,26 +55,26 @@ | VCPKG_INSTALLATION_ROOT | /usr/local/share/vcpkg | ### Project Management -- Apache Ant(TM) 1.10.9 +- Apache Ant(TM) 1.10.10 - Apache Maven 3.8.1 - Gradle 7.0 ### Utilities - 7-Zip 17.04 - aria2 1.35.0 -- azcopy 10.9.0 +- azcopy 10.10.0 - bazel 4.0.0 - bazelisk 1.7.5 - bsdtar 3.3.2 - available by 'tar' alias -- Curl 7.76.0 +- Curl 7.76.1 - Git LFS: 2.13.3 - Git: 2.31.1 -- GitHub CLI: 1.8.1 +- GitHub CLI: 1.9.1 - GNU parallel 20210322 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.1 - gpg (GnuPG) 2.2.27 -- helm v3.5.3+g041ce5a +- helm v3.5.4+g1b5edb6 - Hub CLI: 2.14.2 - jq 1.6 - mongo v4.4.4 @@ -93,16 +93,17 @@ ### Tools - Aliyun CLI 3.0.73 - App Center CLI 2.9.0 -- AWS CLI 2.1.36 +- AWS CLI 2.1.38 - AWS SAM CLI 1.22.0 - AWS Session Manager CLI 1.2.30.0 -- Azure CLI 2.21.0 +- Azure CLI 2.22.0 - Cabal 3.4.0.0 - Cmake 3.20.1 - Fastlane 2.180.1 - GHC 9.0.1 - GHCup v0.1.14.1 - Stack 2.5.1 +- SwiftFormat 0.47.13 - Xcode Command Line Tools 12.4.0.0.1.1610135815 ### Linters @@ -112,17 +113,17 @@ ### Browsers - Safari 14.0.3 (15610.4.3.1.7) - SafariDriver 14.0.3 (15610.4.3.1.7) -- Google Chrome 89.0.4389.114 -- ChromeDriver 89.0.4389.23 -- Microsoft Edge 89.0.774.75 -- MSEdgeDriver 89.0.774.75 +- Google Chrome 90.0.4430.72 +- ChromeDriver 90.0.4430.24 +- Microsoft Edge 90.0.818.41 +- MSEdgeDriver 90.0.818.41 - Mozilla Firefox 87.0 - geckodriver 0.29.1 #### Environment variables | Name | Value | | --------------- | --------------------------------------------- | -| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/89.0.4389.23 | +| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/90.0.4430.24 | | EDGEWEBDRIVER | /usr/local/share/edge_driver | | GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | @@ -196,11 +197,11 @@ | Name | Version | ConfigFile | ServiceStatus | ListenPort | | ----- | -------- | ------------------------------- | ------------- | ---------- | | httpd | 2.4.46_2 | /usr/local/etc/httpd/httpd.conf | stopped | 80 | -| nginx | 1.19.9 | /usr/local/etc/nginx/nginx.conf | stopped | 80 | +| nginx | 1.19.10 | /usr/local/etc/nginx/nginx.conf | stopped | 80 | ### Xamarin #### Visual Studio for Mac -- 8.9.5.4 +- 8.9.6.6 #### Xamarin bundles | symlink | Xamarin.Mono | Xamarin.iOS | Xamarin.Mac | Xamarin.Android | @@ -342,7 +343,7 @@ | Android Emulator | 30.5.4 | | Android SDK Build-tools | 30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3
26.0.0 26.0.1 26.0.2 26.0.3
25.0.0 25.0.1 25.0.2 25.0.3
24.0.0 24.0.1 24.0.2 24.0.3 | | Android SDK Platforms | android-S (rev 2)
android-30 (rev 3)
android-29 (rev 5)
android-28 (rev 6)
android-27 (rev 3)
android-26 (rev 2)
android-25 (rev 3)
android-24 (rev 2) | -| Android SDK Platform-Tools | 31.0.1 | +| Android SDK Platform-Tools | 31.0.2 | | Android SDK Tools | 26.1.1 | | Android Support Repository | 47.0.0 | | CMake | 3.10.2 | From 5690645f0e91c30d888353d7b58432dc0466eca9 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Thu, 22 Apr 2021 18:38:35 +0300 Subject: [PATCH 0192/3485] Add --no-progress flag to choco install (#3238) --- images/win/scripts/ImageHelpers/ChocoHelpers.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/win/scripts/ImageHelpers/ChocoHelpers.ps1 b/images/win/scripts/ImageHelpers/ChocoHelpers.ps1 index ee1f391280cd..16956654b276 100644 --- a/images/win/scripts/ImageHelpers/ChocoHelpers.ps1 +++ b/images/win/scripts/ImageHelpers/ChocoHelpers.ps1 @@ -12,7 +12,7 @@ function Choco-Install { while($true) { Write-Host "Running [#$count]: choco install $packageName -y $argumentList" - choco install $packageName -y @argumentList + choco install $packageName -y @argumentList --no-progress $pkg = choco list --localonly $packageName --exact --all --limitoutput if ($pkg) { From cd4ecad2e636fbea5182332679e04d793fbf642c Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Fri, 23 Apr 2021 19:38:43 +0300 Subject: [PATCH 0193/3485] [Windows] Install vsix extensions using CDN endpoint (#3244) * Install extensions for VS19 * Get vsix packages name in runtime * add a bit of debug * Get extension id from the marketplace uri * Add extension name * skip vcredist installation * Add Get-VsixExtenstionFromMarketplace to ImageHelpers.psm1 * Fix DownloadUri name in the function * DownloadUri in lower case * Add packages to the readme * Add a condition to software report * fix spelling in function * Simplify toolset + get rid of backticks --- .../scripts/ImageHelpers/ImageHelpers.psm1 | 1 + .../scripts/ImageHelpers/InstallHelpers.ps1 | 27 +++++++++++++++++ .../win/scripts/Installers/Install-Vsix.ps1 | 4 ++- .../SoftwareReport.VisualStudio.psm1 | 30 +++++++++++-------- images/win/scripts/Tests/Vsix.Tests.ps1 | 11 +++++-- images/win/toolsets/toolset-2019.json | 30 ++++--------------- 6 files changed, 63 insertions(+), 40 deletions(-) diff --git a/images/win/scripts/ImageHelpers/ImageHelpers.psm1 b/images/win/scripts/ImageHelpers/ImageHelpers.psm1 index 3f10d70bcbfc..e95c10beeb97 100644 --- a/images/win/scripts/ImageHelpers/ImageHelpers.psm1 +++ b/images/win/scripts/ImageHelpers/ImageHelpers.psm1 @@ -21,6 +21,7 @@ Export-ModuleMember -Function @( 'Stop-SvcWithErrHandling' 'Set-SvcWithErrHandling' 'Start-DownloadWithRetry' + 'Get-VsixExtenstionFromMarketplace' 'Install-VsixExtension' 'Get-VSExtensionVersion' 'Get-WinVersion' diff --git a/images/win/scripts/ImageHelpers/InstallHelpers.ps1 b/images/win/scripts/ImageHelpers/InstallHelpers.ps1 index 225b99ffb650..ac55d9cf953d 100644 --- a/images/win/scripts/ImageHelpers/InstallHelpers.ps1 +++ b/images/win/scripts/ImageHelpers/InstallHelpers.ps1 @@ -198,6 +198,33 @@ function Start-DownloadWithRetry return $filePath } +function Get-VsixExtenstionFromMarketplace { + Param + ( + [string] $ExtensionMarketPlaceName, + [string] $MarketplaceUri = "https://marketplace.visualstudio.com/items?itemName=" + ) + + $extensionUri = $MarketplaceUri + $ExtensionMarketPlaceName + $request = Invoke-WebRequest -Uri $extensionUri -UseBasicParsing + $request -match 'UniqueIdentifierValue":"(?[^"]*)' | Out-Null + $extensionName = $Matches.extensionname + $request -match 'VsixId":"(?[^"]*)' | Out-Null + $vsixId = $Matches.vsixid + $request -match 'AssetUri":"(?[^"]*)' | Out-Null + $assetUri = $Matches.uri + $request -match 'Microsoft\.VisualStudio\.Services\.Payload\.FileName":"(?[^"]*)' | Out-Null + $fileName = $Matches.filename + $downloadUri = $assetUri + "/" + $fileName + + return [PSCustomObject] @{ + "ExtensionName" = $extensionName + "VsixId" = $vsixId + "FileName" = $fileName + "DownloadUri" = $downloadUri + } +} + function Install-VsixExtension { Param diff --git a/images/win/scripts/Installers/Install-Vsix.ps1 b/images/win/scripts/Installers/Install-Vsix.ps1 index 628b643b201f..23d75729fb02 100644 --- a/images/win/scripts/Installers/Install-Vsix.ps1 +++ b/images/win/scripts/Installers/Install-Vsix.ps1 @@ -12,7 +12,9 @@ if (-not $vsixPackagesList) { $vsVersion = $toolset.visualStudio.Version $vsixPackagesList | ForEach-Object { - Install-VsixExtension -Url $_.url -Name $_.name -VSversion $vsVersion + # Retrieve cdn endpoint to avoid HTTP error 429 https://github.com/actions/virtual-environments/issues/3074 + $vsixPackage = Get-VsixExtenstionFromMarketplace -ExtensionMarketPlaceName $_ + Install-VsixExtension -Url $vsixPackage.DownloadUri -Name $vsixPackage.FileName -VSversion $vsVersion } Invoke-PesterTests -TestFile "Vsix" \ No newline at end of file diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.VisualStudio.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.VisualStudio.psm1 index 0004c168bdc8..576a8e13dfac 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.VisualStudio.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.VisualStudio.psm1 @@ -20,6 +20,21 @@ function Get-WDKVersion { } function Get-VisualStudioExtensions { + # Additional vsixs + $toolset = Get-ToolsetContent + $vsixUrls = $toolset.visualStudio.vsix + if ($vsixUrls) + { + $vsixs = $vsixUrls | ForEach-Object { + $vsix = Get-VsixExtenstionFromMarketplace -ExtensionMarketPlaceName $_ + $vsixVersion = (Get-VisualStudioPackages | Where-Object {$_.Id -match $vsix.VsixId -and $_.type -eq 'vsix'}).Version + @{ + Package = $vsix.ExtensionName + Version = $vsixVersion + } + } + } + # Wix $vs = (Get-VisualStudioVersion).Name.Split()[-1] $wixPackageVersion = Get-WixVersion @@ -29,18 +44,9 @@ function Get-VisualStudioExtensions { $wdkPackageVersion = Get-VSExtensionVersion -packageName 'Microsoft.Windows.DriverKit' $wdkExtensionVersion = Get-WDKVersion - # SSDT - $analysisPackageVersion = Get-VSExtensionVersion -packageName '04a86fc2-dbd5-4222-848e-911638e487fe' - $reportingPackageVersion = Get-VSExtensionVersion -packageName '717ad572-c4b7-435c-c166-c2969777f718' - - $integrationPackageName = ($vs -match "2019") ? '851E7A09-7B2B-4F06-A15D-BABFCB26B970' : 'D1B09713-C12E-43CC-9EF4-6562298285AB' - $integrationPackageVersion = Get-VSExtensionVersion -packageName $integrationPackageName - $extensions = @( - @{Package = 'SSDT Microsoft Analysis Services Projects'; Version = $analysisPackageVersion} - @{Package = 'SSDT SQL Server Integration Services Projects'; Version = $integrationPackageVersion} - @{Package = 'SSDT Microsoft Reporting Services Projects'; Version = $reportingPackageVersion} - @{Package = 'Windows Driver Kit'; Version = $wixPackageVersion} + $vsixs + @{Package = 'Windows Driver Kit'; Version = $wdkPackageVersion} @{Package = 'Windows Driver Kit Visual Studio Extension'; Version = $wdkExtensionVersion} @{Package = 'WIX Toolset'; Version = $wixPackageVersion} @{Package = "WIX Toolset Studio $vs Extension"; Version = $wixExtensionVersion} @@ -48,5 +54,5 @@ function Get-VisualStudioExtensions { $extensions | Foreach-Object { [PSCustomObject]$_ - } | Select-Object Package, Version + } | Select-Object Package, Version | Sort-Object Package } \ No newline at end of file diff --git a/images/win/scripts/Tests/Vsix.Tests.ps1 b/images/win/scripts/Tests/Vsix.Tests.ps1 index b92f862ead78..69e6682394bf 100644 --- a/images/win/scripts/Tests/Vsix.Tests.ps1 +++ b/images/win/scripts/Tests/Vsix.Tests.ps1 @@ -3,9 +3,16 @@ Describe "Vsix" { $requiredVsixs = $toolset.visualStudio.vsix $allPackages = (Get-VSSetupInstance | Select-VsSetupInstance -Product *).Packages - $testCases = $requiredVsixs | ForEach-Object { @{ VsixId = $_.Id; AllPackages = $allPackages }} + $testCases = $requiredVsixs | ForEach-Object { + $vsix = Get-VsixExtenstionFromMarketplace -ExtensionMarketPlaceName $_ + @{ + VsixName = $vsix.ExtensionName + VsixId = $vsix.VsixId + AllPackages = $allPackages + } + } if ($testCases.Count -gt 0) { - It "Extension " -TestCases $testCases { + It "Extension is installed" -TestCases $testCases { $objVsix = $AllPackages | Where-Object { $_.id -eq $VsixId } $objVsix | Should -Not -BeNullOrEmpty } diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index 3a95d10f7804..215c80821e11 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -270,31 +270,11 @@ "Component.MDD.Linux.GCC.arm" ], "vsix": [ - { - "name": "Microsoft.DataTools.AnalysisServices.vsix", - "url": "https://marketplace.visualstudio.com/_apis/public/gallery/publishers/ProBITools/vsextensions/MicrosoftAnalysisServicesModelingProjects/2.9.5/vspackage", - "id": "04a86fc2-dbd5-4222-848e-911638e487fe" - }, - { - "name": "Microsoft.DataTools.IntegrationServices.exe", - "url": "https://marketplace.visualstudio.com/_apis/public/gallery/publishers/SSIS/vsextensions/SqlServerIntegrationServicesProjects/3.4/vspackage", - "id": "851E7A09-7B2B-4F06-A15D-BABFCB26B970" - }, - { - "name": "Microsoft.DataTools.ReportingServices.vsix", - "url": "https://marketplace.visualstudio.com/_apis/public/gallery/publishers/ProBITools/vsextensions/MicrosoftReportProjectsforVisualStudio/2.6.3/vspackage", - "id": "717ad572-c4b7-435c-c166-c2969777f718" - }, - { - "name": "Microsoft.VisualStudio.Installer.Projects.vsix", - "url": "https://marketplace.visualstudio.com/_apis/public/gallery/publishers/VisualStudioClient/vsextensions/MicrosoftVisualStudio2017InstallerProjects/latest/vspackage", - "id": "VSInstallerProjects" - }, - { - "name": "BizTalkVsix.vsix", - "url": "https://marketplace.visualstudio.com/_apis/public/gallery/publishers/ms-biztalk/vsextensions/BizTalk/3.13.2.0/vspackage", - "id": "BizTalkProjectSystem.BD1D0FA0-E48A-4270-995F-F110DD9F7838" - } + "ProBITools.MicrosoftAnalysisServicesModelingProjects", + "SSIS.SqlServerIntegrationServicesProjects", + "ProBITools.MicrosoftReportProjectsforVisualStudio", + "VisualStudioClient.MicrosoftVisualStudio2017InstallerProjects", + "ms-biztalk.BizTalk" ] }, "docker": { From 1cfd4804166402f910a59d74bfc29263a669d434 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 26 Apr 2021 10:12:58 +0000 Subject: [PATCH 0194/3485] Updating readme file for macOS-11.0 version 20210424.1 (#3261) Co-authored-by: Image generation service account --- images/macos/macos-11.0-Readme.md | 39 +++++++++++++++---------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/images/macos/macos-11.0-Readme.md b/images/macos/macos-11.0-Readme.md index cf78be156485..a15bd7d12e9f 100644 --- a/images/macos/macos-11.0-Readme.md +++ b/images/macos/macos-11.0-Readme.md @@ -1,12 +1,11 @@ | Announcements | |-| -| [[macOS] Az modules will be upgraded from 4.8.0 to 5.7.0 on April, 12](https://github.com/actions/virtual-environments/issues/3129) | | [macOS 11.0 pools will be transited to private preview.](https://github.com/actions/virtual-environments/issues/2486) | *** # macOS 11.2 info - System Version: macOS 11.2.3 (20D91) - Kernel Version: Darwin 20.3.0 -- Image Version: 20210420.1 +- Image Version: 20210424.1 ## Installed Software ### Language and Runtime @@ -21,7 +20,7 @@ - GNU Fortran (Homebrew GCC 8.4.0_3) 8.4.0 - available by `gfortran-8` alias - GNU Fortran (Homebrew GCC 9.3.0_2) 9.3.0 - available by `gfortran-9` alias - Go 1.15.11 -- julia 1.6.0 +- julia 1.6.1 - MSBuild 16.6.0.15801 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) - Node.js v14.16.1 - NVM - Cached node versions: v10.24.1 v12.22.1 v14.16.1 @@ -45,7 +44,7 @@ - Pip 21.0.1 (python 3.9) - Pipx 0.16.1.0 - RubyGems 3.2.16 -- Vcpkg 2021 (build from master \<807a798>) +- Vcpkg 2021 (build from master \<6ebcd4e>) - Yarn 1.22.5 #### Environment variables @@ -64,15 +63,15 @@ - aria2 1.35.0 - azcopy 10.10.0 - bazel 4.0.0 -- bazelisk 1.7.5 +- bazelisk 1.8.0 - bsdtar 3.3.2 - available by 'tar' alias - Curl 7.76.1 - Git LFS: 2.13.3 - Git: 2.31.1 -- GitHub CLI: 1.9.1 +- GitHub CLI: 1.9.2 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.1 -- gpg (GnuPG) 2.2.27 +- gpg (GnuPG) 2.3.1 - helm v3.5.4+g1b5edb6 - Hub CLI: 2.14.2 - jq 1.6 @@ -90,8 +89,8 @@ ### Tools - Aliyun CLI 3.0.73 - App Center CLI 2.9.0 -- AWS CLI 2.1.38 -- AWS SAM CLI 1.22.0 +- AWS CLI 2.1.39 +- AWS SAM CLI 1.23.0 - AWS Session Manager CLI 1.2.54.0 - Azure CLI 2.22.1 - Cabal 3.4.0.0 @@ -100,7 +99,7 @@ - GHC 9.0.1 - GHCup v0.1.14.1 - Stack 2.5.1 -- SwiftFormat 0.47.13 +- SwiftFormat 0.48.0 - Xcode Command Line Tools 12.4.0.0.1.1610135815 ### Linters @@ -112,8 +111,8 @@ - SafariDriver 14.0.3 (16610.4.3.1.7) - Google Chrome 90.0.4430.85 - ChromeDriver 90.0.4430.24 -- Microsoft Edge 90.0.818.41 -- MSEdgeDriver 90.0.818.42 +- Microsoft Edge 90.0.818.42 +- MSEdgeDriver 90.0.818.46 - Mozilla Firefox 88.0 - geckodriver 0.29.1 @@ -125,10 +124,10 @@ | GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | ### Java -| Version | Vendor | Environment Variable | -| --------- | ------------- | -------------------- | -| 8.0.282+8 | Adopt OpenJDK | JAVA_HOME_8_X64 | -| 11.0.10+9 | Adopt OpenJDK | JAVA_HOME_11_X64 | +| Version | Vendor | Environment Variable | +| ---------- | ------------- | -------------------- | +| 8.0.292+10 | Adopt OpenJDK | JAVA_HOME_8_X64 | +| 11.0.11+9 | Adopt OpenJDK | JAVA_HOME_11_X64 | ### Cached Tools #### Ruby @@ -161,7 +160,7 @@ #### Packages - Bindgen 0.58.1 - Cargo-audit 0.14.0 -- Cargo-outdated v0.9.14 +- Cargo-outdated v0.9.15 - Cbindgen 0.19.0 - Clippy 0.1.51 - Rustfmt 1.4.36-stable @@ -185,7 +184,7 @@ ### Xamarin #### Visual Studio for Mac -- 8.9.6.6 +- 8.9.7.8 #### Xamarin bundles | symlink | Xamarin.Mono | Xamarin.iOS | Xamarin.Mac | Xamarin.Android | @@ -274,9 +273,9 @@ | Package Name | Version | | -------------------------- | ------------------------------------------------------------------------------------------------------------------------ | | Android Command Line Tools | 3.0 | -| Android Emulator | 30.5.4 | +| Android Emulator | 30.5.5 | | Android SDK Build-tools | 30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3 | -| Android SDK Platforms | android-S (rev 2)
android-30 (rev 3)
android-29 (rev 5)
android-28 (rev 6)
android-27 (rev 3) | +| Android SDK Platforms | android-S (rev 3)
android-30 (rev 3)
android-29 (rev 5)
android-28 (rev 6)
android-27 (rev 3) | | Android SDK Platform-Tools | 31.0.2 | | Android SDK Tools | 26.1.1 | | Android Support Repository | 47.0.0 | From 08dd8f3a6aca4ced2b7315b316f2e052e40af105 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Isma=C3=ABl=20Mej=C3=ADa?= Date: Mon, 26 Apr 2021 13:48:47 +0200 Subject: [PATCH 0195/3485] [all os] Updated maven from 3.6.3 to 3.8.1 (#3247) --- images/linux/scripts/installers/java-tools.sh | 4 ++-- images/win/scripts/Installers/Install-JavaTools.ps1 | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/images/linux/scripts/installers/java-tools.sh b/images/linux/scripts/installers/java-tools.sh index a5df5182d0c5..94c3252dfc78 100644 --- a/images/linux/scripts/installers/java-tools.sh +++ b/images/linux/scripts/installers/java-tools.sh @@ -62,10 +62,10 @@ apt-fast install -y --no-install-recommends ant ant-optional echo "ANT_HOME=/usr/share/ant" | tee -a /etc/environment # Install Maven -curl -sL https://www-eu.apache.org/dist/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.zip -o maven.zip +curl -sL https://www-eu.apache.org/dist/maven/maven-3/3.8.1/binaries/apache-maven-3.8.1-bin.zip -o maven.zip unzip -qq -d /usr/share maven.zip rm maven.zip -ln -s /usr/share/apache-maven-3.6.3/bin/mvn /usr/bin/mvn +ln -s /usr/share/apache-maven-3.8.1/bin/mvn /usr/bin/mvn # Install Gradle # This script downloads the latest HTML list of releases at https://gradle.org/releases/. diff --git a/images/win/scripts/Installers/Install-JavaTools.ps1 b/images/win/scripts/Installers/Install-JavaTools.ps1 index 085be394c59c..f0f6f1b8990a 100644 --- a/images/win/scripts/Installers/Install-JavaTools.ps1 +++ b/images/win/scripts/Installers/Install-JavaTools.ps1 @@ -105,7 +105,7 @@ foreach ($jdkVersion in $jdkVersions) { # Install Java tools # Force chocolatey to ignore dependencies on Ant and Maven or else they will download the Oracle JDK Choco-Install -PackageName ant -ArgumentList "-i" -Choco-Install -PackageName maven -ArgumentList "-i", "--version=3.6.3" +Choco-Install -PackageName maven -ArgumentList "-i", "--version=3.8.1" Choco-Install -PackageName gradle # Move maven variables to Machine. They may not be in the environment for this script so we need to read them from the registry. From cc0c9ba63b95b18a4e51b40148e260c541c4f485 Mon Sep 17 00:00:00 2001 From: AHuusom Date: Tue, 27 Apr 2021 10:37:12 +0200 Subject: [PATCH 0196/3485] [windows] Fixed version checking (#3219) --- images/win/scripts/Installers/Install-Haskell.ps1 | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/images/win/scripts/Installers/Install-Haskell.ps1 b/images/win/scripts/Installers/Install-Haskell.ps1 index e34d930b2541..6a70d4526398 100644 --- a/images/win/scripts/Installers/Install-Haskell.ps1 +++ b/images/win/scripts/Installers/Install-Haskell.ps1 @@ -4,15 +4,15 @@ ################################################################################ # Get 3 latest versions of GHC -[Version[]] $ChocoVersionsOutput = & choco search ghc --allversions | Where-Object { $_.StartsWith("ghc ") -and $_ -match "Approved"} | ForEach-Object { [regex]::matches($_, "\d+(\.\d+){2,}").value } -$MajorMinorGroups = $ChocoVersionsOutput | Sort-Object -Descending | Group-Object { $_.ToString(2) } | Select-Object -First 3 +[Version[]] $ChocoVersionsOutput = & choco search ghc --allversions | Where-Object { $_.StartsWith('ghc ') -and $_ -match 'Approved' } | ForEach-Object { [regex]::matches($_, '\d+(\.\d+){2,}').value } +$MajorMinorGroups = $ChocoVersionsOutput | Group-Object { $_.ToString(2) } | Sort-Object Name -Descending | Select-Object -First 3 $VersionsList = $MajorMinorGroups | ForEach-Object { $_.Group | Select-Object -First 1 } | Sort-Object # The latest version will be installed as a default ForEach ($version in $VersionsList) { Write-Host "Installing ghc $version..." - Choco-Install -PackageName ghc -ArgumentList "--version", $version, "-m" + Choco-Install -PackageName ghc -ArgumentList '--version', $version, '-m' } # Add default version of GHC to path, because choco formula updates path on user level @@ -20,14 +20,14 @@ $DefaultGhcVersion = $VersionsList | Select-Object -Last 1 $DefaultGhcShortVersion = ([version]$DefaultGhcVersion).ToString(3) $DefaultGhcPath = Join-Path $env:ChocolateyInstall "lib\ghc.$DefaultGhcVersion\tools\ghc-$DefaultGhcShortVersion\bin" # Starting from version 9 haskell installation directory is $env:ChocolateyToolsLocation instead of $env:ChocolateyInstall\lib -if ($ghcVersion -notmatch "^[0-8]\.\d+.*") +if ($DefaultGhcShortVersion -notmatch '^[0-8]\.\d+.*') { $DefaultGhcPath = Join-Path $env:ChocolateyToolsLocation "ghc-$DefaultGhcShortVersion\bin" } Add-MachinePathItem -PathItem $DefaultGhcPath -Write-Host "Installing cabal..." +Write-Host 'Installing cabal...' Choco-Install -PackageName cabal -Invoke-PesterTests -TestFile "Haskell" +Invoke-PesterTests -TestFile 'Haskell' From 1547af6c5d3410c11b2f074ce4754f90607333a7 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 27 Apr 2021 12:46:39 +0000 Subject: [PATCH 0197/3485] Updating readme file for macOS-10.15 version 20210423.1 (#3265) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/macos/macos-10.15-Readme.md | 50 +++++++++++++++--------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/images/macos/macos-10.15-Readme.md b/images/macos/macos-10.15-Readme.md index c201cddf07b2..63ddb3596b76 100644 --- a/images/macos/macos-10.15-Readme.md +++ b/images/macos/macos-10.15-Readme.md @@ -1,18 +1,17 @@ | Announcements | |-| -| [[macOS] Az modules will be upgraded from 4.8.0 to 5.7.0 on April, 12](https://github.com/actions/virtual-environments/issues/3129) | | [macOS 11.0 pools will be transited to private preview.](https://github.com/actions/virtual-environments/issues/2486) | *** # macOS 10.15 info - System Version: macOS 10.15.7 (19H524) - Kernel Version: Darwin 19.6.0 -- Image Version: 20210419.2 +- Image Version: 20210423.1 ## Installed Software ### Language and Runtime - .NET SDK 2.1.300 2.1.301 2.1.302 2.1.401 2.1.402 2.1.403 2.1.500 2.1.502 2.1.503 2.1.504 2.1.505 2.1.506 2.1.507 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 2.1.811 2.1.812 2.1.813 2.1.814 2.1.815 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 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 3.1.408 5.0.100 5.0.101 5.0.102 5.0.200 5.0.201 5.0.202 - Bash 3.2.57(1)-release -- Clang/LLVM 11.1.0 is available on `'$(brew --prefix llvm)/bin/clang'` +- Clang/LLVM 12.0.0 is available on `'$(brew --prefix llvm)/bin/clang'` - Clang/LLVM 12.0.0 is default - gcc-10 (Homebrew GCC 10.2.0_4) 10.2.0 - available by `gcc-10` alias - gcc-8 (Homebrew GCC 8.4.0_3) 8.4.0 - available by `gcc-8` alias @@ -22,6 +21,7 @@ - GNU Fortran (Homebrew GCC 9.3.0_2) 9.3.0 - available by `gfortran-9` alias - Go 1.15.11 - julia 1.6.0 +- MSBuild 16.6.0.15801 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) - Node.js v14.16.1 - NVM - Cached node versions: v10.24.1 v12.22.1 v14.16.1 - NVM 0.38.0 @@ -37,7 +37,7 @@ - Carthage 0.37.0 - CocoaPods 1.10.1 - Composer 2.0.12 -- Homebrew 3.1.2 +- Homebrew 3.1.3 - Miniconda 4.9.2 - NPM 6.14.12 - NuGet 5.6.0.6489 @@ -45,7 +45,7 @@ - Pip 21.0.1 (python 3.9) - Pipx 0.16.1.0 - RubyGems 3.2.16 -- Vcpkg 2021 (build from master \<414bec0>) +- Vcpkg 2021 (build from master \<6ebcd4e>) - Yarn 1.22.5 #### Environment variables @@ -64,16 +64,16 @@ - aria2 1.35.0 - azcopy 10.10.0 - bazel 4.0.0 -- bazelisk 1.7.5 +- bazelisk 1.8.0 - bsdtar 3.3.2 - available by 'tar' alias - Curl 7.76.1 - Git LFS: 2.13.3 - Git: 2.31.1 -- GitHub CLI: 1.9.1 -- GNU parallel 20210322 +- GitHub CLI: 1.9.2 +- GNU parallel 20210422 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.1 -- gpg (GnuPG) 2.2.27 +- gpg (GnuPG) 2.3.1 - helm v3.5.4+g1b5edb6 - Hub CLI: 2.14.2 - jq 1.6 @@ -86,24 +86,24 @@ - psql (PostgreSQL) 13.2 - Subversion (SVN) 1.14.1 - Vagrant 2.2.15 -- virtualbox 6.1.18r142142 +- virtualbox 6.1.20r143896 - zstd 1.4.9 ### Tools - Aliyun CLI 3.0.73 - App Center CLI 2.9.0 -- AWS CLI 2.1.38 -- AWS SAM CLI 1.22.0 -- AWS Session Manager CLI 1.2.30.0 -- Azure CLI 2.22.0 +- AWS CLI 2.1.39 +- AWS SAM CLI 1.23.0 +- AWS Session Manager CLI 1.2.54.0 +- Azure CLI 2.22.1 - Cabal 3.4.0.0 - Cmake 3.20.1 -- Fastlane 2.180.1 +- Fastlane 2.181.0 - GHC 9.0.1 - GHCup v0.1.14.1 - Stack 2.5.1 -- SwiftFormat 0.47.13 +- SwiftFormat 0.48.0 - Xcode Command Line Tools 12.4.0.0.1.1610135815 ### Linters @@ -113,11 +113,11 @@ ### Browsers - Safari 14.0.3 (15610.4.3.1.7) - SafariDriver 14.0.3 (15610.4.3.1.7) -- Google Chrome 90.0.4430.72 +- Google Chrome 90.0.4430.85 - ChromeDriver 90.0.4430.24 -- Microsoft Edge 90.0.818.41 -- MSEdgeDriver 90.0.818.41 -- Mozilla Firefox 87.0 +- Microsoft Edge 90.0.818.42 +- MSEdgeDriver 90.0.818.46 +- Mozilla Firefox 88.0 - geckodriver 0.29.1 #### Environment variables @@ -130,8 +130,8 @@ ### Java | Version | Vendor | Environment Variable | | ----------- | ------------- | -------------------- | -| 8.0.282+8 | Adopt OpenJDK | JAVA_HOME_8_X64 | -| 11.0.10+9 | Adopt OpenJDK | JAVA_HOME_11_X64 | +| 8.0.292+10 | Adopt OpenJDK | JAVA_HOME_8_X64 | +| 11.0.11+9 | Adopt OpenJDK | JAVA_HOME_11_X64 | | 12.0.2+10.3 | Adopt OpenJDK | JAVA_HOME_12_X64 | | 13.0.2+8.1 | Adopt OpenJDK | JAVA_HOME_13_X64 | | 14.0.2+12 | Adopt OpenJDK | JAVA_HOME_14_X64 | @@ -201,7 +201,7 @@ ### Xamarin #### Visual Studio for Mac -- 8.9.6.6 +- 8.9.7.8 #### Xamarin bundles | symlink | Xamarin.Mono | Xamarin.iOS | Xamarin.Mac | Xamarin.Android | @@ -340,9 +340,9 @@ | Package Name | Version | | -------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 3.0 | -| Android Emulator | 30.5.4 | +| Android Emulator | 30.5.5 | | Android SDK Build-tools | 30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3
26.0.0 26.0.1 26.0.2 26.0.3
25.0.0 25.0.1 25.0.2 25.0.3
24.0.0 24.0.1 24.0.2 24.0.3 | -| Android SDK Platforms | android-S (rev 2)
android-30 (rev 3)
android-29 (rev 5)
android-28 (rev 6)
android-27 (rev 3)
android-26 (rev 2)
android-25 (rev 3)
android-24 (rev 2) | +| Android SDK Platforms | android-S (rev 3)
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 Platform-Tools | 31.0.2 | | Android SDK Tools | 26.1.1 | | Android Support Repository | 47.0.0 | From 34ea1d0440d0c8801081276b279d1b232f009a1b Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Tue, 27 Apr 2021 23:03:17 +0300 Subject: [PATCH 0198/3485] [Windows] Return VS2017 SSDT extensions to the readme (#3270) --- .../win/scripts/ImageHelpers/InstallHelpers.ps1 | 2 +- .../SoftwareReport.VisualStudio.psm1 | 16 +++++++++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/images/win/scripts/ImageHelpers/InstallHelpers.ps1 b/images/win/scripts/ImageHelpers/InstallHelpers.ps1 index ac55d9cf953d..4f15d41e92e3 100644 --- a/images/win/scripts/ImageHelpers/InstallHelpers.ps1 +++ b/images/win/scripts/ImageHelpers/InstallHelpers.ps1 @@ -309,7 +309,7 @@ function Get-VSExtensionVersion if (-not $packageVersion) { - Write-Host "Installed package $packageName for Visual Studio 2019 was not found" + Write-Host "Installed package $packageName for Visual Studio was not found" exit 1 } diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.VisualStudio.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.VisualStudio.psm1 index 576a8e13dfac..3f94b84c497a 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.VisualStudio.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.VisualStudio.psm1 @@ -35,8 +35,21 @@ function Get-VisualStudioExtensions { } } - # Wix + # SSDT extensions for VS2017 $vs = (Get-VisualStudioVersion).Name.Split()[-1] + if ($vs -eq "2017") + { + $analysisPackageVersion = Get-VSExtensionVersion -packageName '04a86fc2-dbd5-4222-848e-911638e487fe' + $reportingPackageVersion = Get-VSExtensionVersion -packageName '717ad572-c4b7-435c-c166-c2969777f718' + $integrationPackageName = Get-VSExtensionVersion -packageName 'd1b09713-c12e-43cc-9ef4-6562298285ab' + $ssdtPackages = @( + @{Package = 'SSDT Microsoft Analysis Services Projects'; Version = $analysisPackageVersion} + @{Package = 'SSDT SQL Server Integration Services Projects'; Version = $reportingPackageVersion} + @{Package = 'SSDT Microsoft Reporting Services Projects'; Version = $integrationPackageName} + ) + } + + # Wix $wixPackageVersion = Get-WixVersion $wixExtensionVersion = (Get-VisualStudioPackages | Where-Object {$_.Id -match 'WixToolset.VisualStudioExtension.Dev' -and $_.type -eq 'vsix'}).Version @@ -46,6 +59,7 @@ function Get-VisualStudioExtensions { $extensions = @( $vsixs + $ssdtPackages @{Package = 'Windows Driver Kit'; Version = $wdkPackageVersion} @{Package = 'Windows Driver Kit Visual Studio Extension'; Version = $wdkExtensionVersion} @{Package = 'WIX Toolset'; Version = $wixPackageVersion} From 6d21bc3d1afae279bebb44ee310b7fb16ae2c85c Mon Sep 17 00:00:00 2001 From: Rob Burger Date: Wed, 28 Apr 2021 09:44:01 +0200 Subject: [PATCH 0199/3485] [Ubuntu] Increase Linux stack space to 16384KB (#3260) * Increase Linux stack space to 16384KB * Add stack hard and soft limits to limits.conf --- images/linux/scripts/base/limits.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/images/linux/scripts/base/limits.sh b/images/linux/scripts/base/limits.sh index 24041bc99548..0a0cc99e0da3 100644 --- a/images/linux/scripts/base/limits.sh +++ b/images/linux/scripts/base/limits.sh @@ -5,3 +5,7 @@ echo '* hard nofile 65536' >> /etc/security/limits.conf echo 'session required pam_limits.so' >> /etc/pam.d/common-session echo 'session required pam_limits.so' >> /etc/pam.d/common-session-noninteractive echo 'DefaultLimitNOFILE=65536' >> /etc/systemd/system.conf + +# Double stack size from default 8192KB +echo '* soft stack 16384' >> /etc/security/limits.conf +echo '* hard stack 16384' >> /etc/security/limits.conf From 552da81d139e62b23aac2381b76bdad4e867af2a Mon Sep 17 00:00:00 2001 From: Sergey Dolin Date: Wed, 28 Apr 2021 16:51:16 +0500 Subject: [PATCH 0200/3485] [ubuntu] Document GHC apt repository (#3268) --- .../linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 | 3 ++- images/linux/scripts/installers/haskell.sh | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 index 9388ded03c4f..96cc4b562555 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 @@ -251,7 +251,8 @@ function Build-PHPTable { function Get-GHCVersion { $(ghc --version) -match "version (?\d+\.\d+\.\d+)" | Out-Null $ghcVersion = $Matches.version - return "GHC $ghcVersion" + $aptSourceRepo = Get-AptSourceRepository -PackageName "ghc" + return "GHC $ghcVersion (apt source repository: $aptSourceRepo)" } function Get-GHCupVersion { diff --git a/images/linux/scripts/installers/haskell.sh b/images/linux/scripts/installers/haskell.sh index 725ab8bc50d9..2ab93c78a2f3 100644 --- a/images/linux/scripts/installers/haskell.sh +++ b/images/linux/scripts/installers/haskell.sh @@ -49,4 +49,8 @@ ln -s "/opt/ghc/$defaultGHCVersion/bin/ghc" "/usr/bin/ghc" # Install the latest stable release of haskell stack curl -sSL https://get.haskellstack.org/ | sh -invoke_tests "Haskell" \ No newline at end of file +# remove PPA repo +echo "ghc ppa:hvr/ghc" >> $HELPER_SCRIPTS/apt-sources.txt +add-apt-repository --remove ppa:hvr/ghc + +invoke_tests "Haskell" From db4a0a42af0a9edc5a9bcdbb0de4256d74f044ff Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 29 Apr 2021 08:59:15 +0000 Subject: [PATCH 0201/3485] Updating readme file for ubuntu20 version 20210425.1 (#3264) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/linux/Ubuntu2004-README.md | 59 ++++++++++++++++--------------- 1 file changed, 30 insertions(+), 29 deletions(-) diff --git a/images/linux/Ubuntu2004-README.md b/images/linux/Ubuntu2004-README.md index bd90767e788e..04206a309f21 100644 --- a/images/linux/Ubuntu2004-README.md +++ b/images/linux/Ubuntu2004-README.md @@ -1,21 +1,22 @@ | Announcements | |-| -| [[windows, ubuntu] Few outdated Docker images will be removed on April, 12](https://github.com/actions/virtual-environments/issues/3111) | +| [[ubuntu] Clang 9 will be removed on May, 17th](https://github.com/actions/virtual-environments/issues/3235) | *** # Ubuntu 20.04.2 LTS - Linux kernel version: 5.4.0-1046-azure -- Image Version: 20210419.1 +- Image Version: 20210425.1 ## Installed Software ### Language and Runtime - Bash 5.0.17(1)-release - Clang 9.0.1, 10.0.0, 11.0.0 - Clang-format 9.0.1, 10.0.0, 11.0.0 -- Erlang 23.2.3 (Eshell 11.1.7) +- Erlang 23.3.1 (Eshell 11.2) - GNU C++ 9.3.0, 10.2.0 - GNU Fortran 9.3.0, 10.2.0 -- Julia 1.6.0 +- Julia 1.6.1 - Mono 6.12.0.122 +- MSBuild 16.6.0.15201 (from /usr/lib/mono/msbuild/15.0/bin/MSBuild.dll) - Node 14.16.1 - Perl 5.30.0 - Python 3.8.5 @@ -26,14 +27,14 @@ ### Package Management - cpan 1.64 - Helm 3.5.4 -- Homebrew 3.1.2 +- Homebrew 3.1.3 - Miniconda 4.9.2 - Npm 6.14.12 - Pip 20.0.2 - Pip3 20.0.2 - Pipx 0.16.1.0 - RubyGems 3.1.2 -- Vcpkg (build from master \<414bec0>) +- Vcpkg (build from master \<6ebcd4e>) - Yarn 1.22.10 #### Environment variables @@ -54,21 +55,21 @@ - apt-fast 1.9.10 - AzCopy 10.10.0 (available by `azcopy` and `azcopy10` aliases) - Bazel 4.0.0 -- Bazelisk 1.7.5 +- Bazelisk 1.8.0 - Buildah 1.20.1 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - CMake 3.20.1 -- CodeQL Action Bundle 2.5.0 +- CodeQL Action Bundle 2.5.2 - Docker Compose 1.29.1 - Docker-Buildx 0.5.1 - Docker-Moby Client 20.10.6+azure - Docker-Moby Server 20.10.6+azure -- Fastlane 2.180.1 +- Fastlane 2.181.0 - Git 2.31.1 (apt source repository: ppa:git-core/ppa) - Git LFS 2.13.3 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.6.0 - Haveged 1.9.1 - Heroku 7.52.0 -- HHVM (HipHop VM) 4.105.0 +- HHVM (HipHop VM) 4.106.0 - jq 1.6 - Kind 0.10.0 - Kubectl 1.20.1-5-g76a04fc @@ -82,8 +83,8 @@ - OpenSSL 1.1.1f 31 Mar 2020 - Packer 1.7.2 - PhantomJS 2.1.1 -- Podman 3.1.0 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- Pulumi 2.25.2 +- Podman 3.1.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) +- Pulumi 3.1.0 - R 4.0.5 - Skopeo 1.2.3 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 @@ -94,18 +95,18 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.73 -- AWS CLI 2.1.38 +- AWS CLI 2.1.39 - AWS CLI Session manager plugin 1.2.54.0 -- AWS SAM CLI 1.22.0 -- Azure CLI (azure-cli) 2.22.0 +- AWS SAM CLI 1.23.0 +- Azure CLI (azure-cli) 2.22.1 - Azure CLI (azure-devops) 0.18.0 -- GitHub CLI 1.9.1 -- Google Cloud SDK 336.0.0 (apt source repository: https://packages.cloud.google.com/apt) +- GitHub CLI 1.9.2 +- Google Cloud SDK 337.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 3.18.3 -- OpenShift CLI 4.7.6 +- Netlify CLI 3.21.9 +- OpenShift CLI 4.7.7 - ORAS CLI 0.11.1 -- Vercel CLI 21.3.3 +- Vercel CLI 22.0.1 ### Java | Version | Vendor | Environment Variable | @@ -114,9 +115,9 @@ | 11.0.10+9 (default) | Adopt OpenJDK | JAVA_HOME_11_X64 | ### GraalVM -| Version | Environment variables | -| ----------- | --------------------- | -| CE 21.0.0.2 | GRAALVM_11_ROOT | +| Version | Environment variables | +| --------- | --------------------- | +| CE 21.1.0 | GRAALVM_11_ROOT | ### PHP | Tool | Version | @@ -141,12 +142,12 @@ - Bindgen 0.58.1 - Cargo audit 0.14.0 - Cargo clippy 0.1.51 -- Cargo outdated 0.9.14 +- Cargo outdated 0.9.15 - Cbindgen 0.19.0 - Rustfmt 1.4.36 ### Browsers and Drivers -- Google Chrome 90.0.4430.72 +- Google Chrome 90.0.4430.85 - ChromeDriver 90.0.4430.24 - Mozilla Firefox 87.0 - Geckodriver 0.29.1 @@ -239,7 +240,7 @@ | Android Command Line Tools | 3.0 | | Android SDK Build-tools | 30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3 | | Android SDK Platform-Tools | 31.0.2 | -| Android SDK Platforms | android-S (rev 2)
android-30 (rev 3)
android-29 (rev 5)
android-28 (rev 6)
android-27 (rev 3) | +| Android SDK Platforms | android-S (rev 3)
android-30 (rev 3)
android-29 (rev 5)
android-28 (rev 6)
android-27 (rev 3) | | Android SDK Tools | 26.1.1 | | Android Support Repository | 47.0.0 | | CMake | 3.10.2 | @@ -273,9 +274,9 @@ | node:12-alpine | sha256:9923c9efb13cf7535f67e49b03010f0977a800068e4c8e0e2c93433a6bfa1e77 | 2021-04-14 | | node:14 | sha256:8eb45f4677c813ad08cef8522254640aa6a1800e75a9c213a0a651f6f3564189 | 2021-04-10 | | node:14-alpine | sha256:ed51af876dd7932ce5c1e3b16c2e83a3f58419d824e366de1f7b00f40c848c40 | 2021-04-14 | -| ubuntu:16.04 | sha256:bb84bbf2ff36d46acaf0bb0c6bcb33dae64cd93cba8652d74c9aaf438fada438 | 2021-03-25 | -| ubuntu:18.04 | sha256:122f506735a26c0a1aff2363335412cfc4f84de38326356d31ee00c2cbe52171 | 2021-03-25 | -| ubuntu:20.04 | sha256:3c9c713e0979e9bd6061ed52ac1e9e1f246c9495aa063619d9d695fb8039aa1f | 2021-04-03 | +| ubuntu:16.04 | sha256:eed7e1076bbc1f342c4474c718e5438af4784f59a4e88ad687dbb98483b59ee4 | 2021-04-23 | +| ubuntu:18.04 | sha256:538529c9d229fb55f50e6746b119e899775205d62c0fc1b7e679b30d02ecb6e8 | 2021-04-23 | +| ubuntu:20.04 | sha256:cf31af331f38d1d7158470e095b132acd126a7180a54f263d386da88eb681d93 | 2021-04-23 | ### Installed apt packages | Name | Version | From 4fbbc19bf80660fa89f21ff3fe4bc0b8f199ef21 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 29 Apr 2021 09:01:40 +0000 Subject: [PATCH 0202/3485] Updating readme file for ubuntu18 version 20210425.1 (#3263) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/linux/Ubuntu1804-README.md | 49 ++++++++++++++++--------------- 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/images/linux/Ubuntu1804-README.md b/images/linux/Ubuntu1804-README.md index c96ed67d3146..cb1568d957ad 100644 --- a/images/linux/Ubuntu1804-README.md +++ b/images/linux/Ubuntu1804-README.md @@ -1,21 +1,22 @@ | Announcements | |-| -| [[windows, ubuntu] Few outdated Docker images will be removed on April, 12](https://github.com/actions/virtual-environments/issues/3111) | +| [[ubuntu] Clang 9 will be removed on May, 17th](https://github.com/actions/virtual-environments/issues/3235) | *** # Ubuntu 18.04.5 LTS - Linux kernel version: 5.4.0-1046-azure -- Image Version: 20210419.1 +- Image Version: 20210425.1 ## Installed Software ### Language and Runtime - Bash 4.4.20(1)-release - Clang 9.0.0 - Clang-format 9.0.0 -- Erlang 23.2.3 (Eshell 11.1.7) +- Erlang 23.3.1 (Eshell 11.2) - GNU C++ 7.5.0, 9.3.0, 10.3.0 - GNU Fortran 7.5.0, 9.3.0, 10.3.0 -- Julia 1.6.0 +- Julia 1.6.1 - Mono 6.12.0.122 +- MSBuild 16.6.0.15201 (from /usr/lib/mono/msbuild/15.0/bin/MSBuild.dll) - Node 14.16.1 - Perl 5.26.1 - Python 2.7.17 @@ -26,14 +27,14 @@ ### Package Management - cpan 1.64 - Helm 3.5.4 -- Homebrew 3.1.2 +- Homebrew 3.1.3 - Miniconda 4.9.2 - Npm 6.14.12 - Pip 9.0.1 - Pip3 9.0.1 - Pipx 0.16.1.0 - RubyGems 2.7.6 -- Vcpkg (build from master \<414bec0>) +- Vcpkg (build from master \<6ebcd4e>) - Yarn 1.22.10 #### Environment variables @@ -53,10 +54,10 @@ - apt-fast 1.9.10 - AzCopy 10.10.0 (available by `azcopy` and `azcopy10` aliases) - Bazel 4.0.0 -- Bazelisk 1.7.5 +- Bazelisk 1.8.0 - Buildah 1.19.6 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - CMake 3.20.1 -- CodeQL Action Bundle 2.5.0 +- CodeQL Action Bundle 2.5.2 - Docker Compose 1.29.1 - Docker-Buildx 0.5.1 - Docker-Moby Client 20.10.6+azure @@ -66,7 +67,7 @@ - Git-ftp 1.3.1 - Haveged 1.9.1 - Heroku 7.52.0 -- HHVM (HipHop VM) 4.105.0 +- HHVM (HipHop VM) 4.106.0 - jq 1.5 - Kind 0.10.0 - Kubectl 1.20.1-5-g76a04fc @@ -81,7 +82,7 @@ - Packer 1.7.2 - PhantomJS 2.1.1 - Podman 3.0.1 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- Pulumi 2.25.2 +- Pulumi 3.1.0 - R 4.0.5 - Skopeo 1.2.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 @@ -92,18 +93,18 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.73 -- AWS CLI 1.19.53 +- AWS CLI 1.19.57 - AWS CLI Session manager plugin 1.2.54.0 -- AWS SAM CLI 1.22.0 -- Azure CLI (azure-cli) 2.22.0 +- AWS SAM CLI 1.23.0 +- Azure CLI (azure-cli) 2.22.1 - Azure CLI (azure-devops) 0.18.0 -- GitHub CLI 1.9.1 -- Google Cloud SDK 336.0.0 (apt source repository: https://packages.cloud.google.com/apt) +- GitHub CLI 1.9.2 +- Google Cloud SDK 337.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 3.18.3 -- OpenShift CLI 4.7.6 +- Netlify CLI 3.21.9 +- OpenShift CLI 4.7.7 - ORAS CLI 0.11.1 -- Vercel CLI 21.3.3 +- Vercel CLI 22.0.1 ### Java | Version | Vendor | Environment Variable | @@ -135,12 +136,12 @@ - Bindgen 0.58.1 - Cargo audit 0.14.0 - Cargo clippy 0.1.51 -- Cargo outdated 0.9.14 +- Cargo outdated 0.9.15 - Cbindgen 0.19.0 - Rustfmt 1.4.36 ### Browsers and Drivers -- Google Chrome 90.0.4430.72 +- Google Chrome 90.0.4430.85 - ChromeDriver 90.0.4430.24 - Mozilla Firefox 87.0 - Geckodriver 0.29.1 @@ -231,7 +232,7 @@ | Android Command Line Tools | 3.0 | | Android SDK Build-tools | 30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3
26.0.0 26.0.1 26.0.2 26.0.3
25.0.0 25.0.1 25.0.2 25.0.3
24.0.0 24.0.1 24.0.2 24.0.3
23.0.1 23.0.2 23.0.3 | | Android SDK Platform-Tools | 31.0.2 | -| Android SDK Platforms | android-S (rev 2)
android-30 (rev 3)
android-29 (rev 5)
android-28 (rev 6)
android-27 (rev 3)
android-26 (rev 2)
android-25 (rev 3)
android-24 (rev 2)
android-23 (rev 3) | +| Android SDK Platforms | android-S (rev 3)
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 SDK Tools | 26.1.1 | | Android Support Repository | 47.0.0 | | CMake | 3.10.2 | @@ -265,9 +266,9 @@ | node:12-alpine | sha256:9923c9efb13cf7535f67e49b03010f0977a800068e4c8e0e2c93433a6bfa1e77 | 2021-04-14 | | node:14 | sha256:8eb45f4677c813ad08cef8522254640aa6a1800e75a9c213a0a651f6f3564189 | 2021-04-10 | | node:14-alpine | sha256:ed51af876dd7932ce5c1e3b16c2e83a3f58419d824e366de1f7b00f40c848c40 | 2021-04-14 | -| ubuntu:16.04 | sha256:bb84bbf2ff36d46acaf0bb0c6bcb33dae64cd93cba8652d74c9aaf438fada438 | 2021-03-25 | -| ubuntu:18.04 | sha256:122f506735a26c0a1aff2363335412cfc4f84de38326356d31ee00c2cbe52171 | 2021-03-25 | -| ubuntu:20.04 | sha256:3c9c713e0979e9bd6061ed52ac1e9e1f246c9495aa063619d9d695fb8039aa1f | 2021-04-03 | +| ubuntu:16.04 | sha256:eed7e1076bbc1f342c4474c718e5438af4784f59a4e88ad687dbb98483b59ee4 | 2021-04-23 | +| ubuntu:18.04 | sha256:538529c9d229fb55f50e6746b119e899775205d62c0fc1b7e679b30d02ecb6e8 | 2021-04-23 | +| ubuntu:20.04 | sha256:cf31af331f38d1d7158470e095b132acd126a7180a54f263d386da88eb681d93 | 2021-04-23 | ### Installed apt packages | Name | Version | From d22dbe71122687b4b441d08571c63ef5a8dbffde Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 29 Apr 2021 12:46:42 +0000 Subject: [PATCH 0203/3485] Updating readme file for win16 version 20210425.1 (#3266) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/win/Windows2016-Readme.md | 82 ++++++++++++++------------------ 1 file changed, 37 insertions(+), 45 deletions(-) diff --git a/images/win/Windows2016-Readme.md b/images/win/Windows2016-Readme.md index a310e7d2b6a0..210951380d00 100644 --- a/images/win/Windows2016-Readme.md +++ b/images/win/Windows2016-Readme.md @@ -1,33 +1,29 @@ -| Announcements | -|-| -| [[windows, ubuntu] Few outdated Docker images will be removed on April, 12](https://github.com/actions/virtual-environments/issues/3111) | -*** # Microsoft Windows Server 2016 Datacenter - OS Version: 10.0.14393 Build 4350 -- Image Version: 20210419.1 +- Image Version: 20210425.1 ## Installed Software ### Language and Runtime - Bash 4.4.23(1)-release - Go 1.15.11 -- Julia 1.6.0 +- Julia 1.6.1 - Node 14.16.1 - Perl 5.32.1 - PHP 8.0.3 - Python 3.7.9 -- Ruby 2.5.8p224 +- Ruby 2.5.9p229 ### Package Management - Chocolatey 0.10.15 - Composer 2.0.12 -- Helm 3.5.3 +- Helm 3.5.4 - Miniconda 4.9.2 - NPM 6.14.12 - NuGet 5.9.1.11 -- pip 21.0.1 (python 3.7) +- pip 21.1 (python 3.7) - Pipx 0.16.1.0 -- RubyGems 2.7.6.2 -- Vcpkg (build from master \<414bec0>) +- RubyGems 2.7.6.3 +- Vcpkg (build from master \<84e5852>) - Yarn 1.22.10 #### Environment variables @@ -46,16 +42,16 @@ - 7zip 19.00 - azcopy 10.10.0 - Bazel 4.0.0 -- Bazelisk 1.7.5 +- Bazelisk 1.8.0 - Cabal 3.4.0.0 - CMake 3.20.1 -- CodeQL Action Bundle 2.5.0 +- CodeQL Action Bundle 2.5.2 - Docker 20.10.4 - Docker-compose 1.29.1 - ghc 9.0.1 - Git 2.31.1 - Git LFS 2.13.3 -- Google Cloud SDK 336.0.0 +- Google Cloud SDK 337.0.0 - InnoSetup 6.1.2 - jq 1.6 - Kind 0.10.0 @@ -66,7 +62,7 @@ - NSIS v3.06.1 - OpenSSL 1.1.1 - Packer 1.7.2 -- Pulumi v2.25.2 +- Pulumi v3.1.0 - R 4.0.5 - Stack 2.5.1 - Subversion (SVN) 1.14.1 @@ -78,13 +74,13 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.73 - AWS CLI 2.1.38 -- AWS SAM CLI 1.22.0 +- AWS SAM CLI 1.23.0 - AWS Session Manager CLI 1.2.54.0 -- Azure CLI 2.22.0 -- Azure Dev Spaces CLI 1.0.20201219.2 +- Azure CLI 2.22.1 +- Azure Dev Spaces CLI 1.0.20210421.4 - Azure DevOps CLI extension 0.18.0 - Cloud Foundry CLI 6.53.0 -- GitHub CLI 1.9.1 +- GitHub CLI 1.9.2 - Hub CLI 2.14.2 ### Rust Tools @@ -96,17 +92,17 @@ #### Packages - bindgen 0.58.1 - cargo-audit 0.14.0 -- cargo-outdated v0.9.14 +- cargo-outdated v0.9.15 - cbindgen 0.19.0 - Clippy 0.1.51 - Rustfmt 1.4.36 ### Browsers and webdrivers -- Google Chrome 90.0.4430.72 +- Google Chrome 90.0.4430.85 - Chrome Driver 90.0.4430.24 -- Microsoft Edge 90.0.818.41 -- Microsoft Edge Driver 90.0.818.41 -- Mozilla Firefox 87.0 +- Microsoft Edge 90.0.818.46 +- Microsoft Edge Driver 90.0.818.46 +- Mozilla Firefox 88.0 - Gecko Driver 0.29.1 - IE Driver 3.150.1.0 @@ -118,11 +114,11 @@ | GECKOWEBDRIVER | C:\SeleniumWebDrivers\GeckoDriver | ### Java -| Version | Vendor | Environment Variable | -| ------------------- | ------------- | -------------------- | -| 8.0.282+8 (default) | Adopt OpenJDK | JAVA_HOME_8_X64 | -| 11.0.10+9 | Adopt OpenJDK | JAVA_HOME_11_X64 | -| 13.0.2+8.1 | Adopt OpenJDK | JAVA_HOME_13_X64 | +| Version | Vendor | Environment Variable | +| -------------------- | ------------- | -------------------- | +| 8.0.292+10 (default) | Adopt OpenJDK | JAVA_HOME_8_X64 | +| 11.0.11+9 | Adopt OpenJDK | JAVA_HOME_11_X64 | +| 13.0.2+8.1 | Adopt OpenJDK | JAVA_HOME_13_X64 | ### Shells | Name | Target | @@ -171,18 +167,18 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Version | Architecture | | ------- | ------------ | | 2.4.10 | x64 | -| 2.5.8 (Default) | x64 | -| 2.6.6 | x64 | -| 2.7.2 | x64 | -| 3.0.0 | x64 | +| 2.5.9 (Default) | x64 | +| 2.6.7 | x64 | +| 2.7.3 | x64 | +| 3.0.1 | x64 | #### PyPy -| Python Version | Architecture | PyPy Version | -| -------------- | ------------ | ------------ | -| 2.7.18 | x86 | PyPy 7.3.3 with MSC v.1927 32 bit | -| 3.6.12 | x86 | PyPy 7.3.3 with MSC v.1927 32 bit | -| 3.7.9 | x86 | PyPy 7.3.3-beta0 with MSC v.1927 32 bit | +| Python Version | PyPy Version | +| -------------- | ------------ | +| 2.7.18 | PyPy 7.3.4 with MSC v.1927 64 bit (AMD64) | +| 3.6.12 | PyPy 7.3.3 with MSC v.1927 32 bit | +| 3.7.10 | PyPy 7.3.4 with MSC v.1927 64 bit (AMD64) | @@ -208,7 +204,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Database tools -- Azure CosmosDb Emulator 2.11.11.0 +- Azure CosmosDb Emulator 2.11.13.0 - DacFx 15.0.4897.1 - MySQL 5.7.21.0 - SQLPS 1.0 @@ -463,10 +459,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Workload.Universal | 15.9.28307.1439 | | Microsoft.VisualStudio.Workload.VisualStudioExtension | 15.7.27625.0 | | Microsoft.VisualStudio.Workload.WebCrossPlat | 15.9.28307.341 | -| SSDT Microsoft Analysis Services Projects | 2.9.6 | -| SSDT SQL Server Integration Services Projects | 2.6 | -| SSDT Microsoft Reporting Services Projects | 2.6.3 | -| Windows Driver Kit | 3.11.4516 | +| Windows Driver Kit | 10.0.17740.0 | | Windows Driver Kit Visual Studio Extension | 10.1.17763.1 | | WIX Toolset | 3.11.4516 | | WIX Toolset Studio 2017 Extension | 0.9.21.62588 | @@ -543,7 +536,7 @@ All other versions are saved but not installed. | -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 3.0 | | Android SDK Build-tools | 30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3
26.0.0 26.0.1 26.0.2 26.0.3
25.0.0 25.0.1 25.0.2 25.0.3
24.0.0 24.0.1 24.0.2 24.0.3
23.0.1 23.0.2 23.0.3
22.0.1
21.1.2
20.0.0
19.1.0 | -| Android SDK Platforms | android-S (rev 2)
android-30 (rev 3)
android-29 (rev 5)
android-28 (rev 6)
android-27 (rev 3)
android-26 (rev 2)
android-25 (rev 3)
android-24 (rev 2)
android-23 (rev 3)
android-22 (rev 2)
android-21 (rev 2)
android-20 (rev 2)
android-19 (rev 4) | +| Android SDK Platforms | android-S (rev 3)
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 Platform-Tools | 31.0.2 | | Android SDK Tools | 25.2.5 | | Android Support Repository | 47.0.0 | @@ -574,4 +567,3 @@ All other versions are saved but not installed. | mcr.microsoft.com/windows/servercore:ltsc2016 | sha256:4fbb0b699320a37ad904f31aff8bf1858e89b6c93b4d517b58d9516e3df9c24b | 2021-04-07 | - From 4a134cd3e505e0f971b2a1f73b3bac036b4472d3 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 29 Apr 2021 13:02:29 +0000 Subject: [PATCH 0204/3485] Updating readme file for win19 version 20210425.1 (#3267) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/win/Windows2019-Readme.md | 87 +++++++++++++++----------------- 1 file changed, 42 insertions(+), 45 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index 1041ab684bcf..9f258b6af230 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -1,10 +1,6 @@ -| Announcements | -|-| -| [[windows, ubuntu] Few outdated Docker images will be removed on April, 12](https://github.com/actions/virtual-environments/issues/3111) | -*** # Microsoft Windows Server 2019 Datacenter - OS Version: 10.0.17763 Build 1879 -- Image Version: 20210419.1 +- Image Version: 20210425.1 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -13,24 +9,24 @@ ### Language and Runtime - Bash 4.4.23(1)-release - Go 1.15.11 -- Julia 1.6.0 +- Julia 1.6.1 - Node 14.16.1 - Perl 5.32.1 - PHP 8.0.3 - Python 3.7.9 -- Ruby 2.5.8p224 +- Ruby 2.5.9p229 ### Package Management - Chocolatey 0.10.15 - Composer 2.0.12 -- Helm 3.5.3 +- Helm 3.5.4 - Miniconda 4.9.2 - NPM 6.14.12 - NuGet 5.9.1.11 -- pip 21.0.1 (python 3.7) +- pip 21.1 (python 3.7) - Pipx 0.16.1.0 -- RubyGems 2.7.6.2 -- Vcpkg (build from master \<414bec0>) +- RubyGems 2.7.6.3 +- Vcpkg (build from master \<84e5852>) - Yarn 1.22.10 #### Environment variables @@ -49,16 +45,16 @@ - 7zip 19.00 - azcopy 10.10.0 - Bazel 4.0.0 -- Bazelisk 1.7.5 +- Bazelisk 1.8.0 - Cabal 3.4.0.0 - CMake 3.20.1 -- CodeQL Action Bundle 2.5.0 +- CodeQL Action Bundle 2.5.2 - Docker 20.10.4 - Docker-compose 1.29.1 - ghc 9.0.1 - Git 2.31.1 - Git LFS 2.13.3 -- Google Cloud SDK 336.0.0 +- Google Cloud SDK 337.0.0 - InnoSetup 6.1.2 - jq 1.6 - Kind 0.10.0 @@ -69,7 +65,7 @@ - NSIS v3.06.1 - OpenSSL 1.1.1 - Packer 1.7.2 -- Pulumi v2.25.2 +- Pulumi v3.1.0 - R 4.0.5 - Stack 2.5.1 - Subversion (SVN) 1.14.1 @@ -81,13 +77,13 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.73 - AWS CLI 2.1.38 -- AWS SAM CLI 1.22.0 +- AWS SAM CLI 1.23.0 - AWS Session Manager CLI 1.2.54.0 -- Azure CLI 2.22.0 -- Azure Dev Spaces CLI 1.0.20201219.2 +- Azure CLI 2.22.1 +- Azure Dev Spaces CLI 1.0.20210421.4 - Azure DevOps CLI extension 0.18.0 - Cloud Foundry CLI 6.53.0 -- GitHub CLI 1.9.1 +- GitHub CLI 1.9.2 - Hub CLI 2.14.2 ### Rust Tools @@ -99,17 +95,17 @@ #### Packages - bindgen 0.58.1 - cargo-audit 0.14.0 -- cargo-outdated v0.9.14 +- cargo-outdated v0.9.15 - cbindgen 0.19.0 - Clippy 0.1.51 - Rustfmt 1.4.36 ### Browsers and webdrivers -- Google Chrome 90.0.4430.72 +- Google Chrome 90.0.4430.85 - Chrome Driver 90.0.4430.24 -- Microsoft Edge 90.0.818.41 -- Microsoft Edge Driver 90.0.818.41 -- Mozilla Firefox 87.0 +- Microsoft Edge 90.0.818.46 +- Microsoft Edge Driver 90.0.818.46 +- Mozilla Firefox 88.0 - Gecko Driver 0.29.1 - IE Driver 3.150.1.0 @@ -121,11 +117,11 @@ | GECKOWEBDRIVER | C:\SeleniumWebDrivers\GeckoDriver | ### Java -| Version | Vendor | Environment Variable | -| ------------------- | ------------- | -------------------- | -| 8.0.282+8 (default) | Adopt OpenJDK | JAVA_HOME_8_X64 | -| 11.0.10+9 | Adopt OpenJDK | JAVA_HOME_11_X64 | -| 13.0.2+8.1 | Adopt OpenJDK | JAVA_HOME_13_X64 | +| Version | Vendor | Environment Variable | +| -------------------- | ------------- | -------------------- | +| 8.0.292+10 (default) | Adopt OpenJDK | JAVA_HOME_8_X64 | +| 11.0.11+9 | Adopt OpenJDK | JAVA_HOME_11_X64 | +| 13.0.2+8.1 | Adopt OpenJDK | JAVA_HOME_13_X64 | ### Shells | Name | Target | @@ -177,18 +173,18 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Version | Architecture | | ------- | ------------ | | 2.4.10 | x64 | -| 2.5.8 (Default) | x64 | -| 2.6.6 | x64 | -| 2.7.2 | x64 | -| 3.0.0 | x64 | +| 2.5.9 (Default) | x64 | +| 2.6.7 | x64 | +| 2.7.3 | x64 | +| 3.0.1 | x64 | #### PyPy -| Python Version | Architecture | PyPy Version | -| -------------- | ------------ | ------------ | -| 2.7.18 | x86 | PyPy 7.3.3 with MSC v.1927 32 bit | -| 3.6.12 | x86 | PyPy 7.3.3 with MSC v.1927 32 bit | -| 3.7.9 | x86 | PyPy 7.3.3-beta0 with MSC v.1927 32 bit | +| Python Version | PyPy Version | +| -------------- | ------------ | +| 2.7.18 | PyPy 7.3.4 with MSC v.1927 64 bit (AMD64) | +| 3.6.12 | PyPy 7.3.3 with MSC v.1927 32 bit | +| 3.7.10 | PyPy 7.3.4 with MSC v.1927 64 bit (AMD64) | @@ -214,7 +210,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Database tools -- Azure CosmosDb Emulator 2.11.11.0 +- Azure CosmosDb Emulator 2.11.13.0 - DacFx 15.0.4897.1 - MySQL 5.7.21.0 - SQLPS 1.0 @@ -453,10 +449,12 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Workload.Python | 16.9.31201.172 | | Microsoft.VisualStudio.Workload.Universal | 16.9.31004.209 | | Microsoft.VisualStudio.Workload.VisualStudioExtension | 16.9.31004.209 | -| SSDT Microsoft Analysis Services Projects | 2.9.17 | -| SSDT SQL Server Integration Services Projects | 3.12.1 | -| SSDT Microsoft Reporting Services Projects | 2.6.11 | -| Windows Driver Kit | 3.11.4516 | +| ms-biztalk.BizTalk | 3.13.2.0 | +| ProBITools.MicrosoftAnalysisServicesModelingProjects | 2.9.17 | +| ProBITools.MicrosoftReportProjectsforVisualStudio | 2.6.11 | +| SSIS.SqlServerIntegrationServicesProjects | 3.13.1 | +| VisualStudioClient.MicrosoftVisualStudio2017InstallerProjects | 0.9.9 | +| Windows Driver Kit | 10.0.19030.0 | | Windows Driver Kit Visual Studio Extension | 10.1.19041.685 | | WIX Toolset | 3.11.4516 | | WIX Toolset Studio 2019 Extension | 1.0.0.4 | @@ -533,7 +531,7 @@ All other versions are saved but not installed. | -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 3.0 | | Android SDK Build-tools | 30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3
26.0.0 26.0.1 26.0.2 26.0.3
25.0.0 25.0.1 25.0.2 25.0.3
24.0.0 24.0.1 24.0.2 24.0.3
23.0.1 23.0.2 23.0.3
22.0.1
21.1.2
20.0.0
19.1.0 | -| Android SDK Platforms | android-S (rev 2)
android-30 (rev 3)
android-29 (rev 5)
android-28 (rev 6)
android-27 (rev 3)
android-26 (rev 2)
android-25 (rev 3)
android-24 (rev 2)
android-23 (rev 3)
android-22 (rev 2)
android-21 (rev 2)
android-20 (rev 2)
android-19 (rev 4) | +| Android SDK Platforms | android-S (rev 3)
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 Platform-Tools | 31.0.2 | | Android SDK Tools | 26.1.1 | | Android Support Repository | 47.0.0 | @@ -564,4 +562,3 @@ All other versions are saved but not installed. | mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:1bb6543a7fe87bb95d9adfa4c53ea3469c1c846ad63baf32729078062e8c1127 | 2021-04-09 | - From b1f202e5f05f2adc6cbe7a068f6c51bcefe73566 Mon Sep 17 00:00:00 2001 From: Leonid Lapshin Date: Thu, 29 Apr 2021 17:29:51 +0300 Subject: [PATCH 0205/3485] [ubuntu] Rework php installation (#3272) --- .../SoftwareReport/SoftwareReport.Common.psm1 | 7 ++++--- images/linux/scripts/installers/php.sh | 14 +++++++------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 index 96cc4b562555..c359f768657a 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 @@ -211,10 +211,11 @@ function Get-SbtVersion { function Get-PHPVersions { $result = Get-CommandResult "apt list --installed" -Multiline - return $result.Output | Where-Object { $_ -match "^php\d+\.\d+/"} | ForEach-Object { + $aptSourceRepo = Get-AptSourceRepository -PackageName "php" + $versionsList = $result.Output | Where-Object { $_ -match "^php\d+\.\d+/"} | ForEach-Object { $_ -match "now (?\d+\.\d+\.\d+)-" | Out-Null - $Matches.version - } + $Matches.version } + return $versionsList + "(apt source repository: $aptSourceRepo)" } function Get-ComposerVersion { diff --git a/images/linux/scripts/installers/php.sh b/images/linux/scripts/installers/php.sh index 5391e2cb37b5..020d8c4760e3 100644 --- a/images/linux/scripts/installers/php.sh +++ b/images/linux/scripts/installers/php.sh @@ -10,7 +10,8 @@ source $HELPER_SCRIPTS/os.sh source $HELPER_SCRIPTS/install.sh # add repository -apt-add-repository ppa:ondrej/php -y +REPO_URL="ppa:ondrej/php" +apt-add-repository $REPO_URL -y apt-get update # Install PHP @@ -98,11 +99,10 @@ wget -q -O phpunit https://phar.phpunit.de/phpunit-8.phar chmod +x phpunit mv phpunit /usr/local/bin/phpunit -# ubuntu 20.04 libzip-dev is libzip5 based and is not compatible libzip-dev of ppa:ondrej/php -# see https://github.com/actions/virtual-environments/issues/1084 -if isUbuntu20 ; then - rm /etc/apt/sources.list.d/ondrej-ubuntu-php-focal.list - apt-get update -fi +# remove repository after successfull installation +rm -r /etc/apt/sources.list.d/ondrej-ubuntu-php-* + +echo "php $REPO_URL" >> $HELPER_SCRIPTS/apt-sources.txt +apt-get update invoke_tests "Common" "PHP" \ No newline at end of file From c2a2904e48aa72d165abac9b4fa59de94b933132 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 29 Apr 2021 14:50:39 +0000 Subject: [PATCH 0206/3485] Updating readme file for ubuntu16 version 20210425.1 (#3262) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/linux/Ubuntu1604-README.md | 49 ++++++++++++++++--------------- 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/images/linux/Ubuntu1604-README.md b/images/linux/Ubuntu1604-README.md index 7d6025d69eba..c135115cb214 100644 --- a/images/linux/Ubuntu1604-README.md +++ b/images/linux/Ubuntu1604-README.md @@ -1,21 +1,22 @@ | Announcements | |-| -| [[windows, ubuntu] Few outdated Docker images will be removed on April, 12](https://github.com/actions/virtual-environments/issues/3111) | +| [[ubuntu] Clang 9 will be removed on May, 17th](https://github.com/actions/virtual-environments/issues/3235) | *** # Ubuntu 16.04.7 LTS - Linux kernel version: 4.15.0-1113-azure -- Image Version: 20210419.1 +- Image Version: 20210425.1 ## Installed Software ### Language and Runtime - Bash 4.3.48(1)-release - Clang 9.0.1 - Clang-format 9.0.1 -- Erlang 23.2.3 (Eshell 11.1.7) +- Erlang 23.3.1 (Eshell 11.2) - GNU C++ 5.5.0, 9.3.0 - GNU Fortran 5.5.0, 9.3.0 -- Julia 1.6.0 +- Julia 1.6.1 - Mono 6.12.0.122 +- MSBuild 16.6.0.15201 (from /usr/lib/mono/msbuild/15.0/bin/MSBuild.dll) - Node 14.16.1 - Perl 5.22.1 - Python 2.7.12 @@ -26,13 +27,13 @@ ### Package Management - cpan 1.61 - Helm 3.5.4 -- Homebrew 3.1.2 +- Homebrew 3.1.3 - Miniconda 4.9.2 - Npm 6.14.12 - Pip 8.1.1 - Pip3 8.1.1 - RubyGems 2.5.2 -- Vcpkg (build from master \<414bec0>) +- Vcpkg (build from master \<84e5852>) - Yarn 1.22.10 #### Environment variables @@ -52,9 +53,9 @@ - apt-fast 1.9.10 - AzCopy 10.10.0 (available by `azcopy` and `azcopy10` aliases) - Bazel 4.0.0 -- Bazelisk 1.7.5 +- Bazelisk 1.8.0 - CMake 3.20.1 -- CodeQL Action Bundle 2.5.0 +- CodeQL Action Bundle 2.5.2 - Docker Compose 1.29.1 - Docker-Buildx 0.5.1 - Docker-Moby Client 20.10.6+azure @@ -64,7 +65,7 @@ - Git-ftp 1.0.2 - Haveged 1.9.1 - Heroku 7.52.0 -- HHVM (HipHop VM) 4.56.4 +- HHVM (HipHop VM) 4.56.6 - jq 1.5 - Kind 0.10.0 - Kubectl 1.20.1-5-g76a04fc @@ -78,7 +79,7 @@ - OpenSSL 1.0.2g 1 Mar 2016 - Packer 1.7.2 - PhantomJS 2.1.1 -- Pulumi 2.25.2 +- Pulumi 3.1.0 - R 4.0.5 - Sphinx Open Source Search Server 2.2.9 - SVN 1.9.3 @@ -87,18 +88,18 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.73 -- AWS CLI 1.19.53 +- AWS CLI 1.19.57 - AWS CLI Session manager plugin 1.2.54.0 -- AWS SAM CLI 1.22.0 -- Azure CLI (azure-cli) 2.22.0 +- AWS SAM CLI 1.23.0 +- Azure CLI (azure-cli) 2.22.1 - Azure CLI (azure-devops) 0.18.0 -- GitHub CLI 1.9.1 -- Google Cloud SDK 336.0.0 (apt source repository: https://packages.cloud.google.com/apt) +- GitHub CLI 1.9.2 +- Google Cloud SDK 337.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 3.18.3 -- OpenShift CLI 4.7.6 +- Netlify CLI 3.21.9 +- OpenShift CLI 4.7.7 - ORAS CLI 0.11.1 -- Vercel CLI 21.3.3 +- Vercel CLI 22.0.1 ### Java | Version | Vendor | Environment Variable | @@ -130,12 +131,12 @@ - Bindgen 0.58.1 - Cargo audit 0.14.0 - Cargo clippy 0.1.51 -- Cargo outdated 0.9.14 +- Cargo outdated 0.9.15 - Cbindgen 0.19.0 - Rustfmt 1.4.36 ### Browsers and Drivers -- Google Chrome 90.0.4430.72 +- Google Chrome 90.0.4430.85 - ChromeDriver 90.0.4430.24 - Mozilla Firefox 87.0 - Geckodriver 0.29.1 @@ -226,7 +227,7 @@ | Android Command Line Tools | 3.0 | | Android SDK Build-tools | 30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3
26.0.0 26.0.1 26.0.2 26.0.3
25.0.0 25.0.1 25.0.2 25.0.3
24.0.0 24.0.1 24.0.2 24.0.3
23.0.1 23.0.2 23.0.3 | | Android SDK Platform-Tools | 31.0.2 | -| Android SDK Platforms | android-S (rev 2)
android-30 (rev 3)
android-29 (rev 5)
android-28 (rev 6)
android-27 (rev 3)
android-26 (rev 2)
android-25 (rev 3)
android-24 (rev 2)
android-23 (rev 3) | +| Android SDK Platforms | android-S (rev 3)
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 SDK Tools | 26.1.1 | | Android Support Repository | 47.0.0 | | CMake | 3.10.2 | @@ -260,9 +261,9 @@ | node:12-alpine | sha256:9923c9efb13cf7535f67e49b03010f0977a800068e4c8e0e2c93433a6bfa1e77 | 2021-04-14 | | node:14 | sha256:8eb45f4677c813ad08cef8522254640aa6a1800e75a9c213a0a651f6f3564189 | 2021-04-10 | | node:14-alpine | sha256:ed51af876dd7932ce5c1e3b16c2e83a3f58419d824e366de1f7b00f40c848c40 | 2021-04-14 | -| ubuntu:16.04 | sha256:bb84bbf2ff36d46acaf0bb0c6bcb33dae64cd93cba8652d74c9aaf438fada438 | 2021-03-25 | -| ubuntu:18.04 | sha256:122f506735a26c0a1aff2363335412cfc4f84de38326356d31ee00c2cbe52171 | 2021-03-25 | -| ubuntu:20.04 | sha256:3c9c713e0979e9bd6061ed52ac1e9e1f246c9495aa063619d9d695fb8039aa1f | 2021-04-03 | +| ubuntu:16.04 | sha256:eed7e1076bbc1f342c4474c718e5438af4784f59a4e88ad687dbb98483b59ee4 | 2021-04-23 | +| ubuntu:18.04 | sha256:538529c9d229fb55f50e6746b119e899775205d62c0fc1b7e679b30d02ecb6e8 | 2021-04-23 | +| ubuntu:20.04 | sha256:cf31af331f38d1d7158470e095b132acd126a7180a54f263d386da88eb681d93 | 2021-04-23 | ### Installed apt packages | Name | Version | From f109d39c835e31d9b392241a3513c837480764b7 Mon Sep 17 00:00:00 2001 From: Daniel <56939361+seqdan@users.noreply.github.com> Date: Tue, 4 May 2021 20:39:55 +1200 Subject: [PATCH 0207/3485] Securing packer builds via allowed_inbound_ip_addresses (#3193) * Trying to handover additional parameters * Make restriction to agent ip configurable * Added additional parameter to all other packer files * Added note about new parameter's incompatibility with other parameters to command line help * Added line break for better readability Co-authored-by: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Co-authored-by: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> --- helpers/GenerateResourcesAndImage.ps1 | 12 ++++++++++++ images/linux/ubuntu1604.json | 2 ++ images/linux/ubuntu1804.json | 2 ++ images/linux/ubuntu2004.json | 2 ++ images/win/windows2016.json | 2 ++ images/win/windows2019.json | 2 ++ 6 files changed, 22 insertions(+) diff --git a/helpers/GenerateResourcesAndImage.ps1 b/helpers/GenerateResourcesAndImage.ps1 index 681ff3877628..d7ae67f27511 100644 --- a/helpers/GenerateResourcesAndImage.ps1 +++ b/helpers/GenerateResourcesAndImage.ps1 @@ -89,6 +89,10 @@ Function GenerateResourcesAndImage { .PARAMETER AzureTenantId Tenant needs to be provided for optional authentication via service principal. Example: "11111111-1111-1111-1111-111111111111" + .PARAMETER RestrictToAgentIpAddress + If set, access to the VM used by packer to generate the image is restricted to the public IP address this script is run from. + This parameter cannot be used in combination with the virtual_network_name packer parameter. + .EXAMPLE GenerateResourcesAndImage -SubscriptionId {YourSubscriptionId} -ResourceGroupName "shsamytest1" -ImageGenerationRepositoryRoot "C:\virtual-environments" -ImageType Ubuntu1604 -AzureLocation "East US" #> @@ -112,6 +116,8 @@ Function GenerateResourcesAndImage { [Parameter(Mandatory = $False)] [string] $AzureTenantId, [Parameter(Mandatory = $False)] + [Switch] $RestrictToAgentIpAddress, + [Parameter(Mandatory = $False)] [Switch] $Force ) @@ -215,6 +221,11 @@ Function GenerateResourcesAndImage { throw "'packer' binary is not found on PATH" } + if($RestrictToAgentIpAddress -eq $true) { + $AgentIp = (Invoke-RestMethod http://ipinfo.io/json).ip + echo "Restricting access to packer generated VM to agent IP Address: $AgentIp" + } + & $packerBinary build -on-error=ask ` -var "client_id=$($spClientId)" ` -var "client_secret=$($ServicePrincipalClientSecret)" ` @@ -224,5 +235,6 @@ Function GenerateResourcesAndImage { -var "resource_group=$($ResourceGroupName)" ` -var "storage_account=$($storageAccountName)" ` -var "install_password=$($InstallPassword)" ` + -var "allowed_inbound_ip_addresses=$($AgentIp)" ` $builderScriptPath } diff --git a/images/linux/ubuntu1604.json b/images/linux/ubuntu1604.json index cdb33e709c47..d83c58cbd9f2 100644 --- a/images/linux/ubuntu1604.json +++ b/images/linux/ubuntu1604.json @@ -12,6 +12,7 @@ "virtual_network_resource_group_name": "{{env `VNET_RESOURCE_GROUP`}}", "virtual_network_subnet_name": "{{env `VNET_SUBNET`}}", "private_virtual_network_with_public_ip": "{{env `PRIVATE_VIRTUAL_NETWORK_WITH_PUBLIC_IP`}}", + "allowed_inbound_ip_addresses": "{{env `AGENT_IP`}}", "image_folder": "/imagegeneration", "imagedata_file": "/imagegeneration/imagedata.json", "installer_script_folder": "/imagegeneration/installers", @@ -45,6 +46,7 @@ "virtual_network_resource_group_name": "{{user `virtual_network_resource_group_name`}}", "virtual_network_subnet_name": "{{user `virtual_network_subnet_name`}}", "private_virtual_network_with_public_ip": "{{user `private_virtual_network_with_public_ip`}}", + "allowed_inbound_ip_addresses": "{{user `allowed_inbound_ip_addresses`}}", "os_type": "Linux", "image_publisher": "Canonical", "image_offer": "UbuntuServer", diff --git a/images/linux/ubuntu1804.json b/images/linux/ubuntu1804.json index b4a54f47a972..a8c49440276b 100644 --- a/images/linux/ubuntu1804.json +++ b/images/linux/ubuntu1804.json @@ -12,6 +12,7 @@ "virtual_network_resource_group_name": "{{env `VNET_RESOURCE_GROUP`}}", "virtual_network_subnet_name": "{{env `VNET_SUBNET`}}", "private_virtual_network_with_public_ip": "{{env `PRIVATE_VIRTUAL_NETWORK_WITH_PUBLIC_IP`}}", + "allowed_inbound_ip_addresses": "{{env `AGENT_IP`}}", "image_folder": "/imagegeneration", "imagedata_file": "/imagegeneration/imagedata.json", "installer_script_folder": "/imagegeneration/installers", @@ -45,6 +46,7 @@ "virtual_network_resource_group_name": "{{user `virtual_network_resource_group_name`}}", "virtual_network_subnet_name": "{{user `virtual_network_subnet_name`}}", "private_virtual_network_with_public_ip": "{{user `private_virtual_network_with_public_ip`}}", + "allowed_inbound_ip_addresses": "{{user `allowed_inbound_ip_addresses`}}", "os_type": "Linux", "image_publisher": "Canonical", "image_offer": "UbuntuServer", diff --git a/images/linux/ubuntu2004.json b/images/linux/ubuntu2004.json index 7c0ca2b570a4..f6e241d10cd0 100644 --- a/images/linux/ubuntu2004.json +++ b/images/linux/ubuntu2004.json @@ -12,6 +12,7 @@ "virtual_network_resource_group_name": "{{env `VNET_RESOURCE_GROUP`}}", "virtual_network_subnet_name": "{{env `VNET_SUBNET`}}", "private_virtual_network_with_public_ip": "{{env `PRIVATE_VIRTUAL_NETWORK_WITH_PUBLIC_IP`}}", + "allowed_inbound_ip_addresses": "{{env `AGENT_IP`}}", "image_folder": "/imagegeneration", "imagedata_file": "/imagegeneration/imagedata.json", "installer_script_folder": "/imagegeneration/installers", @@ -45,6 +46,7 @@ "virtual_network_resource_group_name": "{{user `virtual_network_resource_group_name`}}", "virtual_network_subnet_name": "{{user `virtual_network_subnet_name`}}", "private_virtual_network_with_public_ip": "{{user `private_virtual_network_with_public_ip`}}", + "allowed_inbound_ip_addresses": "{{user `allowed_inbound_ip_addresses`}}", "os_type": "Linux", "image_publisher": "canonical", "image_offer": "0001-com-ubuntu-server-focal", diff --git a/images/win/windows2016.json b/images/win/windows2016.json index f090f12bce9e..a0aa9473e9d4 100644 --- a/images/win/windows2016.json +++ b/images/win/windows2016.json @@ -13,6 +13,7 @@ "virtual_network_resource_group_name": "{{env `VNET_RESOURCE_GROUP`}}", "virtual_network_subnet_name": "{{env `VNET_SUBNET`}}", "private_virtual_network_with_public_ip": "{{env `PRIVATE_VIRTUAL_NETWORK_WITH_PUBLIC_IP`}}", + "allowed_inbound_ip_addresses": "{{env `AGENT_IP`}}", "vm_size": "Standard_D8s_v4", "run_scan_antivirus": "false", "root_folder": "C:", @@ -53,6 +54,7 @@ "virtual_network_resource_group_name": "{{user `virtual_network_resource_group_name`}}", "virtual_network_subnet_name": "{{user `virtual_network_subnet_name`}}", "private_virtual_network_with_public_ip": "{{user `private_virtual_network_with_public_ip`}}", + "allowed_inbound_ip_addresses": "{{user `allowed_inbound_ip_addresses`}}", "os_type": "Windows", "image_publisher": "MicrosoftWindowsServer", "image_offer": "WindowsServer", diff --git a/images/win/windows2019.json b/images/win/windows2019.json index b98ea750ee62..c0c6b65d0520 100644 --- a/images/win/windows2019.json +++ b/images/win/windows2019.json @@ -13,6 +13,7 @@ "virtual_network_resource_group_name": "{{env `VNET_RESOURCE_GROUP`}}", "virtual_network_subnet_name": "{{env `VNET_SUBNET`}}", "private_virtual_network_with_public_ip": "{{env `PRIVATE_VIRTUAL_NETWORK_WITH_PUBLIC_IP`}}", + "allowed_inbound_ip_addresses": "{{env `AGENT_IP`}}", "vm_size": "Standard_D8s_v4", "run_scan_antivirus": "false", "root_folder": "C:", @@ -53,6 +54,7 @@ "virtual_network_resource_group_name": "{{user `virtual_network_resource_group_name`}}", "virtual_network_subnet_name": "{{user `virtual_network_subnet_name`}}", "private_virtual_network_with_public_ip": "{{user `private_virtual_network_with_public_ip`}}", + "allowed_inbound_ip_addresses": "{{user `allowed_inbound_ip_addresses`}}", "os_type": "Windows", "image_publisher": "MicrosoftWindowsServer", "image_offer": "WindowsServer", From 365e5a01806196fea730003ea06b56ef145ed79e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 4 May 2021 09:31:01 +0000 Subject: [PATCH 0208/3485] Updating readme file for macOS-11.0 version 20210503.1 (#3299) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/macos/macos-11.0-Readme.md | 50 +++++++++++++++---------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/images/macos/macos-11.0-Readme.md b/images/macos/macos-11.0-Readme.md index a15bd7d12e9f..b79878c3412b 100644 --- a/images/macos/macos-11.0-Readme.md +++ b/images/macos/macos-11.0-Readme.md @@ -2,10 +2,10 @@ |-| | [macOS 11.0 pools will be transited to private preview.](https://github.com/actions/virtual-environments/issues/2486) | *** -# macOS 11.2 info -- System Version: macOS 11.2.3 (20D91) -- Kernel Version: Darwin 20.3.0 -- Image Version: 20210424.1 +# macOS 11.3 info +- System Version: macOS 11.3.1 (20E241) +- Kernel Version: Darwin 20.4.0 +- Image Version: 20210503.1 ## Installed Software ### Language and Runtime @@ -26,7 +26,7 @@ - NVM - Cached node versions: v10.24.1 v12.22.1 v14.16.1 - NVM 0.38.0 - Perl 5.32.1 -- PHP 8.0.3 +- PHP 8.0.5 - Python 2.7.18 - Python 3.9.4 - Ruby 2.7.3p183 @@ -35,16 +35,16 @@ - Bundler version 2.2.16 - Carthage 0.37.0 - CocoaPods 1.10.1 -- Composer 2.0.12 -- Homebrew 3.1.3 +- Composer 2.0.13 +- Homebrew 3.1.5 - Miniconda 4.9.2 - NPM 6.14.12 - NuGet 5.6.0.6489 - Pip 20.3.4 (python 2.7) - Pip 21.0.1 (python 3.9) -- Pipx 0.16.1.0 +- Pipx 0.16.2.1 - RubyGems 3.2.16 -- Vcpkg 2021 (build from master \<6ebcd4e>) +- Vcpkg 2021 (build from master \<8f03e22>) - Yarn 1.22.5 #### Environment variables @@ -75,9 +75,9 @@ - helm v3.5.4+g1b5edb6 - Hub CLI: 2.14.2 - jq 1.6 -- mongo v4.4.4 -- mongod v4.4.4 -- Newman 5.2.2 +- mongo v4.4.5 +- mongod v4.4.5 +- Newman 5.2.3 - OpenSSL 1.1.1k 25 Mar 2021 `(/usr/local/opt/openssl -> /usr/local/Cellar/openssl@1.1/1.1.1k)` - Packer 1.7.2 - PostgreSQL 13.2 @@ -87,32 +87,32 @@ ### Tools -- Aliyun CLI 3.0.73 +- Aliyun CLI 3.0.74 - App Center CLI 2.9.0 -- AWS CLI 2.1.39 +- AWS CLI 2.2.1 - AWS SAM CLI 1.23.0 - AWS Session Manager CLI 1.2.54.0 - Azure CLI 2.22.1 - Cabal 3.4.0.0 -- Cmake 3.20.1 +- Cmake 3.20.2 - Fastlane 2.181.0 - GHC 9.0.1 - GHCup v0.1.14.1 - Stack 2.5.1 - SwiftFormat 0.48.0 -- Xcode Command Line Tools 12.4.0.0.1.1610135815 +- Xcode Command Line Tools 12.5.0.0.1.1617976050 ### Linters - SwiftLint 0.43.1 - yamllint 1.26.1 ### Browsers -- Safari 14.0.3 (16610.4.3.1.7) -- SafariDriver 14.0.3 (16610.4.3.1.7) -- Google Chrome 90.0.4430.85 +- Safari 14.1 (16611.1.21.161.6) +- SafariDriver 14.1 (16611.1.21.161.6) +- Google Chrome 90.0.4430.93 - ChromeDriver 90.0.4430.24 -- Microsoft Edge 90.0.818.42 -- MSEdgeDriver 90.0.818.46 +- Microsoft Edge 90.0.818.51 +- MSEdgeDriver 90.0.818.51 - Mozilla Firefox 88.0 - geckodriver 0.29.1 @@ -159,7 +159,7 @@ #### Packages - Bindgen 0.58.1 -- Cargo-audit 0.14.0 +- Cargo-audit 0.14.1 - Cargo-outdated v0.9.15 - Cbindgen 0.19.0 - Clippy 0.1.51 @@ -184,7 +184,7 @@ ### Xamarin #### Visual Studio for Mac -- 8.9.7.8 +- 8.9.8.7 #### Xamarin bundles | symlink | Xamarin.Mono | Xamarin.iOS | Xamarin.Mac | Xamarin.Android | @@ -272,8 +272,8 @@ ### Android | Package Name | Version | | -------------------------- | ------------------------------------------------------------------------------------------------------------------------ | -| Android Command Line Tools | 3.0 | -| Android Emulator | 30.5.5 | +| Android Command Line Tools | 4.0 | +| Android Emulator | 30.5.6 | | Android SDK Build-tools | 30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3 | | Android SDK Platforms | android-S (rev 3)
android-30 (rev 3)
android-29 (rev 5)
android-28 (rev 6)
android-27 (rev 3) | | Android SDK Platform-Tools | 31.0.2 | From 50f02341da62ac595c0239ea785c5220dffb4db2 Mon Sep 17 00:00:00 2001 From: mikhailshaganov <81769678+mikhailshaganov@users.noreply.github.com> Date: Tue, 4 May 2021 17:29:41 +0300 Subject: [PATCH 0209/3485] select-xamarin-sdk-v2 (#3290) * select-xamarin-sdk-v2 * Update select-xamarin-sdk-v2.sh * change warning message * check existed framework version * check framework version review points --- .../provision/assets/select-xamarin-sdk-v2.sh | 46 +++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 images/macos/provision/assets/select-xamarin-sdk-v2.sh diff --git a/images/macos/provision/assets/select-xamarin-sdk-v2.sh b/images/macos/provision/assets/select-xamarin-sdk-v2.sh new file mode 100644 index 000000000000..5dd63348d03c --- /dev/null +++ b/images/macos/provision/assets/select-xamarin-sdk-v2.sh @@ -0,0 +1,46 @@ +#!/bin/bash -e -o pipefail +get_framework_path() { + case $1 in + --mono) echo '/Library/Frameworks/Mono.framework/Versions' ;; + --ios) echo '/Library/Frameworks/Xamarin.iOS.framework/Versions' ;; + --android) echo '/Library/Frameworks/Xamarin.Android.framework/Versions' ;; + --mac) echo '/Library/Frameworks/Xamarin.Mac.framework/Versions' ;; + *) ;; + esac +} + +change_framework_version() { + local framework=$1 + local version=$2 + + echo "Select $framework $version" + + local countDigit=$(echo "${version}" | grep -o "\." | grep -c "\.") + + if [[ countDigit -gt 1 ]]; then + echo "[WARNING] It is not recommended to specify the exact framework version because your build can be broken with the next patch update. Consider using "major.minor" only format." + fi + + local framework_path=$(get_framework_path "$framework") + + if [ -d "${framework_path}/${version}" ]; then + sudo rm -f "${framework_path}/Current" + sudo ln -s "${framework_path}/${version}" "${framework_path}/Current" + else + echo "Invalid framework version ${framework_path}/${version}" + exit 1 + fi +} + +for arg in "$@"; do + key=$(echo $arg | cut -f1 -d=) + value=$(echo $arg | cut -f2 -d=) + + case $key in + --mono | --ios | --android | --mac) change_framework_version $key $value ;; + *) + echo "Invalid parameter <${key}>" + exit 1 + ;; + esac +done From d441e5b3c081dd186230d3c413965fe2620e13ad Mon Sep 17 00:00:00 2001 From: Alena Sviridenko Date: Tue, 4 May 2021 18:10:24 +0300 Subject: [PATCH 0210/3485] Removed Ubuntu 16.04 from README.md (#3302) --- README.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index b349f8930733..4c80ef28ada2 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,6 @@ For general questions about using the virtual environments or writing your Actio | --------------------|---------------------|--------------------|---------------------| | Ubuntu 20.04 | `ubuntu-latest` or `ubuntu-20.04` | [ubuntu-20.04] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu20&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu20&redirect=1) | Ubuntu 18.04 | `ubuntu-18.04` | [ubuntu-18.04] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu18&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu18&redirect=1) -| Ubuntu 16.04 | `ubuntu-16.04` | [ubuntu-16.04] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu16&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu16&redirect=1) | | macOS 11.0 | `macos-11.0` | [macOS-11.0] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-11.0&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-11.0&redirect=1) | macOS 10.15 | `macos-latest` or `macos-10.15` | [macOS-10.15] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-10.15&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-10.15&redirect=1) | Windows Server 2019 | `windows-latest` or `windows-2019` | [windows-2019] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=windows-2019&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=windows-2019&redirect=1) @@ -22,6 +21,11 @@ The macOS 11.0 virtual environment is currently provided as a private preview on The "macos-latest" YAML workflow label still uses the macOS 10.15 virtual environment. ``` +``` +Ubuntu 16.04 is being deprecated. It is not recommended for new users. +If any of your workflows use Ubuntu 16.04, migrate to Ubuntu 20.04 or 18.04. +``` + ***What images are available for GitHub Actions and Azure DevOps?*** The availability of images for GitHub Actions and Azure DevOps is different. See documentation for more details: - [GitHub Actions](https://docs.github.com/en/free-pro-team@latest/actions/reference/specifications-for-github-hosted-runners#supported-runners-and-hardware-resources) From 1532432fa9a660991080fc342fcc7d61fc5d94e9 Mon Sep 17 00:00:00 2001 From: Leonid Lapshin Date: Tue, 4 May 2021 21:00:16 +0300 Subject: [PATCH 0211/3485] Fix fastlane installation for Ubuntu 20 (#3308) * tmp fix for Ubuntu 20 * removed unnecessary line break Co-authored-by: Leonid Lapshin --- images/linux/scripts/installers/ruby.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/images/linux/scripts/installers/ruby.sh b/images/linux/scripts/installers/ruby.sh index bd260a55d5b2..49273e62c231 100644 --- a/images/linux/scripts/installers/ruby.sh +++ b/images/linux/scripts/installers/ruby.sh @@ -4,11 +4,18 @@ ## Desc: Installs Ruby requirements and ruby gems ################################################################################ +source $HELPER_SCRIPTS/os.sh source $HELPER_SCRIPTS/install.sh apt-get install ruby-full gem update +# temporary fix for fastlane installation https://github.com/fastlane/fastlane/issues/18642 +if isUbuntu20 ; then + gem uninstall rdoc + gem install rdoc -v 6.3.0 +fi + # Install ruby gems from toolset gemsToInstall=$(get_toolset_value ".rubygems[] .name") if [ -n "$gemsToInstall" ]; then From f84d55abebedae28278a3ec1a33054c7d7473a12 Mon Sep 17 00:00:00 2001 From: Darii Nurgaleev <50947177+Darleev@users.noreply.github.com> Date: Wed, 5 May 2021 15:50:15 +0700 Subject: [PATCH 0212/3485] Rework Kubernetes installation to avoid using apt repos on Ubuntu images (#3309) * github_feed_token removal * remove file * GithubFeedToken remove from other files * remove boost from docs * Kubectl installation without additional repo * add latest kubectl version variable --- images/linux/scripts/installers/kubernetes-tools.sh | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/images/linux/scripts/installers/kubernetes-tools.sh b/images/linux/scripts/installers/kubernetes-tools.sh index 6bafaab5f6a4..a32e7ea57efb 100644 --- a/images/linux/scripts/installers/kubernetes-tools.sh +++ b/images/linux/scripts/installers/kubernetes-tools.sh @@ -10,13 +10,9 @@ curl -L -o /usr/local/bin/kind $URL chmod +x /usr/local/bin/kind ## Install kubectl -curl -s https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add - -touch /etc/apt/sources.list.d/kubernetes.list - -# Based on https://kubernetes.io/docs/tasks/tools/install-kubectl/, package is xenial for both OS versions. -echo "deb https://apt.kubernetes.io/ kubernetes-xenial main" | tee -a /etc/apt/sources.list.d/kubernetes.list -apt-get update -apt-get install -y kubectl +KUBECTL_VERSION=$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt) +curl -o /usr/local/bin/kubectl -LO https://storage.googleapis.com/kubernetes-release/release/$KUBECTL_VERSION/bin/linux/amd64/kubectl +chmod +x /usr/local/bin/kubectl # Install Helm curl https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3 | bash From 0cca9be107fa97189304fd98816e4879b6a2ce19 Mon Sep 17 00:00:00 2001 From: Howard Jones Date: Wed, 5 May 2021 10:04:44 +0100 Subject: [PATCH 0213/3485] Make CreateAzureVMFromPackerTemplate friendlier (#3209) * Don't assume JSON output Specify JSON output, since it's required. The default can be changed. * Make actions easier to track To make cleanup easier, use the same GUID for all components and report at the end on what was created. --- helpers/CreateAzureVMFromPackerTemplate.ps1 | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/helpers/CreateAzureVMFromPackerTemplate.ps1 b/helpers/CreateAzureVMFromPackerTemplate.ps1 index 683f2cf51bb1..3206216e594c 100644 --- a/helpers/CreateAzureVMFromPackerTemplate.ps1 +++ b/helpers/CreateAzureVMFromPackerTemplate.ps1 @@ -48,21 +48,22 @@ Function CreateAzureVMFromPackerTemplate { ) $vmSize = "Standard_DS2_v2" - $vnetName = $env:UserName + [System.GUID]::NewGuid().ToString().ToUpper() - $subnetName = $env:UserName + [System.GUID]::NewGuid().ToString().ToUpper() - $nicName = $env:UserName + [System.GUID]::NewGuid().ToString().ToUpper() - $publicIpName = $env:UserName + [System.GUID]::NewGuid().ToString().ToUpper() + $guid = [System.GUID]::NewGuid().ToString().ToUpper() + $vnetName = $env:UserName + "vnet-" + $guid + $subnetName = $env:UserName + "subnet-" + $guid + $nicName = $env:UserName + "nic-" + $guid + $publicIpName = $env:UserName + "pip-" + $guid Write-Host "Creating a virtual network and subnet" - ($vnet = az network vnet create -g $ResourceGroupName -l $AzureLocation -n $vnetName --address-prefixes 10.0.0.0/16 --subnet-name $subnetName --subnet-prefixes 10.0.1.0/24 --subscription $subscriptionId) + ($vnet = az network vnet create -g $ResourceGroupName -l $AzureLocation -n $vnetName --address-prefixes 10.0.0.0/16 --subnet-name $subnetName --subnet-prefixes 10.0.1.0/24 --subscription $subscriptionId -o json) $subnetId = ($vnet | ConvertFrom-Json).newVNet.subnets[0].id Write-Host "`nCreating a network interface controller (NIC)" - ($nic = az network nic create -g $ResourceGroupName -l $AzureLocation -n $nicName --subnet $subnetId --subscription $subscriptionId) + ($nic = az network nic create -g $ResourceGroupName -l $AzureLocation -n $nicName --subnet $subnetId --subscription $subscriptionId -o json) $networkId = ($nic | ConvertFrom-Json).NewNIC.id Write-Host "`nCreating a public IP address" - ($publicIp = az network public-ip create -g $ResourceGroupName -l $AzureLocation -n $publicIpName --allocation-method Static --sku Standard --version IPv4 --subscription $subscriptionId) + ($publicIp = az network public-ip create -g $ResourceGroupName -l $AzureLocation -n $publicIpName --allocation-method Static --sku Standard --version IPv4 --subscription $subscriptionId -o json) $publicIpId = ($publicIp | ConvertFrom-Json).publicIp.id Write-Host "`nAdding the public IP to the NIC" @@ -70,4 +71,6 @@ Function CreateAzureVMFromPackerTemplate { Write-Host "`nCreating the VM" az group deployment create -g $ResourceGroupName -n $VirtualMachineName --subscription $subscriptionId --template-file $templateFilePath --parameters vmSize=$vmSize vmName=$VirtualMachineName adminUserName=$AdminUsername adminPassword=$AdminPassword networkInterfaceId=$networkId + + Write-Host "`nCreated in $(ResourceGroupName):`n vnet $(vnetName)`n subnet $(subnetName)`n nic $(nicName)`n publicip $(publicIpName)`n vm $(VirtualMachineName)" } From adf1f3d76ee411074f875457fa5111d9079b1a98 Mon Sep 17 00:00:00 2001 From: Sergey Dolin Date: Wed, 5 May 2021 18:39:04 +0500 Subject: [PATCH 0214/3485] [ubuntu] Remove apt sources used to install azure-cli only (#3274) --- .../linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 | 3 ++- images/linux/scripts/installers/azure-cli.sh | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 index e3f491ef8779..66964a99fb2e 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 @@ -184,7 +184,8 @@ function Get-JqVersion { function Get-AzureCliVersion { $azcliVersion = az -v | Select-String "azure-cli" | Take-OutputPart -Part -1 - return "Azure CLI (azure-cli) $azcliVersion" + $aptSourceRepo = Get-AptSourceRepository -PackageName "azure-cli" + return "Azure CLI (azure-cli) $azcliVersion (installation method: $aptSourceRepo)" } function Get-AzureDevopsVersion { diff --git a/images/linux/scripts/installers/azure-cli.sh b/images/linux/scripts/installers/azure-cli.sh index bd321ee157dc..45a32b9cd748 100644 --- a/images/linux/scripts/installers/azure-cli.sh +++ b/images/linux/scripts/installers/azure-cli.sh @@ -6,5 +6,8 @@ # Install Azure CLI (instructions taken from https://docs.microsoft.com/en-us/cli/azure/install-azure-cli) curl -sL https://aka.ms/InstallAzureCLIDeb | sudo bash +echo "azure-cli https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt" >> $HELPER_SCRIPTS/apt-sources.txt +rm -f /etc/apt/sources.list.d/azure-cli.list +rm -f /etc/apt/sources.list.d/azure-cli.list.save -invoke_tests "CLI.Tools" "Azure CLI" \ No newline at end of file +invoke_tests "CLI.Tools" "Azure CLI" From 5475c4005994102e4491a4bf3967795ac9222795 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Wed, 5 May 2021 18:23:21 +0300 Subject: [PATCH 0215/3485] [macOS] Add swift program to save certificate (#3311) --- .../configuration/add-certificate.swift | 64 +++++++++++++++++++ .../configuration/configure-machine.sh | 11 +++- images/macos/templates/macOS-11.0.json | 7 +- 3 files changed, 80 insertions(+), 2 deletions(-) create mode 100644 images/macos/provision/configuration/add-certificate.swift diff --git a/images/macos/provision/configuration/add-certificate.swift b/images/macos/provision/configuration/add-certificate.swift new file mode 100644 index 000000000000..fb8209b32296 --- /dev/null +++ b/images/macos/provision/configuration/add-certificate.swift @@ -0,0 +1,64 @@ +import Foundation +import Security + +let certInfo: CFDictionary + +enum SecurityError: Error { + case generalError +} + +func deleteCertificateFromKeyChain(_ certificateLabel: String) -> Bool { + let delQuery: [NSString: Any] = [ + kSecClass: kSecClassCertificate, + kSecAttrLabel: certificateLabel, + ] + let delStatus: OSStatus = SecItemDelete(delQuery as CFDictionary) + + return delStatus == errSecSuccess +} + +func saveCertificateToKeyChain(_ certificate: SecCertificate, certificateLabel: String) throws { + SecKeychainSetPreferenceDomain(SecPreferencesDomain.system) + deleteCertificateFromKeyChain(certificateLabel) + + let setQuery: [NSString: AnyObject] = [ + kSecClass: kSecClassCertificate, + kSecValueRef: certificate, + kSecAttrLabel: certificateLabel as AnyObject, + kSecAttrAccessible: kSecAttrAccessibleWhenUnlocked, + ] + let addStatus: OSStatus = SecItemAdd(setQuery as CFDictionary, nil) + + guard addStatus == errSecSuccess else { + throw SecurityError.generalError + } + + var status = SecTrustSettingsSetTrustSettings(certificate, SecTrustSettingsDomain.admin, nil) +} + +func getCertificateFromString(stringData: String) throws -> SecCertificate { + if let data = NSData(base64Encoded: stringData, options: NSData.Base64DecodingOptions.ignoreUnknownCharacters) { + if let certificate = SecCertificateCreateWithData(kCFAllocatorDefault, data) { + return certificate + } + } + throw SecurityError.generalError +} + +if CommandLine.arguments.count > 1 { + let fileURL = URL(fileURLWithPath: CommandLine.arguments[1]) + do { + let certData = try Data(contentsOf: fileURL) + let certificate = SecCertificateCreateWithData(nil, certData as CFData) + if certificate != nil { + print("Saving certificate") + try? saveCertificateToKeyChain(certificate!, certificateLabel: "Test") + } else { + print("Certificate can't be read") + } + } catch { + print("Unable to read the file \(CommandLine.arguments[1])") + } +} else { + print("Usage: \(CommandLine.arguments[0]) [cert.file]") +} diff --git a/images/macos/provision/configuration/configure-machine.sh b/images/macos/provision/configuration/configure-machine.sh index b6c20afa842e..2951867fc3c9 100644 --- a/images/macos/provision/configuration/configure-machine.sh +++ b/images/macos/provision/configuration/configure-machine.sh @@ -1,5 +1,7 @@ #!/bin/bash -e -o pipefail +source ~/utils/utils.sh + echo "Enabling safari driver..." # https://developer.apple.com/documentation/webkit/testing_with_webdriver_in_safari # Safari’s executable is located at /usr/bin/safaridriver @@ -22,7 +24,14 @@ sudo "/Library/Application Support/VMware Tools/vmware-resolutionSet" 1176 885 # Confirm that the correct intermediate certificate is installed by verifying the expiration date is set to 2030. # sudo security delete-certificate -Z FF6797793A3CD798DC5B2ABEF56F73EDC9F83A64 /Library/Keychains/System.keychain curl https://www.apple.com/certificateauthority/AppleWWDRCAG3.cer --output $HOME/AppleWWDRCAG3.cer --silent -sudo security add-trusted-cert -d -r unspecified -k /Library/Keychains/System.keychain $HOME/AppleWWDRCAG3.cer +# Big Sur requires user interaction to add a cert https://developer.apple.com/forums/thread/671582, we need to use a workaround with SecItemAdd swift method +if is_Less_BigSur; then + sudo security add-trusted-cert -d -r unspecified -k /Library/Keychains/System.keychain $HOME/AppleWWDRCAG3.cer +else + swiftc $HOME/image-generation/add-certificate.swift + sudo ./add-certificate $HOME/AppleWWDRCAG3.cer + rm add-certificate +fi rm $HOME/AppleWWDRCAG3.cer # Create symlink for tests running diff --git a/images/macos/templates/macOS-11.0.json b/images/macos/templates/macOS-11.0.json index fb96ec8214e4..33c3f0085d80 100644 --- a/images/macos/templates/macOS-11.0.json +++ b/images/macos/templates/macOS-11.0.json @@ -61,6 +61,11 @@ "source": "./helpers", "destination": "~/image-generation/" }, + { + "type": "file", + "source": "./provision/configuration/add-certificate.swift", + "destination": "~/image-generation/add-certificate.swift" + }, { "type": "file", "source": "./provision/configuration/environment/bashrc", @@ -109,6 +114,7 @@ "scripts": [ "./provision/configuration/preimagedata.sh", "./provision/configuration/configure-ssh.sh", + "./provision/core/xcode-clt.sh", "./provision/configuration/configure-machine.sh" ], "environment_vars": [ @@ -127,7 +133,6 @@ "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}", "pause_before": "30s", "scripts": [ - "./provision/core/xcode-clt.sh", "./provision/core/homebrew.sh", "./provision/core/powershell.sh", "./provision/core/dotnet.sh", From 366f1b078e54721496695da78814ea48f59f9d95 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Thu, 6 May 2021 10:04:22 +0300 Subject: [PATCH 0216/3485] [Ubuntu] Avoid updating gems (#3320) --- images/linux/scripts/installers/ruby.sh | 7 ------- 1 file changed, 7 deletions(-) diff --git a/images/linux/scripts/installers/ruby.sh b/images/linux/scripts/installers/ruby.sh index 49273e62c231..bf97974752fa 100644 --- a/images/linux/scripts/installers/ruby.sh +++ b/images/linux/scripts/installers/ruby.sh @@ -8,13 +8,6 @@ source $HELPER_SCRIPTS/os.sh source $HELPER_SCRIPTS/install.sh apt-get install ruby-full -gem update - -# temporary fix for fastlane installation https://github.com/fastlane/fastlane/issues/18642 -if isUbuntu20 ; then - gem uninstall rdoc - gem install rdoc -v 6.3.0 -fi # Install ruby gems from toolset gemsToInstall=$(get_toolset_value ".rubygems[] .name") From 3ebf601284cae6a4406b7ea1ad08cd593a4d619b Mon Sep 17 00:00:00 2001 From: Ewout ter Hoeven Date: Thu, 6 May 2021 09:31:09 +0200 Subject: [PATCH 0217/3485] [ubuntu] Add GCC 11 (#3291) * Ubuntu Bionic/Focal: Add GCC 11 Add GCC 11 to the Ubuntu 18.04 Bionic and 20.04 Focal toolsets. * Ubuntu Bionic/Focal: Add GFortran 11 Add GFortran 11 to the Ubuntu 18.04 Bionic and 20.04 Focal toolsets. --- images/linux/toolsets/toolset-1804.json | 6 ++++-- images/linux/toolsets/toolset-2004.json | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index 3df858b0d774..52b881e6be95 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -251,13 +251,15 @@ "gcc": { "versions": [ "g++-9", - "g++-10" + "g++-10", + "g++-11" ] }, "gfortran": { "versions": [ "gfortran-9", - "gfortran-10" + "gfortran-10", + "gfortran-11" ] }, "php": { diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index 790509405a37..92a1848a0d45 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -253,13 +253,15 @@ "gcc": { "versions": [ "g++-9", - "g++-10" + "g++-10", + "g++-11" ] }, "gfortran": { "versions": [ "gfortran-9", - "gfortran-10" + "gfortran-10", + "gfortran-11" ] }, "php": { From 96e0e6f9f359b3f968e7c3f538aaf86d2de266b0 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Thu, 6 May 2021 11:35:05 +0300 Subject: [PATCH 0218/3485] [Ubuntu] Add Cmake 3.18.1 to toolset files (#3322) --- images/linux/toolsets/toolset-1604.json | 1 + images/linux/toolsets/toolset-1804.json | 1 + images/linux/toolsets/toolset-2004.json | 1 + 3 files changed, 3 insertions(+) diff --git a/images/linux/toolsets/toolset-1604.json b/images/linux/toolsets/toolset-1604.json index 1faaceb082b4..14e47bd5581b 100644 --- a/images/linux/toolsets/toolset-1604.json +++ b/images/linux/toolsets/toolset-1604.json @@ -94,6 +94,7 @@ ], "additional_tools": [ "cmake;3.10.2.4988404", + "cmake;3.18.1", "patcher;v4", "platform-tools", "cmdline-tools;latest" diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index 52b881e6be95..2b96ab0d9d40 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -90,6 +90,7 @@ ], "additional_tools": [ "cmake;3.10.2.4988404", + "cmake;3.18.1", "patcher;v4", "platform-tools", "cmdline-tools;latest" diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index 92a1848a0d45..b7685310675c 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -86,6 +86,7 @@ ], "additional_tools": [ "cmake;3.10.2.4988404", + "cmake;3.18.1", "patcher;v4", "platform-tools", "cmdline-tools;latest" From 97403488685142214d3d3e442b74b7360fb18b12 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Thu, 6 May 2021 11:35:21 +0300 Subject: [PATCH 0219/3485] [macos] Add cmake 3.18.1 to toolsets (#3323) --- images/macos/toolsets/toolset-10.14.json | 1 + images/macos/toolsets/toolset-10.15.json | 1 + images/macos/toolsets/toolset-11.0.json | 1 + 3 files changed, 3 insertions(+) diff --git a/images/macos/toolsets/toolset-10.14.json b/images/macos/toolsets/toolset-10.14.json index 55618dd9d441..e0acdbbaffd1 100644 --- a/images/macos/toolsets/toolset-10.14.json +++ b/images/macos/toolsets/toolset-10.14.json @@ -212,6 +212,7 @@ ], "additional-tools": [ "cmake;3.10.2.4988404", + "cmake;3.18.1", "cmdline-tools;latest" ], "ndk": { diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index c59206c84787..9ff43d509674 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -164,6 +164,7 @@ ], "additional-tools": [ "cmake;3.10.2.4988404", + "cmake;3.18.1", "cmdline-tools;latest" ], "ndk": { diff --git a/images/macos/toolsets/toolset-11.0.json b/images/macos/toolsets/toolset-11.0.json index ea557e8b0038..c02c0788f21e 100644 --- a/images/macos/toolsets/toolset-11.0.json +++ b/images/macos/toolsets/toolset-11.0.json @@ -98,6 +98,7 @@ "addon-list": [], "additional-tools": [ "cmake;3.10.2.4988404", + "cmake;3.18.1", "cmdline-tools;latest" ], "ndk": { From 5abc43a504e4ba8e869ef7f56e3fd7b0a3d8560d Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Thu, 6 May 2021 11:35:37 +0300 Subject: [PATCH 0220/3485] [windows] Add cmake 3.18.1 for Android to toolset files (#3324) --- images/win/toolsets/toolset-2016.json | 1 + images/win/toolsets/toolset-2019.json | 1 + 2 files changed, 2 insertions(+) diff --git a/images/win/toolsets/toolset-2016.json b/images/win/toolsets/toolset-2016.json index 5a56636b6ca9..960939978408 100644 --- a/images/win/toolsets/toolset-2016.json +++ b/images/win/toolsets/toolset-2016.json @@ -164,6 +164,7 @@ ], "additional_tools": [ "cmake;3.10.2.4988404", + "cmake;3.18.1", "patcher;v4", "cmdline-tools;latest" ], diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index 215c80821e11..41bdd2e13c07 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -164,6 +164,7 @@ ], "additional_tools": [ "cmake;3.10.2.4988404", + "cmake;3.18.1", "patcher;v4", "cmdline-tools;latest" ], From a5fca054cb360e4800249a3fe9809c609745f9b9 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Thu, 6 May 2021 12:10:58 +0300 Subject: [PATCH 0221/3485] [Ubuntu] Set DefaultLimitSTACK=16384 limit (#3328) * Set DefaultLimitSTACK=16384 limit * Set DefaultLimitSTACK 16MB --- images/linux/scripts/base/limits.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/images/linux/scripts/base/limits.sh b/images/linux/scripts/base/limits.sh index 0a0cc99e0da3..c064f3a5ca91 100644 --- a/images/linux/scripts/base/limits.sh +++ b/images/linux/scripts/base/limits.sh @@ -1,10 +1,13 @@ #!/bin/bash -e -echo '* soft nofile 65536' >> /etc/security/limits.conf -echo '* hard nofile 65536' >> /etc/security/limits.conf echo 'session required pam_limits.so' >> /etc/pam.d/common-session echo 'session required pam_limits.so' >> /etc/pam.d/common-session-noninteractive echo 'DefaultLimitNOFILE=65536' >> /etc/systemd/system.conf +echo 'DefaultLimitSTACK=16M:infinity' >> /etc/systemd/system.conf + +# Raise Number of File Descriptors +echo '* soft nofile 65536' >> /etc/security/limits.conf +echo '* hard nofile 65536' >> /etc/security/limits.conf # Double stack size from default 8192KB echo '* soft stack 16384' >> /etc/security/limits.conf From 9ebab486a84dc39e5a832415ae9ba1f3ddf6bead Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 6 May 2021 09:41:52 +0000 Subject: [PATCH 0222/3485] Updating readme file for macOS-10.14 version 20210501.1 (#3300) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/macos/macos-10.14-Readme.md | 87 +++++++++++++++--------------- 1 file changed, 44 insertions(+), 43 deletions(-) diff --git a/images/macos/macos-10.14-Readme.md b/images/macos/macos-10.14-Readme.md index 249f45c3d51c..115f80774347 100644 --- a/images/macos/macos-10.14-Readme.md +++ b/images/macos/macos-10.14-Readme.md @@ -1,19 +1,18 @@ | Announcements | |-| -| [[macOS] Az modules will be upgraded from 4.8.0 to 5.7.0 on April, 12](https://github.com/actions/virtual-environments/issues/3129) | | [macOS 11.0 pools will be transited to private preview.](https://github.com/actions/virtual-environments/issues/2486) | *** # macOS 10.14 info -- System Version: macOS 10.14.6 (18G8022) +- System Version: macOS 10.14.6 (18G9028) - Kernel Version: Darwin 18.7.0 -- Image Version: 20210413.1 +- Image Version: 20210501.1 ## Installed Software ### Language and Runtime - .NET SDK 2.1.300 2.1.301 2.1.302 2.1.401 2.1.402 2.1.403 2.1.500 2.1.502 2.1.503 2.1.504 2.1.505 2.1.506 2.1.507 - Bash 3.2.57(1)-release - Clang/LLVM 11.0.0 is default -- Clang/LLVM 11.1.0 is available on `'$(brew --prefix llvm)/bin/clang'` +- Clang/LLVM 12.0.0 is available on `'$(brew --prefix llvm)/bin/clang'` - gcc-10 (Homebrew GCC 10.2.0_4) 10.2.0 - available by `gcc-10` alias - gcc-8 (Homebrew GCC 8.4.0_3) 8.4.0 - available by `gcc-8` alias - gcc-9 (Homebrew GCC 9.3.0_2) 9.3.0 - available by `gcc-9` alias @@ -21,12 +20,13 @@ - GNU Fortran (Homebrew GCC 8.4.0_3) 8.4.0 - available by `gfortran-8` alias - GNU Fortran (Homebrew GCC 9.3.0_2) 9.3.0 - available by `gfortran-9` alias - Go 1.15.11 -- julia 1.6.0 +- julia 1.6.1 +- MSBuild 15.7.224.30163 (from /Library/Frameworks/Mono.framework/Versions/5.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) - Node.js v8.17.0 - NVM - Cached node versions: v10.24.1 v12.22.1 v14.16.1 - NVM 0.38.0 - Perl 5.32.1 -- PHP 8.0.3 +- PHP 8.0.5 - Python 2.7.18 - Python 3.9.4 - R 4.0.5 @@ -36,14 +36,14 @@ - Bundler version 2.2.16 - Carthage 0.37.0 - CocoaPods 1.10.1 -- Composer 2.0.12 -- Homebrew 3.1.1 +- Composer 2.0.13 +- Homebrew 3.1.5 - Miniconda 4.9.2 - NPM 3.10.10 - NuGet 4.7.0.5148 - Pip 20.3.4 (python 2.7) - Pip 21.0.1 (python 3.9) -- Pipx 0.16.1.0 +- Pipx 0.16.2.1 - RubyGems 3.2.16 - Yarn 1.22.5 @@ -54,53 +54,54 @@ | VCPKG_INSTALLATION_ROOT | | ### Project Management -- Apache Ant(TM) 1.10.9 +- Apache Ant(TM) 1.10.10 - Apache Maven 3.8.1 - Gradle 7.0 ### Utilities - 7-Zip 17.04 - aria2 1.35.0 -- azcopy 10.9.0 +- azcopy 10.10.0 - bazel 3.7.1 -- bazelisk 1.7.5 +- bazelisk 1.8.0 - bsdtar 2.8.3 - available by 'tar' alias -- Curl 7.76.0 +- Curl 7.76.1 - Git LFS: 2.13.3 - Git: 2.31.1 -- GitHub CLI: 1.8.1 -- GNU parallel 20210322 +- GitHub CLI: 1.9.2 +- GNU parallel 20210422 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.1 -- gpg (GnuPG) 2.2.27 -- helm v3.5.3+g041ce5a +- gpg (GnuPG) 2.3.1 +- helm v3.5.4+g1b5edb6 - Hub CLI: 2.14.2 - jq 1.6 -- mongo v4.4.4 -- mongod v4.4.4 +- mongo v4.4.5 +- mongod v4.4.5 - OpenSSL 1.1.1k 25 Mar 2021 `(/usr/local/opt/openssl -> /usr/local/Cellar/openssl@1.1/1.1.1k)` - Packer 1.7.2 - PostgreSQL 13.2 - psql (PostgreSQL) 13.2 - Subversion (SVN) 1.14.1 -- Vagrant 2.2.15 -- virtualbox 6.1.18r142142 +- Vagrant 2.2.16 +- virtualbox 6.1.22r144080 - zstd 1.4.9 ### Tools - Aliyun CLI 3.0.73 - App Center CLI 1.2.2 -- AWS CLI 2.1.37 -- AWS SAM CLI 1.22.0 -- AWS Session Manager CLI 1.2.30.0 -- Azure CLI 2.22.0 +- AWS CLI 2.2.1 +- AWS SAM CLI 1.23.0 +- AWS Session Manager CLI 1.2.54.0 +- Azure CLI 2.22.1 - Cabal 3.4.0.0 -- Cmake 3.20.1 -- Fastlane 2.180.1 +- Cmake 3.20.2 +- Fastlane 2.181.0 - GHC 9.0.1 - GHCup v0.1.14.1 - Stack 2.5.1 +- SwiftFormat 0.48.0 - Xcode Command Line Tools 10.3.0.0.1.1562985497 ### Linters @@ -108,27 +109,27 @@ - yamllint 1.26.1 ### Browsers -- Safari 14.0.3 (14610.4.3.1.7) -- SafariDriver 14.0.3 (14610.4.3.1.7) -- Google Chrome 89.0.4389.128 -- ChromeDriver 89.0.4389.23 -- Microsoft Edge 89.0.774.75 -- MSEdgeDriver 89.0.774.76 -- Mozilla Firefox 87.0 +- Safari 14.1 (14611.1.21.161.5) +- SafariDriver 14.1 (14611.1.21.161.5) +- Google Chrome 90.0.4430.93 +- ChromeDriver 90.0.4430.24 +- Microsoft Edge 90.0.818.51 +- MSEdgeDriver 90.0.818.51 +- Mozilla Firefox 88.0 - geckodriver 0.29.1 #### Environment variables | Name | Value | | --------------- | --------------------------------------------- | -| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/89.0.4389.23 | +| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/90.0.4430.24 | | EDGEWEBDRIVER | /usr/local/share/edge_driver | | GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | ### Java | Version | Vendor | Environment Variable | | ----------- | ------------- | -------------------- | -| 8.0.282+8 | Adopt OpenJDK | JAVA_HOME_8_X64 | -| 11.0.10+9 | Adopt OpenJDK | JAVA_HOME_11_X64 | +| 8.0.292+10 | Adopt OpenJDK | JAVA_HOME_8_X64 | +| 11.0.11+9 | Adopt OpenJDK | JAVA_HOME_11_X64 | | 12.0.2+10.3 | Adopt OpenJDK | JAVA_HOME_12_X64 | | 13.0.2+8.1 | Adopt OpenJDK | JAVA_HOME_13_X64 | | 14.0.2+12 | Adopt OpenJDK | JAVA_HOME_14_X64 | @@ -172,8 +173,8 @@ #### Packages - Bindgen 0.58.1 -- Cargo-audit 0.14.0 -- Cargo-outdated v0.9.14 +- Cargo-audit 0.14.1 +- Cargo-outdated v0.9.15 - Cbindgen 0.19.0 - Clippy 0.1.51 - Rustfmt 1.4.36-stable @@ -338,11 +339,11 @@ ### Android | Package Name | Version | | -------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 3.0 | -| Android Emulator | 30.5.4 | +| Android Command Line Tools | 4.0 | +| Android Emulator | 30.5.6 | | Android SDK Build-tools | 30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3
26.0.0 26.0.1 26.0.2 26.0.3
25.0.0 25.0.1 25.0.2 25.0.3
24.0.0 24.0.1 24.0.2 24.0.3
23.0.1 23.0.2 23.0.3 23.0.0
22.0.1 22.0.0
21.1.2 21.0.0 21.0.1 21.0.2 21.1.0 21.1.1
20.0.0
19.1.0 19.0.0 19.0.1 19.0.2 19.0.3
18.0.1 18.1.0 18.1.1
17.0.0 | -| Android SDK Platforms | android-S (rev 2)
android-30 (rev 3)
android-29 (rev 5)
android-28 (rev 6)
android-27 (rev 3)
android-26 (rev 2)
android-25 (rev 3)
android-24 (rev 2)
android-23 (rev 3)
android-22 (rev 2)
android-21 (rev 2)
android-20 (rev 2)
android-19 (rev 4)
android-18 (rev 3)
android-17 (rev 3)
android-16 (rev 5)
android-15 (rev 5) | -| Android SDK Platform-Tools | 31.0.1 | +| Android SDK Platforms | android-S (rev 3)
android-30 (rev 3)
android-29 (rev 5)
android-28 (rev 6)
android-27 (rev 3)
android-26 (rev 2)
android-25 (rev 3)
android-24 (rev 2)
android-23 (rev 3)
android-22 (rev 2)
android-21 (rev 2)
android-20 (rev 2)
android-19 (rev 4)
android-18 (rev 3)
android-17 (rev 3)
android-16 (rev 5)
android-15 (rev 5) | +| Android SDK Platform-Tools | 31.0.2 | | Android SDK Tools | 26.1.1 | | Android Support Repository | 47.0.0 | | CMake | 3.10.2 | From 8f215a59bd12ad83c9da881b37a5f4239188855e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 6 May 2021 10:24:38 +0000 Subject: [PATCH 0223/3485] Updating readme file for ubuntu18 version 20210504.1 (#3304) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/linux/Ubuntu1804-README.md | 71 ++++++++++++++++--------------- 1 file changed, 36 insertions(+), 35 deletions(-) diff --git a/images/linux/Ubuntu1804-README.md b/images/linux/Ubuntu1804-README.md index cb1568d957ad..a1fafb41f508 100644 --- a/images/linux/Ubuntu1804-README.md +++ b/images/linux/Ubuntu1804-README.md @@ -1,10 +1,11 @@ | Announcements | |-| -| [[ubuntu] Clang 9 will be removed on May, 17th](https://github.com/actions/virtual-environments/issues/3235) | +| [Ubuntu 16.04 environment will be removed on September 20, 2021](https://github.com/actions/virtual-environments/issues/3287) | +| [[ubuntu] Clang 9 will be removed on May, 17th and default will be set to Clang 11](https://github.com/actions/virtual-environments/issues/3235) | *** # Ubuntu 18.04.5 LTS - Linux kernel version: 5.4.0-1046-azure -- Image Version: 20210425.1 +- Image Version: 20210504.1 ## Installed Software ### Language and Runtime @@ -22,19 +23,19 @@ - Python 2.7.17 - Python3 3.6.9 - Ruby 2.5.1p57 -- Swift 5.3.3 +- Swift 5.4 ### Package Management - cpan 1.64 - Helm 3.5.4 -- Homebrew 3.1.3 +- Homebrew 3.1.5 - Miniconda 4.9.2 - Npm 6.14.12 - Pip 9.0.1 - Pip3 9.0.1 -- Pipx 0.16.1.0 +- Pipx 0.16.2.1 - RubyGems 2.7.6 -- Vcpkg (build from master \<6ebcd4e>) +- Vcpkg (build from master \<95836f4>) - Yarn 1.22.10 #### Environment variables @@ -46,18 +47,18 @@ ### Project Management - Ant 1.10.5 - Gradle 7.0 -- Maven 3.6.3 -- Sbt 1.5.0 +- Maven 3.8.1 +- Sbt 1.5.1 ### Tools -- Ansible 2.10.8 -- apt-fast 1.9.10 +- Ansible 2.10.9 +- apt-fast 1.9.11 - AzCopy 10.10.0 (available by `azcopy` and `azcopy10` aliases) - Bazel 4.0.0 - Bazelisk 1.8.0 - Buildah 1.19.6 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- CMake 3.20.1 -- CodeQL Action Bundle 2.5.2 +- CMake 3.20.2 +- CodeQL Action Bundle 2.5.4 - Docker Compose 1.29.1 - Docker-Buildx 0.5.1 - Docker-Moby Client 20.10.6+azure @@ -66,8 +67,8 @@ - Git LFS 2.13.3 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.3.1 - Haveged 1.9.1 -- Heroku 7.52.0 -- HHVM (HipHop VM) 4.106.0 +- Heroku 7.53.0 +- HHVM (HipHop VM) 4.107.0 - jq 1.5 - Kind 0.10.0 - Kubectl 1.20.1-5-g76a04fc @@ -76,7 +77,7 @@ - MediaInfo 17.12 - Mercurial 4.5.3 - Minikube 1.19.0 -- Newman 5.2.2 +- Newman 5.2.3 - nvm 0.38.0 - OpenSSL 1.1.1 11 Sep 2018 - Packer 1.7.2 @@ -87,42 +88,42 @@ - Skopeo 1.2.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 - SVN 1.9.7 -- Terraform 0.15.0 +- Terraform 0.15.1 - yamllint 1.26.1 - zstd 1.4.9 (homebrew) ### CLI Tools -- Alibaba Cloud CLI 3.0.73 -- AWS CLI 1.19.57 +- Alibaba Cloud CLI 3.0.74 +- AWS CLI 1.19.64 - AWS CLI Session manager plugin 1.2.54.0 - AWS SAM CLI 1.23.0 - Azure CLI (azure-cli) 2.22.1 - Azure CLI (azure-devops) 0.18.0 - GitHub CLI 1.9.2 -- Google Cloud SDK 337.0.0 (apt source repository: https://packages.cloud.google.com/apt) +- Google Cloud SDK 338.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 3.21.9 -- OpenShift CLI 4.7.7 +- Netlify CLI 3.25.0 +- OpenShift CLI 4.7.8 - ORAS CLI 0.11.1 - Vercel CLI 22.0.1 ### Java | Version | Vendor | Environment Variable | | ------------------- | ------------- | -------------------- | -| 8.0.282+8 (default) | Adopt OpenJDK | JAVA_HOME_8_X64 | -| 11.0.10+9 | Adopt OpenJDK | JAVA_HOME_11_X64 | +| 8.0.292+1 (default) | Adopt OpenJDK | JAVA_HOME_8_X64 | +| 11.0.11+9 | Adopt OpenJDK | JAVA_HOME_11_X64 | | 12.0.2+10 | Adopt OpenJDK | JAVA_HOME_12_X64 | ### PHP -| Tool | Version | -| -------- | --------------------------------- | -| PHP | 7.1.33 7.2.34 7.3.27 7.4.16 8.0.3 | -| Composer | 2.0.12 | -| PHPUnit | 8.5.15 | +| Tool | Version | +| -------- | ------------------------------------------------------------------------- | +| PHP | 7.1.33 7.2.34 7.3.28 7.4.18 8.0.5 (apt source repository: ppa:ondrej/php) | +| Composer | 2.0.13 | +| PHPUnit | 8.5.15 | ### Haskell - Cabal 3.4.0.0 -- GHC 9.0.1 +- GHC 9.0.1 (apt source repository: ppa:hvr/ghc) - GHCup 0.1.14.1 - Stack 2.5.1 @@ -130,20 +131,20 @@ - Cargo 1.51.0 - Rust 1.51.0 - Rustdoc 1.51.0 -- Rustup 1.23.1 +- Rustup 1.24.1 #### Packages - Bindgen 0.58.1 -- Cargo audit 0.14.0 +- Cargo audit 0.14.1 - Cargo clippy 0.1.51 - Cargo outdated 0.9.15 - Cbindgen 0.19.0 - Rustfmt 1.4.36 ### Browsers and Drivers -- Google Chrome 90.0.4430.85 +- Google Chrome 90.0.4430.93 - ChromeDriver 90.0.4430.24 -- Mozilla Firefox 87.0 +- Mozilla Firefox 88.0 - Geckodriver 0.29.1 - Chromium 90.0.4430.0 @@ -229,7 +230,7 @@ ### Android | Package Name | Version | | -------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 3.0 | +| Android Command Line Tools | 4.0 | | Android SDK Build-tools | 30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3
26.0.0 26.0.1 26.0.2 26.0.3
25.0.0 25.0.1 25.0.2 25.0.3
24.0.0 24.0.1 24.0.2 24.0.3
23.0.1 23.0.2 23.0.3 | | Android SDK Platform-Tools | 31.0.2 | | Android SDK Platforms | android-S (rev 3)
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) | @@ -281,7 +282,7 @@ | coreutils | 8.28-1ubuntu1 | | curl | 7.58.0-2ubuntu3.13 | | dbus | 1.12.2-1ubuntu1.2 | -| dnsutils | 1:9.11.3+dfsg-1ubuntu1.14 | +| dnsutils | 1:9.11.3+dfsg-1ubuntu1.15 | | dpkg | 1.19.0.5ubuntu2.3 | | fakeroot | 1.22-2ubuntu1 | | file | 1:5.32-2ubuntu0.4 | From a583688e0d9b2d77f180b7ee4c367f40a5ea7daa Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 6 May 2021 10:28:54 +0000 Subject: [PATCH 0224/3485] Updating readme file for ubuntu16 version 20210504.1 (#3305) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/linux/Ubuntu1604-README.md | 69 ++++++++++++++++--------------- 1 file changed, 35 insertions(+), 34 deletions(-) diff --git a/images/linux/Ubuntu1604-README.md b/images/linux/Ubuntu1604-README.md index c135115cb214..ca6aef544173 100644 --- a/images/linux/Ubuntu1604-README.md +++ b/images/linux/Ubuntu1604-README.md @@ -1,10 +1,11 @@ | Announcements | |-| -| [[ubuntu] Clang 9 will be removed on May, 17th](https://github.com/actions/virtual-environments/issues/3235) | +| [Ubuntu 16.04 environment will be removed on September 20, 2021](https://github.com/actions/virtual-environments/issues/3287) | +| [[ubuntu] Clang 9 will be removed on May, 17th and default will be set to Clang 11](https://github.com/actions/virtual-environments/issues/3235) | *** # Ubuntu 16.04.7 LTS - Linux kernel version: 4.15.0-1113-azure -- Image Version: 20210425.1 +- Image Version: 20210504.1 ## Installed Software ### Language and Runtime @@ -22,18 +23,18 @@ - Python 2.7.12 - Python3 3.5.2 - Ruby 2.3.1p112 -- Swift 5.3.3 +- Swift 5.4 ### Package Management - cpan 1.61 - Helm 3.5.4 -- Homebrew 3.1.3 +- Homebrew 3.1.5 - Miniconda 4.9.2 - Npm 6.14.12 - Pip 8.1.1 - Pip3 8.1.1 - RubyGems 2.5.2 -- Vcpkg (build from master \<84e5852>) +- Vcpkg (build from master \<95836f4>) - Yarn 1.22.10 #### Environment variables @@ -45,17 +46,17 @@ ### Project Management - Ant 1.9.6 - Gradle 7.0 -- Maven 3.6.3 -- Sbt 1.5.0 +- Maven 3.8.1 +- Sbt 1.5.1 ### Tools -- Ansible 2.9.20 -- apt-fast 1.9.10 +- Ansible 2.9.21 +- apt-fast 1.9.11 - AzCopy 10.10.0 (available by `azcopy` and `azcopy10` aliases) - Bazel 4.0.0 - Bazelisk 1.8.0 -- CMake 3.20.1 -- CodeQL Action Bundle 2.5.2 +- CMake 3.20.2 +- CodeQL Action Bundle 2.5.4 - Docker Compose 1.29.1 - Docker-Buildx 0.5.1 - Docker-Moby Client 20.10.6+azure @@ -64,7 +65,7 @@ - Git LFS 2.13.3 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.0.2 - Haveged 1.9.1 -- Heroku 7.52.0 +- Heroku 7.53.0 - HHVM (HipHop VM) 4.56.6 - jq 1.5 - Kind 0.10.0 @@ -74,7 +75,7 @@ - MediaInfo 0.7.82 - Mercurial 4.4.1 - Minikube 1.19.0 -- Newman 5.2.2 +- Newman 5.2.3 - nvm 0.38.0 - OpenSSL 1.0.2g 1 Mar 2016 - Packer 1.7.2 @@ -83,41 +84,41 @@ - R 4.0.5 - Sphinx Open Source Search Server 2.2.9 - SVN 1.9.3 -- Terraform 0.15.0 +- Terraform 0.15.1 - zstd 1.4.9 (homebrew) ### CLI Tools -- Alibaba Cloud CLI 3.0.73 -- AWS CLI 1.19.57 +- Alibaba Cloud CLI 3.0.74 +- AWS CLI 1.19.64 - AWS CLI Session manager plugin 1.2.54.0 - AWS SAM CLI 1.23.0 - Azure CLI (azure-cli) 2.22.1 - Azure CLI (azure-devops) 0.18.0 - GitHub CLI 1.9.2 -- Google Cloud SDK 337.0.0 (apt source repository: https://packages.cloud.google.com/apt) +- Google Cloud SDK 338.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 3.21.9 -- OpenShift CLI 4.7.7 +- Netlify CLI 3.25.0 +- OpenShift CLI 4.7.8 - ORAS CLI 0.11.1 - Vercel CLI 22.0.1 ### Java | Version | Vendor | Environment Variable | | ------------------- | ------------- | -------------------- | -| 8.0.282+8 (default) | Adopt OpenJDK | JAVA_HOME_8_X64 | -| 11.0.10+9 | Adopt OpenJDK | JAVA_HOME_11_X64 | +| 8.0.292+1 (default) | Adopt OpenJDK | JAVA_HOME_8_X64 | +| 11.0.11+9 | Adopt OpenJDK | JAVA_HOME_11_X64 | | 12.0.2+10 | Adopt OpenJDK | JAVA_HOME_12_X64 | ### PHP -| Tool | Version | -| -------- | ----------------------------------------------- | -| PHP | 5.6.40 7.0.33 7.1.33 7.2.34 7.3.27 7.4.16 8.0.3 | -| Composer | 2.0.12 | -| PHPUnit | 8.5.15 | +| Tool | Version | +| -------- | --------------------------------------------------------------------------------------- | +| PHP | 5.6.40 7.0.33 7.1.33 7.2.34 7.3.28 7.4.18 8.0.5 (apt source repository: ppa:ondrej/php) | +| Composer | 2.0.13 | +| PHPUnit | 8.5.15 | ### Haskell - Cabal 3.4.0.0 -- GHC 9.0.1 +- GHC 9.0.1 (apt source repository: ppa:hvr/ghc) - GHCup 0.1.14.1 - Stack 2.5.1 @@ -125,20 +126,20 @@ - Cargo 1.51.0 - Rust 1.51.0 - Rustdoc 1.51.0 -- Rustup 1.23.1 +- Rustup 1.24.1 #### Packages - Bindgen 0.58.1 -- Cargo audit 0.14.0 +- Cargo audit 0.14.1 - Cargo clippy 0.1.51 - Cargo outdated 0.9.15 - Cbindgen 0.19.0 - Rustfmt 1.4.36 ### Browsers and Drivers -- Google Chrome 90.0.4430.85 +- Google Chrome 90.0.4430.93 - ChromeDriver 90.0.4430.24 -- Mozilla Firefox 87.0 +- Mozilla Firefox 88.0 - Geckodriver 0.29.1 - Chromium 90.0.4430.0 @@ -224,7 +225,7 @@ ### Android | Package Name | Version | | -------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 3.0 | +| Android Command Line Tools | 4.0 | | Android SDK Build-tools | 30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3
26.0.0 26.0.1 26.0.2 26.0.3
25.0.0 25.0.1 25.0.2 25.0.3
24.0.0 24.0.1 24.0.2 24.0.3
23.0.1 23.0.2 23.0.3 | | Android SDK Platform-Tools | 31.0.2 | | Android SDK Platforms | android-S (rev 3)
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) | @@ -276,8 +277,8 @@ | coreutils | 8.25-2ubuntu3~16.04 | | curl | 7.47.0-1ubuntu2.19 | | dbus | 1.10.6-1ubuntu3.6 | -| dnsutils | 1:9.10.3.dfsg.P4-8ubuntu1.18 | -| dpkg | 1.18.4ubuntu1.6 | +| dnsutils | 1:9.10.3.dfsg.P4-8ubuntu1.19 | +| dpkg | 1.18.4ubuntu1.7 | | fakeroot | 1.20.2-1ubuntu1 | | file | 1:5.25-2ubuntu1.4 | | flex | 2.6.0-11 | From 028fa5d893559484a53f1fa7fa89faea9c558ea0 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Thu, 6 May 2021 16:38:58 +0300 Subject: [PATCH 0225/3485] [macOS] Add Xamarin ios 14.16 and mac 7.10 (#3329) --- images/macos/toolsets/toolset-10.15.json | 13 ++++++++++--- images/macos/toolsets/toolset-11.0.json | 13 ++++++++++--- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index 9ff43d509674..6b98fe1b97e6 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -23,16 +23,23 @@ "6.12.0.125", "6.10.0.106", "6.8.0.123", "6.6.0.166", "6.4.0.208" ], "ios-versions": [ - "14.14.2.5", "14.10.0.4", "14.8.0.3", "14.6.0.15", "14.4.1.3", "14.2.0.12", "14.0.0.0", "13.20.2.2", "13.18.2.1", "13.16.0.13", "13.14.1.39", "13.10.0.21", "13.8.3.0", "13.6.0.12", "13.4.0.2", "13.2.0.47" + "14.16.0.5", "14.14.2.5", "14.10.0.4", "14.8.0.3", "14.6.0.15", "14.4.1.3", "14.2.0.12", "14.0.0.0", "13.20.2.2", "13.18.2.1", "13.16.0.13", "13.14.1.39", "13.10.0.21", "13.8.3.0", "13.6.0.12", "13.4.0.2", "13.2.0.47" ], "mac-versions": [ - "7.8.2.5", "7.4.0.10", "7.2.0.3", "7.0.0.15", "6.22.1.26", "6.20.2.2", "6.18.3.2", "6.16.0.13", "6.14.1.39", "6.10.0.21", "6.8.3.0", "6.6.0.12", "6.4.0.2", "6.2.0.47" + "7.10.0.5", "7.8.2.5", "7.4.0.10", "7.2.0.3", "7.0.0.15", "6.22.1.26", "6.20.2.2", "6.18.3.2", "6.16.0.13", "6.14.1.39", "6.10.0.21", "6.8.3.0", "6.6.0.12", "6.4.0.2", "6.2.0.47" ], "android-versions": [ "11.2.2.1", "11.1.0.26", "11.0.2.0", "10.3.1.4", "10.2.0.100", "10.1.3.7", "10.0.6.2" ], - "bundle-default": "6_12_7", + "bundle-default": "6_12_8", "bundles": [ + { + "symlink": "6_12_8", + "mono":"6.12", + "ios": "14.16", + "mac": "7.10", + "android": "11.2" + }, { "symlink": "6_12_7", "mono":"6.12", diff --git a/images/macos/toolsets/toolset-11.0.json b/images/macos/toolsets/toolset-11.0.json index c02c0788f21e..f397fb364f34 100644 --- a/images/macos/toolsets/toolset-11.0.json +++ b/images/macos/toolsets/toolset-11.0.json @@ -15,16 +15,23 @@ "6.12.0.125" ], "ios-versions": [ - "14.14.2.5", "14.10.0.4", "14.8.0.3", "14.6.0.15", "14.4.1.3", "14.2.0.12", "14.0.0.0", "13.20.2.2" + "14.16.0.5", "14.14.2.5", "14.10.0.4", "14.8.0.3", "14.6.0.15", "14.4.1.3", "14.2.0.12", "14.0.0.0", "13.20.2.2" ], "mac-versions": [ - "7.8.2.5", "7.4.0.10", "7.2.0.3", "7.0.0.15", "6.22.1.26", "6.20.2.2" + "7.10.0.5", "7.8.2.5", "7.4.0.10", "7.2.0.3", "7.0.0.15", "6.22.1.26", "6.20.2.2" ], "android-versions": [ "11.2.2.1", "11.1.0.26", "11.0.2.0" ], - "bundle-default": "6_12_7", + "bundle-default": "6_12_8", "bundles": [ + { + "symlink": "6_12_8", + "mono":"6.12", + "ios": "14.16", + "mac": "7.10", + "android": "11.2" + }, { "symlink": "6_12_7", "mono":"6.12", From 158ed05b6540b2ca90b3464246721e5050a8fb53 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 6 May 2021 15:03:30 +0000 Subject: [PATCH 0226/3485] Updating readme file for ubuntu20 version 20210504.1 (#3312) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/linux/Ubuntu2004-README.md | 75 ++++++++++++++++--------------- 1 file changed, 38 insertions(+), 37 deletions(-) diff --git a/images/linux/Ubuntu2004-README.md b/images/linux/Ubuntu2004-README.md index 04206a309f21..06849e2128d2 100644 --- a/images/linux/Ubuntu2004-README.md +++ b/images/linux/Ubuntu2004-README.md @@ -1,10 +1,11 @@ | Announcements | |-| -| [[ubuntu] Clang 9 will be removed on May, 17th](https://github.com/actions/virtual-environments/issues/3235) | +| [Ubuntu 16.04 environment will be removed on September 20, 2021](https://github.com/actions/virtual-environments/issues/3287) | +| [[ubuntu] Clang 9 will be removed on May, 17th and default will be set to Clang 11](https://github.com/actions/virtual-environments/issues/3235) | *** # Ubuntu 20.04.2 LTS - Linux kernel version: 5.4.0-1046-azure -- Image Version: 20210425.1 +- Image Version: 20210504.1 ## Installed Software ### Language and Runtime @@ -22,19 +23,19 @@ - Python 3.8.5 - Python3 3.8.5 - Ruby 2.7.0p0 -- Swift 5.3.3 +- Swift 5.4 ### Package Management - cpan 1.64 - Helm 3.5.4 -- Homebrew 3.1.3 +- Homebrew 3.1.5 - Miniconda 4.9.2 - Npm 6.14.12 - Pip 20.0.2 - Pip3 20.0.2 -- Pipx 0.16.1.0 +- Pipx 0.16.2.1 - RubyGems 3.1.2 -- Vcpkg (build from master \<6ebcd4e>) +- Vcpkg (build from master \) - Yarn 1.22.10 #### Environment variables @@ -47,18 +48,18 @@ - Ant 1.10.7 - Gradle 7.0 - Lerna 4.0.0 -- Maven 3.6.3 -- Sbt 1.5.0 +- Maven 3.8.1 +- Sbt 1.5.1 ### Tools -- Ansible 2.10.8 -- apt-fast 1.9.10 +- Ansible 2.10.9 +- apt-fast 1.9.11 - AzCopy 10.10.0 (available by `azcopy` and `azcopy10` aliases) - Bazel 4.0.0 - Bazelisk 1.8.0 - Buildah 1.20.1 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- CMake 3.20.1 -- CodeQL Action Bundle 2.5.2 +- CMake 3.20.2 +- CodeQL Action Bundle 2.5.4 - Docker Compose 1.29.1 - Docker-Buildx 0.5.1 - Docker-Moby Client 20.10.6+azure @@ -68,8 +69,8 @@ - Git LFS 2.13.3 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.6.0 - Haveged 1.9.1 -- Heroku 7.52.0 -- HHVM (HipHop VM) 4.106.0 +- Heroku 7.53.0 +- HHVM (HipHop VM) 4.107.0 - jq 1.6 - Kind 0.10.0 - Kubectl 1.20.1-5-g76a04fc @@ -78,7 +79,7 @@ - MediaInfo 19.09 - Mercurial 5.3.1 - Minikube 1.19.0 -- Newman 5.2.2 +- Newman 5.2.3 - nvm 0.38.0 - OpenSSL 1.1.1f 31 Mar 2020 - Packer 1.7.2 @@ -89,30 +90,30 @@ - Skopeo 1.2.3 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 -- Terraform 0.15.0 +- Terraform 0.15.1 - yamllint 1.26.1 - zstd 1.4.9 (homebrew) ### CLI Tools -- Alibaba Cloud CLI 3.0.73 -- AWS CLI 2.1.39 +- Alibaba Cloud CLI 3.0.74 +- AWS CLI 2.2.1 - AWS CLI Session manager plugin 1.2.54.0 - AWS SAM CLI 1.23.0 - Azure CLI (azure-cli) 2.22.1 - Azure CLI (azure-devops) 0.18.0 - GitHub CLI 1.9.2 -- Google Cloud SDK 337.0.0 (apt source repository: https://packages.cloud.google.com/apt) +- Google Cloud SDK 338.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 3.21.9 -- OpenShift CLI 4.7.7 +- Netlify CLI 3.26.0 +- OpenShift CLI 4.7.8 - ORAS CLI 0.11.1 - Vercel CLI 22.0.1 ### Java | Version | Vendor | Environment Variable | | ------------------- | ------------- | -------------------- | -| 8.0.282+8 | Adopt OpenJDK | JAVA_HOME_8_X64 | -| 11.0.10+9 (default) | Adopt OpenJDK | JAVA_HOME_11_X64 | +| 8.0.292+1 | Adopt OpenJDK | JAVA_HOME_8_X64 | +| 11.0.11+9 (default) | Adopt OpenJDK | JAVA_HOME_11_X64 | ### GraalVM | Version | Environment variables | @@ -120,15 +121,15 @@ | CE 21.1.0 | GRAALVM_11_ROOT | ### PHP -| Tool | Version | -| -------- | ------------ | -| PHP | 7.4.16 8.0.3 | -| Composer | 2.0.12 | -| PHPUnit | 8.5.15 | +| Tool | Version | +| -------- | ---------------------------------------------------- | +| PHP | 7.4.18 8.0.5 (apt source repository: ppa:ondrej/php) | +| Composer | 2.0.13 | +| PHPUnit | 8.5.15 | ### Haskell - Cabal 3.4.0.0 -- GHC 9.0.1 +- GHC 9.0.1 (apt source repository: ppa:hvr/ghc) - GHCup 0.1.14.1 - Stack 2.5.1 @@ -136,20 +137,20 @@ - Cargo 1.51.0 - Rust 1.51.0 - Rustdoc 1.51.0 -- Rustup 1.23.1 +- Rustup 1.24.1 #### Packages - Bindgen 0.58.1 -- Cargo audit 0.14.0 +- Cargo audit 0.14.1 - Cargo clippy 0.1.51 - Cargo outdated 0.9.15 - Cbindgen 0.19.0 - Rustfmt 1.4.36 ### Browsers and Drivers -- Google Chrome 90.0.4430.85 +- Google Chrome 90.0.4430.93 - ChromeDriver 90.0.4430.24 -- Mozilla Firefox 87.0 +- Mozilla Firefox 88.0 - Geckodriver 0.29.1 - Chromium 90.0.4430.0 @@ -198,8 +199,8 @@ - 3.5.10 - 3.6.13 - 3.7.10 -- 3.8.9 -- 3.9.4 +- 3.8.10 +- 3.9.5 #### Ruby - 2.5.9 @@ -237,7 +238,7 @@ ### Android | Package Name | Version | | -------------------------- | ------------------------------------------------------------------------------------------------------------------------ | -| Android Command Line Tools | 3.0 | +| Android Command Line Tools | 4.0 | | Android SDK Build-tools | 30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3 | | Android SDK Platform-Tools | 31.0.2 | | Android SDK Platforms | android-S (rev 3)
android-30 (rev 3)
android-29 (rev 5)
android-28 (rev 6)
android-27 (rev 3) | @@ -290,7 +291,7 @@ | coreutils | 8.30-3ubuntu2 | | curl | 7.68.0-1ubuntu2.5 | | dbus | 1.12.16-2ubuntu2.1 | -| dnsutils | 1:9.16.1-0ubuntu2.7 | +| dnsutils | 1:9.16.1-0ubuntu2.8 | | dpkg | 1.19.7ubuntu3 | | fakeroot | 1.24-1 | | file | 1:5.38-4 | From 52d48bcbcde1296a8268bb97f47562b004201a80 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 7 May 2021 13:27:14 +0000 Subject: [PATCH 0227/3485] Updating readme file for macOS-10.15 version 20210503.2 (#3301) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/macos/macos-10.15-Readme.md | 52 +++++++++++++++--------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/images/macos/macos-10.15-Readme.md b/images/macos/macos-10.15-Readme.md index 63ddb3596b76..05ff2a1b0ae8 100644 --- a/images/macos/macos-10.15-Readme.md +++ b/images/macos/macos-10.15-Readme.md @@ -3,9 +3,9 @@ | [macOS 11.0 pools will be transited to private preview.](https://github.com/actions/virtual-environments/issues/2486) | *** # macOS 10.15 info -- System Version: macOS 10.15.7 (19H524) +- System Version: macOS 10.15.7 (19H1030) - Kernel Version: Darwin 19.6.0 -- Image Version: 20210423.1 +- Image Version: 20210503.2 ## Installed Software ### Language and Runtime @@ -20,13 +20,13 @@ - GNU Fortran (Homebrew GCC 8.4.0_3) 8.4.0 - available by `gfortran-8` alias - GNU Fortran (Homebrew GCC 9.3.0_2) 9.3.0 - available by `gfortran-9` alias - Go 1.15.11 -- julia 1.6.0 +- julia 1.6.1 - MSBuild 16.6.0.15801 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) - Node.js v14.16.1 - NVM - Cached node versions: v10.24.1 v12.22.1 v14.16.1 - NVM 0.38.0 - Perl 5.32.1 -- PHP 8.0.3 +- PHP 8.0.5 - Python 2.7.18 - Python 3.9.4 - R 4.0.5 @@ -36,16 +36,16 @@ - Bundler version 2.2.16 - Carthage 0.37.0 - CocoaPods 1.10.1 -- Composer 2.0.12 -- Homebrew 3.1.3 +- Composer 2.0.13 +- Homebrew 3.1.5 - Miniconda 4.9.2 - NPM 6.14.12 - NuGet 5.6.0.6489 - Pip 20.3.4 (python 2.7) - Pip 21.0.1 (python 3.9) -- Pipx 0.16.1.0 +- Pipx 0.16.2.1 - RubyGems 3.2.16 -- Vcpkg 2021 (build from master \<6ebcd4e>) +- Vcpkg 2021 (build from master \<95836f4>) - Yarn 1.22.5 #### Environment variables @@ -77,28 +77,28 @@ - helm v3.5.4+g1b5edb6 - Hub CLI: 2.14.2 - jq 1.6 -- mongo v4.4.4 -- mongod v4.4.4 -- Newman 5.2.2 +- mongo v4.4.5 +- mongod v4.4.5 +- Newman 5.2.3 - OpenSSL 1.1.1k 25 Mar 2021 `(/usr/local/opt/openssl -> /usr/local/Cellar/openssl@1.1/1.1.1k)` - Packer 1.7.2 - PostgreSQL 13.2 - psql (PostgreSQL) 13.2 - Subversion (SVN) 1.14.1 -- Vagrant 2.2.15 -- virtualbox 6.1.20r143896 +- Vagrant 2.2.16 +- virtualbox 6.1.22r144080 - zstd 1.4.9 ### Tools -- Aliyun CLI 3.0.73 +- Aliyun CLI 3.0.74 - App Center CLI 2.9.0 -- AWS CLI 2.1.39 +- AWS CLI 2.2.1 - AWS SAM CLI 1.23.0 - AWS Session Manager CLI 1.2.54.0 - Azure CLI 2.22.1 - Cabal 3.4.0.0 -- Cmake 3.20.1 +- Cmake 3.20.2 - Fastlane 2.181.0 - GHC 9.0.1 - GHCup v0.1.14.1 @@ -111,12 +111,12 @@ - yamllint 1.26.1 ### Browsers -- Safari 14.0.3 (15610.4.3.1.7) -- SafariDriver 14.0.3 (15610.4.3.1.7) -- Google Chrome 90.0.4430.85 +- Safari 14.1 (15611.1.21.161.5) +- SafariDriver 14.1 (15611.1.21.161.5) +- Google Chrome 90.0.4430.93 - ChromeDriver 90.0.4430.24 -- Microsoft Edge 90.0.818.42 -- MSEdgeDriver 90.0.818.46 +- Microsoft Edge 90.0.818.51 +- MSEdgeDriver 90.0.818.51 - Mozilla Firefox 88.0 - geckodriver 0.29.1 @@ -176,8 +176,8 @@ #### Packages - Bindgen 0.58.1 -- Cargo-audit 0.14.0 -- Cargo-outdated v0.9.14 +- Cargo-audit 0.14.1 +- Cargo-outdated v0.9.15 - Cbindgen 0.19.0 - Clippy 0.1.51 - Rustfmt 1.4.36-stable @@ -201,7 +201,7 @@ ### Xamarin #### Visual Studio for Mac -- 8.9.7.8 +- 8.9.8.7 #### Xamarin bundles | symlink | Xamarin.Mono | Xamarin.iOS | Xamarin.Mac | Xamarin.Android | @@ -339,8 +339,8 @@ ### Android | Package Name | Version | | -------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 3.0 | -| Android Emulator | 30.5.5 | +| Android Command Line Tools | 4.0 | +| Android Emulator | 30.5.6 | | Android SDK Build-tools | 30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3
26.0.0 26.0.1 26.0.2 26.0.3
25.0.0 25.0.1 25.0.2 25.0.3
24.0.0 24.0.1 24.0.2 24.0.3 | | Android SDK Platforms | android-S (rev 3)
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 Platform-Tools | 31.0.2 | From a5ee51f72dcbc3879a91a74c63f95737e2d4a292 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Fri, 7 May 2021 16:35:34 +0300 Subject: [PATCH 0228/3485] Revert "[ubuntu] Rework php installation (#3272)" (#3340) This reverts commit b1f202e5f05f2adc6cbe7a068f6c51bcefe73566. --- .../SoftwareReport/SoftwareReport.Common.psm1 | 7 +++---- images/linux/scripts/installers/php.sh | 14 +++++++------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 index c359f768657a..96cc4b562555 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 @@ -211,11 +211,10 @@ function Get-SbtVersion { function Get-PHPVersions { $result = Get-CommandResult "apt list --installed" -Multiline - $aptSourceRepo = Get-AptSourceRepository -PackageName "php" - $versionsList = $result.Output | Where-Object { $_ -match "^php\d+\.\d+/"} | ForEach-Object { + return $result.Output | Where-Object { $_ -match "^php\d+\.\d+/"} | ForEach-Object { $_ -match "now (?\d+\.\d+\.\d+)-" | Out-Null - $Matches.version } - return $versionsList + "(apt source repository: $aptSourceRepo)" + $Matches.version + } } function Get-ComposerVersion { diff --git a/images/linux/scripts/installers/php.sh b/images/linux/scripts/installers/php.sh index 020d8c4760e3..5391e2cb37b5 100644 --- a/images/linux/scripts/installers/php.sh +++ b/images/linux/scripts/installers/php.sh @@ -10,8 +10,7 @@ source $HELPER_SCRIPTS/os.sh source $HELPER_SCRIPTS/install.sh # add repository -REPO_URL="ppa:ondrej/php" -apt-add-repository $REPO_URL -y +apt-add-repository ppa:ondrej/php -y apt-get update # Install PHP @@ -99,10 +98,11 @@ wget -q -O phpunit https://phar.phpunit.de/phpunit-8.phar chmod +x phpunit mv phpunit /usr/local/bin/phpunit -# remove repository after successfull installation -rm -r /etc/apt/sources.list.d/ondrej-ubuntu-php-* - -echo "php $REPO_URL" >> $HELPER_SCRIPTS/apt-sources.txt -apt-get update +# ubuntu 20.04 libzip-dev is libzip5 based and is not compatible libzip-dev of ppa:ondrej/php +# see https://github.com/actions/virtual-environments/issues/1084 +if isUbuntu20 ; then + rm /etc/apt/sources.list.d/ondrej-ubuntu-php-focal.list + apt-get update +fi invoke_tests "Common" "PHP" \ No newline at end of file From dc6dc8374299203c3070de02c137108913e412e6 Mon Sep 17 00:00:00 2001 From: Dibir Magomedsaygitov <61747324+dibir-magomedsaygitov@users.noreply.github.com> Date: Tue, 11 May 2021 10:15:27 +0300 Subject: [PATCH 0229/3485] fix minikube version output (#3352) --- images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 index 66964a99fb2e..eb64d6850049 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 @@ -135,7 +135,7 @@ function Get-KubectlVersion { } function Get-MinikubeVersion { - $minikubeVersion = minikube version --short | Take-OutputPart -Part 2 | Take-OutputPart -Part 0 -Delimiter "v" + $minikubeVersion = minikube version --short | Take-OutputPart -Part 0 -Delimiter "v" return "Minikube $minikubeVersion" } From ae3284dad12b02ab7db14f8d41a4008a175ccb15 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 11 May 2021 09:48:58 +0000 Subject: [PATCH 0230/3485] Updating readme file for macOS-11.0 version 20210510.1 (#3355) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/macos/macos-11.0-Readme.md | 69 ++++++++++++++++--------------- 1 file changed, 35 insertions(+), 34 deletions(-) diff --git a/images/macos/macos-11.0-Readme.md b/images/macos/macos-11.0-Readme.md index b79878c3412b..efd72d060134 100644 --- a/images/macos/macos-11.0-Readme.md +++ b/images/macos/macos-11.0-Readme.md @@ -5,7 +5,7 @@ # macOS 11.3 info - System Version: macOS 11.3.1 (20E241) - Kernel Version: Darwin 20.4.0 -- Image Version: 20210503.1 +- Image Version: 20210510.1 ## Installed Software ### Language and Runtime @@ -13,27 +13,27 @@ - Bash 3.2.57(1)-release - Clang/LLVM 12.0.0 is available on `'$(brew --prefix llvm)/bin/clang'` - Clang/LLVM 12.0.0 is default -- gcc-10 (Homebrew GCC 10.2.0_4) 10.2.0 - available by `gcc-10` alias +- gcc-10 (Homebrew GCC 10.3.0) 10.3.0 - available by `gcc-10` alias - gcc-8 (Homebrew GCC 8.4.0_3) 8.4.0 - available by `gcc-8` alias - gcc-9 (Homebrew GCC 9.3.0_2) 9.3.0 - available by `gcc-9` alias -- GNU Fortran (Homebrew GCC 10.2.0_4) 10.2.0 - available by `gfortran-10` alias +- GNU Fortran (Homebrew GCC 10.3.0) 10.3.0 - available by `gfortran-10` alias - GNU Fortran (Homebrew GCC 8.4.0_3) 8.4.0 - available by `gfortran-8` alias - GNU Fortran (Homebrew GCC 9.3.0_2) 9.3.0 - available by `gfortran-9` alias -- Go 1.15.11 +- Go 1.15.12 - julia 1.6.1 - MSBuild 16.6.0.15801 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) - Node.js v14.16.1 - NVM - Cached node versions: v10.24.1 v12.22.1 v14.16.1 - NVM 0.38.0 - Perl 5.32.1 -- PHP 8.0.5 +- PHP 8.0.6 - Python 2.7.18 -- Python 3.9.4 +- Python 3.9.5 - Ruby 2.7.3p183 ### Package Management -- Bundler version 2.2.16 -- Carthage 0.37.0 +- Bundler version 2.2.17 +- Carthage 0.38.0 - CocoaPods 1.10.1 - Composer 2.0.13 - Homebrew 3.1.5 @@ -41,10 +41,10 @@ - NPM 6.14.12 - NuGet 5.6.0.6489 - Pip 20.3.4 (python 2.7) -- Pip 21.0.1 (python 3.9) +- Pip 21.1.1 (python 3.9) - Pipx 0.16.2.1 -- RubyGems 3.2.16 -- Vcpkg 2021 (build from master \<8f03e22>) +- RubyGems 3.2.17 +- Vcpkg 2021 (build from master \<5a271a9>) - Yarn 1.22.5 #### Environment variables @@ -63,7 +63,7 @@ - aria2 1.35.0 - azcopy 10.10.0 - bazel 4.0.0 -- bazelisk 1.8.0 +- bazelisk 1.8.1 - bsdtar 3.3.2 - available by 'tar' alias - Curl 7.76.1 - Git LFS: 2.13.3 @@ -89,17 +89,17 @@ ### Tools - Aliyun CLI 3.0.74 - App Center CLI 2.9.0 -- AWS CLI 2.2.1 +- AWS CLI 2.2.3 - AWS SAM CLI 1.23.0 - AWS Session Manager CLI 1.2.54.0 -- Azure CLI 2.22.1 +- Azure CLI 2.23.0 - Cabal 3.4.0.0 - Cmake 3.20.2 -- Fastlane 2.181.0 +- Fastlane 2.182.0 - GHC 9.0.1 - GHCup v0.1.14.1 -- Stack 2.5.1 -- SwiftFormat 0.48.0 +- Stack 2.7.1 +- SwiftFormat 0.48.1 - Xcode Command Line Tools 12.5.0.0.1.1617976050 ### Linters @@ -111,9 +111,9 @@ - SafariDriver 14.1 (16611.1.21.161.6) - Google Chrome 90.0.4430.93 - ChromeDriver 90.0.4430.24 -- Microsoft Edge 90.0.818.51 -- MSEdgeDriver 90.0.818.51 -- Mozilla Firefox 88.0 +- Microsoft Edge 90.0.818.56 +- MSEdgeDriver 90.0.818.56 +- Mozilla Firefox 88.0.1 - geckodriver 0.29.1 #### Environment variables @@ -139,8 +139,8 @@ #### Python - 3.7.10 -- 3.8.9 -- 3.9.4 +- 3.8.10 +- 3.9.5 #### Node.js - 10.24.1 @@ -148,21 +148,21 @@ - 14.16.1 #### Go -- 1.15.11 -- 1.16.3 +- 1.15.12 +- 1.16.4 ### Rust Tools -- Cargo 1.51.0 -- Rust 1.51.0 -- Rustdoc 1.51.0 -- Rustup 1.23.1 +- Cargo 1.52.0 +- Rust 1.52.0 +- Rustdoc 1.52.0 +- Rustup 1.24.1 #### Packages - Bindgen 0.58.1 - Cargo-audit 0.14.1 - Cargo-outdated v0.9.15 - Cbindgen 0.19.0 -- Clippy 0.1.51 +- Clippy 0.1.52 - Rustfmt 1.4.36-stable ### PowerShell Tools @@ -173,7 +173,7 @@ | ---------------- | ------- | | Az | 5.7.0 | | MarkdownPS | 1.9 | -| Pester | 5.1.1 | +| Pester | 5.2.0 | | PSScriptAnalyzer | 1.19.1 | ### Web Servers @@ -189,7 +189,8 @@ #### Xamarin bundles | symlink | Xamarin.Mono | Xamarin.iOS | Xamarin.Mac | Xamarin.Android | | ---------------- | ------------ | ----------- | ----------- | --------------- | -| 6_12_7 (default) | 6.12 | 14.14 | 7.8 | 11.2 | +| 6_12_8 (default) | 6.12 | 14.16 | 7.10 | 11.2 | +| 6_12_7 | 6.12 | 14.14 | 7.8 | 11.2 | | 6_12_6 | 6.12 | 14.10 | 7.4 | 11.1 | | 6_12_5 | 6.12 | 14.8 | 7.2 | 11.1 | | 6_12_4 | 6.12 | 14.6 | 7.0 | 11.1 | @@ -212,7 +213,7 @@ #### Xcode Support Tools - xcpretty 0.3.0 -- xcversion 2.6.8 +- xcversion 2.7.0 #### Installed SDKs | SDK | SDK Name | Xcode Version | @@ -273,13 +274,13 @@ | Package Name | Version | | -------------------------- | ------------------------------------------------------------------------------------------------------------------------ | | Android Command Line Tools | 4.0 | -| Android Emulator | 30.5.6 | +| Android Emulator | 30.6.5 | | Android SDK Build-tools | 30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3 | | Android SDK Platforms | android-S (rev 3)
android-30 (rev 3)
android-29 (rev 5)
android-28 (rev 6)
android-27 (rev 3) | | Android SDK Platform-Tools | 31.0.2 | | Android SDK Tools | 26.1.1 | | Android Support Repository | 47.0.0 | -| CMake | 3.10.2 | +| CMake | 3.10.2
3.18.1 | | Google Play services | 49 | | Google Repository | 58 | | NDK | 21.4.7075529
22.1.7171670 | From 23ed4777959a071ae76478fb847b761684f3cd73 Mon Sep 17 00:00:00 2001 From: AlenaSviridenko Date: Tue, 11 May 2021 17:58:25 +0300 Subject: [PATCH 0231/3485] test body input --- .github/workflows/issue-triager.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/issue-triager.yml b/.github/workflows/issue-triager.yml index c948a620a0dc..ea2b0de171ba 100644 --- a/.github/workflows/issue-triager.yml +++ b/.github/workflows/issue-triager.yml @@ -29,6 +29,8 @@ jobs: owner: context.repo.owner, repo: context.repo.repo }); + + console.log(JSON.stringify(context.issue)); const isAnnouncement = issueLabels.data && issueLabels.data .map(label => label.name) From a16083d386f25d01f97015c7dece17c5200f5bc1 Mon Sep 17 00:00:00 2001 From: AlenaSviridenko Date: Tue, 11 May 2021 18:01:50 +0300 Subject: [PATCH 0232/3485] Revert "test body input" This reverts commit 23ed4777959a071ae76478fb847b761684f3cd73. --- .github/workflows/issue-triager.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/issue-triager.yml b/.github/workflows/issue-triager.yml index ea2b0de171ba..c948a620a0dc 100644 --- a/.github/workflows/issue-triager.yml +++ b/.github/workflows/issue-triager.yml @@ -29,8 +29,6 @@ jobs: owner: context.repo.owner, repo: context.repo.repo }); - - console.log(JSON.stringify(context.issue)); const isAnnouncement = issueLabels.data && issueLabels.data .map(label => label.name) From d70d9f2ac2e08cb4fdb9a50fad396e815c0ded6e Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Tue, 11 May 2021 19:07:51 +0300 Subject: [PATCH 0233/3485] Add a warning note about post-deployment scripts (#3364) --- docs/create-image-and-azure-resources.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/create-image-and-azure-resources.md b/docs/create-image-and-azure-resources.md index 342670d9cb04..36feb2a4753a 100644 --- a/docs/create-image-and-azure-resources.md +++ b/docs/create-image-and-azure-resources.md @@ -124,6 +124,9 @@ Generated tool versions and details can be found in related projects: - [Node](https://github.com/actions/node-versions) ### Post-generation scripts + +> :warning: These scripts are intended to run on a VM deployed in Azure + The user, created during the image generation, does not exist in the result VHD hence some configuration files related to the user's home directory need to be changed as well as the file permissions for some directories. Scripts for that are located in the `post-generation` folder in the repository: - Windows: https://github.com/actions/virtual-environments/tree/main/images/win/post-generation - Linux: https://github.com/actions/virtual-environments/tree/main/images/linux/post-generation From 087144469d02935070646e71ec973581c814a058 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Wed, 12 May 2021 11:24:18 +0300 Subject: [PATCH 0234/3485] [ubuntu] Remove pip symlink creation (#3366) --- images/linux/scripts/installers/python.sh | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/images/linux/scripts/installers/python.sh b/images/linux/scripts/installers/python.sh index bd78087c2b46..79c57d530e4f 100644 --- a/images/linux/scripts/installers/python.sh +++ b/images/linux/scripts/installers/python.sh @@ -11,13 +11,10 @@ source $HELPER_SCRIPTS/os.sh # Install Python, Python 3, pip, pip3 if isUbuntu16 || isUbuntu18; then - apt-get install -y --no-install-recommends python python-dev python-pip python3 python3-dev python3-pip python3-venv + apt-get install -y --no-install-recommends python python-dev python-pip fi -if isUbuntu20; then - apt-get install -y --no-install-recommends python3 python3-dev python3-pip python3-venv - ln -s /usr/bin/pip3 /usr/bin/pip -fi +apt-get install -y --no-install-recommends python3 python3-dev python3-pip python3-venv if isUbuntu18 || isUbuntu20 ; then # Install pipx From 68aa36b2c6b2a2211682a6d4298726112363e91e Mon Sep 17 00:00:00 2001 From: Alena Sviridenko Date: Wed, 12 May 2021 14:22:34 +0300 Subject: [PATCH 0235/3485] Added workflow step to check for spammy issue (#3370) --- .github/workflows/issue-triager.yml | 38 +++++++++++++++++++++++++++-- 1 file changed, 36 insertions(+), 2 deletions(-) diff --git a/.github/workflows/issue-triager.yml b/.github/workflows/issue-triager.yml index c948a620a0dc..5fa072bd2097 100644 --- a/.github/workflows/issue-triager.yml +++ b/.github/workflows/issue-triager.yml @@ -19,8 +19,42 @@ jobs: repo-token: "${{ secrets.GITHUB_TOKEN }}" configuration-path: "./triage-rules.yml" - - if: always() - uses: actions/github-script@0.4.0 + - uses: actions/github-script@v4 + id: check-if-spammy + name: Check if new issue is spammy + with: + github-token: ${{secrets.GITHUB_TOKEN}} + result-encoding: string + script: | + const issue = context.payload.issue; + const minTitleLength = 2; + const titleLength = issue.title.trim().split(' ').length; + const isEmptyToolRequest = !!(issue.title.includes('[tool name]') && issue.body.includes('Tool name: ')); + + if (isEmptyToolRequest || titleLength < minTitleLength) { + await github.issues.createComment({ + owner: context.repo.owner, + repo: context.repo.repo, + issue_number: issue.number, + body: "This issue appears to have been opened accidentally. I'm going to close it now, but feel free to open a new issue or ask any questions in discussions!" + }); + + await github.issues.update({ + owner: context.repo.owner, + repo: context.repo.repo, + labels: ['Invalid'], + issue_number: issue.number, + state: 'closed' + }); + + return true; + } + + return false; + + - if: ${{ steps.check-if-spammy.outputs.result == 'false' }} + uses: actions/github-script@v4 + name: Assign labels to issue with: github-token: ${{secrets.GITHUB_TOKEN}} script: | From 769423b171c13c46ffef184a47f45637fc8fc10e Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Thu, 13 May 2021 10:19:34 +0300 Subject: [PATCH 0236/3485] Add build_resource_group_name packer option (#3369) --- images/linux/ubuntu1604.json | 2 ++ images/linux/ubuntu1804.json | 2 ++ images/linux/ubuntu2004.json | 2 ++ images/win/windows2016.json | 2 ++ images/win/windows2019.json | 2 ++ 5 files changed, 10 insertions(+) diff --git a/images/linux/ubuntu1604.json b/images/linux/ubuntu1604.json index d83c58cbd9f2..e64ebe9f700e 100644 --- a/images/linux/ubuntu1604.json +++ b/images/linux/ubuntu1604.json @@ -6,6 +6,7 @@ "tenant_id": "{{env `ARM_TENANT_ID`}}", "resource_group": "{{env `ARM_RESOURCE_GROUP`}}", "storage_account": "{{env `ARM_STORAGE_ACCOUNT`}}", + "build_resource_group_name": "{{env `BUILD_RESOURCE_GROUP_NAME`}}", "temp_resource_group_name": "{{env `TEMP_RESOURCE_GROUP_NAME`}}", "location": "{{env `ARM_RESOURCE_LOCATION`}}", "virtual_network_name": "{{env `VNET_NAME`}}", @@ -39,6 +40,7 @@ "vm_size": "{{user `vm_size`}}", "resource_group_name": "{{user `resource_group`}}", "storage_account": "{{user `storage_account`}}", + "build_resource_group_name": "{{user `build_resource_group_name`}}", "temp_resource_group_name": "{{user `temp_resource_group_name`}}", "capture_container_name": "images", "capture_name_prefix": "{{user `capture_name_prefix`}}", diff --git a/images/linux/ubuntu1804.json b/images/linux/ubuntu1804.json index a8c49440276b..f6ede73f9d26 100644 --- a/images/linux/ubuntu1804.json +++ b/images/linux/ubuntu1804.json @@ -6,6 +6,7 @@ "tenant_id": "{{env `ARM_TENANT_ID`}}", "resource_group": "{{env `ARM_RESOURCE_GROUP`}}", "storage_account": "{{env `ARM_STORAGE_ACCOUNT`}}", + "build_resource_group_name": "{{env `BUILD_RESOURCE_GROUP_NAME`}}", "temp_resource_group_name": "{{env `TEMP_RESOURCE_GROUP_NAME`}}", "location": "{{env `ARM_RESOURCE_LOCATION`}}", "virtual_network_name": "{{env `VNET_NAME`}}", @@ -39,6 +40,7 @@ "vm_size": "{{user `vm_size`}}", "resource_group_name": "{{user `resource_group`}}", "storage_account": "{{user `storage_account`}}", + "build_resource_group_name": "{{user `build_resource_group_name`}}", "temp_resource_group_name": "{{user `temp_resource_group_name`}}", "capture_container_name": "images", "capture_name_prefix": "{{user `capture_name_prefix`}}", diff --git a/images/linux/ubuntu2004.json b/images/linux/ubuntu2004.json index f6e241d10cd0..0d70fc4d73cd 100644 --- a/images/linux/ubuntu2004.json +++ b/images/linux/ubuntu2004.json @@ -6,6 +6,7 @@ "tenant_id": "{{env `ARM_TENANT_ID`}}", "resource_group": "{{env `ARM_RESOURCE_GROUP`}}", "storage_account": "{{env `ARM_STORAGE_ACCOUNT`}}", + "build_resource_group_name": "{{env `BUILD_RESOURCE_GROUP_NAME`}}", "temp_resource_group_name": "{{env `TEMP_RESOURCE_GROUP_NAME`}}", "location": "{{env `ARM_RESOURCE_LOCATION`}}", "virtual_network_name": "{{env `VNET_NAME`}}", @@ -39,6 +40,7 @@ "vm_size": "{{user `vm_size`}}", "resource_group_name": "{{user `resource_group`}}", "storage_account": "{{user `storage_account`}}", + "build_resource_group_name": "{{user `build_resource_group_name`}}", "temp_resource_group_name": "{{user `temp_resource_group_name`}}", "capture_container_name": "images", "capture_name_prefix": "{{user `capture_name_prefix`}}", diff --git a/images/win/windows2016.json b/images/win/windows2016.json index a0aa9473e9d4..f7c6f0493ab2 100644 --- a/images/win/windows2016.json +++ b/images/win/windows2016.json @@ -7,6 +7,7 @@ "object_id": "{{env `ARM_OBJECT_ID`}}", "resource_group": "{{env `ARM_RESOURCE_GROUP`}}", "storage_account": "{{env `ARM_STORAGE_ACCOUNT`}}", + "build_resource_group_name": "{{env `BUILD_RESOURCE_GROUP_NAME`}}", "temp_resource_group_name": "{{env `TEMP_RESOURCE_GROUP_NAME`}}", "location": "{{env `ARM_RESOURCE_LOCATION`}}", "virtual_network_name": "{{env `VNET_NAME`}}", @@ -47,6 +48,7 @@ "vm_size": "{{user `vm_size`}}", "resource_group_name": "{{user `resource_group`}}", "storage_account": "{{user `storage_account`}}", + "build_resource_group_name": "{{user `build_resource_group_name`}}", "temp_resource_group_name": "{{user `temp_resource_group_name`}}", "capture_container_name": "images", "capture_name_prefix": "{{user `capture_name_prefix`}}", diff --git a/images/win/windows2019.json b/images/win/windows2019.json index c0c6b65d0520..6f965f92be7c 100644 --- a/images/win/windows2019.json +++ b/images/win/windows2019.json @@ -7,6 +7,7 @@ "object_id": "{{env `ARM_OBJECT_ID`}}", "resource_group": "{{env `ARM_RESOURCE_GROUP`}}", "storage_account": "{{env `ARM_STORAGE_ACCOUNT`}}", + "build_resource_group_name": "{{env `BUILD_RESOURCE_GROUP_NAME`}}", "temp_resource_group_name": "{{env `TEMP_RESOURCE_GROUP_NAME`}}", "location": "{{env `ARM_RESOURCE_LOCATION`}}", "virtual_network_name": "{{env `VNET_NAME`}}", @@ -47,6 +48,7 @@ "vm_size": "{{user `vm_size`}}", "resource_group_name": "{{user `resource_group`}}", "storage_account": "{{user `storage_account`}}", + "build_resource_group_name": "{{user `build_resource_group_name`}}", "temp_resource_group_name": "{{user `temp_resource_group_name`}}", "capture_container_name": "images", "capture_name_prefix": "{{user `capture_name_prefix`}}", From 0409144182dc17ad9bed72886ba4aa3506cf8a6d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 13 May 2021 08:38:04 +0000 Subject: [PATCH 0237/3485] Ubuntu 1804 (20210510 update) (#3357) * Updating readme file for ubuntu18 version 20210510.0 * Update Ubuntu1804-README.md * Update Ubuntu1804-README.md Co-authored-by: Image generation service account Co-authored-by: Maxim Lobanov Co-authored-by: Actions service account --- images/linux/Ubuntu1804-README.md | 79 ++++++++++++++++--------------- 1 file changed, 40 insertions(+), 39 deletions(-) diff --git a/images/linux/Ubuntu1804-README.md b/images/linux/Ubuntu1804-README.md index a1fafb41f508..e0907be532cb 100644 --- a/images/linux/Ubuntu1804-README.md +++ b/images/linux/Ubuntu1804-README.md @@ -1,11 +1,12 @@ | Announcements | |-| +| [[Ubuntu] .NET SDK pre-installation policy will be changed on June 14](https://github.com/actions/virtual-environments/issues/3338) | | [Ubuntu 16.04 environment will be removed on September 20, 2021](https://github.com/actions/virtual-environments/issues/3287) | | [[ubuntu] Clang 9 will be removed on May, 17th and default will be set to Clang 11](https://github.com/actions/virtual-environments/issues/3235) | *** # Ubuntu 18.04.5 LTS -- Linux kernel version: 5.4.0-1046-azure -- Image Version: 20210504.1 +- Linux kernel version: 5.4.0-1047-azure +- Image Version: 20210510.0 ## Installed Software ### Language and Runtime @@ -13,8 +14,8 @@ - Clang 9.0.0 - Clang-format 9.0.0 - Erlang 23.3.1 (Eshell 11.2) -- GNU C++ 7.5.0, 9.3.0, 10.3.0 -- GNU Fortran 7.5.0, 9.3.0, 10.3.0 +- GNU C++ 7.5.0, 9.3.0, 10.3.0, 11.1.0 +- GNU Fortran 7.5.0, 9.3.0, 10.3.0, 11.1.0 - Julia 1.6.1 - Mono 6.12.0.122 - MSBuild 16.6.0.15201 (from /usr/lib/mono/msbuild/15.0/bin/MSBuild.dll) @@ -28,14 +29,14 @@ ### Package Management - cpan 1.64 - Helm 3.5.4 -- Homebrew 3.1.5 +- Homebrew 3.1.6 - Miniconda 4.9.2 - Npm 6.14.12 - Pip 9.0.1 - Pip3 9.0.1 - Pipx 0.16.2.1 - RubyGems 2.7.6 -- Vcpkg (build from master \<95836f4>) +- Vcpkg (build from master \<5a271a9>) - Yarn 1.22.10 #### Environment variables @@ -46,20 +47,20 @@ ### Project Management - Ant 1.10.5 -- Gradle 7.0 +- Gradle 7.0.1 - Maven 3.8.1 -- Sbt 1.5.1 +- Sbt 1.5.2 ### Tools - Ansible 2.10.9 - apt-fast 1.9.11 - AzCopy 10.10.0 (available by `azcopy` and `azcopy10` aliases) - Bazel 4.0.0 -- Bazelisk 1.8.0 +- Bazelisk 1.8.1 - Buildah 1.19.6 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - CMake 3.20.2 - CodeQL Action Bundle 2.5.4 -- Docker Compose 1.29.1 +- Docker Compose 1.29.2 - Docker-Buildx 0.5.1 - Docker-Moby Client 20.10.6+azure - Docker-Moby Server 20.10.6+azure @@ -67,8 +68,8 @@ - Git LFS 2.13.3 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.3.1 - Haveged 1.9.1 -- Heroku 7.53.0 -- HHVM (HipHop VM) 4.107.0 +- Heroku 7.53.1 +- HHVM (HipHop VM) 4.109.0 - jq 1.5 - Kind 0.10.0 - Kubectl 1.20.1-5-g76a04fc @@ -76,34 +77,34 @@ - Leiningen 2.9.6 - MediaInfo 17.12 - Mercurial 4.5.3 -- Minikube 1.19.0 +- Minikube 1.20.0 - Newman 5.2.3 - nvm 0.38.0 - OpenSSL 1.1.1 11 Sep 2018 - Packer 1.7.2 - PhantomJS 2.1.1 - Podman 3.0.1 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- Pulumi 3.1.0 +- Pulumi 3.2.1 - R 4.0.5 - Skopeo 1.2.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 - SVN 1.9.7 -- Terraform 0.15.1 +- Terraform 0.15.3 - yamllint 1.26.1 - zstd 1.4.9 (homebrew) ### CLI Tools - Alibaba Cloud CLI 3.0.74 -- AWS CLI 1.19.64 +- AWS CLI 1.19.70 - AWS CLI Session manager plugin 1.2.54.0 - AWS SAM CLI 1.23.0 -- Azure CLI (azure-cli) 2.22.1 +- Azure CLI (azure-cli) 2.23.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.18.0 - GitHub CLI 1.9.2 -- Google Cloud SDK 338.0.0 (apt source repository: https://packages.cloud.google.com/apt) +- Google Cloud SDK 339.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 3.25.0 -- OpenShift CLI 4.7.8 +- Netlify CLI 3.29.2 +- OpenShift CLI 4.7.9 - ORAS CLI 0.11.1 - Vercel CLI 22.0.1 @@ -115,36 +116,36 @@ | 12.0.2+10 | Adopt OpenJDK | JAVA_HOME_12_X64 | ### PHP -| Tool | Version | -| -------- | ------------------------------------------------------------------------- | -| PHP | 7.1.33 7.2.34 7.3.28 7.4.18 8.0.5 (apt source repository: ppa:ondrej/php) | -| Composer | 2.0.13 | -| PHPUnit | 8.5.15 | +| Tool | Version | +| -------- | --------------------------------- | +| PHP | 7.1.33 7.2.34 7.3.28 7.4.18 8.0.5 | +| Composer | 2.0.13 | +| PHPUnit | 8.5.15 | ### Haskell - Cabal 3.4.0.0 - GHC 9.0.1 (apt source repository: ppa:hvr/ghc) - GHCup 0.1.14.1 -- Stack 2.5.1 +- Stack 2.7.1 ### Rust Tools -- Cargo 1.51.0 -- Rust 1.51.0 -- Rustdoc 1.51.0 +- Cargo 1.52.0 +- Rust 1.52.1 +- Rustdoc 1.52.1 - Rustup 1.24.1 #### Packages - Bindgen 0.58.1 - Cargo audit 0.14.1 -- Cargo clippy 0.1.51 +- Cargo clippy 0.1.52 - Cargo outdated 0.9.15 - Cbindgen 0.19.0 - Rustfmt 1.4.36 ### Browsers and Drivers -- Google Chrome 90.0.4430.93 +- Google Chrome 90.0.4430.212 - ChromeDriver 90.0.4430.24 -- Mozilla Firefox 88.0 +- Mozilla Firefox 88.0.1 - Geckodriver 0.29.1 - Chromium 90.0.4430.0 @@ -158,7 +159,7 @@ - 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.519 2.1.520 2.1.521 2.1.522 2.1.523 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.616 2.1.617 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 2.1.811 2.1.812 2.1.813 2.1.814 2.1.815 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.109 3.1.110 3.1.111 3.1.112 3.1.113 3.1.114 3.1.200 3.1.201 3.1.202 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 3.1.408 5.0.100 5.0.101 5.0.102 5.0.103 5.0.104 5.0.200 5.0.201 5.0.202 ### Databases -- MongoDB 4.4.5 (apt source repository: https://repo.mongodb.org/apt/ubuntu) +- MongoDB 4.4.6 (apt source repository: https://repo.mongodb.org/apt/ubuntu) - Postgre SQL 13.2 (apt source repository: https://apt.postgresql.org/pub/repos/apt/) - sqlite3 3.22.0 @@ -176,7 +177,7 @@ #### Go - 1.13.15 - 1.14.15 -- 1.15.11 +- 1.15.12 #### Node.js - 10.24.1 @@ -192,8 +193,8 @@ - 3.5.10 - 3.6.13 - 3.7.10 -- 3.8.9 -- 3.9.4 +- 3.8.10 +- 3.9.5 #### Ruby - 2.4.10 @@ -207,7 +208,7 @@ | --------------- | ----------------------------------- | ------------ | | GOROOT_1_13_X64 | /opt/hostedtoolcache/go/1.13.15/x64 | x64 | | GOROOT_1_14_X64 | /opt/hostedtoolcache/go/1.14.15/x64 | x64 | -| GOROOT_1_15_X64 | /opt/hostedtoolcache/go/1.15.11/x64 | x64 | +| GOROOT_1_15_X64 | /opt/hostedtoolcache/go/1.15.12/x64 | x64 | ### PowerShell Tools - PowerShell 7.1.3 @@ -216,7 +217,7 @@ | Module | Version | | ---------- | ------- | | MarkdownPS | 1.9 | -| Pester | 5.1.1 | +| Pester | 5.2.0 | #### Az PowerShell Modules - 5.7.0 3.1.0.zip 4.4.0.zip @@ -236,7 +237,7 @@ | Android SDK Platforms | android-S (rev 3)
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 SDK Tools | 26.1.1 | | Android Support Repository | 47.0.0 | -| CMake | 3.10.2 | +| CMake | 3.10.2
3.18.1 | | 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 | From f20496e05dd68a662c8b4b169fe68f29b3afd77d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 13 May 2021 08:41:46 +0000 Subject: [PATCH 0238/3485] Ubuntu 2004 (20210510 update) (#3356) * Updating readme file for ubuntu20 version 20210510.0 * Update Ubuntu2004-README.md * Update Ubuntu2004-README.md Co-authored-by: Image generation service account Co-authored-by: Maxim Lobanov Co-authored-by: Actions service account --- images/linux/Ubuntu2004-README.md | 81 ++++++++++++++++--------------- 1 file changed, 41 insertions(+), 40 deletions(-) diff --git a/images/linux/Ubuntu2004-README.md b/images/linux/Ubuntu2004-README.md index 06849e2128d2..c86ba846725a 100644 --- a/images/linux/Ubuntu2004-README.md +++ b/images/linux/Ubuntu2004-README.md @@ -1,11 +1,12 @@ | Announcements | |-| +| [[Ubuntu] .NET SDK pre-installation policy will be changed on June 14](https://github.com/actions/virtual-environments/issues/3338) | | [Ubuntu 16.04 environment will be removed on September 20, 2021](https://github.com/actions/virtual-environments/issues/3287) | | [[ubuntu] Clang 9 will be removed on May, 17th and default will be set to Clang 11](https://github.com/actions/virtual-environments/issues/3235) | *** # Ubuntu 20.04.2 LTS -- Linux kernel version: 5.4.0-1046-azure -- Image Version: 20210504.1 +- Linux kernel version: 5.4.0-1047-azure +- Image Version: 20210510.0 ## Installed Software ### Language and Runtime @@ -13,8 +14,8 @@ - Clang 9.0.1, 10.0.0, 11.0.0 - Clang-format 9.0.1, 10.0.0, 11.0.0 - Erlang 23.3.1 (Eshell 11.2) -- GNU C++ 9.3.0, 10.2.0 -- GNU Fortran 9.3.0, 10.2.0 +- GNU C++ 9.3.0, 10.2.0, 11.1.0 +- GNU Fortran 9.3.0, 10.2.0, 11.1.0 - Julia 1.6.1 - Mono 6.12.0.122 - MSBuild 16.6.0.15201 (from /usr/lib/mono/msbuild/15.0/bin/MSBuild.dll) @@ -28,14 +29,14 @@ ### Package Management - cpan 1.64 - Helm 3.5.4 -- Homebrew 3.1.5 +- Homebrew 3.1.6 - Miniconda 4.9.2 - Npm 6.14.12 - Pip 20.0.2 - Pip3 20.0.2 - Pipx 0.16.2.1 - RubyGems 3.1.2 -- Vcpkg (build from master \) +- Vcpkg (build from master \<5a271a9>) - Yarn 1.22.10 #### Environment variables @@ -46,31 +47,31 @@ ### Project Management - Ant 1.10.7 -- Gradle 7.0 +- Gradle 7.0.1 - Lerna 4.0.0 - Maven 3.8.1 -- Sbt 1.5.1 +- Sbt 1.5.2 ### Tools - Ansible 2.10.9 - apt-fast 1.9.11 - AzCopy 10.10.0 (available by `azcopy` and `azcopy10` aliases) - Bazel 4.0.0 -- Bazelisk 1.8.0 +- Bazelisk 1.8.1 - Buildah 1.20.1 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - CMake 3.20.2 - CodeQL Action Bundle 2.5.4 -- Docker Compose 1.29.1 +- Docker Compose 1.29.2 - Docker-Buildx 0.5.1 - Docker-Moby Client 20.10.6+azure - Docker-Moby Server 20.10.6+azure -- Fastlane 2.181.0 +- Fastlane 2.182.0 - Git 2.31.1 (apt source repository: ppa:git-core/ppa) - Git LFS 2.13.3 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.6.0 - Haveged 1.9.1 -- Heroku 7.53.0 -- HHVM (HipHop VM) 4.107.0 +- Heroku 7.53.1 +- HHVM (HipHop VM) 4.109.0 - jq 1.6 - Kind 0.10.0 - Kubectl 1.20.1-5-g76a04fc @@ -78,34 +79,34 @@ - Leiningen 2.9.6 - MediaInfo 19.09 - Mercurial 5.3.1 -- Minikube 1.19.0 +- Minikube 1.20.0 - Newman 5.2.3 - nvm 0.38.0 - OpenSSL 1.1.1f 31 Mar 2020 - Packer 1.7.2 - PhantomJS 2.1.1 - Podman 3.1.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- Pulumi 3.1.0 +- Pulumi 3.2.1 - R 4.0.5 - Skopeo 1.2.3 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 -- Terraform 0.15.1 +- Terraform 0.15.3 - yamllint 1.26.1 - zstd 1.4.9 (homebrew) ### CLI Tools - Alibaba Cloud CLI 3.0.74 -- AWS CLI 2.2.1 +- AWS CLI 2.2.3 - AWS CLI Session manager plugin 1.2.54.0 - AWS SAM CLI 1.23.0 -- Azure CLI (azure-cli) 2.22.1 +- Azure CLI (azure-cli) 2.23.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.18.0 - GitHub CLI 1.9.2 -- Google Cloud SDK 338.0.0 (apt source repository: https://packages.cloud.google.com/apt) +- Google Cloud SDK 339.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 3.26.0 -- OpenShift CLI 4.7.8 +- Netlify CLI 3.29.2 +- OpenShift CLI 4.7.9 - ORAS CLI 0.11.1 - Vercel CLI 22.0.1 @@ -121,36 +122,36 @@ | CE 21.1.0 | GRAALVM_11_ROOT | ### PHP -| Tool | Version | -| -------- | ---------------------------------------------------- | -| PHP | 7.4.18 8.0.5 (apt source repository: ppa:ondrej/php) | -| Composer | 2.0.13 | -| PHPUnit | 8.5.15 | +| Tool | Version | +| -------- | ------------ | +| PHP | 7.4.18 8.0.5 | +| Composer | 2.0.13 | +| PHPUnit | 8.5.15 | ### Haskell - Cabal 3.4.0.0 - GHC 9.0.1 (apt source repository: ppa:hvr/ghc) - GHCup 0.1.14.1 -- Stack 2.5.1 +- Stack 2.7.1 ### Rust Tools -- Cargo 1.51.0 -- Rust 1.51.0 -- Rustdoc 1.51.0 +- Cargo 1.52.0 +- Rust 1.52.1 +- Rustdoc 1.52.1 - Rustup 1.24.1 #### Packages - Bindgen 0.58.1 - Cargo audit 0.14.1 -- Cargo clippy 0.1.51 +- Cargo clippy 0.1.52 - Cargo outdated 0.9.15 - Cbindgen 0.19.0 - Rustfmt 1.4.36 ### Browsers and Drivers -- Google Chrome 90.0.4430.93 +- Google Chrome 90.0.4430.212 - ChromeDriver 90.0.4430.24 -- Mozilla Firefox 88.0 +- Mozilla Firefox 88.0.1 - Geckodriver 0.29.1 - Chromium 90.0.4430.0 @@ -164,7 +165,7 @@ - 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.519 2.1.520 2.1.521 2.1.522 2.1.523 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.616 2.1.617 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 2.1.811 2.1.812 2.1.813 2.1.814 2.1.815 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.109 3.1.110 3.1.111 3.1.112 3.1.113 3.1.114 3.1.200 3.1.201 3.1.202 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 3.1.408 5.0.100 5.0.101 5.0.102 5.0.103 5.0.104 5.0.200 5.0.201 5.0.202 ### Databases -- MongoDB 4.4.5 (apt source repository: https://repo.mongodb.org/apt/ubuntu) +- MongoDB 4.4.6 (apt source repository: https://repo.mongodb.org/apt/ubuntu) - Postgre SQL 13.2 (apt source repository: https://apt.postgresql.org/pub/repos/apt/) - sqlite3 3.31.1 @@ -181,8 +182,8 @@ ### Cached Tools #### Go - 1.14.15 -- 1.15.11 -- 1.16.3 +- 1.15.12 +- 1.16.4 #### Node.js - 10.24.1 @@ -212,8 +213,8 @@ | Name | Value | Architecture | | --------------- | ----------------------------------- | ------------ | | GOROOT_1_14_X64 | /opt/hostedtoolcache/go/1.14.15/x64 | x64 | -| GOROOT_1_15_X64 | /opt/hostedtoolcache/go/1.15.11/x64 | x64 | -| GOROOT_1_16_X64 | /opt/hostedtoolcache/go/1.16.3/x64 | x64 | +| GOROOT_1_15_X64 | /opt/hostedtoolcache/go/1.15.12/x64 | x64 | +| GOROOT_1_16_X64 | /opt/hostedtoolcache/go/1.16.4/x64 | x64 | ### PowerShell Tools - PowerShell 7.1.3 @@ -222,7 +223,7 @@ | Module | Version | | ---------------- | ------- | | MarkdownPS | 1.9 | -| Pester | 5.1.1 | +| Pester | 5.2.0 | | PSScriptAnalyzer | 1.19.1 | #### Az PowerShell Modules @@ -244,7 +245,7 @@ | Android SDK Platforms | android-S (rev 3)
android-30 (rev 3)
android-29 (rev 5)
android-28 (rev 6)
android-27 (rev 3) | | Android SDK Tools | 26.1.1 | | Android Support Repository | 47.0.0 | -| CMake | 3.10.2 | +| CMake | 3.10.2
3.18.1 | | Google Play services | 49 | | Google Repository | 58 | | NDK | 21.4.7075529
22.1.7171670 | From 3b20fa31db4e3df7f6aafecd1d5b3414e8ff0afd Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 13 May 2021 08:44:37 +0000 Subject: [PATCH 0239/3485] Ubuntu 1604 (20210510 update) (#3358) * Updating readme file for ubuntu16 version 20210510.0 * Update Ubuntu1604-README.md * Update Ubuntu1604-README.md Co-authored-by: Image generation service account Co-authored-by: Maxim Lobanov Co-authored-by: Actions service account --- images/linux/Ubuntu1604-README.md | 69 ++++++++++++++++--------------- 1 file changed, 35 insertions(+), 34 deletions(-) diff --git a/images/linux/Ubuntu1604-README.md b/images/linux/Ubuntu1604-README.md index ca6aef544173..f77de93f1c66 100644 --- a/images/linux/Ubuntu1604-README.md +++ b/images/linux/Ubuntu1604-README.md @@ -1,11 +1,12 @@ | Announcements | |-| +| [[Ubuntu] .NET SDK pre-installation policy will be changed on June 14](https://github.com/actions/virtual-environments/issues/3338) | | [Ubuntu 16.04 environment will be removed on September 20, 2021](https://github.com/actions/virtual-environments/issues/3287) | | [[ubuntu] Clang 9 will be removed on May, 17th and default will be set to Clang 11](https://github.com/actions/virtual-environments/issues/3235) | *** # Ubuntu 16.04.7 LTS - Linux kernel version: 4.15.0-1113-azure -- Image Version: 20210504.1 +- Image Version: 20210510.0 ## Installed Software ### Language and Runtime @@ -28,13 +29,13 @@ ### Package Management - cpan 1.61 - Helm 3.5.4 -- Homebrew 3.1.5 +- Homebrew 3.1.6 - Miniconda 4.9.2 - Npm 6.14.12 - Pip 8.1.1 - Pip3 8.1.1 - RubyGems 2.5.2 -- Vcpkg (build from master \<95836f4>) +- Vcpkg (build from master \<5a271a9>) - Yarn 1.22.10 #### Environment variables @@ -45,19 +46,19 @@ ### Project Management - Ant 1.9.6 -- Gradle 7.0 +- Gradle 7.0.1 - Maven 3.8.1 -- Sbt 1.5.1 +- Sbt 1.5.2 ### Tools - Ansible 2.9.21 - apt-fast 1.9.11 - AzCopy 10.10.0 (available by `azcopy` and `azcopy10` aliases) - Bazel 4.0.0 -- Bazelisk 1.8.0 +- Bazelisk 1.8.1 - CMake 3.20.2 - CodeQL Action Bundle 2.5.4 -- Docker Compose 1.29.1 +- Docker Compose 1.29.2 - Docker-Buildx 0.5.1 - Docker-Moby Client 20.10.6+azure - Docker-Moby Server 20.10.6+azure @@ -65,7 +66,7 @@ - Git LFS 2.13.3 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.0.2 - Haveged 1.9.1 -- Heroku 7.53.0 +- Heroku 7.53.1 - HHVM (HipHop VM) 4.56.6 - jq 1.5 - Kind 0.10.0 @@ -74,31 +75,31 @@ - Leiningen 2.9.6 - MediaInfo 0.7.82 - Mercurial 4.4.1 -- Minikube 1.19.0 +- Minikube 1.20.0 - Newman 5.2.3 - nvm 0.38.0 - OpenSSL 1.0.2g 1 Mar 2016 - Packer 1.7.2 - PhantomJS 2.1.1 -- Pulumi 3.1.0 +- Pulumi 3.2.1 - R 4.0.5 - Sphinx Open Source Search Server 2.2.9 - SVN 1.9.3 -- Terraform 0.15.1 +- Terraform 0.15.3 - zstd 1.4.9 (homebrew) ### CLI Tools - Alibaba Cloud CLI 3.0.74 -- AWS CLI 1.19.64 +- AWS CLI 1.19.70 - AWS CLI Session manager plugin 1.2.54.0 - AWS SAM CLI 1.23.0 -- Azure CLI (azure-cli) 2.22.1 +- Azure CLI (azure-cli) 2.23.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.18.0 - GitHub CLI 1.9.2 -- Google Cloud SDK 338.0.0 (apt source repository: https://packages.cloud.google.com/apt) +- Google Cloud SDK 339.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 3.25.0 -- OpenShift CLI 4.7.8 +- Netlify CLI 3.29.2 +- OpenShift CLI 4.7.9 - ORAS CLI 0.11.1 - Vercel CLI 22.0.1 @@ -110,34 +111,34 @@ | 12.0.2+10 | Adopt OpenJDK | JAVA_HOME_12_X64 | ### PHP -| Tool | Version | -| -------- | --------------------------------------------------------------------------------------- | -| PHP | 5.6.40 7.0.33 7.1.33 7.2.34 7.3.28 7.4.18 8.0.5 (apt source repository: ppa:ondrej/php) | -| Composer | 2.0.13 | -| PHPUnit | 8.5.15 | +| Tool | Version | +| -------- | ----------------------------------------------- | +| PHP | 5.6.40 7.0.33 7.1.33 7.2.34 7.3.28 7.4.18 8.0.5 | +| Composer | 2.0.13 | +| PHPUnit | 8.5.15 | ### Haskell - Cabal 3.4.0.0 - GHC 9.0.1 (apt source repository: ppa:hvr/ghc) - GHCup 0.1.14.1 -- Stack 2.5.1 +- Stack 2.7.1 ### Rust Tools -- Cargo 1.51.0 -- Rust 1.51.0 -- Rustdoc 1.51.0 +- Cargo 1.52.0 +- Rust 1.52.1 +- Rustdoc 1.52.1 - Rustup 1.24.1 #### Packages - Bindgen 0.58.1 - Cargo audit 0.14.1 -- Cargo clippy 0.1.51 +- Cargo clippy 0.1.52 - Cargo outdated 0.9.15 - Cbindgen 0.19.0 - Rustfmt 1.4.36 ### Browsers and Drivers -- Google Chrome 90.0.4430.93 +- Google Chrome 90.0.4430.212 - ChromeDriver 90.0.4430.24 - Mozilla Firefox 88.0 - Geckodriver 0.29.1 @@ -153,7 +154,7 @@ - 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.519 2.1.520 2.1.521 2.1.522 2.1.523 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.616 2.1.617 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 2.1.811 2.1.812 2.1.813 2.1.814 2.1.815 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.109 3.1.110 3.1.111 3.1.112 3.1.113 3.1.114 3.1.200 3.1.201 3.1.202 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 3.1.408 5.0.100 5.0.101 5.0.102 5.0.103 5.0.104 5.0.200 5.0.201 5.0.202 ### Databases -- MongoDB 4.4.5 (apt source repository: https://repo.mongodb.org/apt/ubuntu) +- MongoDB 4.4.6 (apt source repository: https://repo.mongodb.org/apt/ubuntu) - Postgre SQL 13.2 (apt source repository: https://apt.postgresql.org/pub/repos/apt/) - sqlite3 3.11.0 @@ -171,7 +172,7 @@ #### Go - 1.13.15 - 1.14.15 -- 1.15.11 +- 1.15.12 #### Node.js - 10.24.1 @@ -187,8 +188,8 @@ - 3.5.10 - 3.6.13 - 3.7.10 -- 3.8.9 -- 3.9.4 +- 3.8.10 +- 3.9.5 #### Ruby - 2.4.10 @@ -202,7 +203,7 @@ | --------------- | ----------------------------------- | ------------ | | GOROOT_1_13_X64 | /opt/hostedtoolcache/go/1.13.15/x64 | x64 | | GOROOT_1_14_X64 | /opt/hostedtoolcache/go/1.14.15/x64 | x64 | -| GOROOT_1_15_X64 | /opt/hostedtoolcache/go/1.15.11/x64 | x64 | +| GOROOT_1_15_X64 | /opt/hostedtoolcache/go/1.15.12/x64 | x64 | ### PowerShell Tools - PowerShell 7.1.3 @@ -211,7 +212,7 @@ | Module | Version | | ---------- | ------- | | MarkdownPS | 1.9 | -| Pester | 5.1.1 | +| Pester | 5.2.0 | #### Az PowerShell Modules - 5.7.0 3.1.0.zip 4.4.0.zip @@ -231,7 +232,7 @@ | Android SDK Platforms | android-S (rev 3)
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 SDK Tools | 26.1.1 | | Android Support Repository | 47.0.0 | -| CMake | 3.10.2 | +| CMake | 3.10.2
3.18.1 | | 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 | From 0f3523c0affede8396d79aaea8943d229fc1a0d8 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Thu, 13 May 2021 11:45:33 +0300 Subject: [PATCH 0240/3485] [macOS] Add GCC 11 (#3361) * Add gcc@11 to macOS images * Change tests and software report to use gcc toolset versions * Add natural sort --- images/macos/provision/core/gcc.sh | 17 +++++++++-------- .../software-report/SoftwareReport.Common.psm1 | 6 +++--- .../SoftwareReport.Generator.ps1 | 4 +++- images/macos/tests/Common.Tests.ps1 | 2 +- images/macos/toolsets/toolset-10.14.json | 8 ++++++++ images/macos/toolsets/toolset-10.15.json | 8 ++++++++ images/macos/toolsets/toolset-11.0.json | 8 ++++++++ 7 files changed, 40 insertions(+), 13 deletions(-) diff --git a/images/macos/provision/core/gcc.sh b/images/macos/provision/core/gcc.sh index 2721725a946d..6f96f2ae96ea 100644 --- a/images/macos/provision/core/gcc.sh +++ b/images/macos/provision/core/gcc.sh @@ -1,15 +1,16 @@ #!/bin/bash -e -o pipefail source ~/utils/utils.sh -echo "Installing GCC@8 using homebrew..." -brew_smart_install "gcc@8" +gccVersions=$(get_toolset_value '.gcc.versions | .[]') -echo "Installing GCC@9 using homebrew..." -brew_smart_install "gcc@9" +for gccVersion in $gccVersions; do + brew_smart_install "gcc@${gccVersion}" +done -# https://github.com/actions/virtual-environments/issues/1280 -echo "Installing GCC@10 using homebrew..." -brew_smart_install "gcc@10" -rm $(which gfortran) +# Delete default gfortran link if it exists https://github.com/actions/virtual-environments/issues/1280 +gfortranPath=$(which gfortran) +if [ $gfortranPath ]; then + rm $gfortranPath +fi invoke_tests "Common" "GCC" diff --git a/images/macos/software-report/SoftwareReport.Common.psm1 b/images/macos/software-report/SoftwareReport.Common.psm1 index a316ae175d04..928d1aaf2a2d 100644 --- a/images/macos/software-report/SoftwareReport.Common.psm1 +++ b/images/macos/software-report/SoftwareReport.Common.psm1 @@ -80,7 +80,7 @@ function Get-VcpkgVersion { } function Get-GccVersion { - $versionList = @("8", "9", "10") + $versionList = Get-ToolsetValue -KeyPath gcc.versions $versionList | Foreach-Object { $version = Run-Command "gcc-${_} --version" | Select-Object -First 1 "$version - available by ``gcc-${_}`` alias" @@ -88,10 +88,10 @@ function Get-GccVersion { } function Get-FortranVersion { - $versionList = @("8", "9", "10") + $versionList = Get-ToolsetValue -KeyPath gcc.versions $versionList | Foreach-Object { $version = Run-Command "gfortran-${_} --version" | Select-Object -First 1 - "$version - available by ``gfortran-${_}`` alias" + "$version - available by ``gfortran-${_}`` alias" } } diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1 index 5860e5d3ebab..f9532db041d3 100644 --- a/images/macos/software-report/SoftwareReport.Generator.ps1 +++ b/images/macos/software-report/SoftwareReport.Generator.ps1 @@ -60,7 +60,9 @@ if ($os.IsLessThanBigSur) { ) } -$markdown += New-MDList -Style Unordered -Lines ($languageAndRuntimeList | Sort-Object) +# To sort GCC and Gfortran correctly, we need to use natural sort https://gist.github.com/markwragg/e2a9dc05f3464103d6998298fb575d4e#file-sort-natural-ps1 +$toNatural = { [regex]::Replace($_, '\d+', { $args[0].Value.PadLeft(20) }) } +$markdown += New-MDList -Style Unordered -Lines ($languageAndRuntimeList | Sort-Object $toNatural) # Package Management $markdown += New-MDHeader "Package Management" -Level 3 diff --git a/images/macos/tests/Common.Tests.ps1 b/images/macos/tests/Common.Tests.ps1 index 2994573a8120..f066fac44d0a 100644 --- a/images/macos/tests/Common.Tests.ps1 +++ b/images/macos/tests/Common.Tests.ps1 @@ -10,7 +10,7 @@ Describe ".NET" { } Describe "GCC" -Skip:($os.IsHighSierra) { - $testCases = @("8", "9", "10") | ForEach-Object { @{Version = $_} } + $testCases = Get-ToolsetValue -KeyPath gcc.versions | ForEach-Object { @{Version = $_} } It "GCC " -TestCases $testCases { param ( diff --git a/images/macos/toolsets/toolset-10.14.json b/images/macos/toolsets/toolset-10.14.json index e0acdbbaffd1..a2d5868b387d 100644 --- a/images/macos/toolsets/toolset-10.14.json +++ b/images/macos/toolsets/toolset-10.14.json @@ -263,6 +263,14 @@ "virtualbox" ] }, + "gcc": { + "versions": [ + "8", + "9", + "10", + "11" + ] + }, "toolcache": [ { "name": "Python", diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index 6b98fe1b97e6..ee1b5550b0c4 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -222,6 +222,14 @@ "virtualbox" ] }, + "gcc": { + "versions": [ + "8", + "9", + "10", + "11" + ] + }, "toolcache": [ { "name": "Python", diff --git a/images/macos/toolsets/toolset-11.0.json b/images/macos/toolsets/toolset-11.0.json index f397fb364f34..9291d71c8171 100644 --- a/images/macos/toolsets/toolset-11.0.json +++ b/images/macos/toolsets/toolset-11.0.json @@ -150,6 +150,14 @@ "julia" ] }, + "gcc": { + "versions": [ + "8", + "9", + "10", + "11" + ] + }, "toolcache": [ { "name": "Python", From d694ead822d6e401652a43cccb458523deafcb32 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 13 May 2021 13:36:40 +0000 Subject: [PATCH 0241/3485] Updating readme file for win16 version 20210509.1 (#3349) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/win/Windows2016-Readme.md | 77 +++++++++++++++++--------------- 1 file changed, 40 insertions(+), 37 deletions(-) diff --git a/images/win/Windows2016-Readme.md b/images/win/Windows2016-Readme.md index 210951380d00..6b0c77ed51a4 100644 --- a/images/win/Windows2016-Readme.md +++ b/images/win/Windows2016-Readme.md @@ -1,29 +1,29 @@ # Microsoft Windows Server 2016 Datacenter - OS Version: 10.0.14393 Build 4350 -- Image Version: 20210425.1 +- Image Version: 20210509.1 ## Installed Software ### Language and Runtime - Bash 4.4.23(1)-release -- Go 1.15.11 +- Go 1.15.12 - Julia 1.6.1 - Node 14.16.1 - Perl 5.32.1 -- PHP 8.0.3 +- PHP 8.0.6 - Python 3.7.9 - Ruby 2.5.9p229 ### Package Management - Chocolatey 0.10.15 -- Composer 2.0.12 +- Composer 2.0.13 - Helm 3.5.4 - Miniconda 4.9.2 - NPM 6.14.12 - NuGet 5.9.1.11 -- pip 21.1 (python 3.7) -- Pipx 0.16.1.0 +- pip 21.1.1 (python 3.7) +- Pipx 0.16.2.1 - RubyGems 2.7.6.3 -- Vcpkg (build from master \<84e5852>) +- Vcpkg (build from master \<770dc02>) - Yarn 1.22.10 #### Environment variables @@ -35,36 +35,36 @@ ### Project Management - Ant 1.10.10 - Gradle 7.0 -- Maven 3.6.3 -- sbt 1.5.0 +- Maven 3.8.1 +- sbt 1.5.1 ### Tools - 7zip 19.00 - azcopy 10.10.0 - Bazel 4.0.0 -- Bazelisk 1.8.0 +- Bazelisk 1.8.1 - Cabal 3.4.0.0 -- CMake 3.20.1 -- CodeQL Action Bundle 2.5.2 +- CMake 3.20.2 +- CodeQL Action Bundle 2.5.4 - Docker 20.10.4 - Docker-compose 1.29.1 - ghc 9.0.1 - Git 2.31.1 - Git LFS 2.13.3 -- Google Cloud SDK 337.0.0 +- Google Cloud SDK 339.0.0 - InnoSetup 6.1.2 - jq 1.6 - Kind 0.10.0 - Kubectl 1.21.0 - Mercurial 5.0 - Mingw-w64 8.1.0 -- Newman 5.2.2 +- Newman 5.2.3 - NSIS v3.06.1 - OpenSSL 1.1.1 - Packer 1.7.2 -- Pulumi v3.1.0 +- Pulumi v3.2.1 - R 4.0.5 -- Stack 2.5.1 +- Stack 2.7.1 - Subversion (SVN) 1.14.1 - VSWhere 2.8.4 - WinAppDriver 1.2.2009.02003 @@ -72,11 +72,11 @@ - zstd 1.4.9 ### CLI Tools -- Alibaba Cloud CLI 3.0.73 -- AWS CLI 2.1.38 +- Alibaba Cloud CLI 3.0.74 +- AWS CLI 2.2.3 - AWS SAM CLI 1.23.0 - AWS Session Manager CLI 1.2.54.0 -- Azure CLI 2.22.1 +- Azure CLI 2.23.0 - Azure Dev Spaces CLI 1.0.20210421.4 - Azure DevOps CLI extension 0.18.0 - Cloud Foundry CLI 6.53.0 @@ -84,25 +84,25 @@ - Hub CLI 2.14.2 ### Rust Tools -- Cargo 1.51.0 -- Rust 1.51.0 -- Rustdoc 1.51.0 -- Rustup 1.23.1 +- Cargo 1.52.0 +- Rust 1.52.0 +- Rustdoc 1.52.0 +- Rustup 1.24.1 #### Packages - bindgen 0.58.1 -- cargo-audit 0.14.0 +- cargo-audit 0.14.1 - cargo-outdated v0.9.15 - cbindgen 0.19.0 -- Clippy 0.1.51 +- Clippy 0.1.52 - Rustfmt 1.4.36 ### Browsers and webdrivers -- Google Chrome 90.0.4430.85 +- Google Chrome 90.0.4430.93 - Chrome Driver 90.0.4430.24 -- Microsoft Edge 90.0.818.46 -- Microsoft Edge Driver 90.0.818.46 -- Mozilla Firefox 88.0 +- Microsoft Edge 90.0.818.56 +- Microsoft Edge Driver 90.0.818.56 +- Mozilla Firefox 88.0.1 - Gecko Driver 0.29.1 - IE Driver 3.150.1.0 @@ -140,8 +140,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | ------- | ------------ | -------------------- | | 1.13.15 | x64 | GOROOT_1_13_X64 | | 1.14.15 | x64 | GOROOT_1_14_X64 | -| 1.15.11 (Default) | x64 | GOROOT_1_15_X64 | -| 1.16.3 | x64 | GOROOT_1_16_X64 | +| 1.15.12 (Default) | x64 | GOROOT_1_15_X64 | +| 1.16.4 | x64 | GOROOT_1_16_X64 | #### Node @@ -159,8 +159,8 @@ 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.9 | x64, x86 | -| 3.9.4 | x64, x86 | +| 3.8.10 | x64, x86 | +| 3.9.5 | x64, x86 | #### Ruby @@ -213,7 +213,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Web Servers | Name | Version | ConfigFile | ServiceName | ServiceStatus | ListenPort | | ------ | ------- | -------------------------------------- | ----------- | ------------- | ---------- | -| Apache | 2.4.46 | C:\tools\Apache24\conf\httpd.conf | Apache | Stopped | 80 | +| Apache | 2.4.47 | C:\tools\Apache24\conf\httpd.conf | Apache | Stopped | 80 | | Nginx | 1.19.10 | C:\tools\nginx-1.19.10\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2017 @@ -459,6 +459,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Workload.Universal | 15.9.28307.1439 | | Microsoft.VisualStudio.Workload.VisualStudioExtension | 15.7.27625.0 | | Microsoft.VisualStudio.Workload.WebCrossPlat | 15.9.28307.341 | +| SSDT Microsoft Analysis Services Projects | 2.9.6 | +| SSDT Microsoft Reporting Services Projects | 2.6 | +| SSDT SQL Server Integration Services Projects | 2.6.3 | | Windows Driver Kit | 10.0.17740.0 | | Windows Driver Kit Visual Studio Extension | 10.1.17763.1 | | WIX Toolset | 3.11.4516 | @@ -524,7 +527,7 @@ All other versions are saved but not installed. | ------------------ | ---------------- | | DockerMsftProvider | 1.0.0.8 | | MarkdownPS | 1.9 | -| Pester | 3.4.0
5.1.1 | +| Pester | 3.4.0
5.2.0 | | PowerShellGet | 1.0.0.1
2.2.5 | | PSScriptAnalyzer | 1.19.1 | | PSWindowsUpdate | 2.2.0.2 | @@ -534,13 +537,13 @@ All other versions are saved but not installed. ### Android | Package Name | Version | | -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 3.0 | +| Android Command Line Tools | 4.0 | | Android SDK Build-tools | 30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3
26.0.0 26.0.1 26.0.2 26.0.3
25.0.0 25.0.1 25.0.2 25.0.3
24.0.0 24.0.1 24.0.2 24.0.3
23.0.1 23.0.2 23.0.3
22.0.1
21.1.2
20.0.0
19.1.0 | | Android SDK Platforms | android-S (rev 3)
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 Platform-Tools | 31.0.2 | | Android SDK Tools | 25.2.5 | | Android Support Repository | 47.0.0 | -| CMake | 3.10.2 | +| CMake | 3.10.2
3.18.1 | | Google APIs | addon-g..._apis-google-21
addon-g..._apis-google-22
addon-g..._apis-google-23
addon-g..._apis-google-24
a...google_apis | | Google Play services | 49 | | Google Repository | 58 | From 0cbfee23224fb0e7329d4733c2d52057900e6850 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 13 May 2021 13:37:30 +0000 Subject: [PATCH 0242/3485] Updating readme file for win19 version 20210509.1 (#3350) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/win/Windows2019-Readme.md | 78 ++++++++++++++++---------------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index 9f258b6af230..1ab4125c6cb9 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -1,6 +1,6 @@ # Microsoft Windows Server 2019 Datacenter - OS Version: 10.0.17763 Build 1879 -- Image Version: 20210425.1 +- Image Version: 20210509.1 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -8,25 +8,25 @@ ## Installed Software ### Language and Runtime - Bash 4.4.23(1)-release -- Go 1.15.11 +- Go 1.15.12 - Julia 1.6.1 - Node 14.16.1 - Perl 5.32.1 -- PHP 8.0.3 +- PHP 8.0.6 - Python 3.7.9 - Ruby 2.5.9p229 ### Package Management - Chocolatey 0.10.15 -- Composer 2.0.12 +- Composer 2.0.13 - Helm 3.5.4 - Miniconda 4.9.2 - NPM 6.14.12 - NuGet 5.9.1.11 -- pip 21.1 (python 3.7) -- Pipx 0.16.1.0 +- pip 21.1.1 (python 3.7) +- Pipx 0.16.2.1 - RubyGems 2.7.6.3 -- Vcpkg (build from master \<84e5852>) +- Vcpkg (build from master \<86d689b>) - Yarn 1.22.10 #### Environment variables @@ -38,36 +38,36 @@ ### Project Management - Ant 1.10.10 - Gradle 7.0 -- Maven 3.6.3 -- sbt 1.5.0 +- Maven 3.8.1 +- sbt 1.5.1 ### Tools - 7zip 19.00 - azcopy 10.10.0 - Bazel 4.0.0 -- Bazelisk 1.8.0 +- Bazelisk 1.8.1 - Cabal 3.4.0.0 -- CMake 3.20.1 -- CodeQL Action Bundle 2.5.2 +- CMake 3.20.2 +- CodeQL Action Bundle 2.5.4 - Docker 20.10.4 - Docker-compose 1.29.1 - ghc 9.0.1 - Git 2.31.1 - Git LFS 2.13.3 -- Google Cloud SDK 337.0.0 +- Google Cloud SDK 339.0.0 - InnoSetup 6.1.2 - jq 1.6 - Kind 0.10.0 - Kubectl 1.21.0 - Mercurial 5.0 - Mingw-w64 8.1.0 -- Newman 5.2.2 +- Newman 5.2.3 - NSIS v3.06.1 - OpenSSL 1.1.1 - Packer 1.7.2 -- Pulumi v3.1.0 +- Pulumi v3.2.1 - R 4.0.5 -- Stack 2.5.1 +- Stack 2.7.1 - Subversion (SVN) 1.14.1 - VSWhere 2.8.4 - WinAppDriver 1.2.2009.02003 @@ -75,11 +75,11 @@ - zstd 1.4.9 ### CLI Tools -- Alibaba Cloud CLI 3.0.73 -- AWS CLI 2.1.38 +- Alibaba Cloud CLI 3.0.74 +- AWS CLI 2.2.3 - AWS SAM CLI 1.23.0 - AWS Session Manager CLI 1.2.54.0 -- Azure CLI 2.22.1 +- Azure CLI 2.23.0 - Azure Dev Spaces CLI 1.0.20210421.4 - Azure DevOps CLI extension 0.18.0 - Cloud Foundry CLI 6.53.0 @@ -87,25 +87,25 @@ - Hub CLI 2.14.2 ### Rust Tools -- Cargo 1.51.0 -- Rust 1.51.0 -- Rustdoc 1.51.0 -- Rustup 1.23.1 +- Cargo 1.52.0 +- Rust 1.52.0 +- Rustdoc 1.52.0 +- Rustup 1.24.1 #### Packages - bindgen 0.58.1 -- cargo-audit 0.14.0 +- cargo-audit 0.14.1 - cargo-outdated v0.9.15 - cbindgen 0.19.0 -- Clippy 0.1.51 +- Clippy 0.1.52 - Rustfmt 1.4.36 ### Browsers and webdrivers -- Google Chrome 90.0.4430.85 +- Google Chrome 90.0.4430.93 - Chrome Driver 90.0.4430.24 -- Microsoft Edge 90.0.818.46 -- Microsoft Edge Driver 90.0.818.46 -- Mozilla Firefox 88.0 +- Microsoft Edge 90.0.818.56 +- Microsoft Edge Driver 90.0.818.56 +- Mozilla Firefox 88.0.1 - Gecko Driver 0.29.1 - IE Driver 3.150.1.0 @@ -146,8 +146,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | ------- | ------------ | -------------------- | | 1.13.15 | x64 | GOROOT_1_13_X64 | | 1.14.15 | x64 | GOROOT_1_14_X64 | -| 1.15.11 (Default) | x64 | GOROOT_1_15_X64 | -| 1.16.3 | x64 | GOROOT_1_16_X64 | +| 1.15.12 (Default) | x64 | GOROOT_1_15_X64 | +| 1.16.4 | x64 | GOROOT_1_16_X64 | #### Node @@ -165,8 +165,8 @@ 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.9 | x64, x86 | -| 3.9.4 | x64, x86 | +| 3.8.10 | x64, x86 | +| 3.9.5 | x64, x86 | #### Ruby @@ -219,7 +219,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Web Servers | Name | Version | ConfigFile | ServiceName | ServiceStatus | ListenPort | | ------ | ------- | -------------------------------------- | ----------- | ------------- | ---------- | -| Apache | 2.4.46 | C:\tools\Apache24\conf\httpd.conf | Apache | Stopped | 80 | +| Apache | 2.4.47 | C:\tools\Apache24\conf\httpd.conf | Apache | Stopped | 80 | | Nginx | 1.19.10 | C:\tools\nginx-1.19.10\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2019 @@ -251,7 +251,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Component.UnityEngine.x64 | 16.9.31004.209 | | Component.Unreal | 16.1.28810.153 | | Component.Unreal.Android | 16.1.28810.153 | -| Component.VSInstallerProjects | 0.9.9 | +| Component.VSInstallerProjects | 1.0.0 | | Component.WixToolset.VisualStudioExtension.Dev16 | 1.0.0.4 | | Component.WixToolset.VisualStudioExtension.Schemas3 | 1.0.0.4 | | Component.WixToolset.VisualStudioExtension.Schemas4 | 1.0.0.4 | @@ -453,7 +453,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | ProBITools.MicrosoftAnalysisServicesModelingProjects | 2.9.17 | | ProBITools.MicrosoftReportProjectsforVisualStudio | 2.6.11 | | SSIS.SqlServerIntegrationServicesProjects | 3.13.1 | -| VisualStudioClient.MicrosoftVisualStudio2017InstallerProjects | 0.9.9 | +| VisualStudioClient.MicrosoftVisualStudio2017InstallerProjects | 1.0.0 | | Windows Driver Kit | 10.0.19030.0 | | Windows Driver Kit Visual Studio Extension | 10.1.19041.685 | | WIX Toolset | 3.11.4516 | @@ -519,7 +519,7 @@ All other versions are saved but not installed. | ------------------ | ---------------- | | DockerMsftProvider | 1.0.0.8 | | MarkdownPS | 1.9 | -| Pester | 3.4.0
5.1.1 | +| Pester | 3.4.0
5.2.0 | | PowerShellGet | 1.0.0.1
2.2.5 | | PSScriptAnalyzer | 1.19.1 | | PSWindowsUpdate | 2.2.0.2 | @@ -529,13 +529,13 @@ All other versions are saved but not installed. ### Android | Package Name | Version | | -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 3.0 | +| Android Command Line Tools | 4.0 | | Android SDK Build-tools | 30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3
26.0.0 26.0.1 26.0.2 26.0.3
25.0.0 25.0.1 25.0.2 25.0.3
24.0.0 24.0.1 24.0.2 24.0.3
23.0.1 23.0.2 23.0.3
22.0.1
21.1.2
20.0.0
19.1.0 | | Android SDK Platforms | android-S (rev 3)
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 Platform-Tools | 31.0.2 | | Android SDK Tools | 26.1.1 | | Android Support Repository | 47.0.0 | -| CMake | 3.10.2 | +| CMake | 3.10.2
3.18.1 | | 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 | From 0b1d415b6ab683b070372abcc80bf8eb27c9a196 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Thu, 13 May 2021 16:43:12 +0300 Subject: [PATCH 0243/3485] Remove Xamarin.IOS&Mac latest bundle (#3375) --- images/macos/toolsets/toolset-10.15.json | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index ee1b5550b0c4..128cb3cbf2f2 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -23,23 +23,16 @@ "6.12.0.125", "6.10.0.106", "6.8.0.123", "6.6.0.166", "6.4.0.208" ], "ios-versions": [ - "14.16.0.5", "14.14.2.5", "14.10.0.4", "14.8.0.3", "14.6.0.15", "14.4.1.3", "14.2.0.12", "14.0.0.0", "13.20.2.2", "13.18.2.1", "13.16.0.13", "13.14.1.39", "13.10.0.21", "13.8.3.0", "13.6.0.12", "13.4.0.2", "13.2.0.47" + "14.14.2.5", "14.10.0.4", "14.8.0.3", "14.6.0.15", "14.4.1.3", "14.2.0.12", "14.0.0.0", "13.20.2.2", "13.18.2.1", "13.16.0.13", "13.14.1.39", "13.10.0.21", "13.8.3.0", "13.6.0.12", "13.4.0.2", "13.2.0.47" ], "mac-versions": [ - "7.10.0.5", "7.8.2.5", "7.4.0.10", "7.2.0.3", "7.0.0.15", "6.22.1.26", "6.20.2.2", "6.18.3.2", "6.16.0.13", "6.14.1.39", "6.10.0.21", "6.8.3.0", "6.6.0.12", "6.4.0.2", "6.2.0.47" + "7.8.2.5", "7.4.0.10", "7.2.0.3", "7.0.0.15", "6.22.1.26", "6.20.2.2", "6.18.3.2", "6.16.0.13", "6.14.1.39", "6.10.0.21", "6.8.3.0", "6.6.0.12", "6.4.0.2", "6.2.0.47" ], "android-versions": [ "11.2.2.1", "11.1.0.26", "11.0.2.0", "10.3.1.4", "10.2.0.100", "10.1.3.7", "10.0.6.2" ], - "bundle-default": "6_12_8", + "bundle-default": "6_12_7", "bundles": [ - { - "symlink": "6_12_8", - "mono":"6.12", - "ios": "14.16", - "mac": "7.10", - "android": "11.2" - }, { "symlink": "6_12_7", "mono":"6.12", From 75a4d89efb33115c6bd73c662fd9f1515c4e0b55 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 13 May 2021 14:59:08 +0000 Subject: [PATCH 0244/3485] Updating readme file for macOS-10.15 version 20210510.1 (#3360) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/macos/macos-10.15-Readme.md | 79 +++++++++++++++--------------- 1 file changed, 40 insertions(+), 39 deletions(-) diff --git a/images/macos/macos-10.15-Readme.md b/images/macos/macos-10.15-Readme.md index 05ff2a1b0ae8..40e7a51b7505 100644 --- a/images/macos/macos-10.15-Readme.md +++ b/images/macos/macos-10.15-Readme.md @@ -5,7 +5,7 @@ # macOS 10.15 info - System Version: macOS 10.15.7 (19H1030) - Kernel Version: Darwin 19.6.0 -- Image Version: 20210503.2 +- Image Version: 20210510.1 ## Installed Software ### Language and Runtime @@ -13,39 +13,39 @@ - Bash 3.2.57(1)-release - Clang/LLVM 12.0.0 is available on `'$(brew --prefix llvm)/bin/clang'` - Clang/LLVM 12.0.0 is default -- gcc-10 (Homebrew GCC 10.2.0_4) 10.2.0 - available by `gcc-10` alias +- gcc-10 (Homebrew GCC 10.3.0) 10.3.0 - available by `gcc-10` alias - gcc-8 (Homebrew GCC 8.4.0_3) 8.4.0 - available by `gcc-8` alias - gcc-9 (Homebrew GCC 9.3.0_2) 9.3.0 - available by `gcc-9` alias -- GNU Fortran (Homebrew GCC 10.2.0_4) 10.2.0 - available by `gfortran-10` alias +- GNU Fortran (Homebrew GCC 10.3.0) 10.3.0 - available by `gfortran-10` alias - GNU Fortran (Homebrew GCC 8.4.0_3) 8.4.0 - available by `gfortran-8` alias - GNU Fortran (Homebrew GCC 9.3.0_2) 9.3.0 - available by `gfortran-9` alias -- Go 1.15.11 +- Go 1.15.12 - julia 1.6.1 - MSBuild 16.6.0.15801 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) - Node.js v14.16.1 - NVM - Cached node versions: v10.24.1 v12.22.1 v14.16.1 - NVM 0.38.0 - Perl 5.32.1 -- PHP 8.0.5 +- PHP 8.0.6 - Python 2.7.18 -- Python 3.9.4 +- Python 3.9.5 - R 4.0.5 - Ruby 2.7.3p183 ### Package Management -- Bundler version 2.2.16 -- Carthage 0.37.0 +- Bundler version 2.2.17 +- Carthage 0.38.0 - CocoaPods 1.10.1 - Composer 2.0.13 -- Homebrew 3.1.5 +- Homebrew 3.1.6 - Miniconda 4.9.2 - NPM 6.14.12 - NuGet 5.6.0.6489 - Pip 20.3.4 (python 2.7) -- Pip 21.0.1 (python 3.9) +- Pip 21.1.1 (python 3.9) - Pipx 0.16.2.1 -- RubyGems 3.2.16 -- Vcpkg 2021 (build from master \<95836f4>) +- RubyGems 3.2.17 +- Vcpkg 2021 (build from master \<5a271a9>) - Yarn 1.22.5 #### Environment variables @@ -64,7 +64,7 @@ - aria2 1.35.0 - azcopy 10.10.0 - bazel 4.0.0 -- bazelisk 1.8.0 +- bazelisk 1.8.1 - bsdtar 3.3.2 - available by 'tar' alias - Curl 7.76.1 - Git LFS: 2.13.3 @@ -93,17 +93,17 @@ ### Tools - Aliyun CLI 3.0.74 - App Center CLI 2.9.0 -- AWS CLI 2.2.1 +- AWS CLI 2.2.3 - AWS SAM CLI 1.23.0 - AWS Session Manager CLI 1.2.54.0 -- Azure CLI 2.22.1 +- Azure CLI 2.23.0 - Cabal 3.4.0.0 - Cmake 3.20.2 -- Fastlane 2.181.0 +- Fastlane 2.182.0 - GHC 9.0.1 - GHCup v0.1.14.1 -- Stack 2.5.1 -- SwiftFormat 0.48.0 +- Stack 2.7.1 +- SwiftFormat 0.48.1 - Xcode Command Line Tools 12.4.0.0.1.1610135815 ### Linters @@ -111,13 +111,13 @@ - yamllint 1.26.1 ### Browsers -- Safari 14.1 (15611.1.21.161.5) -- SafariDriver 14.1 (15611.1.21.161.5) -- Google Chrome 90.0.4430.93 +- Safari 14.1 (15611.1.21.161.7) +- SafariDriver 14.1 (15611.1.21.161.7) +- Google Chrome 90.0.4430.212 - ChromeDriver 90.0.4430.24 -- Microsoft Edge 90.0.818.51 -- MSEdgeDriver 90.0.818.51 -- Mozilla Firefox 88.0 +- Microsoft Edge 90.0.818.56 +- MSEdgeDriver 90.0.818.56 +- Mozilla Firefox 88.0.1 - geckodriver 0.29.1 #### Environment variables @@ -149,8 +149,8 @@ - 3.5.10 - 3.6.13 - 3.7.10 -- 3.8.9 -- 3.9.4 +- 3.8.10 +- 3.9.5 #### PyPy - 2.7.18 [PyPy 7.3.4] @@ -165,21 +165,21 @@ #### Go - 1.13.15 - 1.14.15 -- 1.15.11 -- 1.16.3 +- 1.15.12 +- 1.16.4 ### Rust Tools -- Cargo 1.51.0 -- Rust 1.51.0 -- Rustdoc 1.51.0 -- Rustup 1.23.1 +- Cargo 1.52.0 +- Rust 1.52.1 +- Rustdoc 1.52.1 +- Rustup 1.24.1 #### Packages - Bindgen 0.58.1 - Cargo-audit 0.14.1 - Cargo-outdated v0.9.15 - Cbindgen 0.19.0 -- Clippy 0.1.51 +- Clippy 0.1.52 - Rustfmt 1.4.36-stable ### PowerShell Tools @@ -190,7 +190,7 @@ | ---------------- | ------- | | Az | 5.7.0 | | MarkdownPS | 1.9 | -| Pester | 5.1.1 | +| Pester | 5.2.0 | | PSScriptAnalyzer | 1.19.1 | ### Web Servers @@ -206,7 +206,8 @@ #### Xamarin bundles | symlink | Xamarin.Mono | Xamarin.iOS | Xamarin.Mac | Xamarin.Android | | ---------------- | ------------ | ----------- | ----------- | --------------- | -| 6_12_7 (default) | 6.12 | 14.14 | 7.8 | 11.2 | +| 6_12_8 (default) | 6.12 | 14.16 | 7.10 | 11.2 | +| 6_12_7 | 6.12 | 14.14 | 7.8 | 11.2 | | 6_12_6 | 6.12 | 14.10 | 7.4 | 11.1 | | 6_12_5 | 6.12 | 14.8 | 7.2 | 11.1 | | 6_12_4 | 6.12 | 14.6 | 7.0 | 11.1 | @@ -245,8 +246,8 @@ #### Xcode Support Tools - xcpretty 0.3.0 -- xcversion 2.6.8 -- Nomad CLI 3.2.16 +- xcversion 2.7.0 +- Nomad CLI 3.2.17 - Nomad CLI IPA ipa 0.14.3 - xctool 0.3.7 @@ -340,13 +341,13 @@ | Package Name | Version | | -------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 4.0 | -| Android Emulator | 30.5.6 | +| Android Emulator | 30.6.5 | | Android SDK Build-tools | 30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3
26.0.0 26.0.1 26.0.2 26.0.3
25.0.0 25.0.1 25.0.2 25.0.3
24.0.0 24.0.1 24.0.2 24.0.3 | | Android SDK Platforms | android-S (rev 3)
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 Platform-Tools | 31.0.2 | | Android SDK Tools | 26.1.1 | | Android Support Repository | 47.0.0 | -| CMake | 3.10.2 | +| CMake | 3.10.2
3.18.1 | | 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 | From 09855006a1de8fc4e4de40743db73a3102b84dc6 Mon Sep 17 00:00:00 2001 From: Ewout ter Hoeven Date: Thu, 13 May 2021 17:43:56 +0200 Subject: [PATCH 0245/3485] Add Clang 12 to Ubuntu 20.04 toolset (#3206) * Add Clang 12 to Ubuntu 20.04 toolset * Ubuntu: Install Clang-12 directly from LLVM --- images/linux/scripts/installers/clang.sh | 4 ++-- images/linux/toolsets/toolset-2004.json | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/images/linux/scripts/installers/clang.sh b/images/linux/scripts/installers/clang.sh index 4e8ff01f1b1c..87d1adc5c29b 100644 --- a/images/linux/scripts/installers/clang.sh +++ b/images/linux/scripts/installers/clang.sh @@ -12,7 +12,7 @@ function InstallClang { local version=$1 echo "Installing clang-$version..." - if [[ $version =~ 9 ]] && isUbuntu16; then + if [[ $version =~ 9 ]] && isUbuntu16 || [[ $version =~ 12 ]]; then ./llvm.sh $version apt-get install -y "clang-format-$version" else @@ -43,4 +43,4 @@ done SetDefaultClang $default_clang_version rm llvm.sh -invoke_tests "Tools" "clang" \ No newline at end of file +invoke_tests "Tools" "clang" diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index b7685310675c..efabd165a80a 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -247,7 +247,8 @@ "versions": [ "9", "10", - "11" + "11", + "12" ], "default_version": "10" }, From ca0395c1ee9b6849e97458819ca480ceba0bda6d Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Thu, 13 May 2021 21:12:54 +0300 Subject: [PATCH 0246/3485] Add dotnet nuget list source (#3373) --- images/win/post-generation/Dotnet.ps1 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/images/win/post-generation/Dotnet.ps1 b/images/win/post-generation/Dotnet.ps1 index 68467adba714..38898b9c9fd5 100644 --- a/images/win/post-generation/Dotnet.ps1 +++ b/images/win/post-generation/Dotnet.ps1 @@ -7,5 +7,8 @@ if (-not $latestPath.Contains($dotnetPath)) [System.Environment]::SetEnvironmentVariable('PATH', $latestPath, [System.EnvironmentVariableTarget]::Machine) } -# Delete empty nuget.config file to prevent the issue with downloading packages from nuget.org https://github.com/actions/virtual-environments/issues/3038 +# Delete empty nuget.config file created by choco and recreate the config using the 'dotnet nuget list source command' +# before choco or powershell’s ancient embedded nuget does to prevent the issue with downloading packages from nuget.org +# https://github.com/actions/virtual-environments/issues/3038 Remove-Item $env:APPDATA\NuGet\NuGet.Config -Force +dotnet nuget list source From 15a610677be406d250c1f6732b03c8b87e693a0a Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Fri, 14 May 2021 11:25:07 +0300 Subject: [PATCH 0247/3485] [ubuntu] Remove clang 9 for ubuntu 20, set clang 11 as the default one (#3381) --- images/linux/toolsets/toolset-2004.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index efabd165a80a..72a6873cfae4 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -245,12 +245,11 @@ }, "clang": { "versions": [ - "9", "10", "11", "12" ], - "default_version": "10" + "default_version": "11" }, "gcc": { "versions": [ From a7c8d209c6d1ee3fc28a35af5655b96047b65aac Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Fri, 14 May 2021 12:20:12 +0300 Subject: [PATCH 0248/3485] [windows] Add a test to make sure version 9 is the default one (#3377) --- images/win/scripts/Tests/Haskell.Tests.ps1 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/images/win/scripts/Tests/Haskell.Tests.ps1 b/images/win/scripts/Tests/Haskell.Tests.ps1 index 4bddc57afea9..903e95da2888 100644 --- a/images/win/scripts/Tests/Haskell.Tests.ps1 +++ b/images/win/scripts/Tests/Haskell.Tests.ps1 @@ -36,6 +36,11 @@ Describe "Haskell" { "ghc --version" | Should -MatchCommandOutput $defaultGhcShortVersion } + # Sometimes choco doesn't return version 9, need to check it explicitly https://github.com/chocolatey/choco/issues/2271 + It "Default GHC version is 9" -TestCases $ghcDefaultCases { + "ghc --version" | Should -MatchCommandOutput "9(\.\d+){2,}" + } + It "Cabal is installed" { "cabal --version" | Should -ReturnZeroExitCode } From 72813adbe7adf46b4bcc2514221de8f937d4d7ea Mon Sep 17 00:00:00 2001 From: mikhailshaganov <81769678+mikhailshaganov@users.noreply.github.com> Date: Fri, 14 May 2021 14:11:25 +0300 Subject: [PATCH 0249/3485] Rework apt-fast installation to get rid of apt repo (#3336) * select-xamarin-sdk-v2 * Update select-xamarin-sdk-v2.sh * change warning message * check existed framework version * check framework version review points * Update apt.sh * Update SoftwareReport.Tools.psm1 * remove a commented code * Fixed review points * return unattended-upgrades * Fixed a viewing version * add links for apt fast * apt fast version * apt-fast * final check version * add which apt-fast --- .../scripts/SoftwareReport/SoftwareReport.Tools.psm1 | 4 +++- images/linux/scripts/base/apt.sh | 11 ++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 index eb64d6850049..35a74f684f6c 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 @@ -4,7 +4,9 @@ function Get-AnsibleVersion { } function Get-AptFastVersion { - $aptFastVersion = (dpkg-query --showformat='${Version}' --show apt-fast).Split('-')[0] + $versionFileContent = Get-Content (which apt-fast) -Raw + $match = [Regex]::Match($versionFileContent, '# apt-fast v(.+)\n') + $aptFastVersion = $match.Groups[1].Value return "apt-fast $aptFastVersion" } diff --git a/images/linux/scripts/base/apt.sh b/images/linux/scripts/base/apt.sh index 3fc447f0155f..da0ad4313792 100644 --- a/images/linux/scripts/base/apt.sh +++ b/images/linux/scripts/base/apt.sh @@ -17,9 +17,6 @@ echo "APT::Get::Assume-Yes \"true\";" > /etc/apt/apt.conf.d/90assumeyes # Uninstall unattended-upgrades apt-get purge unattended-upgrades -# Use apt-fast for parallel downloads -add-apt-repository -y ppa:apt-fast/stable - # Need to limit arch for default apt repos due to # https://github.com/actions/virtual-environments/issues/1961 sed -i'' -E 's/^deb http:\/\/(azure.archive|security).ubuntu.com/deb [arch=amd64,i386] http:\/\/\1.ubuntu.com/' /etc/apt/sources.list @@ -28,5 +25,9 @@ echo 'APT sources limited to the actual architectures' cat /etc/apt/sources.list apt-get update -# Install aria2 , jq and apt-fast -apt-get install aria2 jq apt-fast +# Install aria2 , jq +apt-get install aria2 jq + +# Install apt-fast using quick-install.sh +# https://github.com/ilikenwf/apt-fast +bash -c "$(curl -sL https://raw.githubusercontent.com/ilikenwf/apt-fast/master/quick-install.sh)" From 322aa890065e97c27a718bb96274e3cb6d6494a3 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Mon, 17 May 2021 00:54:28 +0300 Subject: [PATCH 0250/3485] [windows] Add msys libxml2 package installation (#3386) --- images/win/scripts/Installers/Install-Msys2.ps1 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/images/win/scripts/Installers/Install-Msys2.ps1 b/images/win/scripts/Installers/Install-Msys2.ps1 index f0da385033bd..bd0590ef5e92 100644 --- a/images/win/scripts/Installers/Install-Msys2.ps1 +++ b/images/win/scripts/Installers/Install-Msys2.ps1 @@ -60,8 +60,9 @@ Write-Host "`n$dash Remove p7zip/7z package due to conflicts" pacman.exe -R --noconfirm --noprogressbar p7zip # mingw package list -$tools64 = "___clang ___clang-tools-extra ___cmake ___llvm ___toolchain ___ragel" -$tools32 = "___clang ___cmake ___llvm ___toolchain ___ragel" +# libxml2 can be removed from the list after the issue is fixed https://github.com/msys2/MINGW-packages/issues/8658 +$tools64 = "___clang ___clang-tools-extra ___cmake ___libxml2 ___llvm ___toolchain ___ragel" +$tools32 = "___clang ___cmake ___libxml2 ___llvm ___toolchain ___ragel" # install mingw64 packages Write-Host "`n$dash Install mingw64 packages" From c4b6ffb1dced0abd1018699b3b0adf32b08b2cce Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 17 May 2021 11:41:02 +0000 Subject: [PATCH 0251/3485] Updating readme file for macOS-11.0 version 20210516.1 (#3398) Co-authored-by: Image generation service account --- images/macos/macos-11.0-Readme.md | 61 ++++++++++++++++--------------- 1 file changed, 32 insertions(+), 29 deletions(-) diff --git a/images/macos/macos-11.0-Readme.md b/images/macos/macos-11.0-Readme.md index efd72d060134..ea87d29e71c5 100644 --- a/images/macos/macos-11.0-Readme.md +++ b/images/macos/macos-11.0-Readme.md @@ -1,30 +1,33 @@ | Announcements | |-| +| [[macOS] GCC version 8 will be removed from images on May, 31](https://github.com/actions/virtual-environments/issues/3378) | | [macOS 11.0 pools will be transited to private preview.](https://github.com/actions/virtual-environments/issues/2486) | *** # macOS 11.3 info - System Version: macOS 11.3.1 (20E241) - Kernel Version: Darwin 20.4.0 -- Image Version: 20210510.1 +- Image Version: 20210516.1 ## Installed Software ### Language and Runtime -- .NET SDK 2.1.300 2.1.301 2.1.302 2.1.401 2.1.402 2.1.403 2.1.500 2.1.502 2.1.503 2.1.504 2.1.505 2.1.506 2.1.507 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 2.1.811 2.1.812 2.1.813 2.1.814 2.1.815 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 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 3.1.408 5.0.100 5.0.101 5.0.102 5.0.200 5.0.201 5.0.202 +- .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 2.1.811 2.1.812 2.1.813 2.1.814 2.1.815 2.1.816 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 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 3.1.408 3.1.409 5.0.100 5.0.101 5.0.102 5.0.200 5.0.201 5.0.202 5.0.203 - Bash 3.2.57(1)-release - Clang/LLVM 12.0.0 is available on `'$(brew --prefix llvm)/bin/clang'` - Clang/LLVM 12.0.0 is default -- gcc-10 (Homebrew GCC 10.3.0) 10.3.0 - available by `gcc-10` alias - gcc-8 (Homebrew GCC 8.4.0_3) 8.4.0 - available by `gcc-8` alias - gcc-9 (Homebrew GCC 9.3.0_2) 9.3.0 - available by `gcc-9` alias -- GNU Fortran (Homebrew GCC 10.3.0) 10.3.0 - available by `gfortran-10` alias -- GNU Fortran (Homebrew GCC 8.4.0_3) 8.4.0 - available by `gfortran-8` alias -- GNU Fortran (Homebrew GCC 9.3.0_2) 9.3.0 - available by `gfortran-9` alias +- gcc-10 (Homebrew GCC 10.3.0) 10.3.0 - available by `gcc-10` alias +- gcc-11 (Homebrew GCC 11.1.0) 11.1.0 - available by `gcc-11` alias +- GNU Fortran (Homebrew GCC 8.4.0_3) 8.4.0 - available by `gfortran-8` alias +- GNU Fortran (Homebrew GCC 9.3.0_2) 9.3.0 - available by `gfortran-9` alias +- GNU Fortran (Homebrew GCC 10.3.0) 10.3.0 - available by `gfortran-10` alias +- GNU Fortran (Homebrew GCC 11.1.0) 11.1.0 - available by `gfortran-11` alias - Go 1.15.12 - julia 1.6.1 - MSBuild 16.6.0.15801 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) -- Node.js v14.16.1 -- NVM - Cached node versions: v10.24.1 v12.22.1 v14.16.1 +- Node.js v14.17.0 - NVM 0.38.0 +- NVM - Cached node versions: v10.24.1 v12.22.1 v14.17.0 - Perl 5.32.1 - PHP 8.0.6 - Python 2.7.18 @@ -36,15 +39,15 @@ - Carthage 0.38.0 - CocoaPods 1.10.1 - Composer 2.0.13 -- Homebrew 3.1.5 +- Homebrew 3.1.7 - Miniconda 4.9.2 -- NPM 6.14.12 +- NPM 6.14.13 - NuGet 5.6.0.6489 - Pip 20.3.4 (python 2.7) - Pip 21.1.1 (python 3.9) - Pipx 0.16.2.1 - RubyGems 3.2.17 -- Vcpkg 2021 (build from master \<5a271a9>) +- Vcpkg 2021 (build from master \) - Yarn 1.22.5 #### Environment variables @@ -56,7 +59,7 @@ ### Project Management - Apache Ant(TM) 1.10.10 - Apache Maven 3.8.1 -- Gradle 7.0 +- Gradle 7.0.2 ### Utilities - 7-Zip 17.04 @@ -80,8 +83,8 @@ - Newman 5.2.3 - OpenSSL 1.1.1k 25 Mar 2021 `(/usr/local/opt/openssl -> /usr/local/Cellar/openssl@1.1/1.1.1k)` - Packer 1.7.2 -- PostgreSQL 13.2 -- psql (PostgreSQL) 13.2 +- PostgreSQL 13.3 +- psql (PostgreSQL) 13.3 - Subversion (SVN) 1.14.1 - zstd 1.4.9 @@ -89,17 +92,17 @@ ### Tools - Aliyun CLI 3.0.74 - App Center CLI 2.9.0 -- AWS CLI 2.2.3 +- AWS CLI 2.2.5 - AWS SAM CLI 1.23.0 - AWS Session Manager CLI 1.2.54.0 - Azure CLI 2.23.0 - Cabal 3.4.0.0 - Cmake 3.20.2 -- Fastlane 2.182.0 +- Fastlane 2.183.0 - GHC 9.0.1 - GHCup v0.1.14.1 - Stack 2.7.1 -- SwiftFormat 0.48.1 +- SwiftFormat 0.48.2 - Xcode Command Line Tools 12.5.0.0.1.1617976050 ### Linters @@ -109,10 +112,10 @@ ### Browsers - Safari 14.1 (16611.1.21.161.6) - SafariDriver 14.1 (16611.1.21.161.6) -- Google Chrome 90.0.4430.93 +- Google Chrome 90.0.4430.212 - ChromeDriver 90.0.4430.24 -- Microsoft Edge 90.0.818.56 -- MSEdgeDriver 90.0.818.56 +- Microsoft Edge 90.0.818.62 +- MSEdgeDriver 90.0.818.62 - Mozilla Firefox 88.0.1 - geckodriver 0.29.1 @@ -145,7 +148,7 @@ #### Node.js - 10.24.1 - 12.22.1 -- 14.16.1 +- 14.17.0 #### Go - 1.15.12 @@ -153,8 +156,8 @@ ### Rust Tools - Cargo 1.52.0 -- Rust 1.52.0 -- Rustdoc 1.52.0 +- Rust 1.52.1 +- Rustdoc 1.52.1 - Rustup 1.24.1 #### Packages @@ -173,18 +176,18 @@ | ---------------- | ------- | | Az | 5.7.0 | | MarkdownPS | 1.9 | -| Pester | 5.2.0 | +| Pester | 5.2.1 | | PSScriptAnalyzer | 1.19.1 | ### Web Servers -| Name | Version | ConfigFile | ServiceStatus | ListenPort | -| ----- | -------- | ------------------------------- | ------------- | ---------- | -| httpd | 2.4.46_2 | /usr/local/etc/httpd/httpd.conf | stopped | 80 | -| nginx | 1.19.10 | /usr/local/etc/nginx/nginx.conf | stopped | 80 | +| Name | Version | ConfigFile | ServiceStatus | ListenPort | +| ----- | ------- | ------------------------------- | ------------- | ---------- | +| httpd | 2.4.47 | /usr/local/etc/httpd/httpd.conf | stopped | 80 | +| nginx | 1.19.10 | /usr/local/etc/nginx/nginx.conf | stopped | 80 | ### Xamarin #### Visual Studio for Mac -- 8.9.8.7 +- 8.9.9.3 #### Xamarin bundles | symlink | Xamarin.Mono | Xamarin.iOS | Xamarin.Mac | Xamarin.Android | From 952ee3e7407ee7567f7a1f5b92c40f2a58acd885 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Mon, 17 May 2021 21:55:32 +0300 Subject: [PATCH 0252/3485] [ubuntu] Move aws-sam-cli installation to the aws.sh script (#3401) --- .../linux/scripts/installers/aws-sam-cli.sh | 28 ------------------- images/linux/scripts/installers/aws.sh | 9 +++++- .../linux/scripts/tests/CLI.Tools.Tests.ps1 | 2 -- images/linux/toolsets/toolset-1804.json | 4 --- images/linux/toolsets/toolset-2004.json | 4 --- images/linux/ubuntu1604.json | 10 ------- 6 files changed, 8 insertions(+), 49 deletions(-) delete mode 100644 images/linux/scripts/installers/aws-sam-cli.sh diff --git a/images/linux/scripts/installers/aws-sam-cli.sh b/images/linux/scripts/installers/aws-sam-cli.sh deleted file mode 100644 index 4fbaa36ec1bd..000000000000 --- a/images/linux/scripts/installers/aws-sam-cli.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash -e -################################################################################ -## File: aws-sam-cli.sh -## Desc: Installs AWS SAM CLI -## Requires Python >=3.6, must be run as non-root user after toolset installation -################################################################################ - -# Source the helpers for use with the script -source $HELPER_SCRIPTS/install.sh - -# Download latest aws sam cli sources -TarballUrl=$(curl -s https://api.github.com/repos/aws/aws-sam-cli/releases/latest | jq -r '.tarball_url') -TarballPath="/tmp/aws-sam-cli.tar.gz" -download_with_retries $TarballUrl "/tmp" "aws-sam-cli.tar.gz" -tar -xzf $TarballPath -C /tmp -cd /tmp/aws-aws-sam-cli* - -mkdir /opt/python-aws-sam-cli -cp -r /opt/hostedtoolcache/Python/3.7* /opt/python-aws-sam-cli - -# Use copy of python 3.7 from toolcache to install aws sam, setuptools package required for the installation -Python3Dir=$(echo /opt/python-aws-sam-cli/3.7*/x64) -Python3BinDir="${Python3Dir}/bin" -$Python3BinDir/python3 -m pip install setuptools -$Python3BinDir/python3 setup.py install -ln -sf ${Python3BinDir}/sam /usr/local/bin/sam - -invoke_tests "CLI.Tools" "AWS SAM CLI" diff --git a/images/linux/scripts/installers/aws.sh b/images/linux/scripts/installers/aws.sh index cba85d7f9371..5bfab832c02c 100644 --- a/images/linux/scripts/installers/aws.sh +++ b/images/linux/scripts/installers/aws.sh @@ -1,7 +1,7 @@ #!/bin/bash -e ################################################################################ ## File: aws.sh -## Desc: Installs the AWS CLI +## Desc: Installs the AWS CLI, Session Manager plugin for the AWS CLI, and AWS SAM CLI ################################################################################ # Source the helpers for use with the script @@ -24,4 +24,11 @@ fi download_with_retries "https://s3.amazonaws.com/session-manager-downloads/plugin/latest/ubuntu_64bit/session-manager-plugin.deb" "/tmp" "session-manager-plugin.deb" apt install /tmp/session-manager-plugin.deb +# Download & install the latest aws sam cli release +zipName="aws-sam-cli-linux-x86_64.zip" +zipUrl="https://github.com/aws/aws-sam-cli/releases/latest/download/${zipName}" +download_with_retries $zipUrl "/tmp" $zipName +unzip /tmp/${zipName} -d /tmp +/tmp/install + invoke_tests "CLI.Tools" "AWS" diff --git a/images/linux/scripts/tests/CLI.Tools.Tests.ps1 b/images/linux/scripts/tests/CLI.Tools.Tests.ps1 index c7e43bb90fa5..ba21be6344a4 100644 --- a/images/linux/scripts/tests/CLI.Tools.Tests.ps1 +++ b/images/linux/scripts/tests/CLI.Tools.Tests.ps1 @@ -25,9 +25,7 @@ Describe "AWS" { It "Session Manager Plugin for the AWS CLI" { session-manager-plugin | Out-String | Should -Match "plugin was installed successfully" } -} -Describe "AWS SAM CLI" { It "AWS SAM CLI" { "sam --version" | Should -ReturnZeroExitCode } diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index 2b96ab0d9d40..0f45c6ac0af2 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -223,10 +223,6 @@ "package": "yamllint", "cmd": "yamllint" }, - { - "package": "aws-sam-cli", - "cmd": "sam" - }, { "package": "ansible-base", "cmd": "ansible" diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index 72a6873cfae4..fd6b1bf29057 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -223,10 +223,6 @@ "package": "yamllint", "cmd": "yamllint" }, - { - "package": "aws-sam-cli", - "cmd": "sam" - }, { "package": "ansible-base", "cmd": "ansible" diff --git a/images/linux/ubuntu1604.json b/images/linux/ubuntu1604.json index e64ebe9f700e..39579597b5bb 100644 --- a/images/linux/ubuntu1604.json +++ b/images/linux/ubuntu1604.json @@ -265,16 +265,6 @@ ], "execute_command": "sudo sh -c '{{ .Vars }} pwsh -f {{ .Path }}'" }, - { - "type": "shell", - "scripts": [ - "{{template_dir}}/scripts/installers/aws-sam-cli.sh" - ], - "environment_vars": [ - "HELPER_SCRIPTS={{user `helper_script_folder`}}" - ], - "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" - }, { "type": "shell", "scripts": [ From 85e107cdc37e99acff75477acd78c07c1c0d7d13 Mon Sep 17 00:00:00 2001 From: Shivam Mathur Date: Tue, 18 May 2021 13:12:14 +0530 Subject: [PATCH 0253/3485] [ubuntu] Add PHP extensions: imagick, pcov and sodium (#3405) --- images/linux/scripts/installers/php.sh | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/images/linux/scripts/installers/php.sh b/images/linux/scripts/installers/php.sh index 5391e2cb37b5..1facaf4e977a 100644 --- a/images/linux/scripts/installers/php.sh +++ b/images/linux/scripts/installers/php.sh @@ -35,6 +35,7 @@ for version in $php_versions; do php$version-gd \ php$version-gmp \ php$version-igbinary \ + php$version-imagick \ php$version-imap \ php$version-interbase \ php$version-intl \ @@ -74,6 +75,17 @@ for version in $php_versions; do if [[ $version != "8.0" ]]; then apt-fast install -y --no-install-recommends php$version-xmlrpc php$version-json fi + + if [[ $version != "5.6" && $version != "7.0" ]]; then + apt-fast install -y --no-install-recommends php$version-pcov + + # Disable PCOV, as Xdebug is enabled by default + echo "" | sudo tee /etc/php/$version/mods-available/pcov.ini + fi + + if [[ $version = "7.0" || $version = "7.1" ]]; then + apt-fast install -y --no-install-recommends php$version-sodium + fi done apt-fast install -y --no-install-recommends php-pear From 729b5626f0d974f9731e0f5937e0d2e417f642dc Mon Sep 17 00:00:00 2001 From: daniv-msft <48293037+daniv-msft@users.noreply.github.com> Date: Wed, 19 May 2021 00:14:16 -0700 Subject: [PATCH 0254/3485] Removing support of Azure Dev Spaces now that it's retired (#3413) --- .../scripts/Installers/Install-AzureDevSpacesCli.ps1 | 10 ---------- .../SoftwareReport/SoftwareReport.Generator.ps1 | 1 - .../scripts/SoftwareReport/SoftwareReport.Tools.psm1 | 5 ----- images/win/scripts/Tests/CLI.Tools.Tests.ps1 | 6 ------ images/win/windows2016.json | 1 - images/win/windows2019.json | 1 - 6 files changed, 24 deletions(-) delete mode 100644 images/win/scripts/Installers/Install-AzureDevSpacesCli.ps1 diff --git a/images/win/scripts/Installers/Install-AzureDevSpacesCli.ps1 b/images/win/scripts/Installers/Install-AzureDevSpacesCli.ps1 deleted file mode 100644 index 5f37fc581b72..000000000000 --- a/images/win/scripts/Installers/Install-AzureDevSpacesCli.ps1 +++ /dev/null @@ -1,10 +0,0 @@ -################################################################################ -## File: Install-AzureDevSpacesCLI.ps1 -## Desc: Install Azure Dev Spaces CLI -################################################################################ - -# Install Azure Dev Spaces CLI -Install-Binary -Url "https://aka.ms/get-azds-windows" -Name "Azure Dev Spaces CLI.exe" -ArgumentList ("/quiet") -Add-MachinePathItem -PathItem "C:\Program Files\Microsoft SDKs\Azure\Azure Dev Spaces CLI" - -Invoke-PesterTests -TestFile "CLI.Tools" -TestName "Azure Dev Spaces CLI" \ No newline at end of file diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index 9a66ad7ab5f9..ab477545d43b 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -114,7 +114,6 @@ $markdown += New-MDList -Style Unordered -Lines (@( (Get-AWSSAMVersion), (Get-AWSSessionManagerVersion), (Get-AzureCLIVersion), - (Get-AZDSVersion), (Get-AzureDevopsExtVersion), (Get-CloudFoundryVersion), (Get-GHVersion), diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 index ec3213421ed9..e8890b8ad58d 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 @@ -253,11 +253,6 @@ function Get-VisualCPPComponents { } } -function Get-AZDSVersion { - $azdsVersion = $(azds --version) | Select-String "(\d+\.\d+\.\d+.\d+)" - return "Azure Dev Spaces CLI $azdsVersion" -} - function Get-DacFxVersion { cd "C:\Program Files\Microsoft SQL Server\150\DAC\bin\" $dacfxversion = (./sqlpackage.exe /version) diff --git a/images/win/scripts/Tests/CLI.Tools.Tests.ps1 b/images/win/scripts/Tests/CLI.Tools.Tests.ps1 index 8079140567a3..d230fcfcddff 100644 --- a/images/win/scripts/Tests/CLI.Tools.Tests.ps1 +++ b/images/win/scripts/Tests/CLI.Tools.Tests.ps1 @@ -53,10 +53,4 @@ Describe "Hub CLI" { It "hub is installed" { "hub --version" | Should -ReturnZeroExitCode } -} - -Describe "Azure Dev Spaces CLI" { - It "Azure Dev Spaces CLI" { - "azds --version" | Should -ReturnZeroExitCode - } } \ No newline at end of file diff --git a/images/win/windows2016.json b/images/win/windows2016.json index f7c6f0493ab2..f6915a84ebf2 100644 --- a/images/win/windows2016.json +++ b/images/win/windows2016.json @@ -209,7 +209,6 @@ "{{ template_dir }}/scripts/Installers/Install-AzureCli.ps1", "{{ template_dir }}/scripts/Installers/Install-AzureDevOpsCli.ps1", "{{ template_dir }}/scripts/Installers/Install-AzCopy.ps1", - "{{ template_dir }}/scripts/Installers/Install-AzureDevSpacesCli.ps1", "{{ template_dir }}/scripts/Installers/Install-NodeLts.ps1", "{{ template_dir }}/scripts/Installers/Install-Bazel.ps1", "{{ template_dir }}/scripts/Installers/Install-7zip.ps1", diff --git a/images/win/windows2019.json b/images/win/windows2019.json index 6f965f92be7c..284b9bf91ff8 100644 --- a/images/win/windows2019.json +++ b/images/win/windows2019.json @@ -197,7 +197,6 @@ "{{ template_dir }}/scripts/Installers/Install-AzureCli.ps1", "{{ template_dir }}/scripts/Installers/Install-AzureDevOpsCli.ps1", "{{ template_dir }}/scripts/Installers/Install-AzCopy.ps1", - "{{ template_dir }}/scripts/Installers/Install-AzureDevSpacesCli.ps1", "{{ template_dir }}/scripts/Installers/Install-NodeLts.ps1", "{{ template_dir }}/scripts/Installers/Install-7zip.ps1", "{{ template_dir }}/scripts/Installers/Install-Packer.ps1", From c60f54012ab18029c1efe8a74bca16ed89a25791 Mon Sep 17 00:00:00 2001 From: Maxim Lobanov Date: Wed, 19 May 2021 14:16:51 +0300 Subject: [PATCH 0255/3485] Rename 'macOS-11.0' to 'macOS-11' everywhere (#3417) * rename 'macos11.0' to 'macos-11' * fix nitpicks * resolve conflicts --- .github/ISSUE_TEMPLATE/announcement.md | 2 +- .github/ISSUE_TEMPLATE/bug-report.md | 2 +- .github/ISSUE_TEMPLATE/tool-request.md | 2 +- .../{macos110.yml => macos11.yml} | 46 +++++++++---------- ...acos-11.0-Readme.md => macos-11-Readme.md} | 1 - .../{macOS-11.0.json => macOS-11.json} | 2 +- .../{toolset-11.0.json => toolset-11.json} | 2 +- 7 files changed, 28 insertions(+), 29 deletions(-) rename images.CI/macos/azure-pipelines/{macos110.yml => macos11.yml} (62%) rename images/macos/{macos-11.0-Readme.md => macos-11-Readme.md} (99%) rename images/macos/templates/{macOS-11.0.json => macOS-11.json} (99%) rename images/macos/toolsets/{toolset-11.0.json => toolset-11.json} (99%) diff --git a/.github/ISSUE_TEMPLATE/announcement.md b/.github/ISSUE_TEMPLATE/announcement.md index 0d501f6fe947..9c4737158806 100644 --- a/.github/ISSUE_TEMPLATE/announcement.md +++ b/.github/ISSUE_TEMPLATE/announcement.md @@ -26,7 +26,7 @@ assignees: '' - [ ] macOS 10.13 - [ ] macOS 10.14 - [ ] macOS 10.15 -- [ ] macOS 11.0 +- [ ] macOS 11 - [ ] Windows Server 2016 R2 - [ ] Windows Server 2019 diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md index 957a479efdb2..8bcb55bf8d3a 100644 --- a/.github/ISSUE_TEMPLATE/bug-report.md +++ b/.github/ISSUE_TEMPLATE/bug-report.md @@ -21,7 +21,7 @@ A clear and concise description of what the bug is, and why you consider it to b - [ ] Ubuntu 18.04 - [ ] Ubuntu 20.04 - [ ] macOS 10.15 -- [ ] macOS 11.0 +- [ ] macOS 11 - [ ] Windows Server 2016 R2 - [ ] Windows Server 2019 diff --git a/.github/ISSUE_TEMPLATE/tool-request.md b/.github/ISSUE_TEMPLATE/tool-request.md index 72fdd0064754..3474b99873d4 100644 --- a/.github/ISSUE_TEMPLATE/tool-request.md +++ b/.github/ISSUE_TEMPLATE/tool-request.md @@ -29,7 +29,7 @@ assignees: '' - [ ] Ubuntu 18.04 - [ ] Ubuntu 20.04 - [ ] macOS 10.15 -- [ ] macOS 11.0 +- [ ] macOS 11 - [ ] Windows Server 2016 R2 - [ ] Windows Server 2019 diff --git a/images.CI/macos/azure-pipelines/macos110.yml b/images.CI/macos/azure-pipelines/macos11.yml similarity index 62% rename from images.CI/macos/azure-pipelines/macos110.yml rename to images.CI/macos/azure-pipelines/macos11.yml index ada6dcfe1867..bf78b9666079 100644 --- a/images.CI/macos/azure-pipelines/macos110.yml +++ b/images.CI/macos/azure-pipelines/macos11.yml @@ -1,23 +1,23 @@ -name: macOS-11.0_$(date:yyyyMMdd)$(rev:.r)_unstable -schedules: -- cron: "0 0 * * *" - displayName: Daily - branches: - include: - - main - always: true - -trigger: none -pr: - autoCancel: true - branches: - include: - - main - -jobs: -- template: image-generation.yml - parameters: - image_label: 'macOS Big Sur' - base_image_name: 'clean-macOS-11.0-380Gb-runner' - template_path: 'templates/macOS-11.0.json' - target_datastore: 'ds-image' +name: macOS-11_$(date:yyyyMMdd)$(rev:.r)_unstable +schedules: +- cron: "0 0 * * *" + displayName: Daily + branches: + include: + - main + always: true + +trigger: none +pr: + autoCancel: true + branches: + include: + - main + +jobs: +- template: image-generation.yml + parameters: + image_label: 'macOS Big Sur' + base_image_name: 'clean-macOS-11-380Gb-runner' + template_path: 'templates/macOS-11.json' + target_datastore: 'ds-image' diff --git a/images/macos/macos-11.0-Readme.md b/images/macos/macos-11-Readme.md similarity index 99% rename from images/macos/macos-11.0-Readme.md rename to images/macos/macos-11-Readme.md index ea87d29e71c5..635ac814a41c 100644 --- a/images/macos/macos-11.0-Readme.md +++ b/images/macos/macos-11-Readme.md @@ -299,4 +299,3 @@ | ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | - diff --git a/images/macos/templates/macOS-11.0.json b/images/macos/templates/macOS-11.json similarity index 99% rename from images/macos/templates/macOS-11.0.json rename to images/macos/templates/macOS-11.json index 33c3f0085d80..948f00042f13 100644 --- a/images/macos/templates/macOS-11.0.json +++ b/images/macos/templates/macOS-11.json @@ -88,7 +88,7 @@ }, { "type": "file", - "source": "./toolsets/toolset-11.0.json", + "source": "./toolsets/toolset-11.json", "destination": "~/image-generation/toolset.json" }, { diff --git a/images/macos/toolsets/toolset-11.0.json b/images/macos/toolsets/toolset-11.json similarity index 99% rename from images/macos/toolsets/toolset-11.0.json rename to images/macos/toolsets/toolset-11.json index 9291d71c8171..7e0eca72a1fb 100644 --- a/images/macos/toolsets/toolset-11.0.json +++ b/images/macos/toolsets/toolset-11.json @@ -216,4 +216,4 @@ "5.0" ] } -} +} \ No newline at end of file From 0bac9037ca8d064874b828cd1e4e4e719567cc7b Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Wed, 19 May 2021 19:45:09 +0300 Subject: [PATCH 0256/3485] Sort by version in advance (#3411) --- images/win/scripts/Installers/Install-Haskell.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/win/scripts/Installers/Install-Haskell.ps1 b/images/win/scripts/Installers/Install-Haskell.ps1 index 6a70d4526398..558509808ad1 100644 --- a/images/win/scripts/Installers/Install-Haskell.ps1 +++ b/images/win/scripts/Installers/Install-Haskell.ps1 @@ -5,7 +5,7 @@ # Get 3 latest versions of GHC [Version[]] $ChocoVersionsOutput = & choco search ghc --allversions | Where-Object { $_.StartsWith('ghc ') -and $_ -match 'Approved' } | ForEach-Object { [regex]::matches($_, '\d+(\.\d+){2,}').value } -$MajorMinorGroups = $ChocoVersionsOutput | Group-Object { $_.ToString(2) } | Sort-Object Name -Descending | Select-Object -First 3 +$MajorMinorGroups = $ChocoVersionsOutput | Sort-Object -Descending | Group-Object { $_.ToString(2) } | Select-Object -First 3 $VersionsList = $MajorMinorGroups | ForEach-Object { $_.Group | Select-Object -First 1 } | Sort-Object # The latest version will be installed as a default From c64a37612fc548942094ca7d98ef90cc2028bbf3 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 20 May 2021 08:57:11 +0000 Subject: [PATCH 0257/3485] Updating readme file for macOS-10.15 version 20210516.1 (#3402) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/macos/macos-10.15-Readme.md | 58 +++++++++++++++--------------- 1 file changed, 30 insertions(+), 28 deletions(-) diff --git a/images/macos/macos-10.15-Readme.md b/images/macos/macos-10.15-Readme.md index 40e7a51b7505..b0235b3aa8b0 100644 --- a/images/macos/macos-10.15-Readme.md +++ b/images/macos/macos-10.15-Readme.md @@ -1,30 +1,33 @@ | Announcements | |-| +| [[macOS] GCC version 8 will be removed from images on May, 31](https://github.com/actions/virtual-environments/issues/3378) | | [macOS 11.0 pools will be transited to private preview.](https://github.com/actions/virtual-environments/issues/2486) | *** # macOS 10.15 info - System Version: macOS 10.15.7 (19H1030) - Kernel Version: Darwin 19.6.0 -- Image Version: 20210510.1 +- Image Version: 20210516.1 ## Installed Software ### Language and Runtime -- .NET SDK 2.1.300 2.1.301 2.1.302 2.1.401 2.1.402 2.1.403 2.1.500 2.1.502 2.1.503 2.1.504 2.1.505 2.1.506 2.1.507 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 2.1.811 2.1.812 2.1.813 2.1.814 2.1.815 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 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 3.1.408 5.0.100 5.0.101 5.0.102 5.0.200 5.0.201 5.0.202 +- .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 2.1.811 2.1.812 2.1.813 2.1.814 2.1.815 2.1.816 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 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 3.1.408 3.1.409 5.0.100 5.0.101 5.0.102 5.0.200 5.0.201 5.0.202 5.0.203 - Bash 3.2.57(1)-release - Clang/LLVM 12.0.0 is available on `'$(brew --prefix llvm)/bin/clang'` - Clang/LLVM 12.0.0 is default -- gcc-10 (Homebrew GCC 10.3.0) 10.3.0 - available by `gcc-10` alias - gcc-8 (Homebrew GCC 8.4.0_3) 8.4.0 - available by `gcc-8` alias - gcc-9 (Homebrew GCC 9.3.0_2) 9.3.0 - available by `gcc-9` alias -- GNU Fortran (Homebrew GCC 10.3.0) 10.3.0 - available by `gfortran-10` alias -- GNU Fortran (Homebrew GCC 8.4.0_3) 8.4.0 - available by `gfortran-8` alias -- GNU Fortran (Homebrew GCC 9.3.0_2) 9.3.0 - available by `gfortran-9` alias +- gcc-10 (Homebrew GCC 10.3.0) 10.3.0 - available by `gcc-10` alias +- gcc-11 (Homebrew GCC 11.1.0) 11.1.0 - available by `gcc-11` alias +- GNU Fortran (Homebrew GCC 8.4.0_3) 8.4.0 - available by `gfortran-8` alias +- GNU Fortran (Homebrew GCC 9.3.0_2) 9.3.0 - available by `gfortran-9` alias +- GNU Fortran (Homebrew GCC 10.3.0) 10.3.0 - available by `gfortran-10` alias +- GNU Fortran (Homebrew GCC 11.1.0) 11.1.0 - available by `gfortran-11` alias - Go 1.15.12 - julia 1.6.1 - MSBuild 16.6.0.15801 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) -- Node.js v14.16.1 -- NVM - Cached node versions: v10.24.1 v12.22.1 v14.16.1 +- Node.js v14.17.0 - NVM 0.38.0 +- NVM - Cached node versions: v10.24.1 v12.22.1 v14.17.0 - Perl 5.32.1 - PHP 8.0.6 - Python 2.7.18 @@ -37,15 +40,15 @@ - Carthage 0.38.0 - CocoaPods 1.10.1 - Composer 2.0.13 -- Homebrew 3.1.6 +- Homebrew 3.1.7 - Miniconda 4.9.2 -- NPM 6.14.12 +- NPM 6.14.13 - NuGet 5.6.0.6489 - Pip 20.3.4 (python 2.7) - Pip 21.1.1 (python 3.9) - Pipx 0.16.2.1 - RubyGems 3.2.17 -- Vcpkg 2021 (build from master \<5a271a9>) +- Vcpkg 2021 (build from master \) - Yarn 1.22.5 #### Environment variables @@ -57,7 +60,7 @@ ### Project Management - Apache Ant(TM) 1.10.10 - Apache Maven 3.8.1 -- Gradle 7.0 +- Gradle 7.0.2 ### Utilities - 7-Zip 17.04 @@ -82,8 +85,8 @@ - Newman 5.2.3 - OpenSSL 1.1.1k 25 Mar 2021 `(/usr/local/opt/openssl -> /usr/local/Cellar/openssl@1.1/1.1.1k)` - Packer 1.7.2 -- PostgreSQL 13.2 -- psql (PostgreSQL) 13.2 +- PostgreSQL 13.3 +- psql (PostgreSQL) 13.3 - Subversion (SVN) 1.14.1 - Vagrant 2.2.16 - virtualbox 6.1.22r144080 @@ -93,17 +96,17 @@ ### Tools - Aliyun CLI 3.0.74 - App Center CLI 2.9.0 -- AWS CLI 2.2.3 +- AWS CLI 2.2.5 - AWS SAM CLI 1.23.0 - AWS Session Manager CLI 1.2.54.0 - Azure CLI 2.23.0 - Cabal 3.4.0.0 - Cmake 3.20.2 -- Fastlane 2.182.0 +- Fastlane 2.183.0 - GHC 9.0.1 - GHCup v0.1.14.1 - Stack 2.7.1 -- SwiftFormat 0.48.1 +- SwiftFormat 0.48.2 - Xcode Command Line Tools 12.4.0.0.1.1610135815 ### Linters @@ -115,8 +118,8 @@ - SafariDriver 14.1 (15611.1.21.161.7) - Google Chrome 90.0.4430.212 - ChromeDriver 90.0.4430.24 -- Microsoft Edge 90.0.818.56 -- MSEdgeDriver 90.0.818.56 +- Microsoft Edge 90.0.818.62 +- MSEdgeDriver 90.0.818.62 - Mozilla Firefox 88.0.1 - geckodriver 0.29.1 @@ -160,7 +163,7 @@ #### Node.js - 10.24.1 - 12.22.1 -- 14.16.1 +- 14.17.0 #### Go - 1.13.15 @@ -190,24 +193,23 @@ | ---------------- | ------- | | Az | 5.7.0 | | MarkdownPS | 1.9 | -| Pester | 5.2.0 | +| Pester | 5.2.1 | | PSScriptAnalyzer | 1.19.1 | ### Web Servers -| Name | Version | ConfigFile | ServiceStatus | ListenPort | -| ----- | -------- | ------------------------------- | ------------- | ---------- | -| httpd | 2.4.46_2 | /usr/local/etc/httpd/httpd.conf | stopped | 80 | -| nginx | 1.19.10 | /usr/local/etc/nginx/nginx.conf | stopped | 80 | +| Name | Version | ConfigFile | ServiceStatus | ListenPort | +| ----- | ------- | ------------------------------- | ------------- | ---------- | +| httpd | 2.4.47 | /usr/local/etc/httpd/httpd.conf | stopped | 80 | +| nginx | 1.19.10 | /usr/local/etc/nginx/nginx.conf | stopped | 80 | ### Xamarin #### Visual Studio for Mac -- 8.9.8.7 +- 8.9.9.3 #### Xamarin bundles | symlink | Xamarin.Mono | Xamarin.iOS | Xamarin.Mac | Xamarin.Android | | ---------------- | ------------ | ----------- | ----------- | --------------- | -| 6_12_8 (default) | 6.12 | 14.16 | 7.10 | 11.2 | -| 6_12_7 | 6.12 | 14.14 | 7.8 | 11.2 | +| 6_12_7 (default) | 6.12 | 14.14 | 7.8 | 11.2 | | 6_12_6 | 6.12 | 14.10 | 7.4 | 11.1 | | 6_12_5 | 6.12 | 14.8 | 7.2 | 11.1 | | 6_12_4 | 6.12 | 14.6 | 7.0 | 11.1 | From 3b591632fbbb392ab701d380eea2ba50af6b1be8 Mon Sep 17 00:00:00 2001 From: Maxim Lobanov Date: Thu, 20 May 2021 17:03:33 +0300 Subject: [PATCH 0258/3485] Update `macos-11.0` to `macos-11` in README (#3427) * Update README.md * Update README.md --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 4c80ef28ada2..90868486b574 100644 --- a/README.md +++ b/README.md @@ -12,12 +12,12 @@ For general questions about using the virtual environments or writing your Actio | --------------------|---------------------|--------------------|---------------------| | Ubuntu 20.04 | `ubuntu-latest` or `ubuntu-20.04` | [ubuntu-20.04] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu20&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu20&redirect=1) | Ubuntu 18.04 | `ubuntu-18.04` | [ubuntu-18.04] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu18&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu18&redirect=1) -| macOS 11.0 | `macos-11.0` | [macOS-11.0] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-11.0&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-11.0&redirect=1) +| macOS 11 | `macos-11` | [macOS-11] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-11.0&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-11.0&redirect=1) | macOS 10.15 | `macos-latest` or `macos-10.15` | [macOS-10.15] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-10.15&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-10.15&redirect=1) | Windows Server 2019 | `windows-latest` or `windows-2019` | [windows-2019] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=windows-2019&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=windows-2019&redirect=1) | Windows Server 2016 | `windows-2016` | [windows-2016] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=windows-2016&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=windows-2016&redirect=1) ``` -The macOS 11.0 virtual environment is currently provided as a private preview only. +The macOS 11 virtual environment is currently provided as a private preview only. The "macos-latest" YAML workflow label still uses the macOS 10.15 virtual environment. ``` @@ -57,7 +57,7 @@ You can also track upcoming changes using the [awaiting-deployment](https://gith [ubuntu-16.04]: https://github.com/actions/virtual-environments/blob/main/images/linux/Ubuntu1604-README.md [Windows-2019]: https://github.com/actions/virtual-environments/blob/main/images/win/Windows2019-Readme.md [windows-2016]: https://github.com/actions/virtual-environments/blob/main/images/win/Windows2016-Readme.md -[macOS-11.0]: https://github.com/actions/virtual-environments/blob/main/images/macos/macos-11.0-Readme.md +[macOS-11]: https://github.com/actions/virtual-environments/blob/main/images/macos/macos-11-Readme.md [macOS-10.15]: https://github.com/actions/virtual-environments/blob/main/images/macos/macos-10.15-Readme.md [self-hosted runners]: https://help.github.com/en/actions/hosting-your-own-runners From f2149f41d32b2aaffeb2486718c8c57e8831fa5f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 20 May 2021 20:22:50 +0000 Subject: [PATCH 0259/3485] Updating readme file for win16 version 20210516.0 (#3404) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/win/Windows2016-Readme.md | 58 ++++++++++++++++---------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/images/win/Windows2016-Readme.md b/images/win/Windows2016-Readme.md index 6b0c77ed51a4..b408584da1b0 100644 --- a/images/win/Windows2016-Readme.md +++ b/images/win/Windows2016-Readme.md @@ -1,13 +1,13 @@ # Microsoft Windows Server 2016 Datacenter -- OS Version: 10.0.14393 Build 4350 -- Image Version: 20210509.1 +- OS Version: 10.0.14393 Build 4402 +- Image Version: 20210516.0 ## Installed Software ### Language and Runtime - Bash 4.4.23(1)-release - Go 1.15.12 - Julia 1.6.1 -- Node 14.16.1 +- Node 14.17.0 - Perl 5.32.1 - PHP 8.0.6 - Python 3.7.9 @@ -18,12 +18,12 @@ - Composer 2.0.13 - Helm 3.5.4 - Miniconda 4.9.2 -- NPM 6.14.12 +- NPM 6.14.13 - NuGet 5.9.1.11 - pip 21.1.1 (python 3.7) - Pipx 0.16.2.1 - RubyGems 2.7.6.3 -- Vcpkg (build from master \<770dc02>) +- Vcpkg (build from master \) - Yarn 1.22.10 #### Environment variables @@ -36,7 +36,7 @@ - Ant 1.10.10 - Gradle 7.0 - Maven 3.8.1 -- sbt 1.5.1 +- sbt 1.5.2 ### Tools - 7zip 19.00 @@ -51,11 +51,11 @@ - ghc 9.0.1 - Git 2.31.1 - Git LFS 2.13.3 -- Google Cloud SDK 339.0.0 +- Google Cloud SDK 340.0.0 - InnoSetup 6.1.2 - jq 1.6 - Kind 0.10.0 -- Kubectl 1.21.0 +- Kubectl 1.21.1 - Mercurial 5.0 - Mingw-w64 8.1.0 - Newman 5.2.3 @@ -69,11 +69,11 @@ - VSWhere 2.8.4 - WinAppDriver 1.2.2009.02003 - yamllint 1.26.1 -- zstd 1.4.9 +- zstd 1.5.0 ### CLI Tools - Alibaba Cloud CLI 3.0.74 -- AWS CLI 2.2.3 +- AWS CLI 2.2.5 - AWS SAM CLI 1.23.0 - AWS Session Manager CLI 1.2.54.0 - Azure CLI 2.23.0 @@ -85,8 +85,8 @@ ### Rust Tools - Cargo 1.52.0 -- Rust 1.52.0 -- Rustdoc 1.52.0 +- Rust 1.52.1 +- Rustdoc 1.52.1 - Rustup 1.24.1 #### Packages @@ -98,10 +98,10 @@ - Rustfmt 1.4.36 ### Browsers and webdrivers -- Google Chrome 90.0.4430.93 +- Google Chrome 90.0.4430.212 - Chrome Driver 90.0.4430.24 -- Microsoft Edge 90.0.818.56 -- Microsoft Edge Driver 90.0.818.56 +- Microsoft Edge 90.0.818.62 +- Microsoft Edge Driver 90.0.818.62 - Mozilla Firefox 88.0.1 - Gecko Driver 0.29.1 - IE Driver 3.150.1.0 @@ -149,7 +149,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | ------- | ------------ | | 10.24.1 | x64 | | 12.22.1 | x64 | -| 14.16.1 | x64 | +| 14.17.0 | x64 | #### Python @@ -187,7 +187,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Property | Value | | -------------------- | ------------------------------------------------------------------------------------------------------------------------------------ | | ServiceName | postgresql-x64-13 | -| Version | 13.2 | +| Version | 13.3 | | ServiceStatus | Stopped | | ServiceStartType | Disabled | | EnvironmentVariables | PGBIN=C:\Program Files\PostgreSQL\13\bin
PGDATA=C:\Program Files\PostgreSQL\13\data
PGROOT=C:\Program Files\PostgreSQL\13 | @@ -199,7 +199,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### MongoDB | Version | ServiceName | ServiceStatus | ServiceStartType | | ------- | ----------- | ------------- | ---------------- | -| 4.4.5.0 | MongoDB | Running | Automatic | +| 4.4.6.0 | MongoDB | Running | Automatic | @@ -219,7 +219,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Visual Studio Enterprise 2017 | Name | Version | Path | | ----------------------------- | --------------- | -------------------------------------------------------------- | -| Visual Studio Enterprise 2017 | 15.9.28307.1500 | C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise | +| Visual Studio Enterprise 2017 | 15.9.28307.1525 | C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise | #### Workloads, components and extensions: @@ -488,20 +488,20 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### .NET Core SDK `Location C:\Program Files\dotnet\sdk` -- 1.1.14 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.519 2.1.520 2.1.521 2.1.522 2.1.523 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.616 2.1.617 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 2.1.811 2.1.812 2.1.813 2.1.814 2.1.815 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.109 3.1.110 3.1.111 3.1.112 3.1.113 3.1.114 3.1.200 3.1.201 3.1.202 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 3.1.408 5.0.100 5.0.101 5.0.102 5.0.103 5.0.104 5.0.200 5.0.201 5.0.202 +- 1.1.14 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.519 2.1.520 2.1.521 2.1.522 2.1.523 2.1.524 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.616 2.1.617 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 2.1.811 2.1.812 2.1.813 2.1.814 2.1.815 2.1.816 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.109 3.1.110 3.1.111 3.1.112 3.1.113 3.1.114 3.1.115 3.1.200 3.1.201 3.1.202 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 3.1.408 3.1.409 5.0.100 5.0.101 5.0.102 5.0.103 5.0.104 5.0.200 5.0.201 5.0.202 5.0.203 ### .NET Core Runtime `Location: C:\Program Files\dotnet\shared\Microsoft.AspNetCore.All` -- 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23 2.1.24 2.1.25 2.1.26 2.1.27 +- 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23 2.1.24 2.1.25 2.1.26 2.1.27 2.1.28 `Location: C:\Program Files\dotnet\shared\Microsoft.AspNetCore.App` -- 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23 2.1.24 2.1.25 2.1.26 2.1.27 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9 3.1.10 3.1.11 3.1.12 3.1.13 3.1.14 5.0.0 5.0.1 5.0.2 5.0.3 5.0.4 5.0.5 +- 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23 2.1.24 2.1.25 2.1.26 2.1.27 2.1.28 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9 3.1.10 3.1.11 3.1.12 3.1.13 3.1.14 3.1.15 5.0.0 5.0.1 5.0.2 5.0.3 5.0.4 5.0.5 5.0.6 `Location: C:\Program Files\dotnet\shared\Microsoft.NETCore.App` -- 1.0.16 1.1.13 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23 2.1.24 2.1.25 2.1.26 2.1.27 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9 3.1.10 3.1.11 3.1.12 3.1.13 3.1.14 5.0.0 5.0.1 5.0.2 5.0.3 5.0.4 5.0.5 +- 1.0.16 1.1.13 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23 2.1.24 2.1.25 2.1.26 2.1.27 2.1.28 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9 3.1.10 3.1.11 3.1.12 3.1.13 3.1.14 3.1.15 5.0.0 5.0.1 5.0.2 5.0.3 5.0.4 5.0.5 5.0.6 `Location: C:\Program Files\dotnet\shared\Microsoft.WindowsDesktop.App` -- 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9 3.1.10 3.1.11 3.1.12 3.1.13 3.1.14 5.0.0 5.0.1 5.0.2 5.0.3 5.0.4 5.0.5 +- 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9 3.1.10 3.1.11 3.1.12 3.1.13 3.1.14 3.1.15 5.0.0 5.0.1 5.0.2 5.0.3 5.0.4 5.0.5 5.0.6 ### .NET Framework `Type: Developer Pack` @@ -527,7 +527,7 @@ All other versions are saved but not installed. | ------------------ | ---------------- | | DockerMsftProvider | 1.0.0.8 | | MarkdownPS | 1.9 | -| Pester | 3.4.0
5.2.0 | +| Pester | 3.4.0
5.2.1 | | PowerShellGet | 1.0.0.1
2.2.5 | | PSScriptAnalyzer | 1.19.1 | | PSWindowsUpdate | 2.2.0.2 | @@ -563,10 +563,10 @@ All other versions are saved but not installed. ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2016 | sha256:1925732dc0f67cd2e40241cbf2c18c59e751b5132d913d7c0cf5bced27a0592e | 2021-04-13 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2016 | sha256:36925b012184012782bb1972743f57b60bcc16064927af1f0b6e1e75424c3130 | 2021-04-13 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2016 | sha256:9efd758e3e23321e904e4996e506dbe73ced588e68fac7e386b7f88a2486f527 | 2021-04-13 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2016 | sha256:616e2816b0024ab7f69a58dfefd1bee58d6ac5501adb8abb9f52b104a1f0a5da | 2021-05-11 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2016 | sha256:7a7b03014820cb4bf0f9a137f33ceade2fa7102ee63a91de720b13bdce43bf3c | 2021-05-11 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2016 | sha256:f19f7100d6ce4090e9f4b3c06729304cf384459f16ca07f9595155c8254a66c0 | 2021-05-11 | | mcr.microsoft.com/windows/nanoserver:10.0.14393.953 | sha256:fc60bd5ae0e61b334ce1cf1bcbf20c10c36b4c5482a01da319c9c989f9e6e268 | 2017-03-08 | -| mcr.microsoft.com/windows/servercore:ltsc2016 | sha256:4fbb0b699320a37ad904f31aff8bf1858e89b6c93b4d517b58d9516e3df9c24b | 2021-04-07 | +| mcr.microsoft.com/windows/servercore:ltsc2016 | sha256:b96ee2b8278f1e62418473f47eefd22340b8c6cefbb565a630d28791efbea16d | 2021-04-26 | From 1b483cc38dc8af5c310004f8fff309155e9fded5 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 21 May 2021 00:14:35 +0000 Subject: [PATCH 0260/3485] Updating readme file for win19 version 20210516.0 (#3403) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/win/Windows2019-Readme.md | 80 ++++++++++++++++---------------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index 1ab4125c6cb9..5e9e56a819a1 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -1,6 +1,6 @@ # Microsoft Windows Server 2019 Datacenter -- OS Version: 10.0.17763 Build 1879 -- Image Version: 20210509.1 +- OS Version: 10.0.17763 Build 1935 +- Image Version: 20210516.0 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -10,7 +10,7 @@ - Bash 4.4.23(1)-release - Go 1.15.12 - Julia 1.6.1 -- Node 14.16.1 +- Node 14.17.0 - Perl 5.32.1 - PHP 8.0.6 - Python 3.7.9 @@ -21,12 +21,12 @@ - Composer 2.0.13 - Helm 3.5.4 - Miniconda 4.9.2 -- NPM 6.14.12 +- NPM 6.14.13 - NuGet 5.9.1.11 - pip 21.1.1 (python 3.7) - Pipx 0.16.2.1 - RubyGems 2.7.6.3 -- Vcpkg (build from master \<86d689b>) +- Vcpkg (build from master \) - Yarn 1.22.10 #### Environment variables @@ -39,7 +39,7 @@ - Ant 1.10.10 - Gradle 7.0 - Maven 3.8.1 -- sbt 1.5.1 +- sbt 1.5.2 ### Tools - 7zip 19.00 @@ -54,11 +54,11 @@ - ghc 9.0.1 - Git 2.31.1 - Git LFS 2.13.3 -- Google Cloud SDK 339.0.0 +- Google Cloud SDK 340.0.0 - InnoSetup 6.1.2 - jq 1.6 - Kind 0.10.0 -- Kubectl 1.21.0 +- Kubectl 1.21.1 - Mercurial 5.0 - Mingw-w64 8.1.0 - Newman 5.2.3 @@ -72,11 +72,11 @@ - VSWhere 2.8.4 - WinAppDriver 1.2.2009.02003 - yamllint 1.26.1 -- zstd 1.4.9 +- zstd 1.5.0 ### CLI Tools - Alibaba Cloud CLI 3.0.74 -- AWS CLI 2.2.3 +- AWS CLI 2.2.5 - AWS SAM CLI 1.23.0 - AWS Session Manager CLI 1.2.54.0 - Azure CLI 2.23.0 @@ -88,8 +88,8 @@ ### Rust Tools - Cargo 1.52.0 -- Rust 1.52.0 -- Rustdoc 1.52.0 +- Rust 1.52.1 +- Rustdoc 1.52.1 - Rustup 1.24.1 #### Packages @@ -101,10 +101,10 @@ - Rustfmt 1.4.36 ### Browsers and webdrivers -- Google Chrome 90.0.4430.93 +- Google Chrome 90.0.4430.212 - Chrome Driver 90.0.4430.24 -- Microsoft Edge 90.0.818.56 -- Microsoft Edge Driver 90.0.818.56 +- Microsoft Edge 90.0.818.62 +- Microsoft Edge Driver 90.0.818.62 - Mozilla Firefox 88.0.1 - Gecko Driver 0.29.1 - IE Driver 3.150.1.0 @@ -155,7 +155,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | ------- | ------------ | | 10.24.1 | x64 | | 12.22.1 | x64 | -| 14.16.1 | x64 | +| 14.17.0 | x64 | #### Python @@ -193,7 +193,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Property | Value | | -------------------- | ------------------------------------------------------------------------------------------------------------------------------------ | | ServiceName | postgresql-x64-13 | -| Version | 13.2 | +| Version | 13.3 | | ServiceStatus | Stopped | | ServiceStartType | Disabled | | EnvironmentVariables | PGBIN=C:\Program Files\PostgreSQL\13\bin
PGDATA=C:\Program Files\PostgreSQL\13\data
PGROOT=C:\Program Files\PostgreSQL\13 | @@ -205,7 +205,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### MongoDB | Version | ServiceName | ServiceStatus | ServiceStartType | | ------- | ----------- | ------------- | ---------------- | -| 4.4.5.0 | MongoDB | Running | Automatic | +| 4.4.6.0 | MongoDB | Running | Automatic | @@ -223,15 +223,15 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Nginx | 1.19.10 | C:\tools\nginx-1.19.10\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2019 -| Name | Version | Path | -| ----------------------------- | -------------- | -------------------------------------------------------------- | -| Visual Studio Enterprise 2019 | 16.9.31205.134 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | +| Name | Version | Path | +| ----------------------------- | ------------- | -------------------------------------------------------------- | +| Visual Studio Enterprise 2019 | 16.9.31229.75 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | #### Workloads, components and extensions: | Package | Version | | ------------------------------------------------------------------------- | -------------- | -| Component.Android.NDK.R16B | 16.9.31130.442 | +| Component.Android.NDK.R16B | 16.9.31227.257 | | Component.Android.SDK25.Private | 16.0.28625.61 | | Component.Android.SDK30 | 16.9.31004.209 | | Component.Ant | 1.9.3.8 | @@ -261,8 +261,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.Component.ClickOnce | 16.4.29409.204 | | Microsoft.Component.MSBuild | 16.5.29515.121 | | Microsoft.Component.NetFX.Native | 16.5.29515.121 | -| Microsoft.Component.PythonTools | 16.9.31201.172 | -| Microsoft.Component.PythonTools.Miniconda | 16.2.29003.222 | +| Microsoft.Component.PythonTools | 16.9.31228.235 | +| Microsoft.Component.PythonTools.Miniconda | 16.9.31228.235 | | Microsoft.Component.PythonTools.Web | 16.9.31004.209 | | Microsoft.Component.VC.Runtime.UCRTSDK | 16.0.28625.61 | | Microsoft.ComponentGroup.Blend | 16.0.28315.86 | @@ -285,11 +285,11 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.Net.ComponentGroup.4.7.DeveloperTools | 16.3.29207.166 | | Microsoft.Net.ComponentGroup.DevelopmentPrerequisites | 16.3.29207.166 | | Microsoft.Net.ComponentGroup.TargetingPacks.Common | 16.0.28516.191 | -| Microsoft.Net.Core.Component.SDK.2.1 | 16.9.31202.62 | +| Microsoft.Net.Core.Component.SDK.2.1 | 16.9.31228.235 | | Microsoft.NetCore.Component.DevelopmentTools | 16.9.31004.209 | -| Microsoft.NetCore.Component.Runtime.3.1 | 16.9.31202.62 | -| Microsoft.NetCore.Component.Runtime.5.0 | 16.9.31202.62 | -| Microsoft.NetCore.Component.SDK | 16.9.31202.62 | +| Microsoft.NetCore.Component.Runtime.3.1 | 16.9.31228.235 | +| Microsoft.NetCore.Component.Runtime.5.0 | 16.9.31228.235 | +| Microsoft.NetCore.Component.SDK | 16.9.31228.235 | | Microsoft.NetCore.Component.Web | 16.9.31004.209 | | Microsoft.VisualStudio.Component.AppInsights.Tools | 16.5.29515.121 | | Microsoft.VisualStudio.Component.AspNet45 | 16.9.31004.209 | @@ -446,7 +446,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Workload.NetWeb | 16.9.31004.209 | | Microsoft.VisualStudio.Workload.Node | 16.9.31004.209 | | Microsoft.VisualStudio.Workload.Office | 16.9.31004.209 | -| Microsoft.VisualStudio.Workload.Python | 16.9.31201.172 | +| Microsoft.VisualStudio.Workload.Python | 16.9.31228.235 | | Microsoft.VisualStudio.Workload.Universal | 16.9.31004.209 | | Microsoft.VisualStudio.Workload.VisualStudioExtension | 16.9.31004.209 | | ms-biztalk.BizTalk | 3.13.2.0 | @@ -480,20 +480,20 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### .NET Core SDK `Location C:\Program Files\dotnet\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.519 2.1.520 2.1.521 2.1.522 2.1.523 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.616 2.1.617 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 2.1.811 2.1.812 2.1.813 2.1.814 2.1.815 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.109 3.1.110 3.1.111 3.1.112 3.1.113 3.1.114 3.1.200 3.1.201 3.1.202 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 3.1.408 5.0.100 5.0.101 5.0.102 5.0.103 5.0.104 5.0.200 5.0.201 5.0.202 +- 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.519 2.1.520 2.1.521 2.1.522 2.1.523 2.1.524 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.616 2.1.617 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 2.1.811 2.1.812 2.1.813 2.1.814 2.1.815 2.1.816 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.109 3.1.110 3.1.111 3.1.112 3.1.113 3.1.114 3.1.115 3.1.200 3.1.201 3.1.202 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 3.1.408 3.1.409 5.0.100 5.0.101 5.0.102 5.0.103 5.0.104 5.0.200 5.0.201 5.0.202 5.0.203 ### .NET Core Runtime `Location: C:\Program Files\dotnet\shared\Microsoft.AspNetCore.All` -- 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23 2.1.24 2.1.25 2.1.26 2.1.27 +- 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23 2.1.24 2.1.25 2.1.26 2.1.27 2.1.28 `Location: C:\Program Files\dotnet\shared\Microsoft.AspNetCore.App` -- 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23 2.1.24 2.1.25 2.1.26 2.1.27 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9 3.1.10 3.1.11 3.1.12 3.1.13 3.1.14 5.0.0 5.0.1 5.0.2 5.0.3 5.0.4 5.0.5 +- 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23 2.1.24 2.1.25 2.1.26 2.1.27 2.1.28 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9 3.1.10 3.1.11 3.1.12 3.1.13 3.1.14 3.1.15 5.0.0 5.0.1 5.0.2 5.0.3 5.0.4 5.0.5 5.0.6 `Location: C:\Program Files\dotnet\shared\Microsoft.NETCore.App` -- 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23 2.1.24 2.1.25 2.1.26 2.1.27 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9 3.1.10 3.1.11 3.1.12 3.1.13 3.1.14 5.0.0 5.0.1 5.0.2 5.0.3 5.0.4 5.0.5 +- 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23 2.1.24 2.1.25 2.1.26 2.1.27 2.1.28 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9 3.1.10 3.1.11 3.1.12 3.1.13 3.1.14 3.1.15 5.0.0 5.0.1 5.0.2 5.0.3 5.0.4 5.0.5 5.0.6 `Location: C:\Program Files\dotnet\shared\Microsoft.WindowsDesktop.App` -- 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9 3.1.10 3.1.11 3.1.12 3.1.13 3.1.14 5.0.0 5.0.1 5.0.2 5.0.3 5.0.4 5.0.5 +- 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9 3.1.10 3.1.11 3.1.12 3.1.13 3.1.14 3.1.15 5.0.0 5.0.1 5.0.2 5.0.3 5.0.4 5.0.5 5.0.6 ### .NET Framework `Type: Developer Pack` @@ -519,7 +519,7 @@ All other versions are saved but not installed. | ------------------ | ---------------- | | DockerMsftProvider | 1.0.0.8 | | MarkdownPS | 1.9 | -| Pester | 3.4.0
5.2.0 | +| Pester | 3.4.0
5.2.1 | | PowerShellGet | 1.0.0.1
2.2.5 | | PSScriptAnalyzer | 1.19.1 | | PSWindowsUpdate | 2.2.0.2 | @@ -555,10 +555,10 @@ All other versions are saved but not installed. ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:e1475e80eb3cbdfd81f542ee473ba1e5a39f918a856f506bb510aa86985c04a5 | 2021-04-13 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:c0255fb4963ceaa3f1e9bdfd13f17c4947645abaaf9f362154ec7259b56e7ba2 | 2021-04-13 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:c298b710b4e1a2687bce3f88492f9e8bd812f31bfd7473a1880992a87722d83a | 2021-04-13 | -| mcr.microsoft.com/windows/nanoserver:1809 | sha256:8746dc8b6726d53ba7176332580712c2c5622290b2b44345ded8e302356203ac | 2021-04-08 | -| mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:1bb6543a7fe87bb95d9adfa4c53ea3469c1c846ad63baf32729078062e8c1127 | 2021-04-09 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:6c8ea03414851b5a77a951a9fc82a43e580e816b12e9d05d6a5918a76c2dd7c1 | 2021-05-11 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:c615be2cb06c4f4386f4ba424239f2172af7a3c8360ab0008131828d50fe020f | 2021-05-11 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:9ae2cdbf93d7a50bc195ea72415afed2636b60b1d4a7028c1a9f68ada07fafec | 2021-05-11 | +| mcr.microsoft.com/windows/nanoserver:1809 | sha256:7810b00b2b0ce434cf8a420627b3aba335a40e1b805e1be2e02241b7446f7a00 | 2021-05-07 | +| mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:edd6d6de1e7252d2d434af58798db1d96762d738f60e15b24ed631f55e26681d | 2021-05-08 | From 926cba5c9e858522e081245849b719e4d2f1b224 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 21 May 2021 07:12:25 +0000 Subject: [PATCH 0261/3485] Updating readme file for ubuntu16 version 20210517.1 (#3407) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/linux/Ubuntu1604-README.md | 44 +++++++++++++++---------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/images/linux/Ubuntu1604-README.md b/images/linux/Ubuntu1604-README.md index f77de93f1c66..e5d94bd6096e 100644 --- a/images/linux/Ubuntu1604-README.md +++ b/images/linux/Ubuntu1604-README.md @@ -6,20 +6,20 @@ *** # Ubuntu 16.04.7 LTS - Linux kernel version: 4.15.0-1113-azure -- Image Version: 20210510.0 +- Image Version: 20210517.1 ## Installed Software ### Language and Runtime - Bash 4.3.48(1)-release - Clang 9.0.1 - Clang-format 9.0.1 -- Erlang 23.3.1 (Eshell 11.2) +- Erlang 24.0 (Eshell 12.0) - GNU C++ 5.5.0, 9.3.0 - GNU Fortran 5.5.0, 9.3.0 - Julia 1.6.1 - Mono 6.12.0.122 - MSBuild 16.6.0.15201 (from /usr/lib/mono/msbuild/15.0/bin/MSBuild.dll) -- Node 14.16.1 +- Node 14.17.0 - Perl 5.22.1 - Python 2.7.12 - Python3 3.5.2 @@ -29,13 +29,13 @@ ### Package Management - cpan 1.61 - Helm 3.5.4 -- Homebrew 3.1.6 +- Homebrew 3.1.7 - Miniconda 4.9.2 -- Npm 6.14.12 +- Npm 6.14.13 - Pip 8.1.1 - Pip3 8.1.1 - RubyGems 2.5.2 -- Vcpkg (build from master \<5a271a9>) +- Vcpkg (build from master \) - Yarn 1.22.10 #### Environment variables @@ -46,7 +46,7 @@ ### Project Management - Ant 1.9.6 -- Gradle 7.0.1 +- Gradle 7.0.2 - Maven 3.8.1 - Sbt 1.5.2 @@ -90,15 +90,15 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.74 -- AWS CLI 1.19.70 +- AWS CLI 1.19.73 - AWS CLI Session manager plugin 1.2.54.0 - AWS SAM CLI 1.23.0 - Azure CLI (azure-cli) 2.23.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.18.0 - GitHub CLI 1.9.2 -- Google Cloud SDK 339.0.0 (apt source repository: https://packages.cloud.google.com/apt) +- Google Cloud SDK 340.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 3.29.2 +- Netlify CLI 3.29.15 - OpenShift CLI 4.7.9 - ORAS CLI 0.11.1 - Vercel CLI 22.0.1 @@ -151,11 +151,11 @@ | GECKOWEBDRIVER | /usr/local/share/gecko_driver | ### .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.519 2.1.520 2.1.521 2.1.522 2.1.523 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.616 2.1.617 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 2.1.811 2.1.812 2.1.813 2.1.814 2.1.815 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.109 3.1.110 3.1.111 3.1.112 3.1.113 3.1.114 3.1.200 3.1.201 3.1.202 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 3.1.408 5.0.100 5.0.101 5.0.102 5.0.103 5.0.104 5.0.200 5.0.201 5.0.202 +- 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.519 2.1.520 2.1.521 2.1.522 2.1.523 2.1.524 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.616 2.1.617 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 2.1.811 2.1.812 2.1.813 2.1.814 2.1.815 2.1.816 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.109 3.1.110 3.1.111 3.1.112 3.1.113 3.1.114 3.1.115 3.1.200 3.1.201 3.1.202 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 3.1.408 3.1.409 5.0.100 5.0.101 5.0.102 5.0.103 5.0.104 5.0.200 5.0.201 5.0.202 5.0.203 ### Databases - MongoDB 4.4.6 (apt source repository: https://repo.mongodb.org/apt/ubuntu) -- Postgre SQL 13.2 (apt source repository: https://apt.postgresql.org/pub/repos/apt/) +- Postgre SQL 13.3 (apt source repository: https://apt.postgresql.org/pub/repos/apt/) - sqlite3 3.11.0 #### MySQL @@ -177,7 +177,7 @@ #### Node.js - 10.24.1 - 12.22.1 -- 14.16.1 +- 14.17.0 #### PyPy - 2.7.18 [PyPy 7.3.4] @@ -212,7 +212,7 @@ | Module | Version | | ---------- | ------- | | MarkdownPS | 1.9 | -| Pester | 5.2.0 | +| Pester | 5.2.1 | #### Az PowerShell Modules - 5.7.0 3.1.0.zip 4.4.0.zip @@ -253,16 +253,16 @@ | alpine:3.11 | sha256:18a918a714d1368847b67173d120ebd110fcfae208305412f3005a61cdc7c20e | 2021-04-14 | | alpine:3.12 | sha256:36553b10a4947067b9fbb7d532951066293a68eae893beba1d9235f7d11a20ad | 2021-04-14 | | alpine:3.13 | sha256:69e70a79f2d41ab5d637de98c1e0b055206ba40a8145e7bddb55ccc04e13cf8f | 2021-04-14 | -| buildpack-deps:buster | sha256:da41958eb012d10ac2e9764885e02612dd515df1b455900f3eda81d81a574ca3 | 2021-04-10 | -| buildpack-deps:stretch | sha256:ea0e73d4d5c3341e1328b58a69f513067c79fd6effd9776fc2d2f8d46e2f6e78 | 2021-04-10 | -| debian:10 | sha256:ba4a437377a0c450ac9bb634c3754a17b1f814ce6fa3157c0dc9eef431b29d1f | 2021-04-10 | -| debian:9 | sha256:c0daa8e312c326ac15721712b8a1e68a5039d725ff47bc25c781921089de0a66 | 2021-04-10 | +| buildpack-deps:buster | sha256:28200c7265b185cbceb55ec2d14b5b303d503aeb4dcf6c456e4a66029400a4eb | 2021-05-12 | +| buildpack-deps:stretch | sha256:a84d08cb47515db24a1228de35a909ba782bc2b9ac66b986f566c9dd973ecc24 | 2021-05-12 | +| debian:10 | sha256:acf7795dc91df17e10effee064bd229580a9c34213b4dba578d64768af5d8c51 | 2021-05-12 | +| debian:9 | sha256:4f8deed5755299e2d7ae1f5649656de89a6b7e30c0be37a3a1b4a49f0af51f7e | 2021-05-12 | | node:10 | sha256:59531d2835edd5161c8f9512f9e095b1836f7a1fcb0ab73e005ec46047384911 | 2021-04-10 | | node:10-alpine | sha256:dc98dac24efd4254f75976c40bce46944697a110d06ce7fa47e7268470cf2e28 | 2021-04-14 | -| node:12 | sha256:609103746810535f5a3a987a26ba4ce95d96225d28e9d6228faa5aa331980f37 | 2021-04-10 | +| node:12 | sha256:e38a48c584fde720a43b1bacfea1178e0900936cb8d0141630e5e35693ee6d08 | 2021-05-12 | | node:12-alpine | sha256:9923c9efb13cf7535f67e49b03010f0977a800068e4c8e0e2c93433a6bfa1e77 | 2021-04-14 | -| node:14 | sha256:8eb45f4677c813ad08cef8522254640aa6a1800e75a9c213a0a651f6f3564189 | 2021-04-10 | -| node:14-alpine | sha256:ed51af876dd7932ce5c1e3b16c2e83a3f58419d824e366de1f7b00f40c848c40 | 2021-04-14 | +| node:14 | sha256:9025a77b2f37fcda3bbd367587367a9f2251d16a756ed544550b8a571e16a653 | 2021-05-13 | +| node:14-alpine | sha256:3689ad4435a413342ccc352170ad0f77433b41173af7fe4c0076f0c9792642cb | 2021-05-13 | | ubuntu:16.04 | sha256:eed7e1076bbc1f342c4474c718e5438af4784f59a4e88ad687dbb98483b59ee4 | 2021-04-23 | | ubuntu:18.04 | sha256:538529c9d229fb55f50e6746b119e899775205d62c0fc1b7e679b30d02ecb6e8 | 2021-04-23 | | ubuntu:20.04 | sha256:cf31af331f38d1d7158470e095b132acd126a7180a54f263d386da88eb681d93 | 2021-04-23 | @@ -307,7 +307,7 @@ | libunwind8 | 1.1-4.1 | | libxkbfile-dev | 1:1.0.9-0ubuntu1 | | libxss1 | 1:1.2.2-1 | -| locales | 2.23-0ubuntu11.2 | +| locales | 2.23-0ubuntu11.3 | | m4 | 1.4.17-5 | | mediainfo | 0.7.82-1 | | net-tools | 1.60-26ubuntu1 | From 5e65aeff738c5dff1040acbc170b375a82db9770 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 21 May 2021 07:21:08 +0000 Subject: [PATCH 0262/3485] Updating readme file for ubuntu18 version 20210517.1 (#3399) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/linux/Ubuntu1804-README.md | 44 +++++++++++++++---------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/images/linux/Ubuntu1804-README.md b/images/linux/Ubuntu1804-README.md index e0907be532cb..e97c3322f2eb 100644 --- a/images/linux/Ubuntu1804-README.md +++ b/images/linux/Ubuntu1804-README.md @@ -6,20 +6,20 @@ *** # Ubuntu 18.04.5 LTS - Linux kernel version: 5.4.0-1047-azure -- Image Version: 20210510.0 +- Image Version: 20210517.1 ## Installed Software ### Language and Runtime - Bash 4.4.20(1)-release - Clang 9.0.0 - Clang-format 9.0.0 -- Erlang 23.3.1 (Eshell 11.2) +- Erlang 24.0 (Eshell 12.0) - GNU C++ 7.5.0, 9.3.0, 10.3.0, 11.1.0 - GNU Fortran 7.5.0, 9.3.0, 10.3.0, 11.1.0 - Julia 1.6.1 - Mono 6.12.0.122 - MSBuild 16.6.0.15201 (from /usr/lib/mono/msbuild/15.0/bin/MSBuild.dll) -- Node 14.16.1 +- Node 14.17.0 - Perl 5.26.1 - Python 2.7.17 - Python3 3.6.9 @@ -29,14 +29,14 @@ ### Package Management - cpan 1.64 - Helm 3.5.4 -- Homebrew 3.1.6 +- Homebrew 3.1.7 - Miniconda 4.9.2 -- Npm 6.14.12 +- Npm 6.14.13 - Pip 9.0.1 - Pip3 9.0.1 - Pipx 0.16.2.1 - RubyGems 2.7.6 -- Vcpkg (build from master \<5a271a9>) +- Vcpkg (build from master \) - Yarn 1.22.10 #### Environment variables @@ -47,7 +47,7 @@ ### Project Management - Ant 1.10.5 -- Gradle 7.0.1 +- Gradle 7.0.2 - Maven 3.8.1 - Sbt 1.5.2 @@ -95,15 +95,15 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.74 -- AWS CLI 1.19.70 +- AWS CLI 1.19.73 - AWS CLI Session manager plugin 1.2.54.0 - AWS SAM CLI 1.23.0 - Azure CLI (azure-cli) 2.23.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.18.0 - GitHub CLI 1.9.2 -- Google Cloud SDK 339.0.0 (apt source repository: https://packages.cloud.google.com/apt) +- Google Cloud SDK 340.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 3.29.2 +- Netlify CLI 3.29.15 - OpenShift CLI 4.7.9 - ORAS CLI 0.11.1 - Vercel CLI 22.0.1 @@ -156,15 +156,15 @@ | GECKOWEBDRIVER | /usr/local/share/gecko_driver | ### .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.519 2.1.520 2.1.521 2.1.522 2.1.523 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.616 2.1.617 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 2.1.811 2.1.812 2.1.813 2.1.814 2.1.815 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.109 3.1.110 3.1.111 3.1.112 3.1.113 3.1.114 3.1.200 3.1.201 3.1.202 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 3.1.408 5.0.100 5.0.101 5.0.102 5.0.103 5.0.104 5.0.200 5.0.201 5.0.202 +- 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.519 2.1.520 2.1.521 2.1.522 2.1.523 2.1.524 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.616 2.1.617 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 2.1.811 2.1.812 2.1.813 2.1.814 2.1.815 2.1.816 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.109 3.1.110 3.1.111 3.1.112 3.1.113 3.1.114 3.1.115 3.1.200 3.1.201 3.1.202 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 3.1.408 3.1.409 5.0.100 5.0.101 5.0.102 5.0.103 5.0.104 5.0.200 5.0.201 5.0.202 5.0.203 ### Databases - MongoDB 4.4.6 (apt source repository: https://repo.mongodb.org/apt/ubuntu) -- Postgre SQL 13.2 (apt source repository: https://apt.postgresql.org/pub/repos/apt/) +- Postgre SQL 13.3 (apt source repository: https://apt.postgresql.org/pub/repos/apt/) - sqlite3 3.22.0 #### MySQL -- MySQL 5.7.33 +- MySQL 5.7.34 - MySQL Server (user:root password:root) ``` @@ -182,7 +182,7 @@ #### Node.js - 10.24.1 - 12.22.1 -- 14.16.1 +- 14.17.0 #### PyPy - 2.7.18 [PyPy 7.3.4] @@ -217,7 +217,7 @@ | Module | Version | | ---------- | ------- | | MarkdownPS | 1.9 | -| Pester | 5.2.0 | +| Pester | 5.2.1 | #### Az PowerShell Modules - 5.7.0 3.1.0.zip 4.4.0.zip @@ -258,16 +258,16 @@ | alpine:3.11 | sha256:18a918a714d1368847b67173d120ebd110fcfae208305412f3005a61cdc7c20e | 2021-04-14 | | alpine:3.12 | sha256:36553b10a4947067b9fbb7d532951066293a68eae893beba1d9235f7d11a20ad | 2021-04-14 | | alpine:3.13 | sha256:69e70a79f2d41ab5d637de98c1e0b055206ba40a8145e7bddb55ccc04e13cf8f | 2021-04-14 | -| buildpack-deps:buster | sha256:da41958eb012d10ac2e9764885e02612dd515df1b455900f3eda81d81a574ca3 | 2021-04-10 | -| buildpack-deps:stretch | sha256:ea0e73d4d5c3341e1328b58a69f513067c79fd6effd9776fc2d2f8d46e2f6e78 | 2021-04-10 | -| debian:10 | sha256:ba4a437377a0c450ac9bb634c3754a17b1f814ce6fa3157c0dc9eef431b29d1f | 2021-04-10 | -| debian:9 | sha256:c0daa8e312c326ac15721712b8a1e68a5039d725ff47bc25c781921089de0a66 | 2021-04-10 | +| buildpack-deps:buster | sha256:28200c7265b185cbceb55ec2d14b5b303d503aeb4dcf6c456e4a66029400a4eb | 2021-05-12 | +| buildpack-deps:stretch | sha256:a84d08cb47515db24a1228de35a909ba782bc2b9ac66b986f566c9dd973ecc24 | 2021-05-12 | +| debian:10 | sha256:acf7795dc91df17e10effee064bd229580a9c34213b4dba578d64768af5d8c51 | 2021-05-12 | +| debian:9 | sha256:4f8deed5755299e2d7ae1f5649656de89a6b7e30c0be37a3a1b4a49f0af51f7e | 2021-05-12 | | node:10 | sha256:59531d2835edd5161c8f9512f9e095b1836f7a1fcb0ab73e005ec46047384911 | 2021-04-10 | | node:10-alpine | sha256:dc98dac24efd4254f75976c40bce46944697a110d06ce7fa47e7268470cf2e28 | 2021-04-14 | -| node:12 | sha256:609103746810535f5a3a987a26ba4ce95d96225d28e9d6228faa5aa331980f37 | 2021-04-10 | +| node:12 | sha256:e38a48c584fde720a43b1bacfea1178e0900936cb8d0141630e5e35693ee6d08 | 2021-05-12 | | node:12-alpine | sha256:9923c9efb13cf7535f67e49b03010f0977a800068e4c8e0e2c93433a6bfa1e77 | 2021-04-14 | -| node:14 | sha256:8eb45f4677c813ad08cef8522254640aa6a1800e75a9c213a0a651f6f3564189 | 2021-04-10 | -| node:14-alpine | sha256:ed51af876dd7932ce5c1e3b16c2e83a3f58419d824e366de1f7b00f40c848c40 | 2021-04-14 | +| node:14 | sha256:9025a77b2f37fcda3bbd367587367a9f2251d16a756ed544550b8a571e16a653 | 2021-05-13 | +| node:14-alpine | sha256:3689ad4435a413342ccc352170ad0f77433b41173af7fe4c0076f0c9792642cb | 2021-05-13 | | ubuntu:16.04 | sha256:eed7e1076bbc1f342c4474c718e5438af4784f59a4e88ad687dbb98483b59ee4 | 2021-04-23 | | ubuntu:18.04 | sha256:538529c9d229fb55f50e6746b119e899775205d62c0fc1b7e679b30d02ecb6e8 | 2021-04-23 | | ubuntu:20.04 | sha256:cf31af331f38d1d7158470e095b132acd126a7180a54f263d386da88eb681d93 | 2021-04-23 | From 7ce21d8b0ec95490d9a4a17e7cf68477717f99ec Mon Sep 17 00:00:00 2001 From: Sergey Dolin Date: Fri, 21 May 2021 12:34:41 +0500 Subject: [PATCH 0263/3485] [ubuntu] Rework Mono installation to avoid using apt repos (#3289) * Rework Mono installation to avoid using apt repos on Ubuntu images * Use rest of line to read full AptSourceRepository --- .../linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 | 3 ++- images/linux/scripts/helpers/SoftwareReport.Helpers.psm1 | 2 +- images/linux/scripts/installers/mono.sh | 4 ++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 index 96cc4b562555..a2ebebcb3037 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 @@ -58,7 +58,8 @@ function Get-ErlangVersion { function Get-MonoVersion { $monoVersion = mono --version | Out-String | Take-OutputPart -Part 4 - return "Mono $monoVersion" + $aptSourceRepo = Get-AptSourceRepository -PackageName "mono" + return "Mono $monoVersion (apt source repository: $aptSourceRepo)" } function Get-MsbuildVersion { diff --git a/images/linux/scripts/helpers/SoftwareReport.Helpers.psm1 b/images/linux/scripts/helpers/SoftwareReport.Helpers.psm1 index dfecd423bec9..b645c670f623 100644 --- a/images/linux/scripts/helpers/SoftwareReport.Helpers.psm1 +++ b/images/linux/scripts/helpers/SoftwareReport.Helpers.psm1 @@ -106,7 +106,7 @@ function Get-CachedToolInstances function Get-AptSourceRepository { param([String] $PackageName) - $sourceUrl = Get-Content "$PSScriptRoot/../helpers/apt-sources.txt" | Select-String -Pattern $PackageName | Take-OutputPart -Part 1 + $sourceUrl = Get-Content "$PSScriptRoot/../helpers/apt-sources.txt" | Select-String -Pattern $PackageName | Take-OutputPart -Part (1..3) return $sourceUrl } diff --git a/images/linux/scripts/installers/mono.sh b/images/linux/scripts/installers/mono.sh index 4025c1c337fe..120f7ca4c9c8 100644 --- a/images/linux/scripts/installers/mono.sh +++ b/images/linux/scripts/installers/mono.sh @@ -14,4 +14,8 @@ echo "deb https://download.mono-project.com/repo/ubuntu stable-$LSB_CODENAME mai apt-get update apt-get install -y --no-install-recommends apt-transport-https mono-complete nuget +rm /etc/apt/sources.list.d/mono-official-stable.list +rm -f /etc/apt/sources.list.d/mono-official-stable.list.save +echo "mono https://download.mono-project.com/repo/ubuntu stable-$LSB_CODENAME main" >> $HELPER_SCRIPTS/apt-sources.txt + invoke_tests "Tools" "Mono" From 589a58e707319199d9b2b199895686f1489c1a21 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Fri, 21 May 2021 15:37:15 +0300 Subject: [PATCH 0264/3485] [Ubuntu] Change java-tools script to retrieve the latest major Gradle version (#3385) * Change java-tools script to retrieve the latest major gradle version * Change gradle installation to use manifest json. Use download_with_retries function * Move maven version to the toolset --- images/linux/scripts/helpers/install.sh | 3 +- images/linux/scripts/installers/java-tools.sh | 35 +++++++++---------- images/linux/toolsets/toolset-1604.json | 3 +- images/linux/toolsets/toolset-1804.json | 3 +- images/linux/toolsets/toolset-2004.json | 3 +- 5 files changed, 24 insertions(+), 23 deletions(-) diff --git a/images/linux/scripts/helpers/install.sh b/images/linux/scripts/helpers/install.sh index c2fbdb2420f4..efdfac54292d 100644 --- a/images/linux/scripts/helpers/install.sh +++ b/images/linux/scripts/helpers/install.sh @@ -19,7 +19,7 @@ download_with_retries() { COMMAND="curl $URL -4 -sL -o '$DEST/$NAME'" fi - echo "Downloading $URL..." + echo "Downloading '$URL' to '${DEST}/${NAME}'..." i=20 while [ $i -gt 0 ]; do ((i--)) @@ -27,6 +27,7 @@ download_with_retries() { if [ $? != 0 ]; then sleep 30 else + echo "Download completed" return 0 fi done diff --git a/images/linux/scripts/installers/java-tools.sh b/images/linux/scripts/installers/java-tools.sh index 94c3252dfc78..a78043a0ffb7 100644 --- a/images/linux/scripts/installers/java-tools.sh +++ b/images/linux/scripts/installers/java-tools.sh @@ -3,6 +3,7 @@ ## File: java-tools.sh ## Desc: Installs Java and related tooling (Ant, Gradle, Maven) ################################################################################ + source $HELPER_SCRIPTS/install.sh source $HELPER_SCRIPTS/os.sh source $HELPER_SCRIPTS/etc-environment.sh @@ -62,27 +63,23 @@ apt-fast install -y --no-install-recommends ant ant-optional echo "ANT_HOME=/usr/share/ant" | tee -a /etc/environment # Install Maven -curl -sL https://www-eu.apache.org/dist/maven/maven-3/3.8.1/binaries/apache-maven-3.8.1-bin.zip -o maven.zip -unzip -qq -d /usr/share maven.zip -rm maven.zip -ln -s /usr/share/apache-maven-3.8.1/bin/mvn /usr/bin/mvn +mavenVersion=$(get_toolset_value '.java.maven') +mavenDownloadUrl="https://www-eu.apache.org/dist/maven/maven-3/${mavenVersion}/binaries/apache-maven-${mavenVersion}-bin.zip" +download_with_retries $mavenDownloadUrl "/tmp" "maven.zip" +unzip -qq -d /usr/share /tmp/maven.zip +ln -s /usr/share/apache-maven-${mavenVersion}/bin/mvn /usr/bin/mvn # Install Gradle -# This script downloads the latest HTML list of releases at https://gradle.org/releases/. -# Then, it extracts the top-most release download URL, relying on the top-most URL being for the latest release. -# The release download URL looks like this: https://services.gradle.org/distributions/gradle-5.2.1-bin.zip -# The release version is extracted from the download URL (i.e. 5.2.1). -# After all of this, the release is downloaded, extracted, a symlink is created that points to it, and GRADLE_HOME is set. -wget -qO gradleReleases.html https://gradle.org/releases/ -gradleUrl=$(grep -m 1 -o "https:\/\/services.gradle.org\/distributions\/gradle-.*-bin\.zip" gradleReleases.html | head -1) -gradleVersion=$(echo $gradleUrl | sed -nre 's/^[^0-9]*(([0-9]+\.)*[0-9]+).*/\1/p') -rm gradleReleases.html -echo "gradleUrl=$gradleUrl" -echo "gradleVersion=$gradleVersion" -curl -sL $gradleUrl -o gradleLatest.zip -unzip -qq -d /usr/share gradleLatest.zip -rm gradleLatest.zip -ln -s /usr/share/gradle-"${gradleVersion}"/bin/gradle /usr/bin/gradle +# This script founds the latest gradle release from https://services.gradle.org/versions/all +# The release is downloaded, extracted, a symlink is created that points to it, and GRADLE_HOME is set. +gradleJson=$(curl -s https://services.gradle.org/versions/all) +gradleLatestVersion=$(echo $gradleJson | jq -r '.[] | select(.version | contains("-") | not).version' | sort -V | tail -n1) +gradleDownloadUrl=$(echo $gradleJson | jq -r ".[] | select(.version==\"$gradleLatestVersion\") | .downloadUrl") +echo "gradleUrl=$gradleDownloadUrl" +echo "gradleVersion=$gradleLatestVersion" +download_with_retries $gradleDownloadUrl "/tmp" "gradleLatest.zip" +unzip -qq -d /usr/share /tmp/gradleLatest.zip +ln -s /usr/share/gradle-"${gradleLatestVersion}"/bin/gradle /usr/bin/gradle echo "GRADLE_HOME=$(find /usr/share -depth -maxdepth 1 -name "gradle*")" | tee -a /etc/environment reloadEtcEnvironment diff --git a/images/linux/toolsets/toolset-1604.json b/images/linux/toolsets/toolset-1604.json index 14e47bd5581b..6cc4906c5f52 100644 --- a/images/linux/toolsets/toolset-1604.json +++ b/images/linux/toolsets/toolset-1604.json @@ -72,7 +72,8 @@ "default": "8", "versions": [ "8", "11", "12" - ] + ], + "maven": "3.8.1" }, "android": { "platform_min_version": "23", diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index 0f45c6ac0af2..9c62b5f49a78 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -72,7 +72,8 @@ "default": "8", "versions": [ "8", "11", "12" - ] + ], + "maven": "3.8.1" }, "android": { "platform_min_version": "23", diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index fd6b1bf29057..323b2068e9b7 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -72,7 +72,8 @@ "default": "11", "versions": [ "8", "11" - ] + ], + "maven": "3.8.1" }, "android": { "platform_min_version": "27", From 75f9131c187acdb0dcea8c39b16d64f6c482b866 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 21 May 2021 13:40:25 +0000 Subject: [PATCH 0265/3485] Updating readme file for ubuntu20 version 20210517.1 (#3400) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/linux/Ubuntu2004-README.md | 50 +++++++++++++++---------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/images/linux/Ubuntu2004-README.md b/images/linux/Ubuntu2004-README.md index c86ba846725a..cc13fb305dbf 100644 --- a/images/linux/Ubuntu2004-README.md +++ b/images/linux/Ubuntu2004-README.md @@ -6,20 +6,20 @@ *** # Ubuntu 20.04.2 LTS - Linux kernel version: 5.4.0-1047-azure -- Image Version: 20210510.0 +- Image Version: 20210517.1 ## Installed Software ### Language and Runtime - Bash 5.0.17(1)-release -- Clang 9.0.1, 10.0.0, 11.0.0 -- Clang-format 9.0.1, 10.0.0, 11.0.0 -- Erlang 23.3.1 (Eshell 11.2) +- Clang 10.0.0, 11.0.0, 12.0.1 +- Clang-format 10.0.0, 11.0.0, 12.0.1 +- Erlang 24.0 (Eshell 12.0) - GNU C++ 9.3.0, 10.2.0, 11.1.0 - GNU Fortran 9.3.0, 10.2.0, 11.1.0 - Julia 1.6.1 - Mono 6.12.0.122 - MSBuild 16.6.0.15201 (from /usr/lib/mono/msbuild/15.0/bin/MSBuild.dll) -- Node 14.16.1 +- Node 14.17.0 - Perl 5.30.0 - Python 3.8.5 - Python3 3.8.5 @@ -29,14 +29,14 @@ ### Package Management - cpan 1.64 - Helm 3.5.4 -- Homebrew 3.1.6 +- Homebrew 3.1.7 - Miniconda 4.9.2 -- Npm 6.14.12 +- Npm 6.14.13 - Pip 20.0.2 - Pip3 20.0.2 - Pipx 0.16.2.1 - RubyGems 3.1.2 -- Vcpkg (build from master \<5a271a9>) +- Vcpkg (build from master \) - Yarn 1.22.10 #### Environment variables @@ -47,7 +47,7 @@ ### Project Management - Ant 1.10.7 -- Gradle 7.0.1 +- Gradle 7.0.2 - Lerna 4.0.0 - Maven 3.8.1 - Sbt 1.5.2 @@ -65,7 +65,7 @@ - Docker-Buildx 0.5.1 - Docker-Moby Client 20.10.6+azure - Docker-Moby Server 20.10.6+azure -- Fastlane 2.182.0 +- Fastlane 2.183.0 - Git 2.31.1 (apt source repository: ppa:git-core/ppa) - Git LFS 2.13.3 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.6.0 @@ -97,15 +97,15 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.74 -- AWS CLI 2.2.3 +- AWS CLI 2.2.5 - AWS CLI Session manager plugin 1.2.54.0 - AWS SAM CLI 1.23.0 - Azure CLI (azure-cli) 2.23.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.18.0 - GitHub CLI 1.9.2 -- Google Cloud SDK 339.0.0 (apt source repository: https://packages.cloud.google.com/apt) +- Google Cloud SDK 340.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 3.29.2 +- Netlify CLI 3.29.15 - OpenShift CLI 4.7.9 - ORAS CLI 0.11.1 - Vercel CLI 22.0.1 @@ -162,15 +162,15 @@ | GECKOWEBDRIVER | /usr/local/share/gecko_driver | ### .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.519 2.1.520 2.1.521 2.1.522 2.1.523 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.616 2.1.617 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 2.1.811 2.1.812 2.1.813 2.1.814 2.1.815 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.109 3.1.110 3.1.111 3.1.112 3.1.113 3.1.114 3.1.200 3.1.201 3.1.202 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 3.1.408 5.0.100 5.0.101 5.0.102 5.0.103 5.0.104 5.0.200 5.0.201 5.0.202 +- 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.519 2.1.520 2.1.521 2.1.522 2.1.523 2.1.524 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.616 2.1.617 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 2.1.811 2.1.812 2.1.813 2.1.814 2.1.815 2.1.816 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.109 3.1.110 3.1.111 3.1.112 3.1.113 3.1.114 3.1.115 3.1.200 3.1.201 3.1.202 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 3.1.408 3.1.409 5.0.100 5.0.101 5.0.102 5.0.103 5.0.104 5.0.200 5.0.201 5.0.202 5.0.203 ### Databases - MongoDB 4.4.6 (apt source repository: https://repo.mongodb.org/apt/ubuntu) -- Postgre SQL 13.2 (apt source repository: https://apt.postgresql.org/pub/repos/apt/) +- Postgre SQL 13.3 (apt source repository: https://apt.postgresql.org/pub/repos/apt/) - sqlite3 3.31.1 #### MySQL -- MySQL 8.0.23 +- MySQL 8.0.25 - MySQL Server (user:root password:root) ``` @@ -188,7 +188,7 @@ #### Node.js - 10.24.1 - 12.22.1 -- 14.16.1 +- 14.17.0 #### PyPy - 2.7.18 [PyPy 7.3.4] @@ -223,7 +223,7 @@ | Module | Version | | ---------------- | ------- | | MarkdownPS | 1.9 | -| Pester | 5.2.0 | +| Pester | 5.2.1 | | PSScriptAnalyzer | 1.19.1 | #### Az PowerShell Modules @@ -266,16 +266,16 @@ | alpine:3.11 | sha256:18a918a714d1368847b67173d120ebd110fcfae208305412f3005a61cdc7c20e | 2021-04-14 | | alpine:3.12 | sha256:36553b10a4947067b9fbb7d532951066293a68eae893beba1d9235f7d11a20ad | 2021-04-14 | | alpine:3.13 | sha256:69e70a79f2d41ab5d637de98c1e0b055206ba40a8145e7bddb55ccc04e13cf8f | 2021-04-14 | -| buildpack-deps:buster | sha256:da41958eb012d10ac2e9764885e02612dd515df1b455900f3eda81d81a574ca3 | 2021-04-10 | -| buildpack-deps:stretch | sha256:ea0e73d4d5c3341e1328b58a69f513067c79fd6effd9776fc2d2f8d46e2f6e78 | 2021-04-10 | -| debian:10 | sha256:ba4a437377a0c450ac9bb634c3754a17b1f814ce6fa3157c0dc9eef431b29d1f | 2021-04-10 | -| debian:9 | sha256:c0daa8e312c326ac15721712b8a1e68a5039d725ff47bc25c781921089de0a66 | 2021-04-10 | +| buildpack-deps:buster | sha256:28200c7265b185cbceb55ec2d14b5b303d503aeb4dcf6c456e4a66029400a4eb | 2021-05-12 | +| buildpack-deps:stretch | sha256:a84d08cb47515db24a1228de35a909ba782bc2b9ac66b986f566c9dd973ecc24 | 2021-05-12 | +| debian:10 | sha256:acf7795dc91df17e10effee064bd229580a9c34213b4dba578d64768af5d8c51 | 2021-05-12 | +| debian:9 | sha256:4f8deed5755299e2d7ae1f5649656de89a6b7e30c0be37a3a1b4a49f0af51f7e | 2021-05-12 | | node:10 | sha256:59531d2835edd5161c8f9512f9e095b1836f7a1fcb0ab73e005ec46047384911 | 2021-04-10 | | node:10-alpine | sha256:dc98dac24efd4254f75976c40bce46944697a110d06ce7fa47e7268470cf2e28 | 2021-04-14 | -| node:12 | sha256:609103746810535f5a3a987a26ba4ce95d96225d28e9d6228faa5aa331980f37 | 2021-04-10 | +| node:12 | sha256:e38a48c584fde720a43b1bacfea1178e0900936cb8d0141630e5e35693ee6d08 | 2021-05-12 | | node:12-alpine | sha256:9923c9efb13cf7535f67e49b03010f0977a800068e4c8e0e2c93433a6bfa1e77 | 2021-04-14 | -| node:14 | sha256:8eb45f4677c813ad08cef8522254640aa6a1800e75a9c213a0a651f6f3564189 | 2021-04-10 | -| node:14-alpine | sha256:ed51af876dd7932ce5c1e3b16c2e83a3f58419d824e366de1f7b00f40c848c40 | 2021-04-14 | +| node:14 | sha256:9025a77b2f37fcda3bbd367587367a9f2251d16a756ed544550b8a571e16a653 | 2021-05-13 | +| node:14-alpine | sha256:3689ad4435a413342ccc352170ad0f77433b41173af7fe4c0076f0c9792642cb | 2021-05-13 | | ubuntu:16.04 | sha256:eed7e1076bbc1f342c4474c718e5438af4784f59a4e88ad687dbb98483b59ee4 | 2021-04-23 | | ubuntu:18.04 | sha256:538529c9d229fb55f50e6746b119e899775205d62c0fc1b7e679b30d02ecb6e8 | 2021-04-23 | | ubuntu:20.04 | sha256:cf31af331f38d1d7158470e095b132acd126a7180a54f263d386da88eb681d93 | 2021-04-23 | From 7c673a20aa8f2854dc600e03b3765d733dcc3e2a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 24 May 2021 12:07:10 +0000 Subject: [PATCH 0266/3485] Updating readme file for macOS-11 version 20210523.1 (#3443) Co-authored-by: Image generation service account --- images/macos/macos-11-Readme.md | 37 +++++++++++++++++---------------- 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/images/macos/macos-11-Readme.md b/images/macos/macos-11-Readme.md index 635ac814a41c..3b630ffbc5f4 100644 --- a/images/macos/macos-11-Readme.md +++ b/images/macos/macos-11-Readme.md @@ -6,7 +6,7 @@ # macOS 11.3 info - System Version: macOS 11.3.1 (20E241) - Kernel Version: Darwin 20.4.0 -- Image Version: 20210516.1 +- Image Version: 20210523.1 ## Installed Software ### Language and Runtime @@ -14,11 +14,11 @@ - Bash 3.2.57(1)-release - Clang/LLVM 12.0.0 is available on `'$(brew --prefix llvm)/bin/clang'` - Clang/LLVM 12.0.0 is default -- gcc-8 (Homebrew GCC 8.4.0_3) 8.4.0 - available by `gcc-8` alias +- gcc-8 (Homebrew GCC 8.5.0) 8.5.0 - available by `gcc-8` alias - gcc-9 (Homebrew GCC 9.3.0_2) 9.3.0 - available by `gcc-9` alias - gcc-10 (Homebrew GCC 10.3.0) 10.3.0 - available by `gcc-10` alias - gcc-11 (Homebrew GCC 11.1.0) 11.1.0 - available by `gcc-11` alias -- GNU Fortran (Homebrew GCC 8.4.0_3) 8.4.0 - available by `gfortran-8` alias +- GNU Fortran (Homebrew GCC 8.5.0) 8.5.0 - available by `gfortran-8` alias - GNU Fortran (Homebrew GCC 9.3.0_2) 9.3.0 - available by `gfortran-9` alias - GNU Fortran (Homebrew GCC 10.3.0) 10.3.0 - available by `gfortran-10` alias - GNU Fortran (Homebrew GCC 11.1.0) 11.1.0 - available by `gfortran-11` alias @@ -28,7 +28,7 @@ - Node.js v14.17.0 - NVM 0.38.0 - NVM - Cached node versions: v10.24.1 v12.22.1 v14.17.0 -- Perl 5.32.1 +- Perl 5.34.0 - PHP 8.0.6 - Python 2.7.18 - Python 3.9.5 @@ -38,8 +38,8 @@ - Bundler version 2.2.17 - Carthage 0.38.0 - CocoaPods 1.10.1 -- Composer 2.0.13 -- Homebrew 3.1.7 +- Composer 2.0.14 +- Homebrew 3.1.9 - Miniconda 4.9.2 - NPM 6.14.13 - NuGet 5.6.0.6489 @@ -47,7 +47,7 @@ - Pip 21.1.1 (python 3.9) - Pipx 0.16.2.1 - RubyGems 3.2.17 -- Vcpkg 2021 (build from master \) +- Vcpkg 2021 (build from master \) - Yarn 1.22.5 #### Environment variables @@ -65,13 +65,13 @@ - 7-Zip 17.04 - aria2 1.35.0 - azcopy 10.10.0 -- bazel 4.0.0 -- bazelisk 1.8.1 +- bazel 4.1.0 +- bazelisk 1.9.0 - bsdtar 3.3.2 - available by 'tar' alias - Curl 7.76.1 - Git LFS: 2.13.3 - Git: 2.31.1 -- GitHub CLI: 1.9.2 +- GitHub CLI: 1.10.3 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.1 - gpg (GnuPG) 2.3.1 @@ -86,7 +86,7 @@ - PostgreSQL 13.3 - psql (PostgreSQL) 13.3 - Subversion (SVN) 1.14.1 -- zstd 1.4.9 +- zstd 1.5.0 ### Tools @@ -98,11 +98,11 @@ - Azure CLI 2.23.0 - Cabal 3.4.0.0 - Cmake 3.20.2 -- Fastlane 2.183.0 +- Fastlane 2.184.0 - GHC 9.0.1 - GHCup v0.1.14.1 - Stack 2.7.1 -- SwiftFormat 0.48.2 +- SwiftFormat 0.48.3 - Xcode Command Line Tools 12.5.0.0.1.1617976050 ### Linters @@ -114,8 +114,8 @@ - SafariDriver 14.1 (16611.1.21.161.6) - Google Chrome 90.0.4430.212 - ChromeDriver 90.0.4430.24 -- Microsoft Edge 90.0.818.62 -- MSEdgeDriver 90.0.818.62 +- Microsoft Edge 90.0.818.66 +- MSEdgeDriver 90.0.818.66 - Mozilla Firefox 88.0.1 - geckodriver 0.29.1 @@ -158,7 +158,7 @@ - Cargo 1.52.0 - Rust 1.52.1 - Rustdoc 1.52.1 -- Rustup 1.24.1 +- Rustup 1.24.2 #### Packages - Bindgen 0.58.1 @@ -187,7 +187,7 @@ ### Xamarin #### Visual Studio for Mac -- 8.9.9.3 +- 8.9.10.4 #### Xamarin bundles | symlink | Xamarin.Mono | Xamarin.iOS | Xamarin.Mac | Xamarin.Android | @@ -279,7 +279,7 @@ | Android Command Line Tools | 4.0 | | Android Emulator | 30.6.5 | | Android SDK Build-tools | 30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3 | -| Android SDK Platforms | android-S (rev 3)
android-30 (rev 3)
android-29 (rev 5)
android-28 (rev 6)
android-27 (rev 3) | +| Android SDK Platforms | android-S (rev 4)
android-30 (rev 3)
android-29 (rev 5)
android-28 (rev 6)
android-27 (rev 3) | | Android SDK Platform-Tools | 31.0.2 | | Android SDK Tools | 26.1.1 | | Android Support Repository | 47.0.0 | @@ -299,3 +299,4 @@ | ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | + From d32753de28982f72a699d80f2169eef14d9b4c1c Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Mon, 24 May 2021 21:36:35 +0300 Subject: [PATCH 0267/3485] Temporary hardcoding fastlane 2.183.2 on macOS (#3444) --- images/macos/provision/core/rubygem.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/images/macos/provision/core/rubygem.sh b/images/macos/provision/core/rubygem.sh index 48bb3bef382d..d0a4dc2895da 100755 --- a/images/macos/provision/core/rubygem.sh +++ b/images/macos/provision/core/rubygem.sh @@ -27,7 +27,9 @@ gem install xcpretty echo Installing bundler... gem install bundler --force +# AppStoreRelease Azure DevOps has issues with Fastlane 2.184.0. Temporary hardcoding the version until the issue is fixed +# https://github.com/microsoft/app-store-vsts-extension/issues/244 echo Installing fastlane tools... -gem install fastlane +gem install fastlane -v 2.183.2 invoke_tests "RubyGem" From 8dd6faf126ede3063971c6adeb7e95c413ad083b Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Mon, 24 May 2021 21:37:55 +0300 Subject: [PATCH 0268/3485] [macOS] Change Add-AssertionOperator to Add-ShouldOperator (#3447) --- images/macos/helpers/Tests.Helpers.psm1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/macos/helpers/Tests.Helpers.psm1 b/images/macos/helpers/Tests.Helpers.psm1 index 718933e5d103..4f585b055c2e 100644 --- a/images/macos/helpers/Tests.Helpers.psm1 +++ b/images/macos/helpers/Tests.Helpers.psm1 @@ -78,8 +78,8 @@ function ShouldReturnZeroExitCode { } } -If (Get-Command -Name Add-AssertionOperator -ErrorAction SilentlyContinue) { - Add-AssertionOperator -Name ReturnZeroExitCode -InternalName ShouldReturnZeroExitCode -Test ${function:ShouldReturnZeroExitCode} +If (Get-Command -Name Add-ShouldOperator -ErrorAction SilentlyContinue) { + Add-ShouldOperator -Name ReturnZeroExitCode -InternalName ShouldReturnZeroExitCode -Test ${function:ShouldReturnZeroExitCode} } function Invoke-PesterTests { From 39e317a1b65a6387361810a1df31a09de851ba88 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Mon, 24 May 2021 21:38:12 +0300 Subject: [PATCH 0269/3485] [ubuntu] Change Add-AssertionOperator to Add-ShouldOperator (#3445) --- images/linux/scripts/helpers/Tests.Helpers.psm1 | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/images/linux/scripts/helpers/Tests.Helpers.psm1 b/images/linux/scripts/helpers/Tests.Helpers.psm1 index c0e2c270ed67..085aaa07908d 100644 --- a/images/linux/scripts/helpers/Tests.Helpers.psm1 +++ b/images/linux/scripts/helpers/Tests.Helpers.psm1 @@ -67,10 +67,6 @@ function ShouldReturnZeroExitCode { } } -If (Get-Command -Name Add-AssertionOperator -ErrorAction SilentlyContinue) { - Add-AssertionOperator -Name ReturnZeroExitCode -InternalName ShouldReturnZeroExitCode -Test ${function:ShouldReturnZeroExitCode} -} - function ShouldMatchCommandOutput { Param( [String] $ActualValue, @@ -102,7 +98,7 @@ function ShouldMatchCommandOutput { } } -If (Get-Command -Name Add-AssertionOperator -ErrorAction SilentlyContinue) { - Add-AssertionOperator -Name ReturnZeroExitCode -InternalName ShouldReturnZeroExitCode -Test ${function:ShouldReturnZeroExitCode} - Add-AssertionOperator -Name MatchCommandOutput -InternalName ShouldMatchCommandOutput -Test ${function:ShouldMatchCommandOutput} -} \ No newline at end of file +If (Get-Command -Name Add-ShouldOperator -ErrorAction SilentlyContinue) { + Add-ShouldOperator -Name ReturnZeroExitCode -InternalName ShouldReturnZeroExitCode -Test ${function:ShouldReturnZeroExitCode} + Add-ShouldOperator -Name MatchCommandOutput -InternalName ShouldMatchCommandOutput -Test ${function:ShouldMatchCommandOutput} +} From 8e7629ee13ea5e8ea81e9c394c6d5fabcd213655 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Tue, 25 May 2021 11:13:12 +0300 Subject: [PATCH 0270/3485] Change Add-AssertionOperator to Add-ShouldOperator (#3446) --- images/win/scripts/ImageHelpers/TestsHelpers.ps1 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/images/win/scripts/ImageHelpers/TestsHelpers.ps1 b/images/win/scripts/ImageHelpers/TestsHelpers.ps1 index 7b5f012ba020..ec71faec846e 100644 --- a/images/win/scripts/ImageHelpers/TestsHelpers.ps1 +++ b/images/win/scripts/ImageHelpers/TestsHelpers.ps1 @@ -128,7 +128,7 @@ function ShouldMatchCommandOutput { } } -If (Get-Command -Name Add-AssertionOperator -ErrorAction SilentlyContinue) { - Add-AssertionOperator -Name ReturnZeroExitCode -InternalName ShouldReturnZeroExitCode -Test ${function:ShouldReturnZeroExitCode} - Add-AssertionOperator -Name MatchCommandOutput -InternalName ShouldMatchCommandOutput -Test ${function:ShouldMatchCommandOutput} +If (Get-Command -Name Add-ShouldOperator -ErrorAction SilentlyContinue) { + Add-ShouldOperator -Name ReturnZeroExitCode -InternalName ShouldReturnZeroExitCode -Test ${function:ShouldReturnZeroExitCode} + Add-ShouldOperator -Name MatchCommandOutput -InternalName ShouldMatchCommandOutput -Test ${function:ShouldMatchCommandOutput} } \ No newline at end of file From f9f82b79eb0ca9b7190d97afb8456282cab97878 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Tue, 25 May 2021 20:33:58 +0300 Subject: [PATCH 0271/3485] Add previous version uninstallation (#3448) --- images/macos/provision/core/rubygem.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/images/macos/provision/core/rubygem.sh b/images/macos/provision/core/rubygem.sh index d0a4dc2895da..82211e38a39f 100755 --- a/images/macos/provision/core/rubygem.sh +++ b/images/macos/provision/core/rubygem.sh @@ -30,6 +30,7 @@ gem install bundler --force # AppStoreRelease Azure DevOps has issues with Fastlane 2.184.0. Temporary hardcoding the version until the issue is fixed # https://github.com/microsoft/app-store-vsts-extension/issues/244 echo Installing fastlane tools... +gem uninstall fastlane -aI gem install fastlane -v 2.183.2 invoke_tests "RubyGem" From f7e0e8befbdca22d3602ae06f4af3cb8fc172fa4 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Thu, 27 May 2021 10:20:41 +0300 Subject: [PATCH 0272/3485] [Windows] Switch to use OData query instead of choco search for ghc installation (#3458) * Switch to use OData query instead of choco search * Simplify the logic --- images/win/scripts/Installers/Install-Haskell.ps1 | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/images/win/scripts/Installers/Install-Haskell.ps1 b/images/win/scripts/Installers/Install-Haskell.ps1 index 558509808ad1..0e44d0ad8e08 100644 --- a/images/win/scripts/Installers/Install-Haskell.ps1 +++ b/images/win/scripts/Installers/Install-Haskell.ps1 @@ -3,10 +3,12 @@ ## Desc: Install Haskell for Windows ################################################################################ -# Get 3 latest versions of GHC -[Version[]] $ChocoVersionsOutput = & choco search ghc --allversions | Where-Object { $_.StartsWith('ghc ') -and $_ -match 'Approved' } | ForEach-Object { [regex]::matches($_, '\d+(\.\d+){2,}').value } -$MajorMinorGroups = $ChocoVersionsOutput | Sort-Object -Descending | Group-Object { $_.ToString(2) } | Select-Object -First 3 -$VersionsList = $MajorMinorGroups | ForEach-Object { $_.Group | Select-Object -First 1 } | Sort-Object +# Get 3 latest versions of GHC, use OData query for that since choco search has issues https://github.com/chocolatey/choco/issues/2271 +$ODataQuery = '$filter=(Title eq ''ghc'') and (IsPrerelease eq false)&$orderby=Version desc' +$Url = "https://community.chocolatey.org/api/v2/Packages()?$ODataQuery" +$ChocoVersionsOutput = [Version[]](Invoke-RestMethod -Uri $Url).properties.Version +$LatestMajorMinor = $ChocoVersionsOutput | Group-Object { $_.ToString(2) } | Sort-Object { [Version]$_.Name } | Select-Object -last 3 +$VersionsList = $LatestMajorMinor | ForEach-Object { $_.Group | Select-Object -First 1 } | Sort-Object # The latest version will be installed as a default ForEach ($version in $VersionsList) From 4b3f574fecda7889b0fdbed8ad3323b6dc3b1377 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 27 May 2021 09:07:26 +0000 Subject: [PATCH 0273/3485] Updating readme file for ubuntu16 version 20210524.1 (#3440) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/linux/Ubuntu1604-README.md | 53 +++++++++++++++---------------- 1 file changed, 26 insertions(+), 27 deletions(-) diff --git a/images/linux/Ubuntu1604-README.md b/images/linux/Ubuntu1604-README.md index e5d94bd6096e..0551f045178c 100644 --- a/images/linux/Ubuntu1604-README.md +++ b/images/linux/Ubuntu1604-README.md @@ -2,22 +2,21 @@ |-| | [[Ubuntu] .NET SDK pre-installation policy will be changed on June 14](https://github.com/actions/virtual-environments/issues/3338) | | [Ubuntu 16.04 environment will be removed on September 20, 2021](https://github.com/actions/virtual-environments/issues/3287) | -| [[ubuntu] Clang 9 will be removed on May, 17th and default will be set to Clang 11](https://github.com/actions/virtual-environments/issues/3235) | *** # Ubuntu 16.04.7 LTS - Linux kernel version: 4.15.0-1113-azure -- Image Version: 20210517.1 +- Image Version: 20210524.1 ## Installed Software ### Language and Runtime - Bash 4.3.48(1)-release - Clang 9.0.1 - Clang-format 9.0.1 -- Erlang 24.0 (Eshell 12.0) +- Erlang 24.0.1 (Eshell 12.0.1) - GNU C++ 5.5.0, 9.3.0 - GNU Fortran 5.5.0, 9.3.0 - Julia 1.6.1 -- Mono 6.12.0.122 +- Mono 6.12.0.122 (apt source repository: https://download.mono-project.com/repo/ubuntu stable-xenial main) - MSBuild 16.6.0.15201 (from /usr/lib/mono/msbuild/15.0/bin/MSBuild.dll) - Node 14.17.0 - Perl 5.22.1 @@ -29,13 +28,13 @@ ### Package Management - cpan 1.61 - Helm 3.5.4 -- Homebrew 3.1.7 +- Homebrew 3.1.9 - Miniconda 4.9.2 - Npm 6.14.13 - Pip 8.1.1 - Pip3 8.1.1 - RubyGems 2.5.2 -- Vcpkg (build from master \) +- Vcpkg (build from master \) - Yarn 1.22.10 #### Environment variables @@ -54,10 +53,10 @@ - Ansible 2.9.21 - apt-fast 1.9.11 - AzCopy 10.10.0 (available by `azcopy` and `azcopy10` aliases) -- Bazel 4.0.0 -- Bazelisk 1.8.1 +- Bazel 4.1.0 +- Bazelisk 1.9.0 - CMake 3.20.2 -- CodeQL Action Bundle 2.5.4 +- CodeQL Action Bundle 2.5.5 - Docker Compose 1.29.2 - Docker-Buildx 0.5.1 - Docker-Moby Client 20.10.6+azure @@ -66,12 +65,12 @@ - Git LFS 2.13.3 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.0.2 - Haveged 1.9.1 -- Heroku 7.53.1 +- Heroku 7.54.0 - HHVM (HipHop VM) 4.56.6 - jq 1.5 -- Kind 0.10.0 +- Kind 0.11.0 - Kubectl 1.20.1-5-g76a04fc -- Kustomize 4.1.2 +- Kustomize 4.1.3 - Leiningen 2.9.6 - MediaInfo 0.7.82 - Mercurial 4.4.1 @@ -81,25 +80,25 @@ - OpenSSL 1.0.2g 1 Mar 2016 - Packer 1.7.2 - PhantomJS 2.1.1 -- Pulumi 3.2.1 -- R 4.0.5 +- Pulumi 3.3.0 +- R 4.1.0 - Sphinx Open Source Search Server 2.2.9 - SVN 1.9.3 -- Terraform 0.15.3 -- zstd 1.4.9 (homebrew) +- Terraform 0.15.4 +- zstd 1.5.0 (homebrew) ### CLI Tools - Alibaba Cloud CLI 3.0.74 -- AWS CLI 1.19.73 +- AWS CLI 1.19.78 - AWS CLI Session manager plugin 1.2.54.0 - AWS SAM CLI 1.23.0 - Azure CLI (azure-cli) 2.23.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.18.0 -- GitHub CLI 1.9.2 -- Google Cloud SDK 340.0.0 (apt source repository: https://packages.cloud.google.com/apt) +- GitHub CLI 1.10.3 +- Google Cloud SDK 341.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 3.29.15 -- OpenShift CLI 4.7.9 +- Netlify CLI 3.30.4 +- OpenShift CLI 4.7.11 - ORAS CLI 0.11.1 - Vercel CLI 22.0.1 @@ -114,7 +113,7 @@ | Tool | Version | | -------- | ----------------------------------------------- | | PHP | 5.6.40 7.0.33 7.1.33 7.2.34 7.3.28 7.4.18 8.0.5 | -| Composer | 2.0.13 | +| Composer | 2.0.14 | | PHPUnit | 8.5.15 | ### Haskell @@ -127,7 +126,7 @@ - Cargo 1.52.0 - Rust 1.52.1 - Rustdoc 1.52.1 -- Rustup 1.24.1 +- Rustup 1.24.2 #### Packages - Bindgen 0.58.1 @@ -180,7 +179,7 @@ - 14.17.0 #### PyPy -- 2.7.18 [PyPy 7.3.4] +- 2.7.18 [PyPy 7.3.5] - 3.6.12 [PyPy 7.3.3] #### Python @@ -229,7 +228,7 @@ | Android Command Line Tools | 4.0 | | Android SDK Build-tools | 30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3
26.0.0 26.0.1 26.0.2 26.0.3
25.0.0 25.0.1 25.0.2 25.0.3
24.0.0 24.0.1 24.0.2 24.0.3
23.0.1 23.0.2 23.0.3 | | Android SDK Platform-Tools | 31.0.2 | -| Android SDK Platforms | android-S (rev 3)
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 SDK Platforms | android-S (rev 4)
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 SDK Tools | 26.1.1 | | Android Support Repository | 47.0.0 | | CMake | 3.10.2
3.18.1 | @@ -263,8 +262,8 @@ | node:12-alpine | sha256:9923c9efb13cf7535f67e49b03010f0977a800068e4c8e0e2c93433a6bfa1e77 | 2021-04-14 | | node:14 | sha256:9025a77b2f37fcda3bbd367587367a9f2251d16a756ed544550b8a571e16a653 | 2021-05-13 | | node:14-alpine | sha256:3689ad4435a413342ccc352170ad0f77433b41173af7fe4c0076f0c9792642cb | 2021-05-13 | -| ubuntu:16.04 | sha256:eed7e1076bbc1f342c4474c718e5438af4784f59a4e88ad687dbb98483b59ee4 | 2021-04-23 | -| ubuntu:18.04 | sha256:538529c9d229fb55f50e6746b119e899775205d62c0fc1b7e679b30d02ecb6e8 | 2021-04-23 | +| ubuntu:16.04 | sha256:98afb2808ee1ec6aa4d7c8f8b82c6347b9ae156932f7186182b997f3d5616ebe | 2021-05-19 | +| ubuntu:18.04 | sha256:04919776d30640ce4ed24442d5f7c1a8e4bd0e4793ed9469843cedaecb0d72fb | 2021-05-19 | | ubuntu:20.04 | sha256:cf31af331f38d1d7158470e095b132acd126a7180a54f263d386da88eb681d93 | 2021-04-23 | ### Installed apt packages From 4341738721c9b7ee1c061f59e086b2e40321aace Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 27 May 2021 09:14:48 +0000 Subject: [PATCH 0274/3485] Updating readme file for ubuntu18 version 20210524.1 (#3442) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/linux/Ubuntu1804-README.md | 55 +++++++++++++++---------------- 1 file changed, 27 insertions(+), 28 deletions(-) diff --git a/images/linux/Ubuntu1804-README.md b/images/linux/Ubuntu1804-README.md index e97c3322f2eb..f477e7ebfacc 100644 --- a/images/linux/Ubuntu1804-README.md +++ b/images/linux/Ubuntu1804-README.md @@ -2,22 +2,21 @@ |-| | [[Ubuntu] .NET SDK pre-installation policy will be changed on June 14](https://github.com/actions/virtual-environments/issues/3338) | | [Ubuntu 16.04 environment will be removed on September 20, 2021](https://github.com/actions/virtual-environments/issues/3287) | -| [[ubuntu] Clang 9 will be removed on May, 17th and default will be set to Clang 11](https://github.com/actions/virtual-environments/issues/3235) | *** # Ubuntu 18.04.5 LTS - Linux kernel version: 5.4.0-1047-azure -- Image Version: 20210517.1 +- Image Version: 20210524.1 ## Installed Software ### Language and Runtime - Bash 4.4.20(1)-release - Clang 9.0.0 - Clang-format 9.0.0 -- Erlang 24.0 (Eshell 12.0) +- Erlang 24.0.1 (Eshell 12.0.1) - GNU C++ 7.5.0, 9.3.0, 10.3.0, 11.1.0 - GNU Fortran 7.5.0, 9.3.0, 10.3.0, 11.1.0 - Julia 1.6.1 -- Mono 6.12.0.122 +- Mono 6.12.0.122 (apt source repository: https://download.mono-project.com/repo/ubuntu stable-bionic main) - MSBuild 16.6.0.15201 (from /usr/lib/mono/msbuild/15.0/bin/MSBuild.dll) - Node 14.17.0 - Perl 5.26.1 @@ -29,14 +28,14 @@ ### Package Management - cpan 1.64 - Helm 3.5.4 -- Homebrew 3.1.7 +- Homebrew 3.1.9 - Miniconda 4.9.2 - Npm 6.14.13 - Pip 9.0.1 - Pip3 9.0.1 - Pipx 0.16.2.1 - RubyGems 2.7.6 -- Vcpkg (build from master \) +- Vcpkg (build from master \) - Yarn 1.22.10 #### Environment variables @@ -55,11 +54,11 @@ - Ansible 2.10.9 - apt-fast 1.9.11 - AzCopy 10.10.0 (available by `azcopy` and `azcopy10` aliases) -- Bazel 4.0.0 -- Bazelisk 1.8.1 +- Bazel 4.1.0 +- Bazelisk 1.9.0 - Buildah 1.19.6 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - CMake 3.20.2 -- CodeQL Action Bundle 2.5.4 +- CodeQL Action Bundle 2.5.5 - Docker Compose 1.29.2 - Docker-Buildx 0.5.1 - Docker-Moby Client 20.10.6+azure @@ -68,12 +67,12 @@ - Git LFS 2.13.3 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.3.1 - Haveged 1.9.1 -- Heroku 7.53.1 -- HHVM (HipHop VM) 4.109.0 +- Heroku 7.54.0 +- HHVM (HipHop VM) 4.110.0 - jq 1.5 -- Kind 0.10.0 +- Kind 0.11.0 - Kubectl 1.20.1-5-g76a04fc -- Kustomize 4.1.2 +- Kustomize 4.1.3 - Leiningen 2.9.6 - MediaInfo 17.12 - Mercurial 4.5.3 @@ -84,27 +83,27 @@ - Packer 1.7.2 - PhantomJS 2.1.1 - Podman 3.0.1 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- Pulumi 3.2.1 -- R 4.0.5 +- Pulumi 3.3.0 +- R 4.1.0 - Skopeo 1.2.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 - SVN 1.9.7 -- Terraform 0.15.3 +- Terraform 0.15.4 - yamllint 1.26.1 -- zstd 1.4.9 (homebrew) +- zstd 1.5.0 (homebrew) ### CLI Tools - Alibaba Cloud CLI 3.0.74 -- AWS CLI 1.19.73 +- AWS CLI 1.19.78 - AWS CLI Session manager plugin 1.2.54.0 - AWS SAM CLI 1.23.0 - Azure CLI (azure-cli) 2.23.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.18.0 -- GitHub CLI 1.9.2 -- Google Cloud SDK 340.0.0 (apt source repository: https://packages.cloud.google.com/apt) +- GitHub CLI 1.10.3 +- Google Cloud SDK 341.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 3.29.15 -- OpenShift CLI 4.7.9 +- Netlify CLI 3.30.4 +- OpenShift CLI 4.7.11 - ORAS CLI 0.11.1 - Vercel CLI 22.0.1 @@ -119,7 +118,7 @@ | Tool | Version | | -------- | --------------------------------- | | PHP | 7.1.33 7.2.34 7.3.28 7.4.18 8.0.5 | -| Composer | 2.0.13 | +| Composer | 2.0.14 | | PHPUnit | 8.5.15 | ### Haskell @@ -132,7 +131,7 @@ - Cargo 1.52.0 - Rust 1.52.1 - Rustdoc 1.52.1 -- Rustup 1.24.1 +- Rustup 1.24.2 #### Packages - Bindgen 0.58.1 @@ -185,7 +184,7 @@ - 14.17.0 #### PyPy -- 2.7.18 [PyPy 7.3.4] +- 2.7.18 [PyPy 7.3.5] - 3.6.12 [PyPy 7.3.3] #### Python @@ -234,7 +233,7 @@ | Android Command Line Tools | 4.0 | | Android SDK Build-tools | 30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3
26.0.0 26.0.1 26.0.2 26.0.3
25.0.0 25.0.1 25.0.2 25.0.3
24.0.0 24.0.1 24.0.2 24.0.3
23.0.1 23.0.2 23.0.3 | | Android SDK Platform-Tools | 31.0.2 | -| Android SDK Platforms | android-S (rev 3)
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 SDK Platforms | android-S (rev 4)
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 SDK Tools | 26.1.1 | | Android Support Repository | 47.0.0 | | CMake | 3.10.2
3.18.1 | @@ -268,8 +267,8 @@ | node:12-alpine | sha256:9923c9efb13cf7535f67e49b03010f0977a800068e4c8e0e2c93433a6bfa1e77 | 2021-04-14 | | node:14 | sha256:9025a77b2f37fcda3bbd367587367a9f2251d16a756ed544550b8a571e16a653 | 2021-05-13 | | node:14-alpine | sha256:3689ad4435a413342ccc352170ad0f77433b41173af7fe4c0076f0c9792642cb | 2021-05-13 | -| ubuntu:16.04 | sha256:eed7e1076bbc1f342c4474c718e5438af4784f59a4e88ad687dbb98483b59ee4 | 2021-04-23 | -| ubuntu:18.04 | sha256:538529c9d229fb55f50e6746b119e899775205d62c0fc1b7e679b30d02ecb6e8 | 2021-04-23 | +| ubuntu:16.04 | sha256:98afb2808ee1ec6aa4d7c8f8b82c6347b9ae156932f7186182b997f3d5616ebe | 2021-05-19 | +| ubuntu:18.04 | sha256:04919776d30640ce4ed24442d5f7c1a8e4bd0e4793ed9469843cedaecb0d72fb | 2021-05-19 | | ubuntu:20.04 | sha256:cf31af331f38d1d7158470e095b132acd126a7180a54f263d386da88eb681d93 | 2021-04-23 | ### Installed apt packages From 22053ef0b102c36a4627bd31372d65134839cafa Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Thu, 27 May 2021 15:38:21 +0300 Subject: [PATCH 0275/3485] Add install Az module section (#3466) * Add install Az module section * add Az module name --- docs/create-image-and-azure-resources.md | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/docs/create-image-and-azure-resources.md b/docs/create-image-and-azure-resources.md index 36feb2a4753a..c2390a608de8 100644 --- a/docs/create-image-and-azure-resources.md +++ b/docs/create-image-and-azure-resources.md @@ -11,8 +11,8 @@ After successful image generation, a snapshot of the temporary VM will be conver - `OS` - Windows/Linux - `packer` - Can be downloaded from https://www.packer.io/downloads - `PowerShell 5.0 or higher` or `PSCore` for linux distributes. -- `Azure CLI ` - https://docs.microsoft.com/en-us/cli/azure/install-azure-cli?view=azure-cli-latest -- `Azure Powershell module` - https://docs.microsoft.com/en-us/powershell/azure/install-az-ps?view=azps-4.6.1 +- `Azure CLI ` - https://docs.microsoft.com/en-us/cli/azure/install-azure-cli +- `Azure Az Powershell module` - https://docs.microsoft.com/en-us/powershell/azure/install-az-ps - `Git for Windows` - https://gitforwindows.org/ ### Azure DevOps self-hosted pool requirements @@ -33,6 +33,11 @@ Download `packer` from https://www.packer.io/downloads, or install it via Chocol choco install packer ``` +Install the Azure Az PowerShell module - https://docs.microsoft.com/en-us/powershell/azure/install-az-ps. +``` +Install-Module -Name Az -Repository PSGallery -Force +``` + Install Azure CLI - https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-windows?view=azure-cli-latest&tabs=azure-cli. ``` Invoke-WebRequest -Uri https://aka.ms/installazurecliwindows -OutFile .\AzureCLI.msi; Start-Process msiexec.exe -Wait -ArgumentList '/I AzureCLI.msi /quiet'; rm .\AzureCLI.msi From 77daa9bf8ea3b3d48ec5e49cec8220dd09812213 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 27 May 2021 13:41:49 +0000 Subject: [PATCH 0276/3485] Updating readme file for macOS-10.15 version 20210525.2 (#3450) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/macos/macos-10.15-Readme.md | 48 +++++++++++++++--------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/images/macos/macos-10.15-Readme.md b/images/macos/macos-10.15-Readme.md index b0235b3aa8b0..5d0110b60515 100644 --- a/images/macos/macos-10.15-Readme.md +++ b/images/macos/macos-10.15-Readme.md @@ -4,9 +4,9 @@ | [macOS 11.0 pools will be transited to private preview.](https://github.com/actions/virtual-environments/issues/2486) | *** # macOS 10.15 info -- System Version: macOS 10.15.7 (19H1030) +- System Version: macOS 10.15.7 (19H1217) - Kernel Version: Darwin 19.6.0 -- Image Version: 20210516.1 +- Image Version: 20210525.2 ## Installed Software ### Language and Runtime @@ -14,11 +14,11 @@ - Bash 3.2.57(1)-release - Clang/LLVM 12.0.0 is available on `'$(brew --prefix llvm)/bin/clang'` - Clang/LLVM 12.0.0 is default -- gcc-8 (Homebrew GCC 8.4.0_3) 8.4.0 - available by `gcc-8` alias +- gcc-8 (Homebrew GCC 8.5.0) 8.5.0 - available by `gcc-8` alias - gcc-9 (Homebrew GCC 9.3.0_2) 9.3.0 - available by `gcc-9` alias - gcc-10 (Homebrew GCC 10.3.0) 10.3.0 - available by `gcc-10` alias - gcc-11 (Homebrew GCC 11.1.0) 11.1.0 - available by `gcc-11` alias -- GNU Fortran (Homebrew GCC 8.4.0_3) 8.4.0 - available by `gfortran-8` alias +- GNU Fortran (Homebrew GCC 8.5.0) 8.5.0 - available by `gfortran-8` alias - GNU Fortran (Homebrew GCC 9.3.0_2) 9.3.0 - available by `gfortran-9` alias - GNU Fortran (Homebrew GCC 10.3.0) 10.3.0 - available by `gfortran-10` alias - GNU Fortran (Homebrew GCC 11.1.0) 11.1.0 - available by `gfortran-11` alias @@ -28,19 +28,19 @@ - Node.js v14.17.0 - NVM 0.38.0 - NVM - Cached node versions: v10.24.1 v12.22.1 v14.17.0 -- Perl 5.32.1 +- Perl 5.34.0 - PHP 8.0.6 - Python 2.7.18 - Python 3.9.5 -- R 4.0.5 +- R 4.1.0 - Ruby 2.7.3p183 ### Package Management - Bundler version 2.2.17 - Carthage 0.38.0 - CocoaPods 1.10.1 -- Composer 2.0.13 -- Homebrew 3.1.7 +- Composer 2.0.14 +- Homebrew 3.1.9 - Miniconda 4.9.2 - NPM 6.14.13 - NuGet 5.6.0.6489 @@ -48,7 +48,7 @@ - Pip 21.1.1 (python 3.9) - Pipx 0.16.2.1 - RubyGems 3.2.17 -- Vcpkg 2021 (build from master \) +- Vcpkg 2021 (build from master \<7c55eca>) - Yarn 1.22.5 #### Environment variables @@ -66,13 +66,13 @@ - 7-Zip 17.04 - aria2 1.35.0 - azcopy 10.10.0 -- bazel 4.0.0 -- bazelisk 1.8.1 +- bazel 4.1.0 +- bazelisk 1.9.0 - bsdtar 3.3.2 - available by 'tar' alias - Curl 7.76.1 - Git LFS: 2.13.3 - Git: 2.31.1 -- GitHub CLI: 1.9.2 +- GitHub CLI: 1.10.3 - GNU parallel 20210422 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.1 @@ -90,7 +90,7 @@ - Subversion (SVN) 1.14.1 - Vagrant 2.2.16 - virtualbox 6.1.22r144080 -- zstd 1.4.9 +- zstd 1.5.0 ### Tools @@ -102,11 +102,11 @@ - Azure CLI 2.23.0 - Cabal 3.4.0.0 - Cmake 3.20.2 -- Fastlane 2.183.0 +- Fastlane 2.183.2 - GHC 9.0.1 - GHCup v0.1.14.1 - Stack 2.7.1 -- SwiftFormat 0.48.2 +- SwiftFormat 0.48.3 - Xcode Command Line Tools 12.4.0.0.1.1610135815 ### Linters @@ -114,12 +114,12 @@ - yamllint 1.26.1 ### Browsers -- Safari 14.1 (15611.1.21.161.7) -- SafariDriver 14.1 (15611.1.21.161.7) +- Safari 14.1.1 (15611.2.7.1.6) +- SafariDriver 14.1.1 (15611.2.7.1.6) - Google Chrome 90.0.4430.212 - ChromeDriver 90.0.4430.24 -- Microsoft Edge 90.0.818.62 -- MSEdgeDriver 90.0.818.62 +- Microsoft Edge 90.0.818.66 +- MSEdgeDriver 90.0.818.66 - Mozilla Firefox 88.0.1 - geckodriver 0.29.1 @@ -156,9 +156,9 @@ - 3.9.5 #### PyPy -- 2.7.18 [PyPy 7.3.4] +- 2.7.18 [PyPy 7.3.5] - 3.6.12 [PyPy 7.3.3] -- 3.7.10 [PyPy 7.3.4] +- 3.7.10 [PyPy 7.3.5] #### Node.js - 10.24.1 @@ -175,7 +175,7 @@ - Cargo 1.52.0 - Rust 1.52.1 - Rustdoc 1.52.1 -- Rustup 1.24.1 +- Rustup 1.24.2 #### Packages - Bindgen 0.58.1 @@ -204,7 +204,7 @@ ### Xamarin #### Visual Studio for Mac -- 8.9.9.3 +- 8.9.10.4 #### Xamarin bundles | symlink | Xamarin.Mono | Xamarin.iOS | Xamarin.Mac | Xamarin.Android | @@ -345,7 +345,7 @@ | Android Command Line Tools | 4.0 | | Android Emulator | 30.6.5 | | Android SDK Build-tools | 30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3
26.0.0 26.0.1 26.0.2 26.0.3
25.0.0 25.0.1 25.0.2 25.0.3
24.0.0 24.0.1 24.0.2 24.0.3 | -| Android SDK Platforms | android-S (rev 3)
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 Platforms | android-S (rev 4)
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 Platform-Tools | 31.0.2 | | Android SDK Tools | 26.1.1 | | Android Support Repository | 47.0.0 | From 6d4c863d14c2d56cf6d49330b71e1d95379e22bf Mon Sep 17 00:00:00 2001 From: Jesse Chan Date: Fri, 28 May 2021 08:22:18 +0100 Subject: [PATCH 0277/3485] Revert "[ubuntu] Add GCC 11 (#3291)" (#3436) This reverts commit 3ebf601284cae6a4406b7ea1ad08cd593a4d619b. Bug: #3376 --- images/linux/toolsets/toolset-1804.json | 6 ++---- images/linux/toolsets/toolset-2004.json | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index 9c62b5f49a78..b78e3ce3103e 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -249,15 +249,13 @@ "gcc": { "versions": [ "g++-9", - "g++-10", - "g++-11" + "g++-10" ] }, "gfortran": { "versions": [ "gfortran-9", - "gfortran-10", - "gfortran-11" + "gfortran-10" ] }, "php": { diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index 323b2068e9b7..6bd1616cc4a4 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -251,15 +251,13 @@ "gcc": { "versions": [ "g++-9", - "g++-10", - "g++-11" + "g++-10" ] }, "gfortran": { "versions": [ "gfortran-9", - "gfortran-10", - "gfortran-11" + "gfortran-10" ] }, "php": { From fe157d6cb768830845c82b8e7326946bb5cea6a7 Mon Sep 17 00:00:00 2001 From: Alena Sviridenko Date: Fri, 28 May 2021 10:45:39 +0300 Subject: [PATCH 0278/3485] [macOS] Add select-xamarin-sdk-v2.sh synopsis (#3473) --- images/macos/provision/assets/select-xamarin-sdk-v2.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/images/macos/provision/assets/select-xamarin-sdk-v2.sh b/images/macos/provision/assets/select-xamarin-sdk-v2.sh index 5dd63348d03c..0e6b08187b4c 100644 --- a/images/macos/provision/assets/select-xamarin-sdk-v2.sh +++ b/images/macos/provision/assets/select-xamarin-sdk-v2.sh @@ -1,4 +1,11 @@ #!/bin/bash -e -o pipefail + +# Select any Xamarin SDK versions as the default ones independently by specifying only those versions that need to be changed. +# Examples: +# 1. Change all versions: $VM_ASSETS/select-xamarin-sdkv-v2.sh --mono=6.12 --ios=14.8 --android=10.2 --mac=7.8 +# 2. Change default Mono and iOS only: $VM_ASSETS/select-xamarin-sdkv-v2.sh --mono=6.12 --ios=14.8 +# 3. Change default Android only: $VM_ASSETS/select-xamarin-sdkv-v2.sh --android=11.1 + get_framework_path() { case $1 in --mono) echo '/Library/Frameworks/Mono.framework/Versions' ;; From 9aa17b4e3158a51080223c3dda7e2474390b211f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 28 May 2021 08:04:19 +0000 Subject: [PATCH 0279/3485] Updating readme file for ubuntu20 version 20210524.1 (#3441) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/linux/Ubuntu2004-README.md | 59 +++++++++++++++---------------- 1 file changed, 29 insertions(+), 30 deletions(-) diff --git a/images/linux/Ubuntu2004-README.md b/images/linux/Ubuntu2004-README.md index cc13fb305dbf..12e3fd0f6871 100644 --- a/images/linux/Ubuntu2004-README.md +++ b/images/linux/Ubuntu2004-README.md @@ -2,22 +2,21 @@ |-| | [[Ubuntu] .NET SDK pre-installation policy will be changed on June 14](https://github.com/actions/virtual-environments/issues/3338) | | [Ubuntu 16.04 environment will be removed on September 20, 2021](https://github.com/actions/virtual-environments/issues/3287) | -| [[ubuntu] Clang 9 will be removed on May, 17th and default will be set to Clang 11](https://github.com/actions/virtual-environments/issues/3235) | *** # Ubuntu 20.04.2 LTS - Linux kernel version: 5.4.0-1047-azure -- Image Version: 20210517.1 +- Image Version: 20210524.1 ## Installed Software ### Language and Runtime - Bash 5.0.17(1)-release - Clang 10.0.0, 11.0.0, 12.0.1 - Clang-format 10.0.0, 11.0.0, 12.0.1 -- Erlang 24.0 (Eshell 12.0) +- Erlang 24.0.1 (Eshell 12.0.1) - GNU C++ 9.3.0, 10.2.0, 11.1.0 - GNU Fortran 9.3.0, 10.2.0, 11.1.0 - Julia 1.6.1 -- Mono 6.12.0.122 +- Mono 6.12.0.122 (apt source repository: https://download.mono-project.com/repo/ubuntu stable-focal main) - MSBuild 16.6.0.15201 (from /usr/lib/mono/msbuild/15.0/bin/MSBuild.dll) - Node 14.17.0 - Perl 5.30.0 @@ -29,14 +28,14 @@ ### Package Management - cpan 1.64 - Helm 3.5.4 -- Homebrew 3.1.7 +- Homebrew 3.1.9 - Miniconda 4.9.2 - Npm 6.14.13 - Pip 20.0.2 - Pip3 20.0.2 - Pipx 0.16.2.1 - RubyGems 3.1.2 -- Vcpkg (build from master \) +- Vcpkg (build from master \) - Yarn 1.22.10 #### Environment variables @@ -56,26 +55,26 @@ - Ansible 2.10.9 - apt-fast 1.9.11 - AzCopy 10.10.0 (available by `azcopy` and `azcopy10` aliases) -- Bazel 4.0.0 -- Bazelisk 1.8.1 -- Buildah 1.20.1 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) +- Bazel 4.1.0 +- Bazelisk 1.9.0 +- Buildah 1.21.0 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - CMake 3.20.2 -- CodeQL Action Bundle 2.5.4 +- CodeQL Action Bundle 2.5.5 - Docker Compose 1.29.2 - Docker-Buildx 0.5.1 - Docker-Moby Client 20.10.6+azure - Docker-Moby Server 20.10.6+azure -- Fastlane 2.183.0 +- Fastlane 2.184.0 - Git 2.31.1 (apt source repository: ppa:git-core/ppa) - Git LFS 2.13.3 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.6.0 - Haveged 1.9.1 -- Heroku 7.53.1 -- HHVM (HipHop VM) 4.109.0 +- Heroku 7.54.0 +- HHVM (HipHop VM) 4.110.0 - jq 1.6 -- Kind 0.10.0 +- Kind 0.11.0 - Kubectl 1.20.1-5-g76a04fc -- Kustomize 4.1.2 +- Kustomize 4.1.3 - Leiningen 2.9.6 - MediaInfo 19.09 - Mercurial 5.3.1 @@ -86,14 +85,14 @@ - Packer 1.7.2 - PhantomJS 2.1.1 - Podman 3.1.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- Pulumi 3.2.1 -- R 4.0.5 +- Pulumi 3.3.0 +- R 4.1.0 - Skopeo 1.2.3 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 -- Terraform 0.15.3 +- Terraform 0.15.4 - yamllint 1.26.1 -- zstd 1.4.9 (homebrew) +- zstd 1.5.0 (homebrew) ### CLI Tools - Alibaba Cloud CLI 3.0.74 @@ -102,11 +101,11 @@ - AWS SAM CLI 1.23.0 - Azure CLI (azure-cli) 2.23.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.18.0 -- GitHub CLI 1.9.2 -- Google Cloud SDK 340.0.0 (apt source repository: https://packages.cloud.google.com/apt) +- GitHub CLI 1.10.3 +- Google Cloud SDK 341.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 3.29.15 -- OpenShift CLI 4.7.9 +- Netlify CLI 3.30.4 +- OpenShift CLI 4.7.11 - ORAS CLI 0.11.1 - Vercel CLI 22.0.1 @@ -125,7 +124,7 @@ | Tool | Version | | -------- | ------------ | | PHP | 7.4.18 8.0.5 | -| Composer | 2.0.13 | +| Composer | 2.0.14 | | PHPUnit | 8.5.15 | ### Haskell @@ -138,7 +137,7 @@ - Cargo 1.52.0 - Rust 1.52.1 - Rustdoc 1.52.1 -- Rustup 1.24.1 +- Rustup 1.24.2 #### Packages - Bindgen 0.58.1 @@ -191,9 +190,9 @@ - 14.17.0 #### PyPy -- 2.7.18 [PyPy 7.3.4] +- 2.7.18 [PyPy 7.3.5] - 3.6.12 [PyPy 7.3.3] -- 3.7.10 [PyPy 7.3.4] +- 3.7.10 [PyPy 7.3.5] #### Python - 2.7.18 @@ -242,7 +241,7 @@ | Android Command Line Tools | 4.0 | | Android SDK Build-tools | 30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3 | | Android SDK Platform-Tools | 31.0.2 | -| Android SDK Platforms | android-S (rev 3)
android-30 (rev 3)
android-29 (rev 5)
android-28 (rev 6)
android-27 (rev 3) | +| Android SDK Platforms | android-S (rev 4)
android-30 (rev 3)
android-29 (rev 5)
android-28 (rev 6)
android-27 (rev 3) | | Android SDK Tools | 26.1.1 | | Android Support Repository | 47.0.0 | | CMake | 3.10.2
3.18.1 | @@ -276,8 +275,8 @@ | node:12-alpine | sha256:9923c9efb13cf7535f67e49b03010f0977a800068e4c8e0e2c93433a6bfa1e77 | 2021-04-14 | | node:14 | sha256:9025a77b2f37fcda3bbd367587367a9f2251d16a756ed544550b8a571e16a653 | 2021-05-13 | | node:14-alpine | sha256:3689ad4435a413342ccc352170ad0f77433b41173af7fe4c0076f0c9792642cb | 2021-05-13 | -| ubuntu:16.04 | sha256:eed7e1076bbc1f342c4474c718e5438af4784f59a4e88ad687dbb98483b59ee4 | 2021-04-23 | -| ubuntu:18.04 | sha256:538529c9d229fb55f50e6746b119e899775205d62c0fc1b7e679b30d02ecb6e8 | 2021-04-23 | +| ubuntu:16.04 | sha256:98afb2808ee1ec6aa4d7c8f8b82c6347b9ae156932f7186182b997f3d5616ebe | 2021-05-19 | +| ubuntu:18.04 | sha256:04919776d30640ce4ed24442d5f7c1a8e4bd0e4793ed9469843cedaecb0d72fb | 2021-05-19 | | ubuntu:20.04 | sha256:cf31af331f38d1d7158470e095b132acd126a7180a54f263d386da88eb681d93 | 2021-04-23 | ### Installed apt packages From cfbaf5ff4d793acc1e440bdd1caba0e7b7e3ae17 Mon Sep 17 00:00:00 2001 From: Alena Sviridenko Date: Fri, 28 May 2021 18:19:34 +0300 Subject: [PATCH 0280/3485] [macOS] removed GCC 8 (#3476) --- images/macos/toolsets/toolset-10.14.json | 1 - images/macos/toolsets/toolset-10.15.json | 1 - images/macos/toolsets/toolset-11.json | 1 - 3 files changed, 3 deletions(-) diff --git a/images/macos/toolsets/toolset-10.14.json b/images/macos/toolsets/toolset-10.14.json index a2d5868b387d..ebbe6620c535 100644 --- a/images/macos/toolsets/toolset-10.14.json +++ b/images/macos/toolsets/toolset-10.14.json @@ -265,7 +265,6 @@ }, "gcc": { "versions": [ - "8", "9", "10", "11" diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index 128cb3cbf2f2..a8fe5e997874 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -217,7 +217,6 @@ }, "gcc": { "versions": [ - "8", "9", "10", "11" diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index 7e0eca72a1fb..443244d3a699 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -152,7 +152,6 @@ }, "gcc": { "versions": [ - "8", "9", "10", "11" From 5898c5ebd44b8a8e50795998685bd14e40d6369e Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Sun, 30 May 2021 00:39:27 +0300 Subject: [PATCH 0281/3485] Change RubyGems installation to use toolset (#3474) --- images/macos/helpers/Tests.Helpers.psm1 | 32 ++++++++++++++++++ images/macos/provision/core/rubygem.sh | 33 ++++--------------- .../software-report/SoftwareReport.Xcode.psm1 | 13 +++++--- images/macos/tests/RubyGem.Tests.ps1 | 27 ++++++++------- images/macos/toolsets/toolset-10.14.json | 10 +++++- images/macos/toolsets/toolset-10.15.json | 10 +++++- images/macos/toolsets/toolset-11.json | 10 +++++- 7 files changed, 89 insertions(+), 46 deletions(-) diff --git a/images/macos/helpers/Tests.Helpers.psm1 b/images/macos/helpers/Tests.Helpers.psm1 index 4f585b055c2e..4eaeec3ceb66 100644 --- a/images/macos/helpers/Tests.Helpers.psm1 +++ b/images/macos/helpers/Tests.Helpers.psm1 @@ -78,8 +78,40 @@ function ShouldReturnZeroExitCode { } } +function ShouldMatchCommandOutput { + Param( + [String] $ActualValue, + [String] $RegularExpression, + [switch] $Negate + ) + + $output = (Get-CommandResult $ActualValue).Output | Out-String + [bool] $succeeded = $output -cmatch $RegularExpression + + if ($Negate) { + $succeeded = -not $succeeded + } + + $failureMessage = '' + + if (-not $succeeded) { + if ($Negate) { + $failureMessage = "Expected regular expression '$RegularExpression' for '$ActualValue' command to not match '$output', but it did match." + } + else { + $failureMessage = "Expected regular expression '$RegularExpression' for '$ActualValue' command to match '$output', but it did not match." + } + } + + return [PSCustomObject] @{ + Succeeded = $succeeded + FailureMessage = $failureMessage + } +} + If (Get-Command -Name Add-ShouldOperator -ErrorAction SilentlyContinue) { Add-ShouldOperator -Name ReturnZeroExitCode -InternalName ShouldReturnZeroExitCode -Test ${function:ShouldReturnZeroExitCode} + Add-ShouldOperator -Name MatchCommandOutput -InternalName ShouldMatchCommandOutput -Test ${function:ShouldMatchCommandOutput} } function Invoke-PesterTests { diff --git a/images/macos/provision/core/rubygem.sh b/images/macos/provision/core/rubygem.sh index 82211e38a39f..ce5dea4546e0 100755 --- a/images/macos/provision/core/rubygem.sh +++ b/images/macos/provision/core/rubygem.sh @@ -4,33 +4,12 @@ source ~/utils/utils.sh echo Updating RubyGems... gem update --system -echo Installing xcode-install utility... -gem install xcode-install --force - -echo Installing CocoaPods... -gem install cocoapods - -if is_Less_BigSur; then - # fix nomad-cli installation - if is_HighSierra; then - brew_smart_install "libxml2" - gem install nokogiri -v 1.6.8.1 -- --use-system-libraries --with-xml2-include=$(brew --prefix libxml2)/include/libxml2 - fi - - echo Installing nomad-cli... - gem install nomad-cli +gemsToInstall=$(get_toolset_value ".rubygems[]") +if [ -n "$gemsToInstall" ]; then + for gem in $gemsToInstall; do + echo "Installing gem $gem" + gem install $gem + done fi -echo Installing xcpretty... -gem install xcpretty - -echo Installing bundler... -gem install bundler --force - -# AppStoreRelease Azure DevOps has issues with Fastlane 2.184.0. Temporary hardcoding the version until the issue is fixed -# https://github.com/microsoft/app-store-vsts-extension/issues/244 -echo Installing fastlane tools... -gem uninstall fastlane -aI -gem install fastlane -v 2.183.2 - invoke_tests "RubyGem" diff --git a/images/macos/software-report/SoftwareReport.Xcode.psm1 b/images/macos/software-report/SoftwareReport.Xcode.psm1 index 070d5ac957ed..b679d0ed0171 100644 --- a/images/macos/software-report/SoftwareReport.Xcode.psm1 +++ b/images/macos/software-report/SoftwareReport.Xcode.psm1 @@ -234,13 +234,18 @@ function Build-XcodeSupportToolsSection { "xcversion $xcversion" ) + $nomadOutput = Run-Command "gem list nomad-cli" + $nomadCLI = [regex]::matches($nomadOutput, "(\d+.){2}\d+").Value + $nomadShenzhenOutput = Run-Command "ipa -version" + $nomadShenzhen = [regex]::matches($nomadShenzhenOutput, "(\d+.){2}\d+").Value + $toolList += @( + "Nomad CLI $nomadCLI", + "Nomad shenzhen CLI $nomadShenzhen" + ) + if ($os.IsLessThanBigSur) { - $nomadCLI = Run-Command "gem -v nomad-cli" - $nomadIPA = Run-Command "ipa -version" $xctool = Run-Command "xctool --version" $toolList += @( - "Nomad CLI $nomadCLI", - "Nomad CLI IPA $nomadIPA", "xctool $xctool" ) } diff --git a/images/macos/tests/RubyGem.Tests.ps1 b/images/macos/tests/RubyGem.Tests.ps1 index 7cb5531bbedb..a875ec8c7513 100644 --- a/images/macos/tests/RubyGem.Tests.ps1 +++ b/images/macos/tests/RubyGem.Tests.ps1 @@ -1,4 +1,15 @@ -$os = Get-OSVersion +Describe "RubyGems" { + $gemTestCases = Get-ToolsetValue -KeyPath "rubygems" | ForEach-Object { + @{gemName = $_} + } + + if ($gemTestCases) + { + It "Gem is installed" -TestCases $gemTestCases { + "gem list -i '^$gemName$'" | Should -MatchCommandOutput "true" + } + } +} Describe "Bundler" { It "Bundler" { @@ -6,17 +17,9 @@ Describe "Bundler" { } } -Describe "Nomad" -Skip:($os.IsBigSur) { - Context "Nomad" { - It "Nomad CLI" { - $result = Get-CommandResult "gem list" - $result.Output | Should -BeLike "*nomad-cli*" - } - } - Context "Nomad CLI" { - It "Nomad CLI IPA" { - "ipa --version" | Should -ReturnZeroExitCode - } +Describe "Nomad shenzhen CLI" { + It "Nomad shenzhen CLI" { + "ipa --version" | Should -ReturnZeroExitCode } } diff --git a/images/macos/toolsets/toolset-10.14.json b/images/macos/toolsets/toolset-10.14.json index ebbe6620c535..8e8bf62a6020 100644 --- a/images/macos/toolsets/toolset-10.14.json +++ b/images/macos/toolsets/toolset-10.14.json @@ -339,5 +339,13 @@ "versions": [ "2.1" ] - } + }, + "rubygems": [ + "xcode-install", + "cocoapods", + "nomad-cli", + "xcpretty", + "bundler", + "fastlane" + ] } diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index a8fe5e997874..90860679ac4b 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -294,5 +294,13 @@ "3.1", "5.0" ] - } + }, + "rubygems": [ + "xcode-install", + "cocoapods", + "nomad-cli", + "xcpretty", + "bundler", + "fastlane" + ] } diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index 443244d3a699..41698065ac61 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -214,5 +214,13 @@ "3.1", "5.0" ] - } + }, + "rubygems": [ + "xcode-install", + "cocoapods", + "nomad-cli", + "xcpretty", + "bundler", + "fastlane" + ] } \ No newline at end of file From 50d06a58af51bda0e88e6e10f7ae95932c6a0033 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 31 May 2021 13:02:19 +0000 Subject: [PATCH 0282/3485] Updating readme file for win19 version 20210525.0 (#3452) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/win/Windows2019-Readme.md | 530 +++++++++++++++---------------- 1 file changed, 264 insertions(+), 266 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index 5e9e56a819a1..59a0f8066f14 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -1,6 +1,6 @@ # Microsoft Windows Server 2019 Datacenter - OS Version: 10.0.17763 Build 1935 -- Image Version: 20210516.0 +- Image Version: 20210525.0 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -18,15 +18,15 @@ ### Package Management - Chocolatey 0.10.15 -- Composer 2.0.13 +- Composer 2.0.14 - Helm 3.5.4 - Miniconda 4.9.2 - NPM 6.14.13 - NuGet 5.9.1.11 -- pip 21.1.1 (python 3.7) +- pip 21.1.2 (python 3.7) - Pipx 0.16.2.1 - RubyGems 2.7.6.3 -- Vcpkg (build from master \) +- Vcpkg (build from master \<83f9a6c>) - Yarn 1.22.10 #### Environment variables @@ -44,20 +44,20 @@ ### Tools - 7zip 19.00 - azcopy 10.10.0 -- Bazel 4.0.0 -- Bazelisk 1.8.1 +- Bazel 4.1.0 +- Bazelisk 1.9.0 - Cabal 3.4.0.0 - CMake 3.20.2 -- CodeQL Action Bundle 2.5.4 +- CodeQL Action Bundle 2.5.5 - Docker 20.10.4 - Docker-compose 1.29.1 - ghc 9.0.1 - Git 2.31.1 - Git LFS 2.13.3 -- Google Cloud SDK 340.0.0 +- Google Cloud SDK 342.0.0 - InnoSetup 6.1.2 - jq 1.6 -- Kind 0.10.0 +- Kind 0.11.0 - Kubectl 1.21.1 - Mercurial 5.0 - Mingw-w64 8.1.0 @@ -65,8 +65,8 @@ - NSIS v3.06.1 - OpenSSL 1.1.1 - Packer 1.7.2 -- Pulumi v3.2.1 -- R 4.0.5 +- Pulumi v3.3.1 +- R 4.1.0 - Stack 2.7.1 - Subversion (SVN) 1.14.1 - VSWhere 2.8.4 @@ -75,22 +75,21 @@ - zstd 1.5.0 ### CLI Tools -- Alibaba Cloud CLI 3.0.74 +- Alibaba Cloud CLI 3.0.75 - AWS CLI 2.2.5 - AWS SAM CLI 1.23.0 - AWS Session Manager CLI 1.2.54.0 -- Azure CLI 2.23.0 -- Azure Dev Spaces CLI 1.0.20210421.4 +- Azure CLI 2.24.0 - Azure DevOps CLI extension 0.18.0 - Cloud Foundry CLI 6.53.0 -- GitHub CLI 1.9.2 +- GitHub CLI 1.10.3 - Hub CLI 2.14.2 ### Rust Tools - Cargo 1.52.0 - Rust 1.52.1 - Rustdoc 1.52.1 -- Rustup 1.24.1 +- Rustup 1.24.2 #### Packages - bindgen 0.58.1 @@ -101,10 +100,10 @@ - Rustfmt 1.4.36 ### Browsers and webdrivers -- Google Chrome 90.0.4430.212 -- Chrome Driver 90.0.4430.24 -- Microsoft Edge 90.0.818.62 -- Microsoft Edge Driver 90.0.818.62 +- Google Chrome 91.0.4472.77 +- Chrome Driver 91.0.4472.19 +- Microsoft Edge 90.0.818.66 +- Microsoft Edge Driver 90.0.818.66 - Mozilla Firefox 88.0.1 - Gecko Driver 0.29.1 - IE Driver 3.150.1.0 @@ -182,9 +181,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### PyPy | Python Version | PyPy Version | | -------------- | ------------ | -| 2.7.18 | PyPy 7.3.4 with MSC v.1927 64 bit (AMD64) | +| 2.7.18 | PyPy 7.3.5 with MSC v.1927 64 bit (AMD64) | | 3.6.12 | PyPy 7.3.3 with MSC v.1927 32 bit | -| 3.7.10 | PyPy 7.3.4 with MSC v.1927 64 bit (AMD64) | +| 3.7.10 | PyPy 7.3.5 with MSC v.1927 64 bit (AMD64) | @@ -217,247 +216,246 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Web Servers -| Name | Version | ConfigFile | ServiceName | ServiceStatus | ListenPort | -| ------ | ------- | -------------------------------------- | ----------- | ------------- | ---------- | -| Apache | 2.4.47 | C:\tools\Apache24\conf\httpd.conf | Apache | Stopped | 80 | -| Nginx | 1.19.10 | C:\tools\nginx-1.19.10\conf\nginx.conf | nginx | Stopped | 80 | +| Name | Version | ConfigFile | ServiceName | ServiceStatus | ListenPort | +| ------ | ------- | ------------------------------------- | ----------- | ------------- | ---------- | +| Apache | 2.4.47 | C:\tools\Apache24\conf\httpd.conf | Apache | Stopped | 80 | +| Nginx | 1.21.0 | C:\tools\nginx-1.21.0\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2019 -| Name | Version | Path | -| ----------------------------- | ------------- | -------------------------------------------------------------- | -| Visual Studio Enterprise 2019 | 16.9.31229.75 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | +| Name | Version | Path | +| ----------------------------- | --------------- | -------------------------------------------------------------- | +| Visual Studio Enterprise 2019 | 16.10.31321.278 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | #### Workloads, components and extensions: -| Package | Version | -| ------------------------------------------------------------------------- | -------------- | -| Component.Android.NDK.R16B | 16.9.31227.257 | -| Component.Android.SDK25.Private | 16.0.28625.61 | -| Component.Android.SDK30 | 16.9.31004.209 | -| Component.Ant | 1.9.3.8 | -| Component.Dotfuscator | 16.0.28528.71 | -| Component.Linux.CMake | 16.2.29003.222 | -| Component.MDD.Android | 16.0.28517.75 | -| Component.MDD.Linux | 16.5.29515.121 | -| Component.MDD.Linux.GCC.arm | 16.5.29515.121 | -| Component.Microsoft.VisualStudio.LiveShare | 1.0.3587 | -| Component.Microsoft.VisualStudio.RazorExtension | 16.9.31004.209 | -| Component.Microsoft.VisualStudio.Tools.Applications | 16.0.31110.1 | -| Component.Microsoft.VisualStudio.Web.AzureFunctions | 16.9.31004.209 | -| Component.Microsoft.Web.LibraryManager | 16.9.31004.209 | -| Component.Microsoft.WebTools.BrowserLink.WebLivePreview | 0.4.12.14637 | -| Component.Microsoft.Windows.DriverKit | 10.0.19030.0 | -| Component.OpenJDK | 16.1.28811.260 | -| Component.UnityEngine.x64 | 16.9.31004.209 | -| Component.Unreal | 16.1.28810.153 | -| Component.Unreal.Android | 16.1.28810.153 | -| Component.VSInstallerProjects | 1.0.0 | -| Component.WixToolset.VisualStudioExtension.Dev16 | 1.0.0.4 | -| Component.WixToolset.VisualStudioExtension.Schemas3 | 1.0.0.4 | -| Component.WixToolset.VisualStudioExtension.Schemas4 | 1.0.0.4 | -| Component.Xamarin | 16.9.31004.209 | -| Component.Xamarin.RemotedSimulator | 16.9.31004.209 | -| Microsoft.Component.Azure.DataLake.Tools | 16.9.31004.209 | -| Microsoft.Component.ClickOnce | 16.4.29409.204 | -| Microsoft.Component.MSBuild | 16.5.29515.121 | -| Microsoft.Component.NetFX.Native | 16.5.29515.121 | -| Microsoft.Component.PythonTools | 16.9.31228.235 | -| Microsoft.Component.PythonTools.Miniconda | 16.9.31228.235 | -| Microsoft.Component.PythonTools.Web | 16.9.31004.209 | -| Microsoft.Component.VC.Runtime.UCRTSDK | 16.0.28625.61 | -| Microsoft.ComponentGroup.Blend | 16.0.28315.86 | -| Microsoft.ComponentGroup.ClickOnce.Publish | 16.9.31004.209 | -| Microsoft.Net.Component.3.5.DeveloperTools | 16.0.28517.75 | -| Microsoft.Net.Component.4.5.1.TargetingPack | 16.0.28517.75 | -| Microsoft.Net.Component.4.5.2.TargetingPack | 16.0.28517.75 | -| Microsoft.Net.Component.4.5.TargetingPack | 16.0.28517.75 | -| Microsoft.Net.Component.4.6.1.TargetingPack | 16.0.28517.75 | -| Microsoft.Net.Component.4.6.2.TargetingPack | 16.0.28517.75 | -| Microsoft.Net.Component.4.6.TargetingPack | 16.0.28517.75 | -| Microsoft.Net.Component.4.7.1.TargetingPack | 16.9.31004.209 | -| Microsoft.Net.Component.4.7.2.SDK | 16.4.29409.204 | -| Microsoft.Net.Component.4.7.2.TargetingPack | 16.9.31004.209 | -| Microsoft.Net.Component.4.7.TargetingPack | 16.9.31004.209 | -| Microsoft.Net.Component.4.8.SDK | 16.4.29313.120 | -| Microsoft.Net.Component.4.TargetingPack | 16.0.28517.75 | -| Microsoft.Net.ComponentGroup.4.6.2.DeveloperTools | 16.3.29207.166 | -| Microsoft.Net.ComponentGroup.4.7.1.DeveloperTools | 16.3.29207.166 | -| Microsoft.Net.ComponentGroup.4.7.DeveloperTools | 16.3.29207.166 | -| Microsoft.Net.ComponentGroup.DevelopmentPrerequisites | 16.3.29207.166 | -| Microsoft.Net.ComponentGroup.TargetingPacks.Common | 16.0.28516.191 | -| Microsoft.Net.Core.Component.SDK.2.1 | 16.9.31228.235 | -| Microsoft.NetCore.Component.DevelopmentTools | 16.9.31004.209 | -| Microsoft.NetCore.Component.Runtime.3.1 | 16.9.31228.235 | -| Microsoft.NetCore.Component.Runtime.5.0 | 16.9.31228.235 | -| Microsoft.NetCore.Component.SDK | 16.9.31228.235 | -| Microsoft.NetCore.Component.Web | 16.9.31004.209 | -| Microsoft.VisualStudio.Component.AppInsights.Tools | 16.5.29515.121 | -| Microsoft.VisualStudio.Component.AspNet45 | 16.9.31004.209 | -| Microsoft.VisualStudio.Component.Azure.AuthoringTools | 16.0.28625.61 | -| Microsoft.VisualStudio.Component.Azure.ClientLibs | 16.0.28315.86 | -| Microsoft.VisualStudio.Component.Azure.Compute.Emulator | 16.9.31004.209 | -| Microsoft.VisualStudio.Component.Azure.Kubernetes.Tools | 16.9.31004.209 | -| Microsoft.VisualStudio.Component.Azure.Powershell | 16.5.29515.121 | -| Microsoft.VisualStudio.Component.Azure.ResourceManager.Tools | 16.4.29409.204 | -| Microsoft.VisualStudio.Component.Azure.ServiceFabric.Tools | 16.4.29313.120 | -| Microsoft.VisualStudio.Component.Azure.Storage.AzCopy | 16.0.28517.75 | -| Microsoft.VisualStudio.Component.Azure.Storage.Emulator | 16.4.29313.120 | -| Microsoft.VisualStudio.Component.Azure.Waverton | 16.9.31019.194 | -| Microsoft.VisualStudio.Component.Azure.Waverton.BuildTools | 16.9.31019.194 | -| Microsoft.VisualStudio.Component.ClassDesigner | 16.0.28528.71 | -| Microsoft.VisualStudio.Component.CloudExplorer | 16.0.28625.61 | -| Microsoft.VisualStudio.Component.CodeMap | 16.0.28625.61 | -| Microsoft.VisualStudio.Component.Common.Azure.Tools | 16.4.29409.204 | -| Microsoft.VisualStudio.Component.CoreEditor | 16.1.28811.260 | -| Microsoft.VisualStudio.Component.Debugger.JustInTime | 16.0.28517.75 | -| Microsoft.VisualStudio.Component.Debugger.Snapshot | 16.5.29813.82 | -| Microsoft.VisualStudio.Component.Debugger.TimeTravel | 16.5.29515.121 | -| Microsoft.VisualStudio.Component.DiagnosticTools | 16.9.31004.209 | -| Microsoft.VisualStudio.Component.DockerTools | 16.4.29409.204 | -| Microsoft.VisualStudio.Component.DotNetModelBuilder | 16.9.31004.209 | -| Microsoft.VisualStudio.Component.DslTools | 16.0.28315.86 | -| Microsoft.VisualStudio.Component.EntityFramework | 16.0.28315.86 | -| Microsoft.VisualStudio.Component.FSharp | 16.0.28315.86 | -| Microsoft.VisualStudio.Component.FSharp.Desktop | 16.0.28315.86 | -| Microsoft.VisualStudio.Component.FSharp.WebTemplates | 16.3.29207.166 | -| Microsoft.VisualStudio.Component.GraphDocument | 16.0.28625.61 | -| Microsoft.VisualStudio.Component.Graphics | 16.9.31004.209 | -| Microsoft.VisualStudio.Component.Graphics.Tools | 16.0.28625.61 | -| Microsoft.VisualStudio.Component.IISExpress | 16.0.28315.86 | -| Microsoft.VisualStudio.Component.IntelliCode | 16.9.31201.172 | -| Microsoft.VisualStudio.Component.IntelliTrace.FrontEnd | 16.5.29515.121 | -| Microsoft.VisualStudio.Component.JavaScript.Diagnostics | 16.0.28517.75 | -| Microsoft.VisualStudio.Component.JavaScript.TypeScript | 16.9.31004.209 | -| Microsoft.VisualStudio.Component.LinqToSql | 16.0.28625.61 | -| Microsoft.VisualStudio.Component.LiveUnitTesting | 16.9.31004.209 | -| Microsoft.VisualStudio.Component.ManagedDesktop.Core | 16.4.29318.151 | -| Microsoft.VisualStudio.Component.ManagedDesktop.Prerequisites | 16.9.31004.209 | -| Microsoft.VisualStudio.Component.Merq | 16.2.29012.281 | -| Microsoft.VisualStudio.Component.MonoDebugger | 16.0.28517.75 | -| Microsoft.VisualStudio.Component.MSODBC.SQL | 16.0.28625.61 | -| Microsoft.VisualStudio.Component.MSSQL.CMDLnUtils | 16.0.28707.177 | -| Microsoft.VisualStudio.Component.Node.Tools | 16.5.29515.121 | -| Microsoft.VisualStudio.Component.NuGet | 16.1.28829.92 | -| Microsoft.VisualStudio.Component.NuGet.BuildTools | 16.1.28829.92 | -| Microsoft.VisualStudio.Component.PortableLibrary | 16.9.31004.209 | -| Microsoft.VisualStudio.Component.Roslyn.Compiler | 16.0.28714.129 | -| Microsoft.VisualStudio.Component.Roslyn.LanguageServices | 16.9.31004.209 | -| Microsoft.VisualStudio.Component.Sharepoint.Tools | 16.4.29409.204 | -| Microsoft.VisualStudio.Component.SQL.ADAL | 16.0.28517.75 | -| Microsoft.VisualStudio.Component.SQL.CLR | 16.0.28315.86 | -| Microsoft.VisualStudio.Component.SQL.DataSources | 16.0.28315.86 | -| Microsoft.VisualStudio.Component.SQL.LocalDB.Runtime | 16.0.28625.61 | -| Microsoft.VisualStudio.Component.SQL.SSDT | 16.3.29207.166 | -| Microsoft.VisualStudio.Component.TeamOffice | 16.4.29409.204 | -| Microsoft.VisualStudio.Component.TestTools.CodedUITest | 16.0.28327.66 | -| Microsoft.VisualStudio.Component.TestTools.WebLoadTest | 16.0.28625.61 | -| Microsoft.VisualStudio.Component.TextTemplating | 16.0.28625.61 | -| Microsoft.VisualStudio.Component.TypeScript.4.1 | 16.0.31004.209 | -| Microsoft.VisualStudio.Component.Unity | 16.0.28315.86 | -| Microsoft.VisualStudio.Component.UWP.VC.ARM64 | 16.3.29207.166 | -| Microsoft.VisualStudio.Component.VC.14.25.x86.x64 | 16.9.31004.209 | -| Microsoft.VisualStudio.Component.VC.140 | 16.9.31004.209 | -| Microsoft.VisualStudio.Component.VC.ASAN | 16.9.31004.209 | -| Microsoft.VisualStudio.Component.VC.ATL | 16.4.29313.120 | -| Microsoft.VisualStudio.Component.VC.ATL.ARM | 16.4.29313.120 | -| Microsoft.VisualStudio.Component.VC.ATL.ARM.Spectre | 16.5.29721.120 | -| Microsoft.VisualStudio.Component.VC.ATL.ARM64 | 16.4.29313.120 | -| Microsoft.VisualStudio.Component.VC.ATL.ARM64.Spectre | 16.5.29515.121 | -| Microsoft.VisualStudio.Component.VC.ATL.Spectre | 16.5.29515.121 | -| Microsoft.VisualStudio.Component.VC.ATLMFC | 16.4.29313.120 | -| Microsoft.VisualStudio.Component.VC.ATLMFC.Spectre | 16.5.29721.120 | -| Microsoft.VisualStudio.Component.VC.CLI.Support | 16.9.31004.209 | -| Microsoft.VisualStudio.Component.VC.CMake.Project | 16.3.29103.31 | -| Microsoft.VisualStudio.Component.VC.CoreIde | 16.9.31004.209 | -| Microsoft.VisualStudio.Component.VC.DiagnosticTools | 16.5.29515.121 | -| Microsoft.VisualStudio.Component.VC.Llvm.Clang | 16.9.31004.209 | -| Microsoft.VisualStudio.Component.VC.Llvm.ClangToolset | 16.3.29207.166 | -| Microsoft.VisualStudio.Component.VC.MFC.ARM | 16.4.29313.120 | -| Microsoft.VisualStudio.Component.VC.MFC.ARM.Spectre | 16.5.29721.120 | -| Microsoft.VisualStudio.Component.VC.MFC.ARM64 | 16.4.29313.120 | -| Microsoft.VisualStudio.Component.VC.MFC.ARM64.Spectre | 16.5.29721.120 | -| Microsoft.VisualStudio.Component.VC.Redist.14.Latest | 16.5.29515.121 | -| Microsoft.VisualStudio.Component.VC.Redist.MSM | 16.5.29515.121 | -| Microsoft.VisualStudio.Component.VC.Runtimes.ARM.Spectre | 16.9.31004.209 | -| Microsoft.VisualStudio.Component.VC.Runtimes.ARM64.Spectre | 16.9.31004.209 | -| Microsoft.VisualStudio.Component.VC.Runtimes.x86.x64.Spectre | 16.9.31004.209 | -| Microsoft.VisualStudio.Component.VC.TestAdapterForBoostTest | 16.0.28517.75 | -| Microsoft.VisualStudio.Component.VC.TestAdapterForGoogleTest | 16.0.28517.75 | -| Microsoft.VisualStudio.Component.VC.Tools.ARM | 16.9.31004.209 | -| Microsoft.VisualStudio.Component.VC.Tools.ARM64 | 16.9.31004.209 | -| Microsoft.VisualStudio.Component.VC.Tools.x86.x64 | 16.9.31004.209 | -| Microsoft.VisualStudio.Component.VC.v141.ARM | 16.9.31004.209 | -| Microsoft.VisualStudio.Component.VC.v141.ARM.Spectre | 16.5.29515.121 | -| Microsoft.VisualStudio.Component.VC.v141.ARM64 | 16.9.31004.209 | -| Microsoft.VisualStudio.Component.VC.v141.ARM64.Spectre | 16.5.29515.121 | -| Microsoft.VisualStudio.Component.VC.v141.ATL | 16.0.28625.61 | -| Microsoft.VisualStudio.Component.VC.v141.ATL.ARM.Spectre | 16.5.29721.120 | -| Microsoft.VisualStudio.Component.VC.v141.ATL.ARM64.Spectre | 16.0.28625.61 | -| Microsoft.VisualStudio.Component.VC.v141.ATL.Spectre | 16.0.28625.61 | -| Microsoft.VisualStudio.Component.VC.v141.MFC | 16.0.28625.61 | -| Microsoft.VisualStudio.Component.VC.v141.MFC.ARM.Spectre | 16.0.28625.61 | -| Microsoft.VisualStudio.Component.VC.v141.MFC.ARM64.Spectre | 16.0.28625.61 | -| Microsoft.VisualStudio.Component.VC.v141.MFC.Spectre | 16.0.28625.61 | -| Microsoft.VisualStudio.Component.VC.v141.x86.x64 | 16.9.31004.209 | -| Microsoft.VisualStudio.Component.VC.v141.x86.x64.Spectre | 16.5.29515.121 | -| Microsoft.VisualStudio.Component.VSSDK | 16.0.28315.86 | -| Microsoft.VisualStudio.Component.Wcf.Tooling | 16.0.28625.61 | -| Microsoft.VisualStudio.Component.Web | 16.9.31004.209 | -| Microsoft.VisualStudio.Component.WebDeploy | 16.0.28517.75 | -| Microsoft.VisualStudio.Component.Windows10SDK | 16.4.29409.204 | -| Microsoft.VisualStudio.Component.Windows10SDK.16299 | 16.9.31004.209 | -| Microsoft.VisualStudio.Component.Windows10SDK.17134 | 16.9.31004.209 | -| Microsoft.VisualStudio.Component.Windows10SDK.17763 | 16.0.28517.75 | -| Microsoft.VisualStudio.Component.Windows10SDK.18362 | 16.1.28829.92 | -| Microsoft.VisualStudio.Component.Windows10SDK.19041 | 16.9.31004.209 | -| Microsoft.VisualStudio.Component.WinXP | 16.9.31004.209 | -| Microsoft.VisualStudio.Component.Workflow | 16.0.28315.86 | -| Microsoft.VisualStudio.ComponentGroup.ArchitectureTools.Native | 16.0.28621.142 | -| Microsoft.VisualStudio.ComponentGroup.Azure.CloudServices | 16.9.31019.194 | -| Microsoft.VisualStudio.ComponentGroup.Azure.Prerequisites | 16.9.31004.209 | -| Microsoft.VisualStudio.ComponentGroup.Azure.ResourceManager.Tools | 16.0.28528.71 | -| Microsoft.VisualStudio.ComponentGroup.AzureFunctions | 16.9.31004.209 | -| Microsoft.VisualStudio.ComponentGroup.MSIX.Packaging | 16.9.31004.209 | -| Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core | 16.2.29012.281 | -| Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Llvm.Clang | 16.9.31004.209 | -| Microsoft.VisualStudio.ComponentGroup.UWP.NetCoreAndStandard | 16.3.29102.218 | -| Microsoft.VisualStudio.ComponentGroup.UWP.Support | 16.9.31004.209 | -| Microsoft.VisualStudio.ComponentGroup.UWP.VC | 16.9.31004.209 | -| Microsoft.VisualStudio.ComponentGroup.UWP.Xamarin | 16.9.31004.209 | -| Microsoft.VisualStudio.ComponentGroup.VisualStudioExtension.Prerequisites | 16.9.31004.209 | -| Microsoft.VisualStudio.ComponentGroup.Web | 16.9.31004.209 | -| Microsoft.VisualStudio.ComponentGroup.Web.Client | 16.9.31004.209 | -| Microsoft.VisualStudio.ComponentGroup.Web.CloudTools | 16.9.31004.209 | -| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions | 16.9.31004.209 | -| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.CMake | 16.9.31004.209 | -| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.TemplateEngine | 16.9.31004.209 | -| Microsoft.VisualStudio.Workload.Azure | 16.9.31004.209 | -| Microsoft.VisualStudio.Workload.CoreEditor | 16.9.31004.209 | -| Microsoft.VisualStudio.Workload.Data | 16.0.28720.110 | -| Microsoft.VisualStudio.Workload.DataScience | 16.9.31004.209 | -| Microsoft.VisualStudio.Workload.ManagedDesktop | 16.9.31004.209 | -| Microsoft.VisualStudio.Workload.ManagedGame | 16.9.31004.209 | -| Microsoft.VisualStudio.Workload.NativeCrossPlat | 16.9.31004.209 | -| Microsoft.VisualStudio.Workload.NativeDesktop | 16.9.31004.209 | -| Microsoft.VisualStudio.Workload.NativeGame | 16.9.31004.209 | -| Microsoft.VisualStudio.Workload.NativeMobile | 16.9.31004.209 | -| Microsoft.VisualStudio.Workload.NetCoreTools | 16.9.31004.209 | -| Microsoft.VisualStudio.Workload.NetCrossPlat | 16.9.31004.209 | -| Microsoft.VisualStudio.Workload.NetWeb | 16.9.31004.209 | -| Microsoft.VisualStudio.Workload.Node | 16.9.31004.209 | -| Microsoft.VisualStudio.Workload.Office | 16.9.31004.209 | -| Microsoft.VisualStudio.Workload.Python | 16.9.31228.235 | -| Microsoft.VisualStudio.Workload.Universal | 16.9.31004.209 | -| Microsoft.VisualStudio.Workload.VisualStudioExtension | 16.9.31004.209 | -| ms-biztalk.BizTalk | 3.13.2.0 | -| ProBITools.MicrosoftAnalysisServicesModelingProjects | 2.9.17 | -| ProBITools.MicrosoftReportProjectsforVisualStudio | 2.6.11 | -| SSIS.SqlServerIntegrationServicesProjects | 3.13.1 | -| VisualStudioClient.MicrosoftVisualStudio2017InstallerProjects | 1.0.0 | -| Windows Driver Kit | 10.0.19030.0 | -| Windows Driver Kit Visual Studio Extension | 10.1.19041.685 | -| WIX Toolset | 3.11.4516 | -| WIX Toolset Studio 2019 Extension | 1.0.0.4 | +| Package | Version | +| ------------------------------------------------------------------------- | --------------- | +| Component.Android.NDK.R16B | 16.10.31320.204 | +| Component.Android.SDK25.Private | 16.0.28625.61 | +| Component.Android.SDK30 | 16.10.31205.252 | +| Component.Ant | 1.9.3.8 | +| Component.Dotfuscator | 16.10.31205.252 | +| Component.Linux.CMake | 16.2.29003.222 | +| Component.MDD.Android | 16.0.28517.75 | +| Component.MDD.Linux | 16.5.29515.121 | +| Component.MDD.Linux.GCC.arm | 16.5.29515.121 | +| Component.Microsoft.VisualStudio.LiveShare | 1.0.4062 | +| Component.Microsoft.VisualStudio.RazorExtension | 16.10.31205.252 | +| Component.Microsoft.VisualStudio.Tools.Applications | 16.0.31110.1 | +| Component.Microsoft.VisualStudio.Web.AzureFunctions | 16.10.31205.252 | +| Component.Microsoft.Web.LibraryManager | 16.10.31205.180 | +| Component.Microsoft.WebTools.BrowserLink.WebLivePreview | 0.7.22.39845 | +| Component.Microsoft.Windows.DriverKit | 10.0.19030.0 | +| Component.OpenJDK | 16.10.31303.311 | +| Component.UnityEngine.x64 | 16.10.31205.252 | +| Component.Unreal | 16.1.28810.153 | +| Component.Unreal.Android | 16.1.28810.153 | +| Component.VSInstallerProjects | 1.0.0 | +| Component.WixToolset.VisualStudioExtension.Dev16 | 1.0.0.4 | +| Component.WixToolset.VisualStudioExtension.Schemas3 | 1.0.0.4 | +| Component.WixToolset.VisualStudioExtension.Schemas4 | 1.0.0.4 | +| Component.Xamarin | 16.10.31205.252 | +| Component.Xamarin.RemotedSimulator | 16.10.31205.252 | +| Microsoft.Component.Azure.DataLake.Tools | 16.10.31205.252 | +| Microsoft.Component.ClickOnce | 16.4.29409.204 | +| Microsoft.Component.MSBuild | 16.5.29515.121 | +| Microsoft.Component.NetFX.Native | 16.5.29515.121 | +| Microsoft.Component.PythonTools | 16.10.31313.127 | +| Microsoft.Component.PythonTools.Miniconda | 16.10.31313.127 | +| Microsoft.Component.PythonTools.Web | 16.10.31205.252 | +| Microsoft.Component.VC.Runtime.UCRTSDK | 16.0.28625.61 | +| Microsoft.ComponentGroup.Blend | 16.0.28315.86 | +| Microsoft.ComponentGroup.ClickOnce.Publish | 16.10.31303.231 | +| Microsoft.Net.Component.3.5.DeveloperTools | 16.0.28517.75 | +| Microsoft.Net.Component.4.5.1.TargetingPack | 16.0.28517.75 | +| Microsoft.Net.Component.4.5.2.TargetingPack | 16.0.28517.75 | +| Microsoft.Net.Component.4.5.TargetingPack | 16.0.28517.75 | +| Microsoft.Net.Component.4.6.1.TargetingPack | 16.0.28517.75 | +| Microsoft.Net.Component.4.6.2.TargetingPack | 16.0.28517.75 | +| Microsoft.Net.Component.4.6.TargetingPack | 16.0.28517.75 | +| Microsoft.Net.Component.4.7.1.TargetingPack | 16.10.31205.252 | +| Microsoft.Net.Component.4.7.2.SDK | 16.4.29409.204 | +| Microsoft.Net.Component.4.7.2.TargetingPack | 16.10.31205.252 | +| Microsoft.Net.Component.4.7.TargetingPack | 16.10.31205.252 | +| Microsoft.Net.Component.4.8.SDK | 16.4.29313.120 | +| Microsoft.Net.Component.4.TargetingPack | 16.0.28517.75 | +| Microsoft.Net.ComponentGroup.4.6.2.DeveloperTools | 16.3.29207.166 | +| Microsoft.Net.ComponentGroup.4.7.1.DeveloperTools | 16.3.29207.166 | +| Microsoft.Net.ComponentGroup.4.7.DeveloperTools | 16.3.29207.166 | +| Microsoft.Net.ComponentGroup.DevelopmentPrerequisites | 16.3.29207.166 | +| Microsoft.Net.ComponentGroup.TargetingPacks.Common | 16.0.28516.191 | +| Microsoft.NetCore.Component.DevelopmentTools | 16.10.31303.231 | +| Microsoft.NetCore.Component.Runtime.3.1 | 16.10.31320.204 | +| Microsoft.NetCore.Component.Runtime.5.0 | 16.10.31320.204 | +| Microsoft.NetCore.Component.SDK | 16.10.31320.204 | +| Microsoft.NetCore.Component.Web | 16.10.31303.231 | +| Microsoft.VisualStudio.Component.AppInsights.Tools | 16.5.29515.121 | +| Microsoft.VisualStudio.Component.AspNet45 | 16.10.31205.252 | +| Microsoft.VisualStudio.Component.Azure.AuthoringTools | 16.0.28625.61 | +| Microsoft.VisualStudio.Component.Azure.ClientLibs | 16.0.28315.86 | +| Microsoft.VisualStudio.Component.Azure.Compute.Emulator | 16.10.31205.252 | +| Microsoft.VisualStudio.Component.Azure.Kubernetes.Tools | 16.10.31205.252 | +| Microsoft.VisualStudio.Component.Azure.Powershell | 16.5.29515.121 | +| Microsoft.VisualStudio.Component.Azure.ResourceManager.Tools | 16.4.29409.204 | +| Microsoft.VisualStudio.Component.Azure.ServiceFabric.Tools | 16.4.29313.120 | +| Microsoft.VisualStudio.Component.Azure.Storage.AzCopy | 16.0.28517.75 | +| Microsoft.VisualStudio.Component.Azure.Storage.Emulator | 16.4.29313.120 | +| Microsoft.VisualStudio.Component.Azure.Waverton | 16.10.31205.252 | +| Microsoft.VisualStudio.Component.Azure.Waverton.BuildTools | 16.10.31205.252 | +| Microsoft.VisualStudio.Component.ClassDesigner | 16.0.28528.71 | +| Microsoft.VisualStudio.Component.CloudExplorer | 16.0.28625.61 | +| Microsoft.VisualStudio.Component.CodeMap | 16.0.28625.61 | +| Microsoft.VisualStudio.Component.Common.Azure.Tools | 16.4.29409.204 | +| Microsoft.VisualStudio.Component.CoreEditor | 16.1.28811.260 | +| Microsoft.VisualStudio.Component.Debugger.JustInTime | 16.0.28517.75 | +| Microsoft.VisualStudio.Component.Debugger.Snapshot | 16.5.29813.82 | +| Microsoft.VisualStudio.Component.Debugger.TimeTravel | 16.10.31205.252 | +| Microsoft.VisualStudio.Component.DiagnosticTools | 16.10.31205.252 | +| Microsoft.VisualStudio.Component.DockerTools | 16.4.29409.204 | +| Microsoft.VisualStudio.Component.DotNetModelBuilder | 16.10.31205.252 | +| Microsoft.VisualStudio.Component.DslTools | 16.0.28315.86 | +| Microsoft.VisualStudio.Component.EntityFramework | 16.0.28315.86 | +| Microsoft.VisualStudio.Component.FSharp | 16.0.28315.86 | +| Microsoft.VisualStudio.Component.FSharp.Desktop | 16.0.28315.86 | +| Microsoft.VisualStudio.Component.FSharp.WebTemplates | 16.3.29207.166 | +| Microsoft.VisualStudio.Component.GraphDocument | 16.0.28625.61 | +| Microsoft.VisualStudio.Component.Graphics | 16.10.31205.252 | +| Microsoft.VisualStudio.Component.Graphics.Tools | 16.0.28625.61 | +| Microsoft.VisualStudio.Component.IISExpress | 16.0.28315.86 | +| Microsoft.VisualStudio.Component.IntelliCode | 16.10.31305.154 | +| Microsoft.VisualStudio.Component.IntelliTrace.FrontEnd | 16.5.29515.121 | +| Microsoft.VisualStudio.Component.JavaScript.Diagnostics | 16.0.28517.75 | +| Microsoft.VisualStudio.Component.JavaScript.TypeScript | 16.10.31303.231 | +| Microsoft.VisualStudio.Component.LinqToSql | 16.0.28625.61 | +| Microsoft.VisualStudio.Component.LiveUnitTesting | 16.10.31205.252 | +| Microsoft.VisualStudio.Component.ManagedDesktop.Core | 16.4.29318.151 | +| Microsoft.VisualStudio.Component.ManagedDesktop.Prerequisites | 16.10.31205.180 | +| Microsoft.VisualStudio.Component.Merq | 16.2.29012.281 | +| Microsoft.VisualStudio.Component.MonoDebugger | 16.0.28517.75 | +| Microsoft.VisualStudio.Component.MSODBC.SQL | 16.0.28625.61 | +| Microsoft.VisualStudio.Component.MSSQL.CMDLnUtils | 16.0.28707.177 | +| Microsoft.VisualStudio.Component.Node.Tools | 16.5.29515.121 | +| Microsoft.VisualStudio.Component.NuGet | 16.1.28829.92 | +| Microsoft.VisualStudio.Component.NuGet.BuildTools | 16.1.28829.92 | +| Microsoft.VisualStudio.Component.PortableLibrary | 16.10.31205.252 | +| Microsoft.VisualStudio.Component.Roslyn.Compiler | 16.0.28714.129 | +| Microsoft.VisualStudio.Component.Roslyn.LanguageServices | 16.10.31205.252 | +| Microsoft.VisualStudio.Component.Sharepoint.Tools | 16.4.29409.204 | +| Microsoft.VisualStudio.Component.SQL.ADAL | 16.0.28517.75 | +| Microsoft.VisualStudio.Component.SQL.CLR | 16.0.28315.86 | +| Microsoft.VisualStudio.Component.SQL.DataSources | 16.0.28315.86 | +| Microsoft.VisualStudio.Component.SQL.LocalDB.Runtime | 16.0.28625.61 | +| Microsoft.VisualStudio.Component.SQL.SSDT | 16.3.29207.166 | +| Microsoft.VisualStudio.Component.TeamOffice | 16.4.29409.204 | +| Microsoft.VisualStudio.Component.TestTools.CodedUITest | 16.0.28327.66 | +| Microsoft.VisualStudio.Component.TestTools.WebLoadTest | 16.0.28625.61 | +| Microsoft.VisualStudio.Component.TextTemplating | 16.0.28625.61 | +| Microsoft.VisualStudio.Component.TypeScript.4.2 | 16.0.31303.231 | +| Microsoft.VisualStudio.Component.Unity | 16.0.28315.86 | +| Microsoft.VisualStudio.Component.UWP.VC.ARM64 | 16.3.29207.166 | +| Microsoft.VisualStudio.Component.VC.14.25.x86.x64 | 16.10.31205.252 | +| Microsoft.VisualStudio.Component.VC.140 | 16.10.31205.252 | +| Microsoft.VisualStudio.Component.VC.ASAN | 16.10.31205.252 | +| Microsoft.VisualStudio.Component.VC.ATL | 16.4.29313.120 | +| Microsoft.VisualStudio.Component.VC.ATL.ARM | 16.4.29313.120 | +| Microsoft.VisualStudio.Component.VC.ATL.ARM.Spectre | 16.5.29721.120 | +| Microsoft.VisualStudio.Component.VC.ATL.ARM64 | 16.4.29313.120 | +| Microsoft.VisualStudio.Component.VC.ATL.ARM64.Spectre | 16.5.29515.121 | +| Microsoft.VisualStudio.Component.VC.ATL.Spectre | 16.5.29515.121 | +| Microsoft.VisualStudio.Component.VC.ATLMFC | 16.4.29313.120 | +| Microsoft.VisualStudio.Component.VC.ATLMFC.Spectre | 16.5.29721.120 | +| Microsoft.VisualStudio.Component.VC.CLI.Support | 16.10.31205.252 | +| Microsoft.VisualStudio.Component.VC.CMake.Project | 16.3.29103.31 | +| Microsoft.VisualStudio.Component.VC.CoreIde | 16.10.31205.252 | +| Microsoft.VisualStudio.Component.VC.DiagnosticTools | 16.5.29515.121 | +| Microsoft.VisualStudio.Component.VC.Llvm.Clang | 16.10.31205.252 | +| Microsoft.VisualStudio.Component.VC.Llvm.ClangToolset | 16.3.29207.166 | +| Microsoft.VisualStudio.Component.VC.MFC.ARM | 16.4.29313.120 | +| Microsoft.VisualStudio.Component.VC.MFC.ARM.Spectre | 16.5.29721.120 | +| Microsoft.VisualStudio.Component.VC.MFC.ARM64 | 16.4.29313.120 | +| Microsoft.VisualStudio.Component.VC.MFC.ARM64.Spectre | 16.5.29721.120 | +| Microsoft.VisualStudio.Component.VC.Redist.14.Latest | 16.5.29515.121 | +| Microsoft.VisualStudio.Component.VC.Redist.MSM | 16.5.29515.121 | +| Microsoft.VisualStudio.Component.VC.Runtimes.ARM.Spectre | 16.10.31205.252 | +| Microsoft.VisualStudio.Component.VC.Runtimes.ARM64.Spectre | 16.10.31205.252 | +| Microsoft.VisualStudio.Component.VC.Runtimes.x86.x64.Spectre | 16.10.31205.252 | +| Microsoft.VisualStudio.Component.VC.TestAdapterForBoostTest | 16.0.28517.75 | +| Microsoft.VisualStudio.Component.VC.TestAdapterForGoogleTest | 16.0.28517.75 | +| Microsoft.VisualStudio.Component.VC.Tools.ARM | 16.10.31205.252 | +| Microsoft.VisualStudio.Component.VC.Tools.ARM64 | 16.10.31205.252 | +| Microsoft.VisualStudio.Component.VC.Tools.x86.x64 | 16.10.31205.252 | +| Microsoft.VisualStudio.Component.VC.v141.ARM | 16.10.31205.252 | +| Microsoft.VisualStudio.Component.VC.v141.ARM.Spectre | 16.5.29515.121 | +| Microsoft.VisualStudio.Component.VC.v141.ARM64 | 16.10.31205.252 | +| Microsoft.VisualStudio.Component.VC.v141.ARM64.Spectre | 16.5.29515.121 | +| Microsoft.VisualStudio.Component.VC.v141.ATL | 16.0.28625.61 | +| Microsoft.VisualStudio.Component.VC.v141.ATL.ARM.Spectre | 16.5.29721.120 | +| Microsoft.VisualStudio.Component.VC.v141.ATL.ARM64.Spectre | 16.0.28625.61 | +| Microsoft.VisualStudio.Component.VC.v141.ATL.Spectre | 16.0.28625.61 | +| Microsoft.VisualStudio.Component.VC.v141.MFC | 16.0.28625.61 | +| Microsoft.VisualStudio.Component.VC.v141.MFC.ARM.Spectre | 16.0.28625.61 | +| Microsoft.VisualStudio.Component.VC.v141.MFC.ARM64.Spectre | 16.0.28625.61 | +| Microsoft.VisualStudio.Component.VC.v141.MFC.Spectre | 16.0.28625.61 | +| Microsoft.VisualStudio.Component.VC.v141.x86.x64 | 16.10.31205.252 | +| Microsoft.VisualStudio.Component.VC.v141.x86.x64.Spectre | 16.5.29515.121 | +| Microsoft.VisualStudio.Component.VSSDK | 16.0.28315.86 | +| Microsoft.VisualStudio.Component.Wcf.Tooling | 16.0.28625.61 | +| Microsoft.VisualStudio.Component.Web | 16.10.31205.252 | +| Microsoft.VisualStudio.Component.WebDeploy | 16.0.28517.75 | +| Microsoft.VisualStudio.Component.Windows10SDK | 16.4.29409.204 | +| Microsoft.VisualStudio.Component.Windows10SDK.16299 | 16.10.31205.252 | +| Microsoft.VisualStudio.Component.Windows10SDK.17134 | 16.10.31205.252 | +| Microsoft.VisualStudio.Component.Windows10SDK.17763 | 16.0.28517.75 | +| Microsoft.VisualStudio.Component.Windows10SDK.18362 | 16.1.28829.92 | +| Microsoft.VisualStudio.Component.Windows10SDK.19041 | 16.10.31205.252 | +| Microsoft.VisualStudio.Component.WinXP | 16.10.31205.252 | +| Microsoft.VisualStudio.Component.Workflow | 16.0.28315.86 | +| Microsoft.VisualStudio.ComponentGroup.ArchitectureTools.Native | 16.0.28621.142 | +| Microsoft.VisualStudio.ComponentGroup.Azure.CloudServices | 16.10.31205.180 | +| Microsoft.VisualStudio.ComponentGroup.Azure.Prerequisites | 16.10.31303.231 | +| Microsoft.VisualStudio.ComponentGroup.Azure.ResourceManager.Tools | 16.0.28528.71 | +| Microsoft.VisualStudio.ComponentGroup.AzureFunctions | 16.10.31205.180 | +| Microsoft.VisualStudio.ComponentGroup.MSIX.Packaging | 16.10.31205.180 | +| Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core | 16.2.29012.281 | +| Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Llvm.Clang | 16.10.31205.180 | +| Microsoft.VisualStudio.ComponentGroup.UWP.NetCoreAndStandard | 16.3.29102.218 | +| Microsoft.VisualStudio.ComponentGroup.UWP.Support | 16.10.31205.180 | +| Microsoft.VisualStudio.ComponentGroup.UWP.VC | 16.10.31205.180 | +| Microsoft.VisualStudio.ComponentGroup.UWP.Xamarin | 16.10.31205.180 | +| Microsoft.VisualStudio.ComponentGroup.VisualStudioExtension.Prerequisites | 16.10.31205.180 | +| Microsoft.VisualStudio.ComponentGroup.Web | 16.10.31205.180 | +| Microsoft.VisualStudio.ComponentGroup.Web.Client | 16.10.31205.180 | +| Microsoft.VisualStudio.ComponentGroup.Web.CloudTools | 16.10.31205.180 | +| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions | 16.10.31205.180 | +| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.CMake | 16.10.31205.180 | +| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.TemplateEngine | 16.10.31205.180 | +| Microsoft.VisualStudio.Workload.Azure | 16.10.31303.231 | +| Microsoft.VisualStudio.Workload.CoreEditor | 16.10.31205.180 | +| Microsoft.VisualStudio.Workload.Data | 16.0.28720.110 | +| Microsoft.VisualStudio.Workload.DataScience | 16.10.31205.180 | +| Microsoft.VisualStudio.Workload.ManagedDesktop | 16.10.31303.231 | +| Microsoft.VisualStudio.Workload.ManagedGame | 16.10.31205.180 | +| Microsoft.VisualStudio.Workload.NativeCrossPlat | 16.10.31205.180 | +| Microsoft.VisualStudio.Workload.NativeDesktop | 16.10.31205.180 | +| Microsoft.VisualStudio.Workload.NativeGame | 16.10.31205.180 | +| Microsoft.VisualStudio.Workload.NativeMobile | 16.10.31205.180 | +| Microsoft.VisualStudio.Workload.NetCoreTools | 16.10.31303.231 | +| Microsoft.VisualStudio.Workload.NetCrossPlat | 16.10.31205.180 | +| Microsoft.VisualStudio.Workload.NetWeb | 16.10.31303.231 | +| Microsoft.VisualStudio.Workload.Node | 16.10.31205.180 | +| Microsoft.VisualStudio.Workload.Office | 16.10.31205.180 | +| Microsoft.VisualStudio.Workload.Python | 16.10.31303.231 | +| Microsoft.VisualStudio.Workload.Universal | 16.10.31205.180 | +| Microsoft.VisualStudio.Workload.VisualStudioExtension | 16.10.31205.180 | +| ms-biztalk.BizTalk | 3.13.2.0 | +| ProBITools.MicrosoftAnalysisServicesModelingProjects | 2.9.17 | +| ProBITools.MicrosoftReportProjectsforVisualStudio | 2.6.11 | +| SSIS.SqlServerIntegrationServicesProjects | 3.13.1 | +| VisualStudioClient.MicrosoftVisualStudio2017InstallerProjects | 1.0.0 | +| Windows Driver Kit | 10.0.19030.0 | +| Windows Driver Kit Visual Studio Extension | 10.1.19041.685 | +| WIX Toolset | 3.11.4516 | +| WIX Toolset Studio 2019 Extension | 1.0.0.4 | #### Microsoft Visual C++: @@ -471,16 +469,16 @@ 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.28.29914 | -| Microsoft Visual C++ 2019 Debug Runtime | x64 | 14.28.29914 | -| Microsoft Visual C++ 2019 Minimum Runtime | x64 | 14.28.29914 | -| Microsoft Visual C++ 2019 Additional Runtime | x86 | 14.28.29914 | -| Microsoft Visual C++ 2019 Debug Runtime | x86 | 14.28.29914 | -| Microsoft Visual C++ 2019 Minimum Runtime | x86 | 14.28.29914 | +| Microsoft Visual C++ 2019 Additional Runtime | x64 | 14.29.30037 | +| Microsoft Visual C++ 2019 Debug Runtime | x64 | 14.29.30037 | +| Microsoft Visual C++ 2019 Minimum Runtime | x64 | 14.29.30037 | +| Microsoft Visual C++ 2019 Additional Runtime | x86 | 14.29.30037 | +| Microsoft Visual C++ 2019 Debug Runtime | x86 | 14.29.30037 | +| Microsoft Visual C++ 2019 Minimum Runtime | x86 | 14.29.30037 | ### .NET Core SDK `Location C:\Program Files\dotnet\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.519 2.1.520 2.1.521 2.1.522 2.1.523 2.1.524 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.616 2.1.617 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 2.1.811 2.1.812 2.1.813 2.1.814 2.1.815 2.1.816 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.109 3.1.110 3.1.111 3.1.112 3.1.113 3.1.114 3.1.115 3.1.200 3.1.201 3.1.202 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 3.1.408 3.1.409 5.0.100 5.0.101 5.0.102 5.0.103 5.0.104 5.0.200 5.0.201 5.0.202 5.0.203 +- 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.519 2.1.520 2.1.521 2.1.522 2.1.523 2.1.524 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.616 2.1.617 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 2.1.811 2.1.812 2.1.813 2.1.814 2.1.815 2.1.816 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.109 3.1.110 3.1.111 3.1.112 3.1.113 3.1.114 3.1.115 3.1.200 3.1.201 3.1.202 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 3.1.408 3.1.409 5.0.100 5.0.101 5.0.102 5.0.103 5.0.104 5.0.200 5.0.201 5.0.202 5.0.203 5.0.300 ### .NET Core Runtime `Location: C:\Program Files\dotnet\shared\Microsoft.AspNetCore.All` @@ -531,7 +529,7 @@ All other versions are saved but not installed. | -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 4.0 | | Android SDK Build-tools | 30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3
26.0.0 26.0.1 26.0.2 26.0.3
25.0.0 25.0.1 25.0.2 25.0.3
24.0.0 24.0.1 24.0.2 24.0.3
23.0.1 23.0.2 23.0.3
22.0.1
21.1.2
20.0.0
19.1.0 | -| Android SDK Platforms | android-S (rev 3)
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 Platforms | android-S (rev 4)
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 Platform-Tools | 31.0.2 | | Android SDK Tools | 26.1.1 | | Android Support Repository | 47.0.0 | From 57a49653278232a231b6dcd02b000ee049134662 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 31 May 2021 14:09:51 +0000 Subject: [PATCH 0283/3485] Updating readme file for win16 version 20210525.0 (#3456) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/win/Windows2016-Readme.md | 55 ++++++++++++++++---------------- 1 file changed, 27 insertions(+), 28 deletions(-) diff --git a/images/win/Windows2016-Readme.md b/images/win/Windows2016-Readme.md index b408584da1b0..fa4fb7a38a50 100644 --- a/images/win/Windows2016-Readme.md +++ b/images/win/Windows2016-Readme.md @@ -1,6 +1,6 @@ # Microsoft Windows Server 2016 Datacenter - OS Version: 10.0.14393 Build 4402 -- Image Version: 20210516.0 +- Image Version: 20210525.0 ## Installed Software ### Language and Runtime @@ -15,15 +15,15 @@ ### Package Management - Chocolatey 0.10.15 -- Composer 2.0.13 +- Composer 2.0.14 - Helm 3.5.4 - Miniconda 4.9.2 - NPM 6.14.13 - NuGet 5.9.1.11 -- pip 21.1.1 (python 3.7) +- pip 21.1.2 (python 3.7) - Pipx 0.16.2.1 - RubyGems 2.7.6.3 -- Vcpkg (build from master \) +- Vcpkg (build from master \<83f9a6c>) - Yarn 1.22.10 #### Environment variables @@ -41,20 +41,20 @@ ### Tools - 7zip 19.00 - azcopy 10.10.0 -- Bazel 4.0.0 -- Bazelisk 1.8.1 +- Bazel 4.1.0 +- Bazelisk 1.9.0 - Cabal 3.4.0.0 - CMake 3.20.2 -- CodeQL Action Bundle 2.5.4 +- CodeQL Action Bundle 2.5.5 - Docker 20.10.4 - Docker-compose 1.29.1 - ghc 9.0.1 - Git 2.31.1 - Git LFS 2.13.3 -- Google Cloud SDK 340.0.0 +- Google Cloud SDK 342.0.0 - InnoSetup 6.1.2 - jq 1.6 -- Kind 0.10.0 +- Kind 0.11.0 - Kubectl 1.21.1 - Mercurial 5.0 - Mingw-w64 8.1.0 @@ -62,8 +62,8 @@ - NSIS v3.06.1 - OpenSSL 1.1.1 - Packer 1.7.2 -- Pulumi v3.2.1 -- R 4.0.5 +- Pulumi v3.3.1 +- R 4.1.0 - Stack 2.7.1 - Subversion (SVN) 1.14.1 - VSWhere 2.8.4 @@ -72,22 +72,21 @@ - zstd 1.5.0 ### CLI Tools -- Alibaba Cloud CLI 3.0.74 +- Alibaba Cloud CLI 3.0.75 - AWS CLI 2.2.5 - AWS SAM CLI 1.23.0 - AWS Session Manager CLI 1.2.54.0 -- Azure CLI 2.23.0 -- Azure Dev Spaces CLI 1.0.20210421.4 +- Azure CLI 2.24.0 - Azure DevOps CLI extension 0.18.0 - Cloud Foundry CLI 6.53.0 -- GitHub CLI 1.9.2 +- GitHub CLI 1.10.3 - Hub CLI 2.14.2 ### Rust Tools - Cargo 1.52.0 - Rust 1.52.1 - Rustdoc 1.52.1 -- Rustup 1.24.1 +- Rustup 1.24.2 #### Packages - bindgen 0.58.1 @@ -98,10 +97,10 @@ - Rustfmt 1.4.36 ### Browsers and webdrivers -- Google Chrome 90.0.4430.212 -- Chrome Driver 90.0.4430.24 -- Microsoft Edge 90.0.818.62 -- Microsoft Edge Driver 90.0.818.62 +- Google Chrome 91.0.4472.77 +- Chrome Driver 91.0.4472.19 +- Microsoft Edge 90.0.818.66 +- Microsoft Edge Driver 90.0.818.66 - Mozilla Firefox 88.0.1 - Gecko Driver 0.29.1 - IE Driver 3.150.1.0 @@ -176,9 +175,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### PyPy | Python Version | PyPy Version | | -------------- | ------------ | -| 2.7.18 | PyPy 7.3.4 with MSC v.1927 64 bit (AMD64) | +| 2.7.18 | PyPy 7.3.5 with MSC v.1927 64 bit (AMD64) | | 3.6.12 | PyPy 7.3.3 with MSC v.1927 32 bit | -| 3.7.10 | PyPy 7.3.4 with MSC v.1927 64 bit (AMD64) | +| 3.7.10 | PyPy 7.3.5 with MSC v.1927 64 bit (AMD64) | @@ -211,10 +210,10 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Web Servers -| Name | Version | ConfigFile | ServiceName | ServiceStatus | ListenPort | -| ------ | ------- | -------------------------------------- | ----------- | ------------- | ---------- | -| Apache | 2.4.47 | C:\tools\Apache24\conf\httpd.conf | Apache | Stopped | 80 | -| Nginx | 1.19.10 | C:\tools\nginx-1.19.10\conf\nginx.conf | nginx | Stopped | 80 | +| Name | Version | ConfigFile | ServiceName | ServiceStatus | ListenPort | +| ------ | ------- | ------------------------------------- | ----------- | ------------- | ---------- | +| Apache | 2.4.47 | C:\tools\Apache24\conf\httpd.conf | Apache | Stopped | 80 | +| Nginx | 1.21.0 | C:\tools\nginx-1.21.0\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2017 | Name | Version | Path | @@ -488,7 +487,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### .NET Core SDK `Location C:\Program Files\dotnet\sdk` -- 1.1.14 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.519 2.1.520 2.1.521 2.1.522 2.1.523 2.1.524 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.616 2.1.617 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 2.1.811 2.1.812 2.1.813 2.1.814 2.1.815 2.1.816 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.109 3.1.110 3.1.111 3.1.112 3.1.113 3.1.114 3.1.115 3.1.200 3.1.201 3.1.202 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 3.1.408 3.1.409 5.0.100 5.0.101 5.0.102 5.0.103 5.0.104 5.0.200 5.0.201 5.0.202 5.0.203 +- 1.1.14 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.519 2.1.520 2.1.521 2.1.522 2.1.523 2.1.524 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.616 2.1.617 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 2.1.811 2.1.812 2.1.813 2.1.814 2.1.815 2.1.816 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.109 3.1.110 3.1.111 3.1.112 3.1.113 3.1.114 3.1.115 3.1.200 3.1.201 3.1.202 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 3.1.408 3.1.409 5.0.100 5.0.101 5.0.102 5.0.103 5.0.104 5.0.200 5.0.201 5.0.202 5.0.203 5.0.300 ### .NET Core Runtime `Location: C:\Program Files\dotnet\shared\Microsoft.AspNetCore.All` @@ -539,7 +538,7 @@ All other versions are saved but not installed. | -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 4.0 | | Android SDK Build-tools | 30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3
26.0.0 26.0.1 26.0.2 26.0.3
25.0.0 25.0.1 25.0.2 25.0.3
24.0.0 24.0.1 24.0.2 24.0.3
23.0.1 23.0.2 23.0.3
22.0.1
21.1.2
20.0.0
19.1.0 | -| Android SDK Platforms | android-S (rev 3)
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 Platforms | android-S (rev 4)
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 Platform-Tools | 31.0.2 | | Android SDK Tools | 25.2.5 | | Android Support Repository | 47.0.0 | From 4983deed0f3cdb3ca57e6487022a9e215317e408 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Mon, 31 May 2021 18:33:17 +0300 Subject: [PATCH 0284/3485] [macos] stick to mongodb 4.4 (#3484) --- images/macos/provision/core/mongodb.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/images/macos/provision/core/mongodb.sh b/images/macos/provision/core/mongodb.sh index 552e35829949..944ef21c39f1 100644 --- a/images/macos/provision/core/mongodb.sh +++ b/images/macos/provision/core/mongodb.sh @@ -8,6 +8,7 @@ source ~/utils/utils.sh echo "Installing mongodb..." brew tap mongodb/brew -brew_smart_install "mongodb-community" +brew_smart_install "mongodb-community@4.4" +ln -sf $(brew --prefix mongodb-community@4.4)/bin/* /usr/local/bin/ invoke_tests "Databases" "Mongo" From dbeeb4df398f07e2211cb9e2607f9723e37556b9 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 1 Jun 2021 11:17:24 +0000 Subject: [PATCH 0285/3485] Updating readme file for macOS-11 version 20210531.1 (#3496) Co-authored-by: Image generation service account --- images/macos/macos-11-Readme.md | 58 ++++++++++++++++----------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/images/macos/macos-11-Readme.md b/images/macos/macos-11-Readme.md index 3b630ffbc5f4..961f71498afa 100644 --- a/images/macos/macos-11-Readme.md +++ b/images/macos/macos-11-Readme.md @@ -3,25 +3,23 @@ | [[macOS] GCC version 8 will be removed from images on May, 31](https://github.com/actions/virtual-environments/issues/3378) | | [macOS 11.0 pools will be transited to private preview.](https://github.com/actions/virtual-environments/issues/2486) | *** -# macOS 11.3 info -- System Version: macOS 11.3.1 (20E241) -- Kernel Version: Darwin 20.4.0 -- Image Version: 20210523.1 +# macOS 11.4 info +- System Version: macOS 11.4 (20F71) +- Kernel Version: Darwin 20.5.0 +- Image Version: 20210531.1 ## Installed Software ### Language and Runtime -- .NET SDK 2.1.300 2.1.301 2.1.302 2.1.401 2.1.402 2.1.403 2.1.500 2.1.502 2.1.503 2.1.504 2.1.505 2.1.506 2.1.507 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 2.1.811 2.1.812 2.1.813 2.1.814 2.1.815 2.1.816 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 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 3.1.408 3.1.409 5.0.100 5.0.101 5.0.102 5.0.200 5.0.201 5.0.202 5.0.203 +- .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 2.1.811 2.1.812 2.1.813 2.1.814 2.1.815 2.1.816 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 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 3.1.408 3.1.409 5.0.100 5.0.101 5.0.102 5.0.200 5.0.201 5.0.202 5.0.300 - Bash 3.2.57(1)-release - Clang/LLVM 12.0.0 is available on `'$(brew --prefix llvm)/bin/clang'` - Clang/LLVM 12.0.0 is default -- gcc-8 (Homebrew GCC 8.5.0) 8.5.0 - available by `gcc-8` alias - gcc-9 (Homebrew GCC 9.3.0_2) 9.3.0 - available by `gcc-9` alias - gcc-10 (Homebrew GCC 10.3.0) 10.3.0 - available by `gcc-10` alias -- gcc-11 (Homebrew GCC 11.1.0) 11.1.0 - available by `gcc-11` alias -- GNU Fortran (Homebrew GCC 8.5.0) 8.5.0 - available by `gfortran-8` alias +- gcc-11 (Homebrew GCC 11.1.0_1) 11.1.0 - available by `gcc-11` alias - GNU Fortran (Homebrew GCC 9.3.0_2) 9.3.0 - available by `gfortran-9` alias - GNU Fortran (Homebrew GCC 10.3.0) 10.3.0 - available by `gfortran-10` alias -- GNU Fortran (Homebrew GCC 11.1.0) 11.1.0 - available by `gfortran-11` alias +- GNU Fortran (Homebrew GCC 11.1.0_1) 11.1.0 - available by `gfortran-11` alias - Go 1.15.12 - julia 1.6.1 - MSBuild 16.6.0.15801 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) @@ -35,7 +33,7 @@ - Ruby 2.7.3p183 ### Package Management -- Bundler version 2.2.17 +- Bundler version 2.2.19 - Carthage 0.38.0 - CocoaPods 1.10.1 - Composer 2.0.14 @@ -45,9 +43,9 @@ - NuGet 5.6.0.6489 - Pip 20.3.4 (python 2.7) - Pip 21.1.1 (python 3.9) -- Pipx 0.16.2.1 -- RubyGems 3.2.17 -- Vcpkg 2021 (build from master \) +- Pipx 0.16.3 +- RubyGems 3.2.19 +- Vcpkg 2021 (build from master \<7bc5b8c>) - Yarn 1.22.5 #### Environment variables @@ -68,14 +66,14 @@ - bazel 4.1.0 - bazelisk 1.9.0 - bsdtar 3.3.2 - available by 'tar' alias -- Curl 7.76.1 +- Curl 7.77.0 - Git LFS: 2.13.3 - Git: 2.31.1 - GitHub CLI: 1.10.3 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.1 - gpg (GnuPG) 2.3.1 -- helm v3.5.4+g1b5edb6 +- helm v3.6.0+g7f2df64 - Hub CLI: 2.14.2 - jq 1.6 - mongo v4.4.5 @@ -90,19 +88,19 @@ ### Tools -- Aliyun CLI 3.0.74 +- Aliyun CLI 3.0.77 - App Center CLI 2.9.0 -- AWS CLI 2.2.5 +- AWS CLI 2.2.7 - AWS SAM CLI 1.23.0 - AWS Session Manager CLI 1.2.54.0 -- Azure CLI 2.23.0 +- Azure CLI 2.24.0 - Cabal 3.4.0.0 -- Cmake 3.20.2 -- Fastlane 2.184.0 +- Cmake 3.20.3 +- Fastlane 2.184.1 - GHC 9.0.1 - GHCup v0.1.14.1 - Stack 2.7.1 -- SwiftFormat 0.48.3 +- SwiftFormat 0.48.4 - Xcode Command Line Tools 12.5.0.0.1.1617976050 ### Linters @@ -110,12 +108,12 @@ - yamllint 1.26.1 ### Browsers -- Safari 14.1 (16611.1.21.161.6) -- SafariDriver 14.1 (16611.1.21.161.6) -- Google Chrome 90.0.4430.212 +- Safari 14.1.1 (16611.2.7.1.4) +- SafariDriver 14.1.1 (16611.2.7.1.4) +- Google Chrome 91.0.4472.77 - ChromeDriver 90.0.4430.24 -- Microsoft Edge 90.0.818.66 -- MSEdgeDriver 90.0.818.66 +- Microsoft Edge 91.0.864.37 +- MSEdgeDriver 91.0.864.37 - Mozilla Firefox 88.0.1 - geckodriver 0.29.1 @@ -176,14 +174,14 @@ | ---------------- | ------- | | Az | 5.7.0 | | MarkdownPS | 1.9 | -| Pester | 5.2.1 | +| Pester | 5.2.2 | | PSScriptAnalyzer | 1.19.1 | ### Web Servers | Name | Version | ConfigFile | ServiceStatus | ListenPort | | ----- | ------- | ------------------------------- | ------------- | ---------- | -| httpd | 2.4.47 | /usr/local/etc/httpd/httpd.conf | stopped | 80 | -| nginx | 1.19.10 | /usr/local/etc/nginx/nginx.conf | stopped | 80 | +| httpd | 2.4.48 | /usr/local/etc/httpd/httpd.conf | stopped | 80 | +| nginx | 1.21.0 | /usr/local/etc/nginx/nginx.conf | stopped | 80 | ### Xamarin #### Visual Studio for Mac @@ -217,6 +215,8 @@ #### Xcode Support Tools - xcpretty 0.3.0 - xcversion 2.7.0 +- Nomad CLI 0.0.2 +- Nomad shenzhen CLI 0.14.3 #### Installed SDKs | SDK | SDK Name | Xcode Version | From 2c6cc7ab0d5370d80dd5a3366b7cf8dcff363d74 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Tue, 1 Jun 2021 18:31:35 +0300 Subject: [PATCH 0286/3485] [Ubuntu] Change rebar installation to use GitHub releases (#3486) * Change rebar installation to use gh releases * Add source $HELPER_SCRIPTS/install.sh * Add Erlang rebar3 to software readme --- .../SoftwareReport/SoftwareReport.Common.psm1 | 7 +++++++ .../SoftwareReport/SoftwareReport.Generator.ps1 | 1 + images/linux/scripts/installers/erlang.sh | 12 +++++++++--- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 index a2ebebcb3037..7f9e8af243f2 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 @@ -56,6 +56,13 @@ function Get-ErlangVersion { return "Erlang $erlangVersion (Eshell $shellVersion)" } +function Get-ErlangRebar3Version { + $result = Get-CommandResult "rebar3 --version" + $result.Output -match "rebar (?(\d+.){2}\d+)" | Out-Null + $rebarVersion = $Matches.version + return "Erlang rebar3 $rebarVersion" +} + function Get-MonoVersion { $monoVersion = mono --version | Out-String | Take-OutputPart -Part 4 $aptSourceRepo = Get-AptSourceRepository -PackageName "mono" diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index 551569a1d582..efe543050a1f 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -42,6 +42,7 @@ $markdown += New-MDList -Style Unordered -Lines (@( (Get-ClangVersions), (Get-ClangFormatVersions), (Get-ErlangVersion), + (Get-ErlangRebar3Version), (Get-MonoVersion), (Get-MsbuildVersion), (Get-NodeVersion), diff --git a/images/linux/scripts/installers/erlang.sh b/images/linux/scripts/installers/erlang.sh index b65b545aeea0..73c973aa3276 100644 --- a/images/linux/scripts/installers/erlang.sh +++ b/images/linux/scripts/installers/erlang.sh @@ -4,6 +4,9 @@ ## Desc: Installs erlang ################################################################################ +# Source the helpers for use with the script +source $HELPER_SCRIPTS/install.sh + source_list=/etc/apt/sources.list.d/eslerlang.list # Install Erlang @@ -13,9 +16,12 @@ apt-get update apt-get install -y --no-install-recommends esl-erlang # Install rebar3 -wget -q -O rebar3 https://s3.amazonaws.com/rebar3/rebar3 -chmod +x rebar3 -mv rebar3 /usr/local/bin/rebar3 +json=$(curl -sL "https://api.github.com/repos/erlang/rebar3/releases") +rebar3Version=$(echo $json | jq -r '.[] | select(.tag_name | contains("-") | not).tag_name' | sort -V | tail -n1) +rebar3DownloadUrl=$(echo $json | jq -r ".[] | select(.tag_name==\"$rebar3Version\").assets[].browser_download_url") +download_with_retries $rebar3DownloadUrl "/tmp" +mv /tmp/rebar3 /usr/local/bin/rebar3 +chmod +x /usr/local/bin/rebar3 invoke_tests "Tools" "erlang" From 62046bdeb93bc7d697e87377aeeec008c8819cdd Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 2 Jun 2021 10:04:46 +0000 Subject: [PATCH 0287/3485] Updating readme file for macOS-10.14 version 20210531.1 (#3495) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/macos/macos-10.14-Readme.md | 119 +++++++++++++++-------------- 1 file changed, 60 insertions(+), 59 deletions(-) diff --git a/images/macos/macos-10.14-Readme.md b/images/macos/macos-10.14-Readme.md index 115f80774347..2ff5b343435b 100644 --- a/images/macos/macos-10.14-Readme.md +++ b/images/macos/macos-10.14-Readme.md @@ -1,11 +1,12 @@ | Announcements | |-| +| [[macOS] GCC version 8 will be removed from images on May, 31](https://github.com/actions/virtual-environments/issues/3378) | | [macOS 11.0 pools will be transited to private preview.](https://github.com/actions/virtual-environments/issues/2486) | *** # macOS 10.14 info -- System Version: macOS 10.14.6 (18G9028) +- System Version: macOS 10.14.6 (18G9216) - Kernel Version: Darwin 18.7.0 -- Image Version: 20210501.1 +- Image Version: 20210531.1 ## Installed Software ### Language and Runtime @@ -13,38 +14,38 @@ - Bash 3.2.57(1)-release - Clang/LLVM 11.0.0 is default - Clang/LLVM 12.0.0 is available on `'$(brew --prefix llvm)/bin/clang'` -- gcc-10 (Homebrew GCC 10.2.0_4) 10.2.0 - available by `gcc-10` alias -- gcc-8 (Homebrew GCC 8.4.0_3) 8.4.0 - available by `gcc-8` alias - gcc-9 (Homebrew GCC 9.3.0_2) 9.3.0 - available by `gcc-9` alias -- GNU Fortran (Homebrew GCC 10.2.0_4) 10.2.0 - available by `gfortran-10` alias -- GNU Fortran (Homebrew GCC 8.4.0_3) 8.4.0 - available by `gfortran-8` alias -- GNU Fortran (Homebrew GCC 9.3.0_2) 9.3.0 - available by `gfortran-9` alias -- Go 1.15.11 +- gcc-10 (Homebrew GCC 10.3.0) 10.3.0 - available by `gcc-10` alias +- gcc-11 (Homebrew GCC 11.1.0_1) 11.1.0 - available by `gcc-11` alias +- GNU Fortran (Homebrew GCC 9.3.0_2) 9.3.0 - available by `gfortran-9` alias +- GNU Fortran (Homebrew GCC 10.3.0) 10.3.0 - available by `gfortran-10` alias +- GNU Fortran (Homebrew GCC 11.1.0_1) 11.1.0 - available by `gfortran-11` alias +- Go 1.15.12 - julia 1.6.1 - MSBuild 15.7.224.30163 (from /Library/Frameworks/Mono.framework/Versions/5.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) - Node.js v8.17.0 -- NVM - Cached node versions: v10.24.1 v12.22.1 v14.16.1 - NVM 0.38.0 -- Perl 5.32.1 -- PHP 8.0.5 +- NVM - Cached node versions: v10.24.1 v12.22.1 v14.17.0 +- Perl 5.34.0 +- PHP 8.0.6 - Python 2.7.18 -- Python 3.9.4 -- R 4.0.5 +- Python 3.9.5 +- R 4.1.0 - Ruby 2.7.3p183 ### Package Management -- Bundler version 2.2.16 -- Carthage 0.37.0 +- Bundler version 2.2.19 +- Carthage 0.38.0 - CocoaPods 1.10.1 -- Composer 2.0.13 -- Homebrew 3.1.5 +- Composer 2.0.14 +- Homebrew 3.1.9 - Miniconda 4.9.2 - NPM 3.10.10 - NuGet 4.7.0.5148 - Pip 20.3.4 (python 2.7) -- Pip 21.0.1 (python 3.9) -- Pipx 0.16.2.1 -- RubyGems 3.2.16 +- Pip 21.1.1 (python 3.9) +- Pipx 0.16.3 +- RubyGems 3.2.19 - Yarn 1.22.5 #### Environment variables @@ -56,52 +57,52 @@ ### Project Management - Apache Ant(TM) 1.10.10 - Apache Maven 3.8.1 -- Gradle 7.0 +- Gradle 7.0.2 ### Utilities - 7-Zip 17.04 - aria2 1.35.0 - azcopy 10.10.0 - bazel 3.7.1 -- bazelisk 1.8.0 +- bazelisk 1.9.0 - bsdtar 2.8.3 - available by 'tar' alias -- Curl 7.76.1 +- Curl 7.77.0 - Git LFS: 2.13.3 - Git: 2.31.1 -- GitHub CLI: 1.9.2 +- GitHub CLI: 1.10.3 - GNU parallel 20210422 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.1 - gpg (GnuPG) 2.3.1 -- helm v3.5.4+g1b5edb6 +- helm v3.6.0+g7f2df64 - Hub CLI: 2.14.2 - jq 1.6 - mongo v4.4.5 - mongod v4.4.5 - OpenSSL 1.1.1k 25 Mar 2021 `(/usr/local/opt/openssl -> /usr/local/Cellar/openssl@1.1/1.1.1k)` - Packer 1.7.2 -- PostgreSQL 13.2 -- psql (PostgreSQL) 13.2 +- PostgreSQL 13.3 +- psql (PostgreSQL) 13.3 - Subversion (SVN) 1.14.1 - Vagrant 2.2.16 - virtualbox 6.1.22r144080 -- zstd 1.4.9 +- zstd 1.5.0 ### Tools -- Aliyun CLI 3.0.73 +- Aliyun CLI 3.0.77 - App Center CLI 1.2.2 -- AWS CLI 2.2.1 +- AWS CLI 2.2.7 - AWS SAM CLI 1.23.0 - AWS Session Manager CLI 1.2.54.0 -- Azure CLI 2.22.1 +- Azure CLI 2.24.0 - Cabal 3.4.0.0 -- Cmake 3.20.2 -- Fastlane 2.181.0 +- Cmake 3.20.3 +- Fastlane 2.184.1 - GHC 9.0.1 - GHCup v0.1.14.1 -- Stack 2.5.1 -- SwiftFormat 0.48.0 +- Stack 2.7.1 +- SwiftFormat 0.48.4 - Xcode Command Line Tools 10.3.0.0.1.1562985497 ### Linters @@ -109,13 +110,13 @@ - yamllint 1.26.1 ### Browsers -- Safari 14.1 (14611.1.21.161.5) -- SafariDriver 14.1 (14611.1.21.161.5) -- Google Chrome 90.0.4430.93 +- Safari 14.1.1 (14611.2.7.1.6) +- SafariDriver 14.1.1 (14611.2.7.1.6) +- Google Chrome 91.0.4472.77 - ChromeDriver 90.0.4430.24 -- Microsoft Edge 90.0.818.51 -- MSEdgeDriver 90.0.818.51 -- Mozilla Firefox 88.0 +- Microsoft Edge 91.0.864.37 +- MSEdgeDriver 91.0.864.37 +- Mozilla Firefox 88.0.1 - geckodriver 0.29.1 #### Environment variables @@ -147,36 +148,36 @@ - 3.5.10 - 3.6.13 - 3.7.10 -- 3.8.9 -- 3.9.4 +- 3.8.10 +- 3.9.5 #### PyPy -- 2.7.18 [PyPy 7.3.4] +- 2.7.18 [PyPy 7.3.5] - 3.6.12 [PyPy 7.3.3] #### Node.js - 10.24.1 - 12.22.1 -- 14.16.1 +- 14.17.0 #### Go - 1.13.15 - 1.14.15 -- 1.15.11 -- 1.16.3 +- 1.15.12 +- 1.16.4 ### Rust Tools -- Cargo 1.51.0 -- Rust 1.51.0 -- Rustdoc 1.51.0 -- Rustup 1.23.1 +- Cargo 1.52.0 +- Rust 1.52.1 +- Rustdoc 1.52.1 +- Rustup 1.24.2 #### Packages - Bindgen 0.58.1 - Cargo-audit 0.14.1 - Cargo-outdated v0.9.15 - Cbindgen 0.19.0 -- Clippy 0.1.51 +- Clippy 0.1.52 - Rustfmt 1.4.36-stable ### PowerShell Tools @@ -187,7 +188,7 @@ | ---------------- | ------- | | Az | 5.7.0 | | MarkdownPS | 1.9 | -| Pester | 5.1.1 | +| Pester | 5.2.2 | | PSScriptAnalyzer | 1.19.1 | ### Xamarin @@ -242,9 +243,9 @@ #### Xcode Support Tools - xcpretty 0.3.0 -- xcversion 2.6.8 -- Nomad CLI 3.2.16 -- Nomad CLI IPA ipa 0.14.3 +- xcversion 2.7.0 +- Nomad CLI 0.0.2 +- Nomad shenzhen CLI 0.14.3 - xctool 0.3.7 #### Installed SDKs @@ -340,13 +341,13 @@ | Package Name | Version | | -------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 4.0 | -| Android Emulator | 30.5.6 | +| Android Emulator | 30.6.5 | | Android SDK Build-tools | 30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3
26.0.0 26.0.1 26.0.2 26.0.3
25.0.0 25.0.1 25.0.2 25.0.3
24.0.0 24.0.1 24.0.2 24.0.3
23.0.1 23.0.2 23.0.3 23.0.0
22.0.1 22.0.0
21.1.2 21.0.0 21.0.1 21.0.2 21.1.0 21.1.1
20.0.0
19.1.0 19.0.0 19.0.1 19.0.2 19.0.3
18.0.1 18.1.0 18.1.1
17.0.0 | -| Android SDK Platforms | android-S (rev 3)
android-30 (rev 3)
android-29 (rev 5)
android-28 (rev 6)
android-27 (rev 3)
android-26 (rev 2)
android-25 (rev 3)
android-24 (rev 2)
android-23 (rev 3)
android-22 (rev 2)
android-21 (rev 2)
android-20 (rev 2)
android-19 (rev 4)
android-18 (rev 3)
android-17 (rev 3)
android-16 (rev 5)
android-15 (rev 5) | +| Android SDK Platforms | android-S (rev 4)
android-30 (rev 3)
android-29 (rev 5)
android-28 (rev 6)
android-27 (rev 3)
android-26 (rev 2)
android-25 (rev 3)
android-24 (rev 2)
android-23 (rev 3)
android-22 (rev 2)
android-21 (rev 2)
android-20 (rev 2)
android-19 (rev 4)
android-18 (rev 3)
android-17 (rev 3)
android-16 (rev 5)
android-15 (rev 5) | | Android SDK Platform-Tools | 31.0.2 | | Android SDK Tools | 26.1.1 | | Android Support Repository | 47.0.0 | -| CMake | 3.10.2 | +| CMake | 3.10.2
3.18.1 | | 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 | From 4d72ed1fd967ab72a486072d69319f8b0f4f0eb0 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Wed, 2 Jun 2021 13:08:05 +0300 Subject: [PATCH 0288/3485] [Windows] Refactor Msys2 installation to use toolset part 1 (#3487) * Refactor Msys2 installation to use toolset * fix indent in the toolset files * Resolve nitpicks * Remove typo (extra $) --- .../win/scripts/Installers/Install-Msys2.ps1 | 43 +++++------ images/win/toolsets/toolset-2016.json | 73 +++++++++++++++++++ images/win/toolsets/toolset-2019.json | 73 +++++++++++++++++++ images/win/windows2016.json | 3 + images/win/windows2019.json | 3 + 5 files changed, 174 insertions(+), 21 deletions(-) diff --git a/images/win/scripts/Installers/Install-Msys2.ps1 b/images/win/scripts/Installers/Install-Msys2.ps1 index bd0590ef5e92..6aded0e1f07e 100644 --- a/images/win/scripts/Installers/Install-Msys2.ps1 +++ b/images/win/scripts/Installers/Install-Msys2.ps1 @@ -52,41 +52,42 @@ Write-Host "`n$dash pacman --noconfirm -Syuu (2nd pass)" pacman.exe -Syuu --noconfirm taskkill /f /fi "MODULES eq msys-2.0.dll" +$toolsetContent = (Get-ToolsetContent).MsysPackages + Write-Host "`n$dash Install msys2 packages" -pacman.exe -S --noconfirm --needed --noprogressbar base-devel compression +$msys2Packages = $toolsetContent.msys2 +pacman.exe -S --noconfirm --needed --noprogressbar $msys2Packages taskkill /f /fi "MODULES eq msys-2.0.dll" Write-Host "`n$dash Remove p7zip/7z package due to conflicts" pacman.exe -R --noconfirm --noprogressbar p7zip -# mingw package list -# libxml2 can be removed from the list after the issue is fixed https://github.com/msys2/MINGW-packages/issues/8658 -$tools64 = "___clang ___clang-tools-extra ___cmake ___libxml2 ___llvm ___toolchain ___ragel" -$tools32 = "___clang ___cmake ___libxml2 ___llvm ___toolchain ___ragel" - -# install mingw64 packages -Write-Host "`n$dash Install mingw64 packages" -$pre = "mingw-w64-x86_64-" -pacman.exe -S --noconfirm --needed --noprogressbar $tools64.replace('___', $pre).split(' ') - -# install mingw32 packages -Write-Host "`n$dash Install mingw32 packages" -$pre = "mingw-w64-i686-" -pacman.exe -S --noconfirm --needed --noprogressbar $tools32.replace('___', $pre).split(' ') +# install mingw packages +$archs = $toolsetContent.mingw.arch +foreach ($arch in $archs) +{ + Write-Host "Installing $arch packages" + $archPackages = $toolsetContent.mingw | Where-Object { $_.arch -eq $arch } + $runtimePackages = $archPackages.runtime_packages.name | ForEach-Object { "${arch}-$_" } + $additionalPackages = $archPackages.additional_packages | ForEach-Object { "${arch}-$_" } + $packagesToInstall = $runtimePackages + $additionalPackages + Write-Host "The following packages will be installed: $packagesToInstall" + pacman.exe -S --noconfirm --needed --noprogressbar $packagesToInstall +} # clean all packages to decrease image size Write-Host "`n$dash Clean packages" pacman.exe -Scc --noconfirm -Write-Host "`n$dash Installed mingw64 packages" -pacman.exe -Q | grep ^mingw-w64-x86_64- - -Write-Host "`n$dash Installed mingw32 packages" -pacman.exe -Q | grep ^mingw-w64-i686- - Write-Host "`n$dash Installed msys2 packages" pacman.exe -Q | grep -v ^mingw-w64- +foreach ($arch in $archs) +{ + Write-Host "`n$dash Installed $arch packages" + pacman.exe -Q | grep ^${arch}- +} + Write-Host "`nMSYS2 installation completed" Invoke-PesterTests -TestFile "MSYS2" diff --git a/images/win/toolsets/toolset-2016.json b/images/win/toolsets/toolset-2016.json index 960939978408..406d85b3c460 100644 --- a/images/win/toolsets/toolset-2016.json +++ b/images/win/toolsets/toolset-2016.json @@ -173,6 +173,79 @@ "latest": "22" } }, + "MsysPackages": { + "msys2": [ + "base-devel", + "compression" + ], + "mingw": [ + { + "arch": "mingw-w64-x86_64", + "runtime_packages": [ + { + "name": "clang", + "executables": [ + "clang", + "g++", + "gcc" + ] + }, + { + "name": "cmake", + "executables": [ + "cmake", + "cpack", + "ctest" + ] + }, + { + "name": "ragel", + "executables": [ + "ragel" + ] + } + ], + "additional_packages": [ + "clang-tools-extra", + "libxml2", + "llvm", + "toolchain" + ] + }, + { + "arch": "mingw-w64-i686", + "runtime_packages": [ + { + "name": "clang", + "executables": [ + "clang", + "g++", + "gcc" + ] + }, + { + "name": "cmake", + "executables": [ + "cmake", + "cpack", + "ctest" + ] + }, + { + "name": "ragel", + "executables": [ + "ragel" + ] + } + ], + "additional_packages": [ + "libxml2", + "llvm", + "toolchain" + ] + } + ] + }, "visualStudio": { "version" : "2017", "subversion" : "15", diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index 41bdd2e13c07..4b08332a0e9f 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -173,6 +173,79 @@ "latest": "22" } }, + "MsysPackages": { + "msys2": [ + "base-devel", + "compression" + ], + "mingw": [ + { + "arch": "mingw-w64-x86_64", + "runtime_packages": [ + { + "name": "clang", + "executables": [ + "clang", + "g++", + "gcc" + ] + }, + { + "name": "cmake", + "executables": [ + "cmake", + "cpack", + "ctest" + ] + }, + { + "name": "ragel", + "executables": [ + "ragel" + ] + } + ], + "additional_packages": [ + "clang-tools-extra", + "libxml2", + "llvm", + "toolchain" + ] + }, + { + "arch": "mingw-w64-i686", + "runtime_packages": [ + { + "name": "clang", + "executables": [ + "clang", + "g++", + "gcc" + ] + }, + { + "name": "cmake", + "executables": [ + "cmake", + "cpack", + "ctest" + ] + }, + { + "name": "ragel", + "executables": [ + "ragel" + ] + } + ], + "additional_packages": [ + "libxml2", + "llvm", + "toolchain" + ] + } + ] + }, "visualStudio": { "version" : "2019", "subversion" : "16", diff --git a/images/win/windows2016.json b/images/win/windows2016.json index f6915a84ebf2..d8c427e88247 100644 --- a/images/win/windows2016.json +++ b/images/win/windows2016.json @@ -299,6 +299,9 @@ }, { "type": "powershell", + "environment_vars": [ + "TOOLSET_JSON_PATH={{user `toolset_json_path`}}" + ], "elevated_user": "SYSTEM", "elevated_password": "", "scripts": [ diff --git a/images/win/windows2019.json b/images/win/windows2019.json index 284b9bf91ff8..d10119b948cc 100644 --- a/images/win/windows2019.json +++ b/images/win/windows2019.json @@ -270,6 +270,9 @@ }, { "type": "powershell", + "environment_vars": [ + "TOOLSET_JSON_PATH={{user `toolset_json_path`}}" + ], "elevated_user": "SYSTEM", "elevated_password": "", "scripts": [ From 2823a3cb6a62cc74961527bdf7623b4b9afb4107 Mon Sep 17 00:00:00 2001 From: Alena Sviridenko Date: Wed, 2 Jun 2021 13:16:51 +0300 Subject: [PATCH 0289/3485] Add macOS 11 onboarding guide (#3449) * Added guide on macOS 11 onboarding * Updated formatting and phrases * Updated onboarding page * Fixed wording * Fixed typos Co-authored-by: ahdbilal <55514721+ahdbilal@users.noreply.github.com> Co-authored-by: Maxim Lobanov * Updated wording and notes * Removed extra space * Fixed new lines * Fixed wording Co-authored-by: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> * Fixed note * Minor wording update Co-authored-by: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> * Fixed note * Fixed typo Co-authored-by: ahdbilal <55514721+ahdbilal@users.noreply.github.com> Co-authored-by: Maxim Lobanov Co-authored-by: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> --- README.md | 12 +++++------- docs/macos-11-onboarding.md | 25 +++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 7 deletions(-) create mode 100644 docs/macos-11-onboarding.md diff --git a/README.md b/README.md index 90868486b574..07bec705fef8 100644 --- a/README.md +++ b/README.md @@ -17,14 +17,12 @@ For general questions about using the virtual environments or writing your Actio | Windows Server 2019 | `windows-latest` or `windows-2019` | [windows-2019] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=windows-2019&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=windows-2019&redirect=1) | Windows Server 2016 | `windows-2016` | [windows-2016] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=windows-2016&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=windows-2016&redirect=1) ``` -The macOS 11 virtual environment is currently provided as a private preview only. -The "macos-latest" YAML workflow label still uses the macOS 10.15 virtual environment. +Ubuntu 16.04 has been deprecated and will be removed on September 20, 2021. +Existing workflows using `Ubuntu 16.04` should migrate to `Ubuntu 20.04` or `Ubuntu 18.04` ``` -``` -Ubuntu 16.04 is being deprecated. It is not recommended for new users. -If any of your workflows use Ubuntu 16.04, migrate to Ubuntu 20.04 or 18.04. -``` +> The macOS 11 virtual environment is currently in preview, and is automatically available to existing Enterprise plan customers. New Enterprise plan customers, or customers on other plans, should fill the form to request access to macOS 11 virtual environment. Please view our [Big Sur guide](./docs/macos-11-onboarding.md) for more details.
+The `macos-latest` YAML workflow label still uses the macOS 10.15 virtual environment. ***What images are available for GitHub Actions and Azure DevOps?*** The availability of images for GitHub Actions and Azure DevOps is different. See documentation for more details: @@ -62,4 +60,4 @@ You can also track upcoming changes using the [awaiting-deployment](https://gith [self-hosted runners]: https://help.github.com/en/actions/hosting-your-own-runners ## Software and image guidelines -To learn more about tools and images support policy, see the [guidelines](./docs/software-and-images-guidelines.md). \ No newline at end of file +To learn more about tools and images support policy, see the [guidelines](./docs/software-and-images-guidelines.md). diff --git a/docs/macos-11-onboarding.md b/docs/macos-11-onboarding.md new file mode 100644 index 000000000000..f4e11a81cf87 --- /dev/null +++ b/docs/macos-11-onboarding.md @@ -0,0 +1,25 @@ +# macOS 11 (Big Sur) onboarding guide + +macOS 11 pools were opened to existing customers only, and we are working on making them ready for production use, rebalancing capacity, and analyzing possible load. + +Meanwhile, we'd like to start including customers to private preview on demand. + +> Big Sur will automatically become available to existing Enterprise customers. New enterprises and customers on other plans, please go through the sign up process described below. + +## Sign up process + +If you need to build and test your project with macOS 11, please, fill out the [form](https://forms.office.com/r/Pn0a7NqBXg). + +We will review the incoming requests periodically and open macOS 11 pool for some amount of them. These are the aspects we consider when processing requests: +- _Pool capacity_. New onboardings are only possible if current performance won't degrade for existing customers. +- _Billing plan_. New Enterprise or Teams customers will be given a priority in joining macOS 11. +- _Necessity of macOS 11_. We can currently afford to add only those projects that really depend on the latest macOS version and its features. + +## Usage + +macOS 11 image label was changed to `macos-11` to avoid confusion with the minor version. We always update images to the latest available OS version. Use the following code snippet to run your builds on macOS Big Sur: +``` +jobs: + build: + runs-on: macos-11 +``` From fa8469a2cd2fec7f176b3f3fae3f0860ed7528c5 Mon Sep 17 00:00:00 2001 From: Javier de la Morena <66418483+fdelamor@users.noreply.github.com> Date: Thu, 3 Jun 2021 08:37:12 +0200 Subject: [PATCH 0290/3485] [ubuntu] Update ORAS URL (#3516) --- images/linux/scripts/installers/oras-cli.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/linux/scripts/installers/oras-cli.sh b/images/linux/scripts/installers/oras-cli.sh index 37b335594e7f..5f96e334f7a2 100644 --- a/images/linux/scripts/installers/oras-cli.sh +++ b/images/linux/scripts/installers/oras-cli.sh @@ -7,8 +7,8 @@ source $HELPER_SCRIPTS/install.sh # Determine latest ORAS CLI version -ORAS_CLI_LATEST_VERSION_URL=https://api.github.com/repos/deislabs/oras/releases/latest -ORAS_CLI_DOWNLOAD_URL=$(curl -s $ORAS_CLI_LATEST_VERSION_URL | jq -r '.assets[].browser_download_url | select(endswith("linux_amd64.tar.gz"))') +ORAS_CLI_LATEST_VERSION_URL=https://api.github.com/repos/oras-project/oras/releases/latest +ORAS_CLI_DOWNLOAD_URL=$(curl -sfL $ORAS_CLI_LATEST_VERSION_URL | jq -r '.assets[].browser_download_url | select(endswith("linux_amd64.tar.gz"))') ORAS_CLI_ARCHIVE=$(basename $ORAS_CLI_DOWNLOAD_URL) # Install ORAS CLI From 1691aca84310d434171a58c18529ec2a114fa0d8 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 3 Jun 2021 07:46:46 +0000 Subject: [PATCH 0291/3485] Updating readme file for ubuntu18 version 20210531.0 (#3491) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/linux/Ubuntu1804-README.md | 67 ++++++++++++++++--------------- 1 file changed, 34 insertions(+), 33 deletions(-) diff --git a/images/linux/Ubuntu1804-README.md b/images/linux/Ubuntu1804-README.md index f477e7ebfacc..066573d04d27 100644 --- a/images/linux/Ubuntu1804-README.md +++ b/images/linux/Ubuntu1804-README.md @@ -1,11 +1,12 @@ | Announcements | |-| +| [[ubuntu] GCC and Gfortran 11 will be removed on May, 31](https://github.com/actions/virtual-environments/issues/3467) | | [[Ubuntu] .NET SDK pre-installation policy will be changed on June 14](https://github.com/actions/virtual-environments/issues/3338) | | [Ubuntu 16.04 environment will be removed on September 20, 2021](https://github.com/actions/virtual-environments/issues/3287) | *** # Ubuntu 18.04.5 LTS - Linux kernel version: 5.4.0-1047-azure -- Image Version: 20210524.1 +- Image Version: 20210531.0 ## Installed Software ### Language and Runtime @@ -13,8 +14,8 @@ - Clang 9.0.0 - Clang-format 9.0.0 - Erlang 24.0.1 (Eshell 12.0.1) -- GNU C++ 7.5.0, 9.3.0, 10.3.0, 11.1.0 -- GNU Fortran 7.5.0, 9.3.0, 10.3.0, 11.1.0 +- GNU C++ 7.5.0, 9.3.0, 10.3.0 +- GNU Fortran 7.5.0, 9.3.0, 10.3.0 - Julia 1.6.1 - Mono 6.12.0.122 (apt source repository: https://download.mono-project.com/repo/ubuntu stable-bionic main) - MSBuild 16.6.0.15201 (from /usr/lib/mono/msbuild/15.0/bin/MSBuild.dll) @@ -23,19 +24,19 @@ - Python 2.7.17 - Python3 3.6.9 - Ruby 2.5.1p57 -- Swift 5.4 +- Swift 5.4.1 ### Package Management - cpan 1.64 -- Helm 3.5.4 +- Helm 3.6.0 - Homebrew 3.1.9 - Miniconda 4.9.2 - Npm 6.14.13 - Pip 9.0.1 - Pip3 9.0.1 -- Pipx 0.16.2.1 +- Pipx 0.16.3 - RubyGems 2.7.6 -- Vcpkg (build from master \) +- Vcpkg (build from master \<7bc5b8c>) - Yarn 1.22.10 #### Environment variables @@ -51,13 +52,13 @@ - Sbt 1.5.2 ### Tools -- Ansible 2.10.9 +- Ansible 2.10.10 - apt-fast 1.9.11 - AzCopy 10.10.0 (available by `azcopy` and `azcopy10` aliases) - Bazel 4.1.0 - Bazelisk 1.9.0 - Buildah 1.19.6 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- CMake 3.20.2 +- CMake 3.20.3 - CodeQL Action Bundle 2.5.5 - Docker Compose 1.29.2 - Docker-Buildx 0.5.1 @@ -68,9 +69,9 @@ - Git-ftp 1.3.1 - Haveged 1.9.1 - Heroku 7.54.0 -- HHVM (HipHop VM) 4.110.0 +- HHVM (HipHop VM) 4.111.0 - jq 1.5 -- Kind 0.11.0 +- Kind 0.11.1 - Kubectl 1.20.1-5-g76a04fc - Kustomize 4.1.3 - Leiningen 2.9.6 @@ -83,7 +84,7 @@ - Packer 1.7.2 - PhantomJS 2.1.1 - Podman 3.0.1 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- Pulumi 3.3.0 +- Pulumi 3.3.1 - R 4.1.0 - Skopeo 1.2.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 @@ -93,19 +94,19 @@ - zstd 1.5.0 (homebrew) ### CLI Tools -- Alibaba Cloud CLI 3.0.74 -- AWS CLI 1.19.78 +- Alibaba Cloud CLI 3.0.77 +- AWS CLI 1.19.84 - AWS CLI Session manager plugin 1.2.54.0 - AWS SAM CLI 1.23.0 -- Azure CLI (azure-cli) 2.23.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) +- Azure CLI (azure-cli) 2.24.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.18.0 - GitHub CLI 1.10.3 -- Google Cloud SDK 341.0.0 (apt source repository: https://packages.cloud.google.com/apt) +- Google Cloud SDK 342.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 3.30.4 -- OpenShift CLI 4.7.11 +- Netlify CLI 3.32.5 +- OpenShift CLI 4.7.12 - ORAS CLI 0.11.1 -- Vercel CLI 22.0.1 +- Vercel CLI 23.0.0 ### Java | Version | Vendor | Environment Variable | @@ -142,11 +143,11 @@ - Rustfmt 1.4.36 ### Browsers and Drivers -- Google Chrome 90.0.4430.212 -- ChromeDriver 90.0.4430.24 +- Google Chrome 91.0.4472.77 +- ChromeDriver 91.0.4472.19 - Mozilla Firefox 88.0.1 - Geckodriver 0.29.1 -- Chromium 90.0.4430.0 +- Chromium 91.0.4472.0 #### Environment variables | Name | Value | @@ -155,7 +156,7 @@ | GECKOWEBDRIVER | /usr/local/share/gecko_driver | ### .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.519 2.1.520 2.1.521 2.1.522 2.1.523 2.1.524 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.616 2.1.617 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 2.1.811 2.1.812 2.1.813 2.1.814 2.1.815 2.1.816 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.109 3.1.110 3.1.111 3.1.112 3.1.113 3.1.114 3.1.115 3.1.200 3.1.201 3.1.202 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 3.1.408 3.1.409 5.0.100 5.0.101 5.0.102 5.0.103 5.0.104 5.0.200 5.0.201 5.0.202 5.0.203 +- 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.519 2.1.520 2.1.521 2.1.522 2.1.523 2.1.524 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.616 2.1.617 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 2.1.811 2.1.812 2.1.813 2.1.814 2.1.815 2.1.816 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.109 3.1.110 3.1.111 3.1.112 3.1.113 3.1.114 3.1.115 3.1.200 3.1.201 3.1.202 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 3.1.408 3.1.409 5.0.100 5.0.101 5.0.102 5.0.103 5.0.104 5.0.200 5.0.201 5.0.202 5.0.203 5.0.300 ### Databases - MongoDB 4.4.6 (apt source repository: https://repo.mongodb.org/apt/ubuntu) @@ -216,7 +217,7 @@ | Module | Version | | ---------- | ------- | | MarkdownPS | 1.9 | -| Pester | 5.2.1 | +| Pester | 5.2.2 | #### Az PowerShell Modules - 5.7.0 3.1.0.zip 4.4.0.zip @@ -257,19 +258,19 @@ | alpine:3.11 | sha256:18a918a714d1368847b67173d120ebd110fcfae208305412f3005a61cdc7c20e | 2021-04-14 | | alpine:3.12 | sha256:36553b10a4947067b9fbb7d532951066293a68eae893beba1d9235f7d11a20ad | 2021-04-14 | | alpine:3.13 | sha256:69e70a79f2d41ab5d637de98c1e0b055206ba40a8145e7bddb55ccc04e13cf8f | 2021-04-14 | -| buildpack-deps:buster | sha256:28200c7265b185cbceb55ec2d14b5b303d503aeb4dcf6c456e4a66029400a4eb | 2021-05-12 | -| buildpack-deps:stretch | sha256:a84d08cb47515db24a1228de35a909ba782bc2b9ac66b986f566c9dd973ecc24 | 2021-05-12 | +| buildpack-deps:buster | sha256:b4ba9e547bb2e4f48186b234a816ec0182c86fda31f4de5c1eeb824a5d3330df | 2021-05-12 | +| buildpack-deps:stretch | sha256:fe5d31963e568ba5c418ad26c7c1391ddeedd801672236f081fc3e1e2950e27b | 2021-05-12 | | debian:10 | sha256:acf7795dc91df17e10effee064bd229580a9c34213b4dba578d64768af5d8c51 | 2021-05-12 | | debian:9 | sha256:4f8deed5755299e2d7ae1f5649656de89a6b7e30c0be37a3a1b4a49f0af51f7e | 2021-05-12 | | node:10 | sha256:59531d2835edd5161c8f9512f9e095b1836f7a1fcb0ab73e005ec46047384911 | 2021-04-10 | | node:10-alpine | sha256:dc98dac24efd4254f75976c40bce46944697a110d06ce7fa47e7268470cf2e28 | 2021-04-14 | -| node:12 | sha256:e38a48c584fde720a43b1bacfea1178e0900936cb8d0141630e5e35693ee6d08 | 2021-05-12 | -| node:12-alpine | sha256:9923c9efb13cf7535f67e49b03010f0977a800068e4c8e0e2c93433a6bfa1e77 | 2021-04-14 | -| node:14 | sha256:9025a77b2f37fcda3bbd367587367a9f2251d16a756ed544550b8a571e16a653 | 2021-05-13 | -| node:14-alpine | sha256:3689ad4435a413342ccc352170ad0f77433b41173af7fe4c0076f0c9792642cb | 2021-05-13 | -| ubuntu:16.04 | sha256:98afb2808ee1ec6aa4d7c8f8b82c6347b9ae156932f7186182b997f3d5616ebe | 2021-05-19 | -| ubuntu:18.04 | sha256:04919776d30640ce4ed24442d5f7c1a8e4bd0e4793ed9469843cedaecb0d72fb | 2021-05-19 | -| ubuntu:20.04 | sha256:cf31af331f38d1d7158470e095b132acd126a7180a54f263d386da88eb681d93 | 2021-04-23 | +| node:12 | sha256:0d6b3522991d04ead0b119feaffafa6a8cd1b374218e9f997a1d4753b7064882 | 2021-05-12 | +| node:12-alpine | sha256:9a372efac4c436dfb6dbdea42f08d3ea60a0103a1df54a7da247e4bed1b327f7 | 2021-04-14 | +| node:14 | sha256:af9879e7473d347048c5d5919aa9775f27c33d92e4d58058ffdc08247f4bd902 | 2021-05-13 | +| node:14-alpine | sha256:f07ead757c93bc5e9e79978075217851d45a5d8e5c48eaf823e7f12d9bbc1d3c | 2021-05-13 | +| ubuntu:16.04 | sha256:9775877f420d453ef790e6832d77630a49b32a92b7bedf330adf4d8669f6600e | 2021-05-19 | +| ubuntu:18.04 | sha256:67b730ece0d34429b455c08124ffd444f021b81e06fa2d9cd0adaf0d0b875182 | 2021-05-19 | +| ubuntu:20.04 | sha256:adf73ca014822ad8237623d388cedf4d5346aa72c270c5acc01431cc93e18e2d | 2021-04-23 | ### Installed apt packages | Name | Version | From a5065df015926ceacc3aef29adde749e50a4fba7 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 3 Jun 2021 09:09:06 +0000 Subject: [PATCH 0292/3485] Updating readme file for ubuntu20 version 20210531.0 (#3492) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/linux/Ubuntu2004-README.md | 71 ++++++++++++++++--------------- 1 file changed, 36 insertions(+), 35 deletions(-) diff --git a/images/linux/Ubuntu2004-README.md b/images/linux/Ubuntu2004-README.md index 12e3fd0f6871..21b6e5ba995e 100644 --- a/images/linux/Ubuntu2004-README.md +++ b/images/linux/Ubuntu2004-README.md @@ -1,11 +1,12 @@ | Announcements | |-| +| [[ubuntu] GCC and Gfortran 11 will be removed on May, 31](https://github.com/actions/virtual-environments/issues/3467) | | [[Ubuntu] .NET SDK pre-installation policy will be changed on June 14](https://github.com/actions/virtual-environments/issues/3338) | | [Ubuntu 16.04 environment will be removed on September 20, 2021](https://github.com/actions/virtual-environments/issues/3287) | *** # Ubuntu 20.04.2 LTS - Linux kernel version: 5.4.0-1047-azure -- Image Version: 20210524.1 +- Image Version: 20210531.0 ## Installed Software ### Language and Runtime @@ -13,8 +14,8 @@ - Clang 10.0.0, 11.0.0, 12.0.1 - Clang-format 10.0.0, 11.0.0, 12.0.1 - Erlang 24.0.1 (Eshell 12.0.1) -- GNU C++ 9.3.0, 10.2.0, 11.1.0 -- GNU Fortran 9.3.0, 10.2.0, 11.1.0 +- GNU C++ 9.3.0, 10.2.0 +- GNU Fortran 9.3.0, 10.2.0 - Julia 1.6.1 - Mono 6.12.0.122 (apt source repository: https://download.mono-project.com/repo/ubuntu stable-focal main) - MSBuild 16.6.0.15201 (from /usr/lib/mono/msbuild/15.0/bin/MSBuild.dll) @@ -23,19 +24,19 @@ - Python 3.8.5 - Python3 3.8.5 - Ruby 2.7.0p0 -- Swift 5.4 +- Swift 5.4.1 ### Package Management - cpan 1.64 -- Helm 3.5.4 +- Helm 3.6.0 - Homebrew 3.1.9 - Miniconda 4.9.2 - Npm 6.14.13 - Pip 20.0.2 - Pip3 20.0.2 -- Pipx 0.16.2.1 +- Pipx 0.16.3 - RubyGems 3.1.2 -- Vcpkg (build from master \) +- Vcpkg (build from master \<7bc5b8c>) - Yarn 1.22.10 #### Environment variables @@ -52,27 +53,27 @@ - Sbt 1.5.2 ### Tools -- Ansible 2.10.9 +- Ansible 2.10.10 - apt-fast 1.9.11 - AzCopy 10.10.0 (available by `azcopy` and `azcopy10` aliases) - Bazel 4.1.0 - Bazelisk 1.9.0 - Buildah 1.21.0 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- CMake 3.20.2 +- CMake 3.20.3 - CodeQL Action Bundle 2.5.5 - Docker Compose 1.29.2 - Docker-Buildx 0.5.1 - Docker-Moby Client 20.10.6+azure - Docker-Moby Server 20.10.6+azure -- Fastlane 2.184.0 +- Fastlane 2.184.1 - Git 2.31.1 (apt source repository: ppa:git-core/ppa) - Git LFS 2.13.3 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.6.0 - Haveged 1.9.1 - Heroku 7.54.0 -- HHVM (HipHop VM) 4.110.0 +- HHVM (HipHop VM) 4.111.0 - jq 1.6 -- Kind 0.11.0 +- Kind 0.11.1 - Kubectl 1.20.1-5-g76a04fc - Kustomize 4.1.3 - Leiningen 2.9.6 @@ -85,7 +86,7 @@ - Packer 1.7.2 - PhantomJS 2.1.1 - Podman 3.1.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- Pulumi 3.3.0 +- Pulumi 3.3.1 - R 4.1.0 - Skopeo 1.2.3 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 @@ -95,19 +96,19 @@ - zstd 1.5.0 (homebrew) ### CLI Tools -- Alibaba Cloud CLI 3.0.74 -- AWS CLI 2.2.5 +- Alibaba Cloud CLI 3.0.77 +- AWS CLI 2.2.7 - AWS CLI Session manager plugin 1.2.54.0 - AWS SAM CLI 1.23.0 -- Azure CLI (azure-cli) 2.23.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) +- Azure CLI (azure-cli) 2.24.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.18.0 - GitHub CLI 1.10.3 -- Google Cloud SDK 341.0.0 (apt source repository: https://packages.cloud.google.com/apt) +- Google Cloud SDK 342.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 3.30.4 -- OpenShift CLI 4.7.11 +- Netlify CLI 3.32.5 +- OpenShift CLI 4.7.12 - ORAS CLI 0.11.1 -- Vercel CLI 22.0.1 +- Vercel CLI 23.0.0 ### Java | Version | Vendor | Environment Variable | @@ -148,11 +149,11 @@ - Rustfmt 1.4.36 ### Browsers and Drivers -- Google Chrome 90.0.4430.212 -- ChromeDriver 90.0.4430.24 +- Google Chrome 91.0.4472.77 +- ChromeDriver 91.0.4472.19 - Mozilla Firefox 88.0.1 - Geckodriver 0.29.1 -- Chromium 90.0.4430.0 +- Chromium 91.0.4472.0 #### Environment variables | Name | Value | @@ -161,7 +162,7 @@ | GECKOWEBDRIVER | /usr/local/share/gecko_driver | ### .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.519 2.1.520 2.1.521 2.1.522 2.1.523 2.1.524 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.616 2.1.617 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 2.1.811 2.1.812 2.1.813 2.1.814 2.1.815 2.1.816 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.109 3.1.110 3.1.111 3.1.112 3.1.113 3.1.114 3.1.115 3.1.200 3.1.201 3.1.202 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 3.1.408 3.1.409 5.0.100 5.0.101 5.0.102 5.0.103 5.0.104 5.0.200 5.0.201 5.0.202 5.0.203 +- 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.519 2.1.520 2.1.521 2.1.522 2.1.523 2.1.524 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.616 2.1.617 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 2.1.811 2.1.812 2.1.813 2.1.814 2.1.815 2.1.816 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.109 3.1.110 3.1.111 3.1.112 3.1.113 3.1.114 3.1.115 3.1.200 3.1.201 3.1.202 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 3.1.408 3.1.409 5.0.100 5.0.101 5.0.102 5.0.103 5.0.104 5.0.200 5.0.201 5.0.202 5.0.203 5.0.300 ### Databases - MongoDB 4.4.6 (apt source repository: https://repo.mongodb.org/apt/ubuntu) @@ -222,7 +223,7 @@ | Module | Version | | ---------------- | ------- | | MarkdownPS | 1.9 | -| Pester | 5.2.1 | +| Pester | 5.2.2 | | PSScriptAnalyzer | 1.19.1 | #### Az PowerShell Modules @@ -265,19 +266,19 @@ | alpine:3.11 | sha256:18a918a714d1368847b67173d120ebd110fcfae208305412f3005a61cdc7c20e | 2021-04-14 | | alpine:3.12 | sha256:36553b10a4947067b9fbb7d532951066293a68eae893beba1d9235f7d11a20ad | 2021-04-14 | | alpine:3.13 | sha256:69e70a79f2d41ab5d637de98c1e0b055206ba40a8145e7bddb55ccc04e13cf8f | 2021-04-14 | -| buildpack-deps:buster | sha256:28200c7265b185cbceb55ec2d14b5b303d503aeb4dcf6c456e4a66029400a4eb | 2021-05-12 | -| buildpack-deps:stretch | sha256:a84d08cb47515db24a1228de35a909ba782bc2b9ac66b986f566c9dd973ecc24 | 2021-05-12 | +| buildpack-deps:buster | sha256:b4ba9e547bb2e4f48186b234a816ec0182c86fda31f4de5c1eeb824a5d3330df | 2021-05-12 | +| buildpack-deps:stretch | sha256:fe5d31963e568ba5c418ad26c7c1391ddeedd801672236f081fc3e1e2950e27b | 2021-05-12 | | debian:10 | sha256:acf7795dc91df17e10effee064bd229580a9c34213b4dba578d64768af5d8c51 | 2021-05-12 | | debian:9 | sha256:4f8deed5755299e2d7ae1f5649656de89a6b7e30c0be37a3a1b4a49f0af51f7e | 2021-05-12 | | node:10 | sha256:59531d2835edd5161c8f9512f9e095b1836f7a1fcb0ab73e005ec46047384911 | 2021-04-10 | | node:10-alpine | sha256:dc98dac24efd4254f75976c40bce46944697a110d06ce7fa47e7268470cf2e28 | 2021-04-14 | -| node:12 | sha256:e38a48c584fde720a43b1bacfea1178e0900936cb8d0141630e5e35693ee6d08 | 2021-05-12 | -| node:12-alpine | sha256:9923c9efb13cf7535f67e49b03010f0977a800068e4c8e0e2c93433a6bfa1e77 | 2021-04-14 | -| node:14 | sha256:9025a77b2f37fcda3bbd367587367a9f2251d16a756ed544550b8a571e16a653 | 2021-05-13 | -| node:14-alpine | sha256:3689ad4435a413342ccc352170ad0f77433b41173af7fe4c0076f0c9792642cb | 2021-05-13 | -| ubuntu:16.04 | sha256:98afb2808ee1ec6aa4d7c8f8b82c6347b9ae156932f7186182b997f3d5616ebe | 2021-05-19 | -| ubuntu:18.04 | sha256:04919776d30640ce4ed24442d5f7c1a8e4bd0e4793ed9469843cedaecb0d72fb | 2021-05-19 | -| ubuntu:20.04 | sha256:cf31af331f38d1d7158470e095b132acd126a7180a54f263d386da88eb681d93 | 2021-04-23 | +| node:12 | sha256:0d6b3522991d04ead0b119feaffafa6a8cd1b374218e9f997a1d4753b7064882 | 2021-05-12 | +| node:12-alpine | sha256:9a372efac4c436dfb6dbdea42f08d3ea60a0103a1df54a7da247e4bed1b327f7 | 2021-04-14 | +| node:14 | sha256:af9879e7473d347048c5d5919aa9775f27c33d92e4d58058ffdc08247f4bd902 | 2021-05-13 | +| node:14-alpine | sha256:f07ead757c93bc5e9e79978075217851d45a5d8e5c48eaf823e7f12d9bbc1d3c | 2021-05-13 | +| ubuntu:16.04 | sha256:9775877f420d453ef790e6832d77630a49b32a92b7bedf330adf4d8669f6600e | 2021-05-19 | +| ubuntu:18.04 | sha256:67b730ece0d34429b455c08124ffd444f021b81e06fa2d9cd0adaf0d0b875182 | 2021-05-19 | +| ubuntu:20.04 | sha256:adf73ca014822ad8237623d388cedf4d5346aa72c270c5acc01431cc93e18e2d | 2021-04-23 | ### Installed apt packages | Name | Version | @@ -296,7 +297,7 @@ | fakeroot | 1.24-1 | | file | 1:5.38-4 | | flex | 2.6.4-6.2 | -| fonts-noto-color-emoji | 0~20200408-1 | +| fonts-noto-color-emoji | 0~20200916-1~ubuntu20.04.1 | | ftp | 0.17-34.1 | | gnupg2 | 2.2.19-3ubuntu2.1 | | haveged | 1.9.1-6ubuntu1 | From 7d7bce18755a7bdfa20febd1ab91a2e56c2436b9 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 3 Jun 2021 11:23:21 +0000 Subject: [PATCH 0293/3485] Updating readme file for macOS-10.15 version 20210531.1 (#3497) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/macos/macos-10.15-Readme.md | 50 ++++++++++++++---------------- 1 file changed, 24 insertions(+), 26 deletions(-) diff --git a/images/macos/macos-10.15-Readme.md b/images/macos/macos-10.15-Readme.md index 5d0110b60515..8f88ce2e25e4 100644 --- a/images/macos/macos-10.15-Readme.md +++ b/images/macos/macos-10.15-Readme.md @@ -6,22 +6,20 @@ # macOS 10.15 info - System Version: macOS 10.15.7 (19H1217) - Kernel Version: Darwin 19.6.0 -- Image Version: 20210525.2 +- Image Version: 20210531.1 ## Installed Software ### Language and Runtime -- .NET SDK 2.1.300 2.1.301 2.1.302 2.1.401 2.1.402 2.1.403 2.1.500 2.1.502 2.1.503 2.1.504 2.1.505 2.1.506 2.1.507 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 2.1.811 2.1.812 2.1.813 2.1.814 2.1.815 2.1.816 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 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 3.1.408 3.1.409 5.0.100 5.0.101 5.0.102 5.0.200 5.0.201 5.0.202 5.0.203 +- .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 2.1.811 2.1.812 2.1.813 2.1.814 2.1.815 2.1.816 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 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 3.1.408 3.1.409 5.0.100 5.0.101 5.0.102 5.0.200 5.0.201 5.0.202 5.0.300 - Bash 3.2.57(1)-release - Clang/LLVM 12.0.0 is available on `'$(brew --prefix llvm)/bin/clang'` - Clang/LLVM 12.0.0 is default -- gcc-8 (Homebrew GCC 8.5.0) 8.5.0 - available by `gcc-8` alias - gcc-9 (Homebrew GCC 9.3.0_2) 9.3.0 - available by `gcc-9` alias - gcc-10 (Homebrew GCC 10.3.0) 10.3.0 - available by `gcc-10` alias -- gcc-11 (Homebrew GCC 11.1.0) 11.1.0 - available by `gcc-11` alias -- GNU Fortran (Homebrew GCC 8.5.0) 8.5.0 - available by `gfortran-8` alias +- gcc-11 (Homebrew GCC 11.1.0_1) 11.1.0 - available by `gcc-11` alias - GNU Fortran (Homebrew GCC 9.3.0_2) 9.3.0 - available by `gfortran-9` alias - GNU Fortran (Homebrew GCC 10.3.0) 10.3.0 - available by `gfortran-10` alias -- GNU Fortran (Homebrew GCC 11.1.0) 11.1.0 - available by `gfortran-11` alias +- GNU Fortran (Homebrew GCC 11.1.0_1) 11.1.0 - available by `gfortran-11` alias - Go 1.15.12 - julia 1.6.1 - MSBuild 16.6.0.15801 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) @@ -36,7 +34,7 @@ - Ruby 2.7.3p183 ### Package Management -- Bundler version 2.2.17 +- Bundler version 2.2.19 - Carthage 0.38.0 - CocoaPods 1.10.1 - Composer 2.0.14 @@ -46,9 +44,9 @@ - NuGet 5.6.0.6489 - Pip 20.3.4 (python 2.7) - Pip 21.1.1 (python 3.9) -- Pipx 0.16.2.1 -- RubyGems 3.2.17 -- Vcpkg 2021 (build from master \<7c55eca>) +- Pipx 0.16.3 +- RubyGems 3.2.19 +- Vcpkg 2021 (build from master \<7bc5b8c>) - Yarn 1.22.5 #### Environment variables @@ -69,7 +67,7 @@ - bazel 4.1.0 - bazelisk 1.9.0 - bsdtar 3.3.2 - available by 'tar' alias -- Curl 7.76.1 +- Curl 7.77.0 - Git LFS: 2.13.3 - Git: 2.31.1 - GitHub CLI: 1.10.3 @@ -77,7 +75,7 @@ - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.1 - gpg (GnuPG) 2.3.1 -- helm v3.5.4+g1b5edb6 +- helm v3.6.0+g7f2df64 - Hub CLI: 2.14.2 - jq 1.6 - mongo v4.4.5 @@ -94,19 +92,19 @@ ### Tools -- Aliyun CLI 3.0.74 +- Aliyun CLI 3.0.77 - App Center CLI 2.9.0 -- AWS CLI 2.2.5 +- AWS CLI 2.2.7 - AWS SAM CLI 1.23.0 - AWS Session Manager CLI 1.2.54.0 -- Azure CLI 2.23.0 +- Azure CLI 2.24.0 - Cabal 3.4.0.0 -- Cmake 3.20.2 -- Fastlane 2.183.2 +- Cmake 3.20.3 +- Fastlane 2.184.1 - GHC 9.0.1 - GHCup v0.1.14.1 - Stack 2.7.1 -- SwiftFormat 0.48.3 +- SwiftFormat 0.48.4 - Xcode Command Line Tools 12.4.0.0.1.1610135815 ### Linters @@ -116,10 +114,10 @@ ### Browsers - Safari 14.1.1 (15611.2.7.1.6) - SafariDriver 14.1.1 (15611.2.7.1.6) -- Google Chrome 90.0.4430.212 +- Google Chrome 91.0.4472.77 - ChromeDriver 90.0.4430.24 -- Microsoft Edge 90.0.818.66 -- MSEdgeDriver 90.0.818.66 +- Microsoft Edge 91.0.864.37 +- MSEdgeDriver 91.0.864.37 - Mozilla Firefox 88.0.1 - geckodriver 0.29.1 @@ -193,14 +191,14 @@ | ---------------- | ------- | | Az | 5.7.0 | | MarkdownPS | 1.9 | -| Pester | 5.2.1 | +| Pester | 5.2.2 | | PSScriptAnalyzer | 1.19.1 | ### Web Servers | Name | Version | ConfigFile | ServiceStatus | ListenPort | | ----- | ------- | ------------------------------- | ------------- | ---------- | -| httpd | 2.4.47 | /usr/local/etc/httpd/httpd.conf | stopped | 80 | -| nginx | 1.19.10 | /usr/local/etc/nginx/nginx.conf | stopped | 80 | +| httpd | 2.4.48 | /usr/local/etc/httpd/httpd.conf | stopped | 80 | +| nginx | 1.21.0 | /usr/local/etc/nginx/nginx.conf | stopped | 80 | ### Xamarin #### Visual Studio for Mac @@ -249,8 +247,8 @@ #### Xcode Support Tools - xcpretty 0.3.0 - xcversion 2.7.0 -- Nomad CLI 3.2.17 -- Nomad CLI IPA ipa 0.14.3 +- Nomad CLI 0.0.2 +- Nomad shenzhen CLI 0.14.3 - xctool 0.3.7 #### Installed SDKs From 59ca08e5bff217f96692374904ea5fbd229d41e6 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Thu, 3 Jun 2021 14:38:17 +0300 Subject: [PATCH 0294/3485] [macOS] Fix default java postfix in the software readme (#3518) --- images/macos/software-report/SoftwareReport.Java.psm1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/macos/software-report/SoftwareReport.Java.psm1 b/images/macos/software-report/SoftwareReport.Java.psm1 index b0d73b792be5..97f81c213a4a 100644 --- a/images/macos/software-report/SoftwareReport.Java.psm1 +++ b/images/macos/software-report/SoftwareReport.Java.psm1 @@ -1,5 +1,5 @@ function Get-JavaVersions { - $defaultJavaPath = Get-Item env:JAVA_HOME + $defaultJavaPath = (Get-Item env:JAVA_HOME).value $javaVersions = Get-Item env:JAVA_HOME_*_X64 $sortRules = @{ Expression = { [Int32]$_.Name.Split("_")[2] } From 5d24b559f9333022274054e2237cab0a9760eacd Mon Sep 17 00:00:00 2001 From: Dmitry Shibanov Date: Thu, 3 Jun 2021 16:28:12 +0300 Subject: [PATCH 0295/3485] [Windows] Add note about Conda (#3513) * add note about Conda * added a note in the same string * move note to Get-CondaVersion function --- images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 index 91050716966e..d8a6c103279e 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 @@ -140,7 +140,7 @@ function Get-PipVersion { function Get-CondaVersion { $condaVersion = & "$env:CONDA\Scripts\conda.exe" --version - return "Mini$condaVersion" + return "Mini$condaVersion (pre-installed on the image but not added to PATH)" } function Get-ComposerVersion { From 70582d170c511d81feb135457b90375180fd264a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 3 Jun 2021 13:30:22 +0000 Subject: [PATCH 0296/3485] Updating readme file for ubuntu16 version 20210531.0 (#3490) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/linux/Ubuntu1604-README.md | 59 ++++++++++++++++--------------- 1 file changed, 30 insertions(+), 29 deletions(-) diff --git a/images/linux/Ubuntu1604-README.md b/images/linux/Ubuntu1604-README.md index 0551f045178c..362792094c9d 100644 --- a/images/linux/Ubuntu1604-README.md +++ b/images/linux/Ubuntu1604-README.md @@ -1,11 +1,12 @@ | Announcements | |-| +| [[ubuntu] GCC and Gfortran 11 will be removed on May, 31](https://github.com/actions/virtual-environments/issues/3467) | | [[Ubuntu] .NET SDK pre-installation policy will be changed on June 14](https://github.com/actions/virtual-environments/issues/3338) | | [Ubuntu 16.04 environment will be removed on September 20, 2021](https://github.com/actions/virtual-environments/issues/3287) | *** # Ubuntu 16.04.7 LTS - Linux kernel version: 4.15.0-1113-azure -- Image Version: 20210524.1 +- Image Version: 20210531.0 ## Installed Software ### Language and Runtime @@ -23,18 +24,18 @@ - Python 2.7.12 - Python3 3.5.2 - Ruby 2.3.1p112 -- Swift 5.4 +- Swift 5.4.1 ### Package Management - cpan 1.61 -- Helm 3.5.4 +- Helm 3.6.0 - Homebrew 3.1.9 - Miniconda 4.9.2 - Npm 6.14.13 - Pip 8.1.1 - Pip3 8.1.1 - RubyGems 2.5.2 -- Vcpkg (build from master \) +- Vcpkg (build from master \<7bc5b8c>) - Yarn 1.22.10 #### Environment variables @@ -50,12 +51,12 @@ - Sbt 1.5.2 ### Tools -- Ansible 2.9.21 +- Ansible 2.9.22 - apt-fast 1.9.11 - AzCopy 10.10.0 (available by `azcopy` and `azcopy10` aliases) - Bazel 4.1.0 - Bazelisk 1.9.0 -- CMake 3.20.2 +- CMake 3.20.3 - CodeQL Action Bundle 2.5.5 - Docker Compose 1.29.2 - Docker-Buildx 0.5.1 @@ -68,7 +69,7 @@ - Heroku 7.54.0 - HHVM (HipHop VM) 4.56.6 - jq 1.5 -- Kind 0.11.0 +- Kind 0.11.1 - Kubectl 1.20.1-5-g76a04fc - Kustomize 4.1.3 - Leiningen 2.9.6 @@ -80,7 +81,7 @@ - OpenSSL 1.0.2g 1 Mar 2016 - Packer 1.7.2 - PhantomJS 2.1.1 -- Pulumi 3.3.0 +- Pulumi 3.3.1 - R 4.1.0 - Sphinx Open Source Search Server 2.2.9 - SVN 1.9.3 @@ -88,19 +89,19 @@ - zstd 1.5.0 (homebrew) ### CLI Tools -- Alibaba Cloud CLI 3.0.74 -- AWS CLI 1.19.78 +- Alibaba Cloud CLI 3.0.77 +- AWS CLI 1.19.84 - AWS CLI Session manager plugin 1.2.54.0 - AWS SAM CLI 1.23.0 -- Azure CLI (azure-cli) 2.23.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) +- Azure CLI (azure-cli) 2.24.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.18.0 - GitHub CLI 1.10.3 -- Google Cloud SDK 341.0.0 (apt source repository: https://packages.cloud.google.com/apt) +- Google Cloud SDK 342.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 3.30.4 -- OpenShift CLI 4.7.11 +- Netlify CLI 3.32.5 +- OpenShift CLI 4.7.12 - ORAS CLI 0.11.1 -- Vercel CLI 22.0.1 +- Vercel CLI 23.0.0 ### Java | Version | Vendor | Environment Variable | @@ -137,11 +138,11 @@ - Rustfmt 1.4.36 ### Browsers and Drivers -- Google Chrome 90.0.4430.212 -- ChromeDriver 90.0.4430.24 +- Google Chrome 91.0.4472.77 +- ChromeDriver 91.0.4472.19 - Mozilla Firefox 88.0 - Geckodriver 0.29.1 -- Chromium 90.0.4430.0 +- Chromium 91.0.4472.0 #### Environment variables | Name | Value | @@ -150,7 +151,7 @@ | GECKOWEBDRIVER | /usr/local/share/gecko_driver | ### .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.519 2.1.520 2.1.521 2.1.522 2.1.523 2.1.524 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.616 2.1.617 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 2.1.811 2.1.812 2.1.813 2.1.814 2.1.815 2.1.816 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.109 3.1.110 3.1.111 3.1.112 3.1.113 3.1.114 3.1.115 3.1.200 3.1.201 3.1.202 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 3.1.408 3.1.409 5.0.100 5.0.101 5.0.102 5.0.103 5.0.104 5.0.200 5.0.201 5.0.202 5.0.203 +- 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.519 2.1.520 2.1.521 2.1.522 2.1.523 2.1.524 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.616 2.1.617 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 2.1.811 2.1.812 2.1.813 2.1.814 2.1.815 2.1.816 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.109 3.1.110 3.1.111 3.1.112 3.1.113 3.1.114 3.1.115 3.1.200 3.1.201 3.1.202 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 3.1.408 3.1.409 5.0.100 5.0.101 5.0.102 5.0.103 5.0.104 5.0.200 5.0.201 5.0.202 5.0.203 5.0.300 ### Databases - MongoDB 4.4.6 (apt source repository: https://repo.mongodb.org/apt/ubuntu) @@ -211,7 +212,7 @@ | Module | Version | | ---------- | ------- | | MarkdownPS | 1.9 | -| Pester | 5.2.1 | +| Pester | 5.2.2 | #### Az PowerShell Modules - 5.7.0 3.1.0.zip 4.4.0.zip @@ -252,19 +253,19 @@ | alpine:3.11 | sha256:18a918a714d1368847b67173d120ebd110fcfae208305412f3005a61cdc7c20e | 2021-04-14 | | alpine:3.12 | sha256:36553b10a4947067b9fbb7d532951066293a68eae893beba1d9235f7d11a20ad | 2021-04-14 | | alpine:3.13 | sha256:69e70a79f2d41ab5d637de98c1e0b055206ba40a8145e7bddb55ccc04e13cf8f | 2021-04-14 | -| buildpack-deps:buster | sha256:28200c7265b185cbceb55ec2d14b5b303d503aeb4dcf6c456e4a66029400a4eb | 2021-05-12 | -| buildpack-deps:stretch | sha256:a84d08cb47515db24a1228de35a909ba782bc2b9ac66b986f566c9dd973ecc24 | 2021-05-12 | +| buildpack-deps:buster | sha256:b4ba9e547bb2e4f48186b234a816ec0182c86fda31f4de5c1eeb824a5d3330df | 2021-05-12 | +| buildpack-deps:stretch | sha256:fe5d31963e568ba5c418ad26c7c1391ddeedd801672236f081fc3e1e2950e27b | 2021-05-12 | | debian:10 | sha256:acf7795dc91df17e10effee064bd229580a9c34213b4dba578d64768af5d8c51 | 2021-05-12 | | debian:9 | sha256:4f8deed5755299e2d7ae1f5649656de89a6b7e30c0be37a3a1b4a49f0af51f7e | 2021-05-12 | | node:10 | sha256:59531d2835edd5161c8f9512f9e095b1836f7a1fcb0ab73e005ec46047384911 | 2021-04-10 | | node:10-alpine | sha256:dc98dac24efd4254f75976c40bce46944697a110d06ce7fa47e7268470cf2e28 | 2021-04-14 | -| node:12 | sha256:e38a48c584fde720a43b1bacfea1178e0900936cb8d0141630e5e35693ee6d08 | 2021-05-12 | -| node:12-alpine | sha256:9923c9efb13cf7535f67e49b03010f0977a800068e4c8e0e2c93433a6bfa1e77 | 2021-04-14 | -| node:14 | sha256:9025a77b2f37fcda3bbd367587367a9f2251d16a756ed544550b8a571e16a653 | 2021-05-13 | -| node:14-alpine | sha256:3689ad4435a413342ccc352170ad0f77433b41173af7fe4c0076f0c9792642cb | 2021-05-13 | -| ubuntu:16.04 | sha256:98afb2808ee1ec6aa4d7c8f8b82c6347b9ae156932f7186182b997f3d5616ebe | 2021-05-19 | -| ubuntu:18.04 | sha256:04919776d30640ce4ed24442d5f7c1a8e4bd0e4793ed9469843cedaecb0d72fb | 2021-05-19 | -| ubuntu:20.04 | sha256:cf31af331f38d1d7158470e095b132acd126a7180a54f263d386da88eb681d93 | 2021-04-23 | +| node:12 | sha256:0d6b3522991d04ead0b119feaffafa6a8cd1b374218e9f997a1d4753b7064882 | 2021-05-12 | +| node:12-alpine | sha256:9a372efac4c436dfb6dbdea42f08d3ea60a0103a1df54a7da247e4bed1b327f7 | 2021-04-14 | +| node:14 | sha256:af9879e7473d347048c5d5919aa9775f27c33d92e4d58058ffdc08247f4bd902 | 2021-05-13 | +| node:14-alpine | sha256:f07ead757c93bc5e9e79978075217851d45a5d8e5c48eaf823e7f12d9bbc1d3c | 2021-05-13 | +| ubuntu:16.04 | sha256:9775877f420d453ef790e6832d77630a49b32a92b7bedf330adf4d8669f6600e | 2021-05-19 | +| ubuntu:18.04 | sha256:67b730ece0d34429b455c08124ffd444f021b81e06fa2d9cd0adaf0d0b875182 | 2021-05-19 | +| ubuntu:20.04 | sha256:adf73ca014822ad8237623d388cedf4d5346aa72c270c5acc01431cc93e18e2d | 2021-04-23 | ### Installed apt packages | Name | Version | From b870568e3655b6016befa46be25589e70a648fff Mon Sep 17 00:00:00 2001 From: Sylvain Date: Thu, 3 Jun 2021 18:12:53 +0200 Subject: [PATCH 0297/3485] [ubuntu] Clean way to disable the pcov PHP Extension (#3472) * Clean way to disable the pcov PHP Extension Fixes https://github.com/actions/virtual-environments/issues/3341 * Update php.sh * Update php.sh * Documentation --- .../scripts/SoftwareReport/SoftwareReport.Common.psm1 | 11 +++++++++++ .../SoftwareReport/SoftwareReport.Generator.ps1 | 4 +--- images/linux/scripts/installers/php.sh | 5 +++-- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 index 7f9e8af243f2..37e5ff3a697f 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 @@ -256,6 +256,17 @@ function Build-PHPTable { } } +function Build-PHPSection { + $output = "" + $output += New-MDHeader "PHP" -Level 3 + $output += Build-PHPTable | New-MDTable + $output += New-MDCode -Lines @( + "Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled." + ) + + return $output +} + function Get-GHCVersion { $(ghc --version) -match "version (?\d+\.\d+\.\d+)" | Out-Null $ghcVersion = $Matches.version diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index efe543050a1f..6941c36cef37 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -179,9 +179,7 @@ if (Test-IsUbuntu20) { $markdown += New-MDNewLine } -$markdown += New-MDHeader "PHP" -Level 3 -$markdown += Build-PHPTable | New-MDTable -$markdown += New-MDNewLine +$markdown += Build-PHPSection $markdown += New-MDHeader "Haskell" -Level 3 $markdown += New-MDList -Style Unordered -Lines (@( diff --git a/images/linux/scripts/installers/php.sh b/images/linux/scripts/installers/php.sh index 1facaf4e977a..511c369d4206 100644 --- a/images/linux/scripts/installers/php.sh +++ b/images/linux/scripts/installers/php.sh @@ -80,7 +80,8 @@ for version in $php_versions; do apt-fast install -y --no-install-recommends php$version-pcov # Disable PCOV, as Xdebug is enabled by default - echo "" | sudo tee /etc/php/$version/mods-available/pcov.ini + # https://github.com/krakjoe/pcov#interoperability + phpdismod -v $version pcov fi if [[ $version = "7.0" || $version = "7.1" ]]; then @@ -117,4 +118,4 @@ if isUbuntu20 ; then apt-get update fi -invoke_tests "Common" "PHP" \ No newline at end of file +invoke_tests "Common" "PHP" From cf551b1f4cf00bb2b561c64e0ff1056ae281376d Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Fri, 4 Jun 2021 09:24:58 +0300 Subject: [PATCH 0298/3485] =?UTF-8?q?[macOS]=20Software=20updates=20week?= =?UTF-8?q?=2023=20=E2=80=94=20add=20Xamarin=206=5F12=5F9=20bundle=20to=20?= =?UTF-8?q?Big=20Sur=20and=20Mono=206.12.0.140=20to=20Catalina=20(#3519)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- images/macos/toolsets/toolset-10.15.json | 2 +- images/macos/toolsets/toolset-11.json | 17 ++++++++++++----- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index 90860679ac4b..909529972519 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -20,7 +20,7 @@ "xamarin": { "vsmac": "latest", "mono-versions": [ - "6.12.0.125", "6.10.0.106", "6.8.0.123", "6.6.0.166", "6.4.0.208" + "6.12.0.140", "6.10.0.106", "6.8.0.123", "6.6.0.166", "6.4.0.208" ], "ios-versions": [ "14.14.2.5", "14.10.0.4", "14.8.0.3", "14.6.0.15", "14.4.1.3", "14.2.0.12", "14.0.0.0", "13.20.2.2", "13.18.2.1", "13.16.0.13", "13.14.1.39", "13.10.0.21", "13.8.3.0", "13.6.0.12", "13.4.0.2", "13.2.0.47" diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index 41698065ac61..8bfd689861bd 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -12,19 +12,26 @@ "xamarin": { "vsmac": "latest", "mono-versions": [ - "6.12.0.125" + "6.12.0.140" ], "ios-versions": [ - "14.16.0.5", "14.14.2.5", "14.10.0.4", "14.8.0.3", "14.6.0.15", "14.4.1.3", "14.2.0.12", "14.0.0.0", "13.20.2.2" + "14.20.0.1", "14.16.0.5", "14.14.2.5", "14.10.0.4", "14.8.0.3", "14.6.0.15", "14.4.1.3", "14.2.0.12", "14.0.0.0", "13.20.2.2" ], "mac-versions": [ - "7.10.0.5", "7.8.2.5", "7.4.0.10", "7.2.0.3", "7.0.0.15", "6.22.1.26", "6.20.2.2" + "7.14.0.1", "7.10.0.5", "7.8.2.5", "7.4.0.10", "7.2.0.3", "7.0.0.15", "6.22.1.26", "6.20.2.2" ], "android-versions": [ - "11.2.2.1", "11.1.0.26", "11.0.2.0" + "11.3.0.1", "11.2.2.1", "11.1.0.26", "11.0.2.0" ], - "bundle-default": "6_12_8", + "bundle-default": "6_12_9", "bundles": [ + { + "symlink": "6_12_9", + "mono":"6.12", + "ios": "14.20", + "mac": "7.14", + "android": "11.3" + }, { "symlink": "6_12_8", "mono":"6.12", From 0648d434e66eb924ee6e6263c344c4d5d320d3d3 Mon Sep 17 00:00:00 2001 From: agorti <66666946+agorti@users.noreply.github.com> Date: Fri, 4 Jun 2021 17:03:52 +0530 Subject: [PATCH 0299/3485] [windows] update npm registry to https (#3521) --- images/win/scripts/Installers/Install-NodeLts.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/win/scripts/Installers/Install-NodeLts.ps1 b/images/win/scripts/Installers/Install-NodeLts.ps1 index 4c1b9d2770fe..2a74cc14d46c 100644 --- a/images/win/scripts/Installers/Install-NodeLts.ps1 +++ b/images/win/scripts/Installers/Install-NodeLts.ps1 @@ -19,7 +19,7 @@ setx npm_config_prefix $PrefixPath /M $env:npm_config_prefix = $PrefixPath npm config set cache $CachePath --global -npm config set registry http://registry.npmjs.org/ +npm config set registry https://registry.npmjs.org/ npm install -g cordova npm install -g grunt-cli From d722f6fed9845544c3625e1d67ea1a74d2a41e58 Mon Sep 17 00:00:00 2001 From: Omar Sandoval Date: Fri, 4 Jun 2021 04:36:14 -0700 Subject: [PATCH 0300/3485] [Ubuntu] Install default version of Clang last (#3506) --- images/linux/scripts/installers/clang.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/images/linux/scripts/installers/clang.sh b/images/linux/scripts/installers/clang.sh index 87d1adc5c29b..688de477926d 100644 --- a/images/linux/scripts/installers/clang.sh +++ b/images/linux/scripts/installers/clang.sh @@ -37,8 +37,11 @@ versions=$(get_toolset_value '.clang.versions[]') default_clang_version=$(get_toolset_value '.clang.default_version') for version in ${versions[*]}; do - InstallClang $version + if [[ $version != $default_clang_version ]]; then + InstallClang $version + fi done +InstallClang $default_clang_version SetDefaultClang $default_clang_version rm llvm.sh From 3fbcebad7a79276d46176350bbdcd39c5c083958 Mon Sep 17 00:00:00 2001 From: Alena Sviridenko Date: Fri, 4 Jun 2021 18:20:54 +0300 Subject: [PATCH 0301/3485] Add explanation for current enterprises (#3527) * Added "current enterprises" explanation * Fixed article Co-authored-by: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Co-authored-by: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 07bec705fef8..65edd5a9994f 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ Ubuntu 16.04 has been deprecated and will be removed on September 20, 2021. Existing workflows using `Ubuntu 16.04` should migrate to `Ubuntu 20.04` or `Ubuntu 18.04` ``` -> The macOS 11 virtual environment is currently in preview, and is automatically available to existing Enterprise plan customers. New Enterprise plan customers, or customers on other plans, should fill the form to request access to macOS 11 virtual environment. Please view our [Big Sur guide](./docs/macos-11-onboarding.md) for more details.
+> The macOS 11 virtual environment is currently in preview and is automatically available to the existing Enterprise plan customers who used macOS hosted runners at least once between May, 1 - June, 1. New Enterprise plan customers, or customers on other plans, should fill the form to request access to macOS 11 virtual environment. Please view our [Big Sur guide](./docs/macos-11-onboarding.md) for more details.
The `macos-latest` YAML workflow label still uses the macOS 10.15 virtual environment. ***What images are available for GitHub Actions and Azure DevOps?*** From 46ced6027121a073b3cc58a7f450fb4fbc350a59 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Sun, 6 Jun 2021 23:44:10 +0300 Subject: [PATCH 0302/3485] [macOS] Get back pypy to big sur (#3524) --- .../macos/software-report/SoftwareReport.Toolcache.psm1 | 7 ++----- images/macos/templates/macOS-11.json | 1 + images/macos/tests/Toolcache.Tests.ps1 | 2 +- images/macos/toolsets/toolset-11.json | 9 +++++++++ 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/images/macos/software-report/SoftwareReport.Toolcache.psm1 b/images/macos/software-report/SoftwareReport.Toolcache.psm1 index 717f614ff70a..344807dbcf0b 100644 --- a/images/macos/software-report/SoftwareReport.Toolcache.psm1 +++ b/images/macos/software-report/SoftwareReport.Toolcache.psm1 @@ -40,11 +40,8 @@ function Build-ToolcacheSection { $output += New-MDList -Lines (Get-ToolcacheRubyVersions) -Style Unordered $output += New-MDHeader "Python" -Level 4 $output += New-MDList -Lines (Get-ToolcachePythonVersions) -Style Unordered - - if ($os.IsLessThanBigSur) { - $output += New-MDHeader "PyPy" -Level 4 - $output += New-MDList -Lines (Get-ToolcachePyPyVersions) -Style Unordered - } + $output += New-MDHeader "PyPy" -Level 4 + $output += New-MDList -Lines (Get-ToolcachePyPyVersions) -Style Unordered if( -not $os.IsHighSierra) { $output += New-MDHeader "Node.js" -Level 4 diff --git a/images/macos/templates/macOS-11.json b/images/macos/templates/macOS-11.json index 948f00042f13..8db2da6b2c48 100644 --- a/images/macos/templates/macOS-11.json +++ b/images/macos/templates/macOS-11.json @@ -187,6 +187,7 @@ "./provision/core/chrome.sh", "./provision/core/edge.sh", "./provision/core/firefox.sh", + "./provision/core/pypy.sh", "./provision/core/pipx-packages.sh" ] }, diff --git a/images/macos/tests/Toolcache.Tests.ps1 b/images/macos/tests/Toolcache.Tests.ps1 index 5989288b59ac..8d3d558f755d 100644 --- a/images/macos/tests/Toolcache.Tests.ps1 +++ b/images/macos/tests/Toolcache.Tests.ps1 @@ -98,7 +98,7 @@ Describe "Toolcache" { } } } - Context "PyPy" -Skip:($os.IsBigSur) { + Context "PyPy" { $pypyDirectory = Join-Path $toolcacheDirectory "PyPy" $pypyPackage = $packages | Where-Object { $_.ToolName -eq "pypy" } | Select-Object -First 1 $testCase = @{ PypyDirectory = $pypyDirectory } diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index 8bfd689861bd..895f0d6eef49 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -176,6 +176,15 @@ "3.9.*" ] }, + { + "name": "PyPy", + "arch": "x64", + "platform" : "darwin", + "versions": [ + "2.7", + "3.7" + ] + }, { "name": "Node", "url" : "https://raw.githubusercontent.com/actions/node-versions/main/versions-manifest.json", From 659b9d878ccce5152198e2ff8aeae3663d39b7f0 Mon Sep 17 00:00:00 2001 From: Nursultan Kassan <84095700+kassannk@users.noreply.github.com> Date: Mon, 7 Jun 2021 12:23:47 +0300 Subject: [PATCH 0303/3485] [Windows] Adding Swig (#3509) --- images/win/scripts/Installers/Install-Swig.ps1 | 8 ++++++++ .../scripts/SoftwareReport/SoftwareReport.Generator.ps1 | 1 + .../win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 | 8 +++++++- images/win/scripts/Tests/Tools.Tests.ps1 | 6 ++++++ images/win/windows2016.json | 3 ++- images/win/windows2019.json | 3 ++- 6 files changed, 26 insertions(+), 3 deletions(-) create mode 100644 images/win/scripts/Installers/Install-Swig.ps1 diff --git a/images/win/scripts/Installers/Install-Swig.ps1 b/images/win/scripts/Installers/Install-Swig.ps1 new file mode 100644 index 000000000000..92cdd576aff7 --- /dev/null +++ b/images/win/scripts/Installers/Install-Swig.ps1 @@ -0,0 +1,8 @@ +################################################################################ +## File: Install-Swig.ps1 +## Desc: Install Swig +################################################################################ + +Choco-Install -PackageName swig + +Invoke-PesterTests -TestFile "Tools" -TestName "Swig" diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index ab477545d43b..2c14ee9bc91f 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -101,6 +101,7 @@ $markdown += New-MDList -Style Unordered -Lines (@( (Get-StackVersion), (Get-SVNVersion), (Get-VSWhereVersion), + (Get-SwigVersion), (Get-WinAppDriver), (Get-ZstdVersion), (Get-YAMLLintVersion) diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 index e8890b8ad58d..eddd3de97374 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 @@ -257,4 +257,10 @@ function Get-DacFxVersion { cd "C:\Program Files\Microsoft SQL Server\150\DAC\bin\" $dacfxversion = (./sqlpackage.exe /version) return "DacFx $dacfxversion" -} \ No newline at end of file +} + +function Get-SwigVersion { + (swig -version | Out-String) -match "version (?\d+\.\d+\.\d+)" | Out-Null + $swigVersion = $Matches.Version + return "Swig $swigVersion" +} diff --git a/images/win/scripts/Tests/Tools.Tests.ps1 b/images/win/scripts/Tests/Tools.Tests.ps1 index 4b446cd4de36..db110f5f25d3 100644 --- a/images/win/scripts/Tests/Tools.Tests.ps1 +++ b/images/win/scripts/Tests/Tools.Tests.ps1 @@ -258,3 +258,9 @@ Describe "Pipx" { "pipx --version" | Should -ReturnZeroExitCode } } + +Describe "Swig" { + It "Swig" { + "swig -version" | Should -ReturnZeroExitCode + } +} diff --git a/images/win/windows2016.json b/images/win/windows2016.json index d8c427e88247..4c183f6ee86a 100644 --- a/images/win/windows2016.json +++ b/images/win/windows2016.json @@ -253,7 +253,8 @@ "{{ template_dir }}/scripts/Installers/Install-Selenium.ps1", "{{ template_dir }}/scripts/Installers/Install-IEWebDriver.ps1", "{{ template_dir }}/scripts/Installers/Install-Apache.ps1", - "{{ template_dir }}/scripts/Installers/Install-Nginx.ps1" + "{{ template_dir }}/scripts/Installers/Install-Nginx.ps1", + "{{ template_dir }}/scripts/Installers/Install-Swig.ps1" ] }, { diff --git a/images/win/windows2019.json b/images/win/windows2019.json index d10119b948cc..8bb66f535b33 100644 --- a/images/win/windows2019.json +++ b/images/win/windows2019.json @@ -257,7 +257,8 @@ "{{ template_dir }}/scripts/Installers/Install-Selenium.ps1", "{{ template_dir }}/scripts/Installers/Install-IEWebDriver.ps1", "{{ template_dir }}/scripts/Installers/Install-Apache.ps1", - "{{ template_dir }}/scripts/Installers/Install-Nginx.ps1" + "{{ template_dir }}/scripts/Installers/Install-Nginx.ps1", + "{{ template_dir }}/scripts/Installers/Install-Swig.ps1" ] }, { From f41704941702811b01e381aad17c5688e0b89b1a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 7 Jun 2021 09:59:33 +0000 Subject: [PATCH 0304/3485] Updating readme file for win16 version 20210531.1 (#3488) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/win/Windows2016-Readme.md | 36 ++++++++++++++++---------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/images/win/Windows2016-Readme.md b/images/win/Windows2016-Readme.md index fa4fb7a38a50..d48a4fe05c49 100644 --- a/images/win/Windows2016-Readme.md +++ b/images/win/Windows2016-Readme.md @@ -1,6 +1,6 @@ # Microsoft Windows Server 2016 Datacenter - OS Version: 10.0.14393 Build 4402 -- Image Version: 20210525.0 +- Image Version: 20210531.1 ## Installed Software ### Language and Runtime @@ -16,14 +16,14 @@ ### Package Management - Chocolatey 0.10.15 - Composer 2.0.14 -- Helm 3.5.4 +- Helm 3.6.0 - Miniconda 4.9.2 - NPM 6.14.13 - NuGet 5.9.1.11 - pip 21.1.2 (python 3.7) -- Pipx 0.16.2.1 +- Pipx 0.16.3 - RubyGems 2.7.6.3 -- Vcpkg (build from master \<83f9a6c>) +- Vcpkg (build from master \<7bc5b8c>) - Yarn 1.22.10 #### Environment variables @@ -44,9 +44,9 @@ - Bazel 4.1.0 - Bazelisk 1.9.0 - Cabal 3.4.0.0 -- CMake 3.20.2 +- CMake 3.20.3 - CodeQL Action Bundle 2.5.5 -- Docker 20.10.4 +- Docker 20.10.5 - Docker-compose 1.29.1 - ghc 9.0.1 - Git 2.31.1 @@ -54,7 +54,7 @@ - Google Cloud SDK 342.0.0 - InnoSetup 6.1.2 - jq 1.6 -- Kind 0.11.0 +- Kind 0.11.1 - Kubectl 1.21.1 - Mercurial 5.0 - Mingw-w64 8.1.0 @@ -72,8 +72,8 @@ - zstd 1.5.0 ### CLI Tools -- Alibaba Cloud CLI 3.0.75 -- AWS CLI 2.2.5 +- Alibaba Cloud CLI 3.0.77 +- AWS CLI 2.2.7 - AWS SAM CLI 1.23.0 - AWS Session Manager CLI 1.2.54.0 - Azure CLI 2.24.0 @@ -99,8 +99,8 @@ ### Browsers and webdrivers - Google Chrome 91.0.4472.77 - Chrome Driver 91.0.4472.19 -- Microsoft Edge 90.0.818.66 -- Microsoft Edge Driver 90.0.818.66 +- Microsoft Edge 91.0.864.37 +- Microsoft Edge Driver 91.0.864.37 - Mozilla Firefox 88.0.1 - Gecko Driver 0.29.1 - IE Driver 3.150.1.0 @@ -212,7 +212,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Web Servers | Name | Version | ConfigFile | ServiceName | ServiceStatus | ListenPort | | ------ | ------- | ------------------------------------- | ----------- | ------------- | ---------- | -| Apache | 2.4.47 | C:\tools\Apache24\conf\httpd.conf | Apache | Stopped | 80 | +| Apache | 2.4.48 | C:\tools\Apache24\conf\httpd.conf | Apache | Stopped | 80 | | Nginx | 1.21.0 | C:\tools\nginx-1.21.0\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2017 @@ -480,10 +480,10 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft Visual C++ 2013 Minimum Runtime | x86 | 12.0.21005 | | Microsoft Visual C++ 2017 Debug Runtime | x64 | 14.16.27033 | | Microsoft Visual C++ 2017 Debug Runtime | x86 | 14.16.27033 | -| Microsoft Visual C++ 2019 Additional Runtime | x64 | 14.28.29914 | -| Microsoft Visual C++ 2019 Minimum Runtime | x64 | 14.28.29914 | -| Microsoft Visual C++ 2019 Additional Runtime | x86 | 14.28.29914 | -| Microsoft Visual C++ 2019 Minimum Runtime | x86 | 14.28.29914 | +| Microsoft Visual C++ 2019 Additional Runtime | x64 | 14.29.30037 | +| Microsoft Visual C++ 2019 Minimum Runtime | x64 | 14.29.30037 | +| Microsoft Visual C++ 2019 Additional Runtime | x86 | 14.29.30037 | +| Microsoft Visual C++ 2019 Minimum Runtime | x86 | 14.29.30037 | ### .NET Core SDK `Location C:\Program Files\dotnet\sdk` @@ -526,7 +526,7 @@ All other versions are saved but not installed. | ------------------ | ---------------- | | DockerMsftProvider | 1.0.0.8 | | MarkdownPS | 1.9 | -| Pester | 3.4.0
5.2.1 | +| Pester | 3.4.0
5.2.2 | | PowerShellGet | 1.0.0.1
2.2.5 | | PSScriptAnalyzer | 1.19.1 | | PSWindowsUpdate | 2.2.0.2 | @@ -564,7 +564,7 @@ All other versions are saved but not installed. | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | | mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2016 | sha256:616e2816b0024ab7f69a58dfefd1bee58d6ac5501adb8abb9f52b104a1f0a5da | 2021-05-11 | | mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2016 | sha256:7a7b03014820cb4bf0f9a137f33ceade2fa7102ee63a91de720b13bdce43bf3c | 2021-05-11 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2016 | sha256:f19f7100d6ce4090e9f4b3c06729304cf384459f16ca07f9595155c8254a66c0 | 2021-05-11 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2016 | sha256:7cc0e9e7599ea9b0a8ac9b0c809236d239ba4ab384270b91a371368d715f4156 | 2021-05-25 | | mcr.microsoft.com/windows/nanoserver:10.0.14393.953 | sha256:fc60bd5ae0e61b334ce1cf1bcbf20c10c36b4c5482a01da319c9c989f9e6e268 | 2017-03-08 | | mcr.microsoft.com/windows/servercore:ltsc2016 | sha256:b96ee2b8278f1e62418473f47eefd22340b8c6cefbb565a630d28791efbea16d | 2021-04-26 | From 22b6f42307dda00090d0971e93ea017559e32c54 Mon Sep 17 00:00:00 2001 From: Nursultan Kassan <84095700+kassannk@users.noreply.github.com> Date: Mon, 7 Jun 2021 16:00:50 +0300 Subject: [PATCH 0305/3485] [macOS] Adding Swig (#3510) --- images/macos/software-report/SoftwareReport.Common.psm1 | 5 +++++ images/macos/software-report/SoftwareReport.Generator.ps1 | 3 ++- images/macos/tests/Common.Tests.ps1 | 8 +++++++- images/macos/toolsets/toolset-10.14.json | 1 + images/macos/toolsets/toolset-10.15.json | 1 + images/macos/toolsets/toolset-11.json | 3 ++- 6 files changed, 18 insertions(+), 3 deletions(-) diff --git a/images/macos/software-report/SoftwareReport.Common.psm1 b/images/macos/software-report/SoftwareReport.Common.psm1 index 928d1aaf2a2d..8585cd054297 100644 --- a/images/macos/software-report/SoftwareReport.Common.psm1 +++ b/images/macos/software-report/SoftwareReport.Common.psm1 @@ -487,6 +487,11 @@ function Get-PowershellVersion { return $powershellVersion } +function Get-SwigVersion { + $swigVersion = Run-Command "swig -version" | Select-Object -First 2 | Take-Part -Part 2 + return "Swig $swigVersion" +} + function Build-PackageManagementEnvironmentTable { return @( @{ diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1 index f9532db041d3..89f455c2fd3e 100644 --- a/images/macos/software-report/SoftwareReport.Generator.ps1 +++ b/images/macos/software-report/SoftwareReport.Generator.ps1 @@ -159,7 +159,8 @@ $toolsList = @( (Get-AWSSAMCLIVersion), (Get-AWSSessionManagerCLIVersion), (Get-AliyunCLIVersion), - (Get-XcodeCommandLineToolsVersion) + (Get-XcodeCommandLineToolsVersion), + (Get-SwigVersion) ) if( -not $os.IsHighSierra) { diff --git a/images/macos/tests/Common.Tests.ps1 b/images/macos/tests/Common.Tests.ps1 index f066fac44d0a..79f47bb3654c 100644 --- a/images/macos/tests/Common.Tests.ps1 +++ b/images/macos/tests/Common.Tests.ps1 @@ -85,4 +85,10 @@ Describe "VSMac" { $vsPath | Should -Exist $vstoolPath | Should -Exist } -} \ No newline at end of file +} + +Describe "Swig" { + It "Swig" { + "swig -version" | Should -ReturnZeroExitCode + } +} diff --git a/images/macos/toolsets/toolset-10.14.json b/images/macos/toolsets/toolset-10.14.json index 8e8bf62a6020..7ed810ee16d6 100644 --- a/images/macos/toolsets/toolset-10.14.json +++ b/images/macos/toolsets/toolset-10.14.json @@ -253,6 +253,7 @@ "perl", "subversion", "swiftformat", + "swig", "xctool", "zstd" ], diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index 909529972519..eb742fb88d3b 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -205,6 +205,7 @@ "perl", "subversion", "swiftformat", + "swig", "xctool", "zstd" ], diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index 895f0d6eef49..fe3a52d272d9 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -151,6 +151,7 @@ "perl", "subversion", "swiftformat", + "swig", "zstd" ], "cask_packages": [ @@ -239,4 +240,4 @@ "bundler", "fastlane" ] -} \ No newline at end of file +} From 638ad60fbd11830bae701940935f58fb0f7598a3 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 7 Jun 2021 14:49:49 +0000 Subject: [PATCH 0306/3485] Updating readme file for win19 version 20210531.1 (#3489) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/win/Windows2019-Readme.md | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index 59a0f8066f14..c550a650b372 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -1,6 +1,6 @@ # Microsoft Windows Server 2019 Datacenter - OS Version: 10.0.17763 Build 1935 -- Image Version: 20210525.0 +- Image Version: 20210531.1 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -19,14 +19,14 @@ ### Package Management - Chocolatey 0.10.15 - Composer 2.0.14 -- Helm 3.5.4 +- Helm 3.6.0 - Miniconda 4.9.2 - NPM 6.14.13 - NuGet 5.9.1.11 - pip 21.1.2 (python 3.7) -- Pipx 0.16.2.1 +- Pipx 0.16.3 - RubyGems 2.7.6.3 -- Vcpkg (build from master \<83f9a6c>) +- Vcpkg (build from master \<7bc5b8c>) - Yarn 1.22.10 #### Environment variables @@ -47,9 +47,9 @@ - Bazel 4.1.0 - Bazelisk 1.9.0 - Cabal 3.4.0.0 -- CMake 3.20.2 +- CMake 3.20.3 - CodeQL Action Bundle 2.5.5 -- Docker 20.10.4 +- Docker 20.10.5 - Docker-compose 1.29.1 - ghc 9.0.1 - Git 2.31.1 @@ -57,7 +57,7 @@ - Google Cloud SDK 342.0.0 - InnoSetup 6.1.2 - jq 1.6 -- Kind 0.11.0 +- Kind 0.11.1 - Kubectl 1.21.1 - Mercurial 5.0 - Mingw-w64 8.1.0 @@ -75,8 +75,8 @@ - zstd 1.5.0 ### CLI Tools -- Alibaba Cloud CLI 3.0.75 -- AWS CLI 2.2.5 +- Alibaba Cloud CLI 3.0.77 +- AWS CLI 2.2.7 - AWS SAM CLI 1.23.0 - AWS Session Manager CLI 1.2.54.0 - Azure CLI 2.24.0 @@ -102,8 +102,8 @@ ### Browsers and webdrivers - Google Chrome 91.0.4472.77 - Chrome Driver 91.0.4472.19 -- Microsoft Edge 90.0.818.66 -- Microsoft Edge Driver 90.0.818.66 +- Microsoft Edge 91.0.864.37 +- Microsoft Edge Driver 91.0.864.37 - Mozilla Firefox 88.0.1 - Gecko Driver 0.29.1 - IE Driver 3.150.1.0 @@ -218,7 +218,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Web Servers | Name | Version | ConfigFile | ServiceName | ServiceStatus | ListenPort | | ------ | ------- | ------------------------------------- | ----------- | ------------- | ---------- | -| Apache | 2.4.47 | C:\tools\Apache24\conf\httpd.conf | Apache | Stopped | 80 | +| Apache | 2.4.48 | C:\tools\Apache24\conf\httpd.conf | Apache | Stopped | 80 | | Nginx | 1.21.0 | C:\tools\nginx-1.21.0\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2019 @@ -517,7 +517,7 @@ All other versions are saved but not installed. | ------------------ | ---------------- | | DockerMsftProvider | 1.0.0.8 | | MarkdownPS | 1.9 | -| Pester | 3.4.0
5.2.1 | +| Pester | 3.4.0
5.2.2 | | PowerShellGet | 1.0.0.1
2.2.5 | | PSScriptAnalyzer | 1.19.1 | | PSWindowsUpdate | 2.2.0.2 | @@ -555,7 +555,7 @@ All other versions are saved but not installed. | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | | mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:6c8ea03414851b5a77a951a9fc82a43e580e816b12e9d05d6a5918a76c2dd7c1 | 2021-05-11 | | mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:c615be2cb06c4f4386f4ba424239f2172af7a3c8360ab0008131828d50fe020f | 2021-05-11 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:9ae2cdbf93d7a50bc195ea72415afed2636b60b1d4a7028c1a9f68ada07fafec | 2021-05-11 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:a3b51566290b6aa485de6d8ac3d8cbf008f560feda73ed1addb208166cbdd3ad | 2021-05-25 | | mcr.microsoft.com/windows/nanoserver:1809 | sha256:7810b00b2b0ce434cf8a420627b3aba335a40e1b805e1be2e02241b7446f7a00 | 2021-05-07 | | mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:edd6d6de1e7252d2d434af58798db1d96762d738f60e15b24ed631f55e26681d | 2021-05-08 | From 395eb43c2bdc41bac61cbd0ad4dcdd8f80eb1506 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Mon, 7 Jun 2021 20:49:36 +0300 Subject: [PATCH 0307/3485] Added a condition for the $binGhcPath to not depend on the exact Haskell version (#3537) --- images/win/scripts/Tests/Haskell.Tests.ps1 | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/images/win/scripts/Tests/Haskell.Tests.ps1 b/images/win/scripts/Tests/Haskell.Tests.ps1 index 903e95da2888..854ba03106db 100644 --- a/images/win/scripts/Tests/Haskell.Tests.ps1 +++ b/images/win/scripts/Tests/Haskell.Tests.ps1 @@ -12,8 +12,8 @@ Describe "Haskell" { $ghcVersion = $_ $ghcShortVersion = ([version]$ghcVersion).ToString(3) $binGhcPath = Join-Path $chocoPackagesPath "ghc.$ghcVersion\tools\ghc-$ghcShortVersion\bin\ghc.exe" - # Starting from version 9 haskell installation directory is $env:ChocolateyToolsLocation instead of $env:ChocolateyInstall\lib - if ($ghcVersion -notmatch "^[0-8]\.\d+.*") + # The most recent GHC versions installation directory is $env:ChocolateyToolsLocation instead of $env:ChocolateyInstall\lib + if (-not (Test-Path $binGhcPath)) { $binGhcPath = Join-Path $env:ChocolateyToolsLocation "ghc-$ghcShortVersion\bin\ghc.exe" } @@ -36,11 +36,6 @@ Describe "Haskell" { "ghc --version" | Should -MatchCommandOutput $defaultGhcShortVersion } - # Sometimes choco doesn't return version 9, need to check it explicitly https://github.com/chocolatey/choco/issues/2271 - It "Default GHC version is 9" -TestCases $ghcDefaultCases { - "ghc --version" | Should -MatchCommandOutput "9(\.\d+){2,}" - } - It "Cabal is installed" { "cabal --version" | Should -ReturnZeroExitCode } From 2ae7ebddaba7962d7c86c900e1537d41eb65270a Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Tue, 8 Jun 2021 10:44:17 +0300 Subject: [PATCH 0308/3485] Add Xcode 13.0 to macOS Big Sur image (#3540) --- images/macos/toolsets/toolset-11.json | 1 + 1 file changed, 1 insertion(+) diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index fe3a52d272d9..b0b4c04e3b99 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -2,6 +2,7 @@ "xcode": { "default": "12.4", "versions": [ + { "link": "13.0", "version": "13.0.0"}, { "link": "12.5", "version": "12.5.0"}, { "link": "12.4", "version": "12.4.0"}, { "link": "12.3", "version": "12.3.0"}, From 4da3c8eef9c7b30e83edff8894441a2231eb7ec0 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Tue, 8 Jun 2021 10:44:31 +0300 Subject: [PATCH 0309/3485] Add blackhole audiodevice for macOS Big sur, add sox and Switchaudio-osx versions to the docs (#3542) --- .../macos/helpers/SoftwareReport.Helpers.psm1 | 11 +++++++++ images/macos/provision/core/audiodevice.sh | 23 ++++++++++++++----- .../SoftwareReport.Common.psm1 | 10 ++++++++ .../SoftwareReport.Generator.ps1 | 7 ++++++ images/macos/templates/macOS-11.json | 1 + images/macos/tests/System.Tests.ps1 | 8 +++++-- 6 files changed, 52 insertions(+), 8 deletions(-) diff --git a/images/macos/helpers/SoftwareReport.Helpers.psm1 b/images/macos/helpers/SoftwareReport.Helpers.psm1 index 6f1bac5b5a82..b996f64b87c8 100644 --- a/images/macos/helpers/SoftwareReport.Helpers.psm1 +++ b/images/macos/helpers/SoftwareReport.Helpers.psm1 @@ -49,3 +49,14 @@ function Get-PathWithLink { $link = Get-LinkTarget($inputPath) return "${inputPath}${link}" } + +function Get-BrewPackageVersion { + param ( + [string] $CommandName + ) + + (Get-LinkTarget (Get-Command $CommandName).Source | Out-String) -match "(?(\d+.){2}\d+)" | Out-Null + $packageVersion = $Matches.Version + + return $packageVersion +} \ No newline at end of file diff --git a/images/macos/provision/core/audiodevice.sh b/images/macos/provision/core/audiodevice.sh index bf9f0f32277d..a078c04f858c 100644 --- a/images/macos/provision/core/audiodevice.sh +++ b/images/macos/provision/core/audiodevice.sh @@ -1,17 +1,28 @@ #!/bin/bash -e -o pipefail source ~/utils/utils.sh -echo "install soundflower" -brew install --cask soundflower - echo "install switchaudio-osx" brew_smart_install "switchaudio-osx" echo "install sox" brew_smart_install "sox" -echo "set Soundflower (2ch) as input/output device" -SwitchAudioSource -s "Soundflower (2ch)" -t input -SwitchAudioSource -s "Soundflower (2ch)" -t output +# Big Sur doesn't support soundflower installation without user interaction https://github.com/mattingalls/Soundflower/releases/tag/2.0b2 +# Install blackhole-2ch for Big Sur instead +if is_Less_BigSur; then + echo "install soundflower" + brew install --cask soundflower + + echo "set Soundflower (2ch) as input/output device" + SwitchAudioSource -s "Soundflower (2ch)" -t input + SwitchAudioSource -s "Soundflower (2ch)" -t output +else + echo "install blackhole-2ch" + brew_smart_install "blackhole-2ch" + + echo "set BlackHole 2ch as input/output device" + SwitchAudioSource -s "BlackHole 2ch" -t input + SwitchAudioSource -s "BlackHole 2ch" -t output +fi invoke_tests "System" "Audio Device" diff --git a/images/macos/software-report/SoftwareReport.Common.psm1 b/images/macos/software-report/SoftwareReport.Common.psm1 index 8585cd054297..f94ef386554c 100644 --- a/images/macos/software-report/SoftwareReport.Common.psm1 +++ b/images/macos/software-report/SoftwareReport.Common.psm1 @@ -462,6 +462,16 @@ function Get-CabalVersion { return "Cabal $cabalVersion" } +function Get-SwitchAudioOsxVersion { + $switchAudioVersion = Get-BrewPackageVersion -CommandName "SwitchAudioSource" + return "Switchaudio-osx $switchAudioVersion" +} + +function Get-SoxVersion { + $soxVersion = Get-BrewPackageVersion -CommandName "sox" + return "Sox $soxVersion" +} + function Get-StackVersion { $stackVersion = Run-Command "stack --version" | Take-Part -Part 1 | ForEach-Object {$_.replace(",","")} return "Stack $stackVersion" diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1 index 89f455c2fd3e..b2eca6c3973a 100644 --- a/images/macos/software-report/SoftwareReport.Generator.ps1 +++ b/images/macos/software-report/SoftwareReport.Generator.ps1 @@ -145,6 +145,13 @@ if ($os.IsLessThanBigSur) { ) } +if (-not $os.IsHighSierra) { + $utilitiesList += @( + (Get-SwitchAudioOsxVersion), + (Get-SoxVersion) + ) +} + $markdown += New-MDList -Style Unordered -Lines ($utilitiesList | Sort-Object) $markdown += New-MDNewLine diff --git a/images/macos/templates/macOS-11.json b/images/macos/templates/macOS-11.json index 8db2da6b2c48..f8661baa1ebf 100644 --- a/images/macos/templates/macOS-11.json +++ b/images/macos/templates/macOS-11.json @@ -182,6 +182,7 @@ "./provision/core/nginx.sh", "./provision/core/postgresql.sh", "./provision/core/mongodb.sh", + "./provision/core/audiodevice.sh", "./provision/core/vcpkg.sh", "./provision/core/miniconda.sh", "./provision/core/chrome.sh", diff --git a/images/macos/tests/System.Tests.ps1 b/images/macos/tests/System.Tests.ps1 index ea5e137551f6..0aa40c39504c 100644 --- a/images/macos/tests/System.Tests.ps1 +++ b/images/macos/tests/System.Tests.ps1 @@ -17,7 +17,7 @@ Describe "Certificate" { } } -Describe "Audio device" -Skip:($os.IsHighSierra -or $os.IsBigSur) { +Describe "Audio device" -Skip:($os.IsHighSierra) { It "Sox is installed" { "sox --version" | Should -ReturnZeroExitCode } @@ -26,9 +26,13 @@ Describe "Audio device" -Skip:($os.IsHighSierra -or $os.IsBigSur) { "SwitchAudioSource -c" | Should -ReturnZeroExitCode } - It "Audio channel Soundflower (2ch)" { + It "Audio channel Soundflower (2ch)" -Skip:($os.IsBigSur) { SwitchAudioSource -c | Should -BeLikeExactly "Soundflower (2ch)" } + + It "Audio channel BlackHole 2ch" -Skip:($os.IsLessThanBigSur) { + SwitchAudioSource -c | Should -BeLikeExactly "BlackHole 2ch" + } } Describe "Screen Resolution" -Skip:($os.IsHighSierra) { From a56b10c364f5317aff66eb19619df3f88b3cdcb7 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Tue, 8 Jun 2021 10:44:41 +0300 Subject: [PATCH 0310/3485] Revert mono version from 6.12.0.140 to 6.12.0.125 (#3543) --- images/macos/toolsets/toolset-10.15.json | 2 +- images/macos/toolsets/toolset-11.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index eb742fb88d3b..c321a4aa520f 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -20,7 +20,7 @@ "xamarin": { "vsmac": "latest", "mono-versions": [ - "6.12.0.140", "6.10.0.106", "6.8.0.123", "6.6.0.166", "6.4.0.208" + "6.12.0.125", "6.10.0.106", "6.8.0.123", "6.6.0.166", "6.4.0.208" ], "ios-versions": [ "14.14.2.5", "14.10.0.4", "14.8.0.3", "14.6.0.15", "14.4.1.3", "14.2.0.12", "14.0.0.0", "13.20.2.2", "13.18.2.1", "13.16.0.13", "13.14.1.39", "13.10.0.21", "13.8.3.0", "13.6.0.12", "13.4.0.2", "13.2.0.47" diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index b0b4c04e3b99..3cd7ba5a5734 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -13,7 +13,7 @@ "xamarin": { "vsmac": "latest", "mono-versions": [ - "6.12.0.140" + "6.12.0.125" ], "ios-versions": [ "14.20.0.1", "14.16.0.5", "14.14.2.5", "14.10.0.4", "14.8.0.3", "14.6.0.15", "14.4.1.3", "14.2.0.12", "14.0.0.0", "13.20.2.2" From f66fa579e82fa0ac12c0f9317c11b93ed545662a Mon Sep 17 00:00:00 2001 From: Darleev <50947177+Darleev@users.noreply.github.com> Date: Tue, 8 Jun 2021 15:36:08 +0700 Subject: [PATCH 0311/3485] [ubuntu] post generation doc update (#3539) --- docs/create-image-and-azure-resources.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/create-image-and-azure-resources.md b/docs/create-image-and-azure-resources.md index c2390a608de8..bdb619d35c1e 100644 --- a/docs/create-image-and-azure-resources.md +++ b/docs/create-image-and-azure-resources.md @@ -136,6 +136,8 @@ The user, created during the image generation, does not exist in the result VHD - Windows: https://github.com/actions/virtual-environments/tree/main/images/win/post-generation - Linux: https://github.com/actions/virtual-environments/tree/main/images/linux/post-generation +**Note:** The default user for Linux should have `sudo privileges`. + The scripts are copied to the VHD during the image generation process to the following paths: - Windows: `C:\post-generation` - Linux: `/opt/post-generation` @@ -144,7 +146,7 @@ The scripts are copied to the VHD during the image generation process to the fol ##### Ubuntu - find /opt/post-generation -mindepth 1 -maxdepth 1 -type f -name '*.sh' -exec bash {} \; + sudo su -c "find /opt/post-generation -mindepth 1 -maxdepth 1 -type f -name '*.sh' -exec bash {} \;" ##### Windows From f66433eafa3c639f4d816e99a69a972725a3f10c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 9 Jun 2021 07:33:51 +0000 Subject: [PATCH 0312/3485] Updating readme file for macOS-11 version 20210608.6 (#3553) Co-authored-by: Image generation service account --- images/macos/macos-11-Readme.md | 92 ++++++++++++++++++++------------- 1 file changed, 56 insertions(+), 36 deletions(-) diff --git a/images/macos/macos-11-Readme.md b/images/macos/macos-11-Readme.md index 961f71498afa..d9621d88e42b 100644 --- a/images/macos/macos-11-Readme.md +++ b/images/macos/macos-11-Readme.md @@ -1,12 +1,12 @@ | Announcements | |-| -| [[macOS] GCC version 8 will be removed from images on May, 31](https://github.com/actions/virtual-environments/issues/3378) | +| [[macOS] Default Xcode on Big Sur image will be set to Xcode 12.5 on June, 15](https://github.com/actions/virtual-environments/issues/3522) | | [macOS 11.0 pools will be transited to private preview.](https://github.com/actions/virtual-environments/issues/2486) | *** # macOS 11.4 info - System Version: macOS 11.4 (20F71) - Kernel Version: Darwin 20.5.0 -- Image Version: 20210531.1 +- Image Version: 20210608.6 ## Installed Software ### Language and Runtime @@ -14,20 +14,20 @@ - Bash 3.2.57(1)-release - Clang/LLVM 12.0.0 is available on `'$(brew --prefix llvm)/bin/clang'` - Clang/LLVM 12.0.0 is default -- gcc-9 (Homebrew GCC 9.3.0_2) 9.3.0 - available by `gcc-9` alias +- gcc-9 (Homebrew GCC 9.4.0) 9.4.0 - available by `gcc-9` alias - gcc-10 (Homebrew GCC 10.3.0) 10.3.0 - available by `gcc-10` alias - gcc-11 (Homebrew GCC 11.1.0_1) 11.1.0 - available by `gcc-11` alias -- GNU Fortran (Homebrew GCC 9.3.0_2) 9.3.0 - available by `gfortran-9` alias +- GNU Fortran (Homebrew GCC 9.4.0) 9.4.0 - available by `gfortran-9` alias - GNU Fortran (Homebrew GCC 10.3.0) 10.3.0 - available by `gfortran-10` alias - GNU Fortran (Homebrew GCC 11.1.0_1) 11.1.0 - available by `gfortran-11` alias -- Go 1.15.12 +- Go 1.15.13 - julia 1.6.1 - MSBuild 16.6.0.15801 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) - Node.js v14.17.0 - NVM 0.38.0 - NVM - Cached node versions: v10.24.1 v12.22.1 v14.17.0 - Perl 5.34.0 -- PHP 8.0.6 +- PHP 8.0.7 - Python 2.7.18 - Python 3.9.5 - Ruby 2.7.3p183 @@ -36,8 +36,8 @@ - Bundler version 2.2.19 - Carthage 0.38.0 - CocoaPods 1.10.1 -- Composer 2.0.14 -- Homebrew 3.1.9 +- Composer 2.1.2 +- Homebrew 3.1.10 - Miniconda 4.9.2 - NPM 6.14.13 - NuGet 5.6.0.6489 @@ -45,7 +45,7 @@ - Pip 21.1.1 (python 3.9) - Pipx 0.16.3 - RubyGems 3.2.19 -- Vcpkg 2021 (build from master \<7bc5b8c>) +- Vcpkg 2021 (build from master \<3199354>) - Yarn 1.22.5 #### Environment variables @@ -68,8 +68,8 @@ - bsdtar 3.3.2 - available by 'tar' alias - Curl 7.77.0 - Git LFS: 2.13.3 -- Git: 2.31.1 -- GitHub CLI: 1.10.3 +- Git: 2.32.0 +- GitHub CLI: 1.11.0 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.1 - gpg (GnuPG) 2.3.1 @@ -83,24 +83,27 @@ - Packer 1.7.2 - PostgreSQL 13.3 - psql (PostgreSQL) 13.3 +- Sox 14.4.2 - Subversion (SVN) 1.14.1 +- Switchaudio-osx 1.1.0 - zstd 1.5.0 ### Tools -- Aliyun CLI 3.0.77 +- Aliyun CLI 3.0.79 - App Center CLI 2.9.0 -- AWS CLI 2.2.7 -- AWS SAM CLI 1.23.0 +- AWS CLI 2.2.9 +- AWS SAM CLI 1.24.1 - AWS Session Manager CLI 1.2.54.0 -- Azure CLI 2.24.0 +- Azure CLI 2.24.2 - Cabal 3.4.0.0 - Cmake 3.20.3 -- Fastlane 2.184.1 +- Fastlane 2.185.0 - GHC 9.0.1 - GHCup v0.1.14.1 - Stack 2.7.1 - SwiftFormat 0.48.4 +- Swig 4.0.2 - Xcode Command Line Tools 12.5.0.0.1.1617976050 ### Linters @@ -111,24 +114,24 @@ - Safari 14.1.1 (16611.2.7.1.4) - SafariDriver 14.1.1 (16611.2.7.1.4) - Google Chrome 91.0.4472.77 -- ChromeDriver 90.0.4430.24 -- Microsoft Edge 91.0.864.37 -- MSEdgeDriver 91.0.864.37 -- Mozilla Firefox 88.0.1 +- ChromeDriver 91.0.4472.19 +- Microsoft Edge 91.0.864.41 +- MSEdgeDriver 91.0.864.41 +- Mozilla Firefox 89.0 - geckodriver 0.29.1 #### Environment variables | Name | Value | | --------------- | --------------------------------------------- | -| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/90.0.4430.24 | +| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/91.0.4472.19 | | EDGEWEBDRIVER | /usr/local/share/edge_driver | | GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | ### Java -| Version | Vendor | Environment Variable | -| ---------- | ------------- | -------------------- | -| 8.0.292+10 | Adopt OpenJDK | JAVA_HOME_8_X64 | -| 11.0.11+9 | Adopt OpenJDK | JAVA_HOME_11_X64 | +| Version | Vendor | Environment Variable | +| -------------------- | ------------- | -------------------- | +| 8.0.292+10 (default) | Adopt OpenJDK | JAVA_HOME_8_X64 | +| 11.0.11+9 | Adopt OpenJDK | JAVA_HOME_11_X64 | ### Cached Tools #### Ruby @@ -143,14 +146,18 @@ - 3.8.10 - 3.9.5 +#### PyPy +- 2.7.18 [PyPy 7.3.5] +- 3.7.10 [PyPy 7.3.5] + #### Node.js - 10.24.1 - 12.22.1 - 14.17.0 #### Go -- 1.15.12 -- 1.16.4 +- 1.15.13 +- 1.16.5 ### Rust Tools - Cargo 1.52.0 @@ -185,12 +192,13 @@ ### Xamarin #### Visual Studio for Mac -- 8.9.10.4 +- 8.10.0.1773 #### Xamarin bundles | symlink | Xamarin.Mono | Xamarin.iOS | Xamarin.Mac | Xamarin.Android | | ---------------- | ------------ | ----------- | ----------- | --------------- | -| 6_12_8 (default) | 6.12 | 14.16 | 7.10 | 11.2 | +| 6_12_9 (default) | 6.12 | 14.20 | 7.14 | 11.3 | +| 6_12_8 | 6.12 | 14.16 | 7.10 | 11.2 | | 6_12_7 | 6.12 | 14.14 | 7.8 | 11.2 | | 6_12_6 | 6.12 | 14.10 | 7.4 | 11.1 | | 6_12_5 | 6.12 | 14.8 | 7.2 | 11.1 | @@ -204,13 +212,14 @@ - NUnit 3.6.1 ### Xcode -| Version | Build | Path | -| -------------- | ------- | ---------------------------- | -| 12.5 | 12E262 | /Applications/Xcode_12.5.app | -| 12.4 (default) | 12D4e | /Applications/Xcode_12.4.app | -| 12.3 | 12C33 | /Applications/Xcode_12.3.app | -| 12.2 | 12B45b | /Applications/Xcode_12.2.app | -| 11.7 | 11E801a | /Applications/Xcode_11.7.app | +| Version | Build | Path | +| -------------- | -------- | ---------------------------- | +| 13.0 (beta) | 13A5154h | /Applications/Xcode_13.0.app | +| 12.5 | 12E262 | /Applications/Xcode_12.5.app | +| 12.4 (default) | 12D4e | /Applications/Xcode_12.4.app | +| 12.3 | 12C33 | /Applications/Xcode_12.3.app | +| 12.2 | 12B45b | /Applications/Xcode_12.2.app | +| 11.7 | 11E801a | /Applications/Xcode_11.7.app | #### Xcode Support Tools - xcpretty 0.3.0 @@ -225,36 +234,44 @@ | macOS 11.0 | macosx11.0 | 12.2 | | macOS 11.1 | macosx11.1 | 12.3, 12.4 | | macOS 11.3 | macosx11.3 | 12.5 | +| macOS 12.0 | macosx12.0 | 13.0 | | iOS 13.7 | iphoneos13.7 | 11.7 | | iOS 14.2 | iphoneos14.2 | 12.2 | | iOS 14.3 | iphoneos14.3 | 12.3 | | iOS 14.4 | iphoneos14.4 | 12.4 | | iOS 14.5 | iphoneos14.5 | 12.5 | +| iOS 15.0 | iphoneos15.0 | 13.0 | | Simulator - iOS 13.7 | iphonesimulator13.7 | 11.7 | | Simulator - iOS 14.2 | iphonesimulator14.2 | 12.2 | | Simulator - iOS 14.3 | iphonesimulator14.3 | 12.3 | | Simulator - iOS 14.4 | iphonesimulator14.4 | 12.4 | | Simulator - iOS 14.5 | iphonesimulator14.5 | 12.5 | +| Simulator - iOS 15.0 | iphonesimulator15.0 | 13.0 | | tvOS 13.4 | appletvos13.4 | 11.7 | | tvOS 14.2 | appletvos14.2 | 12.2 | | tvOS 14.3 | appletvos14.3 | 12.3, 12.4 | | tvOS 14.5 | appletvos14.5 | 12.5 | +| tvOS 15.0 | appletvos15.0 | 13.0 | | Simulator - tvOS 13.4 | appletvsimulator13.4 | 11.7 | | Simulator - tvOS 14.2 | appletvsimulator14.2 | 12.2 | | Simulator - tvOS 14.3 | appletvsimulator14.3 | 12.3, 12.4 | | Simulator - tvOS 14.5 | appletvsimulator14.5 | 12.5 | +| Simulator - tvOS 15.0 | appletvsimulator15.0 | 13.0 | | watchOS 6.2 | watchos6.2 | 11.7 | | watchOS 7.1 | watchos7.1 | 12.2 | | watchOS 7.2 | watchos7.2 | 12.3, 12.4 | | watchOS 7.4 | watchos7.4 | 12.5 | +| watchOS 8.0 | watchos8.0 | 13.0 | | Simulator - watchOS 6.2 | watchsimulator6.2 | 11.7 | | Simulator - watchOS 7.1 | watchsimulator7.1 | 12.2 | | Simulator - watchOS 7.2 | watchsimulator7.2 | 12.3, 12.4 | | Simulator - watchOS 7.4 | watchsimulator7.4 | 12.5 | +| Simulator - watchOS 8.0 | watchsimulator8.0 | 13.0 | | DriverKit 19.0 | driverkit.macosx19.0 | 11.7 | | DriverKit 20.0 | driverkit.macosx20.0 | 12.2 | | DriverKit 20.2 | driverkit.macosx20.2 | 12.3, 12.4 | | DriverKit 20.4 | driverkit.macosx20.4 | 12.5 | +| DriverKit 21.0 | driverkit21.0 | 13.0 | #### Installed Simulators | OS | Xcode Version | Simulators | @@ -264,14 +281,17 @@ | iOS 14.3 | 12.3 | iPod touch (7th generation)
iPhone 11
iPhone 11 Pro
iPhone 11 Pro Max
iPhone 12
iPhone 12 mini
iPhone 12 Pro
iPhone 12 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.4 | 12.4 | iPod touch (7th generation)
iPhone 11
iPhone 11 Pro
iPhone 11 Pro Max
iPhone 12
iPhone 12 mini
iPhone 12 Pro
iPhone 12 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.5 | 12.5 | iPod touch (7th generation)
iPhone 11
iPhone 11 Pro
iPhone 11 Pro Max
iPhone 12
iPhone 12 mini
iPhone 12 Pro
iPhone 12 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 (11-inch) (3rd generation)
iPad Pro (12.9-inch) (4th generation)
iPad Pro (12.9-inch) (5th generation)
iPad Pro (9.7-inch) | +| iOS 15.0 | 13.0 | iPod touch (7th generation)
iPhone 11
iPhone 11 Pro
iPhone 11 Pro Max
iPhone 12
iPhone 12 mini
iPhone 12 Pro
iPhone 12 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 (11-inch) (3rd generation)
iPad Pro (12.9-inch) (4th generation)
iPad Pro (12.9-inch) (5th generation)
iPad Pro (9.7-inch) | | tvOS 13.4 | 11.7 | 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) | | tvOS 14.3 | 12.3
12.4 | Apple TV
Apple TV 4K
Apple TV 4K (at 1080p) | | tvOS 14.5 | 12.5 | Apple TV
Apple TV 4K
Apple TV 4K (2nd generation)
Apple TV 4K (at 1080p)
Apple TV 4K (at 1080p) (2nd generation) | +| tvOS 15.0 | 13.0 | Apple TV
Apple TV 4K
Apple TV 4K (2nd generation)
Apple TV 4K (at 1080p)
Apple TV 4K (at 1080p) (2nd generation) | | watchOS 6.2 | 11.7 | Apple Watch Series 4 - 40mm
Apple Watch Series 4 - 44mm
Apple Watch Series 5 - 40mm
Apple Watch Series 5 - 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 | | watchOS 7.2 | 12.3
12.4 | 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.4 | 12.5 | 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 8.0 | 13.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 | ### Android | Package Name | Version | From b8c7eb863a9cd194009bc2b0aa91637c78b984ed Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Wed, 9 Jun 2021 12:46:07 +0300 Subject: [PATCH 0313/3485] Switch the default Xcode version from 12.4 to 12.5 for macOS Big Sur (#3545) --- images/macos/toolsets/toolset-11.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index 3cd7ba5a5734..588522b72d50 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -1,6 +1,6 @@ { "xcode": { - "default": "12.4", + "default": "12.5", "versions": [ { "link": "13.0", "version": "13.0.0"}, { "link": "12.5", "version": "12.5.0"}, From 6afff5d0d9ec79bb4f68c3cd1b86b253aeb45f6d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 9 Jun 2021 10:41:06 +0000 Subject: [PATCH 0314/3485] Updating readme file for macOS-10.15 version 20210607.1 (#3547) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/macos/macos-10.15-Readme.md | 63 +++++++++++++++--------------- 1 file changed, 32 insertions(+), 31 deletions(-) diff --git a/images/macos/macos-10.15-Readme.md b/images/macos/macos-10.15-Readme.md index 8f88ce2e25e4..742bdcb82302 100644 --- a/images/macos/macos-10.15-Readme.md +++ b/images/macos/macos-10.15-Readme.md @@ -1,12 +1,12 @@ | Announcements | |-| -| [[macOS] GCC version 8 will be removed from images on May, 31](https://github.com/actions/virtual-environments/issues/3378) | +| [[macOS] Default Xcode on Big Sur image will be set to Xcode 12.5 on June, 15](https://github.com/actions/virtual-environments/issues/3522) | | [macOS 11.0 pools will be transited to private preview.](https://github.com/actions/virtual-environments/issues/2486) | *** # macOS 10.15 info - System Version: macOS 10.15.7 (19H1217) - Kernel Version: Darwin 19.6.0 -- Image Version: 20210531.1 +- Image Version: 20210607.1 ## Installed Software ### Language and Runtime @@ -14,20 +14,20 @@ - Bash 3.2.57(1)-release - Clang/LLVM 12.0.0 is available on `'$(brew --prefix llvm)/bin/clang'` - Clang/LLVM 12.0.0 is default -- gcc-9 (Homebrew GCC 9.3.0_2) 9.3.0 - available by `gcc-9` alias +- gcc-9 (Homebrew GCC 9.4.0) 9.4.0 - available by `gcc-9` alias - gcc-10 (Homebrew GCC 10.3.0) 10.3.0 - available by `gcc-10` alias - gcc-11 (Homebrew GCC 11.1.0_1) 11.1.0 - available by `gcc-11` alias -- GNU Fortran (Homebrew GCC 9.3.0_2) 9.3.0 - available by `gfortran-9` alias +- GNU Fortran (Homebrew GCC 9.4.0) 9.4.0 - available by `gfortran-9` alias - GNU Fortran (Homebrew GCC 10.3.0) 10.3.0 - available by `gfortran-10` alias - GNU Fortran (Homebrew GCC 11.1.0_1) 11.1.0 - available by `gfortran-11` alias -- Go 1.15.12 +- Go 1.15.13 - julia 1.6.1 - MSBuild 16.6.0.15801 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) - Node.js v14.17.0 - NVM 0.38.0 - NVM - Cached node versions: v10.24.1 v12.22.1 v14.17.0 - Perl 5.34.0 -- PHP 8.0.6 +- PHP 8.0.7 - Python 2.7.18 - Python 3.9.5 - R 4.1.0 @@ -37,8 +37,8 @@ - Bundler version 2.2.19 - Carthage 0.38.0 - CocoaPods 1.10.1 -- Composer 2.0.14 -- Homebrew 3.1.9 +- Composer 2.1.1 +- Homebrew 3.1.10 - Miniconda 4.9.2 - NPM 6.14.13 - NuGet 5.6.0.6489 @@ -46,7 +46,7 @@ - Pip 21.1.1 (python 3.9) - Pipx 0.16.3 - RubyGems 3.2.19 -- Vcpkg 2021 (build from master \<7bc5b8c>) +- Vcpkg 2021 (build from master \) - Yarn 1.22.5 #### Environment variables @@ -69,8 +69,8 @@ - bsdtar 3.3.2 - available by 'tar' alias - Curl 7.77.0 - Git LFS: 2.13.3 -- Git: 2.31.1 -- GitHub CLI: 1.10.3 +- Git: 2.32.0 +- GitHub CLI: 1.11.0 - GNU parallel 20210422 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.1 @@ -92,19 +92,20 @@ ### Tools -- Aliyun CLI 3.0.77 +- Aliyun CLI 3.0.79 - App Center CLI 2.9.0 -- AWS CLI 2.2.7 -- AWS SAM CLI 1.23.0 +- AWS CLI 2.2.9 +- AWS SAM CLI 1.24.0 - AWS Session Manager CLI 1.2.54.0 -- Azure CLI 2.24.0 +- Azure CLI 2.24.2 - Cabal 3.4.0.0 - Cmake 3.20.3 -- Fastlane 2.184.1 +- Fastlane 2.185.0 - GHC 9.0.1 - GHCup v0.1.14.1 - Stack 2.7.1 - SwiftFormat 0.48.4 +- Swig 4.0.2 - Xcode Command Line Tools 12.4.0.0.1.1610135815 ### Linters @@ -115,27 +116,27 @@ - Safari 14.1.1 (15611.2.7.1.6) - SafariDriver 14.1.1 (15611.2.7.1.6) - Google Chrome 91.0.4472.77 -- ChromeDriver 90.0.4430.24 -- Microsoft Edge 91.0.864.37 -- MSEdgeDriver 91.0.864.37 -- Mozilla Firefox 88.0.1 +- ChromeDriver 91.0.4472.19 +- Microsoft Edge 91.0.864.41 +- MSEdgeDriver 91.0.864.41 +- Mozilla Firefox 89.0 - geckodriver 0.29.1 #### Environment variables | Name | Value | | --------------- | --------------------------------------------- | -| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/90.0.4430.24 | +| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/91.0.4472.19 | | EDGEWEBDRIVER | /usr/local/share/edge_driver | | GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | ### Java -| Version | Vendor | Environment Variable | -| ----------- | ------------- | -------------------- | -| 8.0.292+10 | Adopt OpenJDK | JAVA_HOME_8_X64 | -| 11.0.11+9 | Adopt OpenJDK | JAVA_HOME_11_X64 | -| 12.0.2+10.3 | Adopt OpenJDK | JAVA_HOME_12_X64 | -| 13.0.2+8.1 | Adopt OpenJDK | JAVA_HOME_13_X64 | -| 14.0.2+12 | Adopt OpenJDK | JAVA_HOME_14_X64 | +| Version | Vendor | Environment Variable | +| -------------------- | ------------- | -------------------- | +| 8.0.292+10 (default) | Adopt OpenJDK | JAVA_HOME_8_X64 | +| 11.0.11+9 | Adopt OpenJDK | JAVA_HOME_11_X64 | +| 12.0.2+10.3 | Adopt OpenJDK | JAVA_HOME_12_X64 | +| 13.0.2+8.1 | Adopt OpenJDK | JAVA_HOME_13_X64 | +| 14.0.2+12 | Adopt OpenJDK | JAVA_HOME_14_X64 | ### Cached Tools #### Ruby @@ -166,8 +167,8 @@ #### Go - 1.13.15 - 1.14.15 -- 1.15.12 -- 1.16.4 +- 1.15.13 +- 1.16.5 ### Rust Tools - Cargo 1.52.0 @@ -202,7 +203,7 @@ ### Xamarin #### Visual Studio for Mac -- 8.9.10.4 +- 8.10.0.1773 #### Xamarin bundles | symlink | Xamarin.Mono | Xamarin.iOS | Xamarin.Mac | Xamarin.Android | From ff4ba2e7258b8183db5cc13d30a840222a149ac0 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Thu, 10 Jun 2021 09:19:50 +0300 Subject: [PATCH 0315/3485] Don't install KB5003638 update as it breaks the VM (#3557) --- images/win/scripts/Installers/Install-WindowsUpdates.ps1 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/images/win/scripts/Installers/Install-WindowsUpdates.ps1 b/images/win/scripts/Installers/Install-WindowsUpdates.ps1 index eb19a3ea020a..4c02c9f45098 100644 --- a/images/win/scripts/Installers/Install-WindowsUpdates.ps1 +++ b/images/win/scripts/Installers/Install-WindowsUpdates.ps1 @@ -5,4 +5,10 @@ ################################################################################ Write-Host "Run windows updates" +# KB5003638 causes the windows server 2016 virtual machine to hang on shutdown step +if (Test-IsWin16) { + Get-WUInstall -MicrosoftUpdate + Write-Host "Hide update KB5003638" + Hide-WindowsUpdate -Confirm:$false -KBArticleID "KB5003638" +} Get-WUInstall -MicrosoftUpdate -AcceptAll -Install -IgnoreUserInput -IgnoreReboot From a9d832d671ca99f3a518c6da8306c860df34cd29 Mon Sep 17 00:00:00 2001 From: Sergey Dolin Date: Thu, 10 Jun 2021 13:17:30 +0500 Subject: [PATCH 0316/3485] [ubuntu] installing the latest .NET sdk patch version for every feature version (#3550) * installing the latest patch version for every feature version * simplify versions computing * fix space Co-authored-by: Sergey Dolin --- images/linux/scripts/installers/dotnetcore-sdk.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/images/linux/scripts/installers/dotnetcore-sdk.sh b/images/linux/scripts/installers/dotnetcore-sdk.sh index b2b6d0e60575..bcbcde99cd16 100644 --- a/images/linux/scripts/installers/dotnetcore-sdk.sh +++ b/images/linux/scripts/installers/dotnetcore-sdk.sh @@ -36,7 +36,8 @@ for version in ${DOTNET_VERSIONS[@]}; do rm ./${version}.json done -sortedSdks=$(echo ${sdks[@]} | tr ' ' '\n' | grep -v preview | grep -v rc | grep -v display | cut -d\" -f2 | sort -u -r) +sortedSdks=$(echo ${sdks[@]} | tr ' ' '\n' | grep -v preview | grep -v rc | grep -v display | cut -d\" -f2 | sort -r | uniq -w 5) + extract_dotnet_sdk() { local ARCHIVE_NAME="$1" set -e @@ -66,4 +67,4 @@ setEtcEnvironmentVariable DOTNET_NOLOGO 1 setEtcEnvironmentVariable DOTNET_MULTILEVEL_LOOKUP 0 prependEtcEnvironmentPath '$HOME/.dotnet/tools' -invoke_tests "DotnetSDK" \ No newline at end of file +invoke_tests "DotnetSDK" From 24ae664aedf0c3b471057a514208290c26786834 Mon Sep 17 00:00:00 2001 From: Sergey Dolin Date: Thu, 10 Jun 2021 13:21:02 +0500 Subject: [PATCH 0317/3485] [ubunty] Add note about LLVM repo (#3523) * Add LLVM libc++ info * combine clang, clang-format into LLVM components * fix formatting Co-authored-by: Sergey Dolin --- .../SoftwareReport/SoftwareReport.Common.psm1 | 7 +++++++ .../SoftwareReport/SoftwareReport.Generator.ps1 | 16 +++++++++++----- images/linux/scripts/installers/clang.sh | 2 ++ 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 index 37e5ff3a697f..48c10986ef11 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 @@ -44,6 +44,13 @@ function Get-ClangVersions { return "Clang " + $clangVersions } +function Get-LLVMInfo { + $clangVersions = Get-ClangToolVersions -ToolName "clang" + $clangFormatVersions = Get-ClangToolVersions -ToolName "clang-format" + $aptSourceRepo = Get-AptSourceRepository -PackageName "llvm" + return "LLVM components: Clang $clangFormatVersions, Clang-format $clangFormatVersions (apt source: $aptSourceRepo)" +} + function Get-ClangFormatVersions { $clangFormatVersions = Get-ClangToolVersions -ToolName "clang-format" return "Clang-format " + $clangFormatVersions diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index 6941c36cef37..704639c3249e 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -35,12 +35,10 @@ $markdown += New-MDList -Style Unordered -Lines @( $markdown += New-MDHeader "Installed Software" -Level 2 $markdown += New-MDHeader "Language and Runtime" -Level 3 -$markdown += New-MDList -Style Unordered -Lines (@( +$runtimesList = @( (Get-BashVersion), (Get-CPPVersions), (Get-FortranVersions), - (Get-ClangVersions), - (Get-ClangFormatVersions), (Get-ErlangVersion), (Get-ErlangRebar3Version), (Get-MonoVersion), @@ -52,8 +50,16 @@ $markdown += New-MDList -Style Unordered -Lines (@( (Get-RubyVersion), (Get-SwiftVersion), (Get-JuliaVersion) - ) | Sort-Object -) + ) + +if (Test-IsUbuntu20) { + $runtimesList += (Get-LLVMInfo) +} else { + $runtimesList += (Get-ClangVersions) + $runtimesList += (Get-ClangFormatVersions) +} + +$markdown += New-MDList -Style Unordered -Lines ($runtimesList | Sort-Object) $markdown += New-MDHeader "Package Management" -Level 3 diff --git a/images/linux/scripts/installers/clang.sh b/images/linux/scripts/installers/clang.sh index 688de477926d..3e808066db9b 100644 --- a/images/linux/scripts/installers/clang.sh +++ b/images/linux/scripts/installers/clang.sh @@ -15,6 +15,8 @@ function InstallClang { if [[ $version =~ 9 ]] && isUbuntu16 || [[ $version =~ 12 ]]; then ./llvm.sh $version apt-get install -y "clang-format-$version" + llvm_repo=$(grep '^deb.*apt.llvm.org\/' /etc/apt/sources.list) + echo "llvm $llvm_repo" >> $HELPER_SCRIPTS/apt-sources.txt else apt-get install -y "clang-$version" "lldb-$version" "lld-$version" "clang-format-$version" fi From 9ffd5d885883964d6fd46b38b0fe024980cf2139 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 10 Jun 2021 16:03:55 +0000 Subject: [PATCH 0318/3485] Updating readme file for ubuntu18 version 20210606.1 (#3532) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/linux/Ubuntu1804-README.md | 56 ++++++++++++++++--------------- 1 file changed, 29 insertions(+), 27 deletions(-) diff --git a/images/linux/Ubuntu1804-README.md b/images/linux/Ubuntu1804-README.md index 066573d04d27..98f4c5ebffbb 100644 --- a/images/linux/Ubuntu1804-README.md +++ b/images/linux/Ubuntu1804-README.md @@ -1,21 +1,21 @@ | Announcements | |-| -| [[ubuntu] GCC and Gfortran 11 will be removed on May, 31](https://github.com/actions/virtual-environments/issues/3467) | | [[Ubuntu] .NET SDK pre-installation policy will be changed on June 14](https://github.com/actions/virtual-environments/issues/3338) | | [Ubuntu 16.04 environment will be removed on September 20, 2021](https://github.com/actions/virtual-environments/issues/3287) | *** # Ubuntu 18.04.5 LTS -- Linux kernel version: 5.4.0-1047-azure -- Image Version: 20210531.0 +- Linux kernel version: 5.4.0-1048-azure +- Image Version: 20210606.1 ## Installed Software ### Language and Runtime - Bash 4.4.20(1)-release - Clang 9.0.0 - Clang-format 9.0.0 -- Erlang 24.0.1 (Eshell 12.0.1) -- GNU C++ 7.5.0, 9.3.0, 10.3.0 -- GNU Fortran 7.5.0, 9.3.0, 10.3.0 +- Erlang 24.0.2 (Eshell 12.0.2) +- Erlang rebar3 3.16.1 +- GNU C++ 7.5.0, 9.4.0, 10.3.0 +- GNU Fortran 7.5.0, 9.4.0, 10.3.0 - Julia 1.6.1 - Mono 6.12.0.122 (apt source repository: https://download.mono-project.com/repo/ubuntu stable-bionic main) - MSBuild 16.6.0.15201 (from /usr/lib/mono/msbuild/15.0/bin/MSBuild.dll) @@ -36,7 +36,7 @@ - Pip3 9.0.1 - Pipx 0.16.3 - RubyGems 2.7.6 -- Vcpkg (build from master \<7bc5b8c>) +- Vcpkg (build from master \) - Yarn 1.22.10 #### Environment variables @@ -49,7 +49,7 @@ - Ant 1.10.5 - Gradle 7.0.2 - Maven 3.8.1 -- Sbt 1.5.2 +- Sbt 1.5.3 ### Tools - Ansible 2.10.10 @@ -69,7 +69,7 @@ - Git-ftp 1.3.1 - Haveged 1.9.1 - Heroku 7.54.0 -- HHVM (HipHop VM) 4.111.0 +- HHVM (HipHop VM) 4.112.0 - jq 1.5 - Kind 0.11.1 - Kubectl 1.20.1-5-g76a04fc @@ -84,28 +84,28 @@ - Packer 1.7.2 - PhantomJS 2.1.1 - Podman 3.0.1 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- Pulumi 3.3.1 +- Pulumi 3.4.0 - R 4.1.0 - Skopeo 1.2.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 - SVN 1.9.7 -- Terraform 0.15.4 +- Terraform 0.15.5 - yamllint 1.26.1 - zstd 1.5.0 (homebrew) ### CLI Tools -- Alibaba Cloud CLI 3.0.77 -- AWS CLI 1.19.84 +- Alibaba Cloud CLI 3.0.79 +- AWS CLI 1.19.88 - AWS CLI Session manager plugin 1.2.54.0 -- AWS SAM CLI 1.23.0 -- Azure CLI (azure-cli) 2.24.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) +- AWS SAM CLI 1.24.0 +- Azure CLI (azure-cli) 2.24.2 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.18.0 -- GitHub CLI 1.10.3 -- Google Cloud SDK 342.0.0 (apt source repository: https://packages.cloud.google.com/apt) +- GitHub CLI 1.11.0 +- Google Cloud SDK 343.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 3.32.5 -- OpenShift CLI 4.7.12 -- ORAS CLI 0.11.1 +- Netlify CLI 3.35.1 +- OpenShift CLI 4.7.13 +- ORAS CLI 0.12.0 - Vercel CLI 23.0.0 ### Java @@ -118,10 +118,12 @@ ### PHP | Tool | Version | | -------- | --------------------------------- | -| PHP | 7.1.33 7.2.34 7.3.28 7.4.18 8.0.5 | -| Composer | 2.0.14 | -| PHPUnit | 8.5.15 | - +| PHP | 7.1.33 7.2.34 7.3.28 7.4.20 8.0.7 | +| Composer | 2.1.1 | +| PHPUnit | 8.5.16 | +``` + Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. +``` ### Haskell - Cabal 3.4.0.0 - GHC 9.0.1 (apt source repository: ppa:hvr/ghc) @@ -145,7 +147,7 @@ ### Browsers and Drivers - Google Chrome 91.0.4472.77 - ChromeDriver 91.0.4472.19 -- Mozilla Firefox 88.0.1 +- Mozilla Firefox 89.0 - Geckodriver 0.29.1 - Chromium 91.0.4472.0 @@ -177,7 +179,7 @@ #### Go - 1.13.15 - 1.14.15 -- 1.15.12 +- 1.15.13 #### Node.js - 10.24.1 @@ -208,7 +210,7 @@ | --------------- | ----------------------------------- | ------------ | | GOROOT_1_13_X64 | /opt/hostedtoolcache/go/1.13.15/x64 | x64 | | GOROOT_1_14_X64 | /opt/hostedtoolcache/go/1.14.15/x64 | x64 | -| GOROOT_1_15_X64 | /opt/hostedtoolcache/go/1.15.12/x64 | x64 | +| GOROOT_1_15_X64 | /opt/hostedtoolcache/go/1.15.13/x64 | x64 | ### PowerShell Tools - PowerShell 7.1.3 From 988823832755bbe089b3d1ba2179a283ffa14a65 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 10 Jun 2021 16:19:27 +0000 Subject: [PATCH 0319/3485] Updating readme file for ubuntu20 version 20210606.1 (#3533) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/linux/Ubuntu2004-README.md | 58 ++++++++++++++++--------------- 1 file changed, 30 insertions(+), 28 deletions(-) diff --git a/images/linux/Ubuntu2004-README.md b/images/linux/Ubuntu2004-README.md index 21b6e5ba995e..99c07953dcb9 100644 --- a/images/linux/Ubuntu2004-README.md +++ b/images/linux/Ubuntu2004-README.md @@ -1,19 +1,19 @@ | Announcements | |-| -| [[ubuntu] GCC and Gfortran 11 will be removed on May, 31](https://github.com/actions/virtual-environments/issues/3467) | | [[Ubuntu] .NET SDK pre-installation policy will be changed on June 14](https://github.com/actions/virtual-environments/issues/3338) | | [Ubuntu 16.04 environment will be removed on September 20, 2021](https://github.com/actions/virtual-environments/issues/3287) | *** # Ubuntu 20.04.2 LTS -- Linux kernel version: 5.4.0-1047-azure -- Image Version: 20210531.0 +- Linux kernel version: 5.8.0-1033-azure +- Image Version: 20210606.1 ## Installed Software ### Language and Runtime - Bash 5.0.17(1)-release - Clang 10.0.0, 11.0.0, 12.0.1 - Clang-format 10.0.0, 11.0.0, 12.0.1 -- Erlang 24.0.1 (Eshell 12.0.1) +- Erlang 24.0.2 (Eshell 12.0.2) +- Erlang rebar3 3.16.1 - GNU C++ 9.3.0, 10.2.0 - GNU Fortran 9.3.0, 10.2.0 - Julia 1.6.1 @@ -36,7 +36,7 @@ - Pip3 20.0.2 - Pipx 0.16.3 - RubyGems 3.1.2 -- Vcpkg (build from master \<7bc5b8c>) +- Vcpkg (build from master \) - Yarn 1.22.10 #### Environment variables @@ -50,7 +50,7 @@ - Gradle 7.0.2 - Lerna 4.0.0 - Maven 3.8.1 -- Sbt 1.5.2 +- Sbt 1.5.3 ### Tools - Ansible 2.10.10 @@ -65,13 +65,13 @@ - Docker-Buildx 0.5.1 - Docker-Moby Client 20.10.6+azure - Docker-Moby Server 20.10.6+azure -- Fastlane 2.184.1 +- Fastlane 2.185.0 - Git 2.31.1 (apt source repository: ppa:git-core/ppa) - Git LFS 2.13.3 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.6.0 - Haveged 1.9.1 - Heroku 7.54.0 -- HHVM (HipHop VM) 4.111.0 +- HHVM (HipHop VM) 4.112.0 - jq 1.6 - Kind 0.11.1 - Kubectl 1.20.1-5-g76a04fc @@ -86,28 +86,28 @@ - Packer 1.7.2 - PhantomJS 2.1.1 - Podman 3.1.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- Pulumi 3.3.1 +- Pulumi 3.4.0 - R 4.1.0 - Skopeo 1.2.3 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 -- Terraform 0.15.4 +- Terraform 0.15.5 - yamllint 1.26.1 - zstd 1.5.0 (homebrew) ### CLI Tools -- Alibaba Cloud CLI 3.0.77 -- AWS CLI 2.2.7 +- Alibaba Cloud CLI 3.0.79 +- AWS CLI 2.2.9 - AWS CLI Session manager plugin 1.2.54.0 -- AWS SAM CLI 1.23.0 -- Azure CLI (azure-cli) 2.24.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) +- AWS SAM CLI 1.24.0 +- Azure CLI (azure-cli) 2.24.2 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.18.0 -- GitHub CLI 1.10.3 -- Google Cloud SDK 342.0.0 (apt source repository: https://packages.cloud.google.com/apt) +- GitHub CLI 1.11.0 +- Google Cloud SDK 343.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 3.32.5 -- OpenShift CLI 4.7.12 -- ORAS CLI 0.11.1 +- Netlify CLI 3.35.1 +- OpenShift CLI 4.7.13 +- ORAS CLI 0.12.0 - Vercel CLI 23.0.0 ### Java @@ -124,10 +124,12 @@ ### PHP | Tool | Version | | -------- | ------------ | -| PHP | 7.4.18 8.0.5 | -| Composer | 2.0.14 | -| PHPUnit | 8.5.15 | - +| PHP | 7.4.20 8.0.7 | +| Composer | 2.1.1 | +| PHPUnit | 8.5.16 | +``` + Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. +``` ### Haskell - Cabal 3.4.0.0 - GHC 9.0.1 (apt source repository: ppa:hvr/ghc) @@ -151,7 +153,7 @@ ### Browsers and Drivers - Google Chrome 91.0.4472.77 - ChromeDriver 91.0.4472.19 -- Mozilla Firefox 88.0.1 +- Mozilla Firefox 89.0 - Geckodriver 0.29.1 - Chromium 91.0.4472.0 @@ -182,8 +184,8 @@ ### Cached Tools #### Go - 1.14.15 -- 1.15.12 -- 1.16.4 +- 1.15.13 +- 1.16.5 #### Node.js - 10.24.1 @@ -213,8 +215,8 @@ | Name | Value | Architecture | | --------------- | ----------------------------------- | ------------ | | GOROOT_1_14_X64 | /opt/hostedtoolcache/go/1.14.15/x64 | x64 | -| GOROOT_1_15_X64 | /opt/hostedtoolcache/go/1.15.12/x64 | x64 | -| GOROOT_1_16_X64 | /opt/hostedtoolcache/go/1.16.4/x64 | x64 | +| GOROOT_1_15_X64 | /opt/hostedtoolcache/go/1.15.13/x64 | x64 | +| GOROOT_1_16_X64 | /opt/hostedtoolcache/go/1.16.5/x64 | x64 | ### PowerShell Tools - PowerShell 7.1.3 From edd787f61b9e9f6b636fdfb8523f633de24e8fc2 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Thu, 10 Jun 2021 21:33:10 +0300 Subject: [PATCH 0320/3485] [Windows] Upgrade az powershell module from 5.7.0 to 5.9.0 (#3561) * Add az ps module 5.9.0 to the windows images, move 5.7.0 to zip * Remove 5.7.0 from zip version as it's usage is low based on the telemetry --- images/win/toolsets/toolset-2016.json | 2 +- images/win/toolsets/toolset-2019.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/images/win/toolsets/toolset-2016.json b/images/win/toolsets/toolset-2016.json index 406d85b3c460..0cd62ff97574 100644 --- a/images/win/toolsets/toolset-2016.json +++ b/images/win/toolsets/toolset-2016.json @@ -121,7 +121,7 @@ "name": "az", "url" : "https://raw.githubusercontent.com/Azure/az-ps-module-versions/main/versions-manifest.json", "versions": [ - "5.7.0" + "5.9.0" ], "zip_versions": [ "1.0.0", diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index 4b08332a0e9f..84841df8ca84 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -121,7 +121,7 @@ "name": "az", "url" : "https://raw.githubusercontent.com/Azure/az-ps-module-versions/main/versions-manifest.json", "versions": [ - "5.7.0" + "5.9.0" ], "zip_versions": [ "1.0.0", From 49967f87129f1c358eef537b0df5d0a5903dd668 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Thu, 10 Jun 2021 21:33:43 +0300 Subject: [PATCH 0321/3485] [ubuntu] Change azure ps module from 5.7.0 to 5.9.0 for Ubuntu 18 & 20 (#3562) --- images/linux/toolsets/toolset-1804.json | 2 +- images/linux/toolsets/toolset-2004.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index b78e3ce3103e..174e2f9faf6d 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -109,7 +109,7 @@ "name": "az", "url" : "https://raw.githubusercontent.com/Azure/az-ps-module-versions/main/versions-manifest.json", "versions": [ - "5.7.0" + "5.9.0" ], "zip_versions": [ "3.1.0", diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index 6bd1616cc4a4..8d4ef4c3d71b 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -107,7 +107,7 @@ "name": "az", "url" : "https://raw.githubusercontent.com/Azure/az-ps-module-versions/main/versions-manifest.json", "versions": [ - "5.7.0" + "5.9.0" ], "zip_versions": [ "3.1.0", From fd620b053f3a79fd6dde9318bafa262f0861d8d4 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Thu, 10 Jun 2021 21:34:17 +0300 Subject: [PATCH 0322/3485] [macOS] Upgrade azure powershell from 5.7.0 to 5.9.0 on macOS images (#3563) --- images/macos/toolsets/toolset-10.14.json | 2 +- images/macos/toolsets/toolset-10.15.json | 2 +- images/macos/toolsets/toolset-11.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/images/macos/toolsets/toolset-10.14.json b/images/macos/toolsets/toolset-10.14.json index 7ed810ee16d6..bdc2cddd9392 100644 --- a/images/macos/toolsets/toolset-10.14.json +++ b/images/macos/toolsets/toolset-10.14.json @@ -224,7 +224,7 @@ { "name": "Az", "versions": [ - "5.7.0" + "5.9.0" ] }, {"name": "MarkdownPS"}, diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index c321a4aa520f..0f76064932aa 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -176,7 +176,7 @@ { "name": "Az", "versions": [ - "5.7.0" + "5.9.0" ] }, {"name": "MarkdownPS"}, diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index 588522b72d50..da3ae6249912 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -125,7 +125,7 @@ { "name": "Az", "versions": [ - "5.7.0" + "5.9.0" ] }, {"name": "MarkdownPS"}, From 6c587ebe5d45482ee604dcbd1b3f53a7499f9f06 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Thu, 10 Jun 2021 21:34:49 +0300 Subject: [PATCH 0323/3485] [macOS] Upgrade Xamarin ios and mac versions from .1 to .3 (#3564) --- images/macos/toolsets/toolset-11.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index da3ae6249912..ee6f328a1636 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -16,10 +16,10 @@ "6.12.0.125" ], "ios-versions": [ - "14.20.0.1", "14.16.0.5", "14.14.2.5", "14.10.0.4", "14.8.0.3", "14.6.0.15", "14.4.1.3", "14.2.0.12", "14.0.0.0", "13.20.2.2" + "14.20.0.3", "14.16.0.5", "14.14.2.5", "14.10.0.4", "14.8.0.3", "14.6.0.15", "14.4.1.3", "14.2.0.12", "14.0.0.0", "13.20.2.2" ], "mac-versions": [ - "7.14.0.1", "7.10.0.5", "7.8.2.5", "7.4.0.10", "7.2.0.3", "7.0.0.15", "6.22.1.26", "6.20.2.2" + "7.14.0.3", "7.10.0.5", "7.8.2.5", "7.4.0.10", "7.2.0.3", "7.0.0.15", "6.22.1.26", "6.20.2.2" ], "android-versions": [ "11.3.0.1", "11.2.2.1", "11.1.0.26", "11.0.2.0" From 4416d54d30d2bdecaaa8c805374d93851fb9dbda Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Thu, 10 Jun 2021 22:33:08 +0300 Subject: [PATCH 0324/3485] [Ubuntu] Remove php installation, tests and software docs for Ubuntu 16 (#3541) * Remove php installation, tests and software docs for Ubuntu 16 * Add openssl 1.1.1k installation as python toolcache depends on it * Add a comment about openssl installation on Ubuntu 16 --- .../SoftwareReport/SoftwareReport.Generator.ps1 | 4 +++- images/linux/scripts/installers/basic.sh | 16 ++++++++++++++++ images/linux/scripts/tests/Common.Tests.ps1 | 2 +- images/linux/toolsets/toolset-1604.json | 11 ----------- images/linux/ubuntu1604.json | 1 - 5 files changed, 20 insertions(+), 14 deletions(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index 704639c3249e..004e15657241 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -185,7 +185,9 @@ if (Test-IsUbuntu20) { $markdown += New-MDNewLine } -$markdown += Build-PHPSection +if (-not (Test-IsUbuntu16)) { + $markdown += Build-PHPSection +} $markdown += New-MDHeader "Haskell" -Level 3 $markdown += New-MDList -Style Unordered -Lines (@( diff --git a/images/linux/scripts/installers/basic.sh b/images/linux/scripts/installers/basic.sh index 270cc75c837a..66875b8bf28b 100644 --- a/images/linux/scripts/installers/basic.sh +++ b/images/linux/scripts/installers/basic.sh @@ -4,6 +4,7 @@ ## Desc: Installs basic command line utilities and dev packages ################################################################################ source $HELPER_SCRIPTS/install.sh +source $HELPER_SCRIPTS/os.sh common_packages=$(get_toolset_value .apt.common_packages[]) cmd_packages=$(get_toolset_value .apt.cmd_packages[]) @@ -12,4 +13,19 @@ for package in $common_packages $cmd_packages; do apt-get install -y --no-install-recommends $package done +# Toolcache Python requires updated libssl-dev, which was previously installed from ppa:ondrej. +# The ppa dropped Ubuntu 16 support hence we need to build OpenSSL from source +if isUbuntu16; then + openSslArchiveName="openssl-1.1.1k.tar.gz" + openSslUrl="https://www.openssl.org/source/${openSslArchiveName}" + download_with_retries $openSslUrl "/tmp" + openSslPath="/tmp/$(basename -s .tar.gz $openSslArchiveName)" + mkdir -p "$openSslPath" + tar -C "$openSslPath" -xzf "/tmp/${openSslArchiveName}" --strip-components=1 && cd $openSslPath + ./config --openssldir=/etc/ssl '-Wl,--enable-new-dtags,-rpath,$(LIBRPATH)' + make -s + make install > /dev/null + ln -sf /etc/ssl/bin/openssl /usr/bin/openssl +fi + invoke_tests "Apt" \ No newline at end of file diff --git a/images/linux/scripts/tests/Common.Tests.ps1 b/images/linux/scripts/tests/Common.Tests.ps1 index b6ad0cacbf2c..05f789277427 100644 --- a/images/linux/scripts/tests/Common.Tests.ps1 +++ b/images/linux/scripts/tests/Common.Tests.ps1 @@ -1,4 +1,4 @@ -Describe "PHP" { +Describe "PHP" -Skip:(Test-IsUbuntu16) { [array]$testCases = (Get-ToolsetContent).php.versions | ForEach-Object { @{phpVersion = $_} } diff --git a/images/linux/toolsets/toolset-1604.json b/images/linux/toolsets/toolset-1604.json index 6cc4906c5f52..90450b264174 100644 --- a/images/linux/toolsets/toolset-1604.json +++ b/images/linux/toolsets/toolset-1604.json @@ -253,17 +253,6 @@ "gfortran-9" ] }, - "php": { - "versions": [ - "5.6", - "7.0", - "7.1", - "7.2", - "7.3", - "7.4", - "8.0" - ] - }, "rubygems": [], "node_modules": [ { diff --git a/images/linux/ubuntu1604.json b/images/linux/ubuntu1604.json index 39579597b5bb..7c26e18c7b16 100644 --- a/images/linux/ubuntu1604.json +++ b/images/linux/ubuntu1604.json @@ -227,7 +227,6 @@ "{{template_dir}}/scripts/installers/bazel.sh", "{{template_dir}}/scripts/installers/oras-cli.sh", "{{template_dir}}/scripts/installers/phantomjs.sh", - "{{template_dir}}/scripts/installers/php.sh", "{{template_dir}}/scripts/installers/postgresql.sh", "{{template_dir}}/scripts/installers/pulumi.sh", "{{template_dir}}/scripts/installers/ruby.sh", From bb728f4d0791bdda1bc79925e2684c62cc85566f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 14 Jun 2021 14:15:37 +0000 Subject: [PATCH 0325/3485] Updating readme file for win19 version 20210608.0 (#3554) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/win/Windows2019-Readme.md | 67 ++++++++++++++++---------------- 1 file changed, 34 insertions(+), 33 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index c550a650b372..0401fc392e2b 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -1,6 +1,6 @@ # Microsoft Windows Server 2019 Datacenter -- OS Version: 10.0.17763 Build 1935 -- Image Version: 20210531.1 +- OS Version: 10.0.17763 Build 1999 +- Image Version: 20210608.0 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -8,25 +8,25 @@ ## Installed Software ### Language and Runtime - Bash 4.4.23(1)-release -- Go 1.15.12 +- Go 1.15.13 - Julia 1.6.1 - Node 14.17.0 - Perl 5.32.1 -- PHP 8.0.6 +- PHP 8.0.7 - Python 3.7.9 - Ruby 2.5.9p229 ### Package Management - Chocolatey 0.10.15 -- Composer 2.0.14 +- Composer 2.1.2 - Helm 3.6.0 -- Miniconda 4.9.2 +- Miniconda 4.9.2 (pre-installed on the image but not added to PATH) - NPM 6.14.13 - NuGet 5.9.1.11 - pip 21.1.2 (python 3.7) - Pipx 0.16.3 - RubyGems 2.7.6.3 -- Vcpkg (build from master \<7bc5b8c>) +- Vcpkg (build from master \<38d2893>) - Yarn 1.22.10 #### Environment variables @@ -39,7 +39,7 @@ - Ant 1.10.10 - Gradle 7.0 - Maven 3.8.1 -- sbt 1.5.2 +- sbt 1.5.3 ### Tools - 7zip 19.00 @@ -52,10 +52,10 @@ - Docker 20.10.5 - Docker-compose 1.29.1 - ghc 9.0.1 -- Git 2.31.1 +- Git 2.32.0 - Git LFS 2.13.3 -- Google Cloud SDK 342.0.0 -- InnoSetup 6.1.2 +- Google Cloud SDK 344.0.0 +- InnoSetup 6.2.0 - jq 1.6 - Kind 0.11.1 - Kubectl 1.21.1 @@ -65,31 +65,32 @@ - NSIS v3.06.1 - OpenSSL 1.1.1 - Packer 1.7.2 -- Pulumi v3.3.1 +- Pulumi v3.4.0 - R 4.1.0 - Stack 2.7.1 - Subversion (SVN) 1.14.1 +- Swig 4.0.2 - VSWhere 2.8.4 - WinAppDriver 1.2.2009.02003 - yamllint 1.26.1 - zstd 1.5.0 ### CLI Tools -- Alibaba Cloud CLI 3.0.77 -- AWS CLI 2.2.7 -- AWS SAM CLI 1.23.0 +- Alibaba Cloud CLI 3.0.79 +- AWS CLI 2.2.9 +- AWS SAM CLI 1.24.1 - AWS Session Manager CLI 1.2.54.0 -- Azure CLI 2.24.0 +- Azure CLI 2.24.2 - Azure DevOps CLI extension 0.18.0 - Cloud Foundry CLI 6.53.0 -- GitHub CLI 1.10.3 +- GitHub CLI 1.11.0 - Hub CLI 2.14.2 ### Rust Tools - Cargo 1.52.0 - Rust 1.52.1 - Rustdoc 1.52.1 -- Rustup 1.24.2 +- Rustup 1.24.3 #### Packages - bindgen 0.58.1 @@ -102,9 +103,9 @@ ### Browsers and webdrivers - Google Chrome 91.0.4472.77 - Chrome Driver 91.0.4472.19 -- Microsoft Edge 91.0.864.37 -- Microsoft Edge Driver 91.0.864.37 -- Mozilla Firefox 88.0.1 +- Microsoft Edge 91.0.864.41 +- Microsoft Edge Driver 91.0.864.41 +- Mozilla Firefox 89.0 - Gecko Driver 0.29.1 - IE Driver 3.150.1.0 @@ -145,8 +146,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | ------- | ------------ | -------------------- | | 1.13.15 | x64 | GOROOT_1_13_X64 | | 1.14.15 | x64 | GOROOT_1_14_X64 | -| 1.15.12 (Default) | x64 | GOROOT_1_15_X64 | -| 1.16.4 | x64 | GOROOT_1_16_X64 | +| 1.15.13 (Default) | x64 | GOROOT_1_15_X64 | +| 1.16.5 | x64 | GOROOT_1_16_X64 | #### Node @@ -224,13 +225,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.10.31321.278 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | +| Visual Studio Enterprise 2019 | 16.10.31402.337 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | #### Workloads, components and extensions: | Package | Version | | ------------------------------------------------------------------------- | --------------- | -| Component.Android.NDK.R16B | 16.10.31320.204 | +| Component.Android.NDK.R16B | 16.10.31401.40 | | Component.Android.SDK25.Private | 16.0.28625.61 | | Component.Android.SDK30 | 16.10.31205.252 | | Component.Ant | 1.9.3.8 | @@ -285,9 +286,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.Net.ComponentGroup.DevelopmentPrerequisites | 16.3.29207.166 | | Microsoft.Net.ComponentGroup.TargetingPacks.Common | 16.0.28516.191 | | Microsoft.NetCore.Component.DevelopmentTools | 16.10.31303.231 | -| Microsoft.NetCore.Component.Runtime.3.1 | 16.10.31320.204 | -| Microsoft.NetCore.Component.Runtime.5.0 | 16.10.31320.204 | -| Microsoft.NetCore.Component.SDK | 16.10.31320.204 | +| Microsoft.NetCore.Component.Runtime.3.1 | 16.10.31401.124 | +| Microsoft.NetCore.Component.Runtime.5.0 | 16.10.31401.124 | +| Microsoft.NetCore.Component.SDK | 16.10.31401.124 | | Microsoft.NetCore.Component.Web | 16.10.31303.231 | | Microsoft.VisualStudio.Component.AppInsights.Tools | 16.5.29515.121 | | Microsoft.VisualStudio.Component.AspNet45 | 16.10.31205.252 | @@ -450,7 +451,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | ms-biztalk.BizTalk | 3.13.2.0 | | ProBITools.MicrosoftAnalysisServicesModelingProjects | 2.9.17 | | ProBITools.MicrosoftReportProjectsforVisualStudio | 2.6.11 | -| SSIS.SqlServerIntegrationServicesProjects | 3.13.1 | +| SSIS.SqlServerIntegrationServicesProjects | 3.14 | | VisualStudioClient.MicrosoftVisualStudio2017InstallerProjects | 1.0.0 | | Windows Driver Kit | 10.0.19030.0 | | Windows Driver Kit Visual Studio Extension | 10.1.19041.685 | @@ -478,20 +479,20 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### .NET Core SDK `Location C:\Program Files\dotnet\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.519 2.1.520 2.1.521 2.1.522 2.1.523 2.1.524 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.616 2.1.617 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 2.1.811 2.1.812 2.1.813 2.1.814 2.1.815 2.1.816 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.109 3.1.110 3.1.111 3.1.112 3.1.113 3.1.114 3.1.115 3.1.200 3.1.201 3.1.202 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 3.1.408 3.1.409 5.0.100 5.0.101 5.0.102 5.0.103 5.0.104 5.0.200 5.0.201 5.0.202 5.0.203 5.0.300 +- 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.519 2.1.520 2.1.521 2.1.522 2.1.523 2.1.524 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.616 2.1.617 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 2.1.811 2.1.812 2.1.813 2.1.814 2.1.815 2.1.816 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.109 3.1.110 3.1.111 3.1.112 3.1.113 3.1.114 3.1.115 3.1.116 3.1.200 3.1.201 3.1.202 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 3.1.408 3.1.409 3.1.410 5.0.100 5.0.101 5.0.102 5.0.103 5.0.104 5.0.200 5.0.201 5.0.202 5.0.203 5.0.204 5.0.300 5.0.301 ### .NET Core Runtime `Location: C:\Program Files\dotnet\shared\Microsoft.AspNetCore.All` - 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23 2.1.24 2.1.25 2.1.26 2.1.27 2.1.28 `Location: C:\Program Files\dotnet\shared\Microsoft.AspNetCore.App` -- 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23 2.1.24 2.1.25 2.1.26 2.1.27 2.1.28 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9 3.1.10 3.1.11 3.1.12 3.1.13 3.1.14 3.1.15 5.0.0 5.0.1 5.0.2 5.0.3 5.0.4 5.0.5 5.0.6 +- 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23 2.1.24 2.1.25 2.1.26 2.1.27 2.1.28 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9 3.1.10 3.1.11 3.1.12 3.1.13 3.1.14 3.1.15 3.1.16 5.0.0 5.0.1 5.0.2 5.0.3 5.0.4 5.0.5 5.0.6 5.0.7 `Location: C:\Program Files\dotnet\shared\Microsoft.NETCore.App` -- 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23 2.1.24 2.1.25 2.1.26 2.1.27 2.1.28 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9 3.1.10 3.1.11 3.1.12 3.1.13 3.1.14 3.1.15 5.0.0 5.0.1 5.0.2 5.0.3 5.0.4 5.0.5 5.0.6 +- 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23 2.1.24 2.1.25 2.1.26 2.1.27 2.1.28 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9 3.1.10 3.1.11 3.1.12 3.1.13 3.1.14 3.1.15 3.1.16 5.0.0 5.0.1 5.0.2 5.0.3 5.0.4 5.0.5 5.0.6 5.0.7 `Location: C:\Program Files\dotnet\shared\Microsoft.WindowsDesktop.App` -- 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9 3.1.10 3.1.11 3.1.12 3.1.13 3.1.14 3.1.15 5.0.0 5.0.1 5.0.2 5.0.3 5.0.4 5.0.5 5.0.6 +- 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9 3.1.10 3.1.11 3.1.12 3.1.13 3.1.14 3.1.15 3.1.16 5.0.0 5.0.1 5.0.2 5.0.3 5.0.4 5.0.5 5.0.6 5.0.7 ### .NET Framework `Type: Developer Pack` From 7e05e372edd7ba6b22f32f48b6faf5ef3dd1ffc9 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 14 Jun 2021 17:47:39 +0000 Subject: [PATCH 0326/3485] Updating readme file for win16 version 20210609.1 (#3559) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/win/Windows2016-Readme.md | 65 ++++++++++++++++---------------- 1 file changed, 33 insertions(+), 32 deletions(-) diff --git a/images/win/Windows2016-Readme.md b/images/win/Windows2016-Readme.md index d48a4fe05c49..3482cf4fc81f 100644 --- a/images/win/Windows2016-Readme.md +++ b/images/win/Windows2016-Readme.md @@ -1,29 +1,29 @@ # Microsoft Windows Server 2016 Datacenter - OS Version: 10.0.14393 Build 4402 -- Image Version: 20210531.1 +- Image Version: 20210609.1 ## Installed Software ### Language and Runtime - Bash 4.4.23(1)-release -- Go 1.15.12 +- Go 1.15.13 - Julia 1.6.1 - Node 14.17.0 - Perl 5.32.1 -- PHP 8.0.6 +- PHP 8.0.7 - Python 3.7.9 - Ruby 2.5.9p229 ### Package Management - Chocolatey 0.10.15 -- Composer 2.0.14 +- Composer 2.1.3 - Helm 3.6.0 -- Miniconda 4.9.2 +- Miniconda 4.9.2 (pre-installed on the image but not added to PATH) - NPM 6.14.13 - NuGet 5.9.1.11 - pip 21.1.2 (python 3.7) - Pipx 0.16.3 - RubyGems 2.7.6.3 -- Vcpkg (build from master \<7bc5b8c>) +- Vcpkg (build from master \<38d2893>) - Yarn 1.22.10 #### Environment variables @@ -36,7 +36,7 @@ - Ant 1.10.10 - Gradle 7.0 - Maven 3.8.1 -- sbt 1.5.2 +- sbt 1.5.3 ### Tools - 7zip 19.00 @@ -49,10 +49,10 @@ - Docker 20.10.5 - Docker-compose 1.29.1 - ghc 9.0.1 -- Git 2.31.1 +- Git 2.32.0 - Git LFS 2.13.3 -- Google Cloud SDK 342.0.0 -- InnoSetup 6.1.2 +- Google Cloud SDK 344.0.0 +- InnoSetup 6.2.0 - jq 1.6 - Kind 0.11.1 - Kubectl 1.21.1 @@ -62,31 +62,32 @@ - NSIS v3.06.1 - OpenSSL 1.1.1 - Packer 1.7.2 -- Pulumi v3.3.1 +- Pulumi v3.4.0 - R 4.1.0 - Stack 2.7.1 - Subversion (SVN) 1.14.1 +- Swig 4.0.2 - VSWhere 2.8.4 - WinAppDriver 1.2.2009.02003 - yamllint 1.26.1 - zstd 1.5.0 ### CLI Tools -- Alibaba Cloud CLI 3.0.77 -- AWS CLI 2.2.7 -- AWS SAM CLI 1.23.0 +- Alibaba Cloud CLI 3.0.79 +- AWS CLI 2.2.10 +- AWS SAM CLI 1.24.1 - AWS Session Manager CLI 1.2.54.0 -- Azure CLI 2.24.0 +- Azure CLI 2.24.2 - Azure DevOps CLI extension 0.18.0 - Cloud Foundry CLI 6.53.0 -- GitHub CLI 1.10.3 +- GitHub CLI 1.11.0 - Hub CLI 2.14.2 ### Rust Tools - Cargo 1.52.0 - Rust 1.52.1 - Rustdoc 1.52.1 -- Rustup 1.24.2 +- Rustup 1.24.3 #### Packages - bindgen 0.58.1 @@ -97,11 +98,11 @@ - Rustfmt 1.4.36 ### Browsers and webdrivers -- Google Chrome 91.0.4472.77 +- Google Chrome 91.0.4472.101 - Chrome Driver 91.0.4472.19 -- Microsoft Edge 91.0.864.37 -- Microsoft Edge Driver 91.0.864.37 -- Mozilla Firefox 88.0.1 +- Microsoft Edge 91.0.864.41 +- Microsoft Edge Driver 91.0.864.41 +- Mozilla Firefox 89.0 - Gecko Driver 0.29.1 - IE Driver 3.150.1.0 @@ -139,8 +140,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | ------- | ------------ | -------------------- | | 1.13.15 | x64 | GOROOT_1_13_X64 | | 1.14.15 | x64 | GOROOT_1_14_X64 | -| 1.15.12 (Default) | x64 | GOROOT_1_15_X64 | -| 1.16.4 | x64 | GOROOT_1_16_X64 | +| 1.15.13 (Default) | x64 | GOROOT_1_15_X64 | +| 1.16.5 | x64 | GOROOT_1_16_X64 | #### Node @@ -487,20 +488,20 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### .NET Core SDK `Location C:\Program Files\dotnet\sdk` -- 1.1.14 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.519 2.1.520 2.1.521 2.1.522 2.1.523 2.1.524 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.616 2.1.617 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 2.1.811 2.1.812 2.1.813 2.1.814 2.1.815 2.1.816 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.109 3.1.110 3.1.111 3.1.112 3.1.113 3.1.114 3.1.115 3.1.200 3.1.201 3.1.202 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 3.1.408 3.1.409 5.0.100 5.0.101 5.0.102 5.0.103 5.0.104 5.0.200 5.0.201 5.0.202 5.0.203 5.0.300 +- 1.1.14 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.519 2.1.520 2.1.521 2.1.522 2.1.523 2.1.524 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.616 2.1.617 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 2.1.811 2.1.812 2.1.813 2.1.814 2.1.815 2.1.816 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.109 3.1.110 3.1.111 3.1.112 3.1.113 3.1.114 3.1.115 3.1.116 3.1.200 3.1.201 3.1.202 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 3.1.408 3.1.409 3.1.410 5.0.100 5.0.101 5.0.102 5.0.103 5.0.104 5.0.200 5.0.201 5.0.202 5.0.203 5.0.204 5.0.300 5.0.301 ### .NET Core Runtime `Location: C:\Program Files\dotnet\shared\Microsoft.AspNetCore.All` - 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23 2.1.24 2.1.25 2.1.26 2.1.27 2.1.28 `Location: C:\Program Files\dotnet\shared\Microsoft.AspNetCore.App` -- 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23 2.1.24 2.1.25 2.1.26 2.1.27 2.1.28 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9 3.1.10 3.1.11 3.1.12 3.1.13 3.1.14 3.1.15 5.0.0 5.0.1 5.0.2 5.0.3 5.0.4 5.0.5 5.0.6 +- 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23 2.1.24 2.1.25 2.1.26 2.1.27 2.1.28 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9 3.1.10 3.1.11 3.1.12 3.1.13 3.1.14 3.1.15 3.1.16 5.0.0 5.0.1 5.0.2 5.0.3 5.0.4 5.0.5 5.0.6 5.0.7 `Location: C:\Program Files\dotnet\shared\Microsoft.NETCore.App` -- 1.0.16 1.1.13 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23 2.1.24 2.1.25 2.1.26 2.1.27 2.1.28 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9 3.1.10 3.1.11 3.1.12 3.1.13 3.1.14 3.1.15 5.0.0 5.0.1 5.0.2 5.0.3 5.0.4 5.0.5 5.0.6 +- 1.0.16 1.1.13 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23 2.1.24 2.1.25 2.1.26 2.1.27 2.1.28 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9 3.1.10 3.1.11 3.1.12 3.1.13 3.1.14 3.1.15 3.1.16 5.0.0 5.0.1 5.0.2 5.0.3 5.0.4 5.0.5 5.0.6 5.0.7 `Location: C:\Program Files\dotnet\shared\Microsoft.WindowsDesktop.App` -- 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9 3.1.10 3.1.11 3.1.12 3.1.13 3.1.14 3.1.15 5.0.0 5.0.1 5.0.2 5.0.3 5.0.4 5.0.5 5.0.6 +- 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9 3.1.10 3.1.11 3.1.12 3.1.13 3.1.14 3.1.15 3.1.16 5.0.0 5.0.1 5.0.2 5.0.3 5.0.4 5.0.5 5.0.6 5.0.7 ### .NET Framework `Type: Developer Pack` @@ -538,7 +539,7 @@ All other versions are saved but not installed. | -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 4.0 | | Android SDK Build-tools | 30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3
26.0.0 26.0.1 26.0.2 26.0.3
25.0.0 25.0.1 25.0.2 25.0.3
24.0.0 24.0.1 24.0.2 24.0.3
23.0.1 23.0.2 23.0.3
22.0.1
21.1.2
20.0.0
19.1.0 | -| Android SDK Platforms | android-S (rev 4)
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 Platforms | android-S (rev 5)
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 Platform-Tools | 31.0.2 | | Android SDK Tools | 25.2.5 | | Android Support Repository | 47.0.0 | @@ -562,10 +563,10 @@ All other versions are saved but not installed. ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2016 | sha256:616e2816b0024ab7f69a58dfefd1bee58d6ac5501adb8abb9f52b104a1f0a5da | 2021-05-11 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2016 | sha256:7a7b03014820cb4bf0f9a137f33ceade2fa7102ee63a91de720b13bdce43bf3c | 2021-05-11 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2016 | sha256:7cc0e9e7599ea9b0a8ac9b0c809236d239ba4ab384270b91a371368d715f4156 | 2021-05-25 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2016 | sha256:80ebe3ac5d462f858967ed3af42b6abb4d774229aa65614e11f2229bb1eb67c7 | 2021-06-08 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2016 | sha256:af5a3ae6f3fe3ff6723eaa5cb25c10727760905e0b748fcdd7a74f2a0311b1bc | 2021-06-08 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2016 | sha256:43aa741b7d100954d86a824eab6e25c76b51e5eef92727d5744e8800efdb4089 | 2021-06-08 | | mcr.microsoft.com/windows/nanoserver:10.0.14393.953 | sha256:fc60bd5ae0e61b334ce1cf1bcbf20c10c36b4c5482a01da319c9c989f9e6e268 | 2017-03-08 | -| mcr.microsoft.com/windows/servercore:ltsc2016 | sha256:b96ee2b8278f1e62418473f47eefd22340b8c6cefbb565a630d28791efbea16d | 2021-04-26 | +| mcr.microsoft.com/windows/servercore:ltsc2016 | sha256:431315d3208b79a74c7e598aacb469f0e58a18977f5b93885b1d8d7027cae03d | 2021-06-06 | From 9f07fcc536cfcb1ea4630eb6ecf50ff884ca99d5 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 16 Jun 2021 07:41:46 +0000 Subject: [PATCH 0327/3485] Updating readme file for macOS-11 version 20210614.1 (#3587) Co-authored-by: Image generation service account --- images/macos/macos-11-Readme.md | 43 +++++++++++++++++---------------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/images/macos/macos-11-Readme.md b/images/macos/macos-11-Readme.md index d9621d88e42b..9932cd880de4 100644 --- a/images/macos/macos-11-Readme.md +++ b/images/macos/macos-11-Readme.md @@ -1,19 +1,20 @@ | Announcements | |-| +| [[macOS] Xcode 12.2 and 12.3 will be removed from Big Sur on June, 28](https://github.com/actions/virtual-environments/issues/3555) | | [[macOS] Default Xcode on Big Sur image will be set to Xcode 12.5 on June, 15](https://github.com/actions/virtual-environments/issues/3522) | | [macOS 11.0 pools will be transited to private preview.](https://github.com/actions/virtual-environments/issues/2486) | *** # macOS 11.4 info - System Version: macOS 11.4 (20F71) - Kernel Version: Darwin 20.5.0 -- Image Version: 20210608.6 +- Image Version: 20210614.1 ## Installed Software ### Language and Runtime -- .NET SDK 2.1.300 2.1.301 2.1.302 2.1.401 2.1.402 2.1.403 2.1.500 2.1.502 2.1.503 2.1.504 2.1.505 2.1.506 2.1.507 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 2.1.811 2.1.812 2.1.813 2.1.814 2.1.815 2.1.816 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 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 3.1.408 3.1.409 5.0.100 5.0.101 5.0.102 5.0.200 5.0.201 5.0.202 5.0.300 +- .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 2.1.811 2.1.812 2.1.813 2.1.814 2.1.815 2.1.816 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 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 3.1.408 3.1.409 3.1.410 5.0.100 5.0.101 5.0.102 5.0.200 5.0.201 5.0.202 5.0.300 5.0.301 - Bash 3.2.57(1)-release - Clang/LLVM 12.0.0 is available on `'$(brew --prefix llvm)/bin/clang'` -- Clang/LLVM 12.0.0 is default +- Clang/LLVM 12.0.5 is default - gcc-9 (Homebrew GCC 9.4.0) 9.4.0 - available by `gcc-9` alias - gcc-10 (Homebrew GCC 10.3.0) 10.3.0 - available by `gcc-10` alias - gcc-11 (Homebrew GCC 11.1.0_1) 11.1.0 - available by `gcc-11` alias @@ -33,19 +34,19 @@ - Ruby 2.7.3p183 ### Package Management -- Bundler version 2.2.19 +- Bundler version 2.2.20 - Carthage 0.38.0 - CocoaPods 1.10.1 -- Composer 2.1.2 -- Homebrew 3.1.10 +- Composer 2.1.3 +- Homebrew 3.1.12 - Miniconda 4.9.2 - NPM 6.14.13 - NuGet 5.6.0.6489 - Pip 20.3.4 (python 2.7) - Pip 21.1.1 (python 3.9) - Pipx 0.16.3 -- RubyGems 3.2.19 -- Vcpkg 2021 (build from master \<3199354>) +- RubyGems 3.2.20 +- Vcpkg 2021 (build from master \<14418e1>) - Yarn 1.22.5 #### Environment variables @@ -57,7 +58,7 @@ ### Project Management - Apache Ant(TM) 1.10.10 - Apache Maven 3.8.1 -- Gradle 7.0.2 +- Gradle 7.1 ### Utilities - 7-Zip 17.04 @@ -92,15 +93,15 @@ ### Tools - Aliyun CLI 3.0.79 - App Center CLI 2.9.0 -- AWS CLI 2.2.9 +- AWS CLI 2.2.11 - AWS SAM CLI 1.24.1 - AWS Session Manager CLI 1.2.54.0 - Azure CLI 2.24.2 - Cabal 3.4.0.0 - Cmake 3.20.3 -- Fastlane 2.185.0 +- Fastlane 2.185.1 - GHC 9.0.1 -- GHCup v0.1.14.1 +- GHCup v0.1.15.2 - Stack 2.7.1 - SwiftFormat 0.48.4 - Swig 4.0.2 @@ -113,10 +114,10 @@ ### Browsers - Safari 14.1.1 (16611.2.7.1.4) - SafariDriver 14.1.1 (16611.2.7.1.4) -- Google Chrome 91.0.4472.77 +- Google Chrome 91.0.4472.106 - ChromeDriver 91.0.4472.19 -- Microsoft Edge 91.0.864.41 -- MSEdgeDriver 91.0.864.41 +- Microsoft Edge 91.0.864.48 +- MSEdgeDriver 91.0.864.48 - Mozilla Firefox 89.0 - geckodriver 0.29.1 @@ -163,7 +164,7 @@ - Cargo 1.52.0 - Rust 1.52.1 - Rustdoc 1.52.1 -- Rustup 1.24.2 +- Rustup 1.24.3 #### Packages - Bindgen 0.58.1 @@ -179,7 +180,7 @@ #### PowerShell Modules | Module | Version | | ---------------- | ------- | -| Az | 5.7.0 | +| Az | 5.9.0 | | MarkdownPS | 1.9 | | Pester | 5.2.2 | | PSScriptAnalyzer | 1.19.1 | @@ -192,7 +193,7 @@ ### Xamarin #### Visual Studio for Mac -- 8.10.0.1773 +- 8.10.1.71 #### Xamarin bundles | symlink | Xamarin.Mono | Xamarin.iOS | Xamarin.Mac | Xamarin.Android | @@ -215,8 +216,8 @@ | Version | Build | Path | | -------------- | -------- | ---------------------------- | | 13.0 (beta) | 13A5154h | /Applications/Xcode_13.0.app | -| 12.5 | 12E262 | /Applications/Xcode_12.5.app | -| 12.4 (default) | 12D4e | /Applications/Xcode_12.4.app | +| 12.5 (default) | 12E262 | /Applications/Xcode_12.5.app | +| 12.4 | 12D4e | /Applications/Xcode_12.4.app | | 12.3 | 12C33 | /Applications/Xcode_12.3.app | | 12.2 | 12B45b | /Applications/Xcode_12.2.app | | 11.7 | 11E801a | /Applications/Xcode_11.7.app | @@ -299,7 +300,7 @@ | Android Command Line Tools | 4.0 | | Android Emulator | 30.6.5 | | Android SDK Build-tools | 30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3 | -| Android SDK Platforms | android-S (rev 4)
android-30 (rev 3)
android-29 (rev 5)
android-28 (rev 6)
android-27 (rev 3) | +| Android SDK Platforms | android-S (rev 5)
android-30 (rev 3)
android-29 (rev 5)
android-28 (rev 6)
android-27 (rev 3) | | Android SDK Platform-Tools | 31.0.2 | | Android SDK Tools | 26.1.1 | | Android Support Repository | 47.0.0 | From 1eb3d364c3ca7f6a3af964df1944a46a49d3a701 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 17 Jun 2021 07:54:37 +0000 Subject: [PATCH 0328/3485] Updating readme file for ubuntu18 version 20210614.1 (#3580) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/linux/Ubuntu1804-README.md | 46 +++++++++++++++---------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/images/linux/Ubuntu1804-README.md b/images/linux/Ubuntu1804-README.md index 98f4c5ebffbb..cda8f621dd9f 100644 --- a/images/linux/Ubuntu1804-README.md +++ b/images/linux/Ubuntu1804-README.md @@ -4,8 +4,8 @@ | [Ubuntu 16.04 environment will be removed on September 20, 2021](https://github.com/actions/virtual-environments/issues/3287) | *** # Ubuntu 18.04.5 LTS -- Linux kernel version: 5.4.0-1048-azure -- Image Version: 20210606.1 +- Linux kernel version: 5.4.0-1049-azure +- Image Version: 20210614.1 ## Installed Software ### Language and Runtime @@ -29,14 +29,14 @@ ### Package Management - cpan 1.64 - Helm 3.6.0 -- Homebrew 3.1.9 +- Homebrew 3.1.12 - Miniconda 4.9.2 - Npm 6.14.13 - Pip 9.0.1 - Pip3 9.0.1 - Pipx 0.16.3 - RubyGems 2.7.6 -- Vcpkg (build from master \) +- Vcpkg (build from master \<92b42c4>) - Yarn 1.22.10 #### Environment variables @@ -49,7 +49,7 @@ - Ant 1.10.5 - Gradle 7.0.2 - Maven 3.8.1 -- Sbt 1.5.3 +- Sbt 1.5.4 ### Tools - Ansible 2.10.10 @@ -64,12 +64,12 @@ - Docker-Buildx 0.5.1 - Docker-Moby Client 20.10.6+azure - Docker-Moby Server 20.10.6+azure -- Git 2.31.1 (apt source repository: ppa:git-core/ppa) +- Git 2.32.0 (apt source repository: ppa:git-core/ppa) - Git LFS 2.13.3 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.3.1 - Haveged 1.9.1 -- Heroku 7.54.0 -- HHVM (HipHop VM) 4.112.0 +- Heroku 7.54.1 +- HHVM (HipHop VM) 4.113.0 - jq 1.5 - Kind 0.11.1 - Kubectl 1.20.1-5-g76a04fc @@ -77,7 +77,7 @@ - Leiningen 2.9.6 - MediaInfo 17.12 - Mercurial 4.5.3 -- Minikube 1.20.0 +- Minikube 1.21.0 - Newman 5.2.3 - nvm 0.38.0 - OpenSSL 1.1.1 11 Sep 2018 @@ -89,21 +89,21 @@ - Skopeo 1.2.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 - SVN 1.9.7 -- Terraform 0.15.5 +- Terraform 1.0.0 - yamllint 1.26.1 - zstd 1.5.0 (homebrew) ### CLI Tools - Alibaba Cloud CLI 3.0.79 -- AWS CLI 1.19.88 -- AWS CLI Session manager plugin 1.2.54.0 -- AWS SAM CLI 1.24.0 +- AWS CLI 1.19.93 +- AWS CLI Session manager plugin 1.2.205.0 +- AWS SAM CLI 1.24.1 - Azure CLI (azure-cli) 2.24.2 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.18.0 - GitHub CLI 1.11.0 -- Google Cloud SDK 343.0.0 (apt source repository: https://packages.cloud.google.com/apt) +- Google Cloud SDK 344.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 3.35.1 +- Netlify CLI 3.37.17 - OpenShift CLI 4.7.13 - ORAS CLI 0.12.0 - Vercel CLI 23.0.0 @@ -119,7 +119,7 @@ | Tool | Version | | -------- | --------------------------------- | | PHP | 7.1.33 7.2.34 7.3.28 7.4.20 8.0.7 | -| Composer | 2.1.1 | +| Composer | 2.1.3 | | PHPUnit | 8.5.16 | ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. @@ -127,14 +127,14 @@ ### Haskell - Cabal 3.4.0.0 - GHC 9.0.1 (apt source repository: ppa:hvr/ghc) -- GHCup 0.1.14.1 +- GHCup 0.1.15.2 - Stack 2.7.1 ### Rust Tools - Cargo 1.52.0 - Rust 1.52.1 - Rustdoc 1.52.1 -- Rustup 1.24.2 +- Rustup 1.24.3 #### Packages - Bindgen 0.58.1 @@ -145,8 +145,8 @@ - Rustfmt 1.4.36 ### Browsers and Drivers -- Google Chrome 91.0.4472.77 -- ChromeDriver 91.0.4472.19 +- Google Chrome 91.0.4472.101 +- ChromeDriver 91.0.4472.101 - Mozilla Firefox 89.0 - Geckodriver 0.29.1 - Chromium 91.0.4472.0 @@ -158,7 +158,7 @@ | GECKOWEBDRIVER | /usr/local/share/gecko_driver | ### .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.519 2.1.520 2.1.521 2.1.522 2.1.523 2.1.524 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.616 2.1.617 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 2.1.811 2.1.812 2.1.813 2.1.814 2.1.815 2.1.816 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.109 3.1.110 3.1.111 3.1.112 3.1.113 3.1.114 3.1.115 3.1.200 3.1.201 3.1.202 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 3.1.408 3.1.409 5.0.100 5.0.101 5.0.102 5.0.103 5.0.104 5.0.200 5.0.201 5.0.202 5.0.203 5.0.300 +- 2.1.302 2.1.403 2.1.524 2.1.617 2.1.701 2.1.816 3.1.116 3.1.202 3.1.302 3.1.410 5.0.104 5.0.204 5.0.301 ### Databases - MongoDB 4.4.6 (apt source repository: https://repo.mongodb.org/apt/ubuntu) @@ -222,7 +222,7 @@ | Pester | 5.2.2 | #### Az PowerShell Modules -- 5.7.0 3.1.0.zip 4.4.0.zip +- 5.9.0 3.1.0.zip 4.4.0.zip ### Web Servers | Name | Version | ConfigFile | ServiceStatus | ListenPort | @@ -236,7 +236,7 @@ | Android Command Line Tools | 4.0 | | Android SDK Build-tools | 30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3
26.0.0 26.0.1 26.0.2 26.0.3
25.0.0 25.0.1 25.0.2 25.0.3
24.0.0 24.0.1 24.0.2 24.0.3
23.0.1 23.0.2 23.0.3 | | Android SDK Platform-Tools | 31.0.2 | -| Android SDK Platforms | android-S (rev 4)
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 SDK Platforms | android-S (rev 5)
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 SDK Tools | 26.1.1 | | Android Support Repository | 47.0.0 | | CMake | 3.10.2
3.18.1 | From b52cf39f62eb8f4ed5b1ae13d5a81548d9d04d02 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 17 Jun 2021 11:12:10 +0000 Subject: [PATCH 0329/3485] Updating readme file for win16 version 20210614.1 (#3589) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/win/Windows2016-Readme.md | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/images/win/Windows2016-Readme.md b/images/win/Windows2016-Readme.md index 3482cf4fc81f..90e8e985d40c 100644 --- a/images/win/Windows2016-Readme.md +++ b/images/win/Windows2016-Readme.md @@ -1,6 +1,6 @@ # Microsoft Windows Server 2016 Datacenter -- OS Version: 10.0.14393 Build 4402 -- Image Version: 20210609.1 +- OS Version: 10.0.14393 Build 4467 +- Image Version: 20210614.1 ## Installed Software ### Language and Runtime @@ -23,7 +23,7 @@ - pip 21.1.2 (python 3.7) - Pipx 0.16.3 - RubyGems 2.7.6.3 -- Vcpkg (build from master \<38d2893>) +- Vcpkg (build from master \<92b42c4>) - Yarn 1.22.10 #### Environment variables @@ -74,9 +74,9 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.79 -- AWS CLI 2.2.10 +- AWS CLI 2.2.11 - AWS SAM CLI 1.24.1 -- AWS Session Manager CLI 1.2.54.0 +- AWS Session Manager CLI 1.2.205.0 - Azure CLI 2.24.2 - Azure DevOps CLI extension 0.18.0 - Cloud Foundry CLI 6.53.0 @@ -99,9 +99,9 @@ ### Browsers and webdrivers - Google Chrome 91.0.4472.101 -- Chrome Driver 91.0.4472.19 -- Microsoft Edge 91.0.864.41 -- Microsoft Edge Driver 91.0.864.41 +- Chrome Driver 91.0.4472.101 +- Microsoft Edge 91.0.864.48 +- Microsoft Edge Driver 91.0.864.48 - Mozilla Firefox 89.0 - Gecko Driver 0.29.1 - IE Driver 3.150.1.0 @@ -127,7 +127,7 @@ | msys2bash.cmd | C:\msys64\usr\bin\bash.exe | ### MSYS2 -- Pacman 5.2.2 +- Pacman 6.0.0 ##### Notes: ``` Location: C:\msys64 @@ -514,7 +514,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Azure Powershell Modules | Module | Version | Path | | ------- | ---------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------ | -| Az | 1.0.0.zip
1.6.0.zip
2.3.2.zip
2.6.0.zip
3.1.0.zip
3.5.0.zip
3.8.0.zip
4.3.0.zip
4.4.0.zip
4.7.0.zip
5.5.0.zip
5.7.0 | C:\Modules\az_\ | +| Az | 1.0.0.zip
1.6.0.zip
2.3.2.zip
2.6.0.zip
3.1.0.zip
3.5.0.zip
3.8.0.zip
4.3.0.zip
4.4.0.zip
4.7.0.zip
5.5.0.zip
5.9.0 | C:\Modules\az_\ | | Azure | 3.8.0.zip
4.2.1.zip
5.1.1.zip
2.1.0 [Installed]
5.3.0 | C:\Modules\azure_\ | | AzureRM | 3.8.0.zip
4.2.1.zip
5.1.1.zip
6.7.0.zip
2.1.0 [Installed]
6.13.1 | C:\Modules\azurerm_\ | ``` From cae9ecba81aabaa66eb101bbce0ed3ad964c7dc9 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 17 Jun 2021 15:29:15 +0000 Subject: [PATCH 0330/3485] Updating readme file for ubuntu20 version 20210614.1 (#3579) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/linux/Ubuntu2004-README.md | 49 +++++++++++++++---------------- 1 file changed, 24 insertions(+), 25 deletions(-) diff --git a/images/linux/Ubuntu2004-README.md b/images/linux/Ubuntu2004-README.md index 99c07953dcb9..5bfe139b6789 100644 --- a/images/linux/Ubuntu2004-README.md +++ b/images/linux/Ubuntu2004-README.md @@ -5,18 +5,17 @@ *** # Ubuntu 20.04.2 LTS - Linux kernel version: 5.8.0-1033-azure -- Image Version: 20210606.1 +- Image Version: 20210614.1 ## Installed Software ### Language and Runtime - Bash 5.0.17(1)-release -- Clang 10.0.0, 11.0.0, 12.0.1 -- Clang-format 10.0.0, 11.0.0, 12.0.1 - Erlang 24.0.2 (Eshell 12.0.2) - Erlang rebar3 3.16.1 - GNU C++ 9.3.0, 10.2.0 - GNU Fortran 9.3.0, 10.2.0 - Julia 1.6.1 +- LLVM components: Clang 10.0.0, 11.0.0, 12.0.1, Clang-format 10.0.0, 11.0.0, 12.0.1 (apt source: deb http://apt.llvm.org/focal/ llvm-toolchain-focal-12) - Mono 6.12.0.122 (apt source repository: https://download.mono-project.com/repo/ubuntu stable-focal main) - MSBuild 16.6.0.15201 (from /usr/lib/mono/msbuild/15.0/bin/MSBuild.dll) - Node 14.17.0 @@ -29,14 +28,14 @@ ### Package Management - cpan 1.64 - Helm 3.6.0 -- Homebrew 3.1.9 +- Homebrew 3.1.12 - Miniconda 4.9.2 - Npm 6.14.13 - Pip 20.0.2 - Pip3 20.0.2 - Pipx 0.16.3 - RubyGems 3.1.2 -- Vcpkg (build from master \) +- Vcpkg (build from master \<92b42c4>) - Yarn 1.22.10 #### Environment variables @@ -50,7 +49,7 @@ - Gradle 7.0.2 - Lerna 4.0.0 - Maven 3.8.1 -- Sbt 1.5.3 +- Sbt 1.5.4 ### Tools - Ansible 2.10.10 @@ -66,12 +65,12 @@ - Docker-Moby Client 20.10.6+azure - Docker-Moby Server 20.10.6+azure - Fastlane 2.185.0 -- Git 2.31.1 (apt source repository: ppa:git-core/ppa) +- Git 2.32.0 (apt source repository: ppa:git-core/ppa) - Git LFS 2.13.3 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.6.0 - Haveged 1.9.1 -- Heroku 7.54.0 -- HHVM (HipHop VM) 4.112.0 +- Heroku 7.54.1 +- HHVM (HipHop VM) 4.113.0 - jq 1.6 - Kind 0.11.1 - Kubectl 1.20.1-5-g76a04fc @@ -79,7 +78,7 @@ - Leiningen 2.9.6 - MediaInfo 19.09 - Mercurial 5.3.1 -- Minikube 1.20.0 +- Minikube 1.21.0 - Newman 5.2.3 - nvm 0.38.0 - OpenSSL 1.1.1f 31 Mar 2020 @@ -88,24 +87,24 @@ - Podman 3.1.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Pulumi 3.4.0 - R 4.1.0 -- Skopeo 1.2.3 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) +- Skopeo 1.3.0 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 -- Terraform 0.15.5 +- Terraform 1.0.0 - yamllint 1.26.1 - zstd 1.5.0 (homebrew) ### CLI Tools - Alibaba Cloud CLI 3.0.79 -- AWS CLI 2.2.9 -- AWS CLI Session manager plugin 1.2.54.0 -- AWS SAM CLI 1.24.0 +- AWS CLI 2.2.11 +- AWS CLI Session manager plugin 1.2.205.0 +- AWS SAM CLI 1.24.1 - Azure CLI (azure-cli) 2.24.2 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.18.0 - GitHub CLI 1.11.0 -- Google Cloud SDK 343.0.0 (apt source repository: https://packages.cloud.google.com/apt) +- Google Cloud SDK 344.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 3.35.1 +- Netlify CLI 3.37.18 - OpenShift CLI 4.7.13 - ORAS CLI 0.12.0 - Vercel CLI 23.0.0 @@ -125,7 +124,7 @@ | Tool | Version | | -------- | ------------ | | PHP | 7.4.20 8.0.7 | -| Composer | 2.1.1 | +| Composer | 2.1.3 | | PHPUnit | 8.5.16 | ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. @@ -133,14 +132,14 @@ ### Haskell - Cabal 3.4.0.0 - GHC 9.0.1 (apt source repository: ppa:hvr/ghc) -- GHCup 0.1.14.1 +- GHCup 0.1.15.2 - Stack 2.7.1 ### Rust Tools - Cargo 1.52.0 - Rust 1.52.1 - Rustdoc 1.52.1 -- Rustup 1.24.2 +- Rustup 1.24.3 #### Packages - Bindgen 0.58.1 @@ -151,8 +150,8 @@ - Rustfmt 1.4.36 ### Browsers and Drivers -- Google Chrome 91.0.4472.77 -- ChromeDriver 91.0.4472.19 +- Google Chrome 91.0.4472.101 +- ChromeDriver 91.0.4472.101 - Mozilla Firefox 89.0 - Geckodriver 0.29.1 - Chromium 91.0.4472.0 @@ -164,7 +163,7 @@ | GECKOWEBDRIVER | /usr/local/share/gecko_driver | ### .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.519 2.1.520 2.1.521 2.1.522 2.1.523 2.1.524 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.616 2.1.617 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 2.1.811 2.1.812 2.1.813 2.1.814 2.1.815 2.1.816 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.109 3.1.110 3.1.111 3.1.112 3.1.113 3.1.114 3.1.115 3.1.200 3.1.201 3.1.202 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 3.1.408 3.1.409 5.0.100 5.0.101 5.0.102 5.0.103 5.0.104 5.0.200 5.0.201 5.0.202 5.0.203 5.0.300 +- 2.1.302 2.1.403 2.1.524 2.1.617 2.1.701 2.1.816 3.1.116 3.1.202 3.1.302 3.1.410 5.0.104 5.0.204 5.0.301 ### Databases - MongoDB 4.4.6 (apt source repository: https://repo.mongodb.org/apt/ubuntu) @@ -229,7 +228,7 @@ | PSScriptAnalyzer | 1.19.1 | #### Az PowerShell Modules -- 5.7.0 3.1.0.zip 4.4.0.zip +- 5.9.0 3.1.0.zip 4.4.0.zip ### Web Servers | Name | Version | ConfigFile | ServiceStatus | ListenPort | @@ -244,7 +243,7 @@ | Android Command Line Tools | 4.0 | | Android SDK Build-tools | 30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3 | | Android SDK Platform-Tools | 31.0.2 | -| Android SDK Platforms | android-S (rev 4)
android-30 (rev 3)
android-29 (rev 5)
android-28 (rev 6)
android-27 (rev 3) | +| Android SDK Platforms | android-S (rev 5)
android-30 (rev 3)
android-29 (rev 5)
android-28 (rev 6)
android-27 (rev 3) | | Android SDK Tools | 26.1.1 | | Android Support Repository | 47.0.0 | | CMake | 3.10.2
3.18.1 | From 82fa8f2880083cc7e310fb7f2aa912aa52438aa7 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 17 Jun 2021 22:46:27 +0000 Subject: [PATCH 0331/3485] Updating readme file for macOS-10.15 version 20210612.1 (#3584) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/macos/macos-10.15-Readme.md | 37 ++++++++++++++++-------------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/images/macos/macos-10.15-Readme.md b/images/macos/macos-10.15-Readme.md index 742bdcb82302..71d8eebd2289 100644 --- a/images/macos/macos-10.15-Readme.md +++ b/images/macos/macos-10.15-Readme.md @@ -1,16 +1,17 @@ | Announcements | |-| +| [[macOS] Xcode 12.2 and 12.3 will be removed from Big Sur on June, 28](https://github.com/actions/virtual-environments/issues/3555) | | [[macOS] Default Xcode on Big Sur image will be set to Xcode 12.5 on June, 15](https://github.com/actions/virtual-environments/issues/3522) | | [macOS 11.0 pools will be transited to private preview.](https://github.com/actions/virtual-environments/issues/2486) | *** # macOS 10.15 info - System Version: macOS 10.15.7 (19H1217) - Kernel Version: Darwin 19.6.0 -- Image Version: 20210607.1 +- Image Version: 20210612.1 ## Installed Software ### Language and Runtime -- .NET SDK 2.1.300 2.1.301 2.1.302 2.1.401 2.1.402 2.1.403 2.1.500 2.1.502 2.1.503 2.1.504 2.1.505 2.1.506 2.1.507 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 2.1.811 2.1.812 2.1.813 2.1.814 2.1.815 2.1.816 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 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 3.1.408 3.1.409 5.0.100 5.0.101 5.0.102 5.0.200 5.0.201 5.0.202 5.0.300 +- .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 2.1.811 2.1.812 2.1.813 2.1.814 2.1.815 2.1.816 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 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 3.1.408 3.1.409 3.1.410 5.0.100 5.0.101 5.0.102 5.0.200 5.0.201 5.0.202 5.0.300 5.0.301 - Bash 3.2.57(1)-release - Clang/LLVM 12.0.0 is available on `'$(brew --prefix llvm)/bin/clang'` - Clang/LLVM 12.0.0 is default @@ -34,19 +35,19 @@ - Ruby 2.7.3p183 ### Package Management -- Bundler version 2.2.19 +- Bundler version 2.2.20 - Carthage 0.38.0 - CocoaPods 1.10.1 -- Composer 2.1.1 -- Homebrew 3.1.10 +- Composer 2.1.3 +- Homebrew 3.1.12 - Miniconda 4.9.2 - NPM 6.14.13 - NuGet 5.6.0.6489 - Pip 20.3.4 (python 2.7) - Pip 21.1.1 (python 3.9) - Pipx 0.16.3 -- RubyGems 3.2.19 -- Vcpkg 2021 (build from master \) +- RubyGems 3.2.20 +- Vcpkg 2021 (build from master \<92b42c4>) - Yarn 1.22.5 #### Environment variables @@ -85,7 +86,9 @@ - Packer 1.7.2 - PostgreSQL 13.3 - psql (PostgreSQL) 13.3 +- Sox 14.4.2 - Subversion (SVN) 1.14.1 +- Switchaudio-osx 1.1.0 - Vagrant 2.2.16 - virtualbox 6.1.22r144080 - zstd 1.5.0 @@ -94,15 +97,15 @@ ### Tools - Aliyun CLI 3.0.79 - App Center CLI 2.9.0 -- AWS CLI 2.2.9 -- AWS SAM CLI 1.24.0 +- AWS CLI 2.2.11 +- AWS SAM CLI 1.24.1 - AWS Session Manager CLI 1.2.54.0 - Azure CLI 2.24.2 - Cabal 3.4.0.0 - Cmake 3.20.3 - Fastlane 2.185.0 - GHC 9.0.1 -- GHCup v0.1.14.1 +- GHCup v0.1.15.1 - Stack 2.7.1 - SwiftFormat 0.48.4 - Swig 4.0.2 @@ -115,10 +118,10 @@ ### Browsers - Safari 14.1.1 (15611.2.7.1.6) - SafariDriver 14.1.1 (15611.2.7.1.6) -- Google Chrome 91.0.4472.77 +- Google Chrome 91.0.4472.101 - ChromeDriver 91.0.4472.19 -- Microsoft Edge 91.0.864.41 -- MSEdgeDriver 91.0.864.41 +- Microsoft Edge 91.0.864.48 +- MSEdgeDriver 91.0.864.48 - Mozilla Firefox 89.0 - geckodriver 0.29.1 @@ -174,7 +177,7 @@ - Cargo 1.52.0 - Rust 1.52.1 - Rustdoc 1.52.1 -- Rustup 1.24.2 +- Rustup 1.24.3 #### Packages - Bindgen 0.58.1 @@ -190,7 +193,7 @@ #### PowerShell Modules | Module | Version | | ---------------- | ------- | -| Az | 5.7.0 | +| Az | 5.9.0 | | MarkdownPS | 1.9 | | Pester | 5.2.2 | | PSScriptAnalyzer | 1.19.1 | @@ -203,7 +206,7 @@ ### Xamarin #### Visual Studio for Mac -- 8.10.0.1773 +- 8.10.1.71 #### Xamarin bundles | symlink | Xamarin.Mono | Xamarin.iOS | Xamarin.Mac | Xamarin.Android | @@ -344,7 +347,7 @@ | Android Command Line Tools | 4.0 | | Android Emulator | 30.6.5 | | Android SDK Build-tools | 30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3
26.0.0 26.0.1 26.0.2 26.0.3
25.0.0 25.0.1 25.0.2 25.0.3
24.0.0 24.0.1 24.0.2 24.0.3 | -| Android SDK Platforms | android-S (rev 4)
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 Platforms | android-S (rev 5)
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 Platform-Tools | 31.0.2 | | Android SDK Tools | 26.1.1 | | Android Support Repository | 47.0.0 | From 0b6b04be6450cd679c4e6132b2e935fa7426df69 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Fri, 18 Jun 2021 10:26:34 +0300 Subject: [PATCH 0332/3485] Fix Java_Adopt_Jdk permissions (#3605) --- .../win/scripts/Installers/Install-JavaTools.ps1 | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/images/win/scripts/Installers/Install-JavaTools.ps1 b/images/win/scripts/Installers/Install-JavaTools.ps1 index f0f6f1b8990a..bab2f13bcae5 100644 --- a/images/win/scripts/Installers/Install-JavaTools.ps1 +++ b/images/win/scripts/Installers/Install-JavaTools.ps1 @@ -60,16 +60,13 @@ function Install-JavaFromAdoptOpenJDK { -and $_.binary.architecture -eq $Architecture ` -and $_.binary.image_type -eq "jdk" } - $downloadUrl = $asset.binary.package.link - # We have to replace '+' sign in the version to '-' due to the issue with incorrect path in Android builds https://github.com/actions/virtual-environments/issues/3014 - $fullJavaVersion = $asset.version.semver -replace '\+', '-' # Download and extract java binaries to temporary folder + $downloadUrl = $asset.binary.package.link $archivePath = Start-DownloadWithRetry -Url $downloadUrl -Name $([IO.Path]::GetFileName($downloadUrl)) - $javaTempPath = Join-Path -Path $env:TEMP -ChildPath "Java_$fullJavaVersion" - Extract-7Zip -Path $archivePath -DestinationPath $javaTempPath - $javaTempBinariesPath = Join-Path -Path $javaTempPath -ChildPath "\jdk*\" + # We have to replace '+' sign in the version to '-' due to the issue with incorrect path in Android builds https://github.com/actions/virtual-environments/issues/3014 + $fullJavaVersion = $asset.version.semver -replace '\+', '-' # Create directories in toolcache path $javaToolcachePath = Join-Path -Path $env:AGENT_TOOLSDIRECTORY -ChildPath "Java_Adopt_jdk" $javaVersionPath = Join-Path -Path $javaToolcachePath -ChildPath $fullJavaVersion @@ -84,8 +81,9 @@ function Install-JavaFromAdoptOpenJDK { Write-Host "Creating Java '${fullJavaVersion}' folder in '${javaVersionPath}'" New-Item -ItemType Directory -Path $javaVersionPath -Force | Out-Null - # Complete the installation by moving Java binaries from temporary directory to toolcache and creating the complete file - Move-Item -Path $javaTempBinariesPath -Destination $javaArchPath + # Complete the installation by extarcting Java binaries to toolcache and creating the complete file + Extract-7Zip -Path $archivePath -DestinationPath $javaVersionPath + Get-ChildItem -Path $javaVersionPath | Rename-Item -NewName $javaArchPath New-Item -ItemType File -Path $javaVersionPath -Name "$Architecture.complete" | Out-Null } From e9b07beb47d1cbe5f5d97bb4731024fafaf2c2bd Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 18 Jun 2021 09:23:23 +0000 Subject: [PATCH 0333/3485] Updating readme file for win19 version 20210616.0 (#3602) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/win/Windows2019-Readme.md | 64 ++++++++++++++++---------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index 0401fc392e2b..684d317e5272 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -1,6 +1,6 @@ # Microsoft Windows Server 2019 Datacenter - OS Version: 10.0.17763 Build 1999 -- Image Version: 20210608.0 +- Image Version: 20210616.0 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -10,7 +10,7 @@ - Bash 4.4.23(1)-release - Go 1.15.13 - Julia 1.6.1 -- Node 14.17.0 +- Node 14.17.1 - Perl 5.32.1 - PHP 8.0.7 - Python 3.7.9 @@ -18,7 +18,7 @@ ### Package Management - Chocolatey 0.10.15 -- Composer 2.1.2 +- Composer 2.1.3 - Helm 3.6.0 - Miniconda 4.9.2 (pre-installed on the image but not added to PATH) - NPM 6.14.13 @@ -26,7 +26,7 @@ - pip 21.1.2 (python 3.7) - Pipx 0.16.3 - RubyGems 2.7.6.3 -- Vcpkg (build from master \<38d2893>) +- Vcpkg (build from master \<4dc864e>) - Yarn 1.22.10 #### Environment variables @@ -47,14 +47,14 @@ - Bazel 4.1.0 - Bazelisk 1.9.0 - Cabal 3.4.0.0 -- CMake 3.20.3 +- CMake 3.20.4 - CodeQL Action Bundle 2.5.5 - Docker 20.10.5 - Docker-compose 1.29.1 - ghc 9.0.1 - Git 2.32.0 - Git LFS 2.13.3 -- Google Cloud SDK 344.0.0 +- Google Cloud SDK 345.0.0 - InnoSetup 6.2.0 - jq 1.6 - Kind 0.11.1 @@ -77,10 +77,10 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.79 -- AWS CLI 2.2.9 +- AWS CLI 2.2.12 - AWS SAM CLI 1.24.1 -- AWS Session Manager CLI 1.2.54.0 -- Azure CLI 2.24.2 +- AWS Session Manager CLI 1.2.205.0 +- Azure CLI 2.25.0 - Azure DevOps CLI extension 0.18.0 - Cloud Foundry CLI 6.53.0 - GitHub CLI 1.11.0 @@ -101,11 +101,11 @@ - Rustfmt 1.4.36 ### Browsers and webdrivers -- Google Chrome 91.0.4472.77 -- Chrome Driver 91.0.4472.19 -- Microsoft Edge 91.0.864.41 -- Microsoft Edge Driver 91.0.864.41 -- Mozilla Firefox 89.0 +- Google Chrome 91.0.4472.106 +- Chrome Driver 91.0.4472.101 +- Microsoft Edge 91.0.864.48 +- Microsoft Edge Driver 91.0.864.48 +- Mozilla Firefox 89.0.1 - Gecko Driver 0.29.1 - IE Driver 3.150.1.0 @@ -131,7 +131,7 @@ | wslbash.exe | C:\Windows\System32\bash.exe | ### MSYS2 -- Pacman 5.2.2 +- Pacman 6.0.0 ##### Notes: ``` Location: C:\msys64 @@ -155,7 +155,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | ------- | ------------ | | 10.24.1 | x64 | | 12.22.1 | x64 | -| 14.17.0 | x64 | +| 14.17.1 | x64 | #### Python @@ -210,7 +210,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Database tools -- Azure CosmosDb Emulator 2.11.13.0 +- Azure CosmosDb Emulator 2.14.0.0 - DacFx 15.0.4897.1 - MySQL 5.7.21.0 - SQLPS 1.0 @@ -225,13 +225,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.10.31402.337 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | +| Visual Studio Enterprise 2019 | 16.10.31410.357 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | #### Workloads, components and extensions: | Package | Version | | ------------------------------------------------------------------------- | --------------- | -| Component.Android.NDK.R16B | 16.10.31401.40 | +| Component.Android.NDK.R16B | 16.10.31408.198 | | Component.Android.SDK25.Private | 16.0.28625.61 | | Component.Android.SDK30 | 16.10.31205.252 | | Component.Ant | 1.9.3.8 | @@ -470,12 +470,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.29.30037 | -| Microsoft Visual C++ 2019 Debug Runtime | x64 | 14.29.30037 | -| Microsoft Visual C++ 2019 Minimum Runtime | x64 | 14.29.30037 | -| Microsoft Visual C++ 2019 Additional Runtime | x86 | 14.29.30037 | -| Microsoft Visual C++ 2019 Debug Runtime | x86 | 14.29.30037 | -| Microsoft Visual C++ 2019 Minimum Runtime | x86 | 14.29.30037 | +| Microsoft Visual C++ 2019 Additional Runtime | x64 | 14.29.30038 | +| Microsoft Visual C++ 2019 Debug Runtime | x64 | 14.29.30038 | +| Microsoft Visual C++ 2019 Minimum Runtime | x64 | 14.29.30038 | +| Microsoft Visual C++ 2019 Additional Runtime | x86 | 14.29.30038 | +| Microsoft Visual C++ 2019 Debug Runtime | x86 | 14.29.30038 | +| Microsoft Visual C++ 2019 Minimum Runtime | x86 | 14.29.30038 | ### .NET Core SDK `Location C:\Program Files\dotnet\sdk` @@ -505,7 +505,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Azure Powershell Modules | Module | Version | Path | | ------- | ---------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------ | -| Az | 1.0.0.zip
1.6.0.zip
2.3.2.zip
2.6.0.zip
3.1.0.zip
3.5.0.zip
3.8.0.zip
4.3.0.zip
4.4.0.zip
4.7.0.zip
5.5.0.zip
5.7.0 | C:\Modules\az_\ | +| Az | 1.0.0.zip
1.6.0.zip
2.3.2.zip
2.6.0.zip
3.1.0.zip
3.5.0.zip
3.8.0.zip
4.3.0.zip
4.4.0.zip
4.7.0.zip
5.5.0.zip
5.9.0 | C:\Modules\az_\ | | Azure | 3.8.0.zip
4.2.1.zip
5.1.1.zip
2.1.0 [Installed]
5.3.0 | C:\Modules\azure_\ | | AzureRM | 3.8.0.zip
4.2.1.zip
5.1.1.zip
6.7.0.zip
2.1.0 [Installed]
6.13.1 | C:\Modules\azurerm_\ | ``` @@ -530,7 +530,7 @@ All other versions are saved but not installed. | -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 4.0 | | Android SDK Build-tools | 30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3
26.0.0 26.0.1 26.0.2 26.0.3
25.0.0 25.0.1 25.0.2 25.0.3
24.0.0 24.0.1 24.0.2 24.0.3
23.0.1 23.0.2 23.0.3
22.0.1
21.1.2
20.0.0
19.1.0 | -| Android SDK Platforms | android-S (rev 4)
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 Platforms | android-S (rev 5)
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 Platform-Tools | 31.0.2 | | Android SDK Tools | 26.1.1 | | Android Support Repository | 47.0.0 | @@ -554,10 +554,10 @@ All other versions are saved but not installed. ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:6c8ea03414851b5a77a951a9fc82a43e580e816b12e9d05d6a5918a76c2dd7c1 | 2021-05-11 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:c615be2cb06c4f4386f4ba424239f2172af7a3c8360ab0008131828d50fe020f | 2021-05-11 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:a3b51566290b6aa485de6d8ac3d8cbf008f560feda73ed1addb208166cbdd3ad | 2021-05-25 | -| mcr.microsoft.com/windows/nanoserver:1809 | sha256:7810b00b2b0ce434cf8a420627b3aba335a40e1b805e1be2e02241b7446f7a00 | 2021-05-07 | -| mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:edd6d6de1e7252d2d434af58798db1d96762d738f60e15b24ed631f55e26681d | 2021-05-08 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:7da03aef9a9acb66678d5c14dda85c741268557bdcd55484e6351e373445157f | 2021-06-08 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:8af4375ff474def9233a8a0ce8f0faad829c143c447e98d85c55a24586904f63 | 2021-06-08 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:ceb674e14c24078b16c2b7a3dfe0c31929acbdd34352902bcf381a4489dc6422 | 2021-06-08 | +| mcr.microsoft.com/windows/nanoserver:1809 | sha256:944184f0b31444a929debcd9668218f1e80ef342fe03f5c4b8491eda6da3ffb8 | 2021-06-06 | +| mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:3458c7dbc9ee16016170ecce85bee03b0e7f13744809d67fc881ec8d2086f5ef | 2021-06-06 | From b03244bee3584a593a4dbdd83320ebcb106e7e9f Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Fri, 18 Jun 2021 16:28:09 +0300 Subject: [PATCH 0334/3485] [macOS] Upgrade Xamarin.Android from 11.3.0.1 to 11.3.0.4 (#3603) --- images/macos/toolsets/toolset-11.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index ee6f328a1636..72a2482e4199 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -22,7 +22,7 @@ "7.14.0.3", "7.10.0.5", "7.8.2.5", "7.4.0.10", "7.2.0.3", "7.0.0.15", "6.22.1.26", "6.20.2.2" ], "android-versions": [ - "11.3.0.1", "11.2.2.1", "11.1.0.26", "11.0.2.0" + "11.3.0.4", "11.2.2.1", "11.1.0.26", "11.0.2.0" ], "bundle-default": "6_12_9", "bundles": [ From 4143d0cc7b40ef8d6b99364d9f26ce6839158248 Mon Sep 17 00:00:00 2001 From: Sujith Quintelier Date: Mon, 21 Jun 2021 13:06:00 +0200 Subject: [PATCH 0335/3485] Update GenerateResourcesAndImage.ps1 (#3616) Ubuntu2004 is also a valid option for parameter ImageType --- helpers/GenerateResourcesAndImage.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helpers/GenerateResourcesAndImage.ps1 b/helpers/GenerateResourcesAndImage.ps1 index d7ae67f27511..c9b8db398aac 100644 --- a/helpers/GenerateResourcesAndImage.ps1 +++ b/helpers/GenerateResourcesAndImage.ps1 @@ -72,7 +72,7 @@ Function GenerateResourcesAndImage { The root path of the image generation repository source. .PARAMETER ImageType - The type of the image being generated. Valid options are: {"Windows2016", "Windows2019", "Ubuntu1604", "Ubuntu1804"}. + The type of the image being generated. Valid options are: {"Windows2016", "Windows2019", "Ubuntu1604", "Ubuntu1804", "Ubuntu2004"}. .PARAMETER AzureLocation The location of the resources being created in Azure. For example "East US". From 1fb8c5d6a187c1b2ac276faecf0766f3210d0b58 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Mon, 21 Jun 2021 14:09:51 +0300 Subject: [PATCH 0336/3485] [Windows] Improve Pester tests coverage for MSYS2 (#3595) * Add ShouldReturnZeroExitCodeWithParam function and a new set of tests for MSYS2 tools * Change get-command -> Get-Command * Remove elevated user, return original path after msys installation and tests, resolve nitpicks * Add BeforeEach and AfterEach blocks These blocks change the path before each test and return the original path after each test * Change get-command -> Get-Command --- .../win/scripts/ImageHelpers/TestsHelpers.ps1 | 37 +++++++++ .../win/scripts/Installers/Install-Msys2.ps1 | 1 + images/win/scripts/Tests/MSYS2.Tests.ps1 | 81 ++++++++++++++++--- images/win/windows2016.json | 2 - images/win/windows2019.json | 2 - 5 files changed, 106 insertions(+), 17 deletions(-) diff --git a/images/win/scripts/ImageHelpers/TestsHelpers.ps1 b/images/win/scripts/ImageHelpers/TestsHelpers.ps1 index ec71faec846e..9cbfb1badb80 100644 --- a/images/win/scripts/ImageHelpers/TestsHelpers.ps1 +++ b/images/win/scripts/ImageHelpers/TestsHelpers.ps1 @@ -96,6 +96,42 @@ function ShouldReturnZeroExitCode { } } +# Pester Assert to check exit code of command with given parameter, the assertion performed up to 3 checks (without '-', with 1 and 2 '-') until succeeded +function ShouldReturnZeroExitCodeWithParam { + param ( + [Parameter(Mandatory)] [string] $ActualValue, + [switch] $Negate, + [string] $CallParameter = "version", + [string] $CallerSessionState + ) + + $delimiterCharacter = "" + + while ($delimiterCharacter.Length -le 2) + { + $callParameterWithDelimeter = $delimiterCharacter + $CallParameter + $commandToCheck = "$ActualValue $callParameterWithDelimeter" + [bool]$succeeded = (ShouldReturnZeroExitCode -ActualValue $commandToCheck).Succeeded + + if ($succeeded) + { + break + } + $delimiterCharacter += '-' + } + if ($Negate) { $succeeded = -not $succeeded } + + if (-not $succeeded) + { + $failureMessage = "Tool '$ActualValue' has not returned 0 exit code for any of these flags: '$CallParameter' or '-$CallParameter' or '--$CallParameter'" + } + + return [PSCustomObject] @{ + Succeeded = $succeeded + FailureMessage = $failureMessage + } +} + # Pester Assert to match output of command function ShouldMatchCommandOutput { Param( @@ -130,5 +166,6 @@ function ShouldMatchCommandOutput { If (Get-Command -Name Add-ShouldOperator -ErrorAction SilentlyContinue) { Add-ShouldOperator -Name ReturnZeroExitCode -InternalName ShouldReturnZeroExitCode -Test ${function:ShouldReturnZeroExitCode} + Add-ShouldOperator -Name ReturnZeroExitCodeWithParam -InternalName ShouldReturnZeroExitCodeWithParam -Test ${function:ShouldReturnZeroExitCodeWithParam} Add-ShouldOperator -Name MatchCommandOutput -InternalName ShouldMatchCommandOutput -Test ${function:ShouldMatchCommandOutput} } \ No newline at end of file diff --git a/images/win/scripts/Installers/Install-Msys2.ps1 b/images/win/scripts/Installers/Install-Msys2.ps1 index 6aded0e1f07e..894653acc1a6 100644 --- a/images/win/scripts/Installers/Install-Msys2.ps1 +++ b/images/win/scripts/Installers/Install-Msys2.ps1 @@ -88,6 +88,7 @@ foreach ($arch in $archs) pacman.exe -Q | grep ^${arch}- } +$env:PATH = $origPath Write-Host "`nMSYS2 installation completed" Invoke-PesterTests -TestFile "MSYS2" diff --git a/images/win/scripts/Tests/MSYS2.Tests.ps1 b/images/win/scripts/Tests/MSYS2.Tests.ps1 index e0c6486d0f6f..1290dd1606c1 100644 --- a/images/win/scripts/Tests/MSYS2.Tests.ps1 +++ b/images/win/scripts/Tests/MSYS2.Tests.ps1 @@ -1,23 +1,78 @@ +$toolsetContent = (Get-ToolsetContent).MsysPackages +$archs = $toolsetContent.mingw.arch + BeforeAll { - $msys2BinDir = "C:\msys64\usr\bin" - $msys2mingwDir = "C:\msys64\mingw64\bin" + $msys2Dir = "C:\msys64\usr\bin" + $originalPath = $env:PATH } -Describe "MSYS2" { - It "" -TestCases @( +Describe "MSYS2 packages" { + BeforeEach { + $env:PATH = "$msys2Dir;$env:PATH" + } + + It "msys2Dir exists" { + $msys2Dir | Should -Exist + } + + $TestCases = @( @{ ToolName = "bash.exe" } @{ ToolName = "tar.exe" } @{ ToolName = "make.exe" } - ) { - Join-Path $msys2BinDir $ToolName | Should -Exist + ) + + It " is installed in " -TestCases $TestCases { + (Get-Command "$ToolName").Source | Should -BeLike "$msys2Dir*" + } + + It " is avaialable" -TestCases $TestCases { + "$ToolName" | Should -ReturnZeroExitCodeWithParam } - It "" -TestCases @( - @{ ToolName = "gcc.exe" } - @{ ToolName = "cmake.exe" } - @{ ToolName = "g++.exe" } - @{ ToolName = "clang-tidy.exe" } - ) { - Join-Path $msys2mingwDir $ToolName | Should -Exist + AfterEach { + $env:PATH = $originalPath + } +} + +foreach ($arch in $archs) { + Describe "$arch arch packages" { + $archPackages = $toolsetContent.mingw | Where-Object { $_.arch -eq $arch } + $tools = $archPackages.runtime_packages.name + + if ($arch -eq "mingw-w64-i686") + { + $ExecDir = "C:\msys64\mingw32\bin" + } + else + { + $ExecDir = "C:\msys64\mingw64\bin" + } + + foreach ($tool in $tools) { + Context "$tool package"{ + $executables = ($archPackages.runtime_packages | Where-Object { $_.name -eq $tool }).executables | ForEach-Object { + @{ + ExecName = $_ + ExecDir = $ExecDir + } + } + + BeforeEach { + $env:PATH = "$ExecDir;$env:PATH" + } + + It " is installed in " -TestCases $executables { + (Get-Command "$ExecName").Source | Should -BeLike "$ExecDir*" + } + + It " is available" -TestCases $executables { + "$ExecName" | Should -ReturnZeroExitCodeWithParam + } + + AfterEach { + $env:PATH = $originalPath + } + } + } } } \ No newline at end of file diff --git a/images/win/windows2016.json b/images/win/windows2016.json index 4c183f6ee86a..4259124d9d29 100644 --- a/images/win/windows2016.json +++ b/images/win/windows2016.json @@ -303,8 +303,6 @@ "environment_vars": [ "TOOLSET_JSON_PATH={{user `toolset_json_path`}}" ], - "elevated_user": "SYSTEM", - "elevated_password": "", "scripts": [ "{{ template_dir }}/scripts/Installers/Install-Msys2.ps1" ] diff --git a/images/win/windows2019.json b/images/win/windows2019.json index 8bb66f535b33..5c4a775871ac 100644 --- a/images/win/windows2019.json +++ b/images/win/windows2019.json @@ -274,8 +274,6 @@ "environment_vars": [ "TOOLSET_JSON_PATH={{user `toolset_json_path`}}" ], - "elevated_user": "SYSTEM", - "elevated_password": "", "scripts": [ "{{ template_dir }}/scripts/Installers/Install-Msys2.ps1" ] From 83a5e887f4f546b03818dfdc8e1e4c62b40d067a Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Mon, 21 Jun 2021 20:02:32 +0300 Subject: [PATCH 0337/3485] Revert "Don't install KB5003638 update as it breaks the VM (#3557)" (#3627) This reverts commit ff4ba2e7258b8183db5cc13d30a840222a149ac0. --- images/win/scripts/Installers/Install-WindowsUpdates.ps1 | 6 ------ 1 file changed, 6 deletions(-) diff --git a/images/win/scripts/Installers/Install-WindowsUpdates.ps1 b/images/win/scripts/Installers/Install-WindowsUpdates.ps1 index 4c02c9f45098..eb19a3ea020a 100644 --- a/images/win/scripts/Installers/Install-WindowsUpdates.ps1 +++ b/images/win/scripts/Installers/Install-WindowsUpdates.ps1 @@ -5,10 +5,4 @@ ################################################################################ Write-Host "Run windows updates" -# KB5003638 causes the windows server 2016 virtual machine to hang on shutdown step -if (Test-IsWin16) { - Get-WUInstall -MicrosoftUpdate - Write-Host "Hide update KB5003638" - Hide-WindowsUpdate -Confirm:$false -KBArticleID "KB5003638" -} Get-WUInstall -MicrosoftUpdate -AcceptAll -Install -IgnoreUserInput -IgnoreReboot From efcbf002631cd14f4c4af4a493871e35607a464a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 21 Jun 2021 19:23:53 +0000 Subject: [PATCH 0338/3485] Updating readme file for macOS-11 version 20210620.1 (#3628) Co-authored-by: Image generation service account --- images/macos/macos-11-Readme.md | 61 ++++++++++++++++----------------- 1 file changed, 30 insertions(+), 31 deletions(-) diff --git a/images/macos/macos-11-Readme.md b/images/macos/macos-11-Readme.md index 9932cd880de4..44fd23b32b84 100644 --- a/images/macos/macos-11-Readme.md +++ b/images/macos/macos-11-Readme.md @@ -1,13 +1,12 @@ | Announcements | |-| | [[macOS] Xcode 12.2 and 12.3 will be removed from Big Sur on June, 28](https://github.com/actions/virtual-environments/issues/3555) | -| [[macOS] Default Xcode on Big Sur image will be set to Xcode 12.5 on June, 15](https://github.com/actions/virtual-environments/issues/3522) | | [macOS 11.0 pools will be transited to private preview.](https://github.com/actions/virtual-environments/issues/2486) | *** # macOS 11.4 info - System Version: macOS 11.4 (20F71) - Kernel Version: Darwin 20.5.0 -- Image Version: 20210614.1 +- Image Version: 20210620.1 ## Installed Software ### Language and Runtime @@ -24,9 +23,9 @@ - Go 1.15.13 - julia 1.6.1 - MSBuild 16.6.0.15801 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) -- Node.js v14.17.0 +- Node.js v14.17.1 - NVM 0.38.0 -- NVM - Cached node versions: v10.24.1 v12.22.1 v14.17.0 +- NVM - Cached node versions: v10.24.1 v12.22.1 v14.17.1 - Perl 5.34.0 - PHP 8.0.7 - Python 2.7.18 @@ -46,7 +45,7 @@ - Pip 21.1.1 (python 3.9) - Pipx 0.16.3 - RubyGems 3.2.20 -- Vcpkg 2021 (build from master \<14418e1>) +- Vcpkg 2021 (build from master \<08214e1>) - Yarn 1.22.5 #### Environment variables @@ -63,7 +62,7 @@ ### Utilities - 7-Zip 17.04 - aria2 1.35.0 -- azcopy 10.10.0 +- azcopy 10.11.0 - bazel 4.1.0 - bazelisk 1.9.0 - bsdtar 3.3.2 - available by 'tar' alias @@ -74,14 +73,14 @@ - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.1 - gpg (GnuPG) 2.3.1 -- helm v3.6.0+g7f2df64 +- helm v3.6.1+g61d8e8c - Hub CLI: 2.14.2 - jq 1.6 - mongo v4.4.5 - mongod v4.4.5 - Newman 5.2.3 - OpenSSL 1.1.1k 25 Mar 2021 `(/usr/local/opt/openssl -> /usr/local/Cellar/openssl@1.1/1.1.1k)` -- Packer 1.7.2 +- Packer 1.7.3 - PostgreSQL 13.3 - psql (PostgreSQL) 13.3 - Sox 14.4.2 @@ -91,19 +90,19 @@ ### Tools -- Aliyun CLI 3.0.79 +- Aliyun CLI 3.0.80 - App Center CLI 2.9.0 -- AWS CLI 2.2.11 +- AWS CLI 2.2.13 - AWS SAM CLI 1.24.1 -- AWS Session Manager CLI 1.2.54.0 -- Azure CLI 2.24.2 +- AWS Session Manager CLI 1.2.205.0 +- Azure CLI 2.25.0 - Cabal 3.4.0.0 -- Cmake 3.20.3 +- Cmake 3.20.4 - Fastlane 2.185.1 - GHC 9.0.1 - GHCup v0.1.15.2 - Stack 2.7.1 -- SwiftFormat 0.48.4 +- SwiftFormat 0.48.5 - Swig 4.0.2 - Xcode Command Line Tools 12.5.0.0.1.1617976050 @@ -114,19 +113,19 @@ ### Browsers - Safari 14.1.1 (16611.2.7.1.4) - SafariDriver 14.1.1 (16611.2.7.1.4) -- Google Chrome 91.0.4472.106 -- ChromeDriver 91.0.4472.19 -- Microsoft Edge 91.0.864.48 -- MSEdgeDriver 91.0.864.48 -- Mozilla Firefox 89.0 +- Google Chrome 91.0.4472.114 +- ChromeDriver 91.0.4472.101 +- Microsoft Edge 91.0.864.54 +- MSEdgeDriver 91.0.864.54 +- Mozilla Firefox 89.0.1 - geckodriver 0.29.1 #### Environment variables -| Name | Value | -| --------------- | --------------------------------------------- | -| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/91.0.4472.19 | -| EDGEWEBDRIVER | /usr/local/share/edge_driver | -| GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | +| Name | Value | +| --------------- | ---------------------------------------------- | +| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/91.0.4472.101 | +| EDGEWEBDRIVER | /usr/local/share/edge_driver | +| GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | ### Java | Version | Vendor | Environment Variable | @@ -154,16 +153,16 @@ #### Node.js - 10.24.1 - 12.22.1 -- 14.17.0 +- 14.17.1 #### Go - 1.15.13 - 1.16.5 ### Rust Tools -- Cargo 1.52.0 -- Rust 1.52.1 -- Rustdoc 1.52.1 +- Cargo 1.53.0 +- Rust 1.53.0 +- Rustdoc 1.53.0 - Rustup 1.24.3 #### Packages @@ -171,8 +170,8 @@ - Cargo-audit 0.14.1 - Cargo-outdated v0.9.15 - Cbindgen 0.19.0 -- Clippy 0.1.52 -- Rustfmt 1.4.36-stable +- Clippy 0.1.53 +- Rustfmt 1.4.37-stable ### PowerShell Tools - PowerShell 7.1.3 @@ -193,7 +192,7 @@ ### Xamarin #### Visual Studio for Mac -- 8.10.1.71 +- 8.10.2.17 #### Xamarin bundles | symlink | Xamarin.Mono | Xamarin.iOS | Xamarin.Mac | Xamarin.Android | From 83f05ed56fb316b530476507a59c9dfab7fdee3e Mon Sep 17 00:00:00 2001 From: Maxim Lobanov Date: Tue, 22 Jun 2021 10:21:36 +0300 Subject: [PATCH 0339/3485] Fix macOS 11 label (#3633) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 65edd5a9994f..82a2ae50bd7a 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ For general questions about using the virtual environments or writing your Actio | --------------------|---------------------|--------------------|---------------------| | Ubuntu 20.04 | `ubuntu-latest` or `ubuntu-20.04` | [ubuntu-20.04] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu20&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu20&redirect=1) | Ubuntu 18.04 | `ubuntu-18.04` | [ubuntu-18.04] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu18&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu18&redirect=1) -| macOS 11 | `macos-11` | [macOS-11] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-11.0&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-11.0&redirect=1) +| macOS 11 | `macos-11` | [macOS-11] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-11&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-11&redirect=1) | macOS 10.15 | `macos-latest` or `macos-10.15` | [macOS-10.15] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-10.15&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-10.15&redirect=1) | Windows Server 2019 | `windows-latest` or `windows-2019` | [windows-2019] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=windows-2019&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=windows-2019&redirect=1) | Windows Server 2016 | `windows-2016` | [windows-2016] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=windows-2016&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=windows-2016&redirect=1) From 4e6b32793fba97e0e14a01957a3aaf709f1691bb Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Tue, 22 Jun 2021 11:36:14 +0300 Subject: [PATCH 0340/3485] Add xcode 12.5.1 to macos-11 image (#3629) --- images/macos/toolsets/toolset-11.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index 72a2482e4199..89eac922721a 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -3,7 +3,7 @@ "default": "12.5", "versions": [ { "link": "13.0", "version": "13.0.0"}, - { "link": "12.5", "version": "12.5.0"}, + { "link": "12.5", "version": "12.5.1"}, { "link": "12.4", "version": "12.4.0"}, { "link": "12.3", "version": "12.3.0"}, { "link": "12.2", "version": "12.2.0" }, From 43b77cd2a0f3be072cf0a1f4e026117b96ffb4cc Mon Sep 17 00:00:00 2001 From: Alena Sviridenko Date: Tue, 22 Jun 2021 13:37:53 +0300 Subject: [PATCH 0341/3485] updated Xcode support policy (#3637) --- docs/software-and-images-guidelines.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/software-and-images-guidelines.md b/docs/software-and-images-guidelines.md index 27217d7edaa6..dc9ef42c0a61 100644 --- a/docs/software-and-images-guidelines.md +++ b/docs/software-and-images-guidelines.md @@ -31,7 +31,7 @@ These are the guidelines we follow in software and images supporting routine: | .NET Core | 2 latest LTS versions and 1 latest version. For each feature version only latest patch is installed | | GCC
GNU Fortran
Clang
GNU C++ | 3 latest major versions | | Android NDK | 1 latest, 1 LTS version | -| Xcode | all OS compatible versions, latest beta for each new version | +| Xcode | - all OS compatible versions side-by-side
- for beta, GM versions - latest beta only
- old patch versions are deprecated in 3 months | ## Software default versions update policy for tools with multiple versions installed -In general, once a new version is installed on the image, we announce the default version update 2 weeks prior to deploying it to give time to adapt to upcoming changes. For potentially dangerous updates, we can extend the timeline up to 1 month between the announcement and deployment. \ No newline at end of file +In general, once a new version is installed on the image, we announce the default version update 2 weeks prior to deploying it to give time to adapt to upcoming changes. For potentially dangerous updates, we can extend the timeline up to 1 month between the announcement and deployment. From a13c907aaf6db0a6310d3512c22ee893931d5370 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 22 Jun 2021 14:17:47 +0000 Subject: [PATCH 0342/3485] Updating readme file for macOS-10.15 version 20210620.1 (#3626) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/macos/macos-10.15-Readme.md | 67 +++++++++++++++--------------- 1 file changed, 33 insertions(+), 34 deletions(-) diff --git a/images/macos/macos-10.15-Readme.md b/images/macos/macos-10.15-Readme.md index 71d8eebd2289..3c821e756775 100644 --- a/images/macos/macos-10.15-Readme.md +++ b/images/macos/macos-10.15-Readme.md @@ -1,13 +1,12 @@ | Announcements | |-| | [[macOS] Xcode 12.2 and 12.3 will be removed from Big Sur on June, 28](https://github.com/actions/virtual-environments/issues/3555) | -| [[macOS] Default Xcode on Big Sur image will be set to Xcode 12.5 on June, 15](https://github.com/actions/virtual-environments/issues/3522) | | [macOS 11.0 pools will be transited to private preview.](https://github.com/actions/virtual-environments/issues/2486) | *** # macOS 10.15 info - System Version: macOS 10.15.7 (19H1217) - Kernel Version: Darwin 19.6.0 -- Image Version: 20210612.1 +- Image Version: 20210620.1 ## Installed Software ### Language and Runtime @@ -24,9 +23,9 @@ - Go 1.15.13 - julia 1.6.1 - MSBuild 16.6.0.15801 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) -- Node.js v14.17.0 +- Node.js v14.17.1 - NVM 0.38.0 -- NVM - Cached node versions: v10.24.1 v12.22.1 v14.17.0 +- NVM - Cached node versions: v10.24.1 v12.22.1 v14.17.1 - Perl 5.34.0 - PHP 8.0.7 - Python 2.7.18 @@ -47,7 +46,7 @@ - Pip 21.1.1 (python 3.9) - Pipx 0.16.3 - RubyGems 3.2.20 -- Vcpkg 2021 (build from master \<92b42c4>) +- Vcpkg 2021 (build from master \<08214e1>) - Yarn 1.22.5 #### Environment variables @@ -59,12 +58,12 @@ ### Project Management - Apache Ant(TM) 1.10.10 - Apache Maven 3.8.1 -- Gradle 7.0.2 +- Gradle 7.1 ### Utilities - 7-Zip 17.04 - aria2 1.35.0 -- azcopy 10.10.0 +- azcopy 10.11.0 - bazel 4.1.0 - bazelisk 1.9.0 - bsdtar 3.3.2 - available by 'tar' alias @@ -76,14 +75,14 @@ - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.1 - gpg (GnuPG) 2.3.1 -- helm v3.6.0+g7f2df64 +- helm v3.6.1+g61d8e8c - Hub CLI: 2.14.2 - jq 1.6 - mongo v4.4.5 - mongod v4.4.5 - Newman 5.2.3 - OpenSSL 1.1.1k 25 Mar 2021 `(/usr/local/opt/openssl -> /usr/local/Cellar/openssl@1.1/1.1.1k)` -- Packer 1.7.2 +- Packer 1.7.3 - PostgreSQL 13.3 - psql (PostgreSQL) 13.3 - Sox 14.4.2 @@ -95,19 +94,19 @@ ### Tools -- Aliyun CLI 3.0.79 +- Aliyun CLI 3.0.80 - App Center CLI 2.9.0 -- AWS CLI 2.2.11 +- AWS CLI 2.2.13 - AWS SAM CLI 1.24.1 -- AWS Session Manager CLI 1.2.54.0 -- Azure CLI 2.24.2 +- AWS Session Manager CLI 1.2.205.0 +- Azure CLI 2.25.0 - Cabal 3.4.0.0 -- Cmake 3.20.3 -- Fastlane 2.185.0 +- Cmake 3.20.4 +- Fastlane 2.185.1 - GHC 9.0.1 -- GHCup v0.1.15.1 +- GHCup v0.1.15.2 - Stack 2.7.1 -- SwiftFormat 0.48.4 +- SwiftFormat 0.48.5 - Swig 4.0.2 - Xcode Command Line Tools 12.4.0.0.1.1610135815 @@ -118,19 +117,19 @@ ### Browsers - Safari 14.1.1 (15611.2.7.1.6) - SafariDriver 14.1.1 (15611.2.7.1.6) -- Google Chrome 91.0.4472.101 -- ChromeDriver 91.0.4472.19 -- Microsoft Edge 91.0.864.48 -- MSEdgeDriver 91.0.864.48 -- Mozilla Firefox 89.0 +- Google Chrome 91.0.4472.114 +- ChromeDriver 91.0.4472.101 +- Microsoft Edge 91.0.864.54 +- MSEdgeDriver 91.0.864.54 +- Mozilla Firefox 89.0.1 - geckodriver 0.29.1 #### Environment variables -| Name | Value | -| --------------- | --------------------------------------------- | -| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/91.0.4472.19 | -| EDGEWEBDRIVER | /usr/local/share/edge_driver | -| GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | +| Name | Value | +| --------------- | ---------------------------------------------- | +| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/91.0.4472.101 | +| EDGEWEBDRIVER | /usr/local/share/edge_driver | +| GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | ### Java | Version | Vendor | Environment Variable | @@ -165,7 +164,7 @@ #### Node.js - 10.24.1 - 12.22.1 -- 14.17.0 +- 14.17.1 #### Go - 1.13.15 @@ -174,9 +173,9 @@ - 1.16.5 ### Rust Tools -- Cargo 1.52.0 -- Rust 1.52.1 -- Rustdoc 1.52.1 +- Cargo 1.53.0 +- Rust 1.53.0 +- Rustdoc 1.53.0 - Rustup 1.24.3 #### Packages @@ -184,8 +183,8 @@ - Cargo-audit 0.14.1 - Cargo-outdated v0.9.15 - Cbindgen 0.19.0 -- Clippy 0.1.52 -- Rustfmt 1.4.36-stable +- Clippy 0.1.53 +- Rustfmt 1.4.37-stable ### PowerShell Tools - PowerShell 7.1.3 @@ -206,7 +205,7 @@ ### Xamarin #### Visual Studio for Mac -- 8.10.1.71 +- 8.10.2.17 #### Xamarin bundles | symlink | Xamarin.Mono | Xamarin.iOS | Xamarin.Mac | Xamarin.Android | From d986b255cab564a020146ddf3c8d5dea63af9992 Mon Sep 17 00:00:00 2001 From: Drew Skwiers-Koballa Date: Tue, 22 Jun 2021 12:14:00 -0700 Subject: [PATCH 0343/3485] Update Dacfx 18.7.1 (#3608) * update dacfx to 18.5.1 * update dacfx 18.7.1 Windows * update dacfx 18.7.1 Windows * revert MD changes --- images/win/scripts/Installers/Install-DACFx.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/win/scripts/Installers/Install-DACFx.ps1 b/images/win/scripts/Installers/Install-DACFx.ps1 index a59466d71b68..fc0536ae2ba3 100644 --- a/images/win/scripts/Installers/Install-DACFx.ps1 +++ b/images/win/scripts/Installers/Install-DACFx.ps1 @@ -4,7 +4,7 @@ #################################################################################### $InstallerName = "DacFramework.msi" -$InstallerUrl = "https://go.microsoft.com/fwlink/?linkid=2143544" +$InstallerUrl = "https://go.microsoft.com/fwlink/?linkid=2165211" Install-Binary -Url $InstallerUrl -Name $InstallerName From 1a9637391893d136ed84d1607a9a24d2094a81b1 Mon Sep 17 00:00:00 2001 From: Marcus Felling Date: Wed, 23 Jun 2021 09:52:45 -0500 Subject: [PATCH 0344/3485] [Windows] Adding Bicep CLI (#3600) * Add Bicep CLI * Correct regex for bicep version Co-authored-by: Marcus Felling --- images/win/scripts/Installers/Install-Bicep.ps1 | 8 ++++++++ .../scripts/SoftwareReport/SoftwareReport.Generator.ps1 | 1 + .../win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 | 6 ++++++ images/win/scripts/Tests/Tools.Tests.ps1 | 6 ++++++ images/win/windows2016.json | 3 ++- images/win/windows2019.json | 3 ++- 6 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 images/win/scripts/Installers/Install-Bicep.ps1 diff --git a/images/win/scripts/Installers/Install-Bicep.ps1 b/images/win/scripts/Installers/Install-Bicep.ps1 new file mode 100644 index 000000000000..21a66ce23b58 --- /dev/null +++ b/images/win/scripts/Installers/Install-Bicep.ps1 @@ -0,0 +1,8 @@ +################################################################################ +## File: Install-Bicep.ps1 +## Desc: Install Bicep +################################################################################ + +Choco-Install -PackageName Bicep + +Invoke-PesterTests -TestFile "Tools" -TestName "Bicep" \ No newline at end of file diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index 2c14ee9bc91f..a8e6d947288f 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -77,6 +77,7 @@ $markdown += New-MDList -Style Unordered -Lines (@( (Get-AzCopyVersion), (Get-BazelVersion), (Get-BazeliskVersion), + (Get-BicepVersion), (Get-CabalVersion), (Get-CMakeVersion), (Get-CodeQLBundleVersion), diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 index eddd3de97374..ad5eb2255ad4 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 @@ -18,6 +18,12 @@ function Get-BazeliskVersion { return "Bazelisk $bazeliskVersion" } +function Get-BicepVersion { + (bicep --version | Out-String) -match "bicep cli version (?\d+\.\d+\.\d+)" | Out-Null + $bicepVersion = $Matches.Version + return "Bicep $bicepVersion" +} + function Get-RVersion { ($(cmd /c "Rscript --version 2>&1") | Out-String) -match "R scripting front-end version (?\d+\.\d+\.\d+)" | Out-Null $rVersion = $Matches.Version diff --git a/images/win/scripts/Tests/Tools.Tests.ps1 b/images/win/scripts/Tests/Tools.Tests.ps1 index db110f5f25d3..62f5846fa468 100644 --- a/images/win/scripts/Tests/Tools.Tests.ps1 +++ b/images/win/scripts/Tests/Tools.Tests.ps1 @@ -35,6 +35,12 @@ Describe "Bazel" { } } +Describe "Bicep" { + It "Bicep" { + "bicep --version" | Should -ReturnZeroExitCode + } +} + Describe "CMake" { It "cmake" { "cmake --version" | Should -ReturnZeroExitCode diff --git a/images/win/windows2016.json b/images/win/windows2016.json index 4259124d9d29..b492cd7360e2 100644 --- a/images/win/windows2016.json +++ b/images/win/windows2016.json @@ -254,7 +254,8 @@ "{{ template_dir }}/scripts/Installers/Install-IEWebDriver.ps1", "{{ template_dir }}/scripts/Installers/Install-Apache.ps1", "{{ template_dir }}/scripts/Installers/Install-Nginx.ps1", - "{{ template_dir }}/scripts/Installers/Install-Swig.ps1" + "{{ template_dir }}/scripts/Installers/Install-Swig.ps1", + "{{ template_dir }}/scripts/Installers/Install-Bicep.ps1" ] }, { diff --git a/images/win/windows2019.json b/images/win/windows2019.json index 5c4a775871ac..6b1de8d1129a 100644 --- a/images/win/windows2019.json +++ b/images/win/windows2019.json @@ -258,7 +258,8 @@ "{{ template_dir }}/scripts/Installers/Install-IEWebDriver.ps1", "{{ template_dir }}/scripts/Installers/Install-Apache.ps1", "{{ template_dir }}/scripts/Installers/Install-Nginx.ps1", - "{{ template_dir }}/scripts/Installers/Install-Swig.ps1" + "{{ template_dir }}/scripts/Installers/Install-Swig.ps1", + "{{ template_dir }}/scripts/Installers/Install-Bicep.ps1" ] }, { From 9e21ab0f00902f54ce313cc16867ef3fbcaf1f92 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Wed, 23 Jun 2021 22:20:09 +0300 Subject: [PATCH 0345/3485] Return xcode 12.5 to macos Big Sur (#3635) --- images/macos/toolsets/toolset-11.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index 89eac922721a..4cd56917fee2 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -3,7 +3,8 @@ "default": "12.5", "versions": [ { "link": "13.0", "version": "13.0.0"}, - { "link": "12.5", "version": "12.5.1"}, + { "link": "12.5.1", "version": "12.5.1"}, + { "link": "12.5", "version": "12.5.0"}, { "link": "12.4", "version": "12.4.0"}, { "link": "12.3", "version": "12.3.0"}, { "link": "12.2", "version": "12.2.0" }, From dd399bcab41317bb4b1d92f32d816dfe95d4e474 Mon Sep 17 00:00:00 2001 From: Marcus Felling Date: Thu, 24 Jun 2021 03:13:00 -0500 Subject: [PATCH 0346/3485] [Ubuntu] Adding Bicep CLI (#3639) * Add Bicep CLI to Ubuntu images * Use helper download_with_retries * remove bicep from deprecated 16.04 image * formatting Co-authored-by: Marcus Felling --- .../SoftwareReport/SoftwareReport.Generator.ps1 | 1 + .../SoftwareReport/SoftwareReport.Tools.psm1 | 6 ++++++ images/linux/scripts/installers/bicep.sh | 16 ++++++++++++++++ images/linux/scripts/tests/Tools.Tests.ps1 | 6 ++++++ images/linux/ubuntu1804.json | 1 + images/linux/ubuntu2004.json | 1 + 6 files changed, 31 insertions(+) create mode 100644 images/linux/scripts/installers/bicep.sh diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index 004e15657241..3589044eee96 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -109,6 +109,7 @@ $toolsList = @( (Get-AzCopyVersion), (Get-BazelVersion), (Get-BazeliskVersion), + (Get-BicepVersion), (Get-CodeQLBundleVersion), (Get-CMakeVersion), (Get-DockerMobyClientVersion), diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 index 35a74f684f6c..202920a972e7 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 @@ -26,6 +26,12 @@ function Get-BazeliskVersion { return "Bazelisk $bazeliskVersion" } +function Get-BicepVersion { + (bicep --version | Out-String) -match "bicep cli version (?\d+\.\d+\.\d+)" | Out-Null + $bicepVersion = $Matches.Version + return "Bicep $bicepVersion" +} + function Get-CodeQLBundleVersion { $CodeQLVersionsWildcard = Join-Path $Env:AGENT_TOOLSDIRECTORY -ChildPath "CodeQL" | Join-Path -ChildPath "*" $CodeQLVersionPath = Get-ChildItem $CodeQLVersionsWildcard | Select-Object -First 1 -Expand FullName diff --git a/images/linux/scripts/installers/bicep.sh b/images/linux/scripts/installers/bicep.sh new file mode 100644 index 000000000000..20c0482c2048 --- /dev/null +++ b/images/linux/scripts/installers/bicep.sh @@ -0,0 +1,16 @@ +#!/bin/bash -e +################################################################################ +## File: bicep.sh +## Desc: Installs bicep cli +################################################################################ + +source $HELPER_SCRIPTS/install.sh + +# Install Bicep CLI +download_with_retries "https://github.com/Azure/bicep/releases/latest/download/bicep-linux-x64" "." "bicep.bin" +# Mark it as executable +chmod +x ./bicep.bin +# Add bicep to PATH (requires admin) +sudo mv ./bicep.bin /usr/local/bin/bicep + +invoke_tests "Tools" "Bicep" \ No newline at end of file diff --git a/images/linux/scripts/tests/Tools.Tests.ps1 b/images/linux/scripts/tests/Tools.Tests.ps1 index 76f4ba4d3966..9ae92516dc96 100644 --- a/images/linux/scripts/tests/Tools.Tests.ps1 +++ b/images/linux/scripts/tests/Tools.Tests.ps1 @@ -8,6 +8,12 @@ Describe "azcopy" { } } +Describe "Bicep" { + It "Bicep" { + "bicep --version" | Should -ReturnZeroExitCode + } +} + Describe "Rust" { It "Rustup is installed" { "rustup --version" | Should -ReturnZeroExitCode diff --git a/images/linux/ubuntu1804.json b/images/linux/ubuntu1804.json index f6ede73f9d26..03fb8d806921 100644 --- a/images/linux/ubuntu1804.json +++ b/images/linux/ubuntu1804.json @@ -196,6 +196,7 @@ "{{template_dir}}/scripts/installers/azure-cli.sh", "{{template_dir}}/scripts/installers/azure-devops-cli.sh", "{{template_dir}}/scripts/installers/basic.sh", + "{{template_dir}}/scripts/installers/bicep.sh", "{{template_dir}}/scripts/installers/aliyun-cli.sh", "{{template_dir}}/scripts/installers/apache.sh", "{{template_dir}}/scripts/installers/aws.sh", diff --git a/images/linux/ubuntu2004.json b/images/linux/ubuntu2004.json index 0d70fc4d73cd..c6d10ae44f13 100644 --- a/images/linux/ubuntu2004.json +++ b/images/linux/ubuntu2004.json @@ -196,6 +196,7 @@ "{{template_dir}}/scripts/installers/azure-cli.sh", "{{template_dir}}/scripts/installers/azure-devops-cli.sh", "{{template_dir}}/scripts/installers/basic.sh", + "{{template_dir}}/scripts/installers/bicep.sh", "{{template_dir}}/scripts/installers/aliyun-cli.sh", "{{template_dir}}/scripts/installers/apache.sh", "{{template_dir}}/scripts/installers/aws.sh", From 405a368b22cbac48f31ce7b35f415369d31a27b1 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 24 Jun 2021 08:48:57 +0000 Subject: [PATCH 0347/3485] Updating readme file for ubuntu18 version 20210621.1 (#3622) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/linux/Ubuntu1804-README.md | 75 +++++++++++++++---------------- 1 file changed, 37 insertions(+), 38 deletions(-) diff --git a/images/linux/Ubuntu1804-README.md b/images/linux/Ubuntu1804-README.md index cda8f621dd9f..f22cab385271 100644 --- a/images/linux/Ubuntu1804-README.md +++ b/images/linux/Ubuntu1804-README.md @@ -1,11 +1,10 @@ | Announcements | |-| -| [[Ubuntu] .NET SDK pre-installation policy will be changed on June 14](https://github.com/actions/virtual-environments/issues/3338) | | [Ubuntu 16.04 environment will be removed on September 20, 2021](https://github.com/actions/virtual-environments/issues/3287) | *** # Ubuntu 18.04.5 LTS - Linux kernel version: 5.4.0-1049-azure -- Image Version: 20210614.1 +- Image Version: 20210621.1 ## Installed Software ### Language and Runtime @@ -19,7 +18,7 @@ - Julia 1.6.1 - Mono 6.12.0.122 (apt source repository: https://download.mono-project.com/repo/ubuntu stable-bionic main) - MSBuild 16.6.0.15201 (from /usr/lib/mono/msbuild/15.0/bin/MSBuild.dll) -- Node 14.17.0 +- Node 14.17.1 - Perl 5.26.1 - Python 2.7.17 - Python3 3.6.9 @@ -28,7 +27,7 @@ ### Package Management - cpan 1.64 -- Helm 3.6.0 +- Helm 3.6.1 - Homebrew 3.1.12 - Miniconda 4.9.2 - Npm 6.14.13 @@ -36,7 +35,7 @@ - Pip3 9.0.1 - Pipx 0.16.3 - RubyGems 2.7.6 -- Vcpkg (build from master \<92b42c4>) +- Vcpkg (build from master \<08214e1>) - Yarn 1.22.10 #### Environment variables @@ -47,18 +46,18 @@ ### Project Management - Ant 1.10.5 -- Gradle 7.0.2 +- Gradle 7.1 - Maven 3.8.1 - Sbt 1.5.4 ### Tools - Ansible 2.10.10 - apt-fast 1.9.11 -- AzCopy 10.10.0 (available by `azcopy` and `azcopy10` aliases) +- AzCopy 10.11.0 (available by `azcopy` and `azcopy10` aliases) - Bazel 4.1.0 - Bazelisk 1.9.0 - Buildah 1.19.6 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- CMake 3.20.3 +- CMake 3.20.4 - CodeQL Action Bundle 2.5.5 - Docker Compose 1.29.2 - Docker-Buildx 0.5.1 @@ -69,7 +68,7 @@ - Git-ftp 1.3.1 - Haveged 1.9.1 - Heroku 7.54.1 -- HHVM (HipHop VM) 4.113.0 +- HHVM (HipHop VM) 4.114.0 - jq 1.5 - Kind 0.11.1 - Kubectl 1.20.1-5-g76a04fc @@ -81,10 +80,10 @@ - Newman 5.2.3 - nvm 0.38.0 - OpenSSL 1.1.1 11 Sep 2018 -- Packer 1.7.2 +- Packer 1.7.3 - PhantomJS 2.1.1 - Podman 3.0.1 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- Pulumi 3.4.0 +- Pulumi 3.5.1 - R 4.1.0 - Skopeo 1.2.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 @@ -94,19 +93,19 @@ - zstd 1.5.0 (homebrew) ### CLI Tools -- Alibaba Cloud CLI 3.0.79 -- AWS CLI 1.19.93 +- Alibaba Cloud CLI 3.0.80 +- AWS CLI 1.19.97 - AWS CLI Session manager plugin 1.2.205.0 - AWS SAM CLI 1.24.1 -- Azure CLI (azure-cli) 2.24.2 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) +- Azure CLI (azure-cli) 2.25.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.18.0 - GitHub CLI 1.11.0 -- Google Cloud SDK 344.0.0 (apt source repository: https://packages.cloud.google.com/apt) +- Google Cloud SDK 345.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 3.37.17 -- OpenShift CLI 4.7.13 +- Netlify CLI 3.37.37 +- OpenShift CLI 4.7.16 - ORAS CLI 0.12.0 -- Vercel CLI 23.0.0 +- Vercel CLI 23.0.1 ### Java | Version | Vendor | Environment Variable | @@ -131,23 +130,23 @@ - Stack 2.7.1 ### Rust Tools -- Cargo 1.52.0 -- Rust 1.52.1 -- Rustdoc 1.52.1 +- Cargo 1.53.0 +- Rust 1.53.0 +- Rustdoc 1.53.0 - Rustup 1.24.3 #### Packages - Bindgen 0.58.1 - Cargo audit 0.14.1 -- Cargo clippy 0.1.52 +- Cargo clippy 0.1.53 - Cargo outdated 0.9.15 - Cbindgen 0.19.0 -- Rustfmt 1.4.36 +- Rustfmt 1.4.37 ### Browsers and Drivers -- Google Chrome 91.0.4472.101 +- Google Chrome 91.0.4472.114 - ChromeDriver 91.0.4472.101 -- Mozilla Firefox 89.0 +- Mozilla Firefox 89.0.1 - Geckodriver 0.29.1 - Chromium 91.0.4472.0 @@ -184,7 +183,7 @@ #### Node.js - 10.24.1 - 12.22.1 -- 14.17.0 +- 14.17.1 #### PyPy - 2.7.18 [PyPy 7.3.5] @@ -257,9 +256,9 @@ ### Cached Docker images | Repository:Tag | Digest | Created | | ---------------------- | ------------------------------------------------------------------------ | ---------- | -| alpine:3.11 | sha256:18a918a714d1368847b67173d120ebd110fcfae208305412f3005a61cdc7c20e | 2021-04-14 | -| alpine:3.12 | sha256:36553b10a4947067b9fbb7d532951066293a68eae893beba1d9235f7d11a20ad | 2021-04-14 | -| alpine:3.13 | sha256:69e70a79f2d41ab5d637de98c1e0b055206ba40a8145e7bddb55ccc04e13cf8f | 2021-04-14 | +| alpine:3.11 | sha256:20117524da64d995fd769f0aa3d7cfe2040518426f4b238f43e8373f4aa56c06 | 2021-04-14 | +| alpine:3.12 | sha256:87703314048c40236c6d674424159ee862e2b96ce1c37c62d877e21ed27a387e | 2021-04-14 | +| alpine:3.13 | sha256:f51ff2d96627690d62fee79e6eecd9fa87429a38142b5df8a3bfbb26061df7fc | 2021-04-14 | | buildpack-deps:buster | sha256:b4ba9e547bb2e4f48186b234a816ec0182c86fda31f4de5c1eeb824a5d3330df | 2021-05-12 | | buildpack-deps:stretch | sha256:fe5d31963e568ba5c418ad26c7c1391ddeedd801672236f081fc3e1e2950e27b | 2021-05-12 | | debian:10 | sha256:acf7795dc91df17e10effee064bd229580a9c34213b4dba578d64768af5d8c51 | 2021-05-12 | @@ -267,12 +266,12 @@ | node:10 | sha256:59531d2835edd5161c8f9512f9e095b1836f7a1fcb0ab73e005ec46047384911 | 2021-04-10 | | node:10-alpine | sha256:dc98dac24efd4254f75976c40bce46944697a110d06ce7fa47e7268470cf2e28 | 2021-04-14 | | node:12 | sha256:0d6b3522991d04ead0b119feaffafa6a8cd1b374218e9f997a1d4753b7064882 | 2021-05-12 | -| node:12-alpine | sha256:9a372efac4c436dfb6dbdea42f08d3ea60a0103a1df54a7da247e4bed1b327f7 | 2021-04-14 | -| node:14 | sha256:af9879e7473d347048c5d5919aa9775f27c33d92e4d58058ffdc08247f4bd902 | 2021-05-13 | -| node:14-alpine | sha256:f07ead757c93bc5e9e79978075217851d45a5d8e5c48eaf823e7f12d9bbc1d3c | 2021-05-13 | -| ubuntu:16.04 | sha256:9775877f420d453ef790e6832d77630a49b32a92b7bedf330adf4d8669f6600e | 2021-05-19 | -| ubuntu:18.04 | sha256:67b730ece0d34429b455c08124ffd444f021b81e06fa2d9cd0adaf0d0b875182 | 2021-05-19 | -| ubuntu:20.04 | sha256:adf73ca014822ad8237623d388cedf4d5346aa72c270c5acc01431cc93e18e2d | 2021-04-23 | +| node:12-alpine | sha256:152bd04c3bb9001eebaa1f5a9c5d8bb9253fd3ae8b4a261f5fe760dce38b98ff | 2021-04-14 | +| node:14 | sha256:52fe2e3604ca3d7d0bc017c0d60df5baaf54c3e261bab8334b0657f923092523 | 2021-06-15 | +| node:14-alpine | sha256:cc1a31b2f4a3b8e9cdc6f8dc0c39a3b946d7aa5d10a53439d960d4352b2acfc0 | 2021-06-15 | +| ubuntu:16.04 | sha256:6aab78d1825b4c15c159fecc62b8eef4fdf0c693a15aace3a605ad44e5e2df0c | 2021-06-17 | +| ubuntu:18.04 | sha256:139b3846cee2e63de9ced83cee7023a2d95763ee2573e5b0ab6dea9dfbd4db8f | 2021-06-17 | +| ubuntu:20.04 | sha256:aba80b77e27148d99c034a987e7da3a287ed455390352663418c0f2ed40417fe | 2021-06-17 | ### Installed apt packages | Name | Version | @@ -293,7 +292,7 @@ | ftp | 0.17-34 | | gnupg2 | 2.2.4-1ubuntu1.4 | | haveged | 1.9.1-6 | -| imagemagick | 8:6.9.7.4+dfsg-16ubuntu6.9 | +| imagemagick | 8:6.9.7.4+dfsg-16ubuntu6.11 | | iproute2 | 4.15.0-2ubuntu1.3 | | iputils-ping | 3:20161105-1ubuntu3 | | jq | 1.5+dfsg-2 | @@ -306,8 +305,8 @@ | libgsl-dev | 2.4+dfsg-6 | | libgtk-3-0 | 3.22.30-1ubuntu4 | | libmagic-dev | 1:5.32-2ubuntu0.4 | -| libmagickcore-dev | 8:6.9.7.4+dfsg-16ubuntu6.9 | -| libmagickwand-dev | 8:6.9.7.4+dfsg-16ubuntu6.9 | +| libmagickcore-dev | 8:6.9.7.4+dfsg-16ubuntu6.11 | +| libmagickwand-dev | 8:6.9.7.4+dfsg-16ubuntu6.11 | | libsecret-1-dev | 0.18.6-1 | | libsqlite3-dev | 3.22.0-1ubuntu0.4 | | libunwind8 | 1.2.1-8 | From 059dfd8e750fde58d18f97f92a4ea6f623868154 Mon Sep 17 00:00:00 2001 From: Darleev <50947177+Darleev@users.noreply.github.com> Date: Thu, 24 Jun 2021 22:55:51 +0700 Subject: [PATCH 0348/3485] [macOS 11] software update week 26 (#3648) * software update week 26 * returned previous mono version --- images/macos/toolsets/toolset-11.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index 4cd56917fee2..ce1cc0a15922 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -17,10 +17,10 @@ "6.12.0.125" ], "ios-versions": [ - "14.20.0.3", "14.16.0.5", "14.14.2.5", "14.10.0.4", "14.8.0.3", "14.6.0.15", "14.4.1.3", "14.2.0.12", "14.0.0.0", "13.20.2.2" + "14.20.0.24", "14.16.0.5", "14.14.2.5", "14.10.0.4", "14.8.0.3", "14.6.0.15", "14.4.1.3", "14.2.0.12", "14.0.0.0", "13.20.2.2" ], "mac-versions": [ - "7.14.0.3", "7.10.0.5", "7.8.2.5", "7.4.0.10", "7.2.0.3", "7.0.0.15", "6.22.1.26", "6.20.2.2" + "7.14.0.24", "7.10.0.5", "7.8.2.5", "7.4.0.10", "7.2.0.3", "7.0.0.15", "6.22.1.26", "6.20.2.2" ], "android-versions": [ "11.3.0.4", "11.2.2.1", "11.1.0.26", "11.0.2.0" From c103d79bd102a3742cd86628f56aa9443abfaa84 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 24 Jun 2021 19:09:51 +0000 Subject: [PATCH 0349/3485] Updating readme file for ubuntu20 version 20210621.1 (#3623) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/linux/Ubuntu2004-README.md | 79 +++++++++++++++---------------- 1 file changed, 39 insertions(+), 40 deletions(-) diff --git a/images/linux/Ubuntu2004-README.md b/images/linux/Ubuntu2004-README.md index 5bfe139b6789..bdb07a3909ae 100644 --- a/images/linux/Ubuntu2004-README.md +++ b/images/linux/Ubuntu2004-README.md @@ -1,11 +1,10 @@ | Announcements | |-| -| [[Ubuntu] .NET SDK pre-installation policy will be changed on June 14](https://github.com/actions/virtual-environments/issues/3338) | | [Ubuntu 16.04 environment will be removed on September 20, 2021](https://github.com/actions/virtual-environments/issues/3287) | *** # Ubuntu 20.04.2 LTS - Linux kernel version: 5.8.0-1033-azure -- Image Version: 20210614.1 +- Image Version: 20210621.1 ## Installed Software ### Language and Runtime @@ -18,7 +17,7 @@ - LLVM components: Clang 10.0.0, 11.0.0, 12.0.1, Clang-format 10.0.0, 11.0.0, 12.0.1 (apt source: deb http://apt.llvm.org/focal/ llvm-toolchain-focal-12) - Mono 6.12.0.122 (apt source repository: https://download.mono-project.com/repo/ubuntu stable-focal main) - MSBuild 16.6.0.15201 (from /usr/lib/mono/msbuild/15.0/bin/MSBuild.dll) -- Node 14.17.0 +- Node 14.17.1 - Perl 5.30.0 - Python 3.8.5 - Python3 3.8.5 @@ -27,7 +26,7 @@ ### Package Management - cpan 1.64 -- Helm 3.6.0 +- Helm 3.6.1 - Homebrew 3.1.12 - Miniconda 4.9.2 - Npm 6.14.13 @@ -35,7 +34,7 @@ - Pip3 20.0.2 - Pipx 0.16.3 - RubyGems 3.1.2 -- Vcpkg (build from master \<92b42c4>) +- Vcpkg (build from master \<08214e1>) - Yarn 1.22.10 #### Environment variables @@ -46,7 +45,7 @@ ### Project Management - Ant 1.10.7 -- Gradle 7.0.2 +- Gradle 7.1 - Lerna 4.0.0 - Maven 3.8.1 - Sbt 1.5.4 @@ -54,23 +53,23 @@ ### Tools - Ansible 2.10.10 - apt-fast 1.9.11 -- AzCopy 10.10.0 (available by `azcopy` and `azcopy10` aliases) +- AzCopy 10.11.0 (available by `azcopy` and `azcopy10` aliases) - Bazel 4.1.0 - Bazelisk 1.9.0 - Buildah 1.21.0 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- CMake 3.20.3 +- CMake 3.20.4 - CodeQL Action Bundle 2.5.5 - Docker Compose 1.29.2 - Docker-Buildx 0.5.1 - Docker-Moby Client 20.10.6+azure - Docker-Moby Server 20.10.6+azure -- Fastlane 2.185.0 +- Fastlane 2.185.1 - Git 2.32.0 (apt source repository: ppa:git-core/ppa) - Git LFS 2.13.3 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.6.0 - Haveged 1.9.1 - Heroku 7.54.1 -- HHVM (HipHop VM) 4.113.0 +- HHVM (HipHop VM) 4.114.0 - jq 1.6 - Kind 0.11.1 - Kubectl 1.20.1-5-g76a04fc @@ -82,10 +81,10 @@ - Newman 5.2.3 - nvm 0.38.0 - OpenSSL 1.1.1f 31 Mar 2020 -- Packer 1.7.2 +- Packer 1.7.3 - PhantomJS 2.1.1 - Podman 3.1.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- Pulumi 3.4.0 +- Pulumi 3.5.1 - R 4.1.0 - Skopeo 1.3.0 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 @@ -95,19 +94,19 @@ - zstd 1.5.0 (homebrew) ### CLI Tools -- Alibaba Cloud CLI 3.0.79 -- AWS CLI 2.2.11 +- Alibaba Cloud CLI 3.0.80 +- AWS CLI 2.2.13 - AWS CLI Session manager plugin 1.2.205.0 - AWS SAM CLI 1.24.1 -- Azure CLI (azure-cli) 2.24.2 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) +- Azure CLI (azure-cli) 2.25.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.18.0 - GitHub CLI 1.11.0 -- Google Cloud SDK 344.0.0 (apt source repository: https://packages.cloud.google.com/apt) +- Google Cloud SDK 345.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 3.37.18 -- OpenShift CLI 4.7.13 +- Netlify CLI 3.37.37 +- OpenShift CLI 4.7.16 - ORAS CLI 0.12.0 -- Vercel CLI 23.0.0 +- Vercel CLI 23.0.1 ### Java | Version | Vendor | Environment Variable | @@ -136,23 +135,23 @@ - Stack 2.7.1 ### Rust Tools -- Cargo 1.52.0 -- Rust 1.52.1 -- Rustdoc 1.52.1 +- Cargo 1.53.0 +- Rust 1.53.0 +- Rustdoc 1.53.0 - Rustup 1.24.3 #### Packages - Bindgen 0.58.1 - Cargo audit 0.14.1 -- Cargo clippy 0.1.52 +- Cargo clippy 0.1.53 - Cargo outdated 0.9.15 - Cbindgen 0.19.0 -- Rustfmt 1.4.36 +- Rustfmt 1.4.37 ### Browsers and Drivers -- Google Chrome 91.0.4472.101 +- Google Chrome 91.0.4472.114 - ChromeDriver 91.0.4472.101 -- Mozilla Firefox 89.0 +- Mozilla Firefox 89.0.1 - Geckodriver 0.29.1 - Chromium 91.0.4472.0 @@ -189,7 +188,7 @@ #### Node.js - 10.24.1 - 12.22.1 -- 14.17.0 +- 14.17.1 #### PyPy - 2.7.18 [PyPy 7.3.5] @@ -264,9 +263,9 @@ ### Cached Docker images | Repository:Tag | Digest | Created | | ---------------------- | ------------------------------------------------------------------------ | ---------- | -| alpine:3.11 | sha256:18a918a714d1368847b67173d120ebd110fcfae208305412f3005a61cdc7c20e | 2021-04-14 | -| alpine:3.12 | sha256:36553b10a4947067b9fbb7d532951066293a68eae893beba1d9235f7d11a20ad | 2021-04-14 | -| alpine:3.13 | sha256:69e70a79f2d41ab5d637de98c1e0b055206ba40a8145e7bddb55ccc04e13cf8f | 2021-04-14 | +| alpine:3.11 | sha256:20117524da64d995fd769f0aa3d7cfe2040518426f4b238f43e8373f4aa56c06 | 2021-04-14 | +| alpine:3.12 | sha256:87703314048c40236c6d674424159ee862e2b96ce1c37c62d877e21ed27a387e | 2021-04-14 | +| alpine:3.13 | sha256:f51ff2d96627690d62fee79e6eecd9fa87429a38142b5df8a3bfbb26061df7fc | 2021-04-14 | | buildpack-deps:buster | sha256:b4ba9e547bb2e4f48186b234a816ec0182c86fda31f4de5c1eeb824a5d3330df | 2021-05-12 | | buildpack-deps:stretch | sha256:fe5d31963e568ba5c418ad26c7c1391ddeedd801672236f081fc3e1e2950e27b | 2021-05-12 | | debian:10 | sha256:acf7795dc91df17e10effee064bd229580a9c34213b4dba578d64768af5d8c51 | 2021-05-12 | @@ -274,12 +273,12 @@ | node:10 | sha256:59531d2835edd5161c8f9512f9e095b1836f7a1fcb0ab73e005ec46047384911 | 2021-04-10 | | node:10-alpine | sha256:dc98dac24efd4254f75976c40bce46944697a110d06ce7fa47e7268470cf2e28 | 2021-04-14 | | node:12 | sha256:0d6b3522991d04ead0b119feaffafa6a8cd1b374218e9f997a1d4753b7064882 | 2021-05-12 | -| node:12-alpine | sha256:9a372efac4c436dfb6dbdea42f08d3ea60a0103a1df54a7da247e4bed1b327f7 | 2021-04-14 | -| node:14 | sha256:af9879e7473d347048c5d5919aa9775f27c33d92e4d58058ffdc08247f4bd902 | 2021-05-13 | -| node:14-alpine | sha256:f07ead757c93bc5e9e79978075217851d45a5d8e5c48eaf823e7f12d9bbc1d3c | 2021-05-13 | -| ubuntu:16.04 | sha256:9775877f420d453ef790e6832d77630a49b32a92b7bedf330adf4d8669f6600e | 2021-05-19 | -| ubuntu:18.04 | sha256:67b730ece0d34429b455c08124ffd444f021b81e06fa2d9cd0adaf0d0b875182 | 2021-05-19 | -| ubuntu:20.04 | sha256:adf73ca014822ad8237623d388cedf4d5346aa72c270c5acc01431cc93e18e2d | 2021-04-23 | +| node:12-alpine | sha256:152bd04c3bb9001eebaa1f5a9c5d8bb9253fd3ae8b4a261f5fe760dce38b98ff | 2021-04-14 | +| node:14 | sha256:52fe2e3604ca3d7d0bc017c0d60df5baaf54c3e261bab8334b0657f923092523 | 2021-06-15 | +| node:14-alpine | sha256:cc1a31b2f4a3b8e9cdc6f8dc0c39a3b946d7aa5d10a53439d960d4352b2acfc0 | 2021-06-15 | +| ubuntu:16.04 | sha256:6aab78d1825b4c15c159fecc62b8eef4fdf0c693a15aace3a605ad44e5e2df0c | 2021-06-17 | +| ubuntu:18.04 | sha256:139b3846cee2e63de9ced83cee7023a2d95763ee2573e5b0ab6dea9dfbd4db8f | 2021-06-17 | +| ubuntu:20.04 | sha256:aba80b77e27148d99c034a987e7da3a287ed455390352663418c0f2ed40417fe | 2021-06-17 | ### Installed apt packages | Name | Version | @@ -302,7 +301,7 @@ | ftp | 0.17-34.1 | | gnupg2 | 2.2.19-3ubuntu2.1 | | haveged | 1.9.1-6ubuntu1 | -| imagemagick | 8:6.9.10.23+dfsg-2.1ubuntu11.2 | +| imagemagick | 8:6.9.10.23+dfsg-2.1ubuntu11.4 | | iproute2 | 5.5.0-1ubuntu1 | | iputils-ping | 3:20190709-3 | | jq | 1.6-1ubuntu0.20.04.1 | @@ -315,9 +314,9 @@ | libgsl-dev | 2.5+dfsg-6build1 | | libgtk-3-0 | 3.24.20-0ubuntu1 | | libmagic-dev | 1:5.38-4 | -| libmagickcore-dev | 8:6.9.10.23+dfsg-2.1ubuntu11.2 | -| libmagickwand-dev | 8:6.9.10.23+dfsg-2.1ubuntu11.2 | -| libsecret-1-dev | 0.20.3-0ubuntu1 | +| libmagickcore-dev | 8:6.9.10.23+dfsg-2.1ubuntu11.4 | +| libmagickwand-dev | 8:6.9.10.23+dfsg-2.1ubuntu11.4 | +| libsecret-1-dev | 0.20.4-0ubuntu1 | | libsqlite3-dev | 3.31.1-4ubuntu0.2 | | libunwind8 | 1.2.1-9build1 | | libxkbfile-dev | 1:1.1.0-1 | From 8ebae96a7cf51d0be4700c9e5c49891e07aadc05 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Fri, 25 Jun 2021 18:28:19 +0300 Subject: [PATCH 0350/3485] Remove Xcode 12.2&12.3 from macos Big Sur toolset (#3653) --- images/macos/toolsets/toolset-11.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index ce1cc0a15922..aa7054921414 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -6,8 +6,6 @@ { "link": "12.5.1", "version": "12.5.1"}, { "link": "12.5", "version": "12.5.0"}, { "link": "12.4", "version": "12.4.0"}, - { "link": "12.3", "version": "12.3.0"}, - { "link": "12.2", "version": "12.2.0" }, { "link": "11.7", "version": "11.7.0", "symlinks": ["11.7_beta"] } ] }, From 83c974ff846e029035f94d6656f69412398b2485 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 25 Jun 2021 17:29:27 +0000 Subject: [PATCH 0351/3485] Updating readme file for win16 version 20210620.1 (#3624) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/win/Windows2016-Readme.md | 46 ++++++++++++++++---------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/images/win/Windows2016-Readme.md b/images/win/Windows2016-Readme.md index 90e8e985d40c..c480b5a694e2 100644 --- a/images/win/Windows2016-Readme.md +++ b/images/win/Windows2016-Readme.md @@ -1,13 +1,13 @@ # Microsoft Windows Server 2016 Datacenter - OS Version: 10.0.14393 Build 4467 -- Image Version: 20210614.1 +- Image Version: 20210620.1 ## Installed Software ### Language and Runtime - Bash 4.4.23(1)-release - Go 1.15.13 - Julia 1.6.1 -- Node 14.17.0 +- Node 14.17.1 - Perl 5.32.1 - PHP 8.0.7 - Python 3.7.9 @@ -19,11 +19,11 @@ - Helm 3.6.0 - Miniconda 4.9.2 (pre-installed on the image but not added to PATH) - NPM 6.14.13 -- NuGet 5.9.1.11 +- NuGet 5.10.0.7240 - pip 21.1.2 (python 3.7) - Pipx 0.16.3 - RubyGems 2.7.6.3 -- Vcpkg (build from master \<92b42c4>) +- Vcpkg (build from master \<08214e1>) - Yarn 1.22.10 #### Environment variables @@ -34,24 +34,24 @@ ### Project Management - Ant 1.10.10 -- Gradle 7.0 +- Gradle 7.1 - Maven 3.8.1 - sbt 1.5.3 ### Tools - 7zip 19.00 -- azcopy 10.10.0 +- azcopy 10.11.0 - Bazel 4.1.0 - Bazelisk 1.9.0 - Cabal 3.4.0.0 -- CMake 3.20.3 +- CMake 3.20.4 - CodeQL Action Bundle 2.5.5 - Docker 20.10.5 - Docker-compose 1.29.1 - ghc 9.0.1 - Git 2.32.0 - Git LFS 2.13.3 -- Google Cloud SDK 344.0.0 +- Google Cloud SDK 345.0.0 - InnoSetup 6.2.0 - jq 1.6 - Kind 0.11.1 @@ -62,7 +62,7 @@ - NSIS v3.06.1 - OpenSSL 1.1.1 - Packer 1.7.2 -- Pulumi v3.4.0 +- Pulumi v3.5.1 - R 4.1.0 - Stack 2.7.1 - Subversion (SVN) 1.14.1 @@ -73,20 +73,20 @@ - zstd 1.5.0 ### CLI Tools -- Alibaba Cloud CLI 3.0.79 -- AWS CLI 2.2.11 +- Alibaba Cloud CLI 3.0.80 +- AWS CLI 2.2.13 - AWS SAM CLI 1.24.1 - AWS Session Manager CLI 1.2.205.0 -- Azure CLI 2.24.2 +- Azure CLI 2.25.0 - Azure DevOps CLI extension 0.18.0 - Cloud Foundry CLI 6.53.0 - GitHub CLI 1.11.0 - Hub CLI 2.14.2 ### Rust Tools -- Cargo 1.52.0 -- Rust 1.52.1 -- Rustdoc 1.52.1 +- Cargo 1.53.0 +- Rust 1.53.0 +- Rustdoc 1.53.0 - Rustup 1.24.3 #### Packages @@ -94,15 +94,15 @@ - cargo-audit 0.14.1 - cargo-outdated v0.9.15 - cbindgen 0.19.0 -- Clippy 0.1.52 -- Rustfmt 1.4.36 +- Clippy 0.1.53 +- Rustfmt 1.4.37 ### Browsers and webdrivers -- Google Chrome 91.0.4472.101 +- Google Chrome 91.0.4472.114 - Chrome Driver 91.0.4472.101 -- Microsoft Edge 91.0.864.48 -- Microsoft Edge Driver 91.0.864.48 -- Mozilla Firefox 89.0 +- Microsoft Edge 91.0.864.54 +- Microsoft Edge Driver 91.0.864.54 +- Mozilla Firefox 89.0.1 - Gecko Driver 0.29.1 - IE Driver 3.150.1.0 @@ -149,7 +149,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | ------- | ------------ | | 10.24.1 | x64 | | 12.22.1 | x64 | -| 14.17.0 | x64 | +| 14.17.1 | x64 | #### Python @@ -204,7 +204,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Database tools -- Azure CosmosDb Emulator 2.11.13.0 +- Azure CosmosDb Emulator 2.14.1.0 - DacFx 15.0.4897.1 - MySQL 5.7.21.0 - SQLPS 1.0 From c3f3d8325f86e969eba47d14d6484f752d37b973 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Sat, 26 Jun 2021 11:22:49 +0300 Subject: [PATCH 0352/3485] Revert "Updating readme file for ubuntu20 version 20210621.1 (#3623)" (#3654) --- images/linux/Ubuntu2004-README.md | 79 ++++++++++++++++--------------- 1 file changed, 40 insertions(+), 39 deletions(-) diff --git a/images/linux/Ubuntu2004-README.md b/images/linux/Ubuntu2004-README.md index bdb07a3909ae..5bfe139b6789 100644 --- a/images/linux/Ubuntu2004-README.md +++ b/images/linux/Ubuntu2004-README.md @@ -1,10 +1,11 @@ | Announcements | |-| +| [[Ubuntu] .NET SDK pre-installation policy will be changed on June 14](https://github.com/actions/virtual-environments/issues/3338) | | [Ubuntu 16.04 environment will be removed on September 20, 2021](https://github.com/actions/virtual-environments/issues/3287) | *** # Ubuntu 20.04.2 LTS - Linux kernel version: 5.8.0-1033-azure -- Image Version: 20210621.1 +- Image Version: 20210614.1 ## Installed Software ### Language and Runtime @@ -17,7 +18,7 @@ - LLVM components: Clang 10.0.0, 11.0.0, 12.0.1, Clang-format 10.0.0, 11.0.0, 12.0.1 (apt source: deb http://apt.llvm.org/focal/ llvm-toolchain-focal-12) - Mono 6.12.0.122 (apt source repository: https://download.mono-project.com/repo/ubuntu stable-focal main) - MSBuild 16.6.0.15201 (from /usr/lib/mono/msbuild/15.0/bin/MSBuild.dll) -- Node 14.17.1 +- Node 14.17.0 - Perl 5.30.0 - Python 3.8.5 - Python3 3.8.5 @@ -26,7 +27,7 @@ ### Package Management - cpan 1.64 -- Helm 3.6.1 +- Helm 3.6.0 - Homebrew 3.1.12 - Miniconda 4.9.2 - Npm 6.14.13 @@ -34,7 +35,7 @@ - Pip3 20.0.2 - Pipx 0.16.3 - RubyGems 3.1.2 -- Vcpkg (build from master \<08214e1>) +- Vcpkg (build from master \<92b42c4>) - Yarn 1.22.10 #### Environment variables @@ -45,7 +46,7 @@ ### Project Management - Ant 1.10.7 -- Gradle 7.1 +- Gradle 7.0.2 - Lerna 4.0.0 - Maven 3.8.1 - Sbt 1.5.4 @@ -53,23 +54,23 @@ ### Tools - Ansible 2.10.10 - apt-fast 1.9.11 -- AzCopy 10.11.0 (available by `azcopy` and `azcopy10` aliases) +- AzCopy 10.10.0 (available by `azcopy` and `azcopy10` aliases) - Bazel 4.1.0 - Bazelisk 1.9.0 - Buildah 1.21.0 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- CMake 3.20.4 +- CMake 3.20.3 - CodeQL Action Bundle 2.5.5 - Docker Compose 1.29.2 - Docker-Buildx 0.5.1 - Docker-Moby Client 20.10.6+azure - Docker-Moby Server 20.10.6+azure -- Fastlane 2.185.1 +- Fastlane 2.185.0 - Git 2.32.0 (apt source repository: ppa:git-core/ppa) - Git LFS 2.13.3 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.6.0 - Haveged 1.9.1 - Heroku 7.54.1 -- HHVM (HipHop VM) 4.114.0 +- HHVM (HipHop VM) 4.113.0 - jq 1.6 - Kind 0.11.1 - Kubectl 1.20.1-5-g76a04fc @@ -81,10 +82,10 @@ - Newman 5.2.3 - nvm 0.38.0 - OpenSSL 1.1.1f 31 Mar 2020 -- Packer 1.7.3 +- Packer 1.7.2 - PhantomJS 2.1.1 - Podman 3.1.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- Pulumi 3.5.1 +- Pulumi 3.4.0 - R 4.1.0 - Skopeo 1.3.0 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 @@ -94,19 +95,19 @@ - zstd 1.5.0 (homebrew) ### CLI Tools -- Alibaba Cloud CLI 3.0.80 -- AWS CLI 2.2.13 +- Alibaba Cloud CLI 3.0.79 +- AWS CLI 2.2.11 - AWS CLI Session manager plugin 1.2.205.0 - AWS SAM CLI 1.24.1 -- Azure CLI (azure-cli) 2.25.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) +- Azure CLI (azure-cli) 2.24.2 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.18.0 - GitHub CLI 1.11.0 -- Google Cloud SDK 345.0.0 (apt source repository: https://packages.cloud.google.com/apt) +- Google Cloud SDK 344.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 3.37.37 -- OpenShift CLI 4.7.16 +- Netlify CLI 3.37.18 +- OpenShift CLI 4.7.13 - ORAS CLI 0.12.0 -- Vercel CLI 23.0.1 +- Vercel CLI 23.0.0 ### Java | Version | Vendor | Environment Variable | @@ -135,23 +136,23 @@ - Stack 2.7.1 ### Rust Tools -- Cargo 1.53.0 -- Rust 1.53.0 -- Rustdoc 1.53.0 +- Cargo 1.52.0 +- Rust 1.52.1 +- Rustdoc 1.52.1 - Rustup 1.24.3 #### Packages - Bindgen 0.58.1 - Cargo audit 0.14.1 -- Cargo clippy 0.1.53 +- Cargo clippy 0.1.52 - Cargo outdated 0.9.15 - Cbindgen 0.19.0 -- Rustfmt 1.4.37 +- Rustfmt 1.4.36 ### Browsers and Drivers -- Google Chrome 91.0.4472.114 +- Google Chrome 91.0.4472.101 - ChromeDriver 91.0.4472.101 -- Mozilla Firefox 89.0.1 +- Mozilla Firefox 89.0 - Geckodriver 0.29.1 - Chromium 91.0.4472.0 @@ -188,7 +189,7 @@ #### Node.js - 10.24.1 - 12.22.1 -- 14.17.1 +- 14.17.0 #### PyPy - 2.7.18 [PyPy 7.3.5] @@ -263,9 +264,9 @@ ### Cached Docker images | Repository:Tag | Digest | Created | | ---------------------- | ------------------------------------------------------------------------ | ---------- | -| alpine:3.11 | sha256:20117524da64d995fd769f0aa3d7cfe2040518426f4b238f43e8373f4aa56c06 | 2021-04-14 | -| alpine:3.12 | sha256:87703314048c40236c6d674424159ee862e2b96ce1c37c62d877e21ed27a387e | 2021-04-14 | -| alpine:3.13 | sha256:f51ff2d96627690d62fee79e6eecd9fa87429a38142b5df8a3bfbb26061df7fc | 2021-04-14 | +| alpine:3.11 | sha256:18a918a714d1368847b67173d120ebd110fcfae208305412f3005a61cdc7c20e | 2021-04-14 | +| alpine:3.12 | sha256:36553b10a4947067b9fbb7d532951066293a68eae893beba1d9235f7d11a20ad | 2021-04-14 | +| alpine:3.13 | sha256:69e70a79f2d41ab5d637de98c1e0b055206ba40a8145e7bddb55ccc04e13cf8f | 2021-04-14 | | buildpack-deps:buster | sha256:b4ba9e547bb2e4f48186b234a816ec0182c86fda31f4de5c1eeb824a5d3330df | 2021-05-12 | | buildpack-deps:stretch | sha256:fe5d31963e568ba5c418ad26c7c1391ddeedd801672236f081fc3e1e2950e27b | 2021-05-12 | | debian:10 | sha256:acf7795dc91df17e10effee064bd229580a9c34213b4dba578d64768af5d8c51 | 2021-05-12 | @@ -273,12 +274,12 @@ | node:10 | sha256:59531d2835edd5161c8f9512f9e095b1836f7a1fcb0ab73e005ec46047384911 | 2021-04-10 | | node:10-alpine | sha256:dc98dac24efd4254f75976c40bce46944697a110d06ce7fa47e7268470cf2e28 | 2021-04-14 | | node:12 | sha256:0d6b3522991d04ead0b119feaffafa6a8cd1b374218e9f997a1d4753b7064882 | 2021-05-12 | -| node:12-alpine | sha256:152bd04c3bb9001eebaa1f5a9c5d8bb9253fd3ae8b4a261f5fe760dce38b98ff | 2021-04-14 | -| node:14 | sha256:52fe2e3604ca3d7d0bc017c0d60df5baaf54c3e261bab8334b0657f923092523 | 2021-06-15 | -| node:14-alpine | sha256:cc1a31b2f4a3b8e9cdc6f8dc0c39a3b946d7aa5d10a53439d960d4352b2acfc0 | 2021-06-15 | -| ubuntu:16.04 | sha256:6aab78d1825b4c15c159fecc62b8eef4fdf0c693a15aace3a605ad44e5e2df0c | 2021-06-17 | -| ubuntu:18.04 | sha256:139b3846cee2e63de9ced83cee7023a2d95763ee2573e5b0ab6dea9dfbd4db8f | 2021-06-17 | -| ubuntu:20.04 | sha256:aba80b77e27148d99c034a987e7da3a287ed455390352663418c0f2ed40417fe | 2021-06-17 | +| node:12-alpine | sha256:9a372efac4c436dfb6dbdea42f08d3ea60a0103a1df54a7da247e4bed1b327f7 | 2021-04-14 | +| node:14 | sha256:af9879e7473d347048c5d5919aa9775f27c33d92e4d58058ffdc08247f4bd902 | 2021-05-13 | +| node:14-alpine | sha256:f07ead757c93bc5e9e79978075217851d45a5d8e5c48eaf823e7f12d9bbc1d3c | 2021-05-13 | +| ubuntu:16.04 | sha256:9775877f420d453ef790e6832d77630a49b32a92b7bedf330adf4d8669f6600e | 2021-05-19 | +| ubuntu:18.04 | sha256:67b730ece0d34429b455c08124ffd444f021b81e06fa2d9cd0adaf0d0b875182 | 2021-05-19 | +| ubuntu:20.04 | sha256:adf73ca014822ad8237623d388cedf4d5346aa72c270c5acc01431cc93e18e2d | 2021-04-23 | ### Installed apt packages | Name | Version | @@ -301,7 +302,7 @@ | ftp | 0.17-34.1 | | gnupg2 | 2.2.19-3ubuntu2.1 | | haveged | 1.9.1-6ubuntu1 | -| imagemagick | 8:6.9.10.23+dfsg-2.1ubuntu11.4 | +| imagemagick | 8:6.9.10.23+dfsg-2.1ubuntu11.2 | | iproute2 | 5.5.0-1ubuntu1 | | iputils-ping | 3:20190709-3 | | jq | 1.6-1ubuntu0.20.04.1 | @@ -314,9 +315,9 @@ | libgsl-dev | 2.5+dfsg-6build1 | | libgtk-3-0 | 3.24.20-0ubuntu1 | | libmagic-dev | 1:5.38-4 | -| libmagickcore-dev | 8:6.9.10.23+dfsg-2.1ubuntu11.4 | -| libmagickwand-dev | 8:6.9.10.23+dfsg-2.1ubuntu11.4 | -| libsecret-1-dev | 0.20.4-0ubuntu1 | +| libmagickcore-dev | 8:6.9.10.23+dfsg-2.1ubuntu11.2 | +| libmagickwand-dev | 8:6.9.10.23+dfsg-2.1ubuntu11.2 | +| libsecret-1-dev | 0.20.3-0ubuntu1 | | libsqlite3-dev | 3.31.1-4ubuntu0.2 | | libunwind8 | 1.2.1-9build1 | | libxkbfile-dev | 1:1.1.0-1 | From 20804bc30f65add9e4a48b7ea7dc772a8a2dbf48 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Mon, 28 Jun 2021 10:58:28 +0300 Subject: [PATCH 0353/3485] Remove bicep from software docs and tests for ub16 (#3656) --- .../linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 | 4 ++-- images/linux/scripts/tests/Tools.Tests.ps1 | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index 3589044eee96..26b380a7612b 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -109,7 +109,6 @@ $toolsList = @( (Get-AzCopyVersion), (Get-BazelVersion), (Get-BazeliskVersion), - (Get-BicepVersion), (Get-CodeQLBundleVersion), (Get-CMakeVersion), (Get-DockerMobyClientVersion), @@ -145,8 +144,9 @@ $toolsList = @( if (-not (Test-IsUbuntu16)) { $toolsList += @( - (Get-PodManVersion), + (Get-BicepVersion), (Get-BuildahVersion), + (Get-PodManVersion), (Get-SkopeoVersion), (Get-YamllintVersion) ) diff --git a/images/linux/scripts/tests/Tools.Tests.ps1 b/images/linux/scripts/tests/Tools.Tests.ps1 index 9ae92516dc96..dd92811fbc7a 100644 --- a/images/linux/scripts/tests/Tools.Tests.ps1 +++ b/images/linux/scripts/tests/Tools.Tests.ps1 @@ -8,7 +8,7 @@ Describe "azcopy" { } } -Describe "Bicep" { +Describe "Bicep" -Skip:(Test-IsUbuntu16) { It "Bicep" { "bicep --version" | Should -ReturnZeroExitCode } From 851f0dfc316c21f935e7c161c6663fd2a6bf21df Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 28 Jun 2021 14:23:38 +0000 Subject: [PATCH 0354/3485] Updating readme file for macOS-11 version 20210626.1 (#3658) Co-authored-by: Image generation service account --- images/macos/macos-11-Readme.md | 116 ++++++++++++++------------------ 1 file changed, 51 insertions(+), 65 deletions(-) diff --git a/images/macos/macos-11-Readme.md b/images/macos/macos-11-Readme.md index 44fd23b32b84..5c17aa8beb4a 100644 --- a/images/macos/macos-11-Readme.md +++ b/images/macos/macos-11-Readme.md @@ -1,12 +1,13 @@ | Announcements | |-| +| [[all OS versions] Android SDK tools will be changed to Command line tools on July, 12](https://github.com/actions/virtual-environments/issues/3638) | | [[macOS] Xcode 12.2 and 12.3 will be removed from Big Sur on June, 28](https://github.com/actions/virtual-environments/issues/3555) | | [macOS 11.0 pools will be transited to private preview.](https://github.com/actions/virtual-environments/issues/2486) | *** # macOS 11.4 info - System Version: macOS 11.4 (20F71) - Kernel Version: Darwin 20.5.0 -- Image Version: 20210620.1 +- Image Version: 20210626.1 ## Installed Software ### Language and Runtime @@ -33,19 +34,19 @@ - Ruby 2.7.3p183 ### Package Management -- Bundler version 2.2.20 +- Bundler version 2.2.21 - Carthage 0.38.0 - CocoaPods 1.10.1 - Composer 2.1.3 -- Homebrew 3.1.12 +- Homebrew 3.2.0 - Miniconda 4.9.2 - NPM 6.14.13 - NuGet 5.6.0.6489 - Pip 20.3.4 (python 2.7) - Pip 21.1.1 (python 3.9) - Pipx 0.16.3 -- RubyGems 3.2.20 -- Vcpkg 2021 (build from master \<08214e1>) +- RubyGems 3.2.21 +- Vcpkg 2021 (build from master \) - Yarn 1.22.5 #### Environment variables @@ -78,7 +79,7 @@ - jq 1.6 - mongo v4.4.5 - mongod v4.4.5 -- Newman 5.2.3 +- Newman 5.2.4 - OpenSSL 1.1.1k 25 Mar 2021 `(/usr/local/opt/openssl -> /usr/local/Cellar/openssl@1.1/1.1.1k)` - Packer 1.7.3 - PostgreSQL 13.3 @@ -92,17 +93,17 @@ ### Tools - Aliyun CLI 3.0.80 - App Center CLI 2.9.0 -- AWS CLI 2.2.13 +- AWS CLI 2.2.14 - AWS SAM CLI 1.24.1 - AWS Session Manager CLI 1.2.205.0 - Azure CLI 2.25.0 - Cabal 3.4.0.0 -- Cmake 3.20.4 -- Fastlane 2.185.1 +- Cmake 3.20.5 +- Fastlane 2.186.0 - GHC 9.0.1 - GHCup v0.1.15.2 - Stack 2.7.1 -- SwiftFormat 0.48.5 +- SwiftFormat 0.48.6 - Swig 4.0.2 - Xcode Command Line Tools 12.5.0.0.1.1617976050 @@ -115,9 +116,9 @@ - SafariDriver 14.1.1 (16611.2.7.1.4) - Google Chrome 91.0.4472.114 - ChromeDriver 91.0.4472.101 -- Microsoft Edge 91.0.864.54 -- MSEdgeDriver 91.0.864.54 -- Mozilla Firefox 89.0.1 +- Microsoft Edge 91.0.864.59 +- MSEdgeDriver 91.0.864.59 +- Mozilla Firefox 89.0.2 - geckodriver 0.29.1 #### Environment variables @@ -168,7 +169,7 @@ #### Packages - Bindgen 0.58.1 - Cargo-audit 0.14.1 -- Cargo-outdated v0.9.15 +- Cargo-outdated v0.9.16 - Cbindgen 0.19.0 - Clippy 0.1.53 - Rustfmt 1.4.37-stable @@ -192,7 +193,7 @@ ### Xamarin #### Visual Studio for Mac -- 8.10.2.17 +- 8.10.3.15 #### Xamarin bundles | symlink | Xamarin.Mono | Xamarin.iOS | Xamarin.Mac | Xamarin.Android | @@ -212,14 +213,13 @@ - NUnit 3.6.1 ### Xcode -| Version | Build | Path | -| -------------- | -------- | ---------------------------- | -| 13.0 (beta) | 13A5154h | /Applications/Xcode_13.0.app | -| 12.5 (default) | 12E262 | /Applications/Xcode_12.5.app | -| 12.4 | 12D4e | /Applications/Xcode_12.4.app | -| 12.3 | 12C33 | /Applications/Xcode_12.3.app | -| 12.2 | 12B45b | /Applications/Xcode_12.2.app | -| 11.7 | 11E801a | /Applications/Xcode_11.7.app | +| Version | Build | Path | +| -------------- | -------- | ------------------------------ | +| 13.0 (beta) | 13A5155e | /Applications/Xcode_13.0.app | +| 12.5.1 | 12E507 | /Applications/Xcode_12.5.1.app | +| 12.5 (default) | 12E262 | /Applications/Xcode_12.5.app | +| 12.4 | 12D4e | /Applications/Xcode_12.4.app | +| 11.7 | 11E801a | /Applications/Xcode_11.7.app | #### Xcode Support Tools - xcpretty 0.3.0 @@ -231,67 +231,53 @@ | SDK | SDK Name | Xcode Version | | ----------------------- | -------------------- | ------------- | | macOS 10.15 | macosx10.15 | 11.7 | -| macOS 11.0 | macosx11.0 | 12.2 | -| macOS 11.1 | macosx11.1 | 12.3, 12.4 | -| macOS 11.3 | macosx11.3 | 12.5 | +| macOS 11.1 | macosx11.1 | 12.4 | +| macOS 11.3 | macosx11.3 | 12.5, 12.5.1 | | macOS 12.0 | macosx12.0 | 13.0 | | iOS 13.7 | iphoneos13.7 | 11.7 | -| iOS 14.2 | iphoneos14.2 | 12.2 | -| iOS 14.3 | iphoneos14.3 | 12.3 | | iOS 14.4 | iphoneos14.4 | 12.4 | -| iOS 14.5 | iphoneos14.5 | 12.5 | +| iOS 14.5 | iphoneos14.5 | 12.5, 12.5.1 | | iOS 15.0 | iphoneos15.0 | 13.0 | | Simulator - iOS 13.7 | iphonesimulator13.7 | 11.7 | -| Simulator - iOS 14.2 | iphonesimulator14.2 | 12.2 | -| Simulator - iOS 14.3 | iphonesimulator14.3 | 12.3 | | Simulator - iOS 14.4 | iphonesimulator14.4 | 12.4 | -| Simulator - iOS 14.5 | iphonesimulator14.5 | 12.5 | +| Simulator - iOS 14.5 | iphonesimulator14.5 | 12.5, 12.5.1 | | Simulator - iOS 15.0 | iphonesimulator15.0 | 13.0 | | tvOS 13.4 | appletvos13.4 | 11.7 | -| tvOS 14.2 | appletvos14.2 | 12.2 | -| tvOS 14.3 | appletvos14.3 | 12.3, 12.4 | -| tvOS 14.5 | appletvos14.5 | 12.5 | +| tvOS 14.3 | appletvos14.3 | 12.4 | +| tvOS 14.5 | appletvos14.5 | 12.5, 12.5.1 | | tvOS 15.0 | appletvos15.0 | 13.0 | | Simulator - tvOS 13.4 | appletvsimulator13.4 | 11.7 | -| Simulator - tvOS 14.2 | appletvsimulator14.2 | 12.2 | -| Simulator - tvOS 14.3 | appletvsimulator14.3 | 12.3, 12.4 | -| Simulator - tvOS 14.5 | appletvsimulator14.5 | 12.5 | +| Simulator - tvOS 14.3 | appletvsimulator14.3 | 12.4 | +| Simulator - tvOS 14.5 | appletvsimulator14.5 | 12.5, 12.5.1 | | Simulator - tvOS 15.0 | appletvsimulator15.0 | 13.0 | | watchOS 6.2 | watchos6.2 | 11.7 | -| watchOS 7.1 | watchos7.1 | 12.2 | -| watchOS 7.2 | watchos7.2 | 12.3, 12.4 | -| watchOS 7.4 | watchos7.4 | 12.5 | +| watchOS 7.2 | watchos7.2 | 12.4 | +| watchOS 7.4 | watchos7.4 | 12.5, 12.5.1 | | watchOS 8.0 | watchos8.0 | 13.0 | | Simulator - watchOS 6.2 | watchsimulator6.2 | 11.7 | -| Simulator - watchOS 7.1 | watchsimulator7.1 | 12.2 | -| Simulator - watchOS 7.2 | watchsimulator7.2 | 12.3, 12.4 | -| Simulator - watchOS 7.4 | watchsimulator7.4 | 12.5 | +| Simulator - watchOS 7.2 | watchsimulator7.2 | 12.4 | +| Simulator - watchOS 7.4 | watchsimulator7.4 | 12.5, 12.5.1 | | Simulator - watchOS 8.0 | watchsimulator8.0 | 13.0 | | DriverKit 19.0 | driverkit.macosx19.0 | 11.7 | -| DriverKit 20.0 | driverkit.macosx20.0 | 12.2 | -| DriverKit 20.2 | driverkit.macosx20.2 | 12.3, 12.4 | -| DriverKit 20.4 | driverkit.macosx20.4 | 12.5 | +| DriverKit 20.2 | driverkit.macosx20.2 | 12.4 | +| DriverKit 20.4 | driverkit.macosx20.4 | 12.5, 12.5.1 | | DriverKit 21.0 | driverkit21.0 | 13.0 | #### Installed Simulators -| OS | Xcode Version | Simulators | -| ----------- | ------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| 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.2 | 12.2 | iPod touch (7th generation)
iPhone 11
iPhone 11 Pro
iPhone 11 Pro Max
iPhone 12
iPhone 12 mini
iPhone 12 Pro
iPhone 12 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.3 | 12.3 | iPod touch (7th generation)
iPhone 11
iPhone 11 Pro
iPhone 11 Pro Max
iPhone 12
iPhone 12 mini
iPhone 12 Pro
iPhone 12 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.4 | 12.4 | iPod touch (7th generation)
iPhone 11
iPhone 11 Pro
iPhone 11 Pro Max
iPhone 12
iPhone 12 mini
iPhone 12 Pro
iPhone 12 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.5 | 12.5 | iPod touch (7th generation)
iPhone 11
iPhone 11 Pro
iPhone 11 Pro Max
iPhone 12
iPhone 12 mini
iPhone 12 Pro
iPhone 12 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 (11-inch) (3rd generation)
iPad Pro (12.9-inch) (4th generation)
iPad Pro (12.9-inch) (5th generation)
iPad Pro (9.7-inch) | -| iOS 15.0 | 13.0 | iPod touch (7th generation)
iPhone 11
iPhone 11 Pro
iPhone 11 Pro Max
iPhone 12
iPhone 12 mini
iPhone 12 Pro
iPhone 12 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 (11-inch) (3rd generation)
iPad Pro (12.9-inch) (4th generation)
iPad Pro (12.9-inch) (5th generation)
iPad Pro (9.7-inch) | -| tvOS 13.4 | 11.7 | 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) | -| tvOS 14.3 | 12.3
12.4 | Apple TV
Apple TV 4K
Apple TV 4K (at 1080p) | -| tvOS 14.5 | 12.5 | Apple TV
Apple TV 4K
Apple TV 4K (2nd generation)
Apple TV 4K (at 1080p)
Apple TV 4K (at 1080p) (2nd generation) | -| tvOS 15.0 | 13.0 | Apple TV
Apple TV 4K
Apple TV 4K (2nd generation)
Apple TV 4K (at 1080p)
Apple TV 4K (at 1080p) (2nd generation) | -| watchOS 6.2 | 11.7 | Apple Watch Series 4 - 40mm
Apple Watch Series 4 - 44mm
Apple Watch Series 5 - 40mm
Apple Watch Series 5 - 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 | -| watchOS 7.2 | 12.3
12.4 | 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.4 | 12.5 | 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 8.0 | 13.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 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.4 | 12.4 | iPod touch (7th generation)
iPhone 11
iPhone 11 Pro
iPhone 11 Pro Max
iPhone 12
iPhone 12 mini
iPhone 12 Pro
iPhone 12 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.5 | 12.5
12.5.1 | iPod touch (7th generation)
iPhone 11
iPhone 11 Pro
iPhone 11 Pro Max
iPhone 12
iPhone 12 mini
iPhone 12 Pro
iPhone 12 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 (11-inch) (3rd generation)
iPad Pro (12.9-inch) (4th generation)
iPad Pro (12.9-inch) (5th generation)
iPad Pro (9.7-inch) | +| iOS 15.0 | 13.0 | iPod touch (7th generation)
iPhone 11
iPhone 11 Pro
iPhone 11 Pro Max
iPhone 12
iPhone 12 mini
iPhone 12 Pro
iPhone 12 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 (11-inch) (3rd generation)
iPad Pro (12.9-inch) (4th generation)
iPad Pro (12.9-inch) (5th generation)
iPad Pro (9.7-inch) | +| tvOS 13.4 | 11.7 | Apple TV
Apple TV 4K
Apple TV 4K (at 1080p) | +| tvOS 14.3 | 12.4 | Apple TV
Apple TV 4K
Apple TV 4K (at 1080p) | +| tvOS 14.5 | 12.5
12.5.1 | Apple TV
Apple TV 4K
Apple TV 4K (2nd generation)
Apple TV 4K (at 1080p)
Apple TV 4K (at 1080p) (2nd generation) | +| tvOS 15.0 | 13.0 | Apple TV
Apple TV 4K
Apple TV 4K (2nd generation)
Apple TV 4K (at 1080p)
Apple TV 4K (at 1080p) (2nd generation) | +| watchOS 6.2 | 11.7 | Apple Watch Series 4 - 40mm
Apple Watch Series 4 - 44mm
Apple Watch Series 5 - 40mm
Apple Watch Series 5 - 44mm | +| watchOS 7.2 | 12.4 | 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.4 | 12.5
12.5.1 | 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 8.0 | 13.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 | ### Android | Package Name | Version | From 19d5b9fcef9621bb94322f6b15e29679200cd5b8 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 28 Jun 2021 15:26:36 +0000 Subject: [PATCH 0355/3485] Updating readme file for macOS-10.14 version 20210626.1 (#3657) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/macos/macos-10.14-Readme.md | 116 +++++++++++++++-------------- 1 file changed, 60 insertions(+), 56 deletions(-) diff --git a/images/macos/macos-10.14-Readme.md b/images/macos/macos-10.14-Readme.md index 2ff5b343435b..f1d7bd906163 100644 --- a/images/macos/macos-10.14-Readme.md +++ b/images/macos/macos-10.14-Readme.md @@ -1,12 +1,13 @@ | Announcements | |-| -| [[macOS] GCC version 8 will be removed from images on May, 31](https://github.com/actions/virtual-environments/issues/3378) | +| [[all OS versions] Android SDK tools will be changed to Command line tools on July, 5](https://github.com/actions/virtual-environments/issues/3638) | +| [[macOS] Xcode 12.2 and 12.3 will be removed from Big Sur on June, 28](https://github.com/actions/virtual-environments/issues/3555) | | [macOS 11.0 pools will be transited to private preview.](https://github.com/actions/virtual-environments/issues/2486) | *** # macOS 10.14 info - System Version: macOS 10.14.6 (18G9216) - Kernel Version: Darwin 18.7.0 -- Image Version: 20210531.1 +- Image Version: 20210626.1 ## Installed Software ### Language and Runtime @@ -14,38 +15,38 @@ - Bash 3.2.57(1)-release - Clang/LLVM 11.0.0 is default - Clang/LLVM 12.0.0 is available on `'$(brew --prefix llvm)/bin/clang'` -- gcc-9 (Homebrew GCC 9.3.0_2) 9.3.0 - available by `gcc-9` alias +- gcc-9 (Homebrew GCC 9.4.0) 9.4.0 - available by `gcc-9` alias - gcc-10 (Homebrew GCC 10.3.0) 10.3.0 - available by `gcc-10` alias - gcc-11 (Homebrew GCC 11.1.0_1) 11.1.0 - available by `gcc-11` alias -- GNU Fortran (Homebrew GCC 9.3.0_2) 9.3.0 - available by `gfortran-9` alias +- GNU Fortran (Homebrew GCC 9.4.0) 9.4.0 - available by `gfortran-9` alias - GNU Fortran (Homebrew GCC 10.3.0) 10.3.0 - available by `gfortran-10` alias - GNU Fortran (Homebrew GCC 11.1.0_1) 11.1.0 - available by `gfortran-11` alias -- Go 1.15.12 +- Go 1.15.13 - julia 1.6.1 - MSBuild 15.7.224.30163 (from /Library/Frameworks/Mono.framework/Versions/5.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) - Node.js v8.17.0 - NVM 0.38.0 -- NVM - Cached node versions: v10.24.1 v12.22.1 v14.17.0 +- NVM - Cached node versions: v10.24.1 v12.22.1 v14.17.1 - Perl 5.34.0 -- PHP 8.0.6 +- PHP 8.0.7 - Python 2.7.18 - Python 3.9.5 - R 4.1.0 - Ruby 2.7.3p183 ### Package Management -- Bundler version 2.2.19 +- Bundler version 2.2.21 - Carthage 0.38.0 - CocoaPods 1.10.1 -- Composer 2.0.14 -- Homebrew 3.1.9 +- Composer 2.1.3 +- Homebrew 3.2.0 - Miniconda 4.9.2 - NPM 3.10.10 - NuGet 4.7.0.5148 - Pip 20.3.4 (python 2.7) - Pip 21.1.1 (python 3.9) - Pipx 0.16.3 -- RubyGems 3.2.19 +- RubyGems 3.2.21 - Yarn 1.22.5 #### Environment variables @@ -57,52 +58,55 @@ ### Project Management - Apache Ant(TM) 1.10.10 - Apache Maven 3.8.1 -- Gradle 7.0.2 +- Gradle 7.1 ### Utilities - 7-Zip 17.04 - aria2 1.35.0 -- azcopy 10.10.0 +- azcopy 10.11.0 - bazel 3.7.1 - bazelisk 1.9.0 - bsdtar 2.8.3 - available by 'tar' alias - Curl 7.77.0 - Git LFS: 2.13.3 -- Git: 2.31.1 -- GitHub CLI: 1.10.3 -- GNU parallel 20210422 +- Git: 2.32.0 +- GitHub CLI: 1.11.0 +- GNU parallel 20210622 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.1 - gpg (GnuPG) 2.3.1 -- helm v3.6.0+g7f2df64 +- helm v3.6.1+g61d8e8c - Hub CLI: 2.14.2 - jq 1.6 - mongo v4.4.5 - mongod v4.4.5 - OpenSSL 1.1.1k 25 Mar 2021 `(/usr/local/opt/openssl -> /usr/local/Cellar/openssl@1.1/1.1.1k)` -- Packer 1.7.2 +- Packer 1.7.3 - PostgreSQL 13.3 - psql (PostgreSQL) 13.3 +- Sox 14.4.2 - Subversion (SVN) 1.14.1 +- Switchaudio-osx 1.1.0 - Vagrant 2.2.16 - virtualbox 6.1.22r144080 - zstd 1.5.0 ### Tools -- Aliyun CLI 3.0.77 +- Aliyun CLI 3.0.80 - App Center CLI 1.2.2 -- AWS CLI 2.2.7 -- AWS SAM CLI 1.23.0 -- AWS Session Manager CLI 1.2.54.0 -- Azure CLI 2.24.0 +- AWS CLI 2.2.14 +- AWS SAM CLI 1.24.1 +- AWS Session Manager CLI 1.2.205.0 +- Azure CLI 2.25.0 - Cabal 3.4.0.0 -- Cmake 3.20.3 -- Fastlane 2.184.1 +- Cmake 3.20.5 +- Fastlane 2.186.0 - GHC 9.0.1 -- GHCup v0.1.14.1 +- GHCup v0.1.15.2 - Stack 2.7.1 -- SwiftFormat 0.48.4 +- SwiftFormat 0.48.6 +- Swig 4.0.2 - Xcode Command Line Tools 10.3.0.0.1.1562985497 ### Linters @@ -112,28 +116,28 @@ ### Browsers - Safari 14.1.1 (14611.2.7.1.6) - SafariDriver 14.1.1 (14611.2.7.1.6) -- Google Chrome 91.0.4472.77 -- ChromeDriver 90.0.4430.24 -- Microsoft Edge 91.0.864.37 -- MSEdgeDriver 91.0.864.37 -- Mozilla Firefox 88.0.1 +- Google Chrome 91.0.4472.114 +- ChromeDriver 91.0.4472.101 +- Microsoft Edge 91.0.864.59 +- MSEdgeDriver 91.0.864.59 +- Mozilla Firefox 89.0.2 - geckodriver 0.29.1 #### Environment variables -| Name | Value | -| --------------- | --------------------------------------------- | -| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/90.0.4430.24 | -| EDGEWEBDRIVER | /usr/local/share/edge_driver | -| GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | +| Name | Value | +| --------------- | ---------------------------------------------- | +| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/91.0.4472.101 | +| EDGEWEBDRIVER | /usr/local/share/edge_driver | +| GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | ### Java -| Version | Vendor | Environment Variable | -| ----------- | ------------- | -------------------- | -| 8.0.292+10 | Adopt OpenJDK | JAVA_HOME_8_X64 | -| 11.0.11+9 | Adopt OpenJDK | JAVA_HOME_11_X64 | -| 12.0.2+10.3 | Adopt OpenJDK | JAVA_HOME_12_X64 | -| 13.0.2+8.1 | Adopt OpenJDK | JAVA_HOME_13_X64 | -| 14.0.2+12 | Adopt OpenJDK | JAVA_HOME_14_X64 | +| Version | Vendor | Environment Variable | +| -------------------- | ------------- | -------------------- | +| 8.0.292+10 (default) | Adopt OpenJDK | JAVA_HOME_8_X64 | +| 11.0.11+9 | Adopt OpenJDK | JAVA_HOME_11_X64 | +| 12.0.2+10.3 | Adopt OpenJDK | JAVA_HOME_12_X64 | +| 13.0.2+8.1 | Adopt OpenJDK | JAVA_HOME_13_X64 | +| 14.0.2+12 | Adopt OpenJDK | JAVA_HOME_14_X64 | ### Cached Tools #### Ruby @@ -158,27 +162,27 @@ #### Node.js - 10.24.1 - 12.22.1 -- 14.17.0 +- 14.17.1 #### Go - 1.13.15 - 1.14.15 -- 1.15.12 -- 1.16.4 +- 1.15.13 +- 1.16.5 ### Rust Tools -- Cargo 1.52.0 -- Rust 1.52.1 -- Rustdoc 1.52.1 -- Rustup 1.24.2 +- Cargo 1.53.0 +- Rust 1.53.0 +- Rustdoc 1.53.0 +- Rustup 1.24.3 #### Packages - Bindgen 0.58.1 - Cargo-audit 0.14.1 -- Cargo-outdated v0.9.15 +- Cargo-outdated v0.9.16 - Cbindgen 0.19.0 -- Clippy 0.1.52 -- Rustfmt 1.4.36-stable +- Clippy 0.1.53 +- Rustfmt 1.4.37-stable ### PowerShell Tools - PowerShell 7.1.3 @@ -186,7 +190,7 @@ #### PowerShell Modules | Module | Version | | ---------------- | ------- | -| Az | 5.7.0 | +| Az | 5.9.0 | | MarkdownPS | 1.9 | | Pester | 5.2.2 | | PSScriptAnalyzer | 1.19.1 | @@ -343,7 +347,7 @@ | Android Command Line Tools | 4.0 | | Android Emulator | 30.6.5 | | Android SDK Build-tools | 30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3
26.0.0 26.0.1 26.0.2 26.0.3
25.0.0 25.0.1 25.0.2 25.0.3
24.0.0 24.0.1 24.0.2 24.0.3
23.0.1 23.0.2 23.0.3 23.0.0
22.0.1 22.0.0
21.1.2 21.0.0 21.0.1 21.0.2 21.1.0 21.1.1
20.0.0
19.1.0 19.0.0 19.0.1 19.0.2 19.0.3
18.0.1 18.1.0 18.1.1
17.0.0 | -| Android SDK Platforms | android-S (rev 4)
android-30 (rev 3)
android-29 (rev 5)
android-28 (rev 6)
android-27 (rev 3)
android-26 (rev 2)
android-25 (rev 3)
android-24 (rev 2)
android-23 (rev 3)
android-22 (rev 2)
android-21 (rev 2)
android-20 (rev 2)
android-19 (rev 4)
android-18 (rev 3)
android-17 (rev 3)
android-16 (rev 5)
android-15 (rev 5) | +| Android SDK Platforms | android-S (rev 5)
android-30 (rev 3)
android-29 (rev 5)
android-28 (rev 6)
android-27 (rev 3)
android-26 (rev 2)
android-25 (rev 3)
android-24 (rev 2)
android-23 (rev 3)
android-22 (rev 2)
android-21 (rev 2)
android-20 (rev 2)
android-19 (rev 4)
android-18 (rev 3)
android-17 (rev 3)
android-16 (rev 5)
android-15 (rev 5) | | Android SDK Platform-Tools | 31.0.2 | | Android SDK Tools | 26.1.1 | | Android Support Repository | 47.0.0 | From cd920950ecab4754858eb395a1a763ae20deb342 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 28 Jun 2021 22:01:56 +0000 Subject: [PATCH 0356/3485] Updating readme file for win19 version 20210620.1 (#3625) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/win/Windows2019-Readme.md | 34 ++++++++++++++++---------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index 684d317e5272..a47550f48460 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -1,6 +1,6 @@ # Microsoft Windows Server 2019 Datacenter - OS Version: 10.0.17763 Build 1999 -- Image Version: 20210616.0 +- Image Version: 20210620.1 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -22,11 +22,11 @@ - Helm 3.6.0 - Miniconda 4.9.2 (pre-installed on the image but not added to PATH) - NPM 6.14.13 -- NuGet 5.9.1.11 +- NuGet 5.10.0.7240 - pip 21.1.2 (python 3.7) - Pipx 0.16.3 - RubyGems 2.7.6.3 -- Vcpkg (build from master \<4dc864e>) +- Vcpkg (build from master \<08214e1>) - Yarn 1.22.10 #### Environment variables @@ -37,13 +37,13 @@ ### Project Management - Ant 1.10.10 -- Gradle 7.0 +- Gradle 7.1 - Maven 3.8.1 - sbt 1.5.3 ### Tools - 7zip 19.00 -- azcopy 10.10.0 +- azcopy 10.11.0 - Bazel 4.1.0 - Bazelisk 1.9.0 - Cabal 3.4.0.0 @@ -65,7 +65,7 @@ - NSIS v3.06.1 - OpenSSL 1.1.1 - Packer 1.7.2 -- Pulumi v3.4.0 +- Pulumi v3.5.1 - R 4.1.0 - Stack 2.7.1 - Subversion (SVN) 1.14.1 @@ -76,8 +76,8 @@ - zstd 1.5.0 ### CLI Tools -- Alibaba Cloud CLI 3.0.79 -- AWS CLI 2.2.12 +- Alibaba Cloud CLI 3.0.80 +- AWS CLI 2.2.13 - AWS SAM CLI 1.24.1 - AWS Session Manager CLI 1.2.205.0 - Azure CLI 2.25.0 @@ -87,9 +87,9 @@ - Hub CLI 2.14.2 ### Rust Tools -- Cargo 1.52.0 -- Rust 1.52.1 -- Rustdoc 1.52.1 +- Cargo 1.53.0 +- Rust 1.53.0 +- Rustdoc 1.53.0 - Rustup 1.24.3 #### Packages @@ -97,14 +97,14 @@ - cargo-audit 0.14.1 - cargo-outdated v0.9.15 - cbindgen 0.19.0 -- Clippy 0.1.52 -- Rustfmt 1.4.36 +- Clippy 0.1.53 +- Rustfmt 1.4.37 ### Browsers and webdrivers -- Google Chrome 91.0.4472.106 +- Google Chrome 91.0.4472.114 - Chrome Driver 91.0.4472.101 -- Microsoft Edge 91.0.864.48 -- Microsoft Edge Driver 91.0.864.48 +- Microsoft Edge 91.0.864.54 +- Microsoft Edge Driver 91.0.864.54 - Mozilla Firefox 89.0.1 - Gecko Driver 0.29.1 - IE Driver 3.150.1.0 @@ -210,7 +210,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Database tools -- Azure CosmosDb Emulator 2.14.0.0 +- Azure CosmosDb Emulator 2.14.1.0 - DacFx 15.0.4897.1 - MySQL 5.7.21.0 - SQLPS 1.0 From 24387bf8e666948eb1ea3e637af0696a6c473ea0 Mon Sep 17 00:00:00 2001 From: Alena Sviridenko Date: Tue, 29 Jun 2021 11:51:23 +0300 Subject: [PATCH 0357/3485] Migrate issue templates to .yml (#3659) * Added issue yml templates * Fixed yml syntax * Removed md templates * updated tool request template * fixed windows 2016 naming and bug report dropdown * Styling and wording fixes * Added validation requirements * removed empty issue check * Removed issue triager --- .github/ISSUE_TEMPLATE/announcement.md | 34 ----------- .github/ISSUE_TEMPLATE/announcement.yml | 48 +++++++++++++++ .github/ISSUE_TEMPLATE/bug-report.md | 43 -------------- .github/ISSUE_TEMPLATE/bug-report.yml | 55 +++++++++++++++++ .github/ISSUE_TEMPLATE/tool-request.md | 43 -------------- .github/ISSUE_TEMPLATE/tool-request.yml | 75 ++++++++++++++++++++++++ .github/workflows/issue-triager.yml | 78 ------------------------- 7 files changed, 178 insertions(+), 198 deletions(-) delete mode 100644 .github/ISSUE_TEMPLATE/announcement.md create mode 100644 .github/ISSUE_TEMPLATE/announcement.yml delete mode 100644 .github/ISSUE_TEMPLATE/bug-report.md create mode 100644 .github/ISSUE_TEMPLATE/bug-report.yml delete mode 100644 .github/ISSUE_TEMPLATE/tool-request.md create mode 100644 .github/ISSUE_TEMPLATE/tool-request.yml delete mode 100644 .github/workflows/issue-triager.yml diff --git a/.github/ISSUE_TEMPLATE/announcement.md b/.github/ISSUE_TEMPLATE/announcement.md deleted file mode 100644 index 9c4737158806..000000000000 --- a/.github/ISSUE_TEMPLATE/announcement.md +++ /dev/null @@ -1,34 +0,0 @@ ---- -name: Announcement -about: Submit an announcement -title: '' -labels: Announcement -assignees: '' - ---- - -**Breaking changes** - - -**Target date** - - -**The motivation for the changes** - - -**Possible impact** - - -**Virtual environments affected** -- [ ] Ubuntu 16.04 -- [ ] Ubuntu 18.04 -- [ ] Ubuntu 20.04 -- [ ] macOS 10.13 -- [ ] macOS 10.14 -- [ ] macOS 10.15 -- [ ] macOS 11 -- [ ] Windows Server 2016 R2 -- [ ] Windows Server 2019 - -**Mitigation ways** - diff --git a/.github/ISSUE_TEMPLATE/announcement.yml b/.github/ISSUE_TEMPLATE/announcement.yml new file mode 100644 index 000000000000..ccc3d202f5e9 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/announcement.yml @@ -0,0 +1,48 @@ +name: Announcement +description: Submit an announcement +labels: [Announcement] +body: + - type: textarea + attributes: + label: Breaking changes + placeholder: Short description of the upcoming change + validations: + required: true + - type: textarea + attributes: + label: Target date + placeholder: Date of changes propagation start + validations: + required: true + - type: textarea + attributes: + label: The motivation for the changes + placeholder: Description of main reasons for this change + validations: + required: true + - type: textarea + attributes: + label: Possible impact + placeholder: Description of who might be impacted by this change + validations: + required: true + - type: checkboxes + attributes: + label: Virtual environments affected + options: + - label: Ubuntu 16.04 + - label: Ubuntu 18.04 + - label: Ubuntu 20.04 + - label: macOS 10.15 + - label: macOS 11 + - label: Windows Server 2016 + - label: Windows Server 2019 + validations: + required: true + - type: textarea + attributes: + label: Mitigation ways + description: Steps or options for impact mitigation + validations: + required: true + diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md deleted file mode 100644 index 8bcb55bf8d3a..000000000000 --- a/.github/ISSUE_TEMPLATE/bug-report.md +++ /dev/null @@ -1,43 +0,0 @@ ---- -name: Bug report -about: Submit a bug report -title: '' -labels: needs triage -assignees: '' - ---- - -**Description** -A clear and concise description of what the bug is, and why you consider it to be a bug. - -**Area for Triage**: - - -**Question, Bug, or Feature?**: - - -**Virtual environments affected** -- [ ] Ubuntu 16.04 -- [ ] Ubuntu 18.04 -- [ ] Ubuntu 20.04 -- [ ] macOS 10.15 -- [ ] macOS 11 -- [ ] Windows Server 2016 R2 -- [ ] Windows Server 2019 - -**Image version** - -Image version where you are experiencing the issue. - -**Expected behavior** -A description of what you expected to happen. - -**Actual behavior** -A description of what is actually happening. - -**Repro steps** -A description with steps to reproduce the issue. If your have a public example or repo to share, -please provide the link. - -1. Step 1 -2. Step 2 diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml new file mode 100644 index 000000000000..2631fd08e6fb --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug-report.yml @@ -0,0 +1,55 @@ +name: Bug Report +description: Submit a bug report +labels: [needs triage] +body: + - type: textarea + attributes: + label: Description + description: A clear and concise description of what the bug is, and why you consider it to be a bug. + validations: + required: true + - type: checkboxes + attributes: + label: Virtual environments affected + options: + - label: Ubuntu 16.04 + - label: Ubuntu 18.04 + - label: Ubuntu 20.04 + - label: macOS 10.15 + - label: macOS 11 + - label: Windows Server 2016 + - label: Windows Server 2019 + validations: + required: true + - type: textarea + attributes: + label: Image version and build link + description: | + Image version where you are experiencing the issue. Where to find image version in build logs: + 1. For GitHub Actions, under "Set up job" -> "Virtual Environment" -> "Version". + 2. For Azure DevOps, under "Initialize job" -> "Virtual Environment" -> "Version". + + If you have a public example, please, provide a link to the failed build. + validations: + required: true + - type: input + attributes: + label: Is it regression? + description: If yes, please, provide the latest image version where the issue didn't persist, and a link to the latest successful build. + - type: textarea + attributes: + label: Expected behavior + description: A description of what you expected to happen. + - type: textarea + attributes: + label: Actual behavior + description: A description of what is actually happening. + - type: textarea + attributes: + label: Repro steps + placeholder: | + A description with steps to reproduce the issue. + 1. Step 1 + 2. Step 2 + validations: + required: true \ No newline at end of file diff --git a/.github/ISSUE_TEMPLATE/tool-request.md b/.github/ISSUE_TEMPLATE/tool-request.md deleted file mode 100644 index 3474b99873d4..000000000000 --- a/.github/ISSUE_TEMPLATE/tool-request.md +++ /dev/null @@ -1,43 +0,0 @@ ---- -name: Tool request -about: Request a new tool or update to a tool -title: Update/Add [tool name] -labels: feature request, needs triage -assignees: '' - ---- - -**Tool information** -- Tool name: -- Tool license: -- Add or update? -- Desired version: -- Approximate size: -- If this is an add request: - - Brief description of tool: - - URL for tool's homepage: - - Provide a basic test case to validate the tool's functionality: - -**Area for Triage**: - - -**Question, Bug, or Feature?**: - - -**Virtual environments affected** -- [ ] Ubuntu 16.04 -- [ ] Ubuntu 18.04 -- [ ] Ubuntu 20.04 -- [ ] macOS 10.15 -- [ ] macOS 11 -- [ ] Windows Server 2016 R2 -- [ ] Windows Server 2019 - -**Can this tool be installed during the build?** - - -**Tool installation time in runtime** - - -**Are you willing to submit a PR?** - diff --git a/.github/ISSUE_TEMPLATE/tool-request.yml b/.github/ISSUE_TEMPLATE/tool-request.yml new file mode 100644 index 000000000000..5973500fd5a3 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/tool-request.yml @@ -0,0 +1,75 @@ +name: Tool request +description: Request a new tool or update to a tool +title: Update/Add [tool name] +labels: [feature request, needs triage] +body: + - type: markdown + attributes: + value: "## Tool information" + - type: input + attributes: + label: Tool name + validations: + required: true + - type: input + attributes: + label: Tool license + description: Type of licensing for desired tool. + validations: + required: true + - type: checkboxes + attributes: + label: Add or update? + options: + - label: Add + - label: Update + - type: input + attributes: + label: Desired version + description: Let us know if you're requesting a specific version, dev/RC, whatever is latest, etc. + validations: + required: true + - type: input + attributes: + label: Approximate size + description: Leave blank if unknown. + - type: markdown + attributes: + value: "## If this is an add request" + - type: textarea + attributes: + label: Brief description of tool + - type: input + attributes: + label: URL for tool's homepage + - type: textarea + attributes: + label: Provide a basic test case to validate the tool's functionality. + description: This will be automatically formatted into code. + render: bash + - type: checkboxes + attributes: + label: Virtual environments affected + options: + - label: Ubuntu 16.04 + - label: Ubuntu 18.04 + - label: Ubuntu 20.04 + - label: macOS 10.15 + - label: macOS 11 + - label: Windows Server 2016 + - label: Windows Server 2019 + validations: + required: true + - type: textarea + attributes: + label: Can this tool be installed during the build? + description: If so, please provide a description with required steps. This will be automatically formatted into code. + render: bash + - type: input + attributes: + label: Tool installation time in runtime + description: How long does it take to install the tool? + - type: input + attributes: + label: Are you willing to submit a PR? + description: We accept contributions! \ No newline at end of file diff --git a/.github/workflows/issue-triager.yml b/.github/workflows/issue-triager.yml deleted file mode 100644 index 5fa072bd2097..000000000000 --- a/.github/workflows/issue-triager.yml +++ /dev/null @@ -1,78 +0,0 @@ -# Adapted from: https://github.com/microsoft/azure-pipelines-tasks/blob/master/.github/workflows/blank.yml -# This action labels and assigns newly opened issues - -name: Issue triager -on: - issues: - types: [opened] - -jobs: - label: - - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v1 - - - uses: damccorm/tag-ur-it@master - with: - repo-token: "${{ secrets.GITHUB_TOKEN }}" - configuration-path: "./triage-rules.yml" - - - uses: actions/github-script@v4 - id: check-if-spammy - name: Check if new issue is spammy - with: - github-token: ${{secrets.GITHUB_TOKEN}} - result-encoding: string - script: | - const issue = context.payload.issue; - const minTitleLength = 2; - const titleLength = issue.title.trim().split(' ').length; - const isEmptyToolRequest = !!(issue.title.includes('[tool name]') && issue.body.includes('Tool name: ')); - - if (isEmptyToolRequest || titleLength < minTitleLength) { - await github.issues.createComment({ - owner: context.repo.owner, - repo: context.repo.repo, - issue_number: issue.number, - body: "This issue appears to have been opened accidentally. I'm going to close it now, but feel free to open a new issue or ask any questions in discussions!" - }); - - await github.issues.update({ - owner: context.repo.owner, - repo: context.repo.repo, - labels: ['Invalid'], - issue_number: issue.number, - state: 'closed' - }); - - return true; - } - - return false; - - - if: ${{ steps.check-if-spammy.outputs.result == 'false' }} - uses: actions/github-script@v4 - name: Assign labels to issue - with: - github-token: ${{secrets.GITHUB_TOKEN}} - script: | - const issueLabels = await github.issues.listLabelsOnIssue({ - issue_number: context.issue.number, - owner: context.repo.owner, - 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 de7775d901a5a2fd58017c7a0ae4b80764e69961 Mon Sep 17 00:00:00 2001 From: Leonid Lapshin Date: Tue, 29 Jun 2021 11:59:03 +0300 Subject: [PATCH 0358/3485] [windows] Improve MSYS2 installation (#3652) --- .../win/scripts/Installers/Install-Msys2.ps1 | 5 ++-- images/win/scripts/Tests/MSYS2.Tests.ps1 | 29 ++++++------------- images/win/toolsets/toolset-2016.json | 2 ++ images/win/toolsets/toolset-2019.json | 2 ++ 4 files changed, 15 insertions(+), 23 deletions(-) diff --git a/images/win/scripts/Installers/Install-Msys2.ps1 b/images/win/scripts/Installers/Install-Msys2.ps1 index 894653acc1a6..1a7f2a9a3418 100644 --- a/images/win/scripts/Installers/Install-Msys2.ps1 +++ b/images/win/scripts/Installers/Install-Msys2.ps1 @@ -79,13 +79,12 @@ foreach ($arch in $archs) Write-Host "`n$dash Clean packages" pacman.exe -Scc --noconfirm -Write-Host "`n$dash Installed msys2 packages" -pacman.exe -Q | grep -v ^mingw-w64- +$pkgs = pacman.exe -Q foreach ($arch in $archs) { Write-Host "`n$dash Installed $arch packages" - pacman.exe -Q | grep ^${arch}- + $pkgs | grep ^${arch}- } $env:PATH = $origPath diff --git a/images/win/scripts/Tests/MSYS2.Tests.ps1 b/images/win/scripts/Tests/MSYS2.Tests.ps1 index 1290dd1606c1..9316730b17c9 100644 --- a/images/win/scripts/Tests/MSYS2.Tests.ps1 +++ b/images/win/scripts/Tests/MSYS2.Tests.ps1 @@ -1,6 +1,3 @@ -$toolsetContent = (Get-ToolsetContent).MsysPackages -$archs = $toolsetContent.mingw.arch - BeforeAll { $msys2Dir = "C:\msys64\usr\bin" $originalPath = $env:PATH @@ -34,31 +31,23 @@ Describe "MSYS2 packages" { } } -foreach ($arch in $archs) { - Describe "$arch arch packages" { - $archPackages = $toolsetContent.mingw | Where-Object { $_.arch -eq $arch } - $tools = $archPackages.runtime_packages.name - - if ($arch -eq "mingw-w64-i686") - { - $ExecDir = "C:\msys64\mingw32\bin" - } - else - { - $ExecDir = "C:\msys64\mingw64\bin" - } +$mingwTypes = (Get-ToolsetContent).MsysPackages.mingw +foreach ($mingwType in $mingwTypes) { + Describe "$($mingwType.arch) packages" { + $tools = $mingwType.runtime_packages + $execDir = Join-Path "C:\msys64" $mingwType.exec_dir | Join-Path -ChildPath "bin" foreach ($tool in $tools) { - Context "$tool package"{ - $executables = ($archPackages.runtime_packages | Where-Object { $_.name -eq $tool }).executables | ForEach-Object { + Context "$($tool.name) package"{ + $executables = $tool.executables | ForEach-Object { @{ ExecName = $_ - ExecDir = $ExecDir + ExecDir = $execDir } } BeforeEach { - $env:PATH = "$ExecDir;$env:PATH" + $env:PATH = "$execDir;$env:PATH" } It " is installed in " -TestCases $executables { diff --git a/images/win/toolsets/toolset-2016.json b/images/win/toolsets/toolset-2016.json index 0cd62ff97574..4c36f261de4c 100644 --- a/images/win/toolsets/toolset-2016.json +++ b/images/win/toolsets/toolset-2016.json @@ -181,6 +181,7 @@ "mingw": [ { "arch": "mingw-w64-x86_64", + "exec_dir": "mingw64", "runtime_packages": [ { "name": "clang", @@ -214,6 +215,7 @@ }, { "arch": "mingw-w64-i686", + "exec_dir": "mingw32", "runtime_packages": [ { "name": "clang", diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index 84841df8ca84..5a43d7259dbe 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -181,6 +181,7 @@ "mingw": [ { "arch": "mingw-w64-x86_64", + "exec_dir": "mingw64", "runtime_packages": [ { "name": "clang", @@ -214,6 +215,7 @@ }, { "arch": "mingw-w64-i686", + "exec_dir": "mingw32", "runtime_packages": [ { "name": "clang", From f785d3355f14f8f5e45f81a4111d4f4467a0f518 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 30 Jun 2021 06:37:02 +0000 Subject: [PATCH 0359/3485] Updating readme file for ubuntu18 version 20210628.1 (#3664) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/linux/Ubuntu1804-README.md | 48 ++++++++++++++++--------------- 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/images/linux/Ubuntu1804-README.md b/images/linux/Ubuntu1804-README.md index f22cab385271..0f55dc15468f 100644 --- a/images/linux/Ubuntu1804-README.md +++ b/images/linux/Ubuntu1804-README.md @@ -1,10 +1,11 @@ | Announcements | |-| +| [[all OS versions] Android SDK tools will be changed to Command line tools on July, 12](https://github.com/actions/virtual-environments/issues/3638) | | [Ubuntu 16.04 environment will be removed on September 20, 2021](https://github.com/actions/virtual-environments/issues/3287) | *** # Ubuntu 18.04.5 LTS -- Linux kernel version: 5.4.0-1049-azure -- Image Version: 20210621.1 +- Linux kernel version: 5.4.0-1051-azure +- Image Version: 20210628.1 ## Installed Software ### Language and Runtime @@ -28,14 +29,14 @@ ### Package Management - cpan 1.64 - Helm 3.6.1 -- Homebrew 3.1.12 +- Homebrew 3.2.0 - Miniconda 4.9.2 - Npm 6.14.13 - Pip 9.0.1 - Pip3 9.0.1 - Pipx 0.16.3 - RubyGems 2.7.6 -- Vcpkg (build from master \<08214e1>) +- Vcpkg (build from master \) - Yarn 1.22.10 #### Environment variables @@ -51,14 +52,15 @@ - Sbt 1.5.4 ### Tools -- Ansible 2.10.10 +- Ansible 2.10.11 - apt-fast 1.9.11 - AzCopy 10.11.0 (available by `azcopy` and `azcopy10` aliases) - Bazel 4.1.0 - Bazelisk 1.9.0 +- Bicep 0.4.63 - Buildah 1.19.6 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- CMake 3.20.4 -- CodeQL Action Bundle 2.5.5 +- CMake 3.20.5 +- CodeQL Action Bundle 2.5.6 - Docker Compose 1.29.2 - Docker-Buildx 0.5.1 - Docker-Moby Client 20.10.6+azure @@ -68,7 +70,7 @@ - Git-ftp 1.3.1 - Haveged 1.9.1 - Heroku 7.54.1 -- HHVM (HipHop VM) 4.114.0 +- HHVM (HipHop VM) 4.115.0 - jq 1.5 - Kind 0.11.1 - Kubectl 1.20.1-5-g76a04fc @@ -77,7 +79,7 @@ - MediaInfo 17.12 - Mercurial 4.5.3 - Minikube 1.21.0 -- Newman 5.2.3 +- Newman 5.2.4 - nvm 0.38.0 - OpenSSL 1.1.1 11 Sep 2018 - Packer 1.7.3 @@ -88,21 +90,21 @@ - Skopeo 1.2.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 - SVN 1.9.7 -- Terraform 1.0.0 +- Terraform 1.0.1 - yamllint 1.26.1 - zstd 1.5.0 (homebrew) ### CLI Tools - Alibaba Cloud CLI 3.0.80 -- AWS CLI 1.19.97 +- AWS CLI 1.19.101 - AWS CLI Session manager plugin 1.2.205.0 - AWS SAM CLI 1.24.1 - Azure CLI (azure-cli) 2.25.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.18.0 - GitHub CLI 1.11.0 -- Google Cloud SDK 345.0.0 (apt source repository: https://packages.cloud.google.com/apt) +- Google Cloud SDK 346.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 3.37.37 +- Netlify CLI 3.39.0 - OpenShift CLI 4.7.16 - ORAS CLI 0.12.0 - Vercel CLI 23.0.1 @@ -119,7 +121,7 @@ | -------- | --------------------------------- | | PHP | 7.1.33 7.2.34 7.3.28 7.4.20 8.0.7 | | Composer | 2.1.3 | -| PHPUnit | 8.5.16 | +| PHPUnit | 8.5.17 | ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ``` @@ -139,7 +141,7 @@ - Bindgen 0.58.1 - Cargo audit 0.14.1 - Cargo clippy 0.1.53 -- Cargo outdated 0.9.15 +- Cargo outdated 0.9.16 - Cbindgen 0.19.0 - Rustfmt 1.4.37 @@ -259,16 +261,16 @@ | alpine:3.11 | sha256:20117524da64d995fd769f0aa3d7cfe2040518426f4b238f43e8373f4aa56c06 | 2021-04-14 | | alpine:3.12 | sha256:87703314048c40236c6d674424159ee862e2b96ce1c37c62d877e21ed27a387e | 2021-04-14 | | alpine:3.13 | sha256:f51ff2d96627690d62fee79e6eecd9fa87429a38142b5df8a3bfbb26061df7fc | 2021-04-14 | -| buildpack-deps:buster | sha256:b4ba9e547bb2e4f48186b234a816ec0182c86fda31f4de5c1eeb824a5d3330df | 2021-05-12 | -| buildpack-deps:stretch | sha256:fe5d31963e568ba5c418ad26c7c1391ddeedd801672236f081fc3e1e2950e27b | 2021-05-12 | -| debian:10 | sha256:acf7795dc91df17e10effee064bd229580a9c34213b4dba578d64768af5d8c51 | 2021-05-12 | -| debian:9 | sha256:4f8deed5755299e2d7ae1f5649656de89a6b7e30c0be37a3a1b4a49f0af51f7e | 2021-05-12 | +| buildpack-deps:buster | sha256:3e2554a4168887038da647f8d22f94348fadd67f753a7287e1e8193000fb4b3a | 2021-06-23 | +| buildpack-deps:stretch | sha256:04f933352c6a3e46933907f5a7fb6f37134e027207f5de2d3c234bfec43d0d72 | 2021-06-23 | +| debian:10 | sha256:33a8231b1ec668c044b583971eea94fff37151de3a1d5a3737b08665300c8a0b | 2021-06-23 | +| debian:9 | sha256:8afcdd92f29e1706625631df94ecdfe3bdeb919bb2c6ee685803d245b75ee45a | 2021-06-23 | | node:10 | sha256:59531d2835edd5161c8f9512f9e095b1836f7a1fcb0ab73e005ec46047384911 | 2021-04-10 | | node:10-alpine | sha256:dc98dac24efd4254f75976c40bce46944697a110d06ce7fa47e7268470cf2e28 | 2021-04-14 | -| node:12 | sha256:0d6b3522991d04ead0b119feaffafa6a8cd1b374218e9f997a1d4753b7064882 | 2021-05-12 | -| node:12-alpine | sha256:152bd04c3bb9001eebaa1f5a9c5d8bb9253fd3ae8b4a261f5fe760dce38b98ff | 2021-04-14 | -| node:14 | sha256:52fe2e3604ca3d7d0bc017c0d60df5baaf54c3e261bab8334b0657f923092523 | 2021-06-15 | -| node:14-alpine | sha256:cc1a31b2f4a3b8e9cdc6f8dc0c39a3b946d7aa5d10a53439d960d4352b2acfc0 | 2021-06-15 | +| node:12 | sha256:07ca77017dff8fccf0e333bd1fc7026844eb1e4e6677cc1f98e59843406cec29 | 2021-06-23 | +| node:12-alpine | sha256:be24b4fe27c92231c051a06e717b67e2a4dfc70d8edb0281285762292b854c03 | 2021-04-14 | +| node:14 | sha256:d8f90b676efb1260957a4170a9a0843fc003b673ae164f22df07eaee9bbc6223 | 2021-06-23 | +| node:14-alpine | sha256:21b87afa5f267e50b806f696f754b15b37b4118bb0ef722192f27ddff78d8d67 | 2021-06-15 | | ubuntu:16.04 | sha256:6aab78d1825b4c15c159fecc62b8eef4fdf0c693a15aace3a605ad44e5e2df0c | 2021-06-17 | | ubuntu:18.04 | sha256:139b3846cee2e63de9ced83cee7023a2d95763ee2573e5b0ab6dea9dfbd4db8f | 2021-06-17 | | ubuntu:20.04 | sha256:aba80b77e27148d99c034a987e7da3a287ed455390352663418c0f2ed40417fe | 2021-06-17 | From 7ffed57438eb155732312c9d4e5682d051f5799e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 30 Jun 2021 08:47:42 +0000 Subject: [PATCH 0360/3485] Updating readme file for ubuntu20 version 20210628.1 (#3665) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/linux/Ubuntu2004-README.md | 111 +++++++++++++++--------------- 1 file changed, 56 insertions(+), 55 deletions(-) diff --git a/images/linux/Ubuntu2004-README.md b/images/linux/Ubuntu2004-README.md index 5bfe139b6789..e99c0bad6c00 100644 --- a/images/linux/Ubuntu2004-README.md +++ b/images/linux/Ubuntu2004-README.md @@ -1,24 +1,24 @@ | Announcements | |-| -| [[Ubuntu] .NET SDK pre-installation policy will be changed on June 14](https://github.com/actions/virtual-environments/issues/3338) | +| [[all OS versions] Android SDK tools will be changed to Command line tools on July, 12](https://github.com/actions/virtual-environments/issues/3638) | | [Ubuntu 16.04 environment will be removed on September 20, 2021](https://github.com/actions/virtual-environments/issues/3287) | *** # Ubuntu 20.04.2 LTS -- Linux kernel version: 5.8.0-1033-azure -- Image Version: 20210614.1 +- Linux kernel version: 5.8.0-1036-azure +- Image Version: 20210628.1 ## Installed Software ### Language and Runtime - Bash 5.0.17(1)-release - Erlang 24.0.2 (Eshell 12.0.2) - Erlang rebar3 3.16.1 -- GNU C++ 9.3.0, 10.2.0 -- GNU Fortran 9.3.0, 10.2.0 +- GNU C++ 9.3.0, 10.3.0 +- GNU Fortran 9.3.0, 10.3.0 - Julia 1.6.1 - LLVM components: Clang 10.0.0, 11.0.0, 12.0.1, Clang-format 10.0.0, 11.0.0, 12.0.1 (apt source: deb http://apt.llvm.org/focal/ llvm-toolchain-focal-12) - Mono 6.12.0.122 (apt source repository: https://download.mono-project.com/repo/ubuntu stable-focal main) - MSBuild 16.6.0.15201 (from /usr/lib/mono/msbuild/15.0/bin/MSBuild.dll) -- Node 14.17.0 +- Node 14.17.1 - Perl 5.30.0 - Python 3.8.5 - Python3 3.8.5 @@ -27,15 +27,15 @@ ### Package Management - cpan 1.64 -- Helm 3.6.0 -- Homebrew 3.1.12 +- Helm 3.6.1 +- Homebrew 3.2.0 - Miniconda 4.9.2 - Npm 6.14.13 - Pip 20.0.2 - Pip3 20.0.2 - Pipx 0.16.3 - RubyGems 3.1.2 -- Vcpkg (build from master \<92b42c4>) +- Vcpkg (build from master \) - Yarn 1.22.10 #### Environment variables @@ -46,31 +46,32 @@ ### Project Management - Ant 1.10.7 -- Gradle 7.0.2 +- Gradle 7.1 - Lerna 4.0.0 - Maven 3.8.1 - Sbt 1.5.4 ### Tools -- Ansible 2.10.10 +- Ansible 2.10.11 - apt-fast 1.9.11 -- AzCopy 10.10.0 (available by `azcopy` and `azcopy10` aliases) +- AzCopy 10.11.0 (available by `azcopy` and `azcopy10` aliases) - Bazel 4.1.0 - Bazelisk 1.9.0 +- Bicep 0.4.63 - Buildah 1.21.0 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- CMake 3.20.3 -- CodeQL Action Bundle 2.5.5 +- CMake 3.20.5 +- CodeQL Action Bundle 2.5.6 - Docker Compose 1.29.2 - Docker-Buildx 0.5.1 - Docker-Moby Client 20.10.6+azure - Docker-Moby Server 20.10.6+azure -- Fastlane 2.185.0 +- Fastlane 2.186.0 - Git 2.32.0 (apt source repository: ppa:git-core/ppa) - Git LFS 2.13.3 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.6.0 - Haveged 1.9.1 - Heroku 7.54.1 -- HHVM (HipHop VM) 4.113.0 +- HHVM (HipHop VM) 4.115.0 - jq 1.6 - Kind 0.11.1 - Kubectl 1.20.1-5-g76a04fc @@ -79,35 +80,35 @@ - MediaInfo 19.09 - Mercurial 5.3.1 - Minikube 1.21.0 -- Newman 5.2.3 +- Newman 5.2.4 - nvm 0.38.0 - OpenSSL 1.1.1f 31 Mar 2020 -- Packer 1.7.2 +- Packer 1.7.3 - PhantomJS 2.1.1 - Podman 3.1.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- Pulumi 3.4.0 +- Pulumi 3.5.1 - R 4.1.0 - Skopeo 1.3.0 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 -- Terraform 1.0.0 +- Terraform 1.0.1 - yamllint 1.26.1 - zstd 1.5.0 (homebrew) ### CLI Tools -- Alibaba Cloud CLI 3.0.79 -- AWS CLI 2.2.11 +- Alibaba Cloud CLI 3.0.80 +- AWS CLI 2.2.14 - AWS CLI Session manager plugin 1.2.205.0 - AWS SAM CLI 1.24.1 -- Azure CLI (azure-cli) 2.24.2 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) +- Azure CLI (azure-cli) 2.25.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.18.0 - GitHub CLI 1.11.0 -- Google Cloud SDK 344.0.0 (apt source repository: https://packages.cloud.google.com/apt) +- Google Cloud SDK 346.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 3.37.18 -- OpenShift CLI 4.7.13 +- Netlify CLI 3.39.0 +- OpenShift CLI 4.7.16 - ORAS CLI 0.12.0 -- Vercel CLI 23.0.0 +- Vercel CLI 23.0.1 ### Java | Version | Vendor | Environment Variable | @@ -125,7 +126,7 @@ | -------- | ------------ | | PHP | 7.4.20 8.0.7 | | Composer | 2.1.3 | -| PHPUnit | 8.5.16 | +| PHPUnit | 8.5.17 | ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ``` @@ -136,23 +137,23 @@ - Stack 2.7.1 ### Rust Tools -- Cargo 1.52.0 -- Rust 1.52.1 -- Rustdoc 1.52.1 +- Cargo 1.53.0 +- Rust 1.53.0 +- Rustdoc 1.53.0 - Rustup 1.24.3 #### Packages - Bindgen 0.58.1 - Cargo audit 0.14.1 -- Cargo clippy 0.1.52 -- Cargo outdated 0.9.15 +- Cargo clippy 0.1.53 +- Cargo outdated 0.9.16 - Cbindgen 0.19.0 -- Rustfmt 1.4.36 +- Rustfmt 1.4.37 ### Browsers and Drivers -- Google Chrome 91.0.4472.101 +- Google Chrome 91.0.4472.114 - ChromeDriver 91.0.4472.101 -- Mozilla Firefox 89.0 +- Mozilla Firefox 89.0.1 - Geckodriver 0.29.1 - Chromium 91.0.4472.0 @@ -189,7 +190,7 @@ #### Node.js - 10.24.1 - 12.22.1 -- 14.17.0 +- 14.17.1 #### PyPy - 2.7.18 [PyPy 7.3.5] @@ -264,22 +265,22 @@ ### Cached Docker images | Repository:Tag | Digest | Created | | ---------------------- | ------------------------------------------------------------------------ | ---------- | -| alpine:3.11 | sha256:18a918a714d1368847b67173d120ebd110fcfae208305412f3005a61cdc7c20e | 2021-04-14 | -| alpine:3.12 | sha256:36553b10a4947067b9fbb7d532951066293a68eae893beba1d9235f7d11a20ad | 2021-04-14 | -| alpine:3.13 | sha256:69e70a79f2d41ab5d637de98c1e0b055206ba40a8145e7bddb55ccc04e13cf8f | 2021-04-14 | -| buildpack-deps:buster | sha256:b4ba9e547bb2e4f48186b234a816ec0182c86fda31f4de5c1eeb824a5d3330df | 2021-05-12 | -| buildpack-deps:stretch | sha256:fe5d31963e568ba5c418ad26c7c1391ddeedd801672236f081fc3e1e2950e27b | 2021-05-12 | -| debian:10 | sha256:acf7795dc91df17e10effee064bd229580a9c34213b4dba578d64768af5d8c51 | 2021-05-12 | -| debian:9 | sha256:4f8deed5755299e2d7ae1f5649656de89a6b7e30c0be37a3a1b4a49f0af51f7e | 2021-05-12 | +| alpine:3.11 | sha256:20117524da64d995fd769f0aa3d7cfe2040518426f4b238f43e8373f4aa56c06 | 2021-04-14 | +| alpine:3.12 | sha256:87703314048c40236c6d674424159ee862e2b96ce1c37c62d877e21ed27a387e | 2021-04-14 | +| alpine:3.13 | sha256:f51ff2d96627690d62fee79e6eecd9fa87429a38142b5df8a3bfbb26061df7fc | 2021-04-14 | +| buildpack-deps:buster | sha256:3e2554a4168887038da647f8d22f94348fadd67f753a7287e1e8193000fb4b3a | 2021-06-23 | +| buildpack-deps:stretch | sha256:04f933352c6a3e46933907f5a7fb6f37134e027207f5de2d3c234bfec43d0d72 | 2021-06-23 | +| debian:10 | sha256:33a8231b1ec668c044b583971eea94fff37151de3a1d5a3737b08665300c8a0b | 2021-06-23 | +| debian:9 | sha256:8afcdd92f29e1706625631df94ecdfe3bdeb919bb2c6ee685803d245b75ee45a | 2021-06-23 | | node:10 | sha256:59531d2835edd5161c8f9512f9e095b1836f7a1fcb0ab73e005ec46047384911 | 2021-04-10 | | node:10-alpine | sha256:dc98dac24efd4254f75976c40bce46944697a110d06ce7fa47e7268470cf2e28 | 2021-04-14 | -| node:12 | sha256:0d6b3522991d04ead0b119feaffafa6a8cd1b374218e9f997a1d4753b7064882 | 2021-05-12 | -| node:12-alpine | sha256:9a372efac4c436dfb6dbdea42f08d3ea60a0103a1df54a7da247e4bed1b327f7 | 2021-04-14 | -| node:14 | sha256:af9879e7473d347048c5d5919aa9775f27c33d92e4d58058ffdc08247f4bd902 | 2021-05-13 | -| node:14-alpine | sha256:f07ead757c93bc5e9e79978075217851d45a5d8e5c48eaf823e7f12d9bbc1d3c | 2021-05-13 | -| ubuntu:16.04 | sha256:9775877f420d453ef790e6832d77630a49b32a92b7bedf330adf4d8669f6600e | 2021-05-19 | -| ubuntu:18.04 | sha256:67b730ece0d34429b455c08124ffd444f021b81e06fa2d9cd0adaf0d0b875182 | 2021-05-19 | -| ubuntu:20.04 | sha256:adf73ca014822ad8237623d388cedf4d5346aa72c270c5acc01431cc93e18e2d | 2021-04-23 | +| node:12 | sha256:07ca77017dff8fccf0e333bd1fc7026844eb1e4e6677cc1f98e59843406cec29 | 2021-06-23 | +| node:12-alpine | sha256:be24b4fe27c92231c051a06e717b67e2a4dfc70d8edb0281285762292b854c03 | 2021-04-14 | +| node:14 | sha256:d8f90b676efb1260957a4170a9a0843fc003b673ae164f22df07eaee9bbc6223 | 2021-06-23 | +| node:14-alpine | sha256:21b87afa5f267e50b806f696f754b15b37b4118bb0ef722192f27ddff78d8d67 | 2021-06-15 | +| ubuntu:16.04 | sha256:6aab78d1825b4c15c159fecc62b8eef4fdf0c693a15aace3a605ad44e5e2df0c | 2021-06-17 | +| ubuntu:18.04 | sha256:139b3846cee2e63de9ced83cee7023a2d95763ee2573e5b0ab6dea9dfbd4db8f | 2021-06-17 | +| ubuntu:20.04 | sha256:aba80b77e27148d99c034a987e7da3a287ed455390352663418c0f2ed40417fe | 2021-06-17 | ### Installed apt packages | Name | Version | @@ -302,7 +303,7 @@ | ftp | 0.17-34.1 | | gnupg2 | 2.2.19-3ubuntu2.1 | | haveged | 1.9.1-6ubuntu1 | -| imagemagick | 8:6.9.10.23+dfsg-2.1ubuntu11.2 | +| imagemagick | 8:6.9.10.23+dfsg-2.1ubuntu11.4 | | iproute2 | 5.5.0-1ubuntu1 | | iputils-ping | 3:20190709-3 | | jq | 1.6-1ubuntu0.20.04.1 | @@ -315,9 +316,9 @@ | libgsl-dev | 2.5+dfsg-6build1 | | libgtk-3-0 | 3.24.20-0ubuntu1 | | libmagic-dev | 1:5.38-4 | -| libmagickcore-dev | 8:6.9.10.23+dfsg-2.1ubuntu11.2 | -| libmagickwand-dev | 8:6.9.10.23+dfsg-2.1ubuntu11.2 | -| libsecret-1-dev | 0.20.3-0ubuntu1 | +| libmagickcore-dev | 8:6.9.10.23+dfsg-2.1ubuntu11.4 | +| libmagickwand-dev | 8:6.9.10.23+dfsg-2.1ubuntu11.4 | +| libsecret-1-dev | 0.20.4-0ubuntu1 | | libsqlite3-dev | 3.31.1-4ubuntu0.2 | | libunwind8 | 1.2.1-9build1 | | libxkbfile-dev | 1:1.1.0-1 | From 5ae2170ebe90a53e1cdc9c507ed3e0f1471d6b66 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 1 Jul 2021 11:01:18 +0000 Subject: [PATCH 0361/3485] Updating readme file for macOS-10.15 version 20210626.1 (#3662) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/macos/macos-10.15-Readme.md | 33 +++++++++++++++--------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/images/macos/macos-10.15-Readme.md b/images/macos/macos-10.15-Readme.md index 3c821e756775..3f6d1271810b 100644 --- a/images/macos/macos-10.15-Readme.md +++ b/images/macos/macos-10.15-Readme.md @@ -1,12 +1,13 @@ | Announcements | |-| +| [[all OS versions] Android SDK tools will be changed to Command line tools on July, 12](https://github.com/actions/virtual-environments/issues/3638) | | [[macOS] Xcode 12.2 and 12.3 will be removed from Big Sur on June, 28](https://github.com/actions/virtual-environments/issues/3555) | | [macOS 11.0 pools will be transited to private preview.](https://github.com/actions/virtual-environments/issues/2486) | *** # macOS 10.15 info - System Version: macOS 10.15.7 (19H1217) - Kernel Version: Darwin 19.6.0 -- Image Version: 20210620.1 +- Image Version: 20210626.1 ## Installed Software ### Language and Runtime @@ -34,19 +35,19 @@ - Ruby 2.7.3p183 ### Package Management -- Bundler version 2.2.20 +- Bundler version 2.2.21 - Carthage 0.38.0 - CocoaPods 1.10.1 - Composer 2.1.3 -- Homebrew 3.1.12 +- Homebrew 3.2.0 - Miniconda 4.9.2 - NPM 6.14.13 - NuGet 5.6.0.6489 - Pip 20.3.4 (python 2.7) - Pip 21.1.1 (python 3.9) - Pipx 0.16.3 -- RubyGems 3.2.20 -- Vcpkg 2021 (build from master \<08214e1>) +- RubyGems 3.2.21 +- Vcpkg 2021 (build from master \) - Yarn 1.22.5 #### Environment variables @@ -71,7 +72,7 @@ - Git LFS: 2.13.3 - Git: 2.32.0 - GitHub CLI: 1.11.0 -- GNU parallel 20210422 +- GNU parallel 20210622 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.1 - gpg (GnuPG) 2.3.1 @@ -80,7 +81,7 @@ - jq 1.6 - mongo v4.4.5 - mongod v4.4.5 -- Newman 5.2.3 +- Newman 5.2.4 - OpenSSL 1.1.1k 25 Mar 2021 `(/usr/local/opt/openssl -> /usr/local/Cellar/openssl@1.1/1.1.1k)` - Packer 1.7.3 - PostgreSQL 13.3 @@ -96,17 +97,17 @@ ### Tools - Aliyun CLI 3.0.80 - App Center CLI 2.9.0 -- AWS CLI 2.2.13 +- AWS CLI 2.2.14 - AWS SAM CLI 1.24.1 - AWS Session Manager CLI 1.2.205.0 - Azure CLI 2.25.0 - Cabal 3.4.0.0 -- Cmake 3.20.4 -- Fastlane 2.185.1 +- Cmake 3.20.5 +- Fastlane 2.186.0 - GHC 9.0.1 - GHCup v0.1.15.2 - Stack 2.7.1 -- SwiftFormat 0.48.5 +- SwiftFormat 0.48.6 - Swig 4.0.2 - Xcode Command Line Tools 12.4.0.0.1.1610135815 @@ -119,9 +120,9 @@ - SafariDriver 14.1.1 (15611.2.7.1.6) - Google Chrome 91.0.4472.114 - ChromeDriver 91.0.4472.101 -- Microsoft Edge 91.0.864.54 -- MSEdgeDriver 91.0.864.54 -- Mozilla Firefox 89.0.1 +- Microsoft Edge 91.0.864.59 +- MSEdgeDriver 91.0.864.59 +- Mozilla Firefox 89.0.2 - geckodriver 0.29.1 #### Environment variables @@ -181,7 +182,7 @@ #### Packages - Bindgen 0.58.1 - Cargo-audit 0.14.1 -- Cargo-outdated v0.9.15 +- Cargo-outdated v0.9.16 - Cbindgen 0.19.0 - Clippy 0.1.53 - Rustfmt 1.4.37-stable @@ -205,7 +206,7 @@ ### Xamarin #### Visual Studio for Mac -- 8.10.2.17 +- 8.10.3.15 #### Xamarin bundles | symlink | Xamarin.Mono | Xamarin.iOS | Xamarin.Mac | Xamarin.Android | From 332b6bdabd80ff42fd3d4aac9074bdd8b4fa4435 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 1 Jul 2021 17:13:45 +0000 Subject: [PATCH 0362/3485] Updating readme file for win19 version 20210628.1 (#3667) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/win/Windows2019-Readme.md | 38 ++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index a47550f48460..0daf4270d9d7 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -1,6 +1,10 @@ +| Announcements | +|-| +| [[all OS versions] Android SDK tools will be changed to Command line tools on July, 12](https://github.com/actions/virtual-environments/issues/3638) | +*** # Microsoft Windows Server 2019 Datacenter - OS Version: 10.0.17763 Build 1999 -- Image Version: 20210620.1 +- Image Version: 20210628.1 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -19,14 +23,14 @@ ### Package Management - Chocolatey 0.10.15 - Composer 2.1.3 -- Helm 3.6.0 +- Helm 3.6.1 - Miniconda 4.9.2 (pre-installed on the image but not added to PATH) - NPM 6.14.13 - NuGet 5.10.0.7240 -- pip 21.1.2 (python 3.7) +- pip 21.1.3 (python 3.7) - Pipx 0.16.3 - RubyGems 2.7.6.3 -- Vcpkg (build from master \<08214e1>) +- Vcpkg (build from master \) - Yarn 1.22.10 #### Environment variables @@ -46,22 +50,23 @@ - azcopy 10.11.0 - Bazel 4.1.0 - Bazelisk 1.9.0 +- Bicep 0.4.63 - Cabal 3.4.0.0 -- CMake 3.20.4 -- CodeQL Action Bundle 2.5.5 +- CMake 3.20.5 +- CodeQL Action Bundle 2.5.6 - Docker 20.10.5 - Docker-compose 1.29.1 - ghc 9.0.1 - Git 2.32.0 - Git LFS 2.13.3 -- Google Cloud SDK 345.0.0 +- Google Cloud SDK 346.0.0 - InnoSetup 6.2.0 - jq 1.6 - Kind 0.11.1 -- Kubectl 1.21.1 +- Kubectl 1.21.2 - Mercurial 5.0 - Mingw-w64 8.1.0 -- Newman 5.2.3 +- Newman 5.2.4 - NSIS v3.06.1 - OpenSSL 1.1.1 - Packer 1.7.2 @@ -77,7 +82,7 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.80 -- AWS CLI 2.2.13 +- AWS CLI 2.2.14 - AWS SAM CLI 1.24.1 - AWS Session Manager CLI 1.2.205.0 - Azure CLI 2.25.0 @@ -95,17 +100,17 @@ #### Packages - bindgen 0.58.1 - cargo-audit 0.14.1 -- cargo-outdated v0.9.15 +- cargo-outdated v0.9.16 - cbindgen 0.19.0 - Clippy 0.1.53 - Rustfmt 1.4.37 ### Browsers and webdrivers -- Google Chrome 91.0.4472.114 +- Google Chrome 91.0.4472.124 - Chrome Driver 91.0.4472.101 -- Microsoft Edge 91.0.864.54 -- Microsoft Edge Driver 91.0.864.54 -- Mozilla Firefox 89.0.1 +- Microsoft Edge 91.0.864.59 +- Microsoft Edge Driver 91.0.864.59 +- Mozilla Firefox 89.0.2 - Gecko Driver 0.29.1 - IE Driver 3.150.1.0 @@ -211,7 +216,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Database tools - Azure CosmosDb Emulator 2.14.1.0 -- DacFx 15.0.4897.1 +- DacFx 15.0.5164.1 - MySQL 5.7.21.0 - SQLPS 1.0 @@ -561,3 +566,4 @@ All other versions are saved but not installed. | mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:3458c7dbc9ee16016170ecce85bee03b0e7f13744809d67fc881ec8d2086f5ef | 2021-06-06 | + From 7d0d3aa82ab8565cc43684bd08bf72fb6f5cd9f7 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 1 Jul 2021 18:11:39 +0000 Subject: [PATCH 0363/3485] Updating readme file for win16 version 20210628.1 (#3668) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/win/Windows2016-Readme.md | 38 ++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/images/win/Windows2016-Readme.md b/images/win/Windows2016-Readme.md index c480b5a694e2..090e7d450289 100644 --- a/images/win/Windows2016-Readme.md +++ b/images/win/Windows2016-Readme.md @@ -1,6 +1,10 @@ +| Announcements | +|-| +| [[all OS versions] Android SDK tools will be changed to Command line tools on July, 12](https://github.com/actions/virtual-environments/issues/3638) | +*** # Microsoft Windows Server 2016 Datacenter - OS Version: 10.0.14393 Build 4467 -- Image Version: 20210620.1 +- Image Version: 20210628.1 ## Installed Software ### Language and Runtime @@ -16,14 +20,14 @@ ### Package Management - Chocolatey 0.10.15 - Composer 2.1.3 -- Helm 3.6.0 +- Helm 3.6.1 - Miniconda 4.9.2 (pre-installed on the image but not added to PATH) - NPM 6.14.13 - NuGet 5.10.0.7240 -- pip 21.1.2 (python 3.7) +- pip 21.1.3 (python 3.7) - Pipx 0.16.3 - RubyGems 2.7.6.3 -- Vcpkg (build from master \<08214e1>) +- Vcpkg (build from master \) - Yarn 1.22.10 #### Environment variables @@ -43,22 +47,23 @@ - azcopy 10.11.0 - Bazel 4.1.0 - Bazelisk 1.9.0 +- Bicep 0.4.63 - Cabal 3.4.0.0 -- CMake 3.20.4 -- CodeQL Action Bundle 2.5.5 +- CMake 3.20.5 +- CodeQL Action Bundle 2.5.6 - Docker 20.10.5 - Docker-compose 1.29.1 - ghc 9.0.1 - Git 2.32.0 - Git LFS 2.13.3 -- Google Cloud SDK 345.0.0 +- Google Cloud SDK 346.0.0 - InnoSetup 6.2.0 - jq 1.6 - Kind 0.11.1 -- Kubectl 1.21.1 +- Kubectl 1.21.2 - Mercurial 5.0 - Mingw-w64 8.1.0 -- Newman 5.2.3 +- Newman 5.2.4 - NSIS v3.06.1 - OpenSSL 1.1.1 - Packer 1.7.2 @@ -74,7 +79,7 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.80 -- AWS CLI 2.2.13 +- AWS CLI 2.2.14 - AWS SAM CLI 1.24.1 - AWS Session Manager CLI 1.2.205.0 - Azure CLI 2.25.0 @@ -92,17 +97,17 @@ #### Packages - bindgen 0.58.1 - cargo-audit 0.14.1 -- cargo-outdated v0.9.15 +- cargo-outdated v0.9.16 - cbindgen 0.19.0 - Clippy 0.1.53 - Rustfmt 1.4.37 ### Browsers and webdrivers -- Google Chrome 91.0.4472.114 +- Google Chrome 91.0.4472.124 - Chrome Driver 91.0.4472.101 -- Microsoft Edge 91.0.864.54 -- Microsoft Edge Driver 91.0.864.54 -- Mozilla Firefox 89.0.1 +- Microsoft Edge 91.0.864.59 +- Microsoft Edge Driver 91.0.864.59 +- Mozilla Firefox 89.0.2 - Gecko Driver 0.29.1 - IE Driver 3.150.1.0 @@ -205,7 +210,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Database tools - Azure CosmosDb Emulator 2.14.1.0 -- DacFx 15.0.4897.1 +- DacFx 15.0.5164.1 - MySQL 5.7.21.0 - SQLPS 1.0 @@ -570,3 +575,4 @@ All other versions are saved but not installed. | mcr.microsoft.com/windows/servercore:ltsc2016 | sha256:431315d3208b79a74c7e598aacb469f0e58a18977f5b93885b1d8d7027cae03d | 2021-06-06 | + From cc3405ff7a26b81e796c0247c3c5dec99ef60512 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Wed, 7 Jul 2021 15:16:23 +0300 Subject: [PATCH 0364/3485] [macOS] Switch android tools installation to use cmdline-tools' sdkmanager (#3686) * Switch android installation to use cmdline-tools * Switch android-toolsets and xamarin-android-ndk to use new sdkmanager * Remove cmdline-tools installation from toolset as it's installed * Remove redundant steps with warning prevention * Remove hardcoded licenses as they are accepted during the installation * Add tests to check that both sdkmanagers are available * Simplify Get-AndroidInstalledPackages function to use list_installed * Change regex pattern to output the group * Currently the function returns 4. instead of 4.0, this change fixes it --- .../macos/provision/core/android-toolsets.sh | 39 +++++++------------ .../provision/core/xamarin-android-ndk.sh | 2 +- .../SoftwareReport.Android.psm1 | 23 ++++++----- images/macos/tests/Android.Tests.ps1 | 17 ++++++++ images/macos/toolsets/toolset-10.14.json | 3 +- images/macos/toolsets/toolset-10.15.json | 3 +- images/macos/toolsets/toolset-11.json | 3 +- 7 files changed, 46 insertions(+), 44 deletions(-) diff --git a/images/macos/provision/core/android-toolsets.sh b/images/macos/provision/core/android-toolsets.sh index 5a08278b9c70..ac9c6d037bef 100755 --- a/images/macos/provision/core/android-toolsets.sh +++ b/images/macos/provision/core/android-toolsets.sh @@ -33,38 +33,27 @@ ANDROID_ADDON_LIST=($(get_toolset_value '.android."addon-list"[]')) ANDROID_ADDITIONAL_TOOLS=($(get_toolset_value '.android."additional-tools"[]')) ANDROID_NDK_MAJOR_LTS=($(get_toolset_value '.android.ndk.lts')) ANDROID_NDK_MAJOR_LATEST=($(get_toolset_value '.android.ndk.latest')) -# Get the latest command line tools from https://developer.android.com/studio/index.html -# Release note: https://developer.android.com/studio/releases/sdk-tools.html -ANDROID_OSX_SDK_LOCATION="https://dl.google.com/android/repository/sdk-tools-darwin-3859397.zip" +# Get the latest command line tools from https://developer.android.com/studio#cmdline-tools +ANDROID_OSX_SDK_URL="https://dl.google.com/android/repository/commandlinetools-mac-7302050_latest.zip" ANDROID_HOME=$HOME/Library/Android/sdk ANDROID_OSX_SDK_FILE=tools-macosx.zip pushd $HOME -# Prevent the warning of sdkmanager -mkdir $HOME/.android -echo "count=0" >> $HOME/.android/repositories.cfg +echo "Downloading android command line tools..." +download_with_retries $ANDROID_OSX_SDK_URL "." $ANDROID_OSX_SDK_FILE -echo "Downloading android sdk..." -curl -L -o $ANDROID_OSX_SDK_FILE $ANDROID_OSX_SDK_LOCATION - -echo "Uncompressing android sdk..." -unzip -q $ANDROID_OSX_SDK_FILE && rm -f $ANDROID_OSX_SDK_FILE -rm -rf $HOME/Library/Android/sdk +echo "Uncompressing android command line tools..." mkdir -p $HOME/Library/Android/sdk +unzip -q $ANDROID_OSX_SDK_FILE -d $HOME/Library/Android/sdk/cmdline-tools +# Command line tools need to be placed in $HOME/Library/Android/sdk/cmdline-tools/latest to function properly +mv $HOME/Library/Android/sdk/cmdline-tools/cmdline-tools $HOME/Library/Android/sdk/cmdline-tools/latest +rm -f $ANDROID_OSX_SDK_FILE echo ANDROID_HOME is $ANDROID_HOME -mv tools $ANDROID_HOME - -export PATH=$PATH:$ANDROID_HOME/tools:$ANDROID_HOME/tools/bin - -SDKMANAGER=$ANDROID_HOME/tools/bin/sdkmanager +export PATH=$PATH:$ANDROID_HOME/cmdline-tools/latest:$ANDROID_HOME/cmdline-tools/latest/bin -# Mark the different Android licenses as accepted -mkdir -p $ANDROID_HOME/licenses -echo "8933bad161af4178b1185d1a37fbf41ea5269c55 -d56f5187479451eabf01fb78af6dfcb131a6481e" >> $ANDROID_HOME/licenses/android-sdk-license -echo "84831b9409646a918e30573bab4c9c91346d8abd" >> $ANDROID_HOME/licenses/android-sdk-preview-license +SDKMANAGER=$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager echo "Installing latest tools & platform tools..." echo y | $SDKMANAGER "tools" "platform-tools" @@ -80,14 +69,14 @@ ln -s $ANDROID_HOME/ndk/$ndkLtsLatest $ANDROID_HOME/ndk-bundle ANDROID_NDK_LATEST_HOME=$ANDROID_HOME/ndk/$ndkLatest echo "export ANDROID_NDK_LATEST_HOME=$ANDROID_NDK_LATEST_HOME" >> "${HOME}/.bashrc" -availablePlatforms=($(${ANDROID_HOME}/tools/bin/sdkmanager --list | grep "platforms;android-" | cut -d"|" -f 1 | sort -u)) +availablePlatforms=($($SDKMANAGER --list | grep "platforms;android-" | cut -d"|" -f 1 | sort -u)) filter_components_by_version $ANDROID_PLATFORM "${availablePlatforms[@]}" -allBuildTools=($(${ANDROID_HOME}/tools/bin/sdkmanager --list --include_obsolete | grep "build-tools;" | cut -d"|" -f 1 | sort -u)) +allBuildTools=($($SDKMANAGER --list --include_obsolete | grep "build-tools;" | cut -d"|" -f 1 | sort -u)) availableBuildTools=$(echo ${allBuildTools[@]//*rc[0-9]/}) filter_components_by_version $ANDROID_BUILD_TOOL "${availableBuildTools[@]}" -echo "y" | ${ANDROID_HOME}/tools/bin/sdkmanager ${components[@]} +echo "y" | $SDKMANAGER ${components[@]} for extra_name in "${ANDROID_EXTRA_LIST[@]}" do diff --git a/images/macos/provision/core/xamarin-android-ndk.sh b/images/macos/provision/core/xamarin-android-ndk.sh index 0254643e5643..82896b46c063 100644 --- a/images/macos/provision/core/xamarin-android-ndk.sh +++ b/images/macos/provision/core/xamarin-android-ndk.sh @@ -3,7 +3,7 @@ source ~/utils/utils.sh ANDROID_HOME=$HOME/Library/Android/sdk ANDROID_NDK_HOME=$ANDROID_HOME/ndk-bundle -SDKMANAGER=$ANDROID_HOME/tools/bin/sdkmanager +SDKMANAGER=$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager # Android NDK v16 is not compatible with old Xamarin.Android SDK # and fails builds with BundleAssemblies enabled diff --git a/images/macos/software-report/SoftwareReport.Android.psm1 b/images/macos/software-report/SoftwareReport.Android.psm1 index db5955d269aa..9be1d78a387c 100644 --- a/images/macos/software-report/SoftwareReport.Android.psm1 +++ b/images/macos/software-report/SoftwareReport.Android.psm1 @@ -13,21 +13,13 @@ function Get-AndroidSDKRoot { function Get-AndroidSDKManagerPath { $androidSDKDir = Get-AndroidSDKRoot - return Join-Path $androidSDKDir "tools" "bin" "sdkmanager" + return Join-Path $androidSDKDir "cmdline-tools" "latest" "bin" "sdkmanager" } function Get-AndroidInstalledPackages { $androidSDKManagerPath = Get-AndroidSDKManagerPath - $androidSDKManagerList = Invoke-Expression "$androidSDKManagerPath --list --include_obsolete" - $androidInstalledPackages = @() - foreach($packageInfo in $androidSDKManagerList) { - if($packageInfo -Match "Available Packages:") { - break - } - - $androidInstalledPackages += $packageInfo - } - return $androidInstalledPackages + $androidSDKManagerList = Invoke-Expression "$androidSDKManagerPath --list_installed" + return $androidSDKManagerList } function Get-AndroidPackages { @@ -42,7 +34,7 @@ function Build-AndroidTable { return @( @{ "Package" = "Android Command Line Tools" - "Version" = Get-AndroidPackageVersions -PackageInfo $packageInfo -MatchedString "Android SDK Command-line Tools" + "Version" = Get-AndroidCommandLineToolsVersion }, @{ "Package" = "Android Emulator" @@ -143,6 +135,13 @@ function Get-AndroidPlatformVersions { return ($versions -Join "
") } +function Get-AndroidCommandLineToolsVersion { + $commandLineTools = Get-AndroidSDKManagerPath + (& $commandLineTools --version | Out-String).Trim() -match "(?^(\d+\.){1,}\d+$)" | Out-Null + $commandLineToolsVersion = $Matches.Version + return $commandLineToolsVersion +} + function Get-AndroidBuildToolVersions { param ( [Parameter(Mandatory)] diff --git a/images/macos/tests/Android.Tests.ps1 b/images/macos/tests/Android.Tests.ps1 index c14c89f22e09..02fe6543d5f8 100644 --- a/images/macos/tests/Android.Tests.ps1 +++ b/images/macos/tests/Android.Tests.ps1 @@ -57,6 +57,23 @@ Describe "Android" { } } + Context "SDKManagers" { + $testCases = @( + @{ + PackageName = "SDK tools" + Sdkmanager = "$env:ANDROID_HOME/tools/bin/sdkmanager" + }, + @{ + PackageName = "Command-line tools" + Sdkmanager = "$env:ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager" + } + ) + + It "Sdkmanager from is available" -TestCases $testCases { + "$Sdkmanager --version" | Should -ReturnZeroExitCode + } + } + Context "Packages" { $testCases = $androidPackages | ForEach-Object { @{ PackageName = $_ } } diff --git a/images/macos/toolsets/toolset-10.14.json b/images/macos/toolsets/toolset-10.14.json index bdc2cddd9392..72d34a68b779 100644 --- a/images/macos/toolsets/toolset-10.14.json +++ b/images/macos/toolsets/toolset-10.14.json @@ -212,8 +212,7 @@ ], "additional-tools": [ "cmake;3.10.2.4988404", - "cmake;3.18.1", - "cmdline-tools;latest" + "cmake;3.18.1" ], "ndk": { "lts": "21", diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index 0f76064932aa..783cb28b2b47 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -164,8 +164,7 @@ ], "additional-tools": [ "cmake;3.10.2.4988404", - "cmake;3.18.1", - "cmdline-tools;latest" + "cmake;3.18.1" ], "ndk": { "lts": "21", diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index aa7054921414..3058334bc908 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -112,8 +112,7 @@ "addon-list": [], "additional-tools": [ "cmake;3.10.2.4988404", - "cmake;3.18.1", - "cmdline-tools;latest" + "cmake;3.18.1" ], "ndk": { "lts": "21", From 6e7af98600e03cc5b487f8fec6631889b4374e50 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Wed, 7 Jul 2021 15:16:35 +0300 Subject: [PATCH 0365/3485] [Windows] Switch android tools installation to use cmdline-tools' sdkmanager (#3682) * Switch android installation to use cmdline-tools * Rename update-android sdk to install-android sdk as for the other OSs * Remove cmdline-tools installation from toolset as it's installed * Regenerate licenses for the new sdkmanager * Add tests to check that both sdkmanagers are available * Simplify Get-AndroidInstalledPackages function to use list_installed * Resolve nitpicks from @AlenaSviridenko * Add extra lines to separate comments from the code * Remove extra line after $androidNDKs * Modify software report to output any version number * Change regex pattern to output the group * Currently the function returns 4. instead of 4.0, this change fixes it --- .../scripts/Installers/Install-AndroidSDK.ps1 | 148 ++++++++++++++++++ .../scripts/Installers/Update-AndroidSDK.ps1 | 132 ---------------- .../SoftwareReport.Android.psm1 | 23 ++- images/win/scripts/Tests/Android.Tests.ps1 | 57 ++++--- images/win/toolsets/toolset-2016.json | 3 +- images/win/toolsets/toolset-2019.json | 3 +- images/win/windows2016.json | 2 +- images/win/windows2019.json | 2 +- 8 files changed, 201 insertions(+), 169 deletions(-) create mode 100644 images/win/scripts/Installers/Install-AndroidSDK.ps1 delete mode 100644 images/win/scripts/Installers/Update-AndroidSDK.ps1 diff --git a/images/win/scripts/Installers/Install-AndroidSDK.ps1 b/images/win/scripts/Installers/Install-AndroidSDK.ps1 new file mode 100644 index 000000000000..acb6aefd5c60 --- /dev/null +++ b/images/win/scripts/Installers/Install-AndroidSDK.ps1 @@ -0,0 +1,148 @@ +################################################################################ +## File: Install-AndroidSDK.ps1 +## Desc: Install and update Android SDK and tools +################################################################################ + +# install command-line tools +$cmdlineToolsUrl = "https://dl.google.com/android/repository/commandlinetools-win-7302050_latest.zip" +$cmdlineToolsArchPath = Start-DownloadWithRetry -Url $cmdlineToolsUrl -Name "cmdline-tools.zip" +$sdkInstallRoot = "C:\Program Files (x86)\Android\android-sdk" +$sdkRoot = "C:\Android\android-sdk" +Expand-Archive -Path $cmdlineToolsArchPath -DestinationPath "${sdkInstallRoot}\cmdline-tools" -Force + +# cmdline tools should be installed in ${sdkInstallRoot}\cmdline-tools\latest\bin, but archive contains ${sdkInstallRoot}\cmdline-tools\bin +# we need to create the proper folder structure +Rename-Item "${sdkInstallRoot}\cmdline-tools\cmdline-tools" "latest" + +# ANDROID_NDK_PATH/HOME should not contain spaces. Otherwise, the script ndk-build.cmd gives an error https://github.com/actions/virtual-environments/issues/1122 +# create "C:\Android" directory and a hardlink inside pointed to sdk in Program Files +New-Item -Path "C:\Android" -ItemType Directory +New-Item -Path "$sdkRoot" -ItemType SymbolicLink -Value "$sdkInstallRoot" +$sdkManager = "$sdkRoot\cmdline-tools\latest\bin\sdkmanager.bat" + +# Install the standard Android SDK licenses. Currently, there isn't a better way to do this, +# so we are base64-encoded a zip of the licenses directory from another installation. +# To create this base64 string, create a zip file that contains nothing but a 'licenses' folder, +# which folder contains the accepted license files found in 'C:\Program Files (x86)\Android\android-sdk\licenses'. +# Then, run this in PowerShell: +# $LicensesZipFileName = 'C:\Program Files (x86)\Android\android-sdk\Licenses.zip' +# $base64Content = [Convert]::ToBase64String([IO.File]::ReadAllBytes($LicensesZipFileName)) +# echo $base64Content +# Another possible solution that works in powershell core: +# Write-Ouptut "y" | $sdkManager +$licenseContentBase64 = "UEsDBBQAAAAAAKNK11IAAAAAAAAAAAAAAAAJAAAAbGljZW5zZXMvUEsDBAoAAAAAAJ1K11K7n0IrKgAAACoAAAAhAAAAbGljZW5zZXMvYW5kcm9pZC1nb29nbGV0di1saWNlbnNlDQo2MDEwODViOTRjZDc3ZjBiNTRmZjg2NDA2OTU3MDk5ZWJlNzljNGQ2UEsDBAoAAAAAAKBK11LzQumJKgAAACoAAAAkAAAAbGljZW5zZXMvYW5kcm9pZC1zZGstYXJtLWRidC1saWNlbnNlDQo4NTlmMzE3Njk2ZjY3ZWYzZDdmMzBhNTBhNTU2MGU3ODM0YjQzOTAzUEsDBAoAAAAAAKFK11IKSOJFKgAAACoAAAAcAAAAbGljZW5zZXMvYW5kcm9pZC1zZGstbGljZW5zZQ0KMjQzMzNmOGE2M2I2ODI1ZWE5YzU1MTRmODNjMjgyOWIwMDRkMWZlZVBLAwQKAAAAAACiStdSec1a4SoAAAAqAAAAJAAAAGxpY2Vuc2VzL2FuZHJvaWQtc2RrLXByZXZpZXctbGljZW5zZQ0KODQ4MzFiOTQwOTY0NmE5MThlMzA1NzNiYWI0YzljOTEzNDZkOGFiZFBLAwQKAAAAAACiStdSk6vQKCoAAAAqAAAAGwAAAGxpY2Vuc2VzL2dvb2dsZS1nZGstbGljZW5zZQ0KMzNiNmEyYjY0NjA3ZjExYjc1OWYzMjBlZjlkZmY0YWU1YzQ3ZDk3YVBLAwQKAAAAAACiStdSrE3jESoAAAAqAAAAJAAAAGxpY2Vuc2VzL2ludGVsLWFuZHJvaWQtZXh0cmEtbGljZW5zZQ0KZDk3NWY3NTE2OThhNzdiNjYyZjEyNTRkZGJlZWQzOTAxZTk3NmY1YVBLAwQKAAAAAACjStdSkb1vWioAAAAqAAAAJgAAAGxpY2Vuc2VzL21pcHMtYW5kcm9pZC1zeXNpbWFnZS1saWNlbnNlDQplOWFjYWI1YjVmYmI1NjBhNzJjZmFlY2NlODk0Njg5NmZmNmFhYjlkUEsBAj8AFAAAAAAAo0rXUgAAAAAAAAAAAAAAAAkAJAAAAAAAAAAQAAAAAAAAAGxpY2Vuc2VzLwoAIAAAAAAAAQAYACIHOBcRaNcBIgc4FxFo1wHBTVQTEWjXAVBLAQI/AAoAAAAAAJ1K11K7n0IrKgAAACoAAAAhACQAAAAAAAAAIAAAACcAAABsaWNlbnNlcy9hbmRyb2lkLWdvb2dsZXR2LWxpY2Vuc2UKACAAAAAAAAEAGACUEFUTEWjXAZQQVRMRaNcB6XRUExFo1wFQSwECPwAKAAAAAACgStdS80LpiSoAAAAqAAAAJAAkAAAAAAAAACAAAACQAAAAbGljZW5zZXMvYW5kcm9pZC1zZGstYXJtLWRidC1saWNlbnNlCgAgAAAAAAABABgAsEM0FBFo1wGwQzQUEWjXAXb1MxQRaNcBUEsBAj8ACgAAAAAAoUrXUgpI4kUqAAAAKgAAABwAJAAAAAAAAAAgAAAA/AAAAGxpY2Vuc2VzL2FuZHJvaWQtc2RrLWxpY2Vuc2UKACAAAAAAAAEAGAAsMGUVEWjXASwwZRURaNcB5whlFRFo1wFQSwECPwAKAAAAAACiStdSec1a4SoAAAAqAAAAJAAkAAAAAAAAACAAAABgAQAAbGljZW5zZXMvYW5kcm9pZC1zZGstcHJldmlldy1saWNlbnNlCgAgAAAAAAABABgA7s3WFRFo1wHuzdYVEWjXAfGm1hURaNcBUEsBAj8ACgAAAAAAokrXUpOr0CgqAAAAKgAAABsAJAAAAAAAAAAgAAAAzAEAAGxpY2Vuc2VzL2dvb2dsZS1nZGstbGljZW5zZQoAIAAAAAAAAQAYAGRDRxYRaNcBZENHFhFo1wFfHEcWEWjXAVBLAQI/AAoAAAAAAKJK11KsTeMRKgAAACoAAAAkACQAAAAAAAAAIAAAAC8CAABsaWNlbnNlcy9pbnRlbC1hbmRyb2lkLWV4dHJhLWxpY2Vuc2UKACAAAAAAAAEAGADGsq0WEWjXAcayrRYRaNcBxrKtFhFo1wFQSwECPwAKAAAAAACjStdSkb1vWioAAAAqAAAAJgAkAAAAAAAAACAAAACbAgAAbGljZW5zZXMvbWlwcy1hbmRyb2lkLXN5c2ltYWdlLWxpY2Vuc2UKACAAAAAAAAEAGAA4LjgXEWjXATguOBcRaNcBIgc4FxFo1wFQSwUGAAAAAAgACACDAwAACQMAAAAA" +$licenseContent = [System.Convert]::FromBase64String($licenseContentBase64) +Set-Content -Path "$sdkInstallRoot\android-sdk-licenses.zip" -Value $licenseContent -Encoding Byte +Expand-Archive "$sdkInstallRoot\android-sdk-licenses.zip" $sdkInstallRoot + +# install platform-tools +$platformToolsPath = Join-Path -Path $sdkInstallRoot -ChildPath "platform-tools" +# Remove outdated platform-tools that was brought by Visual Studio Android package +if (Test-Path $platformToolsPath) +{ + Write-Host "Removing previous platform-tools installation from Visual Studio component" + Remove-Item $platformToolsPath -Recurse -Force +} + +Install-AndroidSDKPackages -AndroidSDKManagerPath $sdkManager ` + -AndroidSDKRootPath $sdkRoot ` + -AndroidPackages "platform-tools" + +# get packages to install from the toolset +$androidToolset = (Get-ToolsetContent).android + +# get packages info +$androidPackages = Get-AndroidPackages -AndroidSDKManagerPath $sdkManager + +# platforms +[int]$platformMinVersion = $androidToolset.platform_min_version +$platformListByVersion = Get-AndroidPackagesByVersion -AndroidPackages $androidPackages ` + -PrefixPackageName "platforms;" ` + -MinimumVersion $platformMinVersion ` + -Delimiter "-" ` + -Index 1 +$platformListByName = Get-AndroidPackagesByName -AndroidPackages $androidPackages ` + -PrefixPackageName "platforms;" | Where-Object {$_ -match "-\D+$"} +$platformList = $platformListByVersion + $platformListByName + +# build-tools +[version]$buildToolsMinVersion = $androidToolset.build_tools_min_version +$buildToolsList = Get-AndroidPackagesByVersion -AndroidPackages $androidPackages ` + -PrefixPackageName "build-tools;" ` + -MinimumVersion $buildToolsMinVersion ` + -Delimiter ";" ` + -Index 1 + +Install-AndroidSDKPackages -AndroidSDKManagerPath $sdkManager ` + -AndroidSDKRootPath $sdkRoot ` + -AndroidPackages $platformList + +Install-AndroidSDKPackages -AndroidSDKManagerPath $sdkManager ` + -AndroidSDKRootPath $sdkRoot ` + -AndroidPackages $buildToolsList + +Install-AndroidSDKPackages -AndroidSDKManagerPath $sdkManager ` + -AndroidSDKRootPath $sdkRoot ` + -AndroidPackages $androidToolset.extra_list ` + -PrefixPackageName "extras;" + +Install-AndroidSDKPackages -AndroidSDKManagerPath $sdkManager ` + -AndroidSDKRootPath $sdkRoot ` + -AndroidPackages $androidToolset.addon_list ` + -PrefixPackageName "add-ons;" + +Install-AndroidSDKPackages -AndroidSDKManagerPath $sdkManager ` + -AndroidSDKRootPath $sdkRoot ` + -AndroidPackages $androidToolset.additional_tools + +# NDKs +$ndkLTSMajorVersion = $androidToolset.ndk.lts +$ndkLatestMajorVersion = $androidToolset.ndk.latest + +$ndkLTSPackageName = Get-AndroidPackagesByName -AndroidPackages $androidPackages ` + -PrefixPackageName "ndk;$ndkLTSMajorVersion" ` + | Sort-Object -Unique ` + | Select-Object -Last 1 + +$ndkLatestPackageName = Get-AndroidPackagesByName -AndroidPackages $androidPackages ` + -PrefixPackageName "ndk;$ndkLatestMajorVersion" ` + | Sort-Object -Unique ` + | Select-Object -Last 1 + +$androidNDKs = @($ndkLTSPackageName, $ndkLatestPackageName) + +Install-AndroidSDKPackages -AndroidSDKManagerPath $sdkManager ` + -AndroidSDKRootPath $sdkRoot ` + -AndroidPackages $androidNDKs + +$ndkLTSVersion = $ndkLTSPackageName.Split(';')[1] +$ndkLatestVersion = $ndkLatestPackageName.Split(';')[1] + +# Android NDK root path. +$ndkRoot = "$sdkRoot\ndk-bundle" +# This changes were added due to incompatibility with android ndk-bundle (ndk;22.0.7026061). +# Link issue virtual-environments: https://github.com/actions/virtual-environments/issues/2481 +# Link issue xamarin-android: https://github.com/xamarin/xamarin-android/issues/5526 +New-Item -Path $ndkRoot -ItemType SymbolicLink -Value "$sdkRoot\ndk\$ndkLTSVersion" + +if (Test-Path $ndkRoot) { + setx ANDROID_HOME $sdkRoot /M + setx ANDROID_SDK_ROOT $sdkRoot /M + setx ANDROID_NDK_HOME $ndkRoot /M + setx ANDROID_NDK_PATH $ndkRoot /M + setx ANDROID_NDK_ROOT $ndkRoot /M + (Get-Content -Encoding UTF8 "${ndkRoot}\ndk-build.cmd").replace('%~dp0\build\ndk-build.cmd','"%~dp0\build\ndk-build.cmd"')|Set-Content -Encoding UTF8 "${ndkRoot}\ndk-build.cmd" +} else { + Write-Host "LTS NDK $ndkLTSVersion is not installed at path $ndkRoot" + exit 1 +} + +$ndkLatestPath = "$sdkRoot\ndk\$ndkLatestVersion" +if (Test-Path $ndkLatestPath) { + setx ANDROID_NDK_LATEST_HOME $ndkLatestPath /M +} else { + Write-Host "Latest NDK $ndkLatestVersion is not installed at path $ndkLatestPath" + exit 1 +} + +Invoke-PesterTests -TestFile "Android" diff --git a/images/win/scripts/Installers/Update-AndroidSDK.ps1 b/images/win/scripts/Installers/Update-AndroidSDK.ps1 deleted file mode 100644 index f20c22cea919..000000000000 --- a/images/win/scripts/Installers/Update-AndroidSDK.ps1 +++ /dev/null @@ -1,132 +0,0 @@ -################################################################################ -## File: Update-AndroidSDK.ps1 -## Desc: Install and update Android SDK and tools -################################################################################ - -# Install the standard Android SDK licenses. In the past, there wasn't a better way to do this, -# so we are base64-encoding a zip of the licenses directory from another installation. -# To create this base64 string, create a zip file that contains nothing but a 'licenses' folder, -# which folder contains the accepted license files found in 'C:\Program Files (x86)\Android\android-sdk\licenses'. -# Then, run this in PowerShell: -# $LicensesZipFileName = 'C:\Program Files (x86)\Android\android-sdk\Licenses.zip' -# $base64Content = [Convert]::ToBase64String([IO.File]::ReadAllBytes($LicensesZipFileName)) -# echo $base64Content -# -# Future: see if the base64 technique can be avoided by running this PowerShell script to accept all licenses. -# This fails when run on a live agent, likely because non-interactive mode is set. -# It may work fine during image generation (this script). -# for($i=0; $i -lt 100; $i++) { $response += "y`n"}; $response | .\sdkmanager.bat --licenses -$base64Content = "UEsDBBQAAAAAAKJeN06amkPzKgAAACoAAAAhAAAAbGljZW5zZXMvYW5kcm9pZC1nb29nbGV0di1saWNlbnNlDQpmYzk0NmU4ZjIzMWYzZTMxNTliZjBiN2M2NTVjOTI0Y2IyZTM4MzMwUEsDBBQAAAAIAKBrN05E+YSqQwAAAFQAAAAcAAAAbGljZW5zZXMvYW5kcm9pZC1zZGstbGljZW5zZQXByREAIQgEwP9WmYsjhxgOKJN/CNs9vmdOQ2zdRw2dxQnWjqQ/3oIgXQM9vqUiwkiX8ljWea4ZlCF3xTo1pz6w+wdQSwMEFAAAAAAAxV43TpECY7AqAAAAKgAAACQAAABsaWNlbnNlcy9hbmRyb2lkLXNkay1wcmV2aWV3LWxpY2Vuc2UNCjUwNDY2N2Y0YzBkZTdhZjFhMDZkZTlmNGIxNzI3Yjg0MzUxZjI5MTBQSwMEFAAAAAAAzF43TpOr0CgqAAAAKgAAABsAAABsaWNlbnNlcy9nb29nbGUtZ2RrLWxpY2Vuc2UNCjMzYjZhMmI2NDYwN2YxMWI3NTlmMzIwZWY5ZGZmNGFlNWM0N2Q5N2FQSwMEFAAAAAAAz143TqxN4xEqAAAAKgAAACQAAABsaWNlbnNlcy9pbnRlbC1hbmRyb2lkLWV4dHJhLWxpY2Vuc2UNCmQ5NzVmNzUxNjk4YTc3YjY2MmYxMjU0ZGRiZWVkMzkwMWU5NzZmNWFQSwMEFAAAAAAA0l43Tu2ee/8qAAAAKgAAACYAAABsaWNlbnNlcy9taXBzLWFuZHJvaWQtc3lzaW1hZ2UtbGljZW5zZQ0KNjNkNzAzZjU2OTJmZDg5MWQ1YWNhY2ZiZDhlMDlmNDBmYzk3NjEwNVBLAQIUABQAAAAAAKJeN06amkPzKgAAACoAAAAhAAAAAAAAAAEAIAAAAAAAAABsaWNlbnNlcy9hbmRyb2lkLWdvb2dsZXR2LWxpY2Vuc2VQSwECFAAUAAAACACgazdORPmEqkMAAABUAAAAHAAAAAAAAAABACAAAABpAAAAbGljZW5zZXMvYW5kcm9pZC1zZGstbGljZW5zZVBLAQIUABQAAAAAAMVeN06RAmOwKgAAACoAAAAkAAAAAAAAAAEAIAAAAOYAAABsaWNlbnNlcy9hbmRyb2lkLXNkay1wcmV2aWV3LWxpY2Vuc2VQSwECFAAUAAAAAADMXjdOk6vQKCoAAAAqAAAAGwAAAAAAAAABACAAAABSAQAAbGljZW5zZXMvZ29vZ2xlLWdkay1saWNlbnNlUEsBAhQAFAAAAAAAz143TqxN4xEqAAAAKgAAACQAAAAAAAAAAQAgAAAAtQEAAGxpY2Vuc2VzL2ludGVsLWFuZHJvaWQtZXh0cmEtbGljZW5zZVBLAQIUABQAAAAAANJeN07tnnv/KgAAACoAAAAmAAAAAAAAAAEAIAAAACECAABsaWNlbnNlcy9taXBzLWFuZHJvaWQtc3lzaW1hZ2UtbGljZW5zZVBLBQYAAAAABgAGANoBAACPAgAAAAA=" -$content = [System.Convert]::FromBase64String($base64Content) -Set-Content -Path .\android-sdk-licenses.zip -Value $content -Encoding Byte -$sdkInstallRoot = "C:\Program Files (x86)\Android\android-sdk" -$sdkRoot = "C:\Android\android-sdk" -Expand-Archive -Path .\android-sdk-licenses.zip -DestinationPath $sdkInstallRoot -Force -New-Item -Path "C:\Android" -ItemType Directory -New-Item -Path "$sdkRoot" -ItemType SymbolicLink -Value "$sdkInstallRoot" - -# run the updates. -# keep newer versions in descending order - -# Get android content from toolset -$androidToolset = (Get-ToolsetContent).android -$sdkManager = "$sdkRoot\tools\bin\sdkmanager.bat" - -& $sdkManager --sdk_root=$sdkRoot "platform-tools" - -# get packages info -$androidPackages = Get-AndroidPackages -AndroidSDKManagerPath $sdkManager - -# platforms -[int]$platformMinVersion = $androidToolset.platform_min_version -$platformListByVersion = Get-AndroidPackagesByVersion -AndroidPackages $androidPackages ` - -PrefixPackageName "platforms;" ` - -MinimumVersion $platformMinVersion ` - -Delimiter "-" ` - -Index 1 -$platformListByName = Get-AndroidPackagesByName -AndroidPackages $androidPackages ` - -PrefixPackageName "platforms;" | Where-Object {$_ -match "-\D+$"} -$platformList = $platformListByVersion + $platformListByName - -# build-tools -[version]$buildToolsMinVersion = $androidToolset.build_tools_min_version -$buildToolsList = Get-AndroidPackagesByVersion -AndroidPackages $androidPackages ` - -PrefixPackageName "build-tools;" ` - -MinimumVersion $buildToolsMinVersion ` - -Delimiter ";" ` - -Index 1 - -Install-AndroidSDKPackages -AndroidSDKManagerPath $sdkManager ` - -AndroidSDKRootPath $sdkRoot ` - -AndroidPackages $platformList - -Install-AndroidSDKPackages -AndroidSDKManagerPath $sdkManager ` - -AndroidSDKRootPath $sdkRoot ` - -AndroidPackages $buildToolsList - -Install-AndroidSDKPackages -AndroidSDKManagerPath $sdkManager ` - -AndroidSDKRootPath $sdkRoot ` - -AndroidPackages $androidToolset.extra_list ` - -PrefixPackageName "extras;" - -Install-AndroidSDKPackages -AndroidSDKManagerPath $sdkManager ` - -AndroidSDKRootPath $sdkRoot ` - -AndroidPackages $androidToolset.addon_list ` - -PrefixPackageName "add-ons;" - -Install-AndroidSDKPackages -AndroidSDKManagerPath $sdkManager ` - -AndroidSDKRootPath $sdkRoot ` - -AndroidPackages $androidToolset.additional_tools - -# NDKs -$ndkLTSMajorVersion = $androidToolset.ndk.lts -$ndkLatestMajorVersion = $androidToolset.ndk.latest - -$ndkLTSPackageName = Get-AndroidPackagesByName -AndroidPackages $androidPackages ` - -PrefixPackageName "ndk;$ndkLTSMajorVersion" ` - | Sort-Object -Unique ` - | Select-Object -Last 1 - -$ndkLatestPackageName = Get-AndroidPackagesByName -AndroidPackages $androidPackages ` - -PrefixPackageName "ndk;$ndkLatestMajorVersion" ` - | Sort-Object -Unique ` - | Select-Object -Last 1 - -$androidNDKs = @($ndkLTSPackageName, $ndkLatestPackageName) - - -Install-AndroidSDKPackages -AndroidSDKManagerPath $sdkManager ` - -AndroidSDKRootPath $sdkRoot ` - -AndroidPackages $androidNDKs - -$ndkLTSVersion = $ndkLTSPackageName.Split(';')[1] -$ndkLatestVersion = $ndkLatestPackageName.Split(';')[1] - -# Android NDK root path. -$ndkRoot = "$sdkRoot\ndk-bundle" -# This changes were added due to incompatibility with android ndk-bundle (ndk;22.0.7026061). -# Link issue virtual-environments: https://github.com/actions/virtual-environments/issues/2481 -# Link issue xamarin-android: https://github.com/xamarin/xamarin-android/issues/5526 -New-Item -Path $ndkRoot -ItemType SymbolicLink -Value "$sdkRoot\ndk\$ndkLTSVersion" - -if (Test-Path $ndkRoot) { - setx ANDROID_HOME $sdkRoot /M - setx ANDROID_SDK_ROOT $sdkRoot /M - setx ANDROID_NDK_HOME $ndkRoot /M - setx ANDROID_NDK_PATH $ndkRoot /M - setx ANDROID_NDK_ROOT $ndkRoot /M - (Get-Content -Encoding UTF8 "${ndkRoot}\ndk-build.cmd").replace('%~dp0\build\ndk-build.cmd','"%~dp0\build\ndk-build.cmd"')|Set-Content -Encoding UTF8 "${ndkRoot}\ndk-build.cmd" -} else { - Write-Host "LTS NDK $ndkLTSVersion is not installed at path $ndkRoot" - exit 1 -} - -$ndkLatestPath = "$sdkRoot\ndk\$ndkLatestVersion" -if (Test-Path $ndkLatestPath) { - setx ANDROID_NDK_LATEST_HOME $ndkLatestPath /M -} else { - Write-Host "Latest NDK $ndkLatestVersion is not installed at path $ndkLatestPath" - exit 1 -} - -Invoke-PesterTests -TestFile "Android" diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Android.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Android.psm1 index bc1ad0be79d9..2183a1011c2a 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Android.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Android.psm1 @@ -16,21 +16,13 @@ function Get-AndroidSDKRoot { } function Get-AndroidSDKManagerPath { - return Join-Path $env:ANDROID_HOME "tools\bin\sdkmanager.bat" + return Join-Path $env:ANDROID_HOME "cmdline-tools\latest\bin\sdkmanager.bat" } function Get-AndroidInstalledPackages { $androidSDKManagerPath = Get-AndroidSDKManagerPath - $androidSDKManagerList = & $androidSDKManagerPath --list --include_obsolete - $androidInstalledPackages = @() - foreach($packageInfo in $androidSDKManagerList) { - if($packageInfo -Match "Available Packages:") { - break - } - - $androidInstalledPackages += $packageInfo - } - return $androidInstalledPackages + $androidSDKManagerList = & $androidSDKManagerPath --list_installed + return $androidSDKManagerList } function Build-AndroidTable { @@ -38,7 +30,7 @@ function Build-AndroidTable { return @( @{ "Package" = "Android Command Line Tools" - "Version" = Get-AndroidPackageVersions -PackageInfo $packageInfo -MatchedString "Android SDK Command-line Tools" + "Version" = Get-AndroidCommandLineToolsVersion }, @{ "Package" = "Android Emulator" @@ -127,6 +119,13 @@ function Get-AndroidPlatformVersions { return ($versions -Join "
") } +function Get-AndroidCommandLineToolsVersion { + $commandLineTools = Get-AndroidSDKManagerPath + (& $commandLineTools --version | Out-String).Trim() -match "(?^(\d+\.){1,}\d+$)" | Out-Null + $commandLineToolsVersion = $Matches.Version + return $commandLineToolsVersion +} + function Get-AndroidBuildToolVersions { param ( [Parameter(Mandatory)] diff --git a/images/win/scripts/Tests/Android.Tests.ps1 b/images/win/scripts/Tests/Android.Tests.ps1 index 3a56c0396408..40af8c4559fa 100644 --- a/images/win/scripts/Tests/Android.Tests.ps1 +++ b/images/win/scripts/Tests/Android.Tests.ps1 @@ -51,33 +51,52 @@ Describe "Android SDK" { $additionalToolsTestCases += @{ additionalToolVersion = $_; installedPackages = $androidInstalledPackages } } - It "Platform version is installed" -TestCases $platformTestCases { - "$installedPackages" | Should -Match "$platformVersion" - } + Context "SDKManagers" { + $testCases = @( + @{ + PackageName = "SDK tools" + Sdkmanager = "$env:ANDROID_HOME\tools\bin\sdkmanager.bat" + }, + @{ + PackageName = "Command-line tools" + Sdkmanager = "$env:ANDROID_HOME\cmdline-tools\latest\bin\sdkmanager.bat" + } + ) - It "Platform build tools is installed" -TestCases $buildToolsTestCases { - "$installedPackages" | Should -Match "$buildToolsVersion" + It "Sdkmanager from is available" -TestCases $testCases { + "$Sdkmanager --list" | Should -ReturnZeroExitCode + } } - if (Test-IsWin19) { - It "Extra package is installed" -TestCases $extraPackagesTestCases { - "$installedPackages" | Should -Match "extras;$extraPackage" + Context "Packages" { + It "Platform version is installed" -TestCases $platformTestCases { + "$installedPackages" | Should -Match "$platformVersion" } - It "Addon package is installed" -TestCases $addonsTestCases { - "$installedPackages" | Should -Match "add-ons;$addonPackage" + It "Platform build tools is installed" -TestCases $buildToolsTestCases { + "$installedPackages" | Should -Match "$buildToolsVersion" } - } - It "Additional tool is installed" -TestCases $additionalToolsTestCases { - "$installedPackages" | Should -Match $additionalToolVersion - } + if (Test-IsWin19) { + It "Extra package is installed" -TestCases $extraPackagesTestCases { + "$installedPackages" | Should -Match "extras;$extraPackage" + } - It "LTS NDK is installed" -TestCases @(@{ ndkLTSVersion = $ndkLTSMajorVersion; installedPackages = $androidInstalledPackages }) { - "$installedPackages" | Should -Match "ndk;$ndkLTSVersion" - } + It "Addon package is installed" -TestCases $addonsTestCases { + "$installedPackages" | Should -Match "add-ons;$addonPackage" + } + } - It "Latest NDK is installed" -TestCases @(@{ ndkLatestVersion = $ndkLatestMajorVersion; installedPackages = $androidInstalledPackages }) { - "$installedPackages" | Should -Match "ndk;$ndkLatestVersion" + It "Additional tool is installed" -TestCases $additionalToolsTestCases { + "$installedPackages" | Should -Match $additionalToolVersion + } + + It "LTS NDK is installed" -TestCases @(@{ ndkLTSVersion = $ndkLTSMajorVersion; installedPackages = $androidInstalledPackages }) { + "$installedPackages" | Should -Match "ndk;$ndkLTSVersion" + } + + It "Latest NDK is installed" -TestCases @(@{ ndkLatestVersion = $ndkLatestMajorVersion; installedPackages = $androidInstalledPackages }) { + "$installedPackages" | Should -Match "ndk;$ndkLatestVersion" + } } } diff --git a/images/win/toolsets/toolset-2016.json b/images/win/toolsets/toolset-2016.json index 4c36f261de4c..d09291525ecd 100644 --- a/images/win/toolsets/toolset-2016.json +++ b/images/win/toolsets/toolset-2016.json @@ -165,8 +165,7 @@ "additional_tools": [ "cmake;3.10.2.4988404", "cmake;3.18.1", - "patcher;v4", - "cmdline-tools;latest" + "patcher;v4" ], "ndk": { "lts": "21", diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index 5a43d7259dbe..a409a24ea1c4 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -165,8 +165,7 @@ "additional_tools": [ "cmake;3.10.2.4988404", "cmake;3.18.1", - "patcher;v4", - "cmdline-tools;latest" + "patcher;v4" ], "ndk": { "lts": "21", diff --git a/images/win/windows2016.json b/images/win/windows2016.json index b492cd7360e2..b61fefa843b6 100644 --- a/images/win/windows2016.json +++ b/images/win/windows2016.json @@ -230,7 +230,7 @@ "{{ template_dir }}/scripts/Installers/Install-PyPy.ps1", "{{ template_dir }}/scripts/Installers/Install-Toolset.ps1", "{{ template_dir }}/scripts/Installers/Configure-Toolset.ps1", - "{{ template_dir }}/scripts/Installers/Update-AndroidSDK.ps1", + "{{ template_dir }}/scripts/Installers/Install-AndroidSDK.ps1", "{{ template_dir }}/scripts/Installers/Install-Pipx.ps1", "{{ template_dir }}/scripts/Installers/Install-PipxPackages.ps1" ] diff --git a/images/win/windows2019.json b/images/win/windows2019.json index 6b1de8d1129a..5bec04255de5 100644 --- a/images/win/windows2019.json +++ b/images/win/windows2019.json @@ -233,7 +233,7 @@ "{{ template_dir }}/scripts/Installers/Install-PyPy.ps1", "{{ template_dir }}/scripts/Installers/Install-Toolset.ps1", "{{ template_dir }}/scripts/Installers/Configure-Toolset.ps1", - "{{ template_dir }}/scripts/Installers/Update-AndroidSDK.ps1", + "{{ template_dir }}/scripts/Installers/Install-AndroidSDK.ps1", "{{ template_dir }}/scripts/Installers/Install-AzureModules.ps1", "{{ template_dir }}/scripts/Installers/Install-Pipx.ps1", "{{ template_dir }}/scripts/Installers/Install-PipxPackages.ps1" From f1ab1bd12f5ef0704fde4d7944c09fecd026a564 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Wed, 7 Jul 2021 15:16:46 +0300 Subject: [PATCH 0366/3485] [Ubuntu] Switch android tools installation to use sdkmanager from command-line tools (#3650) * Switch android tools installation to cmdline-tools * Replace deprecated sdkmanger from sdk-tools to the one from cmdline tools * Remove patcherv4 from toolsets as it's included in m2repository extras * Add tests to make sure both sdkmanagers exist * Return cmdline-tools to software readme * Get-AndroidInstalledPackages function now use list_installed param * Create a function to get sdkmanager version = cmdline tools version * Get rid of hardcoded path to ANDROID_HOME * Add reloadEtcEnvironment call to installation script * Use env variable ANDROID_HOME in tests * Modify software report to output any version * Change regex pattern to output the group * Currently the function returns 4. instead of 4.0, this change fixes it --- .../SoftwareReport.Android.psm1 | 23 +++++++-------- .../linux/scripts/helpers/Common.Helpers.psm1 | 2 +- images/linux/scripts/installers/android.sh | 29 ++++++++++--------- images/linux/scripts/tests/Android.Tests.ps1 | 21 ++++++++++++-- images/linux/toolsets/toolset-1604.json | 4 +-- images/linux/toolsets/toolset-1804.json | 4 +-- images/linux/toolsets/toolset-2004.json | 4 +-- 7 files changed, 49 insertions(+), 38 deletions(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Android.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Android.psm1 index 287cca728044..3a0e6b2f2f48 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Android.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Android.psm1 @@ -11,21 +11,13 @@ function Get-AndroidSDKRoot { function Get-AndroidSDKManagerPath { $androidSDKDir = Get-AndroidSDKRoot - return Join-Path $androidSDKDir "tools" "bin" "sdkmanager" + return Join-Path $androidSDKDir "cmdline-tools" "latest" "bin" "sdkmanager" } function Get-AndroidInstalledPackages { $androidSDKManagerPath = Get-AndroidSDKManagerPath - $androidSDKManagerList = Invoke-Expression "$androidSDKManagerPath --list --include_obsolete" - $androidInstalledPackages = @() - foreach($packageInfo in $androidSDKManagerList) { - if($packageInfo -Match "Available Packages:") { - break - } - - $androidInstalledPackages += $packageInfo - } - return $androidInstalledPackages + $androidSDKManagerList = Invoke-Expression "$androidSDKManagerPath --list_installed --include_obsolete" + return $androidSDKManagerList } @@ -34,7 +26,7 @@ function Build-AndroidTable { return @( @{ "Package" = "Android Command Line Tools" - "Version" = Get-AndroidPackageVersions -PackageInfo $packageInfo -MatchedString "Android SDK Command-line Tools" + "Version" = Get-AndroidCommandLineToolsVersion }, @{ "Package" = "Android Emulator" @@ -123,6 +115,13 @@ function Get-AndroidPlatformVersions { return ($versions -Join "
") } +function Get-AndroidCommandLineToolsVersion { + $commandLineTools = Get-AndroidSDKManagerPath + (& $commandLineTools --version | Out-String).Trim() -match "(?^(\d+\.){1,}\d+$)" | Out-Null + $commandLineToolsVersion = $Matches.Version + return $commandLineToolsVersion +} + function Get-AndroidBuildToolVersions { param ( [Parameter(Mandatory)] diff --git a/images/linux/scripts/helpers/Common.Helpers.psm1 b/images/linux/scripts/helpers/Common.Helpers.psm1 index 04a79c46c18a..5dd17c60dc32 100644 --- a/images/linux/scripts/helpers/Common.Helpers.psm1 +++ b/images/linux/scripts/helpers/Common.Helpers.psm1 @@ -56,7 +56,7 @@ function Get-ToolsetValue { } function Get-AndroidPackages { - $androidSDKManagerPath = "/usr/local/lib/android/sdk/tools/bin/sdkmanager" + $androidSDKManagerPath = "/usr/local/lib/android/sdk/cmdline-tools/latest/bin/sdkmanager" $androidPackages = & $androidSDKManagerPath --list --verbose return $androidPackages } diff --git a/images/linux/scripts/installers/android.sh b/images/linux/scripts/installers/android.sh index af2a218ce0a5..7e0c547c04c4 100644 --- a/images/linux/scripts/installers/android.sh +++ b/images/linux/scripts/installers/android.sh @@ -7,6 +7,7 @@ # Source the helpers for use with the script source $HELPER_SCRIPTS/os.sh source $HELPER_SCRIPTS/install.sh +source $HELPER_SCRIPTS/etc-environment.sh function filter_components_by_version { minimumVersion=$1 @@ -26,9 +27,7 @@ function filter_components_by_version { function get_full_ndk_version { majorVersion=$1 - ndkFullVersion=$($SDKMANAGER --list | grep "ndk;${majorVersion}.*" | awk '{gsub("ndk;", ""); print $1}' | sort -V | tail -n1) - echo "$ndkFullVersion" } @@ -36,7 +35,7 @@ function get_full_ndk_version { ANDROID_ROOT=/usr/local/lib/android ANDROID_SDK_ROOT=${ANDROID_ROOT}/sdk ANDROID_NDK_ROOT=${ANDROID_SDK_ROOT}/ndk-bundle -SDKMANAGER=${ANDROID_SDK_ROOT}/tools/bin/sdkmanager +SDKMANAGER=${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager echo "ANDROID_SDK_ROOT=${ANDROID_SDK_ROOT}" | tee -a /etc/environment # ANDROID_HOME is deprecated, but older versions of Gradle rely on it @@ -51,14 +50,12 @@ mkdir -p ${ANDROID_SDK_ROOT} # Download the latest command line tools so that we can accept all of the licenses. # See https://developer.android.com/studio/#command-tools -download_with_retries https://dl.google.com/android/repository/sdk-tools-linux-4333796.zip "." android-sdk.zip -unzip -qq android-sdk.zip -d ${ANDROID_SDK_ROOT} -rm -f android-sdk.zip - -if isUbuntu20 ; then - # Sdk manager doesn't work with Java > 8, set version 8 explicitly - sed -i "2i export JAVA_HOME=${JAVA_HOME_8_X64}" "$SDKMANAGER" -fi +cmdlineTools="android-cmdline-tools.zip" +download_with_retries https://dl.google.com/android/repository/commandlinetools-linux-7302050_latest.zip "." $cmdlineTools +unzip -qq $cmdlineTools -d ${ANDROID_SDK_ROOT}/cmdline-tools +# Command line tools need to be placed in ${ANDROID_SDK_ROOT}/sdk/cmdline-tools/latest to determine SDK root +mv ${ANDROID_SDK_ROOT}/cmdline-tools/cmdline-tools ${ANDROID_SDK_ROOT}/cmdline-tools/latest +rm -f $cmdlineTools # Check sdk manager installation ${SDKMANAGER} --list 1>/dev/null @@ -79,9 +76,9 @@ ANDROID_NDK_MAJOR_LTS=($(get_toolset_value '.android.ndk.lts')) ndkLTSFullVersion=$(get_full_ndk_version $ANDROID_NDK_MAJOR_LTS) components=("${extras[@]}" "${addons[@]}" "${additional[@]}" "ndk;$ndkLTSFullVersion") -if isUbuntu20 ; then +if isUbuntu20; then ANDROID_NDK_MAJOR_LATEST=($(get_toolset_value '.android.ndk.latest')) - ndkLatestFullVersion=$(get_full_ndk_version $ANDROID_NDK_MAJOR_LATEST) + ndkLatestFullVersion=$(get_full_ndk_version $ANDROID_NDK_MAJOR_LATEST) components+=("ndk;$ndkLatestFullVersion") fi @@ -103,7 +100,13 @@ filter_components_by_version $minimumBuildToolVersion "${availableBuildTools[@]} echo "y" | $SDKMANAGER ${components[@]} +# Old skdmanager from sdk tools doesn't work with Java > 8, set version 8 explicitly +if isUbuntu20; then + sed -i "2i export JAVA_HOME=${JAVA_HOME_8_X64}" ${ANDROID_SDK_ROOT}/tools/bin/sdkmanager +fi + # Add required permissions chmod -R a+rwx ${ANDROID_SDK_ROOT} +reloadEtcEnvironment invoke_tests "Android" diff --git a/images/linux/scripts/tests/Android.Tests.ps1 b/images/linux/scripts/tests/Android.Tests.ps1 index 0069c9e1c914..11b18d1221c7 100644 --- a/images/linux/scripts/tests/Android.Tests.ps1 +++ b/images/linux/scripts/tests/Android.Tests.ps1 @@ -32,8 +32,6 @@ Describe "Android" { $androidPackages = $androidPackages | ForEach-Object { $_ } BeforeAll { - $ANDROID_SDK_DIR = "/usr/local/lib/android/sdk" - function Validate-AndroidPackage { param ( [Parameter(Mandatory=$true)] @@ -45,11 +43,28 @@ Describe "Android" { # 'cmake;3.6.4111459' -> 'cmake/3.6.4111459' # 'patcher;v4' -> 'patcher/v4' $PackageName = $PackageName.Replace(";", "/") - $targetPath = Join-Path $ANDROID_SDK_DIR $PackageName + $targetPath = Join-Path $env:ANDROID_HOME $PackageName $targetPath | Should -Exist } } + Context "SDKManagers" { + $testCases = @( + @{ + PackageName = "SDK tools" + Sdkmanager = "$env:ANDROID_HOME/tools/bin/sdkmanager" + }, + @{ + PackageName = "Command-line tools" + Sdkmanager = "$env:ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager" + } + ) + + It "Sdkmanager from is available" -TestCases $testCases { + "$Sdkmanager --version" | Should -ReturnZeroExitCode + } + } + Context "Packages" { $testCases = $androidPackages | ForEach-Object { @{ PackageName = $_ } } diff --git a/images/linux/toolsets/toolset-1604.json b/images/linux/toolsets/toolset-1604.json index 90450b264174..613d04897cd4 100644 --- a/images/linux/toolsets/toolset-1604.json +++ b/images/linux/toolsets/toolset-1604.json @@ -96,9 +96,7 @@ "additional_tools": [ "cmake;3.10.2.4988404", "cmake;3.18.1", - "patcher;v4", - "platform-tools", - "cmdline-tools;latest" + "platform-tools" ], "ndk": { "lts": "21" diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index 174e2f9faf6d..90570f463492 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -92,9 +92,7 @@ "additional_tools": [ "cmake;3.10.2.4988404", "cmake;3.18.1", - "patcher;v4", - "platform-tools", - "cmdline-tools;latest" + "platform-tools" ], "ndk": { "lts": "21" diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index 8d4ef4c3d71b..7823e26f0d58 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -88,9 +88,7 @@ "additional_tools": [ "cmake;3.10.2.4988404", "cmake;3.18.1", - "patcher;v4", - "platform-tools", - "cmdline-tools;latest" + "platform-tools" ], "ndk": { "lts": "21", From e8381d7db3a011a744a9d76eebb6e044327cfdae Mon Sep 17 00:00:00 2001 From: Marcus Felling Date: Wed, 7 Jul 2021 09:10:31 -0500 Subject: [PATCH 0367/3485] [macOS] Adding Bicep CLI (#3655) * Add Bicep CLI * Correct regex for bicep version * Add Bicep CLI * use tap path for bicep brew install * use tap path for bicep brew install * use tap path for bicep brew install * Update bicep package name * Update bicep package name * Update bicep package name * Add install script in order to run homebrew tap * no need to reference utils.sh * Remove bicep from common packages * Add "CLI" to Bicep return statement Co-authored-by: Marcus Felling --- images/macos/provision/core/bicep.sh | 7 +++++++ images/macos/software-report/SoftwareReport.Common.psm1 | 5 +++++ images/macos/software-report/SoftwareReport.Generator.ps1 | 3 ++- images/macos/templates/macOS-10.14.json | 3 ++- images/macos/templates/macOS-10.15.json | 3 ++- images/macos/templates/macOS-11.json | 3 ++- images/macos/tests/Common.Tests.ps1 | 6 ++++++ 7 files changed, 26 insertions(+), 4 deletions(-) create mode 100644 images/macos/provision/core/bicep.sh diff --git a/images/macos/provision/core/bicep.sh b/images/macos/provision/core/bicep.sh new file mode 100644 index 000000000000..a2e7b5849331 --- /dev/null +++ b/images/macos/provision/core/bicep.sh @@ -0,0 +1,7 @@ +#!/bin/bash -e -o pipefail + +echo Installing bicep cli... +brew tap azure/bicep +brew install bicep + +invoke_tests "Common" "Bicep" diff --git a/images/macos/software-report/SoftwareReport.Common.psm1 b/images/macos/software-report/SoftwareReport.Common.psm1 index f94ef386554c..e85a47ec5ee1 100644 --- a/images/macos/software-report/SoftwareReport.Common.psm1 +++ b/images/macos/software-report/SoftwareReport.Common.psm1 @@ -502,6 +502,11 @@ function Get-SwigVersion { return "Swig $swigVersion" } +function Get-BicepVersion { + $bicepVersion = Run-Command "bicep --version" | Take-Part -Part 3 + return "Bicep CLI $bicepVersion" +} + function Build-PackageManagementEnvironmentTable { return @( @{ diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1 index b2eca6c3973a..13252fb3d59a 100644 --- a/images/macos/software-report/SoftwareReport.Generator.ps1 +++ b/images/macos/software-report/SoftwareReport.Generator.ps1 @@ -167,7 +167,8 @@ $toolsList = @( (Get-AWSSessionManagerCLIVersion), (Get-AliyunCLIVersion), (Get-XcodeCommandLineToolsVersion), - (Get-SwigVersion) + (Get-SwigVersion), + (Get-BicepVersion) ) if( -not $os.IsHighSierra) { diff --git a/images/macos/templates/macOS-10.14.json b/images/macos/templates/macOS-10.14.json index 35c04d76d9e9..a0fd28278693 100644 --- a/images/macos/templates/macOS-10.14.json +++ b/images/macos/templates/macOS-10.14.json @@ -183,7 +183,8 @@ "./provision/core/xcode-sims.sh", "./provision/core/xcode-postbuild.sh", "./provision/core/pypy.sh", - "./provision/core/pipx-packages.sh" + "./provision/core/pipx-packages.sh", + "./provision/core/bicep.sh" ] }, { diff --git a/images/macos/templates/macOS-10.15.json b/images/macos/templates/macOS-10.15.json index 92b2f36c61a7..eeb578d1e292 100644 --- a/images/macos/templates/macOS-10.15.json +++ b/images/macos/templates/macOS-10.15.json @@ -186,7 +186,8 @@ "./provision/core/firefox.sh", "./provision/core/xcode-postbuild.sh", "./provision/core/pypy.sh", - "./provision/core/pipx-packages.sh" + "./provision/core/pipx-packages.sh", + "./provision/core/bicep.sh" ] }, { diff --git a/images/macos/templates/macOS-11.json b/images/macos/templates/macOS-11.json index f8661baa1ebf..cf8bcbc9812d 100644 --- a/images/macos/templates/macOS-11.json +++ b/images/macos/templates/macOS-11.json @@ -189,7 +189,8 @@ "./provision/core/edge.sh", "./provision/core/firefox.sh", "./provision/core/pypy.sh", - "./provision/core/pipx-packages.sh" + "./provision/core/pipx-packages.sh", + "./provision/core/bicep.sh" ] }, { diff --git a/images/macos/tests/Common.Tests.ps1 b/images/macos/tests/Common.Tests.ps1 index 79f47bb3654c..0c2366a1b7f9 100644 --- a/images/macos/tests/Common.Tests.ps1 +++ b/images/macos/tests/Common.Tests.ps1 @@ -92,3 +92,9 @@ Describe "Swig" { "swig -version" | Should -ReturnZeroExitCode } } + +Describe "Bicep" { + It "Bicep" { + "bicep --version" | Should -ReturnZeroExitCode + } +} \ No newline at end of file From 8a77fdb2a1dd14a0ac790fccd8815125c4a9560b Mon Sep 17 00:00:00 2001 From: Nikita Bykov <49442273+nikita-bykov@users.noreply.github.com> Date: Thu, 8 Jul 2021 06:23:07 -0700 Subject: [PATCH 0368/3485] [Windows] Move choco installation list into toolset (#3688) * Move choco installation list into toolset * Add a condition to Install-CommonUtils.ps1 * Rename tests and revert Bazel to single script * Return Install-Bazel.ps1 to windows2016.json and windows2019.json * Remove condition and Write-Host command from Install-CommonUtils.ps1 * Reset Install-Bazel.ps1 to be the same as in main * Update choco.common_packages in toolset-2016.json and toolset-2019.json Co-authored-by: Nikita Bykov --- .../win/scripts/Installers/Install-7zip.ps1 | 8 -- .../win/scripts/Installers/Install-AzCopy.ps1 | 8 -- .../win/scripts/Installers/Install-Bicep.ps1 | 8 -- .../win/scripts/Installers/Install-Cmake.ps1 | 8 -- .../Installers/Install-CommonUtils.ps1 | 8 ++ .../scripts/Installers/Install-GitVersion.ps1 | 8 -- .../scripts/Installers/Install-InnoSetup.ps1 | 8 -- images/win/scripts/Installers/Install-Jq.ps1 | 8 -- .../win/scripts/Installers/Install-Julia.ps1 | 8 -- .../win/scripts/Installers/Install-Nuget.ps1 | 8 -- .../scripts/Installers/Install-OpenSSL.ps1 | 8 -- .../win/scripts/Installers/Install-Packer.ps1 | 8 -- .../win/scripts/Installers/Install-Perl.ps1 | 8 -- .../win/scripts/Installers/Install-Pulumi.ps1 | 8 -- images/win/scripts/Installers/Install-Svn.ps1 | 8 -- .../win/scripts/Installers/Install-Swig.ps1 | 8 -- .../scripts/Installers/Install-VSWhere.ps1 | 8 -- .../win/scripts/Tests/ChocoPackages.Tests.ps1 | 99 +++++++++++++++++++ images/win/scripts/Tests/Git.Tests.ps1 | 6 -- images/win/scripts/Tests/Tools.Tests.ps1 | 94 ------------------ images/win/toolsets/toolset-2016.json | 26 +++++ images/win/toolsets/toolset-2019.json | 26 +++++ images/win/windows2016.json | 19 +--- images/win/windows2019.json | 19 +--- 24 files changed, 163 insertions(+), 262 deletions(-) delete mode 100644 images/win/scripts/Installers/Install-7zip.ps1 delete mode 100644 images/win/scripts/Installers/Install-AzCopy.ps1 delete mode 100644 images/win/scripts/Installers/Install-Bicep.ps1 delete mode 100644 images/win/scripts/Installers/Install-Cmake.ps1 create mode 100644 images/win/scripts/Installers/Install-CommonUtils.ps1 delete mode 100644 images/win/scripts/Installers/Install-GitVersion.ps1 delete mode 100644 images/win/scripts/Installers/Install-InnoSetup.ps1 delete mode 100644 images/win/scripts/Installers/Install-Jq.ps1 delete mode 100644 images/win/scripts/Installers/Install-Julia.ps1 delete mode 100644 images/win/scripts/Installers/Install-Nuget.ps1 delete mode 100644 images/win/scripts/Installers/Install-OpenSSL.ps1 delete mode 100644 images/win/scripts/Installers/Install-Packer.ps1 delete mode 100644 images/win/scripts/Installers/Install-Perl.ps1 delete mode 100644 images/win/scripts/Installers/Install-Pulumi.ps1 delete mode 100644 images/win/scripts/Installers/Install-Svn.ps1 delete mode 100644 images/win/scripts/Installers/Install-Swig.ps1 delete mode 100644 images/win/scripts/Installers/Install-VSWhere.ps1 create mode 100644 images/win/scripts/Tests/ChocoPackages.Tests.ps1 diff --git a/images/win/scripts/Installers/Install-7zip.ps1 b/images/win/scripts/Installers/Install-7zip.ps1 deleted file mode 100644 index 9ad1e2045f53..000000000000 --- a/images/win/scripts/Installers/Install-7zip.ps1 +++ /dev/null @@ -1,8 +0,0 @@ -################################################################################ -## File: Install-7zip.ps1 -## Desc: Install 7zip -################################################################################ - -Choco-Install -PackageName 7zip.install - -Invoke-PesterTests -TestFile "Tools" -TestName "7-Zip" \ No newline at end of file diff --git a/images/win/scripts/Installers/Install-AzCopy.ps1 b/images/win/scripts/Installers/Install-AzCopy.ps1 deleted file mode 100644 index 7e2e5c1418f0..000000000000 --- a/images/win/scripts/Installers/Install-AzCopy.ps1 +++ /dev/null @@ -1,8 +0,0 @@ -################################################################################ -## File: Install-AzCopy.ps1 -## Desc: Install AzCopy10 -################################################################################ - -Choco-Install -PackageName azcopy10 - -Invoke-PesterTests -TestFile "Tools" -TestName "AzCopy" \ No newline at end of file diff --git a/images/win/scripts/Installers/Install-Bicep.ps1 b/images/win/scripts/Installers/Install-Bicep.ps1 deleted file mode 100644 index 21a66ce23b58..000000000000 --- a/images/win/scripts/Installers/Install-Bicep.ps1 +++ /dev/null @@ -1,8 +0,0 @@ -################################################################################ -## File: Install-Bicep.ps1 -## Desc: Install Bicep -################################################################################ - -Choco-Install -PackageName Bicep - -Invoke-PesterTests -TestFile "Tools" -TestName "Bicep" \ No newline at end of file diff --git a/images/win/scripts/Installers/Install-Cmake.ps1 b/images/win/scripts/Installers/Install-Cmake.ps1 deleted file mode 100644 index 8baa82e2a41a..000000000000 --- a/images/win/scripts/Installers/Install-Cmake.ps1 +++ /dev/null @@ -1,8 +0,0 @@ -################################################################################ -## File: Install-Cmake.ps1 -## Desc: Install Cmake -################################################################################ - -Choco-Install -PackageName cmake.install -ArgumentList "--installargs",'ADD_CMAKE_TO_PATH=""System""' - -Invoke-PesterTests -TestFile "Tools" -TestName "CMake" \ No newline at end of file diff --git a/images/win/scripts/Installers/Install-CommonUtils.ps1 b/images/win/scripts/Installers/Install-CommonUtils.ps1 new file mode 100644 index 000000000000..815d04f3ebdf --- /dev/null +++ b/images/win/scripts/Installers/Install-CommonUtils.ps1 @@ -0,0 +1,8 @@ +$commonPackages = (Get-ToolsetContent).choco.common_packages + +foreach ($package in $commonPackages) +{ + Choco-Install -PackageName $package.name -ArgumentList $package.args +} + +Invoke-PesterTests -TestFile "ChocoPackages" \ No newline at end of file diff --git a/images/win/scripts/Installers/Install-GitVersion.ps1 b/images/win/scripts/Installers/Install-GitVersion.ps1 deleted file mode 100644 index d59dd67ed222..000000000000 --- a/images/win/scripts/Installers/Install-GitVersion.ps1 +++ /dev/null @@ -1,8 +0,0 @@ -################################################################################ -## File: Install-GitVersion.ps1 -## Desc: Install GitVersion -################################################################################ - -Choco-Install -PackageName gitversion.portable - -Invoke-PesterTests -TestFile "Git" -TestName "GitVersion" diff --git a/images/win/scripts/Installers/Install-InnoSetup.ps1 b/images/win/scripts/Installers/Install-InnoSetup.ps1 deleted file mode 100644 index 0bbbc9250397..000000000000 --- a/images/win/scripts/Installers/Install-InnoSetup.ps1 +++ /dev/null @@ -1,8 +0,0 @@ -################################################################################ -## File: Install-InnoSetup.ps1 -## Desc: Install Inno Setup -################################################################################ - -Choco-Install -PackageName innosetup - -Invoke-PesterTests -TestFile "Tools" -TestName "InnoSetup" \ No newline at end of file diff --git a/images/win/scripts/Installers/Install-Jq.ps1 b/images/win/scripts/Installers/Install-Jq.ps1 deleted file mode 100644 index 50a05a5fd549..000000000000 --- a/images/win/scripts/Installers/Install-Jq.ps1 +++ /dev/null @@ -1,8 +0,0 @@ -################################################################################ -## File: Install-Jq.ps1 -## Desc: Install jq -################################################################################ - -Choco-Install -PackageName jq - -Invoke-PesterTests -TestFile "Tools" -TestName "Jq" \ No newline at end of file diff --git a/images/win/scripts/Installers/Install-Julia.ps1 b/images/win/scripts/Installers/Install-Julia.ps1 deleted file mode 100644 index c4432101280a..000000000000 --- a/images/win/scripts/Installers/Install-Julia.ps1 +++ /dev/null @@ -1,8 +0,0 @@ -################################################################################ -## File: Install-Julia.ps1 -## Desc: Install Julia -################################################################################ - -Choco-Install -PackageName julia -ArgumentList "--ia","/DIR=C:\Julia" - -Invoke-PesterTests -TestFile "Tools" -TestName "Julia" \ No newline at end of file diff --git a/images/win/scripts/Installers/Install-Nuget.ps1 b/images/win/scripts/Installers/Install-Nuget.ps1 deleted file mode 100644 index fe10961d4d23..000000000000 --- a/images/win/scripts/Installers/Install-Nuget.ps1 +++ /dev/null @@ -1,8 +0,0 @@ -################################################################################ -## File: Install-Nuget.ps1 -## Desc: Install NuGet.CommandLine -################################################################################ - -Choco-Install -PackageName NuGet.CommandLine - -Invoke-PesterTests -TestFile "Tools" -TestName "Nuget" \ No newline at end of file diff --git a/images/win/scripts/Installers/Install-OpenSSL.ps1 b/images/win/scripts/Installers/Install-OpenSSL.ps1 deleted file mode 100644 index 77965ccb6942..000000000000 --- a/images/win/scripts/Installers/Install-OpenSSL.ps1 +++ /dev/null @@ -1,8 +0,0 @@ -################################################################################ -## File: Install-OpenSSL.ps1 -## Desc: Install OpenSSL -################################################################################ - -Choco-Install -PackageName openssl.light - -Invoke-PesterTests -TestFile "Tools" -TestName "OpenSSL" \ No newline at end of file diff --git a/images/win/scripts/Installers/Install-Packer.ps1 b/images/win/scripts/Installers/Install-Packer.ps1 deleted file mode 100644 index 7b39e7271902..000000000000 --- a/images/win/scripts/Installers/Install-Packer.ps1 +++ /dev/null @@ -1,8 +0,0 @@ -################################################################################ -## File: Install-Packer.ps1 -## Desc: Install Packer -################################################################################ - -Choco-Install -PackageName packer - -Invoke-PesterTests -TestFile "Tools" -TestName "Packer" \ No newline at end of file diff --git a/images/win/scripts/Installers/Install-Perl.ps1 b/images/win/scripts/Installers/Install-Perl.ps1 deleted file mode 100644 index fb831bf00419..000000000000 --- a/images/win/scripts/Installers/Install-Perl.ps1 +++ /dev/null @@ -1,8 +0,0 @@ -################################################################################ -## File: Install-Perl.ps1 -## Desc: Install Perl -################################################################################ - -Choco-Install -PackageName strawberryperl - -Invoke-PesterTests -TestFile "Tools" -TestName "Perl" \ No newline at end of file diff --git a/images/win/scripts/Installers/Install-Pulumi.ps1 b/images/win/scripts/Installers/Install-Pulumi.ps1 deleted file mode 100644 index 5ba1851f14cd..000000000000 --- a/images/win/scripts/Installers/Install-Pulumi.ps1 +++ /dev/null @@ -1,8 +0,0 @@ -################################################################################ -## File: Install-Pulumi.ps1 -## Desc: Install Pulumi -################################################################################ - -Choco-Install -PackageName pulumi - -Invoke-PesterTests -TestFile "Tools" -TestName "Pulumi" \ No newline at end of file diff --git a/images/win/scripts/Installers/Install-Svn.ps1 b/images/win/scripts/Installers/Install-Svn.ps1 deleted file mode 100644 index 3f939bf6506d..000000000000 --- a/images/win/scripts/Installers/Install-Svn.ps1 +++ /dev/null @@ -1,8 +0,0 @@ -################################################################################ -## File: Install-Svn.ps1 -## Desc: Install Subversion -################################################################################ - -Choco-Install -PackageName tortoisesvn - -Invoke-PesterTests -TestFile "Tools" -TestName "Svn" diff --git a/images/win/scripts/Installers/Install-Swig.ps1 b/images/win/scripts/Installers/Install-Swig.ps1 deleted file mode 100644 index 92cdd576aff7..000000000000 --- a/images/win/scripts/Installers/Install-Swig.ps1 +++ /dev/null @@ -1,8 +0,0 @@ -################################################################################ -## File: Install-Swig.ps1 -## Desc: Install Swig -################################################################################ - -Choco-Install -PackageName swig - -Invoke-PesterTests -TestFile "Tools" -TestName "Swig" diff --git a/images/win/scripts/Installers/Install-VSWhere.ps1 b/images/win/scripts/Installers/Install-VSWhere.ps1 deleted file mode 100644 index 641adedb8b92..000000000000 --- a/images/win/scripts/Installers/Install-VSWhere.ps1 +++ /dev/null @@ -1,8 +0,0 @@ -################################################################################ -## File: Install-VSWhere.ps1 -## Desc: Install latest stable version of VSWhere -################################################################################ - -Choco-Install -PackageName vswhere - -Invoke-PesterTests -TestFile "Tools" -TestName "VSWhere" diff --git a/images/win/scripts/Tests/ChocoPackages.Tests.ps1 b/images/win/scripts/Tests/ChocoPackages.Tests.ps1 new file mode 100644 index 000000000000..ce90ac79eb5e --- /dev/null +++ b/images/win/scripts/Tests/ChocoPackages.Tests.ps1 @@ -0,0 +1,99 @@ +Describe "7-Zip" { + It "7z" { + "7z" | Should -ReturnZeroExitCode + } +} + +Describe "AzCopy" { + It "AzCopy" { + "azcopy --version" | Should -ReturnZeroExitCode + } +} + +Describe "Bicep" { + It "Bicep" { + "bicep --version" | Should -ReturnZeroExitCode + } +} + +Describe "GitVersion" { + It "gitversion is installed" { + "gitversion /version" | Should -ReturnZeroExitCode + } +} + +Describe "InnoSetup" { + It "InnoSetup" { + (Get-Command -Name iscc).CommandType | Should -BeExactly "Application" + } +} + +Describe "Jq" { + It "Jq" { + "jq -n ." | Should -ReturnZeroExitCode + } +} + +Describe "Nuget" { + It "Nuget" { + "nuget" | Should -ReturnZeroExitCode + } +} + +Describe "OpenSSL" { + It "OpenSSL" { + "openssl version" | Should -ReturnZeroExitCode + } +} + +Describe "Packer" { + It "Packer" { + "packer --version" | Should -ReturnZeroExitCode + } +} + +Describe "Perl" { + It "Perl" { + "perl --version" | Should -ReturnZeroExitCode + } +} + +Describe "Pulumi" { + It "pulumi" { + "pulumi version" | Should -ReturnZeroExitCode + } +} + +Describe "Svn" { + It "svn" { + "svn --version --quiet" | Should -ReturnZeroExitCode + } +} + +Describe "Swig" { + It "Swig" { + "swig -version" | Should -ReturnZeroExitCode + } +} + +Describe "VSWhere" { + It "vswhere" { + "vswhere" | Should -ReturnZeroExitCode + } +} + +Describe "Julia" { + It "Julia path exists" { + "C:\Julia" | Should -Exist + } + + It "Julia" { + "julia --version" | Should -ReturnZeroExitCode + } +} + +Describe "CMake" { + It "cmake" { + "cmake --version" | Should -ReturnZeroExitCode + } +} \ No newline at end of file diff --git a/images/win/scripts/Tests/Git.Tests.ps1 b/images/win/scripts/Tests/Git.Tests.ps1 index 8dd159fa434c..9b71aa0b806b 100644 --- a/images/win/scripts/Tests/Git.Tests.ps1 +++ b/images/win/scripts/Tests/Git.Tests.ps1 @@ -23,9 +23,3 @@ Describe "Git" { $env:GCM_INTERACTIVE | Should -BeExactly Never } } - -Describe "GitVersion" { - It "gitversion is installed" { - "gitversion /version" | Should -ReturnZeroExitCode - } -} \ No newline at end of file diff --git a/images/win/scripts/Tests/Tools.Tests.ps1 b/images/win/scripts/Tests/Tools.Tests.ps1 index 62f5846fa468..0827a4ccea34 100644 --- a/images/win/scripts/Tests/Tools.Tests.ps1 +++ b/images/win/scripts/Tests/Tools.Tests.ps1 @@ -1,17 +1,5 @@ Import-Module (Join-Path $PSScriptRoot "..\SoftwareReport\SoftwareReport.Common.psm1") -DisableNameChecking -Describe "7-Zip" { - It "7z" { - "7z" | Should -ReturnZeroExitCode - } -} - -Describe "AzCopy" { - It "AzCopy" { - "azcopy --version" | Should -ReturnZeroExitCode - } -} - Describe "Azure Cosmos DB Emulator" { $cosmosDbEmulatorRegKey = Get-ChildItem "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\*" | Get-ItemProperty | Where-Object { $_.DisplayName -eq 'Azure Cosmos DB Emulator' } $installDir = $cosmosDbEmulatorRegKey.InstallLocation @@ -35,18 +23,6 @@ Describe "Bazel" { } } -Describe "Bicep" { - It "Bicep" { - "bicep --version" | Should -ReturnZeroExitCode - } -} - -Describe "CMake" { - It "cmake" { - "cmake --version" | Should -ReturnZeroExitCode - } -} - Describe "CodeQLBundle" { It "CodeQLBundle" { $CodeQLVersionsWildcard = Join-Path $Env:AGENT_TOOLSDIRECTORY -ChildPath "codeql" | Join-Path -ChildPath "*" @@ -78,22 +54,6 @@ Describe "DotnetTLS" { } } -Describe "Jq" { - It "Jq" { - "jq -n ." | Should -ReturnZeroExitCode - } -} - -Describe "Julia" { - It "Julia path exists" { - "C:\Julia" | Should -Exist - } - - It "Julia" { - "julia --version" | Should -ReturnZeroExitCode - } -} - Describe "Mercurial" { It "Mercurial" { "hg --version" | Should -ReturnZeroExitCode @@ -128,12 +88,6 @@ Describe "Mingw64" { } } -Describe "InnoSetup" { - It "InnoSetup" { - (Get-Command -Name iscc).CommandType | Should -BeExactly "Application" - } -} - Describe "GoogleCloudSDK" { It "" -TestCases @( @{ ToolName = "bq" } @@ -157,30 +111,6 @@ Describe "NSIS" { } } -Describe "Nuget" { - It "Nuget" { - "nuget" | Should -ReturnZeroExitCode - } -} - -Describe "OpenSSL" { - It "OpenSSL" { - "openssl version" | Should -ReturnZeroExitCode - } -} - -Describe "Packer" { - It "Packer" { - "packer --version" | Should -ReturnZeroExitCode - } -} - -Describe "Perl" { - It "Perl" { - "perl --version" | Should -ReturnZeroExitCode - } -} - Describe "PowerShell Core" { It "pwsh" { "pwsh --version" | Should -ReturnZeroExitCode @@ -191,12 +121,6 @@ Describe "PowerShell Core" { } } -Describe "Pulumi" { - It "pulumi" { - "pulumi version" | Should -ReturnZeroExitCode - } -} - Describe "Sbt" { It "sbt" { "sbt --version" | Should -ReturnZeroExitCode @@ -209,12 +133,6 @@ Describe "ServiceFabricSDK" { } } -Describe "Svn" { - It "svn" { - "svn --version --quiet" | Should -ReturnZeroExitCode - } -} - Describe "Stack" { It "Stack" { "stack --version" | Should -ReturnZeroExitCode @@ -241,12 +159,6 @@ Describe "Vcpkg" { } } -Describe "VSWhere" { - It "vswhere" { - "vswhere" | Should -ReturnZeroExitCode - } -} - Describe "WebPlatformInstaller" { It "WebPlatformInstaller" { "WebPICMD" | Should -ReturnZeroExitCode @@ -264,9 +176,3 @@ Describe "Pipx" { "pipx --version" | Should -ReturnZeroExitCode } } - -Describe "Swig" { - It "Swig" { - "swig -version" | Should -ReturnZeroExitCode - } -} diff --git a/images/win/toolsets/toolset-2016.json b/images/win/toolsets/toolset-2016.json index d09291525ecd..21ae256ad8d8 100644 --- a/images/win/toolsets/toolset-2016.json +++ b/images/win/toolsets/toolset-2016.json @@ -345,5 +345,31 @@ "3.1", "5.0" ] + }, + "choco": { + "common_packages": [ + { "name": "7zip.install" }, + { "name": "azcopy10" }, + { "name": "Bicep" }, + { "name": "gitversion.portable" }, + { "name": "innosetup" }, + { "name": "jq" }, + { "name": "NuGet.CommandLine" }, + { "name": "openssl.light" }, + { "name": "packer" }, + { "name": "strawberryperl" }, + { "name": "pulumi" }, + { "name": "tortoisesvn" }, + { "name": "swig" }, + { "name": "vswhere" }, + { + "name": "julia", + "args": [ "--ia", "/DIR=C:\\Julia" ] + }, + { + "name": "cmake.install", + "args": [ "--installargs", "ADD_CMAKE_TO_PATH=\"System\"" ] + } + ] } } diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index a409a24ea1c4..b99ab73dbdc2 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -373,5 +373,31 @@ "3.1", "5.0" ] + }, + "choco": { + "common_packages": [ + { "name": "7zip.install" }, + { "name": "azcopy10" }, + { "name": "Bicep" }, + { "name": "gitversion.portable" }, + { "name": "innosetup" }, + { "name": "jq" }, + { "name": "NuGet.CommandLine" }, + { "name": "openssl.light" }, + { "name": "packer" }, + { "name": "strawberryperl" }, + { "name": "pulumi" }, + { "name": "tortoisesvn" }, + { "name": "swig" }, + { "name": "vswhere" }, + { + "name": "julia", + "args": [ "--ia", "/DIR=C:\\Julia" ] + }, + { + "name": "cmake.install", + "args": [ "--installargs", "ADD_CMAKE_TO_PATH=\"System\"" ] + } + ] } } diff --git a/images/win/windows2016.json b/images/win/windows2016.json index b61fefa843b6..aa2990783443 100644 --- a/images/win/windows2016.json +++ b/images/win/windows2016.json @@ -183,7 +183,6 @@ "TOOLSET_JSON_PATH={{user `toolset_json_path`}}" ], "scripts": [ - "{{ template_dir }}/scripts/Installers/Install-Nuget.ps1", "{{ template_dir }}/scripts/Installers/Install-Wix.ps1", "{{ template_dir }}/scripts/Installers/Install-WDK.ps1", "{{ template_dir }}/scripts/Installers/Install-Vsix.ps1" @@ -208,14 +207,11 @@ "scripts": [ "{{ template_dir }}/scripts/Installers/Install-AzureCli.ps1", "{{ template_dir }}/scripts/Installers/Install-AzureDevOpsCli.ps1", - "{{ template_dir }}/scripts/Installers/Install-AzCopy.ps1", "{{ template_dir }}/scripts/Installers/Install-NodeLts.ps1", "{{ template_dir }}/scripts/Installers/Install-Bazel.ps1", - "{{ template_dir }}/scripts/Installers/Install-7zip.ps1", + "{{ template_dir }}/scripts/Installers/Install-CommonUtils.ps1", "{{ template_dir }}/scripts/Installers/Install-AliyunCli.ps1", "{{ template_dir }}/scripts/Installers/Install-PostgreSQL.ps1", - "{{ template_dir }}/scripts/Installers/Install-Packer.ps1", - "{{ template_dir }}/scripts/Installers/Install-Pulumi.ps1", "{{ template_dir }}/scripts/Installers/Install-JavaTools.ps1" ] }, @@ -239,23 +235,17 @@ "type": "powershell", "scripts": [ "{{ template_dir }}/scripts/Installers/Install-Sbt.ps1", - "{{ template_dir }}/scripts/Installers/Install-OpenSSL.ps1", - "{{ template_dir }}/scripts/Installers/Install-Perl.ps1", "{{ template_dir }}/scripts/Installers/Install-Git.ps1", "{{ template_dir }}/scripts/Installers/Install-GitHub-CLI.ps1", "{{ template_dir }}/scripts/Installers/Install-PHP.ps1", "{{ template_dir }}/scripts/Installers/Install-Rust.ps1", - "{{ template_dir }}/scripts/Installers/Install-Julia.ps1", - "{{ template_dir }}/scripts/Installers/Install-Svn.ps1", "{{ template_dir }}/scripts/Installers/Install-Chrome.ps1", "{{ template_dir }}/scripts/Installers/Install-Edge.ps1", "{{ template_dir }}/scripts/Installers/Install-Firefox.ps1", "{{ template_dir }}/scripts/Installers/Install-Selenium.ps1", "{{ template_dir }}/scripts/Installers/Install-IEWebDriver.ps1", "{{ template_dir }}/scripts/Installers/Install-Apache.ps1", - "{{ template_dir }}/scripts/Installers/Install-Nginx.ps1", - "{{ template_dir }}/scripts/Installers/Install-Swig.ps1", - "{{ template_dir }}/scripts/Installers/Install-Bicep.ps1" + "{{ template_dir }}/scripts/Installers/Install-Nginx.ps1" ] }, { @@ -288,9 +278,7 @@ "TOOLSET_JSON_PATH={{user `toolset_json_path`}}" ], "scripts": [ - "{{ template_dir }}/scripts/Installers/Install-VSWhere.ps1", "{{ template_dir }}/scripts/Installers/Install-WinAppDriver.ps1", - "{{ template_dir }}/scripts/Installers/Install-Cmake.ps1", "{{ template_dir }}/scripts/Installers/Install-R.ps1", "{{ template_dir }}/scripts/Installers/Install-AWS.ps1", "{{ template_dir }}/scripts/Installers/Install-DACFx.ps1", @@ -318,10 +306,7 @@ "{{ template_dir }}/scripts/Installers/Install-Miniconda.ps1", "{{ template_dir }}/scripts/Installers/Install-AzureCosmosDbEmulator.ps1", "{{ template_dir }}/scripts/Installers/Install-Mercurial.ps1", - "{{ template_dir }}/scripts/Installers/Install-Jq.ps1", "{{ template_dir }}/scripts/Installers/Install-Zstd.ps1", - "{{ template_dir }}/scripts/Installers/Install-InnoSetup.ps1", - "{{ template_dir }}/scripts/Installers/Install-GitVersion.ps1", "{{ template_dir }}/scripts/Installers/Install-NSIS.ps1", "{{ template_dir }}/scripts/Installers/Install-CloudFoundryCli.ps1", "{{ template_dir }}/scripts/Installers/Install-Vcpkg.ps1", diff --git a/images/win/windows2019.json b/images/win/windows2019.json index 5bec04255de5..73963e6b6275 100644 --- a/images/win/windows2019.json +++ b/images/win/windows2019.json @@ -190,17 +190,13 @@ "TOOLSET_JSON_PATH={{user `toolset_json_path`}}" ], "scripts": [ - "{{ template_dir }}/scripts/Installers/Install-Nuget.ps1", "{{ template_dir }}/scripts/Installers/Install-Wix.ps1", "{{ template_dir }}/scripts/Installers/Install-WDK.ps1", "{{ template_dir }}/scripts/Installers/Install-Vsix.ps1", "{{ template_dir }}/scripts/Installers/Install-AzureCli.ps1", "{{ template_dir }}/scripts/Installers/Install-AzureDevOpsCli.ps1", - "{{ template_dir }}/scripts/Installers/Install-AzCopy.ps1", "{{ template_dir }}/scripts/Installers/Install-NodeLts.ps1", - "{{ template_dir }}/scripts/Installers/Install-7zip.ps1", - "{{ template_dir }}/scripts/Installers/Install-Packer.ps1", - "{{ template_dir }}/scripts/Installers/Install-Pulumi.ps1", + "{{ template_dir }}/scripts/Installers/Install-CommonUtils.ps1", "{{ template_dir }}/scripts/Installers/Install-JavaTools.ps1" ] }, @@ -242,24 +238,18 @@ { "type": "powershell", "scripts": [ - "{{ template_dir }}/scripts/Installers/Install-OpenSSL.ps1", - "{{ template_dir }}/scripts/Installers/Install-Perl.ps1", "{{ template_dir }}/scripts/Installers/Install-Git.ps1", "{{ template_dir }}/scripts/Installers/Install-GitHub-CLI.ps1", "{{ template_dir }}/scripts/Installers/Install-PHP.ps1", "{{ template_dir }}/scripts/Installers/Install-Rust.ps1", - "{{ template_dir }}/scripts/Installers/Install-Julia.ps1", "{{ template_dir }}/scripts/Installers/Install-Sbt.ps1", - "{{ template_dir }}/scripts/Installers/Install-Svn.ps1", "{{ template_dir }}/scripts/Installers/Install-Chrome.ps1", "{{ template_dir }}/scripts/Installers/Install-Edge.ps1", "{{ template_dir }}/scripts/Installers/Install-Firefox.ps1", "{{ template_dir }}/scripts/Installers/Install-Selenium.ps1", "{{ template_dir }}/scripts/Installers/Install-IEWebDriver.ps1", "{{ template_dir }}/scripts/Installers/Install-Apache.ps1", - "{{ template_dir }}/scripts/Installers/Install-Nginx.ps1", - "{{ template_dir }}/scripts/Installers/Install-Swig.ps1", - "{{ template_dir }}/scripts/Installers/Install-Bicep.ps1" + "{{ template_dir }}/scripts/Installers/Install-Nginx.ps1" ] }, { @@ -285,9 +275,7 @@ "TOOLSET_JSON_PATH={{user `toolset_json_path`}}" ], "scripts": [ - "{{ template_dir }}/scripts/Installers/Install-VSWhere.ps1", "{{ template_dir }}/scripts/Installers/Install-WinAppDriver.ps1", - "{{ template_dir }}/scripts/Installers/Install-Cmake.ps1", "{{ template_dir }}/scripts/Installers/Install-R.ps1", "{{ template_dir }}/scripts/Installers/Install-AWS.ps1", "{{ template_dir }}/scripts/Installers/Install-DACFx.ps1", @@ -301,10 +289,7 @@ "{{ template_dir }}/scripts/Installers/Install-Miniconda.ps1", "{{ template_dir }}/scripts/Installers/Install-AzureCosmosDbEmulator.ps1", "{{ template_dir }}/scripts/Installers/Install-Mercurial.ps1", - "{{ template_dir }}/scripts/Installers/Install-Jq.ps1", "{{ template_dir }}/scripts/Installers/Install-Zstd.ps1", - "{{ template_dir }}/scripts/Installers/Install-InnoSetup.ps1", - "{{ template_dir }}/scripts/Installers/Install-GitVersion.ps1", "{{ template_dir }}/scripts/Installers/Install-NSIS.ps1", "{{ template_dir }}/scripts/Installers/Install-CloudFoundryCli.ps1", "{{ template_dir }}/scripts/Installers/Install-Vcpkg.ps1", From 7fe7393aa2e80159549986f9980329cc0a3651ef Mon Sep 17 00:00:00 2001 From: Hai Cao Date: Mon, 12 Jul 2021 00:59:56 -0700 Subject: [PATCH 0369/3485] [Ubuntu] Add SqlPackage (#3700) * [Ubuntu] Add SqlPackage * Address comments --- .../SoftwareReport.Databases.psm1 | 8 +++++++- images/linux/scripts/installers/sqlpackage.sh | 18 ++++++++++++++++++ images/linux/scripts/tests/Tools.Tests.ps1 | 6 ++++++ images/linux/ubuntu1804.json | 1 + images/linux/ubuntu2004.json | 1 + 5 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 images/linux/scripts/installers/sqlpackage.sh diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Databases.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Databases.psm1 index e80c1b2d9082..8bcb840e0486 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Databases.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Databases.psm1 @@ -25,6 +25,11 @@ function Get-SQLCmdVersion { return "sqlcmd $sqlcmdVersion" } +function Get-SqlPackageVersion { + $sqlPackageVersion = sqlpackage /version + return "SqlPackage $sqlPackageVersion" +} + function Build-MySQLSection { $output = "" @@ -45,7 +50,8 @@ function Build-MSSQLToolsSection { $output += New-MDHeader "MS SQL Server Client Tools" -Level 4 $output += New-MDList -Style Unordered -Lines @( - (Get-SQLCmdVersion) + (Get-SQLCmdVersion), + (Get-SqlPackageVersion) ) return $output diff --git a/images/linux/scripts/installers/sqlpackage.sh b/images/linux/scripts/installers/sqlpackage.sh new file mode 100644 index 000000000000..86a1a49956fc --- /dev/null +++ b/images/linux/scripts/installers/sqlpackage.sh @@ -0,0 +1,18 @@ +#!/bin/bash -e +################################################################################ +## File: sqlpackage.sh +## Desc: Install SqlPackage CLI to DacFx (https://docs.microsoft.com/sql/tools/sqlpackage/sqlpackage-download#get-sqlpackage-net-core-for-linux) +################################################################################ + +# Source the helpers for use with the script +source $HELPER_SCRIPTS/install.sh + +# Install SqlPackage +download_with_retries "https://aka.ms/sqlpackage-linux" "." "sqlpackage.zip" + +unzip -qq sqlpackage.zip -d /usr/local/sqlpackage +rm -f sqlpackage.zip +chmod +x /usr/local/sqlpackage/sqlpackage +ln -sf /usr/local/sqlpackage/sqlpackage /usr/local/bin + +invoke_tests "Tools" "SqlPackage" diff --git a/images/linux/scripts/tests/Tools.Tests.ps1 b/images/linux/scripts/tests/Tools.Tests.ps1 index dd92811fbc7a..1caa559e448e 100644 --- a/images/linux/scripts/tests/Tools.Tests.ps1 +++ b/images/linux/scripts/tests/Tools.Tests.ps1 @@ -171,6 +171,12 @@ Describe "MSSQLCommandLineTools" { } } +Describe "SqlPackage" { + It "sqlpackage" { + "sqlpackage /version" | Should -ReturnZeroExitCode + } +} + Describe "R" { It "r" { "R --version" | Should -ReturnZeroExitCode diff --git a/images/linux/ubuntu1804.json b/images/linux/ubuntu1804.json index 03fb8d806921..8c300c593d68 100644 --- a/images/linux/ubuntu1804.json +++ b/images/linux/ubuntu1804.json @@ -226,6 +226,7 @@ "{{template_dir}}/scripts/installers/mono.sh", "{{template_dir}}/scripts/installers/mysql.sh", "{{template_dir}}/scripts/installers/mssql-cmd-tools.sh", + "{{template_dir}}/scripts/installers/sqlpackage.sh", "{{template_dir}}/scripts/installers/nginx.sh", "{{template_dir}}/scripts/installers/nvm.sh", "{{template_dir}}/scripts/installers/nodejs.sh", diff --git a/images/linux/ubuntu2004.json b/images/linux/ubuntu2004.json index c6d10ae44f13..6d333e3c0eeb 100644 --- a/images/linux/ubuntu2004.json +++ b/images/linux/ubuntu2004.json @@ -226,6 +226,7 @@ "{{template_dir}}/scripts/installers/mono.sh", "{{template_dir}}/scripts/installers/mysql.sh", "{{template_dir}}/scripts/installers/mssql-cmd-tools.sh", + "{{template_dir}}/scripts/installers/sqlpackage.sh", "{{template_dir}}/scripts/installers/nginx.sh", "{{template_dir}}/scripts/installers/nvm.sh", "{{template_dir}}/scripts/installers/nodejs.sh", From 52b67da7854c776a89c73356fb182a28d837b1ad Mon Sep 17 00:00:00 2001 From: Tobias Chen Date: Mon, 12 Jul 2021 15:54:04 +0200 Subject: [PATCH 0370/3485] [Ubuntu] Remove hardcoded toolsToInstall from script (#3701) --- images/linux/scripts/installers/Install-Toolset.ps1 | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/images/linux/scripts/installers/Install-Toolset.ps1 b/images/linux/scripts/installers/Install-Toolset.ps1 index 313591598ae1..e60f5a2b2b67 100644 --- a/images/linux/scripts/installers/Install-Toolset.ps1 +++ b/images/linux/scripts/installers/Install-Toolset.ps1 @@ -28,9 +28,8 @@ $ErrorActionPreference = "Stop" # Get toolset content $toolset = Get-Content -Path "$env:INSTALLER_SCRIPT_FOLDER/toolset.json" -Raw -$toolsToInstall = @("Python", "Node", "Go") -$tools = ConvertFrom-Json -InputObject $toolset | Select-Object -ExpandProperty toolcache | Where-Object {$ToolsToInstall -contains $_.Name} +$tools = ConvertFrom-Json -InputObject $toolset | Select-Object -ExpandProperty toolcache | Where-Object {$_.url -ne $null } foreach ($tool in $tools) { # Get versions manifest for current tool @@ -51,8 +50,5 @@ foreach ($tool in $tools) { exit 1 } } + chown -R "$($env:SUDO_USER):$($env:SUDO_USER)" /opt/hostedtoolcache/$tool } - -chown -R "$($env:SUDO_USER):$($env:SUDO_USER)" /opt/hostedtoolcache/Python -chown -R "$($env:SUDO_USER):$($env:SUDO_USER)" /opt/hostedtoolcache/node -chown -R "$($env:SUDO_USER):$($env:SUDO_USER)" /opt/hostedtoolcache/go \ No newline at end of file From 2ebf8e46f3818060f5d097c4a065486700a8732f Mon Sep 17 00:00:00 2001 From: Dibir Magomedsaygitov <61747324+dibir-magomedsaygitov@users.noreply.github.com> Date: Mon, 12 Jul 2021 18:26:04 +0300 Subject: [PATCH 0371/3485] [Ubuntu] Upgrade Azure PowerShell from 5.9.0 to 6.1.0 (#3675) * upgrade azure powershell from 5.9.0 to 6.1.0 on ubuntu images * zip 5.9.0 version --- images/linux/toolsets/toolset-1804.json | 5 +++-- images/linux/toolsets/toolset-2004.json | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index 90570f463492..0b9f04978d7e 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -107,11 +107,12 @@ "name": "az", "url" : "https://raw.githubusercontent.com/Azure/az-ps-module-versions/main/versions-manifest.json", "versions": [ - "5.9.0" + "6.1.0" ], "zip_versions": [ "3.1.0", - "4.4.0" + "4.4.0", + "5.9.0" ] } ], diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index 7823e26f0d58..2db8e7fe95ab 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -105,11 +105,12 @@ "name": "az", "url" : "https://raw.githubusercontent.com/Azure/az-ps-module-versions/main/versions-manifest.json", "versions": [ - "5.9.0" + "6.1.0" ], "zip_versions": [ "3.1.0", - "4.4.0" + "4.4.0", + "5.9.0" ] } ], From 75e8ea0593bd8702239370cc99d59158664f72cb Mon Sep 17 00:00:00 2001 From: Dibir Magomedsaygitov <61747324+dibir-magomedsaygitov@users.noreply.github.com> Date: Mon, 12 Jul 2021 18:27:04 +0300 Subject: [PATCH 0372/3485] [macOS] Upgrade azure powershell from 5.9.0 to 6.1.0 (#3677) --- images/macos/toolsets/toolset-10.14.json | 2 +- images/macos/toolsets/toolset-10.15.json | 2 +- images/macos/toolsets/toolset-11.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/images/macos/toolsets/toolset-10.14.json b/images/macos/toolsets/toolset-10.14.json index 72d34a68b779..efe6cdc96aa4 100644 --- a/images/macos/toolsets/toolset-10.14.json +++ b/images/macos/toolsets/toolset-10.14.json @@ -223,7 +223,7 @@ { "name": "Az", "versions": [ - "5.9.0" + "6.1.0" ] }, {"name": "MarkdownPS"}, diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index 783cb28b2b47..4afe45be5023 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -175,7 +175,7 @@ { "name": "Az", "versions": [ - "5.9.0" + "6.1.0" ] }, {"name": "MarkdownPS"}, diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index 3058334bc908..1568abd11d8a 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -123,7 +123,7 @@ { "name": "Az", "versions": [ - "5.9.0" + "6.1.0" ] }, {"name": "MarkdownPS"}, From cfffe35709dcc45d09f0a08189be5984f3f13bbb Mon Sep 17 00:00:00 2001 From: Dibir Magomedsaygitov <61747324+dibir-magomedsaygitov@users.noreply.github.com> Date: Mon, 12 Jul 2021 20:17:32 +0300 Subject: [PATCH 0373/3485] [Windows] Upgrade Azure PowerShell from 5.9.0 to 6.1.0 (#3676) * Add 6.1.0 to windows images * Zip 5.9.0 version --- images/win/toolsets/toolset-2016.json | 5 +++-- images/win/toolsets/toolset-2019.json | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/images/win/toolsets/toolset-2016.json b/images/win/toolsets/toolset-2016.json index 21ae256ad8d8..8f63548347f2 100644 --- a/images/win/toolsets/toolset-2016.json +++ b/images/win/toolsets/toolset-2016.json @@ -121,7 +121,7 @@ "name": "az", "url" : "https://raw.githubusercontent.com/Azure/az-ps-module-versions/main/versions-manifest.json", "versions": [ - "5.9.0" + "6.1.0" ], "zip_versions": [ "1.0.0", @@ -134,7 +134,8 @@ "4.3.0", "4.4.0", "4.7.0", - "5.5.0" + "5.5.0", + "5.9.0" ] } ], diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index b99ab73dbdc2..28d8873a186a 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -121,7 +121,7 @@ "name": "az", "url" : "https://raw.githubusercontent.com/Azure/az-ps-module-versions/main/versions-manifest.json", "versions": [ - "5.9.0" + "6.1.0" ], "zip_versions": [ "1.0.0", @@ -134,7 +134,8 @@ "4.3.0", "4.4.0", "4.7.0", - "5.5.0" + "5.5.0", + "5.9.0" ] } ], From 7149c03bd257e033855b6b7dac7138ed7caa5bf4 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Tue, 13 Jul 2021 09:32:41 +0300 Subject: [PATCH 0374/3485] Fix Get-AndroidGoogleAPIsVersions function output (#3715) * The current condition retrieves a system image android 27 for win16 --- images/win/scripts/SoftwareReport/SoftwareReport.Android.psm1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Android.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Android.psm1 index 2183a1011c2a..8953d337b9a1 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Android.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Android.psm1 @@ -150,7 +150,7 @@ function Get-AndroidGoogleAPIsVersions { [object] $PackageInfo ) - $versions = $packageInfo | Where-Object { $_ -Match "Google APIs" } | ForEach-Object { + $versions = $packageInfo | Where-Object { $_ -Match "addon-google_apis" } | ForEach-Object { $packageInfoParts = Split-TableRowByColumns $_ return $packageInfoParts[0].split(";")[1] } From a914ed2f95e6d1f585fedee2a011c0d6052bb3d6 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Tue, 13 Jul 2021 10:41:55 +0300 Subject: [PATCH 0375/3485] [Windows] Fix image generation error related to zipped az modules (#3720) --- images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 index d8a6c103279e..7b612a26ba00 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 @@ -230,7 +230,7 @@ function Get-PowerShellAzureModules { $modulesPath = "C:\Modules" $modules = Get-ChildItem -Path $modulesPath | Sort-Object Name | Group-Object {$_.Name.Split('_')[0]} $modules | ForEach-Object { - $group = $_.group | Sort-Object {[Version]$_.Name.Split('_')[1]} + $group = $_.group | Sort-Object {[Version]$_.Name.Split('_')[1].Replace(".zip","")} $moduleName = $names[$_.Name] $moduleVersions = $group | ForEach-Object {$_.Name.Split('_')[1]} $moduleVersions = $moduleVersions -join '
' From e139c6d581122cdb7519f7c58f7161b921916f0e Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Wed, 14 Jul 2021 10:02:12 +0300 Subject: [PATCH 0376/3485] [macOS] Skip Intel HAXM installation on BigSur (#3698) * Remove HAXM installation as it doesn't work on Big Sur * Change test to validate successful kext load * Add HAXM to software report --- images/macos/provision/core/android-toolsets.sh | 11 +++++++---- .../macos/software-report/SoftwareReport.Android.psm1 | 8 ++++++++ .../software-report/SoftwareReport.Generator.ps1 | 6 +++++- images/macos/tests/Android.Tests.ps1 | 5 ++--- 4 files changed, 22 insertions(+), 8 deletions(-) diff --git a/images/macos/provision/core/android-toolsets.sh b/images/macos/provision/core/android-toolsets.sh index ac9c6d037bef..6efe09c79b25 100755 --- a/images/macos/provision/core/android-toolsets.sh +++ b/images/macos/provision/core/android-toolsets.sh @@ -85,10 +85,13 @@ do done # Intel x86 Emulator Accelerator (HAXM installer) -# see Issue 31164 notes -# Command needs to be run under sudo. -chmod +x $ANDROID_HOME/extras/intel/Hardware_Accelerated_Execution_Manager/silent_install.sh -sudo $ANDROID_HOME/extras/intel/Hardware_Accelerated_Execution_Manager/silent_install.sh +# The Android Emulator uses the built-in Hypervisor.Framework by default, and falls back to using Intel HAXM if Hypervisor.Framework fails to initialize +# https://developer.android.com/studio/run/emulator-acceleration#vm-mac +# The installation doesn't work properly on macOS Big Sur, /dev/HAX is not created +if is_Less_BigSur; then + chmod +x $ANDROID_HOME/extras/intel/Hardware_Accelerated_Execution_Manager/silent_install.sh + sudo $ANDROID_HOME/extras/intel/Hardware_Accelerated_Execution_Manager/silent_install.sh +fi for addon_name in "${ANDROID_ADDON_LIST[@]}" do diff --git a/images/macos/software-report/SoftwareReport.Android.psm1 b/images/macos/software-report/SoftwareReport.Android.psm1 index 9be1d78a387c..7617e7333853 100644 --- a/images/macos/software-report/SoftwareReport.Android.psm1 +++ b/images/macos/software-report/SoftwareReport.Android.psm1 @@ -187,3 +187,11 @@ function Get-AndroidNDKVersions { return ($versions -Join "
") } + +function Get-IntelHaxmVersion { + kextstat | Where-Object { $_ -match "com.intel.kext.intelhaxm \((?(\d+\.){1,}\d+)\)" } | Out-Null + return [PSCustomObject] @{ + "Package Name" = "Intel HAXM" + "Version" = $Matches.Version + } +} \ No newline at end of file diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1 index 13252fb3d59a..8321bd85f8d6 100644 --- a/images/macos/software-report/SoftwareReport.Generator.ps1 +++ b/images/macos/software-report/SoftwareReport.Generator.ps1 @@ -276,7 +276,11 @@ $markdown += New-MDNewLine # Android section $markdown += New-MDHeader "Android" -Level 3 -$markdown += Build-AndroidTable | New-MDTable +$androidTable = Build-AndroidTable +if ($os.IsLessThanBigSur) { + $androidTable += Get-IntelHaxmVersion +} +$markdown += $androidTable | New-MDTable $markdown += New-MDNewLine $markdown += New-MDHeader "Environment variables" -Level 4 $markdown += Build-AndroidEnvironmentTable | New-MDTable diff --git a/images/macos/tests/Android.Tests.ps1 b/images/macos/tests/Android.Tests.ps1 index 02fe6543d5f8..303a271fa4cf 100644 --- a/images/macos/tests/Android.Tests.ps1 +++ b/images/macos/tests/Android.Tests.ps1 @@ -83,8 +83,7 @@ Describe "Android" { } } - It "HAXM is installed" { - $haxmPath = Join-Path $ANDROID_SDK_DIR "extras" "intel" "Hardware_Accelerated_Execution_Manager" "silent_install.sh" - "$haxmPath -v" | Should -ReturnZeroExitCode + It "HAXM is installed" -Skip:($os.IsBigSur) { + "kextstat | grep 'com.intel.kext.intelhaxm'" | Should -ReturnZeroExitCode } } \ No newline at end of file From 8aac9e60c0434fd36c169406371199bcde3727f2 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Wed, 14 Jul 2021 12:23:24 +0300 Subject: [PATCH 0377/3485] [Ubuntu] Update ansible-base to ansible-core (#3711) Update ansible-base 2.10 to ansible-core 2.11 for Ubuntu images --- .../linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 | 2 +- images/linux/scripts/installers/pipx-packages.sh | 7 ++++--- images/linux/toolsets/toolset-1804.json | 2 +- images/linux/toolsets/toolset-2004.json | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 index 202920a972e7..ae7ddfa6d34d 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 @@ -1,5 +1,5 @@ function Get-AnsibleVersion { - $ansibleVersion = ansible --version | Select-Object -First 1 | Take-OutputPart -Part 1 + $ansibleVersion = (ansible --version)[0] -replace "[^\d.]" return "Ansible $ansibleVersion" } diff --git a/images/linux/scripts/installers/pipx-packages.sh b/images/linux/scripts/installers/pipx-packages.sh index 85763b7d499b..c5aeace65d36 100644 --- a/images/linux/scripts/installers/pipx-packages.sh +++ b/images/linux/scripts/installers/pipx-packages.sh @@ -19,9 +19,10 @@ for package in $pipx_packages; do echo "Install $package into default python" pipx install $package - # Install ansible into an existing ansible-base Virtual Environment - if [[ $package == "ansible-base" ]]; then - pipx inject ansible-base ansible + # https://docs.ansible.com/ansible/latest/installation_guide/intro_installation.html + # Install ansible into an existing ansible-core Virtual Environment + if [[ $package == "ansible-core" ]]; then + pipx inject $package ansible fi fi diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index 0b9f04978d7e..d672818cd5c3 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -224,7 +224,7 @@ "cmd": "yamllint" }, { - "package": "ansible-base", + "package": "ansible-core", "cmd": "ansible" } ], diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index 2db8e7fe95ab..832335d35dc5 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -224,7 +224,7 @@ "cmd": "yamllint" }, { - "package": "ansible-base", + "package": "ansible-core", "cmd": "ansible" } ], From ad358c8eb8fde1961567f6e3751ee47d66dc774a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 14 Jul 2021 10:54:38 +0000 Subject: [PATCH 0378/3485] Updating readme file for macOS-11 version 20210712.4 (#3723) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/macos/macos-11-Readme.md | 79 ++++++++++++++++----------------- 1 file changed, 39 insertions(+), 40 deletions(-) diff --git a/images/macos/macos-11-Readme.md b/images/macos/macos-11-Readme.md index 5c17aa8beb4a..92a00659af9b 100644 --- a/images/macos/macos-11-Readme.md +++ b/images/macos/macos-11-Readme.md @@ -1,19 +1,18 @@ | Announcements | |-| | [[all OS versions] Android SDK tools will be changed to Command line tools on July, 12](https://github.com/actions/virtual-environments/issues/3638) | -| [[macOS] Xcode 12.2 and 12.3 will be removed from Big Sur on June, 28](https://github.com/actions/virtual-environments/issues/3555) | | [macOS 11.0 pools will be transited to private preview.](https://github.com/actions/virtual-environments/issues/2486) | *** # macOS 11.4 info - System Version: macOS 11.4 (20F71) - Kernel Version: Darwin 20.5.0 -- Image Version: 20210626.1 +- Image Version: 20210712.4 ## Installed Software ### Language and Runtime - .NET SDK 2.1.300 2.1.301 2.1.302 2.1.401 2.1.402 2.1.403 2.1.500 2.1.502 2.1.503 2.1.504 2.1.505 2.1.506 2.1.507 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 2.1.811 2.1.812 2.1.813 2.1.814 2.1.815 2.1.816 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 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 3.1.408 3.1.409 3.1.410 5.0.100 5.0.101 5.0.102 5.0.200 5.0.201 5.0.202 5.0.300 5.0.301 - Bash 3.2.57(1)-release -- Clang/LLVM 12.0.0 is available on `'$(brew --prefix llvm)/bin/clang'` +- Clang/LLVM 12.0.1 is available on `'$(brew --prefix llvm)/bin/clang'` - Clang/LLVM 12.0.5 is default - gcc-9 (Homebrew GCC 9.4.0) 9.4.0 - available by `gcc-9` alias - gcc-10 (Homebrew GCC 10.3.0) 10.3.0 - available by `gcc-10` alias @@ -24,29 +23,29 @@ - Go 1.15.13 - julia 1.6.1 - MSBuild 16.6.0.15801 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) -- Node.js v14.17.1 +- Node.js v14.17.3 - NVM 0.38.0 -- NVM - Cached node versions: v10.24.1 v12.22.1 v14.17.1 +- NVM - Cached node versions: v10.24.1 v12.22.3 v14.17.3 - Perl 5.34.0 -- PHP 8.0.7 +- PHP 8.0.8 - Python 2.7.18 -- Python 3.9.5 -- Ruby 2.7.3p183 +- Python 3.9.6 +- Ruby 2.7.4p191 ### Package Management -- Bundler version 2.2.21 +- Bundler version 2.2.23 - Carthage 0.38.0 - CocoaPods 1.10.1 - Composer 2.1.3 -- Homebrew 3.2.0 +- Homebrew 3.2.2 - Miniconda 4.9.2 - NPM 6.14.13 - NuGet 5.6.0.6489 - Pip 20.3.4 (python 2.7) -- Pip 21.1.1 (python 3.9) +- Pip 21.1.3 (python 3.9) - Pipx 0.16.3 -- RubyGems 3.2.21 -- Vcpkg 2021 (build from master \) +- RubyGems 3.2.23 +- Vcpkg 2021 (build from master \) - Yarn 1.22.5 #### Environment variables @@ -58,23 +57,23 @@ ### Project Management - Apache Ant(TM) 1.10.10 - Apache Maven 3.8.1 -- Gradle 7.1 +- Gradle 7.1.1 ### Utilities - 7-Zip 17.04 - aria2 1.35.0 - azcopy 10.11.0 - bazel 4.1.0 -- bazelisk 1.9.0 +- bazelisk 1.10.0 - bsdtar 3.3.2 - available by 'tar' alias - Curl 7.77.0 - Git LFS: 2.13.3 - Git: 2.32.0 -- GitHub CLI: 1.11.0 +- GitHub CLI: 1.12.1 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.1 - gpg (GnuPG) 2.3.1 -- helm v3.6.1+g61d8e8c +- helm v3.6.2+gee407bd - Hub CLI: 2.14.2 - jq 1.6 - mongo v4.4.5 @@ -91,19 +90,20 @@ ### Tools -- Aliyun CLI 3.0.80 +- Aliyun CLI 3.0.81 - App Center CLI 2.9.0 -- AWS CLI 2.2.14 -- AWS SAM CLI 1.24.1 +- AWS CLI 2.2.18 +- AWS SAM CLI 1.26.0 - AWS Session Manager CLI 1.2.205.0 -- Azure CLI 2.25.0 +- Azure CLI 2.26.0 +- Bicep CLI 0.4.63 - Cabal 3.4.0.0 - Cmake 3.20.5 -- Fastlane 2.186.0 +- Fastlane 2.187.0 - GHC 9.0.1 - GHCup v0.1.15.2 - Stack 2.7.1 -- SwiftFormat 0.48.6 +- SwiftFormat 0.48.9 - Swig 4.0.2 - Xcode Command Line Tools 12.5.0.0.1.1617976050 @@ -116,8 +116,8 @@ - SafariDriver 14.1.1 (16611.2.7.1.4) - Google Chrome 91.0.4472.114 - ChromeDriver 91.0.4472.101 -- Microsoft Edge 91.0.864.59 -- MSEdgeDriver 91.0.864.59 +- Microsoft Edge 91.0.864.67 +- MSEdgeDriver 91.0.864.67 - Mozilla Firefox 89.0.2 - geckodriver 0.29.1 @@ -138,14 +138,14 @@ #### Ruby - 2.4.10 - 2.5.9 -- 2.6.7 -- 2.7.3 -- 3.0.1 +- 2.6.8 +- 2.7.4 +- 3.0.2 #### Python -- 3.7.10 -- 3.8.10 -- 3.9.5 +- 3.7.11 +- 3.8.11 +- 3.9.6 #### PyPy - 2.7.18 [PyPy 7.3.5] @@ -153,8 +153,8 @@ #### Node.js - 10.24.1 -- 12.22.1 -- 14.17.1 +- 12.22.3 +- 14.17.3 #### Go - 1.15.13 @@ -168,8 +168,8 @@ #### Packages - Bindgen 0.58.1 -- Cargo-audit 0.14.1 -- Cargo-outdated v0.9.16 +- Cargo-audit 0.15.0 +- Cargo-outdated v0.9.17 - Cbindgen 0.19.0 - Clippy 0.1.53 - Rustfmt 1.4.37-stable @@ -180,7 +180,7 @@ #### PowerShell Modules | Module | Version | | ---------------- | ------- | -| Az | 5.9.0 | +| Az | 6.1.0 | | MarkdownPS | 1.9 | | Pester | 5.2.2 | | PSScriptAnalyzer | 1.19.1 | @@ -189,11 +189,11 @@ | Name | Version | ConfigFile | ServiceStatus | ListenPort | | ----- | ------- | ------------------------------- | ------------- | ---------- | | httpd | 2.4.48 | /usr/local/etc/httpd/httpd.conf | stopped | 80 | -| nginx | 1.21.0 | /usr/local/etc/nginx/nginx.conf | stopped | 80 | +| nginx | 1.21.1 | /usr/local/etc/nginx/nginx.conf | stopped | 80 | ### Xamarin #### Visual Studio for Mac -- 8.10.3.15 +- 8.10.5.16 #### Xamarin bundles | symlink | Xamarin.Mono | Xamarin.iOS | Xamarin.Mac | Xamarin.Android | @@ -283,11 +283,10 @@ | Package Name | Version | | -------------------------- | ------------------------------------------------------------------------------------------------------------------------ | | Android Command Line Tools | 4.0 | -| Android Emulator | 30.6.5 | +| Android Emulator | 30.7.5 | | Android SDK Build-tools | 30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3 | | Android SDK Platforms | android-S (rev 5)
android-30 (rev 3)
android-29 (rev 5)
android-28 (rev 6)
android-27 (rev 3) | | Android SDK Platform-Tools | 31.0.2 | -| Android SDK Tools | 26.1.1 | | Android Support Repository | 47.0.0 | | CMake | 3.10.2
3.18.1 | | Google Play services | 49 | From 5161c257a20061de402f03378a99f45c8d9b7b51 Mon Sep 17 00:00:00 2001 From: Yann Jouanique Date: Thu, 15 Jul 2021 11:21:48 +0200 Subject: [PATCH 0379/3485] [ubuntu] Install yq (#3646) --- .../SoftwareReport/SoftwareReport.Generator.ps1 | 1 + .../SoftwareReport/SoftwareReport.Tools.psm1 | 5 +++++ images/linux/scripts/installers/yq.sh | 16 ++++++++++++++++ images/linux/scripts/tests/Tools.Tests.ps1 | 6 ++++++ images/linux/ubuntu1804.json | 1 + images/linux/ubuntu2004.json | 1 + .../SoftwareReport/SoftwareReport.Tools.psm1 | 2 +- 7 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 images/linux/scripts/installers/yq.sh diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index 26b380a7612b..34dd7d11138a 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -123,6 +123,7 @@ $toolsList = @( (Get-HHVMVersion), (Get-SVNVersion), (Get-JqVersion), + (Get-YqVersion), (Get-KindVersion), (Get-KubectlVersion), (Get-KustomizeVersion), diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 index ae7ddfa6d34d..4c641c23bcbe 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 @@ -278,3 +278,8 @@ function Get-ZstdVersion { $zstdVersion = zstd --version | Take-OutputPart -Part 1 -Delimiter "v" | Take-OutputPart -Part 0 -Delimiter "," return "zstd $zstdVersion (homebrew)" } + +function Get-YqVersion { + $yqVersion = ($(yq -V) -Split " ")[-1] + return "yq $yqVersion" +} diff --git a/images/linux/scripts/installers/yq.sh b/images/linux/scripts/installers/yq.sh new file mode 100644 index 000000000000..7f3e3b447737 --- /dev/null +++ b/images/linux/scripts/installers/yq.sh @@ -0,0 +1,16 @@ +#!/bin/bash -e + +# Source the helpers for use with the script +source $HELPER_SCRIPTS/install.sh + +YQ_BINARY=yq_linux_amd64 + +# As per https://github.com/mikefarah/yq#wget +YQ_URL=$(curl -s https://api.github.com/repos/mikefarah/yq/releases/latest | jq -r ".assets[].browser_download_url | select(endswith(\"$YQ_BINARY.tar.gz\"))") +echo "Downloading latest yq from $YQ_URL" + +download_with_retries "$YQ_URL" "/tmp" "${YQ_BINARY}.tar.gz" +tar xzf "/tmp/${YQ_BINARY}.tar.gz" -C "/tmp" +mv /tmp/${YQ_BINARY} /usr/local/bin/yq + +invoke_tests "Tools" "yq" diff --git a/images/linux/scripts/tests/Tools.Tests.ps1 b/images/linux/scripts/tests/Tools.Tests.ps1 index 1caa559e448e..d3b0cfbf5b63 100644 --- a/images/linux/scripts/tests/Tools.Tests.ps1 +++ b/images/linux/scripts/tests/Tools.Tests.ps1 @@ -377,3 +377,9 @@ Describe "Ruby" { } } } + +Describe "yq" { + It "yq" { + "yq -V" | Should -ReturnZeroExitCode + } +} diff --git a/images/linux/ubuntu1804.json b/images/linux/ubuntu1804.json index 8c300c593d68..a91430fd9c34 100644 --- a/images/linux/ubuntu1804.json +++ b/images/linux/ubuntu1804.json @@ -248,6 +248,7 @@ "{{template_dir}}/scripts/installers/dpkg-config.sh", "{{template_dir}}/scripts/installers/mongodb.sh", "{{template_dir}}/scripts/installers/android.sh", + "{{template_dir}}/scripts/installers/yq.sh", "{{template_dir}}/scripts/installers/pypy.sh", "{{template_dir}}/scripts/installers/python.sh" ], diff --git a/images/linux/ubuntu2004.json b/images/linux/ubuntu2004.json index 6d333e3c0eeb..5cc79cce4121 100644 --- a/images/linux/ubuntu2004.json +++ b/images/linux/ubuntu2004.json @@ -248,6 +248,7 @@ "{{template_dir}}/scripts/installers/dpkg-config.sh", "{{template_dir}}/scripts/installers/mongodb.sh", "{{template_dir}}/scripts/installers/android.sh", + "{{template_dir}}/scripts/installers/yq.sh", "{{template_dir}}/scripts/installers/pypy.sh", "{{template_dir}}/scripts/installers/python.sh", "{{template_dir}}/scripts/installers/graalvm.sh" diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 index ad5eb2255ad4..c769c6260b98 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 @@ -269,4 +269,4 @@ function Get-SwigVersion { (swig -version | Out-String) -match "version (?\d+\.\d+\.\d+)" | Out-Null $swigVersion = $Matches.Version return "Swig $swigVersion" -} +} \ No newline at end of file From 84ee9f7202feed8a20b7a19a30e4d3059090539d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 15 Jul 2021 13:36:21 +0000 Subject: [PATCH 0380/3485] Windows Server 2016 (20210711 update) (#3713) * Updating readme file for win16 version 20210711.1 * removed android-27 from google apis list Co-authored-by: Image generation service account Co-authored-by: Alena Sviridenko Co-authored-by: Actions service account --- images/win/Windows2016-Readme.md | 64 ++++++++++++++++---------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/images/win/Windows2016-Readme.md b/images/win/Windows2016-Readme.md index 090e7d450289..439ac8258f73 100644 --- a/images/win/Windows2016-Readme.md +++ b/images/win/Windows2016-Readme.md @@ -3,31 +3,31 @@ | [[all OS versions] Android SDK tools will be changed to Command line tools on July, 12](https://github.com/actions/virtual-environments/issues/3638) | *** # Microsoft Windows Server 2016 Datacenter -- OS Version: 10.0.14393 Build 4467 -- Image Version: 20210628.1 +- OS Version: 10.0.14393 Build 4470 +- Image Version: 20210711.1 ## Installed Software ### Language and Runtime - Bash 4.4.23(1)-release - Go 1.15.13 - Julia 1.6.1 -- Node 14.17.1 +- Node 14.17.3 - Perl 5.32.1 -- PHP 8.0.7 +- PHP 8.0.8 - Python 3.7.9 - Ruby 2.5.9p229 ### Package Management - Chocolatey 0.10.15 - Composer 2.1.3 -- Helm 3.6.1 +- Helm 3.6.2 - Miniconda 4.9.2 (pre-installed on the image but not added to PATH) - NPM 6.14.13 - NuGet 5.10.0.7240 - pip 21.1.3 (python 3.7) - Pipx 0.16.3 - RubyGems 2.7.6.3 -- Vcpkg (build from master \) +- Vcpkg (build from master \<7d169b4>) - Yarn 1.22.10 #### Environment variables @@ -40,7 +40,7 @@ - Ant 1.10.10 - Gradle 7.1 - Maven 3.8.1 -- sbt 1.5.3 +- sbt 1.5.4 ### Tools - 7zip 19.00 @@ -50,13 +50,13 @@ - Bicep 0.4.63 - Cabal 3.4.0.0 - CMake 3.20.5 -- CodeQL Action Bundle 2.5.6 -- Docker 20.10.5 +- CodeQL Action Bundle 2.5.7 +- Docker 20.10.6 - Docker-compose 1.29.1 - ghc 9.0.1 - Git 2.32.0 - Git LFS 2.13.3 -- Google Cloud SDK 346.0.0 +- Google Cloud SDK 347.0.0 - InnoSetup 6.2.0 - jq 1.6 - Kind 0.11.1 @@ -67,7 +67,7 @@ - NSIS v3.06.1 - OpenSSL 1.1.1 - Packer 1.7.2 -- Pulumi v3.5.1 +- Pulumi v3.6.1 - R 4.1.0 - Stack 2.7.1 - Subversion (SVN) 1.14.1 @@ -78,14 +78,14 @@ - zstd 1.5.0 ### CLI Tools -- Alibaba Cloud CLI 3.0.80 -- AWS CLI 2.2.14 -- AWS SAM CLI 1.24.1 +- Alibaba Cloud CLI 3.0.81 +- AWS CLI 2.2.18 +- AWS SAM CLI 1.26.0 - AWS Session Manager CLI 1.2.205.0 -- Azure CLI 2.25.0 +- Azure CLI 2.26.0 - Azure DevOps CLI extension 0.18.0 - Cloud Foundry CLI 6.53.0 -- GitHub CLI 1.11.0 +- GitHub CLI 1.12.1 - Hub CLI 2.14.2 ### Rust Tools @@ -96,8 +96,8 @@ #### Packages - bindgen 0.58.1 -- cargo-audit 0.14.1 -- cargo-outdated v0.9.16 +- cargo-audit 0.15.0 +- cargo-outdated v0.9.17 - cbindgen 0.19.0 - Clippy 0.1.53 - Rustfmt 1.4.37 @@ -105,8 +105,8 @@ ### Browsers and webdrivers - Google Chrome 91.0.4472.124 - Chrome Driver 91.0.4472.101 -- Microsoft Edge 91.0.864.59 -- Microsoft Edge Driver 91.0.864.59 +- Microsoft Edge 91.0.864.67 +- Microsoft Edge Driver 91.0.864.67 - Mozilla Firefox 89.0.2 - Gecko Driver 0.29.1 - IE Driver 3.150.1.0 @@ -153,8 +153,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Version | Architecture | | ------- | ------------ | | 10.24.1 | x64 | -| 12.22.1 | x64 | -| 14.17.1 | x64 | +| 12.22.3 | x64 | +| 14.17.3 | x64 | #### Python @@ -165,7 +165,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | 3.6.8 | x64, x86 | | 3.7.9 (Default) | x64, x86 | | 3.8.10 | x64, x86 | -| 3.9.5 | x64, x86 | +| 3.9.6 | x64, x86 | #### Ruby @@ -173,9 +173,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | ------- | ------------ | | 2.4.10 | x64 | | 2.5.9 (Default) | x64 | -| 2.6.7 | x64 | -| 2.7.3 | x64 | -| 3.0.1 | x64 | +| 2.6.8 | x64 | +| 2.7.4 | x64 | +| 3.0.2 | x64 | #### PyPy @@ -219,7 +219,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Name | Version | ConfigFile | ServiceName | ServiceStatus | ListenPort | | ------ | ------- | ------------------------------------- | ----------- | ------------- | ---------- | | Apache | 2.4.48 | C:\tools\Apache24\conf\httpd.conf | Apache | Stopped | 80 | -| Nginx | 1.21.0 | C:\tools\nginx-1.21.0\conf\nginx.conf | nginx | Stopped | 80 | +| Nginx | 1.21.1 | C:\tools\nginx-1.21.1\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2017 | Name | Version | Path | @@ -549,7 +549,7 @@ All other versions are saved but not installed. | Android SDK Tools | 25.2.5 | | Android Support Repository | 47.0.0 | | CMake | 3.10.2
3.18.1 | -| Google APIs | addon-g..._apis-google-21
addon-g..._apis-google-22
addon-g..._apis-google-23
addon-g..._apis-google-24
a...google_apis | +| Google APIs | addon-google_apis-google-21
addon-google_apis-google-22
addon-google_apis-google-23
addon-google_apis-google-24| | Google Play services | 49 | | Google Repository | 58 | | NDK | 21.4.7075529
22.1.7171670 | @@ -568,11 +568,11 @@ All other versions are saved but not installed. ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2016 | sha256:80ebe3ac5d462f858967ed3af42b6abb4d774229aa65614e11f2229bb1eb67c7 | 2021-06-08 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2016 | sha256:af5a3ae6f3fe3ff6723eaa5cb25c10727760905e0b748fcdd7a74f2a0311b1bc | 2021-06-08 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2016 | sha256:43aa741b7d100954d86a824eab6e25c76b51e5eef92727d5744e8800efdb4089 | 2021-06-08 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2016 | sha256:6f1f6e1e3cf6391a8738aacea3128db2d888a7ac269ea9b0a2d3632394dc194c | 2021-07-08 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2016 | sha256:d839398735dd59b2fa38a1b309a01478fcec69c1adbf67df8dfabadbe9b93dda | 2021-07-08 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2016 | sha256:b0039c9880b74156fd6da75cb9c549494b22d43ddce47d690aeaa4064b6e4d37 | 2021-07-08 | | mcr.microsoft.com/windows/nanoserver:10.0.14393.953 | sha256:fc60bd5ae0e61b334ce1cf1bcbf20c10c36b4c5482a01da319c9c989f9e6e268 | 2017-03-08 | -| mcr.microsoft.com/windows/servercore:ltsc2016 | sha256:431315d3208b79a74c7e598aacb469f0e58a18977f5b93885b1d8d7027cae03d | 2021-06-06 | +| mcr.microsoft.com/windows/servercore:ltsc2016 | sha256:f07c36fa2f9220861e3c0508080d035271e3960fbc1f28eb2ffe6d05e69b6047 | 2021-07-06 | From 13b1855134719ed0bea0201920a45fcce44c93da Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 15 Jul 2021 13:45:59 +0000 Subject: [PATCH 0381/3485] Updating readme file for win19 version 20210711.1 (#3712) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/win/Windows2019-Readme.md | 68 ++++++++++++++++---------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index 0daf4270d9d7..56c0896220e8 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -3,8 +3,8 @@ | [[all OS versions] Android SDK tools will be changed to Command line tools on July, 12](https://github.com/actions/virtual-environments/issues/3638) | *** # Microsoft Windows Server 2019 Datacenter -- OS Version: 10.0.17763 Build 1999 -- Image Version: 20210628.1 +- OS Version: 10.0.17763 Build 2029 +- Image Version: 20210711.1 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -14,23 +14,23 @@ - Bash 4.4.23(1)-release - Go 1.15.13 - Julia 1.6.1 -- Node 14.17.1 +- Node 14.17.3 - Perl 5.32.1 -- PHP 8.0.7 +- PHP 8.0.8 - Python 3.7.9 - Ruby 2.5.9p229 ### Package Management - Chocolatey 0.10.15 - Composer 2.1.3 -- Helm 3.6.1 +- Helm 3.6.2 - Miniconda 4.9.2 (pre-installed on the image but not added to PATH) - NPM 6.14.13 - NuGet 5.10.0.7240 - pip 21.1.3 (python 3.7) - Pipx 0.16.3 - RubyGems 2.7.6.3 -- Vcpkg (build from master \) +- Vcpkg (build from master \<7d169b4>) - Yarn 1.22.10 #### Environment variables @@ -43,7 +43,7 @@ - Ant 1.10.10 - Gradle 7.1 - Maven 3.8.1 -- sbt 1.5.3 +- sbt 1.5.4 ### Tools - 7zip 19.00 @@ -53,13 +53,13 @@ - Bicep 0.4.63 - Cabal 3.4.0.0 - CMake 3.20.5 -- CodeQL Action Bundle 2.5.6 -- Docker 20.10.5 +- CodeQL Action Bundle 2.5.7 +- Docker 20.10.6 - Docker-compose 1.29.1 - ghc 9.0.1 - Git 2.32.0 - Git LFS 2.13.3 -- Google Cloud SDK 346.0.0 +- Google Cloud SDK 347.0.0 - InnoSetup 6.2.0 - jq 1.6 - Kind 0.11.1 @@ -70,7 +70,7 @@ - NSIS v3.06.1 - OpenSSL 1.1.1 - Packer 1.7.2 -- Pulumi v3.5.1 +- Pulumi v3.6.1 - R 4.1.0 - Stack 2.7.1 - Subversion (SVN) 1.14.1 @@ -81,14 +81,14 @@ - zstd 1.5.0 ### CLI Tools -- Alibaba Cloud CLI 3.0.80 -- AWS CLI 2.2.14 -- AWS SAM CLI 1.24.1 +- Alibaba Cloud CLI 3.0.81 +- AWS CLI 2.2.18 +- AWS SAM CLI 1.26.0 - AWS Session Manager CLI 1.2.205.0 -- Azure CLI 2.25.0 +- Azure CLI 2.26.0 - Azure DevOps CLI extension 0.18.0 - Cloud Foundry CLI 6.53.0 -- GitHub CLI 1.11.0 +- GitHub CLI 1.12.1 - Hub CLI 2.14.2 ### Rust Tools @@ -99,8 +99,8 @@ #### Packages - bindgen 0.58.1 -- cargo-audit 0.14.1 -- cargo-outdated v0.9.16 +- cargo-audit 0.15.0 +- cargo-outdated v0.9.17 - cbindgen 0.19.0 - Clippy 0.1.53 - Rustfmt 1.4.37 @@ -108,8 +108,8 @@ ### Browsers and webdrivers - Google Chrome 91.0.4472.124 - Chrome Driver 91.0.4472.101 -- Microsoft Edge 91.0.864.59 -- Microsoft Edge Driver 91.0.864.59 +- Microsoft Edge 91.0.864.67 +- Microsoft Edge Driver 91.0.864.67 - Mozilla Firefox 89.0.2 - Gecko Driver 0.29.1 - IE Driver 3.150.1.0 @@ -159,8 +159,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Version | Architecture | | ------- | ------------ | | 10.24.1 | x64 | -| 12.22.1 | x64 | -| 14.17.1 | x64 | +| 12.22.3 | x64 | +| 14.17.3 | x64 | #### Python @@ -171,7 +171,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | 3.6.8 | x64, x86 | | 3.7.9 (Default) | x64, x86 | | 3.8.10 | x64, x86 | -| 3.9.5 | x64, x86 | +| 3.9.6 | x64, x86 | #### Ruby @@ -179,9 +179,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | ------- | ------------ | | 2.4.10 | x64 | | 2.5.9 (Default) | x64 | -| 2.6.7 | x64 | -| 2.7.3 | x64 | -| 3.0.1 | x64 | +| 2.6.8 | x64 | +| 2.7.4 | x64 | +| 3.0.2 | x64 | #### PyPy @@ -225,18 +225,18 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Name | Version | ConfigFile | ServiceName | ServiceStatus | ListenPort | | ------ | ------- | ------------------------------------- | ----------- | ------------- | ---------- | | Apache | 2.4.48 | C:\tools\Apache24\conf\httpd.conf | Apache | Stopped | 80 | -| Nginx | 1.21.0 | C:\tools\nginx-1.21.0\conf\nginx.conf | nginx | Stopped | 80 | +| Nginx | 1.21.1 | C:\tools\nginx-1.21.1\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2019 | Name | Version | Path | | ----------------------------- | --------------- | -------------------------------------------------------------- | -| Visual Studio Enterprise 2019 | 16.10.31410.357 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | +| Visual Studio Enterprise 2019 | 16.10.31424.327 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | #### Workloads, components and extensions: | Package | Version | | ------------------------------------------------------------------------- | --------------- | -| Component.Android.NDK.R16B | 16.10.31408.198 | +| Component.Android.NDK.R16B | 16.10.31415.396 | | Component.Android.SDK25.Private | 16.0.28625.61 | | Component.Android.SDK30 | 16.10.31205.252 | | Component.Ant | 1.9.3.8 | @@ -559,11 +559,11 @@ All other versions are saved but not installed. ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:7da03aef9a9acb66678d5c14dda85c741268557bdcd55484e6351e373445157f | 2021-06-08 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:8af4375ff474def9233a8a0ce8f0faad829c143c447e98d85c55a24586904f63 | 2021-06-08 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:ceb674e14c24078b16c2b7a3dfe0c31929acbdd34352902bcf381a4489dc6422 | 2021-06-08 | -| mcr.microsoft.com/windows/nanoserver:1809 | sha256:944184f0b31444a929debcd9668218f1e80ef342fe03f5c4b8491eda6da3ffb8 | 2021-06-06 | -| mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:3458c7dbc9ee16016170ecce85bee03b0e7f13744809d67fc881ec8d2086f5ef | 2021-06-06 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:8243310953cf430f0e7bbd5881ad02627dca2aac0c1672af016d0e7981c068a3 | 2021-07-08 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:87507e123f65c703b941da540914a8cf5c1d08334913e69c222927220352c2cd | 2021-07-08 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:aa3c8d10c1b6e503863b4f0672cf594919ab54b9431892eee422d797a19bd217 | 2021-07-08 | +| mcr.microsoft.com/windows/nanoserver:1809 | sha256:38c1fb9049c603299d7e885dc74ce55a6c97d22cef9b01df0e8a11489691bed6 | 2021-07-06 | +| mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:6dfc9ed8c6048a7a45fba93fdfc0b5c4cf1215392e74dfa674003ccfb99061fa | 2021-07-06 | From 836dd6f083dab69b7dd9a4935e02866c6d0c530d Mon Sep 17 00:00:00 2001 From: Leonid Lapshin Date: Fri, 16 Jul 2021 10:55:47 +0300 Subject: [PATCH 0382/3485] [Ubuntu] Fix npm global modules installation (#3734) * fixed directories permissions * local bin permissions Co-authored-by: Leonid Lapshin --- images/linux/scripts/installers/nodejs.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/images/linux/scripts/installers/nodejs.sh b/images/linux/scripts/installers/nodejs.sh index a9a108235c0d..aa6eaff1cc90 100644 --- a/images/linux/scripts/installers/nodejs.sh +++ b/images/linux/scripts/installers/nodejs.sh @@ -30,6 +30,11 @@ done echo "Creating the symlink for [now] command to vercel CLI" ln -s /usr/local/bin/vercel /usr/local/bin/now +# fix global modules installation as regular user +# related issue https://github.com/actions/virtual-environments/issues/3727 +sudo chmod -R 777 /usr/local/lib/node_modules +sudo chmod -R 777 /usr/local/bin + rm -rf ~/n invoke_tests "Node" "Node.js" From b15732aa86522e0ffbc4468f68e28a839ee8105d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 16 Jul 2021 08:58:27 +0000 Subject: [PATCH 0383/3485] Updating readme file for ubuntu20 version 20210712.0 (#3717) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/linux/Ubuntu2004-README.md | 101 +++++++++++++++--------------- 1 file changed, 52 insertions(+), 49 deletions(-) diff --git a/images/linux/Ubuntu2004-README.md b/images/linux/Ubuntu2004-README.md index e99c0bad6c00..8e8ae1b90dbe 100644 --- a/images/linux/Ubuntu2004-README.md +++ b/images/linux/Ubuntu2004-README.md @@ -1,11 +1,12 @@ | Announcements | |-| +| [[Ubuntu] Ansible will be updated to Ansible 4 on July, 19th](https://github.com/actions/virtual-environments/issues/3714) | | [[all OS versions] Android SDK tools will be changed to Command line tools on July, 12](https://github.com/actions/virtual-environments/issues/3638) | | [Ubuntu 16.04 environment will be removed on September 20, 2021](https://github.com/actions/virtual-environments/issues/3287) | *** # Ubuntu 20.04.2 LTS - Linux kernel version: 5.8.0-1036-azure -- Image Version: 20210628.1 +- Image Version: 20210712.0 ## Installed Software ### Language and Runtime @@ -18,24 +19,24 @@ - LLVM components: Clang 10.0.0, 11.0.0, 12.0.1, Clang-format 10.0.0, 11.0.0, 12.0.1 (apt source: deb http://apt.llvm.org/focal/ llvm-toolchain-focal-12) - Mono 6.12.0.122 (apt source repository: https://download.mono-project.com/repo/ubuntu stable-focal main) - MSBuild 16.6.0.15201 (from /usr/lib/mono/msbuild/15.0/bin/MSBuild.dll) -- Node 14.17.1 +- Node 14.17.3 - Perl 5.30.0 -- Python 3.8.5 -- Python3 3.8.5 +- Python 3.8.10 +- Python3 3.8.10 - Ruby 2.7.0p0 -- Swift 5.4.1 +- Swift 5.4.2 ### Package Management - cpan 1.64 -- Helm 3.6.1 -- Homebrew 3.2.0 +- Helm 3.6.2 +- Homebrew 3.2.1 - Miniconda 4.9.2 - Npm 6.14.13 - Pip 20.0.2 - Pip3 20.0.2 - Pipx 0.16.3 - RubyGems 3.1.2 -- Vcpkg (build from master \) +- Vcpkg (build from master \) - Yarn 1.22.10 #### Environment variables @@ -46,10 +47,10 @@ ### Project Management - Ant 1.10.7 -- Gradle 7.1 +- Gradle 7.1.1 - Lerna 4.0.0 - Maven 3.8.1 -- Sbt 1.5.4 +- Sbt 1.5.5 ### Tools - Ansible 2.10.11 @@ -58,55 +59,55 @@ - Bazel 4.1.0 - Bazelisk 1.9.0 - Bicep 0.4.63 -- Buildah 1.21.0 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) +- Buildah 1.21.1 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - CMake 3.20.5 -- CodeQL Action Bundle 2.5.6 +- CodeQL Action Bundle 2.5.7 - Docker Compose 1.29.2 - Docker-Buildx 0.5.1 -- Docker-Moby Client 20.10.6+azure -- Docker-Moby Server 20.10.6+azure -- Fastlane 2.186.0 +- Docker-Moby Client 20.10.7+azure +- Docker-Moby Server 20.10.7+azure +- Fastlane 2.187.0 - Git 2.32.0 (apt source repository: ppa:git-core/ppa) - Git LFS 2.13.3 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.6.0 - Haveged 1.9.1 -- Heroku 7.54.1 -- HHVM (HipHop VM) 4.115.0 +- Heroku 7.56.0 +- HHVM (HipHop VM) 4.117.0 - jq 1.6 - Kind 0.11.1 - Kubectl 1.20.1-5-g76a04fc -- Kustomize 4.1.3 +- Kustomize 4.2.0 - Leiningen 2.9.6 - MediaInfo 19.09 - Mercurial 5.3.1 -- Minikube 1.21.0 +- Minikube 1.22.0 - Newman 5.2.4 - nvm 0.38.0 - OpenSSL 1.1.1f 31 Mar 2020 - Packer 1.7.3 - PhantomJS 2.1.1 -- Podman 3.1.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- Pulumi 3.5.1 +- Podman 3.2.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) +- Pulumi 3.6.1 - R 4.1.0 - Skopeo 1.3.0 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 -- Terraform 1.0.1 +- Terraform 1.0.2 - yamllint 1.26.1 - zstd 1.5.0 (homebrew) ### CLI Tools -- Alibaba Cloud CLI 3.0.80 -- AWS CLI 2.2.14 +- Alibaba Cloud CLI 3.0.81 +- AWS CLI 2.2.18 - AWS CLI Session manager plugin 1.2.205.0 -- AWS SAM CLI 1.24.1 -- Azure CLI (azure-cli) 2.25.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) +- AWS SAM CLI 1.26.0 +- Azure CLI (azure-cli) 2.26.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.18.0 -- GitHub CLI 1.11.0 -- Google Cloud SDK 346.0.0 (apt source repository: https://packages.cloud.google.com/apt) +- GitHub CLI 1.12.1 +- Google Cloud SDK 347.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 3.39.0 -- OpenShift CLI 4.7.16 +- Netlify CLI 4.1.23 +- OpenShift CLI 4.7.19 - ORAS CLI 0.12.0 - Vercel CLI 23.0.1 @@ -124,7 +125,7 @@ ### PHP | Tool | Version | | -------- | ------------ | -| PHP | 7.4.20 8.0.7 | +| PHP | 7.4.21 8.0.8 | | Composer | 2.1.3 | | PHPUnit | 8.5.17 | ``` @@ -144,16 +145,16 @@ #### Packages - Bindgen 0.58.1 -- Cargo audit 0.14.1 +- Cargo audit 0.15.0 - Cargo clippy 0.1.53 -- Cargo outdated 0.9.16 +- Cargo outdated 0.9.17 - Cbindgen 0.19.0 - Rustfmt 1.4.37 ### Browsers and Drivers - Google Chrome 91.0.4472.114 - ChromeDriver 91.0.4472.101 -- Mozilla Firefox 89.0.1 +- Mozilla Firefox 89.0.2 - Geckodriver 0.29.1 - Chromium 91.0.4472.0 @@ -180,6 +181,7 @@ ``` #### MS SQL Server Client Tools - sqlcmd 17.7.0001.1 +- SqlPackage 15.0.5084.2 ### Cached Tools #### Go @@ -189,8 +191,8 @@ #### Node.js - 10.24.1 -- 12.22.1 -- 14.17.1 +- 12.22.3 +- 14.17.3 #### PyPy - 2.7.18 [PyPy 7.3.5] @@ -200,16 +202,16 @@ #### Python - 2.7.18 - 3.5.10 -- 3.6.13 -- 3.7.10 -- 3.8.10 -- 3.9.5 +- 3.6.14 +- 3.7.11 +- 3.8.11 +- 3.9.6 #### Ruby - 2.5.9 -- 2.6.7 -- 2.7.3 -- 3.0.1 +- 2.6.8 +- 2.7.4 +- 3.0.2 #### Environment variables | Name | Value | Architecture | @@ -242,6 +244,7 @@ | Package Name | Version | | -------------------------- | ------------------------------------------------------------------------------------------------------------------------ | | Android Command Line Tools | 4.0 | +| Android Emulator | 30.7.5 | | Android SDK Build-tools | 30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3 | | Android SDK Platform-Tools | 31.0.2 | | Android SDK Platforms | android-S (rev 5)
android-30 (rev 3)
android-29 (rev 5)
android-28 (rev 6)
android-27 (rev 3) | @@ -268,16 +271,16 @@ | alpine:3.11 | sha256:20117524da64d995fd769f0aa3d7cfe2040518426f4b238f43e8373f4aa56c06 | 2021-04-14 | | alpine:3.12 | sha256:87703314048c40236c6d674424159ee862e2b96ce1c37c62d877e21ed27a387e | 2021-04-14 | | alpine:3.13 | sha256:f51ff2d96627690d62fee79e6eecd9fa87429a38142b5df8a3bfbb26061df7fc | 2021-04-14 | -| buildpack-deps:buster | sha256:3e2554a4168887038da647f8d22f94348fadd67f753a7287e1e8193000fb4b3a | 2021-06-23 | +| buildpack-deps:buster | sha256:128203abc1feabf1e0b2bef26a23860a7283770d25fcd3cf30277e1dda4909f1 | 2021-06-23 | | buildpack-deps:stretch | sha256:04f933352c6a3e46933907f5a7fb6f37134e027207f5de2d3c234bfec43d0d72 | 2021-06-23 | -| debian:10 | sha256:33a8231b1ec668c044b583971eea94fff37151de3a1d5a3737b08665300c8a0b | 2021-06-23 | +| debian:10 | sha256:dcb20da8d9d73c9dab5059668852555c171d40cdec297da845da9c929b70e0b1 | 2021-06-23 | | debian:9 | sha256:8afcdd92f29e1706625631df94ecdfe3bdeb919bb2c6ee685803d245b75ee45a | 2021-06-23 | | node:10 | sha256:59531d2835edd5161c8f9512f9e095b1836f7a1fcb0ab73e005ec46047384911 | 2021-04-10 | | node:10-alpine | sha256:dc98dac24efd4254f75976c40bce46944697a110d06ce7fa47e7268470cf2e28 | 2021-04-14 | -| node:12 | sha256:07ca77017dff8fccf0e333bd1fc7026844eb1e4e6677cc1f98e59843406cec29 | 2021-06-23 | -| node:12-alpine | sha256:be24b4fe27c92231c051a06e717b67e2a4dfc70d8edb0281285762292b854c03 | 2021-04-14 | -| node:14 | sha256:d8f90b676efb1260957a4170a9a0843fc003b673ae164f22df07eaee9bbc6223 | 2021-06-23 | -| node:14-alpine | sha256:21b87afa5f267e50b806f696f754b15b37b4118bb0ef722192f27ddff78d8d67 | 2021-06-15 | +| node:12 | sha256:3f646f48001e2cd732a4c0291e1fa5bfcadaaafc3a41227a0bcc76c998c2cee6 | 2021-07-07 | +| node:12-alpine | sha256:05328aa871f251b0643b8dcaa01034f126a8343b51ef302de207ad153a6b6232 | 2021-07-07 | +| node:14 | sha256:0c558991de47e614588a61f9cc90afdcf034c6fc641d3ab650c9570a98b37605 | 2021-07-07 | +| node:14-alpine | sha256:fb6cb918cc72869bd625940f42a7d8ae035c4e786d08187b94e8b91c6a534dfd | 2021-07-07 | | ubuntu:16.04 | sha256:6aab78d1825b4c15c159fecc62b8eef4fdf0c693a15aace3a605ad44e5e2df0c | 2021-06-17 | | ubuntu:18.04 | sha256:139b3846cee2e63de9ced83cee7023a2d95763ee2573e5b0ab6dea9dfbd4db8f | 2021-06-17 | | ubuntu:20.04 | sha256:aba80b77e27148d99c034a987e7da3a287ed455390352663418c0f2ed40417fe | 2021-06-17 | From 55e0391007bdc092e1df321726c8d2b42212cdd7 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 16 Jul 2021 09:17:23 +0000 Subject: [PATCH 0384/3485] Updating readme file for ubuntu18 version 20210712.0 (#3718) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/linux/Ubuntu1804-README.md | 91 ++++++++++++++++--------------- 1 file changed, 47 insertions(+), 44 deletions(-) diff --git a/images/linux/Ubuntu1804-README.md b/images/linux/Ubuntu1804-README.md index 0f55dc15468f..ae82de1b6f35 100644 --- a/images/linux/Ubuntu1804-README.md +++ b/images/linux/Ubuntu1804-README.md @@ -1,11 +1,12 @@ | Announcements | |-| +| [[Ubuntu] Ansible will be updated to Ansible 4 on July, 19th](https://github.com/actions/virtual-environments/issues/3714) | | [[all OS versions] Android SDK tools will be changed to Command line tools on July, 12](https://github.com/actions/virtual-environments/issues/3638) | | [Ubuntu 16.04 environment will be removed on September 20, 2021](https://github.com/actions/virtual-environments/issues/3287) | *** # Ubuntu 18.04.5 LTS - Linux kernel version: 5.4.0-1051-azure -- Image Version: 20210628.1 +- Image Version: 20210712.0 ## Installed Software ### Language and Runtime @@ -19,24 +20,24 @@ - Julia 1.6.1 - Mono 6.12.0.122 (apt source repository: https://download.mono-project.com/repo/ubuntu stable-bionic main) - MSBuild 16.6.0.15201 (from /usr/lib/mono/msbuild/15.0/bin/MSBuild.dll) -- Node 14.17.1 +- Node 14.17.3 - Perl 5.26.1 - Python 2.7.17 - Python3 3.6.9 - Ruby 2.5.1p57 -- Swift 5.4.1 +- Swift 5.4.2 ### Package Management - cpan 1.64 -- Helm 3.6.1 -- Homebrew 3.2.0 +- Helm 3.6.2 +- Homebrew 3.2.1 - Miniconda 4.9.2 - Npm 6.14.13 - Pip 9.0.1 - Pip3 9.0.1 - Pipx 0.16.3 - RubyGems 2.7.6 -- Vcpkg (build from master \) +- Vcpkg (build from master \) - Yarn 1.22.10 #### Environment variables @@ -47,9 +48,9 @@ ### Project Management - Ant 1.10.5 -- Gradle 7.1 +- Gradle 7.1.1 - Maven 3.8.1 -- Sbt 1.5.4 +- Sbt 1.5.5 ### Tools - Ansible 2.10.11 @@ -60,52 +61,52 @@ - Bicep 0.4.63 - Buildah 1.19.6 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - CMake 3.20.5 -- CodeQL Action Bundle 2.5.6 +- CodeQL Action Bundle 2.5.7 - Docker Compose 1.29.2 - Docker-Buildx 0.5.1 -- Docker-Moby Client 20.10.6+azure -- Docker-Moby Server 20.10.6+azure +- Docker-Moby Client 20.10.7+azure +- Docker-Moby Server 20.10.7+azure - Git 2.32.0 (apt source repository: ppa:git-core/ppa) - Git LFS 2.13.3 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.3.1 - Haveged 1.9.1 -- Heroku 7.54.1 -- HHVM (HipHop VM) 4.115.0 +- Heroku 7.56.0 +- HHVM (HipHop VM) 4.117.0 - jq 1.5 - Kind 0.11.1 - Kubectl 1.20.1-5-g76a04fc -- Kustomize 4.1.3 +- Kustomize 4.2.0 - Leiningen 2.9.6 - MediaInfo 17.12 - Mercurial 4.5.3 -- Minikube 1.21.0 +- Minikube 1.22.0 - Newman 5.2.4 - nvm 0.38.0 - OpenSSL 1.1.1 11 Sep 2018 - Packer 1.7.3 - PhantomJS 2.1.1 - Podman 3.0.1 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- Pulumi 3.5.1 +- Pulumi 3.6.1 - R 4.1.0 - Skopeo 1.2.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 - SVN 1.9.7 -- Terraform 1.0.1 +- Terraform 1.0.2 - yamllint 1.26.1 - zstd 1.5.0 (homebrew) ### CLI Tools -- Alibaba Cloud CLI 3.0.80 -- AWS CLI 1.19.101 +- Alibaba Cloud CLI 3.0.81 +- AWS CLI 1.19.109 - AWS CLI Session manager plugin 1.2.205.0 -- AWS SAM CLI 1.24.1 -- Azure CLI (azure-cli) 2.25.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) +- AWS SAM CLI 1.26.0 +- Azure CLI (azure-cli) 2.26.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.18.0 -- GitHub CLI 1.11.0 -- Google Cloud SDK 346.0.0 (apt source repository: https://packages.cloud.google.com/apt) +- GitHub CLI 1.12.1 +- Google Cloud SDK 347.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 3.39.0 -- OpenShift CLI 4.7.16 +- Netlify CLI 4.1.23 +- OpenShift CLI 4.7.19 - ORAS CLI 0.12.0 - Vercel CLI 23.0.1 @@ -119,7 +120,7 @@ ### PHP | Tool | Version | | -------- | --------------------------------- | -| PHP | 7.1.33 7.2.34 7.3.28 7.4.20 8.0.7 | +| PHP | 7.1.33 7.2.34 7.3.29 7.4.21 8.0.8 | | Composer | 2.1.3 | | PHPUnit | 8.5.17 | ``` @@ -139,16 +140,16 @@ #### Packages - Bindgen 0.58.1 -- Cargo audit 0.14.1 +- Cargo audit 0.15.0 - Cargo clippy 0.1.53 -- Cargo outdated 0.9.16 +- Cargo outdated 0.9.17 - Cbindgen 0.19.0 - Rustfmt 1.4.37 ### Browsers and Drivers - Google Chrome 91.0.4472.114 - ChromeDriver 91.0.4472.101 -- Mozilla Firefox 89.0.1 +- Mozilla Firefox 89.0.2 - Geckodriver 0.29.1 - Chromium 91.0.4472.0 @@ -175,6 +176,7 @@ ``` #### MS SQL Server Client Tools - sqlcmd 17.7.0001.1 +- SqlPackage 15.0.5084.2 ### Cached Tools #### Go @@ -184,8 +186,8 @@ #### Node.js - 10.24.1 -- 12.22.1 -- 14.17.1 +- 12.22.3 +- 14.17.3 #### PyPy - 2.7.18 [PyPy 7.3.5] @@ -194,17 +196,17 @@ #### Python - 2.7.18 - 3.5.10 -- 3.6.13 -- 3.7.10 -- 3.8.10 -- 3.9.5 +- 3.6.14 +- 3.7.11 +- 3.8.11 +- 3.9.6 #### Ruby - 2.4.10 - 2.5.9 -- 2.6.7 -- 2.7.3 -- 3.0.1 +- 2.6.8 +- 2.7.4 +- 3.0.2 #### Environment variables | Name | Value | Architecture | @@ -235,6 +237,7 @@ | Package Name | Version | | -------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 4.0 | +| Android Emulator | 30.7.5 | | Android SDK Build-tools | 30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3
26.0.0 26.0.1 26.0.2 26.0.3
25.0.0 25.0.1 25.0.2 25.0.3
24.0.0 24.0.1 24.0.2 24.0.3
23.0.1 23.0.2 23.0.3 | | Android SDK Platform-Tools | 31.0.2 | | Android SDK Platforms | android-S (rev 5)
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) | @@ -261,16 +264,16 @@ | alpine:3.11 | sha256:20117524da64d995fd769f0aa3d7cfe2040518426f4b238f43e8373f4aa56c06 | 2021-04-14 | | alpine:3.12 | sha256:87703314048c40236c6d674424159ee862e2b96ce1c37c62d877e21ed27a387e | 2021-04-14 | | alpine:3.13 | sha256:f51ff2d96627690d62fee79e6eecd9fa87429a38142b5df8a3bfbb26061df7fc | 2021-04-14 | -| buildpack-deps:buster | sha256:3e2554a4168887038da647f8d22f94348fadd67f753a7287e1e8193000fb4b3a | 2021-06-23 | +| buildpack-deps:buster | sha256:128203abc1feabf1e0b2bef26a23860a7283770d25fcd3cf30277e1dda4909f1 | 2021-06-23 | | buildpack-deps:stretch | sha256:04f933352c6a3e46933907f5a7fb6f37134e027207f5de2d3c234bfec43d0d72 | 2021-06-23 | -| debian:10 | sha256:33a8231b1ec668c044b583971eea94fff37151de3a1d5a3737b08665300c8a0b | 2021-06-23 | +| debian:10 | sha256:dcb20da8d9d73c9dab5059668852555c171d40cdec297da845da9c929b70e0b1 | 2021-06-23 | | debian:9 | sha256:8afcdd92f29e1706625631df94ecdfe3bdeb919bb2c6ee685803d245b75ee45a | 2021-06-23 | | node:10 | sha256:59531d2835edd5161c8f9512f9e095b1836f7a1fcb0ab73e005ec46047384911 | 2021-04-10 | | node:10-alpine | sha256:dc98dac24efd4254f75976c40bce46944697a110d06ce7fa47e7268470cf2e28 | 2021-04-14 | -| node:12 | sha256:07ca77017dff8fccf0e333bd1fc7026844eb1e4e6677cc1f98e59843406cec29 | 2021-06-23 | -| node:12-alpine | sha256:be24b4fe27c92231c051a06e717b67e2a4dfc70d8edb0281285762292b854c03 | 2021-04-14 | -| node:14 | sha256:d8f90b676efb1260957a4170a9a0843fc003b673ae164f22df07eaee9bbc6223 | 2021-06-23 | -| node:14-alpine | sha256:21b87afa5f267e50b806f696f754b15b37b4118bb0ef722192f27ddff78d8d67 | 2021-06-15 | +| node:12 | sha256:3f646f48001e2cd732a4c0291e1fa5bfcadaaafc3a41227a0bcc76c998c2cee6 | 2021-07-07 | +| node:12-alpine | sha256:05328aa871f251b0643b8dcaa01034f126a8343b51ef302de207ad153a6b6232 | 2021-07-07 | +| node:14 | sha256:0c558991de47e614588a61f9cc90afdcf034c6fc641d3ab650c9570a98b37605 | 2021-07-07 | +| node:14-alpine | sha256:fb6cb918cc72869bd625940f42a7d8ae035c4e786d08187b94e8b91c6a534dfd | 2021-07-07 | | ubuntu:16.04 | sha256:6aab78d1825b4c15c159fecc62b8eef4fdf0c693a15aace3a605ad44e5e2df0c | 2021-06-17 | | ubuntu:18.04 | sha256:139b3846cee2e63de9ced83cee7023a2d95763ee2573e5b0ab6dea9dfbd4db8f | 2021-06-17 | | ubuntu:20.04 | sha256:aba80b77e27148d99c034a987e7da3a287ed455390352663418c0f2ed40417fe | 2021-06-17 | From 8f8dfb1bcfbbfef030c5acef219fd9f78dd8e8d7 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Fri, 16 Jul 2021 17:25:43 +0300 Subject: [PATCH 0385/3485] Disable schedule as Ubuntu16 is deprecated (#3741) --- images.CI/linux-and-win/azure-pipelines/ubuntu1604.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/images.CI/linux-and-win/azure-pipelines/ubuntu1604.yml b/images.CI/linux-and-win/azure-pipelines/ubuntu1604.yml index af45b23b0313..5a5d271421dd 100644 --- a/images.CI/linux-and-win/azure-pipelines/ubuntu1604.yml +++ b/images.CI/linux-and-win/azure-pipelines/ubuntu1604.yml @@ -1,11 +1,3 @@ -schedules: -- cron: "0 0 * * *" - displayName: Daily - branches: - include: - - main - always: true - trigger: none pr: autoCancel: true From 5d206765aacd30b1ca280e08ec083fca0da4a835 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Fri, 16 Jul 2021 18:40:26 +0300 Subject: [PATCH 0386/3485] Use python3 to install aws-cli V1 (#3740) * Starting from version 1.20 aws-cli dropped python2 support --- images/linux/scripts/installers/aws.sh | 3 ++- images/linux/ubuntu1804.json | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/images/linux/scripts/installers/aws.sh b/images/linux/scripts/installers/aws.sh index 5bfab832c02c..337569dba129 100644 --- a/images/linux/scripts/installers/aws.sh +++ b/images/linux/scripts/installers/aws.sh @@ -15,10 +15,11 @@ if isUbuntu20 ; then /tmp/aws/install -i /usr/local/aws-cli -b /usr/local/bin fi +# The installation should be run after python3 is installed as aws-cli V1 dropped python2 support if isUbuntu16 || isUbuntu18 ; then download_with_retries "https://s3.amazonaws.com/aws-cli/awscli-bundle.zip" "/tmp" "awscli-bundle.zip" unzip -qq /tmp/awscli-bundle.zip -d /tmp - /tmp/awscli-bundle/install -i /usr/local/aws -b /usr/local/bin/aws + python3 /tmp/awscli-bundle/install -i /usr/local/aws -b /usr/local/bin/aws fi download_with_retries "https://s3.amazonaws.com/session-manager-downloads/plugin/latest/ubuntu_64bit/session-manager-plugin.deb" "/tmp" "session-manager-plugin.deb" diff --git a/images/linux/ubuntu1804.json b/images/linux/ubuntu1804.json index a91430fd9c34..6841b61800d5 100644 --- a/images/linux/ubuntu1804.json +++ b/images/linux/ubuntu1804.json @@ -199,7 +199,6 @@ "{{template_dir}}/scripts/installers/bicep.sh", "{{template_dir}}/scripts/installers/aliyun-cli.sh", "{{template_dir}}/scripts/installers/apache.sh", - "{{template_dir}}/scripts/installers/aws.sh", "{{template_dir}}/scripts/installers/clang.sh", "{{template_dir}}/scripts/installers/swift.sh", "{{template_dir}}/scripts/installers/cmake.sh", @@ -250,7 +249,8 @@ "{{template_dir}}/scripts/installers/android.sh", "{{template_dir}}/scripts/installers/yq.sh", "{{template_dir}}/scripts/installers/pypy.sh", - "{{template_dir}}/scripts/installers/python.sh" + "{{template_dir}}/scripts/installers/python.sh", + "{{template_dir}}/scripts/installers/aws.sh" ], "environment_vars": [ "HELPER_SCRIPTS={{user `helper_script_folder`}}", From 11a951ee605a36498389a04dad5572a31600c14a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 16 Jul 2021 22:59:45 +0000 Subject: [PATCH 0387/3485] Updating readme file for macOS-10.15 version 20210712.4 (#3724) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/macos/macos-10.15-Readme.md | 83 +++++++++++++++--------------- 1 file changed, 41 insertions(+), 42 deletions(-) diff --git a/images/macos/macos-10.15-Readme.md b/images/macos/macos-10.15-Readme.md index 3f6d1271810b..723ba5373dc4 100644 --- a/images/macos/macos-10.15-Readme.md +++ b/images/macos/macos-10.15-Readme.md @@ -1,20 +1,19 @@ | Announcements | |-| | [[all OS versions] Android SDK tools will be changed to Command line tools on July, 12](https://github.com/actions/virtual-environments/issues/3638) | -| [[macOS] Xcode 12.2 and 12.3 will be removed from Big Sur on June, 28](https://github.com/actions/virtual-environments/issues/3555) | | [macOS 11.0 pools will be transited to private preview.](https://github.com/actions/virtual-environments/issues/2486) | *** # macOS 10.15 info - System Version: macOS 10.15.7 (19H1217) - Kernel Version: Darwin 19.6.0 -- Image Version: 20210626.1 +- Image Version: 20210712.4 ## Installed Software ### Language and Runtime - .NET SDK 2.1.300 2.1.301 2.1.302 2.1.401 2.1.402 2.1.403 2.1.500 2.1.502 2.1.503 2.1.504 2.1.505 2.1.506 2.1.507 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 2.1.811 2.1.812 2.1.813 2.1.814 2.1.815 2.1.816 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 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 3.1.408 3.1.409 3.1.410 5.0.100 5.0.101 5.0.102 5.0.200 5.0.201 5.0.202 5.0.300 5.0.301 - Bash 3.2.57(1)-release -- Clang/LLVM 12.0.0 is available on `'$(brew --prefix llvm)/bin/clang'` - Clang/LLVM 12.0.0 is default +- Clang/LLVM 12.0.1 is available on `'$(brew --prefix llvm)/bin/clang'` - gcc-9 (Homebrew GCC 9.4.0) 9.4.0 - available by `gcc-9` alias - gcc-10 (Homebrew GCC 10.3.0) 10.3.0 - available by `gcc-10` alias - gcc-11 (Homebrew GCC 11.1.0_1) 11.1.0 - available by `gcc-11` alias @@ -24,30 +23,30 @@ - Go 1.15.13 - julia 1.6.1 - MSBuild 16.6.0.15801 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) -- Node.js v14.17.1 +- Node.js v14.17.3 - NVM 0.38.0 -- NVM - Cached node versions: v10.24.1 v12.22.1 v14.17.1 +- NVM - Cached node versions: v10.24.1 v12.22.3 v14.17.3 - Perl 5.34.0 -- PHP 8.0.7 +- PHP 8.0.8 - Python 2.7.18 -- Python 3.9.5 +- Python 3.9.6 - R 4.1.0 -- Ruby 2.7.3p183 +- Ruby 2.7.4p191 ### Package Management -- Bundler version 2.2.21 +- Bundler version 2.2.23 - Carthage 0.38.0 - CocoaPods 1.10.1 - Composer 2.1.3 -- Homebrew 3.2.0 +- Homebrew 3.2.2 - Miniconda 4.9.2 - NPM 6.14.13 - NuGet 5.6.0.6489 - Pip 20.3.4 (python 2.7) -- Pip 21.1.1 (python 3.9) +- Pip 21.1.3 (python 3.9) - Pipx 0.16.3 -- RubyGems 3.2.21 -- Vcpkg 2021 (build from master \) +- RubyGems 3.2.23 +- Vcpkg 2021 (build from master \) - Yarn 1.22.5 #### Environment variables @@ -59,24 +58,24 @@ ### Project Management - Apache Ant(TM) 1.10.10 - Apache Maven 3.8.1 -- Gradle 7.1 +- Gradle 7.1.1 ### Utilities - 7-Zip 17.04 - aria2 1.35.0 - azcopy 10.11.0 - bazel 4.1.0 -- bazelisk 1.9.0 +- bazelisk 1.10.0 - bsdtar 3.3.2 - available by 'tar' alias - Curl 7.77.0 - Git LFS: 2.13.3 - Git: 2.32.0 -- GitHub CLI: 1.11.0 +- GitHub CLI: 1.12.1 - GNU parallel 20210622 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.1 - gpg (GnuPG) 2.3.1 -- helm v3.6.1+g61d8e8c +- helm v3.6.2+gee407bd - Hub CLI: 2.14.2 - jq 1.6 - mongo v4.4.5 @@ -89,25 +88,26 @@ - Sox 14.4.2 - Subversion (SVN) 1.14.1 - Switchaudio-osx 1.1.0 -- Vagrant 2.2.16 +- Vagrant 2.2.17 - virtualbox 6.1.22r144080 - zstd 1.5.0 ### Tools -- Aliyun CLI 3.0.80 +- Aliyun CLI 3.0.81 - App Center CLI 2.9.0 -- AWS CLI 2.2.14 -- AWS SAM CLI 1.24.1 +- AWS CLI 2.2.18 +- AWS SAM CLI 1.26.0 - AWS Session Manager CLI 1.2.205.0 -- Azure CLI 2.25.0 +- Azure CLI 2.26.0 +- Bicep CLI 0.4.63 - Cabal 3.4.0.0 - Cmake 3.20.5 -- Fastlane 2.186.0 +- Fastlane 2.187.0 - GHC 9.0.1 - GHCup v0.1.15.2 - Stack 2.7.1 -- SwiftFormat 0.48.6 +- SwiftFormat 0.48.9 - Swig 4.0.2 - Xcode Command Line Tools 12.4.0.0.1.1610135815 @@ -120,8 +120,8 @@ - SafariDriver 14.1.1 (15611.2.7.1.6) - Google Chrome 91.0.4472.114 - ChromeDriver 91.0.4472.101 -- Microsoft Edge 91.0.864.59 -- MSEdgeDriver 91.0.864.59 +- Microsoft Edge 91.0.864.67 +- MSEdgeDriver 91.0.864.67 - Mozilla Firefox 89.0.2 - geckodriver 0.29.1 @@ -145,17 +145,17 @@ #### Ruby - 2.4.10 - 2.5.9 -- 2.6.7 -- 2.7.3 -- 3.0.1 +- 2.6.8 +- 2.7.4 +- 3.0.2 #### Python - 2.7.18 - 3.5.10 -- 3.6.13 -- 3.7.10 -- 3.8.10 -- 3.9.5 +- 3.6.14 +- 3.7.11 +- 3.8.11 +- 3.9.6 #### PyPy - 2.7.18 [PyPy 7.3.5] @@ -164,8 +164,8 @@ #### Node.js - 10.24.1 -- 12.22.1 -- 14.17.1 +- 12.22.3 +- 14.17.3 #### Go - 1.13.15 @@ -181,8 +181,8 @@ #### Packages - Bindgen 0.58.1 -- Cargo-audit 0.14.1 -- Cargo-outdated v0.9.16 +- Cargo-audit 0.15.0 +- Cargo-outdated v0.9.17 - Cbindgen 0.19.0 - Clippy 0.1.53 - Rustfmt 1.4.37-stable @@ -193,7 +193,7 @@ #### PowerShell Modules | Module | Version | | ---------------- | ------- | -| Az | 5.9.0 | +| Az | 6.1.0 | | MarkdownPS | 1.9 | | Pester | 5.2.2 | | PSScriptAnalyzer | 1.19.1 | @@ -202,11 +202,11 @@ | Name | Version | ConfigFile | ServiceStatus | ListenPort | | ----- | ------- | ------------------------------- | ------------- | ---------- | | httpd | 2.4.48 | /usr/local/etc/httpd/httpd.conf | stopped | 80 | -| nginx | 1.21.0 | /usr/local/etc/nginx/nginx.conf | stopped | 80 | +| nginx | 1.21.1 | /usr/local/etc/nginx/nginx.conf | stopped | 80 | ### Xamarin #### Visual Studio for Mac -- 8.10.3.15 +- 8.10.5.16 #### Xamarin bundles | symlink | Xamarin.Mono | Xamarin.iOS | Xamarin.Mac | Xamarin.Android | @@ -345,11 +345,10 @@ | Package Name | Version | | -------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 4.0 | -| Android Emulator | 30.6.5 | +| Android Emulator | 30.7.5 | | Android SDK Build-tools | 30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3
26.0.0 26.0.1 26.0.2 26.0.3
25.0.0 25.0.1 25.0.2 25.0.3
24.0.0 24.0.1 24.0.2 24.0.3 | | Android SDK Platforms | android-S (rev 5)
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 Platform-Tools | 31.0.2 | -| Android SDK Tools | 26.1.1 | | Android Support Repository | 47.0.0 | | CMake | 3.10.2
3.18.1 | | Google APIs | addon-google_apis-google-21
addon-google_apis-google-22
addon-google_apis-google-23
addon-google_apis-google-24 | From 6576bc7f78a51e174411e0e1286b9d937274f170 Mon Sep 17 00:00:00 2001 From: Darleev <50947177+Darleev@users.noreply.github.com> Date: Mon, 19 Jul 2021 09:29:23 +0100 Subject: [PATCH 0388/3485] [macOS] Added HTTP status code check to download_with_retries (#3716) * Disable exit on error temporary to implement retry logic based on exit code * Check HTTP response code and retry if it's not 200 * Make variables local to not interfere with other scripts Co-authored-by: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> --- images/macos/provision/utils/utils.sh | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/images/macos/provision/utils/utils.sh b/images/macos/provision/utils/utils.sh index e11f17e85388..c4c80d0ab16d 100755 --- a/images/macos/provision/utils/utils.sh +++ b/images/macos/provision/utils/utils.sh @@ -10,24 +10,29 @@ download_with_retries() { local COMPRESSED="$4" if [[ $COMPRESSED == "compressed" ]]; then - COMMAND="curl $URL -4 -sL --compressed -o '$DEST/$NAME'" + local COMMAND="curl $URL -4 -sL --compressed -o '$DEST/$NAME' -w '%{http_code}'" else - COMMAND="curl $URL -4 -sL -o '$DEST/$NAME'" + local COMMAND="curl $URL -4 -sL -o '$DEST/$NAME' -w '%{http_code}'" fi - echo "Downloading $URL..." + echo "Downloading '$URL' to '${DEST}/${NAME}'..." retries=20 interval=30 while [ $retries -gt 0 ]; do ((retries--)) - eval $COMMAND - if [ $? != 0 ]; then - echo "Unable to download $URL, next attempt in $interval sec, $retries attempts left" - sleep $interval - else - echo "$URL was downloaded successfully to $DEST/$NAME" + # Temporary disable exit on error to retry on non-zero exit code + set +e + http_code=$(eval $COMMAND) + exit_code=$? + if [ $http_code -eq 200 ] && [ $exit_code -eq 0 ]; then + echo "Download completed" return 0 + else + echo "Error — Either HTTP response code for '$URL' is wrong - '$http_code' or exit code is not 0 - '$exit_code'. Waiting $interval seconds before the next attempt, $retries attempts left" + sleep 30 fi + # Enable exit on error back + set -e done echo "Could not download $URL" From 6637167579dc2135accf2098b0c804e29374710c Mon Sep 17 00:00:00 2001 From: Darleev <50947177+Darleev@users.noreply.github.com> Date: Mon, 19 Jul 2021 09:29:53 +0100 Subject: [PATCH 0389/3485] [Ubuntu] Added HTTP status code check to download_with_retries (#3721) * Disable exit on error temporary to implement retry logic based on exit code * Check HTTP response code and retry if it's not 200 * Make variables local to not interfere with other scripts Co-authored-by: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> --- images/linux/scripts/helpers/install.sh | 27 ++++++++++++++-------- images/linux/scripts/installers/graalvm.sh | 4 ++-- 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/images/linux/scripts/helpers/install.sh b/images/linux/scripts/helpers/install.sh index efdfac54292d..0bf12071d721 100644 --- a/images/linux/scripts/helpers/install.sh +++ b/images/linux/scripts/helpers/install.sh @@ -14,22 +14,29 @@ download_with_retries() { local COMPRESSED="$4" if [[ $COMPRESSED == "compressed" ]]; then - COMMAND="curl $URL -4 -sL --compressed -o '$DEST/$NAME'" + local COMMAND="curl $URL -4 -sL --compressed -o '$DEST/$NAME' -w '%{http_code}'" else - COMMAND="curl $URL -4 -sL -o '$DEST/$NAME'" + local COMMAND="curl $URL -4 -sL -o '$DEST/$NAME' -w '%{http_code}'" fi echo "Downloading '$URL' to '${DEST}/${NAME}'..." - i=20 - while [ $i -gt 0 ]; do - ((i--)) - eval $COMMAND - if [ $? != 0 ]; then - sleep 30 - else + retries=20 + interval=30 + while [ $retries -gt 0 ]; do + ((retries--)) + # Temporary disable exit on error to retry on non-zero exit code + set +e + http_code=$(eval $COMMAND) + exit_code=$? + if [ $http_code -eq 200 ] && [ $exit_code -eq 0 ]; then echo "Download completed" return 0 + else + echo "Error — Either HTTP response code for '$URL' is wrong - '$http_code' or exit code is not 0 - '$exit_code'. Waiting $interval seconds before the next attempt, $retries attempts left" + sleep 30 fi + # Enable exit on error back + set -e done echo "Could not download $URL" @@ -58,4 +65,4 @@ get_toolset_value() { local toolset_path=$(get_toolset_path) local query=$1 echo "$(jq -r "$query" $toolset_path)" -} \ No newline at end of file +} diff --git a/images/linux/scripts/installers/graalvm.sh b/images/linux/scripts/installers/graalvm.sh index 6d32344a8f79..4026177a373a 100644 --- a/images/linux/scripts/installers/graalvm.sh +++ b/images/linux/scripts/installers/graalvm.sh @@ -7,7 +7,7 @@ source $HELPER_SCRIPTS/etc-environment.sh GRAALVM_ROOT=/usr/local/graalvm export GRAALVM_11_ROOT=$GRAALVM_ROOT/graalvm-ce-java11* -url=$(curl -s https://api.github.com/repos/graalvm/graalvm-ce-builds/releases/latest | jq -r '.assets[].browser_download_url | select(contains("graalvm-ce-java11-linux-amd64"))') +url=$(curl -s https://api.github.com/repos/graalvm/graalvm-ce-builds/releases/latest | jq -r '.assets[].browser_download_url | select(contains("graalvm-ce-java11-linux-amd64") and endswith("tar.gz"))') download_with_retries "$url" "/tmp" "graalvm-archive.tar.gz" mkdir $GRAALVM_ROOT tar -xzf "/tmp/graalvm-archive.tar.gz" -C $GRAALVM_ROOT @@ -18,4 +18,4 @@ setEtcEnvironmentVariable "GRAALVM_11_ROOT" $GRAALVM_11_ROOT # Install Native Image $GRAALVM_11_ROOT/bin/gu install native-image -invoke_tests "Tools" "GraalVM" \ No newline at end of file +invoke_tests "Tools" "GraalVM" From 0976659f92991b224ae8b10c4f5aea08f2f4686a Mon Sep 17 00:00:00 2001 From: Chris Patterson Date: Mon, 19 Jul 2021 10:41:29 -0400 Subject: [PATCH 0390/3485] Remove module manifest header Removing the module manifest header to prevent licensing confusion with overall repository. --- images/win/scripts/ImageHelpers/ImageHelpers.psd1 | 8 -------- 1 file changed, 8 deletions(-) diff --git a/images/win/scripts/ImageHelpers/ImageHelpers.psd1 b/images/win/scripts/ImageHelpers/ImageHelpers.psd1 index 438a9d322bce..20e9c7b54af2 100644 --- a/images/win/scripts/ImageHelpers/ImageHelpers.psd1 +++ b/images/win/scripts/ImageHelpers/ImageHelpers.psd1 @@ -1,11 +1,3 @@ -# -# Module manifest for module 'ImageHelpers' -# -# Generated by: chrispat -# -# Generated on: 11/1/2017 -# - @{ # Script module or binary module file associated with this manifest. From 1e9bfea57b430b0e47352973a0d78e70d219a15e Mon Sep 17 00:00:00 2001 From: Chris Patterson Date: Mon, 19 Jul 2021 11:21:46 -0400 Subject: [PATCH 0391/3485] Update ImageHelpers.psd1 --- images/win/scripts/ImageHelpers/ImageHelpers.psd1 | 9 --------- 1 file changed, 9 deletions(-) diff --git a/images/win/scripts/ImageHelpers/ImageHelpers.psd1 b/images/win/scripts/ImageHelpers/ImageHelpers.psd1 index 20e9c7b54af2..bdb237c00851 100644 --- a/images/win/scripts/ImageHelpers/ImageHelpers.psd1 +++ b/images/win/scripts/ImageHelpers/ImageHelpers.psd1 @@ -12,15 +12,6 @@ ModuleVersion = '0.0.1' # ID used to uniquely identify this module GUID = 'c9334909-16a1-48f1-a94a-c7baf1b961d9' -# Author of this module -Author = 'chrispat' - -# Company or vendor of this module -CompanyName = 'Unknown' - -# Copyright statement for this module -Copyright = '(c) 2017 chrispat. All rights reserved.' - # Description of the functionality provided by this module Description = 'Helper functions for creating vsts images' From 47c20dcaa31b0223f41b62624ecbdd4e5f7e94c5 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Mon, 19 Jul 2021 20:24:04 +0300 Subject: [PATCH 0392/3485] Stick mongodb version to 4.4.7 (#3747) * Version 5 potentially contains breaking changes. Stick to 4.4.7 and announce changes before upgrading to it. --- images/win/scripts/Installers/Install-MongoDB.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/win/scripts/Installers/Install-MongoDB.ps1 b/images/win/scripts/Installers/Install-MongoDB.ps1 index 177300e972fe..5d07216d5c4d 100644 --- a/images/win/scripts/Installers/Install-MongoDB.ps1 +++ b/images/win/scripts/Installers/Install-MongoDB.ps1 @@ -3,7 +3,7 @@ ## Desc: Install MongoDB #################################################################################### -Choco-Install -PackageName mongodb +Choco-Install -PackageName mongodb -ArgumentList "--version=4.4.7" $mongoPath = (Get-CimInstance Win32_Service -Filter "Name LIKE 'mongodb'").PathName $mongoBin = Split-Path -Path $mongoPath.split('"')[1] Add-MachinePathItem "$mongoBin" From a13f2630dcdbce96997a21201ba786ce61853340 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 20 Jul 2021 07:38:07 +0000 Subject: [PATCH 0393/3485] macOS 11 (20210718 update) (#3748) * Updating readme file for macOS-11 version 20210718.3 * Add MongoDB announcement Co-authored-by: Image generation service account Co-authored-by: Alena Sviridenko Co-authored-by: Actions service account --- images/macos/macos-11-Readme.md | 78 ++++++++++++++++----------------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/images/macos/macos-11-Readme.md b/images/macos/macos-11-Readme.md index 92a00659af9b..08ff4352da0b 100644 --- a/images/macos/macos-11-Readme.md +++ b/images/macos/macos-11-Readme.md @@ -1,16 +1,16 @@ | Announcements | |-| -| [[all OS versions] Android SDK tools will be changed to Command line tools on July, 12](https://github.com/actions/virtual-environments/issues/3638) | | [macOS 11.0 pools will be transited to private preview.](https://github.com/actions/virtual-environments/issues/2486) | +| [[all OS] MongoDB will be updated to version 5 on July, 26th](https://github.com/actions/virtual-environments/issues/3749) | *** # macOS 11.4 info - System Version: macOS 11.4 (20F71) - Kernel Version: Darwin 20.5.0 -- Image Version: 20210712.4 +- Image Version: 20210718.3 ## Installed Software ### Language and Runtime -- .NET SDK 2.1.300 2.1.301 2.1.302 2.1.401 2.1.402 2.1.403 2.1.500 2.1.502 2.1.503 2.1.504 2.1.505 2.1.506 2.1.507 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 2.1.811 2.1.812 2.1.813 2.1.814 2.1.815 2.1.816 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 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 3.1.408 3.1.409 3.1.410 5.0.100 5.0.101 5.0.102 5.0.200 5.0.201 5.0.202 5.0.300 5.0.301 +- .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 2.1.811 2.1.812 2.1.813 2.1.814 2.1.815 2.1.816 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 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 3.1.408 3.1.409 3.1.410 3.1.411 5.0.100 5.0.101 5.0.102 5.0.200 5.0.201 5.0.202 5.0.300 5.0.301 5.0.302 - Bash 3.2.57(1)-release - Clang/LLVM 12.0.1 is available on `'$(brew --prefix llvm)/bin/clang'` - Clang/LLVM 12.0.5 is default @@ -20,8 +20,8 @@ - GNU Fortran (Homebrew GCC 9.4.0) 9.4.0 - available by `gfortran-9` alias - GNU Fortran (Homebrew GCC 10.3.0) 10.3.0 - available by `gfortran-10` alias - GNU Fortran (Homebrew GCC 11.1.0_1) 11.1.0 - available by `gfortran-11` alias -- Go 1.15.13 -- julia 1.6.1 +- Go 1.15.14 +- julia 1.6.2 - MSBuild 16.6.0.15801 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) - Node.js v14.17.3 - NVM 0.38.0 @@ -33,7 +33,7 @@ - Ruby 2.7.4p191 ### Package Management -- Bundler version 2.2.23 +- Bundler version 2.2.24 - Carthage 0.38.0 - CocoaPods 1.10.1 - Composer 2.1.3 @@ -44,8 +44,8 @@ - Pip 20.3.4 (python 2.7) - Pip 21.1.3 (python 3.9) - Pipx 0.16.3 -- RubyGems 3.2.23 -- Vcpkg 2021 (build from master \) +- RubyGems 3.2.24 +- Vcpkg 2021 (build from master \<111220b>) - Yarn 1.22.5 #### Environment variables @@ -55,7 +55,7 @@ | VCPKG_INSTALLATION_ROOT | /usr/local/share/vcpkg | ### Project Management -- Apache Ant(TM) 1.10.10 +- Apache Ant(TM) 1.10.11 - Apache Maven 3.8.1 - Gradle 7.1.1 @@ -64,7 +64,7 @@ - aria2 1.35.0 - azcopy 10.11.0 - bazel 4.1.0 -- bazelisk 1.10.0 +- bazelisk 1.10.1 - bsdtar 3.3.2 - available by 'tar' alias - Curl 7.77.0 - Git LFS: 2.13.3 @@ -73,11 +73,11 @@ - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.1 - gpg (GnuPG) 2.3.1 -- helm v3.6.2+gee407bd +- helm v3.6.3+gd506314 - Hub CLI: 2.14.2 - jq 1.6 -- mongo v4.4.5 -- mongod v4.4.5 +- mongo v4.4.6 +- mongod v4.4.6 - Newman 5.2.4 - OpenSSL 1.1.1k 25 Mar 2021 `(/usr/local/opt/openssl -> /usr/local/Cellar/openssl@1.1/1.1.1k)` - Packer 1.7.3 @@ -92,18 +92,18 @@ ### Tools - Aliyun CLI 3.0.81 - App Center CLI 2.9.0 -- AWS CLI 2.2.18 +- AWS CLI 2.2.20 - AWS SAM CLI 1.26.0 - AWS Session Manager CLI 1.2.205.0 -- Azure CLI 2.26.0 -- Bicep CLI 0.4.63 +- Azure CLI 2.26.1 +- Bicep CLI 0.4.412 - Cabal 3.4.0.0 -- Cmake 3.20.5 +- Cmake 3.21.0 - Fastlane 2.187.0 - GHC 9.0.1 - GHCup v0.1.15.2 - Stack 2.7.1 -- SwiftFormat 0.48.9 +- SwiftFormat 0.48.10 - Swig 4.0.2 - Xcode Command Line Tools 12.5.0.0.1.1617976050 @@ -114,11 +114,11 @@ ### Browsers - Safari 14.1.1 (16611.2.7.1.4) - SafariDriver 14.1.1 (16611.2.7.1.4) -- Google Chrome 91.0.4472.114 +- Google Chrome 91.0.4472.164 - ChromeDriver 91.0.4472.101 -- Microsoft Edge 91.0.864.67 -- MSEdgeDriver 91.0.864.67 -- Mozilla Firefox 89.0.2 +- Microsoft Edge 91.0.864.70 +- MSEdgeDriver 91.0.864.70 +- Mozilla Firefox 90.0 - geckodriver 0.29.1 #### Environment variables @@ -157,8 +157,8 @@ - 14.17.3 #### Go -- 1.15.13 -- 1.16.5 +- 1.15.14 +- 1.16.6 ### Rust Tools - Cargo 1.53.0 @@ -193,7 +193,7 @@ ### Xamarin #### Visual Studio for Mac -- 8.10.5.16 +- 8.10.6.10 #### Xamarin bundles | symlink | Xamarin.Mono | Xamarin.iOS | Xamarin.Mac | Xamarin.Android | @@ -215,7 +215,7 @@ ### Xcode | Version | Build | Path | | -------------- | -------- | ------------------------------ | -| 13.0 (beta) | 13A5155e | /Applications/Xcode_13.0.app | +| 13.0 (beta) | 13A5192j | /Applications/Xcode_13.0.app | | 12.5.1 | 12E507 | /Applications/Xcode_12.5.1.app | | 12.5 (default) | 12E262 | /Applications/Xcode_12.5.app | | 12.4 | 12D4e | /Applications/Xcode_12.4.app | @@ -280,19 +280,19 @@ | watchOS 8.0 | 13.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 | ### Android -| Package Name | Version | -| -------------------------- | ------------------------------------------------------------------------------------------------------------------------ | -| Android Command Line Tools | 4.0 | -| Android Emulator | 30.7.5 | -| Android SDK Build-tools | 30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3 | -| Android SDK Platforms | android-S (rev 5)
android-30 (rev 3)
android-29 (rev 5)
android-28 (rev 6)
android-27 (rev 3) | -| Android SDK Platform-Tools | 31.0.2 | -| Android Support Repository | 47.0.0 | -| CMake | 3.10.2
3.18.1 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 21.4.7075529
22.1.7171670 | -| SDK Patch Applier v4 | 1 | +| Package Name | Version | +| -------------------------- | ---------------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 4.0 | +| Android Emulator | 30.7.5 | +| Android SDK Build-tools | 31.0.0
30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3 | +| Android SDK Platforms | android-31 (rev 1)
android-30 (rev 3)
android-29 (rev 5)
android-28 (rev 6)
android-27 (rev 3) | +| Android SDK Platform-Tools | 31.0.2 | +| Android Support Repository | 47.0.0 | +| CMake | 3.10.2
3.18.1 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 21.4.7075529
22.1.7171670 | +| SDK Patch Applier v4 | 1 | #### Environment variables | Name | Value | From 61f5fe8de5706deddccd3201f665a71a29ee550d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 20 Jul 2021 09:19:20 +0000 Subject: [PATCH 0394/3485] Updating readme file for macOS-10.15 version 20210718.2 (#3750) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/macos/macos-10.15-Readme.md | 75 +++++++++++++++--------------- 1 file changed, 38 insertions(+), 37 deletions(-) diff --git a/images/macos/macos-10.15-Readme.md b/images/macos/macos-10.15-Readme.md index 723ba5373dc4..ea1c0ef24a04 100644 --- a/images/macos/macos-10.15-Readme.md +++ b/images/macos/macos-10.15-Readme.md @@ -1,16 +1,16 @@ | Announcements | |-| -| [[all OS versions] Android SDK tools will be changed to Command line tools on July, 12](https://github.com/actions/virtual-environments/issues/3638) | +| [[all OS] MongoDB will be updated to version 5 on July, 26th](https://github.com/actions/virtual-environments/issues/3749) | | [macOS 11.0 pools will be transited to private preview.](https://github.com/actions/virtual-environments/issues/2486) | *** # macOS 10.15 info - System Version: macOS 10.15.7 (19H1217) - Kernel Version: Darwin 19.6.0 -- Image Version: 20210712.4 +- Image Version: 20210718.2 ## Installed Software ### Language and Runtime -- .NET SDK 2.1.300 2.1.301 2.1.302 2.1.401 2.1.402 2.1.403 2.1.500 2.1.502 2.1.503 2.1.504 2.1.505 2.1.506 2.1.507 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 2.1.811 2.1.812 2.1.813 2.1.814 2.1.815 2.1.816 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 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 3.1.408 3.1.409 3.1.410 5.0.100 5.0.101 5.0.102 5.0.200 5.0.201 5.0.202 5.0.300 5.0.301 +- .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 2.1.811 2.1.812 2.1.813 2.1.814 2.1.815 2.1.816 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 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 3.1.408 3.1.409 3.1.410 3.1.411 5.0.100 5.0.101 5.0.102 5.0.200 5.0.201 5.0.202 5.0.300 5.0.301 5.0.302 - Bash 3.2.57(1)-release - Clang/LLVM 12.0.0 is default - Clang/LLVM 12.0.1 is available on `'$(brew --prefix llvm)/bin/clang'` @@ -20,8 +20,8 @@ - GNU Fortran (Homebrew GCC 9.4.0) 9.4.0 - available by `gfortran-9` alias - GNU Fortran (Homebrew GCC 10.3.0) 10.3.0 - available by `gfortran-10` alias - GNU Fortran (Homebrew GCC 11.1.0_1) 11.1.0 - available by `gfortran-11` alias -- Go 1.15.13 -- julia 1.6.1 +- Go 1.15.14 +- julia 1.6.2 - MSBuild 16.6.0.15801 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) - Node.js v14.17.3 - NVM 0.38.0 @@ -34,7 +34,7 @@ - Ruby 2.7.4p191 ### Package Management -- Bundler version 2.2.23 +- Bundler version 2.2.24 - Carthage 0.38.0 - CocoaPods 1.10.1 - Composer 2.1.3 @@ -45,8 +45,8 @@ - Pip 20.3.4 (python 2.7) - Pip 21.1.3 (python 3.9) - Pipx 0.16.3 -- RubyGems 3.2.23 -- Vcpkg 2021 (build from master \) +- RubyGems 3.2.24 +- Vcpkg 2021 (build from master \<111220b>) - Yarn 1.22.5 #### Environment variables @@ -56,7 +56,7 @@ | VCPKG_INSTALLATION_ROOT | /usr/local/share/vcpkg | ### Project Management -- Apache Ant(TM) 1.10.10 +- Apache Ant(TM) 1.10.11 - Apache Maven 3.8.1 - Gradle 7.1.1 @@ -65,7 +65,7 @@ - aria2 1.35.0 - azcopy 10.11.0 - bazel 4.1.0 -- bazelisk 1.10.0 +- bazelisk 1.10.1 - bsdtar 3.3.2 - available by 'tar' alias - Curl 7.77.0 - Git LFS: 2.13.3 @@ -75,11 +75,11 @@ - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.1 - gpg (GnuPG) 2.3.1 -- helm v3.6.2+gee407bd +- helm v3.6.3+gd506314 - Hub CLI: 2.14.2 - jq 1.6 -- mongo v4.4.5 -- mongod v4.4.5 +- mongo v4.4.6 +- mongod v4.4.6 - Newman 5.2.4 - OpenSSL 1.1.1k 25 Mar 2021 `(/usr/local/opt/openssl -> /usr/local/Cellar/openssl@1.1/1.1.1k)` - Packer 1.7.3 @@ -96,13 +96,13 @@ ### Tools - Aliyun CLI 3.0.81 - App Center CLI 2.9.0 -- AWS CLI 2.2.18 +- AWS CLI 2.2.20 - AWS SAM CLI 1.26.0 - AWS Session Manager CLI 1.2.205.0 -- Azure CLI 2.26.0 -- Bicep CLI 0.4.63 +- Azure CLI 2.26.1 +- Bicep CLI 0.4.412 - Cabal 3.4.0.0 -- Cmake 3.20.5 +- Cmake 3.21.0 - Fastlane 2.187.0 - GHC 9.0.1 - GHCup v0.1.15.2 @@ -118,11 +118,11 @@ ### Browsers - Safari 14.1.1 (15611.2.7.1.6) - SafariDriver 14.1.1 (15611.2.7.1.6) -- Google Chrome 91.0.4472.114 +- Google Chrome 91.0.4472.164 - ChromeDriver 91.0.4472.101 - Microsoft Edge 91.0.864.67 -- MSEdgeDriver 91.0.864.67 -- Mozilla Firefox 89.0.2 +- MSEdgeDriver 91.0.864.70 +- Mozilla Firefox 90.0 - geckodriver 0.29.1 #### Environment variables @@ -170,8 +170,8 @@ #### Go - 1.13.15 - 1.14.15 -- 1.15.13 -- 1.16.5 +- 1.15.14 +- 1.16.6 ### Rust Tools - Cargo 1.53.0 @@ -206,7 +206,7 @@ ### Xamarin #### Visual Studio for Mac -- 8.10.5.16 +- 8.10.6.10 #### Xamarin bundles | symlink | Xamarin.Mono | Xamarin.iOS | Xamarin.Mac | Xamarin.Android | @@ -342,20 +342,21 @@ | watchOS 7.2 | 12.3
12.4 | 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 -| Package Name | Version | -| -------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 4.0 | -| Android Emulator | 30.7.5 | -| Android SDK Build-tools | 30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3
26.0.0 26.0.1 26.0.2 26.0.3
25.0.0 25.0.1 25.0.2 25.0.3
24.0.0 24.0.1 24.0.2 24.0.3 | -| Android SDK Platforms | android-S (rev 5)
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 Platform-Tools | 31.0.2 | -| Android Support Repository | 47.0.0 | -| CMake | 3.10.2
3.18.1 | -| Google APIs | addon-google_apis-google-21
addon-google_apis-google-22
addon-google_apis-google-23
addon-google_apis-google-24 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 15.2.4203891
18.1.5063045
21.4.7075529
22.1.7171670 | -| SDK Patch Applier v4 | 1 | +| Package Name | Version | +| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 4.0 | +| Android Emulator | 30.7.5 | +| Android SDK Build-tools | 31.0.0
30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3
26.0.0 26.0.1 26.0.2 26.0.3
25.0.0 25.0.1 25.0.2 25.0.3
24.0.0 24.0.1 24.0.2 24.0.3 | +| Android SDK Platforms | android-31 (rev 1)
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 Platform-Tools | 31.0.2 | +| Android Support Repository | 47.0.0 | +| CMake | 3.10.2
3.18.1 | +| Google APIs | addon-google_apis-google-21
addon-google_apis-google-22
addon-google_apis-google-23
addon-google_apis-google-24 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 15.2.4203891
18.1.5063045
21.4.7075529
22.1.7171670 | +| SDK Patch Applier v4 | 1 | +| Intel HAXM | 7.6.5 | #### Environment variables | Name | Value | From 08d7091533f75d597e4c230572b5b6a7bc234085 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Tue, 20 Jul 2021 22:37:48 +0300 Subject: [PATCH 0395/3485] Remove platform-tools from toolset (#3761) * Platform-tools is installed along with any version of build-tools, there is no need to install it explicitly --- images/linux/toolsets/toolset-1804.json | 3 +-- images/linux/toolsets/toolset-2004.json | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index d672818cd5c3..597ebdd4de4b 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -91,8 +91,7 @@ ], "additional_tools": [ "cmake;3.10.2.4988404", - "cmake;3.18.1", - "platform-tools" + "cmake;3.18.1" ], "ndk": { "lts": "21" diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index 832335d35dc5..cf633b67255b 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -87,8 +87,7 @@ ], "additional_tools": [ "cmake;3.10.2.4988404", - "cmake;3.18.1", - "platform-tools" + "cmake;3.18.1" ], "ndk": { "lts": "21", From aa5c34a60dfc80c33393c14e30fe38fef0118c96 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 21 Jul 2021 08:54:48 +0000 Subject: [PATCH 0396/3485] Ubuntu 1804 (20210718 update) (#3744) * Updating readme file for ubuntu18 version 20210718.1 * Add MongoDB announcement Co-authored-by: Image generation service account Co-authored-by: Alena Sviridenko Co-authored-by: Actions service account --- images/linux/Ubuntu1804-README.md | 85 ++++++++++++++++--------------- 1 file changed, 43 insertions(+), 42 deletions(-) diff --git a/images/linux/Ubuntu1804-README.md b/images/linux/Ubuntu1804-README.md index ae82de1b6f35..2e064dd63889 100644 --- a/images/linux/Ubuntu1804-README.md +++ b/images/linux/Ubuntu1804-README.md @@ -1,12 +1,12 @@ | Announcements | |-| | [[Ubuntu] Ansible will be updated to Ansible 4 on July, 19th](https://github.com/actions/virtual-environments/issues/3714) | -| [[all OS versions] Android SDK tools will be changed to Command line tools on July, 12](https://github.com/actions/virtual-environments/issues/3638) | | [Ubuntu 16.04 environment will be removed on September 20, 2021](https://github.com/actions/virtual-environments/issues/3287) | +| [[all OS] MongoDB will be updated to version 5 on July, 26th](https://github.com/actions/virtual-environments/issues/3749) | *** # Ubuntu 18.04.5 LTS - Linux kernel version: 5.4.0-1051-azure -- Image Version: 20210712.0 +- Image Version: 20210718.1 ## Installed Software ### Language and Runtime @@ -17,7 +17,7 @@ - Erlang rebar3 3.16.1 - GNU C++ 7.5.0, 9.4.0, 10.3.0 - GNU Fortran 7.5.0, 9.4.0, 10.3.0 -- Julia 1.6.1 +- Julia 1.6.2 - Mono 6.12.0.122 (apt source repository: https://download.mono-project.com/repo/ubuntu stable-bionic main) - MSBuild 16.6.0.15201 (from /usr/lib/mono/msbuild/15.0/bin/MSBuild.dll) - Node 14.17.3 @@ -29,15 +29,15 @@ ### Package Management - cpan 1.64 -- Helm 3.6.2 -- Homebrew 3.2.1 +- Helm 3.6.3 +- Homebrew 3.2.2 - Miniconda 4.9.2 - Npm 6.14.13 - Pip 9.0.1 - Pip3 9.0.1 - Pipx 0.16.3 - RubyGems 2.7.6 -- Vcpkg (build from master \) +- Vcpkg (build from master \<111220b>) - Yarn 1.22.10 #### Environment variables @@ -53,14 +53,14 @@ - Sbt 1.5.5 ### Tools -- Ansible 2.10.11 +- Ansible 2.11.2 - apt-fast 1.9.11 - AzCopy 10.11.0 (available by `azcopy` and `azcopy10` aliases) - Bazel 4.1.0 -- Bazelisk 1.9.0 -- Bicep 0.4.63 +- Bazelisk 1.10.1 +- Bicep 0.4.412 - Buildah 1.19.6 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- CMake 3.20.5 +- CMake 3.21.0 - CodeQL Action Bundle 2.5.7 - Docker Compose 1.29.2 - Docker-Buildx 0.5.1 @@ -70,8 +70,8 @@ - Git LFS 2.13.3 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.3.1 - Haveged 1.9.1 -- Heroku 7.56.0 -- HHVM (HipHop VM) 4.117.0 +- Heroku 7.56.1 +- HHVM (HipHop VM) 4.118.1 - jq 1.5 - Kind 0.11.1 - Kubectl 1.20.1-5-g76a04fc @@ -86,26 +86,27 @@ - Packer 1.7.3 - PhantomJS 2.1.1 - Podman 3.0.1 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- Pulumi 3.6.1 +- Pulumi 3.7.0 - R 4.1.0 - Skopeo 1.2.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 - SVN 1.9.7 - Terraform 1.0.2 - yamllint 1.26.1 +- yq 4.11.0 - zstd 1.5.0 (homebrew) ### CLI Tools - Alibaba Cloud CLI 3.0.81 -- AWS CLI 1.19.109 +- AWS CLI 1.20.1 - AWS CLI Session manager plugin 1.2.205.0 - AWS SAM CLI 1.26.0 -- Azure CLI (azure-cli) 2.26.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) +- Azure CLI (azure-cli) 2.26.1 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.18.0 - GitHub CLI 1.12.1 -- Google Cloud SDK 347.0.0 (apt source repository: https://packages.cloud.google.com/apt) +- Google Cloud SDK 348.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 4.1.23 +- Netlify CLI 4.4.2 - OpenShift CLI 4.7.19 - ORAS CLI 0.12.0 - Vercel CLI 23.0.1 @@ -147,9 +148,9 @@ - Rustfmt 1.4.37 ### Browsers and Drivers -- Google Chrome 91.0.4472.114 +- Google Chrome 91.0.4472.164 - ChromeDriver 91.0.4472.101 -- Mozilla Firefox 89.0.2 +- Mozilla Firefox 90.0 - Geckodriver 0.29.1 - Chromium 91.0.4472.0 @@ -160,10 +161,10 @@ | GECKOWEBDRIVER | /usr/local/share/gecko_driver | ### .NET Core SDK -- 2.1.302 2.1.403 2.1.524 2.1.617 2.1.701 2.1.816 3.1.116 3.1.202 3.1.302 3.1.410 5.0.104 5.0.204 5.0.301 +- 2.1.302 2.1.403 2.1.524 2.1.617 2.1.701 2.1.816 3.1.117 3.1.202 3.1.302 3.1.411 5.0.104 5.0.205 5.0.302 ### Databases -- MongoDB 4.4.6 (apt source repository: https://repo.mongodb.org/apt/ubuntu) +- MongoDB 4.4.7 (apt source repository: https://repo.mongodb.org/apt/ubuntu) - Postgre SQL 13.3 (apt source repository: https://apt.postgresql.org/pub/repos/apt/) - sqlite3 3.22.0 @@ -182,7 +183,7 @@ #### Go - 1.13.15 - 1.14.15 -- 1.15.13 +- 1.15.14 #### Node.js - 10.24.1 @@ -213,7 +214,7 @@ | --------------- | ----------------------------------- | ------------ | | GOROOT_1_13_X64 | /opt/hostedtoolcache/go/1.13.15/x64 | x64 | | GOROOT_1_14_X64 | /opt/hostedtoolcache/go/1.14.15/x64 | x64 | -| GOROOT_1_15_X64 | /opt/hostedtoolcache/go/1.15.13/x64 | x64 | +| GOROOT_1_15_X64 | /opt/hostedtoolcache/go/1.15.14/x64 | x64 | ### PowerShell Tools - PowerShell 7.1.3 @@ -225,7 +226,7 @@ | Pester | 5.2.2 | #### Az PowerShell Modules -- 5.9.0 3.1.0.zip 4.4.0.zip +- 6.1.0 3.1.0.zip 4.4.0.zip 5.9.0.zip ### Web Servers | Name | Version | ConfigFile | ServiceStatus | ListenPort | @@ -234,21 +235,21 @@ | nginx | 1.14.0 | /etc/nginx/nginx.conf | inactive | 80 | ### Android -| Package Name | Version | -| -------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 4.0 | -| Android Emulator | 30.7.5 | -| Android SDK Build-tools | 30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3
26.0.0 26.0.1 26.0.2 26.0.3
25.0.0 25.0.1 25.0.2 25.0.3
24.0.0 24.0.1 24.0.2 24.0.3
23.0.1 23.0.2 23.0.3 | -| Android SDK Platform-Tools | 31.0.2 | -| Android SDK Platforms | android-S (rev 5)
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 SDK Tools | 26.1.1 | -| Android Support Repository | 47.0.0 | -| CMake | 3.10.2
3.18.1 | -| Google APIs | addon-google_apis-google-21
addon-google_apis-google-22
addon-google_apis-google-23
addon-google_apis-google-24 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 21.4.7075529 | -| SDK Patch Applier v4 | 1 | +| Package Name | Version | +| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 4.0 | +| Android Emulator | 30.7.5 | +| Android SDK Build-tools | 31.0.0
30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3
26.0.0 26.0.1 26.0.2 26.0.3
25.0.0 25.0.1 25.0.2 25.0.3
24.0.0 24.0.1 24.0.2 24.0.3
23.0.1 23.0.2 23.0.3 | +| Android SDK Platform-Tools | 31.0.2 | +| Android SDK Platforms | android-31 (rev 1)
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 SDK Tools | 26.1.1 | +| Android Support Repository | 47.0.0 | +| CMake | 3.10.2
3.18.1 | +| Google APIs | addon-google_apis-google-21
addon-google_apis-google-22
addon-google_apis-google-23
addon-google_apis-google-24 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 21.4.7075529 | +| SDK Patch Applier v4 | 1 | #### Environment variables | Name | Value | @@ -274,9 +275,9 @@ | node:12-alpine | sha256:05328aa871f251b0643b8dcaa01034f126a8343b51ef302de207ad153a6b6232 | 2021-07-07 | | node:14 | sha256:0c558991de47e614588a61f9cc90afdcf034c6fc641d3ab650c9570a98b37605 | 2021-07-07 | | node:14-alpine | sha256:fb6cb918cc72869bd625940f42a7d8ae035c4e786d08187b94e8b91c6a534dfd | 2021-07-07 | -| ubuntu:16.04 | sha256:6aab78d1825b4c15c159fecc62b8eef4fdf0c693a15aace3a605ad44e5e2df0c | 2021-06-17 | -| ubuntu:18.04 | sha256:139b3846cee2e63de9ced83cee7023a2d95763ee2573e5b0ab6dea9dfbd4db8f | 2021-06-17 | -| ubuntu:20.04 | sha256:aba80b77e27148d99c034a987e7da3a287ed455390352663418c0f2ed40417fe | 2021-06-17 | +| ubuntu:16.04 | sha256:1b733ff6c7c7aac32101a35cb2c6399ca8c399a9f6de62a386abe26c65b59b9e | 2021-06-17 | +| ubuntu:18.04 | sha256:3b8692dc4474d4f6043fae285676699361792ce1828e22b1b57367b5c05457e3 | 2021-07-13 | +| ubuntu:20.04 | sha256:b3e2e47d016c08b3396b5ebe06ab0b711c34e7f37b98c9d37abe794b71cea0a2 | 2021-07-13 | ### Installed apt packages | Name | Version | From c4a2a7484c0eb1ee31bfdb453ef8b707ee1ea092 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 21 Jul 2021 09:55:29 +0000 Subject: [PATCH 0397/3485] Updating readme file for win16 version 20210719.0 (#3760) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/win/Windows2016-Readme.md | 106 +++++++++++++++---------------- 1 file changed, 53 insertions(+), 53 deletions(-) diff --git a/images/win/Windows2016-Readme.md b/images/win/Windows2016-Readme.md index 439ac8258f73..688f90d9fc46 100644 --- a/images/win/Windows2016-Readme.md +++ b/images/win/Windows2016-Readme.md @@ -1,16 +1,16 @@ | Announcements | |-| -| [[all OS versions] Android SDK tools will be changed to Command line tools on July, 12](https://github.com/actions/virtual-environments/issues/3638) | +| [[all OS] MongoDB will be updated to version 5 on July, 26th](https://github.com/actions/virtual-environments/issues/3749) | *** # Microsoft Windows Server 2016 Datacenter -- OS Version: 10.0.14393 Build 4470 -- Image Version: 20210711.1 +- OS Version: 10.0.14393 Build 4530 +- Image Version: 20210719.0 ## Installed Software ### Language and Runtime - Bash 4.4.23(1)-release -- Go 1.15.13 -- Julia 1.6.1 +- Go 1.15.14 +- Julia 1.6.2 - Node 14.17.3 - Perl 5.32.1 - PHP 8.0.8 @@ -27,7 +27,7 @@ - pip 21.1.3 (python 3.7) - Pipx 0.16.3 - RubyGems 2.7.6.3 -- Vcpkg (build from master \<7d169b4>) +- Vcpkg (build from master \<111220b>) - Yarn 1.22.10 #### Environment variables @@ -37,37 +37,37 @@ | VCPKG_INSTALLATION_ROOT | C:\vcpkg | ### Project Management -- Ant 1.10.10 +- Ant 1.10.11 - Gradle 7.1 - Maven 3.8.1 -- sbt 1.5.4 +- sbt 1.5.5 ### Tools - 7zip 19.00 - azcopy 10.11.0 - Bazel 4.1.0 -- Bazelisk 1.9.0 -- Bicep 0.4.63 +- Bazelisk 1.10.1 +- Bicep 0.4.412 - Cabal 3.4.0.0 -- CMake 3.20.5 +- CMake 3.21.0 - CodeQL Action Bundle 2.5.7 - Docker 20.10.6 - Docker-compose 1.29.1 - ghc 9.0.1 - Git 2.32.0 - Git LFS 2.13.3 -- Google Cloud SDK 347.0.0 +- Google Cloud SDK 348.0.0 - InnoSetup 6.2.0 - jq 1.6 - Kind 0.11.1 -- Kubectl 1.21.2 +- Kubectl 1.21.3 - Mercurial 5.0 - Mingw-w64 8.1.0 - Newman 5.2.4 - NSIS v3.06.1 - OpenSSL 1.1.1 -- Packer 1.7.2 -- Pulumi v3.6.1 +- Packer 1.7.3 +- Pulumi v3.7.0 - R 4.1.0 - Stack 2.7.1 - Subversion (SVN) 1.14.1 @@ -79,10 +79,10 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.81 -- AWS CLI 2.2.18 +- AWS CLI 2.2.20 - AWS SAM CLI 1.26.0 - AWS Session Manager CLI 1.2.205.0 -- Azure CLI 2.26.0 +- Azure CLI 2.26.1 - Azure DevOps CLI extension 0.18.0 - Cloud Foundry CLI 6.53.0 - GitHub CLI 1.12.1 @@ -103,11 +103,11 @@ - Rustfmt 1.4.37 ### Browsers and webdrivers -- Google Chrome 91.0.4472.124 +- Google Chrome 91.0.4472.164 - Chrome Driver 91.0.4472.101 -- Microsoft Edge 91.0.864.67 -- Microsoft Edge Driver 91.0.864.67 -- Mozilla Firefox 89.0.2 +- Microsoft Edge 91.0.864.70 +- Microsoft Edge Driver 91.0.864.70 +- Mozilla Firefox 90.0 - Gecko Driver 0.29.1 - IE Driver 3.150.1.0 @@ -145,8 +145,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | ------- | ------------ | -------------------- | | 1.13.15 | x64 | GOROOT_1_13_X64 | | 1.14.15 | x64 | GOROOT_1_14_X64 | -| 1.15.13 (Default) | x64 | GOROOT_1_15_X64 | -| 1.16.5 | x64 | GOROOT_1_16_X64 | +| 1.15.14 (Default) | x64 | GOROOT_1_15_X64 | +| 1.16.6 | x64 | GOROOT_1_16_X64 | #### Node @@ -204,7 +204,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### MongoDB | Version | ServiceName | ServiceStatus | ServiceStartType | | ------- | ----------- | ------------- | ---------------- | -| 4.4.6.0 | MongoDB | Running | Automatic | +| 4.4.7.0 | MongoDB | Running | Automatic | @@ -224,7 +224,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Visual Studio Enterprise 2017 | Name | Version | Path | | ----------------------------- | --------------- | -------------------------------------------------------------- | -| Visual Studio Enterprise 2017 | 15.9.28307.1525 | C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise | +| Visual Studio Enterprise 2017 | 15.9.28307.1585 | C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise | #### Workloads, components and extensions: @@ -493,20 +493,20 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### .NET Core SDK `Location C:\Program Files\dotnet\sdk` -- 1.1.14 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.519 2.1.520 2.1.521 2.1.522 2.1.523 2.1.524 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.616 2.1.617 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 2.1.811 2.1.812 2.1.813 2.1.814 2.1.815 2.1.816 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.109 3.1.110 3.1.111 3.1.112 3.1.113 3.1.114 3.1.115 3.1.116 3.1.200 3.1.201 3.1.202 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 3.1.408 3.1.409 3.1.410 5.0.100 5.0.101 5.0.102 5.0.103 5.0.104 5.0.200 5.0.201 5.0.202 5.0.203 5.0.204 5.0.300 5.0.301 +- 1.1.14 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.519 2.1.520 2.1.521 2.1.522 2.1.523 2.1.524 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.616 2.1.617 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 2.1.811 2.1.812 2.1.813 2.1.814 2.1.815 2.1.816 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.109 3.1.110 3.1.111 3.1.112 3.1.113 3.1.114 3.1.115 3.1.116 3.1.117 3.1.200 3.1.201 3.1.202 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 3.1.408 3.1.409 3.1.410 3.1.411 5.0.100 5.0.101 5.0.102 5.0.103 5.0.104 5.0.200 5.0.201 5.0.202 5.0.203 5.0.204 5.0.205 5.0.300 5.0.301 5.0.302 ### .NET Core Runtime `Location: C:\Program Files\dotnet\shared\Microsoft.AspNetCore.All` - 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23 2.1.24 2.1.25 2.1.26 2.1.27 2.1.28 `Location: C:\Program Files\dotnet\shared\Microsoft.AspNetCore.App` -- 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23 2.1.24 2.1.25 2.1.26 2.1.27 2.1.28 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9 3.1.10 3.1.11 3.1.12 3.1.13 3.1.14 3.1.15 3.1.16 5.0.0 5.0.1 5.0.2 5.0.3 5.0.4 5.0.5 5.0.6 5.0.7 +- 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23 2.1.24 2.1.25 2.1.26 2.1.27 2.1.28 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9 3.1.10 3.1.11 3.1.12 3.1.13 3.1.14 3.1.15 3.1.16 3.1.17 5.0.0 5.0.1 5.0.2 5.0.3 5.0.4 5.0.5 5.0.6 5.0.7 5.0.8 `Location: C:\Program Files\dotnet\shared\Microsoft.NETCore.App` -- 1.0.16 1.1.13 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23 2.1.24 2.1.25 2.1.26 2.1.27 2.1.28 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9 3.1.10 3.1.11 3.1.12 3.1.13 3.1.14 3.1.15 3.1.16 5.0.0 5.0.1 5.0.2 5.0.3 5.0.4 5.0.5 5.0.6 5.0.7 +- 1.0.16 1.1.13 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23 2.1.24 2.1.25 2.1.26 2.1.27 2.1.28 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9 3.1.10 3.1.11 3.1.12 3.1.13 3.1.14 3.1.15 3.1.16 3.1.17 5.0.0 5.0.1 5.0.2 5.0.3 5.0.4 5.0.5 5.0.6 5.0.7 5.0.8 `Location: C:\Program Files\dotnet\shared\Microsoft.WindowsDesktop.App` -- 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9 3.1.10 3.1.11 3.1.12 3.1.13 3.1.14 3.1.15 3.1.16 5.0.0 5.0.1 5.0.2 5.0.3 5.0.4 5.0.5 5.0.6 5.0.7 +- 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9 3.1.10 3.1.11 3.1.12 3.1.13 3.1.14 3.1.15 3.1.16 3.1.17 5.0.0 5.0.1 5.0.2 5.0.3 5.0.4 5.0.5 5.0.6 5.0.7 5.0.8 ### .NET Framework `Type: Developer Pack` @@ -517,11 +517,11 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - PowerShell 7.1.3 #### Azure Powershell Modules -| Module | Version | Path | -| ------- | ---------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------ | -| Az | 1.0.0.zip
1.6.0.zip
2.3.2.zip
2.6.0.zip
3.1.0.zip
3.5.0.zip
3.8.0.zip
4.3.0.zip
4.4.0.zip
4.7.0.zip
5.5.0.zip
5.9.0 | C:\Modules\az_\ | -| Azure | 3.8.0.zip
4.2.1.zip
5.1.1.zip
2.1.0 [Installed]
5.3.0 | C:\Modules\azure_\ | -| AzureRM | 3.8.0.zip
4.2.1.zip
5.1.1.zip
6.7.0.zip
2.1.0 [Installed]
6.13.1 | C:\Modules\azurerm_\ | +| Module | Version | Path | +| ------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------ | +| Az | 1.0.0.zip
1.6.0.zip
2.3.2.zip
2.6.0.zip
3.1.0.zip
3.5.0.zip
3.8.0.zip
4.3.0.zip
4.4.0.zip
4.7.0.zip
5.5.0.zip
5.9.0.zip
6.1.0 | C:\Modules\az_\ | +| Azure | 2.1.0 [Installed]
3.8.0.zip
4.2.1.zip
5.1.1.zip
5.3.0 | C:\Modules\azure_\ | +| AzureRM | 2.1.0 [Installed]
3.8.0.zip
4.2.1.zip
5.1.1.zip
6.7.0.zip
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'. @@ -536,24 +536,24 @@ All other versions are saved but not installed. | PowerShellGet | 1.0.0.1
2.2.5 | | PSScriptAnalyzer | 1.19.1 | | PSWindowsUpdate | 2.2.0.2 | -| SqlServer | 21.1.18245 | +| SqlServer | 21.1.18256 | | VSSetup | 2.2.16 | ### Android -| Package Name | Version | -| -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 4.0 | -| Android SDK Build-tools | 30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3
26.0.0 26.0.1 26.0.2 26.0.3
25.0.0 25.0.1 25.0.2 25.0.3
24.0.0 24.0.1 24.0.2 24.0.3
23.0.1 23.0.2 23.0.3
22.0.1
21.1.2
20.0.0
19.1.0 | -| Android SDK Platforms | android-S (rev 5)
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 Platform-Tools | 31.0.2 | -| Android SDK Tools | 25.2.5 | -| Android Support Repository | 47.0.0 | -| CMake | 3.10.2
3.18.1 | -| Google APIs | addon-google_apis-google-21
addon-google_apis-google-22
addon-google_apis-google-23
addon-google_apis-google-24| -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 21.4.7075529
22.1.7171670 | -| SDK Patch Applier v4 | 1 | +| Package Name | Version | +| -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 4.0 | +| Android SDK Build-tools | 31.0.0
30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3
26.0.0 26.0.1 26.0.2 26.0.3
25.0.0 25.0.1 25.0.2 25.0.3
24.0.0 24.0.1 24.0.2 24.0.3
23.0.1 23.0.2 23.0.3
22.0.1
21.1.2
20.0.0
19.1.0 | +| Android SDK Platforms | android-31 (rev 1)
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 Platform-Tools | 31.0.2 | +| Android SDK Tools | 25.2.5 | +| Android Support Repository | 47.0.0 | +| CMake | 3.10.2
3.18.1 | +| Google APIs | addon-google_apis-google-21
addon-google_apis-google-22
addon-google_apis-google-23
addon-google_apis-google-24 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 21.4.7075529
22.1.7171670 | +| SDK Patch Applier v4 | 1 | #### Environment variables | Name | Value | @@ -568,11 +568,11 @@ All other versions are saved but not installed. ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2016 | sha256:6f1f6e1e3cf6391a8738aacea3128db2d888a7ac269ea9b0a2d3632394dc194c | 2021-07-08 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2016 | sha256:d839398735dd59b2fa38a1b309a01478fcec69c1adbf67df8dfabadbe9b93dda | 2021-07-08 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2016 | sha256:b0039c9880b74156fd6da75cb9c549494b22d43ddce47d690aeaa4064b6e4d37 | 2021-07-08 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2016 | sha256:3910e75b2ee39515b598e107bdeb7fe83578aea0c1042c1b168070add760a0c3 | 2021-07-13 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2016 | sha256:1fdb72914bfdedf0b121b911d4d4d948d3e369d4dee36e39c135f967215b7092 | 2021-07-13 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2016 | sha256:65d94ee17565554801c4ba0a9b153ee90b6a25bcdb5395356d8f0c452c002203 | 2021-07-13 | | mcr.microsoft.com/windows/nanoserver:10.0.14393.953 | sha256:fc60bd5ae0e61b334ce1cf1bcbf20c10c36b4c5482a01da319c9c989f9e6e268 | 2017-03-08 | -| mcr.microsoft.com/windows/servercore:ltsc2016 | sha256:f07c36fa2f9220861e3c0508080d035271e3960fbc1f28eb2ffe6d05e69b6047 | 2021-07-06 | +| mcr.microsoft.com/windows/servercore:ltsc2016 | sha256:c6b1c3fecf651e7629f96874393476ba00cda2a1c2090314fdfe384267cd584f | 2021-07-09 | From a2b7ff271cac82fed6ac6d874af59c0967942d6d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 21 Jul 2021 10:27:17 +0000 Subject: [PATCH 0398/3485] Updating readme file for win19 version 20210719.0 (#3756) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/win/Windows2019-Readme.md | 108 +++++++++++++++---------------- 1 file changed, 54 insertions(+), 54 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index 56c0896220e8..6f0f45f7f82b 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -1,10 +1,10 @@ | Announcements | |-| -| [[all OS versions] Android SDK tools will be changed to Command line tools on July, 12](https://github.com/actions/virtual-environments/issues/3638) | +| [[all OS] MongoDB will be updated to version 5 on July, 26th](https://github.com/actions/virtual-environments/issues/3749) | *** # Microsoft Windows Server 2019 Datacenter -- OS Version: 10.0.17763 Build 2029 -- Image Version: 20210711.1 +- OS Version: 10.0.17763 Build 2061 +- Image Version: 20210719.0 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -12,8 +12,8 @@ ## Installed Software ### Language and Runtime - Bash 4.4.23(1)-release -- Go 1.15.13 -- Julia 1.6.1 +- Go 1.15.14 +- Julia 1.6.2 - Node 14.17.3 - Perl 5.32.1 - PHP 8.0.8 @@ -30,7 +30,7 @@ - pip 21.1.3 (python 3.7) - Pipx 0.16.3 - RubyGems 2.7.6.3 -- Vcpkg (build from master \<7d169b4>) +- Vcpkg (build from master \<111220b>) - Yarn 1.22.10 #### Environment variables @@ -40,37 +40,37 @@ | VCPKG_INSTALLATION_ROOT | C:\vcpkg | ### Project Management -- Ant 1.10.10 +- Ant 1.10.11 - Gradle 7.1 - Maven 3.8.1 -- sbt 1.5.4 +- sbt 1.5.5 ### Tools - 7zip 19.00 - azcopy 10.11.0 - Bazel 4.1.0 -- Bazelisk 1.9.0 -- Bicep 0.4.63 +- Bazelisk 1.10.1 +- Bicep 0.4.412 - Cabal 3.4.0.0 -- CMake 3.20.5 +- CMake 3.21.0 - CodeQL Action Bundle 2.5.7 - Docker 20.10.6 - Docker-compose 1.29.1 - ghc 9.0.1 - Git 2.32.0 - Git LFS 2.13.3 -- Google Cloud SDK 347.0.0 +- Google Cloud SDK 348.0.0 - InnoSetup 6.2.0 - jq 1.6 - Kind 0.11.1 -- Kubectl 1.21.2 +- Kubectl 1.21.3 - Mercurial 5.0 - Mingw-w64 8.1.0 - Newman 5.2.4 - NSIS v3.06.1 - OpenSSL 1.1.1 -- Packer 1.7.2 -- Pulumi v3.6.1 +- Packer 1.7.3 +- Pulumi v3.7.0 - R 4.1.0 - Stack 2.7.1 - Subversion (SVN) 1.14.1 @@ -82,10 +82,10 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.81 -- AWS CLI 2.2.18 +- AWS CLI 2.2.20 - AWS SAM CLI 1.26.0 - AWS Session Manager CLI 1.2.205.0 -- Azure CLI 2.26.0 +- Azure CLI 2.26.1 - Azure DevOps CLI extension 0.18.0 - Cloud Foundry CLI 6.53.0 - GitHub CLI 1.12.1 @@ -106,11 +106,11 @@ - Rustfmt 1.4.37 ### Browsers and webdrivers -- Google Chrome 91.0.4472.124 +- Google Chrome 91.0.4472.164 - Chrome Driver 91.0.4472.101 -- Microsoft Edge 91.0.864.67 -- Microsoft Edge Driver 91.0.864.67 -- Mozilla Firefox 89.0.2 +- Microsoft Edge 91.0.864.70 +- Microsoft Edge Driver 91.0.864.70 +- Mozilla Firefox 90.0 - Gecko Driver 0.29.1 - IE Driver 3.150.1.0 @@ -151,8 +151,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | ------- | ------------ | -------------------- | | 1.13.15 | x64 | GOROOT_1_13_X64 | | 1.14.15 | x64 | GOROOT_1_14_X64 | -| 1.15.13 (Default) | x64 | GOROOT_1_15_X64 | -| 1.16.5 | x64 | GOROOT_1_16_X64 | +| 1.15.14 (Default) | x64 | GOROOT_1_15_X64 | +| 1.16.6 | x64 | GOROOT_1_16_X64 | #### Node @@ -210,7 +210,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### MongoDB | Version | ServiceName | ServiceStatus | ServiceStartType | | ------- | ----------- | ------------- | ---------------- | -| 4.4.6.0 | MongoDB | Running | Automatic | +| 4.4.7.0 | MongoDB | Running | Automatic | @@ -454,7 +454,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Workload.Universal | 16.10.31205.180 | | Microsoft.VisualStudio.Workload.VisualStudioExtension | 16.10.31205.180 | | ms-biztalk.BizTalk | 3.13.2.0 | -| ProBITools.MicrosoftAnalysisServicesModelingProjects | 2.9.17 | +| ProBITools.MicrosoftAnalysisServicesModelingProjects | 2.9.18 | | ProBITools.MicrosoftReportProjectsforVisualStudio | 2.6.11 | | SSIS.SqlServerIntegrationServicesProjects | 3.14 | | VisualStudioClient.MicrosoftVisualStudio2017InstallerProjects | 1.0.0 | @@ -484,20 +484,20 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### .NET Core SDK `Location C:\Program Files\dotnet\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.519 2.1.520 2.1.521 2.1.522 2.1.523 2.1.524 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.616 2.1.617 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 2.1.811 2.1.812 2.1.813 2.1.814 2.1.815 2.1.816 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.109 3.1.110 3.1.111 3.1.112 3.1.113 3.1.114 3.1.115 3.1.116 3.1.200 3.1.201 3.1.202 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 3.1.408 3.1.409 3.1.410 5.0.100 5.0.101 5.0.102 5.0.103 5.0.104 5.0.200 5.0.201 5.0.202 5.0.203 5.0.204 5.0.300 5.0.301 +- 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.519 2.1.520 2.1.521 2.1.522 2.1.523 2.1.524 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.616 2.1.617 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 2.1.811 2.1.812 2.1.813 2.1.814 2.1.815 2.1.816 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.109 3.1.110 3.1.111 3.1.112 3.1.113 3.1.114 3.1.115 3.1.116 3.1.117 3.1.200 3.1.201 3.1.202 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 3.1.408 3.1.409 3.1.410 3.1.411 5.0.100 5.0.101 5.0.102 5.0.103 5.0.104 5.0.200 5.0.201 5.0.202 5.0.203 5.0.204 5.0.205 5.0.300 5.0.301 5.0.302 ### .NET Core Runtime `Location: C:\Program Files\dotnet\shared\Microsoft.AspNetCore.All` - 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23 2.1.24 2.1.25 2.1.26 2.1.27 2.1.28 `Location: C:\Program Files\dotnet\shared\Microsoft.AspNetCore.App` -- 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23 2.1.24 2.1.25 2.1.26 2.1.27 2.1.28 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9 3.1.10 3.1.11 3.1.12 3.1.13 3.1.14 3.1.15 3.1.16 5.0.0 5.0.1 5.0.2 5.0.3 5.0.4 5.0.5 5.0.6 5.0.7 +- 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23 2.1.24 2.1.25 2.1.26 2.1.27 2.1.28 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9 3.1.10 3.1.11 3.1.12 3.1.13 3.1.14 3.1.15 3.1.16 3.1.17 5.0.0 5.0.1 5.0.2 5.0.3 5.0.4 5.0.5 5.0.6 5.0.7 5.0.8 `Location: C:\Program Files\dotnet\shared\Microsoft.NETCore.App` -- 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23 2.1.24 2.1.25 2.1.26 2.1.27 2.1.28 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9 3.1.10 3.1.11 3.1.12 3.1.13 3.1.14 3.1.15 3.1.16 5.0.0 5.0.1 5.0.2 5.0.3 5.0.4 5.0.5 5.0.6 5.0.7 +- 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23 2.1.24 2.1.25 2.1.26 2.1.27 2.1.28 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9 3.1.10 3.1.11 3.1.12 3.1.13 3.1.14 3.1.15 3.1.16 3.1.17 5.0.0 5.0.1 5.0.2 5.0.3 5.0.4 5.0.5 5.0.6 5.0.7 5.0.8 `Location: C:\Program Files\dotnet\shared\Microsoft.WindowsDesktop.App` -- 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9 3.1.10 3.1.11 3.1.12 3.1.13 3.1.14 3.1.15 3.1.16 5.0.0 5.0.1 5.0.2 5.0.3 5.0.4 5.0.5 5.0.6 5.0.7 +- 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9 3.1.10 3.1.11 3.1.12 3.1.13 3.1.14 3.1.15 3.1.16 3.1.17 5.0.0 5.0.1 5.0.2 5.0.3 5.0.4 5.0.5 5.0.6 5.0.7 5.0.8 ### .NET Framework `Type: Developer Pack` @@ -508,11 +508,11 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - PowerShell 7.1.3 #### Azure Powershell Modules -| Module | Version | Path | -| ------- | ---------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------ | -| Az | 1.0.0.zip
1.6.0.zip
2.3.2.zip
2.6.0.zip
3.1.0.zip
3.5.0.zip
3.8.0.zip
4.3.0.zip
4.4.0.zip
4.7.0.zip
5.5.0.zip
5.9.0 | C:\Modules\az_\ | -| Azure | 3.8.0.zip
4.2.1.zip
5.1.1.zip
2.1.0 [Installed]
5.3.0 | C:\Modules\azure_\ | -| AzureRM | 3.8.0.zip
4.2.1.zip
5.1.1.zip
6.7.0.zip
2.1.0 [Installed]
6.13.1 | C:\Modules\azurerm_\ | +| Module | Version | Path | +| ------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------ | +| Az | 1.0.0.zip
1.6.0.zip
2.3.2.zip
2.6.0.zip
3.1.0.zip
3.5.0.zip
3.8.0.zip
4.3.0.zip
4.4.0.zip
4.7.0.zip
5.5.0.zip
5.9.0.zip
6.1.0 | C:\Modules\az_\ | +| Azure | 2.1.0 [Installed]
3.8.0.zip
4.2.1.zip
5.1.1.zip
5.3.0 | C:\Modules\azure_\ | +| AzureRM | 2.1.0 [Installed]
3.8.0.zip
4.2.1.zip
5.1.1.zip
6.7.0.zip
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'. @@ -527,24 +527,24 @@ All other versions are saved but not installed. | PowerShellGet | 1.0.0.1
2.2.5 | | PSScriptAnalyzer | 1.19.1 | | PSWindowsUpdate | 2.2.0.2 | -| SqlServer | 21.1.18245 | +| SqlServer | 21.1.18256 | | VSSetup | 2.2.16 | ### Android -| Package Name | Version | -| -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 4.0 | -| Android SDK Build-tools | 30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3
26.0.0 26.0.1 26.0.2 26.0.3
25.0.0 25.0.1 25.0.2 25.0.3
24.0.0 24.0.1 24.0.2 24.0.3
23.0.1 23.0.2 23.0.3
22.0.1
21.1.2
20.0.0
19.1.0 | -| Android SDK Platforms | android-S (rev 5)
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 Platform-Tools | 31.0.2 | -| Android SDK Tools | 26.1.1 | -| Android Support Repository | 47.0.0 | -| CMake | 3.10.2
3.18.1 | -| Google APIs | addon-google_apis-google-21
addon-google_apis-google-22
addon-google_apis-google-23
addon-google_apis-google-24 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 21.4.7075529
22.1.7171670 | -| SDK Patch Applier v4 | 1 | +| Package Name | Version | +| -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 4.0 | +| Android SDK Build-tools | 31.0.0
30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3
26.0.0 26.0.1 26.0.2 26.0.3
25.0.0 25.0.1 25.0.2 25.0.3
24.0.0 24.0.1 24.0.2 24.0.3
23.0.1 23.0.2 23.0.3
22.0.1
21.1.2
20.0.0
19.1.0 | +| Android SDK Platforms | android-31 (rev 1)
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 Platform-Tools | 31.0.2 | +| Android SDK Tools | 26.1.1 | +| Android Support Repository | 47.0.0 | +| CMake | 3.10.2
3.18.1 | +| Google APIs | addon-google_apis-google-21
addon-google_apis-google-22
addon-google_apis-google-23
addon-google_apis-google-24 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 21.4.7075529
22.1.7171670 | +| SDK Patch Applier v4 | 1 | #### Environment variables | Name | Value | @@ -559,11 +559,11 @@ All other versions are saved but not installed. ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:8243310953cf430f0e7bbd5881ad02627dca2aac0c1672af016d0e7981c068a3 | 2021-07-08 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:87507e123f65c703b941da540914a8cf5c1d08334913e69c222927220352c2cd | 2021-07-08 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:aa3c8d10c1b6e503863b4f0672cf594919ab54b9431892eee422d797a19bd217 | 2021-07-08 | -| mcr.microsoft.com/windows/nanoserver:1809 | sha256:38c1fb9049c603299d7e885dc74ce55a6c97d22cef9b01df0e8a11489691bed6 | 2021-07-06 | -| mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:6dfc9ed8c6048a7a45fba93fdfc0b5c4cf1215392e74dfa674003ccfb99061fa | 2021-07-06 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:a1ff3aa24d42ea02743db1599c9beece02d66d3b48d3876b185ab2a1110b420c | 2021-07-13 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:6196293feeaed05af457e937edd64dde27fd49f996c1a9e00e198afd5edc8929 | 2021-07-13 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:c6e9c591b9e80e2cb0f8bcb736008ebbc3e3ed23de045523847ef0f9778dbaa6 | 2021-07-13 | +| mcr.microsoft.com/windows/nanoserver:1809 | sha256:0cfbe14b2bcb1bd1af2bdc1603f9b60e63effaf25bce3fbab9ceb23e02b2b97f | 2021-07-06 | +| mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:cc8a0215d2d19516c23b5f8a8e04799631c5ff2fb9a3c509fbd46f7ef7057877 | 2021-07-06 | From f7158e2805c2584ddad76deef5abe2a00b22817d Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Wed, 21 Jul 2021 14:11:34 +0300 Subject: [PATCH 0399/3485] [macOS] Disable App Nap System Wide (#3765) --- images/macos/provision/configuration/configure-machine.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/images/macos/provision/configuration/configure-machine.sh b/images/macos/provision/configuration/configure-machine.sh index 2951867fc3c9..ce9eb3bb8660 100644 --- a/images/macos/provision/configuration/configure-machine.sh +++ b/images/macos/provision/configuration/configure-machine.sh @@ -15,6 +15,9 @@ sudo /usr/sbin/DevToolsSecurity --enable sudo pmset hibernatemode 0 sudo rm -f /var/vm/sleepimage +# Disable App Nap System Wide +defaults write NSGlobalDomain NSAppSleepDisabled -bool YES + # Change screen resolution to the maximum supported for 4Mb video memory sudo "/Library/Application Support/VMware Tools/vmware-resolutionSet" 1176 885 From 9db2160d1e471b725f6bb0d1115dec4b1a594e5e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 21 Jul 2021 11:43:15 +0000 Subject: [PATCH 0400/3485] Ubuntu 2004 (20210718 update) (#3743) * Updating readme file for ubuntu20 version 20210718.1 * Add MongoDB announcement Co-authored-by: Image generation service account Co-authored-by: Alena Sviridenko Co-authored-by: Actions service account --- images/linux/Ubuntu2004-README.md | 87 ++++++++++++++++--------------- 1 file changed, 44 insertions(+), 43 deletions(-) diff --git a/images/linux/Ubuntu2004-README.md b/images/linux/Ubuntu2004-README.md index 8e8ae1b90dbe..9171fc10dc39 100644 --- a/images/linux/Ubuntu2004-README.md +++ b/images/linux/Ubuntu2004-README.md @@ -1,12 +1,12 @@ | Announcements | |-| | [[Ubuntu] Ansible will be updated to Ansible 4 on July, 19th](https://github.com/actions/virtual-environments/issues/3714) | -| [[all OS versions] Android SDK tools will be changed to Command line tools on July, 12](https://github.com/actions/virtual-environments/issues/3638) | | [Ubuntu 16.04 environment will be removed on September 20, 2021](https://github.com/actions/virtual-environments/issues/3287) | +| [[all OS] MongoDB will be updated to version 5 on July, 26th](https://github.com/actions/virtual-environments/issues/3749) | *** # Ubuntu 20.04.2 LTS - Linux kernel version: 5.8.0-1036-azure -- Image Version: 20210712.0 +- Image Version: 20210718.1 ## Installed Software ### Language and Runtime @@ -15,7 +15,7 @@ - Erlang rebar3 3.16.1 - GNU C++ 9.3.0, 10.3.0 - GNU Fortran 9.3.0, 10.3.0 -- Julia 1.6.1 +- Julia 1.6.2 - LLVM components: Clang 10.0.0, 11.0.0, 12.0.1, Clang-format 10.0.0, 11.0.0, 12.0.1 (apt source: deb http://apt.llvm.org/focal/ llvm-toolchain-focal-12) - Mono 6.12.0.122 (apt source repository: https://download.mono-project.com/repo/ubuntu stable-focal main) - MSBuild 16.6.0.15201 (from /usr/lib/mono/msbuild/15.0/bin/MSBuild.dll) @@ -28,15 +28,15 @@ ### Package Management - cpan 1.64 -- Helm 3.6.2 -- Homebrew 3.2.1 +- Helm 3.6.3 +- Homebrew 3.2.2 - Miniconda 4.9.2 - Npm 6.14.13 - Pip 20.0.2 - Pip3 20.0.2 - Pipx 0.16.3 - RubyGems 3.1.2 -- Vcpkg (build from master \) +- Vcpkg (build from master \<111220b>) - Yarn 1.22.10 #### Environment variables @@ -53,14 +53,14 @@ - Sbt 1.5.5 ### Tools -- Ansible 2.10.11 +- Ansible 2.11.2 - apt-fast 1.9.11 - AzCopy 10.11.0 (available by `azcopy` and `azcopy10` aliases) - Bazel 4.1.0 -- Bazelisk 1.9.0 -- Bicep 0.4.63 +- Bazelisk 1.10.1 +- Bicep 0.4.412 - Buildah 1.21.1 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- CMake 3.20.5 +- CMake 3.21.0 - CodeQL Action Bundle 2.5.7 - Docker Compose 1.29.2 - Docker-Buildx 0.5.1 @@ -71,8 +71,8 @@ - Git LFS 2.13.3 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.6.0 - Haveged 1.9.1 -- Heroku 7.56.0 -- HHVM (HipHop VM) 4.117.0 +- Heroku 7.56.1 +- HHVM (HipHop VM) 4.118.1 - jq 1.6 - Kind 0.11.1 - Kubectl 1.20.1-5-g76a04fc @@ -87,26 +87,27 @@ - Packer 1.7.3 - PhantomJS 2.1.1 - Podman 3.2.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- Pulumi 3.6.1 +- Pulumi 3.7.0 - R 4.1.0 - Skopeo 1.3.0 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 - Terraform 1.0.2 - yamllint 1.26.1 +- yq 4.11.0 - zstd 1.5.0 (homebrew) ### CLI Tools - Alibaba Cloud CLI 3.0.81 -- AWS CLI 2.2.18 +- AWS CLI 2.2.20 - AWS CLI Session manager plugin 1.2.205.0 - AWS SAM CLI 1.26.0 -- Azure CLI (azure-cli) 2.26.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) +- Azure CLI (azure-cli) 2.26.1 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.18.0 - GitHub CLI 1.12.1 -- Google Cloud SDK 347.0.0 (apt source repository: https://packages.cloud.google.com/apt) +- Google Cloud SDK 348.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 4.1.23 +- Netlify CLI 4.4.2 - OpenShift CLI 4.7.19 - ORAS CLI 0.12.0 - Vercel CLI 23.0.1 @@ -152,9 +153,9 @@ - Rustfmt 1.4.37 ### Browsers and Drivers -- Google Chrome 91.0.4472.114 +- Google Chrome 91.0.4472.164 - ChromeDriver 91.0.4472.101 -- Mozilla Firefox 89.0.2 +- Mozilla Firefox 90.0 - Geckodriver 0.29.1 - Chromium 91.0.4472.0 @@ -165,10 +166,10 @@ | GECKOWEBDRIVER | /usr/local/share/gecko_driver | ### .NET Core SDK -- 2.1.302 2.1.403 2.1.524 2.1.617 2.1.701 2.1.816 3.1.116 3.1.202 3.1.302 3.1.410 5.0.104 5.0.204 5.0.301 +- 2.1.302 2.1.403 2.1.524 2.1.617 2.1.701 2.1.816 3.1.117 3.1.202 3.1.302 3.1.411 5.0.104 5.0.205 5.0.302 ### Databases -- MongoDB 4.4.6 (apt source repository: https://repo.mongodb.org/apt/ubuntu) +- MongoDB 4.4.7 (apt source repository: https://repo.mongodb.org/apt/ubuntu) - Postgre SQL 13.3 (apt source repository: https://apt.postgresql.org/pub/repos/apt/) - sqlite3 3.31.1 @@ -186,8 +187,8 @@ ### Cached Tools #### Go - 1.14.15 -- 1.15.13 -- 1.16.5 +- 1.15.14 +- 1.16.6 #### Node.js - 10.24.1 @@ -217,8 +218,8 @@ | Name | Value | Architecture | | --------------- | ----------------------------------- | ------------ | | GOROOT_1_14_X64 | /opt/hostedtoolcache/go/1.14.15/x64 | x64 | -| GOROOT_1_15_X64 | /opt/hostedtoolcache/go/1.15.13/x64 | x64 | -| GOROOT_1_16_X64 | /opt/hostedtoolcache/go/1.16.5/x64 | x64 | +| GOROOT_1_15_X64 | /opt/hostedtoolcache/go/1.15.14/x64 | x64 | +| GOROOT_1_16_X64 | /opt/hostedtoolcache/go/1.16.6/x64 | x64 | ### PowerShell Tools - PowerShell 7.1.3 @@ -231,7 +232,7 @@ | PSScriptAnalyzer | 1.19.1 | #### Az PowerShell Modules -- 5.9.0 3.1.0.zip 4.4.0.zip +- 6.1.0 3.1.0.zip 4.4.0.zip 5.9.0.zip ### Web Servers | Name | Version | ConfigFile | ServiceStatus | ListenPort | @@ -241,20 +242,20 @@ | nginx | 1.18.0 | /etc/nginx/nginx.conf | inactive | 80 | ### Android -| Package Name | Version | -| -------------------------- | ------------------------------------------------------------------------------------------------------------------------ | -| Android Command Line Tools | 4.0 | -| Android Emulator | 30.7.5 | -| Android SDK Build-tools | 30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3 | -| Android SDK Platform-Tools | 31.0.2 | -| Android SDK Platforms | android-S (rev 5)
android-30 (rev 3)
android-29 (rev 5)
android-28 (rev 6)
android-27 (rev 3) | -| Android SDK Tools | 26.1.1 | -| Android Support Repository | 47.0.0 | -| CMake | 3.10.2
3.18.1 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 21.4.7075529
22.1.7171670 | -| SDK Patch Applier v4 | 1 | +| Package Name | Version | +| -------------------------- | ---------------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 4.0 | +| Android Emulator | 30.7.5 | +| Android SDK Build-tools | 31.0.0
30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3 | +| Android SDK Platform-Tools | 31.0.2 | +| Android SDK Platforms | android-31 (rev 1)
android-30 (rev 3)
android-29 (rev 5)
android-28 (rev 6)
android-27 (rev 3) | +| Android SDK Tools | 26.1.1 | +| Android Support Repository | 47.0.0 | +| CMake | 3.10.2
3.18.1 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 21.4.7075529
22.1.7171670 | +| SDK Patch Applier v4 | 1 | #### Environment variables | Name | Value | @@ -281,9 +282,9 @@ | node:12-alpine | sha256:05328aa871f251b0643b8dcaa01034f126a8343b51ef302de207ad153a6b6232 | 2021-07-07 | | node:14 | sha256:0c558991de47e614588a61f9cc90afdcf034c6fc641d3ab650c9570a98b37605 | 2021-07-07 | | node:14-alpine | sha256:fb6cb918cc72869bd625940f42a7d8ae035c4e786d08187b94e8b91c6a534dfd | 2021-07-07 | -| ubuntu:16.04 | sha256:6aab78d1825b4c15c159fecc62b8eef4fdf0c693a15aace3a605ad44e5e2df0c | 2021-06-17 | -| ubuntu:18.04 | sha256:139b3846cee2e63de9ced83cee7023a2d95763ee2573e5b0ab6dea9dfbd4db8f | 2021-06-17 | -| ubuntu:20.04 | sha256:aba80b77e27148d99c034a987e7da3a287ed455390352663418c0f2ed40417fe | 2021-06-17 | +| ubuntu:16.04 | sha256:1b733ff6c7c7aac32101a35cb2c6399ca8c399a9f6de62a386abe26c65b59b9e | 2021-06-17 | +| ubuntu:18.04 | sha256:3b8692dc4474d4f6043fae285676699361792ce1828e22b1b57367b5c05457e3 | 2021-07-13 | +| ubuntu:20.04 | sha256:b3e2e47d016c08b3396b5ebe06ab0b711c34e7f37b98c9d37abe794b71cea0a2 | 2021-07-13 | ### Installed apt packages | Name | Version | From 09920886d1d3b3936d727905dbac068f8d8942af Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 21 Jul 2021 11:58:59 +0000 Subject: [PATCH 0401/3485] [ubuntu] fix: correct variable to print only tool name (#3767) it was broken in #3701 --- images/linux/scripts/installers/Install-Toolset.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/linux/scripts/installers/Install-Toolset.ps1 b/images/linux/scripts/installers/Install-Toolset.ps1 index e60f5a2b2b67..e53bf87b3150 100644 --- a/images/linux/scripts/installers/Install-Toolset.ps1 +++ b/images/linux/scripts/installers/Install-Toolset.ps1 @@ -50,5 +50,5 @@ foreach ($tool in $tools) { exit 1 } } - chown -R "$($env:SUDO_USER):$($env:SUDO_USER)" /opt/hostedtoolcache/$tool + chown -R "$($env:SUDO_USER):$($env:SUDO_USER)" "/opt/hostedtoolcache/$($tool.name)" } From 9400af6b301274f4bb1562ac736397b189bc05ba Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Wed, 21 Jul 2021 16:15:34 +0300 Subject: [PATCH 0402/3485] [Ubuntu] Install yq to /usr/bin (#3768) * Installation to /usr/local/bin break some workflows --- images/linux/scripts/installers/yq.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/linux/scripts/installers/yq.sh b/images/linux/scripts/installers/yq.sh index 7f3e3b447737..ae633dae88f7 100644 --- a/images/linux/scripts/installers/yq.sh +++ b/images/linux/scripts/installers/yq.sh @@ -11,6 +11,6 @@ echo "Downloading latest yq from $YQ_URL" download_with_retries "$YQ_URL" "/tmp" "${YQ_BINARY}.tar.gz" tar xzf "/tmp/${YQ_BINARY}.tar.gz" -C "/tmp" -mv /tmp/${YQ_BINARY} /usr/local/bin/yq +mv /tmp/${YQ_BINARY} /usr/bin/yq invoke_tests "Tools" "yq" From 05781ccad03ca6cc140d1c89561622639523cc2c Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Thu, 22 Jul 2021 10:32:13 +0300 Subject: [PATCH 0403/3485] [Windows] Add GVFS (Git Virtual File System) (#3766) * Add GVFS (Git Virtual File System) * invoke all tests from git file --- images/win/scripts/Installers/Install-Git.ps1 | 13 ++++++++++++- .../SoftwareReport/SoftwareReport.Generator.ps1 | 1 + .../SoftwareReport/SoftwareReport.Tools.psm1 | 5 +++++ images/win/scripts/Tests/Git.Tests.ps1 | 6 ++++++ 4 files changed, 24 insertions(+), 1 deletion(-) diff --git a/images/win/scripts/Installers/Install-Git.ps1 b/images/win/scripts/Installers/Install-Git.ps1 index db2eb39119dc..4f543f5b2080 100644 --- a/images/win/scripts/Installers/Install-Git.ps1 +++ b/images/win/scripts/Installers/Install-Git.ps1 @@ -9,9 +9,20 @@ Choco-Install -PackageName git -ArgumentList '--installargs="/VERYSILENT /NOREST # Install hub Choco-Install -PackageName hub +# Install GVFS +$url = "https://api.github.com/repos/microsoft/VFSForGit/releases/latest" +[System.String] $gvfsLatest = (Invoke-RestMethod -Uri $url).assets.browser_download_url -match "SetupGVFS.+\.exe$" +$gvfsInstallerPath = Start-DownloadWithRetry -Url $gvfsLatest -Name "SetupGVFS.exe" + +# Start-Process waits on the entire process tree but Wait-Process only waits on the initiating process(GVFS.Service.UI.exe) +$env:GVFS_UNATTENDED = "1" +$argList = "/VERYSILENT", "/NORESTART", "/NOCANCEL", "/SP-", "/CLOSEAPPLICATIONS", "/RESTARTAPPLICATIONS", "/SUPPRESSMSGBOXES" +Start-Process $gvfsInstallerPath -ArgumentList $argList -PassThru | Wait-Process + # Disable GCM machine-wide [Environment]::SetEnvironmentVariable("GCM_INTERACTIVE", "Never", [System.EnvironmentVariableTarget]::Machine) +# Add to PATH Add-MachinePathItem "C:\Program Files\Git\bin" if (Test-IsWin16) { @@ -22,5 +33,5 @@ if (Test-IsWin16) { 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" -Invoke-PesterTests -TestFile "Git" -TestName "Git" +Invoke-PesterTests -TestFile "Git" Invoke-PesterTests -TestFile "CLI.Tools" -TestName "Hub CLI" diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index a8e6d947288f..8a2820a3da70 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -86,6 +86,7 @@ $markdown += New-MDList -Style Unordered -Lines (@( (Get-GHCVersion), (Get-GitVersion), (Get-GitLFSVersion), + (Get-GVFSVersion), (Get-GoogleCloudSDKVersion), (Get-InnoSetupVersion), (Get-JQVersion), diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 index c769c6260b98..c49374ea560d 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 @@ -67,6 +67,11 @@ function Get-GitLFSVersion { return "Git LFS $gitLfsVersion" } +function Get-GVFSVersion { + $gvfsVersion = (Get-Command gvfs).Version + return "GVFS $gvfsVersion" +} + function Get-InnoSetupVersion { return $(choco list --local-only innosetup) | Select-String -Pattern "InnoSetup" } diff --git a/images/win/scripts/Tests/Git.Tests.ps1 b/images/win/scripts/Tests/Git.Tests.ps1 index 9b71aa0b806b..b9d6a8e0aa42 100644 --- a/images/win/scripts/Tests/Git.Tests.ps1 +++ b/images/win/scripts/Tests/Git.Tests.ps1 @@ -23,3 +23,9 @@ Describe "Git" { $env:GCM_INTERACTIVE | Should -BeExactly Never } } + +Describe "GVFS" { + It "GVFS is installed" { + "gvfs --version" | Should -ReturnZeroExitCode + } +} From 966395f4bd2afb5c93752996e8738f66fb88dafd Mon Sep 17 00:00:00 2001 From: mikhailshaganov <81769678+mikhailshaganov@users.noreply.github.com> Date: Thu, 22 Jul 2021 11:31:30 +0300 Subject: [PATCH 0404/3485] [Ubuntu] Add kotlin (#3755) --- .../SoftwareReport/SoftwareReport.Common.psm1 | 5 ++++ .../SoftwareReport.Generator.ps1 | 3 ++- images/linux/scripts/installers/kotlin.sh | 18 +++++++++++++ images/linux/scripts/tests/Tools.Tests.ps1 | 26 +++++++++++++++++++ images/linux/ubuntu1804.json | 1 + images/linux/ubuntu2004.json | 1 + 6 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 images/linux/scripts/installers/kotlin.sh diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 index 48c10986ef11..324032a5b04e 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 @@ -124,6 +124,11 @@ function Get-SwiftVersion { return "Swift $swiftVersion" } +function Get-KotlinVersion { + $kotlinVersion = kotlin -version | Out-String | Take-OutputPart -Part 2 + return "Kotlin $kotlinVersion" +} + function Get-JuliaVersion { $juliaVersion = julia --version | Take-OutputPart -Part 2 return "Julia $juliaVersion" diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index 34dd7d11138a..8595d0b2a757 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -49,7 +49,8 @@ $runtimesList = @( (Get-Python3Version), (Get-RubyVersion), (Get-SwiftVersion), - (Get-JuliaVersion) + (Get-JuliaVersion), + (Get-KotlinVersion) ) if (Test-IsUbuntu20) { diff --git a/images/linux/scripts/installers/kotlin.sh b/images/linux/scripts/installers/kotlin.sh new file mode 100644 index 000000000000..4a34f874936d --- /dev/null +++ b/images/linux/scripts/installers/kotlin.sh @@ -0,0 +1,18 @@ +#!/bin/bash -e +################################################################################ +## File: kotlin.sh +## Desc: Installs Kotlin +################################################################################ + +source $HELPER_SCRIPTS/install.sh + +KOTLIN_ROOT="/usr/share" + +URL=$(curl -s https://api.github.com/repos/JetBrains/kotlin/releases/latest | jq -r '.assets[].browser_download_url | select(contains("kotlin-compiler"))') +download_with_retries $URL "/tmp" + +unzip -qq /tmp/kotlin-compiler*.zip -d $KOTLIN_ROOT +rm $KOTLIN_ROOT/kotlinc/bin/*.bat +ln -sf $KOTLIN_ROOT/kotlinc/bin/* /usr/bin + +invoke_tests "Tools" "Kotlin" \ No newline at end of file diff --git a/images/linux/scripts/tests/Tools.Tests.ps1 b/images/linux/scripts/tests/Tools.Tests.ps1 index d3b0cfbf5b63..fb0e81657832 100644 --- a/images/linux/scripts/tests/Tools.Tests.ps1 +++ b/images/linux/scripts/tests/Tools.Tests.ps1 @@ -383,3 +383,29 @@ Describe "yq" { "yq -V" | Should -ReturnZeroExitCode } } + +Describe "Kotlin" { + It "kapt" { + "kapt -version"| Should -ReturnZeroExitCode + } + + It "kotlin" { + "kotlin -version"| Should -ReturnZeroExitCode + } + + It "kotlinc" { + "kotlinc -version"| Should -ReturnZeroExitCode + } + + It "kotlinc-js" { + "kotlinc-js -version"| Should -ReturnZeroExitCode + } + + It "kotlinc-jvm" { + "kotlinc-jvm -version"| Should -ReturnZeroExitCode + } + + It "kotlin-dce-js" { + "kotlin-dce-js -version"| Should -ReturnZeroExitCode + } +} diff --git a/images/linux/ubuntu1804.json b/images/linux/ubuntu1804.json index 6841b61800d5..569e40857598 100644 --- a/images/linux/ubuntu1804.json +++ b/images/linux/ubuntu1804.json @@ -223,6 +223,7 @@ "{{template_dir}}/scripts/installers/mercurial.sh", "{{template_dir}}/scripts/installers/miniconda.sh", "{{template_dir}}/scripts/installers/mono.sh", + "{{template_dir}}/scripts/installers/kotlin.sh", "{{template_dir}}/scripts/installers/mysql.sh", "{{template_dir}}/scripts/installers/mssql-cmd-tools.sh", "{{template_dir}}/scripts/installers/sqlpackage.sh", diff --git a/images/linux/ubuntu2004.json b/images/linux/ubuntu2004.json index 5cc79cce4121..5999e6a33180 100644 --- a/images/linux/ubuntu2004.json +++ b/images/linux/ubuntu2004.json @@ -224,6 +224,7 @@ "{{template_dir}}/scripts/installers/mercurial.sh", "{{template_dir}}/scripts/installers/miniconda.sh", "{{template_dir}}/scripts/installers/mono.sh", + "{{template_dir}}/scripts/installers/kotlin.sh", "{{template_dir}}/scripts/installers/mysql.sh", "{{template_dir}}/scripts/installers/mssql-cmd-tools.sh", "{{template_dir}}/scripts/installers/sqlpackage.sh", From 99c8d003d430d036e5375b07e6c53fa605ddbb44 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Thu, 22 Jul 2021 14:32:48 +0300 Subject: [PATCH 0405/3485] [Ubuntu] Update MongoDB to version 5 (#3776) --- images/linux/scripts/installers/mongodb.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/images/linux/scripts/installers/mongodb.sh b/images/linux/scripts/installers/mongodb.sh index ea0b4f42629e..fd7287c46aa4 100644 --- a/images/linux/scripts/installers/mongodb.sh +++ b/images/linux/scripts/installers/mongodb.sh @@ -10,13 +10,13 @@ source $HELPER_SCRIPTS/os.sh REPO_URL="https://repo.mongodb.org/apt/ubuntu" # Install Mongo DB -wget -qO - https://www.mongodb.org/static/pgp/server-4.4.asc | sudo apt-key add - +wget -qO - https://www.mongodb.org/static/pgp/server-5.0.asc | sudo apt-key add - version=$(getOSVersionLabel) -echo "deb [ arch=amd64,arm64 ] $REPO_URL $version/mongodb-org/4.4 multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-org-4.4.list +echo "deb [ arch=amd64,arm64 ] $REPO_URL $version/mongodb-org/5.0 multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-org-5.0.list sudo apt-get update sudo apt-get install -y mongodb-org -rm /etc/apt/sources.list.d/mongodb-org-4.4.list +rm /etc/apt/sources.list.d/mongodb-org-5.0.list echo "mongodb $REPO_URL" >> $HELPER_SCRIPTS/apt-sources.txt From c7cfdf2683c5e30c85996f835bd396681b5404c5 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Thu, 22 Jul 2021 17:31:36 +0300 Subject: [PATCH 0406/3485] [macOS] Update MongoDB to version 5 (#3772) --- images/macos/provision/core/mongodb.sh | 10 ++++------ images/macos/tests/Databases.Tests.ps1 | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/images/macos/provision/core/mongodb.sh b/images/macos/provision/core/mongodb.sh index 944ef21c39f1..9e6c2bba2dfc 100644 --- a/images/macos/provision/core/mongodb.sh +++ b/images/macos/provision/core/mongodb.sh @@ -2,13 +2,11 @@ source ~/utils/utils.sh # MongoDB object-value database -# installs last version of MongoDB Community Edition -# https://docs.mongodb.com/manual/tutorial/install-mongodb-on-os-x/v +# Install latest release version of MongoDB Community Edition +# https://docs.mongodb.com/manual/tutorial/install-mongodb-on-os-x echo "Installing mongodb..." - brew tap mongodb/brew -brew_smart_install "mongodb-community@4.4" -ln -sf $(brew --prefix mongodb-community@4.4)/bin/* /usr/local/bin/ +brew_smart_install "mongodb-community@5.0" -invoke_tests "Databases" "Mongo" +invoke_tests "Databases" "MongoDB" diff --git a/images/macos/tests/Databases.Tests.ps1 b/images/macos/tests/Databases.Tests.ps1 index 6e06a231abb8..5f4548ac77f5 100644 --- a/images/macos/tests/Databases.Tests.ps1 +++ b/images/macos/tests/Databases.Tests.ps1 @@ -1,4 +1,4 @@ -Describe "Mongo" { +Describe "MongoDB" { It "mongodb" { "mongo --version" | Should -ReturnZeroExitCode "mongod --version"| Should -ReturnZeroExitCode From 55fe7979f268d2400fb2e0c5ef92971eaa872e9e Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Thu, 22 Jul 2021 17:40:48 +0300 Subject: [PATCH 0407/3485] Revert "Stick mongodb version to 4.4.7 (#3747)" (#3775) --- images/win/scripts/Installers/Install-MongoDB.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/win/scripts/Installers/Install-MongoDB.ps1 b/images/win/scripts/Installers/Install-MongoDB.ps1 index 5d07216d5c4d..177300e972fe 100644 --- a/images/win/scripts/Installers/Install-MongoDB.ps1 +++ b/images/win/scripts/Installers/Install-MongoDB.ps1 @@ -3,7 +3,7 @@ ## Desc: Install MongoDB #################################################################################### -Choco-Install -PackageName mongodb -ArgumentList "--version=4.4.7" +Choco-Install -PackageName mongodb $mongoPath = (Get-CimInstance Win32_Service -Filter "Name LIKE 'mongodb'").PathName $mongoBin = Split-Path -Path $mongoPath.split('"')[1] Add-MachinePathItem "$mongoBin" From 277b40b48ca3754ca2a8d198c58d83be633ed62e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 26 Jul 2021 15:45:02 +0000 Subject: [PATCH 0408/3485] Updating readme file for macOS-10.14 version 20210724.1 (#3791) Co-authored-by: Image generation service account --- images/macos/macos-10.14-Readme.md | 138 ++++++++++++++--------------- 1 file changed, 69 insertions(+), 69 deletions(-) diff --git a/images/macos/macos-10.14-Readme.md b/images/macos/macos-10.14-Readme.md index f1d7bd906163..c2adfc418675 100644 --- a/images/macos/macos-10.14-Readme.md +++ b/images/macos/macos-10.14-Readme.md @@ -1,52 +1,51 @@ | Announcements | |-| -| [[all OS versions] Android SDK tools will be changed to Command line tools on July, 5](https://github.com/actions/virtual-environments/issues/3638) | -| [[macOS] Xcode 12.2 and 12.3 will be removed from Big Sur on June, 28](https://github.com/actions/virtual-environments/issues/3555) | +| [[all OS] MongoDB will be updated to version 5 on July, 26th](https://github.com/actions/virtual-environments/issues/3749) | | [macOS 11.0 pools will be transited to private preview.](https://github.com/actions/virtual-environments/issues/2486) | *** # macOS 10.14 info - System Version: macOS 10.14.6 (18G9216) - Kernel Version: Darwin 18.7.0 -- Image Version: 20210626.1 +- Image Version: 20210724.1 ## Installed Software ### Language and Runtime - .NET SDK 2.1.300 2.1.301 2.1.302 2.1.401 2.1.402 2.1.403 2.1.500 2.1.502 2.1.503 2.1.504 2.1.505 2.1.506 2.1.507 - Bash 3.2.57(1)-release - Clang/LLVM 11.0.0 is default -- Clang/LLVM 12.0.0 is available on `'$(brew --prefix llvm)/bin/clang'` +- Clang/LLVM 12.0.1 is available on `'$(brew --prefix llvm)/bin/clang'` - gcc-9 (Homebrew GCC 9.4.0) 9.4.0 - available by `gcc-9` alias - gcc-10 (Homebrew GCC 10.3.0) 10.3.0 - available by `gcc-10` alias - gcc-11 (Homebrew GCC 11.1.0_1) 11.1.0 - available by `gcc-11` alias - GNU Fortran (Homebrew GCC 9.4.0) 9.4.0 - available by `gfortran-9` alias - GNU Fortran (Homebrew GCC 10.3.0) 10.3.0 - available by `gfortran-10` alias - GNU Fortran (Homebrew GCC 11.1.0_1) 11.1.0 - available by `gfortran-11` alias -- Go 1.15.13 -- julia 1.6.1 +- Go 1.15.14 +- julia 1.6.2 - MSBuild 15.7.224.30163 (from /Library/Frameworks/Mono.framework/Versions/5.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) - Node.js v8.17.0 - NVM 0.38.0 -- NVM - Cached node versions: v10.24.1 v12.22.1 v14.17.1 +- NVM - Cached node versions: v10.24.1 v12.22.3 v14.17.3 - Perl 5.34.0 -- PHP 8.0.7 +- PHP 8.0.8 - Python 2.7.18 -- Python 3.9.5 +- Python 3.9.6 - R 4.1.0 -- Ruby 2.7.3p183 +- Ruby 2.7.4p191 ### Package Management -- Bundler version 2.2.21 +- Bundler version 2.2.24 - Carthage 0.38.0 - CocoaPods 1.10.1 -- Composer 2.1.3 -- Homebrew 3.2.0 -- Miniconda 4.9.2 +- Composer 2.1.5 +- Homebrew 3.2.3 +- Miniconda 4.10.3 - NPM 3.10.10 - NuGet 4.7.0.5148 - Pip 20.3.4 (python 2.7) -- Pip 21.1.1 (python 3.9) +- Pip 21.1.3 (python 3.9) - Pipx 0.16.3 -- RubyGems 3.2.21 +- RubyGems 3.2.24 - Yarn 1.22.5 #### Environment variables @@ -56,56 +55,57 @@ | VCPKG_INSTALLATION_ROOT | | ### Project Management -- Apache Ant(TM) 1.10.10 +- Apache Ant(TM) 1.10.11 - Apache Maven 3.8.1 -- Gradle 7.1 +- Gradle 7.1.1 ### Utilities - 7-Zip 17.04 - aria2 1.35.0 - azcopy 10.11.0 - bazel 3.7.1 -- bazelisk 1.9.0 +- bazelisk 1.10.1 - bsdtar 2.8.3 - available by 'tar' alias -- Curl 7.77.0 +- Curl 7.78.0 - Git LFS: 2.13.3 - Git: 2.32.0 -- GitHub CLI: 1.11.0 +- GitHub CLI: 1.13.1 - GNU parallel 20210622 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.1 - gpg (GnuPG) 2.3.1 -- helm v3.6.1+g61d8e8c +- helm v3.6.3+gd506314 - Hub CLI: 2.14.2 - jq 1.6 -- mongo v4.4.5 -- mongod v4.4.5 +- mongo v5.0.1 +- mongod v5.0.1 - OpenSSL 1.1.1k 25 Mar 2021 `(/usr/local/opt/openssl -> /usr/local/Cellar/openssl@1.1/1.1.1k)` -- Packer 1.7.3 +- Packer 1.7.4 - PostgreSQL 13.3 - psql (PostgreSQL) 13.3 - Sox 14.4.2 - Subversion (SVN) 1.14.1 - Switchaudio-osx 1.1.0 -- Vagrant 2.2.16 -- virtualbox 6.1.22r144080 +- Vagrant 2.2.17 +- virtualbox 6.1.24r145767 - zstd 1.5.0 ### Tools -- Aliyun CLI 3.0.80 +- Aliyun CLI 3.0.82 - App Center CLI 1.2.2 -- AWS CLI 2.2.14 -- AWS SAM CLI 1.24.1 +- AWS CLI 2.2.22 +- AWS SAM CLI 1.27.2 - AWS Session Manager CLI 1.2.205.0 -- Azure CLI 2.25.0 +- Azure CLI 2.26.1 +- Bicep CLI 0.4.451 - Cabal 3.4.0.0 -- Cmake 3.20.5 -- Fastlane 2.186.0 +- Cmake 3.21.0 +- Fastlane 2.188.0 - GHC 9.0.1 - GHCup v0.1.15.2 -- Stack 2.7.1 -- SwiftFormat 0.48.6 +- Stack 2.7.3 +- SwiftFormat 0.48.11 - Swig 4.0.2 - Xcode Command Line Tools 10.3.0.0.1.1562985497 @@ -116,11 +116,11 @@ ### Browsers - Safari 14.1.1 (14611.2.7.1.6) - SafariDriver 14.1.1 (14611.2.7.1.6) -- Google Chrome 91.0.4472.114 +- Google Chrome 92.0.4515.107 - ChromeDriver 91.0.4472.101 -- Microsoft Edge 91.0.864.59 -- MSEdgeDriver 91.0.864.59 -- Mozilla Firefox 89.0.2 +- Microsoft Edge 92.0.902.55 +- MSEdgeDriver 92.0.902.55 +- Mozilla Firefox 90.0.2 - geckodriver 0.29.1 #### Environment variables @@ -143,17 +143,17 @@ #### Ruby - 2.4.10 - 2.5.9 -- 2.6.7 -- 2.7.3 -- 3.0.1 +- 2.6.8 +- 2.7.4 +- 3.0.2 #### Python - 2.7.18 - 3.5.10 -- 3.6.13 -- 3.7.10 -- 3.8.10 -- 3.9.5 +- 3.6.14 +- 3.7.11 +- 3.8.11 +- 3.9.6 #### PyPy - 2.7.18 [PyPy 7.3.5] @@ -161,14 +161,14 @@ #### Node.js - 10.24.1 -- 12.22.1 -- 14.17.1 +- 12.22.3 +- 14.17.3 #### Go - 1.13.15 - 1.14.15 -- 1.15.13 -- 1.16.5 +- 1.15.14 +- 1.16.6 ### Rust Tools - Cargo 1.53.0 @@ -177,9 +177,9 @@ - Rustup 1.24.3 #### Packages -- Bindgen 0.58.1 -- Cargo-audit 0.14.1 -- Cargo-outdated v0.9.16 +- Bindgen 0.59.0 +- Cargo-audit 0.15.0 +- Cargo-outdated v0.9.17 - Cbindgen 0.19.0 - Clippy 0.1.53 - Rustfmt 1.4.37-stable @@ -190,7 +190,7 @@ #### PowerShell Modules | Module | Version | | ---------------- | ------- | -| Az | 5.9.0 | +| Az | 6.1.0 | | MarkdownPS | 1.9 | | Pester | 5.2.2 | | PSScriptAnalyzer | 1.19.1 | @@ -342,21 +342,21 @@ | watchOS 6.1 | 11.2
11.2.1
11.3
11.3.1 | Apple Watch Series 4 - 40mm
Apple Watch Series 4 - 44mm
Apple Watch Series 5 - 40mm
Apple Watch Series 5 - 44mm | ### Android -| Package Name | Version | -| -------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 4.0 | -| Android Emulator | 30.6.5 | -| Android SDK Build-tools | 30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3
26.0.0 26.0.1 26.0.2 26.0.3
25.0.0 25.0.1 25.0.2 25.0.3
24.0.0 24.0.1 24.0.2 24.0.3
23.0.1 23.0.2 23.0.3 23.0.0
22.0.1 22.0.0
21.1.2 21.0.0 21.0.1 21.0.2 21.1.0 21.1.1
20.0.0
19.1.0 19.0.0 19.0.1 19.0.2 19.0.3
18.0.1 18.1.0 18.1.1
17.0.0 | -| Android SDK Platforms | android-S (rev 5)
android-30 (rev 3)
android-29 (rev 5)
android-28 (rev 6)
android-27 (rev 3)
android-26 (rev 2)
android-25 (rev 3)
android-24 (rev 2)
android-23 (rev 3)
android-22 (rev 2)
android-21 (rev 2)
android-20 (rev 2)
android-19 (rev 4)
android-18 (rev 3)
android-17 (rev 3)
android-16 (rev 5)
android-15 (rev 5) | -| Android SDK Platform-Tools | 31.0.2 | -| Android SDK Tools | 26.1.1 | -| Android Support Repository | 47.0.0 | -| CMake | 3.10.2
3.18.1 | -| Google APIs | addon-google_apis-google-21
addon-google_apis-google-22
addon-google_apis-google-23
addon-google_apis-google-24 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 15.2.4203891
18.1.5063045
21.4.7075529
22.1.7171670 | -| SDK Patch Applier v4 | 1 | +| Package Name | Version | +| -------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 4.0 | +| Android Emulator | 30.7.5 | +| Android SDK Build-tools | 31.0.0
30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3
26.0.0 26.0.1 26.0.2 26.0.3
25.0.0 25.0.1 25.0.2 25.0.3
24.0.0 24.0.1 24.0.2 24.0.3
23.0.1 23.0.2 23.0.3
22.0.1
21.1.2
20.0.0
19.1.0 | +| Android SDK Platforms | android-31 (rev 1)
android-30 (rev 3)
android-29 (rev 5)
android-28 (rev 6)
android-27 (rev 3)
android-26 (rev 2)
android-25 (rev 3)
android-24 (rev 2)
android-23 (rev 3)
android-22 (rev 2)
android-21 (rev 2)
android-20 (rev 2)
android-19 (rev 4)
android-18 (rev 3)
android-17 (rev 3)
android-16 (rev 5)
android-15 (rev 5) | +| Android SDK Platform-Tools | 31.0.2 | +| Android Support Repository | 47.0.0 | +| CMake | 3.10.2
3.18.1 | +| Google APIs | addon-google_apis-google-21
addon-google_apis-google-22
addon-google_apis-google-23
addon-google_apis-google-24 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 15.2.4203891
18.1.5063045
21.4.7075529
22.1.7171670 | +| SDK Patch Applier v4 | 1 | +| Intel HAXM | 7.6.5 | #### Environment variables | Name | Value | From 7b1d76227c55359dc79de15bb8b9f656dd4f9599 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 27 Jul 2021 07:31:55 +0000 Subject: [PATCH 0409/3485] Updating readme file for macOS-11 version 20210724.1 (#3788) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/macos/macos-11-Readme.md | 56 ++++++++++++++++----------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/images/macos/macos-11-Readme.md b/images/macos/macos-11-Readme.md index 08ff4352da0b..2a24d1ccc99e 100644 --- a/images/macos/macos-11-Readme.md +++ b/images/macos/macos-11-Readme.md @@ -1,12 +1,12 @@ | Announcements | |-| -| [macOS 11.0 pools will be transited to private preview.](https://github.com/actions/virtual-environments/issues/2486) | | [[all OS] MongoDB will be updated to version 5 on July, 26th](https://github.com/actions/virtual-environments/issues/3749) | +| [macOS 11.0 pools will be transited to private preview.](https://github.com/actions/virtual-environments/issues/2486) | *** -# macOS 11.4 info -- System Version: macOS 11.4 (20F71) -- Kernel Version: Darwin 20.5.0 -- Image Version: 20210718.3 +# macOS 11.5 info +- System Version: macOS 11.5 (20G71) +- Kernel Version: Darwin 20.6.0 +- Image Version: 20210724.1 ## Installed Software ### Language and Runtime @@ -36,16 +36,16 @@ - Bundler version 2.2.24 - Carthage 0.38.0 - CocoaPods 1.10.1 -- Composer 2.1.3 -- Homebrew 3.2.2 -- Miniconda 4.9.2 +- Composer 2.1.5 +- Homebrew 3.2.3 +- Miniconda 4.10.3 - NPM 6.14.13 - NuGet 5.6.0.6489 - Pip 20.3.4 (python 2.7) - Pip 21.1.3 (python 3.9) - Pipx 0.16.3 - RubyGems 3.2.24 -- Vcpkg 2021 (build from master \<111220b>) +- Vcpkg 2021 (build from master \<7d2541c>) - Yarn 1.22.5 #### Environment variables @@ -66,21 +66,21 @@ - bazel 4.1.0 - bazelisk 1.10.1 - bsdtar 3.3.2 - available by 'tar' alias -- Curl 7.77.0 +- Curl 7.78.0 - Git LFS: 2.13.3 - Git: 2.32.0 -- GitHub CLI: 1.12.1 +- GitHub CLI: 1.13.1 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.1 - gpg (GnuPG) 2.3.1 - helm v3.6.3+gd506314 - Hub CLI: 2.14.2 - jq 1.6 -- mongo v4.4.6 -- mongod v4.4.6 +- mongo v5.0.1 +- mongod v5.0.1 - Newman 5.2.4 - OpenSSL 1.1.1k 25 Mar 2021 `(/usr/local/opt/openssl -> /usr/local/Cellar/openssl@1.1/1.1.1k)` -- Packer 1.7.3 +- Packer 1.7.4 - PostgreSQL 13.3 - psql (PostgreSQL) 13.3 - Sox 14.4.2 @@ -90,20 +90,20 @@ ### Tools -- Aliyun CLI 3.0.81 +- Aliyun CLI 3.0.82 - App Center CLI 2.9.0 -- AWS CLI 2.2.20 -- AWS SAM CLI 1.26.0 +- AWS CLI 2.2.22 +- AWS SAM CLI 1.27.2 - AWS Session Manager CLI 1.2.205.0 - Azure CLI 2.26.1 -- Bicep CLI 0.4.412 +- Bicep CLI 0.4.451 - Cabal 3.4.0.0 - Cmake 3.21.0 -- Fastlane 2.187.0 +- Fastlane 2.188.0 - GHC 9.0.1 - GHCup v0.1.15.2 -- Stack 2.7.1 -- SwiftFormat 0.48.10 +- Stack 2.7.3 +- SwiftFormat 0.48.11 - Swig 4.0.2 - Xcode Command Line Tools 12.5.0.0.1.1617976050 @@ -112,13 +112,13 @@ - yamllint 1.26.1 ### Browsers -- Safari 14.1.1 (16611.2.7.1.4) -- SafariDriver 14.1.1 (16611.2.7.1.4) -- Google Chrome 91.0.4472.164 +- Safari 14.1.2 (16611.3.10.1.3) +- SafariDriver 14.1.2 (16611.3.10.1.3) +- Google Chrome 92.0.4515.107 - ChromeDriver 91.0.4472.101 -- Microsoft Edge 91.0.864.70 -- MSEdgeDriver 91.0.864.70 -- Mozilla Firefox 90.0 +- Microsoft Edge 92.0.902.55 +- MSEdgeDriver 92.0.902.55 +- Mozilla Firefox 90.0.2 - geckodriver 0.29.1 #### Environment variables @@ -167,7 +167,7 @@ - Rustup 1.24.3 #### Packages -- Bindgen 0.58.1 +- Bindgen 0.59.0 - Cargo-audit 0.15.0 - Cargo-outdated v0.9.17 - Cbindgen 0.19.0 From 2e8f85a83b6598b9e038bcbb724eaee5106500d3 Mon Sep 17 00:00:00 2001 From: Maxim Lobanov Date: Thu, 29 Jul 2021 10:46:27 +0300 Subject: [PATCH 0410/3485] [Windows][Improvement] Split and simplify "InitializeVM.ps1" script (#3806) * improve InitializeVM script * Update windows2019.json * remove configs * resolve comments * resolve comments; fix order * fix templates --- _config.yml | 1 - .../Installers/Configure-Antivirus.ps1 | 5 +- .../win/scripts/Installers/Initialize-VM.ps1 | 103 ++---------- .../win/scripts/Installers/Install-Choco.ps1 | 32 ++++ .../Installers/Install-ContainersFeature.ps1 | 11 -- .../scripts/Installers/Install-VCRedist.ps1 | 15 ++ .../Installers/Install-WindowsFeatures.ps1 | 24 +++ .../win/scripts/Installers/Run-Antivirus.ps1 | 30 ---- .../scripts/Installers/Update-ImageData.ps1 | 6 + images/win/windows2016.json | 24 +-- images/win/windows2019.json | 29 +--- triage-rules.yml | 159 ------------------ 12 files changed, 111 insertions(+), 328 deletions(-) delete mode 100644 _config.yml create mode 100644 images/win/scripts/Installers/Install-Choco.ps1 delete mode 100644 images/win/scripts/Installers/Install-ContainersFeature.ps1 create mode 100644 images/win/scripts/Installers/Install-VCRedist.ps1 create mode 100644 images/win/scripts/Installers/Install-WindowsFeatures.ps1 delete mode 100644 images/win/scripts/Installers/Run-Antivirus.ps1 delete mode 100644 triage-rules.yml diff --git a/_config.yml b/_config.yml deleted file mode 100644 index c7418817439b..000000000000 --- a/_config.yml +++ /dev/null @@ -1 +0,0 @@ -theme: jekyll-theme-slate \ No newline at end of file diff --git a/images/win/scripts/Installers/Configure-Antivirus.ps1 b/images/win/scripts/Installers/Configure-Antivirus.ps1 index 650d3a982264..9a87ca52619a 100644 --- a/images/win/scripts/Installers/Configure-Antivirus.ps1 +++ b/images/win/scripts/Installers/Configure-Antivirus.ps1 @@ -1,2 +1,5 @@ Write-Host "Set antivirus parameters" -Set-MpPreference -ScanAvgCPULoadFactor 5 -ExclusionPath "D:\", "C:\" \ No newline at end of file +Set-MpPreference -ScanAvgCPULoadFactor 5 -ExclusionPath "D:\", "C:\" + +Write-Host "Disable Antivirus" +Set-MpPreference -DisableRealtimeMonitoring $true \ No newline at end of file diff --git a/images/win/scripts/Installers/Initialize-VM.ps1 b/images/win/scripts/Installers/Initialize-VM.ps1 index ed215ccdd186..5f50870e6339 100644 --- a/images/win/scripts/Installers/Initialize-VM.ps1 +++ b/images/win/scripts/Installers/Initialize-VM.ps1 @@ -30,48 +30,21 @@ function Disable-UserAccessControl { Write-Host "User Access Control (UAC) has been disabled." } -# Enable $ErrorActionPreference='Stop' for AllUsersAllHosts -Add-Content -Path $profile.AllUsersAllHosts -Value '$ErrorActionPreference="Stop"' - -# Set static env vars -setx ImageVersion $env:IMAGE_VERSION /m -setx ImageOS $env:IMAGE_OS /m -setx AGENT_TOOLSDIRECTORY $env:AGENT_TOOLSDIRECTORY /m - -# Set TLS1.2 -[Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor "Tls12" - -Write-Host "Disable Antivirus" -Set-MpPreference -DisableRealtimeMonitoring $true - -# Disable Windows Update -$AutoUpdatePath = "HKLM:SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU" -If (Test-Path -Path $AutoUpdatePath) { - Set-ItemProperty -Path $AutoUpdatePath -Name NoAutoUpdate -Value 1 - Write-Host "Disabled Windows Update" -} -else { - Write-Host "Windows Update key does not exist" +function Disable-WindowsUpdate { + $AutoUpdatePath = "HKLM:SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU" + If (Test-Path -Path $AutoUpdatePath) { + Set-ItemProperty -Path $AutoUpdatePath -Name NoAutoUpdate -Value 1 + Write-Host "Disabled Windows Update" + } else { + Write-Host "Windows Update key does not exist" + } } -# Install .NET Framework 3.5 (required by Chocolatey) -# Explicitly install all 4.7 sub features to include ASP.Net. -# As of 1/16/2019, WinServer 19 lists .Net 4.7 as NET-Framework-45-Features -Install-WindowsFeature -Name NET-Framework-Features -IncludeAllSubFeature -Install-WindowsFeature -Name NET-Framework-45-Features -IncludeAllSubFeature -if (Test-IsWin16) { - Install-WindowsFeature -Name BITS -IncludeAllSubFeature - Install-WindowsFeature -Name DSC-Service -} +# Enable $ErrorActionPreference='Stop' for AllUsersAllHosts +Add-Content -Path $profile.AllUsersAllHosts -Value '$ErrorActionPreference="Stop"' -# Install FS-iSCSITarget-Server -$fsResult = Install-WindowsFeature -Name FS-iSCSITarget-Server -IncludeAllSubFeature -IncludeManagementTools -if ( $fsResult.Success ) { - Write-Host "FS-iSCSITarget-Server has been successfully installed" -} else { - Write-Host "Failed to install FS-iSCSITarget-Server" - exit 1 -} +Write-Host "Disable Windows Update" +Disable-WindowsUpdate Write-Host "Disable UAC" Disable-UserAccessControl @@ -90,58 +63,6 @@ Write-Host "Enable long path behavior" # See https://docs.microsoft.com/en-us/windows/desktop/fileio/naming-a-file#maximum-path-length-limitation Set-ItemProperty -Path 'HKLM:\SYSTEM\CurrentControlSet\Control\FileSystem' -Name 'LongPathsEnabled' -Value 1 -Write-Host "Install chocolatey" -$chocoExePath = 'C:\ProgramData\Chocolatey\bin' - -if ($($env:Path).ToLower().Contains($($chocoExePath).ToLower())) { - Write-Host "Chocolatey found in PATH, skipping install..." - Exit -} - -# Add to system PATH -$systemPath = [Environment]::GetEnvironmentVariable('Path', [System.EnvironmentVariableTarget]::Machine) -$systemPath += ';' + $chocoExePath -[Environment]::SetEnvironmentVariable("PATH", $systemPath, [System.EnvironmentVariableTarget]::Machine) - -# Update local process' path -$userPath = [Environment]::GetEnvironmentVariable('Path', [System.EnvironmentVariableTarget]::User) -if ($userPath) { - $env:Path = $systemPath + ";" + $userPath -} -else { - $env:Path = $systemPath -} - -# Run the installer -Invoke-Expression ((new-object net.webclient).DownloadString('https://chocolatey.org/install.ps1')) - -# Turn off confirmation -choco feature enable -n allowGlobalConfirmation - -# https://github.com/chocolatey/choco/issues/89 -# Remove some of the command aliases, like `cpack` #89 -Remove-Item -Path $env:ChocolateyInstall\bin\cpack.exe -Force - -if (Test-IsWin16) { - # Install vcredist140 - Choco-Install -PackageName vcredist140 -} - -if (Test-IsWin19) { - # Install vcredist2010 - $Vc2010x86Name = "vcredist_x86.exe" - $Vc2010x86URI = "https://download.microsoft.com/download/1/6/5/165255E7-1014-4D0A-B094-B6A430A6BFFC/${Vc2010x86Name}" - $Vc2010x64Name = "vcredist_x64.exe" - $Vc2010x64URI = "https://download.microsoft.com/download/1/6/5/165255E7-1014-4D0A-B094-B6A430A6BFFC/${Vc2010x64Name}" - $ArgumentList = ("/install", "/quiet", "/norestart") - Install-Binary -Url $Vc2010x86URI -Name $Vc2010x86Name -ArgumentList $ArgumentList - Install-Binary -Url $Vc2010x64URI -Name $Vc2010x64Name -ArgumentList $ArgumentList -} - -# Initialize environmental variable ChocolateyToolsLocation by invoking choco Get-ToolsLocation function -Import-Module "$env:ChocolateyInstall\helpers\chocolateyInstaller.psm1" -Force -Get-ToolsLocation - # Expand disk size of OS drive $driveLetter = "C" $size = Get-PartitionSupportedSize -DriveLetter $driveLetter diff --git a/images/win/scripts/Installers/Install-Choco.ps1 b/images/win/scripts/Installers/Install-Choco.ps1 new file mode 100644 index 000000000000..dfa1c13cc6ef --- /dev/null +++ b/images/win/scripts/Installers/Install-Choco.ps1 @@ -0,0 +1,32 @@ +Write-Host "Set TLS1.2" +[Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor "Tls12" + +Write-Host "Install chocolatey" +$chocoExePath = 'C:\ProgramData\Chocolatey\bin' + +# Add to system PATH +$systemPath = [Environment]::GetEnvironmentVariable('Path', [System.EnvironmentVariableTarget]::Machine) +$systemPath += ';' + $chocoExePath +[Environment]::SetEnvironmentVariable("PATH", $systemPath, [System.EnvironmentVariableTarget]::Machine) + +# Update local process' path +$userPath = [Environment]::GetEnvironmentVariable('Path', [System.EnvironmentVariableTarget]::User) +if ($userPath) { + $env:Path = $systemPath + ";" + $userPath +} else { + $env:Path = $systemPath +} + +# Run the installer +Invoke-Expression ((new-object net.webclient).DownloadString('https://chocolatey.org/install.ps1')) + +# Turn off confirmation +choco feature enable -n allowGlobalConfirmation + +# https://github.com/chocolatey/choco/issues/89 +# Remove some of the command aliases, like `cpack` #89 +Remove-Item -Path $env:ChocolateyInstall\bin\cpack.exe -Force + +# Initialize environmental variable ChocolateyToolsLocation by invoking choco Get-ToolsLocation function +Import-Module "$env:ChocolateyInstall\helpers\chocolateyInstaller.psm1" -Force +Get-ToolsLocation \ No newline at end of file diff --git a/images/win/scripts/Installers/Install-ContainersFeature.ps1 b/images/win/scripts/Installers/Install-ContainersFeature.ps1 deleted file mode 100644 index dbc0dbb68a13..000000000000 --- a/images/win/scripts/Installers/Install-ContainersFeature.ps1 +++ /dev/null @@ -1,11 +0,0 @@ -################################################################################ -## File: Install-ContainersFeature.ps1 -## Desc: Install Windows container features. -## Must be an independent step becuase it requires a machine restart -## before we can continue. -################################################################################ - -Write-Host "Install Containers feature" -Install-WindowsFeature -Name Containers - -Invoke-PesterTests -TestFile "WindowsFeatures" -TestName "ContainersFeature" \ No newline at end of file diff --git a/images/win/scripts/Installers/Install-VCRedist.ps1 b/images/win/scripts/Installers/Install-VCRedist.ps1 new file mode 100644 index 000000000000..0defd50902e8 --- /dev/null +++ b/images/win/scripts/Installers/Install-VCRedist.ps1 @@ -0,0 +1,15 @@ +if (Test-IsWin16) { + # Install vcredist140 + Choco-Install -PackageName vcredist140 +} + +if (Test-IsWin19) { + # Install vcredist2010 + $Vc2010x86Name = "vcredist_x86.exe" + $Vc2010x86URI = "https://download.microsoft.com/download/1/6/5/165255E7-1014-4D0A-B094-B6A430A6BFFC/${Vc2010x86Name}" + $Vc2010x64Name = "vcredist_x64.exe" + $Vc2010x64URI = "https://download.microsoft.com/download/1/6/5/165255E7-1014-4D0A-B094-B6A430A6BFFC/${Vc2010x64Name}" + $ArgumentList = ("/install", "/quiet", "/norestart") + Install-Binary -Url $Vc2010x86URI -Name $Vc2010x86Name -ArgumentList $ArgumentList + Install-Binary -Url $Vc2010x64URI -Name $Vc2010x64Name -ArgumentList $ArgumentList +} \ No newline at end of file diff --git a/images/win/scripts/Installers/Install-WindowsFeatures.ps1 b/images/win/scripts/Installers/Install-WindowsFeatures.ps1 new file mode 100644 index 000000000000..bfee3730b095 --- /dev/null +++ b/images/win/scripts/Installers/Install-WindowsFeatures.ps1 @@ -0,0 +1,24 @@ +# Install .NET Framework 3.5 (required by Chocolatey) +# Explicitly install all 4.7 sub features to include ASP.Net. +# As of 1/16/2019, WinServer 19 lists .Net 4.7 as NET-Framework-45-Features +Install-WindowsFeature -Name NET-Framework-Features -IncludeAllSubFeature +Install-WindowsFeature -Name NET-Framework-45-Features -IncludeAllSubFeature + +if (Test-IsWin16) { + Install-WindowsFeature -Name BITS -IncludeAllSubFeature + Install-WindowsFeature -Name DSC-Service +} + +# Install FS-iSCSITarget-Server +$fsResult = Install-WindowsFeature -Name FS-iSCSITarget-Server -IncludeAllSubFeature -IncludeManagementTools +if ( $fsResult.Success ) { + Write-Host "FS-iSCSITarget-Server has been successfully installed" +} else { + Write-Host "Failed to install FS-iSCSITarget-Server" + exit 1 +} + +Write-Host "Install Containers feature" +Install-WindowsFeature -Name Containers + +Invoke-PesterTests -TestFile "WindowsFeatures" -TestName "ContainersFeature" \ No newline at end of file diff --git a/images/win/scripts/Installers/Run-Antivirus.ps1 b/images/win/scripts/Installers/Run-Antivirus.ps1 deleted file mode 100644 index 7993146aeed5..000000000000 --- a/images/win/scripts/Installers/Run-Antivirus.ps1 +++ /dev/null @@ -1,30 +0,0 @@ -################################################################################ -## File: Run-Antivirus.ps1 -## Desc: Run a full antivirus scan. -## Run right after cleanup before we sysprep -################################################################################ - -if ($env:run_scan_antivirus -eq $true) { - try { - Update-MpSignature - } - catch { - Write-Host "Some error was found" - Write-Host $_ - } - - Write-Host "Make sure windefend is going to start" - Start-Service windefend -ErrorAction Continue - Write-Host "Waiting for windefend to report as running" - $service = Get-Service "Windefend" - $service.WaitForStatus("Running","00:10:00") - - Write-Host "Run antivirus" - # Tell Defender to use 100% of the CPU during the scan - Set-MpPreference -ScanAvgCPULoadFactor 100 - # Full Scan - Start-Process -FilePath "C:\Program Files\Windows Defender\MpCmdRun.exe" -ArgumentList ("-Scan","-ScanType", 2) -Wait -} -else { - Write-Host "Scanning process has been skipped" -} \ No newline at end of file diff --git a/images/win/scripts/Installers/Update-ImageData.ps1 b/images/win/scripts/Installers/Update-ImageData.ps1 index e8b809748a92..15b03e62d2cc 100644 --- a/images/win/scripts/Installers/Update-ImageData.ps1 +++ b/images/win/scripts/Installers/Update-ImageData.ps1 @@ -35,3 +35,9 @@ $json = @" "@ $json | Out-File -FilePath $imageDataFile + + +# Set static env vars +setx ImageVersion $env:IMAGE_VERSION /m +setx ImageOS $env:IMAGE_OS /m +setx AGENT_TOOLSDIRECTORY $env:AGENT_TOOLSDIRECTORY /m \ No newline at end of file diff --git a/images/win/windows2016.json b/images/win/windows2016.json index aa2990783443..bb4cd77cbea2 100644 --- a/images/win/windows2016.json +++ b/images/win/windows2016.json @@ -16,7 +16,6 @@ "private_virtual_network_with_public_ip": "{{env `PRIVATE_VIRTUAL_NETWORK_WITH_PUBLIC_IP`}}", "allowed_inbound_ip_addresses": "{{env `AGENT_IP`}}", "vm_size": "Standard_D8s_v4", - "run_scan_antivirus": "false", "root_folder": "C:", "toolset_json_path": "{{env `TEMP`}}\\toolset.json", "image_folder": "C:\\image", @@ -124,17 +123,19 @@ "PSMODULES_ROOT_FOLDER={{user `psmodules_root_folder`}}" ], "scripts": [ + "{{ template_dir }}/scripts/Installers/Configure-Antivirus.ps1", "{{ template_dir }}/scripts/Installers/Install-PowerShellModules.ps1", - "{{ template_dir }}/scripts/Installers/Initialize-VM.ps1", - "{{ template_dir }}/scripts/Installers/Install-WebPlatformInstaller.ps1" + "{{ template_dir }}/scripts/Installers/Install-WindowsFeatures.ps1", + "{{ template_dir }}/scripts/Installers/Install-Choco.ps1", + "{{ template_dir }}/scripts/Installers/Initialize-VM.ps1" ], "execution_policy": "unrestricted" }, { "type": "powershell", "scripts": [ - "{{ template_dir }}/scripts/Installers/Update-DotnetTLS.ps1", - "{{ template_dir }}/scripts/Installers/Install-ContainersFeature.ps1" + "{{ template_dir }}/scripts/Installers/Install-WebPlatformInstaller.ps1", + "{{ template_dir }}/scripts/Installers/Update-DotnetTLS.ps1" ] }, { @@ -145,10 +146,13 @@ "type": "powershell", "environment_vars": [ "IMAGE_VERSION={{user `image_version`}}", + "IMAGE_OS={{user `image_os`}}", + "AGENT_TOOLSDIRECTORY={{user `agent_tools_directory`}}", "IMAGEDATA_FILE={{user `imagedata_file`}}", "TOOLSET_JSON_PATH={{user `toolset_json_path`}}" ], "scripts": [ + "{{ template_dir }}/scripts/Installers/Install-VCRedist.ps1", "{{ template_dir }}/scripts/Installers/Update-ImageData.ps1", "{{ template_dir }}/scripts/Installers/Install-Docker.ps1", "{{ template_dir }}/scripts/Installers/Install-PowershellCore.ps1" @@ -369,17 +373,7 @@ }, { "type": "powershell", - "environment_vars": [ - "RUN_SCAN_ANTIVIRUS={{user `run_scan_antivirus`}}" - ], "scripts": [ - "{{ template_dir }}/scripts/Installers/Run-Antivirus.ps1" - ] - }, - { - "type": "powershell", - "scripts": [ - "{{ template_dir }}/scripts/Installers/Configure-Antivirus.ps1", "{{ template_dir }}/scripts/Installers/Disable-JITDebugger.ps1" ] }, diff --git a/images/win/windows2019.json b/images/win/windows2019.json index 73963e6b6275..a9e17fb52c5a 100644 --- a/images/win/windows2019.json +++ b/images/win/windows2019.json @@ -16,7 +16,6 @@ "private_virtual_network_with_public_ip": "{{env `PRIVATE_VIRTUAL_NETWORK_WITH_PUBLIC_IP`}}", "allowed_inbound_ip_addresses": "{{env `AGENT_IP`}}", "vm_size": "Standard_D8s_v4", - "run_scan_antivirus": "false", "root_folder": "C:", "toolset_json_path": "{{env `TEMP`}}\\toolset.json", "image_folder": "C:\\image", @@ -124,9 +123,11 @@ "PSMODULES_ROOT_FOLDER={{user `psmodules_root_folder`}}" ], "scripts": [ + "{{ template_dir }}/scripts/Installers/Configure-Antivirus.ps1", "{{ template_dir }}/scripts/Installers/Install-PowerShellModules.ps1", - "{{ template_dir }}/scripts/Installers/Initialize-VM.ps1", - "{{ template_dir }}/scripts/Installers/Install-WebPlatformInstaller.ps1" + "{{ template_dir }}/scripts/Installers/Install-WindowsFeatures.ps1", + "{{ template_dir }}/scripts/Installers/Install-Choco.ps1", + "{{ template_dir }}/scripts/Installers/Initialize-VM.ps1" ], "execution_policy": "unrestricted" }, @@ -141,8 +142,8 @@ { "type": "powershell", "scripts": [ - "{{ template_dir }}/scripts/Installers/Update-DotnetTLS.ps1", - "{{ template_dir }}/scripts/Installers/Install-ContainersFeature.ps1" + "{{ template_dir }}/scripts/Installers/Install-WebPlatformInstaller.ps1", + "{{ template_dir }}/scripts/Installers/Update-DotnetTLS.ps1" ] }, { @@ -153,10 +154,13 @@ "type": "powershell", "environment_vars": [ "IMAGE_VERSION={{user `image_version`}}", + "IMAGE_OS={{user `image_os`}}", + "AGENT_TOOLSDIRECTORY={{user `agent_tools_directory`}}", "IMAGEDATA_FILE={{user `imagedata_file`}}", "TOOLSET_JSON_PATH={{user `toolset_json_path`}}" ], "scripts": [ + "{{ template_dir }}/scripts/Installers/Install-VCRedist.ps1", "{{ template_dir }}/scripts/Installers/Update-ImageData.ps1", "{{ template_dir }}/scripts/Installers/Install-Docker.ps1", "{{ template_dir }}/scripts/Installers/Install-PowershellCore.ps1" @@ -360,21 +364,6 @@ "type": "windows-restart", "restart_timeout": "10m" }, - { - "type": "powershell", - "environment_vars": [ - "RUN_SCAN_ANTIVIRUS={{user `run_scan_antivirus`}}" - ], - "scripts": [ - "{{ template_dir }}/scripts/Installers/Run-Antivirus.ps1" - ] - }, - { - "type": "powershell", - "scripts": [ - "{{ template_dir }}/scripts/Installers/Configure-Antivirus.ps1" - ] - }, { "type": "powershell", "scripts": [ diff --git a/triage-rules.yml b/triage-rules.yml deleted file mode 100644 index 06e0bd255426..000000000000 --- a/triage-rules.yml +++ /dev/null @@ -1,159 +0,0 @@ -# Adapted from https://github.com/microsoft/azure-pipelines-tasks/blob/master/issue-rules.yml - -# Primary rules -rules: - -# Area: .NET Core -- valueFor: '**Area for Triage**' - contains: '.NET Core' - addLabels: ['Area: .NET Core'] - -# Area: .NET Framework -- valueFor: '**Area for Triage**' - contains: '.NET Framework' - addLabels: ['Area: .NET Framework'] - -# Area: Android -- valueFor: '**Area for Triage**' - contains: 'Android' - addLabels: ['Area: Android'] - -# Area: Apple -- valueFor: '**Area for Triage**' - contains: 'Apple' - addLabels: ['Area: Apple'] - -# Area: Artifacts -- valueFor: '**Area for Triage**' - contains: 'Artifacts' - addLabels: ['Area: Artifacts'] - -# Area: C/C++ -- valueFor: '**Area for Triage**' - contains: 'C/C++' - addLabels: ['Area: C/C++'] - -# Area: Containers -- valueFor: '**Area for Triage**' - contains: 'Containers' - addLabels: ['Area: Containers'] - -# Area: Databases -- valueFor: '**Area for Triage**' - contains: 'Databases' - addLabels: ['Area: Databases'] - -# Area: Deployment/Release -- valueFor: '**Area for Triage**' - contains: 'Deployment/Release' - addLabels: ['Area: Deployment/Release'] - -# Area: Erlang / Elixir -- valueFor: '**Area for Triage**' - contains: 'Erlang / Elixir' - addLabels: ['Area: Erlang / Elixir'] - -# Area: Git -- valueFor: '**Area for Triage**' - contains: 'Git' - addLabels: ['Area: Git'] - -# Area: Go -- valueFor: '**Area for Triage**' - contains: 'Go' - addLabels: ['Area: Go'] - -# Area: Haskell -- valueFor: '**Area for Triage**' - contains: 'Haskell' - addLabels: ['Area: Haskell'] - -# Area: Java -- valueFor: '**Area for Triage**' - contains: 'Java' - addLabels: ['Area: Java'] - -# Area: JavaScript and Node.js -- valueFor: '**Area for Triage**' - contains: 'JavaScript and Node.js' - addLabels: ['Area: JavaScript and Node.js'] - -# Area: Packages -- valueFor: '**Area for Triage**' - contains: 'Packages' - addLabels: ['Area: Packages'] - -# Area: PHP -- valueFor: '**Area for Triage**' - contains: 'PHP' - addLabels: ['Area: PHP'] - -# Area: Python -- valueFor: '**Area for Triage**' - contains: 'Python' - addLabels: ['Area: Python'] - -# Area: Ruby -- valueFor: '**Area for Triage**' - contains: 'Ruby' - addLabels: ['Area: Ruby'] - -# Area: Rust -- valueFor: '**Area for Triage**' - contains: 'Rust' - addLabels: ['Area: Rust'] - -# Area: Scala -- valueFor: '**Area for Triage**' - contains: 'Scala' - addLabels: ['Area: Scala'] - -# Area: Scripting and command line -- valueFor: '**Area for Triage**' - contains: 'Scripting and command line' - addLabels: ['Area: Scripting and command line'] - -# Area: Servers -- valueFor: '**Area for Triage**' - contains: 'Servers' - addLabels: ['Area: Servers'] - -# Area: SSH -- valueFor: '**Area for Triage**' - contains: 'SSH' - addLabels: ['Area: SSH'] - -# Area: Testing and code coverage (incl. browser testing) -- valueFor: '**Area for Triage**' - contains: 'Testing and code coverage' - addLabels: ['Area: Testing and code coverage'] - -# Area: Xamarin -- valueFor: '**Area for Triage**' - contains: 'Xamarin' - addLabels: ['Area: Xamarin'] - -# Types -- valueFor: '**Question, Bug, or Feature?**' - contains: Feature - addLabels: ['feature request'] -- valueFor: '**Question, Bug, or Feature?**' - contains: Bug - addLabels: ['investigate'] -- valueFor: '**Question, Bug, or Feature?**' - contains: Question - addLabels: ['question'] - -# runs if first set had no matches -# add likely teams to look at based on text searches -nomatches: -- contains: 'Xcode' - addLabels: ['Area: Apple'] -- contains: 'Bash' - addLabels: ['Area: Scripting and command line'] -- contains: 'Nuget' - addLabels: ['Area: Packages'] -- contains: 'Npm' - addLabels: ['Area: Packages'] -- contains: 'Docker' - addLabels: ['Area: Deployment/Release'] From 7c425c26ab727896fbc05faebe9417a6627e0bb1 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 29 Jul 2021 09:09:00 +0000 Subject: [PATCH 0411/3485] Updating readme file for ubuntu18 version 20210726.1 (#3792) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/linux/Ubuntu1804-README.md | 74 +++++++++++++++---------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/images/linux/Ubuntu1804-README.md b/images/linux/Ubuntu1804-README.md index 2e064dd63889..84de38124636 100644 --- a/images/linux/Ubuntu1804-README.md +++ b/images/linux/Ubuntu1804-README.md @@ -1,12 +1,11 @@ | Announcements | |-| -| [[Ubuntu] Ansible will be updated to Ansible 4 on July, 19th](https://github.com/actions/virtual-environments/issues/3714) | -| [Ubuntu 16.04 environment will be removed on September 20, 2021](https://github.com/actions/virtual-environments/issues/3287) | | [[all OS] MongoDB will be updated to version 5 on July, 26th](https://github.com/actions/virtual-environments/issues/3749) | +| [Ubuntu 16.04 environment will be removed on September 20, 2021](https://github.com/actions/virtual-environments/issues/3287) | *** # Ubuntu 18.04.5 LTS -- Linux kernel version: 5.4.0-1051-azure -- Image Version: 20210718.1 +- Linux kernel version: 5.4.0-1055-azure +- Image Version: 20210726.1 ## Installed Software ### Language and Runtime @@ -18,6 +17,7 @@ - GNU C++ 7.5.0, 9.4.0, 10.3.0 - GNU Fortran 7.5.0, 9.4.0, 10.3.0 - Julia 1.6.2 +- Kotlin 1.5.21-release-314 - Mono 6.12.0.122 (apt source repository: https://download.mono-project.com/repo/ubuntu stable-bionic main) - MSBuild 16.6.0.15201 (from /usr/lib/mono/msbuild/15.0/bin/MSBuild.dll) - Node 14.17.3 @@ -30,14 +30,14 @@ ### Package Management - cpan 1.64 - Helm 3.6.3 -- Homebrew 3.2.2 -- Miniconda 4.9.2 +- Homebrew 3.2.3 +- Miniconda 4.10.3 - Npm 6.14.13 - Pip 9.0.1 - Pip3 9.0.1 - Pipx 0.16.3 - RubyGems 2.7.6 -- Vcpkg (build from master \<111220b>) +- Vcpkg (build from master \) - Yarn 1.22.10 #### Environment variables @@ -53,17 +53,17 @@ - Sbt 1.5.5 ### Tools -- Ansible 2.11.2 +- Ansible 2.11.3 - apt-fast 1.9.11 - AzCopy 10.11.0 (available by `azcopy` and `azcopy10` aliases) - Bazel 4.1.0 - Bazelisk 1.10.1 -- Bicep 0.4.412 +- Bicep 0.4.451 - Buildah 1.19.6 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - CMake 3.21.0 - CodeQL Action Bundle 2.5.7 - Docker Compose 1.29.2 -- Docker-Buildx 0.5.1 +- Docker-Buildx 0.6.0 - Docker-Moby Client 20.10.7+azure - Docker-Moby Server 20.10.7+azure - Git 2.32.0 (apt source repository: ppa:git-core/ppa) @@ -71,7 +71,7 @@ - Git-ftp 1.3.1 - Haveged 1.9.1 - Heroku 7.56.1 -- HHVM (HipHop VM) 4.118.1 +- HHVM (HipHop VM) 4.118.2 - jq 1.5 - Kind 0.11.1 - Kubectl 1.20.1-5-g76a04fc @@ -83,30 +83,30 @@ - Newman 5.2.4 - nvm 0.38.0 - OpenSSL 1.1.1 11 Sep 2018 -- Packer 1.7.3 +- Packer 1.7.4 - PhantomJS 2.1.1 - Podman 3.0.1 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- Pulumi 3.7.0 +- Pulumi 3.8.0 - R 4.1.0 - Skopeo 1.2.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 - SVN 1.9.7 -- Terraform 1.0.2 +- Terraform 1.0.3 - yamllint 1.26.1 -- yq 4.11.0 +- yq 4.11.2 - zstd 1.5.0 (homebrew) ### CLI Tools -- Alibaba Cloud CLI 3.0.81 -- AWS CLI 1.20.1 +- Alibaba Cloud CLI 3.0.82 +- AWS CLI 1.20.6 - AWS CLI Session manager plugin 1.2.205.0 -- AWS SAM CLI 1.26.0 +- AWS SAM CLI 1.27.2 - Azure CLI (azure-cli) 2.26.1 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.18.0 -- GitHub CLI 1.12.1 -- Google Cloud SDK 348.0.0 (apt source repository: https://packages.cloud.google.com/apt) +- GitHub CLI 1.13.1 +- Google Cloud SDK 349.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 4.4.2 +- Netlify CLI 5.2.3 - OpenShift CLI 4.7.19 - ORAS CLI 0.12.0 - Vercel CLI 23.0.1 @@ -122,8 +122,8 @@ | Tool | Version | | -------- | --------------------------------- | | PHP | 7.1.33 7.2.34 7.3.29 7.4.21 8.0.8 | -| Composer | 2.1.3 | -| PHPUnit | 8.5.17 | +| Composer | 2.1.5 | +| PHPUnit | 8.5.18 | ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ``` @@ -131,7 +131,7 @@ - Cabal 3.4.0.0 - GHC 9.0.1 (apt source repository: ppa:hvr/ghc) - GHCup 0.1.15.2 -- Stack 2.7.1 +- Stack 2.7.3 ### Rust Tools - Cargo 1.53.0 @@ -140,7 +140,7 @@ - Rustup 1.24.3 #### Packages -- Bindgen 0.58.1 +- Bindgen 0.59.1 - Cargo audit 0.15.0 - Cargo clippy 0.1.53 - Cargo outdated 0.9.17 @@ -148,11 +148,11 @@ - Rustfmt 1.4.37 ### Browsers and Drivers -- Google Chrome 91.0.4472.164 -- ChromeDriver 91.0.4472.101 +- Google Chrome 92.0.4515.107 +- ChromeDriver 92.0.4515.43 - Mozilla Firefox 90.0 - Geckodriver 0.29.1 -- Chromium 91.0.4472.0 +- Chromium 92.0.4515.0 #### Environment variables | Name | Value | @@ -164,7 +164,7 @@ - 2.1.302 2.1.403 2.1.524 2.1.617 2.1.701 2.1.816 3.1.117 3.1.202 3.1.302 3.1.411 5.0.104 5.0.205 5.0.302 ### Databases -- MongoDB 4.4.7 (apt source repository: https://repo.mongodb.org/apt/ubuntu) +- MongoDB 5.0.1 (apt source repository: https://repo.mongodb.org/apt/ubuntu) - Postgre SQL 13.3 (apt source repository: https://apt.postgresql.org/pub/repos/apt/) - sqlite3 3.22.0 @@ -265,15 +265,15 @@ | alpine:3.11 | sha256:20117524da64d995fd769f0aa3d7cfe2040518426f4b238f43e8373f4aa56c06 | 2021-04-14 | | alpine:3.12 | sha256:87703314048c40236c6d674424159ee862e2b96ce1c37c62d877e21ed27a387e | 2021-04-14 | | alpine:3.13 | sha256:f51ff2d96627690d62fee79e6eecd9fa87429a38142b5df8a3bfbb26061df7fc | 2021-04-14 | -| buildpack-deps:buster | sha256:128203abc1feabf1e0b2bef26a23860a7283770d25fcd3cf30277e1dda4909f1 | 2021-06-23 | -| buildpack-deps:stretch | sha256:04f933352c6a3e46933907f5a7fb6f37134e027207f5de2d3c234bfec43d0d72 | 2021-06-23 | -| debian:10 | sha256:dcb20da8d9d73c9dab5059668852555c171d40cdec297da845da9c929b70e0b1 | 2021-06-23 | -| debian:9 | sha256:8afcdd92f29e1706625631df94ecdfe3bdeb919bb2c6ee685803d245b75ee45a | 2021-06-23 | +| buildpack-deps:buster | sha256:7021538d13a8de5cd15cf5fd72b95b8710831ed7029ebc3282dffd570cdf3818 | 2021-07-22 | +| buildpack-deps:stretch | sha256:d8c71a24bdc64d5dadc7d6ba748e55b01c510d292f94b1afc5fb95ee38dc5f4e | 2021-07-22 | +| debian:10 | sha256:cc58a29c333ee594f7624d968123429b26916face46169304f07580644dde6b2 | 2021-07-22 | +| debian:9 | sha256:06f9296409de8cfecaff43aaee6d608ed48a95c0cac0da2a418ff526acedf67b | 2021-07-22 | | node:10 | sha256:59531d2835edd5161c8f9512f9e095b1836f7a1fcb0ab73e005ec46047384911 | 2021-04-10 | | node:10-alpine | sha256:dc98dac24efd4254f75976c40bce46944697a110d06ce7fa47e7268470cf2e28 | 2021-04-14 | -| node:12 | sha256:3f646f48001e2cd732a4c0291e1fa5bfcadaaafc3a41227a0bcc76c998c2cee6 | 2021-07-07 | +| node:12 | sha256:b37688949b774df8a3474e9f2a26be5cdaccc97c28b99e06a8a07ec9f29819bc | 2021-07-22 | | node:12-alpine | sha256:05328aa871f251b0643b8dcaa01034f126a8343b51ef302de207ad153a6b6232 | 2021-07-07 | -| node:14 | sha256:0c558991de47e614588a61f9cc90afdcf034c6fc641d3ab650c9570a98b37605 | 2021-07-07 | +| node:14 | sha256:976c9107158a1c85ab0702aec5b1d56bbb85de493ca50794e545a0271421e028 | 2021-07-22 | | node:14-alpine | sha256:fb6cb918cc72869bd625940f42a7d8ae035c4e786d08187b94e8b91c6a534dfd | 2021-07-07 | | ubuntu:16.04 | sha256:1b733ff6c7c7aac32101a35cb2c6399ca8c399a9f6de62a386abe26c65b59b9e | 2021-06-17 | | ubuntu:18.04 | sha256:3b8692dc4474d4f6043fae285676699361792ce1828e22b1b57367b5c05457e3 | 2021-07-13 | @@ -288,7 +288,7 @@ | build-essential | 12.4ubuntu1 | | bzip2 | 1.0.6-8.1ubuntu0.2 | | coreutils | 8.28-1ubuntu1 | -| curl | 7.58.0-2ubuntu3.13 | +| curl | 7.58.0-2ubuntu3.14 | | dbus | 1.12.2-1ubuntu1.2 | | dnsutils | 1:9.11.3+dfsg-1ubuntu1.15 | | dpkg | 1.19.0.5ubuntu2.3 | @@ -305,7 +305,7 @@ | lib32z1 | 1:1.2.11.dfsg-0ubuntu2 | | libc++-dev | 6.0-2 | | libc++abi-dev | 6.0-2 | -| libcurl3 | 7.58.0-2ubuntu3.13 | +| libcurl3 | 7.58.0-2ubuntu3.14 | | libgbm-dev | 20.0.8-0ubuntu1~18.04.1 | | libgconf-2-4 | 3.2.6-4ubuntu1 | | libgsl-dev | 2.4+dfsg-6 | From 96965b9b759eceb3be43800a67a4e4c97002d345 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 29 Jul 2021 10:11:39 +0000 Subject: [PATCH 0412/3485] Updating readme file for ubuntu20 version 20210726.1 (#3793) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/linux/Ubuntu2004-README.md | 82 +++++++++++++++---------------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/images/linux/Ubuntu2004-README.md b/images/linux/Ubuntu2004-README.md index 9171fc10dc39..1a61ad3a13a2 100644 --- a/images/linux/Ubuntu2004-README.md +++ b/images/linux/Ubuntu2004-README.md @@ -1,12 +1,11 @@ | Announcements | |-| -| [[Ubuntu] Ansible will be updated to Ansible 4 on July, 19th](https://github.com/actions/virtual-environments/issues/3714) | -| [Ubuntu 16.04 environment will be removed on September 20, 2021](https://github.com/actions/virtual-environments/issues/3287) | | [[all OS] MongoDB will be updated to version 5 on July, 26th](https://github.com/actions/virtual-environments/issues/3749) | +| [Ubuntu 16.04 environment will be removed on September 20, 2021](https://github.com/actions/virtual-environments/issues/3287) | *** # Ubuntu 20.04.2 LTS -- Linux kernel version: 5.8.0-1036-azure -- Image Version: 20210718.1 +- Linux kernel version: 5.8.0-1039-azure +- Image Version: 20210726.1 ## Installed Software ### Language and Runtime @@ -16,6 +15,7 @@ - GNU C++ 9.3.0, 10.3.0 - GNU Fortran 9.3.0, 10.3.0 - Julia 1.6.2 +- Kotlin 1.5.21-release-314 - LLVM components: Clang 10.0.0, 11.0.0, 12.0.1, Clang-format 10.0.0, 11.0.0, 12.0.1 (apt source: deb http://apt.llvm.org/focal/ llvm-toolchain-focal-12) - Mono 6.12.0.122 (apt source repository: https://download.mono-project.com/repo/ubuntu stable-focal main) - MSBuild 16.6.0.15201 (from /usr/lib/mono/msbuild/15.0/bin/MSBuild.dll) @@ -29,14 +29,14 @@ ### Package Management - cpan 1.64 - Helm 3.6.3 -- Homebrew 3.2.2 -- Miniconda 4.9.2 +- Homebrew 3.2.3 +- Miniconda 4.10.3 - Npm 6.14.13 - Pip 20.0.2 - Pip3 20.0.2 - Pipx 0.16.3 - RubyGems 3.1.2 -- Vcpkg (build from master \<111220b>) +- Vcpkg (build from master \) - Yarn 1.22.10 #### Environment variables @@ -53,26 +53,26 @@ - Sbt 1.5.5 ### Tools -- Ansible 2.11.2 +- Ansible 2.11.3 - apt-fast 1.9.11 - AzCopy 10.11.0 (available by `azcopy` and `azcopy10` aliases) - Bazel 4.1.0 - Bazelisk 1.10.1 -- Bicep 0.4.412 -- Buildah 1.21.1 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) +- Bicep 0.4.451 +- Buildah 1.21.3 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - CMake 3.21.0 - CodeQL Action Bundle 2.5.7 - Docker Compose 1.29.2 -- Docker-Buildx 0.5.1 +- Docker-Buildx 0.6.0 - Docker-Moby Client 20.10.7+azure - Docker-Moby Server 20.10.7+azure -- Fastlane 2.187.0 +- Fastlane 2.188.0 - Git 2.32.0 (apt source repository: ppa:git-core/ppa) - Git LFS 2.13.3 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.6.0 - Haveged 1.9.1 - Heroku 7.56.1 -- HHVM (HipHop VM) 4.118.1 +- HHVM (HipHop VM) 4.118.2 - jq 1.6 - Kind 0.11.1 - Kubectl 1.20.1-5-g76a04fc @@ -84,30 +84,30 @@ - Newman 5.2.4 - nvm 0.38.0 - OpenSSL 1.1.1f 31 Mar 2020 -- Packer 1.7.3 +- Packer 1.7.4 - PhantomJS 2.1.1 -- Podman 3.2.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- Pulumi 3.7.0 +- Podman 3.2.3 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) +- Pulumi 3.8.0 - R 4.1.0 - Skopeo 1.3.0 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 -- Terraform 1.0.2 +- Terraform 1.0.3 - yamllint 1.26.1 -- yq 4.11.0 +- yq 4.11.2 - zstd 1.5.0 (homebrew) ### CLI Tools -- Alibaba Cloud CLI 3.0.81 -- AWS CLI 2.2.20 +- Alibaba Cloud CLI 3.0.82 +- AWS CLI 2.2.22 - AWS CLI Session manager plugin 1.2.205.0 -- AWS SAM CLI 1.26.0 +- AWS SAM CLI 1.27.2 - Azure CLI (azure-cli) 2.26.1 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.18.0 -- GitHub CLI 1.12.1 -- Google Cloud SDK 348.0.0 (apt source repository: https://packages.cloud.google.com/apt) +- GitHub CLI 1.13.1 +- Google Cloud SDK 349.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 4.4.2 +- Netlify CLI 5.2.3 - OpenShift CLI 4.7.19 - ORAS CLI 0.12.0 - Vercel CLI 23.0.1 @@ -121,14 +121,14 @@ ### GraalVM | Version | Environment variables | | --------- | --------------------- | -| CE 21.1.0 | GRAALVM_11_ROOT | +| CE 21.2.0 | GRAALVM_11_ROOT | ### PHP | Tool | Version | | -------- | ------------ | | PHP | 7.4.21 8.0.8 | -| Composer | 2.1.3 | -| PHPUnit | 8.5.17 | +| Composer | 2.1.5 | +| PHPUnit | 8.5.18 | ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ``` @@ -136,7 +136,7 @@ - Cabal 3.4.0.0 - GHC 9.0.1 (apt source repository: ppa:hvr/ghc) - GHCup 0.1.15.2 -- Stack 2.7.1 +- Stack 2.7.3 ### Rust Tools - Cargo 1.53.0 @@ -145,7 +145,7 @@ - Rustup 1.24.3 #### Packages -- Bindgen 0.58.1 +- Bindgen 0.59.1 - Cargo audit 0.15.0 - Cargo clippy 0.1.53 - Cargo outdated 0.9.17 @@ -153,11 +153,11 @@ - Rustfmt 1.4.37 ### Browsers and Drivers -- Google Chrome 91.0.4472.164 -- ChromeDriver 91.0.4472.101 +- Google Chrome 92.0.4515.107 +- ChromeDriver 92.0.4515.43 - Mozilla Firefox 90.0 - Geckodriver 0.29.1 -- Chromium 91.0.4472.0 +- Chromium 92.0.4515.0 #### Environment variables | Name | Value | @@ -169,7 +169,7 @@ - 2.1.302 2.1.403 2.1.524 2.1.617 2.1.701 2.1.816 3.1.117 3.1.202 3.1.302 3.1.411 5.0.104 5.0.205 5.0.302 ### Databases -- MongoDB 4.4.7 (apt source repository: https://repo.mongodb.org/apt/ubuntu) +- MongoDB 5.0.1 (apt source repository: https://repo.mongodb.org/apt/ubuntu) - Postgre SQL 13.3 (apt source repository: https://apt.postgresql.org/pub/repos/apt/) - sqlite3 3.31.1 @@ -272,15 +272,15 @@ | alpine:3.11 | sha256:20117524da64d995fd769f0aa3d7cfe2040518426f4b238f43e8373f4aa56c06 | 2021-04-14 | | alpine:3.12 | sha256:87703314048c40236c6d674424159ee862e2b96ce1c37c62d877e21ed27a387e | 2021-04-14 | | alpine:3.13 | sha256:f51ff2d96627690d62fee79e6eecd9fa87429a38142b5df8a3bfbb26061df7fc | 2021-04-14 | -| buildpack-deps:buster | sha256:128203abc1feabf1e0b2bef26a23860a7283770d25fcd3cf30277e1dda4909f1 | 2021-06-23 | -| buildpack-deps:stretch | sha256:04f933352c6a3e46933907f5a7fb6f37134e027207f5de2d3c234bfec43d0d72 | 2021-06-23 | -| debian:10 | sha256:dcb20da8d9d73c9dab5059668852555c171d40cdec297da845da9c929b70e0b1 | 2021-06-23 | -| debian:9 | sha256:8afcdd92f29e1706625631df94ecdfe3bdeb919bb2c6ee685803d245b75ee45a | 2021-06-23 | +| buildpack-deps:buster | sha256:7021538d13a8de5cd15cf5fd72b95b8710831ed7029ebc3282dffd570cdf3818 | 2021-07-22 | +| buildpack-deps:stretch | sha256:d8c71a24bdc64d5dadc7d6ba748e55b01c510d292f94b1afc5fb95ee38dc5f4e | 2021-07-22 | +| debian:10 | sha256:cc58a29c333ee594f7624d968123429b26916face46169304f07580644dde6b2 | 2021-07-22 | +| debian:9 | sha256:06f9296409de8cfecaff43aaee6d608ed48a95c0cac0da2a418ff526acedf67b | 2021-07-22 | | node:10 | sha256:59531d2835edd5161c8f9512f9e095b1836f7a1fcb0ab73e005ec46047384911 | 2021-04-10 | | node:10-alpine | sha256:dc98dac24efd4254f75976c40bce46944697a110d06ce7fa47e7268470cf2e28 | 2021-04-14 | -| node:12 | sha256:3f646f48001e2cd732a4c0291e1fa5bfcadaaafc3a41227a0bcc76c998c2cee6 | 2021-07-07 | +| node:12 | sha256:b37688949b774df8a3474e9f2a26be5cdaccc97c28b99e06a8a07ec9f29819bc | 2021-07-22 | | node:12-alpine | sha256:05328aa871f251b0643b8dcaa01034f126a8343b51ef302de207ad153a6b6232 | 2021-07-07 | -| node:14 | sha256:0c558991de47e614588a61f9cc90afdcf034c6fc641d3ab650c9570a98b37605 | 2021-07-07 | +| node:14 | sha256:976c9107158a1c85ab0702aec5b1d56bbb85de493ca50794e545a0271421e028 | 2021-07-22 | | node:14-alpine | sha256:fb6cb918cc72869bd625940f42a7d8ae035c4e786d08187b94e8b91c6a534dfd | 2021-07-07 | | ubuntu:16.04 | sha256:1b733ff6c7c7aac32101a35cb2c6399ca8c399a9f6de62a386abe26c65b59b9e | 2021-06-17 | | ubuntu:18.04 | sha256:3b8692dc4474d4f6043fae285676699361792ce1828e22b1b57367b5c05457e3 | 2021-07-13 | @@ -296,7 +296,7 @@ | build-essential | 12.8ubuntu1.1 | | bzip2 | 1.0.8-2 | | coreutils | 8.30-3ubuntu2 | -| curl | 7.68.0-1ubuntu2.5 | +| curl | 7.68.0-1ubuntu2.6 | | dbus | 1.12.16-2ubuntu2.1 | | dnsutils | 1:9.16.1-0ubuntu2.8 | | dpkg | 1.19.7ubuntu3 | @@ -314,7 +314,7 @@ | lib32z1 | 1:1.2.11.dfsg-2ubuntu1.2 | | libc++-dev | 1:10.0-50~exp1 | | libc++abi-dev | 1:10.0-50~exp1 | -| libcurl4 | 7.68.0-1ubuntu2.5 | +| libcurl4 | 7.68.0-1ubuntu2.6 | | libgbm-dev | 20.2.6-0ubuntu0.20.04.1 | | libgconf-2-4 | 3.2.6-6ubuntu1 | | libgsl-dev | 2.5+dfsg-6build1 | From 52d30ac08c9d19f26797e3fa189c1f9036505c89 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Thu, 29 Jul 2021 16:15:45 +0300 Subject: [PATCH 0413/3485] [macOS] Fix xcode installation script if there is only one Xcode version to install (#3808) * Cast xcodeVersions variable to array --- images/macos/provision/core/xcode.ps1 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/images/macos/provision/core/xcode.ps1 b/images/macos/provision/core/xcode.ps1 index 0ce0eb8f9e9f..ece967b10d0a 100644 --- a/images/macos/provision/core/xcode.ps1 +++ b/images/macos/provision/core/xcode.ps1 @@ -15,7 +15,7 @@ if ([string]::IsNullOrEmpty($env:XCODE_INSTALL_USER) -or [string]::IsNullOrEmpty $env:SPACESHIP_SKIP_2FA_UPGRADE = 1 $os = Get-OSVersion -$xcodeVersions = Get-ToolsetValue "xcode.versions" +[Array]$xcodeVersions = Get-ToolsetValue "xcode.versions" $defaultXcode = Get-ToolsetValue "xcode.default" [Array]::Reverse($xcodeVersions) $threadCount = "5" @@ -36,8 +36,8 @@ if ($os.IsLessThanCatalina) { $latestXcodeVersion = $xcodeVersions | Select-Object -Last 1 -ExpandProperty link Install-XcodeAdditionalPackages -Version $latestXcodeVersion } -$xcodeVersions | ForEach-Object { - Invoke-XcodeRunFirstLaunch -Version $_.link +$xcodeVersions | ForEach-Object { + Invoke-XcodeRunFirstLaunch -Version $_.link } Invoke-XcodeRunFirstLaunch -Version $defaultXcode From f04052e0643434b29c8eec7cae5da020992c6754 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 29 Jul 2021 13:55:13 +0000 Subject: [PATCH 0414/3485] Updating readme file for macOS-10.15 version 20210725.1 (#3794) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/macos/macos-10.15-Readme.md | 46 +++++++++++++++--------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/images/macos/macos-10.15-Readme.md b/images/macos/macos-10.15-Readme.md index ea1c0ef24a04..bfc475bd66f5 100644 --- a/images/macos/macos-10.15-Readme.md +++ b/images/macos/macos-10.15-Readme.md @@ -6,7 +6,7 @@ # macOS 10.15 info - System Version: macOS 10.15.7 (19H1217) - Kernel Version: Darwin 19.6.0 -- Image Version: 20210718.2 +- Image Version: 20210725.1 ## Installed Software ### Language and Runtime @@ -37,16 +37,16 @@ - Bundler version 2.2.24 - Carthage 0.38.0 - CocoaPods 1.10.1 -- Composer 2.1.3 -- Homebrew 3.2.2 -- Miniconda 4.9.2 +- Composer 2.1.5 +- Homebrew 3.2.3 +- Miniconda 4.10.3 - NPM 6.14.13 - NuGet 5.6.0.6489 - Pip 20.3.4 (python 2.7) - Pip 21.1.3 (python 3.9) - Pipx 0.16.3 - RubyGems 3.2.24 -- Vcpkg 2021 (build from master \<111220b>) +- Vcpkg 2021 (build from master \) - Yarn 1.22.5 #### Environment variables @@ -67,10 +67,10 @@ - bazel 4.1.0 - bazelisk 1.10.1 - bsdtar 3.3.2 - available by 'tar' alias -- Curl 7.77.0 +- Curl 7.78.0 - Git LFS: 2.13.3 - Git: 2.32.0 -- GitHub CLI: 1.12.1 +- GitHub CLI: 1.13.1 - GNU parallel 20210622 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.1 @@ -78,36 +78,36 @@ - helm v3.6.3+gd506314 - Hub CLI: 2.14.2 - jq 1.6 -- mongo v4.4.6 -- mongod v4.4.6 +- mongo v5.0.1 +- mongod v5.0.1 - Newman 5.2.4 - OpenSSL 1.1.1k 25 Mar 2021 `(/usr/local/opt/openssl -> /usr/local/Cellar/openssl@1.1/1.1.1k)` -- Packer 1.7.3 +- Packer 1.7.4 - PostgreSQL 13.3 - psql (PostgreSQL) 13.3 - Sox 14.4.2 - Subversion (SVN) 1.14.1 - Switchaudio-osx 1.1.0 - Vagrant 2.2.17 -- virtualbox 6.1.22r144080 +- virtualbox 6.1.24r145767 - zstd 1.5.0 ### Tools -- Aliyun CLI 3.0.81 +- Aliyun CLI 3.0.82 - App Center CLI 2.9.0 -- AWS CLI 2.2.20 -- AWS SAM CLI 1.26.0 +- AWS CLI 2.2.22 +- AWS SAM CLI 1.27.2 - AWS Session Manager CLI 1.2.205.0 - Azure CLI 2.26.1 -- Bicep CLI 0.4.412 +- Bicep CLI 0.4.451 - Cabal 3.4.0.0 - Cmake 3.21.0 -- Fastlane 2.187.0 +- Fastlane 2.188.0 - GHC 9.0.1 - GHCup v0.1.15.2 -- Stack 2.7.1 -- SwiftFormat 0.48.9 +- Stack 2.7.3 +- SwiftFormat 0.48.11 - Swig 4.0.2 - Xcode Command Line Tools 12.4.0.0.1.1610135815 @@ -118,11 +118,11 @@ ### Browsers - Safari 14.1.1 (15611.2.7.1.6) - SafariDriver 14.1.1 (15611.2.7.1.6) -- Google Chrome 91.0.4472.164 +- Google Chrome 92.0.4515.107 - ChromeDriver 91.0.4472.101 -- Microsoft Edge 91.0.864.67 -- MSEdgeDriver 91.0.864.70 -- Mozilla Firefox 90.0 +- Microsoft Edge 92.0.902.55 +- MSEdgeDriver 92.0.902.55 +- Mozilla Firefox 90.0.2 - geckodriver 0.29.1 #### Environment variables @@ -180,7 +180,7 @@ - Rustup 1.24.3 #### Packages -- Bindgen 0.58.1 +- Bindgen 0.59.1 - Cargo-audit 0.15.0 - Cargo-outdated v0.9.17 - Cbindgen 0.19.0 From 6317ee607b06510a62aa8d84d997ae9a6668dcb7 Mon Sep 17 00:00:00 2001 From: mikhailshaganov <81769678+mikhailshaganov@users.noreply.github.com> Date: Thu, 29 Jul 2021 17:21:09 +0300 Subject: [PATCH 0415/3485] [mac OS] adding kotlin lang using brew (#3777) --- images/macos/software-report/SoftwareReport.Common.psm1 | 5 +++++ images/macos/software-report/SoftwareReport.Generator.ps1 | 3 ++- images/macos/tests/BasicTools.Tests.ps1 | 8 ++++++++ images/macos/toolsets/toolset-10.14.json | 1 + images/macos/toolsets/toolset-10.15.json | 1 + images/macos/toolsets/toolset-11.json | 1 + 6 files changed, 18 insertions(+), 1 deletion(-) diff --git a/images/macos/software-report/SoftwareReport.Common.psm1 b/images/macos/software-report/SoftwareReport.Common.psm1 index e85a47ec5ee1..a1a785173543 100644 --- a/images/macos/software-report/SoftwareReport.Common.psm1 +++ b/images/macos/software-report/SoftwareReport.Common.psm1 @@ -507,6 +507,11 @@ function Get-BicepVersion { return "Bicep CLI $bicepVersion" } +function Get-KotlinVersion { + $kotlinVersion = Run-Command "kotlin -version" | Take-Part -Part 2 + return "kotlin $kotlinVersion" +} + function Build-PackageManagementEnvironmentTable { return @( @{ diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1 index 8321bd85f8d6..c4b82d9f70db 100644 --- a/images/macos/software-report/SoftwareReport.Generator.ps1 +++ b/images/macos/software-report/SoftwareReport.Generator.ps1 @@ -43,7 +43,8 @@ $languageAndRuntimeList = @( (Get-DotnetVersionList), (Get-GoVersion), (Get-PHPVersion), - (Get-JuliaVersion) + (Get-JuliaVersion), + (Get-KotlinVersion) ) if ( -not $os.IsHighSierra) { diff --git a/images/macos/tests/BasicTools.Tests.ps1 b/images/macos/tests/BasicTools.Tests.ps1 index db36dbfdd79b..e5248800c938 100644 --- a/images/macos/tests/BasicTools.Tests.ps1 +++ b/images/macos/tests/BasicTools.Tests.ps1 @@ -166,4 +166,12 @@ Describe "Homebrew" { It "Homebrew" { "brew --version" | Should -ReturnZeroExitCode } +} + +Describe "Kotlin" { + $kotlinPackages = @("kapt", "kotlin", "kotlinc", "kotlinc-js", "kotlinc-jvm", "kotlin-dce-js") + + It " is available" -TestCases ($kotlinPackages | ForEach-Object { @{ toolName = $_ } }) { + "$toolName -version" | Should -ReturnZeroExitCode + } } \ No newline at end of file diff --git a/images/macos/toolsets/toolset-10.14.json b/images/macos/toolsets/toolset-10.14.json index efe6cdc96aa4..1533c723c373 100644 --- a/images/macos/toolsets/toolset-10.14.json +++ b/images/macos/toolsets/toolset-10.14.json @@ -244,6 +244,7 @@ "gnu-tar", "go@1.15", "helm", + "kotlin", "libpq", "llvm", "p7zip", diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index 4afe45be5023..89a41e6ad95d 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -196,6 +196,7 @@ "gnu-tar", "go@1.15", "helm", + "kotlin", "libpq", "llvm", "p7zip", diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index 1568abd11d8a..9811b65628ba 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -143,6 +143,7 @@ "gnu-tar", "go@1.15", "helm", + "kotlin", "libpq", "llvm", "p7zip", From b82bdafea6f7a90bcdd2d19f2d43dace238fb289 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 29 Jul 2021 15:12:53 +0000 Subject: [PATCH 0416/3485] Updating readme file for win19 version 20210725.1 (#3789) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/win/Windows2019-Readme.md | 65 ++++++++++++++++---------------- 1 file changed, 33 insertions(+), 32 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index 6f0f45f7f82b..a880d196dd67 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 2061 -- Image Version: 20210719.0 +- Image Version: 20210725.1 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -22,15 +22,15 @@ ### Package Management - Chocolatey 0.10.15 -- Composer 2.1.3 +- Composer 2.1.5 - Helm 3.6.2 -- Miniconda 4.9.2 (pre-installed on the image but not added to PATH) +- Miniconda 4.10.3 (pre-installed on the image but not added to PATH) - NPM 6.14.13 - NuGet 5.10.0.7240 -- pip 21.1.3 (python 3.7) +- pip 21.2.1 (python 3.7) - Pipx 0.16.3 - RubyGems 2.7.6.3 -- Vcpkg (build from master \<111220b>) +- Vcpkg (build from master \<7d2541c>) - Yarn 1.22.10 #### Environment variables @@ -50,7 +50,7 @@ - azcopy 10.11.0 - Bazel 4.1.0 - Bazelisk 1.10.1 -- Bicep 0.4.412 +- Bicep 0.4.451 - Cabal 3.4.0.0 - CMake 3.21.0 - CodeQL Action Bundle 2.5.7 @@ -59,7 +59,8 @@ - ghc 9.0.1 - Git 2.32.0 - Git LFS 2.13.3 -- Google Cloud SDK 348.0.0 +- Google Cloud SDK 349.0.0 +- GVFS 1.0.21085.9 - InnoSetup 6.2.0 - jq 1.6 - Kind 0.11.1 @@ -70,9 +71,9 @@ - NSIS v3.06.1 - OpenSSL 1.1.1 - Packer 1.7.3 -- Pulumi v3.7.0 +- Pulumi v3.8.0 - R 4.1.0 -- Stack 2.7.1 +- Stack 2.7.3 - Subversion (SVN) 1.14.1 - Swig 4.0.2 - VSWhere 2.8.4 @@ -81,14 +82,14 @@ - zstd 1.5.0 ### CLI Tools -- Alibaba Cloud CLI 3.0.81 -- AWS CLI 2.2.20 -- AWS SAM CLI 1.26.0 +- Alibaba Cloud CLI 3.0.82 +- AWS CLI 2.2.22 +- AWS SAM CLI 1.27.2 - AWS Session Manager CLI 1.2.205.0 - Azure CLI 2.26.1 - Azure DevOps CLI extension 0.18.0 - Cloud Foundry CLI 6.53.0 -- GitHub CLI 1.12.1 +- GitHub CLI 1.13.1 - Hub CLI 2.14.2 ### Rust Tools @@ -98,7 +99,7 @@ - Rustup 1.24.3 #### Packages -- bindgen 0.58.1 +- bindgen 0.59.0 - cargo-audit 0.15.0 - cargo-outdated v0.9.17 - cbindgen 0.19.0 @@ -106,11 +107,11 @@ - Rustfmt 1.4.37 ### Browsers and webdrivers -- Google Chrome 91.0.4472.164 -- Chrome Driver 91.0.4472.101 -- Microsoft Edge 91.0.864.70 -- Microsoft Edge Driver 91.0.864.70 -- Mozilla Firefox 90.0 +- Google Chrome 92.0.4515.107 +- Chrome Driver 92.0.4515.43 +- Microsoft Edge 92.0.902.55 +- Microsoft Edge Driver 92.0.902.55 +- Mozilla Firefox 90.0.2 - Gecko Driver 0.29.1 - IE Driver 3.150.1.0 @@ -210,7 +211,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### MongoDB | Version | ServiceName | ServiceStatus | ServiceStartType | | ------- | ----------- | ------------- | ---------------- | -| 4.4.7.0 | MongoDB | Running | Automatic | +| 5.0.1.0 | MongoDB | Running | Automatic | @@ -230,13 +231,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.10.31424.327 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | +| Visual Studio Enterprise 2019 | 16.10.31515.178 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | #### Workloads, components and extensions: | Package | Version | | ------------------------------------------------------------------------- | --------------- | -| Component.Android.NDK.R16B | 16.10.31415.396 | +| Component.Android.NDK.R16B | 16.10.31515.66 | | Component.Android.SDK25.Private | 16.0.28625.61 | | Component.Android.SDK30 | 16.10.31205.252 | | Component.Ant | 1.9.3.8 | @@ -245,7 +246,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Component.MDD.Android | 16.0.28517.75 | | Component.MDD.Linux | 16.5.29515.121 | | Component.MDD.Linux.GCC.arm | 16.5.29515.121 | -| Component.Microsoft.VisualStudio.LiveShare | 1.0.4062 | +| Component.Microsoft.VisualStudio.LiveShare | 1.0.4473 | | Component.Microsoft.VisualStudio.RazorExtension | 16.10.31205.252 | | Component.Microsoft.VisualStudio.Tools.Applications | 16.0.31110.1 | | Component.Microsoft.VisualStudio.Web.AzureFunctions | 16.10.31205.252 | @@ -291,9 +292,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.Net.ComponentGroup.DevelopmentPrerequisites | 16.3.29207.166 | | Microsoft.Net.ComponentGroup.TargetingPacks.Common | 16.0.28516.191 | | Microsoft.NetCore.Component.DevelopmentTools | 16.10.31303.231 | -| Microsoft.NetCore.Component.Runtime.3.1 | 16.10.31401.124 | -| Microsoft.NetCore.Component.Runtime.5.0 | 16.10.31401.124 | -| Microsoft.NetCore.Component.SDK | 16.10.31401.124 | +| Microsoft.NetCore.Component.Runtime.3.1 | 16.10.31515.66 | +| Microsoft.NetCore.Component.Runtime.5.0 | 16.10.31515.66 | +| Microsoft.NetCore.Component.SDK | 16.10.31515.66 | | Microsoft.NetCore.Component.Web | 16.10.31303.231 | | Microsoft.VisualStudio.Component.AppInsights.Tools | 16.5.29515.121 | | Microsoft.VisualStudio.Component.AspNet45 | 16.10.31205.252 | @@ -475,12 +476,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.29.30038 | -| Microsoft Visual C++ 2019 Debug Runtime | x64 | 14.29.30038 | -| Microsoft Visual C++ 2019 Minimum Runtime | x64 | 14.29.30038 | -| Microsoft Visual C++ 2019 Additional Runtime | x86 | 14.29.30038 | -| Microsoft Visual C++ 2019 Debug Runtime | x86 | 14.29.30038 | -| Microsoft Visual C++ 2019 Minimum Runtime | x86 | 14.29.30038 | +| Microsoft Visual C++ 2019 Additional Runtime | x64 | 14.29.30040 | +| Microsoft Visual C++ 2019 Debug Runtime | x64 | 14.29.30040 | +| Microsoft Visual C++ 2019 Minimum Runtime | x64 | 14.29.30040 | +| Microsoft Visual C++ 2019 Additional Runtime | x86 | 14.29.30040 | +| Microsoft Visual C++ 2019 Debug Runtime | x86 | 14.29.30040 | +| Microsoft Visual C++ 2019 Minimum Runtime | x86 | 14.29.30040 | ### .NET Core SDK `Location C:\Program Files\dotnet\sdk` From d4a2126d259b367597da00d423e1210e15bc8f38 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 29 Jul 2021 19:07:25 +0000 Subject: [PATCH 0417/3485] Updating readme file for win16 version 20210725.1 (#3790) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/win/Windows2016-Readme.md | 49 ++++++++++++++++---------------- 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/images/win/Windows2016-Readme.md b/images/win/Windows2016-Readme.md index 688f90d9fc46..227dae51b9d7 100644 --- a/images/win/Windows2016-Readme.md +++ b/images/win/Windows2016-Readme.md @@ -4,7 +4,7 @@ *** # Microsoft Windows Server 2016 Datacenter - OS Version: 10.0.14393 Build 4530 -- Image Version: 20210719.0 +- Image Version: 20210725.1 ## Installed Software ### Language and Runtime @@ -19,15 +19,15 @@ ### Package Management - Chocolatey 0.10.15 -- Composer 2.1.3 +- Composer 2.1.5 - Helm 3.6.2 -- Miniconda 4.9.2 (pre-installed on the image but not added to PATH) +- Miniconda 4.10.3 (pre-installed on the image but not added to PATH) - NPM 6.14.13 - NuGet 5.10.0.7240 -- pip 21.1.3 (python 3.7) +- pip 21.2.1 (python 3.7) - Pipx 0.16.3 - RubyGems 2.7.6.3 -- Vcpkg (build from master \<111220b>) +- Vcpkg (build from master \<7d2541c>) - Yarn 1.22.10 #### Environment variables @@ -47,7 +47,7 @@ - azcopy 10.11.0 - Bazel 4.1.0 - Bazelisk 1.10.1 -- Bicep 0.4.412 +- Bicep 0.4.451 - Cabal 3.4.0.0 - CMake 3.21.0 - CodeQL Action Bundle 2.5.7 @@ -56,7 +56,8 @@ - ghc 9.0.1 - Git 2.32.0 - Git LFS 2.13.3 -- Google Cloud SDK 348.0.0 +- Google Cloud SDK 349.0.0 +- GVFS 1.0.21085.9 - InnoSetup 6.2.0 - jq 1.6 - Kind 0.11.1 @@ -67,9 +68,9 @@ - NSIS v3.06.1 - OpenSSL 1.1.1 - Packer 1.7.3 -- Pulumi v3.7.0 +- Pulumi v3.8.0 - R 4.1.0 -- Stack 2.7.1 +- Stack 2.7.3 - Subversion (SVN) 1.14.1 - Swig 4.0.2 - VSWhere 2.8.4 @@ -78,14 +79,14 @@ - zstd 1.5.0 ### CLI Tools -- Alibaba Cloud CLI 3.0.81 -- AWS CLI 2.2.20 -- AWS SAM CLI 1.26.0 +- Alibaba Cloud CLI 3.0.82 +- AWS CLI 2.2.22 +- AWS SAM CLI 1.27.2 - AWS Session Manager CLI 1.2.205.0 - Azure CLI 2.26.1 - Azure DevOps CLI extension 0.18.0 - Cloud Foundry CLI 6.53.0 -- GitHub CLI 1.12.1 +- GitHub CLI 1.13.1 - Hub CLI 2.14.2 ### Rust Tools @@ -95,7 +96,7 @@ - Rustup 1.24.3 #### Packages -- bindgen 0.58.1 +- bindgen 0.59.0 - cargo-audit 0.15.0 - cargo-outdated v0.9.17 - cbindgen 0.19.0 @@ -103,11 +104,11 @@ - Rustfmt 1.4.37 ### Browsers and webdrivers -- Google Chrome 91.0.4472.164 -- Chrome Driver 91.0.4472.101 -- Microsoft Edge 91.0.864.70 -- Microsoft Edge Driver 91.0.864.70 -- Mozilla Firefox 90.0 +- Google Chrome 92.0.4515.107 +- Chrome Driver 92.0.4515.43 +- Microsoft Edge 92.0.902.55 +- Microsoft Edge Driver 92.0.902.55 +- Mozilla Firefox 90.0.2 - Gecko Driver 0.29.1 - IE Driver 3.150.1.0 @@ -204,7 +205,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### MongoDB | Version | ServiceName | ServiceStatus | ServiceStartType | | ------- | ----------- | ------------- | ---------------- | -| 4.4.7.0 | MongoDB | Running | Automatic | +| 5.0.1.0 | MongoDB | Running | Automatic | @@ -486,10 +487,10 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft Visual C++ 2013 Minimum Runtime | x86 | 12.0.21005 | | Microsoft Visual C++ 2017 Debug Runtime | x64 | 14.16.27033 | | Microsoft Visual C++ 2017 Debug Runtime | x86 | 14.16.27033 | -| Microsoft Visual C++ 2019 Additional Runtime | x64 | 14.29.30037 | -| Microsoft Visual C++ 2019 Minimum Runtime | x64 | 14.29.30037 | -| Microsoft Visual C++ 2019 Additional Runtime | x86 | 14.29.30037 | -| Microsoft Visual C++ 2019 Minimum Runtime | x86 | 14.29.30037 | +| Microsoft Visual C++ 2019 Additional Runtime | x64 | 14.29.30040 | +| Microsoft Visual C++ 2019 Minimum Runtime | x64 | 14.29.30040 | +| Microsoft Visual C++ 2019 Additional Runtime | x86 | 14.29.30040 | +| Microsoft Visual C++ 2019 Minimum Runtime | x86 | 14.29.30040 | ### .NET Core SDK `Location C:\Program Files\dotnet\sdk` From 0b37a50b575f440a515b8f4163fdab9098843317 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Fri, 30 Jul 2021 11:58:05 +0300 Subject: [PATCH 0418/3485] [Windows] cargo-audit 0.15.0 is broken, stick to 0.14.1 (#3822) --- images/win/scripts/Installers/Install-Rust.ps1 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/images/win/scripts/Installers/Install-Rust.ps1 b/images/win/scripts/Installers/Install-Rust.ps1 index 0acf32799d0a..281857b46187 100644 --- a/images/win/scripts/Installers/Install-Rust.ps1 +++ b/images/win/scripts/Installers/Install-Rust.ps1 @@ -20,7 +20,8 @@ $env:Path = Get-MachinePath # Install common tools rustup component add rustfmt clippy -cargo install --locked bindgen cbindgen cargo-audit cargo-outdated +# Temporary hardcode cargo-audit 0.14.1 as 0.15.0 is broken https://docs.rs/crate/cargo-audit/0.15.0 +cargo install --locked bindgen cbindgen cargo-audit --version 0.14.1 cargo-outdated # Run script at startup for all users $cmdRustSymScript = @" From 2d9cc77844f4ab5e4d7d4bc09a0a40b9c8152467 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Fri, 30 Jul 2021 22:05:33 +0300 Subject: [PATCH 0419/3485] [windows] Install cargo-audit 0.14.1 as 0.15.0 is broken (fix) (#3824) * Install cargo-audit without locked --- images/win/scripts/Installers/Install-Rust.ps1 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/images/win/scripts/Installers/Install-Rust.ps1 b/images/win/scripts/Installers/Install-Rust.ps1 index 281857b46187..6417b767ffec 100644 --- a/images/win/scripts/Installers/Install-Rust.ps1 +++ b/images/win/scripts/Installers/Install-Rust.ps1 @@ -21,7 +21,9 @@ $env:Path = Get-MachinePath # Install common tools rustup component add rustfmt clippy # Temporary hardcode cargo-audit 0.14.1 as 0.15.0 is broken https://docs.rs/crate/cargo-audit/0.15.0 -cargo install --locked bindgen cbindgen cargo-audit --version 0.14.1 cargo-outdated +cargo install --locked bindgen cbindgen cargo-outdated +cargo install cargo-audit --version 0.14.1 + # Run script at startup for all users $cmdRustSymScript = @" From 76c0efb5eb51107653c58f697f52d28f9db9b087 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Fri, 30 Jul 2021 22:05:48 +0300 Subject: [PATCH 0420/3485] [macOS] Install cargo-audit 0.14.1 as 0.15.0 is broken (#3820) * Hardcode 0.14.1 as 0.15.0 is broken * Install cargo-audit without locked --- images/macos/provision/core/rust.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/images/macos/provision/core/rust.sh b/images/macos/provision/core/rust.sh index d60bcf0dc760..0af0126c1adc 100644 --- a/images/macos/provision/core/rust.sh +++ b/images/macos/provision/core/rust.sh @@ -12,7 +12,9 @@ CARGO_HOME=$HOME/.cargo echo Install common tools... rustup component add rustfmt clippy -cargo install --locked bindgen cbindgen cargo-audit cargo-outdated +cargo install --locked bindgen cbindgen cargo-outdated +# Temporary hardcode cargo-audit 0.14.1 as 0.15.0 is broken https://docs.rs/crate/cargo-audit/0.15.0 +cargo install cargo-audit --version 0.14.1 echo Cleanup Cargo registry cached data... rm -rf $CARGO_HOME/registry/* From 799c7a79cf0d15a579c49f681a81f587181099db Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Fri, 30 Jul 2021 22:06:02 +0300 Subject: [PATCH 0421/3485] [Ubuntu] Install cargo-audit 0.14.1 as 0.15.0 is broken (#3821) * Version 0.15.0 is broken, stick to 0.14.1 * Install cargo-audit without locked --- images/linux/scripts/installers/rust.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/images/linux/scripts/installers/rust.sh b/images/linux/scripts/installers/rust.sh index a611183c4c6f..8c111a6d7370 100644 --- a/images/linux/scripts/installers/rust.sh +++ b/images/linux/scripts/installers/rust.sh @@ -17,7 +17,9 @@ source $CARGO_HOME/env # Install common tools rustup component add rustfmt clippy -cargo install --locked bindgen cbindgen cargo-audit cargo-outdated +cargo install --locked bindgen cbindgen cargo-outdated +# Temporary hardcode cargo-audit 0.14.1 as 0.15.0 is broken https://docs.rs/crate/cargo-audit/0.15.0 +cargo install cargo-audit --version 0.14.1 # Permissions chmod -R 777 $(dirname $RUSTUP_HOME) From b28c62d3f17b3d565be8738cba029c8f8c03cc2b Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Sat, 31 Jul 2021 17:24:54 +0300 Subject: [PATCH 0422/3485] [Windows] Use default msys2 installer (#3819) * Use default msys2 installer * Use default msys2 installer * Revert "[Windows] cargo-audit 0.15.0 is broken, stick to 0.14.1 (#3822)" This reverts commit 0b37a50b575f440a515b8f4163fdab9098843317. * merge --- .../win/scripts/Installers/Install-Msys2.ps1 | 25 +++---------------- 1 file changed, 3 insertions(+), 22 deletions(-) diff --git a/images/win/scripts/Installers/Install-Msys2.ps1 b/images/win/scripts/Installers/Install-Msys2.ps1 index 1a7f2a9a3418..a47808c250a1 100644 --- a/images/win/scripts/Installers/Install-Msys2.ps1 +++ b/images/win/scripts/Installers/Install-Msys2.ps1 @@ -8,43 +8,25 @@ # https://packages.msys2.org/group/ $dash = "-" * 40 - $origPath = $env:PATH -$gitPath = "$env:ProgramFiles\Git" $msys2_release = "https://api.github.com/repos/msys2/msys2-installer/releases/latest" - $msys2Uri = ((Invoke-RestMethod $msys2_release).assets | Where-Object { - $_.name -match "x86_64" -and $_.name.EndsWith("tar.xz") }).browser_download_url + $_.name -match "^msys2-x86_64" -and $_.name.EndsWith(".exe") }).browser_download_url # Download the latest msys2 x86_64, filename includes release date Write-Host "Starting msys2 download using $($msys2Uri.split('/')[-1])" $msys2File = Start-DownloadWithRetry -Url $msys2Uri Write-Host "Finished download" -# nix style path for tar -$msys2FileU = "/$msys2File".replace(':', '').replace('\', '/') - -# Git tar needs exe's from mingw64\bin -$env:PATH = "$gitPath\usr\bin;$gitPath\mingw64\bin;$origPath" - -$tar = "$gitPath\usr\bin\tar.exe" - # extract tar.xz to C:\ -Write-Host "Starting msys2 extraction" -&$tar -xJf $msys2FileU -C /c/ +Write-Host "Starting msys2 installation" +& $msys2File in --confirm-command --accept-messages --root C:/msys64 Remove-Item $msys2File -Write-Host "Finished extraction" # Add msys2 bin tools folders to PATH temporary $env:PATH = "C:\msys64\mingw64\bin;C:\msys64\usr\bin;$origPath" -Write-Host "`n$dash bash pacman-key --init" -bash.exe -c "pacman-key --init 2>&1" - -Write-Host "bash pacman-key --populate msys2" -bash.exe -c "pacman-key --populate msys2 2>&1" - Write-Host "`n$dash pacman --noconfirm -Syyuu" pacman.exe -Syyuu --noconfirm taskkill /f /fi "MODULES eq msys-2.0.dll" @@ -53,7 +35,6 @@ pacman.exe -Syuu --noconfirm taskkill /f /fi "MODULES eq msys-2.0.dll" $toolsetContent = (Get-ToolsetContent).MsysPackages - Write-Host "`n$dash Install msys2 packages" $msys2Packages = $toolsetContent.msys2 pacman.exe -S --noconfirm --needed --noprogressbar $msys2Packages From 892ada55d596e8869f6e771639c7b816e4f25801 Mon Sep 17 00:00:00 2001 From: Maxim Lobanov Date: Sun, 1 Aug 2021 15:10:59 +0300 Subject: [PATCH 0423/3485] [Windows] Docker, .NET Core and NPM improvements (#3811) * improve InitializeVM script * Update windows2019.json * remove configs * resolve comments * resolve comments; fix order * fix templates * move Node.js packages to toolset * dotnet warmup and merge docker scripts * Update Node.Tests.ps1 * Update Install-Docker.ps1 * fix node.js tests * fix npm package installation * Update Install-NodeLts.ps1 * fix tests * fix test --- .../win/scripts/Installers/Install-Docker.ps1 | 13 +++++- .../scripts/Installers/Install-DotnetSDK.ps1 | 44 ++++++++++--------- .../scripts/Installers/Install-NodeLts.ps1 | 13 ++---- .../scripts/Installers/Install-TypeScript.ps1 | 8 ---- .../Installers/Update-DockerImages.ps1 | 24 ---------- images/win/scripts/Tests/Node.Tests.ps1 | 16 +++---- images/win/scripts/Tests/Tools.Tests.ps1 | 6 --- images/win/toolsets/toolset-2016.json | 18 +++++++- images/win/toolsets/toolset-2019.json | 18 +++++++- images/win/windows2016.json | 2 - images/win/windows2019.json | 2 - 11 files changed, 81 insertions(+), 83 deletions(-) delete mode 100644 images/win/scripts/Installers/Install-TypeScript.ps1 delete mode 100644 images/win/scripts/Installers/Update-DockerImages.ps1 diff --git a/images/win/scripts/Installers/Install-Docker.ps1 b/images/win/scripts/Installers/Install-Docker.ps1 index 8c2da9b5b6b1..cb713ca4d126 100644 --- a/images/win/scripts/Installers/Install-Docker.ps1 +++ b/images/win/scripts/Installers/Install-Docker.ps1 @@ -12,4 +12,15 @@ Start-Service docker Write-Host "Install-Package Docker-Compose" Choco-Install -PackageName docker-compose -Invoke-PesterTests -TestFile "Docker" -TestName "Docker" \ No newline at end of file +$dockerImages = (Get-ToolsetContent).docker.images +foreach ($dockerImage in $dockerImages) { + Write-Host "Pulling docker image $dockerImage ..." + docker pull $dockerImage + + if (!$?) { + Write-Host "Docker pull failed with a non-zero exit code" + exit 1 + } +} + +Invoke-PesterTests -TestFile "Docker" \ No newline at end of file diff --git a/images/win/scripts/Installers/Install-DotnetSDK.ps1 b/images/win/scripts/Installers/Install-DotnetSDK.ps1 index 12b4a701c0a1..27cd6d39c76c 100644 --- a/images/win/scripts/Installers/Install-DotnetSDK.ps1 +++ b/images/win/scripts/Installers/Install-DotnetSDK.ps1 @@ -12,16 +12,26 @@ Set-SystemVariable -SystemVariable DOTNET_MULTILEVEL_LOOKUP -Value "0" [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor "Tls12" -$templates = @( - 'console', - 'mstest', - 'web', - 'mvc', - 'webapi' -) +function Invoke-Warmup ( + $SdkVersion +) { + # warm up dotnet for first time experience + $projectTypes = @('console', 'mstest', 'web', 'mvc', 'webapi') + $projectTypes | ForEach-Object { + $template = $_ + $projectPath = Join-Path -Path C:\temp -ChildPath $template + New-Item -Path $projectPath -Force -ItemType Directory + Push-Location -Path $projectPath + & $env:ProgramFiles\dotnet\dotnet.exe new globaljson --sdk-version "$sdkVersion" + & $env:ProgramFiles\dotnet\dotnet.exe new $template + Pop-Location + Remove-Item $projectPath -Force -Recurse + } +} function InstallSDKVersion ( - $sdkVersion + $SdkVersion, + $Warmup ) { if (!(Test-Path -Path "C:\Program Files\dotnet\sdk\$sdkVersion")) @@ -40,16 +50,8 @@ function InstallSDKVersion ( $sdkTargetsPath = "C:\Program Files\dotnet\sdk\$sdkVersion\Sdks\Microsoft.NET.Sdk\targets" Start-DownloadWithRetry -Url $sdkTargetsUrl -DownloadPath $sdkTargetsPath -Name $sdkTargetsName - # warm up dotnet for first time experience - $templates | ForEach-Object { - $template = $_ - $projectPath = Join-Path -Path C:\temp -ChildPath $template - New-Item -Path $projectPath -Force -ItemType Directory - Push-Location -Path $projectPath - & $env:ProgramFiles\dotnet\dotnet.exe new globaljson --sdk-version "$sdkVersion" - & $env:ProgramFiles\dotnet\dotnet.exe new $template - Pop-Location - Remove-Item $projectPath -Force -Recurse + if ($Warmup) { + Invoke-Warmup -SdkVersion $SdkVersion } } @@ -57,7 +59,9 @@ function InstallAllValidSdks() { # Consider all channels except preview/eol channels. # Sort the channels in ascending order - $dotnetVersions = (Get-ToolsetContent).dotnet.versions + $dotnetToolset = (Get-ToolsetContent).dotnet + $dotnetVersions = $dotnetToolset.versions + $warmup = $dotnetToolset.warmup # Download installation script. $installationName = "dotnet-install.ps1" @@ -93,7 +97,7 @@ function InstallAllValidSdks() elseif (!$release.'sdk'.'version'.Contains('-')) { $sdkVersion = $release.'sdk'.'version' - InstallSDKVersion -sdkVersion $sdkVersion + InstallSDKVersion -SdkVersion $sdkVersion -Warmup $warmup } } } diff --git a/images/win/scripts/Installers/Install-NodeLts.ps1 b/images/win/scripts/Installers/Install-NodeLts.ps1 index 2a74cc14d46c..3b91ad201fef 100644 --- a/images/win/scripts/Installers/Install-NodeLts.ps1 +++ b/images/win/scripts/Installers/Install-NodeLts.ps1 @@ -21,14 +21,9 @@ $env:npm_config_prefix = $PrefixPath npm config set cache $CachePath --global npm config set registry https://registry.npmjs.org/ -npm install -g cordova -npm install -g grunt-cli -npm install -g gulp-cli -npm install -g parcel-bundler -npm install -g --save-dev webpack webpack-cli -npm install -g yarn -npm install -g lerna -npm install -g node-sass -npm install -g newman +$globalNpmPackages = (Get-ToolsetContent).npm.global_packages +$globalNpmPackages | ForEach-Object { + npm install -g $_.name +} Invoke-PesterTests -TestFile "Node" diff --git a/images/win/scripts/Installers/Install-TypeScript.ps1 b/images/win/scripts/Installers/Install-TypeScript.ps1 deleted file mode 100644 index d413c1000cf8..000000000000 --- a/images/win/scripts/Installers/Install-TypeScript.ps1 +++ /dev/null @@ -1,8 +0,0 @@ -################################################################################ -## File: Install-TypeScript.ps1 -## Desc: Install Latest TypeScript -################################################################################ - -npm install -g typescript - -Invoke-PesterTests -TestFile "Tools" -TestName "Typescript" diff --git a/images/win/scripts/Installers/Update-DockerImages.ps1 b/images/win/scripts/Installers/Update-DockerImages.ps1 deleted file mode 100644 index 39279e4f93c3..000000000000 --- a/images/win/scripts/Installers/Update-DockerImages.ps1 +++ /dev/null @@ -1,24 +0,0 @@ -################################################################################ -## File: Update-DockerImages.ps1 -## Desc: Pull some standard docker images. -## Must be run after docker is installed. -################################################################################ - -function DockerPull { - Param ([string]$image) - - Write-Host Installing $image ... - docker pull $image - - if (!$?) { - Write-Host "Docker pull failed with a non-zero exit code" - exit 1 - } -} - -$dockerToolset = (Get-ToolsetContent).docker -foreach($dockerImage in $dockerToolset.images) { - DockerPull $dockerImage -} - -Invoke-PesterTests -TestFile "Docker" -TestName "DockerImages" \ No newline at end of file diff --git a/images/win/scripts/Tests/Node.Tests.ps1 b/images/win/scripts/Tests/Node.Tests.ps1 index cb8883ad4009..58577276ed7d 100644 --- a/images/win/scripts/Tests/Node.Tests.ps1 +++ b/images/win/scripts/Tests/Node.Tests.ps1 @@ -4,18 +4,16 @@ Describe "Node.JS" { @{ ToolName = "node" } @{ ToolName = "npm" } ) { - "$ToolName --version" | Should -ReturnZeroExitCode + "$ToolName --version" | Should -ReturnZeroExitCode } } + + $globalNpmPackages = (Get-ToolsetContent).npm.global_packages + $globalNpmPackagesWithTests = $globalNpmPackages | Where-Object { $_.test } | ForEach-Object { @{ Name = $_.name; Test = $_.test } } + Context "Global NPM Packages" { - It " " -TestCases @( - @{ ToolName = "gulp" } - @{ ToolName = "grunt" } - @{ ToolName = "yarn" } - @{ ToolName = "lerna" } - @{ ToolName = "newman" } - ) { - "$ToolName --version" | Should -ReturnZeroExitCode + It "" -TestCases $globalNpmPackagesWithTests { + $Test | Should -ReturnZeroExitCode } } } \ No newline at end of file diff --git a/images/win/scripts/Tests/Tools.Tests.ps1 b/images/win/scripts/Tests/Tools.Tests.ps1 index 0827a4ccea34..03756723eb11 100644 --- a/images/win/scripts/Tests/Tools.Tests.ps1 +++ b/images/win/scripts/Tests/Tools.Tests.ps1 @@ -139,12 +139,6 @@ Describe "Stack" { } } -Describe "Typescript" { - It "tsc" { - "tsc --version" | Should -ReturnZeroExitCode - } -} - Describe "Vcpkg" { It "vcpkg" { "vcpkg version" | Should -ReturnZeroExitCode diff --git a/images/win/toolsets/toolset-2016.json b/images/win/toolsets/toolset-2016.json index 8f63548347f2..f9a4b28f7e54 100644 --- a/images/win/toolsets/toolset-2016.json +++ b/images/win/toolsets/toolset-2016.json @@ -340,12 +340,28 @@ "cmd": "yamllint --version" } ], + "npm": { + "global_packages": [ + { "name": "yarn", "test": "yarn --version" }, + { "name": "newman", "test": "newman --version" }, + { "name": "lerna", "test": "lerna --version" }, + { "name": "typescript", "test": "tsc --version" }, + { "name": "cordova" }, + { "name": "grunt-cli", "test": "grunt --version" }, + { "name": "gulp-cli", "test": "gulp --version" }, + { "name": "parcel-bundler" }, + { "name": "webpack" }, + { "name": "webpack-cli" }, + { "name": "node-sass" } + ] + }, "dotnet": { "versions": [ "2.1", "3.1", "5.0" - ] + ], + "warmup": true }, "choco": { "common_packages": [ diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index 28d8873a186a..40e8d6b8a23e 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -368,12 +368,28 @@ "cmd": "yamllint --version" } ], + "npm": { + "global_packages": [ + { "name": "yarn", "test": "yarn --version" }, + { "name": "newman", "test": "newman --version" }, + { "name": "lerna", "test": "lerna --version" }, + { "name": "typescript", "test": "tsc --version" }, + { "name": "cordova" }, + { "name": "grunt-cli", "test": "grunt --version" }, + { "name": "gulp-cli", "test": "gulp --version" }, + { "name": "parcel-bundler" }, + { "name": "webpack" }, + { "name": "webpack-cli" }, + { "name": "node-sass" } + ] + }, "dotnet": { "versions": [ "2.1", "3.1", "5.0" - ] + ], + "warmup": true }, "choco": { "common_packages": [ diff --git a/images/win/windows2016.json b/images/win/windows2016.json index bb4cd77cbea2..7445431ed51c 100644 --- a/images/win/windows2016.json +++ b/images/win/windows2016.json @@ -172,7 +172,6 @@ "TOOLSET_JSON_PATH={{user `toolset_json_path`}}" ], "scripts": [ - "{{ template_dir }}/scripts/Installers/Update-DockerImages.ps1", "{{ template_dir }}/scripts/Installers/Install-KubernetesTools.ps1", "{{ template_dir }}/scripts/Installers/Install-VS.ps1", "{{ template_dir }}/scripts/Installers/Install-NET48.ps1", @@ -304,7 +303,6 @@ "type": "powershell", "scripts": [ "{{ template_dir }}/scripts/Installers/Install-Mingw64.ps1", - "{{ template_dir }}/scripts/Installers/Install-TypeScript.ps1", "{{ template_dir }}/scripts/Installers/Install-Haskell.ps1", "{{ template_dir }}/scripts/Installers/Install-Stack.ps1", "{{ template_dir }}/scripts/Installers/Install-Miniconda.ps1", diff --git a/images/win/windows2019.json b/images/win/windows2019.json index a9e17fb52c5a..18c63ed85408 100644 --- a/images/win/windows2019.json +++ b/images/win/windows2019.json @@ -180,7 +180,6 @@ "TOOLSET_JSON_PATH={{user `toolset_json_path`}}" ], "scripts": [ - "{{ template_dir }}/scripts/Installers/Update-DockerImages.ps1", "{{ template_dir }}/scripts/Installers/Install-KubernetesTools.ps1", "{{ template_dir }}/scripts/Installers/Install-VS.ps1", "{{ template_dir }}/scripts/Installers/Install-NET48.ps1" @@ -287,7 +286,6 @@ "{{ template_dir }}/scripts/Installers/Install-SQLPowerShellTools.ps1", "{{ template_dir }}/scripts/Installers/Install-DotnetSDK.ps1", "{{ template_dir }}/scripts/Installers/Install-Mingw64.ps1", - "{{ template_dir }}/scripts/Installers/Install-TypeScript.ps1", "{{ template_dir }}/scripts/Installers/Install-Haskell.ps1", "{{ template_dir }}/scripts/Installers/Install-Stack.ps1", "{{ template_dir }}/scripts/Installers/Install-Miniconda.ps1", From e9a8f1dac7c4c74cb375036cbbb69cf9005bf960 Mon Sep 17 00:00:00 2001 From: Dibir Magomedsaygitov <61747324+dibir-magomedsaygitov@users.noreply.github.com> Date: Mon, 2 Aug 2021 16:12:26 +0300 Subject: [PATCH 0424/3485] [Ubuntu] Fix GraalVM installation to retrieve latest version (#3832) --- images/linux/scripts/installers/graalvm.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/images/linux/scripts/installers/graalvm.sh b/images/linux/scripts/installers/graalvm.sh index 4026177a373a..b66eeb452d9b 100644 --- a/images/linux/scripts/installers/graalvm.sh +++ b/images/linux/scripts/installers/graalvm.sh @@ -7,7 +7,10 @@ source $HELPER_SCRIPTS/etc-environment.sh GRAALVM_ROOT=/usr/local/graalvm export GRAALVM_11_ROOT=$GRAALVM_ROOT/graalvm-ce-java11* -url=$(curl -s https://api.github.com/repos/graalvm/graalvm-ce-builds/releases/latest | jq -r '.assets[].browser_download_url | select(contains("graalvm-ce-java11-linux-amd64") and endswith("tar.gz"))') +json=$(curl -s "https://api.github.com/repos/graalvm/graalvm-ce-builds/releases") +latest_tag=$(echo $json | jq -r '.[] | select(.prerelease==false).tag_name' | sort --unique --version-sort | tail -1) +url=$(echo $json | jq -r ".[] | select(.tag_name==\"${latest_tag}\").assets[].browser_download_url | select(contains(\"graalvm-ce-java11-linux-amd64\") and endswith(\"tar.gz\"))") + download_with_retries "$url" "/tmp" "graalvm-archive.tar.gz" mkdir $GRAALVM_ROOT tar -xzf "/tmp/graalvm-archive.tar.gz" -C $GRAALVM_ROOT From 7c1956be8a89fcecb122f8f11d893ccd5a342e8f Mon Sep 17 00:00:00 2001 From: Dibir Magomedsaygitov <61747324+dibir-magomedsaygitov@users.noreply.github.com> Date: Mon, 2 Aug 2021 22:11:44 +0300 Subject: [PATCH 0425/3485] [Ubuntu] Fix kubectl installation (#3836) * fix kubectl installation --- images/linux/scripts/installers/kubernetes-tools.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/linux/scripts/installers/kubernetes-tools.sh b/images/linux/scripts/installers/kubernetes-tools.sh index a32e7ea57efb..06d35ff918c4 100644 --- a/images/linux/scripts/installers/kubernetes-tools.sh +++ b/images/linux/scripts/installers/kubernetes-tools.sh @@ -10,8 +10,8 @@ curl -L -o /usr/local/bin/kind $URL chmod +x /usr/local/bin/kind ## Install kubectl -KUBECTL_VERSION=$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt) -curl -o /usr/local/bin/kubectl -LO https://storage.googleapis.com/kubernetes-release/release/$KUBECTL_VERSION/bin/linux/amd64/kubectl +KUBECTL_VERSION=$(curl -L -s "https://dl.k8s.io/release/stable.txt") +curl -o /usr/local/bin/kubectl -LO "https://dl.k8s.io/release/$KUBECTL_VERSION/bin/linux/amd64/kubectl" chmod +x /usr/local/bin/kubectl # Install Helm From 32184fd8507834f6e952274b7a4cbf063783040d Mon Sep 17 00:00:00 2001 From: Maxim Lobanov Date: Tue, 3 Aug 2021 11:56:52 +0300 Subject: [PATCH 0426/3485] [Windows] Clean up and simplify Windows templates (#3833) * improve InitializeVM script * Update windows2019.json * remove configs * resolve comments * resolve comments; fix order * fix templates * move Node.js packages to toolset * dotnet warmup and merge docker scripts * clean up templates * move template * fix dotnetTLS order --- .../scripts/ImageHelpers/InstallHelpers.ps1 | 3 +- .../Installers/Install-AzureModules.ps1 | 2 +- .../scripts/Tests/PowerShellModules.Tests.ps1 | 2 +- images/win/windows2016.json | 126 +++--------------- images/win/windows2019.json | 110 +++------------ 5 files changed, 41 insertions(+), 202 deletions(-) diff --git a/images/win/scripts/ImageHelpers/InstallHelpers.ps1 b/images/win/scripts/ImageHelpers/InstallHelpers.ps1 index 4f15d41e92e3..25a7858586b4 100644 --- a/images/win/scripts/ImageHelpers/InstallHelpers.ps1 +++ b/images/win/scripts/ImageHelpers/InstallHelpers.ps1 @@ -318,7 +318,8 @@ function Get-VSExtensionVersion function Get-ToolsetContent { - $toolsetJson = Get-Content -Path $env:TOOLSET_JSON_PATH -Raw + $toolsetPath = Join-Path "C:\\image" "toolset.json" + $toolsetJson = Get-Content -Path $toolsetPath -Raw ConvertFrom-Json -InputObject $toolsetJson } diff --git a/images/win/scripts/Installers/Install-AzureModules.ps1 b/images/win/scripts/Installers/Install-AzureModules.ps1 index ec36fe6ff86d..1c98a8c3def9 100644 --- a/images/win/scripts/Installers/Install-AzureModules.ps1 +++ b/images/win/scripts/Installers/Install-AzureModules.ps1 @@ -4,7 +4,7 @@ ################################################################################ # The correct Modules need to be saved in C:\Modules -$installPSModulePath = $env:PSMODULES_ROOT_FOLDER +$installPSModulePath = "C:\\Modules" if (-not (Test-Path -LiteralPath $installPSModulePath)) { Write-Host "Creating ${installPSModulePath} folder to store PowerShell Azure modules..." diff --git a/images/win/scripts/Tests/PowerShellModules.Tests.ps1 b/images/win/scripts/Tests/PowerShellModules.Tests.ps1 index c4a9be861c7a..ebda62bb9380 100644 --- a/images/win/scripts/Tests/PowerShellModules.Tests.ps1 +++ b/images/win/scripts/Tests/PowerShellModules.Tests.ps1 @@ -24,7 +24,7 @@ Describe "PowerShellModules" { Describe "AzureModules" { $modules = (Get-ToolsetContent).azureModules - $modulesRootPath = $env:PSMODULES_ROOT_FOLDER + $modulesRootPath = "C:\\Modules" foreach ($module in $modules) { $moduleName = $module.name diff --git a/images/win/windows2016.json b/images/win/windows2016.json index 7445431ed51c..3bcd272d7fa8 100644 --- a/images/win/windows2016.json +++ b/images/win/windows2016.json @@ -16,8 +16,6 @@ "private_virtual_network_with_public_ip": "{{env `PRIVATE_VIRTUAL_NETWORK_WITH_PUBLIC_IP`}}", "allowed_inbound_ip_addresses": "{{env `AGENT_IP`}}", "vm_size": "Standard_D8s_v4", - "root_folder": "C:", - "toolset_json_path": "{{env `TEMP`}}\\toolset.json", "image_folder": "C:\\image", "imagedata_file": "C:\\imagedata.json", "helper_script_folder": "C:\\Program Files\\WindowsPowerShell\\Modules\\", @@ -96,7 +94,7 @@ { "type": "file", "source": "{{template_dir}}/toolsets/toolset-2016.json", - "destination": "{{user `toolset_json_path`}}" + "destination": "{{user `image_folder`}}\\toolset.json" }, { "type": "windows-shell", @@ -119,43 +117,30 @@ "IMAGE_VERSION={{user `image_version`}}", "IMAGE_OS={{user `image_os`}}", "AGENT_TOOLSDIRECTORY={{user `agent_tools_directory`}}", - "TOOLSET_JSON_PATH={{user `toolset_json_path`}}", - "PSMODULES_ROOT_FOLDER={{user `psmodules_root_folder`}}" + "IMAGEDATA_FILE={{user `imagedata_file`}}" ], "scripts": [ "{{ template_dir }}/scripts/Installers/Configure-Antivirus.ps1", "{{ template_dir }}/scripts/Installers/Install-PowerShellModules.ps1", "{{ template_dir }}/scripts/Installers/Install-WindowsFeatures.ps1", "{{ template_dir }}/scripts/Installers/Install-Choco.ps1", - "{{ template_dir }}/scripts/Installers/Initialize-VM.ps1" + "{{ template_dir }}/scripts/Installers/Initialize-VM.ps1", + "{{ template_dir }}/scripts/Installers/Update-ImageData.ps1", + "{{ template_dir }}/scripts/Installers/Update-DotnetTLS.ps1" ], "execution_policy": "unrestricted" }, - { - "type": "powershell", - "scripts": [ - "{{ template_dir }}/scripts/Installers/Install-WebPlatformInstaller.ps1", - "{{ template_dir }}/scripts/Installers/Update-DotnetTLS.ps1" - ] - }, { "type": "windows-restart", "restart_timeout": "30m" }, { "type": "powershell", - "environment_vars": [ - "IMAGE_VERSION={{user `image_version`}}", - "IMAGE_OS={{user `image_os`}}", - "AGENT_TOOLSDIRECTORY={{user `agent_tools_directory`}}", - "IMAGEDATA_FILE={{user `imagedata_file`}}", - "TOOLSET_JSON_PATH={{user `toolset_json_path`}}" - ], "scripts": [ "{{ template_dir }}/scripts/Installers/Install-VCRedist.ps1", - "{{ template_dir }}/scripts/Installers/Update-ImageData.ps1", "{{ template_dir }}/scripts/Installers/Install-Docker.ps1", - "{{ template_dir }}/scripts/Installers/Install-PowershellCore.ps1" + "{{ template_dir }}/scripts/Installers/Install-PowershellCore.ps1", + "{{ template_dir }}/scripts/Installers/Install-WebPlatformInstaller.ps1" ] }, { @@ -168,29 +153,16 @@ 0, 3010 ], - "environment_vars": [ - "TOOLSET_JSON_PATH={{user `toolset_json_path`}}" - ], "scripts": [ "{{ template_dir }}/scripts/Installers/Install-KubernetesTools.ps1", "{{ template_dir }}/scripts/Installers/Install-VS.ps1", "{{ template_dir }}/scripts/Installers/Install-NET48.ps1", - "{{ template_dir }}/scripts/Installers/Windows2016/Install-SSDT.ps1" + "{{ template_dir }}/scripts/Installers/Windows2016/Install-SSDT.ps1", + "{{ template_dir }}/scripts/Installers/Enable-DeveloperMode.ps1" ], "elevated_user": "{{user `install_user`}}", "elevated_password": "{{user `install_password`}}" }, - { - "type": "powershell", - "environment_vars": [ - "TOOLSET_JSON_PATH={{user `toolset_json_path`}}" - ], - "scripts": [ - "{{ template_dir }}/scripts/Installers/Install-Wix.ps1", - "{{ template_dir }}/scripts/Installers/Install-WDK.ps1", - "{{ template_dir }}/scripts/Installers/Install-Vsix.ps1" - ] - }, { "type": "powershell", "scripts": [ @@ -204,10 +176,10 @@ }, { "type": "powershell", - "environment_vars": [ - "TOOLSET_JSON_PATH={{user `toolset_json_path`}}" - ], "scripts": [ + "{{ template_dir }}/scripts/Installers/Install-Wix.ps1", + "{{ template_dir }}/scripts/Installers/Install-WDK.ps1", + "{{ template_dir }}/scripts/Installers/Install-Vsix.ps1", "{{ template_dir }}/scripts/Installers/Install-AzureCli.ps1", "{{ template_dir }}/scripts/Installers/Install-AzureDevOpsCli.ps1", "{{ template_dir }}/scripts/Installers/Install-NodeLts.ps1", @@ -215,28 +187,14 @@ "{{ template_dir }}/scripts/Installers/Install-CommonUtils.ps1", "{{ template_dir }}/scripts/Installers/Install-AliyunCli.ps1", "{{ template_dir }}/scripts/Installers/Install-PostgreSQL.ps1", - "{{ template_dir }}/scripts/Installers/Install-JavaTools.ps1" - ] - }, - { - "type": "powershell", - "environment_vars": [ - "TOOLSET_JSON_PATH={{user `toolset_json_path`}}", - "ROOT_FOLDER={{user `root_folder`}}" - ], - "scripts": [ + "{{ template_dir }}/scripts/Installers/Install-JavaTools.ps1", "{{ template_dir }}/scripts/Installers/Install-Ruby.ps1", "{{ template_dir }}/scripts/Installers/Install-PyPy.ps1", "{{ template_dir }}/scripts/Installers/Install-Toolset.ps1", "{{ template_dir }}/scripts/Installers/Configure-Toolset.ps1", "{{ template_dir }}/scripts/Installers/Install-AndroidSDK.ps1", "{{ template_dir }}/scripts/Installers/Install-Pipx.ps1", - "{{ template_dir }}/scripts/Installers/Install-PipxPackages.ps1" - ] - }, - { - "type": "powershell", - "scripts": [ + "{{ template_dir }}/scripts/Installers/Install-PipxPackages.ps1", "{{ template_dir }}/scripts/Installers/Install-Sbt.ps1", "{{ template_dir }}/scripts/Installers/Install-Git.ps1", "{{ template_dir }}/scripts/Installers/Install-GitHub-CLI.ps1", @@ -251,14 +209,6 @@ "{{ template_dir }}/scripts/Installers/Install-Nginx.ps1" ] }, - { - "type": "powershell", - "scripts": [ - "{{ template_dir }}/scripts/Installers/Enable-DeveloperMode.ps1" - ], - "elevated_user": "{{user `install_user`}}", - "elevated_password": "{{user `install_password`}}" - }, { "type": "windows-shell", "inline": [ @@ -267,41 +217,16 @@ }, { "type": "powershell", - "environment_vars": [ - "TOOLSET_JSON_PATH={{user `toolset_json_path`}}", - "PSMODULES_ROOT_FOLDER={{user `psmodules_root_folder`}}" - ], - "scripts": [ - "{{ template_dir }}/scripts/Installers/Install-AzureModules.ps1" - ] - }, - { - "type": "powershell", - "environment_vars": [ - "TOOLSET_JSON_PATH={{user `toolset_json_path`}}" - ], "scripts": [ + "{{ template_dir }}/scripts/Installers/Install-AzureModules.ps1", "{{ template_dir }}/scripts/Installers/Install-WinAppDriver.ps1", "{{ template_dir }}/scripts/Installers/Install-R.ps1", "{{ template_dir }}/scripts/Installers/Install-AWS.ps1", "{{ template_dir }}/scripts/Installers/Install-DACFx.ps1", "{{ template_dir }}/scripts/Installers/Install-MysqlCli.ps1", "{{ template_dir }}/scripts/Installers/Install-SQLPowerShellTools.ps1", - "{{ template_dir }}/scripts/Installers/Install-DotnetSDK.ps1" - ] - }, - { - "type": "powershell", - "environment_vars": [ - "TOOLSET_JSON_PATH={{user `toolset_json_path`}}" - ], - "scripts": [ - "{{ template_dir }}/scripts/Installers/Install-Msys2.ps1" - ] - }, - { - "type": "powershell", - "scripts": [ + "{{ template_dir }}/scripts/Installers/Install-DotnetSDK.ps1", + "{{ template_dir }}/scripts/Installers/Install-Msys2.ps1", "{{ template_dir }}/scripts/Installers/Install-Mingw64.ps1", "{{ template_dir }}/scripts/Installers/Install-Haskell.ps1", "{{ template_dir }}/scripts/Installers/Install-Stack.ps1", @@ -314,7 +239,8 @@ "{{ template_dir }}/scripts/Installers/Install-Vcpkg.ps1", "{{ template_dir }}/scripts/Installers/Install-MongoDB.ps1", "{{ template_dir }}/scripts/Installers/Install-GoogleCloudSDK.ps1", - "{{ template_dir }}/scripts/Installers/Install-CodeQLBundle.ps1" + "{{ template_dir }}/scripts/Installers/Install-CodeQLBundle.ps1", + "{{ template_dir }}/scripts/Installers/Disable-JITDebugger.ps1" ] }, { @@ -336,11 +262,6 @@ "type": "powershell", "scripts": [ "{{ template_dir }}/scripts/Tests/RunAll-Tests.ps1" - ], - "environment_vars": [ - "TOOLSET_JSON_PATH={{user `toolset_json_path`}}", - "PSMODULES_ROOT_FOLDER={{user `psmodules_root_folder`}}", - "ROOT_FOLDER={{user `root_folder`}}" ] }, { @@ -349,8 +270,7 @@ "pwsh -File '{{user `image_folder`}}\\SoftwareReport\\SoftwareReport.Generator.ps1'" ], "environment_vars": [ - "IMAGE_VERSION={{user `image_version`}}", - "TOOLSET_JSON_PATH={{user `toolset_json_path`}}" + "IMAGE_VERSION={{user `image_version`}}" ] }, { @@ -369,12 +289,6 @@ "type": "windows-restart", "restart_timeout": "30m" }, - { - "type": "powershell", - "scripts": [ - "{{ template_dir }}/scripts/Installers/Disable-JITDebugger.ps1" - ] - }, { "type": "powershell", "inline": [ diff --git a/images/win/windows2019.json b/images/win/windows2019.json index 18c63ed85408..052e51c1b38d 100644 --- a/images/win/windows2019.json +++ b/images/win/windows2019.json @@ -16,12 +16,9 @@ "private_virtual_network_with_public_ip": "{{env `PRIVATE_VIRTUAL_NETWORK_WITH_PUBLIC_IP`}}", "allowed_inbound_ip_addresses": "{{env `AGENT_IP`}}", "vm_size": "Standard_D8s_v4", - "root_folder": "C:", - "toolset_json_path": "{{env `TEMP`}}\\toolset.json", "image_folder": "C:\\image", "imagedata_file": "C:\\imagedata.json", "helper_script_folder": "C:\\Program Files\\WindowsPowerShell\\Modules\\", - "psmodules_root_folder": "C:\\Modules", "agent_tools_directory": "C:\\hostedtoolcache\\windows", "install_user": "installer", "install_password": null, @@ -96,7 +93,7 @@ { "type": "file", "source": "{{template_dir}}/toolsets/toolset-2019.json", - "destination": "{{user `toolset_json_path`}}" + "destination": "{{user `image_folder`}}\\toolset.json" }, { "type": "windows-shell", @@ -119,15 +116,16 @@ "IMAGE_VERSION={{user `image_version`}}", "IMAGE_OS={{user `image_os`}}", "AGENT_TOOLSDIRECTORY={{user `agent_tools_directory`}}", - "TOOLSET_JSON_PATH={{user `toolset_json_path`}}", - "PSMODULES_ROOT_FOLDER={{user `psmodules_root_folder`}}" + "IMAGEDATA_FILE={{user `imagedata_file`}}" ], "scripts": [ "{{ template_dir }}/scripts/Installers/Configure-Antivirus.ps1", "{{ template_dir }}/scripts/Installers/Install-PowerShellModules.ps1", "{{ template_dir }}/scripts/Installers/Install-WindowsFeatures.ps1", "{{ template_dir }}/scripts/Installers/Install-Choco.ps1", - "{{ template_dir }}/scripts/Installers/Initialize-VM.ps1" + "{{ template_dir }}/scripts/Installers/Initialize-VM.ps1", + "{{ template_dir }}/scripts/Installers/Update-ImageData.ps1", + "{{ template_dir }}/scripts/Installers/Update-DotnetTLS.ps1" ], "execution_policy": "unrestricted" }, @@ -139,31 +137,17 @@ "{{ template_dir }}/scripts/Installers/Windows2019/Install-WSL.ps1" ] }, - { - "type": "powershell", - "scripts": [ - "{{ template_dir }}/scripts/Installers/Install-WebPlatformInstaller.ps1", - "{{ template_dir }}/scripts/Installers/Update-DotnetTLS.ps1" - ] - }, { "type": "windows-restart", "restart_timeout": "10m" }, { "type": "powershell", - "environment_vars": [ - "IMAGE_VERSION={{user `image_version`}}", - "IMAGE_OS={{user `image_os`}}", - "AGENT_TOOLSDIRECTORY={{user `agent_tools_directory`}}", - "IMAGEDATA_FILE={{user `imagedata_file`}}", - "TOOLSET_JSON_PATH={{user `toolset_json_path`}}" - ], "scripts": [ "{{ template_dir }}/scripts/Installers/Install-VCRedist.ps1", - "{{ template_dir }}/scripts/Installers/Update-ImageData.ps1", "{{ template_dir }}/scripts/Installers/Install-Docker.ps1", - "{{ template_dir }}/scripts/Installers/Install-PowershellCore.ps1" + "{{ template_dir }}/scripts/Installers/Install-PowershellCore.ps1", + "{{ template_dir }}/scripts/Installers/Install-WebPlatformInstaller.ps1" ] }, { @@ -176,22 +160,17 @@ 0, 3010 ], - "environment_vars": [ - "TOOLSET_JSON_PATH={{user `toolset_json_path`}}" - ], "scripts": [ "{{ template_dir }}/scripts/Installers/Install-KubernetesTools.ps1", "{{ template_dir }}/scripts/Installers/Install-VS.ps1", - "{{ template_dir }}/scripts/Installers/Install-NET48.ps1" + "{{ template_dir }}/scripts/Installers/Install-NET48.ps1", + "{{ template_dir }}/scripts/Installers/Enable-DeveloperMode.ps1" ], "elevated_user": "{{user `install_user`}}", "elevated_password": "{{user `install_password`}}" }, { "type": "powershell", - "environment_vars": [ - "TOOLSET_JSON_PATH={{user `toolset_json_path`}}" - ], "scripts": [ "{{ template_dir }}/scripts/Installers/Install-Wix.ps1", "{{ template_dir }}/scripts/Installers/Install-WDK.ps1", @@ -222,11 +201,6 @@ }, { "type": "powershell", - "environment_vars": [ - "TOOLSET_JSON_PATH={{user `toolset_json_path`}}", - "ROOT_FOLDER={{user `root_folder`}}", - "PSMODULES_ROOT_FOLDER={{user `psmodules_root_folder`}}" - ], "scripts": [ "{{ template_dir }}/scripts/Installers/Install-Ruby.ps1", "{{ template_dir }}/scripts/Installers/Install-PyPy.ps1", @@ -235,12 +209,7 @@ "{{ template_dir }}/scripts/Installers/Install-AndroidSDK.ps1", "{{ template_dir }}/scripts/Installers/Install-AzureModules.ps1", "{{ template_dir }}/scripts/Installers/Install-Pipx.ps1", - "{{ template_dir }}/scripts/Installers/Install-PipxPackages.ps1" - ] - }, - { - "type": "powershell", - "scripts": [ + "{{ template_dir }}/scripts/Installers/Install-PipxPackages.ps1", "{{ template_dir }}/scripts/Installers/Install-Git.ps1", "{{ template_dir }}/scripts/Installers/Install-GitHub-CLI.ps1", "{{ template_dir }}/scripts/Installers/Install-PHP.ps1", @@ -252,32 +221,8 @@ "{{ template_dir }}/scripts/Installers/Install-Selenium.ps1", "{{ template_dir }}/scripts/Installers/Install-IEWebDriver.ps1", "{{ template_dir }}/scripts/Installers/Install-Apache.ps1", - "{{ template_dir }}/scripts/Installers/Install-Nginx.ps1" - ] - }, - { - "type": "powershell", - "scripts": [ - "{{ template_dir }}/scripts/Installers/Enable-DeveloperMode.ps1" - ], - "elevated_user": "{{user `install_user`}}", - "elevated_password": "{{user `install_password`}}" - }, - { - "type": "powershell", - "environment_vars": [ - "TOOLSET_JSON_PATH={{user `toolset_json_path`}}" - ], - "scripts": [ - "{{ template_dir }}/scripts/Installers/Install-Msys2.ps1" - ] - }, - { - "type": "powershell", - "environment_vars": [ - "TOOLSET_JSON_PATH={{user `toolset_json_path`}}" - ], - "scripts": [ + "{{ template_dir }}/scripts/Installers/Install-Nginx.ps1", + "{{ template_dir }}/scripts/Installers/Install-Msys2.ps1", "{{ template_dir }}/scripts/Installers/Install-WinAppDriver.ps1", "{{ template_dir }}/scripts/Installers/Install-R.ps1", "{{ template_dir }}/scripts/Installers/Install-AWS.ps1", @@ -301,13 +246,10 @@ "{{ template_dir }}/scripts/Installers/Install-RootCA.ps1", "{{ template_dir }}/scripts/Installers/Install-MongoDB.ps1", "{{ template_dir }}/scripts/Installers/Install-GoogleCloudSDK.ps1", - "{{ template_dir }}/scripts/Installers/Install-CodeQLBundle.ps1" - ] - }, - { - "type": "powershell", - "scripts": [ - "{{ template_dir }}/scripts/Installers/Install-BizTalkBuildComponent.ps1" + "{{ template_dir }}/scripts/Installers/Install-CodeQLBundle.ps1", + "{{ template_dir }}/scripts/Installers/Install-BizTalkBuildComponent.ps1", + "{{ template_dir }}/scripts/Installers/Disable-JITDebugger.ps1", + "{{ template_dir }}/scripts/Installers/Run-NGen.ps1" ] }, { @@ -329,11 +271,6 @@ "type": "powershell", "scripts": [ "{{ template_dir }}/scripts/Tests/RunAll-Tests.ps1" - ], - "environment_vars": [ - "TOOLSET_JSON_PATH={{user `toolset_json_path`}}", - "PSMODULES_ROOT_FOLDER={{user `psmodules_root_folder`}}", - "ROOT_FOLDER={{user `root_folder`}}" ] }, { @@ -342,8 +279,7 @@ "pwsh -File '{{user `image_folder`}}\\SoftwareReport\\SoftwareReport.Generator.ps1'" ], "environment_vars": [ - "IMAGE_VERSION={{user `image_version`}}", - "TOOLSET_JSON_PATH={{user `toolset_json_path`}}" + "IMAGE_VERSION={{user `image_version`}}" ] }, { @@ -362,18 +298,6 @@ "type": "windows-restart", "restart_timeout": "10m" }, - { - "type": "powershell", - "scripts": [ - "{{ template_dir }}/scripts/Installers/Disable-JITDebugger.ps1" - ] - }, - { - "type": "powershell", - "scripts": [ - "{{ template_dir }}/scripts/Installers/Run-NGen.ps1" - ] - }, { "type": "powershell", "inline": [ From 0768aa2d0db097f25c3c2cdc67ba31be87062347 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Tue, 3 Aug 2021 15:30:56 +0300 Subject: [PATCH 0427/3485] [Ubuntu] Expand oc only in openshift installation (#3841) --- images/linux/scripts/installers/oc.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/linux/scripts/installers/oc.sh b/images/linux/scripts/installers/oc.sh index 0aa39f38f954..27edfa94d317 100644 --- a/images/linux/scripts/installers/oc.sh +++ b/images/linux/scripts/installers/oc.sh @@ -10,6 +10,6 @@ source $HELPER_SCRIPTS/install.sh DOWNLOAD_URL="https://mirror.openshift.com/pub/openshift-v4/clients/ocp/latest/openshift-client-linux.tar.gz" PACKAGE_TAR_NAME="oc.tar.gz" download_with_retries $DOWNLOAD_URL "/tmp" $PACKAGE_TAR_NAME -tar xzf "/tmp/$PACKAGE_TAR_NAME" -C "/usr/local/bin" +tar xzf "/tmp/$PACKAGE_TAR_NAME" -C "/usr/local/bin" oc invoke_tests "CLI.Tools" "OC CLI" \ No newline at end of file From c960549cb11e7999749fbcfd54f490f108bcaa95 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 3 Aug 2021 16:02:00 +0000 Subject: [PATCH 0428/3485] Updating readme file for macOS-11 version 20210801.1 (#3831) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/macos/macos-11-Readme.md | 69 +++++++++++++++++---------------- 1 file changed, 35 insertions(+), 34 deletions(-) diff --git a/images/macos/macos-11-Readme.md b/images/macos/macos-11-Readme.md index 2a24d1ccc99e..5e9862e8d491 100644 --- a/images/macos/macos-11-Readme.md +++ b/images/macos/macos-11-Readme.md @@ -1,12 +1,12 @@ | Announcements | |-| -| [[all OS] MongoDB will be updated to version 5 on July, 26th](https://github.com/actions/virtual-environments/issues/3749) | +| [[macOS, Windows] .NET SDK pre-installation policy will be changed on September, 6](https://github.com/actions/virtual-environments/issues/3809) | | [macOS 11.0 pools will be transited to private preview.](https://github.com/actions/virtual-environments/issues/2486) | *** # macOS 11.5 info - System Version: macOS 11.5 (20G71) - Kernel Version: Darwin 20.6.0 -- Image Version: 20210724.1 +- Image Version: 20210801.1 ## Installed Software ### Language and Runtime @@ -16,36 +16,37 @@ - Clang/LLVM 12.0.5 is default - gcc-9 (Homebrew GCC 9.4.0) 9.4.0 - available by `gcc-9` alias - gcc-10 (Homebrew GCC 10.3.0) 10.3.0 - available by `gcc-10` alias -- gcc-11 (Homebrew GCC 11.1.0_1) 11.1.0 - available by `gcc-11` alias +- gcc-11 (Homebrew GCC 11.2.0) 11.2.0 - available by `gcc-11` alias - GNU Fortran (Homebrew GCC 9.4.0) 9.4.0 - available by `gfortran-9` alias - GNU Fortran (Homebrew GCC 10.3.0) 10.3.0 - available by `gfortran-10` alias -- GNU Fortran (Homebrew GCC 11.1.0_1) 11.1.0 - available by `gfortran-11` alias +- GNU Fortran (Homebrew GCC 11.2.0) 11.2.0 - available by `gfortran-11` alias - Go 1.15.14 - julia 1.6.2 +- kotlin 1.5.21-release-314 - MSBuild 16.6.0.15801 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) -- Node.js v14.17.3 +- Node.js v14.17.4 - NVM 0.38.0 -- NVM - Cached node versions: v10.24.1 v12.22.3 v14.17.3 +- NVM - Cached node versions: v10.24.1 v12.22.4 v14.17.4 - Perl 5.34.0 -- PHP 8.0.8 +- PHP 8.0.9 - Python 2.7.18 - Python 3.9.6 - Ruby 2.7.4p191 ### Package Management -- Bundler version 2.2.24 +- Bundler version 2.2.25 - Carthage 0.38.0 -- CocoaPods 1.10.1 +- CocoaPods 1.10.2 - Composer 2.1.5 -- Homebrew 3.2.3 +- Homebrew 3.2.5 - Miniconda 4.10.3 -- NPM 6.14.13 +- NPM 6.14.14 - NuGet 5.6.0.6489 - Pip 20.3.4 (python 2.7) - Pip 21.1.3 (python 3.9) - Pipx 0.16.3 -- RubyGems 3.2.24 -- Vcpkg 2021 (build from master \<7d2541c>) +- RubyGems 3.2.25 +- Vcpkg 2021 (build from master \<261c458>) - Yarn 1.22.5 #### Environment variables @@ -91,17 +92,17 @@ ### Tools - Aliyun CLI 3.0.82 -- App Center CLI 2.9.0 -- AWS CLI 2.2.22 +- App Center CLI 2.10.0 +- AWS CLI 2.2.25 - AWS SAM CLI 1.27.2 -- AWS Session Manager CLI 1.2.205.0 +- AWS Session Manager CLI 1.2.234.0 - Azure CLI 2.26.1 - Bicep CLI 0.4.451 - Cabal 3.4.0.0 -- Cmake 3.21.0 -- Fastlane 2.188.0 +- Cmake 3.21.1 +- Fastlane 2.189.0 - GHC 9.0.1 -- GHCup v0.1.15.2 +- GHCup v0.1.16.1 - Stack 2.7.3 - SwiftFormat 0.48.11 - Swig 4.0.2 @@ -115,16 +116,16 @@ - Safari 14.1.2 (16611.3.10.1.3) - SafariDriver 14.1.2 (16611.3.10.1.3) - Google Chrome 92.0.4515.107 -- ChromeDriver 91.0.4472.101 -- Microsoft Edge 92.0.902.55 -- MSEdgeDriver 92.0.902.55 +- ChromeDriver 92.0.4515.107 +- Microsoft Edge 92.0.902.62 +- MSEdgeDriver 92.0.902.62 - Mozilla Firefox 90.0.2 - geckodriver 0.29.1 #### Environment variables | Name | Value | | --------------- | ---------------------------------------------- | -| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/91.0.4472.101 | +| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/92.0.4515.107 | | EDGEWEBDRIVER | /usr/local/share/edge_driver | | GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | @@ -153,25 +154,25 @@ #### Node.js - 10.24.1 -- 12.22.3 -- 14.17.3 +- 12.22.4 +- 14.17.4 #### Go - 1.15.14 - 1.16.6 ### Rust Tools -- Cargo 1.53.0 -- Rust 1.53.0 -- Rustdoc 1.53.0 +- Cargo 1.54.0 +- Rust 1.54.0 +- Rustdoc 1.54.0 - Rustup 1.24.3 #### Packages -- Bindgen 0.59.0 -- Cargo-audit 0.15.0 +- Bindgen 0.59.1 +- Cargo-audit 0.14.1 - Cargo-outdated v0.9.17 -- Cbindgen 0.19.0 -- Clippy 0.1.53 +- Cbindgen 0.20.0 +- Clippy 0.1.54 - Rustfmt 1.4.37-stable ### PowerShell Tools @@ -215,7 +216,7 @@ ### Xcode | Version | Build | Path | | -------------- | -------- | ------------------------------ | -| 13.0 (beta) | 13A5192j | /Applications/Xcode_13.0.app | +| 13.0 (beta) | 13A5201i | /Applications/Xcode_13.0.app | | 12.5.1 | 12E507 | /Applications/Xcode_12.5.1.app | | 12.5 (default) | 12E262 | /Applications/Xcode_12.5.app | | 12.4 | 12D4e | /Applications/Xcode_12.4.app | @@ -286,7 +287,7 @@ | Android Emulator | 30.7.5 | | Android SDK Build-tools | 31.0.0
30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3 | | Android SDK Platforms | android-31 (rev 1)
android-30 (rev 3)
android-29 (rev 5)
android-28 (rev 6)
android-27 (rev 3) | -| Android SDK Platform-Tools | 31.0.2 | +| Android SDK Platform-Tools | 31.0.3 | | Android Support Repository | 47.0.0 | | CMake | 3.10.2
3.18.1 | | Google Play services | 49 | From f93413492e47983bafbc29ab84cb697aeeb41f7b Mon Sep 17 00:00:00 2001 From: Maxim Lobanov Date: Tue, 3 Aug 2021 20:17:31 +0300 Subject: [PATCH 0429/3485] [Windows] Move Windows features to toolset (#3838) * move windows features to toolset * Update WindowsFeatures.Tests.ps1 * revert templates --- .../scripts/ImageHelpers/InstallHelpers.ps1 | 1 + .../scripts/Installers/Install-DotnetSDK.ps1 | 18 +++++--- .../scripts/Installers/Install-PostgreSQL.ps1 | 2 +- .../Installers/Install-WindowsFeatures.ps1 | 42 ++++++++++--------- .../scripts/Tests/WindowsFeatures.Tests.ps1 | 36 +++++----------- images/win/toolsets/toolset-2016.json | 8 ++++ images/win/toolsets/toolset-2019.json | 6 +++ 7 files changed, 61 insertions(+), 52 deletions(-) diff --git a/images/win/scripts/ImageHelpers/InstallHelpers.ps1 b/images/win/scripts/ImageHelpers/InstallHelpers.ps1 index 25a7858586b4..14a1648325d2 100644 --- a/images/win/scripts/ImageHelpers/InstallHelpers.ps1 +++ b/images/win/scripts/ImageHelpers/InstallHelpers.ps1 @@ -417,6 +417,7 @@ function Install-AndroidSDKPackages { [Parameter(Mandatory=$true)] [string]$AndroidSDKRootPath, [Parameter(Mandatory=$true)] + [AllowEmptyCollection()] [string[]]$AndroidPackages, [string] $PrefixPackageName ) diff --git a/images/win/scripts/Installers/Install-DotnetSDK.ps1 b/images/win/scripts/Installers/Install-DotnetSDK.ps1 index 27cd6d39c76c..4a9af0f074ac 100644 --- a/images/win/scripts/Installers/Install-DotnetSDK.ps1 +++ b/images/win/scripts/Installers/Install-DotnetSDK.ps1 @@ -29,6 +29,18 @@ function Invoke-Warmup ( } } +function Fix-ImportPublishProfile ( + $SdkVersion +) { + if (Test-IsWin16 -or Test-IsWin19) { + # Fix for issue https://github.com/dotnet/sdk/issues/1276. This will be fixed in 3.1. + $sdkTargetsName = "Microsoft.NET.Sdk.ImportPublishProfile.targets" + $sdkTargetsUrl = "https://raw.githubusercontent.com/dotnet/sdk/82bc30c99f1325dfaa7ad450be96857a4fca2845/src/Tasks/Microsoft.NET.Build.Tasks/targets/${sdkTargetsName}" + $sdkTargetsPath = "C:\Program Files\dotnet\sdk\$sdkVersion\Sdks\Microsoft.NET.Sdk\targets" + Start-DownloadWithRetry -Url $sdkTargetsUrl -DownloadPath $sdkTargetsPath -Name $sdkTargetsName + } +} + function InstallSDKVersion ( $SdkVersion, $Warmup @@ -44,11 +56,7 @@ function InstallSDKVersion ( Write-Host "Sdk version $sdkVersion already installed" } - # Fix for issue 1276. This will be fixed in 3.1. - $sdkTargetsName = "Microsoft.NET.Sdk.ImportPublishProfile.targets" - $sdkTargetsUrl = "https://raw.githubusercontent.com/dotnet/sdk/82bc30c99f1325dfaa7ad450be96857a4fca2845/src/Tasks/Microsoft.NET.Build.Tasks/targets/${sdkTargetsName}" - $sdkTargetsPath = "C:\Program Files\dotnet\sdk\$sdkVersion\Sdks\Microsoft.NET.Sdk\targets" - Start-DownloadWithRetry -Url $sdkTargetsUrl -DownloadPath $sdkTargetsPath -Name $sdkTargetsName + Fix-ImportPublishProfile -SdkVersion $SdkVersion if ($Warmup) { Invoke-Warmup -SdkVersion $SdkVersion diff --git a/images/win/scripts/Installers/Install-PostgreSQL.ps1 b/images/win/scripts/Installers/Install-PostgreSQL.ps1 index 0f88bb7f45d4..8fe78c7fb65c 100644 --- a/images/win/scripts/Installers/Install-PostgreSQL.ps1 +++ b/images/win/scripts/Installers/Install-PostgreSQL.ps1 @@ -7,7 +7,7 @@ Set-SystemVariable -SystemVariable PGUSER -Value $pgUser Set-SystemVariable -SystemVariable PGPASSWORD -Value $pgPwd #Install latest PostgreSQL -Choco-Install -PackageName postgresql -ArgumentList "--params", "'/Password:$pgPwd /NoPath'", "--params-global", "--debug", "--verbose" +Choco-Install -PackageName postgresql -ArgumentList "--params", "'/Password:$pgPwd /NoPath'", "--params-global" #Get Path to pg_ctl.exe $pgPath = (Get-CimInstance Win32_Service -Filter "Name LIKE 'postgresql-%'").PathName diff --git a/images/win/scripts/Installers/Install-WindowsFeatures.ps1 b/images/win/scripts/Installers/Install-WindowsFeatures.ps1 index bfee3730b095..8435eb258ffa 100644 --- a/images/win/scripts/Installers/Install-WindowsFeatures.ps1 +++ b/images/win/scripts/Installers/Install-WindowsFeatures.ps1 @@ -1,24 +1,26 @@ -# Install .NET Framework 3.5 (required by Chocolatey) -# Explicitly install all 4.7 sub features to include ASP.Net. -# As of 1/16/2019, WinServer 19 lists .Net 4.7 as NET-Framework-45-Features -Install-WindowsFeature -Name NET-Framework-Features -IncludeAllSubFeature -Install-WindowsFeature -Name NET-Framework-45-Features -IncludeAllSubFeature +$windowsFeatures = (Get-ToolsetContent).windowsFeatures -if (Test-IsWin16) { - Install-WindowsFeature -Name BITS -IncludeAllSubFeature - Install-WindowsFeature -Name DSC-Service -} +foreach ($feature in $windowsFeatures) { + if ($feature.optionalFeature) { + Write-Host "Activating Windows Optional Feature '$($feature.name)'..." + Enable-WindowsOptionalFeature -Online -FeatureName $feature.name -NoRestart -# Install FS-iSCSITarget-Server -$fsResult = Install-WindowsFeature -Name FS-iSCSITarget-Server -IncludeAllSubFeature -IncludeManagementTools -if ( $fsResult.Success ) { - Write-Host "FS-iSCSITarget-Server has been successfully installed" -} else { - Write-Host "Failed to install FS-iSCSITarget-Server" - exit 1 -} + $resultSuccess = $? + } else { + Write-Host "Activating Windows Feature '$($feature.name)'..." + $Arguments = @{ + Name = $feature.name + IncludeAllSubFeature = [System.Convert]::ToBoolean($feature.includeAllSubFeatures) + IncludeManagementTools = [System.Convert]::ToBoolean($feature.includeManagementTools) + } + $result = Install-WindowsFeature @Arguments -Write-Host "Install Containers feature" -Install-WindowsFeature -Name Containers + $resultSuccess = $result.Success + } -Invoke-PesterTests -TestFile "WindowsFeatures" -TestName "ContainersFeature" \ No newline at end of file + if ($resultSuccess) { + Write-Host "Windows Feature '$($feature.name)' was activated successfully" + } else { + throw "Failed to activate Windows Feature '$($feature.name)'" + } +} \ No newline at end of file diff --git a/images/win/scripts/Tests/WindowsFeatures.Tests.ps1 b/images/win/scripts/Tests/WindowsFeatures.Tests.ps1 index 96e45301875c..d4a811d76223 100644 --- a/images/win/scripts/Tests/WindowsFeatures.Tests.ps1 +++ b/images/win/scripts/Tests/WindowsFeatures.Tests.ps1 @@ -1,33 +1,17 @@ Describe "WindowsFeatures" { - - $testCases = @( - @{ FeatureName = "NET-Framework-Features" } - @{ FeatureName = "NET-Framework-45-Features" } - @{ FeatureName = "FS-iSCSITarget-Server" } - ) - - if (Test-isWin16) { - $testCases += @{ FeatureName = "BITS" } - $testCases += @{ FeatureName = "DSC-Service" } - } - if (Test-isWin19) { - $testCases += @{ FeatureName = "Microsoft-Windows-Subsystem-Linux" } - } - - It "Windows Feature is installed" -TestCases $testCases { - (Get-WindowsFeature -Name $FeatureName).InstallState | Should -Be "Installed" - } - - if (Test-isWin19) { - it "Check WSL is on path" { - (Get-Command -Name 'wsl') | Should -BeTrue + $windowsFeatures = (Get-ToolsetContent).windowsFeatures + $testCases = $windowsFeatures | ForEach-Object { @{ Name = $_.name; OptionalFeature = $_.optionalFeature } } + + It "Windows Feature is installed" -TestCases $testCases { + if ($OptionalFeature) { + (Get-WindowsOptionalFeature -Online -FeatureName $Name).State | Should -Be "Enabled" + } else { + (Get-WindowsFeature -Name $Name).InstallState | Should -Be "Installed" } } -} -Describe "ContainersFeature" { - It "Windows containers feature is installed" { - (Get-WindowsFeature -Name "Containers").InstallState | Should -Be "Installed" + it "Check WSL is on path" -Skip:(-not (Test-IsWin19)) { + (Get-Command -Name 'wsl') | Should -BeTrue } } diff --git a/images/win/toolsets/toolset-2016.json b/images/win/toolsets/toolset-2016.json index f9a4b28f7e54..09a073f7d6d5 100644 --- a/images/win/toolsets/toolset-2016.json +++ b/images/win/toolsets/toolset-2016.json @@ -248,6 +248,14 @@ } ] }, + "windowsFeatures": [ + { "name": "NET-Framework-Features", "includeAllSubFeatures": true }, + { "name": "NET-Framework-45-Features", "includeAllSubFeatures": true }, + { "name": "BITS", "includeAllSubFeatures": true }, + { "name": "DSC-Service" }, + { "name": "FS-iSCSITarget-Server", "includeAllSubFeatures": true, "includeManagementTools": true }, + { "name": "Containers" } + ], "visualStudio": { "version" : "2017", "subversion" : "15", diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index 40e8d6b8a23e..e5416a2693f5 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -248,6 +248,12 @@ } ] }, + "windowsFeatures": [ + { "name": "NET-Framework-Features", "includeAllSubFeatures": true }, + { "name": "NET-Framework-45-Features", "includeAllSubFeatures": true }, + { "name": "FS-iSCSITarget-Server", "includeAllSubFeatures": true, "includeManagementTools": true }, + { "name": "Containers" } + ], "visualStudio": { "version" : "2019", "subversion" : "16", From 924ebc40d19b9457f2d97c6580c4d8c6a028415f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 3 Aug 2021 22:28:29 +0000 Subject: [PATCH 0430/3485] Updating readme file for macOS-10.14 version 20210731.1 (#3848) Co-authored-by: Image generation service account --- images/macos/macos-10.14-Readme.md | 65 +++++++++++++++--------------- 1 file changed, 33 insertions(+), 32 deletions(-) diff --git a/images/macos/macos-10.14-Readme.md b/images/macos/macos-10.14-Readme.md index c2adfc418675..bb3443ad48b1 100644 --- a/images/macos/macos-10.14-Readme.md +++ b/images/macos/macos-10.14-Readme.md @@ -1,12 +1,12 @@ | Announcements | |-| -| [[all OS] MongoDB will be updated to version 5 on July, 26th](https://github.com/actions/virtual-environments/issues/3749) | +| [[macOS, Windows] .NET SDK pre-installation policy will be changed on September, 6](https://github.com/actions/virtual-environments/issues/3809) | | [macOS 11.0 pools will be transited to private preview.](https://github.com/actions/virtual-environments/issues/2486) | *** # macOS 10.14 info -- System Version: macOS 10.14.6 (18G9216) +- System Version: macOS 10.14.6 (18G9323) - Kernel Version: Darwin 18.7.0 -- Image Version: 20210724.1 +- Image Version: 20210731.1 ## Installed Software ### Language and Runtime @@ -22,30 +22,31 @@ - GNU Fortran (Homebrew GCC 11.1.0_1) 11.1.0 - available by `gfortran-11` alias - Go 1.15.14 - julia 1.6.2 +- kotlin 1.5.21-release-314 - MSBuild 15.7.224.30163 (from /Library/Frameworks/Mono.framework/Versions/5.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) - Node.js v8.17.0 - NVM 0.38.0 -- NVM - Cached node versions: v10.24.1 v12.22.3 v14.17.3 +- NVM - Cached node versions: v10.24.1 v12.22.4 v14.17.4 - Perl 5.34.0 -- PHP 8.0.8 +- PHP 8.0.9 - Python 2.7.18 - Python 3.9.6 - R 4.1.0 - Ruby 2.7.4p191 ### Package Management -- Bundler version 2.2.24 +- Bundler version 2.2.25 - Carthage 0.38.0 -- CocoaPods 1.10.1 +- CocoaPods 1.10.2 - Composer 2.1.5 -- Homebrew 3.2.3 +- Homebrew 3.2.5 - Miniconda 4.10.3 - NPM 3.10.10 - NuGet 4.7.0.5148 - Pip 20.3.4 (python 2.7) - Pip 21.1.3 (python 3.9) - Pipx 0.16.3 -- RubyGems 3.2.24 +- RubyGems 3.2.25 - Yarn 1.22.5 #### Environment variables @@ -86,24 +87,24 @@ - Sox 14.4.2 - Subversion (SVN) 1.14.1 - Switchaudio-osx 1.1.0 -- Vagrant 2.2.17 -- virtualbox 6.1.24r145767 +- Vagrant 2.2.18 +- virtualbox 6.1.26r145957 - zstd 1.5.0 ### Tools - Aliyun CLI 3.0.82 - App Center CLI 1.2.2 -- AWS CLI 2.2.22 +- AWS CLI 2.2.25 - AWS SAM CLI 1.27.2 -- AWS Session Manager CLI 1.2.205.0 +- AWS Session Manager CLI 1.2.234.0 - Azure CLI 2.26.1 - Bicep CLI 0.4.451 - Cabal 3.4.0.0 -- Cmake 3.21.0 -- Fastlane 2.188.0 +- Cmake 3.21.1 +- Fastlane 2.189.0 - GHC 9.0.1 -- GHCup v0.1.15.2 +- GHCup v0.1.16.1 - Stack 2.7.3 - SwiftFormat 0.48.11 - Swig 4.0.2 @@ -114,19 +115,19 @@ - yamllint 1.26.1 ### Browsers -- Safari 14.1.1 (14611.2.7.1.6) -- SafariDriver 14.1.1 (14611.2.7.1.6) +- Safari 14.1.2 (14611.3.10.1.5) +- SafariDriver 14.1.2 (14611.3.10.1.5) - Google Chrome 92.0.4515.107 -- ChromeDriver 91.0.4472.101 -- Microsoft Edge 92.0.902.55 -- MSEdgeDriver 92.0.902.55 +- ChromeDriver 92.0.4515.107 +- Microsoft Edge 92.0.902.62 +- MSEdgeDriver 92.0.902.62 - Mozilla Firefox 90.0.2 - geckodriver 0.29.1 #### Environment variables | Name | Value | | --------------- | ---------------------------------------------- | -| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/91.0.4472.101 | +| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/92.0.4515.107 | | EDGEWEBDRIVER | /usr/local/share/edge_driver | | GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | @@ -161,8 +162,8 @@ #### Node.js - 10.24.1 -- 12.22.3 -- 14.17.3 +- 12.22.4 +- 14.17.4 #### Go - 1.13.15 @@ -171,17 +172,17 @@ - 1.16.6 ### Rust Tools -- Cargo 1.53.0 -- Rust 1.53.0 -- Rustdoc 1.53.0 +- Cargo 1.54.0 +- Rust 1.54.0 +- Rustdoc 1.54.0 - Rustup 1.24.3 #### Packages -- Bindgen 0.59.0 -- Cargo-audit 0.15.0 +- Bindgen 0.59.1 +- Cargo-audit 0.14.1 - Cargo-outdated v0.9.17 -- Cbindgen 0.19.0 -- Clippy 0.1.53 +- Cbindgen 0.20.0 +- Clippy 0.1.54 - Rustfmt 1.4.37-stable ### PowerShell Tools @@ -348,7 +349,7 @@ | Android Emulator | 30.7.5 | | Android SDK Build-tools | 31.0.0
30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3
26.0.0 26.0.1 26.0.2 26.0.3
25.0.0 25.0.1 25.0.2 25.0.3
24.0.0 24.0.1 24.0.2 24.0.3
23.0.1 23.0.2 23.0.3
22.0.1
21.1.2
20.0.0
19.1.0 | | Android SDK Platforms | android-31 (rev 1)
android-30 (rev 3)
android-29 (rev 5)
android-28 (rev 6)
android-27 (rev 3)
android-26 (rev 2)
android-25 (rev 3)
android-24 (rev 2)
android-23 (rev 3)
android-22 (rev 2)
android-21 (rev 2)
android-20 (rev 2)
android-19 (rev 4)
android-18 (rev 3)
android-17 (rev 3)
android-16 (rev 5)
android-15 (rev 5) | -| Android SDK Platform-Tools | 31.0.2 | +| Android SDK Platform-Tools | 31.0.3 | | Android Support Repository | 47.0.0 | | CMake | 3.10.2
3.18.1 | | Google APIs | addon-google_apis-google-21
addon-google_apis-google-22
addon-google_apis-google-23
addon-google_apis-google-24 | From 3b5c4ebd39ce3d5812e130938bb066f67d90b54e Mon Sep 17 00:00:00 2001 From: Maxim Lobanov Date: Wed, 4 Aug 2021 09:35:16 +0300 Subject: [PATCH 0431/3485] [Windows] Implement minor improvements, rev 2 (#3839) * implement minor improvements * Update Install-WDK.ps1 * fix nitpick --- .../win/scripts/Installers/Install-Msys2.ps1 | 106 ++++++++++-------- images/win/scripts/Installers/Install-WDK.ps1 | 6 +- images/win/scripts/Installers/Install-Wix.ps1 | 9 +- .../scripts/Installers/Update-DotnetTLS.ps1 | 3 - .../scripts/Installers/Update-ImageData.ps1 | 10 +- .../SoftwareReport.Generator.ps1 | 9 +- .../SoftwareReport.VisualStudio.psm1 | 31 +++-- 7 files changed, 104 insertions(+), 70 deletions(-) diff --git a/images/win/scripts/Installers/Install-Msys2.ps1 b/images/win/scripts/Installers/Install-Msys2.ps1 index a47808c250a1..ff1cc6982d82 100644 --- a/images/win/scripts/Installers/Install-Msys2.ps1 +++ b/images/win/scripts/Installers/Install-Msys2.ps1 @@ -10,19 +10,67 @@ $dash = "-" * 40 $origPath = $env:PATH -$msys2_release = "https://api.github.com/repos/msys2/msys2-installer/releases/latest" -$msys2Uri = ((Invoke-RestMethod $msys2_release).assets | Where-Object { - $_.name -match "^msys2-x86_64" -and $_.name.EndsWith(".exe") }).browser_download_url +function Install-Msys2 { + $msys2_release = "https://api.github.com/repos/msys2/msys2-installer/releases/latest" + $msys2Uri = ((Invoke-RestMethod $msys2_release).assets | Where-Object { + $_.name -match "^msys2-x86_64" -and $_.name.EndsWith(".exe") }).browser_download_url -# Download the latest msys2 x86_64, filename includes release date -Write-Host "Starting msys2 download using $($msys2Uri.split('/')[-1])" -$msys2File = Start-DownloadWithRetry -Url $msys2Uri -Write-Host "Finished download" + # Download the latest msys2 x86_64, filename includes release date + Write-Host "Starting msys2 download using $($msys2Uri.split('/')[-1])" + $msys2File = Start-DownloadWithRetry -Url $msys2Uri + Write-Host "Finished download" -# extract tar.xz to C:\ -Write-Host "Starting msys2 installation" -& $msys2File in --confirm-command --accept-messages --root C:/msys64 -Remove-Item $msys2File + # extract tar.xz to C:\ + Write-Host "Starting msys2 installation" + & $msys2File in --confirm-command --accept-messages --root C:/msys64 + Remove-Item $msys2File +} + +function Install-Msys2Packages($Packages) { + if (-not $Packages) { + return + } + + Write-Host "`n$dash Install msys2 packages" + pacman.exe -S --noconfirm --needed --noprogressbar $Packages + taskkill /f /fi "MODULES eq msys-2.0.dll" + + Write-Host "`n$dash Remove p7zip/7z package due to conflicts" + pacman.exe -R --noconfirm --noprogressbar p7zip +} + +function Install-MingwPackages($Packages) { + if (-not $Packages) { + return + } + + Write-Host "`n$dash Install mingw packages" + $archs = $Packages.arch + + foreach ($arch in $archs) { + Write-Host "Installing $arch packages" + $archPackages = $toolsetContent.mingw | Where-Object { $_.arch -eq $arch } + $runtimePackages = $archPackages.runtime_packages.name | ForEach-Object { "${arch}-$_" } + $additionalPackages = $archPackages.additional_packages | ForEach-Object { "${arch}-$_" } + $packagesToInstall = $runtimePackages + $additionalPackages + Write-Host "The following packages will be installed: $packagesToInstall" + pacman.exe -S --noconfirm --needed --noprogressbar $packagesToInstall + } + + # clean all packages to decrease image size + Write-Host "`n$dash Clean packages" + pacman.exe -Scc --noconfirm + + $pkgs = pacman.exe -Q + + foreach ($arch in $archs) + { + Write-Host "`n$dash Installed $arch packages" + $pkgs | grep ^${arch}- + } +} + +Install-Msys2 # Add msys2 bin tools folders to PATH temporary $env:PATH = "C:\msys64\mingw64\bin;C:\msys64\usr\bin;$origPath" @@ -35,40 +83,10 @@ pacman.exe -Syuu --noconfirm taskkill /f /fi "MODULES eq msys-2.0.dll" $toolsetContent = (Get-ToolsetContent).MsysPackages -Write-Host "`n$dash Install msys2 packages" -$msys2Packages = $toolsetContent.msys2 -pacman.exe -S --noconfirm --needed --noprogressbar $msys2Packages -taskkill /f /fi "MODULES eq msys-2.0.dll" - -Write-Host "`n$dash Remove p7zip/7z package due to conflicts" -pacman.exe -R --noconfirm --noprogressbar p7zip - -# install mingw packages -$archs = $toolsetContent.mingw.arch -foreach ($arch in $archs) -{ - Write-Host "Installing $arch packages" - $archPackages = $toolsetContent.mingw | Where-Object { $_.arch -eq $arch } - $runtimePackages = $archPackages.runtime_packages.name | ForEach-Object { "${arch}-$_" } - $additionalPackages = $archPackages.additional_packages | ForEach-Object { "${arch}-$_" } - $packagesToInstall = $runtimePackages + $additionalPackages - Write-Host "The following packages will be installed: $packagesToInstall" - pacman.exe -S --noconfirm --needed --noprogressbar $packagesToInstall -} - -# clean all packages to decrease image size -Write-Host "`n$dash Clean packages" -pacman.exe -Scc --noconfirm - -$pkgs = pacman.exe -Q - -foreach ($arch in $archs) -{ - Write-Host "`n$dash Installed $arch packages" - $pkgs | grep ^${arch}- -} +Install-Msys2Packages -Packages $toolsetContent.msys2 +Install-MingwPackages -Packages $toolsetContent.mingw $env:PATH = $origPath Write-Host "`nMSYS2 installation completed" -Invoke-PesterTests -TestFile "MSYS2" +Invoke-PesterTests -TestFile "MSYS2" \ No newline at end of file diff --git a/images/win/scripts/Installers/Install-WDK.ps1 b/images/win/scripts/Installers/Install-WDK.ps1 index 82690c8012d3..dea6a468183a 100644 --- a/images/win/scripts/Installers/Install-WDK.ps1 +++ b/images/win/scripts/Installers/Install-WDK.ps1 @@ -11,13 +11,17 @@ if (Test-IsWin19) $FilePath = "C:\Program Files (x86)\Windows Kits\10\Vsix\VS2019\WDK.vsix" $VSver = "2019" } -else +elseif (Test-IsWin16) { $winSdkUrl = "https://go.microsoft.com/fwlink/p/?LinkID=2023014" $wdkUrl = "https://go.microsoft.com/fwlink/?linkid=2026156" $FilePath = "C:\Program Files (x86)\Windows Kits\10\Vsix\WDK.vsix" $VSver = "2017" } +else +{ + throw "Invalid version of Visual Studio is found. Either 2017 or 2019 are required" +} $argumentList = ("/features", "+", "/quiet") diff --git a/images/win/scripts/Installers/Install-Wix.ps1 b/images/win/scripts/Installers/Install-Wix.ps1 index 88ef31b297ff..192c19b42ca4 100644 --- a/images/win/scripts/Installers/Install-Wix.ps1 +++ b/images/win/scripts/Installers/Install-Wix.ps1 @@ -5,18 +5,23 @@ Choco-Install -PackageName wixtoolset -ArgumentList "--force" -if(Test-IsWin19) +if (Test-IsWin19) { $extensionUrl = "https://wixtoolset.gallerycdn.vsassets.io/extensions/wixtoolset/wixtoolsetvisualstudio2019extension/1.0.0.4/1563296438961/Votive2019.vsix" $VSver = "2019" } -else +elseif (Test-IsWin16) { $extensionUrl = "https://robmensching.gallerycdn.vsassets.io/extensions/robmensching/wixtoolsetvisualstudio2017extension/0.9.21.62588/1494013210879/250616/4/Votive2017.vsix" $VSver = "2017" } +else +{ + throw "Invalid version of Visual Studio is found. Either 2017 or 2019 are required" +} $extensionName = "Votive$VSver.vsix" + #Installing VS extension 'Wix Toolset Visual Studio Extension' Install-VsixExtension -Url $extensionUrl -Name $extensionName -VSversion $VSver diff --git a/images/win/scripts/Installers/Update-DotnetTLS.ps1 b/images/win/scripts/Installers/Update-DotnetTLS.ps1 index b854e660929a..a00477d54afe 100644 --- a/images/win/scripts/Installers/Update-DotnetTLS.ps1 +++ b/images/win/scripts/Installers/Update-DotnetTLS.ps1 @@ -14,6 +14,3 @@ $registryPath = "HKLM:\SOFTWARE\Wow6432Node\Microsoft\.NETFramework\v4.0.30319" if(Test-Path $registryPath){ Set-ItemProperty -Path $registryPath -Name $name -Value $value -Type DWORD } - -Invoke-PesterTests -TestFile "Tools" -TestName "DotnetTLS" - diff --git a/images/win/scripts/Installers/Update-ImageData.ps1 b/images/win/scripts/Installers/Update-ImageData.ps1 index 15b03e62d2cc..cc4f4b86d7e2 100644 --- a/images/win/scripts/Installers/Update-ImageData.ps1 +++ b/images/win/scripts/Installers/Update-ImageData.ps1 @@ -7,18 +7,16 @@ $imageVersion = $env:IMAGE_VERSION $imageDataFile = $env:IMAGEDATA_FILE $githubUrl="https://github.com/actions/virtual-environments/blob" -if ($caption -match "2019") -{ +if (Test-IsWin19) { $imageLabel = "windows-2019" $softwareUrl = "${githubUrl}/win19/${imageVersion}/images/win/Windows2019-Readme.md" $releaseUrl="https://github.com/actions/virtual-environments/releases/tag/win19%2F${imageVersion}" -} - -if ($caption -match "2016") -{ +} elseif (Test-IsWin16) { $imageLabel = "windows-2016" $softwareUrl = "${githubUrl}/win16/${imageVersion}/images/win/Windows2016-Readme.md" $releaseUrl="https://github.com/actions/virtual-environments/releases/tag/win16%2F${imageVersion}" +} else { + throw "Invalid platform version is found. Either Windows Server 2016 or 2019 or 2022 are required" } $json = @" diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index 8a2820a3da70..b2f25b908df6 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -273,8 +273,11 @@ $markdown += Build-AndroidEnvironmentTable | New-MDTable $markdown += New-MDNewLine # Docker images section -$markdown += New-MDHeader "Cached Docker images" -Level 3 -$markdown += Get-CachedDockerImagesTableData | New-MDTable -$markdown += New-MDNewLine +$cachedImages = Get-CachedDockerImagesTableData +if ($cachedImages) { + $markdown += New-MDHeader "Cached Docker images" -Level 3 + $markdown += $cachedImages | New-MDTable + $markdown += New-MDNewLine +} $markdown | Out-File -FilePath "C:\InstalledSoftware.md" diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.VisualStudio.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.VisualStudio.psm1 index 3f94b84c497a..d8ecac5d434e 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.VisualStudio.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.VisualStudio.psm1 @@ -37,7 +37,7 @@ function Get-VisualStudioExtensions { # SSDT extensions for VS2017 $vs = (Get-VisualStudioVersion).Name.Split()[-1] - if ($vs -eq "2017") + if (Test-IsWin16) { $analysisPackageVersion = Get-VSExtensionVersion -packageName '04a86fc2-dbd5-4222-848e-911638e487fe' $reportingPackageVersion = Get-VSExtensionVersion -packageName '717ad572-c4b7-435c-c166-c2969777f718' @@ -49,21 +49,30 @@ function Get-VisualStudioExtensions { ) } - # Wix - $wixPackageVersion = Get-WixVersion - $wixExtensionVersion = (Get-VisualStudioPackages | Where-Object {$_.Id -match 'WixToolset.VisualStudioExtension.Dev' -and $_.type -eq 'vsix'}).Version + if (Test-IsWin16 -or Test-IsWin19) { + # Wix + $wixPackageVersion = Get-WixVersion + $wixExtensionVersion = (Get-VisualStudioPackages | Where-Object {$_.Id -match 'WixToolset.VisualStudioExtension.Dev' -and $_.type -eq 'vsix'}).Version + $wixPackages = @( + @{Package = 'WIX Toolset'; Version = $wixPackageVersion} + @{Package = "WIX Toolset Studio $vs Extension"; Version = $wixExtensionVersion} + ) - # WDK - $wdkPackageVersion = Get-VSExtensionVersion -packageName 'Microsoft.Windows.DriverKit' - $wdkExtensionVersion = Get-WDKVersion + # WDK + $wdkPackageVersion = Get-VSExtensionVersion -packageName 'Microsoft.Windows.DriverKit' + $wdkExtensionVersion = Get-WDKVersion + $wdkPackages = @( + @{Package = 'Windows Driver Kit'; Version = $wdkPackageVersion} + @{Package = 'Windows Driver Kit Visual Studio Extension'; Version = $wdkExtensionVersion} + ) + } + $extensions = @( $vsixs $ssdtPackages - @{Package = 'Windows Driver Kit'; Version = $wdkPackageVersion} - @{Package = 'Windows Driver Kit Visual Studio Extension'; Version = $wdkExtensionVersion} - @{Package = 'WIX Toolset'; Version = $wixPackageVersion} - @{Package = "WIX Toolset Studio $vs Extension"; Version = $wixExtensionVersion} + $wixPackages + $wdkPackages ) $extensions | Foreach-Object { From b36d7c39608f136dc167a91b4630d8756658a546 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 4 Aug 2021 06:49:32 +0000 Subject: [PATCH 0432/3485] Updating readme file for macOS-10.15 version 20210801.1 (#3830) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/macos/macos-10.15-Readme.md | 75 +++++++++++++++--------------- 1 file changed, 38 insertions(+), 37 deletions(-) diff --git a/images/macos/macos-10.15-Readme.md b/images/macos/macos-10.15-Readme.md index bfc475bd66f5..e3e6e78c2d7e 100644 --- a/images/macos/macos-10.15-Readme.md +++ b/images/macos/macos-10.15-Readme.md @@ -1,12 +1,12 @@ | Announcements | |-| -| [[all OS] MongoDB will be updated to version 5 on July, 26th](https://github.com/actions/virtual-environments/issues/3749) | +| [[macOS, Windows] .NET SDK pre-installation policy will be changed on September, 6](https://github.com/actions/virtual-environments/issues/3809) | | [macOS 11.0 pools will be transited to private preview.](https://github.com/actions/virtual-environments/issues/2486) | *** # macOS 10.15 info -- System Version: macOS 10.15.7 (19H1217) +- System Version: macOS 10.15.7 (19H1323) - Kernel Version: Darwin 19.6.0 -- Image Version: 20210725.1 +- Image Version: 20210801.1 ## Installed Software ### Language and Runtime @@ -16,37 +16,38 @@ - Clang/LLVM 12.0.1 is available on `'$(brew --prefix llvm)/bin/clang'` - gcc-9 (Homebrew GCC 9.4.0) 9.4.0 - available by `gcc-9` alias - gcc-10 (Homebrew GCC 10.3.0) 10.3.0 - available by `gcc-10` alias -- gcc-11 (Homebrew GCC 11.1.0_1) 11.1.0 - available by `gcc-11` alias +- gcc-11 (Homebrew GCC 11.2.0) 11.2.0 - available by `gcc-11` alias - GNU Fortran (Homebrew GCC 9.4.0) 9.4.0 - available by `gfortran-9` alias - GNU Fortran (Homebrew GCC 10.3.0) 10.3.0 - available by `gfortran-10` alias -- GNU Fortran (Homebrew GCC 11.1.0_1) 11.1.0 - available by `gfortran-11` alias +- GNU Fortran (Homebrew GCC 11.2.0) 11.2.0 - available by `gfortran-11` alias - Go 1.15.14 - julia 1.6.2 +- kotlin 1.5.21-release-314 - MSBuild 16.6.0.15801 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) -- Node.js v14.17.3 +- Node.js v14.17.4 - NVM 0.38.0 -- NVM - Cached node versions: v10.24.1 v12.22.3 v14.17.3 +- NVM - Cached node versions: v10.24.1 v12.22.4 v14.17.4 - Perl 5.34.0 -- PHP 8.0.8 +- PHP 8.0.9 - Python 2.7.18 - Python 3.9.6 - R 4.1.0 - Ruby 2.7.4p191 ### Package Management -- Bundler version 2.2.24 +- Bundler version 2.2.25 - Carthage 0.38.0 -- CocoaPods 1.10.1 +- CocoaPods 1.10.2 - Composer 2.1.5 -- Homebrew 3.2.3 +- Homebrew 3.2.5 - Miniconda 4.10.3 -- NPM 6.14.13 +- NPM 6.14.14 - NuGet 5.6.0.6489 - Pip 20.3.4 (python 2.7) - Pip 21.1.3 (python 3.9) - Pipx 0.16.3 -- RubyGems 3.2.24 -- Vcpkg 2021 (build from master \) +- RubyGems 3.2.25 +- Vcpkg 2021 (build from master \<261c458>) - Yarn 1.22.5 #### Environment variables @@ -88,24 +89,24 @@ - Sox 14.4.2 - Subversion (SVN) 1.14.1 - Switchaudio-osx 1.1.0 -- Vagrant 2.2.17 -- virtualbox 6.1.24r145767 +- Vagrant 2.2.18 +- virtualbox 6.1.26r145957 - zstd 1.5.0 ### Tools - Aliyun CLI 3.0.82 -- App Center CLI 2.9.0 -- AWS CLI 2.2.22 +- App Center CLI 2.10.0 +- AWS CLI 2.2.25 - AWS SAM CLI 1.27.2 -- AWS Session Manager CLI 1.2.205.0 +- AWS Session Manager CLI 1.2.234.0 - Azure CLI 2.26.1 - Bicep CLI 0.4.451 - Cabal 3.4.0.0 -- Cmake 3.21.0 -- Fastlane 2.188.0 +- Cmake 3.21.1 +- Fastlane 2.189.0 - GHC 9.0.1 -- GHCup v0.1.15.2 +- GHCup v0.1.16.1 - Stack 2.7.3 - SwiftFormat 0.48.11 - Swig 4.0.2 @@ -116,19 +117,19 @@ - yamllint 1.26.1 ### Browsers -- Safari 14.1.1 (15611.2.7.1.6) -- SafariDriver 14.1.1 (15611.2.7.1.6) +- Safari 14.1.2 (15611.3.10.1.5) +- SafariDriver 14.1.2 (15611.3.10.1.5) - Google Chrome 92.0.4515.107 -- ChromeDriver 91.0.4472.101 -- Microsoft Edge 92.0.902.55 -- MSEdgeDriver 92.0.902.55 +- ChromeDriver 92.0.4515.107 +- Microsoft Edge 92.0.902.62 +- MSEdgeDriver 92.0.902.62 - Mozilla Firefox 90.0.2 - geckodriver 0.29.1 #### Environment variables | Name | Value | | --------------- | ---------------------------------------------- | -| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/91.0.4472.101 | +| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/92.0.4515.107 | | EDGEWEBDRIVER | /usr/local/share/edge_driver | | GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | @@ -164,8 +165,8 @@ #### Node.js - 10.24.1 -- 12.22.3 -- 14.17.3 +- 12.22.4 +- 14.17.4 #### Go - 1.13.15 @@ -174,17 +175,17 @@ - 1.16.6 ### Rust Tools -- Cargo 1.53.0 -- Rust 1.53.0 -- Rustdoc 1.53.0 +- Cargo 1.54.0 +- Rust 1.54.0 +- Rustdoc 1.54.0 - Rustup 1.24.3 #### Packages - Bindgen 0.59.1 -- Cargo-audit 0.15.0 +- Cargo-audit 0.14.1 - Cargo-outdated v0.9.17 -- Cbindgen 0.19.0 -- Clippy 0.1.53 +- Cbindgen 0.20.0 +- Clippy 0.1.54 - Rustfmt 1.4.37-stable ### PowerShell Tools @@ -348,7 +349,7 @@ | Android Emulator | 30.7.5 | | Android SDK Build-tools | 31.0.0
30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3
26.0.0 26.0.1 26.0.2 26.0.3
25.0.0 25.0.1 25.0.2 25.0.3
24.0.0 24.0.1 24.0.2 24.0.3 | | Android SDK Platforms | android-31 (rev 1)
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 Platform-Tools | 31.0.2 | +| Android SDK Platform-Tools | 31.0.3 | | Android Support Repository | 47.0.0 | | CMake | 3.10.2
3.18.1 | | Google APIs | addon-google_apis-google-21
addon-google_apis-google-22
addon-google_apis-google-23
addon-google_apis-google-24 | From e7ca52b56446be9b2cb1ac63401b35a5dfda1db8 Mon Sep 17 00:00:00 2001 From: Leonid Lapshin Date: Wed, 4 Aug 2021 10:45:59 +0300 Subject: [PATCH 0433/3485] [Ubuntu] Reworked clang installation to use default Ubuntu repo (#3834) --- .../SoftwareReport/SoftwareReport.Common.psm1 | 7 ------- .../SoftwareReport/SoftwareReport.Generator.ps1 | 11 +++-------- images/linux/scripts/installers/clang.sh | 17 ++--------------- 3 files changed, 5 insertions(+), 30 deletions(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 index 324032a5b04e..c6cffc2ab20c 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 @@ -44,13 +44,6 @@ function Get-ClangVersions { return "Clang " + $clangVersions } -function Get-LLVMInfo { - $clangVersions = Get-ClangToolVersions -ToolName "clang" - $clangFormatVersions = Get-ClangToolVersions -ToolName "clang-format" - $aptSourceRepo = Get-AptSourceRepository -PackageName "llvm" - return "LLVM components: Clang $clangFormatVersions, Clang-format $clangFormatVersions (apt source: $aptSourceRepo)" -} - function Get-ClangFormatVersions { $clangFormatVersions = Get-ClangToolVersions -ToolName "clang-format" return "Clang-format " + $clangFormatVersions diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index 8595d0b2a757..ece0b6f9e55d 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -50,16 +50,11 @@ $runtimesList = @( (Get-RubyVersion), (Get-SwiftVersion), (Get-JuliaVersion), - (Get-KotlinVersion) + (Get-KotlinVersion), + (Get-ClangVersions), + (Get-ClangFormatVersions) ) -if (Test-IsUbuntu20) { - $runtimesList += (Get-LLVMInfo) -} else { - $runtimesList += (Get-ClangVersions) - $runtimesList += (Get-ClangFormatVersions) -} - $markdown += New-MDList -Style Unordered -Lines ($runtimesList | Sort-Object) $markdown += New-MDHeader "Package Management" -Level 3 diff --git a/images/linux/scripts/installers/clang.sh b/images/linux/scripts/installers/clang.sh index 3e808066db9b..91f5b962a2ba 100644 --- a/images/linux/scripts/installers/clang.sh +++ b/images/linux/scripts/installers/clang.sh @@ -5,21 +5,13 @@ ################################################################################ # Source the helpers for use with the script -source $HELPER_SCRIPTS/os.sh source $HELPER_SCRIPTS/install.sh function InstallClang { local version=$1 echo "Installing clang-$version..." - if [[ $version =~ 9 ]] && isUbuntu16 || [[ $version =~ 12 ]]; then - ./llvm.sh $version - apt-get install -y "clang-format-$version" - llvm_repo=$(grep '^deb.*apt.llvm.org\/' /etc/apt/sources.list) - echo "llvm $llvm_repo" >> $HELPER_SCRIPTS/apt-sources.txt - else - apt-get install -y "clang-$version" "lldb-$version" "lld-$version" "clang-format-$version" - fi + apt-get install -y "clang-$version" "lldb-$version" "lld-$version" "clang-format-$version" } function SetDefaultClang { @@ -31,10 +23,6 @@ function SetDefaultClang { update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-${version} 100 } -# Download script for automatic installation -download_with_retries https://apt.llvm.org/llvm.sh -chmod +x llvm.sh - versions=$(get_toolset_value '.clang.versions[]') default_clang_version=$(get_toolset_value '.clang.default_version') @@ -43,9 +31,8 @@ for version in ${versions[*]}; do InstallClang $version fi done -InstallClang $default_clang_version +InstallClang $default_clang_version SetDefaultClang $default_clang_version -rm llvm.sh invoke_tests "Tools" "clang" From 04752cb30948d4f6131157e2900022287ebb92a6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 4 Aug 2021 07:49:36 +0000 Subject: [PATCH 0434/3485] Updating readme file for ubuntu18 version 20210803.5 (#3844) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/linux/Ubuntu1804-README.md | 95 +++++++++++++++---------------- 1 file changed, 47 insertions(+), 48 deletions(-) diff --git a/images/linux/Ubuntu1804-README.md b/images/linux/Ubuntu1804-README.md index 84de38124636..4b8c857a6d0c 100644 --- a/images/linux/Ubuntu1804-README.md +++ b/images/linux/Ubuntu1804-README.md @@ -1,18 +1,17 @@ | Announcements | |-| -| [[all OS] MongoDB will be updated to version 5 on July, 26th](https://github.com/actions/virtual-environments/issues/3749) | | [Ubuntu 16.04 environment will be removed on September 20, 2021](https://github.com/actions/virtual-environments/issues/3287) | *** # Ubuntu 18.04.5 LTS - Linux kernel version: 5.4.0-1055-azure -- Image Version: 20210726.1 +- Image Version: 20210803.5 ## Installed Software ### Language and Runtime - Bash 4.4.20(1)-release - Clang 9.0.0 - Clang-format 9.0.0 -- Erlang 24.0.2 (Eshell 12.0.2) +- Erlang 24.0.5 (Eshell 12.0.3) - Erlang rebar3 3.16.1 - GNU C++ 7.5.0, 9.4.0, 10.3.0 - GNU Fortran 7.5.0, 9.4.0, 10.3.0 @@ -20,7 +19,7 @@ - Kotlin 1.5.21-release-314 - Mono 6.12.0.122 (apt source repository: https://download.mono-project.com/repo/ubuntu stable-bionic main) - MSBuild 16.6.0.15201 (from /usr/lib/mono/msbuild/15.0/bin/MSBuild.dll) -- Node 14.17.3 +- Node 14.17.4 - Perl 5.26.1 - Python 2.7.17 - Python3 3.6.9 @@ -30,15 +29,15 @@ ### Package Management - cpan 1.64 - Helm 3.6.3 -- Homebrew 3.2.3 +- Homebrew 3.2.6 - Miniconda 4.10.3 -- Npm 6.14.13 +- Npm 6.14.14 - Pip 9.0.1 - Pip3 9.0.1 - Pipx 0.16.3 - RubyGems 2.7.6 -- Vcpkg (build from master \) -- Yarn 1.22.10 +- Vcpkg (build from master \) +- Yarn 1.22.11 #### Environment variables | Name | Value | @@ -60,8 +59,8 @@ - Bazelisk 1.10.1 - Bicep 0.4.451 - Buildah 1.19.6 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- CMake 3.21.0 -- CodeQL Action Bundle 2.5.7 +- CMake 3.21.1 +- CodeQL Action Bundle 2.5.8 - Docker Compose 1.29.2 - Docker-Buildx 0.6.0 - Docker-Moby Client 20.10.7+azure @@ -71,10 +70,10 @@ - Git-ftp 1.3.1 - Haveged 1.9.1 - Heroku 7.56.1 -- HHVM (HipHop VM) 4.118.2 +- HHVM (HipHop VM) 4.121.0 - jq 1.5 - Kind 0.11.1 -- Kubectl 1.20.1-5-g76a04fc +- Kubectl 1.21.3 - Kustomize 4.2.0 - Leiningen 2.9.6 - MediaInfo 17.12 @@ -86,28 +85,28 @@ - Packer 1.7.4 - PhantomJS 2.1.1 - Podman 3.0.1 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- Pulumi 3.8.0 +- Pulumi 3.9.1 - R 4.1.0 - Skopeo 1.2.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 - SVN 1.9.7 - Terraform 1.0.3 -- yamllint 1.26.1 +- yamllint 1.26.2 - yq 4.11.2 - zstd 1.5.0 (homebrew) ### CLI Tools -- Alibaba Cloud CLI 3.0.82 -- AWS CLI 1.20.6 -- AWS CLI Session manager plugin 1.2.205.0 +- Alibaba Cloud CLI 3.0.83 +- AWS CLI 1.20.12 +- AWS CLI Session manager plugin 1.2.234.0 - AWS SAM CLI 1.27.2 -- Azure CLI (azure-cli) 2.26.1 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) +- Azure CLI (azure-cli) 2.27.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.18.0 - GitHub CLI 1.13.1 -- Google Cloud SDK 349.0.0 (apt source repository: https://packages.cloud.google.com/apt) +- Google Cloud SDK 350.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 5.2.3 -- OpenShift CLI 4.7.19 +- Netlify CLI 5.4.9 +- OpenShift CLI 4.8.3 - ORAS CLI 0.12.0 - Vercel CLI 23.0.1 @@ -121,36 +120,36 @@ ### PHP | Tool | Version | | -------- | --------------------------------- | -| PHP | 7.1.33 7.2.34 7.3.29 7.4.21 8.0.8 | +| PHP | 7.1.33 7.2.34 7.3.29 7.4.22 8.0.9 | | Composer | 2.1.5 | -| PHPUnit | 8.5.18 | +| PHPUnit | 8.5.19 | ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ``` ### Haskell - Cabal 3.4.0.0 - GHC 9.0.1 (apt source repository: ppa:hvr/ghc) -- GHCup 0.1.15.2 +- GHCup 0.1.16.1 - Stack 2.7.3 ### Rust Tools -- Cargo 1.53.0 -- Rust 1.53.0 -- Rustdoc 1.53.0 +- Cargo 1.54.0 +- Rust 1.54.0 +- Rustdoc 1.54.0 - Rustup 1.24.3 #### Packages - Bindgen 0.59.1 -- Cargo audit 0.15.0 -- Cargo clippy 0.1.53 +- Cargo audit 0.14.1 +- Cargo clippy 0.1.54 - Cargo outdated 0.9.17 -- Cbindgen 0.19.0 +- Cbindgen 0.20.0 - Rustfmt 1.4.37 ### Browsers and Drivers -- Google Chrome 92.0.4515.107 -- ChromeDriver 92.0.4515.43 -- Mozilla Firefox 90.0 +- Google Chrome 92.0.4515.131 +- ChromeDriver 92.0.4515.107 +- Mozilla Firefox 90.0.2 - Geckodriver 0.29.1 - Chromium 92.0.4515.0 @@ -169,14 +168,14 @@ - sqlite3 3.22.0 #### MySQL -- MySQL 5.7.34 +- MySQL 5.7.35 - MySQL Server (user:root password:root) ``` MySQL service is disabled by default. Use the following command as a part of your job to start the service: 'sudo systemctl start mysql.service' ``` #### MS SQL Server Client Tools -- sqlcmd 17.7.0001.1 +- sqlcmd 17.8.0001.1 - SqlPackage 15.0.5084.2 ### Cached Tools @@ -187,8 +186,8 @@ #### Node.js - 10.24.1 -- 12.22.3 -- 14.17.3 +- 12.22.4 +- 14.17.4 #### PyPy - 2.7.18 [PyPy 7.3.5] @@ -240,7 +239,7 @@ | Android Command Line Tools | 4.0 | | Android Emulator | 30.7.5 | | Android SDK Build-tools | 31.0.0
30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3
26.0.0 26.0.1 26.0.2 26.0.3
25.0.0 25.0.1 25.0.2 25.0.3
24.0.0 24.0.1 24.0.2 24.0.3
23.0.1 23.0.2 23.0.3 | -| Android SDK Platform-Tools | 31.0.2 | +| Android SDK Platform-Tools | 31.0.3 | | Android SDK Platforms | android-31 (rev 1)
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 SDK Tools | 26.1.1 | | Android Support Repository | 47.0.0 | @@ -262,22 +261,22 @@ ### Cached Docker images | Repository:Tag | Digest | Created | | ---------------------- | ------------------------------------------------------------------------ | ---------- | -| alpine:3.11 | sha256:20117524da64d995fd769f0aa3d7cfe2040518426f4b238f43e8373f4aa56c06 | 2021-04-14 | -| alpine:3.12 | sha256:87703314048c40236c6d674424159ee862e2b96ce1c37c62d877e21ed27a387e | 2021-04-14 | -| alpine:3.13 | sha256:f51ff2d96627690d62fee79e6eecd9fa87429a38142b5df8a3bfbb26061df7fc | 2021-04-14 | +| alpine:3.11 | sha256:6cf3d8abc08cf3792d590152d7a4628ec827621f55b1d3150383f5f39335d6eb | 2021-04-14 | +| alpine:3.12 | sha256:de25c7fc6c4f3a27c7f0c2dff454e4671823a34d88abd533f210848d527e0fbb | 2021-04-14 | +| alpine:3.13 | sha256:1d30d1ba3cb90962067e9b29491fbd56997979d54376f23f01448b5c5cd8b462 | 2021-04-14 | | buildpack-deps:buster | sha256:7021538d13a8de5cd15cf5fd72b95b8710831ed7029ebc3282dffd570cdf3818 | 2021-07-22 | | buildpack-deps:stretch | sha256:d8c71a24bdc64d5dadc7d6ba748e55b01c510d292f94b1afc5fb95ee38dc5f4e | 2021-07-22 | | debian:10 | sha256:cc58a29c333ee594f7624d968123429b26916face46169304f07580644dde6b2 | 2021-07-22 | | debian:9 | sha256:06f9296409de8cfecaff43aaee6d608ed48a95c0cac0da2a418ff526acedf67b | 2021-07-22 | | node:10 | sha256:59531d2835edd5161c8f9512f9e095b1836f7a1fcb0ab73e005ec46047384911 | 2021-04-10 | | node:10-alpine | sha256:dc98dac24efd4254f75976c40bce46944697a110d06ce7fa47e7268470cf2e28 | 2021-04-14 | -| node:12 | sha256:b37688949b774df8a3474e9f2a26be5cdaccc97c28b99e06a8a07ec9f29819bc | 2021-07-22 | -| node:12-alpine | sha256:05328aa871f251b0643b8dcaa01034f126a8343b51ef302de207ad153a6b6232 | 2021-07-07 | -| node:14 | sha256:976c9107158a1c85ab0702aec5b1d56bbb85de493ca50794e545a0271421e028 | 2021-07-22 | -| node:14-alpine | sha256:fb6cb918cc72869bd625940f42a7d8ae035c4e786d08187b94e8b91c6a534dfd | 2021-07-07 | -| ubuntu:16.04 | sha256:1b733ff6c7c7aac32101a35cb2c6399ca8c399a9f6de62a386abe26c65b59b9e | 2021-06-17 | -| ubuntu:18.04 | sha256:3b8692dc4474d4f6043fae285676699361792ce1828e22b1b57367b5c05457e3 | 2021-07-13 | -| ubuntu:20.04 | sha256:b3e2e47d016c08b3396b5ebe06ab0b711c34e7f37b98c9d37abe794b71cea0a2 | 2021-07-13 | +| node:12 | sha256:4095975f2cc22e310e09dd00274a47d18f6a336a6a230e7f6dced8856184ff77 | 2021-07-30 | +| node:12-alpine | sha256:78be4f61c7a0f00cc9da47e3ba2f1bacf9ba85410e8ad2e7de16e1fc4be1b962 | 2021-07-30 | +| node:14 | sha256:cd98882c1093f758d09cf6821dc8f96b241073b38e8ed294ca1f9e484743858f | 2021-07-30 | +| node:14-alpine | sha256:0c80f9449d2690eef49aad35eeb42ed9f9bbe2742cd4e9766a7be3a1aae2a310 | 2021-07-30 | +| ubuntu:16.04 | sha256:6a3ac136b6ca623d6a6fa20a7622f098b2fae1ac05f0114386ef439d8ca89a4a | 2021-07-26 | +| ubuntu:18.04 | sha256:7bd7a9ca99f868bf69c4b6212f64f2af8e243f97ba13abb3e641e03a7ceb59e8 | 2021-07-26 | +| ubuntu:20.04 | sha256:82becede498899ec668628e7cb0ad87b6e1c371cb8a1e597d83a47fac21d6af3 | 2021-07-26 | ### Installed apt packages | Name | Version | From 33004045ddbcfdf9f720afd42ce4c75a9e11b121 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 4 Aug 2021 08:03:41 +0000 Subject: [PATCH 0435/3485] Updating readme file for ubuntu20 version 20210803.0 (#3846) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/linux/Ubuntu2004-README.md | 101 +++++++++++++++--------------- 1 file changed, 50 insertions(+), 51 deletions(-) diff --git a/images/linux/Ubuntu2004-README.md b/images/linux/Ubuntu2004-README.md index 1a61ad3a13a2..bd45192ff9d8 100644 --- a/images/linux/Ubuntu2004-README.md +++ b/images/linux/Ubuntu2004-README.md @@ -1,16 +1,15 @@ | Announcements | |-| -| [[all OS] MongoDB will be updated to version 5 on July, 26th](https://github.com/actions/virtual-environments/issues/3749) | | [Ubuntu 16.04 environment will be removed on September 20, 2021](https://github.com/actions/virtual-environments/issues/3287) | *** # Ubuntu 20.04.2 LTS - Linux kernel version: 5.8.0-1039-azure -- Image Version: 20210726.1 +- Image Version: 20210803.0 ## Installed Software ### Language and Runtime - Bash 5.0.17(1)-release -- Erlang 24.0.2 (Eshell 12.0.2) +- Erlang 24.0.5 (Eshell 12.0.3) - Erlang rebar3 3.16.1 - GNU C++ 9.3.0, 10.3.0 - GNU Fortran 9.3.0, 10.3.0 @@ -19,7 +18,7 @@ - LLVM components: Clang 10.0.0, 11.0.0, 12.0.1, Clang-format 10.0.0, 11.0.0, 12.0.1 (apt source: deb http://apt.llvm.org/focal/ llvm-toolchain-focal-12) - Mono 6.12.0.122 (apt source repository: https://download.mono-project.com/repo/ubuntu stable-focal main) - MSBuild 16.6.0.15201 (from /usr/lib/mono/msbuild/15.0/bin/MSBuild.dll) -- Node 14.17.3 +- Node 14.17.4 - Perl 5.30.0 - Python 3.8.10 - Python3 3.8.10 @@ -29,15 +28,15 @@ ### Package Management - cpan 1.64 - Helm 3.6.3 -- Homebrew 3.2.3 +- Homebrew 3.2.6 - Miniconda 4.10.3 -- Npm 6.14.13 +- Npm 6.14.14 - Pip 20.0.2 - Pip3 20.0.2 - Pipx 0.16.3 - RubyGems 3.1.2 -- Vcpkg (build from master \) -- Yarn 1.22.10 +- Vcpkg (build from master \) +- Yarn 1.22.11 #### Environment variables | Name | Value | @@ -60,22 +59,22 @@ - Bazelisk 1.10.1 - Bicep 0.4.451 - Buildah 1.21.3 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- CMake 3.21.0 -- CodeQL Action Bundle 2.5.7 +- CMake 3.21.1 +- CodeQL Action Bundle 2.5.8 - Docker Compose 1.29.2 - Docker-Buildx 0.6.0 - Docker-Moby Client 20.10.7+azure - Docker-Moby Server 20.10.7+azure -- Fastlane 2.188.0 +- Fastlane 2.190.0 - Git 2.32.0 (apt source repository: ppa:git-core/ppa) - Git LFS 2.13.3 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.6.0 - Haveged 1.9.1 - Heroku 7.56.1 -- HHVM (HipHop VM) 4.118.2 +- HHVM (HipHop VM) 4.121.0 - jq 1.6 - Kind 0.11.1 -- Kubectl 1.20.1-5-g76a04fc +- Kubectl 1.21.3 - Kustomize 4.2.0 - Leiningen 2.9.6 - MediaInfo 19.09 @@ -87,28 +86,28 @@ - Packer 1.7.4 - PhantomJS 2.1.1 - Podman 3.2.3 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- Pulumi 3.8.0 +- Pulumi 3.9.1 - R 4.1.0 - Skopeo 1.3.0 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 - Terraform 1.0.3 -- yamllint 1.26.1 +- yamllint 1.26.2 - yq 4.11.2 - zstd 1.5.0 (homebrew) ### CLI Tools -- Alibaba Cloud CLI 3.0.82 -- AWS CLI 2.2.22 -- AWS CLI Session manager plugin 1.2.205.0 +- Alibaba Cloud CLI 3.0.83 +- AWS CLI 2.2.25 +- AWS CLI Session manager plugin 1.2.234.0 - AWS SAM CLI 1.27.2 -- Azure CLI (azure-cli) 2.26.1 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) +- Azure CLI (azure-cli) 2.27.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.18.0 - GitHub CLI 1.13.1 -- Google Cloud SDK 349.0.0 (apt source repository: https://packages.cloud.google.com/apt) +- Google Cloud SDK 350.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 5.2.3 -- OpenShift CLI 4.7.19 +- Netlify CLI 5.4.11 +- OpenShift CLI 4.8.3 - ORAS CLI 0.12.0 - Vercel CLI 23.0.1 @@ -126,36 +125,36 @@ ### PHP | Tool | Version | | -------- | ------------ | -| PHP | 7.4.21 8.0.8 | +| PHP | 7.4.22 8.0.9 | | Composer | 2.1.5 | -| PHPUnit | 8.5.18 | +| PHPUnit | 8.5.19 | ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ``` ### Haskell - Cabal 3.4.0.0 - GHC 9.0.1 (apt source repository: ppa:hvr/ghc) -- GHCup 0.1.15.2 +- GHCup 0.1.16.1 - Stack 2.7.3 ### Rust Tools -- Cargo 1.53.0 -- Rust 1.53.0 -- Rustdoc 1.53.0 +- Cargo 1.54.0 +- Rust 1.54.0 +- Rustdoc 1.54.0 - Rustup 1.24.3 #### Packages - Bindgen 0.59.1 -- Cargo audit 0.15.0 -- Cargo clippy 0.1.53 +- Cargo audit 0.14.1 +- Cargo clippy 0.1.54 - Cargo outdated 0.9.17 -- Cbindgen 0.19.0 +- Cbindgen 0.20.0 - Rustfmt 1.4.37 ### Browsers and Drivers -- Google Chrome 92.0.4515.107 -- ChromeDriver 92.0.4515.43 -- Mozilla Firefox 90.0 +- Google Chrome 92.0.4515.131 +- ChromeDriver 92.0.4515.107 +- Mozilla Firefox 90.0.2 - Geckodriver 0.29.1 - Chromium 92.0.4515.0 @@ -174,14 +173,14 @@ - sqlite3 3.31.1 #### MySQL -- MySQL 8.0.25 +- MySQL 8.0.26 - MySQL Server (user:root password:root) ``` MySQL service is disabled by default. Use the following command as a part of your job to start the service: 'sudo systemctl start mysql.service' ``` #### MS SQL Server Client Tools -- sqlcmd 17.7.0001.1 +- sqlcmd 17.8.0001.1 - SqlPackage 15.0.5084.2 ### Cached Tools @@ -192,8 +191,8 @@ #### Node.js - 10.24.1 -- 12.22.3 -- 14.17.3 +- 12.22.4 +- 14.17.4 #### PyPy - 2.7.18 [PyPy 7.3.5] @@ -247,7 +246,7 @@ | Android Command Line Tools | 4.0 | | Android Emulator | 30.7.5 | | Android SDK Build-tools | 31.0.0
30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3 | -| Android SDK Platform-Tools | 31.0.2 | +| Android SDK Platform-Tools | 31.0.3 | | Android SDK Platforms | android-31 (rev 1)
android-30 (rev 3)
android-29 (rev 5)
android-28 (rev 6)
android-27 (rev 3) | | Android SDK Tools | 26.1.1 | | Android Support Repository | 47.0.0 | @@ -269,22 +268,22 @@ ### Cached Docker images | Repository:Tag | Digest | Created | | ---------------------- | ------------------------------------------------------------------------ | ---------- | -| alpine:3.11 | sha256:20117524da64d995fd769f0aa3d7cfe2040518426f4b238f43e8373f4aa56c06 | 2021-04-14 | -| alpine:3.12 | sha256:87703314048c40236c6d674424159ee862e2b96ce1c37c62d877e21ed27a387e | 2021-04-14 | -| alpine:3.13 | sha256:f51ff2d96627690d62fee79e6eecd9fa87429a38142b5df8a3bfbb26061df7fc | 2021-04-14 | +| alpine:3.11 | sha256:6cf3d8abc08cf3792d590152d7a4628ec827621f55b1d3150383f5f39335d6eb | 2021-04-14 | +| alpine:3.12 | sha256:de25c7fc6c4f3a27c7f0c2dff454e4671823a34d88abd533f210848d527e0fbb | 2021-04-14 | +| alpine:3.13 | sha256:1d30d1ba3cb90962067e9b29491fbd56997979d54376f23f01448b5c5cd8b462 | 2021-04-14 | | buildpack-deps:buster | sha256:7021538d13a8de5cd15cf5fd72b95b8710831ed7029ebc3282dffd570cdf3818 | 2021-07-22 | | buildpack-deps:stretch | sha256:d8c71a24bdc64d5dadc7d6ba748e55b01c510d292f94b1afc5fb95ee38dc5f4e | 2021-07-22 | | debian:10 | sha256:cc58a29c333ee594f7624d968123429b26916face46169304f07580644dde6b2 | 2021-07-22 | | debian:9 | sha256:06f9296409de8cfecaff43aaee6d608ed48a95c0cac0da2a418ff526acedf67b | 2021-07-22 | | node:10 | sha256:59531d2835edd5161c8f9512f9e095b1836f7a1fcb0ab73e005ec46047384911 | 2021-04-10 | | node:10-alpine | sha256:dc98dac24efd4254f75976c40bce46944697a110d06ce7fa47e7268470cf2e28 | 2021-04-14 | -| node:12 | sha256:b37688949b774df8a3474e9f2a26be5cdaccc97c28b99e06a8a07ec9f29819bc | 2021-07-22 | -| node:12-alpine | sha256:05328aa871f251b0643b8dcaa01034f126a8343b51ef302de207ad153a6b6232 | 2021-07-07 | -| node:14 | sha256:976c9107158a1c85ab0702aec5b1d56bbb85de493ca50794e545a0271421e028 | 2021-07-22 | -| node:14-alpine | sha256:fb6cb918cc72869bd625940f42a7d8ae035c4e786d08187b94e8b91c6a534dfd | 2021-07-07 | -| ubuntu:16.04 | sha256:1b733ff6c7c7aac32101a35cb2c6399ca8c399a9f6de62a386abe26c65b59b9e | 2021-06-17 | -| ubuntu:18.04 | sha256:3b8692dc4474d4f6043fae285676699361792ce1828e22b1b57367b5c05457e3 | 2021-07-13 | -| ubuntu:20.04 | sha256:b3e2e47d016c08b3396b5ebe06ab0b711c34e7f37b98c9d37abe794b71cea0a2 | 2021-07-13 | +| node:12 | sha256:4095975f2cc22e310e09dd00274a47d18f6a336a6a230e7f6dced8856184ff77 | 2021-07-30 | +| node:12-alpine | sha256:78be4f61c7a0f00cc9da47e3ba2f1bacf9ba85410e8ad2e7de16e1fc4be1b962 | 2021-07-30 | +| node:14 | sha256:cd98882c1093f758d09cf6821dc8f96b241073b38e8ed294ca1f9e484743858f | 2021-07-30 | +| node:14-alpine | sha256:0c80f9449d2690eef49aad35eeb42ed9f9bbe2742cd4e9766a7be3a1aae2a310 | 2021-07-30 | +| ubuntu:16.04 | sha256:6a3ac136b6ca623d6a6fa20a7622f098b2fae1ac05f0114386ef439d8ca89a4a | 2021-07-26 | +| ubuntu:18.04 | sha256:7bd7a9ca99f868bf69c4b6212f64f2af8e243f97ba13abb3e641e03a7ceb59e8 | 2021-07-26 | +| ubuntu:20.04 | sha256:82becede498899ec668628e7cb0ad87b6e1c371cb8a1e597d83a47fac21d6af3 | 2021-07-26 | ### Installed apt packages | Name | Version | @@ -315,7 +314,7 @@ | libc++-dev | 1:10.0-50~exp1 | | libc++abi-dev | 1:10.0-50~exp1 | | libcurl4 | 7.68.0-1ubuntu2.6 | -| libgbm-dev | 20.2.6-0ubuntu0.20.04.1 | +| libgbm-dev | 21.0.3-0ubuntu0.2~20.04.1 | | libgconf-2-4 | 3.2.6-6ubuntu1 | | libgsl-dev | 2.5+dfsg-6build1 | | libgtk-3-0 | 3.24.20-0ubuntu1 | @@ -360,7 +359,7 @@ | upx | 3.95-2build1 | | wget | 1.20.3-1ubuntu1 | | xorriso | 1.5.2-1 | -| xvfb | 2:1.20.9-2ubuntu1.2~20.04.2 | +| xvfb | 2:1.20.11-1ubuntu1~20.04.2 | | xz-utils | 5.2.4-1ubuntu1 | | zip | 3.0-11build1 | | zsync | 0.6.2-3ubuntu1 | From 5ece2926131cd3461af84a1805219c4bb67c4610 Mon Sep 17 00:00:00 2001 From: mikhailshaganov <81769678+mikhailshaganov@users.noreply.github.com> Date: Wed, 4 Aug 2021 12:19:55 +0300 Subject: [PATCH 0436/3485] [windows] Add Kotlin (#3784) --- .../win/scripts/SoftwareReport/SoftwareReport.Common.psm1 | 5 +++++ .../scripts/SoftwareReport/SoftwareReport.Generator.ps1 | 3 ++- images/win/scripts/Tests/ChocoPackages.Tests.ps1 | 8 ++++++++ images/win/toolsets/toolset-2016.json | 1 + images/win/toolsets/toolset-2019.json | 1 + 5 files changed, 17 insertions(+), 1 deletion(-) diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 index 7b612a26ba00..1ff73ab0fb92 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 @@ -78,6 +78,11 @@ function Get-GoVersion { return "Go $goVersion" } +function Get-KotlinVersion { + $kotlinVersion = $((cmd /c "kotlinc -version 2>&1") | Out-String).split(" ")[2] + return "Kotlin $kotlinVersion" +} + function Get-PHPVersion { ($(php --version) | Out-String) -match "PHP (?\d+\.\d+\.\d+)" | Out-Null $phpVersion = $Matches.Version diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index b2f25b908df6..ab2cde8e4de9 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -39,7 +39,8 @@ $markdown += New-MDList -Style Unordered -Lines (@( (Get-PerlVersion), (Get-PHPVersion), (Get-PythonVersion), - (Get-RubyVersion) + (Get-RubyVersion), + (Get-KotlinVersion) ) | Sort-Object ) diff --git a/images/win/scripts/Tests/ChocoPackages.Tests.ps1 b/images/win/scripts/Tests/ChocoPackages.Tests.ps1 index ce90ac79eb5e..965f114f8b58 100644 --- a/images/win/scripts/Tests/ChocoPackages.Tests.ps1 +++ b/images/win/scripts/Tests/ChocoPackages.Tests.ps1 @@ -96,4 +96,12 @@ Describe "CMake" { It "cmake" { "cmake --version" | Should -ReturnZeroExitCode } +} + +Describe "Kotlin" { + $kotlinPackages = @("kotlinc", "kotlinc-js", "kotlinc-jvm") + + It " is available" -TestCases ($kotlinPackages | ForEach-Object { @{ toolName = $_ } }) { + "$toolName -version" | Should -ReturnZeroExitCode + } } \ No newline at end of file diff --git a/images/win/toolsets/toolset-2016.json b/images/win/toolsets/toolset-2016.json index 09a073f7d6d5..ceb7e974e6cc 100644 --- a/images/win/toolsets/toolset-2016.json +++ b/images/win/toolsets/toolset-2016.json @@ -387,6 +387,7 @@ { "name": "tortoisesvn" }, { "name": "swig" }, { "name": "vswhere" }, + { "name": "kotlinc" }, { "name": "julia", "args": [ "--ia", "/DIR=C:\\Julia" ] diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index e5416a2693f5..81439fb6e642 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -413,6 +413,7 @@ { "name": "tortoisesvn" }, { "name": "swig" }, { "name": "vswhere" }, + { "name": "kotlinc" }, { "name": "julia", "args": [ "--ia", "/DIR=C:\\Julia" ] From aebdf07fa912fd8b469d17fe4fc9be9817297470 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 4 Aug 2021 09:27:58 +0000 Subject: [PATCH 0437/3485] Updating readme file for win16 version 20210802.1 (#3835) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/win/Windows2016-Readme.md | 60 ++++++++++++++++---------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/images/win/Windows2016-Readme.md b/images/win/Windows2016-Readme.md index 227dae51b9d7..c0ac1a8edbab 100644 --- a/images/win/Windows2016-Readme.md +++ b/images/win/Windows2016-Readme.md @@ -1,34 +1,34 @@ | Announcements | |-| -| [[all OS] MongoDB will be updated to version 5 on July, 26th](https://github.com/actions/virtual-environments/issues/3749) | +| [[macOS, Windows] .NET SDK pre-installation policy will be changed on September, 6](https://github.com/actions/virtual-environments/issues/3809) | *** # Microsoft Windows Server 2016 Datacenter - OS Version: 10.0.14393 Build 4530 -- Image Version: 20210725.1 +- Image Version: 20210802.1 ## Installed Software ### Language and Runtime - Bash 4.4.23(1)-release - Go 1.15.14 - Julia 1.6.2 -- Node 14.17.3 +- Node 14.17.4 - Perl 5.32.1 -- PHP 8.0.8 +- PHP 8.0.9 - Python 3.7.9 - Ruby 2.5.9p229 ### Package Management - Chocolatey 0.10.15 - Composer 2.1.5 -- Helm 3.6.2 +- Helm 3.6.3 - Miniconda 4.10.3 (pre-installed on the image but not added to PATH) -- NPM 6.14.13 +- NPM 6.14.14 - NuGet 5.10.0.7240 -- pip 21.2.1 (python 3.7) +- pip 21.2.2 (python 3.7) - Pipx 0.16.3 - RubyGems 2.7.6.3 -- Vcpkg (build from master \<7d2541c>) -- Yarn 1.22.10 +- Vcpkg (build from master \<261c458>) +- Yarn 1.22.11 #### Environment variables | Name | Value | @@ -49,14 +49,14 @@ - Bazelisk 1.10.1 - Bicep 0.4.451 - Cabal 3.4.0.0 -- CMake 3.21.0 -- CodeQL Action Bundle 2.5.7 +- CMake 3.21.1 +- CodeQL Action Bundle 2.5.8 - Docker 20.10.6 -- Docker-compose 1.29.1 +- Docker-compose 1.29.2 - ghc 9.0.1 - Git 2.32.0 - Git LFS 2.13.3 -- Google Cloud SDK 349.0.0 +- Google Cloud SDK 350.0.0 - GVFS 1.0.21085.9 - InnoSetup 6.2.0 - jq 1.6 @@ -67,8 +67,8 @@ - Newman 5.2.4 - NSIS v3.06.1 - OpenSSL 1.1.1 -- Packer 1.7.3 -- Pulumi v3.8.0 +- Packer 1.7.4 +- Pulumi v3.9.1 - R 4.1.0 - Stack 2.7.3 - Subversion (SVN) 1.14.1 @@ -80,9 +80,9 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.82 -- AWS CLI 2.2.22 +- AWS CLI 2.2.25 - AWS SAM CLI 1.27.2 -- AWS Session Manager CLI 1.2.205.0 +- AWS Session Manager CLI 1.2.234.0 - Azure CLI 2.26.1 - Azure DevOps CLI extension 0.18.0 - Cloud Foundry CLI 6.53.0 @@ -90,24 +90,24 @@ - Hub CLI 2.14.2 ### Rust Tools -- Cargo 1.53.0 -- Rust 1.53.0 -- Rustdoc 1.53.0 +- Cargo 1.54.0 +- Rust 1.54.0 +- Rustdoc 1.54.0 - Rustup 1.24.3 #### Packages -- bindgen 0.59.0 -- cargo-audit 0.15.0 +- bindgen 0.59.1 +- cargo-audit 0.14.1 - cargo-outdated v0.9.17 -- cbindgen 0.19.0 -- Clippy 0.1.53 +- cbindgen 0.20.0 +- Clippy 0.1.54 - Rustfmt 1.4.37 ### Browsers and webdrivers - Google Chrome 92.0.4515.107 -- Chrome Driver 92.0.4515.43 -- Microsoft Edge 92.0.902.55 -- Microsoft Edge Driver 92.0.902.55 +- Chrome Driver 92.0.4515.107 +- Microsoft Edge 92.0.902.62 +- Microsoft Edge Driver 92.0.902.62 - Mozilla Firefox 90.0.2 - Gecko Driver 0.29.1 - IE Driver 3.150.1.0 @@ -154,8 +154,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Version | Architecture | | ------- | ------------ | | 10.24.1 | x64 | -| 12.22.3 | x64 | -| 14.17.3 | x64 | +| 12.22.4 | x64 | +| 14.17.4 | x64 | #### Python @@ -546,7 +546,7 @@ All other versions are saved but not installed. | Android Command Line Tools | 4.0 | | Android SDK Build-tools | 31.0.0
30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3
26.0.0 26.0.1 26.0.2 26.0.3
25.0.0 25.0.1 25.0.2 25.0.3
24.0.0 24.0.1 24.0.2 24.0.3
23.0.1 23.0.2 23.0.3
22.0.1
21.1.2
20.0.0
19.1.0 | | Android SDK Platforms | android-31 (rev 1)
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 Platform-Tools | 31.0.2 | +| Android SDK Platform-Tools | 31.0.3 | | Android SDK Tools | 25.2.5 | | Android Support Repository | 47.0.0 | | CMake | 3.10.2
3.18.1 | From c4bf59ecdafb97dfddcbf51ccc86fb62e2344b3b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 4 Aug 2021 13:26:57 +0000 Subject: [PATCH 0438/3485] Updating readme file for win19 version 20210803.1 (#3845) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/win/Windows2019-Readme.md | 66 ++++++++++++++++---------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index a880d196dd67..be23aa31e874 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -1,10 +1,10 @@ | Announcements | |-| -| [[all OS] MongoDB will be updated to version 5 on July, 26th](https://github.com/actions/virtual-environments/issues/3749) | +| [[macOS, Windows] .NET SDK pre-installation policy will be changed on September, 6](https://github.com/actions/virtual-environments/issues/3809) | *** # Microsoft Windows Server 2019 Datacenter - OS Version: 10.0.17763 Build 2061 -- Image Version: 20210725.1 +- Image Version: 20210803.1 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -14,24 +14,24 @@ - Bash 4.4.23(1)-release - Go 1.15.14 - Julia 1.6.2 -- Node 14.17.3 +- Node 14.17.4 - Perl 5.32.1 -- PHP 8.0.8 +- PHP 8.0.9 - Python 3.7.9 - Ruby 2.5.9p229 ### Package Management - Chocolatey 0.10.15 - Composer 2.1.5 -- Helm 3.6.2 +- Helm 3.6.3 - Miniconda 4.10.3 (pre-installed on the image but not added to PATH) -- NPM 6.14.13 +- NPM 6.14.14 - NuGet 5.10.0.7240 -- pip 21.2.1 (python 3.7) +- pip 21.2.2 (python 3.7) - Pipx 0.16.3 - RubyGems 2.7.6.3 -- Vcpkg (build from master \<7d2541c>) -- Yarn 1.22.10 +- Vcpkg (build from master \) +- Yarn 1.22.11 #### Environment variables | Name | Value | @@ -52,14 +52,14 @@ - Bazelisk 1.10.1 - Bicep 0.4.451 - Cabal 3.4.0.0 -- CMake 3.21.0 -- CodeQL Action Bundle 2.5.7 +- CMake 3.21.1 +- CodeQL Action Bundle 2.5.8 - Docker 20.10.6 -- Docker-compose 1.29.1 +- Docker-compose 1.29.2 - ghc 9.0.1 - Git 2.32.0 - Git LFS 2.13.3 -- Google Cloud SDK 349.0.0 +- Google Cloud SDK 350.0.0 - GVFS 1.0.21085.9 - InnoSetup 6.2.0 - jq 1.6 @@ -70,8 +70,8 @@ - Newman 5.2.4 - NSIS v3.06.1 - OpenSSL 1.1.1 -- Packer 1.7.3 -- Pulumi v3.8.0 +- Packer 1.7.4 +- Pulumi v3.9.1 - R 4.1.0 - Stack 2.7.3 - Subversion (SVN) 1.14.1 @@ -82,35 +82,35 @@ - zstd 1.5.0 ### CLI Tools -- Alibaba Cloud CLI 3.0.82 -- AWS CLI 2.2.22 +- Alibaba Cloud CLI 3.0.83 +- AWS CLI 2.2.25 - AWS SAM CLI 1.27.2 -- AWS Session Manager CLI 1.2.205.0 -- Azure CLI 2.26.1 +- AWS Session Manager CLI 1.2.234.0 +- Azure CLI 2.27.0 - Azure DevOps CLI extension 0.18.0 - Cloud Foundry CLI 6.53.0 - GitHub CLI 1.13.1 - Hub CLI 2.14.2 ### Rust Tools -- Cargo 1.53.0 -- Rust 1.53.0 -- Rustdoc 1.53.0 +- Cargo 1.54.0 +- Rust 1.54.0 +- Rustdoc 1.54.0 - Rustup 1.24.3 #### Packages -- bindgen 0.59.0 -- cargo-audit 0.15.0 +- bindgen 0.59.1 +- cargo-audit 0.14.1 - cargo-outdated v0.9.17 -- cbindgen 0.19.0 -- Clippy 0.1.53 +- cbindgen 0.20.0 +- Clippy 0.1.54 - Rustfmt 1.4.37 ### Browsers and webdrivers -- Google Chrome 92.0.4515.107 -- Chrome Driver 92.0.4515.43 -- Microsoft Edge 92.0.902.55 -- Microsoft Edge Driver 92.0.902.55 +- Google Chrome 92.0.4515.131 +- Chrome Driver 92.0.4515.107 +- Microsoft Edge 92.0.902.62 +- Microsoft Edge Driver 92.0.902.62 - Mozilla Firefox 90.0.2 - Gecko Driver 0.29.1 - IE Driver 3.150.1.0 @@ -160,8 +160,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Version | Architecture | | ------- | ------------ | | 10.24.1 | x64 | -| 12.22.3 | x64 | -| 14.17.3 | x64 | +| 12.22.4 | x64 | +| 14.17.4 | x64 | #### Python @@ -537,7 +537,7 @@ All other versions are saved but not installed. | Android Command Line Tools | 4.0 | | Android SDK Build-tools | 31.0.0
30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3
26.0.0 26.0.1 26.0.2 26.0.3
25.0.0 25.0.1 25.0.2 25.0.3
24.0.0 24.0.1 24.0.2 24.0.3
23.0.1 23.0.2 23.0.3
22.0.1
21.1.2
20.0.0
19.1.0 | | Android SDK Platforms | android-31 (rev 1)
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 Platform-Tools | 31.0.2 | +| Android SDK Platform-Tools | 31.0.3 | | Android SDK Tools | 26.1.1 | | Android Support Repository | 47.0.0 | | CMake | 3.10.2
3.18.1 | From b5a7a67456b5fcbbc4d551b14aa910f2881224f3 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Wed, 4 Aug 2021 18:42:06 +0300 Subject: [PATCH 0439/3485] Add update login keychain parameter (#3853) --- .../macos/provision/bootstrap-provisioner/change_password | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/images/macos/provision/bootstrap-provisioner/change_password b/images/macos/provision/bootstrap-provisioner/change_password index d3516ff20ebd..3235834cc0ea 100755 --- a/images/macos/provision/bootstrap-provisioner/change_password +++ b/images/macos/provision/bootstrap-provisioner/change_password @@ -2,6 +2,7 @@ USERNAME="$1" OLD_PASSWD="$2" NEW_PASSWD="$3" +UPDATE_LOGIN_KEYCHAIN="${4:-true}" export PATH=/usr/bin:/usr/sbin:/usr/local/bin:/bin:/sbin @@ -15,4 +16,7 @@ fi sudo /usr/bin/python /Users/$USERNAME/bootstrap/kcpassword.py "$NEW_PASSWD" sudo /usr/bin/defaults write /Library/Preferences/com.apple.loginwindow autoLoginUser "$USERNAME" -/usr/bin/security set-keychain-password -o "$OLD_PASSWD" -p "$NEW_PASSWD" /Users/$USERNAME/Library/Keychains/login.keychain \ No newline at end of file + +if [[ $UPDATE_LOGIN_KEYCHAIN == "true" ]]; then + /usr/bin/security set-keychain-password -o "$OLD_PASSWD" -p "$NEW_PASSWD" /Users/$USERNAME/Library/Keychains/login.keychain +fi From 8481b2c846bd93b5665352e665107f08cc209722 Mon Sep 17 00:00:00 2001 From: Maxim Lobanov Date: Wed, 4 Aug 2021 22:35:44 +0300 Subject: [PATCH 0440/3485] [Windows] Improve Visual Studio installation scripts to support Preview versions (#3850) * Support Preview versions of Visual Studio * resolve comments * Fix test * fix tests --- images/win/post-generation/VSConfiguration.ps1 | 2 +- images/win/scripts/ImageHelpers/ImageHelpers.psm1 | 3 +-- .../scripts/ImageHelpers/VisualStudioHelpers.ps1 | 12 +++++------- images/win/scripts/Installers/Install-VS.ps1 | 5 +++-- .../scripts/Installers/Install-WinAppDriver.ps1 | 2 +- .../SoftwareReport.VisualStudio.psm1 | 15 +++++++++------ images/win/scripts/Tests/VisualStudio.Tests.ps1 | 2 +- images/win/scripts/Tests/Vsix.Tests.ps1 | 2 +- images/win/scripts/Tests/WinAppDriver.Tests.ps1 | 2 ++ images/win/toolsets/toolset-2016.json | 1 + images/win/toolsets/toolset-2019.json | 1 + images/win/windows2016.json | 8 ++++---- images/win/windows2019.json | 8 ++++---- 13 files changed, 34 insertions(+), 29 deletions(-) diff --git a/images/win/post-generation/VSConfiguration.ps1 b/images/win/post-generation/VSConfiguration.ps1 index 0ff9d7bfbc01..47754b4e5a71 100644 --- a/images/win/post-generation/VSConfiguration.ps1 +++ b/images/win/post-generation/VSConfiguration.ps1 @@ -1,4 +1,4 @@ -$vsInstallRoot = Get-VisualStudioPath +$vsInstallRoot = (Get-VisualStudioInstance).InstallationPath $devEnvPath = "$vsInstallRoot\Common7\IDE\devenv.exe" cmd.exe /c "`"$devEnvPath`" /updateconfiguration" \ No newline at end of file diff --git a/images/win/scripts/ImageHelpers/ImageHelpers.psm1 b/images/win/scripts/ImageHelpers/ImageHelpers.psm1 index e95c10beeb97..9e5f9424be93 100644 --- a/images/win/scripts/ImageHelpers/ImageHelpers.psm1 +++ b/images/win/scripts/ImageHelpers/ImageHelpers.psm1 @@ -34,11 +34,10 @@ Export-ModuleMember -Function @( 'Get-EnvironmentVariable' 'Invoke-PesterTests' 'Get-VsCatalogJsonPath' - 'Get-VisualStudioPath' 'Install-AndroidSDKPackages' 'Get-AndroidPackages' 'Get-AndroidPackagesByName' 'Get-AndroidPackagesByVersion' - 'Get-VisualStudioPackages' + 'Get-VisualStudioInstance' 'Get-VisualStudioComponents' ) diff --git a/images/win/scripts/ImageHelpers/VisualStudioHelpers.ps1 b/images/win/scripts/ImageHelpers/VisualStudioHelpers.ps1 index d5a5d59dc340..a02311f78df7 100644 --- a/images/win/scripts/ImageHelpers/VisualStudioHelpers.ps1 +++ b/images/win/scripts/ImageHelpers/VisualStudioHelpers.ps1 @@ -72,16 +72,14 @@ function Get-VsCatalogJsonPath { return Join-Path $instanceFolder.FullName "catalog.json" } -function Get-VisualStudioPath { - return (Get-VSSetupInstance | Select-VSSetupInstance -Product *).InstallationPath -} - -function Get-VisualStudioPackages { - return (Get-VSSetupInstance | Select-VSSetupInstance -Product *).Packages +function Get-VisualStudioInstance { + # Use -Prerelease and -All flags to make sure that Preview versions of VS are found correctly + $vsInstance = Get-VSSetupInstance -Prerelease -All | Where-Object { $_.DisplayName -match "Visual Studio" } | Select-Object -First 1 + $vsInstance | Select-VSSetupInstance -Product * } function Get-VisualStudioComponents { - Get-VisualStudioPackages | Where-Object type -in 'Component', 'Workload' | + (Get-VisualStudioInstance).Packages | Where-Object type -in 'Component', 'Workload' | Sort-Object Id, Version | Select-Object @{n = 'Package'; e = {$_.Id}}, Version | Where-Object { $_.Package -notmatch "[0-9a-fA-F]{8}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{12}" } } \ No newline at end of file diff --git a/images/win/scripts/Installers/Install-VS.ps1 b/images/win/scripts/Installers/Install-VS.ps1 index 4c1ce9528fb7..cd55698a618e 100644 --- a/images/win/scripts/Installers/Install-VS.ps1 +++ b/images/win/scripts/Installers/Install-VS.ps1 @@ -14,7 +14,8 @@ $workLoadsArgument = [String]::Join(" ", $workLoads) $releaseInPath = $toolset.visualStudio.edition $subVersion = $toolset.visualStudio.subversion -$bootstrapperUrl = "https://aka.ms/vs/${subVersion}/release/vs_${releaseInPath}.exe" +$channel = $toolset.visualStudio.channel +$bootstrapperUrl = "https://aka.ms/vs/${subVersion}/${channel}/vs_${releaseInPath}.exe" # Install VS Install-VisualStudio -BootstrapperUrl $bootstrapperUrl -WorkLoads $workLoadsArgument @@ -30,7 +31,7 @@ if ($instanceFolders -is [array]) exit 1 } -$vsInstallRoot = Get-VisualStudioPath +$vsInstallRoot = (Get-VisualStudioInstance).InstallationPath # Initialize Visual Studio Experimental Instance & "$vsInstallRoot\Common7\IDE\devenv.exe" /RootSuffix Exp /ResetSettings General.vssettings /Command File.Exit diff --git a/images/win/scripts/Installers/Install-WinAppDriver.ps1 b/images/win/scripts/Installers/Install-WinAppDriver.ps1 index a2a1dd3d4c7a..3a503b8b7638 100644 --- a/images/win/scripts/Installers/Install-WinAppDriver.ps1 +++ b/images/win/scripts/Installers/Install-WinAppDriver.ps1 @@ -10,4 +10,4 @@ $InstallerName = "WindowsApplicationDriver.msi" [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 Install-Binary -Url $InstallerUrl -Name $InstallerName -Invoke-PesterTests -TestFile "WinAppDriver" +Invoke-PesterTests -TestFile "WinAppDriver" -TestName "WinAppDriver" diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.VisualStudio.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.VisualStudio.psm1 index d8ecac5d434e..0bcdd5afc184 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.VisualStudio.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.VisualStudio.psm1 @@ -1,9 +1,9 @@ function Get-VisualStudioVersion { - $vsVersion = vswhere -format json | ConvertFrom-Json + $vsInstance = Get-VisualStudioInstance [PSCustomObject]@{ - Name = $vsVersion.displayName - Version = $vsVersion.installationVersion - Path = $vsVersion.installationPath + Name = $vsInstance.DisplayName + Version = $vsInstance.InstallationVersion + Path = $vsInstance.InstallationPath } } @@ -20,6 +20,8 @@ function Get-WDKVersion { } function Get-VisualStudioExtensions { + $vsPackages = (Get-VisualStudioInstance).Packages + # Additional vsixs $toolset = Get-ToolsetContent $vsixUrls = $toolset.visualStudio.vsix @@ -27,7 +29,8 @@ function Get-VisualStudioExtensions { { $vsixs = $vsixUrls | ForEach-Object { $vsix = Get-VsixExtenstionFromMarketplace -ExtensionMarketPlaceName $_ - $vsixVersion = (Get-VisualStudioPackages | Where-Object {$_.Id -match $vsix.VsixId -and $_.type -eq 'vsix'}).Version + + $vsixVersion = ($vsPackages | Where-Object {$_.Id -match $vsix.VsixId -and $_.type -eq 'vsix'}).Version @{ Package = $vsix.ExtensionName Version = $vsixVersion @@ -52,7 +55,7 @@ function Get-VisualStudioExtensions { if (Test-IsWin16 -or Test-IsWin19) { # Wix $wixPackageVersion = Get-WixVersion - $wixExtensionVersion = (Get-VisualStudioPackages | Where-Object {$_.Id -match 'WixToolset.VisualStudioExtension.Dev' -and $_.type -eq 'vsix'}).Version + $wixExtensionVersion = ($vsPackages | Where-Object {$_.Id -match 'WixToolset.VisualStudioExtension.Dev' -and $_.type -eq 'vsix'}).Version $wixPackages = @( @{Package = 'WIX Toolset'; Version = $wixPackageVersion} @{Package = "WIX Toolset Studio $vs Extension"; Version = $wixExtensionVersion} diff --git a/images/win/scripts/Tests/VisualStudio.Tests.ps1 b/images/win/scripts/Tests/VisualStudio.Tests.ps1 index 142a9917ee2f..a9f02cfa30c5 100644 --- a/images/win/scripts/Tests/VisualStudio.Tests.ps1 +++ b/images/win/scripts/Tests/VisualStudio.Tests.ps1 @@ -5,7 +5,7 @@ Describe "Visual Studio" { } It "Devenv.exe" { - $vsInstallRoot = Get-VisualStudioPath + $vsInstallRoot = (Get-VisualStudioInstance).InstallationPath $devenvexePath = "${vsInstallRoot}\Common7\IDE\devenv.exe" $devenvexePath | Should -Exist } diff --git a/images/win/scripts/Tests/Vsix.Tests.ps1 b/images/win/scripts/Tests/Vsix.Tests.ps1 index 69e6682394bf..f09c086133c1 100644 --- a/images/win/scripts/Tests/Vsix.Tests.ps1 +++ b/images/win/scripts/Tests/Vsix.Tests.ps1 @@ -2,7 +2,7 @@ Describe "Vsix" { $toolset = Get-ToolsetContent $requiredVsixs = $toolset.visualStudio.vsix - $allPackages = (Get-VSSetupInstance | Select-VsSetupInstance -Product *).Packages + $allPackages = (Get-VisualStudioInstance).Packages $testCases = $requiredVsixs | ForEach-Object { $vsix = Get-VsixExtenstionFromMarketplace -ExtensionMarketPlaceName $_ @{ diff --git a/images/win/scripts/Tests/WinAppDriver.Tests.ps1 b/images/win/scripts/Tests/WinAppDriver.Tests.ps1 index c33581e40680..3a9d0b43d8b3 100644 --- a/images/win/scripts/Tests/WinAppDriver.Tests.ps1 +++ b/images/win/scripts/Tests/WinAppDriver.Tests.ps1 @@ -2,7 +2,9 @@ Describe "WinAppDriver" { It "WinAppDriver directory exists" { Test-Path -Path "${env:ProgramFiles(x86)}\Windows Application Driver" | Should -BeTrue } +} +Describe "Developer Mode" { It "Developer Mode is enabled" { $path = "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\AppModelUnlock"; Get-ItemProperty -Path $path | Select-Object -ExpandProperty "AllowDevelopmentWithoutDevLicense" | Should -Be 1 diff --git a/images/win/toolsets/toolset-2016.json b/images/win/toolsets/toolset-2016.json index ceb7e974e6cc..fd31857fdabc 100644 --- a/images/win/toolsets/toolset-2016.json +++ b/images/win/toolsets/toolset-2016.json @@ -260,6 +260,7 @@ "version" : "2017", "subversion" : "15", "edition" : "Enterprise", + "channel": "release", "workloads": [ "Microsoft.Net.Component.4.6.2.SDK", "Microsoft.Net.Component.4.6.2.TargetingPack", diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index 81439fb6e642..1708e7f0fea3 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -258,6 +258,7 @@ "version" : "2019", "subversion" : "16", "edition" : "Enterprise", + "channel": "release", "workloads": [ "Component.Dotfuscator", "Component.Linux.CMake", diff --git a/images/win/windows2016.json b/images/win/windows2016.json index 3bcd272d7fa8..8237c40b0e85 100644 --- a/images/win/windows2016.json +++ b/images/win/windows2016.json @@ -154,11 +154,10 @@ 3010 ], "scripts": [ - "{{ template_dir }}/scripts/Installers/Install-KubernetesTools.ps1", "{{ template_dir }}/scripts/Installers/Install-VS.ps1", + "{{ template_dir }}/scripts/Installers/Install-KubernetesTools.ps1", "{{ template_dir }}/scripts/Installers/Install-NET48.ps1", - "{{ template_dir }}/scripts/Installers/Windows2016/Install-SSDT.ps1", - "{{ template_dir }}/scripts/Installers/Enable-DeveloperMode.ps1" + "{{ template_dir }}/scripts/Installers/Windows2016/Install-SSDT.ps1" ], "elevated_user": "{{user `install_user`}}", "elevated_password": "{{user `install_password`}}" @@ -249,7 +248,8 @@ "{{ template_dir }}/scripts/Installers/Install-WindowsUpdates.ps1", "{{ template_dir }}/scripts/Installers/Configure-DynamicPort.ps1", "{{ template_dir }}/scripts/Installers/Configure-GDIProcessHandleQuota.ps1", - "{{ template_dir }}/scripts/Installers/Configure-Shell.ps1" + "{{ template_dir }}/scripts/Installers/Configure-Shell.ps1", + "{{ template_dir }}/scripts/Installers/Enable-DeveloperMode.ps1" ], "elevated_user": "{{user `install_user`}}", "elevated_password": "{{user `install_password`}}" diff --git a/images/win/windows2019.json b/images/win/windows2019.json index 052e51c1b38d..88f25caebfba 100644 --- a/images/win/windows2019.json +++ b/images/win/windows2019.json @@ -161,10 +161,9 @@ 3010 ], "scripts": [ - "{{ template_dir }}/scripts/Installers/Install-KubernetesTools.ps1", "{{ template_dir }}/scripts/Installers/Install-VS.ps1", - "{{ template_dir }}/scripts/Installers/Install-NET48.ps1", - "{{ template_dir }}/scripts/Installers/Enable-DeveloperMode.ps1" + "{{ template_dir }}/scripts/Installers/Install-KubernetesTools.ps1", + "{{ template_dir }}/scripts/Installers/Install-NET48.ps1" ], "elevated_user": "{{user `install_user`}}", "elevated_password": "{{user `install_password`}}" @@ -258,7 +257,8 @@ "{{ template_dir }}/scripts/Installers/Install-WindowsUpdates.ps1", "{{ template_dir }}/scripts/Installers/Configure-DynamicPort.ps1", "{{ template_dir }}/scripts/Installers/Configure-GDIProcessHandleQuota.ps1", - "{{ template_dir }}/scripts/Installers/Configure-Shell.ps1" + "{{ template_dir }}/scripts/Installers/Configure-Shell.ps1", + "{{ template_dir }}/scripts/Installers/Enable-DeveloperMode.ps1" ], "elevated_user": "{{user `install_user`}}", "elevated_password": "{{user `install_password`}}" From 71a9049e380f407fdcea1c1a7d94eff2837cb0fb Mon Sep 17 00:00:00 2001 From: Maxim Lobanov Date: Thu, 5 Aug 2021 07:26:07 +0300 Subject: [PATCH 0441/3485] [Windows] Fix platform conditions by adding brackets (#3856) --- images/win/scripts/Installers/Install-DotnetSDK.ps1 | 2 +- .../win/scripts/SoftwareReport/SoftwareReport.VisualStudio.psm1 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/images/win/scripts/Installers/Install-DotnetSDK.ps1 b/images/win/scripts/Installers/Install-DotnetSDK.ps1 index 4a9af0f074ac..dcffdfd49c9f 100644 --- a/images/win/scripts/Installers/Install-DotnetSDK.ps1 +++ b/images/win/scripts/Installers/Install-DotnetSDK.ps1 @@ -32,7 +32,7 @@ function Invoke-Warmup ( function Fix-ImportPublishProfile ( $SdkVersion ) { - if (Test-IsWin16 -or Test-IsWin19) { + if ((Test-IsWin16) -or (Test-IsWin19)) { # Fix for issue https://github.com/dotnet/sdk/issues/1276. This will be fixed in 3.1. $sdkTargetsName = "Microsoft.NET.Sdk.ImportPublishProfile.targets" $sdkTargetsUrl = "https://raw.githubusercontent.com/dotnet/sdk/82bc30c99f1325dfaa7ad450be96857a4fca2845/src/Tasks/Microsoft.NET.Build.Tasks/targets/${sdkTargetsName}" diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.VisualStudio.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.VisualStudio.psm1 index 0bcdd5afc184..21f2e5dd4a3e 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.VisualStudio.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.VisualStudio.psm1 @@ -52,7 +52,7 @@ function Get-VisualStudioExtensions { ) } - if (Test-IsWin16 -or Test-IsWin19) { + if ((Test-IsWin16) -or (Test-IsWin19)) { # Wix $wixPackageVersion = Get-WixVersion $wixExtensionVersion = ($vsPackages | Where-Object {$_.Id -match 'WixToolset.VisualStudioExtension.Dev' -and $_.type -eq 'vsix'}).Version From 99fa3a3396bfa39d6a059f43e44f36df811133ef Mon Sep 17 00:00:00 2001 From: Julien Marrec Date: Thu, 5 Aug 2021 17:16:04 +0200 Subject: [PATCH 0442/3485] Add aria2 (aria2c) to Windows (#3795) --- .../scripts/SoftwareReport/SoftwareReport.Generator.ps1 | 1 + .../win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 | 8 +++++++- images/win/scripts/Tests/ChocoPackages.Tests.ps1 | 8 +++++++- images/win/toolsets/toolset-2016.json | 1 + images/win/toolsets/toolset-2019.json | 1 + 5 files changed, 17 insertions(+), 2 deletions(-) diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index ab2cde8e4de9..67cd528fcfc4 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -75,6 +75,7 @@ $markdown += New-MDList -Style Unordered -Lines (@( $markdown += New-MDHeader "Tools" -Level 3 $markdown += New-MDList -Style Unordered -Lines (@( (Get-7zipVersion), + (Get-Aria2Version), (Get-AzCopyVersion), (Get-BazelVersion), (Get-BazeliskVersion), diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 index c49374ea560d..a9ccfb8e5374 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 @@ -1,3 +1,9 @@ +function Get-Aria2Version { + (aria2c -v | Out-String) -match "(?(\d+\.){1,}\d+)" | Out-Null + $aria2Version = $Matches.Version + return "aria2 $aria2Version" +} + function Get-AzCosmosDBEmulatorVersion { $regKey = gci HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\* | gp | ? { $_.DisplayName -eq 'Azure Cosmos DB Emulator' } $installDir = $regKey.InstallLocation @@ -274,4 +280,4 @@ function Get-SwigVersion { (swig -version | Out-String) -match "version (?\d+\.\d+\.\d+)" | Out-Null $swigVersion = $Matches.Version return "Swig $swigVersion" -} \ No newline at end of file +} diff --git a/images/win/scripts/Tests/ChocoPackages.Tests.ps1 b/images/win/scripts/Tests/ChocoPackages.Tests.ps1 index 965f114f8b58..1fb602acd28a 100644 --- a/images/win/scripts/Tests/ChocoPackages.Tests.ps1 +++ b/images/win/scripts/Tests/ChocoPackages.Tests.ps1 @@ -4,6 +4,12 @@ Describe "7-Zip" { } } +Describe "Aria2" { + It "Aria2" { + "aria2c --version" | Should -ReturnZeroExitCode + } +} + Describe "AzCopy" { It "AzCopy" { "azcopy --version" | Should -ReturnZeroExitCode @@ -104,4 +110,4 @@ Describe "Kotlin" { It " is available" -TestCases ($kotlinPackages | ForEach-Object { @{ toolName = $_ } }) { "$toolName -version" | Should -ReturnZeroExitCode } -} \ No newline at end of file +} diff --git a/images/win/toolsets/toolset-2016.json b/images/win/toolsets/toolset-2016.json index fd31857fdabc..b4f0ebe9a588 100644 --- a/images/win/toolsets/toolset-2016.json +++ b/images/win/toolsets/toolset-2016.json @@ -375,6 +375,7 @@ "choco": { "common_packages": [ { "name": "7zip.install" }, + { "name": "aria2" }, { "name": "azcopy10" }, { "name": "Bicep" }, { "name": "gitversion.portable" }, diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index 1708e7f0fea3..9f158ec974ba 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -401,6 +401,7 @@ "choco": { "common_packages": [ { "name": "7zip.install" }, + { "name": "aria2" }, { "name": "azcopy10" }, { "name": "Bicep" }, { "name": "gitversion.portable" }, From 6113166f05dd008c285271022b4a2b9f97f68793 Mon Sep 17 00:00:00 2001 From: Alena Sviridenko Date: Fri, 6 Aug 2021 11:45:11 +0300 Subject: [PATCH 0443/3485] Change Ubuntu 16.04 usage terms (#3862) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 82a2ae50bd7a..6870746d67ad 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ For general questions about using the virtual environments or writing your Actio | Windows Server 2019 | `windows-latest` or `windows-2019` | [windows-2019] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=windows-2019&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=windows-2019&redirect=1) | Windows Server 2016 | `windows-2016` | [windows-2016] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=windows-2016&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=windows-2016&redirect=1) ``` -Ubuntu 16.04 has been deprecated and will be removed on September 20, 2021. +Ubuntu 16.04 has been deprecated and will be removed on September 20, 2021. Its usage is limited to current customers, no new onboardings are accepted. Existing workflows using `Ubuntu 16.04` should migrate to `Ubuntu 20.04` or `Ubuntu 18.04` ``` From 7c157775887311aef22147ccbb167702a3cf6028 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Fri, 6 Aug 2021 15:13:14 +0300 Subject: [PATCH 0444/3485] LICENSE: update year (#3863) --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index b50625eb6394..1606539a1952 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2020 GitHub +Copyright (c) 2021 GitHub Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal From b56230f3423cc8fa24bae454cacf7e841b22fb6b Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Fri, 6 Aug 2021 18:25:52 +0300 Subject: [PATCH 0445/3485] [Linux] install.sh: make the IsPackageInstalled function definition consistent (#3864) * linux/../../install.sh: make the IsPackageInstalled function definition consistent --- images/linux/scripts/helpers/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/linux/scripts/helpers/install.sh b/images/linux/scripts/helpers/install.sh index 0bf12071d721..434dcad97a41 100644 --- a/images/linux/scripts/helpers/install.sh +++ b/images/linux/scripts/helpers/install.sh @@ -48,7 +48,7 @@ download_with_retries() { ## if ! IsPackageInstalled packageName; then ## echo "packageName is not installed!" ## fi -function IsPackageInstalled { +IsPackageInstalled() { dpkg -S $1 &> /dev/null } From dcb58dee7ac5640f41ae3fa851458f8afbe2b45c Mon Sep 17 00:00:00 2001 From: Ryan Date: Mon, 9 Aug 2021 08:59:59 +0000 Subject: [PATCH 0446/3485] fix: escape tilde operator (#3868) Prevents markdown to interpret it as 'strike down' style when 2 or more tilde operators appear --- images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 index c6cffc2ab20c..c5abd8ed8ffd 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 @@ -353,6 +353,8 @@ function Get-AptPackages { if ($Null -eq $version) { $version = $(dpkg-query -W -f '${Version}' "$pkg*") } + + $version = $version -replace '~','\~' $output += [PSCustomObject] @{ Name = $pkg From a64db791f32ffe355d7397c1ac896d42686e9dfa Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Tue, 10 Aug 2021 17:24:51 +0300 Subject: [PATCH 0447/3485] disable network discovery popup (#3875) --- images/win/scripts/Installers/Initialize-VM.ps1 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/images/win/scripts/Installers/Initialize-VM.ps1 b/images/win/scripts/Installers/Initialize-VM.ps1 index 5f50870e6339..3e3af7421013 100644 --- a/images/win/scripts/Installers/Initialize-VM.ps1 +++ b/images/win/scripts/Installers/Initialize-VM.ps1 @@ -43,6 +43,12 @@ function Disable-WindowsUpdate { # Enable $ErrorActionPreference='Stop' for AllUsersAllHosts Add-Content -Path $profile.AllUsersAllHosts -Value '$ErrorActionPreference="Stop"' +Write-Host "Disable Server Manager on Logon" +Get-ScheduledTask -TaskName ServerManager | Disable-ScheduledTask + +Write-Host "Disable 'Allow your PC to be discoverable by other PCs' popup" +New-Item -Path HKLM:\System\CurrentControlSet\Control\Network -Name NewNetworkWindowOff -Force + Write-Host "Disable Windows Update" Disable-WindowsUpdate From 7617695f300ce5449844a9b2c707a9cc748607ab Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 11 Aug 2021 09:54:02 +0000 Subject: [PATCH 0448/3485] Updating readme file for macOS-11 version 20210808.1 (#3877) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/macos/macos-11-Readme.md | 40 ++++++++++++++++----------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/images/macos/macos-11-Readme.md b/images/macos/macos-11-Readme.md index 5e9862e8d491..3513499ad854 100644 --- a/images/macos/macos-11-Readme.md +++ b/images/macos/macos-11-Readme.md @@ -6,7 +6,7 @@ # macOS 11.5 info - System Version: macOS 11.5 (20G71) - Kernel Version: Darwin 20.6.0 -- Image Version: 20210801.1 +- Image Version: 20210808.1 ## Installed Software ### Language and Runtime @@ -20,7 +20,7 @@ - GNU Fortran (Homebrew GCC 9.4.0) 9.4.0 - available by `gfortran-9` alias - GNU Fortran (Homebrew GCC 10.3.0) 10.3.0 - available by `gfortran-10` alias - GNU Fortran (Homebrew GCC 11.2.0) 11.2.0 - available by `gfortran-11` alias -- Go 1.15.14 +- Go 1.15.15 - julia 1.6.2 - kotlin 1.5.21-release-314 - MSBuild 16.6.0.15801 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) @@ -38,15 +38,15 @@ - Carthage 0.38.0 - CocoaPods 1.10.2 - Composer 2.1.5 -- Homebrew 3.2.5 +- Homebrew 3.2.6 - Miniconda 4.10.3 - NPM 6.14.14 - NuGet 5.6.0.6489 - Pip 20.3.4 (python 2.7) - Pip 21.1.3 (python 3.9) -- Pipx 0.16.3 +- Pipx 0.16.4 - RubyGems 3.2.25 -- Vcpkg 2021 (build from master \<261c458>) +- Vcpkg 2021 (build from master \<57bd710>) - Yarn 1.22.5 #### Environment variables @@ -70,7 +70,7 @@ - Curl 7.78.0 - Git LFS: 2.13.3 - Git: 2.32.0 -- GitHub CLI: 1.13.1 +- GitHub CLI: 1.14.0 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.1 - gpg (GnuPG) 2.3.1 @@ -91,16 +91,16 @@ ### Tools -- Aliyun CLI 3.0.82 +- Aliyun CLI 3.0.85 - App Center CLI 2.10.0 -- AWS CLI 2.2.25 +- AWS CLI 2.2.27 - AWS SAM CLI 1.27.2 - AWS Session Manager CLI 1.2.234.0 -- Azure CLI 2.26.1 +- Azure CLI 2.27.0 - Bicep CLI 0.4.451 - Cabal 3.4.0.0 - Cmake 3.21.1 -- Fastlane 2.189.0 +- Fastlane 2.191.0 - GHC 9.0.1 - GHCup v0.1.16.1 - Stack 2.7.3 @@ -110,15 +110,15 @@ ### Linters - SwiftLint 0.43.1 -- yamllint 1.26.1 +- yamllint 1.26.2 ### Browsers - Safari 14.1.2 (16611.3.10.1.3) - SafariDriver 14.1.2 (16611.3.10.1.3) -- Google Chrome 92.0.4515.107 +- Google Chrome 92.0.4515.131 - ChromeDriver 92.0.4515.107 -- Microsoft Edge 92.0.902.62 -- MSEdgeDriver 92.0.902.62 +- Microsoft Edge 92.0.902.67 +- MSEdgeDriver 92.0.902.67 - Mozilla Firefox 90.0.2 - geckodriver 0.29.1 @@ -130,10 +130,10 @@ | GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | ### Java -| Version | Vendor | Environment Variable | -| -------------------- | ------------- | -------------------- | -| 8.0.292+10 (default) | Adopt OpenJDK | JAVA_HOME_8_X64 | -| 11.0.11+9 | Adopt OpenJDK | JAVA_HOME_11_X64 | +| Version | Vendor | Environment Variable | +| ------------------- | ------------- | -------------------- | +| 8.0.302+8 (default) | Adopt OpenJDK | JAVA_HOME_8_X64 | +| 11.0.12+7 | Adopt OpenJDK | JAVA_HOME_11_X64 | ### Cached Tools #### Ruby @@ -158,8 +158,8 @@ - 14.17.4 #### Go -- 1.15.14 -- 1.16.6 +- 1.15.15 +- 1.16.7 ### Rust Tools - Cargo 1.54.0 From f365613a9d98f1ca86fced3bb58101b55b599513 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 12 Aug 2021 08:35:54 +0000 Subject: [PATCH 0449/3485] Updating readme file for ubuntu20 version 20210810.1 (#3880) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/linux/Ubuntu2004-README.md | 51 ++++++++++++++++--------------- 1 file changed, 26 insertions(+), 25 deletions(-) diff --git a/images/linux/Ubuntu2004-README.md b/images/linux/Ubuntu2004-README.md index bd45192ff9d8..57d4ac0993e4 100644 --- a/images/linux/Ubuntu2004-README.md +++ b/images/linux/Ubuntu2004-README.md @@ -4,18 +4,19 @@ *** # Ubuntu 20.04.2 LTS - Linux kernel version: 5.8.0-1039-azure -- Image Version: 20210803.0 +- Image Version: 20210810.1 ## Installed Software ### Language and Runtime - Bash 5.0.17(1)-release +- Clang 10.0.0, 11.0.0, 12.0.0 +- Clang-format 10.0.0, 11.0.0, 12.0.0 - Erlang 24.0.5 (Eshell 12.0.3) - Erlang rebar3 3.16.1 - GNU C++ 9.3.0, 10.3.0 - GNU Fortran 9.3.0, 10.3.0 - Julia 1.6.2 - Kotlin 1.5.21-release-314 -- LLVM components: Clang 10.0.0, 11.0.0, 12.0.1, Clang-format 10.0.0, 11.0.0, 12.0.1 (apt source: deb http://apt.llvm.org/focal/ llvm-toolchain-focal-12) - Mono 6.12.0.122 (apt source repository: https://download.mono-project.com/repo/ubuntu stable-focal main) - MSBuild 16.6.0.15201 (from /usr/lib/mono/msbuild/15.0/bin/MSBuild.dll) - Node 14.17.4 @@ -33,9 +34,9 @@ - Npm 6.14.14 - Pip 20.0.2 - Pip3 20.0.2 -- Pipx 0.16.3 +- Pipx 0.16.4 - RubyGems 3.1.2 -- Vcpkg (build from master \) +- Vcpkg (build from master \) - Yarn 1.22.11 #### Environment variables @@ -60,12 +61,12 @@ - Bicep 0.4.451 - Buildah 1.21.3 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - CMake 3.21.1 -- CodeQL Action Bundle 2.5.8 +- CodeQL Action Bundle 2.5.9 - Docker Compose 1.29.2 - Docker-Buildx 0.6.0 - Docker-Moby Client 20.10.7+azure - Docker-Moby Server 20.10.7+azure -- Fastlane 2.190.0 +- Fastlane 2.191.0 - Git 2.32.0 (apt source repository: ppa:git-core/ppa) - Git LFS 2.13.3 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.6.0 @@ -74,7 +75,7 @@ - HHVM (HipHop VM) 4.121.0 - jq 1.6 - Kind 0.11.1 -- Kubectl 1.21.3 +- Kubectl 1.22.0 - Kustomize 4.2.0 - Leiningen 2.9.6 - MediaInfo 19.09 @@ -91,25 +92,25 @@ - Skopeo 1.3.0 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 -- Terraform 1.0.3 +- Terraform 1.0.4 - yamllint 1.26.2 - yq 4.11.2 - zstd 1.5.0 (homebrew) ### CLI Tools -- Alibaba Cloud CLI 3.0.83 -- AWS CLI 2.2.25 +- Alibaba Cloud CLI 3.0.85 +- AWS CLI 2.2.27 - AWS CLI Session manager plugin 1.2.234.0 - AWS SAM CLI 1.27.2 - Azure CLI (azure-cli) 2.27.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) -- Azure CLI (azure-devops) 0.18.0 -- GitHub CLI 1.13.1 -- Google Cloud SDK 350.0.0 (apt source repository: https://packages.cloud.google.com/apt) +- Azure CLI (azure-devops) 0.20.0 +- GitHub CLI 1.14.0 +- Google Cloud SDK 351.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 5.4.11 +- Netlify CLI 6.0.9 - OpenShift CLI 4.8.3 - ORAS CLI 0.12.0 -- Vercel CLI 23.0.1 +- Vercel CLI 23.1.2 ### Java | Version | Vendor | Environment Variable | @@ -168,7 +169,7 @@ - 2.1.302 2.1.403 2.1.524 2.1.617 2.1.701 2.1.816 3.1.117 3.1.202 3.1.302 3.1.411 5.0.104 5.0.205 5.0.302 ### Databases -- MongoDB 5.0.1 (apt source repository: https://repo.mongodb.org/apt/ubuntu) +- MongoDB 5.0.2 (apt source repository: https://repo.mongodb.org/apt/ubuntu) - Postgre SQL 13.3 (apt source repository: https://apt.postgresql.org/pub/repos/apt/) - sqlite3 3.31.1 @@ -186,8 +187,8 @@ ### Cached Tools #### Go - 1.14.15 -- 1.15.14 -- 1.16.6 +- 1.15.15 +- 1.16.7 #### Node.js - 10.24.1 @@ -217,8 +218,8 @@ | Name | Value | Architecture | | --------------- | ----------------------------------- | ------------ | | GOROOT_1_14_X64 | /opt/hostedtoolcache/go/1.14.15/x64 | x64 | -| GOROOT_1_15_X64 | /opt/hostedtoolcache/go/1.15.14/x64 | x64 | -| GOROOT_1_16_X64 | /opt/hostedtoolcache/go/1.16.6/x64 | x64 | +| GOROOT_1_15_X64 | /opt/hostedtoolcache/go/1.15.15/x64 | x64 | +| GOROOT_1_16_X64 | /opt/hostedtoolcache/go/1.16.7/x64 | x64 | ### PowerShell Tools - PowerShell 7.1.3 @@ -302,7 +303,7 @@ | fakeroot | 1.24-1 | | file | 1:5.38-4 | | flex | 2.6.4-6.2 | -| fonts-noto-color-emoji | 0~20200916-1~ubuntu20.04.1 | +| fonts-noto-color-emoji | 0\~20200916-1\~ubuntu20.04.1 | | ftp | 0.17-34.1 | | gnupg2 | 2.2.19-3ubuntu2.1 | | haveged | 1.9.1-6ubuntu1 | @@ -311,10 +312,10 @@ | iputils-ping | 3:20190709-3 | | jq | 1.6-1ubuntu0.20.04.1 | | lib32z1 | 1:1.2.11.dfsg-2ubuntu1.2 | -| libc++-dev | 1:10.0-50~exp1 | -| libc++abi-dev | 1:10.0-50~exp1 | +| libc++-dev | 1:10.0-50\~exp1 | +| libc++abi-dev | 1:10.0-50\~exp1 | | libcurl4 | 7.68.0-1ubuntu2.6 | -| libgbm-dev | 21.0.3-0ubuntu0.2~20.04.1 | +| libgbm-dev | 21.0.3-0ubuntu0.2\~20.04.1 | | libgconf-2-4 | 3.2.6-6ubuntu1 | | libgsl-dev | 2.5+dfsg-6build1 | | libgtk-3-0 | 3.24.20-0ubuntu1 | @@ -359,7 +360,7 @@ | upx | 3.95-2build1 | | wget | 1.20.3-1ubuntu1 | | xorriso | 1.5.2-1 | -| xvfb | 2:1.20.11-1ubuntu1~20.04.2 | +| xvfb | 2:1.20.11-1ubuntu1\~20.04.2 | | xz-utils | 5.2.4-1ubuntu1 | | zip | 3.0-11build1 | | zsync | 0.6.2-3ubuntu1 | From f924b2ced6534076b30c7dd950ab1cd3fb870e80 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 12 Aug 2021 10:49:03 +0000 Subject: [PATCH 0450/3485] Updating readme file for macOS-10.15 version 20210808.1 (#3876) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/macos/macos-10.15-Readme.md | 46 +++++++++++++++--------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/images/macos/macos-10.15-Readme.md b/images/macos/macos-10.15-Readme.md index e3e6e78c2d7e..96af9dd69107 100644 --- a/images/macos/macos-10.15-Readme.md +++ b/images/macos/macos-10.15-Readme.md @@ -6,7 +6,7 @@ # macOS 10.15 info - System Version: macOS 10.15.7 (19H1323) - Kernel Version: Darwin 19.6.0 -- Image Version: 20210801.1 +- Image Version: 20210808.1 ## Installed Software ### Language and Runtime @@ -20,7 +20,7 @@ - GNU Fortran (Homebrew GCC 9.4.0) 9.4.0 - available by `gfortran-9` alias - GNU Fortran (Homebrew GCC 10.3.0) 10.3.0 - available by `gfortran-10` alias - GNU Fortran (Homebrew GCC 11.2.0) 11.2.0 - available by `gfortran-11` alias -- Go 1.15.14 +- Go 1.15.15 - julia 1.6.2 - kotlin 1.5.21-release-314 - MSBuild 16.6.0.15801 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) @@ -39,15 +39,15 @@ - Carthage 0.38.0 - CocoaPods 1.10.2 - Composer 2.1.5 -- Homebrew 3.2.5 +- Homebrew 3.2.6 - Miniconda 4.10.3 - NPM 6.14.14 - NuGet 5.6.0.6489 - Pip 20.3.4 (python 2.7) - Pip 21.1.3 (python 3.9) -- Pipx 0.16.3 +- Pipx 0.16.4 - RubyGems 3.2.25 -- Vcpkg 2021 (build from master \<261c458>) +- Vcpkg 2021 (build from master \<57bd710>) - Yarn 1.22.5 #### Environment variables @@ -71,7 +71,7 @@ - Curl 7.78.0 - Git LFS: 2.13.3 - Git: 2.32.0 -- GitHub CLI: 1.13.1 +- GitHub CLI: 1.14.0 - GNU parallel 20210622 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.1 @@ -95,16 +95,16 @@ ### Tools -- Aliyun CLI 3.0.82 +- Aliyun CLI 3.0.85 - App Center CLI 2.10.0 -- AWS CLI 2.2.25 +- AWS CLI 2.2.27 - AWS SAM CLI 1.27.2 - AWS Session Manager CLI 1.2.234.0 -- Azure CLI 2.26.1 +- Azure CLI 2.27.0 - Bicep CLI 0.4.451 - Cabal 3.4.0.0 - Cmake 3.21.1 -- Fastlane 2.189.0 +- Fastlane 2.191.0 - GHC 9.0.1 - GHCup v0.1.16.1 - Stack 2.7.3 @@ -114,15 +114,15 @@ ### Linters - SwiftLint 0.43.1 -- yamllint 1.26.1 +- yamllint 1.26.2 ### Browsers - Safari 14.1.2 (15611.3.10.1.5) - SafariDriver 14.1.2 (15611.3.10.1.5) -- Google Chrome 92.0.4515.107 +- Google Chrome 92.0.4515.131 - ChromeDriver 92.0.4515.107 -- Microsoft Edge 92.0.902.62 -- MSEdgeDriver 92.0.902.62 +- Microsoft Edge 92.0.902.67 +- MSEdgeDriver 92.0.902.67 - Mozilla Firefox 90.0.2 - geckodriver 0.29.1 @@ -134,13 +134,13 @@ | GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | ### Java -| Version | Vendor | Environment Variable | -| -------------------- | ------------- | -------------------- | -| 8.0.292+10 (default) | Adopt OpenJDK | JAVA_HOME_8_X64 | -| 11.0.11+9 | Adopt OpenJDK | JAVA_HOME_11_X64 | -| 12.0.2+10.3 | Adopt OpenJDK | JAVA_HOME_12_X64 | -| 13.0.2+8.1 | Adopt OpenJDK | JAVA_HOME_13_X64 | -| 14.0.2+12 | Adopt OpenJDK | JAVA_HOME_14_X64 | +| Version | Vendor | Environment Variable | +| ------------------- | ------------- | -------------------- | +| 8.0.302+8 (default) | Adopt OpenJDK | JAVA_HOME_8_X64 | +| 11.0.12+7 | Adopt OpenJDK | JAVA_HOME_11_X64 | +| 12.0.2+10.3 | Adopt OpenJDK | JAVA_HOME_12_X64 | +| 13.0.2+8.1 | Adopt OpenJDK | JAVA_HOME_13_X64 | +| 14.0.2+12 | Adopt OpenJDK | JAVA_HOME_14_X64 | ### Cached Tools #### Ruby @@ -171,8 +171,8 @@ #### Go - 1.13.15 - 1.14.15 -- 1.15.14 -- 1.16.6 +- 1.15.15 +- 1.16.7 ### Rust Tools - Cargo 1.54.0 From 773f03950109be63099c757145fba3e0109fb5a0 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 12 Aug 2021 19:56:45 +0000 Subject: [PATCH 0451/3485] Updating readme file for ubuntu18 version 20210810.1 (#3879) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/linux/Ubuntu1804-README.md | 40 +++++++++++++++---------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/images/linux/Ubuntu1804-README.md b/images/linux/Ubuntu1804-README.md index 4b8c857a6d0c..df6cd7fb7bff 100644 --- a/images/linux/Ubuntu1804-README.md +++ b/images/linux/Ubuntu1804-README.md @@ -4,7 +4,7 @@ *** # Ubuntu 18.04.5 LTS - Linux kernel version: 5.4.0-1055-azure -- Image Version: 20210803.5 +- Image Version: 20210810.1 ## Installed Software ### Language and Runtime @@ -34,9 +34,9 @@ - Npm 6.14.14 - Pip 9.0.1 - Pip3 9.0.1 -- Pipx 0.16.3 +- Pipx 0.16.4 - RubyGems 2.7.6 -- Vcpkg (build from master \) +- Vcpkg (build from master \) - Yarn 1.22.11 #### Environment variables @@ -60,7 +60,7 @@ - Bicep 0.4.451 - Buildah 1.19.6 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - CMake 3.21.1 -- CodeQL Action Bundle 2.5.8 +- CodeQL Action Bundle 2.5.9 - Docker Compose 1.29.2 - Docker-Buildx 0.6.0 - Docker-Moby Client 20.10.7+azure @@ -73,7 +73,7 @@ - HHVM (HipHop VM) 4.121.0 - jq 1.5 - Kind 0.11.1 -- Kubectl 1.21.3 +- Kubectl 1.22.0 - Kustomize 4.2.0 - Leiningen 2.9.6 - MediaInfo 17.12 @@ -90,25 +90,25 @@ - Skopeo 1.2.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 - SVN 1.9.7 -- Terraform 1.0.3 +- Terraform 1.0.4 - yamllint 1.26.2 - yq 4.11.2 - zstd 1.5.0 (homebrew) ### CLI Tools -- Alibaba Cloud CLI 3.0.83 -- AWS CLI 1.20.12 +- Alibaba Cloud CLI 3.0.85 +- AWS CLI 1.20.17 - AWS CLI Session manager plugin 1.2.234.0 - AWS SAM CLI 1.27.2 - Azure CLI (azure-cli) 2.27.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) -- Azure CLI (azure-devops) 0.18.0 -- GitHub CLI 1.13.1 -- Google Cloud SDK 350.0.0 (apt source repository: https://packages.cloud.google.com/apt) +- Azure CLI (azure-devops) 0.20.0 +- GitHub CLI 1.14.0 +- Google Cloud SDK 351.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 5.4.9 -- OpenShift CLI 4.8.3 +- Netlify CLI 6.0.9 +- OpenShift CLI 4.8.4 - ORAS CLI 0.12.0 -- Vercel CLI 23.0.1 +- Vercel CLI 23.1.2 ### Java | Version | Vendor | Environment Variable | @@ -163,7 +163,7 @@ - 2.1.302 2.1.403 2.1.524 2.1.617 2.1.701 2.1.816 3.1.117 3.1.202 3.1.302 3.1.411 5.0.104 5.0.205 5.0.302 ### Databases -- MongoDB 5.0.1 (apt source repository: https://repo.mongodb.org/apt/ubuntu) +- MongoDB 5.0.2 (apt source repository: https://repo.mongodb.org/apt/ubuntu) - Postgre SQL 13.3 (apt source repository: https://apt.postgresql.org/pub/repos/apt/) - sqlite3 3.22.0 @@ -182,7 +182,7 @@ #### Go - 1.13.15 - 1.14.15 -- 1.15.14 +- 1.15.15 #### Node.js - 10.24.1 @@ -213,7 +213,7 @@ | --------------- | ----------------------------------- | ------------ | | GOROOT_1_13_X64 | /opt/hostedtoolcache/go/1.13.15/x64 | x64 | | GOROOT_1_14_X64 | /opt/hostedtoolcache/go/1.14.15/x64 | x64 | -| GOROOT_1_15_X64 | /opt/hostedtoolcache/go/1.15.14/x64 | x64 | +| GOROOT_1_15_X64 | /opt/hostedtoolcache/go/1.15.15/x64 | x64 | ### PowerShell Tools - PowerShell 7.1.3 @@ -281,7 +281,7 @@ ### Installed apt packages | Name | Version | | ----------------- | --------------------------------- | -| binutils | 2.30-21ubuntu1~18.04.5 | +| binutils | 2.30-21ubuntu1\~18.04.5 | | bison | 2:3.0.4.dfsg-1build1 | | brotli | 1.0.3-1ubuntu1.3 | | build-essential | 12.4ubuntu1 | @@ -305,7 +305,7 @@ | libc++-dev | 6.0-2 | | libc++abi-dev | 6.0-2 | | libcurl3 | 7.58.0-2ubuntu3.14 | -| libgbm-dev | 20.0.8-0ubuntu1~18.04.1 | +| libgbm-dev | 20.0.8-0ubuntu1\~18.04.1 | | libgconf-2-4 | 3.2.6-4ubuntu1 | | libgsl-dev | 2.4+dfsg-6 | | libgtk-3-0 | 3.22.30-1ubuntu4 | @@ -329,7 +329,7 @@ | pass | 1.7.1-3 | | patchelf | 0.9-1 | | pkg-config | 0.29.1-0ubuntu2 | -| pollinate | 4.33-0ubuntu1~18.04.2 | +| pollinate | 4.33-0ubuntu1\~18.04.2 | | python-setuptools | 39.0.1-2 | | rpm | 4.14.1+dfsg1-2 | | rsync | 3.1.2-2.1ubuntu1.1 | From cf4e62dadd067c09a0356cd15ff783fc05b63147 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 16 Aug 2021 08:54:17 +0000 Subject: [PATCH 0452/3485] Updating readme file for win19 version 20210810.1 (#3883) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/win/Windows2019-Readme.md | 50 +++++++++++++++++--------------- 1 file changed, 26 insertions(+), 24 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index be23aa31e874..fbb337e9f070 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 2061 -- Image Version: 20210803.1 +- Image Version: 20210810.1 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -12,8 +12,9 @@ ## Installed Software ### Language and Runtime - Bash 4.4.23(1)-release -- Go 1.15.14 +- Go 1.15.15 - Julia 1.6.2 +- Kotlin 1.5.20 - Node 14.17.4 - Perl 5.32.1 - PHP 8.0.9 @@ -27,10 +28,10 @@ - Miniconda 4.10.3 (pre-installed on the image but not added to PATH) - NPM 6.14.14 - NuGet 5.10.0.7240 -- pip 21.2.2 (python 3.7) -- Pipx 0.16.3 +- pip 21.2.3 (python 3.7) +- Pipx 0.16.4 - RubyGems 2.7.6.3 -- Vcpkg (build from master \) +- Vcpkg (build from master \) - Yarn 1.22.11 #### Environment variables @@ -47,24 +48,25 @@ ### Tools - 7zip 19.00 +- aria2 1.35.0 - azcopy 10.11.0 - Bazel 4.1.0 - Bazelisk 1.10.1 - Bicep 0.4.451 - Cabal 3.4.0.0 - CMake 3.21.1 -- CodeQL Action Bundle 2.5.8 +- CodeQL Action Bundle 2.5.9 - Docker 20.10.6 - Docker-compose 1.29.2 - ghc 9.0.1 - Git 2.32.0 - Git LFS 2.13.3 -- Google Cloud SDK 350.0.0 +- Google Cloud SDK 351.0.0 - GVFS 1.0.21085.9 - InnoSetup 6.2.0 - jq 1.6 - Kind 0.11.1 -- Kubectl 1.21.3 +- Kubectl 1.22.0 - Mercurial 5.0 - Mingw-w64 8.1.0 - Newman 5.2.4 @@ -78,18 +80,18 @@ - Swig 4.0.2 - VSWhere 2.8.4 - WinAppDriver 1.2.2009.02003 -- yamllint 1.26.1 +- yamllint 1.26.2 - zstd 1.5.0 ### CLI Tools -- Alibaba Cloud CLI 3.0.83 -- AWS CLI 2.2.25 +- Alibaba Cloud CLI 3.0.85 +- AWS CLI 2.2.27 - AWS SAM CLI 1.27.2 - AWS Session Manager CLI 1.2.234.0 - Azure CLI 2.27.0 -- Azure DevOps CLI extension 0.18.0 +- Azure DevOps CLI extension 0.20.0 - Cloud Foundry CLI 6.53.0 -- GitHub CLI 1.13.1 +- GitHub CLI 1.14.0 - Hub CLI 2.14.2 ### Rust Tools @@ -109,11 +111,11 @@ ### Browsers and webdrivers - Google Chrome 92.0.4515.131 - Chrome Driver 92.0.4515.107 -- Microsoft Edge 92.0.902.62 -- Microsoft Edge Driver 92.0.902.62 +- Microsoft Edge 92.0.902.67 +- Microsoft Edge Driver 92.0.902.67 - Mozilla Firefox 90.0.2 - Gecko Driver 0.29.1 -- IE Driver 3.150.1.0 +- IE Driver 3.150.1.1 #### Environment variables | Name | Value | @@ -123,11 +125,11 @@ | GECKOWEBDRIVER | C:\SeleniumWebDrivers\GeckoDriver | ### Java -| Version | Vendor | Environment Variable | -| -------------------- | ------------- | -------------------- | -| 8.0.292+10 (default) | Adopt OpenJDK | JAVA_HOME_8_X64 | -| 11.0.11+9 | Adopt OpenJDK | JAVA_HOME_11_X64 | -| 13.0.2+8.1 | Adopt OpenJDK | JAVA_HOME_13_X64 | +| Version | Vendor | Environment Variable | +| ------------------- | ------------- | -------------------- | +| 8.0.302+8 (default) | Adopt OpenJDK | JAVA_HOME_8_X64 | +| 11.0.12+7 | Adopt OpenJDK | JAVA_HOME_11_X64 | +| 13.0.2+8.1 | Adopt OpenJDK | JAVA_HOME_13_X64 | ### Shells | Name | Target | @@ -152,8 +154,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | ------- | ------------ | -------------------- | | 1.13.15 | x64 | GOROOT_1_13_X64 | | 1.14.15 | x64 | GOROOT_1_14_X64 | -| 1.15.14 (Default) | x64 | GOROOT_1_15_X64 | -| 1.16.6 | x64 | GOROOT_1_16_X64 | +| 1.15.15 (Default) | x64 | GOROOT_1_15_X64 | +| 1.16.7 | x64 | GOROOT_1_16_X64 | #### Node @@ -211,7 +213,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### MongoDB | Version | ServiceName | ServiceStatus | ServiceStartType | | ------- | ----------- | ------------- | ---------------- | -| 5.0.1.0 | MongoDB | Running | Automatic | +| 5.0.2.0 | MongoDB | Running | Automatic | From 42c5c6179ccaae2a055943486cc5afc1e1252823 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 16 Aug 2021 11:58:51 +0000 Subject: [PATCH 0453/3485] Updating readme file for macOS-11 version 20210814.1 (#3900) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/macos/macos-11-Readme.md | 44 ++++++++++++++++----------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/images/macos/macos-11-Readme.md b/images/macos/macos-11-Readme.md index 3513499ad854..6b621d791a81 100644 --- a/images/macos/macos-11-Readme.md +++ b/images/macos/macos-11-Readme.md @@ -6,11 +6,11 @@ # macOS 11.5 info - System Version: macOS 11.5 (20G71) - Kernel Version: Darwin 20.6.0 -- Image Version: 20210808.1 +- Image Version: 20210814.1 ## Installed Software ### Language and Runtime -- .NET SDK 2.1.300 2.1.301 2.1.302 2.1.401 2.1.402 2.1.403 2.1.500 2.1.502 2.1.503 2.1.504 2.1.505 2.1.506 2.1.507 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 2.1.811 2.1.812 2.1.813 2.1.814 2.1.815 2.1.816 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 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 3.1.408 3.1.409 3.1.410 3.1.411 5.0.100 5.0.101 5.0.102 5.0.200 5.0.201 5.0.202 5.0.300 5.0.301 5.0.302 +- .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 2.1.811 2.1.812 2.1.813 2.1.814 2.1.815 2.1.816 2.1.817 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 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 3.1.408 3.1.409 3.1.410 3.1.411 3.1.412 5.0.100 5.0.101 5.0.102 5.0.200 5.0.201 5.0.202 5.0.300 5.0.301 5.0.302 5.0.400 - Bash 3.2.57(1)-release - Clang/LLVM 12.0.1 is available on `'$(brew --prefix llvm)/bin/clang'` - Clang/LLVM 12.0.5 is default @@ -24,9 +24,9 @@ - julia 1.6.2 - kotlin 1.5.21-release-314 - MSBuild 16.6.0.15801 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) -- Node.js v14.17.4 +- Node.js v14.17.5 - NVM 0.38.0 -- NVM - Cached node versions: v10.24.1 v12.22.4 v14.17.4 +- NVM - Cached node versions: v10.24.1 v12.22.5 v14.17.5 - Perl 5.34.0 - PHP 8.0.9 - Python 2.7.18 @@ -46,7 +46,7 @@ - Pip 21.1.3 (python 3.9) - Pipx 0.16.4 - RubyGems 3.2.25 -- Vcpkg 2021 (build from master \<57bd710>) +- Vcpkg 2021 (build from master \<6bc4362>) - Yarn 1.22.5 #### Environment variables @@ -57,7 +57,7 @@ ### Project Management - Apache Ant(TM) 1.10.11 -- Apache Maven 3.8.1 +- Apache Maven 3.8.2 - Gradle 7.1.1 ### Utilities @@ -77,13 +77,13 @@ - helm v3.6.3+gd506314 - Hub CLI: 2.14.2 - jq 1.6 -- mongo v5.0.1 -- mongod v5.0.1 +- mongo v5.0.2 +- mongod v5.0.2 - Newman 5.2.4 - OpenSSL 1.1.1k 25 Mar 2021 `(/usr/local/opt/openssl -> /usr/local/Cellar/openssl@1.1/1.1.1k)` - Packer 1.7.4 -- PostgreSQL 13.3 -- psql (PostgreSQL) 13.3 +- PostgreSQL 13.4 +- psql (PostgreSQL) 13.4 - Sox 14.4.2 - Subversion (SVN) 1.14.1 - Switchaudio-osx 1.1.0 @@ -93,16 +93,16 @@ ### Tools - Aliyun CLI 3.0.85 - App Center CLI 2.10.0 -- AWS CLI 2.2.27 +- AWS CLI 2.2.29 - AWS SAM CLI 1.27.2 - AWS Session Manager CLI 1.2.234.0 -- Azure CLI 2.27.0 -- Bicep CLI 0.4.451 +- Azure CLI 2.27.1 +- Bicep CLI 0.4.613 - Cabal 3.4.0.0 - Cmake 3.21.1 - Fastlane 2.191.0 - GHC 9.0.1 -- GHCup v0.1.16.1 +- GHCup v0.1.16.2 - Stack 2.7.3 - SwiftFormat 0.48.11 - Swig 4.0.2 @@ -117,9 +117,9 @@ - SafariDriver 14.1.2 (16611.3.10.1.3) - Google Chrome 92.0.4515.131 - ChromeDriver 92.0.4515.107 -- Microsoft Edge 92.0.902.67 -- MSEdgeDriver 92.0.902.67 -- Mozilla Firefox 90.0.2 +- Microsoft Edge 92.0.902.73 +- MSEdgeDriver 92.0.902.73 +- Mozilla Firefox 91.0 - geckodriver 0.29.1 #### Environment variables @@ -154,8 +154,8 @@ #### Node.js - 10.24.1 -- 12.22.4 -- 14.17.4 +- 12.22.5 +- 14.17.5 #### Go - 1.15.15 @@ -176,7 +176,7 @@ - Rustfmt 1.4.37-stable ### PowerShell Tools -- PowerShell 7.1.3 +- PowerShell 7.1.4 #### PowerShell Modules | Module | Version | @@ -194,7 +194,7 @@ ### Xamarin #### Visual Studio for Mac -- 8.10.6.10 +- 8.10.7.17 #### Xamarin bundles | symlink | Xamarin.Mono | Xamarin.iOS | Xamarin.Mac | Xamarin.Android | @@ -216,7 +216,7 @@ ### Xcode | Version | Build | Path | | -------------- | -------- | ------------------------------ | -| 13.0 (beta) | 13A5201i | /Applications/Xcode_13.0.app | +| 13.0 (beta) | 13A5212g | /Applications/Xcode_13.0.app | | 12.5.1 | 12E507 | /Applications/Xcode_12.5.1.app | | 12.5 (default) | 12E262 | /Applications/Xcode_12.5.app | | 12.4 | 12D4e | /Applications/Xcode_12.4.app | From cabf79fd204210d9aac50745c4ae245dc4e336fe Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 16 Aug 2021 12:46:06 +0000 Subject: [PATCH 0454/3485] Updating readme file for win16 version 20210810.1 (#3882) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/win/Windows2016-Readme.md | 54 +++++++++++++++++--------------- 1 file changed, 28 insertions(+), 26 deletions(-) diff --git a/images/win/Windows2016-Readme.md b/images/win/Windows2016-Readme.md index c0ac1a8edbab..ea74f9908e14 100644 --- a/images/win/Windows2016-Readme.md +++ b/images/win/Windows2016-Readme.md @@ -4,13 +4,14 @@ *** # Microsoft Windows Server 2016 Datacenter - OS Version: 10.0.14393 Build 4530 -- Image Version: 20210802.1 +- Image Version: 20210810.1 ## Installed Software ### Language and Runtime - Bash 4.4.23(1)-release -- Go 1.15.14 +- Go 1.15.15 - Julia 1.6.2 +- Kotlin 1.5.20 - Node 14.17.4 - Perl 5.32.1 - PHP 8.0.9 @@ -24,10 +25,10 @@ - Miniconda 4.10.3 (pre-installed on the image but not added to PATH) - NPM 6.14.14 - NuGet 5.10.0.7240 -- pip 21.2.2 (python 3.7) -- Pipx 0.16.3 +- pip 21.2.3 (python 3.7) +- Pipx 0.16.4 - RubyGems 2.7.6.3 -- Vcpkg (build from master \<261c458>) +- Vcpkg (build from master \) - Yarn 1.22.11 #### Environment variables @@ -44,24 +45,25 @@ ### Tools - 7zip 19.00 +- aria2 1.35.0 - azcopy 10.11.0 - Bazel 4.1.0 - Bazelisk 1.10.1 - Bicep 0.4.451 - Cabal 3.4.0.0 - CMake 3.21.1 -- CodeQL Action Bundle 2.5.8 +- CodeQL Action Bundle 2.5.9 - Docker 20.10.6 - Docker-compose 1.29.2 - ghc 9.0.1 - Git 2.32.0 - Git LFS 2.13.3 -- Google Cloud SDK 350.0.0 +- Google Cloud SDK 351.0.0 - GVFS 1.0.21085.9 - InnoSetup 6.2.0 - jq 1.6 - Kind 0.11.1 -- Kubectl 1.21.3 +- Kubectl 1.22.0 - Mercurial 5.0 - Mingw-w64 8.1.0 - Newman 5.2.4 @@ -75,18 +77,18 @@ - Swig 4.0.2 - VSWhere 2.8.4 - WinAppDriver 1.2.2009.02003 -- yamllint 1.26.1 +- yamllint 1.26.2 - zstd 1.5.0 ### CLI Tools -- Alibaba Cloud CLI 3.0.82 -- AWS CLI 2.2.25 +- Alibaba Cloud CLI 3.0.85 +- AWS CLI 2.2.27 - AWS SAM CLI 1.27.2 - AWS Session Manager CLI 1.2.234.0 -- Azure CLI 2.26.1 -- Azure DevOps CLI extension 0.18.0 +- Azure CLI 2.27.0 +- Azure DevOps CLI extension 0.20.0 - Cloud Foundry CLI 6.53.0 -- GitHub CLI 1.13.1 +- GitHub CLI 1.14.0 - Hub CLI 2.14.2 ### Rust Tools @@ -104,13 +106,13 @@ - Rustfmt 1.4.37 ### Browsers and webdrivers -- Google Chrome 92.0.4515.107 +- Google Chrome 92.0.4515.131 - Chrome Driver 92.0.4515.107 -- Microsoft Edge 92.0.902.62 -- Microsoft Edge Driver 92.0.902.62 +- Microsoft Edge 92.0.902.67 +- Microsoft Edge Driver 92.0.902.67 - Mozilla Firefox 90.0.2 - Gecko Driver 0.29.1 -- IE Driver 3.150.1.0 +- IE Driver 3.150.1.1 #### Environment variables | Name | Value | @@ -120,11 +122,11 @@ | GECKOWEBDRIVER | C:\SeleniumWebDrivers\GeckoDriver | ### Java -| Version | Vendor | Environment Variable | -| -------------------- | ------------- | -------------------- | -| 8.0.292+10 (default) | Adopt OpenJDK | JAVA_HOME_8_X64 | -| 11.0.11+9 | Adopt OpenJDK | JAVA_HOME_11_X64 | -| 13.0.2+8.1 | Adopt OpenJDK | JAVA_HOME_13_X64 | +| Version | Vendor | Environment Variable | +| ------------------- | ------------- | -------------------- | +| 8.0.302+8 (default) | Adopt OpenJDK | JAVA_HOME_8_X64 | +| 11.0.12+7 | Adopt OpenJDK | JAVA_HOME_11_X64 | +| 13.0.2+8.1 | Adopt OpenJDK | JAVA_HOME_13_X64 | ### Shells | Name | Target | @@ -146,8 +148,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | ------- | ------------ | -------------------- | | 1.13.15 | x64 | GOROOT_1_13_X64 | | 1.14.15 | x64 | GOROOT_1_14_X64 | -| 1.15.14 (Default) | x64 | GOROOT_1_15_X64 | -| 1.16.6 | x64 | GOROOT_1_16_X64 | +| 1.15.15 (Default) | x64 | GOROOT_1_15_X64 | +| 1.16.7 | x64 | GOROOT_1_16_X64 | #### Node @@ -205,7 +207,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### MongoDB | Version | ServiceName | ServiceStatus | ServiceStartType | | ------- | ----------- | ------------- | ---------------- | -| 5.0.1.0 | MongoDB | Running | Automatic | +| 5.0.2.0 | MongoDB | Running | Automatic | From 5b7a0eee31962e01614523baf7717932dbfe4ff4 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Tue, 17 Aug 2021 11:43:19 +0300 Subject: [PATCH 0455/3485] Add HOMEBREW_SHELLENV_PREFIX env (#3908) --- images/linux/scripts/installers/homebrew.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/images/linux/scripts/installers/homebrew.sh b/images/linux/scripts/installers/homebrew.sh index 3c325b1bb29a..5ff740aaa007 100644 --- a/images/linux/scripts/installers/homebrew.sh +++ b/images/linux/scripts/installers/homebrew.sh @@ -15,9 +15,10 @@ eval $(/home/linuxbrew/.linuxbrew/bin/brew shellenv) # Update /etc/environemnt ## Put HOMEBREW_* variables -brew shellenv|grep 'export HOMEBREW'|sed -E 's/^export (.*);$/\1/' | sudo tee -a /etc/environment +## The variable `HOMEBREW_SHELLENV_PREFIX` will be exported to avoid adding duplicate entries to the environment variables. +HOMEBREW_SHELLENV_PREFIX='' brew shellenv | grep 'export HOMEBREW'| sed -E 's/^export (.*);$/\1/' | sudo tee -a /etc/environment # add brew executables locations to PATH -brew_path=$(brew shellenv|grep '^export PATH' |sed -E 's/^export PATH="([^$]+)\$.*/\1/') +brew_path=$(HOMEBREW_SHELLENV_PREFIX='' brew shellenv | grep '^export PATH' | sed -E 's/^export PATH="([^$]+)\$.*/\1/') prependEtcEnvironmentPath "$brew_path" setEtcEnvironmentVariable HOMEBREW_NO_AUTO_UPDATE 1 setEtcEnvironmentVariable HOMEBREW_CLEANUP_PERIODIC_FULL_DAYS 3650 From 133db654885e1796cc158ab04f9217826294857a Mon Sep 17 00:00:00 2001 From: Maxim Lobanov Date: Tue, 17 Aug 2021 17:57:09 +0300 Subject: [PATCH 0456/3485] Move WSL installation to toolsets (#3906) --- images/win/scripts/Installers/Install-DotnetSDK.ps1 | 2 +- images/win/scripts/Installers/Windows2019/Install-WSL.ps1 | 8 -------- images/win/toolsets/toolset-2019.json | 4 +++- images/win/windows2019.json | 8 -------- 4 files changed, 4 insertions(+), 18 deletions(-) delete mode 100644 images/win/scripts/Installers/Windows2019/Install-WSL.ps1 diff --git a/images/win/scripts/Installers/Install-DotnetSDK.ps1 b/images/win/scripts/Installers/Install-DotnetSDK.ps1 index dcffdfd49c9f..1c41de28ca67 100644 --- a/images/win/scripts/Installers/Install-DotnetSDK.ps1 +++ b/images/win/scripts/Installers/Install-DotnetSDK.ps1 @@ -99,7 +99,7 @@ function InstallAllValidSdks() ForEach ($sdk in $sdks) { - InstallSDKVersion -sdkVersion $sdk.'version' + InstallSDKVersion -sdkVersion $sdk.'version' -Warmup $warmup } } elseif (!$release.'sdk'.'version'.Contains('-')) diff --git a/images/win/scripts/Installers/Windows2019/Install-WSL.ps1 b/images/win/scripts/Installers/Windows2019/Install-WSL.ps1 deleted file mode 100644 index 2e83a1b857a8..000000000000 --- a/images/win/scripts/Installers/Windows2019/Install-WSL.ps1 +++ /dev/null @@ -1,8 +0,0 @@ -################################################################################ -## File: Install-WSL.ps1 -## Desc: Install Windows Subsystem for Linux -################################################################################ - -Write-Host "Install Windows Subsystem for Linux" - -Enable-WindowsOptionalFeature -Online -FeatureName Microsoft-Windows-Subsystem-Linux -NoRestart \ No newline at end of file diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index 9f158ec974ba..786b73b9c57d 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -252,7 +252,9 @@ { "name": "NET-Framework-Features", "includeAllSubFeatures": true }, { "name": "NET-Framework-45-Features", "includeAllSubFeatures": true }, { "name": "FS-iSCSITarget-Server", "includeAllSubFeatures": true, "includeManagementTools": true }, - { "name": "Containers" } + { "name": "Containers" }, + { "name": "Microsoft-Windows-Subsystem-Linux", "optionalFeature": true }, + { "name": "VirtualMachinePlatform", "optionalFeature": true } ], "visualStudio": { "version" : "2019", diff --git a/images/win/windows2019.json b/images/win/windows2019.json index 88f25caebfba..cc85b75d121c 100644 --- a/images/win/windows2019.json +++ b/images/win/windows2019.json @@ -129,14 +129,6 @@ ], "execution_policy": "unrestricted" }, - { - "type": "powershell", - "elevated_user": "SYSTEM", - "elevated_password": "", - "scripts": [ - "{{ template_dir }}/scripts/Installers/Windows2019/Install-WSL.ps1" - ] - }, { "type": "windows-restart", "restart_timeout": "10m" From 83fcc4aeab49eb2424b33c45c65cb2499ac3a643 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 17 Aug 2021 16:43:08 +0000 Subject: [PATCH 0457/3485] Updating readme file for macOS-10.14 version 20210814.1 (#3904) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/macos/macos-10.14-Readme.md | 74 +++++++++++++++--------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/images/macos/macos-10.14-Readme.md b/images/macos/macos-10.14-Readme.md index bb3443ad48b1..d436daeb81b5 100644 --- a/images/macos/macos-10.14-Readme.md +++ b/images/macos/macos-10.14-Readme.md @@ -6,7 +6,7 @@ # macOS 10.14 info - System Version: macOS 10.14.6 (18G9323) - Kernel Version: Darwin 18.7.0 -- Image Version: 20210731.1 +- Image Version: 20210814.1 ## Installed Software ### Language and Runtime @@ -16,22 +16,22 @@ - Clang/LLVM 12.0.1 is available on `'$(brew --prefix llvm)/bin/clang'` - gcc-9 (Homebrew GCC 9.4.0) 9.4.0 - available by `gcc-9` alias - gcc-10 (Homebrew GCC 10.3.0) 10.3.0 - available by `gcc-10` alias -- gcc-11 (Homebrew GCC 11.1.0_1) 11.1.0 - available by `gcc-11` alias +- gcc-11 (Homebrew GCC 11.2.0) 11.2.0 - available by `gcc-11` alias - GNU Fortran (Homebrew GCC 9.4.0) 9.4.0 - available by `gfortran-9` alias - GNU Fortran (Homebrew GCC 10.3.0) 10.3.0 - available by `gfortran-10` alias -- GNU Fortran (Homebrew GCC 11.1.0_1) 11.1.0 - available by `gfortran-11` alias -- Go 1.15.14 +- GNU Fortran (Homebrew GCC 11.2.0) 11.2.0 - available by `gfortran-11` alias +- Go 1.15.15 - julia 1.6.2 - kotlin 1.5.21-release-314 - MSBuild 15.7.224.30163 (from /Library/Frameworks/Mono.framework/Versions/5.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) - Node.js v8.17.0 - NVM 0.38.0 -- NVM - Cached node versions: v10.24.1 v12.22.4 v14.17.4 +- NVM - Cached node versions: v10.24.1 v12.22.5 v14.17.5 - Perl 5.34.0 - PHP 8.0.9 - Python 2.7.18 - Python 3.9.6 -- R 4.1.0 +- R 4.1.1 - Ruby 2.7.4p191 ### Package Management @@ -39,13 +39,13 @@ - Carthage 0.38.0 - CocoaPods 1.10.2 - Composer 2.1.5 -- Homebrew 3.2.5 +- Homebrew 3.2.6 - Miniconda 4.10.3 - NPM 3.10.10 - NuGet 4.7.0.5148 - Pip 20.3.4 (python 2.7) - Pip 21.1.3 (python 3.9) -- Pipx 0.16.3 +- Pipx 0.16.4 - RubyGems 3.2.25 - Yarn 1.22.5 @@ -57,7 +57,7 @@ ### Project Management - Apache Ant(TM) 1.10.11 -- Apache Maven 3.8.1 +- Apache Maven 3.8.2 - Gradle 7.1.1 ### Utilities @@ -70,7 +70,7 @@ - Curl 7.78.0 - Git LFS: 2.13.3 - Git: 2.32.0 -- GitHub CLI: 1.13.1 +- GitHub CLI: 1.14.0 - GNU parallel 20210622 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.1 @@ -78,12 +78,12 @@ - helm v3.6.3+gd506314 - Hub CLI: 2.14.2 - jq 1.6 -- mongo v5.0.1 -- mongod v5.0.1 +- mongo v5.0.2 +- mongod v5.0.2 - OpenSSL 1.1.1k 25 Mar 2021 `(/usr/local/opt/openssl -> /usr/local/Cellar/openssl@1.1/1.1.1k)` - Packer 1.7.4 -- PostgreSQL 13.3 -- psql (PostgreSQL) 13.3 +- PostgreSQL 13.4 +- psql (PostgreSQL) 13.4 - Sox 14.4.2 - Subversion (SVN) 1.14.1 - Switchaudio-osx 1.1.0 @@ -93,18 +93,18 @@ ### Tools -- Aliyun CLI 3.0.82 +- Aliyun CLI 3.0.85 - App Center CLI 1.2.2 -- AWS CLI 2.2.25 +- AWS CLI 2.2.29 - AWS SAM CLI 1.27.2 - AWS Session Manager CLI 1.2.234.0 -- Azure CLI 2.26.1 -- Bicep CLI 0.4.451 +- Azure CLI 2.27.1 +- Bicep CLI 0.4.613 - Cabal 3.4.0.0 - Cmake 3.21.1 -- Fastlane 2.189.0 +- Fastlane 2.191.0 - GHC 9.0.1 -- GHCup v0.1.16.1 +- GHCup v0.1.16.2 - Stack 2.7.3 - SwiftFormat 0.48.11 - Swig 4.0.2 @@ -112,16 +112,16 @@ ### Linters - SwiftLint 0.43.1 -- yamllint 1.26.1 +- yamllint 1.26.2 ### Browsers - Safari 14.1.2 (14611.3.10.1.5) - SafariDriver 14.1.2 (14611.3.10.1.5) -- Google Chrome 92.0.4515.107 +- Google Chrome 92.0.4515.131 - ChromeDriver 92.0.4515.107 -- Microsoft Edge 92.0.902.62 -- MSEdgeDriver 92.0.902.62 -- Mozilla Firefox 90.0.2 +- Microsoft Edge 92.0.902.73 +- MSEdgeDriver 92.0.902.73 +- Mozilla Firefox 91.0 - geckodriver 0.29.1 #### Environment variables @@ -132,13 +132,13 @@ | GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | ### Java -| Version | Vendor | Environment Variable | -| -------------------- | ------------- | -------------------- | -| 8.0.292+10 (default) | Adopt OpenJDK | JAVA_HOME_8_X64 | -| 11.0.11+9 | Adopt OpenJDK | JAVA_HOME_11_X64 | -| 12.0.2+10.3 | Adopt OpenJDK | JAVA_HOME_12_X64 | -| 13.0.2+8.1 | Adopt OpenJDK | JAVA_HOME_13_X64 | -| 14.0.2+12 | Adopt OpenJDK | JAVA_HOME_14_X64 | +| Version | Vendor | Environment Variable | +| ------------------- | ------------- | -------------------- | +| 8.0.302+8 (default) | Adopt OpenJDK | JAVA_HOME_8_X64 | +| 11.0.12+7 | Adopt OpenJDK | JAVA_HOME_11_X64 | +| 12.0.2+10.3 | Adopt OpenJDK | JAVA_HOME_12_X64 | +| 13.0.2+8.1 | Adopt OpenJDK | JAVA_HOME_13_X64 | +| 14.0.2+12 | Adopt OpenJDK | JAVA_HOME_14_X64 | ### Cached Tools #### Ruby @@ -162,14 +162,14 @@ #### Node.js - 10.24.1 -- 12.22.4 -- 14.17.4 +- 12.22.5 +- 14.17.5 #### Go - 1.13.15 - 1.14.15 -- 1.15.14 -- 1.16.6 +- 1.15.15 +- 1.16.7 ### Rust Tools - Cargo 1.54.0 @@ -186,7 +186,7 @@ - Rustfmt 1.4.37-stable ### PowerShell Tools -- PowerShell 7.1.3 +- PowerShell 7.1.4 #### PowerShell Modules | Module | Version | From a98af57cf3cda5378b7a8d42e2e41073bd33493d Mon Sep 17 00:00:00 2001 From: Vladimir Safonkin Date: Tue, 17 Aug 2021 22:24:17 +0300 Subject: [PATCH 0458/3485] Request Akvelon team as reviewers for image update pull requests (#3915) --- .github/workflows/create_pull_request.yml | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/.github/workflows/create_pull_request.yml b/.github/workflows/create_pull_request.yml index cff80e9d61f5..f430613665c7 100644 --- a/.github/workflows/create_pull_request.yml +++ b/.github/workflows/create_pull_request.yml @@ -21,15 +21,29 @@ jobs: git push origin ${{ github.event.client_payload.ReleaseBranchName }}-docs - name: Create pull request for ${{ github.event.client_payload.ReleaseBranchName }} + id: create-pr uses: actions/github-script@v2 with: github-token: ${{secrets.GITHUB_TOKEN}} script: | - github.pulls.create({ + let response = await github.pulls.create({ owner: context.repo.owner, repo: context.repo.repo, title: "${{ github.event.client_payload.PullRequestTitle }}", head: "${{ github.event.client_payload.ReleaseBranchName }}-docs", base: "${{ github.event.client_payload.PullRequestBase }}", body: `${{ github.event.client_payload.PullRequestBody }}` - }); \ No newline at end of file + }); + return response.data.number + + - name: Request reviewers + uses: actions/github-script@v2 + with: + github-token: ${{secrets.GITHUB_TOKEN}} + script: | + github.pulls.requestReviewers({ + owner: context.repo.owner + repo: context.repo.repo + pull_number: ${{ steps.create-pr.outputs.result }} + team_reviewers: ['virtual-environments-akvelon'] + }) \ No newline at end of file From 9a9885aa73ecab063dca5035740f409f9cbca6d4 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Tue, 17 Aug 2021 22:45:20 +0300 Subject: [PATCH 0459/3485] Change the message as macos11 is GA in GH (#3912) --- README.md | 12 ++++++------ docs/macos-11-onboarding.md | 25 ------------------------- 2 files changed, 6 insertions(+), 31 deletions(-) delete mode 100644 docs/macos-11-onboarding.md diff --git a/README.md b/README.md index 6870746d67ad..5337a24c4393 100644 --- a/README.md +++ b/README.md @@ -21,13 +21,13 @@ Ubuntu 16.04 has been deprecated and will be removed on September 20, 2021. Its Existing workflows using `Ubuntu 16.04` should migrate to `Ubuntu 20.04` or `Ubuntu 18.04` ``` -> The macOS 11 virtual environment is currently in preview and is automatically available to the existing Enterprise plan customers who used macOS hosted runners at least once between May, 1 - June, 1. New Enterprise plan customers, or customers on other plans, should fill the form to request access to macOS 11 virtual environment. Please view our [Big Sur guide](./docs/macos-11-onboarding.md) for more details.
+> The macOS 11 virtual environment is currently available only on GitHub Actions. Azure DevOps users can track the macOS 11 onboarding progress in [this issue](https://github.com/actions/virtual-environments/issues/2072).
The `macos-latest` YAML workflow label still uses the macOS 10.15 virtual environment. ***What images are available for GitHub Actions and Azure DevOps?*** -The availability of images for GitHub Actions and Azure DevOps is different. See documentation for more details: -- [GitHub Actions](https://docs.github.com/en/free-pro-team@latest/actions/reference/specifications-for-github-hosted-runners#supported-runners-and-hardware-resources) -- [Azure DevOps](https://docs.microsoft.com/en-us/azure/devops/pipelines/agents/hosted?view=azure-devops&tabs=yaml#software) +The availability of images for GitHub Actions and Azure DevOps is different. See documentation for more details: +- [GitHub Actions](https://docs.github.com/en/free-pro-team@latest/actions/reference/specifications-for-github-hosted-runners#supported-runners-and-hardware-resources) +- [Azure DevOps](https://docs.microsoft.com/en-us/azure/devops/pipelines/agents/hosted?view=azure-devops&tabs=yaml#software) ***What image version is used in my build?*** Usually, image deployment takes 3-4 days, and documentation in the `main` branch is only updated when deployment is finished. To find out which image version and what software versions are used in a specific build, see `Set up job` (GitHub Actions) or `Initialize job` (Azure DevOps) step log. @@ -45,9 +45,9 @@ we pin the tool to specific version(s). *Following Along / Change Notifications* -* **High Impact Changes** (ex. breaking changes, new or deprecated environments) will be posted to the GitHub Changelog on our [blog](https://github.blog/changelog/) and on [twitter](https://twitter.com/GHchangelog). +* **High Impact Changes** (ex. breaking changes, new or deprecated environments) will be posted to the GitHub Changelog on our [blog](https://github.blog/changelog/) and on [twitter](https://twitter.com/GHchangelog). * **Low Impact Changes** will be pinned in this repository and marked with the [Announcement](https://github.com/actions/virtual-environments/labels/Announcement) label. -* **Regular Weekly Rhythm** can be followed by watching [Releases](https://github.com/actions/virtual-environments/releases). Pre-release is created when deployment is started. As soon as deployment is finished, it is converted to release. +* **Regular Weekly Rhythm** can be followed by watching [Releases](https://github.com/actions/virtual-environments/releases). Pre-release is created when deployment is started. As soon as deployment is finished, it is converted to release. You can also track upcoming changes using the [awaiting-deployment](https://github.com/actions/virtual-environments/labels/awaiting-deployment) label. [ubuntu-20.04]: https://github.com/actions/virtual-environments/blob/main/images/linux/Ubuntu2004-README.md diff --git a/docs/macos-11-onboarding.md b/docs/macos-11-onboarding.md deleted file mode 100644 index f4e11a81cf87..000000000000 --- a/docs/macos-11-onboarding.md +++ /dev/null @@ -1,25 +0,0 @@ -# macOS 11 (Big Sur) onboarding guide - -macOS 11 pools were opened to existing customers only, and we are working on making them ready for production use, rebalancing capacity, and analyzing possible load. - -Meanwhile, we'd like to start including customers to private preview on demand. - -> Big Sur will automatically become available to existing Enterprise customers. New enterprises and customers on other plans, please go through the sign up process described below. - -## Sign up process - -If you need to build and test your project with macOS 11, please, fill out the [form](https://forms.office.com/r/Pn0a7NqBXg). - -We will review the incoming requests periodically and open macOS 11 pool for some amount of them. These are the aspects we consider when processing requests: -- _Pool capacity_. New onboardings are only possible if current performance won't degrade for existing customers. -- _Billing plan_. New Enterprise or Teams customers will be given a priority in joining macOS 11. -- _Necessity of macOS 11_. We can currently afford to add only those projects that really depend on the latest macOS version and its features. - -## Usage - -macOS 11 image label was changed to `macos-11` to avoid confusion with the minor version. We always update images to the latest available OS version. Use the following code snippet to run your builds on macOS Big Sur: -``` -jobs: - build: - runs-on: macos-11 -``` From e9edf6552f22cb192475e33c4246036ab3f462fd Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Wed, 18 Aug 2021 11:57:22 +0300 Subject: [PATCH 0460/3485] Remove eval statement (#3920) --- images/linux/scripts/installers/homebrew.sh | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/images/linux/scripts/installers/homebrew.sh b/images/linux/scripts/installers/homebrew.sh index 5ff740aaa007..db3d1dacd29d 100644 --- a/images/linux/scripts/installers/homebrew.sh +++ b/images/linux/scripts/installers/homebrew.sh @@ -11,14 +11,13 @@ source $HELPER_SCRIPTS/install.sh # Install the Homebrew on Linux /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)" -eval $(/home/linuxbrew/.linuxbrew/bin/brew shellenv) +brew_shellenv="/home/linuxbrew/.linuxbrew/bin/brew shellenv" -# Update /etc/environemnt -## Put HOMEBREW_* variables -## The variable `HOMEBREW_SHELLENV_PREFIX` will be exported to avoid adding duplicate entries to the environment variables. -HOMEBREW_SHELLENV_PREFIX='' brew shellenv | grep 'export HOMEBREW'| sed -E 's/^export (.*);$/\1/' | sudo tee -a /etc/environment +# Update /etc/environment +## Put HOMEBREW_* variables. +$brew_shellenv | grep 'export HOMEBREW' | sed -E 's/^export (.*);$/\1/' | sudo tee -a /etc/environment # add brew executables locations to PATH -brew_path=$(HOMEBREW_SHELLENV_PREFIX='' brew shellenv | grep '^export PATH' | sed -E 's/^export PATH="([^$]+)\$.*/\1/') +brew_path=$($brew_shellenv | grep '^export PATH' | sed -E 's/^export PATH="([^$]+)\$.*/\1/') prependEtcEnvironmentPath "$brew_path" setEtcEnvironmentVariable HOMEBREW_NO_AUTO_UPDATE 1 setEtcEnvironmentVariable HOMEBREW_CLEANUP_PERIODIC_FULL_DAYS 3650 From 8f1e4ff32f32dd5d6ebc218e9aaba388f5a0c72f Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 18 Aug 2021 10:35:29 +0000 Subject: [PATCH 0461/3485] [Ubuntu] add aria2 to toolset (#3916) aria2 is already installed as part of https://github.com/actions/virtual-environments/blob/133db654885e1796cc158ab04f9217826294857a/images/linux/scripts/base/apt.sh#L29 This change will add aria2 to the list of apt packages in generated README --- images/linux/scripts/base/apt.sh | 4 ++-- images/linux/scripts/tests/Apt.Tests.ps1 | 5 +++++ images/linux/toolsets/toolset-1804.json | 1 + images/linux/toolsets/toolset-2004.json | 1 + 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/images/linux/scripts/base/apt.sh b/images/linux/scripts/base/apt.sh index da0ad4313792..c764b3b628f1 100644 --- a/images/linux/scripts/base/apt.sh +++ b/images/linux/scripts/base/apt.sh @@ -25,8 +25,8 @@ echo 'APT sources limited to the actual architectures' cat /etc/apt/sources.list apt-get update -# Install aria2 , jq -apt-get install aria2 jq +# Install jq +apt-get install jq # Install apt-fast using quick-install.sh # https://github.com/ilikenwf/apt-fast diff --git a/images/linux/scripts/tests/Apt.Tests.ps1 b/images/linux/scripts/tests/Apt.Tests.ps1 index e9e5ac6d31ed..c1b37e29aba0 100644 --- a/images/linux/scripts/tests/Apt.Tests.ps1 +++ b/images/linux/scripts/tests/Apt.Tests.ps1 @@ -14,6 +14,11 @@ Describe "Apt" { $toolName = "getfacl" } + if ($toolName -eq "aria2") + { + $toolName = "aria2c" + } + if ($toolName -eq "p7zip-full") { $toolName = "p7zip" diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index 597ebdd4de4b..fb135f0b4508 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -158,6 +158,7 @@ "zsync" ], "cmd_packages": [ + "aria2", "binutils", "bison", "brotli", diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index cf633b67255b..812d556a1783 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -158,6 +158,7 @@ ], "cmd_packages": [ "acl", + "aria2", "binutils", "bison", "brotli", From 9be0acc5ac594cf92b7f95d7971fdc4883f0ce7b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 19 Aug 2021 06:31:00 +0000 Subject: [PATCH 0462/3485] Updating readme file for macOS-10.15 version 20210814.1 (#3901) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/macos/macos-10.15-Readme.md | 44 +++++++++++++++--------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/images/macos/macos-10.15-Readme.md b/images/macos/macos-10.15-Readme.md index 96af9dd69107..ab3e0fb8550d 100644 --- a/images/macos/macos-10.15-Readme.md +++ b/images/macos/macos-10.15-Readme.md @@ -6,11 +6,11 @@ # macOS 10.15 info - System Version: macOS 10.15.7 (19H1323) - Kernel Version: Darwin 19.6.0 -- Image Version: 20210808.1 +- Image Version: 20210814.1 ## Installed Software ### Language and Runtime -- .NET SDK 2.1.300 2.1.301 2.1.302 2.1.401 2.1.402 2.1.403 2.1.500 2.1.502 2.1.503 2.1.504 2.1.505 2.1.506 2.1.507 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 2.1.811 2.1.812 2.1.813 2.1.814 2.1.815 2.1.816 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 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 3.1.408 3.1.409 3.1.410 3.1.411 5.0.100 5.0.101 5.0.102 5.0.200 5.0.201 5.0.202 5.0.300 5.0.301 5.0.302 +- .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 2.1.811 2.1.812 2.1.813 2.1.814 2.1.815 2.1.816 2.1.817 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 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 3.1.408 3.1.409 3.1.410 3.1.411 3.1.412 5.0.100 5.0.101 5.0.102 5.0.200 5.0.201 5.0.202 5.0.300 5.0.301 5.0.302 5.0.400 - Bash 3.2.57(1)-release - Clang/LLVM 12.0.0 is default - Clang/LLVM 12.0.1 is available on `'$(brew --prefix llvm)/bin/clang'` @@ -24,14 +24,14 @@ - julia 1.6.2 - kotlin 1.5.21-release-314 - MSBuild 16.6.0.15801 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) -- Node.js v14.17.4 +- Node.js v14.17.5 - NVM 0.38.0 -- NVM - Cached node versions: v10.24.1 v12.22.4 v14.17.4 +- NVM - Cached node versions: v10.24.1 v12.22.5 v14.17.5 - Perl 5.34.0 - PHP 8.0.9 - Python 2.7.18 - Python 3.9.6 -- R 4.1.0 +- R 4.1.1 - Ruby 2.7.4p191 ### Package Management @@ -47,7 +47,7 @@ - Pip 21.1.3 (python 3.9) - Pipx 0.16.4 - RubyGems 3.2.25 -- Vcpkg 2021 (build from master \<57bd710>) +- Vcpkg 2021 (build from master \<6bc4362>) - Yarn 1.22.5 #### Environment variables @@ -58,7 +58,7 @@ ### Project Management - Apache Ant(TM) 1.10.11 -- Apache Maven 3.8.1 +- Apache Maven 3.8.2 - Gradle 7.1.1 ### Utilities @@ -79,13 +79,13 @@ - helm v3.6.3+gd506314 - Hub CLI: 2.14.2 - jq 1.6 -- mongo v5.0.1 -- mongod v5.0.1 +- mongo v5.0.2 +- mongod v5.0.2 - Newman 5.2.4 - OpenSSL 1.1.1k 25 Mar 2021 `(/usr/local/opt/openssl -> /usr/local/Cellar/openssl@1.1/1.1.1k)` - Packer 1.7.4 -- PostgreSQL 13.3 -- psql (PostgreSQL) 13.3 +- PostgreSQL 13.4 +- psql (PostgreSQL) 13.4 - Sox 14.4.2 - Subversion (SVN) 1.14.1 - Switchaudio-osx 1.1.0 @@ -97,16 +97,16 @@ ### Tools - Aliyun CLI 3.0.85 - App Center CLI 2.10.0 -- AWS CLI 2.2.27 +- AWS CLI 2.2.29 - AWS SAM CLI 1.27.2 - AWS Session Manager CLI 1.2.234.0 -- Azure CLI 2.27.0 -- Bicep CLI 0.4.451 +- Azure CLI 2.27.1 +- Bicep CLI 0.4.613 - Cabal 3.4.0.0 - Cmake 3.21.1 - Fastlane 2.191.0 - GHC 9.0.1 -- GHCup v0.1.16.1 +- GHCup v0.1.16.2 - Stack 2.7.3 - SwiftFormat 0.48.11 - Swig 4.0.2 @@ -121,9 +121,9 @@ - SafariDriver 14.1.2 (15611.3.10.1.5) - Google Chrome 92.0.4515.131 - ChromeDriver 92.0.4515.107 -- Microsoft Edge 92.0.902.67 -- MSEdgeDriver 92.0.902.67 -- Mozilla Firefox 90.0.2 +- Microsoft Edge 92.0.902.73 +- MSEdgeDriver 92.0.902.73 +- Mozilla Firefox 91.0 - geckodriver 0.29.1 #### Environment variables @@ -165,8 +165,8 @@ #### Node.js - 10.24.1 -- 12.22.4 -- 14.17.4 +- 12.22.5 +- 14.17.5 #### Go - 1.13.15 @@ -189,7 +189,7 @@ - Rustfmt 1.4.37-stable ### PowerShell Tools -- PowerShell 7.1.3 +- PowerShell 7.1.4 #### PowerShell Modules | Module | Version | @@ -207,7 +207,7 @@ ### Xamarin #### Visual Studio for Mac -- 8.10.6.10 +- 8.10.7.17 #### Xamarin bundles | symlink | Xamarin.Mono | Xamarin.iOS | Xamarin.Mac | Xamarin.Android | From 355c60bf7de9e90745591160ad30c644ae1a4604 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 19 Aug 2021 08:08:26 +0000 Subject: [PATCH 0463/3485] Updating readme file for ubuntu18 version 20210816.1 (#3899) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/linux/Ubuntu1804-README.md | 48 +++++++++++++++---------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/images/linux/Ubuntu1804-README.md b/images/linux/Ubuntu1804-README.md index df6cd7fb7bff..68a39d444569 100644 --- a/images/linux/Ubuntu1804-README.md +++ b/images/linux/Ubuntu1804-README.md @@ -4,7 +4,7 @@ *** # Ubuntu 18.04.5 LTS - Linux kernel version: 5.4.0-1055-azure -- Image Version: 20210810.1 +- Image Version: 20210816.1 ## Installed Software ### Language and Runtime @@ -19,7 +19,7 @@ - Kotlin 1.5.21-release-314 - Mono 6.12.0.122 (apt source repository: https://download.mono-project.com/repo/ubuntu stable-bionic main) - MSBuild 16.6.0.15201 (from /usr/lib/mono/msbuild/15.0/bin/MSBuild.dll) -- Node 14.17.4 +- Node 14.17.5 - Perl 5.26.1 - Python 2.7.17 - Python3 3.6.9 @@ -36,7 +36,7 @@ - Pip3 9.0.1 - Pipx 0.16.4 - RubyGems 2.7.6 -- Vcpkg (build from master \) +- Vcpkg (build from master \<6bc4362>) - Yarn 1.22.11 #### Environment variables @@ -57,7 +57,7 @@ - AzCopy 10.11.0 (available by `azcopy` and `azcopy10` aliases) - Bazel 4.1.0 - Bazelisk 1.10.1 -- Bicep 0.4.451 +- Bicep 0.4.613 - Buildah 1.19.6 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - CMake 3.21.1 - CodeQL Action Bundle 2.5.9 @@ -70,7 +70,7 @@ - Git-ftp 1.3.1 - Haveged 1.9.1 - Heroku 7.56.1 -- HHVM (HipHop VM) 4.121.0 +- HHVM (HipHop VM) 4.122.0 - jq 1.5 - Kind 0.11.1 - Kubectl 1.22.0 @@ -85,8 +85,8 @@ - Packer 1.7.4 - PhantomJS 2.1.1 - Podman 3.0.1 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- Pulumi 3.9.1 -- R 4.1.0 +- Pulumi 3.10.1 +- R 4.1.1 - Skopeo 1.2.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 - SVN 1.9.7 @@ -97,15 +97,15 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.85 -- AWS CLI 1.20.17 +- AWS CLI 1.20.21 - AWS CLI Session manager plugin 1.2.234.0 - AWS SAM CLI 1.27.2 -- Azure CLI (azure-cli) 2.27.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) +- Azure CLI (azure-cli) 2.27.1 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.20.0 - GitHub CLI 1.14.0 -- Google Cloud SDK 351.0.0 (apt source repository: https://packages.cloud.google.com/apt) +- Google Cloud SDK 352.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 6.0.9 +- Netlify CLI 6.3.5 - OpenShift CLI 4.8.4 - ORAS CLI 0.12.0 - Vercel CLI 23.1.2 @@ -129,7 +129,7 @@ ### Haskell - Cabal 3.4.0.0 - GHC 9.0.1 (apt source repository: ppa:hvr/ghc) -- GHCup 0.1.16.1 +- GHCup 0.1.16.2 - Stack 2.7.3 ### Rust Tools @@ -149,7 +149,7 @@ ### Browsers and Drivers - Google Chrome 92.0.4515.131 - ChromeDriver 92.0.4515.107 -- Mozilla Firefox 90.0.2 +- Mozilla Firefox 91.0 - Geckodriver 0.29.1 - Chromium 92.0.4515.0 @@ -160,11 +160,11 @@ | GECKOWEBDRIVER | /usr/local/share/gecko_driver | ### .NET Core SDK -- 2.1.302 2.1.403 2.1.524 2.1.617 2.1.701 2.1.816 3.1.117 3.1.202 3.1.302 3.1.411 5.0.104 5.0.205 5.0.302 +- 2.1.302 2.1.403 2.1.525 2.1.617 2.1.701 2.1.817 3.1.118 3.1.202 3.1.302 3.1.412 5.0.104 5.0.206 5.0.302 5.0.303 5.0.400 ### Databases - MongoDB 5.0.2 (apt source repository: https://repo.mongodb.org/apt/ubuntu) -- Postgre SQL 13.3 (apt source repository: https://apt.postgresql.org/pub/repos/apt/) +- Postgre SQL 13.4 (apt source repository: https://apt.postgresql.org/pub/repos/apt/) - sqlite3 3.22.0 #### MySQL @@ -186,8 +186,8 @@ #### Node.js - 10.24.1 -- 12.22.4 -- 14.17.4 +- 12.22.5 +- 14.17.5 #### PyPy - 2.7.18 [PyPy 7.3.5] @@ -216,7 +216,7 @@ | GOROOT_1_15_X64 | /opt/hostedtoolcache/go/1.15.15/x64 | x64 | ### PowerShell Tools -- PowerShell 7.1.3 +- PowerShell 7.1.4 #### PowerShell Modules | Module | Version | @@ -270,10 +270,10 @@ | debian:9 | sha256:06f9296409de8cfecaff43aaee6d608ed48a95c0cac0da2a418ff526acedf67b | 2021-07-22 | | node:10 | sha256:59531d2835edd5161c8f9512f9e095b1836f7a1fcb0ab73e005ec46047384911 | 2021-04-10 | | node:10-alpine | sha256:dc98dac24efd4254f75976c40bce46944697a110d06ce7fa47e7268470cf2e28 | 2021-04-14 | -| node:12 | sha256:4095975f2cc22e310e09dd00274a47d18f6a336a6a230e7f6dced8856184ff77 | 2021-07-30 | -| node:12-alpine | sha256:78be4f61c7a0f00cc9da47e3ba2f1bacf9ba85410e8ad2e7de16e1fc4be1b962 | 2021-07-30 | -| node:14 | sha256:cd98882c1093f758d09cf6821dc8f96b241073b38e8ed294ca1f9e484743858f | 2021-07-30 | -| node:14-alpine | sha256:0c80f9449d2690eef49aad35eeb42ed9f9bbe2742cd4e9766a7be3a1aae2a310 | 2021-07-30 | +| node:12 | sha256:38dac2d5f70a91c9c68fe284a729cc49e444dad0a7e5388bcaf5c70f645c17e7 | 2021-08-12 | +| node:12-alpine | sha256:372e5cc17da5baedf302643c3bb54283dac990942fc816d9f7c12565e89c3265 | 2021-08-12 | +| node:14 | sha256:adbbb61dab70ea6e5a6c2ad7fba60e4d1047ba98ad1afcd631c15553163b22b7 | 2021-08-12 | +| node:14-alpine | sha256:b8d48b515e3049d4b7e9ced6cedbe223c3bc4a3d0fd02332448f3cdb000faee1 | 2021-08-12 | | ubuntu:16.04 | sha256:6a3ac136b6ca623d6a6fa20a7622f098b2fae1ac05f0114386ef439d8ca89a4a | 2021-07-26 | | ubuntu:18.04 | sha256:7bd7a9ca99f868bf69c4b6212f64f2af8e243f97ba13abb3e641e03a7ceb59e8 | 2021-07-26 | | ubuntu:20.04 | sha256:82becede498899ec668628e7cb0ad87b6e1c371cb8a1e597d83a47fac21d6af3 | 2021-07-26 | @@ -322,7 +322,7 @@ | mediainfo | 17.12-1 | | net-tools | 1.60+git20161116.90da8a0-1ubuntu1 | | netcat | 1.10-41.1 | -| openssh-client | 1:7.6p1-4ubuntu0.3 | +| openssh-client | 1:7.6p1-4ubuntu0.5 | | p7zip-full | 16.02+dfsg-6 | | p7zip-rar | 16.02-2 | | parallel | 20161222-1 | @@ -336,7 +336,7 @@ | shellcheck | 0.4.6-1 | | sphinxsearch | 2.2.11-2 | | sqlite3 | 3.22.0-1ubuntu0.4 | -| ssh | 1:7.6p1-4ubuntu0.3 | +| ssh | 1:7.6p1-4ubuntu0.5 | | sshpass | 1.06-1 | | subversion | 1.9.7-4ubuntu1 | | sudo | 1.8.21p2-3ubuntu1.4 | From ca34695b7a4c2a36403e4738145c681c739fc075 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 19 Aug 2021 08:34:04 +0000 Subject: [PATCH 0464/3485] Updating readme file for ubuntu20 version 20210816.1 (#3898) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/linux/Ubuntu2004-README.md | 50 +++++++++++++++---------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/images/linux/Ubuntu2004-README.md b/images/linux/Ubuntu2004-README.md index 57d4ac0993e4..b79e7dd317eb 100644 --- a/images/linux/Ubuntu2004-README.md +++ b/images/linux/Ubuntu2004-README.md @@ -4,7 +4,7 @@ *** # Ubuntu 20.04.2 LTS - Linux kernel version: 5.8.0-1039-azure -- Image Version: 20210810.1 +- Image Version: 20210816.1 ## Installed Software ### Language and Runtime @@ -19,7 +19,7 @@ - Kotlin 1.5.21-release-314 - Mono 6.12.0.122 (apt source repository: https://download.mono-project.com/repo/ubuntu stable-focal main) - MSBuild 16.6.0.15201 (from /usr/lib/mono/msbuild/15.0/bin/MSBuild.dll) -- Node 14.17.4 +- Node 14.17.5 - Perl 5.30.0 - Python 3.8.10 - Python3 3.8.10 @@ -36,7 +36,7 @@ - Pip3 20.0.2 - Pipx 0.16.4 - RubyGems 3.1.2 -- Vcpkg (build from master \) +- Vcpkg (build from master \<6bc4362>) - Yarn 1.22.11 #### Environment variables @@ -58,7 +58,7 @@ - AzCopy 10.11.0 (available by `azcopy` and `azcopy10` aliases) - Bazel 4.1.0 - Bazelisk 1.10.1 -- Bicep 0.4.451 +- Bicep 0.4.613 - Buildah 1.21.3 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - CMake 3.21.1 - CodeQL Action Bundle 2.5.9 @@ -72,7 +72,7 @@ - Git-ftp 1.6.0 - Haveged 1.9.1 - Heroku 7.56.1 -- HHVM (HipHop VM) 4.121.0 +- HHVM (HipHop VM) 4.122.0 - jq 1.6 - Kind 0.11.1 - Kubectl 1.22.0 @@ -87,8 +87,8 @@ - Packer 1.7.4 - PhantomJS 2.1.1 - Podman 3.2.3 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- Pulumi 3.9.1 -- R 4.1.0 +- Pulumi 3.10.1 +- R 4.1.1 - Skopeo 1.3.0 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 @@ -99,16 +99,16 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.85 -- AWS CLI 2.2.27 +- AWS CLI 2.2.29 - AWS CLI Session manager plugin 1.2.234.0 - AWS SAM CLI 1.27.2 -- Azure CLI (azure-cli) 2.27.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) +- Azure CLI (azure-cli) 2.27.1 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.20.0 - GitHub CLI 1.14.0 -- Google Cloud SDK 351.0.0 (apt source repository: https://packages.cloud.google.com/apt) +- Google Cloud SDK 352.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 6.0.9 -- OpenShift CLI 4.8.3 +- Netlify CLI 6.3.5 +- OpenShift CLI 4.8.4 - ORAS CLI 0.12.0 - Vercel CLI 23.1.2 @@ -135,7 +135,7 @@ ### Haskell - Cabal 3.4.0.0 - GHC 9.0.1 (apt source repository: ppa:hvr/ghc) -- GHCup 0.1.16.1 +- GHCup 0.1.16.2 - Stack 2.7.3 ### Rust Tools @@ -155,7 +155,7 @@ ### Browsers and Drivers - Google Chrome 92.0.4515.131 - ChromeDriver 92.0.4515.107 -- Mozilla Firefox 90.0.2 +- Mozilla Firefox 91.0 - Geckodriver 0.29.1 - Chromium 92.0.4515.0 @@ -166,11 +166,11 @@ | GECKOWEBDRIVER | /usr/local/share/gecko_driver | ### .NET Core SDK -- 2.1.302 2.1.403 2.1.524 2.1.617 2.1.701 2.1.816 3.1.117 3.1.202 3.1.302 3.1.411 5.0.104 5.0.205 5.0.302 +- 2.1.302 2.1.403 2.1.525 2.1.617 2.1.701 2.1.817 3.1.118 3.1.202 3.1.302 3.1.412 5.0.104 5.0.206 5.0.303 5.0.400 ### Databases - MongoDB 5.0.2 (apt source repository: https://repo.mongodb.org/apt/ubuntu) -- Postgre SQL 13.3 (apt source repository: https://apt.postgresql.org/pub/repos/apt/) +- Postgre SQL 13.4 (apt source repository: https://apt.postgresql.org/pub/repos/apt/) - sqlite3 3.31.1 #### MySQL @@ -192,8 +192,8 @@ #### Node.js - 10.24.1 -- 12.22.4 -- 14.17.4 +- 12.22.5 +- 14.17.5 #### PyPy - 2.7.18 [PyPy 7.3.5] @@ -222,7 +222,7 @@ | GOROOT_1_16_X64 | /opt/hostedtoolcache/go/1.16.7/x64 | x64 | ### PowerShell Tools -- PowerShell 7.1.3 +- PowerShell 7.1.4 #### PowerShell Modules | Module | Version | @@ -278,10 +278,10 @@ | debian:9 | sha256:06f9296409de8cfecaff43aaee6d608ed48a95c0cac0da2a418ff526acedf67b | 2021-07-22 | | node:10 | sha256:59531d2835edd5161c8f9512f9e095b1836f7a1fcb0ab73e005ec46047384911 | 2021-04-10 | | node:10-alpine | sha256:dc98dac24efd4254f75976c40bce46944697a110d06ce7fa47e7268470cf2e28 | 2021-04-14 | -| node:12 | sha256:4095975f2cc22e310e09dd00274a47d18f6a336a6a230e7f6dced8856184ff77 | 2021-07-30 | -| node:12-alpine | sha256:78be4f61c7a0f00cc9da47e3ba2f1bacf9ba85410e8ad2e7de16e1fc4be1b962 | 2021-07-30 | -| node:14 | sha256:cd98882c1093f758d09cf6821dc8f96b241073b38e8ed294ca1f9e484743858f | 2021-07-30 | -| node:14-alpine | sha256:0c80f9449d2690eef49aad35eeb42ed9f9bbe2742cd4e9766a7be3a1aae2a310 | 2021-07-30 | +| node:12 | sha256:38dac2d5f70a91c9c68fe284a729cc49e444dad0a7e5388bcaf5c70f645c17e7 | 2021-08-12 | +| node:12-alpine | sha256:372e5cc17da5baedf302643c3bb54283dac990942fc816d9f7c12565e89c3265 | 2021-08-12 | +| node:14 | sha256:adbbb61dab70ea6e5a6c2ad7fba60e4d1047ba98ad1afcd631c15553163b22b7 | 2021-08-12 | +| node:14-alpine | sha256:b8d48b515e3049d4b7e9ced6cedbe223c3bc4a3d0fd02332448f3cdb000faee1 | 2021-08-12 | | ubuntu:16.04 | sha256:6a3ac136b6ca623d6a6fa20a7622f098b2fae1ac05f0114386ef439d8ca89a4a | 2021-07-26 | | ubuntu:18.04 | sha256:7bd7a9ca99f868bf69c4b6212f64f2af8e243f97ba13abb3e641e03a7ceb59e8 | 2021-07-26 | | ubuntu:20.04 | sha256:82becede498899ec668628e7cb0ad87b6e1c371cb8a1e597d83a47fac21d6af3 | 2021-07-26 | @@ -332,7 +332,7 @@ | mediainfo | 19.09-1build1 | | net-tools | 1.60+git20180626.aebd88e-1ubuntu1 | | netcat | 1.206-1ubuntu1 | -| openssh-client | 1:8.2p1-4ubuntu0.2 | +| openssh-client | 1:8.2p1-4ubuntu0.3 | | p7zip-full | 16.02+dfsg-7build1 | | p7zip-rar | 16.02-3build1 | | parallel | 20161222-1.1 | @@ -346,7 +346,7 @@ | shellcheck | 0.7.0-2build2 | | sphinxsearch | 2.2.11-2ubuntu2 | | sqlite3 | 3.31.1-4ubuntu0.2 | -| ssh | 1:8.2p1-4ubuntu0.2 | +| ssh | 1:8.2p1-4ubuntu0.3 | | sshpass | 1.06-1 | | subversion | 1.13.0-3 | | sudo | 1.8.31-1ubuntu1.2 | From ea517278522c5e88693c4d5b3c366ad2269b8f55 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Thu, 19 Aug 2021 13:21:44 +0300 Subject: [PATCH 0465/3485] doc: rename kotlin to Kotlin (#3932) --- images/macos/software-report/SoftwareReport.Common.psm1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/macos/software-report/SoftwareReport.Common.psm1 b/images/macos/software-report/SoftwareReport.Common.psm1 index a1a785173543..240efc0cf9aa 100644 --- a/images/macos/software-report/SoftwareReport.Common.psm1 +++ b/images/macos/software-report/SoftwareReport.Common.psm1 @@ -509,7 +509,7 @@ function Get-BicepVersion { function Get-KotlinVersion { $kotlinVersion = Run-Command "kotlin -version" | Take-Part -Part 2 - return "kotlin $kotlinVersion" + return "Kotlin $kotlinVersion" } function Build-PackageManagementEnvironmentTable { From 3c63be16f66fdf8996f6063b1bf89a6f7fcdef89 Mon Sep 17 00:00:00 2001 From: Pavlo Golub Date: Thu, 19 Aug 2021 12:54:18 +0200 Subject: [PATCH 0466/3485] PostgreSQL not Postgre SQL (#3931) https://wiki.postgresql.org/wiki/Postgres --- .../scripts/SoftwareReport/SoftwareReport.Databases.psm1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Databases.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Databases.psm1 index 8bcb840e0486..bee22b0ac67f 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Databases.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Databases.psm1 @@ -1,7 +1,7 @@ function Get-PostgreSqlVersion { $postgreSQLVersion = psql --version | Take-OutputPart -Part 2 $aptSourceRepo = Get-AptSourceRepository -PackageName "postgresql" - return "Postgre SQL $postgreSQLVersion (apt source repository: $aptSourceRepo)" + return "PostgreSQL $postgreSQLVersion (apt source repository: $aptSourceRepo)" } function Get-MongoDbVersion { @@ -55,4 +55,4 @@ function Build-MSSQLToolsSection { ) return $output -} \ No newline at end of file +} From 385bbfb9aafed88d1b7fb44a8dcee37a04c24522 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 19 Aug 2021 13:19:59 +0000 Subject: [PATCH 0467/3485] Updating readme file for win16 version 20210815.1 (#3907) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/win/Windows2016-Readme.md | 66 ++++++++++++++++---------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/images/win/Windows2016-Readme.md b/images/win/Windows2016-Readme.md index ea74f9908e14..271f9fd01311 100644 --- a/images/win/Windows2016-Readme.md +++ b/images/win/Windows2016-Readme.md @@ -3,8 +3,8 @@ | [[macOS, Windows] .NET SDK pre-installation policy will be changed on September, 6](https://github.com/actions/virtual-environments/issues/3809) | *** # Microsoft Windows Server 2016 Datacenter -- OS Version: 10.0.14393 Build 4530 -- Image Version: 20210810.1 +- OS Version: 10.0.14393 Build 4583 +- Image Version: 20210815.1 ## Installed Software ### Language and Runtime @@ -12,7 +12,7 @@ - Go 1.15.15 - Julia 1.6.2 - Kotlin 1.5.20 -- Node 14.17.4 +- Node 14.17.5 - Perl 5.32.1 - PHP 8.0.9 - Python 3.7.9 @@ -24,11 +24,11 @@ - Helm 3.6.3 - Miniconda 4.10.3 (pre-installed on the image but not added to PATH) - NPM 6.14.14 -- NuGet 5.10.0.7240 -- pip 21.2.3 (python 3.7) +- NuGet 5.11.0.10 +- pip 21.2.4 (python 3.7) - Pipx 0.16.4 - RubyGems 2.7.6.3 -- Vcpkg (build from master \) +- Vcpkg (build from master \<6bc4362>) - Yarn 1.22.11 #### Environment variables @@ -49,7 +49,7 @@ - azcopy 10.11.0 - Bazel 4.1.0 - Bazelisk 1.10.1 -- Bicep 0.4.451 +- Bicep 0.4.613 - Cabal 3.4.0.0 - CMake 3.21.1 - CodeQL Action Bundle 2.5.9 @@ -58,7 +58,7 @@ - ghc 9.0.1 - Git 2.32.0 - Git LFS 2.13.3 -- Google Cloud SDK 351.0.0 +- Google Cloud SDK 352.0.0 - GVFS 1.0.21085.9 - InnoSetup 6.2.0 - jq 1.6 @@ -70,8 +70,8 @@ - NSIS v3.06.1 - OpenSSL 1.1.1 - Packer 1.7.4 -- Pulumi v3.9.1 -- R 4.1.0 +- Pulumi v3.10.1 +- R 4.1.1 - Stack 2.7.3 - Subversion (SVN) 1.14.1 - Swig 4.0.2 @@ -82,10 +82,10 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.85 -- AWS CLI 2.2.27 +- AWS CLI 2.2.29 - AWS SAM CLI 1.27.2 - AWS Session Manager CLI 1.2.234.0 -- Azure CLI 2.27.0 +- Azure CLI 2.27.1 - Azure DevOps CLI extension 0.20.0 - Cloud Foundry CLI 6.53.0 - GitHub CLI 1.14.0 @@ -108,9 +108,9 @@ ### Browsers and webdrivers - Google Chrome 92.0.4515.131 - Chrome Driver 92.0.4515.107 -- Microsoft Edge 92.0.902.67 -- Microsoft Edge Driver 92.0.902.67 -- Mozilla Firefox 90.0.2 +- Microsoft Edge 92.0.902.73 +- Microsoft Edge Driver 92.0.902.73 +- Mozilla Firefox 91.0 - Gecko Driver 0.29.1 - IE Driver 3.150.1.1 @@ -156,8 +156,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Version | Architecture | | ------- | ------------ | | 10.24.1 | x64 | -| 12.22.4 | x64 | -| 14.17.4 | x64 | +| 12.22.5 | x64 | +| 14.17.5 | x64 | #### Python @@ -212,7 +212,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Database tools -- Azure CosmosDb Emulator 2.14.1.0 +- Azure CosmosDb Emulator 2.14.2.0 - DacFx 15.0.5164.1 - MySQL 5.7.21.0 - SQLPS 1.0 @@ -227,7 +227,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Visual Studio Enterprise 2017 | Name | Version | Path | | ----------------------------- | --------------- | -------------------------------------------------------------- | -| Visual Studio Enterprise 2017 | 15.9.28307.1585 | C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise | +| Visual Studio Enterprise 2017 | 15.9.28307.1622 | C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise | #### Workloads, components and extensions: @@ -489,27 +489,27 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft Visual C++ 2013 Minimum Runtime | x86 | 12.0.21005 | | Microsoft Visual C++ 2017 Debug Runtime | x64 | 14.16.27033 | | Microsoft Visual C++ 2017 Debug Runtime | x86 | 14.16.27033 | -| Microsoft Visual C++ 2019 Additional Runtime | x64 | 14.29.30040 | -| Microsoft Visual C++ 2019 Minimum Runtime | x64 | 14.29.30040 | -| Microsoft Visual C++ 2019 Additional Runtime | x86 | 14.29.30040 | -| Microsoft Visual C++ 2019 Minimum Runtime | x86 | 14.29.30040 | +| Microsoft Visual C++ 2019 Additional Runtime | x64 | 14.29.30133 | +| Microsoft Visual C++ 2019 Minimum Runtime | x64 | 14.29.30133 | +| Microsoft Visual C++ 2019 Additional Runtime | x86 | 14.29.30133 | +| Microsoft Visual C++ 2019 Minimum Runtime | x86 | 14.29.30133 | ### .NET Core SDK `Location C:\Program Files\dotnet\sdk` -- 1.1.14 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.519 2.1.520 2.1.521 2.1.522 2.1.523 2.1.524 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.616 2.1.617 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 2.1.811 2.1.812 2.1.813 2.1.814 2.1.815 2.1.816 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.109 3.1.110 3.1.111 3.1.112 3.1.113 3.1.114 3.1.115 3.1.116 3.1.117 3.1.200 3.1.201 3.1.202 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 3.1.408 3.1.409 3.1.410 3.1.411 5.0.100 5.0.101 5.0.102 5.0.103 5.0.104 5.0.200 5.0.201 5.0.202 5.0.203 5.0.204 5.0.205 5.0.300 5.0.301 5.0.302 +- 1.1.14 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.519 2.1.520 2.1.521 2.1.522 2.1.523 2.1.524 2.1.525 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.616 2.1.617 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 2.1.811 2.1.812 2.1.813 2.1.814 2.1.815 2.1.816 2.1.817 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.109 3.1.110 3.1.111 3.1.112 3.1.113 3.1.114 3.1.115 3.1.116 3.1.117 3.1.118 3.1.200 3.1.201 3.1.202 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 3.1.408 3.1.409 3.1.410 3.1.411 3.1.412 5.0.100 5.0.101 5.0.102 5.0.103 5.0.104 5.0.200 5.0.201 5.0.202 5.0.203 5.0.204 5.0.205 5.0.206 5.0.300 5.0.301 5.0.302 5.0.303 5.0.400 ### .NET Core Runtime `Location: C:\Program Files\dotnet\shared\Microsoft.AspNetCore.All` -- 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23 2.1.24 2.1.25 2.1.26 2.1.27 2.1.28 +- 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23 2.1.24 2.1.25 2.1.26 2.1.27 2.1.28 2.1.29 `Location: C:\Program Files\dotnet\shared\Microsoft.AspNetCore.App` -- 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23 2.1.24 2.1.25 2.1.26 2.1.27 2.1.28 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9 3.1.10 3.1.11 3.1.12 3.1.13 3.1.14 3.1.15 3.1.16 3.1.17 5.0.0 5.0.1 5.0.2 5.0.3 5.0.4 5.0.5 5.0.6 5.0.7 5.0.8 +- 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23 2.1.24 2.1.25 2.1.26 2.1.27 2.1.28 2.1.29 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9 3.1.10 3.1.11 3.1.12 3.1.13 3.1.14 3.1.15 3.1.16 3.1.17 3.1.18 5.0.0 5.0.1 5.0.2 5.0.3 5.0.4 5.0.5 5.0.6 5.0.7 5.0.8 5.0.9 `Location: C:\Program Files\dotnet\shared\Microsoft.NETCore.App` -- 1.0.16 1.1.13 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23 2.1.24 2.1.25 2.1.26 2.1.27 2.1.28 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9 3.1.10 3.1.11 3.1.12 3.1.13 3.1.14 3.1.15 3.1.16 3.1.17 5.0.0 5.0.1 5.0.2 5.0.3 5.0.4 5.0.5 5.0.6 5.0.7 5.0.8 +- 1.0.16 1.1.13 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23 2.1.24 2.1.25 2.1.26 2.1.27 2.1.28 2.1.29 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9 3.1.10 3.1.11 3.1.12 3.1.13 3.1.14 3.1.15 3.1.16 3.1.17 3.1.18 5.0.0 5.0.1 5.0.2 5.0.3 5.0.4 5.0.5 5.0.6 5.0.7 5.0.8 5.0.9 `Location: C:\Program Files\dotnet\shared\Microsoft.WindowsDesktop.App` -- 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9 3.1.10 3.1.11 3.1.12 3.1.13 3.1.14 3.1.15 3.1.16 3.1.17 5.0.0 5.0.1 5.0.2 5.0.3 5.0.4 5.0.5 5.0.6 5.0.7 5.0.8 +- 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9 3.1.10 3.1.11 3.1.12 3.1.13 3.1.14 3.1.15 3.1.16 3.1.17 3.1.18 5.0.0 5.0.1 5.0.2 5.0.3 5.0.4 5.0.5 5.0.6 5.0.7 5.0.8 5.0.9 ### .NET Framework `Type: Developer Pack` @@ -517,7 +517,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 4.6.1 4.6.2 4.7 4.7.1 4.7.2 4.8 ### PowerShell Tools -- PowerShell 7.1.3 +- PowerShell 7.1.4 #### Azure Powershell Modules | Module | Version | Path | @@ -571,11 +571,11 @@ All other versions are saved but not installed. ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2016 | sha256:3910e75b2ee39515b598e107bdeb7fe83578aea0c1042c1b168070add760a0c3 | 2021-07-13 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2016 | sha256:1fdb72914bfdedf0b121b911d4d4d948d3e369d4dee36e39c135f967215b7092 | 2021-07-13 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2016 | sha256:65d94ee17565554801c4ba0a9b153ee90b6a25bcdb5395356d8f0c452c002203 | 2021-07-13 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2016 | sha256:1337170239cc81ea287e70fc5092e860183c7ebcbc34b01c84f5c65e98ccf89f | 2021-08-10 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2016 | sha256:e3788091ce9cb0e75c6a880d02fdb5057da8a922cefb9516d0e437a877501edb | 2021-08-10 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2016 | sha256:6a37ef7cd6367bf53c9f71f1b0221efb90d7f34f1d91b50ce7254e6b7de8007a | 2021-08-10 | | mcr.microsoft.com/windows/nanoserver:10.0.14393.953 | sha256:fc60bd5ae0e61b334ce1cf1bcbf20c10c36b4c5482a01da319c9c989f9e6e268 | 2017-03-08 | -| mcr.microsoft.com/windows/servercore:ltsc2016 | sha256:c6b1c3fecf651e7629f96874393476ba00cda2a1c2090314fdfe384267cd584f | 2021-07-09 | +| mcr.microsoft.com/windows/servercore:ltsc2016 | sha256:ac71e33f27c2a6b5db30be0419458e0c4e926214bc9c85afd4d6d6f9028d7233 | 2021-08-01 | From c706ecc11c769c4d115911da8bdde2e8fcd8b378 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 19 Aug 2021 13:29:49 +0000 Subject: [PATCH 0468/3485] Updating readme file for win19 version 20210815.1 (#3905) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/win/Windows2019-Readme.md | 112 +++++++++++++++---------------- 1 file changed, 56 insertions(+), 56 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index fbb337e9f070..93a5e1edb9fb 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -3,8 +3,8 @@ | [[macOS, Windows] .NET SDK pre-installation policy will be changed on September, 6](https://github.com/actions/virtual-environments/issues/3809) | *** # Microsoft Windows Server 2019 Datacenter -- OS Version: 10.0.17763 Build 2061 -- Image Version: 20210810.1 +- OS Version: 10.0.17763 Build 2114 +- Image Version: 20210815.1 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -15,7 +15,7 @@ - Go 1.15.15 - Julia 1.6.2 - Kotlin 1.5.20 -- Node 14.17.4 +- Node 14.17.5 - Perl 5.32.1 - PHP 8.0.9 - Python 3.7.9 @@ -27,11 +27,11 @@ - Helm 3.6.3 - Miniconda 4.10.3 (pre-installed on the image but not added to PATH) - NPM 6.14.14 -- NuGet 5.10.0.7240 -- pip 21.2.3 (python 3.7) +- NuGet 5.11.0.10 +- pip 21.2.4 (python 3.7) - Pipx 0.16.4 - RubyGems 2.7.6.3 -- Vcpkg (build from master \) +- Vcpkg (build from master \<6bc4362>) - Yarn 1.22.11 #### Environment variables @@ -52,7 +52,7 @@ - azcopy 10.11.0 - Bazel 4.1.0 - Bazelisk 1.10.1 -- Bicep 0.4.451 +- Bicep 0.4.613 - Cabal 3.4.0.0 - CMake 3.21.1 - CodeQL Action Bundle 2.5.9 @@ -61,7 +61,7 @@ - ghc 9.0.1 - Git 2.32.0 - Git LFS 2.13.3 -- Google Cloud SDK 351.0.0 +- Google Cloud SDK 352.0.0 - GVFS 1.0.21085.9 - InnoSetup 6.2.0 - jq 1.6 @@ -73,8 +73,8 @@ - NSIS v3.06.1 - OpenSSL 1.1.1 - Packer 1.7.4 -- Pulumi v3.9.1 -- R 4.1.0 +- Pulumi v3.10.1 +- R 4.1.1 - Stack 2.7.3 - Subversion (SVN) 1.14.1 - Swig 4.0.2 @@ -85,10 +85,10 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.85 -- AWS CLI 2.2.27 +- AWS CLI 2.2.29 - AWS SAM CLI 1.27.2 - AWS Session Manager CLI 1.2.234.0 -- Azure CLI 2.27.0 +- Azure CLI 2.27.1 - Azure DevOps CLI extension 0.20.0 - Cloud Foundry CLI 6.53.0 - GitHub CLI 1.14.0 @@ -111,9 +111,9 @@ ### Browsers and webdrivers - Google Chrome 92.0.4515.131 - Chrome Driver 92.0.4515.107 -- Microsoft Edge 92.0.902.67 -- Microsoft Edge Driver 92.0.902.67 -- Mozilla Firefox 90.0.2 +- Microsoft Edge 92.0.902.73 +- Microsoft Edge Driver 92.0.902.73 +- Mozilla Firefox 91.0 - Gecko Driver 0.29.1 - IE Driver 3.150.1.1 @@ -162,8 +162,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Version | Architecture | | ------- | ------------ | | 10.24.1 | x64 | -| 12.22.4 | x64 | -| 14.17.4 | x64 | +| 12.22.5 | x64 | +| 14.17.5 | x64 | #### Python @@ -218,7 +218,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Database tools -- Azure CosmosDb Emulator 2.14.1.0 +- Azure CosmosDb Emulator 2.14.2.0 - DacFx 15.0.5164.1 - MySQL 5.7.21.0 - SQLPS 1.0 @@ -233,13 +233,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.10.31515.178 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | +| Visual Studio Enterprise 2019 | 16.11.31605.320 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | #### Workloads, components and extensions: | Package | Version | | ------------------------------------------------------------------------- | --------------- | -| Component.Android.NDK.R16B | 16.10.31515.66 | +| Component.Android.NDK.R16B | 16.11.31603.221 | | Component.Android.SDK25.Private | 16.0.28625.61 | | Component.Android.SDK30 | 16.10.31205.252 | | Component.Ant | 1.9.3.8 | @@ -248,7 +248,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Component.MDD.Android | 16.0.28517.75 | | Component.MDD.Linux | 16.5.29515.121 | | Component.MDD.Linux.GCC.arm | 16.5.29515.121 | -| Component.Microsoft.VisualStudio.LiveShare | 1.0.4473 | +| Component.Microsoft.VisualStudio.LiveShare | 1.0.4438 | | Component.Microsoft.VisualStudio.RazorExtension | 16.10.31205.252 | | Component.Microsoft.VisualStudio.Tools.Applications | 16.0.31110.1 | | Component.Microsoft.VisualStudio.Web.AzureFunctions | 16.10.31205.252 | @@ -266,19 +266,19 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Component.Xamarin | 16.10.31205.252 | | Component.Xamarin.RemotedSimulator | 16.10.31205.252 | | Microsoft.Component.Azure.DataLake.Tools | 16.10.31205.252 | -| Microsoft.Component.ClickOnce | 16.4.29409.204 | +| Microsoft.Component.ClickOnce | 16.11.31603.221 | | Microsoft.Component.MSBuild | 16.5.29515.121 | | Microsoft.Component.NetFX.Native | 16.5.29515.121 | -| Microsoft.Component.PythonTools | 16.10.31313.127 | -| Microsoft.Component.PythonTools.Miniconda | 16.10.31313.127 | +| Microsoft.Component.PythonTools | 16.11.31314.313 | +| Microsoft.Component.PythonTools.Miniconda | 16.11.31314.313 | | Microsoft.Component.PythonTools.Web | 16.10.31205.252 | | Microsoft.Component.VC.Runtime.UCRTSDK | 16.0.28625.61 | | Microsoft.ComponentGroup.Blend | 16.0.28315.86 | -| Microsoft.ComponentGroup.ClickOnce.Publish | 16.10.31303.231 | +| Microsoft.ComponentGroup.ClickOnce.Publish | 16.11.31603.221 | | Microsoft.Net.Component.3.5.DeveloperTools | 16.0.28517.75 | -| Microsoft.Net.Component.4.5.1.TargetingPack | 16.0.28517.75 | +| Microsoft.Net.Component.4.5.1.TargetingPack | 16.11.31605.320 | | Microsoft.Net.Component.4.5.2.TargetingPack | 16.0.28517.75 | -| Microsoft.Net.Component.4.5.TargetingPack | 16.0.28517.75 | +| Microsoft.Net.Component.4.5.TargetingPack | 16.11.31605.320 | | Microsoft.Net.Component.4.6.1.TargetingPack | 16.0.28517.75 | | Microsoft.Net.Component.4.6.2.TargetingPack | 16.0.28517.75 | | Microsoft.Net.Component.4.6.TargetingPack | 16.0.28517.75 | @@ -287,16 +287,16 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.Net.Component.4.7.2.TargetingPack | 16.10.31205.252 | | Microsoft.Net.Component.4.7.TargetingPack | 16.10.31205.252 | | Microsoft.Net.Component.4.8.SDK | 16.4.29313.120 | -| Microsoft.Net.Component.4.TargetingPack | 16.0.28517.75 | +| Microsoft.Net.Component.4.TargetingPack | 16.11.31605.320 | | Microsoft.Net.ComponentGroup.4.6.2.DeveloperTools | 16.3.29207.166 | | Microsoft.Net.ComponentGroup.4.7.1.DeveloperTools | 16.3.29207.166 | | Microsoft.Net.ComponentGroup.4.7.DeveloperTools | 16.3.29207.166 | | Microsoft.Net.ComponentGroup.DevelopmentPrerequisites | 16.3.29207.166 | | Microsoft.Net.ComponentGroup.TargetingPacks.Common | 16.0.28516.191 | | Microsoft.NetCore.Component.DevelopmentTools | 16.10.31303.231 | -| Microsoft.NetCore.Component.Runtime.3.1 | 16.10.31515.66 | -| Microsoft.NetCore.Component.Runtime.5.0 | 16.10.31515.66 | -| Microsoft.NetCore.Component.SDK | 16.10.31515.66 | +| Microsoft.NetCore.Component.Runtime.3.1 | 16.11.31603.221 | +| Microsoft.NetCore.Component.Runtime.5.0 | 16.11.31603.221 | +| Microsoft.NetCore.Component.SDK | 16.11.31603.221 | | Microsoft.NetCore.Component.Web | 16.10.31303.231 | | Microsoft.VisualStudio.Component.AppInsights.Tools | 16.5.29515.121 | | Microsoft.VisualStudio.Component.AspNet45 | 16.10.31205.252 | @@ -331,10 +331,10 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Component.Graphics | 16.10.31205.252 | | Microsoft.VisualStudio.Component.Graphics.Tools | 16.0.28625.61 | | Microsoft.VisualStudio.Component.IISExpress | 16.0.28315.86 | -| Microsoft.VisualStudio.Component.IntelliCode | 16.10.31305.154 | +| Microsoft.VisualStudio.Component.IntelliCode | 16.11.31603.221 | | Microsoft.VisualStudio.Component.IntelliTrace.FrontEnd | 16.5.29515.121 | | Microsoft.VisualStudio.Component.JavaScript.Diagnostics | 16.0.28517.75 | -| Microsoft.VisualStudio.Component.JavaScript.TypeScript | 16.10.31303.231 | +| Microsoft.VisualStudio.Component.JavaScript.TypeScript | 16.11.31404.150 | | Microsoft.VisualStudio.Component.LinqToSql | 16.0.28625.61 | | Microsoft.VisualStudio.Component.LiveUnitTesting | 16.10.31205.252 | | Microsoft.VisualStudio.Component.ManagedDesktop.Core | 16.4.29318.151 | @@ -359,10 +359,10 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Component.TestTools.CodedUITest | 16.0.28327.66 | | Microsoft.VisualStudio.Component.TestTools.WebLoadTest | 16.0.28625.61 | | Microsoft.VisualStudio.Component.TextTemplating | 16.0.28625.61 | -| Microsoft.VisualStudio.Component.TypeScript.4.2 | 16.0.31303.231 | +| Microsoft.VisualStudio.Component.TypeScript.4.3 | 16.0.31506.151 | | Microsoft.VisualStudio.Component.Unity | 16.0.28315.86 | | Microsoft.VisualStudio.Component.UWP.VC.ARM64 | 16.3.29207.166 | -| Microsoft.VisualStudio.Component.VC.14.25.x86.x64 | 16.10.31205.252 | +| Microsoft.VisualStudio.Component.VC.14.25.x86.x64 | 16.11.31317.239 | | Microsoft.VisualStudio.Component.VC.140 | 16.10.31205.252 | | Microsoft.VisualStudio.Component.VC.ASAN | 16.10.31205.252 | | Microsoft.VisualStudio.Component.VC.ATL | 16.4.29313.120 | @@ -377,7 +377,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Component.VC.CMake.Project | 16.3.29103.31 | | Microsoft.VisualStudio.Component.VC.CoreIde | 16.10.31205.252 | | Microsoft.VisualStudio.Component.VC.DiagnosticTools | 16.5.29515.121 | -| Microsoft.VisualStudio.Component.VC.Llvm.Clang | 16.10.31205.252 | +| Microsoft.VisualStudio.Component.VC.Llvm.Clang | 16.11.31603.221 | | Microsoft.VisualStudio.Component.VC.Llvm.ClangToolset | 16.3.29207.166 | | Microsoft.VisualStudio.Component.VC.MFC.ARM | 16.4.29313.120 | | Microsoft.VisualStudio.Component.VC.MFC.ARM.Spectre | 16.5.29721.120 | @@ -392,7 +392,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Component.VC.TestAdapterForGoogleTest | 16.0.28517.75 | | Microsoft.VisualStudio.Component.VC.Tools.ARM | 16.10.31205.252 | | Microsoft.VisualStudio.Component.VC.Tools.ARM64 | 16.10.31205.252 | -| Microsoft.VisualStudio.Component.VC.Tools.x86.x64 | 16.10.31205.252 | +| Microsoft.VisualStudio.Component.VC.Tools.x86.x64 | 16.11.31317.239 | | Microsoft.VisualStudio.Component.VC.v141.ARM | 16.10.31205.252 | | Microsoft.VisualStudio.Component.VC.v141.ARM.Spectre | 16.5.29515.121 | | Microsoft.VisualStudio.Component.VC.v141.ARM64 | 16.10.31205.252 | @@ -426,7 +426,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.ComponentGroup.AzureFunctions | 16.10.31205.180 | | Microsoft.VisualStudio.ComponentGroup.MSIX.Packaging | 16.10.31205.180 | | Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core | 16.2.29012.281 | -| Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Llvm.Clang | 16.10.31205.180 | +| Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Llvm.Clang | 16.11.31603.221 | | Microsoft.VisualStudio.ComponentGroup.UWP.NetCoreAndStandard | 16.3.29102.218 | | Microsoft.VisualStudio.ComponentGroup.UWP.Support | 16.10.31205.180 | | Microsoft.VisualStudio.ComponentGroup.UWP.VC | 16.10.31205.180 | @@ -438,7 +438,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions | 16.10.31205.180 | | Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.CMake | 16.10.31205.180 | | Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.TemplateEngine | 16.10.31205.180 | -| Microsoft.VisualStudio.Workload.Azure | 16.10.31303.231 | +| Microsoft.VisualStudio.Workload.Azure | 16.11.31503.43 | | Microsoft.VisualStudio.Workload.CoreEditor | 16.10.31205.180 | | Microsoft.VisualStudio.Workload.Data | 16.0.28720.110 | | Microsoft.VisualStudio.Workload.DataScience | 16.10.31205.180 | @@ -478,29 +478,29 @@ 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.29.30040 | -| Microsoft Visual C++ 2019 Debug Runtime | x64 | 14.29.30040 | -| Microsoft Visual C++ 2019 Minimum Runtime | x64 | 14.29.30040 | -| Microsoft Visual C++ 2019 Additional Runtime | x86 | 14.29.30040 | -| Microsoft Visual C++ 2019 Debug Runtime | x86 | 14.29.30040 | -| Microsoft Visual C++ 2019 Minimum Runtime | x86 | 14.29.30040 | +| Microsoft Visual C++ 2019 Additional Runtime | x64 | 14.29.30133 | +| Microsoft Visual C++ 2019 Debug Runtime | x64 | 14.29.30133 | +| Microsoft Visual C++ 2019 Minimum Runtime | x64 | 14.29.30133 | +| Microsoft Visual C++ 2019 Additional Runtime | x86 | 14.29.30133 | +| Microsoft Visual C++ 2019 Debug Runtime | x86 | 14.29.30133 | +| Microsoft Visual C++ 2019 Minimum Runtime | x86 | 14.29.30133 | ### .NET Core SDK `Location C:\Program Files\dotnet\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.519 2.1.520 2.1.521 2.1.522 2.1.523 2.1.524 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.616 2.1.617 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 2.1.811 2.1.812 2.1.813 2.1.814 2.1.815 2.1.816 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.109 3.1.110 3.1.111 3.1.112 3.1.113 3.1.114 3.1.115 3.1.116 3.1.117 3.1.200 3.1.201 3.1.202 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 3.1.408 3.1.409 3.1.410 3.1.411 5.0.100 5.0.101 5.0.102 5.0.103 5.0.104 5.0.200 5.0.201 5.0.202 5.0.203 5.0.204 5.0.205 5.0.300 5.0.301 5.0.302 +- 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.519 2.1.520 2.1.521 2.1.522 2.1.523 2.1.524 2.1.525 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.616 2.1.617 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 2.1.811 2.1.812 2.1.813 2.1.814 2.1.815 2.1.816 2.1.817 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.109 3.1.110 3.1.111 3.1.112 3.1.113 3.1.114 3.1.115 3.1.116 3.1.117 3.1.118 3.1.200 3.1.201 3.1.202 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 3.1.408 3.1.409 3.1.410 3.1.411 3.1.412 5.0.100 5.0.101 5.0.102 5.0.103 5.0.104 5.0.200 5.0.201 5.0.202 5.0.203 5.0.204 5.0.205 5.0.206 5.0.300 5.0.301 5.0.302 5.0.303 5.0.400 ### .NET Core Runtime `Location: C:\Program Files\dotnet\shared\Microsoft.AspNetCore.All` -- 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23 2.1.24 2.1.25 2.1.26 2.1.27 2.1.28 +- 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23 2.1.24 2.1.25 2.1.26 2.1.27 2.1.28 2.1.29 `Location: C:\Program Files\dotnet\shared\Microsoft.AspNetCore.App` -- 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23 2.1.24 2.1.25 2.1.26 2.1.27 2.1.28 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9 3.1.10 3.1.11 3.1.12 3.1.13 3.1.14 3.1.15 3.1.16 3.1.17 5.0.0 5.0.1 5.0.2 5.0.3 5.0.4 5.0.5 5.0.6 5.0.7 5.0.8 +- 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23 2.1.24 2.1.25 2.1.26 2.1.27 2.1.28 2.1.29 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9 3.1.10 3.1.11 3.1.12 3.1.13 3.1.14 3.1.15 3.1.16 3.1.17 3.1.18 5.0.0 5.0.1 5.0.2 5.0.3 5.0.4 5.0.5 5.0.6 5.0.7 5.0.8 5.0.9 `Location: C:\Program Files\dotnet\shared\Microsoft.NETCore.App` -- 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23 2.1.24 2.1.25 2.1.26 2.1.27 2.1.28 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9 3.1.10 3.1.11 3.1.12 3.1.13 3.1.14 3.1.15 3.1.16 3.1.17 5.0.0 5.0.1 5.0.2 5.0.3 5.0.4 5.0.5 5.0.6 5.0.7 5.0.8 +- 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23 2.1.24 2.1.25 2.1.26 2.1.27 2.1.28 2.1.29 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9 3.1.10 3.1.11 3.1.12 3.1.13 3.1.14 3.1.15 3.1.16 3.1.17 3.1.18 5.0.0 5.0.1 5.0.2 5.0.3 5.0.4 5.0.5 5.0.6 5.0.7 5.0.8 5.0.9 `Location: C:\Program Files\dotnet\shared\Microsoft.WindowsDesktop.App` -- 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9 3.1.10 3.1.11 3.1.12 3.1.13 3.1.14 3.1.15 3.1.16 3.1.17 5.0.0 5.0.1 5.0.2 5.0.3 5.0.4 5.0.5 5.0.6 5.0.7 5.0.8 +- 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9 3.1.10 3.1.11 3.1.12 3.1.13 3.1.14 3.1.15 3.1.16 3.1.17 3.1.18 5.0.0 5.0.1 5.0.2 5.0.3 5.0.4 5.0.5 5.0.6 5.0.7 5.0.8 5.0.9 ### .NET Framework `Type: Developer Pack` @@ -508,7 +508,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 4.7.2 4.8 ### PowerShell Tools -- PowerShell 7.1.3 +- PowerShell 7.1.4 #### Azure Powershell Modules | Module | Version | Path | @@ -562,11 +562,11 @@ All other versions are saved but not installed. ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:a1ff3aa24d42ea02743db1599c9beece02d66d3b48d3876b185ab2a1110b420c | 2021-07-13 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:6196293feeaed05af457e937edd64dde27fd49f996c1a9e00e198afd5edc8929 | 2021-07-13 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:c6e9c591b9e80e2cb0f8bcb736008ebbc3e3ed23de045523847ef0f9778dbaa6 | 2021-07-13 | -| mcr.microsoft.com/windows/nanoserver:1809 | sha256:0cfbe14b2bcb1bd1af2bdc1603f9b60e63effaf25bce3fbab9ceb23e02b2b97f | 2021-07-06 | -| mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:cc8a0215d2d19516c23b5f8a8e04799631c5ff2fb9a3c509fbd46f7ef7057877 | 2021-07-06 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:60f7a23b2120c61b486c46d7efb1cb41bb56fe420d30289d25ecacf0298804d3 | 2021-08-10 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:454808052e90913049436560705482dbd22539ab14cfb1b4c05f4403b6651ce7 | 2021-08-10 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:4479ef12594660436cdeaa60f6bce8d06ab7b45a4af9d6c8b17413462262cd79 | 2021-08-10 | +| mcr.microsoft.com/windows/nanoserver:1809 | sha256:bf497134e6b9f1c0b0bcd677cff79f7fae6e545e5a6bf0198676b3b6eede1a64 | 2021-08-05 | +| mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:1be9c8378b8c32d31538253a4b96169f5138a5f6d4c0a04e8d8f9a80b9ac8097 | 2021-08-05 | From accd6d02784891c3962a4ab0aeb821e189380c77 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Thu, 19 Aug 2021 20:49:31 +0300 Subject: [PATCH 0469/3485] Add configure-tccdb-macos11 script (#3933) --- .../configuration/configure-tccdb-macos11.sh | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 images/macos/provision/configuration/configure-tccdb-macos11.sh diff --git a/images/macos/provision/configuration/configure-tccdb-macos11.sh b/images/macos/provision/configuration/configure-tccdb-macos11.sh new file mode 100644 index 000000000000..9af239b19793 --- /dev/null +++ b/images/macos/provision/configuration/configure-tccdb-macos11.sh @@ -0,0 +1,36 @@ +#!/bin/bash -e -o pipefail + +# This script adds permissions, which are required for some installed tools to work properly, to the TCC.db + +defaultUser=$(users) + +sudo sqlite3 /Library/Application\ Support/com.apple.TCC/TCC.db < Date: Fri, 20 Aug 2021 15:13:27 +0300 Subject: [PATCH 0470/3485] selenium: Download selenium-server-standalone.jar from GitHub releases (#3939) --- images/linux/scripts/installers/selenium.sh | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/images/linux/scripts/installers/selenium.sh b/images/linux/scripts/installers/selenium.sh index 85330be66456..7f3e65cb080f 100644 --- a/images/linux/scripts/installers/selenium.sh +++ b/images/linux/scripts/installers/selenium.sh @@ -7,18 +7,14 @@ # Source the helpers for use with the script source $HELPER_SCRIPTS/install.sh -# Determine latest selenium standalone server version -SELENIUM_LATEST_VERSION_URL=https://api.github.com/repos/SeleniumHQ/selenium/releases/latest -SELENIUM_VERSION=$(curl $SELENIUM_LATEST_VERSION_URL | jq '.name' | tr -d '"' | cut -d ' ' -f 2) -SELENIUM_VERSION_MAJOR_MINOR=$(echo $SELENIUM_VERSION | cut -d '.' -f 1,2) - # Download selenium standalone server -echo "Downloading selenium-server-standalone v$SELENIUM_VERSION..." -SELENIUM_JAR_NAME="selenium-server-standalone-$SELENIUM_VERSION.jar" -download_with_retries https://selenium-release.storage.googleapis.com/$SELENIUM_VERSION_MAJOR_MINOR/$SELENIUM_JAR_NAME +SELENIUM_JAR_NAME="selenium-server-standalone.jar" +SELENIUM_JAR_PATH="/usr/share/java" +SELENIUM_LATEST_VERSION_URL="$(curl -s https://api.github.com/repos/SeleniumHQ/selenium/releases/latest |\ + jq -r '.assets[].browser_download_url | select(contains("selenium-server-standalone") and endswith(".jar"))')" +download_with_retries $SELENIUM_LATEST_VERSION_URL $SELENIUM_JAR_PATH $SELENIUM_JAR_NAME -SELENIUM_JAR_PATH="/usr/share/java/selenium-server-standalone.jar" -mv $SELENIUM_JAR_NAME $SELENIUM_JAR_PATH -echo "SELENIUM_JAR_PATH=$SELENIUM_JAR_PATH" | tee -a /etc/environment +# Add SELENIUM_JAR_PATH environment variable +echo "SELENIUM_JAR_PATH=$SELENIUM_JAR_PATH/$SELENIUM_JAR_NAME" | tee -a /etc/environment -invoke_tests "Tools" "Selenium" \ No newline at end of file +invoke_tests "Tools" "Selenium" From 20584a43947912f28b9577384d30bc67dcd933f7 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Fri, 20 Aug 2021 16:55:04 +0300 Subject: [PATCH 0471/3485] win/selenium: Download selenium-server-standalone.jar from GitHub (#3940) --- .../scripts/Installers/Install-Selenium.ps1 | 26 +++++-------------- 1 file changed, 7 insertions(+), 19 deletions(-) diff --git a/images/win/scripts/Installers/Install-Selenium.ps1 b/images/win/scripts/Installers/Install-Selenium.ps1 index c1f2ce152ea9..437e32dfe4c8 100644 --- a/images/win/scripts/Installers/Install-Selenium.ps1 +++ b/images/win/scripts/Installers/Install-Selenium.ps1 @@ -3,32 +3,20 @@ ## Desc: Install Selenium Server standalone ################################################################################ -# Acquire latest Selenium release number from GitHub API -$latestReleaseUrl = "https://api.github.com/repos/SeleniumHQ/selenium/releases/latest" -try { - $latestReleaseInfo = Invoke-RestMethod -Uri $latestReleaseUrl -} catch { - Write-Error $_ - exit 1 -} -Write-Debug $latestReleaseInfo -$seleniumVersionString = $latestReleaseInfo.name.Split(" ")[1] -Write-Debug $seleniumVersionString -$seleniumVersion = [version]::Parse($seleniumVersionString) - -# Download Selenium -Write-Host "Downloading selenium-server-standalone v$seleniumVersion..." - -$seleniumReleaseUrl = "https://selenium-release.storage.googleapis.com/$($seleniumVersion.ToString(2))/selenium-server-standalone-$($seleniumVersion.ToString(3)).jar" +# Create Selenium directory $seleniumDirectory = "C:\selenium\" $seleniumFileName = "selenium-server-standalone.jar" New-Item -ItemType directory -Path $seleniumDirectory +# Download Selenium +$url = "https://api.github.com/repos/SeleniumHQ/selenium/releases/latest" +[System.String] $seleniumReleaseUrl = (Invoke-RestMethod -Uri $url).assets.browser_download_url -match "selenium-server-standalone-.+.jar" + Start-DownloadWithRetry -Url $seleniumReleaseUrl -Name $seleniumFileName -DownloadPath $seleniumDirectory -Write-Host "Add selenium jar to the environment variables..." +# Add SELENIUM_JAR_PATH environment variable $seleniumBinPath = Join-Path $seleniumDirectory $seleniumFileName setx "SELENIUM_JAR_PATH" "$($seleniumBinPath)" /M -Invoke-PesterTests -TestFile "Browsers" -TestName "Selenium" \ No newline at end of file +Invoke-PesterTests -TestFile "Browsers" -TestName "Selenium" From a2d76d2a0e52f14897950ac014385ac71a5c9290 Mon Sep 17 00:00:00 2001 From: Maxim Lobanov Date: Mon, 23 Aug 2021 11:13:14 +0300 Subject: [PATCH 0472/3485] Add Windows Server 2022 image templates (#3929) * add windows2022 image template Co-authored-by: Aleksandr Chebotov Co-authored-by: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Co-authored-by: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Co-authored-by: MaksimZhukov <46996400+MaksimZhukov@users.noreply.github.com> --- .../azure-pipelines/windows2022.yml | 20 ++ .../scripts/ImageHelpers/ImageHelpers.psm1 | 1 + .../scripts/ImageHelpers/InstallHelpers.ps1 | 5 + .../scripts/Installers/Configure-Shell.ps1 | 4 +- .../scripts/Installers/Install-DotnetSDK.ps1 | 58 ++-- .../scripts/Installers/Update-ImageData.ps1 | 6 +- .../SoftwareReport/SoftwareReport.Common.psm1 | 23 +- .../SoftwareReport.Generator.ps1 | 59 ++-- images/win/scripts/Tests/BizTalk.Tests.ps1 | 2 +- images/win/scripts/Tests/CLI.Tools.Tests.ps1 | 2 +- .../win/scripts/Tests/ChocoPackages.Tests.ps1 | 6 +- images/win/scripts/Tests/MSYS2.Tests.ps1 | 9 +- images/win/scripts/Tests/Miniconda.Tests.ps1 | 2 +- .../scripts/Tests/PowerShellModules.Tests.ps1 | 4 +- images/win/scripts/Tests/Tools.Tests.ps1 | 17 +- images/win/scripts/Tests/WDK.Tests.ps1 | 2 +- images/win/scripts/Tests/Wix.Tests.ps1 | 2 +- images/win/toolsets/toolset-2022.json | 247 +++++++++++++++ images/win/windows2022.json | 285 ++++++++++++++++++ 19 files changed, 679 insertions(+), 75 deletions(-) create mode 100644 images.CI/linux-and-win/azure-pipelines/windows2022.yml create mode 100644 images/win/toolsets/toolset-2022.json create mode 100644 images/win/windows2022.json diff --git a/images.CI/linux-and-win/azure-pipelines/windows2022.yml b/images.CI/linux-and-win/azure-pipelines/windows2022.yml new file mode 100644 index 000000000000..30dcfa3665b5 --- /dev/null +++ b/images.CI/linux-and-win/azure-pipelines/windows2022.yml @@ -0,0 +1,20 @@ +schedules: +- cron: "0 0 * * *" + displayName: Daily + branches: + include: + - main + always: true + +trigger: none +pr: + autoCancel: true + branches: + include: + - main + +jobs: +- template: image-generation.yml + parameters: + image_type: windows2022 + image_readme_name: Windows2022-Readme.md \ No newline at end of file diff --git a/images/win/scripts/ImageHelpers/ImageHelpers.psm1 b/images/win/scripts/ImageHelpers/ImageHelpers.psm1 index 9e5f9424be93..5eed2299056f 100644 --- a/images/win/scripts/ImageHelpers/ImageHelpers.psm1 +++ b/images/win/scripts/ImageHelpers/ImageHelpers.psm1 @@ -25,6 +25,7 @@ Export-ModuleMember -Function @( 'Install-VsixExtension' 'Get-VSExtensionVersion' 'Get-WinVersion' + 'Test-IsWin22' 'Test-IsWin19' 'Test-IsWin16' 'Choco-Install' diff --git a/images/win/scripts/ImageHelpers/InstallHelpers.ps1 b/images/win/scripts/ImageHelpers/InstallHelpers.ps1 index 14a1648325d2..30f08c97dd12 100644 --- a/images/win/scripts/ImageHelpers/InstallHelpers.ps1 +++ b/images/win/scripts/ImageHelpers/InstallHelpers.ps1 @@ -380,6 +380,11 @@ function Get-WinVersion (Get-CimInstance -ClassName Win32_OperatingSystem).Caption } +function Test-IsWin22 +{ + (Get-WinVersion) -match "2022" +} + function Test-IsWin19 { (Get-WinVersion) -match "2019" diff --git a/images/win/scripts/Installers/Configure-Shell.ps1 b/images/win/scripts/Installers/Configure-Shell.ps1 index f3487fe9e67c..f72b7a3c2cd1 100644 --- a/images/win/scripts/Installers/Configure-Shell.ps1 +++ b/images/win/scripts/Installers/Configure-Shell.ps1 @@ -15,8 +15,8 @@ C:\msys64\usr\bin\bash.exe -leo pipefail %* # gitbash <--> C:\Program Files\Git\bin\bash.exe New-Item -ItemType SymbolicLink -Path "$shellPath\gitbash.exe" -Target "$env:ProgramFiles\Git\bin\bash.exe" | Out-Null -# WSL is available on Windows Server 2019 -if (Test-IsWin19) +# WSL is available on Windows Server 2019 and Windows Server 2022 +if (-not (Test-IsWin16)) { # wslbash <--> C:\Windows\System32\bash.exe New-Item -ItemType SymbolicLink -Path "$shellPath\wslbash.exe" -Target "$env:SystemRoot\System32\bash.exe" | Out-Null diff --git a/images/win/scripts/Installers/Install-DotnetSDK.ps1 b/images/win/scripts/Installers/Install-DotnetSDK.ps1 index 1c41de28ca67..0add58f5053b 100644 --- a/images/win/scripts/Installers/Install-DotnetSDK.ps1 +++ b/images/win/scripts/Installers/Install-DotnetSDK.ps1 @@ -12,6 +12,32 @@ Set-SystemVariable -SystemVariable DOTNET_MULTILEVEL_LOOKUP -Value "0" [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor "Tls12" +function Get-SDKVersionsToInstall ( + $DotnetVersion +) { + $releaseJson = "https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/${DotnetVersion}/releases.json" + $releasesJsonPath = Start-DownloadWithRetry -Url $releaseJson -Name "releases-${DotnetVersion}.json" + $currentReleases = Get-Content -Path $releasesJsonPath | ConvertFrom-Json + # filtering out the preview/rc releases + $currentReleases = $currentReleases.'releases' | Where-Object { !$_.'release-version'.Contains('-') } + + $sdks = @() + ForEach ($release in $currentReleases) + { + $sdks += $release.'sdk' + $sdks += $release.'sdks' + } + + $sortedSdkVersions = $sdks.version | Sort-Object { [Version] $_ } -Unique + + if (Test-IsWin22) + { + return $sortedSdkVersions | Group-Object { $_.Substring(0, $_.LastIndexOf('.') + 2) } | Foreach-Object { $_.Group[-1] } + } + + return $sortedSdkVersions +} + function Invoke-Warmup ( $SdkVersion ) { @@ -78,35 +104,11 @@ function InstallAllValidSdks() ForEach ($dotnetVersion in $dotnetVersions) { - $releaseJson = "https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/${dotnetVersion}/releases.json" - $releasesJsonPath = Start-DownloadWithRetry -Url $releaseJson -Name "releases-${dotnetVersion}.json" - $currentReleases = Get-Content -Path $releasesJsonPath | ConvertFrom-Json - # filtering out the preview/rc releases - $currentReleases = $currentReleases.'releases' | Where-Object { !$_.'release-version'.Contains('-') } | Sort-Object { [Version] $_.'release-version' } - - ForEach ($release in $currentReleases) + $sdkVersionsToInstall = Get-SDKVersionsToInstall -DotnetVersion $dotnetVersion + + ForEach ($sdkVersion in $sdkVersionsToInstall) { - if ($release.'sdks'.Count -gt 0) - { - Write-Host 'Found sdks property in release: ' + $release.'release-version' + 'with sdks count: ' + $release.'sdks'.Count - - # Remove duplicate entries & preview/rc version from download list - # Sort the sdks on version - $sdks = @($release.'sdk'); - - $sdks += $release.'sdks' | Where-Object { !$_.'version'.Contains('-') -and !$_.'version'.Equals($release.'sdk'.'version') } - $sdks = $sdks | Sort-Object { [Version] $_.'version' } - - ForEach ($sdk in $sdks) - { - InstallSDKVersion -sdkVersion $sdk.'version' -Warmup $warmup - } - } - elseif (!$release.'sdk'.'version'.Contains('-')) - { - $sdkVersion = $release.'sdk'.'version' - InstallSDKVersion -SdkVersion $sdkVersion -Warmup $warmup - } + InstallSDKVersion -SdkVersion $sdkVersion -Warmup $warmup } } } diff --git a/images/win/scripts/Installers/Update-ImageData.ps1 b/images/win/scripts/Installers/Update-ImageData.ps1 index cc4f4b86d7e2..754ce77a1bd4 100644 --- a/images/win/scripts/Installers/Update-ImageData.ps1 +++ b/images/win/scripts/Installers/Update-ImageData.ps1 @@ -7,7 +7,11 @@ $imageVersion = $env:IMAGE_VERSION $imageDataFile = $env:IMAGEDATA_FILE $githubUrl="https://github.com/actions/virtual-environments/blob" -if (Test-IsWin19) { +if (Test-IsWin22) { + $imageLabel = "windows-2022" + $softwareUrl = "${githubUrl}/win22/${imageVersion}/images/win/Windows2022-Readme.md" + $releaseUrl="https://github.com/actions/virtual-environments/releases/tag/win22%2F${imageVersion}" +} elseif (Test-IsWin19) { $imageLabel = "windows-2019" $softwareUrl = "${githubUrl}/win19/${imageVersion}/images/win/Windows2019-Readme.md" $releaseUrl="https://github.com/actions/virtual-environments/releases/tag/win19%2F${imageVersion}" diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 index 1ff73ab0fb92..51e8e77087b8 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 @@ -9,7 +9,7 @@ function Get-OSVersion { } function Get-BashVersion { - $version = bash -c 'echo ${BASH_VERSION}' + $version = bash --% -c 'echo ${BASH_VERSION}' return "Bash $version" } @@ -276,6 +276,10 @@ function Get-CachedDockerImages { function Get-CachedDockerImagesTableData { $allImages = docker images --digests --format "*{{.Repository}}:{{.Tag}}|{{.Digest}} |{{.CreatedAt}}" + if (-not $allImages) { + return $null + } + $allImages.Split("*") | Where-Object { $_ } | ForEach-Object { $parts = $_.Split("|") [PSCustomObject] @{ @@ -321,16 +325,21 @@ function Get-PipxVersion { } function Build-PackageManagementEnvironmentTable { - return @( - @{ - "Name" = "CONDA" - "Value" = $env:CONDA - }, + $envVariables = @( @{ "Name" = "VCPKG_INSTALLATION_ROOT" "Value" = $env:VCPKG_INSTALLATION_ROOT } - ) | ForEach-Object { + ) + if ((Test-IsWin16) -or (Test-IsWin19)) { + $envVariables += @( + @{ + "Name" = "CONDA" + "Value" = $env:CONDA + } + ) + } + return $envVariables | ForEach-Object { [PSCustomObject] @{ "Name" = $_.Name "Value" = $_.Value diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index 67cd528fcfc4..c664ef9809db 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -31,25 +31,27 @@ if (Test-IsWin19) $markdown += New-MDHeader "Installed Software" -Level 2 $markdown += New-MDHeader "Language and Runtime" -Level 3 -$markdown += New-MDList -Style Unordered -Lines (@( +$languageTools = @( (Get-BashVersion), (Get-GoVersion), (Get-JuliaVersion), (Get-NodeVersion), - (Get-PerlVersion), (Get-PHPVersion), (Get-PythonVersion), (Get-RubyVersion), (Get-KotlinVersion) - ) | Sort-Object ) +if ((Test-IsWin16) -or (Test-IsWin19)) { + $languageTools += @( + (Get-PerlVersion) + ) +} +$markdown += New-MDList -Style Unordered -Lines ($languageTools | Sort-Object) -$markdown += New-MDHeader "Package Management" -Level 3 -$markdown += New-MDList -Style Unordered -Lines (@( +$packageManagementList = @( (Get-ChocoVersion), (Get-ComposerVersion), (Get-HelmVersion), - (Get-CondaVersion), (Get-NPMVersion), (Get-NugetVersion), (Get-PipxVersion), @@ -57,23 +59,36 @@ $markdown += New-MDList -Style Unordered -Lines (@( (Get-RubyGemsVersion), (Get-VcpkgVersion), (Get-YarnVersion) - ) | Sort-Object ) + +if ((Test-IsWin16) -or (Test-IsWin19)) { + $packageManagementList += @( + (Get-CondaVersion) + ) +} + +$markdown += New-MDHeader "Package Management" -Level 3 +$markdown += New-MDList -Style Unordered -Lines ($packageManagementList | Sort-Object) + $markdown += New-MDHeader "Environment variables" -Level 4 $markdown += Build-PackageManagementEnvironmentTable | New-MDTable $markdown += New-MDNewLine $markdown += New-MDHeader "Project Management" -Level 3 -$markdown += New-MDList -Style Unordered -Lines (@( +$projectManagementTools = @( (Get-AntVersion), (Get-GradleVersion), - (Get-MavenVersion), - (Get-SbtVersion) - ) | Sort-Object + (Get-MavenVersion) ) +if ((Test-IsWin16) -or (Test-IsWin19)) { + $projectManagementTools += @( + (Get-SbtVersion) + ) +} +$markdown += New-MDList -Style Unordered -Lines ($projectManagementTools | Sort-Object) $markdown += New-MDHeader "Tools" -Level 3 -$markdown += New-MDList -Style Unordered -Lines (@( +$toolsList = @( (Get-7zipVersion), (Get-Aria2Version), (Get-AzCopyVersion), @@ -89,7 +104,6 @@ $markdown += New-MDList -Style Unordered -Lines (@( (Get-GitVersion), (Get-GitLFSVersion), (Get-GVFSVersion), - (Get-GoogleCloudSDKVersion), (Get-InnoSetupVersion), (Get-JQVersion), (Get-KindVersion), @@ -97,7 +111,6 @@ $markdown += New-MDList -Style Unordered -Lines (@( (Get-MercurialVersion), (Get-MinGWVersion), (Get-NewmanVersion), - (Get-NSISVersion), (Get-OpenSSLVersion), (Get-PackerVersion), (Get-PulumiVersion), @@ -109,22 +122,32 @@ $markdown += New-MDList -Style Unordered -Lines (@( (Get-WinAppDriver), (Get-ZstdVersion), (Get-YAMLLintVersion) - ) | Sort-Object ) +if ((Test-IsWin16) -or (Test-IsWin19)) { + $toolsList += @( + (Get-NSISVersion), + (Get-GoogleCloudSDKVersion) + ) +} +$markdown += New-MDList -Style Unordered -Lines ($toolsList | Sort-Object) $markdown += New-MDHeader "CLI Tools" -Level 3 -$markdown += New-MDList -Style Unordered -Lines (@( +$cliTools = @( (Get-AlibabaCLIVersion), (Get-AWSCLIVersion), (Get-AWSSAMVersion), (Get-AWSSessionManagerVersion), (Get-AzureCLIVersion), (Get-AzureDevopsExtVersion), - (Get-CloudFoundryVersion), (Get-GHVersion), (Get-HubVersion) - ) | Sort-Object ) +if ((Test-IsWin16) -or (Test-IsWin19)) { + $cliTools += @( + (Get-CloudFoundryVersion) + ) +} +$markdown += New-MDList -Style Unordered -Lines ($cliTools | Sort-Object) $markdown += New-MDHeader "Rust Tools" -Level 3 $markdown += New-MDList -Style Unordered -Lines (@( diff --git a/images/win/scripts/Tests/BizTalk.Tests.ps1 b/images/win/scripts/Tests/BizTalk.Tests.ps1 index efe792162226..0a3860c709cf 100644 --- a/images/win/scripts/Tests/BizTalk.Tests.ps1 +++ b/images/win/scripts/Tests/BizTalk.Tests.ps1 @@ -3,7 +3,7 @@ ## Desc: Test BizTalk project build component installed. ################################################################################ -Describe "BizTalk Build Component Setup" -Skip:(Test-IsWin16) { +Describe "BizTalk Build Component Setup" -Skip:(-not (Test-IsWin19)) { It "BizTalk Registry Check" { Test-Path "HKLM:\SOFTWARE\WOW6432Node\Microsoft\BizTalk Server\3.0" | Should -BeTrue } diff --git a/images/win/scripts/Tests/CLI.Tools.Tests.ps1 b/images/win/scripts/Tests/CLI.Tools.Tests.ps1 index d230fcfcddff..c508c4d729a3 100644 --- a/images/win/scripts/Tests/CLI.Tools.Tests.ps1 +++ b/images/win/scripts/Tests/CLI.Tools.Tests.ps1 @@ -39,7 +39,7 @@ Describe "GitHub CLI" { } } -Describe "CloudFoundry CLI" { +Describe "CloudFoundry CLI" -Skip:(Test-IsWin22) { It "cf is located in C:\cf-cli" { "C:\cf-cli\cf.exe" | Should -Exist } diff --git a/images/win/scripts/Tests/ChocoPackages.Tests.ps1 b/images/win/scripts/Tests/ChocoPackages.Tests.ps1 index 1fb602acd28a..cb95e095477b 100644 --- a/images/win/scripts/Tests/ChocoPackages.Tests.ps1 +++ b/images/win/scripts/Tests/ChocoPackages.Tests.ps1 @@ -22,13 +22,13 @@ Describe "Bicep" { } } -Describe "GitVersion" { +Describe "GitVersion" -Skip:(Test-IsWin22) { It "gitversion is installed" { "gitversion /version" | Should -ReturnZeroExitCode } } -Describe "InnoSetup" { +Describe "InnoSetup" -Skip:(Test-IsWin22) { It "InnoSetup" { (Get-Command -Name iscc).CommandType | Should -BeExactly "Application" } @@ -58,7 +58,7 @@ Describe "Packer" { } } -Describe "Perl" { +Describe "Perl" -Skip:(Test-IsWin22) { It "Perl" { "perl --version" | Should -ReturnZeroExitCode } diff --git a/images/win/scripts/Tests/MSYS2.Tests.ps1 b/images/win/scripts/Tests/MSYS2.Tests.ps1 index 9316730b17c9..85e1fc512842 100644 --- a/images/win/scripts/Tests/MSYS2.Tests.ps1 +++ b/images/win/scripts/Tests/MSYS2.Tests.ps1 @@ -14,10 +14,15 @@ Describe "MSYS2 packages" { $TestCases = @( @{ ToolName = "bash.exe" } - @{ ToolName = "tar.exe" } - @{ ToolName = "make.exe" } ) + if ((Test-IsWin16) -or (Test-IsWin19)) { + $TestCases += @( + @{ ToolName = "tar.exe" } + @{ ToolName = "make.exe" } + ) + } + It " is installed in " -TestCases $TestCases { (Get-Command "$ToolName").Source | Should -BeLike "$msys2Dir*" } diff --git a/images/win/scripts/Tests/Miniconda.Tests.ps1 b/images/win/scripts/Tests/Miniconda.Tests.ps1 index b19f2db519e7..c3538d70e806 100644 --- a/images/win/scripts/Tests/Miniconda.Tests.ps1 +++ b/images/win/scripts/Tests/Miniconda.Tests.ps1 @@ -1,4 +1,4 @@ -Describe "Miniconda" { +Describe "Miniconda" -Skip:(Test-IsWin22) { It "Miniconda Environment variables is set. " { ${env:CONDA} | Should -Not -BeNullOrEmpty } diff --git a/images/win/scripts/Tests/PowerShellModules.Tests.ps1 b/images/win/scripts/Tests/PowerShellModules.Tests.ps1 index ebda62bb9380..48254d48ba28 100644 --- a/images/win/scripts/Tests/PowerShellModules.Tests.ps1 +++ b/images/win/scripts/Tests/PowerShellModules.Tests.ps1 @@ -59,8 +59,8 @@ Describe "AzureModules" { if ($module.default) { $moduleInfo = @{ moduleName = $moduleName; moduleDefault = $module.default } It " set as default" -TestCases $moduleInfo { - $moduleVersion = (Get-Module -ListAvailable -Name $moduleName).Version.ToString() - $moduleVersion | Should -Match $moduleDefault + $moduleVersions = Get-Module -ListAvailable -Name $moduleName | ForEach-Object { $_.Version.ToString() } + $moduleVersions | Should -Contain $moduleDefault } } } diff --git a/images/win/scripts/Tests/Tools.Tests.ps1 b/images/win/scripts/Tests/Tools.Tests.ps1 index 03756723eb11..6755193ad940 100644 --- a/images/win/scripts/Tests/Tools.Tests.ps1 +++ b/images/win/scripts/Tests/Tools.Tests.ps1 @@ -42,13 +42,16 @@ Describe "DACFx" { It "DACFx" { (Get-ItemProperty HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\*).DisplayName -Contains "Microsoft SQL Server Data-Tier Application Framework (x64)" | Should -BeTrue $sqlPackagePath = 'C:\Program Files\Microsoft SQL Server\150\DAC\bin\SqlPackage.exe' - $sqlLocalDBPath = 'C:\Program Files\Microsoft SQL Server\130\Tools\Binn\SqlLocalDB.exe' "${sqlPackagePath}" | Should -Exist + } + + It "SqlLocalDB" -Skip:(Test-IsWin22) { + $sqlLocalDBPath = 'C:\Program Files\Microsoft SQL Server\130\Tools\Binn\SqlLocalDB.exe' "${sqlLocalDBPath}" | Should -Exist } } -Describe "DotnetTLS" { +Describe "DotnetTLS" -Skip:(Test-IsWin22) { It "Tls 1.2 is enabled" { [Net.ServicePointManager]::SecurityProtocol -band "Tls12" | Should -Be Tls12 } @@ -88,7 +91,7 @@ Describe "Mingw64" { } } -Describe "GoogleCloudSDK" { +Describe "GoogleCloudSDK" -Skip:(Test-IsWin22) { It "" -TestCases @( @{ ToolName = "bq" } @{ ToolName = "gcloud" } @@ -105,7 +108,7 @@ Describe "NET48" { } } -Describe "NSIS" { +Describe "NSIS" -Skip:(Test-IsWin22) { It "NSIS" { "makensis /VERSION" | Should -ReturnZeroExitCode } @@ -121,13 +124,13 @@ Describe "PowerShell Core" { } } -Describe "Sbt" { +Describe "Sbt" -Skip:(Test-IsWin22) { It "sbt" { "sbt --version" | Should -ReturnZeroExitCode } } -Describe "ServiceFabricSDK" { +Describe "ServiceFabricSDK" -Skip:(Test-IsWin22) { It "PowerShell Module" { Get-Module -Name ServiceFabric -ListAvailable | Should -Not -BeNullOrEmpty } @@ -153,7 +156,7 @@ Describe "Vcpkg" { } } -Describe "WebPlatformInstaller" { +Describe "WebPlatformInstaller" -Skip:(Test-IsWin22) { It "WebPlatformInstaller" { "WebPICMD" | Should -ReturnZeroExitCode } diff --git a/images/win/scripts/Tests/WDK.Tests.ps1 b/images/win/scripts/Tests/WDK.Tests.ps1 index c67586e79eb4..6c5dc32953c0 100644 --- a/images/win/scripts/Tests/WDK.Tests.ps1 +++ b/images/win/scripts/Tests/WDK.Tests.ps1 @@ -1,4 +1,4 @@ -Describe "WDK" { +Describe "WDK" -Skip:(Test-IsWin22) { It "WDK exists" { $WDKVersion = (Get-CimInstance -ClassName Win32_Product -Filter "Name = 'Windows Driver Kit'").Version $WDKVersion| Should -Not -BeNullOrEmpty diff --git a/images/win/scripts/Tests/Wix.Tests.ps1 b/images/win/scripts/Tests/Wix.Tests.ps1 index 2a12261e280e..ed9bed384e21 100644 --- a/images/win/scripts/Tests/Wix.Tests.ps1 +++ b/images/win/scripts/Tests/Wix.Tests.ps1 @@ -1,4 +1,4 @@ -Describe "Wix" { +Describe "Wix" -Skip:(Test-IsWin22) { BeforeAll { $regKey = "HKLM:\Software\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall\*" $installedApplications = Get-ItemProperty -Path $regKey diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json new file mode 100644 index 000000000000..32803e3e6ddf --- /dev/null +++ b/images/win/toolsets/toolset-2022.json @@ -0,0 +1,247 @@ +{ + "toolcache": [ + { + "name": "Ruby", + "arch": "x64", + "platform" : "win32", + "versions": [ + "2.7", + "3.0" + ], + "default": "3.0" + }, + { + "name": "Python", + "url" : "https://raw.githubusercontent.com/actions/python-versions/main/versions-manifest.json", + "arch": "x64", + "platform" : "win32", + "versions": [ + "3.7.*", + "3.8.*", + "3.9.*" + ], + "default": "3.9.*" + }, + { + "name": "PyPy", + "arch": "x86", + "platform" : "win64", + "versions": [ + "2.7", + "3.7" + ] + }, + { + "name": "node", + "url" : "https://raw.githubusercontent.com/actions/node-versions/main/versions-manifest.json", + "arch": "x64", + "platform" : "win32", + "versions": [ + "10.*", + "12.*", + "14.*" + ] + }, + { + "name": "go", + "url" : "https://raw.githubusercontent.com/actions/go-versions/main/versions-manifest.json", + "arch": "x64", + "platform" : "win32", + "versions": [ + "1.15.*", + "1.16.*" + ], + "default": "1.16.*" + } + ], + "powershellModules": [ + { "name": "DockerMsftProvider" }, + { "name": "MarkdownPS" }, + { "name": "Pester" }, + { "name": "PowerShellGet" }, + { "name": "PSScriptAnalyzer" }, + { "name": "PSWindowsUpdate" }, + { "name": "SqlServer" }, + { "name": "VSSetup" } + ], + "azureModules": [ + { + "name": "azurerm", + "blob_url": "https://vstsagenttools.blob.core.windows.net/tools/azurepowershellmodules/", + "versions": [ + "2.1.0", + "6.13.1" + ], + "zip_versions": [ + "3.8.0", + "4.2.1", + "5.1.1", + "6.7.0" + ], + "default": "2.1.0" + }, + { + "name": "azure", + "blob_url": "https://vstsagenttools.blob.core.windows.net/tools/azurepowershellmodules/", + "versions": [ + "2.1.0", + "5.3.0" + ], + "zip_versions": [ + "3.8.0", + "4.2.1", + "5.1.1" + ], + "default": "2.1.0" + }, + { + "name": "az", + "url" : "https://raw.githubusercontent.com/Azure/az-ps-module-versions/main/versions-manifest.json", + "versions": [ + "6.1.0" + ], + "zip_versions": [] + } + ], + "java": { + "default": "8", + "versions": [ + "8", "11" + ] + }, + "android": { + "platform_min_version": "27", + "build_tools_min_version": "27.0.0", + "extra_list": [ + "android;m2repository", + "google;m2repository", + "google;google_play_services" + ], + "addon_list": [], + "additional_tools": [ + "cmake;3.18.1", + "patcher;v4" + ], + "ndk": { + "lts": "21", + "latest": "22" + } + }, + "MsysPackages": { + "msys2": [], + "mingw": [] + }, + "windowsFeatures": [ + { "name": "Containers" }, + { "name": "Microsoft-Windows-Subsystem-Linux", "optionalFeature": true }, + { "name": "VirtualMachinePlatform", "optionalFeature": true }, + { "name": "NET-Framework-45-Features", "includeAllSubFeatures": true }, + { "name": "Client-ProjFS", "optionalFeature": true }, + { "name": "NET-Framework-Features", "includeAllSubFeatures": true } + ], + "visualStudio": { + "version" : "2022", + "subversion" : "17", + "edition" : "Enterprise", + "channel": "pre", + "workloads": [ + "Component.Linux.CMake", + "Component.UnityEngine.x64", + "Component.Unreal.Android", + "Microsoft.Component.VC.Runtime.UCRTSDK", + "Microsoft.Net.Component.4.7.2.TargetingPack", + "Microsoft.VisualStudio.Component.AspNet45", + "Microsoft.VisualStudio.Component.Azure.ServiceFabric.Tools", + "Microsoft.VisualStudio.Component.Debugger.JustInTime", + "Microsoft.VisualStudio.Component.EntityFramework", + "Microsoft.VisualStudio.Component.LinqToSql", + "Microsoft.VisualStudio.Component.SQL.SSDT", + "Microsoft.VisualStudio.Component.Sharepoint.Tools", + "Microsoft.VisualStudio.Component.PortableLibrary", + "Microsoft.VisualStudio.Component.TeamOffice", + "Microsoft.VisualStudio.Component.TestTools.CodedUITest", + "Microsoft.VisualStudio.Component.TestTools.WebLoadTest", + "Microsoft.VisualStudio.Component.VC.CLI.Support", + "Microsoft.VisualStudio.Component.VC.CMake.Project", + "Microsoft.VisualStudio.Component.VC.DiagnosticTools", + "Microsoft.VisualStudio.Component.VC.Llvm.ClangToolset", + "Microsoft.VisualStudio.Component.VC.Runtimes.x86.x64.Spectre", + "Microsoft.VisualStudio.Component.VC.TestAdapterForBoostTest", + "Microsoft.VisualStudio.Component.VC.TestAdapterForGoogleTest", + "Microsoft.VisualStudio.Component.VC.v141.x86.x64", + "Microsoft.VisualStudio.Component.VC.v141.x86.x64.Spectre", + "Microsoft.VisualStudio.Component.VC.v141.MFC", + "Microsoft.VisualStudio.Component.VC.v141.MFC.Spectre", + "Microsoft.VisualStudio.Component.Windows10SDK.19041", + "Microsoft.VisualStudio.Component.Workflow", + "Microsoft.VisualStudio.ComponentGroup.Azure.CloudServices", + "Microsoft.VisualStudio.ComponentGroup.Azure.ResourceManager.Tools", + "Microsoft.VisualStudio.ComponentGroup.Web.CloudTools", + "Microsoft.VisualStudio.Workload.Azure", + "Microsoft.VisualStudio.Workload.Data", + "Microsoft.VisualStudio.Workload.ManagedDesktop", + "Microsoft.VisualStudio.Workload.ManagedGame", + "Microsoft.VisualStudio.Workload.NativeCrossPlat", + "Microsoft.VisualStudio.Workload.NativeDesktop", + "Microsoft.VisualStudio.Workload.NativeGame", + "Microsoft.VisualStudio.Workload.NativeMobile", + "Microsoft.VisualStudio.Workload.NetCrossPlat", + "Microsoft.VisualStudio.Workload.NetWeb", + "Microsoft.VisualStudio.Workload.Node", + "Microsoft.VisualStudio.Workload.Office", + "Microsoft.VisualStudio.Workload.Python", + "Microsoft.VisualStudio.Workload.Universal", + "Microsoft.VisualStudio.Workload.VisualStudioExtension", + "Component.MDD.Linux" + ], + "vsix": [] + }, + "docker": { + "images": [] + }, + "pipx": [ + { + "package": "yamllint", + "cmd": "yamllint --version" + } + ], + "npm": { + "global_packages": [ + { "name": "yarn", "test": "yarn --version" }, + { "name": "newman", "test": "newman --version" }, + { "name": "lerna", "test": "lerna --version" } + ] + }, + "dotnet": { + "versions": [ + "3.1", + "5.0" + ], + "warmup": false + }, + "choco": { + "common_packages": [ + { "name": "7zip.install" }, + { "name": "aria2" }, + { "name": "azcopy10" }, + { "name": "Bicep" }, + { "name": "jq" }, + { "name": "NuGet.CommandLine" }, + { "name": "openssl.light" }, + { "name": "packer" }, + { "name": "pulumi" }, + { "name": "tortoisesvn" }, + { "name": "swig" }, + { "name": "vswhere" }, + { "name": "kotlinc" }, + { + "name": "julia", + "args": [ "--ia", "/DIR=C:\\Julia" ] + }, + { + "name": "cmake.install", + "args": [ "--installargs", "ADD_CMAKE_TO_PATH=\"System\"" ] + } + ] + } +} diff --git a/images/win/windows2022.json b/images/win/windows2022.json new file mode 100644 index 000000000000..a0ad7b76b6ae --- /dev/null +++ b/images/win/windows2022.json @@ -0,0 +1,285 @@ +{ + "variables": { + "client_id": "{{env `ARM_CLIENT_ID`}}", + "client_secret": "{{env `ARM_CLIENT_SECRET`}}", + "subscription_id": "{{env `ARM_SUBSCRIPTION_ID`}}", + "tenant_id": "{{env `ARM_TENANT_ID`}}", + "object_id": "{{env `ARM_OBJECT_ID`}}", + "resource_group": "{{env `ARM_RESOURCE_GROUP`}}", + "storage_account": "{{env `ARM_STORAGE_ACCOUNT`}}", + "build_resource_group_name": "{{env `BUILD_RESOURCE_GROUP_NAME`}}", + "temp_resource_group_name": "{{env `TEMP_RESOURCE_GROUP_NAME`}}", + "location": "{{env `ARM_RESOURCE_LOCATION`}}", + "virtual_network_name": "{{env `VNET_NAME`}}", + "virtual_network_resource_group_name": "{{env `VNET_RESOURCE_GROUP`}}", + "virtual_network_subnet_name": "{{env `VNET_SUBNET`}}", + "private_virtual_network_with_public_ip": "{{env `PRIVATE_VIRTUAL_NETWORK_WITH_PUBLIC_IP`}}", + "allowed_inbound_ip_addresses": "{{env `AGENT_IP`}}", + "vm_size": "Standard_D8s_v4", + "image_folder": "C:\\image", + "imagedata_file": "C:\\imagedata.json", + "helper_script_folder": "C:\\Program Files\\WindowsPowerShell\\Modules\\", + "agent_tools_directory": "C:\\hostedtoolcache\\windows", + "install_user": "installer", + "install_password": null, + "capture_name_prefix": "packer", + "image_version": "dev", + "image_os": "win22" + }, + "sensitive-variables": [ + "install_password", + "client_secret" + ], + "builders": [ + { + "name": "vhd", + "type": "azure-arm", + "client_id": "{{user `client_id`}}", + "client_secret": "{{user `client_secret`}}", + "subscription_id": "{{user `subscription_id`}}", + "object_id": "{{user `object_id`}}", + "tenant_id": "{{user `tenant_id`}}", + "os_disk_size_gb": "256", + "location": "{{user `location`}}", + "vm_size": "{{user `vm_size`}}", + "resource_group_name": "{{user `resource_group`}}", + "storage_account": "{{user `storage_account`}}", + "build_resource_group_name": "{{user `build_resource_group_name`}}", + "temp_resource_group_name": "{{user `temp_resource_group_name`}}", + "capture_container_name": "images", + "capture_name_prefix": "{{user `capture_name_prefix`}}", + "virtual_network_name": "{{user `virtual_network_name`}}", + "virtual_network_resource_group_name": "{{user `virtual_network_resource_group_name`}}", + "virtual_network_subnet_name": "{{user `virtual_network_subnet_name`}}", + "private_virtual_network_with_public_ip": "{{user `private_virtual_network_with_public_ip`}}", + "allowed_inbound_ip_addresses": "{{user `allowed_inbound_ip_addresses`}}", + "os_type": "Windows", + "image_publisher": "MicrosoftWindowsServer", + "image_offer": "WindowsServer", + "image_sku": "2022-Datacenter", + "communicator": "winrm", + "winrm_use_ssl": "true", + "winrm_insecure": "true", + "winrm_username": "packer" + } + ], + "provisioners": [ + { + "type": "powershell", + "inline": [ + "New-Item -Path {{user `image_folder`}} -ItemType Directory -Force" + ] + }, + { + "type": "file", + "source": "{{ template_dir }}/scripts/ImageHelpers", + "destination": "{{user `helper_script_folder`}}" + }, + { + "type": "file", + "source": "{{ template_dir }}/scripts/SoftwareReport", + "destination": "{{user `image_folder`}}" + }, + { + "type": "file", + "source": "{{ template_dir }}/post-generation", + "destination": "C:/" + }, + { + "type": "file", + "source": "{{ template_dir }}/scripts/Tests", + "destination": "{{user `image_folder`}}" + }, + { + "type": "file", + "source": "{{template_dir}}/toolsets/toolset-2022.json", + "destination": "{{user `image_folder`}}\\toolset.json" + }, + { + "type": "windows-shell", + "inline": [ + "net user {{user `install_user`}} {{user `install_password`}} /add /passwordchg:no /passwordreq:yes /active:yes /Y", + "net localgroup Administrators {{user `install_user`}} /add", + "winrm set winrm/config/service/auth @{Basic=\"true\"}", + "winrm get winrm/config/service/auth" + ] + }, + { + "type": "powershell", + "inline": [ + "if (-not ((net localgroup Administrators) -contains '{{user `install_user`}}')) { exit 1 }" + ] + }, + { + "type": "powershell", + "environment_vars": [ + "IMAGE_VERSION={{user `image_version`}}", + "IMAGE_OS={{user `image_os`}}", + "AGENT_TOOLSDIRECTORY={{user `agent_tools_directory`}}", + "IMAGEDATA_FILE={{user `imagedata_file`}}" + ], + "scripts": [ + "{{ template_dir }}/scripts/Installers/Configure-Antivirus.ps1", + "{{ template_dir }}/scripts/Installers/Install-PowerShellModules.ps1", + "{{ template_dir }}/scripts/Installers/Install-WindowsFeatures.ps1", + "{{ template_dir }}/scripts/Installers/Install-Choco.ps1", + "{{ template_dir }}/scripts/Installers/Initialize-VM.ps1", + "{{ template_dir }}/scripts/Installers/Update-ImageData.ps1", + "{{ template_dir }}/scripts/Installers/Update-DotnetTLS.ps1" + ], + "execution_policy": "unrestricted" + }, + { + "type": "windows-restart", + "restart_timeout": "10m" + }, + { + "type": "powershell", + "scripts": [ + "{{ template_dir }}/scripts/Installers/Install-VCRedist.ps1", + "{{ template_dir }}/scripts/Installers/Install-Docker.ps1", + "{{ template_dir }}/scripts/Installers/Install-PowershellCore.ps1" + ] + }, + { + "type": "windows-restart", + "restart_timeout": "10m" + }, + { + "type": "powershell", + "valid_exit_codes": [ + 0, + 3010 + ], + "scripts": [ + "{{ template_dir }}/scripts/Installers/Install-VS.ps1", + "{{ template_dir }}/scripts/Installers/Install-KubernetesTools.ps1" + ], + "elevated_user": "{{user `install_user`}}", + "elevated_password": "{{user `install_password`}}" + }, + { + "type": "powershell", + "scripts": [ + "{{ template_dir }}/scripts/Installers/Install-Vsix.ps1", + "{{ template_dir }}/scripts/Installers/Install-AzureCli.ps1", + "{{ template_dir }}/scripts/Installers/Install-AzureDevOpsCli.ps1", + "{{ template_dir }}/scripts/Installers/Install-NodeLts.ps1", + "{{ template_dir }}/scripts/Installers/Install-CommonUtils.ps1", + "{{ template_dir }}/scripts/Installers/Install-JavaTools.ps1" + ] + }, + { + "type": "windows-restart", + "restart_timeout": "10m" + }, + { + "type": "windows-shell", + "inline": [ + "wmic product where \"name like '%%microsoft azure powershell%%'\" call uninstall /nointeractive" + ] + }, + { + "type": "powershell", + "scripts": [ + "{{ template_dir }}/scripts/Installers/Install-Ruby.ps1", + "{{ template_dir }}/scripts/Installers/Install-PyPy.ps1", + "{{ template_dir }}/scripts/Installers/Install-Toolset.ps1", + "{{ template_dir }}/scripts/Installers/Configure-Toolset.ps1", + "{{ template_dir }}/scripts/Installers/Install-AndroidSDK.ps1", + "{{ template_dir }}/scripts/Installers/Install-AzureModules.ps1", + "{{ template_dir }}/scripts/Installers/Install-Pipx.ps1", + "{{ template_dir }}/scripts/Installers/Install-PipxPackages.ps1", + "{{ template_dir }}/scripts/Installers/Install-Git.ps1", + "{{ template_dir }}/scripts/Installers/Install-GitHub-CLI.ps1", + "{{ template_dir }}/scripts/Installers/Install-PHP.ps1", + "{{ template_dir }}/scripts/Installers/Install-Rust.ps1", + "{{ template_dir }}/scripts/Installers/Install-Chrome.ps1", + "{{ template_dir }}/scripts/Installers/Install-Edge.ps1", + "{{ template_dir }}/scripts/Installers/Install-Firefox.ps1", + "{{ template_dir }}/scripts/Installers/Install-Selenium.ps1", + "{{ template_dir }}/scripts/Installers/Install-IEWebDriver.ps1", + "{{ template_dir }}/scripts/Installers/Install-Apache.ps1", + "{{ template_dir }}/scripts/Installers/Install-Nginx.ps1", + "{{ template_dir }}/scripts/Installers/Install-Msys2.ps1", + "{{ template_dir }}/scripts/Installers/Install-WinAppDriver.ps1", + "{{ template_dir }}/scripts/Installers/Install-R.ps1", + "{{ template_dir }}/scripts/Installers/Install-AWS.ps1", + "{{ template_dir }}/scripts/Installers/Install-DACFx.ps1", + "{{ template_dir }}/scripts/Installers/Install-MysqlCli.ps1", + "{{ template_dir }}/scripts/Installers/Install-SQLPowerShellTools.ps1", + "{{ template_dir }}/scripts/Installers/Install-DotnetSDK.ps1", + "{{ template_dir }}/scripts/Installers/Install-Mingw64.ps1", + "{{ template_dir }}/scripts/Installers/Install-Haskell.ps1", + "{{ template_dir }}/scripts/Installers/Install-Stack.ps1", + "{{ template_dir }}/scripts/Installers/Install-AzureCosmosDbEmulator.ps1", + "{{ template_dir }}/scripts/Installers/Install-Mercurial.ps1", + "{{ template_dir }}/scripts/Installers/Install-Zstd.ps1", + "{{ template_dir }}/scripts/Installers/Install-Vcpkg.ps1", + "{{ template_dir }}/scripts/Installers/Install-PostgreSQL.ps1", + "{{ template_dir }}/scripts/Installers/Install-Bazel.ps1", + "{{ template_dir }}/scripts/Installers/Install-AliyunCli.ps1", + "{{ template_dir }}/scripts/Installers/Install-RootCA.ps1", + "{{ template_dir }}/scripts/Installers/Install-MongoDB.ps1", + "{{ template_dir }}/scripts/Installers/Install-CodeQLBundle.ps1", + "{{ template_dir }}/scripts/Installers/Disable-JITDebugger.ps1", + "{{ template_dir }}/scripts/Installers/Run-NGen.ps1" + ] + }, + { + "type": "powershell", + "scripts": [ + "{{ template_dir }}/scripts/Installers/Install-WindowsUpdates.ps1", + "{{ template_dir }}/scripts/Installers/Configure-DynamicPort.ps1", + "{{ template_dir }}/scripts/Installers/Configure-GDIProcessHandleQuota.ps1", + "{{ template_dir }}/scripts/Installers/Configure-Shell.ps1", + "{{ template_dir }}/scripts/Installers/Enable-DeveloperMode.ps1" + ], + "elevated_user": "{{user `install_user`}}", + "elevated_password": "{{user `install_password`}}" + }, + { + "type": "windows-restart", + "restart_timeout": "30m" + }, + { + "type": "powershell", + "scripts": [ + "{{ template_dir }}/scripts/Tests/RunAll-Tests.ps1" + ] + }, + { + "type": "powershell", + "inline": [ + "pwsh -File '{{user `image_folder`}}\\SoftwareReport\\SoftwareReport.Generator.ps1'" + ], + "environment_vars": [ + "IMAGE_VERSION={{user `image_version`}}" + ] + }, + { + "type": "file", + "source": "C:\\InstalledSoftware.md", + "destination": "{{ template_dir }}/Windows2022-Readme.md", + "direction": "download" + }, + { + "type": "powershell", + "scripts": [ + "{{ template_dir }}/scripts/Installers/Finalize-VM.ps1" + ] + }, + { + "type": "windows-restart", + "restart_timeout": "10m" + }, + { + "type": "powershell", + "inline": [ + "if( Test-Path $Env:SystemRoot\\System32\\Sysprep\\unattend.xml ){ rm $Env:SystemRoot\\System32\\Sysprep\\unattend.xml -Force}", + "& $env:SystemRoot\\System32\\Sysprep\\Sysprep.exe /oobe /generalize /quiet /quit", + "while($true) { $imageState = Get-ItemProperty HKLM:\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Setup\\State | Select ImageState; if($imageState.ImageState -ne 'IMAGE_STATE_GENERALIZE_RESEAL_TO_OOBE') { Write-Output $imageState.ImageState; Start-Sleep -s 10 } else { break } }" + ] + } + ] +} From 5e6bfa08e271dd75a27d5290889685fe7f8b8ba8 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 23 Aug 2021 13:20:00 +0300 Subject: [PATCH 0473/3485] Updating readme file for win22 version 20210819.7 (#3947) Co-authored-by: Image generation service account --- images/win/Windows2022-Readme.md | 457 +++++++++++++++++++++++++++++++ 1 file changed, 457 insertions(+) create mode 100644 images/win/Windows2022-Readme.md diff --git a/images/win/Windows2022-Readme.md b/images/win/Windows2022-Readme.md new file mode 100644 index 000000000000..776180925813 --- /dev/null +++ b/images/win/Windows2022-Readme.md @@ -0,0 +1,457 @@ +| Announcements | +|-| +| [[macOS, Windows] .NET SDK pre-installation policy will be changed on September, 6](https://github.com/actions/virtual-environments/issues/3809) | +*** +# Microsoft Windows Server 2022 Datacenter +- OS Version: 10.0.20348 Build 169 +- Image Version: 20210819.7 + +## Installed Software +### Language and Runtime +- Bash 4.4.23(1)-release +- Go 1.16.7 +- Julia 1.6.2 +- Kotlin 1.5.20 +- Node 14.17.5 +- PHP 8.0.9 +- Python 3.9.6 +- Ruby 3.0.2p107 + +### Package Management +- Chocolatey 0.10.15 +- Composer 2.1.5 +- Helm 3.6.3 +- NPM 6.14.14 +- NuGet 5.11.0.10 +- pip 21.2.4 (python 3.9) +- Pipx 0.16.4 +- RubyGems 3.2.22 +- Vcpkg (build from master \) +- Yarn 1.22.11 + +#### Environment variables +| Name | Value | +| ----------------------- | -------- | +| VCPKG_INSTALLATION_ROOT | C:\vcpkg | + +### Project Management +- Ant 1.10.11 +- Gradle 7.1 +- Maven 3.8.1 + +### Tools +- 7zip 19.00 +- aria2 1.35.0 +- azcopy 10.11.0 +- Bazel 4.2.0 +- Bazelisk 1.10.1 +- Bicep 0.4.613 +- Cabal 3.4.0.0 +- CMake 3.21.1 +- CodeQL Action Bundle 2.5.9 +- Docker 20.10.6 +- Docker-compose 1.29.2 +- ghc 9.0.1 +- Git 2.33.0 +- Git LFS 2.13.3 +- GVFS 1.0.21085.9 +- jq 1.6 +- Kind 0.11.1 +- Kubectl 1.22.0 +- Mercurial 5.0 +- Mingw-w64 8.1.0 +- Newman 5.2.4 +- OpenSSL 1.1.1 +- Packer 1.7.4 +- Pulumi v3.10.2 +- R 4.1.1 +- Stack 2.7.3 +- Subversion (SVN) 1.14.1 +- Swig 4.0.2 +- VSWhere 2.8.4 +- WinAppDriver 1.2.2009.02003 +- yamllint 1.26.2 +- zstd 1.5.0 + +### CLI Tools +- Alibaba Cloud CLI 3.0.88 +- AWS CLI 2.2.30 +- AWS SAM CLI 1.28.0 +- AWS Session Manager CLI 1.2.245.0 +- Azure CLI 2.27.1 +- Azure DevOps CLI extension 0.20.0 +- GitHub CLI 1.14.0 +- Hub CLI 2.14.2 + +### Rust Tools +- Cargo 1.54.0 +- Rust 1.54.0 +- Rustdoc 1.54.0 +- Rustup 1.24.3 + +#### Packages +- bindgen 0.59.1 +- cargo-audit 0.14.1 +- cargo-outdated v0.9.17 +- cbindgen 0.20.0 +- Clippy 0.1.54 +- Rustfmt 1.4.37 + +### Browsers and webdrivers +- Google Chrome 92.0.4515.159 +- Chrome Driver 92.0.4515.107 +- Microsoft Edge 92.0.902.73 +- Microsoft Edge Driver 92.0.902.73 +- Mozilla Firefox 91.0.1 +- Gecko Driver 0.29.1 +- IE Driver 3.150.1.1 + +#### Environment variables +| Name | Value | +| --------------- | ---------------------------------- | +| CHROMEWEBDRIVER | C:\SeleniumWebDrivers\ChromeDriver | +| EDGEWEBDRIVER | C:\SeleniumWebDrivers\EdgeDriver | +| GECKOWEBDRIVER | C:\SeleniumWebDrivers\GeckoDriver | + +### Java +| Version | Vendor | Environment Variable | +| ------------------- | ------------- | -------------------- | +| 8.0.302+8 (default) | Adopt OpenJDK | JAVA_HOME_8_X64 | +| 11.0.12+7 | Adopt OpenJDK | JAVA_HOME_11_X64 | + +### Shells +| Name | Target | +| ------------- | --------------------------------- | +| gitbash.exe | C:\Program Files\Git\bin\bash.exe | +| msys2bash.cmd | C:\msys64\usr\bin\bash.exe | +| wslbash.exe | C:\Windows\System32\bash.exe | + +### MSYS2 +- Pacman 6.0.0 +##### Notes: +``` +Location: C:\msys64 + +Note: MSYS2 is pre-installed on image but not added to PATH. +``` +### Cached Tools +#### Go +| Version | Architecture | Environment Variable | +| ------- | ------------ | -------------------- | +| 1.15.15 | x64 | GOROOT_1_15_X64 | +| 1.16.7 (Default) | x64 | GOROOT_1_16_X64 | + + +#### Node +| Version | Architecture | +| ------- | ------------ | +| 10.24.1 | x64 | +| 12.22.5 | x64 | +| 14.17.5 | x64 | + + +#### Python +| Version | Architecture | +| ------- | ------------ | +| 3.7.9 | x64 | +| 3.8.10 | x64 | +| 3.9.6 (Default) | x64 | + + +#### Ruby +| Version | Architecture | +| ------- | ------------ | +| 2.7.4 | x64 | +| 3.0.2 (Default) | x64 | + + +#### PyPy +| Python Version | PyPy Version | +| -------------- | ------------ | +| 2.7.18 | PyPy 7.3.5 with MSC v.1927 64 bit (AMD64) | +| 3.7.10 | PyPy 7.3.5 with MSC v.1927 64 bit (AMD64) | + + + +### Databases +#### PostgreSQL +| Property | Value | +| -------------------- | ------------------------------------------------------------------------------------------------------------------------------------ | +| ServiceName | postgresql-x64-13 | +| Version | 13.4 | +| ServiceStatus | Stopped | +| ServiceStartType | Disabled | +| 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 | + + +#### MongoDB +| Version | ServiceName | ServiceStatus | ServiceStartType | +| ------- | ----------- | ------------- | ---------------- | +| 5.0.2.0 | MongoDB | Running | Automatic | + + + +### Database tools +- Azure CosmosDb Emulator 2.14.2.0 +- DacFx 15.0.5164.1 +- MySQL 5.7.21.0 +- SQLPS 1.0 + + +### Web Servers +| Name | Version | ConfigFile | ServiceName | ServiceStatus | ListenPort | +| ------ | ------- | ------------------------------------- | ----------- | ------------- | ---------- | +| Apache | 2.4.48 | C:\tools\Apache24\conf\httpd.conf | Apache | Stopped | 80 | +| Nginx | 1.21.1 | C:\tools\nginx-1.21.1\conf\nginx.conf | nginx | Stopped | 80 | + +### Visual Studio Enterprise 2022 +| Name | Version | Path | +| ----------------------------- | -------------- | ----------------------------------------------------- | +| Visual Studio Enterprise 2022 | 17.0.31612.314 | C:\Program Files\Microsoft Visual Studio\2022\Preview | + +#### Workloads, components and extensions: + +| Package | Version | +| ------------------------------------------------------------------------- | -------------- | +| Component.Android.NDK.R21E | 17.0.31530.272 | +| Component.Android.SDK25.Private | 17.0.31530.272 | +| Component.Android.SDK30 | 17.0.31530.272 | +| Component.Ant | 1.9.3.8 | +| Component.Linux.CMake | 17.0.31530.272 | +| Component.MDD.Android | 17.0.31530.272 | +| Component.MDD.Linux | 17.0.31530.272 | +| Component.Microsoft.VisualStudio.LiveShare | 1.0.4583 | +| Component.Microsoft.VisualStudio.RazorExtension | 17.0.31530.272 | +| Component.Microsoft.VisualStudio.Web.AzureFunctions | 17.0.31530.272 | +| Component.Microsoft.Web.LibraryManager | 17.0.31530.272 | +| Component.Microsoft.WebTools.BrowserLink.WebLivePreview | 0.9.8.45772 | +| Component.OpenJDK | 17.0.31530.272 | +| Component.UnityEngine.x64 | 17.0.31530.272 | +| Component.Unreal | 17.0.31530.272 | +| Component.Unreal.Android | 17.0.31530.272 | +| Component.Xamarin | 17.0.31530.272 | +| Component.Xamarin.RemotedSimulator | 17.0.31530.272 | +| Microsoft.Component.Azure.DataLake.Tools | 17.0.31530.272 | +| Microsoft.Component.MSBuild | 17.0.31530.272 | +| Microsoft.Component.NetFX.Native | 17.0.31530.272 | +| Microsoft.Component.PythonTools | 17.0.31530.272 | +| Microsoft.Component.VC.Runtime.UCRTSDK | 17.0.31530.272 | +| Microsoft.ComponentGroup.Blend | 17.0.31530.272 | +| Microsoft.ComponentGroup.ClickOnce.Publish | 17.0.31530.272 | +| Microsoft.Net.Component.4.5.2.TargetingPack | 17.0.31530.272 | +| Microsoft.Net.Component.4.6.2.TargetingPack | 17.0.31530.272 | +| Microsoft.Net.Component.4.6.TargetingPack | 17.0.31530.272 | +| Microsoft.Net.Component.4.7.1.TargetingPack | 17.0.31530.272 | +| Microsoft.Net.Component.4.7.2.TargetingPack | 17.0.31530.272 | +| Microsoft.Net.Component.4.8.SDK | 17.0.31530.272 | +| Microsoft.Net.Component.4.8.TargetingPack | 17.0.31530.272 | +| Microsoft.Net.ComponentGroup.4.8.DeveloperTools | 17.0.31530.272 | +| Microsoft.Net.ComponentGroup.DevelopmentPrerequisites | 17.0.31530.272 | +| Microsoft.Net.ComponentGroup.TargetingPacks.Common | 17.0.31530.272 | +| Microsoft.NetCore.Component.DevelopmentTools | 17.0.31530.272 | +| Microsoft.NetCore.Component.Runtime.6.0 | 17.0.31604.169 | +| Microsoft.NetCore.Component.SDK | 17.0.31604.169 | +| Microsoft.NetCore.Component.Web | 17.0.31530.272 | +| Microsoft.VisualStudio.Component.AppInsights.Tools | 17.0.31530.272 | +| Microsoft.VisualStudio.Component.AspNet | 17.0.31530.272 | +| Microsoft.VisualStudio.Component.AspNet45 | 17.0.31530.272 | +| Microsoft.VisualStudio.Component.Azure.AuthoringTools | 17.0.31530.272 | +| Microsoft.VisualStudio.Component.Azure.ClientLibs | 17.0.31530.272 | +| Microsoft.VisualStudio.Component.Azure.Compute.Emulator | 17.0.31530.272 | +| Microsoft.VisualStudio.Component.Azure.Powershell | 17.0.31530.272 | +| Microsoft.VisualStudio.Component.Azure.ResourceManager.Tools | 17.0.31530.272 | +| Microsoft.VisualStudio.Component.Azure.ServiceFabric.Tools | 17.0.31530.272 | +| Microsoft.VisualStudio.Component.Azure.Waverton | 17.0.31530.272 | +| Microsoft.VisualStudio.Component.Azure.Waverton.BuildTools | 17.0.31530.272 | +| Microsoft.VisualStudio.Component.ClassDesigner | 17.0.31530.272 | +| Microsoft.VisualStudio.Component.CodeMap | 17.0.31530.272 | +| Microsoft.VisualStudio.Component.Common.Azure.Tools | 17.0.31530.272 | +| Microsoft.VisualStudio.Component.CoreEditor | 17.0.31530.272 | +| Microsoft.VisualStudio.Component.Debugger.JustInTime | 17.0.31530.272 | +| Microsoft.VisualStudio.Component.Debugger.Snapshot | 17.0.31530.272 | +| Microsoft.VisualStudio.Component.DiagnosticTools | 17.0.31530.272 | +| Microsoft.VisualStudio.Component.DockerTools | 17.0.31530.272 | +| Microsoft.VisualStudio.Component.DotNetModelBuilder | 17.0.31530.272 | +| Microsoft.VisualStudio.Component.EntityFramework | 17.0.31530.272 | +| Microsoft.VisualStudio.Component.FSharp | 17.0.31530.272 | +| Microsoft.VisualStudio.Component.FSharp.WebTemplates | 17.0.31530.272 | +| Microsoft.VisualStudio.Component.GraphDocument | 17.0.31530.272 | +| Microsoft.VisualStudio.Component.Graphics | 17.0.31530.272 | +| Microsoft.VisualStudio.Component.Graphics.Tools | 17.0.31530.272 | +| Microsoft.VisualStudio.Component.IISExpress | 17.0.31530.272 | +| Microsoft.VisualStudio.Component.IntelliCode | 17.0.31530.272 | +| Microsoft.VisualStudio.Component.IntelliTrace.FrontEnd | 17.0.31530.272 | +| Microsoft.VisualStudio.Component.JavaScript.Diagnostics | 17.0.31530.272 | +| Microsoft.VisualStudio.Component.JavaScript.TypeScript | 17.0.31530.272 | +| Microsoft.VisualStudio.Component.LinqToSql | 17.0.31530.272 | +| Microsoft.VisualStudio.Component.LiveUnitTesting | 17.0.31530.272 | +| Microsoft.VisualStudio.Component.ManagedDesktop.Core | 17.0.31530.272 | +| Microsoft.VisualStudio.Component.ManagedDesktop.Prerequisites | 17.0.31530.272 | +| Microsoft.VisualStudio.Component.Merq | 17.0.31530.272 | +| Microsoft.VisualStudio.Component.MonoDebugger | 17.0.31530.272 | +| Microsoft.VisualStudio.Component.MSODBC.SQL | 17.0.31530.272 | +| Microsoft.VisualStudio.Component.MSSQL.CMDLnUtils | 17.0.31530.272 | +| Microsoft.VisualStudio.Component.Node.Tools | 17.0.31530.272 | +| Microsoft.VisualStudio.Component.NuGet | 17.0.31530.272 | +| Microsoft.VisualStudio.Component.NuGet.BuildTools | 17.0.31530.272 | +| Microsoft.VisualStudio.Component.PortableLibrary | 17.0.31530.272 | +| Microsoft.VisualStudio.Component.Roslyn.Compiler | 17.0.31530.272 | +| Microsoft.VisualStudio.Component.Roslyn.LanguageServices | 17.0.31530.272 | +| Microsoft.VisualStudio.Component.Sharepoint.Tools | 17.0.31530.272 | +| Microsoft.VisualStudio.Component.SQL.CLR | 17.0.31530.272 | +| Microsoft.VisualStudio.Component.SQL.DataSources | 17.0.31530.272 | +| Microsoft.VisualStudio.Component.SQL.LocalDB.Runtime | 17.0.31530.272 | +| Microsoft.VisualStudio.Component.SQL.SSDT | 17.0.31530.272 | +| Microsoft.VisualStudio.Component.TeamOffice | 17.0.31530.272 | +| Microsoft.VisualStudio.Component.TestTools.CodedUITest | 17.0.31530.272 | +| Microsoft.VisualStudio.Component.TestTools.WebLoadTest | 17.0.31530.272 | +| Microsoft.VisualStudio.Component.TextTemplating | 17.0.31530.272 | +| Microsoft.VisualStudio.Component.TypeScript.TSServer | 17.0.31530.272 | +| Microsoft.VisualStudio.Component.Unity | 17.0.31530.272 | +| Microsoft.VisualStudio.Component.VC.ASAN | 17.0.31530.272 | +| Microsoft.VisualStudio.Component.VC.ATL | 17.0.31530.272 | +| Microsoft.VisualStudio.Component.VC.CLI.Support | 17.0.31530.272 | +| Microsoft.VisualStudio.Component.VC.CMake.Project | 17.0.31530.272 | +| Microsoft.VisualStudio.Component.VC.CoreIde | 17.0.31530.272 | +| Microsoft.VisualStudio.Component.VC.DiagnosticTools | 17.0.31530.272 | +| Microsoft.VisualStudio.Component.VC.Llvm.ClangToolset | 17.0.31530.272 | +| Microsoft.VisualStudio.Component.VC.Redist.14.Latest | 17.0.31530.272 | +| Microsoft.VisualStudio.Component.VC.Runtimes.x86.x64.Spectre | 17.0.31530.272 | +| Microsoft.VisualStudio.Component.VC.TestAdapterForBoostTest | 17.0.31530.272 | +| Microsoft.VisualStudio.Component.VC.TestAdapterForGoogleTest | 17.0.31530.272 | +| Microsoft.VisualStudio.Component.VC.Tools.x86.x64 | 17.0.31530.272 | +| Microsoft.VisualStudio.Component.VC.v141.ATL | 17.0.31530.272 | +| Microsoft.VisualStudio.Component.VC.v141.ATL.Spectre | 17.0.31530.272 | +| Microsoft.VisualStudio.Component.VC.v141.MFC | 17.0.31530.272 | +| Microsoft.VisualStudio.Component.VC.v141.MFC.Spectre | 17.0.31530.272 | +| Microsoft.VisualStudio.Component.VC.v141.x86.x64 | 17.0.31530.272 | +| Microsoft.VisualStudio.Component.VC.v141.x86.x64.Spectre | 17.0.31530.272 | +| Microsoft.VisualStudio.Component.VSSDK | 17.0.31530.272 | +| Microsoft.VisualStudio.Component.Wcf.Tooling | 17.0.31530.272 | +| Microsoft.VisualStudio.Component.Web | 17.0.31530.272 | +| Microsoft.VisualStudio.Component.WebDeploy | 17.0.31530.272 | +| Microsoft.VisualStudio.Component.Windows10SDK | 17.0.31530.272 | +| Microsoft.VisualStudio.Component.Windows10SDK.19041 | 17.0.31530.272 | +| Microsoft.VisualStudio.Component.Workflow | 17.0.31530.272 | +| Microsoft.VisualStudio.Component.WslDebugging | 17.0.31530.272 | +| Microsoft.VisualStudio.ComponentGroup.ArchitectureTools.Native | 17.0.31530.272 | +| Microsoft.VisualStudio.ComponentGroup.Azure.CloudServices | 17.0.31530.272 | +| Microsoft.VisualStudio.ComponentGroup.Azure.Prerequisites | 17.0.31530.272 | +| Microsoft.VisualStudio.ComponentGroup.Azure.ResourceManager.Tools | 17.0.31530.272 | +| Microsoft.VisualStudio.ComponentGroup.AzureFunctions | 17.0.31530.272 | +| Microsoft.VisualStudio.ComponentGroup.MSIX.Packaging | 17.0.31530.272 | +| Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core | 17.0.31530.272 | +| Microsoft.VisualStudio.ComponentGroup.UWP.NetCoreAndStandard | 17.0.31530.272 | +| Microsoft.VisualStudio.ComponentGroup.UWP.Support | 17.0.31530.272 | +| Microsoft.VisualStudio.ComponentGroup.UWP.Xamarin | 17.0.31530.272 | +| Microsoft.VisualStudio.ComponentGroup.VisualStudioExtension.Prerequisites | 17.0.31530.272 | +| Microsoft.VisualStudio.ComponentGroup.Web | 17.0.31530.272 | +| Microsoft.VisualStudio.ComponentGroup.Web.CloudTools | 17.0.31530.272 | +| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions | 17.0.31530.272 | +| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.CMake | 17.0.31530.272 | +| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.TemplateEngine | 17.0.31530.272 | +| Microsoft.VisualStudio.Workload.Azure | 17.0.31530.272 | +| Microsoft.VisualStudio.Workload.CoreEditor | 17.0.31530.272 | +| Microsoft.VisualStudio.Workload.Data | 17.0.31530.272 | +| Microsoft.VisualStudio.Workload.ManagedDesktop | 17.0.31530.272 | +| Microsoft.VisualStudio.Workload.ManagedGame | 17.0.31530.272 | +| Microsoft.VisualStudio.Workload.NativeCrossPlat | 17.0.31530.272 | +| Microsoft.VisualStudio.Workload.NativeDesktop | 17.0.31530.272 | +| Microsoft.VisualStudio.Workload.NativeGame | 17.0.31530.272 | +| Microsoft.VisualStudio.Workload.NativeMobile | 17.0.31530.272 | +| Microsoft.VisualStudio.Workload.NetCrossPlat | 17.0.31530.272 | +| Microsoft.VisualStudio.Workload.NetWeb | 17.0.31530.272 | +| Microsoft.VisualStudio.Workload.Node | 17.0.31530.272 | +| Microsoft.VisualStudio.Workload.Office | 17.0.31530.272 | +| Microsoft.VisualStudio.Workload.Python | 17.0.31530.272 | +| Microsoft.VisualStudio.Workload.Universal | 17.0.31530.272 | +| Microsoft.VisualStudio.Workload.VisualStudioExtension | 17.0.31530.272 | + +#### Microsoft Visual C++: + +| Name | Architecture | Version | +| -------------------------------------------- | ------------ | ----------- | +| Microsoft Visual C++ 2013 Additional Runtime | x64 | 12.0.40660 | +| Microsoft Visual C++ 2013 Minimum Runtime | x64 | 12.0.40660 | +| Microsoft Visual C++ 2022 Additional Runtime | x64 | 14.30.30423 | +| Microsoft Visual C++ 2022 Debug Runtime | x64 | 14.30.30423 | +| Microsoft Visual C++ 2022 Minimum Runtime | x64 | 14.30.30423 | +| Microsoft Visual C++ 2022 Additional Runtime | x86 | 14.30.30423 | +| Microsoft Visual C++ 2022 Debug Runtime | x86 | 14.30.30423 | +| Microsoft Visual C++ 2022 Minimum Runtime | x86 | 14.30.30423 | + +### .NET Core SDK +`Location C:\Program Files\dotnet\sdk` +- 3.1.118 3.1.202 3.1.302 3.1.412 5.0.104 5.0.206 5.0.303 5.0.400 6.0.100-preview.7.21379.14 + +### .NET Core Runtime +`Location: C:\Program Files\dotnet\shared\Microsoft.AspNetCore.App` +- 3.1.4 3.1.6 3.1.18 5.0.4 5.0.9 6.0.0-preview.7.21378.6 + +`Location: C:\Program Files\dotnet\shared\Microsoft.NETCore.App` +- 3.1.4 3.1.6 3.1.18 5.0.4 5.0.9 6.0.0-preview.7.21377.19 + +`Location: C:\Program Files\dotnet\shared\Microsoft.WindowsDesktop.App` +- 3.1.4 3.1.6 3.1.18 5.0.4 5.0.9 6.0.0-preview.7.21378.9 + +### .NET Framework +`Type: Developer Pack` +`Location C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX Tools` +- 4.8 + +### PowerShell Tools +- PowerShell 7.1.4 + +#### Azure Powershell Modules +| Module | Version | Path | +| ------- | ------------------------------------------------------------------------------- | ------------------------------ | +| Az | 6.1.0 | C:\Modules\az_\ | +| Azure | 2.1.0 [Installed]
3.8.0.zip
4.2.1.zip
5.1.1.zip
5.3.0 | C:\Modules\azure_\ | +| AzureRM | 2.1.0 [Installed]
3.8.0.zip
4.2.1.zip
5.1.1.zip
6.7.0.zip
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.3.0 | +| PowerShellGet | 1.0.0.1
2.2.5 | +| PSScriptAnalyzer | 1.19.1 | +| PSWindowsUpdate | 2.2.0.2 | +| SqlServer | 21.1.18256 | +| VSSetup | 2.2.16 | + +### Android +| Package Name | Version | +| -------------------------- | ---------------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 4.0 | +| Android Emulator | 30.8.4 | +| Android SDK Build-tools | 31.0.0
30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3 | +| Android SDK Platforms | android-31 (rev 1)
android-30 (rev 3)
android-29 (rev 5)
android-28 (rev 6)
android-27 (rev 3) | +| Android SDK Platform-Tools | 31.0.3 | +| Android Support Repository | 47.0.0 | +| CMake | 3.18.1 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 21.4.7075529
22.1.7171670 | +| SDK Patch Applier v4 | 1 | + +#### Environment variables +| Name | Value | +| ----------------------- | ---------------------------------------------------------------------------- | +| ANDROID_HOME | C:\Android\android-sdk | +| ANDROID_NDK_HOME | C:\Android\android-sdk\ndk-bundle -> C:\Android\android-sdk\ndk\21.4.7075529 | +| ANDROID_NDK_LATEST_HOME | C:\Android\android-sdk\ndk\22.1.7171670 | +| ANDROID_NDK_PATH | C:\Android\android-sdk\ndk-bundle -> C:\Android\android-sdk\ndk\21.4.7075529 | +| ANDROID_NDK_ROOT | C:\Android\android-sdk\ndk-bundle -> C:\Android\android-sdk\ndk\21.4.7075529 | +| ANDROID_SDK_ROOT | C:\Android\android-sdk | + + + From 747a0410cdad4831c6aef2ccf23b95ac69c25c8b Mon Sep 17 00:00:00 2001 From: Vladimir Safonkin Date: Mon, 23 Aug 2021 16:24:32 +0300 Subject: [PATCH 0474/3485] Fix workflow step to request PR reviewers (#3948) --- .github/workflows/create_pull_request.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/create_pull_request.yml b/.github/workflows/create_pull_request.yml index f430613665c7..396509a92900 100644 --- a/.github/workflows/create_pull_request.yml +++ b/.github/workflows/create_pull_request.yml @@ -42,8 +42,8 @@ jobs: github-token: ${{secrets.GITHUB_TOKEN}} script: | github.pulls.requestReviewers({ - owner: context.repo.owner - repo: context.repo.repo - pull_number: ${{ steps.create-pr.outputs.result }} + owner: context.repo.owner, + repo: context.repo.repo, + pull_number: ${{ steps.create-pr.outputs.result }}, team_reviewers: ['virtual-environments-akvelon'] }) \ No newline at end of file From be3b04122388d4f2f44737419fa13ef9e7bae39a Mon Sep 17 00:00:00 2001 From: Maxim Lobanov Date: Mon, 23 Aug 2021 19:47:08 +0300 Subject: [PATCH 0475/3485] Update readme with Windows Server 2022 info (#3951) * update readme with Windows Server 2022 info * fix comments --- .github/ISSUE_TEMPLATE/announcement.yml | 1 + .github/ISSUE_TEMPLATE/bug-report.yml | 1 + .github/ISSUE_TEMPLATE/tool-request.yml | 1 + README.md | 11 ++++------- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/announcement.yml b/.github/ISSUE_TEMPLATE/announcement.yml index ccc3d202f5e9..3c414cbca4da 100644 --- a/.github/ISSUE_TEMPLATE/announcement.yml +++ b/.github/ISSUE_TEMPLATE/announcement.yml @@ -37,6 +37,7 @@ body: - label: macOS 11 - label: Windows Server 2016 - label: Windows Server 2019 + - label: Windows Server 2022 validations: required: true - type: textarea diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml index 2631fd08e6fb..61b05c56280e 100644 --- a/.github/ISSUE_TEMPLATE/bug-report.yml +++ b/.github/ISSUE_TEMPLATE/bug-report.yml @@ -19,6 +19,7 @@ body: - label: macOS 11 - label: Windows Server 2016 - label: Windows Server 2019 + - label: Windows Server 2022 validations: required: true - type: textarea diff --git a/.github/ISSUE_TEMPLATE/tool-request.yml b/.github/ISSUE_TEMPLATE/tool-request.yml index 5973500fd5a3..87cee793ee54 100644 --- a/.github/ISSUE_TEMPLATE/tool-request.yml +++ b/.github/ISSUE_TEMPLATE/tool-request.yml @@ -58,6 +58,7 @@ body: - label: macOS 11 - label: Windows Server 2016 - label: Windows Server 2019 + - label: Windows Server 2022 validations: required: true - type: textarea diff --git a/README.md b/README.md index 5337a24c4393..491922e0fa40 100644 --- a/README.md +++ b/README.md @@ -14,15 +14,11 @@ For general questions about using the virtual environments or writing your Actio | Ubuntu 18.04 | `ubuntu-18.04` | [ubuntu-18.04] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu18&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu18&redirect=1) | macOS 11 | `macos-11` | [macOS-11] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-11&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-11&redirect=1) | macOS 10.15 | `macos-latest` or `macos-10.15` | [macOS-10.15] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-10.15&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-10.15&redirect=1) +| Windows Server 2022[beta] | `windows-2022` | [windows-2022] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=windows-2022&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=windows-2022&redirect=1) | | Windows Server 2019 | `windows-latest` or `windows-2019` | [windows-2019] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=windows-2019&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=windows-2019&redirect=1) | Windows Server 2016 | `windows-2016` | [windows-2016] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=windows-2016&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=windows-2016&redirect=1) -``` -Ubuntu 16.04 has been deprecated and will be removed on September 20, 2021. Its usage is limited to current customers, no new onboardings are accepted. -Existing workflows using `Ubuntu 16.04` should migrate to `Ubuntu 20.04` or `Ubuntu 18.04` -``` -> The macOS 11 virtual environment is currently available only on GitHub Actions. Azure DevOps users can track the macOS 11 onboarding progress in [this issue](https://github.com/actions/virtual-environments/issues/2072).
-The `macos-latest` YAML workflow label still uses the macOS 10.15 virtual environment. +Note: Beta and Preview images are provided "as-is", "with all faults" and "as available" and are excluded from the service level agreement and warranty. Beta and Preview images may not be covered by customer support. ***What images are available for GitHub Actions and Azure DevOps?*** The availability of images for GitHub Actions and Azure DevOps is different. See documentation for more details: @@ -53,7 +49,8 @@ You can also track upcoming changes using the [awaiting-deployment](https://gith [ubuntu-20.04]: https://github.com/actions/virtual-environments/blob/main/images/linux/Ubuntu2004-README.md [ubuntu-18.04]: https://github.com/actions/virtual-environments/blob/main/images/linux/Ubuntu1804-README.md [ubuntu-16.04]: https://github.com/actions/virtual-environments/blob/main/images/linux/Ubuntu1604-README.md -[Windows-2019]: https://github.com/actions/virtual-environments/blob/main/images/win/Windows2019-Readme.md +[windows-2022]: https://github.com/actions/virtual-environments/blob/main/images/win/Windows2022-Readme.md +[windows-2019]: https://github.com/actions/virtual-environments/blob/main/images/win/Windows2019-Readme.md [windows-2016]: https://github.com/actions/virtual-environments/blob/main/images/win/Windows2016-Readme.md [macOS-11]: https://github.com/actions/virtual-environments/blob/main/images/macos/macos-11-Readme.md [macOS-10.15]: https://github.com/actions/virtual-environments/blob/main/images/macos/macos-10.15-Readme.md From 22087b3c7a47428a189641f863bcf8ed8f142ace Mon Sep 17 00:00:00 2001 From: Dibir Magomedsaygitov <61747324+dibir-magomedsaygitov@users.noreply.github.com> Date: Mon, 23 Aug 2021 19:51:55 +0300 Subject: [PATCH 0476/3485] [Windows] Add Visual Studio component (#3946) --- images/win/toolsets/toolset-2019.json | 1 + 1 file changed, 1 insertion(+) diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index 786b73b9c57d..96379ed36001 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -334,6 +334,7 @@ "Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Llvm.Clang", "Microsoft.VisualStudio.ComponentGroup.Web.CloudTools", "Microsoft.VisualStudio.ComponentGroup.UWP.VC", + "Microsoft.VisualStudio.ComponentGroup.UWP.VC.v141", "Microsoft.VisualStudio.Workload.Azure", "Microsoft.VisualStudio.Workload.Data", "Microsoft.VisualStudio.Workload.DataScience", From 557fce161e8a546adcaf3a62f22dcd539d43d609 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Tue, 24 Aug 2021 13:45:49 +0300 Subject: [PATCH 0477/3485] [Ubuntu] scripts: move invoke_tests at the bottom (#3950) --- images/linux/scripts/installers/erlang.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/linux/scripts/installers/erlang.sh b/images/linux/scripts/installers/erlang.sh index 73c973aa3276..1eef1cb5a3e6 100644 --- a/images/linux/scripts/installers/erlang.sh +++ b/images/linux/scripts/installers/erlang.sh @@ -23,7 +23,7 @@ download_with_retries $rebar3DownloadUrl "/tmp" mv /tmp/rebar3 /usr/local/bin/rebar3 chmod +x /usr/local/bin/rebar3 -invoke_tests "Tools" "erlang" - # Clean up source list rm $source_list + +invoke_tests "Tools" "erlang" From c97ae471476e7184b6e0fb676798f5acd53686b8 Mon Sep 17 00:00:00 2001 From: Darleev <50947177+Darleev@users.noreply.github.com> Date: Wed, 25 Aug 2021 09:57:13 +0100 Subject: [PATCH 0478/3485] [macOS 11] Fix for invalid link to release and software report (#3954) --- images/macos/provision/configuration/preimagedata.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/images/macos/provision/configuration/preimagedata.sh b/images/macos/provision/configuration/preimagedata.sh index 20220886751b..4f20c842a962 100644 --- a/images/macos/provision/configuration/preimagedata.sh +++ b/images/macos/provision/configuration/preimagedata.sh @@ -8,6 +8,11 @@ os_name=$(sw_vers -productName) os_version=$(sw_vers -productVersion) os_build=$(sw_vers -buildVersion) label_version=$(echo $os_version | cut -d. -f1,2) +if is_Less_BigSur; then + label_version=$(echo $os_version | cut -d. -f1,2) +else + label_version=$(echo $os_version | cut -d. -f1) +fi image_label="macos-${label_version}" release_label="macOS-${label_version}" software_url="https://github.com/actions/virtual-environments/blob/${release_label}/${image_version}/images/macos/${image_label}-Readme.md" From 9d76ecf42223ca5e5150ad01ff3520b39ba4e165 Mon Sep 17 00:00:00 2001 From: Darleev <50947177+Darleev@users.noreply.github.com> Date: Thu, 26 Aug 2021 13:30:52 +0100 Subject: [PATCH 0479/3485] added logs verbosity (#3964) --- helpers/GenerateResourcesAndImage.ps1 | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/helpers/GenerateResourcesAndImage.ps1 b/helpers/GenerateResourcesAndImage.ps1 index c9b8db398aac..623a08ea5632 100644 --- a/helpers/GenerateResourcesAndImage.ps1 +++ b/helpers/GenerateResourcesAndImage.ps1 @@ -3,9 +3,10 @@ $ErrorActionPreference = 'Stop' enum ImageType { Windows2016 = 0 Windows2019 = 1 - Ubuntu1604 = 2 - Ubuntu1804 = 3 - Ubuntu2004 = 4 + Windows2022 = 2 + Ubuntu1604 = 3 + Ubuntu1804 = 4 + Ubuntu2004 = 5 } Function Get-PackerTemplatePath { @@ -23,6 +24,9 @@ Function Get-PackerTemplatePath { ([ImageType]::Windows2019) { $relativeTemplatePath = Join-Path "win" "windows2019.json" } + ([ImageType]::Windows2022) { + $relativeTemplatePath = Join-Path "win" "windows2022.json" + } ([ImageType]::Ubuntu1604) { $relativeTemplatePath = Join-Path "linux" "ubuntu1604.json" } From ca518292362efad7bb285768ad0f0ebd9058d0fc Mon Sep 17 00:00:00 2001 From: Vladimir Safonkin Date: Thu, 26 Aug 2021 15:46:31 +0300 Subject: [PATCH 0480/3485] Try org token to request reviewers for update image PR (#3965) --- .github/workflows/create_pull_request.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/create_pull_request.yml b/.github/workflows/create_pull_request.yml index 396509a92900..14c460f6a697 100644 --- a/.github/workflows/create_pull_request.yml +++ b/.github/workflows/create_pull_request.yml @@ -39,7 +39,7 @@ jobs: - name: Request reviewers uses: actions/github-script@v2 with: - github-token: ${{secrets.GITHUB_TOKEN}} + github-token: ${{secrets.PRAPPROVAL_SECRET}} script: | github.pulls.requestReviewers({ owner: context.repo.owner, From 5aa96839a892457fe3720c0fd69e86d8821aa0b8 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Fri, 27 Aug 2021 09:38:18 +0300 Subject: [PATCH 0481/3485] [Windows] win: add validation InstalledSoftware.md and testResults.xml files (#3960) * win: add validation InstalledSoftware.md file --- .../win/scripts/ImageHelpers/InstallHelpers.ps1 | 2 +- images/win/scripts/ImageHelpers/TestsHelpers.ps1 | 4 ++++ .../SoftwareReport/SoftwareReport.Android.psm1 | 2 +- .../SoftwareReport/SoftwareReport.Tools.psm1 | 3 +-- .../SoftwareReport.WebServers.psm1 | 4 ++-- images/win/scripts/Tests/Nginx.Tests.ps1 | 2 +- images/win/windows2016.json | 12 ++++++++++++ images/win/windows2019.json | 16 ++++++++++++++-- images/win/windows2022.json | 16 ++++++++++++++-- 9 files changed, 50 insertions(+), 11 deletions(-) diff --git a/images/win/scripts/ImageHelpers/InstallHelpers.ps1 b/images/win/scripts/ImageHelpers/InstallHelpers.ps1 index 30f08c97dd12..ececdce84efd 100644 --- a/images/win/scripts/ImageHelpers/InstallHelpers.ps1 +++ b/images/win/scripts/ImageHelpers/InstallHelpers.ps1 @@ -439,7 +439,7 @@ function Get-AndroidPackages { [string]$AndroidSDKManagerPath ) - return (& $AndroidSDKManagerPath --list --verbose).Trim() | Foreach-Object { $_.Split()[0] } | Where-Object {$_} + return (cmd /c "$AndroidSDKManagerPath --list --verbose 2>&1").Trim() | Foreach-Object { $_.Split()[0] } | Where-Object {$_} } function Get-AndroidPackagesByName { diff --git a/images/win/scripts/ImageHelpers/TestsHelpers.ps1 b/images/win/scripts/ImageHelpers/TestsHelpers.ps1 index 9cbfb1badb80..fcc9a61931c0 100644 --- a/images/win/scripts/ImageHelpers/TestsHelpers.ps1 +++ b/images/win/scripts/ImageHelpers/TestsHelpers.ps1 @@ -53,6 +53,10 @@ function Invoke-PesterTests { if ($TestName) { $configuration.Filter.FullName = $TestName } + if ($TestFile -eq "*") { + $configuration.TestResult.Enabled = $true + $configuration.TestResult.OutputPath = "C:\image\Tests\testResults.xml" + } # Update environment variables without reboot Update-Environment diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Android.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Android.psm1 index 8953d337b9a1..08db50303b9d 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Android.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Android.psm1 @@ -21,7 +21,7 @@ function Get-AndroidSDKManagerPath { function Get-AndroidInstalledPackages { $androidSDKManagerPath = Get-AndroidSDKManagerPath - $androidSDKManagerList = & $androidSDKManagerPath --list_installed + $androidSDKManagerList = cmd /c "$androidSDKManagerPath --list_installed 2>&1" return $androidSDKManagerList } diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 index a9ccfb8e5374..3c465142a77c 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 @@ -271,8 +271,7 @@ function Get-VisualCPPComponents { } function Get-DacFxVersion { - cd "C:\Program Files\Microsoft SQL Server\150\DAC\bin\" - $dacfxversion = (./sqlpackage.exe /version) + $dacfxversion = & "$env:ProgramFiles\Microsoft SQL Server\150\DAC\bin\sqlpackage.exe" /version return "DacFx $dacfxversion" } diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.WebServers.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.WebServers.psm1 index 2d09c87e4f44..17f1f989002a 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.WebServers.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.WebServers.psm1 @@ -13,8 +13,8 @@ function Get-ApacheVersion { } function Get-NginxVersion { - $nginxBinPath = Join-Path (Get-NginxPath) "\nginx" - (. $nginxBinPath -v 2>&1 | Select-String -Pattern "nginx/") -match "nginx/(?\d+\.\d+\.\d+)" | Out-Null + $nginxBinPath = Join-Path (Get-NginxPath) "nginx" + (cmd /c "$nginxBinPath -v 2>&1") -match "nginx/(?\d+\.\d+\.\d+)" | Out-Null return $Matches.Version } diff --git a/images/win/scripts/Tests/Nginx.Tests.ps1 b/images/win/scripts/Tests/Nginx.Tests.ps1 index e1e7b6f6c72d..8c6e7ec0298d 100644 --- a/images/win/scripts/Tests/Nginx.Tests.ps1 +++ b/images/win/scripts/Tests/Nginx.Tests.ps1 @@ -1,7 +1,7 @@ Describe "Nginx" { Context "Path" { It "Nginx" { - $nginxPath = Join-Path (Join-Path "C:\tools\" (Get-Item C:\tools\nginx*).Name) "\nginx" + $nginxPath = Join-Path (Join-Path "C:\tools\" (Get-Item C:\tools\nginx*).Name) "nginx" "$nginxPath -v" | Should -ReturnZeroExitCode } } diff --git a/images/win/windows2016.json b/images/win/windows2016.json index 8237c40b0e85..8f05537c5a75 100644 --- a/images/win/windows2016.json +++ b/images/win/windows2016.json @@ -264,6 +264,12 @@ "{{ template_dir }}/scripts/Tests/RunAll-Tests.ps1" ] }, + { + "type": "powershell", + "inline": [ + "if (-not (Test-Path {{user `image_folder`}}\\Tests\\testResults.xml)) { throw '{{user `image_folder`}}\\Tests\\testResults.xml not found' }" + ] + }, { "type": "powershell", "inline": [ @@ -273,6 +279,12 @@ "IMAGE_VERSION={{user `image_version`}}" ] }, + { + "type": "powershell", + "inline": [ + "if (-not (Test-Path C:\\InstalledSoftware.md)) { throw 'C:\\InstalledSoftware.md not found' }" + ] + }, { "type": "file", "source": "C:\\InstalledSoftware.md", diff --git a/images/win/windows2019.json b/images/win/windows2019.json index cc85b75d121c..8ffa122f9061 100644 --- a/images/win/windows2019.json +++ b/images/win/windows2019.json @@ -239,8 +239,7 @@ "{{ template_dir }}/scripts/Installers/Install-GoogleCloudSDK.ps1", "{{ template_dir }}/scripts/Installers/Install-CodeQLBundle.ps1", "{{ template_dir }}/scripts/Installers/Install-BizTalkBuildComponent.ps1", - "{{ template_dir }}/scripts/Installers/Disable-JITDebugger.ps1", - "{{ template_dir }}/scripts/Installers/Run-NGen.ps1" + "{{ template_dir }}/scripts/Installers/Disable-JITDebugger.ps1" ] }, { @@ -265,6 +264,12 @@ "{{ template_dir }}/scripts/Tests/RunAll-Tests.ps1" ] }, + { + "type": "powershell", + "inline": [ + "if (-not (Test-Path {{user `image_folder`}}\\Tests\\testResults.xml)) { throw '{{user `image_folder`}}\\Tests\\testResults.xml not found' }" + ] + }, { "type": "powershell", "inline": [ @@ -274,6 +279,12 @@ "IMAGE_VERSION={{user `image_version`}}" ] }, + { + "type": "powershell", + "inline": [ + "if (-not (Test-Path C:\\InstalledSoftware.md)) { throw 'C:\\InstalledSoftware.md not found' }" + ] + }, { "type": "file", "source": "C:\\InstalledSoftware.md", @@ -283,6 +294,7 @@ { "type": "powershell", "scripts": [ + "{{ template_dir }}/scripts/Installers/Run-NGen.ps1", "{{ template_dir }}/scripts/Installers/Finalize-VM.ps1" ] }, diff --git a/images/win/windows2022.json b/images/win/windows2022.json index a0ad7b76b6ae..4d39b73e967e 100644 --- a/images/win/windows2022.json +++ b/images/win/windows2022.json @@ -222,8 +222,7 @@ "{{ template_dir }}/scripts/Installers/Install-RootCA.ps1", "{{ template_dir }}/scripts/Installers/Install-MongoDB.ps1", "{{ template_dir }}/scripts/Installers/Install-CodeQLBundle.ps1", - "{{ template_dir }}/scripts/Installers/Disable-JITDebugger.ps1", - "{{ template_dir }}/scripts/Installers/Run-NGen.ps1" + "{{ template_dir }}/scripts/Installers/Disable-JITDebugger.ps1" ] }, { @@ -248,6 +247,12 @@ "{{ template_dir }}/scripts/Tests/RunAll-Tests.ps1" ] }, + { + "type": "powershell", + "inline": [ + "if (-not (Test-Path {{user `image_folder`}}\\Tests\\testResults.xml)) { throw '{{user `image_folder`}}\\Tests\\testResults.xml not found' }" + ] + }, { "type": "powershell", "inline": [ @@ -257,6 +262,12 @@ "IMAGE_VERSION={{user `image_version`}}" ] }, + { + "type": "powershell", + "inline": [ + "if (-not (Test-Path C:\\InstalledSoftware.md)) { throw 'C:\\InstalledSoftware.md not found' }" + ] + }, { "type": "file", "source": "C:\\InstalledSoftware.md", @@ -266,6 +277,7 @@ { "type": "powershell", "scripts": [ + "{{ template_dir }}/scripts/Installers/Run-NGen.ps1", "{{ template_dir }}/scripts/Installers/Finalize-VM.ps1" ] }, From 82d0cf5316ba1de756b7f266e8c6321cf2473622 Mon Sep 17 00:00:00 2001 From: Darleev <50947177+Darleev@users.noreply.github.com> Date: Fri, 27 Aug 2021 07:52:51 +0100 Subject: [PATCH 0482/3485] [macOS 11] changed default Xcode version to 12.5.1 (#3966) --- images/macos/toolsets/toolset-11.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index 9811b65628ba..0b45dd16c818 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -1,6 +1,6 @@ { "xcode": { - "default": "12.5", + "default": "12.5.1", "versions": [ { "link": "13.0", "version": "13.0.0"}, { "link": "12.5.1", "version": "12.5.1"}, From 3b94fc1d86c3b0eff987a3a15c5445a6ce694d46 Mon Sep 17 00:00:00 2001 From: Dmitry Shibanov Date: Fri, 27 Aug 2021 14:32:07 +0300 Subject: [PATCH 0483/3485] [Windows] Add Microsoft.VisualStudio.Component.VC.ATLMFC.Spectre (#3968) --- images/win/toolsets/toolset-2022.json | 1 + 1 file changed, 1 insertion(+) diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index 32803e3e6ddf..4dd52ea14b13 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -172,6 +172,7 @@ "Microsoft.VisualStudio.Component.VC.v141.x86.x64.Spectre", "Microsoft.VisualStudio.Component.VC.v141.MFC", "Microsoft.VisualStudio.Component.VC.v141.MFC.Spectre", + "Microsoft.VisualStudio.Component.VC.ATLMFC.Spectre", "Microsoft.VisualStudio.Component.Windows10SDK.19041", "Microsoft.VisualStudio.Component.Workflow", "Microsoft.VisualStudio.ComponentGroup.Azure.CloudServices", From 4f6ba63ac73569cc4113cffc54e45f730f13a671 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Fri, 27 Aug 2021 17:44:45 +0300 Subject: [PATCH 0484/3485] updates: move Install-WindowsUpdates.ps1 at the top to fix winrm timeout (#3971) --- images/win/windows2019.json | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/images/win/windows2019.json b/images/win/windows2019.json index 8ffa122f9061..5bb10a24ee3d 100644 --- a/images/win/windows2019.json +++ b/images/win/windows2019.json @@ -129,9 +129,17 @@ ], "execution_policy": "unrestricted" }, + { + "type": "powershell", + "scripts": [ + "{{ template_dir }}/scripts/Installers/Install-WindowsUpdates.ps1" + ], + "elevated_user": "{{user `install_user`}}", + "elevated_password": "{{user `install_password`}}" + }, { "type": "windows-restart", - "restart_timeout": "10m" + "restart_timeout": "30m" }, { "type": "powershell", @@ -239,24 +247,16 @@ "{{ template_dir }}/scripts/Installers/Install-GoogleCloudSDK.ps1", "{{ template_dir }}/scripts/Installers/Install-CodeQLBundle.ps1", "{{ template_dir }}/scripts/Installers/Install-BizTalkBuildComponent.ps1", - "{{ template_dir }}/scripts/Installers/Disable-JITDebugger.ps1" - ] - }, - { - "type": "powershell", - "scripts": [ - "{{ template_dir }}/scripts/Installers/Install-WindowsUpdates.ps1", + "{{ template_dir }}/scripts/Installers/Disable-JITDebugger.ps1", "{{ template_dir }}/scripts/Installers/Configure-DynamicPort.ps1", "{{ template_dir }}/scripts/Installers/Configure-GDIProcessHandleQuota.ps1", "{{ template_dir }}/scripts/Installers/Configure-Shell.ps1", "{{ template_dir }}/scripts/Installers/Enable-DeveloperMode.ps1" - ], - "elevated_user": "{{user `install_user`}}", - "elevated_password": "{{user `install_password`}}" + ] }, { "type": "windows-restart", - "restart_timeout": "30m" + "restart_timeout": "10m" }, { "type": "powershell", From 1cbea058249db750691ec74f1b3ba9a7b1605d26 Mon Sep 17 00:00:00 2001 From: Dibir Magomedsaygitov <61747324+dibir-magomedsaygitov@users.noreply.github.com> Date: Fri, 27 Aug 2021 22:43:29 +0300 Subject: [PATCH 0485/3485] [Ubuntu] Rework Maven installation (#3973) * rework maven installation * resolve issues * resolve issue with extracting latest maven version --- images/linux/scripts/installers/java-tools.sh | 7 ++++--- images/linux/toolsets/toolset-1604.json | 3 +-- images/linux/toolsets/toolset-1804.json | 3 +-- images/linux/toolsets/toolset-2004.json | 3 +-- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/images/linux/scripts/installers/java-tools.sh b/images/linux/scripts/installers/java-tools.sh index a78043a0ffb7..8067ef348553 100644 --- a/images/linux/scripts/installers/java-tools.sh +++ b/images/linux/scripts/installers/java-tools.sh @@ -63,11 +63,12 @@ apt-fast install -y --no-install-recommends ant ant-optional echo "ANT_HOME=/usr/share/ant" | tee -a /etc/environment # Install Maven -mavenVersion=$(get_toolset_value '.java.maven') -mavenDownloadUrl="https://www-eu.apache.org/dist/maven/maven-3/${mavenVersion}/binaries/apache-maven-${mavenVersion}-bin.zip" +json=$(curl -s "https://api.github.com/repos/apache/maven/tags") +latestMavenVersion=$(echo $json | jq -r '.[] | select(.name | match("^(maven-[0-9.]*)$")) | .name' | head -1 | cut -d- -f2) +mavenDownloadUrl="https://www-eu.apache.org/dist/maven/maven-3/${latestMavenVersion}/binaries/apache-maven-${latestMavenVersion}-bin.zip" download_with_retries $mavenDownloadUrl "/tmp" "maven.zip" unzip -qq -d /usr/share /tmp/maven.zip -ln -s /usr/share/apache-maven-${mavenVersion}/bin/mvn /usr/bin/mvn +ln -s /usr/share/apache-maven-${latestMavenVersion}/bin/mvn /usr/bin/mvn # Install Gradle # This script founds the latest gradle release from https://services.gradle.org/versions/all diff --git a/images/linux/toolsets/toolset-1604.json b/images/linux/toolsets/toolset-1604.json index 613d04897cd4..2021bc1fd6ed 100644 --- a/images/linux/toolsets/toolset-1604.json +++ b/images/linux/toolsets/toolset-1604.json @@ -72,8 +72,7 @@ "default": "8", "versions": [ "8", "11", "12" - ], - "maven": "3.8.1" + ] }, "android": { "platform_min_version": "23", diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index fb135f0b4508..8aeab69ad6db 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -72,8 +72,7 @@ "default": "8", "versions": [ "8", "11", "12" - ], - "maven": "3.8.1" + ] }, "android": { "platform_min_version": "23", diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index 812d556a1783..ca263e0db51e 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -72,8 +72,7 @@ "default": "11", "versions": [ "8", "11" - ], - "maven": "3.8.1" + ] }, "android": { "platform_min_version": "27", From d2c7eb1dfab840ec690a81a1fa5a770305e438ff Mon Sep 17 00:00:00 2001 From: Dibir Magomedsaygitov <61747324+dibir-magomedsaygitov@users.noreply.github.com> Date: Mon, 30 Aug 2021 09:54:10 +0300 Subject: [PATCH 0486/3485] [Windows] Remove exact maven version to install (#3975) --- images/win/scripts/Installers/Install-JavaTools.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/win/scripts/Installers/Install-JavaTools.ps1 b/images/win/scripts/Installers/Install-JavaTools.ps1 index bab2f13bcae5..f2e2bcaa1352 100644 --- a/images/win/scripts/Installers/Install-JavaTools.ps1 +++ b/images/win/scripts/Installers/Install-JavaTools.ps1 @@ -103,7 +103,7 @@ foreach ($jdkVersion in $jdkVersions) { # Install Java tools # Force chocolatey to ignore dependencies on Ant and Maven or else they will download the Oracle JDK Choco-Install -PackageName ant -ArgumentList "-i" -Choco-Install -PackageName maven -ArgumentList "-i", "--version=3.8.1" +Choco-Install -PackageName maven -ArgumentList "-i" Choco-Install -PackageName gradle # Move maven variables to Machine. They may not be in the environment for this script so we need to read them from the registry. From a8c8a73ad164f2128f3d3398165fb208d78474d4 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Mon, 30 Aug 2021 11:55:56 +0300 Subject: [PATCH 0487/3485] [Ubuntu] homebrew: remove double quotes around env vars (#3984) --- images/linux/scripts/installers/homebrew.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/linux/scripts/installers/homebrew.sh b/images/linux/scripts/installers/homebrew.sh index db3d1dacd29d..cb81167e7e01 100644 --- a/images/linux/scripts/installers/homebrew.sh +++ b/images/linux/scripts/installers/homebrew.sh @@ -15,7 +15,7 @@ brew_shellenv="/home/linuxbrew/.linuxbrew/bin/brew shellenv" # Update /etc/environment ## Put HOMEBREW_* variables. -$brew_shellenv | grep 'export HOMEBREW' | sed -E 's/^export (.*);$/\1/' | sudo tee -a /etc/environment +$brew_shellenv | grep 'export HOMEBREW' | sed -E 's/^export (.*);$/\1/' | tr -d '"' | sudo tee -a /etc/environment # add brew executables locations to PATH brew_path=$($brew_shellenv | grep '^export PATH' | sed -E 's/^export PATH="([^$]+)\$.*/\1/') prependEtcEnvironmentPath "$brew_path" From ac3304726e326af72ec28aee8c555688106acc37 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 2 Sep 2021 07:44:10 +0000 Subject: [PATCH 0488/3485] Updating readme file for ubuntu20 version 20210831.9 (#3992) Co-authored-by: Image generation service account --- images/linux/Ubuntu2004-README.md | 121 +++++++++++++++--------------- 1 file changed, 61 insertions(+), 60 deletions(-) diff --git a/images/linux/Ubuntu2004-README.md b/images/linux/Ubuntu2004-README.md index b79e7dd317eb..8ab7ec7cb408 100644 --- a/images/linux/Ubuntu2004-README.md +++ b/images/linux/Ubuntu2004-README.md @@ -2,9 +2,9 @@ |-| | [Ubuntu 16.04 environment will be removed on September 20, 2021](https://github.com/actions/virtual-environments/issues/3287) | *** -# Ubuntu 20.04.2 LTS -- Linux kernel version: 5.8.0-1039-azure -- Image Version: 20210816.1 +# Ubuntu 20.04.3 LTS +- Linux kernel version: 5.8.0-1040-azure +- Image Version: 20210831.9 ## Installed Software ### Language and Runtime @@ -16,10 +16,10 @@ - GNU C++ 9.3.0, 10.3.0 - GNU Fortran 9.3.0, 10.3.0 - Julia 1.6.2 -- Kotlin 1.5.21-release-314 +- Kotlin 1.5.30-release-407 - Mono 6.12.0.122 (apt source repository: https://download.mono-project.com/repo/ubuntu stable-focal main) - MSBuild 16.6.0.15201 (from /usr/lib/mono/msbuild/15.0/bin/MSBuild.dll) -- Node 14.17.5 +- Node 14.17.6 - Perl 5.30.0 - Python 3.8.10 - Python3 3.8.10 @@ -29,14 +29,14 @@ ### Package Management - cpan 1.64 - Helm 3.6.3 -- Homebrew 3.2.6 +- Homebrew 3.2.10 - Miniconda 4.10.3 -- Npm 6.14.14 +- Npm 6.14.15 - Pip 20.0.2 - Pip3 20.0.2 - Pipx 0.16.4 - RubyGems 3.1.2 -- Vcpkg (build from master \<6bc4362>) +- Vcpkg (build from master \<9fb1585>) - Yarn 1.22.11 #### Environment variables @@ -47,36 +47,36 @@ ### Project Management - Ant 1.10.7 -- Gradle 7.1.1 +- Gradle 7.2 - Lerna 4.0.0 -- Maven 3.8.1 +- Maven 3.8.2 - Sbt 1.5.5 ### Tools -- Ansible 2.11.3 +- Ansible 2.11.4 - apt-fast 1.9.11 - AzCopy 10.11.0 (available by `azcopy` and `azcopy10` aliases) -- Bazel 4.1.0 +- Bazel 4.2.1 - Bazelisk 1.10.1 - Bicep 0.4.613 - Buildah 1.21.3 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- CMake 3.21.1 -- CodeQL Action Bundle 2.5.9 +- CMake 3.21.2 +- CodeQL Action Bundle 2.6.0 - Docker Compose 1.29.2 -- Docker-Buildx 0.6.0 -- Docker-Moby Client 20.10.7+azure -- Docker-Moby Server 20.10.7+azure -- Fastlane 2.191.0 -- Git 2.32.0 (apt source repository: ppa:git-core/ppa) +- Docker-Buildx 0.6.3 +- Docker-Moby Client 20.10.8+azure +- Docker-Moby Server 20.10.8+azure +- Fastlane 2.192.0 +- Git 2.33.0 (apt source repository: ppa:git-core/ppa) - Git LFS 2.13.3 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.6.0 - Haveged 1.9.1 -- Heroku 7.56.1 -- HHVM (HipHop VM) 4.122.0 +- Heroku 7.59.0 +- HHVM (HipHop VM) 4.124.0 - jq 1.6 - Kind 0.11.1 -- Kubectl 1.22.0 -- Kustomize 4.2.0 +- Kubectl 1.22.1 +- Kustomize 4.3.0 - Leiningen 2.9.6 - MediaInfo 19.09 - Mercurial 5.3.1 @@ -87,28 +87,28 @@ - Packer 1.7.4 - PhantomJS 2.1.1 - Podman 3.2.3 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- Pulumi 3.10.1 +- Pulumi 3.11.0 - R 4.1.1 - Skopeo 1.3.0 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 -- Terraform 1.0.4 -- yamllint 1.26.2 -- yq 4.11.2 +- Terraform 1.0.5 +- yamllint 1.26.3 +- yq 4.12.1 - zstd 1.5.0 (homebrew) ### CLI Tools -- Alibaba Cloud CLI 3.0.85 -- AWS CLI 2.2.29 -- AWS CLI Session manager plugin 1.2.234.0 -- AWS SAM CLI 1.27.2 -- Azure CLI (azure-cli) 2.27.1 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) +- Alibaba Cloud CLI 3.0.90 +- AWS CLI 2.2.33 +- AWS CLI Session manager plugin 1.2.245.0 +- AWS SAM CLI 1.29.0 +- Azure CLI (azure-cli) 2.27.2 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.20.0 -- GitHub CLI 1.14.0 -- Google Cloud SDK 352.0.0 (apt source repository: https://packages.cloud.google.com/apt) +- GitHub CLI 2.0.0 +- Google Cloud SDK 355.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 6.3.5 -- OpenShift CLI 4.8.4 +- Netlify CLI 6.8.1 +- OpenShift CLI 4.8.5 - ORAS CLI 0.12.0 - Vercel CLI 23.1.2 @@ -124,11 +124,11 @@ | CE 21.2.0 | GRAALVM_11_ROOT | ### PHP -| Tool | Version | -| -------- | ------------ | -| PHP | 7.4.22 8.0.9 | -| Composer | 2.1.5 | -| PHPUnit | 8.5.19 | +| Tool | Version | +| -------- | ------------- | +| PHP | 7.4.23 8.0.10 | +| Composer | 2.1.6 | +| PHPUnit | 8.5.20 | ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ``` @@ -153,9 +153,9 @@ - Rustfmt 1.4.37 ### Browsers and Drivers -- Google Chrome 92.0.4515.131 +- Google Chrome 92.0.4515.159 - ChromeDriver 92.0.4515.107 -- Mozilla Firefox 91.0 +- Mozilla Firefox 91.0.2 - Geckodriver 0.29.1 - Chromium 92.0.4515.0 @@ -166,11 +166,11 @@ | GECKOWEBDRIVER | /usr/local/share/gecko_driver | ### .NET Core SDK -- 2.1.302 2.1.403 2.1.525 2.1.617 2.1.701 2.1.817 3.1.118 3.1.202 3.1.302 3.1.412 5.0.104 5.0.206 5.0.303 5.0.400 +- 2.1.302 2.1.403 2.1.526 2.1.617 2.1.701 2.1.818 3.1.118 3.1.202 3.1.302 3.1.412 5.0.104 5.0.206 5.0.303 5.0.400 ### Databases - MongoDB 5.0.2 (apt source repository: https://repo.mongodb.org/apt/ubuntu) -- Postgre SQL 13.4 (apt source repository: https://apt.postgresql.org/pub/repos/apt/) +- PostgreSQL 13.4 (apt source repository: https://apt.postgresql.org/pub/repos/apt/) - sqlite3 3.31.1 #### MySQL @@ -192,8 +192,8 @@ #### Node.js - 10.24.1 -- 12.22.5 -- 14.17.5 +- 12.22.6 +- 14.17.6 #### PyPy - 2.7.18 [PyPy 7.3.5] @@ -228,8 +228,8 @@ | Module | Version | | ---------------- | ------- | | MarkdownPS | 1.9 | -| Pester | 5.2.2 | -| PSScriptAnalyzer | 1.19.1 | +| Pester | 5.3.0 | +| PSScriptAnalyzer | 1.20.0 | #### Az PowerShell Modules - 6.1.0 3.1.0.zip 4.4.0.zip 5.9.0.zip @@ -245,7 +245,7 @@ | Package Name | Version | | -------------------------- | ---------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 4.0 | -| Android Emulator | 30.7.5 | +| Android Emulator | 30.8.4 | | Android SDK Build-tools | 31.0.0
30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3 | | Android SDK Platform-Tools | 31.0.3 | | Android SDK Platforms | android-31 (rev 1)
android-30 (rev 3)
android-29 (rev 5)
android-28 (rev 6)
android-27 (rev 3) | @@ -272,24 +272,25 @@ | alpine:3.11 | sha256:6cf3d8abc08cf3792d590152d7a4628ec827621f55b1d3150383f5f39335d6eb | 2021-04-14 | | alpine:3.12 | sha256:de25c7fc6c4f3a27c7f0c2dff454e4671823a34d88abd533f210848d527e0fbb | 2021-04-14 | | alpine:3.13 | sha256:1d30d1ba3cb90962067e9b29491fbd56997979d54376f23f01448b5c5cd8b462 | 2021-04-14 | -| buildpack-deps:buster | sha256:7021538d13a8de5cd15cf5fd72b95b8710831ed7029ebc3282dffd570cdf3818 | 2021-07-22 | -| buildpack-deps:stretch | sha256:d8c71a24bdc64d5dadc7d6ba748e55b01c510d292f94b1afc5fb95ee38dc5f4e | 2021-07-22 | -| debian:10 | sha256:cc58a29c333ee594f7624d968123429b26916face46169304f07580644dde6b2 | 2021-07-22 | -| debian:9 | sha256:06f9296409de8cfecaff43aaee6d608ed48a95c0cac0da2a418ff526acedf67b | 2021-07-22 | +| buildpack-deps:buster | sha256:ad1d4fa28be6745ab3df67d99e62f5833dd59d4960ecbd707335306fa85ff442 | 2021-08-17 | +| buildpack-deps:stretch | sha256:410405a7cb1b238dfef3c9c3f84a26187296e876b92117fa25bed3a015dd7c9e | 2021-08-17 | +| debian:10 | sha256:e2fe52e17d649812bddcac07faf16f33542129a59b2c1c59b39a436754b7f146 | 2021-08-17 | +| debian:9 | sha256:0ed9bd85836141af791835584b3931a384561dbc449fa0ae4a8ca79192c3b52c | 2021-08-17 | | node:10 | sha256:59531d2835edd5161c8f9512f9e095b1836f7a1fcb0ab73e005ec46047384911 | 2021-04-10 | | node:10-alpine | sha256:dc98dac24efd4254f75976c40bce46944697a110d06ce7fa47e7268470cf2e28 | 2021-04-14 | -| node:12 | sha256:38dac2d5f70a91c9c68fe284a729cc49e444dad0a7e5388bcaf5c70f645c17e7 | 2021-08-12 | +| node:12 | sha256:61748e56917a2f65621d68c9d9497c7bc420551a29f4be3543a373665eafd6e3 | 2021-08-18 | | node:12-alpine | sha256:372e5cc17da5baedf302643c3bb54283dac990942fc816d9f7c12565e89c3265 | 2021-08-12 | -| node:14 | sha256:adbbb61dab70ea6e5a6c2ad7fba60e4d1047ba98ad1afcd631c15553163b22b7 | 2021-08-12 | +| node:14 | sha256:c1fa7759eeff3f33ba08ff600ffaca4558954722a4345653ed1a0d87dffed9aa | 2021-08-18 | | node:14-alpine | sha256:b8d48b515e3049d4b7e9ced6cedbe223c3bc4a3d0fd02332448f3cdb000faee1 | 2021-08-12 | -| ubuntu:16.04 | sha256:6a3ac136b6ca623d6a6fa20a7622f098b2fae1ac05f0114386ef439d8ca89a4a | 2021-07-26 | -| ubuntu:18.04 | sha256:7bd7a9ca99f868bf69c4b6212f64f2af8e243f97ba13abb3e641e03a7ceb59e8 | 2021-07-26 | -| ubuntu:20.04 | sha256:82becede498899ec668628e7cb0ad87b6e1c371cb8a1e597d83a47fac21d6af3 | 2021-07-26 | +| ubuntu:16.04 | sha256:454054f5bbd571b088db25b662099c6c7b3f0cb78536a2077d54adc48f00cd68 | 2021-08-31 | +| ubuntu:18.04 | sha256:9bc830af2bef73276515a29aa896eedfa7bdf4bdbc5c1063b4c457a4bbb8cd79 | 2021-08-31 | +| ubuntu:20.04 | sha256:9d6a8699fb5c9c39cf08a0871bd6219f0400981c570894cd8cbea30d3424a31f | 2021-08-31 | ### Installed apt packages | Name | Version | | ---------------------- | --------------------------------- | | acl | 2.2.53-6 | +| aria2 | 1.35.0-1build1 | | binutils | 2.34-6ubuntu1.1 | | bison | 2:3.5.1+dfsg-1 | | brotli | 1.0.7-6ubuntu0.1 | @@ -315,7 +316,7 @@ | libc++-dev | 1:10.0-50\~exp1 | | libc++abi-dev | 1:10.0-50\~exp1 | | libcurl4 | 7.68.0-1ubuntu2.6 | -| libgbm-dev | 21.0.3-0ubuntu0.2\~20.04.1 | +| libgbm-dev | 21.0.3-0ubuntu0.3\~20.04.1 | | libgconf-2-4 | 3.2.6-6ubuntu1 | | libgsl-dev | 2.5+dfsg-6build1 | | libgtk-3-0 | 3.24.20-0ubuntu1 | From e2a6bc04d3eba230f11e144db0ffce3b0873a8fa Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 2 Sep 2021 07:47:52 +0000 Subject: [PATCH 0489/3485] Updating readme file for ubuntu18 version 20210831.9 (#3991) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/linux/Ubuntu1804-README.md | 111 +++++++++++++++--------------- 1 file changed, 56 insertions(+), 55 deletions(-) diff --git a/images/linux/Ubuntu1804-README.md b/images/linux/Ubuntu1804-README.md index 68a39d444569..1b5701afc524 100644 --- a/images/linux/Ubuntu1804-README.md +++ b/images/linux/Ubuntu1804-README.md @@ -3,8 +3,8 @@ | [Ubuntu 16.04 environment will be removed on September 20, 2021](https://github.com/actions/virtual-environments/issues/3287) | *** # Ubuntu 18.04.5 LTS -- Linux kernel version: 5.4.0-1055-azure -- Image Version: 20210816.1 +- Linux kernel version: 5.4.0-1056-azure +- Image Version: 20210831.9 ## Installed Software ### Language and Runtime @@ -16,10 +16,10 @@ - GNU C++ 7.5.0, 9.4.0, 10.3.0 - GNU Fortran 7.5.0, 9.4.0, 10.3.0 - Julia 1.6.2 -- Kotlin 1.5.21-release-314 +- Kotlin 1.5.30-release-407 - Mono 6.12.0.122 (apt source repository: https://download.mono-project.com/repo/ubuntu stable-bionic main) - MSBuild 16.6.0.15201 (from /usr/lib/mono/msbuild/15.0/bin/MSBuild.dll) -- Node 14.17.5 +- Node 14.17.6 - Perl 5.26.1 - Python 2.7.17 - Python3 3.6.9 @@ -29,14 +29,14 @@ ### Package Management - cpan 1.64 - Helm 3.6.3 -- Homebrew 3.2.6 +- Homebrew 3.2.10 - Miniconda 4.10.3 -- Npm 6.14.14 +- Npm 6.14.15 - Pip 9.0.1 - Pip3 9.0.1 - Pipx 0.16.4 - RubyGems 2.7.6 -- Vcpkg (build from master \<6bc4362>) +- Vcpkg (build from master \<9fb1585>) - Yarn 1.22.11 #### Environment variables @@ -47,34 +47,34 @@ ### Project Management - Ant 1.10.5 -- Gradle 7.1.1 -- Maven 3.8.1 +- Gradle 7.2 +- Maven 3.8.2 - Sbt 1.5.5 ### Tools -- Ansible 2.11.3 +- Ansible 2.11.4 - apt-fast 1.9.11 - AzCopy 10.11.0 (available by `azcopy` and `azcopy10` aliases) -- Bazel 4.1.0 +- Bazel 4.2.1 - Bazelisk 1.10.1 - Bicep 0.4.613 - Buildah 1.19.6 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- CMake 3.21.1 -- CodeQL Action Bundle 2.5.9 +- CMake 3.21.2 +- CodeQL Action Bundle 2.6.0 - Docker Compose 1.29.2 - Docker-Buildx 0.6.0 -- Docker-Moby Client 20.10.7+azure -- Docker-Moby Server 20.10.7+azure -- Git 2.32.0 (apt source repository: ppa:git-core/ppa) +- Docker-Moby Client 20.10.8+azure +- Docker-Moby Server 20.10.8+azure +- Git 2.33.0 (apt source repository: ppa:git-core/ppa) - Git LFS 2.13.3 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.3.1 - Haveged 1.9.1 -- Heroku 7.56.1 -- HHVM (HipHop VM) 4.122.0 +- Heroku 7.59.0 +- HHVM (HipHop VM) 4.124.0 - jq 1.5 - Kind 0.11.1 -- Kubectl 1.22.0 -- Kustomize 4.2.0 +- Kubectl 1.22.1 +- Kustomize 4.3.0 - Leiningen 2.9.6 - MediaInfo 17.12 - Mercurial 4.5.3 @@ -85,28 +85,28 @@ - Packer 1.7.4 - PhantomJS 2.1.1 - Podman 3.0.1 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- Pulumi 3.10.1 +- Pulumi 3.11.0 - R 4.1.1 - Skopeo 1.2.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 - SVN 1.9.7 -- Terraform 1.0.4 -- yamllint 1.26.2 -- yq 4.11.2 +- Terraform 1.0.5 +- yamllint 1.26.3 +- yq 4.12.1 - zstd 1.5.0 (homebrew) ### CLI Tools -- Alibaba Cloud CLI 3.0.85 -- AWS CLI 1.20.21 -- AWS CLI Session manager plugin 1.2.234.0 -- AWS SAM CLI 1.27.2 -- Azure CLI (azure-cli) 2.27.1 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) +- Alibaba Cloud CLI 3.0.90 +- AWS CLI 1.20.32 +- AWS CLI Session manager plugin 1.2.245.0 +- AWS SAM CLI 1.29.0 +- Azure CLI (azure-cli) 2.27.2 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.20.0 -- GitHub CLI 1.14.0 -- Google Cloud SDK 352.0.0 (apt source repository: https://packages.cloud.google.com/apt) +- GitHub CLI 2.0.0 +- Google Cloud SDK 355.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 6.3.5 -- OpenShift CLI 4.8.4 +- Netlify CLI 6.8.1 +- OpenShift CLI 4.8.5 - ORAS CLI 0.12.0 - Vercel CLI 23.1.2 @@ -118,11 +118,11 @@ | 12.0.2+10 | Adopt OpenJDK | JAVA_HOME_12_X64 | ### PHP -| Tool | Version | -| -------- | --------------------------------- | -| PHP | 7.1.33 7.2.34 7.3.29 7.4.22 8.0.9 | -| Composer | 2.1.5 | -| PHPUnit | 8.5.19 | +| Tool | Version | +| -------- | ---------------------------------- | +| PHP | 7.1.33 7.2.34 7.3.30 7.4.23 8.0.10 | +| Composer | 2.1.6 | +| PHPUnit | 8.5.20 | ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ``` @@ -147,9 +147,9 @@ - Rustfmt 1.4.37 ### Browsers and Drivers -- Google Chrome 92.0.4515.131 +- Google Chrome 92.0.4515.159 - ChromeDriver 92.0.4515.107 -- Mozilla Firefox 91.0 +- Mozilla Firefox 91.0.2 - Geckodriver 0.29.1 - Chromium 92.0.4515.0 @@ -160,11 +160,11 @@ | GECKOWEBDRIVER | /usr/local/share/gecko_driver | ### .NET Core SDK -- 2.1.302 2.1.403 2.1.525 2.1.617 2.1.701 2.1.817 3.1.118 3.1.202 3.1.302 3.1.412 5.0.104 5.0.206 5.0.302 5.0.303 5.0.400 +- 2.1.302 2.1.403 2.1.526 2.1.617 2.1.701 2.1.818 3.1.118 3.1.202 3.1.302 3.1.412 5.0.104 5.0.206 5.0.303 5.0.400 ### Databases - MongoDB 5.0.2 (apt source repository: https://repo.mongodb.org/apt/ubuntu) -- Postgre SQL 13.4 (apt source repository: https://apt.postgresql.org/pub/repos/apt/) +- PostgreSQL 13.4 (apt source repository: https://apt.postgresql.org/pub/repos/apt/) - sqlite3 3.22.0 #### MySQL @@ -186,8 +186,8 @@ #### Node.js - 10.24.1 -- 12.22.5 -- 14.17.5 +- 12.22.6 +- 14.17.6 #### PyPy - 2.7.18 [PyPy 7.3.5] @@ -222,7 +222,7 @@ | Module | Version | | ---------- | ------- | | MarkdownPS | 1.9 | -| Pester | 5.2.2 | +| Pester | 5.3.0 | #### Az PowerShell Modules - 6.1.0 3.1.0.zip 4.4.0.zip 5.9.0.zip @@ -237,7 +237,7 @@ | Package Name | Version | | -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 4.0 | -| Android Emulator | 30.7.5 | +| Android Emulator | 30.8.4 | | Android SDK Build-tools | 31.0.0
30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3
26.0.0 26.0.1 26.0.2 26.0.3
25.0.0 25.0.1 25.0.2 25.0.3
24.0.0 24.0.1 24.0.2 24.0.3
23.0.1 23.0.2 23.0.3 | | Android SDK Platform-Tools | 31.0.3 | | Android SDK Platforms | android-31 (rev 1)
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) | @@ -264,23 +264,24 @@ | alpine:3.11 | sha256:6cf3d8abc08cf3792d590152d7a4628ec827621f55b1d3150383f5f39335d6eb | 2021-04-14 | | alpine:3.12 | sha256:de25c7fc6c4f3a27c7f0c2dff454e4671823a34d88abd533f210848d527e0fbb | 2021-04-14 | | alpine:3.13 | sha256:1d30d1ba3cb90962067e9b29491fbd56997979d54376f23f01448b5c5cd8b462 | 2021-04-14 | -| buildpack-deps:buster | sha256:7021538d13a8de5cd15cf5fd72b95b8710831ed7029ebc3282dffd570cdf3818 | 2021-07-22 | -| buildpack-deps:stretch | sha256:d8c71a24bdc64d5dadc7d6ba748e55b01c510d292f94b1afc5fb95ee38dc5f4e | 2021-07-22 | -| debian:10 | sha256:cc58a29c333ee594f7624d968123429b26916face46169304f07580644dde6b2 | 2021-07-22 | -| debian:9 | sha256:06f9296409de8cfecaff43aaee6d608ed48a95c0cac0da2a418ff526acedf67b | 2021-07-22 | +| buildpack-deps:buster | sha256:ad1d4fa28be6745ab3df67d99e62f5833dd59d4960ecbd707335306fa85ff442 | 2021-08-17 | +| buildpack-deps:stretch | sha256:410405a7cb1b238dfef3c9c3f84a26187296e876b92117fa25bed3a015dd7c9e | 2021-08-17 | +| debian:10 | sha256:e2fe52e17d649812bddcac07faf16f33542129a59b2c1c59b39a436754b7f146 | 2021-08-17 | +| debian:9 | sha256:0ed9bd85836141af791835584b3931a384561dbc449fa0ae4a8ca79192c3b52c | 2021-08-17 | | node:10 | sha256:59531d2835edd5161c8f9512f9e095b1836f7a1fcb0ab73e005ec46047384911 | 2021-04-10 | | node:10-alpine | sha256:dc98dac24efd4254f75976c40bce46944697a110d06ce7fa47e7268470cf2e28 | 2021-04-14 | -| node:12 | sha256:38dac2d5f70a91c9c68fe284a729cc49e444dad0a7e5388bcaf5c70f645c17e7 | 2021-08-12 | +| node:12 | sha256:61748e56917a2f65621d68c9d9497c7bc420551a29f4be3543a373665eafd6e3 | 2021-08-18 | | node:12-alpine | sha256:372e5cc17da5baedf302643c3bb54283dac990942fc816d9f7c12565e89c3265 | 2021-08-12 | -| node:14 | sha256:adbbb61dab70ea6e5a6c2ad7fba60e4d1047ba98ad1afcd631c15553163b22b7 | 2021-08-12 | +| node:14 | sha256:c1fa7759eeff3f33ba08ff600ffaca4558954722a4345653ed1a0d87dffed9aa | 2021-08-18 | | node:14-alpine | sha256:b8d48b515e3049d4b7e9ced6cedbe223c3bc4a3d0fd02332448f3cdb000faee1 | 2021-08-12 | -| ubuntu:16.04 | sha256:6a3ac136b6ca623d6a6fa20a7622f098b2fae1ac05f0114386ef439d8ca89a4a | 2021-07-26 | -| ubuntu:18.04 | sha256:7bd7a9ca99f868bf69c4b6212f64f2af8e243f97ba13abb3e641e03a7ceb59e8 | 2021-07-26 | -| ubuntu:20.04 | sha256:82becede498899ec668628e7cb0ad87b6e1c371cb8a1e597d83a47fac21d6af3 | 2021-07-26 | +| ubuntu:16.04 | sha256:454054f5bbd571b088db25b662099c6c7b3f0cb78536a2077d54adc48f00cd68 | 2021-08-31 | +| ubuntu:18.04 | sha256:9bc830af2bef73276515a29aa896eedfa7bdf4bdbc5c1063b4c457a4bbb8cd79 | 2021-08-31 | +| ubuntu:20.04 | sha256:9d6a8699fb5c9c39cf08a0871bd6219f0400981c570894cd8cbea30d3424a31f | 2021-08-31 | ### Installed apt packages | Name | Version | | ----------------- | --------------------------------- | +| aria2 | 1.33.1-1 | | binutils | 2.30-21ubuntu1\~18.04.5 | | bison | 2:3.0.4.dfsg-1build1 | | brotli | 1.0.3-1ubuntu1.3 | From 126faeedce84fedfeef6e525691aec3b72427a78 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 2 Sep 2021 09:20:50 +0000 Subject: [PATCH 0490/3485] Updating readme file for macOS-11 version 20210831.3 (#4000) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/macos/macos-11-Readme.md | 97 ++++++++++++++++----------------- 1 file changed, 48 insertions(+), 49 deletions(-) diff --git a/images/macos/macos-11-Readme.md b/images/macos/macos-11-Readme.md index 6b621d791a81..3f132676bbd3 100644 --- a/images/macos/macos-11-Readme.md +++ b/images/macos/macos-11-Readme.md @@ -1,16 +1,15 @@ | Announcements | |-| | [[macOS, Windows] .NET SDK pre-installation policy will be changed on September, 6](https://github.com/actions/virtual-environments/issues/3809) | -| [macOS 11.0 pools will be transited to private preview.](https://github.com/actions/virtual-environments/issues/2486) | *** # macOS 11.5 info -- System Version: macOS 11.5 (20G71) +- System Version: macOS 11.5.2 (20G95) - Kernel Version: Darwin 20.6.0 -- Image Version: 20210814.1 +- Image Version: 20210831.3 ## Installed Software ### Language and Runtime -- .NET SDK 2.1.300 2.1.301 2.1.302 2.1.401 2.1.402 2.1.403 2.1.500 2.1.502 2.1.503 2.1.504 2.1.505 2.1.506 2.1.507 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 2.1.811 2.1.812 2.1.813 2.1.814 2.1.815 2.1.816 2.1.817 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 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 3.1.408 3.1.409 3.1.410 3.1.411 3.1.412 5.0.100 5.0.101 5.0.102 5.0.200 5.0.201 5.0.202 5.0.300 5.0.301 5.0.302 5.0.400 +- .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 2.1.811 2.1.812 2.1.813 2.1.814 2.1.815 2.1.816 2.1.818 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 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 3.1.408 3.1.409 3.1.410 3.1.411 3.1.412 5.0.100 5.0.101 5.0.102 5.0.200 5.0.201 5.0.202 5.0.300 5.0.301 5.0.302 5.0.400 - Bash 3.2.57(1)-release - Clang/LLVM 12.0.1 is available on `'$(brew --prefix llvm)/bin/clang'` - Clang/LLVM 12.0.5 is default @@ -22,31 +21,31 @@ - GNU Fortran (Homebrew GCC 11.2.0) 11.2.0 - available by `gfortran-11` alias - Go 1.15.15 - julia 1.6.2 -- kotlin 1.5.21-release-314 +- Kotlin 1.5.30-release-407 - MSBuild 16.6.0.15801 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) -- Node.js v14.17.5 +- Node.js v14.17.6 - NVM 0.38.0 -- NVM - Cached node versions: v10.24.1 v12.22.5 v14.17.5 +- NVM - Cached node versions: v10.24.1 v12.22.6 v14.17.6 - Perl 5.34.0 -- PHP 8.0.9 +- PHP 8.0.10 - Python 2.7.18 - Python 3.9.6 - Ruby 2.7.4p191 ### Package Management -- Bundler version 2.2.25 +- Bundler version 2.2.26 - Carthage 0.38.0 - CocoaPods 1.10.2 -- Composer 2.1.5 -- Homebrew 3.2.6 +- Composer 2.1.6 +- Homebrew 3.2.10 - Miniconda 4.10.3 -- NPM 6.14.14 +- NPM 6.14.15 - NuGet 5.6.0.6489 - Pip 20.3.4 (python 2.7) - Pip 21.1.3 (python 3.9) - Pipx 0.16.4 -- RubyGems 3.2.25 -- Vcpkg 2021 (build from master \<6bc4362>) +- RubyGems 3.2.26 +- Vcpkg 2021 (build from master \<2ea3e99>) - Yarn 1.22.5 #### Environment variables @@ -58,29 +57,29 @@ ### Project Management - Apache Ant(TM) 1.10.11 - Apache Maven 3.8.2 -- Gradle 7.1.1 +- Gradle 7.2 ### Utilities - 7-Zip 17.04 -- aria2 1.35.0 -- azcopy 10.11.0 -- bazel 4.1.0 +- aria2 1.36.0 +- azcopy 10.12.0 +- bazel 4.2.1 - bazelisk 1.10.1 - bsdtar 3.3.2 - available by 'tar' alias - Curl 7.78.0 - Git LFS: 2.13.3 -- Git: 2.32.0 -- GitHub CLI: 1.14.0 +- Git: 2.33.0 +- GitHub CLI: 2.0.0 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.1 -- gpg (GnuPG) 2.3.1 +- gpg (GnuPG) 2.3.2 - helm v3.6.3+gd506314 - Hub CLI: 2.14.2 - jq 1.6 - mongo v5.0.2 - mongod v5.0.2 - Newman 5.2.4 -- OpenSSL 1.1.1k 25 Mar 2021 `(/usr/local/opt/openssl -> /usr/local/Cellar/openssl@1.1/1.1.1k)` +- OpenSSL 1.1.1l 24 Aug 2021 `(/usr/local/opt/openssl -> /usr/local/Cellar/openssl@1.1/1.1.1l)` - Packer 1.7.4 - PostgreSQL 13.4 - psql (PostgreSQL) 13.4 @@ -91,16 +90,16 @@ ### Tools -- Aliyun CLI 3.0.85 +- Aliyun CLI 3.0.90 - App Center CLI 2.10.0 -- AWS CLI 2.2.29 -- AWS SAM CLI 1.27.2 -- AWS Session Manager CLI 1.2.234.0 -- Azure CLI 2.27.1 +- AWS CLI 2.2.34 +- AWS SAM CLI 1.29.0 +- AWS Session Manager CLI 1.2.245.0 +- Azure CLI 2.27.2 - Bicep CLI 0.4.613 - Cabal 3.4.0.0 -- Cmake 3.21.1 -- Fastlane 2.191.0 +- Cmake 3.21.2 +- Fastlane 2.193.0 - GHC 9.0.1 - GHCup v0.1.16.2 - Stack 2.7.3 @@ -110,16 +109,16 @@ ### Linters - SwiftLint 0.43.1 -- yamllint 1.26.2 +- yamllint 1.26.3 ### Browsers -- Safari 14.1.2 (16611.3.10.1.3) -- SafariDriver 14.1.2 (16611.3.10.1.3) -- Google Chrome 92.0.4515.131 +- Safari 14.1.2 (16611.3.10.1.6) +- SafariDriver 14.1.2 (16611.3.10.1.6) +- Google Chrome 93.0.4577.63 - ChromeDriver 92.0.4515.107 -- Microsoft Edge 92.0.902.73 -- MSEdgeDriver 92.0.902.73 -- Mozilla Firefox 91.0 +- Microsoft Edge 92.0.902.84 +- MSEdgeDriver 92.0.902.84 +- Mozilla Firefox 91.0.2 - geckodriver 0.29.1 #### Environment variables @@ -154,8 +153,8 @@ #### Node.js - 10.24.1 -- 12.22.5 -- 14.17.5 +- 12.22.6 +- 14.17.6 #### Go - 1.15.15 @@ -183,8 +182,8 @@ | ---------------- | ------- | | Az | 6.1.0 | | MarkdownPS | 1.9 | -| Pester | 5.2.2 | -| PSScriptAnalyzer | 1.19.1 | +| Pester | 5.3.0 | +| PSScriptAnalyzer | 1.20.0 | ### Web Servers | Name | Version | ConfigFile | ServiceStatus | ListenPort | @@ -194,7 +193,7 @@ ### Xamarin #### Visual Studio for Mac -- 8.10.7.17 +- 8.10.8.0 #### Xamarin bundles | symlink | Xamarin.Mono | Xamarin.iOS | Xamarin.Mac | Xamarin.Android | @@ -214,13 +213,13 @@ - NUnit 3.6.1 ### Xcode -| Version | Build | Path | -| -------------- | -------- | ------------------------------ | -| 13.0 (beta) | 13A5212g | /Applications/Xcode_13.0.app | -| 12.5.1 | 12E507 | /Applications/Xcode_12.5.1.app | -| 12.5 (default) | 12E262 | /Applications/Xcode_12.5.app | -| 12.4 | 12D4e | /Applications/Xcode_12.4.app | -| 11.7 | 11E801a | /Applications/Xcode_11.7.app | +| Version | Build | Path | +| ---------------- | -------- | ------------------------------ | +| 13.0 (beta) | 13A5212g | /Applications/Xcode_13.0.app | +| 12.5.1 (default) | 12E507 | /Applications/Xcode_12.5.1.app | +| 12.5 | 12E262 | /Applications/Xcode_12.5.app | +| 12.4 | 12D4e | /Applications/Xcode_12.4.app | +| 11.7 | 11E801a | /Applications/Xcode_11.7.app | #### Xcode Support Tools - xcpretty 0.3.0 @@ -284,7 +283,7 @@ | Package Name | Version | | -------------------------- | ---------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 4.0 | -| Android Emulator | 30.7.5 | +| Android Emulator | 30.8.4 | | Android SDK Build-tools | 31.0.0
30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3 | | Android SDK Platforms | android-31 (rev 1)
android-30 (rev 3)
android-29 (rev 5)
android-28 (rev 6)
android-27 (rev 3) | | Android SDK Platform-Tools | 31.0.3 | From cd2d38543370c2ee84c6dfea25a817944973937d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 3 Sep 2021 06:07:02 +0000 Subject: [PATCH 0491/3485] Updating readme file for macOS-10.15 version 20210831.3 (#4001) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/macos/macos-10.15-Readme.md | 77 +++++++++++++++--------------- 1 file changed, 38 insertions(+), 39 deletions(-) diff --git a/images/macos/macos-10.15-Readme.md b/images/macos/macos-10.15-Readme.md index ab3e0fb8550d..a3b1497ebcc9 100644 --- a/images/macos/macos-10.15-Readme.md +++ b/images/macos/macos-10.15-Readme.md @@ -1,16 +1,15 @@ | Announcements | |-| | [[macOS, Windows] .NET SDK pre-installation policy will be changed on September, 6](https://github.com/actions/virtual-environments/issues/3809) | -| [macOS 11.0 pools will be transited to private preview.](https://github.com/actions/virtual-environments/issues/2486) | *** # macOS 10.15 info - System Version: macOS 10.15.7 (19H1323) - Kernel Version: Darwin 19.6.0 -- Image Version: 20210814.1 +- Image Version: 20210831.3 ## Installed Software ### Language and Runtime -- .NET SDK 2.1.300 2.1.301 2.1.302 2.1.401 2.1.402 2.1.403 2.1.500 2.1.502 2.1.503 2.1.504 2.1.505 2.1.506 2.1.507 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 2.1.811 2.1.812 2.1.813 2.1.814 2.1.815 2.1.816 2.1.817 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 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 3.1.408 3.1.409 3.1.410 3.1.411 3.1.412 5.0.100 5.0.101 5.0.102 5.0.200 5.0.201 5.0.202 5.0.300 5.0.301 5.0.302 5.0.400 +- .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 2.1.811 2.1.812 2.1.813 2.1.814 2.1.815 2.1.816 2.1.818 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 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 3.1.408 3.1.409 3.1.410 3.1.411 3.1.412 5.0.100 5.0.101 5.0.102 5.0.200 5.0.201 5.0.202 5.0.300 5.0.301 5.0.302 5.0.400 - Bash 3.2.57(1)-release - Clang/LLVM 12.0.0 is default - Clang/LLVM 12.0.1 is available on `'$(brew --prefix llvm)/bin/clang'` @@ -22,32 +21,32 @@ - GNU Fortran (Homebrew GCC 11.2.0) 11.2.0 - available by `gfortran-11` alias - Go 1.15.15 - julia 1.6.2 -- kotlin 1.5.21-release-314 +- Kotlin 1.5.30-release-407 - MSBuild 16.6.0.15801 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) -- Node.js v14.17.5 +- Node.js v14.17.6 - NVM 0.38.0 -- NVM - Cached node versions: v10.24.1 v12.22.5 v14.17.5 +- NVM - Cached node versions: v10.24.1 v12.22.6 v14.17.6 - Perl 5.34.0 -- PHP 8.0.9 +- PHP 8.0.10 - Python 2.7.18 - Python 3.9.6 - R 4.1.1 - Ruby 2.7.4p191 ### Package Management -- Bundler version 2.2.25 +- Bundler version 2.2.26 - Carthage 0.38.0 - CocoaPods 1.10.2 -- Composer 2.1.5 -- Homebrew 3.2.6 +- Composer 2.1.6 +- Homebrew 3.2.10 - Miniconda 4.10.3 -- NPM 6.14.14 +- NPM 6.14.15 - NuGet 5.6.0.6489 - Pip 20.3.4 (python 2.7) - Pip 21.1.3 (python 3.9) - Pipx 0.16.4 -- RubyGems 3.2.25 -- Vcpkg 2021 (build from master \<6bc4362>) +- RubyGems 3.2.26 +- Vcpkg 2021 (build from master \<2ea3e99>) - Yarn 1.22.5 #### Environment variables @@ -59,30 +58,30 @@ ### Project Management - Apache Ant(TM) 1.10.11 - Apache Maven 3.8.2 -- Gradle 7.1.1 +- Gradle 7.2 ### Utilities - 7-Zip 17.04 -- aria2 1.35.0 -- azcopy 10.11.0 -- bazel 4.1.0 +- aria2 1.36.0 +- azcopy 10.12.0 +- bazel 4.2.1 - bazelisk 1.10.1 - bsdtar 3.3.2 - available by 'tar' alias - Curl 7.78.0 - Git LFS: 2.13.3 -- Git: 2.32.0 -- GitHub CLI: 1.14.0 +- Git: 2.33.0 +- GitHub CLI: 2.0.0 - GNU parallel 20210622 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.1 -- gpg (GnuPG) 2.3.1 +- gpg (GnuPG) 2.3.2 - helm v3.6.3+gd506314 - Hub CLI: 2.14.2 - jq 1.6 - mongo v5.0.2 - mongod v5.0.2 - Newman 5.2.4 -- OpenSSL 1.1.1k 25 Mar 2021 `(/usr/local/opt/openssl -> /usr/local/Cellar/openssl@1.1/1.1.1k)` +- OpenSSL 1.1.1l 24 Aug 2021 `(/usr/local/opt/openssl -> /usr/local/Cellar/openssl@1.1/1.1.1l)` - Packer 1.7.4 - PostgreSQL 13.4 - psql (PostgreSQL) 13.4 @@ -95,16 +94,16 @@ ### Tools -- Aliyun CLI 3.0.85 +- Aliyun CLI 3.0.90 - App Center CLI 2.10.0 -- AWS CLI 2.2.29 -- AWS SAM CLI 1.27.2 -- AWS Session Manager CLI 1.2.234.0 -- Azure CLI 2.27.1 +- AWS CLI 2.2.33 +- AWS SAM CLI 1.29.0 +- AWS Session Manager CLI 1.2.245.0 +- Azure CLI 2.27.2 - Bicep CLI 0.4.613 - Cabal 3.4.0.0 -- Cmake 3.21.1 -- Fastlane 2.191.0 +- Cmake 3.21.2 +- Fastlane 2.193.0 - GHC 9.0.1 - GHCup v0.1.16.2 - Stack 2.7.3 @@ -114,16 +113,16 @@ ### Linters - SwiftLint 0.43.1 -- yamllint 1.26.2 +- yamllint 1.26.3 ### Browsers - Safari 14.1.2 (15611.3.10.1.5) - SafariDriver 14.1.2 (15611.3.10.1.5) -- Google Chrome 92.0.4515.131 +- Google Chrome 93.0.4577.63 - ChromeDriver 92.0.4515.107 -- Microsoft Edge 92.0.902.73 -- MSEdgeDriver 92.0.902.73 -- Mozilla Firefox 91.0 +- Microsoft Edge 92.0.902.84 +- MSEdgeDriver 92.0.902.84 +- Mozilla Firefox 91.0.2 - geckodriver 0.29.1 #### Environment variables @@ -165,8 +164,8 @@ #### Node.js - 10.24.1 -- 12.22.5 -- 14.17.5 +- 12.22.6 +- 14.17.6 #### Go - 1.13.15 @@ -196,8 +195,8 @@ | ---------------- | ------- | | Az | 6.1.0 | | MarkdownPS | 1.9 | -| Pester | 5.2.2 | -| PSScriptAnalyzer | 1.19.1 | +| Pester | 5.3.0 | +| PSScriptAnalyzer | 1.20.0 | ### Web Servers | Name | Version | ConfigFile | ServiceStatus | ListenPort | @@ -207,7 +206,7 @@ ### Xamarin #### Visual Studio for Mac -- 8.10.7.17 +- 8.10.8.0 #### Xamarin bundles | symlink | Xamarin.Mono | Xamarin.iOS | Xamarin.Mac | Xamarin.Android | @@ -346,7 +345,7 @@ | Package Name | Version | | -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 4.0 | -| Android Emulator | 30.7.5 | +| Android Emulator | 30.8.4 | | Android SDK Build-tools | 31.0.0
30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3
26.0.0 26.0.1 26.0.2 26.0.3
25.0.0 25.0.1 25.0.2 25.0.3
24.0.0 24.0.1 24.0.2 24.0.3 | | Android SDK Platforms | android-31 (rev 1)
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 Platform-Tools | 31.0.3 | From ec9ac010f114131adacb246cf87c8127c19aa0d9 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 3 Sep 2021 07:12:07 +0000 Subject: [PATCH 0492/3485] Updating readme file for win16 version 20210901.3 (#4005) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/win/Windows2016-Readme.md | 83 ++++++++++++++++---------------- 1 file changed, 42 insertions(+), 41 deletions(-) diff --git a/images/win/Windows2016-Readme.md b/images/win/Windows2016-Readme.md index 271f9fd01311..dba30617a46b 100644 --- a/images/win/Windows2016-Readme.md +++ b/images/win/Windows2016-Readme.md @@ -1,10 +1,11 @@ | Announcements | |-| +| [(Public Beta) Windows Server 2022 with Visual Studio 2022 is now available](https://github.com/actions/virtual-environments/issues/3949) | | [[macOS, Windows] .NET SDK pre-installation policy will be changed on September, 6](https://github.com/actions/virtual-environments/issues/3809) | *** # Microsoft Windows Server 2016 Datacenter - OS Version: 10.0.14393 Build 4583 -- Image Version: 20210815.1 +- Image Version: 20210901.3 ## Installed Software ### Language and Runtime @@ -12,83 +13,83 @@ - Go 1.15.15 - Julia 1.6.2 - Kotlin 1.5.20 -- Node 14.17.5 +- Node 14.17.6 - Perl 5.32.1 -- PHP 8.0.9 +- PHP 8.0.10 - Python 3.7.9 - Ruby 2.5.9p229 ### Package Management - Chocolatey 0.10.15 -- Composer 2.1.5 +- Composer 2.1.6 - Helm 3.6.3 - Miniconda 4.10.3 (pre-installed on the image but not added to PATH) -- NPM 6.14.14 +- NPM 6.14.15 - NuGet 5.11.0.10 - pip 21.2.4 (python 3.7) - Pipx 0.16.4 - RubyGems 2.7.6.3 -- Vcpkg (build from master \<6bc4362>) +- Vcpkg (build from master \<5bc27e8>) - Yarn 1.22.11 #### Environment variables | Name | Value | | ----------------------- | ------------ | -| CONDA | C:\Miniconda | | VCPKG_INSTALLATION_ROOT | C:\vcpkg | +| CONDA | C:\Miniconda | ### Project Management - Ant 1.10.11 -- Gradle 7.1 -- Maven 3.8.1 +- Gradle 7.2 +- Maven 3.8.2 - sbt 1.5.5 ### Tools - 7zip 19.00 -- aria2 1.35.0 -- azcopy 10.11.0 -- Bazel 4.1.0 +- aria2 1.36.0 +- azcopy 10.12.0 +- Bazel 4.2.1 - Bazelisk 1.10.1 - Bicep 0.4.613 - Cabal 3.4.0.0 -- CMake 3.21.1 -- CodeQL Action Bundle 2.5.9 +- CMake 3.21.2 +- CodeQL Action Bundle 2.6.0 - Docker 20.10.6 - Docker-compose 1.29.2 - ghc 9.0.1 -- Git 2.32.0 +- Git 2.33.0 - Git LFS 2.13.3 -- Google Cloud SDK 352.0.0 +- Google Cloud SDK 355.0.0 - GVFS 1.0.21085.9 - InnoSetup 6.2.0 - jq 1.6 - Kind 0.11.1 -- Kubectl 1.22.0 +- Kubectl 1.22.1 - Mercurial 5.0 - Mingw-w64 8.1.0 - Newman 5.2.4 - NSIS v3.06.1 - OpenSSL 1.1.1 - Packer 1.7.4 -- Pulumi v3.10.1 +- Pulumi v3.11.0 - R 4.1.1 - Stack 2.7.3 - Subversion (SVN) 1.14.1 - Swig 4.0.2 - VSWhere 2.8.4 - WinAppDriver 1.2.2009.02003 -- yamllint 1.26.2 +- yamllint 1.26.3 - zstd 1.5.0 ### CLI Tools -- Alibaba Cloud CLI 3.0.85 -- AWS CLI 2.2.29 -- AWS SAM CLI 1.27.2 -- AWS Session Manager CLI 1.2.234.0 -- Azure CLI 2.27.1 +- Alibaba Cloud CLI 3.0.90 +- AWS CLI 2.2.33 +- AWS SAM CLI 1.29.0 +- AWS Session Manager CLI 1.2.245.0 +- Azure CLI 2.27.2 - Azure DevOps CLI extension 0.20.0 - Cloud Foundry CLI 6.53.0 -- GitHub CLI 1.14.0 +- GitHub CLI 2.0.0 - Hub CLI 2.14.2 ### Rust Tools @@ -106,11 +107,11 @@ - Rustfmt 1.4.37 ### Browsers and webdrivers -- Google Chrome 92.0.4515.131 -- Chrome Driver 92.0.4515.107 -- Microsoft Edge 92.0.902.73 -- Microsoft Edge Driver 92.0.902.73 -- Mozilla Firefox 91.0 +- Google Chrome 93.0.4577.63 +- Chrome Driver 93.0.4577.15 +- Microsoft Edge 92.0.902.84 +- Microsoft Edge Driver 92.0.902.84 +- Mozilla Firefox 91.0.2 - Gecko Driver 0.29.1 - IE Driver 3.150.1.1 @@ -156,8 +157,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Version | Architecture | | ------- | ------------ | | 10.24.1 | x64 | -| 12.22.5 | x64 | -| 14.17.5 | x64 | +| 12.22.6 | x64 | +| 14.17.6 | x64 | #### Python @@ -195,7 +196,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Property | Value | | -------------------- | ------------------------------------------------------------------------------------------------------------------------------------ | | ServiceName | postgresql-x64-13 | -| Version | 13.3 | +| Version | 13.4 | | ServiceStatus | Stopped | | ServiceStartType | Disabled | | EnvironmentVariables | PGBIN=C:\Program Files\PostgreSQL\13\bin
PGDATA=C:\Program Files\PostgreSQL\13\data
PGROOT=C:\Program Files\PostgreSQL\13 | @@ -222,7 +223,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Name | Version | ConfigFile | ServiceName | ServiceStatus | ListenPort | | ------ | ------- | ------------------------------------- | ----------- | ------------- | ---------- | | Apache | 2.4.48 | C:\tools\Apache24\conf\httpd.conf | Apache | Stopped | 80 | -| Nginx | 1.21.1 | C:\tools\nginx-1.21.1\conf\nginx.conf | nginx | Stopped | 80 | +| Nginx | 1.21.2 | C:\tools\nginx-1.21.2\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2017 | Name | Version | Path | @@ -496,17 +497,17 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### .NET Core SDK `Location C:\Program Files\dotnet\sdk` -- 1.1.14 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.519 2.1.520 2.1.521 2.1.522 2.1.523 2.1.524 2.1.525 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.616 2.1.617 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 2.1.811 2.1.812 2.1.813 2.1.814 2.1.815 2.1.816 2.1.817 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.109 3.1.110 3.1.111 3.1.112 3.1.113 3.1.114 3.1.115 3.1.116 3.1.117 3.1.118 3.1.200 3.1.201 3.1.202 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 3.1.408 3.1.409 3.1.410 3.1.411 3.1.412 5.0.100 5.0.101 5.0.102 5.0.103 5.0.104 5.0.200 5.0.201 5.0.202 5.0.203 5.0.204 5.0.205 5.0.206 5.0.300 5.0.301 5.0.302 5.0.303 5.0.400 +- 1.1.14 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.519 2.1.520 2.1.521 2.1.522 2.1.523 2.1.524 2.1.525 2.1.526 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.616 2.1.617 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 2.1.811 2.1.812 2.1.813 2.1.814 2.1.815 2.1.816 2.1.818 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.109 3.1.110 3.1.111 3.1.112 3.1.113 3.1.114 3.1.115 3.1.116 3.1.117 3.1.118 3.1.200 3.1.201 3.1.202 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 3.1.408 3.1.409 3.1.410 3.1.411 3.1.412 5.0.100 5.0.101 5.0.102 5.0.103 5.0.104 5.0.200 5.0.201 5.0.202 5.0.203 5.0.204 5.0.205 5.0.206 5.0.300 5.0.301 5.0.302 5.0.303 5.0.400 ### .NET Core Runtime `Location: C:\Program Files\dotnet\shared\Microsoft.AspNetCore.All` -- 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23 2.1.24 2.1.25 2.1.26 2.1.27 2.1.28 2.1.29 +- 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23 2.1.24 2.1.25 2.1.26 2.1.27 2.1.28 2.1.29 2.1.30 `Location: C:\Program Files\dotnet\shared\Microsoft.AspNetCore.App` -- 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23 2.1.24 2.1.25 2.1.26 2.1.27 2.1.28 2.1.29 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9 3.1.10 3.1.11 3.1.12 3.1.13 3.1.14 3.1.15 3.1.16 3.1.17 3.1.18 5.0.0 5.0.1 5.0.2 5.0.3 5.0.4 5.0.5 5.0.6 5.0.7 5.0.8 5.0.9 +- 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23 2.1.24 2.1.25 2.1.26 2.1.27 2.1.28 2.1.29 2.1.30 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9 3.1.10 3.1.11 3.1.12 3.1.13 3.1.14 3.1.15 3.1.16 3.1.17 3.1.18 5.0.0 5.0.1 5.0.2 5.0.3 5.0.4 5.0.5 5.0.6 5.0.7 5.0.8 5.0.9 `Location: C:\Program Files\dotnet\shared\Microsoft.NETCore.App` -- 1.0.16 1.1.13 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23 2.1.24 2.1.25 2.1.26 2.1.27 2.1.28 2.1.29 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9 3.1.10 3.1.11 3.1.12 3.1.13 3.1.14 3.1.15 3.1.16 3.1.17 3.1.18 5.0.0 5.0.1 5.0.2 5.0.3 5.0.4 5.0.5 5.0.6 5.0.7 5.0.8 5.0.9 +- 1.0.16 1.1.13 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23 2.1.24 2.1.25 2.1.26 2.1.27 2.1.28 2.1.29 2.1.30 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9 3.1.10 3.1.11 3.1.12 3.1.13 3.1.14 3.1.15 3.1.16 3.1.17 3.1.18 5.0.0 5.0.1 5.0.2 5.0.3 5.0.4 5.0.5 5.0.6 5.0.7 5.0.8 5.0.9 `Location: C:\Program Files\dotnet\shared\Microsoft.WindowsDesktop.App` - 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9 3.1.10 3.1.11 3.1.12 3.1.13 3.1.14 3.1.15 3.1.16 3.1.17 3.1.18 5.0.0 5.0.1 5.0.2 5.0.3 5.0.4 5.0.5 5.0.6 5.0.7 5.0.8 5.0.9 @@ -535,9 +536,9 @@ All other versions are saved but not installed. | ------------------ | ---------------- | | DockerMsftProvider | 1.0.0.8 | | MarkdownPS | 1.9 | -| Pester | 3.4.0
5.2.2 | +| Pester | 3.4.0
5.3.0 | | PowerShellGet | 1.0.0.1
2.2.5 | -| PSScriptAnalyzer | 1.19.1 | +| PSScriptAnalyzer | 1.20.0 | | PSWindowsUpdate | 2.2.0.2 | | SqlServer | 21.1.18256 | | VSSetup | 2.2.16 | @@ -555,7 +556,7 @@ All other versions are saved but not installed. | Google APIs | addon-google_apis-google-21
addon-google_apis-google-22
addon-google_apis-google-23
addon-google_apis-google-24 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 21.4.7075529
22.1.7171670 | +| NDK | a
a
21.4.7075529
22.1.7171670 | | SDK Patch Applier v4 | 1 | #### Environment variables From aa3d80baa9a3d16d8cf589b2b94b0428b525bd8a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 3 Sep 2021 09:55:51 +0000 Subject: [PATCH 0493/3485] Updating readme file for win22 version 20210901.3 (#4004) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/win/Windows2022-Readme.md | 65 +++++++++++++++++--------------- 1 file changed, 34 insertions(+), 31 deletions(-) diff --git a/images/win/Windows2022-Readme.md b/images/win/Windows2022-Readme.md index 776180925813..1b0f35280499 100644 --- a/images/win/Windows2022-Readme.md +++ b/images/win/Windows2022-Readme.md @@ -1,10 +1,11 @@ | Announcements | |-| +| [(Public Beta) Windows Server 2022 with Visual Studio 2022 is now available](https://github.com/actions/virtual-environments/issues/3949) | | [[macOS, Windows] .NET SDK pre-installation policy will be changed on September, 6](https://github.com/actions/virtual-environments/issues/3809) | *** # Microsoft Windows Server 2022 Datacenter - OS Version: 10.0.20348 Build 169 -- Image Version: 20210819.7 +- Image Version: 20210901.3 ## Installed Software ### Language and Runtime @@ -12,21 +13,21 @@ - Go 1.16.7 - Julia 1.6.2 - Kotlin 1.5.20 -- Node 14.17.5 -- PHP 8.0.9 +- Node 14.17.6 +- PHP 8.0.10 - Python 3.9.6 - Ruby 3.0.2p107 ### Package Management - Chocolatey 0.10.15 -- Composer 2.1.5 +- Composer 2.1.6 - Helm 3.6.3 -- NPM 6.14.14 +- NPM 6.14.15 - NuGet 5.11.0.10 - pip 21.2.4 (python 3.9) - Pipx 0.16.4 - RubyGems 3.2.22 -- Vcpkg (build from master \) +- Vcpkg (build from master \<5bc27e8>) - Yarn 1.22.11 #### Environment variables @@ -36,19 +37,19 @@ ### Project Management - Ant 1.10.11 -- Gradle 7.1 -- Maven 3.8.1 +- Gradle 7.2 +- Maven 3.8.2 ### Tools - 7zip 19.00 -- aria2 1.35.0 -- azcopy 10.11.0 -- Bazel 4.2.0 +- aria2 1.36.0 +- azcopy 10.12.0 +- Bazel 4.2.1 - Bazelisk 1.10.1 - Bicep 0.4.613 - Cabal 3.4.0.0 -- CMake 3.21.1 -- CodeQL Action Bundle 2.5.9 +- CMake 3.21.2 +- CodeQL Action Bundle 2.6.0 - Docker 20.10.6 - Docker-compose 1.29.2 - ghc 9.0.1 @@ -57,30 +58,30 @@ - GVFS 1.0.21085.9 - jq 1.6 - Kind 0.11.1 -- Kubectl 1.22.0 +- Kubectl 1.22.1 - Mercurial 5.0 - Mingw-w64 8.1.0 - Newman 5.2.4 - OpenSSL 1.1.1 - Packer 1.7.4 -- Pulumi v3.10.2 +- Pulumi v3.11.0 - R 4.1.1 - Stack 2.7.3 - Subversion (SVN) 1.14.1 - Swig 4.0.2 - VSWhere 2.8.4 - WinAppDriver 1.2.2009.02003 -- yamllint 1.26.2 +- yamllint 1.26.3 - zstd 1.5.0 ### CLI Tools -- Alibaba Cloud CLI 3.0.88 -- AWS CLI 2.2.30 -- AWS SAM CLI 1.28.0 +- Alibaba Cloud CLI 3.0.90 +- AWS CLI 2.2.33 +- AWS SAM CLI 1.29.0 - AWS Session Manager CLI 1.2.245.0 -- Azure CLI 2.27.1 +- Azure CLI 2.27.2 - Azure DevOps CLI extension 0.20.0 -- GitHub CLI 1.14.0 +- GitHub CLI 2.0.0 - Hub CLI 2.14.2 ### Rust Tools @@ -98,11 +99,11 @@ - Rustfmt 1.4.37 ### Browsers and webdrivers -- Google Chrome 92.0.4515.159 -- Chrome Driver 92.0.4515.107 -- Microsoft Edge 92.0.902.73 -- Microsoft Edge Driver 92.0.902.73 -- Mozilla Firefox 91.0.1 +- Google Chrome 93.0.4577.63 +- Chrome Driver 93.0.4577.15 +- Microsoft Edge 92.0.902.84 +- Microsoft Edge Driver 92.0.902.84 +- Mozilla Firefox 91.0.2 - Gecko Driver 0.29.1 - IE Driver 3.150.1.1 @@ -146,8 +147,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Version | Architecture | | ------- | ------------ | | 10.24.1 | x64 | -| 12.22.5 | x64 | -| 14.17.5 | x64 | +| 12.22.6 | x64 | +| 14.17.6 | x64 | #### Python @@ -205,7 +206,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Name | Version | ConfigFile | ServiceName | ServiceStatus | ListenPort | | ------ | ------- | ------------------------------------- | ----------- | ------------- | ---------- | | Apache | 2.4.48 | C:\tools\Apache24\conf\httpd.conf | Apache | Stopped | 80 | -| Nginx | 1.21.1 | C:\tools\nginx-1.21.1\conf\nginx.conf | nginx | Stopped | 80 | +| Nginx | 1.21.2 | C:\tools\nginx-1.21.2\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2022 | Name | Version | Path | @@ -313,6 +314,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Component.Unity | 17.0.31530.272 | | Microsoft.VisualStudio.Component.VC.ASAN | 17.0.31530.272 | | Microsoft.VisualStudio.Component.VC.ATL | 17.0.31530.272 | +| Microsoft.VisualStudio.Component.VC.ATL.Spectre | 17.0.31530.272 | +| Microsoft.VisualStudio.Component.VC.ATLMFC.Spectre | 17.0.31530.272 | | Microsoft.VisualStudio.Component.VC.CLI.Support | 17.0.31530.272 | | Microsoft.VisualStudio.Component.VC.CMake.Project | 17.0.31530.272 | | Microsoft.VisualStudio.Component.VC.CoreIde | 17.0.31530.272 | @@ -423,7 +426,7 @@ All other versions are saved but not installed. | MarkdownPS | 1.9 | | Pester | 3.4.0
5.3.0 | | PowerShellGet | 1.0.0.1
2.2.5 | -| PSScriptAnalyzer | 1.19.1 | +| PSScriptAnalyzer | 1.20.0 | | PSWindowsUpdate | 2.2.0.2 | | SqlServer | 21.1.18256 | | VSSetup | 2.2.16 | @@ -440,7 +443,7 @@ All other versions are saved but not installed. | CMake | 3.18.1 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 21.4.7075529
22.1.7171670 | +| NDK | a
a
21.4.7075529
22.1.7171670 | | SDK Patch Applier v4 | 1 | #### Environment variables From d261844fc2891e556eaf5f2aff49c725d24bd21f Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Fri, 3 Sep 2021 14:02:30 +0300 Subject: [PATCH 0494/3485] [Windows] postdotnet: delete nuget.conf if exists (#4013) * postdotnet: delete nuget.conf if exists * rename to $nugetConfigPath * add nuget.config check test * remove issue link --- images/win/post-generation/Dotnet.ps1 | 5 +---- images/win/scripts/Tests/ChocoPackages.Tests.ps1 | 3 +++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/images/win/post-generation/Dotnet.ps1 b/images/win/post-generation/Dotnet.ps1 index 38898b9c9fd5..56d2f875d866 100644 --- a/images/win/post-generation/Dotnet.ps1 +++ b/images/win/post-generation/Dotnet.ps1 @@ -7,8 +7,5 @@ if (-not $latestPath.Contains($dotnetPath)) [System.Environment]::SetEnvironmentVariable('PATH', $latestPath, [System.EnvironmentVariableTarget]::Machine) } -# Delete empty nuget.config file created by choco and recreate the config using the 'dotnet nuget list source command' -# before choco or powershell’s ancient embedded nuget does to prevent the issue with downloading packages from nuget.org -# https://github.com/actions/virtual-environments/issues/3038 -Remove-Item $env:APPDATA\NuGet\NuGet.Config -Force +# Recreate the config using the 'dotnet nuget list source command' dotnet nuget list source diff --git a/images/win/scripts/Tests/ChocoPackages.Tests.ps1 b/images/win/scripts/Tests/ChocoPackages.Tests.ps1 index cb95e095477b..bb3693ba659a 100644 --- a/images/win/scripts/Tests/ChocoPackages.Tests.ps1 +++ b/images/win/scripts/Tests/ChocoPackages.Tests.ps1 @@ -44,6 +44,9 @@ Describe "Nuget" { It "Nuget" { "nuget" | Should -ReturnZeroExitCode } + It "NuGet.Config not exists" { + "$env:APPDATA\NuGet\NuGet.Config" | Should -Not -Exist + } } Describe "OpenSSL" { From 6968a424be7df5d6ca1d9065438b05395e2e0b25 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Fri, 3 Sep 2021 17:05:14 +0300 Subject: [PATCH 0495/3485] pester: remove Nuget.Config test (#4015) --- images/win/scripts/Tests/ChocoPackages.Tests.ps1 | 3 --- 1 file changed, 3 deletions(-) diff --git a/images/win/scripts/Tests/ChocoPackages.Tests.ps1 b/images/win/scripts/Tests/ChocoPackages.Tests.ps1 index bb3693ba659a..cb95e095477b 100644 --- a/images/win/scripts/Tests/ChocoPackages.Tests.ps1 +++ b/images/win/scripts/Tests/ChocoPackages.Tests.ps1 @@ -44,9 +44,6 @@ Describe "Nuget" { It "Nuget" { "nuget" | Should -ReturnZeroExitCode } - It "NuGet.Config not exists" { - "$env:APPDATA\NuGet\NuGet.Config" | Should -Not -Exist - } } Describe "OpenSSL" { From 9aea7d589ea353cb7a7152804fa620b90d339611 Mon Sep 17 00:00:00 2001 From: yuk7 Date: Sun, 5 Sep 2021 18:45:02 +0900 Subject: [PATCH 0496/3485] Add Go 1.17 to all OSes toolsets (#3980) --- images/linux/toolsets/toolset-1604.json | 4 +++- images/linux/toolsets/toolset-1804.json | 4 +++- images/linux/toolsets/toolset-2004.json | 3 ++- images/macos/toolsets/toolset-10.14.json | 3 ++- images/macos/toolsets/toolset-10.15.json | 3 ++- images/macos/toolsets/toolset-11.json | 3 ++- images/win/toolsets/toolset-2016.json | 3 ++- images/win/toolsets/toolset-2019.json | 3 ++- images/win/toolsets/toolset-2022.json | 3 ++- 9 files changed, 20 insertions(+), 9 deletions(-) diff --git a/images/linux/toolsets/toolset-1604.json b/images/linux/toolsets/toolset-1604.json index 2021bc1fd6ed..6f00356f571a 100644 --- a/images/linux/toolsets/toolset-1604.json +++ b/images/linux/toolsets/toolset-1604.json @@ -43,7 +43,9 @@ "versions": [ "1.13.*", "1.14.*", - "1.15.*" + "1.15.*", + "1.16.*", + "1.17.*" ], "default": "1.15.*" }, diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index 8aeab69ad6db..20552f1ea09a 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -43,7 +43,9 @@ "versions": [ "1.13.*", "1.14.*", - "1.15.*" + "1.15.*", + "1.16.*", + "1.17.*" ], "default": "1.15.*" }, diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index ca263e0db51e..7d5a4c0e43bc 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -44,7 +44,8 @@ "versions": [ "1.14.*", "1.15.*", - "1.16.*" + "1.16.*", + "1.17.*" ], "default": "1.15.*" }, diff --git a/images/macos/toolsets/toolset-10.14.json b/images/macos/toolsets/toolset-10.14.json index 1533c723c373..fdef00fd2b6c 100644 --- a/images/macos/toolsets/toolset-10.14.json +++ b/images/macos/toolsets/toolset-10.14.json @@ -315,7 +315,8 @@ "1.13.*", "1.14.*", "1.15.*", - "1.16.*" + "1.16.*", + "1.17.*" ] }, { diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index 89a41e6ad95d..1f9bd21ecc63 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -268,7 +268,8 @@ "1.13.*", "1.14.*", "1.15.*", - "1.16.*" + "1.16.*", + "1.17.*" ] }, { diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index 0b45dd16c818..bc6b615e5bcb 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -204,7 +204,8 @@ "platform" : "darwin", "versions": [ "1.15.*", - "1.16.*" + "1.16.*", + "1.17.*" ] }, { diff --git a/images/win/toolsets/toolset-2016.json b/images/win/toolsets/toolset-2016.json index b4f0ebe9a588..e4579d78589b 100644 --- a/images/win/toolsets/toolset-2016.json +++ b/images/win/toolsets/toolset-2016.json @@ -72,7 +72,8 @@ "1.13.*", "1.14.*", "1.15.*", - "1.16.*" + "1.16.*", + "1.17.*" ], "default": "1.15.*" } diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index 96379ed36001..33a49e98c182 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -72,7 +72,8 @@ "1.13.*", "1.14.*", "1.15.*", - "1.16.*" + "1.16.*", + "1.17.*" ], "default": "1.15.*" } diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index 4dd52ea14b13..10c9f18cdc8c 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -49,7 +49,8 @@ "platform" : "win32", "versions": [ "1.15.*", - "1.16.*" + "1.16.*", + "1.17.*" ], "default": "1.16.*" } From efc41532506a31c24bbf836293e65537e9df18f4 Mon Sep 17 00:00:00 2001 From: MaksimZhukov <46996400+MaksimZhukov@users.noreply.github.com> Date: Sun, 5 Sep 2021 12:46:44 +0300 Subject: [PATCH 0497/3485] [macOS] Change .NET SDK pre-installation policy (#4008) --- images/macos/provision/core/dotnet.sh | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/images/macos/provision/core/dotnet.sh b/images/macos/provision/core/dotnet.sh index 0102264fb38a..31454ff71d38 100755 --- a/images/macos/provision/core/dotnet.sh +++ b/images/macos/provision/core/dotnet.sh @@ -26,14 +26,16 @@ for DOTNET_VERSION in "${DOTNET_VERSIONS[@]}"; do # https://rider-support.jetbrains.com/hc/en-us/articles/360004180039 if is_Less_Catalina; then ARGS_LIST+=( - $(curl -s "$RELEASE_URL" | \ - jq -r '.releases[].sdk."version"' | grep -v -E '\-(preview|rc)\d*' | grep -v -E '2.1.[6-9]\d*') - ) + $(curl -s "$RELEASE_URL" | \ + jq -r '.releases[].sdk."version"' | grep -v -E '\-(preview|rc)\d*' | grep -v -E '2.1.[6-9]\d*' | \ + sort -r | rev | uniq -s 2 | rev) + ) else ARGS_LIST+=( - $(curl -s "$RELEASE_URL" | \ - jq -r '.releases[].sdk."version"' | grep -v -E '\-(preview|rc)\d*') - ) + $(curl -s "$RELEASE_URL" | \ + jq -r '.releases[].sdk."version"' | grep -v -E '\-(preview|rc)\d*' | \ + sort -r | rev | uniq -s 2 | rev) + ) fi done From 7546c7f36a0e19195c36a69a9be3a42ac079e551 Mon Sep 17 00:00:00 2001 From: MaksimZhukov <46996400+MaksimZhukov@users.noreply.github.com> Date: Mon, 6 Sep 2021 09:45:16 +0300 Subject: [PATCH 0498/3485] [Windows] Change .NET SDK pre-installation policy (#4007) --- images/win/scripts/Installers/Install-DotnetSDK.ps1 | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/images/win/scripts/Installers/Install-DotnetSDK.ps1 b/images/win/scripts/Installers/Install-DotnetSDK.ps1 index 0add58f5053b..b5cd097322b0 100644 --- a/images/win/scripts/Installers/Install-DotnetSDK.ps1 +++ b/images/win/scripts/Installers/Install-DotnetSDK.ps1 @@ -28,14 +28,9 @@ function Get-SDKVersionsToInstall ( $sdks += $release.'sdks' } - $sortedSdkVersions = $sdks.version | Sort-Object { [Version] $_ } -Unique - - if (Test-IsWin22) - { - return $sortedSdkVersions | Group-Object { $_.Substring(0, $_.LastIndexOf('.') + 2) } | Foreach-Object { $_.Group[-1] } - } - - return $sortedSdkVersions + return $sdks.version | Sort-Object { [Version] $_ } -Unique ` + | Group-Object { $_.Substring(0, $_.LastIndexOf('.') + 2) } ` + | Foreach-Object { $_.Group[-1] } } function Invoke-Warmup ( From 4cb373c912d695cf8057e0b73ff6cbfdf5c860d0 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 6 Sep 2021 13:11:29 +0000 Subject: [PATCH 0499/3485] Updating readme file for macOS-11 version 20210905.2 (#4021) Co-authored-by: Image generation service account --- images/macos/macos-11-Readme.md | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/images/macos/macos-11-Readme.md b/images/macos/macos-11-Readme.md index 3f132676bbd3..db5ac4b51fa2 100644 --- a/images/macos/macos-11-Readme.md +++ b/images/macos/macos-11-Readme.md @@ -5,11 +5,11 @@ # macOS 11.5 info - System Version: macOS 11.5.2 (20G95) - Kernel Version: Darwin 20.6.0 -- Image Version: 20210831.3 +- Image Version: 20210905.2 ## Installed Software ### Language and Runtime -- .NET SDK 2.1.300 2.1.301 2.1.302 2.1.401 2.1.402 2.1.403 2.1.500 2.1.502 2.1.503 2.1.504 2.1.505 2.1.506 2.1.507 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 2.1.811 2.1.812 2.1.813 2.1.814 2.1.815 2.1.816 2.1.818 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 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 3.1.408 3.1.409 3.1.410 3.1.411 3.1.412 5.0.100 5.0.101 5.0.102 5.0.200 5.0.201 5.0.202 5.0.300 5.0.301 5.0.302 5.0.400 +- .NET SDK 2.1.302 2.1.403 2.1.507 2.1.607 2.1.701 2.1.818 3.1.101 3.1.201 3.1.302 3.1.412 5.0.102 5.0.202 5.0.302 5.0.400 - Bash 3.2.57(1)-release - Clang/LLVM 12.0.1 is available on `'$(brew --prefix llvm)/bin/clang'` - Clang/LLVM 12.0.5 is default @@ -29,23 +29,23 @@ - Perl 5.34.0 - PHP 8.0.10 - Python 2.7.18 -- Python 3.9.6 +- Python 3.9.7 - Ruby 2.7.4p191 ### Package Management -- Bundler version 2.2.26 +- Bundler version 2.2.27 - Carthage 0.38.0 -- CocoaPods 1.10.2 +- CocoaPods 1.11.0 - Composer 2.1.6 - Homebrew 3.2.10 - Miniconda 4.10.3 - NPM 6.14.15 - NuGet 5.6.0.6489 - Pip 20.3.4 (python 2.7) -- Pip 21.1.3 (python 3.9) +- Pip 21.2.4 (python 3.9) - Pipx 0.16.4 -- RubyGems 3.2.26 -- Vcpkg 2021 (build from master \<2ea3e99>) +- RubyGems 3.2.27 +- Vcpkg 2021 (build from master \<71422c6>) - Yarn 1.22.5 #### Environment variables @@ -62,7 +62,7 @@ ### Utilities - 7-Zip 17.04 - aria2 1.36.0 -- azcopy 10.12.0 +- azcopy 10.12.1 - bazel 4.2.1 - bazelisk 1.10.1 - bsdtar 3.3.2 - available by 'tar' alias @@ -92,14 +92,14 @@ ### Tools - Aliyun CLI 3.0.90 - App Center CLI 2.10.0 -- AWS CLI 2.2.34 -- AWS SAM CLI 1.29.0 +- AWS CLI 2.2.35 +- AWS SAM CLI 1.30.0 - AWS Session Manager CLI 1.2.245.0 - Azure CLI 2.27.2 - Bicep CLI 0.4.613 - Cabal 3.4.0.0 - Cmake 3.21.2 -- Fastlane 2.193.0 +- Fastlane 2.193.1 - GHC 9.0.1 - GHCup v0.1.16.2 - Stack 2.7.3 @@ -116,8 +116,8 @@ - SafariDriver 14.1.2 (16611.3.10.1.6) - Google Chrome 93.0.4577.63 - ChromeDriver 92.0.4515.107 -- Microsoft Edge 92.0.902.84 -- MSEdgeDriver 92.0.902.84 +- Microsoft Edge 93.0.961.38 +- MSEdgeDriver 93.0.961.38 - Mozilla Firefox 91.0.2 - geckodriver 0.29.1 @@ -159,6 +159,7 @@ #### Go - 1.15.15 - 1.16.7 +- 1.17.0 ### Rust Tools - Cargo 1.54.0 @@ -189,7 +190,7 @@ | Name | Version | ConfigFile | ServiceStatus | ListenPort | | ----- | ------- | ------------------------------- | ------------- | ---------- | | httpd | 2.4.48 | /usr/local/etc/httpd/httpd.conf | stopped | 80 | -| nginx | 1.21.1 | /usr/local/etc/nginx/nginx.conf | stopped | 80 | +| nginx | 1.21.2 | /usr/local/etc/nginx/nginx.conf | stopped | 80 | ### Xamarin #### Visual Studio for Mac @@ -223,7 +224,7 @@ #### Xcode Support Tools - xcpretty 0.3.0 -- xcversion 2.7.0 +- xcversion 2.8.0 - Nomad CLI 0.0.2 - Nomad shenzhen CLI 0.14.3 From 5d8cf1a6a967f91fbb5b4814cb0b3b7cd0c366e4 Mon Sep 17 00:00:00 2001 From: jpark37 Date: Mon, 6 Sep 2021 07:08:45 -0700 Subject: [PATCH 0500/3485] Use 20348 SDK/WDK for windows-2019/2022 images (#3942) --- images/win/scripts/Installers/Install-WDK.ps1 | 4 ++-- images/win/toolsets/toolset-2019.json | 1 + images/win/toolsets/toolset-2022.json | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/images/win/scripts/Installers/Install-WDK.ps1 b/images/win/scripts/Installers/Install-WDK.ps1 index dea6a468183a..c272da543de0 100644 --- a/images/win/scripts/Installers/Install-WDK.ps1 +++ b/images/win/scripts/Installers/Install-WDK.ps1 @@ -6,8 +6,8 @@ # Requires Windows SDK with the same version number as the WDK if (Test-IsWin19) { - $winSdkUrl = "https://go.microsoft.com/fwlink/p/?linkid=2120843" - $wdkUrl = "https://go.microsoft.com/fwlink/?linkid=2128854" + $winSdkUrl = "https://go.microsoft.com/fwlink/?linkid=2164145" + $wdkUrl = "https://go.microsoft.com/fwlink/?linkid=2164149" $FilePath = "C:\Program Files (x86)\Windows Kits\10\Vsix\VS2019\WDK.vsix" $VSver = "2019" } diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index 33a49e98c182..71630f727993 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -328,6 +328,7 @@ "Microsoft.VisualStudio.Component.Windows10SDK.17763", "Microsoft.VisualStudio.Component.Windows10SDK.18362", "Microsoft.VisualStudio.Component.Windows10SDK.19041", + "Microsoft.VisualStudio.Component.Windows10SDK.20348", "Microsoft.VisualStudio.Component.WinXP", "Microsoft.VisualStudio.Component.Workflow", "Microsoft.VisualStudio.ComponentGroup.Azure.CloudServices", diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index 10c9f18cdc8c..d21db4d72807 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -175,6 +175,7 @@ "Microsoft.VisualStudio.Component.VC.v141.MFC.Spectre", "Microsoft.VisualStudio.Component.VC.ATLMFC.Spectre", "Microsoft.VisualStudio.Component.Windows10SDK.19041", + "Microsoft.VisualStudio.Component.Windows10SDK.20348", "Microsoft.VisualStudio.Component.Workflow", "Microsoft.VisualStudio.ComponentGroup.Azure.CloudServices", "Microsoft.VisualStudio.ComponentGroup.Azure.ResourceManager.Tools", From 3703015712cec213f081e031bde670d29a3f6836 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 6 Sep 2021 15:12:12 +0000 Subject: [PATCH 0501/3485] Updating readme file for win19 version 20210903.7 (#4019) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/win/Windows2019-Readme.md | 92 ++++++++++++++++---------------- 1 file changed, 47 insertions(+), 45 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index 93a5e1edb9fb..61228dfd174c 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -1,10 +1,11 @@ | Announcements | |-| +| [(Public Beta) Windows Server 2022 with Visual Studio 2022 is now available](https://github.com/actions/virtual-environments/issues/3949) | | [[macOS, Windows] .NET SDK pre-installation policy will be changed on September, 6](https://github.com/actions/virtual-environments/issues/3809) | *** # Microsoft Windows Server 2019 Datacenter - OS Version: 10.0.17763 Build 2114 -- Image Version: 20210815.1 +- Image Version: 20210903.7 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -15,83 +16,83 @@ - Go 1.15.15 - Julia 1.6.2 - Kotlin 1.5.20 -- Node 14.17.5 +- Node 14.17.6 - Perl 5.32.1 -- PHP 8.0.9 +- PHP 8.0.10 - Python 3.7.9 - Ruby 2.5.9p229 ### Package Management -- Chocolatey 0.10.15 -- Composer 2.1.5 +- Chocolatey 0.11.1 +- Composer 2.1.6 - Helm 3.6.3 - Miniconda 4.10.3 (pre-installed on the image but not added to PATH) -- NPM 6.14.14 +- NPM 6.14.15 - NuGet 5.11.0.10 - pip 21.2.4 (python 3.7) - Pipx 0.16.4 - RubyGems 2.7.6.3 -- Vcpkg (build from master \<6bc4362>) +- Vcpkg (build from master \) - Yarn 1.22.11 #### Environment variables | Name | Value | | ----------------------- | ------------ | -| CONDA | C:\Miniconda | | VCPKG_INSTALLATION_ROOT | C:\vcpkg | +| CONDA | C:\Miniconda | ### Project Management - Ant 1.10.11 -- Gradle 7.1 -- Maven 3.8.1 +- Gradle 7.2 +- Maven 3.8.2 - sbt 1.5.5 ### Tools - 7zip 19.00 -- aria2 1.35.0 -- azcopy 10.11.0 -- Bazel 4.1.0 +- aria2 1.36.0 +- azcopy 10.12.1 +- Bazel 4.2.1 - Bazelisk 1.10.1 - Bicep 0.4.613 - Cabal 3.4.0.0 -- CMake 3.21.1 -- CodeQL Action Bundle 2.5.9 +- CMake 3.21.2 +- CodeQL Action Bundle 2.6.0 - Docker 20.10.6 - Docker-compose 1.29.2 - ghc 9.0.1 -- Git 2.32.0 +- Git 2.33.0 - Git LFS 2.13.3 -- Google Cloud SDK 352.0.0 +- Google Cloud SDK 355.0.0 - GVFS 1.0.21085.9 - InnoSetup 6.2.0 - jq 1.6 - Kind 0.11.1 -- Kubectl 1.22.0 +- Kubectl 1.22.1 - Mercurial 5.0 - Mingw-w64 8.1.0 - Newman 5.2.4 - NSIS v3.06.1 - OpenSSL 1.1.1 - Packer 1.7.4 -- Pulumi v3.10.1 +- Pulumi v3.11.0 - R 4.1.1 - Stack 2.7.3 - Subversion (SVN) 1.14.1 - Swig 4.0.2 - VSWhere 2.8.4 - WinAppDriver 1.2.2009.02003 -- yamllint 1.26.2 +- yamllint 1.26.3 - zstd 1.5.0 ### CLI Tools -- Alibaba Cloud CLI 3.0.85 -- AWS CLI 2.2.29 -- AWS SAM CLI 1.27.2 -- AWS Session Manager CLI 1.2.234.0 -- Azure CLI 2.27.1 +- Alibaba Cloud CLI 3.0.90 +- AWS CLI 2.2.35 +- AWS SAM CLI 1.30.0 +- AWS Session Manager CLI 1.2.245.0 +- Azure CLI 2.27.2 - Azure DevOps CLI extension 0.20.0 - Cloud Foundry CLI 6.53.0 -- GitHub CLI 1.14.0 +- GitHub CLI 2.0.0 - Hub CLI 2.14.2 ### Rust Tools @@ -109,11 +110,11 @@ - Rustfmt 1.4.37 ### Browsers and webdrivers -- Google Chrome 92.0.4515.131 -- Chrome Driver 92.0.4515.107 -- Microsoft Edge 92.0.902.73 -- Microsoft Edge Driver 92.0.902.73 -- Mozilla Firefox 91.0 +- Google Chrome 93.0.4577.63 +- Chrome Driver 93.0.4577.15 +- Microsoft Edge 93.0.961.38 +- Microsoft Edge Driver 92.0.902.84 +- Mozilla Firefox 91.0.2 - Gecko Driver 0.29.1 - IE Driver 3.150.1.1 @@ -162,8 +163,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Version | Architecture | | ------- | ------------ | | 10.24.1 | x64 | -| 12.22.5 | x64 | -| 14.17.5 | x64 | +| 12.22.6 | x64 | +| 14.17.6 | x64 | #### Python @@ -201,7 +202,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Property | Value | | -------------------- | ------------------------------------------------------------------------------------------------------------------------------------ | | ServiceName | postgresql-x64-13 | -| Version | 13.3 | +| Version | 13.4 | | ServiceStatus | Stopped | | ServiceStartType | Disabled | | EnvironmentVariables | PGBIN=C:\Program Files\PostgreSQL\13\bin
PGDATA=C:\Program Files\PostgreSQL\13\data
PGROOT=C:\Program Files\PostgreSQL\13 | @@ -228,18 +229,18 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Name | Version | ConfigFile | ServiceName | ServiceStatus | ListenPort | | ------ | ------- | ------------------------------------- | ----------- | ------------- | ---------- | | Apache | 2.4.48 | C:\tools\Apache24\conf\httpd.conf | Apache | Stopped | 80 | -| Nginx | 1.21.1 | C:\tools\nginx-1.21.1\conf\nginx.conf | nginx | Stopped | 80 | +| Nginx | 1.21.2 | C:\tools\nginx-1.21.2\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2019 | Name | Version | Path | | ----------------------------- | --------------- | -------------------------------------------------------------- | -| Visual Studio Enterprise 2019 | 16.11.31605.320 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | +| Visual Studio Enterprise 2019 | 16.11.31624.102 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | #### Workloads, components and extensions: | Package | Version | | ------------------------------------------------------------------------- | --------------- | -| Component.Android.NDK.R16B | 16.11.31603.221 | +| Component.Android.NDK.R16B | 16.11.31624.102 | | Component.Android.SDK25.Private | 16.0.28625.61 | | Component.Android.SDK30 | 16.10.31205.252 | | Component.Ant | 1.9.3.8 | @@ -430,6 +431,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.ComponentGroup.UWP.NetCoreAndStandard | 16.3.29102.218 | | Microsoft.VisualStudio.ComponentGroup.UWP.Support | 16.10.31205.180 | | Microsoft.VisualStudio.ComponentGroup.UWP.VC | 16.10.31205.180 | +| Microsoft.VisualStudio.ComponentGroup.UWP.VC.v141 | 16.1.28810.153 | | Microsoft.VisualStudio.ComponentGroup.UWP.Xamarin | 16.10.31205.180 | | Microsoft.VisualStudio.ComponentGroup.VisualStudioExtension.Prerequisites | 16.10.31205.180 | | Microsoft.VisualStudio.ComponentGroup.Web | 16.10.31205.180 | @@ -459,7 +461,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | ms-biztalk.BizTalk | 3.13.2.0 | | ProBITools.MicrosoftAnalysisServicesModelingProjects | 2.9.18 | | ProBITools.MicrosoftReportProjectsforVisualStudio | 2.6.11 | -| SSIS.SqlServerIntegrationServicesProjects | 3.14 | +| SSIS.SqlServerIntegrationServicesProjects | 3.15 | | VisualStudioClient.MicrosoftVisualStudio2017InstallerProjects | 1.0.0 | | Windows Driver Kit | 10.0.19030.0 | | Windows Driver Kit Visual Studio Extension | 10.1.19041.685 | @@ -487,17 +489,17 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### .NET Core SDK `Location C:\Program Files\dotnet\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.519 2.1.520 2.1.521 2.1.522 2.1.523 2.1.524 2.1.525 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.616 2.1.617 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 2.1.811 2.1.812 2.1.813 2.1.814 2.1.815 2.1.816 2.1.817 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.109 3.1.110 3.1.111 3.1.112 3.1.113 3.1.114 3.1.115 3.1.116 3.1.117 3.1.118 3.1.200 3.1.201 3.1.202 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 3.1.408 3.1.409 3.1.410 3.1.411 3.1.412 5.0.100 5.0.101 5.0.102 5.0.103 5.0.104 5.0.200 5.0.201 5.0.202 5.0.203 5.0.204 5.0.205 5.0.206 5.0.300 5.0.301 5.0.302 5.0.303 5.0.400 +- 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.519 2.1.520 2.1.521 2.1.522 2.1.523 2.1.524 2.1.526 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.616 2.1.617 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 2.1.811 2.1.812 2.1.813 2.1.814 2.1.815 2.1.816 2.1.818 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.109 3.1.110 3.1.111 3.1.112 3.1.113 3.1.114 3.1.115 3.1.116 3.1.117 3.1.118 3.1.200 3.1.201 3.1.202 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 3.1.408 3.1.409 3.1.410 3.1.411 3.1.412 5.0.100 5.0.101 5.0.102 5.0.103 5.0.104 5.0.200 5.0.201 5.0.202 5.0.203 5.0.204 5.0.205 5.0.206 5.0.300 5.0.301 5.0.302 5.0.303 5.0.400 ### .NET Core Runtime `Location: C:\Program Files\dotnet\shared\Microsoft.AspNetCore.All` -- 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23 2.1.24 2.1.25 2.1.26 2.1.27 2.1.28 2.1.29 +- 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23 2.1.24 2.1.25 2.1.26 2.1.27 2.1.28 2.1.30 `Location: C:\Program Files\dotnet\shared\Microsoft.AspNetCore.App` -- 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23 2.1.24 2.1.25 2.1.26 2.1.27 2.1.28 2.1.29 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9 3.1.10 3.1.11 3.1.12 3.1.13 3.1.14 3.1.15 3.1.16 3.1.17 3.1.18 5.0.0 5.0.1 5.0.2 5.0.3 5.0.4 5.0.5 5.0.6 5.0.7 5.0.8 5.0.9 +- 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23 2.1.24 2.1.25 2.1.26 2.1.27 2.1.28 2.1.30 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9 3.1.10 3.1.11 3.1.12 3.1.13 3.1.14 3.1.15 3.1.16 3.1.17 3.1.18 5.0.0 5.0.1 5.0.2 5.0.3 5.0.4 5.0.5 5.0.6 5.0.7 5.0.8 5.0.9 `Location: C:\Program Files\dotnet\shared\Microsoft.NETCore.App` -- 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23 2.1.24 2.1.25 2.1.26 2.1.27 2.1.28 2.1.29 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9 3.1.10 3.1.11 3.1.12 3.1.13 3.1.14 3.1.15 3.1.16 3.1.17 3.1.18 5.0.0 5.0.1 5.0.2 5.0.3 5.0.4 5.0.5 5.0.6 5.0.7 5.0.8 5.0.9 +- 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23 2.1.24 2.1.25 2.1.26 2.1.27 2.1.28 2.1.30 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9 3.1.10 3.1.11 3.1.12 3.1.13 3.1.14 3.1.15 3.1.16 3.1.17 3.1.18 5.0.0 5.0.1 5.0.2 5.0.3 5.0.4 5.0.5 5.0.6 5.0.7 5.0.8 5.0.9 `Location: C:\Program Files\dotnet\shared\Microsoft.WindowsDesktop.App` - 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9 3.1.10 3.1.11 3.1.12 3.1.13 3.1.14 3.1.15 3.1.16 3.1.17 3.1.18 5.0.0 5.0.1 5.0.2 5.0.3 5.0.4 5.0.5 5.0.6 5.0.7 5.0.8 5.0.9 @@ -526,9 +528,9 @@ All other versions are saved but not installed. | ------------------ | ---------------- | | DockerMsftProvider | 1.0.0.8 | | MarkdownPS | 1.9 | -| Pester | 3.4.0
5.2.2 | +| Pester | 3.4.0
5.3.0 | | PowerShellGet | 1.0.0.1
2.2.5 | -| PSScriptAnalyzer | 1.19.1 | +| PSScriptAnalyzer | 1.20.0 | | PSWindowsUpdate | 2.2.0.2 | | SqlServer | 21.1.18256 | | VSSetup | 2.2.16 | @@ -546,7 +548,7 @@ All other versions are saved but not installed. | Google APIs | addon-google_apis-google-21
addon-google_apis-google-22
addon-google_apis-google-23
addon-google_apis-google-24 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 21.4.7075529
22.1.7171670 | +| NDK | a
a
21.4.7075529
22.1.7171670 | | SDK Patch Applier v4 | 1 | #### Environment variables From 19717dd75837cd8c0a877f78cb270505af1b1702 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Mon, 6 Sep 2021 18:58:11 +0300 Subject: [PATCH 0502/3485] [Windows] Skip Edge installation for windows-2022 (#4027) --- images/win/scripts/Installers/Install-Edge.ps1 | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/images/win/scripts/Installers/Install-Edge.ps1 b/images/win/scripts/Installers/Install-Edge.ps1 index 1f4ce0ae451b..5b1e3a4449c8 100644 --- a/images/win/scripts/Installers/Install-Edge.ps1 +++ b/images/win/scripts/Installers/Install-Edge.ps1 @@ -3,7 +3,10 @@ ## Desc: Install latest stable version of Microsoft Edge browser ################################################################################ -Choco-Install -PackageName microsoft-edge +# Installed by default on Windows Server 2022 +if (-not (Test-IsWin22)) { + Choco-Install -PackageName microsoft-edge +} # Install Microsoft Edge WebDriver Write-Host "Install Edge WebDriver..." @@ -24,13 +27,6 @@ $EdgeDriverVersionFile = Start-DownloadWithRetry -Url $EdgeDriverVersionUrl -Nam Write-Host "Download Microsoft Edge WebDriver..." $EdgeDriverLatestVersion = Get-Content -Path $EdgeDriverVersionFile $EdgeDriverArchName = "edgedriver_win64.zip" -# A temporary workaround to install the previous driver version because 85.0.564.60 for win64 doesn't exist -if ($EdgeDriverLatestVersion -eq "85.0.564.60") -{ - $EdgeDriverLatestVersion = "85.0.564.51" - Set-Content -Path $EdgeDriverVersionFile -Value $EdgeDriverLatestVersion -} - $EdgeDriverDownloadUrl = "https://msedgedriver.azureedge.net/${EdgeDriverLatestVersion}/${EdgeDriverArchName}" $EdgeDriverArchPath = Start-DownloadWithRetry -Url $EdgeDriverDownloadUrl -Name $EdgeDriverArchName @@ -46,4 +42,4 @@ $PathValue = Get-ItemPropertyValue -Path $regEnvKey -Name 'Path' $PathValue += ";$EdgeDriverPath\" Set-ItemProperty -Path $regEnvKey -Name 'Path' -Value $PathValue -Invoke-PesterTests -TestFile "Browsers" -TestName "Edge" \ No newline at end of file +Invoke-PesterTests -TestFile "Browsers" -TestName "Edge" From 4394e4414f48c6acaf0272add56b97a802826591 Mon Sep 17 00:00:00 2001 From: Maxim Lobanov Date: Tue, 7 Sep 2021 10:56:55 +0300 Subject: [PATCH 0503/3485] [macOS] Activate "Allow Remote Automation" Safari option during image generation (#3996) * Move logic to activate "Allow Remote Automation" from base image to image gen scripts * add shebang --- .../provision/configuration/configure-machine.sh | 6 ------ images/macos/provision/core/safari.sh | 16 ++++++++++++++++ images/macos/templates/macOS-10.13.json | 1 + images/macos/templates/macOS-10.14.json | 1 + images/macos/templates/macOS-10.15.json | 1 + images/macos/templates/macOS-11.json | 1 + images/macos/tests/Browsers.Tests.ps1 | 11 +++++++++++ 7 files changed, 31 insertions(+), 6 deletions(-) create mode 100644 images/macos/provision/core/safari.sh diff --git a/images/macos/provision/configuration/configure-machine.sh b/images/macos/provision/configuration/configure-machine.sh index ce9eb3bb8660..a0794071fd8c 100644 --- a/images/macos/provision/configuration/configure-machine.sh +++ b/images/macos/provision/configuration/configure-machine.sh @@ -2,12 +2,6 @@ source ~/utils/utils.sh -echo "Enabling safari driver..." -# https://developer.apple.com/documentation/webkit/testing_with_webdriver_in_safari -# Safari’s executable is located at /usr/bin/safaridriver -# Configure Safari to Enable WebDriver Support -sudo safaridriver --enable - echo "Enabling developer mode..." sudo /usr/sbin/DevToolsSecurity --enable diff --git a/images/macos/provision/core/safari.sh b/images/macos/provision/core/safari.sh new file mode 100644 index 000000000000..8001c39eeb6a --- /dev/null +++ b/images/macos/provision/core/safari.sh @@ -0,0 +1,16 @@ +#!/bin/bash -e -o pipefail + +echo "Enabling safari driver..." +# https://developer.apple.com/documentation/webkit/testing_with_webdriver_in_safari +# Safari’s executable is located at /usr/bin/safaridriver +# Configure Safari to Enable WebDriver Support +sudo safaridriver --enable + +echo "Enabling the 'Allow Remote Automation' option in Safari's Develop menu" +mkdir -p $HOME/Library/WebDriver +safari_plist="$HOME/Library/WebDriver/com.apple.Safari.plist" +# "|| true" is needed to suppress exit code 1 in case if property or file doesn't exist +/usr/libexec/PlistBuddy -c 'delete AllowRemoteAutomation' $safari_plist || true +/usr/libexec/PlistBuddy -c 'add AllowRemoteAutomation bool true' $safari_plist + +invoke_tests "Browsers" "Safari" \ No newline at end of file diff --git a/images/macos/templates/macOS-10.13.json b/images/macos/templates/macOS-10.13.json index 202e55bfe502..306997dac7fc 100644 --- a/images/macos/templates/macOS-10.13.json +++ b/images/macos/templates/macOS-10.13.json @@ -171,6 +171,7 @@ "./provision/core/postgresql.sh", "./provision/core/mongodb.sh", "./provision/core/miniconda.sh", + "./provision/core/safari.sh", "./provision/core/chrome.sh", "./provision/core/edge.sh", "./provision/core/firefox.sh", diff --git a/images/macos/templates/macOS-10.14.json b/images/macos/templates/macOS-10.14.json index a0fd28278693..fd898affc8b2 100644 --- a/images/macos/templates/macOS-10.14.json +++ b/images/macos/templates/macOS-10.14.json @@ -176,6 +176,7 @@ "./provision/core/postgresql.sh", "./provision/core/mongodb.sh", "./provision/core/audiodevice.sh", + "./provision/core/safari.sh", "./provision/core/chrome.sh", "./provision/core/edge.sh", "./provision/core/firefox.sh", diff --git a/images/macos/templates/macOS-10.15.json b/images/macos/templates/macOS-10.15.json index eeb578d1e292..5fe2b3bbd242 100644 --- a/images/macos/templates/macOS-10.15.json +++ b/images/macos/templates/macOS-10.15.json @@ -181,6 +181,7 @@ "./provision/core/audiodevice.sh", "./provision/core/vcpkg.sh", "./provision/core/miniconda.sh", + "./provision/core/safari.sh", "./provision/core/chrome.sh", "./provision/core/edge.sh", "./provision/core/firefox.sh", diff --git a/images/macos/templates/macOS-11.json b/images/macos/templates/macOS-11.json index cf8bcbc9812d..327b9dd500c9 100644 --- a/images/macos/templates/macOS-11.json +++ b/images/macos/templates/macOS-11.json @@ -185,6 +185,7 @@ "./provision/core/audiodevice.sh", "./provision/core/vcpkg.sh", "./provision/core/miniconda.sh", + "./provision/core/safari.sh", "./provision/core/chrome.sh", "./provision/core/edge.sh", "./provision/core/firefox.sh", diff --git a/images/macos/tests/Browsers.Tests.ps1 b/images/macos/tests/Browsers.Tests.ps1 index dead13966179..7351c3f3b875 100644 --- a/images/macos/tests/Browsers.Tests.ps1 +++ b/images/macos/tests/Browsers.Tests.ps1 @@ -31,4 +31,15 @@ Describe "Firefox" { It "Geckodriver" { "geckodriver --version" | Should -ReturnZeroExitCode } +} + +Describe "Safari" { + It "'Allow Remote Automation' option is activated" { + $plistPath = "$env:HOME/Library/WebDriver/com.apple.Safari.plist" + $command = "/usr/libexec/PlistBuddy -c 'print AllowRemoteAutomation' $plistPath" + $plistPath | Should -Exist + $commandResult = Get-CommandResult $command + $commandResult.ExitCode | Should -Be 0 + $commandResult.Output | Should -Be "true" + } } \ No newline at end of file From ea7f3caa06f9e79842fc6328f0bc6fb060093b99 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Wed, 8 Sep 2021 09:50:43 +0300 Subject: [PATCH 0504/3485] Add docker images to list of tools (#4030) --- docs/software-and-images-guidelines.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/software-and-images-guidelines.md b/docs/software-and-images-guidelines.md index dc9ef42c0a61..def5143635aa 100644 --- a/docs/software-and-images-guidelines.md +++ b/docs/software-and-images-guidelines.md @@ -23,9 +23,10 @@ These are the guidelines we follow in software and images supporting routine: | Tool name | Installation strategy | |-----------|-----------------------| +| Docker images | not more than 3 latest LTS OS\tool versions. New images or new versions of current images are added using the standard tool request process | | Java | all LTS versions | | Node.js | 3 latest LTS versions | -| Go | 3 latest minor versions | +| Go | 3 latest minor versions | | Python
Ruby | 5 most popular `major.minor` versions | | PyPy | 3 most popular `major.minor` versions | | .NET Core | 2 latest LTS versions and 1 latest version. For each feature version only latest patch is installed | From f2fdcef0e020770b1b6cc58bda3b4a01f0286f5e Mon Sep 17 00:00:00 2001 From: Nikita Bykov <49442273+nikita-bykov@users.noreply.github.com> Date: Wed, 8 Sep 2021 09:58:52 +0300 Subject: [PATCH 0505/3485] [macOS] Improve configure-tccdb-macos11 script (#4002) --- .../configuration/configure-tccdb-macos11.sh | 68 +++++++++++-------- images/macos/provision/utils/utils.sh | 16 +++++ 2 files changed, 54 insertions(+), 30 deletions(-) diff --git a/images/macos/provision/configuration/configure-tccdb-macos11.sh b/images/macos/provision/configuration/configure-tccdb-macos11.sh index 9af239b19793..3448cd2ee533 100644 --- a/images/macos/provision/configuration/configure-tccdb-macos11.sh +++ b/images/macos/provision/configuration/configure-tccdb-macos11.sh @@ -2,35 +2,43 @@ # This script adds permissions, which are required for some installed tools to work properly, to the TCC.db -defaultUser=$(users) +source ~/utils/utils.sh -sudo sqlite3 /Library/Application\ Support/com.apple.TCC/TCC.db < Date: Wed, 8 Sep 2021 12:29:41 +0200 Subject: [PATCH 0506/3485] [Ubuntu] docker: add debian bullseye images (#4003) With the release of Debian bullseye more and more containers are migrating from buster to bullseye. --- images/linux/toolsets/toolset-1804.json | 3 +++ images/linux/toolsets/toolset-2004.json | 3 +++ 2 files changed, 6 insertions(+) diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index 20552f1ea09a..e9d9119162af 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -204,10 +204,13 @@ "alpine:3.11", "alpine:3.12", "alpine:3.13", + "alpine:3.14", "buildpack-deps:stretch", "buildpack-deps:buster", + "buildpack-deps:bullseye", "debian:9", "debian:10", + "debian:11", "node:10", "node:12", "node:14", diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index 7d5a4c0e43bc..2087bc1dcf6d 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -203,10 +203,13 @@ "alpine:3.11", "alpine:3.12", "alpine:3.13", + "alpine:3.14", "buildpack-deps:stretch", "buildpack-deps:buster", + "buildpack-deps:bullseye", "debian:9", "debian:10", + "debian:11", "node:10", "node:12", "node:14", From 8bbd74620a75431bc66c516e80be4ec79efdfed5 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Wed, 8 Sep 2021 13:30:30 +0300 Subject: [PATCH 0507/3485] winpacker: add extra reboot step (#4037) --- images/win/windows2019.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/images/win/windows2019.json b/images/win/windows2019.json index 5bb10a24ee3d..b9339a3bec6b 100644 --- a/images/win/windows2019.json +++ b/images/win/windows2019.json @@ -129,6 +129,10 @@ ], "execution_policy": "unrestricted" }, + { + "type": "windows-restart", + "restart_timeout": "30m" + }, { "type": "powershell", "scripts": [ From 3a8831b648dc326403ca2b02da9f98db7154bc7b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 8 Sep 2021 10:36:53 +0000 Subject: [PATCH 0508/3485] Updating readme file for macOS-10.15 version 20210905.2 (#4022) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/macos/macos-10.15-Readme.md | 35 +++++++++++++++--------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/images/macos/macos-10.15-Readme.md b/images/macos/macos-10.15-Readme.md index a3b1497ebcc9..6a070d1c9c09 100644 --- a/images/macos/macos-10.15-Readme.md +++ b/images/macos/macos-10.15-Readme.md @@ -5,11 +5,11 @@ # macOS 10.15 info - System Version: macOS 10.15.7 (19H1323) - Kernel Version: Darwin 19.6.0 -- Image Version: 20210831.3 +- Image Version: 20210905.2 ## Installed Software ### Language and Runtime -- .NET SDK 2.1.300 2.1.301 2.1.302 2.1.401 2.1.402 2.1.403 2.1.500 2.1.502 2.1.503 2.1.504 2.1.505 2.1.506 2.1.507 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 2.1.811 2.1.812 2.1.813 2.1.814 2.1.815 2.1.816 2.1.818 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 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 3.1.408 3.1.409 3.1.410 3.1.411 3.1.412 5.0.100 5.0.101 5.0.102 5.0.200 5.0.201 5.0.202 5.0.300 5.0.301 5.0.302 5.0.400 +- .NET SDK 2.1.302 2.1.403 2.1.507 2.1.607 2.1.701 2.1.818 3.1.101 3.1.201 3.1.302 3.1.412 5.0.102 5.0.202 5.0.302 5.0.400 - Bash 3.2.57(1)-release - Clang/LLVM 12.0.0 is default - Clang/LLVM 12.0.1 is available on `'$(brew --prefix llvm)/bin/clang'` @@ -29,24 +29,24 @@ - Perl 5.34.0 - PHP 8.0.10 - Python 2.7.18 -- Python 3.9.6 +- Python 3.9.7 - R 4.1.1 - Ruby 2.7.4p191 ### Package Management -- Bundler version 2.2.26 +- Bundler version 2.2.27 - Carthage 0.38.0 -- CocoaPods 1.10.2 +- CocoaPods 1.11.0 - Composer 2.1.6 - Homebrew 3.2.10 - Miniconda 4.10.3 - NPM 6.14.15 - NuGet 5.6.0.6489 - Pip 20.3.4 (python 2.7) -- Pip 21.1.3 (python 3.9) +- Pip 21.2.4 (python 3.9) - Pipx 0.16.4 -- RubyGems 3.2.26 -- Vcpkg 2021 (build from master \<2ea3e99>) +- RubyGems 3.2.27 +- Vcpkg 2021 (build from master \<71422c6>) - Yarn 1.22.5 #### Environment variables @@ -63,7 +63,7 @@ ### Utilities - 7-Zip 17.04 - aria2 1.36.0 -- azcopy 10.12.0 +- azcopy 10.12.1 - bazel 4.2.1 - bazelisk 1.10.1 - bsdtar 3.3.2 - available by 'tar' alias @@ -71,7 +71,7 @@ - Git LFS: 2.13.3 - Git: 2.33.0 - GitHub CLI: 2.0.0 -- GNU parallel 20210622 +- GNU parallel 20210822 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.1 - gpg (GnuPG) 2.3.2 @@ -96,14 +96,14 @@ ### Tools - Aliyun CLI 3.0.90 - App Center CLI 2.10.0 -- AWS CLI 2.2.33 -- AWS SAM CLI 1.29.0 +- AWS CLI 2.2.35 +- AWS SAM CLI 1.30.0 - AWS Session Manager CLI 1.2.245.0 - Azure CLI 2.27.2 - Bicep CLI 0.4.613 - Cabal 3.4.0.0 - Cmake 3.21.2 -- Fastlane 2.193.0 +- Fastlane 2.193.1 - GHC 9.0.1 - GHCup v0.1.16.2 - Stack 2.7.3 @@ -120,8 +120,8 @@ - SafariDriver 14.1.2 (15611.3.10.1.5) - Google Chrome 93.0.4577.63 - ChromeDriver 92.0.4515.107 -- Microsoft Edge 92.0.902.84 -- MSEdgeDriver 92.0.902.84 +- Microsoft Edge 93.0.961.38 +- MSEdgeDriver 93.0.961.38 - Mozilla Firefox 91.0.2 - geckodriver 0.29.1 @@ -172,6 +172,7 @@ - 1.14.15 - 1.15.15 - 1.16.7 +- 1.17.0 ### Rust Tools - Cargo 1.54.0 @@ -202,7 +203,7 @@ | Name | Version | ConfigFile | ServiceStatus | ListenPort | | ----- | ------- | ------------------------------- | ------------- | ---------- | | httpd | 2.4.48 | /usr/local/etc/httpd/httpd.conf | stopped | 80 | -| nginx | 1.21.1 | /usr/local/etc/nginx/nginx.conf | stopped | 80 | +| nginx | 1.21.2 | /usr/local/etc/nginx/nginx.conf | stopped | 80 | ### Xamarin #### Visual Studio for Mac @@ -250,7 +251,7 @@ #### Xcode Support Tools - xcpretty 0.3.0 -- xcversion 2.7.0 +- xcversion 2.8.0 - Nomad CLI 0.0.2 - Nomad shenzhen CLI 0.14.3 - xctool 0.3.7 From 4b8d98922ac60c4970626a0e4bfbb343742e1c0a Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Wed, 8 Sep 2021 15:44:10 +0300 Subject: [PATCH 0509/3485] doc: add wsl info section for win22 (#4041) --- images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index c664ef9809db..c2ee6301b33d 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -21,7 +21,7 @@ $markdown += New-MDList -Style Unordered -Lines @( "Image Version: $env:IMAGE_VERSION" ) -if (Test-IsWin19) +if ((Test-IsWin19) -or (Test-IsWin22)) { $markdown += New-MDHeader "Enabled windows optional features" -Level 2 $markdown += New-MDList -Style Unordered -Lines @( From 06659e17fdbd9aa1fa713d892c892b15cb867396 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 9 Sep 2021 07:26:34 +0000 Subject: [PATCH 0510/3485] Updating readme file for ubuntu18 version 20210906.1 (#4025) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/linux/Ubuntu1804-README.md | 54 +++++++++++++++++-------------- 1 file changed, 29 insertions(+), 25 deletions(-) diff --git a/images/linux/Ubuntu1804-README.md b/images/linux/Ubuntu1804-README.md index 1b5701afc524..4fa397f925c7 100644 --- a/images/linux/Ubuntu1804-README.md +++ b/images/linux/Ubuntu1804-README.md @@ -4,7 +4,7 @@ *** # Ubuntu 18.04.5 LTS - Linux kernel version: 5.4.0-1056-azure -- Image Version: 20210831.9 +- Image Version: 20210906.1 ## Installed Software ### Language and Runtime @@ -12,7 +12,7 @@ - Clang 9.0.0 - Clang-format 9.0.0 - Erlang 24.0.5 (Eshell 12.0.3) -- Erlang rebar3 3.16.1 +- Erlang rebar3 3.17.0 - GNU C++ 7.5.0, 9.4.0, 10.3.0 - GNU Fortran 7.5.0, 9.4.0, 10.3.0 - Julia 1.6.2 @@ -36,7 +36,7 @@ - Pip3 9.0.1 - Pipx 0.16.4 - RubyGems 2.7.6 -- Vcpkg (build from master \<9fb1585>) +- Vcpkg (build from master \<71422c6>) - Yarn 1.22.11 #### Environment variables @@ -54,7 +54,7 @@ ### Tools - Ansible 2.11.4 - apt-fast 1.9.11 -- AzCopy 10.11.0 (available by `azcopy` and `azcopy10` aliases) +- AzCopy 10.12.1 (available by `azcopy` and `azcopy10` aliases) - Bazel 4.2.1 - Bazelisk 1.10.1 - Bicep 0.4.613 @@ -78,7 +78,7 @@ - Leiningen 2.9.6 - MediaInfo 17.12 - Mercurial 4.5.3 -- Minikube 1.22.0 +- Minikube 1.23.0 - Newman 5.2.4 - nvm 0.38.0 - OpenSSL 1.1.1 11 Sep 2018 @@ -90,23 +90,23 @@ - Skopeo 1.2.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 - SVN 1.9.7 -- Terraform 1.0.5 +- Terraform 1.0.6 - yamllint 1.26.3 -- yq 4.12.1 +- yq 4.12.2 - zstd 1.5.0 (homebrew) ### CLI Tools - Alibaba Cloud CLI 3.0.90 -- AWS CLI 1.20.32 +- AWS CLI 1.20.36 - AWS CLI Session manager plugin 1.2.245.0 -- AWS SAM CLI 1.29.0 +- AWS SAM CLI 1.30.0 - Azure CLI (azure-cli) 2.27.2 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.20.0 - GitHub CLI 2.0.0 - Google Cloud SDK 355.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 6.8.1 -- OpenShift CLI 4.8.5 +- Netlify CLI 6.8.5 +- OpenShift CLI 4.8.9 - ORAS CLI 0.12.0 - Vercel CLI 23.1.2 @@ -147,11 +147,11 @@ - Rustfmt 1.4.37 ### Browsers and Drivers -- Google Chrome 92.0.4515.159 -- ChromeDriver 92.0.4515.107 +- Google Chrome 93.0.4577.63 +- ChromeDriver 93.0.4577.15 - Mozilla Firefox 91.0.2 - Geckodriver 0.29.1 -- Chromium 92.0.4515.0 +- Chromium 93.0.4577.0 #### Environment variables | Name | Value | @@ -183,6 +183,8 @@ - 1.13.15 - 1.14.15 - 1.15.15 +- 1.16.7 +- 1.17.0 #### Node.js - 10.24.1 @@ -214,6 +216,8 @@ | GOROOT_1_13_X64 | /opt/hostedtoolcache/go/1.13.15/x64 | x64 | | GOROOT_1_14_X64 | /opt/hostedtoolcache/go/1.14.15/x64 | x64 | | GOROOT_1_15_X64 | /opt/hostedtoolcache/go/1.15.15/x64 | x64 | +| GOROOT_1_16_X64 | /opt/hostedtoolcache/go/1.16.7/x64 | x64 | +| GOROOT_1_17_X64 | /opt/hostedtoolcache/go/1.17.0/x64 | x64 | ### PowerShell Tools - PowerShell 7.1.4 @@ -261,19 +265,19 @@ ### Cached Docker images | Repository:Tag | Digest | Created | | ---------------------- | ------------------------------------------------------------------------ | ---------- | -| alpine:3.11 | sha256:6cf3d8abc08cf3792d590152d7a4628ec827621f55b1d3150383f5f39335d6eb | 2021-04-14 | -| alpine:3.12 | sha256:de25c7fc6c4f3a27c7f0c2dff454e4671823a34d88abd533f210848d527e0fbb | 2021-04-14 | -| alpine:3.13 | sha256:1d30d1ba3cb90962067e9b29491fbd56997979d54376f23f01448b5c5cd8b462 | 2021-04-14 | -| buildpack-deps:buster | sha256:ad1d4fa28be6745ab3df67d99e62f5833dd59d4960ecbd707335306fa85ff442 | 2021-08-17 | -| buildpack-deps:stretch | sha256:410405a7cb1b238dfef3c9c3f84a26187296e876b92117fa25bed3a015dd7c9e | 2021-08-17 | -| debian:10 | sha256:e2fe52e17d649812bddcac07faf16f33542129a59b2c1c59b39a436754b7f146 | 2021-08-17 | -| debian:9 | sha256:0ed9bd85836141af791835584b3931a384561dbc449fa0ae4a8ca79192c3b52c | 2021-08-17 | +| alpine:3.11 | sha256:e457c945f4be075a9e5365c6628e552fcd15551f0bc1c1fc2ea0f2227a524210 | 2021-08-31 | +| alpine:3.12 | sha256:a296b4c6f6ee2b88f095b61e95c7ef4f51ba25598835b4978c9256d8c8ace48a | 2021-08-31 | +| alpine:3.13 | sha256:2582893dec6f12fd499d3a709477f2c0c0c1dfcd28024c93f1f0626b9e3540c8 | 2021-08-31 | +| buildpack-deps:buster | sha256:a254f0d1ab14e6f05992f64e71cbc6f22ab8a657b0e962bb8d0c7a1a3b2ed6d0 | 2021-09-03 | +| buildpack-deps:stretch | sha256:b4e9fcbcec4f927938983a50cb12d460a1d0c809925bbadb5e9c378cb82c53cb | 2021-09-03 | +| debian:10 | sha256:cdb5ae50fedfda0bc2f9e4d303683ab6096c84db9e97b0bbfea0653549aeb3f8 | 2021-09-03 | +| debian:9 | sha256:74ca5bc3c547829123c1aaf69151bc8a50b9d8b006997e206ce0ef631ad3d0af | 2021-09-03 | | node:10 | sha256:59531d2835edd5161c8f9512f9e095b1836f7a1fcb0ab73e005ec46047384911 | 2021-04-10 | | node:10-alpine | sha256:dc98dac24efd4254f75976c40bce46944697a110d06ce7fa47e7268470cf2e28 | 2021-04-14 | -| node:12 | sha256:61748e56917a2f65621d68c9d9497c7bc420551a29f4be3543a373665eafd6e3 | 2021-08-18 | -| node:12-alpine | sha256:372e5cc17da5baedf302643c3bb54283dac990942fc816d9f7c12565e89c3265 | 2021-08-12 | -| node:14 | sha256:c1fa7759eeff3f33ba08ff600ffaca4558954722a4345653ed1a0d87dffed9aa | 2021-08-18 | -| node:14-alpine | sha256:b8d48b515e3049d4b7e9ced6cedbe223c3bc4a3d0fd02332448f3cdb000faee1 | 2021-08-12 | +| node:12 | sha256:a8f4083bfbffe6d9f2e568efb6c83f8fee6da9f8496853dbf4fcf6e84b1377a6 | 2021-09-03 | +| node:12-alpine | sha256:1ea5900145028957ec0e7b7e590ac677797fa8962ccec4e73188092f7bc14da5 | 2021-08-31 | +| node:14 | sha256:4164d987bfceb62b17db4938d535dd31fc50d6ee0b4e00ac7a774f82af408d48 | 2021-09-03 | +| node:14-alpine | sha256:8c94a0291133e16b92be5c667e0bc35930940dfa7be544fb142e25f8e4510a45 | 2021-08-31 | | ubuntu:16.04 | sha256:454054f5bbd571b088db25b662099c6c7b3f0cb78536a2077d54adc48f00cd68 | 2021-08-31 | | ubuntu:18.04 | sha256:9bc830af2bef73276515a29aa896eedfa7bdf4bdbc5c1063b4c457a4bbb8cd79 | 2021-08-31 | | ubuntu:20.04 | sha256:9d6a8699fb5c9c39cf08a0871bd6219f0400981c570894cd8cbea30d3424a31f | 2021-08-31 | From 1052083f04b2dcefcba6be81a44eb807c6255579 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Thu, 9 Sep 2021 10:46:21 +0300 Subject: [PATCH 0511/3485] [Windows] win-wdk: install WDK 11 (#4014) --- .../scripts/ImageHelpers/InstallHelpers.ps1 | 17 ++++++++++--- images/win/scripts/Installers/Install-WDK.ps1 | 25 ++++++++++++++++--- .../SoftwareReport.VisualStudio.psm1 | 15 +++++++++++ 3 files changed, 49 insertions(+), 8 deletions(-) diff --git a/images/win/scripts/ImageHelpers/InstallHelpers.ps1 b/images/win/scripts/ImageHelpers/InstallHelpers.ps1 index ececdce84efd..76f093b5e31d 100644 --- a/images/win/scripts/ImageHelpers/InstallHelpers.ps1 +++ b/images/win/scripts/ImageHelpers/InstallHelpers.ps1 @@ -22,15 +22,24 @@ function Install-Binary Param ( - [Parameter(Mandatory)] + [Parameter(Mandatory, ParameterSetName="Url")] [String] $Url, - [Parameter(Mandatory)] + [Parameter(Mandatory, ParameterSetName="Url")] [String] $Name, + [Parameter(Mandatory, ParameterSetName="LocalPath")] + [String] $FilePath, [String[]] $ArgumentList ) - Write-Host "Downloading $Name..." - $filePath = Start-DownloadWithRetry -Url $Url -Name $Name + if ($PSCmdlet.ParameterSetName -eq "LocalPath") + { + $name = Split-Path -Path $FilePath -Leaf + } + else + { + Write-Host "Downloading $Name..." + $filePath = Start-DownloadWithRetry -Url $Url -Name $Name + } # MSI binaries should be installed via msiexec.exe $fileExtension = ([System.IO.Path]::GetExtension($Name)).Replace(".", "") diff --git a/images/win/scripts/Installers/Install-WDK.ps1 b/images/win/scripts/Installers/Install-WDK.ps1 index c272da543de0..052245b6d2b1 100644 --- a/images/win/scripts/Installers/Install-WDK.ps1 +++ b/images/win/scripts/Installers/Install-WDK.ps1 @@ -6,8 +6,8 @@ # Requires Windows SDK with the same version number as the WDK if (Test-IsWin19) { - $winSdkUrl = "https://go.microsoft.com/fwlink/?linkid=2164145" - $wdkUrl = "https://go.microsoft.com/fwlink/?linkid=2164149" + $winSdkUrl = "https://go.microsoft.com/fwlink/?linkid=2166460" + $wdkUrl = "https://go.microsoft.com/fwlink/?linkid=2166289" $FilePath = "C:\Program Files (x86)\Windows Kits\10\Vsix\VS2019\WDK.vsix" $VSver = "2019" } @@ -25,8 +25,25 @@ else $argumentList = ("/features", "+", "/quiet") -# `winsdksetup.exe /features + /quiet` installs all features without showing the GUI -Install-Binary -Url $winSdkUrl -Name "winsdksetup.exe" -ArgumentList $argumentList +if (Test-IsWin19) +{ + # Download WDK ISO file + $isoPath = Start-DownloadWithRetry -Url $winSdkUrl -Name winsdk.iso + $diskImage = Mount-DiskImage -ImagePath $isoPath + $driveLetter = ($diskImage | Get-Volume).DriveLetter + $sdkPath = Join-Path "${driveLetter}:\" "winsdksetup.exe" + + # `winsdksetup.exe /features + /quiet` installs all features without showing the GUI + Install-Binary -FilePath $sdkPath -ArgumentList $argumentList + + # Dismount ISO + Dismount-DiskImage -DevicePath $diskImage.DevicePath | Out-Null +} +else +{ + # `winsdksetup.exe /features + /quiet` installs all features without showing the GUI + Install-Binary -Url $winSdkUrl -Name "winsdksetup.exe" -ArgumentList $argumentList +} # `wdksetup.exe /features + /quiet` installs all features without showing the GUI Install-Binary -Url $wdkUrl -Name "wdksetup.exe" -ArgumentList $argumentList diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.VisualStudio.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.VisualStudio.psm1 index 21f2e5dd4a3e..341c5dc4419f 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.VisualStudio.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.VisualStudio.psm1 @@ -7,6 +7,12 @@ function Get-VisualStudioVersion { } } +function Get-SDKVersion { + $regKey = "HKLM:\Software\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall\*" + $installedApplications = Get-ItemProperty -Path $regKey + ($installedApplications | Where-Object { $_.DisplayName -eq 'Windows SDK' } | Select-Object -First 1).DisplayVersion +} + function Get-WixVersion { $regKey = "HKLM:\Software\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall\*" $installedApplications = Get-ItemProperty -Path $regKey @@ -52,6 +58,14 @@ function Get-VisualStudioExtensions { ) } + # SDK + if (Test-IsWin19) { + $sdkPackageVersion = Get-SDKVersion + $sdkPackages = @( + @{Package = 'Windows Software Development Kit Extension'; Version = $sdkPackageVersion} + ) + } + if ((Test-IsWin16) -or (Test-IsWin19)) { # Wix $wixPackageVersion = Get-WixVersion @@ -74,6 +88,7 @@ function Get-VisualStudioExtensions { $extensions = @( $vsixs $ssdtPackages + $sdkPackages $wixPackages $wdkPackages ) From baabb70137a0d37b80d833010c4c3bb9ba84d207 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 9 Sep 2021 08:29:06 +0000 Subject: [PATCH 0512/3485] Updating readme file for ubuntu20 version 20210906.1 (#4024) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/linux/Ubuntu2004-README.md | 54 ++++++++++++++++--------------- 1 file changed, 28 insertions(+), 26 deletions(-) diff --git a/images/linux/Ubuntu2004-README.md b/images/linux/Ubuntu2004-README.md index 8ab7ec7cb408..e2623003d716 100644 --- a/images/linux/Ubuntu2004-README.md +++ b/images/linux/Ubuntu2004-README.md @@ -4,7 +4,7 @@ *** # Ubuntu 20.04.3 LTS - Linux kernel version: 5.8.0-1040-azure -- Image Version: 20210831.9 +- Image Version: 20210906.1 ## Installed Software ### Language and Runtime @@ -12,7 +12,7 @@ - Clang 10.0.0, 11.0.0, 12.0.0 - Clang-format 10.0.0, 11.0.0, 12.0.0 - Erlang 24.0.5 (Eshell 12.0.3) -- Erlang rebar3 3.16.1 +- Erlang rebar3 3.17.0 - GNU C++ 9.3.0, 10.3.0 - GNU Fortran 9.3.0, 10.3.0 - Julia 1.6.2 @@ -36,7 +36,7 @@ - Pip3 20.0.2 - Pipx 0.16.4 - RubyGems 3.1.2 -- Vcpkg (build from master \<9fb1585>) +- Vcpkg (build from master \<71422c6>) - Yarn 1.22.11 #### Environment variables @@ -55,7 +55,7 @@ ### Tools - Ansible 2.11.4 - apt-fast 1.9.11 -- AzCopy 10.11.0 (available by `azcopy` and `azcopy10` aliases) +- AzCopy 10.12.1 (available by `azcopy` and `azcopy10` aliases) - Bazel 4.2.1 - Bazelisk 1.10.1 - Bicep 0.4.613 @@ -66,7 +66,7 @@ - Docker-Buildx 0.6.3 - Docker-Moby Client 20.10.8+azure - Docker-Moby Server 20.10.8+azure -- Fastlane 2.192.0 +- Fastlane 2.193.1 - Git 2.33.0 (apt source repository: ppa:git-core/ppa) - Git LFS 2.13.3 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.6.0 @@ -80,7 +80,7 @@ - Leiningen 2.9.6 - MediaInfo 19.09 - Mercurial 5.3.1 -- Minikube 1.22.0 +- Minikube 1.23.0 - Newman 5.2.4 - nvm 0.38.0 - OpenSSL 1.1.1f 31 Mar 2020 @@ -92,23 +92,23 @@ - Skopeo 1.3.0 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 -- Terraform 1.0.5 +- Terraform 1.0.6 - yamllint 1.26.3 -- yq 4.12.1 +- yq 4.12.2 - zstd 1.5.0 (homebrew) ### CLI Tools - Alibaba Cloud CLI 3.0.90 -- AWS CLI 2.2.33 +- AWS CLI 2.2.35 - AWS CLI Session manager plugin 1.2.245.0 -- AWS SAM CLI 1.29.0 +- AWS SAM CLI 1.30.0 - Azure CLI (azure-cli) 2.27.2 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.20.0 - GitHub CLI 2.0.0 - Google Cloud SDK 355.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 6.8.1 -- OpenShift CLI 4.8.5 +- Netlify CLI 6.8.5 +- OpenShift CLI 4.8.9 - ORAS CLI 0.12.0 - Vercel CLI 23.1.2 @@ -153,11 +153,11 @@ - Rustfmt 1.4.37 ### Browsers and Drivers -- Google Chrome 92.0.4515.159 -- ChromeDriver 92.0.4515.107 +- Google Chrome 93.0.4577.63 +- ChromeDriver 93.0.4577.15 - Mozilla Firefox 91.0.2 - Geckodriver 0.29.1 -- Chromium 92.0.4515.0 +- Chromium 93.0.4577.0 #### Environment variables | Name | Value | @@ -189,6 +189,7 @@ - 1.14.15 - 1.15.15 - 1.16.7 +- 1.17.0 #### Node.js - 10.24.1 @@ -220,6 +221,7 @@ | GOROOT_1_14_X64 | /opt/hostedtoolcache/go/1.14.15/x64 | x64 | | GOROOT_1_15_X64 | /opt/hostedtoolcache/go/1.15.15/x64 | x64 | | GOROOT_1_16_X64 | /opt/hostedtoolcache/go/1.16.7/x64 | x64 | +| GOROOT_1_17_X64 | /opt/hostedtoolcache/go/1.17.0/x64 | x64 | ### PowerShell Tools - PowerShell 7.1.4 @@ -269,19 +271,19 @@ ### Cached Docker images | Repository:Tag | Digest | Created | | ---------------------- | ------------------------------------------------------------------------ | ---------- | -| alpine:3.11 | sha256:6cf3d8abc08cf3792d590152d7a4628ec827621f55b1d3150383f5f39335d6eb | 2021-04-14 | -| alpine:3.12 | sha256:de25c7fc6c4f3a27c7f0c2dff454e4671823a34d88abd533f210848d527e0fbb | 2021-04-14 | -| alpine:3.13 | sha256:1d30d1ba3cb90962067e9b29491fbd56997979d54376f23f01448b5c5cd8b462 | 2021-04-14 | -| buildpack-deps:buster | sha256:ad1d4fa28be6745ab3df67d99e62f5833dd59d4960ecbd707335306fa85ff442 | 2021-08-17 | -| buildpack-deps:stretch | sha256:410405a7cb1b238dfef3c9c3f84a26187296e876b92117fa25bed3a015dd7c9e | 2021-08-17 | -| debian:10 | sha256:e2fe52e17d649812bddcac07faf16f33542129a59b2c1c59b39a436754b7f146 | 2021-08-17 | -| debian:9 | sha256:0ed9bd85836141af791835584b3931a384561dbc449fa0ae4a8ca79192c3b52c | 2021-08-17 | +| alpine:3.11 | sha256:e457c945f4be075a9e5365c6628e552fcd15551f0bc1c1fc2ea0f2227a524210 | 2021-08-31 | +| alpine:3.12 | sha256:a296b4c6f6ee2b88f095b61e95c7ef4f51ba25598835b4978c9256d8c8ace48a | 2021-08-31 | +| alpine:3.13 | sha256:2582893dec6f12fd499d3a709477f2c0c0c1dfcd28024c93f1f0626b9e3540c8 | 2021-08-31 | +| buildpack-deps:buster | sha256:a254f0d1ab14e6f05992f64e71cbc6f22ab8a657b0e962bb8d0c7a1a3b2ed6d0 | 2021-09-03 | +| buildpack-deps:stretch | sha256:b4e9fcbcec4f927938983a50cb12d460a1d0c809925bbadb5e9c378cb82c53cb | 2021-09-03 | +| debian:10 | sha256:cdb5ae50fedfda0bc2f9e4d303683ab6096c84db9e97b0bbfea0653549aeb3f8 | 2021-09-03 | +| debian:9 | sha256:74ca5bc3c547829123c1aaf69151bc8a50b9d8b006997e206ce0ef631ad3d0af | 2021-09-03 | | node:10 | sha256:59531d2835edd5161c8f9512f9e095b1836f7a1fcb0ab73e005ec46047384911 | 2021-04-10 | | node:10-alpine | sha256:dc98dac24efd4254f75976c40bce46944697a110d06ce7fa47e7268470cf2e28 | 2021-04-14 | -| node:12 | sha256:61748e56917a2f65621d68c9d9497c7bc420551a29f4be3543a373665eafd6e3 | 2021-08-18 | -| node:12-alpine | sha256:372e5cc17da5baedf302643c3bb54283dac990942fc816d9f7c12565e89c3265 | 2021-08-12 | -| node:14 | sha256:c1fa7759eeff3f33ba08ff600ffaca4558954722a4345653ed1a0d87dffed9aa | 2021-08-18 | -| node:14-alpine | sha256:b8d48b515e3049d4b7e9ced6cedbe223c3bc4a3d0fd02332448f3cdb000faee1 | 2021-08-12 | +| node:12 | sha256:a8f4083bfbffe6d9f2e568efb6c83f8fee6da9f8496853dbf4fcf6e84b1377a6 | 2021-09-03 | +| node:12-alpine | sha256:1ea5900145028957ec0e7b7e590ac677797fa8962ccec4e73188092f7bc14da5 | 2021-08-31 | +| node:14 | sha256:4164d987bfceb62b17db4938d535dd31fc50d6ee0b4e00ac7a774f82af408d48 | 2021-09-03 | +| node:14-alpine | sha256:8c94a0291133e16b92be5c667e0bc35930940dfa7be544fb142e25f8e4510a45 | 2021-08-31 | | ubuntu:16.04 | sha256:454054f5bbd571b088db25b662099c6c7b3f0cb78536a2077d54adc48f00cd68 | 2021-08-31 | | ubuntu:18.04 | sha256:9bc830af2bef73276515a29aa896eedfa7bdf4bdbc5c1063b4c457a4bbb8cd79 | 2021-08-31 | | ubuntu:20.04 | sha256:9d6a8699fb5c9c39cf08a0871bd6219f0400981c570894cd8cbea30d3424a31f | 2021-08-31 | From 9277e9fb5f88f2396d5959c6bedf370eff30973c Mon Sep 17 00:00:00 2001 From: Michael Kriese Date: Thu, 9 Sep 2021 14:36:30 +0200 Subject: [PATCH 0513/3485] Windowsd Server 2022: prepull docker images (#4040) --- images/win/toolsets/toolset-2022.json | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index d21db4d72807..d1034a88822a 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -200,7 +200,13 @@ "vsix": [] }, "docker": { - "images": [] + "images": [ + "mcr.microsoft.com/windows/servercore:ltsc2022", + "mcr.microsoft.com/windows/nanoserver:ltsc2022", + "mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2022", + "mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2022", + "mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022" + ] }, "pipx": [ { From de98c474f3a149d2aed2d7b8c365c7cc1b55f881 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 9 Sep 2021 15:43:46 +0000 Subject: [PATCH 0514/3485] Updating readme file for win22 version 20210907.1 (#4029) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/win/Windows2022-Readme.md | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/images/win/Windows2022-Readme.md b/images/win/Windows2022-Readme.md index 1b0f35280499..6ee80ac78ec8 100644 --- a/images/win/Windows2022-Readme.md +++ b/images/win/Windows2022-Readme.md @@ -5,7 +5,7 @@ *** # Microsoft Windows Server 2022 Datacenter - OS Version: 10.0.20348 Build 169 -- Image Version: 20210901.3 +- Image Version: 20210907.1 ## Installed Software ### Language and Runtime @@ -15,11 +15,11 @@ - Kotlin 1.5.20 - Node 14.17.6 - PHP 8.0.10 -- Python 3.9.6 +- Python 3.9.7 - Ruby 3.0.2p107 ### Package Management -- Chocolatey 0.10.15 +- Chocolatey 0.11.1 - Composer 2.1.6 - Helm 3.6.3 - NPM 6.14.15 @@ -27,7 +27,7 @@ - pip 21.2.4 (python 3.9) - Pipx 0.16.4 - RubyGems 3.2.22 -- Vcpkg (build from master \<5bc27e8>) +- Vcpkg (build from master \<71422c6>) - Yarn 1.22.11 #### Environment variables @@ -43,7 +43,7 @@ ### Tools - 7zip 19.00 - aria2 1.36.0 -- azcopy 10.12.0 +- azcopy 10.12.1 - Bazel 4.2.1 - Bazelisk 1.10.1 - Bicep 0.4.613 @@ -76,10 +76,10 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.90 -- AWS CLI 2.2.33 -- AWS SAM CLI 1.29.0 +- AWS CLI 2.2.35 +- AWS SAM CLI 1.30.0 - AWS Session Manager CLI 1.2.245.0 -- Azure CLI 2.27.2 +- Azure CLI 2.28.0 - Azure DevOps CLI extension 0.20.0 - GitHub CLI 2.0.0 - Hub CLI 2.14.2 @@ -101,8 +101,8 @@ ### Browsers and webdrivers - Google Chrome 93.0.4577.63 - Chrome Driver 93.0.4577.15 -- Microsoft Edge 92.0.902.84 -- Microsoft Edge Driver 92.0.902.84 +- Microsoft Edge 93.0.961.38 +- Microsoft Edge Driver 93.0.961.38 - Mozilla Firefox 91.0.2 - Gecko Driver 0.29.1 - IE Driver 3.150.1.1 @@ -141,6 +141,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | ------- | ------------ | -------------------- | | 1.15.15 | x64 | GOROOT_1_15_X64 | | 1.16.7 (Default) | x64 | GOROOT_1_16_X64 | +| 1.17.0 | x64 | GOROOT_1_17_X64 | #### Node @@ -156,7 +157,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | ------- | ------------ | | 3.7.9 | x64 | | 3.8.10 | x64 | -| 3.9.6 (Default) | x64 | +| 3.9.7 (Default) | x64 | #### Ruby @@ -338,6 +339,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Component.WebDeploy | 17.0.31530.272 | | Microsoft.VisualStudio.Component.Windows10SDK | 17.0.31530.272 | | Microsoft.VisualStudio.Component.Windows10SDK.19041 | 17.0.31530.272 | +| Microsoft.VisualStudio.Component.Windows10SDK.20348 | 17.0.31530.272 | | Microsoft.VisualStudio.Component.Workflow | 17.0.31530.272 | | Microsoft.VisualStudio.Component.WslDebugging | 17.0.31530.272 | | Microsoft.VisualStudio.ComponentGroup.ArchitectureTools.Native | 17.0.31530.272 | From 39051ea4cfde2ab9e391cbb595b6ea7435ccd35f Mon Sep 17 00:00:00 2001 From: Dmitry Shibanov Date: Thu, 9 Sep 2021 18:53:11 +0300 Subject: [PATCH 0515/3485] [macOS] Move global npm packages to toolset macOS (#4047) --- images/macos/provision/core/node.sh | 29 ++++-------------------- images/macos/tests/Node.Tests.ps1 | 14 +++++------- images/macos/toolsets/toolset-10.13.json | 8 +++++++ images/macos/toolsets/toolset-10.14.json | 8 +++++++ images/macos/toolsets/toolset-10.15.json | 7 ++++++ images/macos/toolsets/toolset-11.json | 6 +++++ 6 files changed, 40 insertions(+), 32 deletions(-) diff --git a/images/macos/provision/core/node.sh b/images/macos/provision/core/node.sh index 29be8ac8dbf4..d9136e17ffe8 100644 --- a/images/macos/provision/core/node.sh +++ b/images/macos/provision/core/node.sh @@ -1,11 +1,6 @@ #!/bin/bash -e -o pipefail source ~/utils/utils.sh -node_modules=( - appcenter-cli - newman -) - if is_Less_Catalina; then echo Installing the latest Node JS 8... TMP_FILE=/tmp/node-v8.17.0.pkg @@ -14,33 +9,19 @@ if is_Less_Catalina; then sudo installer -pkg "${TMP_FILE}" -target / rm -rf "${TMP_FILE}" sudo chown -R $USER "/usr/local/lib/node_modules" - - echo Installing NPM 3.x.x... - npm install -g npm@3 - - # This step is required to install App Center CLI - echo Installing Omelette... - npm install -g omelette@0.4.14 - - echo Installing App Center CLI... - npm install -g appcenter-cli@^1.0.0 else # Install Node.js 14 for macOS >= 10.15 brew_smart_install "node@14" brew link node@14 --force - - for module in ${node_modules[@]}; do - echo "Install $module" - npm install -g $module - done fi echo Installing yarn... curl -o- -L https://yarnpkg.com/install.sh | bash -if is_Less_BigSur; then - echo "Install node-gyp" - npm install -g node-gyp -fi +npm_global_packages=$(get_toolset_value '.npm.global_packages[].name') +for module in ${npm_global_packages[@]}; do + echo "Install $module" + npm install -g $module +done invoke_tests "Node" "Node.js" diff --git a/images/macos/tests/Node.Tests.ps1 b/images/macos/tests/Node.Tests.ps1 index 36c85a2aea47..d2759adb03a6 100644 --- a/images/macos/tests/Node.Tests.ps1 +++ b/images/macos/tests/Node.Tests.ps1 @@ -51,14 +51,12 @@ Describe "nvm" { } } -Describe "AppCenterCLI" { - It "App Center CLI" { - "appcenter --version" | Should -ReturnZeroExitCode - } -} +Describe "Global NPM Packages" { + $globalNpmPackages = Get-ToolsetValue "npm.global_packages" + $globalNpmPackagesWithTests = $globalNpmPackages | Where-Object { $_.test } | ForEach-Object { @{ Name = $_.name; Test = $_.test } } -Describe "Newman" -Skip:($os.IsHighSierra -or $os.IsMojave) { - It "Newman" { - "newman --version" | Should -ReturnZeroExitCode + It "" -TestCases $globalNpmPackagesWithTests { + $Test | Should -ReturnZeroExitCode } } + diff --git a/images/macos/toolsets/toolset-10.13.json b/images/macos/toolsets/toolset-10.13.json index e2af23669d55..48bd440a88e6 100644 --- a/images/macos/toolsets/toolset-10.13.json +++ b/images/macos/toolsets/toolset-10.13.json @@ -209,6 +209,14 @@ {"name": "Pester"}, {"name": "PSScriptAnalyzer"} ], + "npm": { + "global_packages": [ + { "name": "npm@3" }, + { "name": "omelette@0.4.14" }, + { "name": "appcenter-cli@^1.0.0", "test": "appcenter --version" }, + { "name": "node-gyp" } + ] + }, "brew": { "common_packages": [ "aliyun-cli", diff --git a/images/macos/toolsets/toolset-10.14.json b/images/macos/toolsets/toolset-10.14.json index fdef00fd2b6c..3dedb345ba39 100644 --- a/images/macos/toolsets/toolset-10.14.json +++ b/images/macos/toolsets/toolset-10.14.json @@ -230,6 +230,14 @@ {"name": "Pester"}, {"name": "PSScriptAnalyzer"} ], + "npm": { + "global_packages": [ + { "name": "npm@3" }, + { "name": "omelette@0.4.14" }, + { "name": "appcenter-cli@^1.0.0", "test": "appcenter --version" }, + { "name": "node-gyp" } + ] + }, "brew": { "common_packages": [ "aliyun-cli", diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index 1f9bd21ecc63..746bb66d216e 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -182,6 +182,13 @@ {"name": "Pester"}, {"name": "PSScriptAnalyzer"} ], + "npm": { + "global_packages": [ + { "name": "appcenter-cli", "test": "appcenter --version" }, + { "name": "newman", "test": "newman --version" }, + { "name": "node-gyp" } + ] + }, "brew": { "common_packages": [ "aliyun-cli", diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index bc6b615e5bcb..f2922699f6e3 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -130,6 +130,12 @@ {"name": "Pester"}, {"name": "PSScriptAnalyzer"} ], + "npm": { + "global_packages": [ + { "name": "appcenter-cli", "test": "appcenter --version" }, + { "name": "newman", "test": "newman --version" } + ] + }, "brew": { "common_packages": [ "aliyun-cli", From 038e9cfcd8df095469780ee350e50f8612ae5601 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Thu, 9 Sep 2021 19:01:12 +0300 Subject: [PATCH 0516/3485] =?UTF-8?q?[macOS]=20Software=20Updates=202021?= =?UTF-8?q?=20Week=2037=20-=20Update=20Mono=20to=206.12.0.140=20ver?= =?UTF-8?q?=E2=80=A6=20(#4050)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [macOS] Software Updates 2021 Week 37 - Update Mono to 6.12.0.140 version * add issues/21180 link --- images/macos/provision/core/xamarin.sh | 5 +++++ images/macos/toolsets/toolset-10.15.json | 2 +- images/macos/toolsets/toolset-11.json | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/images/macos/provision/core/xamarin.sh b/images/macos/provision/core/xamarin.sh index 5cc6b360cd48..9d390409ebc0 100755 --- a/images/macos/provision/core/xamarin.sh +++ b/images/macos/provision/core/xamarin.sh @@ -64,6 +64,11 @@ createBundleLink $CURRENT_SDK_SYMLINK "Current" # Fix nuget in some mono versions because of known bugs # +if is_BigSur || is_Catalina; then + # The "nuget restore" command fails: https://github.com/mono/mono/issues/21180 + installNuget "6.12.0" "5.9.1" +fi + if is_Less_BigSur; then # Fix Mono issue with default nuget: https://github.com/mono/mono/issues/17637 installNuget "6.4.0" "5.3.1" diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index 746bb66d216e..e0bf7db1e4d6 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -20,7 +20,7 @@ "xamarin": { "vsmac": "latest", "mono-versions": [ - "6.12.0.125", "6.10.0.106", "6.8.0.123", "6.6.0.166", "6.4.0.208" + "6.12.0.140", "6.10.0.106", "6.8.0.123", "6.6.0.166", "6.4.0.208" ], "ios-versions": [ "14.14.2.5", "14.10.0.4", "14.8.0.3", "14.6.0.15", "14.4.1.3", "14.2.0.12", "14.0.0.0", "13.20.2.2", "13.18.2.1", "13.16.0.13", "13.14.1.39", "13.10.0.21", "13.8.3.0", "13.6.0.12", "13.4.0.2", "13.2.0.47" diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index f2922699f6e3..130695add1ba 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -12,7 +12,7 @@ "xamarin": { "vsmac": "latest", "mono-versions": [ - "6.12.0.125" + "6.12.0.140" ], "ios-versions": [ "14.20.0.24", "14.16.0.5", "14.14.2.5", "14.10.0.4", "14.8.0.3", "14.6.0.15", "14.4.1.3", "14.2.0.12", "14.0.0.0", "13.20.2.2" From a886e1c39411d8d4c806d697a63591d7540fa470 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 9 Sep 2021 20:11:34 +0000 Subject: [PATCH 0517/3485] Updating readme file for win16 version 20210907.1 (#4039) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/win/Windows2016-Readme.md | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/images/win/Windows2016-Readme.md b/images/win/Windows2016-Readme.md index dba30617a46b..fa9d753b35c3 100644 --- a/images/win/Windows2016-Readme.md +++ b/images/win/Windows2016-Readme.md @@ -5,7 +5,7 @@ *** # Microsoft Windows Server 2016 Datacenter - OS Version: 10.0.14393 Build 4583 -- Image Version: 20210901.3 +- Image Version: 20210907.1 ## Installed Software ### Language and Runtime @@ -20,7 +20,7 @@ - Ruby 2.5.9p229 ### Package Management -- Chocolatey 0.10.15 +- Chocolatey 0.11.1 - Composer 2.1.6 - Helm 3.6.3 - Miniconda 4.10.3 (pre-installed on the image but not added to PATH) @@ -29,7 +29,7 @@ - pip 21.2.4 (python 3.7) - Pipx 0.16.4 - RubyGems 2.7.6.3 -- Vcpkg (build from master \<5bc27e8>) +- Vcpkg (build from master \<71422c6>) - Yarn 1.22.11 #### Environment variables @@ -47,7 +47,7 @@ ### Tools - 7zip 19.00 - aria2 1.36.0 -- azcopy 10.12.0 +- azcopy 10.12.1 - Bazel 4.2.1 - Bazelisk 1.10.1 - Bicep 0.4.613 @@ -83,10 +83,10 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.90 -- AWS CLI 2.2.33 -- AWS SAM CLI 1.29.0 +- AWS CLI 2.2.35 +- AWS SAM CLI 1.30.0 - AWS Session Manager CLI 1.2.245.0 -- Azure CLI 2.27.2 +- Azure CLI 2.28.0 - Azure DevOps CLI extension 0.20.0 - Cloud Foundry CLI 6.53.0 - GitHub CLI 2.0.0 @@ -109,7 +109,7 @@ ### Browsers and webdrivers - Google Chrome 93.0.4577.63 - Chrome Driver 93.0.4577.15 -- Microsoft Edge 92.0.902.84 +- Microsoft Edge 93.0.961.38 - Microsoft Edge Driver 92.0.902.84 - Mozilla Firefox 91.0.2 - Gecko Driver 0.29.1 @@ -151,6 +151,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | 1.14.15 | x64 | GOROOT_1_14_X64 | | 1.15.15 (Default) | x64 | GOROOT_1_15_X64 | | 1.16.7 | x64 | GOROOT_1_16_X64 | +| 1.17.0 | x64 | GOROOT_1_17_X64 | #### Node @@ -169,7 +170,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | 3.6.8 | x64, x86 | | 3.7.9 (Default) | x64, x86 | | 3.8.10 | x64, x86 | -| 3.9.6 | x64, x86 | +| 3.9.7 | x64, x86 | #### Ruby @@ -497,20 +498,20 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### .NET Core SDK `Location C:\Program Files\dotnet\sdk` -- 1.1.14 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.519 2.1.520 2.1.521 2.1.522 2.1.523 2.1.524 2.1.525 2.1.526 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.616 2.1.617 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 2.1.811 2.1.812 2.1.813 2.1.814 2.1.815 2.1.816 2.1.818 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.109 3.1.110 3.1.111 3.1.112 3.1.113 3.1.114 3.1.115 3.1.116 3.1.117 3.1.118 3.1.200 3.1.201 3.1.202 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 3.1.408 3.1.409 3.1.410 3.1.411 3.1.412 5.0.100 5.0.101 5.0.102 5.0.103 5.0.104 5.0.200 5.0.201 5.0.202 5.0.203 5.0.204 5.0.205 5.0.206 5.0.300 5.0.301 5.0.302 5.0.303 5.0.400 +- 1.1.14 2.1.302 2.1.403 2.1.525 2.1.526 2.1.617 2.1.701 2.1.818 3.1.118 3.1.202 3.1.302 3.1.412 5.0.104 5.0.206 5.0.303 5.0.400 ### .NET Core Runtime `Location: C:\Program Files\dotnet\shared\Microsoft.AspNetCore.All` -- 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23 2.1.24 2.1.25 2.1.26 2.1.27 2.1.28 2.1.29 2.1.30 +- 2.1.2 2.1.5 2.1.12 2.1.24 2.1.29 2.1.30 `Location: C:\Program Files\dotnet\shared\Microsoft.AspNetCore.App` -- 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23 2.1.24 2.1.25 2.1.26 2.1.27 2.1.28 2.1.29 2.1.30 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9 3.1.10 3.1.11 3.1.12 3.1.13 3.1.14 3.1.15 3.1.16 3.1.17 3.1.18 5.0.0 5.0.1 5.0.2 5.0.3 5.0.4 5.0.5 5.0.6 5.0.7 5.0.8 5.0.9 +- 2.1.2 2.1.5 2.1.12 2.1.24 2.1.29 2.1.30 3.1.4 3.1.6 3.1.18 5.0.4 5.0.9 `Location: C:\Program Files\dotnet\shared\Microsoft.NETCore.App` -- 1.0.16 1.1.13 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23 2.1.24 2.1.25 2.1.26 2.1.27 2.1.28 2.1.29 2.1.30 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9 3.1.10 3.1.11 3.1.12 3.1.13 3.1.14 3.1.15 3.1.16 3.1.17 3.1.18 5.0.0 5.0.1 5.0.2 5.0.3 5.0.4 5.0.5 5.0.6 5.0.7 5.0.8 5.0.9 +- 1.0.16 1.1.13 2.1.2 2.1.5 2.1.12 2.1.24 2.1.29 2.1.30 3.1.4 3.1.6 3.1.18 5.0.4 5.0.9 `Location: C:\Program Files\dotnet\shared\Microsoft.WindowsDesktop.App` -- 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9 3.1.10 3.1.11 3.1.12 3.1.13 3.1.14 3.1.15 3.1.16 3.1.17 3.1.18 5.0.0 5.0.1 5.0.2 5.0.3 5.0.4 5.0.5 5.0.6 5.0.7 5.0.8 5.0.9 +- 3.1.4 3.1.6 3.1.18 5.0.4 5.0.9 ### .NET Framework `Type: Developer Pack` From d1d592805b90fc0f382706a6ce2caa9b98ff77f3 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 9 Sep 2021 21:05:53 +0000 Subject: [PATCH 0518/3485] Updating readme file for win19 version 20210907.4 (#4038) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/win/Windows2019-Readme.md | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index 61228dfd174c..609c0ff3c4a6 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -5,7 +5,7 @@ *** # Microsoft Windows Server 2019 Datacenter - OS Version: 10.0.17763 Build 2114 -- Image Version: 20210903.7 +- Image Version: 20210907.4 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -32,7 +32,7 @@ - pip 21.2.4 (python 3.7) - Pipx 0.16.4 - RubyGems 2.7.6.3 -- Vcpkg (build from master \) +- Vcpkg (build from master \<642d1cc>) - Yarn 1.22.11 #### Environment variables @@ -70,7 +70,7 @@ - Kubectl 1.22.1 - Mercurial 5.0 - Mingw-w64 8.1.0 -- Newman 5.2.4 +- Newman 5.3.0 - NSIS v3.06.1 - OpenSSL 1.1.1 - Packer 1.7.4 @@ -89,7 +89,7 @@ - AWS CLI 2.2.35 - AWS SAM CLI 1.30.0 - AWS Session Manager CLI 1.2.245.0 -- Azure CLI 2.27.2 +- Azure CLI 2.28.0 - Azure DevOps CLI extension 0.20.0 - Cloud Foundry CLI 6.53.0 - GitHub CLI 2.0.0 @@ -114,7 +114,7 @@ - Chrome Driver 93.0.4577.15 - Microsoft Edge 93.0.961.38 - Microsoft Edge Driver 92.0.902.84 -- Mozilla Firefox 91.0.2 +- Mozilla Firefox 92.0 - Gecko Driver 0.29.1 - IE Driver 3.150.1.1 @@ -157,6 +157,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | 1.14.15 | x64 | GOROOT_1_14_X64 | | 1.15.15 (Default) | x64 | GOROOT_1_15_X64 | | 1.16.7 | x64 | GOROOT_1_16_X64 | +| 1.17.0 | x64 | GOROOT_1_17_X64 | #### Node @@ -175,7 +176,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | 3.6.8 | x64, x86 | | 3.7.9 (Default) | x64, x86 | | 3.8.10 | x64, x86 | -| 3.9.6 | x64, x86 | +| 3.9.7 | x64, x86 | #### Ruby @@ -229,7 +230,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Name | Version | ConfigFile | ServiceName | ServiceStatus | ListenPort | | ------ | ------- | ------------------------------------- | ----------- | ------------- | ---------- | | Apache | 2.4.48 | C:\tools\Apache24\conf\httpd.conf | Apache | Stopped | 80 | -| Nginx | 1.21.2 | C:\tools\nginx-1.21.2\conf\nginx.conf | nginx | Stopped | 80 | +| Nginx | 1.21.3 | C:\tools\nginx-1.21.3\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2019 | Name | Version | Path | @@ -255,7 +256,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Component.Microsoft.VisualStudio.Web.AzureFunctions | 16.10.31205.252 | | Component.Microsoft.Web.LibraryManager | 16.10.31205.180 | | Component.Microsoft.WebTools.BrowserLink.WebLivePreview | 0.7.22.39845 | -| Component.Microsoft.Windows.DriverKit | 10.0.19030.0 | +| Component.Microsoft.Windows.DriverKit | 10.0.20324.0 | | Component.OpenJDK | 16.10.31303.311 | | Component.UnityEngine.x64 | 16.10.31205.252 | | Component.Unreal | 16.1.28810.153 | @@ -418,6 +419,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Component.Windows10SDK.17763 | 16.0.28517.75 | | Microsoft.VisualStudio.Component.Windows10SDK.18362 | 16.1.28829.92 | | Microsoft.VisualStudio.Component.Windows10SDK.19041 | 16.10.31205.252 | +| Microsoft.VisualStudio.Component.Windows10SDK.20348 | 16.11.31603.221 | | Microsoft.VisualStudio.Component.WinXP | 16.10.31205.252 | | Microsoft.VisualStudio.Component.Workflow | 16.0.28315.86 | | Microsoft.VisualStudio.ComponentGroup.ArchitectureTools.Native | 16.0.28621.142 | @@ -463,8 +465,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | ProBITools.MicrosoftReportProjectsforVisualStudio | 2.6.11 | | SSIS.SqlServerIntegrationServicesProjects | 3.15 | | VisualStudioClient.MicrosoftVisualStudio2017InstallerProjects | 1.0.0 | -| Windows Driver Kit | 10.0.19030.0 | -| Windows Driver Kit Visual Studio Extension | 10.1.19041.685 | +| Windows Driver Kit | 10.0.20324.0 | +| Windows Driver Kit Visual Studio Extension | 10.1.20348.1 | | WIX Toolset | 3.11.4516 | | WIX Toolset Studio 2019 Extension | 1.0.0.4 | @@ -489,20 +491,20 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### .NET Core SDK `Location C:\Program Files\dotnet\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.519 2.1.520 2.1.521 2.1.522 2.1.523 2.1.524 2.1.526 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.616 2.1.617 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 2.1.811 2.1.812 2.1.813 2.1.814 2.1.815 2.1.816 2.1.818 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.109 3.1.110 3.1.111 3.1.112 3.1.113 3.1.114 3.1.115 3.1.116 3.1.117 3.1.118 3.1.200 3.1.201 3.1.202 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 3.1.408 3.1.409 3.1.410 3.1.411 3.1.412 5.0.100 5.0.101 5.0.102 5.0.103 5.0.104 5.0.200 5.0.201 5.0.202 5.0.203 5.0.204 5.0.205 5.0.206 5.0.300 5.0.301 5.0.302 5.0.303 5.0.400 +- 2.1.302 2.1.403 2.1.526 2.1.617 2.1.701 2.1.818 3.1.118 3.1.202 3.1.302 3.1.412 5.0.104 5.0.206 5.0.303 5.0.400 ### .NET Core Runtime `Location: C:\Program Files\dotnet\shared\Microsoft.AspNetCore.All` -- 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23 2.1.24 2.1.25 2.1.26 2.1.27 2.1.28 2.1.30 +- 2.1.2 2.1.5 2.1.12 2.1.24 2.1.30 `Location: C:\Program Files\dotnet\shared\Microsoft.AspNetCore.App` -- 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23 2.1.24 2.1.25 2.1.26 2.1.27 2.1.28 2.1.30 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9 3.1.10 3.1.11 3.1.12 3.1.13 3.1.14 3.1.15 3.1.16 3.1.17 3.1.18 5.0.0 5.0.1 5.0.2 5.0.3 5.0.4 5.0.5 5.0.6 5.0.7 5.0.8 5.0.9 +- 2.1.2 2.1.5 2.1.12 2.1.24 2.1.30 3.1.4 3.1.6 3.1.18 5.0.4 5.0.9 `Location: C:\Program Files\dotnet\shared\Microsoft.NETCore.App` -- 2.1.0 2.1.1 2.1.2 2.1.3 2.1.4 2.1.5 2.1.6 2.1.7 2.1.8 2.1.9 2.1.10 2.1.11 2.1.12 2.1.13 2.1.14 2.1.15 2.1.16 2.1.17 2.1.18 2.1.19 2.1.20 2.1.21 2.1.22 2.1.23 2.1.24 2.1.25 2.1.26 2.1.27 2.1.28 2.1.30 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9 3.1.10 3.1.11 3.1.12 3.1.13 3.1.14 3.1.15 3.1.16 3.1.17 3.1.18 5.0.0 5.0.1 5.0.2 5.0.3 5.0.4 5.0.5 5.0.6 5.0.7 5.0.8 5.0.9 +- 2.1.2 2.1.5 2.1.12 2.1.24 2.1.30 3.1.4 3.1.6 3.1.18 5.0.4 5.0.9 `Location: C:\Program Files\dotnet\shared\Microsoft.WindowsDesktop.App` -- 3.1.0 3.1.1 3.1.2 3.1.3 3.1.4 3.1.5 3.1.6 3.1.7 3.1.8 3.1.9 3.1.10 3.1.11 3.1.12 3.1.13 3.1.14 3.1.15 3.1.16 3.1.17 3.1.18 5.0.0 5.0.1 5.0.2 5.0.3 5.0.4 5.0.5 5.0.6 5.0.7 5.0.8 5.0.9 +- 3.1.4 3.1.6 3.1.18 5.0.4 5.0.9 ### .NET Framework `Type: Developer Pack` From 045e638562a73f8edd17ee2a725607b11272ba06 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Fri, 10 Sep 2021 12:26:11 +0300 Subject: [PATCH 0519/3485] [Windows] Add adoptium to javatools installer (#3985) --- .../scripts/Installers/Install-JavaTools.ps1 | 60 ++++++++++++++----- .../SoftwareReport/SoftwareReport.Java.psm1 | 3 +- images/win/scripts/Tests/Java.Tests.ps1 | 21 ++++++- images/win/toolsets/toolset-2016.json | 12 +++- images/win/toolsets/toolset-2019.json | 12 +++- images/win/toolsets/toolset-2022.json | 12 +++- 6 files changed, 95 insertions(+), 25 deletions(-) diff --git a/images/win/scripts/Installers/Install-JavaTools.ps1 b/images/win/scripts/Installers/Install-JavaTools.ps1 index f2e2bcaa1352..f4a0b9703683 100644 --- a/images/win/scripts/Installers/Install-JavaTools.ps1 +++ b/images/win/scripts/Installers/Install-JavaTools.ps1 @@ -7,10 +7,11 @@ function Set-JavaPath { param ( [string] $Version, [string] $Architecture = "x64", - [switch] $Default + [switch] $Default, + [string] $VendorName ) - $javaPathPattern = Join-Path -Path $env:AGENT_TOOLSDIRECTORY -ChildPath "Java_Adopt_jdk/${Version}*/${Architecture}" + $javaPathPattern = Join-Path -Path $env:AGENT_TOOLSDIRECTORY -ChildPath "Java_${VendorName}_jdk/${Version}*/${Architecture}" $javaPath = (Get-Item -Path $javaPathPattern).FullName if ([string]::IsNullOrEmpty($javaPath)) { @@ -23,6 +24,7 @@ function Set-JavaPath { if ($Default) { + # Clean up any other Java folders from PATH to make sure that they won't conflict with each other $currentPath = Get-MachinePath $pathSegments = $currentPath.Split(';') @@ -47,14 +49,21 @@ function Set-JavaPath { } } -function Install-JavaFromAdoptOpenJDK { +function Install-JavaJDK { param( [string] $JDKVersion, - [string] $Architecture = "x64" + [string] $Architecture = "x64", + [string] $VendorName ) - # Get Java version from adopt openjdk api - $assetUrl = Invoke-RestMethod -Uri "https://api.adoptopenjdk.net/v3/assets/latest/${JDKVersion}/hotspot" + # Get Java version from api + if ($VendorName -eq "Temurin-Hotspot") { + $assetUrl = Invoke-RestMethod -Uri "https://api.adoptium.net/v3/assets/latest/${JDKVersion}/hotspot" + } elseif ($VendorName -eq "Adopt") { + $assetUrl = Invoke-RestMethod -Uri "https://api.adoptopenjdk.net/v3/assets/latest/${JDKVersion}/hotspot" + } else { + throw "$VendorName is invalid vendor name. 'Adopt' and 'Temurin-Hotspot' are allowed values" + } $asset = $assetUrl | Where-Object { $_.binary.os -eq "windows" ` -and $_.binary.architecture -eq $Architecture ` @@ -68,13 +77,13 @@ function Install-JavaFromAdoptOpenJDK { # We have to replace '+' sign in the version to '-' due to the issue with incorrect path in Android builds https://github.com/actions/virtual-environments/issues/3014 $fullJavaVersion = $asset.version.semver -replace '\+', '-' # Create directories in toolcache path - $javaToolcachePath = Join-Path -Path $env:AGENT_TOOLSDIRECTORY -ChildPath "Java_Adopt_jdk" + $javaToolcachePath = Join-Path -Path $env:AGENT_TOOLSDIRECTORY -ChildPath "Java_${VendorName}_jdk" $javaVersionPath = Join-Path -Path $javaToolcachePath -ChildPath $fullJavaVersion $javaArchPath = Join-Path -Path $javaVersionPath -ChildPath $Architecture if (-not (Test-Path $javaToolcachePath)) { - Write-Host "Creating Adopt openjdk toolcache folder" + Write-Host "Creating ${VendorName} toolcache folder" New-Item -ItemType Directory -Path $javaToolcachePath | Out-Null } @@ -87,19 +96,38 @@ function Install-JavaFromAdoptOpenJDK { New-Item -ItemType File -Path $javaVersionPath -Name "$Architecture.complete" | Out-Null } -$jdkVersions = (Get-ToolsetContent).java.versions -$defaultVersion = (Get-ToolsetContent).java.default +$toolsetJava = (Get-ToolsetContent).java +$jdkVendors = $toolsetJava.vendors +$defaultVendor = $toolsetJava.default_vendor +$defaultVersion = $toolsetJava.default -foreach ($jdkVersion in $jdkVersions) { - Install-JavaFromAdoptOpenJDK -JDKVersion $jdkVersion +foreach ($jdkVendor in $jdkVendors) { + $jdkVendorName = $jdkVendor.name + $jdkVersionsToInstall = $jdkVendor.versions + + $isDefaultVendor = $jdkVendorName -eq $defaultVendor - if ($jdkVersion -eq $defaultVersion) { - Set-JavaPath -Version $jdkVersion -Default - } else { - Set-JavaPath -Version $jdkVersion + foreach ($jdkVersionToInstall in $jdkVersionsToInstall) { + $isDefaultVersion = $jdkVersionToInstall -eq $defaultVersion + + Install-JavaJDK -VendorName $jdkVendorName -JDKVersion $jdkVersionToInstall + + if ($isDefaultVendor) { + if ($isDefaultVersion) { + Set-JavaPath -Version $jdkVersionToInstall -VendorName $jdkVendorName -Default + } else { + Set-JavaPath -Version $jdkVersionToInstall -VendorName $jdkVendorName + } + } } } +# Setup JAVA_HOME_13_X64 as this is the only Adopt version needed +# There is no jdk 13 on Windows 2022 +if (-not (Test-IsWin22)) { + Set-JavaPath -Version "13" -VendorName "Adopt" +} + # Install Java tools # Force chocolatey to ignore dependencies on Ant and Maven or else they will download the Oracle JDK Choco-Install -PackageName ant -ArgumentList "-i" diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Java.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Java.psm1 index 3e9d7ada3a5e..5505097fa9d6 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Java.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Java.psm1 @@ -13,10 +13,11 @@ function Get-JavaVersions { $versionInPath = (Split-Path $javaPath) -replace "\w:\\.*\\" $version = $versionInPath -replace '-', '+' $defaultPostfix = ($javaPath -eq $defaultJavaPath) ? " (default)" : "" + $VendorName = ($javaPath -like '*Java_Adopt_jdk*') ? "Adopt OpenJDK" : "Eclipse Temurin" [PSCustomObject] @{ "Version" = $version + $defaultPostfix - "Vendor" = "Adopt OpenJDK" + "Vendor" = $VendorName "Environment Variable" = $_.Name } } diff --git a/images/win/scripts/Tests/Java.Tests.ps1 b/images/win/scripts/Tests/Java.Tests.ps1 index 36f9658962af..62a851d036a2 100644 --- a/images/win/scripts/Tests/Java.Tests.ps1 +++ b/images/win/scripts/Tests/Java.Tests.ps1 @@ -1,6 +1,11 @@ Describe "Java" { - [array]$jdkVersions = (Get-ToolsetContent).java.versions | ForEach-Object { @{Version = $_} } - $defaultVersion = (Get-ToolsetContent).java.default + $toolsetJava = (Get-ToolsetContent).java + $defaultVendor = $toolsetJava.default_vendor + $javaVendors = $toolsetJava.vendors + $defaultVersion = $toolsetJava.default + + [array]$jdkVersions = ($javaVendors | Where-Object {$_.name -eq $defaultVendor}).versions | ForEach-Object { @{Version = $_} } + [array]$adoptJdkVersions = ($javaVendors | Where-Object {$_.name -eq "Adopt"}).versions | ForEach-Object { @{Version = $_} } It "Java is default" -TestCases @(@{ DefaultJavaVersion = $defaultVersion }) { $actualJavaPath = Get-EnvironmentVariable "JAVA_HOME" @@ -33,4 +38,16 @@ Describe "Java" { } $result.Output[0] | Should -Match ([regex]::Escape("openjdk version `"${Version}.")) } + + It "Java Adopt Jdk " -TestCases $adoptJdkVersions { + $adoptPath = Join-Path (Get-ChildItem ${env:AGENT_TOOLSDIRECTORY}\Java_Adopt_jdk\${Version}*) "x64\bin\java" + + $result = Get-CommandResult "`"$adoptPath`" -version" + $result.ExitCode | Should -Be 0 + + if ($Version -eq 8) { + $Version = "1.${Version}" + } + $result.Output[0] | Should -Match ([regex]::Escape("openjdk version `"${Version}.")) + } } diff --git a/images/win/toolsets/toolset-2016.json b/images/win/toolsets/toolset-2016.json index e4579d78589b..25251bd6fc8c 100644 --- a/images/win/toolsets/toolset-2016.json +++ b/images/win/toolsets/toolset-2016.json @@ -142,8 +142,16 @@ ], "java": { "default": "8", - "versions": [ - "8", "11", "13" + "default_vendor": "Temurin-Hotspot", + "vendors": [ + { + "name": "Temurin-Hotspot", + "versions": [ "8", "11" ] + }, + { + "name": "Adopt", + "versions": [ "8", "11", "13" ] + } ] }, "android": { diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index 71630f727993..a8b869f25dfd 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -142,8 +142,16 @@ ], "java": { "default": "8", - "versions": [ - "8", "11", "13" + "default_vendor": "Temurin-Hotspot", + "vendors": [ + { + "name": "Temurin-Hotspot", + "versions": [ "8", "11" ] + }, + { + "name": "Adopt", + "versions": [ "8", "11", "13" ] + } ] }, "android": { diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index d1034a88822a..e698a61d7c19 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -106,8 +106,16 @@ ], "java": { "default": "8", - "versions": [ - "8", "11" + "default_vendor": "Temurin-Hotspot", + "vendors": [ + { + "name": "Temurin-Hotspot", + "versions": [ "8", "11" ] + }, + { + "name": "Adopt", + "versions": [ "8", "11"] + } ] }, "android": { From d022b0d6a8c5af920ebca61c6709f75f8f62aef3 Mon Sep 17 00:00:00 2001 From: Dibir Magomedsaygitov <61747324+dibir-magomedsaygitov@users.noreply.github.com> Date: Fri, 10 Sep 2021 14:41:17 +0300 Subject: [PATCH 0520/3485] [macOS] Move Ruby and Go versions to toolset (#4046) --- images/macos/provision/core/commonutils.sh | 3 --- images/macos/provision/core/golang.sh | 11 +++++++++++ images/macos/provision/core/ruby.sh | 3 ++- images/macos/provision/core/rubygem.sh | 2 +- images/macos/templates/macOS-10.13.json | 1 + images/macos/templates/macOS-10.14.json | 1 + images/macos/templates/macOS-10.15.json | 1 + images/macos/templates/macOS-11.json | 1 + images/macos/tests/BasicTools.Tests.ps1 | 5 ----- images/macos/tests/Common.Tests.ps1 | 6 ++++++ images/macos/tests/RubyGem.Tests.ps1 | 2 +- images/macos/toolsets/toolset-10.13.json | 15 +++++++++++++- images/macos/toolsets/toolset-10.14.json | 23 +++++++++++++--------- images/macos/toolsets/toolset-10.15.json | 23 +++++++++++++--------- images/macos/toolsets/toolset-11.json | 23 +++++++++++++--------- 15 files changed, 81 insertions(+), 39 deletions(-) create mode 100644 images/macos/provision/core/golang.sh diff --git a/images/macos/provision/core/commonutils.sh b/images/macos/provision/core/commonutils.sh index 550e1abe0832..a13f6a7d167b 100644 --- a/images/macos/provision/core/commonutils.sh +++ b/images/macos/provision/core/commonutils.sh @@ -19,9 +19,6 @@ if is_Less_Catalina; then echo "export USE_BAZEL_VERSION=${USE_BAZEL_VERSION}" >> "${HOME}/.bashrc" fi -# Create symlinks for Go 1.15 to preserve backward compatibility -ln -sf $(brew --prefix go@1.15)/bin/* /usr/local/bin/ - # Invoke bazel to download bazel version via bazelisk bazel diff --git a/images/macos/provision/core/golang.sh b/images/macos/provision/core/golang.sh new file mode 100644 index 000000000000..3c37431fad9f --- /dev/null +++ b/images/macos/provision/core/golang.sh @@ -0,0 +1,11 @@ +#!/bin/bash -e -o pipefail +source ~/utils/utils.sh + +DEFAULT_GO_VERSION=$(get_toolset_value '.go.default') +echo "Installing Go..." +brew_smart_install "go@${DEFAULT_GO_VERSION}" + +# Create symlinks to preserve backward compatibility. Symlinks are not created when non-latest go is being installed +ln -sf $(brew --prefix go@${DEFAULT_GO_VERSION})/bin/* /usr/local/bin/ + +invoke_tests "Common" "Go" \ No newline at end of file diff --git a/images/macos/provision/core/ruby.sh b/images/macos/provision/core/ruby.sh index 9c6cefb17959..900eb92e6dc7 100755 --- a/images/macos/provision/core/ruby.sh +++ b/images/macos/provision/core/ruby.sh @@ -1,8 +1,9 @@ #!/bin/bash -e -o pipefail source ~/utils/utils.sh +DEFAULT_RUBY_VERSION=$(get_toolset_value '.ruby.default') echo Installing Ruby... -brew_smart_install "ruby@2.7" +brew_smart_install "ruby@${DEFAULT_RUBY_VERSION}" #if High Sierra - skip installation from toolset if is_HighSierra; then diff --git a/images/macos/provision/core/rubygem.sh b/images/macos/provision/core/rubygem.sh index ce5dea4546e0..60cd1c93dfd0 100755 --- a/images/macos/provision/core/rubygem.sh +++ b/images/macos/provision/core/rubygem.sh @@ -4,7 +4,7 @@ source ~/utils/utils.sh echo Updating RubyGems... gem update --system -gemsToInstall=$(get_toolset_value ".rubygems[]") +gemsToInstall=$(get_toolset_value '.ruby.rubygems | .[]') if [ -n "$gemsToInstall" ]; then for gem in $gemsToInstall; do echo "Installing gem $gem" diff --git a/images/macos/templates/macOS-10.13.json b/images/macos/templates/macOS-10.13.json index 306997dac7fc..56f3b3e680e3 100644 --- a/images/macos/templates/macOS-10.13.json +++ b/images/macos/templates/macOS-10.13.json @@ -159,6 +159,7 @@ "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}", "scripts": [ "./provision/core/commonutils.sh", + "./provision/core/golang.sh", "./provision/core/openjdk.sh", "./provision/core/php.sh", "./provision/core/aws.sh", diff --git a/images/macos/templates/macOS-10.14.json b/images/macos/templates/macOS-10.14.json index fd898affc8b2..6316bf328e70 100644 --- a/images/macos/templates/macOS-10.14.json +++ b/images/macos/templates/macOS-10.14.json @@ -159,6 +159,7 @@ "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}", "scripts": [ "./provision/core/commonutils.sh", + "./provision/core/golang.sh", "./provision/core/swiftlint.sh", "./provision/core/openjdk.sh", "./provision/core/php.sh", diff --git a/images/macos/templates/macOS-10.15.json b/images/macos/templates/macOS-10.15.json index 5fe2b3bbd242..9bdd785aa24c 100644 --- a/images/macos/templates/macOS-10.15.json +++ b/images/macos/templates/macOS-10.15.json @@ -160,6 +160,7 @@ "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}", "scripts": [ "./provision/core/commonutils.sh", + "./provision/core/golang.sh", "./provision/core/swiftlint.sh", "./provision/core/openjdk.sh", "./provision/core/php.sh", diff --git a/images/macos/templates/macOS-11.json b/images/macos/templates/macOS-11.json index 327b9dd500c9..a1a87f424c12 100644 --- a/images/macos/templates/macOS-11.json +++ b/images/macos/templates/macOS-11.json @@ -165,6 +165,7 @@ "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}", "scripts": [ "./provision/core/commonutils.sh", + "./provision/core/golang.sh", "./provision/core/swiftlint.sh", "./provision/core/openjdk.sh", "./provision/core/php.sh", diff --git a/images/macos/tests/BasicTools.Tests.ps1 b/images/macos/tests/BasicTools.Tests.ps1 index e5248800c938..9ff7b1da16e9 100644 --- a/images/macos/tests/BasicTools.Tests.ps1 +++ b/images/macos/tests/BasicTools.Tests.ps1 @@ -24,11 +24,6 @@ Describe "SwiftFormat" { } } -Describe "Go" { - It "Go" { - "go version" | Should -ReturnZeroExitCode - } -} Describe "GnuPG" { It "GnuPG" { diff --git a/images/macos/tests/Common.Tests.ps1 b/images/macos/tests/Common.Tests.ps1 index 0c2366a1b7f9..382605e9bf7f 100644 --- a/images/macos/tests/Common.Tests.ps1 +++ b/images/macos/tests/Common.Tests.ps1 @@ -97,4 +97,10 @@ Describe "Bicep" { It "Bicep" { "bicep --version" | Should -ReturnZeroExitCode } +} + +Describe "Go" { + It "Go" { + "go version" | Should -ReturnZeroExitCode + } } \ No newline at end of file diff --git a/images/macos/tests/RubyGem.Tests.ps1 b/images/macos/tests/RubyGem.Tests.ps1 index a875ec8c7513..0dee6064cbfd 100644 --- a/images/macos/tests/RubyGem.Tests.ps1 +++ b/images/macos/tests/RubyGem.Tests.ps1 @@ -1,5 +1,5 @@ Describe "RubyGems" { - $gemTestCases = Get-ToolsetValue -KeyPath "rubygems" | ForEach-Object { + $gemTestCases = Get-ToolsetValue -KeyPath "ruby.rubygems" | ForEach-Object { @{gemName = $_} } diff --git a/images/macos/toolsets/toolset-10.13.json b/images/macos/toolsets/toolset-10.13.json index 48bd440a88e6..169b4c5fba96 100644 --- a/images/macos/toolsets/toolset-10.13.json +++ b/images/macos/toolsets/toolset-10.13.json @@ -229,7 +229,6 @@ "gh", "gnupg", "gnu-tar", - "go@1.15", "helm", "libpq", "llvm", @@ -279,5 +278,19 @@ "versions": [ "2.1" ] + }, + "ruby": { + "default": "2.7", + "rubygems": [ + "xcode-install", + "cocoapods", + "nomad-cli", + "xcpretty", + "bundler", + "fastlane" + ] + }, + "go": { + "default": "1.15" } } \ No newline at end of file diff --git a/images/macos/toolsets/toolset-10.14.json b/images/macos/toolsets/toolset-10.14.json index 3dedb345ba39..8ed724a8e365 100644 --- a/images/macos/toolsets/toolset-10.14.json +++ b/images/macos/toolsets/toolset-10.14.json @@ -250,7 +250,6 @@ "gh", "gnupg", "gnu-tar", - "go@1.15", "helm", "kotlin", "libpq", @@ -350,12 +349,18 @@ "2.1" ] }, - "rubygems": [ - "xcode-install", - "cocoapods", - "nomad-cli", - "xcpretty", - "bundler", - "fastlane" - ] + "ruby": { + "default": "2.7", + "rubygems": [ + "xcode-install", + "cocoapods", + "nomad-cli", + "xcpretty", + "bundler", + "fastlane" + ] + }, + "go": { + "default": "1.15" + } } diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index e0bf7db1e4d6..5a5a60a3c793 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -201,7 +201,6 @@ "gh", "gnupg", "gnu-tar", - "go@1.15", "helm", "kotlin", "libpq", @@ -304,12 +303,18 @@ "5.0" ] }, - "rubygems": [ - "xcode-install", - "cocoapods", - "nomad-cli", - "xcpretty", - "bundler", - "fastlane" - ] + "ruby": { + "default": "2.7", + "rubygems": [ + "xcode-install", + "cocoapods", + "nomad-cli", + "xcpretty", + "bundler", + "fastlane" + ] + }, + "go": { + "default": "1.15" + } } diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index 130695add1ba..bd3590bfe6d8 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -147,7 +147,6 @@ "gh", "gnupg", "gnu-tar", - "go@1.15", "helm", "kotlin", "libpq", @@ -239,12 +238,18 @@ "5.0" ] }, - "rubygems": [ - "xcode-install", - "cocoapods", - "nomad-cli", - "xcpretty", - "bundler", - "fastlane" - ] + "ruby": { + "default": "2.7", + "rubygems": [ + "xcode-install", + "cocoapods", + "nomad-cli", + "xcpretty", + "bundler", + "fastlane" + ] + }, + "go": { + "default": "1.15" + } } From 06eef92e40d8c0ebfb366a46f481f8c4decbe12b Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Fri, 10 Sep 2021 16:15:45 +0300 Subject: [PATCH 0521/3485] [MacOS] fix python installation order (#4052) --- images/macos/provision/core/powershell.sh | 9 --------- images/macos/tests/BasicTools.Tests.ps1 | 6 ++++++ images/macos/tests/Powershell.Tests.ps1 | 6 ------ images/macos/tests/Python.Tests.ps1 | 5 +++++ images/macos/toolsets/toolset-10.14.json | 1 + images/macos/toolsets/toolset-10.15.json | 1 + images/macos/toolsets/toolset-11.json | 1 + 7 files changed, 14 insertions(+), 15 deletions(-) diff --git a/images/macos/provision/core/powershell.sh b/images/macos/provision/core/powershell.sh index 7e89ded76943..834744856026 100644 --- a/images/macos/provision/core/powershell.sh +++ b/images/macos/provision/core/powershell.sh @@ -1,15 +1,9 @@ #!/bin/bash -e -o pipefail source ~/utils/utils.sh -echo Installing Azure CLI... -brew_smart_install "azure-cli" - echo Installing PowerShell... brew install --cask powershell -# A dummy call of `az` to initialize ~/.azure directory before the modules are installed -az -v - # Install PowerShell modules psModules=$(get_toolset_value '.powershellModules[].name') for module in ${psModules[@]}; do @@ -31,7 +25,4 @@ pwsh -command "& {Import-Module Az}" # powershell link was removed in powershell-6.0.0-beta9 sudo ln -s /usr/local/bin/pwsh /usr/local/bin/powershell -# fix ~/.azure directory permissions -sudo chown -R ${USER}: $HOME/.azure - invoke_tests "Powershell" diff --git a/images/macos/tests/BasicTools.Tests.ps1 b/images/macos/tests/BasicTools.Tests.ps1 index 9ff7b1da16e9..62b73c2b3da0 100644 --- a/images/macos/tests/BasicTools.Tests.ps1 +++ b/images/macos/tests/BasicTools.Tests.ps1 @@ -1,5 +1,11 @@ $os = Get-OSVersion +Describe "Azure CLI" { + It "Azure CLI" { + "az -v" | Should -ReturnZeroExitCode + } +} + Describe "Carthage" { It "Carthage" { "carthage version" | Should -ReturnZeroExitCode diff --git a/images/macos/tests/Powershell.Tests.ps1 b/images/macos/tests/Powershell.Tests.ps1 index b92ac6b20e22..0674b1ef00bb 100644 --- a/images/macos/tests/Powershell.Tests.ps1 +++ b/images/macos/tests/Powershell.Tests.ps1 @@ -40,10 +40,4 @@ Describe "Powershell" { } } } - - Context "Azure CLI" { - It "Azure CLI" { - "az -v" | Should -ReturnZeroExitCode - } - } } \ No newline at end of file diff --git a/images/macos/tests/Python.Tests.ps1 b/images/macos/tests/Python.Tests.ps1 index 6d8c98dc008b..40be7343859c 100644 --- a/images/macos/tests/Python.Tests.ps1 +++ b/images/macos/tests/Python.Tests.ps1 @@ -41,4 +41,9 @@ Describe "Python" { $python3Path = Split-Path (readlink (which python3)) $pip3Path | Should -BeExactly $python3Path } + + It "2to3 symlink does not point to Python 2" { + $2to3path = (Get-ChildItem (Get-Command 2to3).Path).Target + $2to3path | Should -Not -BeLike '/Frameworks/Python.framework/Versions/2.*' + } } \ No newline at end of file diff --git a/images/macos/toolsets/toolset-10.14.json b/images/macos/toolsets/toolset-10.14.json index 8ed724a8e365..3f1637c838c1 100644 --- a/images/macos/toolsets/toolset-10.14.json +++ b/images/macos/toolsets/toolset-10.14.json @@ -243,6 +243,7 @@ "aliyun-cli", "ant", "aria2", + "azure-cli", "bats", "bazelisk", "carthage", diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index 5a5a60a3c793..899f39f78458 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -194,6 +194,7 @@ "aliyun-cli", "ant", "aria2", + "azure-cli", "bats", "bazelisk", "carthage", diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index bd3590bfe6d8..0e5b7a815218 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -141,6 +141,7 @@ "aliyun-cli", "ant", "aria2", + "azure-cli", "bazelisk", "carthage", "cmake", From a9ac553edd63658e5309424dffa1819dc386ea28 Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Fri, 10 Sep 2021 15:16:54 +0200 Subject: [PATCH 0522/3485] Install ghcup on windows (#4044) --- images/win/scripts/Installers/Install-Haskell.ps1 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/images/win/scripts/Installers/Install-Haskell.ps1 b/images/win/scripts/Installers/Install-Haskell.ps1 index 0e44d0ad8e08..cd133d547a5c 100644 --- a/images/win/scripts/Installers/Install-Haskell.ps1 +++ b/images/win/scripts/Installers/Install-Haskell.ps1 @@ -33,3 +33,7 @@ Write-Host 'Installing cabal...' Choco-Install -PackageName cabal Invoke-PesterTests -TestFile 'Haskell' + +# install minimal ghcup, utilizing pre-installed msys2 at C:\msys64 +$bootstrapHaskell = Invoke-WebRequest https://www.haskell.org/ghcup/sh/bootstrap-haskell.ps1 -UseBasicParsing +Invoke-Command -ScriptBlock ([ScriptBlock]::Create($bootstrapHaskell)) -ArgumentList $false, $true, $true, $false, $false, $false, $false, C:\, "", C:\msys64, C:\cabal From ee69b89103cee75483f6ed348e1c307129a20c8c Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Fri, 10 Sep 2021 15:17:15 +0200 Subject: [PATCH 0523/3485] Use ghcup to install GHC on linux and remove docs and profiling libs (#4043) --- .../SoftwareReport/SoftwareReport.Common.psm1 | 3 +- images/linux/scripts/installers/haskell.sh | 38 +++++++++---------- images/linux/scripts/tests/Haskell.Tests.ps1 | 7 ++-- 3 files changed, 21 insertions(+), 27 deletions(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 index c5abd8ed8ffd..b1fb23e98956 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 @@ -275,8 +275,7 @@ function Build-PHPSection { function Get-GHCVersion { $(ghc --version) -match "version (?\d+\.\d+\.\d+)" | Out-Null $ghcVersion = $Matches.version - $aptSourceRepo = Get-AptSourceRepository -PackageName "ghc" - return "GHC $ghcVersion (apt source repository: $aptSourceRepo)" + return "GHC $ghcVersion" } function Get-GHCupVersion { diff --git a/images/linux/scripts/installers/haskell.sh b/images/linux/scripts/installers/haskell.sh index 2ab93c78a2f3..08c016cbdf76 100644 --- a/images/linux/scripts/installers/haskell.sh +++ b/images/linux/scripts/installers/haskell.sh @@ -14,29 +14,29 @@ export BOOTSTRAP_HASKELL_GHC_VERSION=0 ghcup_bin=$GHCUP_INSTALL_BASE_PREFIX/.ghcup/bin setEtcEnvironmentVariable "BOOTSTRAP_HASKELL_NONINTERACTIVE" $BOOTSTRAP_HASKELL_NONINTERACTIVE -# Install Herbert V. Riedel's PPA for managing multiple version of ghc on ubuntu. -# https://launchpad.net/~hvr/+archive/ubuntu/ghc -apt-get install -y software-properties-common -add-apt-repository -y ppa:hvr/ghc -apt-get update - # Install GHCup curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | sh > /dev/null 2>&1 || true export PATH="$ghcup_bin:$PATH" prependEtcEnvironmentPath $ghcup_bin +availableVersions=$(ghcup list -t ghc -r | grep -v "prerelease" | awk '{print $2}') + # Get 2 latest Haskell Major.Minor versions -allGhcVersions=$(apt-cache search "^ghc-" | grep -Po '(\d*\.){2}\d*' | sort --unique --version-sort) -ghcMajorMinorVersions=$(echo "$allGhcVersions" | cut -d "." -f 1,2 | sort --unique --version-sort | tail -2) - -# We are using apt-get to install ghc, not ghcup, -# because ghc installed through ghcup takes up too much disk space (2GB versus 1GB through apt-get) -for version in $ghcMajorMinorVersions; do - # Get latest patch version for given Major.Minor one (ex. 8.6.5 for 8.6) and install it - exactVersion=$(echo "$allGhcVersions" | grep $version | sort --unique --version-sort | tail -1) - apt-get install -y ghc-$exactVersion - ghcInstalledVersions+=("$exactVersion") - defaultGHCVersion=$exactVersion +minorMajorVersions=$(echo "$availableVersions" | cut -d"." -f 1,2 | uniq | tail -n2) +for majorMinorVersion in $minorMajorVersions; do + fullVersion=$(echo "$availableVersions" | grep "$majorMinorVersion." | tail -n1) + echo "install ghc version $fullVersion..." + ghcup install ghc $fullVersion + ghcup set ghc $fullVersion + + # remove docs and profiling libs + ghc_bin_dir="$(ghcup whereis --directory ghc $fullVersion)" + [ -e "${ghc_bin_dir}" ] || exit 1 + ghc_dir="$(realpath "${ghc_bin_dir}"/..)" + [ -e "${ghc_dir}" ] || exit 1 + find "${ghc_dir}" \( -name "*_p.a" -o -name "*.p_hi" \) -type f -delete + rm -r "${ghc_dir}"/share/* + unset ghc_bin_dir ghc_dir done echo "install cabal..." @@ -49,8 +49,4 @@ ln -s "/opt/ghc/$defaultGHCVersion/bin/ghc" "/usr/bin/ghc" # Install the latest stable release of haskell stack curl -sSL https://get.haskellstack.org/ | sh -# remove PPA repo -echo "ghc ppa:hvr/ghc" >> $HELPER_SCRIPTS/apt-sources.txt -add-apt-repository --remove ppa:hvr/ghc - invoke_tests "Haskell" diff --git a/images/linux/scripts/tests/Haskell.Tests.ps1 b/images/linux/scripts/tests/Haskell.Tests.ps1 index b271cf726470..21706bd86ee7 100644 --- a/images/linux/scripts/tests/Haskell.Tests.ps1 +++ b/images/linux/scripts/tests/Haskell.Tests.ps1 @@ -1,8 +1,7 @@ Describe "Haskell" { - - $GHCCommonPath = "/opt/ghc" + $GHCCommonPath = "/usr/local/.ghcup/ghc" $GHCVersions = Get-ChildItem -Path $GHCCommonPath | Where-Object { $_.Name -match "\d+\.\d+" } - + $testCase = @{ GHCVersions = $GHCVersions } It "GHC directory contains two version of GHC" -TestCases $testCase { @@ -32,4 +31,4 @@ Describe "Haskell" { It "Stack" { "stack --version" | Should -ReturnZeroExitCode } -} \ No newline at end of file +} From 1326521a2aea2af61a171131ed882c4c34d1572f Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Fri, 10 Sep 2021 22:32:42 +0300 Subject: [PATCH 0524/3485] toolset: update to az 6.4 (#4061) --- images/win/toolsets/toolset-2016.json | 2 +- images/win/toolsets/toolset-2019.json | 2 +- images/win/toolsets/toolset-2022.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/images/win/toolsets/toolset-2016.json b/images/win/toolsets/toolset-2016.json index 25251bd6fc8c..492f309c238b 100644 --- a/images/win/toolsets/toolset-2016.json +++ b/images/win/toolsets/toolset-2016.json @@ -122,7 +122,7 @@ "name": "az", "url" : "https://raw.githubusercontent.com/Azure/az-ps-module-versions/main/versions-manifest.json", "versions": [ - "6.1.0" + "6.4.0" ], "zip_versions": [ "1.0.0", diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index a8b869f25dfd..b25ab22c56d7 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -122,7 +122,7 @@ "name": "az", "url" : "https://raw.githubusercontent.com/Azure/az-ps-module-versions/main/versions-manifest.json", "versions": [ - "6.1.0" + "6.4.0" ], "zip_versions": [ "1.0.0", diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index e698a61d7c19..e29586acdc06 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -99,7 +99,7 @@ "name": "az", "url" : "https://raw.githubusercontent.com/Azure/az-ps-module-versions/main/versions-manifest.json", "versions": [ - "6.1.0" + "6.4.0" ], "zip_versions": [] } From 5de032f30d60def167b06c2359d0e24dc0b3c775 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Sat, 11 Sep 2021 23:47:49 +0300 Subject: [PATCH 0525/3485] [Windows] mysql: bump mysql version (#4059) --- .../scripts/Installers/Install-MysqlCli.ps1 | 28 +++++++++++-------- 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/images/win/scripts/Installers/Install-MysqlCli.ps1 b/images/win/scripts/Installers/Install-MysqlCli.ps1 index 9547005a6bc7..3f54db2106df 100644 --- a/images/win/scripts/Installers/Install-MysqlCli.ps1 +++ b/images/win/scripts/Installers/Install-MysqlCli.ps1 @@ -3,11 +3,6 @@ ## Desc: Install Mysql CLI ################################################################################ -## Downloading mysql jar -$MysqlVersionName = "mysql-5.7.21-winx64" -$MysqlVersionUrl = "https://dev.mysql.com/get/Downloads/MySQL-5.7/${MysqlVersionName}.zip" -$MysqlPath = "C:\$MysqlVersionName\bin" - # Installing visual c++ redistibutable package. $InstallerName = "vcredist_x64.exe" $InstallerURI = "https://download.microsoft.com/download/0/5/6/056dcda9-d667-4e27-8001-8a0c6971d6b1/${InstallerName}" @@ -15,16 +10,25 @@ $ArgumentList = ("/install", "/quiet", "/norestart") Install-Binary -Url $InstallerURI -Name $InstallerName -ArgumentList $ArgumentList -# MySQL disabled TLS 1.0 support on or about Jul-14-2018. Need to make sure TLS 1.2 is enabled. -[Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor "Tls12" +## Downloading mysql +if (Test-IsWin22) { + $MysqlVersionName = "mysql-8.0.26-winx64" + $MysqlVersionUrl = "https://dev.mysql.com/get/Downloads/MySQL-8/${MysqlVersionName}.zip" +} else { + $MysqlVersionName = "mysql-5.7.35-winx64" + $MysqlVersionUrl = "https://dev.mysql.com/get/Downloads/MySQL-5.7/${MysqlVersionName}.zip" +} -# Get the latest mysql command line tools . -$mysqlArchPath = Start-DownloadWithRetry -Url $MysqlVersionUrl -Name "mysql.zip" +$MysqlArchPath = Start-DownloadWithRetry -Url $MysqlVersionUrl -Name "mysql.zip" # Expand the zip -Extract-7Zip -Path $mysqlArchPath -DestinationPath "C:\" +Extract-7Zip -Path $MysqlArchPath -DestinationPath "C:\" + +# Rename mysql-version to mysql folder +$MysqlPath = "C:\mysql" +Rename-Item -Path "C:\${MysqlVersionName}" -NewName $MysqlPath # Adding mysql in system environment path -Add-MachinePathItem $mysqlPath +Add-MachinePathItem "${MysqlPath}\bin" -Invoke-PesterTests -TestFile "Databases" -TestName "MySQL" \ No newline at end of file +Invoke-PesterTests -TestFile "Databases" -TestName "MySQL" From eddf4a0208b2235f513595d369d0bac437cb4780 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Mon, 13 Sep 2021 12:36:49 +0300 Subject: [PATCH 0526/3485] =?UTF-8?q?Revert=20"[macOS]=20Software=20Update?= =?UTF-8?q?s=202021=20Week=2037=20-=20Update=20Mono=20to=206.12.0.140=20ve?= =?UTF-8?q?r=E2=80=A6=20(#4050)"=20(#4070)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- images/macos/provision/core/xamarin.sh | 5 ----- images/macos/toolsets/toolset-10.15.json | 2 +- images/macos/toolsets/toolset-11.json | 2 +- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/images/macos/provision/core/xamarin.sh b/images/macos/provision/core/xamarin.sh index 9d390409ebc0..5cc6b360cd48 100755 --- a/images/macos/provision/core/xamarin.sh +++ b/images/macos/provision/core/xamarin.sh @@ -64,11 +64,6 @@ createBundleLink $CURRENT_SDK_SYMLINK "Current" # Fix nuget in some mono versions because of known bugs # -if is_BigSur || is_Catalina; then - # The "nuget restore" command fails: https://github.com/mono/mono/issues/21180 - installNuget "6.12.0" "5.9.1" -fi - if is_Less_BigSur; then # Fix Mono issue with default nuget: https://github.com/mono/mono/issues/17637 installNuget "6.4.0" "5.3.1" diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index 899f39f78458..832cafa7aeb4 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -20,7 +20,7 @@ "xamarin": { "vsmac": "latest", "mono-versions": [ - "6.12.0.140", "6.10.0.106", "6.8.0.123", "6.6.0.166", "6.4.0.208" + "6.12.0.125", "6.10.0.106", "6.8.0.123", "6.6.0.166", "6.4.0.208" ], "ios-versions": [ "14.14.2.5", "14.10.0.4", "14.8.0.3", "14.6.0.15", "14.4.1.3", "14.2.0.12", "14.0.0.0", "13.20.2.2", "13.18.2.1", "13.16.0.13", "13.14.1.39", "13.10.0.21", "13.8.3.0", "13.6.0.12", "13.4.0.2", "13.2.0.47" diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index 0e5b7a815218..f70c90409da9 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -12,7 +12,7 @@ "xamarin": { "vsmac": "latest", "mono-versions": [ - "6.12.0.140" + "6.12.0.125" ], "ios-versions": [ "14.20.0.24", "14.16.0.5", "14.14.2.5", "14.10.0.4", "14.8.0.3", "14.6.0.15", "14.4.1.3", "14.2.0.12", "14.0.0.0", "13.20.2.2" From a675a54759e6770d6e3804c9d60eeaf168c5842f Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Mon, 13 Sep 2021 16:13:22 +0300 Subject: [PATCH 0527/3485] Revert "[Ubuntu] Install cargo-audit 0.14.1 as 0.15.0 is broken (#3821)" (#4072) --- images/linux/scripts/installers/rust.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/images/linux/scripts/installers/rust.sh b/images/linux/scripts/installers/rust.sh index 8c111a6d7370..a611183c4c6f 100644 --- a/images/linux/scripts/installers/rust.sh +++ b/images/linux/scripts/installers/rust.sh @@ -17,9 +17,7 @@ source $CARGO_HOME/env # Install common tools rustup component add rustfmt clippy -cargo install --locked bindgen cbindgen cargo-outdated -# Temporary hardcode cargo-audit 0.14.1 as 0.15.0 is broken https://docs.rs/crate/cargo-audit/0.15.0 -cargo install cargo-audit --version 0.14.1 +cargo install --locked bindgen cbindgen cargo-audit cargo-outdated # Permissions chmod -R 777 $(dirname $RUSTUP_HOME) From 746cfcca9acb6283df5878c5138f873290a95334 Mon Sep 17 00:00:00 2001 From: mikhailshaganov <81769678+mikhailshaganov@users.noreply.github.com> Date: Mon, 13 Sep 2021 18:42:19 +0300 Subject: [PATCH 0528/3485] [Windows] Fix ndk output version (#4058) --- images/win/scripts/SoftwareReport/SoftwareReport.Android.psm1 | 1 + 1 file changed, 1 insertion(+) diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Android.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Android.psm1 index 08db50303b9d..0c034b6f4ba1 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Android.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Android.psm1 @@ -22,6 +22,7 @@ function Get-AndroidSDKManagerPath { function Get-AndroidInstalledPackages { $androidSDKManagerPath = Get-AndroidSDKManagerPath $androidSDKManagerList = cmd /c "$androidSDKManagerPath --list_installed 2>&1" + $androidSDKManagerList = $androidSDKManagerList -notmatch "Warning" return $androidSDKManagerList } From 0b3a4c4bdb362b470098e9d8b7693baae2f11c19 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Tue, 14 Sep 2021 09:59:22 +0300 Subject: [PATCH 0529/3485] Revert "[Windows] Install cargo-audit 0.14.1 as 0.15.0 is broken" (#4076) --- images/win/scripts/Installers/Install-Rust.ps1 | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/images/win/scripts/Installers/Install-Rust.ps1 b/images/win/scripts/Installers/Install-Rust.ps1 index 6417b767ffec..0acf32799d0a 100644 --- a/images/win/scripts/Installers/Install-Rust.ps1 +++ b/images/win/scripts/Installers/Install-Rust.ps1 @@ -20,10 +20,7 @@ $env:Path = Get-MachinePath # Install common tools rustup component add rustfmt clippy -# Temporary hardcode cargo-audit 0.14.1 as 0.15.0 is broken https://docs.rs/crate/cargo-audit/0.15.0 -cargo install --locked bindgen cbindgen cargo-outdated -cargo install cargo-audit --version 0.14.1 - +cargo install --locked bindgen cbindgen cargo-audit cargo-outdated # Run script at startup for all users $cmdRustSymScript = @" From 22728c3dbd0888c9afd38cea48ac71109058b523 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Tue, 14 Sep 2021 09:59:35 +0300 Subject: [PATCH 0530/3485] Revert "[macOS] Install cargo-audit 0.14.1 as 0.15.0 is broken (#3820)" (#4074) --- images/macos/provision/core/rust.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/images/macos/provision/core/rust.sh b/images/macos/provision/core/rust.sh index 0af0126c1adc..d60bcf0dc760 100644 --- a/images/macos/provision/core/rust.sh +++ b/images/macos/provision/core/rust.sh @@ -12,9 +12,7 @@ CARGO_HOME=$HOME/.cargo echo Install common tools... rustup component add rustfmt clippy -cargo install --locked bindgen cbindgen cargo-outdated -# Temporary hardcode cargo-audit 0.14.1 as 0.15.0 is broken https://docs.rs/crate/cargo-audit/0.15.0 -cargo install cargo-audit --version 0.14.1 +cargo install --locked bindgen cbindgen cargo-audit cargo-outdated echo Cleanup Cargo registry cached data... rm -rf $CARGO_HOME/registry/* From 2bc9ec209c516daf6bd4f0b1a0ab2b322d3a241d Mon Sep 17 00:00:00 2001 From: Nikolay Frolov <90333448+nikolai-frolov@users.noreply.github.com> Date: Tue, 14 Sep 2021 21:15:32 +0300 Subject: [PATCH 0531/3485] [Windows] Add VC.Tools.ARM and VC.Tools.ARM64 Visual Studio components (#4081) --- images/win/toolsets/toolset-2022.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index e29586acdc06..0cf6a0a90f3b 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -177,6 +177,8 @@ "Microsoft.VisualStudio.Component.VC.Runtimes.x86.x64.Spectre", "Microsoft.VisualStudio.Component.VC.TestAdapterForBoostTest", "Microsoft.VisualStudio.Component.VC.TestAdapterForGoogleTest", + "Microsoft.VisualStudio.Component.VC.Tools.ARM", + "Microsoft.VisualStudio.Component.VC.Tools.ARM64", "Microsoft.VisualStudio.Component.VC.v141.x86.x64", "Microsoft.VisualStudio.Component.VC.v141.x86.x64.Spectre", "Microsoft.VisualStudio.Component.VC.v141.MFC", From d639badcd6498378b72f7be30394b910dbc02b3a Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Tue, 14 Sep 2021 21:16:32 +0300 Subject: [PATCH 0532/3485] [Windows] Bind openssl.light version to 1.1.1.x (#4082) --- images/win/toolsets/toolset-2016.json | 5 ++++- images/win/toolsets/toolset-2019.json | 5 ++++- images/win/toolsets/toolset-2022.json | 5 ++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/images/win/toolsets/toolset-2016.json b/images/win/toolsets/toolset-2016.json index 492f309c238b..851e3060f8c2 100644 --- a/images/win/toolsets/toolset-2016.json +++ b/images/win/toolsets/toolset-2016.json @@ -391,7 +391,10 @@ { "name": "innosetup" }, { "name": "jq" }, { "name": "NuGet.CommandLine" }, - { "name": "openssl.light" }, + { + "name": "openssl.light", + "args": [ "--version=1.1.1.20181020" ] + }, { "name": "packer" }, { "name": "strawberryperl" }, { "name": "pulumi" }, diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index b25ab22c56d7..04095117c236 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -421,7 +421,10 @@ { "name": "innosetup" }, { "name": "jq" }, { "name": "NuGet.CommandLine" }, - { "name": "openssl.light" }, + { + "name": "openssl.light", + "args": [ "--version=1.1.1.20181020" ] + }, { "name": "packer" }, { "name": "strawberryperl" }, { "name": "pulumi" }, diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index 0cf6a0a90f3b..922bcecd81ea 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -246,7 +246,10 @@ { "name": "Bicep" }, { "name": "jq" }, { "name": "NuGet.CommandLine" }, - { "name": "openssl.light" }, + { + "name": "openssl.light", + "args": [ "--version=1.1.1.20181020" ] + }, { "name": "packer" }, { "name": "pulumi" }, { "name": "tortoisesvn" }, From 65da2f8781b5cae348a655f61365191c1b679ec1 Mon Sep 17 00:00:00 2001 From: Nikita Bykov <49442273+nikita-bykov@users.noreply.github.com> Date: Wed, 15 Sep 2021 10:14:42 +0300 Subject: [PATCH 0533/3485] [macOS] Add Android NDK r23 (#4032) --- .../macos/provision/core/android-toolsets.sh | 21 ++++++++++++------- .../SoftwareReport.Android.psm1 | 8 ++++++- images/macos/tests/Android.Tests.ps1 | 18 ++++++++++------ images/macos/toolsets/toolset-10.14.json | 6 ++++-- images/macos/toolsets/toolset-10.15.json | 6 ++++-- images/macos/toolsets/toolset-11.json | 6 ++++-- 6 files changed, 44 insertions(+), 21 deletions(-) diff --git a/images/macos/provision/core/android-toolsets.sh b/images/macos/provision/core/android-toolsets.sh index 6efe09c79b25..7bcb2fcb606d 100755 --- a/images/macos/provision/core/android-toolsets.sh +++ b/images/macos/provision/core/android-toolsets.sh @@ -26,13 +26,14 @@ function get_full_ndk_version { components=() -ANDROID_PLATFORM=($(get_toolset_value '.android.platform_min_version')) -ANDROID_BUILD_TOOL=($(get_toolset_value '.android.build_tools_min_version')) +ANDROID_PLATFORM=$(get_toolset_value '.android.platform_min_version') +ANDROID_BUILD_TOOL=$(get_toolset_value '.android.build_tools_min_version') ANDROID_EXTRA_LIST=($(get_toolset_value '.android."extra-list"[]')) ANDROID_ADDON_LIST=($(get_toolset_value '.android."addon-list"[]')) ANDROID_ADDITIONAL_TOOLS=($(get_toolset_value '.android."additional-tools"[]')) -ANDROID_NDK_MAJOR_LTS=($(get_toolset_value '.android.ndk.lts')) -ANDROID_NDK_MAJOR_LATEST=($(get_toolset_value '.android.ndk.latest')) +ANDROID_NDK_MAJOR_VERSIONS=($(get_toolset_value '.android.ndk."versions"[]')) +ANDROID_NDK_MAJOR_DEFAULT=$(get_toolset_value '.android.ndk.default') +ANDROID_NDK_MAJOR_LATEST=$(get_toolset_value '.android.ndk."versions"[-1]') # Get the latest command line tools from https://developer.android.com/studio#cmdline-tools ANDROID_OSX_SDK_URL="https://dl.google.com/android/repository/commandlinetools-mac-7302050_latest.zip" ANDROID_HOME=$HOME/Library/Android/sdk @@ -59,13 +60,17 @@ echo "Installing latest tools & platform tools..." echo y | $SDKMANAGER "tools" "platform-tools" echo "Installing latest ndk..." -ndkLtsLatest=$(get_full_ndk_version $ANDROID_NDK_MAJOR_LTS) -ndkLatest=$(get_full_ndk_version $ANDROID_NDK_MAJOR_LATEST) -echo y | $SDKMANAGER "ndk;$ndkLtsLatest" "ndk;$ndkLatest" +for ndk_version in "${ANDROID_NDK_MAJOR_VERSIONS[@]}" +do + ndk_full_version=$(get_full_ndk_version $ndk_version) + echo y | $SDKMANAGER "ndk;$ndk_full_version" +done # This changes were added due to incompatibility with android ndk-bundle (ndk;22.0.7026061). # Link issue virtual-environments: https://github.com/actions/virtual-environments/issues/2481 # Link issue xamarin-android: https://github.com/xamarin/xamarin-android/issues/5526 -ln -s $ANDROID_HOME/ndk/$ndkLtsLatest $ANDROID_HOME/ndk-bundle +ndkDefault=$(get_full_ndk_version $ANDROID_NDK_MAJOR_DEFAULT) +ndkLatest=$(get_full_ndk_version $ANDROID_NDK_MAJOR_LATEST) +ln -s $ANDROID_HOME/ndk/$ndkDefault $ANDROID_HOME/ndk-bundle ANDROID_NDK_LATEST_HOME=$ANDROID_HOME/ndk/$ndkLatest echo "export ANDROID_NDK_LATEST_HOME=$ANDROID_NDK_LATEST_HOME" >> "${HOME}/.bashrc" diff --git a/images/macos/software-report/SoftwareReport.Android.psm1 b/images/macos/software-report/SoftwareReport.Android.psm1 index 7617e7333853..ab7a2aa2a428 100644 --- a/images/macos/software-report/SoftwareReport.Android.psm1 +++ b/images/macos/software-report/SoftwareReport.Android.psm1 @@ -1,4 +1,5 @@ Import-Module "$PSScriptRoot/../helpers/SoftwareReport.Helpers.psm1" -DisableNameChecking +Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" function Split-TableRowByColumns { param( @@ -184,8 +185,13 @@ function Get-AndroidNDKVersions { $ndkFolderPath = Join-Path (Get-AndroidSDKRoot) "ndk" $versions += Get-ChildItem -Path $ndkFolderPath -Name + $ndkDefaultVersion = Get-ToolsetValue "android.ndk.default" + $ndkDefaultFullVersion = Get-ChildItem "$env:ANDROID_HOME/ndk/$ndkDefaultVersion.*" -Name | Select-Object -Last 1 - return ($versions -Join "
") + return ($versions | ForEach-Object { + $defaultPostfix = ( $_ -eq $ndkDefaultFullVersion ) ? " (default)" : "" + $_ + $defaultPostfix + } | Join-String -Separator "
") } function Get-IntelHaxmVersion { diff --git a/images/macos/tests/Android.Tests.ps1 b/images/macos/tests/Android.Tests.ps1 index 303a271fa4cf..2550d5492745 100644 --- a/images/macos/tests/Android.Tests.ps1 +++ b/images/macos/tests/Android.Tests.ps1 @@ -8,10 +8,10 @@ Describe "Android" { $androidSdkManagerPackages = Get-AndroidPackages [int]$platformMinVersion = Get-ToolsetValue "android.platform_min_version" [version]$buildToolsMinVersion = Get-ToolsetValue "android.build_tools_min_version" - [string]$ndkLatestVersion = Get-ToolsetValue "android.ndk.latest" - [string]$ndkLtsVersion = Get-ToolsetValue "android.ndk.lts" - $ndkLatestFullVersion = (Get-ChildItem "$env:ANDROID_HOME/ndk/$ndkLatestVersion.*" | Select-Object -Last 1).Name - $ndkLtsFullVersion = (Get-ChildItem "$env:ANDROID_HOME/ndk/$ndkLtsVersion.*" | Select-Object -Last 1).Name + [array]$ndkVersions = Get-ToolsetValue "android.ndk.versions" + [string]$ndkDefaultVersion = Get-ToolsetValue "android.ndk.default" + $ndkFullVersions = $ndkVersions | ForEach-Object { Get-ChildItem "$env:ANDROID_HOME/ndk/${_}.*" -Name | Select-Object -Last 1} | ForEach-Object { "ndk/${_}" } + $ndkDefaultFullVersion = Get-ChildItem "$env:ANDROID_HOME/ndk/$ndkDefaultVersion.*" -Name | Select-Object -Last 1 $platformVersionsList = ($androidSdkManagerPackages | Where-Object { "$_".StartsWith("platforms;") }) -replace 'platforms;android-', '' $platformNumericList = $platformVersionsList | Where-Object { $_ -match "\d+" } | Where-Object { [int]$_ -ge $platformMinVersion } | Sort-Object -Unique @@ -28,10 +28,9 @@ Describe "Android" { "tools/proguard", "ndk-bundle", "cmake", - "ndk/$ndkLatestFullVersion", - "ndk/$ndkLtsFullVersion", $platforms, $buildTools, + $ndkFullVersions, (Get-ToolsetValue "android.extra-list" | ForEach-Object { "extras/${_}" }), (Get-ToolsetValue "android.addon-list" | ForEach-Object { "add-ons/${_}" }), (Get-ToolsetValue "android.additional-tools") @@ -76,11 +75,18 @@ Describe "Android" { Context "Packages" { $testCases = $androidPackages | ForEach-Object { @{ PackageName = $_ } } + $defaultNdkTestCase = @{ NdkDefaultFullVersion = $ndkDefaultFullVersion } It "" -TestCases $testCases { param ([string] $PackageName) Validate-AndroidPackage $PackageName } + + It "ndk-bundle points to the default NDK version" -TestCases $defaultNdkTestCase { + $ndkLinkTarget = (Get-Item $env:ANDROID_NDK_HOME).Target + $ndkVersion = Split-Path -Path $ndkLinkTarget -Leaf + $ndkVersion | Should -BeExactly $NdkDefaultFullVersion + } } It "HAXM is installed" -Skip:($os.IsBigSur) { diff --git a/images/macos/toolsets/toolset-10.14.json b/images/macos/toolsets/toolset-10.14.json index 3f1637c838c1..a21440e70710 100644 --- a/images/macos/toolsets/toolset-10.14.json +++ b/images/macos/toolsets/toolset-10.14.json @@ -215,8 +215,10 @@ "cmake;3.18.1" ], "ndk": { - "lts": "21", - "latest": "22" + "default": "21", + "versions": [ + "21", "22", "23" + ] } }, "powershellModules": [ diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index 832cafa7aeb4..9e980d349406 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -167,8 +167,10 @@ "cmake;3.18.1" ], "ndk": { - "lts": "21", - "latest": "22" + "default": "21", + "versions": [ + "21", "22", "23" + ] } }, "powershellModules": [ diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index f70c90409da9..0c24f6493cf6 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -115,8 +115,10 @@ "cmake;3.18.1" ], "ndk": { - "lts": "21", - "latest": "22" + "default": "21", + "versions": [ + "21", "22", "23" + ] } }, "powershellModules": [ From a380bfdd2417d00fb9ed323014703a4103d8e343 Mon Sep 17 00:00:00 2001 From: Nikolay Frolov <90333448+nikolai-frolov@users.noreply.github.com> Date: Wed, 15 Sep 2021 22:57:58 +0300 Subject: [PATCH 0534/3485] Remove alpine:3.11 docker image from ubuntu 18.04 and 20.04 (#4093) --- images/linux/toolsets/toolset-1804.json | 1 - images/linux/toolsets/toolset-2004.json | 1 - 2 files changed, 2 deletions(-) diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index e9d9119162af..8eea24062d76 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -201,7 +201,6 @@ ], "docker": { "images": [ - "alpine:3.11", "alpine:3.12", "alpine:3.13", "alpine:3.14", diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index 2087bc1dcf6d..0f6327b193d7 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -200,7 +200,6 @@ ], "docker": { "images": [ - "alpine:3.11", "alpine:3.12", "alpine:3.13", "alpine:3.14", From db5e4084fe2395ad38d8e3e5fc41fe03f3ec99c1 Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Thu, 16 Sep 2021 09:06:33 +0200 Subject: [PATCH 0535/3485] Fix unnecessary /usr/bin/ghc symlink (#4095) --- images/linux/scripts/installers/haskell.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/images/linux/scripts/installers/haskell.sh b/images/linux/scripts/installers/haskell.sh index 08c016cbdf76..574052dc7fd2 100644 --- a/images/linux/scripts/installers/haskell.sh +++ b/images/linux/scripts/installers/haskell.sh @@ -44,7 +44,6 @@ ghcup install cabal chmod -R 777 $GHCUP_INSTALL_BASE_PREFIX/.ghcup ln -s $GHCUP_INSTALL_BASE_PREFIX/.ghcup /etc/skel/.ghcup -ln -s "/opt/ghc/$defaultGHCVersion/bin/ghc" "/usr/bin/ghc" # Install the latest stable release of haskell stack curl -sSL https://get.haskellstack.org/ | sh From ecfc9c43da3f7f6ea2586ba1dc9e79e244c09441 Mon Sep 17 00:00:00 2001 From: Dibir Magomedsaygitov <61747324+dibir-magomedsaygitov@users.noreply.github.com> Date: Thu, 16 Sep 2021 11:35:11 +0300 Subject: [PATCH 0536/3485] [Windows] Rework Kotlin installation (#4083) --- .../win/scripts/Installers/Install-Kotlin.ps1 | 18 ++++++++++++++++++ .../win/scripts/Tests/ChocoPackages.Tests.ps1 | 10 +--------- images/win/scripts/Tests/Tools.Tests.ps1 | 8 ++++++++ images/win/toolsets/toolset-2016.json | 1 - images/win/toolsets/toolset-2019.json | 1 - images/win/toolsets/toolset-2022.json | 1 - images/win/windows2016.json | 1 + images/win/windows2019.json | 3 ++- images/win/windows2022.json | 3 ++- 9 files changed, 32 insertions(+), 14 deletions(-) create mode 100644 images/win/scripts/Installers/Install-Kotlin.ps1 diff --git a/images/win/scripts/Installers/Install-Kotlin.ps1 b/images/win/scripts/Installers/Install-Kotlin.ps1 new file mode 100644 index 000000000000..95be7f7777ec --- /dev/null +++ b/images/win/scripts/Installers/Install-Kotlin.ps1 @@ -0,0 +1,18 @@ +################################################################################ +## File: Install-Kotlin.ps1 +## Desc: Install Kotlin +################################################################################ + +# Install Kotlin +$url = "https://api.github.com/repos/JetBrains/kotlin/releases/latest" +[System.String] $kotlinLatest = (Invoke-RestMethod -Uri $url).assets.browser_download_url -match "kotlin-compiler" +$kotlinInstallerPath = Start-DownloadWithRetry -Url $kotlinLatest -Name "kotlin-compiler.zip" + +Write-Host "Expand Kotlin archive" +$kotlinPath = "C:\tools" +Extract-7Zip -Path $kotlinInstallerPath -DestinationPath $kotlinPath + +# Add to PATH +Add-MachinePathItem "$kotlinPath\kotlinc\bin" + +Invoke-PesterTests -TestFile "Tools" -TestName "Kotlin" \ No newline at end of file diff --git a/images/win/scripts/Tests/ChocoPackages.Tests.ps1 b/images/win/scripts/Tests/ChocoPackages.Tests.ps1 index cb95e095477b..9debefdd3cbf 100644 --- a/images/win/scripts/Tests/ChocoPackages.Tests.ps1 +++ b/images/win/scripts/Tests/ChocoPackages.Tests.ps1 @@ -102,12 +102,4 @@ Describe "CMake" { It "cmake" { "cmake --version" | Should -ReturnZeroExitCode } -} - -Describe "Kotlin" { - $kotlinPackages = @("kotlinc", "kotlinc-js", "kotlinc-jvm") - - It " is available" -TestCases ($kotlinPackages | ForEach-Object { @{ toolName = $_ } }) { - "$toolName -version" | Should -ReturnZeroExitCode - } -} +} \ No newline at end of file diff --git a/images/win/scripts/Tests/Tools.Tests.ps1 b/images/win/scripts/Tests/Tools.Tests.ps1 index 6755193ad940..cb72bbd3a49d 100644 --- a/images/win/scripts/Tests/Tools.Tests.ps1 +++ b/images/win/scripts/Tests/Tools.Tests.ps1 @@ -173,3 +173,11 @@ Describe "Pipx" { "pipx --version" | Should -ReturnZeroExitCode } } + +Describe "Kotlin" { + $kotlinPackages = @("kapt", "kotlin", "kotlinc", "kotlin-dce-js", "kotlinc-js", "kotlinc-jvm") + + It " is available" -TestCases ($kotlinPackages | ForEach-Object { @{ toolName = $_ } }) { + "$toolName -version" | Should -ReturnZeroExitCode + } +} \ No newline at end of file diff --git a/images/win/toolsets/toolset-2016.json b/images/win/toolsets/toolset-2016.json index 851e3060f8c2..944ab75c0746 100644 --- a/images/win/toolsets/toolset-2016.json +++ b/images/win/toolsets/toolset-2016.json @@ -401,7 +401,6 @@ { "name": "tortoisesvn" }, { "name": "swig" }, { "name": "vswhere" }, - { "name": "kotlinc" }, { "name": "julia", "args": [ "--ia", "/DIR=C:\\Julia" ] diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index 04095117c236..87abcdd1c5aa 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -431,7 +431,6 @@ { "name": "tortoisesvn" }, { "name": "swig" }, { "name": "vswhere" }, - { "name": "kotlinc" }, { "name": "julia", "args": [ "--ia", "/DIR=C:\\Julia" ] diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index 922bcecd81ea..cd5dae9320e7 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -255,7 +255,6 @@ { "name": "tortoisesvn" }, { "name": "swig" }, { "name": "vswhere" }, - { "name": "kotlinc" }, { "name": "julia", "args": [ "--ia", "/DIR=C:\\Julia" ] diff --git a/images/win/windows2016.json b/images/win/windows2016.json index 8f05537c5a75..0222a54f7181 100644 --- a/images/win/windows2016.json +++ b/images/win/windows2016.json @@ -187,6 +187,7 @@ "{{ template_dir }}/scripts/Installers/Install-AliyunCli.ps1", "{{ template_dir }}/scripts/Installers/Install-PostgreSQL.ps1", "{{ template_dir }}/scripts/Installers/Install-JavaTools.ps1", + "{{ template_dir }}/scripts/Installers/Install-Kotlin.ps1", "{{ template_dir }}/scripts/Installers/Install-Ruby.ps1", "{{ template_dir }}/scripts/Installers/Install-PyPy.ps1", "{{ template_dir }}/scripts/Installers/Install-Toolset.ps1", diff --git a/images/win/windows2019.json b/images/win/windows2019.json index b9339a3bec6b..af3c1ea91fe9 100644 --- a/images/win/windows2019.json +++ b/images/win/windows2019.json @@ -182,7 +182,8 @@ "{{ template_dir }}/scripts/Installers/Install-AzureDevOpsCli.ps1", "{{ template_dir }}/scripts/Installers/Install-NodeLts.ps1", "{{ template_dir }}/scripts/Installers/Install-CommonUtils.ps1", - "{{ template_dir }}/scripts/Installers/Install-JavaTools.ps1" + "{{ template_dir }}/scripts/Installers/Install-JavaTools.ps1", + "{{ template_dir }}/scripts/Installers/Install-Kotlin.ps1" ] }, { diff --git a/images/win/windows2022.json b/images/win/windows2022.json index 4d39b73e967e..64b8680f8e7d 100644 --- a/images/win/windows2022.json +++ b/images/win/windows2022.json @@ -166,7 +166,8 @@ "{{ template_dir }}/scripts/Installers/Install-AzureDevOpsCli.ps1", "{{ template_dir }}/scripts/Installers/Install-NodeLts.ps1", "{{ template_dir }}/scripts/Installers/Install-CommonUtils.ps1", - "{{ template_dir }}/scripts/Installers/Install-JavaTools.ps1" + "{{ template_dir }}/scripts/Installers/Install-JavaTools.ps1", + "{{ template_dir }}/scripts/Installers/Install-Kotlin.ps1" ] }, { From bab55a431940306ddea86cf0302b1452616cd12d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 16 Sep 2021 09:35:51 +0000 Subject: [PATCH 0537/3485] Updating readme file for macOS-11 version 20210914.4 (#4087) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/macos/macos-11-Readme.md | 182 ++++++++++++++++---------------- 1 file changed, 90 insertions(+), 92 deletions(-) diff --git a/images/macos/macos-11-Readme.md b/images/macos/macos-11-Readme.md index db5ac4b51fa2..07bec05d3647 100644 --- a/images/macos/macos-11-Readme.md +++ b/images/macos/macos-11-Readme.md @@ -1,15 +1,15 @@ | Announcements | |-| -| [[macOS, Windows] .NET SDK pre-installation policy will be changed on September, 6](https://github.com/actions/virtual-environments/issues/3809) | +| [macOS-latest workflows will use macOS-11](https://github.com/actions/virtual-environments/issues/4060) | *** -# macOS 11.5 info -- System Version: macOS 11.5.2 (20G95) +# macOS 11.6 info +- System Version: macOS 11.6 (20G165) - Kernel Version: Darwin 20.6.0 -- Image Version: 20210905.2 +- Image Version: 20210914.4 ## Installed Software ### Language and Runtime -- .NET SDK 2.1.302 2.1.403 2.1.507 2.1.607 2.1.701 2.1.818 3.1.101 3.1.201 3.1.302 3.1.412 5.0.102 5.0.202 5.0.302 5.0.400 +- .NET SDK 2.1.302 2.1.403 2.1.507 2.1.607 2.1.701 2.1.818 3.1.101 3.1.201 3.1.302 3.1.413 5.0.102 5.0.202 5.0.302 5.0.401 - Bash 3.2.57(1)-release - Clang/LLVM 12.0.1 is available on `'$(brew --prefix llvm)/bin/clang'` - Clang/LLVM 12.0.5 is default @@ -35,9 +35,9 @@ ### Package Management - Bundler version 2.2.27 - Carthage 0.38.0 -- CocoaPods 1.11.0 -- Composer 2.1.6 -- Homebrew 3.2.10 +- CocoaPods 1.11.2 +- Composer 2.1.7 +- Homebrew 3.2.11 - Miniconda 4.10.3 - NPM 6.14.15 - NuGet 5.6.0.6489 @@ -45,7 +45,7 @@ - Pip 21.2.4 (python 3.9) - Pipx 0.16.4 - RubyGems 3.2.27 -- Vcpkg 2021 (build from master \<71422c6>) +- Vcpkg 2021 (build from master \<92af1ff>) - Yarn 1.22.5 #### Environment variables @@ -71,14 +71,14 @@ - Git: 2.33.0 - GitHub CLI: 2.0.0 - GNU Tar 1.34 - available by 'gtar' alias -- GNU Wget 1.21.1 +- GNU Wget 1.21.2 - gpg (GnuPG) 2.3.2 - helm v3.6.3+gd506314 - Hub CLI: 2.14.2 - jq 1.6 - mongo v5.0.2 - mongod v5.0.2 -- Newman 5.2.4 +- Newman 5.3.0 - OpenSSL 1.1.1l 24 Aug 2021 `(/usr/local/opt/openssl -> /usr/local/Cellar/openssl@1.1/1.1.1l)` - Packer 1.7.4 - PostgreSQL 13.4 @@ -92,10 +92,10 @@ ### Tools - Aliyun CLI 3.0.90 - App Center CLI 2.10.0 -- AWS CLI 2.2.35 -- AWS SAM CLI 1.30.0 +- AWS CLI 2.2.37 +- AWS SAM CLI 1.31.0 - AWS Session Manager CLI 1.2.245.0 -- Azure CLI 2.27.2 +- Azure CLI 2.28.0 - Bicep CLI 0.4.613 - Cabal 3.4.0.0 - Cmake 3.21.2 @@ -108,25 +108,25 @@ - Xcode Command Line Tools 12.5.0.0.1.1617976050 ### Linters -- SwiftLint 0.43.1 +- SwiftLint 0.44.0 - yamllint 1.26.3 ### Browsers - Safari 14.1.2 (16611.3.10.1.6) - SafariDriver 14.1.2 (16611.3.10.1.6) -- Google Chrome 93.0.4577.63 -- ChromeDriver 92.0.4515.107 -- Microsoft Edge 93.0.961.38 -- MSEdgeDriver 93.0.961.38 -- Mozilla Firefox 91.0.2 +- Google Chrome 93.0.4577.82 +- ChromeDriver 93.0.4577.63 +- Microsoft Edge 93.0.961.47 +- MSEdgeDriver 93.0.961.47 +- Mozilla Firefox 92.0 - geckodriver 0.29.1 #### Environment variables -| Name | Value | -| --------------- | ---------------------------------------------- | -| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/92.0.4515.107 | -| EDGEWEBDRIVER | /usr/local/share/edge_driver | -| GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | +| Name | Value | +| --------------- | --------------------------------------------- | +| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/93.0.4577.63 | +| EDGEWEBDRIVER | /usr/local/share/edge_driver | +| GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | ### Java | Version | Vendor | Environment Variable | @@ -143,9 +143,9 @@ - 3.0.2 #### Python -- 3.7.11 -- 3.8.11 -- 3.9.6 +- 3.7.12 +- 3.8.12 +- 3.9.7 #### PyPy - 2.7.18 [PyPy 7.3.5] @@ -158,21 +158,21 @@ #### Go - 1.15.15 -- 1.16.7 -- 1.17.0 +- 1.16.8 +- 1.17.1 ### Rust Tools -- Cargo 1.54.0 -- Rust 1.54.0 -- Rustdoc 1.54.0 +- Cargo 1.55.0 +- Rust 1.55.0 +- Rustdoc 1.55.0 - Rustup 1.24.3 #### Packages - Bindgen 0.59.1 -- Cargo-audit 0.14.1 +- Cargo-audit 0.15.2 - Cargo-outdated v0.9.17 - Cbindgen 0.20.0 -- Clippy 0.1.54 +- Clippy 0.1.55 - Rustfmt 1.4.37-stable ### PowerShell Tools @@ -190,11 +190,11 @@ | Name | Version | ConfigFile | ServiceStatus | ListenPort | | ----- | ------- | ------------------------------- | ------------- | ---------- | | httpd | 2.4.48 | /usr/local/etc/httpd/httpd.conf | stopped | 80 | -| nginx | 1.21.2 | /usr/local/etc/nginx/nginx.conf | stopped | 80 | +| nginx | 1.21.3 | /usr/local/etc/nginx/nginx.conf | stopped | 80 | ### Xamarin #### Visual Studio for Mac -- 8.10.8.0 +- 8.10.9.3 #### Xamarin bundles | symlink | Xamarin.Mono | Xamarin.iOS | Xamarin.Mac | Xamarin.Android | @@ -214,13 +214,13 @@ - NUnit 3.6.1 ### Xcode -| Version | Build | Path | -| ---------------- | -------- | ------------------------------ | -| 13.0 (beta) | 13A5212g | /Applications/Xcode_13.0.app | -| 12.5.1 (default) | 12E507 | /Applications/Xcode_12.5.1.app | -| 12.5 | 12E262 | /Applications/Xcode_12.5.app | -| 12.4 | 12D4e | /Applications/Xcode_12.4.app | -| 11.7 | 11E801a | /Applications/Xcode_11.7.app | +| Version | Build | Path | +| ---------------- | ------- | ------------------------------ | +| 13.0 | 13A233 | /Applications/Xcode_13.0.app | +| 12.5.1 (default) | 12E507 | /Applications/Xcode_12.5.1.app | +| 12.5 | 12E262 | /Applications/Xcode_12.5.app | +| 12.4 | 12D4e | /Applications/Xcode_12.4.app | +| 11.7 | 11E801a | /Applications/Xcode_11.7.app | #### Xcode Support Tools - xcpretty 0.3.0 @@ -229,56 +229,54 @@ - Nomad shenzhen CLI 0.14.3 #### Installed SDKs -| SDK | SDK Name | Xcode Version | -| ----------------------- | -------------------- | ------------- | -| macOS 10.15 | macosx10.15 | 11.7 | -| macOS 11.1 | macosx11.1 | 12.4 | -| macOS 11.3 | macosx11.3 | 12.5, 12.5.1 | -| macOS 12.0 | macosx12.0 | 13.0 | -| iOS 13.7 | iphoneos13.7 | 11.7 | -| iOS 14.4 | iphoneos14.4 | 12.4 | -| iOS 14.5 | iphoneos14.5 | 12.5, 12.5.1 | -| iOS 15.0 | iphoneos15.0 | 13.0 | -| Simulator - iOS 13.7 | iphonesimulator13.7 | 11.7 | -| Simulator - iOS 14.4 | iphonesimulator14.4 | 12.4 | -| Simulator - iOS 14.5 | iphonesimulator14.5 | 12.5, 12.5.1 | -| Simulator - iOS 15.0 | iphonesimulator15.0 | 13.0 | -| tvOS 13.4 | appletvos13.4 | 11.7 | -| tvOS 14.3 | appletvos14.3 | 12.4 | -| tvOS 14.5 | appletvos14.5 | 12.5, 12.5.1 | -| tvOS 15.0 | appletvos15.0 | 13.0 | -| Simulator - tvOS 13.4 | appletvsimulator13.4 | 11.7 | -| Simulator - tvOS 14.3 | appletvsimulator14.3 | 12.4 | -| Simulator - tvOS 14.5 | appletvsimulator14.5 | 12.5, 12.5.1 | -| Simulator - tvOS 15.0 | appletvsimulator15.0 | 13.0 | -| watchOS 6.2 | watchos6.2 | 11.7 | -| watchOS 7.2 | watchos7.2 | 12.4 | -| watchOS 7.4 | watchos7.4 | 12.5, 12.5.1 | -| watchOS 8.0 | watchos8.0 | 13.0 | -| Simulator - watchOS 6.2 | watchsimulator6.2 | 11.7 | -| Simulator - watchOS 7.2 | watchsimulator7.2 | 12.4 | -| Simulator - watchOS 7.4 | watchsimulator7.4 | 12.5, 12.5.1 | -| Simulator - watchOS 8.0 | watchsimulator8.0 | 13.0 | -| DriverKit 19.0 | driverkit.macosx19.0 | 11.7 | -| DriverKit 20.2 | driverkit.macosx20.2 | 12.4 | -| DriverKit 20.4 | driverkit.macosx20.4 | 12.5, 12.5.1 | -| DriverKit 21.0 | driverkit21.0 | 13.0 | +| SDK | SDK Name | Xcode Version | +| ----------------------- | -------------------- | ------------------ | +| macOS 10.15 | macosx10.15 | 11.7 | +| macOS 11.1 | macosx11.1 | 12.4 | +| macOS 11.3 | macosx11.3 | 12.5, 12.5.1, 13.0 | +| iOS 13.7 | iphoneos13.7 | 11.7 | +| iOS 14.4 | iphoneos14.4 | 12.4 | +| iOS 14.5 | iphoneos14.5 | 12.5, 12.5.1 | +| iOS 15.0 | iphoneos15.0 | 13.0 | +| Simulator - iOS 13.7 | iphonesimulator13.7 | 11.7 | +| Simulator - iOS 14.4 | iphonesimulator14.4 | 12.4 | +| Simulator - iOS 14.5 | iphonesimulator14.5 | 12.5, 12.5.1 | +| Simulator - iOS 15.0 | iphonesimulator15.0 | 13.0 | +| tvOS 13.4 | appletvos13.4 | 11.7 | +| tvOS 14.3 | appletvos14.3 | 12.4 | +| tvOS 14.5 | appletvos14.5 | 12.5, 12.5.1 | +| tvOS 15.0 | appletvos15.0 | 13.0 | +| Simulator - tvOS 13.4 | appletvsimulator13.4 | 11.7 | +| Simulator - tvOS 14.3 | appletvsimulator14.3 | 12.4 | +| Simulator - tvOS 14.5 | appletvsimulator14.5 | 12.5, 12.5.1 | +| Simulator - tvOS 15.0 | appletvsimulator15.0 | 13.0 | +| watchOS 6.2 | watchos6.2 | 11.7 | +| watchOS 7.2 | watchos7.2 | 12.4 | +| watchOS 7.4 | watchos7.4 | 12.5, 12.5.1 | +| watchOS 8.0 | watchos8.0 | 13.0 | +| Simulator - watchOS 6.2 | watchsimulator6.2 | 11.7 | +| Simulator - watchOS 7.2 | watchsimulator7.2 | 12.4 | +| Simulator - watchOS 7.4 | watchsimulator7.4 | 12.5, 12.5.1 | +| Simulator - watchOS 8.0 | watchsimulator8.0 | 13.0 | +| DriverKit 19.0 | driverkit.macosx19.0 | 11.7 | +| DriverKit 20.2 | driverkit.macosx20.2 | 12.4 | +| DriverKit 20.4 | driverkit.macosx20.4 | 12.5, 12.5.1, 13.0 | #### Installed Simulators -| OS | Xcode Version | Simulators | -| ----------- | -------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| 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.4 | 12.4 | iPod touch (7th generation)
iPhone 11
iPhone 11 Pro
iPhone 11 Pro Max
iPhone 12
iPhone 12 mini
iPhone 12 Pro
iPhone 12 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.5 | 12.5
12.5.1 | iPod touch (7th generation)
iPhone 11
iPhone 11 Pro
iPhone 11 Pro Max
iPhone 12
iPhone 12 mini
iPhone 12 Pro
iPhone 12 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 (11-inch) (3rd generation)
iPad Pro (12.9-inch) (4th generation)
iPad Pro (12.9-inch) (5th generation)
iPad Pro (9.7-inch) | -| iOS 15.0 | 13.0 | iPod touch (7th generation)
iPhone 11
iPhone 11 Pro
iPhone 11 Pro Max
iPhone 12
iPhone 12 mini
iPhone 12 Pro
iPhone 12 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 (11-inch) (3rd generation)
iPad Pro (12.9-inch) (4th generation)
iPad Pro (12.9-inch) (5th generation)
iPad Pro (9.7-inch) | -| tvOS 13.4 | 11.7 | Apple TV
Apple TV 4K
Apple TV 4K (at 1080p) | -| tvOS 14.3 | 12.4 | Apple TV
Apple TV 4K
Apple TV 4K (at 1080p) | -| tvOS 14.5 | 12.5
12.5.1 | Apple TV
Apple TV 4K
Apple TV 4K (2nd generation)
Apple TV 4K (at 1080p)
Apple TV 4K (at 1080p) (2nd generation) | -| tvOS 15.0 | 13.0 | Apple TV
Apple TV 4K
Apple TV 4K (2nd generation)
Apple TV 4K (at 1080p)
Apple TV 4K (at 1080p) (2nd generation) | -| watchOS 6.2 | 11.7 | Apple Watch Series 4 - 40mm
Apple Watch Series 4 - 44mm
Apple Watch Series 5 - 40mm
Apple Watch Series 5 - 44mm | -| watchOS 7.2 | 12.4 | 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.4 | 12.5
12.5.1 | 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 8.0 | 13.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 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.4 | 12.4 | iPod touch (7th generation)
iPhone 11
iPhone 11 Pro
iPhone 11 Pro Max
iPhone 12
iPhone 12 mini
iPhone 12 Pro
iPhone 12 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.5 | 12.5
12.5.1 | iPod touch (7th generation)
iPhone 11
iPhone 11 Pro
iPhone 11 Pro Max
iPhone 12
iPhone 12 mini
iPhone 12 Pro
iPhone 12 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 (11-inch) (3rd generation)
iPad Pro (12.9-inch) (4th generation)
iPad Pro (12.9-inch) (5th generation)
iPad Pro (9.7-inch) | +| iOS 15.0 | 13.0 | iPod touch (7th generation)
iPhone 11
iPhone 11 Pro
iPhone 11 Pro Max
iPhone 12
iPhone 12 mini
iPhone 12 Pro
iPhone 12 Pro Max
iPhone 13
iPhone 13 mini
iPhone 13 Pro
iPhone 13 Pro Max
iPhone 8
iPhone 8 Plus
iPhone SE (2nd generation)
iPad (7th generation)
iPad (8th generation)
iPad (9th generation)
iPad Air (3rd generation)
iPad Air (4th generation)
iPad mini (6th generation)
iPad Pro (11-inch) (2nd generation)
iPad Pro (11-inch) (3rd generation)
iPad Pro (12.9-inch) (4th generation)
iPad Pro (12.9-inch) (5th generation)
iPad Pro (9.7-inch) | +| tvOS 13.4 | 11.7 | Apple TV
Apple TV 4K
Apple TV 4K (at 1080p) | +| tvOS 14.3 | 12.4 | Apple TV
Apple TV 4K
Apple TV 4K (at 1080p) | +| tvOS 14.5 | 12.5
12.5.1 | Apple TV
Apple TV 4K
Apple TV 4K (2nd generation)
Apple TV 4K (at 1080p)
Apple TV 4K (at 1080p) (2nd generation) | +| tvOS 15.0 | 13.0 | Apple TV
Apple TV 4K
Apple TV 4K (2nd generation)
Apple TV 4K (at 1080p)
Apple TV 4K (at 1080p) (2nd generation) | +| watchOS 6.2 | 11.7 | Apple Watch Series 4 - 40mm
Apple Watch Series 4 - 44mm
Apple Watch Series 5 - 40mm
Apple Watch Series 5 - 44mm | +| watchOS 7.2 | 12.4 | 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.4 | 12.5
12.5.1 | 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 8.0 | 13.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
Apple Watch Series 7 - 41mm
Apple Watch Series 7 - 45mm | ### Android | Package Name | Version | From 46cf736fbe8fd6bccedd0ca17b733b99665bb736 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 16 Sep 2021 10:22:54 +0000 Subject: [PATCH 0538/3485] Updating readme file for win16 version 20210914.2 (#4090) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/win/Windows2016-Readme.md | 67 ++++++++++++++++---------------- 1 file changed, 33 insertions(+), 34 deletions(-) diff --git a/images/win/Windows2016-Readme.md b/images/win/Windows2016-Readme.md index fa9d753b35c3..98df23e4e495 100644 --- a/images/win/Windows2016-Readme.md +++ b/images/win/Windows2016-Readme.md @@ -1,11 +1,10 @@ | Announcements | |-| | [(Public Beta) Windows Server 2022 with Visual Studio 2022 is now available](https://github.com/actions/virtual-environments/issues/3949) | -| [[macOS, Windows] .NET SDK pre-installation policy will be changed on September, 6](https://github.com/actions/virtual-environments/issues/3809) | *** # Microsoft Windows Server 2016 Datacenter - OS Version: 10.0.14393 Build 4583 -- Image Version: 20210907.1 +- Image Version: 20210914.2 ## Installed Software ### Language and Runtime @@ -21,7 +20,7 @@ ### Package Management - Chocolatey 0.11.1 -- Composer 2.1.6 +- Composer 2.1.7 - Helm 3.6.3 - Miniconda 4.10.3 (pre-installed on the image but not added to PATH) - NPM 6.14.15 @@ -29,7 +28,7 @@ - pip 21.2.4 (python 3.7) - Pipx 0.16.4 - RubyGems 2.7.6.3 -- Vcpkg (build from master \<71422c6>) +- Vcpkg (build from master \) - Yarn 1.22.11 #### Environment variables @@ -53,13 +52,13 @@ - Bicep 0.4.613 - Cabal 3.4.0.0 - CMake 3.21.2 -- CodeQL Action Bundle 2.6.0 -- Docker 20.10.6 +- CodeQL Action Bundle 2.6.1 +- Docker 20.10.7 - Docker-compose 1.29.2 - ghc 9.0.1 - Git 2.33.0 - Git LFS 2.13.3 -- Google Cloud SDK 355.0.0 +- Google Cloud SDK 357.0.0 - GVFS 1.0.21085.9 - InnoSetup 6.2.0 - jq 1.6 @@ -67,11 +66,11 @@ - Kubectl 1.22.1 - Mercurial 5.0 - Mingw-w64 8.1.0 -- Newman 5.2.4 +- Newman 5.3.0 - NSIS v3.06.1 - OpenSSL 1.1.1 - Packer 1.7.4 -- Pulumi v3.11.0 +- Pulumi v3.12.0 - R 4.1.1 - Stack 2.7.3 - Subversion (SVN) 1.14.1 @@ -83,8 +82,8 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.90 -- AWS CLI 2.2.35 -- AWS SAM CLI 1.30.0 +- AWS CLI 2.2.37 +- AWS SAM CLI 1.31.0 - AWS Session Manager CLI 1.2.245.0 - Azure CLI 2.28.0 - Azure DevOps CLI extension 0.20.0 @@ -93,25 +92,25 @@ - Hub CLI 2.14.2 ### Rust Tools -- Cargo 1.54.0 -- Rust 1.54.0 -- Rustdoc 1.54.0 +- Cargo 1.55.0 +- Rust 1.55.0 +- Rustdoc 1.55.0 - Rustup 1.24.3 #### Packages - bindgen 0.59.1 -- cargo-audit 0.14.1 +- cargo-audit 0.15.2 - cargo-outdated v0.9.17 - cbindgen 0.20.0 -- Clippy 0.1.54 +- Clippy 0.1.55 - Rustfmt 1.4.37 ### Browsers and webdrivers -- Google Chrome 93.0.4577.63 -- Chrome Driver 93.0.4577.15 -- Microsoft Edge 93.0.961.38 -- Microsoft Edge Driver 92.0.902.84 -- Mozilla Firefox 91.0.2 +- Google Chrome 93.0.4577.82 +- Chrome Driver 93.0.4577.63 +- Microsoft Edge 93.0.961.47 +- Microsoft Edge Driver 93.0.961.47 +- Mozilla Firefox 92.0 - Gecko Driver 0.29.1 - IE Driver 3.150.1.1 @@ -123,11 +122,11 @@ | GECKOWEBDRIVER | C:\SeleniumWebDrivers\GeckoDriver | ### Java -| Version | Vendor | Environment Variable | -| ------------------- | ------------- | -------------------- | -| 8.0.302+8 (default) | Adopt OpenJDK | JAVA_HOME_8_X64 | -| 11.0.12+7 | Adopt OpenJDK | JAVA_HOME_11_X64 | -| 13.0.2+8.1 | Adopt OpenJDK | JAVA_HOME_13_X64 | +| Version | Vendor | Environment Variable | +| ------------------- | --------------- | -------------------- | +| 8.0.302+8 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | +| 11.0.12+7 | Eclipse Temurin | JAVA_HOME_11_X64 | +| 13.0.2+8.1 | Adopt OpenJDK | JAVA_HOME_13_X64 | ### Shells | Name | Target | @@ -136,7 +135,7 @@ | msys2bash.cmd | C:\msys64\usr\bin\bash.exe | ### MSYS2 -- Pacman 6.0.0 +- Pacman 6.0.1 ##### Notes: ``` Location: C:\msys64 @@ -150,8 +149,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | 1.13.15 | x64 | GOROOT_1_13_X64 | | 1.14.15 | x64 | GOROOT_1_14_X64 | | 1.15.15 (Default) | x64 | GOROOT_1_15_X64 | -| 1.16.7 | x64 | GOROOT_1_16_X64 | -| 1.17.0 | x64 | GOROOT_1_17_X64 | +| 1.16.8 | x64 | GOROOT_1_16_X64 | +| 1.17.1 | x64 | GOROOT_1_17_X64 | #### Node @@ -214,9 +213,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Database tools -- Azure CosmosDb Emulator 2.14.2.0 +- Azure CosmosDb Emulator 2.14.3.0 - DacFx 15.0.5164.1 -- MySQL 5.7.21.0 +- MySQL 5.7.35.0 - SQLPS 1.0 @@ -224,7 +223,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Name | Version | ConfigFile | ServiceName | ServiceStatus | ListenPort | | ------ | ------- | ------------------------------------- | ----------- | ------------- | ---------- | | Apache | 2.4.48 | C:\tools\Apache24\conf\httpd.conf | Apache | Stopped | 80 | -| Nginx | 1.21.2 | C:\tools\nginx-1.21.2\conf\nginx.conf | nginx | Stopped | 80 | +| Nginx | 1.21.3 | C:\tools\nginx-1.21.3\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2017 | Name | Version | Path | @@ -524,7 +523,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Azure Powershell Modules | Module | Version | Path | | ------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------ | -| Az | 1.0.0.zip
1.6.0.zip
2.3.2.zip
2.6.0.zip
3.1.0.zip
3.5.0.zip
3.8.0.zip
4.3.0.zip
4.4.0.zip
4.7.0.zip
5.5.0.zip
5.9.0.zip
6.1.0 | C:\Modules\az_\ | +| Az | 1.0.0.zip
1.6.0.zip
2.3.2.zip
2.6.0.zip
3.1.0.zip
3.5.0.zip
3.8.0.zip
4.3.0.zip
4.4.0.zip
4.7.0.zip
5.5.0.zip
5.9.0.zip
6.4.0 | C:\Modules\az_\ | | Azure | 2.1.0 [Installed]
3.8.0.zip
4.2.1.zip
5.1.1.zip
5.3.0 | C:\Modules\azure_\ | | AzureRM | 2.1.0 [Installed]
3.8.0.zip
4.2.1.zip
5.1.1.zip
6.7.0.zip
6.13.1 | C:\Modules\azurerm_\ | ``` @@ -557,7 +556,7 @@ All other versions are saved but not installed. | Google APIs | addon-google_apis-google-21
addon-google_apis-google-22
addon-google_apis-google-23
addon-google_apis-google-24 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | a
a
21.4.7075529
22.1.7171670 | +| NDK | 21.4.7075529
22.1.7171670 | | SDK Patch Applier v4 | 1 | #### Environment variables From 5a73d60641e18afcc288b71bad8eb0b071fb5d35 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Thu, 16 Sep 2021 15:58:40 +0300 Subject: [PATCH 0539/3485] [Windows] win2022: enable use of test-signed code (#4098) --- images/win/scripts/Tests/WindowsFeatures.Tests.ps1 | 6 ++++++ images/win/windows2022.json | 10 +++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/images/win/scripts/Tests/WindowsFeatures.Tests.ps1 b/images/win/scripts/Tests/WindowsFeatures.Tests.ps1 index d4a811d76223..9f0684ba625d 100644 --- a/images/win/scripts/Tests/WindowsFeatures.Tests.ps1 +++ b/images/win/scripts/Tests/WindowsFeatures.Tests.ps1 @@ -50,3 +50,9 @@ Describe "GDIProcessHandleQuota" { (Get-ItemProperty $regPath32).GDIProcessHandleQuota | Should -BeExactly 20000 } } + +Describe "Test Signed Drivers" -Skip:(-not (Test-IsWin22)) { + It "bcdedit testsigning should be Yes"{ + "$(bcdedit)" | Should -Match "testsigning\s+Yes" + } +} diff --git a/images/win/windows2022.json b/images/win/windows2022.json index 64b8680f8e7d..2c92c3923fe4 100644 --- a/images/win/windows2022.json +++ b/images/win/windows2022.json @@ -110,6 +110,14 @@ "if (-not ((net localgroup Administrators) -contains '{{user `install_user`}}')) { exit 1 }" ] }, + { + "type": "powershell", + "inline": [ + "bcdedit.exe /set TESTSIGNING ON" + ], + "elevated_user": "{{user `install_user`}}", + "elevated_password": "{{user `install_password`}}" + }, { "type": "powershell", "environment_vars": [ @@ -143,7 +151,7 @@ }, { "type": "windows-restart", - "restart_timeout": "10m" + "restart_timeout": "30m" }, { "type": "powershell", From b913c5ba8707a668ae8c82fbff78a3d50ca9b855 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 16 Sep 2021 13:22:23 +0000 Subject: [PATCH 0540/3485] Updating readme file for win19 version 20210914.2 (#4091) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/win/Windows2019-Readme.md | 68 ++++++++++++++++---------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index 609c0ff3c4a6..663ee9b2c906 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -1,11 +1,10 @@ | Announcements | |-| | [(Public Beta) Windows Server 2022 with Visual Studio 2022 is now available](https://github.com/actions/virtual-environments/issues/3949) | -| [[macOS, Windows] .NET SDK pre-installation policy will be changed on September, 6](https://github.com/actions/virtual-environments/issues/3809) | *** # Microsoft Windows Server 2019 Datacenter - OS Version: 10.0.17763 Build 2114 -- Image Version: 20210907.4 +- Image Version: 20210914.2 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -24,7 +23,7 @@ ### Package Management - Chocolatey 0.11.1 -- Composer 2.1.6 +- Composer 2.1.7 - Helm 3.6.3 - Miniconda 4.10.3 (pre-installed on the image but not added to PATH) - NPM 6.14.15 @@ -32,7 +31,7 @@ - pip 21.2.4 (python 3.7) - Pipx 0.16.4 - RubyGems 2.7.6.3 -- Vcpkg (build from master \<642d1cc>) +- Vcpkg (build from master \) - Yarn 1.22.11 #### Environment variables @@ -56,13 +55,13 @@ - Bicep 0.4.613 - Cabal 3.4.0.0 - CMake 3.21.2 -- CodeQL Action Bundle 2.6.0 -- Docker 20.10.6 +- CodeQL Action Bundle 2.6.1 +- Docker 20.10.7 - Docker-compose 1.29.2 - ghc 9.0.1 - Git 2.33.0 - Git LFS 2.13.3 -- Google Cloud SDK 355.0.0 +- Google Cloud SDK 357.0.0 - GVFS 1.0.21085.9 - InnoSetup 6.2.0 - jq 1.6 @@ -74,7 +73,7 @@ - NSIS v3.06.1 - OpenSSL 1.1.1 - Packer 1.7.4 -- Pulumi v3.11.0 +- Pulumi v3.12.0 - R 4.1.1 - Stack 2.7.3 - Subversion (SVN) 1.14.1 @@ -86,8 +85,8 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.90 -- AWS CLI 2.2.35 -- AWS SAM CLI 1.30.0 +- AWS CLI 2.2.37 +- AWS SAM CLI 1.31.0 - AWS Session Manager CLI 1.2.245.0 - Azure CLI 2.28.0 - Azure DevOps CLI extension 0.20.0 @@ -96,24 +95,24 @@ - Hub CLI 2.14.2 ### Rust Tools -- Cargo 1.54.0 -- Rust 1.54.0 -- Rustdoc 1.54.0 +- Cargo 1.55.0 +- Rust 1.55.0 +- Rustdoc 1.55.0 - Rustup 1.24.3 #### Packages - bindgen 0.59.1 -- cargo-audit 0.14.1 +- cargo-audit 0.15.2 - cargo-outdated v0.9.17 - cbindgen 0.20.0 -- Clippy 0.1.54 +- Clippy 0.1.55 - Rustfmt 1.4.37 ### Browsers and webdrivers -- Google Chrome 93.0.4577.63 -- Chrome Driver 93.0.4577.15 -- Microsoft Edge 93.0.961.38 -- Microsoft Edge Driver 92.0.902.84 +- Google Chrome 93.0.4577.82 +- Chrome Driver 93.0.4577.63 +- Microsoft Edge 93.0.961.47 +- Microsoft Edge Driver 93.0.961.47 - Mozilla Firefox 92.0 - Gecko Driver 0.29.1 - IE Driver 3.150.1.1 @@ -126,11 +125,11 @@ | GECKOWEBDRIVER | C:\SeleniumWebDrivers\GeckoDriver | ### Java -| Version | Vendor | Environment Variable | -| ------------------- | ------------- | -------------------- | -| 8.0.302+8 (default) | Adopt OpenJDK | JAVA_HOME_8_X64 | -| 11.0.12+7 | Adopt OpenJDK | JAVA_HOME_11_X64 | -| 13.0.2+8.1 | Adopt OpenJDK | JAVA_HOME_13_X64 | +| Version | Vendor | Environment Variable | +| ------------------- | --------------- | -------------------- | +| 8.0.302+8 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | +| 11.0.12+7 | Eclipse Temurin | JAVA_HOME_11_X64 | +| 13.0.2+8.1 | Adopt OpenJDK | JAVA_HOME_13_X64 | ### Shells | Name | Target | @@ -140,7 +139,7 @@ | wslbash.exe | C:\Windows\System32\bash.exe | ### MSYS2 -- Pacman 6.0.0 +- Pacman 6.0.1 ##### Notes: ``` Location: C:\msys64 @@ -156,8 +155,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | 1.13.15 | x64 | GOROOT_1_13_X64 | | 1.14.15 | x64 | GOROOT_1_14_X64 | | 1.15.15 (Default) | x64 | GOROOT_1_15_X64 | -| 1.16.7 | x64 | GOROOT_1_16_X64 | -| 1.17.0 | x64 | GOROOT_1_17_X64 | +| 1.16.8 | x64 | GOROOT_1_16_X64 | +| 1.17.1 | x64 | GOROOT_1_17_X64 | #### Node @@ -220,9 +219,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Database tools -- Azure CosmosDb Emulator 2.14.2.0 +- Azure CosmosDb Emulator 2.14.3.0 - DacFx 15.0.5164.1 -- MySQL 5.7.21.0 +- MySQL 5.7.35.0 - SQLPS 1.0 @@ -256,7 +255,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Component.Microsoft.VisualStudio.Web.AzureFunctions | 16.10.31205.252 | | Component.Microsoft.Web.LibraryManager | 16.10.31205.180 | | Component.Microsoft.WebTools.BrowserLink.WebLivePreview | 0.7.22.39845 | -| Component.Microsoft.Windows.DriverKit | 10.0.20324.0 | +| Component.Microsoft.Windows.DriverKit | 10.0.21381.0 | | Component.OpenJDK | 16.10.31303.311 | | Component.UnityEngine.x64 | 16.10.31205.252 | | Component.Unreal | 16.1.28810.153 | @@ -465,8 +464,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | ProBITools.MicrosoftReportProjectsforVisualStudio | 2.6.11 | | SSIS.SqlServerIntegrationServicesProjects | 3.15 | | VisualStudioClient.MicrosoftVisualStudio2017InstallerProjects | 1.0.0 | -| Windows Driver Kit | 10.0.20324.0 | -| Windows Driver Kit Visual Studio Extension | 10.1.20348.1 | +| Windows Driver Kit | 10.0.21381.0 | +| Windows Driver Kit Visual Studio Extension | 10.1.22000.1 | +| Windows Software Development Kit Extension | 10.1.22000.1 | | WIX Toolset | 3.11.4516 | | WIX Toolset Studio 2019 Extension | 1.0.0.4 | @@ -517,7 +517,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Azure Powershell Modules | Module | Version | Path | | ------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------ | -| Az | 1.0.0.zip
1.6.0.zip
2.3.2.zip
2.6.0.zip
3.1.0.zip
3.5.0.zip
3.8.0.zip
4.3.0.zip
4.4.0.zip
4.7.0.zip
5.5.0.zip
5.9.0.zip
6.1.0 | C:\Modules\az_\ | +| Az | 1.0.0.zip
1.6.0.zip
2.3.2.zip
2.6.0.zip
3.1.0.zip
3.5.0.zip
3.8.0.zip
4.3.0.zip
4.4.0.zip
4.7.0.zip
5.5.0.zip
5.9.0.zip
6.4.0 | C:\Modules\az_\ | | Azure | 2.1.0 [Installed]
3.8.0.zip
4.2.1.zip
5.1.1.zip
5.3.0 | C:\Modules\azure_\ | | AzureRM | 2.1.0 [Installed]
3.8.0.zip
4.2.1.zip
5.1.1.zip
6.7.0.zip
6.13.1 | C:\Modules\azurerm_\ | ``` @@ -550,7 +550,7 @@ All other versions are saved but not installed. | Google APIs | addon-google_apis-google-21
addon-google_apis-google-22
addon-google_apis-google-23
addon-google_apis-google-24 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | a
a
21.4.7075529
22.1.7171670 | +| NDK | 21.4.7075529
22.1.7171670 | | SDK Patch Applier v4 | 1 | #### Environment variables From c630409d0ea574b21eab2b6987b128d6ccc9e139 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 16 Sep 2021 17:06:04 +0000 Subject: [PATCH 0541/3485] Updating readme file for ubuntu18 version 20210913.1 (#4067) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/linux/Ubuntu1804-README.md | 98 ++++++++++++++++--------------- 1 file changed, 51 insertions(+), 47 deletions(-) diff --git a/images/linux/Ubuntu1804-README.md b/images/linux/Ubuntu1804-README.md index 4fa397f925c7..45708aa44831 100644 --- a/images/linux/Ubuntu1804-README.md +++ b/images/linux/Ubuntu1804-README.md @@ -1,10 +1,11 @@ | Announcements | |-| +| [[Ubuntu] Alpine 3.11 docker image will be removed on September, 20](https://github.com/actions/virtual-environments/issues/4042) | | [Ubuntu 16.04 environment will be removed on September 20, 2021](https://github.com/actions/virtual-environments/issues/3287) | *** # Ubuntu 18.04.5 LTS -- Linux kernel version: 5.4.0-1056-azure -- Image Version: 20210906.1 +- Linux kernel version: 5.4.0-1058-azure +- Image Version: 20210913.1 ## Installed Software ### Language and Runtime @@ -24,19 +25,19 @@ - Python 2.7.17 - Python3 3.6.9 - Ruby 2.5.1p57 -- Swift 5.4.2 +- Swift 5.4.3 ### Package Management - cpan 1.64 - Helm 3.6.3 -- Homebrew 3.2.10 +- Homebrew 3.2.11 - Miniconda 4.10.3 - Npm 6.14.15 - Pip 9.0.1 - Pip3 9.0.1 - Pipx 0.16.4 - RubyGems 2.7.6 -- Vcpkg (build from master \<71422c6>) +- Vcpkg (build from master \) - Yarn 1.22.11 #### Environment variables @@ -60,7 +61,7 @@ - Bicep 0.4.613 - Buildah 1.19.6 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - CMake 3.21.2 -- CodeQL Action Bundle 2.6.0 +- CodeQL Action Bundle 2.6.1 - Docker Compose 1.29.2 - Docker-Buildx 0.6.0 - Docker-Moby Client 20.10.8+azure @@ -70,7 +71,7 @@ - Git-ftp 1.3.1 - Haveged 1.9.1 - Heroku 7.59.0 -- HHVM (HipHop VM) 4.124.0 +- HHVM (HipHop VM) 4.126.0 - jq 1.5 - Kind 0.11.1 - Kubectl 1.22.1 @@ -79,13 +80,13 @@ - MediaInfo 17.12 - Mercurial 4.5.3 - Minikube 1.23.0 -- Newman 5.2.4 +- Newman 5.3.0 - nvm 0.38.0 - OpenSSL 1.1.1 11 Sep 2018 - Packer 1.7.4 - PhantomJS 2.1.1 - Podman 3.0.1 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- Pulumi 3.11.0 +- Pulumi 3.12.0 - R 4.1.1 - Skopeo 1.2.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 @@ -97,16 +98,16 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.90 -- AWS CLI 1.20.36 +- AWS CLI 1.20.40 - AWS CLI Session manager plugin 1.2.245.0 -- AWS SAM CLI 1.30.0 -- Azure CLI (azure-cli) 2.27.2 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) +- AWS SAM CLI 1.31.0 +- Azure CLI (azure-cli) 2.28.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.20.0 - GitHub CLI 2.0.0 -- Google Cloud SDK 355.0.0 (apt source repository: https://packages.cloud.google.com/apt) +- Google Cloud SDK 356.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 6.8.5 -- OpenShift CLI 4.8.9 +- Netlify CLI 6.8.12 +- OpenShift CLI 4.8.10 - ORAS CLI 0.12.0 - Vercel CLI 23.1.2 @@ -128,28 +129,28 @@ ``` ### Haskell - Cabal 3.4.0.0 -- GHC 9.0.1 (apt source repository: ppa:hvr/ghc) +- GHC 9.0.1 - GHCup 0.1.16.2 - Stack 2.7.3 ### Rust Tools -- Cargo 1.54.0 -- Rust 1.54.0 -- Rustdoc 1.54.0 +- Cargo 1.55.0 +- Rust 1.55.0 +- Rustdoc 1.55.0 - Rustup 1.24.3 #### Packages - Bindgen 0.59.1 - Cargo audit 0.14.1 -- Cargo clippy 0.1.54 +- Cargo clippy 0.1.55 - Cargo outdated 0.9.17 - Cbindgen 0.20.0 - Rustfmt 1.4.37 ### Browsers and Drivers - Google Chrome 93.0.4577.63 -- ChromeDriver 93.0.4577.15 -- Mozilla Firefox 91.0.2 +- ChromeDriver 93.0.4577.63 +- Mozilla Firefox 92.0 - Geckodriver 0.29.1 - Chromium 93.0.4577.0 @@ -183,8 +184,8 @@ - 1.13.15 - 1.14.15 - 1.15.15 -- 1.16.7 -- 1.17.0 +- 1.16.8 +- 1.17.1 #### Node.js - 10.24.1 @@ -198,10 +199,10 @@ #### Python - 2.7.18 - 3.5.10 -- 3.6.14 -- 3.7.11 +- 3.6.15 +- 3.7.12 - 3.8.11 -- 3.9.6 +- 3.9.7 #### Ruby - 2.4.10 @@ -216,8 +217,8 @@ | GOROOT_1_13_X64 | /opt/hostedtoolcache/go/1.13.15/x64 | x64 | | GOROOT_1_14_X64 | /opt/hostedtoolcache/go/1.14.15/x64 | x64 | | GOROOT_1_15_X64 | /opt/hostedtoolcache/go/1.15.15/x64 | x64 | -| GOROOT_1_16_X64 | /opt/hostedtoolcache/go/1.16.7/x64 | x64 | -| GOROOT_1_17_X64 | /opt/hostedtoolcache/go/1.17.0/x64 | x64 | +| GOROOT_1_16_X64 | /opt/hostedtoolcache/go/1.16.8/x64 | x64 | +| GOROOT_1_17_X64 | /opt/hostedtoolcache/go/1.17.1/x64 | x64 | ### PowerShell Tools - PowerShell 7.1.4 @@ -263,24 +264,27 @@ | ANDROID_SDK_ROOT | /usr/local/lib/android/sdk | ### Cached Docker images -| Repository:Tag | Digest | Created | -| ---------------------- | ------------------------------------------------------------------------ | ---------- | -| alpine:3.11 | sha256:e457c945f4be075a9e5365c6628e552fcd15551f0bc1c1fc2ea0f2227a524210 | 2021-08-31 | -| alpine:3.12 | sha256:a296b4c6f6ee2b88f095b61e95c7ef4f51ba25598835b4978c9256d8c8ace48a | 2021-08-31 | -| alpine:3.13 | sha256:2582893dec6f12fd499d3a709477f2c0c0c1dfcd28024c93f1f0626b9e3540c8 | 2021-08-31 | -| buildpack-deps:buster | sha256:a254f0d1ab14e6f05992f64e71cbc6f22ab8a657b0e962bb8d0c7a1a3b2ed6d0 | 2021-09-03 | -| buildpack-deps:stretch | sha256:b4e9fcbcec4f927938983a50cb12d460a1d0c809925bbadb5e9c378cb82c53cb | 2021-09-03 | -| debian:10 | sha256:cdb5ae50fedfda0bc2f9e4d303683ab6096c84db9e97b0bbfea0653549aeb3f8 | 2021-09-03 | -| debian:9 | sha256:74ca5bc3c547829123c1aaf69151bc8a50b9d8b006997e206ce0ef631ad3d0af | 2021-09-03 | -| node:10 | sha256:59531d2835edd5161c8f9512f9e095b1836f7a1fcb0ab73e005ec46047384911 | 2021-04-10 | -| node:10-alpine | sha256:dc98dac24efd4254f75976c40bce46944697a110d06ce7fa47e7268470cf2e28 | 2021-04-14 | -| node:12 | sha256:a8f4083bfbffe6d9f2e568efb6c83f8fee6da9f8496853dbf4fcf6e84b1377a6 | 2021-09-03 | -| node:12-alpine | sha256:1ea5900145028957ec0e7b7e590ac677797fa8962ccec4e73188092f7bc14da5 | 2021-08-31 | -| node:14 | sha256:4164d987bfceb62b17db4938d535dd31fc50d6ee0b4e00ac7a774f82af408d48 | 2021-09-03 | -| node:14-alpine | sha256:8c94a0291133e16b92be5c667e0bc35930940dfa7be544fb142e25f8e4510a45 | 2021-08-31 | -| ubuntu:16.04 | sha256:454054f5bbd571b088db25b662099c6c7b3f0cb78536a2077d54adc48f00cd68 | 2021-08-31 | -| ubuntu:18.04 | sha256:9bc830af2bef73276515a29aa896eedfa7bdf4bdbc5c1063b4c457a4bbb8cd79 | 2021-08-31 | -| ubuntu:20.04 | sha256:9d6a8699fb5c9c39cf08a0871bd6219f0400981c570894cd8cbea30d3424a31f | 2021-08-31 | +| Repository:Tag | Digest | Created | +| ----------------------- | ------------------------------------------------------------------------ | ---------- | +| alpine:3.11 | sha256:e457c945f4be075a9e5365c6628e552fcd15551f0bc1c1fc2ea0f2227a524210 | 2021-08-31 | +| alpine:3.12 | sha256:a296b4c6f6ee2b88f095b61e95c7ef4f51ba25598835b4978c9256d8c8ace48a | 2021-08-31 | +| alpine:3.13 | sha256:2582893dec6f12fd499d3a709477f2c0c0c1dfcd28024c93f1f0626b9e3540c8 | 2021-08-31 | +| alpine:3.14 | sha256:e1c082e3d3c45cccac829840a25941e679c25d438cc8412c2fa221cf1a824e6a | 2021-08-27 | +| buildpack-deps:bullseye | sha256:97aee9e88aef0054c2c01ab31f3d6620bebaaa864656582d99e80164e4454176 | 2021-09-03 | +| buildpack-deps:buster | sha256:a254f0d1ab14e6f05992f64e71cbc6f22ab8a657b0e962bb8d0c7a1a3b2ed6d0 | 2021-09-03 | +| buildpack-deps:stretch | sha256:b4e9fcbcec4f927938983a50cb12d460a1d0c809925bbadb5e9c378cb82c53cb | 2021-09-03 | +| debian:10 | sha256:cdb5ae50fedfda0bc2f9e4d303683ab6096c84db9e97b0bbfea0653549aeb3f8 | 2021-09-03 | +| debian:11 | sha256:08db48d59c0a91afb802ebafc921be3154e200c452e4d0b19634b426b03e0e25 | 2021-09-03 | +| debian:9 | sha256:74ca5bc3c547829123c1aaf69151bc8a50b9d8b006997e206ce0ef631ad3d0af | 2021-09-03 | +| node:10 | sha256:59531d2835edd5161c8f9512f9e095b1836f7a1fcb0ab73e005ec46047384911 | 2021-04-10 | +| node:10-alpine | sha256:dc98dac24efd4254f75976c40bce46944697a110d06ce7fa47e7268470cf2e28 | 2021-04-14 | +| node:12 | sha256:a8f4083bfbffe6d9f2e568efb6c83f8fee6da9f8496853dbf4fcf6e84b1377a6 | 2021-09-03 | +| node:12-alpine | sha256:1ea5900145028957ec0e7b7e590ac677797fa8962ccec4e73188092f7bc14da5 | 2021-08-31 | +| node:14 | sha256:4164d987bfceb62b17db4938d535dd31fc50d6ee0b4e00ac7a774f82af408d48 | 2021-09-03 | +| node:14-alpine | sha256:8c94a0291133e16b92be5c667e0bc35930940dfa7be544fb142e25f8e4510a45 | 2021-08-31 | +| ubuntu:16.04 | sha256:454054f5bbd571b088db25b662099c6c7b3f0cb78536a2077d54adc48f00cd68 | 2021-08-31 | +| ubuntu:18.04 | sha256:9bc830af2bef73276515a29aa896eedfa7bdf4bdbc5c1063b4c457a4bbb8cd79 | 2021-08-31 | +| ubuntu:20.04 | sha256:9d6a8699fb5c9c39cf08a0871bd6219f0400981c570894cd8cbea30d3424a31f | 2021-08-31 | ### Installed apt packages | Name | Version | From 243bf51a684cc162b3285ecf3e7a7045d718ba83 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 16 Sep 2021 17:46:29 +0000 Subject: [PATCH 0542/3485] Updating readme file for ubuntu20 version 20210913.1 (#4068) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/linux/Ubuntu2004-README.md | 98 ++++++++++++++++--------------- 1 file changed, 51 insertions(+), 47 deletions(-) diff --git a/images/linux/Ubuntu2004-README.md b/images/linux/Ubuntu2004-README.md index e2623003d716..428500ef6340 100644 --- a/images/linux/Ubuntu2004-README.md +++ b/images/linux/Ubuntu2004-README.md @@ -1,10 +1,11 @@ | Announcements | |-| +| [[Ubuntu] Alpine 3.11 docker image will be removed on September, 20](https://github.com/actions/virtual-environments/issues/4042) | | [Ubuntu 16.04 environment will be removed on September 20, 2021](https://github.com/actions/virtual-environments/issues/3287) | *** # Ubuntu 20.04.3 LTS -- Linux kernel version: 5.8.0-1040-azure -- Image Version: 20210906.1 +- Linux kernel version: 5.8.0-1041-azure +- Image Version: 20210913.1 ## Installed Software ### Language and Runtime @@ -24,19 +25,19 @@ - Python 3.8.10 - Python3 3.8.10 - Ruby 2.7.0p0 -- Swift 5.4.2 +- Swift 5.4.3 ### Package Management - cpan 1.64 - Helm 3.6.3 -- Homebrew 3.2.10 +- Homebrew 3.2.11 - Miniconda 4.10.3 - Npm 6.14.15 - Pip 20.0.2 - Pip3 20.0.2 - Pipx 0.16.4 - RubyGems 3.1.2 -- Vcpkg (build from master \<71422c6>) +- Vcpkg (build from master \) - Yarn 1.22.11 #### Environment variables @@ -61,7 +62,7 @@ - Bicep 0.4.613 - Buildah 1.21.3 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - CMake 3.21.2 -- CodeQL Action Bundle 2.6.0 +- CodeQL Action Bundle 2.6.1 - Docker Compose 1.29.2 - Docker-Buildx 0.6.3 - Docker-Moby Client 20.10.8+azure @@ -72,7 +73,7 @@ - Git-ftp 1.6.0 - Haveged 1.9.1 - Heroku 7.59.0 -- HHVM (HipHop VM) 4.124.0 +- HHVM (HipHop VM) 4.126.0 - jq 1.6 - Kind 0.11.1 - Kubectl 1.22.1 @@ -81,13 +82,13 @@ - MediaInfo 19.09 - Mercurial 5.3.1 - Minikube 1.23.0 -- Newman 5.2.4 +- Newman 5.3.0 - nvm 0.38.0 - OpenSSL 1.1.1f 31 Mar 2020 - Packer 1.7.4 - PhantomJS 2.1.1 - Podman 3.2.3 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- Pulumi 3.11.0 +- Pulumi 3.12.0 - R 4.1.1 - Skopeo 1.3.0 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 @@ -99,16 +100,16 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.90 -- AWS CLI 2.2.35 +- AWS CLI 2.2.37 - AWS CLI Session manager plugin 1.2.245.0 -- AWS SAM CLI 1.30.0 -- Azure CLI (azure-cli) 2.27.2 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) +- AWS SAM CLI 1.31.0 +- Azure CLI (azure-cli) 2.28.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.20.0 - GitHub CLI 2.0.0 -- Google Cloud SDK 355.0.0 (apt source repository: https://packages.cloud.google.com/apt) +- Google Cloud SDK 356.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 6.8.5 -- OpenShift CLI 4.8.9 +- Netlify CLI 6.8.12 +- OpenShift CLI 4.8.10 - ORAS CLI 0.12.0 - Vercel CLI 23.1.2 @@ -134,28 +135,28 @@ ``` ### Haskell - Cabal 3.4.0.0 -- GHC 9.0.1 (apt source repository: ppa:hvr/ghc) +- GHC 9.0.1 - GHCup 0.1.16.2 - Stack 2.7.3 ### Rust Tools -- Cargo 1.54.0 -- Rust 1.54.0 -- Rustdoc 1.54.0 +- Cargo 1.55.0 +- Rust 1.55.0 +- Rustdoc 1.55.0 - Rustup 1.24.3 #### Packages - Bindgen 0.59.1 - Cargo audit 0.14.1 -- Cargo clippy 0.1.54 +- Cargo clippy 0.1.55 - Cargo outdated 0.9.17 - Cbindgen 0.20.0 - Rustfmt 1.4.37 ### Browsers and Drivers - Google Chrome 93.0.4577.63 -- ChromeDriver 93.0.4577.15 -- Mozilla Firefox 91.0.2 +- ChromeDriver 93.0.4577.63 +- Mozilla Firefox 92.0 - Geckodriver 0.29.1 - Chromium 93.0.4577.0 @@ -188,8 +189,8 @@ #### Go - 1.14.15 - 1.15.15 -- 1.16.7 -- 1.17.0 +- 1.16.8 +- 1.17.1 #### Node.js - 10.24.1 @@ -204,10 +205,10 @@ #### Python - 2.7.18 - 3.5.10 -- 3.6.14 -- 3.7.11 +- 3.6.15 +- 3.7.12 - 3.8.11 -- 3.9.6 +- 3.9.7 #### Ruby - 2.5.9 @@ -220,8 +221,8 @@ | --------------- | ----------------------------------- | ------------ | | GOROOT_1_14_X64 | /opt/hostedtoolcache/go/1.14.15/x64 | x64 | | GOROOT_1_15_X64 | /opt/hostedtoolcache/go/1.15.15/x64 | x64 | -| GOROOT_1_16_X64 | /opt/hostedtoolcache/go/1.16.7/x64 | x64 | -| GOROOT_1_17_X64 | /opt/hostedtoolcache/go/1.17.0/x64 | x64 | +| GOROOT_1_16_X64 | /opt/hostedtoolcache/go/1.16.8/x64 | x64 | +| GOROOT_1_17_X64 | /opt/hostedtoolcache/go/1.17.1/x64 | x64 | ### PowerShell Tools - PowerShell 7.1.4 @@ -269,24 +270,27 @@ | ANDROID_SDK_ROOT | /usr/local/lib/android/sdk | ### Cached Docker images -| Repository:Tag | Digest | Created | -| ---------------------- | ------------------------------------------------------------------------ | ---------- | -| alpine:3.11 | sha256:e457c945f4be075a9e5365c6628e552fcd15551f0bc1c1fc2ea0f2227a524210 | 2021-08-31 | -| alpine:3.12 | sha256:a296b4c6f6ee2b88f095b61e95c7ef4f51ba25598835b4978c9256d8c8ace48a | 2021-08-31 | -| alpine:3.13 | sha256:2582893dec6f12fd499d3a709477f2c0c0c1dfcd28024c93f1f0626b9e3540c8 | 2021-08-31 | -| buildpack-deps:buster | sha256:a254f0d1ab14e6f05992f64e71cbc6f22ab8a657b0e962bb8d0c7a1a3b2ed6d0 | 2021-09-03 | -| buildpack-deps:stretch | sha256:b4e9fcbcec4f927938983a50cb12d460a1d0c809925bbadb5e9c378cb82c53cb | 2021-09-03 | -| debian:10 | sha256:cdb5ae50fedfda0bc2f9e4d303683ab6096c84db9e97b0bbfea0653549aeb3f8 | 2021-09-03 | -| debian:9 | sha256:74ca5bc3c547829123c1aaf69151bc8a50b9d8b006997e206ce0ef631ad3d0af | 2021-09-03 | -| node:10 | sha256:59531d2835edd5161c8f9512f9e095b1836f7a1fcb0ab73e005ec46047384911 | 2021-04-10 | -| node:10-alpine | sha256:dc98dac24efd4254f75976c40bce46944697a110d06ce7fa47e7268470cf2e28 | 2021-04-14 | -| node:12 | sha256:a8f4083bfbffe6d9f2e568efb6c83f8fee6da9f8496853dbf4fcf6e84b1377a6 | 2021-09-03 | -| node:12-alpine | sha256:1ea5900145028957ec0e7b7e590ac677797fa8962ccec4e73188092f7bc14da5 | 2021-08-31 | -| node:14 | sha256:4164d987bfceb62b17db4938d535dd31fc50d6ee0b4e00ac7a774f82af408d48 | 2021-09-03 | -| node:14-alpine | sha256:8c94a0291133e16b92be5c667e0bc35930940dfa7be544fb142e25f8e4510a45 | 2021-08-31 | -| ubuntu:16.04 | sha256:454054f5bbd571b088db25b662099c6c7b3f0cb78536a2077d54adc48f00cd68 | 2021-08-31 | -| ubuntu:18.04 | sha256:9bc830af2bef73276515a29aa896eedfa7bdf4bdbc5c1063b4c457a4bbb8cd79 | 2021-08-31 | -| ubuntu:20.04 | sha256:9d6a8699fb5c9c39cf08a0871bd6219f0400981c570894cd8cbea30d3424a31f | 2021-08-31 | +| Repository:Tag | Digest | Created | +| ----------------------- | ------------------------------------------------------------------------ | ---------- | +| alpine:3.11 | sha256:e457c945f4be075a9e5365c6628e552fcd15551f0bc1c1fc2ea0f2227a524210 | 2021-08-31 | +| alpine:3.12 | sha256:a296b4c6f6ee2b88f095b61e95c7ef4f51ba25598835b4978c9256d8c8ace48a | 2021-08-31 | +| alpine:3.13 | sha256:2582893dec6f12fd499d3a709477f2c0c0c1dfcd28024c93f1f0626b9e3540c8 | 2021-08-31 | +| alpine:3.14 | sha256:e1c082e3d3c45cccac829840a25941e679c25d438cc8412c2fa221cf1a824e6a | 2021-08-27 | +| buildpack-deps:bullseye | sha256:97aee9e88aef0054c2c01ab31f3d6620bebaaa864656582d99e80164e4454176 | 2021-09-03 | +| buildpack-deps:buster | sha256:a254f0d1ab14e6f05992f64e71cbc6f22ab8a657b0e962bb8d0c7a1a3b2ed6d0 | 2021-09-03 | +| buildpack-deps:stretch | sha256:b4e9fcbcec4f927938983a50cb12d460a1d0c809925bbadb5e9c378cb82c53cb | 2021-09-03 | +| debian:10 | sha256:cdb5ae50fedfda0bc2f9e4d303683ab6096c84db9e97b0bbfea0653549aeb3f8 | 2021-09-03 | +| debian:11 | sha256:08db48d59c0a91afb802ebafc921be3154e200c452e4d0b19634b426b03e0e25 | 2021-09-03 | +| debian:9 | sha256:74ca5bc3c547829123c1aaf69151bc8a50b9d8b006997e206ce0ef631ad3d0af | 2021-09-03 | +| node:10 | sha256:59531d2835edd5161c8f9512f9e095b1836f7a1fcb0ab73e005ec46047384911 | 2021-04-10 | +| node:10-alpine | sha256:dc98dac24efd4254f75976c40bce46944697a110d06ce7fa47e7268470cf2e28 | 2021-04-14 | +| node:12 | sha256:a8f4083bfbffe6d9f2e568efb6c83f8fee6da9f8496853dbf4fcf6e84b1377a6 | 2021-09-03 | +| node:12-alpine | sha256:1ea5900145028957ec0e7b7e590ac677797fa8962ccec4e73188092f7bc14da5 | 2021-08-31 | +| node:14 | sha256:4164d987bfceb62b17db4938d535dd31fc50d6ee0b4e00ac7a774f82af408d48 | 2021-09-03 | +| node:14-alpine | sha256:8c94a0291133e16b92be5c667e0bc35930940dfa7be544fb142e25f8e4510a45 | 2021-08-31 | +| ubuntu:16.04 | sha256:454054f5bbd571b088db25b662099c6c7b3f0cb78536a2077d54adc48f00cd68 | 2021-08-31 | +| ubuntu:18.04 | sha256:9bc830af2bef73276515a29aa896eedfa7bdf4bdbc5c1063b4c457a4bbb8cd79 | 2021-08-31 | +| ubuntu:20.04 | sha256:9d6a8699fb5c9c39cf08a0871bd6219f0400981c570894cd8cbea30d3424a31f | 2021-08-31 | ### Installed apt packages | Name | Version | From 21fd64672f549cb4cbbb6bfdf7ca03f5886ed6c4 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 16 Sep 2021 18:14:17 +0000 Subject: [PATCH 0543/3485] Updating readme file for win22 version 20210914.2 (#4092) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/win/Windows2022-Readme.md | 77 ++++++++++++++++++-------------- 1 file changed, 44 insertions(+), 33 deletions(-) diff --git a/images/win/Windows2022-Readme.md b/images/win/Windows2022-Readme.md index 6ee80ac78ec8..e67462795b31 100644 --- a/images/win/Windows2022-Readme.md +++ b/images/win/Windows2022-Readme.md @@ -1,16 +1,18 @@ | Announcements | |-| | [(Public Beta) Windows Server 2022 with Visual Studio 2022 is now available](https://github.com/actions/virtual-environments/issues/3949) | -| [[macOS, Windows] .NET SDK pre-installation policy will be changed on September, 6](https://github.com/actions/virtual-environments/issues/3809) | *** # Microsoft Windows Server 2022 Datacenter - OS Version: 10.0.20348 Build 169 -- Image Version: 20210907.1 +- Image Version: 20210914.2 + +## Enabled windows optional features +- Windows Subsystem for Linux [WSLv1] ## Installed Software ### Language and Runtime - Bash 4.4.23(1)-release -- Go 1.16.7 +- Go 1.16.8 - Julia 1.6.2 - Kotlin 1.5.20 - Node 14.17.6 @@ -20,14 +22,14 @@ ### Package Management - Chocolatey 0.11.1 -- Composer 2.1.6 +- Composer 2.1.7 - Helm 3.6.3 - NPM 6.14.15 - NuGet 5.11.0.10 - pip 21.2.4 (python 3.9) - Pipx 0.16.4 - RubyGems 3.2.22 -- Vcpkg (build from master \<71422c6>) +- Vcpkg (build from master \) - Yarn 1.22.11 #### Environment variables @@ -49,8 +51,8 @@ - Bicep 0.4.613 - Cabal 3.4.0.0 - CMake 3.21.2 -- CodeQL Action Bundle 2.6.0 -- Docker 20.10.6 +- CodeQL Action Bundle 2.6.1 +- Docker 20.10.7 - Docker-compose 1.29.2 - ghc 9.0.1 - Git 2.33.0 @@ -61,10 +63,10 @@ - Kubectl 1.22.1 - Mercurial 5.0 - Mingw-w64 8.1.0 -- Newman 5.2.4 +- Newman 5.3.0 - OpenSSL 1.1.1 - Packer 1.7.4 -- Pulumi v3.11.0 +- Pulumi v3.12.0 - R 4.1.1 - Stack 2.7.3 - Subversion (SVN) 1.14.1 @@ -76,8 +78,8 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.90 -- AWS CLI 2.2.35 -- AWS SAM CLI 1.30.0 +- AWS CLI 2.2.37 +- AWS SAM CLI 1.31.0 - AWS Session Manager CLI 1.2.245.0 - Azure CLI 2.28.0 - Azure DevOps CLI extension 0.20.0 @@ -85,25 +87,25 @@ - Hub CLI 2.14.2 ### Rust Tools -- Cargo 1.54.0 -- Rust 1.54.0 -- Rustdoc 1.54.0 +- Cargo 1.55.0 +- Rust 1.55.0 +- Rustdoc 1.55.0 - Rustup 1.24.3 #### Packages - bindgen 0.59.1 -- cargo-audit 0.14.1 +- cargo-audit 0.15.2 - cargo-outdated v0.9.17 - cbindgen 0.20.0 -- Clippy 0.1.54 +- Clippy 0.1.55 - Rustfmt 1.4.37 ### Browsers and webdrivers -- Google Chrome 93.0.4577.63 -- Chrome Driver 93.0.4577.15 -- Microsoft Edge 93.0.961.38 -- Microsoft Edge Driver 93.0.961.38 -- Mozilla Firefox 91.0.2 +- Google Chrome 93.0.4577.82 +- Chrome Driver 93.0.4577.63 +- Microsoft Edge 93.0.961.47 +- Microsoft Edge Driver 93.0.961.47 +- Mozilla Firefox 92.0 - Gecko Driver 0.29.1 - IE Driver 3.150.1.1 @@ -115,10 +117,10 @@ | GECKOWEBDRIVER | C:\SeleniumWebDrivers\GeckoDriver | ### Java -| Version | Vendor | Environment Variable | -| ------------------- | ------------- | -------------------- | -| 8.0.302+8 (default) | Adopt OpenJDK | JAVA_HOME_8_X64 | -| 11.0.12+7 | Adopt OpenJDK | JAVA_HOME_11_X64 | +| Version | Vendor | Environment Variable | +| ------------------- | --------------- | -------------------- | +| 8.0.302+8 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | +| 11.0.12+7 | Eclipse Temurin | JAVA_HOME_11_X64 | ### Shells | Name | Target | @@ -128,7 +130,7 @@ | wslbash.exe | C:\Windows\System32\bash.exe | ### MSYS2 -- Pacman 6.0.0 +- Pacman 6.0.1 ##### Notes: ``` Location: C:\msys64 @@ -140,8 +142,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Version | Architecture | Environment Variable | | ------- | ------------ | -------------------- | | 1.15.15 | x64 | GOROOT_1_15_X64 | -| 1.16.7 (Default) | x64 | GOROOT_1_16_X64 | -| 1.17.0 | x64 | GOROOT_1_17_X64 | +| 1.16.8 (Default) | x64 | GOROOT_1_16_X64 | +| 1.17.1 | x64 | GOROOT_1_17_X64 | #### Node @@ -197,9 +199,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Database tools -- Azure CosmosDb Emulator 2.14.2.0 +- Azure CosmosDb Emulator 2.14.3.0 - DacFx 15.0.5164.1 -- MySQL 5.7.21.0 +- MySQL 8.0.26.0 - SQLPS 1.0 @@ -207,7 +209,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Name | Version | ConfigFile | ServiceName | ServiceStatus | ListenPort | | ------ | ------- | ------------------------------------- | ----------- | ------------- | ---------- | | Apache | 2.4.48 | C:\tools\Apache24\conf\httpd.conf | Apache | Stopped | 80 | -| Nginx | 1.21.2 | C:\tools\nginx-1.21.2\conf\nginx.conf | nginx | Stopped | 80 | +| Nginx | 1.21.3 | C:\tools\nginx-1.21.3\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2022 | Name | Version | Path | @@ -413,7 +415,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Azure Powershell Modules | Module | Version | Path | | ------- | ------------------------------------------------------------------------------- | ------------------------------ | -| Az | 6.1.0 | C:\Modules\az_\ | +| Az | 6.4.0 | C:\Modules\az_\ | | Azure | 2.1.0 [Installed]
3.8.0.zip
4.2.1.zip
5.1.1.zip
5.3.0 | C:\Modules\azure_\ | | AzureRM | 2.1.0 [Installed]
3.8.0.zip
4.2.1.zip
5.1.1.zip
6.7.0.zip
6.13.1 | C:\Modules\azurerm_\ | ``` @@ -445,7 +447,7 @@ All other versions are saved but not installed. | CMake | 3.18.1 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | a
a
21.4.7075529
22.1.7171670 | +| NDK | 21.4.7075529
22.1.7171670 | | SDK Patch Applier v4 | 1 | #### Environment variables @@ -458,5 +460,14 @@ All other versions are saved but not installed. | ANDROID_NDK_ROOT | C:\Android\android-sdk\ndk-bundle -> C:\Android\android-sdk\ndk\21.4.7075529 | | ANDROID_SDK_ROOT | C:\Android\android-sdk | +### Cached Docker images +| Repository:Tag | Digest | Created | +| ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2022 | sha256:38857a55ffcfc715fd4f79d1524db88ec0a8fefe11543db42a030424329b0bf6 | 2021-08-18 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2022 | sha256:f449e95b12aa5e1c79681a5dd0dc35c4dcd95a2ca4c4568343b2b87cb6341084 | 2021-08-18 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:a3632ef8d3a55159f006cefd6306b832c67093564b1a89c1ae7e299299b7f175 | 2021-08-18 | +| mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:3df3372895223b44475125ab3553fd39a71d89a896099d463d3216f1e22a3ab0 | 2021-08-09 | +| mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:8f756a7fd4fe963cc7dd2c3ad1597327535da8e8f55a7d1932780934efa87e04 | 2021-08-09 | + From e036d6c4f357ba14ec01745e5479912ee18e0235 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 16 Sep 2021 22:04:49 +0000 Subject: [PATCH 0544/3485] Updating readme file for macOS-10.15 version 20210914.1 (#4088) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/macos/macos-10.15-Readme.md | 72 +++++++++++++++--------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/images/macos/macos-10.15-Readme.md b/images/macos/macos-10.15-Readme.md index 6a070d1c9c09..0d3f342fd6a0 100644 --- a/images/macos/macos-10.15-Readme.md +++ b/images/macos/macos-10.15-Readme.md @@ -1,11 +1,11 @@ | Announcements | |-| -| [[macOS, Windows] .NET SDK pre-installation policy will be changed on September, 6](https://github.com/actions/virtual-environments/issues/3809) | +| [macOS-latest workflows will use macOS-11](https://github.com/actions/virtual-environments/issues/4060) | *** # macOS 10.15 info -- System Version: macOS 10.15.7 (19H1323) +- System Version: macOS 10.15.7 (19H1417) - Kernel Version: Darwin 19.6.0 -- Image Version: 20210905.2 +- Image Version: 20210914.1 ## Installed Software ### Language and Runtime @@ -36,9 +36,9 @@ ### Package Management - Bundler version 2.2.27 - Carthage 0.38.0 -- CocoaPods 1.11.0 +- CocoaPods 1.11.2 - Composer 2.1.6 -- Homebrew 3.2.10 +- Homebrew 3.2.11 - Miniconda 4.10.3 - NPM 6.14.15 - NuGet 5.6.0.6489 @@ -46,7 +46,7 @@ - Pip 21.2.4 (python 3.9) - Pipx 0.16.4 - RubyGems 3.2.27 -- Vcpkg 2021 (build from master \<71422c6>) +- Vcpkg 2021 (build from master \) - Yarn 1.22.5 #### Environment variables @@ -73,14 +73,14 @@ - GitHub CLI: 2.0.0 - GNU parallel 20210822 - GNU Tar 1.34 - available by 'gtar' alias -- GNU Wget 1.21.1 +- GNU Wget 1.21.2 - gpg (GnuPG) 2.3.2 - helm v3.6.3+gd506314 - Hub CLI: 2.14.2 - jq 1.6 - mongo v5.0.2 - mongod v5.0.2 -- Newman 5.2.4 +- Newman 5.3.0 - OpenSSL 1.1.1l 24 Aug 2021 `(/usr/local/opt/openssl -> /usr/local/Cellar/openssl@1.1/1.1.1l)` - Packer 1.7.4 - PostgreSQL 13.4 @@ -96,10 +96,10 @@ ### Tools - Aliyun CLI 3.0.90 - App Center CLI 2.10.0 -- AWS CLI 2.2.35 -- AWS SAM CLI 1.30.0 +- AWS CLI 2.2.37 +- AWS SAM CLI 1.31.0 - AWS Session Manager CLI 1.2.245.0 -- Azure CLI 2.27.2 +- Azure CLI 2.28.0 - Bicep CLI 0.4.613 - Cabal 3.4.0.0 - Cmake 3.21.2 @@ -112,25 +112,25 @@ - Xcode Command Line Tools 12.4.0.0.1.1610135815 ### Linters -- SwiftLint 0.43.1 +- SwiftLint 0.44.0 - yamllint 1.26.3 ### Browsers -- Safari 14.1.2 (15611.3.10.1.5) -- SafariDriver 14.1.2 (15611.3.10.1.5) -- Google Chrome 93.0.4577.63 -- ChromeDriver 92.0.4515.107 -- Microsoft Edge 93.0.961.38 -- MSEdgeDriver 93.0.961.38 -- Mozilla Firefox 91.0.2 +- Safari 14.1.2 (15611.3.10.1.7) +- SafariDriver 14.1.2 (15611.3.10.1.7) +- Google Chrome 93.0.4577.82 +- ChromeDriver 93.0.4577.63 +- Microsoft Edge 93.0.961.47 +- MSEdgeDriver 93.0.961.47 +- Mozilla Firefox 92.0 - geckodriver 0.29.1 #### Environment variables -| Name | Value | -| --------------- | ---------------------------------------------- | -| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/92.0.4515.107 | -| EDGEWEBDRIVER | /usr/local/share/edge_driver | -| GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | +| Name | Value | +| --------------- | --------------------------------------------- | +| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/93.0.4577.63 | +| EDGEWEBDRIVER | /usr/local/share/edge_driver | +| GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | ### Java | Version | Vendor | Environment Variable | @@ -152,10 +152,10 @@ #### Python - 2.7.18 - 3.5.10 -- 3.6.14 -- 3.7.11 -- 3.8.11 -- 3.9.6 +- 3.6.15 +- 3.7.12 +- 3.8.12 +- 3.9.7 #### PyPy - 2.7.18 [PyPy 7.3.5] @@ -171,21 +171,21 @@ - 1.13.15 - 1.14.15 - 1.15.15 -- 1.16.7 -- 1.17.0 +- 1.16.8 +- 1.17.1 ### Rust Tools -- Cargo 1.54.0 -- Rust 1.54.0 -- Rustdoc 1.54.0 +- Cargo 1.55.0 +- Rust 1.55.0 +- Rustdoc 1.55.0 - Rustup 1.24.3 #### Packages - Bindgen 0.59.1 -- Cargo-audit 0.14.1 +- Cargo-audit 0.15.2 - Cargo-outdated v0.9.17 - Cbindgen 0.20.0 -- Clippy 0.1.54 +- Clippy 0.1.55 - Rustfmt 1.4.37-stable ### PowerShell Tools @@ -203,7 +203,7 @@ | Name | Version | ConfigFile | ServiceStatus | ListenPort | | ----- | ------- | ------------------------------- | ------------- | ---------- | | httpd | 2.4.48 | /usr/local/etc/httpd/httpd.conf | stopped | 80 | -| nginx | 1.21.2 | /usr/local/etc/nginx/nginx.conf | stopped | 80 | +| nginx | 1.21.3 | /usr/local/etc/nginx/nginx.conf | stopped | 80 | ### Xamarin #### Visual Studio for Mac From 9fe940e8a3cb67b6ecf0dbbcc9cb7efcc68aa008 Mon Sep 17 00:00:00 2001 From: MaksimZhukov <46996400+MaksimZhukov@users.noreply.github.com> Date: Sat, 18 Sep 2021 01:10:15 +0300 Subject: [PATCH 0545/3485] [macOS] Install Xcode 13 beta along with 13 stable (#4102) --- images/macos/provision/core/xcode.ps1 | 6 +++++- images/macos/toolsets/toolset-11.json | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/images/macos/provision/core/xcode.ps1 b/images/macos/provision/core/xcode.ps1 index ece967b10d0a..ab984cd937fe 100644 --- a/images/macos/provision/core/xcode.ps1 +++ b/images/macos/provision/core/xcode.ps1 @@ -44,7 +44,11 @@ Invoke-XcodeRunFirstLaunch -Version $defaultXcode Write-Host "Configuring Xcode symlinks..." $xcodeVersions | ForEach-Object { Build-XcodeSymlinks -Version $_.link -Symlinks $_.symlinks - Build-ProvisionatorSymlink -Version $_.link + + # Skip creating symlink to install multiple releases of the same Xcode version side-by-side + if ($_."skip-symlink" -ne "true") { + Build-ProvisionatorSymlink -Version $_.link + } } Write-Host "Setting default Xcode to $defaultXcode" diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index 0c24f6493cf6..313e37f21ca5 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -3,6 +3,7 @@ "default": "12.5.1", "versions": [ { "link": "13.0", "version": "13.0.0"}, + { "link": "13.0_beta", "version": "13 beta 5", "skip-symlink": "true"}, { "link": "12.5.1", "version": "12.5.1"}, { "link": "12.5", "version": "12.5.0"}, { "link": "12.4", "version": "12.4.0"}, From ebedfbc739019e8942be5003fad3f7d0a3de340c Mon Sep 17 00:00:00 2001 From: Maksim Shilov <89912354+shilovmaksim@users.noreply.github.com> Date: Mon, 20 Sep 2021 13:06:52 +0300 Subject: [PATCH 0546/3485] [Windows OS] Include Microsoft Game Development Kit (GDK) to image (#4097) --- images/win/scripts/Installers/Install-GDK.ps1 | 19 +++++++++++++++++++ .../SoftwareReport/SoftwareReport.Common.psm1 | 7 +++++++ .../SoftwareReport.Generator.ps1 | 5 +++++ images/win/scripts/Tests/Tools.Tests.ps1 | 6 ++++++ images/win/windows2019.json | 1 + 5 files changed, 38 insertions(+) create mode 100644 images/win/scripts/Installers/Install-GDK.ps1 diff --git a/images/win/scripts/Installers/Install-GDK.ps1 b/images/win/scripts/Installers/Install-GDK.ps1 new file mode 100644 index 000000000000..6283167d5d73 --- /dev/null +++ b/images/win/scripts/Installers/Install-GDK.ps1 @@ -0,0 +1,19 @@ +################################################################################ +## File: Install-GDK.ps1 +## Desc: Install Microsoft Game Developement Kit +################################################################################ + +# Preparation +$tempFolder = Join-Path $env:Tmp "GDK" + +# Fetching Microsoft GDK release version +$GDKReleaseVersion = (Invoke-RestMethod -Uri "https://api.github.com/repos/microsoft/GDK/releases/latest").tag_name + +# Cloning GDK repo and checking out to release +git clone --depth 1 --branch $GDKReleaseVersion "https://github.com/microsoft/GDK.git" $tempFolder + +# Installing GDK +$GDKInstaller = Join-Path $tempFolder "pgdk.exe" +Install-Binary -FilePath $GDKInstaller -ArgumentList ("/quiet", "/norestart") + +Invoke-PesterTests -Testfile "Tools" -TestName "Microsoft GDK" \ No newline at end of file diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 index 51e8e77087b8..4bcf722b011e 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 @@ -324,6 +324,13 @@ function Get-PipxVersion { return "Pipx $pipxVersion" } +function Get-GDKVersion { + $regKey = "HKLM:\Software\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall\*" + $installedApplications = Get-ItemProperty -Path $regKey + $GDKRelease = $installedApplications | Where-Object DisplayName -match "Microsoft Game Development Kit" + return "$($GDKRelease.DisplayName) $($GDKRelease.DisplayVersion)" +} + function Build-PackageManagementEnvironmentTable { $envVariables = @( @{ diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index c2ee6301b33d..167de2ce4969 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -123,6 +123,11 @@ $toolsList = @( (Get-ZstdVersion), (Get-YAMLLintVersion) ) +if (Test-IsWin19) { + $toolsList += @( + (Get-GDKVersion) + ) +} if ((Test-IsWin16) -or (Test-IsWin19)) { $toolsList += @( (Get-NSISVersion), diff --git a/images/win/scripts/Tests/Tools.Tests.ps1 b/images/win/scripts/Tests/Tools.Tests.ps1 index cb72bbd3a49d..8f18ecce3143 100644 --- a/images/win/scripts/Tests/Tools.Tests.ps1 +++ b/images/win/scripts/Tests/Tools.Tests.ps1 @@ -91,6 +91,12 @@ Describe "Mingw64" { } } +Describe "Microsoft GDK" -Skip:(-not (Test-IsWin19)) { + It "GDK" { + "$($env:GRDKLatest)grdk.ini" | Should -Exist + } +} + Describe "GoogleCloudSDK" -Skip:(Test-IsWin22) { It "" -TestCases @( @{ ToolName = "bq" } diff --git a/images/win/windows2019.json b/images/win/windows2019.json index af3c1ea91fe9..1bc66248a761 100644 --- a/images/win/windows2019.json +++ b/images/win/windows2019.json @@ -252,6 +252,7 @@ "{{ template_dir }}/scripts/Installers/Install-GoogleCloudSDK.ps1", "{{ template_dir }}/scripts/Installers/Install-CodeQLBundle.ps1", "{{ template_dir }}/scripts/Installers/Install-BizTalkBuildComponent.ps1", + "{{ template_dir }}/scripts/Installers/Install-GDK.ps1", "{{ template_dir }}/scripts/Installers/Disable-JITDebugger.ps1", "{{ template_dir }}/scripts/Installers/Configure-DynamicPort.ps1", "{{ template_dir }}/scripts/Installers/Configure-GDIProcessHandleQuota.ps1", From bd5288c7c2a9e3e8ae86799c0a5642443a574f59 Mon Sep 17 00:00:00 2001 From: Nikita Bykov <49442273+nikita-bykov@users.noreply.github.com> Date: Mon, 20 Sep 2021 13:13:00 +0300 Subject: [PATCH 0547/3485] [macOS] Improve haskell setup (#4071) Freeing up disk space on macOS by removing docs and profiling libs of GHC. --- images/macos/provision/core/haskell.sh | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/images/macos/provision/core/haskell.sh b/images/macos/provision/core/haskell.sh index 342c5f6ec69e..f79b58976832 100644 --- a/images/macos/provision/core/haskell.sh +++ b/images/macos/provision/core/haskell.sh @@ -14,6 +14,15 @@ for majorMinorVersion in $minorMajorVersions; do echo "install ghc version $fullVersion..." ghcup install $fullVersion ghcup set $fullVersion + + # remove docs and profiling libs + ghc_bin_dir="$(ghcup whereis --directory ghc $fullVersion)" + [ -e "${ghc_bin_dir}" ] || exit 1 + ghc_dir="$( cd "$( dirname "${ghc_bin_dir}" )" > /dev/null 2>&1 && pwd )" + [ -e "${ghc_dir}" ] || exit 1 + find "${ghc_dir}" \( -name "*_p.a" -o -name "*.p_hi" \) -type f -delete + rm -r "${ghc_dir}"/share/* + unset ghc_bin_dir ghc_dir done echo "install cabal..." From ef2db470d9b9a7225ef79e73eda23d6671f55a72 Mon Sep 17 00:00:00 2001 From: Nikita Bykov <49442273+nikita-bykov@users.noreply.github.com> Date: Mon, 20 Sep 2021 13:35:44 +0300 Subject: [PATCH 0548/3485] [Ubuntu] Add android NDK r23 (#4073) --- .../SoftwareReport.Android.psm1 | 8 ++++++- images/linux/scripts/installers/android.sh | 21 +++++++++-------- images/linux/scripts/tests/Android.Tests.ps1 | 23 +++++++++++-------- images/linux/toolsets/toolset-1804.json | 5 +++- images/linux/toolsets/toolset-2004.json | 6 +++-- 5 files changed, 40 insertions(+), 23 deletions(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Android.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Android.psm1 index 3a0e6b2f2f48..5ba50848f40c 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Android.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Android.psm1 @@ -156,7 +156,13 @@ function Get-AndroidGoogleAPIsVersions { function Get-AndroidNDKVersions { $ndkFolderPath = Join-Path (Get-AndroidSDKRoot) "ndk" $versions = Get-ChildItem -Path $ndkFolderPath -Name - return ($versions -Join "
") + $ndkDefaultVersion = Get-ToolsetValue "android.ndk.default" + $ndkDefaultFullVersion = Get-ChildItem "$env:ANDROID_HOME/ndk/$ndkDefaultVersion.*" -Name | Select-Object -Last 1 + + return ($versions | ForEach-Object { + $defaultPostfix = ( $_ -eq $ndkDefaultFullVersion ) ? " (default)" : "" + $_ + $defaultPostfix + } | Join-String -Separator "
") } function Build-AndroidEnvironmentTable { diff --git a/images/linux/scripts/installers/android.sh b/images/linux/scripts/installers/android.sh index 7e0c547c04c4..957f1430df92 100644 --- a/images/linux/scripts/installers/android.sh +++ b/images/linux/scripts/installers/android.sh @@ -72,22 +72,25 @@ minimumPlatformVersion=$(get_toolset_value '.android.platform_min_version') extras=$(get_toolset_value '.android.extra_list[]|"extras;" + .') addons=$(get_toolset_value '.android.addon_list[]|"add-ons;" + .') additional=$(get_toolset_value '.android.additional_tools[]') -ANDROID_NDK_MAJOR_LTS=($(get_toolset_value '.android.ndk.lts')) -ndkLTSFullVersion=$(get_full_ndk_version $ANDROID_NDK_MAJOR_LTS) +ANDROID_NDK_MAJOR_VERSIONS=($(get_toolset_value '.android.ndk.versions[]')) +ANDROID_NDK_MAJOR_DEFAULT=$(get_toolset_value '.android.ndk.default') +ndkDefaultFullVersion=$(get_full_ndk_version $ANDROID_NDK_MAJOR_DEFAULT) -components=("${extras[@]}" "${addons[@]}" "${additional[@]}" "ndk;$ndkLTSFullVersion") -if isUbuntu20; then - ANDROID_NDK_MAJOR_LATEST=($(get_toolset_value '.android.ndk.latest')) - ndkLatestFullVersion=$(get_full_ndk_version $ANDROID_NDK_MAJOR_LATEST) - components+=("ndk;$ndkLatestFullVersion") -fi +components=("${extras[@]}" "${addons[@]}" "${additional[@]}") +for ndk_version in "${ANDROID_NDK_MAJOR_VERSIONS[@]}" +do + ndk_full_version=$(get_full_ndk_version $ndk_version) + components+=("ndk;$ndk_full_version") +done # This changes were added due to incompatibility with android ndk-bundle (ndk;22.0.7026061). # Link issue virtual-environments: https://github.com/actions/virtual-environments/issues/2481 # Link issue xamarin-android: https://github.com/xamarin/xamarin-android/issues/5526 -ln -s $ANDROID_SDK_ROOT/ndk/$ndkLTSFullVersion $ANDROID_NDK_ROOT +ln -s $ANDROID_SDK_ROOT/ndk/$ndkDefaultFullVersion $ANDROID_NDK_ROOT if isUbuntu20; then + ANDROID_NDK_MAJOR_LATEST=(${ANDROID_NDK_MAJOR_VERSIONS[-1]}) + ndkLatestFullVersion=$(get_full_ndk_version $ANDROID_NDK_MAJOR_LATEST) echo "ANDROID_NDK_LATEST_HOME=$ANDROID_SDK_ROOT/ndk/$ndkLatestFullVersion" | tee -a /etc/environment fi diff --git a/images/linux/scripts/tests/Android.Tests.ps1 b/images/linux/scripts/tests/Android.Tests.ps1 index 11b18d1221c7..cd103b931403 100644 --- a/images/linux/scripts/tests/Android.Tests.ps1 +++ b/images/linux/scripts/tests/Android.Tests.ps1 @@ -2,8 +2,10 @@ Describe "Android" { $androidSdkManagerPackages = Get-AndroidPackages [int]$platformMinVersion = Get-ToolsetValue "android.platform_min_version" [version]$buildToolsMinVersion = Get-ToolsetValue "android.build_tools_min_version" - [string]$ndkLTSVersion = Get-ToolsetValue "android.ndk.lts" - $ndkLTSFullVersion = (Get-ChildItem "/usr/local/lib/android/sdk/ndk/$ndkLTSVersion.*" | Select-Object -Last 1).Name + [string]$ndkDefaultVersion = Get-ToolsetValue "android.ndk.default" + [array]$ndkVersions = Get-ToolsetValue "android.ndk.versions" + $ndkDefaultFullVersion = Get-ChildItem "$env:ANDROID_HOME/ndk/$ndkDefaultVersion.*" -Name | Select-Object -Last 1 + $ndkFullVersions = $ndkVersions | ForEach-Object { (Get-ChildItem "/usr/local/lib/android/sdk/ndk/${_}.*" | Select-Object -Last 1).Name } | ForEach-Object { "ndk/${_}" } $platformVersionsList = ($androidSdkManagerPackages | Where-Object { "$_".StartsWith("platforms;") }) -replace 'platforms;android-', '' $platformNumericList = $platformVersionsList | Where-Object { $_ -match "\d+" } | Where-Object { [int]$_ -ge $platformMinVersion } | Sort-Object -Unique @@ -17,18 +19,12 @@ Describe "Android" { $androidPackages = @( $platforms, $buildTools, + $ndkFullVersions, (Get-ToolsetValue "android.extra_list" | ForEach-Object { "extras/${_}" }), (Get-ToolsetValue "android.addon_list" | ForEach-Object { "add-ons/${_}" }), - (Get-ToolsetValue "android.additional_tools" | ForEach-Object { "${_}" }), - "ndk/$ndkLTSFullVersion" + (Get-ToolsetValue "android.additional_tools" | ForEach-Object { "${_}" }) ) - [string]$ndkLatestVersion = Get-ToolsetValue "android.ndk.latest" - if ($ndkLatestVersion) { - $ndkLatestFullVersion = (Get-ChildItem "/usr/local/lib/android/sdk/ndk/$ndkLatestVersion.*" | Select-Object -Last 1).Name - $androidPackages += @("ndk/$ndkLatestFullVersion") - } - $androidPackages = $androidPackages | ForEach-Object { $_ } BeforeAll { @@ -67,10 +63,17 @@ Describe "Android" { Context "Packages" { $testCases = $androidPackages | ForEach-Object { @{ PackageName = $_ } } + $defaultNdkTestCase = @{ NdkDefaultFullVersion = $ndkDefaultFullVersion } It "" -TestCases $testCases { param ([string] $PackageName) Validate-AndroidPackage $PackageName } + + It "ndk-bundle points to the default NDK version" -TestCases $defaultNdkTestCase { + $ndkLinkTarget = (Get-Item $env:ANDROID_NDK_HOME).Target + $ndkVersion = Split-Path -Path $ndkLinkTarget -Leaf + $ndkVersion | Should -BeExactly $NdkDefaultFullVersion + } } } \ No newline at end of file diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index 8eea24062d76..85669e8290de 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -95,7 +95,10 @@ "cmake;3.18.1" ], "ndk": { - "lts": "21" + "default": "21", + "versions": [ + "21", "23" + ] } }, "powershellModules": [ diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index 0f6327b193d7..c3b1d519baa8 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -90,8 +90,10 @@ "cmake;3.18.1" ], "ndk": { - "lts": "21", - "latest": "22" + "default": "21", + "versions": [ + "21", "22", "23" + ] } }, "powershellModules": [ From 0bcacd4c922d5d4b042f8e1a1b56f6f583d52183 Mon Sep 17 00:00:00 2001 From: Maksim Shilov <89912354+shilovmaksim@users.noreply.github.com> Date: Mon, 20 Sep 2021 16:20:56 +0300 Subject: [PATCH 0549/3485] Measure and output installing and downloading durations (#4104) --- .../scripts/ImageHelpers/InstallHelpers.ps1 | 21 ++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/images/win/scripts/ImageHelpers/InstallHelpers.ps1 b/images/win/scripts/ImageHelpers/InstallHelpers.ps1 index 76f093b5e31d..e05e44e9ff44 100644 --- a/images/win/scripts/ImageHelpers/InstallHelpers.ps1 +++ b/images/win/scripts/ImageHelpers/InstallHelpers.ps1 @@ -51,23 +51,27 @@ function Install-Binary try { + $installStartTime = Get-Date Write-Host "Starting Install $Name..." $process = Start-Process -FilePath $filePath -ArgumentList $ArgumentList -Wait -PassThru - $exitCode = $process.ExitCode + $installCompleteTime = [math]::Round(($(Get-Date) - $installStartTime).TotalSeconds, 2) if ($exitCode -eq 0 -or $exitCode -eq 3010) { - Write-Host "Installation successful" + Write-Host "Installation successful in $installCompleteTime seconds" } else { Write-Host "Non zero exit code returned by the installation process: $exitCode" + Write-Host "Total time elapsed: $installCompleteTime seconds" exit $exitCode } } catch { + $installCompleteTime = [math]::Round(($(Get-Date) - $installStartTime).TotalSeconds, 2) Write-Host "Failed to install the $fileExtension ${Name}: $($_.Exception.Message)" + Write-Host "Installation failed after $installCompleteTime seconds" exit 1 } } @@ -178,24 +182,29 @@ function Start-DownloadWithRetry } $filePath = Join-Path -Path $DownloadPath -ChildPath $Name - - #Default retry logic for the package. + $downloadStartTime = Get-Date + + # Default retry logic for the package. while ($Retries -gt 0) { try { + $downloadAttemptStartTime = Get-Date Write-Host "Downloading package from: $Url to path $filePath ." (New-Object System.Net.WebClient).DownloadFile($Url, $filePath) break } catch { - Write-Host "There is an error during package downloading:`n $_" + $failTime = [math]::Round(($(Get-Date) - $downloadStartTime).TotalSeconds, 2) + $attemptTime = [math]::Round(($(Get-Date) - $downloadAttemptStartTime).TotalSeconds, 2) + Write-Host "There is an error encounterd after $attemptTime seconds during package downloading:`n $_" $Retries-- if ($Retries -eq 0) { Write-Host "File can't be downloaded. Please try later or check that file exists by url: $Url" + Write-Host "Total time elapsed $failTime" exit 1 } @@ -204,6 +213,8 @@ function Start-DownloadWithRetry } } + $downloadCompleteTime = [math]::Round(($(Get-Date) - $downloadStartTime).TotalSeconds, 2) + Write-Host "Package downloaded successfully in $downloadCompleteTime seconds" return $filePath } From 819cd8e740577d90414e31c9dfd7180fe69e1564 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 20 Sep 2021 18:53:17 +0000 Subject: [PATCH 0550/3485] Updating readme file for macOS-11 version 20210917.1 (#4109) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/macos/macos-11-Readme.md | 63 +++++++++++++++++---------------- 1 file changed, 33 insertions(+), 30 deletions(-) diff --git a/images/macos/macos-11-Readme.md b/images/macos/macos-11-Readme.md index 07bec05d3647..7815465bf3e8 100644 --- a/images/macos/macos-11-Readme.md +++ b/images/macos/macos-11-Readme.md @@ -5,7 +5,7 @@ # macOS 11.6 info - System Version: macOS 11.6 (20G165) - Kernel Version: Darwin 20.6.0 -- Image Version: 20210914.4 +- Image Version: 20210917.1 ## Installed Software ### Language and Runtime @@ -36,8 +36,8 @@ - Bundler version 2.2.27 - Carthage 0.38.0 - CocoaPods 1.11.2 -- Composer 2.1.7 -- Homebrew 3.2.11 +- Composer 2.1.8 +- Homebrew 3.2.12 - Miniconda 4.10.3 - NPM 6.14.15 - NuGet 5.6.0.6489 @@ -45,7 +45,7 @@ - Pip 21.2.4 (python 3.9) - Pipx 0.16.4 - RubyGems 3.2.27 -- Vcpkg 2021 (build from master \<92af1ff>) +- Vcpkg 2021 (build from master \<4428702>) - Yarn 1.22.5 #### Environment variables @@ -66,21 +66,21 @@ - bazel 4.2.1 - bazelisk 1.10.1 - bsdtar 3.3.2 - available by 'tar' alias -- Curl 7.78.0 +- Curl 7.79.0 - Git LFS: 2.13.3 - Git: 2.33.0 - GitHub CLI: 2.0.0 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.2 - gpg (GnuPG) 2.3.2 -- helm v3.6.3+gd506314 +- helm v3.7.0+geeac838 - Hub CLI: 2.14.2 - jq 1.6 - mongo v5.0.2 - mongod v5.0.2 - Newman 5.3.0 - OpenSSL 1.1.1l 24 Aug 2021 `(/usr/local/opt/openssl -> /usr/local/Cellar/openssl@1.1/1.1.1l)` -- Packer 1.7.4 +- Packer 1.7.5 - PostgreSQL 13.4 - psql (PostgreSQL) 13.4 - Sox 14.4.2 @@ -92,14 +92,14 @@ ### Tools - Aliyun CLI 3.0.90 - App Center CLI 2.10.0 -- AWS CLI 2.2.37 +- AWS CLI 2.2.39 - AWS SAM CLI 1.31.0 - AWS Session Manager CLI 1.2.245.0 - Azure CLI 2.28.0 - Bicep CLI 0.4.613 - Cabal 3.4.0.0 - Cmake 3.21.2 -- Fastlane 2.193.1 +- Fastlane 2.194.0 - GHC 9.0.1 - GHCup v0.1.16.2 - Stack 2.7.3 @@ -116,8 +116,8 @@ - SafariDriver 14.1.2 (16611.3.10.1.6) - Google Chrome 93.0.4577.82 - ChromeDriver 93.0.4577.63 -- Microsoft Edge 93.0.961.47 -- MSEdgeDriver 93.0.961.47 +- Microsoft Edge 93.0.961.52 +- MSEdgeDriver 93.0.961.52 - Mozilla Firefox 92.0 - geckodriver 0.29.1 @@ -189,7 +189,7 @@ ### Web Servers | Name | Version | ConfigFile | ServiceStatus | ListenPort | | ----- | ------- | ------------------------------- | ------------- | ---------- | -| httpd | 2.4.48 | /usr/local/etc/httpd/httpd.conf | stopped | 80 | +| httpd | 2.4.49 | /usr/local/etc/httpd/httpd.conf | stopped | 80 | | nginx | 1.21.3 | /usr/local/etc/nginx/nginx.conf | stopped | 80 | ### Xamarin @@ -214,13 +214,14 @@ - NUnit 3.6.1 ### Xcode -| Version | Build | Path | -| ---------------- | ------- | ------------------------------ | -| 13.0 | 13A233 | /Applications/Xcode_13.0.app | -| 12.5.1 (default) | 12E507 | /Applications/Xcode_12.5.1.app | -| 12.5 | 12E262 | /Applications/Xcode_12.5.app | -| 12.4 | 12D4e | /Applications/Xcode_12.4.app | -| 11.7 | 11E801a | /Applications/Xcode_11.7.app | +| Version | Build | Path | +| ---------------- | -------- | --------------------------------- | +| 13.0 (beta) | 13A5212g | /Applications/Xcode_13.0_beta.app | +| 13.0 | 13A233 | /Applications/Xcode_13.0.app | +| 12.5.1 (default) | 12E507 | /Applications/Xcode_12.5.1.app | +| 12.5 | 12E262 | /Applications/Xcode_12.5.app | +| 12.4 | 12D4e | /Applications/Xcode_12.4.app | +| 11.7 | 11E801a | /Applications/Xcode_11.7.app | #### Xcode Support Tools - xcpretty 0.3.0 @@ -234,33 +235,35 @@ | macOS 10.15 | macosx10.15 | 11.7 | | macOS 11.1 | macosx11.1 | 12.4 | | macOS 11.3 | macosx11.3 | 12.5, 12.5.1, 13.0 | +| macOS 12.0 | macosx12.0 | 13.0 | | iOS 13.7 | iphoneos13.7 | 11.7 | | iOS 14.4 | iphoneos14.4 | 12.4 | | iOS 14.5 | iphoneos14.5 | 12.5, 12.5.1 | -| iOS 15.0 | iphoneos15.0 | 13.0 | +| iOS 15.0 | iphoneos15.0 | 13.0, 13.0 | | Simulator - iOS 13.7 | iphonesimulator13.7 | 11.7 | | Simulator - iOS 14.4 | iphonesimulator14.4 | 12.4 | | Simulator - iOS 14.5 | iphonesimulator14.5 | 12.5, 12.5.1 | -| Simulator - iOS 15.0 | iphonesimulator15.0 | 13.0 | +| Simulator - iOS 15.0 | iphonesimulator15.0 | 13.0, 13.0 | | tvOS 13.4 | appletvos13.4 | 11.7 | | tvOS 14.3 | appletvos14.3 | 12.4 | | tvOS 14.5 | appletvos14.5 | 12.5, 12.5.1 | -| tvOS 15.0 | appletvos15.0 | 13.0 | +| tvOS 15.0 | appletvos15.0 | 13.0, 13.0 | | Simulator - tvOS 13.4 | appletvsimulator13.4 | 11.7 | | Simulator - tvOS 14.3 | appletvsimulator14.3 | 12.4 | | Simulator - tvOS 14.5 | appletvsimulator14.5 | 12.5, 12.5.1 | -| Simulator - tvOS 15.0 | appletvsimulator15.0 | 13.0 | +| Simulator - tvOS 15.0 | appletvsimulator15.0 | 13.0, 13.0 | | watchOS 6.2 | watchos6.2 | 11.7 | | watchOS 7.2 | watchos7.2 | 12.4 | | watchOS 7.4 | watchos7.4 | 12.5, 12.5.1 | -| watchOS 8.0 | watchos8.0 | 13.0 | +| watchOS 8.0 | watchos8.0 | 13.0, 13.0 | | Simulator - watchOS 6.2 | watchsimulator6.2 | 11.7 | | Simulator - watchOS 7.2 | watchsimulator7.2 | 12.4 | | Simulator - watchOS 7.4 | watchsimulator7.4 | 12.5, 12.5.1 | -| Simulator - watchOS 8.0 | watchsimulator8.0 | 13.0 | +| Simulator - watchOS 8.0 | watchsimulator8.0 | 13.0, 13.0 | | DriverKit 19.0 | driverkit.macosx19.0 | 11.7 | | DriverKit 20.2 | driverkit.macosx20.2 | 12.4 | | DriverKit 20.4 | driverkit.macosx20.4 | 12.5, 12.5.1, 13.0 | +| DriverKit 21.0 | driverkit21.0 | 13.0 | #### Installed Simulators | OS | Xcode Version | Simulators | @@ -268,15 +271,15 @@ | 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.4 | 12.4 | iPod touch (7th generation)
iPhone 11
iPhone 11 Pro
iPhone 11 Pro Max
iPhone 12
iPhone 12 mini
iPhone 12 Pro
iPhone 12 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.5 | 12.5
12.5.1 | iPod touch (7th generation)
iPhone 11
iPhone 11 Pro
iPhone 11 Pro Max
iPhone 12
iPhone 12 mini
iPhone 12 Pro
iPhone 12 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 (11-inch) (3rd generation)
iPad Pro (12.9-inch) (4th generation)
iPad Pro (12.9-inch) (5th generation)
iPad Pro (9.7-inch) | -| iOS 15.0 | 13.0 | iPod touch (7th generation)
iPhone 11
iPhone 11 Pro
iPhone 11 Pro Max
iPhone 12
iPhone 12 mini
iPhone 12 Pro
iPhone 12 Pro Max
iPhone 13
iPhone 13 mini
iPhone 13 Pro
iPhone 13 Pro Max
iPhone 8
iPhone 8 Plus
iPhone SE (2nd generation)
iPad (7th generation)
iPad (8th generation)
iPad (9th generation)
iPad Air (3rd generation)
iPad Air (4th generation)
iPad mini (6th generation)
iPad Pro (11-inch) (2nd generation)
iPad Pro (11-inch) (3rd generation)
iPad Pro (12.9-inch) (4th generation)
iPad Pro (12.9-inch) (5th generation)
iPad Pro (9.7-inch) | +| iOS 15.0 | 13.0
13.0 | iPod touch (7th generation)
iPhone 11
iPhone 11 Pro
iPhone 11 Pro Max
iPhone 12
iPhone 12 mini
iPhone 12 Pro
iPhone 12 Pro Max
iPhone 13
iPhone 13 mini
iPhone 13 Pro
iPhone 13 Pro Max
iPhone 8
iPhone 8 Plus
iPhone SE (2nd generation)
iPad (7th generation)
iPad (8th generation)
iPad (9th generation)
iPad Air (3rd generation)
iPad Air (4th generation)
iPad mini (6th generation)
iPad Pro (11-inch) (2nd generation)
iPad Pro (11-inch) (3rd generation)
iPad Pro (12.9-inch) (4th generation)
iPad Pro (12.9-inch) (5th generation)
iPad Pro (9.7-inch) | | tvOS 13.4 | 11.7 | Apple TV
Apple TV 4K
Apple TV 4K (at 1080p) | | tvOS 14.3 | 12.4 | Apple TV
Apple TV 4K
Apple TV 4K (at 1080p) | | tvOS 14.5 | 12.5
12.5.1 | Apple TV
Apple TV 4K
Apple TV 4K (2nd generation)
Apple TV 4K (at 1080p)
Apple TV 4K (at 1080p) (2nd generation) | -| tvOS 15.0 | 13.0 | Apple TV
Apple TV 4K
Apple TV 4K (2nd generation)
Apple TV 4K (at 1080p)
Apple TV 4K (at 1080p) (2nd generation) | +| tvOS 15.0 | 13.0
13.0 | Apple TV
Apple TV 4K
Apple TV 4K (2nd generation)
Apple TV 4K (at 1080p)
Apple TV 4K (at 1080p) (2nd generation) | | watchOS 6.2 | 11.7 | Apple Watch Series 4 - 40mm
Apple Watch Series 4 - 44mm
Apple Watch Series 5 - 40mm
Apple Watch Series 5 - 44mm | | watchOS 7.2 | 12.4 | 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.4 | 12.5
12.5.1 | 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 8.0 | 13.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
Apple Watch Series 7 - 41mm
Apple Watch Series 7 - 45mm | +| watchOS 8.0 | 13.0
13.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
Apple Watch Series 7 - 41mm
Apple Watch Series 7 - 45mm | ### Android | Package Name | Version | @@ -290,7 +293,7 @@ | CMake | 3.10.2
3.18.1 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 21.4.7075529
22.1.7171670 | +| NDK | 21.4.7075529 (default)
22.1.7171670
23.0.7599858 | | SDK Patch Applier v4 | 1 | #### Environment variables @@ -298,7 +301,7 @@ | ----------------------- | -------------------------------------------------------------------------------------------------- | | ANDROID_HOME | /Users/runner/Library/Android/sdk | | ANDROID_NDK_HOME | /Users/runner/Library/Android/sdk/ndk-bundle -> /Users/runner/Library/Android/sdk/ndk/21.4.7075529 | -| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/22.1.7171670 | +| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/23.0.7599858 | | ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk-bundle -> /Users/runner/Library/Android/sdk/ndk/21.4.7075529 | | ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | From 23a859a9bccbd4dff15840d4cacf9f04f31181fe Mon Sep 17 00:00:00 2001 From: MaksimZhukov <46996400+MaksimZhukov@users.noreply.github.com> Date: Tue, 21 Sep 2021 10:17:50 +0300 Subject: [PATCH 0551/3485] Update Android NDK policy in the Software and image guidelines (#4119) --- docs/software-and-images-guidelines.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/software-and-images-guidelines.md b/docs/software-and-images-guidelines.md index def5143635aa..8ffbc6eae61a 100644 --- a/docs/software-and-images-guidelines.md +++ b/docs/software-and-images-guidelines.md @@ -31,7 +31,7 @@ These are the guidelines we follow in software and images supporting routine: | PyPy | 3 most popular `major.minor` versions | | .NET Core | 2 latest LTS versions and 1 latest version. For each feature version only latest patch is installed | | GCC
GNU Fortran
Clang
GNU C++ | 3 latest major versions | -| Android NDK | 1 latest, 1 LTS version | +| Android NDK | 1 latest non-LTS, 2 latest LTS versions | | Xcode | - all OS compatible versions side-by-side
- for beta, GM versions - latest beta only
- old patch versions are deprecated in 3 months | ## Software default versions update policy for tools with multiple versions installed From 63894956a14854619637f8b43973bf176f522762 Mon Sep 17 00:00:00 2001 From: Nikolay Frolov <90333448+nikolai-frolov@users.noreply.github.com> Date: Tue, 21 Sep 2021 12:49:59 +0300 Subject: [PATCH 0552/3485] [MacOS] Add SBT (#4101) --- images/macos/software-report/SoftwareReport.Common.psm1 | 5 +++++ images/macos/software-report/SoftwareReport.Generator.ps1 | 3 ++- images/macos/tests/BasicTools.Tests.ps1 | 6 ++++++ images/macos/toolsets/toolset-10.14.json | 1 + images/macos/toolsets/toolset-10.15.json | 1 + images/macos/toolsets/toolset-11.json | 1 + 6 files changed, 16 insertions(+), 1 deletion(-) diff --git a/images/macos/software-report/SoftwareReport.Common.psm1 b/images/macos/software-report/SoftwareReport.Common.psm1 index 240efc0cf9aa..64ee19a1c959 100644 --- a/images/macos/software-report/SoftwareReport.Common.psm1 +++ b/images/macos/software-report/SoftwareReport.Common.psm1 @@ -512,6 +512,11 @@ function Get-KotlinVersion { return "Kotlin $kotlinVersion" } +function Get-SbtVersion { + $sbtVersion = Run-Command "sbt -version" | Take-Part -Part 3 + return "Sbt $sbtVersion" +} + function Build-PackageManagementEnvironmentTable { return @( @{ diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1 index c4b82d9f70db..e9d196f7e554 100644 --- a/images/macos/software-report/SoftwareReport.Generator.ps1 +++ b/images/macos/software-report/SoftwareReport.Generator.ps1 @@ -99,7 +99,8 @@ $markdown += New-MDHeader "Project Management" -Level 3 $markdown += New-MDList -Style Unordered -Lines (@( (Get-MavenVersion), (Get-GradleVersion), - (Get-ApacheAntVersion) + (Get-ApacheAntVersion), + (Get-SbtVersion) ) | Sort-Object ) diff --git a/images/macos/tests/BasicTools.Tests.ps1 b/images/macos/tests/BasicTools.Tests.ps1 index 62b73c2b3da0..7696845d2963 100644 --- a/images/macos/tests/BasicTools.Tests.ps1 +++ b/images/macos/tests/BasicTools.Tests.ps1 @@ -175,4 +175,10 @@ Describe "Kotlin" { It " is available" -TestCases ($kotlinPackages | ForEach-Object { @{ toolName = $_ } }) { "$toolName -version" | Should -ReturnZeroExitCode } +} + +Describe "sbt" { + It "sbt" { + "sbt -version" | Should -ReturnZeroExitCode + } } \ No newline at end of file diff --git a/images/macos/toolsets/toolset-10.14.json b/images/macos/toolsets/toolset-10.14.json index a21440e70710..20402349b00b 100644 --- a/images/macos/toolsets/toolset-10.14.json +++ b/images/macos/toolsets/toolset-10.14.json @@ -261,6 +261,7 @@ "packer", "parallel", "perl", + "sbt", "subversion", "swiftformat", "swig", diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index 9e980d349406..76971fb49668 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -212,6 +212,7 @@ "packer", "parallel", "perl", + "sbt", "subversion", "swiftformat", "swig", diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index 313e37f21ca5..4e64229f3870 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -158,6 +158,7 @@ "p7zip", "packer", "perl", + "sbt", "subversion", "swiftformat", "swig", From c8da80b53234df07a64a81d2240714318f3f763f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 21 Sep 2021 09:58:20 +0000 Subject: [PATCH 0553/3485] Updating readme file for macOS-10.14 version 20210918.1 (#4117) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/macos/macos-10.14-Readme.md | 126 ++++++++++++++--------------- 1 file changed, 63 insertions(+), 63 deletions(-) diff --git a/images/macos/macos-10.14-Readme.md b/images/macos/macos-10.14-Readme.md index d436daeb81b5..b95685e22486 100644 --- a/images/macos/macos-10.14-Readme.md +++ b/images/macos/macos-10.14-Readme.md @@ -1,16 +1,15 @@ | Announcements | |-| -| [[macOS, Windows] .NET SDK pre-installation policy will be changed on September, 6](https://github.com/actions/virtual-environments/issues/3809) | -| [macOS 11.0 pools will be transited to private preview.](https://github.com/actions/virtual-environments/issues/2486) | +| [macOS-latest workflows will use macOS-11](https://github.com/actions/virtual-environments/issues/4060) | *** # macOS 10.14 info - System Version: macOS 10.14.6 (18G9323) - Kernel Version: Darwin 18.7.0 -- Image Version: 20210814.1 +- Image Version: 20210918.1 ## Installed Software ### Language and Runtime -- .NET SDK 2.1.300 2.1.301 2.1.302 2.1.401 2.1.402 2.1.403 2.1.500 2.1.502 2.1.503 2.1.504 2.1.505 2.1.506 2.1.507 +- .NET SDK 2.1.302 2.1.403 2.1.507 - Bash 3.2.57(1)-release - Clang/LLVM 11.0.0 is default - Clang/LLVM 12.0.1 is available on `'$(brew --prefix llvm)/bin/clang'` @@ -22,31 +21,31 @@ - GNU Fortran (Homebrew GCC 11.2.0) 11.2.0 - available by `gfortran-11` alias - Go 1.15.15 - julia 1.6.2 -- kotlin 1.5.21-release-314 +- Kotlin 1.5.30-release-407 - MSBuild 15.7.224.30163 (from /Library/Frameworks/Mono.framework/Versions/5.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) - Node.js v8.17.0 - NVM 0.38.0 -- NVM - Cached node versions: v10.24.1 v12.22.5 v14.17.5 +- NVM - Cached node versions: v10.24.1 v12.22.6 v14.17.6 - Perl 5.34.0 -- PHP 8.0.9 +- PHP 8.0.10 - Python 2.7.18 -- Python 3.9.6 +- Python 3.9.7 - R 4.1.1 - Ruby 2.7.4p191 ### Package Management -- Bundler version 2.2.25 +- Bundler version 2.2.27 - Carthage 0.38.0 -- CocoaPods 1.10.2 -- Composer 2.1.5 -- Homebrew 3.2.6 +- CocoaPods 1.11.2 +- Composer 2.1.8 +- Homebrew 3.2.12 - Miniconda 4.10.3 - NPM 3.10.10 - NuGet 4.7.0.5148 - Pip 20.3.4 (python 2.7) -- Pip 21.1.3 (python 3.9) +- Pip 21.2.4 (python 3.9) - Pipx 0.16.4 -- RubyGems 3.2.25 +- RubyGems 3.2.27 - Yarn 1.22.5 #### Environment variables @@ -58,30 +57,30 @@ ### Project Management - Apache Ant(TM) 1.10.11 - Apache Maven 3.8.2 -- Gradle 7.1.1 +- Gradle 7.2 ### Utilities - 7-Zip 17.04 -- aria2 1.35.0 -- azcopy 10.11.0 +- aria2 1.36.0 +- azcopy 10.12.1 - bazel 3.7.1 - bazelisk 1.10.1 - bsdtar 2.8.3 - available by 'tar' alias -- Curl 7.78.0 +- Curl 7.79.0 - Git LFS: 2.13.3 -- Git: 2.32.0 -- GitHub CLI: 1.14.0 -- GNU parallel 20210622 +- Git: 2.33.0 +- GitHub CLI: 2.0.0 +- GNU parallel 20210822 - GNU Tar 1.34 - available by 'gtar' alias -- GNU Wget 1.21.1 -- gpg (GnuPG) 2.3.1 -- helm v3.6.3+gd506314 +- GNU Wget 1.21.2 +- gpg (GnuPG) 2.3.2 +- helm v3.7.0+geeac838 - Hub CLI: 2.14.2 - jq 1.6 - mongo v5.0.2 - mongod v5.0.2 -- OpenSSL 1.1.1k 25 Mar 2021 `(/usr/local/opt/openssl -> /usr/local/Cellar/openssl@1.1/1.1.1k)` -- Packer 1.7.4 +- OpenSSL 1.1.1l 24 Aug 2021 `(/usr/local/opt/openssl -> /usr/local/Cellar/openssl@1.1/1.1.1l)` +- Packer 1.7.5 - PostgreSQL 13.4 - psql (PostgreSQL) 13.4 - Sox 14.4.2 @@ -93,16 +92,16 @@ ### Tools -- Aliyun CLI 3.0.85 +- Aliyun CLI 3.0.90 - App Center CLI 1.2.2 -- AWS CLI 2.2.29 -- AWS SAM CLI 1.27.2 -- AWS Session Manager CLI 1.2.234.0 -- Azure CLI 2.27.1 +- AWS CLI 2.2.39 +- AWS SAM CLI 1.31.0 +- AWS Session Manager CLI 1.2.245.0 +- Azure CLI 2.28.0 - Bicep CLI 0.4.613 - Cabal 3.4.0.0 -- Cmake 3.21.1 -- Fastlane 2.191.0 +- Cmake 3.21.2 +- Fastlane 2.194.0 - GHC 9.0.1 - GHCup v0.1.16.2 - Stack 2.7.3 @@ -111,25 +110,25 @@ - Xcode Command Line Tools 10.3.0.0.1.1562985497 ### Linters -- SwiftLint 0.43.1 -- yamllint 1.26.2 +- SwiftLint 0.44.0 +- yamllint 1.26.3 ### Browsers - Safari 14.1.2 (14611.3.10.1.5) - SafariDriver 14.1.2 (14611.3.10.1.5) -- Google Chrome 92.0.4515.131 -- ChromeDriver 92.0.4515.107 -- Microsoft Edge 92.0.902.73 -- MSEdgeDriver 92.0.902.73 -- Mozilla Firefox 91.0 +- Google Chrome 93.0.4577.82 +- ChromeDriver 93.0.4577.63 +- Microsoft Edge 93.0.961.52 +- MSEdgeDriver 93.0.961.52 +- Mozilla Firefox 92.0 - geckodriver 0.29.1 #### Environment variables -| Name | Value | -| --------------- | ---------------------------------------------- | -| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/92.0.4515.107 | -| EDGEWEBDRIVER | /usr/local/share/edge_driver | -| GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | +| Name | Value | +| --------------- | --------------------------------------------- | +| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/93.0.4577.63 | +| EDGEWEBDRIVER | /usr/local/share/edge_driver | +| GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | ### Java | Version | Vendor | Environment Variable | @@ -151,10 +150,10 @@ #### Python - 2.7.18 - 3.5.10 -- 3.6.14 -- 3.7.11 -- 3.8.11 -- 3.9.6 +- 3.6.15 +- 3.7.12 +- 3.8.12 +- 3.9.7 #### PyPy - 2.7.18 [PyPy 7.3.5] @@ -162,27 +161,28 @@ #### Node.js - 10.24.1 -- 12.22.5 -- 14.17.5 +- 12.22.6 +- 14.17.6 #### Go - 1.13.15 - 1.14.15 - 1.15.15 -- 1.16.7 +- 1.16.8 +- 1.17.1 ### Rust Tools -- Cargo 1.54.0 -- Rust 1.54.0 -- Rustdoc 1.54.0 +- Cargo 1.55.0 +- Rust 1.55.0 +- Rustdoc 1.55.0 - Rustup 1.24.3 #### Packages - Bindgen 0.59.1 -- Cargo-audit 0.14.1 +- Cargo-audit 0.15.2 - Cargo-outdated v0.9.17 - Cbindgen 0.20.0 -- Clippy 0.1.54 +- Clippy 0.1.55 - Rustfmt 1.4.37-stable ### PowerShell Tools @@ -193,8 +193,8 @@ | ---------------- | ------- | | Az | 6.1.0 | | MarkdownPS | 1.9 | -| Pester | 5.2.2 | -| PSScriptAnalyzer | 1.19.1 | +| Pester | 5.3.0 | +| PSScriptAnalyzer | 1.20.0 | ### Xamarin #### Visual Studio for Mac @@ -248,7 +248,7 @@ #### Xcode Support Tools - xcpretty 0.3.0 -- xcversion 2.7.0 +- xcversion 2.8.0 - Nomad CLI 0.0.2 - Nomad shenzhen CLI 0.14.3 - xctool 0.3.7 @@ -346,7 +346,7 @@ | Package Name | Version | | -------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 4.0 | -| Android Emulator | 30.7.5 | +| Android Emulator | 30.8.4 | | Android SDK Build-tools | 31.0.0
30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3
26.0.0 26.0.1 26.0.2 26.0.3
25.0.0 25.0.1 25.0.2 25.0.3
24.0.0 24.0.1 24.0.2 24.0.3
23.0.1 23.0.2 23.0.3
22.0.1
21.1.2
20.0.0
19.1.0 | | Android SDK Platforms | android-31 (rev 1)
android-30 (rev 3)
android-29 (rev 5)
android-28 (rev 6)
android-27 (rev 3)
android-26 (rev 2)
android-25 (rev 3)
android-24 (rev 2)
android-23 (rev 3)
android-22 (rev 2)
android-21 (rev 2)
android-20 (rev 2)
android-19 (rev 4)
android-18 (rev 3)
android-17 (rev 3)
android-16 (rev 5)
android-15 (rev 5) | | Android SDK Platform-Tools | 31.0.3 | @@ -355,7 +355,7 @@ | Google APIs | addon-google_apis-google-21
addon-google_apis-google-22
addon-google_apis-google-23
addon-google_apis-google-24 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 15.2.4203891
18.1.5063045
21.4.7075529
22.1.7171670 | +| NDK | 15.2.4203891
18.1.5063045
21.4.7075529 (default)
22.1.7171670
23.0.7599858 | | SDK Patch Applier v4 | 1 | | Intel HAXM | 7.6.5 | @@ -365,7 +365,7 @@ | ANDROID_HOME | /Users/runner/Library/Android/sdk | | ANDROID_NDK_18R_PATH | /Users/runner/Library/Android/sdk/ndk/18.1.5063045 | | ANDROID_NDK_HOME | /Users/runner/Library/Android/sdk/ndk-bundle -> /Users/runner/Library/Android/sdk/ndk/21.4.7075529 | -| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/22.1.7171670 | +| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/23.0.7599858 | | ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk-bundle -> /Users/runner/Library/Android/sdk/ndk/21.4.7075529 | | ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | From 597a99bdce8857862ada549914787f8db242d5dc Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Wed, 22 Sep 2021 11:22:16 +0300 Subject: [PATCH 0554/3485] az: update Az 6.1.0 -> 6.4.0 (#4124) --- images/linux/toolsets/toolset-1804.json | 2 +- images/linux/toolsets/toolset-2004.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index 85669e8290de..936c49d42bc4 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -110,7 +110,7 @@ "name": "az", "url" : "https://raw.githubusercontent.com/Azure/az-ps-module-versions/main/versions-manifest.json", "versions": [ - "6.1.0" + "6.4.0" ], "zip_versions": [ "3.1.0", diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index c3b1d519baa8..f12648040229 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -106,7 +106,7 @@ "name": "az", "url" : "https://raw.githubusercontent.com/Azure/az-ps-module-versions/main/versions-manifest.json", "versions": [ - "6.1.0" + "6.4.0" ], "zip_versions": [ "3.1.0", From f30be610347e7a66880918291e870efaf42c01d8 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 22 Sep 2021 09:42:37 +0000 Subject: [PATCH 0555/3485] Updating readme file for win22 version 20210920.1 (#4115) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/win/Windows2022-Readme.md | 371 ++++++++++++++++--------------- 1 file changed, 187 insertions(+), 184 deletions(-) diff --git a/images/win/Windows2022-Readme.md b/images/win/Windows2022-Readme.md index e67462795b31..847f533a8d71 100644 --- a/images/win/Windows2022-Readme.md +++ b/images/win/Windows2022-Readme.md @@ -3,8 +3,8 @@ | [(Public Beta) Windows Server 2022 with Visual Studio 2022 is now available](https://github.com/actions/virtual-environments/issues/3949) | *** # Microsoft Windows Server 2022 Datacenter -- OS Version: 10.0.20348 Build 169 -- Image Version: 20210914.2 +- OS Version: 10.0.20348 Build 230 +- Image Version: 20210920.1 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -14,7 +14,7 @@ - Bash 4.4.23(1)-release - Go 1.16.8 - Julia 1.6.2 -- Kotlin 1.5.20 +- Kotlin 1.5.30 - Node 14.17.6 - PHP 8.0.10 - Python 3.9.7 @@ -22,14 +22,14 @@ ### Package Management - Chocolatey 0.11.1 -- Composer 2.1.7 +- Composer 2.1.8 - Helm 3.6.3 - NPM 6.14.15 - NuGet 5.11.0.10 - pip 21.2.4 (python 3.9) - Pipx 0.16.4 - RubyGems 3.2.22 -- Vcpkg (build from master \) +- Vcpkg (build from master \<4428702>) - Yarn 1.22.11 #### Environment variables @@ -60,7 +60,7 @@ - GVFS 1.0.21085.9 - jq 1.6 - Kind 0.11.1 -- Kubectl 1.22.1 +- Kubectl 1.22.2 - Mercurial 5.0 - Mingw-w64 8.1.0 - Newman 5.3.0 @@ -78,7 +78,7 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.90 -- AWS CLI 2.2.37 +- AWS CLI 2.2.39 - AWS SAM CLI 1.31.0 - AWS Session Manager CLI 1.2.245.0 - Azure CLI 2.28.0 @@ -103,10 +103,10 @@ ### Browsers and webdrivers - Google Chrome 93.0.4577.82 - Chrome Driver 93.0.4577.63 -- Microsoft Edge 93.0.961.47 -- Microsoft Edge Driver 93.0.961.47 +- Microsoft Edge 93.0.961.52 +- Microsoft Edge Driver 93.0.961.52 - Mozilla Firefox 92.0 -- Gecko Driver 0.29.1 +- Gecko Driver 0.30.0 - IE Driver 3.150.1.1 #### Environment variables @@ -208,174 +208,177 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Web Servers | Name | Version | ConfigFile | ServiceName | ServiceStatus | ListenPort | | ------ | ------- | ------------------------------------- | ----------- | ------------- | ---------- | -| Apache | 2.4.48 | C:\tools\Apache24\conf\httpd.conf | Apache | Stopped | 80 | +| Apache | 2.4.49 | C:\tools\Apache24\conf\httpd.conf | Apache | Stopped | 80 | | Nginx | 1.21.3 | C:\tools\nginx-1.21.3\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2022 -| Name | Version | Path | -| ----------------------------- | -------------- | ----------------------------------------------------- | -| Visual Studio Enterprise 2022 | 17.0.31612.314 | C:\Program Files\Microsoft Visual Studio\2022\Preview | +| Name | Version | Path | +| ----------------------------- | ------------ | ----------------------------------------------------- | +| Visual Studio Enterprise 2022 | 17.0.31710.8 | C:\Program Files\Microsoft Visual Studio\2022\Preview | #### Workloads, components and extensions: | Package | Version | | ------------------------------------------------------------------------- | -------------- | -| Component.Android.NDK.R21E | 17.0.31530.272 | -| Component.Android.SDK25.Private | 17.0.31530.272 | -| Component.Android.SDK30 | 17.0.31530.272 | +| Component.Android.NDK.R21E | 17.0.31709.181 | +| Component.Android.SDK25.Private | 17.0.31709.181 | +| Component.Android.SDK30 | 17.0.31709.181 | | Component.Ant | 1.9.3.8 | -| Component.Linux.CMake | 17.0.31530.272 | -| Component.MDD.Android | 17.0.31530.272 | -| Component.MDD.Linux | 17.0.31530.272 | -| Component.Microsoft.VisualStudio.LiveShare | 1.0.4583 | -| Component.Microsoft.VisualStudio.RazorExtension | 17.0.31530.272 | -| Component.Microsoft.VisualStudio.Web.AzureFunctions | 17.0.31530.272 | -| Component.Microsoft.Web.LibraryManager | 17.0.31530.272 | -| Component.Microsoft.WebTools.BrowserLink.WebLivePreview | 0.9.8.45772 | -| Component.OpenJDK | 17.0.31530.272 | -| Component.UnityEngine.x64 | 17.0.31530.272 | -| Component.Unreal | 17.0.31530.272 | -| Component.Unreal.Android | 17.0.31530.272 | -| Component.Xamarin | 17.0.31530.272 | -| Component.Xamarin.RemotedSimulator | 17.0.31530.272 | -| Microsoft.Component.Azure.DataLake.Tools | 17.0.31530.272 | -| Microsoft.Component.MSBuild | 17.0.31530.272 | -| Microsoft.Component.NetFX.Native | 17.0.31530.272 | -| Microsoft.Component.PythonTools | 17.0.31530.272 | -| Microsoft.Component.VC.Runtime.UCRTSDK | 17.0.31530.272 | -| Microsoft.ComponentGroup.Blend | 17.0.31530.272 | -| Microsoft.ComponentGroup.ClickOnce.Publish | 17.0.31530.272 | -| Microsoft.Net.Component.4.5.2.TargetingPack | 17.0.31530.272 | -| Microsoft.Net.Component.4.6.2.TargetingPack | 17.0.31530.272 | -| Microsoft.Net.Component.4.6.TargetingPack | 17.0.31530.272 | -| Microsoft.Net.Component.4.7.1.TargetingPack | 17.0.31530.272 | -| Microsoft.Net.Component.4.7.2.TargetingPack | 17.0.31530.272 | -| Microsoft.Net.Component.4.8.SDK | 17.0.31530.272 | -| Microsoft.Net.Component.4.8.TargetingPack | 17.0.31530.272 | -| Microsoft.Net.ComponentGroup.4.8.DeveloperTools | 17.0.31530.272 | -| Microsoft.Net.ComponentGroup.DevelopmentPrerequisites | 17.0.31530.272 | -| Microsoft.Net.ComponentGroup.TargetingPacks.Common | 17.0.31530.272 | -| Microsoft.NetCore.Component.DevelopmentTools | 17.0.31530.272 | -| Microsoft.NetCore.Component.Runtime.6.0 | 17.0.31604.169 | -| Microsoft.NetCore.Component.SDK | 17.0.31604.169 | -| Microsoft.NetCore.Component.Web | 17.0.31530.272 | -| Microsoft.VisualStudio.Component.AppInsights.Tools | 17.0.31530.272 | -| Microsoft.VisualStudio.Component.AspNet | 17.0.31530.272 | -| Microsoft.VisualStudio.Component.AspNet45 | 17.0.31530.272 | -| Microsoft.VisualStudio.Component.Azure.AuthoringTools | 17.0.31530.272 | -| Microsoft.VisualStudio.Component.Azure.ClientLibs | 17.0.31530.272 | -| Microsoft.VisualStudio.Component.Azure.Compute.Emulator | 17.0.31530.272 | -| Microsoft.VisualStudio.Component.Azure.Powershell | 17.0.31530.272 | -| Microsoft.VisualStudio.Component.Azure.ResourceManager.Tools | 17.0.31530.272 | -| Microsoft.VisualStudio.Component.Azure.ServiceFabric.Tools | 17.0.31530.272 | -| Microsoft.VisualStudio.Component.Azure.Waverton | 17.0.31530.272 | -| Microsoft.VisualStudio.Component.Azure.Waverton.BuildTools | 17.0.31530.272 | -| Microsoft.VisualStudio.Component.ClassDesigner | 17.0.31530.272 | -| Microsoft.VisualStudio.Component.CodeMap | 17.0.31530.272 | -| Microsoft.VisualStudio.Component.Common.Azure.Tools | 17.0.31530.272 | -| Microsoft.VisualStudio.Component.CoreEditor | 17.0.31530.272 | -| Microsoft.VisualStudio.Component.Debugger.JustInTime | 17.0.31530.272 | -| Microsoft.VisualStudio.Component.Debugger.Snapshot | 17.0.31530.272 | -| Microsoft.VisualStudio.Component.DiagnosticTools | 17.0.31530.272 | -| Microsoft.VisualStudio.Component.DockerTools | 17.0.31530.272 | -| Microsoft.VisualStudio.Component.DotNetModelBuilder | 17.0.31530.272 | -| Microsoft.VisualStudio.Component.EntityFramework | 17.0.31530.272 | -| Microsoft.VisualStudio.Component.FSharp | 17.0.31530.272 | -| Microsoft.VisualStudio.Component.FSharp.WebTemplates | 17.0.31530.272 | -| Microsoft.VisualStudio.Component.GraphDocument | 17.0.31530.272 | -| Microsoft.VisualStudio.Component.Graphics | 17.0.31530.272 | -| Microsoft.VisualStudio.Component.Graphics.Tools | 17.0.31530.272 | -| Microsoft.VisualStudio.Component.IISExpress | 17.0.31530.272 | -| Microsoft.VisualStudio.Component.IntelliCode | 17.0.31530.272 | -| Microsoft.VisualStudio.Component.IntelliTrace.FrontEnd | 17.0.31530.272 | -| Microsoft.VisualStudio.Component.JavaScript.Diagnostics | 17.0.31530.272 | -| Microsoft.VisualStudio.Component.JavaScript.TypeScript | 17.0.31530.272 | -| Microsoft.VisualStudio.Component.LinqToSql | 17.0.31530.272 | -| Microsoft.VisualStudio.Component.LiveUnitTesting | 17.0.31530.272 | -| Microsoft.VisualStudio.Component.ManagedDesktop.Core | 17.0.31530.272 | -| Microsoft.VisualStudio.Component.ManagedDesktop.Prerequisites | 17.0.31530.272 | -| Microsoft.VisualStudio.Component.Merq | 17.0.31530.272 | -| Microsoft.VisualStudio.Component.MonoDebugger | 17.0.31530.272 | -| Microsoft.VisualStudio.Component.MSODBC.SQL | 17.0.31530.272 | -| Microsoft.VisualStudio.Component.MSSQL.CMDLnUtils | 17.0.31530.272 | -| Microsoft.VisualStudio.Component.Node.Tools | 17.0.31530.272 | -| Microsoft.VisualStudio.Component.NuGet | 17.0.31530.272 | -| Microsoft.VisualStudio.Component.NuGet.BuildTools | 17.0.31530.272 | -| Microsoft.VisualStudio.Component.PortableLibrary | 17.0.31530.272 | -| Microsoft.VisualStudio.Component.Roslyn.Compiler | 17.0.31530.272 | -| Microsoft.VisualStudio.Component.Roslyn.LanguageServices | 17.0.31530.272 | -| Microsoft.VisualStudio.Component.Sharepoint.Tools | 17.0.31530.272 | -| Microsoft.VisualStudio.Component.SQL.CLR | 17.0.31530.272 | -| Microsoft.VisualStudio.Component.SQL.DataSources | 17.0.31530.272 | -| Microsoft.VisualStudio.Component.SQL.LocalDB.Runtime | 17.0.31530.272 | -| Microsoft.VisualStudio.Component.SQL.SSDT | 17.0.31530.272 | -| Microsoft.VisualStudio.Component.TeamOffice | 17.0.31530.272 | -| Microsoft.VisualStudio.Component.TestTools.CodedUITest | 17.0.31530.272 | -| Microsoft.VisualStudio.Component.TestTools.WebLoadTest | 17.0.31530.272 | -| Microsoft.VisualStudio.Component.TextTemplating | 17.0.31530.272 | -| Microsoft.VisualStudio.Component.TypeScript.TSServer | 17.0.31530.272 | -| Microsoft.VisualStudio.Component.Unity | 17.0.31530.272 | -| Microsoft.VisualStudio.Component.VC.ASAN | 17.0.31530.272 | -| Microsoft.VisualStudio.Component.VC.ATL | 17.0.31530.272 | -| Microsoft.VisualStudio.Component.VC.ATL.Spectre | 17.0.31530.272 | -| Microsoft.VisualStudio.Component.VC.ATLMFC.Spectre | 17.0.31530.272 | -| Microsoft.VisualStudio.Component.VC.CLI.Support | 17.0.31530.272 | -| Microsoft.VisualStudio.Component.VC.CMake.Project | 17.0.31530.272 | -| Microsoft.VisualStudio.Component.VC.CoreIde | 17.0.31530.272 | -| Microsoft.VisualStudio.Component.VC.DiagnosticTools | 17.0.31530.272 | -| Microsoft.VisualStudio.Component.VC.Llvm.ClangToolset | 17.0.31530.272 | -| Microsoft.VisualStudio.Component.VC.Redist.14.Latest | 17.0.31530.272 | -| Microsoft.VisualStudio.Component.VC.Runtimes.x86.x64.Spectre | 17.0.31530.272 | -| Microsoft.VisualStudio.Component.VC.TestAdapterForBoostTest | 17.0.31530.272 | -| Microsoft.VisualStudio.Component.VC.TestAdapterForGoogleTest | 17.0.31530.272 | -| Microsoft.VisualStudio.Component.VC.Tools.x86.x64 | 17.0.31530.272 | -| Microsoft.VisualStudio.Component.VC.v141.ATL | 17.0.31530.272 | -| Microsoft.VisualStudio.Component.VC.v141.ATL.Spectre | 17.0.31530.272 | -| Microsoft.VisualStudio.Component.VC.v141.MFC | 17.0.31530.272 | -| Microsoft.VisualStudio.Component.VC.v141.MFC.Spectre | 17.0.31530.272 | -| Microsoft.VisualStudio.Component.VC.v141.x86.x64 | 17.0.31530.272 | -| Microsoft.VisualStudio.Component.VC.v141.x86.x64.Spectre | 17.0.31530.272 | -| Microsoft.VisualStudio.Component.VSSDK | 17.0.31530.272 | -| Microsoft.VisualStudio.Component.Wcf.Tooling | 17.0.31530.272 | -| Microsoft.VisualStudio.Component.Web | 17.0.31530.272 | -| Microsoft.VisualStudio.Component.WebDeploy | 17.0.31530.272 | -| Microsoft.VisualStudio.Component.Windows10SDK | 17.0.31530.272 | -| Microsoft.VisualStudio.Component.Windows10SDK.19041 | 17.0.31530.272 | -| Microsoft.VisualStudio.Component.Windows10SDK.20348 | 17.0.31530.272 | -| Microsoft.VisualStudio.Component.Workflow | 17.0.31530.272 | -| Microsoft.VisualStudio.Component.WslDebugging | 17.0.31530.272 | -| Microsoft.VisualStudio.ComponentGroup.ArchitectureTools.Native | 17.0.31530.272 | -| Microsoft.VisualStudio.ComponentGroup.Azure.CloudServices | 17.0.31530.272 | -| Microsoft.VisualStudio.ComponentGroup.Azure.Prerequisites | 17.0.31530.272 | -| Microsoft.VisualStudio.ComponentGroup.Azure.ResourceManager.Tools | 17.0.31530.272 | -| Microsoft.VisualStudio.ComponentGroup.AzureFunctions | 17.0.31530.272 | -| Microsoft.VisualStudio.ComponentGroup.MSIX.Packaging | 17.0.31530.272 | -| Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core | 17.0.31530.272 | -| Microsoft.VisualStudio.ComponentGroup.UWP.NetCoreAndStandard | 17.0.31530.272 | -| Microsoft.VisualStudio.ComponentGroup.UWP.Support | 17.0.31530.272 | -| Microsoft.VisualStudio.ComponentGroup.UWP.Xamarin | 17.0.31530.272 | -| Microsoft.VisualStudio.ComponentGroup.VisualStudioExtension.Prerequisites | 17.0.31530.272 | -| Microsoft.VisualStudio.ComponentGroup.Web | 17.0.31530.272 | -| Microsoft.VisualStudio.ComponentGroup.Web.CloudTools | 17.0.31530.272 | -| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions | 17.0.31530.272 | -| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.CMake | 17.0.31530.272 | -| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.TemplateEngine | 17.0.31530.272 | -| Microsoft.VisualStudio.Workload.Azure | 17.0.31530.272 | -| Microsoft.VisualStudio.Workload.CoreEditor | 17.0.31530.272 | -| Microsoft.VisualStudio.Workload.Data | 17.0.31530.272 | -| Microsoft.VisualStudio.Workload.ManagedDesktop | 17.0.31530.272 | -| Microsoft.VisualStudio.Workload.ManagedGame | 17.0.31530.272 | -| Microsoft.VisualStudio.Workload.NativeCrossPlat | 17.0.31530.272 | -| Microsoft.VisualStudio.Workload.NativeDesktop | 17.0.31530.272 | -| Microsoft.VisualStudio.Workload.NativeGame | 17.0.31530.272 | -| Microsoft.VisualStudio.Workload.NativeMobile | 17.0.31530.272 | -| Microsoft.VisualStudio.Workload.NetCrossPlat | 17.0.31530.272 | -| Microsoft.VisualStudio.Workload.NetWeb | 17.0.31530.272 | -| Microsoft.VisualStudio.Workload.Node | 17.0.31530.272 | -| Microsoft.VisualStudio.Workload.Office | 17.0.31530.272 | -| Microsoft.VisualStudio.Workload.Python | 17.0.31530.272 | -| Microsoft.VisualStudio.Workload.Universal | 17.0.31530.272 | -| Microsoft.VisualStudio.Workload.VisualStudioExtension | 17.0.31530.272 | +| Component.Linux.CMake | 17.0.31709.181 | +| Component.MDD.Android | 17.0.31709.181 | +| Component.MDD.Linux | 17.0.31709.181 | +| Component.Microsoft.VisualStudio.LiveShare | 1.0.4639 | +| Component.Microsoft.VisualStudio.RazorExtension | 17.0.31709.181 | +| Component.Microsoft.VisualStudio.Web.AzureFunctions | 17.0.31709.181 | +| Component.Microsoft.Web.LibraryManager | 17.0.31709.181 | +| Component.Microsoft.WebTools.BrowserLink.WebLivePreview | 17.0.21.8162 | +| Component.OpenJDK | 17.0.31709.181 | +| Component.UnityEngine.x64 | 17.0.31709.181 | +| Component.Unreal | 17.0.31709.181 | +| Component.Unreal.Android | 17.0.31709.181 | +| Component.Xamarin | 17.0.31709.181 | +| Component.Xamarin.RemotedSimulator | 17.0.31709.181 | +| Microsoft.Component.Azure.DataLake.Tools | 17.0.31709.181 | +| Microsoft.Component.ClickOnce | 17.0.31709.181 | +| Microsoft.Component.MSBuild | 17.0.31709.181 | +| Microsoft.Component.NetFX.Native | 17.0.31709.181 | +| Microsoft.Component.PythonTools | 17.0.31709.181 | +| Microsoft.Component.VC.Runtime.UCRTSDK | 17.0.31709.181 | +| Microsoft.ComponentGroup.Blend | 17.0.31709.181 | +| Microsoft.ComponentGroup.ClickOnce.Publish | 17.0.31709.181 | +| Microsoft.Net.Component.4.5.2.TargetingPack | 17.0.31709.181 | +| Microsoft.Net.Component.4.6.2.TargetingPack | 17.0.31709.181 | +| Microsoft.Net.Component.4.6.TargetingPack | 17.0.31709.181 | +| Microsoft.Net.Component.4.7.1.TargetingPack | 17.0.31709.181 | +| Microsoft.Net.Component.4.7.2.TargetingPack | 17.0.31709.181 | +| Microsoft.Net.Component.4.8.SDK | 17.0.31709.181 | +| Microsoft.Net.Component.4.8.TargetingPack | 17.0.31709.181 | +| Microsoft.Net.ComponentGroup.4.8.DeveloperTools | 17.0.31709.181 | +| Microsoft.Net.ComponentGroup.DevelopmentPrerequisites | 17.0.31709.181 | +| Microsoft.Net.ComponentGroup.TargetingPacks.Common | 17.0.31709.181 | +| Microsoft.NetCore.Component.DevelopmentTools | 17.0.31709.181 | +| Microsoft.NetCore.Component.Runtime.6.0 | 17.0.31709.181 | +| Microsoft.NetCore.Component.SDK | 17.0.31709.198 | +| Microsoft.NetCore.Component.Web | 17.0.31709.181 | +| Microsoft.VisualStudio.Component.AppInsights.Tools | 17.0.31709.181 | +| Microsoft.VisualStudio.Component.AspNet | 17.0.31709.181 | +| Microsoft.VisualStudio.Component.AspNet45 | 17.0.31709.181 | +| Microsoft.VisualStudio.Component.Azure.AuthoringTools | 17.0.31709.181 | +| Microsoft.VisualStudio.Component.Azure.ClientLibs | 17.0.31709.181 | +| Microsoft.VisualStudio.Component.Azure.Compute.Emulator | 17.0.31709.181 | +| Microsoft.VisualStudio.Component.Azure.Powershell | 17.0.31709.181 | +| Microsoft.VisualStudio.Component.Azure.ResourceManager.Tools | 17.0.31709.181 | +| Microsoft.VisualStudio.Component.Azure.ServiceFabric.Tools | 17.0.31709.181 | +| Microsoft.VisualStudio.Component.Azure.Waverton | 17.0.31709.181 | +| Microsoft.VisualStudio.Component.Azure.Waverton.BuildTools | 17.0.31709.181 | +| Microsoft.VisualStudio.Component.ClassDesigner | 17.0.31709.181 | +| Microsoft.VisualStudio.Component.CodeMap | 17.0.31709.181 | +| Microsoft.VisualStudio.Component.Common.Azure.Tools | 17.0.31709.181 | +| Microsoft.VisualStudio.Component.CoreEditor | 17.0.31709.181 | +| Microsoft.VisualStudio.Component.Debugger.JustInTime | 17.0.31709.181 | +| Microsoft.VisualStudio.Component.Debugger.Snapshot | 17.0.31709.181 | +| Microsoft.VisualStudio.Component.DiagnosticTools | 17.0.31709.181 | +| Microsoft.VisualStudio.Component.DockerTools | 17.0.31709.181 | +| Microsoft.VisualStudio.Component.DotNetModelBuilder | 17.0.31709.181 | +| Microsoft.VisualStudio.Component.EntityFramework | 17.0.31709.181 | +| Microsoft.VisualStudio.Component.FSharp | 17.0.31709.181 | +| Microsoft.VisualStudio.Component.FSharp.WebTemplates | 17.0.31709.181 | +| Microsoft.VisualStudio.Component.GraphDocument | 17.0.31709.181 | +| Microsoft.VisualStudio.Component.Graphics | 17.0.31709.181 | +| Microsoft.VisualStudio.Component.Graphics.Tools | 17.0.31709.181 | +| Microsoft.VisualStudio.Component.IISExpress | 17.0.31709.181 | +| Microsoft.VisualStudio.Component.IntelliCode | 17.0.31709.181 | +| Microsoft.VisualStudio.Component.IntelliTrace.FrontEnd | 17.0.31709.181 | +| Microsoft.VisualStudio.Component.JavaScript.Diagnostics | 17.0.31709.181 | +| Microsoft.VisualStudio.Component.JavaScript.TypeScript | 17.0.31709.181 | +| Microsoft.VisualStudio.Component.LinqToSql | 17.0.31709.181 | +| Microsoft.VisualStudio.Component.LiveUnitTesting | 17.0.31709.181 | +| Microsoft.VisualStudio.Component.ManagedDesktop.Core | 17.0.31709.181 | +| Microsoft.VisualStudio.Component.ManagedDesktop.Prerequisites | 17.0.31709.181 | +| Microsoft.VisualStudio.Component.Merq | 17.0.31709.181 | +| Microsoft.VisualStudio.Component.MonoDebugger | 17.0.31709.181 | +| Microsoft.VisualStudio.Component.MSODBC.SQL | 17.0.31709.181 | +| Microsoft.VisualStudio.Component.MSSQL.CMDLnUtils | 17.0.31709.181 | +| Microsoft.VisualStudio.Component.Node.Tools | 17.0.31709.181 | +| Microsoft.VisualStudio.Component.NuGet | 17.0.31709.181 | +| Microsoft.VisualStudio.Component.NuGet.BuildTools | 17.0.31709.181 | +| Microsoft.VisualStudio.Component.PortableLibrary | 17.0.31709.181 | +| Microsoft.VisualStudio.Component.Roslyn.Compiler | 17.0.31709.181 | +| Microsoft.VisualStudio.Component.Roslyn.LanguageServices | 17.0.31709.181 | +| Microsoft.VisualStudio.Component.Sharepoint.Tools | 17.0.31709.181 | +| Microsoft.VisualStudio.Component.SQL.CLR | 17.0.31709.181 | +| Microsoft.VisualStudio.Component.SQL.DataSources | 17.0.31709.181 | +| Microsoft.VisualStudio.Component.SQL.LocalDB.Runtime | 17.0.31709.181 | +| Microsoft.VisualStudio.Component.SQL.SSDT | 17.0.31709.181 | +| Microsoft.VisualStudio.Component.TeamOffice | 17.0.31709.181 | +| Microsoft.VisualStudio.Component.TestTools.CodedUITest | 17.0.31709.181 | +| Microsoft.VisualStudio.Component.TestTools.WebLoadTest | 17.0.31709.181 | +| Microsoft.VisualStudio.Component.TextTemplating | 17.0.31709.181 | +| Microsoft.VisualStudio.Component.TypeScript.TSServer | 17.0.31709.181 | +| Microsoft.VisualStudio.Component.Unity | 17.0.31709.181 | +| Microsoft.VisualStudio.Component.VC.ASAN | 17.0.31709.181 | +| Microsoft.VisualStudio.Component.VC.ATL | 17.0.31709.181 | +| Microsoft.VisualStudio.Component.VC.ATL.Spectre | 17.0.31709.181 | +| Microsoft.VisualStudio.Component.VC.ATLMFC.Spectre | 17.0.31709.181 | +| Microsoft.VisualStudio.Component.VC.CLI.Support | 17.0.31709.181 | +| Microsoft.VisualStudio.Component.VC.CMake.Project | 17.0.31709.181 | +| Microsoft.VisualStudio.Component.VC.CoreIde | 17.0.31709.181 | +| Microsoft.VisualStudio.Component.VC.DiagnosticTools | 17.0.31709.181 | +| Microsoft.VisualStudio.Component.VC.Llvm.ClangToolset | 17.0.31709.181 | +| Microsoft.VisualStudio.Component.VC.Redist.14.Latest | 17.0.31709.181 | +| Microsoft.VisualStudio.Component.VC.Runtimes.x86.x64.Spectre | 17.0.31709.181 | +| Microsoft.VisualStudio.Component.VC.TestAdapterForBoostTest | 17.0.31709.181 | +| Microsoft.VisualStudio.Component.VC.TestAdapterForGoogleTest | 17.0.31709.181 | +| Microsoft.VisualStudio.Component.VC.Tools.ARM | 17.0.31709.181 | +| Microsoft.VisualStudio.Component.VC.Tools.ARM64 | 17.0.31709.181 | +| Microsoft.VisualStudio.Component.VC.Tools.x86.x64 | 17.0.31709.181 | +| Microsoft.VisualStudio.Component.VC.v141.ATL | 17.0.31709.181 | +| Microsoft.VisualStudio.Component.VC.v141.ATL.Spectre | 17.0.31709.181 | +| Microsoft.VisualStudio.Component.VC.v141.MFC | 17.0.31709.181 | +| Microsoft.VisualStudio.Component.VC.v141.MFC.Spectre | 17.0.31709.181 | +| Microsoft.VisualStudio.Component.VC.v141.x86.x64 | 17.0.31709.181 | +| Microsoft.VisualStudio.Component.VC.v141.x86.x64.Spectre | 17.0.31709.181 | +| Microsoft.VisualStudio.Component.VSSDK | 17.0.31709.181 | +| Microsoft.VisualStudio.Component.Wcf.Tooling | 17.0.31709.181 | +| Microsoft.VisualStudio.Component.Web | 17.0.31709.181 | +| Microsoft.VisualStudio.Component.WebDeploy | 17.0.31709.181 | +| Microsoft.VisualStudio.Component.Windows10SDK | 17.0.31709.181 | +| Microsoft.VisualStudio.Component.Windows10SDK.19041 | 17.0.31709.181 | +| Microsoft.VisualStudio.Component.Windows10SDK.20348 | 17.0.31709.181 | +| Microsoft.VisualStudio.Component.Workflow | 17.0.31709.181 | +| Microsoft.VisualStudio.Component.WslDebugging | 17.0.31709.181 | +| Microsoft.VisualStudio.ComponentGroup.ArchitectureTools.Native | 17.0.31709.181 | +| Microsoft.VisualStudio.ComponentGroup.Azure.CloudServices | 17.0.31709.181 | +| Microsoft.VisualStudio.ComponentGroup.Azure.Prerequisites | 17.0.31709.181 | +| Microsoft.VisualStudio.ComponentGroup.Azure.ResourceManager.Tools | 17.0.31709.181 | +| Microsoft.VisualStudio.ComponentGroup.AzureFunctions | 17.0.31709.181 | +| Microsoft.VisualStudio.ComponentGroup.MSIX.Packaging | 17.0.31709.181 | +| Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core | 17.0.31709.181 | +| Microsoft.VisualStudio.ComponentGroup.UWP.NetCoreAndStandard | 17.0.31709.181 | +| Microsoft.VisualStudio.ComponentGroup.UWP.Support | 17.0.31709.181 | +| Microsoft.VisualStudio.ComponentGroup.UWP.Xamarin | 17.0.31709.181 | +| Microsoft.VisualStudio.ComponentGroup.VisualStudioExtension.Prerequisites | 17.0.31709.181 | +| Microsoft.VisualStudio.ComponentGroup.Web | 17.0.31709.181 | +| Microsoft.VisualStudio.ComponentGroup.Web.CloudTools | 17.0.31709.181 | +| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions | 17.0.31709.181 | +| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.CMake | 17.0.31709.181 | +| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.TemplateEngine | 17.0.31709.181 | +| Microsoft.VisualStudio.Workload.Azure | 17.0.31709.181 | +| Microsoft.VisualStudio.Workload.CoreEditor | 17.0.31709.181 | +| Microsoft.VisualStudio.Workload.Data | 17.0.31709.181 | +| Microsoft.VisualStudio.Workload.ManagedDesktop | 17.0.31709.181 | +| Microsoft.VisualStudio.Workload.ManagedGame | 17.0.31709.181 | +| Microsoft.VisualStudio.Workload.NativeCrossPlat | 17.0.31709.181 | +| Microsoft.VisualStudio.Workload.NativeDesktop | 17.0.31709.181 | +| Microsoft.VisualStudio.Workload.NativeGame | 17.0.31709.181 | +| Microsoft.VisualStudio.Workload.NativeMobile | 17.0.31709.181 | +| Microsoft.VisualStudio.Workload.NetCrossPlat | 17.0.31709.181 | +| Microsoft.VisualStudio.Workload.NetWeb | 17.0.31709.181 | +| Microsoft.VisualStudio.Workload.Node | 17.0.31709.181 | +| Microsoft.VisualStudio.Workload.Office | 17.0.31709.181 | +| Microsoft.VisualStudio.Workload.Python | 17.0.31709.181 | +| Microsoft.VisualStudio.Workload.Universal | 17.0.31709.181 | +| Microsoft.VisualStudio.Workload.VisualStudioExtension | 17.0.31709.181 | #### Microsoft Visual C++: @@ -383,26 +386,26 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | -------------------------------------------- | ------------ | ----------- | | Microsoft Visual C++ 2013 Additional Runtime | x64 | 12.0.40660 | | Microsoft Visual C++ 2013 Minimum Runtime | x64 | 12.0.40660 | -| Microsoft Visual C++ 2022 Additional Runtime | x64 | 14.30.30423 | -| Microsoft Visual C++ 2022 Debug Runtime | x64 | 14.30.30423 | -| Microsoft Visual C++ 2022 Minimum Runtime | x64 | 14.30.30423 | -| Microsoft Visual C++ 2022 Additional Runtime | x86 | 14.30.30423 | -| Microsoft Visual C++ 2022 Debug Runtime | x86 | 14.30.30423 | -| Microsoft Visual C++ 2022 Minimum Runtime | x86 | 14.30.30423 | +| Microsoft Visual C++ 2022 Additional Runtime | x64 | 14.30.30528 | +| Microsoft Visual C++ 2022 Debug Runtime | x64 | 14.30.30528 | +| Microsoft Visual C++ 2022 Minimum Runtime | x64 | 14.30.30528 | +| Microsoft Visual C++ 2022 Additional Runtime | x86 | 14.30.30528 | +| Microsoft Visual C++ 2022 Debug Runtime | x86 | 14.30.30528 | +| Microsoft Visual C++ 2022 Minimum Runtime | x86 | 14.30.30528 | ### .NET Core SDK `Location C:\Program Files\dotnet\sdk` -- 3.1.118 3.1.202 3.1.302 3.1.412 5.0.104 5.0.206 5.0.303 5.0.400 6.0.100-preview.7.21379.14 +- 3.1.119 3.1.202 3.1.302 3.1.413 5.0.104 5.0.207 5.0.303 5.0.401 6.0.100-rc.1.21458.32 ### .NET Core Runtime `Location: C:\Program Files\dotnet\shared\Microsoft.AspNetCore.App` -- 3.1.4 3.1.6 3.1.18 5.0.4 5.0.9 6.0.0-preview.7.21378.6 +- 3.1.4 3.1.6 3.1.18 3.1.19 5.0.4 5.0.9 5.0.10 6.0.0-rc.1.21452.15 `Location: C:\Program Files\dotnet\shared\Microsoft.NETCore.App` -- 3.1.4 3.1.6 3.1.18 5.0.4 5.0.9 6.0.0-preview.7.21377.19 +- 3.1.4 3.1.6 3.1.18 3.1.19 5.0.4 5.0.9 5.0.10 6.0.0-rc.1.21451.13 `Location: C:\Program Files\dotnet\shared\Microsoft.WindowsDesktop.App` -- 3.1.4 3.1.6 3.1.18 5.0.4 5.0.9 6.0.0-preview.7.21378.9 +- 3.1.4 3.1.6 3.1.19 5.0.4 5.0.9 5.0.10 6.0.0-rc.1.21451.3 ### .NET Framework `Type: Developer Pack` @@ -463,11 +466,11 @@ All other versions are saved but not installed. ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2022 | sha256:38857a55ffcfc715fd4f79d1524db88ec0a8fefe11543db42a030424329b0bf6 | 2021-08-18 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2022 | sha256:f449e95b12aa5e1c79681a5dd0dc35c4dcd95a2ca4c4568343b2b87cb6341084 | 2021-08-18 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:a3632ef8d3a55159f006cefd6306b832c67093564b1a89c1ae7e299299b7f175 | 2021-08-18 | -| mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:3df3372895223b44475125ab3553fd39a71d89a896099d463d3216f1e22a3ab0 | 2021-08-09 | -| mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:8f756a7fd4fe963cc7dd2c3ad1597327535da8e8f55a7d1932780934efa87e04 | 2021-08-09 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2022 | sha256:b4f5f7e22ab51300c50ea544663d636a92b3b27510826888f74bb198a8fac491 | 2021-09-14 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2022 | sha256:b5e12302fb9a9e541dd2a9be0204753c7686a410dbdbfbdbac3edf3255b69e2d | 2021-09-14 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:d3207fda5c642d4658422f49b4bf2685331506da3723d0ac545a66a4623845c9 | 2021-09-14 | +| mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:2957ba15f3e5704fdb5097703c6b124fbd405a2455eda9f2839e13885faf3788 | 2021-09-13 | +| mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:591f3c76c17869b99700815aa259f728a92f4912dcd68bcce21b7e9a4309cda4 | 2021-09-13 | From 75380ebaa32906df0a1ac86510cbd5168758ddbb Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Wed, 22 Sep 2021 15:38:39 +0300 Subject: [PATCH 0556/3485] [MacOS] Add Adoptium to Java installer (#4116) --- images/macos/provision/core/openjdk.sh | 89 +++++++++++++------ .../software-report/SoftwareReport.Java.psm1 | 3 +- images/macos/tests/Java.Tests.ps1 | 25 +++++- images/macos/toolsets/toolset-10.14.json | 12 ++- images/macos/toolsets/toolset-10.15.json | 12 ++- images/macos/toolsets/toolset-11.json | 12 ++- 6 files changed, 116 insertions(+), 37 deletions(-) mode change 100644 => 100755 images/macos/provision/core/openjdk.sh diff --git a/images/macos/provision/core/openjdk.sh b/images/macos/provision/core/openjdk.sh old mode 100644 new mode 100755 index 72504f2fdd6d..5af74113507d --- a/images/macos/provision/core/openjdk.sh +++ b/images/macos/provision/core/openjdk.sh @@ -1,53 +1,90 @@ #!/bin/bash -e -o pipefail source ~/utils/utils.sh -JAVA_TOOLCACHE_PATH=$AGENT_TOOLSDIRECTORY/Java_Adopt_jdk - createEnvironmentVariable() { local JAVA_VERSION=$1 - local JAVA_PATH=$2 + local VENDOR_NAME=$2 + local DEFAULT=$3 + + INSTALL_PATH_PATTERN=$(echo ${AGENT_TOOLSDIRECTORY}/Java_${VENDOR_NAME}_jdk/${JAVA_VERSION}*/x64/Contents/Home/) - local JAVA_HOME_PATH=$JAVA_PATH/Contents/Home - if [[ $JAVA_VERSION == $JAVA_DEFAULT ]]; then - echo "export JAVA_HOME=${JAVA_HOME_PATH}" >> "${HOME}/.bashrc" + if [[ ${DEFAULT} == "True" ]]; then + echo "Setting up JAVA_HOME variable to ${INSTALL_PATH_PATTERN}" + echo "export JAVA_HOME=${INSTALL_PATH_PATTERN}" >> "${HOME}/.bashrc" fi - echo "export JAVA_HOME_${JAVA_VERSION}_X64=${JAVA_HOME_PATH}" >> "${HOME}/.bashrc" + + echo "Setting up JAVA_HOME_${JAVA_VERSION}_X64 variable to ${INSTALL_PATH_PATTERN}" + echo "export JAVA_HOME_${JAVA_VERSION}_X64=${INSTALL_PATH_PATTERN}" >> "${HOME}/.bashrc" } -installJavaFromAdoptOpenJDK() { +installOpenJDK() { local JAVA_VERSION=$1 + local VENDOR_NAME=$2 # Get link for Java binaries and Java version - assetUrl=$(curl -s "https://api.adoptopenjdk.net/v3/assets/latest/${JAVA_VERSION}/hotspot") - asset=$(echo $assetUrl | jq -r '.[] | select(.binary.os=="mac" and .binary.image_type=="jdk" and .binary.architecture=="x64")') - archivePath=$(echo $asset | jq -r '.binary.package.link') - fullVersion=$(echo $asset | jq -r '.version.semver' | tr '+' '-') + if [[ ${VENDOR_NAME} == "Temurin-Hotspot" ]]; then + assetUrl=$(curl -s "https://api.adoptium.net/v3/assets/latest/${JAVA_VERSION}/hotspot") + elif [[ ${VENDOR_NAME} == "Adopt" ]]; then + assetUrl=$(curl -s "https://api.adoptopenjdk.net/v3/assets/latest/${JAVA_VERSION}/hotspot") + else + echo "${VENDOR_NAME} is invalid, valid names are: Temurin-Hotspot and Adopt" + exit 1 + fi - javaToolcacheVersionPath=$JAVA_TOOLCACHE_PATH/$fullVersion - javaToolcacheVersionArchPath=$javaToolcacheVersionPath/x64 + asset=$(echo ${assetUrl} | jq -r '.[] | select(.binary.os=="mac" and .binary.image_type=="jdk" and .binary.architecture=="x64")') + archivePath=$(echo ${asset} | jq -r '.binary.package.link') + fullVersion=$(echo ${asset} | jq -r '.version.semver' | tr '+' '-') + + JAVA_TOOLCACHE_PATH=${AGENT_TOOLSDIRECTORY}/Java_${VENDOR_NAME}_jdk + + javaToolcacheVersionPath=$JAVA_TOOLCACHE_PATH/${fullVersion} + javaToolcacheVersionArchPath=${javaToolcacheVersionPath}/x64 # Download and extract Java binaries - download_with_retries $archivePath /tmp OpenJDK${JAVA_VERSION}.tar.gz - mkdir -p $javaToolcacheVersionArchPath - tar -xzf /tmp/OpenJDK${JAVA_VERSION}.tar.gz -C $javaToolcacheVersionArchPath --strip-components=1 - # Create complete file - touch $javaToolcacheVersionPath/x64.complete + download_with_retries ${archivePath} /tmp OpenJDK-${VENDOR_NAME}-${fullVersion}.tar.gz + + echo "Creating ${javaToolcacheVersionArchPath} directory" + mkdir -p ${javaToolcacheVersionArchPath} - createEnvironmentVariable $JAVA_VERSION $javaToolcacheVersionArchPath + tar -xf /tmp/OpenJDK-${VENDOR_NAME}-${fullVersion}.tar.gz -C ${javaToolcacheVersionArchPath} --strip-components=1 + # Create complete file + touch ${javaToolcacheVersionPath}/x64.complete # Create a symlink to '/Library/Java/JavaVirtualMachines' # so '/usr/libexec/java_home' will be able to find Java - sudo ln -sf $javaToolcacheVersionArchPath /Library/Java/JavaVirtualMachines/adoptopenjdk-${JAVA_VERSION}.jdk + sudo ln -sf ${javaToolcacheVersionArchPath} /Library/Java/JavaVirtualMachines/${VENDOR_NAME}-${JAVA_VERSION}.jdk } -JAVA_VERSIONS_LIST=($(get_toolset_value '.java.versions | .[]')) -JAVA_DEFAULT=$(get_toolset_value '.java.default') +defaultVersion=$(get_toolset_value '.java.default') +defaultVendor=$(get_toolset_value '.java.default_vendor') +jdkVendors=($(get_toolset_value '.java.vendors[].name')) -for JAVA_VERSION in "${JAVA_VERSIONS_LIST[@]}" -do - installJavaFromAdoptOpenJDK $JAVA_VERSION +for jdkVendor in ${jdkVendors[@]}; do + + # get vendor-specific versions + jdkVersionsToInstall=($(get_toolset_value ".java.vendors[] | select (.name==\"${jdkVendor}\") | .versions[]")) + + for jdkVersionToInstall in ${jdkVersionsToInstall[@]}; do + + installOpenJDK ${jdkVersionToInstall} ${jdkVendor} + + isDefaultVersion=False; [[ ${jdkVersionToInstall} == ${defaultVersion} ]] && isDefaultVersion=True + + if [[ ${jdkVendor} == ${defaultVendor} ]]; then + createEnvironmentVariable ${jdkVersionToInstall} ${jdkVendor} ${isDefaultVersion} + fi + + done done +# Big Sur or newer does not have these versions of Adopt. +# Also hardcode these versions as they only exist for Adopt +if is_Less_BigSur; then + for adoptVersionToInstall in 12 13 14; do + createEnvironmentVariable ${adoptVersionToInstall} "Adopt" + done +fi + echo Installing Maven... brew_smart_install "maven" diff --git a/images/macos/software-report/SoftwareReport.Java.psm1 b/images/macos/software-report/SoftwareReport.Java.psm1 index 97f81c213a4a..9b52247252b2 100644 --- a/images/macos/software-report/SoftwareReport.Java.psm1 +++ b/images/macos/software-report/SoftwareReport.Java.psm1 @@ -12,10 +12,11 @@ function Get-JavaVersions { $version = $javaPath.split('/')[5] $fullVersion = $version.Replace('-', '+') $defaultPostfix = ($javaPath -eq $defaultJavaPath) ? " (default)" : "" + $vendorName = ($javaPath -like '*Java_Adopt_jdk*') ? "Adopt OpenJDK" : "Eclipse Temurin" [PSCustomObject] @{ "Version" = $fullVersion + $defaultPostfix - "Vendor" = "Adopt OpenJDK" + "Vendor" = $vendorName "Environment Variable" = $_.Name } } diff --git a/images/macos/tests/Java.Tests.ps1 b/images/macos/tests/Java.Tests.ps1 index beeedf228c04..fd67ea6566e0 100644 --- a/images/macos/tests/Java.Tests.ps1 +++ b/images/macos/tests/Java.Tests.ps1 @@ -23,11 +23,17 @@ Describe "Java" { } } - $versionsList = Get-ToolsetValue "java.versions" - $defaultJava = Get-ToolsetValue "java.default" + $toolsetJava = Get-ToolsetValue "java" + $defaultVersion = $toolsetJava.default + $defaultVendor = $toolsetJava.default_vendor + $javaVendors = $toolsetJava.vendors - $testCases = $versionsList | ForEach-Object { @{ Title = $_; Version = (Get-NativeVersionFormat $_); EnvVariable = "JAVA_HOME_${_}_X64" } } - $testCases += @{ Title = "Default"; Version = (Get-NativeVersionFormat $defaultJava); EnvVariable = "JAVA_HOME" } + [array]$jdkVersions = ($javaVendors | Where-Object {$_.name -eq $defaultVendor}).versions + [array]$adoptJdkVersions = ($javaVendors | Where-Object {$_.name -eq "Adopt"}).versions + + $adoptCases = $adoptJdkVersions | ForEach-Object { @{Version = $_} } + $testCases = $jdkVersions | ForEach-Object { @{ Title = $_; Version = (Get-NativeVersionFormat $_); EnvVariable = "JAVA_HOME_${_}_X64" } } + $testCases += @{ Title = "Default"; Version = (Get-NativeVersionFormat $defaultVersion); EnvVariable = "JAVA_HOME" } $testCases | ForEach-Object { Context $_.Title { @@ -49,6 +55,17 @@ Describe "Java" { } } + Context "Java Adopt" { + Describe "Java Adopt" { + It "Java Adopt " -TestCases $adoptCases { + $adoptPath = Join-Path (Get-ChildItem ${env:AGENT_TOOLSDIRECTORY}\Java_Adopt_jdk\${Version}*) "x64\Contents\Home\bin\java" + + $result = Get-CommandResult "`"$adoptPath`" -version" + $result.ExitCode | Should -Be 0 + } + } + } + Context "Maven" { Describe "Maven" { It "Maven" { diff --git a/images/macos/toolsets/toolset-10.14.json b/images/macos/toolsets/toolset-10.14.json index 20402349b00b..e84b0a00e39b 100644 --- a/images/macos/toolsets/toolset-10.14.json +++ b/images/macos/toolsets/toolset-10.14.json @@ -197,8 +197,16 @@ }, "java": { "default": "8", - "versions": [ - "8", "11", "12", "13", "14" + "default_vendor": "Temurin-Hotspot", + "vendors": [ + { + "name": "Temurin-Hotspot", + "versions": [ "8", "11" ] + }, + { + "name": "Adopt", + "versions": [ "8", "11", "12", "13", "14" ] + } ] }, "android": { diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index 76971fb49668..8b9f4a8ebcbc 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -149,8 +149,16 @@ }, "java": { "default": "8", - "versions": [ - "8", "11", "12", "13", "14" + "default_vendor": "Temurin-Hotspot", + "vendors": [ + { + "name": "Temurin-Hotspot", + "versions": [ "8", "11" ] + }, + { + "name": "Adopt", + "versions": [ "8", "11", "12", "13", "14" ] + } ] }, "android": { diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index 4e64229f3870..2868bbdc817c 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -100,8 +100,16 @@ }, "java": { "default": "8", - "versions": [ - "8", "11" + "default_vendor": "Temurin-Hotspot", + "vendors": [ + { + "name": "Temurin-Hotspot", + "versions": [ "8", "11" ] + }, + { + "name": "Adopt", + "versions": [ "8", "11" ] + } ] }, "android": { From 0d16297bf748cbb51f3cf262f4e28175b29a9dd8 Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Wed, 22 Sep 2021 18:32:16 +0200 Subject: [PATCH 0557/3485] [Ubuntu] Simplify ghcup code (#4126) --- images/linux/scripts/installers/haskell.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/images/linux/scripts/installers/haskell.sh b/images/linux/scripts/installers/haskell.sh index 574052dc7fd2..702841e6da38 100644 --- a/images/linux/scripts/installers/haskell.sh +++ b/images/linux/scripts/installers/haskell.sh @@ -30,9 +30,7 @@ for majorMinorVersion in $minorMajorVersions; do ghcup set ghc $fullVersion # remove docs and profiling libs - ghc_bin_dir="$(ghcup whereis --directory ghc $fullVersion)" - [ -e "${ghc_bin_dir}" ] || exit 1 - ghc_dir="$(realpath "${ghc_bin_dir}"/..)" + ghc_dir="$(ghcup whereis basedir)/ghc/$fullVersion" [ -e "${ghc_dir}" ] || exit 1 find "${ghc_dir}" \( -name "*_p.a" -o -name "*.p_hi" \) -type f -delete rm -r "${ghc_dir}"/share/* From f59c79f259f52de93f3d4695e362046eae088658 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Wed, 22 Sep 2021 19:36:54 +0300 Subject: [PATCH 0558/3485] [macOS] Simpify ghcup code to use "ghcup whereis basedir" (#4127) --- images/macos/provision/core/haskell.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/images/macos/provision/core/haskell.sh b/images/macos/provision/core/haskell.sh index f79b58976832..feac3c3eddaa 100644 --- a/images/macos/provision/core/haskell.sh +++ b/images/macos/provision/core/haskell.sh @@ -16,9 +16,7 @@ for majorMinorVersion in $minorMajorVersions; do ghcup set $fullVersion # remove docs and profiling libs - ghc_bin_dir="$(ghcup whereis --directory ghc $fullVersion)" - [ -e "${ghc_bin_dir}" ] || exit 1 - ghc_dir="$( cd "$( dirname "${ghc_bin_dir}" )" > /dev/null 2>&1 && pwd )" + ghc_dir="$(ghcup whereis basedir)/ghc/$fullVersion" [ -e "${ghc_dir}" ] || exit 1 find "${ghc_dir}" \( -name "*_p.a" -o -name "*.p_hi" \) -type f -delete rm -r "${ghc_dir}"/share/* From c97e29c514950b373e9b11f037b778edd33812f7 Mon Sep 17 00:00:00 2001 From: Henti Smith <28868601+henti@users.noreply.github.com> Date: Thu, 23 Sep 2021 09:52:11 +0100 Subject: [PATCH 0559/3485] Add LLVM via choco (#4056) --- .../scripts/SoftwareReport/SoftwareReport.Common.psm1 | 5 +++++ .../scripts/SoftwareReport/SoftwareReport.Generator.ps1 | 1 + images/win/scripts/Tests/Tools.Tests.ps1 | 9 +++++++++ images/win/toolsets/toolset-2016.json | 1 + images/win/toolsets/toolset-2019.json | 1 + images/win/toolsets/toolset-2022.json | 1 + 6 files changed, 18 insertions(+) diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 index 4bcf722b011e..71adb7a96b08 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 @@ -94,6 +94,11 @@ function Get-JuliaVersion { return "Julia $juliaVersion" } +function Get-LLVMVersion { + $llvmVersion = [regex]::matches($(clang --version), "\d+\.\d+\.\d+").Value + return "LLVM $llvmVersion" +} + function Get-PerlVersion { ($(perl --version) | Out-String) -match "\(v(?\d+\.\d+\.\d+)\)" | Out-Null $perlVersion = $Matches.Version diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index 167de2ce4969..6a59ed3ae009 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -35,6 +35,7 @@ $languageTools = @( (Get-BashVersion), (Get-GoVersion), (Get-JuliaVersion), + (Get-LLVMVersion), (Get-NodeVersion), (Get-PHPVersion), (Get-PythonVersion), diff --git a/images/win/scripts/Tests/Tools.Tests.ps1 b/images/win/scripts/Tests/Tools.Tests.ps1 index 8f18ecce3143..e333e7d63361 100644 --- a/images/win/scripts/Tests/Tools.Tests.ps1 +++ b/images/win/scripts/Tests/Tools.Tests.ps1 @@ -81,6 +81,15 @@ Describe "KubernetesTools" { } } +Describe "LLVM" { + It "" -TestCases @( + @{ ToolName = "clang" } + @{ ToolName = "clang++" } + ) { + "$ToolName --version" | Should -ReturnZeroExitCode + } +} + Describe "Mingw64" { It "" -TestCases @( @{ ToolName = "gcc" } diff --git a/images/win/toolsets/toolset-2016.json b/images/win/toolsets/toolset-2016.json index 944ab75c0746..c85169ba6909 100644 --- a/images/win/toolsets/toolset-2016.json +++ b/images/win/toolsets/toolset-2016.json @@ -390,6 +390,7 @@ { "name": "gitversion.portable" }, { "name": "innosetup" }, { "name": "jq" }, + { "name": "llvm" }, { "name": "NuGet.CommandLine" }, { "name": "openssl.light", diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index 87abcdd1c5aa..de2b45b90bf5 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -420,6 +420,7 @@ { "name": "gitversion.portable" }, { "name": "innosetup" }, { "name": "jq" }, + { "name": "llvm" }, { "name": "NuGet.CommandLine" }, { "name": "openssl.light", diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index cd5dae9320e7..f5b2d1686e1f 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -245,6 +245,7 @@ { "name": "azcopy10" }, { "name": "Bicep" }, { "name": "jq" }, + { "name": "llvm" }, { "name": "NuGet.CommandLine" }, { "name": "openssl.light", From 65b91cc62b988abc6f8bb4cb3b7eb19d4410b482 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 23 Sep 2021 09:16:53 +0000 Subject: [PATCH 0560/3485] Updating readme file for win19 version 20210920.1 (#4122) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/win/Windows2019-Readme.md | 50 ++++++++++++++++---------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index 663ee9b2c906..8bf62e5075cf 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -3,8 +3,8 @@ | [(Public Beta) Windows Server 2022 with Visual Studio 2022 is now available](https://github.com/actions/virtual-environments/issues/3949) | *** # Microsoft Windows Server 2019 Datacenter -- OS Version: 10.0.17763 Build 2114 -- Image Version: 20210914.2 +- OS Version: 10.0.17763 Build 2183 +- Image Version: 20210920.1 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -14,7 +14,7 @@ - Bash 4.4.23(1)-release - Go 1.15.15 - Julia 1.6.2 -- Kotlin 1.5.20 +- Kotlin 1.5.31 - Node 14.17.6 - Perl 5.32.1 - PHP 8.0.10 @@ -23,7 +23,7 @@ ### Package Management - Chocolatey 0.11.1 -- Composer 2.1.7 +- Composer 2.1.8 - Helm 3.6.3 - Miniconda 4.10.3 (pre-installed on the image but not added to PATH) - NPM 6.14.15 @@ -31,7 +31,7 @@ - pip 21.2.4 (python 3.7) - Pipx 0.16.4 - RubyGems 2.7.6.3 -- Vcpkg (build from master \) +- Vcpkg (build from master \<4428702>) - Yarn 1.22.11 #### Environment variables @@ -66,7 +66,7 @@ - InnoSetup 6.2.0 - jq 1.6 - Kind 0.11.1 -- Kubectl 1.22.1 +- Kubectl 1.22.2 - Mercurial 5.0 - Mingw-w64 8.1.0 - Newman 5.3.0 @@ -85,7 +85,7 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.90 -- AWS CLI 2.2.37 +- AWS CLI 2.2.39 - AWS SAM CLI 1.31.0 - AWS Session Manager CLI 1.2.245.0 - Azure CLI 2.28.0 @@ -111,10 +111,10 @@ ### Browsers and webdrivers - Google Chrome 93.0.4577.82 - Chrome Driver 93.0.4577.63 -- Microsoft Edge 93.0.961.47 -- Microsoft Edge Driver 93.0.961.47 +- Microsoft Edge 93.0.961.52 +- Microsoft Edge Driver 93.0.961.52 - Mozilla Firefox 92.0 -- Gecko Driver 0.29.1 +- Gecko Driver 0.30.0 - IE Driver 3.150.1.1 #### Environment variables @@ -228,19 +228,19 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Web Servers | Name | Version | ConfigFile | ServiceName | ServiceStatus | ListenPort | | ------ | ------- | ------------------------------------- | ----------- | ------------- | ---------- | -| Apache | 2.4.48 | C:\tools\Apache24\conf\httpd.conf | Apache | Stopped | 80 | +| Apache | 2.4.49 | C:\tools\Apache24\conf\httpd.conf | Apache | Stopped | 80 | | Nginx | 1.21.3 | C:\tools\nginx-1.21.3\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2019 | Name | Version | Path | | ----------------------------- | --------------- | -------------------------------------------------------------- | -| Visual Studio Enterprise 2019 | 16.11.31624.102 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | +| Visual Studio Enterprise 2019 | 16.11.31702.278 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | #### Workloads, components and extensions: | Package | Version | | ------------------------------------------------------------------------- | --------------- | -| Component.Android.NDK.R16B | 16.11.31624.102 | +| Component.Android.NDK.R16B | 16.11.31627.206 | | Component.Android.SDK25.Private | 16.0.28625.61 | | Component.Android.SDK30 | 16.10.31205.252 | | Component.Ant | 1.9.3.8 | @@ -295,9 +295,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.Net.ComponentGroup.DevelopmentPrerequisites | 16.3.29207.166 | | Microsoft.Net.ComponentGroup.TargetingPacks.Common | 16.0.28516.191 | | Microsoft.NetCore.Component.DevelopmentTools | 16.10.31303.231 | -| Microsoft.NetCore.Component.Runtime.3.1 | 16.11.31603.221 | -| Microsoft.NetCore.Component.Runtime.5.0 | 16.11.31603.221 | -| Microsoft.NetCore.Component.SDK | 16.11.31603.221 | +| Microsoft.NetCore.Component.Runtime.3.1 | 16.11.31701.289 | +| Microsoft.NetCore.Component.Runtime.5.0 | 16.11.31701.289 | +| Microsoft.NetCore.Component.SDK | 16.11.31701.289 | | Microsoft.NetCore.Component.Web | 16.10.31303.231 | | Microsoft.VisualStudio.Component.AppInsights.Tools | 16.5.29515.121 | | Microsoft.VisualStudio.Component.AspNet45 | 16.10.31205.252 | @@ -491,20 +491,20 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### .NET Core SDK `Location C:\Program Files\dotnet\sdk` -- 2.1.302 2.1.403 2.1.526 2.1.617 2.1.701 2.1.818 3.1.118 3.1.202 3.1.302 3.1.412 5.0.104 5.0.206 5.0.303 5.0.400 +- 2.1.302 2.1.403 2.1.526 2.1.617 2.1.701 2.1.818 3.1.119 3.1.202 3.1.302 3.1.413 5.0.104 5.0.207 5.0.303 5.0.401 ### .NET Core Runtime `Location: C:\Program Files\dotnet\shared\Microsoft.AspNetCore.All` - 2.1.2 2.1.5 2.1.12 2.1.24 2.1.30 `Location: C:\Program Files\dotnet\shared\Microsoft.AspNetCore.App` -- 2.1.2 2.1.5 2.1.12 2.1.24 2.1.30 3.1.4 3.1.6 3.1.18 5.0.4 5.0.9 +- 2.1.2 2.1.5 2.1.12 2.1.24 2.1.30 3.1.4 3.1.6 3.1.19 5.0.4 5.0.9 5.0.10 `Location: C:\Program Files\dotnet\shared\Microsoft.NETCore.App` -- 2.1.2 2.1.5 2.1.12 2.1.24 2.1.30 3.1.4 3.1.6 3.1.18 5.0.4 5.0.9 +- 2.1.2 2.1.5 2.1.12 2.1.24 2.1.30 3.1.4 3.1.6 3.1.19 5.0.4 5.0.9 5.0.10 `Location: C:\Program Files\dotnet\shared\Microsoft.WindowsDesktop.App` -- 3.1.4 3.1.6 3.1.18 5.0.4 5.0.9 +- 3.1.4 3.1.6 3.1.19 5.0.4 5.0.9 5.0.10 ### .NET Framework `Type: Developer Pack` @@ -566,11 +566,11 @@ All other versions are saved but not installed. ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:60f7a23b2120c61b486c46d7efb1cb41bb56fe420d30289d25ecacf0298804d3 | 2021-08-10 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:454808052e90913049436560705482dbd22539ab14cfb1b4c05f4403b6651ce7 | 2021-08-10 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:4479ef12594660436cdeaa60f6bce8d06ab7b45a4af9d6c8b17413462262cd79 | 2021-08-10 | -| mcr.microsoft.com/windows/nanoserver:1809 | sha256:bf497134e6b9f1c0b0bcd677cff79f7fae6e545e5a6bf0198676b3b6eede1a64 | 2021-08-05 | -| mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:1be9c8378b8c32d31538253a4b96169f5138a5f6d4c0a04e8d8f9a80b9ac8097 | 2021-08-05 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:ff55a743a870b75591d2386b140867552b7f976f9250389e527b6f132d1d1629 | 2021-09-14 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:a3acbe2669d7290fbb04cd2c8a865fbee48ed45cb9a95b1183e386defd33213b | 2021-09-14 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:067c989576d5c60490585967a76313f9d8543ebda2dcbb447e81d741e6b2d017 | 2021-09-14 | +| mcr.microsoft.com/windows/nanoserver:1809 | sha256:03ee436d47400ad04331b22bff41b54c31f5391c91ef05c3dbadb6d2eb511cd2 | 2021-09-13 | +| mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:2b33eda096538c803fbf0c03dc7ea42c3c1b713e30aae03116d989867eda2bf8 | 2021-09-13 | From 43a9344f7e88cbf7f2c6193522ad1407d85190f2 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 23 Sep 2021 09:20:25 +0000 Subject: [PATCH 0561/3485] Updating readme file for ubuntu20 version 20210919.1 (#4110) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/linux/Ubuntu2004-README.md | 53 +++++++++++++++---------------- 1 file changed, 26 insertions(+), 27 deletions(-) diff --git a/images/linux/Ubuntu2004-README.md b/images/linux/Ubuntu2004-README.md index 428500ef6340..77131c4527ff 100644 --- a/images/linux/Ubuntu2004-README.md +++ b/images/linux/Ubuntu2004-README.md @@ -5,7 +5,7 @@ *** # Ubuntu 20.04.3 LTS - Linux kernel version: 5.8.0-1041-azure -- Image Version: 20210913.1 +- Image Version: 20210919.1 ## Installed Software ### Language and Runtime @@ -29,15 +29,15 @@ ### Package Management - cpan 1.64 -- Helm 3.6.3 -- Homebrew 3.2.11 +- Helm 3.7.0 +- Homebrew 3.2.12 - Miniconda 4.10.3 - Npm 6.14.15 - Pip 20.0.2 - Pip3 20.0.2 - Pipx 0.16.4 - RubyGems 3.1.2 -- Vcpkg (build from master \) +- Vcpkg (build from master \<4428702>) - Yarn 1.22.11 #### Environment variables @@ -54,7 +54,7 @@ - Sbt 1.5.5 ### Tools -- Ansible 2.11.4 +- Ansible 2.11.5 - apt-fast 1.9.11 - AzCopy 10.12.1 (available by `azcopy` and `azcopy10` aliases) - Bazel 4.2.1 @@ -67,49 +67,49 @@ - Docker-Buildx 0.6.3 - Docker-Moby Client 20.10.8+azure - Docker-Moby Server 20.10.8+azure -- Fastlane 2.193.1 +- Fastlane 2.194.0 - Git 2.33.0 (apt source repository: ppa:git-core/ppa) - Git LFS 2.13.3 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.6.0 - Haveged 1.9.1 - Heroku 7.59.0 -- HHVM (HipHop VM) 4.126.0 +- HHVM (HipHop VM) 4.127.0 - jq 1.6 - Kind 0.11.1 -- Kubectl 1.22.1 +- Kubectl 1.22.2 - Kustomize 4.3.0 -- Leiningen 2.9.6 +- Leiningen 2.9.7 - MediaInfo 19.09 - Mercurial 5.3.1 -- Minikube 1.23.0 +- Minikube 1.23.1 - Newman 5.3.0 - nvm 0.38.0 - OpenSSL 1.1.1f 31 Mar 2020 -- Packer 1.7.4 +- Packer 1.7.5 - PhantomJS 2.1.1 -- Podman 3.2.3 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) +- Podman 3.3.1 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Pulumi 3.12.0 - R 4.1.1 - Skopeo 1.3.0 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 -- Terraform 1.0.6 +- Terraform 1.0.7 - yamllint 1.26.3 -- yq 4.12.2 +- yq 4.13.0 - zstd 1.5.0 (homebrew) ### CLI Tools - Alibaba Cloud CLI 3.0.90 -- AWS CLI 2.2.37 +- AWS CLI 2.2.39 - AWS CLI Session manager plugin 1.2.245.0 - AWS SAM CLI 1.31.0 - Azure CLI (azure-cli) 2.28.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.20.0 - GitHub CLI 2.0.0 -- Google Cloud SDK 356.0.0 (apt source repository: https://packages.cloud.google.com/apt) +- Google Cloud SDK 357.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 6.8.12 -- OpenShift CLI 4.8.10 +- Netlify CLI 6.9.6 +- OpenShift CLI 4.8.11 - ORAS CLI 0.12.0 - Vercel CLI 23.1.2 @@ -128,7 +128,7 @@ | Tool | Version | | -------- | ------------- | | PHP | 7.4.23 8.0.10 | -| Composer | 2.1.6 | +| Composer | 2.1.8 | | PHPUnit | 8.5.20 | ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. @@ -147,17 +147,17 @@ #### Packages - Bindgen 0.59.1 -- Cargo audit 0.14.1 +- Cargo audit 0.15.2 - Cargo clippy 0.1.55 - Cargo outdated 0.9.17 - Cbindgen 0.20.0 - Rustfmt 1.4.37 ### Browsers and Drivers -- Google Chrome 93.0.4577.63 +- Google Chrome 93.0.4577.82 - ChromeDriver 93.0.4577.63 - Mozilla Firefox 92.0 -- Geckodriver 0.29.1 +- Geckodriver 0.30.0 - Chromium 93.0.4577.0 #### Environment variables @@ -167,7 +167,7 @@ | GECKOWEBDRIVER | /usr/local/share/gecko_driver | ### .NET Core SDK -- 2.1.302 2.1.403 2.1.526 2.1.617 2.1.701 2.1.818 3.1.118 3.1.202 3.1.302 3.1.412 5.0.104 5.0.206 5.0.303 5.0.400 +- 2.1.302 2.1.403 2.1.526 2.1.617 2.1.701 2.1.818 3.1.119 3.1.202 3.1.302 3.1.413 5.0.104 5.0.207 5.0.303 5.0.401 ### Databases - MongoDB 5.0.2 (apt source repository: https://repo.mongodb.org/apt/ubuntu) @@ -207,7 +207,7 @@ - 3.5.10 - 3.6.15 - 3.7.12 -- 3.8.11 +- 3.8.12 - 3.9.7 #### Ruby @@ -272,7 +272,6 @@ ### Cached Docker images | Repository:Tag | Digest | Created | | ----------------------- | ------------------------------------------------------------------------ | ---------- | -| alpine:3.11 | sha256:e457c945f4be075a9e5365c6628e552fcd15551f0bc1c1fc2ea0f2227a524210 | 2021-08-31 | | alpine:3.12 | sha256:a296b4c6f6ee2b88f095b61e95c7ef4f51ba25598835b4978c9256d8c8ace48a | 2021-08-31 | | alpine:3.13 | sha256:2582893dec6f12fd499d3a709477f2c0c0c1dfcd28024c93f1f0626b9e3540c8 | 2021-08-31 | | alpine:3.14 | sha256:e1c082e3d3c45cccac829840a25941e679c25d438cc8412c2fa221cf1a824e6a | 2021-08-27 | @@ -303,7 +302,7 @@ | build-essential | 12.8ubuntu1.1 | | bzip2 | 1.0.8-2 | | coreutils | 8.30-3ubuntu2 | -| curl | 7.68.0-1ubuntu2.6 | +| curl | 7.68.0-1ubuntu2.7 | | dbus | 1.12.16-2ubuntu2.1 | | dnsutils | 1:9.16.1-0ubuntu2.8 | | dpkg | 1.19.7ubuntu3 | @@ -321,7 +320,7 @@ | lib32z1 | 1:1.2.11.dfsg-2ubuntu1.2 | | libc++-dev | 1:10.0-50\~exp1 | | libc++abi-dev | 1:10.0-50\~exp1 | -| libcurl4 | 7.68.0-1ubuntu2.6 | +| libcurl4 | 7.68.0-1ubuntu2.7 | | libgbm-dev | 21.0.3-0ubuntu0.3\~20.04.1 | | libgconf-2-4 | 3.2.6-6ubuntu1 | | libgsl-dev | 2.5+dfsg-6build1 | From 55e7e1101b88718c17c7e11479cb9960df202f3b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 23 Sep 2021 09:22:03 +0000 Subject: [PATCH 0562/3485] Updating readme file for ubuntu18 version 20210919.1 (#4111) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/linux/Ubuntu1804-README.md | 53 +++++++++++++++---------------- 1 file changed, 26 insertions(+), 27 deletions(-) diff --git a/images/linux/Ubuntu1804-README.md b/images/linux/Ubuntu1804-README.md index 45708aa44831..c2f6ae984ab8 100644 --- a/images/linux/Ubuntu1804-README.md +++ b/images/linux/Ubuntu1804-README.md @@ -3,9 +3,9 @@ | [[Ubuntu] Alpine 3.11 docker image will be removed on September, 20](https://github.com/actions/virtual-environments/issues/4042) | | [Ubuntu 16.04 environment will be removed on September 20, 2021](https://github.com/actions/virtual-environments/issues/3287) | *** -# Ubuntu 18.04.5 LTS -- Linux kernel version: 5.4.0-1058-azure -- Image Version: 20210913.1 +# Ubuntu 18.04.6 LTS +- Linux kernel version: 5.4.0-1056-azure +- Image Version: 20210919.1 ## Installed Software ### Language and Runtime @@ -29,15 +29,15 @@ ### Package Management - cpan 1.64 -- Helm 3.6.3 -- Homebrew 3.2.11 +- Helm 3.7.0 +- Homebrew 3.2.12 - Miniconda 4.10.3 - Npm 6.14.15 - Pip 9.0.1 - Pip3 9.0.1 - Pipx 0.16.4 - RubyGems 2.7.6 -- Vcpkg (build from master \) +- Vcpkg (build from master \<4428702>) - Yarn 1.22.11 #### Environment variables @@ -53,7 +53,7 @@ - Sbt 1.5.5 ### Tools -- Ansible 2.11.4 +- Ansible 2.11.5 - apt-fast 1.9.11 - AzCopy 10.12.1 (available by `azcopy` and `azcopy10` aliases) - Bazel 4.2.1 @@ -71,19 +71,19 @@ - Git-ftp 1.3.1 - Haveged 1.9.1 - Heroku 7.59.0 -- HHVM (HipHop VM) 4.126.0 +- HHVM (HipHop VM) 4.127.0 - jq 1.5 - Kind 0.11.1 -- Kubectl 1.22.1 +- Kubectl 1.22.2 - Kustomize 4.3.0 -- Leiningen 2.9.6 +- Leiningen 2.9.7 - MediaInfo 17.12 - Mercurial 4.5.3 -- Minikube 1.23.0 +- Minikube 1.23.1 - Newman 5.3.0 - nvm 0.38.0 - OpenSSL 1.1.1 11 Sep 2018 -- Packer 1.7.4 +- Packer 1.7.5 - PhantomJS 2.1.1 - Podman 3.0.1 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Pulumi 3.12.0 @@ -91,23 +91,23 @@ - Skopeo 1.2.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 - SVN 1.9.7 -- Terraform 1.0.6 +- Terraform 1.0.7 - yamllint 1.26.3 -- yq 4.12.2 +- yq 4.13.0 - zstd 1.5.0 (homebrew) ### CLI Tools - Alibaba Cloud CLI 3.0.90 -- AWS CLI 1.20.40 +- AWS CLI 1.20.44 - AWS CLI Session manager plugin 1.2.245.0 - AWS SAM CLI 1.31.0 - Azure CLI (azure-cli) 2.28.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.20.0 - GitHub CLI 2.0.0 -- Google Cloud SDK 356.0.0 (apt source repository: https://packages.cloud.google.com/apt) +- Google Cloud SDK 357.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 6.8.12 -- OpenShift CLI 4.8.10 +- Netlify CLI 6.9.6 +- OpenShift CLI 4.8.11 - ORAS CLI 0.12.0 - Vercel CLI 23.1.2 @@ -122,7 +122,7 @@ | Tool | Version | | -------- | ---------------------------------- | | PHP | 7.1.33 7.2.34 7.3.30 7.4.23 8.0.10 | -| Composer | 2.1.6 | +| Composer | 2.1.8 | | PHPUnit | 8.5.20 | ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. @@ -141,17 +141,17 @@ #### Packages - Bindgen 0.59.1 -- Cargo audit 0.14.1 +- Cargo audit 0.15.2 - Cargo clippy 0.1.55 - Cargo outdated 0.9.17 - Cbindgen 0.20.0 - Rustfmt 1.4.37 ### Browsers and Drivers -- Google Chrome 93.0.4577.63 +- Google Chrome 93.0.4577.82 - ChromeDriver 93.0.4577.63 - Mozilla Firefox 92.0 -- Geckodriver 0.29.1 +- Geckodriver 0.30.0 - Chromium 93.0.4577.0 #### Environment variables @@ -161,7 +161,7 @@ | GECKOWEBDRIVER | /usr/local/share/gecko_driver | ### .NET Core SDK -- 2.1.302 2.1.403 2.1.526 2.1.617 2.1.701 2.1.818 3.1.118 3.1.202 3.1.302 3.1.412 5.0.104 5.0.206 5.0.303 5.0.400 +- 2.1.302 2.1.403 2.1.526 2.1.617 2.1.701 2.1.818 3.1.119 3.1.202 3.1.302 3.1.413 5.0.104 5.0.207 5.0.303 5.0.401 ### Databases - MongoDB 5.0.2 (apt source repository: https://repo.mongodb.org/apt/ubuntu) @@ -201,7 +201,7 @@ - 3.5.10 - 3.6.15 - 3.7.12 -- 3.8.11 +- 3.8.12 - 3.9.7 #### Ruby @@ -266,7 +266,6 @@ ### Cached Docker images | Repository:Tag | Digest | Created | | ----------------------- | ------------------------------------------------------------------------ | ---------- | -| alpine:3.11 | sha256:e457c945f4be075a9e5365c6628e552fcd15551f0bc1c1fc2ea0f2227a524210 | 2021-08-31 | | alpine:3.12 | sha256:a296b4c6f6ee2b88f095b61e95c7ef4f51ba25598835b4978c9256d8c8ace48a | 2021-08-31 | | alpine:3.13 | sha256:2582893dec6f12fd499d3a709477f2c0c0c1dfcd28024c93f1f0626b9e3540c8 | 2021-08-31 | | alpine:3.14 | sha256:e1c082e3d3c45cccac829840a25941e679c25d438cc8412c2fa221cf1a824e6a | 2021-08-27 | @@ -296,7 +295,7 @@ | build-essential | 12.4ubuntu1 | | bzip2 | 1.0.6-8.1ubuntu0.2 | | coreutils | 8.28-1ubuntu1 | -| curl | 7.58.0-2ubuntu3.14 | +| curl | 7.58.0-2ubuntu3.15 | | dbus | 1.12.2-1ubuntu1.2 | | dnsutils | 1:9.11.3+dfsg-1ubuntu1.15 | | dpkg | 1.19.0.5ubuntu2.3 | @@ -313,7 +312,7 @@ | lib32z1 | 1:1.2.11.dfsg-0ubuntu2 | | libc++-dev | 6.0-2 | | libc++abi-dev | 6.0-2 | -| libcurl3 | 7.58.0-2ubuntu3.14 | +| libcurl3 | 7.58.0-2ubuntu3.15 | | libgbm-dev | 20.0.8-0ubuntu1\~18.04.1 | | libgconf-2-4 | 3.2.6-4ubuntu1 | | libgsl-dev | 2.4+dfsg-6 | From 59f8fd1e625cea2b1da4070a52669eb8c23013e2 Mon Sep 17 00:00:00 2001 From: Darleev <50947177+Darleev@users.noreply.github.com> Date: Thu, 23 Sep 2021 09:25:03 +0000 Subject: [PATCH 0563/3485] [macOS] Anka script for clean macOS generation. (#4028) --- .../configuration/CreateCleanAnkaTemplate.ps1 | 228 ++++++++++++++++++ 1 file changed, 228 insertions(+) create mode 100644 images/macos/provision/configuration/CreateCleanAnkaTemplate.ps1 diff --git a/images/macos/provision/configuration/CreateCleanAnkaTemplate.ps1 b/images/macos/provision/configuration/CreateCleanAnkaTemplate.ps1 new file mode 100644 index 000000000000..c4e6689cc54b --- /dev/null +++ b/images/macos/provision/configuration/CreateCleanAnkaTemplate.ps1 @@ -0,0 +1,228 @@ +[CmdletBinding()] +param( + [Parameter(Mandatory)] + [ValidateNotNullOrEmpty()] + [Version] $MacOSVersion, + + [ValidateNotNullOrEmpty()] + [String] $TemplateUsername, + + [Parameter(Mandatory)] + [ValidateNotNullOrEmpty()] + [String] $TemplatePassword, + + [Parameter(Mandatory)] + [ValidateNotNullOrEmpty()] + [String] $RegistryUrl, + + [Bool] $BetaSearch = $false, + [Int] $CpuCount = 6, + [Int] $RamSizeGb = 7, + [Int] $DiskSizeGb = 300, + [String] $DisplayResolution = "1920x1080" +) + +$ErrorActionPreference = "Stop" + +function Get-MacOSInstallers { + param ( + [version] $MacOSVersion, + [bool] $BetaSearch = $false + ) + + # Enroll machine to DeveloperSeed if we need beta and unenroll otherwise + $seedutil = "/System/Library/PrivateFrameworks/Seeding.framework/Versions/Current/Resources/seedutil" + if ($BetaSearch) { + Write-Host "Beta Version requested. Enrolling machine to DeveloperSeed" + sudo $seedutil enroll DeveloperSeed | Out-Null + } else { + Write-Host "Reseting the seed before requesting stable versions" + sudo $seedutil unenroll | Out-Null + } + + # Validate there is no softwareupdate at the moment + Test-SoftwareUpdate + + # Validate availability OSVersion + $availableVersions = Get-AvailableVersions -IsBeta $BetaSearch + $macOSName = $availableVersions.Where{ $_.OSVersion -eq $MacOSVersion }.OSName + if (-not $macOSName) { + Write-Host "Requested macOS '$MacOSVersion' version not found in the list of available installers. Available versions are:`n$($availableVersions.OSVersion)" + Write-Host 'Make sure to pass "-BetaSearch $true" if you need a beta version installer' + exit 1 + } + + $installerPathPattern = "/Applications/Install*${macOSName}.app" + if (Test-Path $installerPathPattern) { + $previousInstallerPath = Get-Item -Path $installerPathPattern + Write-Host "Removing '$previousInstallerPath' installation app before downloading the new one" + sudo rm -rf "$previousInstallerPath" + } + + # Download macOS installer + Write-Host "Requested macOS '$MacOSVersion' version installer found, fetching it from Apple Software Update" + $result = Invoke-WithRetry { softwareupdate --fetch-full-installer --full-installer-version $MacOSVersion } {$LASTEXITCODE -eq 0} | Out-String + if (-not $result.Contains("Install finished successfully")) { + Write-Host "[Error]: failed to fetch $MacOSVersion macOS '$MacOSVersion' `n$result" + exit 1 + } + + $installerPath = Get-Item -Path $installerPathPattern + Write-Host "Installer successfully downloaded to '$installerPath'" + + return $installerPath.FullName +} + +function Invoke-WithRetry { + param( + [scriptblock] $Command, + [scriptblock] $BreakCondition, + [int] $RetryCount = 20, + [int] $Seconds = 60 + ) + + while ($RetryCount -gt 0) { + $result = & $Command + + if (& $BreakCondition) { + break + } + + $RetryCount-- + Write-Host "Waiting $Seconds seconds before retrying. Retries left: $RetryCount" + Start-Sleep -Seconds $Seconds + } + + $result +} + +function Get-AvailableVersions { + param ( + [Int] $RetryCount = 20, + [Int] $RetryInterval = 60, + [Bool] $IsBeta = $false + ) + + if ($IsBeta) { + $searchPostfix = " beta" + } + + $softwareUpdates = Invoke-WithRetry { softwareupdate --list-full-installers | Where-Object { $_.Contains("Title: macOS") -and $_ -match $searchPostfix } } { {$LASTEXITCODE -eq 0}} + $allVersions = $softwareUpdates -replace "(\* )?(Title|Version|Size):" | ConvertFrom-Csv -Header OsName, OsVersion + + return $allVersions +} + +function Test-SoftwareUpdate { + param ( + [String] $UpdateProcessName = "softwareupdate", + [Int] $RetryCount = 20, + [Int] $RetryInterval = 60 + ) + + $command = { + $updateProcess = (Get-Process -Name $UpdateProcessName -ErrorAction SilentlyContinue).id + if ($updateProcess) { + # Workaround to get commandline param as it doesn't work for macOS atm https://github.com/PowerShell/PowerShell/issues/13943 + $processName = ps -o command= $updateProcess + Write-Host "Another software update process is in place with the following arguments '$processName', wait $RetryInterval seconds, $RetryCount attempts left" + } + } + $condition = { + $null -eq (Get-Process -Name $UpdateProcessName -ErrorAction SilentlyContinue) + } + + Invoke-WithRetry -Command $command -BreakCondition $condition +} + +function New-AnkaVMTemplate { + param ( + [String] $InstallerPath, + [String] $ShortMacOSVersion, + [String] $TemplateName, + [String] $TemplateUsername, + [String] $TemplatePassword, + [Int] $CpuCount, + [Int] $RamSizeGb, + [Int] $DiskSizeGb, + [String] $DisplayResolution + ) + + $isTemplateExists = (Invoke-Anka { anka --machine-readable list } | ConvertFrom-Json).body.name -eq $templateName + if ($isTemplateExists) { + Write-Host "Deleting existed template with name '$templateName' before creating a new one" + Invoke-Anka { anka delete $templateName --yes } + } + + Write-Host "Creating Anka VM template with name '$TemplateName' and user $TemplateUsername" + $env:ANKA_DEFAULT_USER = $TemplateUsername + $env:ANKA_DEFAULT_PASSWD = $TemplatePassword + $env:ANKA_CREATE_SUSPEND = 0 + Write-Host "Cpu Count: $CpuCount, RamSize: ${RamSizeGb}G, DiskSizeGb: ${DiskSizeGb}G, InstallerPath: $InstallerPath, TemplateName: $templateName" + Invoke-Anka { anka create --cpu-count $CpuCount --ram-size "${RamSizeGb}G" --disk-size "${DiskSizeGb}G" --app $InstallerPath $templateName } + + # Apple Metal is available starting from Big Sur + if (-not $ShortMacOSVersion.StartsWith("10.")) { + Write-Host "Enabling Graphics Acceleration with Apple Metal for $templateName" + Invoke-Anka { anka modify $templateName set display -c pg } + } + + Write-Host "Setting screen resolution to $DisplayResolution for $templateName" + Invoke-Anka { anka modify $templateName set display -r $DisplayResolution } + + return $templateName +} + +function Add-AnkaImageToRegistry { + param ( + [String] $RegistryUrl, + [String] $ShortMacOSVersion, + [String] $TemplateName + ) + + Write-Host "Pushing image to the registry..." + Invoke-Anka { anka registry -a $RegistryUrl push -t $ShortMacOSVersion $TemplateName } +} + +function Invoke-Anka { + param ( + [scriptblock] $Cmd + ) + + & $Cmd + if ($LASTEXITCODE -ne 0) { + Write-Error "There is an error during command execution" + exit 1 + } +} + +function Get-ShortMacOSVersion { + param ( + [Version] $MacOSVersion + ) + + # Take Major.Minor version for macOS 10 (10.14 or 10.15) and Major for all further versions + if ($MacOSVersion.Major -eq 10) { + $shortMacOSVersion = $MacOSVersion.ToString(2) + } + else { + $shortMacOSVersion = $MacOSVersion.Major + } + + return $shortMacOSVersion +} + +$macOSInstaller = Get-MacOSInstallers -MacOSVersion $MacOSVersion -BetaSearch $BetaSearch +$shortMacOSVersion = Get-ShortMacOSVersion -MacOSVersion $MacOSVersion +$templateName = "clean_macos_${shortMacOSVersion}_${DiskSizeGb}gb" +New-AnkaVMTemplate -InstallerPath $macOSInstaller ` + -ShortMacOSVersion $shortMacOSVersion ` + -TemplateName $templateName ` + -TemplateUsername $TemplateUsername ` + -TemplatePassword $TemplatePassword ` + -CpuCount $CpuCount ` + -RamSizeGb $RamSizeGb ` + -DiskSizeGb $DiskSizeGb ` + -DisplayResolution $DisplayResolution + +Add-AnkaImageToRegistry -RegistryUrl $registryUrl -ShortMacOSVersion $shortMacOSVersion -TemplateName $templateName \ No newline at end of file From fabf527ea8b5a9a2fe3e6742369d30f2cce4f11b Mon Sep 17 00:00:00 2001 From: Nikita Bykov <49442273+nikita-bykov@users.noreply.github.com> Date: Thu, 23 Sep 2021 13:33:28 +0300 Subject: [PATCH 0564/3485] [Windows] Add android NDK r23 (#4100) --- .../scripts/Installers/Install-AndroidSDK.ps1 | 27 +++++++------------ .../SoftwareReport.Android.psm1 | 21 ++++++++++++++- images/win/scripts/Tests/Android.Tests.ps1 | 18 ++++++++----- images/win/toolsets/toolset-2016.json | 6 +++-- images/win/toolsets/toolset-2019.json | 6 +++-- images/win/toolsets/toolset-2022.json | 6 +++-- 6 files changed, 54 insertions(+), 30 deletions(-) diff --git a/images/win/scripts/Installers/Install-AndroidSDK.ps1 b/images/win/scripts/Installers/Install-AndroidSDK.ps1 index acb6aefd5c60..427614d9ae7c 100644 --- a/images/win/scripts/Installers/Install-AndroidSDK.ps1 +++ b/images/win/scripts/Installers/Install-AndroidSDK.ps1 @@ -96,34 +96,27 @@ Install-AndroidSDKPackages -AndroidSDKManagerPath $sdkManager ` -AndroidPackages $androidToolset.additional_tools # NDKs -$ndkLTSMajorVersion = $androidToolset.ndk.lts -$ndkLatestMajorVersion = $androidToolset.ndk.latest +$ndkMajorVersions = $androidToolset.ndk.versions +$ndkDefaultMajorVersion = $androidToolset.ndk.default +$ndkLatestMajorVersion = $ndkMajorVersions | Select-Object -Last 1 -$ndkLTSPackageName = Get-AndroidPackagesByName -AndroidPackages $androidPackages ` - -PrefixPackageName "ndk;$ndkLTSMajorVersion" ` - | Sort-Object -Unique ` - | Select-Object -Last 1 - -$ndkLatestPackageName = Get-AndroidPackagesByName -AndroidPackages $androidPackages ` - -PrefixPackageName "ndk;$ndkLatestMajorVersion" ` - | Sort-Object -Unique ` - | Select-Object -Last 1 - -$androidNDKs = @($ndkLTSPackageName, $ndkLatestPackageName) +$androidNDKs = $ndkMajorVersions | Foreach-Object { + Get-AndroidPackagesByName -AndroidPackages $androidPackages -PrefixPackageName "ndk;$_" | Sort-Object -Unique | Select-Object -Last 1 +} Install-AndroidSDKPackages -AndroidSDKManagerPath $sdkManager ` -AndroidSDKRootPath $sdkRoot ` -AndroidPackages $androidNDKs -$ndkLTSVersion = $ndkLTSPackageName.Split(';')[1] -$ndkLatestVersion = $ndkLatestPackageName.Split(';')[1] +$ndkDefaultVersion = ($androidNDKs | Where-Object { $_ -match "ndk;$ndkDefaultMajorVersion" }).Split(';')[1] +$ndkLatestVersion = ($androidNDKs | Where-Object { $_ -match "ndk;$ndkLatestMajorVersion" }).Split(';')[1] # Android NDK root path. $ndkRoot = "$sdkRoot\ndk-bundle" # This changes were added due to incompatibility with android ndk-bundle (ndk;22.0.7026061). # Link issue virtual-environments: https://github.com/actions/virtual-environments/issues/2481 # Link issue xamarin-android: https://github.com/xamarin/xamarin-android/issues/5526 -New-Item -Path $ndkRoot -ItemType SymbolicLink -Value "$sdkRoot\ndk\$ndkLTSVersion" +New-Item -Path $ndkRoot -ItemType SymbolicLink -Value "$sdkRoot\ndk\$ndkDefaultVersion" if (Test-Path $ndkRoot) { setx ANDROID_HOME $sdkRoot /M @@ -133,7 +126,7 @@ if (Test-Path $ndkRoot) { setx ANDROID_NDK_ROOT $ndkRoot /M (Get-Content -Encoding UTF8 "${ndkRoot}\ndk-build.cmd").replace('%~dp0\build\ndk-build.cmd','"%~dp0\build\ndk-build.cmd"')|Set-Content -Encoding UTF8 "${ndkRoot}\ndk-build.cmd" } else { - Write-Host "LTS NDK $ndkLTSVersion is not installed at path $ndkRoot" + Write-Host "Default NDK $ndkDefaultVersion is not installed at path $ndkRoot" exit 1 } diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Android.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Android.psm1 index 0c034b6f4ba1..37baf4625669 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Android.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Android.psm1 @@ -75,7 +75,7 @@ function Build-AndroidTable { }, @{ "Package" = "NDK" - "Version" = Get-AndroidPackageVersions -PackageInfo $packageInfo -MatchedString "ndk;" + "Version" = Get-AndroidNdkVersions -PackageInfo $packageInfo }, @{ "Package" = "SDK Patch Applier v4" @@ -158,6 +158,25 @@ function Get-AndroidGoogleAPIsVersions { return ($versions -Join "
") } +function Get-AndroidNdkVersions { + param ( + [Parameter(Mandatory)] + [object] $PackageInfo + ) + + $ndkLinkTarget = (Get-Item $env:ANDROID_NDK_HOME).Target + $ndkDefaultFullVersion = Split-Path -Path $ndkLinkTarget -Leaf + + $versions = $packageInfo | Where-Object { $_ -Match "ndk;" } | ForEach-Object { + $version = (Split-TableRowByColumns $_)[1] + if ($version -eq $ndkDefaultFullVersion) { + $version += " (default)" + } + $version + } + return ($versions -Join "
") +} + function Build-AndroidEnvironmentTable { $androidVersions = Get-Item env:ANDROID_* diff --git a/images/win/scripts/Tests/Android.Tests.ps1 b/images/win/scripts/Tests/Android.Tests.ps1 index 40af8c4559fa..6ca51c2fe805 100644 --- a/images/win/scripts/Tests/Android.Tests.ps1 +++ b/images/win/scripts/Tests/Android.Tests.ps1 @@ -5,8 +5,12 @@ Describe "Android SDK" { $androidPackages = Get-AndroidPackages -AndroidSDKManagerPath (Get-AndroidSDKManagerPath) $androidInstalledPackages = Get-AndroidInstalledPackages - $ndkLTSMajorVersion = $androidToolset.ndk.lts - $ndkLatestMajorVersion = $androidToolset.ndk.latest + $ndkDefaultMajorVersion = $androidToolset.ndk.default + $ndkDefaultFullVersion = Get-ChildItem "$env:ANDROID_HOME/ndk/$ndkDefaultMajorVersion.*" -Name | Select-Object -Last 1 + $ndkVersions = $androidToolset.ndk.versions + $ndkPackagesTestCases = $ndkVersions | ForEach-Object { + @{ ndkPackage = $_; installedPackages = $androidInstalledPackages } + } $platformTestCases = @() [int]$platformMinVersion = $androidToolset.platform_min_version @@ -91,12 +95,14 @@ Describe "Android SDK" { "$installedPackages" | Should -Match $additionalToolVersion } - It "LTS NDK is installed" -TestCases @(@{ ndkLTSVersion = $ndkLTSMajorVersion; installedPackages = $androidInstalledPackages }) { - "$installedPackages" | Should -Match "ndk;$ndkLTSVersion" + It "NDK is installed" -TestCases $ndkPackagesTestCases { + "$installedPackages" | Should -Match "ndk;$ndkPackage" } - It "Latest NDK is installed" -TestCases @(@{ ndkLatestVersion = $ndkLatestMajorVersion; installedPackages = $androidInstalledPackages }) { - "$installedPackages" | Should -Match "ndk;$ndkLatestVersion" + It "ndk-bundle points to the default NDK version" -TestCases @{ ndkDefaultVersion = $ndkDefaultFullVersion } { + $ndkLinkTarget = (Get-Item $env:ANDROID_NDK_HOME).Target + $ndkVersion = Split-Path -Path $ndkLinkTarget -Leaf + $ndkVersion | Should -BeExactly $ndkDefaultVersion } } } diff --git a/images/win/toolsets/toolset-2016.json b/images/win/toolsets/toolset-2016.json index c85169ba6909..e1f58c0213ef 100644 --- a/images/win/toolsets/toolset-2016.json +++ b/images/win/toolsets/toolset-2016.json @@ -178,8 +178,10 @@ "patcher;v4" ], "ndk": { - "lts": "21", - "latest": "22" + "default": "21", + "versions": [ + "21", "22", "23" + ] } }, "MsysPackages": { diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index de2b45b90bf5..415391440362 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -178,8 +178,10 @@ "patcher;v4" ], "ndk": { - "lts": "21", - "latest": "22" + "default": "21", + "versions": [ + "21", "22", "23" + ] } }, "MsysPackages": { diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index f5b2d1686e1f..ecf23ab2113f 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -132,8 +132,10 @@ "patcher;v4" ], "ndk": { - "lts": "21", - "latest": "22" + "default": "21", + "versions": [ + "21", "22", "23" + ] } }, "MsysPackages": { From 41c6b5d6ca4c301b6615a6fd26f8c9abdf357136 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 23 Sep 2021 13:35:40 +0000 Subject: [PATCH 0565/3485] Updating readme file for win16 version 20210919.1 (#4114) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/win/Windows2016-Readme.md | 62 ++++++++++++++++---------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/images/win/Windows2016-Readme.md b/images/win/Windows2016-Readme.md index 98df23e4e495..f8b9330617b3 100644 --- a/images/win/Windows2016-Readme.md +++ b/images/win/Windows2016-Readme.md @@ -3,15 +3,15 @@ | [(Public Beta) Windows Server 2022 with Visual Studio 2022 is now available](https://github.com/actions/virtual-environments/issues/3949) | *** # Microsoft Windows Server 2016 Datacenter -- OS Version: 10.0.14393 Build 4583 -- Image Version: 20210914.2 +- OS Version: 10.0.14393 Build 4651 +- Image Version: 20210919.1 ## Installed Software ### Language and Runtime - Bash 4.4.23(1)-release - Go 1.15.15 - Julia 1.6.2 -- Kotlin 1.5.20 +- Kotlin 1.5.30 - Node 14.17.6 - Perl 5.32.1 - PHP 8.0.10 @@ -20,7 +20,7 @@ ### Package Management - Chocolatey 0.11.1 -- Composer 2.1.7 +- Composer 2.1.8 - Helm 3.6.3 - Miniconda 4.10.3 (pre-installed on the image but not added to PATH) - NPM 6.14.15 @@ -28,7 +28,7 @@ - pip 21.2.4 (python 3.7) - Pipx 0.16.4 - RubyGems 2.7.6.3 -- Vcpkg (build from master \) +- Vcpkg (build from master \<4428702>) - Yarn 1.22.11 #### Environment variables @@ -63,7 +63,7 @@ - InnoSetup 6.2.0 - jq 1.6 - Kind 0.11.1 -- Kubectl 1.22.1 +- Kubectl 1.22.2 - Mercurial 5.0 - Mingw-w64 8.1.0 - Newman 5.3.0 @@ -82,7 +82,7 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.90 -- AWS CLI 2.2.37 +- AWS CLI 2.2.39 - AWS SAM CLI 1.31.0 - AWS Session Manager CLI 1.2.245.0 - Azure CLI 2.28.0 @@ -108,10 +108,10 @@ ### Browsers and webdrivers - Google Chrome 93.0.4577.82 - Chrome Driver 93.0.4577.63 -- Microsoft Edge 93.0.961.47 -- Microsoft Edge Driver 93.0.961.47 +- Microsoft Edge 93.0.961.52 +- Microsoft Edge Driver 93.0.961.52 - Mozilla Firefox 92.0 -- Gecko Driver 0.29.1 +- Gecko Driver 0.30.0 - IE Driver 3.150.1.1 #### Environment variables @@ -222,13 +222,13 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Web Servers | Name | Version | ConfigFile | ServiceName | ServiceStatus | ListenPort | | ------ | ------- | ------------------------------------- | ----------- | ------------- | ---------- | -| Apache | 2.4.48 | C:\tools\Apache24\conf\httpd.conf | Apache | Stopped | 80 | +| Apache | 2.4.49 | C:\tools\Apache24\conf\httpd.conf | Apache | Stopped | 80 | | Nginx | 1.21.3 | C:\tools\nginx-1.21.3\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2017 | Name | Version | Path | | ----------------------------- | --------------- | -------------------------------------------------------------- | -| Visual Studio Enterprise 2017 | 15.9.28307.1622 | C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise | +| Visual Studio Enterprise 2017 | 15.9.28307.1684 | C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise | #### Workloads, components and extensions: @@ -304,10 +304,10 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.Net.ComponentGroup.DevelopmentPrerequisites | 15.8.27825.0 | | Microsoft.Net.ComponentGroup.TargetingPacks.Common | 15.6.27406.0 | | Microsoft.Net.Core.Component.SDK.1x | 15.9.28307.1259 | -| Microsoft.Net.Core.Component.SDK.2.1 | 15.9.28307.1439 | +| Microsoft.Net.Core.Component.SDK.2.1 | 15.9.28307.1684 | | Microsoft.NetCore.1x.ComponentGroup.Web | 15.9.28307.1259 | -| Microsoft.NetCore.ComponentGroup.DevelopmentTools.2.1 | 15.8.27924.0 | -| Microsoft.NetCore.ComponentGroup.Web.2.1 | 15.8.27924.0 | +| Microsoft.NetCore.ComponentGroup.DevelopmentTools.2.1 | 15.9.28307.1684 | +| Microsoft.NetCore.ComponentGroup.Web.2.1 | 15.9.28307.1684 | | Microsoft.VisualStudio.Component.AppInsights.Tools | 15.8.27825.0 | | Microsoft.VisualStudio.Component.AspNet45 | 15.7.27625.0 | | Microsoft.VisualStudio.Component.Azure.AuthoringTools | 15.9.28307.421 | @@ -449,9 +449,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions | 15.8.27825.0 | | Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.TemplateEngine | 15.8.27729.1 | | Microsoft.VisualStudio.Web.Mvc4.ComponentGroup | 15.6.27406.0 | -| Microsoft.VisualStudio.Workload.Azure | 15.9.28307.1439 | +| Microsoft.VisualStudio.Workload.Azure | 15.9.28307.1684 | | Microsoft.VisualStudio.Workload.CoreEditor | 15.0.27205.0 | -| Microsoft.VisualStudio.Workload.Data | 15.9.28307.1439 | +| Microsoft.VisualStudio.Workload.Data | 15.9.28307.1684 | | Microsoft.VisualStudio.Workload.DataScience | 15.9.28307.421 | | Microsoft.VisualStudio.Workload.ManagedDesktop | 15.9.28307.1062 | | Microsoft.VisualStudio.Workload.ManagedGame | 15.0.27005.2 | @@ -459,13 +459,13 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Workload.NativeDesktop | 15.9.28307.102 | | Microsoft.VisualStudio.Workload.NativeGame | 15.9.28307.102 | | Microsoft.VisualStudio.Workload.NativeMobile | 15.9.28107.0 | -| Microsoft.VisualStudio.Workload.NetCoreTools | 15.8.27906.1 | -| Microsoft.VisualStudio.Workload.NetCrossPlat | 15.9.28107.0 | -| Microsoft.VisualStudio.Workload.NetWeb | 15.9.28307.1439 | +| Microsoft.VisualStudio.Workload.NetCoreTools | 15.9.28307.1684 | +| Microsoft.VisualStudio.Workload.NetCrossPlat | 15.9.28307.1684 | +| Microsoft.VisualStudio.Workload.NetWeb | 15.9.28307.1684 | | Microsoft.VisualStudio.Workload.Node | 15.9.28107.0 | -| Microsoft.VisualStudio.Workload.Office | 15.9.28307.1439 | +| Microsoft.VisualStudio.Workload.Office | 15.9.28307.1684 | | Microsoft.VisualStudio.Workload.Python | 15.9.28307.1500 | -| Microsoft.VisualStudio.Workload.Universal | 15.9.28307.1439 | +| Microsoft.VisualStudio.Workload.Universal | 15.9.28307.1684 | | Microsoft.VisualStudio.Workload.VisualStudioExtension | 15.7.27625.0 | | Microsoft.VisualStudio.Workload.WebCrossPlat | 15.9.28307.341 | | SSDT Microsoft Analysis Services Projects | 2.9.6 | @@ -497,20 +497,20 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### .NET Core SDK `Location C:\Program Files\dotnet\sdk` -- 1.1.14 2.1.302 2.1.403 2.1.525 2.1.526 2.1.617 2.1.701 2.1.818 3.1.118 3.1.202 3.1.302 3.1.412 5.0.104 5.0.206 5.0.303 5.0.400 +- 1.1.14 2.1.302 2.1.403 2.1.526 2.1.617 2.1.701 2.1.818 3.1.119 3.1.202 3.1.302 3.1.413 5.0.104 5.0.207 5.0.303 5.0.401 ### .NET Core Runtime `Location: C:\Program Files\dotnet\shared\Microsoft.AspNetCore.All` -- 2.1.2 2.1.5 2.1.12 2.1.24 2.1.29 2.1.30 +- 2.1.2 2.1.5 2.1.12 2.1.24 2.1.30 `Location: C:\Program Files\dotnet\shared\Microsoft.AspNetCore.App` -- 2.1.2 2.1.5 2.1.12 2.1.24 2.1.29 2.1.30 3.1.4 3.1.6 3.1.18 5.0.4 5.0.9 +- 2.1.2 2.1.5 2.1.12 2.1.24 2.1.30 3.1.4 3.1.6 3.1.19 5.0.4 5.0.9 5.0.10 `Location: C:\Program Files\dotnet\shared\Microsoft.NETCore.App` -- 1.0.16 1.1.13 2.1.2 2.1.5 2.1.12 2.1.24 2.1.29 2.1.30 3.1.4 3.1.6 3.1.18 5.0.4 5.0.9 +- 1.0.16 1.1.13 2.1.2 2.1.5 2.1.12 2.1.24 2.1.30 3.1.4 3.1.6 3.1.19 5.0.4 5.0.9 5.0.10 `Location: C:\Program Files\dotnet\shared\Microsoft.WindowsDesktop.App` -- 3.1.4 3.1.6 3.1.18 5.0.4 5.0.9 +- 3.1.4 3.1.6 3.1.19 5.0.4 5.0.9 5.0.10 ### .NET Framework `Type: Developer Pack` @@ -572,11 +572,11 @@ All other versions are saved but not installed. ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2016 | sha256:1337170239cc81ea287e70fc5092e860183c7ebcbc34b01c84f5c65e98ccf89f | 2021-08-10 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2016 | sha256:e3788091ce9cb0e75c6a880d02fdb5057da8a922cefb9516d0e437a877501edb | 2021-08-10 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2016 | sha256:6a37ef7cd6367bf53c9f71f1b0221efb90d7f34f1d91b50ce7254e6b7de8007a | 2021-08-10 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2016 | sha256:dde4551c0b326807cfd2b0457d6cf6a44906d788c917b6f6115bf5cab03a670c | 2021-09-14 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2016 | sha256:a5b246ba628f417576dbca9c12e241627be4aa786b9508fea57a934ec3ebdf30 | 2021-09-14 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2016 | sha256:c12743903deef533e2232e3a04af92f5558ef0449d5d6dbd139cddf07f5bcb15 | 2021-09-14 | | mcr.microsoft.com/windows/nanoserver:10.0.14393.953 | sha256:fc60bd5ae0e61b334ce1cf1bcbf20c10c36b4c5482a01da319c9c989f9e6e268 | 2017-03-08 | -| mcr.microsoft.com/windows/servercore:ltsc2016 | sha256:ac71e33f27c2a6b5db30be0419458e0c4e926214bc9c85afd4d6d6f9028d7233 | 2021-08-01 | +| mcr.microsoft.com/windows/servercore:ltsc2016 | sha256:22cc6661c975edc09fa44c497f8310b264da4ff102a56a974e4cf1a790626a22 | 2021-09-13 | From bfc5bd5cc3a39df7e5be868f4ba451c751815184 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Thu, 23 Sep 2021 16:52:53 +0300 Subject: [PATCH 0566/3485] [MacOS] Add Adoptium (Temurin-Hotspot) jdk 17 LTS (#4128) --- images/macos/toolsets/toolset-10.14.json | 2 +- images/macos/toolsets/toolset-10.15.json | 2 +- images/macos/toolsets/toolset-11.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/images/macos/toolsets/toolset-10.14.json b/images/macos/toolsets/toolset-10.14.json index e84b0a00e39b..3aff5d25b013 100644 --- a/images/macos/toolsets/toolset-10.14.json +++ b/images/macos/toolsets/toolset-10.14.json @@ -201,7 +201,7 @@ "vendors": [ { "name": "Temurin-Hotspot", - "versions": [ "8", "11" ] + "versions": [ "8", "11", "17" ] }, { "name": "Adopt", diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index 8b9f4a8ebcbc..9deaed65f851 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -153,7 +153,7 @@ "vendors": [ { "name": "Temurin-Hotspot", - "versions": [ "8", "11" ] + "versions": [ "8", "11", "17" ] }, { "name": "Adopt", diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index 2868bbdc817c..8eeff5ad16e3 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -104,7 +104,7 @@ "vendors": [ { "name": "Temurin-Hotspot", - "versions": [ "8", "11" ] + "versions": [ "8", "11", "17" ] }, { "name": "Adopt", From 4f4c0e4ad067543c2b4500f3565a25dad408ecfd Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 23 Sep 2021 14:41:06 +0000 Subject: [PATCH 0567/3485] Updating readme file for macOS-10.15 version 20210919.1 (#4118) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/macos/macos-10.15-Readme.md | 32 +++++++++++++++--------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/images/macos/macos-10.15-Readme.md b/images/macos/macos-10.15-Readme.md index 0d3f342fd6a0..58f24281c054 100644 --- a/images/macos/macos-10.15-Readme.md +++ b/images/macos/macos-10.15-Readme.md @@ -5,11 +5,11 @@ # macOS 10.15 info - System Version: macOS 10.15.7 (19H1417) - Kernel Version: Darwin 19.6.0 -- Image Version: 20210914.1 +- Image Version: 20210919.1 ## Installed Software ### Language and Runtime -- .NET SDK 2.1.302 2.1.403 2.1.507 2.1.607 2.1.701 2.1.818 3.1.101 3.1.201 3.1.302 3.1.412 5.0.102 5.0.202 5.0.302 5.0.400 +- .NET SDK 2.1.302 2.1.403 2.1.507 2.1.607 2.1.701 2.1.818 3.1.101 3.1.201 3.1.302 3.1.413 5.0.102 5.0.202 5.0.302 5.0.401 - Bash 3.2.57(1)-release - Clang/LLVM 12.0.0 is default - Clang/LLVM 12.0.1 is available on `'$(brew --prefix llvm)/bin/clang'` @@ -37,8 +37,8 @@ - Bundler version 2.2.27 - Carthage 0.38.0 - CocoaPods 1.11.2 -- Composer 2.1.6 -- Homebrew 3.2.11 +- Composer 2.1.8 +- Homebrew 3.2.12 - Miniconda 4.10.3 - NPM 6.14.15 - NuGet 5.6.0.6489 @@ -46,7 +46,7 @@ - Pip 21.2.4 (python 3.9) - Pipx 0.16.4 - RubyGems 3.2.27 -- Vcpkg 2021 (build from master \) +- Vcpkg 2021 (build from master \<4428702>) - Yarn 1.22.5 #### Environment variables @@ -67,7 +67,7 @@ - bazel 4.2.1 - bazelisk 1.10.1 - bsdtar 3.3.2 - available by 'tar' alias -- Curl 7.78.0 +- Curl 7.79.0 - Git LFS: 2.13.3 - Git: 2.33.0 - GitHub CLI: 2.0.0 @@ -75,14 +75,14 @@ - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.2 - gpg (GnuPG) 2.3.2 -- helm v3.6.3+gd506314 +- helm v3.7.0+geeac838 - Hub CLI: 2.14.2 - jq 1.6 - mongo v5.0.2 - mongod v5.0.2 - Newman 5.3.0 - OpenSSL 1.1.1l 24 Aug 2021 `(/usr/local/opt/openssl -> /usr/local/Cellar/openssl@1.1/1.1.1l)` -- Packer 1.7.4 +- Packer 1.7.5 - PostgreSQL 13.4 - psql (PostgreSQL) 13.4 - Sox 14.4.2 @@ -96,14 +96,14 @@ ### Tools - Aliyun CLI 3.0.90 - App Center CLI 2.10.0 -- AWS CLI 2.2.37 +- AWS CLI 2.2.39 - AWS SAM CLI 1.31.0 - AWS Session Manager CLI 1.2.245.0 - Azure CLI 2.28.0 - Bicep CLI 0.4.613 - Cabal 3.4.0.0 - Cmake 3.21.2 -- Fastlane 2.193.1 +- Fastlane 2.194.0 - GHC 9.0.1 - GHCup v0.1.16.2 - Stack 2.7.3 @@ -120,8 +120,8 @@ - SafariDriver 14.1.2 (15611.3.10.1.7) - Google Chrome 93.0.4577.82 - ChromeDriver 93.0.4577.63 -- Microsoft Edge 93.0.961.47 -- MSEdgeDriver 93.0.961.47 +- Microsoft Edge 93.0.961.52 +- MSEdgeDriver 93.0.961.52 - Mozilla Firefox 92.0 - geckodriver 0.29.1 @@ -202,12 +202,12 @@ ### Web Servers | Name | Version | ConfigFile | ServiceStatus | ListenPort | | ----- | ------- | ------------------------------- | ------------- | ---------- | -| httpd | 2.4.48 | /usr/local/etc/httpd/httpd.conf | stopped | 80 | +| httpd | 2.4.49 | /usr/local/etc/httpd/httpd.conf | stopped | 80 | | nginx | 1.21.3 | /usr/local/etc/nginx/nginx.conf | stopped | 80 | ### Xamarin #### Visual Studio for Mac -- 8.10.8.0 +- 8.10.9.3 #### Xamarin bundles | symlink | Xamarin.Mono | Xamarin.iOS | Xamarin.Mac | Xamarin.Android | @@ -355,7 +355,7 @@ | Google APIs | addon-google_apis-google-21
addon-google_apis-google-22
addon-google_apis-google-23
addon-google_apis-google-24 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 15.2.4203891
18.1.5063045
21.4.7075529
22.1.7171670 | +| NDK | 15.2.4203891
18.1.5063045
21.4.7075529 (default)
22.1.7171670
23.0.7599858 | | SDK Patch Applier v4 | 1 | | Intel HAXM | 7.6.5 | @@ -365,7 +365,7 @@ | ANDROID_HOME | /Users/runner/Library/Android/sdk | | ANDROID_NDK_18R_PATH | /Users/runner/Library/Android/sdk/ndk/18.1.5063045 | | ANDROID_NDK_HOME | /Users/runner/Library/Android/sdk/ndk-bundle -> /Users/runner/Library/Android/sdk/ndk/21.4.7075529 | -| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/22.1.7171670 | +| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/23.0.7599858 | | ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk-bundle -> /Users/runner/Library/Android/sdk/ndk/21.4.7075529 | | ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | From 93b173e9cbc26f538550864d0a0d8cebb14077a9 Mon Sep 17 00:00:00 2001 From: Dibir Magomedsaygitov <61747324+dibir-magomedsaygitov@users.noreply.github.com> Date: Thu, 23 Sep 2021 20:33:47 +0300 Subject: [PATCH 0568/3485] update software week 39 (#4135) --- images/macos/toolsets/toolset-10.15.json | 2 +- images/macos/toolsets/toolset-11.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index 9deaed65f851..3be6256650a1 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -20,7 +20,7 @@ "xamarin": { "vsmac": "latest", "mono-versions": [ - "6.12.0.125", "6.10.0.106", "6.8.0.123", "6.6.0.166", "6.4.0.208" + "6.12.0.140", "6.10.0.106", "6.8.0.123", "6.6.0.166", "6.4.0.208" ], "ios-versions": [ "14.14.2.5", "14.10.0.4", "14.8.0.3", "14.6.0.15", "14.4.1.3", "14.2.0.12", "14.0.0.0", "13.20.2.2", "13.18.2.1", "13.16.0.13", "13.14.1.39", "13.10.0.21", "13.8.3.0", "13.6.0.12", "13.4.0.2", "13.2.0.47" diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index 8eeff5ad16e3..5ed04c165757 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -13,7 +13,7 @@ "xamarin": { "vsmac": "latest", "mono-versions": [ - "6.12.0.125" + "6.12.0.140" ], "ios-versions": [ "14.20.0.24", "14.16.0.5", "14.14.2.5", "14.10.0.4", "14.8.0.3", "14.6.0.15", "14.4.1.3", "14.2.0.12", "14.0.0.0", "13.20.2.2" From ee4eda5e9971d5817292647b95c0e4a0b96f48cf Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Fri, 24 Sep 2021 11:05:25 +0300 Subject: [PATCH 0569/3485] [Windows] Add Adoptium (Temurin-Hotspot) jdk 17 LTS (#4129) --- images/win/scripts/Tests/Java.Tests.ps1 | 10 ++++++---- images/win/toolsets/toolset-2016.json | 2 +- images/win/toolsets/toolset-2019.json | 2 +- images/win/toolsets/toolset-2022.json | 2 +- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/images/win/scripts/Tests/Java.Tests.ps1 b/images/win/scripts/Tests/Java.Tests.ps1 index 62a851d036a2..85c40a8b601b 100644 --- a/images/win/scripts/Tests/Java.Tests.ps1 +++ b/images/win/scripts/Tests/Java.Tests.ps1 @@ -36,18 +36,20 @@ Describe "Java" { if ($Version -eq 8) { $Version = "1.${Version}" } - $result.Output[0] | Should -Match ([regex]::Escape("openjdk version `"${Version}.")) + $outputPattern = "openjdk version `"${Version}" + $result.Output[0] | Should -Match $outputPattern } It "Java Adopt Jdk " -TestCases $adoptJdkVersions { $adoptPath = Join-Path (Get-ChildItem ${env:AGENT_TOOLSDIRECTORY}\Java_Adopt_jdk\${Version}*) "x64\bin\java" - + $result = Get-CommandResult "`"$adoptPath`" -version" $result.ExitCode | Should -Be 0 - + if ($Version -eq 8) { $Version = "1.${Version}" } - $result.Output[0] | Should -Match ([regex]::Escape("openjdk version `"${Version}.")) + $outputPattern = "openjdk version `"${Version}" + $result.Output[0] | Should -Match $outputPattern } } diff --git a/images/win/toolsets/toolset-2016.json b/images/win/toolsets/toolset-2016.json index e1f58c0213ef..40d8b2d3ba19 100644 --- a/images/win/toolsets/toolset-2016.json +++ b/images/win/toolsets/toolset-2016.json @@ -146,7 +146,7 @@ "vendors": [ { "name": "Temurin-Hotspot", - "versions": [ "8", "11" ] + "versions": [ "8", "11", "17" ] }, { "name": "Adopt", diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index 415391440362..4383cfc7ba06 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -146,7 +146,7 @@ "vendors": [ { "name": "Temurin-Hotspot", - "versions": [ "8", "11" ] + "versions": [ "8", "11", "17" ] }, { "name": "Adopt", diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index ecf23ab2113f..de88621f1061 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -110,7 +110,7 @@ "vendors": [ { "name": "Temurin-Hotspot", - "versions": [ "8", "11" ] + "versions": [ "8", "11", "17" ] }, { "name": "Adopt", From bf1cae6dcf2db1909c7535198c938a881a6e31c8 Mon Sep 17 00:00:00 2001 From: Dmitry Shibanov Date: Fri, 24 Sep 2021 13:56:16 +0300 Subject: [PATCH 0570/3485] Add macOS 12 image templates (#4062) --- images.CI/macos/azure-pipelines/macos12.yml | 23 ++ images/macos/helpers/Common.Helpers.psm1 | 6 + .../configuration/environment/bashrc | 4 - images/macos/provision/core/commonutils.sh | 3 + images/macos/provision/core/homebrew.sh | 2 +- images/macos/provision/core/miniconda.sh | 2 + images/macos/provision/core/ruby.sh | 4 + images/macos/provision/core/xcode-clt.sh | 4 + images/macos/provision/utils/utils.sh | 18 ++ .../SoftwareReport.Generator.ps1 | 62 +++-- .../software-report/SoftwareReport.Xcode.psm1 | 11 +- images/macos/templates/macOS-12.json | 227 ++++++++++++++++++ images/macos/tests/Android.Tests.ps1 | 2 +- images/macos/tests/BasicTools.Tests.ps1 | 20 +- images/macos/tests/Common.Tests.ps1 | 6 +- images/macos/tests/PHP.Tests.ps1 | 4 +- images/macos/tests/RubyGem.Tests.ps1 | 4 +- images/macos/tests/System.Tests.ps1 | 4 +- images/macos/tests/XamarinNDK.Tests.ps1 | 4 +- images/macos/toolsets/toolset-12.json | 166 +++++++++++++ 20 files changed, 530 insertions(+), 46 deletions(-) create mode 100644 images.CI/macos/azure-pipelines/macos12.yml create mode 100644 images/macos/templates/macOS-12.json create mode 100644 images/macos/toolsets/toolset-12.json diff --git a/images.CI/macos/azure-pipelines/macos12.yml b/images.CI/macos/azure-pipelines/macos12.yml new file mode 100644 index 000000000000..090de9af9f1c --- /dev/null +++ b/images.CI/macos/azure-pipelines/macos12.yml @@ -0,0 +1,23 @@ +name: macOS-12_$(date:yyyyMMdd)$(rev:.r)_unstable +# schedules: +# - cron: "0 0 * * *" +# displayName: Daily +# branches: +# include: +# - main +# always: true + +trigger: none +pr: + autoCancel: true + branches: + include: + - main + +jobs: +- template: image-generation.yml + parameters: + image_label: 'macOS Monterey' + base_image_name: 'clean-macOS-12-380Gb-runner' + template_path: 'templates/macOS-12.json' + target_datastore: 'ds-image' diff --git a/images/macos/helpers/Common.Helpers.psm1 b/images/macos/helpers/Common.Helpers.psm1 index 66edb8789cda..50ed849d71a3 100644 --- a/images/macos/helpers/Common.Helpers.psm1 +++ b/images/macos/helpers/Common.Helpers.psm1 @@ -28,6 +28,9 @@ function Get-EnvironmentVariable($variable) { function Get-OSVersion { $osVersion = [Environment]::OSVersion $osVersionMajorMinor = $osVersion.Version.ToString(2) + # Monterey needs future review: + # [Environment]::OSVersion returns 11.0 for Monterey preview. + [SemVer]$osMontereyVersion = sw_vers -productVersion return [PSCustomObject]@{ Version = $osVersion.Version Platform = $osVersion.Platform @@ -35,9 +38,12 @@ function Get-OSVersion { IsMojave = $osVersionMajorMinor -eq "10.14" IsCatalina = $osVersionMajorMinor -eq "10.15" IsBigSur = $osVersionMajorMinor -eq "11.0" + IsMonterey = $osMontereyVersion.Major -eq "12" IsLessThanCatalina = [SemVer]$osVersion.Version -lt "10.15" IsLessThanBigSur = [SemVer]$osVersion.Version -lt "11.0" + IsLessThanMonterey = $osMontereyVersion -lt "12.0" IsHigherThanMojave = [SemVer]$osVersion.Version -ge "10.15" + IsHigherThanCatalina = [SemVer]$osVersion.Version -ge "11.0" } } diff --git a/images/macos/provision/configuration/environment/bashrc b/images/macos/provision/configuration/environment/bashrc index 224f000cdbee..2ffdeb0bc606 100644 --- a/images/macos/provision/configuration/environment/bashrc +++ b/images/macos/provision/configuration/environment/bashrc @@ -12,7 +12,6 @@ export VM_ASSETS=/usr/local/opt/$USER/scripts export NUNIT_BASE_PATH=/Library/Developer/nunit export NUNIT3_PATH=/Library/Developer/nunit/3.6.0 -export CONDA=/usr/local/miniconda export AGENT_TOOLSDIRECTORY=$HOME/hostedtoolcache export RUNNER_TOOL_CACHE=$HOME/hostedtoolcache @@ -20,9 +19,6 @@ export PATH=/Library/Frameworks/Mono.framework/Versions/Current/Commands:$PATH export PATH=$ANDROID_HOME/tools:$ANDROID_HOME/platform-tools:$ANDROID_NDK_HOME:$PATH export PATH=/usr/local/bin:/usr/local/sbin:~/bin:~/.yarn/bin:$PATH export PATH="/usr/local/opt/curl/bin:$PATH" -export PATH="/usr/local/opt/ruby@2.7/bin:$PATH" -GEM_PATH=`gem env|awk '/EXECUTABLE DIRECTORY/ {print $4}'` -export PATH="$GEM_PATH:$PATH" export PATH=$HOME/.cargo/bin:$PATH export RCT_NO_LAUNCH_PACKAGER=1 diff --git a/images/macos/provision/core/commonutils.sh b/images/macos/provision/core/commonutils.sh index a13f6a7d167b..0f046e6996d8 100644 --- a/images/macos/provision/core/commonutils.sh +++ b/images/macos/provision/core/commonutils.sh @@ -1,6 +1,9 @@ #!/bin/bash -e -o pipefail source ~/utils/utils.sh +# Monterey needs future review: +# Llvm, aliyun-cli, gnupg, helm have issues with building from the source code. +# Added gmp for now, because toolcache ruby needs its libs. Remove it when php starts to build from source code. common_packages=$(get_toolset_value '.brew.common_packages[]') for package in $common_packages; do echo "Installing $package..." diff --git a/images/macos/provision/core/homebrew.sh b/images/macos/provision/core/homebrew.sh index 57f8764476c1..c5380226a522 100755 --- a/images/macos/provision/core/homebrew.sh +++ b/images/macos/provision/core/homebrew.sh @@ -14,7 +14,7 @@ echo "Installing jq..." brew install jq echo "Installing curl..." -brew_smart_install "curl" +brew install curl echo "Installing wget..." brew_smart_install "wget" diff --git a/images/macos/provision/core/miniconda.sh b/images/macos/provision/core/miniconda.sh index a225b55b36a1..86f1c90dd6c2 100644 --- a/images/macos/provision/core/miniconda.sh +++ b/images/macos/provision/core/miniconda.sh @@ -11,4 +11,6 @@ if [ -d "$HOME/.conda" ]; then sudo chown -R $USER "$HOME/.conda" fi +echo "export CONDA=/usr/local/miniconda" >> $HOME/.bashrc + invoke_tests "Common" "Miniconda" diff --git a/images/macos/provision/core/ruby.sh b/images/macos/provision/core/ruby.sh index 900eb92e6dc7..53b21938d2e1 100755 --- a/images/macos/provision/core/ruby.sh +++ b/images/macos/provision/core/ruby.sh @@ -4,6 +4,10 @@ source ~/utils/utils.sh DEFAULT_RUBY_VERSION=$(get_toolset_value '.ruby.default') echo Installing Ruby... brew_smart_install "ruby@${DEFAULT_RUBY_VERSION}" +export PATH=/usr/local/opt/ruby@${DEFAULT_RUBY_VERSION}/bin:$PATH +GEM_PATH=`gem env|awk '/EXECUTABLE DIRECTORY/ {print $4}'` +echo "GEM_PATH=$GEM_PATH" >> "$HOME/.bashrc" +echo 'export PATH="$GEM_PATH:/usr/local/opt/ruby@'${DEFAULT_RUBY_VERSION}'/bin:$PATH"' >> "$HOME/.bashrc" #if High Sierra - skip installation from toolset if is_HighSierra; then diff --git a/images/macos/provision/core/xcode-clt.sh b/images/macos/provision/core/xcode-clt.sh index aecba8e83951..bb6cffaac31b 100644 --- a/images/macos/provision/core/xcode-clt.sh +++ b/images/macos/provision/core/xcode-clt.sh @@ -12,6 +12,10 @@ install_clt() { clt_placeholder="/tmp/.com.apple.dt.CommandLineTools.installondemand.in-progress" sudo touch $clt_placeholder cltPattern="Command Line Tools" + # Command Line Tools for Xcode 13.0 does not support macOS 12 + if is_Monterey; then + cltPattern="Command Line Tools beta" + fi clt_label_command="/usr/sbin/softwareupdate -l | grep -B 1 -E '${cltPattern}' | diff --git a/images/macos/provision/utils/utils.sh b/images/macos/provision/utils/utils.sh index 97ee2bf09f29..c4acb551d1ee 100755 --- a/images/macos/provision/utils/utils.sh +++ b/images/macos/provision/utils/utils.sh @@ -39,6 +39,14 @@ download_with_retries() { return 1 } +is_Monterey() { + if [ "$OSTYPE" = "darwin21" ]; then + true + else + false + fi +} + is_BigSur() { if [ "$OSTYPE" = "darwin20" ]; then true @@ -87,6 +95,14 @@ is_Less_BigSur() { fi } +is_Less_Monterey() { + if is_HighSierra || is_Mojave || is_Catalina || is_BigSur; then + true + else + false + fi +} + get_toolset_path() { echo "$HOME/image-generation/toolset.json" } @@ -124,6 +140,8 @@ get_brew_os_keyword() { echo "catalina" elif is_BigSur; then echo "big_sur" + elif is_Monterey; then + echo "monterey" else echo "null" fi diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1 index e9d196f7e554..e4686f05ba26 100644 --- a/images/macos/software-report/SoftwareReport.Generator.ps1 +++ b/images/macos/software-report/SoftwareReport.Generator.ps1 @@ -42,12 +42,17 @@ $languageAndRuntimeList = @( (Get-RubyVersion), (Get-DotnetVersionList), (Get-GoVersion), - (Get-PHPVersion), (Get-JuliaVersion), (Get-KotlinVersion) ) -if ( -not $os.IsHighSierra) { +if ($os.IsLessThanMonterey) { + $languageAndRuntimeList += @( + (Get-PHPVersion) + ) +} + +if ( -not $os.IsHighSierra -and $os.IsLessThanMonterey) { $languageAndRuntimeList += @( (Get-GccVersion) (Get-FortranVersion) @@ -72,28 +77,34 @@ $packageManagementList = @( (Get-PipVersion -Version 3), (Get-PipxVersion), (Get-BundlerVersion), - (Get-CarthageVersion), (Get-CocoaPodsVersion), (Get-HomebrewVersion), (Get-NPMVersion), (Get-YarnVersion), (Get-NuGetVersion), - (Get-CondaVersion), (Get-RubyGemsVersion), (Get-ComposerVersion) ) -if ($os.IsHigherThanMojave) { +if ($os.IsLessThanMonterey) { + $packageManagementList += @( + (Get-CarthageVersion), + (Get-CondaVersion) + ) +} + +if ($os.IsHigherThanMojave -and $os.IsLessThanMonterey) { $packageManagementList += @( (Get-VcpkgVersion) ) } $markdown += New-MDList -Style Unordered -Lines ($packageManagementList | Sort-Object) -$markdown += New-MDHeader "Environment variables" -Level 4 -$markdown += Build-PackageManagementEnvironmentTable | New-MDTable -$markdown += New-MDNewLine - +if ($os.IsLessThanMonterey) { + $markdown += New-MDHeader "Environment variables" -Level 4 + $markdown += Build-PackageManagementEnvironmentTable | New-MDTable + $markdown += New-MDNewLine +} # Project Management $markdown += New-MDHeader "Project Management" -Level 3 $markdown += New-MDList -Style Unordered -Lines (@( @@ -117,7 +128,6 @@ $utilitiesList = @( (Get-PackerVersion), (Get-OpenSSLVersion), (Get-JqVersion), - (Get-GPGVersion), (Get-PostgresClientVersion), (Get-PostgresServerVersion), (Get-Aria2Version), @@ -125,7 +135,6 @@ $utilitiesList = @( (Get-ZstdVersion), (Get-BazelVersion), (Get-BazeliskVersion), - (Get-HelmVersion), (Get-MongoVersion), (Get-MongodVersion), (Get-7zipVersion), @@ -133,7 +142,14 @@ $utilitiesList = @( (Get-GnuTarVersion) ) -if ($os.IsHigherThanMojave) { +if ($os.IsLessThanMonterey) { + $utilitiesList += @( + (Get-GPGVersion), + (Get-HelmVersion) + ) +} + +if ($os.IsHigherThanMojave -and $os.IsLessThanMonterey) { $utilitiesList += @( (Get-NewmanVersion) ) @@ -147,7 +163,7 @@ if ($os.IsLessThanBigSur) { ) } -if (-not $os.IsHighSierra) { +if (-not $os.IsHighSierra -and $os.IsLessThanMonterey) { $utilitiesList += @( (Get-SwitchAudioOsxVersion), (Get-SoxVersion) @@ -166,8 +182,16 @@ $toolsList = @( (Get-AzureCLIVersion), (Get-AWSCLIVersion), (Get-AWSSAMCLIVersion), - (Get-AWSSessionManagerCLIVersion), - (Get-AliyunCLIVersion), + (Get-AWSSessionManagerCLIVersion) +) + +if ($os.IsLessThanMonterey) { + $toolsList += @( + (Get-AliyunCLIVersion) + ) +} + +$toolsList += @( (Get-XcodeCommandLineToolsVersion), (Get-SwigVersion), (Get-BicepVersion) @@ -178,9 +202,13 @@ if( -not $os.IsHighSierra) { (Get-GHCupVersion), (Get-GHCVersion), (Get-CabalVersion), - (Get-StackVersion), - (Get-SwiftFormatVersion) + (Get-StackVersion) ) + if($os.IsLessThanMonterey) { + $toolsList += @( + (Get-SwiftFormatVersion) + ) + } } $markdown += New-MDList -Style Unordered -Lines ($toolsList | Sort-Object) diff --git a/images/macos/software-report/SoftwareReport.Xcode.psm1 b/images/macos/software-report/SoftwareReport.Xcode.psm1 index b679d0ed0171..fba70458da58 100644 --- a/images/macos/software-report/SoftwareReport.Xcode.psm1 +++ b/images/macos/software-report/SoftwareReport.Xcode.psm1 @@ -238,10 +238,13 @@ function Build-XcodeSupportToolsSection { $nomadCLI = [regex]::matches($nomadOutput, "(\d+.){2}\d+").Value $nomadShenzhenOutput = Run-Command "ipa -version" $nomadShenzhen = [regex]::matches($nomadShenzhenOutput, "(\d+.){2}\d+").Value - $toolList += @( - "Nomad CLI $nomadCLI", - "Nomad shenzhen CLI $nomadShenzhen" - ) + + if ($os.IsLessThanMonterey) { + $toolList += @( + "Nomad CLI $nomadCLI", + "Nomad shenzhen CLI $nomadShenzhen" + ) + } if ($os.IsLessThanBigSur) { $xctool = Run-Command "xctool --version" diff --git a/images/macos/templates/macOS-12.json b/images/macos/templates/macOS-12.json new file mode 100644 index 000000000000..3b6ae18354e1 --- /dev/null +++ b/images/macos/templates/macOS-12.json @@ -0,0 +1,227 @@ +{ + "variables": { + "vcenter_server": null, + "vcenter_username": null, + "vcenter_password": null, + "vcenter_datacenter": null, + "cluster_or_esxi_host": null, + "esxi_datastore": null, + "build_id": null, + "baseimage_name": null, + "output_folder": null, + "vm_username": null, + "vm_password": null, + "xcode_install_user": null, + "xcode_install_password": null, + "image_os": "macos12" + }, + "builders": [ + { + "type": "vsphere-clone", + "vcenter_server": "{{user `vcenter_server`}}", + "username": "{{user `vcenter_username`}}", + "password": "{{user `vcenter_password`}}", + "insecure_connection": true, + "datacenter": "{{ user `vcenter_datacenter` }}", + "template": "{{ user `baseimage_name` }}", + "folder": "{{user `output_folder` }}", + "host": "{{user `cluster_or_esxi_host`}}", + "datastore": "{{user `esxi_datastore`}}", + "vm_name": "{{user `build_id`}}", + "ssh_username": "{{user `vm_username`}}", + "ssh_password": "{{user `vm_password`}}", + "CPUs": "10", + "RAM": "24576", + "NestedHV": "true", + "shutdown_timeout": "15m" + } + ], + "provisioners": [ + { + "type": "shell", + "inline": "mkdir ~/image-generation" + }, + { + "type": "file", + "source": "./provision/assets", + "destination": "~/image-generation/" + }, + { + "type": "file", + "source": "./tests", + "destination": "~/image-generation/" + }, + { + "type": "file", + "source": "./software-report", + "destination": "~/image-generation/" + }, + { + "type": "file", + "source": "./helpers", + "destination": "~/image-generation/" + }, + { + "type": "file", + "source": "./provision/configuration/add-certificate.swift", + "destination": "~/image-generation/add-certificate.swift" + }, + { + "type": "file", + "source": "./provision/configuration/environment/bashrc", + "destination": "~/.bashrc" + }, + { + "type": "file", + "source": "./provision/configuration/environment/bashprofile", + "destination": "~/.bash_profile" + }, + { + "type": "file", + "source": "./provision/utils", + "destination": "~/" + }, + { + "type": "file", + "source": "./provision/bootstrap-provisioner", + "destination": "~/bootstrap" + }, + { + "type": "file", + "source": "./toolsets/toolset-12.json", + "destination": "~/image-generation/toolset.json" + }, + { + "type": "shell", + "execute_command": "chmod +x {{ .Path }}; sudo {{ .Vars }} {{ .Path }}", + "scripts": [ + "./provision/configuration/add-network-interface-detection.sh", + "./provision/configuration/autologin.sh", + "./provision/configuration/disable-auto-updates.sh", + "./provision/configuration/screensaver-off.sh", + "./provision/configuration/ntpconf.sh", + "./provision/configuration/max-files.sh", + "./provision/configuration/shell-change.sh" + ], + "environment_vars": [ + "PASSWORD={{user `vm_password`}}", + "USERNAME={{user `vm_username`}}" + ] + }, + { + "type": "shell", + "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}", + "scripts": [ + "./provision/configuration/preimagedata.sh", + "./provision/configuration/configure-ssh.sh", + "./provision/core/xcode-clt.sh", + "./provision/configuration/configure-machine.sh" + ], + "environment_vars": [ + "IMAGE_VERSION={{user `build_id`}}", + "IMAGE_OS={{user `image_os`}}" + ] + }, + { + "type": "shell", + "execute_command": "chmod +x {{ .Path }}; sudo {{ .Vars }} {{ .Path }}", + "script": "./provision/core/reboot.sh", + "expect_disconnect": true + }, + { + "type": "shell", + "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}", + "pause_before": "30s", + "scripts": [ + "./provision/core/homebrew.sh", + "./provision/core/powershell.sh", + "./provision/core/dotnet.sh", + "./provision/core/python.sh", + "./provision/core/azcopy.sh", + "./provision/core/openssl.sh", + "./provision/core/ruby.sh", + "./provision/core/rubygem.sh", + "./provision/core/git.sh", + "./provision/core/node.sh" + ] + }, + { + "type": "shell", + "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} pwsh -f {{ .Path }}", + "script": "./provision/core/xcode.ps1", + "environment_vars": [ + "XCODE_INSTALL_USER={{user `xcode_install_user`}}", + "XCODE_INSTALL_PASSWORD={{user `xcode_install_password`}}" + ] + }, + { + "type": "shell", + "execute_command": "chmod +x {{ .Path }}; sudo {{ .Vars }} {{ .Path }}", + "script": "./provision/core/reboot.sh", + "expect_disconnect": true + }, + { + "type": "shell", + "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}", + "scripts": [ + "./provision/core/commonutils.sh", + "./provision/core/golang.sh", + "./provision/core/swiftlint.sh", + "./provision/core/openjdk.sh", + "./provision/core/aws.sh", + "./provision/core/rust.sh", + "./provision/core/haskell.sh", + "./provision/core/stack.sh", + "./provision/core/cocoapods.sh", + "./provision/core/android-toolsets.sh", + "./provision/core/xamarin.sh", + "./provision/core/vsmac.sh", + "./provision/core/nvm.sh", + "./provision/core/apache.sh", + "./provision/core/nginx.sh", + "./provision/core/postgresql.sh", + "./provision/core/mongodb.sh", + "./provision/core/safari.sh", + "./provision/core/chrome.sh", + "./provision/core/edge.sh", + "./provision/core/firefox.sh", + "./provision/core/pypy.sh", + "./provision/core/pipx-packages.sh", + "./provision/core/bicep.sh" + ] + }, + { + "type": "shell", + "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} pwsh -f {{ .Path }}", + "scripts": "./provision/core/toolset.ps1" + }, + { + "type": "shell", + "execute_command": "ruby {{ .Path }}", + "scripts": [ + "./provision/core/delete-duplicate-sims.rb" + ] + }, + { + "type": "shell", + "inline": [ + "pwsh -File \"$HOME/image-generation/software-report/SoftwareReport.Generator.ps1\" -OutputDirectory \"$HOME/image-generation/output/software-report\" -ImageName {{user `build_id`}}", + "pwsh -File \"$HOME/image-generation/tests/RunAll-Tests.ps1\"" + ] + }, + { + "type": "file", + "direction": "download", + "source": "~/image-generation/output/*", + "destination": "../image-output/" + }, + { + "type": "shell", + "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}", + "scripts": [ + "./provision/configuration/configure-hostname.sh", + "./provision/configuration/finalize-vm.sh" + ] + } + ] +} diff --git a/images/macos/tests/Android.Tests.ps1 b/images/macos/tests/Android.Tests.ps1 index 2550d5492745..0edfe2e7c437 100644 --- a/images/macos/tests/Android.Tests.ps1 +++ b/images/macos/tests/Android.Tests.ps1 @@ -89,7 +89,7 @@ Describe "Android" { } } - It "HAXM is installed" -Skip:($os.IsBigSur) { + It "HAXM is installed" -Skip:($os.IsHigherThanCatalina) { "kextstat | grep 'com.intel.kext.intelhaxm'" | Should -ReturnZeroExitCode } } \ No newline at end of file diff --git a/images/macos/tests/BasicTools.Tests.ps1 b/images/macos/tests/BasicTools.Tests.ps1 index 7696845d2963..8fdd2bdb2034 100644 --- a/images/macos/tests/BasicTools.Tests.ps1 +++ b/images/macos/tests/BasicTools.Tests.ps1 @@ -6,7 +6,7 @@ Describe "Azure CLI" { } } -Describe "Carthage" { +Describe "Carthage" -Skip:($os.IsMonterey) { It "Carthage" { "carthage version" | Should -ReturnZeroExitCode } @@ -24,20 +24,20 @@ Describe "Subversion" { } } -Describe "SwiftFormat" { +Describe "SwiftFormat" -Skip:($os.IsMonterey) { It "SwiftFormat" { "swiftformat --version" | Should -ReturnZeroExitCode } } -Describe "GnuPG" { +Describe "GnuPG" -Skip:($os.IsMonterey) { It "GnuPG" { "gpg --version" | Should -ReturnZeroExitCode } } -Describe "Clang/LLVM" { +Describe "Clang/LLVM" -Skip:($os.IsMonterey) { It "Clang/LLVM is installed" { "$(brew --prefix llvm)/bin/clang --version" | Should -ReturnZeroExitCode } @@ -61,7 +61,7 @@ Describe "Perl" { } } -Describe "Helm" { +Describe "Helm" -Skip:($os.IsMonterey) { It "Helm" { "helm version --short" | Should -ReturnZeroExitCode } @@ -109,7 +109,7 @@ Describe "bazel" { } } -Describe "Aliyun CLI" { +Describe "Aliyun CLI" -Skip:($os.IsMonterey) { It "Aliyun CLI" { "aliyun --version" | Should -ReturnZeroExitCode } @@ -139,25 +139,25 @@ Describe "wget" { } } -Describe "vagrant" -Skip:($os.IsBigSur) { +Describe "vagrant" -Skip:($os.IsHigherThanCatalina) { It "vagrant" { "vagrant --version" | Should -ReturnZeroExitCode } } -Describe "virtualbox" -Skip:($os.IsBigSur) { +Describe "virtualbox" -Skip:($os.IsHigherThanCatalina) { It "virtualbox" { "vboxmanage -v" | Should -ReturnZeroExitCode } } -Describe "xctool" -Skip:($os.IsBigSur) { +Describe "xctool" -Skip:($os.IsHigherThanCatalina) { It "xctool" { "xctool --version" | Should -ReturnZeroExitCode } } -Describe "R" -Skip:($os.IsBigSur) { +Describe "R" -Skip:($os.IsHigherThanCatalina) { It "R" { "R --version" | Should -ReturnZeroExitCode } diff --git a/images/macos/tests/Common.Tests.ps1 b/images/macos/tests/Common.Tests.ps1 index 382605e9bf7f..5b3c4730b371 100644 --- a/images/macos/tests/Common.Tests.ps1 +++ b/images/macos/tests/Common.Tests.ps1 @@ -9,7 +9,7 @@ Describe ".NET" { } } -Describe "GCC" -Skip:($os.IsHighSierra) { +Describe "GCC" -Skip:($os.IsHighSierra -or $os.IsMonterey) { $testCases = Get-ToolsetValue -KeyPath gcc.versions | ForEach-Object { @{Version = $_} } It "GCC " -TestCases $testCases { @@ -33,7 +33,7 @@ Describe "GCC" -Skip:($os.IsHighSierra) { } } -Describe "vcpkg" -Skip:($os.IsHighSierra -or $os.IsMojave) { +Describe "vcpkg" -Skip:($os.IsHighSierra -or $os.IsMojave -or $os.IsMonterey) { It "vcpkg" { "vcpkg version" | Should -ReturnZeroExitCode } @@ -58,7 +58,7 @@ Describe "AzCopy" { } } -Describe "Miniconda" { +Describe "Miniconda" -Skip:($os.IsMonterey) { It "Conda" { Get-EnvironmentVariable "CONDA" | Should -Not -BeNullOrEmpty $condaBinPath = Join-Path $env:CONDA "bin" "conda" diff --git a/images/macos/tests/PHP.Tests.ps1 b/images/macos/tests/PHP.Tests.ps1 index a7c9f380683d..937c87464e81 100644 --- a/images/macos/tests/PHP.Tests.ps1 +++ b/images/macos/tests/PHP.Tests.ps1 @@ -1,4 +1,6 @@ -Describe "PHP" { +$os = Get-OSVersion + +Describe "PHP" -Skip:($os.IsMonterey) { Context "PHP" { It "PHP Path" { Get-WhichTool "php" | Should -Not -BeLike "/usr/bin/php*" diff --git a/images/macos/tests/RubyGem.Tests.ps1 b/images/macos/tests/RubyGem.Tests.ps1 index 0dee6064cbfd..d8f43e7c3b94 100644 --- a/images/macos/tests/RubyGem.Tests.ps1 +++ b/images/macos/tests/RubyGem.Tests.ps1 @@ -1,3 +1,5 @@ +$os = Get-OSVersion + Describe "RubyGems" { $gemTestCases = Get-ToolsetValue -KeyPath "ruby.rubygems" | ForEach-Object { @{gemName = $_} @@ -17,7 +19,7 @@ Describe "Bundler" { } } -Describe "Nomad shenzhen CLI" { +Describe "Nomad shenzhen CLI" -Skip:($os.IsMonterey) { It "Nomad shenzhen CLI" { "ipa --version" | Should -ReturnZeroExitCode } diff --git a/images/macos/tests/System.Tests.ps1 b/images/macos/tests/System.Tests.ps1 index 0aa40c39504c..e2b243723ad0 100644 --- a/images/macos/tests/System.Tests.ps1 +++ b/images/macos/tests/System.Tests.ps1 @@ -17,7 +17,7 @@ Describe "Certificate" { } } -Describe "Audio device" -Skip:($os.IsHighSierra) { +Describe "Audio device" -Skip:($os.IsHighSierra -or $os.IsMonterey) { It "Sox is installed" { "sox --version" | Should -ReturnZeroExitCode } @@ -26,7 +26,7 @@ Describe "Audio device" -Skip:($os.IsHighSierra) { "SwitchAudioSource -c" | Should -ReturnZeroExitCode } - It "Audio channel Soundflower (2ch)" -Skip:($os.IsBigSur) { + It "Audio channel Soundflower (2ch)" -Skip:($os.IsHigherThanCatalina) { SwitchAudioSource -c | Should -BeLikeExactly "Soundflower (2ch)" } diff --git a/images/macos/tests/XamarinNDK.Tests.ps1 b/images/macos/tests/XamarinNDK.Tests.ps1 index 62d45c377561..05e87af52a57 100644 --- a/images/macos/tests/XamarinNDK.Tests.ps1 +++ b/images/macos/tests/XamarinNDK.Tests.ps1 @@ -11,7 +11,7 @@ Describe "Xamarin NDK" { $ANDROID_SDK_DIR = Join-Path $env:HOME "Library" "Android" "sdk" } - Context "Xamarin NDK toolchains" -Skip:($os.IsBigSur) { + Context "Xamarin NDK toolchains" -Skip:($os.IsHigherThanCatalina) { $testCases = $androidNdkToolchains | ForEach-Object { @{AndroidNdkToolchain = $_} } It "" -TestCases $testCases { @@ -22,7 +22,7 @@ Describe "Xamarin NDK" { } } - Context "Xamarin Legacy NDK versions" -Skip:($os.IsBigSur) { + Context "Xamarin Legacy NDK versions" -Skip:($os.IsHigherThanCatalina) { It "Android NDK version r18b is installed" { $ndk18BundlePath = Join-Path $ANDROID_SDK_DIR "ndk" "18.1.5063045" "source.properties" $rawContent = Get-Content $ndk18BundlePath -Raw diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json new file mode 100644 index 000000000000..9025ba010f7f --- /dev/null +++ b/images/macos/toolsets/toolset-12.json @@ -0,0 +1,166 @@ +{ + "xcode": { + "default": "13.0", + "versions": [ + { "link": "13.0", "version": "13.0.0"} + ] + }, + "xamarin": { + "vsmac": "latest", + "mono-versions": [ + "6.12.0.125" + ], + "ios-versions": [ + "14.20.0.24" + ], + "mac-versions": [ + "7.14.0.24" + ], + "android-versions": [ + "11.3.0.4" + ], + "bundle-default": "6_12_9", + "bundles": [ + { + "symlink": "6_12_9", + "mono":"6.12", + "ios": "14.20", + "mac": "7.14", + "android": "11.3" + } + ] + }, + "java": { + "default": "8", + "versions": [ + "8", "11" + ] + }, + "android": { + "platform_min_version": "27", + "build_tools_min_version": "27.0.0", + "extra-list": [ + "android;m2repository", "google;m2repository", "google;google_play_services", "intel;Hardware_Accelerated_Execution_Manager" + ], + "addon-list": [], + "additional-tools": [ + "cmake;3.18.1" + ], + "ndk": { + "default": "21", + "versions": [ + "21", "22", "23" + ] + } + }, + "powershellModules": [ + { "name": "Az" }, + { "name": "MarkdownPS" }, + { "name": "Pester" }, + { "name": "PSScriptAnalyzer" } + ], + "npm": { + "global_packages": [] + }, + "brew": { + "common_packages": [ + "ant", + "aria2", + "azure-cli", + "bazelisk", + "cmake", + "gh", + "gnu-tar", + "kotlin", + "libpq", + "p7zip", + "packer", + "perl", + "sbt", + "subversion", + "swig", + "zstd", + "gmp" + ], + "cask_packages": [ + "julia" + ] + }, + "toolcache": [ + { + "name": "Python", + "url" : "https://raw.githubusercontent.com/actions/python-versions/main/versions-manifest.json", + "arch": "x64", + "platform" : "darwin", + "versions": [ + "3.7.*", + "3.8.*", + "3.9.*" + ] + }, + { + "name": "PyPy", + "arch": "x64", + "platform" : "darwin", + "versions": [ + "2.7", + "3.7" + ] + }, + { + "name": "Node", + "url" : "https://raw.githubusercontent.com/actions/node-versions/main/versions-manifest.json", + "platform" : "darwin", + "arch": "x64", + "versions": [ + "10.*", + "12.*", + "14.*" + ] + }, + { + "name": "Go", + "url" : "https://raw.githubusercontent.com/actions/go-versions/main/versions-manifest.json", + "arch": "x64", + "platform" : "darwin", + "versions": [ + "1.15.*", + "1.16.*", + "1.17.*" + ] + }, + { + "name": "Ruby", + "arch": "x64", + "versions": [ + "2.7.*", + "3.0.*" + ] + } + ], + "pipx": [ + { + "package": "yamllint", + "cmd": "yamllint --version" + } + ], + "dotnet": { + "versions": [ + "3.1", + "5.0" + ] + }, + "ruby": { + "default": "3.0", + "rubygems": [ + "xcode-install", + "cocoapods", + "xcpretty", + "bundler", + "fastlane" + ] + }, + "go": { + "default": "1.17" + } +} From 45df250473c17be4ad5439675d73415ae94d7803 Mon Sep 17 00:00:00 2001 From: Dibir Magomedsaygitov <61747324+dibir-magomedsaygitov@users.noreply.github.com> Date: Sat, 25 Sep 2021 19:10:58 +0300 Subject: [PATCH 0571/3485] fix aliyun-cli installation (#4147) --- images/linux/scripts/installers/aliyun-cli.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/linux/scripts/installers/aliyun-cli.sh b/images/linux/scripts/installers/aliyun-cli.sh index fd9737caa73f..b5dd9f9347da 100644 --- a/images/linux/scripts/installers/aliyun-cli.sh +++ b/images/linux/scripts/installers/aliyun-cli.sh @@ -8,7 +8,7 @@ source $HELPER_SCRIPTS/install.sh # Install Alibaba Cloud CLI -URL=$(curl -s https://api.github.com/repos/aliyun/aliyun-cli/releases/latest | jq -r '.assets[].browser_download_url | select(contains("aliyun-cli-linux"))') +URL=$(curl -s https://api.github.com/repos/aliyun/aliyun-cli/releases/latest | jq -r '.assets[].browser_download_url | select(contains("aliyun-cli-linux") and endswith("amd64.tgz"))') download_with_retries $URL "/tmp" tar xzf /tmp/aliyun-cli-linux-*-amd64.tgz mv aliyun /usr/local/bin From 60685cb0e116934a9b2c8e55bbfbaa87ee5c7603 Mon Sep 17 00:00:00 2001 From: MaksimZhukov <46996400+MaksimZhukov@users.noreply.github.com> Date: Sun, 26 Sep 2021 18:32:42 +0300 Subject: [PATCH 0572/3485] Revert "update software week 39 (#4135)" (#4148) --- images/macos/toolsets/toolset-10.15.json | 2 +- images/macos/toolsets/toolset-11.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index 3be6256650a1..9deaed65f851 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -20,7 +20,7 @@ "xamarin": { "vsmac": "latest", "mono-versions": [ - "6.12.0.140", "6.10.0.106", "6.8.0.123", "6.6.0.166", "6.4.0.208" + "6.12.0.125", "6.10.0.106", "6.8.0.123", "6.6.0.166", "6.4.0.208" ], "ios-versions": [ "14.14.2.5", "14.10.0.4", "14.8.0.3", "14.6.0.15", "14.4.1.3", "14.2.0.12", "14.0.0.0", "13.20.2.2", "13.18.2.1", "13.16.0.13", "13.14.1.39", "13.10.0.21", "13.8.3.0", "13.6.0.12", "13.4.0.2", "13.2.0.47" diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index 5ed04c165757..8eeff5ad16e3 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -13,7 +13,7 @@ "xamarin": { "vsmac": "latest", "mono-versions": [ - "6.12.0.140" + "6.12.0.125" ], "ios-versions": [ "14.20.0.24", "14.16.0.5", "14.14.2.5", "14.10.0.4", "14.8.0.3", "14.6.0.15", "14.4.1.3", "14.2.0.12", "14.0.0.0", "13.20.2.2" From 82a0226a27ed07437aa136ab42d048592d54d9ed Mon Sep 17 00:00:00 2001 From: Darleev <50947177+Darleev@users.noreply.github.com> Date: Mon, 27 Sep 2021 09:03:26 +0000 Subject: [PATCH 0573/3485] [macOS 11] anka template (#3990) --- .../configuration/configure-machine.sh | 4 +- images/macos/templates/macOS-11.pkr.hcl | 213 ++++++++++++++++++ images/macos/tests/System.Tests.ps1 | 2 +- 3 files changed, 217 insertions(+), 2 deletions(-) create mode 100644 images/macos/templates/macOS-11.pkr.hcl diff --git a/images/macos/provision/configuration/configure-machine.sh b/images/macos/provision/configuration/configure-machine.sh index a0794071fd8c..73c77c1d8e93 100644 --- a/images/macos/provision/configuration/configure-machine.sh +++ b/images/macos/provision/configuration/configure-machine.sh @@ -13,7 +13,9 @@ sudo rm -f /var/vm/sleepimage defaults write NSGlobalDomain NSAppSleepDisabled -bool YES # Change screen resolution to the maximum supported for 4Mb video memory -sudo "/Library/Application Support/VMware Tools/vmware-resolutionSet" 1176 885 +if [ -d "/Library/Application Support/VMware Tools" ]; then + sudo "/Library/Application Support/VMware Tools/vmware-resolutionSet" 1176 885 +fi # https://developer.apple.com/support/expiration/ # Enterprise iOS Distribution Certificates generated between February 7 and September 1st, 2020 will expire on February 7, 2023. diff --git a/images/macos/templates/macOS-11.pkr.hcl b/images/macos/templates/macOS-11.pkr.hcl new file mode 100644 index 000000000000..6b8c840465a8 --- /dev/null +++ b/images/macos/templates/macOS-11.pkr.hcl @@ -0,0 +1,213 @@ +variable "source_vm_name" { + type = string + default = "clean_macos_11_300gb" +} + +variable "source_vm_tag" { + type = string + default = "bigsur_300gb" +} + +variable "vm_name" { + type = string + default = "macos-11" +} + +variable "vcpu_count" { + type = string + default = "4" +} + +variable "ram_size" { + type = string + default = "6G" +} + +variable "image_os" { + type = string + default = "macos11" +} + +variable "build_id" { type = string } +variable "vm_username" { type = string } +variable "vm_password" { type = string } +variable "xcode_install_user" { type = string } +variable "xcode_install_password" { type = string } + +source "veertu-anka-vm-clone" "template" { + vm_name = "${var.vm_name}" + source_vm_name = "${var.source_vm_name}" + source_vm_tag = "${var.source_vm_tag}" + vcpu_count = "${var.vcpu_count}" + ram_size = "${var.ram_size}" + stop_vm = "true" +} + +build { + sources = [ + "source.veertu-anka-vm-clone.template", + ] + provisioner "shell" { + inline = [ + "mkdir ~/image-generation" + ] + } + provisioner "file" { + destination = "image-generation/" + sources = [ "./provision/assets", "./tests", "./software-report", "./helpers" ] + } + provisioner "file" { + destination = "image-generation/add-certificate.swift" + source = "./provision/configuration/add-certificate.swift" + } + provisioner "file" { + destination = ".bashrc" + source = "./provision/configuration/environment/bashrc" + } + provisioner "file" { + destination = ".bash_profile" + source = "./provision/configuration/environment/bashprofile" + } + provisioner "file" { + destination = "./" + source = "./provision/utils" + } + provisioner "shell" { + inline = [ + "mkdir ~/bootstrap" + ] + } + provisioner "file" { + destination = "bootstrap" + source = "./provision/bootstrap-provisioner/" + } + provisioner "file" { + destination = "image-generation/toolset.json" + source = "./toolsets/toolset-11.json" + } + provisioner "shell" { + scripts = [ + "./provision/configuration/configure-tccdb-macos11.sh", + "./provision/configuration/add-network-interface-detection.sh", + "./provision/configuration/autologin.sh", + "./provision/configuration/disable-auto-updates.sh", + "./provision/configuration/screensaver-off.sh", + "./provision/configuration/ntpconf.sh", + "./provision/configuration/max-files.sh", + "./provision/configuration/shell-change.sh" + ] + environment_vars = [ + "PASSWORD=${var.vm_password}", + "USERNAME=${var.vm_username}" + ] + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}" + } + provisioner "shell" { + scripts = [ + "./provision/configuration/preimagedata.sh", + "./provision/configuration/configure-ssh.sh", + "./provision/core/xcode-clt.sh", + "./provision/configuration/configure-machine.sh" + ] + environment_vars = [ + "IMAGE_VERSION=${var.build_id}", + "IMAGE_OS=${var.image_os}" + ] + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" + } + provisioner "shell" { + script = "./provision/core/reboot.sh" + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}" + expect_disconnect = true + } + provisioner "shell" { + pause_before = "30s" + scripts = [ + "./provision/core/homebrew.sh", + "./provision/core/powershell.sh", + "./provision/core/dotnet.sh", + "./provision/core/python.sh", + "./provision/core/azcopy.sh", + "./provision/core/openssl.sh", + "./provision/core/ruby.sh", + "./provision/core/rubygem.sh", + "./provision/core/git.sh", + "./provision/core/node.sh" + ] + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" + } + provisioner "shell" { + script = "./provision/core/xcode.ps1" + environment_vars = [ + "XCODE_INSTALL_USER=${var.xcode_install_user}", + "XCODE_INSTALL_PASSWORD=${var.xcode_install_password}" + ] + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} pwsh -f {{ .Path }}" + } + provisioner "shell" { + script = "./provision/core/reboot.sh" + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}" + expect_disconnect = true + } + provisioner "shell" { + scripts = [ + "./provision/core/commonutils.sh", + "./provision/core/golang.sh", + "./provision/core/swiftlint.sh", + "./provision/core/openjdk.sh", + "./provision/core/php.sh", + "./provision/core/aws.sh", + "./provision/core/rust.sh", + "./provision/core/gcc.sh", + "./provision/core/haskell.sh", + "./provision/core/stack.sh", + "./provision/core/cocoapods.sh", + "./provision/core/android-toolsets.sh", + "./provision/core/xamarin.sh", + "./provision/core/vsmac.sh", + "./provision/core/nvm.sh", + "./provision/core/apache.sh", + "./provision/core/nginx.sh", + "./provision/core/postgresql.sh", + "./provision/core/mongodb.sh", + "./provision/core/audiodevice.sh", + "./provision/core/vcpkg.sh", + "./provision/core/miniconda.sh", + "./provision/core/safari.sh", + "./provision/core/chrome.sh", + "./provision/core/edge.sh", + "./provision/core/firefox.sh", + "./provision/core/pypy.sh", + "./provision/core/pipx-packages.sh", + "./provision/core/bicep.sh" + ] + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" + } + provisioner "shell" { + script = "./provision/core/toolset.ps1" + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} pwsh -f {{ .Path }}" + } + provisioner "shell" { + script = "./provision/core/delete-duplicate-sims.rb" + execute_command = "source $HOME/.bash_profile; ruby {{ .Path }}" + } + provisioner "shell" { + inline = [ + "pwsh -File \"$HOME/image-generation/software-report/SoftwareReport.Generator.ps1\" -OutputDirectory \"$HOME/image-generation/output/software-report\" -ImageName UUID=${build.PackerRunUUID}", + "pwsh -File \"$HOME/image-generation/tests/RunAll-Tests.ps1\"" + ] + execute_command = "source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" + } + provisioner "file" { + destination = "../image-output/" + direction = "download" + source = "./image-generation/output/" + } + provisioner "shell" { + scripts = [ + "./provision/configuration/configure-hostname.sh", + "./provision/configuration/finalize-vm.sh" + ] + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" + } +} \ No newline at end of file diff --git a/images/macos/tests/System.Tests.ps1 b/images/macos/tests/System.Tests.ps1 index e2b243723ad0..5b6b14e31efe 100644 --- a/images/macos/tests/System.Tests.ps1 +++ b/images/macos/tests/System.Tests.ps1 @@ -37,6 +37,6 @@ Describe "Audio device" -Skip:($os.IsHighSierra -or $os.IsMonterey) { Describe "Screen Resolution" -Skip:($os.IsHighSierra) { It "Screen Resolution" { - system_profiler SPDisplaysDataType | Select-String "Resolution" | Should -Match "1176 x 885" + system_profiler SPDisplaysDataType | Select-String "Resolution" | Should -Match "1176 x 885|1920 x 1080" } } From 40b0efb28785910753d8604cf84f1ece126142f9 Mon Sep 17 00:00:00 2001 From: Maksim Shilov <89912354+shilovmaksim@users.noreply.github.com> Date: Mon, 27 Sep 2021 12:11:20 +0300 Subject: [PATCH 0574/3485] PathHelpers: Dealing with hardcoded registry paths and optimizing code (#4125) --- .../win/scripts/ImageHelpers/PathHelpers.ps1 | 74 +++++++------------ 1 file changed, 27 insertions(+), 47 deletions(-) diff --git a/images/win/scripts/ImageHelpers/PathHelpers.ps1 b/images/win/scripts/ImageHelpers/PathHelpers.ps1 index 339778dcf1f2..1c98dcb65a6e 100644 --- a/images/win/scripts/ImageHelpers/PathHelpers.ps1 +++ b/images/win/scripts/ImageHelpers/PathHelpers.ps1 @@ -1,68 +1,48 @@ -function Test-MachinePath{ - [CmdletBinding()] +function Get-SystemVariable { param( - [string]$PathItem + [string]$SystemVariable ) - - $currentPath = Get-MachinePath - - $pathItems = $currentPath.Split(';') - - if($pathItems.Contains($PathItem)) - { - return $true - } - else - { - return $false - } + + [System.Environment]::GetEnvironmentVariable($SystemVariable, "Machine") } -function Set-MachinePath{ - [CmdletBinding()] +function Set-SystemVariable { param( - [string]$NewPath + [string]$SystemVariable, + [string]$Value ) - Set-ItemProperty -Path 'Registry::HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Session Manager\Environment' -Name Path -Value $NewPath - return $NewPath + + [System.Environment]::SetEnvironmentVariable($SystemVariable, $Value, "Machine") + Get-SystemVariable $SystemVariable } -function Add-MachinePathItem -{ - [CmdletBinding()] - param( - [string]$PathItem - ) - - $currentPath = Get-MachinePath - $newPath = $PathItem + ';' + $currentPath - return Set-MachinePath -NewPath $newPath +function Get-MachinePath { + Get-SystemVariable PATH } -function Get-MachinePath{ - [CmdletBinding()] +function Set-MachinePath { param( - + [string]$NewPath ) - $currentPath = (Get-ItemProperty -Path 'Registry::HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Session Manager\Environment' -Name PATH).Path - return $currentPath + + Set-SystemVariable PATH $NewPath } -function Get-SystemVariable{ - [CmdletBinding()] +function Test-MachinePath { param( - [string]$SystemVariable + [string]$PathItem ) - $currentPath = (Get-ItemProperty -Path 'Registry::HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Session Manager\Environment' -Name $SystemVariable).$SystemVariable - return $currentPath + + $pathItems = (Get-MachinePath).Split(';') + $pathItems.Contains($PathItem) } -function Set-SystemVariable{ - [CmdletBinding()] +function Add-MachinePathItem { param( - [string]$SystemVariable, - [string]$Value + [string]$PathItem ) - Set-ItemProperty -Path 'Registry::HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Session Manager\Environment' -Name $SystemVariable -Value $Value - return $Value + + $currentPath = Get-MachinePath + $newPath = $PathItem + ';' + $currentPath + Set-MachinePath -NewPath $newPath } From 3d52ccd52782771c8abe8eb224b5af3006e0312c Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Mon, 27 Sep 2021 22:57:51 +0300 Subject: [PATCH 0575/3485] [MacOS] add Temurin-Hotspot to MacOS 12 (#4155) --- images/macos/toolsets/toolset-12.json | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index 9025ba010f7f..981bcf49df37 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -32,8 +32,16 @@ }, "java": { "default": "8", - "versions": [ - "8", "11" + "default_vendor": "Temurin-Hotspot", + "vendors": [ + { + "name": "Temurin-Hotspot", + "versions": [ "8", "11", "17" ] + }, + { + "name": "Adopt", + "versions": [ "8", "11" ] + } ] }, "android": { From 9bb6c3297becf50c7311bc673c372a8c51403e1b Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Tue, 28 Sep 2021 11:24:02 +0300 Subject: [PATCH 0576/3485] [MacOS] Do not install latest OpenSSL (#4154) --- images/macos/provision/core/openssl.sh | 3 --- images/macos/software-report/SoftwareReport.Common.psm1 | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/images/macos/provision/core/openssl.sh b/images/macos/provision/core/openssl.sh index 5c28fd80116f..c7d66405ceac 100755 --- a/images/macos/provision/core/openssl.sh +++ b/images/macos/provision/core/openssl.sh @@ -1,9 +1,6 @@ #!/bin/bash -e -o pipefail source ~/utils/utils.sh -echo "Install latest openssl" -brew_smart_install "openssl" - echo "Install openssl@1.1" brew_smart_install "openssl@1.1" diff --git a/images/macos/software-report/SoftwareReport.Common.psm1 b/images/macos/software-report/SoftwareReport.Common.psm1 index 64ee19a1c959..f429390ddd42 100644 --- a/images/macos/software-report/SoftwareReport.Common.psm1 +++ b/images/macos/software-report/SoftwareReport.Common.psm1 @@ -308,7 +308,7 @@ function Get-PackerVersion { } function Get-OpenSSLVersion { - $opensslVersion = Get-Item /usr/local/opt/openssl | ForEach-Object {"{0} ``({1} -> {2})``" -f (Run-Command "openssl version"), $_.FullName, $_.Target} + $opensslVersion = Get-Item /usr/local/opt/openssl@1.1 | ForEach-Object {"{0} ``({1} -> {2})``" -f (Run-Command "openssl version"), $_.FullName, $_.Target} return $opensslVersion } From 1e7e6749a5fa9ad8d332d8d93ae24785579e5fc9 Mon Sep 17 00:00:00 2001 From: josetr <37419832+josetr@users.noreply.github.com> Date: Tue, 28 Sep 2021 09:30:00 +0100 Subject: [PATCH 0577/3485] Fix Visual Studio Experimental Instance Initialization (#4143) --- images/win/scripts/Installers/Install-VS.ps1 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/images/win/scripts/Installers/Install-VS.ps1 b/images/win/scripts/Installers/Install-VS.ps1 index cd55698a618e..bc282b6ce965 100644 --- a/images/win/scripts/Installers/Install-VS.ps1 +++ b/images/win/scripts/Installers/Install-VS.ps1 @@ -34,7 +34,8 @@ if ($instanceFolders -is [array]) $vsInstallRoot = (Get-VisualStudioInstance).InstallationPath # Initialize Visual Studio Experimental Instance -& "$vsInstallRoot\Common7\IDE\devenv.exe" /RootSuffix Exp /ResetSettings General.vssettings /Command File.Exit +# The Out-Null cmdlet is required to ensure PowerShell waits until the '/ResetSettings' command fully completes. +& "$vsInstallRoot\Common7\IDE\devenv.exe" /RootSuffix Exp /ResetSettings General.vssettings /Command File.Exit | Out-Null # Updating content of MachineState.json file to disable autoupdate of VSIX extensions $newContent = '{"Extensions":[{"Key":"1e906ff5-9da8-4091-a299-5c253c55fdc9","Value":{"ShouldAutoUpdate":false}},{"Key":"Microsoft.VisualStudio.Web.AzureFunctions","Value":{"ShouldAutoUpdate":false}}],"ShouldAutoUpdate":false,"ShouldCheckForUpdates":false}' @@ -48,4 +49,4 @@ if (Test-IsWin19) { Install-Binary -Url $sdkUrl -Name $sdkFileName -ArgumentList $argumentList } -Invoke-PesterTests -TestFile "VisualStudio" \ No newline at end of file +Invoke-PesterTests -TestFile "VisualStudio" From efcefca087530a54af9874b0e3552e4522c5bbe1 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Tue, 28 Sep 2021 16:03:39 +0300 Subject: [PATCH 0578/3485] Revert "[Windows OS] Include Microsoft Game Development Kit (GDK) to image" (#4162) --- images/win/scripts/Installers/Install-GDK.ps1 | 19 ------------------- .../SoftwareReport/SoftwareReport.Common.psm1 | 7 ------- .../SoftwareReport.Generator.ps1 | 5 ----- images/win/scripts/Tests/Tools.Tests.ps1 | 6 ------ images/win/windows2019.json | 1 - 5 files changed, 38 deletions(-) delete mode 100644 images/win/scripts/Installers/Install-GDK.ps1 diff --git a/images/win/scripts/Installers/Install-GDK.ps1 b/images/win/scripts/Installers/Install-GDK.ps1 deleted file mode 100644 index 6283167d5d73..000000000000 --- a/images/win/scripts/Installers/Install-GDK.ps1 +++ /dev/null @@ -1,19 +0,0 @@ -################################################################################ -## File: Install-GDK.ps1 -## Desc: Install Microsoft Game Developement Kit -################################################################################ - -# Preparation -$tempFolder = Join-Path $env:Tmp "GDK" - -# Fetching Microsoft GDK release version -$GDKReleaseVersion = (Invoke-RestMethod -Uri "https://api.github.com/repos/microsoft/GDK/releases/latest").tag_name - -# Cloning GDK repo and checking out to release -git clone --depth 1 --branch $GDKReleaseVersion "https://github.com/microsoft/GDK.git" $tempFolder - -# Installing GDK -$GDKInstaller = Join-Path $tempFolder "pgdk.exe" -Install-Binary -FilePath $GDKInstaller -ArgumentList ("/quiet", "/norestart") - -Invoke-PesterTests -Testfile "Tools" -TestName "Microsoft GDK" \ No newline at end of file diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 index 71adb7a96b08..2f6ca4c522f8 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 @@ -329,13 +329,6 @@ function Get-PipxVersion { return "Pipx $pipxVersion" } -function Get-GDKVersion { - $regKey = "HKLM:\Software\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall\*" - $installedApplications = Get-ItemProperty -Path $regKey - $GDKRelease = $installedApplications | Where-Object DisplayName -match "Microsoft Game Development Kit" - return "$($GDKRelease.DisplayName) $($GDKRelease.DisplayVersion)" -} - function Build-PackageManagementEnvironmentTable { $envVariables = @( @{ diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index 6a59ed3ae009..608adaa239eb 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -124,11 +124,6 @@ $toolsList = @( (Get-ZstdVersion), (Get-YAMLLintVersion) ) -if (Test-IsWin19) { - $toolsList += @( - (Get-GDKVersion) - ) -} if ((Test-IsWin16) -or (Test-IsWin19)) { $toolsList += @( (Get-NSISVersion), diff --git a/images/win/scripts/Tests/Tools.Tests.ps1 b/images/win/scripts/Tests/Tools.Tests.ps1 index e333e7d63361..c45660e00133 100644 --- a/images/win/scripts/Tests/Tools.Tests.ps1 +++ b/images/win/scripts/Tests/Tools.Tests.ps1 @@ -100,12 +100,6 @@ Describe "Mingw64" { } } -Describe "Microsoft GDK" -Skip:(-not (Test-IsWin19)) { - It "GDK" { - "$($env:GRDKLatest)grdk.ini" | Should -Exist - } -} - Describe "GoogleCloudSDK" -Skip:(Test-IsWin22) { It "" -TestCases @( @{ ToolName = "bq" } diff --git a/images/win/windows2019.json b/images/win/windows2019.json index 1bc66248a761..af3c1ea91fe9 100644 --- a/images/win/windows2019.json +++ b/images/win/windows2019.json @@ -252,7 +252,6 @@ "{{ template_dir }}/scripts/Installers/Install-GoogleCloudSDK.ps1", "{{ template_dir }}/scripts/Installers/Install-CodeQLBundle.ps1", "{{ template_dir }}/scripts/Installers/Install-BizTalkBuildComponent.ps1", - "{{ template_dir }}/scripts/Installers/Install-GDK.ps1", "{{ template_dir }}/scripts/Installers/Disable-JITDebugger.ps1", "{{ template_dir }}/scripts/Installers/Configure-DynamicPort.ps1", "{{ template_dir }}/scripts/Installers/Configure-GDIProcessHandleQuota.ps1", From b930b3d9d8327f678c752c0dd35f9921d182c4f5 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Wed, 29 Sep 2021 09:40:01 +0300 Subject: [PATCH 0579/3485] [Windows] win: add vcredist 2010 test (#4160) --- .../win/scripts/Installers/Install-VCRedist.ps1 | 4 +++- images/win/scripts/Tests/Tools.Tests.ps1 | 16 ++++++++++++++++ images/win/windows2019.json | 2 ++ images/win/windows2022.json | 1 - 4 files changed, 21 insertions(+), 2 deletions(-) diff --git a/images/win/scripts/Installers/Install-VCRedist.ps1 b/images/win/scripts/Installers/Install-VCRedist.ps1 index 0defd50902e8..473fed3a299c 100644 --- a/images/win/scripts/Installers/Install-VCRedist.ps1 +++ b/images/win/scripts/Installers/Install-VCRedist.ps1 @@ -12,4 +12,6 @@ if (Test-IsWin19) { $ArgumentList = ("/install", "/quiet", "/norestart") Install-Binary -Url $Vc2010x86URI -Name $Vc2010x86Name -ArgumentList $ArgumentList Install-Binary -Url $Vc2010x64URI -Name $Vc2010x64Name -ArgumentList $ArgumentList -} \ No newline at end of file +} + +Invoke-PesterTests -TestFile "Tools" -TestName "VCRedist" diff --git a/images/win/scripts/Tests/Tools.Tests.ps1 b/images/win/scripts/Tests/Tools.Tests.ps1 index c45660e00133..3eb5322587d9 100644 --- a/images/win/scripts/Tests/Tools.Tests.ps1 +++ b/images/win/scripts/Tests/Tools.Tests.ps1 @@ -165,6 +165,22 @@ Describe "Vcpkg" { } } +Describe "VCRedist" -Skip:(Test-IsWin22) { + It "vcredist_140" -Skip:(Test-IsWin19) { + "C:\Windows\System32\vcruntime140.dll" | Should -Exist + } + + It "vcredist_2010_x64" -Skip:(Test-IsWin16) { + "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{1D8E6291-B0D5-35EC-8441-6616F567A0F7}" | Should -Exist + "C:\Windows\System32\msvcr100.dll" | Should -Exist + } + + It "vcredist_2010_x64" -Skip:(Test-IsWin16) { + "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{1D8E6291-B0D5-35EC-8441-6616F567A0F7}" | Should -Exist + "C:\Windows\System32\msvcr100.dll" | Should -Exist + } +} + Describe "WebPlatformInstaller" -Skip:(Test-IsWin22) { It "WebPlatformInstaller" { "WebPICMD" | Should -ReturnZeroExitCode diff --git a/images/win/windows2019.json b/images/win/windows2019.json index af3c1ea91fe9..fe47fea33de2 100644 --- a/images/win/windows2019.json +++ b/images/win/windows2019.json @@ -143,6 +143,8 @@ }, { "type": "windows-restart", + "check_registry": true, + "restart_check_command": "powershell -command \"& {if (-not (Get-Process TiWorker.exe -ErrorAction SilentlyContinue)) { Write-Output 'Restart complete' }}\"", "restart_timeout": "30m" }, { diff --git a/images/win/windows2022.json b/images/win/windows2022.json index 2c92c3923fe4..d35c0c63729b 100644 --- a/images/win/windows2022.json +++ b/images/win/windows2022.json @@ -144,7 +144,6 @@ { "type": "powershell", "scripts": [ - "{{ template_dir }}/scripts/Installers/Install-VCRedist.ps1", "{{ template_dir }}/scripts/Installers/Install-Docker.ps1", "{{ template_dir }}/scripts/Installers/Install-PowershellCore.ps1" ] From 2070ce9b0777d42bdc0ab762d8b161bc88938d23 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Wed, 29 Sep 2021 10:55:11 +0300 Subject: [PATCH 0580/3485] [Ubuntu] set docker-compose v1 (#4176) --- images/linux/scripts/installers/docker-compose.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/linux/scripts/installers/docker-compose.sh b/images/linux/scripts/installers/docker-compose.sh index cc6dc6c3142d..d6c8e3466ac2 100644 --- a/images/linux/scripts/installers/docker-compose.sh +++ b/images/linux/scripts/installers/docker-compose.sh @@ -4,8 +4,8 @@ ## Desc: Installs Docker Compose ################################################################################ -# Install latest docker-compose from releases -URL=$(curl -s https://api.github.com/repos/docker/compose/releases/latest | jq -r '.assets[].browser_download_url | select(endswith("docker-compose-Linux-x86_64"))') +# Install docker-compose v1 from releases +URL="https://github.com/docker/compose/releases/download/1.29.2/docker-compose-Linux-x86_64" curl -L $URL -o /usr/local/bin/docker-compose chmod +x /usr/local/bin/docker-compose From 1d9156313991640f6c5232a258ffbcf84b69978c Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Wed, 29 Sep 2021 14:58:06 +0300 Subject: [PATCH 0581/3485] [Ubuntu] java: do not use the github tag release (#4182) --- images/linux/scripts/installers/java-tools.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/images/linux/scripts/installers/java-tools.sh b/images/linux/scripts/installers/java-tools.sh index 8067ef348553..fbc5f6b13077 100644 --- a/images/linux/scripts/installers/java-tools.sh +++ b/images/linux/scripts/installers/java-tools.sh @@ -63,12 +63,10 @@ apt-fast install -y --no-install-recommends ant ant-optional echo "ANT_HOME=/usr/share/ant" | tee -a /etc/environment # Install Maven -json=$(curl -s "https://api.github.com/repos/apache/maven/tags") -latestMavenVersion=$(echo $json | jq -r '.[] | select(.name | match("^(maven-[0-9.]*)$")) | .name' | head -1 | cut -d- -f2) -mavenDownloadUrl="https://www-eu.apache.org/dist/maven/maven-3/${latestMavenVersion}/binaries/apache-maven-${latestMavenVersion}-bin.zip" +mavenDownloadUrl=$(curl -sL https://maven.apache.org/download.cgi | grep -oP 'https://[^/"].+/binaries/apache-maven-.+-bin.zip(?=")') download_with_retries $mavenDownloadUrl "/tmp" "maven.zip" unzip -qq -d /usr/share /tmp/maven.zip -ln -s /usr/share/apache-maven-${latestMavenVersion}/bin/mvn /usr/bin/mvn +ln -s /usr/share/apache-maven-*/bin/mvn /usr/bin/mvn # Install Gradle # This script founds the latest gradle release from https://services.gradle.org/versions/all From 051de33461d68bc7ede1f24878340e851274230f Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Wed, 29 Sep 2021 15:31:14 +0300 Subject: [PATCH 0582/3485] [Windows] Add new component to VS22 (#4181) --- images/win/toolsets/toolset-2022.json | 1 + 1 file changed, 1 insertion(+) diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index de88621f1061..5a011437f76b 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -185,6 +185,7 @@ "Microsoft.VisualStudio.Component.VC.v141.x86.x64.Spectre", "Microsoft.VisualStudio.Component.VC.v141.MFC", "Microsoft.VisualStudio.Component.VC.v141.MFC.Spectre", + "Microsoft.VisualStudio.Component.VC.ATLMFC", "Microsoft.VisualStudio.Component.VC.ATLMFC.Spectre", "Microsoft.VisualStudio.Component.Windows10SDK.19041", "Microsoft.VisualStudio.Component.Windows10SDK.20348", From ecfad34b309f7e731421f19f4d717e00dea391fd Mon Sep 17 00:00:00 2001 From: Dibir Magomedsaygitov <61747324+dibir-magomedsaygitov@users.noreply.github.com> Date: Wed, 29 Sep 2021 18:37:33 +0300 Subject: [PATCH 0583/3485] [Ubuntu] Downgrade git-lfs version to 2.13.3 (#4168) --- images/linux/scripts/installers/git.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/linux/scripts/installers/git.sh b/images/linux/scripts/installers/git.sh index d878862cbc93..24baeb3fdca2 100644 --- a/images/linux/scripts/installers/git.sh +++ b/images/linux/scripts/installers/git.sh @@ -18,7 +18,7 @@ git --version # Install git-lfs curl -s $GIT_LFS_REPO/script.deb.sh | bash -apt-get install -y git-lfs +apt-get install -y git-lfs=2.13.3 # Install git-ftp apt-get install git-ftp -y From 95ee5e0c6d72b4623c0c3d317bdeb8ff88b6ad96 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 30 Sep 2021 11:23:16 +0000 Subject: [PATCH 0584/3485] Updating readme file for ubuntu18 version 20210929.1 (#4184) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/linux/Ubuntu1804-README.md | 93 +++++++++++++++---------------- 1 file changed, 46 insertions(+), 47 deletions(-) diff --git a/images/linux/Ubuntu1804-README.md b/images/linux/Ubuntu1804-README.md index c2f6ae984ab8..57d4752ecab5 100644 --- a/images/linux/Ubuntu1804-README.md +++ b/images/linux/Ubuntu1804-README.md @@ -1,11 +1,10 @@ | Announcements | |-| -| [[Ubuntu] Alpine 3.11 docker image will be removed on September, 20](https://github.com/actions/virtual-environments/issues/4042) | | [Ubuntu 16.04 environment will be removed on September 20, 2021](https://github.com/actions/virtual-environments/issues/3287) | *** # Ubuntu 18.04.6 LTS -- Linux kernel version: 5.4.0-1056-azure -- Image Version: 20210919.1 +- Linux kernel version: 5.4.0-1059-azure +- Image Version: 20210929.1 ## Installed Software ### Language and Runtime @@ -16,28 +15,28 @@ - Erlang rebar3 3.17.0 - GNU C++ 7.5.0, 9.4.0, 10.3.0 - GNU Fortran 7.5.0, 9.4.0, 10.3.0 -- Julia 1.6.2 -- Kotlin 1.5.30-release-407 +- Julia 1.6.3 +- Kotlin 1.5.31-release-548 - Mono 6.12.0.122 (apt source repository: https://download.mono-project.com/repo/ubuntu stable-bionic main) - MSBuild 16.6.0.15201 (from /usr/lib/mono/msbuild/15.0/bin/MSBuild.dll) -- Node 14.17.6 +- Node 14.18.0 - Perl 5.26.1 - Python 2.7.17 - Python3 3.6.9 - Ruby 2.5.1p57 -- Swift 5.4.3 +- Swift 5.5 ### Package Management - cpan 1.64 - Helm 3.7.0 -- Homebrew 3.2.12 +- Homebrew 3.2.13 - Miniconda 4.10.3 - Npm 6.14.15 - Pip 9.0.1 - Pip3 9.0.1 - Pipx 0.16.4 - RubyGems 2.7.6 -- Vcpkg (build from master \<4428702>) +- Vcpkg (build from master \<33f02c0>) - Yarn 1.22.11 #### Environment variables @@ -55,13 +54,13 @@ ### Tools - Ansible 2.11.5 - apt-fast 1.9.11 -- AzCopy 10.12.1 (available by `azcopy` and `azcopy10` aliases) +- AzCopy 10.12.2 (available by `azcopy` and `azcopy10` aliases) - Bazel 4.2.1 - Bazelisk 1.10.1 - Bicep 0.4.613 - Buildah 1.19.6 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- CMake 3.21.2 -- CodeQL Action Bundle 2.6.1 +- CMake 3.21.3 +- CodeQL Action Bundle 2.6.2 - Docker Compose 1.29.2 - Docker-Buildx 0.6.0 - Docker-Moby Client 20.10.8+azure @@ -71,43 +70,43 @@ - Git-ftp 1.3.1 - Haveged 1.9.1 - Heroku 7.59.0 -- HHVM (HipHop VM) 4.127.0 +- HHVM (HipHop VM) 4.129.0 - jq 1.5 - Kind 0.11.1 - Kubectl 1.22.2 -- Kustomize 4.3.0 +- Kustomize 4.4.0 - Leiningen 2.9.7 - MediaInfo 17.12 - Mercurial 4.5.3 -- Minikube 1.23.1 +- Minikube 1.23.2 - Newman 5.3.0 - nvm 0.38.0 - OpenSSL 1.1.1 11 Sep 2018 -- Packer 1.7.5 +- Packer 1.7.6 - PhantomJS 2.1.1 - Podman 3.0.1 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- Pulumi 3.12.0 +- Pulumi 3.13.2 - R 4.1.1 - Skopeo 1.2.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 - SVN 1.9.7 - Terraform 1.0.7 - yamllint 1.26.3 -- yq 4.13.0 +- yq 4.13.2 - zstd 1.5.0 (homebrew) ### CLI Tools -- Alibaba Cloud CLI 3.0.90 -- AWS CLI 1.20.44 +- Alibaba Cloud CLI 3.0.94 +- AWS CLI 1.20.50 - AWS CLI Session manager plugin 1.2.245.0 -- AWS SAM CLI 1.31.0 +- AWS SAM CLI 1.32.0 - Azure CLI (azure-cli) 2.28.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.20.0 - GitHub CLI 2.0.0 -- Google Cloud SDK 357.0.0 (apt source repository: https://packages.cloud.google.com/apt) +- Google Cloud SDK 359.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 6.9.6 -- OpenShift CLI 4.8.11 +- Netlify CLI 6.9.24 +- OpenShift CLI 4.8.13 - ORAS CLI 0.12.0 - Vercel CLI 23.1.2 @@ -121,16 +120,16 @@ ### PHP | Tool | Version | | -------- | ---------------------------------- | -| PHP | 7.1.33 7.2.34 7.3.30 7.4.23 8.0.10 | +| PHP | 7.1.33 7.2.34 7.3.31 7.4.24 8.0.11 | | Composer | 2.1.8 | -| PHPUnit | 8.5.20 | +| PHPUnit | 8.5.21 | ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ``` ### Haskell -- Cabal 3.4.0.0 +- Cabal 3.6.0.0 - GHC 9.0.1 -- GHCup 0.1.16.2 +- GHCup 0.1.17.1 - Stack 2.7.3 ### Rust Tools @@ -148,11 +147,11 @@ - Rustfmt 1.4.37 ### Browsers and Drivers -- Google Chrome 93.0.4577.82 -- ChromeDriver 93.0.4577.63 +- Google Chrome 94.0.4606.61 +- ChromeDriver 94.0.4606.61 - Mozilla Firefox 92.0 - Geckodriver 0.30.0 -- Chromium 93.0.4577.0 +- Chromium 94.0.4606.0 #### Environment variables | Name | Value | @@ -164,7 +163,7 @@ - 2.1.302 2.1.403 2.1.526 2.1.617 2.1.701 2.1.818 3.1.119 3.1.202 3.1.302 3.1.413 5.0.104 5.0.207 5.0.303 5.0.401 ### Databases -- MongoDB 5.0.2 (apt source repository: https://repo.mongodb.org/apt/ubuntu) +- MongoDB 5.0.3 (apt source repository: https://repo.mongodb.org/apt/ubuntu) - PostgreSQL 13.4 (apt source repository: https://apt.postgresql.org/pub/repos/apt/) - sqlite3 3.22.0 @@ -190,7 +189,7 @@ #### Node.js - 10.24.1 - 12.22.6 -- 14.17.6 +- 14.18.0 #### PyPy - 2.7.18 [PyPy 7.3.5] @@ -227,10 +226,10 @@ | Module | Version | | ---------- | ------- | | MarkdownPS | 1.9 | -| Pester | 5.3.0 | +| Pester | 5.3.1 | #### Az PowerShell Modules -- 6.1.0 3.1.0.zip 4.4.0.zip 5.9.0.zip +- 6.4.0 3.1.0.zip 4.4.0.zip 5.9.0.zip ### Web Servers | Name | Version | ConfigFile | ServiceStatus | ListenPort | @@ -252,7 +251,7 @@ | Google APIs | addon-google_apis-google-21
addon-google_apis-google-22
addon-google_apis-google-23
addon-google_apis-google-24 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 21.4.7075529 | +| NDK | 21.4.7075529 (default)
23.0.7599858 | | SDK Patch Applier v4 | 1 | #### Environment variables @@ -269,18 +268,18 @@ | alpine:3.12 | sha256:a296b4c6f6ee2b88f095b61e95c7ef4f51ba25598835b4978c9256d8c8ace48a | 2021-08-31 | | alpine:3.13 | sha256:2582893dec6f12fd499d3a709477f2c0c0c1dfcd28024c93f1f0626b9e3540c8 | 2021-08-31 | | alpine:3.14 | sha256:e1c082e3d3c45cccac829840a25941e679c25d438cc8412c2fa221cf1a824e6a | 2021-08-27 | -| buildpack-deps:bullseye | sha256:97aee9e88aef0054c2c01ab31f3d6620bebaaa864656582d99e80164e4454176 | 2021-09-03 | -| buildpack-deps:buster | sha256:a254f0d1ab14e6f05992f64e71cbc6f22ab8a657b0e962bb8d0c7a1a3b2ed6d0 | 2021-09-03 | -| buildpack-deps:stretch | sha256:b4e9fcbcec4f927938983a50cb12d460a1d0c809925bbadb5e9c378cb82c53cb | 2021-09-03 | -| debian:10 | sha256:cdb5ae50fedfda0bc2f9e4d303683ab6096c84db9e97b0bbfea0653549aeb3f8 | 2021-09-03 | -| debian:11 | sha256:08db48d59c0a91afb802ebafc921be3154e200c452e4d0b19634b426b03e0e25 | 2021-09-03 | -| debian:9 | sha256:74ca5bc3c547829123c1aaf69151bc8a50b9d8b006997e206ce0ef631ad3d0af | 2021-09-03 | +| buildpack-deps:bullseye | sha256:e3d110d51825ea68a90f3d8f56bd0958d5aba0099cd8741c6249f6ea014cdc0c | 2021-09-28 | +| buildpack-deps:buster | sha256:cd01a4c25b0be12a252ddbddd2b286ee47cdf1eac3a8a9c268073709c4e8098f | 2021-09-28 | +| buildpack-deps:stretch | sha256:b07c88daec80f31b7a3b9dfc8938023b8250c71c9b076034c19d6ef6da964186 | 2021-09-28 | +| debian:10 | sha256:f4b36c72b25772bd4f83e939d9b17dfe804977e455338d29266e845c106c7e02 | 2021-09-28 | +| debian:11 | sha256:e68966e6b0c5e55ad80a5b6d0366245c086768c99e921317c1c1da6bc9e3c920 | 2021-09-28 | +| debian:9 | sha256:69b306996a84b9d143876d47ad77643367f0329f67f3056a1da8125315a0d637 | 2021-09-28 | | node:10 | sha256:59531d2835edd5161c8f9512f9e095b1836f7a1fcb0ab73e005ec46047384911 | 2021-04-10 | | node:10-alpine | sha256:dc98dac24efd4254f75976c40bce46944697a110d06ce7fa47e7268470cf2e28 | 2021-04-14 | -| node:12 | sha256:a8f4083bfbffe6d9f2e568efb6c83f8fee6da9f8496853dbf4fcf6e84b1377a6 | 2021-09-03 | +| node:12 | sha256:18c8ec450aa0d85ccee88d119c7d28ba5d8cbaf614c53837755fe2f67d44a466 | 2021-09-28 | | node:12-alpine | sha256:1ea5900145028957ec0e7b7e590ac677797fa8962ccec4e73188092f7bc14da5 | 2021-08-31 | -| node:14 | sha256:4164d987bfceb62b17db4938d535dd31fc50d6ee0b4e00ac7a774f82af408d48 | 2021-09-03 | -| node:14-alpine | sha256:8c94a0291133e16b92be5c667e0bc35930940dfa7be544fb142e25f8e4510a45 | 2021-08-31 | +| node:14 | sha256:906a937a57b31381b154bcf36ca5b8787197a2b802de810f9998722069337b77 | 2021-09-29 | +| node:14-alpine | sha256:276f611d6f338a38c3265f28075e3fb2542358e39ba6b688a1c51a41d4f97682 | 2021-09-29 | | ubuntu:16.04 | sha256:454054f5bbd571b088db25b662099c6c7b3f0cb78536a2077d54adc48f00cd68 | 2021-08-31 | | ubuntu:18.04 | sha256:9bc830af2bef73276515a29aa896eedfa7bdf4bdbc5c1063b4c457a4bbb8cd79 | 2021-08-31 | | ubuntu:20.04 | sha256:9d6a8699fb5c9c39cf08a0871bd6219f0400981c570894cd8cbea30d3424a31f | 2021-08-31 | @@ -295,7 +294,7 @@ | build-essential | 12.4ubuntu1 | | bzip2 | 1.0.6-8.1ubuntu0.2 | | coreutils | 8.28-1ubuntu1 | -| curl | 7.58.0-2ubuntu3.15 | +| curl | 7.58.0-2ubuntu3.16 | | dbus | 1.12.2-1ubuntu1.2 | | dnsutils | 1:9.11.3+dfsg-1ubuntu1.15 | | dpkg | 1.19.0.5ubuntu2.3 | @@ -312,7 +311,7 @@ | lib32z1 | 1:1.2.11.dfsg-0ubuntu2 | | libc++-dev | 6.0-2 | | libc++abi-dev | 6.0-2 | -| libcurl3 | 7.58.0-2ubuntu3.15 | +| libcurl3 | 7.58.0-2ubuntu3.16 | | libgbm-dev | 20.0.8-0ubuntu1\~18.04.1 | | libgconf-2-4 | 3.2.6-4ubuntu1 | | libgsl-dev | 2.4+dfsg-6 | From ead91b94967755331bf9895a899692ed29e0defe Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 30 Sep 2021 12:32:27 +0000 Subject: [PATCH 0585/3485] Updating readme file for ubuntu20 version 20210929.1 (#4185) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/linux/Ubuntu2004-README.md | 95 +++++++++++++++---------------- 1 file changed, 47 insertions(+), 48 deletions(-) diff --git a/images/linux/Ubuntu2004-README.md b/images/linux/Ubuntu2004-README.md index 77131c4527ff..33745c70d783 100644 --- a/images/linux/Ubuntu2004-README.md +++ b/images/linux/Ubuntu2004-README.md @@ -1,11 +1,10 @@ | Announcements | |-| -| [[Ubuntu] Alpine 3.11 docker image will be removed on September, 20](https://github.com/actions/virtual-environments/issues/4042) | | [Ubuntu 16.04 environment will be removed on September 20, 2021](https://github.com/actions/virtual-environments/issues/3287) | *** # Ubuntu 20.04.3 LTS -- Linux kernel version: 5.8.0-1041-azure -- Image Version: 20210919.1 +- Linux kernel version: 5.8.0-1042-azure +- Image Version: 20210929.1 ## Installed Software ### Language and Runtime @@ -16,28 +15,28 @@ - Erlang rebar3 3.17.0 - GNU C++ 9.3.0, 10.3.0 - GNU Fortran 9.3.0, 10.3.0 -- Julia 1.6.2 -- Kotlin 1.5.30-release-407 +- Julia 1.6.3 +- Kotlin 1.5.31-release-548 - Mono 6.12.0.122 (apt source repository: https://download.mono-project.com/repo/ubuntu stable-focal main) - MSBuild 16.6.0.15201 (from /usr/lib/mono/msbuild/15.0/bin/MSBuild.dll) -- Node 14.17.6 +- Node 14.18.0 - Perl 5.30.0 - Python 3.8.10 - Python3 3.8.10 - Ruby 2.7.0p0 -- Swift 5.4.3 +- Swift 5.5 ### Package Management - cpan 1.64 - Helm 3.7.0 -- Homebrew 3.2.12 +- Homebrew 3.2.13 - Miniconda 4.10.3 - Npm 6.14.15 - Pip 20.0.2 - Pip3 20.0.2 - Pipx 0.16.4 - RubyGems 3.1.2 -- Vcpkg (build from master \<4428702>) +- Vcpkg (build from master \<33f02c0>) - Yarn 1.22.11 #### Environment variables @@ -56,60 +55,60 @@ ### Tools - Ansible 2.11.5 - apt-fast 1.9.11 -- AzCopy 10.12.1 (available by `azcopy` and `azcopy10` aliases) +- AzCopy 10.12.2 (available by `azcopy` and `azcopy10` aliases) - Bazel 4.2.1 - Bazelisk 1.10.1 - Bicep 0.4.613 - Buildah 1.21.3 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- CMake 3.21.2 -- CodeQL Action Bundle 2.6.1 +- CMake 3.21.3 +- CodeQL Action Bundle 2.6.2 - Docker Compose 1.29.2 - Docker-Buildx 0.6.3 - Docker-Moby Client 20.10.8+azure - Docker-Moby Server 20.10.8+azure -- Fastlane 2.194.0 +- Fastlane 2.195.0 - Git 2.33.0 (apt source repository: ppa:git-core/ppa) - Git LFS 2.13.3 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.6.0 - Haveged 1.9.1 - Heroku 7.59.0 -- HHVM (HipHop VM) 4.127.0 +- HHVM (HipHop VM) 4.129.0 - jq 1.6 - Kind 0.11.1 - Kubectl 1.22.2 -- Kustomize 4.3.0 +- Kustomize 4.4.0 - Leiningen 2.9.7 - MediaInfo 19.09 - Mercurial 5.3.1 -- Minikube 1.23.1 +- Minikube 1.23.2 - Newman 5.3.0 - nvm 0.38.0 - OpenSSL 1.1.1f 31 Mar 2020 -- Packer 1.7.5 +- Packer 1.7.6 - PhantomJS 2.1.1 - Podman 3.3.1 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- Pulumi 3.12.0 +- Pulumi 3.13.2 - R 4.1.1 - Skopeo 1.3.0 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 - Terraform 1.0.7 - yamllint 1.26.3 -- yq 4.13.0 +- yq 4.13.2 - zstd 1.5.0 (homebrew) ### CLI Tools -- Alibaba Cloud CLI 3.0.90 -- AWS CLI 2.2.39 +- Alibaba Cloud CLI 3.0.94 +- AWS CLI 2.2.42 - AWS CLI Session manager plugin 1.2.245.0 -- AWS SAM CLI 1.31.0 +- AWS SAM CLI 1.32.0 - Azure CLI (azure-cli) 2.28.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.20.0 - GitHub CLI 2.0.0 -- Google Cloud SDK 357.0.0 (apt source repository: https://packages.cloud.google.com/apt) +- Google Cloud SDK 359.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 6.9.6 -- OpenShift CLI 4.8.11 +- Netlify CLI 6.9.24 +- OpenShift CLI 4.8.13 - ORAS CLI 0.12.0 - Vercel CLI 23.1.2 @@ -127,16 +126,16 @@ ### PHP | Tool | Version | | -------- | ------------- | -| PHP | 7.4.23 8.0.10 | +| PHP | 7.4.24 8.0.11 | | Composer | 2.1.8 | -| PHPUnit | 8.5.20 | +| PHPUnit | 8.5.21 | ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ``` ### Haskell -- Cabal 3.4.0.0 +- Cabal 3.6.0.0 - GHC 9.0.1 -- GHCup 0.1.16.2 +- GHCup 0.1.17.1 - Stack 2.7.3 ### Rust Tools @@ -154,11 +153,11 @@ - Rustfmt 1.4.37 ### Browsers and Drivers -- Google Chrome 93.0.4577.82 -- ChromeDriver 93.0.4577.63 +- Google Chrome 94.0.4606.61 +- ChromeDriver 94.0.4606.61 - Mozilla Firefox 92.0 - Geckodriver 0.30.0 -- Chromium 93.0.4577.0 +- Chromium 94.0.4606.0 #### Environment variables | Name | Value | @@ -170,7 +169,7 @@ - 2.1.302 2.1.403 2.1.526 2.1.617 2.1.701 2.1.818 3.1.119 3.1.202 3.1.302 3.1.413 5.0.104 5.0.207 5.0.303 5.0.401 ### Databases -- MongoDB 5.0.2 (apt source repository: https://repo.mongodb.org/apt/ubuntu) +- MongoDB 5.0.3 (apt source repository: https://repo.mongodb.org/apt/ubuntu) - PostgreSQL 13.4 (apt source repository: https://apt.postgresql.org/pub/repos/apt/) - sqlite3 3.31.1 @@ -195,7 +194,7 @@ #### Node.js - 10.24.1 - 12.22.6 -- 14.17.6 +- 14.18.0 #### PyPy - 2.7.18 [PyPy 7.3.5] @@ -231,11 +230,11 @@ | Module | Version | | ---------------- | ------- | | MarkdownPS | 1.9 | -| Pester | 5.3.0 | +| Pester | 5.3.1 | | PSScriptAnalyzer | 1.20.0 | #### Az PowerShell Modules -- 6.1.0 3.1.0.zip 4.4.0.zip 5.9.0.zip +- 6.4.0 3.1.0.zip 4.4.0.zip 5.9.0.zip ### Web Servers | Name | Version | ConfigFile | ServiceStatus | ListenPort | @@ -257,7 +256,7 @@ | CMake | 3.10.2
3.18.1 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 21.4.7075529
22.1.7171670 | +| NDK | 21.4.7075529 (default)
22.1.7171670
23.0.7599858 | | SDK Patch Applier v4 | 1 | #### Environment variables @@ -265,7 +264,7 @@ | ----------------------- | ------------------------------------------------------------------------------------ | | ANDROID_HOME | /usr/local/lib/android/sdk | | ANDROID_NDK_HOME | /usr/local/lib/android/sdk/ndk-bundle -> /usr/local/lib/android/sdk/ndk/21.4.7075529 | -| ANDROID_NDK_LATEST_HOME | /usr/local/lib/android/sdk/ndk/22.1.7171670 | +| ANDROID_NDK_LATEST_HOME | /usr/local/lib/android/sdk/ndk/23.0.7599858 | | ANDROID_NDK_ROOT | /usr/local/lib/android/sdk/ndk-bundle -> /usr/local/lib/android/sdk/ndk/21.4.7075529 | | ANDROID_SDK_ROOT | /usr/local/lib/android/sdk | @@ -275,18 +274,18 @@ | alpine:3.12 | sha256:a296b4c6f6ee2b88f095b61e95c7ef4f51ba25598835b4978c9256d8c8ace48a | 2021-08-31 | | alpine:3.13 | sha256:2582893dec6f12fd499d3a709477f2c0c0c1dfcd28024c93f1f0626b9e3540c8 | 2021-08-31 | | alpine:3.14 | sha256:e1c082e3d3c45cccac829840a25941e679c25d438cc8412c2fa221cf1a824e6a | 2021-08-27 | -| buildpack-deps:bullseye | sha256:97aee9e88aef0054c2c01ab31f3d6620bebaaa864656582d99e80164e4454176 | 2021-09-03 | -| buildpack-deps:buster | sha256:a254f0d1ab14e6f05992f64e71cbc6f22ab8a657b0e962bb8d0c7a1a3b2ed6d0 | 2021-09-03 | -| buildpack-deps:stretch | sha256:b4e9fcbcec4f927938983a50cb12d460a1d0c809925bbadb5e9c378cb82c53cb | 2021-09-03 | -| debian:10 | sha256:cdb5ae50fedfda0bc2f9e4d303683ab6096c84db9e97b0bbfea0653549aeb3f8 | 2021-09-03 | -| debian:11 | sha256:08db48d59c0a91afb802ebafc921be3154e200c452e4d0b19634b426b03e0e25 | 2021-09-03 | -| debian:9 | sha256:74ca5bc3c547829123c1aaf69151bc8a50b9d8b006997e206ce0ef631ad3d0af | 2021-09-03 | +| buildpack-deps:bullseye | sha256:e3d110d51825ea68a90f3d8f56bd0958d5aba0099cd8741c6249f6ea014cdc0c | 2021-09-28 | +| buildpack-deps:buster | sha256:cd01a4c25b0be12a252ddbddd2b286ee47cdf1eac3a8a9c268073709c4e8098f | 2021-09-28 | +| buildpack-deps:stretch | sha256:b07c88daec80f31b7a3b9dfc8938023b8250c71c9b076034c19d6ef6da964186 | 2021-09-28 | +| debian:10 | sha256:f4b36c72b25772bd4f83e939d9b17dfe804977e455338d29266e845c106c7e02 | 2021-09-28 | +| debian:11 | sha256:e68966e6b0c5e55ad80a5b6d0366245c086768c99e921317c1c1da6bc9e3c920 | 2021-09-28 | +| debian:9 | sha256:69b306996a84b9d143876d47ad77643367f0329f67f3056a1da8125315a0d637 | 2021-09-28 | | node:10 | sha256:59531d2835edd5161c8f9512f9e095b1836f7a1fcb0ab73e005ec46047384911 | 2021-04-10 | | node:10-alpine | sha256:dc98dac24efd4254f75976c40bce46944697a110d06ce7fa47e7268470cf2e28 | 2021-04-14 | -| node:12 | sha256:a8f4083bfbffe6d9f2e568efb6c83f8fee6da9f8496853dbf4fcf6e84b1377a6 | 2021-09-03 | +| node:12 | sha256:18c8ec450aa0d85ccee88d119c7d28ba5d8cbaf614c53837755fe2f67d44a466 | 2021-09-28 | | node:12-alpine | sha256:1ea5900145028957ec0e7b7e590ac677797fa8962ccec4e73188092f7bc14da5 | 2021-08-31 | -| node:14 | sha256:4164d987bfceb62b17db4938d535dd31fc50d6ee0b4e00ac7a774f82af408d48 | 2021-09-03 | -| node:14-alpine | sha256:8c94a0291133e16b92be5c667e0bc35930940dfa7be544fb142e25f8e4510a45 | 2021-08-31 | +| node:14 | sha256:906a937a57b31381b154bcf36ca5b8787197a2b802de810f9998722069337b77 | 2021-09-29 | +| node:14-alpine | sha256:276f611d6f338a38c3265f28075e3fb2542358e39ba6b688a1c51a41d4f97682 | 2021-09-29 | | ubuntu:16.04 | sha256:454054f5bbd571b088db25b662099c6c7b3f0cb78536a2077d54adc48f00cd68 | 2021-08-31 | | ubuntu:18.04 | sha256:9bc830af2bef73276515a29aa896eedfa7bdf4bdbc5c1063b4c457a4bbb8cd79 | 2021-08-31 | | ubuntu:20.04 | sha256:9d6a8699fb5c9c39cf08a0871bd6219f0400981c570894cd8cbea30d3424a31f | 2021-08-31 | @@ -321,7 +320,7 @@ | libc++-dev | 1:10.0-50\~exp1 | | libc++abi-dev | 1:10.0-50\~exp1 | | libcurl4 | 7.68.0-1ubuntu2.7 | -| libgbm-dev | 21.0.3-0ubuntu0.3\~20.04.1 | +| libgbm-dev | 21.0.3-0ubuntu0.3\~20.04.2 | | libgconf-2-4 | 3.2.6-6ubuntu1 | | libgsl-dev | 2.5+dfsg-6build1 | | libgtk-3-0 | 3.24.20-0ubuntu1 | From 26333688ed1296d56183b1a4d9073998b489838d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 30 Sep 2021 13:36:17 +0000 Subject: [PATCH 0586/3485] Updating readme file for win22 version 20210927.1 (#4164) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/win/Windows2022-Readme.md | 58 +++++++++++++++++--------------- 1 file changed, 30 insertions(+), 28 deletions(-) diff --git a/images/win/Windows2022-Readme.md b/images/win/Windows2022-Readme.md index 847f533a8d71..3a828aff22fd 100644 --- a/images/win/Windows2022-Readme.md +++ b/images/win/Windows2022-Readme.md @@ -4,7 +4,7 @@ *** # Microsoft Windows Server 2022 Datacenter - OS Version: 10.0.20348 Build 230 -- Image Version: 20210920.1 +- Image Version: 20210927.1 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -13,15 +13,16 @@ ### Language and Runtime - Bash 4.4.23(1)-release - Go 1.16.8 -- Julia 1.6.2 -- Kotlin 1.5.30 +- Julia 1.6.3 +- Kotlin 1.5.31 +- LLVM 12.0.1 - Node 14.17.6 - PHP 8.0.10 - Python 3.9.7 - Ruby 3.0.2p107 ### Package Management -- Chocolatey 0.11.1 +- Chocolatey 0.11.2 - Composer 2.1.8 - Helm 3.6.3 - NPM 6.14.15 @@ -29,7 +30,7 @@ - pip 21.2.4 (python 3.9) - Pipx 0.16.4 - RubyGems 3.2.22 -- Vcpkg (build from master \<4428702>) +- Vcpkg (build from master \<46700e2>) - Yarn 1.22.11 #### Environment variables @@ -45,13 +46,13 @@ ### Tools - 7zip 19.00 - aria2 1.36.0 -- azcopy 10.12.1 +- azcopy 10.12.2 - Bazel 4.2.1 - Bazelisk 1.10.1 - Bicep 0.4.613 - Cabal 3.4.0.0 -- CMake 3.21.2 -- CodeQL Action Bundle 2.6.1 +- CMake 3.21.3 +- CodeQL Action Bundle 2.6.2 - Docker 20.10.7 - Docker-compose 1.29.2 - ghc 9.0.1 @@ -65,8 +66,8 @@ - Mingw-w64 8.1.0 - Newman 5.3.0 - OpenSSL 1.1.1 -- Packer 1.7.4 -- Pulumi v3.12.0 +- Packer 1.7.5 +- Pulumi v3.13.0 - R 4.1.1 - Stack 2.7.3 - Subversion (SVN) 1.14.1 @@ -77,9 +78,9 @@ - zstd 1.5.0 ### CLI Tools -- Alibaba Cloud CLI 3.0.90 -- AWS CLI 2.2.39 -- AWS SAM CLI 1.31.0 +- Alibaba Cloud CLI 3.0.93 +- AWS CLI 2.2.41 +- AWS SAM CLI 1.32.0 - AWS Session Manager CLI 1.2.245.0 - Azure CLI 2.28.0 - Azure DevOps CLI extension 0.20.0 @@ -101,11 +102,11 @@ - Rustfmt 1.4.37 ### Browsers and webdrivers -- Google Chrome 93.0.4577.82 -- Chrome Driver 93.0.4577.63 -- Microsoft Edge 93.0.961.52 -- Microsoft Edge Driver 93.0.961.52 -- Mozilla Firefox 92.0 +- Google Chrome 94.0.4606.61 +- Chrome Driver 94.0.4606.61 +- Microsoft Edge 94.0.992.31 +- Microsoft Edge Driver 94.0.992.31 +- Mozilla Firefox 92.0.1 - Gecko Driver 0.30.0 - IE Driver 3.150.1.1 @@ -121,6 +122,7 @@ | ------------------- | --------------- | -------------------- | | 8.0.302+8 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | | 11.0.12+7 | Eclipse Temurin | JAVA_HOME_11_X64 | +| 17.0.0+35 | Eclipse Temurin | JAVA_HOME_17_X64 | ### Shells | Name | Target | @@ -194,7 +196,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### MongoDB | Version | ServiceName | ServiceStatus | ServiceStartType | | ------- | ----------- | ------------- | ---------------- | -| 5.0.2.0 | MongoDB | Running | Automatic | +| 5.0.3.0 | MongoDB | Running | Automatic | @@ -212,9 +214,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Nginx | 1.21.3 | C:\tools\nginx-1.21.3\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2022 -| Name | Version | Path | -| ----------------------------- | ------------ | ----------------------------------------------------- | -| Visual Studio Enterprise 2022 | 17.0.31710.8 | C:\Program Files\Microsoft Visual Studio\2022\Preview | +| Name | Version | Path | +| ----------------------------- | ------------- | ----------------------------------------------------- | +| Visual Studio Enterprise 2022 | 17.0.31717.71 | C:\Program Files\Microsoft Visual Studio\2022\Preview | #### Workloads, components and extensions: @@ -257,8 +259,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.Net.ComponentGroup.DevelopmentPrerequisites | 17.0.31709.181 | | Microsoft.Net.ComponentGroup.TargetingPacks.Common | 17.0.31709.181 | | Microsoft.NetCore.Component.DevelopmentTools | 17.0.31709.181 | -| Microsoft.NetCore.Component.Runtime.6.0 | 17.0.31709.181 | -| Microsoft.NetCore.Component.SDK | 17.0.31709.198 | +| Microsoft.NetCore.Component.Runtime.6.0 | 17.0.31716.346 | +| Microsoft.NetCore.Component.SDK | 17.0.31716.346 | | Microsoft.NetCore.Component.Web | 17.0.31709.181 | | Microsoft.VisualStudio.Component.AppInsights.Tools | 17.0.31709.181 | | Microsoft.VisualStudio.Component.AspNet | 17.0.31709.181 | @@ -395,7 +397,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### .NET Core SDK `Location C:\Program Files\dotnet\sdk` -- 3.1.119 3.1.202 3.1.302 3.1.413 5.0.104 5.0.207 5.0.303 5.0.401 6.0.100-rc.1.21458.32 +- 3.1.119 3.1.202 3.1.302 3.1.413 5.0.104 5.0.207 5.0.303 5.0.401 6.0.100-rc.1.21463.6 ### .NET Core Runtime `Location: C:\Program Files\dotnet\shared\Microsoft.AspNetCore.App` @@ -431,7 +433,7 @@ All other versions are saved but not installed. | ------------------ | ---------------- | | DockerMsftProvider | 1.0.0.8 | | MarkdownPS | 1.9 | -| Pester | 3.4.0
5.3.0 | +| Pester | 3.4.0
5.3.1 | | PowerShellGet | 1.0.0.1
2.2.5 | | PSScriptAnalyzer | 1.20.0 | | PSWindowsUpdate | 2.2.0.2 | @@ -450,7 +452,7 @@ All other versions are saved but not installed. | CMake | 3.18.1 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 21.4.7075529
22.1.7171670 | +| NDK | 21.4.7075529 (default)
22.1.7171670
23.0.7599858 | | SDK Patch Applier v4 | 1 | #### Environment variables @@ -458,7 +460,7 @@ All other versions are saved but not installed. | ----------------------- | ---------------------------------------------------------------------------- | | ANDROID_HOME | C:\Android\android-sdk | | ANDROID_NDK_HOME | C:\Android\android-sdk\ndk-bundle -> C:\Android\android-sdk\ndk\21.4.7075529 | -| ANDROID_NDK_LATEST_HOME | C:\Android\android-sdk\ndk\22.1.7171670 | +| ANDROID_NDK_LATEST_HOME | C:\Android\android-sdk\ndk\23.0.7599858 | | ANDROID_NDK_PATH | C:\Android\android-sdk\ndk-bundle -> C:\Android\android-sdk\ndk\21.4.7075529 | | ANDROID_NDK_ROOT | C:\Android\android-sdk\ndk-bundle -> C:\Android\android-sdk\ndk\21.4.7075529 | | ANDROID_SDK_ROOT | C:\Android\android-sdk | From 1885bf35ef6b4f1cbd49941732f97a59aca26957 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 30 Sep 2021 14:14:07 +0000 Subject: [PATCH 0587/3485] Updating readme file for win16 version 20210927.1 (#4165) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/win/Windows2016-Readme.md | 48 +++++++++++++++++--------------- 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/images/win/Windows2016-Readme.md b/images/win/Windows2016-Readme.md index f8b9330617b3..6e30e7a40eb3 100644 --- a/images/win/Windows2016-Readme.md +++ b/images/win/Windows2016-Readme.md @@ -4,14 +4,15 @@ *** # Microsoft Windows Server 2016 Datacenter - OS Version: 10.0.14393 Build 4651 -- Image Version: 20210919.1 +- Image Version: 20210927.1 ## Installed Software ### Language and Runtime - Bash 4.4.23(1)-release - Go 1.15.15 -- Julia 1.6.2 -- Kotlin 1.5.30 +- Julia 1.6.3 +- Kotlin 1.5.31 +- LLVM 12.0.1 - Node 14.17.6 - Perl 5.32.1 - PHP 8.0.10 @@ -19,7 +20,7 @@ - Ruby 2.5.9p229 ### Package Management -- Chocolatey 0.11.1 +- Chocolatey 0.11.2 - Composer 2.1.8 - Helm 3.6.3 - Miniconda 4.10.3 (pre-installed on the image but not added to PATH) @@ -28,7 +29,7 @@ - pip 21.2.4 (python 3.7) - Pipx 0.16.4 - RubyGems 2.7.6.3 -- Vcpkg (build from master \<4428702>) +- Vcpkg (build from master \<3768cef>) - Yarn 1.22.11 #### Environment variables @@ -46,19 +47,19 @@ ### Tools - 7zip 19.00 - aria2 1.36.0 -- azcopy 10.12.1 +- azcopy 10.12.2 - Bazel 4.2.1 - Bazelisk 1.10.1 - Bicep 0.4.613 - Cabal 3.4.0.0 -- CMake 3.21.2 -- CodeQL Action Bundle 2.6.1 +- CMake 3.21.3 +- CodeQL Action Bundle 2.6.2 - Docker 20.10.7 - Docker-compose 1.29.2 - ghc 9.0.1 - Git 2.33.0 - Git LFS 2.13.3 -- Google Cloud SDK 357.0.0 +- Google Cloud SDK 358.0.0 - GVFS 1.0.21085.9 - InnoSetup 6.2.0 - jq 1.6 @@ -69,8 +70,8 @@ - Newman 5.3.0 - NSIS v3.06.1 - OpenSSL 1.1.1 -- Packer 1.7.4 -- Pulumi v3.12.0 +- Packer 1.7.5 +- Pulumi v3.13.0 - R 4.1.1 - Stack 2.7.3 - Subversion (SVN) 1.14.1 @@ -81,9 +82,9 @@ - zstd 1.5.0 ### CLI Tools -- Alibaba Cloud CLI 3.0.90 -- AWS CLI 2.2.39 -- AWS SAM CLI 1.31.0 +- Alibaba Cloud CLI 3.0.93 +- AWS CLI 2.2.41 +- AWS SAM CLI 1.32.0 - AWS Session Manager CLI 1.2.245.0 - Azure CLI 2.28.0 - Azure DevOps CLI extension 0.20.0 @@ -106,11 +107,11 @@ - Rustfmt 1.4.37 ### Browsers and webdrivers -- Google Chrome 93.0.4577.82 -- Chrome Driver 93.0.4577.63 -- Microsoft Edge 93.0.961.52 -- Microsoft Edge Driver 93.0.961.52 -- Mozilla Firefox 92.0 +- Google Chrome 94.0.4606.61 +- Chrome Driver 94.0.4606.61 +- Microsoft Edge 94.0.992.31 +- Microsoft Edge Driver 94.0.992.31 +- Mozilla Firefox 92.0.1 - Gecko Driver 0.30.0 - IE Driver 3.150.1.1 @@ -127,6 +128,7 @@ | 8.0.302+8 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | | 11.0.12+7 | Eclipse Temurin | JAVA_HOME_11_X64 | | 13.0.2+8.1 | Adopt OpenJDK | JAVA_HOME_13_X64 | +| 17.0.0+35 | Eclipse Temurin | JAVA_HOME_17_X64 | ### Shells | Name | Target | @@ -208,7 +210,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### MongoDB | Version | ServiceName | ServiceStatus | ServiceStartType | | ------- | ----------- | ------------- | ---------------- | -| 5.0.2.0 | MongoDB | Running | Automatic | +| 5.0.3.0 | MongoDB | Running | Automatic | @@ -536,7 +538,7 @@ All other versions are saved but not installed. | ------------------ | ---------------- | | DockerMsftProvider | 1.0.0.8 | | MarkdownPS | 1.9 | -| Pester | 3.4.0
5.3.0 | +| Pester | 3.4.0
5.3.1 | | PowerShellGet | 1.0.0.1
2.2.5 | | PSScriptAnalyzer | 1.20.0 | | PSWindowsUpdate | 2.2.0.2 | @@ -556,7 +558,7 @@ All other versions are saved but not installed. | Google APIs | addon-google_apis-google-21
addon-google_apis-google-22
addon-google_apis-google-23
addon-google_apis-google-24 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 21.4.7075529
22.1.7171670 | +| NDK | 21.4.7075529 (default)
22.1.7171670
23.0.7599858 | | SDK Patch Applier v4 | 1 | #### Environment variables @@ -564,7 +566,7 @@ All other versions are saved but not installed. | ----------------------- | ---------------------------------------------------------------------------- | | ANDROID_HOME | C:\Android\android-sdk | | ANDROID_NDK_HOME | C:\Android\android-sdk\ndk-bundle -> C:\Android\android-sdk\ndk\21.4.7075529 | -| ANDROID_NDK_LATEST_HOME | C:\Android\android-sdk\ndk\22.1.7171670 | +| ANDROID_NDK_LATEST_HOME | C:\Android\android-sdk\ndk\23.0.7599858 | | ANDROID_NDK_PATH | C:\Android\android-sdk\ndk-bundle -> C:\Android\android-sdk\ndk\21.4.7075529 | | ANDROID_NDK_ROOT | C:\Android\android-sdk\ndk-bundle -> C:\Android\android-sdk\ndk\21.4.7075529 | | ANDROID_SDK_ROOT | C:\Android\android-sdk | From a908240ead0632d98143582e0cdea014ee28629f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 30 Sep 2021 14:31:07 +0000 Subject: [PATCH 0588/3485] Updating readme file for win19 version 20210928.2 (#4177) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/win/Windows2019-Readme.md | 46 +++++++++++++++++--------------- 1 file changed, 24 insertions(+), 22 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index 8bf62e5075cf..91f5c335af6f 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 2183 -- Image Version: 20210920.1 +- Image Version: 20210928.2 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -13,8 +13,9 @@ ### Language and Runtime - Bash 4.4.23(1)-release - Go 1.15.15 -- Julia 1.6.2 +- Julia 1.6.3 - Kotlin 1.5.31 +- LLVM 12.0.1 - Node 14.17.6 - Perl 5.32.1 - PHP 8.0.10 @@ -22,7 +23,7 @@ - Ruby 2.5.9p229 ### Package Management -- Chocolatey 0.11.1 +- Chocolatey 0.11.2 - Composer 2.1.8 - Helm 3.6.3 - Miniconda 4.10.3 (pre-installed on the image but not added to PATH) @@ -31,7 +32,7 @@ - pip 21.2.4 (python 3.7) - Pipx 0.16.4 - RubyGems 2.7.6.3 -- Vcpkg (build from master \<4428702>) +- Vcpkg (build from master \<042e1db>) - Yarn 1.22.11 #### Environment variables @@ -49,19 +50,19 @@ ### Tools - 7zip 19.00 - aria2 1.36.0 -- azcopy 10.12.1 +- azcopy 10.12.2 - Bazel 4.2.1 - Bazelisk 1.10.1 - Bicep 0.4.613 - Cabal 3.4.0.0 -- CMake 3.21.2 -- CodeQL Action Bundle 2.6.1 +- CMake 3.21.3 +- CodeQL Action Bundle 2.6.2 - Docker 20.10.7 - Docker-compose 1.29.2 - ghc 9.0.1 - Git 2.33.0 - Git LFS 2.13.3 -- Google Cloud SDK 357.0.0 +- Google Cloud SDK 359.0.0 - GVFS 1.0.21085.9 - InnoSetup 6.2.0 - jq 1.6 @@ -72,8 +73,8 @@ - Newman 5.3.0 - NSIS v3.06.1 - OpenSSL 1.1.1 -- Packer 1.7.4 -- Pulumi v3.12.0 +- Packer 1.7.5 +- Pulumi v3.13.2 - R 4.1.1 - Stack 2.7.3 - Subversion (SVN) 1.14.1 @@ -84,9 +85,9 @@ - zstd 1.5.0 ### CLI Tools -- Alibaba Cloud CLI 3.0.90 -- AWS CLI 2.2.39 -- AWS SAM CLI 1.31.0 +- Alibaba Cloud CLI 3.0.93 +- AWS CLI 2.2.41 +- AWS SAM CLI 1.32.0 - AWS Session Manager CLI 1.2.245.0 - Azure CLI 2.28.0 - Azure DevOps CLI extension 0.20.0 @@ -109,11 +110,11 @@ - Rustfmt 1.4.37 ### Browsers and webdrivers -- Google Chrome 93.0.4577.82 -- Chrome Driver 93.0.4577.63 -- Microsoft Edge 93.0.961.52 -- Microsoft Edge Driver 93.0.961.52 -- Mozilla Firefox 92.0 +- Google Chrome 94.0.4606.61 +- Chrome Driver 94.0.4606.61 +- Microsoft Edge 94.0.992.31 +- Microsoft Edge Driver 94.0.992.31 +- Mozilla Firefox 92.0.1 - Gecko Driver 0.30.0 - IE Driver 3.150.1.1 @@ -130,6 +131,7 @@ | 8.0.302+8 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | | 11.0.12+7 | Eclipse Temurin | JAVA_HOME_11_X64 | | 13.0.2+8.1 | Adopt OpenJDK | JAVA_HOME_13_X64 | +| 17.0.0+35 | Eclipse Temurin | JAVA_HOME_17_X64 | ### Shells | Name | Target | @@ -214,7 +216,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### MongoDB | Version | ServiceName | ServiceStatus | ServiceStartType | | ------- | ----------- | ------------- | ---------------- | -| 5.0.2.0 | MongoDB | Running | Automatic | +| 5.0.3.0 | MongoDB | Running | Automatic | @@ -530,7 +532,7 @@ All other versions are saved but not installed. | ------------------ | ---------------- | | DockerMsftProvider | 1.0.0.8 | | MarkdownPS | 1.9 | -| Pester | 3.4.0
5.3.0 | +| Pester | 3.4.0
5.3.1 | | PowerShellGet | 1.0.0.1
2.2.5 | | PSScriptAnalyzer | 1.20.0 | | PSWindowsUpdate | 2.2.0.2 | @@ -550,7 +552,7 @@ All other versions are saved but not installed. | Google APIs | addon-google_apis-google-21
addon-google_apis-google-22
addon-google_apis-google-23
addon-google_apis-google-24 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 21.4.7075529
22.1.7171670 | +| NDK | 21.4.7075529 (default)
22.1.7171670
23.0.7599858 | | SDK Patch Applier v4 | 1 | #### Environment variables @@ -558,7 +560,7 @@ All other versions are saved but not installed. | ----------------------- | ---------------------------------------------------------------------------- | | ANDROID_HOME | C:\Android\android-sdk | | ANDROID_NDK_HOME | C:\Android\android-sdk\ndk-bundle -> C:\Android\android-sdk\ndk\21.4.7075529 | -| ANDROID_NDK_LATEST_HOME | C:\Android\android-sdk\ndk\22.1.7171670 | +| ANDROID_NDK_LATEST_HOME | C:\Android\android-sdk\ndk\23.0.7599858 | | ANDROID_NDK_PATH | C:\Android\android-sdk\ndk-bundle -> C:\Android\android-sdk\ndk\21.4.7075529 | | ANDROID_NDK_ROOT | C:\Android\android-sdk\ndk-bundle -> C:\Android\android-sdk\ndk\21.4.7075529 | | ANDROID_SDK_ROOT | C:\Android\android-sdk | From 6f39c8aef0f9abf656fabe4ce459f07283d228ca Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Thu, 30 Sep 2021 20:15:27 +0300 Subject: [PATCH 0589/3485] [macOS] Software Updates 2021 Week 40 (#4194) --- images/macos/toolsets/toolset-11.json | 13 ++++++++++--- images/macos/toolsets/toolset-12.json | 10 +++++----- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index 8eeff5ad16e3..4a31b8d0d41e 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -16,16 +16,23 @@ "6.12.0.125" ], "ios-versions": [ - "14.20.0.24", "14.16.0.5", "14.14.2.5", "14.10.0.4", "14.8.0.3", "14.6.0.15", "14.4.1.3", "14.2.0.12", "14.0.0.0", "13.20.2.2" + "15.0.0.6","14.20.0.24", "14.16.0.5", "14.14.2.5", "14.10.0.4", "14.8.0.3", "14.6.0.15", "14.4.1.3", "14.2.0.12", "14.0.0.0", "13.20.2.2" ], "mac-versions": [ - "7.14.0.24", "7.10.0.5", "7.8.2.5", "7.4.0.10", "7.2.0.3", "7.0.0.15", "6.22.1.26", "6.20.2.2" + "7.14.0.27", "7.10.0.5", "7.8.2.5", "7.4.0.10", "7.2.0.3", "7.0.0.15", "6.22.1.26", "6.20.2.2" ], "android-versions": [ "11.3.0.4", "11.2.2.1", "11.1.0.26", "11.0.2.0" ], - "bundle-default": "6_12_9", + "bundle-default": "6_12_10", "bundles": [ + { + "symlink": "6_12_10", + "mono":"6.12", + "ios": "15.0", + "mac": "7.14", + "android": "11.3" + }, { "symlink": "6_12_9", "mono":"6.12", diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index 981bcf49df37..e34a3a2897cb 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -11,20 +11,20 @@ "6.12.0.125" ], "ios-versions": [ - "14.20.0.24" + "15.0.0.6" ], "mac-versions": [ - "7.14.0.24" + "7.14.0.27" ], "android-versions": [ "11.3.0.4" ], - "bundle-default": "6_12_9", + "bundle-default": "6_12_10", "bundles": [ { - "symlink": "6_12_9", + "symlink": "6_12_10", "mono":"6.12", - "ios": "14.20", + "ios": "15.0", "mac": "7.14", "android": "11.3" } From 9c5cf733d90eddf3aa5c858807cad50fe45cf1c6 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Thu, 30 Sep 2021 20:17:00 +0300 Subject: [PATCH 0590/3485] packer: add pause after windows update (#4192) --- images/win/windows2019.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/images/win/windows2019.json b/images/win/windows2019.json index fe47fea33de2..7c16c7c7b526 100644 --- a/images/win/windows2019.json +++ b/images/win/windows2019.json @@ -144,11 +144,12 @@ { "type": "windows-restart", "check_registry": true, - "restart_check_command": "powershell -command \"& {if (-not (Get-Process TiWorker.exe -ErrorAction SilentlyContinue)) { Write-Output 'Restart complete' }}\"", + "restart_check_command": "powershell -command \"& {if ((-not (Get-Process TiWorker.exe -ErrorAction SilentlyContinue)) -and (-not [System.Environment]::HasShutdownStarted) ) { Write-Output 'Restart complete' }}\"", "restart_timeout": "30m" }, { "type": "powershell", + "pause_before": "2m", "scripts": [ "{{ template_dir }}/scripts/Installers/Install-VCRedist.ps1", "{{ template_dir }}/scripts/Installers/Install-Docker.ps1", From b665bad57bcd15dfcdb4d951e164a0f9cc67e36f Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Fri, 1 Oct 2021 12:33:34 +0300 Subject: [PATCH 0591/3485] Install compose v1 and v2 alongside (#4203) --- .../scripts/SoftwareReport/SoftwareReport.Generator.ps1 | 3 ++- .../scripts/SoftwareReport/SoftwareReport.Tools.psm1 | 9 +++++++-- images/linux/scripts/installers/docker-compose.sh | 2 +- images/linux/scripts/installers/docker-moby.sh | 1 + images/linux/scripts/tests/Tools.Tests.ps1 | 6 +++++- 5 files changed, 16 insertions(+), 5 deletions(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index ece0b6f9e55d..912c7f74e71d 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -109,7 +109,8 @@ $toolsList = @( (Get-CMakeVersion), (Get-DockerMobyClientVersion), (Get-DockerMobyServerVersion), - (Get-DockerComposeVersion), + (Get-DockerComposeV1Version), + (Get-DockerComposeV2Version), (Get-DockerBuildxVersion), (Get-GitVersion), (Get-GitLFSVersion), diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 index 4c641c23bcbe..a189d38b4c1f 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 @@ -63,9 +63,14 @@ function Get-CMakeVersion { return "CMake $cmakeVersion" } -function Get-DockerComposeVersion { +function Get-DockerComposeV1Version { $composeVersion = docker-compose -v | Take-OutputPart -Part 2 | Take-OutputPart -Part 0 -Delimiter "," - return "Docker Compose $composeVersion" + return "Docker Compose v1 $composeVersion" +} + +function Get-DockerComposeV2Version { + $composeVersion = docker compose version | Take-OutputPart -Part 3 + return "Docker Compose v2 $composeVersion" } function Get-DockerMobyClientVersion { diff --git a/images/linux/scripts/installers/docker-compose.sh b/images/linux/scripts/installers/docker-compose.sh index d6c8e3466ac2..40db139caa03 100644 --- a/images/linux/scripts/installers/docker-compose.sh +++ b/images/linux/scripts/installers/docker-compose.sh @@ -9,4 +9,4 @@ URL="https://github.com/docker/compose/releases/download/1.29.2/docker-compose-L curl -L $URL -o /usr/local/bin/docker-compose chmod +x /usr/local/bin/docker-compose -invoke_tests "Tools" "Docker-compose" +invoke_tests "Tools" "Docker-compose v1" diff --git a/images/linux/scripts/installers/docker-moby.sh b/images/linux/scripts/installers/docker-moby.sh index bb900eb290c4..57617774fab1 100644 --- a/images/linux/scripts/installers/docker-moby.sh +++ b/images/linux/scripts/installers/docker-moby.sh @@ -16,6 +16,7 @@ if ! IsPackageInstalled $docker_package; then apt-get update apt-get install -y moby-engine moby-cli apt-get install --no-install-recommends -y moby-buildx + apt-get install -y moby-compose else echo "Docker ($docker_package) is already installed" fi diff --git a/images/linux/scripts/tests/Tools.Tests.ps1 b/images/linux/scripts/tests/Tools.Tests.ps1 index fb0e81657832..216536eedede 100644 --- a/images/linux/scripts/tests/Tools.Tests.ps1 +++ b/images/linux/scripts/tests/Tools.Tests.ps1 @@ -66,6 +66,10 @@ Describe "Docker" { "docker buildx" | Should -ReturnZeroExitCode } + It "docker compose v2" { + "docker compose" | Should -ReturnZeroExitCode + } + Context "docker images" { $testCases = (Get-ToolsetContent).docker.images | ForEach-Object { @{ ImageName = $_ } } @@ -75,7 +79,7 @@ Describe "Docker" { } } -Describe "Docker-compose" { +Describe "Docker-compose v1" { It "docker-compose" { "docker-compose --version"| Should -ReturnZeroExitCode } From 011b3bd05d68357225277b7c82933a59707124ee Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 1 Oct 2021 13:38:43 +0000 Subject: [PATCH 0592/3485] Updating readme file for macOS-10.15 version 20210927.1 (#4161) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/macos/macos-10.15-Readme.md | 68 +++++++++++++++--------------- 1 file changed, 35 insertions(+), 33 deletions(-) diff --git a/images/macos/macos-10.15-Readme.md b/images/macos/macos-10.15-Readme.md index 58f24281c054..254805e4a7a7 100644 --- a/images/macos/macos-10.15-Readme.md +++ b/images/macos/macos-10.15-Readme.md @@ -5,7 +5,7 @@ # macOS 10.15 info - System Version: macOS 10.15.7 (19H1417) - Kernel Version: Darwin 19.6.0 -- Image Version: 20210919.1 +- Image Version: 20210927.1 ## Installed Software ### Language and Runtime @@ -20,33 +20,33 @@ - GNU Fortran (Homebrew GCC 10.3.0) 10.3.0 - available by `gfortran-10` alias - GNU Fortran (Homebrew GCC 11.2.0) 11.2.0 - available by `gfortran-11` alias - Go 1.15.15 -- julia 1.6.2 -- Kotlin 1.5.30-release-407 +- julia 1.6.3 +- Kotlin 1.5.31-release-548 - MSBuild 16.6.0.15801 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) - Node.js v14.17.6 - NVM 0.38.0 - NVM - Cached node versions: v10.24.1 v12.22.6 v14.17.6 - Perl 5.34.0 -- PHP 8.0.10 +- PHP 8.0.11 - Python 2.7.18 - Python 3.9.7 - R 4.1.1 - Ruby 2.7.4p191 ### Package Management -- Bundler version 2.2.27 +- Bundler version 2.2.28 - Carthage 0.38.0 - CocoaPods 1.11.2 - Composer 2.1.8 -- Homebrew 3.2.12 +- Homebrew 3.2.13 - Miniconda 4.10.3 - NPM 6.14.15 - NuGet 5.6.0.6489 - Pip 20.3.4 (python 2.7) - Pip 21.2.4 (python 3.9) - Pipx 0.16.4 -- RubyGems 3.2.27 -- Vcpkg 2021 (build from master \<4428702>) +- RubyGems 3.2.28 +- Vcpkg 2021 (build from master \<3768cef>) - Yarn 1.22.5 #### Environment variables @@ -59,19 +59,20 @@ - Apache Ant(TM) 1.10.11 - Apache Maven 3.8.2 - Gradle 7.2 +- Sbt 1.5.5 ### Utilities - 7-Zip 17.04 - aria2 1.36.0 -- azcopy 10.12.1 +- azcopy 10.12.2 - bazel 4.2.1 - bazelisk 1.10.1 - bsdtar 3.3.2 - available by 'tar' alias -- Curl 7.79.0 +- Curl 7.79.1 - Git LFS: 2.13.3 - Git: 2.33.0 - GitHub CLI: 2.0.0 -- GNU parallel 20210822 +- GNU parallel 20210922 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.2 - gpg (GnuPG) 2.3.2 @@ -81,7 +82,7 @@ - mongo v5.0.2 - mongod v5.0.2 - Newman 5.3.0 -- OpenSSL 1.1.1l 24 Aug 2021 `(/usr/local/opt/openssl -> /usr/local/Cellar/openssl@1.1/1.1.1l)` +- OpenSSL 1.1.1l 24 Aug 2021 `(/usr/local/opt/openssl@1.1 -> /usr/local/Cellar/openssl@1.1/1.1.1l)` - Packer 1.7.5 - PostgreSQL 13.4 - psql (PostgreSQL) 13.4 @@ -94,18 +95,18 @@ ### Tools -- Aliyun CLI 3.0.90 -- App Center CLI 2.10.0 -- AWS CLI 2.2.39 -- AWS SAM CLI 1.31.0 +- Aliyun CLI 3.0.93 +- App Center CLI 2.10.1 +- AWS CLI 2.2.41 +- AWS SAM CLI 1.32.0 - AWS Session Manager CLI 1.2.245.0 - Azure CLI 2.28.0 - Bicep CLI 0.4.613 -- Cabal 3.4.0.0 -- Cmake 3.21.2 -- Fastlane 2.194.0 +- Cabal 3.6.1.0 +- Cmake 3.21.3 +- Fastlane 2.195.0 - GHC 9.0.1 -- GHCup v0.1.16.2 +- GHCup 0.1.17.1 - Stack 2.7.3 - SwiftFormat 0.48.11 - Swig 4.0.2 @@ -118,12 +119,12 @@ ### Browsers - Safari 14.1.2 (15611.3.10.1.7) - SafariDriver 14.1.2 (15611.3.10.1.7) -- Google Chrome 93.0.4577.82 +- Google Chrome 94.0.4606.61 - ChromeDriver 93.0.4577.63 -- Microsoft Edge 93.0.961.52 -- MSEdgeDriver 93.0.961.52 -- Mozilla Firefox 92.0 -- geckodriver 0.29.1 +- Microsoft Edge 94.0.992.31 +- MSEdgeDriver 94.0.992.31 +- Mozilla Firefox 92.0.1 +- geckodriver 0.30.0 #### Environment variables | Name | Value | @@ -133,13 +134,14 @@ | GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | ### Java -| Version | Vendor | Environment Variable | -| ------------------- | ------------- | -------------------- | -| 8.0.302+8 (default) | Adopt OpenJDK | JAVA_HOME_8_X64 | -| 11.0.12+7 | Adopt OpenJDK | JAVA_HOME_11_X64 | -| 12.0.2+10.3 | Adopt OpenJDK | JAVA_HOME_12_X64 | -| 13.0.2+8.1 | Adopt OpenJDK | JAVA_HOME_13_X64 | -| 14.0.2+12 | Adopt OpenJDK | JAVA_HOME_14_X64 | +| Version | Vendor | Environment Variable | +| ------------------- | --------------- | -------------------- | +| 8.0.302+8 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | +| 11.0.12+7 | Eclipse Temurin | JAVA_HOME_11_X64 | +| 12.0.2+10.3 | Adopt OpenJDK | JAVA_HOME_12_X64 | +| 13.0.2+8.1 | Adopt OpenJDK | JAVA_HOME_13_X64 | +| 14.0.2+12 | Adopt OpenJDK | JAVA_HOME_14_X64 | +| 17.0.0+35 | Eclipse Temurin | JAVA_HOME_17_X64 | ### Cached Tools #### Ruby @@ -196,7 +198,7 @@ | ---------------- | ------- | | Az | 6.1.0 | | MarkdownPS | 1.9 | -| Pester | 5.3.0 | +| Pester | 5.3.1 | | PSScriptAnalyzer | 1.20.0 | ### Web Servers From cf63ebf55da1e959d85b3c132fc6d98367f4eb8b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 1 Oct 2021 14:34:36 +0000 Subject: [PATCH 0593/3485] Updating readme file for macOS-11 version 20210927.2 (#4159) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/macos/macos-11-Readme.md | 62 +++++++++++++++++---------------- 1 file changed, 32 insertions(+), 30 deletions(-) diff --git a/images/macos/macos-11-Readme.md b/images/macos/macos-11-Readme.md index 7815465bf3e8..df6cd542ec4e 100644 --- a/images/macos/macos-11-Readme.md +++ b/images/macos/macos-11-Readme.md @@ -5,7 +5,7 @@ # macOS 11.6 info - System Version: macOS 11.6 (20G165) - Kernel Version: Darwin 20.6.0 -- Image Version: 20210917.1 +- Image Version: 20210927.2 ## Installed Software ### Language and Runtime @@ -20,32 +20,32 @@ - GNU Fortran (Homebrew GCC 10.3.0) 10.3.0 - available by `gfortran-10` alias - GNU Fortran (Homebrew GCC 11.2.0) 11.2.0 - available by `gfortran-11` alias - Go 1.15.15 -- julia 1.6.2 -- Kotlin 1.5.30-release-407 +- julia 1.6.3 +- Kotlin 1.5.31-release-548 - MSBuild 16.6.0.15801 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) - Node.js v14.17.6 - NVM 0.38.0 - NVM - Cached node versions: v10.24.1 v12.22.6 v14.17.6 - Perl 5.34.0 -- PHP 8.0.10 +- PHP 8.0.11 - Python 2.7.18 - Python 3.9.7 - Ruby 2.7.4p191 ### Package Management -- Bundler version 2.2.27 +- Bundler version 2.2.28 - Carthage 0.38.0 - CocoaPods 1.11.2 - Composer 2.1.8 -- Homebrew 3.2.12 +- Homebrew 3.2.13 - Miniconda 4.10.3 - NPM 6.14.15 - NuGet 5.6.0.6489 - Pip 20.3.4 (python 2.7) - Pip 21.2.4 (python 3.9) - Pipx 0.16.4 -- RubyGems 3.2.27 -- Vcpkg 2021 (build from master \<4428702>) +- RubyGems 3.2.28 +- Vcpkg 2021 (build from master \<3768cef>) - Yarn 1.22.5 #### Environment variables @@ -58,15 +58,16 @@ - Apache Ant(TM) 1.10.11 - Apache Maven 3.8.2 - Gradle 7.2 +- Sbt 1.5.5 ### Utilities - 7-Zip 17.04 - aria2 1.36.0 -- azcopy 10.12.1 +- azcopy 10.12.2 - bazel 4.2.1 - bazelisk 1.10.1 - bsdtar 3.3.2 - available by 'tar' alias -- Curl 7.79.0 +- Curl 7.79.1 - Git LFS: 2.13.3 - Git: 2.33.0 - GitHub CLI: 2.0.0 @@ -79,7 +80,7 @@ - mongo v5.0.2 - mongod v5.0.2 - Newman 5.3.0 -- OpenSSL 1.1.1l 24 Aug 2021 `(/usr/local/opt/openssl -> /usr/local/Cellar/openssl@1.1/1.1.1l)` +- OpenSSL 1.1.1l 24 Aug 2021 `(/usr/local/opt/openssl@1.1 -> /usr/local/Cellar/openssl@1.1/1.1.1l)` - Packer 1.7.5 - PostgreSQL 13.4 - psql (PostgreSQL) 13.4 @@ -90,22 +91,22 @@ ### Tools -- Aliyun CLI 3.0.90 -- App Center CLI 2.10.0 -- AWS CLI 2.2.39 -- AWS SAM CLI 1.31.0 +- Aliyun CLI 3.0.93 +- App Center CLI 2.10.1 +- AWS CLI 2.2.41 +- AWS SAM CLI 1.32.0 - AWS Session Manager CLI 1.2.245.0 - Azure CLI 2.28.0 - Bicep CLI 0.4.613 -- Cabal 3.4.0.0 -- Cmake 3.21.2 -- Fastlane 2.194.0 +- Cabal 3.6.1.0 +- Cmake 3.21.3 +- Fastlane 2.195.0 - GHC 9.0.1 -- GHCup v0.1.16.2 +- GHCup 0.1.17.1 - Stack 2.7.3 - SwiftFormat 0.48.11 - Swig 4.0.2 -- Xcode Command Line Tools 12.5.0.0.1.1617976050 +- Xcode Command Line Tools 13.0.0.0.1.1630607135 ### Linters - SwiftLint 0.44.0 @@ -114,12 +115,12 @@ ### Browsers - Safari 14.1.2 (16611.3.10.1.6) - SafariDriver 14.1.2 (16611.3.10.1.6) -- Google Chrome 93.0.4577.82 +- Google Chrome 94.0.4606.61 - ChromeDriver 93.0.4577.63 -- Microsoft Edge 93.0.961.52 -- MSEdgeDriver 93.0.961.52 -- Mozilla Firefox 92.0 -- geckodriver 0.29.1 +- Microsoft Edge 94.0.992.31 +- MSEdgeDriver 94.0.992.31 +- Mozilla Firefox 92.0.1 +- geckodriver 0.30.0 #### Environment variables | Name | Value | @@ -129,10 +130,11 @@ | GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | ### Java -| Version | Vendor | Environment Variable | -| ------------------- | ------------- | -------------------- | -| 8.0.302+8 (default) | Adopt OpenJDK | JAVA_HOME_8_X64 | -| 11.0.12+7 | Adopt OpenJDK | JAVA_HOME_11_X64 | +| Version | Vendor | Environment Variable | +| ------------------- | --------------- | -------------------- | +| 8.0.302+8 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | +| 11.0.12+7 | Eclipse Temurin | JAVA_HOME_11_X64 | +| 17.0.0+35 | Eclipse Temurin | JAVA_HOME_17_X64 | ### Cached Tools #### Ruby @@ -183,7 +185,7 @@ | ---------------- | ------- | | Az | 6.1.0 | | MarkdownPS | 1.9 | -| Pester | 5.3.0 | +| Pester | 5.3.1 | | PSScriptAnalyzer | 1.20.0 | ### Web Servers From 4119a5acc83571fffef448ba0edd385aa5c34a13 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Sat, 2 Oct 2021 13:08:07 +0300 Subject: [PATCH 0594/3485] [MacOS] Restore openssl-1.1.x symlink (#4206) --- 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 c7d66405ceac..c956fb2dc074 100755 --- a/images/macos/provision/core/openssl.sh +++ b/images/macos/provision/core/openssl.sh @@ -7,4 +7,7 @@ brew_smart_install "openssl@1.1" # Symlink brew openssl@1.1 to `/usr/local/bin` as Homebrew refuses ln -sf $(brew --prefix openssl@1.1)/bin/openssl /usr/local/bin/openssl +# Most of buildsystems and scripts look up ssl here +ln -sf $(brew --cellar openssl@1.1)/1.1* /usr/local/opt/openssl + invoke_tests "OpenSSL" From c161416ac88327a4362f4fb8b3413fea4fe9289b Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Mon, 4 Oct 2021 10:19:24 +0300 Subject: [PATCH 0595/3485] Revert "[Ubuntu] java: do not use the github tag release (#4182)" (#4213) This reverts commit 1d9156313991640f6c5232a258ffbcf84b69978c. --- images/linux/scripts/installers/java-tools.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/images/linux/scripts/installers/java-tools.sh b/images/linux/scripts/installers/java-tools.sh index fbc5f6b13077..8067ef348553 100644 --- a/images/linux/scripts/installers/java-tools.sh +++ b/images/linux/scripts/installers/java-tools.sh @@ -63,10 +63,12 @@ apt-fast install -y --no-install-recommends ant ant-optional echo "ANT_HOME=/usr/share/ant" | tee -a /etc/environment # Install Maven -mavenDownloadUrl=$(curl -sL https://maven.apache.org/download.cgi | grep -oP 'https://[^/"].+/binaries/apache-maven-.+-bin.zip(?=")') +json=$(curl -s "https://api.github.com/repos/apache/maven/tags") +latestMavenVersion=$(echo $json | jq -r '.[] | select(.name | match("^(maven-[0-9.]*)$")) | .name' | head -1 | cut -d- -f2) +mavenDownloadUrl="https://www-eu.apache.org/dist/maven/maven-3/${latestMavenVersion}/binaries/apache-maven-${latestMavenVersion}-bin.zip" download_with_retries $mavenDownloadUrl "/tmp" "maven.zip" unzip -qq -d /usr/share /tmp/maven.zip -ln -s /usr/share/apache-maven-*/bin/mvn /usr/bin/mvn +ln -s /usr/share/apache-maven-${latestMavenVersion}/bin/mvn /usr/bin/mvn # Install Gradle # This script founds the latest gradle release from https://services.gradle.org/versions/all From fdcef883c3987605fa28d7885a2f64b14841882f Mon Sep 17 00:00:00 2001 From: josetr <37419832+josetr@users.noreply.github.com> Date: Tue, 5 Oct 2021 08:29:39 +0100 Subject: [PATCH 0596/3485] Initialize Visual Studio Experimental Instance on the correct user (#4223) --- images/win/post-generation/VSConfiguration.ps1 | 4 ++++ images/win/scripts/Installers/Install-VS.ps1 | 6 ------ 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/images/win/post-generation/VSConfiguration.ps1 b/images/win/post-generation/VSConfiguration.ps1 index 47754b4e5a71..109c69d9fd2e 100644 --- a/images/win/post-generation/VSConfiguration.ps1 +++ b/images/win/post-generation/VSConfiguration.ps1 @@ -1,4 +1,8 @@ $vsInstallRoot = (Get-VisualStudioInstance).InstallationPath $devEnvPath = "$vsInstallRoot\Common7\IDE\devenv.exe" +# Initialize Visual Studio Experimental Instance +# The Out-Null cmdlet is required to ensure PowerShell waits until the '/ResetSettings' command fully completes. +& "$devEnvPath" /RootSuffix Exp /ResetSettings General.vssettings /Command File.Exit | Out-Null + cmd.exe /c "`"$devEnvPath`" /updateconfiguration" \ No newline at end of file diff --git a/images/win/scripts/Installers/Install-VS.ps1 b/images/win/scripts/Installers/Install-VS.ps1 index bc282b6ce965..deefb20194e4 100644 --- a/images/win/scripts/Installers/Install-VS.ps1 +++ b/images/win/scripts/Installers/Install-VS.ps1 @@ -31,12 +31,6 @@ if ($instanceFolders -is [array]) exit 1 } -$vsInstallRoot = (Get-VisualStudioInstance).InstallationPath - -# Initialize Visual Studio Experimental Instance -# The Out-Null cmdlet is required to ensure PowerShell waits until the '/ResetSettings' command fully completes. -& "$vsInstallRoot\Common7\IDE\devenv.exe" /RootSuffix Exp /ResetSettings General.vssettings /Command File.Exit | Out-Null - # Updating content of MachineState.json file to disable autoupdate of VSIX extensions $newContent = '{"Extensions":[{"Key":"1e906ff5-9da8-4091-a299-5c253c55fdc9","Value":{"ShouldAutoUpdate":false}},{"Key":"Microsoft.VisualStudio.Web.AzureFunctions","Value":{"ShouldAutoUpdate":false}}],"ShouldAutoUpdate":false,"ShouldCheckForUpdates":false}' Set-Content -Path "$vsInstallRoot\Common7\IDE\Extensions\MachineState.json" -Value $newContent From 1400689a45c1cdd5e1e9dbbbd03528188cf2108d Mon Sep 17 00:00:00 2001 From: CrazyMax Date: Tue, 5 Oct 2021 16:07:46 +0200 Subject: [PATCH 0597/3485] [Ubuntu] docker: add buildkit image (#4227) Co-authored-by: CrazyMax --- images/linux/toolsets/toolset-1804.json | 1 + images/linux/toolsets/toolset-2004.json | 1 + 2 files changed, 2 insertions(+) diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index 936c49d42bc4..d5f3f5e674cb 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -213,6 +213,7 @@ "debian:9", "debian:10", "debian:11", + "moby/buildkit:latest", "node:10", "node:12", "node:14", diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index f12648040229..85b8f272ae2f 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -211,6 +211,7 @@ "debian:9", "debian:10", "debian:11", + "moby/buildkit:latest", "node:10", "node:12", "node:14", From 3264ac55cf40dbccfc47827769ec1c5accbed44d Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Wed, 6 Oct 2021 13:44:09 +0300 Subject: [PATCH 0598/3485] vs: revert $vsInstallRoot (#4234) --- images/win/scripts/Installers/Install-VS.ps1 | 1 + 1 file changed, 1 insertion(+) diff --git a/images/win/scripts/Installers/Install-VS.ps1 b/images/win/scripts/Installers/Install-VS.ps1 index deefb20194e4..2017dbb81458 100644 --- a/images/win/scripts/Installers/Install-VS.ps1 +++ b/images/win/scripts/Installers/Install-VS.ps1 @@ -32,6 +32,7 @@ if ($instanceFolders -is [array]) } # Updating content of MachineState.json file to disable autoupdate of VSIX extensions +$vsInstallRoot = (Get-VisualStudioInstance).InstallationPath $newContent = '{"Extensions":[{"Key":"1e906ff5-9da8-4091-a299-5c253c55fdc9","Value":{"ShouldAutoUpdate":false}},{"Key":"Microsoft.VisualStudio.Web.AzureFunctions","Value":{"ShouldAutoUpdate":false}}],"ShouldAutoUpdate":false,"ShouldCheckForUpdates":false}' Set-Content -Path "$vsInstallRoot\Common7\IDE\Extensions\MachineState.json" -Value $newContent From 9ff76f18b9ce6a12bf5e813d82ff4b4c911c9730 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Wed, 6 Oct 2021 18:47:15 +0300 Subject: [PATCH 0599/3485] [Windows] wdk: remove iso installer (#4232) --- images/win/scripts/Installers/Install-WDK.ps1 | 23 +++---------------- images/win/toolsets/toolset-2019.json | 1 + 2 files changed, 4 insertions(+), 20 deletions(-) diff --git a/images/win/scripts/Installers/Install-WDK.ps1 b/images/win/scripts/Installers/Install-WDK.ps1 index 052245b6d2b1..139f50c13c13 100644 --- a/images/win/scripts/Installers/Install-WDK.ps1 +++ b/images/win/scripts/Installers/Install-WDK.ps1 @@ -6,7 +6,7 @@ # Requires Windows SDK with the same version number as the WDK if (Test-IsWin19) { - $winSdkUrl = "https://go.microsoft.com/fwlink/?linkid=2166460" + $winSdkUrl = "https://go.microsoft.com/fwlink/?linkid=2173743" $wdkUrl = "https://go.microsoft.com/fwlink/?linkid=2166289" $FilePath = "C:\Program Files (x86)\Windows Kits\10\Vsix\VS2019\WDK.vsix" $VSver = "2019" @@ -25,25 +25,8 @@ else $argumentList = ("/features", "+", "/quiet") -if (Test-IsWin19) -{ - # Download WDK ISO file - $isoPath = Start-DownloadWithRetry -Url $winSdkUrl -Name winsdk.iso - $diskImage = Mount-DiskImage -ImagePath $isoPath - $driveLetter = ($diskImage | Get-Volume).DriveLetter - $sdkPath = Join-Path "${driveLetter}:\" "winsdksetup.exe" - - # `winsdksetup.exe /features + /quiet` installs all features without showing the GUI - Install-Binary -FilePath $sdkPath -ArgumentList $argumentList - - # Dismount ISO - Dismount-DiskImage -DevicePath $diskImage.DevicePath | Out-Null -} -else -{ - # `winsdksetup.exe /features + /quiet` installs all features without showing the GUI - Install-Binary -Url $winSdkUrl -Name "winsdksetup.exe" -ArgumentList $argumentList -} +# `winsdksetup.exe /features + /quiet` installs all features without showing the GUI +Install-Binary -Url $winSdkUrl -Name "winsdksetup.exe" -ArgumentList $argumentList # `wdksetup.exe /features + /quiet` installs all features without showing the GUI Install-Binary -Url $wdkUrl -Name "wdksetup.exe" -ArgumentList $argumentList diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index 4383cfc7ba06..dd245b149965 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -339,6 +339,7 @@ "Microsoft.VisualStudio.Component.Windows10SDK.18362", "Microsoft.VisualStudio.Component.Windows10SDK.19041", "Microsoft.VisualStudio.Component.Windows10SDK.20348", + "Microsoft.VisualStudio.Component.Windows11SDK.22000", "Microsoft.VisualStudio.Component.WinXP", "Microsoft.VisualStudio.Component.Workflow", "Microsoft.VisualStudio.ComponentGroup.Azure.CloudServices", From e3040198f1bf40bf7a31613703215d4d789402f1 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 6 Oct 2021 23:58:55 +0000 Subject: [PATCH 0600/3485] Updating readme file for macOS-11 version 20211001.1 (#4224) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/macos/macos-11-Readme.md | 71 +++++++++++++++++---------------- 1 file changed, 37 insertions(+), 34 deletions(-) diff --git a/images/macos/macos-11-Readme.md b/images/macos/macos-11-Readme.md index df6cd542ec4e..9d4ea4dcfc90 100644 --- a/images/macos/macos-11-Readme.md +++ b/images/macos/macos-11-Readme.md @@ -1,11 +1,13 @@ | Announcements | |-| +| [[macOS] Xcode 12.5 will be removed from Big Sur on October, 18](https://github.com/actions/virtual-environments/issues/4183) | +| [[macOS] Default Xcode on Big Sur image will be set to Xcode 13.0 on October, 18](https://github.com/actions/virtual-environments/issues/4180) | | [macOS-latest workflows will use macOS-11](https://github.com/actions/virtual-environments/issues/4060) | *** # macOS 11.6 info - System Version: macOS 11.6 (20G165) - Kernel Version: Darwin 20.6.0 -- Image Version: 20210927.2 +- Image Version: 20211001.1 ## Installed Software ### Language and Runtime @@ -25,7 +27,7 @@ - MSBuild 16.6.0.15801 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) - Node.js v14.17.6 - NVM 0.38.0 -- NVM - Cached node versions: v10.24.1 v12.22.6 v14.17.6 +- NVM - Cached node versions: v10.24.1 v12.22.6 v14.18.0 - Perl 5.34.0 - PHP 8.0.11 - Python 2.7.18 @@ -37,7 +39,7 @@ - Carthage 0.38.0 - CocoaPods 1.11.2 - Composer 2.1.8 -- Homebrew 3.2.13 +- Homebrew 3.2.14 - Miniconda 4.10.3 - NPM 6.14.15 - NuGet 5.6.0.6489 @@ -45,8 +47,8 @@ - Pip 21.2.4 (python 3.9) - Pipx 0.16.4 - RubyGems 3.2.28 -- Vcpkg 2021 (build from master \<3768cef>) -- Yarn 1.22.5 +- Vcpkg 2021 (build from master \<2a31089>) +- Yarn 1.22.15 #### Environment variables | Name | Value | @@ -68,7 +70,7 @@ - bazelisk 1.10.1 - bsdtar 3.3.2 - available by 'tar' alias - Curl 7.79.1 -- Git LFS: 2.13.3 +- Git LFS: 3.0.1 - Git: 2.33.0 - GitHub CLI: 2.0.0 - GNU Tar 1.34 - available by 'gtar' alias @@ -77,11 +79,11 @@ - helm v3.7.0+geeac838 - Hub CLI: 2.14.2 - jq 1.6 -- mongo v5.0.2 -- mongod v5.0.2 +- mongo v5.0.3 +- mongod v5.0.3 - Newman 5.3.0 - OpenSSL 1.1.1l 24 Aug 2021 `(/usr/local/opt/openssl@1.1 -> /usr/local/Cellar/openssl@1.1/1.1.1l)` -- Packer 1.7.5 +- Packer 1.7.6 - PostgreSQL 13.4 - psql (PostgreSQL) 13.4 - Sox 14.4.2 @@ -91,10 +93,10 @@ ### Tools -- Aliyun CLI 3.0.93 -- App Center CLI 2.10.1 -- AWS CLI 2.2.41 -- AWS SAM CLI 1.32.0 +- Aliyun CLI 3.0.94 +- App Center CLI 2.10.2 +- AWS CLI 2.2.43 +- AWS SAM CLI 1.33.0 - AWS Session Manager CLI 1.2.245.0 - Azure CLI 2.28.0 - Bicep CLI 0.4.613 @@ -102,7 +104,7 @@ - Cmake 3.21.3 - Fastlane 2.195.0 - GHC 9.0.1 -- GHCup 0.1.17.1 +- GHCup 0.1.17.2 - Stack 2.7.3 - SwiftFormat 0.48.11 - Swig 4.0.2 @@ -115,17 +117,17 @@ ### Browsers - Safari 14.1.2 (16611.3.10.1.6) - SafariDriver 14.1.2 (16611.3.10.1.6) -- Google Chrome 94.0.4606.61 -- ChromeDriver 93.0.4577.63 -- Microsoft Edge 94.0.992.31 -- MSEdgeDriver 94.0.992.31 +- Google Chrome 94.0.4606.71 +- ChromeDriver 94.0.4606.61 +- Microsoft Edge 94.0.992.37 +- MSEdgeDriver 94.0.992.38 - Mozilla Firefox 92.0.1 - geckodriver 0.30.0 #### Environment variables | Name | Value | | --------------- | --------------------------------------------- | -| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/93.0.4577.63 | +| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/94.0.4606.61 | | EDGEWEBDRIVER | /usr/local/share/edge_driver | | GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | @@ -156,7 +158,7 @@ #### Node.js - 10.24.1 - 12.22.6 -- 14.17.6 +- 14.18.0 #### Go - 1.15.15 @@ -196,21 +198,22 @@ ### Xamarin #### Visual Studio for Mac -- 8.10.9.3 +- 8.10.10.8 #### Xamarin bundles -| symlink | Xamarin.Mono | Xamarin.iOS | Xamarin.Mac | Xamarin.Android | -| ---------------- | ------------ | ----------- | ----------- | --------------- | -| 6_12_9 (default) | 6.12 | 14.20 | 7.14 | 11.3 | -| 6_12_8 | 6.12 | 14.16 | 7.10 | 11.2 | -| 6_12_7 | 6.12 | 14.14 | 7.8 | 11.2 | -| 6_12_6 | 6.12 | 14.10 | 7.4 | 11.1 | -| 6_12_5 | 6.12 | 14.8 | 7.2 | 11.1 | -| 6_12_4 | 6.12 | 14.6 | 7.0 | 11.1 | -| 6_12_3 | 6.12 | 14.4 | 6.22 | 11.1 | -| 6_12_2 | 6.12 | 14.2 | 6.20 | 11.0 | -| 6_12_1 | 6.12 | 14.0 | 6.20 | 11.0 | -| 6_12_0 | 6.12 | 13.20 | 6.20 | 11.0 | +| symlink | Xamarin.Mono | Xamarin.iOS | Xamarin.Mac | Xamarin.Android | +| ----------------- | ------------ | ----------- | ----------- | --------------- | +| 6_12_10 (default) | 6.12 | 15.0 | 7.14 | 11.3 | +| 6_12_9 | 6.12 | 14.20 | 7.14 | 11.3 | +| 6_12_8 | 6.12 | 14.16 | 7.10 | 11.2 | +| 6_12_7 | 6.12 | 14.14 | 7.8 | 11.2 | +| 6_12_6 | 6.12 | 14.10 | 7.4 | 11.1 | +| 6_12_5 | 6.12 | 14.8 | 7.2 | 11.1 | +| 6_12_4 | 6.12 | 14.6 | 7.0 | 11.1 | +| 6_12_3 | 6.12 | 14.4 | 6.22 | 11.1 | +| 6_12_2 | 6.12 | 14.2 | 6.20 | 11.0 | +| 6_12_1 | 6.12 | 14.0 | 6.20 | 11.0 | +| 6_12_0 | 6.12 | 13.20 | 6.20 | 11.0 | #### Unit Test Framework - NUnit 3.6.1 @@ -218,8 +221,8 @@ ### Xcode | Version | Build | Path | | ---------------- | -------- | --------------------------------- | -| 13.0 (beta) | 13A5212g | /Applications/Xcode_13.0_beta.app | | 13.0 | 13A233 | /Applications/Xcode_13.0.app | +| 13.0 (beta) | 13A5212g | /Applications/Xcode_13.0_beta.app | | 12.5.1 (default) | 12E507 | /Applications/Xcode_12.5.1.app | | 12.5 | 12E262 | /Applications/Xcode_12.5.app | | 12.4 | 12D4e | /Applications/Xcode_12.4.app | From 09f644cdcd285ee641c31e10f147e355462faa90 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 7 Oct 2021 00:02:21 +0000 Subject: [PATCH 0601/3485] Updating readme file for macOS-10.15 version 20211002.1 (#4212) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/macos/macos-10.15-Readme.md | 44 ++++++++++++++++-------------- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/images/macos/macos-10.15-Readme.md b/images/macos/macos-10.15-Readme.md index 254805e4a7a7..3429a50f2769 100644 --- a/images/macos/macos-10.15-Readme.md +++ b/images/macos/macos-10.15-Readme.md @@ -1,11 +1,13 @@ | Announcements | |-| +| [[macOS] Xcode 12.5 will be removed from Big Sur on October, 18](https://github.com/actions/virtual-environments/issues/4183) | +| [[macOS] Default Xcode on Big Sur image will be set to Xcode 13.0 on October, 18](https://github.com/actions/virtual-environments/issues/4180) | | [macOS-latest workflows will use macOS-11](https://github.com/actions/virtual-environments/issues/4060) | *** # macOS 10.15 info - System Version: macOS 10.15.7 (19H1417) - Kernel Version: Darwin 19.6.0 -- Image Version: 20210927.1 +- Image Version: 20211002.1 ## Installed Software ### Language and Runtime @@ -25,7 +27,7 @@ - MSBuild 16.6.0.15801 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) - Node.js v14.17.6 - NVM 0.38.0 -- NVM - Cached node versions: v10.24.1 v12.22.6 v14.17.6 +- NVM - Cached node versions: v10.24.1 v12.22.6 v14.18.0 - Perl 5.34.0 - PHP 8.0.11 - Python 2.7.18 @@ -38,7 +40,7 @@ - Carthage 0.38.0 - CocoaPods 1.11.2 - Composer 2.1.8 -- Homebrew 3.2.13 +- Homebrew 3.2.14 - Miniconda 4.10.3 - NPM 6.14.15 - NuGet 5.6.0.6489 @@ -46,8 +48,8 @@ - Pip 21.2.4 (python 3.9) - Pipx 0.16.4 - RubyGems 3.2.28 -- Vcpkg 2021 (build from master \<3768cef>) -- Yarn 1.22.5 +- Vcpkg 2021 (build from master \<2a31089>) +- Yarn 1.22.15 #### Environment variables | Name | Value | @@ -69,7 +71,7 @@ - bazelisk 1.10.1 - bsdtar 3.3.2 - available by 'tar' alias - Curl 7.79.1 -- Git LFS: 2.13.3 +- Git LFS: 3.0.1 - Git: 2.33.0 - GitHub CLI: 2.0.0 - GNU parallel 20210922 @@ -79,11 +81,11 @@ - helm v3.7.0+geeac838 - Hub CLI: 2.14.2 - jq 1.6 -- mongo v5.0.2 -- mongod v5.0.2 +- mongo v5.0.3 +- mongod v5.0.3 - Newman 5.3.0 - OpenSSL 1.1.1l 24 Aug 2021 `(/usr/local/opt/openssl@1.1 -> /usr/local/Cellar/openssl@1.1/1.1.1l)` -- Packer 1.7.5 +- Packer 1.7.6 - PostgreSQL 13.4 - psql (PostgreSQL) 13.4 - Sox 14.4.2 @@ -95,10 +97,10 @@ ### Tools -- Aliyun CLI 3.0.93 -- App Center CLI 2.10.1 -- AWS CLI 2.2.41 -- AWS SAM CLI 1.32.0 +- Aliyun CLI 3.0.94 +- App Center CLI 2.10.2 +- AWS CLI 2.2.43 +- AWS SAM CLI 1.33.0 - AWS Session Manager CLI 1.2.245.0 - Azure CLI 2.28.0 - Bicep CLI 0.4.613 @@ -106,7 +108,7 @@ - Cmake 3.21.3 - Fastlane 2.195.0 - GHC 9.0.1 -- GHCup 0.1.17.1 +- GHCup 0.1.17.2 - Stack 2.7.3 - SwiftFormat 0.48.11 - Swig 4.0.2 @@ -119,17 +121,17 @@ ### Browsers - Safari 14.1.2 (15611.3.10.1.7) - SafariDriver 14.1.2 (15611.3.10.1.7) -- Google Chrome 94.0.4606.61 -- ChromeDriver 93.0.4577.63 -- Microsoft Edge 94.0.992.31 -- MSEdgeDriver 94.0.992.31 +- Google Chrome 94.0.4606.71 +- ChromeDriver 94.0.4606.61 +- Microsoft Edge 94.0.992.38 +- MSEdgeDriver 94.0.992.38 - Mozilla Firefox 92.0.1 - geckodriver 0.30.0 #### Environment variables | Name | Value | | --------------- | --------------------------------------------- | -| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/93.0.4577.63 | +| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/94.0.4606.61 | | EDGEWEBDRIVER | /usr/local/share/edge_driver | | GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | @@ -167,7 +169,7 @@ #### Node.js - 10.24.1 - 12.22.6 -- 14.17.6 +- 14.18.0 #### Go - 1.13.15 @@ -209,7 +211,7 @@ ### Xamarin #### Visual Studio for Mac -- 8.10.9.3 +- 8.10.10.8 #### Xamarin bundles | symlink | Xamarin.Mono | Xamarin.iOS | Xamarin.Mac | Xamarin.Android | From 801fa37b760e628b00397eedbe533ce72490c66d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 7 Oct 2021 08:02:28 +0000 Subject: [PATCH 0602/3485] Updating readme file for ubuntu18 version 20211004.1 (#4219) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/linux/Ubuntu1804-README.md | 51 ++++++++++++++++--------------- 1 file changed, 26 insertions(+), 25 deletions(-) diff --git a/images/linux/Ubuntu1804-README.md b/images/linux/Ubuntu1804-README.md index 57d4752ecab5..8fdc47733e6a 100644 --- a/images/linux/Ubuntu1804-README.md +++ b/images/linux/Ubuntu1804-README.md @@ -4,7 +4,7 @@ *** # Ubuntu 18.04.6 LTS - Linux kernel version: 5.4.0-1059-azure -- Image Version: 20210929.1 +- Image Version: 20211004.1 ## Installed Software ### Language and Runtime @@ -29,15 +29,15 @@ ### Package Management - cpan 1.64 - Helm 3.7.0 -- Homebrew 3.2.13 +- Homebrew 3.2.14 - Miniconda 4.10.3 - Npm 6.14.15 - Pip 9.0.1 - Pip3 9.0.1 - Pipx 0.16.4 - RubyGems 2.7.6 -- Vcpkg (build from master \<33f02c0>) -- Yarn 1.22.11 +- Vcpkg (build from master \<2a31089>) +- Yarn 1.22.15 #### Environment variables | Name | Value | @@ -48,7 +48,7 @@ ### Project Management - Ant 1.10.5 - Gradle 7.2 -- Maven 3.8.2 +- Maven 3.8.3 - Sbt 1.5.5 ### Tools @@ -61,7 +61,8 @@ - Buildah 1.19.6 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - CMake 3.21.3 - CodeQL Action Bundle 2.6.2 -- Docker Compose 1.29.2 +- Docker Compose v1 1.29.2 +- Docker Compose v2 2.0.0 - Docker-Buildx 0.6.0 - Docker-Moby Client 20.10.8+azure - Docker-Moby Server 20.10.8+azure @@ -90,22 +91,22 @@ - Skopeo 1.2.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 - SVN 1.9.7 -- Terraform 1.0.7 +- Terraform 1.0.8 - yamllint 1.26.3 -- yq 4.13.2 +- yq 4.13.3 - zstd 1.5.0 (homebrew) ### CLI Tools - Alibaba Cloud CLI 3.0.94 -- AWS CLI 1.20.50 +- AWS CLI 1.20.53 - AWS CLI Session manager plugin 1.2.245.0 -- AWS SAM CLI 1.32.0 +- AWS SAM CLI 1.33.0 - Azure CLI (azure-cli) 2.28.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.20.0 - GitHub CLI 2.0.0 - Google Cloud SDK 359.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 6.9.24 +- Netlify CLI 6.9.28 - OpenShift CLI 4.8.13 - ORAS CLI 0.12.0 - Vercel CLI 23.1.2 @@ -129,7 +130,7 @@ ### Haskell - Cabal 3.6.0.0 - GHC 9.0.1 -- GHCup 0.1.17.1 +- GHCup 0.1.17.2 - Stack 2.7.3 ### Rust Tools @@ -147,7 +148,7 @@ - Rustfmt 1.4.37 ### Browsers and Drivers -- Google Chrome 94.0.4606.61 +- Google Chrome 94.0.4606.71 - ChromeDriver 94.0.4606.61 - Mozilla Firefox 92.0 - Geckodriver 0.30.0 @@ -164,7 +165,7 @@ ### Databases - MongoDB 5.0.3 (apt source repository: https://repo.mongodb.org/apt/ubuntu) -- PostgreSQL 13.4 (apt source repository: https://apt.postgresql.org/pub/repos/apt/) +- PostgreSQL 14.0 (apt source repository: https://apt.postgresql.org/pub/repos/apt/) - sqlite3 3.22.0 #### MySQL @@ -268,21 +269,21 @@ | alpine:3.12 | sha256:a296b4c6f6ee2b88f095b61e95c7ef4f51ba25598835b4978c9256d8c8ace48a | 2021-08-31 | | alpine:3.13 | sha256:2582893dec6f12fd499d3a709477f2c0c0c1dfcd28024c93f1f0626b9e3540c8 | 2021-08-31 | | alpine:3.14 | sha256:e1c082e3d3c45cccac829840a25941e679c25d438cc8412c2fa221cf1a824e6a | 2021-08-27 | -| buildpack-deps:bullseye | sha256:e3d110d51825ea68a90f3d8f56bd0958d5aba0099cd8741c6249f6ea014cdc0c | 2021-09-28 | -| buildpack-deps:buster | sha256:cd01a4c25b0be12a252ddbddd2b286ee47cdf1eac3a8a9c268073709c4e8098f | 2021-09-28 | -| buildpack-deps:stretch | sha256:b07c88daec80f31b7a3b9dfc8938023b8250c71c9b076034c19d6ef6da964186 | 2021-09-28 | -| debian:10 | sha256:f4b36c72b25772bd4f83e939d9b17dfe804977e455338d29266e845c106c7e02 | 2021-09-28 | -| debian:11 | sha256:e68966e6b0c5e55ad80a5b6d0366245c086768c99e921317c1c1da6bc9e3c920 | 2021-09-28 | -| debian:9 | sha256:69b306996a84b9d143876d47ad77643367f0329f67f3056a1da8125315a0d637 | 2021-09-28 | +| buildpack-deps:bullseye | sha256:e54ae211c5b7f7bef56152bd3004a28989c31d88a6a12e104ba91e715194af2a | 2021-09-28 | +| buildpack-deps:buster | sha256:df00248c216c6ee635cfe9ab3ef070aadd0a58d5ac3da08ed2e4273d4800e54d | 2021-09-28 | +| buildpack-deps:stretch | sha256:57d5d14748554b31c75a2e95e63c51e8cdfb24393e33c1431982123b7d0c2280 | 2021-09-28 | +| debian:10 | sha256:9b0a8c03b28d4fd2b57cc44e4a3d06b01d4237c8874015a1749837d517c38612 | 2021-09-28 | +| debian:11 | sha256:86dddd82dddf445aea3d2ea26af46cebd727bf2f47ed810fa1450a0d79722d55 | 2021-09-28 | +| debian:9 | sha256:c1274c24446b98394e1594ceefac1012e1b39b752586ca993fe3c3bea6f6d20f | 2021-09-28 | | node:10 | sha256:59531d2835edd5161c8f9512f9e095b1836f7a1fcb0ab73e005ec46047384911 | 2021-04-10 | | node:10-alpine | sha256:dc98dac24efd4254f75976c40bce46944697a110d06ce7fa47e7268470cf2e28 | 2021-04-14 | -| node:12 | sha256:18c8ec450aa0d85ccee88d119c7d28ba5d8cbaf614c53837755fe2f67d44a466 | 2021-09-28 | +| node:12 | sha256:86afd89e91d667a65b37e05659974ccd702b8e3b1aff30416d1f77cf67729e2b | 2021-09-28 | | node:12-alpine | sha256:1ea5900145028957ec0e7b7e590ac677797fa8962ccec4e73188092f7bc14da5 | 2021-08-31 | -| node:14 | sha256:906a937a57b31381b154bcf36ca5b8787197a2b802de810f9998722069337b77 | 2021-09-29 | -| node:14-alpine | sha256:276f611d6f338a38c3265f28075e3fb2542358e39ba6b688a1c51a41d4f97682 | 2021-09-29 | +| node:14 | sha256:167d0a4af6b4e0d0769086b871a36c25faed75b72705144cabbda70466cc0d8e | 2021-09-29 | +| node:14-alpine | sha256:1fdf68e175b39915e740da73269970b0a0a881c497865bc7b5accb9bd83a7811 | 2021-09-29 | | ubuntu:16.04 | sha256:454054f5bbd571b088db25b662099c6c7b3f0cb78536a2077d54adc48f00cd68 | 2021-08-31 | -| ubuntu:18.04 | sha256:9bc830af2bef73276515a29aa896eedfa7bdf4bdbc5c1063b4c457a4bbb8cd79 | 2021-08-31 | -| ubuntu:20.04 | sha256:9d6a8699fb5c9c39cf08a0871bd6219f0400981c570894cd8cbea30d3424a31f | 2021-08-31 | +| ubuntu:18.04 | sha256:d501bde46939f19cb83d6fc604f8d0cda403683e8aa9765f5f0f271de3025279 | 2021-10-01 | +| ubuntu:20.04 | sha256:44ab2c3b26363823dcb965498ab06abf74a1e6af20a732902250743df0d4172d | 2021-10-01 | ### Installed apt packages | Name | Version | From 196a731891e1679cb228265ac599a56bd32781e4 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 7 Oct 2021 08:04:04 +0000 Subject: [PATCH 0603/3485] Updating readme file for ubuntu20 version 20211004.1 (#4218) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/linux/Ubuntu2004-README.md | 51 ++++++++++++++++--------------- 1 file changed, 26 insertions(+), 25 deletions(-) diff --git a/images/linux/Ubuntu2004-README.md b/images/linux/Ubuntu2004-README.md index 33745c70d783..d3f8234ae70b 100644 --- a/images/linux/Ubuntu2004-README.md +++ b/images/linux/Ubuntu2004-README.md @@ -4,7 +4,7 @@ *** # Ubuntu 20.04.3 LTS - Linux kernel version: 5.8.0-1042-azure -- Image Version: 20210929.1 +- Image Version: 20211004.1 ## Installed Software ### Language and Runtime @@ -29,15 +29,15 @@ ### Package Management - cpan 1.64 - Helm 3.7.0 -- Homebrew 3.2.13 +- Homebrew 3.2.14 - Miniconda 4.10.3 - Npm 6.14.15 - Pip 20.0.2 - Pip3 20.0.2 - Pipx 0.16.4 - RubyGems 3.1.2 -- Vcpkg (build from master \<33f02c0>) -- Yarn 1.22.11 +- Vcpkg (build from master \<2a31089>) +- Yarn 1.22.15 #### Environment variables | Name | Value | @@ -49,7 +49,7 @@ - Ant 1.10.7 - Gradle 7.2 - Lerna 4.0.0 -- Maven 3.8.2 +- Maven 3.8.3 - Sbt 1.5.5 ### Tools @@ -62,7 +62,8 @@ - Buildah 1.21.3 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - CMake 3.21.3 - CodeQL Action Bundle 2.6.2 -- Docker Compose 1.29.2 +- Docker Compose v1 1.29.2 +- Docker Compose v2 2.0.0 - Docker-Buildx 0.6.3 - Docker-Moby Client 20.10.8+azure - Docker-Moby Server 20.10.8+azure @@ -92,22 +93,22 @@ - Skopeo 1.3.0 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 -- Terraform 1.0.7 +- Terraform 1.0.8 - yamllint 1.26.3 -- yq 4.13.2 +- yq 4.13.3 - zstd 1.5.0 (homebrew) ### CLI Tools - Alibaba Cloud CLI 3.0.94 -- AWS CLI 2.2.42 +- AWS CLI 2.2.43 - AWS CLI Session manager plugin 1.2.245.0 -- AWS SAM CLI 1.32.0 +- AWS SAM CLI 1.33.0 - Azure CLI (azure-cli) 2.28.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.20.0 - GitHub CLI 2.0.0 - Google Cloud SDK 359.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 6.9.24 +- Netlify CLI 6.9.28 - OpenShift CLI 4.8.13 - ORAS CLI 0.12.0 - Vercel CLI 23.1.2 @@ -135,7 +136,7 @@ ### Haskell - Cabal 3.6.0.0 - GHC 9.0.1 -- GHCup 0.1.17.1 +- GHCup 0.1.17.2 - Stack 2.7.3 ### Rust Tools @@ -153,7 +154,7 @@ - Rustfmt 1.4.37 ### Browsers and Drivers -- Google Chrome 94.0.4606.61 +- Google Chrome 94.0.4606.71 - ChromeDriver 94.0.4606.61 - Mozilla Firefox 92.0 - Geckodriver 0.30.0 @@ -170,7 +171,7 @@ ### Databases - MongoDB 5.0.3 (apt source repository: https://repo.mongodb.org/apt/ubuntu) -- PostgreSQL 13.4 (apt source repository: https://apt.postgresql.org/pub/repos/apt/) +- PostgreSQL 14.0 (apt source repository: https://apt.postgresql.org/pub/repos/apt/) - sqlite3 3.31.1 #### MySQL @@ -274,21 +275,21 @@ | alpine:3.12 | sha256:a296b4c6f6ee2b88f095b61e95c7ef4f51ba25598835b4978c9256d8c8ace48a | 2021-08-31 | | alpine:3.13 | sha256:2582893dec6f12fd499d3a709477f2c0c0c1dfcd28024c93f1f0626b9e3540c8 | 2021-08-31 | | alpine:3.14 | sha256:e1c082e3d3c45cccac829840a25941e679c25d438cc8412c2fa221cf1a824e6a | 2021-08-27 | -| buildpack-deps:bullseye | sha256:e3d110d51825ea68a90f3d8f56bd0958d5aba0099cd8741c6249f6ea014cdc0c | 2021-09-28 | -| buildpack-deps:buster | sha256:cd01a4c25b0be12a252ddbddd2b286ee47cdf1eac3a8a9c268073709c4e8098f | 2021-09-28 | -| buildpack-deps:stretch | sha256:b07c88daec80f31b7a3b9dfc8938023b8250c71c9b076034c19d6ef6da964186 | 2021-09-28 | -| debian:10 | sha256:f4b36c72b25772bd4f83e939d9b17dfe804977e455338d29266e845c106c7e02 | 2021-09-28 | -| debian:11 | sha256:e68966e6b0c5e55ad80a5b6d0366245c086768c99e921317c1c1da6bc9e3c920 | 2021-09-28 | -| debian:9 | sha256:69b306996a84b9d143876d47ad77643367f0329f67f3056a1da8125315a0d637 | 2021-09-28 | +| buildpack-deps:bullseye | sha256:e54ae211c5b7f7bef56152bd3004a28989c31d88a6a12e104ba91e715194af2a | 2021-09-28 | +| buildpack-deps:buster | sha256:df00248c216c6ee635cfe9ab3ef070aadd0a58d5ac3da08ed2e4273d4800e54d | 2021-09-28 | +| buildpack-deps:stretch | sha256:57d5d14748554b31c75a2e95e63c51e8cdfb24393e33c1431982123b7d0c2280 | 2021-09-28 | +| debian:10 | sha256:9b0a8c03b28d4fd2b57cc44e4a3d06b01d4237c8874015a1749837d517c38612 | 2021-09-28 | +| debian:11 | sha256:86dddd82dddf445aea3d2ea26af46cebd727bf2f47ed810fa1450a0d79722d55 | 2021-09-28 | +| debian:9 | sha256:c1274c24446b98394e1594ceefac1012e1b39b752586ca993fe3c3bea6f6d20f | 2021-09-28 | | node:10 | sha256:59531d2835edd5161c8f9512f9e095b1836f7a1fcb0ab73e005ec46047384911 | 2021-04-10 | | node:10-alpine | sha256:dc98dac24efd4254f75976c40bce46944697a110d06ce7fa47e7268470cf2e28 | 2021-04-14 | -| node:12 | sha256:18c8ec450aa0d85ccee88d119c7d28ba5d8cbaf614c53837755fe2f67d44a466 | 2021-09-28 | +| node:12 | sha256:86afd89e91d667a65b37e05659974ccd702b8e3b1aff30416d1f77cf67729e2b | 2021-09-28 | | node:12-alpine | sha256:1ea5900145028957ec0e7b7e590ac677797fa8962ccec4e73188092f7bc14da5 | 2021-08-31 | -| node:14 | sha256:906a937a57b31381b154bcf36ca5b8787197a2b802de810f9998722069337b77 | 2021-09-29 | -| node:14-alpine | sha256:276f611d6f338a38c3265f28075e3fb2542358e39ba6b688a1c51a41d4f97682 | 2021-09-29 | +| node:14 | sha256:167d0a4af6b4e0d0769086b871a36c25faed75b72705144cabbda70466cc0d8e | 2021-09-29 | +| node:14-alpine | sha256:1fdf68e175b39915e740da73269970b0a0a881c497865bc7b5accb9bd83a7811 | 2021-09-29 | | ubuntu:16.04 | sha256:454054f5bbd571b088db25b662099c6c7b3f0cb78536a2077d54adc48f00cd68 | 2021-08-31 | -| ubuntu:18.04 | sha256:9bc830af2bef73276515a29aa896eedfa7bdf4bdbc5c1063b4c457a4bbb8cd79 | 2021-08-31 | -| ubuntu:20.04 | sha256:9d6a8699fb5c9c39cf08a0871bd6219f0400981c570894cd8cbea30d3424a31f | 2021-08-31 | +| ubuntu:18.04 | sha256:d501bde46939f19cb83d6fc604f8d0cda403683e8aa9765f5f0f271de3025279 | 2021-10-01 | +| ubuntu:20.04 | sha256:44ab2c3b26363823dcb965498ab06abf74a1e6af20a732902250743df0d4172d | 2021-10-01 | ### Installed apt packages | Name | Version | From fb6be2f59d2eab4a0ea19512f8d7390f55e0c11d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 7 Oct 2021 09:22:41 +0000 Subject: [PATCH 0604/3485] Updating readme file for win22 version 20211003.1 (#4214) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/win/Windows2022-Readme.md | 33 ++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/images/win/Windows2022-Readme.md b/images/win/Windows2022-Readme.md index 3a828aff22fd..109fd564dcdf 100644 --- a/images/win/Windows2022-Readme.md +++ b/images/win/Windows2022-Readme.md @@ -4,7 +4,7 @@ *** # Microsoft Windows Server 2022 Datacenter - OS Version: 10.0.20348 Build 230 -- Image Version: 20210927.1 +- Image Version: 20211003.1 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -16,7 +16,7 @@ - Julia 1.6.3 - Kotlin 1.5.31 - LLVM 12.0.1 -- Node 14.17.6 +- Node 14.18.0 - PHP 8.0.10 - Python 3.9.7 - Ruby 3.0.2p107 @@ -30,8 +30,8 @@ - pip 21.2.4 (python 3.9) - Pipx 0.16.4 - RubyGems 3.2.22 -- Vcpkg (build from master \<46700e2>) -- Yarn 1.22.11 +- Vcpkg (build from master \<2a31089>) +- Yarn 1.22.15 #### Environment variables | Name | Value | @@ -67,7 +67,7 @@ - Newman 5.3.0 - OpenSSL 1.1.1 - Packer 1.7.5 -- Pulumi v3.13.0 +- Pulumi v3.13.2 - R 4.1.1 - Stack 2.7.3 - Subversion (SVN) 1.14.1 @@ -78,9 +78,9 @@ - zstd 1.5.0 ### CLI Tools -- Alibaba Cloud CLI 3.0.93 -- AWS CLI 2.2.41 -- AWS SAM CLI 1.32.0 +- Alibaba Cloud CLI 3.0.94 +- AWS CLI 2.2.43 +- AWS SAM CLI 1.33.0 - AWS Session Manager CLI 1.2.245.0 - Azure CLI 2.28.0 - Azure DevOps CLI extension 0.20.0 @@ -102,10 +102,10 @@ - Rustfmt 1.4.37 ### Browsers and webdrivers -- Google Chrome 94.0.4606.61 +- Google Chrome 94.0.4606.71 - Chrome Driver 94.0.4606.61 -- Microsoft Edge 94.0.992.31 -- Microsoft Edge Driver 94.0.992.31 +- Microsoft Edge 94.0.992.38 +- Microsoft Edge Driver 94.0.992.38 - Mozilla Firefox 92.0.1 - Gecko Driver 0.30.0 - IE Driver 3.150.1.1 @@ -153,7 +153,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | ------- | ------------ | | 10.24.1 | x64 | | 12.22.6 | x64 | -| 14.17.6 | x64 | +| 14.18.0 | x64 | #### Python @@ -183,12 +183,12 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### PostgreSQL | Property | Value | | -------------------- | ------------------------------------------------------------------------------------------------------------------------------------ | -| ServiceName | postgresql-x64-13 | -| Version | 13.4 | +| ServiceName | postgresql-x64-14 | +| Version | 14.0 | | ServiceStatus | Stopped | | ServiceStartType | Disabled | -| 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 | +| EnvironmentVariables | PGBIN=C:\Program Files\PostgreSQL\14\bin
PGDATA=C:\Program Files\PostgreSQL\14\data
PGROOT=C:\Program Files\PostgreSQL\14 | +| Path | C:\Program Files\PostgreSQL\14 | | UserName | postgres | | Password | root | @@ -321,6 +321,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Component.VC.ASAN | 17.0.31709.181 | | Microsoft.VisualStudio.Component.VC.ATL | 17.0.31709.181 | | Microsoft.VisualStudio.Component.VC.ATL.Spectre | 17.0.31709.181 | +| Microsoft.VisualStudio.Component.VC.ATLMFC | 17.0.31709.181 | | Microsoft.VisualStudio.Component.VC.ATLMFC.Spectre | 17.0.31709.181 | | Microsoft.VisualStudio.Component.VC.CLI.Support | 17.0.31709.181 | | Microsoft.VisualStudio.Component.VC.CMake.Project | 17.0.31709.181 | From 2cf3cc7bf56ee2107cabb08ea4b03ebbb13676b7 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 7 Oct 2021 09:50:26 +0000 Subject: [PATCH 0605/3485] Updating readme file for win19 version 20211003.2 (#4216) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/win/Windows2019-Readme.md | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index 91f5c335af6f..6db557a7b158 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 2183 -- Image Version: 20210928.2 +- Image Version: 20211003.2 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -16,7 +16,7 @@ - Julia 1.6.3 - Kotlin 1.5.31 - LLVM 12.0.1 -- Node 14.17.6 +- Node 14.18.0 - Perl 5.32.1 - PHP 8.0.10 - Python 3.7.9 @@ -32,8 +32,8 @@ - pip 21.2.4 (python 3.7) - Pipx 0.16.4 - RubyGems 2.7.6.3 -- Vcpkg (build from master \<042e1db>) -- Yarn 1.22.11 +- Vcpkg (build from master \<2a31089>) +- Yarn 1.22.15 #### Environment variables | Name | Value | @@ -85,9 +85,9 @@ - zstd 1.5.0 ### CLI Tools -- Alibaba Cloud CLI 3.0.93 -- AWS CLI 2.2.41 -- AWS SAM CLI 1.32.0 +- Alibaba Cloud CLI 3.0.94 +- AWS CLI 2.2.43 +- AWS SAM CLI 1.33.0 - AWS Session Manager CLI 1.2.245.0 - Azure CLI 2.28.0 - Azure DevOps CLI extension 0.20.0 @@ -110,10 +110,10 @@ - Rustfmt 1.4.37 ### Browsers and webdrivers -- Google Chrome 94.0.4606.61 +- Google Chrome 94.0.4606.71 - Chrome Driver 94.0.4606.61 -- Microsoft Edge 94.0.992.31 -- Microsoft Edge Driver 94.0.992.31 +- Microsoft Edge 94.0.992.38 +- Microsoft Edge Driver 94.0.992.38 - Mozilla Firefox 92.0.1 - Gecko Driver 0.30.0 - IE Driver 3.150.1.1 @@ -166,7 +166,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | ------- | ------------ | | 10.24.1 | x64 | | 12.22.6 | x64 | -| 14.17.6 | x64 | +| 14.18.0 | x64 | #### Python @@ -203,12 +203,12 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### PostgreSQL | Property | Value | | -------------------- | ------------------------------------------------------------------------------------------------------------------------------------ | -| ServiceName | postgresql-x64-13 | -| Version | 13.4 | +| ServiceName | postgresql-x64-14 | +| Version | 14.0 | | ServiceStatus | Stopped | | ServiceStartType | Disabled | -| 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 | +| EnvironmentVariables | PGBIN=C:\Program Files\PostgreSQL\14\bin
PGDATA=C:\Program Files\PostgreSQL\14\data
PGROOT=C:\Program Files\PostgreSQL\14 | +| Path | C:\Program Files\PostgreSQL\14 | | UserName | postgres | | Password | root | From c610e2cb297212a67f0462db4371f160b029add4 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 7 Oct 2021 13:49:53 +0000 Subject: [PATCH 0606/3485] Updating readme file for win16 version 20211003.1 (#4215) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/win/Windows2016-Readme.md | 34 ++++++++++++++++---------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/images/win/Windows2016-Readme.md b/images/win/Windows2016-Readme.md index 6e30e7a40eb3..2367e63f619f 100644 --- a/images/win/Windows2016-Readme.md +++ b/images/win/Windows2016-Readme.md @@ -4,7 +4,7 @@ *** # Microsoft Windows Server 2016 Datacenter - OS Version: 10.0.14393 Build 4651 -- Image Version: 20210927.1 +- Image Version: 20211003.1 ## Installed Software ### Language and Runtime @@ -13,7 +13,7 @@ - Julia 1.6.3 - Kotlin 1.5.31 - LLVM 12.0.1 -- Node 14.17.6 +- Node 14.18.0 - Perl 5.32.1 - PHP 8.0.10 - Python 3.7.9 @@ -29,8 +29,8 @@ - pip 21.2.4 (python 3.7) - Pipx 0.16.4 - RubyGems 2.7.6.3 -- Vcpkg (build from master \<3768cef>) -- Yarn 1.22.11 +- Vcpkg (build from master \<2a31089>) +- Yarn 1.22.15 #### Environment variables | Name | Value | @@ -59,7 +59,7 @@ - ghc 9.0.1 - Git 2.33.0 - Git LFS 2.13.3 -- Google Cloud SDK 358.0.0 +- Google Cloud SDK 359.0.0 - GVFS 1.0.21085.9 - InnoSetup 6.2.0 - jq 1.6 @@ -71,7 +71,7 @@ - NSIS v3.06.1 - OpenSSL 1.1.1 - Packer 1.7.5 -- Pulumi v3.13.0 +- Pulumi v3.13.2 - R 4.1.1 - Stack 2.7.3 - Subversion (SVN) 1.14.1 @@ -82,9 +82,9 @@ - zstd 1.5.0 ### CLI Tools -- Alibaba Cloud CLI 3.0.93 -- AWS CLI 2.2.41 -- AWS SAM CLI 1.32.0 +- Alibaba Cloud CLI 3.0.94 +- AWS CLI 2.2.43 +- AWS SAM CLI 1.33.0 - AWS Session Manager CLI 1.2.245.0 - Azure CLI 2.28.0 - Azure DevOps CLI extension 0.20.0 @@ -107,10 +107,10 @@ - Rustfmt 1.4.37 ### Browsers and webdrivers -- Google Chrome 94.0.4606.61 +- Google Chrome 94.0.4606.71 - Chrome Driver 94.0.4606.61 -- Microsoft Edge 94.0.992.31 -- Microsoft Edge Driver 94.0.992.31 +- Microsoft Edge 94.0.992.38 +- Microsoft Edge Driver 94.0.992.38 - Mozilla Firefox 92.0.1 - Gecko Driver 0.30.0 - IE Driver 3.150.1.1 @@ -160,7 +160,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | ------- | ------------ | | 10.24.1 | x64 | | 12.22.6 | x64 | -| 14.17.6 | x64 | +| 14.18.0 | x64 | #### Python @@ -197,12 +197,12 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### PostgreSQL | Property | Value | | -------------------- | ------------------------------------------------------------------------------------------------------------------------------------ | -| ServiceName | postgresql-x64-13 | -| Version | 13.4 | +| ServiceName | postgresql-x64-14 | +| Version | 14.0 | | ServiceStatus | Stopped | | ServiceStartType | Disabled | -| 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 | +| EnvironmentVariables | PGBIN=C:\Program Files\PostgreSQL\14\bin
PGDATA=C:\Program Files\PostgreSQL\14\data
PGROOT=C:\Program Files\PostgreSQL\14 | +| Path | C:\Program Files\PostgreSQL\14 | | UserName | postgres | | Password | root | From 2913bd7060477ea4c6a76db7695ad6ac9053ad9d Mon Sep 17 00:00:00 2001 From: Dmitry Shibanov Date: Fri, 8 Oct 2021 13:35:16 +0300 Subject: [PATCH 0607/3485] remove code duplicate for Get-PHPVersio (#4231) --- images/macos/software-report/SoftwareReport.Common.psm1 | 5 ----- 1 file changed, 5 deletions(-) diff --git a/images/macos/software-report/SoftwareReport.Common.psm1 b/images/macos/software-report/SoftwareReport.Common.psm1 index f429390ddd42..48e3218b8046 100644 --- a/images/macos/software-report/SoftwareReport.Common.psm1 +++ b/images/macos/software-report/SoftwareReport.Common.psm1 @@ -151,11 +151,6 @@ function Build-OSInfoSection { return $output } -function Get-PHPVersion { - $PHPVersion = Run-Command "php --version" | Select-Object -First 1 | Take-Part -Part 0,1 - return $PHPVersion -} - function Get-MSBuildVersion { $msbuildVersion = msbuild -version | Select-Object -Last 1 $result = Select-String -Path (Get-Command msbuild).Source -Pattern "msbuild" From cf96490586c2ae8bd19e173f358a5f371e850bf6 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Sat, 9 Oct 2021 16:51:33 +0300 Subject: [PATCH 0608/3485] [Windows] Install the latest available azure-cli msi package (#4242) --- images/win/scripts/Installers/Install-AzureCli.ps1 | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/images/win/scripts/Installers/Install-AzureCli.ps1 b/images/win/scripts/Installers/Install-AzureCli.ps1 index 81b6988acd1d..1c8013340fe3 100644 --- a/images/win/scripts/Installers/Install-AzureCli.ps1 +++ b/images/win/scripts/Installers/Install-AzureCli.ps1 @@ -4,10 +4,8 @@ ################################################################################ Write-Host "Install the latest Azure CLI release" -$assets = Invoke-RestMethod -Uri 'https://api.github.com/repos/Azure/azure-cli/releases/latest' -$azCliUrl = $assets.assets.browser_download_url -$azCliName = [IO.Path]::GetFileName($azCliUrl) -Install-Binary -Url $azCliUrl -Name $azCliName -ArgumentList ("/qn", "/norestart") +$azCliUrl = "https://aka.ms/installazurecliwindows" +Install-Binary -Url $azCliUrl -Name "azure-cli.msi" -ArgumentList ("/qn", "/norestart") $azureCliExtensionPath = Join-Path $Env:CommonProgramFiles 'AzureCliExtensionDirectory' $null = New-Item -ItemType "Directory" -Path $azureCliExtensionPath From e4546d3d537dea790051af3fa7e04c0fc0809bac Mon Sep 17 00:00:00 2001 From: Dibir Magomedsaygitov <61747324+dibir-magomedsaygitov@users.noreply.github.com> Date: Sat, 9 Oct 2021 19:46:34 +0300 Subject: [PATCH 0609/3485] [Windows] Add missing VS2022 components (#4239) --- images/win/toolsets/toolset-2022.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index 5a011437f76b..8dd2bb5d7f72 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -180,7 +180,12 @@ "Microsoft.VisualStudio.Component.VC.TestAdapterForBoostTest", "Microsoft.VisualStudio.Component.VC.TestAdapterForGoogleTest", "Microsoft.VisualStudio.Component.VC.Tools.ARM", + "Microsoft.VisualStudio.Component.VC.MFC.ARM", + "Microsoft.VisualStudio.Component.VC.ATL.ARM64", + "Microsoft.VisualStudio.Component.VC.MFC.ARM64", + "Microsoft.VisualStudio.Component.VC.MFC.ARM64EC", "Microsoft.VisualStudio.Component.VC.Tools.ARM64", + "Microsoft.VisualStudio.Component.VC.Tools.ARM64EC", "Microsoft.VisualStudio.Component.VC.v141.x86.x64", "Microsoft.VisualStudio.Component.VC.v141.x86.x64.Spectre", "Microsoft.VisualStudio.Component.VC.v141.MFC", From 9f43e68092474d7132d1f8884814b11b65a39cdc Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Mon, 11 Oct 2021 13:59:45 +0300 Subject: [PATCH 0610/3485] Ubuntu add python 3.10 to the toolcache (#4252) --- images/linux/toolsets/toolset-1804.json | 3 ++- images/linux/toolsets/toolset-2004.json | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index d5f3f5e674cb..671e8fe03d0c 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -12,7 +12,8 @@ "3.6.*", "3.7.*", "3.8.*", - "3.9.*" + "3.9.*", + "3.10.*" ] }, { diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index 85b8f272ae2f..83931463e47d 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -12,7 +12,8 @@ "3.6.*", "3.7.*", "3.8.*", - "3.9.*" + "3.9.*", + "3.10.*" ] }, { From 5425b6cf3d42c368ba3488c865d562566646deef Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Mon, 11 Oct 2021 16:39:02 +0300 Subject: [PATCH 0611/3485] Add python 3.10 to the toolcache (#4253) --- images/win/toolsets/toolset-2016.json | 3 ++- images/win/toolsets/toolset-2019.json | 3 ++- images/win/toolsets/toolset-2022.json | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/images/win/toolsets/toolset-2016.json b/images/win/toolsets/toolset-2016.json index 40d8b2d3ba19..7d538d88e018 100644 --- a/images/win/toolsets/toolset-2016.json +++ b/images/win/toolsets/toolset-2016.json @@ -24,7 +24,8 @@ "3.6.*", "3.7.*", "3.8.*", - "3.9.*" + "3.9.*", + "3.10.*" ], "default": "3.7.*" }, diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index dd245b149965..be490b619a55 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -24,7 +24,8 @@ "3.6.*", "3.7.*", "3.8.*", - "3.9.*" + "3.9.*", + "3.10.*" ], "default": "3.7.*" }, diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index 8dd2bb5d7f72..f535b9765f6c 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -18,7 +18,8 @@ "versions": [ "3.7.*", "3.8.*", - "3.9.*" + "3.9.*", + "3.10.*" ], "default": "3.9.*" }, From b9c994fd6caaeb84739c882ed50b7c6288030de2 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Mon, 11 Oct 2021 16:42:35 +0300 Subject: [PATCH 0612/3485] [macOS] Add python 3.10 to the toolcache (#4254) --- images/macos/toolsets/toolset-10.14.json | 3 ++- images/macos/toolsets/toolset-10.15.json | 3 ++- images/macos/toolsets/toolset-11.json | 3 ++- images/macos/toolsets/toolset-12.json | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/images/macos/toolsets/toolset-10.14.json b/images/macos/toolsets/toolset-10.14.json index 3aff5d25b013..ff45ea7bafca 100644 --- a/images/macos/toolsets/toolset-10.14.json +++ b/images/macos/toolsets/toolset-10.14.json @@ -302,7 +302,8 @@ "3.6.*", "3.7.*", "3.8.*", - "3.9.*" + "3.9.*", + "3.10.*" ] }, { diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index 9deaed65f851..ba1b63ec0c86 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -253,7 +253,8 @@ "3.6.*", "3.7.*", "3.8.*", - "3.9.*" + "3.9.*", + "3.10.*" ] }, { diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index 4a31b8d0d41e..a3eca16b6099 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -199,7 +199,8 @@ "versions": [ "3.7.*", "3.8.*", - "3.9.*" + "3.9.*", + "3.10.*" ] }, { diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index e34a3a2897cb..14cb184ef1cf 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -103,7 +103,8 @@ "versions": [ "3.7.*", "3.8.*", - "3.9.*" + "3.9.*", + "3.10.*" ] }, { From b8c61a14bcaa62fb174d46331d8c883f574b0f2a Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Wed, 13 Oct 2021 11:37:28 +0300 Subject: [PATCH 0613/3485] utils: silently ignore records that would violate (#4267) --- images/macos/provision/utils/utils.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/macos/provision/utils/utils.sh b/images/macos/provision/utils/utils.sh index c4acb551d1ee..090fa60e30af 100755 --- a/images/macos/provision/utils/utils.sh +++ b/images/macos/provision/utils/utils.sh @@ -196,7 +196,7 @@ configure_system_tccdb () { local values=$1 local dbPath="/Library/Application Support/com.apple.TCC/TCC.db" - local sqlQuery="INSERT INTO access VALUES($values);" + local sqlQuery="INSERT OR IGNORE INTO access VALUES($values);" sudo sqlite3 "$dbPath" "$sqlQuery" } @@ -204,6 +204,6 @@ configure_user_tccdb () { local values=$1 local dbPath="$HOME/Library/Application Support/com.apple.TCC/TCC.db" - local sqlQuery="INSERT INTO access VALUES($values);" + local sqlQuery="INSERT OR IGNORE INTO access VALUES($values);" sqlite3 "$dbPath" "$sqlQuery" } From a527c05b15824b0890b63eb746ffd1f3ef4d6b8c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 14 Oct 2021 08:45:02 +0000 Subject: [PATCH 0614/3485] Updating readme file for macOS-10.15 version 20211011.2 (#4263) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/macos/macos-10.15-Readme.md | 47 +++++++++++++++--------------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/images/macos/macos-10.15-Readme.md b/images/macos/macos-10.15-Readme.md index 3429a50f2769..c1c7fb437cf2 100644 --- a/images/macos/macos-10.15-Readme.md +++ b/images/macos/macos-10.15-Readme.md @@ -7,14 +7,14 @@ # macOS 10.15 info - System Version: macOS 10.15.7 (19H1417) - Kernel Version: Darwin 19.6.0 -- Image Version: 20211002.1 +- Image Version: 20211011.2 ## Installed Software ### Language and Runtime - .NET SDK 2.1.302 2.1.403 2.1.507 2.1.607 2.1.701 2.1.818 3.1.101 3.1.201 3.1.302 3.1.413 5.0.102 5.0.202 5.0.302 5.0.401 - Bash 3.2.57(1)-release - Clang/LLVM 12.0.0 is default -- Clang/LLVM 12.0.1 is available on `'$(brew --prefix llvm)/bin/clang'` +- Clang/LLVM 13.0.0 is available on `'$(brew --prefix llvm)/bin/clang'` - gcc-9 (Homebrew GCC 9.4.0) 9.4.0 - available by `gcc-9` alias - gcc-10 (Homebrew GCC 10.3.0) 10.3.0 - available by `gcc-10` alias - gcc-11 (Homebrew GCC 11.2.0) 11.2.0 - available by `gcc-11` alias @@ -25,8 +25,8 @@ - julia 1.6.3 - Kotlin 1.5.31-release-548 - MSBuild 16.6.0.15801 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) -- Node.js v14.17.6 -- NVM 0.38.0 +- Node.js v14.18.0 +- NVM 0.39.0 - NVM - Cached node versions: v10.24.1 v12.22.6 v14.18.0 - Perl 5.34.0 - PHP 8.0.11 @@ -36,19 +36,19 @@ - Ruby 2.7.4p191 ### Package Management -- Bundler version 2.2.28 +- Bundler version 2.2.29 - Carthage 0.38.0 - CocoaPods 1.11.2 -- Composer 2.1.8 -- Homebrew 3.2.14 +- Composer 2.1.9 +- Homebrew 3.2.16 - Miniconda 4.10.3 - NPM 6.14.15 - NuGet 5.6.0.6489 - Pip 20.3.4 (python 2.7) - Pip 21.2.4 (python 3.9) - Pipx 0.16.4 -- RubyGems 3.2.28 -- Vcpkg 2021 (build from master \<2a31089>) +- RubyGems 3.2.29 +- Vcpkg 2021 (build from master \<1d4128f>) - Yarn 1.22.15 #### Environment variables @@ -59,7 +59,7 @@ ### Project Management - Apache Ant(TM) 1.10.11 -- Apache Maven 3.8.2 +- Apache Maven 3.8.3 - Gradle 7.2 - Sbt 1.5.5 @@ -84,10 +84,10 @@ - mongo v5.0.3 - mongod v5.0.3 - Newman 5.3.0 -- OpenSSL 1.1.1l 24 Aug 2021 `(/usr/local/opt/openssl@1.1 -> /usr/local/Cellar/openssl@1.1/1.1.1l)` +- OpenSSL 1.1.1l 24 Aug 2021 `(/usr/local/opt/openssl@1.1 -> /usr/local/Cellar/openssl@1.1/1.1.1l_1)` - Packer 1.7.6 -- PostgreSQL 13.4 -- psql (PostgreSQL) 13.4 +- PostgreSQL 14.0 +- psql (PostgreSQL) 14.0 - Sox 14.4.2 - Subversion (SVN) 1.14.1 - Switchaudio-osx 1.1.0 @@ -98,19 +98,19 @@ ### Tools - Aliyun CLI 3.0.94 -- App Center CLI 2.10.2 -- AWS CLI 2.2.43 +- App Center CLI 2.10.3 +- AWS CLI 2.2.44 - AWS SAM CLI 1.33.0 - AWS Session Manager CLI 1.2.245.0 -- Azure CLI 2.28.0 +- Azure CLI 2.28.1 - Bicep CLI 0.4.613 -- Cabal 3.6.1.0 +- Cabal 3.4.1.0 - Cmake 3.21.3 - Fastlane 2.195.0 - GHC 9.0.1 - GHCup 0.1.17.2 - Stack 2.7.3 -- SwiftFormat 0.48.11 +- SwiftFormat 0.48.15 - Swig 4.0.2 - Xcode Command Line Tools 12.4.0.0.1.1610135815 @@ -121,11 +121,11 @@ ### Browsers - Safari 14.1.2 (15611.3.10.1.7) - SafariDriver 14.1.2 (15611.3.10.1.7) -- Google Chrome 94.0.4606.71 +- Google Chrome 94.0.4606.81 - ChromeDriver 94.0.4606.61 - Microsoft Edge 94.0.992.38 - MSEdgeDriver 94.0.992.38 -- Mozilla Firefox 92.0.1 +- Mozilla Firefox 93.0 - geckodriver 0.30.0 #### Environment variables @@ -160,6 +160,7 @@ - 3.7.12 - 3.8.12 - 3.9.7 +- 3.10.0 #### PyPy - 2.7.18 [PyPy 7.3.5] @@ -175,8 +176,8 @@ - 1.13.15 - 1.14.15 - 1.15.15 -- 1.16.8 -- 1.17.1 +- 1.16.9 +- 1.17.2 ### Rust Tools - Cargo 1.55.0 @@ -206,7 +207,7 @@ ### Web Servers | Name | Version | ConfigFile | ServiceStatus | ListenPort | | ----- | ------- | ------------------------------- | ------------- | ---------- | -| httpd | 2.4.49 | /usr/local/etc/httpd/httpd.conf | stopped | 80 | +| httpd | 2.4.51 | /usr/local/etc/httpd/httpd.conf | stopped | 80 | | nginx | 1.21.3 | /usr/local/etc/nginx/nginx.conf | stopped | 80 | ### Xamarin From 5061a95c85cd6d843913b11fa60c66f9cc120ea0 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 14 Oct 2021 08:56:52 +0000 Subject: [PATCH 0615/3485] Updating readme file for ubuntu20 version 20211011.1 (#4251) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/linux/Ubuntu2004-README.md | 61 ++++++++++++++++--------------- 1 file changed, 31 insertions(+), 30 deletions(-) diff --git a/images/linux/Ubuntu2004-README.md b/images/linux/Ubuntu2004-README.md index d3f8234ae70b..42c821dc8e83 100644 --- a/images/linux/Ubuntu2004-README.md +++ b/images/linux/Ubuntu2004-README.md @@ -4,7 +4,7 @@ *** # Ubuntu 20.04.3 LTS - Linux kernel version: 5.8.0-1042-azure -- Image Version: 20211004.1 +- Image Version: 20211011.1 ## Installed Software ### Language and Runtime @@ -29,14 +29,14 @@ ### Package Management - cpan 1.64 - Helm 3.7.0 -- Homebrew 3.2.14 +- Homebrew 3.2.15 - Miniconda 4.10.3 - Npm 6.14.15 - Pip 20.0.2 - Pip3 20.0.2 - Pipx 0.16.4 - RubyGems 3.1.2 -- Vcpkg (build from master \<2a31089>) +- Vcpkg (build from master \<973a7d5>) - Yarn 1.22.15 #### Environment variables @@ -61,19 +61,19 @@ - Bicep 0.4.613 - Buildah 1.21.3 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - CMake 3.21.3 -- CodeQL Action Bundle 2.6.2 +- CodeQL Action Bundle 2.6.3 - Docker Compose v1 1.29.2 - Docker Compose v2 2.0.0 - Docker-Buildx 0.6.3 -- Docker-Moby Client 20.10.8+azure -- Docker-Moby Server 20.10.8+azure +- Docker-Moby Client 20.10.9+azure-1 +- Docker-Moby Server 20.10.9+azure-1 - Fastlane 2.195.0 - Git 2.33.0 (apt source repository: ppa:git-core/ppa) - Git LFS 2.13.3 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.6.0 - Haveged 1.9.1 - Heroku 7.59.0 -- HHVM (HipHop VM) 4.129.0 +- HHVM (HipHop VM) 4.130.0 - jq 1.6 - Kind 0.11.1 - Kubectl 1.22.2 @@ -83,32 +83,32 @@ - Mercurial 5.3.1 - Minikube 1.23.2 - Newman 5.3.0 -- nvm 0.38.0 +- nvm 0.39.0 - OpenSSL 1.1.1f 31 Mar 2020 - Packer 1.7.6 - PhantomJS 2.1.1 - Podman 3.3.1 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- Pulumi 3.13.2 +- Pulumi 3.14.0 - R 4.1.1 - Skopeo 1.3.0 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 - Terraform 1.0.8 - yamllint 1.26.3 -- yq 4.13.3 +- yq 4.13.4 - zstd 1.5.0 (homebrew) ### CLI Tools - Alibaba Cloud CLI 3.0.94 -- AWS CLI 2.2.43 +- AWS CLI 2.2.44 - AWS CLI Session manager plugin 1.2.245.0 - AWS SAM CLI 1.33.0 - Azure CLI (azure-cli) 2.28.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.20.0 - GitHub CLI 2.0.0 -- Google Cloud SDK 359.0.0 (apt source repository: https://packages.cloud.google.com/apt) +- Google Cloud SDK 360.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 6.9.28 +- Netlify CLI 6.10.4 - OpenShift CLI 4.8.13 - ORAS CLI 0.12.0 - Vercel CLI 23.1.2 @@ -128,13 +128,13 @@ | Tool | Version | | -------- | ------------- | | PHP | 7.4.24 8.0.11 | -| Composer | 2.1.8 | +| Composer | 2.1.9 | | PHPUnit | 8.5.21 | ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ``` ### Haskell -- Cabal 3.6.0.0 +- Cabal 3.4.1.0 - GHC 9.0.1 - GHCup 0.1.17.2 - Stack 2.7.3 @@ -154,9 +154,9 @@ - Rustfmt 1.4.37 ### Browsers and Drivers -- Google Chrome 94.0.4606.71 +- Google Chrome 94.0.4606.81 - ChromeDriver 94.0.4606.61 -- Mozilla Firefox 92.0 +- Mozilla Firefox 93.0 - Geckodriver 0.30.0 - Chromium 94.0.4606.0 @@ -183,14 +183,14 @@ ``` #### MS SQL Server Client Tools - sqlcmd 17.8.0001.1 -- SqlPackage 15.0.5084.2 +- SqlPackage 15.0.5282.3 ### Cached Tools #### Go - 1.14.15 - 1.15.15 -- 1.16.8 -- 1.17.1 +- 1.16.9 +- 1.17.2 #### Node.js - 10.24.1 @@ -221,8 +221,8 @@ | --------------- | ----------------------------------- | ------------ | | GOROOT_1_14_X64 | /opt/hostedtoolcache/go/1.14.15/x64 | x64 | | GOROOT_1_15_X64 | /opt/hostedtoolcache/go/1.15.15/x64 | x64 | -| GOROOT_1_16_X64 | /opt/hostedtoolcache/go/1.16.8/x64 | x64 | -| GOROOT_1_17_X64 | /opt/hostedtoolcache/go/1.17.1/x64 | x64 | +| GOROOT_1_16_X64 | /opt/hostedtoolcache/go/1.16.9/x64 | x64 | +| GOROOT_1_17_X64 | /opt/hostedtoolcache/go/1.17.2/x64 | x64 | ### PowerShell Tools - PowerShell 7.1.4 @@ -275,21 +275,22 @@ | alpine:3.12 | sha256:a296b4c6f6ee2b88f095b61e95c7ef4f51ba25598835b4978c9256d8c8ace48a | 2021-08-31 | | alpine:3.13 | sha256:2582893dec6f12fd499d3a709477f2c0c0c1dfcd28024c93f1f0626b9e3540c8 | 2021-08-31 | | alpine:3.14 | sha256:e1c082e3d3c45cccac829840a25941e679c25d438cc8412c2fa221cf1a824e6a | 2021-08-27 | -| buildpack-deps:bullseye | sha256:e54ae211c5b7f7bef56152bd3004a28989c31d88a6a12e104ba91e715194af2a | 2021-09-28 | -| buildpack-deps:buster | sha256:df00248c216c6ee635cfe9ab3ef070aadd0a58d5ac3da08ed2e4273d4800e54d | 2021-09-28 | +| buildpack-deps:bullseye | sha256:781dbad21bcc644af42ec465c2adbf6d9470b256755a13b2a2eadadf331cdaf9 | 2021-09-28 | +| buildpack-deps:buster | sha256:4ab33f2a6712321207d5736d6899841e03d3cc26d50fb7489b0e4a48bf42a1d0 | 2021-09-28 | | buildpack-deps:stretch | sha256:57d5d14748554b31c75a2e95e63c51e8cdfb24393e33c1431982123b7d0c2280 | 2021-09-28 | -| debian:10 | sha256:9b0a8c03b28d4fd2b57cc44e4a3d06b01d4237c8874015a1749837d517c38612 | 2021-09-28 | -| debian:11 | sha256:86dddd82dddf445aea3d2ea26af46cebd727bf2f47ed810fa1450a0d79722d55 | 2021-09-28 | +| debian:10 | sha256:e5cfab8012b17d80f93a7f567797b0c8a2839069d4f50e499152162152518663 | 2021-09-28 | +| debian:11 | sha256:b6a47ddbc1de53e0024d19908f5ef7b3d870686f1234fdb2d19770e097db1575 | 2021-09-28 | | debian:9 | sha256:c1274c24446b98394e1594ceefac1012e1b39b752586ca993fe3c3bea6f6d20f | 2021-09-28 | +| moby/buildkit:latest | sha256:94bc3a93cfa5197064cfdc86e4289cead7b46a2bc95874f142fbf51c67ad2826 | 2021-10-04 | | node:10 | sha256:59531d2835edd5161c8f9512f9e095b1836f7a1fcb0ab73e005ec46047384911 | 2021-04-10 | | node:10-alpine | sha256:dc98dac24efd4254f75976c40bce46944697a110d06ce7fa47e7268470cf2e28 | 2021-04-14 | | node:12 | sha256:86afd89e91d667a65b37e05659974ccd702b8e3b1aff30416d1f77cf67729e2b | 2021-09-28 | | node:12-alpine | sha256:1ea5900145028957ec0e7b7e590ac677797fa8962ccec4e73188092f7bc14da5 | 2021-08-31 | | node:14 | sha256:167d0a4af6b4e0d0769086b871a36c25faed75b72705144cabbda70466cc0d8e | 2021-09-29 | -| node:14-alpine | sha256:1fdf68e175b39915e740da73269970b0a0a881c497865bc7b5accb9bd83a7811 | 2021-09-29 | +| node:14-alpine | sha256:6e52e0b3bedfb494496488514d18bee7fd503fd4e44289ea012ad02f8f41a312 | 2021-09-29 | | ubuntu:16.04 | sha256:454054f5bbd571b088db25b662099c6c7b3f0cb78536a2077d54adc48f00cd68 | 2021-08-31 | -| ubuntu:18.04 | sha256:d501bde46939f19cb83d6fc604f8d0cda403683e8aa9765f5f0f271de3025279 | 2021-10-01 | -| ubuntu:20.04 | sha256:44ab2c3b26363823dcb965498ab06abf74a1e6af20a732902250743df0d4172d | 2021-10-01 | +| ubuntu:18.04 | sha256:bfb4cabd667790ead5c95d9fe341937f0c21118fa79bc768d51c5da9d1dbe917 | 2021-10-01 | +| ubuntu:20.04 | sha256:a0d9e826ab87bd665cfc640598a871b748b4b70a01a4f3d174d4fb02adad07a9 | 2021-10-01 | ### Installed apt packages | Name | Version | @@ -361,7 +362,7 @@ | texinfo | 6.7.0.dfsg.2-5 | | time | 1.7-25.1build1 | | tk | 8.6.9+1 | -| tzdata | 2021a-0ubuntu0.20.04 | +| tzdata | 2021a-2ubuntu0.20.04 | | unzip | 6.0-25ubuntu1 | | upx | 3.95-2build1 | | wget | 1.20.3-1ubuntu1 | From 15ec3a848d3f317fd17d01d287fe3042a8270aba Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 14 Oct 2021 09:08:19 +0000 Subject: [PATCH 0616/3485] Updating readme file for ubuntu18 version 20211011.1 (#4250) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/linux/Ubuntu1804-README.md | 61 ++++++++++++++++--------------- 1 file changed, 31 insertions(+), 30 deletions(-) diff --git a/images/linux/Ubuntu1804-README.md b/images/linux/Ubuntu1804-README.md index 8fdc47733e6a..cfe0f41f50e5 100644 --- a/images/linux/Ubuntu1804-README.md +++ b/images/linux/Ubuntu1804-README.md @@ -4,7 +4,7 @@ *** # Ubuntu 18.04.6 LTS - Linux kernel version: 5.4.0-1059-azure -- Image Version: 20211004.1 +- Image Version: 20211011.1 ## Installed Software ### Language and Runtime @@ -29,14 +29,14 @@ ### Package Management - cpan 1.64 - Helm 3.7.0 -- Homebrew 3.2.14 +- Homebrew 3.2.15 - Miniconda 4.10.3 - Npm 6.14.15 - Pip 9.0.1 - Pip3 9.0.1 - Pipx 0.16.4 - RubyGems 2.7.6 -- Vcpkg (build from master \<2a31089>) +- Vcpkg (build from master \<973a7d5>) - Yarn 1.22.15 #### Environment variables @@ -60,18 +60,18 @@ - Bicep 0.4.613 - Buildah 1.19.6 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - CMake 3.21.3 -- CodeQL Action Bundle 2.6.2 +- CodeQL Action Bundle 2.6.3 - Docker Compose v1 1.29.2 - Docker Compose v2 2.0.0 - Docker-Buildx 0.6.0 -- Docker-Moby Client 20.10.8+azure -- Docker-Moby Server 20.10.8+azure +- Docker-Moby Client 20.10.9+azure-1 +- Docker-Moby Server 20.10.9+azure-1 - Git 2.33.0 (apt source repository: ppa:git-core/ppa) - Git LFS 2.13.3 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.3.1 - Haveged 1.9.1 - Heroku 7.59.0 -- HHVM (HipHop VM) 4.129.0 +- HHVM (HipHop VM) 4.130.0 - jq 1.5 - Kind 0.11.1 - Kubectl 1.22.2 @@ -81,32 +81,32 @@ - Mercurial 4.5.3 - Minikube 1.23.2 - Newman 5.3.0 -- nvm 0.38.0 +- nvm 0.39.0 - OpenSSL 1.1.1 11 Sep 2018 - Packer 1.7.6 - PhantomJS 2.1.1 - Podman 3.0.1 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- Pulumi 3.13.2 +- Pulumi 3.14.0 - R 4.1.1 - Skopeo 1.2.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 - SVN 1.9.7 - Terraform 1.0.8 - yamllint 1.26.3 -- yq 4.13.3 +- yq 4.13.4 - zstd 1.5.0 (homebrew) ### CLI Tools - Alibaba Cloud CLI 3.0.94 -- AWS CLI 1.20.53 +- AWS CLI 1.20.58 - AWS CLI Session manager plugin 1.2.245.0 - AWS SAM CLI 1.33.0 - Azure CLI (azure-cli) 2.28.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.20.0 - GitHub CLI 2.0.0 -- Google Cloud SDK 359.0.0 (apt source repository: https://packages.cloud.google.com/apt) +- Google Cloud SDK 360.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 6.9.28 +- Netlify CLI 6.10.4 - OpenShift CLI 4.8.13 - ORAS CLI 0.12.0 - Vercel CLI 23.1.2 @@ -122,13 +122,13 @@ | Tool | Version | | -------- | ---------------------------------- | | PHP | 7.1.33 7.2.34 7.3.31 7.4.24 8.0.11 | -| Composer | 2.1.8 | +| Composer | 2.1.9 | | PHPUnit | 8.5.21 | ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ``` ### Haskell -- Cabal 3.6.0.0 +- Cabal 3.4.1.0 - GHC 9.0.1 - GHCup 0.1.17.2 - Stack 2.7.3 @@ -148,9 +148,9 @@ - Rustfmt 1.4.37 ### Browsers and Drivers -- Google Chrome 94.0.4606.71 +- Google Chrome 94.0.4606.81 - ChromeDriver 94.0.4606.61 -- Mozilla Firefox 92.0 +- Mozilla Firefox 93.0 - Geckodriver 0.30.0 - Chromium 94.0.4606.0 @@ -177,15 +177,15 @@ ``` #### MS SQL Server Client Tools - sqlcmd 17.8.0001.1 -- SqlPackage 15.0.5084.2 +- SqlPackage 15.0.5282.3 ### Cached Tools #### Go - 1.13.15 - 1.14.15 - 1.15.15 -- 1.16.8 -- 1.17.1 +- 1.16.9 +- 1.17.2 #### Node.js - 10.24.1 @@ -217,8 +217,8 @@ | GOROOT_1_13_X64 | /opt/hostedtoolcache/go/1.13.15/x64 | x64 | | GOROOT_1_14_X64 | /opt/hostedtoolcache/go/1.14.15/x64 | x64 | | GOROOT_1_15_X64 | /opt/hostedtoolcache/go/1.15.15/x64 | x64 | -| GOROOT_1_16_X64 | /opt/hostedtoolcache/go/1.16.8/x64 | x64 | -| GOROOT_1_17_X64 | /opt/hostedtoolcache/go/1.17.1/x64 | x64 | +| GOROOT_1_16_X64 | /opt/hostedtoolcache/go/1.16.9/x64 | x64 | +| GOROOT_1_17_X64 | /opt/hostedtoolcache/go/1.17.2/x64 | x64 | ### PowerShell Tools - PowerShell 7.1.4 @@ -269,21 +269,22 @@ | alpine:3.12 | sha256:a296b4c6f6ee2b88f095b61e95c7ef4f51ba25598835b4978c9256d8c8ace48a | 2021-08-31 | | alpine:3.13 | sha256:2582893dec6f12fd499d3a709477f2c0c0c1dfcd28024c93f1f0626b9e3540c8 | 2021-08-31 | | alpine:3.14 | sha256:e1c082e3d3c45cccac829840a25941e679c25d438cc8412c2fa221cf1a824e6a | 2021-08-27 | -| buildpack-deps:bullseye | sha256:e54ae211c5b7f7bef56152bd3004a28989c31d88a6a12e104ba91e715194af2a | 2021-09-28 | -| buildpack-deps:buster | sha256:df00248c216c6ee635cfe9ab3ef070aadd0a58d5ac3da08ed2e4273d4800e54d | 2021-09-28 | +| buildpack-deps:bullseye | sha256:781dbad21bcc644af42ec465c2adbf6d9470b256755a13b2a2eadadf331cdaf9 | 2021-09-28 | +| buildpack-deps:buster | sha256:4ab33f2a6712321207d5736d6899841e03d3cc26d50fb7489b0e4a48bf42a1d0 | 2021-09-28 | | buildpack-deps:stretch | sha256:57d5d14748554b31c75a2e95e63c51e8cdfb24393e33c1431982123b7d0c2280 | 2021-09-28 | -| debian:10 | sha256:9b0a8c03b28d4fd2b57cc44e4a3d06b01d4237c8874015a1749837d517c38612 | 2021-09-28 | -| debian:11 | sha256:86dddd82dddf445aea3d2ea26af46cebd727bf2f47ed810fa1450a0d79722d55 | 2021-09-28 | +| debian:10 | sha256:e5cfab8012b17d80f93a7f567797b0c8a2839069d4f50e499152162152518663 | 2021-09-28 | +| debian:11 | sha256:b6a47ddbc1de53e0024d19908f5ef7b3d870686f1234fdb2d19770e097db1575 | 2021-09-28 | | debian:9 | sha256:c1274c24446b98394e1594ceefac1012e1b39b752586ca993fe3c3bea6f6d20f | 2021-09-28 | +| moby/buildkit:latest | sha256:94bc3a93cfa5197064cfdc86e4289cead7b46a2bc95874f142fbf51c67ad2826 | 2021-10-04 | | node:10 | sha256:59531d2835edd5161c8f9512f9e095b1836f7a1fcb0ab73e005ec46047384911 | 2021-04-10 | | node:10-alpine | sha256:dc98dac24efd4254f75976c40bce46944697a110d06ce7fa47e7268470cf2e28 | 2021-04-14 | | node:12 | sha256:86afd89e91d667a65b37e05659974ccd702b8e3b1aff30416d1f77cf67729e2b | 2021-09-28 | | node:12-alpine | sha256:1ea5900145028957ec0e7b7e590ac677797fa8962ccec4e73188092f7bc14da5 | 2021-08-31 | | node:14 | sha256:167d0a4af6b4e0d0769086b871a36c25faed75b72705144cabbda70466cc0d8e | 2021-09-29 | -| node:14-alpine | sha256:1fdf68e175b39915e740da73269970b0a0a881c497865bc7b5accb9bd83a7811 | 2021-09-29 | +| node:14-alpine | sha256:6e52e0b3bedfb494496488514d18bee7fd503fd4e44289ea012ad02f8f41a312 | 2021-09-29 | | ubuntu:16.04 | sha256:454054f5bbd571b088db25b662099c6c7b3f0cb78536a2077d54adc48f00cd68 | 2021-08-31 | -| ubuntu:18.04 | sha256:d501bde46939f19cb83d6fc604f8d0cda403683e8aa9765f5f0f271de3025279 | 2021-10-01 | -| ubuntu:20.04 | sha256:44ab2c3b26363823dcb965498ab06abf74a1e6af20a732902250743df0d4172d | 2021-10-01 | +| ubuntu:18.04 | sha256:bfb4cabd667790ead5c95d9fe341937f0c21118fa79bc768d51c5da9d1dbe917 | 2021-10-01 | +| ubuntu:20.04 | sha256:a0d9e826ab87bd665cfc640598a871b748b4b70a01a4f3d174d4fb02adad07a9 | 2021-10-01 | ### Installed apt packages | Name | Version | @@ -353,7 +354,7 @@ | texinfo | 6.5.0.dfsg.1-2 | | time | 1.7-25.1build1 | | tk | 8.6.0+9 | -| tzdata | 2021a-0ubuntu0.18.04 | +| tzdata | 2021a-2ubuntu0.18.04 | | unzip | 6.0-21ubuntu1.1 | | upx | 3.94-4 | | wget | 1.19.4-1ubuntu2.2 | From a660d071712bebf73aa82d7980d4539f78186b8a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 14 Oct 2021 10:21:43 +0000 Subject: [PATCH 0617/3485] Updating readme file for win22 version 20211011.0 (#4259) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/win/Windows2022-Readme.md | 38 +++++++++++++++++++------------- 1 file changed, 23 insertions(+), 15 deletions(-) diff --git a/images/win/Windows2022-Readme.md b/images/win/Windows2022-Readme.md index 109fd564dcdf..abc6796b21e6 100644 --- a/images/win/Windows2022-Readme.md +++ b/images/win/Windows2022-Readme.md @@ -4,7 +4,7 @@ *** # Microsoft Windows Server 2022 Datacenter - OS Version: 10.0.20348 Build 230 -- Image Version: 20211003.1 +- Image Version: 20211011.0 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -12,10 +12,10 @@ ## Installed Software ### Language and Runtime - Bash 4.4.23(1)-release -- Go 1.16.8 +- Go 1.16.9 - Julia 1.6.3 - Kotlin 1.5.31 -- LLVM 12.0.1 +- LLVM 13.0.0 - Node 14.18.0 - PHP 8.0.10 - Python 3.9.7 @@ -23,14 +23,14 @@ ### Package Management - Chocolatey 0.11.2 -- Composer 2.1.8 -- Helm 3.6.3 +- Composer 2.1.9 +- Helm 3.7.0 - NPM 6.14.15 - NuGet 5.11.0.10 - pip 21.2.4 (python 3.9) - Pipx 0.16.4 - RubyGems 3.2.22 -- Vcpkg (build from master \<2a31089>) +- Vcpkg (build from master \<973a7d5>) - Yarn 1.22.15 #### Environment variables @@ -41,7 +41,7 @@ ### Project Management - Ant 1.10.11 - Gradle 7.2 -- Maven 3.8.2 +- Maven 3.8.3 ### Tools - 7zip 19.00 @@ -52,13 +52,13 @@ - Bicep 0.4.613 - Cabal 3.4.0.0 - CMake 3.21.3 -- CodeQL Action Bundle 2.6.2 +- CodeQL Action Bundle 2.6.3 - Docker 20.10.7 - Docker-compose 1.29.2 - ghc 9.0.1 - Git 2.33.0 - Git LFS 2.13.3 -- GVFS 1.0.21085.9 +- GVFS 1.0.21229.1 - jq 1.6 - Kind 0.11.1 - Kubectl 1.22.2 @@ -67,7 +67,7 @@ - Newman 5.3.0 - OpenSSL 1.1.1 - Packer 1.7.5 -- Pulumi v3.13.2 +- Pulumi v3.14.0 - R 4.1.1 - Stack 2.7.3 - Subversion (SVN) 1.14.1 @@ -102,11 +102,11 @@ - Rustfmt 1.4.37 ### Browsers and webdrivers -- Google Chrome 94.0.4606.71 +- Google Chrome 94.0.4606.81 - Chrome Driver 94.0.4606.61 - Microsoft Edge 94.0.992.38 - Microsoft Edge Driver 94.0.992.38 -- Mozilla Firefox 92.0.1 +- Mozilla Firefox 93.0 - Gecko Driver 0.30.0 - IE Driver 3.150.1.1 @@ -144,8 +144,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Version | Architecture | Environment Variable | | ------- | ------------ | -------------------- | | 1.15.15 | x64 | GOROOT_1_15_X64 | -| 1.16.8 (Default) | x64 | GOROOT_1_16_X64 | -| 1.17.1 | x64 | GOROOT_1_17_X64 | +| 1.16.9 (Default) | x64 | GOROOT_1_16_X64 | +| 1.17.2 | x64 | GOROOT_1_17_X64 | #### Node @@ -162,6 +162,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | 3.7.9 | x64 | | 3.8.10 | x64 | | 3.9.7 (Default) | x64 | +| 3.10.0 | x64 | #### Ruby @@ -210,7 +211,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Web Servers | Name | Version | ConfigFile | ServiceName | ServiceStatus | ListenPort | | ------ | ------- | ------------------------------------- | ----------- | ------------- | ---------- | -| Apache | 2.4.49 | C:\tools\Apache24\conf\httpd.conf | Apache | Stopped | 80 | +| Apache | 2.4.51 | C:\tools\Apache24\conf\httpd.conf | Apache | Stopped | 80 | | Nginx | 1.21.3 | C:\tools\nginx-1.21.3\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2022 @@ -320,6 +321,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Component.Unity | 17.0.31709.181 | | Microsoft.VisualStudio.Component.VC.ASAN | 17.0.31709.181 | | Microsoft.VisualStudio.Component.VC.ATL | 17.0.31709.181 | +| Microsoft.VisualStudio.Component.VC.ATL.ARM | 17.0.31709.181 | +| Microsoft.VisualStudio.Component.VC.ATL.ARM64 | 17.0.31709.181 | +| Microsoft.VisualStudio.Component.VC.ATL.ARM64EC | 17.0.31709.181 | | Microsoft.VisualStudio.Component.VC.ATL.Spectre | 17.0.31709.181 | | Microsoft.VisualStudio.Component.VC.ATLMFC | 17.0.31709.181 | | Microsoft.VisualStudio.Component.VC.ATLMFC.Spectre | 17.0.31709.181 | @@ -328,12 +332,16 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Component.VC.CoreIde | 17.0.31709.181 | | Microsoft.VisualStudio.Component.VC.DiagnosticTools | 17.0.31709.181 | | Microsoft.VisualStudio.Component.VC.Llvm.ClangToolset | 17.0.31709.181 | +| Microsoft.VisualStudio.Component.VC.MFC.ARM | 17.0.31709.181 | +| Microsoft.VisualStudio.Component.VC.MFC.ARM64 | 17.0.31709.181 | +| Microsoft.VisualStudio.Component.VC.MFC.ARM64EC | 17.0.31709.181 | | Microsoft.VisualStudio.Component.VC.Redist.14.Latest | 17.0.31709.181 | | Microsoft.VisualStudio.Component.VC.Runtimes.x86.x64.Spectre | 17.0.31709.181 | | Microsoft.VisualStudio.Component.VC.TestAdapterForBoostTest | 17.0.31709.181 | | Microsoft.VisualStudio.Component.VC.TestAdapterForGoogleTest | 17.0.31709.181 | | Microsoft.VisualStudio.Component.VC.Tools.ARM | 17.0.31709.181 | | Microsoft.VisualStudio.Component.VC.Tools.ARM64 | 17.0.31709.181 | +| Microsoft.VisualStudio.Component.VC.Tools.ARM64EC | 17.0.31709.181 | | Microsoft.VisualStudio.Component.VC.Tools.x86.x64 | 17.0.31709.181 | | Microsoft.VisualStudio.Component.VC.v141.ATL | 17.0.31709.181 | | Microsoft.VisualStudio.Component.VC.v141.ATL.Spectre | 17.0.31709.181 | From 66869761deb92b0ec409dcebe8969ff19134ef65 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 14 Oct 2021 10:48:35 +0000 Subject: [PATCH 0618/3485] Updating readme file for macOS-11 version 20211011.3 (#4262) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/macos/macos-11-Readme.md | 51 +++++++++++++++++---------------- 1 file changed, 26 insertions(+), 25 deletions(-) diff --git a/images/macos/macos-11-Readme.md b/images/macos/macos-11-Readme.md index 9d4ea4dcfc90..1f702be43e67 100644 --- a/images/macos/macos-11-Readme.md +++ b/images/macos/macos-11-Readme.md @@ -7,14 +7,14 @@ # macOS 11.6 info - System Version: macOS 11.6 (20G165) - Kernel Version: Darwin 20.6.0 -- Image Version: 20211001.1 +- Image Version: 20211011.3 ## Installed Software ### Language and Runtime - .NET SDK 2.1.302 2.1.403 2.1.507 2.1.607 2.1.701 2.1.818 3.1.101 3.1.201 3.1.302 3.1.413 5.0.102 5.0.202 5.0.302 5.0.401 - Bash 3.2.57(1)-release -- Clang/LLVM 12.0.1 is available on `'$(brew --prefix llvm)/bin/clang'` - Clang/LLVM 12.0.5 is default +- Clang/LLVM 13.0.0 is available on `'$(brew --prefix llvm)/bin/clang'` - gcc-9 (Homebrew GCC 9.4.0) 9.4.0 - available by `gcc-9` alias - gcc-10 (Homebrew GCC 10.3.0) 10.3.0 - available by `gcc-10` alias - gcc-11 (Homebrew GCC 11.2.0) 11.2.0 - available by `gcc-11` alias @@ -25,8 +25,8 @@ - julia 1.6.3 - Kotlin 1.5.31-release-548 - MSBuild 16.6.0.15801 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) -- Node.js v14.17.6 -- NVM 0.38.0 +- Node.js v14.18.0 +- NVM 0.39.0 - NVM - Cached node versions: v10.24.1 v12.22.6 v14.18.0 - Perl 5.34.0 - PHP 8.0.11 @@ -35,19 +35,19 @@ - Ruby 2.7.4p191 ### Package Management -- Bundler version 2.2.28 +- Bundler version 2.2.29 - Carthage 0.38.0 - CocoaPods 1.11.2 -- Composer 2.1.8 -- Homebrew 3.2.14 +- Composer 2.1.9 +- Homebrew 3.2.16 - Miniconda 4.10.3 - NPM 6.14.15 - NuGet 5.6.0.6489 - Pip 20.3.4 (python 2.7) - Pip 21.2.4 (python 3.9) - Pipx 0.16.4 -- RubyGems 3.2.28 -- Vcpkg 2021 (build from master \<2a31089>) +- RubyGems 3.2.29 +- Vcpkg 2021 (build from master \) - Yarn 1.22.15 #### Environment variables @@ -58,7 +58,7 @@ ### Project Management - Apache Ant(TM) 1.10.11 -- Apache Maven 3.8.2 +- Apache Maven 3.8.3 - Gradle 7.2 - Sbt 1.5.5 @@ -82,10 +82,10 @@ - mongo v5.0.3 - mongod v5.0.3 - Newman 5.3.0 -- OpenSSL 1.1.1l 24 Aug 2021 `(/usr/local/opt/openssl@1.1 -> /usr/local/Cellar/openssl@1.1/1.1.1l)` +- OpenSSL 1.1.1l 24 Aug 2021 `(/usr/local/opt/openssl@1.1 -> /usr/local/Cellar/openssl@1.1/1.1.1l_1)` - Packer 1.7.6 -- PostgreSQL 13.4 -- psql (PostgreSQL) 13.4 +- PostgreSQL 14.0 +- psql (PostgreSQL) 14.0 - Sox 14.4.2 - Subversion (SVN) 1.14.1 - Switchaudio-osx 1.1.0 @@ -94,19 +94,19 @@ ### Tools - Aliyun CLI 3.0.94 -- App Center CLI 2.10.2 -- AWS CLI 2.2.43 +- App Center CLI 2.10.3 +- AWS CLI 2.2.45 - AWS SAM CLI 1.33.0 - AWS Session Manager CLI 1.2.245.0 -- Azure CLI 2.28.0 +- Azure CLI 2.28.1 - Bicep CLI 0.4.613 -- Cabal 3.6.1.0 +- Cabal 3.4.1.0 - Cmake 3.21.3 - Fastlane 2.195.0 - GHC 9.0.1 - GHCup 0.1.17.2 - Stack 2.7.3 -- SwiftFormat 0.48.11 +- SwiftFormat 0.48.15 - Swig 4.0.2 - Xcode Command Line Tools 13.0.0.0.1.1630607135 @@ -117,11 +117,11 @@ ### Browsers - Safari 14.1.2 (16611.3.10.1.6) - SafariDriver 14.1.2 (16611.3.10.1.6) -- Google Chrome 94.0.4606.71 +- Google Chrome 94.0.4606.81 - ChromeDriver 94.0.4606.61 -- Microsoft Edge 94.0.992.37 +- Microsoft Edge 94.0.992.38 - MSEdgeDriver 94.0.992.38 -- Mozilla Firefox 92.0.1 +- Mozilla Firefox 93.0 - geckodriver 0.30.0 #### Environment variables @@ -150,6 +150,7 @@ - 3.7.12 - 3.8.12 - 3.9.7 +- 3.10.0 #### PyPy - 2.7.18 [PyPy 7.3.5] @@ -162,8 +163,8 @@ #### Go - 1.15.15 -- 1.16.8 -- 1.17.1 +- 1.16.9 +- 1.17.2 ### Rust Tools - Cargo 1.55.0 @@ -193,7 +194,7 @@ ### Web Servers | Name | Version | ConfigFile | ServiceStatus | ListenPort | | ----- | ------- | ------------------------------- | ------------- | ---------- | -| httpd | 2.4.49 | /usr/local/etc/httpd/httpd.conf | stopped | 80 | +| httpd | 2.4.51 | /usr/local/etc/httpd/httpd.conf | stopped | 80 | | nginx | 1.21.3 | /usr/local/etc/nginx/nginx.conf | stopped | 80 | ### Xamarin @@ -221,8 +222,8 @@ ### Xcode | Version | Build | Path | | ---------------- | -------- | --------------------------------- | -| 13.0 | 13A233 | /Applications/Xcode_13.0.app | | 13.0 (beta) | 13A5212g | /Applications/Xcode_13.0_beta.app | +| 13.0 | 13A233 | /Applications/Xcode_13.0.app | | 12.5.1 (default) | 12E507 | /Applications/Xcode_12.5.1.app | | 12.5 | 12E262 | /Applications/Xcode_12.5.app | | 12.4 | 12D4e | /Applications/Xcode_12.4.app | From 3ec2449adecb6e9d05b23e16ff7dc8266396f9c7 Mon Sep 17 00:00:00 2001 From: Dibir Magomedsaygitov <61747324+dibir-magomedsaygitov@users.noreply.github.com> Date: Thu, 14 Oct 2021 14:37:56 +0300 Subject: [PATCH 0619/3485] set xcode 13.0 as default and remove xcode 12.5 (#4258) --- images/macos/toolsets/toolset-11.json | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index a3eca16b6099..fa24efbe7782 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -1,12 +1,11 @@ { "xcode": { - "default": "12.5.1", + "default": "13.0", "versions": [ - { "link": "13.0", "version": "13.0.0"}, - { "link": "13.0_beta", "version": "13 beta 5", "skip-symlink": "true"}, - { "link": "12.5.1", "version": "12.5.1"}, - { "link": "12.5", "version": "12.5.0"}, - { "link": "12.4", "version": "12.4.0"}, + { "link": "13.0", "version": "13.0.0" }, + { "link": "13.0_beta", "version": "13 beta 5", "skip-symlink": "true" }, + { "link": "12.5.1", "version": "12.5.1" }, + { "link": "12.4", "version": "12.4.0" }, { "link": "11.7", "version": "11.7.0", "symlinks": ["11.7_beta"] } ] }, From 64937b994499a4586077159653f24e975746bb14 Mon Sep 17 00:00:00 2001 From: Nikita Bykov <49442273+nikita-bykov@users.noreply.github.com> Date: Thu, 14 Oct 2021 14:42:34 +0300 Subject: [PATCH 0620/3485] [macOS] Add GOROOT env variables (#4220) --- images/macos/helpers/Common.Helpers.psm1 | 17 +++++- .../macos/helpers/SoftwareReport.Helpers.psm1 | 58 +++++++++++++++++++ .../provision/core/configure-toolset.ps1 | 47 +++++++++++++++ images/macos/provision/core/toolset.ps1 | 8 +-- .../SoftwareReport.Toolcache.psm1 | 19 ++++-- images/macos/templates/macOS-10.14.json | 5 +- images/macos/templates/macOS-10.15.json | 5 +- images/macos/templates/macOS-11.json | 5 +- images/macos/templates/macOS-12.json | 5 +- images/macos/toolsets/toolset-10.14.json | 1 + images/macos/toolsets/toolset-10.15.json | 1 + images/macos/toolsets/toolset-11.json | 1 + images/macos/toolsets/toolset-12.json | 1 + 13 files changed, 155 insertions(+), 18 deletions(-) create mode 100644 images/macos/provision/core/configure-toolset.ps1 diff --git a/images/macos/helpers/Common.Helpers.psm1 b/images/macos/helpers/Common.Helpers.psm1 index 50ed849d71a3..1d42cb0d8b41 100644 --- a/images/macos/helpers/Common.Helpers.psm1 +++ b/images/macos/helpers/Common.Helpers.psm1 @@ -104,8 +104,7 @@ function Invoke-ValidateCommand { return $output } -function Start-DownloadWithRetry -{ +function Start-DownloadWithRetry { Param ( [Parameter(Mandatory)] @@ -147,4 +146,16 @@ function Start-DownloadWithRetry } return $filePath -} \ No newline at end of file +} + +function Add-EnvironmentVariable { + param + ( + [Parameter(Mandatory)] [string] $Name, + [Parameter(Mandatory)] [string] $Value, + [string] $FilePath = "${env:HOME}/.bashrc" + ) + + $envVar = "export {0}={1}" -f $Name, $Value + Add-Content -Path $FilePath -Value $envVar +} diff --git a/images/macos/helpers/SoftwareReport.Helpers.psm1 b/images/macos/helpers/SoftwareReport.Helpers.psm1 index b996f64b87c8..0f8b9abcddf1 100644 --- a/images/macos/helpers/SoftwareReport.Helpers.psm1 +++ b/images/macos/helpers/SoftwareReport.Helpers.psm1 @@ -59,4 +59,62 @@ function Get-BrewPackageVersion { $packageVersion = $Matches.Version return $packageVersion +} + +function Get-CachedToolInstances { + <# + .SYNOPSIS + Returns hashtable of installed cached tools. + + .DESCRIPTION + Return hashtable that contains versions and architectures for the selected cached tool. + + .PARAMETER Name + Name of cached tool. + + .PARAMETER VersionCommand + Optional parameter. Command to return version of system default tool. + + .EXAMPLE + Get-CachedToolInstances -Name "Python" -VersionCommand "--version" + + #> + + param + ( + [String] $Name, + [String] $VersionCommand + ) + + $toolInstances = @() + $toolPath = Join-Path -Path $env:AGENT_TOOLSDIRECTORY -ChildPath $Name + + # Get all installed versions from TOOLSDIRECTORY folder + $versions = Get-ChildItem $toolPath | Sort-Object { [System.Version]$_.Name } + foreach ($version in $versions) { + $instanceInfo = @{} + + # Create instance hashtable + [string]$instanceInfo.Path = Join-Path -Path $toolPath -ChildPath $version.Name + [string]$instanceInfo.Version = $version.Name + + # Get all architectures for current version + [array]$instanceInfo.Architecture_Array = Get-ChildItem $version.FullName -Name -Directory | Where-Object { $_ -match "^x[0-9]{2}$" } + [string]$instanceInfo.Architecture = $instanceInfo.Architecture_Array -Join ", " + + # Add (default) postfix to version name, in case if current version is in environment path + if (-not ([string]::IsNullOrEmpty($VersionCommand))) { + $defaultVersion = $(& ($Name.ToLower()) $VersionCommand 2>&1) + $defaultToolVersion = $defaultVersion | Select-String -Pattern "\d+\.\d+\.\d+" -AllMatches ` + | ForEach-Object { $_.Matches.Value } + + if ([version]$version.Name -eq [version]$defaultToolVersion) { + $instanceInfo.Version += " (Default)" + } + } + + $toolInstances += $instanceInfo + } + + return $toolInstances } \ No newline at end of file diff --git a/images/macos/provision/core/configure-toolset.ps1 b/images/macos/provision/core/configure-toolset.ps1 new file mode 100644 index 000000000000..d569eee6903f --- /dev/null +++ b/images/macos/provision/core/configure-toolset.ps1 @@ -0,0 +1,47 @@ +################################################################################ +## File: Configure-Toolset.ps1 +## Team: CI-Build +## Desc: Configure toolset +################################################################################ + +Import-Module "~/image-generation/helpers/Common.Helpers.psm1" + +function Get-ToolsetToolFullPath +{ + param + ( + [Parameter(Mandatory)] [string] $ToolName, + [Parameter(Mandatory)] [string] $ToolVersion, + [Parameter(Mandatory)] [string] $ToolArchitecture + ) + + $toolPath = Join-Path -Path $env:AGENT_TOOLSDIRECTORY -ChildPath $toolName + $toolPathVersion = Join-Path -Path $toolPath -ChildPath $toolVersion + $foundVersion = Get-Item $toolPathVersion | Sort-Object -Property {[version]$_.name} -Descending | Select-Object -First 1 + $installationDir = Join-Path -Path $foundVersion -ChildPath $toolArchitecture + return $installationDir +} + +$toolcache = Get-ToolsetValue "toolcache" + +foreach ($tool in $toolcache) +{ + $toolName = $tool.name + $toolArch = $tool.arch + $toolEnvironment = $tool.variable_template + + if (-not $toolEnvironment) + { + continue + } + + foreach ($toolVersion in $tool.versions) + { + Write-Host "Set $toolName $toolVersion environment variable..." + $toolPath = Get-ToolsetToolFullPath -ToolName $toolName -ToolVersion $toolVersion -ToolArchitecture $toolArch + $envName = $toolEnvironment -f $toolVersion.split(".") + + # Add environment variable name=value + Add-EnvironmentVariable -Name $envName -Value $toolPath + } +} diff --git a/images/macos/provision/core/toolset.ps1 b/images/macos/provision/core/toolset.ps1 index c9ebc5250dc7..e2c4efe8f7d8 100644 --- a/images/macos/provision/core/toolset.ps1 +++ b/images/macos/provision/core/toolset.ps1 @@ -6,12 +6,6 @@ Import-Module "~/image-generation/helpers/Tests.Helpers.psm1" Import-Module "~/image-generation/helpers/Common.Helpers.psm1" -Function Get-ToolcacheFromToolset { - $toolsetPath = Join-Path $env:HOME "image-generation" "toolset.json" - $toolsetJson = Get-Content -Raw $toolsetPath | ConvertFrom-Json - return $toolsetJson.toolcache -} - Function Install-Asset { param( [Parameter(Mandatory=$true)] @@ -36,7 +30,7 @@ Function Install-Asset { # Get toolcache content from toolset $toolsToInstall = @("Python", "Node", "Go") -$tools = Get-ToolcacheFromToolset | Where-Object {$ToolsToInstall -contains $_.Name} +$tools = Get-ToolsetValue "toolcache" | Where-Object {$toolsToInstall -contains $_.Name} foreach ($tool in $tools) { # Get versions manifest for current tool diff --git a/images/macos/software-report/SoftwareReport.Toolcache.psm1 b/images/macos/software-report/SoftwareReport.Toolcache.psm1 index 344807dbcf0b..a31746cf7e8e 100644 --- a/images/macos/software-report/SoftwareReport.Toolcache.psm1 +++ b/images/macos/software-report/SoftwareReport.Toolcache.psm1 @@ -28,9 +28,20 @@ function Get-ToolcacheNodeVersions { return Get-ChildItem $toolcachePath -Name | Sort-Object { [Version]$_ } } -function Get-ToolcacheGoVersions { - $toolcachePath = Join-Path $env:HOME "hostedtoolcache" "Go" - return Get-ChildItem $toolcachePath -Name | Sort-Object { [Version]$_ } +function Get-ToolcacheGoTable { + $ToolInstances = Get-CachedToolInstances -Name "Go" -VersionCommand "version" + foreach ($Instance in $ToolInstances) { + $Version = [System.Version]($Instance.Version -Split(" "))[0] + $Instance."Environment Variable" = "GOROOT_$($Version.major)_$($Version.minor)_X64" + } + + $Content = $ToolInstances | New-MDTable -Columns ([ordered]@{ + Version = "left"; + Architecture = "left"; + "Environment Variable" = "left" + }) + + return $Content } function Build-ToolcacheSection { @@ -47,7 +58,7 @@ function Build-ToolcacheSection { $output += New-MDHeader "Node.js" -Level 4 $output += New-MDList -Lines (Get-ToolcacheNodeVersions) -Style Unordered $output += New-MDHeader "Go" -Level 4 - $output += New-MDList -Lines (Get-ToolcacheGoVersions) -Style Unordered + $output += Get-ToolcacheGoTable } return $output diff --git a/images/macos/templates/macOS-10.14.json b/images/macos/templates/macOS-10.14.json index 6316bf328e70..3b17fda0934c 100644 --- a/images/macos/templates/macOS-10.14.json +++ b/images/macos/templates/macOS-10.14.json @@ -192,7 +192,10 @@ { "type": "shell", "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} pwsh -f {{ .Path }}", - "scripts": "./provision/core/toolset.ps1" + "scripts": [ + "./provision/core/toolset.ps1", + "./provision/core/configure-toolset.ps1" + ] }, { "type": "shell", diff --git a/images/macos/templates/macOS-10.15.json b/images/macos/templates/macOS-10.15.json index 9bdd785aa24c..6c07559e3c15 100644 --- a/images/macos/templates/macOS-10.15.json +++ b/images/macos/templates/macOS-10.15.json @@ -195,7 +195,10 @@ { "type": "shell", "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} pwsh -f {{ .Path }}", - "scripts": "./provision/core/toolset.ps1" + "scripts": [ + "./provision/core/toolset.ps1", + "./provision/core/configure-toolset.ps1" + ] }, { "type": "shell", diff --git a/images/macos/templates/macOS-11.json b/images/macos/templates/macOS-11.json index a1a87f424c12..b564327a37b7 100644 --- a/images/macos/templates/macOS-11.json +++ b/images/macos/templates/macOS-11.json @@ -198,7 +198,10 @@ { "type": "shell", "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} pwsh -f {{ .Path }}", - "scripts": "./provision/core/toolset.ps1" + "scripts": [ + "./provision/core/toolset.ps1", + "./provision/core/configure-toolset.ps1" + ] }, { "type": "shell", diff --git a/images/macos/templates/macOS-12.json b/images/macos/templates/macOS-12.json index 3b6ae18354e1..596bc460d511 100644 --- a/images/macos/templates/macOS-12.json +++ b/images/macos/templates/macOS-12.json @@ -193,7 +193,10 @@ { "type": "shell", "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} pwsh -f {{ .Path }}", - "scripts": "./provision/core/toolset.ps1" + "scripts": [ + "./provision/core/toolset.ps1", + "./provision/core/configure-toolset.ps1" + ] }, { "type": "shell", diff --git a/images/macos/toolsets/toolset-10.14.json b/images/macos/toolsets/toolset-10.14.json index ff45ea7bafca..b6ae1155dc34 100644 --- a/images/macos/toolsets/toolset-10.14.json +++ b/images/macos/toolsets/toolset-10.14.json @@ -331,6 +331,7 @@ "url" : "https://raw.githubusercontent.com/actions/go-versions/main/versions-manifest.json", "arch": "x64", "platform" : "darwin", + "variable_template" : "GOROOT_{0}_{1}_X64", "versions": [ "1.13.*", "1.14.*", diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index ba1b63ec0c86..1764687bd31d 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -283,6 +283,7 @@ "url" : "https://raw.githubusercontent.com/actions/go-versions/main/versions-manifest.json", "arch": "x64", "platform" : "darwin", + "variable_template" : "GOROOT_{0}_{1}_X64", "versions": [ "1.13.*", "1.14.*", diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index fa24efbe7782..d5997a0b727c 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -227,6 +227,7 @@ "url" : "https://raw.githubusercontent.com/actions/go-versions/main/versions-manifest.json", "arch": "x64", "platform" : "darwin", + "variable_template" : "GOROOT_{0}_{1}_X64", "versions": [ "1.15.*", "1.16.*", diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index 14cb184ef1cf..82ddeda55c88 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -132,6 +132,7 @@ "url" : "https://raw.githubusercontent.com/actions/go-versions/main/versions-manifest.json", "arch": "x64", "platform" : "darwin", + "variable_template" : "GOROOT_{0}_{1}_X64", "versions": [ "1.15.*", "1.16.*", From 5690fb5b41628468394a0c009686f8de653c3ccc Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 14 Oct 2021 13:22:07 +0000 Subject: [PATCH 0621/3485] Updating readme file for win19 version 20211011.0 (#4261) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/win/Windows2019-Readme.md | 56 +++++++++++++++++--------------- 1 file changed, 29 insertions(+), 27 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index 6db557a7b158..70b5785f179a 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 2183 -- Image Version: 20211003.2 +- Image Version: 20211011.0 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -15,7 +15,7 @@ - Go 1.15.15 - Julia 1.6.3 - Kotlin 1.5.31 -- LLVM 12.0.1 +- LLVM 13.0.0 - Node 14.18.0 - Perl 5.32.1 - PHP 8.0.10 @@ -24,15 +24,15 @@ ### Package Management - Chocolatey 0.11.2 -- Composer 2.1.8 -- Helm 3.6.3 +- Composer 2.1.9 +- Helm 3.7.0 - Miniconda 4.10.3 (pre-installed on the image but not added to PATH) - NPM 6.14.15 - NuGet 5.11.0.10 - pip 21.2.4 (python 3.7) - Pipx 0.16.4 - RubyGems 2.7.6.3 -- Vcpkg (build from master \<2a31089>) +- Vcpkg (build from master \<1d4128f>) - Yarn 1.22.15 #### Environment variables @@ -44,7 +44,7 @@ ### Project Management - Ant 1.10.11 - Gradle 7.2 -- Maven 3.8.2 +- Maven 3.8.3 - sbt 1.5.5 ### Tools @@ -56,14 +56,14 @@ - Bicep 0.4.613 - Cabal 3.4.0.0 - CMake 3.21.3 -- CodeQL Action Bundle 2.6.2 +- CodeQL Action Bundle 2.6.3 - Docker 20.10.7 - Docker-compose 1.29.2 - ghc 9.0.1 - Git 2.33.0 - Git LFS 2.13.3 -- Google Cloud SDK 359.0.0 -- GVFS 1.0.21085.9 +- Google Cloud SDK 360.0.0 +- GVFS 1.0.21229.1 - InnoSetup 6.2.0 - jq 1.6 - Kind 0.11.1 @@ -74,7 +74,7 @@ - NSIS v3.06.1 - OpenSSL 1.1.1 - Packer 1.7.5 -- Pulumi v3.13.2 +- Pulumi v3.14.0 - R 4.1.1 - Stack 2.7.3 - Subversion (SVN) 1.14.1 @@ -110,11 +110,11 @@ - Rustfmt 1.4.37 ### Browsers and webdrivers -- Google Chrome 94.0.4606.71 +- Google Chrome 94.0.4606.81 - Chrome Driver 94.0.4606.61 - Microsoft Edge 94.0.992.38 - Microsoft Edge Driver 94.0.992.38 -- Mozilla Firefox 92.0.1 +- Mozilla Firefox 93.0 - Gecko Driver 0.30.0 - IE Driver 3.150.1.1 @@ -157,8 +157,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | 1.13.15 | x64 | GOROOT_1_13_X64 | | 1.14.15 | x64 | GOROOT_1_14_X64 | | 1.15.15 (Default) | x64 | GOROOT_1_15_X64 | -| 1.16.8 | x64 | GOROOT_1_16_X64 | -| 1.17.1 | x64 | GOROOT_1_17_X64 | +| 1.16.9 | x64 | GOROOT_1_16_X64 | +| 1.17.2 | x64 | GOROOT_1_17_X64 | #### Node @@ -178,6 +178,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | 3.7.9 (Default) | x64, x86 | | 3.8.10 | x64, x86 | | 3.9.7 | x64, x86 | +| 3.10.0 | x64 | #### Ruby @@ -230,19 +231,19 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Web Servers | Name | Version | ConfigFile | ServiceName | ServiceStatus | ListenPort | | ------ | ------- | ------------------------------------- | ----------- | ------------- | ---------- | -| Apache | 2.4.49 | C:\tools\Apache24\conf\httpd.conf | Apache | Stopped | 80 | +| Apache | 2.4.51 | C:\tools\Apache24\conf\httpd.conf | Apache | Stopped | 80 | | Nginx | 1.21.3 | C:\tools\nginx-1.21.3\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2019 | Name | Version | Path | | ----------------------------- | --------------- | -------------------------------------------------------------- | -| Visual Studio Enterprise 2019 | 16.11.31702.278 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | +| Visual Studio Enterprise 2019 | 16.11.31727.386 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | #### Workloads, components and extensions: | Package | Version | | ------------------------------------------------------------------------- | --------------- | -| Component.Android.NDK.R16B | 16.11.31627.206 | +| Component.Android.NDK.R16B | 16.11.31727.140 | | Component.Android.SDK25.Private | 16.0.28625.61 | | Component.Android.SDK30 | 16.10.31205.252 | | Component.Ant | 1.9.3.8 | @@ -421,6 +422,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Component.Windows10SDK.18362 | 16.1.28829.92 | | Microsoft.VisualStudio.Component.Windows10SDK.19041 | 16.10.31205.252 | | Microsoft.VisualStudio.Component.Windows10SDK.20348 | 16.11.31603.221 | +| Microsoft.VisualStudio.Component.Windows11SDK.22000 | 16.11.31727.170 | | Microsoft.VisualStudio.Component.WinXP | 16.10.31205.252 | | Microsoft.VisualStudio.Component.Workflow | 16.0.28315.86 | | Microsoft.VisualStudio.ComponentGroup.ArchitectureTools.Native | 16.0.28621.142 | @@ -450,8 +452,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Workload.ManagedDesktop | 16.10.31303.231 | | Microsoft.VisualStudio.Workload.ManagedGame | 16.10.31205.180 | | Microsoft.VisualStudio.Workload.NativeCrossPlat | 16.10.31205.180 | -| Microsoft.VisualStudio.Workload.NativeDesktop | 16.10.31205.180 | -| Microsoft.VisualStudio.Workload.NativeGame | 16.10.31205.180 | +| Microsoft.VisualStudio.Workload.NativeDesktop | 16.11.31727.170 | +| Microsoft.VisualStudio.Workload.NativeGame | 16.11.31727.170 | | Microsoft.VisualStudio.Workload.NativeMobile | 16.10.31205.180 | | Microsoft.VisualStudio.Workload.NetCoreTools | 16.10.31303.231 | | Microsoft.VisualStudio.Workload.NetCrossPlat | 16.10.31205.180 | @@ -459,7 +461,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Workload.Node | 16.10.31205.180 | | Microsoft.VisualStudio.Workload.Office | 16.10.31205.180 | | Microsoft.VisualStudio.Workload.Python | 16.10.31303.231 | -| Microsoft.VisualStudio.Workload.Universal | 16.10.31205.180 | +| Microsoft.VisualStudio.Workload.Universal | 16.11.31727.170 | | Microsoft.VisualStudio.Workload.VisualStudioExtension | 16.10.31205.180 | | ms-biztalk.BizTalk | 3.13.2.0 | | ProBITools.MicrosoftAnalysisServicesModelingProjects | 2.9.18 | @@ -468,7 +470,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | VisualStudioClient.MicrosoftVisualStudio2017InstallerProjects | 1.0.0 | | Windows Driver Kit | 10.0.21381.0 | | Windows Driver Kit Visual Studio Extension | 10.1.22000.1 | -| Windows Software Development Kit Extension | 10.1.22000.1 | +| Windows Software Development Kit Extension | 10.1.22000.194 | | WIX Toolset | 3.11.4516 | | WIX Toolset Studio 2019 Extension | 1.0.0.4 | @@ -484,12 +486,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.29.30133 | -| Microsoft Visual C++ 2019 Debug Runtime | x64 | 14.29.30133 | -| Microsoft Visual C++ 2019 Minimum Runtime | x64 | 14.29.30133 | -| Microsoft Visual C++ 2019 Additional Runtime | x86 | 14.29.30133 | -| Microsoft Visual C++ 2019 Debug Runtime | x86 | 14.29.30133 | -| Microsoft Visual C++ 2019 Minimum Runtime | x86 | 14.29.30133 | +| Microsoft Visual C++ 2019 Additional Runtime | x64 | 14.29.30135 | +| Microsoft Visual C++ 2019 Debug Runtime | x64 | 14.29.30135 | +| Microsoft Visual C++ 2019 Minimum Runtime | x64 | 14.29.30135 | +| Microsoft Visual C++ 2019 Additional Runtime | x86 | 14.29.30135 | +| Microsoft Visual C++ 2019 Debug Runtime | x86 | 14.29.30135 | +| Microsoft Visual C++ 2019 Minimum Runtime | x86 | 14.29.30135 | ### .NET Core SDK `Location C:\Program Files\dotnet\sdk` From 7e90162def4d94656df794fc7116102f0a219707 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Thu, 14 Oct 2021 16:27:30 +0300 Subject: [PATCH 0622/3485] [Windows] revert PR3766 (#4278) --- images/win/scripts/Installers/Install-Git.ps1 | 10 ---------- .../SoftwareReport/SoftwareReport.Generator.ps1 | 1 - .../scripts/SoftwareReport/SoftwareReport.Tools.psm1 | 5 ----- images/win/scripts/Tests/Git.Tests.ps1 | 6 ------ 4 files changed, 22 deletions(-) diff --git a/images/win/scripts/Installers/Install-Git.ps1 b/images/win/scripts/Installers/Install-Git.ps1 index 4f543f5b2080..f48daf620612 100644 --- a/images/win/scripts/Installers/Install-Git.ps1 +++ b/images/win/scripts/Installers/Install-Git.ps1 @@ -9,16 +9,6 @@ Choco-Install -PackageName git -ArgumentList '--installargs="/VERYSILENT /NOREST # Install hub Choco-Install -PackageName hub -# Install GVFS -$url = "https://api.github.com/repos/microsoft/VFSForGit/releases/latest" -[System.String] $gvfsLatest = (Invoke-RestMethod -Uri $url).assets.browser_download_url -match "SetupGVFS.+\.exe$" -$gvfsInstallerPath = Start-DownloadWithRetry -Url $gvfsLatest -Name "SetupGVFS.exe" - -# Start-Process waits on the entire process tree but Wait-Process only waits on the initiating process(GVFS.Service.UI.exe) -$env:GVFS_UNATTENDED = "1" -$argList = "/VERYSILENT", "/NORESTART", "/NOCANCEL", "/SP-", "/CLOSEAPPLICATIONS", "/RESTARTAPPLICATIONS", "/SUPPRESSMSGBOXES" -Start-Process $gvfsInstallerPath -ArgumentList $argList -PassThru | Wait-Process - # Disable GCM machine-wide [Environment]::SetEnvironmentVariable("GCM_INTERACTIVE", "Never", [System.EnvironmentVariableTarget]::Machine) diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index 608adaa239eb..6d5e8afa9422 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -104,7 +104,6 @@ $toolsList = @( (Get-GHCVersion), (Get-GitVersion), (Get-GitLFSVersion), - (Get-GVFSVersion), (Get-InnoSetupVersion), (Get-JQVersion), (Get-KindVersion), diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 index 3c465142a77c..ee47d5021c82 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 @@ -73,11 +73,6 @@ function Get-GitLFSVersion { return "Git LFS $gitLfsVersion" } -function Get-GVFSVersion { - $gvfsVersion = (Get-Command gvfs).Version - return "GVFS $gvfsVersion" -} - function Get-InnoSetupVersion { return $(choco list --local-only innosetup) | Select-String -Pattern "InnoSetup" } diff --git a/images/win/scripts/Tests/Git.Tests.ps1 b/images/win/scripts/Tests/Git.Tests.ps1 index b9d6a8e0aa42..9b71aa0b806b 100644 --- a/images/win/scripts/Tests/Git.Tests.ps1 +++ b/images/win/scripts/Tests/Git.Tests.ps1 @@ -23,9 +23,3 @@ Describe "Git" { $env:GCM_INTERACTIVE | Should -BeExactly Never } } - -Describe "GVFS" { - It "GVFS is installed" { - "gvfs --version" | Should -ReturnZeroExitCode - } -} From 7c1a240d2bc5031aa1220ef0cdcafe13e0303a82 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 14 Oct 2021 14:43:58 +0000 Subject: [PATCH 0623/3485] Updating readme file for win16 version 20211011.0 (#4260) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/win/Windows2016-Readme.md | 39 ++++++++++++++++---------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/images/win/Windows2016-Readme.md b/images/win/Windows2016-Readme.md index 2367e63f619f..d877b956e78d 100644 --- a/images/win/Windows2016-Readme.md +++ b/images/win/Windows2016-Readme.md @@ -4,7 +4,7 @@ *** # Microsoft Windows Server 2016 Datacenter - OS Version: 10.0.14393 Build 4651 -- Image Version: 20211003.1 +- Image Version: 20211011.0 ## Installed Software ### Language and Runtime @@ -12,7 +12,7 @@ - Go 1.15.15 - Julia 1.6.3 - Kotlin 1.5.31 -- LLVM 12.0.1 +- LLVM 13.0.0 - Node 14.18.0 - Perl 5.32.1 - PHP 8.0.10 @@ -21,15 +21,15 @@ ### Package Management - Chocolatey 0.11.2 -- Composer 2.1.8 -- Helm 3.6.3 +- Composer 2.1.9 +- Helm 3.7.0 - Miniconda 4.10.3 (pre-installed on the image but not added to PATH) - NPM 6.14.15 - NuGet 5.11.0.10 - pip 21.2.4 (python 3.7) - Pipx 0.16.4 - RubyGems 2.7.6.3 -- Vcpkg (build from master \<2a31089>) +- Vcpkg (build from master \<1d4128f>) - Yarn 1.22.15 #### Environment variables @@ -41,7 +41,7 @@ ### Project Management - Ant 1.10.11 - Gradle 7.2 -- Maven 3.8.2 +- Maven 3.8.3 - sbt 1.5.5 ### Tools @@ -53,14 +53,14 @@ - Bicep 0.4.613 - Cabal 3.4.0.0 - CMake 3.21.3 -- CodeQL Action Bundle 2.6.2 +- CodeQL Action Bundle 2.6.3 - Docker 20.10.7 - Docker-compose 1.29.2 - ghc 9.0.1 - Git 2.33.0 - Git LFS 2.13.3 -- Google Cloud SDK 359.0.0 -- GVFS 1.0.21085.9 +- Google Cloud SDK 360.0.0 +- GVFS 1.0.21229.1 - InnoSetup 6.2.0 - jq 1.6 - Kind 0.11.1 @@ -71,7 +71,7 @@ - NSIS v3.06.1 - OpenSSL 1.1.1 - Packer 1.7.5 -- Pulumi v3.13.2 +- Pulumi v3.14.0 - R 4.1.1 - Stack 2.7.3 - Subversion (SVN) 1.14.1 @@ -107,11 +107,11 @@ - Rustfmt 1.4.37 ### Browsers and webdrivers -- Google Chrome 94.0.4606.71 +- Google Chrome 94.0.4606.81 - Chrome Driver 94.0.4606.61 - Microsoft Edge 94.0.992.38 - Microsoft Edge Driver 94.0.992.38 -- Mozilla Firefox 92.0.1 +- Mozilla Firefox 93.0 - Gecko Driver 0.30.0 - IE Driver 3.150.1.1 @@ -151,8 +151,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | 1.13.15 | x64 | GOROOT_1_13_X64 | | 1.14.15 | x64 | GOROOT_1_14_X64 | | 1.15.15 (Default) | x64 | GOROOT_1_15_X64 | -| 1.16.8 | x64 | GOROOT_1_16_X64 | -| 1.17.1 | x64 | GOROOT_1_17_X64 | +| 1.16.9 | x64 | GOROOT_1_16_X64 | +| 1.17.2 | x64 | GOROOT_1_17_X64 | #### Node @@ -172,6 +172,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | 3.7.9 (Default) | x64, x86 | | 3.8.10 | x64, x86 | | 3.9.7 | x64, x86 | +| 3.10.0 | x64 | #### Ruby @@ -224,7 +225,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Web Servers | Name | Version | ConfigFile | ServiceName | ServiceStatus | ListenPort | | ------ | ------- | ------------------------------------- | ----------- | ------------- | ---------- | -| Apache | 2.4.49 | C:\tools\Apache24\conf\httpd.conf | Apache | Stopped | 80 | +| Apache | 2.4.51 | C:\tools\Apache24\conf\httpd.conf | Apache | Stopped | 80 | | Nginx | 1.21.3 | C:\tools\nginx-1.21.3\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2017 @@ -492,10 +493,10 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft Visual C++ 2013 Minimum Runtime | x86 | 12.0.21005 | | Microsoft Visual C++ 2017 Debug Runtime | x64 | 14.16.27033 | | Microsoft Visual C++ 2017 Debug Runtime | x86 | 14.16.27033 | -| Microsoft Visual C++ 2019 Additional Runtime | x64 | 14.29.30133 | -| Microsoft Visual C++ 2019 Minimum Runtime | x64 | 14.29.30133 | -| Microsoft Visual C++ 2019 Additional Runtime | x86 | 14.29.30133 | -| Microsoft Visual C++ 2019 Minimum Runtime | x86 | 14.29.30133 | +| Microsoft Visual C++ 2019 Additional Runtime | x64 | 14.29.30135 | +| Microsoft Visual C++ 2019 Minimum Runtime | x64 | 14.29.30135 | +| Microsoft Visual C++ 2019 Additional Runtime | x86 | 14.29.30135 | +| Microsoft Visual C++ 2019 Minimum Runtime | x86 | 14.29.30135 | ### .NET Core SDK `Location C:\Program Files\dotnet\sdk` From e6679307f9a1ab79c67e14d6e6ae923cf4f345dd Mon Sep 17 00:00:00 2001 From: Dibir Magomedsaygitov <61747324+dibir-magomedsaygitov@users.noreply.github.com> Date: Fri, 15 Oct 2021 11:36:47 +0300 Subject: [PATCH 0624/3485] [Windows] Pin Selenium to 3.141.59 version (#4276) --- images/win/scripts/Installers/Install-Selenium.ps1 | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/images/win/scripts/Installers/Install-Selenium.ps1 b/images/win/scripts/Installers/Install-Selenium.ps1 index 437e32dfe4c8..af19dcd148e2 100644 --- a/images/win/scripts/Installers/Install-Selenium.ps1 +++ b/images/win/scripts/Installers/Install-Selenium.ps1 @@ -9,11 +9,12 @@ $seleniumFileName = "selenium-server-standalone.jar" New-Item -ItemType directory -Path $seleniumDirectory -# Download Selenium -$url = "https://api.github.com/repos/SeleniumHQ/selenium/releases/latest" -[System.String] $seleniumReleaseUrl = (Invoke-RestMethod -Uri $url).assets.browser_download_url -match "selenium-server-standalone-.+.jar" +# Temporarily download Selenium 3.141.59, since 4.* can contain some breaking changes +#$url = "https://api.github.com/repos/SeleniumHQ/selenium/releases" +#[System.String] $seleniumReleaseUrl = (Invoke-RestMethod -Uri $url).assets.browser_download_url -match "selenium-server-standalone-.+.jar" -Start-DownloadWithRetry -Url $seleniumReleaseUrl -Name $seleniumFileName -DownloadPath $seleniumDirectory +$seleniumDownloadUrl = "https://github.com/SeleniumHQ/selenium/releases/download/selenium-3.141.59/selenium-server-standalone-3.141.59.jar" +Start-DownloadWithRetry -Url $seleniumDownloadUrl -Name $seleniumFileName -DownloadPath $seleniumDirectory # Add SELENIUM_JAR_PATH environment variable $seleniumBinPath = Join-Path $seleniumDirectory $seleniumFileName From 12b8bece9189c5fdb8f4d93dcb5097f52d21575d Mon Sep 17 00:00:00 2001 From: Dibir Magomedsaygitov <61747324+dibir-magomedsaygitov@users.noreply.github.com> Date: Fri, 15 Oct 2021 11:40:54 +0300 Subject: [PATCH 0625/3485] [Ubuntu] Pin Selenium to 3.141.59 version (#4279) --- images/linux/scripts/installers/selenium.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/images/linux/scripts/installers/selenium.sh b/images/linux/scripts/installers/selenium.sh index 7f3e65cb080f..f43b7b87cb6c 100644 --- a/images/linux/scripts/installers/selenium.sh +++ b/images/linux/scripts/installers/selenium.sh @@ -7,12 +7,13 @@ # Source the helpers for use with the script source $HELPER_SCRIPTS/install.sh -# Download selenium standalone server +# Temporarily download Selenium 3.141.59, since 4.* can contain some breaking changes SELENIUM_JAR_NAME="selenium-server-standalone.jar" SELENIUM_JAR_PATH="/usr/share/java" -SELENIUM_LATEST_VERSION_URL="$(curl -s https://api.github.com/repos/SeleniumHQ/selenium/releases/latest |\ - jq -r '.assets[].browser_download_url | select(contains("selenium-server-standalone") and endswith(".jar"))')" -download_with_retries $SELENIUM_LATEST_VERSION_URL $SELENIUM_JAR_PATH $SELENIUM_JAR_NAME +SELENIUM_DOWNLOAD_URL="https://github.com/SeleniumHQ/selenium/releases/download/selenium-3.141.59/selenium-server-standalone-3.141.59.jar" +#SELENIUM_LATEST_VERSION_URL="$(curl -s https://api.github.com/repos/SeleniumHQ/selenium/releases/latest |\ +# jq -r '.assets[].browser_download_url | select(contains("selenium-server-standalone") and endswith(".jar"))')" +download_with_retries $SELENIUM_DOWNLOAD_URL $SELENIUM_JAR_PATH $SELENIUM_JAR_NAME # Add SELENIUM_JAR_PATH environment variable echo "SELENIUM_JAR_PATH=$SELENIUM_JAR_PATH/$SELENIUM_JAR_NAME" | tee -a /etc/environment From b5373b2c298445a5f7615923a89531c1eac569f5 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Fri, 15 Oct 2021 14:32:29 +0300 Subject: [PATCH 0626/3485] Anka Software Updates (#4256) * Anka Software Updates * allow to set up video contoller --- images.CI/macos/anka/Anka.Helpers.psm1 | 218 ++++++++++++ .../macos/anka/CreateCleanAnkaTemplate.ps1 | 179 ++++++++++ images.CI/macos/anka/Service.Helpers.psm1 | 315 ++++++++++++++++++ .../configuration/CreateCleanAnkaTemplate.ps1 | 228 ------------- 4 files changed, 712 insertions(+), 228 deletions(-) create mode 100644 images.CI/macos/anka/Anka.Helpers.psm1 create mode 100644 images.CI/macos/anka/CreateCleanAnkaTemplate.ps1 create mode 100644 images.CI/macos/anka/Service.Helpers.psm1 delete mode 100644 images/macos/provision/configuration/CreateCleanAnkaTemplate.ps1 diff --git a/images.CI/macos/anka/Anka.Helpers.psm1 b/images.CI/macos/anka/Anka.Helpers.psm1 new file mode 100644 index 000000000000..56fc54c0251a --- /dev/null +++ b/images.CI/macos/anka/Anka.Helpers.psm1 @@ -0,0 +1,218 @@ +function Push-AnkaTemplateToRegistry { + param ( + [Parameter(Mandatory)] + [ValidateNotNullOrEmpty()] + [string] $RegistryUrl, + + [Parameter(Mandatory)] + [ValidateNotNullOrEmpty()] + [string] $TagVersion, + + [Parameter(Mandatory)] + [ValidateNotNullOrEmpty()] + [string] $TemplateName + ) + + $command = "anka registry -a $RegistryUrl push -t $TagVersion $TemplateName" + Invoke-AnkaCommand -Command $command +} + +function Get-AnkaVM { + param( + [string] $VMName + ) + + $command = "anka --machine-readable list" + if (-not [string]::IsNullOrEmpty($VMName)) { + $command = "anka --machine-readable show $VMName" + } + Invoke-AnkaCommand -Command $command | ConvertFrom-Json | Foreach-Object body +} + +function Get-AnkaVMStatus { + param( + [Parameter(Mandatory)] + [ValidateNotNullOrEmpty()] + [string] $VMName + ) + + $command = "anka --machine-readable list $VMName" + Invoke-AnkaCommand -Command $command | ConvertFrom-Json | Foreach-Object { $_.body.status } +} + +function Get-AnkaVMIPAddress { + param( + [Parameter(Mandatory)] + [ValidateNotNullOrEmpty()] + [string] $VMName + ) + + Get-AnkaVM -VMName $VMName | Foreach-Object ip +} + +function Invoke-AnkaCommand { + param ( + [Parameter(Mandatory)] + [ValidateNotNullOrEmpty()] + [string] $Command + ) + + $result = bash -c "$Command 2>&1" | Out-String + if ($LASTEXITCODE -ne 0) { + Write-Error "There is an error during command execution:`n$result" + exit 1 + } + $result +} + +function New-AnkaVMTemplate { + param ( + [Parameter(Mandatory)] + [ValidateNotNullOrEmpty()] + [string] $InstallerPath, + + [Parameter(Mandatory)] + [ValidateNotNullOrEmpty()] + [string] $TemplateName, + + [Parameter(Mandatory)] + [ValidateNotNullOrEmpty()] + [string] $TemplateUsername, + + [Parameter(Mandatory)] + [ValidateNotNullOrEmpty()] + [string] $TemplatePassword, + + [Parameter(Mandatory)] + [int] $CPUCount, + + [Parameter(Mandatory)] + [int] $RamSizeGb, + + [Parameter(Mandatory)] + [int] $DiskSizeGb + ) + + $env:ANKA_DEFAULT_USER = $TemplateUsername + $env:ANKA_DEFAULT_PASSWD = $TemplatePassword + $env:ANKA_CREATE_SUSPEND = 0 + $command = "anka create --cpu-count '$CPUCount' --ram-size '${RamSizeGb}G' --disk-size '${DiskSizeGb}G' --app '$InstallerPath' $TemplateName" + Invoke-AnkaCommand -Command $command +} + +function Remove-AnkaVM { + param( + [Parameter(Mandatory)] + [ValidateNotNullOrEmpty()] + [string] $VMName + ) + + $command = "anka delete $VMName --yes" + $isTemplateExists = Get-AnkaVM | Where-Object name -eq $VMName + if ($isTemplateExists) { + $null = Invoke-AnkaCommand -Command $command + } +} + +function Set-AnkaVMVideoController { + param( + [Parameter(Mandatory)] + [ValidateNotNullOrEmpty()] + [string] $VMName, + + [Parameter(Mandatory)] + [ValidateNotNullOrEmpty()] + [string] $ShortMacOSVersion, + + [ValidateSet("fbuf", "pg")] + [string] $Controller = "pg" + ) + + $command = "anka modify $VMName set display -c $Controller" + # Apple Metal is available starting from Big Sur + if (-not $ShortMacOSVersion.StartsWith("10.")) { + $null = Invoke-AnkaCommand -Command $command + } +} + +function Set-AnkaVMDisplayResolution { + param ( + [Parameter(Mandatory)] + [ValidateNotNullOrEmpty()] + [string] $VMName, + + [Parameter(Mandatory)] + [ValidateNotNullOrEmpty()] + [string] $DisplayResolution + ) + + $command = "anka modify $VMName set display -r $DisplayResolution" + $null = Invoke-AnkaCommand -Command $command +} + +function Start-AnkaVM { + param( + [Parameter(Mandatory)] + [ValidateNotNullOrEmpty()] + [string] $VMName + ) + + $command = "anka start $VMName" + $vmStatus = Get-AnkaVMStatus -VMName $VMName + if ($vmStatus -eq "stopped") { + $null = Invoke-AnkaCommand -Command $command + } +} + +function Stop-AnkaVM { + param( + [Parameter(Mandatory)] + [ValidateNotNullOrEmpty()] + [string] $VMName + ) + + $command = "anka stop $VMName" + $vmStatus = Get-AnkaVMStatus -VMName $VMName + if ($vmStatus -eq "running") { + $null = Invoke-AnkaCommand -Command $command + } +} + +function Wait-AnkaVMIPAddress { + param( + [Parameter(Mandatory)] + [ValidateNotNullOrEmpty()] + [string] $VMName, + + [int] $RetryCount = 20, + [int] $Seconds = 60 + ) + + $condition = { Get-AnkaVMIPAddress -VMName $VMName } + $null = Invoke-WithRetry -BreakCondition $condition -RetryCount $RetryCount -Seconds $Seconds +} + +function Wait-AnkaVMSSHService { + param ( + [Parameter(Mandatory)] + [ValidateNotNullOrEmpty()] + [string] $VMName, + + [int] $RetryCount = 20, + [int] $Seconds = 60 + ) + + Start-Sleep -Seconds $Seconds + Write-Host "`t[*] Waiting for '$VMName' VM to get an IP address" + Wait-AnkaVMIPAddress -VMName $VMName -RetryCount $RetryCount -Seconds $Seconds + + $ipAddress = Get-AnkaVMIPAddress -VMName $VMName + Write-Host "`t[*] The '$ipAddress' IP address for '$VMName' VM" + + Write-Host "`t[*] Checking if SSH on a port is open" + $isSSHPortOpen = Test-SSHPort -IPAddress $ipAddress + if (-not $isSSHPortOpen) { + Write-Host "`t[x] SSH port is closed" + exit 1 + } +} diff --git a/images.CI/macos/anka/CreateCleanAnkaTemplate.ps1 b/images.CI/macos/anka/CreateCleanAnkaTemplate.ps1 new file mode 100644 index 000000000000..2be1d965a3be --- /dev/null +++ b/images.CI/macos/anka/CreateCleanAnkaTemplate.ps1 @@ -0,0 +1,179 @@ +[CmdletBinding()] +param( + [Parameter(Mandatory)] + [ValidateNotNullOrEmpty()] + [version] $MacOSVersion, + + [ValidateNotNullOrEmpty()] + [string] $TemplateUsername, + + [Parameter(Mandatory)] + [ValidateNotNullOrEmpty()] + [string] $TemplatePassword, + + [Parameter(Mandatory)] + [ValidateNotNullOrEmpty()] + [string] $RegistryUrl, + + [ValidateNotNullOrEmpty()] + [string] $TemplateName, + + [bool] $DownloadLatestVersion = $true, + [bool] $BetaSearch = $false, + [bool] $InstallSoftwareUpdate = $true, + [bool] $EnableAutoLogon = $true, + [int] $CPUCount = 6, + [int] $RamSizeGb = 7, + [int] $DiskSizeGb = 300, + [string] $DisplayResolution = "1920x1080" +) + +$ErrorActionPreference = "Stop" +$WarningPreference = "SilentlyContinue" + +# Import helper modules +Import-Module "$PSScriptRoot/Anka.Helpers.psm1" +Import-Module "$PSScriptRoot/Service.Helpers.psm1" + +# Helper functions +function Invoke-EnableAutoLogon { + if (-not $EnableAutoLogon) { + Write-Host "`t[*] Skip configuring AutoLogon" + return + } + + $ipAddress = Get-AnkaVMIPAddress -VMName $TemplateName + + Write-Host "`t[*] Enable AutoLogon" + Enable-AutoLogon -HostName $ipAddress -UserName $TemplateUsername -Password $TemplatePassword + + Write-Host "`t[*] Reboot '$TemplateName' VM to enable AutoLogon" + Restart-VMSSH -HostName $ipAddress | Show-StringWithFormat + + Wait-AnkaVMSSHService -VMName $TemplateName -Seconds 30 + + Write-Host "`t[*] Checking if AutoLogon is enabled" + Test-AutoLogon -VMName $TemplateName -UserName $TemplateUsername +} + +function Invoke-SoftwareUpdate { + if (-not $InstallSoftwareUpdate) { + Write-Host "`t[*] Skip installing software updates" + return + } + + $ipAddress = Get-AnkaVMIPAddress -VMName $TemplateName + + # Install Software Updates + # Security updates may not be able to install(hang, freeze) when AutoLogon is turned off + Write-Host "`t[*] Finding available software" + $newUpdates = Get-SoftwareUpdate -HostName $ipAddress + + if (-not $newUpdates) { + Write-Host "`t[*] No Updates Available" + return + } + + Write-Host "`t[*] Fetching Software Updates ready to install on '$TemplateName' VM:" + Show-StringWithFormat $newUpdates + Write-Host "`t[*] Installing Software Updates on 'test_vm' VM:" + Install-SoftwareUpdate -HostName $ipAddress | Show-StringWithFormat + + # Check if Action: restart + if ($newUpdates.Contains("Action: restart")) { + Write-Host "`t[*] Sleep 60 seconds before the software updates have been installed" + Start-Sleep -Seconds 60 + + Write-Host "`t[*] Waiting for loginwindow process" + Wait-LoginWindow -HostName $ipAddress | Show-StringWithFormat + + # Re-enable AutoLogon after installing a new security software update + Invoke-EnableAutoLogon + + # Check software updates have been installed + $updates = Get-SoftwareUpdate -HostName $ipAddress + if ($updates.Contains("Action: restart")) { + Write-Host "`t[x] Software updates failed to install: $updates" + Show-StringWithFormat $updates + exit 1 + } + } + + Write-Host "`t[*] Show the install history:" + $hUpdates = Get-SoftwareUpdateHistory -HostName $ipAddress + Show-StringWithFormat $hUpdates +} + +function Invoke-UpdateSettings { + $isConfRequired = $InstallSoftwareUpdate -or $EnableAutoLogon + if (-not $isConfRequired) { + Write-Host "`t[*] Skip additional configuration" + return + } + + Write-Host "`t[*] Starting '$TemplateName' VM" + Start-AnkaVM -VMName $TemplateName + + Write-Host "`t[*] Waiting for SSH service on '$TemplateName' VM" + Wait-AnkaVMSSHService -VMName $TemplateName -Seconds 30 + + # Configure AutoLogon + Invoke-EnableAutoLogon + + # Install software updates + Invoke-SoftwareUpdate + + Write-Host "`t[*] Stopping '$TemplateName' VM" + Stop-AnkaVM -VMName $TemplateName +} + +function Test-VMStopped { + $vmStatus = Get-AnkaVMStatus -VMName $TemplateName + if ($vmStatus -ne "stopped") { + Write-Host "`t[x] VM '$TemplateName' state is not stopped. The current state is '$vmStatus'" + exit 1 + } +} + +# Password is passed as env-var "SSHPASS" +$env:SSHUSER = $TemplateUsername +$env:SSHPASS = $TemplatePassword + +Write-Host "`n[#1] Download macOS application installer:" +$macOSInstaller = Get-MacOSInstaller -MacOSVersion $MacOSVersion -DownloadLatestVersion $DownloadLatestVersion -BetaSearch $BetaSearch +$shortMacOSVersion = Get-ShortMacOSVersion -MacOSVersion $MacOSVersion +if ([string]::IsNullOrEmpty($TemplateName)) { + $TemplateName = "clean_macos_${shortMacOSVersion}_${DiskSizeGb}gb" +} + +Write-Host "`n[#2] Create a VM template:" +Write-Host "`t[*] Deleting existed template with name '$TemplateName' before creating a new one" +Remove-AnkaVM -VMName $TemplateName + +Write-Host "`t[*] Creating Anka VM template with name '$TemplateName' and '$TemplateUsername' user" +Write-Host "`t[*] CPU Count: $CPUCount, RamSize: ${RamSizeGb}G, DiskSizeGb: ${DiskSizeGb}G, InstallerPath: $macOSInstaller, TemplateName: $TemplateName" +New-AnkaVMTemplate -InstallerPath $macOSInstaller ` + -TemplateName $TemplateName ` + -TemplateUsername $TemplateUsername ` + -TemplatePassword $TemplatePassword ` + -CPUCount $CPUCount ` + -RamSizeGb $RamSizeGb ` + -DiskSizeGb $DiskSizeGb | Show-StringWithFormat + +Write-Host "`n[#3] Configure AutoLogon and/or install software updates:" +Invoke-UpdateSettings + +Write-Host "`n[#4] Finalization '$TemplateName' configuration and push to the registry:" +Write-Host "`t[*] The '$TemplateName' VM status is stopped" +Test-VMStopped + +# Configure graphics settings +Write-Host "`t[*] Enabling Graphics Acceleration with Apple Metal for '$TemplateName' VM" +Set-AnkaVMVideoController -VMName $TemplateName -ShortMacOSVersion $ShortMacOSVersion + +Write-Host "`t[*] Setting screen resolution to $DisplayResolution for $TemplateName" +Set-AnkaVMDisplayResolution -VMName $TemplateName -DisplayResolution $DisplayResolution + +# Push a VM template (and tag) to the Cloud +Write-Host "`t[*] Pushing '$TemplateName' image with '$ShortMacOSVersion' tag to the '$RegistryUrl' registry..." +Push-AnkaTemplateToRegistry -RegistryUrl $registryUrl -TagVersion $shortMacOSVersion -TemplateName $TemplateName diff --git a/images.CI/macos/anka/Service.Helpers.psm1 b/images.CI/macos/anka/Service.Helpers.psm1 new file mode 100644 index 000000000000..fce822d67059 --- /dev/null +++ b/images.CI/macos/anka/Service.Helpers.psm1 @@ -0,0 +1,315 @@ +function Enable-AutoLogon { + param ( + [Parameter(Mandatory)] + [ValidateNotNullOrEmpty()] + [string] $HostName, + + [Parameter(Mandatory)] + [ValidateNotNullOrEmpty()] + [string] $UserName, + + [Parameter(Mandatory)] + [ValidateNotNullOrEmpty()] + [string] $Password + ) + + $url = "https://raw.githubusercontent.com/actions/virtual-environments/main/images/macos/provision/bootstrap-provisioner/kcpassword.py" + $script = Invoke-RestMethod -Uri $url + $base64 = [Convert]::ToBase64String($script.ToCharArray()) + $kcpassword = "echo $base64 | base64 --decode > ~/kcpassword;sudo python ./kcpassword '${Password}';rm ./kcpassword" + $loginwindow = "sudo /usr/bin/defaults write /Library/Preferences/com.apple.loginwindow autoLoginUser '${UserName}';sudo /usr/bin/defaults write /Library/Preferences/com.apple.loginwindow autoLoginUserScreenLocked -bool false" + $command = "${kcpassword};$loginwindow" + Invoke-SSHPassCommand -HostName $HostName -Command $command +} + +function Get-AvailableVersions { + param ( + [bool] $IsBeta = $false + ) + + if ($IsBeta) { + $searchPostfix = " beta" + } + + $command = { /usr/sbin/softwareupdate --list-full-installers | grep "macOS" } + $condition = { $LASTEXITCODE -eq 0 } + $softwareUpdates = Invoke-WithRetry -Command $command -BreakCondition $condition | Where-Object { $_.Contains("Title: macOS") -and $_ -match $searchPostfix } + $allVersions = $softwareUpdates -replace "(\* )?(Title|Version|Size):" | ConvertFrom-Csv -Header OSName, OSVersion | Select-Object OSName, OSVersion -Unique + + $allVersions +} + +function Get-MacOSInstaller { + param ( + [Parameter(Mandatory)] + [version] $MacOSVersion, + + [bool] $DownloadLatestVersion = $false, + [bool] $BetaSearch = $false + ) + + # Enroll machine to DeveloperSeed if we need beta and unenroll otherwise + $seedutil = "/System/Library/PrivateFrameworks/Seeding.framework/Versions/Current/Resources/seedutil" + if ($BetaSearch) { + Write-Host "`t[*] Beta Version requested. Enrolling machine to DeveloperSeed" + sudo $seedutil enroll DeveloperSeed | Out-Null + } else { + Write-Host "`t[*] Reseting the seed before requesting stable versions" + sudo $seedutil unenroll | Out-Null + } + + # Validate there is no softwareupdate at the moment + Test-SoftwareUpdate + + # Validate availability OSVersion + Write-Host "`t[*] Finding available full installers" + $availableVersions = Get-AvailableVersions -IsBeta $BetaSearch + if ($DownloadLatestVersion) { + $shortMacOSVersion = Get-ShortMacOSVersion -MacOSVersion $MacOSVersion + $filterSearch = "${shortMacOSVersion}." + $filteredVersions = $availableVersions.Where{ $_.OSVersion.StartsWith($filterSearch) } + if (-not $filteredVersions) { + Write-Host "`t[x] Failed to find any macOS versions using '$filterSearch' search condition" + Show-StringWithFormat $availableVersions + exit 1 + } + Show-StringWithFormat $filteredVersions + $osVersions = $filteredVersions.OSVersion | Sort-Object {[version]$_} + $MacOSVersion = $osVersions | Select-Object -Last 1 + Write-Host "`t[*] The 'DownloadLatestVersion' flag is set. Latest macOS version is '$MacOSVersion' now" + } + + $macOSName = $availableVersions.Where{ $MacOSVersion -eq $_.OSVersion }.OSName + if (-not $macOSName) { + Write-Host "`t[x] Requested macOS '$MacOSVersion' version not found in the list of available installers. Available versions are:`n$($availableVersions.OSVersion)" + Write-Host "`t[x] Make sure to pass '-BetaSearch `$true' if you need a beta version installer" + exit 1 + } + + $installerPathPattern = "/Applications/Install*${macOSName}.app" + if (Test-Path $installerPathPattern) { + $previousInstallerPath = Get-Item -Path $installerPathPattern + Write-Host "`t[*] Removing '$previousInstallerPath' installation app before downloading the new one" + sudo rm -rf "$previousInstallerPath" + } + + # Download macOS installer + Write-Host "`t[*] Requested macOS '$MacOSVersion' version installer found, fetching it from Apple Software Update" + $result = Invoke-WithRetry { /usr/sbin/softwareupdate --fetch-full-installer --full-installer-version $MacOSVersion } {$LASTEXITCODE -eq 0} | Out-String + if (-not $result.Contains("Install finished successfully")) { + Write-Host "`t[x] Failed to fetch $MacOSVersion macOS `n$result" + exit 1 + } + + $installerPath = (Get-Item -Path $installerPathPattern).FullName + Write-Host "`t[*] Installer successfully downloaded to '$installerPath'" + + $installerPath +} + +function Get-ShortMacOSVersion { + param ( + [Parameter(Mandatory)] + [version] $MacOSVersion + ) + + # Take Major.Minor version for macOS 10 (10.14 or 10.15) and Major for all further versions + $MacOSVersion.Major -eq 10 ? $MacOSVersion.ToString(2) : $MacOSVersion.ToString(1) +} + +function Get-SoftwareUpdate { + param( + [Parameter(Mandatory)] + [ValidateNotNullOrEmpty()] + [string] $HostName + ) + + $command = "/usr/sbin/softwareupdate --list" + $result = Invoke-SSHPassCommand -HostName $HostName -Command $command + $result | Where-Object { $_ -match "(Label|Title):" } | Out-String +} + +function Get-SoftwareUpdateHistory { + param ( + [Parameter(Mandatory)] + [ValidateNotNullOrEmpty()] + [string] $HostName + ) + + $command = "/usr/sbin/softwareupdate --history" + Invoke-SSHPassCommand -HostName $HostName -Command $command | Out-String +} + +function Install-SoftwareUpdate { + param( + [Parameter(Mandatory)] + [ValidateNotNullOrEmpty()] + [string] $HostName + ) + + $command = "sudo /usr/sbin/softwareupdate --all --install --restart --verbose" + Invoke-SSHPassCommand -HostName $HostName -Command $command +} + +function Invoke-SSHPassCommand { + param( + [Parameter(Mandatory)] + [ValidateNotNullOrEmpty()] + [string] $HostName, + + [Parameter(Mandatory)] + [ValidateNotNullOrEmpty()] + [string] $Command, + + [int] $ConnectTimeout = 10, + [int] $ConnectionAttempts = 10, + [int] $ServerAliveInterval = 30 + ) + + $sshArg = @( + "sshpass" + "-e" + "ssh" + "-o UserKnownHostsFile=/dev/null" + "-o StrictHostKeyChecking=no" + "-o ConnectTimeout=$ConnectTimeout" + "-o ConnectionAttempts=$ConnectionAttempts" + "-o LogLevel=ERROR" + "-o ServerAliveInterval=$ServerAliveInterval" + "${env:SSHUSER}@${HostName}" + ) + $sshPassOptions = $sshArg -join " " + bash -c "$sshPassOptions \""$Command\"" 2>&1" +} + +function Invoke-WithRetry { + param( + [scriptblock] $Command, + [scriptblock] $BreakCondition, + [int] $RetryCount = 20, + [int] $Seconds = 60 + ) + + while ($RetryCount -gt 0) { + if ($Command) { + $result = & $Command + } + + if (& $BreakCondition) { + return $result + } + + $RetryCount-- + if ($RetryCount -eq 0) { + Write-Error "No more attempts left: $BreakCondition" + } + Write-Host "`t [/] Waiting $Seconds seconds before retrying. Retries left: $RetryCount" + Start-Sleep -Seconds $Seconds + } + + $result +} + +function Restart-VMSSH { + param( + [Parameter(Mandatory)] + [ValidateNotNullOrEmpty()] + [string] $HostName + ) + + $command = "sudo reboot" + Invoke-SSHPassCommand -HostName $HostName -Command $command +} + +function Show-StringWithFormat { + param( + [Parameter(ValuefromPipeline)] + [object] $string + ) + + process { + ($string | Out-String).Trim().split("`n") | ForEach-Object { Write-Host "`t $_" } + } +} + +function Test-AutoLogon { + param( + [Parameter(Mandatory)] + [ValidateNotNullOrEmpty()] + [string] $VMName, + + [Parameter(Mandatory)] + [ValidateNotNullOrEmpty()] + [string] $UserName + ) + + Invoke-WithRetry -BreakCondition { + # pwsh crashes if it invokes directly + # https://github.com/dotnet/runtime/issues/59059 + $ankaUser = "" | bash -c "anka run $VMName /usr/bin/id -nu" + $UserName -eq $ankaUser + } +} + +function Test-SoftwareUpdate { + param ( + [string] $UpdateProcessName = "softwareupdate" + ) + + $command = { + $updateProcess = (Get-Process -Name $UpdateProcessName -ErrorAction SilentlyContinue).id + if ($updateProcess) { + # Workaround to get commandline param as it doesn't work for macOS atm https://github.com/PowerShell/PowerShell/issues/13943 + $processName = /bin/ps -o command= $updateProcess + Write-Host "`t[*] Another software update process with '$updateProcess' id is in place with the following arguments '$processName'" + } + } + $condition = { + $null -eq (Get-Process -Name $UpdateProcessName -ErrorAction SilentlyContinue) + } + + Invoke-WithRetry -Command $command -BreakCondition $condition +} + +function Test-SSHPort { + param( + [Parameter(Mandatory)] + [ipaddress] $IPAddress, + + [int] $Port = 22, + [int] $Timeout = 2000 + ) + + Invoke-WithRetry -Command {$true} -BreakCondition { + try { + $client = [System.Net.Sockets.TcpClient]::new() + $client.ConnectAsync($IPAddress, $Port).Wait($Timeout) + } + catch { + $false + } + finally { + $client.Close() + } + } +} + +function Wait-LoginWindow { + param ( + [Parameter(Mandatory)] + [ValidateNotNullOrEmpty()] + [string] $HostName, + + [int] $RetryCount = 60, + [int] $Seconds = 60 + ) + + $condition = { + $psCommand = "/bin/ps auxww" + $lw = "/System/Library/CoreServices/loginwindow.app/Contents/MacOS/loginwindow" + $ctk = "/System/Library/Frameworks/CryptoTokenKit.framework/ctkahp.bundle/Contents/MacOS/ctkahp" + $proc = Invoke-SSHPassCommand -HostName $HostName -Command $psCommand | Out-String + $proc.Contains($lw) -and $proc.Contains($ctk) + } + Invoke-WithRetry -RetryCount $RetryCount -Seconds $Seconds -BreakCondition $condition +} diff --git a/images/macos/provision/configuration/CreateCleanAnkaTemplate.ps1 b/images/macos/provision/configuration/CreateCleanAnkaTemplate.ps1 deleted file mode 100644 index c4e6689cc54b..000000000000 --- a/images/macos/provision/configuration/CreateCleanAnkaTemplate.ps1 +++ /dev/null @@ -1,228 +0,0 @@ -[CmdletBinding()] -param( - [Parameter(Mandatory)] - [ValidateNotNullOrEmpty()] - [Version] $MacOSVersion, - - [ValidateNotNullOrEmpty()] - [String] $TemplateUsername, - - [Parameter(Mandatory)] - [ValidateNotNullOrEmpty()] - [String] $TemplatePassword, - - [Parameter(Mandatory)] - [ValidateNotNullOrEmpty()] - [String] $RegistryUrl, - - [Bool] $BetaSearch = $false, - [Int] $CpuCount = 6, - [Int] $RamSizeGb = 7, - [Int] $DiskSizeGb = 300, - [String] $DisplayResolution = "1920x1080" -) - -$ErrorActionPreference = "Stop" - -function Get-MacOSInstallers { - param ( - [version] $MacOSVersion, - [bool] $BetaSearch = $false - ) - - # Enroll machine to DeveloperSeed if we need beta and unenroll otherwise - $seedutil = "/System/Library/PrivateFrameworks/Seeding.framework/Versions/Current/Resources/seedutil" - if ($BetaSearch) { - Write-Host "Beta Version requested. Enrolling machine to DeveloperSeed" - sudo $seedutil enroll DeveloperSeed | Out-Null - } else { - Write-Host "Reseting the seed before requesting stable versions" - sudo $seedutil unenroll | Out-Null - } - - # Validate there is no softwareupdate at the moment - Test-SoftwareUpdate - - # Validate availability OSVersion - $availableVersions = Get-AvailableVersions -IsBeta $BetaSearch - $macOSName = $availableVersions.Where{ $_.OSVersion -eq $MacOSVersion }.OSName - if (-not $macOSName) { - Write-Host "Requested macOS '$MacOSVersion' version not found in the list of available installers. Available versions are:`n$($availableVersions.OSVersion)" - Write-Host 'Make sure to pass "-BetaSearch $true" if you need a beta version installer' - exit 1 - } - - $installerPathPattern = "/Applications/Install*${macOSName}.app" - if (Test-Path $installerPathPattern) { - $previousInstallerPath = Get-Item -Path $installerPathPattern - Write-Host "Removing '$previousInstallerPath' installation app before downloading the new one" - sudo rm -rf "$previousInstallerPath" - } - - # Download macOS installer - Write-Host "Requested macOS '$MacOSVersion' version installer found, fetching it from Apple Software Update" - $result = Invoke-WithRetry { softwareupdate --fetch-full-installer --full-installer-version $MacOSVersion } {$LASTEXITCODE -eq 0} | Out-String - if (-not $result.Contains("Install finished successfully")) { - Write-Host "[Error]: failed to fetch $MacOSVersion macOS '$MacOSVersion' `n$result" - exit 1 - } - - $installerPath = Get-Item -Path $installerPathPattern - Write-Host "Installer successfully downloaded to '$installerPath'" - - return $installerPath.FullName -} - -function Invoke-WithRetry { - param( - [scriptblock] $Command, - [scriptblock] $BreakCondition, - [int] $RetryCount = 20, - [int] $Seconds = 60 - ) - - while ($RetryCount -gt 0) { - $result = & $Command - - if (& $BreakCondition) { - break - } - - $RetryCount-- - Write-Host "Waiting $Seconds seconds before retrying. Retries left: $RetryCount" - Start-Sleep -Seconds $Seconds - } - - $result -} - -function Get-AvailableVersions { - param ( - [Int] $RetryCount = 20, - [Int] $RetryInterval = 60, - [Bool] $IsBeta = $false - ) - - if ($IsBeta) { - $searchPostfix = " beta" - } - - $softwareUpdates = Invoke-WithRetry { softwareupdate --list-full-installers | Where-Object { $_.Contains("Title: macOS") -and $_ -match $searchPostfix } } { {$LASTEXITCODE -eq 0}} - $allVersions = $softwareUpdates -replace "(\* )?(Title|Version|Size):" | ConvertFrom-Csv -Header OsName, OsVersion - - return $allVersions -} - -function Test-SoftwareUpdate { - param ( - [String] $UpdateProcessName = "softwareupdate", - [Int] $RetryCount = 20, - [Int] $RetryInterval = 60 - ) - - $command = { - $updateProcess = (Get-Process -Name $UpdateProcessName -ErrorAction SilentlyContinue).id - if ($updateProcess) { - # Workaround to get commandline param as it doesn't work for macOS atm https://github.com/PowerShell/PowerShell/issues/13943 - $processName = ps -o command= $updateProcess - Write-Host "Another software update process is in place with the following arguments '$processName', wait $RetryInterval seconds, $RetryCount attempts left" - } - } - $condition = { - $null -eq (Get-Process -Name $UpdateProcessName -ErrorAction SilentlyContinue) - } - - Invoke-WithRetry -Command $command -BreakCondition $condition -} - -function New-AnkaVMTemplate { - param ( - [String] $InstallerPath, - [String] $ShortMacOSVersion, - [String] $TemplateName, - [String] $TemplateUsername, - [String] $TemplatePassword, - [Int] $CpuCount, - [Int] $RamSizeGb, - [Int] $DiskSizeGb, - [String] $DisplayResolution - ) - - $isTemplateExists = (Invoke-Anka { anka --machine-readable list } | ConvertFrom-Json).body.name -eq $templateName - if ($isTemplateExists) { - Write-Host "Deleting existed template with name '$templateName' before creating a new one" - Invoke-Anka { anka delete $templateName --yes } - } - - Write-Host "Creating Anka VM template with name '$TemplateName' and user $TemplateUsername" - $env:ANKA_DEFAULT_USER = $TemplateUsername - $env:ANKA_DEFAULT_PASSWD = $TemplatePassword - $env:ANKA_CREATE_SUSPEND = 0 - Write-Host "Cpu Count: $CpuCount, RamSize: ${RamSizeGb}G, DiskSizeGb: ${DiskSizeGb}G, InstallerPath: $InstallerPath, TemplateName: $templateName" - Invoke-Anka { anka create --cpu-count $CpuCount --ram-size "${RamSizeGb}G" --disk-size "${DiskSizeGb}G" --app $InstallerPath $templateName } - - # Apple Metal is available starting from Big Sur - if (-not $ShortMacOSVersion.StartsWith("10.")) { - Write-Host "Enabling Graphics Acceleration with Apple Metal for $templateName" - Invoke-Anka { anka modify $templateName set display -c pg } - } - - Write-Host "Setting screen resolution to $DisplayResolution for $templateName" - Invoke-Anka { anka modify $templateName set display -r $DisplayResolution } - - return $templateName -} - -function Add-AnkaImageToRegistry { - param ( - [String] $RegistryUrl, - [String] $ShortMacOSVersion, - [String] $TemplateName - ) - - Write-Host "Pushing image to the registry..." - Invoke-Anka { anka registry -a $RegistryUrl push -t $ShortMacOSVersion $TemplateName } -} - -function Invoke-Anka { - param ( - [scriptblock] $Cmd - ) - - & $Cmd - if ($LASTEXITCODE -ne 0) { - Write-Error "There is an error during command execution" - exit 1 - } -} - -function Get-ShortMacOSVersion { - param ( - [Version] $MacOSVersion - ) - - # Take Major.Minor version for macOS 10 (10.14 or 10.15) and Major for all further versions - if ($MacOSVersion.Major -eq 10) { - $shortMacOSVersion = $MacOSVersion.ToString(2) - } - else { - $shortMacOSVersion = $MacOSVersion.Major - } - - return $shortMacOSVersion -} - -$macOSInstaller = Get-MacOSInstallers -MacOSVersion $MacOSVersion -BetaSearch $BetaSearch -$shortMacOSVersion = Get-ShortMacOSVersion -MacOSVersion $MacOSVersion -$templateName = "clean_macos_${shortMacOSVersion}_${DiskSizeGb}gb" -New-AnkaVMTemplate -InstallerPath $macOSInstaller ` - -ShortMacOSVersion $shortMacOSVersion ` - -TemplateName $templateName ` - -TemplateUsername $TemplateUsername ` - -TemplatePassword $TemplatePassword ` - -CpuCount $CpuCount ` - -RamSizeGb $RamSizeGb ` - -DiskSizeGb $DiskSizeGb ` - -DisplayResolution $DisplayResolution - -Add-AnkaImageToRegistry -RegistryUrl $registryUrl -ShortMacOSVersion $shortMacOSVersion -TemplateName $templateName \ No newline at end of file From 6f4486a3fe9df528ca6b00eceff30675c2c2ab6b Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Fri, 15 Oct 2021 18:45:50 +0300 Subject: [PATCH 0627/3485] Add windows11.22000 SDK to VS2022 (#4285) --- images/win/toolsets/toolset-2022.json | 1 + 1 file changed, 1 insertion(+) diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index f535b9765f6c..094d85081c61 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -195,6 +195,7 @@ "Microsoft.VisualStudio.Component.VC.ATLMFC.Spectre", "Microsoft.VisualStudio.Component.Windows10SDK.19041", "Microsoft.VisualStudio.Component.Windows10SDK.20348", + "Microsoft.VisualStudio.Component.Windows11SDK.22000", "Microsoft.VisualStudio.Component.Workflow", "Microsoft.VisualStudio.ComponentGroup.Azure.CloudServices", "Microsoft.VisualStudio.ComponentGroup.Azure.ResourceManager.Tools", From 823f2db3252d33946f8b631fda91ab130bc98e79 Mon Sep 17 00:00:00 2001 From: Ralph Jansen Date: Fri, 15 Oct 2021 20:15:42 +0200 Subject: [PATCH 0628/3485] Add Microsoft Graph PowerShell SDK (#4274) --- images/win/toolsets/toolset-2016.json | 3 ++- images/win/toolsets/toolset-2019.json | 3 ++- images/win/toolsets/toolset-2022.json | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/images/win/toolsets/toolset-2016.json b/images/win/toolsets/toolset-2016.json index 7d538d88e018..a6a83bb2375f 100644 --- a/images/win/toolsets/toolset-2016.json +++ b/images/win/toolsets/toolset-2016.json @@ -87,7 +87,8 @@ {"name": "PSScriptAnalyzer"}, {"name": "PSWindowsUpdate"}, {"name": "SqlServer"}, - {"name": "VSSetup"} + {"name": "VSSetup"}, + {"name": "Microsoft.Graph"} ], "azureModules": [ { diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index be490b619a55..3d2d1a2138be 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -87,7 +87,8 @@ {"name": "PSScriptAnalyzer"}, {"name": "PSWindowsUpdate"}, {"name": "SqlServer"}, - {"name": "VSSetup"} + {"name": "VSSetup"}, + {"name": "Microsoft.Graph"} ], "azureModules": [ { diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index 094d85081c61..c728989daa15 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -64,7 +64,8 @@ { "name": "PSScriptAnalyzer" }, { "name": "PSWindowsUpdate" }, { "name": "SqlServer" }, - { "name": "VSSetup" } + { "name": "VSSetup" }, + { "name": "Microsoft.Graph" } ], "azureModules": [ { From 0ebc9a7c16f6ede94382db84116f4cba986441b0 Mon Sep 17 00:00:00 2001 From: Drew Skwiers-Koballa Date: Sun, 17 Oct 2021 00:40:10 -0700 Subject: [PATCH 0629/3485] update dacfx to 18.8 (#4266) --- images/win/scripts/Installers/Install-DACFx.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/win/scripts/Installers/Install-DACFx.ps1 b/images/win/scripts/Installers/Install-DACFx.ps1 index fc0536ae2ba3..86695a559534 100644 --- a/images/win/scripts/Installers/Install-DACFx.ps1 +++ b/images/win/scripts/Installers/Install-DACFx.ps1 @@ -4,7 +4,7 @@ #################################################################################### $InstallerName = "DacFramework.msi" -$InstallerUrl = "https://go.microsoft.com/fwlink/?linkid=2165211" +$InstallerUrl = "https://aka.ms/dacfx-msi" Install-Binary -Url $InstallerUrl -Name $InstallerName From fc586bcfb8db901d2798a4ade7752d3efed0ab09 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Mon, 18 Oct 2021 15:10:02 +0300 Subject: [PATCH 0630/3485] [Windows] pypy: update select condition (#4291) --- images/win/scripts/Installers/Install-PyPy.ps1 | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/images/win/scripts/Installers/Install-PyPy.ps1 b/images/win/scripts/Installers/Install-PyPy.ps1 index 7f5cff226465..8d104b432375 100644 --- a/images/win/scripts/Installers/Install-PyPy.ps1 +++ b/images/win/scripts/Installers/Install-PyPy.ps1 @@ -32,8 +32,7 @@ function Install-PyPy Extract-7Zip -Path $packagePath -DestinationPath $env:Temp # Get Python version from binaries - $pypyApp = Get-ChildItem -Path "$tempFolder\pypy*.exe" | Where-Object Name -match "pypy(\d+)?.exe" - $pypyName = $pypyApp.Name + $pypyApp = Get-ChildItem -Path "$tempFolder\pypy*.exe" | Where-Object Name -match "pypy(\d+)?.exe" | Select-Object -First 1 $pythonVersion = & $pypyApp -c "import sys;print('{}.{}.{}'.format(sys.version_info[0],sys.version_info[1],sys.version_info[2]))" $pypyFullVersion = & $pypyApp -c "import sys;print('{}.{}.{}'.format(*sys.pypy_version_info[0:3]))" @@ -59,7 +58,12 @@ function Install-PyPy Move-Item -Path $tempFolder -Destination $pypyArchPath | Out-Null Write-Host "Install PyPy '${pythonVersion}' in '${pypyArchPath}'" - cmd.exe /c "cd /d $pypyArchPath && mklink python.exe $pypyName && python.exe -m ensurepip && python.exe -m pip install --upgrade pip" + if (Test-Path "$pypyArchPath\python.exe") { + cmd.exe /c "cd /d $pypyArchPath && python.exe -m ensurepip && python.exe -m pip install --upgrade pip" + } else { + $pypyName = $pypyApp.Name + cmd.exe /c "cd /d $pypyArchPath && mklink python.exe $pypyName && python.exe -m ensurepip && python.exe -m pip install --upgrade pip" + } if ($LASTEXITCODE -ne 0) { From 3be6d05f1be1509cac40948609610177c9877d90 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 18 Oct 2021 17:13:13 +0000 Subject: [PATCH 0631/3485] Updating readme file for macOS-10.14 version 20211016.1 (#4290) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/macos/macos-10.14-Readme.md | 126 +++++++++++++++-------------- 1 file changed, 66 insertions(+), 60 deletions(-) diff --git a/images/macos/macos-10.14-Readme.md b/images/macos/macos-10.14-Readme.md index b95685e22486..3e77c7cde4a6 100644 --- a/images/macos/macos-10.14-Readme.md +++ b/images/macos/macos-10.14-Readme.md @@ -1,18 +1,20 @@ | Announcements | |-| +| [[macOS] Xcode 12.5 will be removed from Big Sur on October, 18](https://github.com/actions/virtual-environments/issues/4183) | +| [[macOS] Default Xcode on Big Sur image will be set to Xcode 13.0 on October, 18](https://github.com/actions/virtual-environments/issues/4180) | | [macOS-latest workflows will use macOS-11](https://github.com/actions/virtual-environments/issues/4060) | *** # macOS 10.14 info - System Version: macOS 10.14.6 (18G9323) - Kernel Version: Darwin 18.7.0 -- Image Version: 20210918.1 +- Image Version: 20211016.1 ## Installed Software ### Language and Runtime - .NET SDK 2.1.302 2.1.403 2.1.507 - Bash 3.2.57(1)-release - Clang/LLVM 11.0.0 is default -- Clang/LLVM 12.0.1 is available on `'$(brew --prefix llvm)/bin/clang'` +- Clang/LLVM 13.0.0 is available on `'$(brew --prefix llvm)/bin/clang'` - gcc-9 (Homebrew GCC 9.4.0) 9.4.0 - available by `gcc-9` alias - gcc-10 (Homebrew GCC 10.3.0) 10.3.0 - available by `gcc-10` alias - gcc-11 (Homebrew GCC 11.2.0) 11.2.0 - available by `gcc-11` alias @@ -20,33 +22,33 @@ - GNU Fortran (Homebrew GCC 10.3.0) 10.3.0 - available by `gfortran-10` alias - GNU Fortran (Homebrew GCC 11.2.0) 11.2.0 - available by `gfortran-11` alias - Go 1.15.15 -- julia 1.6.2 -- Kotlin 1.5.30-release-407 +- julia 1.6.3 +- Kotlin 1.5.31-release-548 - MSBuild 15.7.224.30163 (from /Library/Frameworks/Mono.framework/Versions/5.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) - Node.js v8.17.0 -- NVM 0.38.0 -- NVM - Cached node versions: v10.24.1 v12.22.6 v14.17.6 +- NVM 0.39.0 +- NVM - Cached node versions: v10.24.1 v12.22.7 v14.18.1 - Perl 5.34.0 -- PHP 8.0.10 +- PHP 8.0.11 - Python 2.7.18 - Python 3.9.7 - R 4.1.1 - Ruby 2.7.4p191 ### Package Management -- Bundler version 2.2.27 +- Bundler version 2.2.29 - Carthage 0.38.0 - CocoaPods 1.11.2 -- Composer 2.1.8 -- Homebrew 3.2.12 +- Composer 2.1.9 +- Homebrew 3.2.16 - Miniconda 4.10.3 - NPM 3.10.10 - NuGet 4.7.0.5148 - Pip 20.3.4 (python 2.7) - Pip 21.2.4 (python 3.9) - Pipx 0.16.4 -- RubyGems 3.2.27 -- Yarn 1.22.5 +- RubyGems 3.2.29 +- Yarn 1.22.15 #### Environment variables | Name | Value | @@ -56,33 +58,34 @@ ### Project Management - Apache Ant(TM) 1.10.11 -- Apache Maven 3.8.2 +- Apache Maven 3.8.3 - Gradle 7.2 +- Sbt 1.5.5 ### Utilities - 7-Zip 17.04 - aria2 1.36.0 -- azcopy 10.12.1 +- azcopy 10.12.2 - bazel 3.7.1 - bazelisk 1.10.1 - bsdtar 2.8.3 - available by 'tar' alias -- Curl 7.79.0 -- Git LFS: 2.13.3 -- Git: 2.33.0 -- GitHub CLI: 2.0.0 -- GNU parallel 20210822 +- Curl 7.79.1 +- Git LFS: 3.0.1 +- Git: 2.33.1 +- GitHub CLI: 2.1.0 +- GNU parallel 20210922 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.2 - gpg (GnuPG) 2.3.2 -- helm v3.7.0+geeac838 +- helm v3.7.1+g1d11fcb - Hub CLI: 2.14.2 - jq 1.6 -- mongo v5.0.2 -- mongod v5.0.2 -- OpenSSL 1.1.1l 24 Aug 2021 `(/usr/local/opt/openssl -> /usr/local/Cellar/openssl@1.1/1.1.1l)` -- Packer 1.7.5 -- PostgreSQL 13.4 -- psql (PostgreSQL) 13.4 +- mongo v5.0.3 +- mongod v5.0.3 +- OpenSSL 1.1.1l 24 Aug 2021 `(/usr/local/opt/openssl@1.1 -> /usr/local/Cellar/openssl@1.1/1.1.1l_1)` +- Packer 1.7.6 +- PostgreSQL 14.0 +- psql (PostgreSQL) 14.0 - Sox 14.4.2 - Subversion (SVN) 1.14.1 - Switchaudio-osx 1.1.0 @@ -92,20 +95,20 @@ ### Tools -- Aliyun CLI 3.0.90 +- Aliyun CLI 3.0.94 - App Center CLI 1.2.2 -- AWS CLI 2.2.39 -- AWS SAM CLI 1.31.0 +- AWS CLI 2.2.46 +- AWS SAM CLI 1.33.0 - AWS Session Manager CLI 1.2.245.0 -- Azure CLI 2.28.0 -- Bicep CLI 0.4.613 -- Cabal 3.4.0.0 -- Cmake 3.21.2 -- Fastlane 2.194.0 +- Azure CLI 2.29.0 +- Bicep CLI 0.4.1008 +- Cabal 3.4.1.0 +- Cmake 3.21.3 +- Fastlane 2.196.0 - GHC 9.0.1 -- GHCup v0.1.16.2 +- GHCup 0.1.17.2 - Stack 2.7.3 -- SwiftFormat 0.48.11 +- SwiftFormat 0.48.16 - Swig 4.0.2 - Xcode Command Line Tools 10.3.0.0.1.1562985497 @@ -116,28 +119,29 @@ ### Browsers - Safari 14.1.2 (14611.3.10.1.5) - SafariDriver 14.1.2 (14611.3.10.1.5) -- Google Chrome 93.0.4577.82 -- ChromeDriver 93.0.4577.63 -- Microsoft Edge 93.0.961.52 -- MSEdgeDriver 93.0.961.52 -- Mozilla Firefox 92.0 -- geckodriver 0.29.1 +- Google Chrome 94.0.4606.81 +- ChromeDriver 94.0.4606.61 +- Microsoft Edge 94.0.992.50 +- MSEdgeDriver 94.0.992.50 +- Mozilla Firefox 93.0 +- geckodriver 0.30.0 #### Environment variables | Name | Value | | --------------- | --------------------------------------------- | -| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/93.0.4577.63 | +| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/94.0.4606.61 | | EDGEWEBDRIVER | /usr/local/share/edge_driver | | GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | ### Java -| Version | Vendor | Environment Variable | -| ------------------- | ------------- | -------------------- | -| 8.0.302+8 (default) | Adopt OpenJDK | JAVA_HOME_8_X64 | -| 11.0.12+7 | Adopt OpenJDK | JAVA_HOME_11_X64 | -| 12.0.2+10.3 | Adopt OpenJDK | JAVA_HOME_12_X64 | -| 13.0.2+8.1 | Adopt OpenJDK | JAVA_HOME_13_X64 | -| 14.0.2+12 | Adopt OpenJDK | JAVA_HOME_14_X64 | +| Version | Vendor | Environment Variable | +| ------------------- | --------------- | -------------------- | +| 8.0.302+8 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | +| 11.0.12+7 | Eclipse Temurin | JAVA_HOME_11_X64 | +| 12.0.2+10.3 | Adopt OpenJDK | JAVA_HOME_12_X64 | +| 13.0.2+8.1 | Adopt OpenJDK | JAVA_HOME_13_X64 | +| 14.0.2+12 | Adopt OpenJDK | JAVA_HOME_14_X64 | +| 17.0.0+35 | Eclipse Temurin | JAVA_HOME_17_X64 | ### Cached Tools #### Ruby @@ -154,6 +158,7 @@ - 3.7.12 - 3.8.12 - 3.9.7 +- 3.10.0 #### PyPy - 2.7.18 [PyPy 7.3.5] @@ -161,16 +166,17 @@ #### Node.js - 10.24.1 -- 12.22.6 -- 14.17.6 +- 12.22.7 +- 14.18.1 #### Go -- 1.13.15 -- 1.14.15 -- 1.15.15 -- 1.16.8 -- 1.17.1 - +| Version | Architecture | Environment Variable | +| ------- | ------------ | -------------------- | +| 1.13.15 | x64 | GOROOT_1_13_X64 | +| 1.14.15 | x64 | GOROOT_1_14_X64 | +| 1.15.15 (Default) | x64 | GOROOT_1_15_X64 | +| 1.16.9 | x64 | GOROOT_1_16_X64 | +| 1.17.2 | x64 | GOROOT_1_17_X64 | ### Rust Tools - Cargo 1.55.0 - Rust 1.55.0 @@ -186,14 +192,14 @@ - Rustfmt 1.4.37-stable ### PowerShell Tools -- PowerShell 7.1.4 +- PowerShell 7.1.5 #### PowerShell Modules | Module | Version | | ---------------- | ------- | | Az | 6.1.0 | | MarkdownPS | 1.9 | -| Pester | 5.3.0 | +| Pester | 5.3.1 | | PSScriptAnalyzer | 1.20.0 | ### Xamarin From 8c93fad835f96f8ea7df3107f7be4040d770fe4b Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Tue, 19 Oct 2021 11:22:08 +0300 Subject: [PATCH 0632/3485] Add Xcode 13.1 to macOS 11 & 12 (#4301) --- images/macos/toolsets/toolset-11.json | 1 + images/macos/toolsets/toolset-12.json | 1 + 2 files changed, 2 insertions(+) diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index d5997a0b727c..1b1b1501e767 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -2,6 +2,7 @@ "xcode": { "default": "13.0", "versions": [ + { "link": "13.1", "version": "13.1.0" }, { "link": "13.0", "version": "13.0.0" }, { "link": "13.0_beta", "version": "13 beta 5", "skip-symlink": "true" }, { "link": "12.5.1", "version": "12.5.1" }, diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index 82ddeda55c88..11fc679d5c12 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -2,6 +2,7 @@ "xcode": { "default": "13.0", "versions": [ + { "link": "13.1", "version": "13.1.0" }, { "link": "13.0", "version": "13.0.0"} ] }, From ae930f132c4bee495bd81eb75ec4fd7be6f1e812 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Tue, 19 Oct 2021 12:58:41 +0300 Subject: [PATCH 0633/3485] win2019: enable use of test-signed code (#4296) --- images/win/scripts/Tests/WindowsFeatures.Tests.ps1 | 2 +- images/win/windows2019.json | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/images/win/scripts/Tests/WindowsFeatures.Tests.ps1 b/images/win/scripts/Tests/WindowsFeatures.Tests.ps1 index 9f0684ba625d..f2a591acab2b 100644 --- a/images/win/scripts/Tests/WindowsFeatures.Tests.ps1 +++ b/images/win/scripts/Tests/WindowsFeatures.Tests.ps1 @@ -51,7 +51,7 @@ Describe "GDIProcessHandleQuota" { } } -Describe "Test Signed Drivers" -Skip:(-not (Test-IsWin22)) { +Describe "Test Signed Drivers" -Skip:(Test-IsWin16) { It "bcdedit testsigning should be Yes"{ "$(bcdedit)" | Should -Match "testsigning\s+Yes" } diff --git a/images/win/windows2019.json b/images/win/windows2019.json index 7c16c7c7b526..5a0dfcf43e64 100644 --- a/images/win/windows2019.json +++ b/images/win/windows2019.json @@ -110,6 +110,14 @@ "if (-not ((net localgroup Administrators) -contains '{{user `install_user`}}')) { exit 1 }" ] }, + { + "type": "powershell", + "inline": [ + "bcdedit.exe /set TESTSIGNING ON" + ], + "elevated_user": "{{user `install_user`}}", + "elevated_password": "{{user `install_password`}}" + }, { "type": "powershell", "environment_vars": [ From f4fbe6e36f24b2f3bbf4f9ec048863bf945b992d Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Wed, 20 Oct 2021 00:37:29 +0300 Subject: [PATCH 0634/3485] Remove Ubuntu 16.04 from templates (#4313) --- .github/ISSUE_TEMPLATE/announcement.yml | 1 - .github/ISSUE_TEMPLATE/bug-report.yml | 1 - .github/ISSUE_TEMPLATE/tool-request.yml | 1 - README.md | 1 - 4 files changed, 4 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/announcement.yml b/.github/ISSUE_TEMPLATE/announcement.yml index 3c414cbca4da..ba4b53b87537 100644 --- a/.github/ISSUE_TEMPLATE/announcement.yml +++ b/.github/ISSUE_TEMPLATE/announcement.yml @@ -30,7 +30,6 @@ body: attributes: label: Virtual environments affected options: - - label: Ubuntu 16.04 - label: Ubuntu 18.04 - label: Ubuntu 20.04 - label: macOS 10.15 diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml index 61b05c56280e..fea945a8cf11 100644 --- a/.github/ISSUE_TEMPLATE/bug-report.yml +++ b/.github/ISSUE_TEMPLATE/bug-report.yml @@ -12,7 +12,6 @@ body: attributes: label: Virtual environments affected options: - - label: Ubuntu 16.04 - label: Ubuntu 18.04 - label: Ubuntu 20.04 - label: macOS 10.15 diff --git a/.github/ISSUE_TEMPLATE/tool-request.yml b/.github/ISSUE_TEMPLATE/tool-request.yml index 87cee793ee54..9c2a86d5f3be 100644 --- a/.github/ISSUE_TEMPLATE/tool-request.yml +++ b/.github/ISSUE_TEMPLATE/tool-request.yml @@ -51,7 +51,6 @@ body: attributes: label: Virtual environments affected options: - - label: Ubuntu 16.04 - label: Ubuntu 18.04 - label: Ubuntu 20.04 - label: macOS 10.15 diff --git a/README.md b/README.md index 491922e0fa40..fe6239d5d242 100644 --- a/README.md +++ b/README.md @@ -48,7 +48,6 @@ You can also track upcoming changes using the [awaiting-deployment](https://gith [ubuntu-20.04]: https://github.com/actions/virtual-environments/blob/main/images/linux/Ubuntu2004-README.md [ubuntu-18.04]: https://github.com/actions/virtual-environments/blob/main/images/linux/Ubuntu1804-README.md -[ubuntu-16.04]: https://github.com/actions/virtual-environments/blob/main/images/linux/Ubuntu1604-README.md [windows-2022]: https://github.com/actions/virtual-environments/blob/main/images/win/Windows2022-Readme.md [windows-2019]: https://github.com/actions/virtual-environments/blob/main/images/win/Windows2019-Readme.md [windows-2016]: https://github.com/actions/virtual-environments/blob/main/images/win/Windows2016-Readme.md From 7512554102a52a39eaa0e53e176942a93e6cc003 Mon Sep 17 00:00:00 2001 From: Jeff Josephson Date: Wed, 20 Oct 2021 06:06:42 -0700 Subject: [PATCH 0635/3485] fix(chromium): Fix for chromium using very low base position (#4315) --- images/linux/scripts/installers/google-chrome.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/images/linux/scripts/installers/google-chrome.sh b/images/linux/scripts/installers/google-chrome.sh index 350a9f0f4928..ee34de334f94 100644 --- a/images/linux/scripts/installers/google-chrome.sh +++ b/images/linux/scripts/installers/google-chrome.sh @@ -17,8 +17,9 @@ function GetChromiumRevision { # Take the first part of the revision variable to search not only for a specific version, # but also for similar ones, so that we can get a previous one if the required revision is not found FIRST_PART_OF_REVISION=${REVISION:0:${#REVISION}/2} - URL="https://www.googleapis.com/storage/v1/b/chromium-browser-snapshots/o?delimiter=/&prefix=Linux_x64/${FIRST_PART_OF_REVISION}" - VERSIONS=$(curl -s $URL | jq -r '.prefixes[]' | cut -d "/" -f 2 | sort --version-sort) + FIRST_PART_OF_PREVIOUS_REVISION=$(expr $FIRST_PART_OF_REVISION - 1) + URL="https://www.googleapis.com/storage/v1/b/chromium-browser-snapshots/o?delimiter=/&prefix=Linux_x64" + VERSIONS=$((curl -s $URL/${FIRST_PART_OF_REVISION} | jq -r '.prefixes[]' && curl -s $URL/${FIRST_PART_OF_PREVIOUS_REVISION} | jq -r '.prefixes[]') | cut -d "/" -f 2 | sort --version-sort) # If required Chromium revision is not found in the list # we should have to decrement the revision number until we find one. From 335de740856f0a7c8c003d4908e491dadfb33cff Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 20 Oct 2021 17:17:37 +0000 Subject: [PATCH 0636/3485] Updating readme file for macOS-11 version 20211018.1 (#4303) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/macos/macos-11-Readme.md | 170 ++++++++++++++++---------------- 1 file changed, 86 insertions(+), 84 deletions(-) diff --git a/images/macos/macos-11-Readme.md b/images/macos/macos-11-Readme.md index 1f702be43e67..1bbf1f5cb800 100644 --- a/images/macos/macos-11-Readme.md +++ b/images/macos/macos-11-Readme.md @@ -7,14 +7,14 @@ # macOS 11.6 info - System Version: macOS 11.6 (20G165) - Kernel Version: Darwin 20.6.0 -- Image Version: 20211011.3 +- Image Version: 20211018.1 ## Installed Software ### Language and Runtime -- .NET SDK 2.1.302 2.1.403 2.1.507 2.1.607 2.1.701 2.1.818 3.1.101 3.1.201 3.1.302 3.1.413 5.0.102 5.0.202 5.0.302 5.0.401 +- .NET SDK 2.1.302 2.1.403 2.1.507 2.1.607 2.1.701 2.1.818 3.1.101 3.1.201 3.1.302 3.1.414 5.0.102 5.0.202 5.0.302 5.0.402 - Bash 3.2.57(1)-release -- Clang/LLVM 12.0.5 is default - Clang/LLVM 13.0.0 is available on `'$(brew --prefix llvm)/bin/clang'` +- Clang/LLVM 13.0.0 is default - gcc-9 (Homebrew GCC 9.4.0) 9.4.0 - available by `gcc-9` alias - gcc-10 (Homebrew GCC 10.3.0) 10.3.0 - available by `gcc-10` alias - gcc-11 (Homebrew GCC 11.2.0) 11.2.0 - available by `gcc-11` alias @@ -25,9 +25,9 @@ - julia 1.6.3 - Kotlin 1.5.31-release-548 - MSBuild 16.6.0.15801 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) -- Node.js v14.18.0 +- Node.js v14.18.1 - NVM 0.39.0 -- NVM - Cached node versions: v10.24.1 v12.22.6 v14.18.0 +- NVM - Cached node versions: v10.24.1 v12.22.7 v14.18.1 - Perl 5.34.0 - PHP 8.0.11 - Python 2.7.18 @@ -39,7 +39,7 @@ - Carthage 0.38.0 - CocoaPods 1.11.2 - Composer 2.1.9 -- Homebrew 3.2.16 +- Homebrew 3.2.17 - Miniconda 4.10.3 - NPM 6.14.15 - NuGet 5.6.0.6489 @@ -47,7 +47,7 @@ - Pip 21.2.4 (python 3.9) - Pipx 0.16.4 - RubyGems 3.2.29 -- Vcpkg 2021 (build from master \) +- Vcpkg 2021 (build from master \<078f3e5>) - Yarn 1.22.15 #### Environment variables @@ -71,12 +71,12 @@ - bsdtar 3.3.2 - available by 'tar' alias - Curl 7.79.1 - Git LFS: 3.0.1 -- Git: 2.33.0 -- GitHub CLI: 2.0.0 +- Git: 2.33.1 +- GitHub CLI: 2.1.0 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.2 - gpg (GnuPG) 2.3.2 -- helm v3.7.0+geeac838 +- helm v3.7.1+g1d11fcb - Hub CLI: 2.14.2 - jq 1.6 - mongo v5.0.3 @@ -95,23 +95,23 @@ ### Tools - Aliyun CLI 3.0.94 - App Center CLI 2.10.3 -- AWS CLI 2.2.45 +- AWS CLI 2.2.46 - AWS SAM CLI 1.33.0 - AWS Session Manager CLI 1.2.245.0 -- Azure CLI 2.28.1 -- Bicep CLI 0.4.613 +- Azure CLI 2.29.0 +- Bicep CLI 0.4.1008 - Cabal 3.4.1.0 - Cmake 3.21.3 -- Fastlane 2.195.0 +- Fastlane 2.196.0 - GHC 9.0.1 - GHCup 0.1.17.2 - Stack 2.7.3 -- SwiftFormat 0.48.15 +- SwiftFormat 0.48.17 - Swig 4.0.2 - Xcode Command Line Tools 13.0.0.0.1.1630607135 ### Linters -- SwiftLint 0.44.0 +- SwiftLint 0.45.0 - yamllint 1.26.3 ### Browsers @@ -119,8 +119,8 @@ - SafariDriver 14.1.2 (16611.3.10.1.6) - Google Chrome 94.0.4606.81 - ChromeDriver 94.0.4606.61 -- Microsoft Edge 94.0.992.38 -- MSEdgeDriver 94.0.992.38 +- Microsoft Edge 94.0.992.50 +- MSEdgeDriver 94.0.992.50 - Mozilla Firefox 93.0 - geckodriver 0.30.0 @@ -153,19 +153,20 @@ - 3.10.0 #### PyPy -- 2.7.18 [PyPy 7.3.5] -- 3.7.10 [PyPy 7.3.5] +- 2.7.18 [PyPy 7.3.6] +- 3.7.12 [PyPy 7.3.6] #### Node.js - 10.24.1 -- 12.22.6 -- 14.18.0 +- 12.22.7 +- 14.18.1 #### Go -- 1.15.15 -- 1.16.9 -- 1.17.2 - +| Version | Architecture | Environment Variable | +| ------- | ------------ | -------------------- | +| 1.15.15 (Default) | x64 | GOROOT_1_15_X64 | +| 1.16.9 | x64 | GOROOT_1_16_X64 | +| 1.17.2 | x64 | GOROOT_1_17_X64 | ### Rust Tools - Cargo 1.55.0 - Rust 1.55.0 @@ -181,7 +182,7 @@ - Rustfmt 1.4.37-stable ### PowerShell Tools -- PowerShell 7.1.4 +- PowerShell 7.1.5 #### PowerShell Modules | Module | Version | @@ -199,7 +200,7 @@ ### Xamarin #### Visual Studio for Mac -- 8.10.10.8 +- 8.10.11.8 #### Xamarin bundles | symlink | Xamarin.Mono | Xamarin.iOS | Xamarin.Mac | Xamarin.Android | @@ -220,14 +221,14 @@ - NUnit 3.6.1 ### Xcode -| Version | Build | Path | -| ---------------- | -------- | --------------------------------- | -| 13.0 (beta) | 13A5212g | /Applications/Xcode_13.0_beta.app | -| 13.0 | 13A233 | /Applications/Xcode_13.0.app | -| 12.5.1 (default) | 12E507 | /Applications/Xcode_12.5.1.app | -| 12.5 | 12E262 | /Applications/Xcode_12.5.app | -| 12.4 | 12D4e | /Applications/Xcode_12.4.app | -| 11.7 | 11E801a | /Applications/Xcode_11.7.app | +| Version | Build | Path | +| -------------- | -------- | --------------------------------- | +| 13.1 | 13A1030d | /Applications/Xcode_13.1.app | +| 13.0 (beta) | 13A5212g | /Applications/Xcode_13.0_beta.app | +| 13.0 (default) | 13A233 | /Applications/Xcode_13.0.app | +| 12.5.1 | 12E507 | /Applications/Xcode_12.5.1.app | +| 12.4 | 12D4e | /Applications/Xcode_12.4.app | +| 11.7 | 11E801a | /Applications/Xcode_11.7.app | #### Xcode Support Tools - xcpretty 0.3.0 @@ -236,56 +237,57 @@ - Nomad shenzhen CLI 0.14.3 #### Installed SDKs -| SDK | SDK Name | Xcode Version | -| ----------------------- | -------------------- | ------------------ | -| macOS 10.15 | macosx10.15 | 11.7 | -| macOS 11.1 | macosx11.1 | 12.4 | -| macOS 11.3 | macosx11.3 | 12.5, 12.5.1, 13.0 | -| macOS 12.0 | macosx12.0 | 13.0 | -| iOS 13.7 | iphoneos13.7 | 11.7 | -| iOS 14.4 | iphoneos14.4 | 12.4 | -| iOS 14.5 | iphoneos14.5 | 12.5, 12.5.1 | -| iOS 15.0 | iphoneos15.0 | 13.0, 13.0 | -| Simulator - iOS 13.7 | iphonesimulator13.7 | 11.7 | -| Simulator - iOS 14.4 | iphonesimulator14.4 | 12.4 | -| Simulator - iOS 14.5 | iphonesimulator14.5 | 12.5, 12.5.1 | -| Simulator - iOS 15.0 | iphonesimulator15.0 | 13.0, 13.0 | -| tvOS 13.4 | appletvos13.4 | 11.7 | -| tvOS 14.3 | appletvos14.3 | 12.4 | -| tvOS 14.5 | appletvos14.5 | 12.5, 12.5.1 | -| tvOS 15.0 | appletvos15.0 | 13.0, 13.0 | -| Simulator - tvOS 13.4 | appletvsimulator13.4 | 11.7 | -| Simulator - tvOS 14.3 | appletvsimulator14.3 | 12.4 | -| Simulator - tvOS 14.5 | appletvsimulator14.5 | 12.5, 12.5.1 | -| Simulator - tvOS 15.0 | appletvsimulator15.0 | 13.0, 13.0 | -| watchOS 6.2 | watchos6.2 | 11.7 | -| watchOS 7.2 | watchos7.2 | 12.4 | -| watchOS 7.4 | watchos7.4 | 12.5, 12.5.1 | -| watchOS 8.0 | watchos8.0 | 13.0, 13.0 | -| Simulator - watchOS 6.2 | watchsimulator6.2 | 11.7 | -| Simulator - watchOS 7.2 | watchsimulator7.2 | 12.4 | -| Simulator - watchOS 7.4 | watchsimulator7.4 | 12.5, 12.5.1 | -| Simulator - watchOS 8.0 | watchsimulator8.0 | 13.0, 13.0 | -| DriverKit 19.0 | driverkit.macosx19.0 | 11.7 | -| DriverKit 20.2 | driverkit.macosx20.2 | 12.4 | -| DriverKit 20.4 | driverkit.macosx20.4 | 12.5, 12.5.1, 13.0 | -| DriverKit 21.0 | driverkit21.0 | 13.0 | +| SDK | SDK Name | Xcode Version | +| ----------------------- | -------------------- | ---------------- | +| macOS 10.15 | macosx10.15 | 11.7 | +| macOS 11.1 | macosx11.1 | 12.4 | +| macOS 11.3 | macosx11.3 | 12.5.1, 13.0 | +| macOS 12.0 | macosx12.0 | 13.0, 13.1 | +| iOS 13.7 | iphoneos13.7 | 11.7 | +| iOS 14.4 | iphoneos14.4 | 12.4 | +| iOS 14.5 | iphoneos14.5 | 12.5.1 | +| iOS 15.0 | iphoneos15.0 | 13.0, 13.0, 13.1 | +| Simulator - iOS 13.7 | iphonesimulator13.7 | 11.7 | +| Simulator - iOS 14.4 | iphonesimulator14.4 | 12.4 | +| Simulator - iOS 14.5 | iphonesimulator14.5 | 12.5.1 | +| Simulator - iOS 15.0 | iphonesimulator15.0 | 13.0, 13.0, 13.1 | +| tvOS 13.4 | appletvos13.4 | 11.7 | +| tvOS 14.3 | appletvos14.3 | 12.4 | +| tvOS 14.5 | appletvos14.5 | 12.5.1 | +| tvOS 15.0 | appletvos15.0 | 13.0, 13.0, 13.1 | +| Simulator - tvOS 13.4 | appletvsimulator13.4 | 11.7 | +| Simulator - tvOS 14.3 | appletvsimulator14.3 | 12.4 | +| Simulator - tvOS 14.5 | appletvsimulator14.5 | 12.5.1 | +| Simulator - tvOS 15.0 | appletvsimulator15.0 | 13.0, 13.0, 13.1 | +| watchOS 6.2 | watchos6.2 | 11.7 | +| watchOS 7.2 | watchos7.2 | 12.4 | +| watchOS 7.4 | watchos7.4 | 12.5.1 | +| watchOS 8.0 | watchos8.0 | 13.0, 13.0, 13.1 | +| Simulator - watchOS 6.2 | watchsimulator6.2 | 11.7 | +| Simulator - watchOS 7.2 | watchsimulator7.2 | 12.4 | +| Simulator - watchOS 7.4 | watchsimulator7.4 | 12.5.1 | +| Simulator - watchOS 8.0 | watchsimulator8.0 | 13.0, 13.0, 13.1 | +| DriverKit 19.0 | driverkit.macosx19.0 | 11.7 | +| DriverKit 20.2 | driverkit.macosx20.2 | 12.4 | +| DriverKit 20.4 | driverkit.macosx20.4 | 12.5.1, 13.0 | +| DriverKit 21.0 | driverkit21.0 | 13.0 | +| DriverKit 21.0.1 | driverkit21.0.1 | 13.1 | #### Installed Simulators -| OS | Xcode Version | Simulators | -| ----------- | -------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| 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.4 | 12.4 | iPod touch (7th generation)
iPhone 11
iPhone 11 Pro
iPhone 11 Pro Max
iPhone 12
iPhone 12 mini
iPhone 12 Pro
iPhone 12 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.5 | 12.5
12.5.1 | iPod touch (7th generation)
iPhone 11
iPhone 11 Pro
iPhone 11 Pro Max
iPhone 12
iPhone 12 mini
iPhone 12 Pro
iPhone 12 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 (11-inch) (3rd generation)
iPad Pro (12.9-inch) (4th generation)
iPad Pro (12.9-inch) (5th generation)
iPad Pro (9.7-inch) | -| iOS 15.0 | 13.0
13.0 | iPod touch (7th generation)
iPhone 11
iPhone 11 Pro
iPhone 11 Pro Max
iPhone 12
iPhone 12 mini
iPhone 12 Pro
iPhone 12 Pro Max
iPhone 13
iPhone 13 mini
iPhone 13 Pro
iPhone 13 Pro Max
iPhone 8
iPhone 8 Plus
iPhone SE (2nd generation)
iPad (7th generation)
iPad (8th generation)
iPad (9th generation)
iPad Air (3rd generation)
iPad Air (4th generation)
iPad mini (6th generation)
iPad Pro (11-inch) (2nd generation)
iPad Pro (11-inch) (3rd generation)
iPad Pro (12.9-inch) (4th generation)
iPad Pro (12.9-inch) (5th generation)
iPad Pro (9.7-inch) | -| tvOS 13.4 | 11.7 | Apple TV
Apple TV 4K
Apple TV 4K (at 1080p) | -| tvOS 14.3 | 12.4 | Apple TV
Apple TV 4K
Apple TV 4K (at 1080p) | -| tvOS 14.5 | 12.5
12.5.1 | Apple TV
Apple TV 4K
Apple TV 4K (2nd generation)
Apple TV 4K (at 1080p)
Apple TV 4K (at 1080p) (2nd generation) | -| tvOS 15.0 | 13.0
13.0 | Apple TV
Apple TV 4K
Apple TV 4K (2nd generation)
Apple TV 4K (at 1080p)
Apple TV 4K (at 1080p) (2nd generation) | -| watchOS 6.2 | 11.7 | Apple Watch Series 4 - 40mm
Apple Watch Series 4 - 44mm
Apple Watch Series 5 - 40mm
Apple Watch Series 5 - 44mm | -| watchOS 7.2 | 12.4 | 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.4 | 12.5
12.5.1 | 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 8.0 | 13.0
13.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
Apple Watch Series 7 - 41mm
Apple Watch Series 7 - 45mm | +| OS | Xcode Version | Simulators | +| ----------- | -------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| 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.4 | 12.4 | iPod touch (7th generation)
iPhone 11
iPhone 11 Pro
iPhone 11 Pro Max
iPhone 12
iPhone 12 mini
iPhone 12 Pro
iPhone 12 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.5 | 12.5.1 | iPod touch (7th generation)
iPhone 11
iPhone 11 Pro
iPhone 11 Pro Max
iPhone 12
iPhone 12 mini
iPhone 12 Pro
iPhone 12 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 (11-inch) (3rd generation)
iPad Pro (12.9-inch) (4th generation)
iPad Pro (12.9-inch) (5th generation)
iPad Pro (9.7-inch) | +| iOS 15.0 | 13.0
13.0
13.1 | iPod touch (7th generation)
iPhone 11
iPhone 11 Pro
iPhone 11 Pro Max
iPhone 12
iPhone 12 mini
iPhone 12 Pro
iPhone 12 Pro Max
iPhone 13
iPhone 13 mini
iPhone 13 Pro
iPhone 13 Pro Max
iPhone 8
iPhone 8 Plus
iPhone SE (2nd generation)
iPad (7th generation)
iPad (8th generation)
iPad (9th generation)
iPad Air (3rd generation)
iPad Air (4th generation)
iPad mini (6th generation)
iPad Pro (11-inch) (2nd generation)
iPad Pro (11-inch) (3rd generation)
iPad Pro (12.9-inch) (4th generation)
iPad Pro (12.9-inch) (5th generation)
iPad Pro (9.7-inch) | +| tvOS 13.4 | 11.7 | Apple TV
Apple TV 4K
Apple TV 4K (at 1080p) | +| tvOS 14.3 | 12.4 | Apple TV
Apple TV 4K
Apple TV 4K (at 1080p) | +| tvOS 14.5 | 12.5.1 | Apple TV
Apple TV 4K
Apple TV 4K (2nd generation)
Apple TV 4K (at 1080p)
Apple TV 4K (at 1080p) (2nd generation) | +| tvOS 15.0 | 13.0
13.0
13.1 | Apple TV
Apple TV 4K
Apple TV 4K (2nd generation)
Apple TV 4K (at 1080p)
Apple TV 4K (at 1080p) (2nd generation) | +| watchOS 6.2 | 11.7 | Apple Watch Series 4 - 40mm
Apple Watch Series 4 - 44mm
Apple Watch Series 5 - 40mm
Apple Watch Series 5 - 44mm | +| watchOS 7.2 | 12.4 | 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.4 | 12.5.1 | 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 8.0 | 13.0
13.0
13.1 | 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
Apple Watch Series 7 - 41mm
Apple Watch Series 7 - 45mm | ### Android | Package Name | Version | From 219d11cbd1f301a8c11236dd9da37486655628b0 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Thu, 21 Oct 2021 09:29:45 +0300 Subject: [PATCH 0637/3485] Fix PyPy permissions (#4317) --- .../win/scripts/Installers/Install-PyPy.ps1 | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/images/win/scripts/Installers/Install-PyPy.ps1 b/images/win/scripts/Installers/Install-PyPy.ps1 index 8d104b432375..bff461ec646c 100644 --- a/images/win/scripts/Installers/Install-PyPy.ps1 +++ b/images/win/scripts/Installers/Install-PyPy.ps1 @@ -26,10 +26,17 @@ function Install-PyPy [String]$Architecture ) + # Create PyPy toolcache folder + $pypyToolcachePath = Join-Path -Path $env:AGENT_TOOLSDIRECTORY -ChildPath "PyPy" + if (-not (Test-Path $pypyToolcachePath)) { + Write-Host "Create PyPy toolcache folder" + New-Item -ItemType Directory -Path $pypyToolcachePath | Out-Null + } + # Expand archive with binaries $packageName = [IO.Path]::GetFileNameWithoutExtension((Split-Path -Path $packagePath -Leaf)) - $tempFolder = Join-Path -Path $env:Temp -ChildPath $packageName - Extract-7Zip -Path $packagePath -DestinationPath $env:Temp + $tempFolder = Join-Path -Path $pypyToolcachePath -ChildPath $packageName + Extract-7Zip -Path $packagePath -DestinationPath $pypyToolcachePath # Get Python version from binaries $pypyApp = Get-ChildItem -Path "$tempFolder\pypy*.exe" | Where-Object Name -match "pypy(\d+)?.exe" | Select-Object -First 1 @@ -37,20 +44,14 @@ function Install-PyPy $pypyFullVersion = & $pypyApp -c "import sys;print('{}.{}.{}'.format(*sys.pypy_version_info[0:3]))" Write-Host "Put '$pypyFullVersion' to PYPY_VERSION file" - New-Item -Path "$tempFolder\PYPY_VERSION" -Value $pypyFullVersion + New-Item -Path "$tempFolder\PYPY_VERSION" -Value $pypyFullVersion | Out-Null if ($pythonVersion) { Write-Host "Installing PyPy $pythonVersion" - $pypyToolcachePath = Join-Path -Path $env:AGENT_TOOLSDIRECTORY -ChildPath "PyPy" $pypyVersionPath = Join-Path -Path $pypyToolcachePath -ChildPath $pythonVersion $pypyArchPath = Join-Path -Path $pypyVersionPath -ChildPath $architecture - if (-not (Test-Path $pypyToolcachePath)) { - Write-Host "Create PyPy toolcache folder" - New-Item -ItemType Directory -Path $pypyToolcachePath | Out-Null - } - Write-Host "Create PyPy '${pythonVersion}' folder in '${pypyVersionPath}'" New-Item -ItemType Directory -Path $pypyVersionPath -Force | Out-Null From c9e59704eba95d9d9a9d7fb84248fc3cb29a91f6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 21 Oct 2021 08:03:23 +0000 Subject: [PATCH 0638/3485] Updating readme file for macOS-10.15 version 20211016.1 (#4295) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/macos/macos-10.15-Readme.md | 51 +++++++++++++++--------------- 1 file changed, 26 insertions(+), 25 deletions(-) diff --git a/images/macos/macos-10.15-Readme.md b/images/macos/macos-10.15-Readme.md index c1c7fb437cf2..3c2222ea1a43 100644 --- a/images/macos/macos-10.15-Readme.md +++ b/images/macos/macos-10.15-Readme.md @@ -7,11 +7,11 @@ # macOS 10.15 info - System Version: macOS 10.15.7 (19H1417) - Kernel Version: Darwin 19.6.0 -- Image Version: 20211011.2 +- Image Version: 20211016.1 ## Installed Software ### Language and Runtime -- .NET SDK 2.1.302 2.1.403 2.1.507 2.1.607 2.1.701 2.1.818 3.1.101 3.1.201 3.1.302 3.1.413 5.0.102 5.0.202 5.0.302 5.0.401 +- .NET SDK 2.1.302 2.1.403 2.1.507 2.1.607 2.1.701 2.1.818 3.1.101 3.1.201 3.1.302 3.1.414 5.0.102 5.0.202 5.0.302 5.0.402 - Bash 3.2.57(1)-release - Clang/LLVM 12.0.0 is default - Clang/LLVM 13.0.0 is available on `'$(brew --prefix llvm)/bin/clang'` @@ -25,9 +25,9 @@ - julia 1.6.3 - Kotlin 1.5.31-release-548 - MSBuild 16.6.0.15801 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) -- Node.js v14.18.0 +- Node.js v14.18.1 - NVM 0.39.0 -- NVM - Cached node versions: v10.24.1 v12.22.6 v14.18.0 +- NVM - Cached node versions: v10.24.1 v12.22.7 v14.18.1 - Perl 5.34.0 - PHP 8.0.11 - Python 2.7.18 @@ -48,7 +48,7 @@ - Pip 21.2.4 (python 3.9) - Pipx 0.16.4 - RubyGems 3.2.29 -- Vcpkg 2021 (build from master \<1d4128f>) +- Vcpkg 2021 (build from master \<699c877>) - Yarn 1.22.15 #### Environment variables @@ -72,13 +72,13 @@ - bsdtar 3.3.2 - available by 'tar' alias - Curl 7.79.1 - Git LFS: 3.0.1 -- Git: 2.33.0 -- GitHub CLI: 2.0.0 +- Git: 2.33.1 +- GitHub CLI: 2.1.0 - GNU parallel 20210922 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.2 - gpg (GnuPG) 2.3.2 -- helm v3.7.0+geeac838 +- helm v3.7.1+g1d11fcb - Hub CLI: 2.14.2 - jq 1.6 - mongo v5.0.3 @@ -99,18 +99,18 @@ ### Tools - Aliyun CLI 3.0.94 - App Center CLI 2.10.3 -- AWS CLI 2.2.44 +- AWS CLI 2.2.46 - AWS SAM CLI 1.33.0 - AWS Session Manager CLI 1.2.245.0 -- Azure CLI 2.28.1 -- Bicep CLI 0.4.613 +- Azure CLI 2.29.0 +- Bicep CLI 0.4.1008 - Cabal 3.4.1.0 - Cmake 3.21.3 -- Fastlane 2.195.0 +- Fastlane 2.196.0 - GHC 9.0.1 - GHCup 0.1.17.2 - Stack 2.7.3 -- SwiftFormat 0.48.15 +- SwiftFormat 0.48.16 - Swig 4.0.2 - Xcode Command Line Tools 12.4.0.0.1.1610135815 @@ -123,8 +123,8 @@ - SafariDriver 14.1.2 (15611.3.10.1.7) - Google Chrome 94.0.4606.81 - ChromeDriver 94.0.4606.61 -- Microsoft Edge 94.0.992.38 -- MSEdgeDriver 94.0.992.38 +- Microsoft Edge 94.0.992.50 +- MSEdgeDriver 94.0.992.50 - Mozilla Firefox 93.0 - geckodriver 0.30.0 @@ -169,16 +169,17 @@ #### Node.js - 10.24.1 -- 12.22.6 -- 14.18.0 +- 12.22.7 +- 14.18.1 #### Go -- 1.13.15 -- 1.14.15 -- 1.15.15 -- 1.16.9 -- 1.17.2 - +| Version | Architecture | Environment Variable | +| ------- | ------------ | -------------------- | +| 1.13.15 | x64 | GOROOT_1_13_X64 | +| 1.14.15 | x64 | GOROOT_1_14_X64 | +| 1.15.15 (Default) | x64 | GOROOT_1_15_X64 | +| 1.16.9 | x64 | GOROOT_1_16_X64 | +| 1.17.2 | x64 | GOROOT_1_17_X64 | ### Rust Tools - Cargo 1.55.0 - Rust 1.55.0 @@ -194,7 +195,7 @@ - Rustfmt 1.4.37-stable ### PowerShell Tools -- PowerShell 7.1.4 +- PowerShell 7.1.5 #### PowerShell Modules | Module | Version | @@ -212,7 +213,7 @@ ### Xamarin #### Visual Studio for Mac -- 8.10.10.8 +- 8.10.11.8 #### Xamarin bundles | symlink | Xamarin.Mono | Xamarin.iOS | Xamarin.Mac | Xamarin.Android | From 31f235d1c0d9366088b5a64f1a7b05acb62785f7 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 21 Oct 2021 10:00:52 +0000 Subject: [PATCH 0639/3485] Updating readme file for ubuntu18 version 20211017.0 (#4293) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/linux/Ubuntu1804-README.md | 75 ++++++++++++++++--------------- 1 file changed, 38 insertions(+), 37 deletions(-) diff --git a/images/linux/Ubuntu1804-README.md b/images/linux/Ubuntu1804-README.md index cfe0f41f50e5..59f29d13cf23 100644 --- a/images/linux/Ubuntu1804-README.md +++ b/images/linux/Ubuntu1804-README.md @@ -3,8 +3,8 @@ | [Ubuntu 16.04 environment will be removed on September 20, 2021](https://github.com/actions/virtual-environments/issues/3287) | *** # Ubuntu 18.04.6 LTS -- Linux kernel version: 5.4.0-1059-azure -- Image Version: 20211011.1 +- Linux kernel version: 5.4.0-1061-azure +- Image Version: 20211017.0 ## Installed Software ### Language and Runtime @@ -19,7 +19,7 @@ - Kotlin 1.5.31-release-548 - Mono 6.12.0.122 (apt source repository: https://download.mono-project.com/repo/ubuntu stable-bionic main) - MSBuild 16.6.0.15201 (from /usr/lib/mono/msbuild/15.0/bin/MSBuild.dll) -- Node 14.18.0 +- Node 14.18.1 - Perl 5.26.1 - Python 2.7.17 - Python3 3.6.9 @@ -28,16 +28,16 @@ ### Package Management - cpan 1.64 -- Helm 3.7.0 -- Homebrew 3.2.15 +- Helm 3.7.1 +- Homebrew 3.2.16 - Miniconda 4.10.3 - Npm 6.14.15 - Pip 9.0.1 - Pip3 9.0.1 - Pipx 0.16.4 - RubyGems 2.7.6 -- Vcpkg (build from master \<973a7d5>) -- Yarn 1.22.15 +- Vcpkg (build from master \<699c877>) +- Yarn 1.22.17 #### Environment variables | Name | Value | @@ -52,26 +52,26 @@ - Sbt 1.5.5 ### Tools -- Ansible 2.11.5 +- Ansible 2.11.6 - apt-fast 1.9.11 - AzCopy 10.12.2 (available by `azcopy` and `azcopy10` aliases) - Bazel 4.2.1 - Bazelisk 1.10.1 -- Bicep 0.4.613 +- Bicep 0.4.1008 - Buildah 1.19.6 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - CMake 3.21.3 -- CodeQL Action Bundle 2.6.3 +- CodeQL Action Bundle 2.6.3-a - Docker Compose v1 1.29.2 - Docker Compose v2 2.0.0 - Docker-Buildx 0.6.0 - Docker-Moby Client 20.10.9+azure-1 - Docker-Moby Server 20.10.9+azure-1 -- Git 2.33.0 (apt source repository: ppa:git-core/ppa) +- Git 2.33.1 (apt source repository: ppa:git-core/ppa) - Git LFS 2.13.3 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.3.1 - Haveged 1.9.1 - Heroku 7.59.0 -- HHVM (HipHop VM) 4.130.0 +- HHVM (HipHop VM) 4.131.0 - jq 1.5 - Kind 0.11.1 - Kubectl 1.22.2 @@ -86,28 +86,28 @@ - Packer 1.7.6 - PhantomJS 2.1.1 - Podman 3.0.1 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- Pulumi 3.14.0 +- Pulumi 3.15.0 - R 4.1.1 - Skopeo 1.2.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 - SVN 1.9.7 -- Terraform 1.0.8 +- Terraform 1.0.9 - yamllint 1.26.3 - yq 4.13.4 - zstd 1.5.0 (homebrew) ### CLI Tools - Alibaba Cloud CLI 3.0.94 -- AWS CLI 1.20.58 +- AWS CLI 1.20.63 - AWS CLI Session manager plugin 1.2.245.0 - AWS SAM CLI 1.33.0 -- Azure CLI (azure-cli) 2.28.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) +- Azure CLI (azure-cli) 2.29.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.20.0 -- GitHub CLI 2.0.0 +- GitHub CLI 2.1.0 - Google Cloud SDK 360.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 6.10.4 -- OpenShift CLI 4.8.13 +- Netlify CLI 6.13.2 +- OpenShift CLI 4.8.14 - ORAS CLI 0.12.0 - Vercel CLI 23.1.2 @@ -161,7 +161,7 @@ | GECKOWEBDRIVER | /usr/local/share/gecko_driver | ### .NET Core SDK -- 2.1.302 2.1.403 2.1.526 2.1.617 2.1.701 2.1.818 3.1.119 3.1.202 3.1.302 3.1.413 5.0.104 5.0.207 5.0.303 5.0.401 +- 2.1.302 2.1.403 2.1.526 2.1.617 2.1.701 2.1.818 3.1.120 3.1.202 3.1.302 3.1.414 5.0.104 5.0.208 5.0.303 5.0.402 ### Databases - MongoDB 5.0.3 (apt source repository: https://repo.mongodb.org/apt/ubuntu) @@ -189,11 +189,11 @@ #### Node.js - 10.24.1 -- 12.22.6 -- 14.18.0 +- 12.22.7 +- 14.18.1 #### PyPy -- 2.7.18 [PyPy 7.3.5] +- 2.7.18 [PyPy 7.3.6] - 3.6.12 [PyPy 7.3.3] #### Python @@ -203,6 +203,7 @@ - 3.7.12 - 3.8.12 - 3.9.7 +- 3.10.0 #### Ruby - 2.4.10 @@ -221,7 +222,7 @@ | GOROOT_1_17_X64 | /opt/hostedtoolcache/go/1.17.2/x64 | x64 | ### PowerShell Tools -- PowerShell 7.1.4 +- PowerShell 7.1.5 #### PowerShell Modules | Module | Version | @@ -269,22 +270,22 @@ | alpine:3.12 | sha256:a296b4c6f6ee2b88f095b61e95c7ef4f51ba25598835b4978c9256d8c8ace48a | 2021-08-31 | | alpine:3.13 | sha256:2582893dec6f12fd499d3a709477f2c0c0c1dfcd28024c93f1f0626b9e3540c8 | 2021-08-31 | | alpine:3.14 | sha256:e1c082e3d3c45cccac829840a25941e679c25d438cc8412c2fa221cf1a824e6a | 2021-08-27 | -| buildpack-deps:bullseye | sha256:781dbad21bcc644af42ec465c2adbf6d9470b256755a13b2a2eadadf331cdaf9 | 2021-09-28 | -| buildpack-deps:buster | sha256:4ab33f2a6712321207d5736d6899841e03d3cc26d50fb7489b0e4a48bf42a1d0 | 2021-09-28 | -| buildpack-deps:stretch | sha256:57d5d14748554b31c75a2e95e63c51e8cdfb24393e33c1431982123b7d0c2280 | 2021-09-28 | -| debian:10 | sha256:e5cfab8012b17d80f93a7f567797b0c8a2839069d4f50e499152162152518663 | 2021-09-28 | -| debian:11 | sha256:b6a47ddbc1de53e0024d19908f5ef7b3d870686f1234fdb2d19770e097db1575 | 2021-09-28 | -| debian:9 | sha256:c1274c24446b98394e1594ceefac1012e1b39b752586ca993fe3c3bea6f6d20f | 2021-09-28 | +| buildpack-deps:bullseye | sha256:1062c3cabe1b62d7e64609e1ebe30406b9d802684758a01fd386bbc60ea6b1aa | 2021-10-12 | +| buildpack-deps:buster | sha256:6d442a75a480d13760660675e0094e87e7b64ebd64acb43754c5ed46cb1ea532 | 2021-10-12 | +| buildpack-deps:stretch | sha256:63b243cde6ed83435eb26eda196769a37b9426abc76cc7e89ad364c3a24ce18f | 2021-10-12 | +| debian:10 | sha256:f9182ead292f45165f4a851e5ff98ea0800e172ccedce7d17764ffaae5ed4d6e | 2021-10-12 | +| debian:11 | sha256:4d6ab716de467aad58e91b1b720f0badd7478847ec7a18f66027d0f8a329a43c | 2021-10-12 | +| debian:9 | sha256:86269e614274db90a1d71dac258c74ed0a867a1d05f67dea6263b0f216ec7724 | 2021-10-12 | | moby/buildkit:latest | sha256:94bc3a93cfa5197064cfdc86e4289cead7b46a2bc95874f142fbf51c67ad2826 | 2021-10-04 | | node:10 | sha256:59531d2835edd5161c8f9512f9e095b1836f7a1fcb0ab73e005ec46047384911 | 2021-04-10 | | node:10-alpine | sha256:dc98dac24efd4254f75976c40bce46944697a110d06ce7fa47e7268470cf2e28 | 2021-04-14 | -| node:12 | sha256:86afd89e91d667a65b37e05659974ccd702b8e3b1aff30416d1f77cf67729e2b | 2021-09-28 | -| node:12-alpine | sha256:1ea5900145028957ec0e7b7e590ac677797fa8962ccec4e73188092f7bc14da5 | 2021-08-31 | -| node:14 | sha256:167d0a4af6b4e0d0769086b871a36c25faed75b72705144cabbda70466cc0d8e | 2021-09-29 | -| node:14-alpine | sha256:6e52e0b3bedfb494496488514d18bee7fd503fd4e44289ea012ad02f8f41a312 | 2021-09-29 | -| ubuntu:16.04 | sha256:454054f5bbd571b088db25b662099c6c7b3f0cb78536a2077d54adc48f00cd68 | 2021-08-31 | -| ubuntu:18.04 | sha256:bfb4cabd667790ead5c95d9fe341937f0c21118fa79bc768d51c5da9d1dbe917 | 2021-10-01 | -| ubuntu:20.04 | sha256:a0d9e826ab87bd665cfc640598a871b748b4b70a01a4f3d174d4fb02adad07a9 | 2021-10-01 | +| node:12 | sha256:9b9e79251f73f999dd440a41714a91eea34996ec809953906009592def0d4380 | 2021-10-13 | +| node:12-alpine | sha256:dfbebf17bfb014e1e7068e76325a117bccf8679c68aec6a28514184a209c8bae | 2021-10-13 | +| node:14 | sha256:109b118e0d49dd12ca6f5b84a7a9a9c8a147f75567b3ad50620bdacaf5e6320d | 2021-10-13 | +| node:14-alpine | sha256:a251de4db0e0632446c0ba62adbe1e37ff148a53732e4574d2ed0f5462cc4407 | 2021-10-13 | +| ubuntu:16.04 | sha256:0f71fa8d4d2d4292c3c617fda2b36f6dabe5c8b6e34c3dc5b0d17d4e704bd39c | 2021-08-31 | +| ubuntu:18.04 | sha256:0fedbd5bd9fb72089c7bbca476949e10593cebed9b1fb9edf5b79dbbacddd7d6 | 2021-10-01 | +| ubuntu:20.04 | sha256:626ffe58f6e7566e00254b638eb7e0f3b11d4da9675088f4781a50ae288f3322 | 2021-10-16 | ### Installed apt packages | Name | Version | From ebd938338bb6b2acbdd6fae26c8828da046517d4 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 21 Oct 2021 10:36:17 +0000 Subject: [PATCH 0640/3485] Updating readme file for ubuntu20 version 20211017.0 (#4294) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/linux/Ubuntu2004-README.md | 79 ++++++++++++++++--------------- 1 file changed, 40 insertions(+), 39 deletions(-) diff --git a/images/linux/Ubuntu2004-README.md b/images/linux/Ubuntu2004-README.md index 42c821dc8e83..b2154c24a673 100644 --- a/images/linux/Ubuntu2004-README.md +++ b/images/linux/Ubuntu2004-README.md @@ -4,7 +4,7 @@ *** # Ubuntu 20.04.3 LTS - Linux kernel version: 5.8.0-1042-azure -- Image Version: 20211011.1 +- Image Version: 20211017.0 ## Installed Software ### Language and Runtime @@ -19,7 +19,7 @@ - Kotlin 1.5.31-release-548 - Mono 6.12.0.122 (apt source repository: https://download.mono-project.com/repo/ubuntu stable-focal main) - MSBuild 16.6.0.15201 (from /usr/lib/mono/msbuild/15.0/bin/MSBuild.dll) -- Node 14.18.0 +- Node 14.18.1 - Perl 5.30.0 - Python 3.8.10 - Python3 3.8.10 @@ -28,16 +28,16 @@ ### Package Management - cpan 1.64 -- Helm 3.7.0 -- Homebrew 3.2.15 +- Helm 3.7.1 +- Homebrew 3.2.16 - Miniconda 4.10.3 - Npm 6.14.15 - Pip 20.0.2 - Pip3 20.0.2 - Pipx 0.16.4 - RubyGems 3.1.2 -- Vcpkg (build from master \<973a7d5>) -- Yarn 1.22.15 +- Vcpkg (build from master \<699c877>) +- Yarn 1.22.17 #### Environment variables | Name | Value | @@ -53,27 +53,27 @@ - Sbt 1.5.5 ### Tools -- Ansible 2.11.5 +- Ansible 2.11.6 - apt-fast 1.9.11 - AzCopy 10.12.2 (available by `azcopy` and `azcopy10` aliases) - Bazel 4.2.1 - Bazelisk 1.10.1 -- Bicep 0.4.613 +- Bicep 0.4.1008 - Buildah 1.21.3 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - CMake 3.21.3 -- CodeQL Action Bundle 2.6.3 +- CodeQL Action Bundle 2.6.3-a - Docker Compose v1 1.29.2 - Docker Compose v2 2.0.0 - Docker-Buildx 0.6.3 - Docker-Moby Client 20.10.9+azure-1 - Docker-Moby Server 20.10.9+azure-1 -- Fastlane 2.195.0 -- Git 2.33.0 (apt source repository: ppa:git-core/ppa) +- Fastlane 2.196.0 +- Git 2.33.1 (apt source repository: ppa:git-core/ppa) - Git LFS 2.13.3 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.6.0 - Haveged 1.9.1 - Heroku 7.59.0 -- HHVM (HipHop VM) 4.130.0 +- HHVM (HipHop VM) 4.131.0 - jq 1.6 - Kind 0.11.1 - Kubectl 1.22.2 @@ -88,28 +88,28 @@ - Packer 1.7.6 - PhantomJS 2.1.1 - Podman 3.3.1 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- Pulumi 3.14.0 +- Pulumi 3.15.0 - R 4.1.1 - Skopeo 1.3.0 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 -- Terraform 1.0.8 +- Terraform 1.0.9 - yamllint 1.26.3 - yq 4.13.4 - zstd 1.5.0 (homebrew) ### CLI Tools - Alibaba Cloud CLI 3.0.94 -- AWS CLI 2.2.44 +- AWS CLI 2.2.46 - AWS CLI Session manager plugin 1.2.245.0 - AWS SAM CLI 1.33.0 -- Azure CLI (azure-cli) 2.28.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) +- Azure CLI (azure-cli) 2.29.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.20.0 -- GitHub CLI 2.0.0 +- GitHub CLI 2.1.0 - Google Cloud SDK 360.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 6.10.4 -- OpenShift CLI 4.8.13 +- Netlify CLI 6.13.2 +- OpenShift CLI 4.8.14 - ORAS CLI 0.12.0 - Vercel CLI 23.1.2 @@ -167,7 +167,7 @@ | GECKOWEBDRIVER | /usr/local/share/gecko_driver | ### .NET Core SDK -- 2.1.302 2.1.403 2.1.526 2.1.617 2.1.701 2.1.818 3.1.119 3.1.202 3.1.302 3.1.413 5.0.104 5.0.207 5.0.303 5.0.401 +- 2.1.302 2.1.403 2.1.526 2.1.617 2.1.701 2.1.818 3.1.120 3.1.202 3.1.302 3.1.414 5.0.104 5.0.208 5.0.303 5.0.402 ### Databases - MongoDB 5.0.3 (apt source repository: https://repo.mongodb.org/apt/ubuntu) @@ -194,13 +194,13 @@ #### Node.js - 10.24.1 -- 12.22.6 -- 14.18.0 +- 12.22.7 +- 14.18.1 #### PyPy -- 2.7.18 [PyPy 7.3.5] +- 2.7.18 [PyPy 7.3.6] - 3.6.12 [PyPy 7.3.3] -- 3.7.10 [PyPy 7.3.5] +- 3.7.12 [PyPy 7.3.6] #### Python - 2.7.18 @@ -209,6 +209,7 @@ - 3.7.12 - 3.8.12 - 3.9.7 +- 3.10.0 #### Ruby - 2.5.9 @@ -225,7 +226,7 @@ | GOROOT_1_17_X64 | /opt/hostedtoolcache/go/1.17.2/x64 | x64 | ### PowerShell Tools -- PowerShell 7.1.4 +- PowerShell 7.1.5 #### PowerShell Modules | Module | Version | @@ -275,22 +276,22 @@ | alpine:3.12 | sha256:a296b4c6f6ee2b88f095b61e95c7ef4f51ba25598835b4978c9256d8c8ace48a | 2021-08-31 | | alpine:3.13 | sha256:2582893dec6f12fd499d3a709477f2c0c0c1dfcd28024c93f1f0626b9e3540c8 | 2021-08-31 | | alpine:3.14 | sha256:e1c082e3d3c45cccac829840a25941e679c25d438cc8412c2fa221cf1a824e6a | 2021-08-27 | -| buildpack-deps:bullseye | sha256:781dbad21bcc644af42ec465c2adbf6d9470b256755a13b2a2eadadf331cdaf9 | 2021-09-28 | -| buildpack-deps:buster | sha256:4ab33f2a6712321207d5736d6899841e03d3cc26d50fb7489b0e4a48bf42a1d0 | 2021-09-28 | -| buildpack-deps:stretch | sha256:57d5d14748554b31c75a2e95e63c51e8cdfb24393e33c1431982123b7d0c2280 | 2021-09-28 | -| debian:10 | sha256:e5cfab8012b17d80f93a7f567797b0c8a2839069d4f50e499152162152518663 | 2021-09-28 | -| debian:11 | sha256:b6a47ddbc1de53e0024d19908f5ef7b3d870686f1234fdb2d19770e097db1575 | 2021-09-28 | -| debian:9 | sha256:c1274c24446b98394e1594ceefac1012e1b39b752586ca993fe3c3bea6f6d20f | 2021-09-28 | +| buildpack-deps:bullseye | sha256:1062c3cabe1b62d7e64609e1ebe30406b9d802684758a01fd386bbc60ea6b1aa | 2021-10-12 | +| buildpack-deps:buster | sha256:6d442a75a480d13760660675e0094e87e7b64ebd64acb43754c5ed46cb1ea532 | 2021-10-12 | +| buildpack-deps:stretch | sha256:63b243cde6ed83435eb26eda196769a37b9426abc76cc7e89ad364c3a24ce18f | 2021-10-12 | +| debian:10 | sha256:f9182ead292f45165f4a851e5ff98ea0800e172ccedce7d17764ffaae5ed4d6e | 2021-10-12 | +| debian:11 | sha256:4d6ab716de467aad58e91b1b720f0badd7478847ec7a18f66027d0f8a329a43c | 2021-10-12 | +| debian:9 | sha256:86269e614274db90a1d71dac258c74ed0a867a1d05f67dea6263b0f216ec7724 | 2021-10-12 | | moby/buildkit:latest | sha256:94bc3a93cfa5197064cfdc86e4289cead7b46a2bc95874f142fbf51c67ad2826 | 2021-10-04 | | node:10 | sha256:59531d2835edd5161c8f9512f9e095b1836f7a1fcb0ab73e005ec46047384911 | 2021-04-10 | | node:10-alpine | sha256:dc98dac24efd4254f75976c40bce46944697a110d06ce7fa47e7268470cf2e28 | 2021-04-14 | -| node:12 | sha256:86afd89e91d667a65b37e05659974ccd702b8e3b1aff30416d1f77cf67729e2b | 2021-09-28 | -| node:12-alpine | sha256:1ea5900145028957ec0e7b7e590ac677797fa8962ccec4e73188092f7bc14da5 | 2021-08-31 | -| node:14 | sha256:167d0a4af6b4e0d0769086b871a36c25faed75b72705144cabbda70466cc0d8e | 2021-09-29 | -| node:14-alpine | sha256:6e52e0b3bedfb494496488514d18bee7fd503fd4e44289ea012ad02f8f41a312 | 2021-09-29 | -| ubuntu:16.04 | sha256:454054f5bbd571b088db25b662099c6c7b3f0cb78536a2077d54adc48f00cd68 | 2021-08-31 | -| ubuntu:18.04 | sha256:bfb4cabd667790ead5c95d9fe341937f0c21118fa79bc768d51c5da9d1dbe917 | 2021-10-01 | -| ubuntu:20.04 | sha256:a0d9e826ab87bd665cfc640598a871b748b4b70a01a4f3d174d4fb02adad07a9 | 2021-10-01 | +| node:12 | sha256:9b9e79251f73f999dd440a41714a91eea34996ec809953906009592def0d4380 | 2021-10-13 | +| node:12-alpine | sha256:dfbebf17bfb014e1e7068e76325a117bccf8679c68aec6a28514184a209c8bae | 2021-10-13 | +| node:14 | sha256:109b118e0d49dd12ca6f5b84a7a9a9c8a147f75567b3ad50620bdacaf5e6320d | 2021-10-13 | +| node:14-alpine | sha256:a251de4db0e0632446c0ba62adbe1e37ff148a53732e4574d2ed0f5462cc4407 | 2021-10-13 | +| ubuntu:16.04 | sha256:0f71fa8d4d2d4292c3c617fda2b36f6dabe5c8b6e34c3dc5b0d17d4e704bd39c | 2021-08-31 | +| ubuntu:18.04 | sha256:0fedbd5bd9fb72089c7bbca476949e10593cebed9b1fb9edf5b79dbbacddd7d6 | 2021-10-01 | +| ubuntu:20.04 | sha256:626ffe58f6e7566e00254b638eb7e0f3b11d4da9675088f4781a50ae288f3322 | 2021-10-16 | ### Installed apt packages | Name | Version | @@ -322,7 +323,7 @@ | libc++-dev | 1:10.0-50\~exp1 | | libc++abi-dev | 1:10.0-50\~exp1 | | libcurl4 | 7.68.0-1ubuntu2.7 | -| libgbm-dev | 21.0.3-0ubuntu0.3\~20.04.2 | +| libgbm-dev | 21.0.3-0ubuntu0.3\~20.04.3 | | libgconf-2-4 | 3.2.6-6ubuntu1 | | libgsl-dev | 2.5+dfsg-6build1 | | libgtk-3-0 | 3.24.20-0ubuntu1 | From ec7fba496f5c7c9adf6660d2d86b10a101a369b0 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 21 Oct 2021 11:46:59 +0000 Subject: [PATCH 0641/3485] Updating readme file for win22 version 20211018.0 (#4305) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/win/Windows2022-Readme.md | 425 ++++++++++++++++--------------- 1 file changed, 213 insertions(+), 212 deletions(-) diff --git a/images/win/Windows2022-Readme.md b/images/win/Windows2022-Readme.md index abc6796b21e6..563734b42922 100644 --- a/images/win/Windows2022-Readme.md +++ b/images/win/Windows2022-Readme.md @@ -3,8 +3,8 @@ | [(Public Beta) Windows Server 2022 with Visual Studio 2022 is now available](https://github.com/actions/virtual-environments/issues/3949) | *** # Microsoft Windows Server 2022 Datacenter -- OS Version: 10.0.20348 Build 230 -- Image Version: 20211011.0 +- OS Version: 10.0.20348 Build 288 +- Image Version: 20211018.0 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -16,7 +16,7 @@ - Julia 1.6.3 - Kotlin 1.5.31 - LLVM 13.0.0 -- Node 14.18.0 +- Node 14.18.1 - PHP 8.0.10 - Python 3.9.7 - Ruby 3.0.2p107 @@ -27,11 +27,11 @@ - Helm 3.7.0 - NPM 6.14.15 - NuGet 5.11.0.10 -- pip 21.2.4 (python 3.9) +- pip 21.3 (python 3.9) - Pipx 0.16.4 - RubyGems 3.2.22 -- Vcpkg (build from master \<973a7d5>) -- Yarn 1.22.15 +- Vcpkg (build from master \<699c877>) +- Yarn 1.22.17 #### Environment variables | Name | Value | @@ -49,16 +49,15 @@ - azcopy 10.12.2 - Bazel 4.2.1 - Bazelisk 1.10.1 -- Bicep 0.4.613 -- Cabal 3.4.0.0 +- Bicep 0.4.1008 +- Cabal 3.6.2.0 - CMake 3.21.3 -- CodeQL Action Bundle 2.6.3 +- CodeQL Action Bundle 2.6.3-a - Docker 20.10.7 - Docker-compose 1.29.2 - ghc 9.0.1 -- Git 2.33.0 -- Git LFS 2.13.3 -- GVFS 1.0.21229.1 +- Git 2.33.1 +- Git LFS 3.0.1 - jq 1.6 - Kind 0.11.1 - Kubectl 1.22.2 @@ -66,8 +65,8 @@ - Mingw-w64 8.1.0 - Newman 5.3.0 - OpenSSL 1.1.1 -- Packer 1.7.5 -- Pulumi v3.14.0 +- Packer 1.7.6 +- Pulumi v3.15.0 - R 4.1.1 - Stack 2.7.3 - Subversion (SVN) 1.14.1 @@ -79,12 +78,12 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.94 -- AWS CLI 2.2.43 +- AWS CLI 2.2.46 - AWS SAM CLI 1.33.0 - AWS Session Manager CLI 1.2.245.0 -- Azure CLI 2.28.0 +- Azure CLI 2.29.0 - Azure DevOps CLI extension 0.20.0 -- GitHub CLI 2.0.0 +- GitHub CLI 2.1.0 - Hub CLI 2.14.2 ### Rust Tools @@ -104,8 +103,8 @@ ### Browsers and webdrivers - Google Chrome 94.0.4606.81 - Chrome Driver 94.0.4606.61 -- Microsoft Edge 94.0.992.38 -- Microsoft Edge Driver 94.0.992.38 +- Microsoft Edge 94.0.992.50 +- Microsoft Edge Driver 94.0.992.50 - Mozilla Firefox 93.0 - Gecko Driver 0.30.0 - IE Driver 3.150.1.1 @@ -152,8 +151,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Version | Architecture | | ------- | ------------ | | 10.24.1 | x64 | -| 12.22.6 | x64 | -| 14.18.0 | x64 | +| 12.22.7 | x64 | +| 14.18.1 | x64 | #### Python @@ -175,8 +174,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### PyPy | Python Version | PyPy Version | | -------------- | ------------ | -| 2.7.18 | PyPy 7.3.5 with MSC v.1927 64 bit (AMD64) | -| 3.7.10 | PyPy 7.3.5 with MSC v.1927 64 bit (AMD64) | +| 2.7.18 | PyPy 7.3.6 with MSC v.1929 64 bit (AMD64) | +| 3.7.12 | PyPy 7.3.6 with MSC v.1929 64 bit (AMD64) | @@ -203,7 +202,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Database tools - Azure CosmosDb Emulator 2.14.3.0 -- DacFx 15.0.5164.1 +- DacFx 15.0.5282.3 - MySQL 8.0.26.0 - SQLPS 1.0 @@ -215,181 +214,182 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Nginx | 1.21.3 | C:\tools\nginx-1.21.3\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2022 -| Name | Version | Path | -| ----------------------------- | ------------- | ----------------------------------------------------- | -| Visual Studio Enterprise 2022 | 17.0.31717.71 | C:\Program Files\Microsoft Visual Studio\2022\Preview | +| Name | Version | Path | +| ----------------------------- | -------------- | ----------------------------------------------------- | +| Visual Studio Enterprise 2022 | 17.0.31808.319 | C:\Program Files\Microsoft Visual Studio\2022\Preview | #### Workloads, components and extensions: -| Package | Version | -| ------------------------------------------------------------------------- | -------------- | -| Component.Android.NDK.R21E | 17.0.31709.181 | -| Component.Android.SDK25.Private | 17.0.31709.181 | -| Component.Android.SDK30 | 17.0.31709.181 | -| Component.Ant | 1.9.3.8 | -| Component.Linux.CMake | 17.0.31709.181 | -| Component.MDD.Android | 17.0.31709.181 | -| Component.MDD.Linux | 17.0.31709.181 | -| Component.Microsoft.VisualStudio.LiveShare | 1.0.4639 | -| Component.Microsoft.VisualStudio.RazorExtension | 17.0.31709.181 | -| Component.Microsoft.VisualStudio.Web.AzureFunctions | 17.0.31709.181 | -| Component.Microsoft.Web.LibraryManager | 17.0.31709.181 | -| Component.Microsoft.WebTools.BrowserLink.WebLivePreview | 17.0.21.8162 | -| Component.OpenJDK | 17.0.31709.181 | -| Component.UnityEngine.x64 | 17.0.31709.181 | -| Component.Unreal | 17.0.31709.181 | -| Component.Unreal.Android | 17.0.31709.181 | -| Component.Xamarin | 17.0.31709.181 | -| Component.Xamarin.RemotedSimulator | 17.0.31709.181 | -| Microsoft.Component.Azure.DataLake.Tools | 17.0.31709.181 | -| Microsoft.Component.ClickOnce | 17.0.31709.181 | -| Microsoft.Component.MSBuild | 17.0.31709.181 | -| Microsoft.Component.NetFX.Native | 17.0.31709.181 | -| Microsoft.Component.PythonTools | 17.0.31709.181 | -| Microsoft.Component.VC.Runtime.UCRTSDK | 17.0.31709.181 | -| Microsoft.ComponentGroup.Blend | 17.0.31709.181 | -| Microsoft.ComponentGroup.ClickOnce.Publish | 17.0.31709.181 | -| Microsoft.Net.Component.4.5.2.TargetingPack | 17.0.31709.181 | -| Microsoft.Net.Component.4.6.2.TargetingPack | 17.0.31709.181 | -| Microsoft.Net.Component.4.6.TargetingPack | 17.0.31709.181 | -| Microsoft.Net.Component.4.7.1.TargetingPack | 17.0.31709.181 | -| Microsoft.Net.Component.4.7.2.TargetingPack | 17.0.31709.181 | -| Microsoft.Net.Component.4.8.SDK | 17.0.31709.181 | -| Microsoft.Net.Component.4.8.TargetingPack | 17.0.31709.181 | -| Microsoft.Net.ComponentGroup.4.8.DeveloperTools | 17.0.31709.181 | -| Microsoft.Net.ComponentGroup.DevelopmentPrerequisites | 17.0.31709.181 | -| Microsoft.Net.ComponentGroup.TargetingPacks.Common | 17.0.31709.181 | -| Microsoft.NetCore.Component.DevelopmentTools | 17.0.31709.181 | -| Microsoft.NetCore.Component.Runtime.6.0 | 17.0.31716.346 | -| Microsoft.NetCore.Component.SDK | 17.0.31716.346 | -| Microsoft.NetCore.Component.Web | 17.0.31709.181 | -| Microsoft.VisualStudio.Component.AppInsights.Tools | 17.0.31709.181 | -| Microsoft.VisualStudio.Component.AspNet | 17.0.31709.181 | -| Microsoft.VisualStudio.Component.AspNet45 | 17.0.31709.181 | -| Microsoft.VisualStudio.Component.Azure.AuthoringTools | 17.0.31709.181 | -| Microsoft.VisualStudio.Component.Azure.ClientLibs | 17.0.31709.181 | -| Microsoft.VisualStudio.Component.Azure.Compute.Emulator | 17.0.31709.181 | -| Microsoft.VisualStudio.Component.Azure.Powershell | 17.0.31709.181 | -| Microsoft.VisualStudio.Component.Azure.ResourceManager.Tools | 17.0.31709.181 | -| Microsoft.VisualStudio.Component.Azure.ServiceFabric.Tools | 17.0.31709.181 | -| Microsoft.VisualStudio.Component.Azure.Waverton | 17.0.31709.181 | -| Microsoft.VisualStudio.Component.Azure.Waverton.BuildTools | 17.0.31709.181 | -| Microsoft.VisualStudio.Component.ClassDesigner | 17.0.31709.181 | -| Microsoft.VisualStudio.Component.CodeMap | 17.0.31709.181 | -| Microsoft.VisualStudio.Component.Common.Azure.Tools | 17.0.31709.181 | -| Microsoft.VisualStudio.Component.CoreEditor | 17.0.31709.181 | -| Microsoft.VisualStudio.Component.Debugger.JustInTime | 17.0.31709.181 | -| Microsoft.VisualStudio.Component.Debugger.Snapshot | 17.0.31709.181 | -| Microsoft.VisualStudio.Component.DiagnosticTools | 17.0.31709.181 | -| Microsoft.VisualStudio.Component.DockerTools | 17.0.31709.181 | -| Microsoft.VisualStudio.Component.DotNetModelBuilder | 17.0.31709.181 | -| Microsoft.VisualStudio.Component.EntityFramework | 17.0.31709.181 | -| Microsoft.VisualStudio.Component.FSharp | 17.0.31709.181 | -| Microsoft.VisualStudio.Component.FSharp.WebTemplates | 17.0.31709.181 | -| Microsoft.VisualStudio.Component.GraphDocument | 17.0.31709.181 | -| Microsoft.VisualStudio.Component.Graphics | 17.0.31709.181 | -| Microsoft.VisualStudio.Component.Graphics.Tools | 17.0.31709.181 | -| Microsoft.VisualStudio.Component.IISExpress | 17.0.31709.181 | -| Microsoft.VisualStudio.Component.IntelliCode | 17.0.31709.181 | -| Microsoft.VisualStudio.Component.IntelliTrace.FrontEnd | 17.0.31709.181 | -| Microsoft.VisualStudio.Component.JavaScript.Diagnostics | 17.0.31709.181 | -| Microsoft.VisualStudio.Component.JavaScript.TypeScript | 17.0.31709.181 | -| Microsoft.VisualStudio.Component.LinqToSql | 17.0.31709.181 | -| Microsoft.VisualStudio.Component.LiveUnitTesting | 17.0.31709.181 | -| Microsoft.VisualStudio.Component.ManagedDesktop.Core | 17.0.31709.181 | -| Microsoft.VisualStudio.Component.ManagedDesktop.Prerequisites | 17.0.31709.181 | -| Microsoft.VisualStudio.Component.Merq | 17.0.31709.181 | -| Microsoft.VisualStudio.Component.MonoDebugger | 17.0.31709.181 | -| Microsoft.VisualStudio.Component.MSODBC.SQL | 17.0.31709.181 | -| Microsoft.VisualStudio.Component.MSSQL.CMDLnUtils | 17.0.31709.181 | -| Microsoft.VisualStudio.Component.Node.Tools | 17.0.31709.181 | -| Microsoft.VisualStudio.Component.NuGet | 17.0.31709.181 | -| Microsoft.VisualStudio.Component.NuGet.BuildTools | 17.0.31709.181 | -| Microsoft.VisualStudio.Component.PortableLibrary | 17.0.31709.181 | -| Microsoft.VisualStudio.Component.Roslyn.Compiler | 17.0.31709.181 | -| Microsoft.VisualStudio.Component.Roslyn.LanguageServices | 17.0.31709.181 | -| Microsoft.VisualStudio.Component.Sharepoint.Tools | 17.0.31709.181 | -| Microsoft.VisualStudio.Component.SQL.CLR | 17.0.31709.181 | -| Microsoft.VisualStudio.Component.SQL.DataSources | 17.0.31709.181 | -| Microsoft.VisualStudio.Component.SQL.LocalDB.Runtime | 17.0.31709.181 | -| Microsoft.VisualStudio.Component.SQL.SSDT | 17.0.31709.181 | -| Microsoft.VisualStudio.Component.TeamOffice | 17.0.31709.181 | -| Microsoft.VisualStudio.Component.TestTools.CodedUITest | 17.0.31709.181 | -| Microsoft.VisualStudio.Component.TestTools.WebLoadTest | 17.0.31709.181 | -| Microsoft.VisualStudio.Component.TextTemplating | 17.0.31709.181 | -| Microsoft.VisualStudio.Component.TypeScript.TSServer | 17.0.31709.181 | -| Microsoft.VisualStudio.Component.Unity | 17.0.31709.181 | -| Microsoft.VisualStudio.Component.VC.ASAN | 17.0.31709.181 | -| Microsoft.VisualStudio.Component.VC.ATL | 17.0.31709.181 | -| Microsoft.VisualStudio.Component.VC.ATL.ARM | 17.0.31709.181 | -| Microsoft.VisualStudio.Component.VC.ATL.ARM64 | 17.0.31709.181 | -| Microsoft.VisualStudio.Component.VC.ATL.ARM64EC | 17.0.31709.181 | -| Microsoft.VisualStudio.Component.VC.ATL.Spectre | 17.0.31709.181 | -| Microsoft.VisualStudio.Component.VC.ATLMFC | 17.0.31709.181 | -| Microsoft.VisualStudio.Component.VC.ATLMFC.Spectre | 17.0.31709.181 | -| Microsoft.VisualStudio.Component.VC.CLI.Support | 17.0.31709.181 | -| Microsoft.VisualStudio.Component.VC.CMake.Project | 17.0.31709.181 | -| Microsoft.VisualStudio.Component.VC.CoreIde | 17.0.31709.181 | -| Microsoft.VisualStudio.Component.VC.DiagnosticTools | 17.0.31709.181 | -| Microsoft.VisualStudio.Component.VC.Llvm.ClangToolset | 17.0.31709.181 | -| Microsoft.VisualStudio.Component.VC.MFC.ARM | 17.0.31709.181 | -| Microsoft.VisualStudio.Component.VC.MFC.ARM64 | 17.0.31709.181 | -| Microsoft.VisualStudio.Component.VC.MFC.ARM64EC | 17.0.31709.181 | -| Microsoft.VisualStudio.Component.VC.Redist.14.Latest | 17.0.31709.181 | -| Microsoft.VisualStudio.Component.VC.Runtimes.x86.x64.Spectre | 17.0.31709.181 | -| Microsoft.VisualStudio.Component.VC.TestAdapterForBoostTest | 17.0.31709.181 | -| Microsoft.VisualStudio.Component.VC.TestAdapterForGoogleTest | 17.0.31709.181 | -| Microsoft.VisualStudio.Component.VC.Tools.ARM | 17.0.31709.181 | -| Microsoft.VisualStudio.Component.VC.Tools.ARM64 | 17.0.31709.181 | -| Microsoft.VisualStudio.Component.VC.Tools.ARM64EC | 17.0.31709.181 | -| Microsoft.VisualStudio.Component.VC.Tools.x86.x64 | 17.0.31709.181 | -| Microsoft.VisualStudio.Component.VC.v141.ATL | 17.0.31709.181 | -| Microsoft.VisualStudio.Component.VC.v141.ATL.Spectre | 17.0.31709.181 | -| Microsoft.VisualStudio.Component.VC.v141.MFC | 17.0.31709.181 | -| Microsoft.VisualStudio.Component.VC.v141.MFC.Spectre | 17.0.31709.181 | -| Microsoft.VisualStudio.Component.VC.v141.x86.x64 | 17.0.31709.181 | -| Microsoft.VisualStudio.Component.VC.v141.x86.x64.Spectre | 17.0.31709.181 | -| Microsoft.VisualStudio.Component.VSSDK | 17.0.31709.181 | -| Microsoft.VisualStudio.Component.Wcf.Tooling | 17.0.31709.181 | -| Microsoft.VisualStudio.Component.Web | 17.0.31709.181 | -| Microsoft.VisualStudio.Component.WebDeploy | 17.0.31709.181 | -| Microsoft.VisualStudio.Component.Windows10SDK | 17.0.31709.181 | -| Microsoft.VisualStudio.Component.Windows10SDK.19041 | 17.0.31709.181 | -| Microsoft.VisualStudio.Component.Windows10SDK.20348 | 17.0.31709.181 | -| Microsoft.VisualStudio.Component.Workflow | 17.0.31709.181 | -| Microsoft.VisualStudio.Component.WslDebugging | 17.0.31709.181 | -| Microsoft.VisualStudio.ComponentGroup.ArchitectureTools.Native | 17.0.31709.181 | -| Microsoft.VisualStudio.ComponentGroup.Azure.CloudServices | 17.0.31709.181 | -| Microsoft.VisualStudio.ComponentGroup.Azure.Prerequisites | 17.0.31709.181 | -| Microsoft.VisualStudio.ComponentGroup.Azure.ResourceManager.Tools | 17.0.31709.181 | -| Microsoft.VisualStudio.ComponentGroup.AzureFunctions | 17.0.31709.181 | -| Microsoft.VisualStudio.ComponentGroup.MSIX.Packaging | 17.0.31709.181 | -| Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core | 17.0.31709.181 | -| Microsoft.VisualStudio.ComponentGroup.UWP.NetCoreAndStandard | 17.0.31709.181 | -| Microsoft.VisualStudio.ComponentGroup.UWP.Support | 17.0.31709.181 | -| Microsoft.VisualStudio.ComponentGroup.UWP.Xamarin | 17.0.31709.181 | -| Microsoft.VisualStudio.ComponentGroup.VisualStudioExtension.Prerequisites | 17.0.31709.181 | -| Microsoft.VisualStudio.ComponentGroup.Web | 17.0.31709.181 | -| Microsoft.VisualStudio.ComponentGroup.Web.CloudTools | 17.0.31709.181 | -| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions | 17.0.31709.181 | -| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.CMake | 17.0.31709.181 | -| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.TemplateEngine | 17.0.31709.181 | -| Microsoft.VisualStudio.Workload.Azure | 17.0.31709.181 | -| Microsoft.VisualStudio.Workload.CoreEditor | 17.0.31709.181 | -| Microsoft.VisualStudio.Workload.Data | 17.0.31709.181 | -| Microsoft.VisualStudio.Workload.ManagedDesktop | 17.0.31709.181 | -| Microsoft.VisualStudio.Workload.ManagedGame | 17.0.31709.181 | -| Microsoft.VisualStudio.Workload.NativeCrossPlat | 17.0.31709.181 | -| Microsoft.VisualStudio.Workload.NativeDesktop | 17.0.31709.181 | -| Microsoft.VisualStudio.Workload.NativeGame | 17.0.31709.181 | -| Microsoft.VisualStudio.Workload.NativeMobile | 17.0.31709.181 | -| Microsoft.VisualStudio.Workload.NetCrossPlat | 17.0.31709.181 | -| Microsoft.VisualStudio.Workload.NetWeb | 17.0.31709.181 | -| Microsoft.VisualStudio.Workload.Node | 17.0.31709.181 | -| Microsoft.VisualStudio.Workload.Office | 17.0.31709.181 | -| Microsoft.VisualStudio.Workload.Python | 17.0.31709.181 | -| Microsoft.VisualStudio.Workload.Universal | 17.0.31709.181 | -| Microsoft.VisualStudio.Workload.VisualStudioExtension | 17.0.31709.181 | +| Package | Version | +| ------------------------------------------------------------------------- | --------------- | +| Component.Android.NDK.R21E | 17.0.31804.368 | +| Component.Android.SDK.MAUI | 17.0.31804.368 | +| Component.Android.SDK25.Private | 17.0.31804.368 | +| Component.Ant | 1.9.3.8 | +| Component.Linux.CMake | 17.0.31804.368 | +| Component.MDD.Android | 17.0.31804.368 | +| Component.MDD.Linux | 17.0.31804.368 | +| Component.Microsoft.VisualStudio.LiveShare.2022 | 1.0.4647 | +| Component.Microsoft.VisualStudio.RazorExtension | 17.0.31804.368 | +| Component.Microsoft.VisualStudio.Web.AzureFunctions | 17.0.31804.368 | +| Component.Microsoft.Web.LibraryManager | 17.0.31804.368 | +| Component.Microsoft.WebTools.BrowserLink.WebLivePreview | 17.0.31.12604 | +| Component.OpenJDK | 17.0.31804.368 | +| Component.UnityEngine.x64 | 17.0.31804.368 | +| Component.Unreal | 17.0.31804.368 | +| Component.Unreal.Android | 17.0.31804.368 | +| Component.Xamarin | 17.0.31804.368 | +| Component.Xamarin.RemotedSimulator | 17.0.31807.282 | +| Microsoft.Component.Azure.DataLake.Tools | 17.0.31805.14 | +| Microsoft.Component.ClickOnce | 17.0.31804.368 | +| Microsoft.Component.MSBuild | 17.0.31804.368 | +| Microsoft.Component.NetFX.Native | 17.0.31804.368 | +| Microsoft.Component.PythonTools | 17.0.31804.368 | +| Microsoft.Component.VC.Runtime.UCRTSDK | 17.0.31804.368 | +| Microsoft.ComponentGroup.Blend | 17.0.31804.368 | +| Microsoft.ComponentGroup.ClickOnce.Publish | 17.0.31804.368 | +| Microsoft.Net.Component.4.5.2.TargetingPack | 17.0.31804.368 | +| Microsoft.Net.Component.4.6.2.TargetingPack | 17.0.31804.368 | +| Microsoft.Net.Component.4.6.TargetingPack | 17.0.31804.368 | +| Microsoft.Net.Component.4.7.1.TargetingPack | 17.0.31804.368 | +| Microsoft.Net.Component.4.7.2.TargetingPack | 17.0.31804.368 | +| Microsoft.Net.Component.4.8.SDK | 17.0.31804.368 | +| Microsoft.Net.Component.4.8.TargetingPack | 17.0.31804.368 | +| Microsoft.Net.ComponentGroup.4.8.DeveloperTools | 17.0.31804.368 | +| Microsoft.Net.ComponentGroup.DevelopmentPrerequisites | 17.0.31804.368 | +| Microsoft.Net.ComponentGroup.TargetingPacks.Common | 17.0.31804.368 | +| Microsoft.NetCore.Component.DevelopmentTools | 17.0.31804.368 | +| Microsoft.NetCore.Component.Runtime.6.0 | 17.0.31807.268 | +| Microsoft.NetCore.Component.SDK | 17.0.31807.268 | +| Microsoft.NetCore.Component.Web | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.AppInsights.Tools | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.AspNet | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.AspNet45 | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.Azure.AuthoringTools | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.Azure.ClientLibs | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.Azure.Compute.Emulator | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.Azure.Powershell | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.Azure.ResourceManager.Tools | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.Azure.ServiceFabric.Tools | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.Azure.Waverton | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.Azure.Waverton.BuildTools | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.ClassDesigner | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.CodeMap | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.Common.Azure.Tools | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.CoreEditor | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.Debugger.JustInTime | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.Debugger.Snapshot | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.DiagnosticTools | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.DockerTools | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.DotNetModelBuilder | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.EntityFramework | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.FSharp | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.FSharp.WebTemplates | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.GraphDocument | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.Graphics | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.Graphics.Tools | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.IISExpress | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.IntelliCode | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.IntelliTrace.FrontEnd | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.JavaScript.Diagnostics | 17.0.31805.14 | +| Microsoft.VisualStudio.Component.JavaScript.TypeScript | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.LinqToSql | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.LiveUnitTesting | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.ManagedDesktop.Core | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.ManagedDesktop.Prerequisites | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.Merq | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.MonoDebugger | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.MSODBC.SQL | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.MSSQL.CMDLnUtils | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.Node.Tools | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.NuGet | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.NuGet.BuildTools | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.PortableLibrary | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.Roslyn.Compiler | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.Roslyn.LanguageServices | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.Sharepoint.Tools | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.SQL.CLR | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.SQL.DataSources | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.SQL.LocalDB.Runtime | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.SQL.SSDT | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.TeamOffice | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.TestTools.CodedUITest | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.TestTools.WebLoadTest | 17.0.31805.14 | +| Microsoft.VisualStudio.Component.TextTemplating | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.TypeScript.TSServer | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.Unity | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.VC.ASAN | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.VC.ATL | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.VC.ATL.ARM | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.VC.ATL.ARM64 | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.VC.ATL.ARM64EC | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.VC.ATL.Spectre | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.VC.ATLMFC | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.VC.ATLMFC.Spectre | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.VC.CLI.Support | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.VC.CMake.Project | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.VC.CoreIde | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.VC.DiagnosticTools | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.VC.Llvm.ClangToolset | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.VC.MFC.ARM | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.VC.MFC.ARM64 | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.VC.MFC.ARM64EC | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.VC.Redist.14.Latest | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.VC.Runtimes.x86.x64.Spectre | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.VC.TestAdapterForBoostTest | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.VC.TestAdapterForGoogleTest | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.VC.Tools.ARM | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.VC.Tools.ARM64 | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.VC.Tools.ARM64EC | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.VC.Tools.x86.x64 | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.VC.v141.ATL | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.VC.v141.ATL.Spectre | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.VC.v141.MFC | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.VC.v141.MFC.Spectre | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.VC.v141.x86.x64 | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.VC.v141.x86.x64.Spectre | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.VSSDK | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.Wcf.Tooling | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.Web | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.WebDeploy | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.Windows10SDK | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.Windows10SDK.19041 | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.Windows10SDK.20348 | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.Windows11SDK.22000 | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.Workflow | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.WslDebugging | 17.0.31804.368 | +| Microsoft.VisualStudio.ComponentGroup.ArchitectureTools.Native | 17.0.31804.368 | +| Microsoft.VisualStudio.ComponentGroup.Azure.CloudServices | 17.0.31804.368 | +| Microsoft.VisualStudio.ComponentGroup.Azure.Prerequisites | 17.0.31804.368 | +| Microsoft.VisualStudio.ComponentGroup.Azure.ResourceManager.Tools | 17.0.31804.368 | +| Microsoft.VisualStudio.ComponentGroup.AzureFunctions | 17.0.31804.368 | +| Microsoft.VisualStudio.ComponentGroup.MSIX.Packaging | 17.0.31806.525 | +| Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core | 17.0.31804.368 | +| Microsoft.VisualStudio.ComponentGroup.UWP.NetCoreAndStandard | 17.0.31804.368 | +| Microsoft.VisualStudio.ComponentGroup.UWP.Support | 17.0.31804.368 | +| Microsoft.VisualStudio.ComponentGroup.UWP.Xamarin | 17.0.31804.368 | +| Microsoft.VisualStudio.ComponentGroup.VisualStudioExtension.Prerequisites | 17.0.31804.368 | +| Microsoft.VisualStudio.ComponentGroup.Web | 17.0.31804.368 | +| Microsoft.VisualStudio.ComponentGroup.Web.CloudTools | 17.0.31804.368 | +| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions | 17.0.31804.368 | +| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.CMake | 17.0.31804.368 | +| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.TemplateEngine | 17.0.31804.368 | +| Microsoft.VisualStudio.Workload.Azure | 17.0.31804.368 | +| Microsoft.VisualStudio.Workload.CoreEditor | 17.0.31804.368 | +| Microsoft.VisualStudio.Workload.Data | 17.0.31804.368 | +| Microsoft.VisualStudio.Workload.ManagedDesktop | 17.0.31804.368 | +| Microsoft.VisualStudio.Workload.ManagedGame | 17.0.31804.368 | +| Microsoft.VisualStudio.Workload.NativeCrossPlat | 17.0.31804.368 | +| Microsoft.VisualStudio.Workload.NativeDesktop | 17.0.31804.368 | +| Microsoft.VisualStudio.Workload.NativeGame | 17.0.31804.368 | +| Microsoft.VisualStudio.Workload.NativeMobile | 17.0.31804.368 | +| Microsoft.VisualStudio.Workload.NetCrossPlat | 17.0.31807.5358 | +| Microsoft.VisualStudio.Workload.NetWeb | 17.0.31804.368 | +| Microsoft.VisualStudio.Workload.Node | 17.0.31804.368 | +| Microsoft.VisualStudio.Workload.Office | 17.0.31804.368 | +| Microsoft.VisualStudio.Workload.Python | 17.0.31804.368 | +| Microsoft.VisualStudio.Workload.Universal | 17.0.31804.368 | +| Microsoft.VisualStudio.Workload.VisualStudioExtension | 17.0.31804.368 | #### Microsoft Visual C++: @@ -397,26 +397,26 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | -------------------------------------------- | ------------ | ----------- | | Microsoft Visual C++ 2013 Additional Runtime | x64 | 12.0.40660 | | Microsoft Visual C++ 2013 Minimum Runtime | x64 | 12.0.40660 | -| Microsoft Visual C++ 2022 Additional Runtime | x64 | 14.30.30528 | -| Microsoft Visual C++ 2022 Debug Runtime | x64 | 14.30.30528 | -| Microsoft Visual C++ 2022 Minimum Runtime | x64 | 14.30.30528 | -| Microsoft Visual C++ 2022 Additional Runtime | x86 | 14.30.30528 | -| Microsoft Visual C++ 2022 Debug Runtime | x86 | 14.30.30528 | -| Microsoft Visual C++ 2022 Minimum Runtime | x86 | 14.30.30528 | +| Microsoft Visual C++ 2022 Additional Runtime | x64 | 14.30.30704 | +| Microsoft Visual C++ 2022 Debug Runtime | x64 | 14.30.30704 | +| Microsoft Visual C++ 2022 Minimum Runtime | x64 | 14.30.30704 | +| Microsoft Visual C++ 2022 Additional Runtime | x86 | 14.30.30704 | +| Microsoft Visual C++ 2022 Debug Runtime | x86 | 14.30.30704 | +| Microsoft Visual C++ 2022 Minimum Runtime | x86 | 14.30.30704 | ### .NET Core SDK `Location C:\Program Files\dotnet\sdk` -- 3.1.119 3.1.202 3.1.302 3.1.413 5.0.104 5.0.207 5.0.303 5.0.401 6.0.100-rc.1.21463.6 +- 3.1.120 3.1.202 3.1.302 3.1.414 5.0.104 5.0.208 5.0.303 5.0.402 6.0.100-rc.2.21505.57 ### .NET Core Runtime `Location: C:\Program Files\dotnet\shared\Microsoft.AspNetCore.App` -- 3.1.4 3.1.6 3.1.18 3.1.19 5.0.4 5.0.9 5.0.10 6.0.0-rc.1.21452.15 +- 3.1.4 3.1.6 3.1.19 3.1.20 5.0.4 5.0.9 5.0.10 5.0.11 6.0.0-rc.2.21480.10 `Location: C:\Program Files\dotnet\shared\Microsoft.NETCore.App` -- 3.1.4 3.1.6 3.1.18 3.1.19 5.0.4 5.0.9 5.0.10 6.0.0-rc.1.21451.13 +- 3.1.4 3.1.6 3.1.19 3.1.20 5.0.4 5.0.9 5.0.10 5.0.11 6.0.0-rc.2.21480.5 `Location: C:\Program Files\dotnet\shared\Microsoft.WindowsDesktop.App` -- 3.1.4 3.1.6 3.1.19 5.0.4 5.0.9 5.0.10 6.0.0-rc.1.21451.3 +- 3.1.4 3.1.6 3.1.20 5.0.4 5.0.9 5.0.11 6.0.0-rc.2.21501.6 ### .NET Framework `Type: Developer Pack` @@ -424,7 +424,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 4.8 ### PowerShell Tools -- PowerShell 7.1.4 +- PowerShell 7.1.5 #### Azure Powershell Modules | Module | Version | Path | @@ -442,6 +442,7 @@ All other versions are saved but not installed. | ------------------ | ---------------- | | DockerMsftProvider | 1.0.0.8 | | MarkdownPS | 1.9 | +| Microsoft.Graph | 1.7.0 | | Pester | 3.4.0
5.3.1 | | PowerShellGet | 1.0.0.1
2.2.5 | | PSScriptAnalyzer | 1.20.0 | @@ -477,11 +478,11 @@ All other versions are saved but not installed. ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2022 | sha256:b4f5f7e22ab51300c50ea544663d636a92b3b27510826888f74bb198a8fac491 | 2021-09-14 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2022 | sha256:b5e12302fb9a9e541dd2a9be0204753c7686a410dbdbfbdbac3edf3255b69e2d | 2021-09-14 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:d3207fda5c642d4658422f49b4bf2685331506da3723d0ac545a66a4623845c9 | 2021-09-14 | -| mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:2957ba15f3e5704fdb5097703c6b124fbd405a2455eda9f2839e13885faf3788 | 2021-09-13 | -| mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:591f3c76c17869b99700815aa259f728a92f4912dcd68bcce21b7e9a4309cda4 | 2021-09-13 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2022 | sha256:4d22d9b5d0a5338a88d4b4127c0cacc6396d805e29c118583f468a5aea91d11d | 2021-10-12 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2022 | sha256:83db307a518011c4759daaff65d8c913d4dd53f8a2e55eaae7a1b2310536c49c | 2021-10-12 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:0336b90d7653044a87d7d6a974a0fc9f1d675a3163601d24b824f787a8811bea | 2021-10-12 | +| mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:b6f730b1dc1de3d6158ec284eb90a3bf657a70ad67201dcb98b51d05ff0ae3a3 | 2021-10-07 | +| mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:7a755066b33150c44ab196118e84a070df556bcaeccb08818d1993eb3a37a6b8 | 2021-10-07 | From 479bc3f1ea7db39653dd95318ddcdd7dfab9198d Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Thu, 21 Oct 2021 17:53:30 +0300 Subject: [PATCH 0642/3485] Add symlink for Xcode 12.5 (#4321) --- images/macos/toolsets/toolset-11.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index 1b1b1501e767..d8272bf0a06a 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -5,7 +5,7 @@ { "link": "13.1", "version": "13.1.0" }, { "link": "13.0", "version": "13.0.0" }, { "link": "13.0_beta", "version": "13 beta 5", "skip-symlink": "true" }, - { "link": "12.5.1", "version": "12.5.1" }, + { "link": "12.5.1", "version": "12.5.1", "symlinks": ["12.5"] }, { "link": "12.4", "version": "12.4.0" }, { "link": "11.7", "version": "11.7.0", "symlinks": ["11.7_beta"] } ] From 94c5dcadbd52bdeb3dd4e5c096e13e4562b7bab9 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 21 Oct 2021 15:23:12 +0000 Subject: [PATCH 0643/3485] Updating readme file for win19 version 20211018.0 (#4306) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/win/Windows2019-Readme.md | 78 ++++++++++++++++---------------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index 70b5785f179a..a42a518406d3 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -3,8 +3,8 @@ | [(Public Beta) Windows Server 2022 with Visual Studio 2022 is now available](https://github.com/actions/virtual-environments/issues/3949) | *** # Microsoft Windows Server 2019 Datacenter -- OS Version: 10.0.17763 Build 2183 -- Image Version: 20211011.0 +- OS Version: 10.0.17763 Build 2237 +- Image Version: 20211018.0 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -16,7 +16,7 @@ - Julia 1.6.3 - Kotlin 1.5.31 - LLVM 13.0.0 -- Node 14.18.0 +- Node 14.18.1 - Perl 5.32.1 - PHP 8.0.10 - Python 3.7.9 @@ -29,11 +29,11 @@ - Miniconda 4.10.3 (pre-installed on the image but not added to PATH) - NPM 6.14.15 - NuGet 5.11.0.10 -- pip 21.2.4 (python 3.7) +- pip 21.3 (python 3.7) - Pipx 0.16.4 - RubyGems 2.7.6.3 -- Vcpkg (build from master \<1d4128f>) -- Yarn 1.22.15 +- Vcpkg (build from master \<699c877>) +- Yarn 1.22.17 #### Environment variables | Name | Value | @@ -53,17 +53,16 @@ - azcopy 10.12.2 - Bazel 4.2.1 - Bazelisk 1.10.1 -- Bicep 0.4.613 -- Cabal 3.4.0.0 +- Bicep 0.4.1008 +- Cabal 3.6.2.0 - CMake 3.21.3 -- CodeQL Action Bundle 2.6.3 +- CodeQL Action Bundle 2.6.3-a - Docker 20.10.7 - Docker-compose 1.29.2 - ghc 9.0.1 -- Git 2.33.0 -- Git LFS 2.13.3 +- Git 2.33.1 +- Git LFS 3.0.1 - Google Cloud SDK 360.0.0 -- GVFS 1.0.21229.1 - InnoSetup 6.2.0 - jq 1.6 - Kind 0.11.1 @@ -73,8 +72,8 @@ - Newman 5.3.0 - NSIS v3.06.1 - OpenSSL 1.1.1 -- Packer 1.7.5 -- Pulumi v3.14.0 +- Packer 1.7.6 +- Pulumi v3.15.0 - R 4.1.1 - Stack 2.7.3 - Subversion (SVN) 1.14.1 @@ -86,13 +85,13 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.94 -- AWS CLI 2.2.43 +- AWS CLI 2.2.46 - AWS SAM CLI 1.33.0 - AWS Session Manager CLI 1.2.245.0 -- Azure CLI 2.28.0 +- Azure CLI 2.29.0 - Azure DevOps CLI extension 0.20.0 - Cloud Foundry CLI 6.53.0 -- GitHub CLI 2.0.0 +- GitHub CLI 2.1.0 - Hub CLI 2.14.2 ### Rust Tools @@ -112,8 +111,8 @@ ### Browsers and webdrivers - Google Chrome 94.0.4606.81 - Chrome Driver 94.0.4606.61 -- Microsoft Edge 94.0.992.38 -- Microsoft Edge Driver 94.0.992.38 +- Microsoft Edge 94.0.992.50 +- Microsoft Edge Driver 94.0.992.50 - Mozilla Firefox 93.0 - Gecko Driver 0.30.0 - IE Driver 3.150.1.1 @@ -165,8 +164,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Version | Architecture | | ------- | ------------ | | 10.24.1 | x64 | -| 12.22.6 | x64 | -| 14.18.0 | x64 | +| 12.22.7 | x64 | +| 14.18.1 | x64 | #### Python @@ -194,9 +193,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### PyPy | Python Version | PyPy Version | | -------------- | ------------ | -| 2.7.18 | PyPy 7.3.5 with MSC v.1927 64 bit (AMD64) | +| 2.7.18 | PyPy 7.3.6 with MSC v.1929 64 bit (AMD64) | | 3.6.12 | PyPy 7.3.3 with MSC v.1927 32 bit | -| 3.7.10 | PyPy 7.3.5 with MSC v.1927 64 bit (AMD64) | +| 3.7.12 | PyPy 7.3.6 with MSC v.1929 64 bit (AMD64) | @@ -223,7 +222,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Database tools - Azure CosmosDb Emulator 2.14.3.0 -- DacFx 15.0.5164.1 +- DacFx 15.0.5282.3 - MySQL 5.7.35.0 - SQLPS 1.0 @@ -237,13 +236,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.11.31727.386 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | +| Visual Studio Enterprise 2019 | 16.11.31729.503 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | #### Workloads, components and extensions: | Package | Version | | ------------------------------------------------------------------------- | --------------- | -| Component.Android.NDK.R16B | 16.11.31727.140 | +| Component.Android.NDK.R16B | 16.11.31729.444 | | Component.Android.SDK25.Private | 16.0.28625.61 | | Component.Android.SDK30 | 16.10.31205.252 | | Component.Ant | 1.9.3.8 | @@ -298,9 +297,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.Net.ComponentGroup.DevelopmentPrerequisites | 16.3.29207.166 | | Microsoft.Net.ComponentGroup.TargetingPacks.Common | 16.0.28516.191 | | Microsoft.NetCore.Component.DevelopmentTools | 16.10.31303.231 | -| Microsoft.NetCore.Component.Runtime.3.1 | 16.11.31701.289 | -| Microsoft.NetCore.Component.Runtime.5.0 | 16.11.31701.289 | -| Microsoft.NetCore.Component.SDK | 16.11.31701.289 | +| Microsoft.NetCore.Component.Runtime.3.1 | 16.11.31729.444 | +| Microsoft.NetCore.Component.Runtime.5.0 | 16.11.31729.444 | +| Microsoft.NetCore.Component.SDK | 16.11.31729.444 | | Microsoft.NetCore.Component.Web | 16.10.31303.231 | | Microsoft.VisualStudio.Component.AppInsights.Tools | 16.5.29515.121 | | Microsoft.VisualStudio.Component.AspNet45 | 16.10.31205.252 | @@ -495,20 +494,20 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### .NET Core SDK `Location C:\Program Files\dotnet\sdk` -- 2.1.302 2.1.403 2.1.526 2.1.617 2.1.701 2.1.818 3.1.119 3.1.202 3.1.302 3.1.413 5.0.104 5.0.207 5.0.303 5.0.401 +- 2.1.302 2.1.403 2.1.526 2.1.617 2.1.701 2.1.818 3.1.120 3.1.202 3.1.302 3.1.414 5.0.104 5.0.208 5.0.303 5.0.402 ### .NET Core Runtime `Location: C:\Program Files\dotnet\shared\Microsoft.AspNetCore.All` - 2.1.2 2.1.5 2.1.12 2.1.24 2.1.30 `Location: C:\Program Files\dotnet\shared\Microsoft.AspNetCore.App` -- 2.1.2 2.1.5 2.1.12 2.1.24 2.1.30 3.1.4 3.1.6 3.1.19 5.0.4 5.0.9 5.0.10 +- 2.1.2 2.1.5 2.1.12 2.1.24 2.1.30 3.1.4 3.1.6 3.1.20 5.0.4 5.0.9 5.0.11 `Location: C:\Program Files\dotnet\shared\Microsoft.NETCore.App` -- 2.1.2 2.1.5 2.1.12 2.1.24 2.1.30 3.1.4 3.1.6 3.1.19 5.0.4 5.0.9 5.0.10 +- 2.1.2 2.1.5 2.1.12 2.1.24 2.1.30 3.1.4 3.1.6 3.1.20 5.0.4 5.0.9 5.0.11 `Location: C:\Program Files\dotnet\shared\Microsoft.WindowsDesktop.App` -- 3.1.4 3.1.6 3.1.19 5.0.4 5.0.9 5.0.10 +- 3.1.4 3.1.6 3.1.20 5.0.4 5.0.9 5.0.11 ### .NET Framework `Type: Developer Pack` @@ -516,7 +515,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 4.7.2 4.8 ### PowerShell Tools -- PowerShell 7.1.4 +- PowerShell 7.1.5 #### Azure Powershell Modules | Module | Version | Path | @@ -534,6 +533,7 @@ All other versions are saved but not installed. | ------------------ | ---------------- | | DockerMsftProvider | 1.0.0.8 | | MarkdownPS | 1.9 | +| Microsoft.Graph | 1.7.0 | | Pester | 3.4.0
5.3.1 | | PowerShellGet | 1.0.0.1
2.2.5 | | PSScriptAnalyzer | 1.20.0 | @@ -570,11 +570,11 @@ All other versions are saved but not installed. ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:ff55a743a870b75591d2386b140867552b7f976f9250389e527b6f132d1d1629 | 2021-09-14 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:a3acbe2669d7290fbb04cd2c8a865fbee48ed45cb9a95b1183e386defd33213b | 2021-09-14 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:067c989576d5c60490585967a76313f9d8543ebda2dcbb447e81d741e6b2d017 | 2021-09-14 | -| mcr.microsoft.com/windows/nanoserver:1809 | sha256:03ee436d47400ad04331b22bff41b54c31f5391c91ef05c3dbadb6d2eb511cd2 | 2021-09-13 | -| mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:2b33eda096538c803fbf0c03dc7ea42c3c1b713e30aae03116d989867eda2bf8 | 2021-09-13 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:695800879b816ecb5e4c916ffae424549cbfe8f26d652020f8e5e26393719e93 | 2021-10-12 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:a713050b9d9d940565e37d50a0e5109259eaf985997c4f28ec568f088962908c | 2021-10-12 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:82047a37202950bc5fcb6f47938f9b2871f94bde9bddf7f574a859289e15103c | 2021-10-12 | +| mcr.microsoft.com/windows/nanoserver:1809 | sha256:4f06e1d8263b934d2e88dc1c6ff402f5b499c4d19ad6d0e2a5b9ee945f782928 | 2021-10-07 | +| mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:3fef9b0eac4a5d8b7d455dd07c3d8d3947657cc98bc48b0a02546ca5d782a4d5 | 2021-10-07 | From db36e4a62263e85eca99d50eb03e2403721d8976 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 21 Oct 2021 21:04:56 +0000 Subject: [PATCH 0644/3485] Updating readme file for win16 version 20211018.0 (#4304) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/win/Windows2016-Readme.md | 68 ++++++++++++++++---------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/images/win/Windows2016-Readme.md b/images/win/Windows2016-Readme.md index d877b956e78d..02ff6cfd0cf5 100644 --- a/images/win/Windows2016-Readme.md +++ b/images/win/Windows2016-Readme.md @@ -3,8 +3,8 @@ | [(Public Beta) Windows Server 2022 with Visual Studio 2022 is now available](https://github.com/actions/virtual-environments/issues/3949) | *** # Microsoft Windows Server 2016 Datacenter -- OS Version: 10.0.14393 Build 4651 -- Image Version: 20211011.0 +- OS Version: 10.0.14393 Build 4704 +- Image Version: 20211018.0 ## Installed Software ### Language and Runtime @@ -13,7 +13,7 @@ - Julia 1.6.3 - Kotlin 1.5.31 - LLVM 13.0.0 -- Node 14.18.0 +- Node 14.18.1 - Perl 5.32.1 - PHP 8.0.10 - Python 3.7.9 @@ -26,11 +26,11 @@ - Miniconda 4.10.3 (pre-installed on the image but not added to PATH) - NPM 6.14.15 - NuGet 5.11.0.10 -- pip 21.2.4 (python 3.7) +- pip 21.3 (python 3.7) - Pipx 0.16.4 - RubyGems 2.7.6.3 -- Vcpkg (build from master \<1d4128f>) -- Yarn 1.22.15 +- Vcpkg (build from master \<699c877>) +- Yarn 1.22.17 #### Environment variables | Name | Value | @@ -50,17 +50,16 @@ - azcopy 10.12.2 - Bazel 4.2.1 - Bazelisk 1.10.1 -- Bicep 0.4.613 -- Cabal 3.4.0.0 +- Bicep 0.4.1008 +- Cabal 3.6.2.0 - CMake 3.21.3 -- CodeQL Action Bundle 2.6.3 +- CodeQL Action Bundle 2.6.3-a - Docker 20.10.7 - Docker-compose 1.29.2 - ghc 9.0.1 -- Git 2.33.0 -- Git LFS 2.13.3 +- Git 2.33.1 +- Git LFS 3.0.1 - Google Cloud SDK 360.0.0 -- GVFS 1.0.21229.1 - InnoSetup 6.2.0 - jq 1.6 - Kind 0.11.1 @@ -70,8 +69,8 @@ - Newman 5.3.0 - NSIS v3.06.1 - OpenSSL 1.1.1 -- Packer 1.7.5 -- Pulumi v3.14.0 +- Packer 1.7.6 +- Pulumi v3.15.0 - R 4.1.1 - Stack 2.7.3 - Subversion (SVN) 1.14.1 @@ -83,13 +82,13 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.94 -- AWS CLI 2.2.43 +- AWS CLI 2.2.46 - AWS SAM CLI 1.33.0 - AWS Session Manager CLI 1.2.245.0 -- Azure CLI 2.28.0 +- Azure CLI 2.29.0 - Azure DevOps CLI extension 0.20.0 - Cloud Foundry CLI 6.53.0 -- GitHub CLI 2.0.0 +- GitHub CLI 2.1.0 - Hub CLI 2.14.2 ### Rust Tools @@ -109,8 +108,8 @@ ### Browsers and webdrivers - Google Chrome 94.0.4606.81 - Chrome Driver 94.0.4606.61 -- Microsoft Edge 94.0.992.38 -- Microsoft Edge Driver 94.0.992.38 +- Microsoft Edge 94.0.992.50 +- Microsoft Edge Driver 94.0.992.50 - Mozilla Firefox 93.0 - Gecko Driver 0.30.0 - IE Driver 3.150.1.1 @@ -159,8 +158,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Version | Architecture | | ------- | ------------ | | 10.24.1 | x64 | -| 12.22.6 | x64 | -| 14.18.0 | x64 | +| 12.22.7 | x64 | +| 14.18.1 | x64 | #### Python @@ -188,9 +187,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### PyPy | Python Version | PyPy Version | | -------------- | ------------ | -| 2.7.18 | PyPy 7.3.5 with MSC v.1927 64 bit (AMD64) | +| 2.7.18 | PyPy 7.3.6 with MSC v.1929 64 bit (AMD64) | | 3.6.12 | PyPy 7.3.3 with MSC v.1927 32 bit | -| 3.7.10 | PyPy 7.3.5 with MSC v.1927 64 bit (AMD64) | +| 3.7.12 | PyPy 7.3.6 with MSC v.1929 64 bit (AMD64) | @@ -217,7 +216,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Database tools - Azure CosmosDb Emulator 2.14.3.0 -- DacFx 15.0.5164.1 +- DacFx 15.0.5282.3 - MySQL 5.7.35.0 - SQLPS 1.0 @@ -231,7 +230,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Visual Studio Enterprise 2017 | Name | Version | Path | | ----------------------------- | --------------- | -------------------------------------------------------------- | -| Visual Studio Enterprise 2017 | 15.9.28307.1684 | C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise | +| Visual Studio Enterprise 2017 | 15.9.28307.1705 | C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise | #### Workloads, components and extensions: @@ -500,20 +499,20 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### .NET Core SDK `Location C:\Program Files\dotnet\sdk` -- 1.1.14 2.1.302 2.1.403 2.1.526 2.1.617 2.1.701 2.1.818 3.1.119 3.1.202 3.1.302 3.1.413 5.0.104 5.0.207 5.0.303 5.0.401 +- 1.1.14 2.1.302 2.1.403 2.1.526 2.1.617 2.1.701 2.1.818 3.1.120 3.1.202 3.1.302 3.1.414 5.0.104 5.0.208 5.0.303 5.0.402 ### .NET Core Runtime `Location: C:\Program Files\dotnet\shared\Microsoft.AspNetCore.All` - 2.1.2 2.1.5 2.1.12 2.1.24 2.1.30 `Location: C:\Program Files\dotnet\shared\Microsoft.AspNetCore.App` -- 2.1.2 2.1.5 2.1.12 2.1.24 2.1.30 3.1.4 3.1.6 3.1.19 5.0.4 5.0.9 5.0.10 +- 2.1.2 2.1.5 2.1.12 2.1.24 2.1.30 3.1.4 3.1.6 3.1.20 5.0.4 5.0.9 5.0.11 `Location: C:\Program Files\dotnet\shared\Microsoft.NETCore.App` -- 1.0.16 1.1.13 2.1.2 2.1.5 2.1.12 2.1.24 2.1.30 3.1.4 3.1.6 3.1.19 5.0.4 5.0.9 5.0.10 +- 1.0.16 1.1.13 2.1.2 2.1.5 2.1.12 2.1.24 2.1.30 3.1.4 3.1.6 3.1.20 5.0.4 5.0.9 5.0.11 `Location: C:\Program Files\dotnet\shared\Microsoft.WindowsDesktop.App` -- 3.1.4 3.1.6 3.1.19 5.0.4 5.0.9 5.0.10 +- 3.1.4 3.1.6 3.1.20 5.0.4 5.0.9 5.0.11 ### .NET Framework `Type: Developer Pack` @@ -521,7 +520,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 4.6.1 4.6.2 4.7 4.7.1 4.7.2 4.8 ### PowerShell Tools -- PowerShell 7.1.4 +- PowerShell 7.1.5 #### Azure Powershell Modules | Module | Version | Path | @@ -539,6 +538,7 @@ All other versions are saved but not installed. | ------------------ | ---------------- | | DockerMsftProvider | 1.0.0.8 | | MarkdownPS | 1.9 | +| Microsoft.Graph | 1.7.0 | | Pester | 3.4.0
5.3.1 | | PowerShellGet | 1.0.0.1
2.2.5 | | PSScriptAnalyzer | 1.20.0 | @@ -575,11 +575,11 @@ All other versions are saved but not installed. ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2016 | sha256:dde4551c0b326807cfd2b0457d6cf6a44906d788c917b6f6115bf5cab03a670c | 2021-09-14 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2016 | sha256:a5b246ba628f417576dbca9c12e241627be4aa786b9508fea57a934ec3ebdf30 | 2021-09-14 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2016 | sha256:c12743903deef533e2232e3a04af92f5558ef0449d5d6dbd139cddf07f5bcb15 | 2021-09-14 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2016 | sha256:8475573b3deea860097590fe71c1a5333c937f5aadb7a6b07d760fe9017e28b1 | 2021-10-12 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2016 | sha256:97bbc6dd603e44f5a34e3f309b493c77b964b0e07d9e3dd7333f063ccaf33523 | 2021-10-12 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2016 | sha256:bff7dee44dc39f9e997389be6de0c9fcde608879eb52070839ac03f6058f1385 | 2021-10-12 | | mcr.microsoft.com/windows/nanoserver:10.0.14393.953 | sha256:fc60bd5ae0e61b334ce1cf1bcbf20c10c36b4c5482a01da319c9c989f9e6e268 | 2017-03-08 | -| mcr.microsoft.com/windows/servercore:ltsc2016 | sha256:22cc6661c975edc09fa44c497f8310b264da4ff102a56a974e4cf1a790626a22 | 2021-09-13 | +| mcr.microsoft.com/windows/servercore:ltsc2016 | sha256:bcff581aa164b5d0036284c21fb1733d4f5a7356341a32876ef9d0f6539aaa2b | 2021-10-06 | From 283bac3995d0cbdd2359ca2b449f63d33a9e7d0b Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Fri, 22 Oct 2021 14:24:31 +0300 Subject: [PATCH 0645/3485] Fix Ruby permissions (#4322) --- .../win/scripts/Installers/Install-Ruby.ps1 | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/images/win/scripts/Installers/Install-Ruby.ps1 b/images/win/scripts/Installers/Install-Ruby.ps1 index ef0436ae7c30..caf539500937 100644 --- a/images/win/scripts/Installers/Install-Ruby.ps1 +++ b/images/win/scripts/Installers/Install-Ruby.ps1 @@ -43,10 +43,18 @@ function Install-Ruby [String]$Architecture = "x64" ) + # Create Ruby toolcache folder + $rubyToolcachePath = Join-Path -Path $env:AGENT_TOOLSDIRECTORY -ChildPath "Ruby" + if (-not (Test-Path $rubyToolcachePath)) + { + Write-Host "Creating Ruby toolcache folder" + New-Item -ItemType Directory -Path $rubyToolcachePath | Out-Null + } + # Expand archive with binaries $packageName = [IO.Path]::GetFileNameWithoutExtension((Split-Path -Path $PackagePath -Leaf)) - $tempFolder = Join-Path -Path $env:TEMP -ChildPath $packageName - Extract-7Zip -Path $PackagePath -DestinationPath $env:TEMP + $tempFolder = Join-Path -Path $rubyToolcachePath -ChildPath $packageName + Extract-7Zip -Path $PackagePath -DestinationPath $rubyToolcachePath # Get Ruby version from binaries $rubyVersion = & "$tempFolder\bin\ruby.exe" -e "print RUBY_VERSION" @@ -54,16 +62,9 @@ function Install-Ruby if ($rubyVersion) { Write-Host "Installing Ruby $rubyVersion" - $rubyToolcachePath = Join-Path -Path $env:AGENT_TOOLSDIRECTORY -ChildPath "Ruby" $rubyVersionPath = Join-Path -Path $rubyToolcachePath -ChildPath $rubyVersion $rubyArchPath = Join-Path -Path $rubyVersionPath -ChildPath $Architecture - if (-not (Test-Path $rubyToolcachePath)) - { - Write-Host "Creating Ruby toolcache folder" - New-Item -ItemType Directory -Path $rubyToolcachePath | Out-Null - } - Write-Host "Creating Ruby '${rubyVersion}' folder in '${rubyVersionPath}'" New-Item -ItemType Directory -Path $rubyVersionPath -Force | Out-Null From 77e299148d40feb565b612a359f19f965619b0b6 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Mon, 25 Oct 2021 16:30:47 +0300 Subject: [PATCH 0646/3485] [Windows] Do not use M2_HOME env var to get mvn path (#4333) * Do not use M2_HOME env var to get mvn path * use Get-MachinePath to get mvn path --- images/win/scripts/Installers/Install-JavaTools.ps1 | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/images/win/scripts/Installers/Install-JavaTools.ps1 b/images/win/scripts/Installers/Install-JavaTools.ps1 index f4a0b9703683..4a798a7c71b3 100644 --- a/images/win/scripts/Installers/Install-JavaTools.ps1 +++ b/images/win/scripts/Installers/Install-JavaTools.ps1 @@ -134,15 +134,12 @@ Choco-Install -PackageName ant -ArgumentList "-i" Choco-Install -PackageName maven -ArgumentList "-i" Choco-Install -PackageName gradle -# Move maven variables to Machine. They may not be in the environment for this script so we need to read them from the registry. -$userEnvironmentKey = 'Registry::HKLM\SYSTEM\CurrentControlSet\Control\Session Manager\Environment' - -$m2_home = (Get-ItemProperty -Path $userEnvironmentKey -Name M2_HOME).M2_HOME -$m2 = $m2_home + '\bin' +# Add maven env variables to Machine +[string]$m2 = (Get-MachinePath).Split(";") -match "maven" $maven_opts = '-Xms256m' $m2_repo = 'C:\ProgramData\m2' -New-Item -Path $m2_repo -ItemType Directory -Force +New-Item -Path $m2_repo -ItemType Directory -Force | Out-Null setx M2 $m2 /M setx M2_REPO $m2_repo /M From c353eee69185347027c877fc750784dc078431c3 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Mon, 25 Oct 2021 19:47:26 +0300 Subject: [PATCH 0647/3485] anka: replace test_vm to TemplateName (#4339) --- images.CI/macos/anka/CreateCleanAnkaTemplate.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images.CI/macos/anka/CreateCleanAnkaTemplate.ps1 b/images.CI/macos/anka/CreateCleanAnkaTemplate.ps1 index 2be1d965a3be..28448e254d06 100644 --- a/images.CI/macos/anka/CreateCleanAnkaTemplate.ps1 +++ b/images.CI/macos/anka/CreateCleanAnkaTemplate.ps1 @@ -76,7 +76,7 @@ function Invoke-SoftwareUpdate { Write-Host "`t[*] Fetching Software Updates ready to install on '$TemplateName' VM:" Show-StringWithFormat $newUpdates - Write-Host "`t[*] Installing Software Updates on 'test_vm' VM:" + Write-Host "`t[*] Installing Software Updates on '$TemplateName' VM:" Install-SoftwareUpdate -HostName $ipAddress | Show-StringWithFormat # Check if Action: restart From 1f97f5de37f02aa993b7ebbb4333fd3ceaec758e Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Tue, 26 Oct 2021 14:16:20 +0300 Subject: [PATCH 0648/3485] [Windows] Add NSIS to Windows Server 2022 (#4326) --- images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 | 2 +- images/win/scripts/Tests/Tools.Tests.ps1 | 2 +- images/win/windows2022.json | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index 6d5e8afa9422..2b8194722486 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -111,6 +111,7 @@ $toolsList = @( (Get-MercurialVersion), (Get-MinGWVersion), (Get-NewmanVersion), + (Get-NSISVersion), (Get-OpenSSLVersion), (Get-PackerVersion), (Get-PulumiVersion), @@ -125,7 +126,6 @@ $toolsList = @( ) if ((Test-IsWin16) -or (Test-IsWin19)) { $toolsList += @( - (Get-NSISVersion), (Get-GoogleCloudSDKVersion) ) } diff --git a/images/win/scripts/Tests/Tools.Tests.ps1 b/images/win/scripts/Tests/Tools.Tests.ps1 index 3eb5322587d9..5bf24fb51674 100644 --- a/images/win/scripts/Tests/Tools.Tests.ps1 +++ b/images/win/scripts/Tests/Tools.Tests.ps1 @@ -117,7 +117,7 @@ Describe "NET48" { } } -Describe "NSIS" -Skip:(Test-IsWin22) { +Describe "NSIS" { It "NSIS" { "makensis /VERSION" | Should -ReturnZeroExitCode } diff --git a/images/win/windows2022.json b/images/win/windows2022.json index d35c0c63729b..69068512e201 100644 --- a/images/win/windows2022.json +++ b/images/win/windows2022.json @@ -223,6 +223,7 @@ "{{ template_dir }}/scripts/Installers/Install-AzureCosmosDbEmulator.ps1", "{{ template_dir }}/scripts/Installers/Install-Mercurial.ps1", "{{ template_dir }}/scripts/Installers/Install-Zstd.ps1", + "{{ template_dir }}/scripts/Installers/Install-NSIS.ps1", "{{ template_dir }}/scripts/Installers/Install-Vcpkg.ps1", "{{ template_dir }}/scripts/Installers/Install-PostgreSQL.ps1", "{{ template_dir }}/scripts/Installers/Install-Bazel.ps1", From 2d46e3f4d965927ce242d1fed6d5e92c7ff076c5 Mon Sep 17 00:00:00 2001 From: Dibir Magomedsaygitov <61747324+dibir-magomedsaygitov@users.noreply.github.com> Date: Tue, 26 Oct 2021 15:30:59 +0300 Subject: [PATCH 0649/3485] [Ubuntu] Remove Ubuntu16 related code from the VE repository (#4336) --- docs/create-image-and-azure-resources.md | 6 +- helpers/GenerateResourcesAndImage.ps1 | 12 +- .../azure-pipelines/ubuntu1604.yml | 12 - images/linux/Ubuntu1604-README.md | 350 ----------------- images/linux/config/ubuntu1604.conf | 2 - .../SoftwareReport.Generator.ps1 | 26 +- .../linux/scripts/helpers/Common.Helpers.psm1 | 4 - images/linux/scripts/helpers/os.sh | 5 - images/linux/scripts/installers/ansible.sh | 14 - images/linux/scripts/installers/aws.sh | 4 +- images/linux/scripts/installers/basic.sh | 16 - images/linux/scripts/installers/java-tools.sh | 8 +- images/linux/scripts/installers/mercurial.sh | 19 - .../linux/scripts/installers/preimagedata.sh | 5 - images/linux/scripts/installers/python.sh | 35 +- images/linux/scripts/installers/vcpkg.sh | 13 - images/linux/scripts/tests/Apt.Tests.ps1 | 5 + images/linux/scripts/tests/Common.Tests.ps1 | 4 +- images/linux/scripts/tests/Tools.Tests.ps1 | 10 +- images/linux/toolsets/toolset-1604.json | 302 --------------- images/linux/toolsets/toolset-1804.json | 1 + images/linux/toolsets/toolset-2004.json | 1 + images/linux/ubuntu1604.json | 361 ------------------ images/linux/ubuntu1804.json | 1 - images/linux/ubuntu2004.json | 1 - 25 files changed, 43 insertions(+), 1174 deletions(-) delete mode 100644 images.CI/linux-and-win/azure-pipelines/ubuntu1604.yml delete mode 100644 images/linux/Ubuntu1604-README.md delete mode 100644 images/linux/config/ubuntu1604.conf delete mode 100644 images/linux/scripts/installers/ansible.sh delete mode 100644 images/linux/scripts/installers/mercurial.sh delete mode 100644 images/linux/toolsets/toolset-1604.json delete mode 100644 images/linux/ubuntu1604.json diff --git a/docs/create-image-and-azure-resources.md b/docs/create-image-and-azure-resources.md index bdb619d35c1e..1f2676b86bc3 100644 --- a/docs/create-image-and-azure-resources.md +++ b/docs/create-image-and-azure-resources.md @@ -1,5 +1,5 @@ # Virtual-Environments -The virtual-environments project uses [Packer](https://www.packer.io/) to generate disk images for the following platforms: Windows 2016/2019, Ubuntu 16.04/18.04/20.04. +The virtual-environments project uses [Packer](https://www.packer.io/) to generate disk images for the following platforms: Windows 2016/2019/2022, Ubuntu 18.04/20.04. Each image is configured through a JSON template that Packer understands and which specifies where to build the image (Azure in this case), and what scripts to run to install software and prepare the disk. The Packer process initializes a connection to Azure subscription via Azure CLI, and automatically creates the temporary Azure resources required to build the source VM(temporary resource group, network interfaces, and VM from the "clean" image specified in the template). If the VM deployment succeeds, the build agent connects to the VM and starts to execute installation steps from the JSON template. @@ -56,13 +56,13 @@ Set-Location C:\virtual-environments Import-Module .\helpers\GenerateResourcesAndImage.ps1 -GenerateResourcesAndImage -SubscriptionId {YourSubscriptionId} -ResourceGroupName "myTestResourceGroup" -ImageGenerationRepositoryRoot "$pwd" -ImageType Ubuntu1604 -AzureLocation "East US" +GenerateResourcesAndImage -SubscriptionId {YourSubscriptionId} -ResourceGroupName "myTestResourceGroup" -ImageGenerationRepositoryRoot "$pwd" -ImageType Ubuntu1804 -AzureLocation "East US" ``` Where: - `SubscriptionId` - The Azure subscription Id where resources will be created. - `ResourceGroupName` - The Azure resource group name where the Azure resources will be created. - `ImageGenerationRepositoryRoot` - The root path of the image generation repository source. -- `ImageType` - The type of the image being generated. Valid options are: "Windows2016", "Windows2019", "Ubuntu1604", "Ubuntu1804", "Ubuntu2004". +- `ImageType` - The type of the image being generated. Valid options are: "Windows2016", "Windows2019", "Windows2022", "Ubuntu1804", "Ubuntu2004". - `AzureLocation` - The location of the resources being created in Azure. For example "East US". The function automatically creates all required Azure resources and kicks off packer image generation for the selected image type. diff --git a/helpers/GenerateResourcesAndImage.ps1 b/helpers/GenerateResourcesAndImage.ps1 index 623a08ea5632..4a4930085032 100644 --- a/helpers/GenerateResourcesAndImage.ps1 +++ b/helpers/GenerateResourcesAndImage.ps1 @@ -4,9 +4,8 @@ enum ImageType { Windows2016 = 0 Windows2019 = 1 Windows2022 = 2 - Ubuntu1604 = 3 - Ubuntu1804 = 4 - Ubuntu2004 = 5 + Ubuntu1804 = 3 + Ubuntu2004 = 4 } Function Get-PackerTemplatePath { @@ -27,9 +26,6 @@ Function Get-PackerTemplatePath { ([ImageType]::Windows2022) { $relativeTemplatePath = Join-Path "win" "windows2022.json" } - ([ImageType]::Ubuntu1604) { - $relativeTemplatePath = Join-Path "linux" "ubuntu1604.json" - } ([ImageType]::Ubuntu1804) { $relativeTemplatePath = Join-Path "linux" "ubuntu1804.json" } @@ -76,7 +72,7 @@ Function GenerateResourcesAndImage { The root path of the image generation repository source. .PARAMETER ImageType - The type of the image being generated. Valid options are: {"Windows2016", "Windows2019", "Ubuntu1604", "Ubuntu1804", "Ubuntu2004"}. + The type of the image being generated. Valid options are: {"Windows2016", "Windows2019", "Windows2022", "Ubuntu1804", "Ubuntu2004"}. .PARAMETER AzureLocation The location of the resources being created in Azure. For example "East US". @@ -98,7 +94,7 @@ Function GenerateResourcesAndImage { This parameter cannot be used in combination with the virtual_network_name packer parameter. .EXAMPLE - GenerateResourcesAndImage -SubscriptionId {YourSubscriptionId} -ResourceGroupName "shsamytest1" -ImageGenerationRepositoryRoot "C:\virtual-environments" -ImageType Ubuntu1604 -AzureLocation "East US" + GenerateResourcesAndImage -SubscriptionId {YourSubscriptionId} -ResourceGroupName "shsamytest1" -ImageGenerationRepositoryRoot "C:\virtual-environments" -ImageType Ubuntu1804 -AzureLocation "East US" #> param ( [Parameter(Mandatory = $True)] diff --git a/images.CI/linux-and-win/azure-pipelines/ubuntu1604.yml b/images.CI/linux-and-win/azure-pipelines/ubuntu1604.yml deleted file mode 100644 index 5a5d271421dd..000000000000 --- a/images.CI/linux-and-win/azure-pipelines/ubuntu1604.yml +++ /dev/null @@ -1,12 +0,0 @@ -trigger: none -pr: - autoCancel: true - branches: - include: - - main - -jobs: -- template: image-generation.yml - parameters: - image_type: ubuntu1604 - image_readme_name: Ubuntu1604-README.md \ No newline at end of file diff --git a/images/linux/Ubuntu1604-README.md b/images/linux/Ubuntu1604-README.md deleted file mode 100644 index 362792094c9d..000000000000 --- a/images/linux/Ubuntu1604-README.md +++ /dev/null @@ -1,350 +0,0 @@ -| Announcements | -|-| -| [[ubuntu] GCC and Gfortran 11 will be removed on May, 31](https://github.com/actions/virtual-environments/issues/3467) | -| [[Ubuntu] .NET SDK pre-installation policy will be changed on June 14](https://github.com/actions/virtual-environments/issues/3338) | -| [Ubuntu 16.04 environment will be removed on September 20, 2021](https://github.com/actions/virtual-environments/issues/3287) | -*** -# Ubuntu 16.04.7 LTS -- Linux kernel version: 4.15.0-1113-azure -- Image Version: 20210531.0 - -## Installed Software -### Language and Runtime -- Bash 4.3.48(1)-release -- Clang 9.0.1 -- Clang-format 9.0.1 -- Erlang 24.0.1 (Eshell 12.0.1) -- GNU C++ 5.5.0, 9.3.0 -- GNU Fortran 5.5.0, 9.3.0 -- Julia 1.6.1 -- Mono 6.12.0.122 (apt source repository: https://download.mono-project.com/repo/ubuntu stable-xenial main) -- MSBuild 16.6.0.15201 (from /usr/lib/mono/msbuild/15.0/bin/MSBuild.dll) -- Node 14.17.0 -- Perl 5.22.1 -- Python 2.7.12 -- Python3 3.5.2 -- Ruby 2.3.1p112 -- Swift 5.4.1 - -### Package Management -- cpan 1.61 -- Helm 3.6.0 -- Homebrew 3.1.9 -- Miniconda 4.9.2 -- Npm 6.14.13 -- Pip 8.1.1 -- Pip3 8.1.1 -- RubyGems 2.5.2 -- Vcpkg (build from master \<7bc5b8c>) -- Yarn 1.22.10 - -#### Environment variables -| Name | Value | -| ----------------------- | ---------------------- | -| CONDA | /usr/share/miniconda | -| VCPKG_INSTALLATION_ROOT | /usr/local/share/vcpkg | - -### Project Management -- Ant 1.9.6 -- Gradle 7.0.2 -- Maven 3.8.1 -- Sbt 1.5.2 - -### Tools -- Ansible 2.9.22 -- apt-fast 1.9.11 -- AzCopy 10.10.0 (available by `azcopy` and `azcopy10` aliases) -- Bazel 4.1.0 -- Bazelisk 1.9.0 -- CMake 3.20.3 -- CodeQL Action Bundle 2.5.5 -- Docker Compose 1.29.2 -- Docker-Buildx 0.5.1 -- Docker-Moby Client 20.10.6+azure -- Docker-Moby Server 20.10.6+azure -- Git 2.31.1 (apt source repository: ppa:git-core/ppa) -- Git LFS 2.13.3 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) -- Git-ftp 1.0.2 -- Haveged 1.9.1 -- Heroku 7.54.0 -- HHVM (HipHop VM) 4.56.6 -- jq 1.5 -- Kind 0.11.1 -- Kubectl 1.20.1-5-g76a04fc -- Kustomize 4.1.3 -- Leiningen 2.9.6 -- MediaInfo 0.7.82 -- Mercurial 4.4.1 -- Minikube 1.20.0 -- Newman 5.2.3 -- nvm 0.38.0 -- OpenSSL 1.0.2g 1 Mar 2016 -- Packer 1.7.2 -- PhantomJS 2.1.1 -- Pulumi 3.3.1 -- R 4.1.0 -- Sphinx Open Source Search Server 2.2.9 -- SVN 1.9.3 -- Terraform 0.15.4 -- zstd 1.5.0 (homebrew) - -### CLI Tools -- Alibaba Cloud CLI 3.0.77 -- AWS CLI 1.19.84 -- AWS CLI Session manager plugin 1.2.54.0 -- AWS SAM CLI 1.23.0 -- Azure CLI (azure-cli) 2.24.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) -- Azure CLI (azure-devops) 0.18.0 -- GitHub CLI 1.10.3 -- Google Cloud SDK 342.0.0 (apt source repository: https://packages.cloud.google.com/apt) -- Hub CLI 2.14.2 -- Netlify CLI 3.32.5 -- OpenShift CLI 4.7.12 -- ORAS CLI 0.11.1 -- Vercel CLI 23.0.0 - -### Java -| Version | Vendor | Environment Variable | -| ------------------- | ------------- | -------------------- | -| 8.0.292+1 (default) | Adopt OpenJDK | JAVA_HOME_8_X64 | -| 11.0.11+9 | Adopt OpenJDK | JAVA_HOME_11_X64 | -| 12.0.2+10 | Adopt OpenJDK | JAVA_HOME_12_X64 | - -### PHP -| Tool | Version | -| -------- | ----------------------------------------------- | -| PHP | 5.6.40 7.0.33 7.1.33 7.2.34 7.3.28 7.4.18 8.0.5 | -| Composer | 2.0.14 | -| PHPUnit | 8.5.15 | - -### Haskell -- Cabal 3.4.0.0 -- GHC 9.0.1 (apt source repository: ppa:hvr/ghc) -- GHCup 0.1.14.1 -- Stack 2.7.1 - -### Rust Tools -- Cargo 1.52.0 -- Rust 1.52.1 -- Rustdoc 1.52.1 -- Rustup 1.24.2 - -#### Packages -- Bindgen 0.58.1 -- Cargo audit 0.14.1 -- Cargo clippy 0.1.52 -- Cargo outdated 0.9.15 -- Cbindgen 0.19.0 -- Rustfmt 1.4.36 - -### Browsers and Drivers -- Google Chrome 91.0.4472.77 -- ChromeDriver 91.0.4472.19 -- Mozilla Firefox 88.0 -- Geckodriver 0.29.1 -- Chromium 91.0.4472.0 - -#### Environment variables -| Name | Value | -| --------------- | ------------------------------ | -| CHROMEWEBDRIVER | /usr/local/share/chrome_driver | -| GECKOWEBDRIVER | /usr/local/share/gecko_driver | - -### .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.519 2.1.520 2.1.521 2.1.522 2.1.523 2.1.524 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.616 2.1.617 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 2.1.811 2.1.812 2.1.813 2.1.814 2.1.815 2.1.816 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.109 3.1.110 3.1.111 3.1.112 3.1.113 3.1.114 3.1.115 3.1.200 3.1.201 3.1.202 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402 3.1.403 3.1.404 3.1.405 3.1.406 3.1.407 3.1.408 3.1.409 5.0.100 5.0.101 5.0.102 5.0.103 5.0.104 5.0.200 5.0.201 5.0.202 5.0.203 5.0.300 - -### Databases -- MongoDB 4.4.6 (apt source repository: https://repo.mongodb.org/apt/ubuntu) -- Postgre SQL 13.3 (apt source repository: https://apt.postgresql.org/pub/repos/apt/) -- sqlite3 3.11.0 - -#### MySQL -- MySQL 5.7.33 -- MySQL Server (user:root password:root) - -``` - MySQL service is disabled by default. Use the following command as a part of your job to start the service: 'sudo systemctl start mysql.service' -``` -#### MS SQL Server Client Tools -- sqlcmd 17.7.0001.1 - -### Cached Tools -#### Go -- 1.13.15 -- 1.14.15 -- 1.15.12 - -#### Node.js -- 10.24.1 -- 12.22.1 -- 14.17.0 - -#### PyPy -- 2.7.18 [PyPy 7.3.5] -- 3.6.12 [PyPy 7.3.3] - -#### Python -- 2.7.18 -- 3.5.10 -- 3.6.13 -- 3.7.10 -- 3.8.10 -- 3.9.5 - -#### Ruby -- 2.4.10 -- 2.5.9 -- 2.6.7 -- 2.7.3 -- 3.0.1 - -#### Environment variables -| Name | Value | Architecture | -| --------------- | ----------------------------------- | ------------ | -| GOROOT_1_13_X64 | /opt/hostedtoolcache/go/1.13.15/x64 | x64 | -| GOROOT_1_14_X64 | /opt/hostedtoolcache/go/1.14.15/x64 | x64 | -| GOROOT_1_15_X64 | /opt/hostedtoolcache/go/1.15.12/x64 | x64 | - -### PowerShell Tools -- PowerShell 7.1.3 - -#### PowerShell Modules -| Module | Version | -| ---------- | ------- | -| MarkdownPS | 1.9 | -| Pester | 5.2.2 | - -#### Az PowerShell Modules -- 5.7.0 3.1.0.zip 4.4.0.zip - -### Web Servers -| Name | Version | ConfigFile | ServiceStatus | ListenPort | -| ------- | ------- | ------------------------- | ------------- | ---------- | -| apache2 | 2.4.18 | /etc/apache2/apache2.conf | inactive | 80 | -| nginx | 1.10.3 | /etc/nginx/nginx.conf | inactive | 80 | - -### Android -| Package Name | Version | -| -------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 4.0 | -| Android SDK Build-tools | 30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3
26.0.0 26.0.1 26.0.2 26.0.3
25.0.0 25.0.1 25.0.2 25.0.3
24.0.0 24.0.1 24.0.2 24.0.3
23.0.1 23.0.2 23.0.3 | -| Android SDK Platform-Tools | 31.0.2 | -| Android SDK Platforms | android-S (rev 4)
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 SDK Tools | 26.1.1 | -| Android Support Repository | 47.0.0 | -| CMake | 3.10.2
3.18.1 | -| Google APIs | addon-google_apis-google-21
addon-google_apis-google-22
addon-google_apis-google-23
addon-google_apis-google-24 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 21.4.7075529 | -| SDK Patch Applier v4 | 1 | - -#### Environment variables -| Name | Value | -| ---------------- | ------------------------------------------------------------------------------------ | -| ANDROID_HOME | /usr/local/lib/android/sdk | -| ANDROID_NDK_HOME | /usr/local/lib/android/sdk/ndk-bundle -> /usr/local/lib/android/sdk/ndk/21.4.7075529 | -| ANDROID_NDK_ROOT | /usr/local/lib/android/sdk/ndk-bundle -> /usr/local/lib/android/sdk/ndk/21.4.7075529 | -| ANDROID_SDK_ROOT | /usr/local/lib/android/sdk | - -### Cached Docker images -| Repository:Tag | Digest | Created | -| ---------------------- | ------------------------------------------------------------------------ | ---------- | -| alpine:3.11 | sha256:18a918a714d1368847b67173d120ebd110fcfae208305412f3005a61cdc7c20e | 2021-04-14 | -| alpine:3.12 | sha256:36553b10a4947067b9fbb7d532951066293a68eae893beba1d9235f7d11a20ad | 2021-04-14 | -| alpine:3.13 | sha256:69e70a79f2d41ab5d637de98c1e0b055206ba40a8145e7bddb55ccc04e13cf8f | 2021-04-14 | -| buildpack-deps:buster | sha256:b4ba9e547bb2e4f48186b234a816ec0182c86fda31f4de5c1eeb824a5d3330df | 2021-05-12 | -| buildpack-deps:stretch | sha256:fe5d31963e568ba5c418ad26c7c1391ddeedd801672236f081fc3e1e2950e27b | 2021-05-12 | -| debian:10 | sha256:acf7795dc91df17e10effee064bd229580a9c34213b4dba578d64768af5d8c51 | 2021-05-12 | -| debian:9 | sha256:4f8deed5755299e2d7ae1f5649656de89a6b7e30c0be37a3a1b4a49f0af51f7e | 2021-05-12 | -| node:10 | sha256:59531d2835edd5161c8f9512f9e095b1836f7a1fcb0ab73e005ec46047384911 | 2021-04-10 | -| node:10-alpine | sha256:dc98dac24efd4254f75976c40bce46944697a110d06ce7fa47e7268470cf2e28 | 2021-04-14 | -| node:12 | sha256:0d6b3522991d04ead0b119feaffafa6a8cd1b374218e9f997a1d4753b7064882 | 2021-05-12 | -| node:12-alpine | sha256:9a372efac4c436dfb6dbdea42f08d3ea60a0103a1df54a7da247e4bed1b327f7 | 2021-04-14 | -| node:14 | sha256:af9879e7473d347048c5d5919aa9775f27c33d92e4d58058ffdc08247f4bd902 | 2021-05-13 | -| node:14-alpine | sha256:f07ead757c93bc5e9e79978075217851d45a5d8e5c48eaf823e7f12d9bbc1d3c | 2021-05-13 | -| ubuntu:16.04 | sha256:9775877f420d453ef790e6832d77630a49b32a92b7bedf330adf4d8669f6600e | 2021-05-19 | -| ubuntu:18.04 | sha256:67b730ece0d34429b455c08124ffd444f021b81e06fa2d9cd0adaf0d0b875182 | 2021-05-19 | -| ubuntu:20.04 | sha256:adf73ca014822ad8237623d388cedf4d5346aa72c270c5acc01431cc93e18e2d | 2021-04-23 | - -### Installed apt packages -| Name | Version | -| ----------------- | ---------------------------- | -| binutils | 2.26.1-1ubuntu1~16.04.8 | -| bison | 2:3.0.4.dfsg-1 | -| brotli | 1.0.3-1ubuntu1~16.04.2 | -| build-essential | 12.1ubuntu2 | -| bzip2 | 1.0.6-8ubuntu0.2 | -| coreutils | 8.25-2ubuntu3~16.04 | -| curl | 7.47.0-1ubuntu2.19 | -| dbus | 1.10.6-1ubuntu3.6 | -| dnsutils | 1:9.10.3.dfsg.P4-8ubuntu1.19 | -| dpkg | 1.18.4ubuntu1.7 | -| fakeroot | 1.20.2-1ubuntu1 | -| file | 1:5.25-2ubuntu1.4 | -| flex | 2.6.0-11 | -| ftp | 0.17-33 | -| gnupg2 | 2.1.11-6ubuntu2.1 | -| haveged | 1.9.1-3 | -| imagemagick | 8:6.8.9.9-7ubuntu5.16 | -| iproute2 | 4.3.0-1ubuntu3.16.04.5 | -| iputils-ping | 3:20121221-5ubuntu2 | -| jq | 1.5+dfsg-1ubuntu0.1 | -| lib32z1 | 1:1.2.8.dfsg-2ubuntu4.3 | -| libc++-dev | 3.7.0-1ubuntu0.1 | -| libc++abi-dev | 3.7.0-1ubuntu0.1 | -| libcurl3 | 7.47.0-1ubuntu2.19 | -| libgbm-dev | 18.0.5-0ubuntu0~16.04.1 | -| libgconf-2-4 | 3.2.6-3ubuntu6 | -| libgsl-dev | 2.1+dfsg-2 | -| libgtk-3-0 | 3.18.9-1ubuntu3.3 | -| libicu55 | 55.1-7ubuntu0.5 | -| libmagic-dev | 1:5.25-2ubuntu1.4 | -| libmagickcore-dev | 8:6.8.9.9-7ubuntu5.16 | -| libmagickwand-dev | 8:6.8.9.9-7ubuntu5.16 | -| libsecret-1-dev | 0.18.4-1ubuntu2 | -| libsqlite3-dev | 3.11.0-1ubuntu1.5 | -| libunwind8 | 1.1-4.1 | -| libxkbfile-dev | 1:1.0.9-0ubuntu1 | -| libxss1 | 1:1.2.2-1 | -| locales | 2.23-0ubuntu11.3 | -| m4 | 1.4.17-5 | -| mediainfo | 0.7.82-1 | -| net-tools | 1.60-26ubuntu1 | -| netcat | 1.10-41 | -| openssh-client | 1:7.2p2-4ubuntu2.10 | -| p7zip | 9.20.1~dfsg.1-4.2ubuntu0.1 | -| p7zip-full | 9.20.1~dfsg.1-4.2ubuntu0.1 | -| p7zip-rar | 9.20.1~ds.1-4 | -| parallel | 20161222-1~ubuntu0.16.04.1 | -| pass | 1.6.5-3 | -| patchelf | 0.9-1~ubuntu16.04.3 | -| pkg-config | 0.29.1-0ubuntu1 | -| pollinate | 4.33-0ubuntu1~16.04.1 | -| python-setuptools | 20.7.0-1 | -| rpm | 4.12.0.1+dfsg1-3build3 | -| rsync | 3.1.1-3ubuntu1.3 | -| shellcheck | 0.3.7-5 | -| sphinxsearch | 2.2.9-1build1 | -| sqlite3 | 3.11.0-1ubuntu1.5 | -| ssh | 1:7.2p2-4ubuntu2.10 | -| sshpass | 1.05-1 | -| subversion | 1.9.3-2ubuntu1.3 | -| sudo | 1.8.16-0ubuntu1.10 | -| swig | 3.0.8-0ubuntu3 | -| telnet | 0.17-40 | -| texinfo | 6.1.0.dfsg.1-5 | -| time | 1.7-25.1 | -| tk | 8.6.0+9 | -| tzdata | 2021a-0ubuntu0.16.04 | -| unzip | 6.0-20ubuntu1.1 | -| upx | 3.91-1 | -| wget | 1.17.1-1ubuntu1.5 | -| xorriso | 1.4.2-4ubuntu1 | -| xvfb | 2:1.18.4-0ubuntu0.12 | -| xz-utils | 5.1.1alpha+20120614-2ubuntu2 | -| yamllint | 1.2.1-1 | -| zip | 3.0-11 | -| zsync | 0.6.2-1ubuntu1 | - - diff --git a/images/linux/config/ubuntu1604.conf b/images/linux/config/ubuntu1604.conf deleted file mode 100644 index d2ac1423158e..000000000000 --- a/images/linux/config/ubuntu1604.conf +++ /dev/null @@ -1,2 +0,0 @@ -# Name of the pool supported by this image -POOL_NAME="Ubuntu 1604" diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index 912c7f74e71d..a5178b70d1c8 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -67,17 +67,12 @@ $packageManagementList = @( (Get-HelmVersion), (Get-NpmVersion), (Get-YarnVersion), + (Get-PipxVersion), (Get-PipVersion), (Get-Pip3Version), (Get-VcpkgVersion) ) -if (-not (Test-IsUbuntu16)) { - $packageManagementList += @( - (Get-PipxVersion) - ) -} - $markdown += New-MDList -Style Unordered -Lines ($packageManagementList | Sort-Object) $markdown += New-MDHeader "Environment variables" -Level 4 $markdown += Build-PackageManagementEnvironmentTable | New-MDTable @@ -105,6 +100,8 @@ $toolsList = @( (Get-AzCopyVersion), (Get-BazelVersion), (Get-BazeliskVersion), + (Get-BicepVersion), + (Get-BuildahVersion), (Get-CodeQLBundleVersion), (Get-CMakeVersion), (Get-DockerMobyClientVersion), @@ -133,23 +130,16 @@ $toolsList = @( (Get-OpensslVersion), (Get-PackerVersion), (Get-PhantomJSVersion), + (Get-PodManVersion), (Get-PulumiVersion), (Get-RVersion), + (Get-SkopeoVersion), (Get-SphinxVersion), (Get-TerraformVersion), + (Get-YamllintVersion), (Get-ZstdVersion) ) -if (-not (Test-IsUbuntu16)) { - $toolsList += @( - (Get-BicepVersion), - (Get-BuildahVersion), - (Get-PodManVersion), - (Get-SkopeoVersion), - (Get-YamllintVersion) - ) -} - if (Test-IsUbuntu20) { $toolsList += (Get-FastlaneVersion) } @@ -184,9 +174,7 @@ if (Test-IsUbuntu20) { $markdown += New-MDNewLine } -if (-not (Test-IsUbuntu16)) { - $markdown += Build-PHPSection -} +$markdown += Build-PHPSection $markdown += New-MDHeader "Haskell" -Level 3 $markdown += New-MDList -Style Unordered -Lines (@( diff --git a/images/linux/scripts/helpers/Common.Helpers.psm1 b/images/linux/scripts/helpers/Common.Helpers.psm1 index 5dd17c60dc32..0c609aea0cc9 100644 --- a/images/linux/scripts/helpers/Common.Helpers.psm1 +++ b/images/linux/scripts/helpers/Common.Helpers.psm1 @@ -22,10 +22,6 @@ function Get-KernelVersion { return "Linux kernel version: $kernelVersion" } -function Test-IsUbuntu16 { - return (lsb_release -rs) -eq "16.04" -} - function Test-IsUbuntu18 { return (lsb_release -rs) -eq "18.04" } diff --git a/images/linux/scripts/helpers/os.sh b/images/linux/scripts/helpers/os.sh index 8bec86080ff5..6bb38f51ad61 100644 --- a/images/linux/scripts/helpers/os.sh +++ b/images/linux/scripts/helpers/os.sh @@ -4,11 +4,6 @@ ## Desc: Helper functions for installing tools ################################################################################ -function isUbuntu16 -{ - lsb_release -d | grep -q 'Ubuntu 16' -} - function isUbuntu18 { lsb_release -d | grep -q 'Ubuntu 18' diff --git a/images/linux/scripts/installers/ansible.sh b/images/linux/scripts/installers/ansible.sh deleted file mode 100644 index cf63f5073883..000000000000 --- a/images/linux/scripts/installers/ansible.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash -e -################################################################################ -## File: ansible.sh -## Desc: Installs Ansible -################################################################################ - -# this script is used only on Ubuntu 16.04 -# for Ubuntu 18.04 and 20.04 we use pipx ansible-base package -# Install latest Ansible -add-apt-repository ppa:ansible/ansible -apt-get update -apt-get install -y --no-install-recommends ansible - -invoke_tests "Tools" "Ansible" diff --git a/images/linux/scripts/installers/aws.sh b/images/linux/scripts/installers/aws.sh index 337569dba129..c7f851e64426 100644 --- a/images/linux/scripts/installers/aws.sh +++ b/images/linux/scripts/installers/aws.sh @@ -8,7 +8,7 @@ source $HELPER_SCRIPTS/os.sh source $HELPER_SCRIPTS/install.sh -# Install the AWS CLI v1 on Ubuntu16 and Ubuntu18, and AWS CLI v2 on Ubuntu20 +# Install the AWS CLI v1 Ubuntu18 and AWS CLI v2 on Ubuntu20 if isUbuntu20 ; then download_with_retries "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" "/tmp" "awscliv2.zip" unzip -qq /tmp/awscliv2.zip -d /tmp @@ -16,7 +16,7 @@ if isUbuntu20 ; then fi # The installation should be run after python3 is installed as aws-cli V1 dropped python2 support -if isUbuntu16 || isUbuntu18 ; then +if isUbuntu18 ; then download_with_retries "https://s3.amazonaws.com/aws-cli/awscli-bundle.zip" "/tmp" "awscli-bundle.zip" unzip -qq /tmp/awscli-bundle.zip -d /tmp python3 /tmp/awscli-bundle/install -i /usr/local/aws -b /usr/local/bin/aws diff --git a/images/linux/scripts/installers/basic.sh b/images/linux/scripts/installers/basic.sh index 66875b8bf28b..270cc75c837a 100644 --- a/images/linux/scripts/installers/basic.sh +++ b/images/linux/scripts/installers/basic.sh @@ -4,7 +4,6 @@ ## Desc: Installs basic command line utilities and dev packages ################################################################################ source $HELPER_SCRIPTS/install.sh -source $HELPER_SCRIPTS/os.sh common_packages=$(get_toolset_value .apt.common_packages[]) cmd_packages=$(get_toolset_value .apt.cmd_packages[]) @@ -13,19 +12,4 @@ for package in $common_packages $cmd_packages; do apt-get install -y --no-install-recommends $package done -# Toolcache Python requires updated libssl-dev, which was previously installed from ppa:ondrej. -# The ppa dropped Ubuntu 16 support hence we need to build OpenSSL from source -if isUbuntu16; then - openSslArchiveName="openssl-1.1.1k.tar.gz" - openSslUrl="https://www.openssl.org/source/${openSslArchiveName}" - download_with_retries $openSslUrl "/tmp" - openSslPath="/tmp/$(basename -s .tar.gz $openSslArchiveName)" - mkdir -p "$openSslPath" - tar -C "$openSslPath" -xzf "/tmp/${openSslArchiveName}" --strip-components=1 && cd $openSslPath - ./config --openssldir=/etc/ssl '-Wl,--enable-new-dtags,-rpath,$(LIBRPATH)' - make -s - make install > /dev/null - ln -sf /etc/ssl/bin/openssl /usr/bin/openssl -fi - invoke_tests "Apt" \ No newline at end of file diff --git a/images/linux/scripts/installers/java-tools.sh b/images/linux/scripts/installers/java-tools.sh index 8067ef348553..fcd863e2985e 100644 --- a/images/linux/scripts/installers/java-tools.sh +++ b/images/linux/scripts/installers/java-tools.sh @@ -16,7 +16,7 @@ JAVA_TOOLCACHE_PATH="$AGENT_TOOLSDIRECTORY/Java_Adopt_jdk" wget -qO - "https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public" | apt-key add - add-apt-repository --yes https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ -if isUbuntu16 || isUbuntu18 ; then +if isUbuntu18 ; then # Install GPG Key for Azul Open JDK. See https://www.azul.com/downloads/azure-only/zulu/ apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0xB1998361219BD9C9 apt-add-repository "deb https://repos.azul.com/azure-only/zulu/apt stable main" @@ -46,12 +46,6 @@ for JAVA_VERSION in ${JAVA_VERSIONS_LIST[@]}; do done # Set Default Java version -if isUbuntu16; then - # issue: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=825987 - # stackoverflow: https://askubuntu.com/questions/1187136/update-java-alternatives-only-java-but-not-javac-is-changed - sed -i 's/(hl|jre|jdk|plugin|DUMMY) /(hl|jre|jdk|jdkhl|plugin|DUMMY) /g' /usr/sbin/update-java-alternatives -fi - update-java-alternatives -s /usr/lib/jvm/adoptopenjdk-${DEFAULT_JDK_VERSION}-hotspot-amd64 echo "JAVA_HOME=/usr/lib/jvm/adoptopenjdk-${DEFAULT_JDK_VERSION}-hotspot-amd64" | tee -a /etc/environment diff --git a/images/linux/scripts/installers/mercurial.sh b/images/linux/scripts/installers/mercurial.sh deleted file mode 100644 index e785dba0b9e4..000000000000 --- a/images/linux/scripts/installers/mercurial.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash -e -################################################################################ -## File: mercurial.sh -## Desc: Installs Mercurial -################################################################################ - -# Source the helpers for use with the script -source $HELPER_SCRIPTS/os.sh - -if isUbuntu16 ; then - # Install Mercurial from the mercurial-ppa/releases repository for the latest version for Ubuntu16. - # https://www.mercurial-scm.org/wiki/Download - add-apt-repository ppa:mercurial-ppa/releases -y - apt-get update -fi - -apt-get install -y --no-install-recommends mercurial - -invoke_tests "Tools" "Mercurial" \ No newline at end of file diff --git a/images/linux/scripts/installers/preimagedata.sh b/images/linux/scripts/installers/preimagedata.sh index 126d6a95ec57..747f229614c7 100644 --- a/images/linux/scripts/installers/preimagedata.sh +++ b/images/linux/scripts/installers/preimagedata.sh @@ -16,11 +16,6 @@ if [[ "$image_label" =~ "ubuntu-18" ]]; then releaseUrl="https://github.com/actions/virtual-environments/releases/tag/ubuntu18%2F${image_version}" fi -if [[ "$image_label" =~ "ubuntu-16" ]]; then - software_url="${github_url}/ubuntu16/${image_version}/images/linux/Ubuntu1604-README.md" - releaseUrl="https://github.com/actions/virtual-environments/releases/tag/ubuntu16%2F${image_version}" -fi - cat < $imagedata_file [ { diff --git a/images/linux/scripts/installers/python.sh b/images/linux/scripts/installers/python.sh index 79c57d530e4f..e14bf46888d5 100644 --- a/images/linux/scripts/installers/python.sh +++ b/images/linux/scripts/installers/python.sh @@ -10,31 +10,26 @@ source $HELPER_SCRIPTS/etc-environment.sh source $HELPER_SCRIPTS/os.sh # Install Python, Python 3, pip, pip3 -if isUbuntu16 || isUbuntu18; then +if isUbuntu18; then apt-get install -y --no-install-recommends python python-dev python-pip fi apt-get install -y --no-install-recommends python3 python3-dev python3-pip python3-venv -if isUbuntu18 || isUbuntu20 ; then - # Install pipx - # Set pipx custom directory - export PIPX_BIN_DIR=/opt/pipx_bin - export PIPX_HOME=/opt/pipx - - python3 -m pip install pipx - python3 -m pipx ensurepath - - # Update /etc/environment - setEtcEnvironmentVariable "PIPX_BIN_DIR" $PIPX_BIN_DIR - setEtcEnvironmentVariable "PIPX_HOME" $PIPX_HOME - prependEtcEnvironmentPath $PIPX_BIN_DIR - - # Test pipx - if ! command -v pipx; then - echo "pipx was not installed or not found on PATH" - exit 1 - fi +# Install pipx +# Set pipx custom directory +export PIPX_BIN_DIR=/opt/pipx_bin +export PIPX_HOME=/opt/pipx +python3 -m pip install pipx +python3 -m pipx ensurepath +# Update /etc/environment +setEtcEnvironmentVariable "PIPX_BIN_DIR" $PIPX_BIN_DIR +setEtcEnvironmentVariable "PIPX_HOME" $PIPX_HOME +prependEtcEnvironmentPath $PIPX_BIN_DIR +# Test pipx +if ! command -v pipx; then + echo "pipx was not installed or not found on PATH" + exit 1 fi # Adding this dir to PATH will make installed pip commands are immediately available. diff --git a/images/linux/scripts/installers/vcpkg.sh b/images/linux/scripts/installers/vcpkg.sh index fd2f7ff361cc..5d609fecdef0 100644 --- a/images/linux/scripts/installers/vcpkg.sh +++ b/images/linux/scripts/installers/vcpkg.sh @@ -4,9 +4,6 @@ ## Desc: Installs vcpkg ################################################################################ -# Source the helpers for use with the script -source $HELPER_SCRIPTS/os.sh - # Set env variable for vcpkg VCPKG_INSTALLATION_ROOT=/usr/local/share/vcpkg echo "VCPKG_INSTALLATION_ROOT=${VCPKG_INSTALLATION_ROOT}" | tee -a /etc/environment @@ -14,19 +11,9 @@ echo "VCPKG_INSTALLATION_ROOT=${VCPKG_INSTALLATION_ROOT}" | tee -a /etc/environm # Install vcpkg git clone --depth=1 https://github.com/Microsoft/vcpkg $VCPKG_INSTALLATION_ROOT -# vcpkg requires g++ version 7+, yet Ubuntu 16 default is 5.4. Set version 7 as default temporarily -if isUbuntu16; then - ln -sf g++-7 /usr/bin/g++ -fi - $VCPKG_INSTALLATION_ROOT/bootstrap-vcpkg.sh $VCPKG_INSTALLATION_ROOT/vcpkg integrate install chmod 0777 -R $VCPKG_INSTALLATION_ROOT ln -sf $VCPKG_INSTALLATION_ROOT/vcpkg /usr/local/bin -# Set back g++ 5.4 as default -if isUbuntu16; then - ln -sf g++-5 /usr/bin/g++ -fi - invoke_tests "Tools" "Vcpkg" \ No newline at end of file diff --git a/images/linux/scripts/tests/Apt.Tests.ps1 b/images/linux/scripts/tests/Apt.Tests.ps1 index c1b37e29aba0..7c3383ba4b20 100644 --- a/images/linux/scripts/tests/Apt.Tests.ps1 +++ b/images/linux/scripts/tests/Apt.Tests.ps1 @@ -49,6 +49,11 @@ Describe "Apt" { $toolName = "netstat" } + if ($toolName -eq "mercurial") + { + $toolName = "hg" + } + (Get-Command -Name $toolName).CommandType | Should -BeExactly "Application" } } \ No newline at end of file diff --git a/images/linux/scripts/tests/Common.Tests.ps1 b/images/linux/scripts/tests/Common.Tests.ps1 index 05f789277427..ccd1efd0452d 100644 --- a/images/linux/scripts/tests/Common.Tests.ps1 +++ b/images/linux/scripts/tests/Common.Tests.ps1 @@ -1,4 +1,4 @@ -Describe "PHP" -Skip:(Test-IsUbuntu16) { +Describe "PHP" { [array]$testCases = (Get-ToolsetContent).php.versions | ForEach-Object { @{phpVersion = $_} } @@ -39,7 +39,7 @@ Describe "Swift" { } } -Describe "PipxPackages" -Skip:(Test-IsUbuntu16) { +Describe "PipxPackages" { [array]$testCases = (Get-ToolsetContent).pipx | ForEach-Object { @{package=$_.package; cmd = $_.cmd} } It "" -TestCases $testCases { diff --git a/images/linux/scripts/tests/Tools.Tests.ps1 b/images/linux/scripts/tests/Tools.Tests.ps1 index 216536eedede..7ceb57c62db1 100644 --- a/images/linux/scripts/tests/Tools.Tests.ps1 +++ b/images/linux/scripts/tests/Tools.Tests.ps1 @@ -8,7 +8,7 @@ Describe "azcopy" { } } -Describe "Bicep" -Skip:(Test-IsUbuntu16) { +Describe "Bicep" { It "Bicep" { "bicep --version" | Should -ReturnZeroExitCode } @@ -289,12 +289,6 @@ Describe "Leiningen" { } } -Describe "Mercurial" { - It "mercurial" { - "hg --version" | Should -ReturnZeroExitCode - } -} - Describe "Conda" { It "conda" { "conda --version" | Should -ReturnZeroExitCode @@ -329,7 +323,7 @@ Describe "GraalVM" -Skip:(-not (Test-IsUbuntu20)) { } } -Describe "Containers" -Skip:(Test-IsUbuntu16) { +Describe "Containers" { $testCases = @("podman", "buildah", "skopeo") | ForEach-Object { @{ContainerCommand = $_} } It "" -TestCases $testCases { diff --git a/images/linux/toolsets/toolset-1604.json b/images/linux/toolsets/toolset-1604.json deleted file mode 100644 index 6f00356f571a..000000000000 --- a/images/linux/toolsets/toolset-1604.json +++ /dev/null @@ -1,302 +0,0 @@ -{ - "toolcache": [ - { - "name": "Python", - "url" : "https://raw.githubusercontent.com/actions/python-versions/main/versions-manifest.json", - "platform" : "linux", - "platform_version": "16.04", - "arch": "x64", - "versions": [ - "2.7.*", - "3.5.*", - "3.6.*", - "3.7.*", - "3.8.*", - "3.9.*" - ] - }, - { - "name": "PyPy", - "arch": "x64", - "platform" : "linux", - "versions": [ - "2.7", - "3.6" - ] - }, - { - "name": "node", - "url" : "https://raw.githubusercontent.com/actions/node-versions/main/versions-manifest.json", - "platform" : "linux", - "arch": "x64", - "versions": [ - "10.*", - "12.*", - "14.*" - ] - }, - { - "name": "go", - "url" : "https://raw.githubusercontent.com/actions/go-versions/main/versions-manifest.json", - "arch": "x64", - "platform" : "linux", - "versions": [ - "1.13.*", - "1.14.*", - "1.15.*", - "1.16.*", - "1.17.*" - ], - "default": "1.15.*" - }, - { - "name": "Ruby", - "platform_version": "16.04", - "arch": "x64", - "versions": [ - "2.4.*", - "2.5.*", - "2.6.*", - "2.7.*", - "3.0.*" - ] - }, - { - "name": "CodeQL", - "platform" : "linux", - "arch": "x64", - "versions": [ - "*" - ] - } - ], - "java": { - "default": "8", - "versions": [ - "8", "11", "12" - ] - }, - "android": { - "platform_min_version": "23", - "build_tools_min_version": "23.0.1", - "extra_list": [ - "android;m2repository", - "google;m2repository", - "google;google_play_services", - "m2repository;com;android;support;constraint;constraint-layout-solver;1.0.2", - "m2repository;com;android;support;constraint;constraint-layout-solver;1.0.1", - "m2repository;com;android;support;constraint;constraint-layout;1.0.2", - "m2repository;com;android;support;constraint;constraint-layout;1.0.1" - ], - "addon_list": [ - "addon-google_apis-google-24", - "addon-google_apis-google-23", - "addon-google_apis-google-22", - "addon-google_apis-google-21" - ], - "additional_tools": [ - "cmake;3.10.2.4988404", - "cmake;3.18.1", - "platform-tools" - ], - "ndk": { - "lts": "21" - } - }, - "powershellModules": [ - {"name": "MarkdownPS"}, - {"name": "Pester"} - ], - "azureModules": [ - { - "name": "az", - "url" : "https://raw.githubusercontent.com/Azure/az-ps-module-versions/main/versions-manifest.json", - "versions": [ - "5.7.0" - ], - "zip_versions": [ - "3.1.0", - "4.4.0" - ] - } - ], - "apt": { - "common_packages": [ - "build-essential", - "dbus", - "dnsutils", - "dpkg", - "fakeroot", - "gnupg2", - "imagemagick", - "iproute2", - "iputils-ping", - "lib32z1", - "libc++abi-dev", - "libc++-dev", - "libcurl3", - "libgbm-dev", - "libgconf-2-4", - "libgsl-dev", - "libgtk-3-0", - "libicu55", - "libmagic-dev", - "libmagickcore-dev", - "libmagickwand-dev", - "libsecret-1-dev", - "libsqlite3-dev", - "libunwind8", - "libxkbfile-dev", - "libxss1", - "locales", - "openssh-client", - "p7zip-rar", - "p7zip", - "pkg-config", - "python-setuptools", - "rpm", - "texinfo", - "tk", - "tzdata", - "upx", - "xorriso", - "xvfb", - "xz-utils", - "zsync" - ], - "cmd_packages": [ - "binutils", - "bison", - "brotli", - "bzip2", - "coreutils", - "curl", - "file", - "flex", - "ftp", - "haveged", - "jq", - "m4", - "mediainfo", - "netcat", - "net-tools", - "p7zip-full", - "parallel", - "pass", - "patchelf", - "pollinate", - "rsync", - "shellcheck", - "sphinxsearch", - "sqlite3", - "ssh", - "sshpass", - "subversion", - "sudo", - "swig", - "telnet", - "time", - "unzip", - "wget", - "yamllint", - "zip" - ] - }, - "brew": [ - {"name": "zstd"} - ], - "docker": { - "images": [ - "alpine:3.11", - "alpine:3.12", - "alpine:3.13", - "buildpack-deps:stretch", - "buildpack-deps:buster", - "debian:9", - "debian:10", - "node:10", - "node:12", - "node:14", - "node:10-alpine", - "node:12-alpine", - "node:14-alpine", - "ubuntu:16.04", - "ubuntu:18.04", - "ubuntu:20.04" - ] - }, - "dotnet": { - "aptPackages": [ - "dotnet-sdk-3.1", - "dotnet-sdk-5.0" - ], - "versions": [ - "2.1", - "3.1", - "5.0" - ] - }, - "clang": { - "versions": [ - "9" - ], - "default_version": "9" - }, - "gcc": { - "versions": [ - "g++-9" - ] - }, - "gfortran": { - "versions": [ - "gfortran-9" - ] - }, - "rubygems": [], - "node_modules": [ - { - "name": "grunt", - "command": "grunt" - }, - { - "name": "gulp", - "command": "gulp" - }, - { - "name": "n", - "command": "n" - }, - { - "name": "parcel-bundler", - "command": "parcel" - }, - { - "name": "typescript", - "command": "tsc" - }, - { - "name": "newman", - "command": "newman" - }, - { - "name": "vercel", - "command": "vercel" - }, - { - "name": "webpack", - "command": "webpack" - }, - { - "name": "webpack-cli", - "command": "webpack-cli" - }, - { - "name": "netlify-cli", - "command": "netlify" - }, - { - "name": "yarn", - "command": "yarn" - } - ] -} diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index 671e8fe03d0c..e2ca070fdeb7 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -148,6 +148,7 @@ "libxkbfile-dev", "libxss1", "locales", + "mercurial", "openssh-client", "p7zip-rar", "pkg-config", diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index 83931463e47d..ee50f3e65a25 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -145,6 +145,7 @@ "libxkbfile-dev", "libxss1", "locales", + "mercurial", "openssh-client", "p7zip-rar", "pkg-config", diff --git a/images/linux/ubuntu1604.json b/images/linux/ubuntu1604.json deleted file mode 100644 index 7c26e18c7b16..000000000000 --- a/images/linux/ubuntu1604.json +++ /dev/null @@ -1,361 +0,0 @@ -{ - "variables": { - "client_id": "{{env `ARM_CLIENT_ID`}}", - "client_secret": "{{env `ARM_CLIENT_SECRET`}}", - "subscription_id": "{{env `ARM_SUBSCRIPTION_ID`}}", - "tenant_id": "{{env `ARM_TENANT_ID`}}", - "resource_group": "{{env `ARM_RESOURCE_GROUP`}}", - "storage_account": "{{env `ARM_STORAGE_ACCOUNT`}}", - "build_resource_group_name": "{{env `BUILD_RESOURCE_GROUP_NAME`}}", - "temp_resource_group_name": "{{env `TEMP_RESOURCE_GROUP_NAME`}}", - "location": "{{env `ARM_RESOURCE_LOCATION`}}", - "virtual_network_name": "{{env `VNET_NAME`}}", - "virtual_network_resource_group_name": "{{env `VNET_RESOURCE_GROUP`}}", - "virtual_network_subnet_name": "{{env `VNET_SUBNET`}}", - "private_virtual_network_with_public_ip": "{{env `PRIVATE_VIRTUAL_NETWORK_WITH_PUBLIC_IP`}}", - "allowed_inbound_ip_addresses": "{{env `AGENT_IP`}}", - "image_folder": "/imagegeneration", - "imagedata_file": "/imagegeneration/imagedata.json", - "installer_script_folder": "/imagegeneration/installers", - "helper_script_folder": "/imagegeneration/helpers", - "vm_size": "Standard_D4s_v4", - "capture_name_prefix": "packer", - "image_version": "dev", - "image_os": "ubuntu16", - "run_validation_diskspace": "false", - "dockerhub_login": "{{env `DOCKERHUB_LOGIN`}}", - "dockerhub_password": "{{env `DOCKERHUB_PASSWORD`}}" - }, - "sensitive-variables": [ - "client_secret" - ], - "builders": [ - { - "type": "azure-arm", - "client_id": "{{user `client_id`}}", - "client_secret": "{{user `client_secret`}}", - "subscription_id": "{{user `subscription_id`}}", - "tenant_id": "{{user `tenant_id`}}", - "location": "{{user `location`}}", - "vm_size": "{{user `vm_size`}}", - "resource_group_name": "{{user `resource_group`}}", - "storage_account": "{{user `storage_account`}}", - "build_resource_group_name": "{{user `build_resource_group_name`}}", - "temp_resource_group_name": "{{user `temp_resource_group_name`}}", - "capture_container_name": "images", - "capture_name_prefix": "{{user `capture_name_prefix`}}", - "virtual_network_name": "{{user `virtual_network_name`}}", - "virtual_network_resource_group_name": "{{user `virtual_network_resource_group_name`}}", - "virtual_network_subnet_name": "{{user `virtual_network_subnet_name`}}", - "private_virtual_network_with_public_ip": "{{user `private_virtual_network_with_public_ip`}}", - "allowed_inbound_ip_addresses": "{{user `allowed_inbound_ip_addresses`}}", - "os_type": "Linux", - "image_publisher": "Canonical", - "image_offer": "UbuntuServer", - "image_sku": "16.04-LTS", - "os_disk_size_gb": "86" - } - ], - "provisioners": [ - { - "type": "shell", - "inline": [ - "mkdir {{user `image_folder`}}", - "chmod 777 {{user `image_folder`}}" - ], - "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" - }, - { - "type": "shell", - "script": "{{template_dir}}/scripts/base/apt-mock.sh", - "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" - }, - { - "type": "shell", - "scripts": [ - "{{template_dir}}/scripts/base/repos.sh" - ], - "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" - }, - { - "type": "shell", - "script": "{{template_dir}}/scripts/base/apt.sh", - "environment_vars": [ - "DEBIAN_FRONTEND=noninteractive" - ], - "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" - }, - { - "type": "shell", - "script": "{{template_dir}}/scripts/base/limits.sh", - "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" - }, - { - "type": "file", - "source": "{{template_dir}}/scripts/helpers", - "destination": "{{user `helper_script_folder`}}" - }, - { - "type": "file", - "source": "{{template_dir}}/scripts/installers", - "destination": "{{user `installer_script_folder`}}" - }, - { - "type": "file", - "source": "{{ template_dir }}/post-generation", - "destination": "{{user `image_folder`}}" - }, - { - "type": "file", - "source": "{{template_dir}}/scripts/tests", - "destination": "{{user `image_folder`}}" - }, - { - "type": "file", - "source": "{{ template_dir }}/scripts/SoftwareReport", - "destination": "{{user `image_folder`}}" - }, - { - "type": "file", - "source": "{{template_dir}}/toolsets/toolset-1604.json", - "destination": "{{user `installer_script_folder`}}/toolset.json" - }, - { - "type": "shell", - "scripts": [ - "{{template_dir}}/scripts/installers/preimagedata.sh" - ], - "environment_vars": [ - "IMAGE_VERSION={{user `image_version`}}", - "IMAGEDATA_FILE={{user `imagedata_file`}}" - ], - "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" - }, - { - "type": "shell", - "scripts": [ - "{{template_dir}}/scripts/installers/configure-environment.sh" - ], - "environment_vars": [ - "IMAGE_VERSION={{user `image_version`}}", - "IMAGE_OS={{user `image_os`}}", - "HELPER_SCRIPTS={{user `helper_script_folder`}}" - ], - "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" - }, - { - "type": "shell", - "scripts": [ - "{{template_dir}}/scripts/installers/complete-snap-setup.sh" - ], - "environment_vars": [ - "HELPER_SCRIPTS={{user `helper_script_folder`}}" - ], - "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" - }, - { - "type": "shell", - "scripts": [ - "{{template_dir}}/scripts/installers/powershellcore.sh" - ], - "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" - }, - { - "type": "shell", - "scripts": [ - "{{template_dir}}/scripts/installers/Install-PowerShellModules.ps1", - "{{template_dir}}/scripts/installers/Install-AzureModules.ps1" - ], - "environment_vars": [ - "HELPER_SCRIPTS={{user `helper_script_folder`}}", - "INSTALLER_SCRIPT_FOLDER={{user `installer_script_folder`}}" - ], - "execute_command": "sudo sh -c '{{ .Vars }} pwsh -f {{ .Path }}'" - }, - { - "type": "shell", - "scripts": [ - "{{template_dir}}/scripts/installers/docker-compose.sh", - "{{template_dir}}/scripts/installers/docker-moby.sh" - ], - "environment_vars": [ - "HELPER_SCRIPTS={{user `helper_script_folder`}}", - "INSTALLER_SCRIPT_FOLDER={{user `installer_script_folder`}}", - "DOCKERHUB_LOGIN={{user `dockerhub_login`}}", - "DOCKERHUB_PASSWORD={{user `dockerhub_password`}}" - ], - "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" - }, - { - "type": "shell", - "scripts": [ - "{{template_dir}}/scripts/installers/ansible.sh", - "{{template_dir}}/scripts/installers/azcopy.sh", - "{{template_dir}}/scripts/installers/azure-cli.sh", - "{{template_dir}}/scripts/installers/azure-devops-cli.sh", - "{{template_dir}}/scripts/installers/basic.sh", - "{{template_dir}}/scripts/installers/aliyun-cli.sh", - "{{template_dir}}/scripts/installers/apache.sh", - "{{template_dir}}/scripts/installers/aws.sh", - "{{template_dir}}/scripts/installers/nvm.sh", - "{{template_dir}}/scripts/installers/clang.sh", - "{{template_dir}}/scripts/installers/swift.sh", - "{{template_dir}}/scripts/installers/cmake.sh", - "{{template_dir}}/scripts/installers/codeql-bundle.sh", - "{{template_dir}}/scripts/installers/dotnetcore-sdk.sh", - "{{template_dir}}/scripts/installers/erlang.sh", - "{{template_dir}}/scripts/installers/firefox.sh", - "{{template_dir}}/scripts/installers/gcc.sh", - "{{template_dir}}/scripts/installers/gfortran.sh", - "{{template_dir}}/scripts/installers/git.sh", - "{{template_dir}}/scripts/installers/github-cli.sh", - "{{template_dir}}/scripts/installers/google-chrome.sh", - "{{template_dir}}/scripts/installers/google-cloud-sdk.sh", - "{{template_dir}}/scripts/installers/haskell.sh", - "{{template_dir}}/scripts/installers/heroku.sh", - "{{template_dir}}/scripts/installers/hhvm.sh", - "{{template_dir}}/scripts/installers/java-tools.sh", - "{{template_dir}}/scripts/installers/kubernetes-tools.sh", - "{{template_dir}}/scripts/installers/oc.sh", - "{{template_dir}}/scripts/installers/leiningen.sh", - "{{template_dir}}/scripts/installers/mercurial.sh", - "{{template_dir}}/scripts/installers/miniconda.sh", - "{{template_dir}}/scripts/installers/mono.sh", - "{{template_dir}}/scripts/installers/mysql.sh", - "{{template_dir}}/scripts/installers/mssql-cmd-tools.sh", - "{{template_dir}}/scripts/installers/nodejs.sh", - "{{template_dir}}/scripts/installers/bazel.sh", - "{{template_dir}}/scripts/installers/oras-cli.sh", - "{{template_dir}}/scripts/installers/phantomjs.sh", - "{{template_dir}}/scripts/installers/postgresql.sh", - "{{template_dir}}/scripts/installers/pulumi.sh", - "{{template_dir}}/scripts/installers/ruby.sh", - "{{template_dir}}/scripts/installers/r.sh", - "{{template_dir}}/scripts/installers/rust.sh", - "{{template_dir}}/scripts/installers/julia.sh", - "{{template_dir}}/scripts/installers/sbt.sh", - "{{template_dir}}/scripts/installers/selenium.sh", - "{{template_dir}}/scripts/installers/terraform.sh", - "{{template_dir}}/scripts/installers/packer.sh", - "{{template_dir}}/scripts/installers/vcpkg.sh", - "{{template_dir}}/scripts/installers/dpkg-config.sh", - "{{template_dir}}/scripts/installers/mongodb.sh", - "{{template_dir}}/scripts/installers/nginx.sh", - "{{template_dir}}/scripts/installers/android.sh", - "{{template_dir}}/scripts/installers/pypy.sh", - "{{template_dir}}/scripts/installers/python.sh" - ], - "environment_vars": [ - "HELPER_SCRIPTS={{user `helper_script_folder`}}", - "INSTALLER_SCRIPT_FOLDER={{user `installer_script_folder`}}", - "DEBIAN_FRONTEND=noninteractive" - ], - "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" - }, - { - "type": "shell", - "scripts": [ - "{{template_dir}}/scripts/installers/Install-Toolset.ps1", - "{{template_dir}}/scripts/installers/Configure-Toolset.ps1" - ], - "environment_vars": [ - "HELPER_SCRIPTS={{user `helper_script_folder`}}", - "INSTALLER_SCRIPT_FOLDER={{user `installer_script_folder`}}" - ], - "execute_command": "sudo sh -c '{{ .Vars }} pwsh -f {{ .Path }}'" - }, - { - "type": "shell", - "scripts": [ - "{{template_dir}}/scripts/installers/homebrew.sh" - ], - "environment_vars": [ - "HELPER_SCRIPTS={{user `helper_script_folder`}}", - "DEBIAN_FRONTEND=noninteractive", - "INSTALLER_SCRIPT_FOLDER={{user `installer_script_folder`}}" - ], - "execute_command": "/bin/sh -c '{{ .Vars }} {{ .Path }}'" - }, - { - "type": "shell", - "expect_disconnect": true, - "scripts": [ - "{{template_dir}}/scripts/base/reboot.sh" - ], - "execute_command": "/bin/sh -c '{{ .Vars }} {{ .Path }}'" - }, - { - "type": "shell", - "pause_before": "60s", - "start_retry_timeout": "10m", - "scripts": [ - "{{template_dir}}/scripts/installers/cleanup.sh" - ], - "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" - }, - { - "type": "shell", - "script": "{{template_dir}}/scripts/base/apt-mock-remove.sh", - "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" - }, - { - "type": "shell", - "inline": [ - "pwsh -File {{user `image_folder`}}/SoftwareReport/SoftwareReport.Generator.ps1 -OutputDirectory {{user `image_folder`}}", - "pwsh -File {{user `image_folder`}}/tests/RunAll-Tests.ps1 -OutputDirectory {{user `image_folder`}}" - ], - "environment_vars": [ - "IMAGE_VERSION={{user `image_version`}}", - "INSTALLER_SCRIPT_FOLDER={{user `installer_script_folder`}}" - ] - }, - { - "type": "file", - "source": "{{user `image_folder`}}/Ubuntu-Readme.md", - "destination": "{{template_dir}}/Ubuntu1604-README.md", - "direction": "download" - }, - { - "type": "shell", - "scripts":[ - "{{template_dir}}/scripts/installers/post-deployment.sh" - ], - "environment_vars":[ - "HELPER_SCRIPT_FOLDER={{user `helper_script_folder`}}", - "INSTALLER_SCRIPT_FOLDER={{user `installer_script_folder`}}", - "IMAGE_FOLDER={{user `image_folder`}}" - ], - "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" - }, - { - "type": "shell", - "scripts": [ - "{{template_dir}}/scripts/installers/validate-disk-space.sh" - ], - "environment_vars": [ - "RUN_VALIDATION={{user `run_validation_diskspace`}}" - ] - }, - { - "type": "file", - "source": "{{template_dir}}/config/ubuntu1604.conf", - "destination": "/tmp/" - }, - { - "type": "shell", - "inline": [ - "mkdir -p /etc/vsts", - "cp /tmp/ubuntu1604.conf /etc/vsts/machine_instance.conf" - ], - "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" - }, - { - "type": "shell", - "inline": [ - "sleep 30", - "/usr/sbin/waagent -force -deprovision+user && export HISTSIZE=0 && sync" - ], - "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" - } - ] -} diff --git a/images/linux/ubuntu1804.json b/images/linux/ubuntu1804.json index 569e40857598..bff0b4597fe4 100644 --- a/images/linux/ubuntu1804.json +++ b/images/linux/ubuntu1804.json @@ -220,7 +220,6 @@ "{{template_dir}}/scripts/installers/kubernetes-tools.sh", "{{template_dir}}/scripts/installers/oc.sh", "{{template_dir}}/scripts/installers/leiningen.sh", - "{{template_dir}}/scripts/installers/mercurial.sh", "{{template_dir}}/scripts/installers/miniconda.sh", "{{template_dir}}/scripts/installers/mono.sh", "{{template_dir}}/scripts/installers/kotlin.sh", diff --git a/images/linux/ubuntu2004.json b/images/linux/ubuntu2004.json index 5999e6a33180..4d7af50f0a7c 100644 --- a/images/linux/ubuntu2004.json +++ b/images/linux/ubuntu2004.json @@ -221,7 +221,6 @@ "{{template_dir}}/scripts/installers/kubernetes-tools.sh", "{{template_dir}}/scripts/installers/oc.sh", "{{template_dir}}/scripts/installers/leiningen.sh", - "{{template_dir}}/scripts/installers/mercurial.sh", "{{template_dir}}/scripts/installers/miniconda.sh", "{{template_dir}}/scripts/installers/mono.sh", "{{template_dir}}/scripts/installers/kotlin.sh", From 479e40b202e174cc00577ec745d3018056da87b6 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Wed, 27 Oct 2021 11:06:13 +0300 Subject: [PATCH 0650/3485] Remove default values from Anka packer template (#4346) --- images/macos/templates/macOS-11.pkr.hcl | 85 ++++++++++++++----------- 1 file changed, 48 insertions(+), 37 deletions(-) diff --git a/images/macos/templates/macOS-11.pkr.hcl b/images/macos/templates/macOS-11.pkr.hcl index 6b8c840465a8..7cc739a8201a 100644 --- a/images/macos/templates/macOS-11.pkr.hcl +++ b/images/macos/templates/macOS-11.pkr.hcl @@ -1,26 +1,43 @@ variable "source_vm_name" { - type = string - default = "clean_macos_11_300gb" + type = string } variable "source_vm_tag" { type = string - default = "bigsur_300gb" } -variable "vm_name" { +variable "build_id" { + type = string +} + +variable "vm_username" { type = string - default = "macos-11" + sensitive = true +} + +variable "vm_password" { + type = string + sensitive = true +} + +variable "xcode_install_user" { + type = string + sensitive = true +} + +variable "xcode_install_password" { + type = string + sensitive = true } variable "vcpu_count" { type = string - default = "4" + default = "5" } variable "ram_size" { type = string - default = "6G" + default = "12G" } variable "image_os" { @@ -28,23 +45,17 @@ variable "image_os" { default = "macos11" } -variable "build_id" { type = string } -variable "vm_username" { type = string } -variable "vm_password" { type = string } -variable "xcode_install_user" { type = string } -variable "xcode_install_password" { type = string } - source "veertu-anka-vm-clone" "template" { - vm_name = "${var.vm_name}" + vm_name = "${var.build_id}" source_vm_name = "${var.source_vm_name}" source_vm_tag = "${var.source_vm_tag}" vcpu_count = "${var.vcpu_count}" ram_size = "${var.ram_size}" - stop_vm = "true" + stop_vm = "true" } -build { - sources = [ +build { + sources = [ "source.veertu-anka-vm-clone.template", ] provisioner "shell" { @@ -54,23 +65,23 @@ build { } provisioner "file" { destination = "image-generation/" - sources = [ "./provision/assets", "./tests", "./software-report", "./helpers" ] + sources = [ "./provision/assets", "./tests", "./software-report", "./helpers" ] } provisioner "file" { destination = "image-generation/add-certificate.swift" - source = "./provision/configuration/add-certificate.swift" + source = "./provision/configuration/add-certificate.swift" } provisioner "file" { destination = ".bashrc" - source = "./provision/configuration/environment/bashrc" + source = "./provision/configuration/environment/bashrc" } provisioner "file" { destination = ".bash_profile" - source = "./provision/configuration/environment/bashprofile" + source = "./provision/configuration/environment/bashprofile" } provisioner "file" { destination = "./" - source = "./provision/utils" + source = "./provision/utils" } provisioner "shell" { inline = [ @@ -79,11 +90,11 @@ build { } provisioner "file" { destination = "bootstrap" - source = "./provision/bootstrap-provisioner/" + source = "./provision/bootstrap-provisioner/" } provisioner "file" { destination = "image-generation/toolset.json" - source = "./toolsets/toolset-11.json" + source = "./toolsets/toolset-11.json" } provisioner "shell" { scripts = [ @@ -100,7 +111,7 @@ build { "PASSWORD=${var.vm_password}", "USERNAME=${var.vm_username}" ] - execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}" + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}" } provisioner "shell" { scripts = [ @@ -113,11 +124,11 @@ build { "IMAGE_VERSION=${var.build_id}", "IMAGE_OS=${var.image_os}" ] - execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" } provisioner "shell" { script = "./provision/core/reboot.sh" - execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}" + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}" expect_disconnect = true } provisioner "shell" { @@ -134,7 +145,7 @@ build { "./provision/core/git.sh", "./provision/core/node.sh" ] - execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" } provisioner "shell" { script = "./provision/core/xcode.ps1" @@ -142,11 +153,11 @@ build { "XCODE_INSTALL_USER=${var.xcode_install_user}", "XCODE_INSTALL_PASSWORD=${var.xcode_install_password}" ] - execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} pwsh -f {{ .Path }}" + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} pwsh -f {{ .Path }}" } provisioner "shell" { script = "./provision/core/reboot.sh" - execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}" + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}" expect_disconnect = true } provisioner "shell" { @@ -181,33 +192,33 @@ build { "./provision/core/pipx-packages.sh", "./provision/core/bicep.sh" ] - execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" } provisioner "shell" { script = "./provision/core/toolset.ps1" - execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} pwsh -f {{ .Path }}" + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} pwsh -f {{ .Path }}" } provisioner "shell" { script = "./provision/core/delete-duplicate-sims.rb" - execute_command = "source $HOME/.bash_profile; ruby {{ .Path }}" + execute_command = "source $HOME/.bash_profile; ruby {{ .Path }}" } provisioner "shell" { inline = [ "pwsh -File \"$HOME/image-generation/software-report/SoftwareReport.Generator.ps1\" -OutputDirectory \"$HOME/image-generation/output/software-report\" -ImageName UUID=${build.PackerRunUUID}", "pwsh -File \"$HOME/image-generation/tests/RunAll-Tests.ps1\"" ] - execute_command = "source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" + execute_command = "source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" } provisioner "file" { destination = "../image-output/" direction = "download" - source = "./image-generation/output/" + source = "./image-generation/output/" } provisioner "shell" { scripts = [ "./provision/configuration/configure-hostname.sh", "./provision/configuration/finalize-vm.sh" ] - execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" } -} \ No newline at end of file +} From 76e359f80693d10a54867f9ee7d3c91e98a0b7a7 Mon Sep 17 00:00:00 2001 From: Maksim Shilov <89912354+shilovmaksim@users.noreply.github.com> Date: Wed, 27 Oct 2021 14:12:22 +0300 Subject: [PATCH 0651/3485] Add VC.14.29.16.11 and VC.Runtimes.ARM64.Spectre to VS2022 (#4344) --- images/win/toolsets/toolset-2022.json | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index c728989daa15..c7bad38cc062 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -178,6 +178,7 @@ "Microsoft.VisualStudio.Component.VC.CMake.Project", "Microsoft.VisualStudio.Component.VC.DiagnosticTools", "Microsoft.VisualStudio.Component.VC.Llvm.ClangToolset", + "Microsoft.VisualStudio.Component.VC.Runtimes.ARM64.Spectre", "Microsoft.VisualStudio.Component.VC.Runtimes.x86.x64.Spectre", "Microsoft.VisualStudio.Component.VC.TestAdapterForBoostTest", "Microsoft.VisualStudio.Component.VC.TestAdapterForGoogleTest", @@ -192,6 +193,12 @@ "Microsoft.VisualStudio.Component.VC.v141.x86.x64.Spectre", "Microsoft.VisualStudio.Component.VC.v141.MFC", "Microsoft.VisualStudio.Component.VC.v141.MFC.Spectre", + "Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM", + "Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM.Spectre", + "Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM64", + "Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM64.Spectre", + "Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64", + "Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64.Spectre", "Microsoft.VisualStudio.Component.VC.ATLMFC", "Microsoft.VisualStudio.Component.VC.ATLMFC.Spectre", "Microsoft.VisualStudio.Component.Windows10SDK.19041", From a8f97f002300b166b926cbe33b46169966faa083 Mon Sep 17 00:00:00 2001 From: Ralph Jansen Date: Wed, 27 Oct 2021 13:45:01 +0200 Subject: [PATCH 0652/3485] Update module to latest version (#4349) --- images/win/toolsets/toolset-2016.json | 2 +- images/win/toolsets/toolset-2019.json | 2 +- images/win/toolsets/toolset-2022.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/images/win/toolsets/toolset-2016.json b/images/win/toolsets/toolset-2016.json index a6a83bb2375f..88a3a8e655f8 100644 --- a/images/win/toolsets/toolset-2016.json +++ b/images/win/toolsets/toolset-2016.json @@ -124,7 +124,7 @@ "name": "az", "url" : "https://raw.githubusercontent.com/Azure/az-ps-module-versions/main/versions-manifest.json", "versions": [ - "6.4.0" + "6.5.0" ], "zip_versions": [ "1.0.0", diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index 3d2d1a2138be..07695874812f 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -124,7 +124,7 @@ "name": "az", "url" : "https://raw.githubusercontent.com/Azure/az-ps-module-versions/main/versions-manifest.json", "versions": [ - "6.4.0" + "6.5.0" ], "zip_versions": [ "1.0.0", diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index c7bad38cc062..b520d6c4cd29 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -101,7 +101,7 @@ "name": "az", "url" : "https://raw.githubusercontent.com/Azure/az-ps-module-versions/main/versions-manifest.json", "versions": [ - "6.4.0" + "6.5.0" ], "zip_versions": [] } From 4eb1b7986df57495a11e701a5fb6dada6cabb827 Mon Sep 17 00:00:00 2001 From: Nikolay Frolov <90333448+nikolai-frolov@users.noreply.github.com> Date: Wed, 27 Oct 2021 16:48:10 +0300 Subject: [PATCH 0653/3485] Add jazzy tool to MacOS 10.14 - 12 (#4348) --- images/macos/software-report/SoftwareReport.Common.psm1 | 5 +++++ images/macos/software-report/SoftwareReport.Generator.ps1 | 1 + images/macos/tests/RubyGem.Tests.ps1 | 6 ++++++ images/macos/toolsets/toolset-10.14.json | 3 ++- images/macos/toolsets/toolset-10.15.json | 3 ++- images/macos/toolsets/toolset-11.json | 3 ++- images/macos/toolsets/toolset-12.json | 3 ++- 7 files changed, 20 insertions(+), 4 deletions(-) diff --git a/images/macos/software-report/SoftwareReport.Common.psm1 b/images/macos/software-report/SoftwareReport.Common.psm1 index 48e3218b8046..782b137f62e4 100644 --- a/images/macos/software-report/SoftwareReport.Common.psm1 +++ b/images/macos/software-report/SoftwareReport.Common.psm1 @@ -512,6 +512,11 @@ function Get-SbtVersion { return "Sbt $sbtVersion" } +function Get-JazzyVersion { + $jazzyVersion = Run-Command "jazzy --version" | Take-Part -Part 2 + return "Jazzy $jazzyVersion" +} + function Build-PackageManagementEnvironmentTable { return @( @{ diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1 index e4686f05ba26..706404eeb441 100644 --- a/images/macos/software-report/SoftwareReport.Generator.ps1 +++ b/images/macos/software-report/SoftwareReport.Generator.ps1 @@ -176,6 +176,7 @@ $markdown += New-MDNewLine # Tools $markdown += New-MDHeader "Tools" -Level 3 $toolsList = @( + (Get-JazzyVersion), (Get-FastlaneVersion), (Get-CmakeVersion), (Get-AppCenterCLIVersion), diff --git a/images/macos/tests/RubyGem.Tests.ps1 b/images/macos/tests/RubyGem.Tests.ps1 index d8f43e7c3b94..5e15d2f703cf 100644 --- a/images/macos/tests/RubyGem.Tests.ps1 +++ b/images/macos/tests/RubyGem.Tests.ps1 @@ -35,4 +35,10 @@ Describe "xcpretty" { It "xcpretty" { "xcpretty --version" | Should -ReturnZeroExitCode } +} + +Describe "jazzy" { + It "jazzy" { + "jazzy --version" | Should -ReturnZeroExitCode + } } \ No newline at end of file diff --git a/images/macos/toolsets/toolset-10.14.json b/images/macos/toolsets/toolset-10.14.json index b6ae1155dc34..b3ddd3f0a99b 100644 --- a/images/macos/toolsets/toolset-10.14.json +++ b/images/macos/toolsets/toolset-10.14.json @@ -371,7 +371,8 @@ "nomad-cli", "xcpretty", "bundler", - "fastlane" + "fastlane", + "jazzy" ] }, "go": { diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index 1764687bd31d..a4bfadcf17c2 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -325,7 +325,8 @@ "nomad-cli", "xcpretty", "bundler", - "fastlane" + "fastlane", + "jazzy" ] }, "go": { diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index d8272bf0a06a..10c26bbb912a 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -268,7 +268,8 @@ "nomad-cli", "xcpretty", "bundler", - "fastlane" + "fastlane", + "jazzy" ] }, "go": { diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index 11fc679d5c12..3dd622c06514 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -168,7 +168,8 @@ "cocoapods", "xcpretty", "bundler", - "fastlane" + "fastlane", + "jazzy" ] }, "go": { From 733c34d93a499d50a753a5c311df114c97a48dfa Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Wed, 27 Oct 2021 19:23:50 +0300 Subject: [PATCH 0654/3485] Add node 16 to the toolcache (#4354) --- images/win/toolsets/toolset-2016.json | 3 ++- images/win/toolsets/toolset-2019.json | 3 ++- images/win/toolsets/toolset-2022.json | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/images/win/toolsets/toolset-2016.json b/images/win/toolsets/toolset-2016.json index 88a3a8e655f8..1e310ed6cd0e 100644 --- a/images/win/toolsets/toolset-2016.json +++ b/images/win/toolsets/toolset-2016.json @@ -61,7 +61,8 @@ "versions": [ "10.*", "12.*", - "14.*" + "14.*", + "16.*" ] }, { diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index 07695874812f..c902a2051547 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -61,7 +61,8 @@ "versions": [ "10.*", "12.*", - "14.*" + "14.*", + "16.*" ] }, { diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index b520d6c4cd29..d76b90b3a466 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -40,7 +40,8 @@ "versions": [ "10.*", "12.*", - "14.*" + "14.*", + "16.*" ] }, { From 7d905024ff81f41e47557b7128c2b2d56c1a147f Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Wed, 27 Oct 2021 19:23:59 +0300 Subject: [PATCH 0655/3485] Add node 16 to toolcache + docker images (#4353) --- images/linux/toolsets/toolset-1804.json | 5 ++++- images/linux/toolsets/toolset-2004.json | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index e2ca070fdeb7..f31017bc8160 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -33,7 +33,8 @@ "versions": [ "10.*", "12.*", - "14.*" + "14.*", + "16.*" ] }, { @@ -219,9 +220,11 @@ "node:10", "node:12", "node:14", + "node:16", "node:10-alpine", "node:12-alpine", "node:14-alpine", + "node:16-alpine", "ubuntu:16.04", "ubuntu:18.04", "ubuntu:20.04" diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index ee50f3e65a25..6ae9911b88ba 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -34,7 +34,8 @@ "versions": [ "10.*", "12.*", - "14.*" + "14.*", + "16.*" ] }, { @@ -217,9 +218,11 @@ "node:10", "node:12", "node:14", + "node:16", "node:10-alpine", "node:12-alpine", "node:14-alpine", + "node:16-alpine", "ubuntu:16.04", "ubuntu:18.04", "ubuntu:20.04" From 1b3870ab40017b65d7e9708bbb6d28dd0871ec2d Mon Sep 17 00:00:00 2001 From: Dibir Magomedsaygitov <61747324+dibir-magomedsaygitov@users.noreply.github.com> Date: Thu, 28 Oct 2021 22:17:05 +0300 Subject: [PATCH 0656/3485] [Windows] Rework Selenium installation (#4309) --- .../win/scripts/Installers/Install-Selenium.ps1 | 16 ++++++++++------ .../SoftwareReport/SoftwareReport.Generator.ps1 | 1 + .../SoftwareReport/SoftwareReport.Tools.psm1 | 6 ++++++ images/win/toolsets/toolset-2016.json | 4 ++++ images/win/toolsets/toolset-2019.json | 4 ++++ images/win/toolsets/toolset-2022.json | 4 ++++ 6 files changed, 29 insertions(+), 6 deletions(-) diff --git a/images/win/scripts/Installers/Install-Selenium.ps1 b/images/win/scripts/Installers/Install-Selenium.ps1 index af19dcd148e2..25525b50798b 100644 --- a/images/win/scripts/Installers/Install-Selenium.ps1 +++ b/images/win/scripts/Installers/Install-Selenium.ps1 @@ -5,17 +5,21 @@ # Create Selenium directory $seleniumDirectory = "C:\selenium\" -$seleniumFileName = "selenium-server-standalone.jar" - New-Item -ItemType directory -Path $seleniumDirectory -# Temporarily download Selenium 3.141.59, since 4.* can contain some breaking changes -#$url = "https://api.github.com/repos/SeleniumHQ/selenium/releases" -#[System.String] $seleniumReleaseUrl = (Invoke-RestMethod -Uri $url).assets.browser_download_url -match "selenium-server-standalone-.+.jar" +# Download Selenium +$seleniumMajorVersion = (Get-ToolsetContent).selenium.version +$seleniumBinaryName = (Get-ToolsetContent).selenium.binary_name +$seleniumFileName = "$seleniumBinaryName.jar" +$json = Invoke-RestMethod -Uri "https://api.github.com/repos/SeleniumHQ/selenium/releases?per_page=100" +$seleniumDownloadUrl = $json.Where{-not $_.prerelease}.assets.browser_download_url | Where-Object { $_ -like "*${seleniumBinaryName}-${seleniumMajorVersion}.*jar" } | Select-Object -First 1 -$seleniumDownloadUrl = "https://github.com/SeleniumHQ/selenium/releases/download/selenium-3.141.59/selenium-server-standalone-3.141.59.jar" Start-DownloadWithRetry -Url $seleniumDownloadUrl -Name $seleniumFileName -DownloadPath $seleniumDirectory +# Create an epmty file to retrive selenium version +$seleniumFullVersion = $seleniumDownloadUrl.Split("-")[1].Split("/")[0] +New-Item -Path $seleniumDirectory -Name "$seleniumBinaryName-$seleniumFullVersion" + # Add SELENIUM_JAR_PATH environment variable $seleniumBinPath = Join-Path $seleniumDirectory $seleniumFileName setx "SELENIUM_JAR_PATH" "$($seleniumBinPath)" /M diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index 2b8194722486..5e13eedf31e4 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -119,6 +119,7 @@ $toolsList = @( (Get-StackVersion), (Get-SVNVersion), (Get-VSWhereVersion), + (Get-SeleniumVersion), (Get-SwigVersion), (Get-WinAppDriver), (Get-ZstdVersion), diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 index ee47d5021c82..5a85cc7ae2aa 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 @@ -275,3 +275,9 @@ function Get-SwigVersion { $swigVersion = $Matches.Version return "Swig $swigVersion" } + +function Get-SeleniumVersion { + $seleniumBinaryName = (Get-ToolsetContent).selenium.binary_name + $fullSeleniumVersion = (Get-ChildItem "C:\selenium\${seleniumBinaryName}-*").Name -replace "${seleniumBinaryName}-" + return "Selenium server $fullSeleniumVersion" +} \ No newline at end of file diff --git a/images/win/toolsets/toolset-2016.json b/images/win/toolsets/toolset-2016.json index 1e310ed6cd0e..e3e54e94114b 100644 --- a/images/win/toolsets/toolset-2016.json +++ b/images/win/toolsets/toolset-2016.json @@ -363,6 +363,10 @@ "cmd": "yamllint --version" } ], + "selenium": { + "version": "3", + "binary_name": "selenium-server-standalone" + }, "npm": { "global_packages": [ { "name": "yarn", "test": "yarn --version" }, diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index c902a2051547..32116547feef 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -394,6 +394,10 @@ "cmd": "yamllint --version" } ], + "selenium": { + "version": "3", + "binary_name": "selenium-server-standalone" + }, "npm": { "global_packages": [ { "name": "yarn", "test": "yarn --version" }, diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index d76b90b3a466..a86fb6c2dd75 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -243,6 +243,10 @@ "cmd": "yamllint --version" } ], + "selenium": { + "version": "3", + "binary_name": "selenium-server-standalone" + }, "npm": { "global_packages": [ { "name": "yarn", "test": "yarn --version" }, From 2e47a52b7e29c54c85559fc8f925dc7363c9f274 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Fri, 29 Oct 2021 01:15:55 +0300 Subject: [PATCH 0657/3485] [Ubuntu] Avoid installing preview android platform versions (#4371) --- images/linux/scripts/installers/android.sh | 2 +- images/linux/scripts/tests/Android.Tests.ps1 | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/images/linux/scripts/installers/android.sh b/images/linux/scripts/installers/android.sh index 957f1430df92..aef8f5906211 100644 --- a/images/linux/scripts/installers/android.sh +++ b/images/linux/scripts/installers/android.sh @@ -94,7 +94,7 @@ if isUbuntu20; then echo "ANDROID_NDK_LATEST_HOME=$ANDROID_SDK_ROOT/ndk/$ndkLatestFullVersion" | tee -a /etc/environment fi -availablePlatforms=($($SDKMANAGER --list | sed -n '/Available Packages:/,/^$/p' | grep "platforms;android-" | cut -d"|" -f 1)) +availablePlatforms=($($SDKMANAGER --list | sed -n '/Available Packages:/,/^$/p' | grep "platforms;android-[0-9]" | cut -d"|" -f 1)) allBuildTools=($($SDKMANAGER --list | grep "build-tools;" | cut -d"|" -f 1 | sort -u)) availableBuildTools=$(echo ${allBuildTools[@]//*rc[0-9]/}) diff --git a/images/linux/scripts/tests/Android.Tests.ps1 b/images/linux/scripts/tests/Android.Tests.ps1 index cd103b931403..3d530a0b990e 100644 --- a/images/linux/scripts/tests/Android.Tests.ps1 +++ b/images/linux/scripts/tests/Android.Tests.ps1 @@ -6,18 +6,16 @@ Describe "Android" { [array]$ndkVersions = Get-ToolsetValue "android.ndk.versions" $ndkDefaultFullVersion = Get-ChildItem "$env:ANDROID_HOME/ndk/$ndkDefaultVersion.*" -Name | Select-Object -Last 1 $ndkFullVersions = $ndkVersions | ForEach-Object { (Get-ChildItem "/usr/local/lib/android/sdk/ndk/${_}.*" | Select-Object -Last 1).Name } | ForEach-Object { "ndk/${_}" } - - $platformVersionsList = ($androidSdkManagerPackages | Where-Object { "$_".StartsWith("platforms;") }) -replace 'platforms;android-', '' - $platformNumericList = $platformVersionsList | Where-Object { $_ -match "\d+" } | Where-Object { [int]$_ -ge $platformMinVersion } | Sort-Object -Unique - $platformLetterList = $platformVersionsList | Where-Object { $_ -match "\D+" } | Sort-Object -Unique - $platforms = $platformNumericList + $platformLetterList | ForEach-Object { "platforms/android-${_}" } + # Platforms starting with a letter are the preview versions, which is not installed on the image + $platformVersionsList = ($androidSdkManagerPackages | Where-Object { "$_".StartsWith("platforms;") }) -replace 'platforms;android-', '' | Where-Object { $_ -match "^\d+$" } | Sort-Object -Unique + $platformsInstalled = $platformVersionsList | Where-Object { [int]$_ -ge $platformMinVersion } | ForEach-Object { "platforms/android-${_}" } $buildToolsList = ($androidSdkManagerPackages | Where-Object { "$_".StartsWith("build-tools;") }) -replace 'build-tools;', '' $buildTools = $buildToolsList | Where-Object { $_ -match "\d+(\.\d+){2,}$"} | Where-Object { [version]$_ -ge $buildToolsMinVersion } | Sort-Object -Unique | ForEach-Object { "build-tools/${_}" } $androidPackages = @( - $platforms, + $platformsInstalled, $buildTools, $ndkFullVersions, (Get-ToolsetValue "android.extra_list" | ForEach-Object { "extras/${_}" }), From b8c5b5f3f00365896b6b51c6030446a71fdf3d54 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Fri, 29 Oct 2021 01:16:26 +0300 Subject: [PATCH 0658/3485] [macOS] Avoid installing preview android platform versions (#4372) --- images/macos/provision/core/android-toolsets.sh | 2 +- images/macos/tests/Android.Tests.ps1 | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/images/macos/provision/core/android-toolsets.sh b/images/macos/provision/core/android-toolsets.sh index 7bcb2fcb606d..813d3cd057d1 100755 --- a/images/macos/provision/core/android-toolsets.sh +++ b/images/macos/provision/core/android-toolsets.sh @@ -74,7 +74,7 @@ ln -s $ANDROID_HOME/ndk/$ndkDefault $ANDROID_HOME/ndk-bundle ANDROID_NDK_LATEST_HOME=$ANDROID_HOME/ndk/$ndkLatest echo "export ANDROID_NDK_LATEST_HOME=$ANDROID_NDK_LATEST_HOME" >> "${HOME}/.bashrc" -availablePlatforms=($($SDKMANAGER --list | grep "platforms;android-" | cut -d"|" -f 1 | sort -u)) +availablePlatforms=($($SDKMANAGER --list | grep "platforms;android-[0-9]" | cut -d"|" -f 1 | sort -u)) filter_components_by_version $ANDROID_PLATFORM "${availablePlatforms[@]}" allBuildTools=($($SDKMANAGER --list --include_obsolete | grep "build-tools;" | cut -d"|" -f 1 | sort -u)) diff --git a/images/macos/tests/Android.Tests.ps1 b/images/macos/tests/Android.Tests.ps1 index 0edfe2e7c437..8c9f97fab473 100644 --- a/images/macos/tests/Android.Tests.ps1 +++ b/images/macos/tests/Android.Tests.ps1 @@ -12,11 +12,9 @@ Describe "Android" { [string]$ndkDefaultVersion = Get-ToolsetValue "android.ndk.default" $ndkFullVersions = $ndkVersions | ForEach-Object { Get-ChildItem "$env:ANDROID_HOME/ndk/${_}.*" -Name | Select-Object -Last 1} | ForEach-Object { "ndk/${_}" } $ndkDefaultFullVersion = Get-ChildItem "$env:ANDROID_HOME/ndk/$ndkDefaultVersion.*" -Name | Select-Object -Last 1 - - $platformVersionsList = ($androidSdkManagerPackages | Where-Object { "$_".StartsWith("platforms;") }) -replace 'platforms;android-', '' - $platformNumericList = $platformVersionsList | Where-Object { $_ -match "\d+" } | Where-Object { [int]$_ -ge $platformMinVersion } | Sort-Object -Unique - $platformLetterList = $platformVersionsList | Where-Object { $_ -match "\D+" } | Sort-Object -Unique - $platforms = $platformNumericList + $platformLetterList | ForEach-Object { "platforms/android-${_}" } + # Platforms starting with a letter are the preview versions, which is not installed on the image + $platformVersionsList = ($androidSdkManagerPackages | Where-Object { "$_".StartsWith("platforms;") }) -replace 'platforms;android-', '' | Where-Object { $_ -match "^\d+$" } | Sort-Object -Unique + $platformsInstalled = $platformVersionsList | Where-Object { [int]$_ -ge $platformMinVersion } | ForEach-Object { "platforms/android-${_}" } $buildToolsList = ($androidSdkManagerPackages | Where-Object { "$_".StartsWith("build-tools;") }) -replace 'build-tools;', '' $buildTools = $buildToolsList | Where-Object { $_ -match "\d+(\.\d+){2,}$"} | Where-Object { [version]$_ -ge $buildToolsMinVersion } | Sort-Object -Unique | @@ -28,7 +26,7 @@ Describe "Android" { "tools/proguard", "ndk-bundle", "cmake", - $platforms, + $platformsInstalled, $buildTools, $ndkFullVersions, (Get-ToolsetValue "android.extra-list" | ForEach-Object { "extras/${_}" }), From 43d7228dce2b01ade2e862ae4ffaa9f6b9fc588d Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Fri, 29 Oct 2021 09:00:26 +0300 Subject: [PATCH 0659/3485] Add node 16 to the macOS toolcache (#4352) --- images/macos/toolsets/toolset-10.15.json | 3 ++- images/macos/toolsets/toolset-11.json | 3 ++- images/macos/toolsets/toolset-12.json | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index a4bfadcf17c2..8dab0ae2675c 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -275,7 +275,8 @@ "versions": [ "10.*", "12.*", - "14.*" + "14.*", + "16.*" ] }, { diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index 10c26bbb912a..cf7426770114 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -220,7 +220,8 @@ "versions": [ "10.*", "12.*", - "14.*" + "14.*", + "16.*" ] }, { diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index 3dd622c06514..fb81b60bb2b1 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -125,7 +125,8 @@ "versions": [ "10.*", "12.*", - "14.*" + "14.*", + "16.*" ] }, { From 029139e1b7c59f893a93e5f865f5183ab142a369 Mon Sep 17 00:00:00 2001 From: Maksim Shilov <89912354+shilovmaksim@users.noreply.github.com> Date: Fri, 29 Oct 2021 11:22:51 +0300 Subject: [PATCH 0660/3485] [Ubuntu] Adding pypy 3.8 to toolset to Ubuntu 20.04 (#4365) --- images/linux/toolsets/toolset-2004.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index 6ae9911b88ba..2cb1ed2dba1f 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -23,7 +23,8 @@ "versions": [ "2.7", "3.6", - "3.7" + "3.7", + "3.8" ] }, { From 1457fb6402aaad8508d16a8968106b628368867f Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Fri, 29 Oct 2021 11:46:56 +0300 Subject: [PATCH 0661/3485] [Ubuntu] fix apt http headers and proxy settings (#4368) --- images/linux/scripts/base/apt.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/images/linux/scripts/base/apt.sh b/images/linux/scripts/base/apt.sh index c764b3b628f1..05d08878c510 100644 --- a/images/linux/scripts/base/apt.sh +++ b/images/linux/scripts/base/apt.sh @@ -14,6 +14,13 @@ echo "APT::Acquire::Retries \"10\";" > /etc/apt/apt.conf.d/80-retries # Configure apt to always assume Y echo "APT::Get::Assume-Yes \"true\";" > /etc/apt/apt.conf.d/90assumeyes +# Fix bad proxy and http headers settings +cat <> /etc/apt/apt.conf.d/99bad_proxy +Acquire::http::Pipeline-Depth 0; +Acquire::http::No-Cache true; +Acquire::BrokenProxy true; +EOF + # Uninstall unattended-upgrades apt-get purge unattended-upgrades From f5d2b977cd76ad717c0586e6db214f13ab89fa12 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Fri, 29 Oct 2021 16:45:56 +0300 Subject: [PATCH 0662/3485] Add Xcode 13.2 to macOS 11 & 12 (#4363) --- images/macos/toolsets/toolset-11.json | 1 + images/macos/toolsets/toolset-12.json | 1 + 2 files changed, 2 insertions(+) diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index cf7426770114..40c8d42d231c 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -2,6 +2,7 @@ "xcode": { "default": "13.0", "versions": [ + { "link": "13.2", "version": "13.2.0" }, { "link": "13.1", "version": "13.1.0" }, { "link": "13.0", "version": "13.0.0" }, { "link": "13.0_beta", "version": "13 beta 5", "skip-symlink": "true" }, diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index fb81b60bb2b1..cac60ec29027 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -2,6 +2,7 @@ "xcode": { "default": "13.0", "versions": [ + { "link": "13.2", "version": "13.2.0" }, { "link": "13.1", "version": "13.1.0" }, { "link": "13.0", "version": "13.0.0"} ] From d502c640877f59df4d6dc16cf9538faf2e8188d5 Mon Sep 17 00:00:00 2001 From: Dibir Magomedsaygitov <61747324+dibir-magomedsaygitov@users.noreply.github.com> Date: Fri, 29 Oct 2021 16:55:01 +0300 Subject: [PATCH 0663/3485] [Ubuntu] Rework Selenium installation (#4308) --- .../SoftwareReport/SoftwareReport.Browsers.psm1 | 10 ++++++++++ .../SoftwareReport/SoftwareReport.Generator.ps1 | 3 ++- .../SoftwareReport/SoftwareReport.Tools.psm1 | 2 +- images/linux/scripts/installers/selenium.sh | 15 ++++++++++----- images/linux/scripts/tests/Tools.Tests.ps1 | 6 ++++-- images/linux/toolsets/toolset-1804.json | 4 ++++ images/linux/toolsets/toolset-2004.json | 4 ++++ 7 files changed, 35 insertions(+), 9 deletions(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Browsers.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Browsers.psm1 index 8ba6cb7673b2..8c60f8d731fb 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Browsers.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Browsers.psm1 @@ -23,6 +23,12 @@ function Get-ChromiumVersion { return $chromiumVersion } +function Get-SeleniumVersion { + $seleniumBinaryName = Get-ToolsetValue "selenium.binary_name" + $fullSeleniumVersion = (Get-ChildItem "/usr/share/java/${seleniumBinaryName}-*").Name -replace "${seleniumBinaryName}-" + return "Selenium server $fullSeleniumVersion" +} + function Build-BrowserWebdriversEnvironmentTable { return @( @{ @@ -32,6 +38,10 @@ function Build-BrowserWebdriversEnvironmentTable { @{ "Name" = "GECKOWEBDRIVER" "Value" = $env:GECKOWEBDRIVER + }, + @{ + "Name" = "SELENIUM_JAR_PATH" + "Value" = $env:SELENIUM_JAR_PATH } ) | ForEach-Object { [PSCustomObject] @{ diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index a5178b70d1c8..c11f0031cd9b 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -212,7 +212,8 @@ $browsersAndDriversList = @( (Get-ChromeDriverVersion), (Get-FirefoxVersion), (Get-GeckodriverVersion), - (Get-ChromiumVersion) + (Get-ChromiumVersion), + (Get-SeleniumVersion) ) $markdown += New-MDList -Style Unordered -Lines $browsersAndDriversList diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 index a189d38b4c1f..79b306cb0731 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 @@ -287,4 +287,4 @@ function Get-ZstdVersion { function Get-YqVersion { $yqVersion = ($(yq -V) -Split " ")[-1] return "yq $yqVersion" -} +} \ No newline at end of file diff --git a/images/linux/scripts/installers/selenium.sh b/images/linux/scripts/installers/selenium.sh index f43b7b87cb6c..23e723a4bc7a 100644 --- a/images/linux/scripts/installers/selenium.sh +++ b/images/linux/scripts/installers/selenium.sh @@ -7,14 +7,19 @@ # Source the helpers for use with the script source $HELPER_SCRIPTS/install.sh -# Temporarily download Selenium 3.141.59, since 4.* can contain some breaking changes -SELENIUM_JAR_NAME="selenium-server-standalone.jar" +# Download Selenium server +SELENIUM_MAJOR_VERSION=$(get_toolset_value '.selenium.version') +SELENIUM_BINARY_NAME=$(get_toolset_value '.selenium.binary_name') SELENIUM_JAR_PATH="/usr/share/java" -SELENIUM_DOWNLOAD_URL="https://github.com/SeleniumHQ/selenium/releases/download/selenium-3.141.59/selenium-server-standalone-3.141.59.jar" -#SELENIUM_LATEST_VERSION_URL="$(curl -s https://api.github.com/repos/SeleniumHQ/selenium/releases/latest |\ -# jq -r '.assets[].browser_download_url | select(contains("selenium-server-standalone") and endswith(".jar"))')" +SELENIUM_JAR_NAME="$SELENIUM_BINARY_NAME.jar" +json=$(curl -s "https://api.github.com/repos/SeleniumHQ/selenium/releases?per_page=100") +SELENIUM_DOWNLOAD_URL=$(echo $json | jq -r ".[] | select(.prerelease==false).assets[].browser_download_url | select(contains(\"${SELENIUM_BINARY_NAME}-${SELENIUM_MAJOR_VERSION}\") and endswith(\".jar\"))" | head -1) download_with_retries $SELENIUM_DOWNLOAD_URL $SELENIUM_JAR_PATH $SELENIUM_JAR_NAME +# Create an epmty file to retrive selenium version +SELENIUM_FULL_VERSION=$(echo $SELENIUM_DOWNLOAD_URL | awk -F"${SELENIUM_BINARY_NAME}-|.jar" '{print $2}') +touch "$SELENIUM_JAR_PATH/$SELENIUM_BINARY_NAME-$SELENIUM_FULL_VERSION" + # Add SELENIUM_JAR_PATH environment variable echo "SELENIUM_JAR_PATH=$SELENIUM_JAR_PATH/$SELENIUM_JAR_NAME" | tee -a /etc/environment diff --git a/images/linux/scripts/tests/Tools.Tests.ps1 b/images/linux/scripts/tests/Tools.Tests.ps1 index 7ceb57c62db1..6cfbc01f27b8 100644 --- a/images/linux/scripts/tests/Tools.Tests.ps1 +++ b/images/linux/scripts/tests/Tools.Tests.ps1 @@ -194,8 +194,10 @@ Describe "Sbt" { } Describe "Selenium" { - It "Selenium Server 'selenium-server-standalone.jar' is installed" { - "/usr/share/java/selenium-server-standalone.jar" | Should -Exist + It "Selenium is installed" { + $seleniumBinaryName = (Get-ToolsetContent).selenium.binary_name + $seleniumPath = Join-Path "/usr/share/java" "$seleniumBinaryName.jar" + $seleniumPath | Should -Exist } } diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index f31017bc8160..88692e622d5e 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -278,6 +278,10 @@ "8.0" ] }, + "selenium": { + "version": "3", + "binary_name": "selenium-server-standalone" + }, "rubygems": [], "node_modules": [ { diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index 2cb1ed2dba1f..d07ef49072f3 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -279,6 +279,10 @@ "rubygems": [ {"name": "fastlane"} ], + "selenium": { + "version": "3", + "binary_name": "selenium-server-standalone" + }, "node_modules": [ { "name": "grunt", From 3ab5292583699b39c750d186af0b5a4d35fcd83a Mon Sep 17 00:00:00 2001 From: Dibir Magomedsaygitov <61747324+dibir-magomedsaygitov@users.noreply.github.com> Date: Fri, 29 Oct 2021 17:26:06 +0300 Subject: [PATCH 0664/3485] move selenium version output to the browsers sector (#4377) --- .../SoftwareReport/SoftwareReport.Browsers.psm1 | 10 ++++++++++ .../SoftwareReport/SoftwareReport.Generator.ps1 | 4 ++-- .../scripts/SoftwareReport/SoftwareReport.Tools.psm1 | 6 ------ 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Browsers.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Browsers.psm1 index d60ce845b5b2..11840825b0b3 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Browsers.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Browsers.psm1 @@ -54,6 +54,12 @@ function Get-SeleniumWebDriverVersion { return "$driverName $webDriverVersion" } +function Get-SeleniumVersion { + $seleniumBinaryName = (Get-ToolsetContent).selenium.binary_name + $fullSeleniumVersion = (Get-ChildItem "C:\selenium\${seleniumBinaryName}-*").Name -replace "${seleniumBinaryName}-" + return "Selenium server $fullSeleniumVersion" +} + function Build-BrowserWebdriversEnvironmentTable { return @( @{ @@ -67,6 +73,10 @@ function Build-BrowserWebdriversEnvironmentTable { @{ "Name" = "GECKOWEBDRIVER" "Value" = $env:GECKOWEBDRIVER + }, + @{ + "Name" = "SELENIUM_JAR_PATH" + "Value" = $env:SELENIUM_JAR_PATH } ) | ForEach-Object { [PSCustomObject] @{ diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index 5e13eedf31e4..d6fcbf754a8b 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -119,7 +119,6 @@ $toolsList = @( (Get-StackVersion), (Get-SVNVersion), (Get-VSWhereVersion), - (Get-SeleniumVersion), (Get-SwigVersion), (Get-WinAppDriver), (Get-ZstdVersion), @@ -178,7 +177,8 @@ $markdown += New-MDList -Style Unordered -Lines @( (Get-SeleniumWebDriverVersion -Driver "edge"), (Get-BrowserVersion -Browser "firefox"), (Get-SeleniumWebDriverVersion -Driver "firefox"), - (Get-SeleniumWebDriverVersion -Driver "iexplorer") + (Get-SeleniumWebDriverVersion -Driver "iexplorer"), + (Get-SeleniumVersion) ) $markdown += New-MDHeader "Environment variables" -Level 4 diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 index 5a85cc7ae2aa..185c0b6769b6 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 @@ -274,10 +274,4 @@ function Get-SwigVersion { (swig -version | Out-String) -match "version (?\d+\.\d+\.\d+)" | Out-Null $swigVersion = $Matches.Version return "Swig $swigVersion" -} - -function Get-SeleniumVersion { - $seleniumBinaryName = (Get-ToolsetContent).selenium.binary_name - $fullSeleniumVersion = (Get-ChildItem "C:\selenium\${seleniumBinaryName}-*").Name -replace "${seleniumBinaryName}-" - return "Selenium server $fullSeleniumVersion" } \ No newline at end of file From 82583b9f01370bbfbc00cd1e982e5006adc0aa9a Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Fri, 29 Oct 2021 18:37:20 +0300 Subject: [PATCH 0665/3485] [macOS] Software Updates 2021 Week 44 (#4374) --- images/macos/toolsets/toolset-10.15.json | 2 +- images/macos/toolsets/toolset-11.json | 2 +- images/macos/toolsets/toolset-12.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index 8dab0ae2675c..fdcaff071392 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -20,7 +20,7 @@ "xamarin": { "vsmac": "latest", "mono-versions": [ - "6.12.0.125", "6.10.0.106", "6.8.0.123", "6.6.0.166", "6.4.0.208" + "6.12.0.140", "6.10.0.106", "6.8.0.123", "6.6.0.166", "6.4.0.208" ], "ios-versions": [ "14.14.2.5", "14.10.0.4", "14.8.0.3", "14.6.0.15", "14.4.1.3", "14.2.0.12", "14.0.0.0", "13.20.2.2", "13.18.2.1", "13.16.0.13", "13.14.1.39", "13.10.0.21", "13.8.3.0", "13.6.0.12", "13.4.0.2", "13.2.0.47" diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index 40c8d42d231c..58b58e94faba 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -14,7 +14,7 @@ "xamarin": { "vsmac": "latest", "mono-versions": [ - "6.12.0.125" + "6.12.0.140" ], "ios-versions": [ "15.0.0.6","14.20.0.24", "14.16.0.5", "14.14.2.5", "14.10.0.4", "14.8.0.3", "14.6.0.15", "14.4.1.3", "14.2.0.12", "14.0.0.0", "13.20.2.2" diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index cac60ec29027..1042fb8d1551 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -10,7 +10,7 @@ "xamarin": { "vsmac": "latest", "mono-versions": [ - "6.12.0.125" + "6.12.0.140" ], "ios-versions": [ "15.0.0.6" From 41690119db6f52190ac73501b993d87a1798b21d Mon Sep 17 00:00:00 2001 From: Maksim Shilov <89912354+shilovmaksim@users.noreply.github.com> Date: Fri, 29 Oct 2021 18:38:12 +0300 Subject: [PATCH 0666/3485] [MacOS] Adding PyPy 3.8 to toolsets (#4366) --- images/macos/toolsets/toolset-10.15.json | 3 ++- images/macos/toolsets/toolset-11.json | 3 ++- images/macos/toolsets/toolset-12.json | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index fdcaff071392..2e5f1b909234 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -264,7 +264,8 @@ "versions": [ "2.7", "3.6", - "3.7" + "3.7", + "3.8" ] }, { diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index 58b58e94faba..6acb992d293a 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -210,7 +210,8 @@ "platform" : "darwin", "versions": [ "2.7", - "3.7" + "3.7", + "3.8" ] }, { diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index 1042fb8d1551..eb0d6f8448c3 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -115,7 +115,8 @@ "platform" : "darwin", "versions": [ "2.7", - "3.7" + "3.7", + "3.8" ] }, { From 7901cb5ade884637ab38eb312fb950b1f6845574 Mon Sep 17 00:00:00 2001 From: Maksim Shilov <89912354+shilovmaksim@users.noreply.github.com> Date: Fri, 29 Oct 2021 18:38:49 +0300 Subject: [PATCH 0667/3485] [windows] Adding pypy 3.8 to toolset (#4364) --- images/win/toolsets/toolset-2016.json | 3 ++- images/win/toolsets/toolset-2019.json | 3 ++- images/win/toolsets/toolset-2022.json | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/images/win/toolsets/toolset-2016.json b/images/win/toolsets/toolset-2016.json index e3e54e94114b..d5f6ba8ffa9e 100644 --- a/images/win/toolsets/toolset-2016.json +++ b/images/win/toolsets/toolset-2016.json @@ -50,7 +50,8 @@ "versions": [ "2.7", "3.6", - "3.7" + "3.7", + "3.8" ] }, { diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index 32116547feef..e47f5466934b 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -50,7 +50,8 @@ "versions": [ "2.7", "3.6", - "3.7" + "3.7", + "3.8" ] }, { diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index a86fb6c2dd75..91f80cef9d77 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -29,7 +29,8 @@ "platform" : "win64", "versions": [ "2.7", - "3.7" + "3.7", + "3.8" ] }, { From e66f7c0790e0a9d00753dbac5aca6b624ca76dda Mon Sep 17 00:00:00 2001 From: V-Zabayrachny <79155496+V-Zabayrachny@users.noreply.github.com> Date: Fri, 29 Oct 2021 18:41:09 +0300 Subject: [PATCH 0668/3485] [Ubuntu] fix software report for azure-cli (#4379) --- images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 index 79b306cb0731..e4d65b09094c 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 @@ -196,13 +196,13 @@ function Get-JqVersion { } function Get-AzureCliVersion { - $azcliVersion = az -v | Select-String "azure-cli" | Take-OutputPart -Part -1 + $azcliVersion = (az version | ConvertFrom-Json).'azure-cli' $aptSourceRepo = Get-AptSourceRepository -PackageName "azure-cli" return "Azure CLI (azure-cli) $azcliVersion (installation method: $aptSourceRepo)" } function Get-AzureDevopsVersion { - $azdevopsVersion = az -v | Select-String "azure-devops" | Take-OutputPart -Part -1 + $azdevopsVersion = (az version | ConvertFrom-Json).extensions.'azure-devops' return "Azure CLI (azure-devops) $azdevopsVersion" } From ecbbec3330b950fffeaff1d262e966f3550a4700 Mon Sep 17 00:00:00 2001 From: Dibir Magomedsaygitov <61747324+dibir-magomedsaygitov@users.noreply.github.com> Date: Sat, 30 Oct 2021 03:27:10 +0300 Subject: [PATCH 0669/3485] [macOS] Pin Selenium to 3.141.59 version (#4359) --- images/macos/provision/core/chrome.sh | 4 ++++ images/macos/software-report/SoftwareReport.Browsers.psm1 | 8 +++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/images/macos/provision/core/chrome.sh b/images/macos/provision/core/chrome.sh index cca49e3a2c36..b772ac0078c4 100644 --- a/images/macos/provision/core/chrome.sh +++ b/images/macos/provision/core/chrome.sh @@ -7,8 +7,12 @@ brew_cask_install_ignoring_sha256 "google-chrome" echo "Installing Chrome Driver" brew install --cask chromedriver +# Temporarily download Selenium 3.141.59, since 4.* can contain some breaking changes echo "Installing Selenium" +cd $(brew --repo homebrew/core) +git checkout dc37198 brew_smart_install "selenium-server-standalone" +git checkout master CHROMEWEBDRIVER_DIR=$(readlink $(which chromedriver) | xargs dirname) echo "export CHROMEWEBDRIVER=$CHROMEWEBDRIVER_DIR" >> "${HOME}/.bashrc" diff --git a/images/macos/software-report/SoftwareReport.Browsers.psm1 b/images/macos/software-report/SoftwareReport.Browsers.psm1 index 0d4b6b02842d..7f6fdccc4a0f 100644 --- a/images/macos/software-report/SoftwareReport.Browsers.psm1 +++ b/images/macos/software-report/SoftwareReport.Browsers.psm1 @@ -7,7 +7,8 @@ function Get-BrowserSection { (Get-EdgeVersion), (Get-EdgeDriverVersion), (Get-FirefoxVersion), - (Get-GeckodriverVersion) + (Get-GeckodriverVersion), + (Get-SeleniumVersion) ) } @@ -51,6 +52,11 @@ function Get-GeckodriverVersion { return Run-Command "geckodriver --version" | Select-Object -First 1 } +function Get-SeleniumVersion { + $seleniumVersion = (Get-ChildItem -Path "/usr/local/Cellar/selenium-server*/*").Name + return "Selenium server $seleniumVersion" +} + function Build-BrowserWebdriversEnvironmentTable { return @( @{ From 64b553b5d0d0748ad3e0a478c26e8e97425dfb75 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Sat, 30 Oct 2021 13:05:59 +0300 Subject: [PATCH 0670/3485] [macOS] Install stable Xcode clt for Monterey (#4382) --- images/macos/provision/core/xcode-clt.sh | 4 ---- images/macos/toolsets/toolset-12.json | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/images/macos/provision/core/xcode-clt.sh b/images/macos/provision/core/xcode-clt.sh index bb6cffaac31b..aecba8e83951 100644 --- a/images/macos/provision/core/xcode-clt.sh +++ b/images/macos/provision/core/xcode-clt.sh @@ -12,10 +12,6 @@ install_clt() { clt_placeholder="/tmp/.com.apple.dt.CommandLineTools.installondemand.in-progress" sudo touch $clt_placeholder cltPattern="Command Line Tools" - # Command Line Tools for Xcode 13.0 does not support macOS 12 - if is_Monterey; then - cltPattern="Command Line Tools beta" - fi clt_label_command="/usr/sbin/softwareupdate -l | grep -B 1 -E '${cltPattern}' | diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index eb0d6f8448c3..7548babc1151 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -1,6 +1,6 @@ { "xcode": { - "default": "13.0", + "default": "13.1", "versions": [ { "link": "13.2", "version": "13.2.0" }, { "link": "13.1", "version": "13.1.0" }, From 234919982e06424fcb68ac73f07e4cb2fe17ee60 Mon Sep 17 00:00:00 2001 From: Nikolay Frolov <90333448+nikolai-frolov@users.noreply.github.com> Date: Sat, 30 Oct 2021 14:03:05 +0300 Subject: [PATCH 0671/3485] [Windows] Rework NodeJS install (#4375) --- images/win/scripts/Installers/Install-NodeLts.ps1 | 3 ++- images/win/scripts/Tests/Node.Tests.ps1 | 6 ++++++ images/win/toolsets/toolset-2016.json | 3 +++ images/win/toolsets/toolset-2019.json | 3 +++ images/win/toolsets/toolset-2022.json | 3 +++ 5 files changed, 17 insertions(+), 1 deletion(-) diff --git a/images/win/scripts/Installers/Install-NodeLts.ps1 b/images/win/scripts/Installers/Install-NodeLts.ps1 index 3b91ad201fef..008fafc303bb 100644 --- a/images/win/scripts/Installers/Install-NodeLts.ps1 +++ b/images/win/scripts/Installers/Install-NodeLts.ps1 @@ -10,7 +10,8 @@ $CachePath = 'C:\npm\cache' New-Item -Path $PrefixPath -Force -ItemType Directory New-Item -Path $CachePath -Force -ItemType Directory -Choco-Install -PackageName nodejs-lts -ArgumentList "--force" +$defaultVersion = (Get-ToolsetContent).node.default +Choco-Install -PackageName nodejs -ArgumentList "--version=$defaultVersion" Add-MachinePathItem $PrefixPath $env:Path = Get-MachinePath diff --git a/images/win/scripts/Tests/Node.Tests.ps1 b/images/win/scripts/Tests/Node.Tests.ps1 index 58577276ed7d..720e65b07f57 100644 --- a/images/win/scripts/Tests/Node.Tests.ps1 +++ b/images/win/scripts/Tests/Node.Tests.ps1 @@ -16,4 +16,10 @@ Describe "Node.JS" { $Test | Should -ReturnZeroExitCode } } + + Context "Node.js version" { + It "Node.js version should correspond to the version in the toolset" { + node --version | Should -BeLike "v$((Get-ToolsetContent).node.default)*" + } + } } \ No newline at end of file diff --git a/images/win/toolsets/toolset-2016.json b/images/win/toolsets/toolset-2016.json index d5f6ba8ffa9e..bb347a2bca2c 100644 --- a/images/win/toolsets/toolset-2016.json +++ b/images/win/toolsets/toolset-2016.json @@ -421,5 +421,8 @@ "args": [ "--installargs", "ADD_CMAKE_TO_PATH=\"System\"" ] } ] + }, + "node": { + "default": "14.18.1" } } diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index e47f5466934b..1f34c2f75d31 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -452,5 +452,8 @@ "args": [ "--installargs", "ADD_CMAKE_TO_PATH=\"System\"" ] } ] + }, + "node": { + "default": "14.18.1" } } diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index 91f80cef9d77..2343822c0ea6 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -289,5 +289,8 @@ "args": [ "--installargs", "ADD_CMAKE_TO_PATH=\"System\"" ] } ] + }, + "node": { + "default": "14.18.1" } } From 5f33b32a1e3f80fef13cf8527d1b96b1d269a1fe Mon Sep 17 00:00:00 2001 From: Nikolay Frolov <90333448+nikolai-frolov@users.noreply.github.com> Date: Sat, 30 Oct 2021 14:56:36 +0300 Subject: [PATCH 0672/3485] [Linux] Rework NodeJS install (#4378) --- images/linux/scripts/installers/nodejs.sh | 7 +++++-- images/linux/scripts/tests/Node.Tests.ps1 | 4 ++++ images/linux/toolsets/toolset-1804.json | 3 +++ images/linux/toolsets/toolset-2004.json | 3 +++ 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/images/linux/scripts/installers/nodejs.sh b/images/linux/scripts/installers/nodejs.sh index aa6eaff1cc90..bbf89a67a549 100644 --- a/images/linux/scripts/installers/nodejs.sh +++ b/images/linux/scripts/installers/nodejs.sh @@ -7,9 +7,12 @@ # Source the helpers for use with the script source $HELPER_SCRIPTS/install.sh -# Install LTS Node.js and related build tools +# Install default Node.js +defaultVersion=$(get_toolset_value '.node.default') +# TODO: Usage of "githubusercontent.com/mklement0" doesn't look like a correct approach. Need to correct it according to the official Node.js docs. curl -sL https://raw.githubusercontent.com/mklement0/n-install/stable/bin/n-install | bash -s -- -ny - -~/n/bin/n lts +~/n/bin/n $defaultVersion + # Install node modules node_modules=$(get_toolset_value '.node_modules[].name') diff --git a/images/linux/scripts/tests/Node.Tests.ps1 b/images/linux/scripts/tests/Node.Tests.ps1 index 06790bdf1867..10d8e35d636b 100644 --- a/images/linux/scripts/tests/Node.Tests.ps1 +++ b/images/linux/scripts/tests/Node.Tests.ps1 @@ -10,5 +10,9 @@ Describe "Node.js" { "$NodeCommand --version" | Should -ReturnZeroExitCode } + + It "Node.js version should correspond to the version in the toolset" { + node --version | Should -BeLike "v$((Get-ToolsetContent).node.default).*" + } } diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index 88692e622d5e..f50232270f7f 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -283,6 +283,9 @@ "binary_name": "selenium-server-standalone" }, "rubygems": [], + "node": { + "default": "14" + }, "node_modules": [ { "name": "grunt", diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index d07ef49072f3..fa07c29101ce 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -283,6 +283,9 @@ "version": "3", "binary_name": "selenium-server-standalone" }, + "node": { + "default": "14" + }, "node_modules": [ { "name": "grunt", From 60d2208f8819a8ff4f198b7758ae5e0d2e66986e Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Mon, 1 Nov 2021 14:04:07 +0300 Subject: [PATCH 0673/3485] [Ubuntu] build vcpkg from specific commit (#4386) --- images/linux/scripts/installers/vcpkg.sh | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/images/linux/scripts/installers/vcpkg.sh b/images/linux/scripts/installers/vcpkg.sh index 5d609fecdef0..3041600e5a5e 100644 --- a/images/linux/scripts/installers/vcpkg.sh +++ b/images/linux/scripts/installers/vcpkg.sh @@ -5,15 +5,24 @@ ################################################################################ # Set env variable for vcpkg + +# Checkout the specific commit as master builds are falling. +# Upstream report: https://github.com/microsoft/vcpkg/issues/21107 +GIT_COMMIT_HASH=d78a0b47bdd4deb6bc5547e06e289672892ed226 VCPKG_INSTALLATION_ROOT=/usr/local/share/vcpkg echo "VCPKG_INSTALLATION_ROOT=${VCPKG_INSTALLATION_ROOT}" | tee -a /etc/environment # Install vcpkg -git clone --depth=1 https://github.com/Microsoft/vcpkg $VCPKG_INSTALLATION_ROOT +git clone https://github.com/Microsoft/vcpkg $VCPKG_INSTALLATION_ROOT + +pushd $VCPKG_INSTALLATION_ROOT +git checkout $GIT_COMMIT_HASH +popd $VCPKG_INSTALLATION_ROOT/bootstrap-vcpkg.sh $VCPKG_INSTALLATION_ROOT/vcpkg integrate install chmod 0777 -R $VCPKG_INSTALLATION_ROOT -ln -sf $VCPKG_INSTALLATION_ROOT/vcpkg /usr/local/bin +mkdir -p /usr/local/bin +ln -sf $VCPKG_INSTALLATION_ROOT/vcpkg /usr/local/bin/vcpkg -invoke_tests "Tools" "Vcpkg" \ No newline at end of file +invoke_tests "Tools" "Vcpkg" From 228c4f45e720111e4597d12ab7e8bb453c0ddf57 Mon Sep 17 00:00:00 2001 From: Dibir Magomedsaygitov <61747324+dibir-magomedsaygitov@users.noreply.github.com> Date: Mon, 1 Nov 2021 17:14:51 +0300 Subject: [PATCH 0674/3485] add android-ndk-latest-home env variable on ubuntu18 (#4385) --- images/linux/scripts/installers/android.sh | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/images/linux/scripts/installers/android.sh b/images/linux/scripts/installers/android.sh index aef8f5906211..cb56acde7d85 100644 --- a/images/linux/scripts/installers/android.sh +++ b/images/linux/scripts/installers/android.sh @@ -88,11 +88,9 @@ done # Link issue xamarin-android: https://github.com/xamarin/xamarin-android/issues/5526 ln -s $ANDROID_SDK_ROOT/ndk/$ndkDefaultFullVersion $ANDROID_NDK_ROOT -if isUbuntu20; then - ANDROID_NDK_MAJOR_LATEST=(${ANDROID_NDK_MAJOR_VERSIONS[-1]}) - ndkLatestFullVersion=$(get_full_ndk_version $ANDROID_NDK_MAJOR_LATEST) - echo "ANDROID_NDK_LATEST_HOME=$ANDROID_SDK_ROOT/ndk/$ndkLatestFullVersion" | tee -a /etc/environment -fi +ANDROID_NDK_MAJOR_LATEST=(${ANDROID_NDK_MAJOR_VERSIONS[-1]}) +ndkLatestFullVersion=$(get_full_ndk_version $ANDROID_NDK_MAJOR_LATEST) +echo "ANDROID_NDK_LATEST_HOME=$ANDROID_SDK_ROOT/ndk/$ndkLatestFullVersion" | tee -a /etc/environment availablePlatforms=($($SDKMANAGER --list | sed -n '/Available Packages:/,/^$/p' | grep "platforms;android-[0-9]" | cut -d"|" -f 1)) allBuildTools=($($SDKMANAGER --list | grep "build-tools;" | cut -d"|" -f 1 | sort -u)) From a0ac40903ee820aae7966162b8c22f1fe325142e Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Mon, 1 Nov 2021 17:58:03 +0300 Subject: [PATCH 0675/3485] Schedule macOS-12 builds (#4393) --- .../azure-pipelines/image-generation.yml | 2 +- images.CI/macos/azure-pipelines/macos12.yml | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/images.CI/linux-and-win/azure-pipelines/image-generation.yml b/images.CI/linux-and-win/azure-pipelines/image-generation.yml index 30ce846f5326..9cc38d5efa4b 100644 --- a/images.CI/linux-and-win/azure-pipelines/image-generation.yml +++ b/images.CI/linux-and-win/azure-pipelines/image-generation.yml @@ -22,7 +22,7 @@ jobs: filePath: ./images.CI/download-repo.ps1 arguments: -RepoUrl $(CUSTOM_REPOSITORY_URL) ` -RepoBranch $(CUSTOM_REPOSITORY_BRANCH) - + - task: PowerShell@2 displayName: 'Set image template variables' inputs: diff --git a/images.CI/macos/azure-pipelines/macos12.yml b/images.CI/macos/azure-pipelines/macos12.yml index 090de9af9f1c..4baf7e30ed8e 100644 --- a/images.CI/macos/azure-pipelines/macos12.yml +++ b/images.CI/macos/azure-pipelines/macos12.yml @@ -1,11 +1,11 @@ name: macOS-12_$(date:yyyyMMdd)$(rev:.r)_unstable -# schedules: -# - cron: "0 0 * * *" -# displayName: Daily -# branches: -# include: -# - main -# always: true +schedules: +- cron: "0 0 * * *" + displayName: Daily + branches: + include: + - main + always: true trigger: none pr: From 706a7ae6d398dc8937bef79272d819808afd2145 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Mon, 1 Nov 2021 18:35:29 +0300 Subject: [PATCH 0676/3485] [macOS] install vcpkg from specific commit (#4389) --- images/macos/provision/core/vcpkg.sh | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/images/macos/provision/core/vcpkg.sh b/images/macos/provision/core/vcpkg.sh index d20cb3ca4fef..188ed418c20d 100644 --- a/images/macos/provision/core/vcpkg.sh +++ b/images/macos/provision/core/vcpkg.sh @@ -2,14 +2,24 @@ source ~/utils/utils.sh # Set env variable for vcpkg + +# Checkout the specific commit as master builds are falling. +# Upstream report: https://github.com/microsoft/vcpkg/issues/21107 +GIT_COMMIT_HASH=d78a0b47bdd4deb6bc5547e06e289672892ed226 VCPKG_INSTALLATION_ROOT=/usr/local/share/vcpkg echo "export VCPKG_INSTALLATION_ROOT=${VCPKG_INSTALLATION_ROOT}" | tee -a ~/.bashrc # Install vcpkg -git clone --depth=1 https://github.com/Microsoft/vcpkg $VCPKG_INSTALLATION_ROOT +git clone https://github.com/Microsoft/vcpkg $VCPKG_INSTALLATION_ROOT + +pushd $VCPKG_INSTALLATION_ROOT +git checkout $GIT_COMMIT_HASH +popd + $VCPKG_INSTALLATION_ROOT/bootstrap-vcpkg.sh $VCPKG_INSTALLATION_ROOT/vcpkg integrate install chmod -R 0777 $VCPKG_INSTALLATION_ROOT -ln -sf $VCPKG_INSTALLATION_ROOT/vcpkg /usr/local/bin +mkdir -p /usr/local/bin +ln -sf $VCPKG_INSTALLATION_ROOT/vcpkg /usr/local/bin/vcpkg invoke_tests "Common" "vcpkg" From 3a5b9591bcee84e693812fbf65a2748233e2aae6 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Tue, 2 Nov 2021 01:25:25 +0300 Subject: [PATCH 0677/3485] Docker service does not start on Windows Server (#4397) --- images/win/scripts/Installers/Install-Docker.ps1 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/images/win/scripts/Installers/Install-Docker.ps1 b/images/win/scripts/Installers/Install-Docker.ps1 index cb713ca4d126..232eee46ba3b 100644 --- a/images/win/scripts/Installers/Install-Docker.ps1 +++ b/images/win/scripts/Installers/Install-Docker.ps1 @@ -23,4 +23,10 @@ foreach ($dockerImage in $dockerImages) { } } +# fatal: open C:\ProgramData\docker\panic.log: Access is denied. +$panicLog = "C:\ProgramData\docker\panic.log" +if (Test-Path -Path $panicLog) { + Set-ItemProperty -Path "C:\ProgramData\docker\panic.log" -Name IsReadOnly -Value $false +} + Invoke-PesterTests -TestFile "Docker" \ No newline at end of file From ffc388200c6cfb71a1183bff593ce443621d67af Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Tue, 2 Nov 2021 13:56:54 +0300 Subject: [PATCH 0678/3485] Revert "Docker service does not start on Windows Server (#4397)" (#4403) --- images/win/scripts/Installers/Install-Docker.ps1 | 6 ------ 1 file changed, 6 deletions(-) diff --git a/images/win/scripts/Installers/Install-Docker.ps1 b/images/win/scripts/Installers/Install-Docker.ps1 index 232eee46ba3b..cb713ca4d126 100644 --- a/images/win/scripts/Installers/Install-Docker.ps1 +++ b/images/win/scripts/Installers/Install-Docker.ps1 @@ -23,10 +23,4 @@ foreach ($dockerImage in $dockerImages) { } } -# fatal: open C:\ProgramData\docker\panic.log: Access is denied. -$panicLog = "C:\ProgramData\docker\panic.log" -if (Test-Path -Path $panicLog) { - Set-ItemProperty -Path "C:\ProgramData\docker\panic.log" -Name IsReadOnly -Value $false -} - Invoke-PesterTests -TestFile "Docker" \ No newline at end of file From 3230c424762eb9c6230933cf9a70aae0d8a530ab Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Tue, 2 Nov 2021 17:01:28 +0300 Subject: [PATCH 0679/3485] [Windows] make choco dummy call for currently installed version (#4410) --- images/win/post-generation/Choco.ps1 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/images/win/post-generation/Choco.ps1 b/images/win/post-generation/Choco.ps1 index 3f8e7c8dff8f..0c7566efdecc 100644 --- a/images/win/post-generation/Choco.ps1 +++ b/images/win/post-generation/Choco.ps1 @@ -1,2 +1,5 @@ -# Step to avoid initial delay for choco scripts -choco upgrade chocolatey \ No newline at end of file +# Step to avoid initial delay for choco scripts. +# On calling the first choco command +# Chocolatey spends 2 minutes cleaning up and removing unneeded packages in the environment. +$ChocoVersion = choco --version +choco upgrade chocolatey --version=$ChocoVersion From c1838780e9468eb2ed5bdf21e3f0a7dc402c25a9 Mon Sep 17 00:00:00 2001 From: Maksim Shilov <89912354+shilovmaksim@users.noreply.github.com> Date: Tue, 2 Nov 2021 17:26:03 +0300 Subject: [PATCH 0680/3485] [Ubuntu] Slight rework of the PyPy installation (#4381) --- images/linux/scripts/installers/pypy.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/images/linux/scripts/installers/pypy.sh b/images/linux/scripts/installers/pypy.sh index dc3f0a485ef0..547c72020e9d 100644 --- a/images/linux/scripts/installers/pypy.sh +++ b/images/linux/scripts/installers/pypy.sh @@ -74,14 +74,14 @@ function InstallPyPy } # Installation PyPy -uri="https://downloads.python.org/pypy/" -download_with_retries $uri "/tmp" "pypyUrls.html" compressed -pypyVersions="$(cat /tmp/pypyUrls.html | grep 'linux64' | awk -v uri="$uri" -F'>|<' '{print uri$5}')" +pypyVersions=$(curl https://downloads.python.org/pypy/versions.json) toolsetVersions=$(get_toolset_value '.toolcache[] | select(.name | contains("PyPy")) | .versions[]') for toolsetVersion in $toolsetVersions; do - latestMajorPyPyVersion=$(echo "${pypyVersions}" | grep -E "pypy${toolsetVersion}-v[0-9]+\.[0-9]+\.[0-9]+-" | head -1) - + latestMajorPyPyVersion=$(echo $pypyVersions | + jq -r --arg toolsetVersion $toolsetVersion '.[] + | select((.python_version | startswith($toolsetVersion)) and .stable == true).files[] + | select(.arch == "x64" and .platform == "linux").download_url' | head -1) if [[ -z "$latestMajorPyPyVersion" ]]; then echo "Failed to get PyPy version '$toolsetVersion'" exit 1 From 0aa021402c448c1673fb88d19aed4ee151d53637 Mon Sep 17 00:00:00 2001 From: Maksim Shilov <89912354+shilovmaksim@users.noreply.github.com> Date: Tue, 2 Nov 2021 17:26:25 +0300 Subject: [PATCH 0681/3485] [MacOS] Slight rework of the PyPy installation (#4394) --- images/macos/provision/core/pypy.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/images/macos/provision/core/pypy.sh b/images/macos/provision/core/pypy.sh index 08dd221ae013..eab316845abc 100644 --- a/images/macos/provision/core/pypy.sh +++ b/images/macos/provision/core/pypy.sh @@ -75,13 +75,14 @@ function InstallPyPy rm -f $PACKAGE_TAR_TEMP_PATH } -uri="https://downloads.python.org/pypy/" -pypyVersions=$(curl -4 -s --compressed $uri | grep 'osx64' | awk -v uri="$uri" -F'>|<' '{print uri$5}') +pypyVersions=$(curl https://downloads.python.org/pypy/versions.json) toolsetVersions=$(get_toolset_value '.toolcache[] | select(.name | contains("PyPy")) | .versions[]') -versionPattern="v[0-9]+\.[0-9]+\.[0-9]+-" for toolsetVersion in $toolsetVersions; do - latestMajorPyPyVersion=$(echo "${pypyVersions}" | grep -E "pypy${toolsetVersion}-${versionPattern}" | head -1) + latestMajorPyPyVersion=$(echo $pypyVersions | + jq -r --arg toolsetVersion $toolsetVersion '.[] + | select((.python_version | startswith($toolsetVersion)) and .stable == true).files[] + | select(.platform == "darwin").download_url' | head -1) if [[ -z "$latestMajorPyPyVersion" ]]; then echo "Failed to get PyPy version '$toolsetVersion'" exit 1 From 30a08e95b2e6e2c071784d98bcfc92728a3a1200 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Tue, 2 Nov 2021 17:53:34 +0300 Subject: [PATCH 0682/3485] Pin Docker EE to 20.10.7 version (#4404) --- images/win/scripts/Installers/Install-Docker.ps1 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/images/win/scripts/Installers/Install-Docker.ps1 b/images/win/scripts/Installers/Install-Docker.ps1 index cb713ca4d126..0ba79d382852 100644 --- a/images/win/scripts/Installers/Install-Docker.ps1 +++ b/images/win/scripts/Installers/Install-Docker.ps1 @@ -5,8 +5,10 @@ ## can continue. ################################################################################ +# Docker EE 20.10.8 has the regression +# fatal: open C:\ProgramData\docker\panic.log: Access is denied. Write-Host "Install-Package Docker" -Install-Package -Name docker -ProviderName DockerMsftProvider -Force +Install-Package -Name docker -ProviderName DockerMsftProvider -RequiredVersion 20.10.7 -Force Start-Service docker Write-Host "Install-Package Docker-Compose" From 064daaefd93f638d6ad13bfe5976311e4ff233ba Mon Sep 17 00:00:00 2001 From: Maksim Shilov <89912354+shilovmaksim@users.noreply.github.com> Date: Tue, 2 Nov 2021 19:28:27 +0300 Subject: [PATCH 0683/3485] Removing go versions less than 1.15 - linux (#4408) --- images/linux/toolsets/toolset-1804.json | 2 -- images/linux/toolsets/toolset-2004.json | 1 - 2 files changed, 3 deletions(-) diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index f50232270f7f..a61977a6f7ac 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -43,8 +43,6 @@ "arch": "x64", "platform" : "linux", "versions": [ - "1.13.*", - "1.14.*", "1.15.*", "1.16.*", "1.17.*" diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index fa07c29101ce..11ff9178b2be 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -45,7 +45,6 @@ "arch": "x64", "platform" : "linux", "versions": [ - "1.14.*", "1.15.*", "1.16.*", "1.17.*" From f4296db032b8da3fb616926c1a3b44de38aedbd8 Mon Sep 17 00:00:00 2001 From: V-Zabayrachny <79155496+V-Zabayrachny@users.noreply.github.com> Date: Tue, 2 Nov 2021 19:29:24 +0300 Subject: [PATCH 0684/3485] Fix software report for azure-cli (#4401) --- images/macos/software-report/SoftwareReport.Common.psm1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/macos/software-report/SoftwareReport.Common.psm1 b/images/macos/software-report/SoftwareReport.Common.psm1 index 782b137f62e4..8ed019f9a148 100644 --- a/images/macos/software-report/SoftwareReport.Common.psm1 +++ b/images/macos/software-report/SoftwareReport.Common.psm1 @@ -418,7 +418,7 @@ function Get-AppCenterCLIVersion { } function Get-AzureCLIVersion { - $azureCLIVersion = Run-Command "az -v" | Select-String "^azure-cli" | Take-Part -Part 1 + $azureCLIVersion = (az version | ConvertFrom-Json).'azure-cli' return "Azure CLI $azureCLIVersion" } From cd5e5fc28650b533a2ea39c041361a9468fdbdf2 Mon Sep 17 00:00:00 2001 From: Maksim Shilov <89912354+shilovmaksim@users.noreply.github.com> Date: Tue, 2 Nov 2021 21:32:26 +0300 Subject: [PATCH 0685/3485] Removing go versions less than 1.15 - macos (#4409) --- images/macos/toolsets/toolset-10.14.json | 2 -- images/macos/toolsets/toolset-10.15.json | 2 -- 2 files changed, 4 deletions(-) diff --git a/images/macos/toolsets/toolset-10.14.json b/images/macos/toolsets/toolset-10.14.json index b3ddd3f0a99b..4db0578a9c63 100644 --- a/images/macos/toolsets/toolset-10.14.json +++ b/images/macos/toolsets/toolset-10.14.json @@ -333,8 +333,6 @@ "platform" : "darwin", "variable_template" : "GOROOT_{0}_{1}_X64", "versions": [ - "1.13.*", - "1.14.*", "1.15.*", "1.16.*", "1.17.*" diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index 2e5f1b909234..1cd9f996a2ed 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -287,8 +287,6 @@ "platform" : "darwin", "variable_template" : "GOROOT_{0}_{1}_X64", "versions": [ - "1.13.*", - "1.14.*", "1.15.*", "1.16.*", "1.17.*" From 0363026f158604416f9804f5e78ca7da19f755e9 Mon Sep 17 00:00:00 2001 From: Maksim Shilov <89912354+shilovmaksim@users.noreply.github.com> Date: Tue, 2 Nov 2021 22:10:01 +0300 Subject: [PATCH 0686/3485] Removing go versions less than 1.15 (#4407) --- images/win/toolsets/toolset-2016.json | 2 -- images/win/toolsets/toolset-2019.json | 2 -- 2 files changed, 4 deletions(-) diff --git a/images/win/toolsets/toolset-2016.json b/images/win/toolsets/toolset-2016.json index bb347a2bca2c..020f525de9c1 100644 --- a/images/win/toolsets/toolset-2016.json +++ b/images/win/toolsets/toolset-2016.json @@ -72,8 +72,6 @@ "arch": "x64", "platform" : "win32", "versions": [ - "1.13.*", - "1.14.*", "1.15.*", "1.16.*", "1.17.*" diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index 1f34c2f75d31..bf5a027de668 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -72,8 +72,6 @@ "arch": "x64", "platform" : "win32", "versions": [ - "1.13.*", - "1.14.*", "1.15.*", "1.16.*", "1.17.*" From 5b6883ef7242dfd90cdc31f97d9d8dc9fb5c152d Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Tue, 2 Nov 2021 22:50:27 +0300 Subject: [PATCH 0687/3485] Add 32-bit version of python to win19 & win22 (#4405) --- images/win/toolsets/toolset-2019.json | 3 ++- images/win/toolsets/toolset-2022.json | 12 ++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index bf5a027de668..e640401aec9c 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -40,7 +40,8 @@ "3.6.*", "3.7.*", "3.8.*", - "3.9.*" + "3.9.*", + "3.10.*" ] }, { diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index 2343822c0ea6..c97f9f38ef97 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -23,6 +23,18 @@ ], "default": "3.9.*" }, + { + "name": "Python", + "url" : "https://raw.githubusercontent.com/actions/python-versions/main/versions-manifest.json", + "arch": "x86", + "platform" : "win32", + "versions": [ + "3.7.*", + "3.8.*", + "3.9.*", + "3.10.*" + ] + }, { "name": "PyPy", "arch": "x86", From 0c599134ade7ae6b286b0b037de7be7596066f19 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 3 Nov 2021 08:46:58 +0000 Subject: [PATCH 0688/3485] Updating readme file for ubuntu20 version 20211101.1 (#4395) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/linux/Ubuntu2004-README.md | 128 ++++++++++++++++-------------- 1 file changed, 69 insertions(+), 59 deletions(-) diff --git a/images/linux/Ubuntu2004-README.md b/images/linux/Ubuntu2004-README.md index b2154c24a673..c482909720d6 100644 --- a/images/linux/Ubuntu2004-README.md +++ b/images/linux/Ubuntu2004-README.md @@ -1,17 +1,20 @@ | Announcements | |-| -| [Ubuntu 16.04 environment will be removed on September 20, 2021](https://github.com/actions/virtual-environments/issues/3287) | +| [[all OSs] Selenium server version will be upgraded from 3 to 4 on November, 15](https://github.com/actions/virtual-environments/issues/4376) | +| [[Ubuntu] Node:10 docker images will be removed on November, 15](https://github.com/actions/virtual-environments/issues/4357) | +| [[All OSs] Node.js version 10 will be removed from the images on November, 15](https://github.com/actions/virtual-environments/issues/4356) | +| [[All OSs] Go versions less than 1.15 will be removed on November, 8](https://github.com/actions/virtual-environments/issues/4311) | *** # Ubuntu 20.04.3 LTS -- Linux kernel version: 5.8.0-1042-azure -- Image Version: 20211017.0 +- Linux kernel version: 5.11.0-1020-azure +- Image Version: 20211101.1 ## Installed Software ### Language and Runtime - Bash 5.0.17(1)-release - Clang 10.0.0, 11.0.0, 12.0.0 - Clang-format 10.0.0, 11.0.0, 12.0.0 -- Erlang 24.0.5 (Eshell 12.0.3) +- Erlang 24.1.3 (Eshell 12.1.3) - Erlang rebar3 3.17.0 - GNU C++ 9.3.0, 10.3.0 - GNU Fortran 9.3.0, 10.3.0 @@ -24,19 +27,19 @@ - Python 3.8.10 - Python3 3.8.10 - Ruby 2.7.0p0 -- Swift 5.5 +- Swift 5.5.1 ### Package Management - cpan 1.64 - Helm 3.7.1 -- Homebrew 3.2.16 +- Homebrew 3.3.2 - Miniconda 4.10.3 - Npm 6.14.15 - Pip 20.0.2 - Pip3 20.0.2 - Pipx 0.16.4 - RubyGems 3.1.2 -- Vcpkg (build from master \<699c877>) +- Vcpkg (build from master \) - Yarn 1.22.17 #### Environment variables @@ -55,28 +58,28 @@ ### Tools - Ansible 2.11.6 - apt-fast 1.9.11 -- AzCopy 10.12.2 (available by `azcopy` and `azcopy10` aliases) +- AzCopy 10.13.0 (available by `azcopy` and `azcopy10` aliases) - Bazel 4.2.1 - Bazelisk 1.10.1 - Bicep 0.4.1008 - Buildah 1.21.3 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- CMake 3.21.3 -- CodeQL Action Bundle 2.6.3-a +- CMake 3.21.4 +- CodeQL Action Bundle 2.7.0 - Docker Compose v1 1.29.2 - Docker Compose v2 2.0.0 - Docker-Buildx 0.6.3 -- Docker-Moby Client 20.10.9+azure-1 -- Docker-Moby Server 20.10.9+azure-1 -- Fastlane 2.196.0 +- Docker-Moby Client 20.10.10+azure-1 +- Docker-Moby Server 20.10.10+azure-1 +- Fastlane 2.197.0 - Git 2.33.1 (apt source repository: ppa:git-core/ppa) - Git LFS 2.13.3 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.6.0 - Haveged 1.9.1 -- Heroku 7.59.0 -- HHVM (HipHop VM) 4.131.0 +- Heroku 7.59.1 +- HHVM (HipHop VM) 4.133.0 - jq 1.6 - Kind 0.11.1 -- Kubectl 1.22.2 +- Kubectl 1.22.3 - Kustomize 4.4.0 - Leiningen 2.9.7 - MediaInfo 19.09 @@ -85,31 +88,31 @@ - Newman 5.3.0 - nvm 0.39.0 - OpenSSL 1.1.1f 31 Mar 2020 -- Packer 1.7.6 +- Packer 1.7.7 - PhantomJS 2.1.1 - Podman 3.3.1 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- Pulumi 3.15.0 +- Pulumi 3.16.0 - R 4.1.1 - Skopeo 1.3.0 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 -- Terraform 1.0.9 +- Terraform 1.0.10 - yamllint 1.26.3 -- yq 4.13.4 +- yq 4.14.1 - zstd 1.5.0 (homebrew) ### CLI Tools -- Alibaba Cloud CLI 3.0.94 -- AWS CLI 2.2.46 -- AWS CLI Session manager plugin 1.2.245.0 -- AWS SAM CLI 1.33.0 -- Azure CLI (azure-cli) 2.29.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) -- Azure CLI (azure-devops) 0.20.0 -- GitHub CLI 2.1.0 -- Google Cloud SDK 360.0.0 (apt source repository: https://packages.cloud.google.com/apt) +- Alibaba Cloud CLI 3.0.97 +- AWS CLI 2.3.2 +- AWS CLI Session manager plugin 1.2.279.0 +- AWS SAM CLI 1.34.1 +- Azure CLI (azure-cli) 2.29.2 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) +- Azure CLI (azure-devops) 0.21.0 +- GitHub CLI 2.2.0 +- Google Cloud SDK 362.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 6.13.2 -- OpenShift CLI 4.8.14 +- Netlify CLI 6.14.7 +- OpenShift CLI 4.9.5 - ORAS CLI 0.12.0 - Vercel CLI 23.1.2 @@ -122,49 +125,51 @@ ### GraalVM | Version | Environment variables | | --------- | --------------------- | -| CE 21.2.0 | GRAALVM_11_ROOT | +| CE 21.3.0 | GRAALVM_11_ROOT | ### PHP | Tool | Version | | -------- | ------------- | -| PHP | 7.4.24 8.0.11 | -| Composer | 2.1.9 | +| PHP | 7.4.25 8.0.12 | +| Composer | 2.1.10 | | PHPUnit | 8.5.21 | ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ``` ### Haskell -- Cabal 3.4.1.0 -- GHC 9.0.1 -- GHCup 0.1.17.2 +- Cabal 3.6.2.0 +- GHC 9.2.1 +- GHCup 0.1.17.3 - Stack 2.7.3 ### Rust Tools -- Cargo 1.55.0 -- Rust 1.55.0 -- Rustdoc 1.55.0 +- Cargo 1.56.0 +- Rust 1.56.1 +- Rustdoc 1.56.1 - Rustup 1.24.3 #### Packages - Bindgen 0.59.1 - Cargo audit 0.15.2 -- Cargo clippy 0.1.55 +- Cargo clippy 0.1.56 - Cargo outdated 0.9.17 - Cbindgen 0.20.0 - Rustfmt 1.4.37 ### Browsers and Drivers -- Google Chrome 94.0.4606.81 -- ChromeDriver 94.0.4606.61 +- Google Chrome 95.0.4638.69 +- ChromeDriver 95.0.4638.54 - Mozilla Firefox 93.0 - Geckodriver 0.30.0 -- Chromium 94.0.4606.0 +- Chromium 95.0.4638.0 +- Selenium server 3.141.59 #### Environment variables -| Name | Value | -| --------------- | ------------------------------ | -| CHROMEWEBDRIVER | /usr/local/share/chrome_driver | -| GECKOWEBDRIVER | /usr/local/share/gecko_driver | +| Name | Value | +| ----------------- | ---------------------------------------------- | +| CHROMEWEBDRIVER | /usr/local/share/chrome_driver | +| GECKOWEBDRIVER | /usr/local/share/gecko_driver | +| SELENIUM_JAR_PATH | /usr/share/java/selenium-server-standalone.jar | ### .NET Core SDK - 2.1.302 2.1.403 2.1.526 2.1.617 2.1.701 2.1.818 3.1.120 3.1.202 3.1.302 3.1.414 5.0.104 5.0.208 5.0.303 5.0.402 @@ -175,7 +180,7 @@ - sqlite3 3.31.1 #### MySQL -- MySQL 8.0.26 +- MySQL 8.0.27 - MySQL Server (user:root password:root) ``` @@ -196,11 +201,13 @@ - 10.24.1 - 12.22.7 - 14.18.1 +- 16.13.0 #### PyPy - 2.7.18 [PyPy 7.3.6] - 3.6.12 [PyPy 7.3.3] -- 3.7.12 [PyPy 7.3.6] +- 3.7.12 [PyPy 7.3.7] +- 3.8.12 [PyPy 7.3.7] #### Python - 2.7.18 @@ -249,7 +256,7 @@ | Package Name | Version | | -------------------------- | ---------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 4.0 | -| Android Emulator | 30.8.4 | +| Android Emulator | 30.9.5 | | Android SDK Build-tools | 31.0.0
30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3 | | Android SDK Platform-Tools | 31.0.3 | | Android SDK Platforms | android-31 (rev 1)
android-30 (rev 3)
android-29 (rev 5)
android-28 (rev 6)
android-27 (rev 3) | @@ -258,7 +265,7 @@ | CMake | 3.10.2
3.18.1 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 21.4.7075529 (default)
22.1.7171670
23.0.7599858 | +| NDK | 21.4.7075529 (default)
22.1.7171670
23.1.7779620 | | SDK Patch Applier v4 | 1 | #### Environment variables @@ -266,7 +273,7 @@ | ----------------------- | ------------------------------------------------------------------------------------ | | ANDROID_HOME | /usr/local/lib/android/sdk | | ANDROID_NDK_HOME | /usr/local/lib/android/sdk/ndk-bundle -> /usr/local/lib/android/sdk/ndk/21.4.7075529 | -| ANDROID_NDK_LATEST_HOME | /usr/local/lib/android/sdk/ndk/23.0.7599858 | +| ANDROID_NDK_LATEST_HOME | /usr/local/lib/android/sdk/ndk/23.1.7779620 | | ANDROID_NDK_ROOT | /usr/local/lib/android/sdk/ndk-bundle -> /usr/local/lib/android/sdk/ndk/21.4.7075529 | | ANDROID_SDK_ROOT | /usr/local/lib/android/sdk | @@ -285,10 +292,12 @@ | moby/buildkit:latest | sha256:94bc3a93cfa5197064cfdc86e4289cead7b46a2bc95874f142fbf51c67ad2826 | 2021-10-04 | | node:10 | sha256:59531d2835edd5161c8f9512f9e095b1836f7a1fcb0ab73e005ec46047384911 | 2021-04-10 | | node:10-alpine | sha256:dc98dac24efd4254f75976c40bce46944697a110d06ce7fa47e7268470cf2e28 | 2021-04-14 | -| node:12 | sha256:9b9e79251f73f999dd440a41714a91eea34996ec809953906009592def0d4380 | 2021-10-13 | -| node:12-alpine | sha256:dfbebf17bfb014e1e7068e76325a117bccf8679c68aec6a28514184a209c8bae | 2021-10-13 | -| node:14 | sha256:109b118e0d49dd12ca6f5b84a7a9a9c8a147f75567b3ad50620bdacaf5e6320d | 2021-10-13 | -| node:14-alpine | sha256:a251de4db0e0632446c0ba62adbe1e37ff148a53732e4574d2ed0f5462cc4407 | 2021-10-13 | +| node:12 | sha256:15a9da96daf0609aee1b8971d3487095f0385d990e64f099684b5d9d8d711f4d | 2021-10-22 | +| node:12-alpine | sha256:88656c98cc43bafa6a517dfdb7b4945693c47ff7d0d24da2254a3174d308f93e | 2021-10-22 | +| node:14 | sha256:ab6c8cd32006f8a4c1c795e55ddfbc7f54f5a3fb7318506ecb355cab8f5e7182 | 2021-10-22 | +| node:14-alpine | sha256:dc92f36e7cd917816fa2df041d4e9081453366381a00f40398d99e9392e78664 | 2021-10-22 | +| node:16 | sha256:683b8ea4ebc033a0f9060501fc31c1481d3f7232cc032851abbd8cc8d91fdff7 | 2021-10-27 | +| node:16-alpine | sha256:8f1827381eb7fca5a79ad21cb42e935546bedf67d9f668519a7db69d77d812bf | 2021-10-27 | | ubuntu:16.04 | sha256:0f71fa8d4d2d4292c3c617fda2b36f6dabe5c8b6e34c3dc5b0d17d4e704bd39c | 2021-08-31 | | ubuntu:18.04 | sha256:0fedbd5bd9fb72089c7bbca476949e10593cebed9b1fb9edf5b79dbbacddd7d6 | 2021-10-01 | | ubuntu:20.04 | sha256:626ffe58f6e7566e00254b638eb7e0f3b11d4da9675088f4781a50ae288f3322 | 2021-10-16 | @@ -298,7 +307,7 @@ | ---------------------- | --------------------------------- | | acl | 2.2.53-6 | | aria2 | 1.35.0-1build1 | -| binutils | 2.34-6ubuntu1.1 | +| binutils | 2.34-6ubuntu1.3 | | bison | 2:3.5.1+dfsg-1 | | brotli | 1.0.7-6ubuntu0.1 | | build-essential | 12.8ubuntu1.1 | @@ -306,7 +315,7 @@ | coreutils | 8.30-3ubuntu2 | | curl | 7.68.0-1ubuntu2.7 | | dbus | 1.12.16-2ubuntu2.1 | -| dnsutils | 1:9.16.1-0ubuntu2.8 | +| dnsutils | 1:9.16.1-0ubuntu2.9 | | dpkg | 1.19.7ubuntu3 | | fakeroot | 1.24-1 | | file | 1:5.38-4 | @@ -338,6 +347,7 @@ | locales | 2.31-0ubuntu9.2 | | m4 | 1.4.18-4 | | mediainfo | 19.09-1build1 | +| mercurial | 5.3.1-1ubuntu1 | | net-tools | 1.60+git20180626.aebd88e-1ubuntu1 | | netcat | 1.206-1ubuntu1 | | openssh-client | 1:8.2p1-4ubuntu0.3 | @@ -363,7 +373,7 @@ | texinfo | 6.7.0.dfsg.2-5 | | time | 1.7-25.1build1 | | tk | 8.6.9+1 | -| tzdata | 2021a-2ubuntu0.20.04 | +| tzdata | 2021e-0ubuntu0.20.04 | | unzip | 6.0-25ubuntu1 | | upx | 3.95-2build1 | | wget | 1.20.3-1ubuntu1 | From f65a6fd6e92d674864a53700d7c31d9fcdd07167 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 3 Nov 2021 09:11:06 +0000 Subject: [PATCH 0689/3485] Updating readme file for macOS-10.15 version 20211029.1 (#4388) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/macos/macos-10.15-Readme.md | 103 +++++++++++++++-------------- 1 file changed, 54 insertions(+), 49 deletions(-) diff --git a/images/macos/macos-10.15-Readme.md b/images/macos/macos-10.15-Readme.md index 3c2222ea1a43..12a4e6eeefba 100644 --- a/images/macos/macos-10.15-Readme.md +++ b/images/macos/macos-10.15-Readme.md @@ -1,13 +1,15 @@ | Announcements | |-| -| [[macOS] Xcode 12.5 will be removed from Big Sur on October, 18](https://github.com/actions/virtual-environments/issues/4183) | -| [[macOS] Default Xcode on Big Sur image will be set to Xcode 13.0 on October, 18](https://github.com/actions/virtual-environments/issues/4180) | +| [[all OSs] Selenium server version will be upgraded from 3 to 4 on November, 15](https://github.com/actions/virtual-environments/issues/4376) | +| [[All OSs] Node.js version 10 will be removed from the images on November, 15](https://github.com/actions/virtual-environments/issues/4356) | +| [[macOS Big Sur] Xcode 13 beta will be removed and Xcode 13.1 set as default on November, 15](https://github.com/actions/virtual-environments/issues/4355) | +| [[All OSs] Go versions less than 1.15 will be removed on November, 8](https://github.com/actions/virtual-environments/issues/4311) | | [macOS-latest workflows will use macOS-11](https://github.com/actions/virtual-environments/issues/4060) | *** # macOS 10.15 info -- System Version: macOS 10.15.7 (19H1417) +- System Version: macOS 10.15.7 (19H1419) - Kernel Version: Darwin 19.6.0 -- Image Version: 20211016.1 +- Image Version: 20211029.1 ## Installed Software ### Language and Runtime @@ -24,31 +26,31 @@ - Go 1.15.15 - julia 1.6.3 - Kotlin 1.5.31-release-548 -- MSBuild 16.6.0.15801 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) +- MSBuild 16.9.0.22901 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) - Node.js v14.18.1 - NVM 0.39.0 - NVM - Cached node versions: v10.24.1 v12.22.7 v14.18.1 - Perl 5.34.0 -- PHP 8.0.11 +- PHP 8.0.12 - Python 2.7.18 - Python 3.9.7 - R 4.1.1 - Ruby 2.7.4p191 ### Package Management -- Bundler version 2.2.29 +- Bundler version 2.2.30 - Carthage 0.38.0 - CocoaPods 1.11.2 - Composer 2.1.9 -- Homebrew 3.2.16 +- Homebrew 3.3.1 - Miniconda 4.10.3 - NPM 6.14.15 -- NuGet 5.6.0.6489 +- NuGet 5.9.0.7134 - Pip 20.3.4 (python 2.7) - Pip 21.2.4 (python 3.9) - Pipx 0.16.4 -- RubyGems 3.2.29 -- Vcpkg 2021 (build from master \<699c877>) +- RubyGems 3.2.30 +- Vcpkg 2021 (build from master \) - Yarn 1.22.15 #### Environment variables @@ -58,7 +60,7 @@ | VCPKG_INSTALLATION_ROOT | /usr/local/share/vcpkg | ### Project Management -- Apache Ant(TM) 1.10.11 +- Apache Ant(TM) 1.10.12 - Apache Maven 3.8.3 - Gradle 7.2 - Sbt 1.5.5 @@ -66,18 +68,18 @@ ### Utilities - 7-Zip 17.04 - aria2 1.36.0 -- azcopy 10.12.2 +- azcopy 10.13.0 - bazel 4.2.1 - bazelisk 1.10.1 - bsdtar 3.3.2 - available by 'tar' alias - Curl 7.79.1 -- Git LFS: 3.0.1 +- Git LFS: 3.0.2 - Git: 2.33.1 -- GitHub CLI: 2.1.0 -- GNU parallel 20210922 +- GitHub CLI: 2.2.0 +- GNU parallel 20211022 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.2 -- gpg (GnuPG) 2.3.2 +- gpg (GnuPG) 2.3.3 - helm v3.7.1+g1d11fcb - Hub CLI: 2.14.2 - jq 1.6 @@ -85,65 +87,66 @@ - mongod v5.0.3 - Newman 5.3.0 - OpenSSL 1.1.1l 24 Aug 2021 `(/usr/local/opt/openssl@1.1 -> /usr/local/Cellar/openssl@1.1/1.1.1l_1)` -- Packer 1.7.6 +- Packer 1.7.8 - PostgreSQL 14.0 - psql (PostgreSQL) 14.0 - Sox 14.4.2 - Subversion (SVN) 1.14.1 - Switchaudio-osx 1.1.0 - Vagrant 2.2.18 -- virtualbox 6.1.26r145957 +- virtualbox 6.1.28r147628 - zstd 1.5.0 ### Tools -- Aliyun CLI 3.0.94 -- App Center CLI 2.10.3 -- AWS CLI 2.2.46 -- AWS SAM CLI 1.33.0 -- AWS Session Manager CLI 1.2.245.0 -- Azure CLI 2.29.0 +- Aliyun CLI 3.0.96 +- App Center CLI 2.10.4 +- AWS CLI 2.3.2 +- AWS SAM CLI 1.34.1 +- AWS Session Manager CLI 1.2.279.0 +- Azure CLI 2.29.2 - Bicep CLI 0.4.1008 - Cabal 3.4.1.0 -- Cmake 3.21.3 -- Fastlane 2.196.0 +- Cmake 3.21.4 +- Fastlane 2.197.0 - GHC 9.0.1 -- GHCup 0.1.17.2 +- GHCup 0.1.17.3 +- Jazzy 0.14.1 - Stack 2.7.3 -- SwiftFormat 0.48.16 +- SwiftFormat 0.48.17 - Swig 4.0.2 - Xcode Command Line Tools 12.4.0.0.1.1610135815 ### Linters -- SwiftLint 0.44.0 +- SwiftLint 0.45.0 - yamllint 1.26.3 ### Browsers -- Safari 14.1.2 (15611.3.10.1.7) -- SafariDriver 14.1.2 (15611.3.10.1.7) -- Google Chrome 94.0.4606.81 -- ChromeDriver 94.0.4606.61 -- Microsoft Edge 94.0.992.50 -- MSEdgeDriver 94.0.992.50 +- Safari 15.0 (15612.1.29.41.4) +- SafariDriver 15.0 (15612.1.29.41.4) +- Google Chrome 95.0.4638.69 +- ChromeDriver 95.0.4638.54 +- Microsoft Edge 95.0.1020.38 +- MSEdgeDriver 95.0.1020.38 - Mozilla Firefox 93.0 - geckodriver 0.30.0 #### Environment variables | Name | Value | | --------------- | --------------------------------------------- | -| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/94.0.4606.61 | +| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/95.0.4638.54 | | EDGEWEBDRIVER | /usr/local/share/edge_driver | | GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | ### Java | Version | Vendor | Environment Variable | | ------------------- | --------------- | -------------------- | -| 8.0.302+8 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | -| 11.0.12+7 | Eclipse Temurin | JAVA_HOME_11_X64 | +| 8.0.312+7 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | +| 11.0.13+8 | Eclipse Temurin | JAVA_HOME_11_X64 | | 12.0.2+10.3 | Adopt OpenJDK | JAVA_HOME_12_X64 | | 13.0.2+8.1 | Adopt OpenJDK | JAVA_HOME_13_X64 | | 14.0.2+12 | Adopt OpenJDK | JAVA_HOME_14_X64 | -| 17.0.0+35 | Eclipse Temurin | JAVA_HOME_17_X64 | +| 17.0.1+12 | Eclipse Temurin | JAVA_HOME_17_X64 | ### Cached Tools #### Ruby @@ -163,14 +166,16 @@ - 3.10.0 #### PyPy -- 2.7.18 [PyPy 7.3.5] +- 2.7.18 [PyPy 7.3.6] - 3.6.12 [PyPy 7.3.3] -- 3.7.10 [PyPy 7.3.5] +- 3.7.12 [PyPy 7.3.7] +- 3.8.12 [PyPy 7.3.7] #### Node.js - 10.24.1 - 12.22.7 - 14.18.1 +- 16.13.0 #### Go | Version | Architecture | Environment Variable | @@ -181,9 +186,9 @@ | 1.16.9 | x64 | GOROOT_1_16_X64 | | 1.17.2 | x64 | GOROOT_1_17_X64 | ### Rust Tools -- Cargo 1.55.0 -- Rust 1.55.0 -- Rustdoc 1.55.0 +- Cargo 1.56.0 +- Rust 1.56.0 +- Rustdoc 1.56.0 - Rustup 1.24.3 #### Packages @@ -191,7 +196,7 @@ - Cargo-audit 0.15.2 - Cargo-outdated v0.9.17 - Cbindgen 0.20.0 -- Clippy 0.1.55 +- Clippy 0.1.56 - Rustfmt 1.4.37-stable ### PowerShell Tools @@ -352,7 +357,7 @@ | Package Name | Version | | -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 4.0 | -| Android Emulator | 30.8.4 | +| Android Emulator | 30.9.5 | | Android SDK Build-tools | 31.0.0
30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3
26.0.0 26.0.1 26.0.2 26.0.3
25.0.0 25.0.1 25.0.2 25.0.3
24.0.0 24.0.1 24.0.2 24.0.3 | | Android SDK Platforms | android-31 (rev 1)
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 Platform-Tools | 31.0.3 | @@ -361,7 +366,7 @@ | Google APIs | addon-google_apis-google-21
addon-google_apis-google-22
addon-google_apis-google-23
addon-google_apis-google-24 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 15.2.4203891
18.1.5063045
21.4.7075529 (default)
22.1.7171670
23.0.7599858 | +| NDK | 15.2.4203891
18.1.5063045
21.4.7075529 (default)
22.1.7171670
23.1.7779620 | | SDK Patch Applier v4 | 1 | | Intel HAXM | 7.6.5 | @@ -371,7 +376,7 @@ | ANDROID_HOME | /Users/runner/Library/Android/sdk | | ANDROID_NDK_18R_PATH | /Users/runner/Library/Android/sdk/ndk/18.1.5063045 | | ANDROID_NDK_HOME | /Users/runner/Library/Android/sdk/ndk-bundle -> /Users/runner/Library/Android/sdk/ndk/21.4.7075529 | -| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/23.0.7599858 | +| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/23.1.7779620 | | ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk-bundle -> /Users/runner/Library/Android/sdk/ndk/21.4.7075529 | | ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | From c48fcf4fe81279f0c8a2253549308c9f04b8e9e1 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 3 Nov 2021 10:01:56 +0000 Subject: [PATCH 0690/3485] Updating readme file for macOS-11 version 20211029.3 (#4387) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/macos/macos-11-Readme.md | 111 ++++++++++++++++++-------------- 1 file changed, 64 insertions(+), 47 deletions(-) diff --git a/images/macos/macos-11-Readme.md b/images/macos/macos-11-Readme.md index 1bbf1f5cb800..15c650a9ae24 100644 --- a/images/macos/macos-11-Readme.md +++ b/images/macos/macos-11-Readme.md @@ -1,13 +1,15 @@ | Announcements | |-| -| [[macOS] Xcode 12.5 will be removed from Big Sur on October, 18](https://github.com/actions/virtual-environments/issues/4183) | -| [[macOS] Default Xcode on Big Sur image will be set to Xcode 13.0 on October, 18](https://github.com/actions/virtual-environments/issues/4180) | +| [[all OSs] Selenium server version will be upgraded from 3 to 4 on November, 15](https://github.com/actions/virtual-environments/issues/4376) | +| [[All OSs] Node.js version 10 will be removed from the images on November, 15](https://github.com/actions/virtual-environments/issues/4356) | +| [[macOS Big Sur] Xcode 13 beta will be removed and Xcode 13.1 set as default on November, 15](https://github.com/actions/virtual-environments/issues/4355) | +| [[All OSs] Go versions less than 1.15 will be removed on November, 8](https://github.com/actions/virtual-environments/issues/4311) | | [macOS-latest workflows will use macOS-11](https://github.com/actions/virtual-environments/issues/4060) | *** # macOS 11.6 info -- System Version: macOS 11.6 (20G165) +- System Version: macOS 11.6.1 (20G224) - Kernel Version: Darwin 20.6.0 -- Image Version: 20211018.1 +- Image Version: 20211029.3 ## Installed Software ### Language and Runtime @@ -24,30 +26,30 @@ - Go 1.15.15 - julia 1.6.3 - Kotlin 1.5.31-release-548 -- MSBuild 16.6.0.15801 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) +- MSBuild 16.9.0.22901 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) - Node.js v14.18.1 - NVM 0.39.0 - NVM - Cached node versions: v10.24.1 v12.22.7 v14.18.1 - Perl 5.34.0 -- PHP 8.0.11 +- PHP 8.0.12 - Python 2.7.18 - Python 3.9.7 - Ruby 2.7.4p191 ### Package Management -- Bundler version 2.2.29 +- Bundler version 2.2.30 - Carthage 0.38.0 - CocoaPods 1.11.2 -- Composer 2.1.9 -- Homebrew 3.2.17 +- Composer 2.1.10 +- Homebrew 3.3.1 - Miniconda 4.10.3 - NPM 6.14.15 -- NuGet 5.6.0.6489 +- NuGet 5.9.0.7134 - Pip 20.3.4 (python 2.7) - Pip 21.2.4 (python 3.9) - Pipx 0.16.4 -- RubyGems 3.2.29 -- Vcpkg 2021 (build from master \<078f3e5>) +- RubyGems 3.2.30 +- Vcpkg 2021 (build from master \) - Yarn 1.22.15 #### Environment variables @@ -57,7 +59,7 @@ | VCPKG_INSTALLATION_ROOT | /usr/local/share/vcpkg | ### Project Management -- Apache Ant(TM) 1.10.11 +- Apache Ant(TM) 1.10.12 - Apache Maven 3.8.3 - Gradle 7.2 - Sbt 1.5.5 @@ -65,17 +67,17 @@ ### Utilities - 7-Zip 17.04 - aria2 1.36.0 -- azcopy 10.12.2 +- azcopy 10.13.0 - bazel 4.2.1 - bazelisk 1.10.1 - bsdtar 3.3.2 - available by 'tar' alias - Curl 7.79.1 -- Git LFS: 3.0.1 +- Git LFS: 3.0.2 - Git: 2.33.1 -- GitHub CLI: 2.1.0 +- GitHub CLI: 2.2.0 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.2 -- gpg (GnuPG) 2.3.2 +- gpg (GnuPG) 2.3.3 - helm v3.7.1+g1d11fcb - Hub CLI: 2.14.2 - jq 1.6 @@ -83,7 +85,7 @@ - mongod v5.0.3 - Newman 5.3.0 - OpenSSL 1.1.1l 24 Aug 2021 `(/usr/local/opt/openssl@1.1 -> /usr/local/Cellar/openssl@1.1/1.1.1l_1)` -- Packer 1.7.6 +- Packer 1.7.8 - PostgreSQL 14.0 - psql (PostgreSQL) 14.0 - Sox 14.4.2 @@ -93,18 +95,19 @@ ### Tools -- Aliyun CLI 3.0.94 -- App Center CLI 2.10.3 -- AWS CLI 2.2.46 -- AWS SAM CLI 1.33.0 -- AWS Session Manager CLI 1.2.245.0 -- Azure CLI 2.29.0 +- Aliyun CLI 3.0.96 +- App Center CLI 2.10.4 +- AWS CLI 2.3.2 +- AWS SAM CLI 1.34.1 +- AWS Session Manager CLI 1.2.279.0 +- Azure CLI 2.29.2 - Bicep CLI 0.4.1008 -- Cabal 3.4.1.0 -- Cmake 3.21.3 -- Fastlane 2.196.0 +- Cabal 3.6.2.0 +- Cmake 3.21.4 +- Fastlane 2.197.0 - GHC 9.0.1 -- GHCup 0.1.17.2 +- GHCup 0.1.17.3 +- Jazzy 0.14.1 - Stack 2.7.3 - SwiftFormat 0.48.17 - Swig 4.0.2 @@ -115,28 +118,28 @@ - yamllint 1.26.3 ### Browsers -- Safari 14.1.2 (16611.3.10.1.6) -- SafariDriver 14.1.2 (16611.3.10.1.6) -- Google Chrome 94.0.4606.81 -- ChromeDriver 94.0.4606.61 -- Microsoft Edge 94.0.992.50 -- MSEdgeDriver 94.0.992.50 +- Safari 15.1 (16612.2.9.1.30) +- SafariDriver 15.1 (16612.2.9.1.30) +- Google Chrome 95.0.4638.69 +- ChromeDriver 95.0.4638.54 +- Microsoft Edge 95.0.1020.38 +- MSEdgeDriver 95.0.1020.40 - Mozilla Firefox 93.0 - geckodriver 0.30.0 #### Environment variables | Name | Value | | --------------- | --------------------------------------------- | -| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/94.0.4606.61 | +| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/95.0.4638.54 | | EDGEWEBDRIVER | /usr/local/share/edge_driver | | GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | ### Java | Version | Vendor | Environment Variable | | ------------------- | --------------- | -------------------- | -| 8.0.302+8 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | -| 11.0.12+7 | Eclipse Temurin | JAVA_HOME_11_X64 | -| 17.0.0+35 | Eclipse Temurin | JAVA_HOME_17_X64 | +| 8.0.312+7 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | +| 11.0.13+8 | Eclipse Temurin | JAVA_HOME_11_X64 | +| 17.0.1+12 | Eclipse Temurin | JAVA_HOME_17_X64 | ### Cached Tools #### Ruby @@ -154,12 +157,14 @@ #### PyPy - 2.7.18 [PyPy 7.3.6] -- 3.7.12 [PyPy 7.3.6] +- 3.7.12 [PyPy 7.3.7] +- 3.8.12 [PyPy 7.3.7] #### Node.js - 10.24.1 - 12.22.7 - 14.18.1 +- 16.13.0 #### Go | Version | Architecture | Environment Variable | @@ -168,9 +173,9 @@ | 1.16.9 | x64 | GOROOT_1_16_X64 | | 1.17.2 | x64 | GOROOT_1_17_X64 | ### Rust Tools -- Cargo 1.55.0 -- Rust 1.55.0 -- Rustdoc 1.55.0 +- Cargo 1.56.0 +- Rust 1.56.0 +- Rustdoc 1.56.0 - Rustup 1.24.3 #### Packages @@ -178,7 +183,7 @@ - Cargo-audit 0.15.2 - Cargo-outdated v0.9.17 - Cbindgen 0.20.0 -- Clippy 0.1.55 +- Clippy 0.1.56 - Rustfmt 1.4.37-stable ### PowerShell Tools @@ -223,9 +228,10 @@ ### Xcode | Version | Build | Path | | -------------- | -------- | --------------------------------- | +| 13.2 (beta) | 13C5066c | /Applications/Xcode_13.2.app | | 13.1 | 13A1030d | /Applications/Xcode_13.1.app | -| 13.0 (beta) | 13A5212g | /Applications/Xcode_13.0_beta.app | | 13.0 (default) | 13A233 | /Applications/Xcode_13.0.app | +| 13.0 (beta) | 13A5212g | /Applications/Xcode_13.0_beta.app | | 12.5.1 | 12E507 | /Applications/Xcode_12.5.1.app | | 12.4 | 12D4e | /Applications/Xcode_12.4.app | | 11.7 | 11E801a | /Applications/Xcode_11.7.app | @@ -243,35 +249,43 @@ | macOS 11.1 | macosx11.1 | 12.4 | | macOS 11.3 | macosx11.3 | 12.5.1, 13.0 | | macOS 12.0 | macosx12.0 | 13.0, 13.1 | +| macOS 12.1 | macosx12.1 | 13.2 | | iOS 13.7 | iphoneos13.7 | 11.7 | | iOS 14.4 | iphoneos14.4 | 12.4 | | iOS 14.5 | iphoneos14.5 | 12.5.1 | | iOS 15.0 | iphoneos15.0 | 13.0, 13.0, 13.1 | +| iOS 15.2 | iphoneos15.2 | 13.2 | | Simulator - iOS 13.7 | iphonesimulator13.7 | 11.7 | | Simulator - iOS 14.4 | iphonesimulator14.4 | 12.4 | | Simulator - iOS 14.5 | iphonesimulator14.5 | 12.5.1 | | Simulator - iOS 15.0 | iphonesimulator15.0 | 13.0, 13.0, 13.1 | +| Simulator - iOS 15.2 | iphonesimulator15.2 | 13.2 | | tvOS 13.4 | appletvos13.4 | 11.7 | | tvOS 14.3 | appletvos14.3 | 12.4 | | tvOS 14.5 | appletvos14.5 | 12.5.1 | | tvOS 15.0 | appletvos15.0 | 13.0, 13.0, 13.1 | +| tvOS 15.2 | appletvos15.2 | 13.2 | | Simulator - tvOS 13.4 | appletvsimulator13.4 | 11.7 | | Simulator - tvOS 14.3 | appletvsimulator14.3 | 12.4 | | Simulator - tvOS 14.5 | appletvsimulator14.5 | 12.5.1 | | Simulator - tvOS 15.0 | appletvsimulator15.0 | 13.0, 13.0, 13.1 | +| Simulator - tvOS 15.2 | appletvsimulator15.2 | 13.2 | | watchOS 6.2 | watchos6.2 | 11.7 | | watchOS 7.2 | watchos7.2 | 12.4 | | watchOS 7.4 | watchos7.4 | 12.5.1 | | watchOS 8.0 | watchos8.0 | 13.0, 13.0, 13.1 | +| watchOS 8.3 | watchos8.3 | 13.2 | | Simulator - watchOS 6.2 | watchsimulator6.2 | 11.7 | | Simulator - watchOS 7.2 | watchsimulator7.2 | 12.4 | | Simulator - watchOS 7.4 | watchsimulator7.4 | 12.5.1 | | Simulator - watchOS 8.0 | watchsimulator8.0 | 13.0, 13.0, 13.1 | +| Simulator - watchOS 8.3 | watchsimulator8.3 | 13.2 | | DriverKit 19.0 | driverkit.macosx19.0 | 11.7 | | DriverKit 20.2 | driverkit.macosx20.2 | 12.4 | | DriverKit 20.4 | driverkit.macosx20.4 | 12.5.1, 13.0 | | DriverKit 21.0 | driverkit21.0 | 13.0 | | DriverKit 21.0.1 | driverkit21.0.1 | 13.1 | +| DriverKit 21.2 | driverkit21.2 | 13.2 | #### Installed Simulators | OS | Xcode Version | Simulators | @@ -280,20 +294,23 @@ | iOS 14.4 | 12.4 | iPod touch (7th generation)
iPhone 11
iPhone 11 Pro
iPhone 11 Pro Max
iPhone 12
iPhone 12 mini
iPhone 12 Pro
iPhone 12 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.5 | 12.5.1 | iPod touch (7th generation)
iPhone 11
iPhone 11 Pro
iPhone 11 Pro Max
iPhone 12
iPhone 12 mini
iPhone 12 Pro
iPhone 12 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 (11-inch) (3rd generation)
iPad Pro (12.9-inch) (4th generation)
iPad Pro (12.9-inch) (5th generation)
iPad Pro (9.7-inch) | | iOS 15.0 | 13.0
13.0
13.1 | iPod touch (7th generation)
iPhone 11
iPhone 11 Pro
iPhone 11 Pro Max
iPhone 12
iPhone 12 mini
iPhone 12 Pro
iPhone 12 Pro Max
iPhone 13
iPhone 13 mini
iPhone 13 Pro
iPhone 13 Pro Max
iPhone 8
iPhone 8 Plus
iPhone SE (2nd generation)
iPad (7th generation)
iPad (8th generation)
iPad (9th generation)
iPad Air (3rd generation)
iPad Air (4th generation)
iPad mini (6th generation)
iPad Pro (11-inch) (2nd generation)
iPad Pro (11-inch) (3rd generation)
iPad Pro (12.9-inch) (4th generation)
iPad Pro (12.9-inch) (5th generation)
iPad Pro (9.7-inch) | +| iOS 15.2 | 13.2 | iPod touch (7th generation)
iPhone 11
iPhone 11 Pro
iPhone 11 Pro Max
iPhone 12
iPhone 12 mini
iPhone 12 Pro
iPhone 12 Pro Max
iPhone 13
iPhone 13 mini
iPhone 13 Pro
iPhone 13 Pro Max
iPhone 8
iPhone 8 Plus
iPhone SE (2nd generation)
iPad (7th generation)
iPad (8th generation)
iPad (9th generation)
iPad Air (3rd generation)
iPad Air (4th generation)
iPad mini (6th generation)
iPad Pro (11-inch) (2nd generation)
iPad Pro (11-inch) (3rd generation)
iPad Pro (12.9-inch) (4th generation)
iPad Pro (12.9-inch) (5th generation)
iPad Pro (9.7-inch) | | tvOS 13.4 | 11.7 | Apple TV
Apple TV 4K
Apple TV 4K (at 1080p) | | tvOS 14.3 | 12.4 | Apple TV
Apple TV 4K
Apple TV 4K (at 1080p) | | tvOS 14.5 | 12.5.1 | Apple TV
Apple TV 4K
Apple TV 4K (2nd generation)
Apple TV 4K (at 1080p)
Apple TV 4K (at 1080p) (2nd generation) | | tvOS 15.0 | 13.0
13.0
13.1 | Apple TV
Apple TV 4K
Apple TV 4K (2nd generation)
Apple TV 4K (at 1080p)
Apple TV 4K (at 1080p) (2nd generation) | +| tvOS 15.2 | 13.2 | Apple TV
Apple TV 4K
Apple TV 4K (2nd generation)
Apple TV 4K (at 1080p)
Apple TV 4K (at 1080p) (2nd generation) | | watchOS 6.2 | 11.7 | Apple Watch Series 4 - 40mm
Apple Watch Series 4 - 44mm
Apple Watch Series 5 - 40mm
Apple Watch Series 5 - 44mm | | watchOS 7.2 | 12.4 | 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.4 | 12.5.1 | 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 8.0 | 13.0
13.0
13.1 | 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
Apple Watch Series 7 - 41mm
Apple Watch Series 7 - 45mm | +| watchOS 8.3 | 13.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
Apple Watch Series 7 - 41mm
Apple Watch Series 7 - 45mm | ### Android | Package Name | Version | | -------------------------- | ---------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 4.0 | -| Android Emulator | 30.8.4 | +| Android Emulator | 30.9.5 | | Android SDK Build-tools | 31.0.0
30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3 | | Android SDK Platforms | android-31 (rev 1)
android-30 (rev 3)
android-29 (rev 5)
android-28 (rev 6)
android-27 (rev 3) | | Android SDK Platform-Tools | 31.0.3 | @@ -301,7 +318,7 @@ | CMake | 3.10.2
3.18.1 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 21.4.7075529 (default)
22.1.7171670
23.0.7599858 | +| NDK | 21.4.7075529 (default)
22.1.7171670
23.1.7779620 | | SDK Patch Applier v4 | 1 | #### Environment variables @@ -309,7 +326,7 @@ | ----------------------- | -------------------------------------------------------------------------------------------------- | | ANDROID_HOME | /Users/runner/Library/Android/sdk | | ANDROID_NDK_HOME | /Users/runner/Library/Android/sdk/ndk-bundle -> /Users/runner/Library/Android/sdk/ndk/21.4.7075529 | -| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/23.0.7599858 | +| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/23.1.7779620 | | ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk-bundle -> /Users/runner/Library/Android/sdk/ndk/21.4.7075529 | | ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | From abdba31f29f673afe65eab08cba1ef0c1ecd1bad Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 3 Nov 2021 12:38:19 +0000 Subject: [PATCH 0691/3485] Updating readme file for ubuntu18 version 20211101.1 (#4396) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/linux/Ubuntu1804-README.md | 119 ++++++++++++++++-------------- 1 file changed, 64 insertions(+), 55 deletions(-) diff --git a/images/linux/Ubuntu1804-README.md b/images/linux/Ubuntu1804-README.md index 59f29d13cf23..fe4fccda1682 100644 --- a/images/linux/Ubuntu1804-README.md +++ b/images/linux/Ubuntu1804-README.md @@ -1,17 +1,20 @@ | Announcements | |-| -| [Ubuntu 16.04 environment will be removed on September 20, 2021](https://github.com/actions/virtual-environments/issues/3287) | +| [[all OSs] Selenium server version will be upgraded from 3 to 4 on November, 15](https://github.com/actions/virtual-environments/issues/4376) | +| [[Ubuntu] Node:10 docker images will be removed on November, 15](https://github.com/actions/virtual-environments/issues/4357) | +| [[All OSs] Node.js version 10 will be removed from the images on November, 15](https://github.com/actions/virtual-environments/issues/4356) | +| [[All OSs] Go versions less than 1.15 will be removed on November, 8](https://github.com/actions/virtual-environments/issues/4311) | *** # Ubuntu 18.04.6 LTS -- Linux kernel version: 5.4.0-1061-azure -- Image Version: 20211017.0 +- Linux kernel version: 5.4.0-1062-azure +- Image Version: 20211101.1 ## Installed Software ### Language and Runtime - Bash 4.4.20(1)-release - Clang 9.0.0 - Clang-format 9.0.0 -- Erlang 24.0.5 (Eshell 12.0.3) +- Erlang 24.1.3 (Eshell 12.1.3) - Erlang rebar3 3.17.0 - GNU C++ 7.5.0, 9.4.0, 10.3.0 - GNU Fortran 7.5.0, 9.4.0, 10.3.0 @@ -24,19 +27,19 @@ - Python 2.7.17 - Python3 3.6.9 - Ruby 2.5.1p57 -- Swift 5.5 +- Swift 5.5.1 ### Package Management - cpan 1.64 - Helm 3.7.1 -- Homebrew 3.2.16 +- Homebrew 3.3.2 - Miniconda 4.10.3 - Npm 6.14.15 - Pip 9.0.1 - Pip3 9.0.1 - Pipx 0.16.4 - RubyGems 2.7.6 -- Vcpkg (build from master \<699c877>) +- Vcpkg (build from master \) - Yarn 1.22.17 #### Environment variables @@ -54,27 +57,27 @@ ### Tools - Ansible 2.11.6 - apt-fast 1.9.11 -- AzCopy 10.12.2 (available by `azcopy` and `azcopy10` aliases) +- AzCopy 10.13.0 (available by `azcopy` and `azcopy10` aliases) - Bazel 4.2.1 - Bazelisk 1.10.1 - Bicep 0.4.1008 - Buildah 1.19.6 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- CMake 3.21.3 -- CodeQL Action Bundle 2.6.3-a +- CMake 3.21.4 +- CodeQL Action Bundle 2.7.0 - Docker Compose v1 1.29.2 - Docker Compose v2 2.0.0 - Docker-Buildx 0.6.0 -- Docker-Moby Client 20.10.9+azure-1 -- Docker-Moby Server 20.10.9+azure-1 +- Docker-Moby Client 20.10.10+azure-1 +- Docker-Moby Server 20.10.10+azure-1 - Git 2.33.1 (apt source repository: ppa:git-core/ppa) - Git LFS 2.13.3 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.3.1 - Haveged 1.9.1 -- Heroku 7.59.0 -- HHVM (HipHop VM) 4.131.0 +- Heroku 7.59.1 +- HHVM (HipHop VM) 4.133.0 - jq 1.5 - Kind 0.11.1 -- Kubectl 1.22.2 +- Kubectl 1.22.3 - Kustomize 4.4.0 - Leiningen 2.9.7 - MediaInfo 17.12 @@ -83,31 +86,31 @@ - Newman 5.3.0 - nvm 0.39.0 - OpenSSL 1.1.1 11 Sep 2018 -- Packer 1.7.6 +- Packer 1.7.7 - PhantomJS 2.1.1 - Podman 3.0.1 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- Pulumi 3.15.0 +- Pulumi 3.16.0 - R 4.1.1 - Skopeo 1.2.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 - SVN 1.9.7 -- Terraform 1.0.9 +- Terraform 1.0.10 - yamllint 1.26.3 -- yq 4.13.4 +- yq 4.14.1 - zstd 1.5.0 (homebrew) ### CLI Tools -- Alibaba Cloud CLI 3.0.94 -- AWS CLI 1.20.63 -- AWS CLI Session manager plugin 1.2.245.0 -- AWS SAM CLI 1.33.0 -- Azure CLI (azure-cli) 2.29.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) -- Azure CLI (azure-devops) 0.20.0 -- GitHub CLI 2.1.0 -- Google Cloud SDK 360.0.0 (apt source repository: https://packages.cloud.google.com/apt) +- Alibaba Cloud CLI 3.0.97 +- AWS CLI 1.21.7 +- AWS CLI Session manager plugin 1.2.279.0 +- AWS SAM CLI 1.34.1 +- Azure CLI (azure-cli) 2.29.2 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) +- Azure CLI (azure-devops) 0.21.0 +- GitHub CLI 2.2.0 +- Google Cloud SDK 362.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 6.13.2 -- OpenShift CLI 4.8.14 +- Netlify CLI 6.14.7 +- OpenShift CLI 4.9.5 - ORAS CLI 0.12.0 - Vercel CLI 23.1.2 @@ -121,44 +124,46 @@ ### PHP | Tool | Version | | -------- | ---------------------------------- | -| PHP | 7.1.33 7.2.34 7.3.31 7.4.24 8.0.11 | -| Composer | 2.1.9 | +| PHP | 7.1.33 7.2.34 7.3.31 7.4.25 8.0.12 | +| Composer | 2.1.10 | | PHPUnit | 8.5.21 | ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ``` ### Haskell -- Cabal 3.4.1.0 -- GHC 9.0.1 -- GHCup 0.1.17.2 +- Cabal 3.6.2.0 +- GHC 9.2.1 +- GHCup 0.1.17.3 - Stack 2.7.3 ### Rust Tools -- Cargo 1.55.0 -- Rust 1.55.0 -- Rustdoc 1.55.0 +- Cargo 1.56.0 +- Rust 1.56.1 +- Rustdoc 1.56.1 - Rustup 1.24.3 #### Packages - Bindgen 0.59.1 - Cargo audit 0.15.2 -- Cargo clippy 0.1.55 +- Cargo clippy 0.1.56 - Cargo outdated 0.9.17 - Cbindgen 0.20.0 - Rustfmt 1.4.37 ### Browsers and Drivers -- Google Chrome 94.0.4606.81 -- ChromeDriver 94.0.4606.61 +- Google Chrome 95.0.4638.69 +- ChromeDriver 95.0.4638.54 - Mozilla Firefox 93.0 - Geckodriver 0.30.0 -- Chromium 94.0.4606.0 +- Chromium 95.0.4638.0 +- Selenium server 3.141.59 #### Environment variables -| Name | Value | -| --------------- | ------------------------------ | -| CHROMEWEBDRIVER | /usr/local/share/chrome_driver | -| GECKOWEBDRIVER | /usr/local/share/gecko_driver | +| Name | Value | +| ----------------- | ---------------------------------------------- | +| CHROMEWEBDRIVER | /usr/local/share/chrome_driver | +| GECKOWEBDRIVER | /usr/local/share/gecko_driver | +| SELENIUM_JAR_PATH | /usr/share/java/selenium-server-standalone.jar | ### .NET Core SDK - 2.1.302 2.1.403 2.1.526 2.1.617 2.1.701 2.1.818 3.1.120 3.1.202 3.1.302 3.1.414 5.0.104 5.0.208 5.0.303 5.0.402 @@ -169,7 +174,7 @@ - sqlite3 3.22.0 #### MySQL -- MySQL 5.7.35 +- MySQL 5.7.36 - MySQL Server (user:root password:root) ``` @@ -191,6 +196,7 @@ - 10.24.1 - 12.22.7 - 14.18.1 +- 16.13.0 #### PyPy - 2.7.18 [PyPy 7.3.6] @@ -243,7 +249,7 @@ | Package Name | Version | | -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 4.0 | -| Android Emulator | 30.8.4 | +| Android Emulator | 30.9.5 | | Android SDK Build-tools | 31.0.0
30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3
26.0.0 26.0.1 26.0.2 26.0.3
25.0.0 25.0.1 25.0.2 25.0.3
24.0.0 24.0.1 24.0.2 24.0.3
23.0.1 23.0.2 23.0.3 | | Android SDK Platform-Tools | 31.0.3 | | Android SDK Platforms | android-31 (rev 1)
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) | @@ -253,7 +259,7 @@ | Google APIs | addon-google_apis-google-21
addon-google_apis-google-22
addon-google_apis-google-23
addon-google_apis-google-24 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 21.4.7075529 (default)
23.0.7599858 | +| NDK | 21.4.7075529 (default)
23.1.7779620 | | SDK Patch Applier v4 | 1 | #### Environment variables @@ -279,10 +285,12 @@ | moby/buildkit:latest | sha256:94bc3a93cfa5197064cfdc86e4289cead7b46a2bc95874f142fbf51c67ad2826 | 2021-10-04 | | node:10 | sha256:59531d2835edd5161c8f9512f9e095b1836f7a1fcb0ab73e005ec46047384911 | 2021-04-10 | | node:10-alpine | sha256:dc98dac24efd4254f75976c40bce46944697a110d06ce7fa47e7268470cf2e28 | 2021-04-14 | -| node:12 | sha256:9b9e79251f73f999dd440a41714a91eea34996ec809953906009592def0d4380 | 2021-10-13 | -| node:12-alpine | sha256:dfbebf17bfb014e1e7068e76325a117bccf8679c68aec6a28514184a209c8bae | 2021-10-13 | -| node:14 | sha256:109b118e0d49dd12ca6f5b84a7a9a9c8a147f75567b3ad50620bdacaf5e6320d | 2021-10-13 | -| node:14-alpine | sha256:a251de4db0e0632446c0ba62adbe1e37ff148a53732e4574d2ed0f5462cc4407 | 2021-10-13 | +| node:12 | sha256:15a9da96daf0609aee1b8971d3487095f0385d990e64f099684b5d9d8d711f4d | 2021-10-22 | +| node:12-alpine | sha256:88656c98cc43bafa6a517dfdb7b4945693c47ff7d0d24da2254a3174d308f93e | 2021-10-22 | +| node:14 | sha256:ab6c8cd32006f8a4c1c795e55ddfbc7f54f5a3fb7318506ecb355cab8f5e7182 | 2021-10-22 | +| node:14-alpine | sha256:dc92f36e7cd917816fa2df041d4e9081453366381a00f40398d99e9392e78664 | 2021-10-22 | +| node:16 | sha256:683b8ea4ebc033a0f9060501fc31c1481d3f7232cc032851abbd8cc8d91fdff7 | 2021-10-27 | +| node:16-alpine | sha256:8f1827381eb7fca5a79ad21cb42e935546bedf67d9f668519a7db69d77d812bf | 2021-10-27 | | ubuntu:16.04 | sha256:0f71fa8d4d2d4292c3c617fda2b36f6dabe5c8b6e34c3dc5b0d17d4e704bd39c | 2021-08-31 | | ubuntu:18.04 | sha256:0fedbd5bd9fb72089c7bbca476949e10593cebed9b1fb9edf5b79dbbacddd7d6 | 2021-10-01 | | ubuntu:20.04 | sha256:626ffe58f6e7566e00254b638eb7e0f3b11d4da9675088f4781a50ae288f3322 | 2021-10-16 | @@ -291,7 +299,7 @@ | Name | Version | | ----------------- | --------------------------------- | | aria2 | 1.33.1-1 | -| binutils | 2.30-21ubuntu1\~18.04.5 | +| binutils | 2.30-21ubuntu1\~18.04.7 | | bison | 2:3.0.4.dfsg-1build1 | | brotli | 1.0.3-1ubuntu1.3 | | build-essential | 12.4ubuntu1 | @@ -299,7 +307,7 @@ | coreutils | 8.28-1ubuntu1 | | curl | 7.58.0-2ubuntu3.16 | | dbus | 1.12.2-1ubuntu1.2 | -| dnsutils | 1:9.11.3+dfsg-1ubuntu1.15 | +| dnsutils | 1:9.11.3+dfsg-1ubuntu1.16 | | dpkg | 1.19.0.5ubuntu2.3 | | fakeroot | 1.22-2ubuntu1 | | file | 1:5.32-2ubuntu0.4 | @@ -330,6 +338,7 @@ | locales | 2.27-3ubuntu1.4 | | m4 | 1.4.18-1 | | mediainfo | 17.12-1 | +| mercurial | 4.5.3-1ubuntu2.2 | | net-tools | 1.60+git20161116.90da8a0-1ubuntu1 | | netcat | 1.10-41.1 | | openssh-client | 1:7.6p1-4ubuntu0.5 | @@ -355,7 +364,7 @@ | texinfo | 6.5.0.dfsg.1-2 | | time | 1.7-25.1build1 | | tk | 8.6.0+9 | -| tzdata | 2021a-2ubuntu0.18.04 | +| tzdata | 2021e-0ubuntu0.18.04 | | unzip | 6.0-21ubuntu1.1 | | upx | 3.94-4 | | wget | 1.19.4-1ubuntu2.2 | From 05c460a0b65d60f1c51bdb3447b5a934ac338919 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Wed, 3 Nov 2021 16:14:29 +0300 Subject: [PATCH 0692/3485] Set Microsoft Defender Antivirus to passive mode (#4415) --- images/win/scripts/Installers/Configure-Antivirus.ps1 | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/images/win/scripts/Installers/Configure-Antivirus.ps1 b/images/win/scripts/Installers/Configure-Antivirus.ps1 index 9a87ca52619a..7cbf43b39e1a 100644 --- a/images/win/scripts/Installers/Configure-Antivirus.ps1 +++ b/images/win/scripts/Installers/Configure-Antivirus.ps1 @@ -2,4 +2,12 @@ Write-Host "Set antivirus parameters" Set-MpPreference -ScanAvgCPULoadFactor 5 -ExclusionPath "D:\", "C:\" Write-Host "Disable Antivirus" -Set-MpPreference -DisableRealtimeMonitoring $true \ No newline at end of file +Set-MpPreference -DisableRealtimeMonitoring $true + +# https://github.com/actions/virtual-environments/issues/4277 +# https://docs.microsoft.com/en-us/microsoft-365/security/defender-endpoint/microsoft-defender-antivirus-compatibility?view=o365-worldwide +$atpRegPath = 'HKLM:\SOFTWARE\Policies\Microsoft\Windows Advanced Threat Protection' +if (Test-Path $atpRegPath) { + Write-Host "Set Microsoft Defender Antivirus to passive mode" + Set-ItemProperty -Path $atpRegPath -Name 'ForceDefenderPassiveMode' -Value '1' -Type 'DWORD' +} From 1678e31616b0153040fd82249570929344a96959 Mon Sep 17 00:00:00 2001 From: Dibir Magomedsaygitov <61747324+dibir-magomedsaygitov@users.noreply.github.com> Date: Wed, 3 Nov 2021 19:53:53 +0300 Subject: [PATCH 0693/3485] software updates week 55 (#4417) --- images/macos/toolsets/toolset-11.json | 13 ++++++++++--- images/macos/toolsets/toolset-12.json | 13 ++++++++++--- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index 6acb992d293a..2ce6bcbee24c 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -17,16 +17,23 @@ "6.12.0.140" ], "ios-versions": [ - "15.0.0.6","14.20.0.24", "14.16.0.5", "14.14.2.5", "14.10.0.4", "14.8.0.3", "14.6.0.15", "14.4.1.3", "14.2.0.12", "14.0.0.0", "13.20.2.2" + "15.2.0.1", "15.0.0.6", "14.20.0.24", "14.16.0.5", "14.14.2.5", "14.10.0.4", "14.8.0.3", "14.6.0.15", "14.4.1.3", "14.2.0.12", "14.0.0.0", "13.20.2.2" ], "mac-versions": [ - "7.14.0.27", "7.10.0.5", "7.8.2.5", "7.4.0.10", "7.2.0.3", "7.0.0.15", "6.22.1.26", "6.20.2.2" + "8.2.0.1", "7.14.0.27", "7.10.0.5", "7.8.2.5", "7.4.0.10", "7.2.0.3", "7.0.0.15", "6.22.1.26", "6.20.2.2" ], "android-versions": [ - "11.3.0.4", "11.2.2.1", "11.1.0.26", "11.0.2.0" + "12.0.0.3", "11.3.0.4", "11.2.2.1", "11.1.0.26", "11.0.2.0" ], "bundle-default": "6_12_10", "bundles": [ + { + "symlink": "6_12_11", + "mono":"6.12", + "ios": "15.2", + "mac": "8.2", + "android": "12.0" + }, { "symlink": "6_12_10", "mono":"6.12", diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index 7548babc1151..8bd192728032 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -13,16 +13,23 @@ "6.12.0.140" ], "ios-versions": [ - "15.0.0.6" + "15.2.0.1", "15.0.0.6" ], "mac-versions": [ - "7.14.0.27" + "8.2.0.1", "7.14.0.27" ], "android-versions": [ - "11.3.0.4" + "12.0.0.3", "11.3.0.4" ], "bundle-default": "6_12_10", "bundles": [ + { + "symlink": "6_12_11", + "mono":"6.12", + "ios": "15.2", + "mac": "8.2", + "android": "12.0" + }, { "symlink": "6_12_10", "mono":"6.12", From 748a4b8ede3cf5268af55d3ace5ca9176ef3fe84 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 3 Nov 2021 20:23:12 +0000 Subject: [PATCH 0694/3485] Updating readme file for win22 version 20211102.4 (#4414) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/win/Windows2022-Readme.md | 115 ++++++++++++++++++------------- 1 file changed, 67 insertions(+), 48 deletions(-) diff --git a/images/win/Windows2022-Readme.md b/images/win/Windows2022-Readme.md index 563734b42922..11d1d2d12d2b 100644 --- a/images/win/Windows2022-Readme.md +++ b/images/win/Windows2022-Readme.md @@ -1,10 +1,14 @@ | Announcements | |-| +| [[all OSs] Selenium server version will be upgraded from 3 to 4 on November, 15](https://github.com/actions/virtual-environments/issues/4376) | +| [[All OSs] Node.js version 10 will be removed from the images on November, 15](https://github.com/actions/virtual-environments/issues/4356) | +| [Windows-2016 environment will be removed on March 15, 2022](https://github.com/actions/virtual-environments/issues/4312) | +| [[All OSs] Go versions less than 1.15 will be removed on November, 8](https://github.com/actions/virtual-environments/issues/4311) | | [(Public Beta) Windows Server 2022 with Visual Studio 2022 is now available](https://github.com/actions/virtual-environments/issues/3949) | *** # Microsoft Windows Server 2022 Datacenter - OS Version: 10.0.20348 Build 288 -- Image Version: 20211018.0 +- Image Version: 20211102.4 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -22,15 +26,15 @@ - Ruby 3.0.2p107 ### Package Management -- Chocolatey 0.11.2 -- Composer 2.1.9 +- Chocolatey 0.11.3 +- Composer 2.1.11 - Helm 3.7.0 - NPM 6.14.15 - NuGet 5.11.0.10 -- pip 21.3 (python 3.9) +- pip 21.3.1 (python 3.9) - Pipx 0.16.4 - RubyGems 3.2.22 -- Vcpkg (build from master \<699c877>) +- Vcpkg (build from master \<35443ee>) - Yarn 1.22.17 #### Environment variables @@ -39,20 +43,20 @@ | VCPKG_INSTALLATION_ROOT | C:\vcpkg | ### Project Management -- Ant 1.10.11 +- Ant 1.10.12 - Gradle 7.2 - Maven 3.8.3 ### Tools - 7zip 19.00 - aria2 1.36.0 -- azcopy 10.12.2 +- azcopy 10.13.0 - Bazel 4.2.1 - Bazelisk 1.10.1 - Bicep 0.4.1008 - Cabal 3.6.2.0 -- CMake 3.21.3 -- CodeQL Action Bundle 2.6.3-a +- CMake 3.21.4 +- CodeQL Action Bundle 2.7.0 - Docker 20.10.7 - Docker-compose 1.29.2 - ghc 9.0.1 @@ -60,13 +64,14 @@ - Git LFS 3.0.1 - jq 1.6 - Kind 0.11.1 -- Kubectl 1.22.2 +- Kubectl 1.22.3 - Mercurial 5.0 - Mingw-w64 8.1.0 - Newman 5.3.0 +- NSIS v3.06.1 - OpenSSL 1.1.1 - Packer 1.7.6 -- Pulumi v3.15.0 +- Pulumi v3.16.0 - R 4.1.1 - Stack 2.7.3 - Subversion (SVN) 1.14.1 @@ -77,19 +82,19 @@ - zstd 1.5.0 ### CLI Tools -- Alibaba Cloud CLI 3.0.94 -- AWS CLI 2.2.46 -- AWS SAM CLI 1.33.0 -- AWS Session Manager CLI 1.2.245.0 -- Azure CLI 2.29.0 -- Azure DevOps CLI extension 0.20.0 -- GitHub CLI 2.1.0 +- Alibaba Cloud CLI 3.0.97 +- AWS CLI 2.3.0 +- AWS SAM CLI 1.34.1 +- AWS Session Manager CLI 1.2.279.0 +- Azure CLI 2.30.0 +- Azure DevOps CLI extension 0.21.0 +- GitHub CLI 2.2.0 - Hub CLI 2.14.2 ### Rust Tools -- Cargo 1.55.0 -- Rust 1.55.0 -- Rustdoc 1.55.0 +- Cargo 1.56.0 +- Rust 1.56.1 +- Rustdoc 1.56.1 - Rustup 1.24.3 #### Packages @@ -97,31 +102,33 @@ - cargo-audit 0.15.2 - cargo-outdated v0.9.17 - cbindgen 0.20.0 -- Clippy 0.1.55 +- Clippy 0.1.56 - Rustfmt 1.4.37 ### Browsers and webdrivers -- Google Chrome 94.0.4606.81 -- Chrome Driver 94.0.4606.61 -- Microsoft Edge 94.0.992.50 -- Microsoft Edge Driver 94.0.992.50 -- Mozilla Firefox 93.0 +- Google Chrome 95.0.4638.69 +- Chrome Driver 95.0.4638.54 +- Microsoft Edge 95.0.1020.40 +- Microsoft Edge Driver 95.0.1020.40 +- Mozilla Firefox 94.0 - Gecko Driver 0.30.0 - IE Driver 3.150.1.1 +- Selenium server 3.141.59 #### Environment variables -| Name | Value | -| --------------- | ---------------------------------- | -| CHROMEWEBDRIVER | C:\SeleniumWebDrivers\ChromeDriver | -| EDGEWEBDRIVER | C:\SeleniumWebDrivers\EdgeDriver | -| GECKOWEBDRIVER | C:\SeleniumWebDrivers\GeckoDriver | +| Name | Value | +| ----------------- | ------------------------------------------ | +| CHROMEWEBDRIVER | C:\SeleniumWebDrivers\ChromeDriver | +| EDGEWEBDRIVER | C:\SeleniumWebDrivers\EdgeDriver | +| GECKOWEBDRIVER | C:\SeleniumWebDrivers\GeckoDriver | +| SELENIUM_JAR_PATH | C:\selenium\selenium-server-standalone.jar | ### Java | Version | Vendor | Environment Variable | | ------------------- | --------------- | -------------------- | -| 8.0.302+8 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | -| 11.0.12+7 | Eclipse Temurin | JAVA_HOME_11_X64 | -| 17.0.0+35 | Eclipse Temurin | JAVA_HOME_17_X64 | +| 8.0.312+7 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | +| 11.0.13+8 | Eclipse Temurin | JAVA_HOME_11_X64 | +| 17.0.1+12 | Eclipse Temurin | JAVA_HOME_17_X64 | ### Shells | Name | Target | @@ -153,6 +160,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | 10.24.1 | x64 | | 12.22.7 | x64 | | 14.18.1 | x64 | +| 16.13.0 | x64 | #### Python @@ -175,7 +183,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Python Version | PyPy Version | | -------------- | ------------ | | 2.7.18 | PyPy 7.3.6 with MSC v.1929 64 bit (AMD64) | -| 3.7.12 | PyPy 7.3.6 with MSC v.1929 64 bit (AMD64) | +| 3.7.12 | PyPy 7.3.7 with MSC v.1929 64 bit (AMD64) | +| 3.8.12 | PyPy 7.3.7 with MSC v.1929 64 bit (AMD64) | @@ -201,7 +210,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Database tools -- Azure CosmosDb Emulator 2.14.3.0 +- Azure CosmosDb Emulator 2.14.4.0 - DacFx 15.0.5282.3 - MySQL 8.0.26.0 - SQLPS 1.0 @@ -216,7 +225,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Visual Studio Enterprise 2022 | Name | Version | Path | | ----------------------------- | -------------- | ----------------------------------------------------- | -| Visual Studio Enterprise 2022 | 17.0.31808.319 | C:\Program Files\Microsoft Visual Studio\2022\Preview | +| Visual Studio Enterprise 2022 | 17.0.31825.309 | C:\Program Files\Microsoft Visual Studio\2022\Preview | #### Workloads, components and extensions: @@ -245,6 +254,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.Component.MSBuild | 17.0.31804.368 | | Microsoft.Component.NetFX.Native | 17.0.31804.368 | | Microsoft.Component.PythonTools | 17.0.31804.368 | +| Microsoft.Component.PythonTools.Web | 17.0.31804.368 | | Microsoft.Component.VC.Runtime.UCRTSDK | 17.0.31804.368 | | Microsoft.ComponentGroup.Blend | 17.0.31804.368 | | Microsoft.ComponentGroup.ClickOnce.Publish | 17.0.31804.368 | @@ -284,14 +294,15 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Component.DotNetModelBuilder | 17.0.31804.368 | | Microsoft.VisualStudio.Component.EntityFramework | 17.0.31804.368 | | Microsoft.VisualStudio.Component.FSharp | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.FSharp.Desktop | 17.0.31804.368 | | Microsoft.VisualStudio.Component.FSharp.WebTemplates | 17.0.31804.368 | | Microsoft.VisualStudio.Component.GraphDocument | 17.0.31804.368 | | Microsoft.VisualStudio.Component.Graphics | 17.0.31804.368 | | Microsoft.VisualStudio.Component.Graphics.Tools | 17.0.31804.368 | | Microsoft.VisualStudio.Component.IISExpress | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.IntelliCode | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.IntelliCode | 17.0.31821.396 | | Microsoft.VisualStudio.Component.IntelliTrace.FrontEnd | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.JavaScript.Diagnostics | 17.0.31805.14 | +| Microsoft.VisualStudio.Component.JavaScript.Diagnostics | 17.0.31815.197 | | Microsoft.VisualStudio.Component.JavaScript.TypeScript | 17.0.31804.368 | | Microsoft.VisualStudio.Component.LinqToSql | 17.0.31804.368 | | Microsoft.VisualStudio.Component.LiveUnitTesting | 17.0.31804.368 | @@ -314,10 +325,16 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Component.SQL.SSDT | 17.0.31804.368 | | Microsoft.VisualStudio.Component.TeamOffice | 17.0.31804.368 | | Microsoft.VisualStudio.Component.TestTools.CodedUITest | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.TestTools.WebLoadTest | 17.0.31805.14 | +| Microsoft.VisualStudio.Component.TestTools.WebLoadTest | 17.0.31815.197 | | Microsoft.VisualStudio.Component.TextTemplating | 17.0.31804.368 | | Microsoft.VisualStudio.Component.TypeScript.TSServer | 17.0.31804.368 | | Microsoft.VisualStudio.Component.Unity | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM.Spectre | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM64 | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM64.Spectre | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64 | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64.Spectre | 17.0.31804.368 | | Microsoft.VisualStudio.Component.VC.ASAN | 17.0.31804.368 | | Microsoft.VisualStudio.Component.VC.ATL | 17.0.31804.368 | | Microsoft.VisualStudio.Component.VC.ATL.ARM | 17.0.31804.368 | @@ -335,6 +352,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Component.VC.MFC.ARM64 | 17.0.31804.368 | | Microsoft.VisualStudio.Component.VC.MFC.ARM64EC | 17.0.31804.368 | | Microsoft.VisualStudio.Component.VC.Redist.14.Latest | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.VC.Runtimes.ARM64.Spectre | 17.0.31804.368 | | Microsoft.VisualStudio.Component.VC.Runtimes.x86.x64.Spectre | 17.0.31804.368 | | Microsoft.VisualStudio.Component.VC.TestAdapterForBoostTest | 17.0.31804.368 | | Microsoft.VisualStudio.Component.VC.TestAdapterForGoogleTest | 17.0.31804.368 | @@ -355,7 +373,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Component.Windows10SDK | 17.0.31804.368 | | Microsoft.VisualStudio.Component.Windows10SDK.19041 | 17.0.31804.368 | | Microsoft.VisualStudio.Component.Windows10SDK.20348 | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.Windows11SDK.22000 | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.Windows11SDK.22000 | 17.0.31821.396 | | Microsoft.VisualStudio.Component.Workflow | 17.0.31804.368 | | Microsoft.VisualStudio.Component.WslDebugging | 17.0.31804.368 | | Microsoft.VisualStudio.ComponentGroup.ArchitectureTools.Native | 17.0.31804.368 | @@ -377,13 +395,14 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Workload.Azure | 17.0.31804.368 | | Microsoft.VisualStudio.Workload.CoreEditor | 17.0.31804.368 | | Microsoft.VisualStudio.Workload.Data | 17.0.31804.368 | +| Microsoft.VisualStudio.Workload.DataScience | 17.0.31821.396 | | Microsoft.VisualStudio.Workload.ManagedDesktop | 17.0.31804.368 | | Microsoft.VisualStudio.Workload.ManagedGame | 17.0.31804.368 | | Microsoft.VisualStudio.Workload.NativeCrossPlat | 17.0.31804.368 | | Microsoft.VisualStudio.Workload.NativeDesktop | 17.0.31804.368 | | Microsoft.VisualStudio.Workload.NativeGame | 17.0.31804.368 | | Microsoft.VisualStudio.Workload.NativeMobile | 17.0.31804.368 | -| Microsoft.VisualStudio.Workload.NetCrossPlat | 17.0.31807.5358 | +| Microsoft.VisualStudio.Workload.NetCrossPlat | 17.0.31821.5396 | | Microsoft.VisualStudio.Workload.NetWeb | 17.0.31804.368 | | Microsoft.VisualStudio.Workload.Node | 17.0.31804.368 | | Microsoft.VisualStudio.Workload.Office | 17.0.31804.368 | @@ -429,7 +448,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Azure Powershell Modules | Module | Version | Path | | ------- | ------------------------------------------------------------------------------- | ------------------------------ | -| Az | 6.4.0 | C:\Modules\az_\ | +| Az | 6.5.0 | C:\Modules\az_\ | | Azure | 2.1.0 [Installed]
3.8.0.zip
4.2.1.zip
5.1.1.zip
5.3.0 | C:\Modules\azure_\ | | AzureRM | 2.1.0 [Installed]
3.8.0.zip
4.2.1.zip
5.1.1.zip
6.7.0.zip
6.13.1 | C:\Modules\azurerm_\ | ``` @@ -442,7 +461,7 @@ All other versions are saved but not installed. | ------------------ | ---------------- | | DockerMsftProvider | 1.0.0.8 | | MarkdownPS | 1.9 | -| Microsoft.Graph | 1.7.0 | +| Microsoft.Graph | 1.8.0 | | Pester | 3.4.0
5.3.1 | | PowerShellGet | 1.0.0.1
2.2.5 | | PSScriptAnalyzer | 1.20.0 | @@ -454,7 +473,7 @@ All other versions are saved but not installed. | Package Name | Version | | -------------------------- | ---------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 4.0 | -| Android Emulator | 30.8.4 | +| Android Emulator | 30.9.5 | | Android SDK Build-tools | 31.0.0
30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3 | | Android SDK Platforms | android-31 (rev 1)
android-30 (rev 3)
android-29 (rev 5)
android-28 (rev 6)
android-27 (rev 3) | | Android SDK Platform-Tools | 31.0.3 | @@ -462,7 +481,7 @@ All other versions are saved but not installed. | CMake | 3.18.1 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 21.4.7075529 (default)
22.1.7171670
23.0.7599858 | +| NDK | 21.4.7075529 (default)
22.1.7171670
23.1.7779620 | | SDK Patch Applier v4 | 1 | #### Environment variables @@ -470,7 +489,7 @@ All other versions are saved but not installed. | ----------------------- | ---------------------------------------------------------------------------- | | ANDROID_HOME | C:\Android\android-sdk | | ANDROID_NDK_HOME | C:\Android\android-sdk\ndk-bundle -> C:\Android\android-sdk\ndk\21.4.7075529 | -| ANDROID_NDK_LATEST_HOME | C:\Android\android-sdk\ndk\23.0.7599858 | +| ANDROID_NDK_LATEST_HOME | C:\Android\android-sdk\ndk\23.1.7779620 | | ANDROID_NDK_PATH | C:\Android\android-sdk\ndk-bundle -> C:\Android\android-sdk\ndk\21.4.7075529 | | ANDROID_NDK_ROOT | C:\Android\android-sdk\ndk-bundle -> C:\Android\android-sdk\ndk\21.4.7075529 | | ANDROID_SDK_ROOT | C:\Android\android-sdk | From 869b0cccd4146b13f60543e76acd8df495e87a45 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 4 Nov 2021 03:22:24 +0000 Subject: [PATCH 0695/3485] Updating readme file for win19 version 20211102.4 (#4413) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/win/Windows2019-Readme.md | 92 +++++++++++++++++--------------- 1 file changed, 50 insertions(+), 42 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index a42a518406d3..e79010d8bab4 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -1,10 +1,14 @@ | Announcements | |-| +| [[all OSs] Selenium server version will be upgraded from 3 to 4 on November, 15](https://github.com/actions/virtual-environments/issues/4376) | +| [[All OSs] Node.js version 10 will be removed from the images on November, 15](https://github.com/actions/virtual-environments/issues/4356) | +| [Windows-2016 environment will be removed on March 15, 2022](https://github.com/actions/virtual-environments/issues/4312) | +| [[All OSs] Go versions less than 1.15 will be removed on November, 8](https://github.com/actions/virtual-environments/issues/4311) | | [(Public Beta) Windows Server 2022 with Visual Studio 2022 is now available](https://github.com/actions/virtual-environments/issues/3949) | *** # Microsoft Windows Server 2019 Datacenter - OS Version: 10.0.17763 Build 2237 -- Image Version: 20211018.0 +- Image Version: 20211102.4 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -23,16 +27,16 @@ - Ruby 2.5.9p229 ### Package Management -- Chocolatey 0.11.2 -- Composer 2.1.9 +- Chocolatey 0.11.3 +- Composer 2.1.11 - Helm 3.7.0 - Miniconda 4.10.3 (pre-installed on the image but not added to PATH) - NPM 6.14.15 - NuGet 5.11.0.10 -- pip 21.3 (python 3.7) +- pip 21.3.1 (python 3.7) - Pipx 0.16.4 - RubyGems 2.7.6.3 -- Vcpkg (build from master \<699c877>) +- Vcpkg (build from master \<85b3115>) - Yarn 1.22.17 #### Environment variables @@ -42,7 +46,7 @@ | CONDA | C:\Miniconda | ### Project Management -- Ant 1.10.11 +- Ant 1.10.12 - Gradle 7.2 - Maven 3.8.3 - sbt 1.5.5 @@ -50,30 +54,30 @@ ### Tools - 7zip 19.00 - aria2 1.36.0 -- azcopy 10.12.2 +- azcopy 10.13.0 - Bazel 4.2.1 - Bazelisk 1.10.1 - Bicep 0.4.1008 - Cabal 3.6.2.0 -- CMake 3.21.3 -- CodeQL Action Bundle 2.6.3-a +- CMake 3.21.4 +- CodeQL Action Bundle 2.7.0 - Docker 20.10.7 - Docker-compose 1.29.2 - ghc 9.0.1 - Git 2.33.1 - Git LFS 3.0.1 -- Google Cloud SDK 360.0.0 +- Google Cloud SDK 363.0.0 - InnoSetup 6.2.0 - jq 1.6 - Kind 0.11.1 -- Kubectl 1.22.2 +- Kubectl 1.22.3 - Mercurial 5.0 - Mingw-w64 8.1.0 - Newman 5.3.0 - NSIS v3.06.1 - OpenSSL 1.1.1 - Packer 1.7.6 -- Pulumi v3.15.0 +- Pulumi v3.16.0 - R 4.1.1 - Stack 2.7.3 - Subversion (SVN) 1.14.1 @@ -84,20 +88,20 @@ - zstd 1.5.0 ### CLI Tools -- Alibaba Cloud CLI 3.0.94 -- AWS CLI 2.2.46 -- AWS SAM CLI 1.33.0 -- AWS Session Manager CLI 1.2.245.0 -- Azure CLI 2.29.0 -- Azure DevOps CLI extension 0.20.0 +- Alibaba Cloud CLI 3.0.97 +- AWS CLI 2.3.0 +- AWS SAM CLI 1.34.1 +- AWS Session Manager CLI 1.2.279.0 +- Azure CLI 2.30.0 +- Azure DevOps CLI extension 0.21.0 - Cloud Foundry CLI 6.53.0 -- GitHub CLI 2.1.0 +- GitHub CLI 2.2.0 - Hub CLI 2.14.2 ### Rust Tools -- Cargo 1.55.0 -- Rust 1.55.0 -- Rustdoc 1.55.0 +- Cargo 1.56.0 +- Rust 1.56.1 +- Rustdoc 1.56.1 - Rustup 1.24.3 #### Packages @@ -105,32 +109,34 @@ - cargo-audit 0.15.2 - cargo-outdated v0.9.17 - cbindgen 0.20.0 -- Clippy 0.1.55 +- Clippy 0.1.56 - Rustfmt 1.4.37 ### Browsers and webdrivers -- Google Chrome 94.0.4606.81 -- Chrome Driver 94.0.4606.61 -- Microsoft Edge 94.0.992.50 -- Microsoft Edge Driver 94.0.992.50 -- Mozilla Firefox 93.0 +- Google Chrome 95.0.4638.69 +- Chrome Driver 95.0.4638.54 +- Microsoft Edge 95.0.1020.40 +- Microsoft Edge Driver 95.0.1020.40 +- Mozilla Firefox 94.0 - Gecko Driver 0.30.0 - IE Driver 3.150.1.1 +- Selenium server 3.141.59 #### Environment variables -| Name | Value | -| --------------- | ---------------------------------- | -| CHROMEWEBDRIVER | C:\SeleniumWebDrivers\ChromeDriver | -| EDGEWEBDRIVER | C:\SeleniumWebDrivers\EdgeDriver | -| GECKOWEBDRIVER | C:\SeleniumWebDrivers\GeckoDriver | +| Name | Value | +| ----------------- | ------------------------------------------ | +| CHROMEWEBDRIVER | C:\SeleniumWebDrivers\ChromeDriver | +| EDGEWEBDRIVER | C:\SeleniumWebDrivers\EdgeDriver | +| GECKOWEBDRIVER | C:\SeleniumWebDrivers\GeckoDriver | +| SELENIUM_JAR_PATH | C:\selenium\selenium-server-standalone.jar | ### Java | Version | Vendor | Environment Variable | | ------------------- | --------------- | -------------------- | -| 8.0.302+8 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | -| 11.0.12+7 | Eclipse Temurin | JAVA_HOME_11_X64 | +| 8.0.312+7 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | +| 11.0.13+8 | Eclipse Temurin | JAVA_HOME_11_X64 | | 13.0.2+8.1 | Adopt OpenJDK | JAVA_HOME_13_X64 | -| 17.0.0+35 | Eclipse Temurin | JAVA_HOME_17_X64 | +| 17.0.1+12 | Eclipse Temurin | JAVA_HOME_17_X64 | ### Shells | Name | Target | @@ -166,6 +172,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | 10.24.1 | x64 | | 12.22.7 | x64 | | 14.18.1 | x64 | +| 16.13.0 | x64 | #### Python @@ -195,7 +202,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | -------------- | ------------ | | 2.7.18 | PyPy 7.3.6 with MSC v.1929 64 bit (AMD64) | | 3.6.12 | PyPy 7.3.3 with MSC v.1927 32 bit | -| 3.7.12 | PyPy 7.3.6 with MSC v.1929 64 bit (AMD64) | +| 3.7.12 | PyPy 7.3.7 with MSC v.1929 64 bit (AMD64) | +| 3.8.12 | PyPy 7.3.7 with MSC v.1929 64 bit (AMD64) | @@ -221,7 +229,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Database tools -- Azure CosmosDb Emulator 2.14.3.0 +- Azure CosmosDb Emulator 2.14.4.0 - DacFx 15.0.5282.3 - MySQL 5.7.35.0 - SQLPS 1.0 @@ -520,7 +528,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Azure Powershell Modules | Module | Version | Path | | ------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------ | -| Az | 1.0.0.zip
1.6.0.zip
2.3.2.zip
2.6.0.zip
3.1.0.zip
3.5.0.zip
3.8.0.zip
4.3.0.zip
4.4.0.zip
4.7.0.zip
5.5.0.zip
5.9.0.zip
6.4.0 | C:\Modules\az_\ | +| Az | 1.0.0.zip
1.6.0.zip
2.3.2.zip
2.6.0.zip
3.1.0.zip
3.5.0.zip
3.8.0.zip
4.3.0.zip
4.4.0.zip
4.7.0.zip
5.5.0.zip
5.9.0.zip
6.5.0 | C:\Modules\az_\ | | Azure | 2.1.0 [Installed]
3.8.0.zip
4.2.1.zip
5.1.1.zip
5.3.0 | C:\Modules\azure_\ | | AzureRM | 2.1.0 [Installed]
3.8.0.zip
4.2.1.zip
5.1.1.zip
6.7.0.zip
6.13.1 | C:\Modules\azurerm_\ | ``` @@ -533,7 +541,7 @@ All other versions are saved but not installed. | ------------------ | ---------------- | | DockerMsftProvider | 1.0.0.8 | | MarkdownPS | 1.9 | -| Microsoft.Graph | 1.7.0 | +| Microsoft.Graph | 1.8.0 | | Pester | 3.4.0
5.3.1 | | PowerShellGet | 1.0.0.1
2.2.5 | | PSScriptAnalyzer | 1.20.0 | @@ -554,7 +562,7 @@ All other versions are saved but not installed. | Google APIs | addon-google_apis-google-21
addon-google_apis-google-22
addon-google_apis-google-23
addon-google_apis-google-24 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 21.4.7075529 (default)
22.1.7171670
23.0.7599858 | +| NDK | 21.4.7075529 (default)
22.1.7171670
23.1.7779620 | | SDK Patch Applier v4 | 1 | #### Environment variables @@ -562,7 +570,7 @@ All other versions are saved but not installed. | ----------------------- | ---------------------------------------------------------------------------- | | ANDROID_HOME | C:\Android\android-sdk | | ANDROID_NDK_HOME | C:\Android\android-sdk\ndk-bundle -> C:\Android\android-sdk\ndk\21.4.7075529 | -| ANDROID_NDK_LATEST_HOME | C:\Android\android-sdk\ndk\23.0.7599858 | +| ANDROID_NDK_LATEST_HOME | C:\Android\android-sdk\ndk\23.1.7779620 | | ANDROID_NDK_PATH | C:\Android\android-sdk\ndk-bundle -> C:\Android\android-sdk\ndk\21.4.7075529 | | ANDROID_NDK_ROOT | C:\Android\android-sdk\ndk-bundle -> C:\Android\android-sdk\ndk\21.4.7075529 | | ANDROID_SDK_ROOT | C:\Android\android-sdk | From aec3886d58900cfa523bd268c169a4bfe697c683 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 4 Nov 2021 03:24:10 +0000 Subject: [PATCH 0696/3485] Updating readme file for win16 version 20211102.4 (#4412) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/win/Windows2016-Readme.md | 92 +++++++++++++++++--------------- 1 file changed, 50 insertions(+), 42 deletions(-) diff --git a/images/win/Windows2016-Readme.md b/images/win/Windows2016-Readme.md index 02ff6cfd0cf5..eca1b3669f39 100644 --- a/images/win/Windows2016-Readme.md +++ b/images/win/Windows2016-Readme.md @@ -1,10 +1,14 @@ | Announcements | |-| +| [[all OSs] Selenium server version will be upgraded from 3 to 4 on November, 15](https://github.com/actions/virtual-environments/issues/4376) | +| [[All OSs] Node.js version 10 will be removed from the images on November, 15](https://github.com/actions/virtual-environments/issues/4356) | +| [Windows-2016 environment will be removed on March 15, 2022](https://github.com/actions/virtual-environments/issues/4312) | +| [[All OSs] Go versions less than 1.15 will be removed on November, 8](https://github.com/actions/virtual-environments/issues/4311) | | [(Public Beta) Windows Server 2022 with Visual Studio 2022 is now available](https://github.com/actions/virtual-environments/issues/3949) | *** # Microsoft Windows Server 2016 Datacenter - OS Version: 10.0.14393 Build 4704 -- Image Version: 20211018.0 +- Image Version: 20211102.4 ## Installed Software ### Language and Runtime @@ -20,16 +24,16 @@ - Ruby 2.5.9p229 ### Package Management -- Chocolatey 0.11.2 -- Composer 2.1.9 +- Chocolatey 0.11.3 +- Composer 2.1.11 - Helm 3.7.0 - Miniconda 4.10.3 (pre-installed on the image but not added to PATH) - NPM 6.14.15 - NuGet 5.11.0.10 -- pip 21.3 (python 3.7) +- pip 21.3.1 (python 3.7) - Pipx 0.16.4 - RubyGems 2.7.6.3 -- Vcpkg (build from master \<699c877>) +- Vcpkg (build from master \<85b3115>) - Yarn 1.22.17 #### Environment variables @@ -39,7 +43,7 @@ | CONDA | C:\Miniconda | ### Project Management -- Ant 1.10.11 +- Ant 1.10.12 - Gradle 7.2 - Maven 3.8.3 - sbt 1.5.5 @@ -47,30 +51,30 @@ ### Tools - 7zip 19.00 - aria2 1.36.0 -- azcopy 10.12.2 +- azcopy 10.13.0 - Bazel 4.2.1 - Bazelisk 1.10.1 - Bicep 0.4.1008 - Cabal 3.6.2.0 -- CMake 3.21.3 -- CodeQL Action Bundle 2.6.3-a +- CMake 3.21.4 +- CodeQL Action Bundle 2.7.0 - Docker 20.10.7 - Docker-compose 1.29.2 - ghc 9.0.1 - Git 2.33.1 - Git LFS 3.0.1 -- Google Cloud SDK 360.0.0 +- Google Cloud SDK 363.0.0 - InnoSetup 6.2.0 - jq 1.6 - Kind 0.11.1 -- Kubectl 1.22.2 +- Kubectl 1.22.3 - Mercurial 5.0 - Mingw-w64 8.1.0 - Newman 5.3.0 - NSIS v3.06.1 - OpenSSL 1.1.1 - Packer 1.7.6 -- Pulumi v3.15.0 +- Pulumi v3.16.0 - R 4.1.1 - Stack 2.7.3 - Subversion (SVN) 1.14.1 @@ -81,20 +85,20 @@ - zstd 1.5.0 ### CLI Tools -- Alibaba Cloud CLI 3.0.94 -- AWS CLI 2.2.46 -- AWS SAM CLI 1.33.0 -- AWS Session Manager CLI 1.2.245.0 -- Azure CLI 2.29.0 -- Azure DevOps CLI extension 0.20.0 +- Alibaba Cloud CLI 3.0.97 +- AWS CLI 2.3.0 +- AWS SAM CLI 1.34.1 +- AWS Session Manager CLI 1.2.279.0 +- Azure CLI 2.30.0 +- Azure DevOps CLI extension 0.21.0 - Cloud Foundry CLI 6.53.0 -- GitHub CLI 2.1.0 +- GitHub CLI 2.2.0 - Hub CLI 2.14.2 ### Rust Tools -- Cargo 1.55.0 -- Rust 1.55.0 -- Rustdoc 1.55.0 +- Cargo 1.56.0 +- Rust 1.56.1 +- Rustdoc 1.56.1 - Rustup 1.24.3 #### Packages @@ -102,32 +106,34 @@ - cargo-audit 0.15.2 - cargo-outdated v0.9.17 - cbindgen 0.20.0 -- Clippy 0.1.55 +- Clippy 0.1.56 - Rustfmt 1.4.37 ### Browsers and webdrivers -- Google Chrome 94.0.4606.81 -- Chrome Driver 94.0.4606.61 -- Microsoft Edge 94.0.992.50 -- Microsoft Edge Driver 94.0.992.50 -- Mozilla Firefox 93.0 +- Google Chrome 95.0.4638.69 +- Chrome Driver 95.0.4638.54 +- Microsoft Edge 95.0.1020.40 +- Microsoft Edge Driver 95.0.1020.40 +- Mozilla Firefox 94.0 - Gecko Driver 0.30.0 - IE Driver 3.150.1.1 +- Selenium server 3.141.59 #### Environment variables -| Name | Value | -| --------------- | ---------------------------------- | -| CHROMEWEBDRIVER | C:\SeleniumWebDrivers\ChromeDriver | -| EDGEWEBDRIVER | C:\SeleniumWebDrivers\EdgeDriver | -| GECKOWEBDRIVER | C:\SeleniumWebDrivers\GeckoDriver | +| Name | Value | +| ----------------- | ------------------------------------------ | +| CHROMEWEBDRIVER | C:\SeleniumWebDrivers\ChromeDriver | +| EDGEWEBDRIVER | C:\SeleniumWebDrivers\EdgeDriver | +| GECKOWEBDRIVER | C:\SeleniumWebDrivers\GeckoDriver | +| SELENIUM_JAR_PATH | C:\selenium\selenium-server-standalone.jar | ### Java | Version | Vendor | Environment Variable | | ------------------- | --------------- | -------------------- | -| 8.0.302+8 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | -| 11.0.12+7 | Eclipse Temurin | JAVA_HOME_11_X64 | +| 8.0.312+7 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | +| 11.0.13+8 | Eclipse Temurin | JAVA_HOME_11_X64 | | 13.0.2+8.1 | Adopt OpenJDK | JAVA_HOME_13_X64 | -| 17.0.0+35 | Eclipse Temurin | JAVA_HOME_17_X64 | +| 17.0.1+12 | Eclipse Temurin | JAVA_HOME_17_X64 | ### Shells | Name | Target | @@ -160,6 +166,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | 10.24.1 | x64 | | 12.22.7 | x64 | | 14.18.1 | x64 | +| 16.13.0 | x64 | #### Python @@ -189,7 +196,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | -------------- | ------------ | | 2.7.18 | PyPy 7.3.6 with MSC v.1929 64 bit (AMD64) | | 3.6.12 | PyPy 7.3.3 with MSC v.1927 32 bit | -| 3.7.12 | PyPy 7.3.6 with MSC v.1929 64 bit (AMD64) | +| 3.7.12 | PyPy 7.3.7 with MSC v.1929 64 bit (AMD64) | +| 3.8.12 | PyPy 7.3.7 with MSC v.1929 64 bit (AMD64) | @@ -215,7 +223,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Database tools -- Azure CosmosDb Emulator 2.14.3.0 +- Azure CosmosDb Emulator 2.14.4.0 - DacFx 15.0.5282.3 - MySQL 5.7.35.0 - SQLPS 1.0 @@ -525,7 +533,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Azure Powershell Modules | Module | Version | Path | | ------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------ | -| Az | 1.0.0.zip
1.6.0.zip
2.3.2.zip
2.6.0.zip
3.1.0.zip
3.5.0.zip
3.8.0.zip
4.3.0.zip
4.4.0.zip
4.7.0.zip
5.5.0.zip
5.9.0.zip
6.4.0 | C:\Modules\az_\ | +| Az | 1.0.0.zip
1.6.0.zip
2.3.2.zip
2.6.0.zip
3.1.0.zip
3.5.0.zip
3.8.0.zip
4.3.0.zip
4.4.0.zip
4.7.0.zip
5.5.0.zip
5.9.0.zip
6.5.0 | C:\Modules\az_\ | | Azure | 2.1.0 [Installed]
3.8.0.zip
4.2.1.zip
5.1.1.zip
5.3.0 | C:\Modules\azure_\ | | AzureRM | 2.1.0 [Installed]
3.8.0.zip
4.2.1.zip
5.1.1.zip
6.7.0.zip
6.13.1 | C:\Modules\azurerm_\ | ``` @@ -538,7 +546,7 @@ All other versions are saved but not installed. | ------------------ | ---------------- | | DockerMsftProvider | 1.0.0.8 | | MarkdownPS | 1.9 | -| Microsoft.Graph | 1.7.0 | +| Microsoft.Graph | 1.8.0 | | Pester | 3.4.0
5.3.1 | | PowerShellGet | 1.0.0.1
2.2.5 | | PSScriptAnalyzer | 1.20.0 | @@ -559,7 +567,7 @@ All other versions are saved but not installed. | Google APIs | addon-google_apis-google-21
addon-google_apis-google-22
addon-google_apis-google-23
addon-google_apis-google-24 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 21.4.7075529 (default)
22.1.7171670
23.0.7599858 | +| NDK | 21.4.7075529 (default)
22.1.7171670
23.1.7779620 | | SDK Patch Applier v4 | 1 | #### Environment variables @@ -567,7 +575,7 @@ All other versions are saved but not installed. | ----------------------- | ---------------------------------------------------------------------------- | | ANDROID_HOME | C:\Android\android-sdk | | ANDROID_NDK_HOME | C:\Android\android-sdk\ndk-bundle -> C:\Android\android-sdk\ndk\21.4.7075529 | -| ANDROID_NDK_LATEST_HOME | C:\Android\android-sdk\ndk\23.0.7599858 | +| ANDROID_NDK_LATEST_HOME | C:\Android\android-sdk\ndk\23.1.7779620 | | ANDROID_NDK_PATH | C:\Android\android-sdk\ndk-bundle -> C:\Android\android-sdk\ndk\21.4.7075529 | | ANDROID_NDK_ROOT | C:\Android\android-sdk\ndk-bundle -> C:\Android\android-sdk\ndk\21.4.7075529 | | ANDROID_SDK_ROOT | C:\Android\android-sdk | From 49a757831333df74735099bdf96b69ccde5aece3 Mon Sep 17 00:00:00 2001 From: Jay W <40270505+JayDoubleu@users.noreply.github.com> Date: Sun, 7 Nov 2021 16:07:58 +0000 Subject: [PATCH 0697/3485] [ubuntu] Fix swift installation (#4429) --- images/linux/scripts/installers/swift.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/linux/scripts/installers/swift.sh b/images/linux/scripts/installers/swift.sh index d3b683f9e379..ac8e87c6b4ce 100644 --- a/images/linux/scripts/installers/swift.sh +++ b/images/linux/scripts/installers/swift.sh @@ -9,7 +9,7 @@ source $HELPER_SCRIPTS/install.sh # Install image_label="$(lsb_release -rs)" -swift_version=$(curl -s -L -N https://swift.org/download|awk -F"[ <]" '/id="swift-/ {print $4; exit}') +swift_version=$(curl -s "https://api.github.com/repos/apple/swift/releases/latest" | jq -r '.tag_name | match("[0-9.]+").string') swift_tar_name="swift-$swift_version-RELEASE-ubuntu$image_label.tar.gz" swift_tar_url="https://swift.org/builds/swift-$swift_version-release/ubuntu${image_label//./}/swift-$swift_version-RELEASE/$swift_tar_name" @@ -25,4 +25,4 @@ ln -s "$SWIFT_BIN" /usr/local/bin/swift ln -s "$SWIFTC_BIN" /usr/local/bin/swiftc echo "SWIFT_PATH=$SWIFT_PATH" | tee -a /etc/environment -invoke_tests "Common" "Swift" \ No newline at end of file +invoke_tests "Common" "Swift" From c4eeb9c78259bf7c8f593269d7103cb8de7492ac Mon Sep 17 00:00:00 2001 From: Zachary Cook <58912675+zacdirect@users.noreply.github.com> Date: Mon, 8 Nov 2021 05:45:41 -0600 Subject: [PATCH 0698/3485] Optional passthru of AllowBlobPublicAccess (#4425) --- helpers/GenerateResourcesAndImage.ps1 | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/helpers/GenerateResourcesAndImage.ps1 b/helpers/GenerateResourcesAndImage.ps1 index 4a4930085032..517a983aead4 100644 --- a/helpers/GenerateResourcesAndImage.ps1 +++ b/helpers/GenerateResourcesAndImage.ps1 @@ -92,6 +92,9 @@ Function GenerateResourcesAndImage { .PARAMETER RestrictToAgentIpAddress If set, access to the VM used by packer to generate the image is restricted to the public IP address this script is run from. This parameter cannot be used in combination with the virtual_network_name packer parameter. + + .PARAMETER AllowBlobPublicAccess + The Azure storage account will be created with this option. .EXAMPLE GenerateResourcesAndImage -SubscriptionId {YourSubscriptionId} -ResourceGroupName "shsamytest1" -ImageGenerationRepositoryRoot "C:\virtual-environments" -ImageType Ubuntu1804 -AzureLocation "East US" @@ -118,7 +121,9 @@ Function GenerateResourcesAndImage { [Parameter(Mandatory = $False)] [Switch] $RestrictToAgentIpAddress, [Parameter(Mandatory = $False)] - [Switch] $Force + [Switch] $Force, + [Parameter(Mandatory = $False)] + [bool] $AllowBlobPublicAccess = $False, ) $builderScriptPath = Get-PackerTemplatePath -RepositoryRoot $ImageGenerationRepositoryRoot -ImageType $ImageType @@ -186,7 +191,7 @@ Function GenerateResourcesAndImage { $storageAccountName = $storageAccountName.Replace("-", "").Replace("_", "").Replace("(", "").Replace(")", "").ToLower() $storageAccountName += "001" - New-AzStorageAccount -ResourceGroupName $ResourceGroupName -AccountName $storageAccountName -Location $AzureLocation -SkuName "Standard_LRS" + New-AzStorageAccount -ResourceGroupName $ResourceGroupName -AccountName $storageAccountName -Location $AzureLocation -SkuName "Standard_LRS" -AllowBlobPublicAccess $AllowBlobPublicAccess if ([string]::IsNullOrEmpty($AzureClientId)) { # Interactive authentication: A service principal is created during runtime. From 488fa4238579cf636412ea3bf4470dd19fc5fcef Mon Sep 17 00:00:00 2001 From: Maksim Shilov <89912354+shilovmaksim@users.noreply.github.com> Date: Mon, 8 Nov 2021 15:05:55 +0300 Subject: [PATCH 0699/3485] [Windows] Slight rework of the PyPy installation (#4392) --- .../win/scripts/Installers/Install-PyPy.ps1 | 62 ++++++------------- 1 file changed, 20 insertions(+), 42 deletions(-) diff --git a/images/win/scripts/Installers/Install-PyPy.ps1 b/images/win/scripts/Installers/Install-PyPy.ps1 index bff461ec646c..6a8f1a9ee82f 100644 --- a/images/win/scripts/Installers/Install-PyPy.ps1 +++ b/images/win/scripts/Installers/Install-PyPy.ps1 @@ -3,22 +3,6 @@ ## Team: CI-Build ## Desc: Install PyPy ################################################################################ -function Get-PyPyVersions -{ - $uri = "https://downloads.python.org/pypy/" - try - { - $hrefs = (Invoke-WebRequest -Uri $uri).Links.href - $hrefs | Where-Object {$_ -match '^pypy'} | Select-Object @{n = "Name"; e = {$_}}, @{n = "href"; e = { - [string]::Join('', ($uri, $_)) - }} - } - catch - { - Write-Host "Enable to send request to the '$uri'. Error: '$_'" - exit 1 - } -} function Install-PyPy { param( @@ -83,35 +67,29 @@ function Install-PyPy } # Get PyPy content from toolset -$pypyTools = Get-ToolsetContent | Select-Object -ExpandProperty toolcache | Where-Object Name -eq "PyPy" +$toolsetVersions = Get-ToolsetContent | Select-Object -ExpandProperty toolcache | Where-Object Name -eq "PyPy" -# Get PyPy versions from the repo -$pypyVersions = Get-PyPyVersions +# Get PyPy releases +$pypyVersions = Invoke-RestMethod https://downloads.python.org/pypy/versions.json Write-Host "Starting installation PyPy..." -foreach($pypyTool in $pypyTools) +foreach($toolsetVersion in $toolsetVersions.versions) { - foreach($pypyVersion in $pypyTool.versions) + # Query latest PyPy version + $latestMajorPyPyVersion = $pypyVersions | + Where-Object {$_.python_version.StartsWith("$toolsetVersion") -and $_.stable -eq $true} | + Select-Object -ExpandProperty files -First 1 | + Where-Object platform -like "win*" + + if ($latestMajorPyPyVersion) { - # Query latest PyPy version - # PyPy 3.6 is not updated anymore and win32 should be used - $platform = if ($pypyVersion -like "3.6*") { "win32" } else { $pypyTool.platform } - $filter = '{0}{1}-v\d+\.\d+\.\d+-{2}.zip' -f $pypyTool.name, $pypyVersion, $platform - $latestMajorPyPyVersion = $pypyVersions | Where-Object {$_.name -match $filter} | Select-Object -First 1 - - if ($latestMajorPyPyVersion) - { - $packageName = $latestMajorPyPyVersion.name - - Write-Host "Found PyPy '$packageName' package" - $url = $latestMajorPyPyVersion.href - $tempPyPyPackagePath = Start-DownloadWithRetry -Url $url -Name $packageName - Install-PyPy -PackagePath $tempPyPyPackagePath -Architecture $pypyTool.arch - } - else - { - Write-Host "Failed to query PyPy version '$pypyVersion' by '$filter' filter" - exit 1 - } + Write-Host "Found PyPy '$($latestMajorPyPyVersion.filename)' package" + $tempPyPyPackagePath = Start-DownloadWithRetry -Url $latestMajorPyPyVersion.download_url -Name $latestMajorPyPyVersion.filename + Install-PyPy -PackagePath $tempPyPyPackagePath -Architecture $toolsetVersions.arch } -} + else + { + Write-Host "Failed to query PyPy version '$toolsetVersion'" + exit 1 + } +} \ No newline at end of file From 11464d528851644f2bc76bc9aa7adb3c1bfee1b8 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Mon, 8 Nov 2021 15:54:37 +0300 Subject: [PATCH 0700/3485] Revert "[Ubuntu] build vcpkg from specific commit (#4386)" (#4438) This reverts commit 60d2208f8819a8ff4f198b7758ae5e0d2e66986e. --- images/linux/scripts/installers/vcpkg.sh | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/images/linux/scripts/installers/vcpkg.sh b/images/linux/scripts/installers/vcpkg.sh index 3041600e5a5e..5d609fecdef0 100644 --- a/images/linux/scripts/installers/vcpkg.sh +++ b/images/linux/scripts/installers/vcpkg.sh @@ -5,24 +5,15 @@ ################################################################################ # Set env variable for vcpkg - -# Checkout the specific commit as master builds are falling. -# Upstream report: https://github.com/microsoft/vcpkg/issues/21107 -GIT_COMMIT_HASH=d78a0b47bdd4deb6bc5547e06e289672892ed226 VCPKG_INSTALLATION_ROOT=/usr/local/share/vcpkg echo "VCPKG_INSTALLATION_ROOT=${VCPKG_INSTALLATION_ROOT}" | tee -a /etc/environment # Install vcpkg -git clone https://github.com/Microsoft/vcpkg $VCPKG_INSTALLATION_ROOT - -pushd $VCPKG_INSTALLATION_ROOT -git checkout $GIT_COMMIT_HASH -popd +git clone --depth=1 https://github.com/Microsoft/vcpkg $VCPKG_INSTALLATION_ROOT $VCPKG_INSTALLATION_ROOT/bootstrap-vcpkg.sh $VCPKG_INSTALLATION_ROOT/vcpkg integrate install chmod 0777 -R $VCPKG_INSTALLATION_ROOT -mkdir -p /usr/local/bin -ln -sf $VCPKG_INSTALLATION_ROOT/vcpkg /usr/local/bin/vcpkg +ln -sf $VCPKG_INSTALLATION_ROOT/vcpkg /usr/local/bin -invoke_tests "Tools" "Vcpkg" +invoke_tests "Tools" "Vcpkg" \ No newline at end of file From 8fd74ebe0f0706cb6aa2cc01f5863961d01173e9 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Mon, 8 Nov 2021 16:52:37 +0300 Subject: [PATCH 0701/3485] Revert "[macOS] install vcpkg from specific commit (#4389)" (#4439) This reverts commit 706a7ae6d398dc8937bef79272d819808afd2145. --- images/macos/provision/core/vcpkg.sh | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/images/macos/provision/core/vcpkg.sh b/images/macos/provision/core/vcpkg.sh index 188ed418c20d..d20cb3ca4fef 100644 --- a/images/macos/provision/core/vcpkg.sh +++ b/images/macos/provision/core/vcpkg.sh @@ -2,24 +2,14 @@ source ~/utils/utils.sh # Set env variable for vcpkg - -# Checkout the specific commit as master builds are falling. -# Upstream report: https://github.com/microsoft/vcpkg/issues/21107 -GIT_COMMIT_HASH=d78a0b47bdd4deb6bc5547e06e289672892ed226 VCPKG_INSTALLATION_ROOT=/usr/local/share/vcpkg echo "export VCPKG_INSTALLATION_ROOT=${VCPKG_INSTALLATION_ROOT}" | tee -a ~/.bashrc # Install vcpkg -git clone https://github.com/Microsoft/vcpkg $VCPKG_INSTALLATION_ROOT - -pushd $VCPKG_INSTALLATION_ROOT -git checkout $GIT_COMMIT_HASH -popd - +git clone --depth=1 https://github.com/Microsoft/vcpkg $VCPKG_INSTALLATION_ROOT $VCPKG_INSTALLATION_ROOT/bootstrap-vcpkg.sh $VCPKG_INSTALLATION_ROOT/vcpkg integrate install chmod -R 0777 $VCPKG_INSTALLATION_ROOT -mkdir -p /usr/local/bin -ln -sf $VCPKG_INSTALLATION_ROOT/vcpkg /usr/local/bin/vcpkg +ln -sf $VCPKG_INSTALLATION_ROOT/vcpkg /usr/local/bin invoke_tests "Common" "vcpkg" From fa41b676c7e3a929bb61d79997d11175fc686657 Mon Sep 17 00:00:00 2001 From: Nikolay Frolov <90333448+nikolai-frolov@users.noreply.github.com> Date: Tue, 9 Nov 2021 17:18:30 +0300 Subject: [PATCH 0702/3485] [Win] Rework NodeJS install (#4406) --- images/win/scripts/Installers/Install-NodeLts.ps1 | 13 ++++++++++++- images/win/toolsets/toolset-2016.json | 2 +- images/win/toolsets/toolset-2019.json | 2 +- images/win/toolsets/toolset-2022.json | 2 +- 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/images/win/scripts/Installers/Install-NodeLts.ps1 b/images/win/scripts/Installers/Install-NodeLts.ps1 index 008fafc303bb..374a776f1159 100644 --- a/images/win/scripts/Installers/Install-NodeLts.ps1 +++ b/images/win/scripts/Installers/Install-NodeLts.ps1 @@ -11,7 +11,18 @@ New-Item -Path $PrefixPath -Force -ItemType Directory New-Item -Path $CachePath -Force -ItemType Directory $defaultVersion = (Get-ToolsetContent).node.default -Choco-Install -PackageName nodejs -ArgumentList "--version=$defaultVersion" +$queryFilter = "`$filter=(Id eq 'nodejs') and (IsPrerelease eq false) and (Version ge '$defaultVersion')" +$url = "https://community.chocolatey.org/api/v2/Packages()?$queryFilter" +$chocoVersionsOutput = (Invoke-RestMethod -Uri $url).properties.Version +# Take the latest version available for given default version from the toolset which is used as wildcard +# Toolset file can contain a version in any form: Major, Major.Minor or even the exact version +$versionToInstall = $chocoVersionsOutput | + # Take the exact default version and its subversions + Where-Object { $_ -Like "$defaultVersion.*" -or $_ -eq $defaultVersion } | + Sort-Object { [Version]$_ } | + Select-Object -Last 1 + +Choco-Install -PackageName nodejs -ArgumentList "--version=$versionToInstall" Add-MachinePathItem $PrefixPath $env:Path = Get-MachinePath diff --git a/images/win/toolsets/toolset-2016.json b/images/win/toolsets/toolset-2016.json index 020f525de9c1..72b6492a6fd3 100644 --- a/images/win/toolsets/toolset-2016.json +++ b/images/win/toolsets/toolset-2016.json @@ -421,6 +421,6 @@ ] }, "node": { - "default": "14.18.1" + "default": "14" } } diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index e640401aec9c..ac2f170cba17 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -453,6 +453,6 @@ ] }, "node": { - "default": "14.18.1" + "default": "14" } } diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index c97f9f38ef97..408daf0a0218 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -303,6 +303,6 @@ ] }, "node": { - "default": "14.18.1" + "default": "14" } } From 58ce149ebf60095fb17e5862f7cf63da4029fa8c Mon Sep 17 00:00:00 2001 From: Nikolay Frolov <90333448+nikolai-frolov@users.noreply.github.com> Date: Tue, 9 Nov 2021 17:49:30 +0300 Subject: [PATCH 0703/3485] [MacOS] Rework NodeJS install (#4380) --- images/macos/provision/core/node.sh | 9 ++++++--- images/macos/provision/core/nvm.sh | 4 ++-- images/macos/tests/Node.Tests.ps1 | 4 ++++ images/macos/toolsets/toolset-10.14.json | 8 ++++++++ images/macos/toolsets/toolset-10.15.json | 8 ++++++++ images/macos/toolsets/toolset-11.json | 8 ++++++++ images/macos/toolsets/toolset-12.json | 8 ++++++++ 7 files changed, 44 insertions(+), 5 deletions(-) diff --git a/images/macos/provision/core/node.sh b/images/macos/provision/core/node.sh index d9136e17ffe8..128b4f6fb06e 100644 --- a/images/macos/provision/core/node.sh +++ b/images/macos/provision/core/node.sh @@ -10,9 +10,12 @@ if is_Less_Catalina; then rm -rf "${TMP_FILE}" sudo chown -R $USER "/usr/local/lib/node_modules" else - # Install Node.js 14 for macOS >= 10.15 - brew_smart_install "node@14" - brew link node@14 --force + # Install default Node.js for macOS >= 10.15 + defaultVersion=$(get_toolset_value '.node.default') + + echo "Installing Node.js $defaultVersion" + brew_smart_install "node@$defaultVersion" + brew link node@$defaultVersion --force fi echo Installing yarn... diff --git a/images/macos/provision/core/nvm.sh b/images/macos/provision/core/nvm.sh index 2b80a0b6ad5a..16252a029178 100755 --- a/images/macos/provision/core/nvm.sh +++ b/images/macos/provision/core/nvm.sh @@ -11,10 +11,10 @@ curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/$VERSION/install.sh | bash if [ $? -eq 0 ]; then . ~/.bashrc nvm --version - nodeVersions=("v10" "v12" "v14") + nodeVersions=$(get_toolset_value '.node.nvm_versions[]') for version in ${nodeVersions[@]} do - nvm install $version + nvm install v${version} done # set system node as default diff --git a/images/macos/tests/Node.Tests.ps1 b/images/macos/tests/Node.Tests.ps1 index d2759adb03a6..baeab0464dd0 100644 --- a/images/macos/tests/Node.Tests.ps1 +++ b/images/macos/tests/Node.Tests.ps1 @@ -13,6 +13,10 @@ Describe "Node.js" { "node --version" | Should -ReturnZeroExitCode } + It "Node.js version should correspond to the version in the toolset" { + node --version | Should -BeLike "v$(Get-ToolsetValue 'node.default')*" + } + It "Node.js $expectedNodeVersion is default" { (Get-CommandResult "node --version").Output | Should -BeLike $expectedNodeVersion } diff --git a/images/macos/toolsets/toolset-10.14.json b/images/macos/toolsets/toolset-10.14.json index 4db0578a9c63..18cc772bf004 100644 --- a/images/macos/toolsets/toolset-10.14.json +++ b/images/macos/toolsets/toolset-10.14.json @@ -375,5 +375,13 @@ }, "go": { "default": "1.15" + }, + "node": { + "default": "8", + "nvm_versions": [ + "10", + "12", + "14" + ] } } diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index 1cd9f996a2ed..5aa1f47e8ff0 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -331,5 +331,13 @@ }, "go": { "default": "1.15" + }, + "node": { + "default": "14", + "nvm_versions": [ + "10", + "12", + "14" + ] } } diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index 2ce6bcbee24c..89479c683535 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -284,5 +284,13 @@ }, "go": { "default": "1.15" + }, + "node": { + "default": "14", + "nvm_versions": [ + "10", + "12", + "14" + ] } } diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index 8bd192728032..11f3a7ea9e7d 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -184,5 +184,13 @@ }, "go": { "default": "1.17" + }, + "node": { + "default": "14", + "nvm_versions": [ + "10", + "12", + "14" + ] } } From 881dbcfda3a2eff38c549590d15344454109545a Mon Sep 17 00:00:00 2001 From: Bob Arnson Date: Tue, 9 Nov 2021 11:31:20 -0500 Subject: [PATCH 0704/3485] Fix typo in helpers/GenerateResourcesAndImage.ps1. (#4449) --- helpers/GenerateResourcesAndImage.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helpers/GenerateResourcesAndImage.ps1 b/helpers/GenerateResourcesAndImage.ps1 index 517a983aead4..16d90e522e44 100644 --- a/helpers/GenerateResourcesAndImage.ps1 +++ b/helpers/GenerateResourcesAndImage.ps1 @@ -123,7 +123,7 @@ Function GenerateResourcesAndImage { [Parameter(Mandatory = $False)] [Switch] $Force, [Parameter(Mandatory = $False)] - [bool] $AllowBlobPublicAccess = $False, + [bool] $AllowBlobPublicAccess = $False ) $builderScriptPath = Get-PackerTemplatePath -RepositoryRoot $ImageGenerationRepositoryRoot -ImageType $ImageType From a6b29e3206d00b1f8e24286956336e87637aea92 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Wed, 10 Nov 2021 00:00:18 +0300 Subject: [PATCH 0705/3485] Change channel from pre to release for VS22 (#4451) --- images/win/toolsets/toolset-2022.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index 408daf0a0218..b5ef50eebc63 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -170,7 +170,7 @@ "version" : "2022", "subversion" : "17", "edition" : "Enterprise", - "channel": "pre", + "channel": "release", "workloads": [ "Component.Linux.CMake", "Component.UnityEngine.x64", From a672a9157eae88d20b410062a141d88b76345450 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 10 Nov 2021 10:10:53 +0000 Subject: [PATCH 0706/3485] Updating readme file for macOS-11 version 20211106.1 (#4434) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/macos/macos-11-Readme.md | 48 +++++++++++++++++---------------- 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/images/macos/macos-11-Readme.md b/images/macos/macos-11-Readme.md index 15c650a9ae24..6dcd6c12d287 100644 --- a/images/macos/macos-11-Readme.md +++ b/images/macos/macos-11-Readme.md @@ -9,7 +9,7 @@ # macOS 11.6 info - System Version: macOS 11.6.1 (20G224) - Kernel Version: Darwin 20.6.0 -- Image Version: 20211029.3 +- Image Version: 20211106.1 ## Installed Software ### Language and Runtime @@ -19,10 +19,10 @@ - Clang/LLVM 13.0.0 is default - gcc-9 (Homebrew GCC 9.4.0) 9.4.0 - available by `gcc-9` alias - gcc-10 (Homebrew GCC 10.3.0) 10.3.0 - available by `gcc-10` alias -- gcc-11 (Homebrew GCC 11.2.0) 11.2.0 - available by `gcc-11` alias +- gcc-11 (Homebrew GCC 11.2.0_1) 11.2.0 - available by `gcc-11` alias - GNU Fortran (Homebrew GCC 9.4.0) 9.4.0 - available by `gfortran-9` alias - GNU Fortran (Homebrew GCC 10.3.0) 10.3.0 - available by `gfortran-10` alias -- GNU Fortran (Homebrew GCC 11.2.0) 11.2.0 - available by `gfortran-11` alias +- GNU Fortran (Homebrew GCC 11.2.0_1) 11.2.0 - available by `gfortran-11` alias - Go 1.15.15 - julia 1.6.3 - Kotlin 1.5.31-release-548 @@ -40,8 +40,8 @@ - Bundler version 2.2.30 - Carthage 0.38.0 - CocoaPods 1.11.2 -- Composer 2.1.10 -- Homebrew 3.3.1 +- Composer 2.1.11 +- Homebrew 3.3.2 - Miniconda 4.10.3 - NPM 6.14.15 - NuGet 5.9.0.7134 @@ -49,7 +49,7 @@ - Pip 21.2.4 (python 3.9) - Pipx 0.16.4 - RubyGems 3.2.30 -- Vcpkg 2021 (build from master \) +- Vcpkg 2021 (build from master \) - Yarn 1.22.15 #### Environment variables @@ -95,21 +95,21 @@ ### Tools -- Aliyun CLI 3.0.96 +- Aliyun CLI 3.0.97 - App Center CLI 2.10.4 -- AWS CLI 2.3.2 -- AWS SAM CLI 1.34.1 +- AWS CLI 2.3.4 +- AWS SAM CLI 1.35.0 - AWS Session Manager CLI 1.2.279.0 -- Azure CLI 2.29.2 +- Azure CLI 2.30.0 - Bicep CLI 0.4.1008 - Cabal 3.6.2.0 - Cmake 3.21.4 - Fastlane 2.197.0 -- GHC 9.0.1 +- GHC 9.2.1 - GHCup 0.1.17.3 - Jazzy 0.14.1 - Stack 2.7.3 -- SwiftFormat 0.48.17 +- SwiftFormat 0.48.18 - Swig 4.0.2 - Xcode Command Line Tools 13.0.0.0.1.1630607135 @@ -122,10 +122,11 @@ - SafariDriver 15.1 (16612.2.9.1.30) - Google Chrome 95.0.4638.69 - ChromeDriver 95.0.4638.54 -- Microsoft Edge 95.0.1020.38 -- MSEdgeDriver 95.0.1020.40 -- Mozilla Firefox 93.0 +- Microsoft Edge 95.0.1020.44 +- MSEdgeDriver 95.0.1020.44 +- Mozilla Firefox 94.0.1 - geckodriver 0.30.0 +- Selenium server 3.141.59_2 #### Environment variables | Name | Value | @@ -152,7 +153,7 @@ #### Python - 3.7.12 - 3.8.12 -- 3.9.7 +- 3.9.8 - 3.10.0 #### PyPy @@ -170,12 +171,12 @@ | Version | Architecture | Environment Variable | | ------- | ------------ | -------------------- | | 1.15.15 (Default) | x64 | GOROOT_1_15_X64 | -| 1.16.9 | x64 | GOROOT_1_16_X64 | -| 1.17.2 | x64 | GOROOT_1_17_X64 | +| 1.16.10 | x64 | GOROOT_1_16_X64 | +| 1.17.3 | x64 | GOROOT_1_17_X64 | ### Rust Tools - Cargo 1.56.0 -- Rust 1.56.0 -- Rustdoc 1.56.0 +- Rust 1.56.1 +- Rustdoc 1.56.1 - Rustup 1.24.3 #### Packages @@ -201,15 +202,16 @@ | Name | Version | ConfigFile | ServiceStatus | ListenPort | | ----- | ------- | ------------------------------- | ------------- | ---------- | | httpd | 2.4.51 | /usr/local/etc/httpd/httpd.conf | stopped | 80 | -| nginx | 1.21.3 | /usr/local/etc/nginx/nginx.conf | stopped | 80 | +| nginx | 1.21.4 | /usr/local/etc/nginx/nginx.conf | stopped | 80 | ### Xamarin #### Visual Studio for Mac -- 8.10.11.8 +- 8.10.12.16 #### Xamarin bundles | symlink | Xamarin.Mono | Xamarin.iOS | Xamarin.Mac | Xamarin.Android | | ----------------- | ------------ | ----------- | ----------- | --------------- | +| 6_12_11 | 6.12 | 15.2 | 8.2 | 12.0 | | 6_12_10 (default) | 6.12 | 15.0 | 7.14 | 11.3 | | 6_12_9 | 6.12 | 14.20 | 7.14 | 11.3 | | 6_12_8 | 6.12 | 14.16 | 7.10 | 11.2 | @@ -230,8 +232,8 @@ | -------------- | -------- | --------------------------------- | | 13.2 (beta) | 13C5066c | /Applications/Xcode_13.2.app | | 13.1 | 13A1030d | /Applications/Xcode_13.1.app | -| 13.0 (default) | 13A233 | /Applications/Xcode_13.0.app | | 13.0 (beta) | 13A5212g | /Applications/Xcode_13.0_beta.app | +| 13.0 (default) | 13A233 | /Applications/Xcode_13.0.app | | 12.5.1 | 12E507 | /Applications/Xcode_12.5.1.app | | 12.4 | 12D4e | /Applications/Xcode_12.4.app | | 11.7 | 11E801a | /Applications/Xcode_11.7.app | From 80864b592c90f34d511a0be71569516ff00cff58 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 10 Nov 2021 10:33:07 +0000 Subject: [PATCH 0707/3485] Updating readme file for ubuntu18 version 20211108.1 (#4441) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/linux/Ubuntu1804-README.md | 67 +++++++++++++++---------------- 1 file changed, 32 insertions(+), 35 deletions(-) diff --git a/images/linux/Ubuntu1804-README.md b/images/linux/Ubuntu1804-README.md index fe4fccda1682..d86caca25188 100644 --- a/images/linux/Ubuntu1804-README.md +++ b/images/linux/Ubuntu1804-README.md @@ -7,7 +7,7 @@ *** # Ubuntu 18.04.6 LTS - Linux kernel version: 5.4.0-1062-azure -- Image Version: 20211101.1 +- Image Version: 20211108.1 ## Installed Software ### Language and Runtime @@ -74,7 +74,7 @@ - Git-ftp 1.3.1 - Haveged 1.9.1 - Heroku 7.59.1 -- HHVM (HipHop VM) 4.133.0 +- HHVM (HipHop VM) 4.134.0 - jq 1.5 - Kind 0.11.1 - Kubectl 1.22.3 @@ -82,15 +82,15 @@ - Leiningen 2.9.7 - MediaInfo 17.12 - Mercurial 4.5.3 -- Minikube 1.23.2 +- Minikube 1.24.0 - Newman 5.3.0 - nvm 0.39.0 - OpenSSL 1.1.1 11 Sep 2018 -- Packer 1.7.7 +- Packer 1.7.8 - PhantomJS 2.1.1 - Podman 3.0.1 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- Pulumi 3.16.0 -- R 4.1.1 +- Pulumi 3.17.0 +- R 4.1.2 - Skopeo 1.2.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 - SVN 1.9.7 @@ -101,15 +101,15 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.97 -- AWS CLI 1.21.7 +- AWS CLI 1.21.12 - AWS CLI Session manager plugin 1.2.279.0 -- AWS SAM CLI 1.34.1 -- Azure CLI (azure-cli) 2.29.2 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) +- AWS SAM CLI 1.35.0 +- Azure CLI (azure-cli) 2.30.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.21.0 - GitHub CLI 2.2.0 -- Google Cloud SDK 362.0.0 (apt source repository: https://packages.cloud.google.com/apt) +- Google Cloud SDK 363.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 6.14.7 +- Netlify CLI 6.14.16 - OpenShift CLI 4.9.5 - ORAS CLI 0.12.0 - Vercel CLI 23.1.2 @@ -125,7 +125,7 @@ | Tool | Version | | -------- | ---------------------------------- | | PHP | 7.1.33 7.2.34 7.3.31 7.4.25 8.0.12 | -| Composer | 2.1.10 | +| Composer | 2.1.11 | | PHPUnit | 8.5.21 | ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. @@ -152,8 +152,8 @@ ### Browsers and Drivers - Google Chrome 95.0.4638.69 -- ChromeDriver 95.0.4638.54 -- Mozilla Firefox 93.0 +- ChromeDriver 95.0.4638.69 +- Mozilla Firefox 94.0 - Geckodriver 0.30.0 - Chromium 95.0.4638.0 - Selenium server 3.141.59 @@ -166,7 +166,7 @@ | SELENIUM_JAR_PATH | /usr/share/java/selenium-server-standalone.jar | ### .NET Core SDK -- 2.1.302 2.1.403 2.1.526 2.1.617 2.1.701 2.1.818 3.1.120 3.1.202 3.1.302 3.1.414 5.0.104 5.0.208 5.0.303 5.0.402 +- 2.1.302 2.1.403 2.1.526 2.1.617 2.1.701 2.1.818 3.1.120 3.1.202 3.1.302 3.1.414 3.1.415 5.0.104 5.0.208 5.0.303 5.0.402 5.0.403 ### Databases - MongoDB 5.0.3 (apt source repository: https://repo.mongodb.org/apt/ubuntu) @@ -186,11 +186,9 @@ ### Cached Tools #### Go -- 1.13.15 -- 1.14.15 - 1.15.15 -- 1.16.9 -- 1.17.2 +- 1.16.10 +- 1.17.3 #### Node.js - 10.24.1 @@ -208,7 +206,7 @@ - 3.6.15 - 3.7.12 - 3.8.12 -- 3.9.7 +- 3.9.8 - 3.10.0 #### Ruby @@ -221,14 +219,12 @@ #### Environment variables | Name | Value | Architecture | | --------------- | ----------------------------------- | ------------ | -| GOROOT_1_13_X64 | /opt/hostedtoolcache/go/1.13.15/x64 | x64 | -| GOROOT_1_14_X64 | /opt/hostedtoolcache/go/1.14.15/x64 | x64 | | GOROOT_1_15_X64 | /opt/hostedtoolcache/go/1.15.15/x64 | x64 | -| GOROOT_1_16_X64 | /opt/hostedtoolcache/go/1.16.9/x64 | x64 | -| GOROOT_1_17_X64 | /opt/hostedtoolcache/go/1.17.2/x64 | x64 | +| GOROOT_1_16_X64 | /opt/hostedtoolcache/go/1.16.10/x64 | x64 | +| GOROOT_1_17_X64 | /opt/hostedtoolcache/go/1.17.3/x64 | x64 | ### PowerShell Tools -- PowerShell 7.1.5 +- PowerShell 7.2.0 #### PowerShell Modules | Module | Version | @@ -263,12 +259,13 @@ | SDK Patch Applier v4 | 1 | #### Environment variables -| Name | Value | -| ---------------- | ------------------------------------------------------------------------------------ | -| ANDROID_HOME | /usr/local/lib/android/sdk | -| ANDROID_NDK_HOME | /usr/local/lib/android/sdk/ndk-bundle -> /usr/local/lib/android/sdk/ndk/21.4.7075529 | -| ANDROID_NDK_ROOT | /usr/local/lib/android/sdk/ndk-bundle -> /usr/local/lib/android/sdk/ndk/21.4.7075529 | -| ANDROID_SDK_ROOT | /usr/local/lib/android/sdk | +| Name | Value | +| ----------------------- | ------------------------------------------------------------------------------------ | +| ANDROID_HOME | /usr/local/lib/android/sdk | +| ANDROID_NDK_HOME | /usr/local/lib/android/sdk/ndk-bundle -> /usr/local/lib/android/sdk/ndk/21.4.7075529 | +| ANDROID_NDK_LATEST_HOME | /usr/local/lib/android/sdk/ndk/23.1.7779620 | +| ANDROID_NDK_ROOT | /usr/local/lib/android/sdk/ndk-bundle -> /usr/local/lib/android/sdk/ndk/21.4.7075529 | +| ANDROID_SDK_ROOT | /usr/local/lib/android/sdk | ### Cached Docker images | Repository:Tag | Digest | Created | @@ -282,15 +279,15 @@ | debian:10 | sha256:f9182ead292f45165f4a851e5ff98ea0800e172ccedce7d17764ffaae5ed4d6e | 2021-10-12 | | debian:11 | sha256:4d6ab716de467aad58e91b1b720f0badd7478847ec7a18f66027d0f8a329a43c | 2021-10-12 | | debian:9 | sha256:86269e614274db90a1d71dac258c74ed0a867a1d05f67dea6263b0f216ec7724 | 2021-10-12 | -| moby/buildkit:latest | sha256:94bc3a93cfa5197064cfdc86e4289cead7b46a2bc95874f142fbf51c67ad2826 | 2021-10-04 | +| moby/buildkit:latest | sha256:be268d9d1aa75a670a12417a17122eaaa889c036c465fb30dd010bccb88b35d1 | 2021-11-02 | | node:10 | sha256:59531d2835edd5161c8f9512f9e095b1836f7a1fcb0ab73e005ec46047384911 | 2021-04-10 | | node:10-alpine | sha256:dc98dac24efd4254f75976c40bce46944697a110d06ce7fa47e7268470cf2e28 | 2021-04-14 | | node:12 | sha256:15a9da96daf0609aee1b8971d3487095f0385d990e64f099684b5d9d8d711f4d | 2021-10-22 | -| node:12-alpine | sha256:88656c98cc43bafa6a517dfdb7b4945693c47ff7d0d24da2254a3174d308f93e | 2021-10-22 | +| node:12-alpine | sha256:1ecf7789a48e604a841409e65cf2e172d5a014ecd5e60689137d785d2613e9b0 | 2021-10-22 | | node:14 | sha256:ab6c8cd32006f8a4c1c795e55ddfbc7f54f5a3fb7318506ecb355cab8f5e7182 | 2021-10-22 | -| node:14-alpine | sha256:dc92f36e7cd917816fa2df041d4e9081453366381a00f40398d99e9392e78664 | 2021-10-22 | +| node:14-alpine | sha256:c346198378f78f8611254dce222e7e6635804e41e5203d1825321edd6c59dca1 | 2021-10-22 | | node:16 | sha256:683b8ea4ebc033a0f9060501fc31c1481d3f7232cc032851abbd8cc8d91fdff7 | 2021-10-27 | -| node:16-alpine | sha256:8f1827381eb7fca5a79ad21cb42e935546bedf67d9f668519a7db69d77d812bf | 2021-10-27 | +| node:16-alpine | sha256:3bca55259ada636e5fee8f2836aba7fa01fed7afd0652e12773ad44af95868b9 | 2021-10-27 | | ubuntu:16.04 | sha256:0f71fa8d4d2d4292c3c617fda2b36f6dabe5c8b6e34c3dc5b0d17d4e704bd39c | 2021-08-31 | | ubuntu:18.04 | sha256:0fedbd5bd9fb72089c7bbca476949e10593cebed9b1fb9edf5b79dbbacddd7d6 | 2021-10-01 | | ubuntu:20.04 | sha256:626ffe58f6e7566e00254b638eb7e0f3b11d4da9675088f4781a50ae288f3322 | 2021-10-16 | From 48df2547e74d473cf246408d01cf1c3290925aa8 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 10 Nov 2021 11:15:49 +0000 Subject: [PATCH 0708/3485] Updating readme file for macOS-10.15 version 20211106.1 (#4433) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/macos/macos-10.15-Readme.md | 53 +++++++++++++++--------------- 1 file changed, 26 insertions(+), 27 deletions(-) diff --git a/images/macos/macos-10.15-Readme.md b/images/macos/macos-10.15-Readme.md index 12a4e6eeefba..5522fa57cdde 100644 --- a/images/macos/macos-10.15-Readme.md +++ b/images/macos/macos-10.15-Readme.md @@ -9,7 +9,7 @@ # macOS 10.15 info - System Version: macOS 10.15.7 (19H1419) - Kernel Version: Darwin 19.6.0 -- Image Version: 20211029.1 +- Image Version: 20211106.1 ## Installed Software ### Language and Runtime @@ -19,10 +19,10 @@ - Clang/LLVM 13.0.0 is available on `'$(brew --prefix llvm)/bin/clang'` - gcc-9 (Homebrew GCC 9.4.0) 9.4.0 - available by `gcc-9` alias - gcc-10 (Homebrew GCC 10.3.0) 10.3.0 - available by `gcc-10` alias -- gcc-11 (Homebrew GCC 11.2.0) 11.2.0 - available by `gcc-11` alias +- gcc-11 (Homebrew GCC 11.2.0_1) 11.2.0 - available by `gcc-11` alias - GNU Fortran (Homebrew GCC 9.4.0) 9.4.0 - available by `gfortran-9` alias - GNU Fortran (Homebrew GCC 10.3.0) 10.3.0 - available by `gfortran-10` alias -- GNU Fortran (Homebrew GCC 11.2.0) 11.2.0 - available by `gfortran-11` alias +- GNU Fortran (Homebrew GCC 11.2.0_1) 11.2.0 - available by `gfortran-11` alias - Go 1.15.15 - julia 1.6.3 - Kotlin 1.5.31-release-548 @@ -34,15 +34,15 @@ - PHP 8.0.12 - Python 2.7.18 - Python 3.9.7 -- R 4.1.1 +- R 4.1.2 - Ruby 2.7.4p191 ### Package Management - Bundler version 2.2.30 - Carthage 0.38.0 - CocoaPods 1.11.2 -- Composer 2.1.9 -- Homebrew 3.3.1 +- Composer 2.1.11 +- Homebrew 3.3.2 - Miniconda 4.10.3 - NPM 6.14.15 - NuGet 5.9.0.7134 @@ -50,7 +50,7 @@ - Pip 21.2.4 (python 3.9) - Pipx 0.16.4 - RubyGems 3.2.30 -- Vcpkg 2021 (build from master \) +- Vcpkg 2021 (build from master \) - Yarn 1.22.15 #### Environment variables @@ -93,27 +93,27 @@ - Sox 14.4.2 - Subversion (SVN) 1.14.1 - Switchaudio-osx 1.1.0 -- Vagrant 2.2.18 +- Vagrant 2.2.19 - virtualbox 6.1.28r147628 - zstd 1.5.0 ### Tools -- Aliyun CLI 3.0.96 +- Aliyun CLI 3.0.97 - App Center CLI 2.10.4 -- AWS CLI 2.3.2 -- AWS SAM CLI 1.34.1 +- AWS CLI 2.3.4 +- AWS SAM CLI 1.35.0 - AWS Session Manager CLI 1.2.279.0 -- Azure CLI 2.29.2 +- Azure CLI 2.30.0 - Bicep CLI 0.4.1008 -- Cabal 3.4.1.0 +- Cabal 3.6.2.0 - Cmake 3.21.4 - Fastlane 2.197.0 -- GHC 9.0.1 +- GHC 9.2.1 - GHCup 0.1.17.3 - Jazzy 0.14.1 - Stack 2.7.3 -- SwiftFormat 0.48.17 +- SwiftFormat 0.48.18 - Swig 4.0.2 - Xcode Command Line Tools 12.4.0.0.1.1610135815 @@ -126,10 +126,11 @@ - SafariDriver 15.0 (15612.1.29.41.4) - Google Chrome 95.0.4638.69 - ChromeDriver 95.0.4638.54 -- Microsoft Edge 95.0.1020.38 -- MSEdgeDriver 95.0.1020.38 -- Mozilla Firefox 93.0 +- Microsoft Edge 95.0.1020.44 +- MSEdgeDriver 95.0.1020.44 +- Mozilla Firefox 94.0.1 - geckodriver 0.30.0 +- Selenium server 3.141.59_2 #### Environment variables | Name | Value | @@ -162,7 +163,7 @@ - 3.6.15 - 3.7.12 - 3.8.12 -- 3.9.7 +- 3.9.8 - 3.10.0 #### PyPy @@ -180,15 +181,13 @@ #### Go | Version | Architecture | Environment Variable | | ------- | ------------ | -------------------- | -| 1.13.15 | x64 | GOROOT_1_13_X64 | -| 1.14.15 | x64 | GOROOT_1_14_X64 | | 1.15.15 (Default) | x64 | GOROOT_1_15_X64 | -| 1.16.9 | x64 | GOROOT_1_16_X64 | -| 1.17.2 | x64 | GOROOT_1_17_X64 | +| 1.16.10 | x64 | GOROOT_1_16_X64 | +| 1.17.3 | x64 | GOROOT_1_17_X64 | ### Rust Tools - Cargo 1.56.0 -- Rust 1.56.0 -- Rustdoc 1.56.0 +- Rust 1.56.1 +- Rustdoc 1.56.1 - Rustup 1.24.3 #### Packages @@ -214,11 +213,11 @@ | Name | Version | ConfigFile | ServiceStatus | ListenPort | | ----- | ------- | ------------------------------- | ------------- | ---------- | | httpd | 2.4.51 | /usr/local/etc/httpd/httpd.conf | stopped | 80 | -| nginx | 1.21.3 | /usr/local/etc/nginx/nginx.conf | stopped | 80 | +| nginx | 1.21.4 | /usr/local/etc/nginx/nginx.conf | stopped | 80 | ### Xamarin #### Visual Studio for Mac -- 8.10.11.8 +- 8.10.12.16 #### Xamarin bundles | symlink | Xamarin.Mono | Xamarin.iOS | Xamarin.Mac | Xamarin.Android | From 4672cb208d045a5a6fb0083a0baed1da88af9e68 Mon Sep 17 00:00:00 2001 From: Bob Arnson Date: Wed, 10 Nov 2021 06:38:26 -0500 Subject: [PATCH 0709/3485] Add WiX v3 to Windows 2022. (#4448) Move WiX to tools and stop installing WiX Votive VSIX, which isn't needed for build. --- images/win/scripts/Installers/Install-Wix.ps1 | 22 +----------------- .../SoftwareReport.Generator.ps1 | 1 + .../SoftwareReport/SoftwareReport.Tools.psm1 | 6 +++++ .../SoftwareReport.VisualStudio.psm1 | 15 ------------ images/win/scripts/Tests/Tools.Tests.ps1 | 6 +++++ images/win/scripts/Tests/Wix.Tests.ps1 | 23 ------------------- images/win/windows2022.json | 1 + 7 files changed, 15 insertions(+), 59 deletions(-) delete mode 100644 images/win/scripts/Tests/Wix.Tests.ps1 diff --git a/images/win/scripts/Installers/Install-Wix.ps1 b/images/win/scripts/Installers/Install-Wix.ps1 index 192c19b42ca4..60d3e0e688ef 100644 --- a/images/win/scripts/Installers/Install-Wix.ps1 +++ b/images/win/scripts/Installers/Install-Wix.ps1 @@ -5,24 +5,4 @@ Choco-Install -PackageName wixtoolset -ArgumentList "--force" -if (Test-IsWin19) -{ - $extensionUrl = "https://wixtoolset.gallerycdn.vsassets.io/extensions/wixtoolset/wixtoolsetvisualstudio2019extension/1.0.0.4/1563296438961/Votive2019.vsix" - $VSver = "2019" -} -elseif (Test-IsWin16) -{ - $extensionUrl = "https://robmensching.gallerycdn.vsassets.io/extensions/robmensching/wixtoolsetvisualstudio2017extension/0.9.21.62588/1494013210879/250616/4/Votive2017.vsix" - $VSver = "2017" -} -else -{ - throw "Invalid version of Visual Studio is found. Either 2017 or 2019 are required" -} - -$extensionName = "Votive$VSver.vsix" - -#Installing VS extension 'Wix Toolset Visual Studio Extension' -Install-VsixExtension -Url $extensionUrl -Name $extensionName -VSversion $VSver - -Invoke-PesterTests -TestFile "Wix" +Invoke-PesterTests -TestFile "Tools" -TestName "WiX" diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index d6fcbf754a8b..69537a437d0a 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -121,6 +121,7 @@ $toolsList = @( (Get-VSWhereVersion), (Get-SwigVersion), (Get-WinAppDriver), + (Get-WixVersion), (Get-ZstdVersion), (Get-YAMLLintVersion) ) diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 index 185c0b6769b6..9456bf567edb 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 @@ -156,6 +156,12 @@ function Get-WinAppDriver { return "WinAppDriver $winAppDriverVersion" } +function Get-WixVersion { + $regKey = "HKLM:\Software\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall\*" + $installedApplications = Get-ItemProperty -Path $regKey + return ($installedApplications | Where-Object { $_.BundleCachePath -imatch ".*\\WiX\d*\.exe$" } | Select-Object -First 1).DisplayName +} + function Get-ZstdVersion { $(zstd --version) -match "v(?\d+\.\d+\.\d+)" | Out-Null $zstdVersion = $Matches.Version diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.VisualStudio.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.VisualStudio.psm1 index 341c5dc4419f..37a8825595cf 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.VisualStudio.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.VisualStudio.psm1 @@ -13,12 +13,6 @@ function Get-SDKVersion { ($installedApplications | Where-Object { $_.DisplayName -eq 'Windows SDK' } | Select-Object -First 1).DisplayVersion } -function Get-WixVersion { - $regKey = "HKLM:\Software\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall\*" - $installedApplications = Get-ItemProperty -Path $regKey - ($installedApplications | Where-Object { $_.DisplayName -match "wix" } | Select-Object -First 1).DisplayVersion -} - function Get-WDKVersion { $regKey = "HKLM:\Software\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall\*" $installedApplications = Get-ItemProperty -Path $regKey @@ -67,14 +61,6 @@ function Get-VisualStudioExtensions { } if ((Test-IsWin16) -or (Test-IsWin19)) { - # Wix - $wixPackageVersion = Get-WixVersion - $wixExtensionVersion = ($vsPackages | Where-Object {$_.Id -match 'WixToolset.VisualStudioExtension.Dev' -and $_.type -eq 'vsix'}).Version - $wixPackages = @( - @{Package = 'WIX Toolset'; Version = $wixPackageVersion} - @{Package = "WIX Toolset Studio $vs Extension"; Version = $wixExtensionVersion} - ) - # WDK $wdkPackageVersion = Get-VSExtensionVersion -packageName 'Microsoft.Windows.DriverKit' $wdkExtensionVersion = Get-WDKVersion @@ -89,7 +75,6 @@ function Get-VisualStudioExtensions { $vsixs $ssdtPackages $sdkPackages - $wixPackages $wdkPackages ) diff --git a/images/win/scripts/Tests/Tools.Tests.ps1 b/images/win/scripts/Tests/Tools.Tests.ps1 index 5bf24fb51674..c5578bffd4ed 100644 --- a/images/win/scripts/Tests/Tools.Tests.ps1 +++ b/images/win/scripts/Tests/Tools.Tests.ps1 @@ -187,6 +187,12 @@ Describe "WebPlatformInstaller" -Skip:(Test-IsWin22) { } } +Describe "WiX" { + It "WiX directory exists" { + $env:WIX | Should -Exist + } +} + Describe "Zstd" { It "zstd" { "zstd -V" | Should -ReturnZeroExitCode diff --git a/images/win/scripts/Tests/Wix.Tests.ps1 b/images/win/scripts/Tests/Wix.Tests.ps1 deleted file mode 100644 index ed9bed384e21..000000000000 --- a/images/win/scripts/Tests/Wix.Tests.ps1 +++ /dev/null @@ -1,23 +0,0 @@ -Describe "Wix" -Skip:(Test-IsWin22) { - BeforeAll { - $regKey = "HKLM:\Software\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall\*" - $installedApplications = Get-ItemProperty -Path $regKey - $version = ($installedApplications | Where-Object { $_.DisplayName -and $_.DisplayName.toLower().Contains("wix") } | Select-Object -First 1).DisplayVersion - } - - It "Wix Toolset version from registry" { - $version | Should -Not -BeNullOrEmpty - } - - It "Wix Toolset version from system" { - if (Test-IsWin19) - { - $exVersion = Get-VSExtensionVersion -packageName "WixToolset.VisualStudioExtension.Dev16" - } - else - { - $exVersion = Get-VSExtensionVersion -packageName "WixToolset.VisualStudioExtension.Dev15" - } - $exVersion | Should -Not -BeNullOrEmpty - } -} diff --git a/images/win/windows2022.json b/images/win/windows2022.json index 69068512e201..334e4b7e44c0 100644 --- a/images/win/windows2022.json +++ b/images/win/windows2022.json @@ -168,6 +168,7 @@ { "type": "powershell", "scripts": [ + "{{ template_dir }}/scripts/Installers/Install-Wix.ps1", "{{ template_dir }}/scripts/Installers/Install-Vsix.ps1", "{{ template_dir }}/scripts/Installers/Install-AzureCli.ps1", "{{ template_dir }}/scripts/Installers/Install-AzureDevOpsCli.ps1", From 4f8049546ee84b94b4fe947bab7fa9558b34b195 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 10 Nov 2021 12:35:07 +0000 Subject: [PATCH 0710/3485] Updating readme file for ubuntu20 version 20211108.1 (#4440) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/linux/Ubuntu2004-README.md | 52 +++++++++++++++---------------- 1 file changed, 25 insertions(+), 27 deletions(-) diff --git a/images/linux/Ubuntu2004-README.md b/images/linux/Ubuntu2004-README.md index c482909720d6..170a1b16fa7e 100644 --- a/images/linux/Ubuntu2004-README.md +++ b/images/linux/Ubuntu2004-README.md @@ -7,7 +7,7 @@ *** # Ubuntu 20.04.3 LTS - Linux kernel version: 5.11.0-1020-azure -- Image Version: 20211101.1 +- Image Version: 20211108.1 ## Installed Software ### Language and Runtime @@ -76,7 +76,7 @@ - Git-ftp 1.6.0 - Haveged 1.9.1 - Heroku 7.59.1 -- HHVM (HipHop VM) 4.133.0 +- HHVM (HipHop VM) 4.134.0 - jq 1.6 - Kind 0.11.1 - Kubectl 1.22.3 @@ -84,15 +84,15 @@ - Leiningen 2.9.7 - MediaInfo 19.09 - Mercurial 5.3.1 -- Minikube 1.23.2 +- Minikube 1.24.0 - Newman 5.3.0 - nvm 0.39.0 - OpenSSL 1.1.1f 31 Mar 2020 -- Packer 1.7.7 +- Packer 1.7.8 - PhantomJS 2.1.1 - Podman 3.3.1 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- Pulumi 3.16.0 -- R 4.1.1 +- Pulumi 3.17.0 +- R 4.1.2 - Skopeo 1.3.0 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 @@ -103,15 +103,15 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.97 -- AWS CLI 2.3.2 +- AWS CLI 2.3.4 - AWS CLI Session manager plugin 1.2.279.0 -- AWS SAM CLI 1.34.1 -- Azure CLI (azure-cli) 2.29.2 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) +- AWS SAM CLI 1.35.0 +- Azure CLI (azure-cli) 2.30.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.21.0 - GitHub CLI 2.2.0 -- Google Cloud SDK 362.0.0 (apt source repository: https://packages.cloud.google.com/apt) +- Google Cloud SDK 363.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 6.14.7 +- Netlify CLI 6.14.16 - OpenShift CLI 4.9.5 - ORAS CLI 0.12.0 - Vercel CLI 23.1.2 @@ -131,7 +131,7 @@ | Tool | Version | | -------- | ------------- | | PHP | 7.4.25 8.0.12 | -| Composer | 2.1.10 | +| Composer | 2.1.11 | | PHPUnit | 8.5.21 | ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. @@ -158,8 +158,8 @@ ### Browsers and Drivers - Google Chrome 95.0.4638.69 -- ChromeDriver 95.0.4638.54 -- Mozilla Firefox 93.0 +- ChromeDriver 95.0.4638.69 +- Mozilla Firefox 94.0 - Geckodriver 0.30.0 - Chromium 95.0.4638.0 - Selenium server 3.141.59 @@ -172,7 +172,7 @@ | SELENIUM_JAR_PATH | /usr/share/java/selenium-server-standalone.jar | ### .NET Core SDK -- 2.1.302 2.1.403 2.1.526 2.1.617 2.1.701 2.1.818 3.1.120 3.1.202 3.1.302 3.1.414 5.0.104 5.0.208 5.0.303 5.0.402 +- 2.1.302 2.1.403 2.1.526 2.1.617 2.1.701 2.1.818 3.1.120 3.1.202 3.1.302 3.1.414 3.1.415 5.0.104 5.0.208 5.0.303 5.0.402 5.0.403 ### Databases - MongoDB 5.0.3 (apt source repository: https://repo.mongodb.org/apt/ubuntu) @@ -192,10 +192,9 @@ ### Cached Tools #### Go -- 1.14.15 - 1.15.15 -- 1.16.9 -- 1.17.2 +- 1.16.10 +- 1.17.3 #### Node.js - 10.24.1 @@ -215,7 +214,7 @@ - 3.6.15 - 3.7.12 - 3.8.12 -- 3.9.7 +- 3.9.8 - 3.10.0 #### Ruby @@ -227,13 +226,12 @@ #### Environment variables | Name | Value | Architecture | | --------------- | ----------------------------------- | ------------ | -| GOROOT_1_14_X64 | /opt/hostedtoolcache/go/1.14.15/x64 | x64 | | GOROOT_1_15_X64 | /opt/hostedtoolcache/go/1.15.15/x64 | x64 | -| GOROOT_1_16_X64 | /opt/hostedtoolcache/go/1.16.9/x64 | x64 | -| GOROOT_1_17_X64 | /opt/hostedtoolcache/go/1.17.2/x64 | x64 | +| GOROOT_1_16_X64 | /opt/hostedtoolcache/go/1.16.10/x64 | x64 | +| GOROOT_1_17_X64 | /opt/hostedtoolcache/go/1.17.3/x64 | x64 | ### PowerShell Tools -- PowerShell 7.1.5 +- PowerShell 7.2.0 #### PowerShell Modules | Module | Version | @@ -289,15 +287,15 @@ | debian:10 | sha256:f9182ead292f45165f4a851e5ff98ea0800e172ccedce7d17764ffaae5ed4d6e | 2021-10-12 | | debian:11 | sha256:4d6ab716de467aad58e91b1b720f0badd7478847ec7a18f66027d0f8a329a43c | 2021-10-12 | | debian:9 | sha256:86269e614274db90a1d71dac258c74ed0a867a1d05f67dea6263b0f216ec7724 | 2021-10-12 | -| moby/buildkit:latest | sha256:94bc3a93cfa5197064cfdc86e4289cead7b46a2bc95874f142fbf51c67ad2826 | 2021-10-04 | +| moby/buildkit:latest | sha256:be268d9d1aa75a670a12417a17122eaaa889c036c465fb30dd010bccb88b35d1 | 2021-11-02 | | node:10 | sha256:59531d2835edd5161c8f9512f9e095b1836f7a1fcb0ab73e005ec46047384911 | 2021-04-10 | | node:10-alpine | sha256:dc98dac24efd4254f75976c40bce46944697a110d06ce7fa47e7268470cf2e28 | 2021-04-14 | | node:12 | sha256:15a9da96daf0609aee1b8971d3487095f0385d990e64f099684b5d9d8d711f4d | 2021-10-22 | -| node:12-alpine | sha256:88656c98cc43bafa6a517dfdb7b4945693c47ff7d0d24da2254a3174d308f93e | 2021-10-22 | +| node:12-alpine | sha256:1ecf7789a48e604a841409e65cf2e172d5a014ecd5e60689137d785d2613e9b0 | 2021-10-22 | | node:14 | sha256:ab6c8cd32006f8a4c1c795e55ddfbc7f54f5a3fb7318506ecb355cab8f5e7182 | 2021-10-22 | -| node:14-alpine | sha256:dc92f36e7cd917816fa2df041d4e9081453366381a00f40398d99e9392e78664 | 2021-10-22 | +| node:14-alpine | sha256:c346198378f78f8611254dce222e7e6635804e41e5203d1825321edd6c59dca1 | 2021-10-22 | | node:16 | sha256:683b8ea4ebc033a0f9060501fc31c1481d3f7232cc032851abbd8cc8d91fdff7 | 2021-10-27 | -| node:16-alpine | sha256:8f1827381eb7fca5a79ad21cb42e935546bedf67d9f668519a7db69d77d812bf | 2021-10-27 | +| node:16-alpine | sha256:3bca55259ada636e5fee8f2836aba7fa01fed7afd0652e12773ad44af95868b9 | 2021-10-27 | | ubuntu:16.04 | sha256:0f71fa8d4d2d4292c3c617fda2b36f6dabe5c8b6e34c3dc5b0d17d4e704bd39c | 2021-08-31 | | ubuntu:18.04 | sha256:0fedbd5bd9fb72089c7bbca476949e10593cebed9b1fb9edf5b79dbbacddd7d6 | 2021-10-01 | | ubuntu:20.04 | sha256:626ffe58f6e7566e00254b638eb7e0f3b11d4da9675088f4781a50ae288f3322 | 2021-10-16 | From 44b6734000ba85855054c3f47c3e92840c14a59b Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Wed, 10 Nov 2021 17:11:29 +0300 Subject: [PATCH 0711/3485] Remove Xcode13 beta & set Xcode 13.1 as default (#4456) --- images/macos/toolsets/toolset-11.json | 3 +-- images/macos/toolsets/toolset-12.json | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index 89479c683535..a6f4a9a52da7 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -1,11 +1,10 @@ { "xcode": { - "default": "13.0", + "default": "13.1", "versions": [ { "link": "13.2", "version": "13.2.0" }, { "link": "13.1", "version": "13.1.0" }, { "link": "13.0", "version": "13.0.0" }, - { "link": "13.0_beta", "version": "13 beta 5", "skip-symlink": "true" }, { "link": "12.5.1", "version": "12.5.1", "symlinks": ["12.5"] }, { "link": "12.4", "version": "12.4.0" }, { "link": "11.7", "version": "11.7.0", "symlinks": ["11.7_beta"] } diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index 11f3a7ea9e7d..628238cfaa13 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -3,8 +3,7 @@ "default": "13.1", "versions": [ { "link": "13.2", "version": "13.2.0" }, - { "link": "13.1", "version": "13.1.0" }, - { "link": "13.0", "version": "13.0.0"} + { "link": "13.1", "version": "13.1.0" } ] }, "xamarin": { From 41c947a8f0baf60cb18061d8ce66682079790598 Mon Sep 17 00:00:00 2001 From: Maksim Shilov <89912354+shilovmaksim@users.noreply.github.com> Date: Wed, 10 Nov 2021 19:30:25 +0300 Subject: [PATCH 0712/3485] [Ubuntu] Pin MongoDB to the specific version defined in the toolset (#4447) --- images/linux/scripts/installers/mongodb.sh | 12 ++++++++---- images/linux/scripts/tests/Databases.Tests.ps1 | 3 ++- images/linux/toolsets/toolset-1804.json | 5 ++++- images/linux/toolsets/toolset-2004.json | 5 ++++- 4 files changed, 18 insertions(+), 7 deletions(-) diff --git a/images/linux/scripts/installers/mongodb.sh b/images/linux/scripts/installers/mongodb.sh index fd7287c46aa4..524a211c301e 100644 --- a/images/linux/scripts/installers/mongodb.sh +++ b/images/linux/scripts/installers/mongodb.sh @@ -6,17 +6,21 @@ # Source the helpers source $HELPER_SCRIPTS/os.sh +source $HELPER_SCRIPTS/install.sh REPO_URL="https://repo.mongodb.org/apt/ubuntu" +osLabel=$(getOSVersionLabel) +toolsetVersion=$(get_toolset_value '.mongodb.version') +latestVersion=$(curl $REPO_URL/dists/$osLabel/mongodb-org/ | awk -F'>|<' '{print $3}' | grep "^$toolsetVersion" | tail -1) # Install Mongo DB -wget -qO - https://www.mongodb.org/static/pgp/server-5.0.asc | sudo apt-key add - -version=$(getOSVersionLabel) -echo "deb [ arch=amd64,arm64 ] $REPO_URL $version/mongodb-org/5.0 multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-org-5.0.list +wget -qO - https://www.mongodb.org/static/pgp/server-$latestVersion.asc | sudo apt-key add - + +echo "deb [ arch=amd64,arm64 ] $REPO_URL $osLabel/mongodb-org/$latestVersion multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-org-$latestVersion.list sudo apt-get update sudo apt-get install -y mongodb-org -rm /etc/apt/sources.list.d/mongodb-org-5.0.list +rm /etc/apt/sources.list.d/mongodb-org-$latestVersion.list echo "mongodb $REPO_URL" >> $HELPER_SCRIPTS/apt-sources.txt diff --git a/images/linux/scripts/tests/Databases.Tests.ps1 b/images/linux/scripts/tests/Databases.Tests.ps1 index 9259c5a8fec2..6477a04e9f79 100644 --- a/images/linux/scripts/tests/Databases.Tests.ps1 +++ b/images/linux/scripts/tests/Databases.Tests.ps1 @@ -3,7 +3,8 @@ Describe "MongoDB" { @{ ToolName = "mongo" } @{ ToolName = "mongod" } ) { - "$ToolName --version" | Should -ReturnZeroExitCode + $toolsetVersion = (Get-ToolsetContent).mongodb.version + (&$ToolName --version)[2].Split('"')[-2] | Should -BeLike "$toolsetVersion*" } } diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index a61977a6f7ac..6f6887878fe9 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -329,5 +329,8 @@ "name": "yarn", "command": "yarn" } - ] + ], + "mongodb": { + "version": "5" + } } diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index 11ff9178b2be..c6b297bb4c57 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -334,5 +334,8 @@ "name": "yarn", "command": "yarn" } - ] + ], + "mongodb": { + "version": "5" + } } From 596859266ef6bec991a12569c99ba905ba825e1c Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Wed, 10 Nov 2021 20:56:23 +0300 Subject: [PATCH 0713/3485] Remove node10 docker images from ubuntu toolsets (#4461) --- images/linux/toolsets/toolset-1804.json | 2 -- images/linux/toolsets/toolset-2004.json | 2 -- 2 files changed, 4 deletions(-) diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index 6f6887878fe9..c40cda7d34f2 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -215,11 +215,9 @@ "debian:10", "debian:11", "moby/buildkit:latest", - "node:10", "node:12", "node:14", "node:16", - "node:10-alpine", "node:12-alpine", "node:14-alpine", "node:16-alpine", diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index c6b297bb4c57..171e48efca30 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -215,11 +215,9 @@ "debian:10", "debian:11", "moby/buildkit:latest", - "node:10", "node:12", "node:14", "node:16", - "node:10-alpine", "node:12-alpine", "node:14-alpine", "node:16-alpine", From fef060bec8f22cec3ebe76a37cdd4b2defa1cfb9 Mon Sep 17 00:00:00 2001 From: Maksim Shilov <89912354+shilovmaksim@users.noreply.github.com> Date: Wed, 10 Nov 2021 21:43:42 +0300 Subject: [PATCH 0714/3485] [Windows] Pin MongoDB to the specific version defined in the toolset (#4418) --- .../win/scripts/ImageHelpers/ChocoHelpers.ps1 | 32 +++++++++++++++++++ .../scripts/ImageHelpers/ImageHelpers.psm1 | 2 ++ .../scripts/Installers/Install-MongoDB.ps1 | 4 ++- images/win/scripts/Tests/Databases.Tests.ps1 | 3 +- images/win/toolsets/toolset-2016.json | 3 ++ images/win/toolsets/toolset-2019.json | 3 ++ images/win/toolsets/toolset-2022.json | 3 ++ 7 files changed, 48 insertions(+), 2 deletions(-) diff --git a/images/win/scripts/ImageHelpers/ChocoHelpers.ps1 b/images/win/scripts/ImageHelpers/ChocoHelpers.ps1 index 16956654b276..6089c3924410 100644 --- a/images/win/scripts/ImageHelpers/ChocoHelpers.ps1 +++ b/images/win/scripts/ImageHelpers/ChocoHelpers.ps1 @@ -29,4 +29,36 @@ function Choco-Install { } } } +} + +function Send-RequestToCocolateyPackages { + param( + [Parameter(Mandatory)] + [string] $FilterQuery, + [string] $Url = "https://community.chocolatey.org/api", + [int] $ApiVersion = 2 + ) + + $response = Invoke-RestMethod "$Url/v$ApiVersion/Packages()?$filterQuery" + + return $response +} + +function Get-LatestChocoPackageVersion { + param( + [Parameter(Mandatory)] + [string] $PackageName, + [Parameter(Mandatory)] + [string] $TargetVersion + ) + + $versionNumbers = $TargetVersion.Split(".") + [int]$versionNumbers[-1] += 1 + $incrementedVersion = $versionNumbers -join "." + $filterQuery = "`$filter=(Id eq '$PackageName') and (IsPrerelease eq false) and (Version ge '$TargetVersion') and (Version lt '$incrementedVersion')" + $latestVersion = (Send-RequestToCocolateyPackages -FilterQuery $filterQuery).properties.Version | + Sort-Object {[version]$_} | + Select-Object -Last 1 + + return $latestVersion } \ No newline at end of file diff --git a/images/win/scripts/ImageHelpers/ImageHelpers.psm1 b/images/win/scripts/ImageHelpers/ImageHelpers.psm1 index 5eed2299056f..5beeef1ff10c 100644 --- a/images/win/scripts/ImageHelpers/ImageHelpers.psm1 +++ b/images/win/scripts/ImageHelpers/ImageHelpers.psm1 @@ -29,6 +29,8 @@ Export-ModuleMember -Function @( 'Test-IsWin19' 'Test-IsWin16' 'Choco-Install' + 'Send-RequestToCocolateyPackages' + 'Get-LatestChocoPackageVersion' 'Extract-7Zip' 'Get-CommandResult' 'Get-WhichTool' diff --git a/images/win/scripts/Installers/Install-MongoDB.ps1 b/images/win/scripts/Installers/Install-MongoDB.ps1 index 177300e972fe..8f4a97786003 100644 --- a/images/win/scripts/Installers/Install-MongoDB.ps1 +++ b/images/win/scripts/Installers/Install-MongoDB.ps1 @@ -3,7 +3,9 @@ ## Desc: Install MongoDB #################################################################################### -Choco-Install -PackageName mongodb +$toolsetVersion = (Get-ToolsetContent).mongodb.version +$latestChocoPackage = Get-LatestChocoPackageVersion -TargetVersion $toolsetVersion -PackageName "mongodb" +Choco-Install -PackageName mongodb -ArgumentList "--version $latestChocoPackage" $mongoPath = (Get-CimInstance Win32_Service -Filter "Name LIKE 'mongodb'").PathName $mongoBin = Split-Path -Path $mongoPath.split('"')[1] Add-MachinePathItem "$mongoBin" diff --git a/images/win/scripts/Tests/Databases.Tests.ps1 b/images/win/scripts/Tests/Databases.Tests.ps1 index bf478c52aaf0..6213d7f2e95b 100644 --- a/images/win/scripts/Tests/Databases.Tests.ps1 +++ b/images/win/scripts/Tests/Databases.Tests.ps1 @@ -3,7 +3,8 @@ Describe "MongoDB" { @{ ToolName = "mongo" } @{ ToolName = "mongod" } ) { - "$ToolName --version" | Should -ReturnZeroExitCode + $toolsetVersion = (Get-ToolsetContent).mongodb.version + (&$ToolName --version)[2].Split('"')[-2] | Should -BeLike "$toolsetVersion*" } } diff --git a/images/win/toolsets/toolset-2016.json b/images/win/toolsets/toolset-2016.json index 72b6492a6fd3..3ec118d625a5 100644 --- a/images/win/toolsets/toolset-2016.json +++ b/images/win/toolsets/toolset-2016.json @@ -422,5 +422,8 @@ }, "node": { "default": "14" + }, + "mongodb": { + "version": "5" } } diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index ac2f170cba17..0f30286b24ba 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -454,5 +454,8 @@ }, "node": { "default": "14" + }, + "mongodb": { + "version": "5" } } diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index b5ef50eebc63..bddcdec996d4 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -304,5 +304,8 @@ }, "node": { "default": "14" + }, + "mongodb": { + "version": "5" } } From 9ebc095c4af0de3f5ccba03e780ad49a5221f967 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Thu, 11 Nov 2021 11:23:05 +0300 Subject: [PATCH 0715/3485] [macOS] move llvm to toolset (#4457) --- images/macos/provision/core/commonutils.sh | 4 ++-- images/macos/provision/core/llvm.sh | 8 ++++++++ images/macos/templates/macOS-10.15.json | 1 + images/macos/templates/macOS-11.json | 3 ++- images/macos/templates/macOS-11.pkr.hcl | 1 + images/macos/tests/BasicTools.Tests.ps1 | 7 ------- images/macos/tests/LLVM.Tests.ps1 | 9 +++++++++ images/macos/toolsets/toolset-10.15.json | 4 +++- images/macos/toolsets/toolset-11.json | 4 +++- 9 files changed, 29 insertions(+), 12 deletions(-) create mode 100644 images/macos/provision/core/llvm.sh create mode 100644 images/macos/tests/LLVM.Tests.ps1 diff --git a/images/macos/provision/core/commonutils.sh b/images/macos/provision/core/commonutils.sh index 0f046e6996d8..a91554f686d8 100644 --- a/images/macos/provision/core/commonutils.sh +++ b/images/macos/provision/core/commonutils.sh @@ -2,8 +2,8 @@ source ~/utils/utils.sh # Monterey needs future review: -# Llvm, aliyun-cli, gnupg, helm have issues with building from the source code. -# Added gmp for now, because toolcache ruby needs its libs. Remove it when php starts to build from source code. +# aliyun-cli, gnupg, helm have issues with building from the source code. +# Added gmp for now, because toolcache ruby needs its libs. Remove it when php starts to build from source code. common_packages=$(get_toolset_value '.brew.common_packages[]') for package in $common_packages; do echo "Installing $package..." diff --git a/images/macos/provision/core/llvm.sh b/images/macos/provision/core/llvm.sh new file mode 100644 index 000000000000..ff1aa683ff2c --- /dev/null +++ b/images/macos/provision/core/llvm.sh @@ -0,0 +1,8 @@ +#!/bin/bash -e -o pipefail +source ~/utils/utils.sh + +llvmVersion=$(get_toolset_value '.llvm.version') + +brew_smart_install "llvm@${llvmVersion}" + +invoke_tests "LLVM" \ No newline at end of file diff --git a/images/macos/templates/macOS-10.15.json b/images/macos/templates/macOS-10.15.json index 6c07559e3c15..d6f57c07f8fb 100644 --- a/images/macos/templates/macOS-10.15.json +++ b/images/macos/templates/macOS-10.15.json @@ -160,6 +160,7 @@ "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}", "scripts": [ "./provision/core/commonutils.sh", + "./provision/core/llvm.sh", "./provision/core/golang.sh", "./provision/core/swiftlint.sh", "./provision/core/openjdk.sh", diff --git a/images/macos/templates/macOS-11.json b/images/macos/templates/macOS-11.json index b564327a37b7..bebcfc2d7626 100644 --- a/images/macos/templates/macOS-11.json +++ b/images/macos/templates/macOS-11.json @@ -165,6 +165,7 @@ "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}", "scripts": [ "./provision/core/commonutils.sh", + "./provision/core/llvm.sh", "./provision/core/golang.sh", "./provision/core/swiftlint.sh", "./provision/core/openjdk.sh", @@ -198,7 +199,7 @@ { "type": "shell", "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} pwsh -f {{ .Path }}", - "scripts": [ + "scripts": [ "./provision/core/toolset.ps1", "./provision/core/configure-toolset.ps1" ] diff --git a/images/macos/templates/macOS-11.pkr.hcl b/images/macos/templates/macOS-11.pkr.hcl index 7cc739a8201a..7e44532a391b 100644 --- a/images/macos/templates/macOS-11.pkr.hcl +++ b/images/macos/templates/macOS-11.pkr.hcl @@ -163,6 +163,7 @@ build { provisioner "shell" { scripts = [ "./provision/core/commonutils.sh", + "./provision/core/llvm.sh", "./provision/core/golang.sh", "./provision/core/swiftlint.sh", "./provision/core/openjdk.sh", diff --git a/images/macos/tests/BasicTools.Tests.ps1 b/images/macos/tests/BasicTools.Tests.ps1 index 8fdd2bdb2034..4389c89e60a5 100644 --- a/images/macos/tests/BasicTools.Tests.ps1 +++ b/images/macos/tests/BasicTools.Tests.ps1 @@ -30,19 +30,12 @@ Describe "SwiftFormat" -Skip:($os.IsMonterey) { } } - Describe "GnuPG" -Skip:($os.IsMonterey) { It "GnuPG" { "gpg --version" | Should -ReturnZeroExitCode } } -Describe "Clang/LLVM" -Skip:($os.IsMonterey) { - It "Clang/LLVM is installed" { - "$(brew --prefix llvm)/bin/clang --version" | Should -ReturnZeroExitCode - } -} - Describe "zstd" { It "zstd" { "zstd --version" | Should -ReturnZeroExitCode diff --git a/images/macos/tests/LLVM.Tests.ps1 b/images/macos/tests/LLVM.Tests.ps1 new file mode 100644 index 000000000000..75b67e9c4cfc --- /dev/null +++ b/images/macos/tests/LLVM.Tests.ps1 @@ -0,0 +1,9 @@ +$os = Get-OSVersion + +Describe "Clang/LLVM" -Skip:($os.IsMonterey) { + It "Clang/LLVM is installed and version is correct" { + $toolsetVersion = Get-ToolsetValue 'llvm.version' + $clangVersion = & "$(brew --prefix llvm)/bin/clang" --version + $clangVersion[0] | Should -BeLike "*${toolsetVersion}*" + } +} \ No newline at end of file diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index 5aa1f47e8ff0..8b80a88ce6fe 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -215,7 +215,6 @@ "helm", "kotlin", "libpq", - "llvm", "p7zip", "packer", "parallel", @@ -339,5 +338,8 @@ "12", "14" ] + }, + "llvm": { + "version": "13" } } diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index a6f4a9a52da7..45b784a75788 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -176,7 +176,6 @@ "helm", "kotlin", "libpq", - "llvm", "p7zip", "packer", "perl", @@ -291,5 +290,8 @@ "12", "14" ] + }, + "llvm": { + "version": "13" } } From 63998e0de13d4a17ea3e28d8e325281219ac38ae Mon Sep 17 00:00:00 2001 From: Dibir Magomedsaygitov <61747324+dibir-magomedsaygitov@users.noreply.github.com> Date: Thu, 11 Nov 2021 11:53:00 +0300 Subject: [PATCH 0716/3485] upgrade selenium version from 3 to 4 (#4472) --- images/linux/toolsets/toolset-1804.json | 4 ++-- images/linux/toolsets/toolset-2004.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index c40cda7d34f2..304927cd722f 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -275,8 +275,8 @@ ] }, "selenium": { - "version": "3", - "binary_name": "selenium-server-standalone" + "version": "4", + "binary_name": "selenium-server" }, "rubygems": [], "node": { diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index 171e48efca30..2231c26f553f 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -277,8 +277,8 @@ {"name": "fastlane"} ], "selenium": { - "version": "3", - "binary_name": "selenium-server-standalone" + "version": "4", + "binary_name": "selenium-server" }, "node": { "default": "14" From 206a8183190e81d3266084457e619553551c1252 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Thu, 11 Nov 2021 00:54:32 -0800 Subject: [PATCH 0717/3485] Perform a full clone of vcpkg instead of depth=1 (#4272) The vcpkg versioning feature relies on retrieving information from its git repository history. This means users need a deep clone. --- images/linux/scripts/installers/vcpkg.sh | 2 +- images/win/scripts/Installers/Install-Vcpkg.ps1 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/images/linux/scripts/installers/vcpkg.sh b/images/linux/scripts/installers/vcpkg.sh index 5d609fecdef0..731de8b1b432 100644 --- a/images/linux/scripts/installers/vcpkg.sh +++ b/images/linux/scripts/installers/vcpkg.sh @@ -9,7 +9,7 @@ VCPKG_INSTALLATION_ROOT=/usr/local/share/vcpkg echo "VCPKG_INSTALLATION_ROOT=${VCPKG_INSTALLATION_ROOT}" | tee -a /etc/environment # Install vcpkg -git clone --depth=1 https://github.com/Microsoft/vcpkg $VCPKG_INSTALLATION_ROOT +git clone https://github.com/Microsoft/vcpkg $VCPKG_INSTALLATION_ROOT $VCPKG_INSTALLATION_ROOT/bootstrap-vcpkg.sh $VCPKG_INSTALLATION_ROOT/vcpkg integrate install diff --git a/images/win/scripts/Installers/Install-Vcpkg.ps1 b/images/win/scripts/Installers/Install-Vcpkg.ps1 index 4360b2d35e46..76e7d24f577c 100644 --- a/images/win/scripts/Installers/Install-Vcpkg.ps1 +++ b/images/win/scripts/Installers/Install-Vcpkg.ps1 @@ -7,7 +7,7 @@ $Uri = 'https://github.com/Microsoft/vcpkg.git' $InstallDir = 'C:\vcpkg' $VcpkgExecPath = 'vcpkg.exe' -git clone --depth=1 $Uri $InstallDir -q +git clone $Uri $InstallDir -q # Build and integrate vcpkg Invoke-Expression "$InstallDir\bootstrap-vcpkg.bat" From 71b8207a59daabf4dad48777bcdeaaf57d354619 Mon Sep 17 00:00:00 2001 From: Nikolay Frolov <90333448+nikolai-frolov@users.noreply.github.com> Date: Thu, 11 Nov 2021 12:47:29 +0300 Subject: [PATCH 0718/3485] [Ubuntu] Change source of n tool to official (#4455) --- .../scripts/SoftwareReport/SoftwareReport.Generator.ps1 | 1 + .../linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 | 5 +++++ images/linux/scripts/installers/nodejs.sh | 5 ++--- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index c11f0031cd9b..9c6c32dd4ddf 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -126,6 +126,7 @@ $toolsList = @( (Get-HGVersion), (Get-MinikubeVersion), (Get-NewmanVersion), + (Get-NVersion), (Get-NvmVersion), (Get-OpensslVersion), (Get-PackerVersion), diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 index e4d65b09094c..45eaa41ff44d 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 @@ -170,6 +170,11 @@ function Get-NewmanVersion { return "Newman $(newman --version)" } +function Get-NVersion { + $nVersion = (n --version).Replace('v', '') + return "n $nVersion" +} + function Get-NvmVersion { $nvmVersion = bash -c "source /etc/skel/.nvm/nvm.sh && nvm --version" return "nvm $nvmVersion" diff --git a/images/linux/scripts/installers/nodejs.sh b/images/linux/scripts/installers/nodejs.sh index bbf89a67a549..3969e3899d8f 100644 --- a/images/linux/scripts/installers/nodejs.sh +++ b/images/linux/scripts/installers/nodejs.sh @@ -9,9 +9,8 @@ source $HELPER_SCRIPTS/install.sh # Install default Node.js defaultVersion=$(get_toolset_value '.node.default') -# TODO: Usage of "githubusercontent.com/mklement0" doesn't look like a correct approach. Need to correct it according to the official Node.js docs. -curl -sL https://raw.githubusercontent.com/mklement0/n-install/stable/bin/n-install | bash -s -- -ny - -~/n/bin/n $defaultVersion +curl -L https://raw.githubusercontent.com/tj/n/master/bin/n -o ~/n +bash ~/n $defaultVersion # Install node modules node_modules=$(get_toolset_value '.node_modules[].name') From 08024941c38cc74d608a7e2cde0b1b0a8eba1509 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 11 Nov 2021 09:56:09 +0000 Subject: [PATCH 0719/3485] Updating readme file for win19 version 20211110.1 (#4460) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/win/Windows2019-Readme.md | 97 ++++++++++++++++---------------- 1 file changed, 48 insertions(+), 49 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index e79010d8bab4..c9dc66cfb7f5 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -1,5 +1,6 @@ | Announcements | |-| +| [[all OSs] Default Nodejs version will be set to 16 on November, 29](https://github.com/actions/virtual-environments/issues/4446) | | [[all OSs] Selenium server version will be upgraded from 3 to 4 on November, 15](https://github.com/actions/virtual-environments/issues/4376) | | [[All OSs] Node.js version 10 will be removed from the images on November, 15](https://github.com/actions/virtual-environments/issues/4356) | | [Windows-2016 environment will be removed on March 15, 2022](https://github.com/actions/virtual-environments/issues/4312) | @@ -7,8 +8,8 @@ | [(Public Beta) Windows Server 2022 with Visual Studio 2022 is now available](https://github.com/actions/virtual-environments/issues/3949) | *** # Microsoft Windows Server 2019 Datacenter -- OS Version: 10.0.17763 Build 2237 -- Image Version: 20211102.4 +- OS Version: 10.0.17763 Build 2300 +- Image Version: 20211110.1 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -28,15 +29,15 @@ ### Package Management - Chocolatey 0.11.3 -- Composer 2.1.11 -- Helm 3.7.0 +- Composer 2.1.12 +- Helm 3.7.1 - Miniconda 4.10.3 (pre-installed on the image but not added to PATH) - NPM 6.14.15 -- NuGet 5.11.0.10 +- NuGet 6.0.0.280 - pip 21.3.1 (python 3.7) - Pipx 0.16.4 - RubyGems 2.7.6.3 -- Vcpkg (build from master \<85b3115>) +- Vcpkg (build from master \<70033db>) - Yarn 1.22.17 #### Environment variables @@ -63,10 +64,10 @@ - CodeQL Action Bundle 2.7.0 - Docker 20.10.7 - Docker-compose 1.29.2 -- ghc 9.0.1 +- ghc 9.2.1 - Git 2.33.1 - Git LFS 3.0.1 -- Google Cloud SDK 363.0.0 +- Google Cloud SDK 364.0.0 - InnoSetup 6.2.0 - jq 1.6 - Kind 0.11.1 @@ -77,8 +78,8 @@ - NSIS v3.06.1 - OpenSSL 1.1.1 - Packer 1.7.6 -- Pulumi v3.16.0 -- R 4.1.1 +- Pulumi v3.17.1 +- R 4.1.2 - Stack 2.7.3 - Subversion (SVN) 1.14.1 - Swig 4.0.2 @@ -88,12 +89,12 @@ - zstd 1.5.0 ### CLI Tools -- Alibaba Cloud CLI 3.0.97 -- AWS CLI 2.3.0 -- AWS SAM CLI 1.34.1 +- Alibaba Cloud CLI 3.0.99 +- AWS CLI 2.3.5 +- AWS SAM CLI 1.35.0 - AWS Session Manager CLI 1.2.279.0 - Azure CLI 2.30.0 -- Azure DevOps CLI extension 0.21.0 +- Azure DevOps CLI extension 0.22.0 - Cloud Foundry CLI 6.53.0 - GitHub CLI 2.2.0 - Hub CLI 2.14.2 @@ -107,17 +108,17 @@ #### Packages - bindgen 0.59.1 - cargo-audit 0.15.2 -- cargo-outdated v0.9.17 +- cargo-outdated v0.9.18 - cbindgen 0.20.0 - Clippy 0.1.56 - Rustfmt 1.4.37 ### Browsers and webdrivers - Google Chrome 95.0.4638.69 -- Chrome Driver 95.0.4638.54 -- Microsoft Edge 95.0.1020.40 -- Microsoft Edge Driver 95.0.1020.40 -- Mozilla Firefox 94.0 +- Chrome Driver 95.0.4638.69 +- Microsoft Edge 95.0.1020.44 +- Microsoft Edge Driver 95.0.1020.44 +- Mozilla Firefox 94.0.1 - Gecko Driver 0.30.0 - IE Driver 3.150.1.1 - Selenium server 3.141.59 @@ -159,11 +160,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Go | Version | Architecture | Environment Variable | | ------- | ------------ | -------------------- | -| 1.13.15 | x64 | GOROOT_1_13_X64 | -| 1.14.15 | x64 | GOROOT_1_14_X64 | | 1.15.15 (Default) | x64 | GOROOT_1_15_X64 | -| 1.16.9 | x64 | GOROOT_1_16_X64 | -| 1.17.2 | x64 | GOROOT_1_17_X64 | +| 1.16.10 | x64 | GOROOT_1_16_X64 | +| 1.17.3 | x64 | GOROOT_1_17_X64 | #### Node @@ -183,8 +182,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | 3.6.8 | x64, x86 | | 3.7.9 (Default) | x64, x86 | | 3.8.10 | x64, x86 | -| 3.9.7 | x64, x86 | -| 3.10.0 | x64 | +| 3.9.8 | x64, x86 | +| 3.10.0 | x64, x86 | #### Ruby @@ -224,7 +223,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### MongoDB | Version | ServiceName | ServiceStatus | ServiceStartType | | ------- | ----------- | ------------- | ---------------- | -| 5.0.3.0 | MongoDB | Running | Automatic | +| 5.1.0.0 | MongoDB | Running | Automatic | @@ -239,18 +238,18 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Name | Version | ConfigFile | ServiceName | ServiceStatus | ListenPort | | ------ | ------- | ------------------------------------- | ----------- | ------------- | ---------- | | Apache | 2.4.51 | C:\tools\Apache24\conf\httpd.conf | Apache | Stopped | 80 | -| Nginx | 1.21.3 | C:\tools\nginx-1.21.3\conf\nginx.conf | nginx | Stopped | 80 | +| Nginx | 1.21.4 | C:\tools\nginx-1.21.4\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2019 | Name | Version | Path | | ----------------------------- | --------------- | -------------------------------------------------------------- | -| Visual Studio Enterprise 2019 | 16.11.31729.503 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | +| Visual Studio Enterprise 2019 | 16.11.31829.152 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | #### Workloads, components and extensions: | Package | Version | | ------------------------------------------------------------------------- | --------------- | -| Component.Android.NDK.R16B | 16.11.31729.444 | +| Component.Android.NDK.R16B | 16.11.31827.77 | | Component.Android.SDK25.Private | 16.0.28625.61 | | Component.Android.SDK30 | 16.10.31205.252 | | Component.Ant | 1.9.3.8 | @@ -266,7 +265,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Component.Microsoft.Web.LibraryManager | 16.10.31205.180 | | Component.Microsoft.WebTools.BrowserLink.WebLivePreview | 0.7.22.39845 | | Component.Microsoft.Windows.DriverKit | 10.0.21381.0 | -| Component.OpenJDK | 16.10.31303.311 | +| Component.OpenJDK | 16.11.31827.77 | | Component.UnityEngine.x64 | 16.10.31205.252 | | Component.Unreal | 16.1.28810.153 | | Component.Unreal.Android | 16.1.28810.153 | @@ -305,15 +304,15 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.Net.ComponentGroup.DevelopmentPrerequisites | 16.3.29207.166 | | Microsoft.Net.ComponentGroup.TargetingPacks.Common | 16.0.28516.191 | | Microsoft.NetCore.Component.DevelopmentTools | 16.10.31303.231 | -| Microsoft.NetCore.Component.Runtime.3.1 | 16.11.31729.444 | -| Microsoft.NetCore.Component.Runtime.5.0 | 16.11.31729.444 | -| Microsoft.NetCore.Component.SDK | 16.11.31729.444 | +| Microsoft.NetCore.Component.Runtime.3.1 | 16.11.31828.110 | +| Microsoft.NetCore.Component.Runtime.5.0 | 16.11.31828.110 | +| Microsoft.NetCore.Component.SDK | 16.11.31828.110 | | Microsoft.NetCore.Component.Web | 16.10.31303.231 | | Microsoft.VisualStudio.Component.AppInsights.Tools | 16.5.29515.121 | | Microsoft.VisualStudio.Component.AspNet45 | 16.10.31205.252 | -| Microsoft.VisualStudio.Component.Azure.AuthoringTools | 16.0.28625.61 | +| Microsoft.VisualStudio.Component.Azure.AuthoringTools | 16.11.31827.77 | | Microsoft.VisualStudio.Component.Azure.ClientLibs | 16.0.28315.86 | -| Microsoft.VisualStudio.Component.Azure.Compute.Emulator | 16.10.31205.252 | +| Microsoft.VisualStudio.Component.Azure.Compute.Emulator | 16.11.31827.77 | | Microsoft.VisualStudio.Component.Azure.Kubernetes.Tools | 16.10.31205.252 | | Microsoft.VisualStudio.Component.Azure.Powershell | 16.5.29515.121 | | Microsoft.VisualStudio.Component.Azure.ResourceManager.Tools | 16.4.29409.204 | @@ -493,29 +492,29 @@ 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.29.30135 | | Microsoft Visual C++ 2019 Debug Runtime | x64 | 14.29.30135 | -| Microsoft Visual C++ 2019 Minimum Runtime | x64 | 14.29.30135 | -| Microsoft Visual C++ 2019 Additional Runtime | x86 | 14.29.30135 | | Microsoft Visual C++ 2019 Debug Runtime | x86 | 14.29.30135 | -| Microsoft Visual C++ 2019 Minimum Runtime | x86 | 14.29.30135 | +| Microsoft Visual C++ 2022 Additional Runtime | x64 | 14.30.30704 | +| Microsoft Visual C++ 2022 Minimum Runtime | x64 | 14.30.30704 | +| Microsoft Visual C++ 2022 Additional Runtime | x86 | 14.30.30704 | +| Microsoft Visual C++ 2022 Minimum Runtime | x86 | 14.30.30704 | ### .NET Core SDK `Location C:\Program Files\dotnet\sdk` -- 2.1.302 2.1.403 2.1.526 2.1.617 2.1.701 2.1.818 3.1.120 3.1.202 3.1.302 3.1.414 5.0.104 5.0.208 5.0.303 5.0.402 +- 2.1.302 2.1.403 2.1.526 2.1.617 2.1.701 2.1.818 3.1.120 3.1.202 3.1.302 3.1.415 5.0.104 5.0.209 5.0.303 5.0.403 ### .NET Core Runtime `Location: C:\Program Files\dotnet\shared\Microsoft.AspNetCore.All` - 2.1.2 2.1.5 2.1.12 2.1.24 2.1.30 `Location: C:\Program Files\dotnet\shared\Microsoft.AspNetCore.App` -- 2.1.2 2.1.5 2.1.12 2.1.24 2.1.30 3.1.4 3.1.6 3.1.20 5.0.4 5.0.9 5.0.11 +- 2.1.2 2.1.5 2.1.12 2.1.24 2.1.30 3.1.4 3.1.6 3.1.20 3.1.21 5.0.4 5.0.9 5.0.12 `Location: C:\Program Files\dotnet\shared\Microsoft.NETCore.App` -- 2.1.2 2.1.5 2.1.12 2.1.24 2.1.30 3.1.4 3.1.6 3.1.20 5.0.4 5.0.9 5.0.11 +- 2.1.2 2.1.5 2.1.12 2.1.24 2.1.30 3.1.4 3.1.6 3.1.20 3.1.21 5.0.4 5.0.9 5.0.12 `Location: C:\Program Files\dotnet\shared\Microsoft.WindowsDesktop.App` -- 3.1.4 3.1.6 3.1.20 5.0.4 5.0.9 5.0.11 +- 3.1.4 3.1.6 3.1.20 3.1.21 5.0.4 5.0.9 5.0.12 ### .NET Framework `Type: Developer Pack` @@ -523,7 +522,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 4.7.2 4.8 ### PowerShell Tools -- PowerShell 7.1.5 +- PowerShell 7.2.0 #### Azure Powershell Modules | Module | Version | Path | @@ -578,11 +577,11 @@ All other versions are saved but not installed. ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:695800879b816ecb5e4c916ffae424549cbfe8f26d652020f8e5e26393719e93 | 2021-10-12 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:a713050b9d9d940565e37d50a0e5109259eaf985997c4f28ec568f088962908c | 2021-10-12 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:82047a37202950bc5fcb6f47938f9b2871f94bde9bddf7f574a859289e15103c | 2021-10-12 | -| mcr.microsoft.com/windows/nanoserver:1809 | sha256:4f06e1d8263b934d2e88dc1c6ff402f5b499c4d19ad6d0e2a5b9ee945f782928 | 2021-10-07 | -| mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:3fef9b0eac4a5d8b7d455dd07c3d8d3947657cc98bc48b0a02546ca5d782a4d5 | 2021-10-07 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:a58fa6b269980877f4c5681df79c816bbe2b220b84819224b1445d13a8b3b15e | 2021-11-09 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:d7f06d8eb2e6f45b20d293a5a5a48611a26bf6eac444e6c3284f04edc1ab6b9e | 2021-11-09 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:f1915874869d31d4ba9002478809248b7661937d28a01156b12e4c72558ec8f2 | 2021-11-09 | +| mcr.microsoft.com/windows/nanoserver:1809 | sha256:3c0ca16693dfc1252120cb6066ddfccf53b9bbce4523bdb7c7fb3f55dd86f33f | 2021-11-04 | +| mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:bfa356b928c9977bf2c03d536e251eda8879debf42d884771cb855313a6a5da7 | 2021-11-04 | From 0ddb8a2302be1da5cf1acaf4ba56e54955a338c8 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Thu, 11 Nov 2021 13:13:07 +0300 Subject: [PATCH 0720/3485] [Windows] Use Get-LatestChocoPackageVersion to get nodejs version to install (#4469) * Use Get-LatestChocoPackageVersion to get nodejs * Fix typo in Send-RequestToChocolateyPackages --- images/win/scripts/ImageHelpers/ChocoHelpers.ps1 | 6 +++--- images/win/scripts/Installers/Install-NodeLts.ps1 | 11 +---------- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/images/win/scripts/ImageHelpers/ChocoHelpers.ps1 b/images/win/scripts/ImageHelpers/ChocoHelpers.ps1 index 6089c3924410..f47b012b7850 100644 --- a/images/win/scripts/ImageHelpers/ChocoHelpers.ps1 +++ b/images/win/scripts/ImageHelpers/ChocoHelpers.ps1 @@ -31,7 +31,7 @@ function Choco-Install { } } -function Send-RequestToCocolateyPackages { +function Send-RequestToChocolateyPackages { param( [Parameter(Mandatory)] [string] $FilterQuery, @@ -56,9 +56,9 @@ function Get-LatestChocoPackageVersion { [int]$versionNumbers[-1] += 1 $incrementedVersion = $versionNumbers -join "." $filterQuery = "`$filter=(Id eq '$PackageName') and (IsPrerelease eq false) and (Version ge '$TargetVersion') and (Version lt '$incrementedVersion')" - $latestVersion = (Send-RequestToCocolateyPackages -FilterQuery $filterQuery).properties.Version | + $latestVersion = (Send-RequestToChocolateyPackages -FilterQuery $filterQuery).properties.Version | Sort-Object {[version]$_} | Select-Object -Last 1 - + return $latestVersion } \ No newline at end of file diff --git a/images/win/scripts/Installers/Install-NodeLts.ps1 b/images/win/scripts/Installers/Install-NodeLts.ps1 index 374a776f1159..18ba83b7d00e 100644 --- a/images/win/scripts/Installers/Install-NodeLts.ps1 +++ b/images/win/scripts/Installers/Install-NodeLts.ps1 @@ -11,16 +11,7 @@ New-Item -Path $PrefixPath -Force -ItemType Directory New-Item -Path $CachePath -Force -ItemType Directory $defaultVersion = (Get-ToolsetContent).node.default -$queryFilter = "`$filter=(Id eq 'nodejs') and (IsPrerelease eq false) and (Version ge '$defaultVersion')" -$url = "https://community.chocolatey.org/api/v2/Packages()?$queryFilter" -$chocoVersionsOutput = (Invoke-RestMethod -Uri $url).properties.Version -# Take the latest version available for given default version from the toolset which is used as wildcard -# Toolset file can contain a version in any form: Major, Major.Minor or even the exact version -$versionToInstall = $chocoVersionsOutput | - # Take the exact default version and its subversions - Where-Object { $_ -Like "$defaultVersion.*" -or $_ -eq $defaultVersion } | - Sort-Object { [Version]$_ } | - Select-Object -Last 1 +$versionToInstall = Get-LatestChocoPackageVersion -TargetVersion $defaultVersion -PackageName "nodejs" Choco-Install -PackageName nodejs -ArgumentList "--version=$versionToInstall" From 5d89a3805e5737dd605229a04533c51275b9803a Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Thu, 11 Nov 2021 13:40:57 +0300 Subject: [PATCH 0721/3485] [Ubuntu] Remove node version 10.x (#4475) --- images/linux/toolsets/toolset-1804.json | 1 - images/linux/toolsets/toolset-2004.json | 1 - 2 files changed, 2 deletions(-) diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index 304927cd722f..c78f983c1304 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -31,7 +31,6 @@ "platform" : "linux", "arch": "x64", "versions": [ - "10.*", "12.*", "14.*", "16.*" diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index 2231c26f553f..ddf23c82f384 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -33,7 +33,6 @@ "platform" : "linux", "arch": "x64", "versions": [ - "10.*", "12.*", "14.*", "16.*" From 10ea71465c40a6d18386fdd1085048a5a074ba6a Mon Sep 17 00:00:00 2001 From: Dibir Magomedsaygitov <61747324+dibir-magomedsaygitov@users.noreply.github.com> Date: Thu, 11 Nov 2021 14:57:18 +0300 Subject: [PATCH 0722/3485] [macOS] Upgrade Selenium server version from 3 to 4 (#4474) * upgrade selenium version from 3 to 4 * add test --- images/macos/provision/core/chrome.sh | 6 +----- images/macos/tests/Browsers.Tests.ps1 | 6 ++++++ 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/images/macos/provision/core/chrome.sh b/images/macos/provision/core/chrome.sh index b772ac0078c4..056f356a891e 100644 --- a/images/macos/provision/core/chrome.sh +++ b/images/macos/provision/core/chrome.sh @@ -7,12 +7,8 @@ brew_cask_install_ignoring_sha256 "google-chrome" echo "Installing Chrome Driver" brew install --cask chromedriver -# Temporarily download Selenium 3.141.59, since 4.* can contain some breaking changes echo "Installing Selenium" -cd $(brew --repo homebrew/core) -git checkout dc37198 -brew_smart_install "selenium-server-standalone" -git checkout master +brew_smart_install "selenium-server" CHROMEWEBDRIVER_DIR=$(readlink $(which chromedriver) | xargs dirname) echo "export CHROMEWEBDRIVER=$CHROMEWEBDRIVER_DIR" >> "${HOME}/.bashrc" diff --git a/images/macos/tests/Browsers.Tests.ps1 b/images/macos/tests/Browsers.Tests.ps1 index 7351c3f3b875..6020a8df5286 100644 --- a/images/macos/tests/Browsers.Tests.ps1 +++ b/images/macos/tests/Browsers.Tests.ps1 @@ -10,6 +10,12 @@ Describe "Chrome" { } } +Describe "Selenium server" { + It "Selenium server" { + (Get-ChildItem -Path "/usr/local/Cellar/selenium-server*/*").Name | Should -BeLike "4.*" + } +} + Describe "Edge" { It "Microsoft Edge" { $edgeLocation = "/Applications/Microsoft Edge.app/Contents/MacOS/Microsoft Edge" From e5e8cc59dd946939f2fe61ddd8bba152aa12f2f7 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Thu, 11 Nov 2021 15:27:09 +0300 Subject: [PATCH 0723/3485] Add miniconda to windows 2022 image (#4467) --- .../scripts/SoftwareReport/SoftwareReport.Generator.ps1 | 7 +------ images/win/scripts/Tests/Miniconda.Tests.ps1 | 4 ++-- images/win/windows2022.json | 1 + 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index 69537a437d0a..280b9c95ea7f 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -51,6 +51,7 @@ $markdown += New-MDList -Style Unordered -Lines ($languageTools | Sort-Object) $packageManagementList = @( (Get-ChocoVersion), + (Get-CondaVersion), (Get-ComposerVersion), (Get-HelmVersion), (Get-NPMVersion), @@ -62,12 +63,6 @@ $packageManagementList = @( (Get-YarnVersion) ) -if ((Test-IsWin16) -or (Test-IsWin19)) { - $packageManagementList += @( - (Get-CondaVersion) - ) -} - $markdown += New-MDHeader "Package Management" -Level 3 $markdown += New-MDList -Style Unordered -Lines ($packageManagementList | Sort-Object) diff --git a/images/win/scripts/Tests/Miniconda.Tests.ps1 b/images/win/scripts/Tests/Miniconda.Tests.ps1 index c3538d70e806..763a158e23cd 100644 --- a/images/win/scripts/Tests/Miniconda.Tests.ps1 +++ b/images/win/scripts/Tests/Miniconda.Tests.ps1 @@ -1,8 +1,8 @@ -Describe "Miniconda" -Skip:(Test-IsWin22) { +Describe "Miniconda" { It "Miniconda Environment variables is set. " { ${env:CONDA} | Should -Not -BeNullOrEmpty } - + It "Miniconda $env:CONDA\ " -TestCases @( @{ PathTest = "python.exe" } @{ PathTest = "Scripts\conda.exe" } diff --git a/images/win/windows2022.json b/images/win/windows2022.json index 334e4b7e44c0..90c1dbaf6c8d 100644 --- a/images/win/windows2022.json +++ b/images/win/windows2022.json @@ -221,6 +221,7 @@ "{{ template_dir }}/scripts/Installers/Install-Mingw64.ps1", "{{ template_dir }}/scripts/Installers/Install-Haskell.ps1", "{{ template_dir }}/scripts/Installers/Install-Stack.ps1", + "{{ template_dir }}/scripts/Installers/Install-Miniconda.ps1", "{{ template_dir }}/scripts/Installers/Install-AzureCosmosDbEmulator.ps1", "{{ template_dir }}/scripts/Installers/Install-Mercurial.ps1", "{{ template_dir }}/scripts/Installers/Install-Zstd.ps1", From 68e428c4d29f2b13bb8299a7440d84729c5970e0 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Thu, 11 Nov 2021 16:13:05 +0300 Subject: [PATCH 0724/3485] Perform a full clone of vcpkg instead of depth=1 (#4476) --- images/macos/provision/core/vcpkg.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/macos/provision/core/vcpkg.sh b/images/macos/provision/core/vcpkg.sh index d20cb3ca4fef..a1ac7c254969 100644 --- a/images/macos/provision/core/vcpkg.sh +++ b/images/macos/provision/core/vcpkg.sh @@ -6,7 +6,7 @@ VCPKG_INSTALLATION_ROOT=/usr/local/share/vcpkg echo "export VCPKG_INSTALLATION_ROOT=${VCPKG_INSTALLATION_ROOT}" | tee -a ~/.bashrc # Install vcpkg -git clone --depth=1 https://github.com/Microsoft/vcpkg $VCPKG_INSTALLATION_ROOT +git clone https://github.com/Microsoft/vcpkg $VCPKG_INSTALLATION_ROOT $VCPKG_INSTALLATION_ROOT/bootstrap-vcpkg.sh $VCPKG_INSTALLATION_ROOT/vcpkg integrate install chmod -R 0777 $VCPKG_INSTALLATION_ROOT From d127e51bf4c2d55aa5ff9e23084ba7e09fc44a35 Mon Sep 17 00:00:00 2001 From: Maksim Shilov <89912354+shilovmaksim@users.noreply.github.com> Date: Thu, 11 Nov 2021 16:14:27 +0300 Subject: [PATCH 0725/3485] [MacOS] Pin MongoDB to the specific version defined in the toolset (#4452) * Define mongodb version installed in the toolset * Searching for latest version of a tool based on a toolset version --- images/macos/provision/core/mongodb.sh | 6 ++++-- images/macos/tests/Databases.Tests.ps1 | 9 ++++++--- images/macos/toolsets/toolset-10.14.json | 3 +++ images/macos/toolsets/toolset-10.15.json | 5 ++++- images/macos/toolsets/toolset-11.json | 5 ++++- images/macos/toolsets/toolset-12.json | 3 +++ 6 files changed, 24 insertions(+), 7 deletions(-) diff --git a/images/macos/provision/core/mongodb.sh b/images/macos/provision/core/mongodb.sh index 9e6c2bba2dfc..a8522e56b95b 100644 --- a/images/macos/provision/core/mongodb.sh +++ b/images/macos/provision/core/mongodb.sh @@ -4,9 +4,11 @@ source ~/utils/utils.sh # MongoDB object-value database # Install latest release version of MongoDB Community Edition # https://docs.mongodb.com/manual/tutorial/install-mongodb-on-os-x +toolsetVersion=$(get_toolset_value '.mongodb.version') -echo "Installing mongodb..." brew tap mongodb/brew -brew_smart_install "mongodb-community@5.0" +versionToInstall=$(brew search --formulae /mongodb-community@$toolsetVersion/ | awk -F'/' '{print $3}' | tail -1) +echo "Installing mongodb $versionToInstall" +brew_smart_install "$versionToInstall" invoke_tests "Databases" "MongoDB" diff --git a/images/macos/tests/Databases.Tests.ps1 b/images/macos/tests/Databases.Tests.ps1 index 5f4548ac77f5..9872866f584c 100644 --- a/images/macos/tests/Databases.Tests.ps1 +++ b/images/macos/tests/Databases.Tests.ps1 @@ -1,7 +1,10 @@ Describe "MongoDB" { - It "mongodb" { - "mongo --version" | Should -ReturnZeroExitCode - "mongod --version"| Should -ReturnZeroExitCode + It "" -TestCases @( + @{ ToolName = "mongo" } + @{ ToolName = "mongod" } + ) { + $toolsetVersion = Get-ToolsetValue 'mongodb.version' + (&$ToolName --version)[2].Split('"')[-2] | Should -BeLike "$toolsetVersion*" } } diff --git a/images/macos/toolsets/toolset-10.14.json b/images/macos/toolsets/toolset-10.14.json index 18cc772bf004..7e4f7899c54f 100644 --- a/images/macos/toolsets/toolset-10.14.json +++ b/images/macos/toolsets/toolset-10.14.json @@ -383,5 +383,8 @@ "12", "14" ] + }, + "mongodb": { + "version": "5" } } diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index 8b80a88ce6fe..2c499ad3ef65 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -341,5 +341,8 @@ }, "llvm": { "version": "13" + }, + "mongodb": { + "version": "5" } -} +} \ No newline at end of file diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index 45b784a75788..4de3e965c1a3 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -293,5 +293,8 @@ }, "llvm": { "version": "13" + }, + "mongodb": { + "version": "5" } -} +} \ No newline at end of file diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index 628238cfaa13..17e22e0dd19d 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -191,5 +191,8 @@ "12", "14" ] + }, + "mongodb": { + "version": "5" } } From bd3faa00113a932f431106b483d7a2754507c538 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Thu, 11 Nov 2021 16:34:25 +0300 Subject: [PATCH 0726/3485] [Windows] Remove node version 10.x (#4478) --- images/win/toolsets/toolset-2016.json | 1 - images/win/toolsets/toolset-2019.json | 1 - images/win/toolsets/toolset-2022.json | 1 - 3 files changed, 3 deletions(-) diff --git a/images/win/toolsets/toolset-2016.json b/images/win/toolsets/toolset-2016.json index 3ec118d625a5..2d7027c1d6b8 100644 --- a/images/win/toolsets/toolset-2016.json +++ b/images/win/toolsets/toolset-2016.json @@ -60,7 +60,6 @@ "arch": "x64", "platform" : "win32", "versions": [ - "10.*", "12.*", "14.*", "16.*" diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index 0f30286b24ba..7d693cff9ba5 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -61,7 +61,6 @@ "arch": "x64", "platform" : "win32", "versions": [ - "10.*", "12.*", "14.*", "16.*" diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index bddcdec996d4..e46b1ceb655e 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -51,7 +51,6 @@ "arch": "x64", "platform" : "win32", "versions": [ - "10.*", "12.*", "14.*", "16.*" From 60dcd87ff38380e3b67d6a2cdd4d8e1b37131782 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 11 Nov 2021 13:35:22 +0000 Subject: [PATCH 0727/3485] Updating readme file for win16 version 20211109.0 (#4453) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/win/Windows2016-Readme.md | 71 ++++++++++++++++---------------- 1 file changed, 35 insertions(+), 36 deletions(-) diff --git a/images/win/Windows2016-Readme.md b/images/win/Windows2016-Readme.md index eca1b3669f39..e3a461142a91 100644 --- a/images/win/Windows2016-Readme.md +++ b/images/win/Windows2016-Readme.md @@ -1,5 +1,6 @@ | Announcements | |-| +| [[all OSs] Default Nodejs version will be set to 16 on November, 29](https://github.com/actions/virtual-environments/issues/4446) | | [[all OSs] Selenium server version will be upgraded from 3 to 4 on November, 15](https://github.com/actions/virtual-environments/issues/4376) | | [[All OSs] Node.js version 10 will be removed from the images on November, 15](https://github.com/actions/virtual-environments/issues/4356) | | [Windows-2016 environment will be removed on March 15, 2022](https://github.com/actions/virtual-environments/issues/4312) | @@ -7,8 +8,8 @@ | [(Public Beta) Windows Server 2022 with Visual Studio 2022 is now available](https://github.com/actions/virtual-environments/issues/3949) | *** # Microsoft Windows Server 2016 Datacenter -- OS Version: 10.0.14393 Build 4704 -- Image Version: 20211102.4 +- OS Version: 10.0.14393 Build 4770 +- Image Version: 20211109.0 ## Installed Software ### Language and Runtime @@ -25,15 +26,15 @@ ### Package Management - Chocolatey 0.11.3 -- Composer 2.1.11 -- Helm 3.7.0 +- Composer 2.1.12 +- Helm 3.7.1 - Miniconda 4.10.3 (pre-installed on the image but not added to PATH) - NPM 6.14.15 -- NuGet 5.11.0.10 +- NuGet 6.0.0.280 - pip 21.3.1 (python 3.7) - Pipx 0.16.4 - RubyGems 2.7.6.3 -- Vcpkg (build from master \<85b3115>) +- Vcpkg (build from master \<6cfa934>) - Yarn 1.22.17 #### Environment variables @@ -60,10 +61,10 @@ - CodeQL Action Bundle 2.7.0 - Docker 20.10.7 - Docker-compose 1.29.2 -- ghc 9.0.1 +- ghc 9.2.1 - Git 2.33.1 - Git LFS 3.0.1 -- Google Cloud SDK 363.0.0 +- Google Cloud SDK 364.0.0 - InnoSetup 6.2.0 - jq 1.6 - Kind 0.11.1 @@ -74,8 +75,8 @@ - NSIS v3.06.1 - OpenSSL 1.1.1 - Packer 1.7.6 -- Pulumi v3.16.0 -- R 4.1.1 +- Pulumi v3.17.0 +- R 4.1.2 - Stack 2.7.3 - Subversion (SVN) 1.14.1 - Swig 4.0.2 @@ -85,12 +86,12 @@ - zstd 1.5.0 ### CLI Tools -- Alibaba Cloud CLI 3.0.97 -- AWS CLI 2.3.0 -- AWS SAM CLI 1.34.1 +- Alibaba Cloud CLI 3.0.99 +- AWS CLI 2.3.4 +- AWS SAM CLI 1.35.0 - AWS Session Manager CLI 1.2.279.0 - Azure CLI 2.30.0 -- Azure DevOps CLI extension 0.21.0 +- Azure DevOps CLI extension 0.22.0 - Cloud Foundry CLI 6.53.0 - GitHub CLI 2.2.0 - Hub CLI 2.14.2 @@ -111,10 +112,10 @@ ### Browsers and webdrivers - Google Chrome 95.0.4638.69 -- Chrome Driver 95.0.4638.54 -- Microsoft Edge 95.0.1020.40 -- Microsoft Edge Driver 95.0.1020.40 -- Mozilla Firefox 94.0 +- Chrome Driver 95.0.4638.69 +- Microsoft Edge 95.0.1020.44 +- Microsoft Edge Driver 95.0.1020.44 +- Mozilla Firefox 94.0.1 - Gecko Driver 0.30.0 - IE Driver 3.150.1.1 - Selenium server 3.141.59 @@ -153,11 +154,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Go | Version | Architecture | Environment Variable | | ------- | ------------ | -------------------- | -| 1.13.15 | x64 | GOROOT_1_13_X64 | -| 1.14.15 | x64 | GOROOT_1_14_X64 | | 1.15.15 (Default) | x64 | GOROOT_1_15_X64 | -| 1.16.9 | x64 | GOROOT_1_16_X64 | -| 1.17.2 | x64 | GOROOT_1_17_X64 | +| 1.16.10 | x64 | GOROOT_1_16_X64 | +| 1.17.3 | x64 | GOROOT_1_17_X64 | #### Node @@ -177,7 +176,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | 3.6.8 | x64, x86 | | 3.7.9 (Default) | x64, x86 | | 3.8.10 | x64, x86 | -| 3.9.7 | x64, x86 | +| 3.9.8 | x64, x86 | | 3.10.0 | x64 | @@ -218,7 +217,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### MongoDB | Version | ServiceName | ServiceStatus | ServiceStartType | | ------- | ----------- | ------------- | ---------------- | -| 5.0.3.0 | MongoDB | Running | Automatic | +| 5.1.0.0 | MongoDB | Running | Automatic | @@ -233,12 +232,12 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Name | Version | ConfigFile | ServiceName | ServiceStatus | ListenPort | | ------ | ------- | ------------------------------------- | ----------- | ------------- | ---------- | | Apache | 2.4.51 | C:\tools\Apache24\conf\httpd.conf | Apache | Stopped | 80 | -| Nginx | 1.21.3 | C:\tools\nginx-1.21.3\conf\nginx.conf | nginx | Stopped | 80 | +| Nginx | 1.21.4 | C:\tools\nginx-1.21.4\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2017 | Name | Version | Path | | ----------------------------- | --------------- | -------------------------------------------------------------- | -| Visual Studio Enterprise 2017 | 15.9.28307.1705 | C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise | +| Visual Studio Enterprise 2017 | 15.9.28307.1745 | C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise | #### Workloads, components and extensions: @@ -500,27 +499,27 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft Visual C++ 2013 Minimum Runtime | x86 | 12.0.21005 | | Microsoft Visual C++ 2017 Debug Runtime | x64 | 14.16.27033 | | Microsoft Visual C++ 2017 Debug Runtime | x86 | 14.16.27033 | -| Microsoft Visual C++ 2019 Additional Runtime | x64 | 14.29.30135 | -| Microsoft Visual C++ 2019 Minimum Runtime | x64 | 14.29.30135 | -| Microsoft Visual C++ 2019 Additional Runtime | x86 | 14.29.30135 | -| Microsoft Visual C++ 2019 Minimum Runtime | x86 | 14.29.30135 | +| Microsoft Visual C++ 2022 Additional Runtime | x64 | 14.30.30704 | +| Microsoft Visual C++ 2022 Minimum Runtime | x64 | 14.30.30704 | +| Microsoft Visual C++ 2022 Additional Runtime | x86 | 14.30.30704 | +| Microsoft Visual C++ 2022 Minimum Runtime | x86 | 14.30.30704 | ### .NET Core SDK `Location C:\Program Files\dotnet\sdk` -- 1.1.14 2.1.302 2.1.403 2.1.526 2.1.617 2.1.701 2.1.818 3.1.120 3.1.202 3.1.302 3.1.414 5.0.104 5.0.208 5.0.303 5.0.402 +- 1.1.14 2.1.302 2.1.403 2.1.526 2.1.617 2.1.701 2.1.818 3.1.120 3.1.202 3.1.302 3.1.415 5.0.104 5.0.209 5.0.303 5.0.403 ### .NET Core Runtime `Location: C:\Program Files\dotnet\shared\Microsoft.AspNetCore.All` - 2.1.2 2.1.5 2.1.12 2.1.24 2.1.30 `Location: C:\Program Files\dotnet\shared\Microsoft.AspNetCore.App` -- 2.1.2 2.1.5 2.1.12 2.1.24 2.1.30 3.1.4 3.1.6 3.1.20 5.0.4 5.0.9 5.0.11 +- 2.1.2 2.1.5 2.1.12 2.1.24 2.1.30 3.1.4 3.1.6 3.1.20 3.1.21 5.0.4 5.0.9 5.0.12 `Location: C:\Program Files\dotnet\shared\Microsoft.NETCore.App` -- 1.0.16 1.1.13 2.1.2 2.1.5 2.1.12 2.1.24 2.1.30 3.1.4 3.1.6 3.1.20 5.0.4 5.0.9 5.0.11 +- 1.0.16 1.1.13 2.1.2 2.1.5 2.1.12 2.1.24 2.1.30 3.1.4 3.1.6 3.1.20 3.1.21 5.0.4 5.0.9 5.0.12 `Location: C:\Program Files\dotnet\shared\Microsoft.WindowsDesktop.App` -- 3.1.4 3.1.6 3.1.20 5.0.4 5.0.9 5.0.11 +- 3.1.4 3.1.6 3.1.20 3.1.21 5.0.4 5.0.9 5.0.12 ### .NET Framework `Type: Developer Pack` @@ -528,7 +527,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 4.6.1 4.6.2 4.7 4.7.1 4.7.2 4.8 ### PowerShell Tools -- PowerShell 7.1.5 +- PowerShell 7.2.0 #### Azure Powershell Modules | Module | Version | Path | @@ -587,7 +586,7 @@ All other versions are saved but not installed. | mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2016 | sha256:97bbc6dd603e44f5a34e3f309b493c77b964b0e07d9e3dd7333f063ccaf33523 | 2021-10-12 | | mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2016 | sha256:bff7dee44dc39f9e997389be6de0c9fcde608879eb52070839ac03f6058f1385 | 2021-10-12 | | mcr.microsoft.com/windows/nanoserver:10.0.14393.953 | sha256:fc60bd5ae0e61b334ce1cf1bcbf20c10c36b4c5482a01da319c9c989f9e6e268 | 2017-03-08 | -| mcr.microsoft.com/windows/servercore:ltsc2016 | sha256:bcff581aa164b5d0036284c21fb1733d4f5a7356341a32876ef9d0f6539aaa2b | 2021-10-06 | +| mcr.microsoft.com/windows/servercore:ltsc2016 | sha256:0a54ee92e51c03f30b6902df63fb88be973c8d04a40c456058ab6acbdd92d103 | 2021-11-03 | From f8c50c93b54977055267e0cd1b10075b8746cab2 Mon Sep 17 00:00:00 2001 From: V-Zabayrachny <79155496+V-Zabayrachny@users.noreply.github.com> Date: Thu, 11 Nov 2021 17:18:39 +0300 Subject: [PATCH 0728/3485] [Windows] Add MySQL to the toolset (#4435) --- images/win/scripts/Installers/Install-MysqlCli.ps1 | 12 ++++-------- images/win/scripts/Tests/Databases.Tests.ps1 | 6 +++--- images/win/toolsets/toolset-2016.json | 3 +++ images/win/toolsets/toolset-2019.json | 3 +++ images/win/toolsets/toolset-2022.json | 3 +++ 5 files changed, 16 insertions(+), 11 deletions(-) diff --git a/images/win/scripts/Installers/Install-MysqlCli.ps1 b/images/win/scripts/Installers/Install-MysqlCli.ps1 index 3f54db2106df..f9c422e63287 100644 --- a/images/win/scripts/Installers/Install-MysqlCli.ps1 +++ b/images/win/scripts/Installers/Install-MysqlCli.ps1 @@ -11,13 +11,9 @@ $ArgumentList = ("/install", "/quiet", "/norestart") Install-Binary -Url $InstallerURI -Name $InstallerName -ArgumentList $ArgumentList ## Downloading mysql -if (Test-IsWin22) { - $MysqlVersionName = "mysql-8.0.26-winx64" - $MysqlVersionUrl = "https://dev.mysql.com/get/Downloads/MySQL-8/${MysqlVersionName}.zip" -} else { - $MysqlVersionName = "mysql-5.7.35-winx64" - $MysqlVersionUrl = "https://dev.mysql.com/get/Downloads/MySQL-5.7/${MysqlVersionName}.zip" -} +$MysqlMajorMinor = (Get-ToolsetContent).Mysql.version +$MysqlFullVersion = ((Invoke-WebRequest -Uri https://dev.mysql.com/downloads/mysql/${MysqlMajorMinor}.html).Content | Select-String -Pattern "${MysqlMajorMinor}\.\d+").Matches.Value +$MysqlVersionUrl = "https://dev.mysql.com/get/Downloads/MySQL-${MysqlMajorMinor}/mysql-${MysqlFullVersion}-winx64.zip" $MysqlArchPath = Start-DownloadWithRetry -Url $MysqlVersionUrl -Name "mysql.zip" @@ -26,7 +22,7 @@ Extract-7Zip -Path $MysqlArchPath -DestinationPath "C:\" # Rename mysql-version to mysql folder $MysqlPath = "C:\mysql" -Rename-Item -Path "C:\${MysqlVersionName}" -NewName $MysqlPath +Rename-Item -Path "C:\mysql-${MysqlFullVersion}-winx64" -NewName $MysqlPath # Adding mysql in system environment path Add-MachinePathItem "${MysqlPath}\bin" diff --git a/images/win/scripts/Tests/Databases.Tests.ps1 b/images/win/scripts/Tests/Databases.Tests.ps1 index 6213d7f2e95b..6737eb1fd857 100644 --- a/images/win/scripts/Tests/Databases.Tests.ps1 +++ b/images/win/scripts/Tests/Databases.Tests.ps1 @@ -55,7 +55,7 @@ Describe "PostgreSQL" { Describe "MySQL" { It "MySQL CLI" { - "mysql -V" | Should -ReturnZeroExitCode + $MysqlMajorMinor = (Get-ToolsetContent).Mysql.version + mysql -V | Should -BeLike "*${MysqlMajorMinor}*" } -} - +} \ No newline at end of file diff --git a/images/win/toolsets/toolset-2016.json b/images/win/toolsets/toolset-2016.json index 2d7027c1d6b8..e914d7e97419 100644 --- a/images/win/toolsets/toolset-2016.json +++ b/images/win/toolsets/toolset-2016.json @@ -422,6 +422,9 @@ "node": { "default": "14" }, + "Mysql": { + "version": "5.7" + }, "mongodb": { "version": "5" } diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index 7d693cff9ba5..70bb92567b9c 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -454,6 +454,9 @@ "node": { "default": "14" }, + "Mysql": { + "version": "5.7" + }, "mongodb": { "version": "5" } diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index e46b1ceb655e..f0dd0b82819e 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -304,6 +304,9 @@ "node": { "default": "14" }, + "Mysql": { + "version": "8.0" + }, "mongodb": { "version": "5" } From 47a60e077673c6caa771c23697dc851e4c86caa0 Mon Sep 17 00:00:00 2001 From: Dibir Magomedsaygitov <61747324+dibir-magomedsaygitov@users.noreply.github.com> Date: Thu, 11 Nov 2021 18:21:51 +0300 Subject: [PATCH 0729/3485] [Windows] Upgrade Selenium server version from 3 to 4 (#4473) --- images/win/scripts/Tests/Browsers.Tests.ps1 | 11 ++++++----- images/win/toolsets/toolset-2016.json | 4 ++-- images/win/toolsets/toolset-2019.json | 4 ++-- images/win/toolsets/toolset-2022.json | 4 ++-- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/images/win/scripts/Tests/Browsers.Tests.ps1 b/images/win/scripts/Tests/Browsers.Tests.ps1 index b1b4a7609ca9..89fd9b5e6cdf 100644 --- a/images/win/scripts/Tests/Browsers.Tests.ps1 +++ b/images/win/scripts/Tests/Browsers.Tests.ps1 @@ -139,15 +139,16 @@ Describe "Internet Explorer" { } Describe "Selenium" { - It "Selenium 'C:\selenium' path exists" { - "C:\selenium" | Should -Exist + BeforeAll { + $seleniumBinaryName = (Get-ToolsetContent).selenium.binary_name + $seleniumBinPath = Join-Path "C:\selenium\" "$seleniumBinaryName.jar" } - It "Selenium Server 'selenium-server-standalone.jar' is installed" { - "C:\selenium\selenium-server-standalone.jar" | Should -Exist + It "Selenium server is installed" { + $seleniumBinPath | Should -Exist } It "SELENIUM_JAR_PATH environment variable exists" { - Get-EnvironmentVariable "SELENIUM_JAR_PATH" | Should -BeExactly "C:\selenium\selenium-server-standalone.jar" + Get-EnvironmentVariable "SELENIUM_JAR_PATH" | Should -BeExactly "$seleniumBinPath" } } \ No newline at end of file diff --git a/images/win/toolsets/toolset-2016.json b/images/win/toolsets/toolset-2016.json index e914d7e97419..49141ca6decf 100644 --- a/images/win/toolsets/toolset-2016.json +++ b/images/win/toolsets/toolset-2016.json @@ -362,8 +362,8 @@ } ], "selenium": { - "version": "3", - "binary_name": "selenium-server-standalone" + "version": "4", + "binary_name": "selenium-server" }, "npm": { "global_packages": [ diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index 70bb92567b9c..2726268d04c7 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -394,8 +394,8 @@ } ], "selenium": { - "version": "3", - "binary_name": "selenium-server-standalone" + "version": "4", + "binary_name": "selenium-server" }, "npm": { "global_packages": [ diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index f0dd0b82819e..d7c19905b2f7 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -256,8 +256,8 @@ } ], "selenium": { - "version": "3", - "binary_name": "selenium-server-standalone" + "version": "4", + "binary_name": "selenium-server" }, "npm": { "global_packages": [ From d6a789cbef30e0681d6667b1c91cb7a9bd9184bd Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 11 Nov 2021 15:59:19 +0000 Subject: [PATCH 0730/3485] Updating readme file for win22 version 20211109.2 (#4454) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/win/Windows2022-Readme.md | 441 ++++++++++++++++--------------- 1 file changed, 221 insertions(+), 220 deletions(-) diff --git a/images/win/Windows2022-Readme.md b/images/win/Windows2022-Readme.md index 11d1d2d12d2b..35574ecfdd70 100644 --- a/images/win/Windows2022-Readme.md +++ b/images/win/Windows2022-Readme.md @@ -1,5 +1,6 @@ | Announcements | |-| +| [[all OSs] Default Nodejs version will be set to 16 on November, 29](https://github.com/actions/virtual-environments/issues/4446) | | [[all OSs] Selenium server version will be upgraded from 3 to 4 on November, 15](https://github.com/actions/virtual-environments/issues/4376) | | [[All OSs] Node.js version 10 will be removed from the images on November, 15](https://github.com/actions/virtual-environments/issues/4356) | | [Windows-2016 environment will be removed on March 15, 2022](https://github.com/actions/virtual-environments/issues/4312) | @@ -7,8 +8,8 @@ | [(Public Beta) Windows Server 2022 with Visual Studio 2022 is now available](https://github.com/actions/virtual-environments/issues/3949) | *** # Microsoft Windows Server 2022 Datacenter -- OS Version: 10.0.20348 Build 288 -- Image Version: 20211102.4 +- OS Version: 10.0.20348 Build 350 +- Image Version: 20211109.2 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -16,25 +17,25 @@ ## Installed Software ### Language and Runtime - Bash 4.4.23(1)-release -- Go 1.16.9 +- Go 1.16.10 - Julia 1.6.3 - Kotlin 1.5.31 - LLVM 13.0.0 - Node 14.18.1 - PHP 8.0.10 -- Python 3.9.7 +- Python 3.9.8 - Ruby 3.0.2p107 ### Package Management - Chocolatey 0.11.3 -- Composer 2.1.11 -- Helm 3.7.0 +- Composer 2.1.12 +- Helm 3.7.1 - NPM 6.14.15 -- NuGet 5.11.0.10 +- NuGet 6.0.0.280 - pip 21.3.1 (python 3.9) - Pipx 0.16.4 - RubyGems 3.2.22 -- Vcpkg (build from master \<35443ee>) +- Vcpkg (build from master \<70033db>) - Yarn 1.22.17 #### Environment variables @@ -59,7 +60,7 @@ - CodeQL Action Bundle 2.7.0 - Docker 20.10.7 - Docker-compose 1.29.2 -- ghc 9.0.1 +- ghc 9.2.1 - Git 2.33.1 - Git LFS 3.0.1 - jq 1.6 @@ -71,8 +72,8 @@ - NSIS v3.06.1 - OpenSSL 1.1.1 - Packer 1.7.6 -- Pulumi v3.16.0 -- R 4.1.1 +- Pulumi v3.17.0 +- R 4.1.2 - Stack 2.7.3 - Subversion (SVN) 1.14.1 - Swig 4.0.2 @@ -82,12 +83,12 @@ - zstd 1.5.0 ### CLI Tools -- Alibaba Cloud CLI 3.0.97 -- AWS CLI 2.3.0 -- AWS SAM CLI 1.34.1 +- Alibaba Cloud CLI 3.0.99 +- AWS CLI 2.3.4 +- AWS SAM CLI 1.35.0 - AWS Session Manager CLI 1.2.279.0 - Azure CLI 2.30.0 -- Azure DevOps CLI extension 0.21.0 +- Azure DevOps CLI extension 0.22.0 - GitHub CLI 2.2.0 - Hub CLI 2.14.2 @@ -107,10 +108,10 @@ ### Browsers and webdrivers - Google Chrome 95.0.4638.69 -- Chrome Driver 95.0.4638.54 -- Microsoft Edge 95.0.1020.40 -- Microsoft Edge Driver 95.0.1020.40 -- Mozilla Firefox 94.0 +- Chrome Driver 95.0.4638.69 +- Microsoft Edge 95.0.1020.44 +- Microsoft Edge Driver 95.0.1020.44 +- Mozilla Firefox 94.0.1 - Gecko Driver 0.30.0 - IE Driver 3.150.1.1 - Selenium server 3.141.59 @@ -150,8 +151,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Version | Architecture | Environment Variable | | ------- | ------------ | -------------------- | | 1.15.15 | x64 | GOROOT_1_15_X64 | -| 1.16.9 (Default) | x64 | GOROOT_1_16_X64 | -| 1.17.2 | x64 | GOROOT_1_17_X64 | +| 1.16.10 (Default) | x64 | GOROOT_1_16_X64 | +| 1.17.3 | x64 | GOROOT_1_17_X64 | #### Node @@ -166,10 +167,10 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Python | Version | Architecture | | ------- | ------------ | -| 3.7.9 | x64 | -| 3.8.10 | x64 | -| 3.9.7 (Default) | x64 | -| 3.10.0 | x64 | +| 3.7.9 | x64, x86 | +| 3.8.10 | x64, x86 | +| 3.9.8 (Default) | x64, x86 | +| 3.10.0 | x64, x86 | #### Ruby @@ -205,7 +206,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### MongoDB | Version | ServiceName | ServiceStatus | ServiceStartType | | ------- | ----------- | ------------- | ---------------- | -| 5.0.3.0 | MongoDB | Running | Automatic | +| 5.1.0.0 | MongoDB | Running | Automatic | @@ -220,195 +221,195 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Name | Version | ConfigFile | ServiceName | ServiceStatus | ListenPort | | ------ | ------- | ------------------------------------- | ----------- | ------------- | ---------- | | Apache | 2.4.51 | C:\tools\Apache24\conf\httpd.conf | Apache | Stopped | 80 | -| Nginx | 1.21.3 | C:\tools\nginx-1.21.3\conf\nginx.conf | nginx | Stopped | 80 | +| Nginx | 1.21.4 | C:\tools\nginx-1.21.4\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2022 -| Name | Version | Path | -| ----------------------------- | -------------- | ----------------------------------------------------- | -| Visual Studio Enterprise 2022 | 17.0.31825.309 | C:\Program Files\Microsoft Visual Studio\2022\Preview | +| Name | Version | Path | +| ----------------------------- | ------------- | -------------------------------------------------------- | +| Visual Studio Enterprise 2022 | 17.0.31903.59 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | #### Workloads, components and extensions: -| Package | Version | -| ------------------------------------------------------------------------- | --------------- | -| Component.Android.NDK.R21E | 17.0.31804.368 | -| Component.Android.SDK.MAUI | 17.0.31804.368 | -| Component.Android.SDK25.Private | 17.0.31804.368 | -| Component.Ant | 1.9.3.8 | -| Component.Linux.CMake | 17.0.31804.368 | -| Component.MDD.Android | 17.0.31804.368 | -| Component.MDD.Linux | 17.0.31804.368 | -| Component.Microsoft.VisualStudio.LiveShare.2022 | 1.0.4647 | -| Component.Microsoft.VisualStudio.RazorExtension | 17.0.31804.368 | -| Component.Microsoft.VisualStudio.Web.AzureFunctions | 17.0.31804.368 | -| Component.Microsoft.Web.LibraryManager | 17.0.31804.368 | -| Component.Microsoft.WebTools.BrowserLink.WebLivePreview | 17.0.31.12604 | -| Component.OpenJDK | 17.0.31804.368 | -| Component.UnityEngine.x64 | 17.0.31804.368 | -| Component.Unreal | 17.0.31804.368 | -| Component.Unreal.Android | 17.0.31804.368 | -| Component.Xamarin | 17.0.31804.368 | -| Component.Xamarin.RemotedSimulator | 17.0.31807.282 | -| Microsoft.Component.Azure.DataLake.Tools | 17.0.31805.14 | -| Microsoft.Component.ClickOnce | 17.0.31804.368 | -| Microsoft.Component.MSBuild | 17.0.31804.368 | -| Microsoft.Component.NetFX.Native | 17.0.31804.368 | -| Microsoft.Component.PythonTools | 17.0.31804.368 | -| Microsoft.Component.PythonTools.Web | 17.0.31804.368 | -| Microsoft.Component.VC.Runtime.UCRTSDK | 17.0.31804.368 | -| Microsoft.ComponentGroup.Blend | 17.0.31804.368 | -| Microsoft.ComponentGroup.ClickOnce.Publish | 17.0.31804.368 | -| Microsoft.Net.Component.4.5.2.TargetingPack | 17.0.31804.368 | -| Microsoft.Net.Component.4.6.2.TargetingPack | 17.0.31804.368 | -| Microsoft.Net.Component.4.6.TargetingPack | 17.0.31804.368 | -| Microsoft.Net.Component.4.7.1.TargetingPack | 17.0.31804.368 | -| Microsoft.Net.Component.4.7.2.TargetingPack | 17.0.31804.368 | -| Microsoft.Net.Component.4.8.SDK | 17.0.31804.368 | -| Microsoft.Net.Component.4.8.TargetingPack | 17.0.31804.368 | -| Microsoft.Net.ComponentGroup.4.8.DeveloperTools | 17.0.31804.368 | -| Microsoft.Net.ComponentGroup.DevelopmentPrerequisites | 17.0.31804.368 | -| Microsoft.Net.ComponentGroup.TargetingPacks.Common | 17.0.31804.368 | -| Microsoft.NetCore.Component.DevelopmentTools | 17.0.31804.368 | -| Microsoft.NetCore.Component.Runtime.6.0 | 17.0.31807.268 | -| Microsoft.NetCore.Component.SDK | 17.0.31807.268 | -| Microsoft.NetCore.Component.Web | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.AppInsights.Tools | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.AspNet | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.AspNet45 | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.Azure.AuthoringTools | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.Azure.ClientLibs | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.Azure.Compute.Emulator | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.Azure.Powershell | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.Azure.ResourceManager.Tools | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.Azure.ServiceFabric.Tools | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.Azure.Waverton | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.Azure.Waverton.BuildTools | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.ClassDesigner | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.CodeMap | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.Common.Azure.Tools | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.CoreEditor | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.Debugger.JustInTime | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.Debugger.Snapshot | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.DiagnosticTools | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.DockerTools | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.DotNetModelBuilder | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.EntityFramework | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.FSharp | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.FSharp.Desktop | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.FSharp.WebTemplates | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.GraphDocument | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.Graphics | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.Graphics.Tools | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.IISExpress | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.IntelliCode | 17.0.31821.396 | -| Microsoft.VisualStudio.Component.IntelliTrace.FrontEnd | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.JavaScript.Diagnostics | 17.0.31815.197 | -| Microsoft.VisualStudio.Component.JavaScript.TypeScript | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.LinqToSql | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.LiveUnitTesting | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.ManagedDesktop.Core | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.ManagedDesktop.Prerequisites | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.Merq | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.MonoDebugger | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.MSODBC.SQL | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.MSSQL.CMDLnUtils | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.Node.Tools | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.NuGet | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.NuGet.BuildTools | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.PortableLibrary | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.Roslyn.Compiler | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.Roslyn.LanguageServices | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.Sharepoint.Tools | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.SQL.CLR | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.SQL.DataSources | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.SQL.LocalDB.Runtime | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.SQL.SSDT | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.TeamOffice | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.TestTools.CodedUITest | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.TestTools.WebLoadTest | 17.0.31815.197 | -| Microsoft.VisualStudio.Component.TextTemplating | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.TypeScript.TSServer | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.Unity | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM.Spectre | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM64 | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM64.Spectre | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64 | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64.Spectre | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.VC.ASAN | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.VC.ATL | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.VC.ATL.ARM | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.VC.ATL.ARM64 | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.VC.ATL.ARM64EC | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.VC.ATL.Spectre | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.VC.ATLMFC | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.VC.ATLMFC.Spectre | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.VC.CLI.Support | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.VC.CMake.Project | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.VC.CoreIde | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.VC.DiagnosticTools | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.VC.Llvm.ClangToolset | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.VC.MFC.ARM | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.VC.MFC.ARM64 | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.VC.MFC.ARM64EC | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.VC.Redist.14.Latest | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.VC.Runtimes.ARM64.Spectre | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.VC.Runtimes.x86.x64.Spectre | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.VC.TestAdapterForBoostTest | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.VC.TestAdapterForGoogleTest | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.VC.Tools.ARM | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.VC.Tools.ARM64 | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.VC.Tools.ARM64EC | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.VC.Tools.x86.x64 | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.VC.v141.ATL | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.VC.v141.ATL.Spectre | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.VC.v141.MFC | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.VC.v141.MFC.Spectre | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.VC.v141.x86.x64 | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.VC.v141.x86.x64.Spectre | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.VSSDK | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.Wcf.Tooling | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.Web | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.WebDeploy | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.Windows10SDK | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.Windows10SDK.19041 | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.Windows10SDK.20348 | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.Windows11SDK.22000 | 17.0.31821.396 | -| Microsoft.VisualStudio.Component.Workflow | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.WslDebugging | 17.0.31804.368 | -| Microsoft.VisualStudio.ComponentGroup.ArchitectureTools.Native | 17.0.31804.368 | -| Microsoft.VisualStudio.ComponentGroup.Azure.CloudServices | 17.0.31804.368 | -| Microsoft.VisualStudio.ComponentGroup.Azure.Prerequisites | 17.0.31804.368 | -| Microsoft.VisualStudio.ComponentGroup.Azure.ResourceManager.Tools | 17.0.31804.368 | -| Microsoft.VisualStudio.ComponentGroup.AzureFunctions | 17.0.31804.368 | -| Microsoft.VisualStudio.ComponentGroup.MSIX.Packaging | 17.0.31806.525 | -| Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core | 17.0.31804.368 | -| Microsoft.VisualStudio.ComponentGroup.UWP.NetCoreAndStandard | 17.0.31804.368 | -| Microsoft.VisualStudio.ComponentGroup.UWP.Support | 17.0.31804.368 | -| Microsoft.VisualStudio.ComponentGroup.UWP.Xamarin | 17.0.31804.368 | -| Microsoft.VisualStudio.ComponentGroup.VisualStudioExtension.Prerequisites | 17.0.31804.368 | -| Microsoft.VisualStudio.ComponentGroup.Web | 17.0.31804.368 | -| Microsoft.VisualStudio.ComponentGroup.Web.CloudTools | 17.0.31804.368 | -| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions | 17.0.31804.368 | -| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.CMake | 17.0.31804.368 | -| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.TemplateEngine | 17.0.31804.368 | -| Microsoft.VisualStudio.Workload.Azure | 17.0.31804.368 | -| Microsoft.VisualStudio.Workload.CoreEditor | 17.0.31804.368 | -| Microsoft.VisualStudio.Workload.Data | 17.0.31804.368 | -| Microsoft.VisualStudio.Workload.DataScience | 17.0.31821.396 | -| Microsoft.VisualStudio.Workload.ManagedDesktop | 17.0.31804.368 | -| Microsoft.VisualStudio.Workload.ManagedGame | 17.0.31804.368 | -| Microsoft.VisualStudio.Workload.NativeCrossPlat | 17.0.31804.368 | -| Microsoft.VisualStudio.Workload.NativeDesktop | 17.0.31804.368 | -| Microsoft.VisualStudio.Workload.NativeGame | 17.0.31804.368 | -| Microsoft.VisualStudio.Workload.NativeMobile | 17.0.31804.368 | -| Microsoft.VisualStudio.Workload.NetCrossPlat | 17.0.31821.5396 | -| Microsoft.VisualStudio.Workload.NetWeb | 17.0.31804.368 | -| Microsoft.VisualStudio.Workload.Node | 17.0.31804.368 | -| Microsoft.VisualStudio.Workload.Office | 17.0.31804.368 | -| Microsoft.VisualStudio.Workload.Python | 17.0.31804.368 | -| Microsoft.VisualStudio.Workload.Universal | 17.0.31804.368 | -| Microsoft.VisualStudio.Workload.VisualStudioExtension | 17.0.31804.368 | +| Package | Version | +| ------------------------------------------------------------------------- | -------------- | +| Component.Android.NDK.R21E | 17.0.31804.368 | +| Component.Android.SDK.MAUI | 17.0.31804.368 | +| Component.Android.SDK25.Private | 17.0.31804.368 | +| Component.Ant | 1.9.3.8 | +| Component.Linux.CMake | 17.0.31804.368 | +| Component.MDD.Android | 17.0.31804.368 | +| Component.MDD.Linux | 17.0.31804.368 | +| Component.Microsoft.VisualStudio.LiveShare.2022 | 1.0.4647 | +| Component.Microsoft.VisualStudio.RazorExtension | 17.0.31804.368 | +| Component.Microsoft.VisualStudio.Web.AzureFunctions | 17.0.31804.368 | +| Component.Microsoft.Web.LibraryManager | 17.0.31804.368 | +| Component.Microsoft.WebTools.BrowserLink.WebLivePreview | 17.0.31.12604 | +| Component.OpenJDK | 17.0.31804.368 | +| Component.UnityEngine.x64 | 17.0.31804.368 | +| Component.Unreal | 17.0.31804.368 | +| Component.Unreal.Android | 17.0.31804.368 | +| Component.Xamarin | 17.0.31804.368 | +| Component.Xamarin.RemotedSimulator | 17.0.31807.282 | +| Microsoft.Component.Azure.DataLake.Tools | 17.0.31805.14 | +| Microsoft.Component.ClickOnce | 17.0.31804.368 | +| Microsoft.Component.MSBuild | 17.0.31804.368 | +| Microsoft.Component.NetFX.Native | 17.0.31804.368 | +| Microsoft.Component.PythonTools | 17.0.31804.368 | +| Microsoft.Component.PythonTools.Web | 17.0.31804.368 | +| Microsoft.Component.VC.Runtime.UCRTSDK | 17.0.31804.368 | +| Microsoft.ComponentGroup.Blend | 17.0.31804.368 | +| Microsoft.ComponentGroup.ClickOnce.Publish | 17.0.31804.368 | +| Microsoft.Net.Component.4.5.2.TargetingPack | 17.0.31804.368 | +| Microsoft.Net.Component.4.6.2.TargetingPack | 17.0.31804.368 | +| Microsoft.Net.Component.4.6.TargetingPack | 17.0.31804.368 | +| Microsoft.Net.Component.4.7.1.TargetingPack | 17.0.31804.368 | +| Microsoft.Net.Component.4.7.2.TargetingPack | 17.0.31804.368 | +| Microsoft.Net.Component.4.8.SDK | 17.0.31804.368 | +| Microsoft.Net.Component.4.8.TargetingPack | 17.0.31804.368 | +| Microsoft.Net.ComponentGroup.4.8.DeveloperTools | 17.0.31804.368 | +| Microsoft.Net.ComponentGroup.DevelopmentPrerequisites | 17.0.31804.368 | +| Microsoft.Net.ComponentGroup.TargetingPacks.Common | 17.0.31804.368 | +| Microsoft.NetCore.Component.DevelopmentTools | 17.0.31804.368 | +| Microsoft.NetCore.Component.Runtime.6.0 | 17.0.31902.203 | +| Microsoft.NetCore.Component.SDK | 17.0.31902.203 | +| Microsoft.NetCore.Component.Web | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.AppInsights.Tools | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.AspNet | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.AspNet45 | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.Azure.AuthoringTools | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.Azure.ClientLibs | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.Azure.Compute.Emulator | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.Azure.Powershell | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.Azure.ResourceManager.Tools | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.Azure.ServiceFabric.Tools | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.Azure.Waverton | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.Azure.Waverton.BuildTools | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.ClassDesigner | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.CodeMap | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.Common.Azure.Tools | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.CoreEditor | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.Debugger.JustInTime | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.Debugger.Snapshot | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.DiagnosticTools | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.DockerTools | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.DotNetModelBuilder | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.EntityFramework | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.FSharp | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.FSharp.Desktop | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.FSharp.WebTemplates | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.GraphDocument | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.Graphics | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.Graphics.Tools | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.IISExpress | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.IntelliCode | 17.0.31821.396 | +| Microsoft.VisualStudio.Component.IntelliTrace.FrontEnd | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.JavaScript.Diagnostics | 17.0.31815.197 | +| Microsoft.VisualStudio.Component.JavaScript.TypeScript | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.LinqToSql | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.LiveUnitTesting | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.ManagedDesktop.Core | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.ManagedDesktop.Prerequisites | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.Merq | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.MonoDebugger | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.MSODBC.SQL | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.MSSQL.CMDLnUtils | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.Node.Tools | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.NuGet | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.NuGet.BuildTools | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.PortableLibrary | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.Roslyn.Compiler | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.Roslyn.LanguageServices | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.Sharepoint.Tools | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.SQL.CLR | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.SQL.DataSources | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.SQL.LocalDB.Runtime | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.SQL.SSDT | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.TeamOffice | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.TestTools.CodedUITest | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.TestTools.WebLoadTest | 17.0.31815.197 | +| Microsoft.VisualStudio.Component.TextTemplating | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.TypeScript.TSServer | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.Unity | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM.Spectre | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM64 | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM64.Spectre | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64 | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64.Spectre | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.VC.ASAN | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.VC.ATL | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.VC.ATL.ARM | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.VC.ATL.ARM64 | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.VC.ATL.ARM64EC | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.VC.ATL.Spectre | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.VC.ATLMFC | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.VC.ATLMFC.Spectre | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.VC.CLI.Support | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.VC.CMake.Project | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.VC.CoreIde | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.VC.DiagnosticTools | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.VC.Llvm.ClangToolset | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.VC.MFC.ARM | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.VC.MFC.ARM64 | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.VC.MFC.ARM64EC | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.VC.Redist.14.Latest | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.VC.Runtimes.ARM64.Spectre | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.VC.Runtimes.x86.x64.Spectre | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.VC.TestAdapterForBoostTest | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.VC.TestAdapterForGoogleTest | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.VC.Tools.ARM | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.VC.Tools.ARM64 | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.VC.Tools.ARM64EC | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.VC.Tools.x86.x64 | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.VC.v141.ATL | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.VC.v141.ATL.Spectre | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.VC.v141.MFC | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.VC.v141.MFC.Spectre | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.VC.v141.x86.x64 | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.VC.v141.x86.x64.Spectre | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.VSSDK | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.Wcf.Tooling | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.Web | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.WebDeploy | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.Windows10SDK | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.Windows10SDK.19041 | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.Windows10SDK.20348 | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.Windows11SDK.22000 | 17.0.31821.396 | +| Microsoft.VisualStudio.Component.Workflow | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.WslDebugging | 17.0.31804.368 | +| Microsoft.VisualStudio.ComponentGroup.ArchitectureTools.Native | 17.0.31804.368 | +| Microsoft.VisualStudio.ComponentGroup.Azure.CloudServices | 17.0.31804.368 | +| Microsoft.VisualStudio.ComponentGroup.Azure.Prerequisites | 17.0.31804.368 | +| Microsoft.VisualStudio.ComponentGroup.Azure.ResourceManager.Tools | 17.0.31804.368 | +| Microsoft.VisualStudio.ComponentGroup.AzureFunctions | 17.0.31804.368 | +| Microsoft.VisualStudio.ComponentGroup.MSIX.Packaging | 17.0.31806.525 | +| Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core | 17.0.31804.368 | +| Microsoft.VisualStudio.ComponentGroup.UWP.NetCoreAndStandard | 17.0.31804.368 | +| Microsoft.VisualStudio.ComponentGroup.UWP.Support | 17.0.31804.368 | +| Microsoft.VisualStudio.ComponentGroup.UWP.Xamarin | 17.0.31804.368 | +| Microsoft.VisualStudio.ComponentGroup.VisualStudioExtension.Prerequisites | 17.0.31804.368 | +| Microsoft.VisualStudio.ComponentGroup.Web | 17.0.31804.368 | +| Microsoft.VisualStudio.ComponentGroup.Web.CloudTools | 17.0.31804.368 | +| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions | 17.0.31804.368 | +| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.CMake | 17.0.31804.368 | +| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.TemplateEngine | 17.0.31804.368 | +| Microsoft.VisualStudio.Workload.Azure | 17.0.31804.368 | +| Microsoft.VisualStudio.Workload.CoreEditor | 17.0.31804.368 | +| Microsoft.VisualStudio.Workload.Data | 17.0.31804.368 | +| Microsoft.VisualStudio.Workload.DataScience | 17.0.31821.396 | +| Microsoft.VisualStudio.Workload.ManagedDesktop | 17.0.31804.368 | +| Microsoft.VisualStudio.Workload.ManagedGame | 17.0.31804.368 | +| Microsoft.VisualStudio.Workload.NativeCrossPlat | 17.0.31804.368 | +| Microsoft.VisualStudio.Workload.NativeDesktop | 17.0.31804.368 | +| Microsoft.VisualStudio.Workload.NativeGame | 17.0.31804.368 | +| Microsoft.VisualStudio.Workload.NativeMobile | 17.0.31804.368 | +| Microsoft.VisualStudio.Workload.NetCrossPlat | 17.0.31902.203 | +| Microsoft.VisualStudio.Workload.NetWeb | 17.0.31804.368 | +| Microsoft.VisualStudio.Workload.Node | 17.0.31804.368 | +| Microsoft.VisualStudio.Workload.Office | 17.0.31804.368 | +| Microsoft.VisualStudio.Workload.Python | 17.0.31804.368 | +| Microsoft.VisualStudio.Workload.Universal | 17.0.31804.368 | +| Microsoft.VisualStudio.Workload.VisualStudioExtension | 17.0.31804.368 | #### Microsoft Visual C++: @@ -425,17 +426,17 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### .NET Core SDK `Location C:\Program Files\dotnet\sdk` -- 3.1.120 3.1.202 3.1.302 3.1.414 5.0.104 5.0.208 5.0.303 5.0.402 6.0.100-rc.2.21505.57 +- 3.1.120 3.1.202 3.1.302 3.1.415 5.0.104 5.0.209 5.0.303 5.0.403 6.0.100 ### .NET Core Runtime `Location: C:\Program Files\dotnet\shared\Microsoft.AspNetCore.App` -- 3.1.4 3.1.6 3.1.19 3.1.20 5.0.4 5.0.9 5.0.10 5.0.11 6.0.0-rc.2.21480.10 +- 3.1.4 3.1.6 3.1.20 3.1.21 5.0.4 5.0.9 5.0.11 5.0.12 6.0.0 `Location: C:\Program Files\dotnet\shared\Microsoft.NETCore.App` -- 3.1.4 3.1.6 3.1.19 3.1.20 5.0.4 5.0.9 5.0.10 5.0.11 6.0.0-rc.2.21480.5 +- 3.1.4 3.1.6 3.1.20 3.1.21 5.0.4 5.0.9 5.0.11 5.0.12 6.0.0 `Location: C:\Program Files\dotnet\shared\Microsoft.WindowsDesktop.App` -- 3.1.4 3.1.6 3.1.20 5.0.4 5.0.9 5.0.11 6.0.0-rc.2.21501.6 +- 3.1.4 3.1.6 3.1.20 3.1.21 5.0.4 5.0.9 5.0.12 6.0.0 ### .NET Framework `Type: Developer Pack` @@ -443,7 +444,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 4.8 ### PowerShell Tools -- PowerShell 7.1.5 +- PowerShell 7.2.0 #### Azure Powershell Modules | Module | Version | Path | @@ -497,11 +498,11 @@ All other versions are saved but not installed. ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2022 | sha256:4d22d9b5d0a5338a88d4b4127c0cacc6396d805e29c118583f468a5aea91d11d | 2021-10-12 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2022 | sha256:83db307a518011c4759daaff65d8c913d4dd53f8a2e55eaae7a1b2310536c49c | 2021-10-12 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:0336b90d7653044a87d7d6a974a0fc9f1d675a3163601d24b824f787a8811bea | 2021-10-12 | -| mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:b6f730b1dc1de3d6158ec284eb90a3bf657a70ad67201dcb98b51d05ff0ae3a3 | 2021-10-07 | -| mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:7a755066b33150c44ab196118e84a070df556bcaeccb08818d1993eb3a37a6b8 | 2021-10-07 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2022 | sha256:b6a565f5242df03ba025d250a2af06fbde85373549af885159d7e8b9e93ec615 | 2021-11-09 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2022 | sha256:c6e169c86508cd70bf81e881c7084124bb4c765cb171cb9c1508851b627efb84 | 2021-11-09 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:11db21e65550210228cf257c56fe81bd40bd99912b597d277ab869e38215bfde | 2021-11-09 | +| mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:c093aac93e3771a85832fcf27d21dc5c12751091255a79be5a05d9bfb48c6a73 | 2021-11-03 | +| mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:35b987eaca23cce6456c07adea57a155352dce50adf0539fd57e68f3af3e8e29 | 2021-11-03 | From fa7f7eac99ac8be26fc4a420d7f35783824aa0ac Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Fri, 12 Nov 2021 10:59:53 +0300 Subject: [PATCH 0731/3485] [Windows] Pin mongodb to 5.0 (#4482) * [Windows] pin mongodb to 5.0 * Change version argument to include "=" --- images/win/scripts/Installers/Install-MongoDB.ps1 | 2 +- images/win/toolsets/toolset-2016.json | 2 +- images/win/toolsets/toolset-2019.json | 2 +- images/win/toolsets/toolset-2022.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/images/win/scripts/Installers/Install-MongoDB.ps1 b/images/win/scripts/Installers/Install-MongoDB.ps1 index 8f4a97786003..2265b40aaa4f 100644 --- a/images/win/scripts/Installers/Install-MongoDB.ps1 +++ b/images/win/scripts/Installers/Install-MongoDB.ps1 @@ -5,7 +5,7 @@ $toolsetVersion = (Get-ToolsetContent).mongodb.version $latestChocoPackage = Get-LatestChocoPackageVersion -TargetVersion $toolsetVersion -PackageName "mongodb" -Choco-Install -PackageName mongodb -ArgumentList "--version $latestChocoPackage" +Choco-Install -PackageName mongodb -ArgumentList "--version=$latestChocoPackage" $mongoPath = (Get-CimInstance Win32_Service -Filter "Name LIKE 'mongodb'").PathName $mongoBin = Split-Path -Path $mongoPath.split('"')[1] Add-MachinePathItem "$mongoBin" diff --git a/images/win/toolsets/toolset-2016.json b/images/win/toolsets/toolset-2016.json index 49141ca6decf..bf2c21ada6cc 100644 --- a/images/win/toolsets/toolset-2016.json +++ b/images/win/toolsets/toolset-2016.json @@ -426,6 +426,6 @@ "version": "5.7" }, "mongodb": { - "version": "5" + "version": "5.0" } } diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index 2726268d04c7..5cb45bbd4e1f 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -458,6 +458,6 @@ "version": "5.7" }, "mongodb": { - "version": "5" + "version": "5.0" } } diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index d7c19905b2f7..12ab1ba93d78 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -308,6 +308,6 @@ "version": "8.0" }, "mongodb": { - "version": "5" + "version": "5.0" } } From dec1d799e0dc1194633f4d5ea8d5ada66c6b7de6 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Fri, 12 Nov 2021 11:00:03 +0300 Subject: [PATCH 0732/3485] [Ubuntu] Pin mongodb version to 5.0 (#4483) --- images/linux/toolsets/toolset-1804.json | 2 +- images/linux/toolsets/toolset-2004.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index c78f983c1304..600f6064371a 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -328,6 +328,6 @@ } ], "mongodb": { - "version": "5" + "version": "5.0" } } diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index ddf23c82f384..96b1454d4f00 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -333,6 +333,6 @@ } ], "mongodb": { - "version": "5" + "version": "5.0" } } From c025446a959f8e97afe7847e7a2718d7091e4d88 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Fri, 12 Nov 2021 11:00:19 +0300 Subject: [PATCH 0733/3485] [macOS] Pin mongodb version to 5.0 (#4484) --- images/macos/toolsets/toolset-10.14.json | 2 +- images/macos/toolsets/toolset-10.15.json | 2 +- images/macos/toolsets/toolset-11.json | 2 +- images/macos/toolsets/toolset-12.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/images/macos/toolsets/toolset-10.14.json b/images/macos/toolsets/toolset-10.14.json index 7e4f7899c54f..420f0ecc4eaa 100644 --- a/images/macos/toolsets/toolset-10.14.json +++ b/images/macos/toolsets/toolset-10.14.json @@ -385,6 +385,6 @@ ] }, "mongodb": { - "version": "5" + "version": "5.0" } } diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index 2c499ad3ef65..210fc172376c 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -343,6 +343,6 @@ "version": "13" }, "mongodb": { - "version": "5" + "version": "5.0" } } \ No newline at end of file diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index 4de3e965c1a3..cda28c04fb8e 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -295,6 +295,6 @@ "version": "13" }, "mongodb": { - "version": "5" + "version": "5.0" } } \ No newline at end of file diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index 17e22e0dd19d..08ee9efde560 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -193,6 +193,6 @@ ] }, "mongodb": { - "version": "5" + "version": "5.0" } } From ff555147fd5ad1cc157f875801d5c2fcb69caf01 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Fri, 12 Nov 2021 15:51:50 +0300 Subject: [PATCH 0734/3485] Add wasm.tools component to VS2022 (#4490) --- images/win/toolsets/toolset-2022.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index 12ab1ba93d78..94c509750253 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -236,7 +236,8 @@ "Microsoft.VisualStudio.Workload.Python", "Microsoft.VisualStudio.Workload.Universal", "Microsoft.VisualStudio.Workload.VisualStudioExtension", - "Component.MDD.Linux" + "Component.MDD.Linux", + "wasm.tools" ], "vsix": [] }, From 6dc8234648564472f721007db2336b03cec1b8a1 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Fri, 12 Nov 2021 21:43:33 +0300 Subject: [PATCH 0735/3485] [macOS] Remove node version 10.x (#4477) --- images/macos/tests/Node.Tests.ps1 | 4 ++-- images/macos/toolsets/toolset-10.15.json | 5 ++--- images/macos/toolsets/toolset-11.json | 5 ++--- images/macos/toolsets/toolset-12.json | 5 ++--- 4 files changed, 8 insertions(+), 11 deletions(-) diff --git a/images/macos/tests/Node.Tests.ps1 b/images/macos/tests/Node.Tests.ps1 index baeab0464dd0..5f9e873410a4 100644 --- a/images/macos/tests/Node.Tests.ps1 +++ b/images/macos/tests/Node.Tests.ps1 @@ -42,8 +42,8 @@ Describe "nvm" { } Context "nvm versions" { - $NVM_VERSIONS = @(10, 12, 14) - $testCases = $NVM_VERSIONS | ForEach-Object { @{NvmVersion = $_} } + [array]$nvmVersions = Get-ToolsetValue 'node.nvm_versions' + $testCases = $nvmVersions | ForEach-Object { @{NvmVersion = $_} } It "" -TestCases $testCases { param ( diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index 210fc172376c..76df1ffa7bbf 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -273,7 +273,6 @@ "platform" : "darwin", "arch": "x64", "versions": [ - "10.*", "12.*", "14.*", "16.*" @@ -334,9 +333,9 @@ "node": { "default": "14", "nvm_versions": [ - "10", "12", - "14" + "14", + "16" ] }, "llvm": { diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index cda28c04fb8e..b2ef89a48b93 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -225,7 +225,6 @@ "platform" : "darwin", "arch": "x64", "versions": [ - "10.*", "12.*", "14.*", "16.*" @@ -286,9 +285,9 @@ "node": { "default": "14", "nvm_versions": [ - "10", "12", - "14" + "14", + "16" ] }, "llvm": { diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index 08ee9efde560..3e0434f0a78c 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -131,7 +131,6 @@ "platform" : "darwin", "arch": "x64", "versions": [ - "10.*", "12.*", "14.*", "16.*" @@ -187,9 +186,9 @@ "node": { "default": "14", "nvm_versions": [ - "10", "12", - "14" + "14", + "16" ] }, "mongodb": { From fad30aa851abbe958b4e1743f8628317fab44faa Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Mon, 15 Nov 2021 12:54:35 +0300 Subject: [PATCH 0736/3485] [Windows] move llvm to toolset (#4487) --- images/win/scripts/Installers/Install-LLVM.ps1 | 10 ++++++++++ images/win/scripts/Tests/LLVM.Tests.ps1 | 7 +++++++ images/win/scripts/Tests/Tools.Tests.ps1 | 9 --------- images/win/toolsets/toolset-2016.json | 4 +++- images/win/toolsets/toolset-2019.json | 4 +++- images/win/windows2016.json | 3 ++- images/win/windows2019.json | 3 ++- 7 files changed, 27 insertions(+), 13 deletions(-) create mode 100644 images/win/scripts/Installers/Install-LLVM.ps1 create mode 100644 images/win/scripts/Tests/LLVM.Tests.ps1 diff --git a/images/win/scripts/Installers/Install-LLVM.ps1 b/images/win/scripts/Installers/Install-LLVM.ps1 new file mode 100644 index 000000000000..07c7c46e2de6 --- /dev/null +++ b/images/win/scripts/Installers/Install-LLVM.ps1 @@ -0,0 +1,10 @@ +################################################################################ +## File: Install-LLVM.ps1 +## Desc: Install the latest stable version of llvm and clang compilers +################################################################################ + +$llvmVersion = (Get-ToolsetContent).llvm.version +$latestChocoVersion = Get-LatestChocoPackageVersion -TargetVersion $llvmVersion -PackageName "llvm" +Choco-Install -PackageName llvm -ArgumentList "--version $latestChocoVersion" + +Invoke-PesterTests -TestFile "LLVM" diff --git a/images/win/scripts/Tests/LLVM.Tests.ps1 b/images/win/scripts/Tests/LLVM.Tests.ps1 new file mode 100644 index 000000000000..a20fd96098fb --- /dev/null +++ b/images/win/scripts/Tests/LLVM.Tests.ps1 @@ -0,0 +1,7 @@ +Describe "Clang/LLVM" { + It "Clang/LLVM installed and version is correct" { + $toolsetVersion = (Get-ToolsetContent).llvm.version + $clangVersion = clang --version + $clangVersion[0] | Should -BeLike "*${toolsetVersion}*" + } +} \ No newline at end of file diff --git a/images/win/scripts/Tests/Tools.Tests.ps1 b/images/win/scripts/Tests/Tools.Tests.ps1 index c5578bffd4ed..0309d6da9ceb 100644 --- a/images/win/scripts/Tests/Tools.Tests.ps1 +++ b/images/win/scripts/Tests/Tools.Tests.ps1 @@ -81,15 +81,6 @@ Describe "KubernetesTools" { } } -Describe "LLVM" { - It "" -TestCases @( - @{ ToolName = "clang" } - @{ ToolName = "clang++" } - ) { - "$ToolName --version" | Should -ReturnZeroExitCode - } -} - Describe "Mingw64" { It "" -TestCases @( @{ ToolName = "gcc" } diff --git a/images/win/toolsets/toolset-2016.json b/images/win/toolsets/toolset-2016.json index bf2c21ada6cc..118fd6c3f4de 100644 --- a/images/win/toolsets/toolset-2016.json +++ b/images/win/toolsets/toolset-2016.json @@ -397,7 +397,6 @@ { "name": "gitversion.portable" }, { "name": "innosetup" }, { "name": "jq" }, - { "name": "llvm" }, { "name": "NuGet.CommandLine" }, { "name": "openssl.light", @@ -427,5 +426,8 @@ }, "mongodb": { "version": "5.0" + }, + "llvm": { + "version": "13" } } diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index 5cb45bbd4e1f..7ddacfbec7f1 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -429,7 +429,6 @@ { "name": "gitversion.portable" }, { "name": "innosetup" }, { "name": "jq" }, - { "name": "llvm" }, { "name": "NuGet.CommandLine" }, { "name": "openssl.light", @@ -459,5 +458,8 @@ }, "mongodb": { "version": "5.0" + }, + "llvm": { + "version": "13" } } diff --git a/images/win/windows2016.json b/images/win/windows2016.json index 0222a54f7181..56b3217066c3 100644 --- a/images/win/windows2016.json +++ b/images/win/windows2016.json @@ -206,7 +206,8 @@ "{{ template_dir }}/scripts/Installers/Install-Selenium.ps1", "{{ template_dir }}/scripts/Installers/Install-IEWebDriver.ps1", "{{ template_dir }}/scripts/Installers/Install-Apache.ps1", - "{{ template_dir }}/scripts/Installers/Install-Nginx.ps1" + "{{ template_dir }}/scripts/Installers/Install-Nginx.ps1", + "{{ template_dir }}/scripts/Installers/Install-LLVM.ps1" ] }, { diff --git a/images/win/windows2019.json b/images/win/windows2019.json index 5a0dfcf43e64..dac81ffab774 100644 --- a/images/win/windows2019.json +++ b/images/win/windows2019.json @@ -267,7 +267,8 @@ "{{ template_dir }}/scripts/Installers/Configure-DynamicPort.ps1", "{{ template_dir }}/scripts/Installers/Configure-GDIProcessHandleQuota.ps1", "{{ template_dir }}/scripts/Installers/Configure-Shell.ps1", - "{{ template_dir }}/scripts/Installers/Enable-DeveloperMode.ps1" + "{{ template_dir }}/scripts/Installers/Enable-DeveloperMode.ps1", + "{{ template_dir }}/scripts/Installers/Install-LLVM.ps1" ] }, { From d09b1f8f9c5317fe58ba7a9df212d82c0199b68a Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Mon, 15 Nov 2021 14:51:38 +0300 Subject: [PATCH 0737/3485] [Ubuntu] add maven back to toolset (#4507) --- images/linux/scripts/installers/java-tools.sh | 11 +++++------ images/linux/toolsets/toolset-1804.json | 3 ++- images/linux/toolsets/toolset-2004.json | 3 ++- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/images/linux/scripts/installers/java-tools.sh b/images/linux/scripts/installers/java-tools.sh index fcd863e2985e..f9e6dc30b94d 100644 --- a/images/linux/scripts/installers/java-tools.sh +++ b/images/linux/scripts/installers/java-tools.sh @@ -34,7 +34,7 @@ for JAVA_VERSION in ${JAVA_VERSIONS_LIST[@]}; do if [[ -z $fullJavaVersion ]]; then fullJavaVersion=$(java -fullversion 2>&1 | tr -d "\"" | tr "+" "-" | awk '{print $4}') fi - + javaToolcacheVersionPath="$JAVA_TOOLCACHE_PATH/$fullJavaVersion" mkdir -p "$javaToolcacheVersionPath" @@ -57,12 +57,11 @@ apt-fast install -y --no-install-recommends ant ant-optional echo "ANT_HOME=/usr/share/ant" | tee -a /etc/environment # Install Maven -json=$(curl -s "https://api.github.com/repos/apache/maven/tags") -latestMavenVersion=$(echo $json | jq -r '.[] | select(.name | match("^(maven-[0-9.]*)$")) | .name' | head -1 | cut -d- -f2) -mavenDownloadUrl="https://www-eu.apache.org/dist/maven/maven-3/${latestMavenVersion}/binaries/apache-maven-${latestMavenVersion}-bin.zip" -download_with_retries $mavenDownloadUrl "/tmp" "maven.zip" +mavenVersion=$(get_toolset_value '.java.maven') +mavenDownloadUrl="https://www-eu.apache.org/dist/maven/maven-3/${mavenVersion}/binaries/apache-maven-${mavenVersion}-bin.zip" +download_with_retries ${mavenDownloadUrl} "/tmp" "maven.zip" unzip -qq -d /usr/share /tmp/maven.zip -ln -s /usr/share/apache-maven-${latestMavenVersion}/bin/mvn /usr/bin/mvn +ln -s /usr/share/apache-maven-${mavenVersion}/bin/mvn /usr/bin/mvn # Install Gradle # This script founds the latest gradle release from https://services.gradle.org/versions/all diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index 600f6064371a..0c69a6ceb305 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -73,7 +73,8 @@ "default": "8", "versions": [ "8", "11", "12" - ] + ], + "maven": "3.8.3" }, "android": { "platform_min_version": "23", diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index 96b1454d4f00..8c22702abd9e 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -74,7 +74,8 @@ "default": "11", "versions": [ "8", "11" - ] + ], + "maven": "3.8.3" }, "android": { "platform_min_version": "27", From 06c90a3200a1ec9d3efa6f9f4fb8cac24cf94bc1 Mon Sep 17 00:00:00 2001 From: Maxim Lobanov Date: Mon, 15 Nov 2021 18:35:50 +0100 Subject: [PATCH 0738/3485] [Ubuntu] Chmod known directories (#4509) * chmod known directories * nit space --- images/linux/scripts/installers/post-deployment.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/images/linux/scripts/installers/post-deployment.sh b/images/linux/scripts/installers/post-deployment.sh index c14c00d7768a..1ed878c583fb 100644 --- a/images/linux/scripts/installers/post-deployment.sh +++ b/images/linux/scripts/installers/post-deployment.sh @@ -6,11 +6,12 @@ mv -f /imagegeneration/post-generation /opt -# set chmod -R 777 /opt -if [[ -d "/opt" ]]; then - echo "chmod -R 777 /opt" - chmod -R 777 /opt -fi +echo "chmod -R 777 /opt" +chmod -R 777 /opt +echo "chmod -R 777 /usr/share" +chmod -R 777 /usr/share +echo "chmod -R 777 /home" +chmod -R 777 /home # remove installer and helper folders rm -rf $HELPER_SCRIPT_FOLDER From d3e74a5d7d72059b07f6da019baa669c5f782388 Mon Sep 17 00:00:00 2001 From: V-Zabayrachny <79155496+V-Zabayrachny@users.noreply.github.com> Date: Tue, 16 Nov 2021 11:32:09 +0300 Subject: [PATCH 0739/3485] [Windows] Add PHP to the toolset (#4493) --- images/win/scripts/Installers/Install-PHP.ps1 | 4 +++- images/win/scripts/Tests/PHP.Tests.ps1 | 15 +++++++++------ images/win/toolsets/toolset-2016.json | 3 +++ images/win/toolsets/toolset-2019.json | 3 +++ images/win/toolsets/toolset-2022.json | 3 +++ 5 files changed, 21 insertions(+), 7 deletions(-) diff --git a/images/win/scripts/Installers/Install-PHP.ps1 b/images/win/scripts/Installers/Install-PHP.ps1 index cbd73d5db6a9..40b1bcc0895e 100644 --- a/images/win/scripts/Installers/Install-PHP.ps1 +++ b/images/win/scripts/Installers/Install-PHP.ps1 @@ -5,7 +5,9 @@ # Install latest PHP in chocolatey $installDir = "c:\tools\php" -Choco-Install -PackageName php -ArgumentList "--force", "--params", "/InstallDir:$installDir" +$phpMajorMinor = (Get-ToolsetContent).php.version +$phpVersionToInstall = Get-LatestChocoPackageVersion -TargetVersion $phpMajorMinor -PackageName "php" +Choco-Install -PackageName php -ArgumentList "--params", "/InstallDir:$installDir", "--version=$phpVersionToInstall" # Install latest Composer in chocolatey Choco-Install -PackageName composer -ArgumentList "--ia", "/DEV=$installDir /PHP=$installDir" diff --git a/images/win/scripts/Tests/PHP.Tests.ps1 b/images/win/scripts/Tests/PHP.Tests.ps1 index 74469d9a1866..0e1013315532 100644 --- a/images/win/scripts/Tests/PHP.Tests.ps1 +++ b/images/win/scripts/Tests/PHP.Tests.ps1 @@ -1,13 +1,16 @@ Describe "PHP" { - It "Check in the PATH" -TestCases @( - @{ ToolName = "php" } - @{ ToolName = "composer" } - ) { - "$ToolName --version" | Should -ReturnZeroExitCode + It "Check PHP version" { + $phpMajorMinor = (Get-ToolsetContent).php.version + $phpInstalledVersion = php --version | Select-String -Pattern "PHP $phpMajorMinor" + $phpInstalledVersion | Should -BeLike "*${phpMajorMinor}*" + } + + It "Check Composer in the PATH" { + "composer --version" | Should -ReturnZeroExitCode } It "PHP Environment variables is set." { ${env:PHPROOT} | Should -Not -BeNullOrEmpty ${env:PHPROOT} | Should -Exist } -} \ No newline at end of file +} diff --git a/images/win/toolsets/toolset-2016.json b/images/win/toolsets/toolset-2016.json index 118fd6c3f4de..9cce92d0c1fe 100644 --- a/images/win/toolsets/toolset-2016.json +++ b/images/win/toolsets/toolset-2016.json @@ -427,6 +427,9 @@ "mongodb": { "version": "5.0" }, + "php": { + "version": "8.0" + }, "llvm": { "version": "13" } diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index 7ddacfbec7f1..1670e9860578 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -459,6 +459,9 @@ "mongodb": { "version": "5.0" }, + "php": { + "version": "8.0" + }, "llvm": { "version": "13" } diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index 94c509750253..796fcfdbe8d7 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -310,5 +310,8 @@ }, "mongodb": { "version": "5.0" + }, + "php": { + "version": "8.0" } } From ff41a760f0646b012039af297dba8d99178a8ada Mon Sep 17 00:00:00 2001 From: Maksim Shilov <89912354+shilovmaksim@users.noreply.github.com> Date: Tue, 16 Nov 2021 11:38:03 +0300 Subject: [PATCH 0740/3485] [Windows] Pin PostgreSQL version installed in the toolset (#4492) --- .../scripts/Installers/Install-PostgreSQL.ps1 | 22 +++++++++++-------- images/win/scripts/Tests/Databases.Tests.ps1 | 10 +++++++++ images/win/toolsets/toolset-2016.json | 3 +++ images/win/toolsets/toolset-2019.json | 3 +++ images/win/toolsets/toolset-2022.json | 3 +++ 5 files changed, 32 insertions(+), 9 deletions(-) diff --git a/images/win/scripts/Installers/Install-PostgreSQL.ps1 b/images/win/scripts/Installers/Install-PostgreSQL.ps1 index 8fe78c7fb65c..9e6a435e4906 100644 --- a/images/win/scripts/Installers/Install-PostgreSQL.ps1 +++ b/images/win/scripts/Installers/Install-PostgreSQL.ps1 @@ -1,23 +1,27 @@ -#Define user and password for PostgreSQL database +# Define user and password for PostgreSQL database $pgUser = "postgres" $pgPwd = "root" -#Prepare environment variable for validation +# Prepare environment variable for validation Set-SystemVariable -SystemVariable PGUSER -Value $pgUser Set-SystemVariable -SystemVariable PGPASSWORD -Value $pgPwd -#Install latest PostgreSQL -Choco-Install -PackageName postgresql -ArgumentList "--params", "'/Password:$pgPwd /NoPath'", "--params-global" +# Define latest available version to install based on version specified in the toolset +$toolsetVersion = (Get-ToolsetContent).postgresql.version +$latestChocoPackage = Get-LatestChocoPackageVersion -TargetVersion $toolsetVersion -PackageName "postgresql" -#Get Path to pg_ctl.exe +# Install latest PostgreSQL +Choco-Install -PackageName postgresql -ArgumentList "--params", "'/Password:$pgPwd /NoPath'", "--params-global", "--version=$latestChocoPackage" + +# Get Path to pg_ctl.exe $pgPath = (Get-CimInstance Win32_Service -Filter "Name LIKE 'postgresql-%'").PathName -#Parse output of command above to obtain pure path +# Parse output of command above to obtain pure path $pgBin = Split-Path -Path $pgPath.split('"')[1] $pgRoot = Split-Path -Path $pgPath.split('"')[5] $pgData = Join-Path $pgRoot "data" -#Validate PostgreSQL installation +# Validate PostgreSQL installation $pgReadyPath = Join-Path $pgBin "pg_isready.exe" $pgReady = Start-Process -FilePath $pgReadyPath -Wait -PassThru $exitCode = $pgReady.ExitCode @@ -28,12 +32,12 @@ if ($exitCode -ne 0) exit $exitCode } -#Added PostgreSQL environment variable +# Added PostgreSQL environment variable Set-SystemVariable -SystemVariable PGBIN -Value $pgBin Set-SystemVariable -SystemVariable PGROOT -Value $pgRoot Set-SystemVariable -SystemVariable PGDATA -Value $pgData -#Stop and disable PostgreSQL service +# Stop and disable PostgreSQL service $pgService = Get-Service -Name postgresql* Stop-Service -InputObject $pgService Set-Service -InputObject $pgService -StartupType Disabled diff --git a/images/win/scripts/Tests/Databases.Tests.ps1 b/images/win/scripts/Tests/Databases.Tests.ps1 index 6737eb1fd857..adf8c983c6f9 100644 --- a/images/win/scripts/Tests/Databases.Tests.ps1 +++ b/images/win/scripts/Tests/Databases.Tests.ps1 @@ -51,6 +51,16 @@ Describe "PostgreSQL" { $StartType | Should -Be "Disabled" } } + + Context "PostgreSQL version" { + It "PostgreSQL version should correspond to the version in the toolset" { + $toolsetVersion = (Get-ToolsetContent).postgresql.version + # Client version + (&$Env:PGBIN\psql --version).split()[-1] | Should -BeLike "$toolsetVersion*" + # Server version + (&$Env:PGBIN\pg_config --version).split()[-1] | Should -BeLike "$toolsetVersion*" + } + } } Describe "MySQL" { diff --git a/images/win/toolsets/toolset-2016.json b/images/win/toolsets/toolset-2016.json index 9cce92d0c1fe..a0d119a32add 100644 --- a/images/win/toolsets/toolset-2016.json +++ b/images/win/toolsets/toolset-2016.json @@ -432,5 +432,8 @@ }, "llvm": { "version": "13" + }, + "postgresql": { + "version": "14" } } diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index 1670e9860578..3fbafade0129 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -464,5 +464,8 @@ }, "llvm": { "version": "13" + }, + "postgresql": { + "version": "14" } } diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index 796fcfdbe8d7..a05ec3128149 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -313,5 +313,8 @@ }, "php": { "version": "8.0" + }, + "postgresql": { + "version": "14" } } From 4bd35685859893f5e76815f63574284fb7cb77b1 Mon Sep 17 00:00:00 2001 From: Maksim Shilov <89912354+shilovmaksim@users.noreply.github.com> Date: Tue, 16 Nov 2021 11:43:59 +0300 Subject: [PATCH 0741/3485] [MacOS] Pin PostgreSQL version installed in the toolset (#4504) --- images/macos/provision/core/postgresql.sh | 13 ++++++++----- images/macos/tests/Databases.Tests.ps1 | 12 ++++++------ images/macos/toolsets/toolset-10.15.json | 3 +++ images/macos/toolsets/toolset-11.json | 3 +++ images/macos/toolsets/toolset-12.json | 3 +++ 5 files changed, 23 insertions(+), 11 deletions(-) diff --git a/images/macos/provision/core/postgresql.sh b/images/macos/provision/core/postgresql.sh index 25414638fd82..5a5c381f95bd 100644 --- a/images/macos/provision/core/postgresql.sh +++ b/images/macos/provision/core/postgresql.sh @@ -1,13 +1,16 @@ #!/bin/bash -e -o pipefail source ~/utils/utils.sh -#Install latest version of postgresql -brew_smart_install "postgres" +# Fetch PostgreSQL version to install from the toolset +toolsetVersion=$(get_toolset_value '.postgresql.version') -#Service postgresql should be started before use. +# Install latest version of PostgreSQL +brew_smart_install postgresql@$toolsetVersion + +# Service PostgreSQL should be started before use brew services start postgresql -#Verify PostgreSQL is ready for accept incoming connections +# Verify PostgreSQL is ready for accept incoming connections echo "Check PostgreSQL service is running" i=10 COMMAND='pg_isready' @@ -23,7 +26,7 @@ while [ $i -gt 0 ]; do sleep 10 done -#Stop postgresql +# Stop PostgreSQL brew services stop postgresql invoke_tests "Databases" "PostgreSQL" diff --git a/images/macos/tests/Databases.Tests.ps1 b/images/macos/tests/Databases.Tests.ps1 index 9872866f584c..9c6f9a263bca 100644 --- a/images/macos/tests/Databases.Tests.ps1 +++ b/images/macos/tests/Databases.Tests.ps1 @@ -9,11 +9,11 @@ Describe "MongoDB" { } Describe "PostgreSQL" { - It "PostgreSQL-Client" { - "psql --version" | Should -ReturnZeroExitCode - } - - It "PostgreSQL-Server" { - "pg_config --version" | Should -ReturnZeroExitCode + It "PostgreSQL version should correspond to the version in the toolset" { + $toolsetVersion = Get-ToolsetValue 'postgresql.version' + # Client version + (psql --version).split()[-1] | Should -BeLike "$toolsetVersion*" + # Server version + (pg_config --version).split()[-1] | Should -BeLike "$toolsetVersion*" } } \ No newline at end of file diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index 76df1ffa7bbf..6597a3fe6647 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -343,5 +343,8 @@ }, "mongodb": { "version": "5.0" + }, + "postgresql": { + "version": "14" } } \ No newline at end of file diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index b2ef89a48b93..aa19099b3dc5 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -295,5 +295,8 @@ }, "mongodb": { "version": "5.0" + }, + "postgresql": { + "version": "14" } } \ No newline at end of file diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index 3e0434f0a78c..4cf2be7f58ff 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -193,5 +193,8 @@ }, "mongodb": { "version": "5.0" + }, + "postgresql": { + "version": "14" } } From 1b583e05e53be25d716f5707c48a22b17b039275 Mon Sep 17 00:00:00 2001 From: Maksim Shilov <89912354+shilovmaksim@users.noreply.github.com> Date: Tue, 16 Nov 2021 11:48:38 +0300 Subject: [PATCH 0742/3485] [Ubuntu] Pin PostgreSQL version installed in the toolset (#4510) * Pin PostgreSQL version installed in the toolset * Source the helpers and resolving comments --- images/linux/scripts/installers/postgresql.sh | 16 ++++++++++++---- images/linux/scripts/tests/Databases.Tests.ps1 | 9 ++++++++- images/linux/toolsets/toolset-1804.json | 3 +++ images/linux/toolsets/toolset-2004.json | 3 +++ 4 files changed, 26 insertions(+), 5 deletions(-) diff --git a/images/linux/scripts/installers/postgresql.sh b/images/linux/scripts/installers/postgresql.sh index 85b7dec0d8ba..f3d38cf21d3e 100644 --- a/images/linux/scripts/installers/postgresql.sh +++ b/images/linux/scripts/installers/postgresql.sh @@ -1,18 +1,26 @@ #!/bin/bash -e ################################################################################ ## File: postgresql.sh -## Desc: Installs Postgresql +## Desc: Installs PostgreSQL ################################################################################ +# Source the helpers +source $HELPER_SCRIPTS/os.sh +source $HELPER_SCRIPTS/install.sh + REPO_URL="https://apt.postgresql.org/pub/repos/apt/" -#Preparing repo for PostgreSQL 12. +# Preparing repo for PostgreSQL wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - -echo "deb $REPO_URL `lsb_release -cs`-pgdg main" | tee /etc/apt/sources.list.d/pgdg.list +echo "deb $REPO_URL $(getOSVersionLabel)-pgdg main" | tee /etc/apt/sources.list.d/pgdg.list + +# Fetch PostgreSQL version to install from the toolset +toolsetVersion=$(get_toolset_value '.postgresql.version') +# Install PostgreSQL echo "Install PostgreSQL" apt update -apt install postgresql postgresql-client +apt install postgresql-$toolsetVersion echo "Install libpq-dev" apt-get install libpq-dev diff --git a/images/linux/scripts/tests/Databases.Tests.ps1 b/images/linux/scripts/tests/Databases.Tests.ps1 index 6477a04e9f79..a141c53e911d 100644 --- a/images/linux/scripts/tests/Databases.Tests.ps1 +++ b/images/linux/scripts/tests/Databases.Tests.ps1 @@ -9,12 +9,19 @@ Describe "MongoDB" { } Describe "PostgreSQL" { - It "PostgreSQL Service" { "sudo systemctl start postgresql" | Should -ReturnZeroExitCode (Get-CommandResult "pg_isready").Output | Should -Be "/var/run/postgresql:5432 - accepting connections" "sudo systemctl stop postgresql" | Should -ReturnZeroExitCode } + + It "PostgreSQL version should correspond to the version in the toolset" { + $toolsetVersion = (Get-ToolsetContent).postgresql.version + # Client version + (psql --version).split()[-1] | Should -BeLike "$toolsetVersion*" + # Server version + (pg_config --version).split()[-1] | Should -BeLike "$toolsetVersion*" + } } Describe "MySQL" { diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index 0c69a6ceb305..80f3d9e9457b 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -330,5 +330,8 @@ ], "mongodb": { "version": "5.0" + }, + "postgresql": { + "version": "14" } } diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index 8c22702abd9e..bc5bf595ddc9 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -335,5 +335,8 @@ ], "mongodb": { "version": "5.0" + }, + "postgresql": { + "version": "14" } } From df27520b1f223f23188191ec1a3fdce76f5cddd8 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Tue, 16 Nov 2021 17:14:17 +0300 Subject: [PATCH 0743/3485] [Windows] Add test to validate windows updates installation (#4489) * Add test to validate windows updates installation * Add function Get-WindowsUpdatesHistory --- .../scripts/ImageHelpers/ImageHelpers.psm1 | 1 + .../scripts/ImageHelpers/InstallHelpers.ps1 | 44 +++++++++++++++++++ .../Installers/Install-WindowsUpdates.ps1 | 33 +++++++++++++- .../scripts/Tests/WindowsFeatures.Tests.ps1 | 22 ++++++++++ images/win/windows2019.json | 28 +++++------- 5 files changed, 110 insertions(+), 18 deletions(-) diff --git a/images/win/scripts/ImageHelpers/ImageHelpers.psm1 b/images/win/scripts/ImageHelpers/ImageHelpers.psm1 index 5beeef1ff10c..09e4962a6064 100644 --- a/images/win/scripts/ImageHelpers/ImageHelpers.psm1 +++ b/images/win/scripts/ImageHelpers/ImageHelpers.psm1 @@ -43,4 +43,5 @@ Export-ModuleMember -Function @( 'Get-AndroidPackagesByVersion' 'Get-VisualStudioInstance' 'Get-VisualStudioComponents' + 'Get-WindowsUpdatesHistory' ) diff --git a/images/win/scripts/ImageHelpers/InstallHelpers.ps1 b/images/win/scripts/ImageHelpers/InstallHelpers.ps1 index e05e44e9ff44..0791b7f3088b 100644 --- a/images/win/scripts/ImageHelpers/InstallHelpers.ps1 +++ b/images/win/scripts/ImageHelpers/InstallHelpers.ps1 @@ -489,3 +489,47 @@ function Get-AndroidPackagesByVersion { $packagesByVersion = $packagesByName | Where-Object { ($_.Split($Delimiter)[$Index] -as $Type) -ge $MinimumVersion } return $packagesByVersion | Sort-Object { $_.Split($Delimiter)[$Index] -as $Type} -Unique } + +function Get-WindowsUpdatesHistory { + $allEvents = @{} + # 19 - Installation Successful: Windows successfully installed the following update + # 20 - Installation Failure: Windows failed to install the following update with error + # 43 - Installation Started: Windows has started installing the following update + $filter = @{ + LogName = "System" + Id = 19, 20, 43 + ProviderName = "Microsoft-Windows-WindowsUpdateClient" + } + $events = Get-WinEvent -FilterHashtable $filter -ErrorAction SilentlyContinue | Sort-Object Id + + foreach ( $event in $events ) { + switch ( $event.Id ) { + 19 { + $status = "Successful" + $title = $event.Properties[0].Value + $allEvents[$title] = "" + break + } + 20 { + $status = "Failure" + $title = $event.Properties[1].Value + $allEvents[$title] = "" + break + } + 43 { + $status = "InProgress" + $title = $event.Properties[0].Value + break + } + } + + if ( $status -eq "InProgress" -and $allEvents.ContainsKey($title) ) { + continue + } + + [PSCustomObject]@{ + Status = $status + Title = $title + } + } +} diff --git a/images/win/scripts/Installers/Install-WindowsUpdates.ps1 b/images/win/scripts/Installers/Install-WindowsUpdates.ps1 index eb19a3ea020a..299604093df1 100644 --- a/images/win/scripts/Installers/Install-WindowsUpdates.ps1 +++ b/images/win/scripts/Installers/Install-WindowsUpdates.ps1 @@ -4,5 +4,34 @@ ## Should be run at end, just before SoftwareReport and Finalize-VM.ps1. ################################################################################ -Write-Host "Run windows updates" -Get-WUInstall -MicrosoftUpdate -AcceptAll -Install -IgnoreUserInput -IgnoreReboot +function Install-WindowsUpdates { + Write-Host "Starting wuauserv" + Start-Service -Name wuauserv -PassThru | Out-Host + + Write-Host "Getting list of available windows updates" + Get-WindowsUpdate -MicrosoftUpdate -OutVariable updates | Out-Host + + if ( -not $updates ) { + Write-Host "There are no windows updates to install" + return + } + + Write-Host "Installing windows updates" + Get-WindowsUpdate -MicrosoftUpdate -AcceptAll -Install -IgnoreUserInput -IgnoreReboot | Out-Host + + Write-Host "Validating windows updates installation and skip Microsoft Defender Antivirus" + # Azure service can automatic updates AV engine(Microsoft.Azure.Security.AntimalwareSignature.AntimalwareConfiguration) + # Get-WUHistory doesn't support Windows Server 2022 + $wuHistory = Get-WindowsUpdatesHistory | Where-Object { $_.Status -in ("Successful", "InProgress") } + $wuFail = $updates[0] | Where-Object Title -notmatch "Microsoft Defender Antivirus" | Where-Object { -not ($wuHistory.Title -match $_.KB) } + + if ( $wuFail ) { + Write-Host "Windows updates failed to install: $($wuFail.KB)" + exit 1 + } +} + +Install-WindowsUpdates + +# Create complete windows update file +New-Item -Path $env:windir -Name WindowsUpdateDone.txt -ItemType File | Out-Null diff --git a/images/win/scripts/Tests/WindowsFeatures.Tests.ps1 b/images/win/scripts/Tests/WindowsFeatures.Tests.ps1 index f2a591acab2b..7c754967c005 100644 --- a/images/win/scripts/Tests/WindowsFeatures.Tests.ps1 +++ b/images/win/scripts/Tests/WindowsFeatures.Tests.ps1 @@ -56,3 +56,25 @@ Describe "Test Signed Drivers" -Skip:(Test-IsWin16) { "$(bcdedit)" | Should -Match "testsigning\s+Yes" } } + +Describe "Windows Updates" { + It "WindowsUpdateDone.txt should exist" { + "$env:windir\WindowsUpdateDone.txt" | Should -Exist + } + + $testCases = Get-WindowsUpdatesHistory | Sort-Object Title | ForEach-Object { + @{ + Title = $_.Title + Status = $_.Status + } + } + + It "" -TestCases $testCases { + $expect = "Successful" + if ( $Title -match "Microsoft Defender Antivirus" ) { + $expect = "Successful", "Failure" + } + + $Status | Should -BeIn $expect + } +} diff --git a/images/win/windows2019.json b/images/win/windows2019.json index dac81ffab774..abeec44b03c4 100644 --- a/images/win/windows2019.json +++ b/images/win/windows2019.json @@ -143,21 +143,6 @@ }, { "type": "powershell", - "scripts": [ - "{{ template_dir }}/scripts/Installers/Install-WindowsUpdates.ps1" - ], - "elevated_user": "{{user `install_user`}}", - "elevated_password": "{{user `install_password`}}" - }, - { - "type": "windows-restart", - "check_registry": true, - "restart_check_command": "powershell -command \"& {if ((-not (Get-Process TiWorker.exe -ErrorAction SilentlyContinue)) -and (-not [System.Environment]::HasShutdownStarted) ) { Write-Output 'Restart complete' }}\"", - "restart_timeout": "30m" - }, - { - "type": "powershell", - "pause_before": "2m", "scripts": [ "{{ template_dir }}/scripts/Installers/Install-VCRedist.ps1", "{{ template_dir }}/scripts/Installers/Install-Docker.ps1", @@ -271,12 +256,23 @@ "{{ template_dir }}/scripts/Installers/Install-LLVM.ps1" ] }, + { + "type": "powershell", + "scripts": [ + "{{ template_dir }}/scripts/Installers/Install-WindowsUpdates.ps1" + ], + "elevated_user": "{{user `install_user`}}", + "elevated_password": "{{user `install_password`}}" + }, { "type": "windows-restart", - "restart_timeout": "10m" + "check_registry": true, + "restart_check_command": "powershell -command \"& {if ((-not (Get-Process TiWorker.exe -ErrorAction SilentlyContinue)) -and (-not [System.Environment]::HasShutdownStarted) ) { Write-Output 'Restart complete' }}\"", + "restart_timeout": "30m" }, { "type": "powershell", + "pause_before": "2m", "scripts": [ "{{ template_dir }}/scripts/Tests/RunAll-Tests.ps1" ] From 01570219dae48676fee5b295dcef94bcd409bc1d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 18 Nov 2021 08:14:14 +0000 Subject: [PATCH 0744/3485] Updating readme file for macOS-11 version 20211114.1 (#4514) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-11-Readme.md | 191 ++++++++++++++++---------------- 1 file changed, 94 insertions(+), 97 deletions(-) diff --git a/images/macos/macos-11-Readme.md b/images/macos/macos-11-Readme.md index 6dcd6c12d287..5b4fe9e7061f 100644 --- a/images/macos/macos-11-Readme.md +++ b/images/macos/macos-11-Readme.md @@ -1,19 +1,19 @@ | Announcements | |-| +| [[all OSs] Default Nodejs version will be set to 16 on November, 29](https://github.com/actions/virtual-environments/issues/4446) | | [[all OSs] Selenium server version will be upgraded from 3 to 4 on November, 15](https://github.com/actions/virtual-environments/issues/4376) | | [[All OSs] Node.js version 10 will be removed from the images on November, 15](https://github.com/actions/virtual-environments/issues/4356) | | [[macOS Big Sur] Xcode 13 beta will be removed and Xcode 13.1 set as default on November, 15](https://github.com/actions/virtual-environments/issues/4355) | -| [[All OSs] Go versions less than 1.15 will be removed on November, 8](https://github.com/actions/virtual-environments/issues/4311) | | [macOS-latest workflows will use macOS-11](https://github.com/actions/virtual-environments/issues/4060) | *** # macOS 11.6 info - System Version: macOS 11.6.1 (20G224) - Kernel Version: Darwin 20.6.0 -- Image Version: 20211106.1 +- Image Version: 20211114.1 ## Installed Software ### Language and Runtime -- .NET SDK 2.1.302 2.1.403 2.1.507 2.1.607 2.1.701 2.1.818 3.1.101 3.1.201 3.1.302 3.1.414 5.0.102 5.0.202 5.0.302 5.0.402 +- .NET SDK 2.1.302 2.1.403 2.1.507 2.1.607 2.1.701 2.1.818 3.1.101 3.1.201 3.1.302 3.1.415 5.0.102 5.0.202 5.0.302 5.0.403 - Bash 3.2.57(1)-release - Clang/LLVM 13.0.0 is available on `'$(brew --prefix llvm)/bin/clang'` - Clang/LLVM 13.0.0 is default @@ -29,27 +29,27 @@ - MSBuild 16.9.0.22901 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) - Node.js v14.18.1 - NVM 0.39.0 -- NVM - Cached node versions: v10.24.1 v12.22.7 v14.18.1 +- NVM - Cached node versions: v12.22.7 v14.18.1 v16.13.0 - Perl 5.34.0 - PHP 8.0.12 - Python 2.7.18 -- Python 3.9.7 +- Python 3.9.8 - Ruby 2.7.4p191 ### Package Management -- Bundler version 2.2.30 +- Bundler version 2.2.31 - Carthage 0.38.0 - CocoaPods 1.11.2 -- Composer 2.1.11 -- Homebrew 3.3.2 +- Composer 2.1.12 +- Homebrew 3.3.3 - Miniconda 4.10.3 - NPM 6.14.15 - NuGet 5.9.0.7134 - Pip 20.3.4 (python 2.7) -- Pip 21.2.4 (python 3.9) +- Pip 21.3.1 (python 3.9) - Pipx 0.16.4 -- RubyGems 3.2.30 -- Vcpkg 2021 (build from master \<d78a0b47b>) +- RubyGems 3.2.31 +- Vcpkg 2021 (build from master \<c973b499f>) - Yarn 1.22.15 #### Environment variables @@ -61,7 +61,7 @@ ### Project Management - Apache Ant(TM) 1.10.12 - Apache Maven 3.8.3 -- Gradle 7.2 +- Gradle 7.3 - Sbt 1.5.5 ### Utilities @@ -71,7 +71,7 @@ - bazel 4.2.1 - bazelisk 1.10.1 - bsdtar 3.3.2 - available by 'tar' alias -- Curl 7.79.1 +- Curl 7.80.0 - Git LFS: 3.0.2 - Git: 2.33.1 - GitHub CLI: 2.2.0 @@ -84,10 +84,10 @@ - mongo v5.0.3 - mongod v5.0.3 - Newman 5.3.0 -- OpenSSL 1.1.1l 24 Aug 2021 `(/usr/local/opt/openssl@1.1 -> /usr/local/Cellar/openssl@1.1/1.1.1l_1)` +- OpenSSL 1.1.1l 24 Aug 2021 `(/usr/local/opt/openssl@1.1 -> ../Cellar/openssl@1.1/1.1.1l_1)` - Packer 1.7.8 -- PostgreSQL 14.0 -- psql (PostgreSQL) 14.0 +- PostgreSQL 14.1 +- psql (PostgreSQL) 14.1 - Sox 14.4.2 - Subversion (SVN) 1.14.1 - Switchaudio-osx 1.1.0 @@ -95,9 +95,9 @@ ### Tools -- Aliyun CLI 3.0.97 +- Aliyun CLI 3.0.99 - App Center CLI 2.10.4 -- AWS CLI 2.3.4 +- AWS CLI 2.3.6 - AWS SAM CLI 1.35.0 - AWS Session Manager CLI 1.2.279.0 - Azure CLI 2.30.0 @@ -106,7 +106,7 @@ - Cmake 3.21.4 - Fastlane 2.197.0 - GHC 9.2.1 -- GHCup 0.1.17.3 +- GHCup 0.1.17.4 - Jazzy 0.14.1 - Stack 2.7.3 - SwiftFormat 0.48.18 @@ -121,17 +121,17 @@ - Safari 15.1 (16612.2.9.1.30) - SafariDriver 15.1 (16612.2.9.1.30) - Google Chrome 95.0.4638.69 -- ChromeDriver 95.0.4638.54 -- Microsoft Edge 95.0.1020.44 -- MSEdgeDriver 95.0.1020.44 +- ChromeDriver 95.0.4638.69 +- Microsoft Edge 95.0.1020.53 +- MSEdgeDriver 95.0.1020.53 - Mozilla Firefox 94.0.1 - geckodriver 0.30.0 -- Selenium server 3.141.59_2 +- Selenium server 4.0.0 #### Environment variables | Name | Value | | --------------- | --------------------------------------------- | -| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/95.0.4638.54 | +| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/95.0.4638.69 | | EDGEWEBDRIVER | /usr/local/share/edge_driver | | GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | @@ -162,7 +162,6 @@ - 3.8.12 [PyPy 7.3.7] #### Node.js -- 10.24.1 - 12.22.7 - 14.18.1 - 16.13.0 @@ -182,13 +181,13 @@ #### Packages - Bindgen 0.59.1 - Cargo-audit 0.15.2 -- Cargo-outdated v0.9.17 +- Cargo-outdated v0.10.0 - Cbindgen 0.20.0 - Clippy 0.1.56 - Rustfmt 1.4.37-stable ### PowerShell Tools -- PowerShell 7.1.5 +- PowerShell 7.2.0 #### PowerShell Modules | Module | Version | @@ -206,7 +205,7 @@ ### Xamarin #### Visual Studio for Mac -- 8.10.12.16 +- 8.10.13.11 #### Xamarin bundles | symlink | Xamarin.Mono | Xamarin.iOS | Xamarin.Mac | Xamarin.Android | @@ -228,15 +227,14 @@ - NUnit 3.6.1 ### Xcode -| Version | Build | Path | -| -------------- | -------- | --------------------------------- | -| 13.2 (beta) | 13C5066c | /Applications/Xcode_13.2.app | -| 13.1 | 13A1030d | /Applications/Xcode_13.1.app | -| 13.0 (beta) | 13A5212g | /Applications/Xcode_13.0_beta.app | -| 13.0 (default) | 13A233 | /Applications/Xcode_13.0.app | -| 12.5.1 | 12E507 | /Applications/Xcode_12.5.1.app | -| 12.4 | 12D4e | /Applications/Xcode_12.4.app | -| 11.7 | 11E801a | /Applications/Xcode_11.7.app | +| Version | Build | Path | +| -------------- | -------- | ------------------------------ | +| 13.2 (beta) | 13C5066c | /Applications/Xcode_13.2.app | +| 13.1 (default) | 13A1030d | /Applications/Xcode_13.1.app | +| 13.0 | 13A233 | /Applications/Xcode_13.0.app | +| 12.5.1 | 12E507 | /Applications/Xcode_12.5.1.app | +| 12.4 | 12D4e | /Applications/Xcode_12.4.app | +| 11.7 | 11E801a | /Applications/Xcode_11.7.app | #### Xcode Support Tools - xcpretty 0.3.0 @@ -245,68 +243,67 @@ - Nomad shenzhen CLI 0.14.3 #### Installed SDKs -| SDK | SDK Name | Xcode Version | -| ----------------------- | -------------------- | ---------------- | -| macOS 10.15 | macosx10.15 | 11.7 | -| macOS 11.1 | macosx11.1 | 12.4 | -| macOS 11.3 | macosx11.3 | 12.5.1, 13.0 | -| macOS 12.0 | macosx12.0 | 13.0, 13.1 | -| macOS 12.1 | macosx12.1 | 13.2 | -| iOS 13.7 | iphoneos13.7 | 11.7 | -| iOS 14.4 | iphoneos14.4 | 12.4 | -| iOS 14.5 | iphoneos14.5 | 12.5.1 | -| iOS 15.0 | iphoneos15.0 | 13.0, 13.0, 13.1 | -| iOS 15.2 | iphoneos15.2 | 13.2 | -| Simulator - iOS 13.7 | iphonesimulator13.7 | 11.7 | -| Simulator - iOS 14.4 | iphonesimulator14.4 | 12.4 | -| Simulator - iOS 14.5 | iphonesimulator14.5 | 12.5.1 | -| Simulator - iOS 15.0 | iphonesimulator15.0 | 13.0, 13.0, 13.1 | -| Simulator - iOS 15.2 | iphonesimulator15.2 | 13.2 | -| tvOS 13.4 | appletvos13.4 | 11.7 | -| tvOS 14.3 | appletvos14.3 | 12.4 | -| tvOS 14.5 | appletvos14.5 | 12.5.1 | -| tvOS 15.0 | appletvos15.0 | 13.0, 13.0, 13.1 | -| tvOS 15.2 | appletvos15.2 | 13.2 | -| Simulator - tvOS 13.4 | appletvsimulator13.4 | 11.7 | -| Simulator - tvOS 14.3 | appletvsimulator14.3 | 12.4 | -| Simulator - tvOS 14.5 | appletvsimulator14.5 | 12.5.1 | -| Simulator - tvOS 15.0 | appletvsimulator15.0 | 13.0, 13.0, 13.1 | -| Simulator - tvOS 15.2 | appletvsimulator15.2 | 13.2 | -| watchOS 6.2 | watchos6.2 | 11.7 | -| watchOS 7.2 | watchos7.2 | 12.4 | -| watchOS 7.4 | watchos7.4 | 12.5.1 | -| watchOS 8.0 | watchos8.0 | 13.0, 13.0, 13.1 | -| watchOS 8.3 | watchos8.3 | 13.2 | -| Simulator - watchOS 6.2 | watchsimulator6.2 | 11.7 | -| Simulator - watchOS 7.2 | watchsimulator7.2 | 12.4 | -| Simulator - watchOS 7.4 | watchsimulator7.4 | 12.5.1 | -| Simulator - watchOS 8.0 | watchsimulator8.0 | 13.0, 13.0, 13.1 | -| Simulator - watchOS 8.3 | watchsimulator8.3 | 13.2 | -| DriverKit 19.0 | driverkit.macosx19.0 | 11.7 | -| DriverKit 20.2 | driverkit.macosx20.2 | 12.4 | -| DriverKit 20.4 | driverkit.macosx20.4 | 12.5.1, 13.0 | -| DriverKit 21.0 | driverkit21.0 | 13.0 | -| DriverKit 21.0.1 | driverkit21.0.1 | 13.1 | -| DriverKit 21.2 | driverkit21.2 | 13.2 | +| SDK | SDK Name | Xcode Version | +| ----------------------- | -------------------- | ------------- | +| macOS 10.15 | macosx10.15 | 11.7 | +| macOS 11.1 | macosx11.1 | 12.4 | +| macOS 11.3 | macosx11.3 | 12.5.1, 13.0 | +| macOS 12.0 | macosx12.0 | 13.1 | +| macOS 12.1 | macosx12.1 | 13.2 | +| iOS 13.7 | iphoneos13.7 | 11.7 | +| iOS 14.4 | iphoneos14.4 | 12.4 | +| iOS 14.5 | iphoneos14.5 | 12.5.1 | +| iOS 15.0 | iphoneos15.0 | 13.0, 13.1 | +| iOS 15.2 | iphoneos15.2 | 13.2 | +| Simulator - iOS 13.7 | iphonesimulator13.7 | 11.7 | +| Simulator - iOS 14.4 | iphonesimulator14.4 | 12.4 | +| Simulator - iOS 14.5 | iphonesimulator14.5 | 12.5.1 | +| Simulator - iOS 15.0 | iphonesimulator15.0 | 13.0, 13.1 | +| Simulator - iOS 15.2 | iphonesimulator15.2 | 13.2 | +| tvOS 13.4 | appletvos13.4 | 11.7 | +| tvOS 14.3 | appletvos14.3 | 12.4 | +| tvOS 14.5 | appletvos14.5 | 12.5.1 | +| tvOS 15.0 | appletvos15.0 | 13.0, 13.1 | +| tvOS 15.2 | appletvos15.2 | 13.2 | +| Simulator - tvOS 13.4 | appletvsimulator13.4 | 11.7 | +| Simulator - tvOS 14.3 | appletvsimulator14.3 | 12.4 | +| Simulator - tvOS 14.5 | appletvsimulator14.5 | 12.5.1 | +| Simulator - tvOS 15.0 | appletvsimulator15.0 | 13.0, 13.1 | +| Simulator - tvOS 15.2 | appletvsimulator15.2 | 13.2 | +| watchOS 6.2 | watchos6.2 | 11.7 | +| watchOS 7.2 | watchos7.2 | 12.4 | +| watchOS 7.4 | watchos7.4 | 12.5.1 | +| watchOS 8.0 | watchos8.0 | 13.0, 13.1 | +| watchOS 8.3 | watchos8.3 | 13.2 | +| Simulator - watchOS 6.2 | watchsimulator6.2 | 11.7 | +| Simulator - watchOS 7.2 | watchsimulator7.2 | 12.4 | +| Simulator - watchOS 7.4 | watchsimulator7.4 | 12.5.1 | +| Simulator - watchOS 8.0 | watchsimulator8.0 | 13.0, 13.1 | +| Simulator - watchOS 8.3 | watchsimulator8.3 | 13.2 | +| DriverKit 19.0 | driverkit.macosx19.0 | 11.7 | +| DriverKit 20.2 | driverkit.macosx20.2 | 12.4 | +| DriverKit 20.4 | driverkit.macosx20.4 | 12.5.1, 13.0 | +| DriverKit 21.0.1 | driverkit21.0.1 | 13.1 | +| DriverKit 21.2 | driverkit21.2 | 13.2 | #### Installed Simulators -| OS | Xcode Version | Simulators | -| ----------- | -------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| iOS 13.7 | 11.7 | iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (7th generation)<br>iPad Air (3rd generation)<br>iPad Pro (11-inch) (2nd generation)<br>iPad Pro (12.9-inch) (4th generation)<br>iPad Pro (9.7-inch) | -| iOS 14.4 | 12.4 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (7th generation)<br>iPad (8th generation)<br>iPad Air (3rd generation)<br>iPad Air (4th generation)<br>iPad Pro (11-inch) (2nd generation)<br>iPad Pro (12.9-inch) (4th generation)<br>iPad Pro (9.7-inch) | -| iOS 14.5 | 12.5.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (7th generation)<br>iPad (8th generation)<br>iPad Air (3rd generation)<br>iPad Air (4th generation)<br>iPad Pro (11-inch) (2nd generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (4th generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | -| iOS 15.0 | 13.0<br>13.0<br>13.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (7th generation)<br>iPad (8th generation)<br>iPad (9th generation)<br>iPad Air (3rd generation)<br>iPad Air (4th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (2nd generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (4th generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | -| iOS 15.2 | 13.2 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (7th generation)<br>iPad (8th generation)<br>iPad (9th generation)<br>iPad Air (3rd generation)<br>iPad Air (4th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (2nd generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (4th generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | -| tvOS 13.4 | 11.7 | Apple TV<br>Apple TV 4K<br>Apple TV 4K (at 1080p) | -| tvOS 14.3 | 12.4 | Apple TV<br>Apple TV 4K<br>Apple TV 4K (at 1080p) | -| tvOS 14.5 | 12.5.1 | Apple TV<br>Apple TV 4K<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p)<br>Apple TV 4K (at 1080p) (2nd generation) | -| tvOS 15.0 | 13.0<br>13.0<br>13.1 | Apple TV<br>Apple TV 4K<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p)<br>Apple TV 4K (at 1080p) (2nd generation) | -| tvOS 15.2 | 13.2 | Apple TV<br>Apple TV 4K<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p)<br>Apple TV 4K (at 1080p) (2nd generation) | -| watchOS 6.2 | 11.7 | Apple Watch Series 4 - 40mm<br>Apple Watch Series 4 - 44mm<br>Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm | -| watchOS 7.2 | 12.4 | Apple Watch Series 4 - 40mm<br>Apple Watch Series 4 - 44mm<br>Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm | -| watchOS 7.4 | 12.5.1 | Apple Watch Series 4 - 40mm<br>Apple Watch Series 4 - 44mm<br>Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm | -| watchOS 8.0 | 13.0<br>13.0<br>13.1 | Apple Watch Series 4 - 40mm<br>Apple Watch Series 4 - 44mm<br>Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | -| watchOS 8.3 | 13.2 | Apple Watch Series 4 - 40mm<br>Apple Watch Series 4 - 44mm<br>Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | +| OS | Xcode Version | Simulators | +| ----------- | ------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| iOS 13.7 | 11.7 | iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (7th generation)<br>iPad Air (3rd generation)<br>iPad Pro (11-inch) (2nd generation)<br>iPad Pro (12.9-inch) (4th generation)<br>iPad Pro (9.7-inch) | +| iOS 14.4 | 12.4 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (7th generation)<br>iPad (8th generation)<br>iPad Air (3rd generation)<br>iPad Air (4th generation)<br>iPad Pro (11-inch) (2nd generation)<br>iPad Pro (12.9-inch) (4th generation)<br>iPad Pro (9.7-inch) | +| iOS 14.5 | 12.5.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (7th generation)<br>iPad (8th generation)<br>iPad Air (3rd generation)<br>iPad Air (4th generation)<br>iPad Pro (11-inch) (2nd generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (4th generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | +| iOS 15.0 | 13.0<br>13.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (7th generation)<br>iPad (8th generation)<br>iPad (9th generation)<br>iPad Air (3rd generation)<br>iPad Air (4th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (2nd generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (4th generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | +| iOS 15.2 | 13.2 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (7th generation)<br>iPad (8th generation)<br>iPad (9th generation)<br>iPad Air (3rd generation)<br>iPad Air (4th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (2nd generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (4th generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | +| tvOS 13.4 | 11.7 | Apple TV<br>Apple TV 4K<br>Apple TV 4K (at 1080p) | +| tvOS 14.3 | 12.4 | Apple TV<br>Apple TV 4K<br>Apple TV 4K (at 1080p) | +| tvOS 14.5 | 12.5.1 | Apple TV<br>Apple TV 4K<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p)<br>Apple TV 4K (at 1080p) (2nd generation) | +| tvOS 15.0 | 13.0<br>13.1 | Apple TV<br>Apple TV 4K<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p)<br>Apple TV 4K (at 1080p) (2nd generation) | +| tvOS 15.2 | 13.2 | Apple TV<br>Apple TV 4K<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p)<br>Apple TV 4K (at 1080p) (2nd generation) | +| watchOS 6.2 | 11.7 | Apple Watch Series 4 - 40mm<br>Apple Watch Series 4 - 44mm<br>Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm | +| watchOS 7.2 | 12.4 | Apple Watch Series 4 - 40mm<br>Apple Watch Series 4 - 44mm<br>Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm | +| watchOS 7.4 | 12.5.1 | Apple Watch Series 4 - 40mm<br>Apple Watch Series 4 - 44mm<br>Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm | +| watchOS 8.0 | 13.0<br>13.1 | Apple Watch Series 4 - 40mm<br>Apple Watch Series 4 - 44mm<br>Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | +| watchOS 8.3 | 13.2 | Apple Watch Series 4 - 40mm<br>Apple Watch Series 4 - 44mm<br>Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | ### Android | Package Name | Version | From 0189f46a2ac3aed8b6d1a38cba999748d1cb736a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 18 Nov 2021 09:10:23 +0000 Subject: [PATCH 0745/3485] Updating readme file for ubuntu18 version 20211114.1 (#4505) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu1804-README.md | 76 +++++++++++++++---------------- 1 file changed, 37 insertions(+), 39 deletions(-) diff --git a/images/linux/Ubuntu1804-README.md b/images/linux/Ubuntu1804-README.md index d86caca25188..48f844f755a9 100644 --- a/images/linux/Ubuntu1804-README.md +++ b/images/linux/Ubuntu1804-README.md @@ -1,13 +1,13 @@ | Announcements | |-| +| [[all OSs] Default Nodejs version will be set to 16 on November, 29](https://github.com/actions/virtual-environments/issues/4446) | | [[all OSs] Selenium server version will be upgraded from 3 to 4 on November, 15](https://github.com/actions/virtual-environments/issues/4376) | | [[Ubuntu] Node:10 docker images will be removed on November, 15](https://github.com/actions/virtual-environments/issues/4357) | | [[All OSs] Node.js version 10 will be removed from the images on November, 15](https://github.com/actions/virtual-environments/issues/4356) | -| [[All OSs] Go versions less than 1.15 will be removed on November, 8](https://github.com/actions/virtual-environments/issues/4311) | *** # Ubuntu 18.04.6 LTS -- Linux kernel version: 5.4.0-1062-azure -- Image Version: 20211108.1 +- Linux kernel version: 5.4.0-1063-azure +- Image Version: 20211114.1 ## Installed Software ### Language and Runtime @@ -32,14 +32,14 @@ ### Package Management - cpan 1.64 - Helm 3.7.1 -- Homebrew 3.3.2 +- Homebrew 3.3.3 - Miniconda 4.10.3 - Npm 6.14.15 - Pip 9.0.1 - Pip3 9.0.1 - Pipx 0.16.4 - RubyGems 2.7.6 -- Vcpkg (build from master \<d78a0b47b>) +- Vcpkg (build from master \<12bdfc7dd>) - Yarn 1.22.17 #### Environment variables @@ -50,7 +50,7 @@ ### Project Management - Ant 1.10.5 -- Gradle 7.2 +- Gradle 7.3 - Maven 3.8.3 - Sbt 1.5.5 @@ -65,8 +65,8 @@ - CMake 3.21.4 - CodeQL Action Bundle 2.7.0 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.0.0 -- Docker-Buildx 0.6.0 +- Docker Compose v2 2.1.1+azure-1 +- Docker-Buildx 0.7.0 - Docker-Moby Client 20.10.10+azure-1 - Docker-Moby Server 20.10.10+azure-1 - Git 2.33.1 (apt source repository: ppa:git-core/ppa) @@ -74,43 +74,44 @@ - Git-ftp 1.3.1 - Haveged 1.9.1 - Heroku 7.59.1 -- HHVM (HipHop VM) 4.134.0 +- HHVM (HipHop VM) 4.135.0 - jq 1.5 - Kind 0.11.1 - Kubectl 1.22.3 -- Kustomize 4.4.0 -- Leiningen 2.9.7 +- Kustomize 4.4.1 +- Leiningen 2.9.8 - MediaInfo 17.12 - Mercurial 4.5.3 - Minikube 1.24.0 +- n 8.0.0 - Newman 5.3.0 - nvm 0.39.0 - OpenSSL 1.1.1 11 Sep 2018 - Packer 1.7.8 - PhantomJS 2.1.1 - Podman 3.0.1 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- Pulumi 3.17.0 +- Pulumi 3.17.1 - R 4.1.2 - Skopeo 1.2.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 - SVN 1.9.7 -- Terraform 1.0.10 +- Terraform 1.0.11 - yamllint 1.26.3 -- yq 4.14.1 +- yq 4.14.2 - zstd 1.5.0 (homebrew) ### CLI Tools -- Alibaba Cloud CLI 3.0.97 -- AWS CLI 1.21.12 +- Alibaba Cloud CLI 3.0.99 +- AWS CLI 1.22.5 - AWS CLI Session manager plugin 1.2.279.0 - AWS SAM CLI 1.35.0 - Azure CLI (azure-cli) 2.30.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) -- Azure CLI (azure-devops) 0.21.0 +- Azure CLI (azure-devops) 0.22.0 - GitHub CLI 2.2.0 -- Google Cloud SDK 363.0.0 (apt source repository: https://packages.cloud.google.com/apt) +- Google Cloud SDK 364.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 6.14.16 -- OpenShift CLI 4.9.5 +- Netlify CLI 6.14.23 +- OpenShift CLI 4.9.6 - ORAS CLI 0.12.0 - Vercel CLI 23.1.2 @@ -125,7 +126,7 @@ | Tool | Version | | -------- | ---------------------------------- | | PHP | 7.1.33 7.2.34 7.3.31 7.4.25 8.0.12 | -| Composer | 2.1.11 | +| Composer | 2.1.12 | | PHPUnit | 8.5.21 | ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. @@ -146,7 +147,7 @@ - Bindgen 0.59.1 - Cargo audit 0.15.2 - Cargo clippy 0.1.56 -- Cargo outdated 0.9.17 +- Cargo outdated 0.10.0 - Cbindgen 0.20.0 - Rustfmt 1.4.37 @@ -156,21 +157,21 @@ - Mozilla Firefox 94.0 - Geckodriver 0.30.0 - Chromium 95.0.4638.0 -- Selenium server 3.141.59 +- Selenium server 4.0.0 #### Environment variables -| Name | Value | -| ----------------- | ---------------------------------------------- | -| CHROMEWEBDRIVER | /usr/local/share/chrome_driver | -| GECKOWEBDRIVER | /usr/local/share/gecko_driver | -| SELENIUM_JAR_PATH | /usr/share/java/selenium-server-standalone.jar | +| Name | Value | +| ----------------- | ----------------------------------- | +| CHROMEWEBDRIVER | /usr/local/share/chrome_driver | +| GECKOWEBDRIVER | /usr/local/share/gecko_driver | +| SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | ### .NET Core SDK -- 2.1.302 2.1.403 2.1.526 2.1.617 2.1.701 2.1.818 3.1.120 3.1.202 3.1.302 3.1.414 3.1.415 5.0.104 5.0.208 5.0.303 5.0.402 5.0.403 +- 2.1.302 2.1.403 2.1.526 2.1.617 2.1.701 2.1.818 3.1.120 3.1.202 3.1.302 3.1.415 5.0.104 5.0.209 5.0.303 5.0.403 ### Databases - MongoDB 5.0.3 (apt source repository: https://repo.mongodb.org/apt/ubuntu) -- PostgreSQL 14.0 (apt source repository: https://apt.postgresql.org/pub/repos/apt/) +- PostgreSQL 14.1 (apt source repository: https://apt.postgresql.org/pub/repos/apt/) - sqlite3 3.22.0 #### MySQL @@ -191,7 +192,6 @@ - 1.17.3 #### Node.js -- 10.24.1 - 12.22.7 - 14.18.1 - 16.13.0 @@ -270,9 +270,9 @@ ### Cached Docker images | Repository:Tag | Digest | Created | | ----------------------- | ------------------------------------------------------------------------ | ---------- | -| alpine:3.12 | sha256:a296b4c6f6ee2b88f095b61e95c7ef4f51ba25598835b4978c9256d8c8ace48a | 2021-08-31 | -| alpine:3.13 | sha256:2582893dec6f12fd499d3a709477f2c0c0c1dfcd28024c93f1f0626b9e3540c8 | 2021-08-31 | -| alpine:3.14 | sha256:e1c082e3d3c45cccac829840a25941e679c25d438cc8412c2fa221cf1a824e6a | 2021-08-27 | +| alpine:3.12 | sha256:d9459083f962de6bd980ae6a05be2a4cf670df6a1d898157bceb420342bec280 | 2021-11-12 | +| alpine:3.13 | sha256:026f721af4cf2843e07bba648e158fb35ecc876d822130633cc49f707f0fc88c | 2021-11-12 | +| alpine:3.14 | sha256:635f0aa53d99017b38d1a0aa5b2082f7812b03e3cdb299103fe77b5c8a07f1d2 | 2021-11-12 | | buildpack-deps:bullseye | sha256:1062c3cabe1b62d7e64609e1ebe30406b9d802684758a01fd386bbc60ea6b1aa | 2021-10-12 | | buildpack-deps:buster | sha256:6d442a75a480d13760660675e0094e87e7b64ebd64acb43754c5ed46cb1ea532 | 2021-10-12 | | buildpack-deps:stretch | sha256:63b243cde6ed83435eb26eda196769a37b9426abc76cc7e89ad364c3a24ce18f | 2021-10-12 | @@ -280,14 +280,12 @@ | debian:11 | sha256:4d6ab716de467aad58e91b1b720f0badd7478847ec7a18f66027d0f8a329a43c | 2021-10-12 | | debian:9 | sha256:86269e614274db90a1d71dac258c74ed0a867a1d05f67dea6263b0f216ec7724 | 2021-10-12 | | moby/buildkit:latest | sha256:be268d9d1aa75a670a12417a17122eaaa889c036c465fb30dd010bccb88b35d1 | 2021-11-02 | -| node:10 | sha256:59531d2835edd5161c8f9512f9e095b1836f7a1fcb0ab73e005ec46047384911 | 2021-04-10 | -| node:10-alpine | sha256:dc98dac24efd4254f75976c40bce46944697a110d06ce7fa47e7268470cf2e28 | 2021-04-14 | | node:12 | sha256:15a9da96daf0609aee1b8971d3487095f0385d990e64f099684b5d9d8d711f4d | 2021-10-22 | -| node:12-alpine | sha256:1ecf7789a48e604a841409e65cf2e172d5a014ecd5e60689137d785d2613e9b0 | 2021-10-22 | +| node:12-alpine | sha256:0eca266c5fe38ba93aebac00e45c9ac1bb7328b0702a6dc10e1a6ea543d49301 | 2021-11-13 | | node:14 | sha256:ab6c8cd32006f8a4c1c795e55ddfbc7f54f5a3fb7318506ecb355cab8f5e7182 | 2021-10-22 | -| node:14-alpine | sha256:c346198378f78f8611254dce222e7e6635804e41e5203d1825321edd6c59dca1 | 2021-10-22 | +| node:14-alpine | sha256:240e1e6ef6dfba3bb70d6e88cca6cbb0b5a6f3a2b4496ed7edc5474e8ed594bd | 2021-11-13 | | node:16 | sha256:683b8ea4ebc033a0f9060501fc31c1481d3f7232cc032851abbd8cc8d91fdff7 | 2021-10-27 | -| node:16-alpine | sha256:3bca55259ada636e5fee8f2836aba7fa01fed7afd0652e12773ad44af95868b9 | 2021-10-27 | +| node:16-alpine | sha256:60ef0bed1dc2ec835cfe3c4226d074fdfaba571fd619c280474cc04e93f0ec5b | 2021-11-13 | | ubuntu:16.04 | sha256:0f71fa8d4d2d4292c3c617fda2b36f6dabe5c8b6e34c3dc5b0d17d4e704bd39c | 2021-08-31 | | ubuntu:18.04 | sha256:0fedbd5bd9fb72089c7bbca476949e10593cebed9b1fb9edf5b79dbbacddd7d6 | 2021-10-01 | | ubuntu:20.04 | sha256:626ffe58f6e7566e00254b638eb7e0f3b11d4da9675088f4781a50ae288f3322 | 2021-10-16 | From 152addc1c7badc3f970bfa254d09b37fb7960730 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 18 Nov 2021 09:14:43 +0000 Subject: [PATCH 0746/3485] Updating readme file for ubuntu20 version 20211114.1 (#4506) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2004-README.md | 76 +++++++++++++++---------------- 1 file changed, 37 insertions(+), 39 deletions(-) diff --git a/images/linux/Ubuntu2004-README.md b/images/linux/Ubuntu2004-README.md index 170a1b16fa7e..402066b95437 100644 --- a/images/linux/Ubuntu2004-README.md +++ b/images/linux/Ubuntu2004-README.md @@ -1,13 +1,13 @@ | Announcements | |-| +| [[all OSs] Default Nodejs version will be set to 16 on November, 29](https://github.com/actions/virtual-environments/issues/4446) | | [[all OSs] Selenium server version will be upgraded from 3 to 4 on November, 15](https://github.com/actions/virtual-environments/issues/4376) | | [[Ubuntu] Node:10 docker images will be removed on November, 15](https://github.com/actions/virtual-environments/issues/4357) | | [[All OSs] Node.js version 10 will be removed from the images on November, 15](https://github.com/actions/virtual-environments/issues/4356) | -| [[All OSs] Go versions less than 1.15 will be removed on November, 8](https://github.com/actions/virtual-environments/issues/4311) | *** # Ubuntu 20.04.3 LTS -- Linux kernel version: 5.11.0-1020-azure -- Image Version: 20211108.1 +- Linux kernel version: 5.11.0-1021-azure +- Image Version: 20211114.1 ## Installed Software ### Language and Runtime @@ -32,14 +32,14 @@ ### Package Management - cpan 1.64 - Helm 3.7.1 -- Homebrew 3.3.2 +- Homebrew 3.3.3 - Miniconda 4.10.3 - Npm 6.14.15 - Pip 20.0.2 - Pip3 20.0.2 - Pipx 0.16.4 - RubyGems 3.1.2 -- Vcpkg (build from master \<d78a0b47b>) +- Vcpkg (build from master \<12bdfc7dd>) - Yarn 1.22.17 #### Environment variables @@ -50,7 +50,7 @@ ### Project Management - Ant 1.10.7 -- Gradle 7.2 +- Gradle 7.3 - Lerna 4.0.0 - Maven 3.8.3 - Sbt 1.5.5 @@ -66,8 +66,8 @@ - CMake 3.21.4 - CodeQL Action Bundle 2.7.0 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.0.0 -- Docker-Buildx 0.6.3 +- Docker Compose v2 2.1.1+azure-1 +- Docker-Buildx 0.7.0 - Docker-Moby Client 20.10.10+azure-1 - Docker-Moby Server 20.10.10+azure-1 - Fastlane 2.197.0 @@ -76,43 +76,44 @@ - Git-ftp 1.6.0 - Haveged 1.9.1 - Heroku 7.59.1 -- HHVM (HipHop VM) 4.134.0 +- HHVM (HipHop VM) 4.135.0 - jq 1.6 - Kind 0.11.1 - Kubectl 1.22.3 -- Kustomize 4.4.0 -- Leiningen 2.9.7 +- Kustomize 4.4.1 +- Leiningen 2.9.8 - MediaInfo 19.09 - Mercurial 5.3.1 - Minikube 1.24.0 +- n 8.0.0 - Newman 5.3.0 - nvm 0.39.0 - OpenSSL 1.1.1f 31 Mar 2020 - Packer 1.7.8 - PhantomJS 2.1.1 - Podman 3.3.1 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- Pulumi 3.17.0 +- Pulumi 3.17.1 - R 4.1.2 - Skopeo 1.3.0 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 -- Terraform 1.0.10 +- Terraform 1.0.11 - yamllint 1.26.3 -- yq 4.14.1 +- yq 4.14.2 - zstd 1.5.0 (homebrew) ### CLI Tools -- Alibaba Cloud CLI 3.0.97 -- AWS CLI 2.3.4 +- Alibaba Cloud CLI 3.0.99 +- AWS CLI 2.3.6 - AWS CLI Session manager plugin 1.2.279.0 - AWS SAM CLI 1.35.0 - Azure CLI (azure-cli) 2.30.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) -- Azure CLI (azure-devops) 0.21.0 +- Azure CLI (azure-devops) 0.22.0 - GitHub CLI 2.2.0 -- Google Cloud SDK 363.0.0 (apt source repository: https://packages.cloud.google.com/apt) +- Google Cloud SDK 364.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 6.14.16 -- OpenShift CLI 4.9.5 +- Netlify CLI 6.14.23 +- OpenShift CLI 4.9.6 - ORAS CLI 0.12.0 - Vercel CLI 23.1.2 @@ -131,7 +132,7 @@ | Tool | Version | | -------- | ------------- | | PHP | 7.4.25 8.0.12 | -| Composer | 2.1.11 | +| Composer | 2.1.12 | | PHPUnit | 8.5.21 | ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. @@ -152,7 +153,7 @@ - Bindgen 0.59.1 - Cargo audit 0.15.2 - Cargo clippy 0.1.56 -- Cargo outdated 0.9.17 +- Cargo outdated 0.10.0 - Cbindgen 0.20.0 - Rustfmt 1.4.37 @@ -162,21 +163,21 @@ - Mozilla Firefox 94.0 - Geckodriver 0.30.0 - Chromium 95.0.4638.0 -- Selenium server 3.141.59 +- Selenium server 4.0.0 #### Environment variables -| Name | Value | -| ----------------- | ---------------------------------------------- | -| CHROMEWEBDRIVER | /usr/local/share/chrome_driver | -| GECKOWEBDRIVER | /usr/local/share/gecko_driver | -| SELENIUM_JAR_PATH | /usr/share/java/selenium-server-standalone.jar | +| Name | Value | +| ----------------- | ----------------------------------- | +| CHROMEWEBDRIVER | /usr/local/share/chrome_driver | +| GECKOWEBDRIVER | /usr/local/share/gecko_driver | +| SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | ### .NET Core SDK -- 2.1.302 2.1.403 2.1.526 2.1.617 2.1.701 2.1.818 3.1.120 3.1.202 3.1.302 3.1.414 3.1.415 5.0.104 5.0.208 5.0.303 5.0.402 5.0.403 +- 2.1.302 2.1.403 2.1.526 2.1.617 2.1.701 2.1.818 3.1.120 3.1.202 3.1.302 3.1.415 5.0.104 5.0.209 5.0.303 5.0.403 ### Databases - MongoDB 5.0.3 (apt source repository: https://repo.mongodb.org/apt/ubuntu) -- PostgreSQL 14.0 (apt source repository: https://apt.postgresql.org/pub/repos/apt/) +- PostgreSQL 14.1 (apt source repository: https://apt.postgresql.org/pub/repos/apt/) - sqlite3 3.31.1 #### MySQL @@ -197,7 +198,6 @@ - 1.17.3 #### Node.js -- 10.24.1 - 12.22.7 - 14.18.1 - 16.13.0 @@ -278,9 +278,9 @@ ### Cached Docker images | Repository:Tag | Digest | Created | | ----------------------- | ------------------------------------------------------------------------ | ---------- | -| alpine:3.12 | sha256:a296b4c6f6ee2b88f095b61e95c7ef4f51ba25598835b4978c9256d8c8ace48a | 2021-08-31 | -| alpine:3.13 | sha256:2582893dec6f12fd499d3a709477f2c0c0c1dfcd28024c93f1f0626b9e3540c8 | 2021-08-31 | -| alpine:3.14 | sha256:e1c082e3d3c45cccac829840a25941e679c25d438cc8412c2fa221cf1a824e6a | 2021-08-27 | +| alpine:3.12 | sha256:d9459083f962de6bd980ae6a05be2a4cf670df6a1d898157bceb420342bec280 | 2021-11-12 | +| alpine:3.13 | sha256:026f721af4cf2843e07bba648e158fb35ecc876d822130633cc49f707f0fc88c | 2021-11-12 | +| alpine:3.14 | sha256:635f0aa53d99017b38d1a0aa5b2082f7812b03e3cdb299103fe77b5c8a07f1d2 | 2021-11-12 | | buildpack-deps:bullseye | sha256:1062c3cabe1b62d7e64609e1ebe30406b9d802684758a01fd386bbc60ea6b1aa | 2021-10-12 | | buildpack-deps:buster | sha256:6d442a75a480d13760660675e0094e87e7b64ebd64acb43754c5ed46cb1ea532 | 2021-10-12 | | buildpack-deps:stretch | sha256:63b243cde6ed83435eb26eda196769a37b9426abc76cc7e89ad364c3a24ce18f | 2021-10-12 | @@ -288,14 +288,12 @@ | debian:11 | sha256:4d6ab716de467aad58e91b1b720f0badd7478847ec7a18f66027d0f8a329a43c | 2021-10-12 | | debian:9 | sha256:86269e614274db90a1d71dac258c74ed0a867a1d05f67dea6263b0f216ec7724 | 2021-10-12 | | moby/buildkit:latest | sha256:be268d9d1aa75a670a12417a17122eaaa889c036c465fb30dd010bccb88b35d1 | 2021-11-02 | -| node:10 | sha256:59531d2835edd5161c8f9512f9e095b1836f7a1fcb0ab73e005ec46047384911 | 2021-04-10 | -| node:10-alpine | sha256:dc98dac24efd4254f75976c40bce46944697a110d06ce7fa47e7268470cf2e28 | 2021-04-14 | | node:12 | sha256:15a9da96daf0609aee1b8971d3487095f0385d990e64f099684b5d9d8d711f4d | 2021-10-22 | -| node:12-alpine | sha256:1ecf7789a48e604a841409e65cf2e172d5a014ecd5e60689137d785d2613e9b0 | 2021-10-22 | +| node:12-alpine | sha256:0eca266c5fe38ba93aebac00e45c9ac1bb7328b0702a6dc10e1a6ea543d49301 | 2021-11-13 | | node:14 | sha256:ab6c8cd32006f8a4c1c795e55ddfbc7f54f5a3fb7318506ecb355cab8f5e7182 | 2021-10-22 | -| node:14-alpine | sha256:c346198378f78f8611254dce222e7e6635804e41e5203d1825321edd6c59dca1 | 2021-10-22 | +| node:14-alpine | sha256:240e1e6ef6dfba3bb70d6e88cca6cbb0b5a6f3a2b4496ed7edc5474e8ed594bd | 2021-11-13 | | node:16 | sha256:683b8ea4ebc033a0f9060501fc31c1481d3f7232cc032851abbd8cc8d91fdff7 | 2021-10-27 | -| node:16-alpine | sha256:3bca55259ada636e5fee8f2836aba7fa01fed7afd0652e12773ad44af95868b9 | 2021-10-27 | +| node:16-alpine | sha256:60ef0bed1dc2ec835cfe3c4226d074fdfaba571fd619c280474cc04e93f0ec5b | 2021-11-13 | | ubuntu:16.04 | sha256:0f71fa8d4d2d4292c3c617fda2b36f6dabe5c8b6e34c3dc5b0d17d4e704bd39c | 2021-08-31 | | ubuntu:18.04 | sha256:0fedbd5bd9fb72089c7bbca476949e10593cebed9b1fb9edf5b79dbbacddd7d6 | 2021-10-01 | | ubuntu:20.04 | sha256:626ffe58f6e7566e00254b638eb7e0f3b11d4da9675088f4781a50ae288f3322 | 2021-10-16 | From bebaaa653c156d41df1a76ae95898bcc3e12655a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 18 Nov 2021 09:32:47 +0000 Subject: [PATCH 0747/3485] Updating readme file for macOS-10.15 version 20211114.1 (#4511) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-10.15-Readme.md | 61 +++++++++++++++--------------- 1 file changed, 30 insertions(+), 31 deletions(-) diff --git a/images/macos/macos-10.15-Readme.md b/images/macos/macos-10.15-Readme.md index 5522fa57cdde..781dfa35b663 100644 --- a/images/macos/macos-10.15-Readme.md +++ b/images/macos/macos-10.15-Readme.md @@ -1,19 +1,19 @@ | Announcements | |-| +| [[all OSs] Default Nodejs version will be set to 16 on November, 29](https://github.com/actions/virtual-environments/issues/4446) | | [[all OSs] Selenium server version will be upgraded from 3 to 4 on November, 15](https://github.com/actions/virtual-environments/issues/4376) | | [[All OSs] Node.js version 10 will be removed from the images on November, 15](https://github.com/actions/virtual-environments/issues/4356) | | [[macOS Big Sur] Xcode 13 beta will be removed and Xcode 13.1 set as default on November, 15](https://github.com/actions/virtual-environments/issues/4355) | -| [[All OSs] Go versions less than 1.15 will be removed on November, 8](https://github.com/actions/virtual-environments/issues/4311) | | [macOS-latest workflows will use macOS-11](https://github.com/actions/virtual-environments/issues/4060) | *** # macOS 10.15 info -- System Version: macOS 10.15.7 (19H1419) +- System Version: macOS 10.15.7 (19H1519) - Kernel Version: Darwin 19.6.0 -- Image Version: 20211106.1 +- Image Version: 20211114.1 ## Installed Software ### Language and Runtime -- .NET SDK 2.1.302 2.1.403 2.1.507 2.1.607 2.1.701 2.1.818 3.1.101 3.1.201 3.1.302 3.1.414 5.0.102 5.0.202 5.0.302 5.0.402 +- .NET SDK 2.1.302 2.1.403 2.1.507 2.1.607 2.1.701 2.1.818 3.1.101 3.1.201 3.1.302 3.1.415 5.0.102 5.0.202 5.0.302 5.0.403 - Bash 3.2.57(1)-release - Clang/LLVM 12.0.0 is default - Clang/LLVM 13.0.0 is available on `'$(brew --prefix llvm)/bin/clang'` @@ -29,28 +29,28 @@ - MSBuild 16.9.0.22901 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) - Node.js v14.18.1 - NVM 0.39.0 -- NVM - Cached node versions: v10.24.1 v12.22.7 v14.18.1 +- NVM - Cached node versions: v12.22.7 v14.18.1 v16.13.0 - Perl 5.34.0 - PHP 8.0.12 - Python 2.7.18 -- Python 3.9.7 +- Python 3.9.8 - R 4.1.2 - Ruby 2.7.4p191 ### Package Management -- Bundler version 2.2.30 +- Bundler version 2.2.31 - Carthage 0.38.0 - CocoaPods 1.11.2 -- Composer 2.1.11 -- Homebrew 3.3.2 +- Composer 2.1.12 +- Homebrew 3.3.3 - Miniconda 4.10.3 - NPM 6.14.15 - NuGet 5.9.0.7134 - Pip 20.3.4 (python 2.7) -- Pip 21.2.4 (python 3.9) +- Pip 21.3.1 (python 3.9) - Pipx 0.16.4 -- RubyGems 3.2.30 -- Vcpkg 2021 (build from master \<d78a0b47b>) +- RubyGems 3.2.31 +- Vcpkg 2021 (build from master \<c973b499f>) - Yarn 1.22.15 #### Environment variables @@ -62,7 +62,7 @@ ### Project Management - Apache Ant(TM) 1.10.12 - Apache Maven 3.8.3 -- Gradle 7.2 +- Gradle 7.3 - Sbt 1.5.5 ### Utilities @@ -72,7 +72,7 @@ - bazel 4.2.1 - bazelisk 1.10.1 - bsdtar 3.3.2 - available by 'tar' alias -- Curl 7.79.1 +- Curl 7.80.0 - Git LFS: 3.0.2 - Git: 2.33.1 - GitHub CLI: 2.2.0 @@ -86,10 +86,10 @@ - mongo v5.0.3 - mongod v5.0.3 - Newman 5.3.0 -- OpenSSL 1.1.1l 24 Aug 2021 `(/usr/local/opt/openssl@1.1 -> /usr/local/Cellar/openssl@1.1/1.1.1l_1)` +- OpenSSL 1.1.1l 24 Aug 2021 `(/usr/local/opt/openssl@1.1 -> ../Cellar/openssl@1.1/1.1.1l_1)` - Packer 1.7.8 -- PostgreSQL 14.0 -- psql (PostgreSQL) 14.0 +- PostgreSQL 14.1 +- psql (PostgreSQL) 14.1 - Sox 14.4.2 - Subversion (SVN) 1.14.1 - Switchaudio-osx 1.1.0 @@ -99,9 +99,9 @@ ### Tools -- Aliyun CLI 3.0.97 +- Aliyun CLI 3.0.99 - App Center CLI 2.10.4 -- AWS CLI 2.3.4 +- AWS CLI 2.3.6 - AWS SAM CLI 1.35.0 - AWS Session Manager CLI 1.2.279.0 - Azure CLI 2.30.0 @@ -110,7 +110,7 @@ - Cmake 3.21.4 - Fastlane 2.197.0 - GHC 9.2.1 -- GHCup 0.1.17.3 +- GHCup 0.1.17.4 - Jazzy 0.14.1 - Stack 2.7.3 - SwiftFormat 0.48.18 @@ -122,20 +122,20 @@ - yamllint 1.26.3 ### Browsers -- Safari 15.0 (15612.1.29.41.4) -- SafariDriver 15.0 (15612.1.29.41.4) +- Safari 15.1 (15612.2.9.1.30) +- SafariDriver 15.1 (15612.2.9.1.30) - Google Chrome 95.0.4638.69 -- ChromeDriver 95.0.4638.54 -- Microsoft Edge 95.0.1020.44 -- MSEdgeDriver 95.0.1020.44 +- ChromeDriver 95.0.4638.69 +- Microsoft Edge 95.0.1020.53 +- MSEdgeDriver 95.0.1020.53 - Mozilla Firefox 94.0.1 - geckodriver 0.30.0 -- Selenium server 3.141.59_2 +- Selenium server 4.0.0 #### Environment variables | Name | Value | | --------------- | --------------------------------------------- | -| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/95.0.4638.54 | +| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/95.0.4638.69 | | EDGEWEBDRIVER | /usr/local/share/edge_driver | | GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | @@ -173,7 +173,6 @@ - 3.8.12 [PyPy 7.3.7] #### Node.js -- 10.24.1 - 12.22.7 - 14.18.1 - 16.13.0 @@ -193,13 +192,13 @@ #### Packages - Bindgen 0.59.1 - Cargo-audit 0.15.2 -- Cargo-outdated v0.9.17 +- Cargo-outdated v0.10.0 - Cbindgen 0.20.0 - Clippy 0.1.56 - Rustfmt 1.4.37-stable ### PowerShell Tools -- PowerShell 7.1.5 +- PowerShell 7.2.0 #### PowerShell Modules | Module | Version | @@ -217,7 +216,7 @@ ### Xamarin #### Visual Studio for Mac -- 8.10.12.16 +- 8.10.13.11 #### Xamarin bundles | symlink | Xamarin.Mono | Xamarin.iOS | Xamarin.Mac | Xamarin.Android | From 5ab1cb345e583ded4d4300f8f43de7358942e39e Mon Sep 17 00:00:00 2001 From: Dibir Magomedsaygitov <61747324+dibir-magomedsaygitov@users.noreply.github.com> Date: Thu, 18 Nov 2021 17:23:05 +0300 Subject: [PATCH 0748/3485] [macOS] Remove macOS 10.13 related code in the VE repo (#4494) --- images.CI/macos/azure-pipelines/macos1013.yml | 16 - images.CI/macos/move-vm.ps1 | 6 +- images/macos/helpers/Common.Helpers.psm1 | 1 - images/macos/macos-10.13-Readme.md | 340 ------------------ images/macos/provision/core/firefox.sh | 14 +- images/macos/provision/core/ruby.sh | 5 - .../provision/core/toolcache-high-sierra.sh | 25 -- images/macos/provision/utils/utils.sh | 18 +- .../SoftwareReport.Generator.ps1 | 71 ++-- .../SoftwareReport.Toolcache.psm1 | 11 +- images/macos/templates/macOS-10.13.json | 208 ----------- images/macos/tests/Common.Tests.ps1 | 6 +- images/macos/tests/Haskell.Tests.ps1 | 2 +- images/macos/tests/Linters.Tests.ps1 | 2 +- images/macos/tests/Rust.Tests.ps1 | 2 +- images/macos/tests/System.Tests.ps1 | 4 +- images/macos/tests/Toolcache.Tests.ps1 | 4 +- images/macos/tests/Xcode.Tests.ps1 | 2 +- images/macos/toolsets/toolset-10.13.json | 296 --------------- 19 files changed, 54 insertions(+), 979 deletions(-) delete mode 100644 images.CI/macos/azure-pipelines/macos1013.yml delete mode 100644 images/macos/macos-10.13-Readme.md delete mode 100644 images/macos/provision/core/toolcache-high-sierra.sh delete mode 100644 images/macos/templates/macOS-10.13.json delete mode 100644 images/macos/toolsets/toolset-10.13.json diff --git a/images.CI/macos/azure-pipelines/macos1013.yml b/images.CI/macos/azure-pipelines/macos1013.yml deleted file mode 100644 index 37db40b88b0f..000000000000 --- a/images.CI/macos/azure-pipelines/macos1013.yml +++ /dev/null @@ -1,16 +0,0 @@ -name: macOS-10.13_$(date:yyyyMMdd)$(rev:.r)_unstable - -trigger: none -pr: - autoCancel: true - branches: - include: - - main - -jobs: -- template: image-generation.yml - parameters: - image_label: 'macOS High Sierra' - base_image_name: 'clean-macOS-10.13.6-380Gb-SIPoff_runner' - template_path: 'templates/macOS-10.13.json' - target_datastore: 'ds-image' diff --git a/images.CI/macos/move-vm.ps1 b/images.CI/macos/move-vm.ps1 index 7e8f999ce7ed..8e8c3b74963b 100644 --- a/images.CI/macos/move-vm.ps1 +++ b/images.CI/macos/move-vm.ps1 @@ -82,10 +82,8 @@ try { } try { - if ($VMName -notmatch "10.13") { - Write-Host "Change CPU count to $CpuCount, cores count to $CoresPerSocketCount, amount of RAM to $Memory" - $vm | Set-VM -NumCPU $CpuCount -CoresPerSocket $CoresPerSocketCount -MemoryMB $Memory -Confirm:$false -ErrorAction Stop | Out-Null - } + Write-Host "Change CPU count to $CpuCount, cores count to $CoresPerSocketCount, amount of RAM to $Memory" + $vm | Set-VM -NumCPU $CpuCount -CoresPerSocket $CoresPerSocketCount -MemoryMB $Memory -Confirm:$false -ErrorAction Stop | Out-Null } catch { Write-Host "##vso[task.LogIssue type=error;]Failed to change specs for VM '$VMName'" } diff --git a/images/macos/helpers/Common.Helpers.psm1 b/images/macos/helpers/Common.Helpers.psm1 index 1d42cb0d8b41..a84871f1b1a7 100644 --- a/images/macos/helpers/Common.Helpers.psm1 +++ b/images/macos/helpers/Common.Helpers.psm1 @@ -34,7 +34,6 @@ function Get-OSVersion { return [PSCustomObject]@{ Version = $osVersion.Version Platform = $osVersion.Platform - IsHighSierra = $osVersionMajorMinor -eq "10.13" IsMojave = $osVersionMajorMinor -eq "10.14" IsCatalina = $osVersionMajorMinor -eq "10.15" IsBigSur = $osVersionMajorMinor -eq "11.0" diff --git a/images/macos/macos-10.13-Readme.md b/images/macos/macos-10.13-Readme.md deleted file mode 100644 index e49d7cb3109b..000000000000 --- a/images/macos/macos-10.13-Readme.md +++ /dev/null @@ -1,340 +0,0 @@ -| Announcements | -|-| -| [[macOS] Az modules will be upgraded from 4.8.0 to 5.7.0 on April, 12](https://github.com/actions/virtual-environments/issues/3129) | -| [macOS 11.0 pools will be transited to private preview.](https://github.com/actions/virtual-environments/issues/2486) | -*** -# macOS 10.13 info -- System Version: macOS 10.13.6 (17G14033) -- Kernel Version: Darwin 17.7.0 -- Image Version: 20210413.1 - -## Installed Software -### Language and Runtime -- .NET SDK 2.1.300 2.1.301 2.1.302 2.1.401 2.1.402 2.1.403 2.1.500 2.1.502 2.1.503 2.1.504 2.1.505 2.1.506 2.1.507 -- Bash 3.2.57(1)-release -- Go 1.15.11 -- julia 1.6.0 -- Node.js v8.17.0 -- NVM - Cached node versions: v10.24.1 v12.22.1 v14.16.1 -- NVM 0.38.0 -- Perl 5.32.1 -- PHP 8.0.3 -- Python 2.7.18 -- Python 3.9.4 -- R 4.0.5 -- Ruby 2.7.3p183 - -### Package Management -- Bundler version 2.2.16 -- Carthage 0.37.0 -- CocoaPods 1.10.1 -- Composer 2.0.12 -- Homebrew 3.1.1 -- Miniconda 4.9.2 -- NPM 3.10.10 -- NuGet 4.7.0.5148 -- Pip 20.3.4 (python 2.7) -- Pip 21.0.1 (python 3.9) -- Pipx 0.16.1.0 -- RubyGems 3.2.16 -- Yarn 1.22.5 - -#### Environment variables -| Name | Value | -| ----------------------- | -------------------- | -| CONDA | /usr/local/miniconda | -| VCPKG_INSTALLATION_ROOT | | - -### Project Management -- Apache Ant(TM) 1.10.9 -- Apache Maven 3.8.1 -- Gradle 7.0 - -### Utilities -- 7-Zip 17.04 -- aria2 1.35.0 -- azcopy 10.9.0 -- bazel 3.7.1 -- bazelisk 1.7.5 -- bsdtar 2.8.3 - available by 'tar' alias -- Curl 7.76.0 -- Git LFS: 2.13.3 -- Git: 2.31.1 -- GitHub CLI: 1.8.1 -- GNU parallel 20210322 -- GNU Tar 1.34 - available by 'gtar' alias -- GNU Wget 1.21.1 -- gpg (GnuPG) 2.2.27 -- helm v3.5.3+g041ce5a -- Hub CLI: 2.14.2 -- jq 1.6 -- mongo v4.4.4 -- mongod v4.4.4 -- OpenSSL 1.1.1k 25 Mar 2021 `(/usr/local/opt/openssl -> /usr/local/Cellar/openssl@1.1/1.1.1k)` -- Packer 1.7.2 -- PostgreSQL 13.2 -- psql (PostgreSQL) 13.2 -- Subversion (SVN) 1.14.1 -- Vagrant 2.2.15 -- virtualbox 6.1.18r142142 -- zstd 1.4.9 - - -### Tools -- Aliyun CLI 3.0.73 -- App Center CLI 1.2.2 -- AWS CLI 2.1.37 -- AWS SAM CLI 1.22.0 -- AWS Session Manager CLI 1.2.30.0 -- Azure CLI 2.22.0 -- Cmake 3.20.1 -- Fastlane 2.180.1 -- Xcode Command Line Tools 10.1.0.0.1.1539992718 - -### Linters -- yamllint 1.26.1 - -### Browsers -- Safari 13.1.2 (13609.3.5.1.5) -- SafariDriver 13.1.2 (13609.3.5.1.5) -- Google Chrome 89.0.4389.128 -- ChromeDriver 89.0.4389.23 -- Microsoft Edge 89.0.774.75 -- MSEdgeDriver 89.0.774.76 -- Mozilla Firefox 87.0 -- geckodriver 0.29.1 (970ef713fe58 2021-04-08 23:34 +0200) - -#### Environment variables -| Name | Value | -| --------------- | --------------------------------------------- | -| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/89.0.4389.23 | -| EDGEWEBDRIVER | /usr/local/share/edge_driver | -| GECKOWEBDRIVER | /usr/local/bin | - -### Java -| Version | Vendor | Environment Variable | -| ----------- | ------------- | -------------------- | -| 8.0.282+8 | Adopt OpenJDK | JAVA_HOME_8_X64 | -| 11.0.10+9 | Adopt OpenJDK | JAVA_HOME_11_X64 | -| 12.0.2+10.3 | Adopt OpenJDK | JAVA_HOME_12_X64 | -| 13.0.2+8.1 | Adopt OpenJDK | JAVA_HOME_13_X64 | -| 14.0.2+12 | Adopt OpenJDK | JAVA_HOME_14_X64 | - -### Cached Tools -#### Ruby -- 2.4.10 -- 2.5.8 -- 2.6.6 -- 2.7.1 - -#### Python -- 2.7.17 -- 3.5.10 -- 3.6.10 -- 3.7.6 -- 3.8.2 - -#### PyPy -- 2.7.18 [PyPy 7.3.4] -- 3.6.12 [PyPy 7.3.3] - -### PowerShell Tools -- PowerShell 7.1.3 - -#### PowerShell Modules -| Module | Version | -| ---------------- | ------- | -| Az | 4.8.0 | -| MarkdownPS | 1.9 | -| Pester | 5.1.1 | -| PSScriptAnalyzer | 1.19.1 | - -### Xamarin -#### Visual Studio for Mac -- 8.3.11.1 - -#### Xamarin bundles -| symlink | Xamarin.Mono | Xamarin.iOS | Xamarin.Mac | Xamarin.Android | -| ---------------- | ------------ | ----------- | ----------- | --------------- | -| 6_4_2 | 6.4 | 13.6 | 6.6 | 10.0 | -| 6_4_1 | 6.4 | 13.4 | 6.4 | 10.0 | -| 6_4_0 | 6.4 | 13.2 | 6.2 | 10.0 | -| 6_0_0 | 6.0 | 12.14 | 5.16 | 9.4 | -| 5_18_3 | 5.18 | 12.10 | 5.10 | 9.3 | -| 5_18_2 | 5.18 | 12.8 | 5.8 | 9.2 | -| 5_18_1 | 5.18 | 12.6 | 5.6 | 9.2 | -| 5_16_0_0 | 5.16 | 12.2 | 5.2 | 9.1 | -| 5_16_0 | 5.16 | 12.2 | 5.2 | 9.1 | -| 5_12_0_3 | 5.12 | 12.2 | 5.3 | 9.0 | -| 5_12_0_XC10_PRE | 5.12 | 12.0 | 5.2 | 9.0 | -| 5_12_0 (default) | 5.12 | 11.14 | 4.6 | 9.0 | -| 5_10_1 | 5.10 | 11.12 | 4.4 | 8.3 | -| 5_8_1 | 5.8 | 11.9 | 4.2 | 8.2 | -| 5_8_0 | 5.8 | 11.8 | 4.2 | 8.2 | -| 5_4_1 | 5.4 | 11.6 | 4.0 | 8.1 | -| 5_4_0 | 5.4 | 11.2 | 3.8 | 8.0 | -| 5_2_0 | 5.2 | 11.0 | 3.6 | 7.4 | -| Legacy_5_0_1 | 5.0 | 10.10 | 3.4 | 7.3 | -| Legacy_4_8_1 | 4.8 | 10.6 | 3.0 | 7.1 | - -#### Unit Test Framework -- NUnit 3.6.1 - -### Xcode -| Version | Build | Path | -| -------------- | ------- | ----------------------------- | -| 10.1 (default) | 10B61 | /Applications/Xcode_10.1.app | -| 10.0 | 10A255 | /Applications/Xcode_10.app | -| 9.4.1 | 9F2000 | /Applications/Xcode_9.4.1.app | -| 9.4 | 9F1027a | /Applications/Xcode_9.4.app | -| 9.3.1 | 9E501 | /Applications/Xcode_9.3.1.app | -| 9.3 | 9E145 | /Applications/Xcode_9.3.app | -| 9.2 | 9C40b | /Applications/Xcode_9.2.app | -| 9.1 | 9B55 | /Applications/Xcode_9.1.app | -| 9.0 | 9A235 | /Applications/Xcode_9.app | -| 8.3.3 | 8E3004b | /Applications/Xcode_8.3.3.app | -| 8.2.1 | 8C1002 | /Applications/Xcode_8.2.1.app | -| 8.1 | 8B62 | /Applications/Xcode_8.1.app | -| 8.0 | 8A218a | /Applications/Xcode_8.app | - -#### Xcode Support Tools -- xcpretty 0.3.0 -- xcversion 2.6.8 -- Nomad CLI 3.2.16 -- Nomad CLI IPA ipa 0.14.3 -- xctool 0.3.7 - -#### Installed SDKs -| SDK | SDK Name | Xcode Version | -| ----------------------- | -------------------- | ------------------------------------- | -| macOS 10.12 | macosx10.12 | 8.0, 8.1, 8.2.1, 8.3.3 | -| macOS 10.13 | macosx10.13 | 9.0, 9.1, 9.2, 9.3, 9.3.1, 9.4, 9.4.1 | -| macOS 10.14 | macosx10.14 | 10.0, 10.1 | -| iOS 10.0 | iphoneos10.0 | 8.0 | -| iOS 10.1 | iphoneos10.1 | 8.1 | -| iOS 10.2 | iphoneos10.2 | 8.2.1 | -| iOS 10.3 | iphoneos10.3 | 8.3.3 | -| iOS 11.0 | iphoneos11.0 | 9.0 | -| iOS 11.1 | iphoneos11.1 | 9.1 | -| iOS 11.2 | iphoneos11.2 | 9.2 | -| iOS 11.3 | iphoneos11.3 | 9.3, 9.3.1 | -| iOS 11.4 | iphoneos11.4 | 9.4, 9.4.1 | -| iOS 12.0 | iphoneos12.0 | 10.0 | -| iOS 12.1 | iphoneos12.1 | 10.1 | -| Simulator - iOS 10.0 | iphonesimulator10.0 | 8.0 | -| Simulator - iOS 10.1 | iphonesimulator10.1 | 8.1 | -| Simulator - iOS 10.2 | iphonesimulator10.2 | 8.2.1 | -| Simulator - iOS 10.3 | iphonesimulator10.3 | 8.3.3 | -| Simulator - iOS 11.0 | iphonesimulator11.0 | 9.0 | -| Simulator - iOS 11.1 | iphonesimulator11.1 | 9.1 | -| Simulator - iOS 11.2 | iphonesimulator11.2 | 9.2 | -| Simulator - iOS 11.3 | iphonesimulator11.3 | 9.3, 9.3.1 | -| Simulator - iOS 11.4 | iphonesimulator11.4 | 9.4, 9.4.1 | -| Simulator - iOS 12.0 | iphonesimulator12.0 | 10.0 | -| Simulator - iOS 12.1 | iphonesimulator12.1 | 10.1 | -| tvOS 10.0 | appletvos10.0 | 8.0, 8.1 | -| tvOS 10.1 | appletvos10.1 | 8.2.1 | -| tvOS 10.2 | appletvos10.2 | 8.3.3 | -| tvOS 11.0 | appletvos11.0 | 9.0 | -| tvOS 11.1 | appletvos11.1 | 9.1 | -| tvOS 11.2 | appletvos11.2 | 9.2 | -| tvOS 11.3 | appletvos11.3 | 9.3, 9.3.1 | -| tvOS 11.4 | appletvos11.4 | 9.4, 9.4.1 | -| tvOS 12.0 | appletvos12.0 | 10.0 | -| tvOS 12.1 | appletvos12.1 | 10.1 | -| Simulator - tvOS 10.0 | appletvsimulator10.0 | 8.0, 8.1 | -| Simulator - tvOS 10.1 | appletvsimulator10.1 | 8.2.1 | -| Simulator - tvOS 10.2 | appletvsimulator10.2 | 8.3.3 | -| Simulator - tvOS 11.0 | appletvsimulator11.0 | 9.0 | -| Simulator - tvOS 11.1 | appletvsimulator11.1 | 9.1 | -| Simulator - tvOS 11.2 | appletvsimulator11.2 | 9.2 | -| Simulator - tvOS 11.3 | appletvsimulator11.3 | 9.3, 9.3.1 | -| Simulator - tvOS 11.4 | appletvsimulator11.4 | 9.4, 9.4.1 | -| Simulator - tvOS 12.0 | appletvsimulator12.0 | 10.0 | -| Simulator - tvOS 12.1 | appletvsimulator12.1 | 10.1 | -| watchOS 3.0 | watchos3.0 | 8.0 | -| watchOS 3.1 | watchos3.1 | 8.1, 8.2.1 | -| watchOS 3.2 | watchos3.2 | 8.3.3 | -| watchOS 4.0 | watchos4.0 | 9.0 | -| watchOS 4.1 | watchos4.1 | 9.1 | -| watchOS 4.2 | watchos4.2 | 9.2 | -| watchOS 4.3 | watchos4.3 | 9.3, 9.3.1, 9.4, 9.4.1 | -| watchOS 5.0 | watchos5.0 | 10.0 | -| watchOS 5.1 | watchos5.1 | 10.1 | -| Simulator - watchOS 3.0 | watchsimulator3.0 | 8.0 | -| Simulator - watchOS 3.1 | watchsimulator3.1 | 8.1, 8.2.1 | -| Simulator - watchOS 3.2 | watchsimulator3.2 | 8.3.3 | -| Simulator - watchOS 4.0 | watchsimulator4.0 | 9.0 | -| Simulator - watchOS 4.1 | watchsimulator4.1 | 9.1 | -| Simulator - watchOS 4.2 | watchsimulator4.2 | 9.2 | -| Simulator - watchOS 4.3 | watchsimulator4.3 | 9.3, 9.3.1, 9.4, 9.4.1 | -| Simulator - watchOS 5.0 | watchsimulator5.0 | 10.0 | -| Simulator - watchOS 5.1 | watchsimulator5.1 | 10.1 | - -#### Installed Simulators -| OS | Xcode Version | Simulators | -| ----------- | ------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| iOS 8.4 | 8.0<br>8.1<br>8.2.1<br>8.3.3<br>9.0<br>9.1<br>9.2<br>9.3<br>9.3.1<br>9.4<br>9.4.1<br>10.0<br>10.1 | iPhone 4s<br>iPhone 5<br>iPhone 5s<br>iPhone 6<br>iPhone 6 Plus<br>iPad 2<br>iPad Air<br>iPad Retina | -| iOS 9.0 | 8.0<br>8.1<br>8.2.1<br>8.3.3<br>9.0<br>9.1<br>9.2<br>9.3<br>9.3.1<br>9.4<br>9.4.1<br>10.0<br>10.1 | iPhone 4s<br>iPhone 5<br>iPhone 5s<br>iPhone 6<br>iPhone 6 Plus<br>iPhone 6s<br>iPhone 6s Plus<br>iPad 2<br>iPad Air<br>iPad Air 2<br>iPad Retina | -| iOS 9.1 | 8.0<br>8.1<br>8.2.1<br>8.3.3<br>9.0<br>9.1<br>9.2<br>9.3<br>9.3.1<br>9.4<br>9.4.1<br>10.0<br>10.1 | iPhone 4s<br>iPhone 5<br>iPhone 5s<br>iPhone 6<br>iPhone 6 Plus<br>iPhone 6s<br>iPhone 6s Plus<br>iPad 2<br>iPad Air<br>iPad Air 2<br>iPad Pro<br>iPad Retina | -| iOS 9.2 | 8.0<br>8.1<br>8.2.1<br>8.3.3<br>9.0<br>9.1<br>9.2<br>9.3<br>9.3.1<br>9.4<br>9.4.1<br>10.0<br>10.1 | iPhone 4s<br>iPhone 5<br>iPhone 5s<br>iPhone 6<br>iPhone 6 Plus<br>iPhone 6s<br>iPhone 6s Plus<br>iPad 2<br>iPad Air<br>iPad Air 2<br>iPad Pro<br>iPad Retina | -| iOS 9.3 | 8.0<br>8.1<br>8.2.1<br>8.3.3<br>9.0<br>9.1<br>9.2<br>9.3<br>9.3.1<br>9.4<br>9.4.1<br>10.0<br>10.1 | iPhone 4s<br>iPhone 5<br>iPhone 5s<br>iPhone 6<br>iPhone 6 Plus<br>iPhone 6s<br>iPhone 6s Plus<br>iPad 2<br>iPad Air<br>iPad Air 2<br>iPad Pro<br>iPad Retina | -| iOS 10.0 | 8.0<br>8.1<br>8.2.1<br>8.3.3<br>9.0<br>9.1<br>9.2<br>9.3<br>9.3.1<br>9.4<br>9.4.1<br>10.0<br>10.1 | iPhone 5<br>iPhone 5s<br>iPhone 6<br>iPhone 6 Plus<br>iPhone 6s<br>iPhone 6s Plus<br>iPhone 7<br>iPhone 7 Plus<br>iPhone SE<br>iPad Air<br>iPad Air 2<br>iPad Pro (12.9 inch)<br>iPad Pro (9.7 inch)<br>iPad Retina | -| iOS 10.1 | 8.0<br>8.1<br>8.2.1<br>8.3.3<br>9.0<br>9.1<br>9.2<br>9.3<br>9.3.1<br>9.4<br>9.4.1<br>10.0<br>10.1 | iPhone 5<br>iPhone 5s<br>iPhone 6<br>iPhone 6 Plus<br>iPhone 6s<br>iPhone 6s Plus<br>iPhone 7<br>iPhone 7 Plus<br>iPhone SE<br>iPad Air<br>iPad Air 2<br>iPad Pro (12.9 inch)<br>iPad Pro (9.7 inch)<br>iPad Retina | -| iOS 10.2 | 8.0<br>8.1<br>8.2.1<br>8.3.3<br>9.0<br>9.1<br>9.2<br>9.3<br>9.3.1<br>9.4<br>9.4.1<br>10.0<br>10.1 | iPhone 5<br>iPhone 5s<br>iPhone 6<br>iPhone 6 Plus<br>iPhone 6s<br>iPhone 6s Plus<br>iPhone 7<br>iPhone 7 Plus<br>iPhone SE<br>iPad Air<br>iPad Air 2<br>iPad Pro (12.9 inch)<br>iPad Pro (9.7 inch)<br>iPad Retina | -| iOS 10.3 | 8.0<br>8.1<br>8.2.1<br>8.3.3<br>9.0<br>9.1<br>9.2<br>9.3<br>9.3.1<br>9.4<br>9.4.1<br>10.0<br>10.1 | iPhone 5<br>iPhone 5s<br>iPhone 6<br>iPhone 6 Plus<br>iPhone 6s<br>iPhone 6s Plus<br>iPhone 7<br>iPhone 7 Plus<br>iPhone SE<br>iPad (5th generation)<br>iPad Air<br>iPad Air 2<br>iPad Pro (10.5-inch)<br>iPad Pro (12.9 inch)<br>iPad Pro (12.9-inch) (2nd generation)<br>iPad Pro (9.7 inch)<br>iPad Retina | -| iOS 11.0 | 9.0 | iPhone 5s<br>iPhone 6<br>iPhone 6 Plus<br>iPhone 6s<br>iPhone 6s Plus<br>iPhone 7<br>iPhone 7 Plus<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE<br>iPhone X<br>iPad (5th generation)<br>iPad Air<br>iPad Air 2<br>iPad Pro (10.5-inch)<br>iPad Pro (12.9-inch)<br>iPad Pro (12.9-inch) (2nd generation)<br>iPad Pro (9.7-inch) | -| iOS 11.1 | 9.1 | iPhone 5s<br>iPhone 6<br>iPhone 6 Plus<br>iPhone 6s<br>iPhone 6s Plus<br>iPhone 7<br>iPhone 7 Plus<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE<br>iPhone X<br>iPad (5th generation)<br>iPad Air<br>iPad Air 2<br>iPad Pro (10.5-inch)<br>iPad Pro (12.9-inch)<br>iPad Pro (12.9-inch) (2nd generation)<br>iPad Pro (9.7-inch) | -| iOS 11.2 | 9.2 | iPhone 5s<br>iPhone 6<br>iPhone 6 Plus<br>iPhone 6s<br>iPhone 6s Plus<br>iPhone 7<br>iPhone 7 Plus<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE<br>iPhone X<br>iPad (5th generation)<br>iPad Air<br>iPad Air 2<br>iPad Pro (10.5-inch)<br>iPad Pro (12.9-inch)<br>iPad Pro (12.9-inch) (2nd generation)<br>iPad Pro (9.7-inch) | -| iOS 11.3 | 9.3<br>9.3.1 | iPhone 5s<br>iPhone 6<br>iPhone 6 Plus<br>iPhone 6s<br>iPhone 6s Plus<br>iPhone 7<br>iPhone 7 Plus<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE<br>iPhone X<br>iPad (5th generation)<br>iPad Air<br>iPad Air 2<br>iPad Pro (10.5-inch)<br>iPad Pro (12.9-inch)<br>iPad Pro (12.9-inch) (2nd generation)<br>iPad Pro (9.7-inch) | -| iOS 11.4 | 9.4<br>9.4.1 | iPhone 5s<br>iPhone 6<br>iPhone 6 Plus<br>iPhone 6s<br>iPhone 6s Plus<br>iPhone 7<br>iPhone 7 Plus<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE<br>iPhone X<br>iPad (5th generation)<br>iPad Air<br>iPad Air 2<br>iPad Pro (10.5-inch)<br>iPad Pro (12.9-inch)<br>iPad Pro (12.9-inch) (2nd generation)<br>iPad Pro (9.7-inch) | -| iOS 12.0 | 10.0 | iPhone 5s<br>iPhone 6<br>iPhone 6 Plus<br>iPhone 6s<br>iPhone 6s Plus<br>iPhone 7<br>iPhone 7 Plus<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE<br>iPhone X<br>iPhone XR<br>iPhone XS<br>iPhone XS Max<br>iPad (5th generation)<br>iPad (6th generation)<br>iPad Air<br>iPad Air 2<br>iPad Pro (10.5-inch)<br>iPad Pro (12.9-inch)<br>iPad Pro (12.9-inch) (2nd generation)<br>iPad Pro (9.7-inch) | -| iOS 12.1 | 10.1 | iPhone 5s<br>iPhone 6<br>iPhone 6 Plus<br>iPhone 6s<br>iPhone 6s Plus<br>iPhone 7<br>iPhone 7 Plus<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE<br>iPhone X<br>iPhone XR<br>iPhone XS<br>iPhone XS Max<br>iPad (5th generation)<br>iPad (6th generation)<br>iPad Air<br>iPad Air 2<br>iPad Pro (10.5-inch)<br>iPad Pro (11-inch)<br>iPad Pro (12.9-inch)<br>iPad Pro (12.9-inch) (2nd generation)<br>iPad Pro (12.9-inch) (3rd generation)<br>iPad Pro (9.7-inch) | -| tvOS 10.0 | 8.0<br>8.1 | Apple TV 1080p | -| tvOS 10.1 | 8.2.1 | Apple TV 1080p | -| tvOS 10.2 | 8.3.3 | Apple TV 1080p | -| tvOS 11.0 | 9.0 | Apple TV<br>Apple TV 4K<br>Apple TV 4K (at 1080p) | -| tvOS 11.1 | 9.1 | Apple TV<br>Apple TV 4K<br>Apple TV 4K (at 1080p) | -| tvOS 11.2 | 9.2 | Apple TV<br>Apple TV 4K<br>Apple TV 4K (at 1080p) | -| tvOS 11.3 | 9.3<br>9.3.1 | Apple TV<br>Apple TV 4K<br>Apple TV 4K (at 1080p) | -| tvOS 11.4 | 9.4<br>9.4.1 | Apple TV<br>Apple TV 4K<br>Apple TV 4K (at 1080p) | -| tvOS 12.0 | 10.0 | Apple TV<br>Apple TV 4K<br>Apple TV 4K (at 1080p) | -| tvOS 12.1 | 10.1 | Apple TV<br>Apple TV 4K<br>Apple TV 4K (at 1080p) | -| watchOS 3.0 | 8.0 | Apple Watch - 38mm<br>Apple Watch - 42mm<br>Apple Watch Series 2 - 38mm<br>Apple Watch Series 2 - 42mm | -| watchOS 3.1 | 8.1<br>8.2.1 | Apple Watch - 38mm<br>Apple Watch - 42mm<br>Apple Watch Series 2 - 38mm<br>Apple Watch Series 2 - 42mm | -| watchOS 3.2 | 8.3.3 | Apple Watch - 38mm<br>Apple Watch - 42mm<br>Apple Watch Series 2 - 38mm<br>Apple Watch Series 2 - 42mm | -| watchOS 4.0 | 9.0 | Apple Watch - 38mm<br>Apple Watch - 42mm<br>Apple Watch Series 2 - 38mm<br>Apple Watch Series 2 - 42mm<br>Apple Watch Series 3 - 38mm<br>Apple Watch Series 3 - 42mm | -| watchOS 4.1 | 9.1 | Apple Watch - 38mm<br>Apple Watch - 42mm<br>Apple Watch Series 2 - 38mm<br>Apple Watch Series 2 - 42mm<br>Apple Watch Series 3 - 38mm<br>Apple Watch Series 3 - 42mm | -| watchOS 4.2 | 9.2 | Apple Watch - 38mm<br>Apple Watch - 42mm<br>Apple Watch Series 2 - 38mm<br>Apple Watch Series 2 - 42mm<br>Apple Watch Series 3 - 38mm<br>Apple Watch Series 3 - 42mm | -| watchOS 4.3 | 9.3<br>9.3.1<br>9.4<br>9.4.1 | Apple Watch - 38mm<br>Apple Watch - 42mm<br>Apple Watch Series 2 - 38mm<br>Apple Watch Series 2 - 42mm<br>Apple Watch Series 3 - 38mm<br>Apple Watch Series 3 - 42mm | -| watchOS 5.0 | 10.0 | Apple Watch Series 2 - 38mm<br>Apple Watch Series 2 - 42mm<br>Apple Watch Series 3 - 38mm<br>Apple Watch Series 3 - 42mm<br>Apple Watch Series 4 - 40mm<br>Apple Watch Series 4 - 44mm | -| watchOS 5.1 | 10.1 | Apple Watch Series 2 - 38mm<br>Apple Watch Series 2 - 42mm<br>Apple Watch Series 3 - 38mm<br>Apple Watch Series 3 - 42mm<br>Apple Watch Series 4 - 40mm<br>Apple Watch Series 4 - 44mm | - -### Android -| Package Name | Version | -| -------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Emulator | 30.5.4 | -| Android SDK Build-tools | 30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3<br>26.0.0 26.0.1 26.0.2 26.0.3<br>25.0.0 25.0.1 25.0.2 25.0.3<br>24.0.0 24.0.1 24.0.2 24.0.3<br>23.0.1 23.0.2 23.0.3 23.0.0<br>22.0.1 22.0.0<br>21.1.2 21.0.0 21.0.1 21.0.2 21.1.0 21.1.1<br>20.0.0<br>19.1.0 19.0.0 19.0.1 19.0.2 19.0.3<br>18.0.1 18.1.0 18.1.1<br>17.0.0 | -| Android SDK Platforms | android-S (rev 2)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3)<br>android-26 (rev 2)<br>android-25 (rev 3)<br>android-24 (rev 2)<br>android-23 (rev 3)<br>android-22 (rev 2)<br>android-21 (rev 2)<br>android-20 (rev 2)<br>android-19 (rev 4)<br>android-18 (rev 3)<br>android-17 (rev 3)<br>android-16 (rev 5)<br>android-15 (rev 5) | -| Android SDK Platform-Tools | 31.0.1 | -| Android SDK Tools | 26.1.1 | -| Android Support Repository | 47.0.0 | -| CMake | 3.10.2 | -| Google APIs | addon-google_apis-google-21<br>addon-google_apis-google-22<br>addon-google_apis-google-23<br>addon-google_apis-google-24 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 15.2.4203891<br>18.1.5063045<br>21.4.7075529<br>22.1.7171670 | -| SDK Patch Applier v4 | 1 | - -#### Environment variables -| Name | Value | -| ----------------------- | -------------------------------------------------------------------------------------------------- | -| ANDROID_HOME | /Users/runner/Library/Android/sdk | -| ANDROID_NDK_18R_PATH | /Users/runner/Library/Android/sdk/ndk/18.1.5063045 | -| ANDROID_NDK_HOME | /Users/runner/Library/Android/sdk/ndk-bundle -> /Users/runner/Library/Android/sdk/ndk/21.4.7075529 | -| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/22.1.7171670 | -| ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk-bundle -> /Users/runner/Library/Android/sdk/ndk/21.4.7075529 | -| ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | - - - diff --git a/images/macos/provision/core/firefox.sh b/images/macos/provision/core/firefox.sh index 1173de925e95..f2527c349bf0 100644 --- a/images/macos/provision/core/firefox.sh +++ b/images/macos/provision/core/firefox.sh @@ -4,17 +4,9 @@ source ~/utils/utils.sh echo "Installing Firefox..." brew install --cask firefox -# High Sierra builds driver from sources, and it takes about 2 hours. It's much faster to download the binary directly -if ! is_HighSierra; then - echo "Installing Geckodriver..." - brew_smart_install "geckodriver" - geckoPath="$(brew --prefix geckodriver)/bin" -else - geckoUrl="$(curl -s https://api.github.com/repos/mozilla/geckodriver/releases/latest | jq -r '.assets[].browser_download_url | select(endswith("macos.tar.gz"))')" - download_with_retries $geckoUrl "/tmp" "geckodriver.tar.gz" - geckoPath="/usr/local/bin" - tar -xzf /tmp/geckodriver.tar.gz -C $geckoPath -fi +echo "Installing Geckodriver..." +brew_smart_install "geckodriver" +geckoPath="$(brew --prefix geckodriver)/bin" echo "Add GECKOWEBDRIVER to bashrc..." echo "export GECKOWEBDRIVER=${geckoPath}" >> "${HOME}/.bashrc" diff --git a/images/macos/provision/core/ruby.sh b/images/macos/provision/core/ruby.sh index 53b21938d2e1..e4c198a6a873 100755 --- a/images/macos/provision/core/ruby.sh +++ b/images/macos/provision/core/ruby.sh @@ -9,11 +9,6 @@ GEM_PATH=`gem env|awk '/EXECUTABLE DIRECTORY/ {print $4}'` echo "GEM_PATH=$GEM_PATH" >> "$HOME/.bashrc" echo 'export PATH="$GEM_PATH:/usr/local/opt/ruby@'${DEFAULT_RUBY_VERSION}'/bin:$PATH"' >> "$HOME/.bashrc" -#if High Sierra - skip installation from toolset -if is_HighSierra; then - exit 0 -fi - echo "Install Ruby from toolset..." PACKAGE_TAR_NAMES=$(curl -s "https://api.github.com/repos/ruby/ruby-builder/releases/latest" | jq -r '.assets[].name') TOOLSET_VERSIONS=$(get_toolset_value '.toolcache[] | select(.name | contains("Ruby")) | .versions[]') diff --git a/images/macos/provision/core/toolcache-high-sierra.sh b/images/macos/provision/core/toolcache-high-sierra.sh deleted file mode 100644 index a834d87a43c1..000000000000 --- a/images/macos/provision/core/toolcache-high-sierra.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash -e -o pipefail -########################################################################### -# The script downloads macos hosted tool cache for several Python versions -# and installs them onto the system -# -########################################################################### -SOURCE_URL="https://vstsagenttools.blob.core.windows.net/tools" -PACKAGES_DIR=/tmp/hostedtoolcache - -# Download hosted tool cache with azcopy -azcopy copy $SOURCE_URL $PACKAGES_DIR --include-path "hostedtoolcache/macos-10.13" --recursive -mv $PACKAGES_DIR/tools/hostedtoolcache/macos-10.13/* $PACKAGES_DIR - -if [ $? -ne 0 ]; then - echo "An error occured while downloading hostedtoolcache" - exit 1 -fi - -# Install the tools from the hosted tool cache -packages=$(find $PACKAGES_DIR -name package.json) -for package in $packages; do - pushd $(dirname $package) - npm install - popd -done; \ No newline at end of file diff --git a/images/macos/provision/utils/utils.sh b/images/macos/provision/utils/utils.sh index 090fa60e30af..a51fab435af1 100755 --- a/images/macos/provision/utils/utils.sh +++ b/images/macos/provision/utils/utils.sh @@ -71,16 +71,8 @@ is_Mojave() { fi } -is_HighSierra() { - if [ "$OSTYPE" = "darwin17" ]; then - true - else - false - fi -} - is_Less_Catalina() { - if is_HighSierra || is_Mojave; then + if is_Mojave; then true else false @@ -88,7 +80,7 @@ is_Less_Catalina() { } is_Less_BigSur() { - if is_HighSierra || is_Mojave || is_Catalina; then + if is_Mojave || is_Catalina; then true else false @@ -96,7 +88,7 @@ is_Less_BigSur() { } is_Less_Monterey() { - if is_HighSierra || is_Mojave || is_Catalina || is_BigSur; then + if is_Mojave || is_Catalina || is_BigSur; then true else false @@ -132,9 +124,7 @@ brew_cask_install_ignoring_sha256() { } get_brew_os_keyword() { - if is_HighSierra; then - echo "high_sierra" - elif is_Mojave; then + if is_Mojave; then echo "mojave" elif is_Catalina; then echo "catalina" diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1 index 706404eeb441..3b892f309551 100644 --- a/images/macos/software-report/SoftwareReport.Generator.ps1 +++ b/images/macos/software-report/SoftwareReport.Generator.ps1 @@ -52,7 +52,7 @@ if ($os.IsLessThanMonterey) { ) } -if ( -not $os.IsHighSierra -and $os.IsLessThanMonterey) { +if ($os.IsLessThanMonterey) { $languageAndRuntimeList += @( (Get-GccVersion) (Get-FortranVersion) @@ -163,7 +163,7 @@ if ($os.IsLessThanBigSur) { ) } -if (-not $os.IsHighSierra -and $os.IsLessThanMonterey) { +if ($os.IsLessThanMonterey) { $utilitiesList += @( (Get-SwitchAudioOsxVersion), (Get-SoxVersion) @@ -195,21 +195,17 @@ if ($os.IsLessThanMonterey) { $toolsList += @( (Get-XcodeCommandLineToolsVersion), (Get-SwigVersion), - (Get-BicepVersion) + (Get-BicepVersion), + (Get-GHCupVersion), + (Get-GHCVersion), + (Get-CabalVersion), + (Get-StackVersion) ) -if( -not $os.IsHighSierra) { +if($os.IsLessThanMonterey) { $toolsList += @( - (Get-GHCupVersion), - (Get-GHCVersion), - (Get-CabalVersion), - (Get-StackVersion) + (Get-SwiftFormatVersion) ) - if($os.IsLessThanMonterey) { - $toolsList += @( - (Get-SwiftFormatVersion) - ) - } } $markdown += New-MDList -Style Unordered -Lines ($toolsList | Sort-Object) @@ -217,15 +213,10 @@ $markdown += New-MDList -Style Unordered -Lines ($toolsList | Sort-Object) # Linters $markdown += New-MDHeader "Linters" -Level 3 $lintersList = @( - (Get-YamllintVersion) + (Get-YamllintVersion), + (Get-SwiftLintVersion) ) -if ( -not $os.IsHighSierra) { - $lintersList += @( - (Get-SwiftLintVersion) - ) -} - $markdown += New-MDList -Style Unordered -Lines ($lintersList | Sort-Object) $markdown += New-MDHeader "Browsers" -Level 3 @@ -241,27 +232,25 @@ $markdown += New-MDNewLine # Toolcache $markdown += Build-ToolcacheSection -if ( -not $os.IsHighSierra) { - $markdown += New-MDHeader "Rust Tools" -Level 3 - $markdown += New-MDList -Style Unordered -Lines (@( - (Get-RustVersion), - (Get-RustupVersion), - (Get-RustdocVersion), - (Get-RustCargoVersion) - ) | Sort-Object - ) - - $markdown += New-MDHeader "Packages" -Level 4 - $markdown += New-MDList -Style Unordered -Lines (@( - (Get-Bindgen), - (Get-Cbindgen), - (Get-Cargooutdated), - (Get-Cargoaudit), - (Get-RustfmtVersion), - (Get-RustClippyVersion) - ) | Sort-Object - ) -} +$markdown += New-MDHeader "Rust Tools" -Level 3 +$markdown += New-MDList -Style Unordered -Lines (@( + (Get-RustVersion), + (Get-RustupVersion), + (Get-RustdocVersion), + (Get-RustCargoVersion) + ) | Sort-Object +) + +$markdown += New-MDHeader "Packages" -Level 4 +$markdown += New-MDList -Style Unordered -Lines (@( + (Get-Bindgen), + (Get-Cbindgen), + (Get-Cargooutdated), + (Get-Cargoaudit), + (Get-RustfmtVersion), + (Get-RustClippyVersion) + ) | Sort-Object +) $markdown += New-MDHeader "PowerShell Tools" -Level 3 $markdown += New-MDList -Lines (Get-PowershellVersion) -Style Unordered diff --git a/images/macos/software-report/SoftwareReport.Toolcache.psm1 b/images/macos/software-report/SoftwareReport.Toolcache.psm1 index a31746cf7e8e..3b39b6fc793a 100644 --- a/images/macos/software-report/SoftwareReport.Toolcache.psm1 +++ b/images/macos/software-report/SoftwareReport.Toolcache.psm1 @@ -53,13 +53,10 @@ function Build-ToolcacheSection { $output += New-MDList -Lines (Get-ToolcachePythonVersions) -Style Unordered $output += New-MDHeader "PyPy" -Level 4 $output += New-MDList -Lines (Get-ToolcachePyPyVersions) -Style Unordered - - if( -not $os.IsHighSierra) { - $output += New-MDHeader "Node.js" -Level 4 - $output += New-MDList -Lines (Get-ToolcacheNodeVersions) -Style Unordered - $output += New-MDHeader "Go" -Level 4 - $output += Get-ToolcacheGoTable - } + $output += New-MDHeader "Node.js" -Level 4 + $output += New-MDList -Lines (Get-ToolcacheNodeVersions) -Style Unordered + $output += New-MDHeader "Go" -Level 4 + $output += Get-ToolcacheGoTable return $output } diff --git a/images/macos/templates/macOS-10.13.json b/images/macos/templates/macOS-10.13.json deleted file mode 100644 index 56f3b3e680e3..000000000000 --- a/images/macos/templates/macOS-10.13.json +++ /dev/null @@ -1,208 +0,0 @@ -{ - "variables": { - "vcenter_server": null, - "vcenter_username": null, - "vcenter_password": null, - "vcenter_datacenter": null, - "cluster_or_esxi_host": null, - "esxi_datastore": null, - "build_id": null, - "baseimage_name": null, - "output_folder": null, - "vm_username": null, - "vm_password": null, - "xcode_install_user": null, - "xcode_install_password": null, - "image_os": "macos1013" - }, - "builders": [ - { - "type": "vsphere-clone", - "vcenter_server": "{{user `vcenter_server`}}", - "username": "{{user `vcenter_username`}}", - "password": "{{user `vcenter_password`}}", - "insecure_connection": true, - "datacenter": "{{ user `vcenter_datacenter` }}", - "template": "{{ user `baseimage_name` }}", - "folder": "{{user `output_folder` }}", - "host": "{{user `cluster_or_esxi_host`}}", - "datastore": "{{user `esxi_datastore`}}", - "vm_name": "{{user `build_id`}}", - "ssh_username": "{{user `vm_username`}}", - "ssh_password": "{{user `vm_password`}}", - "CPUs": "10", - "RAM": "24576", - "NestedHV": "true", - "shutdown_timeout": "15m" - } - ], - "provisioners": [ - { - "type": "shell", - "inline": "mkdir ~/image-generation" - }, - { - "type": "file", - "source": "./provision/assets", - "destination": "~/image-generation/" - }, - { - "type": "file", - "source": "./tests", - "destination": "~/image-generation/" - }, - { - "type": "file", - "source": "./software-report", - "destination": "~/image-generation/" - }, - { - "type": "file", - "source": "./helpers", - "destination": "~/image-generation/" - }, - { - "type": "file", - "source": "./provision/configuration/environment/bashrc", - "destination": "~/.bashrc" - }, - { - "type": "file", - "source": "./provision/configuration/environment/bashprofile", - "destination": "~/.bash_profile" - }, - { - "type": "file", - "source": "./provision/utils", - "destination": "~/" - }, - { - "type": "file", - "source": "./provision/bootstrap-provisioner", - "destination": "~/bootstrap" - }, - { - "type": "file", - "source": "./toolsets/toolset-10.13.json", - "destination": "~/image-generation/toolset.json" - }, - { - "type": "shell", - "execute_command": "chmod +x {{ .Path }}; sudo {{ .Vars }} {{ .Path }}", - "scripts": [ - "./provision/configuration/add-network-interface-detection.sh", - "./provision/configuration/autologin.sh", - "./provision/configuration/disable-auto-updates.sh", - "./provision/configuration/screensaver-off.sh", - "./provision/configuration/ntpconf.sh", - "./provision/configuration/max-files.sh" - ], - "environment_vars": [ - "PASSWORD={{user `vm_password`}}", - "USERNAME={{user `vm_username`}}" - ] - }, - { - "type": "shell", - "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}", - "scripts": [ - "./provision/configuration/preimagedata.sh", - "./provision/configuration/configure-ssh.sh", - "./provision/configuration/configure-machine.sh" - ], - "environment_vars": [ - "IMAGE_VERSION={{user `build_id`}}", - "IMAGE_OS={{user `image_os`}}" - ] - }, - { - "type": "shell", - "execute_command": "chmod +x {{ .Path }}; sudo {{ .Vars }} {{ .Path }}", - "script": "./provision/core/reboot.sh", - "expect_disconnect": true - }, - { - "type": "shell", - "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}", - "pause_before": "30s", - "scripts": [ - "./provision/core/xcode-clt.sh", - "./provision/core/homebrew.sh", - "./provision/core/powershell.sh", - "./provision/core/dotnet.sh", - "./provision/core/python.sh", - "./provision/core/azcopy.sh", - "./provision/core/openssl.sh", - "./provision/core/ruby.sh", - "./provision/core/rubygem.sh", - "./provision/core/git.sh", - "./provision/core/node.sh" - ] - }, - { - "type": "shell", - "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} pwsh -f {{ .Path }}", - "script": "./provision/core/xcode.ps1", - "environment_vars": [ - "XCODE_INSTALL_USER={{user `xcode_install_user`}}", - "XCODE_INSTALL_PASSWORD={{user `xcode_install_password`}}" - ] - }, - { - "type": "shell", - "execute_command": "chmod +x {{ .Path }}; sudo {{ .Vars }} {{ .Path }}", - "script": "./provision/core/reboot.sh", - "expect_disconnect": true - }, - { - "type": "shell", - "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}", - "scripts": [ - "./provision/core/commonutils.sh", - "./provision/core/golang.sh", - "./provision/core/openjdk.sh", - "./provision/core/php.sh", - "./provision/core/aws.sh", - "./provision/core/cocoapods.sh", - "./provision/core/android-toolsets.sh", - "./provision/core/xamarin.sh", - "./provision/core/xamarin-android-ndk.sh", - "./provision/core/vsmac.sh", - "./provision/core/nvm.sh", - "./provision/core/postgresql.sh", - "./provision/core/mongodb.sh", - "./provision/core/miniconda.sh", - "./provision/core/safari.sh", - "./provision/core/chrome.sh", - "./provision/core/edge.sh", - "./provision/core/firefox.sh", - "./provision/core/toolcache-high-sierra.sh", - "./provision/core/pypy.sh", - "./provision/core/pipx-packages.sh", - "./provision/core/xcode-sims.sh", - "./provision/core/build-xcode-symlinks.sh" - ] - }, - { - "type": "shell", - "inline": [ - "pwsh -File \"$HOME/image-generation/software-report/SoftwareReport.Generator.ps1\" -OutputDirectory \"$HOME/image-generation/output/software-report\" -ImageName {{user `build_id`}}", - "pwsh -File \"$HOME/image-generation/tests/RunAll-Tests.ps1\"" - ] - }, - { - "type": "file", - "direction": "download", - "source": "~/image-generation/output/*", - "destination": "../image-output/" - }, - { - "type": "shell", - "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}", - "scripts": [ - "./provision/configuration/configure-hostname.sh", - "./provision/configuration/finalize-vm.sh" - ] - } - ] -} diff --git a/images/macos/tests/Common.Tests.ps1 b/images/macos/tests/Common.Tests.ps1 index 5b3c4730b371..16d7878c5bbe 100644 --- a/images/macos/tests/Common.Tests.ps1 +++ b/images/macos/tests/Common.Tests.ps1 @@ -9,7 +9,7 @@ Describe ".NET" { } } -Describe "GCC" -Skip:($os.IsHighSierra -or $os.IsMonterey) { +Describe "GCC" -Skip:($os.IsMonterey) { $testCases = Get-ToolsetValue -KeyPath gcc.versions | ForEach-Object { @{Version = $_} } It "GCC <Version>" -TestCases $testCases { @@ -33,7 +33,7 @@ Describe "GCC" -Skip:($os.IsHighSierra -or $os.IsMonterey) { } } -Describe "vcpkg" -Skip:($os.IsHighSierra -or $os.IsMojave -or $os.IsMonterey) { +Describe "vcpkg" -Skip:($os.IsMojave -or $os.IsMonterey) { It "vcpkg" { "vcpkg version" | Should -ReturnZeroExitCode } @@ -66,7 +66,7 @@ Describe "Miniconda" -Skip:($os.IsMonterey) { } } -Describe "Stack" -Skip:($os.IsHighSierra) { +Describe "Stack" { It "Stack" { "stack --version" | Should -ReturnZeroExitCode } diff --git a/images/macos/tests/Haskell.Tests.ps1 b/images/macos/tests/Haskell.Tests.ps1 index 4bbf8884d5b9..525e8934211f 100644 --- a/images/macos/tests/Haskell.Tests.ps1 +++ b/images/macos/tests/Haskell.Tests.ps1 @@ -1,6 +1,6 @@ $os = Get-OSVersion -Describe "Haskell" -Skip:($os.IsHighSierra) { +Describe "Haskell" { Context "GHCup" { It "GHCup" { "ghcup --version" | Should -ReturnZeroExitCode diff --git a/images/macos/tests/Linters.Tests.ps1 b/images/macos/tests/Linters.Tests.ps1 index 6517b56df30e..99fa34969b69 100644 --- a/images/macos/tests/Linters.Tests.ps1 +++ b/images/macos/tests/Linters.Tests.ps1 @@ -3,7 +3,7 @@ Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1" -DisableNameChecking $os = Get-OSVersion Describe "SwiftLint" { - It "SwiftLint" -Skip:($os.IsHighSierra) { + It "SwiftLint" { "swiftlint version" | Should -ReturnZeroExitCode } } \ No newline at end of file diff --git a/images/macos/tests/Rust.Tests.ps1 b/images/macos/tests/Rust.Tests.ps1 index 405724d535b0..585271830458 100644 --- a/images/macos/tests/Rust.Tests.ps1 +++ b/images/macos/tests/Rust.Tests.ps1 @@ -1,6 +1,6 @@ $os = Get-OSVersion -Describe "Rust" -Skip:($os.IsHighSierra) { +Describe "Rust" { Context "Rust" { It "Rustup is installed" { "rustup --version" | Should -ReturnZeroExitCode diff --git a/images/macos/tests/System.Tests.ps1 b/images/macos/tests/System.Tests.ps1 index 5b6b14e31efe..71b6d48f63d8 100644 --- a/images/macos/tests/System.Tests.ps1 +++ b/images/macos/tests/System.Tests.ps1 @@ -17,7 +17,7 @@ Describe "Certificate" { } } -Describe "Audio device" -Skip:($os.IsHighSierra -or $os.IsMonterey) { +Describe "Audio device" -Skip:($os.IsMonterey) { It "Sox is installed" { "sox --version" | Should -ReturnZeroExitCode } @@ -35,7 +35,7 @@ Describe "Audio device" -Skip:($os.IsHighSierra -or $os.IsMonterey) { } } -Describe "Screen Resolution" -Skip:($os.IsHighSierra) { +Describe "Screen Resolution" { It "Screen Resolution" { system_profiler SPDisplaysDataType | Select-String "Resolution" | Should -Match "1176 x 885|1920 x 1080" } diff --git a/images/macos/tests/Toolcache.Tests.ps1 b/images/macos/tests/Toolcache.Tests.ps1 index 8d3d558f755d..aaeb8db9ab7d 100644 --- a/images/macos/tests/Toolcache.Tests.ps1 +++ b/images/macos/tests/Toolcache.Tests.ps1 @@ -142,7 +142,7 @@ Describe "Toolcache" { } } - Context "Node" -Skip:($os.IsHighSierra) { + Context "Node" { $nodeDirectory = Join-Path $toolcacheDirectory "node" $nodePackage = $packages | Where-Object { $_.ToolName -eq "node" } | Select-Object -First 1 $testCase = @{ NodeDirectory = $nodeDirectory } @@ -192,7 +192,7 @@ Describe "Toolcache" { } } - Context "Go" -Skip:($os.IsHighSierra) { + Context "Go" { $goDirectory = Join-Path $toolcacheDirectory "go" $goPackage = $packages | Where-Object { $_.ToolName -eq "go" } | Select-Object -First 1 $testCase = @{ GoDirectory = $goDirectory } diff --git a/images/macos/tests/Xcode.Tests.ps1 b/images/macos/tests/Xcode.Tests.ps1 index 73d86bb495e5..411eb041e885 100644 --- a/images/macos/tests/Xcode.Tests.ps1 +++ b/images/macos/tests/Xcode.Tests.ps1 @@ -34,7 +34,7 @@ Describe "Xcode" { } Context "Additional tools" { - It "Xcode <XcodeVersion> tools are installed" -TestCases $testCases -Skip:($os.IsHighSierra) { + It "Xcode <XcodeVersion> tools are installed" -TestCases $testCases { $TOOLS_NOT_INSTALLED_EXIT_CODE = 69 $xcodebuildPath = Get-XcodeToolPath -Version $XcodeVersion -ToolName "xcodebuild" $result = Get-CommandResult "$xcodebuildPath -checkFirstLaunchStatus" diff --git a/images/macos/toolsets/toolset-10.13.json b/images/macos/toolsets/toolset-10.13.json deleted file mode 100644 index 169b4c5fba96..000000000000 --- a/images/macos/toolsets/toolset-10.13.json +++ /dev/null @@ -1,296 +0,0 @@ -{ - "xcode": { - "default": "10.1", - "versions": [ - { "link": "10.1", "version": "10.1.0", "symlinks": ["10.1_beta"] }, - { "link": "10", "version": "10.0.0", "symlinks": ["10_beta"] }, - { "link": "9.4.1", "version": "9.4.1" }, - { "link": "9.4", "version": "9.4.0", "symlinks": ["9.4_beta"] }, - { "link": "9.3.1", "version": "9.3.1" }, - { "link": "9.3", "version": "9.3.0", "symlinks": ["9.3_beta"] }, - { "link": "9.2", "version": "9.2.0" }, - { "link": "9.1", "version": "9.1.0" }, - { "link": "9", "version": "9.0.0" }, - { "link": "8.3.3", "version": "8.3.3" }, - { "link": "8.2.1", "version": "8.2.1" }, - { "link": "8.1", "version": "8.1.0" }, - { "link": "8", "version": "8.0.0" } - ] - }, - "xamarin": { - "vsmac": "8.3.11.1", - "mono-versions": [ - "6.4.0.208", "6.0.0.334", "5.18.1.3", "5.16.1.0", "5.12.0.309", "5.10.1.57", "5.8.1.0", "5.4.1.7", "5.2.0.224", "5.0.1.1", "4.8.1.0" - ], - "ios-versions": [ - "13.6.0.12", "13.4.0.2", "13.2.0.47", "12.14.0.114", "12.10.0.157", "12.8.0.2", "12.6.0.25", "12.2.1.16", "12.0.0.15", "11.14.0.13", "11.12.0.4", "11.9.1.24", "11.8.0.20", "11.6.1.4", "11.2.0.11", "11.0.0.0", "10.10.0.36", "10.6.0.10" - ], - "mac-versions": [ - "6.6.0.12", "6.4.0.2", "6.2.0.47", "5.16.1.24", "5.10.0.157", "5.8.0.0", "5.6.0.25", "5.3.1.28", "5.2.1.16" , "4.6.0.13", "4.4.1.193", "4.2.1.28", "4.0.0.216", "3.8.0.49", "3.6.3.3", "3.4.0.36", "3.0.0.398" - ], - "android-versions": [ - "10.0.6.2", "9.4.1.0", "9.3.0-23", "9.2.3-0", "9.1.8-0", "9.0.0-20", "8.3.3-2", "8.2.0-16", "8.1.5-0", "8.0.0-33", "7.4.5-1", "7.3.1-2", "7.1.0-43" - ], - "bundle-default": "5_12_0", - "bundles": [ - { - "symlink": "6_4_2", - "mono": "6.4", - "ios": "13.6", - "mac": "6.6", - "android": "10.0" - }, - { - "symlink": "6_4_1", - "mono": "6.4", - "ios": "13.4", - "mac": "6.4", - "android": "10.0" - }, - { - "symlink": "6_4_0", - "mono": "6.4", - "ios": "13.2", - "mac": "6.2", - "android": "10.0" - }, - { - "symlink": "6_0_0", - "mono": "6.0", - "ios": "12.14", - "mac": "5.16", - "android": "9.4" - }, - { - "symlink": "5_18_3", - "mono": "5.18", - "ios": "12.10", - "mac": "5.10", - "android": "9.3" - }, - { - "symlink": "5_18_2", - "mono": "5.18", - "ios": "12.8", - "mac": "5.8", - "android": "9.2" - }, - { - "symlink": "5_18_1", - "mono": "5.18", - "ios": "12.6", - "mac": "5.6", - "android": "9.2" - }, - { - "symlink": "5_16_0_0", - "mono": "5.16", - "ios": "12.2", - "mac": "5.2", - "android": "9.1" - }, - { - "symlink": "5_16_0", - "mono": "5.16", - "ios": "12.2", - "mac": "5.2", - "android": "9.1" - }, - { - "symlink": "5_12_0_3", - "mono": "5.12", - "ios": "12.2", - "mac": "5.3", - "android": "9.0" - }, - { - "symlink": "5_12_0_XC10_PRE", - "mono": "5.12", - "ios": "12.0", - "mac": "5.2", - "android": "9.0" - }, - { - "symlink": "5_12_0", - "mono": "5.12", - "ios": "11.14", - "mac": "4.6", - "android": "9.0" - }, - { - "symlink": "5_10_1", - "mono": "5.10", - "ios": "11.12", - "mac": "4.4", - "android": "8.3" - }, - { - "symlink": "5_8_1", - "mono": "5.8", - "ios": "11.9", - "mac": "4.2", - "android": "8.2" - }, - { - "symlink": "5_8_0", - "mono": "5.8", - "ios": "11.8", - "mac": "4.2", - "android": "8.2" - }, - { - "symlink": "5_4_1", - "mono": "5.4", - "ios": "11.6", - "mac": "4.0", - "android": "8.1" - }, - { - "symlink": "5_4_0", - "mono": "5.4", - "ios": "11.2", - "mac": "3.8", - "android": "8.0" - }, - { - "symlink": "5_2_0", - "mono": "5.2", - "ios": "11.0", - "mac": "3.6", - "android": "7.4" - }, - { - "symlink": "Legacy_5_0_1", - "mono": "5.0", - "ios": "10.10", - "mac": "3.4", - "android": "7.3" - }, - { - "symlink": "Legacy_4_8_1", - "mono": "4.8", - "ios": "10.6", - "mac": "3.0", - "android": "7.1" - } - ] - }, - "java": { - "default": "8", - "versions": [ - "8", "11", "12", "13", "14" - ] - }, - "android": { - "platform_min_version": "15", - "build_tools_min_version": "17.0.0", - "extra-list": [ - "android;m2repository", "google;m2repository", "google;google_play_services", "intel;Hardware_Accelerated_Execution_Manager", "m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta1", "m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta2", "m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta3", "m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta4", "m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta5", "m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0", "m2repository;com;android;support;constraint;constraint-layout-solver;1.0.1", "m2repository;com;android;support;constraint;constraint-layout-solver;1.0.2", "m2repository;com;android;support;constraint;constraint-layout;1.0.0-beta1", "m2repository;com;android;support;constraint;constraint-layout;1.0.0-beta2", "m2repository;com;android;support;constraint;constraint-layout;1.0.0-beta3", "m2repository;com;android;support;constraint;constraint-layout;1.0.0-beta4", "m2repository;com;android;support;constraint;constraint-layout;1.0.0-beta5", "m2repository;com;android;support;constraint;constraint-layout;1.0.0", "m2repository;com;android;support;constraint;constraint-layout;1.0.1", "m2repository;com;android;support;constraint;constraint-layout;1.0.2" - ], - "addon-list": [ - "addon-google_apis-google-24", "addon-google_apis-google-23", "addon-google_apis-google-22", "addon-google_apis-google-21" - ], - "additional-tools": [ - "cmake;3.10.2.4988404" - ], - "ndk": { - "lts": "21", - "latest": "22" - } - }, - "powershellModules": [ - { - "name": "Az", - "versions": [ - "4.8.0" - ] - }, - {"name": "MarkdownPS"}, - {"name": "Pester"}, - {"name": "PSScriptAnalyzer"} - ], - "npm": { - "global_packages": [ - { "name": "npm@3" }, - { "name": "omelette@0.4.14" }, - { "name": "appcenter-cli@^1.0.0", "test": "appcenter --version" }, - { "name": "node-gyp" } - ] - }, - "brew": { - "common_packages": [ - "aliyun-cli", - "ant", - "aria2", - "bats", - "bazelisk", - "carthage", - "cmake", - "gh", - "gnupg", - "gnu-tar", - "helm", - "libpq", - "llvm", - "p7zip", - "packer", - "parallel", - "perl", - "subversion", - "xctool", - "zstd" - ], - "cask_packages": [ - "julia", - "r", - "vagrant", - "virtualbox" - ] - }, - "toolcache": [ - { - "name": "PyPy", - "arch": "x64", - "platform" : "darwin", - "versions": [ - "2.7", - "3.6" - ] - }, - { - "name": "Ruby", - "arch": "x64", - "versions": [ - "2.4.*", - "2.5.*", - "2.6.*", - "2.7.*" - ] - } - ], - "pipx": [ - { - "package": "yamllint", - "cmd": "yamllint --version" - } - ], - "dotnet": { - "versions": [ - "2.1" - ] - }, - "ruby": { - "default": "2.7", - "rubygems": [ - "xcode-install", - "cocoapods", - "nomad-cli", - "xcpretty", - "bundler", - "fastlane" - ] - }, - "go": { - "default": "1.15" - } -} \ No newline at end of file From a8096c59abc25169756b8dddc7a266d90dbff9ac Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Thu, 18 Nov 2021 17:52:27 +0300 Subject: [PATCH 0749/3485] softwarereport: do not use regex to get version of choco (#4536) --- images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 index 2f6ca4c522f8..83c441ce5902 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 @@ -111,9 +111,7 @@ function Get-NodeVersion { } function Get-ChocoVersion { - ($(choco version) | Out-String) -match "v(?<version>\d+\.\d+\.\d+)" | Out-Null - $chocoVersion = $Matches.Version - return "Chocolatey $chocoVersion" + return "Chocolatey $(choco --version)" } function Get-VcpkgVersion { From f38b2174698750ed6d8e5297458c0df698958345 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Thu, 18 Nov 2021 18:06:58 +0300 Subject: [PATCH 0750/3485] [macOS] week 47 software update (#4538) --- images/macos/toolsets/toolset-11.json | 4 ++-- images/macos/toolsets/toolset-12.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index aa19099b3dc5..35568ade8ce7 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -16,10 +16,10 @@ "6.12.0.140" ], "ios-versions": [ - "15.2.0.1", "15.0.0.6", "14.20.0.24", "14.16.0.5", "14.14.2.5", "14.10.0.4", "14.8.0.3", "14.6.0.15", "14.4.1.3", "14.2.0.12", "14.0.0.0", "13.20.2.2" + "15.2.0.17", "15.0.0.6", "14.20.0.24", "14.16.0.5", "14.14.2.5", "14.10.0.4", "14.8.0.3", "14.6.0.15", "14.4.1.3", "14.2.0.12", "14.0.0.0", "13.20.2.2" ], "mac-versions": [ - "8.2.0.1", "7.14.0.27", "7.10.0.5", "7.8.2.5", "7.4.0.10", "7.2.0.3", "7.0.0.15", "6.22.1.26", "6.20.2.2" + "8.2.0.17", "7.14.0.27", "7.10.0.5", "7.8.2.5", "7.4.0.10", "7.2.0.3", "7.0.0.15", "6.22.1.26", "6.20.2.2" ], "android-versions": [ "12.0.0.3", "11.3.0.4", "11.2.2.1", "11.1.0.26", "11.0.2.0" diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index 4cf2be7f58ff..83a6ee5f0fb5 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -12,10 +12,10 @@ "6.12.0.140" ], "ios-versions": [ - "15.2.0.1", "15.0.0.6" + "15.2.0.17", "15.0.0.6" ], "mac-versions": [ - "8.2.0.1", "7.14.0.27" + "8.2.0.17", "7.14.0.27" ], "android-versions": [ "12.0.0.3", "11.3.0.4" From d3a5bad25f3b4326c5666bab0011ac7f1beec95e Mon Sep 17 00:00:00 2001 From: Maxim Lobanov <maxim-lobanov@github.com> Date: Fri, 19 Nov 2021 12:44:22 +0100 Subject: [PATCH 0751/3485] [Windows] Install Docker-wincred (#4540) * Add Docker WinCred * fix getting docker url * Use Expand-Archive instead of Extract-7Zip since 7zip is not installed yet --- images/win/scripts/Installers/Install-Docker.ps1 | 7 +++++++ .../scripts/SoftwareReport/SoftwareReport.Generator.ps1 | 1 + .../win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 | 5 +++++ images/win/scripts/Tests/Docker.Tests.ps1 | 4 ++++ 4 files changed, 17 insertions(+) diff --git a/images/win/scripts/Installers/Install-Docker.ps1 b/images/win/scripts/Installers/Install-Docker.ps1 index 0ba79d382852..fa0dcaf63abe 100644 --- a/images/win/scripts/Installers/Install-Docker.ps1 +++ b/images/win/scripts/Installers/Install-Docker.ps1 @@ -14,6 +14,13 @@ Start-Service docker Write-Host "Install-Package Docker-Compose" Choco-Install -PackageName docker-compose +Write-Host "Install docker-wincred" +$dockerCredLatestRelease = Invoke-RestMethod -Uri "https://api.github.com/repos/docker/docker-credential-helpers/releases/latest" +$dockerCredDownloadUrl = $dockerCredLatestRelease.assets.browser_download_url -match "docker-credential-wincred-.+\.zip" | Select-Object -First 1 +$dockerCredArchive = Start-DownloadWithRetry -Url $dockerCredDownloadUrl +Expand-Archive -Path $dockerCredArchive -DestinationPath "C:\Program Files\Docker" + +Write-Host "Download docker images" $dockerImages = (Get-ToolsetContent).docker.images foreach ($dockerImage in $dockerImages) { Write-Host "Pulling docker image $dockerImage ..." diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index 280b9c95ea7f..fa8f299bfc24 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -96,6 +96,7 @@ $toolsList = @( (Get-CodeQLBundleVersion), (Get-DockerVersion), (Get-DockerComposeVersion), + (Get-DockerWincredVersion), (Get-GHCVersion), (Get-GitVersion), (Get-GitLFSVersion), diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 index 9456bf567edb..3534691e1817 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 @@ -61,6 +61,11 @@ function Get-DockerComposeVersion { return "Docker-compose $dockerComposeVersion" } +function Get-DockerWincredVersion { + $dockerCredVersion = $(docker-credential-wincred version) + return "Docker-wincred $dockerCredVersion" +} + function Get-GitVersion { $(git version) -match "git version (?<version>\d+\.\d+\.\d+)" | Out-Null $gitVersion = $Matches.Version diff --git a/images/win/scripts/Tests/Docker.Tests.ps1 b/images/win/scripts/Tests/Docker.Tests.ps1 index 697de6a7230c..1a87c924fbbd 100644 --- a/images/win/scripts/Tests/Docker.Tests.ps1 +++ b/images/win/scripts/Tests/Docker.Tests.ps1 @@ -6,6 +6,10 @@ Describe "Docker" { "$ToolName --version" | Should -ReturnZeroExitCode } + It "docker-wincred" { + "docker-credential-wincred version" | Should -ReturnZeroExitCode + } + It "docker service is up" { "docker images" | Should -ReturnZeroExitCode } From 2790cecf1f188b41fc79177c4c62d650aa362c7b Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Sun, 21 Nov 2021 14:47:13 +0300 Subject: [PATCH 0752/3485] [Ubuntu] Update maven to 3.8.4 (#4550) --- images/linux/toolsets/toolset-1804.json | 2 +- images/linux/toolsets/toolset-2004.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index 80f3d9e9457b..37b712bd1fdf 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -74,7 +74,7 @@ "versions": [ "8", "11", "12" ], - "maven": "3.8.3" + "maven": "3.8.4" }, "android": { "platform_min_version": "23", diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index bc5bf595ddc9..2200e65e51d1 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -75,7 +75,7 @@ "versions": [ "8", "11" ], - "maven": "3.8.3" + "maven": "3.8.4" }, "android": { "platform_min_version": "27", From 81d68d49b3e76eef3376e14a361e0c3778119a22 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Sun, 21 Nov 2021 19:32:23 +0300 Subject: [PATCH 0753/3485] [Ubuntu] install libpcre2-8-0 for PHP compat (#4551) --- images/linux/scripts/installers/php.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/images/linux/scripts/installers/php.sh b/images/linux/scripts/installers/php.sh index 511c369d4206..a83d0cb46cb4 100644 --- a/images/linux/scripts/installers/php.sh +++ b/images/linux/scripts/installers/php.sh @@ -13,6 +13,12 @@ source $HELPER_SCRIPTS/install.sh apt-add-repository ppa:ondrej/php -y apt-get update +# install specific version of libpcre2 otherwise latest ppa-hosted php fails +# https://github.com/oerdnj/deb.sury.org/issues/1682 +if isUbuntu20 ; then + apt-get install -y libpcre2-8-0 +fi + # Install PHP php_versions=$(get_toolset_value '.php.versions[]') From be2dc0315bec831ba9846d8bfa91c146836c02ea Mon Sep 17 00:00:00 2001 From: V-Zabayrachny <79155496+V-Zabayrachny@users.noreply.github.com> Date: Sun, 21 Nov 2021 23:11:18 +0300 Subject: [PATCH 0754/3485] [macOS] Add PHP to the toolset (#4544) --- images/macos/provision/core/php.sh | 3 ++- images/macos/tests/PHP.Tests.ps1 | 7 +++++-- images/macos/toolsets/toolset-10.15.json | 3 +++ images/macos/toolsets/toolset-11.json | 5 ++++- images/macos/toolsets/toolset-12.json | 3 +++ 5 files changed, 17 insertions(+), 4 deletions(-) diff --git a/images/macos/provision/core/php.sh b/images/macos/provision/core/php.sh index e269d42ddca7..bc68692b3727 100644 --- a/images/macos/provision/core/php.sh +++ b/images/macos/provision/core/php.sh @@ -2,7 +2,8 @@ source ~/utils/utils.sh echo Installing PHP -brew_smart_install "php" +phpVersionToolset=$(get_toolset_value '.php.version') +brew_smart_install "php@${phpVersionToolset}" echo Installing composer brew_smart_install "composer" diff --git a/images/macos/tests/PHP.Tests.ps1 b/images/macos/tests/PHP.Tests.ps1 index 937c87464e81..ac34a9b48f31 100644 --- a/images/macos/tests/PHP.Tests.ps1 +++ b/images/macos/tests/PHP.Tests.ps1 @@ -6,12 +6,15 @@ Describe "PHP" -Skip:($os.IsMonterey) { Get-WhichTool "php" | Should -Not -BeLike "/usr/bin/php*" } It "PHP version" { - "php --version" | Should -ReturnZeroExitCode + $phpVersionToolset = Get-ToolsetValue 'php.version' + $phpInstalledVersion = php --version | Out-String | Select-String "${phpVersionToolset}" + $phpInstalledVersion | Should -BeLike "PHP ${phpVersionToolset}*" } } + Context "Composer" { It "Composer" { "composer --version" | Should -ReturnZeroExitCode } } -} \ No newline at end of file +} diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index 6597a3fe6647..cef4348d0e11 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -341,6 +341,9 @@ "llvm": { "version": "13" }, + "php": { + "version": "8.0" + }, "mongodb": { "version": "5.0" }, diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index 35568ade8ce7..f0921898ce89 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -293,10 +293,13 @@ "llvm": { "version": "13" }, + "php": { + "version": "8.0" + }, "mongodb": { "version": "5.0" }, "postgresql": { "version": "14" } -} \ No newline at end of file +} diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index 83a6ee5f0fb5..a0bd7936c822 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -191,6 +191,9 @@ "16" ] }, + "php": { + "version": "8.0" + }, "mongodb": { "version": "5.0" }, From 04aeb7bfd42050e2ea66782b445c98552da2faf2 Mon Sep 17 00:00:00 2001 From: Ewout ter Hoeven <E.M.terHoeven@student.tudelft.nl> Date: Mon, 22 Nov 2021 10:36:16 +0100 Subject: [PATCH 0755/3485] CI: Run linter only on changes of JSON and MD files (#4527) --- .github/workflows/linter.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml index 2b47f4cd7a95..f5c8c6377910 100644 --- a/.github/workflows/linter.yml +++ b/.github/workflows/linter.yml @@ -5,6 +5,10 @@ name: Linter on: pull_request: branches: [ main ] + paths: + - '**.json' + - '**.md' + - '**.sh' jobs: build: @@ -18,12 +22,12 @@ jobs: fetch-depth: 0 - name: Lint Code Base - uses: github/super-linter@v3 + uses: github/super-linter/slim@v4 env: VALIDATE_ALL_CODEBASE: false GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} VALIDATE_JSON: true - VALIDATE_MD: true + VALIDATE_MARKDOWN: true DEFAULT_BRANCH: ${{ github.base_ref }} - name: Checking shebang lines in MacOS and Ubuntu releases. From 0365a15eb69e3d0a9a8fd251ad7cea07bb160ec1 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Mon, 22 Nov 2021 15:18:46 +0300 Subject: [PATCH 0756/3485] Anka disable beta seed (#4564) * Remove current beta seed program * format unenroll output --- images.CI/macos/anka/CreateCleanAnkaTemplate.ps1 | 4 ++++ images.CI/macos/anka/Service.Helpers.psm1 | 11 +++++++++++ 2 files changed, 15 insertions(+) diff --git a/images.CI/macos/anka/CreateCleanAnkaTemplate.ps1 b/images.CI/macos/anka/CreateCleanAnkaTemplate.ps1 index 28448e254d06..ff38c1b6fc3d 100644 --- a/images.CI/macos/anka/CreateCleanAnkaTemplate.ps1 +++ b/images.CI/macos/anka/CreateCleanAnkaTemplate.ps1 @@ -64,6 +64,10 @@ function Invoke-SoftwareUpdate { $ipAddress = Get-AnkaVMIPAddress -VMName $TemplateName + # Unenroll Seed + Write-Host "`t[*] Reseting the seed before requesting stable versions" + Remove-CurrentBetaSeed -HostName $ipAddress | Show-StringWithFormat + # Install Software Updates # Security updates may not be able to install(hang, freeze) when AutoLogon is turned off Write-Host "`t[*] Finding available software" diff --git a/images.CI/macos/anka/Service.Helpers.psm1 b/images.CI/macos/anka/Service.Helpers.psm1 index fce822d67059..2c5ba9bdd222 100644 --- a/images.CI/macos/anka/Service.Helpers.psm1 +++ b/images.CI/macos/anka/Service.Helpers.psm1 @@ -232,6 +232,17 @@ function Show-StringWithFormat { } } +function Remove-CurrentBetaSeed { + param( + [Parameter(Mandatory)] + [ValidateNotNullOrEmpty()] + [string] $HostName + ) + + $command = "sudo /System/Library/PrivateFrameworks/Seeding.framework/Versions/Current/Resources/seedutil unenroll" + Invoke-SSHPassCommand -HostName $HostName -Command $command | Out-String +} + function Test-AutoLogon { param( [Parameter(Mandatory)] From 79dfeeba4508a2e4fec60484e1da2aaa6507ab12 Mon Sep 17 00:00:00 2001 From: Ewout ter Hoeven <E.M.terHoeven@student.tudelft.nl> Date: Mon, 22 Nov 2021 13:21:03 +0100 Subject: [PATCH 0757/3485] [Windows] Add sbt to Windows 2022 image (#4526) * [Windows] Add sbt to Windows 2022 image * Update SoftwareReport.Generator.ps1 to include sbt on Win22 --- .../scripts/SoftwareReport/SoftwareReport.Generator.ps1 | 9 +++------ images/win/scripts/Tests/Tools.Tests.ps1 | 6 +++--- images/win/windows2022.json | 1 + 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index fa8f299bfc24..75fac3b2bf64 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -74,13 +74,10 @@ $markdown += New-MDHeader "Project Management" -Level 3 $projectManagementTools = @( (Get-AntVersion), (Get-GradleVersion), - (Get-MavenVersion) + (Get-MavenVersion), + (Get-SbtVersion) ) -if ((Test-IsWin16) -or (Test-IsWin19)) { - $projectManagementTools += @( - (Get-SbtVersion) - ) -} + $markdown += New-MDList -Style Unordered -Lines ($projectManagementTools | Sort-Object) $markdown += New-MDHeader "Tools" -Level 3 diff --git a/images/win/scripts/Tests/Tools.Tests.ps1 b/images/win/scripts/Tests/Tools.Tests.ps1 index 0309d6da9ceb..11cde9b9a60f 100644 --- a/images/win/scripts/Tests/Tools.Tests.ps1 +++ b/images/win/scripts/Tests/Tools.Tests.ps1 @@ -124,7 +124,7 @@ Describe "PowerShell Core" { } } -Describe "Sbt" -Skip:(Test-IsWin22) { +Describe "Sbt" { It "sbt" { "sbt --version" | Should -ReturnZeroExitCode } @@ -199,7 +199,7 @@ Describe "Pipx" { Describe "Kotlin" { $kotlinPackages = @("kapt", "kotlin", "kotlinc", "kotlin-dce-js", "kotlinc-js", "kotlinc-jvm") - It "<toolName> is available" -TestCases ($kotlinPackages | ForEach-Object { @{ toolName = $_ } }) { + It "<toolName> is available" -TestCases ($kotlinPackages | ForEach-Object { @{ toolName = $_ } }) { "$toolName -version" | Should -ReturnZeroExitCode } -} \ No newline at end of file +} diff --git a/images/win/windows2022.json b/images/win/windows2022.json index 90c1dbaf6c8d..948afff76656 100644 --- a/images/win/windows2022.json +++ b/images/win/windows2022.json @@ -203,6 +203,7 @@ "{{ template_dir }}/scripts/Installers/Install-GitHub-CLI.ps1", "{{ template_dir }}/scripts/Installers/Install-PHP.ps1", "{{ template_dir }}/scripts/Installers/Install-Rust.ps1", + "{{ template_dir }}/scripts/Installers/Install-Sbt.ps1", "{{ template_dir }}/scripts/Installers/Install-Chrome.ps1", "{{ template_dir }}/scripts/Installers/Install-Edge.ps1", "{{ template_dir }}/scripts/Installers/Install-Firefox.ps1", From 1fc7895bd9e469460c143cabef1e85a848b7a39c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 22 Nov 2021 17:31:27 +0000 Subject: [PATCH 0758/3485] Updating readme file for win22 version 20211115.1 (#4512) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2022-Readme.md | 45 +++++++++++++++++--------------- 1 file changed, 24 insertions(+), 21 deletions(-) diff --git a/images/win/Windows2022-Readme.md b/images/win/Windows2022-Readme.md index 35574ecfdd70..faeaab2c0f37 100644 --- a/images/win/Windows2022-Readme.md +++ b/images/win/Windows2022-Readme.md @@ -1,15 +1,14 @@ | Announcements | |-| +| [Windows Server 2022 with Visual Studio 2022 is generally available starting from November, 15](https://github.com/actions/virtual-environments/issues/4488) | | [[all OSs] Default Nodejs version will be set to 16 on November, 29](https://github.com/actions/virtual-environments/issues/4446) | | [[all OSs] Selenium server version will be upgraded from 3 to 4 on November, 15](https://github.com/actions/virtual-environments/issues/4376) | | [[All OSs] Node.js version 10 will be removed from the images on November, 15](https://github.com/actions/virtual-environments/issues/4356) | | [Windows-2016 environment will be removed on March 15, 2022](https://github.com/actions/virtual-environments/issues/4312) | -| [[All OSs] Go versions less than 1.15 will be removed on November, 8](https://github.com/actions/virtual-environments/issues/4311) | -| [(Public Beta) Windows Server 2022 with Visual Studio 2022 is now available](https://github.com/actions/virtual-environments/issues/3949) | *** # Microsoft Windows Server 2022 Datacenter - OS Version: 10.0.20348 Build 350 -- Image Version: 20211109.2 +- Image Version: 20211115.1 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -30,12 +29,13 @@ - Chocolatey 0.11.3 - Composer 2.1.12 - Helm 3.7.1 +- Miniconda 4.10.3 (pre-installed on the image but not added to PATH) - NPM 6.14.15 - NuGet 6.0.0.280 - pip 21.3.1 (python 3.9) - Pipx 0.16.4 - RubyGems 3.2.22 -- Vcpkg (build from master \<70033db>) +- Vcpkg (build from master \<c973b499f>) - Yarn 1.22.17 #### Environment variables @@ -71,20 +71,21 @@ - Newman 5.3.0 - NSIS v3.06.1 - OpenSSL 1.1.1 -- Packer 1.7.6 -- Pulumi v3.17.0 +- Packer 1.7.8 +- Pulumi v3.17.1 - R 4.1.2 - Stack 2.7.3 - Subversion (SVN) 1.14.1 - Swig 4.0.2 - VSWhere 2.8.4 - WinAppDriver 1.2.2009.02003 +- WiX Toolset v3.11.2.4516 - yamllint 1.26.3 - zstd 1.5.0 ### CLI Tools - Alibaba Cloud CLI 3.0.99 -- AWS CLI 2.3.4 +- AWS CLI 2.3.6 - AWS SAM CLI 1.35.0 - AWS Session Manager CLI 1.2.279.0 - Azure CLI 2.30.0 @@ -101,7 +102,7 @@ #### Packages - bindgen 0.59.1 - cargo-audit 0.15.2 -- cargo-outdated v0.9.17 +- cargo-outdated v0.10.0 - cbindgen 0.20.0 - Clippy 0.1.56 - Rustfmt 1.4.37 @@ -109,20 +110,20 @@ ### Browsers and webdrivers - Google Chrome 95.0.4638.69 - Chrome Driver 95.0.4638.69 -- Microsoft Edge 95.0.1020.44 -- Microsoft Edge Driver 95.0.1020.44 +- Microsoft Edge 95.0.1020.53 +- Microsoft Edge Driver 95.0.1020.53 - Mozilla Firefox 94.0.1 - Gecko Driver 0.30.0 - IE Driver 3.150.1.1 -- Selenium server 3.141.59 +- Selenium server 4.0.0 #### Environment variables -| Name | Value | -| ----------------- | ------------------------------------------ | -| CHROMEWEBDRIVER | C:\SeleniumWebDrivers\ChromeDriver | -| EDGEWEBDRIVER | C:\SeleniumWebDrivers\EdgeDriver | -| GECKOWEBDRIVER | C:\SeleniumWebDrivers\GeckoDriver | -| SELENIUM_JAR_PATH | C:\selenium\selenium-server-standalone.jar | +| Name | Value | +| ----------------- | ---------------------------------- | +| CHROMEWEBDRIVER | C:\SeleniumWebDrivers\ChromeDriver | +| EDGEWEBDRIVER | C:\SeleniumWebDrivers\EdgeDriver | +| GECKOWEBDRIVER | C:\SeleniumWebDrivers\GeckoDriver | +| SELENIUM_JAR_PATH | C:\selenium\selenium-server.jar | ### Java | Version | Vendor | Environment Variable | @@ -158,7 +159,6 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Node | Version | Architecture | | ------- | ------------ | -| 10.24.1 | x64 | | 12.22.7 | x64 | | 14.18.1 | x64 | | 16.13.0 | x64 | @@ -194,7 +194,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Property | Value | | -------------------- | ------------------------------------------------------------------------------------------------------------------------------------ | | ServiceName | postgresql-x64-14 | -| Version | 14.0 | +| Version | 14.1 | | ServiceStatus | Stopped | | ServiceStartType | Disabled | | EnvironmentVariables | PGBIN=C:\Program Files\PostgreSQL\14\bin <br> PGDATA=C:\Program Files\PostgreSQL\14\data <br> PGROOT=C:\Program Files\PostgreSQL\14 | @@ -206,14 +206,14 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### MongoDB | Version | ServiceName | ServiceStatus | ServiceStartType | | ------- | ----------- | ------------- | ---------------- | -| 5.1.0.0 | MongoDB | Running | Automatic | +| 5.0.3.0 | MongoDB | Running | Automatic | ### Database tools - Azure CosmosDb Emulator 2.14.4.0 - DacFx 15.0.5282.3 -- MySQL 8.0.26.0 +- MySQL 8.0.27.0 - SQLPS 1.0 @@ -269,6 +269,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.Net.ComponentGroup.4.8.DeveloperTools | 17.0.31804.368 | | Microsoft.Net.ComponentGroup.DevelopmentPrerequisites | 17.0.31804.368 | | Microsoft.Net.ComponentGroup.TargetingPacks.Common | 17.0.31804.368 | +| microsoft.net.runtime.mono.tooling | 6.0.21.52210 | +| microsoft.net.sdk.emscripten | 6.0.5.2003 | | Microsoft.NetCore.Component.DevelopmentTools | 17.0.31804.368 | | Microsoft.NetCore.Component.Runtime.6.0 | 17.0.31902.203 | | Microsoft.NetCore.Component.SDK | 17.0.31902.203 | @@ -410,6 +412,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Workload.Python | 17.0.31804.368 | | Microsoft.VisualStudio.Workload.Universal | 17.0.31804.368 | | Microsoft.VisualStudio.Workload.VisualStudioExtension | 17.0.31804.368 | +| wasm.tools | 6.0.21.52210 | #### Microsoft Visual C++: From 741076d322e85437bcb7aca6941a689395042eae Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 23 Nov 2021 06:39:18 +0000 Subject: [PATCH 0759/3485] Updating readme file for win16 version 20211115.1 (#4520) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2016-Readme.md | 50 +++++++++++++++----------------- 1 file changed, 23 insertions(+), 27 deletions(-) diff --git a/images/win/Windows2016-Readme.md b/images/win/Windows2016-Readme.md index e3a461142a91..6ec950375ecb 100644 --- a/images/win/Windows2016-Readme.md +++ b/images/win/Windows2016-Readme.md @@ -1,15 +1,14 @@ | Announcements | |-| +| [Windows Server 2022 with Visual Studio 2022 is generally available starting from November, 15](https://github.com/actions/virtual-environments/issues/4488) | | [[all OSs] Default Nodejs version will be set to 16 on November, 29](https://github.com/actions/virtual-environments/issues/4446) | | [[all OSs] Selenium server version will be upgraded from 3 to 4 on November, 15](https://github.com/actions/virtual-environments/issues/4376) | | [[All OSs] Node.js version 10 will be removed from the images on November, 15](https://github.com/actions/virtual-environments/issues/4356) | | [Windows-2016 environment will be removed on March 15, 2022](https://github.com/actions/virtual-environments/issues/4312) | -| [[All OSs] Go versions less than 1.15 will be removed on November, 8](https://github.com/actions/virtual-environments/issues/4311) | -| [(Public Beta) Windows Server 2022 with Visual Studio 2022 is now available](https://github.com/actions/virtual-environments/issues/3949) | *** # Microsoft Windows Server 2016 Datacenter - OS Version: 10.0.14393 Build 4770 -- Image Version: 20211109.0 +- Image Version: 20211115.1 ## Installed Software ### Language and Runtime @@ -34,7 +33,7 @@ - pip 21.3.1 (python 3.7) - Pipx 0.16.4 - RubyGems 2.7.6.3 -- Vcpkg (build from master \<6cfa934>) +- Vcpkg (build from master \<c973b499f>) - Yarn 1.22.17 #### Environment variables @@ -74,20 +73,21 @@ - Newman 5.3.0 - NSIS v3.06.1 - OpenSSL 1.1.1 -- Packer 1.7.6 -- Pulumi v3.17.0 +- Packer 1.7.8 +- Pulumi v3.17.1 - R 4.1.2 - Stack 2.7.3 - Subversion (SVN) 1.14.1 - Swig 4.0.2 - VSWhere 2.8.4 - WinAppDriver 1.2.2009.02003 +- WiX Toolset v3.11.2.4516 - yamllint 1.26.3 - zstd 1.5.0 ### CLI Tools - Alibaba Cloud CLI 3.0.99 -- AWS CLI 2.3.4 +- AWS CLI 2.3.6 - AWS SAM CLI 1.35.0 - AWS Session Manager CLI 1.2.279.0 - Azure CLI 2.30.0 @@ -105,7 +105,7 @@ #### Packages - bindgen 0.59.1 - cargo-audit 0.15.2 -- cargo-outdated v0.9.17 +- cargo-outdated v0.10.0 - cbindgen 0.20.0 - Clippy 0.1.56 - Rustfmt 1.4.37 @@ -113,20 +113,20 @@ ### Browsers and webdrivers - Google Chrome 95.0.4638.69 - Chrome Driver 95.0.4638.69 -- Microsoft Edge 95.0.1020.44 -- Microsoft Edge Driver 95.0.1020.44 +- Microsoft Edge 95.0.1020.53 +- Microsoft Edge Driver 95.0.1020.53 - Mozilla Firefox 94.0.1 - Gecko Driver 0.30.0 - IE Driver 3.150.1.1 -- Selenium server 3.141.59 +- Selenium server 4.0.0 #### Environment variables -| Name | Value | -| ----------------- | ------------------------------------------ | -| CHROMEWEBDRIVER | C:\SeleniumWebDrivers\ChromeDriver | -| EDGEWEBDRIVER | C:\SeleniumWebDrivers\EdgeDriver | -| GECKOWEBDRIVER | C:\SeleniumWebDrivers\GeckoDriver | -| SELENIUM_JAR_PATH | C:\selenium\selenium-server-standalone.jar | +| Name | Value | +| ----------------- | ---------------------------------- | +| CHROMEWEBDRIVER | C:\SeleniumWebDrivers\ChromeDriver | +| EDGEWEBDRIVER | C:\SeleniumWebDrivers\EdgeDriver | +| GECKOWEBDRIVER | C:\SeleniumWebDrivers\GeckoDriver | +| SELENIUM_JAR_PATH | C:\selenium\selenium-server.jar | ### Java | Version | Vendor | Environment Variable | @@ -162,7 +162,6 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Node | Version | Architecture | | ------- | ------------ | -| 10.24.1 | x64 | | 12.22.7 | x64 | | 14.18.1 | x64 | | 16.13.0 | x64 | @@ -205,7 +204,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Property | Value | | -------------------- | ------------------------------------------------------------------------------------------------------------------------------------ | | ServiceName | postgresql-x64-14 | -| Version | 14.0 | +| Version | 14.1 | | ServiceStatus | Stopped | | ServiceStartType | Disabled | | EnvironmentVariables | PGBIN=C:\Program Files\PostgreSQL\14\bin <br> PGDATA=C:\Program Files\PostgreSQL\14\data <br> PGROOT=C:\Program Files\PostgreSQL\14 | @@ -217,14 +216,14 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### MongoDB | Version | ServiceName | ServiceStatus | ServiceStartType | | ------- | ----------- | ------------- | ---------------- | -| 5.1.0.0 | MongoDB | Running | Automatic | +| 5.0.3.0 | MongoDB | Running | Automatic | ### Database tools - Azure CosmosDb Emulator 2.14.4.0 - DacFx 15.0.5282.3 -- MySQL 5.7.35.0 +- MySQL 5.7.36.0 - SQLPS 1.0 @@ -273,7 +272,6 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Component.UnityEngine.x64 | 15.9.28307.616 | | Component.Unreal | 15.8.27729.1 | | Component.Unreal.Android | 15.9.28307.341 | -| Component.WixToolset.VisualStudioExtension.Dev15 | 0.9.21.62588 | | Component.Xamarin | 15.9.28307.1177 | | Component.Xamarin.Profiler | 15.0.27005.2 | | Component.Xamarin.RemotedSimulator | 15.6.27323.2 | @@ -482,8 +480,6 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | SSDT SQL Server Integration Services Projects | 2.6.3 | | Windows Driver Kit | 10.0.17740.0 | | Windows Driver Kit Visual Studio Extension | 10.1.17763.1 | -| WIX Toolset | 3.11.4516 | -| WIX Toolset Studio 2017 Extension | 0.9.21.62588 | #### Microsoft Visual C++: @@ -582,9 +578,9 @@ All other versions are saved but not installed. ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2016 | sha256:8475573b3deea860097590fe71c1a5333c937f5aadb7a6b07d760fe9017e28b1 | 2021-10-12 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2016 | sha256:97bbc6dd603e44f5a34e3f309b493c77b964b0e07d9e3dd7333f063ccaf33523 | 2021-10-12 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2016 | sha256:bff7dee44dc39f9e997389be6de0c9fcde608879eb52070839ac03f6058f1385 | 2021-10-12 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2016 | sha256:04596195c24adb48a59ecfdfaa3fcefff5563e4cdb6d22cadfb588d4525a5a3f | 2021-11-09 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2016 | sha256:b77c157fca59b9a93b6ed1bf34f7c224497184546d5e63953fb08d9769f73123 | 2021-11-09 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2016 | sha256:9c649d68d85741479778a3e7006ac002fe47ded9fccd01be5b03ced5e0d23e27 | 2021-11-09 | | mcr.microsoft.com/windows/nanoserver:10.0.14393.953 | sha256:fc60bd5ae0e61b334ce1cf1bcbf20c10c36b4c5482a01da319c9c989f9e6e268 | 2017-03-08 | | mcr.microsoft.com/windows/servercore:ltsc2016 | sha256:0a54ee92e51c03f30b6902df63fb88be973c8d04a40c456058ab6acbdd92d103 | 2021-11-03 | From 0c030e3e071a3820832cebc597ef1c4bc9363267 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Tue, 23 Nov 2021 12:10:09 +0300 Subject: [PATCH 0760/3485] Revert "[Ubuntu] install libpcre1-8-0 for PHP compat (#4551)" (#4565) This reverts commit 81d68d49b3e76eef3376e14a361e0c3778119a22. --- images/linux/scripts/installers/php.sh | 6 ------ 1 file changed, 6 deletions(-) diff --git a/images/linux/scripts/installers/php.sh b/images/linux/scripts/installers/php.sh index a83d0cb46cb4..511c369d4206 100644 --- a/images/linux/scripts/installers/php.sh +++ b/images/linux/scripts/installers/php.sh @@ -13,12 +13,6 @@ source $HELPER_SCRIPTS/install.sh apt-add-repository ppa:ondrej/php -y apt-get update -# install specific version of libpcre2 otherwise latest ppa-hosted php fails -# https://github.com/oerdnj/deb.sury.org/issues/1682 -if isUbuntu20 ; then - apt-get install -y libpcre2-8-0 -fi - # Install PHP php_versions=$(get_toolset_value '.php.versions[]') From 870d8506f2baed1018986d6b34ddaf399476585f Mon Sep 17 00:00:00 2001 From: Nikolay Frolov <90333448+nikolai-frolov@users.noreply.github.com> Date: Tue, 23 Nov 2021 21:01:37 +0300 Subject: [PATCH 0761/3485] [Windows] Add Service Fabric SDK to Software Report (#4563) --- .../win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 | 3 ++- images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 | 5 +++++ images/win/scripts/Tests/Tools.Tests.ps1 | 4 ++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index 75fac3b2bf64..e0c34b245745 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -120,7 +120,8 @@ $toolsList = @( ) if ((Test-IsWin16) -or (Test-IsWin19)) { $toolsList += @( - (Get-GoogleCloudSDKVersion) + (Get-GoogleCloudSDKVersion), + (Get-ServiceFabricSDKVersion) ) } $markdown += New-MDList -Style Unordered -Lines ($toolsList | Sort-Object) diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 index 3534691e1817..515acb322abb 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 @@ -249,6 +249,11 @@ function Get-GoogleCloudSDKVersion { (gcloud --version) -match "Google Cloud SDK" } +function Get-ServiceFabricSDKVersion { + $serviceFabricSDKVersion = Get-ItemPropertyValue 'HKLM:\SOFTWARE\Microsoft\Service Fabric\' -Name FabricVersion + return "Service Fabric SDK $serviceFabricSDKVersion" +} + function Get-NewmanVersion { return "Newman $(newman --version)" } diff --git a/images/win/scripts/Tests/Tools.Tests.ps1 b/images/win/scripts/Tests/Tools.Tests.ps1 index 11cde9b9a60f..dfbd0c078f01 100644 --- a/images/win/scripts/Tests/Tools.Tests.ps1 +++ b/images/win/scripts/Tests/Tools.Tests.ps1 @@ -134,6 +134,10 @@ Describe "ServiceFabricSDK" -Skip:(Test-IsWin22) { It "PowerShell Module" { Get-Module -Name ServiceFabric -ListAvailable | Should -Not -BeNullOrEmpty } + + It "ServiceFabricSDK version" { + Get-ItemPropertyValue 'HKLM:\SOFTWARE\Microsoft\Service Fabric\' -Name FabricVersion | Should -Not -BeNullOrEmpty + } } Describe "Stack" { From 2c9f161957f8c57253dd248661c8681a7c28b200 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Wed, 24 Nov 2021 13:53:28 +0300 Subject: [PATCH 0762/3485] Remove Choco.ps1 post-generation script (#4576) --- images/win/post-generation/Choco.ps1 | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 images/win/post-generation/Choco.ps1 diff --git a/images/win/post-generation/Choco.ps1 b/images/win/post-generation/Choco.ps1 deleted file mode 100644 index 0c7566efdecc..000000000000 --- a/images/win/post-generation/Choco.ps1 +++ /dev/null @@ -1,5 +0,0 @@ -# Step to avoid initial delay for choco scripts. -# On calling the first choco command -# Chocolatey spends 2 minutes cleaning up and removing unneeded packages in the environment. -$ChocoVersion = choco --version -choco upgrade chocolatey --version=$ChocoVersion From aaebcb3658faee4a958c4eec1fa0cb2ed9189087 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 24 Nov 2021 17:36:18 +0000 Subject: [PATCH 0763/3485] Updating readme file for macOS-11 version 20211120.1 (#4558) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-11-Readme.md | 42 ++++++++++++++++----------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/images/macos/macos-11-Readme.md b/images/macos/macos-11-Readme.md index 5b4fe9e7061f..ba5175fe0508 100644 --- a/images/macos/macos-11-Readme.md +++ b/images/macos/macos-11-Readme.md @@ -9,7 +9,7 @@ # macOS 11.6 info - System Version: macOS 11.6.1 (20G224) - Kernel Version: Darwin 20.6.0 -- Image Version: 20211114.1 +- Image Version: 20211120.1 ## Installed Software ### Language and Runtime @@ -19,19 +19,19 @@ - Clang/LLVM 13.0.0 is default - gcc-9 (Homebrew GCC 9.4.0) 9.4.0 - available by `gcc-9` alias - gcc-10 (Homebrew GCC 10.3.0) 10.3.0 - available by `gcc-10` alias -- gcc-11 (Homebrew GCC 11.2.0_1) 11.2.0 - available by `gcc-11` alias +- gcc-11 (Homebrew GCC 11.2.0_2) 11.2.0 - available by `gcc-11` alias - GNU Fortran (Homebrew GCC 9.4.0) 9.4.0 - available by `gfortran-9` alias - GNU Fortran (Homebrew GCC 10.3.0) 10.3.0 - available by `gfortran-10` alias -- GNU Fortran (Homebrew GCC 11.2.0_1) 11.2.0 - available by `gfortran-11` alias +- GNU Fortran (Homebrew GCC 11.2.0_2) 11.2.0 - available by `gfortran-11` alias - Go 1.15.15 -- julia 1.6.3 -- Kotlin 1.5.31-release-548 +- julia 1.6.4 +- Kotlin 1.6.0-release-798 - MSBuild 16.9.0.22901 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) - Node.js v14.18.1 - NVM 0.39.0 - NVM - Cached node versions: v12.22.7 v14.18.1 v16.13.0 - Perl 5.34.0 -- PHP 8.0.12 +- PHP 8.0.13 - Python 2.7.18 - Python 3.9.8 - Ruby 2.7.4p191 @@ -41,7 +41,7 @@ - Carthage 0.38.0 - CocoaPods 1.11.2 - Composer 2.1.12 -- Homebrew 3.3.3 +- Homebrew 3.3.4 - Miniconda 4.10.3 - NPM 6.14.15 - NuGet 5.9.0.7134 @@ -49,7 +49,7 @@ - Pip 21.3.1 (python 3.9) - Pipx 0.16.4 - RubyGems 3.2.31 -- Vcpkg 2021 (build from master \<c973b499f>) +- Vcpkg 2021 (build from master \<709e9ec32>) - Yarn 1.22.15 #### Environment variables @@ -60,7 +60,7 @@ ### Project Management - Apache Ant(TM) 1.10.12 -- Apache Maven 3.8.3 +- Apache Maven 3.8.4 - Gradle 7.3 - Sbt 1.5.5 @@ -73,7 +73,7 @@ - bsdtar 3.3.2 - available by 'tar' alias - Curl 7.80.0 - Git LFS: 3.0.2 -- Git: 2.33.1 +- Git: 2.34.0 - GitHub CLI: 2.2.0 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.2 @@ -97,14 +97,14 @@ ### Tools - Aliyun CLI 3.0.99 - App Center CLI 2.10.4 -- AWS CLI 2.3.6 +- AWS CLI 2.4.0 - AWS SAM CLI 1.35.0 - AWS Session Manager CLI 1.2.279.0 - Azure CLI 2.30.0 - Bicep CLI 0.4.1008 - Cabal 3.6.2.0 -- Cmake 3.21.4 -- Fastlane 2.197.0 +- Cmake 3.22.0 +- Fastlane 2.198.1 - GHC 9.2.1 - GHCup 0.1.17.4 - Jazzy 0.14.1 @@ -120,8 +120,8 @@ ### Browsers - Safari 15.1 (16612.2.9.1.30) - SafariDriver 15.1 (16612.2.9.1.30) -- Google Chrome 95.0.4638.69 -- ChromeDriver 95.0.4638.69 +- Google Chrome 96.0.4664.55 +- ChromeDriver 96.0.4664.45 - Microsoft Edge 95.0.1020.53 - MSEdgeDriver 95.0.1020.53 - Mozilla Firefox 94.0.1 @@ -131,7 +131,7 @@ #### Environment variables | Name | Value | | --------------- | --------------------------------------------- | -| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/95.0.4638.69 | +| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/96.0.4664.45 | | EDGEWEBDRIVER | /usr/local/share/edge_driver | | GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | @@ -153,7 +153,7 @@ #### Python - 3.7.12 - 3.8.12 -- 3.9.8 +- 3.9.9 - 3.10.0 #### PyPy @@ -180,8 +180,8 @@ #### Packages - Bindgen 0.59.1 -- Cargo-audit 0.15.2 -- Cargo-outdated v0.10.0 +- Cargo-audit 0.16.0 +- Cargo-outdated v0.10.2 - Cbindgen 0.20.0 - Clippy 0.1.56 - Rustfmt 1.4.37-stable @@ -205,7 +205,7 @@ ### Xamarin #### Visual Studio for Mac -- 8.10.13.11 +- 8.10.14.17 #### Xamarin bundles | symlink | Xamarin.Mono | Xamarin.iOS | Xamarin.Mac | Xamarin.Android | @@ -229,7 +229,7 @@ ### Xcode | Version | Build | Path | | -------------- | -------- | ------------------------------ | -| 13.2 (beta) | 13C5066c | /Applications/Xcode_13.2.app | +| 13.2 (beta) | 13C5081f | /Applications/Xcode_13.2.app | | 13.1 (default) | 13A1030d | /Applications/Xcode_13.1.app | | 13.0 | 13A233 | /Applications/Xcode_13.0.app | | 12.5.1 | 12E507 | /Applications/Xcode_12.5.1.app | From 9c07c3959a85161eb01e7e36cd6d15729928b37a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 24 Nov 2021 17:36:51 +0000 Subject: [PATCH 0764/3485] Updating readme file for macOS-10.15 version 20211120.1 (#4557) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-10.15-Readme.md | 40 +++++++++++++++--------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/images/macos/macos-10.15-Readme.md b/images/macos/macos-10.15-Readme.md index 781dfa35b663..7a58e2fbe1ee 100644 --- a/images/macos/macos-10.15-Readme.md +++ b/images/macos/macos-10.15-Readme.md @@ -9,7 +9,7 @@ # macOS 10.15 info - System Version: macOS 10.15.7 (19H1519) - Kernel Version: Darwin 19.6.0 -- Image Version: 20211114.1 +- Image Version: 20211120.1 ## Installed Software ### Language and Runtime @@ -19,19 +19,19 @@ - Clang/LLVM 13.0.0 is available on `'$(brew --prefix llvm)/bin/clang'` - gcc-9 (Homebrew GCC 9.4.0) 9.4.0 - available by `gcc-9` alias - gcc-10 (Homebrew GCC 10.3.0) 10.3.0 - available by `gcc-10` alias -- gcc-11 (Homebrew GCC 11.2.0_1) 11.2.0 - available by `gcc-11` alias +- gcc-11 (Homebrew GCC 11.2.0_2) 11.2.0 - available by `gcc-11` alias - GNU Fortran (Homebrew GCC 9.4.0) 9.4.0 - available by `gfortran-9` alias - GNU Fortran (Homebrew GCC 10.3.0) 10.3.0 - available by `gfortran-10` alias -- GNU Fortran (Homebrew GCC 11.2.0_1) 11.2.0 - available by `gfortran-11` alias +- GNU Fortran (Homebrew GCC 11.2.0_2) 11.2.0 - available by `gfortran-11` alias - Go 1.15.15 -- julia 1.6.3 -- Kotlin 1.5.31-release-548 +- julia 1.6.4 +- Kotlin 1.6.0-release-798 - MSBuild 16.9.0.22901 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) - Node.js v14.18.1 - NVM 0.39.0 - NVM - Cached node versions: v12.22.7 v14.18.1 v16.13.0 - Perl 5.34.0 -- PHP 8.0.12 +- PHP 8.0.13 - Python 2.7.18 - Python 3.9.8 - R 4.1.2 @@ -42,7 +42,7 @@ - Carthage 0.38.0 - CocoaPods 1.11.2 - Composer 2.1.12 -- Homebrew 3.3.3 +- Homebrew 3.3.4 - Miniconda 4.10.3 - NPM 6.14.15 - NuGet 5.9.0.7134 @@ -50,7 +50,7 @@ - Pip 21.3.1 (python 3.9) - Pipx 0.16.4 - RubyGems 3.2.31 -- Vcpkg 2021 (build from master \<c973b499f>) +- Vcpkg 2021 (build from master \<709e9ec32>) - Yarn 1.22.15 #### Environment variables @@ -61,7 +61,7 @@ ### Project Management - Apache Ant(TM) 1.10.12 -- Apache Maven 3.8.3 +- Apache Maven 3.8.4 - Gradle 7.3 - Sbt 1.5.5 @@ -74,7 +74,7 @@ - bsdtar 3.3.2 - available by 'tar' alias - Curl 7.80.0 - Git LFS: 3.0.2 -- Git: 2.33.1 +- Git: 2.34.0 - GitHub CLI: 2.2.0 - GNU parallel 20211022 - GNU Tar 1.34 - available by 'gtar' alias @@ -101,14 +101,14 @@ ### Tools - Aliyun CLI 3.0.99 - App Center CLI 2.10.4 -- AWS CLI 2.3.6 +- AWS CLI 2.4.0 - AWS SAM CLI 1.35.0 - AWS Session Manager CLI 1.2.279.0 - Azure CLI 2.30.0 - Bicep CLI 0.4.1008 - Cabal 3.6.2.0 -- Cmake 3.21.4 -- Fastlane 2.197.0 +- Cmake 3.22.0 +- Fastlane 2.198.1 - GHC 9.2.1 - GHCup 0.1.17.4 - Jazzy 0.14.1 @@ -124,8 +124,8 @@ ### Browsers - Safari 15.1 (15612.2.9.1.30) - SafariDriver 15.1 (15612.2.9.1.30) -- Google Chrome 95.0.4638.69 -- ChromeDriver 95.0.4638.69 +- Google Chrome 96.0.4664.55 +- ChromeDriver 96.0.4664.45 - Microsoft Edge 95.0.1020.53 - MSEdgeDriver 95.0.1020.53 - Mozilla Firefox 94.0.1 @@ -135,7 +135,7 @@ #### Environment variables | Name | Value | | --------------- | --------------------------------------------- | -| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/95.0.4638.69 | +| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/96.0.4664.45 | | EDGEWEBDRIVER | /usr/local/share/edge_driver | | GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | @@ -163,7 +163,7 @@ - 3.6.15 - 3.7.12 - 3.8.12 -- 3.9.8 +- 3.9.9 - 3.10.0 #### PyPy @@ -191,8 +191,8 @@ #### Packages - Bindgen 0.59.1 -- Cargo-audit 0.15.2 -- Cargo-outdated v0.10.0 +- Cargo-audit 0.16.0 +- Cargo-outdated v0.10.2 - Cbindgen 0.20.0 - Clippy 0.1.56 - Rustfmt 1.4.37-stable @@ -216,7 +216,7 @@ ### Xamarin #### Visual Studio for Mac -- 8.10.13.11 +- 8.10.14.17 #### Xamarin bundles | symlink | Xamarin.Mono | Xamarin.iOS | Xamarin.Mac | Xamarin.Android | From a4ba8d27585fda6f7a470371b9c7a66a341be2bc Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Wed, 24 Nov 2021 22:42:44 +0300 Subject: [PATCH 0765/3485] [Ubuntu] set default nodeJS version to 16 (#4561) --- images/linux/toolsets/toolset-1804.json | 2 +- images/linux/toolsets/toolset-2004.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index 37b712bd1fdf..d57fa56c1768 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -280,7 +280,7 @@ }, "rubygems": [], "node": { - "default": "14" + "default": "16" }, "node_modules": [ { diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index 2200e65e51d1..5b7759d2348a 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -281,7 +281,7 @@ "binary_name": "selenium-server" }, "node": { - "default": "14" + "default": "16" }, "node_modules": [ { From f3f76a29b0cd8a6d78824f4a7d64a924150b7da1 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Wed, 24 Nov 2021 22:42:52 +0300 Subject: [PATCH 0766/3485] [Windows] set default nodeJS version to 16 (#4560) --- images/win/toolsets/toolset-2016.json | 2 +- images/win/toolsets/toolset-2019.json | 2 +- images/win/toolsets/toolset-2022.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/images/win/toolsets/toolset-2016.json b/images/win/toolsets/toolset-2016.json index a0d119a32add..05943d9d4191 100644 --- a/images/win/toolsets/toolset-2016.json +++ b/images/win/toolsets/toolset-2016.json @@ -419,7 +419,7 @@ ] }, "node": { - "default": "14" + "default": "16" }, "Mysql": { "version": "5.7" diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index 3fbafade0129..3334fc0c7369 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -451,7 +451,7 @@ ] }, "node": { - "default": "14" + "default": "16" }, "Mysql": { "version": "5.7" diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index a05ec3128149..18add708bf55 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -303,7 +303,7 @@ ] }, "node": { - "default": "14" + "default": "16" }, "Mysql": { "version": "8.0" From 4553146bc77d2407e687d63844bb2f153c93b576 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Wed, 24 Nov 2021 22:43:00 +0300 Subject: [PATCH 0767/3485] [macOS] set default nodeJS version to 16 (#4559) --- images/macos/tests/Node.Tests.ps1 | 9 --------- images/macos/toolsets/toolset-10.15.json | 2 +- images/macos/toolsets/toolset-11.json | 2 +- images/macos/toolsets/toolset-12.json | 2 +- 4 files changed, 3 insertions(+), 12 deletions(-) diff --git a/images/macos/tests/Node.Tests.ps1 b/images/macos/tests/Node.Tests.ps1 index 5f9e873410a4..cb2c442003dc 100644 --- a/images/macos/tests/Node.Tests.ps1 +++ b/images/macos/tests/Node.Tests.ps1 @@ -4,11 +4,6 @@ Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1" -DisableNameChecking $os = Get-OSVersion Describe "Node.js" { - BeforeAll { - $os = Get-OSVersion - $expectedNodeVersion = if ($os.IsHigherThanMojave) { "v14.*" } else { "v8.*" } - } - It "Node.js is installed" { "node --version" | Should -ReturnZeroExitCode } @@ -17,10 +12,6 @@ Describe "Node.js" { node --version | Should -BeLike "v$(Get-ToolsetValue 'node.default')*" } - It "Node.js $expectedNodeVersion is default" { - (Get-CommandResult "node --version").Output | Should -BeLike $expectedNodeVersion - } - It "NPM is installed" { "npm --version" | Should -ReturnZeroExitCode } diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index cef4348d0e11..9532170f044c 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -331,7 +331,7 @@ "default": "1.15" }, "node": { - "default": "14", + "default": "16", "nvm_versions": [ "12", "14", diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index f0921898ce89..a89bc721d148 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -283,7 +283,7 @@ "default": "1.15" }, "node": { - "default": "14", + "default": "16", "nvm_versions": [ "12", "14", diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index a0bd7936c822..897456c974bf 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -184,7 +184,7 @@ "default": "1.17" }, "node": { - "default": "14", + "default": "16", "nvm_versions": [ "12", "14", From 51716d79fa16290dbadb201fe4a667cbb386818c Mon Sep 17 00:00:00 2001 From: V-Zabayrachny <79155496+V-Zabayrachny@users.noreply.github.com> Date: Thu, 25 Nov 2021 10:20:15 +0300 Subject: [PATCH 0768/3485] [macOS] Fix markup in the software report (#4579) --- images/macos/software-report/SoftwareReport.Generator.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1 index 3b892f309551..f69292947786 100644 --- a/images/macos/software-report/SoftwareReport.Generator.ps1 +++ b/images/macos/software-report/SoftwareReport.Generator.ps1 @@ -171,7 +171,6 @@ if ($os.IsLessThanMonterey) { } $markdown += New-MDList -Style Unordered -Lines ($utilitiesList | Sort-Object) -$markdown += New-MDNewLine # Tools $markdown += New-MDHeader "Tools" -Level 3 @@ -231,6 +230,7 @@ $markdown += New-MDNewLine # Toolcache $markdown += Build-ToolcacheSection +$markdown += New-MDNewLine $markdown += New-MDHeader "Rust Tools" -Level 3 $markdown += New-MDList -Style Unordered -Lines (@( From 7a9ecc28775b3d7a923df59a2420aa64f3f6be92 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 25 Nov 2021 08:10:14 +0000 Subject: [PATCH 0769/3485] Updating readme file for ubuntu18 version 20211122.1 (#4555) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu1804-README.md | 80 +++++++++++++++---------------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/images/linux/Ubuntu1804-README.md b/images/linux/Ubuntu1804-README.md index 48f844f755a9..3a018f2f5aef 100644 --- a/images/linux/Ubuntu1804-README.md +++ b/images/linux/Ubuntu1804-README.md @@ -7,19 +7,19 @@ *** # Ubuntu 18.04.6 LTS - Linux kernel version: 5.4.0-1063-azure -- Image Version: 20211114.1 +- Image Version: 20211122.1 ## Installed Software ### Language and Runtime - Bash 4.4.20(1)-release - Clang 9.0.0 - Clang-format 9.0.0 -- Erlang 24.1.3 (Eshell 12.1.3) +- Erlang 24.1.5 (Eshell 12.1.5) - Erlang rebar3 3.17.0 - GNU C++ 7.5.0, 9.4.0, 10.3.0 - GNU Fortran 7.5.0, 9.4.0, 10.3.0 -- Julia 1.6.3 -- Kotlin 1.5.31-release-548 +- Julia 1.6.4 +- Kotlin 1.6.0-release-798 - Mono 6.12.0.122 (apt source repository: https://download.mono-project.com/repo/ubuntu stable-bionic main) - MSBuild 16.6.0.15201 (from /usr/lib/mono/msbuild/15.0/bin/MSBuild.dll) - Node 14.18.1 @@ -32,14 +32,14 @@ ### Package Management - cpan 1.64 - Helm 3.7.1 -- Homebrew 3.3.3 +- Homebrew 3.3.4 - Miniconda 4.10.3 - Npm 6.14.15 - Pip 9.0.1 - Pip3 9.0.1 - Pipx 0.16.4 - RubyGems 2.7.6 -- Vcpkg (build from master \<12bdfc7dd>) +- Vcpkg (build from master \<653912591>) - Yarn 1.22.17 #### Environment variables @@ -51,7 +51,7 @@ ### Project Management - Ant 1.10.5 - Gradle 7.3 -- Maven 3.8.3 +- Maven 3.8.4 - Sbt 1.5.5 ### Tools @@ -62,22 +62,22 @@ - Bazelisk 1.10.1 - Bicep 0.4.1008 - Buildah 1.19.6 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- CMake 3.21.4 -- CodeQL Action Bundle 2.7.0 +- CMake 3.22.0 +- CodeQL Action Bundle 2.7.1 - Docker Compose v1 1.29.2 - Docker Compose v2 2.1.1+azure-1 - Docker-Buildx 0.7.0 -- Docker-Moby Client 20.10.10+azure-1 -- Docker-Moby Server 20.10.10+azure-1 -- Git 2.33.1 (apt source repository: ppa:git-core/ppa) +- Docker-Moby Client 20.10.11+azure-1 +- Docker-Moby Server 20.10.11+azure-1 +- Git 2.34.0 (apt source repository: ppa:git-core/ppa) - Git LFS 2.13.3 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.3.1 - Haveged 1.9.1 -- Heroku 7.59.1 -- HHVM (HipHop VM) 4.135.0 +- Heroku 7.59.2 +- HHVM (HipHop VM) 4.136.0 - jq 1.5 - Kind 0.11.1 -- Kubectl 1.22.3 +- Kubectl 1.22.4 - Kustomize 4.4.1 - Leiningen 2.9.8 - MediaInfo 17.12 @@ -90,7 +90,7 @@ - Packer 1.7.8 - PhantomJS 2.1.1 - Podman 3.0.1 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- Pulumi 3.17.1 +- Pulumi 3.18.0 - R 4.1.2 - Skopeo 1.2.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 @@ -102,16 +102,16 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.99 -- AWS CLI 1.22.5 +- AWS CLI 1.22.10 - AWS CLI Session manager plugin 1.2.279.0 - AWS SAM CLI 1.35.0 - Azure CLI (azure-cli) 2.30.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.22.0 - GitHub CLI 2.2.0 -- Google Cloud SDK 364.0.0 (apt source repository: https://packages.cloud.google.com/apt) +- Google Cloud SDK 365.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 6.14.23 -- OpenShift CLI 4.9.6 +- Netlify CLI 7.0.2 +- OpenShift CLI 4.9.7 - ORAS CLI 0.12.0 - Vercel CLI 23.1.2 @@ -125,7 +125,7 @@ ### PHP | Tool | Version | | -------- | ---------------------------------- | -| PHP | 7.1.33 7.2.34 7.3.31 7.4.25 8.0.12 | +| PHP | 7.1.33 7.2.34 7.3.33 7.4.26 8.0.13 | | Composer | 2.1.12 | | PHPUnit | 8.5.21 | ``` @@ -134,7 +134,7 @@ ### Haskell - Cabal 3.6.2.0 - GHC 9.2.1 -- GHCup 0.1.17.3 +- GHCup 0.1.17.4 - Stack 2.7.3 ### Rust Tools @@ -145,18 +145,18 @@ #### Packages - Bindgen 0.59.1 -- Cargo audit 0.15.2 +- Cargo audit 0.16.0 - Cargo clippy 0.1.56 -- Cargo outdated 0.10.0 +- Cargo outdated 0.10.2 - Cbindgen 0.20.0 - Rustfmt 1.4.37 ### Browsers and Drivers -- Google Chrome 95.0.4638.69 -- ChromeDriver 95.0.4638.69 +- Google Chrome 96.0.4664.45 +- ChromeDriver 96.0.4664.45 - Mozilla Firefox 94.0 - Geckodriver 0.30.0 -- Chromium 95.0.4638.0 +- Chromium 96.0.4664.0 - Selenium server 4.0.0 #### Environment variables @@ -170,7 +170,7 @@ - 2.1.302 2.1.403 2.1.526 2.1.617 2.1.701 2.1.818 3.1.120 3.1.202 3.1.302 3.1.415 5.0.104 5.0.209 5.0.303 5.0.403 ### Databases -- MongoDB 5.0.3 (apt source repository: https://repo.mongodb.org/apt/ubuntu) +- MongoDB 5.0.4 (apt source repository: https://repo.mongodb.org/apt/ubuntu) - PostgreSQL 14.1 (apt source repository: https://apt.postgresql.org/pub/repos/apt/) - sqlite3 3.22.0 @@ -206,7 +206,7 @@ - 3.6.15 - 3.7.12 - 3.8.12 -- 3.9.8 +- 3.9.9 - 3.10.0 #### Ruby @@ -273,18 +273,18 @@ | alpine:3.12 | sha256:d9459083f962de6bd980ae6a05be2a4cf670df6a1d898157bceb420342bec280 | 2021-11-12 | | alpine:3.13 | sha256:026f721af4cf2843e07bba648e158fb35ecc876d822130633cc49f707f0fc88c | 2021-11-12 | | alpine:3.14 | sha256:635f0aa53d99017b38d1a0aa5b2082f7812b03e3cdb299103fe77b5c8a07f1d2 | 2021-11-12 | -| buildpack-deps:bullseye | sha256:1062c3cabe1b62d7e64609e1ebe30406b9d802684758a01fd386bbc60ea6b1aa | 2021-10-12 | -| buildpack-deps:buster | sha256:6d442a75a480d13760660675e0094e87e7b64ebd64acb43754c5ed46cb1ea532 | 2021-10-12 | -| buildpack-deps:stretch | sha256:63b243cde6ed83435eb26eda196769a37b9426abc76cc7e89ad364c3a24ce18f | 2021-10-12 | -| debian:10 | sha256:f9182ead292f45165f4a851e5ff98ea0800e172ccedce7d17764ffaae5ed4d6e | 2021-10-12 | -| debian:11 | sha256:4d6ab716de467aad58e91b1b720f0badd7478847ec7a18f66027d0f8a329a43c | 2021-10-12 | -| debian:9 | sha256:86269e614274db90a1d71dac258c74ed0a867a1d05f67dea6263b0f216ec7724 | 2021-10-12 | -| moby/buildkit:latest | sha256:be268d9d1aa75a670a12417a17122eaaa889c036c465fb30dd010bccb88b35d1 | 2021-11-02 | -| node:12 | sha256:15a9da96daf0609aee1b8971d3487095f0385d990e64f099684b5d9d8d711f4d | 2021-10-22 | +| buildpack-deps:bullseye | sha256:b83c9c8628517694fc9adea2dc25f70113f511606482c79e1a7689ba4893f7c4 | 2021-11-17 | +| buildpack-deps:buster | sha256:184194bf02563c474132a6982ed5878ef32b19b9f2a10029422ab304ca88ade1 | 2021-11-17 | +| buildpack-deps:stretch | sha256:36fba449401e28a20c9fc9ebae94b4071c0a69bab5aade3340539ac9c857375a | 2021-11-17 | +| debian:10 | sha256:e5333f8697a86fa1be53b2a7e994247083f61885166df0cdda9f812acb514d7c | 2021-11-17 | +| debian:11 | sha256:e8c184b56a94db0947a9d51ec68f42ef5584442f20547fa3bd8cbd00203b2e7a | 2021-11-17 | +| debian:9 | sha256:d8ee86bf0afeb901de293c692a540307a670306cbdb7a06e2c840f17b0c35374 | 2021-11-17 | +| moby/buildkit:latest | sha256:d6c89b7085b106301645ddcc77cf64eb7b705ab507b72d52d130ac33f1300417 | 2021-11-18 | +| node:12 | sha256:cb615135757e6e2eed4fad6d80f07b13d9f35072700c01da6de26fde5c9e8632 | 2021-11-17 | | node:12-alpine | sha256:0eca266c5fe38ba93aebac00e45c9ac1bb7328b0702a6dc10e1a6ea543d49301 | 2021-11-13 | -| node:14 | sha256:ab6c8cd32006f8a4c1c795e55ddfbc7f54f5a3fb7318506ecb355cab8f5e7182 | 2021-10-22 | +| node:14 | sha256:fbd6954d3941ebd1e12cd995dc10a4994535aa44d47271a91a829a2d1f88fc4c | 2021-11-17 | | node:14-alpine | sha256:240e1e6ef6dfba3bb70d6e88cca6cbb0b5a6f3a2b4496ed7edc5474e8ed594bd | 2021-11-13 | -| node:16 | sha256:683b8ea4ebc033a0f9060501fc31c1481d3f7232cc032851abbd8cc8d91fdff7 | 2021-10-27 | +| node:16 | sha256:580a0850049c59a48f06090edd48c9f966c5e6572bbbabc369ba3ecbc4855dba | 2021-11-17 | | node:16-alpine | sha256:60ef0bed1dc2ec835cfe3c4226d074fdfaba571fd619c280474cc04e93f0ec5b | 2021-11-13 | | ubuntu:16.04 | sha256:0f71fa8d4d2d4292c3c617fda2b36f6dabe5c8b6e34c3dc5b0d17d4e704bd39c | 2021-08-31 | | ubuntu:18.04 | sha256:0fedbd5bd9fb72089c7bbca476949e10593cebed9b1fb9edf5b79dbbacddd7d6 | 2021-10-01 | @@ -346,7 +346,7 @@ | pollinate | 4.33-0ubuntu1\~18.04.2 | | python-setuptools | 39.0.1-2 | | rpm | 4.14.1+dfsg1-2 | -| rsync | 3.1.2-2.1ubuntu1.1 | +| rsync | 3.1.2-2.1ubuntu1.2 | | shellcheck | 0.4.6-1 | | sphinxsearch | 2.2.11-2 | | sqlite3 | 3.22.0-1ubuntu0.4 | From d7624a56756368d94d3b751b5652d8116cefa4be Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 25 Nov 2021 09:19:16 +0000 Subject: [PATCH 0770/3485] Updating readme file for ubuntu20 version 20211122.1 (#4554) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2004-README.md | 86 +++++++++++++++---------------- 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/images/linux/Ubuntu2004-README.md b/images/linux/Ubuntu2004-README.md index 402066b95437..30d4641820c8 100644 --- a/images/linux/Ubuntu2004-README.md +++ b/images/linux/Ubuntu2004-README.md @@ -7,19 +7,19 @@ *** # Ubuntu 20.04.3 LTS - Linux kernel version: 5.11.0-1021-azure -- Image Version: 20211114.1 +- Image Version: 20211122.1 ## Installed Software ### Language and Runtime - Bash 5.0.17(1)-release - Clang 10.0.0, 11.0.0, 12.0.0 - Clang-format 10.0.0, 11.0.0, 12.0.0 -- Erlang 24.1.3 (Eshell 12.1.3) +- Erlang 24.1.5 (Eshell 12.1.5) - Erlang rebar3 3.17.0 - GNU C++ 9.3.0, 10.3.0 - GNU Fortran 9.3.0, 10.3.0 -- Julia 1.6.3 -- Kotlin 1.5.31-release-548 +- Julia 1.6.4 +- Kotlin 1.6.0-release-798 - Mono 6.12.0.122 (apt source repository: https://download.mono-project.com/repo/ubuntu stable-focal main) - MSBuild 16.6.0.15201 (from /usr/lib/mono/msbuild/15.0/bin/MSBuild.dll) - Node 14.18.1 @@ -32,14 +32,14 @@ ### Package Management - cpan 1.64 - Helm 3.7.1 -- Homebrew 3.3.3 +- Homebrew 3.3.4 - Miniconda 4.10.3 - Npm 6.14.15 - Pip 20.0.2 - Pip3 20.0.2 - Pipx 0.16.4 - RubyGems 3.1.2 -- Vcpkg (build from master \<12bdfc7dd>) +- Vcpkg (build from master \<653912591>) - Yarn 1.22.17 #### Environment variables @@ -52,7 +52,7 @@ - Ant 1.10.7 - Gradle 7.3 - Lerna 4.0.0 -- Maven 3.8.3 +- Maven 3.8.4 - Sbt 1.5.5 ### Tools @@ -63,23 +63,23 @@ - Bazelisk 1.10.1 - Bicep 0.4.1008 - Buildah 1.21.3 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- CMake 3.21.4 -- CodeQL Action Bundle 2.7.0 +- CMake 3.22.0 +- CodeQL Action Bundle 2.7.1 - Docker Compose v1 1.29.2 - Docker Compose v2 2.1.1+azure-1 - Docker-Buildx 0.7.0 -- Docker-Moby Client 20.10.10+azure-1 -- Docker-Moby Server 20.10.10+azure-1 -- Fastlane 2.197.0 -- Git 2.33.1 (apt source repository: ppa:git-core/ppa) +- Docker-Moby Client 20.10.11+azure-1 +- Docker-Moby Server 20.10.11+azure-1 +- Fastlane 2.198.1 +- Git 2.34.0 (apt source repository: ppa:git-core/ppa) - Git LFS 2.13.3 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.6.0 - Haveged 1.9.1 -- Heroku 7.59.1 -- HHVM (HipHop VM) 4.135.0 +- Heroku 7.59.2 +- HHVM (HipHop VM) 4.136.0 - jq 1.6 - Kind 0.11.1 -- Kubectl 1.22.3 +- Kubectl 1.22.4 - Kustomize 4.4.1 - Leiningen 2.9.8 - MediaInfo 19.09 @@ -91,8 +91,8 @@ - OpenSSL 1.1.1f 31 Mar 2020 - Packer 1.7.8 - PhantomJS 2.1.1 -- Podman 3.3.1 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- Pulumi 3.17.1 +- Podman 3.4.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) +- Pulumi 3.18.0 - R 4.1.2 - Skopeo 1.3.0 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 @@ -104,16 +104,16 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.99 -- AWS CLI 2.3.6 +- AWS CLI 2.4.0 - AWS CLI Session manager plugin 1.2.279.0 - AWS SAM CLI 1.35.0 - Azure CLI (azure-cli) 2.30.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.22.0 - GitHub CLI 2.2.0 -- Google Cloud SDK 364.0.0 (apt source repository: https://packages.cloud.google.com/apt) +- Google Cloud SDK 365.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 6.14.23 -- OpenShift CLI 4.9.6 +- Netlify CLI 7.0.2 +- OpenShift CLI 4.9.7 - ORAS CLI 0.12.0 - Vercel CLI 23.1.2 @@ -131,7 +131,7 @@ ### PHP | Tool | Version | | -------- | ------------- | -| PHP | 7.4.25 8.0.12 | +| PHP | 7.4.26 8.0.13 | | Composer | 2.1.12 | | PHPUnit | 8.5.21 | ``` @@ -140,7 +140,7 @@ ### Haskell - Cabal 3.6.2.0 - GHC 9.2.1 -- GHCup 0.1.17.3 +- GHCup 0.1.17.4 - Stack 2.7.3 ### Rust Tools @@ -151,18 +151,18 @@ #### Packages - Bindgen 0.59.1 -- Cargo audit 0.15.2 +- Cargo audit 0.16.0 - Cargo clippy 0.1.56 -- Cargo outdated 0.10.0 +- Cargo outdated 0.10.2 - Cbindgen 0.20.0 - Rustfmt 1.4.37 ### Browsers and Drivers -- Google Chrome 95.0.4638.69 -- ChromeDriver 95.0.4638.69 +- Google Chrome 96.0.4664.45 +- ChromeDriver 96.0.4664.45 - Mozilla Firefox 94.0 - Geckodriver 0.30.0 -- Chromium 95.0.4638.0 +- Chromium 96.0.4664.0 - Selenium server 4.0.0 #### Environment variables @@ -176,7 +176,7 @@ - 2.1.302 2.1.403 2.1.526 2.1.617 2.1.701 2.1.818 3.1.120 3.1.202 3.1.302 3.1.415 5.0.104 5.0.209 5.0.303 5.0.403 ### Databases -- MongoDB 5.0.3 (apt source repository: https://repo.mongodb.org/apt/ubuntu) +- MongoDB 5.0.4 (apt source repository: https://repo.mongodb.org/apt/ubuntu) - PostgreSQL 14.1 (apt source repository: https://apt.postgresql.org/pub/repos/apt/) - sqlite3 3.31.1 @@ -214,7 +214,7 @@ - 3.6.15 - 3.7.12 - 3.8.12 -- 3.9.8 +- 3.9.9 - 3.10.0 #### Ruby @@ -281,18 +281,18 @@ | alpine:3.12 | sha256:d9459083f962de6bd980ae6a05be2a4cf670df6a1d898157bceb420342bec280 | 2021-11-12 | | alpine:3.13 | sha256:026f721af4cf2843e07bba648e158fb35ecc876d822130633cc49f707f0fc88c | 2021-11-12 | | alpine:3.14 | sha256:635f0aa53d99017b38d1a0aa5b2082f7812b03e3cdb299103fe77b5c8a07f1d2 | 2021-11-12 | -| buildpack-deps:bullseye | sha256:1062c3cabe1b62d7e64609e1ebe30406b9d802684758a01fd386bbc60ea6b1aa | 2021-10-12 | -| buildpack-deps:buster | sha256:6d442a75a480d13760660675e0094e87e7b64ebd64acb43754c5ed46cb1ea532 | 2021-10-12 | -| buildpack-deps:stretch | sha256:63b243cde6ed83435eb26eda196769a37b9426abc76cc7e89ad364c3a24ce18f | 2021-10-12 | -| debian:10 | sha256:f9182ead292f45165f4a851e5ff98ea0800e172ccedce7d17764ffaae5ed4d6e | 2021-10-12 | -| debian:11 | sha256:4d6ab716de467aad58e91b1b720f0badd7478847ec7a18f66027d0f8a329a43c | 2021-10-12 | -| debian:9 | sha256:86269e614274db90a1d71dac258c74ed0a867a1d05f67dea6263b0f216ec7724 | 2021-10-12 | -| moby/buildkit:latest | sha256:be268d9d1aa75a670a12417a17122eaaa889c036c465fb30dd010bccb88b35d1 | 2021-11-02 | -| node:12 | sha256:15a9da96daf0609aee1b8971d3487095f0385d990e64f099684b5d9d8d711f4d | 2021-10-22 | +| buildpack-deps:bullseye | sha256:b83c9c8628517694fc9adea2dc25f70113f511606482c79e1a7689ba4893f7c4 | 2021-11-17 | +| buildpack-deps:buster | sha256:184194bf02563c474132a6982ed5878ef32b19b9f2a10029422ab304ca88ade1 | 2021-11-17 | +| buildpack-deps:stretch | sha256:36fba449401e28a20c9fc9ebae94b4071c0a69bab5aade3340539ac9c857375a | 2021-11-17 | +| debian:10 | sha256:e5333f8697a86fa1be53b2a7e994247083f61885166df0cdda9f812acb514d7c | 2021-11-17 | +| debian:11 | sha256:e8c184b56a94db0947a9d51ec68f42ef5584442f20547fa3bd8cbd00203b2e7a | 2021-11-17 | +| debian:9 | sha256:d8ee86bf0afeb901de293c692a540307a670306cbdb7a06e2c840f17b0c35374 | 2021-11-17 | +| moby/buildkit:latest | sha256:d6c89b7085b106301645ddcc77cf64eb7b705ab507b72d52d130ac33f1300417 | 2021-11-18 | +| node:12 | sha256:cb615135757e6e2eed4fad6d80f07b13d9f35072700c01da6de26fde5c9e8632 | 2021-11-17 | | node:12-alpine | sha256:0eca266c5fe38ba93aebac00e45c9ac1bb7328b0702a6dc10e1a6ea543d49301 | 2021-11-13 | -| node:14 | sha256:ab6c8cd32006f8a4c1c795e55ddfbc7f54f5a3fb7318506ecb355cab8f5e7182 | 2021-10-22 | +| node:14 | sha256:fbd6954d3941ebd1e12cd995dc10a4994535aa44d47271a91a829a2d1f88fc4c | 2021-11-17 | | node:14-alpine | sha256:240e1e6ef6dfba3bb70d6e88cca6cbb0b5a6f3a2b4496ed7edc5474e8ed594bd | 2021-11-13 | -| node:16 | sha256:683b8ea4ebc033a0f9060501fc31c1481d3f7232cc032851abbd8cc8d91fdff7 | 2021-10-27 | +| node:16 | sha256:580a0850049c59a48f06090edd48c9f966c5e6572bbbabc369ba3ecbc4855dba | 2021-11-17 | | node:16-alpine | sha256:60ef0bed1dc2ec835cfe3c4226d074fdfaba571fd619c280474cc04e93f0ec5b | 2021-11-13 | | ubuntu:16.04 | sha256:0f71fa8d4d2d4292c3c617fda2b36f6dabe5c8b6e34c3dc5b0d17d4e704bd39c | 2021-08-31 | | ubuntu:18.04 | sha256:0fedbd5bd9fb72089c7bbca476949e10593cebed9b1fb9edf5b79dbbacddd7d6 | 2021-10-01 | @@ -328,7 +328,7 @@ | libc++-dev | 1:10.0-50\~exp1 | | libc++abi-dev | 1:10.0-50\~exp1 | | libcurl4 | 7.68.0-1ubuntu2.7 | -| libgbm-dev | 21.0.3-0ubuntu0.3\~20.04.3 | +| libgbm-dev | 21.0.3-0ubuntu0.3\~20.04.4 | | libgconf-2-4 | 3.2.6-6ubuntu1 | | libgsl-dev | 2.5+dfsg-6build1 | | libgtk-3-0 | 3.24.20-0ubuntu1 | @@ -356,7 +356,7 @@ | pollinate | 4.33-3ubuntu1.20.04.1 | | python-is-python3 | 3.8.2-4 | | rpm | 4.14.2.1+dfsg1-1build2 | -| rsync | 3.1.3-8 | +| rsync | 3.1.3-8ubuntu0.1 | | shellcheck | 0.7.0-2build2 | | sphinxsearch | 2.2.11-2ubuntu2 | | sqlite3 | 3.31.1-4ubuntu0.2 | From 81c96d97812a268e6015a08590ab506f480498a7 Mon Sep 17 00:00:00 2001 From: Maksim Shilov <89912354+shilovmaksim@users.noreply.github.com> Date: Thu, 25 Nov 2021 14:24:27 +0300 Subject: [PATCH 0771/3485] [Windows] Fix Get-LatestChocoPackageVersion (#4581) --- images/win/scripts/ImageHelpers/ChocoHelpers.ps1 | 1 + 1 file changed, 1 insertion(+) diff --git a/images/win/scripts/ImageHelpers/ChocoHelpers.ps1 b/images/win/scripts/ImageHelpers/ChocoHelpers.ps1 index f47b012b7850..9405f3ebc455 100644 --- a/images/win/scripts/ImageHelpers/ChocoHelpers.ps1 +++ b/images/win/scripts/ImageHelpers/ChocoHelpers.ps1 @@ -57,6 +57,7 @@ function Get-LatestChocoPackageVersion { $incrementedVersion = $versionNumbers -join "." $filterQuery = "`$filter=(Id eq '$PackageName') and (IsPrerelease eq false) and (Version ge '$TargetVersion') and (Version lt '$incrementedVersion')" $latestVersion = (Send-RequestToChocolateyPackages -FilterQuery $filterQuery).properties.Version | + Where-Object {$_ -Like "$TargetVersion.*" -or $_ -eq $TargetVersion} | Sort-Object {[version]$_} | Select-Object -Last 1 From 446bf8d222493ea5c155c47024263a72f3aa87dc Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 25 Nov 2021 14:22:03 +0000 Subject: [PATCH 0772/3485] Updating readme file for win19 version 20211122.1 (#4569) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2019-Readme.md | 81 +++++++++++++++----------------- 1 file changed, 38 insertions(+), 43 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index c9dc66cfb7f5..df0bbef0fb8b 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -1,15 +1,14 @@ | Announcements | |-| +| [Windows Server 2022 with Visual Studio 2022 is generally available starting from November, 15](https://github.com/actions/virtual-environments/issues/4488) | | [[all OSs] Default Nodejs version will be set to 16 on November, 29](https://github.com/actions/virtual-environments/issues/4446) | | [[all OSs] Selenium server version will be upgraded from 3 to 4 on November, 15](https://github.com/actions/virtual-environments/issues/4376) | | [[All OSs] Node.js version 10 will be removed from the images on November, 15](https://github.com/actions/virtual-environments/issues/4356) | | [Windows-2016 environment will be removed on March 15, 2022](https://github.com/actions/virtual-environments/issues/4312) | -| [[All OSs] Go versions less than 1.15 will be removed on November, 8](https://github.com/actions/virtual-environments/issues/4311) | -| [(Public Beta) Windows Server 2022 with Visual Studio 2022 is now available](https://github.com/actions/virtual-environments/issues/3949) | *** # Microsoft Windows Server 2019 Datacenter - OS Version: 10.0.17763 Build 2300 -- Image Version: 20211110.1 +- Image Version: 20211122.1 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -18,12 +17,12 @@ ### Language and Runtime - Bash 4.4.23(1)-release - Go 1.15.15 -- Julia 1.6.3 -- Kotlin 1.5.31 +- Julia 1.6.4 +- Kotlin 1.6.0 - LLVM 13.0.0 - Node 14.18.1 - Perl 5.32.1 -- PHP 8.0.10 +- PHP 8.0.13 - Python 3.7.9 - Ruby 2.5.9p229 @@ -37,7 +36,7 @@ - pip 21.3.1 (python 3.7) - Pipx 0.16.4 - RubyGems 2.7.6.3 -- Vcpkg (build from master \<70033db>) +- Vcpkg (build from master \<653912591>) - Yarn 1.22.17 #### Environment variables @@ -49,48 +48,50 @@ ### Project Management - Ant 1.10.12 - Gradle 7.2 -- Maven 3.8.3 +- Maven 3.8.4 - sbt 1.5.5 ### Tools -- 7zip 19.00 +- 7zip 21.05 - aria2 1.36.0 - azcopy 10.13.0 - Bazel 4.2.1 - Bazelisk 1.10.1 - Bicep 0.4.1008 - Cabal 3.6.2.0 -- CMake 3.21.4 -- CodeQL Action Bundle 2.7.0 +- CMake 3.22.0 +- CodeQL Action Bundle 2.7.1 - Docker 20.10.7 - Docker-compose 1.29.2 +- Docker-wincred 0.6.4 - ghc 9.2.1 -- Git 2.33.1 -- Git LFS 3.0.1 -- Google Cloud SDK 364.0.0 +- Git 2.34.0 +- Git LFS 3.0.2 +- Google Cloud SDK 365.0.0 - InnoSetup 6.2.0 - jq 1.6 - Kind 0.11.1 -- Kubectl 1.22.3 +- Kubectl 1.22.4 - Mercurial 5.0 - Mingw-w64 8.1.0 - Newman 5.3.0 - NSIS v3.06.1 - OpenSSL 1.1.1 -- Packer 1.7.6 -- Pulumi v3.17.1 +- Packer 1.7.8 +- Pulumi v3.18.0 - R 4.1.2 - Stack 2.7.3 - Subversion (SVN) 1.14.1 - Swig 4.0.2 - VSWhere 2.8.4 - WinAppDriver 1.2.2009.02003 +- WiX Toolset v3.11.2.4516 - yamllint 1.26.3 - zstd 1.5.0 ### CLI Tools - Alibaba Cloud CLI 3.0.99 -- AWS CLI 2.3.5 +- AWS CLI 2.4.0 - AWS SAM CLI 1.35.0 - AWS Session Manager CLI 1.2.279.0 - Azure CLI 2.30.0 @@ -107,29 +108,29 @@ #### Packages - bindgen 0.59.1 -- cargo-audit 0.15.2 -- cargo-outdated v0.9.18 +- cargo-audit 0.16.0 +- cargo-outdated v0.10.2 - cbindgen 0.20.0 - Clippy 0.1.56 - Rustfmt 1.4.37 ### Browsers and webdrivers -- Google Chrome 95.0.4638.69 -- Chrome Driver 95.0.4638.69 -- Microsoft Edge 95.0.1020.44 -- Microsoft Edge Driver 95.0.1020.44 +- Google Chrome 96.0.4664.45 +- Chrome Driver 96.0.4664.45 +- Microsoft Edge 96.0.1054.29 +- Microsoft Edge Driver 96.0.1054.29 - Mozilla Firefox 94.0.1 - Gecko Driver 0.30.0 - IE Driver 3.150.1.1 -- Selenium server 3.141.59 +- Selenium server 4.0.0 #### Environment variables -| Name | Value | -| ----------------- | ------------------------------------------ | -| CHROMEWEBDRIVER | C:\SeleniumWebDrivers\ChromeDriver | -| EDGEWEBDRIVER | C:\SeleniumWebDrivers\EdgeDriver | -| GECKOWEBDRIVER | C:\SeleniumWebDrivers\GeckoDriver | -| SELENIUM_JAR_PATH | C:\selenium\selenium-server-standalone.jar | +| Name | Value | +| ----------------- | ---------------------------------- | +| CHROMEWEBDRIVER | C:\SeleniumWebDrivers\ChromeDriver | +| EDGEWEBDRIVER | C:\SeleniumWebDrivers\EdgeDriver | +| GECKOWEBDRIVER | C:\SeleniumWebDrivers\GeckoDriver | +| SELENIUM_JAR_PATH | C:\selenium\selenium-server.jar | ### Java | Version | Vendor | Environment Variable | @@ -168,7 +169,6 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Node | Version | Architecture | | ------- | ------------ | -| 10.24.1 | x64 | | 12.22.7 | x64 | | 14.18.1 | x64 | | 16.13.0 | x64 | @@ -182,7 +182,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | 3.6.8 | x64, x86 | | 3.7.9 (Default) | x64, x86 | | 3.8.10 | x64, x86 | -| 3.9.8 | x64, x86 | +| 3.9.9 | x64, x86 | | 3.10.0 | x64, x86 | @@ -211,7 +211,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Property | Value | | -------------------- | ------------------------------------------------------------------------------------------------------------------------------------ | | ServiceName | postgresql-x64-14 | -| Version | 14.0 | +| Version | 14.1 | | ServiceStatus | Stopped | | ServiceStartType | Disabled | | EnvironmentVariables | PGBIN=C:\Program Files\PostgreSQL\14\bin <br> PGDATA=C:\Program Files\PostgreSQL\14\data <br> PGROOT=C:\Program Files\PostgreSQL\14 | @@ -223,14 +223,14 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### MongoDB | Version | ServiceName | ServiceStatus | ServiceStartType | | ------- | ----------- | ------------- | ---------------- | -| 5.1.0.0 | MongoDB | Running | Automatic | +| 5.0.4.0 | MongoDB | Running | Automatic | ### Database tools - Azure CosmosDb Emulator 2.14.4.0 - DacFx 15.0.5282.3 -- MySQL 5.7.35.0 +- MySQL 5.7.36.0 - SQLPS 1.0 @@ -243,13 +243,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.11.31829.152 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | +| Visual Studio Enterprise 2019 | 16.11.31911.196 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | #### Workloads, components and extensions: | Package | Version | | ------------------------------------------------------------------------- | --------------- | -| Component.Android.NDK.R16B | 16.11.31827.77 | +| Component.Android.NDK.R16B | 16.11.31910.99 | | Component.Android.SDK25.Private | 16.0.28625.61 | | Component.Android.SDK30 | 16.10.31205.252 | | Component.Ant | 1.9.3.8 | @@ -270,9 +270,6 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Component.Unreal | 16.1.28810.153 | | Component.Unreal.Android | 16.1.28810.153 | | Component.VSInstallerProjects | 1.0.0 | -| Component.WixToolset.VisualStudioExtension.Dev16 | 1.0.0.4 | -| Component.WixToolset.VisualStudioExtension.Schemas3 | 1.0.0.4 | -| Component.WixToolset.VisualStudioExtension.Schemas4 | 1.0.0.4 | | Component.Xamarin | 16.10.31205.252 | | Component.Xamarin.RemotedSimulator | 16.10.31205.252 | | Microsoft.Component.Azure.DataLake.Tools | 16.10.31205.252 | @@ -477,8 +474,6 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Windows Driver Kit | 10.0.21381.0 | | Windows Driver Kit Visual Studio Extension | 10.1.22000.1 | | Windows Software Development Kit Extension | 10.1.22000.194 | -| WIX Toolset | 3.11.4516 | -| WIX Toolset Studio 2019 Extension | 1.0.0.4 | #### Microsoft Visual C++: From 7a3b442a0b30eb8addb88c323d82ebd6706a6562 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 25 Nov 2021 14:30:30 +0000 Subject: [PATCH 0773/3485] Updating readme file for win16 version 20211122.1 (#4568) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2016-Readme.md | 47 ++++++++++++++++---------------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/images/win/Windows2016-Readme.md b/images/win/Windows2016-Readme.md index 6ec950375ecb..87209dbbd8e1 100644 --- a/images/win/Windows2016-Readme.md +++ b/images/win/Windows2016-Readme.md @@ -8,18 +8,18 @@ *** # Microsoft Windows Server 2016 Datacenter - OS Version: 10.0.14393 Build 4770 -- Image Version: 20211115.1 +- Image Version: 20211122.1 ## Installed Software ### Language and Runtime - Bash 4.4.23(1)-release - Go 1.15.15 -- Julia 1.6.3 -- Kotlin 1.5.31 +- Julia 1.6.4 +- Kotlin 1.6.0 - LLVM 13.0.0 - Node 14.18.1 - Perl 5.32.1 -- PHP 8.0.10 +- PHP 8.0.13 - Python 3.7.9 - Ruby 2.5.9p229 @@ -33,7 +33,7 @@ - pip 21.3.1 (python 3.7) - Pipx 0.16.4 - RubyGems 2.7.6.3 -- Vcpkg (build from master \<c973b499f>) +- Vcpkg (build from master \<653912591>) - Yarn 1.22.17 #### Environment variables @@ -45,36 +45,37 @@ ### Project Management - Ant 1.10.12 - Gradle 7.2 -- Maven 3.8.3 +- Maven 3.8.4 - sbt 1.5.5 ### Tools -- 7zip 19.00 +- 7zip 21.05 - aria2 1.36.0 - azcopy 10.13.0 - Bazel 4.2.1 - Bazelisk 1.10.1 - Bicep 0.4.1008 - Cabal 3.6.2.0 -- CMake 3.21.4 -- CodeQL Action Bundle 2.7.0 +- CMake 3.22.0 +- CodeQL Action Bundle 2.7.1 - Docker 20.10.7 - Docker-compose 1.29.2 +- Docker-wincred 0.6.4 - ghc 9.2.1 -- Git 2.33.1 -- Git LFS 3.0.1 -- Google Cloud SDK 364.0.0 +- Git 2.34.0 +- Git LFS 3.0.2 +- Google Cloud SDK 365.0.0 - InnoSetup 6.2.0 - jq 1.6 - Kind 0.11.1 -- Kubectl 1.22.3 +- Kubectl 1.22.4 - Mercurial 5.0 - Mingw-w64 8.1.0 - Newman 5.3.0 - NSIS v3.06.1 - OpenSSL 1.1.1 - Packer 1.7.8 -- Pulumi v3.17.1 +- Pulumi v3.18.0 - R 4.1.2 - Stack 2.7.3 - Subversion (SVN) 1.14.1 @@ -87,7 +88,7 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.99 -- AWS CLI 2.3.6 +- AWS CLI 2.4.0 - AWS SAM CLI 1.35.0 - AWS Session Manager CLI 1.2.279.0 - Azure CLI 2.30.0 @@ -104,17 +105,17 @@ #### Packages - bindgen 0.59.1 -- cargo-audit 0.15.2 -- cargo-outdated v0.10.0 +- cargo-audit 0.16.0 +- cargo-outdated v0.10.2 - cbindgen 0.20.0 - Clippy 0.1.56 - Rustfmt 1.4.37 ### Browsers and webdrivers -- Google Chrome 95.0.4638.69 -- Chrome Driver 95.0.4638.69 -- Microsoft Edge 95.0.1020.53 -- Microsoft Edge Driver 95.0.1020.53 +- Google Chrome 96.0.4664.45 +- Chrome Driver 96.0.4664.45 +- Microsoft Edge 96.0.1054.29 +- Microsoft Edge Driver 96.0.1054.29 - Mozilla Firefox 94.0.1 - Gecko Driver 0.30.0 - IE Driver 3.150.1.1 @@ -175,7 +176,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | 3.6.8 | x64, x86 | | 3.7.9 (Default) | x64, x86 | | 3.8.10 | x64, x86 | -| 3.9.8 | x64, x86 | +| 3.9.9 | x64, x86 | | 3.10.0 | x64 | @@ -216,7 +217,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### MongoDB | Version | ServiceName | ServiceStatus | ServiceStartType | | ------- | ----------- | ------------- | ---------------- | -| 5.0.3.0 | MongoDB | Running | Automatic | +| 5.0.4.0 | MongoDB | Running | Automatic | From 120fc45b768c07b897c53b7783e5c101a5ef5510 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 26 Nov 2021 00:31:07 +0000 Subject: [PATCH 0774/3485] Updating readme file for win22 version 20211122.0 (#4570) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2022-Readme.md | 58 +++++++++++++++++--------------- 1 file changed, 30 insertions(+), 28 deletions(-) diff --git a/images/win/Windows2022-Readme.md b/images/win/Windows2022-Readme.md index faeaab2c0f37..2e2b38595bb6 100644 --- a/images/win/Windows2022-Readme.md +++ b/images/win/Windows2022-Readme.md @@ -8,7 +8,7 @@ *** # Microsoft Windows Server 2022 Datacenter - OS Version: 10.0.20348 Build 350 -- Image Version: 20211115.1 +- Image Version: 20211122.0 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -17,12 +17,12 @@ ### Language and Runtime - Bash 4.4.23(1)-release - Go 1.16.10 -- Julia 1.6.3 -- Kotlin 1.5.31 +- Julia 1.6.4 +- Kotlin 1.6.0 - LLVM 13.0.0 - Node 14.18.1 -- PHP 8.0.10 -- Python 3.9.8 +- PHP 8.0.13 +- Python 3.9.9 - Ruby 3.0.2p107 ### Package Management @@ -35,7 +35,7 @@ - pip 21.3.1 (python 3.9) - Pipx 0.16.4 - RubyGems 3.2.22 -- Vcpkg (build from master \<c973b499f>) +- Vcpkg (build from master \<653912591>) - Yarn 1.22.17 #### Environment variables @@ -46,33 +46,35 @@ ### Project Management - Ant 1.10.12 - Gradle 7.2 -- Maven 3.8.3 +- Maven 3.8.4 +- sbt 1.5.5 ### Tools -- 7zip 19.00 +- 7zip 21.05 - aria2 1.36.0 - azcopy 10.13.0 - Bazel 4.2.1 - Bazelisk 1.10.1 - Bicep 0.4.1008 - Cabal 3.6.2.0 -- CMake 3.21.4 -- CodeQL Action Bundle 2.7.0 +- CMake 3.22.0 +- CodeQL Action Bundle 2.7.2 - Docker 20.10.7 - Docker-compose 1.29.2 +- Docker-wincred 0.6.4 - ghc 9.2.1 -- Git 2.33.1 -- Git LFS 3.0.1 +- Git 2.34.0 +- Git LFS 3.0.2 - jq 1.6 - Kind 0.11.1 -- Kubectl 1.22.3 +- Kubectl 1.22.4 - Mercurial 5.0 - Mingw-w64 8.1.0 - Newman 5.3.0 - NSIS v3.06.1 - OpenSSL 1.1.1 - Packer 1.7.8 -- Pulumi v3.17.1 +- Pulumi v3.18.0 - R 4.1.2 - Stack 2.7.3 - Subversion (SVN) 1.14.1 @@ -85,7 +87,7 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.99 -- AWS CLI 2.3.6 +- AWS CLI 2.4.0 - AWS SAM CLI 1.35.0 - AWS Session Manager CLI 1.2.279.0 - Azure CLI 2.30.0 @@ -101,18 +103,18 @@ #### Packages - bindgen 0.59.1 -- cargo-audit 0.15.2 -- cargo-outdated v0.10.0 +- cargo-audit 0.16.0 +- cargo-outdated v0.10.2 - cbindgen 0.20.0 - Clippy 0.1.56 - Rustfmt 1.4.37 ### Browsers and webdrivers -- Google Chrome 95.0.4638.69 -- Chrome Driver 95.0.4638.69 -- Microsoft Edge 95.0.1020.53 -- Microsoft Edge Driver 95.0.1020.53 -- Mozilla Firefox 94.0.1 +- Google Chrome 96.0.4664.45 +- Chrome Driver 96.0.4664.45 +- Microsoft Edge 96.0.1054.29 +- Microsoft Edge Driver 96.0.1054.29 +- Mozilla Firefox 94.0.2 - Gecko Driver 0.30.0 - IE Driver 3.150.1.1 - Selenium server 4.0.0 @@ -169,7 +171,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | ------- | ------------ | | 3.7.9 | x64, x86 | | 3.8.10 | x64, x86 | -| 3.9.8 (Default) | x64, x86 | +| 3.9.9 (Default) | x64, x86 | | 3.10.0 | x64, x86 | @@ -206,7 +208,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### MongoDB | Version | ServiceName | ServiceStatus | ServiceStartType | | ------- | ----------- | ------------- | ---------------- | -| 5.0.3.0 | MongoDB | Running | Automatic | +| 5.0.4.0 | MongoDB | Running | Automatic | @@ -224,9 +226,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Nginx | 1.21.4 | C:\tools\nginx-1.21.4\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2022 -| Name | Version | Path | -| ----------------------------- | ------------- | -------------------------------------------------------- | -| Visual Studio Enterprise 2022 | 17.0.31903.59 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | +| Name | Version | Path | +| ----------------------------- | -------------- | -------------------------------------------------------- | +| Visual Studio Enterprise 2022 | 17.0.31912.275 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | #### Workloads, components and extensions: @@ -273,7 +275,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | microsoft.net.sdk.emscripten | 6.0.5.2003 | | Microsoft.NetCore.Component.DevelopmentTools | 17.0.31804.368 | | Microsoft.NetCore.Component.Runtime.6.0 | 17.0.31902.203 | -| Microsoft.NetCore.Component.SDK | 17.0.31902.203 | +| Microsoft.NetCore.Component.SDK | 17.0.31912.81 | | Microsoft.NetCore.Component.Web | 17.0.31804.368 | | Microsoft.VisualStudio.Component.AppInsights.Tools | 17.0.31804.368 | | Microsoft.VisualStudio.Component.AspNet | 17.0.31804.368 | From acc3d7cc0dc1c92f27d6a277c3c7b12fc93d7731 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Fri, 26 Nov 2021 10:41:26 +0300 Subject: [PATCH 0775/3485] Remove Dotnet.ps1 post-generation script (#4585) --- images/win/post-generation/Dotnet.ps1 | 11 --- .../scripts/ImageHelpers/ImageHelpers.psm1 | 7 ++ .../win/scripts/ImageHelpers/PathHelpers.ps1 | 88 +++++++++++++++++++ .../scripts/Installers/Install-DotnetSDK.ps1 | 17 +++- 4 files changed, 108 insertions(+), 15 deletions(-) delete mode 100644 images/win/post-generation/Dotnet.ps1 diff --git a/images/win/post-generation/Dotnet.ps1 b/images/win/post-generation/Dotnet.ps1 deleted file mode 100644 index 56d2f875d866..000000000000 --- a/images/win/post-generation/Dotnet.ps1 +++ /dev/null @@ -1,11 +0,0 @@ -$latestPath = [System.Environment]::GetEnvironmentVariable('PATH', [System.EnvironmentVariableTarget]::Machine) -$dotnetPath = "$env:USERPROFILE\.dotnet\tools" - -if (-not $latestPath.Contains($dotnetPath)) -{ - $latestPath = "$dotnetPath;$latestPath" - [System.Environment]::SetEnvironmentVariable('PATH', $latestPath, [System.EnvironmentVariableTarget]::Machine) -} - -# Recreate the config using the 'dotnet nuget list source command' -dotnet nuget list source diff --git a/images/win/scripts/ImageHelpers/ImageHelpers.psm1 b/images/win/scripts/ImageHelpers/ImageHelpers.psm1 index 09e4962a6064..bf7438f769c9 100644 --- a/images/win/scripts/ImageHelpers/ImageHelpers.psm1 +++ b/images/win/scripts/ImageHelpers/ImageHelpers.psm1 @@ -8,12 +8,19 @@ param() . $PSScriptRoot\VisualStudioHelpers.ps1 Export-ModuleMember -Function @( + 'Connect-Hive' + 'Disconnect-Hive' 'Test-MachinePath' 'Get-MachinePath' + 'Get-DefaultPath' 'Set-MachinePath' + 'Set-DefaultPath' 'Add-MachinePathItem' + 'Add-DefaultPathItem' 'Get-SystemVariable' + 'Get-DefaultVariable' 'Set-SystemVariable' + 'Set-DefaultVariable' 'Install-Binary' 'Install-VisualStudio' 'Get-ToolsetContent' diff --git a/images/win/scripts/ImageHelpers/PathHelpers.ps1 b/images/win/scripts/ImageHelpers/PathHelpers.ps1 index 1c98dcb65a6e..af4bd5ef5fc8 100644 --- a/images/win/scripts/ImageHelpers/PathHelpers.ps1 +++ b/images/win/scripts/ImageHelpers/PathHelpers.ps1 @@ -1,3 +1,38 @@ +function Connect-Hive { + param( + [string]$FileName = "C:\Users\Default\NTUSER.DAT", + [string]$SubKey = "HKLM\DEFAULT" + ) + + Write-Host "Loading the file $FileName to the Key $SubKey" + if (Test-Path $SubKey.Replace("\",":")) { + return + } + + $result = reg load $SubKey $FileName *>&1 + if ($LASTEXITCODE -ne 0) { + Write-Host "Failed to load hive: $result" + exit 1 + } +} + +function Disconnect-Hive { + param( + [string]$SubKey = "HKLM\DEFAULT" + ) + + Write-Host "Unloading the hive $SubKey" + if (-not (Test-Path $SubKey.Replace("\",":"))) { + return + } + + $result = reg unload $SubKey *>&1 + if ($LASTEXITCODE -ne 0) { + Write-Host "Failed to unload hive: $result" + exit 1 + } +} + function Get-SystemVariable { param( [string]$SystemVariable @@ -6,6 +41,19 @@ function Get-SystemVariable { [System.Environment]::GetEnvironmentVariable($SystemVariable, "Machine") } +function Get-DefaultVariable { + param( + [string]$DefaultVariable, + [string]$Name = "DEFAULT\Environment", + [bool]$Writable = $false + ) + + $key = [Microsoft.Win32.Registry]::LocalMachine.OpenSubKey($Name, $Writable) + $key.GetValue($DefaultVariable, "", "DoNotExpandEnvironmentNames") + $key.Handle.Close() + [System.GC]::Collect() +} + function Set-SystemVariable { param( [string]$SystemVariable, @@ -16,10 +64,30 @@ function Set-SystemVariable { Get-SystemVariable $SystemVariable } +function Set-DefaultVariable { + param( + [string]$DefaultVariable, + [string]$Value, + [string]$Name = "DEFAULT\Environment", + [string]$Kind = "ExpandString", + [bool]$Writable = $true + ) + + $key = [Microsoft.Win32.Registry]::LocalMachine.OpenSubKey($Name, $Writable) + $key.SetValue($DefaultVariable, $Value, $Kind) + Get-DefaultVariable $DefaultVariable + $key.Handle.Close() + [System.GC]::Collect() +} + function Get-MachinePath { Get-SystemVariable PATH } +function Get-DefaultPath { + Get-DefaultVariable Path +} + function Set-MachinePath { param( [string]$NewPath @@ -28,6 +96,14 @@ function Set-MachinePath { Set-SystemVariable PATH $NewPath } +function Set-DefaultPath { + param( + [string]$NewPath + ) + + Set-DefaultVariable PATH $NewPath +} + function Test-MachinePath { param( [string]$PathItem @@ -46,3 +122,15 @@ function Add-MachinePathItem { $newPath = $PathItem + ';' + $currentPath Set-MachinePath -NewPath $newPath } + +function Add-DefaultPathItem { + param( + [string]$PathItem + ) + + Connect-Hive + $currentPath = Get-DefaultPath + $newPath = $PathItem + ';' + $currentPath + Set-DefaultPath -NewPath $newPath + Disconnect-Hive +} diff --git a/images/win/scripts/Installers/Install-DotnetSDK.ps1 b/images/win/scripts/Installers/Install-DotnetSDK.ps1 index b5cd097322b0..1b802e24fe7a 100644 --- a/images/win/scripts/Installers/Install-DotnetSDK.ps1 +++ b/images/win/scripts/Installers/Install-DotnetSDK.ps1 @@ -110,12 +110,21 @@ function InstallAllValidSdks() function RunPostInstallationSteps() { + # Add dotnet to PATH Add-MachinePathItem "C:\Program Files\dotnet" - # Run script at startup for all users - $cmdDotNet = 'C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe -NoProfile -Command "[System.Environment]::SetEnvironmentVariable(''PATH'',"""$env:USERPROFILE\.dotnet\tools;$env:PATH""", ''USER'')"' - # Update Run key to run a script at logon - Set-ItemProperty -Path "HKLM:\Software\Microsoft\Windows\CurrentVersion\Run" -Name "DOTNETUSERPATH" -Value $cmdDotNet + # Remove NuGet Folder + $nugetPath = "$env:APPDATA\NuGet" + if (Test-Path $nugetPath) { + Remove-Item -Path $nugetPath -Force -Recurse + } + + # Generate and copy new NuGet.Config config + dotnet nuget list source | Out-Null + Copy-Item -Path $nugetPath -Destination C:\Users\Default\AppData\Roaming -Force -Recurse + + # Add %USERPROFILE%\.dotnet\tools to USER PATH + Add-DefaultPathItem "%USERPROFILE%\.dotnet\tools" } InstallAllValidSdks From 8922c7b5bfab73d55acfba59c3291bec9a0b9804 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Fri, 26 Nov 2021 11:52:02 +0300 Subject: [PATCH 0776/3485] [Windows] pin mysql release version in toolset (#4590) --- images/win/scripts/Installers/Install-MysqlCli.ps1 | 6 +++--- images/win/scripts/Tests/Databases.Tests.ps1 | 6 +++--- images/win/toolsets/toolset-2016.json | 5 +++-- images/win/toolsets/toolset-2019.json | 5 +++-- images/win/toolsets/toolset-2022.json | 5 +++-- 5 files changed, 15 insertions(+), 12 deletions(-) diff --git a/images/win/scripts/Installers/Install-MysqlCli.ps1 b/images/win/scripts/Installers/Install-MysqlCli.ps1 index f9c422e63287..af07d5ad20d5 100644 --- a/images/win/scripts/Installers/Install-MysqlCli.ps1 +++ b/images/win/scripts/Installers/Install-MysqlCli.ps1 @@ -11,9 +11,9 @@ $ArgumentList = ("/install", "/quiet", "/norestart") Install-Binary -Url $InstallerURI -Name $InstallerName -ArgumentList $ArgumentList ## Downloading mysql -$MysqlMajorMinor = (Get-ToolsetContent).Mysql.version -$MysqlFullVersion = ((Invoke-WebRequest -Uri https://dev.mysql.com/downloads/mysql/${MysqlMajorMinor}.html).Content | Select-String -Pattern "${MysqlMajorMinor}\.\d+").Matches.Value -$MysqlVersionUrl = "https://dev.mysql.com/get/Downloads/MySQL-${MysqlMajorMinor}/mysql-${MysqlFullVersion}-winx64.zip" +$MysqlMajorVersion = (Get-ToolsetContent).mysql.major_version +$MysqlFullVersion = (Get-ToolsetContent).mysql.full_version +$MysqlVersionUrl = "https://dev.mysql.com/get/Downloads/MySQL-${MysqlMajorVersion}/mysql-${MysqlFullVersion}-winx64.zip" $MysqlArchPath = Start-DownloadWithRetry -Url $MysqlVersionUrl -Name "mysql.zip" diff --git a/images/win/scripts/Tests/Databases.Tests.ps1 b/images/win/scripts/Tests/Databases.Tests.ps1 index adf8c983c6f9..ac6b3106f7a1 100644 --- a/images/win/scripts/Tests/Databases.Tests.ps1 +++ b/images/win/scripts/Tests/Databases.Tests.ps1 @@ -65,7 +65,7 @@ Describe "PostgreSQL" { Describe "MySQL" { It "MySQL CLI" { - $MysqlMajorMinor = (Get-ToolsetContent).Mysql.version - mysql -V | Should -BeLike "*${MysqlMajorMinor}*" + $MysqlMajorVersion = (Get-ToolsetContent).mysql.major_version + mysql -V | Should -BeLike "*${MysqlMajorVersion}*" } -} \ No newline at end of file +} diff --git a/images/win/toolsets/toolset-2016.json b/images/win/toolsets/toolset-2016.json index 05943d9d4191..3e21da8caf12 100644 --- a/images/win/toolsets/toolset-2016.json +++ b/images/win/toolsets/toolset-2016.json @@ -421,8 +421,9 @@ "node": { "default": "16" }, - "Mysql": { - "version": "5.7" + "mysql": { + "major_version": "5.7", + "full_version": "5.7.35" }, "mongodb": { "version": "5.0" diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index 3334fc0c7369..89b18bb3c3b4 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -453,8 +453,9 @@ "node": { "default": "16" }, - "Mysql": { - "version": "5.7" + "mysql": { + "major_version": "5.7", + "full_version": "5.7.35" }, "mongodb": { "version": "5.0" diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index 18add708bf55..a99f6da5f751 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -305,8 +305,9 @@ "node": { "default": "16" }, - "Mysql": { - "version": "8.0" + "mysql": { + "major_version": "8.0", + "full_version": "8.0.26" }, "mongodb": { "version": "5.0" From af645a7b5e433a9fcc3ea1d6388896e0e3a8cad8 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Fri, 26 Nov 2021 12:39:13 +0300 Subject: [PATCH 0777/3485] [Ubuntu] get rid of post-gen rust script (#4575) --- .../linux/post-generation/rust-permissions.sh | 14 -------------- .../SoftwareReport/SoftwareReport.Rust.psm1 | 7 ++++--- images/linux/scripts/installers/rust.sh | 17 ++++------------- images/linux/scripts/tests/Tools.Tests.ps1 | 7 +++++++ 4 files changed, 15 insertions(+), 30 deletions(-) delete mode 100644 images/linux/post-generation/rust-permissions.sh diff --git a/images/linux/post-generation/rust-permissions.sh b/images/linux/post-generation/rust-permissions.sh deleted file mode 100644 index aff56ca172a3..000000000000 --- a/images/linux/post-generation/rust-permissions.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash - -# Fix permissions for the Rust folder -# https://github.com/actions/virtual-environments/issues/572 - -rust_folder="/usr/share/rust" -rust_user=$(cut -d: -f1 /etc/passwd | tail -1) - -if [ -d "$rust_folder" ]; then - rust_folder_owner=$(ls -ld $rust_folder | awk '{print $3}') - if [ "$rust_user" != "$rust_folder_owner" ]; then - chown "$rust_user":docker -R $rust_folder - fi -fi diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Rust.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Rust.psm1 index f5f25a39365d..a556bf4c88c5 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Rust.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Rust.psm1 @@ -1,6 +1,7 @@ function Initialize-RustEnvironment { - ln -sf "/usr/share/rust/.rustup" $HOME/.rustup - ln -sf "/usr/share/rust/.cargo" $HOME/.cargo + $env:PATH = "/etc/skel/.cargo/bin:/etc/skel/.rustup/bin:$($env:PATH)" + $env:RUSTUP_HOME = "/etc/skel/.rustup" + $env:CARGO_HOME = "/etc/skel/.cargo" } function Get-RustVersion { @@ -52,4 +53,4 @@ function Get-RustdocVersion { function Get-RustfmtVersion { $rustfmtVersion = $(rustfmt --version) | Take-OutputPart -Part 1 | Take-OutputPart -Part 0 -Delimiter "-" return "Rustfmt $rustfmtVersion" -} \ No newline at end of file +} diff --git a/images/linux/scripts/installers/rust.sh b/images/linux/scripts/installers/rust.sh index a611183c4c6f..123c0362e971 100644 --- a/images/linux/scripts/installers/rust.sh +++ b/images/linux/scripts/installers/rust.sh @@ -7,8 +7,8 @@ # Source the helpers for use with the script source $HELPER_SCRIPTS/etc-environment.sh -export RUSTUP_HOME=/usr/share/rust/.rustup -export CARGO_HOME=/usr/share/rust/.cargo +export RUSTUP_HOME=/etc/skel/.rustup +export CARGO_HOME=/etc/skel/.cargo curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain=stable --profile=minimal @@ -19,19 +19,10 @@ source $CARGO_HOME/env rustup component add rustfmt clippy cargo install --locked bindgen cbindgen cargo-audit cargo-outdated -# Permissions -chmod -R 777 $(dirname $RUSTUP_HOME) - # Cleanup Cargo cache rm -rf ${CARGO_HOME}/registry/* # Update /etc/environemnt -prependEtcEnvironmentPath "${CARGO_HOME}/bin" - -# Rust Symlinks are added to a default profile /etc/skel -pushd /etc/skel -ln -sf $RUSTUP_HOME .rustup -ln -sf $CARGO_HOME .cargo -popd +prependEtcEnvironmentPath '$HOME/.cargo/bin' -invoke_tests "Tools" "Rust" \ No newline at end of file +invoke_tests "Tools" "Rust" diff --git a/images/linux/scripts/tests/Tools.Tests.ps1 b/images/linux/scripts/tests/Tools.Tests.ps1 index 6cfbc01f27b8..56596be32f2c 100644 --- a/images/linux/scripts/tests/Tools.Tests.ps1 +++ b/images/linux/scripts/tests/Tools.Tests.ps1 @@ -15,6 +15,13 @@ Describe "Bicep" { } Describe "Rust" { + BeforeAll { + $env:PATH = "/etc/skel/.cargo/bin:/etc/skel/.rustup/bin:$($env:PATH)" + $env:RUSTUP_HOME = "/etc/skel/.rustup" + $env:CARGO_HOME = "/etc/skel/.cargo" + } + + It "Rustup is installed" { "rustup --version" | Should -ReturnZeroExitCode } From 978ab79564cafd23e31f7bcc76fe4126aed38230 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Fri, 26 Nov 2021 17:49:05 +0300 Subject: [PATCH 0778/3485] [Windows] Invoke Move-Item and Rename-Item with retry after Extract-7Zip (#4598) --- .../scripts/ImageHelpers/ImageHelpers.psm1 | 1 + .../scripts/ImageHelpers/InstallHelpers.ps1 | 26 +++++++++++++++++++ .../scripts/Installers/Install-AndroidSDK.ps1 | 8 +++--- .../scripts/Installers/Install-JavaTools.ps1 | 4 ++- .../scripts/Installers/Install-MysqlCli.ps1 | 4 ++- .../win/scripts/Installers/Install-PyPy.ps1 | 4 ++- .../win/scripts/Installers/Install-Ruby.ps1 | 4 ++- 7 files changed, 44 insertions(+), 7 deletions(-) diff --git a/images/win/scripts/ImageHelpers/ImageHelpers.psm1 b/images/win/scripts/ImageHelpers/ImageHelpers.psm1 index bf7438f769c9..b6545dec361b 100644 --- a/images/win/scripts/ImageHelpers/ImageHelpers.psm1 +++ b/images/win/scripts/ImageHelpers/ImageHelpers.psm1 @@ -43,6 +43,7 @@ Export-ModuleMember -Function @( 'Get-WhichTool' 'Get-EnvironmentVariable' 'Invoke-PesterTests' + 'Invoke-SBWithRetry' 'Get-VsCatalogJsonPath' 'Install-AndroidSDKPackages' 'Get-AndroidPackages' diff --git a/images/win/scripts/ImageHelpers/InstallHelpers.ps1 b/images/win/scripts/ImageHelpers/InstallHelpers.ps1 index 0791b7f3088b..eddac73daf28 100644 --- a/images/win/scripts/ImageHelpers/InstallHelpers.ps1 +++ b/images/win/scripts/ImageHelpers/InstallHelpers.ps1 @@ -533,3 +533,29 @@ function Get-WindowsUpdatesHistory { } } } + +function Invoke-SBWithRetry { + param ( + [scriptblock] $Command, + [int] $RetryCount = 10, + [int] $TimeoutInSecs = 5 + ) + + while ($RetryCount -gt 0) { + try { + & $Command + return + } + catch { + Write-Host "There is an error encounterd:`n $_" + $RetryCount-- + + if ($RetryCount -eq 0) { + exit 1 + } + + Write-Host "Waiting $TimeoutInSecs seconds before retrying. Retries left: $RetryCount" + Start-Sleep -Seconds $TimeoutInSecs + } + } +} diff --git a/images/win/scripts/Installers/Install-AndroidSDK.ps1 b/images/win/scripts/Installers/Install-AndroidSDK.ps1 index 427614d9ae7c..dfb163cf1026 100644 --- a/images/win/scripts/Installers/Install-AndroidSDK.ps1 +++ b/images/win/scripts/Installers/Install-AndroidSDK.ps1 @@ -8,11 +8,13 @@ $cmdlineToolsUrl = "https://dl.google.com/android/repository/commandlinetools-wi $cmdlineToolsArchPath = Start-DownloadWithRetry -Url $cmdlineToolsUrl -Name "cmdline-tools.zip" $sdkInstallRoot = "C:\Program Files (x86)\Android\android-sdk" $sdkRoot = "C:\Android\android-sdk" -Expand-Archive -Path $cmdlineToolsArchPath -DestinationPath "${sdkInstallRoot}\cmdline-tools" -Force +Extract-7Zip -Path $cmdlineToolsArchPath -DestinationPath "${sdkInstallRoot}\cmdline-tools" # cmdline tools should be installed in ${sdkInstallRoot}\cmdline-tools\latest\bin, but archive contains ${sdkInstallRoot}\cmdline-tools\bin # we need to create the proper folder structure -Rename-Item "${sdkInstallRoot}\cmdline-tools\cmdline-tools" "latest" +Invoke-SBWithRetry -Command { + Rename-Item "${sdkInstallRoot}\cmdline-tools\cmdline-tools" "latest" -ErrorAction Stop +} # ANDROID_NDK_PATH/HOME should not contain spaces. Otherwise, the script ndk-build.cmd gives an error https://github.com/actions/virtual-environments/issues/1122 # create "C:\Android" directory and a hardlink inside pointed to sdk in Program Files @@ -33,7 +35,7 @@ $sdkManager = "$sdkRoot\cmdline-tools\latest\bin\sdkmanager.bat" $licenseContentBase64 = "UEsDBBQAAAAAAKNK11IAAAAAAAAAAAAAAAAJAAAAbGljZW5zZXMvUEsDBAoAAAAAAJ1K11K7n0IrKgAAACoAAAAhAAAAbGljZW5zZXMvYW5kcm9pZC1nb29nbGV0di1saWNlbnNlDQo2MDEwODViOTRjZDc3ZjBiNTRmZjg2NDA2OTU3MDk5ZWJlNzljNGQ2UEsDBAoAAAAAAKBK11LzQumJKgAAACoAAAAkAAAAbGljZW5zZXMvYW5kcm9pZC1zZGstYXJtLWRidC1saWNlbnNlDQo4NTlmMzE3Njk2ZjY3ZWYzZDdmMzBhNTBhNTU2MGU3ODM0YjQzOTAzUEsDBAoAAAAAAKFK11IKSOJFKgAAACoAAAAcAAAAbGljZW5zZXMvYW5kcm9pZC1zZGstbGljZW5zZQ0KMjQzMzNmOGE2M2I2ODI1ZWE5YzU1MTRmODNjMjgyOWIwMDRkMWZlZVBLAwQKAAAAAACiStdSec1a4SoAAAAqAAAAJAAAAGxpY2Vuc2VzL2FuZHJvaWQtc2RrLXByZXZpZXctbGljZW5zZQ0KODQ4MzFiOTQwOTY0NmE5MThlMzA1NzNiYWI0YzljOTEzNDZkOGFiZFBLAwQKAAAAAACiStdSk6vQKCoAAAAqAAAAGwAAAGxpY2Vuc2VzL2dvb2dsZS1nZGstbGljZW5zZQ0KMzNiNmEyYjY0NjA3ZjExYjc1OWYzMjBlZjlkZmY0YWU1YzQ3ZDk3YVBLAwQKAAAAAACiStdSrE3jESoAAAAqAAAAJAAAAGxpY2Vuc2VzL2ludGVsLWFuZHJvaWQtZXh0cmEtbGljZW5zZQ0KZDk3NWY3NTE2OThhNzdiNjYyZjEyNTRkZGJlZWQzOTAxZTk3NmY1YVBLAwQKAAAAAACjStdSkb1vWioAAAAqAAAAJgAAAGxpY2Vuc2VzL21pcHMtYW5kcm9pZC1zeXNpbWFnZS1saWNlbnNlDQplOWFjYWI1YjVmYmI1NjBhNzJjZmFlY2NlODk0Njg5NmZmNmFhYjlkUEsBAj8AFAAAAAAAo0rXUgAAAAAAAAAAAAAAAAkAJAAAAAAAAAAQAAAAAAAAAGxpY2Vuc2VzLwoAIAAAAAAAAQAYACIHOBcRaNcBIgc4FxFo1wHBTVQTEWjXAVBLAQI/AAoAAAAAAJ1K11K7n0IrKgAAACoAAAAhACQAAAAAAAAAIAAAACcAAABsaWNlbnNlcy9hbmRyb2lkLWdvb2dsZXR2LWxpY2Vuc2UKACAAAAAAAAEAGACUEFUTEWjXAZQQVRMRaNcB6XRUExFo1wFQSwECPwAKAAAAAACgStdS80LpiSoAAAAqAAAAJAAkAAAAAAAAACAAAACQAAAAbGljZW5zZXMvYW5kcm9pZC1zZGstYXJtLWRidC1saWNlbnNlCgAgAAAAAAABABgAsEM0FBFo1wGwQzQUEWjXAXb1MxQRaNcBUEsBAj8ACgAAAAAAoUrXUgpI4kUqAAAAKgAAABwAJAAAAAAAAAAgAAAA/AAAAGxpY2Vuc2VzL2FuZHJvaWQtc2RrLWxpY2Vuc2UKACAAAAAAAAEAGAAsMGUVEWjXASwwZRURaNcB5whlFRFo1wFQSwECPwAKAAAAAACiStdSec1a4SoAAAAqAAAAJAAkAAAAAAAAACAAAABgAQAAbGljZW5zZXMvYW5kcm9pZC1zZGstcHJldmlldy1saWNlbnNlCgAgAAAAAAABABgA7s3WFRFo1wHuzdYVEWjXAfGm1hURaNcBUEsBAj8ACgAAAAAAokrXUpOr0CgqAAAAKgAAABsAJAAAAAAAAAAgAAAAzAEAAGxpY2Vuc2VzL2dvb2dsZS1nZGstbGljZW5zZQoAIAAAAAAAAQAYAGRDRxYRaNcBZENHFhFo1wFfHEcWEWjXAVBLAQI/AAoAAAAAAKJK11KsTeMRKgAAACoAAAAkACQAAAAAAAAAIAAAAC8CAABsaWNlbnNlcy9pbnRlbC1hbmRyb2lkLWV4dHJhLWxpY2Vuc2UKACAAAAAAAAEAGADGsq0WEWjXAcayrRYRaNcBxrKtFhFo1wFQSwECPwAKAAAAAACjStdSkb1vWioAAAAqAAAAJgAkAAAAAAAAACAAAACbAgAAbGljZW5zZXMvbWlwcy1hbmRyb2lkLXN5c2ltYWdlLWxpY2Vuc2UKACAAAAAAAAEAGAA4LjgXEWjXATguOBcRaNcBIgc4FxFo1wFQSwUGAAAAAAgACACDAwAACQMAAAAA" $licenseContent = [System.Convert]::FromBase64String($licenseContentBase64) Set-Content -Path "$sdkInstallRoot\android-sdk-licenses.zip" -Value $licenseContent -Encoding Byte -Expand-Archive "$sdkInstallRoot\android-sdk-licenses.zip" $sdkInstallRoot +Extract-7Zip -Path "$sdkInstallRoot\android-sdk-licenses.zip" -DestinationPath $sdkInstallRoot # install platform-tools $platformToolsPath = Join-Path -Path $sdkInstallRoot -ChildPath "platform-tools" diff --git a/images/win/scripts/Installers/Install-JavaTools.ps1 b/images/win/scripts/Installers/Install-JavaTools.ps1 index 4a798a7c71b3..7f8492ef0a67 100644 --- a/images/win/scripts/Installers/Install-JavaTools.ps1 +++ b/images/win/scripts/Installers/Install-JavaTools.ps1 @@ -92,7 +92,9 @@ function Install-JavaJDK { # Complete the installation by extarcting Java binaries to toolcache and creating the complete file Extract-7Zip -Path $archivePath -DestinationPath $javaVersionPath - Get-ChildItem -Path $javaVersionPath | Rename-Item -NewName $javaArchPath + Invoke-SBWithRetry -Command { + Get-ChildItem -Path $javaVersionPath | Rename-Item -NewName $javaArchPath -ErrorAction Stop + } New-Item -ItemType File -Path $javaVersionPath -Name "$Architecture.complete" | Out-Null } diff --git a/images/win/scripts/Installers/Install-MysqlCli.ps1 b/images/win/scripts/Installers/Install-MysqlCli.ps1 index af07d5ad20d5..3feecfb014e9 100644 --- a/images/win/scripts/Installers/Install-MysqlCli.ps1 +++ b/images/win/scripts/Installers/Install-MysqlCli.ps1 @@ -22,7 +22,9 @@ Extract-7Zip -Path $MysqlArchPath -DestinationPath "C:\" # Rename mysql-version to mysql folder $MysqlPath = "C:\mysql" -Rename-Item -Path "C:\mysql-${MysqlFullVersion}-winx64" -NewName $MysqlPath +Invoke-SBWithRetry -Command { + Rename-Item -Path "C:\mysql-${MysqlFullVersion}-winx64" -NewName $MysqlPath -ErrorAction Stop +} # Adding mysql in system environment path Add-MachinePathItem "${MysqlPath}\bin" diff --git a/images/win/scripts/Installers/Install-PyPy.ps1 b/images/win/scripts/Installers/Install-PyPy.ps1 index 6a8f1a9ee82f..dd7d8efb2dd7 100644 --- a/images/win/scripts/Installers/Install-PyPy.ps1 +++ b/images/win/scripts/Installers/Install-PyPy.ps1 @@ -40,7 +40,9 @@ function Install-PyPy New-Item -ItemType Directory -Path $pypyVersionPath -Force | Out-Null Write-Host "Move PyPy '${pythonVersion}' files to '${pypyArchPath}'" - Move-Item -Path $tempFolder -Destination $pypyArchPath | Out-Null + Invoke-SBWithRetry -Command { + Move-Item -Path $tempFolder -Destination $pypyArchPath -ErrorAction Stop | Out-Null + } Write-Host "Install PyPy '${pythonVersion}' in '${pypyArchPath}'" if (Test-Path "$pypyArchPath\python.exe") { diff --git a/images/win/scripts/Installers/Install-Ruby.ps1 b/images/win/scripts/Installers/Install-Ruby.ps1 index caf539500937..b1d269e7d306 100644 --- a/images/win/scripts/Installers/Install-Ruby.ps1 +++ b/images/win/scripts/Installers/Install-Ruby.ps1 @@ -69,7 +69,9 @@ function Install-Ruby New-Item -ItemType Directory -Path $rubyVersionPath -Force | Out-Null Write-Host "Moving Ruby '${rubyVersion}' files to '${rubyArchPath}'" - Move-Item -Path $tempFolder -Destination $rubyArchPath | Out-Null + Invoke-SBWithRetry -Command { + Move-Item -Path $tempFolder -Destination $rubyArchPath -ErrorAction Stop | Out-Null + } Write-Host "Removing Ruby '${rubyVersion}' documentation '${rubyArchPath}\share\doc' folder" Remove-Item -Path "${rubyArchPath}\share\doc" -Force -Recurse -ErrorAction Ignore From 3063eac71258e748f9a952f4a7f6e1c3ab5f6eed Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Fri, 26 Nov 2021 20:37:33 +0300 Subject: [PATCH 0779/3485] Revert "Add WiX v3 to Windows 2022. (#4448)" (#4604) This reverts commit 4672cb208d045a5a6fb0083a0baed1da88af9e68. --- images/win/scripts/Installers/Install-Wix.ps1 | 22 +++++++++++++++++- .../SoftwareReport.Generator.ps1 | 1 - .../SoftwareReport/SoftwareReport.Tools.psm1 | 6 ----- .../SoftwareReport.VisualStudio.psm1 | 15 ++++++++++++ images/win/scripts/Tests/Tools.Tests.ps1 | 6 ----- images/win/scripts/Tests/Wix.Tests.ps1 | 23 +++++++++++++++++++ images/win/windows2022.json | 1 - 7 files changed, 59 insertions(+), 15 deletions(-) create mode 100644 images/win/scripts/Tests/Wix.Tests.ps1 diff --git a/images/win/scripts/Installers/Install-Wix.ps1 b/images/win/scripts/Installers/Install-Wix.ps1 index 60d3e0e688ef..192c19b42ca4 100644 --- a/images/win/scripts/Installers/Install-Wix.ps1 +++ b/images/win/scripts/Installers/Install-Wix.ps1 @@ -5,4 +5,24 @@ Choco-Install -PackageName wixtoolset -ArgumentList "--force" -Invoke-PesterTests -TestFile "Tools" -TestName "WiX" +if (Test-IsWin19) +{ + $extensionUrl = "https://wixtoolset.gallerycdn.vsassets.io/extensions/wixtoolset/wixtoolsetvisualstudio2019extension/1.0.0.4/1563296438961/Votive2019.vsix" + $VSver = "2019" +} +elseif (Test-IsWin16) +{ + $extensionUrl = "https://robmensching.gallerycdn.vsassets.io/extensions/robmensching/wixtoolsetvisualstudio2017extension/0.9.21.62588/1494013210879/250616/4/Votive2017.vsix" + $VSver = "2017" +} +else +{ + throw "Invalid version of Visual Studio is found. Either 2017 or 2019 are required" +} + +$extensionName = "Votive$VSver.vsix" + +#Installing VS extension 'Wix Toolset Visual Studio Extension' +Install-VsixExtension -Url $extensionUrl -Name $extensionName -VSversion $VSver + +Invoke-PesterTests -TestFile "Wix" diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index e0c34b245745..f9d1f17e6267 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -114,7 +114,6 @@ $toolsList = @( (Get-VSWhereVersion), (Get-SwigVersion), (Get-WinAppDriver), - (Get-WixVersion), (Get-ZstdVersion), (Get-YAMLLintVersion) ) diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 index 515acb322abb..f0cc9b546bc4 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 @@ -161,12 +161,6 @@ function Get-WinAppDriver { return "WinAppDriver $winAppDriverVersion" } -function Get-WixVersion { - $regKey = "HKLM:\Software\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall\*" - $installedApplications = Get-ItemProperty -Path $regKey - return ($installedApplications | Where-Object { $_.BundleCachePath -imatch ".*\\WiX\d*\.exe$" } | Select-Object -First 1).DisplayName -} - function Get-ZstdVersion { $(zstd --version) -match "v(?<version>\d+\.\d+\.\d+)" | Out-Null $zstdVersion = $Matches.Version diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.VisualStudio.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.VisualStudio.psm1 index 37a8825595cf..341c5dc4419f 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.VisualStudio.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.VisualStudio.psm1 @@ -13,6 +13,12 @@ function Get-SDKVersion { ($installedApplications | Where-Object { $_.DisplayName -eq 'Windows SDK' } | Select-Object -First 1).DisplayVersion } +function Get-WixVersion { + $regKey = "HKLM:\Software\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall\*" + $installedApplications = Get-ItemProperty -Path $regKey + ($installedApplications | Where-Object { $_.DisplayName -match "wix" } | Select-Object -First 1).DisplayVersion +} + function Get-WDKVersion { $regKey = "HKLM:\Software\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall\*" $installedApplications = Get-ItemProperty -Path $regKey @@ -61,6 +67,14 @@ function Get-VisualStudioExtensions { } if ((Test-IsWin16) -or (Test-IsWin19)) { + # Wix + $wixPackageVersion = Get-WixVersion + $wixExtensionVersion = ($vsPackages | Where-Object {$_.Id -match 'WixToolset.VisualStudioExtension.Dev' -and $_.type -eq 'vsix'}).Version + $wixPackages = @( + @{Package = 'WIX Toolset'; Version = $wixPackageVersion} + @{Package = "WIX Toolset Studio $vs Extension"; Version = $wixExtensionVersion} + ) + # WDK $wdkPackageVersion = Get-VSExtensionVersion -packageName 'Microsoft.Windows.DriverKit' $wdkExtensionVersion = Get-WDKVersion @@ -75,6 +89,7 @@ function Get-VisualStudioExtensions { $vsixs $ssdtPackages $sdkPackages + $wixPackages $wdkPackages ) diff --git a/images/win/scripts/Tests/Tools.Tests.ps1 b/images/win/scripts/Tests/Tools.Tests.ps1 index dfbd0c078f01..27ba0da895f7 100644 --- a/images/win/scripts/Tests/Tools.Tests.ps1 +++ b/images/win/scripts/Tests/Tools.Tests.ps1 @@ -182,12 +182,6 @@ Describe "WebPlatformInstaller" -Skip:(Test-IsWin22) { } } -Describe "WiX" { - It "WiX directory exists" { - $env:WIX | Should -Exist - } -} - Describe "Zstd" { It "zstd" { "zstd -V" | Should -ReturnZeroExitCode diff --git a/images/win/scripts/Tests/Wix.Tests.ps1 b/images/win/scripts/Tests/Wix.Tests.ps1 new file mode 100644 index 000000000000..ed9bed384e21 --- /dev/null +++ b/images/win/scripts/Tests/Wix.Tests.ps1 @@ -0,0 +1,23 @@ +Describe "Wix" -Skip:(Test-IsWin22) { + BeforeAll { + $regKey = "HKLM:\Software\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall\*" + $installedApplications = Get-ItemProperty -Path $regKey + $version = ($installedApplications | Where-Object { $_.DisplayName -and $_.DisplayName.toLower().Contains("wix") } | Select-Object -First 1).DisplayVersion + } + + It "Wix Toolset version from registry" { + $version | Should -Not -BeNullOrEmpty + } + + It "Wix Toolset version from system" { + if (Test-IsWin19) + { + $exVersion = Get-VSExtensionVersion -packageName "WixToolset.VisualStudioExtension.Dev16" + } + else + { + $exVersion = Get-VSExtensionVersion -packageName "WixToolset.VisualStudioExtension.Dev15" + } + $exVersion | Should -Not -BeNullOrEmpty + } +} diff --git a/images/win/windows2022.json b/images/win/windows2022.json index 948afff76656..fc30ef0fb212 100644 --- a/images/win/windows2022.json +++ b/images/win/windows2022.json @@ -168,7 +168,6 @@ { "type": "powershell", "scripts": [ - "{{ template_dir }}/scripts/Installers/Install-Wix.ps1", "{{ template_dir }}/scripts/Installers/Install-Vsix.ps1", "{{ template_dir }}/scripts/Installers/Install-AzureCli.ps1", "{{ template_dir }}/scripts/Installers/Install-AzureDevOpsCli.ps1", From cb93e86daf5d16554536d5fad7217928239700f1 Mon Sep 17 00:00:00 2001 From: V-Zabayrachny <79155496+V-Zabayrachny@users.noreply.github.com> Date: Fri, 26 Nov 2021 22:26:18 +0300 Subject: [PATCH 0780/3485] [Ubuntu] Update the version Git-lfs (#4607) --- images/linux/scripts/installers/git.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/linux/scripts/installers/git.sh b/images/linux/scripts/installers/git.sh index 24baeb3fdca2..d878862cbc93 100644 --- a/images/linux/scripts/installers/git.sh +++ b/images/linux/scripts/installers/git.sh @@ -18,7 +18,7 @@ git --version # Install git-lfs curl -s $GIT_LFS_REPO/script.deb.sh | bash -apt-get install -y git-lfs=2.13.3 +apt-get install -y git-lfs # Install git-ftp apt-get install git-ftp -y From 340b210bd148ad566675062399cefbad224d713f Mon Sep 17 00:00:00 2001 From: Nikolay Frolov <90333448+nikolai-frolov@users.noreply.github.com> Date: Sat, 27 Nov 2021 12:40:37 +0300 Subject: [PATCH 0781/3485] [Windows] Add gulp-cli npm package (#4601) --- images/win/toolsets/toolset-2022.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index a99f6da5f751..5b06743daa8b 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -264,7 +264,8 @@ "global_packages": [ { "name": "yarn", "test": "yarn --version" }, { "name": "newman", "test": "newman --version" }, - { "name": "lerna", "test": "lerna --version" } + { "name": "lerna", "test": "lerna --version" }, + { "name": "gulp-cli", "test": "gulp --version" } ] }, "dotnet": { From 884d3e799d55768e87f516a6990514f93820e71a Mon Sep 17 00:00:00 2001 From: Nikolay Frolov <90333448+nikolai-frolov@users.noreply.github.com> Date: Mon, 29 Nov 2021 18:54:51 +0300 Subject: [PATCH 0782/3485] [Windows] Add WiX tool for Windows 2022 (#4624) --- images/win/scripts/Installers/Install-Wix.ps1 | 13 ++++++------- .../SoftwareReport/SoftwareReport.Generator.ps1 | 1 + .../SoftwareReport/SoftwareReport.Tools.psm1 | 6 ++++++ .../SoftwareReport/SoftwareReport.VisualStudio.psm1 | 8 -------- images/win/scripts/Tests/Wix.Tests.ps1 | 6 +++--- images/win/windows2022.json | 1 + 6 files changed, 17 insertions(+), 18 deletions(-) diff --git a/images/win/scripts/Installers/Install-Wix.ps1 b/images/win/scripts/Installers/Install-Wix.ps1 index 192c19b42ca4..5758cfc73eb0 100644 --- a/images/win/scripts/Installers/Install-Wix.ps1 +++ b/images/win/scripts/Installers/Install-Wix.ps1 @@ -15,14 +15,13 @@ elseif (Test-IsWin16) $extensionUrl = "https://robmensching.gallerycdn.vsassets.io/extensions/robmensching/wixtoolsetvisualstudio2017extension/0.9.21.62588/1494013210879/250616/4/Votive2017.vsix" $VSver = "2017" } -else -{ - throw "Invalid version of Visual Studio is found. Either 2017 or 2019 are required" -} -$extensionName = "Votive$VSver.vsix" +if (-not (Test-IsWin22)) +{ + $extensionName = "Votive$VSver.vsix" -#Installing VS extension 'Wix Toolset Visual Studio Extension' -Install-VsixExtension -Url $extensionUrl -Name $extensionName -VSversion $VSver + #Installing VS extension 'Wix Toolset Visual Studio Extension' + Install-VsixExtension -Url $extensionUrl -Name $extensionName -VSversion $VSver +} Invoke-PesterTests -TestFile "Wix" diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index f9d1f17e6267..e0c34b245745 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -114,6 +114,7 @@ $toolsList = @( (Get-VSWhereVersion), (Get-SwigVersion), (Get-WinAppDriver), + (Get-WixVersion), (Get-ZstdVersion), (Get-YAMLLintVersion) ) diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 index f0cc9b546bc4..515acb322abb 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 @@ -161,6 +161,12 @@ function Get-WinAppDriver { return "WinAppDriver $winAppDriverVersion" } +function Get-WixVersion { + $regKey = "HKLM:\Software\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall\*" + $installedApplications = Get-ItemProperty -Path $regKey + return ($installedApplications | Where-Object { $_.BundleCachePath -imatch ".*\\WiX\d*\.exe$" } | Select-Object -First 1).DisplayName +} + function Get-ZstdVersion { $(zstd --version) -match "v(?<version>\d+\.\d+\.\d+)" | Out-Null $zstdVersion = $Matches.Version diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.VisualStudio.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.VisualStudio.psm1 index 341c5dc4419f..dc3dc031d106 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.VisualStudio.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.VisualStudio.psm1 @@ -13,12 +13,6 @@ function Get-SDKVersion { ($installedApplications | Where-Object { $_.DisplayName -eq 'Windows SDK' } | Select-Object -First 1).DisplayVersion } -function Get-WixVersion { - $regKey = "HKLM:\Software\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall\*" - $installedApplications = Get-ItemProperty -Path $regKey - ($installedApplications | Where-Object { $_.DisplayName -match "wix" } | Select-Object -First 1).DisplayVersion -} - function Get-WDKVersion { $regKey = "HKLM:\Software\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall\*" $installedApplications = Get-ItemProperty -Path $regKey @@ -68,10 +62,8 @@ function Get-VisualStudioExtensions { if ((Test-IsWin16) -or (Test-IsWin19)) { # Wix - $wixPackageVersion = Get-WixVersion $wixExtensionVersion = ($vsPackages | Where-Object {$_.Id -match 'WixToolset.VisualStudioExtension.Dev' -and $_.type -eq 'vsix'}).Version $wixPackages = @( - @{Package = 'WIX Toolset'; Version = $wixPackageVersion} @{Package = "WIX Toolset Studio $vs Extension"; Version = $wixExtensionVersion} ) diff --git a/images/win/scripts/Tests/Wix.Tests.ps1 b/images/win/scripts/Tests/Wix.Tests.ps1 index ed9bed384e21..7b7f7cdae720 100644 --- a/images/win/scripts/Tests/Wix.Tests.ps1 +++ b/images/win/scripts/Tests/Wix.Tests.ps1 @@ -1,15 +1,15 @@ -Describe "Wix" -Skip:(Test-IsWin22) { +Describe "Wix" { BeforeAll { $regKey = "HKLM:\Software\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall\*" $installedApplications = Get-ItemProperty -Path $regKey - $version = ($installedApplications | Where-Object { $_.DisplayName -and $_.DisplayName.toLower().Contains("wix") } | Select-Object -First 1).DisplayVersion + $version = ($installedApplications | Where-Object { $_.BundleCachePath -imatch ".*\\WiX\d*\.exe$" } | Select-Object -First 1).DisplayName } It "Wix Toolset version from registry" { $version | Should -Not -BeNullOrEmpty } - It "Wix Toolset version from system" { + It "Wix Toolset version from system" -Skip:(Test-IsWin22) { if (Test-IsWin19) { $exVersion = Get-VSExtensionVersion -packageName "WixToolset.VisualStudioExtension.Dev16" diff --git a/images/win/windows2022.json b/images/win/windows2022.json index fc30ef0fb212..948afff76656 100644 --- a/images/win/windows2022.json +++ b/images/win/windows2022.json @@ -168,6 +168,7 @@ { "type": "powershell", "scripts": [ + "{{ template_dir }}/scripts/Installers/Install-Wix.ps1", "{{ template_dir }}/scripts/Installers/Install-Vsix.ps1", "{{ template_dir }}/scripts/Installers/Install-AzureCli.ps1", "{{ template_dir }}/scripts/Installers/Install-AzureDevOpsCli.ps1", From 4e1be8de7f45c302e49a01ba551bc0b1734a60f8 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Mon, 29 Nov 2021 22:05:49 +0300 Subject: [PATCH 0783/3485] [macOS] Upgrade php version to 8.1 (#4631) --- images/macos/toolsets/toolset-10.15.json | 2 +- images/macos/toolsets/toolset-11.json | 2 +- images/macos/toolsets/toolset-12.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index 9532170f044c..74a7eac60289 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -342,7 +342,7 @@ "version": "13" }, "php": { - "version": "8.0" + "version": "8.1" }, "mongodb": { "version": "5.0" diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index a89bc721d148..c87ab23ab13f 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -294,7 +294,7 @@ "version": "13" }, "php": { - "version": "8.0" + "version": "8.1" }, "mongodb": { "version": "5.0" diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index 897456c974bf..bb847a482a62 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -192,7 +192,7 @@ ] }, "php": { - "version": "8.0" + "version": "8.1" }, "mongodb": { "version": "5.0" From 248e6728a3e4549d252c3f3fa2f797d611be7b10 Mon Sep 17 00:00:00 2001 From: Nikolay Frolov <90333448+nikolai-frolov@users.noreply.github.com> Date: Mon, 29 Nov 2021 22:09:02 +0300 Subject: [PATCH 0784/3485] [Windows] Update MySQL version to 5.7.36 (#4632) --- images/win/toolsets/toolset-2016.json | 2 +- images/win/toolsets/toolset-2019.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/images/win/toolsets/toolset-2016.json b/images/win/toolsets/toolset-2016.json index 3e21da8caf12..60b6e8a058b5 100644 --- a/images/win/toolsets/toolset-2016.json +++ b/images/win/toolsets/toolset-2016.json @@ -423,7 +423,7 @@ }, "mysql": { "major_version": "5.7", - "full_version": "5.7.35" + "full_version": "5.7.36" }, "mongodb": { "version": "5.0" diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index 89b18bb3c3b4..f7ad0840a155 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -455,7 +455,7 @@ }, "mysql": { "major_version": "5.7", - "full_version": "5.7.35" + "full_version": "5.7.36" }, "mongodb": { "version": "5.0" From f4306a6c4010513067dd35e5dcf8634112366d38 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Tue, 30 Nov 2021 11:38:03 +0300 Subject: [PATCH 0785/3485] [Windows] zstd: Invoke Move-Item with retry (#4633) --- images/win/scripts/Installers/Install-Zstd.ps1 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/images/win/scripts/Installers/Install-Zstd.ps1 b/images/win/scripts/Installers/Install-Zstd.ps1 index f29ea581383d..0dd403c02dc2 100644 --- a/images/win/scripts/Installers/Install-Zstd.ps1 +++ b/images/win/scripts/Installers/Install-Zstd.ps1 @@ -15,7 +15,9 @@ $filesInArchive = 7z l $zstdArchivePath | Out-String if ($filesInArchive.Contains($zstdParentName)) { Extract-7Zip -Path $zstdArchivePath -DestinationPath $toolPath - Move-Item -Path "${zstdPath}*" -Destination $zstdPath + Invoke-SBWithRetry -Command { + Move-Item -Path "${zstdPath}*" -Destination $zstdPath -ErrorAction Stop + } } else { Extract-7Zip -Path $zstdArchivePath -DestinationPath $zstdPath } From 6f662479c8c173dd5ec118732c3eb2719e4a07a4 Mon Sep 17 00:00:00 2001 From: Sergey Dolin <sergey.dolin@gmail.com> Date: Wed, 1 Dec 2021 12:58:26 +0500 Subject: [PATCH 0786/3485] [macOS] Rebuilding Launch Services database (#4588) --- images/macos/helpers/Xcode.Installer.psm1 | 13 ++++++++++++- images/macos/provision/core/xcode.ps1 | 5 +++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/images/macos/helpers/Xcode.Installer.psm1 b/images/macos/helpers/Xcode.Installer.psm1 index 97d4c132104b..a08ee3b56439 100644 --- a/images/macos/helpers/Xcode.Installer.psm1 +++ b/images/macos/helpers/Xcode.Installer.psm1 @@ -175,6 +175,17 @@ function Build-XcodeSymlinks { } } +function Rebuild-XcodeLaunchServicesDb { + param( + [Parameter(Mandatory)] + [string]$Version + ) + + $xcodePath = Get-XcodeRootPath -Version $Version + $lsregister = '/System/Library/Frameworks/CoreServices.framework/Frameworks/LaunchServices.framework/Support/lsregister' + Get-ChildItem -Recurse -Filter "*.app" $xcodePath | Foreach-Object { & $lsregister -f $_.FullName} +} + function Build-ProvisionatorSymlink { param( [Parameter(Mandatory)] @@ -216,4 +227,4 @@ function Set-XcodeDeveloperDirEnvironmentVariables { Write-Host "Set ${variableName}=${variableValue}" "export ${variableName}=${variableValue}" | Out-File "$env:HOME/.bashrc" -Append } -} \ No newline at end of file +} diff --git a/images/macos/provision/core/xcode.ps1 b/images/macos/provision/core/xcode.ps1 index ab984cd937fe..1f8ce717c497 100644 --- a/images/macos/provision/core/xcode.ps1 +++ b/images/macos/provision/core/xcode.ps1 @@ -51,6 +51,11 @@ $xcodeVersions | ForEach-Object { } } +Write-Host "Rebuilding Launch Services database ..." +$xcodeVersions | ForEach-Object { + Rebuild-XcodeLaunchServicesDb -Version $_.link +} + Write-Host "Setting default Xcode to $defaultXcode" Switch-Xcode -Version $defaultXcode New-Item -Path "/Applications/Xcode.app" -ItemType SymbolicLink -Value (Get-XcodeRootPath -Version $defaultXcode) | Out-Null From 92269a3a22c96240dfb589ee40adc66be12dbba5 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 1 Dec 2021 13:01:53 +0000 Subject: [PATCH 0787/3485] Updating readme file for win19 version 20211229.2 (#4638) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2019-Readme.md | 51 +++++++++++++++++--------------- 1 file changed, 27 insertions(+), 24 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index df0bbef0fb8b..1d7845ca3b24 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -2,13 +2,11 @@ |-| | [Windows Server 2022 with Visual Studio 2022 is generally available starting from November, 15](https://github.com/actions/virtual-environments/issues/4488) | | [[all OSs] Default Nodejs version will be set to 16 on November, 29](https://github.com/actions/virtual-environments/issues/4446) | -| [[all OSs] Selenium server version will be upgraded from 3 to 4 on November, 15](https://github.com/actions/virtual-environments/issues/4376) | -| [[All OSs] Node.js version 10 will be removed from the images on November, 15](https://github.com/actions/virtual-environments/issues/4356) | | [Windows-2016 environment will be removed on March 15, 2022](https://github.com/actions/virtual-environments/issues/4312) | *** # Microsoft Windows Server 2019 Datacenter - OS Version: 10.0.17763 Build 2300 -- Image Version: 20211122.1 +- Image Version: 20211229.2 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -18,9 +16,9 @@ - Bash 4.4.23(1)-release - Go 1.15.15 - Julia 1.6.4 -- Kotlin 1.6.0 +- Kotlin 1.5.32 - LLVM 13.0.0 -- Node 14.18.1 +- Node 16.13.0 - Perl 5.32.1 - PHP 8.0.13 - Python 3.7.9 @@ -31,12 +29,12 @@ - Composer 2.1.12 - Helm 3.7.1 - Miniconda 4.10.3 (pre-installed on the image but not added to PATH) -- NPM 6.14.15 +- NPM 8.1.0 - NuGet 6.0.0.280 - pip 21.3.1 (python 3.7) - Pipx 0.16.4 - RubyGems 2.7.6.3 -- Vcpkg (build from master \<653912591>) +- Vcpkg (build from master \<60a8f7971>) - Yarn 1.22.17 #### Environment variables @@ -52,7 +50,7 @@ - sbt 1.5.5 ### Tools -- 7zip 21.05 +- 7zip 21.06 - aria2 1.36.0 - azcopy 10.13.0 - Bazel 4.2.1 @@ -60,14 +58,14 @@ - Bicep 0.4.1008 - Cabal 3.6.2.0 - CMake 3.22.0 -- CodeQL Action Bundle 2.7.1 +- CodeQL Action Bundle 2.7.2 - Docker 20.10.7 - Docker-compose 1.29.2 - Docker-wincred 0.6.4 - ghc 9.2.1 -- Git 2.34.0 +- Git 2.34.1 - Git LFS 3.0.2 -- Google Cloud SDK 365.0.0 +- Google Cloud SDK 365.0.1 - InnoSetup 6.2.0 - jq 1.6 - Kind 0.11.1 @@ -78,21 +76,21 @@ - NSIS v3.06.1 - OpenSSL 1.1.1 - Packer 1.7.8 -- Pulumi v3.18.0 +- Pulumi v3.18.1 - R 4.1.2 +- Service Fabric SDK 8.2.1235.9590 - Stack 2.7.3 - Subversion (SVN) 1.14.1 - Swig 4.0.2 - VSWhere 2.8.4 - WinAppDriver 1.2.2009.02003 -- WiX Toolset v3.11.2.4516 - yamllint 1.26.3 - zstd 1.5.0 ### CLI Tools - Alibaba Cloud CLI 3.0.99 -- AWS CLI 2.4.0 -- AWS SAM CLI 1.35.0 +- AWS CLI 2.4.2 +- AWS SAM CLI 1.36.0 - AWS Session Manager CLI 1.2.279.0 - Azure CLI 2.30.0 - Azure DevOps CLI extension 0.22.0 @@ -107,7 +105,7 @@ - Rustup 1.24.3 #### Packages -- bindgen 0.59.1 +- bindgen 0.59.2 - cargo-audit 0.16.0 - cargo-outdated v0.10.2 - cbindgen 0.20.0 @@ -117,12 +115,12 @@ ### Browsers and webdrivers - Google Chrome 96.0.4664.45 - Chrome Driver 96.0.4664.45 -- Microsoft Edge 96.0.1054.29 -- Microsoft Edge Driver 96.0.1054.29 -- Mozilla Firefox 94.0.1 +- Microsoft Edge 96.0.1054.34 +- Microsoft Edge Driver 96.0.1054.34 +- Mozilla Firefox 94.0.2 - Gecko Driver 0.30.0 - IE Driver 3.150.1.1 -- Selenium server 4.0.0 +- Selenium server 4.1.0 #### Environment variables | Name | Value | @@ -191,9 +189,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | ------- | ------------ | | 2.4.10 | x64 | | 2.5.9 (Default) | x64 | -| 2.6.8 | x64 | -| 2.7.4 | x64 | -| 3.0.2 | x64 | +| 2.6.9 | x64 | +| 2.7.5 | x64 | +| 3.0.3 | x64 | #### PyPy @@ -270,6 +268,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Component.Unreal | 16.1.28810.153 | | Component.Unreal.Android | 16.1.28810.153 | | Component.VSInstallerProjects | 1.0.0 | +| Component.WixToolset.VisualStudioExtension.Dev16 | 1.0.0.4 | +| Component.WixToolset.VisualStudioExtension.Schemas3 | 1.0.0.4 | +| Component.WixToolset.VisualStudioExtension.Schemas4 | 1.0.0.4 | | Component.Xamarin | 16.10.31205.252 | | Component.Xamarin.RemotedSimulator | 16.10.31205.252 | | Microsoft.Component.Azure.DataLake.Tools | 16.10.31205.252 | @@ -474,6 +475,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Windows Driver Kit | 10.0.21381.0 | | Windows Driver Kit Visual Studio Extension | 10.1.22000.1 | | Windows Software Development Kit Extension | 10.1.22000.194 | +| WIX Toolset | 3.11.4516 | +| WIX Toolset Studio 2019 Extension | 1.0.0.4 | #### Microsoft Visual C++: @@ -535,7 +538,7 @@ All other versions are saved but not installed. | ------------------ | ---------------- | | DockerMsftProvider | 1.0.0.8 | | MarkdownPS | 1.9 | -| Microsoft.Graph | 1.8.0 | +| Microsoft.Graph | 1.9.0 | | Pester | 3.4.0<br>5.3.1 | | PowerShellGet | 1.0.0.1<br>2.2.5 | | PSScriptAnalyzer | 1.20.0 | From 9c7f92e4c3adf2749854d7954df586190efc1084 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 1 Dec 2021 13:07:11 +0000 Subject: [PATCH 0788/3485] Updating readme file for win16 version 20211229.2 (#4637) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2016-Readme.md | 49 ++++++++++++++++---------------- 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/images/win/Windows2016-Readme.md b/images/win/Windows2016-Readme.md index 87209dbbd8e1..4736da1d5751 100644 --- a/images/win/Windows2016-Readme.md +++ b/images/win/Windows2016-Readme.md @@ -2,22 +2,20 @@ |-| | [Windows Server 2022 with Visual Studio 2022 is generally available starting from November, 15](https://github.com/actions/virtual-environments/issues/4488) | | [[all OSs] Default Nodejs version will be set to 16 on November, 29](https://github.com/actions/virtual-environments/issues/4446) | -| [[all OSs] Selenium server version will be upgraded from 3 to 4 on November, 15](https://github.com/actions/virtual-environments/issues/4376) | -| [[All OSs] Node.js version 10 will be removed from the images on November, 15](https://github.com/actions/virtual-environments/issues/4356) | | [Windows-2016 environment will be removed on March 15, 2022](https://github.com/actions/virtual-environments/issues/4312) | *** # Microsoft Windows Server 2016 Datacenter - OS Version: 10.0.14393 Build 4770 -- Image Version: 20211122.1 +- Image Version: 20211229.2 ## Installed Software ### Language and Runtime - Bash 4.4.23(1)-release - Go 1.15.15 - Julia 1.6.4 -- Kotlin 1.6.0 +- Kotlin 1.5.32 - LLVM 13.0.0 -- Node 14.18.1 +- Node 16.13.0 - Perl 5.32.1 - PHP 8.0.13 - Python 3.7.9 @@ -28,12 +26,12 @@ - Composer 2.1.12 - Helm 3.7.1 - Miniconda 4.10.3 (pre-installed on the image but not added to PATH) -- NPM 6.14.15 +- NPM 8.1.0 - NuGet 6.0.0.280 - pip 21.3.1 (python 3.7) - Pipx 0.16.4 - RubyGems 2.7.6.3 -- Vcpkg (build from master \<653912591>) +- Vcpkg (build from master \<60a8f7971>) - Yarn 1.22.17 #### Environment variables @@ -49,7 +47,7 @@ - sbt 1.5.5 ### Tools -- 7zip 21.05 +- 7zip 21.06 - aria2 1.36.0 - azcopy 10.13.0 - Bazel 4.2.1 @@ -57,14 +55,14 @@ - Bicep 0.4.1008 - Cabal 3.6.2.0 - CMake 3.22.0 -- CodeQL Action Bundle 2.7.1 +- CodeQL Action Bundle 2.7.2 - Docker 20.10.7 - Docker-compose 1.29.2 - Docker-wincred 0.6.4 - ghc 9.2.1 -- Git 2.34.0 +- Git 2.34.1 - Git LFS 3.0.2 -- Google Cloud SDK 365.0.0 +- Google Cloud SDK 365.0.1 - InnoSetup 6.2.0 - jq 1.6 - Kind 0.11.1 @@ -75,21 +73,21 @@ - NSIS v3.06.1 - OpenSSL 1.1.1 - Packer 1.7.8 -- Pulumi v3.18.0 +- Pulumi v3.18.1 - R 4.1.2 +- Service Fabric SDK 8.2.1235.9590 - Stack 2.7.3 - Subversion (SVN) 1.14.1 - Swig 4.0.2 - VSWhere 2.8.4 - WinAppDriver 1.2.2009.02003 -- WiX Toolset v3.11.2.4516 - yamllint 1.26.3 - zstd 1.5.0 ### CLI Tools - Alibaba Cloud CLI 3.0.99 -- AWS CLI 2.4.0 -- AWS SAM CLI 1.35.0 +- AWS CLI 2.4.2 +- AWS SAM CLI 1.36.0 - AWS Session Manager CLI 1.2.279.0 - Azure CLI 2.30.0 - Azure DevOps CLI extension 0.22.0 @@ -104,7 +102,7 @@ - Rustup 1.24.3 #### Packages -- bindgen 0.59.1 +- bindgen 0.59.2 - cargo-audit 0.16.0 - cargo-outdated v0.10.2 - cbindgen 0.20.0 @@ -114,12 +112,12 @@ ### Browsers and webdrivers - Google Chrome 96.0.4664.45 - Chrome Driver 96.0.4664.45 -- Microsoft Edge 96.0.1054.29 -- Microsoft Edge Driver 96.0.1054.29 -- Mozilla Firefox 94.0.1 +- Microsoft Edge 96.0.1054.34 +- Microsoft Edge Driver 96.0.1054.34 +- Mozilla Firefox 94.0.2 - Gecko Driver 0.30.0 - IE Driver 3.150.1.1 -- Selenium server 4.0.0 +- Selenium server 4.1.0 #### Environment variables | Name | Value | @@ -185,9 +183,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | ------- | ------------ | | 2.4.10 | x64 | | 2.5.9 (Default) | x64 | -| 2.6.8 | x64 | -| 2.7.4 | x64 | -| 3.0.2 | x64 | +| 2.6.9 | x64 | +| 2.7.5 | x64 | +| 3.0.3 | x64 | #### PyPy @@ -273,6 +271,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Component.UnityEngine.x64 | 15.9.28307.616 | | Component.Unreal | 15.8.27729.1 | | Component.Unreal.Android | 15.9.28307.341 | +| Component.WixToolset.VisualStudioExtension.Dev15 | 0.9.21.62588 | | Component.Xamarin | 15.9.28307.1177 | | Component.Xamarin.Profiler | 15.0.27005.2 | | Component.Xamarin.RemotedSimulator | 15.6.27323.2 | @@ -481,6 +480,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | SSDT SQL Server Integration Services Projects | 2.6.3 | | Windows Driver Kit | 10.0.17740.0 | | Windows Driver Kit Visual Studio Extension | 10.1.17763.1 | +| WIX Toolset | 3.11.4516 | +| WIX Toolset Studio 2017 Extension | 0.9.21.62588 | #### Microsoft Visual C++: @@ -542,7 +543,7 @@ All other versions are saved but not installed. | ------------------ | ---------------- | | DockerMsftProvider | 1.0.0.8 | | MarkdownPS | 1.9 | -| Microsoft.Graph | 1.8.0 | +| Microsoft.Graph | 1.9.0 | | Pester | 3.4.0<br>5.3.1 | | PowerShellGet | 1.0.0.1<br>2.2.5 | | PSScriptAnalyzer | 1.20.0 | From 91d17b91508881963d3b51293219fbb3cb4b5a09 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 2 Dec 2021 06:51:13 +0000 Subject: [PATCH 0789/3485] Updating readme file for ubuntu18 version 20211129.1 (#4626) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu1804-README.md | 47 +++++++++++++++---------------- 1 file changed, 22 insertions(+), 25 deletions(-) diff --git a/images/linux/Ubuntu1804-README.md b/images/linux/Ubuntu1804-README.md index 3a018f2f5aef..525d87e57472 100644 --- a/images/linux/Ubuntu1804-README.md +++ b/images/linux/Ubuntu1804-README.md @@ -1,20 +1,17 @@ | Announcements | |-| | [[all OSs] Default Nodejs version will be set to 16 on November, 29](https://github.com/actions/virtual-environments/issues/4446) | -| [[all OSs] Selenium server version will be upgraded from 3 to 4 on November, 15](https://github.com/actions/virtual-environments/issues/4376) | -| [[Ubuntu] Node:10 docker images will be removed on November, 15](https://github.com/actions/virtual-environments/issues/4357) | -| [[All OSs] Node.js version 10 will be removed from the images on November, 15](https://github.com/actions/virtual-environments/issues/4356) | *** # Ubuntu 18.04.6 LTS - Linux kernel version: 5.4.0-1063-azure -- Image Version: 20211122.1 +- Image Version: 20211129.1 ## Installed Software ### Language and Runtime - Bash 4.4.20(1)-release - Clang 9.0.0 - Clang-format 9.0.0 -- Erlang 24.1.5 (Eshell 12.1.5) +- Erlang 24.1.6 (Eshell 12.1.5) - Erlang rebar3 3.17.0 - GNU C++ 7.5.0, 9.4.0, 10.3.0 - GNU Fortran 7.5.0, 9.4.0, 10.3.0 @@ -22,7 +19,7 @@ - Kotlin 1.6.0-release-798 - Mono 6.12.0.122 (apt source repository: https://download.mono-project.com/repo/ubuntu stable-bionic main) - MSBuild 16.6.0.15201 (from /usr/lib/mono/msbuild/15.0/bin/MSBuild.dll) -- Node 14.18.1 +- Node 16.13.0 - Perl 5.26.1 - Python 2.7.17 - Python3 3.6.9 @@ -32,14 +29,14 @@ ### Package Management - cpan 1.64 - Helm 3.7.1 -- Homebrew 3.3.4 +- Homebrew 3.3.5 - Miniconda 4.10.3 -- Npm 6.14.15 +- Npm 8.1.0 - Pip 9.0.1 - Pip3 9.0.1 - Pipx 0.16.4 - RubyGems 2.7.6 -- Vcpkg (build from master \<653912591>) +- Vcpkg (build from master \<3a68454af>) - Yarn 1.22.17 #### Environment variables @@ -63,18 +60,18 @@ - Bicep 0.4.1008 - Buildah 1.19.6 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - CMake 3.22.0 -- CodeQL Action Bundle 2.7.1 +- CodeQL Action Bundle 2.7.2 - Docker Compose v1 1.29.2 - Docker Compose v2 2.1.1+azure-1 - Docker-Buildx 0.7.0 - Docker-Moby Client 20.10.11+azure-1 - Docker-Moby Server 20.10.11+azure-1 -- Git 2.34.0 (apt source repository: ppa:git-core/ppa) -- Git LFS 2.13.3 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) +- Git 2.34.1 (apt source repository: ppa:git-core/ppa) +- Git LFS 3.0.2 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.3.1 - Haveged 1.9.1 - Heroku 7.59.2 -- HHVM (HipHop VM) 4.136.0 +- HHVM (HipHop VM) 4.137.0 - jq 1.5 - Kind 0.11.1 - Kubectl 1.22.4 @@ -90,28 +87,28 @@ - Packer 1.7.8 - PhantomJS 2.1.1 - Podman 3.0.1 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- Pulumi 3.18.0 +- Pulumi 3.18.1 - R 4.1.2 - Skopeo 1.2.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 - SVN 1.9.7 - Terraform 1.0.11 - yamllint 1.26.3 -- yq 4.14.2 +- yq 4.15.1 - zstd 1.5.0 (homebrew) ### CLI Tools - Alibaba Cloud CLI 3.0.99 -- AWS CLI 1.22.10 +- AWS CLI 1.22.14 - AWS CLI Session manager plugin 1.2.279.0 -- AWS SAM CLI 1.35.0 +- AWS SAM CLI 1.36.0 - Azure CLI (azure-cli) 2.30.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.22.0 - GitHub CLI 2.2.0 -- Google Cloud SDK 365.0.0 (apt source repository: https://packages.cloud.google.com/apt) +- Google Cloud SDK 365.0.1 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 7.0.2 -- OpenShift CLI 4.9.7 +- Netlify CLI 8.0.3 +- OpenShift CLI 4.9.8 - ORAS CLI 0.12.0 - Vercel CLI 23.1.2 @@ -144,7 +141,7 @@ - Rustup 1.24.3 #### Packages -- Bindgen 0.59.1 +- Bindgen 0.59.2 - Cargo audit 0.16.0 - Cargo clippy 0.1.56 - Cargo outdated 0.10.2 @@ -157,7 +154,7 @@ - Mozilla Firefox 94.0 - Geckodriver 0.30.0 - Chromium 96.0.4664.0 -- Selenium server 4.0.0 +- Selenium server 4.1.0 #### Environment variables | Name | Value | @@ -212,9 +209,9 @@ #### Ruby - 2.4.10 - 2.5.9 -- 2.6.8 -- 2.7.4 -- 3.0.2 +- 2.6.9 +- 2.7.5 +- 3.0.3 #### Environment variables | Name | Value | Architecture | From d0f20ddfa317289a4875d0c6916b285e8ebf8ca3 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 2 Dec 2021 06:53:16 +0000 Subject: [PATCH 0790/3485] Updating readme file for ubuntu20 version 20211129.1 (#4625) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2004-README.md | 49 +++++++++++++++---------------- 1 file changed, 23 insertions(+), 26 deletions(-) diff --git a/images/linux/Ubuntu2004-README.md b/images/linux/Ubuntu2004-README.md index 30d4641820c8..95ef79736a04 100644 --- a/images/linux/Ubuntu2004-README.md +++ b/images/linux/Ubuntu2004-README.md @@ -1,20 +1,17 @@ | Announcements | |-| | [[all OSs] Default Nodejs version will be set to 16 on November, 29](https://github.com/actions/virtual-environments/issues/4446) | -| [[all OSs] Selenium server version will be upgraded from 3 to 4 on November, 15](https://github.com/actions/virtual-environments/issues/4376) | -| [[Ubuntu] Node:10 docker images will be removed on November, 15](https://github.com/actions/virtual-environments/issues/4357) | -| [[All OSs] Node.js version 10 will be removed from the images on November, 15](https://github.com/actions/virtual-environments/issues/4356) | *** # Ubuntu 20.04.3 LTS - Linux kernel version: 5.11.0-1021-azure -- Image Version: 20211122.1 +- Image Version: 20211129.1 ## Installed Software ### Language and Runtime - Bash 5.0.17(1)-release - Clang 10.0.0, 11.0.0, 12.0.0 - Clang-format 10.0.0, 11.0.0, 12.0.0 -- Erlang 24.1.5 (Eshell 12.1.5) +- Erlang 24.1.6 (Eshell 12.1.5) - Erlang rebar3 3.17.0 - GNU C++ 9.3.0, 10.3.0 - GNU Fortran 9.3.0, 10.3.0 @@ -22,7 +19,7 @@ - Kotlin 1.6.0-release-798 - Mono 6.12.0.122 (apt source repository: https://download.mono-project.com/repo/ubuntu stable-focal main) - MSBuild 16.6.0.15201 (from /usr/lib/mono/msbuild/15.0/bin/MSBuild.dll) -- Node 14.18.1 +- Node 16.13.0 - Perl 5.30.0 - Python 3.8.10 - Python3 3.8.10 @@ -32,14 +29,14 @@ ### Package Management - cpan 1.64 - Helm 3.7.1 -- Homebrew 3.3.4 +- Homebrew 3.3.5 - Miniconda 4.10.3 -- Npm 6.14.15 +- Npm 8.1.0 - Pip 20.0.2 - Pip3 20.0.2 - Pipx 0.16.4 - RubyGems 3.1.2 -- Vcpkg (build from master \<653912591>) +- Vcpkg (build from master \<3a68454af>) - Yarn 1.22.17 #### Environment variables @@ -64,19 +61,19 @@ - Bicep 0.4.1008 - Buildah 1.21.3 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - CMake 3.22.0 -- CodeQL Action Bundle 2.7.1 +- CodeQL Action Bundle 2.7.2 - Docker Compose v1 1.29.2 - Docker Compose v2 2.1.1+azure-1 - Docker-Buildx 0.7.0 - Docker-Moby Client 20.10.11+azure-1 - Docker-Moby Server 20.10.11+azure-1 - Fastlane 2.198.1 -- Git 2.34.0 (apt source repository: ppa:git-core/ppa) -- Git LFS 2.13.3 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) +- Git 2.34.1 (apt source repository: ppa:git-core/ppa) +- Git LFS 3.0.2 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.6.0 - Haveged 1.9.1 - Heroku 7.59.2 -- HHVM (HipHop VM) 4.136.0 +- HHVM (HipHop VM) 4.137.0 - jq 1.6 - Kind 0.11.1 - Kubectl 1.22.4 @@ -92,28 +89,28 @@ - Packer 1.7.8 - PhantomJS 2.1.1 - Podman 3.4.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- Pulumi 3.18.0 +- Pulumi 3.18.1 - R 4.1.2 - Skopeo 1.3.0 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 - Terraform 1.0.11 - yamllint 1.26.3 -- yq 4.14.2 +- yq 4.15.1 - zstd 1.5.0 (homebrew) ### CLI Tools - Alibaba Cloud CLI 3.0.99 -- AWS CLI 2.4.0 +- AWS CLI 2.4.2 - AWS CLI Session manager plugin 1.2.279.0 -- AWS SAM CLI 1.35.0 +- AWS SAM CLI 1.36.0 - Azure CLI (azure-cli) 2.30.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.22.0 - GitHub CLI 2.2.0 -- Google Cloud SDK 365.0.0 (apt source repository: https://packages.cloud.google.com/apt) +- Google Cloud SDK 365.0.1 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 7.0.2 -- OpenShift CLI 4.9.7 +- Netlify CLI 8.0.3 +- OpenShift CLI 4.9.8 - ORAS CLI 0.12.0 - Vercel CLI 23.1.2 @@ -150,7 +147,7 @@ - Rustup 1.24.3 #### Packages -- Bindgen 0.59.1 +- Bindgen 0.59.2 - Cargo audit 0.16.0 - Cargo clippy 0.1.56 - Cargo outdated 0.10.2 @@ -163,7 +160,7 @@ - Mozilla Firefox 94.0 - Geckodriver 0.30.0 - Chromium 96.0.4664.0 -- Selenium server 4.0.0 +- Selenium server 4.1.0 #### Environment variables | Name | Value | @@ -219,9 +216,9 @@ #### Ruby - 2.5.9 -- 2.6.8 -- 2.7.4 -- 3.0.2 +- 2.6.9 +- 2.7.5 +- 3.0.3 #### Environment variables | Name | Value | Architecture | @@ -372,7 +369,7 @@ | tzdata | 2021e-0ubuntu0.20.04 | | unzip | 6.0-25ubuntu1 | | upx | 3.95-2build1 | -| wget | 1.20.3-1ubuntu1 | +| wget | 1.20.3-1ubuntu2 | | xorriso | 1.5.2-1 | | xvfb | 2:1.20.11-1ubuntu1\~20.04.2 | | xz-utils | 5.2.4-1ubuntu1 | From c50afe27cd8d3fea12cfe0553f9b1802670136d8 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Thu, 2 Dec 2021 10:56:43 +0300 Subject: [PATCH 0791/3485] [Windows] Add pause after Windows Update (#4641) --- images/win/scripts/ImageHelpers/InstallHelpers.ps1 | 10 +++++----- .../Installers/Wait-WindowsUpdatesForInstall.ps1 | 12 ++++++++++++ images/win/windows2019.json | 1 + images/win/windows2022.json | 4 ++++ 4 files changed, 22 insertions(+), 5 deletions(-) create mode 100644 images/win/scripts/Installers/Wait-WindowsUpdatesForInstall.ps1 diff --git a/images/win/scripts/ImageHelpers/InstallHelpers.ps1 b/images/win/scripts/ImageHelpers/InstallHelpers.ps1 index eddac73daf28..f113071d932a 100644 --- a/images/win/scripts/ImageHelpers/InstallHelpers.ps1 +++ b/images/win/scripts/ImageHelpers/InstallHelpers.ps1 @@ -519,7 +519,7 @@ function Get-WindowsUpdatesHistory { 43 { $status = "InProgress" $title = $event.Properties[0].Value - break + break } } @@ -538,7 +538,7 @@ function Invoke-SBWithRetry { param ( [scriptblock] $Command, [int] $RetryCount = 10, - [int] $TimeoutInSecs = 5 + [int] $RetryIntervalSeconds = 5 ) while ($RetryCount -gt 0) { @@ -547,15 +547,15 @@ function Invoke-SBWithRetry { return } catch { - Write-Host "There is an error encounterd:`n $_" + Write-Host "There is an error encountered:`n $_" $RetryCount-- if ($RetryCount -eq 0) { exit 1 } - Write-Host "Waiting $TimeoutInSecs seconds before retrying. Retries left: $RetryCount" - Start-Sleep -Seconds $TimeoutInSecs + Write-Host "Waiting $RetryIntervalSeconds seconds before retrying. Retries left: $RetryCount" + Start-Sleep -Seconds $RetryIntervalSeconds } } } diff --git a/images/win/scripts/Installers/Wait-WindowsUpdatesForInstall.ps1 b/images/win/scripts/Installers/Wait-WindowsUpdatesForInstall.ps1 new file mode 100644 index 000000000000..2039e9396458 --- /dev/null +++ b/images/win/scripts/Installers/Wait-WindowsUpdatesForInstall.ps1 @@ -0,0 +1,12 @@ +################################################################################ +## File: Wait-WindowsUpdatesForInstall.ps1 +## Desc: Wait for installation windows updates to complete +################################################################################ + +Invoke-SBWithRetry -RetryCount 10 -RetryIntervalSeconds 120 -Command { + $inProgress = Get-WindowsUpdatesHistory | Where-Object Status -eq "InProgress" + if ( $inProgress ) { + $title = $inProgress.Title -join "`n" + throw "InProgress: $title" + } +} diff --git a/images/win/windows2019.json b/images/win/windows2019.json index abeec44b03c4..09797cdb32fb 100644 --- a/images/win/windows2019.json +++ b/images/win/windows2019.json @@ -274,6 +274,7 @@ "type": "powershell", "pause_before": "2m", "scripts": [ + "{{ template_dir }}/scripts/Installers/Wait-WindowsUpdatesForInstall.ps1", "{{ template_dir }}/scripts/Tests/RunAll-Tests.ps1" ] }, diff --git a/images/win/windows2022.json b/images/win/windows2022.json index 948afff76656..431757235b2e 100644 --- a/images/win/windows2022.json +++ b/images/win/windows2022.json @@ -251,11 +251,15 @@ }, { "type": "windows-restart", + "check_registry": true, + "restart_check_command": "powershell -command \"& {if ((-not (Get-Process TiWorker.exe -ErrorAction SilentlyContinue)) -and (-not [System.Environment]::HasShutdownStarted) ) { Write-Output 'Restart complete' }}\"", "restart_timeout": "30m" }, { "type": "powershell", + "pause_before": "2m", "scripts": [ + "{{ template_dir }}/scripts/Installers/Wait-WindowsUpdatesForInstall.ps1", "{{ template_dir }}/scripts/Tests/RunAll-Tests.ps1" ] }, From 23e75abf724f551d12043f33a40f5efb42bfedb1 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 2 Dec 2021 09:14:12 +0000 Subject: [PATCH 0792/3485] Updating readme file for macOS-11 version 20211127.1 (#4622) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-11-Readme.md | 51 ++++++++++++++++----------------- 1 file changed, 24 insertions(+), 27 deletions(-) diff --git a/images/macos/macos-11-Readme.md b/images/macos/macos-11-Readme.md index ba5175fe0508..ccdf2236a7dc 100644 --- a/images/macos/macos-11-Readme.md +++ b/images/macos/macos-11-Readme.md @@ -1,15 +1,12 @@ | Announcements | |-| | [[all OSs] Default Nodejs version will be set to 16 on November, 29](https://github.com/actions/virtual-environments/issues/4446) | -| [[all OSs] Selenium server version will be upgraded from 3 to 4 on November, 15](https://github.com/actions/virtual-environments/issues/4376) | -| [[All OSs] Node.js version 10 will be removed from the images on November, 15](https://github.com/actions/virtual-environments/issues/4356) | -| [[macOS Big Sur] Xcode 13 beta will be removed and Xcode 13.1 set as default on November, 15](https://github.com/actions/virtual-environments/issues/4355) | | [macOS-latest workflows will use macOS-11](https://github.com/actions/virtual-environments/issues/4060) | *** # macOS 11.6 info - System Version: macOS 11.6.1 (20G224) - Kernel Version: Darwin 20.6.0 -- Image Version: 20211120.1 +- Image Version: 20211127.1 ## Installed Software ### Language and Runtime @@ -19,37 +16,37 @@ - Clang/LLVM 13.0.0 is default - gcc-9 (Homebrew GCC 9.4.0) 9.4.0 - available by `gcc-9` alias - gcc-10 (Homebrew GCC 10.3.0) 10.3.0 - available by `gcc-10` alias -- gcc-11 (Homebrew GCC 11.2.0_2) 11.2.0 - available by `gcc-11` alias +- gcc-11 (Homebrew GCC 11.2.0_3) 11.2.0 - available by `gcc-11` alias - GNU Fortran (Homebrew GCC 9.4.0) 9.4.0 - available by `gfortran-9` alias - GNU Fortran (Homebrew GCC 10.3.0) 10.3.0 - available by `gfortran-10` alias -- GNU Fortran (Homebrew GCC 11.2.0_2) 11.2.0 - available by `gfortran-11` alias +- GNU Fortran (Homebrew GCC 11.2.0_3) 11.2.0 - available by `gfortran-11` alias - Go 1.15.15 - julia 1.6.4 - Kotlin 1.6.0-release-798 - MSBuild 16.9.0.22901 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) -- Node.js v14.18.1 +- Node.js v16.13.0 - NVM 0.39.0 - NVM - Cached node versions: v12.22.7 v14.18.1 v16.13.0 - Perl 5.34.0 - PHP 8.0.13 - Python 2.7.18 -- Python 3.9.8 -- Ruby 2.7.4p191 +- Python 3.9.9 +- Ruby 2.7.5p203 ### Package Management -- Bundler version 2.2.31 +- Bundler version 2.2.32 - Carthage 0.38.0 - CocoaPods 1.11.2 - Composer 2.1.12 -- Homebrew 3.3.4 +- Homebrew 3.3.5 - Miniconda 4.10.3 -- NPM 6.14.15 +- NPM 8.1.0 - NuGet 5.9.0.7134 - Pip 20.3.4 (python 2.7) - Pip 21.3.1 (python 3.9) - Pipx 0.16.4 -- RubyGems 3.2.31 -- Vcpkg 2021 (build from master \<709e9ec32>) +- RubyGems 3.2.32 +- Vcpkg 2021 (build from master \<b3cfaaf1b>) - Yarn 1.22.15 #### Environment variables @@ -73,7 +70,7 @@ - bsdtar 3.3.2 - available by 'tar' alias - Curl 7.80.0 - Git LFS: 3.0.2 -- Git: 2.34.0 +- Git: 2.34.1 - GitHub CLI: 2.2.0 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.2 @@ -93,12 +90,11 @@ - Switchaudio-osx 1.1.0 - zstd 1.5.0 - ### Tools - Aliyun CLI 3.0.99 -- App Center CLI 2.10.4 -- AWS CLI 2.4.0 -- AWS SAM CLI 1.35.0 +- App Center CLI 2.10.6 +- AWS CLI 2.4.2 +- AWS SAM CLI 1.36.0 - AWS Session Manager CLI 1.2.279.0 - Azure CLI 2.30.0 - Bicep CLI 0.4.1008 @@ -122,11 +118,11 @@ - SafariDriver 15.1 (16612.2.9.1.30) - Google Chrome 96.0.4664.55 - ChromeDriver 96.0.4664.45 -- Microsoft Edge 95.0.1020.53 -- MSEdgeDriver 95.0.1020.53 -- Mozilla Firefox 94.0.1 +- Microsoft Edge 96.0.1054.34 +- MSEdgeDriver 96.0.1054.34 +- Mozilla Firefox 94.0.2 - geckodriver 0.30.0 -- Selenium server 4.0.0 +- Selenium server 4.1.0 #### Environment variables | Name | Value | @@ -146,9 +142,9 @@ #### Ruby - 2.4.10 - 2.5.9 -- 2.6.8 -- 2.7.4 -- 3.0.2 +- 2.6.9 +- 2.7.5 +- 3.0.3 #### Python - 3.7.12 @@ -172,6 +168,7 @@ | 1.15.15 (Default) | x64 | GOROOT_1_15_X64 | | 1.16.10 | x64 | GOROOT_1_16_X64 | | 1.17.3 | x64 | GOROOT_1_17_X64 | + ### Rust Tools - Cargo 1.56.0 - Rust 1.56.1 @@ -179,7 +176,7 @@ - Rustup 1.24.3 #### Packages -- Bindgen 0.59.1 +- Bindgen 0.59.2 - Cargo-audit 0.16.0 - Cargo-outdated v0.10.2 - Cbindgen 0.20.0 From 4638404b13b4dbd3d9f37614973acf32f7368ba1 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 2 Dec 2021 11:03:15 +0000 Subject: [PATCH 0793/3485] Updating readme file for macOS-10.15 version 20211126.1 (#4623) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-10.15-Readme.md | 55 ++++++++++++++---------------- 1 file changed, 26 insertions(+), 29 deletions(-) diff --git a/images/macos/macos-10.15-Readme.md b/images/macos/macos-10.15-Readme.md index 7a58e2fbe1ee..13b2bbdbfd51 100644 --- a/images/macos/macos-10.15-Readme.md +++ b/images/macos/macos-10.15-Readme.md @@ -1,15 +1,12 @@ | Announcements | |-| | [[all OSs] Default Nodejs version will be set to 16 on November, 29](https://github.com/actions/virtual-environments/issues/4446) | -| [[all OSs] Selenium server version will be upgraded from 3 to 4 on November, 15](https://github.com/actions/virtual-environments/issues/4376) | -| [[All OSs] Node.js version 10 will be removed from the images on November, 15](https://github.com/actions/virtual-environments/issues/4356) | -| [[macOS Big Sur] Xcode 13 beta will be removed and Xcode 13.1 set as default on November, 15](https://github.com/actions/virtual-environments/issues/4355) | | [macOS-latest workflows will use macOS-11](https://github.com/actions/virtual-environments/issues/4060) | *** # macOS 10.15 info - System Version: macOS 10.15.7 (19H1519) - Kernel Version: Darwin 19.6.0 -- Image Version: 20211120.1 +- Image Version: 20211126.1 ## Installed Software ### Language and Runtime @@ -19,38 +16,38 @@ - Clang/LLVM 13.0.0 is available on `'$(brew --prefix llvm)/bin/clang'` - gcc-9 (Homebrew GCC 9.4.0) 9.4.0 - available by `gcc-9` alias - gcc-10 (Homebrew GCC 10.3.0) 10.3.0 - available by `gcc-10` alias -- gcc-11 (Homebrew GCC 11.2.0_2) 11.2.0 - available by `gcc-11` alias +- gcc-11 (Homebrew GCC 11.2.0_3) 11.2.0 - available by `gcc-11` alias - GNU Fortran (Homebrew GCC 9.4.0) 9.4.0 - available by `gfortran-9` alias - GNU Fortran (Homebrew GCC 10.3.0) 10.3.0 - available by `gfortran-10` alias -- GNU Fortran (Homebrew GCC 11.2.0_2) 11.2.0 - available by `gfortran-11` alias +- GNU Fortran (Homebrew GCC 11.2.0_3) 11.2.0 - available by `gfortran-11` alias - Go 1.15.15 - julia 1.6.4 - Kotlin 1.6.0-release-798 - MSBuild 16.9.0.22901 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) -- Node.js v14.18.1 +- Node.js v16.13.0 - NVM 0.39.0 - NVM - Cached node versions: v12.22.7 v14.18.1 v16.13.0 - Perl 5.34.0 - PHP 8.0.13 - Python 2.7.18 -- Python 3.9.8 +- Python 3.9.9 - R 4.1.2 -- Ruby 2.7.4p191 +- Ruby 2.7.5p203 ### Package Management -- Bundler version 2.2.31 +- Bundler version 2.2.32 - Carthage 0.38.0 - CocoaPods 1.11.2 - Composer 2.1.12 -- Homebrew 3.3.4 +- Homebrew 3.3.5 - Miniconda 4.10.3 -- NPM 6.14.15 +- NPM 8.1.0 - NuGet 5.9.0.7134 - Pip 20.3.4 (python 2.7) - Pip 21.3.1 (python 3.9) - Pipx 0.16.4 -- RubyGems 3.2.31 -- Vcpkg 2021 (build from master \<709e9ec32>) +- RubyGems 3.2.32 +- Vcpkg 2021 (build from master \<b3cfaaf1b>) - Yarn 1.22.15 #### Environment variables @@ -74,9 +71,9 @@ - bsdtar 3.3.2 - available by 'tar' alias - Curl 7.80.0 - Git LFS: 3.0.2 -- Git: 2.34.0 +- Git: 2.34.1 - GitHub CLI: 2.2.0 -- GNU parallel 20211022 +- GNU parallel 20211122 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.2 - gpg (GnuPG) 2.3.3 @@ -94,15 +91,14 @@ - Subversion (SVN) 1.14.1 - Switchaudio-osx 1.1.0 - Vagrant 2.2.19 -- virtualbox 6.1.28r147628 +- virtualbox 6.1.30r148432 - zstd 1.5.0 - ### Tools - Aliyun CLI 3.0.99 -- App Center CLI 2.10.4 -- AWS CLI 2.4.0 -- AWS SAM CLI 1.35.0 +- App Center CLI 2.10.6 +- AWS CLI 2.4.2 +- AWS SAM CLI 1.36.0 - AWS Session Manager CLI 1.2.279.0 - Azure CLI 2.30.0 - Bicep CLI 0.4.1008 @@ -126,11 +122,11 @@ - SafariDriver 15.1 (15612.2.9.1.30) - Google Chrome 96.0.4664.55 - ChromeDriver 96.0.4664.45 -- Microsoft Edge 95.0.1020.53 -- MSEdgeDriver 95.0.1020.53 -- Mozilla Firefox 94.0.1 +- Microsoft Edge 96.0.1054.34 +- MSEdgeDriver 96.0.1054.34 +- Mozilla Firefox 94.0.2 - geckodriver 0.30.0 -- Selenium server 4.0.0 +- Selenium server 4.1.0 #### Environment variables | Name | Value | @@ -153,9 +149,9 @@ #### Ruby - 2.4.10 - 2.5.9 -- 2.6.8 -- 2.7.4 -- 3.0.2 +- 2.6.9 +- 2.7.5 +- 3.0.3 #### Python - 2.7.18 @@ -183,6 +179,7 @@ | 1.15.15 (Default) | x64 | GOROOT_1_15_X64 | | 1.16.10 | x64 | GOROOT_1_16_X64 | | 1.17.3 | x64 | GOROOT_1_17_X64 | + ### Rust Tools - Cargo 1.56.0 - Rust 1.56.1 @@ -190,7 +187,7 @@ - Rustup 1.24.3 #### Packages -- Bindgen 0.59.1 +- Bindgen 0.59.2 - Cargo-audit 0.16.0 - Cargo-outdated v0.10.2 - Cbindgen 0.20.0 From ddaeaaa8fba88b009ab140001e63ee317dae52db Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 2 Dec 2021 13:13:24 +0000 Subject: [PATCH 0794/3485] Updating readme file for win22 version 20211130.3 (#4642) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2022-Readme.md | 48 +++++++++++++++----------------- 1 file changed, 23 insertions(+), 25 deletions(-) diff --git a/images/win/Windows2022-Readme.md b/images/win/Windows2022-Readme.md index 2e2b38595bb6..08d5ee88f9ca 100644 --- a/images/win/Windows2022-Readme.md +++ b/images/win/Windows2022-Readme.md @@ -2,13 +2,11 @@ |-| | [Windows Server 2022 with Visual Studio 2022 is generally available starting from November, 15](https://github.com/actions/virtual-environments/issues/4488) | | [[all OSs] Default Nodejs version will be set to 16 on November, 29](https://github.com/actions/virtual-environments/issues/4446) | -| [[all OSs] Selenium server version will be upgraded from 3 to 4 on November, 15](https://github.com/actions/virtual-environments/issues/4376) | -| [[All OSs] Node.js version 10 will be removed from the images on November, 15](https://github.com/actions/virtual-environments/issues/4356) | | [Windows-2016 environment will be removed on March 15, 2022](https://github.com/actions/virtual-environments/issues/4312) | *** # Microsoft Windows Server 2022 Datacenter - OS Version: 10.0.20348 Build 350 -- Image Version: 20211122.0 +- Image Version: 20211130.3 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -18,24 +16,24 @@ - Bash 4.4.23(1)-release - Go 1.16.10 - Julia 1.6.4 -- Kotlin 1.6.0 +- Kotlin 1.5.32 - LLVM 13.0.0 -- Node 14.18.1 +- Node 16.13.0 - PHP 8.0.13 - Python 3.9.9 -- Ruby 3.0.2p107 +- Ruby 3.0.3p157 ### Package Management - Chocolatey 0.11.3 -- Composer 2.1.12 +- Composer 2.1.14 - Helm 3.7.1 - Miniconda 4.10.3 (pre-installed on the image but not added to PATH) -- NPM 6.14.15 +- NPM 8.1.0 - NuGet 6.0.0.280 - pip 21.3.1 (python 3.9) - Pipx 0.16.4 -- RubyGems 3.2.22 -- Vcpkg (build from master \<653912591>) +- RubyGems 3.2.32 +- Vcpkg (build from master \<c1c6eb92e>) - Yarn 1.22.17 #### Environment variables @@ -50,7 +48,7 @@ - sbt 1.5.5 ### Tools -- 7zip 21.05 +- 7zip 21.06 - aria2 1.36.0 - azcopy 10.13.0 - Bazel 4.2.1 @@ -63,7 +61,7 @@ - Docker-compose 1.29.2 - Docker-wincred 0.6.4 - ghc 9.2.1 -- Git 2.34.0 +- Git 2.34.1 - Git LFS 3.0.2 - jq 1.6 - Kind 0.11.1 @@ -74,7 +72,7 @@ - NSIS v3.06.1 - OpenSSL 1.1.1 - Packer 1.7.8 -- Pulumi v3.18.0 +- Pulumi v3.18.1 - R 4.1.2 - Stack 2.7.3 - Subversion (SVN) 1.14.1 @@ -86,9 +84,9 @@ - zstd 1.5.0 ### CLI Tools -- Alibaba Cloud CLI 3.0.99 -- AWS CLI 2.4.0 -- AWS SAM CLI 1.35.0 +- Alibaba Cloud CLI 3.0.100 +- AWS CLI 2.4.2 +- AWS SAM CLI 1.36.0 - AWS Session Manager CLI 1.2.279.0 - Azure CLI 2.30.0 - Azure DevOps CLI extension 0.22.0 @@ -102,7 +100,7 @@ - Rustup 1.24.3 #### Packages -- bindgen 0.59.1 +- bindgen 0.59.2 - cargo-audit 0.16.0 - cargo-outdated v0.10.2 - cbindgen 0.20.0 @@ -112,12 +110,12 @@ ### Browsers and webdrivers - Google Chrome 96.0.4664.45 - Chrome Driver 96.0.4664.45 -- Microsoft Edge 96.0.1054.29 -- Microsoft Edge Driver 96.0.1054.29 +- Microsoft Edge 96.0.1054.34 +- Microsoft Edge Driver 96.0.1054.34 - Mozilla Firefox 94.0.2 - Gecko Driver 0.30.0 - IE Driver 3.150.1.1 -- Selenium server 4.0.0 +- Selenium server 4.1.0 #### Environment variables | Name | Value | @@ -178,8 +176,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Ruby | Version | Architecture | | ------- | ------------ | -| 2.7.4 | x64 | -| 3.0.2 (Default) | x64 | +| 2.7.5 | x64 | +| 3.0.3 (Default) | x64 | #### PyPy @@ -215,7 +213,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Database tools - Azure CosmosDb Emulator 2.14.4.0 - DacFx 15.0.5282.3 -- MySQL 8.0.27.0 +- MySQL 8.0.26.0 - SQLPS 1.0 @@ -467,7 +465,7 @@ All other versions are saved but not installed. | ------------------ | ---------------- | | DockerMsftProvider | 1.0.0.8 | | MarkdownPS | 1.9 | -| Microsoft.Graph | 1.8.0 | +| Microsoft.Graph | 1.9.0 | | Pester | 3.4.0<br>5.3.1 | | PowerShellGet | 1.0.0.1<br>2.2.5 | | PSScriptAnalyzer | 1.20.0 | @@ -479,7 +477,7 @@ All other versions are saved but not installed. | Package Name | Version | | -------------------------- | ---------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 4.0 | -| Android Emulator | 30.9.5 | +| Android Emulator | 31.1.4 | | Android SDK Build-tools | 31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | | Android SDK Platforms | android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | | Android SDK Platform-Tools | 31.0.3 | From ca8169d472eaf60b286fe30eb4f602acbf3c1442 Mon Sep 17 00:00:00 2001 From: Maksim Shilov <89912354+shilovmaksim@users.noreply.github.com> Date: Thu, 2 Dec 2021 18:35:56 +0300 Subject: [PATCH 0795/3485] [MacOS] Add software to MacOS 12 image was not available during the Monterey beta stage. (#4644) --- .../SoftwareReport.Generator.ps1 | 34 +++++++------------ images/macos/templates/macOS-12.json | 4 +++ images/macos/tests/BasicTools.Tests.ps1 | 4 +-- images/macos/tests/Common.Tests.ps1 | 2 +- images/macos/tests/LLVM.Tests.ps1 | 2 +- images/macos/tests/PHP.Tests.ps1 | 2 +- images/macos/tests/RubyGem.Tests.ps1 | 2 +- images/macos/tests/System.Tests.ps1 | 2 +- images/macos/toolsets/toolset-12.json | 6 ++++ 9 files changed, 29 insertions(+), 29 deletions(-) diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1 index f69292947786..5490a66dcb64 100644 --- a/images/macos/software-report/SoftwareReport.Generator.ps1 +++ b/images/macos/software-report/SoftwareReport.Generator.ps1 @@ -43,21 +43,16 @@ $languageAndRuntimeList = @( (Get-DotnetVersionList), (Get-GoVersion), (Get-JuliaVersion), - (Get-KotlinVersion) + (Get-KotlinVersion), + (Get-PHPVersion), + (Get-ClangLLVMVersion) ) if ($os.IsLessThanMonterey) { $languageAndRuntimeList += @( - (Get-PHPVersion) - ) -} - -if ($os.IsLessThanMonterey) { - $languageAndRuntimeList += @( - (Get-GccVersion) + (Get-GccVersion), (Get-FortranVersion) - (Get-ClangLLVMVersion) - ) + ) } if ($os.IsLessThanBigSur) { @@ -83,17 +78,17 @@ $packageManagementList = @( (Get-YarnVersion), (Get-NuGetVersion), (Get-RubyGemsVersion), - (Get-ComposerVersion) + (Get-ComposerVersion), + (Get-CarthageVersion) ) if ($os.IsLessThanMonterey) { $packageManagementList += @( - (Get-CarthageVersion), (Get-CondaVersion) ) } -if ($os.IsHigherThanMojave -and $os.IsLessThanMonterey) { +if ($os.IsHigherThanMojave) { $packageManagementList += @( (Get-VcpkgVersion) ) @@ -139,12 +134,14 @@ $utilitiesList = @( (Get-MongodVersion), (Get-7zipVersion), (Get-BsdtarVersion), - (Get-GnuTarVersion) + (Get-GnuTarVersion), + (Get-GPGVersion), + (Get-SwitchAudioOsxVersion), + (Get-SoxVersion) ) if ($os.IsLessThanMonterey) { $utilitiesList += @( - (Get-GPGVersion), (Get-HelmVersion) ) } @@ -163,13 +160,6 @@ if ($os.IsLessThanBigSur) { ) } -if ($os.IsLessThanMonterey) { - $utilitiesList += @( - (Get-SwitchAudioOsxVersion), - (Get-SoxVersion) - ) -} - $markdown += New-MDList -Style Unordered -Lines ($utilitiesList | Sort-Object) # Tools diff --git a/images/macos/templates/macOS-12.json b/images/macos/templates/macOS-12.json index 596bc460d511..6cf0215d60d8 100644 --- a/images/macos/templates/macOS-12.json +++ b/images/macos/templates/macOS-12.json @@ -165,9 +165,11 @@ "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}", "scripts": [ "./provision/core/commonutils.sh", + "./provision/core/llvm.sh", "./provision/core/golang.sh", "./provision/core/swiftlint.sh", "./provision/core/openjdk.sh", + "./provision/core/php.sh", "./provision/core/aws.sh", "./provision/core/rust.sh", "./provision/core/haskell.sh", @@ -181,6 +183,8 @@ "./provision/core/nginx.sh", "./provision/core/postgresql.sh", "./provision/core/mongodb.sh", + "./provision/core/audiodevice.sh", + "./provision/core/vcpkg.sh", "./provision/core/safari.sh", "./provision/core/chrome.sh", "./provision/core/edge.sh", diff --git a/images/macos/tests/BasicTools.Tests.ps1 b/images/macos/tests/BasicTools.Tests.ps1 index 4389c89e60a5..bc6845117e70 100644 --- a/images/macos/tests/BasicTools.Tests.ps1 +++ b/images/macos/tests/BasicTools.Tests.ps1 @@ -6,7 +6,7 @@ Describe "Azure CLI" { } } -Describe "Carthage" -Skip:($os.IsMonterey) { +Describe "Carthage" { It "Carthage" { "carthage version" | Should -ReturnZeroExitCode } @@ -30,7 +30,7 @@ Describe "SwiftFormat" -Skip:($os.IsMonterey) { } } -Describe "GnuPG" -Skip:($os.IsMonterey) { +Describe "GnuPG" { It "GnuPG" { "gpg --version" | Should -ReturnZeroExitCode } diff --git a/images/macos/tests/Common.Tests.ps1 b/images/macos/tests/Common.Tests.ps1 index 16d7878c5bbe..107937da155e 100644 --- a/images/macos/tests/Common.Tests.ps1 +++ b/images/macos/tests/Common.Tests.ps1 @@ -33,7 +33,7 @@ Describe "GCC" -Skip:($os.IsMonterey) { } } -Describe "vcpkg" -Skip:($os.IsMojave -or $os.IsMonterey) { +Describe "vcpkg" -Skip:($os.IsMojave) { It "vcpkg" { "vcpkg version" | Should -ReturnZeroExitCode } diff --git a/images/macos/tests/LLVM.Tests.ps1 b/images/macos/tests/LLVM.Tests.ps1 index 75b67e9c4cfc..0591d049a72c 100644 --- a/images/macos/tests/LLVM.Tests.ps1 +++ b/images/macos/tests/LLVM.Tests.ps1 @@ -1,6 +1,6 @@ $os = Get-OSVersion -Describe "Clang/LLVM" -Skip:($os.IsMonterey) { +Describe "Clang/LLVM" { It "Clang/LLVM is installed and version is correct" { $toolsetVersion = Get-ToolsetValue 'llvm.version' $clangVersion = & "$(brew --prefix llvm)/bin/clang" --version diff --git a/images/macos/tests/PHP.Tests.ps1 b/images/macos/tests/PHP.Tests.ps1 index ac34a9b48f31..d5b2573246b6 100644 --- a/images/macos/tests/PHP.Tests.ps1 +++ b/images/macos/tests/PHP.Tests.ps1 @@ -1,6 +1,6 @@ $os = Get-OSVersion -Describe "PHP" -Skip:($os.IsMonterey) { +Describe "PHP" { Context "PHP" { It "PHP Path" { Get-WhichTool "php" | Should -Not -BeLike "/usr/bin/php*" diff --git a/images/macos/tests/RubyGem.Tests.ps1 b/images/macos/tests/RubyGem.Tests.ps1 index 5e15d2f703cf..cd3806886c7d 100644 --- a/images/macos/tests/RubyGem.Tests.ps1 +++ b/images/macos/tests/RubyGem.Tests.ps1 @@ -19,7 +19,7 @@ Describe "Bundler" { } } -Describe "Nomad shenzhen CLI" -Skip:($os.IsMonterey) { +Describe "Nomad shenzhen CLI" { It "Nomad shenzhen CLI" { "ipa --version" | Should -ReturnZeroExitCode } diff --git a/images/macos/tests/System.Tests.ps1 b/images/macos/tests/System.Tests.ps1 index 71b6d48f63d8..2b7f00915ba5 100644 --- a/images/macos/tests/System.Tests.ps1 +++ b/images/macos/tests/System.Tests.ps1 @@ -17,7 +17,7 @@ Describe "Certificate" { } } -Describe "Audio device" -Skip:($os.IsMonterey) { +Describe "Audio device" { It "Sox is installed" { "sox --version" | Should -ReturnZeroExitCode } diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index bb847a482a62..0f35a3188336 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -84,8 +84,10 @@ "aria2", "azure-cli", "bazelisk", + "carthage", "cmake", "gh", + "gnupg", "gnu-tar", "kotlin", "libpq", @@ -174,6 +176,7 @@ "rubygems": [ "xcode-install", "cocoapods", + "nomad-cli", "xcpretty", "bundler", "fastlane", @@ -191,6 +194,9 @@ "16" ] }, + "llvm": { + "version": "13" + }, "php": { "version": "8.1" }, From d12aeab69ca9c80f2d9317ea06e6087c25e66d10 Mon Sep 17 00:00:00 2001 From: V-Zabayrachny <79155496+V-Zabayrachny@users.noreply.github.com> Date: Fri, 3 Dec 2021 00:33:38 +0300 Subject: [PATCH 0796/3485] [Windows] Fix markdown in the software report (#4587) --- .../SoftwareReport/SoftwareReport.Common.psm1 | 4 ++-- .../SoftwareReport.Generator.ps1 | 20 ++++++------------- .../SoftwareReport.Helpers.psm1 | 2 +- 3 files changed, 9 insertions(+), 17 deletions(-) diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 index 83c441ce5902..0bd99e7ccd23 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 @@ -310,7 +310,7 @@ function Get-PacmanVersion { $rawVersion = & $pacmanPath --version $rawVersion.Split([System.Environment]::NewLine)[1] -match "\d+\.\d+(\.\d+)?" | Out-Null $pacmanVersion = $matches[0] - return "- Pacman $pacmanVersion" + return "Pacman $pacmanVersion" } function Get-YAMLLintVersion { @@ -319,7 +319,7 @@ function Get-YAMLLintVersion { function Get-BizTalkVersion { $bizTalkReg = Get-ItemProperty "HKLM:\SOFTWARE\WOW6432Node\Microsoft\BizTalk Server\3.0" - return "- $($bizTalkReg.ProductName) $($bizTalkReg.ProductVersion) " + return "$($bizTalkReg.ProductName) $($bizTalkReg.ProductVersion)" } function Get-PipxVersion { diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index e0c34b245745..4f7fd01e3a56 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -189,32 +189,28 @@ $markdown += Get-ShellTarget $markdown += New-MDNewLine $markdown += New-MDHeader "MSYS2" -Level 3 -$markdown += Get-PacmanVersion -$markdown += New-MDNewLine +$markdown += "$(Get-PacmanVersion)" | New-MDList -Style Unordered $markdown += New-MDHeader "Notes:" -Level 5 -$markdown += @' +$reportMsys64 = @' ``` Location: C:\msys64 Note: MSYS2 is pre-installed on image but not added to PATH. ``` '@ -$markdown += New-MDNewLine +$markdown += New-MDParagraph -Lines $reportMsys64 if (Test-IsWin19) { $markdown += New-MDHeader "BizTalk Server" -Level 3 - $markdown += Get-BizTalkVersion - $markdown += New-MDNewLine + $markdown += "$(Get-BizTalkVersion)" | New-MDList -Style Unordered } $markdown += New-MDHeader "Cached Tools" -Level 3 $markdown += (Build-CachedToolsMarkdown) -$markdown += New-MDNewLine $markdown += New-MDHeader "Databases" -Level 3 $markdown += Build-DatabasesMarkdown -$markdown += New-MDNewLine $markdown += New-MDHeader "Database tools" -Level 3 $markdown += New-MDList -Style Unordered -Lines (@( @@ -224,7 +220,6 @@ $markdown += New-MDList -Style Unordered -Lines (@( (Get-SQLPSVersion) ) | Sort-Object ) -$markdown += New-MDNewLine $markdown += Build-WebServersSection @@ -234,12 +229,10 @@ $markdown += $vs | New-MDTable $markdown += New-MDNewLine $markdown += New-MDHeader "Workloads, components and extensions:" -Level 4 -$markdown += New-MDNewLine $markdown += ((Get-VisualStudioComponents) + (Get-VisualStudioExtensions)) | New-MDTable $markdown += New-MDNewLine $markdown += New-MDHeader "Microsoft Visual C++:" -Level 4 -$markdown += New-MDNewLine $markdown += Get-VisualCPPComponents | New-MDTable $markdown += New-MDNewLine @@ -272,14 +265,14 @@ $markdown += New-MDList -Lines (Get-PowershellCoreVersion) -Style Unordered $markdown += New-MDHeader "Azure Powershell Modules" -Level 4 $markdown += Get-PowerShellAzureModules | New-MDTable -$markdown += @' +$reportAzPwsh = @' ``` 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. ``` '@ -$markdown += New-MDNewLine +$markdown += New-MDParagraph -Lines $reportAzPwsh $markdown += New-MDHeader "Powershell Modules" -Level 4 $markdown += Get-PowerShellModules | New-MDTable @@ -298,7 +291,6 @@ $cachedImages = Get-CachedDockerImagesTableData if ($cachedImages) { $markdown += New-MDHeader "Cached Docker images" -Level 3 $markdown += $cachedImages | New-MDTable - $markdown += New-MDNewLine } $markdown | Out-File -FilePath "C:\InstalledSoftware.md" diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Helpers.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Helpers.psm1 index 4620c3e70abe..0c20144ba998 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Helpers.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Helpers.psm1 @@ -21,7 +21,7 @@ function Build-MarkdownElement ) $markdown = New-MDHeader $Head -Level 4 - $markdown += New-MDParagraph -Lines $Content + $markdown += New-MDParagraph -Lines $Content -NoNewLine return $markdown } From 050efaf52a756ad291fd5e0d5923d07e913bc34c Mon Sep 17 00:00:00 2001 From: Nikolay Frolov <90333448+nikolai-frolov@users.noreply.github.com> Date: Fri, 3 Dec 2021 19:49:55 +0300 Subject: [PATCH 0797/3485] [Windows] Improve MySQL install (#4646) --- .../win/scripts/Installers/Install-MysqlCli.ps1 | 15 +++++++++++---- images/win/scripts/Tests/Databases.Tests.ps1 | 4 ++-- images/win/toolsets/toolset-2016.json | 3 +-- images/win/toolsets/toolset-2019.json | 3 +-- images/win/toolsets/toolset-2022.json | 3 +-- 5 files changed, 16 insertions(+), 12 deletions(-) diff --git a/images/win/scripts/Installers/Install-MysqlCli.ps1 b/images/win/scripts/Installers/Install-MysqlCli.ps1 index 3feecfb014e9..693883a79f57 100644 --- a/images/win/scripts/Installers/Install-MysqlCli.ps1 +++ b/images/win/scripts/Installers/Install-MysqlCli.ps1 @@ -11,9 +11,16 @@ $ArgumentList = ("/install", "/quiet", "/norestart") Install-Binary -Url $InstallerURI -Name $InstallerName -ArgumentList $ArgumentList ## Downloading mysql -$MysqlMajorVersion = (Get-ToolsetContent).mysql.major_version -$MysqlFullVersion = (Get-ToolsetContent).mysql.full_version -$MysqlVersionUrl = "https://dev.mysql.com/get/Downloads/MySQL-${MysqlMajorVersion}/mysql-${MysqlFullVersion}-winx64.zip" +[version]$MysqlVersion = (Get-ToolsetContent).mysql.version +$MysqlVersionMajorMinor = $MysqlVersion.ToString(2) + +if ($MysqlVersion.Build -lt 0) { + $MysqlVersion = (Invoke-RestMethod -Uri "https://dev.mysql.com/downloads/mysql/${MysqlVersionMajorMinor}.html" | + Select-String -Pattern "${MysqlVersionMajorMinor}\.\d+").Matches.Value +} + +$MysqlVersionFull = $MysqlVersion.ToString() +$MysqlVersionUrl = "https://dev.mysql.com/get/Downloads/MySQL-${MysqlVersionMajorMinor}/mysql-${MysqlVersionFull}-winx64.zip" $MysqlArchPath = Start-DownloadWithRetry -Url $MysqlVersionUrl -Name "mysql.zip" @@ -23,7 +30,7 @@ Extract-7Zip -Path $MysqlArchPath -DestinationPath "C:\" # Rename mysql-version to mysql folder $MysqlPath = "C:\mysql" Invoke-SBWithRetry -Command { - Rename-Item -Path "C:\mysql-${MysqlFullVersion}-winx64" -NewName $MysqlPath -ErrorAction Stop + Rename-Item -Path "C:\mysql-${MysqlVersionFull}-winx64" -NewName $MysqlPath -ErrorAction Stop } # Adding mysql in system environment path diff --git a/images/win/scripts/Tests/Databases.Tests.ps1 b/images/win/scripts/Tests/Databases.Tests.ps1 index ac6b3106f7a1..1e0c88a34a23 100644 --- a/images/win/scripts/Tests/Databases.Tests.ps1 +++ b/images/win/scripts/Tests/Databases.Tests.ps1 @@ -65,7 +65,7 @@ Describe "PostgreSQL" { Describe "MySQL" { It "MySQL CLI" { - $MysqlMajorVersion = (Get-ToolsetContent).mysql.major_version - mysql -V | Should -BeLike "*${MysqlMajorVersion}*" + $MysqlVersion = (Get-ToolsetContent).mysql.version + mysql -V | Should -BeLike "*${MysqlVersion}*" } } diff --git a/images/win/toolsets/toolset-2016.json b/images/win/toolsets/toolset-2016.json index 60b6e8a058b5..22bbd544840b 100644 --- a/images/win/toolsets/toolset-2016.json +++ b/images/win/toolsets/toolset-2016.json @@ -422,8 +422,7 @@ "default": "16" }, "mysql": { - "major_version": "5.7", - "full_version": "5.7.36" + "version": "5.7" }, "mongodb": { "version": "5.0" diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index f7ad0840a155..1a8fb546c176 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -454,8 +454,7 @@ "default": "16" }, "mysql": { - "major_version": "5.7", - "full_version": "5.7.36" + "version": "5.7" }, "mongodb": { "version": "5.0" diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index 5b06743daa8b..c901aaecd471 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -307,8 +307,7 @@ "default": "16" }, "mysql": { - "major_version": "8.0", - "full_version": "8.0.26" + "version": "8.0.26" }, "mongodb": { "version": "5.0" From cb6dd7c0e3932094d26c9cd773c37049bb600999 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Mon, 6 Dec 2021 22:02:12 +0300 Subject: [PATCH 0798/3485] Add pause after installation windows features (#4668) --- images/win/windows2022.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/images/win/windows2022.json b/images/win/windows2022.json index 431757235b2e..555f3d3e7291 100644 --- a/images/win/windows2022.json +++ b/images/win/windows2022.json @@ -139,10 +139,12 @@ }, { "type": "windows-restart", + "check_registry": true, "restart_timeout": "10m" }, { "type": "powershell", + "pause_before": "2m", "scripts": [ "{{ template_dir }}/scripts/Installers/Install-Docker.ps1", "{{ template_dir }}/scripts/Installers/Install-PowershellCore.ps1" From 4828764ba046132752924ee8df852a3853701524 Mon Sep 17 00:00:00 2001 From: Reupen Shah <reupen@users.noreply.github.com> Date: Tue, 7 Dec 2021 10:58:30 +0000 Subject: [PATCH 0799/3485] [Windows] Add Llvm.Clang component to VS 2022 (#4670) --- images/win/toolsets/toolset-2022.json | 1 + 1 file changed, 1 insertion(+) diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index c901aaecd471..37b3ad71ef38 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -190,6 +190,7 @@ "Microsoft.VisualStudio.Component.VC.CLI.Support", "Microsoft.VisualStudio.Component.VC.CMake.Project", "Microsoft.VisualStudio.Component.VC.DiagnosticTools", + "Microsoft.VisualStudio.Component.VC.Llvm.Clang", "Microsoft.VisualStudio.Component.VC.Llvm.ClangToolset", "Microsoft.VisualStudio.Component.VC.Runtimes.ARM64.Spectre", "Microsoft.VisualStudio.Component.VC.Runtimes.x86.x64.Spectre", From 57cf70f7916880d77efea1f14345165c81a47844 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Tue, 7 Dec 2021 14:30:22 +0300 Subject: [PATCH 0800/3485] [Anka] Clear LastRecommendedMajorOSBundleIdentifier property (#4675) * clear LastRecommendedMajorOSBundleIdentifier property * remove property --- images.CI/macos/anka/Service.Helpers.psm1 | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/images.CI/macos/anka/Service.Helpers.psm1 b/images.CI/macos/anka/Service.Helpers.psm1 index 2c5ba9bdd222..855b754faa7f 100644 --- a/images.CI/macos/anka/Service.Helpers.psm1 +++ b/images.CI/macos/anka/Service.Helpers.psm1 @@ -93,6 +93,10 @@ function Get-MacOSInstaller { sudo rm -rf "$previousInstallerPath" } + # Clear LastRecommendedMajorOSBundleIdentifier to prevent error during fetching updates + # Install failed with error: Update not found + Update-SoftwareBundle + # Download macOS installer Write-Host "`t[*] Requested macOS '$MacOSVersion' version installer found, fetching it from Apple Software Update" $result = Invoke-WithRetry { /usr/sbin/softwareupdate --fetch-full-installer --full-installer-version $MacOSVersion } {$LASTEXITCODE -eq 0} | Out-String @@ -324,3 +328,12 @@ function Wait-LoginWindow { } Invoke-WithRetry -RetryCount $RetryCount -Seconds $Seconds -BreakCondition $condition } + +function Update-SoftwareBundle { + $productVersion = sw_vers -productVersion + + if ( $productVersion.StartsWith('11.') ) { + sudo rm -rf /Library/Preferences/com.apple.commerce.plist + sudo /usr/bin/defaults delete /Library/Preferences/com.apple.SoftwareUpdate.plist LastRecommendedMajorOSBundleIdentifier | Out-Null + } +} From 4a8cc99a637fd7c0180642eecbe5551f44308c9d Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Tue, 7 Dec 2021 20:05:02 +0300 Subject: [PATCH 0801/3485] [macos] pester: Replace service status stopped to none (#4677) * pester: Replace service status stopped to none * validate stopped or none --- images/macos/tests/WebServers.Tests.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/macos/tests/WebServers.Tests.ps1 b/images/macos/tests/WebServers.Tests.ps1 index 67e4ca301e7a..ae9dc724f198 100644 --- a/images/macos/tests/WebServers.Tests.ps1 +++ b/images/macos/tests/WebServers.Tests.ps1 @@ -6,7 +6,7 @@ Describe "Apache" -Skip:($os.IsLessThanCatalina) { } It "Apache Service" { - brew services list | Out-String | Should -Match "httpd\s+stopped" + brew services list | Out-String | Should -Match "httpd\s+(stopped|none)" } } @@ -16,6 +16,6 @@ Describe "Nginx" -Skip:($os.IsLessThanCatalina) { } It "Nginx Service" { - brew services list | Out-String | Should -Match "nginx\s+stopped" + brew services list | Out-String | Should -Match "nginx\s+(stopped|none)" } } From 77f9a979a8ca2968ba3d4b0ab7befc6250f99de0 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Tue, 7 Dec 2021 23:38:14 +0300 Subject: [PATCH 0802/3485] [Ubuntu] Downgrade mysql to 8.0.26 (#4674) --- .../SoftwareReport.Databases.psm1 | 2 +- images/linux/scripts/installers/mysql.sh | 33 +++++++++++++++---- .../linux/scripts/tests/Databases.Tests.ps1 | 2 +- 3 files changed, 28 insertions(+), 9 deletions(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Databases.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Databases.psm1 index bee22b0ac67f..f561a13608d8 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Databases.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Databases.psm1 @@ -16,7 +16,7 @@ function Get-SqliteVersion { } function Get-MySQLVersion { - $mySQLVersion = mysqld --version | Take-OutputPart -Part 2 | Take-OutputPart -Part 0 -Delimiter "-" + $mySQLVersion = mysqld --version | Take-OutputPart -Part 2 return "MySQL $mySQLVersion" } diff --git a/images/linux/scripts/installers/mysql.sh b/images/linux/scripts/installers/mysql.sh index 2fae8449d97b..da324ca8689a 100644 --- a/images/linux/scripts/installers/mysql.sh +++ b/images/linux/scripts/installers/mysql.sh @@ -4,22 +4,41 @@ ## Desc: Installs MySQL Client ################################################################################ -export ACCEPT_EULA=Y +source /etc/os-release # Mysql setting up root password MYSQL_ROOT_PASSWORD=root echo "mysql-server mysql-server/root_password password $MYSQL_ROOT_PASSWORD" | debconf-set-selections echo "mysql-server mysql-server/root_password_again password $MYSQL_ROOT_PASSWORD" | debconf-set-selections -# Install MySQL Client -apt-get install mysql-client -y +mkdir -p /tmp/mysql +pushd /tmp -# Install MySQL Server -apt-get install -y mysql-server +# Mandatory dependency +apt-get install -y libmecab2 libaio1 -#Install MySQL Dev tools -apt install libmysqlclient-dev -y +wget -q https://downloads.mysql.com/archives/get/p/23/file/mysql-server_8.0.26-1ubuntu${VERSION_ID}_amd64.deb-bundle.tar +tar -xf mysql-server_8.0.26-1ubuntu${VERSION_ID}_amd64.deb-bundle.tar -C /tmp/mysql +pushd mysql + +# Remove debs with debug info +rm mysql-community-*debug*.deb + +mysql_debs=( + mysql-common* + mysql-community-client-plugins* + mysql-community-client* + mysql-client* + mysql-community-server* + mysql-server* + libmysqlclient21* + libmysqlclient-dev* +) + +for package in ${mysql_debs[@]}; do +dpkg -i $package +done # Disable mysql.service systemctl is-active --quiet mysql.service && systemctl stop mysql.service systemctl disable mysql.service diff --git a/images/linux/scripts/tests/Databases.Tests.ps1 b/images/linux/scripts/tests/Databases.Tests.ps1 index a141c53e911d..b730874357c8 100644 --- a/images/linux/scripts/tests/Databases.Tests.ps1 +++ b/images/linux/scripts/tests/Databases.Tests.ps1 @@ -31,7 +31,7 @@ Describe "MySQL" { It "MySQL Service" { "sudo systemctl start mysql" | Should -ReturnZeroExitCode - mysql -s -N -h localhost -uroot -proot -e "select count(*) from mysql.user where user='root' and authentication_string is null;" | Should -BeExactly 0 + sudo mysql -s -N -h localhost -uroot -proot -e "select count(*) from mysql.user where user='root' and authentication_string is null;" | Should -BeExactly 0 "sudo mysql -vvv -e 'CREATE DATABASE smoke_test' -uroot -proot" | Should -ReturnZeroExitCode "sudo mysql -vvv -e 'DROP DATABASE smoke_test' -uroot -proot" | Should -ReturnZeroExitCode "sudo systemctl stop mysql" | Should -ReturnZeroExitCode From 05b9e3e79c897f95be3a5701976b6e4e2508e2f9 Mon Sep 17 00:00:00 2001 From: Shivam Mathur <shivam_jpr@hotmail.com> Date: Wed, 8 Dec 2021 02:09:17 +0530 Subject: [PATCH 0803/3485] [Ubuntu] upgrade php version to 8.1 (#4681) --- images/linux/scripts/installers/php.sh | 2 +- images/linux/toolsets/toolset-1804.json | 3 ++- images/linux/toolsets/toolset-2004.json | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/images/linux/scripts/installers/php.sh b/images/linux/scripts/installers/php.sh index 511c369d4206..f415a78e4c05 100644 --- a/images/linux/scripts/installers/php.sh +++ b/images/linux/scripts/installers/php.sh @@ -72,7 +72,7 @@ for version in $php_versions; do apt-fast install -y --no-install-recommends php$version-recode fi - if [[ $version != "8.0" ]]; then + if [[ $version != "8.0" && $version != "8.1" ]]; then apt-fast install -y --no-install-recommends php$version-xmlrpc php$version-json fi diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index d57fa56c1768..760dc231ffed 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -271,7 +271,8 @@ "7.2", "7.3", "7.4", - "8.0" + "8.0", + "8.1" ] }, "selenium": { diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index 5b7759d2348a..66a105e85d8d 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -270,7 +270,8 @@ "php": { "versions": [ "7.4", - "8.0" + "8.0", + "8.1" ] }, "rubygems": [ From 89e19af4c9b514a4f41a30c40464ed31d2ec28b7 Mon Sep 17 00:00:00 2001 From: Maksim Shilov <89912354+shilovmaksim@users.noreply.github.com> Date: Wed, 8 Dec 2021 00:35:25 +0300 Subject: [PATCH 0804/3485] [MacOS] Add GCC and remove Nomad from MacOS 12 image (#4667) * Add gcc 11 to macos12 * Remove nomad-shenzhen cli from macos12 --- .../software-report/SoftwareReport.Generator.ps1 | 11 +++-------- images/macos/templates/macOS-12.json | 1 + images/macos/tests/Common.Tests.ps1 | 2 +- images/macos/tests/RubyGem.Tests.ps1 | 2 +- images/macos/toolsets/toolset-12.json | 6 +++++- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1 index 5490a66dcb64..43442cef627d 100644 --- a/images/macos/software-report/SoftwareReport.Generator.ps1 +++ b/images/macos/software-report/SoftwareReport.Generator.ps1 @@ -45,16 +45,11 @@ $languageAndRuntimeList = @( (Get-JuliaVersion), (Get-KotlinVersion), (Get-PHPVersion), - (Get-ClangLLVMVersion) + (Get-ClangLLVMVersion), + (Get-GccVersion), + (Get-FortranVersion) ) -if ($os.IsLessThanMonterey) { - $languageAndRuntimeList += @( - (Get-GccVersion), - (Get-FortranVersion) - ) -} - if ($os.IsLessThanBigSur) { $languageAndRuntimeList += @( (Get-RVersion) diff --git a/images/macos/templates/macOS-12.json b/images/macos/templates/macOS-12.json index 6cf0215d60d8..2d3c1768687f 100644 --- a/images/macos/templates/macOS-12.json +++ b/images/macos/templates/macOS-12.json @@ -172,6 +172,7 @@ "./provision/core/php.sh", "./provision/core/aws.sh", "./provision/core/rust.sh", + "./provision/core/gcc.sh", "./provision/core/haskell.sh", "./provision/core/stack.sh", "./provision/core/cocoapods.sh", diff --git a/images/macos/tests/Common.Tests.ps1 b/images/macos/tests/Common.Tests.ps1 index 107937da155e..19f338a2c28e 100644 --- a/images/macos/tests/Common.Tests.ps1 +++ b/images/macos/tests/Common.Tests.ps1 @@ -9,7 +9,7 @@ Describe ".NET" { } } -Describe "GCC" -Skip:($os.IsMonterey) { +Describe "GCC" { $testCases = Get-ToolsetValue -KeyPath gcc.versions | ForEach-Object { @{Version = $_} } It "GCC <Version>" -TestCases $testCases { diff --git a/images/macos/tests/RubyGem.Tests.ps1 b/images/macos/tests/RubyGem.Tests.ps1 index cd3806886c7d..5e15d2f703cf 100644 --- a/images/macos/tests/RubyGem.Tests.ps1 +++ b/images/macos/tests/RubyGem.Tests.ps1 @@ -19,7 +19,7 @@ Describe "Bundler" { } } -Describe "Nomad shenzhen CLI" { +Describe "Nomad shenzhen CLI" -Skip:($os.IsMonterey) { It "Nomad shenzhen CLI" { "ipa --version" | Should -ReturnZeroExitCode } diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index 0f35a3188336..117a023e7a30 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -104,6 +104,11 @@ "julia" ] }, + "gcc": { + "versions": [ + "11" + ] + }, "toolcache": [ { "name": "Python", @@ -176,7 +181,6 @@ "rubygems": [ "xcode-install", "cocoapods", - "nomad-cli", "xcpretty", "bundler", "fastlane", From 7450e2dabe08637b7206a57b000e9c1fa036bbfe Mon Sep 17 00:00:00 2001 From: Shivam Mathur <shivam_jpr@hotmail.com> Date: Wed, 8 Dec 2021 13:08:39 +0530 Subject: [PATCH 0805/3485] [Windows] upgrade php version to 8.1 (#4680) --- images/win/toolsets/toolset-2016.json | 2 +- images/win/toolsets/toolset-2019.json | 2 +- images/win/toolsets/toolset-2022.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/images/win/toolsets/toolset-2016.json b/images/win/toolsets/toolset-2016.json index 22bbd544840b..d0ee7ef83bac 100644 --- a/images/win/toolsets/toolset-2016.json +++ b/images/win/toolsets/toolset-2016.json @@ -428,7 +428,7 @@ "version": "5.0" }, "php": { - "version": "8.0" + "version": "8.1" }, "llvm": { "version": "13" diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index 1a8fb546c176..99bbf7951ab9 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -460,7 +460,7 @@ "version": "5.0" }, "php": { - "version": "8.0" + "version": "8.1" }, "llvm": { "version": "13" diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index 37b3ad71ef38..fa75aaf42ed1 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -314,7 +314,7 @@ "version": "5.0" }, "php": { - "version": "8.0" + "version": "8.1" }, "postgresql": { "version": "14" From 07a22999fec8b179e4905490ed5910bd7e827c15 Mon Sep 17 00:00:00 2001 From: Nikolay Frolov <90333448+nikolai-frolov@users.noreply.github.com> Date: Wed, 8 Dec 2021 10:39:42 +0300 Subject: [PATCH 0806/3485] [Windows] Update Kotlin install (#4645) --- .../scripts/ImageHelpers/ImageHelpers.psm1 | 1 + .../scripts/ImageHelpers/InstallHelpers.ps1 | 27 +++++++++++++++++++ .../win/scripts/Installers/Install-Kotlin.ps1 | 8 +++--- images/win/toolsets/toolset-2016.json | 4 +++ images/win/toolsets/toolset-2019.json | 4 +++ images/win/toolsets/toolset-2022.json | 4 +++ 6 files changed, 45 insertions(+), 3 deletions(-) diff --git a/images/win/scripts/ImageHelpers/ImageHelpers.psm1 b/images/win/scripts/ImageHelpers/ImageHelpers.psm1 index b6545dec361b..531530f4b0ca 100644 --- a/images/win/scripts/ImageHelpers/ImageHelpers.psm1 +++ b/images/win/scripts/ImageHelpers/ImageHelpers.psm1 @@ -38,6 +38,7 @@ Export-ModuleMember -Function @( 'Choco-Install' 'Send-RequestToCocolateyPackages' 'Get-LatestChocoPackageVersion' + 'Get-GitHubPackageDownloadUrl' 'Extract-7Zip' 'Get-CommandResult' 'Get-WhichTool' diff --git a/images/win/scripts/ImageHelpers/InstallHelpers.ps1 b/images/win/scripts/ImageHelpers/InstallHelpers.ps1 index f113071d932a..4522bcf7f022 100644 --- a/images/win/scripts/ImageHelpers/InstallHelpers.ps1 +++ b/images/win/scripts/ImageHelpers/InstallHelpers.ps1 @@ -559,3 +559,30 @@ function Invoke-SBWithRetry { } } } + +function Get-GitHubPackageDownloadUrl { + param ( + [string]$RepoOwner, + [string]$RepoName, + [string]$BinaryName, + [string]$Version, + [string]$UrlFilter, + [boolean]$IsPrerelease = $false, + [int]$SearchInCount = 100 + ) + + if ($Version -eq "latest") { + $Version = "*" + } + $json = Invoke-RestMethod -Uri "https://api.github.com/repos/${RepoOwner}/${RepoName}/releases?per_page=${SearchInCount}" + $versionToDownload = ($json.Where{ $_.prerelease -eq $IsPrerelease }.tag_name | + Select-String -Pattern "\d+.\d+.\d+").Matches.Value | + Where-Object {$_ -Like "${Version}.*" -or $_ -eq ${Version}} | + Sort-Object {[version]$_} | + Select-Object -Last 1 + + $UrlFilter = $UrlFilter -replace "{BinaryName}",$BinaryName -replace "{Version}",$versionToDownload + $downloadUrl = $json.assets.browser_download_url -like $UrlFilter + + return $downloadUrl +} diff --git a/images/win/scripts/Installers/Install-Kotlin.ps1 b/images/win/scripts/Installers/Install-Kotlin.ps1 index 95be7f7777ec..09009433c27f 100644 --- a/images/win/scripts/Installers/Install-Kotlin.ps1 +++ b/images/win/scripts/Installers/Install-Kotlin.ps1 @@ -4,9 +4,11 @@ ################################################################################ # Install Kotlin -$url = "https://api.github.com/repos/JetBrains/kotlin/releases/latest" -[System.String] $kotlinLatest = (Invoke-RestMethod -Uri $url).assets.browser_download_url -match "kotlin-compiler" -$kotlinInstallerPath = Start-DownloadWithRetry -Url $kotlinLatest -Name "kotlin-compiler.zip" +$kotlinVersion = (Get-ToolsetContent).kotlin.version +$kotlinBinaryName = (Get-ToolsetContent).kotlin.binary_name + +$kotlinDownloadUrl = Get-GitHubPackageDownloadUrl -RepoOwner "JetBrains" -RepoName "kotlin" -BinaryName $kotlinBinaryName -Version $kotlinVersion -UrlFilter "*{BinaryName}-{Version}.zip" +$kotlinInstallerPath = Start-DownloadWithRetry -Url $kotlinDownloadUrl -Name "$kotlinBinaryName.zip" Write-Host "Expand Kotlin archive" $kotlinPath = "C:\tools" diff --git a/images/win/toolsets/toolset-2016.json b/images/win/toolsets/toolset-2016.json index d0ee7ef83bac..28981b3d8f9f 100644 --- a/images/win/toolsets/toolset-2016.json +++ b/images/win/toolsets/toolset-2016.json @@ -435,5 +435,9 @@ }, "postgresql": { "version": "14" + }, + "kotlin": { + "version": "latest", + "binary_name": "kotlin-compiler" } } diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index 99bbf7951ab9..51fc9bc13de6 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -467,5 +467,9 @@ }, "postgresql": { "version": "14" + }, + "kotlin": { + "version": "latest", + "binary_name": "kotlin-compiler" } } diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index fa75aaf42ed1..5c7d803e08bc 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -318,5 +318,9 @@ }, "postgresql": { "version": "14" + }, + "kotlin": { + "version": "latest", + "binary_name": "kotlin-compiler" } } From 4d7a8a0e3570f91eedc11dccce8c95eae2df6532 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Wed, 8 Dec 2021 16:02:06 +0300 Subject: [PATCH 0807/3485] [Ubuntu] do not install mysql 8.x on 18.04 (#4685) --- images/linux/scripts/installers/mysql.sh | 67 +++++++++++++------ .../linux/scripts/tests/Databases.Tests.ps1 | 4 +- 2 files changed, 47 insertions(+), 24 deletions(-) diff --git a/images/linux/scripts/installers/mysql.sh b/images/linux/scripts/installers/mysql.sh index da324ca8689a..e0f012affa36 100644 --- a/images/linux/scripts/installers/mysql.sh +++ b/images/linux/scripts/installers/mysql.sh @@ -5,40 +5,63 @@ ################################################################################ source /etc/os-release +source $HELPER_SCRIPTS/os.sh # Mysql setting up root password MYSQL_ROOT_PASSWORD=root echo "mysql-server mysql-server/root_password password $MYSQL_ROOT_PASSWORD" | debconf-set-selections echo "mysql-server mysql-server/root_password_again password $MYSQL_ROOT_PASSWORD" | debconf-set-selections -mkdir -p /tmp/mysql -pushd /tmp +# Ubuntu's repo now contains 8.0.28 which is buggy, +# see https://bugs.mysql.com/bug.php?id=105288 -# Mandatory dependency -apt-get install -y libmecab2 libaio1 +if isUbuntu20 ; then + mkdir -p /tmp/mysql + pushd /tmp -wget -q https://downloads.mysql.com/archives/get/p/23/file/mysql-server_8.0.26-1ubuntu${VERSION_ID}_amd64.deb-bundle.tar -tar -xf mysql-server_8.0.26-1ubuntu${VERSION_ID}_amd64.deb-bundle.tar -C /tmp/mysql + # Mandatory dependency + apt-get install -y libmecab2 libaio1 -pushd mysql + wget -q https://downloads.mysql.com/archives/get/p/23/file/mysql-server_8.0.26-1ubuntu${VERSION_ID}_amd64.deb-bundle.tar + tar -xf mysql-server_8.0.26-1ubuntu${VERSION_ID}_amd64.deb-bundle.tar -C /tmp/mysql -# Remove debs with debug info -rm mysql-community-*debug*.deb + pushd mysql -mysql_debs=( - mysql-common* - mysql-community-client-plugins* - mysql-community-client* - mysql-client* - mysql-community-server* - mysql-server* - libmysqlclient21* - libmysqlclient-dev* -) + # Remove debs with debug info + rm mysql-community-*debug*.deb + + mysql_debs=( + mysql-common* + mysql-community-client-plugins* + mysql-community-client* + mysql-client* + mysql-community-server* + mysql-server* + libmysqlclient21* + libmysqlclient-dev* + ) + + for package in ${mysql_debs[@]}; do + dpkg -i $package + done + + # Start mysql to change its settings + systemctl start mysql.service + # Enable mysql log-in without sudo by activation of the mysql_native_password plugin + mysql -s -N -h localhost -uroot -proot -e "ALTER USER 'root'@'localhost' IDENTIFIED WITH mysql_native_password BY 'root'; FLUSH PRIVILEGES;" +else + export ACCEPT_EULA=Y + + # Install MySQL Client + apt-get install mysql-client -y + + # Install MySQL Server + apt-get install -y mysql-server + + #Install MySQL Dev tools + apt install libmysqlclient-dev -y +fi -for package in ${mysql_debs[@]}; do -dpkg -i $package -done # Disable mysql.service systemctl is-active --quiet mysql.service && systemctl stop mysql.service systemctl disable mysql.service diff --git a/images/linux/scripts/tests/Databases.Tests.ps1 b/images/linux/scripts/tests/Databases.Tests.ps1 index b730874357c8..f80dab5c07fe 100644 --- a/images/linux/scripts/tests/Databases.Tests.ps1 +++ b/images/linux/scripts/tests/Databases.Tests.ps1 @@ -31,9 +31,9 @@ Describe "MySQL" { It "MySQL Service" { "sudo systemctl start mysql" | Should -ReturnZeroExitCode - sudo mysql -s -N -h localhost -uroot -proot -e "select count(*) from mysql.user where user='root' and authentication_string is null;" | Should -BeExactly 0 + mysql -s -N -h localhost -uroot -proot -e "select count(*) from mysql.user where user='root' and authentication_string is null;" | Should -BeExactly 0 "sudo mysql -vvv -e 'CREATE DATABASE smoke_test' -uroot -proot" | Should -ReturnZeroExitCode "sudo mysql -vvv -e 'DROP DATABASE smoke_test' -uroot -proot" | Should -ReturnZeroExitCode - "sudo systemctl stop mysql" | Should -ReturnZeroExitCode + "sudo systemctl stop mysql" | Should -ReturnZeroExitCode } } From 82bb1e015f9264af00d7980fffec7884af5f0d65 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 9 Dec 2021 08:40:23 +0000 Subject: [PATCH 0808/3485] macOS 11 (20211207 update) (#4686) * Updating readme file for macOS-11 version 20211207.1 * Fix markdown for gcc and gfortran * Remove extra whitespaces * Fix clang section * Rearrange clang lines Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-11-Readme.md | 75 ++++++++++++++++----------------- 1 file changed, 37 insertions(+), 38 deletions(-) diff --git a/images/macos/macos-11-Readme.md b/images/macos/macos-11-Readme.md index ccdf2236a7dc..e01e4d37057a 100644 --- a/images/macos/macos-11-Readme.md +++ b/images/macos/macos-11-Readme.md @@ -1,12 +1,11 @@ | Announcements | |-| -| [[all OSs] Default Nodejs version will be set to 16 on November, 29](https://github.com/actions/virtual-environments/issues/4446) | | [macOS-latest workflows will use macOS-11](https://github.com/actions/virtual-environments/issues/4060) | *** # macOS 11.6 info - System Version: macOS 11.6.1 (20G224) - Kernel Version: Darwin 20.6.0 -- Image Version: 20211127.1 +- Image Version: 20211207.1 ## Installed Software ### Language and Runtime @@ -21,32 +20,32 @@ - GNU Fortran (Homebrew GCC 10.3.0) 10.3.0 - available by `gfortran-10` alias - GNU Fortran (Homebrew GCC 11.2.0_3) 11.2.0 - available by `gfortran-11` alias - Go 1.15.15 -- julia 1.6.4 +- julia 1.7.0 - Kotlin 1.6.0-release-798 - MSBuild 16.9.0.22901 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) -- Node.js v16.13.0 +- Node.js v16.13.1 - NVM 0.39.0 -- NVM - Cached node versions: v12.22.7 v14.18.1 v16.13.0 +- NVM - Cached node versions: v12.22.7 v14.18.2 v16.13.1 - Perl 5.34.0 -- PHP 8.0.13 +- PHP 8.1.0 - Python 2.7.18 - Python 3.9.9 - Ruby 2.7.5p203 ### Package Management -- Bundler version 2.2.32 +- Bundler version 2.2.33 - Carthage 0.38.0 - CocoaPods 1.11.2 -- Composer 2.1.12 -- Homebrew 3.3.5 +- Composer 2.1.14 +- Homebrew 3.3.7 - Miniconda 4.10.3 -- NPM 8.1.0 +- NPM 8.1.2 - NuGet 5.9.0.7134 - Pip 20.3.4 (python 2.7) - Pip 21.3.1 (python 3.9) - Pipx 0.16.4 -- RubyGems 3.2.32 -- Vcpkg 2021 (build from master \<b3cfaaf1b>) +- RubyGems 3.2.33 +- Vcpkg 2021 (build from master \<7bb175eaf>) - Yarn 1.22.15 #### Environment variables @@ -58,28 +57,28 @@ ### Project Management - Apache Ant(TM) 1.10.12 - Apache Maven 3.8.4 -- Gradle 7.3 +- Gradle 7.3.1 - Sbt 1.5.5 ### Utilities - 7-Zip 17.04 - aria2 1.36.0 - azcopy 10.13.0 -- bazel 4.2.1 +- bazel 4.2.2 - bazelisk 1.10.1 - bsdtar 3.3.2 - available by 'tar' alias - Curl 7.80.0 - Git LFS: 3.0.2 - Git: 2.34.1 -- GitHub CLI: 2.2.0 +- GitHub CLI: 2.3.0 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.2 - gpg (GnuPG) 2.3.3 - helm v3.7.1+g1d11fcb - Hub CLI: 2.14.2 - jq 1.6 -- mongo v5.0.3 -- mongod v5.0.3 +- mongo v5.0.4 +- mongod v5.0.4 - Newman 5.3.0 - OpenSSL 1.1.1l 24 Aug 2021 `(/usr/local/opt/openssl@1.1 -> ../Cellar/openssl@1.1/1.1.1l_1)` - Packer 1.7.8 @@ -91,12 +90,12 @@ - zstd 1.5.0 ### Tools -- Aliyun CLI 3.0.99 +- Aliyun CLI 3.0.100 - App Center CLI 2.10.6 -- AWS CLI 2.4.2 +- AWS CLI 2.4.5 - AWS SAM CLI 1.36.0 - AWS Session Manager CLI 1.2.279.0 -- Azure CLI 2.30.0 +- Azure CLI 2.31.0 - Bicep CLI 0.4.1008 - Cabal 3.6.2.0 - Cmake 3.22.0 @@ -105,22 +104,22 @@ - GHCup 0.1.17.4 - Jazzy 0.14.1 - Stack 2.7.3 -- SwiftFormat 0.48.18 +- SwiftFormat 0.49.0 - Swig 4.0.2 - Xcode Command Line Tools 13.0.0.0.1.1630607135 ### Linters -- SwiftLint 0.45.0 +- SwiftLint 0.45.1 - yamllint 1.26.3 ### Browsers - Safari 15.1 (16612.2.9.1.30) - SafariDriver 15.1 (16612.2.9.1.30) -- Google Chrome 96.0.4664.55 +- Google Chrome 96.0.4664.93 - ChromeDriver 96.0.4664.45 -- Microsoft Edge 96.0.1054.34 -- MSEdgeDriver 96.0.1054.34 -- Mozilla Firefox 94.0.2 +- Microsoft Edge 96.0.1054.43 +- MSEdgeDriver 96.0.1054.43 +- Mozilla Firefox 95.0 - geckodriver 0.30.0 - Selenium server 4.1.0 @@ -159,20 +158,20 @@ #### Node.js - 12.22.7 -- 14.18.1 -- 16.13.0 +- 14.18.2 +- 16.13.1 #### Go | Version | Architecture | Environment Variable | | ------- | ------------ | -------------------- | | 1.15.15 (Default) | x64 | GOROOT_1_15_X64 | -| 1.16.10 | x64 | GOROOT_1_16_X64 | -| 1.17.3 | x64 | GOROOT_1_17_X64 | +| 1.16.11 | x64 | GOROOT_1_16_X64 | +| 1.17.4 | x64 | GOROOT_1_17_X64 | ### Rust Tools -- Cargo 1.56.0 -- Rust 1.56.1 -- Rustdoc 1.56.1 +- Cargo 1.57.0 +- Rust 1.57.0 +- Rustdoc 1.57.0 - Rustup 1.24.3 #### Packages @@ -180,7 +179,7 @@ - Cargo-audit 0.16.0 - Cargo-outdated v0.10.2 - Cbindgen 0.20.0 -- Clippy 0.1.56 +- Clippy 0.1.57 - Rustfmt 1.4.37-stable ### PowerShell Tools @@ -197,8 +196,8 @@ ### Web Servers | Name | Version | ConfigFile | ServiceStatus | ListenPort | | ----- | ------- | ------------------------------- | ------------- | ---------- | -| httpd | 2.4.51 | /usr/local/etc/httpd/httpd.conf | stopped | 80 | -| nginx | 1.21.4 | /usr/local/etc/nginx/nginx.conf | stopped | 80 | +| httpd | 2.4.51 | /usr/local/etc/httpd/httpd.conf | none | 80 | +| nginx | 1.21.4 | /usr/local/etc/nginx/nginx.conf | none | 80 | ### Xamarin #### Visual Studio for Mac @@ -226,7 +225,7 @@ ### Xcode | Version | Build | Path | | -------------- | -------- | ------------------------------ | -| 13.2 (beta) | 13C5081f | /Applications/Xcode_13.2.app | +| 13.2 | 13C90 | /Applications/Xcode_13.2.app | | 13.1 (default) | 13A1030d | /Applications/Xcode_13.1.app | | 13.0 | 13A233 | /Applications/Xcode_13.0.app | | 12.5.1 | 12E507 | /Applications/Xcode_12.5.1.app | @@ -306,7 +305,7 @@ | Package Name | Version | | -------------------------- | ---------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 4.0 | -| Android Emulator | 30.9.5 | +| Android Emulator | 31.1.4 | | Android SDK Build-tools | 31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | | Android SDK Platforms | android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | | Android SDK Platform-Tools | 31.0.3 | From 2e01f1d85c258b0142861f3a5bc7110243dc55de Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 9 Dec 2021 11:37:28 +0000 Subject: [PATCH 0809/3485] Updating readme file for win22 version 20211206.1 (#4673) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2022-Readme.md | 63 +++++++++++++------------------- 1 file changed, 26 insertions(+), 37 deletions(-) diff --git a/images/win/Windows2022-Readme.md b/images/win/Windows2022-Readme.md index 08d5ee88f9ca..ba043dfb2295 100644 --- a/images/win/Windows2022-Readme.md +++ b/images/win/Windows2022-Readme.md @@ -1,12 +1,11 @@ | Announcements | |-| | [Windows Server 2022 with Visual Studio 2022 is generally available starting from November, 15](https://github.com/actions/virtual-environments/issues/4488) | -| [[all OSs] Default Nodejs version will be set to 16 on November, 29](https://github.com/actions/virtual-environments/issues/4446) | | [Windows-2016 environment will be removed on March 15, 2022](https://github.com/actions/virtual-environments/issues/4312) | *** # Microsoft Windows Server 2022 Datacenter - OS Version: 10.0.20348 Build 350 -- Image Version: 20211130.3 +- Image Version: 20211206.1 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -14,11 +13,11 @@ ## Installed Software ### Language and Runtime - Bash 4.4.23(1)-release -- Go 1.16.10 -- Julia 1.6.4 +- Go 1.16.11 +- Julia 1.7.0 - Kotlin 1.5.32 - LLVM 13.0.0 -- Node 16.13.0 +- Node 16.13.1 - PHP 8.0.13 - Python 3.9.9 - Ruby 3.0.3p157 @@ -28,12 +27,12 @@ - Composer 2.1.14 - Helm 3.7.1 - Miniconda 4.10.3 (pre-installed on the image but not added to PATH) -- NPM 8.1.0 +- NPM 8.1.2 - NuGet 6.0.0.280 - pip 21.3.1 (python 3.9) - Pipx 0.16.4 - RubyGems 3.2.32 -- Vcpkg (build from master \<c1c6eb92e>) +- Vcpkg (build from master \<63e935d96>) - Yarn 1.22.17 #### Environment variables @@ -43,7 +42,7 @@ ### Project Management - Ant 1.10.12 -- Gradle 7.2 +- Gradle 7.3 - Maven 3.8.4 - sbt 1.5.5 @@ -51,7 +50,7 @@ - 7zip 21.06 - aria2 1.36.0 - azcopy 10.13.0 -- Bazel 4.2.1 +- Bazel 4.2.2 - Bazelisk 1.10.1 - Bicep 0.4.1008 - Cabal 3.6.2.0 @@ -72,7 +71,7 @@ - NSIS v3.06.1 - OpenSSL 1.1.1 - Packer 1.7.8 -- Pulumi v3.18.1 +- Pulumi v3.19.0 - R 4.1.2 - Stack 2.7.3 - Subversion (SVN) 1.14.1 @@ -85,18 +84,18 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.100 -- AWS CLI 2.4.2 +- AWS CLI 2.4.5 - AWS SAM CLI 1.36.0 - AWS Session Manager CLI 1.2.279.0 - Azure CLI 2.30.0 - Azure DevOps CLI extension 0.22.0 -- GitHub CLI 2.2.0 +- GitHub CLI 2.3.0 - Hub CLI 2.14.2 ### Rust Tools -- Cargo 1.56.0 -- Rust 1.56.1 -- Rustdoc 1.56.1 +- Cargo 1.57.0 +- Rust 1.57.0 +- Rustdoc 1.57.0 - Rustup 1.24.3 #### Packages @@ -104,14 +103,14 @@ - cargo-audit 0.16.0 - cargo-outdated v0.10.2 - cbindgen 0.20.0 -- Clippy 0.1.56 +- Clippy 0.1.57 - Rustfmt 1.4.37 ### Browsers and webdrivers - Google Chrome 96.0.4664.45 - Chrome Driver 96.0.4664.45 -- Microsoft Edge 96.0.1054.34 -- Microsoft Edge Driver 96.0.1054.34 +- Microsoft Edge 96.0.1054.43 +- Microsoft Edge Driver 96.0.1054.43 - Mozilla Firefox 94.0.2 - Gecko Driver 0.30.0 - IE Driver 3.150.1.1 @@ -141,28 +140,28 @@ ### MSYS2 - Pacman 6.0.1 + ##### Notes: ``` Location: C:\msys64 Note: MSYS2 is pre-installed on image but not added to PATH. ``` + ### Cached Tools #### Go | Version | Architecture | Environment Variable | | ------- | ------------ | -------------------- | | 1.15.15 | x64 | GOROOT_1_15_X64 | -| 1.16.10 (Default) | x64 | GOROOT_1_16_X64 | -| 1.17.3 | x64 | GOROOT_1_17_X64 | - +| 1.16.11 (Default) | x64 | GOROOT_1_16_X64 | +| 1.17.4 | x64 | GOROOT_1_17_X64 | #### Node | Version | Architecture | | ------- | ------------ | | 12.22.7 | x64 | -| 14.18.1 | x64 | -| 16.13.0 | x64 | - +| 14.18.2 | x64 | +| 16.13.1 | x64 | #### Python | Version | Architecture | @@ -172,14 +171,12 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | 3.9.9 (Default) | x64, x86 | | 3.10.0 | x64, x86 | - #### Ruby | Version | Architecture | | ------- | ------------ | | 2.7.5 | x64 | | 3.0.3 (Default) | x64 | - #### PyPy | Python Version | PyPy Version | | -------------- | ------------ | @@ -187,8 +184,6 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | 3.7.12 | PyPy 7.3.7 with MSC v.1929 64 bit (AMD64) | | 3.8.12 | PyPy 7.3.7 with MSC v.1929 64 bit (AMD64) | - - ### Databases #### PostgreSQL | Property | Value | @@ -202,21 +197,17 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | UserName | postgres | | Password | root | - #### MongoDB | Version | ServiceName | ServiceStatus | ServiceStartType | | ------- | ----------- | ------------- | ---------------- | | 5.0.4.0 | MongoDB | Running | Automatic | - - ### Database tools - Azure CosmosDb Emulator 2.14.4.0 - DacFx 15.0.5282.3 - MySQL 8.0.26.0 - SQLPS 1.0 - ### Web Servers | Name | Version | ConfigFile | ServiceName | ServiceStatus | ListenPort | | ------ | ------- | ------------------------------------- | ----------- | ------------- | ---------- | @@ -226,10 +217,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Visual Studio Enterprise 2022 | Name | Version | Path | | ----------------------------- | -------------- | -------------------------------------------------------- | -| Visual Studio Enterprise 2022 | 17.0.31912.275 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | +| Visual Studio Enterprise 2022 | 17.0.31919.166 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | #### Workloads, components and extensions: - | Package | Version | | ------------------------------------------------------------------------- | -------------- | | Component.Android.NDK.R21E | 17.0.31804.368 | @@ -409,13 +399,12 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Workload.NetWeb | 17.0.31804.368 | | Microsoft.VisualStudio.Workload.Node | 17.0.31804.368 | | Microsoft.VisualStudio.Workload.Office | 17.0.31804.368 | -| Microsoft.VisualStudio.Workload.Python | 17.0.31804.368 | +| Microsoft.VisualStudio.Workload.Python | 17.0.31919.74 | | Microsoft.VisualStudio.Workload.Universal | 17.0.31804.368 | | Microsoft.VisualStudio.Workload.VisualStudioExtension | 17.0.31804.368 | | wasm.tools | 6.0.21.52210 | #### Microsoft Visual C++: - | Name | Architecture | Version | | -------------------------------------------- | ------------ | ----------- | | Microsoft Visual C++ 2013 Additional Runtime | x64 | 12.0.40660 | @@ -460,6 +449,7 @@ 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 | | ------------------ | ---------------- | @@ -508,4 +498,3 @@ All other versions are saved but not installed. | mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:35b987eaca23cce6456c07adea57a155352dce50adf0539fd57e68f3af3e8e29 | 2021-11-03 | - From 2330c91d00a74b69957766299ce6dfa9e4816787 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 9 Dec 2021 13:26:34 +0000 Subject: [PATCH 0810/3485] Updating readme file for ubuntu18 version 20211208.3 (#4697) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu1804-README.md | 157 +++++++++++++++--------------- 1 file changed, 76 insertions(+), 81 deletions(-) diff --git a/images/linux/Ubuntu1804-README.md b/images/linux/Ubuntu1804-README.md index 525d87e57472..def03e93900b 100644 --- a/images/linux/Ubuntu1804-README.md +++ b/images/linux/Ubuntu1804-README.md @@ -1,25 +1,21 @@ -| Announcements | -|-| -| [[all OSs] Default Nodejs version will be set to 16 on November, 29](https://github.com/actions/virtual-environments/issues/4446) | -*** # Ubuntu 18.04.6 LTS -- Linux kernel version: 5.4.0-1063-azure -- Image Version: 20211129.1 +- Linux kernel version: 5.4.0-1064-azure +- Image Version: 20211208.3 ## Installed Software ### Language and Runtime - Bash 4.4.20(1)-release - Clang 9.0.0 - Clang-format 9.0.0 -- Erlang 24.1.6 (Eshell 12.1.5) +- Erlang 24.1.7 (Eshell 12.1.5) - Erlang rebar3 3.17.0 - GNU C++ 7.5.0, 9.4.0, 10.3.0 - GNU Fortran 7.5.0, 9.4.0, 10.3.0 -- Julia 1.6.4 +- Julia 1.7.0 - Kotlin 1.6.0-release-798 - Mono 6.12.0.122 (apt source repository: https://download.mono-project.com/repo/ubuntu stable-bionic main) - MSBuild 16.6.0.15201 (from /usr/lib/mono/msbuild/15.0/bin/MSBuild.dll) -- Node 16.13.0 +- Node 16.13.1 - Perl 5.26.1 - Python 2.7.17 - Python3 3.6.9 @@ -29,14 +25,14 @@ ### Package Management - cpan 1.64 - Helm 3.7.1 -- Homebrew 3.3.5 +- Homebrew 3.3.7 - Miniconda 4.10.3 -- Npm 8.1.0 +- Npm 8.1.2 - Pip 9.0.1 - Pip3 9.0.1 - Pipx 0.16.4 - RubyGems 2.7.6 -- Vcpkg (build from master \<3a68454af>) +- Vcpkg (build from master \<7bb175eaf>) - Yarn 1.22.17 #### Environment variables @@ -47,68 +43,68 @@ ### Project Management - Ant 1.10.5 -- Gradle 7.3 +- Gradle 7.3.1 - Maven 3.8.4 - Sbt 1.5.5 ### Tools -- Ansible 2.11.6 +- Ansible 2.11.7 - apt-fast 1.9.11 - AzCopy 10.13.0 (available by `azcopy` and `azcopy10` aliases) -- Bazel 4.2.1 +- Bazel 4.2.2 - Bazelisk 1.10.1 - Bicep 0.4.1008 - Buildah 1.19.6 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- CMake 3.22.0 -- CodeQL Action Bundle 2.7.2 +- CMake 3.22.1 +- CodeQL Action Bundle 2.7.3 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.1.1+azure-1 -- Docker-Buildx 0.7.0 -- Docker-Moby Client 20.10.11+azure-1 -- Docker-Moby Server 20.10.11+azure-1 +- Docker Compose v2 2.1.1+azure-2 +- Docker-Buildx 0.7.1 +- Docker-Moby Client 20.10.11+azure-2 +- Docker-Moby Server 20.10.11+azure-2 - Git 2.34.1 (apt source repository: ppa:git-core/ppa) - Git LFS 3.0.2 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.3.1 - Haveged 1.9.1 - Heroku 7.59.2 -- HHVM (HipHop VM) 4.137.0 +- HHVM (HipHop VM) 4.138.0 - jq 1.5 - Kind 0.11.1 -- Kubectl 1.22.4 +- Kubectl 1.23.0 - Kustomize 4.4.1 - Leiningen 2.9.8 - MediaInfo 17.12 - Mercurial 4.5.3 - Minikube 1.24.0 -- n 8.0.0 +- n 8.0.1 - Newman 5.3.0 - nvm 0.39.0 - OpenSSL 1.1.1 11 Sep 2018 - Packer 1.7.8 - PhantomJS 2.1.1 - Podman 3.0.1 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- Pulumi 3.18.1 +- Pulumi 3.19.0 - R 4.1.2 - Skopeo 1.2.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 - SVN 1.9.7 - Terraform 1.0.11 - yamllint 1.26.3 -- yq 4.15.1 +- yq 4.16.1 - zstd 1.5.0 (homebrew) ### CLI Tools -- Alibaba Cloud CLI 3.0.99 -- AWS CLI 1.22.14 +- Alibaba Cloud CLI 3.0.100 +- AWS CLI 1.22.21 - AWS CLI Session manager plugin 1.2.279.0 - AWS SAM CLI 1.36.0 -- Azure CLI (azure-cli) 2.30.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) +- Azure CLI (azure-cli) 2.31.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.22.0 -- GitHub CLI 2.2.0 -- Google Cloud SDK 365.0.1 (apt source repository: https://packages.cloud.google.com/apt) +- GitHub CLI 2.3.0 +- Google Cloud SDK 366.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 8.0.3 -- OpenShift CLI 4.9.8 +- Netlify CLI 8.0.16 +- OpenShift CLI 4.9.10 - ORAS CLI 0.12.0 - Vercel CLI 23.1.2 @@ -120,11 +116,11 @@ | 12.0.2+10 | Adopt OpenJDK | JAVA_HOME_12_X64 | ### PHP -| Tool | Version | -| -------- | ---------------------------------- | -| PHP | 7.1.33 7.2.34 7.3.33 7.4.26 8.0.13 | -| Composer | 2.1.12 | -| PHPUnit | 8.5.21 | +| Tool | Version | +| -------- | ---------------------------------------- | +| PHP | 7.1.33 7.2.34 7.3.33 7.4.26 8.0.13 8.1.0 | +| Composer | 2.1.14 | +| PHPUnit | 8.5.21 | ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ``` @@ -135,21 +131,21 @@ - Stack 2.7.3 ### Rust Tools -- Cargo 1.56.0 -- Rust 1.56.1 -- Rustdoc 1.56.1 +- Cargo 1.57.0 +- Rust 1.57.0 +- Rustdoc 1.57.0 - Rustup 1.24.3 #### Packages - Bindgen 0.59.2 - Cargo audit 0.16.0 -- Cargo clippy 0.1.56 +- Cargo clippy 0.1.57 - Cargo outdated 0.10.2 - Cbindgen 0.20.0 - Rustfmt 1.4.37 ### Browsers and Drivers -- Google Chrome 96.0.4664.45 +- Google Chrome 96.0.4664.93 - ChromeDriver 96.0.4664.45 - Mozilla Firefox 94.0 - Geckodriver 0.30.0 @@ -167,12 +163,12 @@ - 2.1.302 2.1.403 2.1.526 2.1.617 2.1.701 2.1.818 3.1.120 3.1.202 3.1.302 3.1.415 5.0.104 5.0.209 5.0.303 5.0.403 ### Databases -- MongoDB 5.0.4 (apt source repository: https://repo.mongodb.org/apt/ubuntu) +- MongoDB 5.0.5 (apt source repository: https://repo.mongodb.org/apt/ubuntu) - PostgreSQL 14.1 (apt source repository: https://apt.postgresql.org/pub/repos/apt/) - sqlite3 3.22.0 #### MySQL -- MySQL 5.7.36 +- MySQL 5.7.36-0ubuntu0.18.04.1 - MySQL Server (user:root password:root) ``` @@ -185,13 +181,13 @@ ### Cached Tools #### Go - 1.15.15 -- 1.16.10 -- 1.17.3 +- 1.16.11 +- 1.17.4 #### Node.js - 12.22.7 -- 14.18.1 -- 16.13.0 +- 14.18.2 +- 16.13.1 #### PyPy - 2.7.18 [PyPy 7.3.6] @@ -217,8 +213,8 @@ | Name | Value | Architecture | | --------------- | ----------------------------------- | ------------ | | GOROOT_1_15_X64 | /opt/hostedtoolcache/go/1.15.15/x64 | x64 | -| GOROOT_1_16_X64 | /opt/hostedtoolcache/go/1.16.10/x64 | x64 | -| GOROOT_1_17_X64 | /opt/hostedtoolcache/go/1.17.3/x64 | x64 | +| GOROOT_1_16_X64 | /opt/hostedtoolcache/go/1.16.11/x64 | x64 | +| GOROOT_1_17_X64 | /opt/hostedtoolcache/go/1.17.4/x64 | x64 | ### PowerShell Tools - PowerShell 7.2.0 @@ -239,21 +235,21 @@ | nginx | 1.14.0 | /etc/nginx/nginx.conf | inactive | 80 | ### Android -| Package Name | Version | -| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 4.0 | -| Android Emulator | 30.9.5 | -| Android SDK Build-tools | 31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3<br>26.0.0 26.0.1 26.0.2 26.0.3<br>25.0.0 25.0.1 25.0.2 25.0.3<br>24.0.0 24.0.1 24.0.2 24.0.3<br>23.0.1 23.0.2 23.0.3 | -| Android SDK Platform-Tools | 31.0.3 | -| Android SDK Platforms | android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3)<br>android-26 (rev 2)<br>android-25 (rev 3)<br>android-24 (rev 2)<br>android-23 (rev 3) | -| Android SDK Tools | 26.1.1 | -| Android Support Repository | 47.0.0 | -| CMake | 3.10.2<br>3.18.1 | -| Google APIs | addon-google_apis-google-21<br>addon-google_apis-google-22<br>addon-google_apis-google-23<br>addon-google_apis-google-24 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 21.4.7075529 (default)<br>23.1.7779620 | -| SDK Patch Applier v4 | 1 | +| Package Name | Version | +| -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 4.0 | +| Android Emulator | 31.1.4 | +| Android SDK Build-tools | 32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3<br>26.0.0 26.0.1 26.0.2 26.0.3<br>25.0.0 25.0.1 25.0.2 25.0.3<br>24.0.0 24.0.1 24.0.2 24.0.3<br>23.0.1 23.0.2 23.0.3 | +| Android SDK Platform-Tools | 31.0.3 | +| Android SDK Platforms | android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3)<br>android-26 (rev 2)<br>android-25 (rev 3)<br>android-24 (rev 2)<br>android-23 (rev 3) | +| Android SDK Tools | 26.1.1 | +| Android Support Repository | 47.0.0 | +| CMake | 3.10.2<br>3.18.1 | +| Google APIs | addon-google_apis-google-21<br>addon-google_apis-google-22<br>addon-google_apis-google-23<br>addon-google_apis-google-24 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 21.4.7075529 (default)<br>23.1.7779620 | +| SDK Patch Applier v4 | 1 | #### Environment variables | Name | Value | @@ -270,19 +266,19 @@ | alpine:3.12 | sha256:d9459083f962de6bd980ae6a05be2a4cf670df6a1d898157bceb420342bec280 | 2021-11-12 | | alpine:3.13 | sha256:026f721af4cf2843e07bba648e158fb35ecc876d822130633cc49f707f0fc88c | 2021-11-12 | | alpine:3.14 | sha256:635f0aa53d99017b38d1a0aa5b2082f7812b03e3cdb299103fe77b5c8a07f1d2 | 2021-11-12 | -| buildpack-deps:bullseye | sha256:b83c9c8628517694fc9adea2dc25f70113f511606482c79e1a7689ba4893f7c4 | 2021-11-17 | -| buildpack-deps:buster | sha256:184194bf02563c474132a6982ed5878ef32b19b9f2a10029422ab304ca88ade1 | 2021-11-17 | -| buildpack-deps:stretch | sha256:36fba449401e28a20c9fc9ebae94b4071c0a69bab5aade3340539ac9c857375a | 2021-11-17 | -| debian:10 | sha256:e5333f8697a86fa1be53b2a7e994247083f61885166df0cdda9f812acb514d7c | 2021-11-17 | -| debian:11 | sha256:e8c184b56a94db0947a9d51ec68f42ef5584442f20547fa3bd8cbd00203b2e7a | 2021-11-17 | -| debian:9 | sha256:d8ee86bf0afeb901de293c692a540307a670306cbdb7a06e2c840f17b0c35374 | 2021-11-17 | +| buildpack-deps:bullseye | sha256:5445b145c8a1a2f7e5a4b233f571c629aed12fce435496f942ad267f21a05ff2 | 2021-12-02 | +| buildpack-deps:buster | sha256:c11cd0a4c97acd1aa8d2289aee5c126ac78adc48108744c104f6741cbd9a1f6c | 2021-12-02 | +| buildpack-deps:stretch | sha256:bb93e2c2858cb20f7f16e433773adb2c583fce38dc9c71976c62bf098f956093 | 2021-12-02 | +| debian:10 | sha256:5b57f8c365c40fde437d53b953c436995525be7c481eb0128b1cbf3b49b0df18 | 2021-12-02 | +| debian:11 | sha256:45ee40a844048c2f6d0105899c1a17733530b56d481612608aab5e2e4048570b | 2021-12-02 | +| debian:9 | sha256:aa78ddaa7f8a14bad8f940ebff5542377f91843f6dcc168e41a8628c6007e815 | 2021-12-02 | | moby/buildkit:latest | sha256:d6c89b7085b106301645ddcc77cf64eb7b705ab507b72d52d130ac33f1300417 | 2021-11-18 | -| node:12 | sha256:cb615135757e6e2eed4fad6d80f07b13d9f35072700c01da6de26fde5c9e8632 | 2021-11-17 | +| node:12 | sha256:eb92ed2473762b6d11736a4b4345aa3ef68f773999fe633bc4d9c91fa5d8f9d6 | 2021-12-02 | | node:12-alpine | sha256:0eca266c5fe38ba93aebac00e45c9ac1bb7328b0702a6dc10e1a6ea543d49301 | 2021-11-13 | -| node:14 | sha256:fbd6954d3941ebd1e12cd995dc10a4994535aa44d47271a91a829a2d1f88fc4c | 2021-11-17 | -| node:14-alpine | sha256:240e1e6ef6dfba3bb70d6e88cca6cbb0b5a6f3a2b4496ed7edc5474e8ed594bd | 2021-11-13 | -| node:16 | sha256:580a0850049c59a48f06090edd48c9f966c5e6572bbbabc369ba3ecbc4855dba | 2021-11-17 | -| node:16-alpine | sha256:60ef0bed1dc2ec835cfe3c4226d074fdfaba571fd619c280474cc04e93f0ec5b | 2021-11-13 | +| node:14 | sha256:52c884d7cf8509c27def168415a1ff23a0bd95d358dd5787ca77b60474dcb3db | 2021-12-02 | +| node:14-alpine | sha256:7bcf853eeb97a25465cb385b015606c22e926f548cbd117f85b7196df8aa0d29 | 2021-12-02 | +| node:16 | sha256:89b59ce49929d8a8e230946bdb1b58c14cdbbb86c9a7397610afcecfce1be035 | 2021-12-02 | +| node:16-alpine | sha256:a9b9cb880fa429b0bea899cd3b1bc081ab7277cc97e6d2dcd84bd9753b2027e1 | 2021-12-02 | | ubuntu:16.04 | sha256:0f71fa8d4d2d4292c3c617fda2b36f6dabe5c8b6e34c3dc5b0d17d4e704bd39c | 2021-08-31 | | ubuntu:18.04 | sha256:0fedbd5bd9fb72089c7bbca476949e10593cebed9b1fb9edf5b79dbbacddd7d6 | 2021-10-01 | | ubuntu:20.04 | sha256:626ffe58f6e7566e00254b638eb7e0f3b11d4da9675088f4781a50ae288f3322 | 2021-10-16 | @@ -307,7 +303,7 @@ | ftp | 0.17-34 | | gnupg2 | 2.2.4-1ubuntu1.4 | | haveged | 1.9.1-6 | -| imagemagick | 8:6.9.7.4+dfsg-16ubuntu6.11 | +| imagemagick | 8:6.9.7.4+dfsg-16ubuntu6.12 | | iproute2 | 4.15.0-2ubuntu1.3 | | iputils-ping | 3:20161105-1ubuntu3 | | jq | 1.5+dfsg-2 | @@ -320,8 +316,8 @@ | libgsl-dev | 2.4+dfsg-6 | | libgtk-3-0 | 3.22.30-1ubuntu4 | | libmagic-dev | 1:5.32-2ubuntu0.4 | -| libmagickcore-dev | 8:6.9.7.4+dfsg-16ubuntu6.11 | -| libmagickwand-dev | 8:6.9.7.4+dfsg-16ubuntu6.11 | +| libmagickcore-dev | 8:6.9.7.4+dfsg-16ubuntu6.12 | +| libmagickwand-dev | 8:6.9.7.4+dfsg-16ubuntu6.12 | | libsecret-1-dev | 0.18.6-1 | | libsqlite3-dev | 3.22.0-1ubuntu0.4 | | libunwind8 | 1.2.1-8 | @@ -366,4 +362,3 @@ | zip | 3.0-11build1 | | zsync | 0.6.2-3ubuntu1 | - From ee0629bfc34c345a0d95f587f394d79a023c81f6 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Thu, 9 Dec 2021 16:56:27 +0300 Subject: [PATCH 0811/3485] Revert "Updating readme file for ubuntu18 version 20211208.3 (#4697)" (#4704) This reverts commit 2330c91d00a74b69957766299ce6dfa9e4816787. --- images/linux/Ubuntu1804-README.md | 157 +++++++++++++++--------------- 1 file changed, 81 insertions(+), 76 deletions(-) diff --git a/images/linux/Ubuntu1804-README.md b/images/linux/Ubuntu1804-README.md index def03e93900b..525d87e57472 100644 --- a/images/linux/Ubuntu1804-README.md +++ b/images/linux/Ubuntu1804-README.md @@ -1,21 +1,25 @@ +| Announcements | +|-| +| [[all OSs] Default Nodejs version will be set to 16 on November, 29](https://github.com/actions/virtual-environments/issues/4446) | +*** # Ubuntu 18.04.6 LTS -- Linux kernel version: 5.4.0-1064-azure -- Image Version: 20211208.3 +- Linux kernel version: 5.4.0-1063-azure +- Image Version: 20211129.1 ## Installed Software ### Language and Runtime - Bash 4.4.20(1)-release - Clang 9.0.0 - Clang-format 9.0.0 -- Erlang 24.1.7 (Eshell 12.1.5) +- Erlang 24.1.6 (Eshell 12.1.5) - Erlang rebar3 3.17.0 - GNU C++ 7.5.0, 9.4.0, 10.3.0 - GNU Fortran 7.5.0, 9.4.0, 10.3.0 -- Julia 1.7.0 +- Julia 1.6.4 - Kotlin 1.6.0-release-798 - Mono 6.12.0.122 (apt source repository: https://download.mono-project.com/repo/ubuntu stable-bionic main) - MSBuild 16.6.0.15201 (from /usr/lib/mono/msbuild/15.0/bin/MSBuild.dll) -- Node 16.13.1 +- Node 16.13.0 - Perl 5.26.1 - Python 2.7.17 - Python3 3.6.9 @@ -25,14 +29,14 @@ ### Package Management - cpan 1.64 - Helm 3.7.1 -- Homebrew 3.3.7 +- Homebrew 3.3.5 - Miniconda 4.10.3 -- Npm 8.1.2 +- Npm 8.1.0 - Pip 9.0.1 - Pip3 9.0.1 - Pipx 0.16.4 - RubyGems 2.7.6 -- Vcpkg (build from master \<7bb175eaf>) +- Vcpkg (build from master \<3a68454af>) - Yarn 1.22.17 #### Environment variables @@ -43,68 +47,68 @@ ### Project Management - Ant 1.10.5 -- Gradle 7.3.1 +- Gradle 7.3 - Maven 3.8.4 - Sbt 1.5.5 ### Tools -- Ansible 2.11.7 +- Ansible 2.11.6 - apt-fast 1.9.11 - AzCopy 10.13.0 (available by `azcopy` and `azcopy10` aliases) -- Bazel 4.2.2 +- Bazel 4.2.1 - Bazelisk 1.10.1 - Bicep 0.4.1008 - Buildah 1.19.6 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- CMake 3.22.1 -- CodeQL Action Bundle 2.7.3 +- CMake 3.22.0 +- CodeQL Action Bundle 2.7.2 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.1.1+azure-2 -- Docker-Buildx 0.7.1 -- Docker-Moby Client 20.10.11+azure-2 -- Docker-Moby Server 20.10.11+azure-2 +- Docker Compose v2 2.1.1+azure-1 +- Docker-Buildx 0.7.0 +- Docker-Moby Client 20.10.11+azure-1 +- Docker-Moby Server 20.10.11+azure-1 - Git 2.34.1 (apt source repository: ppa:git-core/ppa) - Git LFS 3.0.2 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.3.1 - Haveged 1.9.1 - Heroku 7.59.2 -- HHVM (HipHop VM) 4.138.0 +- HHVM (HipHop VM) 4.137.0 - jq 1.5 - Kind 0.11.1 -- Kubectl 1.23.0 +- Kubectl 1.22.4 - Kustomize 4.4.1 - Leiningen 2.9.8 - MediaInfo 17.12 - Mercurial 4.5.3 - Minikube 1.24.0 -- n 8.0.1 +- n 8.0.0 - Newman 5.3.0 - nvm 0.39.0 - OpenSSL 1.1.1 11 Sep 2018 - Packer 1.7.8 - PhantomJS 2.1.1 - Podman 3.0.1 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- Pulumi 3.19.0 +- Pulumi 3.18.1 - R 4.1.2 - Skopeo 1.2.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 - SVN 1.9.7 - Terraform 1.0.11 - yamllint 1.26.3 -- yq 4.16.1 +- yq 4.15.1 - zstd 1.5.0 (homebrew) ### CLI Tools -- Alibaba Cloud CLI 3.0.100 -- AWS CLI 1.22.21 +- Alibaba Cloud CLI 3.0.99 +- AWS CLI 1.22.14 - AWS CLI Session manager plugin 1.2.279.0 - AWS SAM CLI 1.36.0 -- Azure CLI (azure-cli) 2.31.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) +- Azure CLI (azure-cli) 2.30.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.22.0 -- GitHub CLI 2.3.0 -- Google Cloud SDK 366.0.0 (apt source repository: https://packages.cloud.google.com/apt) +- GitHub CLI 2.2.0 +- Google Cloud SDK 365.0.1 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 8.0.16 -- OpenShift CLI 4.9.10 +- Netlify CLI 8.0.3 +- OpenShift CLI 4.9.8 - ORAS CLI 0.12.0 - Vercel CLI 23.1.2 @@ -116,11 +120,11 @@ | 12.0.2+10 | Adopt OpenJDK | JAVA_HOME_12_X64 | ### PHP -| Tool | Version | -| -------- | ---------------------------------------- | -| PHP | 7.1.33 7.2.34 7.3.33 7.4.26 8.0.13 8.1.0 | -| Composer | 2.1.14 | -| PHPUnit | 8.5.21 | +| Tool | Version | +| -------- | ---------------------------------- | +| PHP | 7.1.33 7.2.34 7.3.33 7.4.26 8.0.13 | +| Composer | 2.1.12 | +| PHPUnit | 8.5.21 | ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ``` @@ -131,21 +135,21 @@ - Stack 2.7.3 ### Rust Tools -- Cargo 1.57.0 -- Rust 1.57.0 -- Rustdoc 1.57.0 +- Cargo 1.56.0 +- Rust 1.56.1 +- Rustdoc 1.56.1 - Rustup 1.24.3 #### Packages - Bindgen 0.59.2 - Cargo audit 0.16.0 -- Cargo clippy 0.1.57 +- Cargo clippy 0.1.56 - Cargo outdated 0.10.2 - Cbindgen 0.20.0 - Rustfmt 1.4.37 ### Browsers and Drivers -- Google Chrome 96.0.4664.93 +- Google Chrome 96.0.4664.45 - ChromeDriver 96.0.4664.45 - Mozilla Firefox 94.0 - Geckodriver 0.30.0 @@ -163,12 +167,12 @@ - 2.1.302 2.1.403 2.1.526 2.1.617 2.1.701 2.1.818 3.1.120 3.1.202 3.1.302 3.1.415 5.0.104 5.0.209 5.0.303 5.0.403 ### Databases -- MongoDB 5.0.5 (apt source repository: https://repo.mongodb.org/apt/ubuntu) +- MongoDB 5.0.4 (apt source repository: https://repo.mongodb.org/apt/ubuntu) - PostgreSQL 14.1 (apt source repository: https://apt.postgresql.org/pub/repos/apt/) - sqlite3 3.22.0 #### MySQL -- MySQL 5.7.36-0ubuntu0.18.04.1 +- MySQL 5.7.36 - MySQL Server (user:root password:root) ``` @@ -181,13 +185,13 @@ ### Cached Tools #### Go - 1.15.15 -- 1.16.11 -- 1.17.4 +- 1.16.10 +- 1.17.3 #### Node.js - 12.22.7 -- 14.18.2 -- 16.13.1 +- 14.18.1 +- 16.13.0 #### PyPy - 2.7.18 [PyPy 7.3.6] @@ -213,8 +217,8 @@ | Name | Value | Architecture | | --------------- | ----------------------------------- | ------------ | | GOROOT_1_15_X64 | /opt/hostedtoolcache/go/1.15.15/x64 | x64 | -| GOROOT_1_16_X64 | /opt/hostedtoolcache/go/1.16.11/x64 | x64 | -| GOROOT_1_17_X64 | /opt/hostedtoolcache/go/1.17.4/x64 | x64 | +| GOROOT_1_16_X64 | /opt/hostedtoolcache/go/1.16.10/x64 | x64 | +| GOROOT_1_17_X64 | /opt/hostedtoolcache/go/1.17.3/x64 | x64 | ### PowerShell Tools - PowerShell 7.2.0 @@ -235,21 +239,21 @@ | nginx | 1.14.0 | /etc/nginx/nginx.conf | inactive | 80 | ### Android -| Package Name | Version | -| -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 4.0 | -| Android Emulator | 31.1.4 | -| Android SDK Build-tools | 32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3<br>26.0.0 26.0.1 26.0.2 26.0.3<br>25.0.0 25.0.1 25.0.2 25.0.3<br>24.0.0 24.0.1 24.0.2 24.0.3<br>23.0.1 23.0.2 23.0.3 | -| Android SDK Platform-Tools | 31.0.3 | -| Android SDK Platforms | android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3)<br>android-26 (rev 2)<br>android-25 (rev 3)<br>android-24 (rev 2)<br>android-23 (rev 3) | -| Android SDK Tools | 26.1.1 | -| Android Support Repository | 47.0.0 | -| CMake | 3.10.2<br>3.18.1 | -| Google APIs | addon-google_apis-google-21<br>addon-google_apis-google-22<br>addon-google_apis-google-23<br>addon-google_apis-google-24 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 21.4.7075529 (default)<br>23.1.7779620 | -| SDK Patch Applier v4 | 1 | +| Package Name | Version | +| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 4.0 | +| Android Emulator | 30.9.5 | +| Android SDK Build-tools | 31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3<br>26.0.0 26.0.1 26.0.2 26.0.3<br>25.0.0 25.0.1 25.0.2 25.0.3<br>24.0.0 24.0.1 24.0.2 24.0.3<br>23.0.1 23.0.2 23.0.3 | +| Android SDK Platform-Tools | 31.0.3 | +| Android SDK Platforms | android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3)<br>android-26 (rev 2)<br>android-25 (rev 3)<br>android-24 (rev 2)<br>android-23 (rev 3) | +| Android SDK Tools | 26.1.1 | +| Android Support Repository | 47.0.0 | +| CMake | 3.10.2<br>3.18.1 | +| Google APIs | addon-google_apis-google-21<br>addon-google_apis-google-22<br>addon-google_apis-google-23<br>addon-google_apis-google-24 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 21.4.7075529 (default)<br>23.1.7779620 | +| SDK Patch Applier v4 | 1 | #### Environment variables | Name | Value | @@ -266,19 +270,19 @@ | alpine:3.12 | sha256:d9459083f962de6bd980ae6a05be2a4cf670df6a1d898157bceb420342bec280 | 2021-11-12 | | alpine:3.13 | sha256:026f721af4cf2843e07bba648e158fb35ecc876d822130633cc49f707f0fc88c | 2021-11-12 | | alpine:3.14 | sha256:635f0aa53d99017b38d1a0aa5b2082f7812b03e3cdb299103fe77b5c8a07f1d2 | 2021-11-12 | -| buildpack-deps:bullseye | sha256:5445b145c8a1a2f7e5a4b233f571c629aed12fce435496f942ad267f21a05ff2 | 2021-12-02 | -| buildpack-deps:buster | sha256:c11cd0a4c97acd1aa8d2289aee5c126ac78adc48108744c104f6741cbd9a1f6c | 2021-12-02 | -| buildpack-deps:stretch | sha256:bb93e2c2858cb20f7f16e433773adb2c583fce38dc9c71976c62bf098f956093 | 2021-12-02 | -| debian:10 | sha256:5b57f8c365c40fde437d53b953c436995525be7c481eb0128b1cbf3b49b0df18 | 2021-12-02 | -| debian:11 | sha256:45ee40a844048c2f6d0105899c1a17733530b56d481612608aab5e2e4048570b | 2021-12-02 | -| debian:9 | sha256:aa78ddaa7f8a14bad8f940ebff5542377f91843f6dcc168e41a8628c6007e815 | 2021-12-02 | +| buildpack-deps:bullseye | sha256:b83c9c8628517694fc9adea2dc25f70113f511606482c79e1a7689ba4893f7c4 | 2021-11-17 | +| buildpack-deps:buster | sha256:184194bf02563c474132a6982ed5878ef32b19b9f2a10029422ab304ca88ade1 | 2021-11-17 | +| buildpack-deps:stretch | sha256:36fba449401e28a20c9fc9ebae94b4071c0a69bab5aade3340539ac9c857375a | 2021-11-17 | +| debian:10 | sha256:e5333f8697a86fa1be53b2a7e994247083f61885166df0cdda9f812acb514d7c | 2021-11-17 | +| debian:11 | sha256:e8c184b56a94db0947a9d51ec68f42ef5584442f20547fa3bd8cbd00203b2e7a | 2021-11-17 | +| debian:9 | sha256:d8ee86bf0afeb901de293c692a540307a670306cbdb7a06e2c840f17b0c35374 | 2021-11-17 | | moby/buildkit:latest | sha256:d6c89b7085b106301645ddcc77cf64eb7b705ab507b72d52d130ac33f1300417 | 2021-11-18 | -| node:12 | sha256:eb92ed2473762b6d11736a4b4345aa3ef68f773999fe633bc4d9c91fa5d8f9d6 | 2021-12-02 | +| node:12 | sha256:cb615135757e6e2eed4fad6d80f07b13d9f35072700c01da6de26fde5c9e8632 | 2021-11-17 | | node:12-alpine | sha256:0eca266c5fe38ba93aebac00e45c9ac1bb7328b0702a6dc10e1a6ea543d49301 | 2021-11-13 | -| node:14 | sha256:52c884d7cf8509c27def168415a1ff23a0bd95d358dd5787ca77b60474dcb3db | 2021-12-02 | -| node:14-alpine | sha256:7bcf853eeb97a25465cb385b015606c22e926f548cbd117f85b7196df8aa0d29 | 2021-12-02 | -| node:16 | sha256:89b59ce49929d8a8e230946bdb1b58c14cdbbb86c9a7397610afcecfce1be035 | 2021-12-02 | -| node:16-alpine | sha256:a9b9cb880fa429b0bea899cd3b1bc081ab7277cc97e6d2dcd84bd9753b2027e1 | 2021-12-02 | +| node:14 | sha256:fbd6954d3941ebd1e12cd995dc10a4994535aa44d47271a91a829a2d1f88fc4c | 2021-11-17 | +| node:14-alpine | sha256:240e1e6ef6dfba3bb70d6e88cca6cbb0b5a6f3a2b4496ed7edc5474e8ed594bd | 2021-11-13 | +| node:16 | sha256:580a0850049c59a48f06090edd48c9f966c5e6572bbbabc369ba3ecbc4855dba | 2021-11-17 | +| node:16-alpine | sha256:60ef0bed1dc2ec835cfe3c4226d074fdfaba571fd619c280474cc04e93f0ec5b | 2021-11-13 | | ubuntu:16.04 | sha256:0f71fa8d4d2d4292c3c617fda2b36f6dabe5c8b6e34c3dc5b0d17d4e704bd39c | 2021-08-31 | | ubuntu:18.04 | sha256:0fedbd5bd9fb72089c7bbca476949e10593cebed9b1fb9edf5b79dbbacddd7d6 | 2021-10-01 | | ubuntu:20.04 | sha256:626ffe58f6e7566e00254b638eb7e0f3b11d4da9675088f4781a50ae288f3322 | 2021-10-16 | @@ -303,7 +307,7 @@ | ftp | 0.17-34 | | gnupg2 | 2.2.4-1ubuntu1.4 | | haveged | 1.9.1-6 | -| imagemagick | 8:6.9.7.4+dfsg-16ubuntu6.12 | +| imagemagick | 8:6.9.7.4+dfsg-16ubuntu6.11 | | iproute2 | 4.15.0-2ubuntu1.3 | | iputils-ping | 3:20161105-1ubuntu3 | | jq | 1.5+dfsg-2 | @@ -316,8 +320,8 @@ | libgsl-dev | 2.4+dfsg-6 | | libgtk-3-0 | 3.22.30-1ubuntu4 | | libmagic-dev | 1:5.32-2ubuntu0.4 | -| libmagickcore-dev | 8:6.9.7.4+dfsg-16ubuntu6.12 | -| libmagickwand-dev | 8:6.9.7.4+dfsg-16ubuntu6.12 | +| libmagickcore-dev | 8:6.9.7.4+dfsg-16ubuntu6.11 | +| libmagickwand-dev | 8:6.9.7.4+dfsg-16ubuntu6.11 | | libsecret-1-dev | 0.18.6-1 | | libsqlite3-dev | 3.22.0-1ubuntu0.4 | | libunwind8 | 1.2.1-8 | @@ -362,3 +366,4 @@ | zip | 3.0-11build1 | | zsync | 0.6.2-3ubuntu1 | + From 8a7123162fe2ff255e6f5b6ec395f198bd02eb1f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 9 Dec 2021 14:10:17 +0000 Subject: [PATCH 0812/3485] macOS 10.15 (20211207 update) (#4692) * Updating readme file for macOS-10.15 version 20211207.1 * Add new lines to gcc, clang, gfrotran * Move clang line Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-10.15-Readme.md | 71 +++++++++++++++--------------- 1 file changed, 35 insertions(+), 36 deletions(-) diff --git a/images/macos/macos-10.15-Readme.md b/images/macos/macos-10.15-Readme.md index 13b2bbdbfd51..04267f0caae1 100644 --- a/images/macos/macos-10.15-Readme.md +++ b/images/macos/macos-10.15-Readme.md @@ -1,12 +1,11 @@ | Announcements | |-| -| [[all OSs] Default Nodejs version will be set to 16 on November, 29](https://github.com/actions/virtual-environments/issues/4446) | | [macOS-latest workflows will use macOS-11](https://github.com/actions/virtual-environments/issues/4060) | *** # macOS 10.15 info - System Version: macOS 10.15.7 (19H1519) - Kernel Version: Darwin 19.6.0 -- Image Version: 20211126.1 +- Image Version: 20211207.1 ## Installed Software ### Language and Runtime @@ -21,33 +20,33 @@ - GNU Fortran (Homebrew GCC 10.3.0) 10.3.0 - available by `gfortran-10` alias - GNU Fortran (Homebrew GCC 11.2.0_3) 11.2.0 - available by `gfortran-11` alias - Go 1.15.15 -- julia 1.6.4 +- julia 1.7.0 - Kotlin 1.6.0-release-798 - MSBuild 16.9.0.22901 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) -- Node.js v16.13.0 +- Node.js v16.13.1 - NVM 0.39.0 -- NVM - Cached node versions: v12.22.7 v14.18.1 v16.13.0 +- NVM - Cached node versions: v12.22.7 v14.18.2 v16.13.1 - Perl 5.34.0 -- PHP 8.0.13 +- PHP 8.1.0 - Python 2.7.18 - Python 3.9.9 - R 4.1.2 - Ruby 2.7.5p203 ### Package Management -- Bundler version 2.2.32 +- Bundler version 2.2.33 - Carthage 0.38.0 - CocoaPods 1.11.2 -- Composer 2.1.12 -- Homebrew 3.3.5 +- Composer 2.1.14 +- Homebrew 3.3.7 - Miniconda 4.10.3 -- NPM 8.1.0 +- NPM 8.1.2 - NuGet 5.9.0.7134 - Pip 20.3.4 (python 2.7) - Pip 21.3.1 (python 3.9) - Pipx 0.16.4 -- RubyGems 3.2.32 -- Vcpkg 2021 (build from master \<b3cfaaf1b>) +- RubyGems 3.2.33 +- Vcpkg 2021 (build from master \<7bb175eaf>) - Yarn 1.22.15 #### Environment variables @@ -59,20 +58,20 @@ ### Project Management - Apache Ant(TM) 1.10.12 - Apache Maven 3.8.4 -- Gradle 7.3 +- Gradle 7.3.1 - Sbt 1.5.5 ### Utilities - 7-Zip 17.04 - aria2 1.36.0 - azcopy 10.13.0 -- bazel 4.2.1 +- bazel 4.2.2 - bazelisk 1.10.1 - bsdtar 3.3.2 - available by 'tar' alias - Curl 7.80.0 - Git LFS: 3.0.2 - Git: 2.34.1 -- GitHub CLI: 2.2.0 +- GitHub CLI: 2.3.0 - GNU parallel 20211122 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.2 @@ -80,8 +79,8 @@ - helm v3.7.1+g1d11fcb - Hub CLI: 2.14.2 - jq 1.6 -- mongo v5.0.3 -- mongod v5.0.3 +- mongo v5.0.4 +- mongod v5.0.4 - Newman 5.3.0 - OpenSSL 1.1.1l 24 Aug 2021 `(/usr/local/opt/openssl@1.1 -> ../Cellar/openssl@1.1/1.1.1l_1)` - Packer 1.7.8 @@ -95,12 +94,12 @@ - zstd 1.5.0 ### Tools -- Aliyun CLI 3.0.99 +- Aliyun CLI 3.0.100 - App Center CLI 2.10.6 -- AWS CLI 2.4.2 +- AWS CLI 2.4.5 - AWS SAM CLI 1.36.0 - AWS Session Manager CLI 1.2.279.0 -- Azure CLI 2.30.0 +- Azure CLI 2.31.0 - Bicep CLI 0.4.1008 - Cabal 3.6.2.0 - Cmake 3.22.0 @@ -109,21 +108,21 @@ - GHCup 0.1.17.4 - Jazzy 0.14.1 - Stack 2.7.3 -- SwiftFormat 0.48.18 +- SwiftFormat 0.49.0 - Swig 4.0.2 - Xcode Command Line Tools 12.4.0.0.1.1610135815 ### Linters -- SwiftLint 0.45.0 +- SwiftLint 0.45.1 - yamllint 1.26.3 ### Browsers - Safari 15.1 (15612.2.9.1.30) - SafariDriver 15.1 (15612.2.9.1.30) -- Google Chrome 96.0.4664.55 +- Google Chrome 96.0.4664.93 - ChromeDriver 96.0.4664.45 -- Microsoft Edge 96.0.1054.34 -- MSEdgeDriver 96.0.1054.34 +- Microsoft Edge 96.0.1054.43 +- MSEdgeDriver 96.0.1054.43 - Mozilla Firefox 94.0.2 - geckodriver 0.30.0 - Selenium server 4.1.0 @@ -170,20 +169,20 @@ #### Node.js - 12.22.7 -- 14.18.1 -- 16.13.0 +- 14.18.2 +- 16.13.1 #### Go | Version | Architecture | Environment Variable | | ------- | ------------ | -------------------- | | 1.15.15 (Default) | x64 | GOROOT_1_15_X64 | -| 1.16.10 | x64 | GOROOT_1_16_X64 | -| 1.17.3 | x64 | GOROOT_1_17_X64 | +| 1.16.11 | x64 | GOROOT_1_16_X64 | +| 1.17.4 | x64 | GOROOT_1_17_X64 | ### Rust Tools -- Cargo 1.56.0 -- Rust 1.56.1 -- Rustdoc 1.56.1 +- Cargo 1.57.0 +- Rust 1.57.0 +- Rustdoc 1.57.0 - Rustup 1.24.3 #### Packages @@ -191,7 +190,7 @@ - Cargo-audit 0.16.0 - Cargo-outdated v0.10.2 - Cbindgen 0.20.0 -- Clippy 0.1.56 +- Clippy 0.1.57 - Rustfmt 1.4.37-stable ### PowerShell Tools @@ -208,8 +207,8 @@ ### Web Servers | Name | Version | ConfigFile | ServiceStatus | ListenPort | | ----- | ------- | ------------------------------- | ------------- | ---------- | -| httpd | 2.4.51 | /usr/local/etc/httpd/httpd.conf | stopped | 80 | -| nginx | 1.21.4 | /usr/local/etc/nginx/nginx.conf | stopped | 80 | +| httpd | 2.4.51 | /usr/local/etc/httpd/httpd.conf | none | 80 | +| nginx | 1.21.4 | /usr/local/etc/nginx/nginx.conf | none | 80 | ### Xamarin #### Visual Studio for Mac @@ -352,7 +351,7 @@ | Package Name | Version | | -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 4.0 | -| Android Emulator | 30.9.5 | +| Android Emulator | 31.1.4 | | Android SDK Build-tools | 31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3<br>26.0.0 26.0.1 26.0.2 26.0.3<br>25.0.0 25.0.1 25.0.2 25.0.3<br>24.0.0 24.0.1 24.0.2 24.0.3 | | Android SDK Platforms | android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3)<br>android-26 (rev 2)<br>android-25 (rev 3)<br>android-24 (rev 2) | | Android SDK Platform-Tools | 31.0.3 | From 5f872f77d6ad7f81081ebd0046b537762e0a3d2d Mon Sep 17 00:00:00 2001 From: Maksim Shilov <89912354+shilovmaksim@users.noreply.github.com> Date: Thu, 9 Dec 2021 18:39:44 +0300 Subject: [PATCH 0813/3485] Sorting releases and taking latest (#4703) --- images/linux/scripts/installers/kotlin.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/images/linux/scripts/installers/kotlin.sh b/images/linux/scripts/installers/kotlin.sh index 4a34f874936d..2b07521900c4 100644 --- a/images/linux/scripts/installers/kotlin.sh +++ b/images/linux/scripts/installers/kotlin.sh @@ -8,7 +8,9 @@ source $HELPER_SCRIPTS/install.sh KOTLIN_ROOT="/usr/share" -URL=$(curl -s https://api.github.com/repos/JetBrains/kotlin/releases/latest | jq -r '.assets[].browser_download_url | select(contains("kotlin-compiler"))') +kotlinReleasesUrl="https://api.github.com/repos/JetBrains/kotlin/releases" +latestRelease=$(curl -s $kotlinReleasesUrl | jq -r 'map(select(.prerelease == false)) | sort_by(.target_commitish)[-1]') +URL=$(echo $latestRelease | jq -r '.assets[].browser_download_url | select(contains("kotlin-compiler"))') download_with_retries $URL "/tmp" unzip -qq /tmp/kotlin-compiler*.zip -d $KOTLIN_ROOT From f57f6aaf4adcb5e525c43667d9c478b6bd3bb99a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 9 Dec 2021 17:38:17 +0000 Subject: [PATCH 0814/3485] Updating readme file for win16 version 20211206.1 (#4676) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2016-Readme.md | 63 +++++++++++++------------------- 1 file changed, 26 insertions(+), 37 deletions(-) diff --git a/images/win/Windows2016-Readme.md b/images/win/Windows2016-Readme.md index 4736da1d5751..9db313cd0c64 100644 --- a/images/win/Windows2016-Readme.md +++ b/images/win/Windows2016-Readme.md @@ -1,21 +1,20 @@ | Announcements | |-| | [Windows Server 2022 with Visual Studio 2022 is generally available starting from November, 15](https://github.com/actions/virtual-environments/issues/4488) | -| [[all OSs] Default Nodejs version will be set to 16 on November, 29](https://github.com/actions/virtual-environments/issues/4446) | | [Windows-2016 environment will be removed on March 15, 2022](https://github.com/actions/virtual-environments/issues/4312) | *** # Microsoft Windows Server 2016 Datacenter - OS Version: 10.0.14393 Build 4770 -- Image Version: 20211229.2 +- Image Version: 20211206.1 ## Installed Software ### Language and Runtime - Bash 4.4.23(1)-release - Go 1.15.15 -- Julia 1.6.4 +- Julia 1.7.0 - Kotlin 1.5.32 - LLVM 13.0.0 -- Node 16.13.0 +- Node 16.13.1 - Perl 5.32.1 - PHP 8.0.13 - Python 3.7.9 @@ -23,15 +22,15 @@ ### Package Management - Chocolatey 0.11.3 -- Composer 2.1.12 +- Composer 2.1.14 - Helm 3.7.1 - Miniconda 4.10.3 (pre-installed on the image but not added to PATH) -- NPM 8.1.0 +- NPM 8.1.2 - NuGet 6.0.0.280 - pip 21.3.1 (python 3.7) - Pipx 0.16.4 - RubyGems 2.7.6.3 -- Vcpkg (build from master \<60a8f7971>) +- Vcpkg (build from master \<63e935d96>) - Yarn 1.22.17 #### Environment variables @@ -42,7 +41,7 @@ ### Project Management - Ant 1.10.12 -- Gradle 7.2 +- Gradle 7.3 - Maven 3.8.4 - sbt 1.5.5 @@ -50,7 +49,7 @@ - 7zip 21.06 - aria2 1.36.0 - azcopy 10.13.0 -- Bazel 4.2.1 +- Bazel 4.2.2 - Bazelisk 1.10.1 - Bicep 0.4.1008 - Cabal 3.6.2.0 @@ -73,7 +72,7 @@ - NSIS v3.06.1 - OpenSSL 1.1.1 - Packer 1.7.8 -- Pulumi v3.18.1 +- Pulumi v3.19.0 - R 4.1.2 - Service Fabric SDK 8.2.1235.9590 - Stack 2.7.3 @@ -81,24 +80,25 @@ - Swig 4.0.2 - VSWhere 2.8.4 - WinAppDriver 1.2.2009.02003 +- WiX Toolset v3.11.2.4516 - yamllint 1.26.3 - zstd 1.5.0 ### CLI Tools -- Alibaba Cloud CLI 3.0.99 -- AWS CLI 2.4.2 +- Alibaba Cloud CLI 3.0.100 +- AWS CLI 2.4.5 - AWS SAM CLI 1.36.0 - AWS Session Manager CLI 1.2.279.0 - Azure CLI 2.30.0 - Azure DevOps CLI extension 0.22.0 - Cloud Foundry CLI 6.53.0 -- GitHub CLI 2.2.0 +- GitHub CLI 2.3.0 - Hub CLI 2.14.2 ### Rust Tools -- Cargo 1.56.0 -- Rust 1.56.1 -- Rustdoc 1.56.1 +- Cargo 1.57.0 +- Rust 1.57.0 +- Rustdoc 1.57.0 - Rustup 1.24.3 #### Packages @@ -106,14 +106,14 @@ - cargo-audit 0.16.0 - cargo-outdated v0.10.2 - cbindgen 0.20.0 -- Clippy 0.1.56 +- Clippy 0.1.57 - Rustfmt 1.4.37 ### Browsers and webdrivers - Google Chrome 96.0.4664.45 - Chrome Driver 96.0.4664.45 -- Microsoft Edge 96.0.1054.34 -- Microsoft Edge Driver 96.0.1054.34 +- Microsoft Edge 96.0.1054.43 +- Microsoft Edge Driver 96.0.1054.43 - Mozilla Firefox 94.0.2 - Gecko Driver 0.30.0 - IE Driver 3.150.1.1 @@ -143,28 +143,28 @@ ### MSYS2 - Pacman 6.0.1 + ##### Notes: ``` Location: C:\msys64 Note: MSYS2 is pre-installed on image but not added to PATH. ``` + ### Cached Tools #### Go | Version | Architecture | Environment Variable | | ------- | ------------ | -------------------- | | 1.15.15 (Default) | x64 | GOROOT_1_15_X64 | -| 1.16.10 | x64 | GOROOT_1_16_X64 | -| 1.17.3 | x64 | GOROOT_1_17_X64 | - +| 1.16.11 | x64 | GOROOT_1_16_X64 | +| 1.17.4 | x64 | GOROOT_1_17_X64 | #### Node | Version | Architecture | | ------- | ------------ | | 12.22.7 | x64 | -| 14.18.1 | x64 | -| 16.13.0 | x64 | - +| 14.18.2 | x64 | +| 16.13.1 | x64 | #### Python | Version | Architecture | @@ -177,7 +177,6 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | 3.9.9 | x64, x86 | | 3.10.0 | x64 | - #### Ruby | Version | Architecture | | ------- | ------------ | @@ -187,7 +186,6 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | 2.7.5 | x64 | | 3.0.3 | x64 | - #### PyPy | Python Version | PyPy Version | | -------------- | ------------ | @@ -196,8 +194,6 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | 3.7.12 | PyPy 7.3.7 with MSC v.1929 64 bit (AMD64) | | 3.8.12 | PyPy 7.3.7 with MSC v.1929 64 bit (AMD64) | - - ### Databases #### PostgreSQL | Property | Value | @@ -211,21 +207,17 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | UserName | postgres | | Password | root | - #### MongoDB | Version | ServiceName | ServiceStatus | ServiceStartType | | ------- | ----------- | ------------- | ---------------- | | 5.0.4.0 | MongoDB | Running | Automatic | - - ### Database tools - Azure CosmosDb Emulator 2.14.4.0 - DacFx 15.0.5282.3 - MySQL 5.7.36.0 - SQLPS 1.0 - ### Web Servers | Name | Version | ConfigFile | ServiceName | ServiceStatus | ListenPort | | ------ | ------- | ------------------------------------- | ----------- | ------------- | ---------- | @@ -238,7 +230,6 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Visual Studio Enterprise 2017 | 15.9.28307.1745 | C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise | #### Workloads, components and extensions: - | Package | Version | | ------------------------------------------------------------------------- | ---------------- | | Component.Anaconda3.x64 | 5.2.0 | @@ -480,11 +471,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | SSDT SQL Server Integration Services Projects | 2.6.3 | | Windows Driver Kit | 10.0.17740.0 | | Windows Driver Kit Visual Studio Extension | 10.1.17763.1 | -| WIX Toolset | 3.11.4516 | | WIX Toolset Studio 2017 Extension | 0.9.21.62588 | #### Microsoft Visual C++: - | Name | Architecture | Version | | -------------------------------------------- | ------------ | ----------- | | Microsoft Visual C++ 2010 Redistributable | x64 | 10.0.30319 | @@ -538,6 +527,7 @@ 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 | | ------------------ | ---------------- | @@ -587,4 +577,3 @@ All other versions are saved but not installed. | mcr.microsoft.com/windows/servercore:ltsc2016 | sha256:0a54ee92e51c03f30b6902df63fb88be973c8d04a40c456058ab6acbdd92d103 | 2021-11-03 | - From 8aa18c1d57265ed0013ccab1d293d4e19c98dc99 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 9 Dec 2021 20:10:17 +0000 Subject: [PATCH 0815/3485] Updating readme file for win19 version 20211207.2 (#4682) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2019-Readme.md | 72 ++++++++++++++------------------ 1 file changed, 31 insertions(+), 41 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index 1d7845ca3b24..cac4f03c89da 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -1,12 +1,11 @@ | Announcements | |-| | [Windows Server 2022 with Visual Studio 2022 is generally available starting from November, 15](https://github.com/actions/virtual-environments/issues/4488) | -| [[all OSs] Default Nodejs version will be set to 16 on November, 29](https://github.com/actions/virtual-environments/issues/4446) | | [Windows-2016 environment will be removed on March 15, 2022](https://github.com/actions/virtual-environments/issues/4312) | *** # Microsoft Windows Server 2019 Datacenter - OS Version: 10.0.17763 Build 2300 -- Image Version: 20211229.2 +- Image Version: 20211207.2 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -15,10 +14,10 @@ ### Language and Runtime - Bash 4.4.23(1)-release - Go 1.15.15 -- Julia 1.6.4 +- Julia 1.7.0 - Kotlin 1.5.32 - LLVM 13.0.0 -- Node 16.13.0 +- Node 16.13.1 - Perl 5.32.1 - PHP 8.0.13 - Python 3.7.9 @@ -26,15 +25,15 @@ ### Package Management - Chocolatey 0.11.3 -- Composer 2.1.12 +- Composer 2.1.14 - Helm 3.7.1 - Miniconda 4.10.3 (pre-installed on the image but not added to PATH) -- NPM 8.1.0 +- NPM 8.1.2 - NuGet 6.0.0.280 - pip 21.3.1 (python 3.7) - Pipx 0.16.4 - RubyGems 2.7.6.3 -- Vcpkg (build from master \<60a8f7971>) +- Vcpkg (build from master \<431d3810a>) - Yarn 1.22.17 #### Environment variables @@ -45,7 +44,7 @@ ### Project Management - Ant 1.10.12 -- Gradle 7.2 +- Gradle 7.3 - Maven 3.8.4 - sbt 1.5.5 @@ -53,7 +52,7 @@ - 7zip 21.06 - aria2 1.36.0 - azcopy 10.13.0 -- Bazel 4.2.1 +- Bazel 4.2.2 - Bazelisk 1.10.1 - Bicep 0.4.1008 - Cabal 3.6.2.0 @@ -76,7 +75,7 @@ - NSIS v3.06.1 - OpenSSL 1.1.1 - Packer 1.7.8 -- Pulumi v3.18.1 +- Pulumi v3.19.0 - R 4.1.2 - Service Fabric SDK 8.2.1235.9590 - Stack 2.7.3 @@ -84,24 +83,25 @@ - Swig 4.0.2 - VSWhere 2.8.4 - WinAppDriver 1.2.2009.02003 +- WiX Toolset v3.11.2.4516 - yamllint 1.26.3 - zstd 1.5.0 ### CLI Tools -- Alibaba Cloud CLI 3.0.99 -- AWS CLI 2.4.2 +- Alibaba Cloud CLI 3.0.100 +- AWS CLI 2.4.5 - AWS SAM CLI 1.36.0 - AWS Session Manager CLI 1.2.279.0 -- Azure CLI 2.30.0 +- Azure CLI 2.31.0 - Azure DevOps CLI extension 0.22.0 - Cloud Foundry CLI 6.53.0 -- GitHub CLI 2.2.0 +- GitHub CLI 2.3.0 - Hub CLI 2.14.2 ### Rust Tools -- Cargo 1.56.0 -- Rust 1.56.1 -- Rustdoc 1.56.1 +- Cargo 1.57.0 +- Rust 1.57.0 +- Rustdoc 1.57.0 - Rustup 1.24.3 #### Packages @@ -109,14 +109,14 @@ - cargo-audit 0.16.0 - cargo-outdated v0.10.2 - cbindgen 0.20.0 -- Clippy 0.1.56 +- Clippy 0.1.57 - Rustfmt 1.4.37 ### Browsers and webdrivers -- Google Chrome 96.0.4664.45 +- Google Chrome 96.0.4664.93 - Chrome Driver 96.0.4664.45 -- Microsoft Edge 96.0.1054.34 -- Microsoft Edge Driver 96.0.1054.34 +- Microsoft Edge 96.0.1054.43 +- Microsoft Edge Driver 96.0.1054.43 - Mozilla Firefox 94.0.2 - Gecko Driver 0.30.0 - IE Driver 3.150.1.1 @@ -147,30 +147,31 @@ ### MSYS2 - Pacman 6.0.1 + ##### Notes: ``` Location: C:\msys64 Note: MSYS2 is pre-installed on image but not added to PATH. ``` + ### BizTalk Server -- BizTalk Server Project Build Component 3.13.765.0 +- BizTalk Server Project Build Component 3.13.765.0 + ### Cached Tools #### Go | Version | Architecture | Environment Variable | | ------- | ------------ | -------------------- | | 1.15.15 (Default) | x64 | GOROOT_1_15_X64 | -| 1.16.10 | x64 | GOROOT_1_16_X64 | -| 1.17.3 | x64 | GOROOT_1_17_X64 | - +| 1.16.11 | x64 | GOROOT_1_16_X64 | +| 1.17.4 | x64 | GOROOT_1_17_X64 | #### Node | Version | Architecture | | ------- | ------------ | | 12.22.7 | x64 | -| 14.18.1 | x64 | -| 16.13.0 | x64 | - +| 14.18.2 | x64 | +| 16.13.1 | x64 | #### Python | Version | Architecture | @@ -183,7 +184,6 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | 3.9.9 | x64, x86 | | 3.10.0 | x64, x86 | - #### Ruby | Version | Architecture | | ------- | ------------ | @@ -193,7 +193,6 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | 2.7.5 | x64 | | 3.0.3 | x64 | - #### PyPy | Python Version | PyPy Version | | -------------- | ------------ | @@ -202,8 +201,6 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | 3.7.12 | PyPy 7.3.7 with MSC v.1929 64 bit (AMD64) | | 3.8.12 | PyPy 7.3.7 with MSC v.1929 64 bit (AMD64) | - - ### Databases #### PostgreSQL | Property | Value | @@ -217,13 +214,10 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | UserName | postgres | | Password | root | - #### MongoDB | Version | ServiceName | ServiceStatus | ServiceStartType | | ------- | ----------- | ------------- | ---------------- | -| 5.0.4.0 | MongoDB | Running | Automatic | - - +| 5.0.5.0 | MongoDB | Running | Automatic | ### Database tools - Azure CosmosDb Emulator 2.14.4.0 @@ -231,7 +225,6 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - MySQL 5.7.36.0 - SQLPS 1.0 - ### Web Servers | Name | Version | ConfigFile | ServiceName | ServiceStatus | ListenPort | | ------ | ------- | ------------------------------------- | ----------- | ------------- | ---------- | @@ -244,7 +237,6 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Visual Studio Enterprise 2019 | 16.11.31911.196 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | #### Workloads, components and extensions: - | Package | Version | | ------------------------------------------------------------------------- | --------------- | | Component.Android.NDK.R16B | 16.11.31910.99 | @@ -475,11 +467,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Windows Driver Kit | 10.0.21381.0 | | Windows Driver Kit Visual Studio Extension | 10.1.22000.1 | | Windows Software Development Kit Extension | 10.1.22000.194 | -| WIX Toolset | 3.11.4516 | | WIX Toolset Studio 2019 Extension | 1.0.0.4 | #### Microsoft Visual C++: - | Name | Architecture | Version | | -------------------------------------------- | ------------ | ----------- | | Microsoft Visual C++ 2010 Redistributable | x64 | 10.0.40219 | @@ -533,6 +523,7 @@ 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 | | ------------------ | ---------------- | @@ -582,4 +573,3 @@ All other versions are saved but not installed. | mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:bfa356b928c9977bf2c03d536e251eda8879debf42d884771cb855313a6a5da7 | 2021-11-04 | - From 5e4f5b88985ec73f24a76105c842be44865a4cd7 Mon Sep 17 00:00:00 2001 From: Vladimir Safonkin <vsafonkin@github.com> Date: Fri, 10 Dec 2021 00:40:09 +0300 Subject: [PATCH 0816/3485] [Windows] Add grunt-cli to global npm packages on Windows 2022 (#4689) --- images/win/toolsets/toolset-2022.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index 5c7d803e08bc..71c840894dda 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -266,7 +266,8 @@ { "name": "yarn", "test": "yarn --version" }, { "name": "newman", "test": "newman --version" }, { "name": "lerna", "test": "lerna --version" }, - { "name": "gulp-cli", "test": "gulp --version" } + { "name": "gulp-cli", "test": "gulp --version" }, + { "name": "grunt-cli", "test": "grunt --version" } ] }, "dotnet": { From 54bf98dc42d436d1d874d82fc2df5b0656b4b50b Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Fri, 10 Dec 2021 09:56:11 +0300 Subject: [PATCH 0817/3485] Update the script to support MSGraph (#4701) --- helpers/GenerateResourcesAndImage.ps1 | 46 ++++++++++++++++++++------- 1 file changed, 35 insertions(+), 11 deletions(-) diff --git a/helpers/GenerateResourcesAndImage.ps1 b/helpers/GenerateResourcesAndImage.ps1 index 16d90e522e44..de68ddfe4119 100644 --- a/helpers/GenerateResourcesAndImage.ps1 +++ b/helpers/GenerateResourcesAndImage.ps1 @@ -127,8 +127,8 @@ Function GenerateResourcesAndImage { ) $builderScriptPath = Get-PackerTemplatePath -RepositoryRoot $ImageGenerationRepositoryRoot -ImageType $ImageType - $ServicePrincipalClientSecret = $env:UserName + [System.GUID]::NewGuid().ToString().ToUpper(); - $InstallPassword = $env:UserName + [System.GUID]::NewGuid().ToString().ToUpper(); + $ServicePrincipalClientSecret = $env:UserName + [System.GUID]::NewGuid().ToString().ToUpper() + $InstallPassword = $env:UserName + [System.GUID]::NewGuid().ToString().ToUpper() if ([string]::IsNullOrEmpty($AzureClientId)) { @@ -196,15 +196,40 @@ Function GenerateResourcesAndImage { if ([string]::IsNullOrEmpty($AzureClientId)) { # Interactive authentication: A service principal is created during runtime. $spDisplayName = [System.GUID]::NewGuid().ToString().ToUpper() - $credentialProperties = @{ StartDate=Get-Date; EndDate=Get-Date -Year 2024; Password=$ServicePrincipalClientSecret } - $credentials = New-Object -TypeName Microsoft.Azure.Commands.ActiveDirectory.PSADPasswordCredential -Property $credentialProperties - $sp = New-AzADServicePrincipal -DisplayName $spDisplayName -PasswordCredential $credentials + $startDate = Get-Date + $endDate = $startDate.AddYears(1) + + if ('Microsoft.Azure.Commands.ActiveDirectory.PSADPasswordCredential' -as [type]) { + $credentials = [Microsoft.Azure.Commands.ActiveDirectory.PSADPasswordCredential]@{ + StartDate = $startDate + EndDate = $endDate + Password = $ServicePrincipalClientSecret + } + $sp = New-AzADServicePrincipal -DisplayName $spDisplayName -PasswordCredential $credentials + $spClientId = $sp.ApplicationId + $azRoleParam = @{ + RoleDefinitionName = "Contributor" + ServicePrincipalName = $spClientId + } + } - $spAppId = $sp.ApplicationId - $spClientId = $sp.ApplicationId - Start-Sleep -Seconds $SecondsToWaitForServicePrincipalSetup + if ('Microsoft.Azure.PowerShell.Cmdlets.Resources.MSGraph.Models.ApiV10.MicrosoftGraphPasswordCredential' -as [type]) { + $credentials = [Microsoft.Azure.PowerShell.Cmdlets.Resources.MSGraph.Models.ApiV10.MicrosoftGraphPasswordCredential]@{ + StartDateTime = $startDate + EndDateTime = $endDate + } + $sp = New-AzADServicePrincipal -DisplayName $spDisplayName + $appCred = New-AzADAppCredential -ApplicationId $sp.AppId -PasswordCredentials $credentials + $spClientId = $sp.AppId + $azRoleParam = @{ + RoleDefinitionName = "Contributor" + PrincipalId = $sp.Id + } + $ServicePrincipalClientSecret = $appCred.SecretText + } - New-AzRoleAssignment -RoleDefinitionName Contributor -ServicePrincipalName $spAppId + Start-Sleep -Seconds $SecondsToWaitForServicePrincipalSetup + New-AzRoleAssignment @azRoleParam Start-Sleep -Seconds $SecondsToWaitForServicePrincipalSetup $sub = Get-AzSubscription -SubscriptionId $SubscriptionId $tenantId = $sub.TenantId @@ -212,7 +237,6 @@ Function GenerateResourcesAndImage { } else { # Parametrized Authentication via given service principal: The service principal with the data provided via the command line # is used for all authentication purposes. - $spAppId = $AzureClientId $spClientId = $AzureClientId $credentials = $AzureAppCred $ServicePrincipalClientSecret = $AzureClientSecret @@ -228,7 +252,7 @@ Function GenerateResourcesAndImage { if($RestrictToAgentIpAddress -eq $true) { $AgentIp = (Invoke-RestMethod http://ipinfo.io/json).ip - echo "Restricting access to packer generated VM to agent IP Address: $AgentIp" + Write-Host "Restricting access to packer generated VM to agent IP Address: $AgentIp" } & $packerBinary build -on-error=ask ` From 9e306021789ae5a23cff850089a97e5d54a5cee9 Mon Sep 17 00:00:00 2001 From: Cornelius Riemenschneider <criemen@github.com> Date: Fri, 10 Dec 2021 08:26:07 +0100 Subject: [PATCH 0818/3485] CodeQL: Pull the bundle from codeql-action@v1 rather than main. (#4702) As github/codeql-action by default uses the bundle from the toolcache, make sure that that is considered stable. --- images/linux/scripts/installers/codeql-bundle.sh | 2 +- images/win/scripts/Installers/Install-CodeQLBundle.ps1 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/images/linux/scripts/installers/codeql-bundle.sh b/images/linux/scripts/installers/codeql-bundle.sh index 80062464a1d4..46f53ca03b3a 100644 --- a/images/linux/scripts/installers/codeql-bundle.sh +++ b/images/linux/scripts/installers/codeql-bundle.sh @@ -7,7 +7,7 @@ source $HELPER_SCRIPTS/install.sh # Retrieve the name of the CodeQL bundle preferred by the Action (in the format codeql-bundle-YYYYMMDD). -codeql_bundle_name="$(curl -sSL https://raw.githubusercontent.com/github/codeql-action/main/src/defaults.json | jq -r .bundleVersion)" +codeql_bundle_name="$(curl -sSL https://raw.githubusercontent.com/github/codeql-action/v1/src/defaults.json | jq -r .bundleVersion)" # Convert the bundle name to a version number (0.0.0-YYYYMMDD). codeql_bundle_version="0.0.0-${codeql_bundle_name##*-}" diff --git a/images/win/scripts/Installers/Install-CodeQLBundle.ps1 b/images/win/scripts/Installers/Install-CodeQLBundle.ps1 index d9f273775933..a70a12ac1539 100644 --- a/images/win/scripts/Installers/Install-CodeQLBundle.ps1 +++ b/images/win/scripts/Installers/Install-CodeQLBundle.ps1 @@ -4,7 +4,7 @@ ################################################################################ # Retrieve the name of the CodeQL bundle preferred by the Action (in the format codeql-bundle-YYYYMMDD). -$CodeQLBundleName = (Invoke-RestMethod "https://raw.githubusercontent.com/github/codeql-action/main/src/defaults.json").bundleVersion +$CodeQLBundleName = (Invoke-RestMethod "https://raw.githubusercontent.com/github/codeql-action/v1/src/defaults.json").bundleVersion # Convert the bundle name to a version number (0.0.0-YYYYMMDD). $CodeQLBundleVersion = "0.0.0-" + $CodeQLBundleName.split("-")[-1] From fea7c2e6d1e82bc3c7af7dc5c32c9a067b9cc8a9 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Fri, 10 Dec 2021 10:27:18 +0300 Subject: [PATCH 0819/3485] [Ubuntu] fix software report for mysql (#4699) --- .../linux/scripts/SoftwareReport/SoftwareReport.Databases.psm1 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Databases.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Databases.psm1 index f561a13608d8..5cdfddc2b033 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Databases.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Databases.psm1 @@ -17,6 +17,9 @@ function Get-SqliteVersion { function Get-MySQLVersion { $mySQLVersion = mysqld --version | Take-OutputPart -Part 2 + if (-not (Test-IsUbuntu20)) { + $mySQLVersion = $mySQLVersion | Take-OutputPart -Part 0 -Delimiter "-" + } return "MySQL $mySQLVersion" } From 1fb7d122d1281b6e9b86df478549ad911756445f Mon Sep 17 00:00:00 2001 From: Julian Ospald <hasufell@posteo.de> Date: Fri, 10 Dec 2021 09:23:44 +0100 Subject: [PATCH 0820/3485] Expose ghcup binary to PATH on windows (#4264) * Expose ghcup binary to PATH on windows The bootstrap-haskell.ps1 script uses '[System.EnvironmentVariableTarget]::User' instead of '[System.EnvironmentVariableTarget]::Machine', so it appears ghcup env vars and PATH update never make it. Do these manually for now. * Set CABAL_DIR and make sure config is adjusted The config adjustment usually includes adding msys2 directories, so cabal can find `pkg-config` and libraries, e.g.: + C: \ghcup\msys64\mingw64\bin + extra-include-dirs: C:\ghcup\msys64\mingw64\include + extra-lib-dirs: C:\ghcup\msys64\mingw64\lib - extra-prog-path: C:\cabal\bin + extra-prog-path: C:\ghcup\bin, * Expose cabal dir to PATH as well * Use Set-SystemVariable * Fix tests * Use hardcoded cabal dir * Fix bootstrap-haskell * Move test after installation * Print ghcup installation message * Don't adjust cabal.config (to include mingw paths) This may break setups. --- .../scripts/Installers/Install-Haskell.ps1 | 15 +++++++++++--- images/win/scripts/Tests/Haskell.Tests.ps1 | 20 ++++++++++++++++++- 2 files changed, 31 insertions(+), 4 deletions(-) diff --git a/images/win/scripts/Installers/Install-Haskell.ps1 b/images/win/scripts/Installers/Install-Haskell.ps1 index cd133d547a5c..63c7a7c95662 100644 --- a/images/win/scripts/Installers/Install-Haskell.ps1 +++ b/images/win/scripts/Installers/Install-Haskell.ps1 @@ -32,8 +32,17 @@ Add-MachinePathItem -PathItem $DefaultGhcPath Write-Host 'Installing cabal...' Choco-Install -PackageName cabal -Invoke-PesterTests -TestFile 'Haskell' - # install minimal ghcup, utilizing pre-installed msys2 at C:\msys64 +Write-Host 'Installing ghcup...' +$msysPath = "C:\msys64" +$ghcupPrefix = "C:\" +$cabalDir = "C:\cabal" $bootstrapHaskell = Invoke-WebRequest https://www.haskell.org/ghcup/sh/bootstrap-haskell.ps1 -UseBasicParsing -Invoke-Command -ScriptBlock ([ScriptBlock]::Create($bootstrapHaskell)) -ArgumentList $false, $true, $true, $false, $false, $false, $false, C:\, "", C:\msys64, C:\cabal +Invoke-Command -ScriptBlock ([ScriptBlock]::Create($bootstrapHaskell)) -ArgumentList $false, $true, $true, $false, $true, $false, $false, $ghcupPrefix, "", $msysPath, $cabalDir +Set-SystemVariable "GHCUP_INSTALL_BASE_PREFIX" $ghcupPrefix +Set-SystemVariable "GHCUP_MSYS2" $msysPath +Set-SystemVariable "CABAL_DIR" $cabalDir +Add-MachinePathItem "$ghcupPrefix\ghcup\bin" +Add-MachinePathItem "$cabalDir\bin" + +Invoke-PesterTests -TestFile 'Haskell' diff --git a/images/win/scripts/Tests/Haskell.Tests.ps1 b/images/win/scripts/Tests/Haskell.Tests.ps1 index 854ba03106db..db93e36d53eb 100644 --- a/images/win/scripts/Tests/Haskell.Tests.ps1 +++ b/images/win/scripts/Tests/Haskell.Tests.ps1 @@ -24,6 +24,15 @@ Describe "Haskell" { } } + $ghcupEnvExists = @( + @{envVar = "GHCUP_INSTALL_BASE_PREFIX"} + @{envVar = "GHCUP_MSYS2"} + ) + + It "<envVar> environment variable exists" -TestCases $ghcupEnvExists { + Test-Path env:\$envVar + } + It "Accurate 3 versions of GHC are installed" -TestCases @{ghcCount = $ghcCount} { $ghcCount | Should -BeExactly 3 } @@ -39,4 +48,13 @@ Describe "Haskell" { It "Cabal is installed" { "cabal --version" | Should -ReturnZeroExitCode } -} \ No newline at end of file + + It "cabal config was modified and exists" { + $env:CABAL_DIR | Should -Exist + "cabal user-config diff" | Should -ReturnZeroExitCode + } + + It "ghcup is installed" { + "ghcup --version" | Should -ReturnZeroExitCode + } +} From 9d3fcffab4bcf8af2f8c46598d89712aff22a0e6 Mon Sep 17 00:00:00 2001 From: Marcel Gerber <mgerber59@gmail.com> Date: Fri, 10 Dec 2021 10:38:30 +0100 Subject: [PATCH 0821/3485] [Ubuntu] remove `--unsafe-perm` code for netlify-cli (#4712) --- images/linux/scripts/installers/nodejs.sh | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/images/linux/scripts/installers/nodejs.sh b/images/linux/scripts/installers/nodejs.sh index 3969e3899d8f..8556a57ee678 100644 --- a/images/linux/scripts/installers/nodejs.sh +++ b/images/linux/scripts/installers/nodejs.sh @@ -14,20 +14,7 @@ bash ~/n $defaultVersion # Install node modules node_modules=$(get_toolset_value '.node_modules[].name') - -# remove commenting out of this line as nmp migrated to v7 -# npm install -g $node_modules - -# TODO: workaround for Netlify CLI with npm6. Remove 19-28 and uncomment 17 if migration to npm7 compelted -for module in $node_modules; do - echo "Installing node module $module" - if [ $module = "netlify-cli" ];then - # Install the Netlify CLI using --unsafe-perm=true options to avoid permission issues - npm install -g --unsafe-perm=true $module - else - npm install -g $module - fi -done +npm install -g $node_modules echo "Creating the symlink for [now] command to vercel CLI" ln -s /usr/local/bin/vercel /usr/local/bin/now From 6aa5d3704e1fd983ae09c23a11f9c468992cfcbd Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Fri, 10 Dec 2021 13:10:45 +0300 Subject: [PATCH 0822/3485] Delete image before push (#4713) --- images.CI/macos/anka/Anka.Helpers.psm1 | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/images.CI/macos/anka/Anka.Helpers.psm1 b/images.CI/macos/anka/Anka.Helpers.psm1 index 56fc54c0251a..d076625fdf00 100644 --- a/images.CI/macos/anka/Anka.Helpers.psm1 +++ b/images.CI/macos/anka/Anka.Helpers.psm1 @@ -13,7 +13,16 @@ function Push-AnkaTemplateToRegistry { [string] $TemplateName ) - $command = "anka registry -a $RegistryUrl push -t $TagVersion $TemplateName" + # if registry uuid doesn't match than delete an image in registry + $images = anka --machine-readable registry --registry-path $RegistryUrl list | ConvertFrom-Json | ForEach-Object body + $images | Where-Object name -eq $TemplateName | ForEach-Object { + $id = $_.id + Show-StringWithFormat "Deleting '$TemplateName[$id]' VM and '$TagVersion' tag" + $uri = '{0}/registry/vm?id={1}' -f $RegistryUrl, $id + Invoke-WebRequest -Uri $uri -Method Delete | Out-Null + } + + $command = "anka registry --registry-path $RegistryUrl push --force --tag $TagVersion $TemplateName" Invoke-AnkaCommand -Command $command } From 38877b32560a70cb12da5cede9df7a46fd1db15c Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Mon, 13 Dec 2021 10:52:27 +0300 Subject: [PATCH 0823/3485] Add NativeDesktop.Llvm.Clang component (#4717) --- images/win/toolsets/toolset-2022.json | 1 + 1 file changed, 1 insertion(+) diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index 71c840894dda..534114d0c3d6 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -221,6 +221,7 @@ "Microsoft.VisualStudio.Component.Workflow", "Microsoft.VisualStudio.ComponentGroup.Azure.CloudServices", "Microsoft.VisualStudio.ComponentGroup.Azure.ResourceManager.Tools", + "Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Llvm.Clang", "Microsoft.VisualStudio.ComponentGroup.Web.CloudTools", "Microsoft.VisualStudio.Workload.Azure", "Microsoft.VisualStudio.Workload.Data", From c44447f874b58987c4a3d677453c286c6263fa55 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 13 Dec 2021 09:17:56 +0000 Subject: [PATCH 0824/3485] Updating readme file for ubuntu18 version 20211209.3 (#4709) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu1804-README.md | 161 +++++++++++++++--------------- 1 file changed, 78 insertions(+), 83 deletions(-) diff --git a/images/linux/Ubuntu1804-README.md b/images/linux/Ubuntu1804-README.md index 525d87e57472..9be89fec8a68 100644 --- a/images/linux/Ubuntu1804-README.md +++ b/images/linux/Ubuntu1804-README.md @@ -1,25 +1,21 @@ -| Announcements | -|-| -| [[all OSs] Default Nodejs version will be set to 16 on November, 29](https://github.com/actions/virtual-environments/issues/4446) | -*** # Ubuntu 18.04.6 LTS -- Linux kernel version: 5.4.0-1063-azure -- Image Version: 20211129.1 +- Linux kernel version: 5.4.0-1064-azure +- Image Version: 20211209.3 ## Installed Software ### Language and Runtime - Bash 4.4.20(1)-release - Clang 9.0.0 - Clang-format 9.0.0 -- Erlang 24.1.6 (Eshell 12.1.5) +- Erlang 24.1.7 (Eshell 12.1.5) - Erlang rebar3 3.17.0 - GNU C++ 7.5.0, 9.4.0, 10.3.0 - GNU Fortran 7.5.0, 9.4.0, 10.3.0 -- Julia 1.6.4 +- Julia 1.7.0 - Kotlin 1.6.0-release-798 - Mono 6.12.0.122 (apt source repository: https://download.mono-project.com/repo/ubuntu stable-bionic main) - MSBuild 16.6.0.15201 (from /usr/lib/mono/msbuild/15.0/bin/MSBuild.dll) -- Node 16.13.0 +- Node 16.13.1 - Perl 5.26.1 - Python 2.7.17 - Python3 3.6.9 @@ -28,15 +24,15 @@ ### Package Management - cpan 1.64 -- Helm 3.7.1 -- Homebrew 3.3.5 +- Helm 3.7.2 +- Homebrew 3.3.7 - Miniconda 4.10.3 -- Npm 8.1.0 +- Npm 8.1.2 - Pip 9.0.1 - Pip3 9.0.1 - Pipx 0.16.4 - RubyGems 2.7.6 -- Vcpkg (build from master \<3a68454af>) +- Vcpkg (build from master \<14543ba18>) - Yarn 1.22.17 #### Environment variables @@ -47,68 +43,68 @@ ### Project Management - Ant 1.10.5 -- Gradle 7.3 +- Gradle 7.3.1 - Maven 3.8.4 - Sbt 1.5.5 ### Tools -- Ansible 2.11.6 +- Ansible 2.11.7 - apt-fast 1.9.11 - AzCopy 10.13.0 (available by `azcopy` and `azcopy10` aliases) -- Bazel 4.2.1 +- Bazel 4.2.2 - Bazelisk 1.10.1 - Bicep 0.4.1008 - Buildah 1.19.6 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- CMake 3.22.0 -- CodeQL Action Bundle 2.7.2 +- CMake 3.22.1 +- CodeQL Action Bundle 2.7.3 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.1.1+azure-1 -- Docker-Buildx 0.7.0 -- Docker-Moby Client 20.10.11+azure-1 -- Docker-Moby Server 20.10.11+azure-1 +- Docker Compose v2 2.1.1+azure-2 +- Docker-Buildx 0.7.1 +- Docker-Moby Client 20.10.11+azure-2 +- Docker-Moby Server 20.10.11+azure-2 - Git 2.34.1 (apt source repository: ppa:git-core/ppa) - Git LFS 3.0.2 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.3.1 - Haveged 1.9.1 - Heroku 7.59.2 -- HHVM (HipHop VM) 4.137.0 +- HHVM (HipHop VM) 4.138.0 - jq 1.5 - Kind 0.11.1 -- Kubectl 1.22.4 +- Kubectl 1.23.0 - Kustomize 4.4.1 - Leiningen 2.9.8 - MediaInfo 17.12 - Mercurial 4.5.3 - Minikube 1.24.0 -- n 8.0.0 +- n 8.0.1 - Newman 5.3.0 - nvm 0.39.0 - OpenSSL 1.1.1 11 Sep 2018 - Packer 1.7.8 - PhantomJS 2.1.1 - Podman 3.0.1 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- Pulumi 3.18.1 +- Pulumi 3.19.0 - R 4.1.2 - Skopeo 1.2.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 - SVN 1.9.7 -- Terraform 1.0.11 +- Terraform 1.1.0 - yamllint 1.26.3 -- yq 4.15.1 +- yq 4.16.1 - zstd 1.5.0 (homebrew) ### CLI Tools -- Alibaba Cloud CLI 3.0.99 -- AWS CLI 1.22.14 +- Alibaba Cloud CLI 3.0.100 +- AWS CLI 1.22.22 - AWS CLI Session manager plugin 1.2.279.0 - AWS SAM CLI 1.36.0 -- Azure CLI (azure-cli) 2.30.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) +- Azure CLI (azure-cli) 2.31.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.22.0 -- GitHub CLI 2.2.0 -- Google Cloud SDK 365.0.1 (apt source repository: https://packages.cloud.google.com/apt) +- GitHub CLI 2.3.0 +- Google Cloud SDK 366.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 8.0.3 -- OpenShift CLI 4.9.8 +- Netlify CLI 8.0.18 +- OpenShift CLI 4.9.10 - ORAS CLI 0.12.0 - Vercel CLI 23.1.2 @@ -120,11 +116,11 @@ | 12.0.2+10 | Adopt OpenJDK | JAVA_HOME_12_X64 | ### PHP -| Tool | Version | -| -------- | ---------------------------------- | -| PHP | 7.1.33 7.2.34 7.3.33 7.4.26 8.0.13 | -| Composer | 2.1.12 | -| PHPUnit | 8.5.21 | +| Tool | Version | +| -------- | ---------------------------------------- | +| PHP | 7.1.33 7.2.34 7.3.33 7.4.26 8.0.13 8.1.0 | +| Composer | 2.1.14 | +| PHPUnit | 8.5.21 | ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ``` @@ -135,21 +131,21 @@ - Stack 2.7.3 ### Rust Tools -- Cargo 1.56.0 -- Rust 1.56.1 -- Rustdoc 1.56.1 +- Cargo 1.57.0 +- Rust 1.57.0 +- Rustdoc 1.57.0 - Rustup 1.24.3 #### Packages - Bindgen 0.59.2 - Cargo audit 0.16.0 -- Cargo clippy 0.1.56 +- Cargo clippy 0.1.57 - Cargo outdated 0.10.2 - Cbindgen 0.20.0 - Rustfmt 1.4.37 ### Browsers and Drivers -- Google Chrome 96.0.4664.45 +- Google Chrome 96.0.4664.93 - ChromeDriver 96.0.4664.45 - Mozilla Firefox 94.0 - Geckodriver 0.30.0 @@ -167,12 +163,12 @@ - 2.1.302 2.1.403 2.1.526 2.1.617 2.1.701 2.1.818 3.1.120 3.1.202 3.1.302 3.1.415 5.0.104 5.0.209 5.0.303 5.0.403 ### Databases -- MongoDB 5.0.4 (apt source repository: https://repo.mongodb.org/apt/ubuntu) +- MongoDB 5.0.5 (apt source repository: https://repo.mongodb.org/apt/ubuntu) - PostgreSQL 14.1 (apt source repository: https://apt.postgresql.org/pub/repos/apt/) - sqlite3 3.22.0 #### MySQL -- MySQL 5.7.36 +- MySQL 5.7.36-0ubuntu0.18.04.1 - MySQL Server (user:root password:root) ``` @@ -185,13 +181,13 @@ ### Cached Tools #### Go - 1.15.15 -- 1.16.10 -- 1.17.3 +- 1.16.11 +- 1.17.4 #### Node.js - 12.22.7 -- 14.18.1 -- 16.13.0 +- 14.18.2 +- 16.13.1 #### PyPy - 2.7.18 [PyPy 7.3.6] @@ -217,8 +213,8 @@ | Name | Value | Architecture | | --------------- | ----------------------------------- | ------------ | | GOROOT_1_15_X64 | /opt/hostedtoolcache/go/1.15.15/x64 | x64 | -| GOROOT_1_16_X64 | /opt/hostedtoolcache/go/1.16.10/x64 | x64 | -| GOROOT_1_17_X64 | /opt/hostedtoolcache/go/1.17.3/x64 | x64 | +| GOROOT_1_16_X64 | /opt/hostedtoolcache/go/1.16.11/x64 | x64 | +| GOROOT_1_17_X64 | /opt/hostedtoolcache/go/1.17.4/x64 | x64 | ### PowerShell Tools - PowerShell 7.2.0 @@ -239,21 +235,21 @@ | nginx | 1.14.0 | /etc/nginx/nginx.conf | inactive | 80 | ### Android -| Package Name | Version | -| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 4.0 | -| Android Emulator | 30.9.5 | -| Android SDK Build-tools | 31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3<br>26.0.0 26.0.1 26.0.2 26.0.3<br>25.0.0 25.0.1 25.0.2 25.0.3<br>24.0.0 24.0.1 24.0.2 24.0.3<br>23.0.1 23.0.2 23.0.3 | -| Android SDK Platform-Tools | 31.0.3 | -| Android SDK Platforms | android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3)<br>android-26 (rev 2)<br>android-25 (rev 3)<br>android-24 (rev 2)<br>android-23 (rev 3) | -| Android SDK Tools | 26.1.1 | -| Android Support Repository | 47.0.0 | -| CMake | 3.10.2<br>3.18.1 | -| Google APIs | addon-google_apis-google-21<br>addon-google_apis-google-22<br>addon-google_apis-google-23<br>addon-google_apis-google-24 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 21.4.7075529 (default)<br>23.1.7779620 | -| SDK Patch Applier v4 | 1 | +| Package Name | Version | +| -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 4.0 | +| Android Emulator | 31.1.4 | +| Android SDK Build-tools | 32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3<br>26.0.0 26.0.1 26.0.2 26.0.3<br>25.0.0 25.0.1 25.0.2 25.0.3<br>24.0.0 24.0.1 24.0.2 24.0.3<br>23.0.1 23.0.2 23.0.3 | +| Android SDK Platform-Tools | 31.0.3 | +| Android SDK Platforms | android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3)<br>android-26 (rev 2)<br>android-25 (rev 3)<br>android-24 (rev 2)<br>android-23 (rev 3) | +| Android SDK Tools | 26.1.1 | +| Android Support Repository | 47.0.0 | +| CMake | 3.10.2<br>3.18.1 | +| Google APIs | addon-google_apis-google-21<br>addon-google_apis-google-22<br>addon-google_apis-google-23<br>addon-google_apis-google-24 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 21.4.7075529 (default)<br>23.1.7779620 | +| SDK Patch Applier v4 | 1 | #### Environment variables | Name | Value | @@ -270,19 +266,19 @@ | alpine:3.12 | sha256:d9459083f962de6bd980ae6a05be2a4cf670df6a1d898157bceb420342bec280 | 2021-11-12 | | alpine:3.13 | sha256:026f721af4cf2843e07bba648e158fb35ecc876d822130633cc49f707f0fc88c | 2021-11-12 | | alpine:3.14 | sha256:635f0aa53d99017b38d1a0aa5b2082f7812b03e3cdb299103fe77b5c8a07f1d2 | 2021-11-12 | -| buildpack-deps:bullseye | sha256:b83c9c8628517694fc9adea2dc25f70113f511606482c79e1a7689ba4893f7c4 | 2021-11-17 | -| buildpack-deps:buster | sha256:184194bf02563c474132a6982ed5878ef32b19b9f2a10029422ab304ca88ade1 | 2021-11-17 | -| buildpack-deps:stretch | sha256:36fba449401e28a20c9fc9ebae94b4071c0a69bab5aade3340539ac9c857375a | 2021-11-17 | -| debian:10 | sha256:e5333f8697a86fa1be53b2a7e994247083f61885166df0cdda9f812acb514d7c | 2021-11-17 | -| debian:11 | sha256:e8c184b56a94db0947a9d51ec68f42ef5584442f20547fa3bd8cbd00203b2e7a | 2021-11-17 | -| debian:9 | sha256:d8ee86bf0afeb901de293c692a540307a670306cbdb7a06e2c840f17b0c35374 | 2021-11-17 | +| buildpack-deps:bullseye | sha256:5445b145c8a1a2f7e5a4b233f571c629aed12fce435496f942ad267f21a05ff2 | 2021-12-02 | +| buildpack-deps:buster | sha256:c11cd0a4c97acd1aa8d2289aee5c126ac78adc48108744c104f6741cbd9a1f6c | 2021-12-02 | +| buildpack-deps:stretch | sha256:bb93e2c2858cb20f7f16e433773adb2c583fce38dc9c71976c62bf098f956093 | 2021-12-02 | +| debian:10 | sha256:5b57f8c365c40fde437d53b953c436995525be7c481eb0128b1cbf3b49b0df18 | 2021-12-02 | +| debian:11 | sha256:45ee40a844048c2f6d0105899c1a17733530b56d481612608aab5e2e4048570b | 2021-12-02 | +| debian:9 | sha256:aa78ddaa7f8a14bad8f940ebff5542377f91843f6dcc168e41a8628c6007e815 | 2021-12-02 | | moby/buildkit:latest | sha256:d6c89b7085b106301645ddcc77cf64eb7b705ab507b72d52d130ac33f1300417 | 2021-11-18 | -| node:12 | sha256:cb615135757e6e2eed4fad6d80f07b13d9f35072700c01da6de26fde5c9e8632 | 2021-11-17 | +| node:12 | sha256:eb92ed2473762b6d11736a4b4345aa3ef68f773999fe633bc4d9c91fa5d8f9d6 | 2021-12-02 | | node:12-alpine | sha256:0eca266c5fe38ba93aebac00e45c9ac1bb7328b0702a6dc10e1a6ea543d49301 | 2021-11-13 | -| node:14 | sha256:fbd6954d3941ebd1e12cd995dc10a4994535aa44d47271a91a829a2d1f88fc4c | 2021-11-17 | -| node:14-alpine | sha256:240e1e6ef6dfba3bb70d6e88cca6cbb0b5a6f3a2b4496ed7edc5474e8ed594bd | 2021-11-13 | -| node:16 | sha256:580a0850049c59a48f06090edd48c9f966c5e6572bbbabc369ba3ecbc4855dba | 2021-11-17 | -| node:16-alpine | sha256:60ef0bed1dc2ec835cfe3c4226d074fdfaba571fd619c280474cc04e93f0ec5b | 2021-11-13 | +| node:14 | sha256:52c884d7cf8509c27def168415a1ff23a0bd95d358dd5787ca77b60474dcb3db | 2021-12-02 | +| node:14-alpine | sha256:7bcf853eeb97a25465cb385b015606c22e926f548cbd117f85b7196df8aa0d29 | 2021-12-02 | +| node:16 | sha256:89b59ce49929d8a8e230946bdb1b58c14cdbbb86c9a7397610afcecfce1be035 | 2021-12-02 | +| node:16-alpine | sha256:a9b9cb880fa429b0bea899cd3b1bc081ab7277cc97e6d2dcd84bd9753b2027e1 | 2021-12-02 | | ubuntu:16.04 | sha256:0f71fa8d4d2d4292c3c617fda2b36f6dabe5c8b6e34c3dc5b0d17d4e704bd39c | 2021-08-31 | | ubuntu:18.04 | sha256:0fedbd5bd9fb72089c7bbca476949e10593cebed9b1fb9edf5b79dbbacddd7d6 | 2021-10-01 | | ubuntu:20.04 | sha256:626ffe58f6e7566e00254b638eb7e0f3b11d4da9675088f4781a50ae288f3322 | 2021-10-16 | @@ -307,7 +303,7 @@ | ftp | 0.17-34 | | gnupg2 | 2.2.4-1ubuntu1.4 | | haveged | 1.9.1-6 | -| imagemagick | 8:6.9.7.4+dfsg-16ubuntu6.11 | +| imagemagick | 8:6.9.7.4+dfsg-16ubuntu6.12 | | iproute2 | 4.15.0-2ubuntu1.3 | | iputils-ping | 3:20161105-1ubuntu3 | | jq | 1.5+dfsg-2 | @@ -320,8 +316,8 @@ | libgsl-dev | 2.4+dfsg-6 | | libgtk-3-0 | 3.22.30-1ubuntu4 | | libmagic-dev | 1:5.32-2ubuntu0.4 | -| libmagickcore-dev | 8:6.9.7.4+dfsg-16ubuntu6.11 | -| libmagickwand-dev | 8:6.9.7.4+dfsg-16ubuntu6.11 | +| libmagickcore-dev | 8:6.9.7.4+dfsg-16ubuntu6.12 | +| libmagickwand-dev | 8:6.9.7.4+dfsg-16ubuntu6.12 | | libsecret-1-dev | 0.18.6-1 | | libsqlite3-dev | 3.22.0-1ubuntu0.4 | | libunwind8 | 1.2.1-8 | @@ -366,4 +362,3 @@ | zip | 3.0-11build1 | | zsync | 0.6.2-3ubuntu1 | - From 9c8ba4fededb8081d23606c112dd30f5e24ed4de Mon Sep 17 00:00:00 2001 From: Vladimir Safonkin <vsafonkin@github.com> Date: Mon, 13 Dec 2021 12:49:56 +0300 Subject: [PATCH 0825/3485] Expand inner arrays in languageAndRuntimeList array (#4714) --- .../SoftwareReport.Generator.ps1 | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1 index 43442cef627d..368d797644ba 100644 --- a/images/macos/software-report/SoftwareReport.Generator.ps1 +++ b/images/macos/software-report/SoftwareReport.Generator.ps1 @@ -31,22 +31,22 @@ $markdown += New-MDList -Style Unordered -Lines ("Image Version: {0}" -f $ImageN $markdown += New-MDHeader "Installed Software" -Level 2 $markdown += New-MDHeader "Language and Runtime" -Level 3 $languageAndRuntimeList = @( - (Get-BashVersion), - (Get-MSBuildVersion), - (Get-NodeVersion), - (Get-NVMVersion), - (Get-NVMNodeVersionList), - (Get-PerlVersion), - (Get-PythonVersion), - (Get-Python3Version), - (Get-RubyVersion), - (Get-DotnetVersionList), - (Get-GoVersion), - (Get-JuliaVersion), - (Get-KotlinVersion), - (Get-PHPVersion), - (Get-ClangLLVMVersion), - (Get-GccVersion), + (Get-BashVersion) + (Get-MSBuildVersion) + (Get-NodeVersion) + (Get-NVMVersion) + (Get-NVMNodeVersionList) + (Get-PerlVersion) + (Get-PythonVersion) + (Get-Python3Version) + (Get-RubyVersion) + (Get-DotnetVersionList) + (Get-GoVersion) + (Get-JuliaVersion) + (Get-KotlinVersion) + (Get-PHPVersion) + (Get-ClangLLVMVersion) + (Get-GccVersion) (Get-FortranVersion) ) From 211e6f3c29a79e3028987fbbadc158352d793881 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 13 Dec 2021 11:16:38 +0000 Subject: [PATCH 0826/3485] Updating readme file for ubuntu20 version 20211209.3 (#4708) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2004-README.md | 155 +++++++++++++++--------------- 1 file changed, 75 insertions(+), 80 deletions(-) diff --git a/images/linux/Ubuntu2004-README.md b/images/linux/Ubuntu2004-README.md index 95ef79736a04..42eec1949f23 100644 --- a/images/linux/Ubuntu2004-README.md +++ b/images/linux/Ubuntu2004-README.md @@ -1,25 +1,21 @@ -| Announcements | -|-| -| [[all OSs] Default Nodejs version will be set to 16 on November, 29](https://github.com/actions/virtual-environments/issues/4446) | -*** # Ubuntu 20.04.3 LTS -- Linux kernel version: 5.11.0-1021-azure -- Image Version: 20211129.1 +- Linux kernel version: 5.11.0-1022-azure +- Image Version: 20211209.3 ## Installed Software ### Language and Runtime - Bash 5.0.17(1)-release - Clang 10.0.0, 11.0.0, 12.0.0 - Clang-format 10.0.0, 11.0.0, 12.0.0 -- Erlang 24.1.6 (Eshell 12.1.5) +- Erlang 24.1.7 (Eshell 12.1.5) - Erlang rebar3 3.17.0 - GNU C++ 9.3.0, 10.3.0 - GNU Fortran 9.3.0, 10.3.0 -- Julia 1.6.4 +- Julia 1.7.0 - Kotlin 1.6.0-release-798 - Mono 6.12.0.122 (apt source repository: https://download.mono-project.com/repo/ubuntu stable-focal main) - MSBuild 16.6.0.15201 (from /usr/lib/mono/msbuild/15.0/bin/MSBuild.dll) -- Node 16.13.0 +- Node 16.13.1 - Perl 5.30.0 - Python 3.8.10 - Python3 3.8.10 @@ -28,15 +24,15 @@ ### Package Management - cpan 1.64 -- Helm 3.7.1 -- Homebrew 3.3.5 +- Helm 3.7.2 +- Homebrew 3.3.7 - Miniconda 4.10.3 -- Npm 8.1.0 +- Npm 8.1.2 - Pip 20.0.2 - Pip3 20.0.2 - Pipx 0.16.4 - RubyGems 3.1.2 -- Vcpkg (build from master \<3a68454af>) +- Vcpkg (build from master \<14543ba18>) - Yarn 1.22.17 #### Environment variables @@ -47,70 +43,70 @@ ### Project Management - Ant 1.10.7 -- Gradle 7.3 +- Gradle 7.3.1 - Lerna 4.0.0 - Maven 3.8.4 - Sbt 1.5.5 ### Tools -- Ansible 2.11.6 +- Ansible 2.12.1 - apt-fast 1.9.11 - AzCopy 10.13.0 (available by `azcopy` and `azcopy10` aliases) -- Bazel 4.2.1 +- Bazel 4.2.2 - Bazelisk 1.10.1 - Bicep 0.4.1008 - Buildah 1.21.3 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- CMake 3.22.0 -- CodeQL Action Bundle 2.7.2 +- CMake 3.22.1 +- CodeQL Action Bundle 2.7.3 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.1.1+azure-1 -- Docker-Buildx 0.7.0 -- Docker-Moby Client 20.10.11+azure-1 -- Docker-Moby Server 20.10.11+azure-1 +- Docker Compose v2 2.1.1+azure-2 +- Docker-Buildx 0.7.1 +- Docker-Moby Client 20.10.11+azure-2 +- Docker-Moby Server 20.10.11+azure-2 - Fastlane 2.198.1 - Git 2.34.1 (apt source repository: ppa:git-core/ppa) - Git LFS 3.0.2 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.6.0 - Haveged 1.9.1 - Heroku 7.59.2 -- HHVM (HipHop VM) 4.137.0 +- HHVM (HipHop VM) 4.138.0 - jq 1.6 - Kind 0.11.1 -- Kubectl 1.22.4 +- Kubectl 1.23.0 - Kustomize 4.4.1 - Leiningen 2.9.8 - MediaInfo 19.09 - Mercurial 5.3.1 - Minikube 1.24.0 -- n 8.0.0 +- n 8.0.1 - Newman 5.3.0 - nvm 0.39.0 - OpenSSL 1.1.1f 31 Mar 2020 - Packer 1.7.8 - PhantomJS 2.1.1 - Podman 3.4.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- Pulumi 3.18.1 +- Pulumi 3.19.0 - R 4.1.2 - Skopeo 1.3.0 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 -- Terraform 1.0.11 +- Terraform 1.1.0 - yamllint 1.26.3 -- yq 4.15.1 +- yq 4.16.1 - zstd 1.5.0 (homebrew) ### CLI Tools -- Alibaba Cloud CLI 3.0.99 -- AWS CLI 2.4.2 +- Alibaba Cloud CLI 3.0.100 +- AWS CLI 2.4.5 - AWS CLI Session manager plugin 1.2.279.0 - AWS SAM CLI 1.36.0 -- Azure CLI (azure-cli) 2.30.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) +- Azure CLI (azure-cli) 2.31.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.22.0 -- GitHub CLI 2.2.0 -- Google Cloud SDK 365.0.1 (apt source repository: https://packages.cloud.google.com/apt) +- GitHub CLI 2.3.0 +- Google Cloud SDK 366.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 8.0.3 -- OpenShift CLI 4.9.8 +- Netlify CLI 8.0.18 +- OpenShift CLI 4.9.10 - ORAS CLI 0.12.0 - Vercel CLI 23.1.2 @@ -126,11 +122,11 @@ | CE 21.3.0 | GRAALVM_11_ROOT | ### PHP -| Tool | Version | -| -------- | ------------- | -| PHP | 7.4.26 8.0.13 | -| Composer | 2.1.12 | -| PHPUnit | 8.5.21 | +| Tool | Version | +| -------- | ------------------- | +| PHP | 7.4.26 8.0.13 8.1.0 | +| Composer | 2.1.14 | +| PHPUnit | 8.5.21 | ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ``` @@ -141,21 +137,21 @@ - Stack 2.7.3 ### Rust Tools -- Cargo 1.56.0 -- Rust 1.56.1 -- Rustdoc 1.56.1 +- Cargo 1.57.0 +- Rust 1.57.0 +- Rustdoc 1.57.0 - Rustup 1.24.3 #### Packages - Bindgen 0.59.2 - Cargo audit 0.16.0 -- Cargo clippy 0.1.56 +- Cargo clippy 0.1.57 - Cargo outdated 0.10.2 - Cbindgen 0.20.0 - Rustfmt 1.4.37 ### Browsers and Drivers -- Google Chrome 96.0.4664.45 +- Google Chrome 96.0.4664.93 - ChromeDriver 96.0.4664.45 - Mozilla Firefox 94.0 - Geckodriver 0.30.0 @@ -173,12 +169,12 @@ - 2.1.302 2.1.403 2.1.526 2.1.617 2.1.701 2.1.818 3.1.120 3.1.202 3.1.302 3.1.415 5.0.104 5.0.209 5.0.303 5.0.403 ### Databases -- MongoDB 5.0.4 (apt source repository: https://repo.mongodb.org/apt/ubuntu) +- MongoDB 5.0.5 (apt source repository: https://repo.mongodb.org/apt/ubuntu) - PostgreSQL 14.1 (apt source repository: https://apt.postgresql.org/pub/repos/apt/) - sqlite3 3.31.1 #### MySQL -- MySQL 8.0.27 +- MySQL 8.0.26 - MySQL Server (user:root password:root) ``` @@ -191,13 +187,13 @@ ### Cached Tools #### Go - 1.15.15 -- 1.16.10 -- 1.17.3 +- 1.16.11 +- 1.17.4 #### Node.js - 12.22.7 -- 14.18.1 -- 16.13.0 +- 14.18.2 +- 16.13.1 #### PyPy - 2.7.18 [PyPy 7.3.6] @@ -224,8 +220,8 @@ | Name | Value | Architecture | | --------------- | ----------------------------------- | ------------ | | GOROOT_1_15_X64 | /opt/hostedtoolcache/go/1.15.15/x64 | x64 | -| GOROOT_1_16_X64 | /opt/hostedtoolcache/go/1.16.10/x64 | x64 | -| GOROOT_1_17_X64 | /opt/hostedtoolcache/go/1.17.3/x64 | x64 | +| GOROOT_1_16_X64 | /opt/hostedtoolcache/go/1.16.11/x64 | x64 | +| GOROOT_1_17_X64 | /opt/hostedtoolcache/go/1.17.4/x64 | x64 | ### PowerShell Tools - PowerShell 7.2.0 @@ -248,20 +244,20 @@ | nginx | 1.18.0 | /etc/nginx/nginx.conf | inactive | 80 | ### Android -| Package Name | Version | -| -------------------------- | ---------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 4.0 | -| Android Emulator | 30.9.5 | -| Android SDK Build-tools | 31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | -| Android SDK Platform-Tools | 31.0.3 | -| Android SDK Platforms | android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | -| Android SDK Tools | 26.1.1 | -| Android Support Repository | 47.0.0 | -| CMake | 3.10.2<br>3.18.1 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 21.4.7075529 (default)<br>22.1.7171670<br>23.1.7779620 | -| SDK Patch Applier v4 | 1 | +| Package Name | Version | +| -------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 4.0 | +| Android Emulator | 31.1.4 | +| Android SDK Build-tools | 32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | +| Android SDK Platform-Tools | 31.0.3 | +| Android SDK Platforms | android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | +| Android SDK Tools | 26.1.1 | +| Android Support Repository | 47.0.0 | +| CMake | 3.10.2<br>3.18.1 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 21.4.7075529 (default)<br>22.1.7171670<br>23.1.7779620 | +| SDK Patch Applier v4 | 1 | #### Environment variables | Name | Value | @@ -278,19 +274,19 @@ | alpine:3.12 | sha256:d9459083f962de6bd980ae6a05be2a4cf670df6a1d898157bceb420342bec280 | 2021-11-12 | | alpine:3.13 | sha256:026f721af4cf2843e07bba648e158fb35ecc876d822130633cc49f707f0fc88c | 2021-11-12 | | alpine:3.14 | sha256:635f0aa53d99017b38d1a0aa5b2082f7812b03e3cdb299103fe77b5c8a07f1d2 | 2021-11-12 | -| buildpack-deps:bullseye | sha256:b83c9c8628517694fc9adea2dc25f70113f511606482c79e1a7689ba4893f7c4 | 2021-11-17 | -| buildpack-deps:buster | sha256:184194bf02563c474132a6982ed5878ef32b19b9f2a10029422ab304ca88ade1 | 2021-11-17 | -| buildpack-deps:stretch | sha256:36fba449401e28a20c9fc9ebae94b4071c0a69bab5aade3340539ac9c857375a | 2021-11-17 | -| debian:10 | sha256:e5333f8697a86fa1be53b2a7e994247083f61885166df0cdda9f812acb514d7c | 2021-11-17 | -| debian:11 | sha256:e8c184b56a94db0947a9d51ec68f42ef5584442f20547fa3bd8cbd00203b2e7a | 2021-11-17 | -| debian:9 | sha256:d8ee86bf0afeb901de293c692a540307a670306cbdb7a06e2c840f17b0c35374 | 2021-11-17 | +| buildpack-deps:bullseye | sha256:5445b145c8a1a2f7e5a4b233f571c629aed12fce435496f942ad267f21a05ff2 | 2021-12-02 | +| buildpack-deps:buster | sha256:c11cd0a4c97acd1aa8d2289aee5c126ac78adc48108744c104f6741cbd9a1f6c | 2021-12-02 | +| buildpack-deps:stretch | sha256:bb93e2c2858cb20f7f16e433773adb2c583fce38dc9c71976c62bf098f956093 | 2021-12-02 | +| debian:10 | sha256:5b57f8c365c40fde437d53b953c436995525be7c481eb0128b1cbf3b49b0df18 | 2021-12-02 | +| debian:11 | sha256:45ee40a844048c2f6d0105899c1a17733530b56d481612608aab5e2e4048570b | 2021-12-02 | +| debian:9 | sha256:aa78ddaa7f8a14bad8f940ebff5542377f91843f6dcc168e41a8628c6007e815 | 2021-12-02 | | moby/buildkit:latest | sha256:d6c89b7085b106301645ddcc77cf64eb7b705ab507b72d52d130ac33f1300417 | 2021-11-18 | -| node:12 | sha256:cb615135757e6e2eed4fad6d80f07b13d9f35072700c01da6de26fde5c9e8632 | 2021-11-17 | +| node:12 | sha256:eb92ed2473762b6d11736a4b4345aa3ef68f773999fe633bc4d9c91fa5d8f9d6 | 2021-12-02 | | node:12-alpine | sha256:0eca266c5fe38ba93aebac00e45c9ac1bb7328b0702a6dc10e1a6ea543d49301 | 2021-11-13 | -| node:14 | sha256:fbd6954d3941ebd1e12cd995dc10a4994535aa44d47271a91a829a2d1f88fc4c | 2021-11-17 | -| node:14-alpine | sha256:240e1e6ef6dfba3bb70d6e88cca6cbb0b5a6f3a2b4496ed7edc5474e8ed594bd | 2021-11-13 | -| node:16 | sha256:580a0850049c59a48f06090edd48c9f966c5e6572bbbabc369ba3ecbc4855dba | 2021-11-17 | -| node:16-alpine | sha256:60ef0bed1dc2ec835cfe3c4226d074fdfaba571fd619c280474cc04e93f0ec5b | 2021-11-13 | +| node:14 | sha256:52c884d7cf8509c27def168415a1ff23a0bd95d358dd5787ca77b60474dcb3db | 2021-12-02 | +| node:14-alpine | sha256:7bcf853eeb97a25465cb385b015606c22e926f548cbd117f85b7196df8aa0d29 | 2021-12-02 | +| node:16 | sha256:89b59ce49929d8a8e230946bdb1b58c14cdbbb86c9a7397610afcecfce1be035 | 2021-12-02 | +| node:16-alpine | sha256:a9b9cb880fa429b0bea899cd3b1bc081ab7277cc97e6d2dcd84bd9753b2027e1 | 2021-12-02 | | ubuntu:16.04 | sha256:0f71fa8d4d2d4292c3c617fda2b36f6dabe5c8b6e34c3dc5b0d17d4e704bd39c | 2021-08-31 | | ubuntu:18.04 | sha256:0fedbd5bd9fb72089c7bbca476949e10593cebed9b1fb9edf5b79dbbacddd7d6 | 2021-10-01 | | ubuntu:20.04 | sha256:626ffe58f6e7566e00254b638eb7e0f3b11d4da9675088f4781a50ae288f3322 | 2021-10-16 | @@ -325,7 +321,7 @@ | libc++-dev | 1:10.0-50\~exp1 | | libc++abi-dev | 1:10.0-50\~exp1 | | libcurl4 | 7.68.0-1ubuntu2.7 | -| libgbm-dev | 21.0.3-0ubuntu0.3\~20.04.4 | +| libgbm-dev | 21.0.3-0ubuntu0.3\~20.04.5 | | libgconf-2-4 | 3.2.6-6ubuntu1 | | libgsl-dev | 2.5+dfsg-6build1 | | libgtk-3-0 | 3.24.20-0ubuntu1 | @@ -376,4 +372,3 @@ | zip | 3.0-11build1 | | zsync | 0.6.2-3ubuntu1 | - From ea705c4d6334facde0d6a2671af97af056057243 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Mon, 13 Dec 2021 14:54:37 +0300 Subject: [PATCH 0827/3485] [Windows] Wait Containers installation feature (#4720) --- images/win/windows2022.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/win/windows2022.json b/images/win/windows2022.json index 555f3d3e7291..251507985f3a 100644 --- a/images/win/windows2022.json +++ b/images/win/windows2022.json @@ -140,11 +140,11 @@ { "type": "windows-restart", "check_registry": true, + "restart_check_command": "powershell -command \"& {while ( (Get-WindowsOptionalFeature -Online -FeatureName Containers -ErrorAction SilentlyContinue).State -ne 'Enabled' ) { Start-Sleep 30; Write-Output 'InProgress' }}\"", "restart_timeout": "10m" }, { "type": "powershell", - "pause_before": "2m", "scripts": [ "{{ template_dir }}/scripts/Installers/Install-Docker.ps1", "{{ template_dir }}/scripts/Installers/Install-PowershellCore.ps1" From 573c5aa999a097a7e901c6be423cb886581b077c Mon Sep 17 00:00:00 2001 From: V-Zabayrachny <79155496+V-Zabayrachny@users.noreply.github.com> Date: Tue, 14 Dec 2021 11:31:48 +0300 Subject: [PATCH 0828/3485] [Windows] Add installer projects to VS on Windows-2022 (#4715) * [Windows] Add installer projects to VS on windows-2022 * [Windows] Improve the function Install-VsixExtension --- images/win/scripts/ImageHelpers/InstallHelpers.ps1 | 9 ++++++++- images/win/scripts/Installers/Install-Vsix.ps1 | 2 +- images/win/toolsets/toolset-2022.json | 4 +++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/images/win/scripts/ImageHelpers/InstallHelpers.ps1 b/images/win/scripts/ImageHelpers/InstallHelpers.ps1 index 4522bcf7f022..30084aa477fc 100644 --- a/images/win/scripts/ImageHelpers/InstallHelpers.ps1 +++ b/images/win/scripts/ImageHelpers/InstallHelpers.ps1 @@ -270,10 +270,17 @@ function Install-VsixExtension $vsEdition = (Get-ToolsetContent).visualStudio.edition try { + $installPath = ${env:ProgramFiles(x86)} + + if (Test-IsWin22) + { + $installPath = ${env:ProgramFiles} + } + #There are 2 types of packages at the moment - exe and vsix if ($Name -match "vsix") { - $process = Start-Process -FilePath "C:\Program Files (x86)\Microsoft Visual Studio\$VSversion\${vsEdition}\Common7\IDE\VSIXInstaller.exe" -ArgumentList $argumentList -Wait -PassThru + $process = Start-Process -FilePath "${installPath}\Microsoft Visual Studio\${VSversion}\${vsEdition}\Common7\IDE\VSIXInstaller.exe" -ArgumentList $argumentList -Wait -PassThru } else { diff --git a/images/win/scripts/Installers/Install-Vsix.ps1 b/images/win/scripts/Installers/Install-Vsix.ps1 index 23d75729fb02..405a4562b47b 100644 --- a/images/win/scripts/Installers/Install-Vsix.ps1 +++ b/images/win/scripts/Installers/Install-Vsix.ps1 @@ -12,7 +12,7 @@ if (-not $vsixPackagesList) { $vsVersion = $toolset.visualStudio.Version $vsixPackagesList | ForEach-Object { - # Retrieve cdn endpoint to avoid HTTP error 429 https://github.com/actions/virtual-environments/issues/3074 + # Retrieve cdn endpoint to avoid HTTP error 429 https://github.com/actions/virtual-environments/issues/3074 $vsixPackage = Get-VsixExtenstionFromMarketplace -ExtensionMarketPlaceName $_ Install-VsixExtension -Url $vsixPackage.DownloadUri -Name $vsixPackage.FileName -VSversion $vsVersion } diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index 534114d0c3d6..2e6151a4477e 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -241,7 +241,9 @@ "Component.MDD.Linux", "wasm.tools" ], - "vsix": [] + "vsix": [ + "VisualStudioClient.MicrosoftVisualStudio2022InstallerProjects" + ] }, "docker": { "images": [ From 44d41e873b40d276395ae09267d4280558e4d251 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Tue, 14 Dec 2021 18:08:46 +0300 Subject: [PATCH 0829/3485] [Windows] Remove RustJunction.ps1 post-generation script (#4635) * Remove RustJunction.ps1 post-generation script * update rust tests --- images/win/post-generation/RustJunction.ps1 | 12 ------ .../win/scripts/Installers/Install-Rust.ps1 | 39 +++---------------- images/win/scripts/Tests/Rust.Tests.ps1 | 22 +++++++---- 3 files changed, 20 insertions(+), 53 deletions(-) delete mode 100644 images/win/post-generation/RustJunction.ps1 diff --git a/images/win/post-generation/RustJunction.ps1 b/images/win/post-generation/RustJunction.ps1 deleted file mode 100644 index 86f3fc106f9e..000000000000 --- a/images/win/post-generation/RustJunction.ps1 +++ /dev/null @@ -1,12 +0,0 @@ -# Create Rust junction points to cargo and rustup folder -$cargoTarget = "$env:USERPROFILE\.cargo" -if (-not (Test-Path $cargoTarget)) -{ - New-Item -ItemType Junction -Path $cargoTarget -Target "C:\Rust\.cargo" -} - -$rustupTarget = "$env:USERPROFILE\.rustup" -if (-not (Test-Path $rustupTarget)) -{ - New-Item -ItemType Junction -Path $rustupTarget -Target "C:\Rust\.rustup" -} \ No newline at end of file diff --git a/images/win/scripts/Installers/Install-Rust.ps1 b/images/win/scripts/Installers/Install-Rust.ps1 index 0acf32799d0a..73b5abb3f33a 100644 --- a/images/win/scripts/Installers/Install-Rust.ps1 +++ b/images/win/scripts/Installers/Install-Rust.ps1 @@ -4,8 +4,8 @@ ################################################################################ # Rust Env -$env:RUSTUP_HOME = "C:\Rust\.rustup" -$env:CARGO_HOME = "C:\Rust\.cargo" +$env:RUSTUP_HOME = "C:\Users\Default\.rustup" +$env:CARGO_HOME = "C:\Users\Default\.cargo" # Download the latest rustup-init.exe for Windows x64 # See https://rustup.rs/# @@ -14,43 +14,16 @@ $rustupPath = Start-DownloadWithRetry -Url "https://win.rustup.rs/x86_64" -Name # Install Rust by running rustup-init.exe (disabling the confirmation prompt with -y) & $rustupPath -y --default-toolchain=stable --profile=minimal +# Add %USERPROFILE%\.cargo\bin to USER PATH +Add-DefaultPathItem "%USERPROFILE%\.cargo\bin" # Add Rust binaries to the path -Add-MachinePathItem "$env:CARGO_HOME\bin" -$env:Path = Get-MachinePath +$env:Path += ";$env:CARGO_HOME\bin" # Install common tools rustup component add rustfmt clippy cargo install --locked bindgen cbindgen cargo-audit cargo-outdated -# Run script at startup for all users -$cmdRustSymScript = @" -@echo off - -if exist $env:CARGO_HOME ( - if not exist %USERPROFILE%\.cargo ( - mklink /J %USERPROFILE%\.cargo $env:CARGO_HOME - ) -) - -if exist $env:RUSTUP_HOME ( - if not exist %USERPROFILE%\.rustup ( - mklink /J %USERPROFILE%\.rustup $env:RUSTUP_HOME - ) -) -"@ - -$cmdPath = "C:\Rust\rustsym.bat" -$cmdRustSymScript | Out-File -Encoding ascii -FilePath $cmdPath - # Cleanup Cargo crates cache Remove-Item "${env:CARGO_HOME}\registry\*" -Recurse -Force -# Update Run key to run a script at logon -Set-ItemProperty -Path "HKLM:\Software\Microsoft\Windows\CurrentVersion\Run" -Name "RUSTSYM" -Value $cmdPath - -# Create temporary symlinks to properly validate tools version -Set-Location -Path $env:UserProfile -$null = New-Item -Name ".rustup" -Value $env:RUSTUP_HOME -ItemType Junction -$null = New-Item -Name ".cargo" -Value $env:CARGO_HOME -ItemType Junction - -Invoke-PesterTests -TestFile "Rust" \ No newline at end of file +Invoke-PesterTests -TestFile "Rust" diff --git a/images/win/scripts/Tests/Rust.Tests.ps1 b/images/win/scripts/Tests/Rust.Tests.ps1 index 49e0c694f16e..56ca20f857fa 100644 --- a/images/win/scripts/Tests/Rust.Tests.ps1 +++ b/images/win/scripts/Tests/Rust.Tests.ps1 @@ -1,10 +1,16 @@ Describe "Rust" { + BeforeAll { + $env:RUSTUP_HOME = "C:\Users\Default\.rustup" + $env:CARGO_HOME = "C:\Users\Default\.cargo" + $env:Path += ";$env:CARGO_HOME\bin" + } + $rustTools = @( - @{ToolName = "rustup"; binPath = "C:\Rust\.cargo\bin\rustup.exe"} - @{ToolName = "rustc"; binPath = "C:\Rust\.cargo\bin\rustc.exe"} - @{ToolName = "cargo"; binPath = "C:\Rust\.cargo\bin\cargo.exe"} - @{ToolName = "cargo audit"; binPath = "C:\Rust\.cargo\bin\cargo-audit.exe"} - @{ToolName = "cargo outdated"; binPath = "C:\Rust\.cargo\bin\cargo-outdated.exe"} + @{ToolName = "rustup"; binPath = "C:\Users\Default\.cargo\bin\rustup.exe"} + @{ToolName = "rustc"; binPath = "C:\Users\Default\.cargo\bin\rustc.exe"} + @{ToolName = "cargo"; binPath = "C:\Users\Default\.cargo\bin\cargo.exe"} + @{ToolName = "cargo audit"; binPath = "C:\Users\Default\.cargo\bin\cargo-audit.exe"} + @{ToolName = "cargo outdated"; binPath = "C:\Users\Default\.cargo\bin\cargo-outdated.exe"} ) $rustEnvNotExists = @( @@ -12,8 +18,8 @@ Describe "Rust" { @{envVar = "CARGO_HOME"} ) - It "C:\Rust\.rustup and C:\Rust\.cargo folders exist" { - "C:\Rust\.rustup", "C:\Rust\.cargo" | Should -Exist + It "C:\Users\Default\.rustup and C:\Users\Default\.cargo folders exist" { + "C:\Users\Default\.rustup", "C:\Users\Default\.cargo" | Should -Exist } It "<envVar> environment variable does not exist" -TestCases $rustEnvNotExists { @@ -24,4 +30,4 @@ Describe "Rust" { "$ToolName --version" | Should -ReturnZeroExitCode $binPath | Should -Exist } -} \ No newline at end of file +} From 9ec86a6e3e7696fff040cb80cf2cfaa589039019 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Tue, 14 Dec 2021 21:46:30 +0300 Subject: [PATCH 0830/3485] [Ubuntu] install mysql init script for sysVinit compatibility (#4736) --- .../scripts/helpers/mysql-service-helper.sh | 193 ++++++++++++++++++ images/linux/scripts/installers/mysql.sh | 5 + .../linux/scripts/tests/Databases.Tests.ps1 | 9 +- 3 files changed, 206 insertions(+), 1 deletion(-) create mode 100644 images/linux/scripts/helpers/mysql-service-helper.sh diff --git a/images/linux/scripts/helpers/mysql-service-helper.sh b/images/linux/scripts/helpers/mysql-service-helper.sh new file mode 100644 index 000000000000..f09e0db5eb66 --- /dev/null +++ b/images/linux/scripts/helpers/mysql-service-helper.sh @@ -0,0 +1,193 @@ +#!/bin/bash +# +# Temporary fix for the https://github.com/actions/virtual-environments/issues/4732 issue +# Taken from the official ubuntu:20.04 docker container +### BEGIN INIT INFO +# Provides: mysql +# Required-Start: $remote_fs $syslog +# Required-Stop: $remote_fs $syslog +# Should-Start: $network $time +# Should-Stop: $network $time +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: Start and stop the mysql database server daemon +# Description: Controls the main MySQL database server daemon "mysqld" +# and its wrapper script "mysqld_safe". +### END INIT INFO +# +set -e +set -u +${DEBIAN_SCRIPT_DEBUG:+ set -v -x} + +test -x /usr/bin/mysqld_safe || exit 0 + +. /lib/lsb/init-functions + +SELF=$(cd $(dirname $0); pwd -P)/$(basename $0) +CONF=/etc/mysql/my.cnf +MYADMIN="/usr/bin/mysqladmin --defaults-file=/etc/mysql/debian.cnf" + +# priority can be overriden and "-s" adds output to stderr +ERR_LOGGER="logger -p daemon.err -t /etc/init.d/mysql -i" + +# Safeguard (relative paths, core dumps..) +cd / +umask 077 + +# mysqladmin likes to read /root/.my.cnf. This is usually not what I want +# as many admins e.g. only store a password without a username there and +# so break my scripts. +export HOME=/etc/mysql/ + +## Fetch a particular option from mysql's invocation. +# +# Usage: void mysqld_get_param option +mysqld_get_param() { + /usr/sbin/mysqld --print-defaults \ + | tr " " "\n" \ + | grep -- "--$1" \ + | tail -n 1 \ + | cut -d= -f2 +} + +## Do some sanity checks before even trying to start mysqld. +sanity_checks() { + # check for config file + if [ ! -r /etc/mysql/my.cnf ]; then + log_warning_msg "$0: WARNING: /etc/mysql/my.cnf cannot be read. See README.Debian.gz" + echo "WARNING: /etc/mysql/my.cnf cannot be read. See README.Debian.gz" | $ERR_LOGGER + fi + + # check for diskspace shortage + datadir=`mysqld_get_param datadir` + if LC_ALL=C BLOCKSIZE= df --portability $datadir/. | tail -n 1 | awk '{ exit ($4>4096) }'; then + log_failure_msg "$0: ERROR: The partition with $datadir is too full!" + echo "ERROR: The partition with $datadir is too full!" | $ERR_LOGGER + exit 1 + fi +} + +## Checks if there is a server running and if so if it is accessible. +# +# check_alive insists on a pingable server +# check_dead also fails if there is a lost mysqld in the process list +# +# Usage: boolean mysqld_status [check_alive|check_dead] [warn|nowarn] +mysqld_status () { + ping_output=`$MYADMIN ping 2>&1`; ping_alive=$(( ! $? )) + + ps_alive=0 + pidfile=`mysqld_get_param pid-file` + if [ -f "$pidfile" ] && ps `cat $pidfile` >/dev/null 2>&1; then ps_alive=1; fi + + if [ "$1" = "check_alive" -a $ping_alive = 1 ] || + [ "$1" = "check_dead" -a $ping_alive = 0 -a $ps_alive = 0 ]; then + return 0 # EXIT_SUCCESS + else + if [ "$2" = "warn" ]; then + echo -e "$ps_alive processes alive and '$MYADMIN ping' resulted in\n$ping_output\n" | $ERR_LOGGER -p daemon.debug + fi + return 1 # EXIT_FAILURE + fi +} + +# +# main() +# + +case "${1:-''}" in + 'start') + sanity_checks; + # Start daemon + log_daemon_msg "Starting MySQL database server" "mysqld" + if mysqld_status check_alive nowarn; then + log_progress_msg "already running" + log_end_msg 0 + else + # Could be removed during boot + test -e /var/run/mysqld || install -m 755 -o mysql -g root -d /var/run/mysqld + + # Start MySQL! + su - mysql -s /bin/sh -c "/usr/bin/mysqld_safe > /dev/null 2>&1 &" + + # 6s was reported in #352070 to be too few when using ndbcluster + # 14s was reported in #736452 to be too few with large installs + for i in $(seq 1 30); do + sleep 1 + if mysqld_status check_alive nowarn ; then break; fi + log_progress_msg "." + done + if mysqld_status check_alive warn; then + log_end_msg 0 + # Now start mysqlcheck or whatever the admin wants. + output=$(/etc/mysql/debian-start) + [ -n "$output" ] && log_action_msg "$output" + else + log_end_msg 1 + log_failure_msg "Please take a look at the syslog" + fi + fi + ;; + + 'stop') + # * As a passwordless mysqladmin (e.g. via ~/.my.cnf) must be possible + # at least for cron, we can rely on it here, too. (although we have + # to specify it explicit as e.g. sudo environments points to the normal + # users home and not /root) + log_daemon_msg "Stopping MySQL database server" "mysqld" + if ! mysqld_status check_dead nowarn; then + set +e + shutdown_out=`$MYADMIN shutdown 2>&1`; r=$? + set -e + if [ "$r" -ne 0 ]; then + log_end_msg 1 + [ "$VERBOSE" != "no" ] && log_failure_msg "Error: $shutdown_out" + log_daemon_msg "Killing MySQL database server by signal" "mysqld" + killall -15 mysqld + server_down= + for i in 1 2 3 4 5 6 7 8 9 10; do + sleep 1 + if mysqld_status check_dead nowarn; then server_down=1; break; fi + done + if test -z "$server_down"; then killall -9 mysqld; fi + fi + fi + + if ! mysqld_status check_dead warn; then + log_end_msg 1 + log_failure_msg "Please stop MySQL manually and read /usr/share/doc/mysql-server-5.7/README.Debian.gz!" + exit -1 + else + log_end_msg 0 + fi + ;; + + 'restart') + set +e; $SELF stop; set -e + $SELF start + ;; + + 'reload'|'force-reload') + log_daemon_msg "Reloading MySQL database server" "mysqld" + $MYADMIN reload + log_end_msg 0 + ;; + + 'status') + if mysqld_status check_alive nowarn; then + log_action_msg "$($MYADMIN version)" + else + log_action_msg "MySQL is stopped." + exit 3 + fi + ;; + + *) + echo "Usage: $SELF start|stop|restart|reload|force-reload|status" + exit 1 + ;; +esac + +# Some success paths end up returning non-zero so exit 0 explicitly. See +# bug #739846. +exit 0 diff --git a/images/linux/scripts/installers/mysql.sh b/images/linux/scripts/installers/mysql.sh index e0f012affa36..c5029c1f6bb7 100644 --- a/images/linux/scripts/installers/mysql.sh +++ b/images/linux/scripts/installers/mysql.sh @@ -45,6 +45,11 @@ if isUbuntu20 ; then dpkg -i $package done + # Install the /etc/init.d/mysql script for backward compatibility with sysVinit + cp $HELPER_SCRIPTS/mysql-service-helper.sh /etc/init.d/mysql + # Fix permission + chmod 755 /etc/init.d/mysql + # Start mysql to change its settings systemctl start mysql.service # Enable mysql log-in without sudo by activation of the mysql_native_password plugin diff --git a/images/linux/scripts/tests/Databases.Tests.ps1 b/images/linux/scripts/tests/Databases.Tests.ps1 index f80dab5c07fe..79e6cb999209 100644 --- a/images/linux/scripts/tests/Databases.Tests.ps1 +++ b/images/linux/scripts/tests/Databases.Tests.ps1 @@ -12,7 +12,7 @@ Describe "PostgreSQL" { It "PostgreSQL Service" { "sudo systemctl start postgresql" | Should -ReturnZeroExitCode (Get-CommandResult "pg_isready").Output | Should -Be "/var/run/postgresql:5432 - accepting connections" - "sudo systemctl stop postgresql" | Should -ReturnZeroExitCode + "sudo systemctl stop postgresql" | Should -ReturnZeroExitCode } It "PostgreSQL version should correspond to the version in the toolset" { @@ -36,4 +36,11 @@ Describe "MySQL" { "sudo mysql -vvv -e 'DROP DATABASE smoke_test' -uroot -proot" | Should -ReturnZeroExitCode "sudo systemctl stop mysql" | Should -ReturnZeroExitCode } + + It "MySQL sysVinit script works" { + sudo /etc/init.d/mysql start | Out-Null + systemctl is-active mysql | Should -Be "active" + sudo /etc/init.d/mysql stop | Out-Null + systemctl is-active mysql | Should -Be "inactive" + } } From c17273886772fe282dd46ac18d0ca81cae9860a8 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 16 Dec 2021 07:18:31 +0000 Subject: [PATCH 0831/3485] macOS 11 (20211211 update) (#4721) * Updating readme file for macOS-11 version 20211211.1 * Add new lines in GCC, Gfortran, Clang Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-11-Readme.md | 50 ++++++++++++++++----------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/images/macos/macos-11-Readme.md b/images/macos/macos-11-Readme.md index e01e4d37057a..921df8ee80b1 100644 --- a/images/macos/macos-11-Readme.md +++ b/images/macos/macos-11-Readme.md @@ -5,7 +5,7 @@ # macOS 11.6 info - System Version: macOS 11.6.1 (20G224) - Kernel Version: Darwin 20.6.0 -- Image Version: 20211207.1 +- Image Version: 20211211.1 ## Installed Software ### Language and Runtime @@ -45,7 +45,7 @@ - Pip 21.3.1 (python 3.9) - Pipx 0.16.4 - RubyGems 3.2.33 -- Vcpkg 2021 (build from master \<7bb175eaf>) +- Vcpkg 2021 (build from master \<48bba4f9c>) - Yarn 1.22.15 #### Environment variables @@ -58,14 +58,14 @@ - Apache Ant(TM) 1.10.12 - Apache Maven 3.8.4 - Gradle 7.3.1 -- Sbt 1.5.5 +- Sbt 1.5.6 ### Utilities - 7-Zip 17.04 - aria2 1.36.0 - azcopy 10.13.0 - bazel 4.2.2 -- bazelisk 1.10.1 +- bazelisk 1.11.0 - bsdtar 3.3.2 - available by 'tar' alias - Curl 7.80.0 - Git LFS: 3.0.2 @@ -74,7 +74,7 @@ - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.2 - gpg (GnuPG) 2.3.3 -- helm v3.7.1+g1d11fcb +- helm v3.7.2+g663a896 - Hub CLI: 2.14.2 - jq 1.6 - mongo v5.0.4 @@ -92,19 +92,19 @@ ### Tools - Aliyun CLI 3.0.100 - App Center CLI 2.10.6 -- AWS CLI 2.4.5 +- AWS CLI 2.4.6 - AWS SAM CLI 1.36.0 - AWS Session Manager CLI 1.2.279.0 - Azure CLI 2.31.0 - Bicep CLI 0.4.1008 - Cabal 3.6.2.0 -- Cmake 3.22.0 -- Fastlane 2.198.1 +- Cmake 3.22.1 +- Fastlane 2.199.0 - GHC 9.2.1 - GHCup 0.1.17.4 - Jazzy 0.14.1 - Stack 2.7.3 -- SwiftFormat 0.49.0 +- SwiftFormat 0.49.1 - Swig 4.0.2 - Xcode Command Line Tools 13.0.0.0.1.1630607135 @@ -117,7 +117,7 @@ - SafariDriver 15.1 (16612.2.9.1.30) - Google Chrome 96.0.4664.93 - ChromeDriver 96.0.4664.45 -- Microsoft Edge 96.0.1054.43 +- Microsoft Edge 96.0.1054.53 - MSEdgeDriver 96.0.1054.43 - Mozilla Firefox 95.0 - geckodriver 0.30.0 @@ -165,8 +165,8 @@ | Version | Architecture | Environment Variable | | ------- | ------------ | -------------------- | | 1.15.15 (Default) | x64 | GOROOT_1_15_X64 | -| 1.16.11 | x64 | GOROOT_1_16_X64 | -| 1.17.4 | x64 | GOROOT_1_17_X64 | +| 1.16.12 | x64 | GOROOT_1_16_X64 | +| 1.17.5 | x64 | GOROOT_1_17_X64 | ### Rust Tools - Cargo 1.57.0 @@ -302,19 +302,19 @@ | watchOS 8.3 | 13.2 | Apple Watch Series 4 - 40mm<br>Apple Watch Series 4 - 44mm<br>Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | ### Android -| Package Name | Version | -| -------------------------- | ---------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 4.0 | -| Android Emulator | 31.1.4 | -| Android SDK Build-tools | 31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | -| Android SDK Platforms | android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | -| Android SDK Platform-Tools | 31.0.3 | -| Android Support Repository | 47.0.0 | -| CMake | 3.10.2<br>3.18.1 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 21.4.7075529 (default)<br>22.1.7171670<br>23.1.7779620 | -| SDK Patch Applier v4 | 1 | +| Package Name | Version | +| -------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 4.0 | +| Android Emulator | 31.1.4 | +| Android SDK Build-tools | 32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | +| Android SDK Platforms | android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | +| Android SDK Platform-Tools | 31.0.3 | +| Android Support Repository | 47.0.0 | +| CMake | 3.10.2<br>3.18.1 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 21.4.7075529 (default)<br>22.1.7171670<br>23.1.7779620 | +| SDK Patch Applier v4 | 1 | #### Environment variables | Name | Value | From ff37068951591328f151559a696fcddca12aaad4 Mon Sep 17 00:00:00 2001 From: Andrew King <4885461+andrew-r-king@users.noreply.github.com> Date: Thu, 16 Dec 2021 02:57:04 -0500 Subject: [PATCH 0832/3485] Update Install-NSIS.ps1 (#4740) * Update Install-NSIS.ps1 Update NSIS to 3.08 See notes in #4739 * use in Install-NSIS.ps1, added nsis to toolset files --- images/win/scripts/Installers/Install-NSIS.ps1 | 5 +++-- images/win/toolsets/toolset-2016.json | 3 +++ images/win/toolsets/toolset-2019.json | 3 +++ images/win/toolsets/toolset-2022.json | 3 +++ 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/images/win/scripts/Installers/Install-NSIS.ps1 b/images/win/scripts/Installers/Install-NSIS.ps1 index 47165ef14784..49a58fc5249e 100644 --- a/images/win/scripts/Installers/Install-NSIS.ps1 +++ b/images/win/scripts/Installers/Install-NSIS.ps1 @@ -3,10 +3,11 @@ ## Desc: Install NSIS ################################################################################ -Install-Binary -Url 'https://downloads.sourceforge.net/project/nsis/NSIS%203/3.06.1/nsis-3.06.1-setup.exe' -Name nsis-3.06.1-setup.exe -ArgumentList ('/S') +$NsisVersion = (Get-ToolsetContent).nsis.version +Install-Binary -Url "https://downloads.sourceforge.net/project/nsis/NSIS%203/${NsisVersion}/nsis-${NsisVersion}-setup.exe" -Name "nsis-${NsisVersion}-setup.exe" -ArgumentList ('/S') $NsisPath = "${env:ProgramFiles(x86)}\NSIS\" Add-MachinePathItem $NsisPath $env:Path = Get-MachinePath -Invoke-PesterTests -TestFile "Tools" -TestName "NSIS" \ No newline at end of file +Invoke-PesterTests -TestFile "Tools" -TestName "NSIS" diff --git a/images/win/toolsets/toolset-2016.json b/images/win/toolsets/toolset-2016.json index 28981b3d8f9f..83259ed9484b 100644 --- a/images/win/toolsets/toolset-2016.json +++ b/images/win/toolsets/toolset-2016.json @@ -427,6 +427,9 @@ "mongodb": { "version": "5.0" }, + "nsis": { + "version": "3.08" + }, "php": { "version": "8.1" }, diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index 51fc9bc13de6..c7d19fe1a44e 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -459,6 +459,9 @@ "mongodb": { "version": "5.0" }, + "nsis": { + "version": "3.08" + }, "php": { "version": "8.1" }, diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index 2e6151a4477e..124cb77b80fd 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -317,6 +317,9 @@ "mongodb": { "version": "5.0" }, + "nsis": { + "version": "3.08" + }, "php": { "version": "8.1" }, From 30861de4bbace7fa729da7c663d9c9e72790c6e8 Mon Sep 17 00:00:00 2001 From: V-Zabayrachny <79155496+V-Zabayrachny@users.noreply.github.com> Date: Thu, 16 Dec 2021 12:07:15 +0300 Subject: [PATCH 0833/3485] [Ubuntu] Update npm parcel package to v2 (#4743) * [Ubuntu] Update npm parcel package to v2 * [Ubuntu] Add the parcel to the software report * [Ubuntu] Move the parcel on tools to the software report --- .../linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 | 5 +++++ .../scripts/SoftwareReport/SoftwareReport.Generator.ps1 | 3 ++- images/linux/toolsets/toolset-1804.json | 2 +- images/linux/toolsets/toolset-2004.json | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 index b1fb23e98956..87673c7e8f52 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 @@ -174,6 +174,11 @@ function Get-YarnVersion { return "Yarn $yarnVersion" } +function Get-ParcelVersion { + $parcelVersion = parcel --version + return "Parcel $parcelVersion" +} + function Get-PipVersion { $result = Get-CommandResult "pip --version" $result.Output -match "pip (?<version>\d+\.\d+\.\d+)" | Out-Null diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index 9c6c32dd4ddf..405604b3392d 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -130,6 +130,7 @@ $toolsList = @( (Get-NvmVersion), (Get-OpensslVersion), (Get-PackerVersion), + (Get-ParcelVersion), (Get-PhantomJSVersion), (Get-PodManVersion), (Get-PulumiVersion), @@ -213,7 +214,7 @@ $browsersAndDriversList = @( (Get-ChromeDriverVersion), (Get-FirefoxVersion), (Get-GeckodriverVersion), - (Get-ChromiumVersion), + (Get-ChromiumVersion), (Get-SeleniumVersion) ) diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index 760dc231ffed..865c30a48e7b 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -297,7 +297,7 @@ "command": "n" }, { - "name": "parcel-bundler", + "name": "parcel", "command": "parcel" }, { diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index 66a105e85d8d..3a74f73704d2 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -298,7 +298,7 @@ "command": "n" }, { - "name": "parcel-bundler", + "name": "parcel", "command": "parcel" }, { From c042ffc4d770c801e6e7cd5199a5b10b4c7690df Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 16 Dec 2021 09:22:19 +0000 Subject: [PATCH 0834/3485] Updating readme file for ubuntu18 version 20211212.1 (#4730) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu1804-README.md | 32 +++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/images/linux/Ubuntu1804-README.md b/images/linux/Ubuntu1804-README.md index 9be89fec8a68..e655b5ace78e 100644 --- a/images/linux/Ubuntu1804-README.md +++ b/images/linux/Ubuntu1804-README.md @@ -1,6 +1,6 @@ # Ubuntu 18.04.6 LTS - Linux kernel version: 5.4.0-1064-azure -- Image Version: 20211209.3 +- Image Version: 20211212.1 ## Installed Software ### Language and Runtime @@ -32,7 +32,7 @@ - Pip3 9.0.1 - Pipx 0.16.4 - RubyGems 2.7.6 -- Vcpkg (build from master \<14543ba18>) +- Vcpkg (build from master \<48bba4f9c>) - Yarn 1.22.17 #### Environment variables @@ -45,29 +45,29 @@ - Ant 1.10.5 - Gradle 7.3.1 - Maven 3.8.4 -- Sbt 1.5.5 +- Sbt 1.5.6 ### Tools - Ansible 2.11.7 - apt-fast 1.9.11 - AzCopy 10.13.0 (available by `azcopy` and `azcopy10` aliases) - Bazel 4.2.2 -- Bazelisk 1.10.1 +- Bazelisk 1.11.0 - Bicep 0.4.1008 - Buildah 1.19.6 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - CMake 3.22.1 - CodeQL Action Bundle 2.7.3 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.1.1+azure-2 +- Docker Compose v2 2.2.2+azure-1 - Docker-Buildx 0.7.1 -- Docker-Moby Client 20.10.11+azure-2 -- Docker-Moby Server 20.10.11+azure-2 +- Docker-Moby Client 20.10.11+azure-3 +- Docker-Moby Server 20.10.11+azure-3 - Git 2.34.1 (apt source repository: ppa:git-core/ppa) - Git LFS 3.0.2 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.3.1 - Haveged 1.9.1 - Heroku 7.59.2 -- HHVM (HipHop VM) 4.138.0 +- HHVM (HipHop VM) 4.139.0 - jq 1.5 - Kind 0.11.1 - Kubectl 1.23.0 @@ -95,7 +95,7 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.100 -- AWS CLI 1.22.22 +- AWS CLI 1.22.23 - AWS CLI Session manager plugin 1.2.279.0 - AWS SAM CLI 1.36.0 - Azure CLI (azure-cli) 2.31.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) @@ -103,7 +103,7 @@ - GitHub CLI 2.3.0 - Google Cloud SDK 366.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 8.0.18 +- Netlify CLI 8.0.20 - OpenShift CLI 4.9.10 - ORAS CLI 0.12.0 - Vercel CLI 23.1.2 @@ -147,7 +147,7 @@ ### Browsers and Drivers - Google Chrome 96.0.4664.93 - ChromeDriver 96.0.4664.45 -- Mozilla Firefox 94.0 +- Mozilla Firefox 95.0 - Geckodriver 0.30.0 - Chromium 96.0.4664.0 - Selenium server 4.1.0 @@ -168,7 +168,7 @@ - sqlite3 3.22.0 #### MySQL -- MySQL 5.7.36-0ubuntu0.18.04.1 +- MySQL 5.7.36 - MySQL Server (user:root password:root) ``` @@ -181,8 +181,8 @@ ### Cached Tools #### Go - 1.15.15 -- 1.16.11 -- 1.17.4 +- 1.16.12 +- 1.17.5 #### Node.js - 12.22.7 @@ -213,8 +213,8 @@ | Name | Value | Architecture | | --------------- | ----------------------------------- | ------------ | | GOROOT_1_15_X64 | /opt/hostedtoolcache/go/1.15.15/x64 | x64 | -| GOROOT_1_16_X64 | /opt/hostedtoolcache/go/1.16.11/x64 | x64 | -| GOROOT_1_17_X64 | /opt/hostedtoolcache/go/1.17.4/x64 | x64 | +| GOROOT_1_16_X64 | /opt/hostedtoolcache/go/1.16.12/x64 | x64 | +| GOROOT_1_17_X64 | /opt/hostedtoolcache/go/1.17.5/x64 | x64 | ### PowerShell Tools - PowerShell 7.2.0 From 8d70ee3468023c7b0b4b9b361a691efa465ec299 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 16 Dec 2021 10:10:50 +0000 Subject: [PATCH 0835/3485] Updating readme file for win16 version 20211212.1 (#4725) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2016-Readme.md | 67 ++++++++++++++++---------------- 1 file changed, 33 insertions(+), 34 deletions(-) diff --git a/images/win/Windows2016-Readme.md b/images/win/Windows2016-Readme.md index 9db313cd0c64..25c533acac9f 100644 --- a/images/win/Windows2016-Readme.md +++ b/images/win/Windows2016-Readme.md @@ -1,22 +1,21 @@ | Announcements | |-| -| [Windows Server 2022 with Visual Studio 2022 is generally available starting from November, 15](https://github.com/actions/virtual-environments/issues/4488) | | [Windows-2016 environment will be removed on March 15, 2022](https://github.com/actions/virtual-environments/issues/4312) | *** # Microsoft Windows Server 2016 Datacenter - OS Version: 10.0.14393 Build 4770 -- Image Version: 20211206.1 +- Image Version: 20211212.1 ## Installed Software ### Language and Runtime - Bash 4.4.23(1)-release - Go 1.15.15 - Julia 1.7.0 -- Kotlin 1.5.32 +- Kotlin 1.6.0 - LLVM 13.0.0 - Node 16.13.1 - Perl 5.32.1 -- PHP 8.0.13 +- PHP 8.1.0 - Python 3.7.9 - Ruby 2.5.9p229 @@ -30,7 +29,7 @@ - pip 21.3.1 (python 3.7) - Pipx 0.16.4 - RubyGems 2.7.6.3 -- Vcpkg (build from master \<63e935d96>) +- Vcpkg (build from master \<48bba4f9c>) - Yarn 1.22.17 #### Environment variables @@ -43,29 +42,29 @@ - Ant 1.10.12 - Gradle 7.3 - Maven 3.8.4 -- sbt 1.5.5 +- sbt 1.5.6 ### Tools - 7zip 21.06 - aria2 1.36.0 - azcopy 10.13.0 - Bazel 4.2.2 -- Bazelisk 1.10.1 +- Bazelisk 1.11.0 - Bicep 0.4.1008 - Cabal 3.6.2.0 -- CMake 3.22.0 -- CodeQL Action Bundle 2.7.2 +- CMake 3.22.1 +- CodeQL Action Bundle 2.7.3 - Docker 20.10.7 - Docker-compose 1.29.2 - Docker-wincred 0.6.4 - ghc 9.2.1 - Git 2.34.1 - Git LFS 3.0.2 -- Google Cloud SDK 365.0.1 +- Google Cloud SDK 366.0.0 - InnoSetup 6.2.0 - jq 1.6 - Kind 0.11.1 -- Kubectl 1.22.4 +- Kubectl 1.23.0 - Mercurial 5.0 - Mingw-w64 8.1.0 - Newman 5.3.0 @@ -86,10 +85,10 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.100 -- AWS CLI 2.4.5 +- AWS CLI 2.4.6 - AWS SAM CLI 1.36.0 - AWS Session Manager CLI 1.2.279.0 -- Azure CLI 2.30.0 +- Azure CLI 2.31.0 - Azure DevOps CLI extension 0.22.0 - Cloud Foundry CLI 6.53.0 - GitHub CLI 2.3.0 @@ -110,11 +109,11 @@ - Rustfmt 1.4.37 ### Browsers and webdrivers -- Google Chrome 96.0.4664.45 +- Google Chrome 96.0.4664.93 - Chrome Driver 96.0.4664.45 -- Microsoft Edge 96.0.1054.43 -- Microsoft Edge Driver 96.0.1054.43 -- Mozilla Firefox 94.0.2 +- Microsoft Edge 96.0.1054.53 +- Microsoft Edge Driver 96.0.1054.53 +- Mozilla Firefox 95.0 - Gecko Driver 0.30.0 - IE Driver 3.150.1.1 - Selenium server 4.1.0 @@ -156,8 +155,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Version | Architecture | Environment Variable | | ------- | ------------ | -------------------- | | 1.15.15 (Default) | x64 | GOROOT_1_15_X64 | -| 1.16.11 | x64 | GOROOT_1_16_X64 | -| 1.17.4 | x64 | GOROOT_1_17_X64 | +| 1.16.12 | x64 | GOROOT_1_16_X64 | +| 1.17.5 | x64 | GOROOT_1_17_X64 | #### Node | Version | Architecture | @@ -210,7 +209,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### MongoDB | Version | ServiceName | ServiceStatus | ServiceStartType | | ------- | ----------- | ------------- | ---------------- | -| 5.0.4.0 | MongoDB | Running | Automatic | +| 5.0.5.0 | MongoDB | Running | Automatic | ### Database tools - Azure CosmosDb Emulator 2.14.4.0 @@ -542,20 +541,20 @@ All other versions are saved but not installed. | VSSetup | 2.2.16 | ### Android -| Package Name | Version | -| -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 4.0 | -| Android SDK Build-tools | 31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3<br>26.0.0 26.0.1 26.0.2 26.0.3<br>25.0.0 25.0.1 25.0.2 25.0.3<br>24.0.0 24.0.1 24.0.2 24.0.3<br>23.0.1 23.0.2 23.0.3<br>22.0.1<br>21.1.2<br>20.0.0<br>19.1.0 | -| Android SDK Platforms | android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3)<br>android-26 (rev 2)<br>android-25 (rev 3)<br>android-24 (rev 2)<br>android-23 (rev 3)<br>android-22 (rev 2)<br>android-21 (rev 2)<br>android-20 (rev 2)<br>android-19 (rev 4) | -| Android SDK Platform-Tools | 31.0.3 | -| Android SDK Tools | 25.2.5 | -| Android Support Repository | 47.0.0 | -| CMake | 3.10.2<br>3.18.1 | -| Google APIs | addon-google_apis-google-21<br>addon-google_apis-google-22<br>addon-google_apis-google-23<br>addon-google_apis-google-24 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 21.4.7075529 (default)<br>22.1.7171670<br>23.1.7779620 | -| SDK Patch Applier v4 | 1 | +| Package Name | Version | +| -------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 4.0 | +| Android SDK Build-tools | 32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3<br>26.0.0 26.0.1 26.0.2 26.0.3<br>25.0.0 25.0.1 25.0.2 25.0.3<br>24.0.0 24.0.1 24.0.2 24.0.3<br>23.0.1 23.0.2 23.0.3<br>22.0.1<br>21.1.2<br>20.0.0<br>19.1.0 | +| Android SDK Platforms | android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3)<br>android-26 (rev 2)<br>android-25 (rev 3)<br>android-24 (rev 2)<br>android-23 (rev 3)<br>android-22 (rev 2)<br>android-21 (rev 2)<br>android-20 (rev 2)<br>android-19 (rev 4) | +| Android SDK Platform-Tools | 31.0.3 | +| Android SDK Tools | 25.2.5 | +| Android Support Repository | 47.0.0 | +| CMake | 3.10.2<br>3.18.1 | +| Google APIs | addon-google_apis-google-21<br>addon-google_apis-google-22<br>addon-google_apis-google-23<br>addon-google_apis-google-24 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 21.4.7075529 (default)<br>22.1.7171670<br>23.1.7779620 | +| SDK Patch Applier v4 | 1 | #### Environment variables | Name | Value | From 192509400a704a3bde5800d83e48a84bd372f4b3 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Thu, 16 Dec 2021 13:55:29 +0300 Subject: [PATCH 0836/3485] Add TagName param with default value unixtimestamp (#4753) --- images.CI/macos/anka/Anka.Helpers.psm1 | 6 +++--- images.CI/macos/anka/CreateCleanAnkaTemplate.ps1 | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/images.CI/macos/anka/Anka.Helpers.psm1 b/images.CI/macos/anka/Anka.Helpers.psm1 index d076625fdf00..dcf1550f2095 100644 --- a/images.CI/macos/anka/Anka.Helpers.psm1 +++ b/images.CI/macos/anka/Anka.Helpers.psm1 @@ -6,7 +6,7 @@ function Push-AnkaTemplateToRegistry { [Parameter(Mandatory)] [ValidateNotNullOrEmpty()] - [string] $TagVersion, + [string] $TagName, [Parameter(Mandatory)] [ValidateNotNullOrEmpty()] @@ -17,12 +17,12 @@ function Push-AnkaTemplateToRegistry { $images = anka --machine-readable registry --registry-path $RegistryUrl list | ConvertFrom-Json | ForEach-Object body $images | Where-Object name -eq $TemplateName | ForEach-Object { $id = $_.id - Show-StringWithFormat "Deleting '$TemplateName[$id]' VM and '$TagVersion' tag" + Show-StringWithFormat "Deleting '$TemplateName[$id]' VM and '$TagName' tag" $uri = '{0}/registry/vm?id={1}' -f $RegistryUrl, $id Invoke-WebRequest -Uri $uri -Method Delete | Out-Null } - $command = "anka registry --registry-path $RegistryUrl push --force --tag $TagVersion $TemplateName" + $command = "anka registry --registry-path $RegistryUrl push --force --tag $TagName $TemplateName" Invoke-AnkaCommand -Command $command } diff --git a/images.CI/macos/anka/CreateCleanAnkaTemplate.ps1 b/images.CI/macos/anka/CreateCleanAnkaTemplate.ps1 index ff38c1b6fc3d..a140c39486d1 100644 --- a/images.CI/macos/anka/CreateCleanAnkaTemplate.ps1 +++ b/images.CI/macos/anka/CreateCleanAnkaTemplate.ps1 @@ -25,7 +25,8 @@ param( [int] $CPUCount = 6, [int] $RamSizeGb = 7, [int] $DiskSizeGb = 300, - [string] $DisplayResolution = "1920x1080" + [string] $DisplayResolution = "1920x1080", + [string] $TagName = [DateTimeOffset]::Now.ToUnixTimeSeconds() ) $ErrorActionPreference = "Stop" @@ -179,5 +180,5 @@ Write-Host "`t[*] Setting screen resolution to $DisplayResolution for $TemplateN Set-AnkaVMDisplayResolution -VMName $TemplateName -DisplayResolution $DisplayResolution # Push a VM template (and tag) to the Cloud -Write-Host "`t[*] Pushing '$TemplateName' image with '$ShortMacOSVersion' tag to the '$RegistryUrl' registry..." -Push-AnkaTemplateToRegistry -RegistryUrl $registryUrl -TagVersion $shortMacOSVersion -TemplateName $TemplateName +Write-Host "`t[*] Pushing '$TemplateName' image with '$TagName' tag to the '$RegistryUrl' registry..." +Push-AnkaTemplateToRegistry -RegistryUrl $registryUrl -TagName $TagName -TemplateName $TemplateName From a39bc873887d38e2331e11394678075616862658 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 16 Dec 2021 11:08:54 +0000 Subject: [PATCH 0837/3485] macOS 10.15 (20211212 update) (#4726) * Updating readme file for macOS-10.15 version 20211212.1 * Add new lines to gcc, gfrotran, clang Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-10.15-Readme.md | 58 +++++++++++++++--------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/images/macos/macos-10.15-Readme.md b/images/macos/macos-10.15-Readme.md index 04267f0caae1..c25903128dea 100644 --- a/images/macos/macos-10.15-Readme.md +++ b/images/macos/macos-10.15-Readme.md @@ -5,7 +5,7 @@ # macOS 10.15 info - System Version: macOS 10.15.7 (19H1519) - Kernel Version: Darwin 19.6.0 -- Image Version: 20211207.1 +- Image Version: 20211212.1 ## Installed Software ### Language and Runtime @@ -46,7 +46,7 @@ - Pip 21.3.1 (python 3.9) - Pipx 0.16.4 - RubyGems 3.2.33 -- Vcpkg 2021 (build from master \<7bb175eaf>) +- Vcpkg 2021 (build from master \<48bba4f9c>) - Yarn 1.22.15 #### Environment variables @@ -59,14 +59,14 @@ - Apache Ant(TM) 1.10.12 - Apache Maven 3.8.4 - Gradle 7.3.1 -- Sbt 1.5.5 +- Sbt 1.5.6 ### Utilities - 7-Zip 17.04 - aria2 1.36.0 - azcopy 10.13.0 - bazel 4.2.2 -- bazelisk 1.10.1 +- bazelisk 1.11.0 - bsdtar 3.3.2 - available by 'tar' alias - Curl 7.80.0 - Git LFS: 3.0.2 @@ -76,7 +76,7 @@ - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.2 - gpg (GnuPG) 2.3.3 -- helm v3.7.1+g1d11fcb +- helm v3.7.2+g663a896 - Hub CLI: 2.14.2 - jq 1.6 - mongo v5.0.4 @@ -96,19 +96,19 @@ ### Tools - Aliyun CLI 3.0.100 - App Center CLI 2.10.6 -- AWS CLI 2.4.5 +- AWS CLI 2.4.6 - AWS SAM CLI 1.36.0 - AWS Session Manager CLI 1.2.279.0 - Azure CLI 2.31.0 - Bicep CLI 0.4.1008 - Cabal 3.6.2.0 -- Cmake 3.22.0 -- Fastlane 2.198.1 +- Cmake 3.22.1 +- Fastlane 2.199.0 - GHC 9.2.1 - GHCup 0.1.17.4 - Jazzy 0.14.1 - Stack 2.7.3 -- SwiftFormat 0.49.0 +- SwiftFormat 0.49.1 - Swig 4.0.2 - Xcode Command Line Tools 12.4.0.0.1.1610135815 @@ -121,9 +121,9 @@ - SafariDriver 15.1 (15612.2.9.1.30) - Google Chrome 96.0.4664.93 - ChromeDriver 96.0.4664.45 -- Microsoft Edge 96.0.1054.43 -- MSEdgeDriver 96.0.1054.43 -- Mozilla Firefox 94.0.2 +- Microsoft Edge 96.0.1054.53 +- MSEdgeDriver 96.0.1054.53 +- Mozilla Firefox 95.0 - geckodriver 0.30.0 - Selenium server 4.1.0 @@ -176,8 +176,8 @@ | Version | Architecture | Environment Variable | | ------- | ------------ | -------------------- | | 1.15.15 (Default) | x64 | GOROOT_1_15_X64 | -| 1.16.11 | x64 | GOROOT_1_16_X64 | -| 1.17.4 | x64 | GOROOT_1_17_X64 | +| 1.16.12 | x64 | GOROOT_1_16_X64 | +| 1.17.5 | x64 | GOROOT_1_17_X64 | ### Rust Tools - Cargo 1.57.0 @@ -348,21 +348,21 @@ | watchOS 7.2 | 12.3<br>12.4 | Apple Watch Series 4 - 40mm<br>Apple Watch Series 4 - 44mm<br>Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm | ### Android -| Package Name | Version | -| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 4.0 | -| Android Emulator | 31.1.4 | -| Android SDK Build-tools | 31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3<br>26.0.0 26.0.1 26.0.2 26.0.3<br>25.0.0 25.0.1 25.0.2 25.0.3<br>24.0.0 24.0.1 24.0.2 24.0.3 | -| Android SDK Platforms | android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3)<br>android-26 (rev 2)<br>android-25 (rev 3)<br>android-24 (rev 2) | -| Android SDK Platform-Tools | 31.0.3 | -| Android Support Repository | 47.0.0 | -| CMake | 3.10.2<br>3.18.1 | -| Google APIs | addon-google_apis-google-21<br>addon-google_apis-google-22<br>addon-google_apis-google-23<br>addon-google_apis-google-24 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 15.2.4203891<br>18.1.5063045<br>21.4.7075529 (default)<br>22.1.7171670<br>23.1.7779620 | -| SDK Patch Applier v4 | 1 | -| Intel HAXM | 7.6.5 | +| Package Name | Version | +| -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 4.0 | +| Android Emulator | 31.1.4 | +| Android SDK Build-tools | 32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3<br>26.0.0 26.0.1 26.0.2 26.0.3<br>25.0.0 25.0.1 25.0.2 25.0.3<br>24.0.0 24.0.1 24.0.2 24.0.3 | +| Android SDK Platforms | android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3)<br>android-26 (rev 2)<br>android-25 (rev 3)<br>android-24 (rev 2) | +| Android SDK Platform-Tools | 31.0.3 | +| Android Support Repository | 47.0.0 | +| CMake | 3.10.2<br>3.18.1 | +| Google APIs | addon-google_apis-google-21<br>addon-google_apis-google-22<br>addon-google_apis-google-23<br>addon-google_apis-google-24 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 15.2.4203891<br>18.1.5063045<br>21.4.7075529 (default)<br>22.1.7171670<br>23.1.7779620 | +| SDK Patch Applier v4 | 1 | +| Intel HAXM | 7.6.5 | #### Environment variables | Name | Value | From 73d58cc85146b9290c3783f50671c0002b3b6225 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Thu, 16 Dec 2021 14:56:33 +0300 Subject: [PATCH 0838/3485] [Ubuntu] enable -e bash mode in mysql helper (#4752) --- images/linux/scripts/helpers/mysql-service-helper.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/linux/scripts/helpers/mysql-service-helper.sh b/images/linux/scripts/helpers/mysql-service-helper.sh index f09e0db5eb66..9c184a4c41cd 100644 --- a/images/linux/scripts/helpers/mysql-service-helper.sh +++ b/images/linux/scripts/helpers/mysql-service-helper.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/bash -e # # Temporary fix for the https://github.com/actions/virtual-environments/issues/4732 issue # Taken from the official ubuntu:20.04 docker container From ae91041b9051518809212512330f65a2354d644e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 16 Dec 2021 12:57:50 +0000 Subject: [PATCH 0839/3485] Updating readme file for win19 version 20211212.1 (#4724) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2019-Readme.md | 61 ++++++++++++++++---------------- 1 file changed, 30 insertions(+), 31 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index cac4f03c89da..ecd62f9009d3 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -1,11 +1,10 @@ | Announcements | |-| -| [Windows Server 2022 with Visual Studio 2022 is generally available starting from November, 15](https://github.com/actions/virtual-environments/issues/4488) | | [Windows-2016 environment will be removed on March 15, 2022](https://github.com/actions/virtual-environments/issues/4312) | *** # Microsoft Windows Server 2019 Datacenter - OS Version: 10.0.17763 Build 2300 -- Image Version: 20211207.2 +- Image Version: 20211212.1 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -15,11 +14,11 @@ - Bash 4.4.23(1)-release - Go 1.15.15 - Julia 1.7.0 -- Kotlin 1.5.32 +- Kotlin 1.6.0 - LLVM 13.0.0 - Node 16.13.1 - Perl 5.32.1 -- PHP 8.0.13 +- PHP 8.1.0 - Python 3.7.9 - Ruby 2.5.9p229 @@ -33,7 +32,7 @@ - pip 21.3.1 (python 3.7) - Pipx 0.16.4 - RubyGems 2.7.6.3 -- Vcpkg (build from master \<431d3810a>) +- Vcpkg (build from master \<48bba4f9c>) - Yarn 1.22.17 #### Environment variables @@ -46,29 +45,29 @@ - Ant 1.10.12 - Gradle 7.3 - Maven 3.8.4 -- sbt 1.5.5 +- sbt 1.5.6 ### Tools - 7zip 21.06 - aria2 1.36.0 - azcopy 10.13.0 - Bazel 4.2.2 -- Bazelisk 1.10.1 +- Bazelisk 1.11.0 - Bicep 0.4.1008 - Cabal 3.6.2.0 -- CMake 3.22.0 -- CodeQL Action Bundle 2.7.2 +- CMake 3.22.1 +- CodeQL Action Bundle 2.7.3 - Docker 20.10.7 - Docker-compose 1.29.2 - Docker-wincred 0.6.4 - ghc 9.2.1 - Git 2.34.1 - Git LFS 3.0.2 -- Google Cloud SDK 365.0.1 +- Google Cloud SDK 366.0.0 - InnoSetup 6.2.0 - jq 1.6 - Kind 0.11.1 -- Kubectl 1.22.4 +- Kubectl 1.23.0 - Mercurial 5.0 - Mingw-w64 8.1.0 - Newman 5.3.0 @@ -89,7 +88,7 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.100 -- AWS CLI 2.4.5 +- AWS CLI 2.4.6 - AWS SAM CLI 1.36.0 - AWS Session Manager CLI 1.2.279.0 - Azure CLI 2.31.0 @@ -115,9 +114,9 @@ ### Browsers and webdrivers - Google Chrome 96.0.4664.93 - Chrome Driver 96.0.4664.45 -- Microsoft Edge 96.0.1054.43 -- Microsoft Edge Driver 96.0.1054.43 -- Mozilla Firefox 94.0.2 +- Microsoft Edge 96.0.1054.53 +- Microsoft Edge Driver 96.0.1054.53 +- Mozilla Firefox 95.0 - Gecko Driver 0.30.0 - IE Driver 3.150.1.1 - Selenium server 4.1.0 @@ -163,8 +162,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Version | Architecture | Environment Variable | | ------- | ------------ | -------------------- | | 1.15.15 (Default) | x64 | GOROOT_1_15_X64 | -| 1.16.11 | x64 | GOROOT_1_16_X64 | -| 1.17.4 | x64 | GOROOT_1_17_X64 | +| 1.16.12 | x64 | GOROOT_1_16_X64 | +| 1.17.5 | x64 | GOROOT_1_17_X64 | #### Node | Version | Architecture | @@ -538,20 +537,20 @@ All other versions are saved but not installed. | VSSetup | 2.2.16 | ### Android -| Package Name | Version | -| -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 4.0 | -| Android SDK Build-tools | 31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3<br>26.0.0 26.0.1 26.0.2 26.0.3<br>25.0.0 25.0.1 25.0.2 25.0.3<br>24.0.0 24.0.1 24.0.2 24.0.3<br>23.0.1 23.0.2 23.0.3<br>22.0.1<br>21.1.2<br>20.0.0<br>19.1.0 | -| Android SDK Platforms | android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3)<br>android-26 (rev 2)<br>android-25 (rev 3)<br>android-24 (rev 2)<br>android-23 (rev 3)<br>android-22 (rev 2)<br>android-21 (rev 2)<br>android-20 (rev 2)<br>android-19 (rev 4) | -| Android SDK Platform-Tools | 31.0.3 | -| Android SDK Tools | 26.1.1 | -| Android Support Repository | 47.0.0 | -| CMake | 3.10.2<br>3.18.1 | -| Google APIs | addon-google_apis-google-21<br>addon-google_apis-google-22<br>addon-google_apis-google-23<br>addon-google_apis-google-24 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 21.4.7075529 (default)<br>22.1.7171670<br>23.1.7779620 | -| SDK Patch Applier v4 | 1 | +| Package Name | Version | +| -------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 4.0 | +| Android SDK Build-tools | 32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3<br>26.0.0 26.0.1 26.0.2 26.0.3<br>25.0.0 25.0.1 25.0.2 25.0.3<br>24.0.0 24.0.1 24.0.2 24.0.3<br>23.0.1 23.0.2 23.0.3<br>22.0.1<br>21.1.2<br>20.0.0<br>19.1.0 | +| Android SDK Platforms | android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3)<br>android-26 (rev 2)<br>android-25 (rev 3)<br>android-24 (rev 2)<br>android-23 (rev 3)<br>android-22 (rev 2)<br>android-21 (rev 2)<br>android-20 (rev 2)<br>android-19 (rev 4) | +| Android SDK Platform-Tools | 31.0.3 | +| Android SDK Tools | 26.1.1 | +| Android Support Repository | 47.0.0 | +| CMake | 3.10.2<br>3.18.1 | +| Google APIs | addon-google_apis-google-21<br>addon-google_apis-google-22<br>addon-google_apis-google-23<br>addon-google_apis-google-24 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 21.4.7075529 (default)<br>22.1.7171670<br>23.1.7779620 | +| SDK Patch Applier v4 | 1 | #### Environment variables | Name | Value | From 6b7e9bec505313a429693af57116fa2c37bbc4db Mon Sep 17 00:00:00 2001 From: Matt Cooley <matt@mattcooley.net> Date: Thu, 16 Dec 2021 05:09:14 -0800 Subject: [PATCH 0840/3485] [Windows] Add UWP VC++ ARM64 component (#4750) --- images/win/toolsets/toolset-2022.json | 1 + 1 file changed, 1 insertion(+) diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index 124cb77b80fd..3051719437cc 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -187,6 +187,7 @@ "Microsoft.VisualStudio.Component.TeamOffice", "Microsoft.VisualStudio.Component.TestTools.CodedUITest", "Microsoft.VisualStudio.Component.TestTools.WebLoadTest", + "Microsoft.VisualStudio.Component.UWP.VC.ARM64", "Microsoft.VisualStudio.Component.VC.CLI.Support", "Microsoft.VisualStudio.Component.VC.CMake.Project", "Microsoft.VisualStudio.Component.VC.DiagnosticTools", From 68b46cf15fab1932fee632d8d28278590b2ec3ed Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 16 Dec 2021 13:19:57 +0000 Subject: [PATCH 0841/3485] Updating readme file for win22 version 20211212.1 (#4722) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2022-Readme.md | 66 ++++++++++++++++---------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/images/win/Windows2022-Readme.md b/images/win/Windows2022-Readme.md index ba043dfb2295..a01ce696b8e5 100644 --- a/images/win/Windows2022-Readme.md +++ b/images/win/Windows2022-Readme.md @@ -1,11 +1,10 @@ | Announcements | |-| -| [Windows Server 2022 with Visual Studio 2022 is generally available starting from November, 15](https://github.com/actions/virtual-environments/issues/4488) | | [Windows-2016 environment will be removed on March 15, 2022](https://github.com/actions/virtual-environments/issues/4312) | *** # Microsoft Windows Server 2022 Datacenter - OS Version: 10.0.20348 Build 350 -- Image Version: 20211206.1 +- Image Version: 20211212.1 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -13,12 +12,12 @@ ## Installed Software ### Language and Runtime - Bash 4.4.23(1)-release -- Go 1.16.11 +- Go 1.16.12 - Julia 1.7.0 -- Kotlin 1.5.32 +- Kotlin 1.6.0 - LLVM 13.0.0 - Node 16.13.1 -- PHP 8.0.13 +- PHP 8.1.0 - Python 3.9.9 - Ruby 3.0.3p157 @@ -32,7 +31,7 @@ - pip 21.3.1 (python 3.9) - Pipx 0.16.4 - RubyGems 3.2.32 -- Vcpkg (build from master \<63e935d96>) +- Vcpkg (build from master \<48bba4f9c>) - Yarn 1.22.17 #### Environment variables @@ -44,18 +43,18 @@ - Ant 1.10.12 - Gradle 7.3 - Maven 3.8.4 -- sbt 1.5.5 +- sbt 1.5.6 ### Tools - 7zip 21.06 - aria2 1.36.0 - azcopy 10.13.0 - Bazel 4.2.2 -- Bazelisk 1.10.1 +- Bazelisk 1.11.0 - Bicep 0.4.1008 - Cabal 3.6.2.0 -- CMake 3.22.0 -- CodeQL Action Bundle 2.7.2 +- CMake 3.22.1 +- CodeQL Action Bundle 2.7.3 - Docker 20.10.7 - Docker-compose 1.29.2 - Docker-wincred 0.6.4 @@ -64,7 +63,7 @@ - Git LFS 3.0.2 - jq 1.6 - Kind 0.11.1 -- Kubectl 1.22.4 +- Kubectl 1.23.0 - Mercurial 5.0 - Mingw-w64 8.1.0 - Newman 5.3.0 @@ -84,10 +83,10 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.100 -- AWS CLI 2.4.5 +- AWS CLI 2.4.6 - AWS SAM CLI 1.36.0 - AWS Session Manager CLI 1.2.279.0 -- Azure CLI 2.30.0 +- Azure CLI 2.31.0 - Azure DevOps CLI extension 0.22.0 - GitHub CLI 2.3.0 - Hub CLI 2.14.2 @@ -107,11 +106,11 @@ - Rustfmt 1.4.37 ### Browsers and webdrivers -- Google Chrome 96.0.4664.45 +- Google Chrome 96.0.4664.93 - Chrome Driver 96.0.4664.45 -- Microsoft Edge 96.0.1054.43 -- Microsoft Edge Driver 96.0.1054.43 -- Mozilla Firefox 94.0.2 +- Microsoft Edge 96.0.1054.53 +- Microsoft Edge Driver 96.0.1054.53 +- Mozilla Firefox 95.0 - Gecko Driver 0.30.0 - IE Driver 3.150.1.1 - Selenium server 4.1.0 @@ -153,8 +152,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Version | Architecture | Environment Variable | | ------- | ------------ | -------------------- | | 1.15.15 | x64 | GOROOT_1_15_X64 | -| 1.16.11 (Default) | x64 | GOROOT_1_16_X64 | -| 1.17.4 | x64 | GOROOT_1_17_X64 | +| 1.16.12 (Default) | x64 | GOROOT_1_16_X64 | +| 1.17.5 | x64 | GOROOT_1_17_X64 | #### Node | Version | Architecture | @@ -200,7 +199,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### MongoDB | Version | ServiceName | ServiceStatus | ServiceStartType | | ------- | ----------- | ------------- | ---------------- | -| 5.0.4.0 | MongoDB | Running | Automatic | +| 5.0.5.0 | MongoDB | Running | Automatic | ### Database tools - Azure CosmosDb Emulator 2.14.4.0 @@ -340,6 +339,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Component.VC.CMake.Project | 17.0.31804.368 | | Microsoft.VisualStudio.Component.VC.CoreIde | 17.0.31804.368 | | Microsoft.VisualStudio.Component.VC.DiagnosticTools | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.VC.Llvm.Clang | 17.0.31804.368 | | Microsoft.VisualStudio.Component.VC.Llvm.ClangToolset | 17.0.31804.368 | | Microsoft.VisualStudio.Component.VC.MFC.ARM | 17.0.31804.368 | | Microsoft.VisualStudio.Component.VC.MFC.ARM64 | 17.0.31804.368 | @@ -464,19 +464,19 @@ All other versions are saved but not installed. | VSSetup | 2.2.16 | ### Android -| Package Name | Version | -| -------------------------- | ---------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 4.0 | -| Android Emulator | 31.1.4 | -| Android SDK Build-tools | 31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | -| Android SDK Platforms | android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | -| Android SDK Platform-Tools | 31.0.3 | -| Android Support Repository | 47.0.0 | -| CMake | 3.18.1 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 21.4.7075529 (default)<br>22.1.7171670<br>23.1.7779620 | -| SDK Patch Applier v4 | 1 | +| Package Name | Version | +| -------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 4.0 | +| Android Emulator | 31.1.4 | +| Android SDK Build-tools | 32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | +| Android SDK Platforms | android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | +| Android SDK Platform-Tools | 31.0.3 | +| Android Support Repository | 47.0.0 | +| CMake | 3.18.1 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 21.4.7075529 (default)<br>22.1.7171670<br>23.1.7779620 | +| SDK Patch Applier v4 | 1 | #### Environment variables | Name | Value | From 2d4cd7ab638cb71d5450589d28db9488a2e6f826 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 16 Dec 2021 14:35:21 +0000 Subject: [PATCH 0842/3485] Updating readme file for ubuntu20 version 20211214.2 (#4737) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2004-README.md | 44 +++++++++++++++---------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/images/linux/Ubuntu2004-README.md b/images/linux/Ubuntu2004-README.md index 42eec1949f23..75909f7a6189 100644 --- a/images/linux/Ubuntu2004-README.md +++ b/images/linux/Ubuntu2004-README.md @@ -1,6 +1,6 @@ # Ubuntu 20.04.3 LTS - Linux kernel version: 5.11.0-1022-azure -- Image Version: 20211209.3 +- Image Version: 20211214.2 ## Installed Software ### Language and Runtime @@ -20,19 +20,19 @@ - Python 3.8.10 - Python3 3.8.10 - Ruby 2.7.0p0 -- Swift 5.5.1 +- Swift 5.5.2 ### Package Management - cpan 1.64 - Helm 3.7.2 -- Homebrew 3.3.7 +- Homebrew 3.3.8 - Miniconda 4.10.3 - Npm 8.1.2 - Pip 20.0.2 - Pip3 20.0.2 - Pipx 0.16.4 - RubyGems 3.1.2 -- Vcpkg (build from master \<14543ba18>) +- Vcpkg (build from master \<a9ff505c5>) - Yarn 1.22.17 #### Environment variables @@ -46,30 +46,30 @@ - Gradle 7.3.1 - Lerna 4.0.0 - Maven 3.8.4 -- Sbt 1.5.5 +- Sbt 1.5.6 ### Tools - Ansible 2.12.1 - apt-fast 1.9.11 - AzCopy 10.13.0 (available by `azcopy` and `azcopy10` aliases) - Bazel 4.2.2 -- Bazelisk 1.10.1 +- Bazelisk 1.11.0 - Bicep 0.4.1008 - Buildah 1.21.3 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - CMake 3.22.1 - CodeQL Action Bundle 2.7.3 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.1.1+azure-2 +- Docker Compose v2 2.2.2+azure-1 - Docker-Buildx 0.7.1 -- Docker-Moby Client 20.10.11+azure-2 -- Docker-Moby Server 20.10.11+azure-2 -- Fastlane 2.198.1 +- Docker-Moby Client 20.10.11+azure-3 +- Docker-Moby Server 20.10.11+azure-3 +- Fastlane 2.199.0 - Git 2.34.1 (apt source repository: ppa:git-core/ppa) - Git LFS 3.0.2 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.6.0 - Haveged 1.9.1 - Heroku 7.59.2 -- HHVM (HipHop VM) 4.138.0 +- HHVM (HipHop VM) 4.139.0 - jq 1.6 - Kind 0.11.1 - Kubectl 1.23.0 @@ -96,8 +96,8 @@ - zstd 1.5.0 (homebrew) ### CLI Tools -- Alibaba Cloud CLI 3.0.100 -- AWS CLI 2.4.5 +- Alibaba Cloud CLI 3.0.101 +- AWS CLI 2.4.6 - AWS CLI Session manager plugin 1.2.279.0 - AWS SAM CLI 1.36.0 - Azure CLI (azure-cli) 2.31.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) @@ -105,8 +105,8 @@ - GitHub CLI 2.3.0 - Google Cloud SDK 366.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 8.0.18 -- OpenShift CLI 4.9.10 +- Netlify CLI 8.1.1 +- OpenShift CLI 4.9.11 - ORAS CLI 0.12.0 - Vercel CLI 23.1.2 @@ -151,9 +151,9 @@ - Rustfmt 1.4.37 ### Browsers and Drivers -- Google Chrome 96.0.4664.93 +- Google Chrome 96.0.4664.110 - ChromeDriver 96.0.4664.45 -- Mozilla Firefox 94.0 +- Mozilla Firefox 95.0 - Geckodriver 0.30.0 - Chromium 96.0.4664.0 - Selenium server 4.1.0 @@ -187,8 +187,8 @@ ### Cached Tools #### Go - 1.15.15 -- 1.16.11 -- 1.17.4 +- 1.16.12 +- 1.17.5 #### Node.js - 12.22.7 @@ -208,7 +208,7 @@ - 3.7.12 - 3.8.12 - 3.9.9 -- 3.10.0 +- 3.10.1 #### Ruby - 2.5.9 @@ -220,8 +220,8 @@ | Name | Value | Architecture | | --------------- | ----------------------------------- | ------------ | | GOROOT_1_15_X64 | /opt/hostedtoolcache/go/1.15.15/x64 | x64 | -| GOROOT_1_16_X64 | /opt/hostedtoolcache/go/1.16.11/x64 | x64 | -| GOROOT_1_17_X64 | /opt/hostedtoolcache/go/1.17.4/x64 | x64 | +| GOROOT_1_16_X64 | /opt/hostedtoolcache/go/1.16.12/x64 | x64 | +| GOROOT_1_17_X64 | /opt/hostedtoolcache/go/1.17.5/x64 | x64 | ### PowerShell Tools - PowerShell 7.2.0 From d9b2265e5876c1f0f9060ef7aa6b3b0ec0cfe8ca Mon Sep 17 00:00:00 2001 From: V-Zabayrachny <79155496+V-Zabayrachny@users.noreply.github.com> Date: Thu, 16 Dec 2021 18:37:45 +0300 Subject: [PATCH 0843/3485] [Windows] Update npm parcel package to v2 (#4742) * [Windows] Update npm parcel package to v2 * [Windows] Add the parcel to the software report * [Windows] Add the parcel in tests * [Windows] Move the function Get-ParcelVersion --- .../win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 | 1 + images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 | 5 +++++ images/win/toolsets/toolset-2016.json | 2 +- images/win/toolsets/toolset-2019.json | 2 +- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index 4f7fd01e3a56..7101fea62756 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -121,6 +121,7 @@ $toolsList = @( if ((Test-IsWin16) -or (Test-IsWin19)) { $toolsList += @( (Get-GoogleCloudSDKVersion), + (Get-ParcelVersion), (Get-ServiceFabricSDKVersion) ) } diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 index 515acb322abb..f69aee1d17a4 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 @@ -135,6 +135,11 @@ function Get-PackerVersion { return "Packer $packerVersion" } +function Get-ParcelVersion { + $parcelVersion = parcel --version + return "Parcel $parcelVersion" +} + function Get-PulumiVersion { return "Pulumi $(pulumi version)" } diff --git a/images/win/toolsets/toolset-2016.json b/images/win/toolsets/toolset-2016.json index 83259ed9484b..dcd8e39ae7ba 100644 --- a/images/win/toolsets/toolset-2016.json +++ b/images/win/toolsets/toolset-2016.json @@ -374,7 +374,7 @@ { "name": "cordova" }, { "name": "grunt-cli", "test": "grunt --version" }, { "name": "gulp-cli", "test": "gulp --version" }, - { "name": "parcel-bundler" }, + { "name": "parcel", "test": "parcel --version" }, { "name": "webpack" }, { "name": "webpack-cli" }, { "name": "node-sass" } diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index c7d19fe1a44e..6051c0b5bcda 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -406,7 +406,7 @@ { "name": "cordova" }, { "name": "grunt-cli", "test": "grunt --version" }, { "name": "gulp-cli", "test": "gulp --version" }, - { "name": "parcel-bundler" }, + { "name": "parcel", "test": "parcel --version"}, { "name": "webpack" }, { "name": "webpack-cli" }, { "name": "node-sass" } From 5d6f295a0574e1c2702522fd682f50560fc2fcad Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Thu, 16 Dec 2021 21:30:00 +0300 Subject: [PATCH 0844/3485] Remove the title and move the block about Azure (#4759) --- docs/create-image-and-azure-resources.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docs/create-image-and-azure-resources.md b/docs/create-image-and-azure-resources.md index 1f2676b86bc3..912def66630a 100644 --- a/docs/create-image-and-azure-resources.md +++ b/docs/create-image-and-azure-resources.md @@ -15,8 +15,7 @@ After successful image generation, a snapshot of the temporary VM will be conver - `Azure Az Powershell module` - https://docs.microsoft.com/en-us/powershell/azure/install-az-ps - `Git for Windows` - https://gitforwindows.org/ -### Azure DevOps self-hosted pool requirements -To connect to a temporary VM packer use WinRM or SSH connections on public IP interfaces. +> To connect to a temporary VM packer uses WinRM or SSH connections on public IP interfaces. If you use a build agent located in an Azure subscription, please make sure that HTTPS/SSH ports are allowed for incoming/outgoing connections. In case of firewall restrictions, prohibiting connections from public addresses, private virtual network resources can be deployed and passed as arguments to the packer. This approach allows virtual machines to use private connections inside VLAN. From 34a2d681186a29e8cfdaf17c6443f4910ed468c4 Mon Sep 17 00:00:00 2001 From: Nikolay Frolov <90333448+nikolai-frolov@users.noreply.github.com> Date: Fri, 17 Dec 2021 00:05:42 +0300 Subject: [PATCH 0845/3485] [MacOS] Software updates Week 51 (#4756) --- images/macos/toolsets/toolset-10.15.json | 2 +- images/macos/toolsets/toolset-11.json | 2 +- images/macos/toolsets/toolset-12.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index 74a7eac60289..6176945b33b2 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -20,7 +20,7 @@ "xamarin": { "vsmac": "latest", "mono-versions": [ - "6.12.0.140", "6.10.0.106", "6.8.0.123", "6.6.0.166", "6.4.0.208" + "6.12.0.162", "6.10.0.106", "6.8.0.123", "6.6.0.166", "6.4.0.208" ], "ios-versions": [ "14.14.2.5", "14.10.0.4", "14.8.0.3", "14.6.0.15", "14.4.1.3", "14.2.0.12", "14.0.0.0", "13.20.2.2", "13.18.2.1", "13.16.0.13", "13.14.1.39", "13.10.0.21", "13.8.3.0", "13.6.0.12", "13.4.0.2", "13.2.0.47" diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index c87ab23ab13f..742cc8e30ac1 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -13,7 +13,7 @@ "xamarin": { "vsmac": "latest", "mono-versions": [ - "6.12.0.140" + "6.12.0.162" ], "ios-versions": [ "15.2.0.17", "15.0.0.6", "14.20.0.24", "14.16.0.5", "14.14.2.5", "14.10.0.4", "14.8.0.3", "14.6.0.15", "14.4.1.3", "14.2.0.12", "14.0.0.0", "13.20.2.2" diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index 117a023e7a30..0ba53b03e9e4 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -9,7 +9,7 @@ "xamarin": { "vsmac": "latest", "mono-versions": [ - "6.12.0.140" + "6.12.0.162" ], "ios-versions": [ "15.2.0.17", "15.0.0.6" From 36f279b62335d159e1dc7b92b36aa10c411534c4 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Fri, 17 Dec 2021 11:40:04 +0300 Subject: [PATCH 0846/3485] Cleanup /root/.cache directory (#4761) --- images/linux/scripts/installers/cleanup.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/images/linux/scripts/installers/cleanup.sh b/images/linux/scripts/installers/cleanup.sh index 93be919bd763..8120144f9e7c 100644 --- a/images/linux/scripts/installers/cleanup.sh +++ b/images/linux/scripts/installers/cleanup.sh @@ -7,6 +7,7 @@ before=$(df / -Pm | awk 'NR==2{print $4}') # It removes everything but the lock file from /var/cache/apt/archives/ and /var/cache/apt/archives/partial apt-get clean rm -rf /tmp/* +rm -rf /root/.cache # journalctl if command -v journalctl; then From ef47ec38e73712ee8398f2c22dd0795ea8ef579e Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Fri, 17 Dec 2021 23:47:47 +0300 Subject: [PATCH 0847/3485] [macOS] install zlib (#4763) --- images/macos/software-report/SoftwareReport.Common.psm1 | 5 +++++ images/macos/software-report/SoftwareReport.Generator.ps1 | 3 +++ images/macos/toolsets/toolset-10.15.json | 3 ++- images/macos/toolsets/toolset-11.json | 3 ++- images/macos/toolsets/toolset-12.json | 3 ++- 5 files changed, 14 insertions(+), 3 deletions(-) diff --git a/images/macos/software-report/SoftwareReport.Common.psm1 b/images/macos/software-report/SoftwareReport.Common.psm1 index 8ed019f9a148..38a2cfc9e73c 100644 --- a/images/macos/software-report/SoftwareReport.Common.psm1 +++ b/images/macos/software-report/SoftwareReport.Common.psm1 @@ -517,6 +517,11 @@ function Get-JazzyVersion { return "Jazzy $jazzyVersion" } +function Get-ZlibVersion { + $zlibVersion = (brew info zlib)[0] | Take-Part -Part 2 + return "Zlib $zlibVersion" +} + function Build-PackageManagementEnvironmentTable { return @( @{ diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1 index 368d797644ba..a7016f904b5a 100644 --- a/images/macos/software-report/SoftwareReport.Generator.ps1 +++ b/images/macos/software-report/SoftwareReport.Generator.ps1 @@ -291,6 +291,9 @@ $markdown += New-MDHeader "Environment variables" -Level 4 $markdown += Build-AndroidEnvironmentTable | New-MDTable $markdown += New-MDNewLine +$markdown += New-MDHeader "Miscellaneous" -Level 3 +$markdown += New-MDList -Lines @(Get-ZlibVersion) -Style Unordered + # # Generate systeminfo.txt with information about image (for debug purpose) # diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index 6176945b33b2..1db75e409b8e 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -224,7 +224,8 @@ "swiftformat", "swig", "xctool", - "zstd" + "zstd", + "zlib" ], "cask_packages": [ "julia", diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index 742cc8e30ac1..adeb4f5770dd 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -183,7 +183,8 @@ "subversion", "swiftformat", "swig", - "zstd" + "zstd", + "zlib" ], "cask_packages": [ "julia" diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index 0ba53b03e9e4..afaf701c4e2f 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -98,7 +98,8 @@ "subversion", "swig", "zstd", - "gmp" + "gmp", + "zlib" ], "cask_packages": [ "julia" From b102665470f24361781e2811272db8d30afbcccf Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Sat, 18 Dec 2021 20:28:32 +0300 Subject: [PATCH 0848/3485] [macOS] Add xcode 13.2.1 (#4765) --- images/macos/toolsets/toolset-11.json | 1 + images/macos/toolsets/toolset-12.json | 1 + 2 files changed, 2 insertions(+) diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index adeb4f5770dd..e24814eb59cb 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -2,6 +2,7 @@ "xcode": { "default": "13.1", "versions": [ + { "link": "13.2.1", "version": "13.2.1" }, { "link": "13.2", "version": "13.2.0" }, { "link": "13.1", "version": "13.1.0" }, { "link": "13.0", "version": "13.0.0" }, diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index afaf701c4e2f..a4ca2b473451 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -2,6 +2,7 @@ "xcode": { "default": "13.1", "versions": [ + { "link": "13.2.1", "version": "13.2.1" }, { "link": "13.2", "version": "13.2.0" }, { "link": "13.1", "version": "13.1.0" } ] From 459c5d1a210221e4127b31ad46b8c86b757c57a1 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Sat, 18 Dec 2021 20:28:48 +0300 Subject: [PATCH 0849/3485] [Ubuntu] list mysql-core dependencies explicitly (#4767) --- images/linux/scripts/installers/mysql.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/images/linux/scripts/installers/mysql.sh b/images/linux/scripts/installers/mysql.sh index c5029c1f6bb7..ebe57cd6d64c 100644 --- a/images/linux/scripts/installers/mysql.sh +++ b/images/linux/scripts/installers/mysql.sh @@ -33,8 +33,10 @@ if isUbuntu20 ; then mysql_debs=( mysql-common* mysql-community-client-plugins* + mysql-community-client-core* mysql-community-client* mysql-client* + mysql-community-server-core* mysql-community-server* mysql-server* libmysqlclient21* From d2c5a46fcf197cad949b4cad5dd9e65100a7a133 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Sun, 19 Dec 2021 17:19:29 +0300 Subject: [PATCH 0850/3485] [Ubuntu] put snapd auto refresh on hold (#4768) --- images/linux/scripts/base/snap.sh | 8 ++++++++ images/linux/ubuntu1804.json | 5 +++++ images/linux/ubuntu2004.json | 5 +++++ 3 files changed, 18 insertions(+) create mode 100644 images/linux/scripts/base/snap.sh diff --git a/images/linux/scripts/base/snap.sh b/images/linux/scripts/base/snap.sh new file mode 100644 index 000000000000..98163745b6e9 --- /dev/null +++ b/images/linux/scripts/base/snap.sh @@ -0,0 +1,8 @@ +#!/bin/bash -e + +# Put snapd auto refresh on hold +# as it may generate too much traffic on Canonical's snap server +# when they are rolling a new major update out. +# Hold is calculated as today's date + 60 days + +snap set system refresh.hold="$(date --date='today+60 days' +%Y-%m-%dT%H:%M:%S%:z)" diff --git a/images/linux/ubuntu1804.json b/images/linux/ubuntu1804.json index bff0b4597fe4..38a0c266fde6 100644 --- a/images/linux/ubuntu1804.json +++ b/images/linux/ubuntu1804.json @@ -316,6 +316,11 @@ "script": "{{template_dir}}/scripts/base/apt-mock-remove.sh", "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" }, + { + "type": "shell", + "script": "{{template_dir}}/scripts/base/snap.sh", + "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" + }, { "type": "shell", "inline": [ diff --git a/images/linux/ubuntu2004.json b/images/linux/ubuntu2004.json index 4d7af50f0a7c..eb9e9e61365a 100644 --- a/images/linux/ubuntu2004.json +++ b/images/linux/ubuntu2004.json @@ -317,6 +317,11 @@ "script": "{{template_dir}}/scripts/base/apt-mock-remove.sh", "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" }, + { + "type": "shell", + "script": "{{template_dir}}/scripts/base/snap.sh", + "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" + }, { "type": "shell", "inline": [ From 6846f12d42a5aed66ca3d9e8bca287d236aa24d3 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Mon, 20 Dec 2021 17:25:00 +0300 Subject: [PATCH 0851/3485] Initialize rust environment to get software report (#4774) --- .../win/scripts/SoftwareReport/SoftwareReport.Common.psm1 | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 index 0bd99e7ccd23..77099297f85a 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 @@ -1,3 +1,9 @@ +function Initialize-RustEnvironment { + $env:RUSTUP_HOME = "C:\Users\Default\.rustup" + $env:CARGO_HOME = "C:\Users\Default\.cargo" + $env:Path += ";$env:CARGO_HOME\bin" +} + function Get-OSName { return (Get-CimInstance -ClassName Win32_OperatingSystem).Caption } @@ -14,6 +20,7 @@ function Get-BashVersion { } function Get-RustVersion { + Initialize-RustEnvironment $rustVersion = [regex]::matches($(rustc --version), "\d+\.\d+\.\d+").Value return $rustVersion } @@ -349,4 +356,3 @@ function Build-PackageManagementEnvironmentTable { } } } - From fa1beee5afb10bb792d461bf60d15deee7c1bea5 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Mon, 20 Dec 2021 22:07:41 +0300 Subject: [PATCH 0852/3485] [macOS] install X libraries (#4777) --- .../macos/software-report/SoftwareReport.Common.psm1 | 10 ++++++++++ .../macos/software-report/SoftwareReport.Generator.ps1 | 7 ++++++- images/macos/toolsets/toolset-10.15.json | 4 +++- images/macos/toolsets/toolset-11.json | 4 +++- images/macos/toolsets/toolset-12.json | 4 +++- 5 files changed, 25 insertions(+), 4 deletions(-) diff --git a/images/macos/software-report/SoftwareReport.Common.psm1 b/images/macos/software-report/SoftwareReport.Common.psm1 index 38a2cfc9e73c..2b30c2e72d47 100644 --- a/images/macos/software-report/SoftwareReport.Common.psm1 +++ b/images/macos/software-report/SoftwareReport.Common.psm1 @@ -522,6 +522,16 @@ function Get-ZlibVersion { return "Zlib $zlibVersion" } +function Get-LibXftVersion { + $libXftVersion = (brew info libxft)[0] | Take-Part -Part 2 + return "libXft $libXftVersion" +} + +function Get-LibXextVersion { + $libXextVersion = (brew info libxext)[0] | Take-Part -Part 2 + return "libXext $libXextVersion" +} + function Build-PackageManagementEnvironmentTable { return @( @{ diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1 index a7016f904b5a..d8d724a3b8a9 100644 --- a/images/macos/software-report/SoftwareReport.Generator.ps1 +++ b/images/macos/software-report/SoftwareReport.Generator.ps1 @@ -292,7 +292,12 @@ $markdown += Build-AndroidEnvironmentTable | New-MDTable $markdown += New-MDNewLine $markdown += New-MDHeader "Miscellaneous" -Level 3 -$markdown += New-MDList -Lines @(Get-ZlibVersion) -Style Unordered +$markdown += New-MDList -Style Unordered -Lines (@( + (Get-ZlibVersion), + (Get-LibXextVersion), + (Get-LibXftVersion) + ) | Sort-Object +) # # Generate systeminfo.txt with information about image (for debug purpose) diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index 1db75e409b8e..aba45a82399c 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -225,7 +225,9 @@ "swig", "xctool", "zstd", - "zlib" + "zlib", + "libxext", + "libxft" ], "cask_packages": [ "julia", diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index e24814eb59cb..a82679ee27e1 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -185,7 +185,9 @@ "swiftformat", "swig", "zstd", - "zlib" + "zlib", + "libxext", + "libxft" ], "cask_packages": [ "julia" diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index a4ca2b473451..67ed08d923d3 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -100,7 +100,9 @@ "swig", "zstd", "gmp", - "zlib" + "zlib", + "libxext", + "libxft" ], "cask_packages": [ "julia" From 8ad56a1fede5341379be2f8034b8375026526e4f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 21 Dec 2021 09:13:49 +0000 Subject: [PATCH 0853/3485] Updating readme file for macOS-11 version 20211219.1 (#4775) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-11-Readme.md | 107 +++++++++++++++++--------------- 1 file changed, 56 insertions(+), 51 deletions(-) diff --git a/images/macos/macos-11-Readme.md b/images/macos/macos-11-Readme.md index 921df8ee80b1..d5ef19848562 100644 --- a/images/macos/macos-11-Readme.md +++ b/images/macos/macos-11-Readme.md @@ -1,15 +1,16 @@ | Announcements | |-| +| [[All OSs] Python version 3.5 will be removed from the images on January 24, 2022](https://github.com/actions/virtual-environments/issues/4744) | | [macOS-latest workflows will use macOS-11](https://github.com/actions/virtual-environments/issues/4060) | *** # macOS 11.6 info -- System Version: macOS 11.6.1 (20G224) +- System Version: macOS 11.6.2 (20G314) - Kernel Version: Darwin 20.6.0 -- Image Version: 20211211.1 +- Image Version: 20211219.1 ## Installed Software ### Language and Runtime -- .NET SDK 2.1.302 2.1.403 2.1.507 2.1.607 2.1.701 2.1.818 3.1.101 3.1.201 3.1.302 3.1.415 5.0.102 5.0.202 5.0.302 5.0.403 +- .NET SDK 2.1.302 2.1.403 2.1.507 2.1.607 2.1.701 2.1.818 3.1.101 3.1.201 3.1.302 3.1.416 5.0.102 5.0.202 5.0.302 5.0.404 - Bash 3.2.57(1)-release - Clang/LLVM 13.0.0 is available on `'$(brew --prefix llvm)/bin/clang'` - Clang/LLVM 13.0.0 is default @@ -21,13 +22,13 @@ - GNU Fortran (Homebrew GCC 11.2.0_3) 11.2.0 - available by `gfortran-11` alias - Go 1.15.15 - julia 1.7.0 -- Kotlin 1.6.0-release-798 -- MSBuild 16.9.0.22901 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) +- Kotlin 1.6.10-release-923 +- MSBuild 16.10.1.58001 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) - Node.js v16.13.1 -- NVM 0.39.0 -- NVM - Cached node versions: v12.22.7 v14.18.2 v16.13.1 +- NVM 0.39.1 +- NVM - Cached node versions: v12.22.8 v14.18.2 v16.13.1 - Perl 5.34.0 -- PHP 8.1.0 +- PHP 8.1.1 - Python 2.7.18 - Python 3.9.9 - Ruby 2.7.5p203 @@ -37,7 +38,7 @@ - Carthage 0.38.0 - CocoaPods 1.11.2 - Composer 2.1.14 -- Homebrew 3.3.7 +- Homebrew 3.3.8 - Miniconda 4.10.3 - NPM 8.1.2 - NuGet 5.9.0.7134 @@ -45,8 +46,8 @@ - Pip 21.3.1 (python 3.9) - Pipx 0.16.4 - RubyGems 3.2.33 -- Vcpkg 2021 (build from master \<48bba4f9c>) -- Yarn 1.22.15 +- Vcpkg 2021 (build from master \<50fd3d995>) +- Yarn 1.22.17 #### Environment variables | Name | Value | @@ -57,8 +58,8 @@ ### Project Management - Apache Ant(TM) 1.10.12 - Apache Maven 3.8.4 -- Gradle 7.3.1 -- Sbt 1.5.6 +- Gradle 7.3.2 +- Sbt 1.5.7 ### Utilities - 7-Zip 17.04 @@ -80,7 +81,7 @@ - mongo v5.0.4 - mongod v5.0.4 - Newman 5.3.0 -- OpenSSL 1.1.1l 24 Aug 2021 `(/usr/local/opt/openssl@1.1 -> ../Cellar/openssl@1.1/1.1.1l_1)` +- OpenSSL 1.1.1m 14 Dec 2021 `(/usr/local/opt/openssl@1.1 -> ../Cellar/openssl@1.1/1.1.1m)` - Packer 1.7.8 - PostgreSQL 14.1 - psql (PostgreSQL) 14.1 @@ -90,13 +91,13 @@ - zstd 1.5.0 ### Tools -- Aliyun CLI 3.0.100 +- Aliyun CLI 3.0.102 - App Center CLI 2.10.6 - AWS CLI 2.4.6 - AWS SAM CLI 1.36.0 - AWS Session Manager CLI 1.2.279.0 - Azure CLI 2.31.0 -- Bicep CLI 0.4.1008 +- Bicep CLI 0.4.1124 - Cabal 3.6.2.0 - Cmake 3.22.1 - Fastlane 2.199.0 @@ -106,20 +107,20 @@ - Stack 2.7.3 - SwiftFormat 0.49.1 - Swig 4.0.2 -- Xcode Command Line Tools 13.0.0.0.1.1630607135 +- Xcode Command Line Tools 13.2.0.0.1.1638488800 ### Linters - SwiftLint 0.45.1 - yamllint 1.26.3 ### Browsers -- Safari 15.1 (16612.2.9.1.30) -- SafariDriver 15.1 (16612.2.9.1.30) -- Google Chrome 96.0.4664.93 +- Safari 15.2 (16612.3.6.1.8) +- SafariDriver 15.2 (16612.3.6.1.8) +- Google Chrome 96.0.4664.110 - ChromeDriver 96.0.4664.45 -- Microsoft Edge 96.0.1054.53 -- MSEdgeDriver 96.0.1054.43 -- Mozilla Firefox 95.0 +- Microsoft Edge 96.0.1054.62 +- MSEdgeDriver 96.0.1054.62 +- Mozilla Firefox 95.0.1 - geckodriver 0.30.0 - Selenium server 4.1.0 @@ -157,7 +158,7 @@ - 3.8.12 [PyPy 7.3.7] #### Node.js -- 12.22.7 +- 12.22.8 - 14.18.2 - 16.13.1 @@ -183,7 +184,7 @@ - Rustfmt 1.4.37-stable ### PowerShell Tools -- PowerShell 7.2.0 +- PowerShell 7.2.1 #### PowerShell Modules | Module | Version | @@ -201,7 +202,7 @@ ### Xamarin #### Visual Studio for Mac -- 8.10.14.17 +- 8.10.16.2 #### Xamarin bundles | symlink | Xamarin.Mono | Xamarin.iOS | Xamarin.Mac | Xamarin.Android | @@ -225,6 +226,7 @@ ### Xcode | Version | Build | Path | | -------------- | -------- | ------------------------------ | +| 13.2.1 | 13C100 | /Applications/Xcode_13.2.1.app | | 13.2 | 13C90 | /Applications/Xcode_13.2.app | | 13.1 (default) | 13A1030d | /Applications/Xcode_13.1.app | | 13.0 | 13A233 | /Applications/Xcode_13.0.app | @@ -245,61 +247,61 @@ | macOS 11.1 | macosx11.1 | 12.4 | | macOS 11.3 | macosx11.3 | 12.5.1, 13.0 | | macOS 12.0 | macosx12.0 | 13.1 | -| macOS 12.1 | macosx12.1 | 13.2 | +| macOS 12.1 | macosx12.1 | 13.2, 13.2.1 | | iOS 13.7 | iphoneos13.7 | 11.7 | | iOS 14.4 | iphoneos14.4 | 12.4 | | iOS 14.5 | iphoneos14.5 | 12.5.1 | | iOS 15.0 | iphoneos15.0 | 13.0, 13.1 | -| iOS 15.2 | iphoneos15.2 | 13.2 | +| iOS 15.2 | iphoneos15.2 | 13.2, 13.2.1 | | Simulator - iOS 13.7 | iphonesimulator13.7 | 11.7 | | Simulator - iOS 14.4 | iphonesimulator14.4 | 12.4 | | Simulator - iOS 14.5 | iphonesimulator14.5 | 12.5.1 | | Simulator - iOS 15.0 | iphonesimulator15.0 | 13.0, 13.1 | -| Simulator - iOS 15.2 | iphonesimulator15.2 | 13.2 | +| Simulator - iOS 15.2 | iphonesimulator15.2 | 13.2, 13.2.1 | | tvOS 13.4 | appletvos13.4 | 11.7 | | tvOS 14.3 | appletvos14.3 | 12.4 | | tvOS 14.5 | appletvos14.5 | 12.5.1 | | tvOS 15.0 | appletvos15.0 | 13.0, 13.1 | -| tvOS 15.2 | appletvos15.2 | 13.2 | +| tvOS 15.2 | appletvos15.2 | 13.2, 13.2.1 | | Simulator - tvOS 13.4 | appletvsimulator13.4 | 11.7 | | Simulator - tvOS 14.3 | appletvsimulator14.3 | 12.4 | | Simulator - tvOS 14.5 | appletvsimulator14.5 | 12.5.1 | | Simulator - tvOS 15.0 | appletvsimulator15.0 | 13.0, 13.1 | -| Simulator - tvOS 15.2 | appletvsimulator15.2 | 13.2 | +| Simulator - tvOS 15.2 | appletvsimulator15.2 | 13.2, 13.2.1 | | watchOS 6.2 | watchos6.2 | 11.7 | | watchOS 7.2 | watchos7.2 | 12.4 | | watchOS 7.4 | watchos7.4 | 12.5.1 | | watchOS 8.0 | watchos8.0 | 13.0, 13.1 | -| watchOS 8.3 | watchos8.3 | 13.2 | +| watchOS 8.3 | watchos8.3 | 13.2, 13.2.1 | | Simulator - watchOS 6.2 | watchsimulator6.2 | 11.7 | | Simulator - watchOS 7.2 | watchsimulator7.2 | 12.4 | | Simulator - watchOS 7.4 | watchsimulator7.4 | 12.5.1 | | Simulator - watchOS 8.0 | watchsimulator8.0 | 13.0, 13.1 | -| Simulator - watchOS 8.3 | watchsimulator8.3 | 13.2 | +| Simulator - watchOS 8.3 | watchsimulator8.3 | 13.2, 13.2.1 | | DriverKit 19.0 | driverkit.macosx19.0 | 11.7 | | DriverKit 20.2 | driverkit.macosx20.2 | 12.4 | | DriverKit 20.4 | driverkit.macosx20.4 | 12.5.1, 13.0 | | DriverKit 21.0.1 | driverkit21.0.1 | 13.1 | -| DriverKit 21.2 | driverkit21.2 | 13.2 | +| DriverKit 21.2 | driverkit21.2 | 13.2, 13.2.1 | #### Installed Simulators -| OS | Xcode Version | Simulators | -| ----------- | ------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| iOS 13.7 | 11.7 | iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (7th generation)<br>iPad Air (3rd generation)<br>iPad Pro (11-inch) (2nd generation)<br>iPad Pro (12.9-inch) (4th generation)<br>iPad Pro (9.7-inch) | -| iOS 14.4 | 12.4 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (7th generation)<br>iPad (8th generation)<br>iPad Air (3rd generation)<br>iPad Air (4th generation)<br>iPad Pro (11-inch) (2nd generation)<br>iPad Pro (12.9-inch) (4th generation)<br>iPad Pro (9.7-inch) | -| iOS 14.5 | 12.5.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (7th generation)<br>iPad (8th generation)<br>iPad Air (3rd generation)<br>iPad Air (4th generation)<br>iPad Pro (11-inch) (2nd generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (4th generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | -| iOS 15.0 | 13.0<br>13.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (7th generation)<br>iPad (8th generation)<br>iPad (9th generation)<br>iPad Air (3rd generation)<br>iPad Air (4th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (2nd generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (4th generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | -| iOS 15.2 | 13.2 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (7th generation)<br>iPad (8th generation)<br>iPad (9th generation)<br>iPad Air (3rd generation)<br>iPad Air (4th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (2nd generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (4th generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | -| tvOS 13.4 | 11.7 | Apple TV<br>Apple TV 4K<br>Apple TV 4K (at 1080p) | -| tvOS 14.3 | 12.4 | Apple TV<br>Apple TV 4K<br>Apple TV 4K (at 1080p) | -| tvOS 14.5 | 12.5.1 | Apple TV<br>Apple TV 4K<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p)<br>Apple TV 4K (at 1080p) (2nd generation) | -| tvOS 15.0 | 13.0<br>13.1 | Apple TV<br>Apple TV 4K<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p)<br>Apple TV 4K (at 1080p) (2nd generation) | -| tvOS 15.2 | 13.2 | Apple TV<br>Apple TV 4K<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p)<br>Apple TV 4K (at 1080p) (2nd generation) | -| watchOS 6.2 | 11.7 | Apple Watch Series 4 - 40mm<br>Apple Watch Series 4 - 44mm<br>Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm | -| watchOS 7.2 | 12.4 | Apple Watch Series 4 - 40mm<br>Apple Watch Series 4 - 44mm<br>Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm | -| watchOS 7.4 | 12.5.1 | Apple Watch Series 4 - 40mm<br>Apple Watch Series 4 - 44mm<br>Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm | -| watchOS 8.0 | 13.0<br>13.1 | Apple Watch Series 4 - 40mm<br>Apple Watch Series 4 - 44mm<br>Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | -| watchOS 8.3 | 13.2 | Apple Watch Series 4 - 40mm<br>Apple Watch Series 4 - 44mm<br>Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | +| OS | Xcode Version | Simulators | +| ----------- | -------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| iOS 13.7 | 11.7 | iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (7th generation)<br>iPad Air (3rd generation)<br>iPad Pro (11-inch) (2nd generation)<br>iPad Pro (12.9-inch) (4th generation)<br>iPad Pro (9.7-inch) | +| iOS 14.4 | 12.4 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (7th generation)<br>iPad (8th generation)<br>iPad Air (3rd generation)<br>iPad Air (4th generation)<br>iPad Pro (11-inch) (2nd generation)<br>iPad Pro (12.9-inch) (4th generation)<br>iPad Pro (9.7-inch) | +| iOS 14.5 | 12.5.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (7th generation)<br>iPad (8th generation)<br>iPad Air (3rd generation)<br>iPad Air (4th generation)<br>iPad Pro (11-inch) (2nd generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (4th generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | +| iOS 15.0 | 13.0<br>13.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (7th generation)<br>iPad (8th generation)<br>iPad (9th generation)<br>iPad Air (3rd generation)<br>iPad Air (4th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (2nd generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (4th generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | +| iOS 15.2 | 13.2<br>13.2.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (7th generation)<br>iPad (8th generation)<br>iPad (9th generation)<br>iPad Air (3rd generation)<br>iPad Air (4th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (2nd generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (4th generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | +| tvOS 13.4 | 11.7 | Apple TV<br>Apple TV 4K<br>Apple TV 4K (at 1080p) | +| tvOS 14.3 | 12.4 | Apple TV<br>Apple TV 4K<br>Apple TV 4K (at 1080p) | +| tvOS 14.5 | 12.5.1 | Apple TV<br>Apple TV 4K<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p)<br>Apple TV 4K (at 1080p) (2nd generation) | +| tvOS 15.0 | 13.0<br>13.1 | Apple TV<br>Apple TV 4K<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p)<br>Apple TV 4K (at 1080p) (2nd generation) | +| tvOS 15.2 | 13.2<br>13.2.1 | Apple TV<br>Apple TV 4K<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p)<br>Apple TV 4K (at 1080p) (2nd generation) | +| watchOS 6.2 | 11.7 | Apple Watch Series 4 - 40mm<br>Apple Watch Series 4 - 44mm<br>Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm | +| watchOS 7.2 | 12.4 | Apple Watch Series 4 - 40mm<br>Apple Watch Series 4 - 44mm<br>Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm | +| watchOS 7.4 | 12.5.1 | Apple Watch Series 4 - 40mm<br>Apple Watch Series 4 - 44mm<br>Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm | +| watchOS 8.0 | 13.0<br>13.1 | Apple Watch Series 4 - 40mm<br>Apple Watch Series 4 - 44mm<br>Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | +| watchOS 8.3 | 13.2<br>13.2.1 | Apple Watch Series 4 - 40mm<br>Apple Watch Series 4 - 44mm<br>Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | ### Android | Package Name | Version | @@ -325,5 +327,8 @@ | ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk-bundle -> /Users/runner/Library/Android/sdk/ndk/21.4.7075529 | | ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | +### Miscellaneous +- Zlib 1.2.11 + From 6e09f7e132b6078190bc353a081dc9f77eddf3bb Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Tue, 21 Dec 2021 19:12:15 +0300 Subject: [PATCH 0854/3485] [Ubuntu] Do not use apt-fast (#4784) --- images/linux/scripts/installers/java-tools.sh | 2 +- images/linux/scripts/installers/php.sh | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/images/linux/scripts/installers/java-tools.sh b/images/linux/scripts/installers/java-tools.sh index f9e6dc30b94d..32113b31ea61 100644 --- a/images/linux/scripts/installers/java-tools.sh +++ b/images/linux/scripts/installers/java-tools.sh @@ -53,7 +53,7 @@ echo "JAVA_HOME=/usr/lib/jvm/adoptopenjdk-${DEFAULT_JDK_VERSION}-hotspot-amd64" # add extra permissions to be able execute command without sudo chmod -R 777 /usr/lib/jvm # Install Ant -apt-fast install -y --no-install-recommends ant ant-optional +apt-get install -y --no-install-recommends ant ant-optional echo "ANT_HOME=/usr/share/ant" | tee -a /etc/environment # Install Maven diff --git a/images/linux/scripts/installers/php.sh b/images/linux/scripts/installers/php.sh index f415a78e4c05..c11eb620dd1b 100644 --- a/images/linux/scripts/installers/php.sh +++ b/images/linux/scripts/installers/php.sh @@ -18,7 +18,7 @@ php_versions=$(get_toolset_value '.php.versions[]') for version in $php_versions; do echo "Installing PHP $version" - apt-fast install -y --no-install-recommends \ + apt-get install -y --no-install-recommends \ php$version \ php$version-amqp \ php$version-apcu \ @@ -65,19 +65,19 @@ for version in $php_versions; do php$version-zmq if [[ $version == "5.6" || $version == "7.0" || $version == "7.1" ]]; then - apt-fast install -y --no-install-recommends php$version-mcrypt php$version-recode + apt-get install -y --no-install-recommends php$version-mcrypt php$version-recode fi if [[ $version == "7.2" || $version == "7.3" ]]; then - apt-fast install -y --no-install-recommends php$version-recode + apt-get install -y --no-install-recommends php$version-recode fi if [[ $version != "8.0" && $version != "8.1" ]]; then - apt-fast install -y --no-install-recommends php$version-xmlrpc php$version-json + apt-get install -y --no-install-recommends php$version-xmlrpc php$version-json fi if [[ $version != "5.6" && $version != "7.0" ]]; then - apt-fast install -y --no-install-recommends php$version-pcov + apt-get install -y --no-install-recommends php$version-pcov # Disable PCOV, as Xdebug is enabled by default # https://github.com/krakjoe/pcov#interoperability @@ -85,13 +85,13 @@ for version in $php_versions; do fi if [[ $version = "7.0" || $version = "7.1" ]]; then - apt-fast install -y --no-install-recommends php$version-sodium + apt-get install -y --no-install-recommends php$version-sodium fi done -apt-fast install -y --no-install-recommends php-pear +apt-get install -y --no-install-recommends php-pear -apt-fast install -y --no-install-recommends snmp +apt-get install -y --no-install-recommends snmp # Install composer php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" From 99772f4c61b2c3e1413d874f785ada54005bb414 Mon Sep 17 00:00:00 2001 From: alex-3sr <38663389+alex-3sr@users.noreply.github.com> Date: Wed, 22 Dec 2021 07:11:44 +0100 Subject: [PATCH 0855/3485] Add EnableHttpsTrafficOnly for storage (#4789) --- helpers/GenerateResourcesAndImage.ps1 | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/helpers/GenerateResourcesAndImage.ps1 b/helpers/GenerateResourcesAndImage.ps1 index de68ddfe4119..d023e103937b 100644 --- a/helpers/GenerateResourcesAndImage.ps1 +++ b/helpers/GenerateResourcesAndImage.ps1 @@ -123,7 +123,9 @@ Function GenerateResourcesAndImage { [Parameter(Mandatory = $False)] [Switch] $Force, [Parameter(Mandatory = $False)] - [bool] $AllowBlobPublicAccess = $False + [bool] $AllowBlobPublicAccess = $False, + [Parameter(Mandatory = $False)] + [bool] $EnableHttpsTrafficOnly = $False ) $builderScriptPath = Get-PackerTemplatePath -RepositoryRoot $ImageGenerationRepositoryRoot -ImageType $ImageType @@ -191,7 +193,7 @@ Function GenerateResourcesAndImage { $storageAccountName = $storageAccountName.Replace("-", "").Replace("_", "").Replace("(", "").Replace(")", "").ToLower() $storageAccountName += "001" - New-AzStorageAccount -ResourceGroupName $ResourceGroupName -AccountName $storageAccountName -Location $AzureLocation -SkuName "Standard_LRS" -AllowBlobPublicAccess $AllowBlobPublicAccess + New-AzStorageAccount -ResourceGroupName $ResourceGroupName -AccountName $storageAccountName -Location $AzureLocation -SkuName "Standard_LRS" -AllowBlobPublicAccess $AllowBlobPublicAccess -EnableHttpsTrafficOnly $EnableHttpsTrafficOnly if ([string]::IsNullOrEmpty($AzureClientId)) { # Interactive authentication: A service principal is created during runtime. @@ -266,4 +268,4 @@ Function GenerateResourcesAndImage { -var "install_password=$($InstallPassword)" ` -var "allowed_inbound_ip_addresses=$($AgentIp)" ` $builderScriptPath -} +} \ No newline at end of file From d8cbcdfd3874a5e5db243edf7e08a20d475b13fe Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 22 Dec 2021 06:15:23 +0000 Subject: [PATCH 0856/3485] Updating readme file for macOS-10.15 version 20211220.1 (#4785) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-10.15-Readme.md | 60 ++++++++++++++++-------------- 1 file changed, 33 insertions(+), 27 deletions(-) diff --git a/images/macos/macos-10.15-Readme.md b/images/macos/macos-10.15-Readme.md index c25903128dea..e101c7c647a3 100644 --- a/images/macos/macos-10.15-Readme.md +++ b/images/macos/macos-10.15-Readme.md @@ -1,15 +1,16 @@ | Announcements | |-| +| [[All OSs] Python version 3.5 will be removed from the images on January 24, 2022](https://github.com/actions/virtual-environments/issues/4744) | | [macOS-latest workflows will use macOS-11](https://github.com/actions/virtual-environments/issues/4060) | *** # macOS 10.15 info -- System Version: macOS 10.15.7 (19H1519) +- System Version: macOS 10.15.7 (19H1615) - Kernel Version: Darwin 19.6.0 -- Image Version: 20211212.1 +- Image Version: 20211220.1 ## Installed Software ### Language and Runtime -- .NET SDK 2.1.302 2.1.403 2.1.507 2.1.607 2.1.701 2.1.818 3.1.101 3.1.201 3.1.302 3.1.415 5.0.102 5.0.202 5.0.302 5.0.403 +- .NET SDK 2.1.302 2.1.403 2.1.507 2.1.607 2.1.701 2.1.818 3.1.101 3.1.201 3.1.302 3.1.416 5.0.102 5.0.202 5.0.302 5.0.404 - Bash 3.2.57(1)-release - Clang/LLVM 12.0.0 is default - Clang/LLVM 13.0.0 is available on `'$(brew --prefix llvm)/bin/clang'` @@ -21,13 +22,13 @@ - GNU Fortran (Homebrew GCC 11.2.0_3) 11.2.0 - available by `gfortran-11` alias - Go 1.15.15 - julia 1.7.0 -- Kotlin 1.6.0-release-798 -- MSBuild 16.9.0.22901 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) +- Kotlin 1.6.10-release-923 +- MSBuild 16.10.1.58001 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) - Node.js v16.13.1 -- NVM 0.39.0 -- NVM - Cached node versions: v12.22.7 v14.18.2 v16.13.1 +- NVM 0.39.1 +- NVM - Cached node versions: v12.22.8 v14.18.2 v16.13.1 - Perl 5.34.0 -- PHP 8.1.0 +- PHP 8.1.1 - Python 2.7.18 - Python 3.9.9 - R 4.1.2 @@ -38,7 +39,7 @@ - Carthage 0.38.0 - CocoaPods 1.11.2 - Composer 2.1.14 -- Homebrew 3.3.7 +- Homebrew 3.3.9 - Miniconda 4.10.3 - NPM 8.1.2 - NuGet 5.9.0.7134 @@ -46,8 +47,8 @@ - Pip 21.3.1 (python 3.9) - Pipx 0.16.4 - RubyGems 3.2.33 -- Vcpkg 2021 (build from master \<48bba4f9c>) -- Yarn 1.22.15 +- Vcpkg 2021 (build from master \<cf43cf71c>) +- Yarn 1.22.17 #### Environment variables | Name | Value | @@ -58,8 +59,8 @@ ### Project Management - Apache Ant(TM) 1.10.12 - Apache Maven 3.8.4 -- Gradle 7.3.1 -- Sbt 1.5.6 +- Gradle 7.3.2 +- Sbt 1.5.7 ### Utilities - 7-Zip 17.04 @@ -82,7 +83,7 @@ - mongo v5.0.4 - mongod v5.0.4 - Newman 5.3.0 -- OpenSSL 1.1.1l 24 Aug 2021 `(/usr/local/opt/openssl@1.1 -> ../Cellar/openssl@1.1/1.1.1l_1)` +- OpenSSL 1.1.1m 14 Dec 2021 `(/usr/local/opt/openssl@1.1 -> ../Cellar/openssl@1.1/1.1.1m)` - Packer 1.7.8 - PostgreSQL 14.1 - psql (PostgreSQL) 14.1 @@ -94,13 +95,13 @@ - zstd 1.5.0 ### Tools -- Aliyun CLI 3.0.100 -- App Center CLI 2.10.6 +- Aliyun CLI 3.0.102 +- App Center CLI 2.10.7 - AWS CLI 2.4.6 - AWS SAM CLI 1.36.0 - AWS Session Manager CLI 1.2.279.0 - Azure CLI 2.31.0 -- Bicep CLI 0.4.1008 +- Bicep CLI 0.4.1124 - Cabal 3.6.2.0 - Cmake 3.22.1 - Fastlane 2.199.0 @@ -117,13 +118,13 @@ - yamllint 1.26.3 ### Browsers -- Safari 15.1 (15612.2.9.1.30) -- SafariDriver 15.1 (15612.2.9.1.30) -- Google Chrome 96.0.4664.93 +- Safari 15.2 (15612.3.6.1.8) +- SafariDriver 15.2 (15612.3.6.1.8) +- Google Chrome 96.0.4664.110 - ChromeDriver 96.0.4664.45 -- Microsoft Edge 96.0.1054.53 -- MSEdgeDriver 96.0.1054.53 -- Mozilla Firefox 95.0 +- Microsoft Edge 96.0.1054.62 +- MSEdgeDriver 96.0.1054.62 +- Mozilla Firefox 95.0.2 - geckodriver 0.30.0 - Selenium server 4.1.0 @@ -168,7 +169,7 @@ - 3.8.12 [PyPy 7.3.7] #### Node.js -- 12.22.7 +- 12.22.8 - 14.18.2 - 16.13.1 @@ -194,7 +195,7 @@ - Rustfmt 1.4.37-stable ### PowerShell Tools -- PowerShell 7.2.0 +- PowerShell 7.2.1 #### PowerShell Modules | Module | Version | @@ -207,12 +208,12 @@ ### Web Servers | Name | Version | ConfigFile | ServiceStatus | ListenPort | | ----- | ------- | ------------------------------- | ------------- | ---------- | -| httpd | 2.4.51 | /usr/local/etc/httpd/httpd.conf | none | 80 | +| httpd | 2.4.52 | /usr/local/etc/httpd/httpd.conf | none | 80 | | nginx | 1.21.4 | /usr/local/etc/nginx/nginx.conf | none | 80 | ### Xamarin #### Visual Studio for Mac -- 8.10.14.17 +- 8.10.16.2 #### Xamarin bundles | symlink | Xamarin.Mono | Xamarin.iOS | Xamarin.Mac | Xamarin.Android | @@ -374,5 +375,10 @@ | ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk-bundle -> /Users/runner/Library/Android/sdk/ndk/21.4.7075529 | | ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | +### Miscellaneous +- libXext 1.3.4 +- libXft 2.3.4 +- Zlib 1.2.11 + From cfacab19e6cf234eb85792e95d967302ae27df93 Mon Sep 17 00:00:00 2001 From: Dibir Magomedsaygitov <61747324+dibir-magomedsaygitov@users.noreply.github.com> Date: Wed, 22 Dec 2021 10:38:22 +0300 Subject: [PATCH 0857/3485] [macOS] Rework PowerShell installation (#4778) --- images/macos/provision/core/powershell.sh | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/images/macos/provision/core/powershell.sh b/images/macos/provision/core/powershell.sh index 834744856026..289b6106ca3b 100644 --- a/images/macos/provision/core/powershell.sh +++ b/images/macos/provision/core/powershell.sh @@ -2,7 +2,16 @@ source ~/utils/utils.sh echo Installing PowerShell... -brew install --cask powershell +psRelease=$(curl -s "https://api.github.com/repos/PowerShell/PowerShell/releases/latest") +psDownloadUrl=$(echo $psRelease | jq -r '.assets[].browser_download_url | select(contains("osx-x64.pkg"))' | head -n 1) +download_with_retries $psDownloadUrl "/tmp" "powershell.pkg" + +# Work around the issue on macOS Big Sur 11.5 or higher for possible error message ("can't be opened because Apple cannot check it for malicious software") when installing the package +if ! is_Less_BigSur; then + sudo xattr -rd com.apple.quarantine /tmp/powershell.pkg +fi + +sudo installer -pkg /tmp/powershell.pkg -target / # Install PowerShell modules psModules=$(get_toolset_value '.powershellModules[].name') From 5aca2192f76258eb8ee09a9adf83e8bdeef2dfa6 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Wed, 22 Dec 2021 10:41:15 +0300 Subject: [PATCH 0858/3485] [Ubuntu] get rid of homebrew post-gen script (#4634) --- .../post-generation/homebrew-permissions.sh | 18 ------------------ .../scripts/installers/post-deployment.sh | 4 +--- 2 files changed, 1 insertion(+), 21 deletions(-) delete mode 100644 images/linux/post-generation/homebrew-permissions.sh diff --git a/images/linux/post-generation/homebrew-permissions.sh b/images/linux/post-generation/homebrew-permissions.sh deleted file mode 100644 index b19947b463fd..000000000000 --- a/images/linux/post-generation/homebrew-permissions.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash - -# Fix permissions for Homebrew -# https://github.com/actions/virtual-environments/issues/1568 - -# Reset brew repository directory to make the brew clean after chmoding /home -cd $(brew --repo) -git reset --hard - -brew_folder="/home/linuxbrew/" -homebrew_user=$(cut -d: -f1 /etc/passwd | tail -1) - -if [ -d "$brew_folder" ]; then - brew_folder_owner=$(ls -ld $brew_folder | awk '{print $3}') - if [ "$homebrew_user" != "$brew_folder_owner" ]; then - chown "$homebrew_user":docker -R $brew_folder - fi -fi diff --git a/images/linux/scripts/installers/post-deployment.sh b/images/linux/scripts/installers/post-deployment.sh index 1ed878c583fb..a7418c406425 100644 --- a/images/linux/scripts/installers/post-deployment.sh +++ b/images/linux/scripts/installers/post-deployment.sh @@ -10,8 +10,6 @@ echo "chmod -R 777 /opt" chmod -R 777 /opt echo "chmod -R 777 /usr/share" chmod -R 777 /usr/share -echo "chmod -R 777 /home" -chmod -R 777 /home # remove installer and helper folders rm -rf $HELPER_SCRIPT_FOLDER @@ -27,4 +25,4 @@ echo "Updated /etc/environment: $(cat /etc/environment)" # Clean yarn and npm cache yarn cache clean -npm cache clean --force \ No newline at end of file +npm cache clean --force From bcce0b93c0814c63b3ce10a85a74f5ca9c86a273 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 22 Dec 2021 08:28:06 +0000 Subject: [PATCH 0859/3485] Updating readme file for ubuntu20 version 20211219.1 (#4772) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2004-README.md | 42 ++++++++++++++++++------------- 1 file changed, 24 insertions(+), 18 deletions(-) diff --git a/images/linux/Ubuntu2004-README.md b/images/linux/Ubuntu2004-README.md index 75909f7a6189..16ccf7713112 100644 --- a/images/linux/Ubuntu2004-README.md +++ b/images/linux/Ubuntu2004-README.md @@ -1,6 +1,10 @@ +| Announcements | +|-| +| [[All OSs] Python version 3.5 will be removed from the images on January 24, 2022](https://github.com/actions/virtual-environments/issues/4744) | +*** # Ubuntu 20.04.3 LTS - Linux kernel version: 5.11.0-1022-azure -- Image Version: 20211214.2 +- Image Version: 20211219.1 ## Installed Software ### Language and Runtime @@ -32,7 +36,7 @@ - Pip3 20.0.2 - Pipx 0.16.4 - RubyGems 3.1.2 -- Vcpkg (build from master \<a9ff505c5>) +- Vcpkg (build from master \<50fd3d995>) - Yarn 1.22.17 #### Environment variables @@ -43,10 +47,10 @@ ### Project Management - Ant 1.10.7 -- Gradle 7.3.1 +- Gradle 7.3.2 - Lerna 4.0.0 - Maven 3.8.4 -- Sbt 1.5.6 +- Sbt 1.5.7 ### Tools - Ansible 2.12.1 @@ -54,7 +58,7 @@ - AzCopy 10.13.0 (available by `azcopy` and `azcopy10` aliases) - Bazel 4.2.2 - Bazelisk 1.11.0 -- Bicep 0.4.1008 +- Bicep 0.4.1124 - Buildah 1.21.3 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - CMake 3.22.1 - CodeQL Action Bundle 2.7.3 @@ -69,10 +73,10 @@ - Git-ftp 1.6.0 - Haveged 1.9.1 - Heroku 7.59.2 -- HHVM (HipHop VM) 4.139.0 +- HHVM (HipHop VM) 4.140.1 - jq 1.6 - Kind 0.11.1 -- Kubectl 1.23.0 +- Kubectl 1.23.1 - Kustomize 4.4.1 - Leiningen 2.9.8 - MediaInfo 19.09 @@ -80,9 +84,10 @@ - Minikube 1.24.0 - n 8.0.1 - Newman 5.3.0 -- nvm 0.39.0 +- nvm 0.39.1 - OpenSSL 1.1.1f 31 Mar 2020 - Packer 1.7.8 +- Parcel 2.0.1 - PhantomJS 2.1.1 - Podman 3.4.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Pulumi 3.19.0 @@ -90,22 +95,22 @@ - Skopeo 1.3.0 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 -- Terraform 1.1.0 +- Terraform 1.1.2 - yamllint 1.26.3 - yq 4.16.1 - zstd 1.5.0 (homebrew) ### CLI Tools -- Alibaba Cloud CLI 3.0.101 +- Alibaba Cloud CLI 3.0.102 - AWS CLI 2.4.6 - AWS CLI Session manager plugin 1.2.279.0 - AWS SAM CLI 1.36.0 - Azure CLI (azure-cli) 2.31.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.22.0 - GitHub CLI 2.3.0 -- Google Cloud SDK 366.0.0 (apt source repository: https://packages.cloud.google.com/apt) +- Google Cloud SDK 367.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 8.1.1 +- Netlify CLI 8.1.8 - OpenShift CLI 4.9.11 - ORAS CLI 0.12.0 - Vercel CLI 23.1.2 @@ -166,7 +171,7 @@ | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | ### .NET Core SDK -- 2.1.302 2.1.403 2.1.526 2.1.617 2.1.701 2.1.818 3.1.120 3.1.202 3.1.302 3.1.415 5.0.104 5.0.209 5.0.303 5.0.403 +- 2.1.302 2.1.403 2.1.526 2.1.617 2.1.701 2.1.818 3.1.120 3.1.202 3.1.302 3.1.416 5.0.104 5.0.210 5.0.303 5.0.404 ### Databases - MongoDB 5.0.5 (apt source repository: https://repo.mongodb.org/apt/ubuntu) @@ -191,7 +196,7 @@ - 1.17.5 #### Node.js -- 12.22.7 +- 12.22.8 - 14.18.2 - 16.13.1 @@ -224,7 +229,7 @@ | GOROOT_1_17_X64 | /opt/hostedtoolcache/go/1.17.5/x64 | x64 | ### PowerShell Tools -- PowerShell 7.2.0 +- PowerShell 7.2.1 #### PowerShell Modules | Module | Version | @@ -281,8 +286,8 @@ | debian:11 | sha256:45ee40a844048c2f6d0105899c1a17733530b56d481612608aab5e2e4048570b | 2021-12-02 | | debian:9 | sha256:aa78ddaa7f8a14bad8f940ebff5542377f91843f6dcc168e41a8628c6007e815 | 2021-12-02 | | moby/buildkit:latest | sha256:d6c89b7085b106301645ddcc77cf64eb7b705ab507b72d52d130ac33f1300417 | 2021-11-18 | -| node:12 | sha256:eb92ed2473762b6d11736a4b4345aa3ef68f773999fe633bc4d9c91fa5d8f9d6 | 2021-12-02 | -| node:12-alpine | sha256:0eca266c5fe38ba93aebac00e45c9ac1bb7328b0702a6dc10e1a6ea543d49301 | 2021-11-13 | +| node:12 | sha256:f881ce751096a214a7e595b0ccf9ee7d6e38d8e0141d7e9d5880b2f242ad392b | 2021-12-18 | +| node:12-alpine | sha256:8fad09b7620b2bc715cbba92e3313c64a797e453f560118576f1740a44584d5d | 2021-12-18 | | node:14 | sha256:52c884d7cf8509c27def168415a1ff23a0bd95d358dd5787ca77b60474dcb3db | 2021-12-02 | | node:14-alpine | sha256:7bcf853eeb97a25465cb385b015606c22e926f548cbd117f85b7196df8aa0d29 | 2021-12-02 | | node:16 | sha256:89b59ce49929d8a8e230946bdb1b58c14cdbbb86c9a7397610afcecfce1be035 | 2021-12-02 | @@ -367,8 +372,9 @@ | upx | 3.95-2build1 | | wget | 1.20.3-1ubuntu2 | | xorriso | 1.5.2-1 | -| xvfb | 2:1.20.11-1ubuntu1\~20.04.2 | +| xvfb | 2:1.20.13-1ubuntu1\~20.04.2 | | xz-utils | 5.2.4-1ubuntu1 | | zip | 3.0-11build1 | | zsync | 0.6.2-3ubuntu1 | + From f2749792079582f58ed6b69160ced9fbc4ec2f8b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 22 Dec 2021 09:03:14 +0000 Subject: [PATCH 0860/3485] Updating readme file for ubuntu18 version 20211219.1 (#4771) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu1804-README.md | 54 +++++++++++++++++-------------- 1 file changed, 30 insertions(+), 24 deletions(-) diff --git a/images/linux/Ubuntu1804-README.md b/images/linux/Ubuntu1804-README.md index e655b5ace78e..2b34015987e7 100644 --- a/images/linux/Ubuntu1804-README.md +++ b/images/linux/Ubuntu1804-README.md @@ -1,6 +1,10 @@ +| Announcements | +|-| +| [[All OSs] Python version 3.5 will be removed from the images on January 24, 2022](https://github.com/actions/virtual-environments/issues/4744) | +*** # Ubuntu 18.04.6 LTS - Linux kernel version: 5.4.0-1064-azure -- Image Version: 20211212.1 +- Image Version: 20211219.1 ## Installed Software ### Language and Runtime @@ -20,19 +24,19 @@ - Python 2.7.17 - Python3 3.6.9 - Ruby 2.5.1p57 -- Swift 5.5.1 +- Swift 5.5.2 ### Package Management - cpan 1.64 - Helm 3.7.2 -- Homebrew 3.3.7 +- Homebrew 3.3.8 - Miniconda 4.10.3 - Npm 8.1.2 - Pip 9.0.1 - Pip3 9.0.1 - Pipx 0.16.4 - RubyGems 2.7.6 -- Vcpkg (build from master \<48bba4f9c>) +- Vcpkg (build from master \<50fd3d995>) - Yarn 1.22.17 #### Environment variables @@ -43,9 +47,9 @@ ### Project Management - Ant 1.10.5 -- Gradle 7.3.1 +- Gradle 7.3.2 - Maven 3.8.4 -- Sbt 1.5.6 +- Sbt 1.5.7 ### Tools - Ansible 2.11.7 @@ -53,7 +57,7 @@ - AzCopy 10.13.0 (available by `azcopy` and `azcopy10` aliases) - Bazel 4.2.2 - Bazelisk 1.11.0 -- Bicep 0.4.1008 +- Bicep 0.4.1124 - Buildah 1.19.6 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - CMake 3.22.1 - CodeQL Action Bundle 2.7.3 @@ -67,10 +71,10 @@ - Git-ftp 1.3.1 - Haveged 1.9.1 - Heroku 7.59.2 -- HHVM (HipHop VM) 4.139.0 +- HHVM (HipHop VM) 4.140.1 - jq 1.5 - Kind 0.11.1 -- Kubectl 1.23.0 +- Kubectl 1.23.1 - Kustomize 4.4.1 - Leiningen 2.9.8 - MediaInfo 17.12 @@ -78,9 +82,10 @@ - Minikube 1.24.0 - n 8.0.1 - Newman 5.3.0 -- nvm 0.39.0 +- nvm 0.39.1 - OpenSSL 1.1.1 11 Sep 2018 - Packer 1.7.8 +- Parcel 2.0.1 - PhantomJS 2.1.1 - Podman 3.0.1 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Pulumi 3.19.0 @@ -88,23 +93,23 @@ - Skopeo 1.2.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 - SVN 1.9.7 -- Terraform 1.1.0 +- Terraform 1.1.2 - yamllint 1.26.3 - yq 4.16.1 - zstd 1.5.0 (homebrew) ### CLI Tools -- Alibaba Cloud CLI 3.0.100 -- AWS CLI 1.22.23 +- Alibaba Cloud CLI 3.0.102 +- AWS CLI 1.22.24 - AWS CLI Session manager plugin 1.2.279.0 - AWS SAM CLI 1.36.0 - Azure CLI (azure-cli) 2.31.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.22.0 - GitHub CLI 2.3.0 -- Google Cloud SDK 366.0.0 (apt source repository: https://packages.cloud.google.com/apt) +- Google Cloud SDK 367.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 8.0.20 -- OpenShift CLI 4.9.10 +- Netlify CLI 8.1.8 +- OpenShift CLI 4.9.11 - ORAS CLI 0.12.0 - Vercel CLI 23.1.2 @@ -145,7 +150,7 @@ - Rustfmt 1.4.37 ### Browsers and Drivers -- Google Chrome 96.0.4664.93 +- Google Chrome 96.0.4664.110 - ChromeDriver 96.0.4664.45 - Mozilla Firefox 95.0 - Geckodriver 0.30.0 @@ -160,7 +165,7 @@ | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | ### .NET Core SDK -- 2.1.302 2.1.403 2.1.526 2.1.617 2.1.701 2.1.818 3.1.120 3.1.202 3.1.302 3.1.415 5.0.104 5.0.209 5.0.303 5.0.403 +- 2.1.302 2.1.403 2.1.526 2.1.617 2.1.701 2.1.818 3.1.120 3.1.202 3.1.302 3.1.416 5.0.104 5.0.210 5.0.303 5.0.404 ### Databases - MongoDB 5.0.5 (apt source repository: https://repo.mongodb.org/apt/ubuntu) @@ -185,7 +190,7 @@ - 1.17.5 #### Node.js -- 12.22.7 +- 12.22.8 - 14.18.2 - 16.13.1 @@ -200,7 +205,7 @@ - 3.7.12 - 3.8.12 - 3.9.9 -- 3.10.0 +- 3.10.1 #### Ruby - 2.4.10 @@ -217,7 +222,7 @@ | GOROOT_1_17_X64 | /opt/hostedtoolcache/go/1.17.5/x64 | x64 | ### PowerShell Tools -- PowerShell 7.2.0 +- PowerShell 7.2.1 #### PowerShell Modules | Module | Version | @@ -273,8 +278,8 @@ | debian:11 | sha256:45ee40a844048c2f6d0105899c1a17733530b56d481612608aab5e2e4048570b | 2021-12-02 | | debian:9 | sha256:aa78ddaa7f8a14bad8f940ebff5542377f91843f6dcc168e41a8628c6007e815 | 2021-12-02 | | moby/buildkit:latest | sha256:d6c89b7085b106301645ddcc77cf64eb7b705ab507b72d52d130ac33f1300417 | 2021-11-18 | -| node:12 | sha256:eb92ed2473762b6d11736a4b4345aa3ef68f773999fe633bc4d9c91fa5d8f9d6 | 2021-12-02 | -| node:12-alpine | sha256:0eca266c5fe38ba93aebac00e45c9ac1bb7328b0702a6dc10e1a6ea543d49301 | 2021-11-13 | +| node:12 | sha256:f881ce751096a214a7e595b0ccf9ee7d6e38d8e0141d7e9d5880b2f242ad392b | 2021-12-18 | +| node:12-alpine | sha256:8fad09b7620b2bc715cbba92e3313c64a797e453f560118576f1740a44584d5d | 2021-12-18 | | node:14 | sha256:52c884d7cf8509c27def168415a1ff23a0bd95d358dd5787ca77b60474dcb3db | 2021-12-02 | | node:14-alpine | sha256:7bcf853eeb97a25465cb385b015606c22e926f548cbd117f85b7196df8aa0d29 | 2021-12-02 | | node:16 | sha256:89b59ce49929d8a8e230946bdb1b58c14cdbbb86c9a7397610afcecfce1be035 | 2021-12-02 | @@ -357,8 +362,9 @@ | upx | 3.94-4 | | wget | 1.19.4-1ubuntu2.2 | | xorriso | 1.4.8-3 | -| xvfb | 2:1.19.6-1ubuntu4.9 | +| xvfb | 2:1.19.6-1ubuntu4.10 | | xz-utils | 5.2.2-1.3 | | zip | 3.0-11build1 | | zsync | 0.6.2-3ubuntu1 | + From 986530d6bb268502c6c29cf7d8c3b1b0b3095bbe Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Wed, 22 Dec 2021 17:34:53 +0300 Subject: [PATCH 0861/3485] Skip linter-check for readmes (#4794) * Exclude readmes from the linter * Add env variable with exclusion to the linter yml * Rename Ubuntu readmes to correspond with the other images * Remove trailing space in ubuntu software generator * Rename Ubuntu1804-README.md to Ubuntu1804-Readme.md * Rename Ubuntu2004-README.md to Ubuntu2004-Readme.md --- .github/workflows/linter.yml | 1 + images/linux/{Ubuntu1804-README.md => Ubuntu1804-Readme.md} | 0 images/linux/{Ubuntu2004-README.md => Ubuntu2004-Readme.md} | 0 .../linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 | 2 +- images/linux/ubuntu1804.json | 2 +- images/linux/ubuntu2004.json | 2 +- 6 files changed, 4 insertions(+), 3 deletions(-) rename images/linux/{Ubuntu1804-README.md => Ubuntu1804-Readme.md} (100%) rename images/linux/{Ubuntu2004-README.md => Ubuntu2004-Readme.md} (100%) diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml index f5c8c6377910..b2f41f9427d6 100644 --- a/.github/workflows/linter.yml +++ b/.github/workflows/linter.yml @@ -29,6 +29,7 @@ jobs: VALIDATE_JSON: true VALIDATE_MARKDOWN: true DEFAULT_BRANCH: ${{ github.base_ref }} + FILTER_REGEX_EXCLUDE: .*images/*/.*-Readme.md - name: Checking shebang lines in MacOS and Ubuntu releases. run: ./images.CI/shebang-linter.ps1 diff --git a/images/linux/Ubuntu1804-README.md b/images/linux/Ubuntu1804-Readme.md similarity index 100% rename from images/linux/Ubuntu1804-README.md rename to images/linux/Ubuntu1804-Readme.md diff --git a/images/linux/Ubuntu2004-README.md b/images/linux/Ubuntu2004-Readme.md similarity index 100% rename from images/linux/Ubuntu2004-README.md rename to images/linux/Ubuntu2004-Readme.md diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index 405604b3392d..b15e53b0f8c1 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -53,7 +53,7 @@ $runtimesList = @( (Get-KotlinVersion), (Get-ClangVersions), (Get-ClangFormatVersions) - ) + ) $markdown += New-MDList -Style Unordered -Lines ($runtimesList | Sort-Object) diff --git a/images/linux/ubuntu1804.json b/images/linux/ubuntu1804.json index 38a0c266fde6..4fb6da11ec51 100644 --- a/images/linux/ubuntu1804.json +++ b/images/linux/ubuntu1804.json @@ -335,7 +335,7 @@ { "type": "file", "source": "{{user `image_folder`}}/Ubuntu-Readme.md", - "destination": "{{template_dir}}/Ubuntu1804-README.md", + "destination": "{{template_dir}}/Ubuntu1804-Readme.md", "direction": "download" }, { diff --git a/images/linux/ubuntu2004.json b/images/linux/ubuntu2004.json index eb9e9e61365a..d88e3779cf23 100644 --- a/images/linux/ubuntu2004.json +++ b/images/linux/ubuntu2004.json @@ -336,7 +336,7 @@ { "type": "file", "source": "{{user `image_folder`}}/Ubuntu-Readme.md", - "destination": "{{template_dir}}/Ubuntu2004-README.md", + "destination": "{{template_dir}}/Ubuntu2004-Readme.md", "direction": "download" }, { From 35c775a8520fd4e734bbef1ebf6ee820bf9ca190 Mon Sep 17 00:00:00 2001 From: Nikolay Frolov <90333448+nikolai-frolov@users.noreply.github.com> Date: Wed, 22 Dec 2021 17:42:54 +0300 Subject: [PATCH 0862/3485] [Windows] Update Finalize-VM (#4791) --- images/win/scripts/Installers/Finalize-VM.ps1 | 31 +++++++++---------- images/win/windows2016.json | 1 + images/win/windows2019.json | 1 + images/win/windows2022.json | 1 + 4 files changed, 18 insertions(+), 16 deletions(-) diff --git a/images/win/scripts/Installers/Finalize-VM.ps1 b/images/win/scripts/Installers/Finalize-VM.ps1 index 8e29dbe20949..7ff69f898614 100644 --- a/images/win/scripts/Installers/Finalize-VM.ps1 +++ b/images/win/scripts/Installers/Finalize-VM.ps1 @@ -8,33 +8,32 @@ Dism.exe /online /Cleanup-Image /StartComponentCleanup /ResetBase Write-Host "Clean up various directories" @( - "C:\\Recovery", - "$env:windir\\logs", - "$env:windir\\winsxs\\manifestcache", - "$env:windir\\Temp", + "$env:SystemDrive\Recovery", + "$env:SystemRoot\logs", + "$env:SystemRoot\winsxs\manifestcache", + "$env:SystemRoot\Temp", "$env:TEMP" ) | ForEach-Object { if (Test-Path $_) { Write-Host "Removing $_" - try { - Takeown /d Y /R /f $_ | Out-Null - Icacls $_ /GRANT:r administrators:F /T /c /q 2>&1 | Out-Null - Remove-Item $_ -Recurse -Force | Out-Null - } - catch { $global:error.RemoveAt(0) } + cmd /c "takeown /d Y /R /f $_ 2>&1" | Out-Null + cmd /c "icacls $_ /grant:r administrators:f /t /c /q 2>&1" | Out-Null + Remove-Item $_ -Recurse -Force -ErrorAction SilentlyContinue | Out-Null } } -$winInstallDir = "$env:windir\\Installer" -New-Item -Path $winInstallDir -ItemType Directory -Force +$winInstallDir = "$env:SystemRoot\Installer" +New-Item -Path $winInstallDir -ItemType Directory -Force | Out-Null # Remove AllUsersAllHosts profile -Remove-Item $profile.AllUsersAllHosts -Force +Remove-Item $profile.AllUsersAllHosts -Force -ErrorAction SilentlyContinue | Out-Null # Clean yarn and npm cache -yarn cache clean -npm cache clean --force +cmd /c "yarn cache clean 2>&1" | Out-Null +cmd /c "npm cache clean --force 2>&1" | Out-Null # allow msi to write to temp folder # see https://github.com/actions/virtual-environments/issues/1704 -icacls "C:\Windows\Temp" /q /c /t /grant Users:F /T +cmd /c "icacls $env:SystemRoot\Temp /grant Users:f /t /c /q 2>&1" | Out-Null + +Write-Host "Finalize-VM.ps1 - completed" diff --git a/images/win/windows2016.json b/images/win/windows2016.json index 56b3217066c3..e2aaa2d66a37 100644 --- a/images/win/windows2016.json +++ b/images/win/windows2016.json @@ -295,6 +295,7 @@ }, { "type": "powershell", + "skip_clean": true, "scripts": [ "{{ template_dir }}/scripts/Installers/Finalize-VM.ps1" ] diff --git a/images/win/windows2019.json b/images/win/windows2019.json index 09797cdb32fb..2efe458dc7be 100644 --- a/images/win/windows2019.json +++ b/images/win/windows2019.json @@ -307,6 +307,7 @@ }, { "type": "powershell", + "skip_clean": true, "scripts": [ "{{ template_dir }}/scripts/Installers/Run-NGen.ps1", "{{ template_dir }}/scripts/Installers/Finalize-VM.ps1" diff --git a/images/win/windows2022.json b/images/win/windows2022.json index 251507985f3a..8e0346203d80 100644 --- a/images/win/windows2022.json +++ b/images/win/windows2022.json @@ -294,6 +294,7 @@ }, { "type": "powershell", + "skip_clean": true, "scripts": [ "{{ template_dir }}/scripts/Installers/Run-NGen.ps1", "{{ template_dir }}/scripts/Installers/Finalize-VM.ps1" From 5331de8e37b286a43cc1f4d1729347a490270361 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 22 Dec 2021 14:44:04 +0000 Subject: [PATCH 0863/3485] Windows Server 2016 (20211219 update) (#4779) * Updating readme file for win16 version 20211219.1 * Update rust and rust tools versions There is an issue with the documentation, fixed in https://github.com/actions/virtual-environments/pull/4774 Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2016-Readme.md | 62 ++++++++++++++++---------------- 1 file changed, 32 insertions(+), 30 deletions(-) diff --git a/images/win/Windows2016-Readme.md b/images/win/Windows2016-Readme.md index 25c533acac9f..b049a6aff50e 100644 --- a/images/win/Windows2016-Readme.md +++ b/images/win/Windows2016-Readme.md @@ -1,21 +1,22 @@ | Announcements | |-| +| [[All OSs] Python version 3.5 will be removed from the images on January 24, 2022](https://github.com/actions/virtual-environments/issues/4744) | | [Windows-2016 environment will be removed on March 15, 2022](https://github.com/actions/virtual-environments/issues/4312) | *** # Microsoft Windows Server 2016 Datacenter -- OS Version: 10.0.14393 Build 4770 -- Image Version: 20211212.1 +- OS Version: 10.0.14393 Build 4825 +- Image Version: 20211219.1 ## Installed Software ### Language and Runtime - Bash 4.4.23(1)-release - Go 1.15.15 - Julia 1.7.0 -- Kotlin 1.6.0 +- Kotlin 1.6.10 - LLVM 13.0.0 - Node 16.13.1 - Perl 5.32.1 -- PHP 8.1.0 +- PHP 8.1.1 - Python 3.7.9 - Ruby 2.5.9p229 @@ -29,7 +30,7 @@ - pip 21.3.1 (python 3.7) - Pipx 0.16.4 - RubyGems 2.7.6.3 -- Vcpkg (build from master \<48bba4f9c>) +- Vcpkg (build from master \<50fd3d995>) - Yarn 1.22.17 #### Environment variables @@ -42,7 +43,7 @@ - Ant 1.10.12 - Gradle 7.3 - Maven 3.8.4 -- sbt 1.5.6 +- sbt 1.5.7 ### Tools - 7zip 21.06 @@ -50,7 +51,7 @@ - azcopy 10.13.0 - Bazel 4.2.2 - Bazelisk 1.11.0 -- Bicep 0.4.1008 +- Bicep 0.4.1124 - Cabal 3.6.2.0 - CMake 3.22.1 - CodeQL Action Bundle 2.7.3 @@ -60,20 +61,21 @@ - ghc 9.2.1 - Git 2.34.1 - Git LFS 3.0.2 -- Google Cloud SDK 366.0.0 +- Google Cloud SDK 367.0.0 - InnoSetup 6.2.0 - jq 1.6 - Kind 0.11.1 -- Kubectl 1.23.0 +- Kubectl 1.23.1 - Mercurial 5.0 - Mingw-w64 8.1.0 - Newman 5.3.0 -- NSIS v3.06.1 +- NSIS v3.08 - OpenSSL 1.1.1 - Packer 1.7.8 -- Pulumi v3.19.0 +- Parcel 2.0.1 +- Pulumi v3.20.0 - R 4.1.2 -- Service Fabric SDK 8.2.1235.9590 +- Service Fabric SDK 8.2.1363.9590 - Stack 2.7.3 - Subversion (SVN) 1.14.1 - Swig 4.0.2 @@ -84,7 +86,7 @@ - zstd 1.5.0 ### CLI Tools -- Alibaba Cloud CLI 3.0.100 +- Alibaba Cloud CLI 3.0.102 - AWS CLI 2.4.6 - AWS SAM CLI 1.36.0 - AWS Session Manager CLI 1.2.279.0 @@ -109,11 +111,11 @@ - Rustfmt 1.4.37 ### Browsers and webdrivers -- Google Chrome 96.0.4664.93 +- Google Chrome 96.0.4664.110 - Chrome Driver 96.0.4664.45 -- Microsoft Edge 96.0.1054.53 -- Microsoft Edge Driver 96.0.1054.53 -- Mozilla Firefox 95.0 +- Microsoft Edge 96.0.1054.62 +- Microsoft Edge Driver 96.0.1054.62 +- Mozilla Firefox 95.0.2 - Gecko Driver 0.30.0 - IE Driver 3.150.1.1 - Selenium server 4.1.0 @@ -161,7 +163,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Node | Version | Architecture | | ------- | ------------ | -| 12.22.7 | x64 | +| 12.22.8 | x64 | | 14.18.2 | x64 | | 16.13.1 | x64 | @@ -174,7 +176,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | 3.7.9 (Default) | x64, x86 | | 3.8.10 | x64, x86 | | 3.9.9 | x64, x86 | -| 3.10.0 | x64 | +| 3.10.1 | x64 | #### Ruby | Version | Architecture | @@ -226,7 +228,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Visual Studio Enterprise 2017 | Name | Version | Path | | ----------------------------- | --------------- | -------------------------------------------------------------- | -| Visual Studio Enterprise 2017 | 15.9.28307.1745 | C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise | +| Visual Studio Enterprise 2017 | 15.9.28307.1759 | C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise | #### Workloads, components and extensions: | Package | Version | @@ -461,7 +463,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Workload.NetWeb | 15.9.28307.1684 | | Microsoft.VisualStudio.Workload.Node | 15.9.28107.0 | | Microsoft.VisualStudio.Workload.Office | 15.9.28307.1684 | -| Microsoft.VisualStudio.Workload.Python | 15.9.28307.1500 | +| Microsoft.VisualStudio.Workload.Python | 15.9.28307.1758 | | Microsoft.VisualStudio.Workload.Universal | 15.9.28307.1684 | | Microsoft.VisualStudio.Workload.VisualStudioExtension | 15.7.27625.0 | | Microsoft.VisualStudio.Workload.WebCrossPlat | 15.9.28307.341 | @@ -492,20 +494,20 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### .NET Core SDK `Location C:\Program Files\dotnet\sdk` -- 1.1.14 2.1.302 2.1.403 2.1.526 2.1.617 2.1.701 2.1.818 3.1.120 3.1.202 3.1.302 3.1.415 5.0.104 5.0.209 5.0.303 5.0.403 +- 1.1.14 2.1.302 2.1.403 2.1.526 2.1.617 2.1.701 2.1.818 3.1.120 3.1.202 3.1.302 3.1.416 5.0.104 5.0.210 5.0.303 5.0.404 ### .NET Core Runtime `Location: C:\Program Files\dotnet\shared\Microsoft.AspNetCore.All` - 2.1.2 2.1.5 2.1.12 2.1.24 2.1.30 `Location: C:\Program Files\dotnet\shared\Microsoft.AspNetCore.App` -- 2.1.2 2.1.5 2.1.12 2.1.24 2.1.30 3.1.4 3.1.6 3.1.20 3.1.21 5.0.4 5.0.9 5.0.12 +- 2.1.2 2.1.5 2.1.12 2.1.24 2.1.30 3.1.4 3.1.6 3.1.20 3.1.22 5.0.4 5.0.9 5.0.13 `Location: C:\Program Files\dotnet\shared\Microsoft.NETCore.App` -- 1.0.16 1.1.13 2.1.2 2.1.5 2.1.12 2.1.24 2.1.30 3.1.4 3.1.6 3.1.20 3.1.21 5.0.4 5.0.9 5.0.12 +- 1.0.16 1.1.13 2.1.2 2.1.5 2.1.12 2.1.24 2.1.30 3.1.4 3.1.6 3.1.20 3.1.22 5.0.4 5.0.9 5.0.13 `Location: C:\Program Files\dotnet\shared\Microsoft.WindowsDesktop.App` -- 3.1.4 3.1.6 3.1.20 3.1.21 5.0.4 5.0.9 5.0.12 +- 3.1.4 3.1.6 3.1.20 3.1.22 5.0.4 5.0.9 5.0.13 ### .NET Framework `Type: Developer Pack` @@ -513,7 +515,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 4.6.1 4.6.2 4.7 4.7.1 4.7.2 4.8 ### PowerShell Tools -- PowerShell 7.2.0 +- PowerShell 7.2.1 #### Azure Powershell Modules | Module | Version | Path | @@ -569,10 +571,10 @@ All other versions are saved but not installed. ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2016 | sha256:04596195c24adb48a59ecfdfaa3fcefff5563e4cdb6d22cadfb588d4525a5a3f | 2021-11-09 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2016 | sha256:b77c157fca59b9a93b6ed1bf34f7c224497184546d5e63953fb08d9769f73123 | 2021-11-09 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2016 | sha256:9c649d68d85741479778a3e7006ac002fe47ded9fccd01be5b03ced5e0d23e27 | 2021-11-09 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2016 | sha256:4176e79680e8f3e20bf4b15edb5fb38643045ed58a943fa92be08fd961895e81 | 2021-12-14 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2016 | sha256:02e765bcfd4119f165d465519f17ac2b7ac034bdbb724a9bbb873fcdd3dcdd2c | 2021-12-14 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2016 | sha256:db6a24255fb8212eac322d43f3b1a38380a25015bfbacfe4cad1e80f5b78dbc7 | 2021-12-14 | | mcr.microsoft.com/windows/nanoserver:10.0.14393.953 | sha256:fc60bd5ae0e61b334ce1cf1bcbf20c10c36b4c5482a01da319c9c989f9e6e268 | 2017-03-08 | -| mcr.microsoft.com/windows/servercore:ltsc2016 | sha256:0a54ee92e51c03f30b6902df63fb88be973c8d04a40c456058ab6acbdd92d103 | 2021-11-03 | +| mcr.microsoft.com/windows/servercore:ltsc2016 | sha256:1f6d7cef5d9d46603bb02d8e8c5df131ed3da729f2d6d2055cdb6594fc1c1c1a | 2021-12-08 | From 4c3e1eb41f0a6e38a6afdf5b68d7804b5a94d3b9 Mon Sep 17 00:00:00 2001 From: Mark Dorison <mark@chromatichq.com> Date: Wed, 22 Dec 2021 12:18:45 -0500 Subject: [PATCH 0864/3485] Updated broken links to Ubuntu READMEs. (#4795) --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index fe6239d5d242..2ed84c2741cc 100644 --- a/README.md +++ b/README.md @@ -46,8 +46,8 @@ we pin the tool to specific version(s). * **Regular Weekly Rhythm** can be followed by watching [Releases](https://github.com/actions/virtual-environments/releases). Pre-release is created when deployment is started. As soon as deployment is finished, it is converted to release. You can also track upcoming changes using the [awaiting-deployment](https://github.com/actions/virtual-environments/labels/awaiting-deployment) label. -[ubuntu-20.04]: https://github.com/actions/virtual-environments/blob/main/images/linux/Ubuntu2004-README.md -[ubuntu-18.04]: https://github.com/actions/virtual-environments/blob/main/images/linux/Ubuntu1804-README.md +[ubuntu-20.04]: https://github.com/actions/virtual-environments/blob/main/images/linux/Ubuntu2004-Readme.md +[ubuntu-18.04]: https://github.com/actions/virtual-environments/blob/main/images/linux/Ubuntu1804-Readme.md [windows-2022]: https://github.com/actions/virtual-environments/blob/main/images/win/Windows2022-Readme.md [windows-2019]: https://github.com/actions/virtual-environments/blob/main/images/win/Windows2019-Readme.md [windows-2016]: https://github.com/actions/virtual-environments/blob/main/images/win/Windows2016-Readme.md From 20705eae3581b34ff79b00795e85a16ce422cb2e Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Wed, 22 Dec 2021 21:24:04 +0300 Subject: [PATCH 0865/3485] Change capitalization for Readme name in CI ymls (#4796) --- images.CI/linux-and-win/azure-pipelines/ubuntu1804.yml | 2 +- images.CI/linux-and-win/azure-pipelines/ubuntu2004.yml | 2 +- images/linux/scripts/installers/preimagedata.sh | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/images.CI/linux-and-win/azure-pipelines/ubuntu1804.yml b/images.CI/linux-and-win/azure-pipelines/ubuntu1804.yml index e7c303fdf447..44823c63fe7e 100644 --- a/images.CI/linux-and-win/azure-pipelines/ubuntu1804.yml +++ b/images.CI/linux-and-win/azure-pipelines/ubuntu1804.yml @@ -17,4 +17,4 @@ jobs: - template: image-generation.yml parameters: image_type: ubuntu1804 - image_readme_name: Ubuntu1804-README.md \ No newline at end of file + image_readme_name: Ubuntu1804-Readme.md \ No newline at end of file diff --git a/images.CI/linux-and-win/azure-pipelines/ubuntu2004.yml b/images.CI/linux-and-win/azure-pipelines/ubuntu2004.yml index f46e717ee86d..4bf78c183957 100644 --- a/images.CI/linux-and-win/azure-pipelines/ubuntu2004.yml +++ b/images.CI/linux-and-win/azure-pipelines/ubuntu2004.yml @@ -17,4 +17,4 @@ jobs: - template: image-generation.yml parameters: image_type: ubuntu2004 - image_readme_name: Ubuntu2004-README.md \ No newline at end of file + image_readme_name: Ubuntu2004-Readme.md \ No newline at end of file diff --git a/images/linux/scripts/installers/preimagedata.sh b/images/linux/scripts/installers/preimagedata.sh index 747f229614c7..c494bed97d51 100644 --- a/images/linux/scripts/installers/preimagedata.sh +++ b/images/linux/scripts/installers/preimagedata.sh @@ -7,12 +7,12 @@ image_label="ubuntu-$(lsb_release -rs)" github_url="https://github.com/actions/virtual-environments/blob" if [[ "$image_label" =~ "ubuntu-20" ]]; then - software_url="${github_url}/ubuntu20/${image_version}/images/linux/Ubuntu2004-README.md" + software_url="${github_url}/ubuntu20/${image_version}/images/linux/Ubuntu2004-Readme.md" releaseUrl="https://github.com/actions/virtual-environments/releases/tag/ubuntu20%2F${image_version}" fi if [[ "$image_label" =~ "ubuntu-18" ]]; then - software_url="${github_url}/ubuntu18/${image_version}/images/linux/Ubuntu1804-README.md" + software_url="${github_url}/ubuntu18/${image_version}/images/linux/Ubuntu1804-Readme.md" releaseUrl="https://github.com/actions/virtual-environments/releases/tag/ubuntu18%2F${image_version}" fi From 99eda5a423543bb428e7cb04f4fff2d5e8956b00 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 22 Dec 2021 20:51:08 +0000 Subject: [PATCH 0866/3485] Windows Server 2019 (20211219 update) (#4776) * Updating readme file for win19 version 20211219.1 * Update rust and rust tools versions There is an issue with the documentation, fixed in https://github.com/actions/virtual-environments/pull/4774 Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2019-Readme.md | 72 ++++++++++++++++---------------- 1 file changed, 37 insertions(+), 35 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index ecd62f9009d3..cb13cd4df07a 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -1,10 +1,11 @@ | Announcements | |-| +| [[All OSs] Python version 3.5 will be removed from the images on January 24, 2022](https://github.com/actions/virtual-environments/issues/4744) | | [Windows-2016 environment will be removed on March 15, 2022](https://github.com/actions/virtual-environments/issues/4312) | *** # Microsoft Windows Server 2019 Datacenter -- OS Version: 10.0.17763 Build 2300 -- Image Version: 20211212.1 +- OS Version: 10.0.17763 Build 2366 +- Image Version: 20211219.1 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -14,11 +15,11 @@ - Bash 4.4.23(1)-release - Go 1.15.15 - Julia 1.7.0 -- Kotlin 1.6.0 +- Kotlin 1.6.10 - LLVM 13.0.0 - Node 16.13.1 - Perl 5.32.1 -- PHP 8.1.0 +- PHP 8.1.1 - Python 3.7.9 - Ruby 2.5.9p229 @@ -32,7 +33,7 @@ - pip 21.3.1 (python 3.7) - Pipx 0.16.4 - RubyGems 2.7.6.3 -- Vcpkg (build from master \<48bba4f9c>) +- Vcpkg (build from master \<50fd3d995>) - Yarn 1.22.17 #### Environment variables @@ -45,7 +46,7 @@ - Ant 1.10.12 - Gradle 7.3 - Maven 3.8.4 -- sbt 1.5.6 +- sbt 1.5.7 ### Tools - 7zip 21.06 @@ -53,7 +54,7 @@ - azcopy 10.13.0 - Bazel 4.2.2 - Bazelisk 1.11.0 -- Bicep 0.4.1008 +- Bicep 0.4.1124 - Cabal 3.6.2.0 - CMake 3.22.1 - CodeQL Action Bundle 2.7.3 @@ -63,20 +64,21 @@ - ghc 9.2.1 - Git 2.34.1 - Git LFS 3.0.2 -- Google Cloud SDK 366.0.0 +- Google Cloud SDK 367.0.0 - InnoSetup 6.2.0 - jq 1.6 - Kind 0.11.1 -- Kubectl 1.23.0 +- Kubectl 1.23.1 - Mercurial 5.0 - Mingw-w64 8.1.0 - Newman 5.3.0 -- NSIS v3.06.1 +- NSIS v3.08 - OpenSSL 1.1.1 - Packer 1.7.8 -- Pulumi v3.19.0 +- Parcel 2.0.1 +- Pulumi v3.20.0 - R 4.1.2 -- Service Fabric SDK 8.2.1235.9590 +- Service Fabric SDK 8.2.1363.9590 - Stack 2.7.3 - Subversion (SVN) 1.14.1 - Swig 4.0.2 @@ -87,7 +89,7 @@ - zstd 1.5.0 ### CLI Tools -- Alibaba Cloud CLI 3.0.100 +- Alibaba Cloud CLI 3.0.102 - AWS CLI 2.4.6 - AWS SAM CLI 1.36.0 - AWS Session Manager CLI 1.2.279.0 @@ -112,11 +114,11 @@ - Rustfmt 1.4.37 ### Browsers and webdrivers -- Google Chrome 96.0.4664.93 +- Google Chrome 96.0.4664.110 - Chrome Driver 96.0.4664.45 -- Microsoft Edge 96.0.1054.53 -- Microsoft Edge Driver 96.0.1054.53 -- Mozilla Firefox 95.0 +- Microsoft Edge 96.0.1054.62 +- Microsoft Edge Driver 96.0.1054.62 +- Mozilla Firefox 95.0.2 - Gecko Driver 0.30.0 - IE Driver 3.150.1.1 - Selenium server 4.1.0 @@ -168,7 +170,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Node | Version | Architecture | | ------- | ------------ | -| 12.22.7 | x64 | +| 12.22.8 | x64 | | 14.18.2 | x64 | | 16.13.1 | x64 | @@ -181,7 +183,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | 3.7.9 (Default) | x64, x86 | | 3.8.10 | x64, x86 | | 3.9.9 | x64, x86 | -| 3.10.0 | x64, x86 | +| 3.10.1 | x64, x86 | #### Ruby | Version | Architecture | @@ -233,12 +235,12 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Visual Studio Enterprise 2019 | Name | Version | Path | | ----------------------------- | --------------- | -------------------------------------------------------------- | -| Visual Studio Enterprise 2019 | 16.11.31911.196 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | +| Visual Studio Enterprise 2019 | 16.11.32002.261 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | #### Workloads, components and extensions: | Package | Version | | ------------------------------------------------------------------------- | --------------- | -| Component.Android.NDK.R16B | 16.11.31910.99 | +| Component.Android.NDK.R16B | 16.11.32001.129 | | Component.Android.SDK25.Private | 16.0.28625.61 | | Component.Android.SDK30 | 16.10.31205.252 | | Component.Ant | 1.9.3.8 | @@ -293,9 +295,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.Net.ComponentGroup.DevelopmentPrerequisites | 16.3.29207.166 | | Microsoft.Net.ComponentGroup.TargetingPacks.Common | 16.0.28516.191 | | Microsoft.NetCore.Component.DevelopmentTools | 16.10.31303.231 | -| Microsoft.NetCore.Component.Runtime.3.1 | 16.11.31828.110 | -| Microsoft.NetCore.Component.Runtime.5.0 | 16.11.31828.110 | -| Microsoft.NetCore.Component.SDK | 16.11.31828.110 | +| Microsoft.NetCore.Component.Runtime.3.1 | 16.11.32002.110 | +| Microsoft.NetCore.Component.Runtime.5.0 | 16.11.32002.110 | +| Microsoft.NetCore.Component.SDK | 16.11.32002.110 | | Microsoft.NetCore.Component.Web | 16.10.31303.231 | | Microsoft.VisualStudio.Component.AppInsights.Tools | 16.5.29515.121 | | Microsoft.VisualStudio.Component.AspNet45 | 16.10.31205.252 | @@ -455,7 +457,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Workload.NetWeb | 16.10.31303.231 | | Microsoft.VisualStudio.Workload.Node | 16.10.31205.180 | | Microsoft.VisualStudio.Workload.Office | 16.10.31205.180 | -| Microsoft.VisualStudio.Workload.Python | 16.10.31303.231 | +| Microsoft.VisualStudio.Workload.Python | 16.11.32001.129 | | Microsoft.VisualStudio.Workload.Universal | 16.11.31727.170 | | Microsoft.VisualStudio.Workload.VisualStudioExtension | 16.10.31205.180 | | ms-biztalk.BizTalk | 3.13.2.0 | @@ -488,20 +490,20 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### .NET Core SDK `Location C:\Program Files\dotnet\sdk` -- 2.1.302 2.1.403 2.1.526 2.1.617 2.1.701 2.1.818 3.1.120 3.1.202 3.1.302 3.1.415 5.0.104 5.0.209 5.0.303 5.0.403 +- 2.1.302 2.1.403 2.1.526 2.1.617 2.1.701 2.1.818 3.1.120 3.1.202 3.1.302 3.1.416 5.0.104 5.0.210 5.0.303 5.0.404 ### .NET Core Runtime `Location: C:\Program Files\dotnet\shared\Microsoft.AspNetCore.All` - 2.1.2 2.1.5 2.1.12 2.1.24 2.1.30 `Location: C:\Program Files\dotnet\shared\Microsoft.AspNetCore.App` -- 2.1.2 2.1.5 2.1.12 2.1.24 2.1.30 3.1.4 3.1.6 3.1.20 3.1.21 5.0.4 5.0.9 5.0.12 +- 2.1.2 2.1.5 2.1.12 2.1.24 2.1.30 3.1.4 3.1.6 3.1.20 3.1.22 5.0.4 5.0.9 5.0.13 `Location: C:\Program Files\dotnet\shared\Microsoft.NETCore.App` -- 2.1.2 2.1.5 2.1.12 2.1.24 2.1.30 3.1.4 3.1.6 3.1.20 3.1.21 5.0.4 5.0.9 5.0.12 +- 2.1.2 2.1.5 2.1.12 2.1.24 2.1.30 3.1.4 3.1.6 3.1.20 3.1.22 5.0.4 5.0.9 5.0.13 `Location: C:\Program Files\dotnet\shared\Microsoft.WindowsDesktop.App` -- 3.1.4 3.1.6 3.1.20 3.1.21 5.0.4 5.0.9 5.0.12 +- 3.1.4 3.1.6 3.1.20 3.1.22 5.0.4 5.0.9 5.0.13 ### .NET Framework `Type: Developer Pack` @@ -509,7 +511,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 4.7.2 4.8 ### PowerShell Tools -- PowerShell 7.2.0 +- PowerShell 7.2.1 #### Azure Powershell Modules | Module | Version | Path | @@ -565,10 +567,10 @@ All other versions are saved but not installed. ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:a58fa6b269980877f4c5681df79c816bbe2b220b84819224b1445d13a8b3b15e | 2021-11-09 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:d7f06d8eb2e6f45b20d293a5a5a48611a26bf6eac444e6c3284f04edc1ab6b9e | 2021-11-09 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:f1915874869d31d4ba9002478809248b7661937d28a01156b12e4c72558ec8f2 | 2021-11-09 | -| mcr.microsoft.com/windows/nanoserver:1809 | sha256:3c0ca16693dfc1252120cb6066ddfccf53b9bbce4523bdb7c7fb3f55dd86f33f | 2021-11-04 | -| mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:bfa356b928c9977bf2c03d536e251eda8879debf42d884771cb855313a6a5da7 | 2021-11-04 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:0fbc7569a9acf9c18dbbfed30a223a6c9dc1d6aa3f7249ee830ce5de4d918e0a | 2021-12-14 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:a2b50c6addd83abb16c9ab8a8c31de983e1646f16306bb33dc8d6a8f5b779c4a | 2021-12-14 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:f983e03922d3686cd04467130cdeb731aaae23d6eaf237c0fa8da38e69931eab | 2021-12-14 | +| mcr.microsoft.com/windows/nanoserver:1809 | sha256:e2ab5e142f95316001aae073e28ace8a8315a79c33afd510ca2774d1b0764573 | 2021-12-07 | +| mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:50a88017fa694dd52cb1644a6d204f5305f78cce356f588dae0be983485065b2 | 2021-12-07 | From 1e6b55a4843db32555eb50f13ca392027eb9b7ab Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 22 Dec 2021 22:14:10 +0000 Subject: [PATCH 0867/3485] Windows Server 2022 (20211219 update) (#4773) * Updating readme file for win22 version 20211219.1 * Update rust and rust tools versions There is an issue with the documentation, fixed in https://github.com/actions/virtual-environments/pull/4774 Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2022-Readme.md | 73 +++++++++++++++++--------------- 1 file changed, 39 insertions(+), 34 deletions(-) diff --git a/images/win/Windows2022-Readme.md b/images/win/Windows2022-Readme.md index a01ce696b8e5..a970b4495dc8 100644 --- a/images/win/Windows2022-Readme.md +++ b/images/win/Windows2022-Readme.md @@ -1,10 +1,11 @@ | Announcements | |-| +| [[All OSs] Python version 3.5 will be removed from the images on January 24, 2022](https://github.com/actions/virtual-environments/issues/4744) | | [Windows-2016 environment will be removed on March 15, 2022](https://github.com/actions/virtual-environments/issues/4312) | *** # Microsoft Windows Server 2022 Datacenter -- OS Version: 10.0.20348 Build 350 -- Image Version: 20211212.1 +- OS Version: 10.0.20348 Build 405 +- Image Version: 20211219.1 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -14,10 +15,10 @@ - Bash 4.4.23(1)-release - Go 1.16.12 - Julia 1.7.0 -- Kotlin 1.6.0 +- Kotlin 1.6.10 - LLVM 13.0.0 - Node 16.13.1 -- PHP 8.1.0 +- PHP 8.1.1 - Python 3.9.9 - Ruby 3.0.3p157 @@ -31,7 +32,7 @@ - pip 21.3.1 (python 3.9) - Pipx 0.16.4 - RubyGems 3.2.32 -- Vcpkg (build from master \<48bba4f9c>) +- Vcpkg (build from master \<50fd3d995>) - Yarn 1.22.17 #### Environment variables @@ -43,7 +44,7 @@ - Ant 1.10.12 - Gradle 7.3 - Maven 3.8.4 -- sbt 1.5.6 +- sbt 1.5.7 ### Tools - 7zip 21.06 @@ -51,7 +52,7 @@ - azcopy 10.13.0 - Bazel 4.2.2 - Bazelisk 1.11.0 -- Bicep 0.4.1008 +- Bicep 0.4.1124 - Cabal 3.6.2.0 - CMake 3.22.1 - CodeQL Action Bundle 2.7.3 @@ -63,14 +64,14 @@ - Git LFS 3.0.2 - jq 1.6 - Kind 0.11.1 -- Kubectl 1.23.0 +- Kubectl 1.23.1 - Mercurial 5.0 - Mingw-w64 8.1.0 - Newman 5.3.0 -- NSIS v3.06.1 +- NSIS v3.08 - OpenSSL 1.1.1 - Packer 1.7.8 -- Pulumi v3.19.0 +- Pulumi v3.20.0 - R 4.1.2 - Stack 2.7.3 - Subversion (SVN) 1.14.1 @@ -82,7 +83,7 @@ - zstd 1.5.0 ### CLI Tools -- Alibaba Cloud CLI 3.0.100 +- Alibaba Cloud CLI 3.0.102 - AWS CLI 2.4.6 - AWS SAM CLI 1.36.0 - AWS Session Manager CLI 1.2.279.0 @@ -106,11 +107,11 @@ - Rustfmt 1.4.37 ### Browsers and webdrivers -- Google Chrome 96.0.4664.93 +- Google Chrome 96.0.4664.110 - Chrome Driver 96.0.4664.45 -- Microsoft Edge 96.0.1054.53 -- Microsoft Edge Driver 96.0.1054.53 -- Mozilla Firefox 95.0 +- Microsoft Edge 96.0.1054.62 +- Microsoft Edge Driver 96.0.1054.62 +- Mozilla Firefox 95.0.2 - Gecko Driver 0.30.0 - IE Driver 3.150.1.1 - Selenium server 4.1.0 @@ -158,7 +159,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Node | Version | Architecture | | ------- | ------------ | -| 12.22.7 | x64 | +| 12.22.8 | x64 | | 14.18.2 | x64 | | 16.13.1 | x64 | @@ -168,7 +169,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | 3.7.9 | x64, x86 | | 3.8.10 | x64, x86 | | 3.9.9 (Default) | x64, x86 | -| 3.10.0 | x64, x86 | +| 3.10.1 | x64, x86 | #### Ruby | Version | Architecture | @@ -216,7 +217,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Visual Studio Enterprise 2022 | Name | Version | Path | | ----------------------------- | -------------- | -------------------------------------------------------- | -| Visual Studio Enterprise 2022 | 17.0.31919.166 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | +| Visual Studio Enterprise 2022 | 17.0.32014.148 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | #### Workloads, components and extensions: | Package | Version | @@ -237,6 +238,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Component.UnityEngine.x64 | 17.0.31804.368 | | Component.Unreal | 17.0.31804.368 | | Component.Unreal.Android | 17.0.31804.368 | +| Component.VSInstallerProjects2022 | 0.1.0 | | Component.Xamarin | 17.0.31804.368 | | Component.Xamarin.RemotedSimulator | 17.0.31807.282 | | Microsoft.Component.Azure.DataLake.Tools | 17.0.31805.14 | @@ -258,11 +260,11 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.Net.ComponentGroup.4.8.DeveloperTools | 17.0.31804.368 | | Microsoft.Net.ComponentGroup.DevelopmentPrerequisites | 17.0.31804.368 | | Microsoft.Net.ComponentGroup.TargetingPacks.Common | 17.0.31804.368 | -| microsoft.net.runtime.mono.tooling | 6.0.21.52210 | +| microsoft.net.runtime.mono.tooling | 6.0.121.56705 | | microsoft.net.sdk.emscripten | 6.0.5.2003 | | Microsoft.NetCore.Component.DevelopmentTools | 17.0.31804.368 | -| Microsoft.NetCore.Component.Runtime.6.0 | 17.0.31902.203 | -| Microsoft.NetCore.Component.SDK | 17.0.31912.81 | +| Microsoft.NetCore.Component.Runtime.6.0 | 17.0.32002.159 | +| Microsoft.NetCore.Component.SDK | 17.0.32002.159 | | Microsoft.NetCore.Component.Web | 17.0.31804.368 | | Microsoft.VisualStudio.Component.AppInsights.Tools | 17.0.31804.368 | | Microsoft.VisualStudio.Component.AspNet | 17.0.31804.368 | @@ -294,7 +296,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Component.IISExpress | 17.0.31804.368 | | Microsoft.VisualStudio.Component.IntelliCode | 17.0.31821.396 | | Microsoft.VisualStudio.Component.IntelliTrace.FrontEnd | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.JavaScript.Diagnostics | 17.0.31815.197 | +| Microsoft.VisualStudio.Component.JavaScript.Diagnostics | 17.0.32001.416 | | Microsoft.VisualStudio.Component.JavaScript.TypeScript | 17.0.31804.368 | | Microsoft.VisualStudio.Component.LinqToSql | 17.0.31804.368 | | Microsoft.VisualStudio.Component.LiveUnitTesting | 17.0.31804.368 | @@ -317,10 +319,11 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Component.SQL.SSDT | 17.0.31804.368 | | Microsoft.VisualStudio.Component.TeamOffice | 17.0.31804.368 | | Microsoft.VisualStudio.Component.TestTools.CodedUITest | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.TestTools.WebLoadTest | 17.0.31815.197 | +| Microsoft.VisualStudio.Component.TestTools.WebLoadTest | 17.0.32001.416 | | Microsoft.VisualStudio.Component.TextTemplating | 17.0.31804.368 | | Microsoft.VisualStudio.Component.TypeScript.TSServer | 17.0.31804.368 | | Microsoft.VisualStudio.Component.Unity | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.UWP.VC.ARM64 | 17.0.31804.368 | | Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM | 17.0.31804.368 | | Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM.Spectre | 17.0.31804.368 | | Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM64 | 17.0.31804.368 | @@ -376,6 +379,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.ComponentGroup.AzureFunctions | 17.0.31804.368 | | Microsoft.VisualStudio.ComponentGroup.MSIX.Packaging | 17.0.31806.525 | | Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core | 17.0.31804.368 | +| Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Llvm.Clang | 17.0.31804.368 | | Microsoft.VisualStudio.ComponentGroup.UWP.NetCoreAndStandard | 17.0.31804.368 | | Microsoft.VisualStudio.ComponentGroup.UWP.Support | 17.0.31804.368 | | Microsoft.VisualStudio.ComponentGroup.UWP.Xamarin | 17.0.31804.368 | @@ -402,7 +406,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Workload.Python | 17.0.31919.74 | | Microsoft.VisualStudio.Workload.Universal | 17.0.31804.368 | | Microsoft.VisualStudio.Workload.VisualStudioExtension | 17.0.31804.368 | -| wasm.tools | 6.0.21.52210 | +| wasm.tools | 6.0.121.56705 | +| VisualStudioClient.MicrosoftVisualStudio2022InstallerProjects | 0.1.0 | #### Microsoft Visual C++: | Name | Architecture | Version | @@ -418,17 +423,17 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### .NET Core SDK `Location C:\Program Files\dotnet\sdk` -- 3.1.120 3.1.202 3.1.302 3.1.415 5.0.104 5.0.209 5.0.303 5.0.403 6.0.100 +- 3.1.120 3.1.202 3.1.302 3.1.416 5.0.104 5.0.210 5.0.303 5.0.404 6.0.101 ### .NET Core Runtime `Location: C:\Program Files\dotnet\shared\Microsoft.AspNetCore.App` -- 3.1.4 3.1.6 3.1.20 3.1.21 5.0.4 5.0.9 5.0.11 5.0.12 6.0.0 +- 3.1.4 3.1.6 3.1.20 3.1.21 3.1.22 5.0.4 5.0.9 5.0.12 5.0.13 6.0.1 `Location: C:\Program Files\dotnet\shared\Microsoft.NETCore.App` -- 3.1.4 3.1.6 3.1.20 3.1.21 5.0.4 5.0.9 5.0.11 5.0.12 6.0.0 +- 3.1.4 3.1.6 3.1.20 3.1.21 3.1.22 5.0.4 5.0.9 5.0.12 5.0.13 6.0.1 `Location: C:\Program Files\dotnet\shared\Microsoft.WindowsDesktop.App` -- 3.1.4 3.1.6 3.1.20 3.1.21 5.0.4 5.0.9 5.0.12 6.0.0 +- 3.1.4 3.1.6 3.1.20 3.1.22 5.0.4 5.0.9 5.0.13 6.0.1 ### .NET Framework `Type: Developer Pack` @@ -436,7 +441,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 4.8 ### PowerShell Tools -- PowerShell 7.2.0 +- PowerShell 7.2.1 #### Azure Powershell Modules | Module | Version | Path | @@ -491,10 +496,10 @@ All other versions are saved but not installed. ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2022 | sha256:b6a565f5242df03ba025d250a2af06fbde85373549af885159d7e8b9e93ec615 | 2021-11-09 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2022 | sha256:c6e169c86508cd70bf81e881c7084124bb4c765cb171cb9c1508851b627efb84 | 2021-11-09 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:11db21e65550210228cf257c56fe81bd40bd99912b597d277ab869e38215bfde | 2021-11-09 | -| mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:c093aac93e3771a85832fcf27d21dc5c12751091255a79be5a05d9bfb48c6a73 | 2021-11-03 | -| mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:35b987eaca23cce6456c07adea57a155352dce50adf0539fd57e68f3af3e8e29 | 2021-11-03 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2022 | sha256:f361f9071edda48d05910f4e77f17f7bdb83f75e3f5504c70b31eb3efa784d09 | 2021-12-14 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2022 | sha256:6e9e92babd4d6ea9b1b79bb4c39b8eebff794923368b7602fdecc2fda7811855 | 2021-12-14 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:26d0f5d9c0287dd89900e8d82a59cef31d8e62dcd624227d286654ac618cc4c2 | 2021-12-14 | +| mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:802c38698f46f154711a18c4ac31b224e05159dd287e662d2a16a1ffc4be7d15 | 2021-12-08 | +| mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:1f8965b9b4e2097ac78590ba652f069eafd5b6a0a4e9e603a415d362bfb7638c | 2021-12-08 | From efcb653004918aa933167b934e29078e0b3f42bc Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Thu, 23 Dec 2021 16:23:19 +0300 Subject: [PATCH 0868/3485] [macOS] Software update week 52 (#4798) --- images/macos/toolsets/toolset-11.json | 11 +++++++++-- images/macos/toolsets/toolset-12.json | 11 +++++++++-- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index a82679ee27e1..447b044ab35f 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -17,16 +17,23 @@ "6.12.0.162" ], "ios-versions": [ - "15.2.0.17", "15.0.0.6", "14.20.0.24", "14.16.0.5", "14.14.2.5", "14.10.0.4", "14.8.0.3", "14.6.0.15", "14.4.1.3", "14.2.0.12", "14.0.0.0", "13.20.2.2" + "15.4.0.0", "15.2.0.17", "15.0.0.6", "14.20.0.24", "14.16.0.5", "14.14.2.5", "14.10.0.4", "14.8.0.3", "14.6.0.15", "14.4.1.3", "14.2.0.12", "14.0.0.0", "13.20.2.2" ], "mac-versions": [ - "8.2.0.17", "7.14.0.27", "7.10.0.5", "7.8.2.5", "7.4.0.10", "7.2.0.3", "7.0.0.15", "6.22.1.26", "6.20.2.2" + "8.4.0.0", "8.2.0.17", "7.14.0.27", "7.10.0.5", "7.8.2.5", "7.4.0.10", "7.2.0.3", "7.0.0.15", "6.22.1.26", "6.20.2.2" ], "android-versions": [ "12.0.0.3", "11.3.0.4", "11.2.2.1", "11.1.0.26", "11.0.2.0" ], "bundle-default": "6_12_10", "bundles": [ + { + "symlink": "6_12_12", + "mono":"6.12", + "ios": "15.4", + "mac": "8.4", + "android": "12.0" + }, { "symlink": "6_12_11", "mono":"6.12", diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index 67ed08d923d3..665f4c471ae3 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -13,16 +13,23 @@ "6.12.0.162" ], "ios-versions": [ - "15.2.0.17", "15.0.0.6" + "15.4.0.0", "15.2.0.17", "15.0.0.6" ], "mac-versions": [ - "8.2.0.17", "7.14.0.27" + "8.4.0.0", "8.2.0.17", "7.14.0.27" ], "android-versions": [ "12.0.0.3", "11.3.0.4" ], "bundle-default": "6_12_10", "bundles": [ + { + "symlink": "6_12_12", + "mono":"6.12", + "ios": "15.4", + "mac": "8.4", + "android": "12.0" + }, { "symlink": "6_12_11", "mono":"6.12", From d4793cf4769ef7e03d4bd8347e66b48d8fb0e0d3 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Thu, 23 Dec 2021 21:53:35 +0300 Subject: [PATCH 0869/3485] Add data about Ubuntu packages to software guidelines (#4802) --- docs/software-and-images-guidelines.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/software-and-images-guidelines.md b/docs/software-and-images-guidelines.md index 8ffbc6eae61a..3ca201c63031 100644 --- a/docs/software-and-images-guidelines.md +++ b/docs/software-and-images-guidelines.md @@ -18,7 +18,7 @@ In general, these are the guidelines we consider when deciding what to pre-insta These are the guidelines we follow in software and images supporting routine: - Tools and versions will typically be removed 6 months after they are deprecated or have reached end-of-life. - We support at least 2 latest OS versions (LTS only for Ubuntu) and initiate deprecation process for the oldest one when image usage drops below 5%. -- Most of the tools are preinstalled in the latest version only. +- The images generally contain the latest versions of packages installed except for Ubuntu LTS where we rely on the Canonical-provided repositories mostly. - Popular tools can have several versions installed side-by-side with the following strategy: | Tool name | Installation strategy | From 7518d04a3a12a7fb369179b0e77d4d89c3db9b0f Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Fri, 24 Dec 2021 10:58:19 +0300 Subject: [PATCH 0870/3485] [Windows] Stop SoftwareReport script if error (#4801) * Stop SoftwareReport script if error * Validate blank versions * Fix tables parsing --- .../SoftwareReport.Android.psm1 | 2 +- .../SoftwareReport/SoftwareReport.Common.psm1 | 25 +++++----- .../SoftwareReport.Generator.ps1 | 6 +++ .../SoftwareReport.Helpers.psm1 | 47 +++++++++++++++++++ 4 files changed, 66 insertions(+), 14 deletions(-) diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Android.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Android.psm1 index 37baf4625669..9a24791a4a0e 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Android.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Android.psm1 @@ -122,7 +122,7 @@ function Get-AndroidPlatformVersions { function Get-AndroidCommandLineToolsVersion { $commandLineTools = Get-AndroidSDKManagerPath - (& $commandLineTools --version | Out-String).Trim() -match "(?<version>^(\d+\.){1,}\d+$)" | Out-Null + (cmd /c "$commandLineTools --version 2>NUL" | Out-String).Trim() -match "(?<version>^(\d+\.){1,}\d+$)" | Out-Null $commandLineToolsVersion = $Matches.Version return $commandLineToolsVersion } diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 index 77099297f85a..68b838640895 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 @@ -26,28 +26,29 @@ function Get-RustVersion { } function Get-RustupVersion { - $version = [regex]::matches($(rustup --version), "\d+\.\d+\.\d+").Value - return $version + $rustupInfo = cmd /c "rustup --version 2>NUL" + $version = [regex]::matches($rustupInfo, "\d+\.\d+\.\d+").Value + return $version } function Get-RustCargoVersion { - $version = [regex]::matches($(cargo --version), "\d+\.\d+\.\d+").Value - return $version + $version = [regex]::matches($(cargo --version), "\d+\.\d+\.\d+").Value + return $version } function Get-RustdocVersion { - $version = [regex]::matches($(rustdoc --version), "\d+\.\d+\.\d+").Value - return $version + $version = [regex]::matches($(rustdoc --version), "\d+\.\d+\.\d+").Value + return $version } function Get-RustfmtVersion { - $version = [regex]::matches($(rustfmt --version), "\d+\.\d+\.\d+").Value - return $version + $version = [regex]::matches($(rustfmt --version), "\d+\.\d+\.\d+").Value + return $version } function Get-RustClippyVersion { - $version = [regex]::matches($(cargo clippy --version), "\d+\.\d+\.\d+").Value - return $version + $version = [regex]::matches($(cargo clippy --version), "\d+\.\d+\.\d+").Value + return $version } function Get-BindgenVersion { @@ -122,10 +123,8 @@ function Get-ChocoVersion { } function Get-VcpkgVersion { - ($(vcpkg version) | Out-String) -match "version (?<version>\d+\.\d+\.\d+)" | Out-Null - $vcpkgVersion = $Matches.Version $commitId = git -C "C:\vcpkg" rev-parse --short HEAD - return "Vcpkg $vcpkgVersion (build from master \<$commitId>)" + return "Vcpkg (build from master \<$commitId>)" } function Get-NPMVersion { diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index 7101fea62756..0df5a6b0fea4 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -1,3 +1,8 @@ +$global:ErrorActionPreference = "Stop" +$global:ProgressPreference = "SilentlyContinue" +$ErrorView = "NormalView" +Set-StrictMode -Version Latest + Import-Module MarkdownPS Import-Module (Join-Path $PSScriptRoot "SoftwareReport.Android.psm1") -DisableNameChecking Import-Module (Join-Path $PSScriptRoot "SoftwareReport.Browsers.psm1") -DisableNameChecking @@ -294,4 +299,5 @@ if ($cachedImages) { $markdown += $cachedImages | New-MDTable } +Test-BlankElement -Markdown $markdown $markdown | Out-File -FilePath "C:\InstalledSoftware.md" diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Helpers.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Helpers.psm1 index 0c20144ba998..b62fda7eb794 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Helpers.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Helpers.psm1 @@ -114,3 +114,50 @@ function Get-PathWithLink { $link = Get-LinkTarget($inputPath) return "${inputPath}${link}" } + +function Test-BlankElement { + param( + [string] $Markdown + ) + + $splitByLines = $Markdown.Split("`n") + # Validate entry without version + $blankVersions = $splitByLines -match "^-" -notmatch "(OS|Image) Version|WSL|Vcpkg|\d\." | Out-String + + # Validate tables with blank rows + $blankRows = "" + for($i = 0; $i -lt $splitByLines.Length; $i++) { + $addRows= $false + $table = @() + if ($splitByLines[$i].StartsWith("#") -and $splitByLines[$i+1].StartsWith("|")) { + $table += $splitByLines[$i,($i+1),($i+2)] + $i += 3 + $current = $splitByLines[$i] + while ($current.StartsWith("|")) { + $isBlankRow = $current.Substring(1, $current.LastIndexOf("|") - 2).Split("|").Trim() -contains "" + if ($isBlankRow) { + $table += $current + $addRows = $true + } + $current = $splitByLines[++$i] + } + if ($addRows) { + $blankRows += $table | Out-String + } + } + } + + # Display report + $isReport = $false + if ($blankVersions) { + Write-Host "Software list with blank version:`n${blankVersions}" + $isReport = $true + } + if ($blankRows) { + Write-Host "Tables with blank rows:`n${blankRows}" + $isReport = $true + } + if ($isReport) { + exit 1 + } +} From fcb8a9ca81fc68d83269726d459c5196afc5c195 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Mon, 27 Dec 2021 11:41:47 +0300 Subject: [PATCH 0871/3485] Windows 2022 is not in a beta state anymore (#4810) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2ed84c2741cc..a815af66b745 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ For general questions about using the virtual environments or writing your Actio | Ubuntu 18.04 | `ubuntu-18.04` | [ubuntu-18.04] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu18&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu18&redirect=1) | macOS 11 | `macos-11` | [macOS-11] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-11&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-11&redirect=1) | macOS 10.15 | `macos-latest` or `macos-10.15` | [macOS-10.15] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-10.15&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-10.15&redirect=1) -| Windows Server 2022<sup>[beta]</sup> | `windows-2022` | [windows-2022] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=windows-2022&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=windows-2022&redirect=1) | +| Windows Server 2022 | `windows-2022` | [windows-2022] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=windows-2022&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=windows-2022&redirect=1) | | Windows Server 2019 | `windows-latest` or `windows-2019` | [windows-2019] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=windows-2019&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=windows-2019&redirect=1) | Windows Server 2016 | `windows-2016` | [windows-2016] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=windows-2016&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=windows-2016&redirect=1) From ddf7ca43281530fc204dc0556dac1b7da22347ef Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Mon, 27 Dec 2021 13:43:52 +0300 Subject: [PATCH 0872/3485] [Windows] Add Perl to windows-2022 (#4808) * Add Perl to windows-2022 toolset * Add missing tests and software report for perl --- .../win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 | 6 +----- images/win/scripts/Tests/ChocoPackages.Tests.ps1 | 2 +- images/win/toolsets/toolset-2022.json | 1 + 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index 0df5a6b0fea4..610e0e9a2db9 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -42,16 +42,12 @@ $languageTools = @( (Get-JuliaVersion), (Get-LLVMVersion), (Get-NodeVersion), + (Get-PerlVersion) (Get-PHPVersion), (Get-PythonVersion), (Get-RubyVersion), (Get-KotlinVersion) ) -if ((Test-IsWin16) -or (Test-IsWin19)) { - $languageTools += @( - (Get-PerlVersion) - ) -} $markdown += New-MDList -Style Unordered -Lines ($languageTools | Sort-Object) $packageManagementList = @( diff --git a/images/win/scripts/Tests/ChocoPackages.Tests.ps1 b/images/win/scripts/Tests/ChocoPackages.Tests.ps1 index 9debefdd3cbf..1d30d71858ee 100644 --- a/images/win/scripts/Tests/ChocoPackages.Tests.ps1 +++ b/images/win/scripts/Tests/ChocoPackages.Tests.ps1 @@ -58,7 +58,7 @@ Describe "Packer" { } } -Describe "Perl" -Skip:(Test-IsWin22) { +Describe "Perl" { It "Perl" { "perl --version" | Should -ReturnZeroExitCode } diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index 3051719437cc..99e9edd1b8cf 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -295,6 +295,7 @@ "args": [ "--version=1.1.1.20181020" ] }, { "name": "packer" }, + { "name": "strawberryperl" }, { "name": "pulumi" }, { "name": "tortoisesvn" }, { "name": "swig" }, From 3ff9488146f1becf49e0470212ed02c71ffd7695 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Mon, 27 Dec 2021 18:17:25 +0300 Subject: [PATCH 0873/3485] [macOS] Enable voiceover if SIP is disabled (#4805) * Enable voiceover if SIP is disabled * Replace touch with `echo -n "a"` The file should contain `a` symbol Co-authored-by: Craig Morten <cmorten@users.noreply.github.com> * Wrap sudo call into bash -c Co-authored-by: Craig Morten <cmorten@users.noreply.github.com> --- images/macos/provision/configuration/configure-machine.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/images/macos/provision/configuration/configure-machine.sh b/images/macos/provision/configuration/configure-machine.sh index 73c77c1d8e93..c97d44398af6 100644 --- a/images/macos/provision/configuration/configure-machine.sh +++ b/images/macos/provision/configuration/configure-machine.sh @@ -17,6 +17,11 @@ if [ -d "/Library/Application Support/VMware Tools" ]; then sudo "/Library/Application Support/VMware Tools/vmware-resolutionSet" 1176 885 fi +# Update VoiceOver Utility to allow VoiceOver to be controlled with AppleScript by creating a special file (SIP must be disabled) +if csrutil status | grep -Eq "System Integrity Protection status: (disabled|unknown)"; then + sudo bash -c 'echo -n "a" > /private/var/db/Accessibility/.VoiceOverAppleScriptEnabled' +fi + # https://developer.apple.com/support/expiration/ # Enterprise iOS Distribution Certificates generated between February 7 and September 1st, 2020 will expire on February 7, 2023. # Rotate the certificate before expiration to ensure your apps are installed and signed with an active certificate. From bb56fb7ef4593d52ad0c77af67b52fa8c1b85a34 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Mon, 27 Dec 2021 23:12:44 +0300 Subject: [PATCH 0874/3485] Add Service Fabric SDK to windows 2022 (#4812) --- .../SoftwareReport/SoftwareReport.Generator.ps1 | 4 ++-- images/win/scripts/Tests/Tools.Tests.ps1 | 4 ++-- images/win/windows2022.json | 10 +++++++++- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index 610e0e9a2db9..1e0d7abf4af5 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -110,6 +110,7 @@ $toolsList = @( (Get-PackerVersion), (Get-PulumiVersion), (Get-RVersion), + (Get-ServiceFabricSDKVersion), (Get-StackVersion), (Get-SVNVersion), (Get-VSWhereVersion), @@ -122,8 +123,7 @@ $toolsList = @( if ((Test-IsWin16) -or (Test-IsWin19)) { $toolsList += @( (Get-GoogleCloudSDKVersion), - (Get-ParcelVersion), - (Get-ServiceFabricSDKVersion) + (Get-ParcelVersion) ) } $markdown += New-MDList -Style Unordered -Lines ($toolsList | Sort-Object) diff --git a/images/win/scripts/Tests/Tools.Tests.ps1 b/images/win/scripts/Tests/Tools.Tests.ps1 index 27ba0da895f7..1773a4fb33a0 100644 --- a/images/win/scripts/Tests/Tools.Tests.ps1 +++ b/images/win/scripts/Tests/Tools.Tests.ps1 @@ -130,7 +130,7 @@ Describe "Sbt" { } } -Describe "ServiceFabricSDK" -Skip:(Test-IsWin22) { +Describe "ServiceFabricSDK" { It "PowerShell Module" { Get-Module -Name ServiceFabric -ListAvailable | Should -Not -BeNullOrEmpty } @@ -176,7 +176,7 @@ Describe "VCRedist" -Skip:(Test-IsWin22) { } } -Describe "WebPlatformInstaller" -Skip:(Test-IsWin22) { +Describe "WebPlatformInstaller" { It "WebPlatformInstaller" { "WebPICMD" | Should -ReturnZeroExitCode } diff --git a/images/win/windows2022.json b/images/win/windows2022.json index 8e0346203d80..d38ce154c552 100644 --- a/images/win/windows2022.json +++ b/images/win/windows2022.json @@ -147,7 +147,8 @@ "type": "powershell", "scripts": [ "{{ template_dir }}/scripts/Installers/Install-Docker.ps1", - "{{ template_dir }}/scripts/Installers/Install-PowershellCore.ps1" + "{{ template_dir }}/scripts/Installers/Install-PowershellCore.ps1", + "{{ template_dir }}/scripts/Installers/Install-WebPlatformInstaller.ps1" ] }, { @@ -180,6 +181,13 @@ "{{ template_dir }}/scripts/Installers/Install-Kotlin.ps1" ] }, + { + "type": "powershell", + "scripts": [ + "{{ template_dir }}/scripts/Installers/Install-ServiceFabricSDK.ps1" + ], + "execution_policy": "remotesigned" + }, { "type": "windows-restart", "restart_timeout": "10m" From 92eeb55189d6faee20e7e2df1eb741fb5c140572 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Tue, 28 Dec 2021 11:16:20 +0300 Subject: [PATCH 0875/3485] [Ubuntu] Add verbosity during software report generation (#4811) * Add verbosity during software report generation * Fix Get-CpanVersion * set default ValidateExitCode value to $true * update java test * use lower-case for parameters --- .../SoftwareReport/SoftwareReport.Common.psm1 | 2 +- .../SoftwareReport.Generator.ps1 | 63 ++++++++++--------- .../SoftwareReport/SoftwareReport.Tools.psm1 | 2 +- .../linux/scripts/helpers/Common.Helpers.psm1 | 18 +++++- .../helpers/SoftwareReport.Helpers.psm1 | 46 ++++++++++++++ .../linux/scripts/helpers/Tests.Helpers.psm1 | 10 +-- .../linux/scripts/tests/Databases.Tests.ps1 | 2 +- images/linux/scripts/tests/Java.Tests.ps1 | 8 +-- 8 files changed, 107 insertions(+), 44 deletions(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 index 87673c7e8f52..ccff2b02bb7c 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 @@ -140,7 +140,7 @@ function Get-HomebrewVersion { } function Get-CpanVersion { - $result = Get-CommandResult "cpan --version" + $result = Get-CommandResult "cpan --version" -ExpectExitCode @(25, 255) $result.Output -match "version (?<version>\d+\.\d+) " | Out-Null $cpanVersion = $Matches.version return "cpan $cpanVersion" diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index b15e53b0f8c1..38452bfcf97e 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -3,7 +3,9 @@ param ( $OutputDirectory ) -$ErrorActionPreference = "Stop" +$global:ErrorActionPreference = "Stop" +$global:ErrorView = "NormalView" +Set-StrictMode -Version Latest Import-Module MarkdownPS Import-Module (Join-Path $PSScriptRoot "SoftwareReport.Android.psm1") -DisableNameChecking @@ -36,41 +38,41 @@ $markdown += New-MDHeader "Installed Software" -Level 2 $markdown += New-MDHeader "Language and Runtime" -Level 3 $runtimesList = @( - (Get-BashVersion), - (Get-CPPVersions), - (Get-FortranVersions), - (Get-ErlangVersion), - (Get-ErlangRebar3Version), - (Get-MonoVersion), - (Get-MsbuildVersion), - (Get-NodeVersion), - (Get-PerlVersion), - (Get-PythonVersion), - (Get-Python3Version), - (Get-RubyVersion), - (Get-SwiftVersion), - (Get-JuliaVersion), - (Get-KotlinVersion), - (Get-ClangVersions), - (Get-ClangFormatVersions) - ) + (Get-BashVersion), + (Get-CPPVersions), + (Get-FortranVersions), + (Get-ErlangVersion), + (Get-ErlangRebar3Version), + (Get-MonoVersion), + (Get-MsbuildVersion), + (Get-NodeVersion), + (Get-PerlVersion), + (Get-PythonVersion), + (Get-Python3Version), + (Get-RubyVersion), + (Get-SwiftVersion), + (Get-JuliaVersion), + (Get-KotlinVersion), + (Get-ClangVersions), + (Get-ClangFormatVersions) +) $markdown += New-MDList -Style Unordered -Lines ($runtimesList | Sort-Object) $markdown += New-MDHeader "Package Management" -Level 3 $packageManagementList = @( - (Get-HomebrewVersion), - (Get-CpanVersion), - (Get-GemVersion), - (Get-MinicondaVersion), - (Get-HelmVersion), - (Get-NpmVersion), - (Get-YarnVersion), - (Get-PipxVersion), - (Get-PipVersion), - (Get-Pip3Version), - (Get-VcpkgVersion) + (Get-HomebrewVersion), + (Get-CpanVersion), + (Get-GemVersion), + (Get-MinicondaVersion), + (Get-HelmVersion), + (Get-NpmVersion), + (Get-YarnVersion), + (Get-PipxVersion), + (Get-PipVersion), + (Get-Pip3Version), + (Get-VcpkgVersion) ) $markdown += New-MDList -Style Unordered -Lines ($packageManagementList | Sort-Object) @@ -273,4 +275,5 @@ $markdown += New-MDNewLine $markdown += New-MDHeader "Installed apt packages" -Level 3 $markdown += Get-AptPackages | New-MDTable +Test-BlankElement $markdown | Out-File -FilePath "${OutputDirectory}/Ubuntu-Readme.md" diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 index 45eaa41ff44d..fa6cea41aaac 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 @@ -182,7 +182,7 @@ function Get-NvmVersion { function Get-PackerVersion { # Packer 1.7.1 has a bug and outputs version to stderr instead of stdout https://github.com/hashicorp/packer/issues/10855 - $result = (Get-CommandResult -Command "packer --version").Output + $result = (Get-CommandResult "packer --version").Output $packerVersion = [regex]::matches($result, "(\d+.){2}\d+").Value return "Packer $packerVersion" } diff --git a/images/linux/scripts/helpers/Common.Helpers.psm1 b/images/linux/scripts/helpers/Common.Helpers.psm1 index 0c609aea0cc9..eab83e2044f8 100644 --- a/images/linux/scripts/helpers/Common.Helpers.psm1 +++ b/images/linux/scripts/helpers/Common.Helpers.psm1 @@ -2,11 +2,27 @@ function Get-CommandResult { param ( [Parameter(Mandatory=$true)] [string] $Command, - [switch] $Multiline + [int[]] $ExpectExitCode = 0, + [switch] $Multiline, + [bool] $ValidateExitCode = $true ) + # Bash trick to suppress and show error output because some commands write to stderr (for example, "python --version") $stdout = & bash -c "$Command 2>&1" $exitCode = $LASTEXITCODE + + if ($ValidateExitCode) { + if ($ExpectExitCode -notcontains $exitCode) { + try { + throw "StdOut: '$stdout' ExitCode: '$exitCode'" + } catch { + Write-Host $_.Exception.Message + Write-Host $_.ScriptStackTrace + exit $LASTEXITCODE + } + } + } + return @{ Output = If ($Multiline -eq $true) { $stdout } else { [string]$stdout } ExitCode = $exitCode diff --git a/images/linux/scripts/helpers/SoftwareReport.Helpers.psm1 b/images/linux/scripts/helpers/SoftwareReport.Helpers.psm1 index b645c670f623..a9c4c3a3a016 100644 --- a/images/linux/scripts/helpers/SoftwareReport.Helpers.psm1 +++ b/images/linux/scripts/helpers/SoftwareReport.Helpers.psm1 @@ -110,3 +110,49 @@ function Get-AptSourceRepository { return $sourceUrl } +function Test-BlankElement { + param( + [string] $Markdown + ) + + $splitByLines = $Markdown.Split("`n") + # Validate entry without version + $blankVersions = $splitByLines -match "^-" -notmatch "Image Version|MySQL Server|Vcpkg|\d\." | Out-String + + # Validate tables with blank rows + $blankRows = "" + for($i = 0; $i -lt $splitByLines.Length; $i++) { + $addRows= $false + $table = @() + if ($splitByLines[$i].StartsWith("#") -and $splitByLines[$i+1].StartsWith("|")) { + $table += $splitByLines[$i,($i+1),($i+2)] + $i += 3 + $current = $splitByLines[$i] + while ($current.StartsWith("|")) { + $isBlankRow = $current.Substring(1, $current.LastIndexOf("|") - 2).Split("|").Trim() -contains "" + if ($isBlankRow) { + $table += $current + $addRows = $true + } + $current = $splitByLines[++$i] + } + if ($addRows) { + $blankRows += $table | Out-String + } + } + } + + # Display report + $isReport = $false + if ($blankVersions) { + Write-Host "Software list with blank version:`n${blankVersions}" + $isReport = $true + } + if ($blankRows) { + Write-Host "Tables with blank rows:`n${blankRows}" + $isReport = $true + } + if ($isReport) { + exit 1 + } +} diff --git a/images/linux/scripts/helpers/Tests.Helpers.psm1 b/images/linux/scripts/helpers/Tests.Helpers.psm1 index 085aaa07908d..5689d9e54a3b 100644 --- a/images/linux/scripts/helpers/Tests.Helpers.psm1 +++ b/images/linux/scripts/helpers/Tests.Helpers.psm1 @@ -44,12 +44,12 @@ function Invoke-PesterTests { function ShouldReturnZeroExitCode { Param( - [String] $ActualValue, + [string] $ActualValue, [switch] $Negate, [string] $Because # This parameter is unused but we need it to match Pester asserts signature ) - $result = Get-CommandResult $ActualValue + $result = Get-CommandResult $ActualValue -ValidateExitCode $false [bool]$succeeded = $result.ExitCode -eq 0 if ($Negate) { $succeeded = -not $succeeded } @@ -69,12 +69,12 @@ function ShouldReturnZeroExitCode { function ShouldMatchCommandOutput { Param( - [String] $ActualValue, - [String] $RegularExpression, + [string] $ActualValue, + [string] $RegularExpression, [switch] $Negate ) - $output = (Get-CommandResult $ActualValue).Output | Out-String + $output = (Get-CommandResult $ActualValue -ValidateExitCode $false).Output | Out-String [bool] $succeeded = $output -cmatch $RegularExpression if ($Negate) { diff --git a/images/linux/scripts/tests/Databases.Tests.ps1 b/images/linux/scripts/tests/Databases.Tests.ps1 index 79e6cb999209..4b004963a265 100644 --- a/images/linux/scripts/tests/Databases.Tests.ps1 +++ b/images/linux/scripts/tests/Databases.Tests.ps1 @@ -11,7 +11,7 @@ Describe "MongoDB" { Describe "PostgreSQL" { It "PostgreSQL Service" { "sudo systemctl start postgresql" | Should -ReturnZeroExitCode - (Get-CommandResult "pg_isready").Output | Should -Be "/var/run/postgresql:5432 - accepting connections" + "pg_isready" | Should -MatchCommandOutput "/var/run/postgresql:5432 - accepting connections" "sudo systemctl stop postgresql" | Should -ReturnZeroExitCode } diff --git a/images/linux/scripts/tests/Java.Tests.ps1 b/images/linux/scripts/tests/Java.Tests.ps1 index 68caf17cb22e..1a5932744bf5 100644 --- a/images/linux/scripts/tests/Java.Tests.ps1 +++ b/images/linux/scripts/tests/Java.Tests.ps1 @@ -29,8 +29,7 @@ Describe "Java" { $gradleVariableValue | Should -BeLike "/usr/share/gradle-*" $gradlePath = Join-Path $env:GRADLE_HOME "bin/gradle" - $result = Get-CommandResult "`"$GradlePath`" -version" - $result.ExitCode | Should -Be 0 + "`"$GradlePath`" -version" | Should -ReturnZeroExitCode } It "Java <Version>" -TestCases $jdkVersions { @@ -38,12 +37,11 @@ Describe "Java" { $javaVariableValue | Should -Not -BeNullOrEmpty $javaPath = Join-Path $javaVariableValue "bin/java" - $result = Get-CommandResult "`"$javaPath`" -version" - $result.ExitCode | Should -Be 0 + "`"$javaPath`" -version" | Should -ReturnZeroExitCode if ($Version -eq 8) { $Version = "1.${Version}" } - $result.Output | Should -Match ([regex]::Escape("openjdk version `"${Version}.")) + "`"$javaPath`" -version" | Should -MatchCommandOutput ([regex]::Escape("openjdk version `"${Version}.")) } } \ No newline at end of file From 29dbc46881136406ea6830a1dff33c4c152aee27 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Wed, 29 Dec 2021 13:01:38 +0300 Subject: [PATCH 0876/3485] [Ubuntu] restart snapd during images generation (#4814) --- images/linux/scripts/base/snap.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/images/linux/scripts/base/snap.sh b/images/linux/scripts/base/snap.sh index 98163745b6e9..6d38c2e051ba 100644 --- a/images/linux/scripts/base/snap.sh +++ b/images/linux/scripts/base/snap.sh @@ -5,4 +5,10 @@ # when they are rolling a new major update out. # Hold is calculated as today's date + 60 days +# snapd is started automatically, but during image generation +# a unix socket may die, restart snapd.service (and therefore snapd.socket) +# to make sure the socket is alive. + +systemctl restart snapd.socket +systemctl restart snapd snap set system refresh.hold="$(date --date='today+60 days' +%Y-%m-%dT%H:%M:%S%:z)" From 3c2f1c6350b3d34a557f12f62e3ee47a839ea401 Mon Sep 17 00:00:00 2001 From: V-Zabayrachny <79155496+V-Zabayrachny@users.noreply.github.com> Date: Thu, 30 Dec 2021 10:36:59 +0300 Subject: [PATCH 0877/3485] [macOS] Remove macOS 10.14 related code in the VE repo (#4816) * [MacOS] Remove code for macOS-10.14 * remove is_Less_BigSur in all script * remove variable the IsLessThanBigSur --- images.CI/macos/azure-pipelines/macos1014.yml | 23 -- images/macos/helpers/Common.Helpers.psm1 | 4 - images/macos/macos-10.14-Readme.md | 379 ----------------- .../configuration/configure-machine.sh | 2 +- .../provision/configuration/finalize-vm.sh | 2 +- .../provision/configuration/preimagedata.sh | 2 +- .../macos/provision/core/android-toolsets.sh | 2 +- images/macos/provision/core/audiodevice.sh | 2 +- images/macos/provision/core/commonutils.sh | 6 - images/macos/provision/core/dotnet.sh | 20 +- images/macos/provision/core/node.sh | 19 +- images/macos/provision/core/openjdk.sh | 2 +- images/macos/provision/core/powershell.sh | 2 +- images/macos/provision/core/xamarin.sh | 8 +- images/macos/provision/core/xcode.ps1 | 4 - images/macos/provision/utils/utils.sh | 30 +- .../SoftwareReport.Android.psm1 | 2 +- .../SoftwareReport.Generator.ps1 | 22 +- .../software-report/SoftwareReport.Xcode.psm1 | 2 +- images/macos/templates/macOS-10.14.json | 229 ---------- images/macos/tests/Common.Tests.ps1 | 2 +- images/macos/tests/System.Tests.ps1 | 2 +- images/macos/tests/WebServers.Tests.ps1 | 4 +- images/macos/toolsets/toolset-10.14.json | 390 ------------------ 24 files changed, 33 insertions(+), 1127 deletions(-) delete mode 100644 images.CI/macos/azure-pipelines/macos1014.yml delete mode 100644 images/macos/macos-10.14-Readme.md delete mode 100644 images/macos/templates/macOS-10.14.json delete mode 100644 images/macos/toolsets/toolset-10.14.json diff --git a/images.CI/macos/azure-pipelines/macos1014.yml b/images.CI/macos/azure-pipelines/macos1014.yml deleted file mode 100644 index 21f7e48c175c..000000000000 --- a/images.CI/macos/azure-pipelines/macos1014.yml +++ /dev/null @@ -1,23 +0,0 @@ -name: macOS-10.14_$(date:yyyyMMdd)$(rev:.r)_unstable -schedules: -- cron: "0 0 * * *" - displayName: Daily - branches: - include: - - main - always: true - -trigger: none -pr: - autoCancel: true - branches: - include: - - main - -jobs: -- template: image-generation.yml - parameters: - image_label: 'macOS Mojave' - base_image_name: 'clean-macOS-10.14-380Gb_runner' - template_path: 'templates/macOS-10.14.json' - target_datastore: 'ds-image' diff --git a/images/macos/helpers/Common.Helpers.psm1 b/images/macos/helpers/Common.Helpers.psm1 index a84871f1b1a7..f8d758b3b26e 100644 --- a/images/macos/helpers/Common.Helpers.psm1 +++ b/images/macos/helpers/Common.Helpers.psm1 @@ -34,14 +34,10 @@ function Get-OSVersion { return [PSCustomObject]@{ Version = $osVersion.Version Platform = $osVersion.Platform - IsMojave = $osVersionMajorMinor -eq "10.14" IsCatalina = $osVersionMajorMinor -eq "10.15" IsBigSur = $osVersionMajorMinor -eq "11.0" IsMonterey = $osMontereyVersion.Major -eq "12" - IsLessThanCatalina = [SemVer]$osVersion.Version -lt "10.15" - IsLessThanBigSur = [SemVer]$osVersion.Version -lt "11.0" IsLessThanMonterey = $osMontereyVersion -lt "12.0" - IsHigherThanMojave = [SemVer]$osVersion.Version -ge "10.15" IsHigherThanCatalina = [SemVer]$osVersion.Version -ge "11.0" } } diff --git a/images/macos/macos-10.14-Readme.md b/images/macos/macos-10.14-Readme.md deleted file mode 100644 index 3e77c7cde4a6..000000000000 --- a/images/macos/macos-10.14-Readme.md +++ /dev/null @@ -1,379 +0,0 @@ -| Announcements | -|-| -| [[macOS] Xcode 12.5 will be removed from Big Sur on October, 18](https://github.com/actions/virtual-environments/issues/4183) | -| [[macOS] Default Xcode on Big Sur image will be set to Xcode 13.0 on October, 18](https://github.com/actions/virtual-environments/issues/4180) | -| [macOS-latest workflows will use macOS-11](https://github.com/actions/virtual-environments/issues/4060) | -*** -# macOS 10.14 info -- System Version: macOS 10.14.6 (18G9323) -- Kernel Version: Darwin 18.7.0 -- Image Version: 20211016.1 - -## Installed Software -### Language and Runtime -- .NET SDK 2.1.302 2.1.403 2.1.507 -- Bash 3.2.57(1)-release -- Clang/LLVM 11.0.0 is default -- Clang/LLVM 13.0.0 is available on `'$(brew --prefix llvm)/bin/clang'` -- gcc-9 (Homebrew GCC 9.4.0) 9.4.0 - available by `gcc-9` alias -- gcc-10 (Homebrew GCC 10.3.0) 10.3.0 - available by `gcc-10` alias -- gcc-11 (Homebrew GCC 11.2.0) 11.2.0 - available by `gcc-11` alias -- GNU Fortran (Homebrew GCC 9.4.0) 9.4.0 - available by `gfortran-9` alias -- GNU Fortran (Homebrew GCC 10.3.0) 10.3.0 - available by `gfortran-10` alias -- GNU Fortran (Homebrew GCC 11.2.0) 11.2.0 - available by `gfortran-11` alias -- Go 1.15.15 -- julia 1.6.3 -- Kotlin 1.5.31-release-548 -- MSBuild 15.7.224.30163 (from /Library/Frameworks/Mono.framework/Versions/5.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) -- Node.js v8.17.0 -- NVM 0.39.0 -- NVM - Cached node versions: v10.24.1 v12.22.7 v14.18.1 -- Perl 5.34.0 -- PHP 8.0.11 -- Python 2.7.18 -- Python 3.9.7 -- R 4.1.1 -- Ruby 2.7.4p191 - -### Package Management -- Bundler version 2.2.29 -- Carthage 0.38.0 -- CocoaPods 1.11.2 -- Composer 2.1.9 -- Homebrew 3.2.16 -- Miniconda 4.10.3 -- NPM 3.10.10 -- NuGet 4.7.0.5148 -- Pip 20.3.4 (python 2.7) -- Pip 21.2.4 (python 3.9) -- Pipx 0.16.4 -- RubyGems 3.2.29 -- Yarn 1.22.15 - -#### Environment variables -| Name | Value | -| ----------------------- | -------------------- | -| CONDA | /usr/local/miniconda | -| VCPKG_INSTALLATION_ROOT | | - -### Project Management -- Apache Ant(TM) 1.10.11 -- Apache Maven 3.8.3 -- Gradle 7.2 -- Sbt 1.5.5 - -### Utilities -- 7-Zip 17.04 -- aria2 1.36.0 -- azcopy 10.12.2 -- bazel 3.7.1 -- bazelisk 1.10.1 -- bsdtar 2.8.3 - available by 'tar' alias -- Curl 7.79.1 -- Git LFS: 3.0.1 -- Git: 2.33.1 -- GitHub CLI: 2.1.0 -- GNU parallel 20210922 -- GNU Tar 1.34 - available by 'gtar' alias -- GNU Wget 1.21.2 -- gpg (GnuPG) 2.3.2 -- helm v3.7.1+g1d11fcb -- Hub CLI: 2.14.2 -- jq 1.6 -- mongo v5.0.3 -- mongod v5.0.3 -- OpenSSL 1.1.1l 24 Aug 2021 `(/usr/local/opt/openssl@1.1 -> /usr/local/Cellar/openssl@1.1/1.1.1l_1)` -- Packer 1.7.6 -- PostgreSQL 14.0 -- psql (PostgreSQL) 14.0 -- Sox 14.4.2 -- Subversion (SVN) 1.14.1 -- Switchaudio-osx 1.1.0 -- Vagrant 2.2.18 -- virtualbox 6.1.26r145957 -- zstd 1.5.0 - - -### Tools -- Aliyun CLI 3.0.94 -- App Center CLI 1.2.2 -- AWS CLI 2.2.46 -- AWS SAM CLI 1.33.0 -- AWS Session Manager CLI 1.2.245.0 -- Azure CLI 2.29.0 -- Bicep CLI 0.4.1008 -- Cabal 3.4.1.0 -- Cmake 3.21.3 -- Fastlane 2.196.0 -- GHC 9.0.1 -- GHCup 0.1.17.2 -- Stack 2.7.3 -- SwiftFormat 0.48.16 -- Swig 4.0.2 -- Xcode Command Line Tools 10.3.0.0.1.1562985497 - -### Linters -- SwiftLint 0.44.0 -- yamllint 1.26.3 - -### Browsers -- Safari 14.1.2 (14611.3.10.1.5) -- SafariDriver 14.1.2 (14611.3.10.1.5) -- Google Chrome 94.0.4606.81 -- ChromeDriver 94.0.4606.61 -- Microsoft Edge 94.0.992.50 -- MSEdgeDriver 94.0.992.50 -- Mozilla Firefox 93.0 -- geckodriver 0.30.0 - -#### Environment variables -| Name | Value | -| --------------- | --------------------------------------------- | -| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/94.0.4606.61 | -| EDGEWEBDRIVER | /usr/local/share/edge_driver | -| GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | - -### Java -| Version | Vendor | Environment Variable | -| ------------------- | --------------- | -------------------- | -| 8.0.302+8 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | -| 11.0.12+7 | Eclipse Temurin | JAVA_HOME_11_X64 | -| 12.0.2+10.3 | Adopt OpenJDK | JAVA_HOME_12_X64 | -| 13.0.2+8.1 | Adopt OpenJDK | JAVA_HOME_13_X64 | -| 14.0.2+12 | Adopt OpenJDK | JAVA_HOME_14_X64 | -| 17.0.0+35 | Eclipse Temurin | JAVA_HOME_17_X64 | - -### Cached Tools -#### Ruby -- 2.4.10 -- 2.5.9 -- 2.6.8 -- 2.7.4 -- 3.0.2 - -#### Python -- 2.7.18 -- 3.5.10 -- 3.6.15 -- 3.7.12 -- 3.8.12 -- 3.9.7 -- 3.10.0 - -#### PyPy -- 2.7.18 [PyPy 7.3.5] -- 3.6.12 [PyPy 7.3.3] - -#### Node.js -- 10.24.1 -- 12.22.7 -- 14.18.1 - -#### Go -| Version | Architecture | Environment Variable | -| ------- | ------------ | -------------------- | -| 1.13.15 | x64 | GOROOT_1_13_X64 | -| 1.14.15 | x64 | GOROOT_1_14_X64 | -| 1.15.15 (Default) | x64 | GOROOT_1_15_X64 | -| 1.16.9 | x64 | GOROOT_1_16_X64 | -| 1.17.2 | x64 | GOROOT_1_17_X64 | -### Rust Tools -- Cargo 1.55.0 -- Rust 1.55.0 -- Rustdoc 1.55.0 -- Rustup 1.24.3 - -#### Packages -- Bindgen 0.59.1 -- Cargo-audit 0.15.2 -- Cargo-outdated v0.9.17 -- Cbindgen 0.20.0 -- Clippy 0.1.55 -- Rustfmt 1.4.37-stable - -### PowerShell Tools -- PowerShell 7.1.5 - -#### PowerShell Modules -| Module | Version | -| ---------------- | ------- | -| Az | 6.1.0 | -| MarkdownPS | 1.9 | -| Pester | 5.3.1 | -| PSScriptAnalyzer | 1.20.0 | - -### Xamarin -#### Visual Studio for Mac -- 8.5.0.3183 - -#### Xamarin bundles -| symlink | Xamarin.Mono | Xamarin.iOS | Xamarin.Mac | Xamarin.Android | -| ---------------- | ------------ | ----------- | ----------- | --------------- | -| 6_8_0 | 6.8 | 13.14 | 6.14 | 10.2 | -| 6_6_1 | 6.6 | 13.10 | 6.10 | 10.1 | -| 6_6_0 | 6.6 | 13.8 | 6.8 | 10.1 | -| 6_4_2 | 6.4 | 13.6 | 6.6 | 10.0 | -| 6_4_1 | 6.4 | 13.4 | 6.4 | 10.0 | -| 6_4_0 | 6.4 | 13.2 | 6.2 | 10.0 | -| 6_0_0 | 6.0 | 12.14 | 5.16 | 9.4 | -| 5_18_3 | 5.18 | 12.10 | 5.10 | 9.3 | -| 5_18_2 | 5.18 | 12.8 | 5.8 | 9.2 | -| 5_18_1 | 5.18 | 12.6 | 5.6 | 9.2 | -| 5_16_0_0 | 5.16 | 12.2 | 5.2 | 9.1 | -| 5_16_0 | 5.16 | 12.2 | 5.2 | 9.1 | -| 5_12_0_3 | 5.12 | 12.2 | 5.3 | 9.0 | -| 5_12_0_XC10_PRE | 5.12 | 12.0 | 5.2 | 9.0 | -| 5_12_0 (default) | 5.12 | 11.14 | 4.6 | 9.0 | -| 5_10_1 | 5.10 | 11.12 | 4.4 | 8.3 | -| 5_8_1 | 5.8 | 11.9 | 4.2 | 8.2 | -| 5_8_0 | 5.8 | 11.8 | 4.2 | 8.2 | -| 5_4_1 | 5.4 | 11.6 | 4.0 | 8.1 | -| 5_4_0 | 5.4 | 11.2 | 3.8 | 8.0 | -| 5_2_0 | 5.2 | 11.0 | 3.6 | 7.4 | -| Legacy_5_0_1 | 5.0 | 10.10 | 3.4 | 7.3 | -| Legacy_4_8_1 | 4.8 | 10.6 | 3.0 | 7.1 | - -#### Unit Test Framework -- NUnit 3.6.1 - -### Xcode -| Version | Build | Path | -| ---------------- | ------- | ------------------------------ | -| 11.3.1 (default) | 11C505 | /Applications/Xcode_11.3.1.app | -| 11.3 | 11C29 | /Applications/Xcode_11.3.app | -| 11.2.1 | 11B500 | /Applications/Xcode_11.2.1.app | -| 11.2 | 11B52 | /Applications/Xcode_11.2.app | -| 11.1 | 11A1027 | /Applications/Xcode_11.1.app | -| 11.0 | 11A420a | /Applications/Xcode_11.app | -| 10.3 | 10G8 | /Applications/Xcode_10.3.app | -| 10.2.1 | 10E1001 | /Applications/Xcode_10.2.1.app | -| 10.2 | 10E125 | /Applications/Xcode_10.2.app | -| 10.1 | 10B61 | /Applications/Xcode_10.1.app | -| 10.0 | 10A255 | /Applications/Xcode_10.app | -| 9.4.1 | 9F2000 | /Applications/Xcode_9.4.1.app | - -#### Xcode Support Tools -- xcpretty 0.3.0 -- xcversion 2.8.0 -- Nomad CLI 0.0.2 -- Nomad shenzhen CLI 0.14.3 -- xctool 0.3.7 - -#### Installed SDKs -| SDK | SDK Name | Xcode Version | -| ----------------------- | -------------------- | -------------------------------------- | -| macOS 10.13 | macosx10.13 | 9.4.1 | -| macOS 10.14 | macosx10.14 | 10.0, 10.1, 10.2, 10.2.1, 10.3 | -| macOS 10.15 | macosx10.15 | 11.0, 11.1, 11.2, 11.2.1, 11.3, 11.3.1 | -| iOS 11.4 | iphoneos11.4 | 9.4.1 | -| iOS 12.0 | iphoneos12.0 | 10.0 | -| iOS 12.1 | iphoneos12.1 | 10.1 | -| iOS 12.2 | iphoneos12.2 | 10.2, 10.2.1 | -| iOS 12.4 | iphoneos12.4 | 10.3 | -| iOS 13.0 | iphoneos13.0 | 11.0 | -| iOS 13.1 | iphoneos13.1 | 11.1 | -| iOS 13.2 | iphoneos13.2 | 11.2, 11.2.1, 11.3, 11.3.1 | -| Simulator - iOS 11.4 | iphonesimulator11.4 | 9.4.1 | -| Simulator - iOS 12.0 | iphonesimulator12.0 | 10.0 | -| Simulator - iOS 12.1 | iphonesimulator12.1 | 10.1 | -| Simulator - iOS 12.2 | iphonesimulator12.2 | 10.2, 10.2.1 | -| Simulator - iOS 12.4 | iphonesimulator12.4 | 10.3 | -| Simulator - iOS 13.0 | iphonesimulator13.0 | 11.0 | -| Simulator - iOS 13.1 | iphonesimulator13.1 | 11.1 | -| Simulator - iOS 13.2 | iphonesimulator13.2 | 11.2, 11.2.1, 11.3, 11.3.1 | -| tvOS 11.4 | appletvos11.4 | 9.4.1 | -| tvOS 12.0 | appletvos12.0 | 10.0 | -| tvOS 12.1 | appletvos12.1 | 10.1 | -| tvOS 12.2 | appletvos12.2 | 10.2, 10.2.1 | -| tvOS 12.4 | appletvos12.4 | 10.3 | -| tvOS 13.0 | appletvos13.0 | 11.0, 11.1 | -| tvOS 13.2 | appletvos13.2 | 11.2, 11.2.1, 11.3, 11.3.1 | -| Simulator - tvOS 11.4 | appletvsimulator11.4 | 9.4.1 | -| Simulator - tvOS 12.0 | appletvsimulator12.0 | 10.0 | -| Simulator - tvOS 12.1 | appletvsimulator12.1 | 10.1 | -| Simulator - tvOS 12.2 | appletvsimulator12.2 | 10.2, 10.2.1 | -| Simulator - tvOS 12.4 | appletvsimulator12.4 | 10.3 | -| Simulator - tvOS 13.0 | appletvsimulator13.0 | 11.0, 11.1 | -| Simulator - tvOS 13.2 | appletvsimulator13.2 | 11.2, 11.2.1, 11.3, 11.3.1 | -| watchOS 4.3 | watchos4.3 | 9.4.1 | -| watchOS 5.0 | watchos5.0 | 10.0 | -| watchOS 5.1 | watchos5.1 | 10.1 | -| watchOS 5.2 | watchos5.2 | 10.2, 10.2.1 | -| watchOS 5.3 | watchos5.3 | 10.3 | -| watchOS 6.0 | watchos6.0 | 11.0, 11.1 | -| watchOS 6.1 | watchos6.1 | 11.2, 11.2.1, 11.3, 11.3.1 | -| Simulator - watchOS 4.3 | watchsimulator4.3 | 9.4.1 | -| Simulator - watchOS 5.0 | watchsimulator5.0 | 10.0 | -| Simulator - watchOS 5.1 | watchsimulator5.1 | 10.1 | -| Simulator - watchOS 5.2 | watchsimulator5.2 | 10.2, 10.2.1 | -| Simulator - watchOS 5.3 | watchsimulator5.3 | 10.3 | -| Simulator - watchOS 6.0 | watchsimulator6.0 | 11.0, 11.1 | -| Simulator - watchOS 6.1 | watchsimulator6.1 | 11.2, 11.2.1, 11.3, 11.3.1 | -| DriverKit 19.0 | driverkit.macosx19.0 | 11.0, 11.1, 11.2, 11.2.1, 11.3, 11.3.1 | - -#### Installed Simulators -| OS | Xcode Version | Simulators | -| ----------- | --------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| iOS 8.4 | 9.4.1<br>10.0<br>10.1<br>10.2<br>10.2.1<br>10.3<br>11.0<br>11.1<br>11.2<br>11.2.1<br>11.3<br>11.3.1 | iPhone 4s<br>iPhone 5<br>iPhone 5s<br>iPhone 6<br>iPhone 6 Plus<br>iPad 2<br>iPad Air<br>iPad Retina | -| iOS 9.0 | 9.4.1<br>10.0<br>10.1<br>10.2<br>10.2.1<br>10.3<br>11.0<br>11.1<br>11.2<br>11.2.1<br>11.3<br>11.3.1 | iPhone 4s<br>iPhone 5<br>iPhone 5s<br>iPhone 6<br>iPhone 6 Plus<br>iPhone 6s<br>iPhone 6s Plus<br>iPad 2<br>iPad Air<br>iPad Air 2<br>iPad Retina | -| iOS 9.1 | 9.4.1<br>10.0<br>10.1<br>10.2<br>10.2.1<br>10.3<br>11.0<br>11.1<br>11.2<br>11.2.1<br>11.3<br>11.3.1 | iPhone 4s<br>iPhone 5<br>iPhone 5s<br>iPhone 6<br>iPhone 6 Plus<br>iPhone 6s<br>iPhone 6s Plus<br>iPad 2<br>iPad Air<br>iPad Air 2<br>iPad Pro<br>iPad Retina | -| iOS 9.2 | 9.4.1<br>10.0<br>10.1<br>10.2<br>10.2.1<br>10.3<br>11.0<br>11.1<br>11.2<br>11.2.1<br>11.3<br>11.3.1 | iPhone 4s<br>iPhone 5<br>iPhone 5s<br>iPhone 6<br>iPhone 6 Plus<br>iPhone 6s<br>iPhone 6s Plus<br>iPad 2<br>iPad Air<br>iPad Air 2<br>iPad Pro<br>iPad Retina | -| iOS 9.3 | 9.4.1<br>10.0<br>10.1<br>10.2<br>10.2.1<br>10.3<br>11.0<br>11.1<br>11.2<br>11.2.1<br>11.3<br>11.3.1 | iPhone 4s<br>iPhone 5<br>iPhone 5s<br>iPhone 6<br>iPhone 6 Plus<br>iPhone 6s<br>iPhone 6s Plus<br>iPad 2<br>iPad Air<br>iPad Air 2<br>iPad Pro<br>iPad Retina | -| iOS 10.0 | 9.4.1<br>10.0<br>10.1<br>10.2<br>10.2.1<br>10.3<br>11.0<br>11.1<br>11.2<br>11.2.1<br>11.3<br>11.3.1 | iPhone 5<br>iPhone 5s<br>iPhone 6<br>iPhone 6 Plus<br>iPhone 6s<br>iPhone 6s Plus<br>iPhone SE<br>iPad Air<br>iPad Air 2<br>iPad Pro (12.9 inch)<br>iPad Pro (9.7 inch) | -| iOS 10.1 | 9.4.1<br>10.0<br>10.1<br>10.2<br>10.2.1<br>10.3<br>11.0<br>11.1<br>11.2<br>11.2.1<br>11.3<br>11.3.1 | iPhone 5<br>iPhone 5s<br>iPhone 6<br>iPhone 6 Plus<br>iPhone 6s<br>iPhone 6s Plus<br>iPhone 7<br>iPhone 7 Plus<br>iPhone SE<br>iPad Air<br>iPad Air 2<br>iPad Pro (12.9 inch)<br>iPad Pro (9.7 inch) | -| iOS 10.2 | 9.4.1<br>10.0<br>10.1<br>10.2<br>10.2.1<br>10.3<br>11.0<br>11.1<br>11.2<br>11.2.1<br>11.3<br>11.3.1 | iPhone 5<br>iPhone 5s<br>iPhone 6<br>iPhone 6 Plus<br>iPhone 6s<br>iPhone 6s Plus<br>iPhone 7<br>iPhone 7 Plus<br>iPhone SE<br>iPad Air<br>iPad Air 2<br>iPad Pro (12.9 inch)<br>iPad Pro (9.7 inch) | -| iOS 10.3 | 9.4.1<br>10.0<br>10.1<br>10.2<br>10.2.1<br>10.3<br>11.0<br>11.1<br>11.2<br>11.2.1<br>11.3<br>11.3.1 | iPhone 5<br>iPhone 5s<br>iPhone 6<br>iPhone 6 Plus<br>iPhone 6s<br>iPhone 6s Plus<br>iPhone 7<br>iPhone 7 Plus<br>iPhone SE<br>iPad (5th generation)<br>iPad Air<br>iPad Air 2<br>iPad Pro (10.5-inch)<br>iPad Pro (12.9 inch)<br>iPad Pro (12.9-inch) (2nd generation)<br>iPad Pro (9.7 inch) | -| iOS 11.4 | 9.4.1 | iPhone 5s<br>iPhone 6<br>iPhone 6 Plus<br>iPhone 6s<br>iPhone 6s Plus<br>iPhone 7<br>iPhone 7 Plus<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE<br>iPhone X<br>iPad (5th generation)<br>iPad Air<br>iPad Air 2<br>iPad Pro (10.5-inch)<br>iPad Pro (12.9-inch)<br>iPad Pro (12.9-inch) (2nd generation)<br>iPad Pro (9.7-inch) | -| iOS 12.0 | 10.0 | iPhone 5s<br>iPhone 6<br>iPhone 6 Plus<br>iPhone 6s<br>iPhone 6s Plus<br>iPhone 7<br>iPhone 7 Plus<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE<br>iPhone X<br>iPhone XR<br>iPhone XS<br>iPhone XS Max<br>iPad (5th generation)<br>iPad (6th generation)<br>iPad Air<br>iPad Air 2<br>iPad Pro (10.5-inch)<br>iPad Pro (12.9-inch)<br>iPad Pro (12.9-inch) (2nd generation)<br>iPad Pro (9.7-inch) | -| iOS 12.1 | 10.1 | iPhone 5s<br>iPhone 6<br>iPhone 6 Plus<br>iPhone 6s<br>iPhone 6s Plus<br>iPhone 7<br>iPhone 7 Plus<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE<br>iPhone X<br>iPhone XR<br>iPhone XS<br>iPhone XS Max<br>iPad (5th generation)<br>iPad (6th generation)<br>iPad Air<br>iPad Air 2<br>iPad Pro (10.5-inch)<br>iPad Pro (11-inch)<br>iPad Pro (12.9-inch)<br>iPad Pro (12.9-inch) (2nd generation)<br>iPad Pro (12.9-inch) (3rd generation)<br>iPad Pro (9.7-inch) | -| iOS 12.2 | 10.2<br>10.2.1 | iPhone 5s<br>iPhone 6<br>iPhone 6 Plus<br>iPhone 6s<br>iPhone 6s Plus<br>iPhone 7<br>iPhone 7 Plus<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE<br>iPhone X<br>iPhone XR<br>iPhone Xs<br>iPhone Xs Max<br>iPad (5th generation)<br>iPad (6th generation)<br>iPad Air<br>iPad Air (3rd generation)<br>iPad Air 2<br>iPad Pro (10.5-inch)<br>iPad Pro (11-inch)<br>iPad Pro (12.9-inch)<br>iPad Pro (12.9-inch) (2nd generation)<br>iPad Pro (12.9-inch) (3rd generation)<br>iPad Pro (9.7-inch) | -| iOS 12.4 | 10.3 | iPhone 5s<br>iPhone 6<br>iPhone 6 Plus<br>iPhone 6s<br>iPhone 6s Plus<br>iPhone 7<br>iPhone 7 Plus<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE<br>iPhone X<br>iPhone XR<br>iPhone Xs<br>iPhone Xs Max<br>iPad (5th generation)<br>iPad (6th generation)<br>iPad Air<br>iPad Air (3rd generation)<br>iPad Air 2<br>iPad Pro (10.5-inch)<br>iPad Pro (11-inch)<br>iPad Pro (12.9-inch)<br>iPad Pro (12.9-inch) (2nd generation)<br>iPad Pro (12.9-inch) (3rd generation)<br>iPad Pro (9.7-inch) | -| iOS 13.0 | 11.0 | iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPad Air (3rd generation)<br>iPad Pro (11-inch)<br>iPad Pro (12.9-inch) (3rd generation)<br>iPad Pro (9.7-inch) | -| iOS 13.1 | 11.1 | iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPad Air (3rd generation)<br>iPad Pro (11-inch)<br>iPad Pro (12.9-inch) (3rd generation)<br>iPad Pro (9.7-inch) | -| iOS 13.2 | 11.2<br>11.2.1 | iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPad (7th generation)<br>iPad Air (3rd generation)<br>iPad Pro (11-inch)<br>iPad Pro (12.9-inch) (3rd generation)<br>iPad Pro (9.7-inch) | -| iOS 13.3 | 11.3<br>11.3.1 | iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPad (7th generation)<br>iPad Air (3rd generation)<br>iPad Pro (11-inch)<br>iPad Pro (12.9-inch) (3rd generation)<br>iPad Pro (9.7-inch) | -| tvOS 11.4 | 9.4.1 | Apple TV<br>Apple TV 4K<br>Apple TV 4K (at 1080p) | -| tvOS 12.0 | 10.0 | Apple TV<br>Apple TV 4K<br>Apple TV 4K (at 1080p) | -| tvOS 12.1 | 10.1 | Apple TV<br>Apple TV 4K<br>Apple TV 4K (at 1080p) | -| tvOS 12.2 | 10.2<br>10.2.1 | Apple TV<br>Apple TV 4K<br>Apple TV 4K (at 1080p) | -| tvOS 12.4 | 10.3 | Apple TV<br>Apple TV 4K<br>Apple TV 4K (at 1080p) | -| tvOS 13.0 | 11.0<br>11.1 | Apple TV<br>Apple TV 4K<br>Apple TV 4K (at 1080p) | -| tvOS 13.2 | 11.2<br>11.2.1 | Apple TV<br>Apple TV 4K<br>Apple TV 4K (at 1080p) | -| tvOS 13.3 | 11.3<br>11.3.1 | Apple TV<br>Apple TV 4K<br>Apple TV 4K (at 1080p) | -| watchOS 4.3 | 9.4.1 | Apple Watch - 38mm<br>Apple Watch - 42mm<br>Apple Watch Series 2 - 38mm<br>Apple Watch Series 2 - 42mm<br>Apple Watch Series 3 - 38mm<br>Apple Watch Series 3 - 42mm | -| watchOS 5.0 | 10.0 | Apple Watch Series 2 - 38mm<br>Apple Watch Series 2 - 42mm<br>Apple Watch Series 3 - 38mm<br>Apple Watch Series 3 - 42mm<br>Apple Watch Series 4 - 40mm<br>Apple Watch Series 4 - 44mm | -| watchOS 5.1 | 10.1 | Apple Watch Series 2 - 38mm<br>Apple Watch Series 2 - 42mm<br>Apple Watch Series 3 - 38mm<br>Apple Watch Series 3 - 42mm<br>Apple Watch Series 4 - 40mm<br>Apple Watch Series 4 - 44mm | -| watchOS 5.2 | 10.2<br>10.2.1 | Apple Watch Series 2 - 38mm<br>Apple Watch Series 2 - 42mm<br>Apple Watch Series 3 - 38mm<br>Apple Watch Series 3 - 42mm<br>Apple Watch Series 4 - 40mm<br>Apple Watch Series 4 - 44mm | -| watchOS 5.3 | 10.3 | Apple Watch Series 2 - 38mm<br>Apple Watch Series 2 - 42mm<br>Apple Watch Series 3 - 38mm<br>Apple Watch Series 3 - 42mm<br>Apple Watch Series 4 - 40mm<br>Apple Watch Series 4 - 44mm | -| watchOS 6.0 | 11.0<br>11.1 | Apple Watch Series 4 - 40mm<br>Apple Watch Series 4 - 44mm<br>Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm | -| watchOS 6.1 | 11.2<br>11.2.1<br>11.3<br>11.3.1 | Apple Watch Series 4 - 40mm<br>Apple Watch Series 4 - 44mm<br>Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm | - -### Android -| Package Name | Version | -| -------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 4.0 | -| Android Emulator | 30.8.4 | -| Android SDK Build-tools | 31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3<br>26.0.0 26.0.1 26.0.2 26.0.3<br>25.0.0 25.0.1 25.0.2 25.0.3<br>24.0.0 24.0.1 24.0.2 24.0.3<br>23.0.1 23.0.2 23.0.3<br>22.0.1<br>21.1.2<br>20.0.0<br>19.1.0 | -| Android SDK Platforms | android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3)<br>android-26 (rev 2)<br>android-25 (rev 3)<br>android-24 (rev 2)<br>android-23 (rev 3)<br>android-22 (rev 2)<br>android-21 (rev 2)<br>android-20 (rev 2)<br>android-19 (rev 4)<br>android-18 (rev 3)<br>android-17 (rev 3)<br>android-16 (rev 5)<br>android-15 (rev 5) | -| Android SDK Platform-Tools | 31.0.3 | -| Android Support Repository | 47.0.0 | -| CMake | 3.10.2<br>3.18.1 | -| Google APIs | addon-google_apis-google-21<br>addon-google_apis-google-22<br>addon-google_apis-google-23<br>addon-google_apis-google-24 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 15.2.4203891<br>18.1.5063045<br>21.4.7075529 (default)<br>22.1.7171670<br>23.0.7599858 | -| SDK Patch Applier v4 | 1 | -| Intel HAXM | 7.6.5 | - -#### Environment variables -| Name | Value | -| ----------------------- | -------------------------------------------------------------------------------------------------- | -| ANDROID_HOME | /Users/runner/Library/Android/sdk | -| ANDROID_NDK_18R_PATH | /Users/runner/Library/Android/sdk/ndk/18.1.5063045 | -| ANDROID_NDK_HOME | /Users/runner/Library/Android/sdk/ndk-bundle -> /Users/runner/Library/Android/sdk/ndk/21.4.7075529 | -| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/23.0.7599858 | -| ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk-bundle -> /Users/runner/Library/Android/sdk/ndk/21.4.7075529 | -| ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | - - - diff --git a/images/macos/provision/configuration/configure-machine.sh b/images/macos/provision/configuration/configure-machine.sh index c97d44398af6..89ecfa020115 100644 --- a/images/macos/provision/configuration/configure-machine.sh +++ b/images/macos/provision/configuration/configure-machine.sh @@ -29,7 +29,7 @@ fi # sudo security delete-certificate -Z FF6797793A3CD798DC5B2ABEF56F73EDC9F83A64 /Library/Keychains/System.keychain curl https://www.apple.com/certificateauthority/AppleWWDRCAG3.cer --output $HOME/AppleWWDRCAG3.cer --silent # Big Sur requires user interaction to add a cert https://developer.apple.com/forums/thread/671582, we need to use a workaround with SecItemAdd swift method -if is_Less_BigSur; then +if is_Catalina; then sudo security add-trusted-cert -d -r unspecified -k /Library/Keychains/System.keychain $HOME/AppleWWDRCAG3.cer else swiftc $HOME/image-generation/add-certificate.swift diff --git a/images/macos/provision/configuration/finalize-vm.sh b/images/macos/provision/configuration/finalize-vm.sh index 44fb8e9ec5b2..e7af07eb3e00 100644 --- a/images/macos/provision/configuration/finalize-vm.sh +++ b/images/macos/provision/configuration/finalize-vm.sh @@ -5,7 +5,7 @@ source ~/utils/utils.sh # Close all finder windows because they can interfere with UI tests osascript -e 'tell application "Finder" to close windows' -if is_Less_BigSur; then +if is_Catalina; then # Ignore available updates to prevent system pop-ups updateName=$(softwareupdate -l | grep "Title: " | awk -F[:,] '{print $2}' | awk '{$1=$1};1') || true if [ ! -z "$updateName" ]; then diff --git a/images/macos/provision/configuration/preimagedata.sh b/images/macos/provision/configuration/preimagedata.sh index 4f20c842a962..21d9654db0a4 100644 --- a/images/macos/provision/configuration/preimagedata.sh +++ b/images/macos/provision/configuration/preimagedata.sh @@ -8,7 +8,7 @@ os_name=$(sw_vers -productName) os_version=$(sw_vers -productVersion) os_build=$(sw_vers -buildVersion) label_version=$(echo $os_version | cut -d. -f1,2) -if is_Less_BigSur; then +if is_Catalina; then label_version=$(echo $os_version | cut -d. -f1,2) else label_version=$(echo $os_version | cut -d. -f1) diff --git a/images/macos/provision/core/android-toolsets.sh b/images/macos/provision/core/android-toolsets.sh index 813d3cd057d1..0fe237ffbaeb 100755 --- a/images/macos/provision/core/android-toolsets.sh +++ b/images/macos/provision/core/android-toolsets.sh @@ -93,7 +93,7 @@ done # The Android Emulator uses the built-in Hypervisor.Framework by default, and falls back to using Intel HAXM if Hypervisor.Framework fails to initialize # https://developer.android.com/studio/run/emulator-acceleration#vm-mac # The installation doesn't work properly on macOS Big Sur, /dev/HAX is not created -if is_Less_BigSur; then +if is_Catalina; then chmod +x $ANDROID_HOME/extras/intel/Hardware_Accelerated_Execution_Manager/silent_install.sh sudo $ANDROID_HOME/extras/intel/Hardware_Accelerated_Execution_Manager/silent_install.sh fi diff --git a/images/macos/provision/core/audiodevice.sh b/images/macos/provision/core/audiodevice.sh index a078c04f858c..a94de8100fe2 100644 --- a/images/macos/provision/core/audiodevice.sh +++ b/images/macos/provision/core/audiodevice.sh @@ -9,7 +9,7 @@ brew_smart_install "sox" # Big Sur doesn't support soundflower installation without user interaction https://github.com/mattingalls/Soundflower/releases/tag/2.0b2 # Install blackhole-2ch for Big Sur instead -if is_Less_BigSur; then +if is_Catalina; then echo "install soundflower" brew install --cask soundflower diff --git a/images/macos/provision/core/commonutils.sh b/images/macos/provision/core/commonutils.sh index a91554f686d8..9b8df533447c 100644 --- a/images/macos/provision/core/commonutils.sh +++ b/images/macos/provision/core/commonutils.sh @@ -16,12 +16,6 @@ for package in $cask_packages; do brew install --cask $package done -# Specify Bazel version 3.7.1 to install due to the bug with 4.0.0: https://github.com/bazelbuild/bazel/pull/12882 -if is_Less_Catalina; then - export USE_BAZEL_VERSION="3.7.1" - echo "export USE_BAZEL_VERSION=${USE_BAZEL_VERSION}" >> "${HOME}/.bashrc" -fi - # Invoke bazel to download bazel version via bazelisk bazel diff --git a/images/macos/provision/core/dotnet.sh b/images/macos/provision/core/dotnet.sh index 31454ff71d38..1dad1c91479d 100755 --- a/images/macos/provision/core/dotnet.sh +++ b/images/macos/provision/core/dotnet.sh @@ -22,21 +22,11 @@ DOTNET_VERSIONS=($(get_toolset_value '.dotnet.versions | .[]')) for DOTNET_VERSION in "${DOTNET_VERSIONS[@]}"; do RELEASE_URL="https://raw.githubusercontent.com/dotnet/core/master/release-notes/${DOTNET_VERSION}/releases.json" - # Old Mono versions don't support NuGet versions from .Net sdk >=2.1.6**, exclude them explicitly from Mojave and HS images - # https://rider-support.jetbrains.com/hc/en-us/articles/360004180039 - if is_Less_Catalina; then - ARGS_LIST+=( - $(curl -s "$RELEASE_URL" | \ - jq -r '.releases[].sdk."version"' | grep -v -E '\-(preview|rc)\d*' | grep -v -E '2.1.[6-9]\d*' | \ - sort -r | rev | uniq -s 2 | rev) - ) - else - ARGS_LIST+=( - $(curl -s "$RELEASE_URL" | \ - jq -r '.releases[].sdk."version"' | grep -v -E '\-(preview|rc)\d*' | \ - sort -r | rev | uniq -s 2 | rev) - ) - fi + ARGS_LIST+=( + $(curl -s "$RELEASE_URL" | \ + jq -r '.releases[].sdk."version"' | grep -v -E '\-(preview|rc)\d*' | \ + sort -r | rev | uniq -s 2 | rev) + ) done for ARGS in "${ARGS_LIST[@]}"; do diff --git a/images/macos/provision/core/node.sh b/images/macos/provision/core/node.sh index 128b4f6fb06e..f98113fc0042 100644 --- a/images/macos/provision/core/node.sh +++ b/images/macos/provision/core/node.sh @@ -1,22 +1,11 @@ #!/bin/bash -e -o pipefail source ~/utils/utils.sh -if is_Less_Catalina; then - echo Installing the latest Node JS 8... - TMP_FILE=/tmp/node-v8.17.0.pkg - NODEURL=https://nodejs.org/dist/latest-v8.x/node-v8.17.0.pkg - download_with_retries $NODEURL "/tmp" - sudo installer -pkg "${TMP_FILE}" -target / - rm -rf "${TMP_FILE}" - sudo chown -R $USER "/usr/local/lib/node_modules" -else - # Install default Node.js for macOS >= 10.15 - defaultVersion=$(get_toolset_value '.node.default') +defaultVersion=$(get_toolset_value '.node.default') - echo "Installing Node.js $defaultVersion" - brew_smart_install "node@$defaultVersion" - brew link node@$defaultVersion --force -fi +echo "Installing Node.js $defaultVersion" +brew_smart_install "node@$defaultVersion" +brew link node@$defaultVersion --force echo Installing yarn... curl -o- -L https://yarnpkg.com/install.sh | bash diff --git a/images/macos/provision/core/openjdk.sh b/images/macos/provision/core/openjdk.sh index 5af74113507d..90a91695e7f9 100755 --- a/images/macos/provision/core/openjdk.sh +++ b/images/macos/provision/core/openjdk.sh @@ -79,7 +79,7 @@ done # Big Sur or newer does not have these versions of Adopt. # Also hardcode these versions as they only exist for Adopt -if is_Less_BigSur; then +if is_Catalina; then for adoptVersionToInstall in 12 13 14; do createEnvironmentVariable ${adoptVersionToInstall} "Adopt" done diff --git a/images/macos/provision/core/powershell.sh b/images/macos/provision/core/powershell.sh index 289b6106ca3b..fc6d6ffca3d6 100644 --- a/images/macos/provision/core/powershell.sh +++ b/images/macos/provision/core/powershell.sh @@ -7,7 +7,7 @@ psDownloadUrl=$(echo $psRelease | jq -r '.assets[].browser_download_url | select download_with_retries $psDownloadUrl "/tmp" "powershell.pkg" # Work around the issue on macOS Big Sur 11.5 or higher for possible error message ("can't be opened because Apple cannot check it for malicious software") when installing the package -if ! is_Less_BigSur; then +if ! is_Catalina; then sudo xattr -rd com.apple.quarantine /tmp/powershell.pkg fi diff --git a/images/macos/provision/core/xamarin.sh b/images/macos/provision/core/xamarin.sh index 5cc6b360cd48..b747faaa73fe 100755 --- a/images/macos/provision/core/xamarin.sh +++ b/images/macos/provision/core/xamarin.sh @@ -64,17 +64,11 @@ createBundleLink $CURRENT_SDK_SYMLINK "Current" # Fix nuget in some mono versions because of known bugs # -if is_Less_BigSur; then +if is_Catalina; then # Fix Mono issue with default nuget: https://github.com/mono/mono/issues/17637 installNuget "6.4.0" "5.3.1" fi -if is_Less_Catalina; then - installNuget "4.8.1" "4.3.0" - installNuget "5.0.1" "4.3.0" - installNuget "5.2.0" "4.3.0" -fi - # Creating UWP Shim to hack UWP build failure createUWPShim diff --git a/images/macos/provision/core/xcode.ps1 b/images/macos/provision/core/xcode.ps1 index 1f8ce717c497..802bb9af4392 100644 --- a/images/macos/provision/core/xcode.ps1 +++ b/images/macos/provision/core/xcode.ps1 @@ -32,10 +32,6 @@ $xcodeVersions | ForEach-Object -ThrottleLimit $threadCount -Parallel { } Write-Host "Configuring Xcode versions..." -if ($os.IsLessThanCatalina) { - $latestXcodeVersion = $xcodeVersions | Select-Object -Last 1 -ExpandProperty link - Install-XcodeAdditionalPackages -Version $latestXcodeVersion -} $xcodeVersions | ForEach-Object { Invoke-XcodeRunFirstLaunch -Version $_.link } diff --git a/images/macos/provision/utils/utils.sh b/images/macos/provision/utils/utils.sh index a51fab435af1..2e2789667439 100755 --- a/images/macos/provision/utils/utils.sh +++ b/images/macos/provision/utils/utils.sh @@ -63,32 +63,8 @@ is_Catalina() { fi } -is_Mojave() { - if [ "$OSTYPE" = "darwin18" ]; then - true - else - false - fi -} - -is_Less_Catalina() { - if is_Mojave; then - true - else - false - fi -} - -is_Less_BigSur() { - if is_Mojave || is_Catalina; then - true - else - false - fi -} - is_Less_Monterey() { - if is_Mojave || is_Catalina || is_BigSur; then + if is_Catalina || is_BigSur; then true else false @@ -124,9 +100,7 @@ brew_cask_install_ignoring_sha256() { } get_brew_os_keyword() { - if is_Mojave; then - echo "mojave" - elif is_Catalina; then + if is_Catalina; then echo "catalina" elif is_BigSur; then echo "big_sur" diff --git a/images/macos/software-report/SoftwareReport.Android.psm1 b/images/macos/software-report/SoftwareReport.Android.psm1 index ab7a2aa2a428..91973332271c 100644 --- a/images/macos/software-report/SoftwareReport.Android.psm1 +++ b/images/macos/software-report/SoftwareReport.Android.psm1 @@ -177,7 +177,7 @@ function Get-AndroidGoogleAPIsVersions { function Get-AndroidNDKVersions { $os = Get-OSVersion - if ($os.IsLessThanBigSur) { + if ($os.IsCatalina) { # Hardcode NDK 15 as a separate case since it is installed manually without sdk-manager (to none default location) $versions = @() $versions += "15.2.4203891" diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1 index d8d724a3b8a9..f77bc980e2e8 100644 --- a/images/macos/software-report/SoftwareReport.Generator.ps1 +++ b/images/macos/software-report/SoftwareReport.Generator.ps1 @@ -50,7 +50,7 @@ $languageAndRuntimeList = @( (Get-FortranVersion) ) -if ($os.IsLessThanBigSur) { +if ($os.IsCatalina) { $languageAndRuntimeList += @( (Get-RVersion) ) @@ -74,7 +74,8 @@ $packageManagementList = @( (Get-NuGetVersion), (Get-RubyGemsVersion), (Get-ComposerVersion), - (Get-CarthageVersion) + (Get-CarthageVersion), + (Get-VcpkgVersion) ) if ($os.IsLessThanMonterey) { @@ -83,12 +84,6 @@ if ($os.IsLessThanMonterey) { ) } -if ($os.IsHigherThanMojave) { - $packageManagementList += @( - (Get-VcpkgVersion) - ) -} - $markdown += New-MDList -Style Unordered -Lines ($packageManagementList | Sort-Object) if ($os.IsLessThanMonterey) { $markdown += New-MDHeader "Environment variables" -Level 4 @@ -141,13 +136,13 @@ if ($os.IsLessThanMonterey) { ) } -if ($os.IsHigherThanMojave -and $os.IsLessThanMonterey) { +if ($os.IsLessThanMonterey) { $utilitiesList += @( (Get-NewmanVersion) ) } -if ($os.IsLessThanBigSur) { +if ($os.IsCatalina) { $utilitiesList += @( (Get-VirtualBoxVersion), (Get-VagrantVersion), @@ -245,9 +240,8 @@ $markdown += Get-PowerShellModules | New-MDTable $markdown += New-MDNewLine # Web Servers -if ($os.IsHigherThanMojave) { - $markdown += Build-WebServersSection -} +$markdown += Build-WebServersSection + # Xamarin section $markdown += New-MDHeader "Xamarin" -Level 3 @@ -282,7 +276,7 @@ $markdown += New-MDNewLine # Android section $markdown += New-MDHeader "Android" -Level 3 $androidTable = Build-AndroidTable -if ($os.IsLessThanBigSur) { +if ($os.IsCatalina) { $androidTable += Get-IntelHaxmVersion } $markdown += $androidTable | New-MDTable diff --git a/images/macos/software-report/SoftwareReport.Xcode.psm1 b/images/macos/software-report/SoftwareReport.Xcode.psm1 index fba70458da58..b9ad8e834171 100644 --- a/images/macos/software-report/SoftwareReport.Xcode.psm1 +++ b/images/macos/software-report/SoftwareReport.Xcode.psm1 @@ -246,7 +246,7 @@ function Build-XcodeSupportToolsSection { ) } - if ($os.IsLessThanBigSur) { + if ($os.IsCatalina) { $xctool = Run-Command "xctool --version" $toolList += @( "xctool $xctool" diff --git a/images/macos/templates/macOS-10.14.json b/images/macos/templates/macOS-10.14.json deleted file mode 100644 index 3b17fda0934c..000000000000 --- a/images/macos/templates/macOS-10.14.json +++ /dev/null @@ -1,229 +0,0 @@ -{ - "variables": { - "vcenter_server": null, - "vcenter_username": null, - "vcenter_password": null, - "vcenter_datacenter": null, - "cluster_or_esxi_host": null, - "esxi_datastore": null, - "build_id": null, - "baseimage_name": null, - "output_folder": null, - "vm_username": null, - "vm_password": null, - "xcode_install_user": null, - "xcode_install_password": null, - "image_os": "macos1014" - }, - "builders": [ - { - "type": "vsphere-clone", - "vcenter_server": "{{user `vcenter_server`}}", - "username": "{{user `vcenter_username`}}", - "password": "{{user `vcenter_password`}}", - "insecure_connection": true, - "datacenter": "{{ user `vcenter_datacenter` }}", - "template": "{{ user `baseimage_name` }}", - "folder": "{{user `output_folder` }}", - "host": "{{user `cluster_or_esxi_host`}}", - "datastore": "{{user `esxi_datastore`}}", - "vm_name": "{{user `build_id`}}", - "ssh_username": "{{user `vm_username`}}", - "ssh_password": "{{user `vm_password`}}", - "CPUs": "10", - "RAM": "24576", - "NestedHV": "true", - "shutdown_timeout": "15m" - } - ], - "provisioners": [ - { - "type": "shell", - "inline": "mkdir ~/image-generation" - }, - { - "type": "file", - "source": "./provision/assets", - "destination": "~/image-generation/" - }, - { - "type": "file", - "source": "./tests", - "destination": "~/image-generation/" - }, - { - "type": "file", - "source": "./software-report", - "destination": "~/image-generation/" - }, - { - "type": "file", - "source": "./helpers", - "destination": "~/image-generation/" - }, - { - "type": "file", - "source": "./provision/configuration/environment/bashrc", - "destination": "~/.bashrc" - }, - { - "type": "file", - "source": "./provision/configuration/environment/bashprofile", - "destination": "~/.bash_profile" - }, - { - "type": "file", - "source": "./provision/utils", - "destination": "~/" - }, - { - "type": "file", - "source": "./provision/bootstrap-provisioner", - "destination": "~/bootstrap" - }, - { - "type": "file", - "source": "./toolsets/toolset-10.14.json", - "destination": "~/image-generation/toolset.json" - }, - { - "type": "shell", - "execute_command": "chmod +x {{ .Path }}; sudo {{ .Vars }} {{ .Path }}", - "scripts": [ - "./provision/configuration/add-network-interface-detection.sh", - "./provision/configuration/autologin.sh", - "./provision/configuration/disable-auto-updates.sh", - "./provision/configuration/screensaver-off.sh", - "./provision/configuration/ntpconf.sh", - "./provision/configuration/max-files.sh" - ], - "environment_vars": [ - "PASSWORD={{user `vm_password`}}", - "USERNAME={{user `vm_username`}}" - ] - }, - { - "type": "shell", - "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}", - "scripts": [ - "./provision/configuration/preimagedata.sh", - "./provision/configuration/configure-ssh.sh", - "./provision/configuration/configure-machine.sh" - ], - "environment_vars": [ - "IMAGE_VERSION={{user `build_id`}}", - "IMAGE_OS={{user `image_os`}}" - ] - }, - { - "type": "shell", - "execute_command": "chmod +x {{ .Path }}; sudo {{ .Vars }} {{ .Path }}", - "script": "./provision/core/reboot.sh", - "expect_disconnect": true - }, - { - "type": "shell", - "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}", - "pause_before": "30s", - "scripts": [ - "./provision/core/xcode-clt.sh", - "./provision/core/homebrew.sh", - "./provision/core/powershell.sh", - "./provision/core/dotnet.sh", - "./provision/core/python.sh", - "./provision/core/azcopy.sh", - "./provision/core/openssl.sh", - "./provision/core/ruby.sh", - "./provision/core/rubygem.sh", - "./provision/core/git.sh", - "./provision/core/node.sh" - ] - }, - { - "type": "shell", - "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} pwsh -f {{ .Path }}", - "script": "./provision/core/xcode.ps1", - "environment_vars": [ - "XCODE_INSTALL_USER={{user `xcode_install_user`}}", - "XCODE_INSTALL_PASSWORD={{user `xcode_install_password`}}" - ] - }, - { - "type": "shell", - "execute_command": "chmod +x {{ .Path }}; sudo {{ .Vars }} {{ .Path }}", - "script": "./provision/core/reboot.sh", - "expect_disconnect": true - }, - { - "type": "shell", - "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}", - "scripts": [ - "./provision/core/commonutils.sh", - "./provision/core/golang.sh", - "./provision/core/swiftlint.sh", - "./provision/core/openjdk.sh", - "./provision/core/php.sh", - "./provision/core/aws.sh", - "./provision/core/rust.sh", - "./provision/core/gcc.sh", - "./provision/core/haskell.sh", - "./provision/core/stack.sh", - "./provision/core/cocoapods.sh", - "./provision/core/android-toolsets.sh", - "./provision/core/xamarin.sh", - "./provision/core/xamarin-android-ndk.sh", - "./provision/core/vsmac.sh", - "./provision/core/nvm.sh", - "./provision/core/postgresql.sh", - "./provision/core/mongodb.sh", - "./provision/core/audiodevice.sh", - "./provision/core/safari.sh", - "./provision/core/chrome.sh", - "./provision/core/edge.sh", - "./provision/core/firefox.sh", - "./provision/core/miniconda.sh", - "./provision/core/xcode-sims.sh", - "./provision/core/xcode-postbuild.sh", - "./provision/core/pypy.sh", - "./provision/core/pipx-packages.sh", - "./provision/core/bicep.sh" - ] - }, - { - "type": "shell", - "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} pwsh -f {{ .Path }}", - "scripts": [ - "./provision/core/toolset.ps1", - "./provision/core/configure-toolset.ps1" - ] - }, - { - "type": "shell", - "execute_command": "ruby {{ .Path }}", - "scripts": [ - "./provision/core/delete-duplicate-sims.rb" - ] - }, - { - "type": "shell", - "inline": [ - "pwsh -File \"$HOME/image-generation/software-report/SoftwareReport.Generator.ps1\" -OutputDirectory \"$HOME/image-generation/output/software-report\" -ImageName {{user `build_id`}}", - "pwsh -File \"$HOME/image-generation/tests/RunAll-Tests.ps1\"" - ] - }, - { - "type": "file", - "direction": "download", - "source": "~/image-generation/output/*", - "destination": "../image-output/" - }, - { - "type": "shell", - "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}", - "scripts": [ - "./provision/configuration/configure-hostname.sh", - "./provision/configuration/finalize-vm.sh" - ] - } - ] -} diff --git a/images/macos/tests/Common.Tests.ps1 b/images/macos/tests/Common.Tests.ps1 index 19f338a2c28e..9d05270fe67d 100644 --- a/images/macos/tests/Common.Tests.ps1 +++ b/images/macos/tests/Common.Tests.ps1 @@ -33,7 +33,7 @@ Describe "GCC" { } } -Describe "vcpkg" -Skip:($os.IsMojave) { +Describe "vcpkg" { It "vcpkg" { "vcpkg version" | Should -ReturnZeroExitCode } diff --git a/images/macos/tests/System.Tests.ps1 b/images/macos/tests/System.Tests.ps1 index 2b7f00915ba5..a067fb5f4d75 100644 --- a/images/macos/tests/System.Tests.ps1 +++ b/images/macos/tests/System.Tests.ps1 @@ -30,7 +30,7 @@ Describe "Audio device" { SwitchAudioSource -c | Should -BeLikeExactly "Soundflower (2ch)" } - It "Audio channel BlackHole 2ch" -Skip:($os.IsLessThanBigSur) { + It "Audio channel BlackHole 2ch" -Skip:($os.IsCatalina) { SwitchAudioSource -c | Should -BeLikeExactly "BlackHole 2ch" } } diff --git a/images/macos/tests/WebServers.Tests.ps1 b/images/macos/tests/WebServers.Tests.ps1 index ae9dc724f198..0763320ab8e2 100644 --- a/images/macos/tests/WebServers.Tests.ps1 +++ b/images/macos/tests/WebServers.Tests.ps1 @@ -1,6 +1,6 @@ $os = Get-OSVersion -Describe "Apache" -Skip:($os.IsLessThanCatalina) { +Describe "Apache" { It "Apache CLI" { "httpd -v" | Should -ReturnZeroExitCode } @@ -10,7 +10,7 @@ Describe "Apache" -Skip:($os.IsLessThanCatalina) { } } -Describe "Nginx" -Skip:($os.IsLessThanCatalina) { +Describe "Nginx" { It "Nginx CLI" { "nginx -v" | Should -ReturnZeroExitCode } diff --git a/images/macos/toolsets/toolset-10.14.json b/images/macos/toolsets/toolset-10.14.json deleted file mode 100644 index 420f0ecc4eaa..000000000000 --- a/images/macos/toolsets/toolset-10.14.json +++ /dev/null @@ -1,390 +0,0 @@ -{ - "xcode": { - "default": "11.3.1", - "versions": [ - { "link": "11.3.1", "version": "11.3.1", "symlinks": ["11.3.1_beta"] }, - { "link": "11.3", "version": "11.3.0", "symlinks": ["11.3_beta"] }, - { "link": "11.2.1", "version": "11.2.1", "symlinks": ["11.2.1_beta"] }, - { "link": "11.2", "version": "11.2.0", "symlinks": ["11.2_beta"] }, - { "link": "11.1", "version": "11.1.0", "symlinks": ["11.1_beta"] }, - { "link": "11", "version": "11.0.0", "symlinks": ["11_beta"] }, - { "link": "10.3", "version": "10.3.0", "symlinks": ["10.3_beta"] }, - { "link": "10.2.1", "version": "10.2.1", "symlinks": ["10.2.1_beta"] }, - { "link": "10.2", "version": "10.2.0", "symlinks": ["10.2_beta"] }, - { "link": "10.1", "version": "10.1.0", "symlinks": ["10.1_beta"] }, - { "link": "10", "version": "10.0.0", "symlinks": ["10_beta"] }, - { "link": "9.4.1", "version": "9.4.1" } - ] - }, - "xamarin": { - "vsmac": "8.5.0.3183", - "mono-versions": [ - "6.8.0.123", "6.6.0.166", "6.4.0.208", "6.0.0.334", "5.18.1.3", "5.16.1.0", "5.12.0.309", "5.10.1.57", "5.8.1.0", "5.4.1.7", "5.2.0.224", "5.0.1.1", "4.8.1.0" - ], - "ios-versions": [ - "13.14.1.39", "13.10.0.21", "13.8.3.0", "13.6.0.12", "13.4.0.2", "13.2.0.47", "12.14.0.114", "12.10.0.157", "12.8.0.2", "12.6.0.25", "12.2.1.16", "12.0.0.15", "11.14.0.13", "11.12.0.4", "11.9.1.24", "11.8.0.20", "11.6.1.4", "11.2.0.11", "11.0.0.0", "10.10.0.36", "10.6.0.10" - ], - "mac-versions": [ - "6.14.1.39", "6.10.0.21", "6.8.3.0", "6.6.0.12", "6.4.0.2", "6.2.0.47", "5.16.1.24", "5.10.0.157", "5.8.0.0", "5.6.0.25", "5.3.1.28", "5.2.1.16" , "4.6.0.13", "4.4.1.193", "4.2.1.28", "4.0.0.216", "3.8.0.49", "3.6.3.3", "3.4.0.36", "3.0.0.398" - ], - "android-versions": [ - "10.2.0.100", "10.1.3.7", "10.0.6.2", "9.4.1.0", "9.3.0-23", "9.2.3-0", "9.1.8-0", "9.0.0-20", "8.3.3-2", "8.2.0-16", "8.1.5-0", "8.0.0-33", "7.4.5-1", "7.3.1-2", "7.1.0-43" - ], - "bundle-default": "5_12_0", - "bundles": [ - { - "symlink": "6_8_0", - "mono": "6.8", - "ios": "13.14", - "mac": "6.14", - "android": "10.2" - }, - { - "symlink": "6_6_1", - "mono": "6.6", - "ios": "13.10", - "mac": "6.10", - "android": "10.1" - }, - { - "symlink": "6_6_0", - "mono": "6.6", - "ios": "13.8", - "mac": "6.8", - "android": "10.1" - }, - { - "symlink": "6_4_2", - "mono": "6.4", - "ios": "13.6", - "mac": "6.6", - "android": "10.0" - }, - { - "symlink": "6_4_1", - "mono": "6.4", - "ios": "13.4", - "mac": "6.4", - "android": "10.0" - }, - { - "symlink": "6_4_0", - "mono": "6.4", - "ios": "13.2", - "mac": "6.2", - "android": "10.0" - }, - { - "symlink": "6_0_0", - "mono": "6.0", - "ios": "12.14", - "mac": "5.16", - "android": "9.4" - }, - { - "symlink": "5_18_3", - "mono": "5.18", - "ios": "12.10", - "mac": "5.10", - "android": "9.3" - }, - { - "symlink": "5_18_2", - "mono": "5.18", - "ios": "12.8", - "mac": "5.8", - "android": "9.2" - }, - { - "symlink": "5_18_1", - "mono": "5.18", - "ios": "12.6", - "mac": "5.6", - "android": "9.2" - }, - { - "symlink": "5_16_0_0", - "mono": "5.16", - "ios": "12.2", - "mac": "5.2", - "android": "9.1" - }, - { - "symlink": "5_16_0", - "mono": "5.16", - "ios": "12.2", - "mac": "5.2", - "android": "9.1" - }, - { - "symlink": "5_12_0_3", - "mono": "5.12", - "ios": "12.2", - "mac": "5.3", - "android": "9.0" - }, - { - "symlink": "5_12_0_XC10_PRE", - "mono": "5.12", - "ios": "12.0", - "mac": "5.2", - "android": "9.0" - }, - { - "symlink": "5_12_0", - "mono": "5.12", - "ios": "11.14", - "mac": "4.6", - "android": "9.0" - }, - { - "symlink": "5_10_1", - "mono": "5.10", - "ios": "11.12", - "mac": "4.4", - "android": "8.3" - }, - { - "symlink": "5_8_1", - "mono": "5.8", - "ios": "11.9", - "mac": "4.2", - "android": "8.2" - }, - { - "symlink": "5_8_0", - "mono": "5.8", - "ios": "11.8", - "mac": "4.2", - "android": "8.2" - }, - { - "symlink": "5_4_1", - "mono": "5.4", - "ios": "11.6", - "mac": "4.0", - "android": "8.1" - }, - { - "symlink": "5_4_0", - "mono": "5.4", - "ios": "11.2", - "mac": "3.8", - "android": "8.0" - }, - { - "symlink": "5_2_0", - "mono": "5.2", - "ios": "11.0", - "mac": "3.6", - "android": "7.4" - }, - { - "symlink": "Legacy_5_0_1", - "mono": "5.0", - "ios": "10.10", - "mac": "3.4", - "android": "7.3" - }, - { - "symlink": "Legacy_4_8_1", - "mono": "4.8", - "ios": "10.6", - "mac": "3.0", - "android": "7.1" - } - ] - }, - "java": { - "default": "8", - "default_vendor": "Temurin-Hotspot", - "vendors": [ - { - "name": "Temurin-Hotspot", - "versions": [ "8", "11", "17" ] - }, - { - "name": "Adopt", - "versions": [ "8", "11", "12", "13", "14" ] - } - ] - }, - "android": { - "platform_min_version": "15", - "build_tools_min_version": "17.0.0", - "extra-list": [ - "android;m2repository", "google;m2repository", "google;google_play_services", "intel;Hardware_Accelerated_Execution_Manager", "m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta1", "m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta2", "m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta3", "m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta4", "m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta5", "m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0", "m2repository;com;android;support;constraint;constraint-layout-solver;1.0.1", "m2repository;com;android;support;constraint;constraint-layout-solver;1.0.2", "m2repository;com;android;support;constraint;constraint-layout;1.0.0-beta1", "m2repository;com;android;support;constraint;constraint-layout;1.0.0-beta2", "m2repository;com;android;support;constraint;constraint-layout;1.0.0-beta3", "m2repository;com;android;support;constraint;constraint-layout;1.0.0-beta4", "m2repository;com;android;support;constraint;constraint-layout;1.0.0-beta5", "m2repository;com;android;support;constraint;constraint-layout;1.0.0", "m2repository;com;android;support;constraint;constraint-layout;1.0.1", "m2repository;com;android;support;constraint;constraint-layout;1.0.2" - ], - "addon-list": [ - "addon-google_apis-google-24", "addon-google_apis-google-23", "addon-google_apis-google-22", "addon-google_apis-google-21" - ], - "additional-tools": [ - "cmake;3.10.2.4988404", - "cmake;3.18.1" - ], - "ndk": { - "default": "21", - "versions": [ - "21", "22", "23" - ] - } - }, - "powershellModules": [ - { - "name": "Az", - "versions": [ - "6.1.0" - ] - }, - {"name": "MarkdownPS"}, - {"name": "Pester"}, - {"name": "PSScriptAnalyzer"} - ], - "npm": { - "global_packages": [ - { "name": "npm@3" }, - { "name": "omelette@0.4.14" }, - { "name": "appcenter-cli@^1.0.0", "test": "appcenter --version" }, - { "name": "node-gyp" } - ] - }, - "brew": { - "common_packages": [ - "aliyun-cli", - "ant", - "aria2", - "azure-cli", - "bats", - "bazelisk", - "carthage", - "cmake", - "gh", - "gnupg", - "gnu-tar", - "helm", - "kotlin", - "libpq", - "llvm", - "p7zip", - "packer", - "parallel", - "perl", - "sbt", - "subversion", - "swiftformat", - "swig", - "xctool", - "zstd" - ], - "cask_packages": [ - "julia", - "r", - "vagrant", - "virtualbox" - ] - }, - "gcc": { - "versions": [ - "9", - "10", - "11" - ] - }, - "toolcache": [ - { - "name": "Python", - "url" : "https://raw.githubusercontent.com/actions/python-versions/main/versions-manifest.json", - "arch": "x64", - "platform" : "darwin", - "versions": [ - "2.7.*", - "3.5.*", - "3.6.*", - "3.7.*", - "3.8.*", - "3.9.*", - "3.10.*" - ] - }, - { - "name": "PyPy", - "arch": "x64", - "platform" : "darwin", - "versions": [ - "2.7", - "3.6" - ] - }, - { - "name": "Node", - "url" : "https://raw.githubusercontent.com/actions/node-versions/main/versions-manifest.json", - "platform" : "darwin", - "arch": "x64", - "versions": [ - "10.*", - "12.*", - "14.*" - ] - }, - { - "name": "Go", - "url" : "https://raw.githubusercontent.com/actions/go-versions/main/versions-manifest.json", - "arch": "x64", - "platform" : "darwin", - "variable_template" : "GOROOT_{0}_{1}_X64", - "versions": [ - "1.15.*", - "1.16.*", - "1.17.*" - ] - }, - { - "name": "Ruby", - "arch": "x64", - "versions": [ - "2.4.*", - "2.5.*", - "2.6.*", - "2.7.*", - "3.0.*" - ] - } - ], - "pipx": [ - { - "package": "yamllint", - "cmd": "yamllint --version" - } - ], - "dotnet": { - "versions": [ - "2.1" - ] - }, - "ruby": { - "default": "2.7", - "rubygems": [ - "xcode-install", - "cocoapods", - "nomad-cli", - "xcpretty", - "bundler", - "fastlane", - "jazzy" - ] - }, - "go": { - "default": "1.15" - }, - "node": { - "default": "8", - "nvm_versions": [ - "10", - "12", - "14" - ] - }, - "mongodb": { - "version": "5.0" - } -} From cd453927cac82e4dc2658bb65d42b2c97eb83212 Mon Sep 17 00:00:00 2001 From: Dibir Magomedsaygitov <61747324+dibir-magomedsaygitov@users.noreply.github.com> Date: Thu, 6 Jan 2022 15:50:24 +0300 Subject: [PATCH 0878/3485] downgrade rubygems version to 3.2.33 (#4815) --- images/macos/provision/core/rubygem.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/images/macos/provision/core/rubygem.sh b/images/macos/provision/core/rubygem.sh index 60cd1c93dfd0..73906297804d 100755 --- a/images/macos/provision/core/rubygem.sh +++ b/images/macos/provision/core/rubygem.sh @@ -1,8 +1,9 @@ #!/bin/bash -e -o pipefail source ~/utils/utils.sh +# Temporarily downgrade RubyGems version to 3.2.33 due to issue with RubyGems 3.3.3 (https://github.com/actions/virtual-environments-internal/issues/3162) echo Updating RubyGems... -gem update --system +gem update --system 3.2.33 gemsToInstall=$(get_toolset_value '.ruby.rubygems | .[]') if [ -n "$gemsToInstall" ]; then From 97368aa175b8298230ad3efabca6937a6f02db0f Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Sun, 9 Jan 2022 11:40:39 +0300 Subject: [PATCH 0879/3485] [Ubuntu] put snap.sh upper environment cleanup (#4847) --- images/linux/ubuntu1804.json | 10 +++++----- images/linux/ubuntu2004.json | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/images/linux/ubuntu1804.json b/images/linux/ubuntu1804.json index 4fb6da11ec51..538f8019e640 100644 --- a/images/linux/ubuntu1804.json +++ b/images/linux/ubuntu1804.json @@ -294,6 +294,11 @@ ], "execute_command": "/bin/sh -c '{{ .Vars }} {{ .Path }}'" }, + { + "type": "shell", + "script": "{{template_dir}}/scripts/base/snap.sh", + "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" + }, { "type": "shell", "expect_disconnect": true, @@ -316,11 +321,6 @@ "script": "{{template_dir}}/scripts/base/apt-mock-remove.sh", "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" }, - { - "type": "shell", - "script": "{{template_dir}}/scripts/base/snap.sh", - "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" - }, { "type": "shell", "inline": [ diff --git a/images/linux/ubuntu2004.json b/images/linux/ubuntu2004.json index d88e3779cf23..a44f7402d981 100644 --- a/images/linux/ubuntu2004.json +++ b/images/linux/ubuntu2004.json @@ -295,6 +295,11 @@ ], "execute_command": "/bin/sh -c '{{ .Vars }} {{ .Path }}'" }, + { + "type": "shell", + "script": "{{template_dir}}/scripts/base/snap.sh", + "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" + }, { "type": "shell", "expect_disconnect": true, @@ -317,11 +322,6 @@ "script": "{{template_dir}}/scripts/base/apt-mock-remove.sh", "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" }, - { - "type": "shell", - "script": "{{template_dir}}/scripts/base/snap.sh", - "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" - }, { "type": "shell", "inline": [ From 865d8050970ea72e4a4a46eeec0b081b393349f4 Mon Sep 17 00:00:00 2001 From: Craig Morten <cmorten@users.noreply.github.com> Date: Tue, 11 Jan 2022 10:40:14 +0000 Subject: [PATCH 0880/3485] [macOS] Enable voiceover applescript defaults (#4824) * feat: enable voiceover applescript in defaults * refactor: reword comment * fix: grammar in VO comment --- images/macos/provision/configuration/configure-machine.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/images/macos/provision/configuration/configure-machine.sh b/images/macos/provision/configuration/configure-machine.sh index 89ecfa020115..a3b7c039d6d4 100644 --- a/images/macos/provision/configuration/configure-machine.sh +++ b/images/macos/provision/configuration/configure-machine.sh @@ -17,10 +17,13 @@ if [ -d "/Library/Application Support/VMware Tools" ]; then sudo "/Library/Application Support/VMware Tools/vmware-resolutionSet" 1176 885 fi -# Update VoiceOver Utility to allow VoiceOver to be controlled with AppleScript by creating a special file (SIP must be disabled) +# Update VoiceOver Utility to allow VoiceOver to be controlled with AppleScript +# by creating a special Accessibility DB file (SIP must be disabled) and +# updating the user defaults system to reflect this change. if csrutil status | grep -Eq "System Integrity Protection status: (disabled|unknown)"; then sudo bash -c 'echo -n "a" > /private/var/db/Accessibility/.VoiceOverAppleScriptEnabled' fi +defaults write com.apple.VoiceOver4/default SCREnableAppleScript -bool YES # https://developer.apple.com/support/expiration/ # Enterprise iOS Distribution Certificates generated between February 7 and September 1st, 2020 will expire on February 7, 2023. From 340f75b8f23a3217525ae5c7ccca3a6a5fd62c8e Mon Sep 17 00:00:00 2001 From: Maksim Shilov <89912354+shilovmaksim@users.noreply.github.com> Date: Wed, 12 Jan 2022 09:55:46 +0300 Subject: [PATCH 0881/3485] Add vc v141 ATL ARM/64 components (#4857) --- images/win/toolsets/toolset-2019.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index 6051c0b5bcda..ce9bdb485b6a 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -327,6 +327,8 @@ "Microsoft.VisualStudio.Component.VC.v141.ARM.Spectre", "Microsoft.VisualStudio.Component.VC.v141.ARM64.Spectre", "Microsoft.VisualStudio.Component.VC.v141.ATL", + "Microsoft.VisualStudio.Component.VC.v141.ATL.ARM", + "Microsoft.VisualStudio.Component.VC.v141.ATL.ARM64", "Microsoft.VisualStudio.Component.VC.v141.ATL.ARM.Spectre", "Microsoft.VisualStudio.Component.VC.v141.ATL.ARM64.Spectre", "Microsoft.VisualStudio.Component.VC.v141.ATL.Spectre", From 9a54916b6c9d14f479a41d76a82c6e4e6e5bce44 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Wed, 12 Jan 2022 12:54:57 +0300 Subject: [PATCH 0882/3485] Pass build_id as an argument to ImageName (#4869) --- images/macos/templates/macOS-11.pkr.hcl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/macos/templates/macOS-11.pkr.hcl b/images/macos/templates/macOS-11.pkr.hcl index 7e44532a391b..6cdea6efe1f7 100644 --- a/images/macos/templates/macOS-11.pkr.hcl +++ b/images/macos/templates/macOS-11.pkr.hcl @@ -205,7 +205,7 @@ build { } provisioner "shell" { inline = [ - "pwsh -File \"$HOME/image-generation/software-report/SoftwareReport.Generator.ps1\" -OutputDirectory \"$HOME/image-generation/output/software-report\" -ImageName UUID=${build.PackerRunUUID}", + "pwsh -File \"$HOME/image-generation/software-report/SoftwareReport.Generator.ps1\" -OutputDirectory \"$HOME/image-generation/output/software-report\" -ImageName ${var.build_id}", "pwsh -File \"$HOME/image-generation/tests/RunAll-Tests.ps1\"" ] execute_command = "source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" From 1048793daacbe1e6c3701382d9d600b7398d9d15 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Wed, 12 Jan 2022 22:05:33 +0300 Subject: [PATCH 0883/3485] [Ubuntu] Add Eclipse Temurin (Adoptium) to Java installer (#4868) --- .../SoftwareReport/SoftwareReport.Java.psm1 | 17 ++- images/linux/scripts/installers/java-tools.sh | 144 +++++++++++++----- images/linux/scripts/tests/Java.Tests.ps1 | 25 ++- images/linux/toolsets/toolset-1804.json | 12 +- images/linux/toolsets/toolset-2004.json | 14 +- 5 files changed, 158 insertions(+), 54 deletions(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Java.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Java.psm1 index ae13eab9a229..7d7067719aa4 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Java.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Java.psm1 @@ -1,19 +1,22 @@ function Get-JavaVersions { - $toolcachePath = Join-Path $env:AGENT_TOOLSDIRECTORY "Java_Adopt_jdk" - $javaToolcacheVersions = Get-ChildItem $toolcachePath -Name | Sort-Object { [int]$_.Split(".")[0] } + $javaToolcacheVersions = Get-ChildItem $env:AGENT_TOOLSDIRECTORY/Java*/* -Directory | Sort-Object { [int]$_.Name.Split(".")[0] } - return $javaToolcacheVersions | ForEach-Object { - $majorVersion = $_.split(".")[0] - $fullVersion = $_.Replace("-", "+") + $existingVersions = $javaToolcacheVersions | ForEach-Object { + $majorVersion = $_.Name.split(".")[0] + $fullVersion = $_.Name.Replace("-", "+") $defaultJavaPath = $env:JAVA_HOME $javaPath = Get-Item env:JAVA_HOME_${majorVersion}_X64 $defaultPostfix = ($javaPath.Value -eq $defaultJavaPath) ? " (default)" : "" + $vendorName = ($_.FullName -like '*Java_Adopt_jdk*') ? "Adopt OpenJDK" : "Eclipse Temurin" [PSCustomObject] @{ "Version" = $fullVersion + $defaultPostfix - "Vendor" = "Adopt OpenJDK" + "Vendor" = $vendorName "Environment Variable" = $javaPath.Name } } -} \ No newline at end of file + # Return all the vendors which are not Adopt, also look for version 12 of Adopt (Eclipse Temurin does not have this version) + $versionsToReturn = $existingVersions | Where-Object {$_.Vendor -notlike "Adopt*" -or $_.Version.Split(".")[0] -eq 12} + return $versionsToReturn +} diff --git a/images/linux/scripts/installers/java-tools.sh b/images/linux/scripts/installers/java-tools.sh index 32113b31ea61..2ac4817d0040 100644 --- a/images/linux/scripts/installers/java-tools.sh +++ b/images/linux/scripts/installers/java-tools.sh @@ -8,50 +8,120 @@ source $HELPER_SCRIPTS/install.sh source $HELPER_SCRIPTS/os.sh source $HELPER_SCRIPTS/etc-environment.sh -JAVA_VERSIONS_LIST=$(get_toolset_value '.java.versions | .[]') -DEFAULT_JDK_VERSION=$(get_toolset_value '.java.default') -JAVA_TOOLCACHE_PATH="$AGENT_TOOLSDIRECTORY/Java_Adopt_jdk" - -# Install GPG Key for Adopt Open JDK. See https://adoptopenjdk.net/installation.html -wget -qO - "https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public" | apt-key add - -add-apt-repository --yes https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ - -if isUbuntu18 ; then - # Install GPG Key for Azul Open JDK. See https://www.azul.com/downloads/azure-only/zulu/ - apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0xB1998361219BD9C9 - apt-add-repository "deb https://repos.azul.com/azure-only/zulu/apt stable main" -fi +createJavaEnvironmentalVariable() { + local JAVA_VERSION=$1 + local VENDOR_NAME=$2 + local DEFAULT=$3 -apt-get update + case ${VENDOR_NAME} in -for JAVA_VERSION in ${JAVA_VERSIONS_LIST[@]}; do - apt-get -y install adoptopenjdk-$JAVA_VERSION-hotspot=\* - javaVersionPath="/usr/lib/jvm/adoptopenjdk-${JAVA_VERSION}-hotspot-amd64" - echo "JAVA_HOME_${JAVA_VERSION}_X64=$javaVersionPath" | tee -a /etc/environment - fullJavaVersion=$(cat "$javaVersionPath/release" | grep "^SEMANTIC" | cut -d "=" -f 2 | tr -d "\"" | tr "+" "-") + "Adopt" ) + INSTALL_PATH_PATTERN="/usr/lib/jvm/adoptopenjdk-${JAVA_VERSION}-hotspot-amd64" ;; - # If there is no semver in java release, then extract java version from -fullversion - if [[ -z $fullJavaVersion ]]; then - fullJavaVersion=$(java -fullversion 2>&1 | tr -d "\"" | tr "+" "-" | awk '{print $4}') + "Temurin-Hotspot" ) + INSTALL_PATH_PATTERN="/usr/lib/jvm/temurin-${JAVA_VERSION}-jdk-amd64" ;; + *) + echo "Unknown vendor" + exit 1 + + esac + + if [[ ${DEFAULT} == "True" ]]; then + echo "Setting up JAVA_HOME variable to ${INSTALL_PATH_PATTERN}" + addEtcEnvironmentVariable JAVA_HOME ${INSTALL_PATH_PATTERN} + echo "Setting up default symlink" + update-java-alternatives -s ${INSTALL_PATH_PATTERN} fi - javaToolcacheVersionPath="$JAVA_TOOLCACHE_PATH/$fullJavaVersion" - mkdir -p "$javaToolcacheVersionPath" + echo "Setting up JAVA_HOME_${JAVA_VERSION}_X64 variable to ${INSTALL_PATH_PATTERN}" + addEtcEnvironmentVariable JAVA_HOME_${JAVA_VERSION}_X64 ${INSTALL_PATH_PATTERN} +} + +enableRepositories() { + # Add Adopt PPA + wget -qO - "https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public" | apt-key add - + add-apt-repository --yes https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ + + # Add Addoptium PPA + wget -qO - "https://packages.adoptium.net/artifactory/api/gpg/key/public" | apt-key add - + add-apt-repository --yes https://packages.adoptium.net/artifactory/deb/ + + if isUbuntu18 ; then + # Install GPG Key for Azul Open JDK. See https://www.azul.com/downloads/azure-only/zulu/ + apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0xB1998361219BD9C9 + apt-add-repository "deb https://repos.azul.com/azure-only/zulu/apt stable main" + fi +} + +installOpenJDK() { + local JAVA_VERSION=$1 + local VENDOR_NAME=$2 + + # Install Java from PPA repositories. + if [[ ${VENDOR_NAME} == "Temurin-Hotspot" ]]; then + apt-get -y install temurin-${JAVA_VERSION}-jdk=\* + javaVersionPath="/usr/lib/jvm/temurin-${JAVA_VERSION}-jdk-amd64" + elif [[ ${VENDOR_NAME} == "Adopt" ]]; then + apt-get -y install adoptopenjdk-${JAVA_VERSION}-hotspot=\* + javaVersionPath="/usr/lib/jvm/adoptopenjdk-${JAVA_VERSION}-hotspot-amd64" + else + echo "${VENDOR_NAME} is invalid, valid names are: Temurin-Hotspot and Adopt" + exit 1 + fi + + JAVA_TOOLCACHE_PATH="${AGENT_TOOLSDIRECTORY}/Java_${VENDOR_NAME}_jdk" + + fullJavaVersion=$(cat "${javaVersionPath}/release" | grep "^SEMANTIC" | cut -d "=" -f 2 | tr -d "\"" | tr "+" "-") + + # If there is no semver in java release, then extract java version from -fullversion + [[ -z ${fullJavaVersion} ]] && fullJavaVersion=$(${javaVersionPath}/bin/java -fullversion 2>&1 | tr -d "\"" | tr "+" "-" | awk '{print $4}') + + javaToolcacheVersionPath="${JAVA_TOOLCACHE_PATH}/${fullJavaVersion}" + mkdir -p "${javaToolcacheVersionPath}" # Create a complete file - touch "$javaToolcacheVersionPath/x64.complete" + touch "${javaToolcacheVersionPath}/x64.complete" # Create symlink for Java - ln -s $javaVersionPath "$javaToolcacheVersionPath/x64" -done + ln -s ${javaVersionPath} "${javaToolcacheVersionPath}/x64" + + # add extra permissions to be able execute command without sudo + chmod -R 777 /usr/lib/jvm +} + +# Fetch repositories data +enableRepositories + +# Get all the updates from enabled repositories. +apt-get update + +defaultVersion=$(get_toolset_value '.java.default') +defaultVendor=$(get_toolset_value '.java.default_vendor') +jdkVendors=($(get_toolset_value '.java.vendors[].name')) + +for jdkVendor in ${jdkVendors[@]}; do -# Set Default Java version -update-java-alternatives -s /usr/lib/jvm/adoptopenjdk-${DEFAULT_JDK_VERSION}-hotspot-amd64 + # get vendor-specific versions + jdkVersionsToInstall=($(get_toolset_value ".java.vendors[] | select (.name==\"${jdkVendor}\") | .versions[]")) -echo "JAVA_HOME=/usr/lib/jvm/adoptopenjdk-${DEFAULT_JDK_VERSION}-hotspot-amd64" | tee -a /etc/environment + for jdkVersionToInstall in ${jdkVersionsToInstall[@]}; do + + installOpenJDK ${jdkVersionToInstall} ${jdkVendor} + + isDefaultVersion=False; [[ ${jdkVersionToInstall} == ${defaultVersion} ]] && isDefaultVersion=True + + if [[ ${jdkVendor} == ${defaultVendor} ]]; then + createJavaEnvironmentalVariable ${jdkVersionToInstall} ${jdkVendor} ${isDefaultVersion} + fi + + done +done + +# Adopt 12 is only available for Ubuntu 18.04 +if isUbuntu18; then + createJavaEnvironmentalVariable "12" "Adopt" +fi -# add extra permissions to be able execute command without sudo -chmod -R 777 /usr/lib/jvm # Install Ant apt-get install -y --no-install-recommends ant ant-optional echo "ANT_HOME=/usr/share/ant" | tee -a /etc/environment @@ -67,11 +137,11 @@ ln -s /usr/share/apache-maven-${mavenVersion}/bin/mvn /usr/bin/mvn # This script founds the latest gradle release from https://services.gradle.org/versions/all # The release is downloaded, extracted, a symlink is created that points to it, and GRADLE_HOME is set. gradleJson=$(curl -s https://services.gradle.org/versions/all) -gradleLatestVersion=$(echo $gradleJson | jq -r '.[] | select(.version | contains("-") | not).version' | sort -V | tail -n1) -gradleDownloadUrl=$(echo $gradleJson | jq -r ".[] | select(.version==\"$gradleLatestVersion\") | .downloadUrl") -echo "gradleUrl=$gradleDownloadUrl" -echo "gradleVersion=$gradleLatestVersion" -download_with_retries $gradleDownloadUrl "/tmp" "gradleLatest.zip" +gradleLatestVersion=$(echo ${gradleJson} | jq -r '.[] | select(.version | contains("-") | not).version' | sort -V | tail -n1) +gradleDownloadUrl=$(echo ${gradleJson} | jq -r ".[] | select(.version==\"$gradleLatestVersion\") | .downloadUrl") +echo "gradleUrl=${gradleDownloadUrl}" +echo "gradleVersion=${gradleLatestVersion}" +download_with_retries ${gradleDownloadUrl} "/tmp" "gradleLatest.zip" unzip -qq -d /usr/share /tmp/gradleLatest.zip ln -s /usr/share/gradle-"${gradleLatestVersion}"/bin/gradle /usr/bin/gradle echo "GRADLE_HOME=$(find /usr/share -depth -maxdepth 1 -name "gradle*")" | tee -a /etc/environment diff --git a/images/linux/scripts/tests/Java.Tests.ps1 b/images/linux/scripts/tests/Java.Tests.ps1 index 1a5932744bf5..67fa7929560d 100644 --- a/images/linux/scripts/tests/Java.Tests.ps1 +++ b/images/linux/scripts/tests/Java.Tests.ps1 @@ -1,10 +1,15 @@ Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" -DisableNameChecking Describe "Java" { - [array]$jdkVersions = (Get-ToolsetContent).java.versions | ForEach-Object { @{Version = $_} } - $defaultJavaVersion = (Get-ToolsetContent).java.default + $toolsetJava = (Get-ToolsetContent).java + $defaultVersion = $toolsetJava.default + $defaultVendor = $toolsetJava.default_vendor + $javaVendors = $toolsetJava.vendors - It "Java <DefaultJavaVersion> is default" -TestCases @{ DefaultJavaVersion = $defaultJavaVersion } { + [array]$jdkVersions = ($javaVendors | Where-Object {$_.name -eq $defaultVendor}).versions | ForEach-Object { @{Version = $_} } + [array]$adoptJdkVersions = ($javaVendors | Where-Object {$_.name -eq "Adopt"}).versions | ForEach-Object { @{Version = $_} } + + It "Java <DefaultJavaVersion> is default" -TestCases @{ DefaultJavaVersion = $defaultVersion } { $actualJavaPath = Get-EnvironmentVariable "JAVA_HOME" $expectedJavaPath = Get-EnvironmentVariable "JAVA_HOME_${DefaultJavaVersion}_X64" @@ -42,6 +47,16 @@ Describe "Java" { if ($Version -eq 8) { $Version = "1.${Version}" } - "`"$javaPath`" -version" | Should -MatchCommandOutput ([regex]::Escape("openjdk version `"${Version}.")) + "`"$javaPath`" -version" | Should -MatchCommandOutput ([regex]::Escape("openjdk version `"${Version}.")) + } + + It "Java Adopt <Version>" -TestCases $adoptJdkVersions { + $javaPath = Join-Path (Get-ChildItem ${env:AGENT_TOOLSDIRECTORY}\Java_Adopt_jdk\${Version}*) "x64\bin\java" + "`"$javaPath`" -version" | Should -ReturnZeroExitCode + + if ($Version -eq 8) { + $Version = "1.${Version}" + } + "`"$javaPath`" -version" | Should -MatchCommandOutput ([regex]::Escape("openjdk version `"${Version}.")) } -} \ No newline at end of file +} diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index 865c30a48e7b..d8fbf5bd0917 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -71,8 +71,16 @@ ], "java": { "default": "8", - "versions": [ - "8", "11", "12" + "default_vendor": "Temurin-Hotspot", + "vendors": [ + { + "name": "Temurin-Hotspot", + "versions": [ "8", "11", "17" ] + }, + { + "name": "Adopt", + "versions": [ "8", "11", "12" ] + } ], "maven": "3.8.4" }, diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index 3a74f73704d2..122aebcbe8e9 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -71,9 +71,17 @@ } ], "java": { - "default": "11", - "versions": [ - "8", "11" + "default": "8", + "default_vendor": "Temurin-Hotspot", + "vendors": [ + { + "name": "Temurin-Hotspot", + "versions": [ "8", "11", "17" ] + }, + { + "name": "Adopt", + "versions": [ "8", "11" ] + } ], "maven": "3.8.4" }, From b5fd6da0f9c2336b13da8ff68d0ffbaa2a65b546 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Wed, 12 Jan 2022 22:05:59 +0300 Subject: [PATCH 0884/3485] Add Net.Component.4.7.TargetingPack component (#4874) --- images/win/toolsets/toolset-2022.json | 1 + 1 file changed, 1 insertion(+) diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index 99e9edd1b8cf..ba00517e92f4 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -175,6 +175,7 @@ "Component.UnityEngine.x64", "Component.Unreal.Android", "Microsoft.Component.VC.Runtime.UCRTSDK", + "Microsoft.Net.Component.4.7.TargetingPack", "Microsoft.Net.Component.4.7.2.TargetingPack", "Microsoft.VisualStudio.Component.AspNet45", "Microsoft.VisualStudio.Component.Azure.ServiceFabric.Tools", From a6856ecef36861a423efc7d57453e5bceee94f31 Mon Sep 17 00:00:00 2001 From: Nikolay Frolov <90333448+nikolai-frolov@users.noreply.github.com> Date: Wed, 12 Jan 2022 22:06:39 +0300 Subject: [PATCH 0885/3485] [Ubuntu] Update Azure PowerShell to 7.1 (#4855) --- images/linux/toolsets/toolset-1804.json | 5 +++-- images/linux/toolsets/toolset-2004.json | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index d8fbf5bd0917..1f4915c8ce4a 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -118,12 +118,13 @@ "name": "az", "url" : "https://raw.githubusercontent.com/Azure/az-ps-module-versions/main/versions-manifest.json", "versions": [ - "6.4.0" + "7.1.0" ], "zip_versions": [ "3.1.0", "4.4.0", - "5.9.0" + "5.9.0", + "6.6.0" ] } ], diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index 122aebcbe8e9..0947c7cf7e78 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -116,12 +116,13 @@ "name": "az", "url" : "https://raw.githubusercontent.com/Azure/az-ps-module-versions/main/versions-manifest.json", "versions": [ - "6.4.0" + "7.1.0" ], "zip_versions": [ "3.1.0", "4.4.0", - "5.9.0" + "5.9.0", + "6.6.0" ] } ], From 44fd9ae71a2c489b298b67115a2132035e0287ca Mon Sep 17 00:00:00 2001 From: Nikolay Frolov <90333448+nikolai-frolov@users.noreply.github.com> Date: Wed, 12 Jan 2022 22:06:45 +0300 Subject: [PATCH 0886/3485] [macOS] Update Azure PowerShell to 7.1 (#4854) --- images/macos/toolsets/toolset-10.15.json | 2 +- images/macos/toolsets/toolset-11.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index aba45a82399c..994e7bd47379 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -185,7 +185,7 @@ { "name": "Az", "versions": [ - "6.1.0" + "7.1.0" ] }, {"name": "MarkdownPS"}, diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index 447b044ab35f..94c33602fc83 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -156,7 +156,7 @@ { "name": "Az", "versions": [ - "6.1.0" + "7.1.0" ] }, {"name": "MarkdownPS"}, From a8db6be3f0e4e66a699f865aa83bdc70cbc76dcf Mon Sep 17 00:00:00 2001 From: Nikolay Frolov <90333448+nikolai-frolov@users.noreply.github.com> Date: Wed, 12 Jan 2022 22:06:52 +0300 Subject: [PATCH 0887/3485] [Windows] Update Azure PowerShell to 7.1 (#4853) --- images/win/toolsets/toolset-2016.json | 5 +++-- images/win/toolsets/toolset-2019.json | 5 +++-- images/win/toolsets/toolset-2022.json | 6 ++++-- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/images/win/toolsets/toolset-2016.json b/images/win/toolsets/toolset-2016.json index dcd8e39ae7ba..a1b063d7d2f5 100644 --- a/images/win/toolsets/toolset-2016.json +++ b/images/win/toolsets/toolset-2016.json @@ -123,7 +123,7 @@ "name": "az", "url" : "https://raw.githubusercontent.com/Azure/az-ps-module-versions/main/versions-manifest.json", "versions": [ - "6.5.0" + "7.1.0" ], "zip_versions": [ "1.0.0", @@ -137,7 +137,8 @@ "4.4.0", "4.7.0", "5.5.0", - "5.9.0" + "5.9.0", + "6.6.0" ] } ], diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index ce9bdb485b6a..1415c388849a 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -124,7 +124,7 @@ "name": "az", "url" : "https://raw.githubusercontent.com/Azure/az-ps-module-versions/main/versions-manifest.json", "versions": [ - "6.5.0" + "7.1.0" ], "zip_versions": [ "1.0.0", @@ -138,7 +138,8 @@ "4.4.0", "4.7.0", "5.5.0", - "5.9.0" + "5.9.0", + "6.6.0" ] } ], diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index ba00517e92f4..e9852a1ceb0d 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -114,9 +114,11 @@ "name": "az", "url" : "https://raw.githubusercontent.com/Azure/az-ps-module-versions/main/versions-manifest.json", "versions": [ - "6.5.0" + "7.1.0" ], - "zip_versions": [] + "zip_versions": [ + "6.6.0" + ] } ], "java": { From 02b0bf3e1a42323b0b445599ae08907599e09b46 Mon Sep 17 00:00:00 2001 From: Nikolay Frolov <90333448+nikolai-frolov@users.noreply.github.com> Date: Wed, 12 Jan 2022 22:07:09 +0300 Subject: [PATCH 0888/3485] [Windows] Add Microsoft.VisualStudio.Component.VC.Modules.x86.x64 (#4872) --- images/win/toolsets/toolset-2019.json | 1 + images/win/toolsets/toolset-2022.json | 1 + 2 files changed, 2 insertions(+) diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index 1415c388849a..d87af251c37b 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -317,6 +317,7 @@ "Microsoft.VisualStudio.Component.VC.MFC.ARM.Spectre", "Microsoft.VisualStudio.Component.VC.MFC.ARM64", "Microsoft.VisualStudio.Component.VC.MFC.ARM64.Spectre", + "Microsoft.VisualStudio.Component.VC.Modules.x86.x64", "Microsoft.VisualStudio.Component.VC.Redist.MSM", "Microsoft.VisualStudio.Component.VC.Runtimes.ARM.Spectre", "Microsoft.VisualStudio.Component.VC.Runtimes.ARM64.Spectre", diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index e9852a1ceb0d..c0ad5f95f4a9 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -205,6 +205,7 @@ "Microsoft.VisualStudio.Component.VC.ATL.ARM64", "Microsoft.VisualStudio.Component.VC.MFC.ARM64", "Microsoft.VisualStudio.Component.VC.MFC.ARM64EC", + "Microsoft.VisualStudio.Component.VC.Modules.x86.x64", "Microsoft.VisualStudio.Component.VC.Tools.ARM64", "Microsoft.VisualStudio.Component.VC.Tools.ARM64EC", "Microsoft.VisualStudio.Component.VC.v141.x86.x64", From 59bc59f5685228c0a239c6c2bbe5fc2e7f409315 Mon Sep 17 00:00:00 2001 From: Lucas Mior <lucas.mior@gmail.com> Date: Thu, 13 Jan 2022 03:53:31 -0300 Subject: [PATCH 0889/3485] Fixing small typo (#4878) --- images/win/scripts/Installers/Install-JavaTools.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/win/scripts/Installers/Install-JavaTools.ps1 b/images/win/scripts/Installers/Install-JavaTools.ps1 index 7f8492ef0a67..0cc61a7b47f0 100644 --- a/images/win/scripts/Installers/Install-JavaTools.ps1 +++ b/images/win/scripts/Installers/Install-JavaTools.ps1 @@ -90,7 +90,7 @@ function Install-JavaJDK { Write-Host "Creating Java '${fullJavaVersion}' folder in '${javaVersionPath}'" New-Item -ItemType Directory -Path $javaVersionPath -Force | Out-Null - # Complete the installation by extarcting Java binaries to toolcache and creating the complete file + # Complete the installation by extracting Java binaries to toolcache and creating the complete file Extract-7Zip -Path $archivePath -DestinationPath $javaVersionPath Invoke-SBWithRetry -Command { Get-ChildItem -Path $javaVersionPath | Rename-Item -NewName $javaArchPath -ErrorAction Stop From 7b9719416be32082cfc5fe7abf9cd25c29f89858 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Thu, 13 Jan 2022 11:23:56 +0300 Subject: [PATCH 0890/3485] [Ubuntu] Disable motd updates metadata (#4873) * Disable motd updates metadata * check daemon.conf config exists * mask fwupd-refresh.timer service --- .../linux/scripts/installers/configure-environment.sh | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/images/linux/scripts/installers/configure-environment.sh b/images/linux/scripts/installers/configure-environment.sh index d3c99fcf4033..851e113a8420 100644 --- a/images/linux/scripts/installers/configure-environment.sh +++ b/images/linux/scripts/installers/configure-environment.sh @@ -31,4 +31,12 @@ echo 'vm.max_map_count=262144' | tee -a /etc/sysctl.conf # Create symlink for tests running chmod +x $HELPER_SCRIPTS/invoke-tests.sh -ln -s $HELPER_SCRIPTS/invoke-tests.sh /usr/local/bin/invoke_tests \ No newline at end of file +ln -s $HELPER_SCRIPTS/invoke-tests.sh /usr/local/bin/invoke_tests + +# Disable motd updates metadata +sed -i 's/ENABLED=1/ENABLED=0/g' /etc/default/motd-news + +if [[ -f "/etc/fwupd/daemon.conf" ]]; then + sed -i 's/UpdateMotd=true/UpdateMotd=false/g' /etc/fwupd/daemon.conf + systemctl mask fwupd-refresh.timer +fi From 996eae034625eaa62cc81ce29faa04e11fa3e6cc Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 13 Jan 2022 08:40:42 +0000 Subject: [PATCH 0891/3485] Updating readme file for ubuntu20 version 20220111.1 (#4861) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2004-Readme.md | 114 +++++++++++++++--------------- 1 file changed, 58 insertions(+), 56 deletions(-) diff --git a/images/linux/Ubuntu2004-Readme.md b/images/linux/Ubuntu2004-Readme.md index 16ccf7713112..c5353a850d47 100644 --- a/images/linux/Ubuntu2004-Readme.md +++ b/images/linux/Ubuntu2004-Readme.md @@ -1,10 +1,12 @@ | Announcements | |-| +| [[All OSs] Az PowerShell Module will be upgraded to 7.1.0 on January, 17](https://github.com/actions/virtual-environments/issues/4841) | +| [[Ubuntu] Issue with libstdc++ cannot allocate memory in static TLS block](https://github.com/actions/virtual-environments/issues/4799) | | [[All OSs] Python version 3.5 will be removed from the images on January 24, 2022](https://github.com/actions/virtual-environments/issues/4744) | *** # Ubuntu 20.04.3 LTS -- Linux kernel version: 5.11.0-1022-azure -- Image Version: 20211219.1 +- Linux kernel version: 5.11.0-1025-azure +- Image Version: 20220111.1 ## Installed Software ### Language and Runtime @@ -12,14 +14,14 @@ - Clang 10.0.0, 11.0.0, 12.0.0 - Clang-format 10.0.0, 11.0.0, 12.0.0 - Erlang 24.1.7 (Eshell 12.1.5) -- Erlang rebar3 3.17.0 +- Erlang rebar3 3.18.0 - GNU C++ 9.3.0, 10.3.0 - GNU Fortran 9.3.0, 10.3.0 -- Julia 1.7.0 +- Julia 1.7.1 - Kotlin 1.6.0-release-798 - Mono 6.12.0.122 (apt source repository: https://download.mono-project.com/repo/ubuntu stable-focal main) - MSBuild 16.6.0.15201 (from /usr/lib/mono/msbuild/15.0/bin/MSBuild.dll) -- Node 16.13.1 +- Node 16.13.2 - Perl 5.30.0 - Python 3.8.10 - Python3 3.8.10 @@ -29,14 +31,14 @@ ### Package Management - cpan 1.64 - Helm 3.7.2 -- Homebrew 3.3.8 +- Homebrew 3.3.10 - Miniconda 4.10.3 - Npm 8.1.2 - Pip 20.0.2 - Pip3 20.0.2 -- Pipx 0.16.4 +- Pipx 1.0.0 - RubyGems 3.1.2 -- Vcpkg (build from master \<50fd3d995>) +- Vcpkg (build from master \<b8b1217bd>) - Yarn 1.22.17 #### Environment variables @@ -47,10 +49,10 @@ ### Project Management - Ant 1.10.7 -- Gradle 7.3.2 +- Gradle 7.3.3 - Lerna 4.0.0 - Maven 3.8.4 -- Sbt 1.5.7 +- Sbt 1.6.1 ### Tools - Ansible 2.12.1 @@ -73,7 +75,7 @@ - Git-ftp 1.6.0 - Haveged 1.9.1 - Heroku 7.59.2 -- HHVM (HipHop VM) 4.140.1 +- HHVM (HipHop VM) 4.143.0 - jq 1.6 - Kind 0.11.1 - Kubectl 1.23.1 @@ -82,36 +84,36 @@ - MediaInfo 19.09 - Mercurial 5.3.1 - Minikube 1.24.0 -- n 8.0.1 -- Newman 5.3.0 +- n 8.0.2 +- Newman 5.3.1 - nvm 0.39.1 - OpenSSL 1.1.1f 31 Mar 2020 - Packer 1.7.8 -- Parcel 2.0.1 +- Parcel 2.1.1 - PhantomJS 2.1.1 - Podman 3.4.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- Pulumi 3.19.0 +- Pulumi 3.21.1 - R 4.1.2 - Skopeo 1.3.0 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 -- Terraform 1.1.2 +- Terraform 1.1.3 - yamllint 1.26.3 -- yq 4.16.1 -- zstd 1.5.0 (homebrew) +- yq 4.16.2 +- zstd 1.5.1 (homebrew) ### CLI Tools - Alibaba Cloud CLI 3.0.102 -- AWS CLI 2.4.6 -- AWS CLI Session manager plugin 1.2.279.0 -- AWS SAM CLI 1.36.0 -- Azure CLI (azure-cli) 2.31.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) +- AWS CLI 2.4.9 +- AWS CLI Session manager plugin 1.2.295.0 +- AWS SAM CLI 1.37.0 +- Azure CLI (azure-cli) 2.32.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.22.0 -- GitHub CLI 2.3.0 -- Google Cloud SDK 367.0.0 (apt source repository: https://packages.cloud.google.com/apt) +- GitHub CLI 2.4.0 +- Google Cloud SDK 368.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 8.1.8 -- OpenShift CLI 4.9.11 +- Netlify CLI 8.6.21 +- OpenShift CLI 4.9.13 - ORAS CLI 0.12.0 - Vercel CLI 23.1.2 @@ -129,9 +131,9 @@ ### PHP | Tool | Version | | -------- | ------------------- | -| PHP | 7.4.26 8.0.13 8.1.0 | -| Composer | 2.1.14 | -| PHPUnit | 8.5.21 | +| PHP | 7.4.27 8.0.14 8.1.1 | +| Composer | 2.2.4 | +| PHPUnit | 8.5.22 | ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ``` @@ -156,11 +158,11 @@ - Rustfmt 1.4.37 ### Browsers and Drivers -- Google Chrome 96.0.4664.110 -- ChromeDriver 96.0.4664.45 -- Mozilla Firefox 95.0 +- Google Chrome 97.0.4692.71 +- ChromeDriver 97.0.4692.71 +- Mozilla Firefox 95.0.1 - Geckodriver 0.30.0 -- Chromium 96.0.4664.0 +- Chromium 97.0.4692.0 - Selenium server 4.1.0 #### Environment variables @@ -192,13 +194,13 @@ ### Cached Tools #### Go - 1.15.15 -- 1.16.12 -- 1.17.5 +- 1.16.13 +- 1.17.6 #### Node.js -- 12.22.8 -- 14.18.2 -- 16.13.1 +- 12.22.9 +- 14.18.3 +- 16.13.2 #### PyPy - 2.7.18 [PyPy 7.3.6] @@ -225,8 +227,8 @@ | Name | Value | Architecture | | --------------- | ----------------------------------- | ------------ | | GOROOT_1_15_X64 | /opt/hostedtoolcache/go/1.15.15/x64 | x64 | -| GOROOT_1_16_X64 | /opt/hostedtoolcache/go/1.16.12/x64 | x64 | -| GOROOT_1_17_X64 | /opt/hostedtoolcache/go/1.17.5/x64 | x64 | +| GOROOT_1_16_X64 | /opt/hostedtoolcache/go/1.16.13/x64 | x64 | +| GOROOT_1_17_X64 | /opt/hostedtoolcache/go/1.17.6/x64 | x64 | ### PowerShell Tools - PowerShell 7.2.1 @@ -279,22 +281,22 @@ | alpine:3.12 | sha256:d9459083f962de6bd980ae6a05be2a4cf670df6a1d898157bceb420342bec280 | 2021-11-12 | | alpine:3.13 | sha256:026f721af4cf2843e07bba648e158fb35ecc876d822130633cc49f707f0fc88c | 2021-11-12 | | alpine:3.14 | sha256:635f0aa53d99017b38d1a0aa5b2082f7812b03e3cdb299103fe77b5c8a07f1d2 | 2021-11-12 | -| buildpack-deps:bullseye | sha256:5445b145c8a1a2f7e5a4b233f571c629aed12fce435496f942ad267f21a05ff2 | 2021-12-02 | -| buildpack-deps:buster | sha256:c11cd0a4c97acd1aa8d2289aee5c126ac78adc48108744c104f6741cbd9a1f6c | 2021-12-02 | -| buildpack-deps:stretch | sha256:bb93e2c2858cb20f7f16e433773adb2c583fce38dc9c71976c62bf098f956093 | 2021-12-02 | -| debian:10 | sha256:5b57f8c365c40fde437d53b953c436995525be7c481eb0128b1cbf3b49b0df18 | 2021-12-02 | -| debian:11 | sha256:45ee40a844048c2f6d0105899c1a17733530b56d481612608aab5e2e4048570b | 2021-12-02 | -| debian:9 | sha256:aa78ddaa7f8a14bad8f940ebff5542377f91843f6dcc168e41a8628c6007e815 | 2021-12-02 | +| buildpack-deps:bullseye | sha256:8cca6f729d85d572000a436eac498ff5358eeee5a0fa7b3e2b6668620c6ac06e | 2021-12-21 | +| buildpack-deps:buster | sha256:24cf4668129a284b9b960ffaa5e79f9654d7d040708721c8e7708811e362a9d9 | 2021-12-21 | +| buildpack-deps:stretch | sha256:19610095f7d1718c20d79e5109c42f64dabea9fdf104221394acdf2999170c51 | 2021-12-21 | +| debian:10 | sha256:94ccfd1c5115a6903cbb415f043a0b04e307be3f37b768cf6d6d3edff0021da3 | 2021-12-21 | +| debian:11 | sha256:2906804d2a64e8a13a434a1a127fe3f6a28bf7cf3696be4223b06276f32f1f2d | 2021-12-21 | +| debian:9 | sha256:54284a7a45383b407c1968657e8f1c50dc25b82d8d56b3812e46ad19f8bcfd83 | 2021-12-21 | | moby/buildkit:latest | sha256:d6c89b7085b106301645ddcc77cf64eb7b705ab507b72d52d130ac33f1300417 | 2021-11-18 | -| node:12 | sha256:f881ce751096a214a7e595b0ccf9ee7d6e38d8e0141d7e9d5880b2f242ad392b | 2021-12-18 | -| node:12-alpine | sha256:8fad09b7620b2bc715cbba92e3313c64a797e453f560118576f1740a44584d5d | 2021-12-18 | -| node:14 | sha256:52c884d7cf8509c27def168415a1ff23a0bd95d358dd5787ca77b60474dcb3db | 2021-12-02 | -| node:14-alpine | sha256:7bcf853eeb97a25465cb385b015606c22e926f548cbd117f85b7196df8aa0d29 | 2021-12-02 | -| node:16 | sha256:89b59ce49929d8a8e230946bdb1b58c14cdbbb86c9a7397610afcecfce1be035 | 2021-12-02 | -| node:16-alpine | sha256:a9b9cb880fa429b0bea899cd3b1bc081ab7277cc97e6d2dcd84bd9753b2027e1 | 2021-12-02 | +| node:12 | sha256:36b3ee4724ab60ac5f288d22999074437ed517e8d1bd2e24ab19609479d39c81 | 2021-12-21 | +| node:12-alpine | sha256:05d61228b85c54b5527e74afc54153eb3572aae005948fb068a0f4ebe01f7c1e | 2022-01-03 | +| node:14 | sha256:e5c6aac226819f88d6431a56f502972d323d052b1b6108094ba7e6b07154a542 | 2021-12-21 | +| node:14-alpine | sha256:1e7481a9a977d8e4160a73ed6a0e726724570bf7d941adbec63a82cf7c07ae19 | 2022-01-03 | +| node:16 | sha256:32605ead97ed57bd39a8a7b0e919240e1a3218974dfc6965e61b54a801753131 | 2021-12-21 | +| node:16-alpine | sha256:0e071f3c5c84cffa6b1035023e1956cf28d48f4b36e229cef328772da81ec0c5 | 2022-01-03 | | ubuntu:16.04 | sha256:0f71fa8d4d2d4292c3c617fda2b36f6dabe5c8b6e34c3dc5b0d17d4e704bd39c | 2021-08-31 | -| ubuntu:18.04 | sha256:0fedbd5bd9fb72089c7bbca476949e10593cebed9b1fb9edf5b79dbbacddd7d6 | 2021-10-01 | -| ubuntu:20.04 | sha256:626ffe58f6e7566e00254b638eb7e0f3b11d4da9675088f4781a50ae288f3322 | 2021-10-16 | +| ubuntu:18.04 | sha256:37b7471c1945a2a12e5a57488ee4e3e216a8369d0b9ee1ec2e41db9c2c1e3d22 | 2022-01-07 | +| ubuntu:20.04 | sha256:b5a61709a9a44284d88fb12e5c48db0409cfad5b69d4ff8224077c57302df9cf | 2022-01-07 | ### Installed apt packages | Name | Version | @@ -344,7 +346,7 @@ | mercurial | 5.3.1-1ubuntu1 | | net-tools | 1.60+git20180626.aebd88e-1ubuntu1 | | netcat | 1.206-1ubuntu1 | -| openssh-client | 1:8.2p1-4ubuntu0.3 | +| openssh-client | 1:8.2p1-4ubuntu0.4 | | p7zip-full | 16.02+dfsg-7build1 | | p7zip-rar | 16.02-3build1 | | parallel | 20161222-1.1 | @@ -358,7 +360,7 @@ | shellcheck | 0.7.0-2build2 | | sphinxsearch | 2.2.11-2ubuntu2 | | sqlite3 | 3.31.1-4ubuntu0.2 | -| ssh | 1:8.2p1-4ubuntu0.3 | +| ssh | 1:8.2p1-4ubuntu0.4 | | sshpass | 1.06-1 | | subversion | 1.13.0-3 | | sudo | 1.8.31-1ubuntu1.2 | From 5db309d81e6c65e4432863b48d110fa57ff0f179 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 13 Jan 2022 09:40:25 +0000 Subject: [PATCH 0892/3485] Updating readme file for ubuntu18 version 20220111.1 (#4862) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu1804-Readme.md | 110 +++++++++++++++--------------- 1 file changed, 56 insertions(+), 54 deletions(-) diff --git a/images/linux/Ubuntu1804-Readme.md b/images/linux/Ubuntu1804-Readme.md index 2b34015987e7..58b1e49d6734 100644 --- a/images/linux/Ubuntu1804-Readme.md +++ b/images/linux/Ubuntu1804-Readme.md @@ -1,10 +1,12 @@ | Announcements | |-| +| [[All OSs] Az PowerShell Module will be upgraded to 7.1.0 on January, 17](https://github.com/actions/virtual-environments/issues/4841) | +| [[Ubuntu] Issue with libstdc++ cannot allocate memory in static TLS block](https://github.com/actions/virtual-environments/issues/4799) | | [[All OSs] Python version 3.5 will be removed from the images on January 24, 2022](https://github.com/actions/virtual-environments/issues/4744) | *** # Ubuntu 18.04.6 LTS -- Linux kernel version: 5.4.0-1064-azure -- Image Version: 20211219.1 +- Linux kernel version: 5.4.0-1065-azure +- Image Version: 20220111.1 ## Installed Software ### Language and Runtime @@ -12,14 +14,14 @@ - Clang 9.0.0 - Clang-format 9.0.0 - Erlang 24.1.7 (Eshell 12.1.5) -- Erlang rebar3 3.17.0 +- Erlang rebar3 3.18.0 - GNU C++ 7.5.0, 9.4.0, 10.3.0 - GNU Fortran 7.5.0, 9.4.0, 10.3.0 -- Julia 1.7.0 +- Julia 1.7.1 - Kotlin 1.6.0-release-798 - Mono 6.12.0.122 (apt source repository: https://download.mono-project.com/repo/ubuntu stable-bionic main) - MSBuild 16.6.0.15201 (from /usr/lib/mono/msbuild/15.0/bin/MSBuild.dll) -- Node 16.13.1 +- Node 16.13.2 - Perl 5.26.1 - Python 2.7.17 - Python3 3.6.9 @@ -29,14 +31,14 @@ ### Package Management - cpan 1.64 - Helm 3.7.2 -- Homebrew 3.3.8 +- Homebrew 3.3.10 - Miniconda 4.10.3 - Npm 8.1.2 - Pip 9.0.1 - Pip3 9.0.1 -- Pipx 0.16.4 +- Pipx 1.0.0 - RubyGems 2.7.6 -- Vcpkg (build from master \<50fd3d995>) +- Vcpkg (build from master \<b8b1217bd>) - Yarn 1.22.17 #### Environment variables @@ -47,9 +49,9 @@ ### Project Management - Ant 1.10.5 -- Gradle 7.3.2 +- Gradle 7.3.3 - Maven 3.8.4 -- Sbt 1.5.7 +- Sbt 1.6.1 ### Tools - Ansible 2.11.7 @@ -71,7 +73,7 @@ - Git-ftp 1.3.1 - Haveged 1.9.1 - Heroku 7.59.2 -- HHVM (HipHop VM) 4.140.1 +- HHVM (HipHop VM) 4.143.0 - jq 1.5 - Kind 0.11.1 - Kubectl 1.23.1 @@ -80,36 +82,36 @@ - MediaInfo 17.12 - Mercurial 4.5.3 - Minikube 1.24.0 -- n 8.0.1 -- Newman 5.3.0 +- n 8.0.2 +- Newman 5.3.1 - nvm 0.39.1 - OpenSSL 1.1.1 11 Sep 2018 - Packer 1.7.8 -- Parcel 2.0.1 +- Parcel 2.1.1 - PhantomJS 2.1.1 - Podman 3.0.1 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- Pulumi 3.19.0 +- Pulumi 3.21.1 - R 4.1.2 - Skopeo 1.2.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 - SVN 1.9.7 -- Terraform 1.1.2 +- Terraform 1.1.3 - yamllint 1.26.3 -- yq 4.16.1 -- zstd 1.5.0 (homebrew) +- yq 4.16.2 +- zstd 1.5.1 (homebrew) ### CLI Tools - Alibaba Cloud CLI 3.0.102 -- AWS CLI 1.22.24 -- AWS CLI Session manager plugin 1.2.279.0 -- AWS SAM CLI 1.36.0 -- Azure CLI (azure-cli) 2.31.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) +- AWS CLI 1.22.33 +- AWS CLI Session manager plugin 1.2.295.0 +- AWS SAM CLI 1.37.0 +- Azure CLI (azure-cli) 2.32.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.22.0 -- GitHub CLI 2.3.0 -- Google Cloud SDK 367.0.0 (apt source repository: https://packages.cloud.google.com/apt) +- GitHub CLI 2.4.0 +- Google Cloud SDK 368.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 8.1.8 -- OpenShift CLI 4.9.11 +- Netlify CLI 8.6.21 +- OpenShift CLI 4.9.13 - ORAS CLI 0.12.0 - Vercel CLI 23.1.2 @@ -123,9 +125,9 @@ ### PHP | Tool | Version | | -------- | ---------------------------------------- | -| PHP | 7.1.33 7.2.34 7.3.33 7.4.26 8.0.13 8.1.0 | -| Composer | 2.1.14 | -| PHPUnit | 8.5.21 | +| PHP | 7.1.33 7.2.34 7.3.33 7.4.27 8.0.14 8.1.1 | +| Composer | 2.2.4 | +| PHPUnit | 8.5.22 | ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ``` @@ -150,11 +152,11 @@ - Rustfmt 1.4.37 ### Browsers and Drivers -- Google Chrome 96.0.4664.110 -- ChromeDriver 96.0.4664.45 -- Mozilla Firefox 95.0 +- Google Chrome 97.0.4692.71 +- ChromeDriver 97.0.4692.71 +- Mozilla Firefox 95.0.1 - Geckodriver 0.30.0 -- Chromium 96.0.4664.0 +- Chromium 97.0.4692.0 - Selenium server 4.1.0 #### Environment variables @@ -186,13 +188,13 @@ ### Cached Tools #### Go - 1.15.15 -- 1.16.12 -- 1.17.5 +- 1.16.13 +- 1.17.6 #### Node.js -- 12.22.8 -- 14.18.2 -- 16.13.1 +- 12.22.9 +- 14.18.3 +- 16.13.2 #### PyPy - 2.7.18 [PyPy 7.3.6] @@ -218,8 +220,8 @@ | Name | Value | Architecture | | --------------- | ----------------------------------- | ------------ | | GOROOT_1_15_X64 | /opt/hostedtoolcache/go/1.15.15/x64 | x64 | -| GOROOT_1_16_X64 | /opt/hostedtoolcache/go/1.16.12/x64 | x64 | -| GOROOT_1_17_X64 | /opt/hostedtoolcache/go/1.17.5/x64 | x64 | +| GOROOT_1_16_X64 | /opt/hostedtoolcache/go/1.16.13/x64 | x64 | +| GOROOT_1_17_X64 | /opt/hostedtoolcache/go/1.17.6/x64 | x64 | ### PowerShell Tools - PowerShell 7.2.1 @@ -271,22 +273,22 @@ | alpine:3.12 | sha256:d9459083f962de6bd980ae6a05be2a4cf670df6a1d898157bceb420342bec280 | 2021-11-12 | | alpine:3.13 | sha256:026f721af4cf2843e07bba648e158fb35ecc876d822130633cc49f707f0fc88c | 2021-11-12 | | alpine:3.14 | sha256:635f0aa53d99017b38d1a0aa5b2082f7812b03e3cdb299103fe77b5c8a07f1d2 | 2021-11-12 | -| buildpack-deps:bullseye | sha256:5445b145c8a1a2f7e5a4b233f571c629aed12fce435496f942ad267f21a05ff2 | 2021-12-02 | -| buildpack-deps:buster | sha256:c11cd0a4c97acd1aa8d2289aee5c126ac78adc48108744c104f6741cbd9a1f6c | 2021-12-02 | -| buildpack-deps:stretch | sha256:bb93e2c2858cb20f7f16e433773adb2c583fce38dc9c71976c62bf098f956093 | 2021-12-02 | -| debian:10 | sha256:5b57f8c365c40fde437d53b953c436995525be7c481eb0128b1cbf3b49b0df18 | 2021-12-02 | -| debian:11 | sha256:45ee40a844048c2f6d0105899c1a17733530b56d481612608aab5e2e4048570b | 2021-12-02 | -| debian:9 | sha256:aa78ddaa7f8a14bad8f940ebff5542377f91843f6dcc168e41a8628c6007e815 | 2021-12-02 | +| buildpack-deps:bullseye | sha256:8cca6f729d85d572000a436eac498ff5358eeee5a0fa7b3e2b6668620c6ac06e | 2021-12-21 | +| buildpack-deps:buster | sha256:24cf4668129a284b9b960ffaa5e79f9654d7d040708721c8e7708811e362a9d9 | 2021-12-21 | +| buildpack-deps:stretch | sha256:19610095f7d1718c20d79e5109c42f64dabea9fdf104221394acdf2999170c51 | 2021-12-21 | +| debian:10 | sha256:94ccfd1c5115a6903cbb415f043a0b04e307be3f37b768cf6d6d3edff0021da3 | 2021-12-21 | +| debian:11 | sha256:2906804d2a64e8a13a434a1a127fe3f6a28bf7cf3696be4223b06276f32f1f2d | 2021-12-21 | +| debian:9 | sha256:54284a7a45383b407c1968657e8f1c50dc25b82d8d56b3812e46ad19f8bcfd83 | 2021-12-21 | | moby/buildkit:latest | sha256:d6c89b7085b106301645ddcc77cf64eb7b705ab507b72d52d130ac33f1300417 | 2021-11-18 | -| node:12 | sha256:f881ce751096a214a7e595b0ccf9ee7d6e38d8e0141d7e9d5880b2f242ad392b | 2021-12-18 | -| node:12-alpine | sha256:8fad09b7620b2bc715cbba92e3313c64a797e453f560118576f1740a44584d5d | 2021-12-18 | -| node:14 | sha256:52c884d7cf8509c27def168415a1ff23a0bd95d358dd5787ca77b60474dcb3db | 2021-12-02 | -| node:14-alpine | sha256:7bcf853eeb97a25465cb385b015606c22e926f548cbd117f85b7196df8aa0d29 | 2021-12-02 | -| node:16 | sha256:89b59ce49929d8a8e230946bdb1b58c14cdbbb86c9a7397610afcecfce1be035 | 2021-12-02 | -| node:16-alpine | sha256:a9b9cb880fa429b0bea899cd3b1bc081ab7277cc97e6d2dcd84bd9753b2027e1 | 2021-12-02 | +| node:12 | sha256:36b3ee4724ab60ac5f288d22999074437ed517e8d1bd2e24ab19609479d39c81 | 2021-12-21 | +| node:12-alpine | sha256:05d61228b85c54b5527e74afc54153eb3572aae005948fb068a0f4ebe01f7c1e | 2022-01-03 | +| node:14 | sha256:e5c6aac226819f88d6431a56f502972d323d052b1b6108094ba7e6b07154a542 | 2021-12-21 | +| node:14-alpine | sha256:1e7481a9a977d8e4160a73ed6a0e726724570bf7d941adbec63a82cf7c07ae19 | 2022-01-03 | +| node:16 | sha256:32605ead97ed57bd39a8a7b0e919240e1a3218974dfc6965e61b54a801753131 | 2021-12-21 | +| node:16-alpine | sha256:0e071f3c5c84cffa6b1035023e1956cf28d48f4b36e229cef328772da81ec0c5 | 2022-01-03 | | ubuntu:16.04 | sha256:0f71fa8d4d2d4292c3c617fda2b36f6dabe5c8b6e34c3dc5b0d17d4e704bd39c | 2021-08-31 | -| ubuntu:18.04 | sha256:0fedbd5bd9fb72089c7bbca476949e10593cebed9b1fb9edf5b79dbbacddd7d6 | 2021-10-01 | -| ubuntu:20.04 | sha256:626ffe58f6e7566e00254b638eb7e0f3b11d4da9675088f4781a50ae288f3322 | 2021-10-16 | +| ubuntu:18.04 | sha256:37b7471c1945a2a12e5a57488ee4e3e216a8369d0b9ee1ec2e41db9c2c1e3d22 | 2022-01-07 | +| ubuntu:20.04 | sha256:b5a61709a9a44284d88fb12e5c48db0409cfad5b69d4ff8224077c57302df9cf | 2022-01-07 | ### Installed apt packages | Name | Version | From b8762ca56804a2931ed467521261589f2a2efab6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 13 Jan 2022 13:00:03 +0000 Subject: [PATCH 0893/3485] Updating readme file for win16 version 20220110.1 (#4866) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2016-Readme.md | 50 +++++++++++++++++--------------- 1 file changed, 26 insertions(+), 24 deletions(-) diff --git a/images/win/Windows2016-Readme.md b/images/win/Windows2016-Readme.md index b049a6aff50e..f273654dc870 100644 --- a/images/win/Windows2016-Readme.md +++ b/images/win/Windows2016-Readme.md @@ -1,17 +1,19 @@ | Announcements | |-| +| [windows-latest workflows will use Windows Server 2022](https://github.com/actions/virtual-environments/issues/4856) | +| [[All OSs] Az PowerShell Module will be upgraded to 7.1.0 on January, 17](https://github.com/actions/virtual-environments/issues/4841) | | [[All OSs] Python version 3.5 will be removed from the images on January 24, 2022](https://github.com/actions/virtual-environments/issues/4744) | | [Windows-2016 environment will be removed on March 15, 2022](https://github.com/actions/virtual-environments/issues/4312) | *** # Microsoft Windows Server 2016 Datacenter - OS Version: 10.0.14393 Build 4825 -- Image Version: 20211219.1 +- Image Version: 20220110.1 ## Installed Software ### Language and Runtime - Bash 4.4.23(1)-release - Go 1.15.15 -- Julia 1.7.0 +- Julia 1.7.1 - Kotlin 1.6.10 - LLVM 13.0.0 - Node 16.13.1 @@ -22,15 +24,15 @@ ### Package Management - Chocolatey 0.11.3 -- Composer 2.1.14 +- Composer 2.2.4 - Helm 3.7.1 - Miniconda 4.10.3 (pre-installed on the image but not added to PATH) - NPM 8.1.2 - NuGet 6.0.0.280 - pip 21.3.1 (python 3.7) -- Pipx 0.16.4 +- Pipx 1.0.0 - RubyGems 2.7.6.3 -- Vcpkg (build from master \<50fd3d995>) +- Vcpkg (build from master \<5edd518dc>) - Yarn 1.22.17 #### Environment variables @@ -43,10 +45,10 @@ - Ant 1.10.12 - Gradle 7.3 - Maven 3.8.4 -- sbt 1.5.7 +- sbt 1.6.1 ### Tools -- 7zip 21.06 +- 7zip 21.07 - aria2 1.36.0 - azcopy 10.13.0 - Bazel 4.2.2 @@ -68,12 +70,12 @@ - Kubectl 1.23.1 - Mercurial 5.0 - Mingw-w64 8.1.0 -- Newman 5.3.0 +- Newman 5.3.1 - NSIS v3.08 - OpenSSL 1.1.1 - Packer 1.7.8 -- Parcel 2.0.1 -- Pulumi v3.20.0 +- Parcel 2.1.1 +- Pulumi v3.21.1 - R 4.1.2 - Service Fabric SDK 8.2.1363.9590 - Stack 2.7.3 @@ -83,17 +85,17 @@ - WinAppDriver 1.2.2009.02003 - WiX Toolset v3.11.2.4516 - yamllint 1.26.3 -- zstd 1.5.0 +- zstd 1.5.1 ### CLI Tools - Alibaba Cloud CLI 3.0.102 -- AWS CLI 2.4.6 -- AWS SAM CLI 1.36.0 +- AWS CLI 2.4.9 +- AWS SAM CLI 1.37.0 - AWS Session Manager CLI 1.2.279.0 -- Azure CLI 2.31.0 +- Azure CLI 2.32.0 - Azure DevOps CLI extension 0.22.0 - Cloud Foundry CLI 6.53.0 -- GitHub CLI 2.3.0 +- GitHub CLI 2.4.0 - Hub CLI 2.14.2 ### Rust Tools @@ -111,10 +113,10 @@ - Rustfmt 1.4.37 ### Browsers and webdrivers -- Google Chrome 96.0.4664.110 -- Chrome Driver 96.0.4664.45 -- Microsoft Edge 96.0.1054.62 -- Microsoft Edge Driver 96.0.1054.62 +- Google Chrome 97.0.4692.71 +- Chrome Driver 97.0.4692.71 +- Microsoft Edge 97.0.1072.55 +- Microsoft Edge Driver 97.0.1072.55 - Mozilla Firefox 95.0.2 - Gecko Driver 0.30.0 - IE Driver 3.150.1.1 @@ -157,8 +159,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Version | Architecture | Environment Variable | | ------- | ------------ | -------------------- | | 1.15.15 (Default) | x64 | GOROOT_1_15_X64 | -| 1.16.12 | x64 | GOROOT_1_16_X64 | -| 1.17.5 | x64 | GOROOT_1_17_X64 | +| 1.16.13 | x64 | GOROOT_1_16_X64 | +| 1.17.6 | x64 | GOROOT_1_17_X64 | #### Node | Version | Architecture | @@ -222,8 +224,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Web Servers | Name | Version | ConfigFile | ServiceName | ServiceStatus | ListenPort | | ------ | ------- | ------------------------------------- | ----------- | ------------- | ---------- | -| Apache | 2.4.51 | C:\tools\Apache24\conf\httpd.conf | Apache | Stopped | 80 | -| Nginx | 1.21.4 | C:\tools\nginx-1.21.4\conf\nginx.conf | nginx | Stopped | 80 | +| Apache | 2.4.52 | C:\tools\Apache24\conf\httpd.conf | Apache | Stopped | 80 | +| Nginx | 1.21.5 | C:\tools\nginx-1.21.5\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2017 | Name | Version | Path | @@ -534,7 +536,7 @@ All other versions are saved but not installed. | ------------------ | ---------------- | | DockerMsftProvider | 1.0.0.8 | | MarkdownPS | 1.9 | -| Microsoft.Graph | 1.9.0 | +| Microsoft.Graph | 1.9.1 | | Pester | 3.4.0<br>5.3.1 | | PowerShellGet | 1.0.0.1<br>2.2.5 | | PSScriptAnalyzer | 1.20.0 | From 8e0e0d68b96a85314b5e16a6a5896244672a83f6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 13 Jan 2022 15:52:06 +0000 Subject: [PATCH 0894/3485] Updating readme file for win19 version 20220110.1 (#4865) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2019-Readme.md | 62 ++++++++++++++++---------------- 1 file changed, 32 insertions(+), 30 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index cb13cd4df07a..4fb5df3127d3 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -1,11 +1,13 @@ | Announcements | |-| +| [windows-latest workflows will use Windows Server 2022](https://github.com/actions/virtual-environments/issues/4856) | +| [[All OSs] Az PowerShell Module will be upgraded to 7.1.0 on January, 17](https://github.com/actions/virtual-environments/issues/4841) | | [[All OSs] Python version 3.5 will be removed from the images on January 24, 2022](https://github.com/actions/virtual-environments/issues/4744) | | [Windows-2016 environment will be removed on March 15, 2022](https://github.com/actions/virtual-environments/issues/4312) | *** # Microsoft Windows Server 2019 Datacenter - OS Version: 10.0.17763 Build 2366 -- Image Version: 20211219.1 +- Image Version: 20220110.1 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -14,10 +16,10 @@ ### Language and Runtime - Bash 4.4.23(1)-release - Go 1.15.15 -- Julia 1.7.0 +- Julia 1.7.1 - Kotlin 1.6.10 - LLVM 13.0.0 -- Node 16.13.1 +- Node 16.13.2 - Perl 5.32.1 - PHP 8.1.1 - Python 3.7.9 @@ -25,15 +27,15 @@ ### Package Management - Chocolatey 0.11.3 -- Composer 2.1.14 +- Composer 2.2.4 - Helm 3.7.1 - Miniconda 4.10.3 (pre-installed on the image but not added to PATH) - NPM 8.1.2 - NuGet 6.0.0.280 - pip 21.3.1 (python 3.7) -- Pipx 0.16.4 +- Pipx 1.0.0 - RubyGems 2.7.6.3 -- Vcpkg (build from master \<50fd3d995>) +- Vcpkg (build from master \<9f04533f3>) - Yarn 1.22.17 #### Environment variables @@ -46,10 +48,10 @@ - Ant 1.10.12 - Gradle 7.3 - Maven 3.8.4 -- sbt 1.5.7 +- sbt 1.6.1 ### Tools -- 7zip 21.06 +- 7zip 21.07 - aria2 1.36.0 - azcopy 10.13.0 - Bazel 4.2.2 @@ -71,12 +73,12 @@ - Kubectl 1.23.1 - Mercurial 5.0 - Mingw-w64 8.1.0 -- Newman 5.3.0 +- Newman 5.3.1 - NSIS v3.08 - OpenSSL 1.1.1 - Packer 1.7.8 -- Parcel 2.0.1 -- Pulumi v3.20.0 +- Parcel 2.1.1 +- Pulumi v3.21.1 - R 4.1.2 - Service Fabric SDK 8.2.1363.9590 - Stack 2.7.3 @@ -86,17 +88,17 @@ - WinAppDriver 1.2.2009.02003 - WiX Toolset v3.11.2.4516 - yamllint 1.26.3 -- zstd 1.5.0 +- zstd 1.5.1 ### CLI Tools - Alibaba Cloud CLI 3.0.102 -- AWS CLI 2.4.6 -- AWS SAM CLI 1.36.0 +- AWS CLI 2.4.9 +- AWS SAM CLI 1.37.0 - AWS Session Manager CLI 1.2.279.0 -- Azure CLI 2.31.0 +- Azure CLI 2.32.0 - Azure DevOps CLI extension 0.22.0 - Cloud Foundry CLI 6.53.0 -- GitHub CLI 2.3.0 +- GitHub CLI 2.4.0 - Hub CLI 2.14.2 ### Rust Tools @@ -114,10 +116,10 @@ - Rustfmt 1.4.37 ### Browsers and webdrivers -- Google Chrome 96.0.4664.110 -- Chrome Driver 96.0.4664.45 -- Microsoft Edge 96.0.1054.62 -- Microsoft Edge Driver 96.0.1054.62 +- Google Chrome 97.0.4692.71 +- Chrome Driver 97.0.4692.71 +- Microsoft Edge 97.0.1072.55 +- Microsoft Edge Driver 97.0.1072.55 - Mozilla Firefox 95.0.2 - Gecko Driver 0.30.0 - IE Driver 3.150.1.1 @@ -164,15 +166,15 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Version | Architecture | Environment Variable | | ------- | ------------ | -------------------- | | 1.15.15 (Default) | x64 | GOROOT_1_15_X64 | -| 1.16.12 | x64 | GOROOT_1_16_X64 | -| 1.17.5 | x64 | GOROOT_1_17_X64 | +| 1.16.13 | x64 | GOROOT_1_16_X64 | +| 1.17.6 | x64 | GOROOT_1_17_X64 | #### Node | Version | Architecture | | ------- | ------------ | -| 12.22.8 | x64 | -| 14.18.2 | x64 | -| 16.13.1 | x64 | +| 12.22.9 | x64 | +| 14.18.3 | x64 | +| 16.13.2 | x64 | #### Python | Version | Architecture | @@ -229,8 +231,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Web Servers | Name | Version | ConfigFile | ServiceName | ServiceStatus | ListenPort | | ------ | ------- | ------------------------------------- | ----------- | ------------- | ---------- | -| Apache | 2.4.51 | C:\tools\Apache24\conf\httpd.conf | Apache | Stopped | 80 | -| Nginx | 1.21.4 | C:\tools\nginx-1.21.4\conf\nginx.conf | nginx | Stopped | 80 | +| Apache | 2.4.52 | C:\tools\Apache24\conf\httpd.conf | Apache | Stopped | 80 | +| Nginx | 1.21.5 | C:\tools\nginx-1.21.5\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2019 | Name | Version | Path | @@ -260,7 +262,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Component.UnityEngine.x64 | 16.10.31205.252 | | Component.Unreal | 16.1.28810.153 | | Component.Unreal.Android | 16.1.28810.153 | -| Component.VSInstallerProjects | 1.0.0 | +| Component.VSInstallerProjects | 1.0.1 | | Component.WixToolset.VisualStudioExtension.Dev16 | 1.0.0.4 | | Component.WixToolset.VisualStudioExtension.Schemas3 | 1.0.0.4 | | Component.WixToolset.VisualStudioExtension.Schemas4 | 1.0.0.4 | @@ -464,7 +466,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | ProBITools.MicrosoftAnalysisServicesModelingProjects | 2.9.18 | | ProBITools.MicrosoftReportProjectsforVisualStudio | 2.6.11 | | SSIS.SqlServerIntegrationServicesProjects | 3.15 | -| VisualStudioClient.MicrosoftVisualStudio2017InstallerProjects | 1.0.0 | +| VisualStudioClient.MicrosoftVisualStudio2017InstallerProjects | 1.0.1 | | Windows Driver Kit | 10.0.21381.0 | | Windows Driver Kit Visual Studio Extension | 10.1.22000.1 | | Windows Software Development Kit Extension | 10.1.22000.194 | @@ -530,7 +532,7 @@ All other versions are saved but not installed. | ------------------ | ---------------- | | DockerMsftProvider | 1.0.0.8 | | MarkdownPS | 1.9 | -| Microsoft.Graph | 1.9.0 | +| Microsoft.Graph | 1.9.1 | | Pester | 3.4.0<br>5.3.1 | | PowerShellGet | 1.0.0.1<br>2.2.5 | | PSScriptAnalyzer | 1.20.0 | From 562a5868e9a5cd881db628295a7748da234f6454 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 14 Jan 2022 07:42:16 +0000 Subject: [PATCH 0895/3485] Updating readme file for macOS-11 version 20220110.2 (#4860) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-11-Readme.md | 67 ++++++++++++++++++--------------- 1 file changed, 36 insertions(+), 31 deletions(-) diff --git a/images/macos/macos-11-Readme.md b/images/macos/macos-11-Readme.md index d5ef19848562..4f137fe7be17 100644 --- a/images/macos/macos-11-Readme.md +++ b/images/macos/macos-11-Readme.md @@ -1,12 +1,14 @@ | Announcements | |-| +| [[All OSs] Az PowerShell Module will be upgraded to 7.1.0 on January, 17](https://github.com/actions/virtual-environments/issues/4841) | +| [[macOS] Default Xcode on Big Sur image will be set to Xcode 13.2.1 on January, 24](https://github.com/actions/virtual-environments/issues/4800) | | [[All OSs] Python version 3.5 will be removed from the images on January 24, 2022](https://github.com/actions/virtual-environments/issues/4744) | | [macOS-latest workflows will use macOS-11](https://github.com/actions/virtual-environments/issues/4060) | *** # macOS 11.6 info - System Version: macOS 11.6.2 (20G314) - Kernel Version: Darwin 20.6.0 -- Image Version: 20211219.1 +- Image Version: 20220110.2 ## Installed Software ### Language and Runtime @@ -21,12 +23,12 @@ - GNU Fortran (Homebrew GCC 10.3.0) 10.3.0 - available by `gfortran-10` alias - GNU Fortran (Homebrew GCC 11.2.0_3) 11.2.0 - available by `gfortran-11` alias - Go 1.15.15 -- julia 1.7.0 +- julia 1.7.1 - Kotlin 1.6.10-release-923 - MSBuild 16.10.1.58001 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) - Node.js v16.13.1 - NVM 0.39.1 -- NVM - Cached node versions: v12.22.8 v14.18.2 v16.13.1 +- NVM - Cached node versions: v12.22.9 v14.18.3 v16.13.2 - Perl 5.34.0 - PHP 8.1.1 - Python 2.7.18 @@ -34,19 +36,19 @@ - Ruby 2.7.5p203 ### Package Management -- Bundler version 2.2.33 +- Bundler version 2.3.4 - Carthage 0.38.0 - CocoaPods 1.11.2 -- Composer 2.1.14 -- Homebrew 3.3.8 +- Composer 2.2.4 +- Homebrew 3.3.9 - Miniconda 4.10.3 - NPM 8.1.2 - NuGet 5.9.0.7134 - Pip 20.3.4 (python 2.7) - Pip 21.3.1 (python 3.9) -- Pipx 0.16.4 +- Pipx 1.0.0 - RubyGems 3.2.33 -- Vcpkg 2021 (build from master \<50fd3d995>) +- Vcpkg 2021 (build from master \<9f04533f3>) - Yarn 1.22.17 #### Environment variables @@ -58,8 +60,8 @@ ### Project Management - Apache Ant(TM) 1.10.12 - Apache Maven 3.8.4 -- Gradle 7.3.2 -- Sbt 1.5.7 +- Gradle 7.3.3 +- Sbt 1.6.1 ### Utilities - 7-Zip 17.04 @@ -68,19 +70,19 @@ - bazel 4.2.2 - bazelisk 1.11.0 - bsdtar 3.3.2 - available by 'tar' alias -- Curl 7.80.0 +- Curl 7.81.0 - Git LFS: 3.0.2 - Git: 2.34.1 -- GitHub CLI: 2.3.0 +- GitHub CLI: 2.4.0 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.2 -- gpg (GnuPG) 2.3.3 +- gpg (GnuPG) 2.3.4 - helm v3.7.2+g663a896 - Hub CLI: 2.14.2 - jq 1.6 - mongo v5.0.4 - mongod v5.0.4 -- Newman 5.3.0 +- Newman 5.3.1 - OpenSSL 1.1.1m 14 Dec 2021 `(/usr/local/opt/openssl@1.1 -> ../Cellar/openssl@1.1/1.1.1m)` - Packer 1.7.8 - PostgreSQL 14.1 @@ -88,15 +90,15 @@ - Sox 14.4.2 - Subversion (SVN) 1.14.1 - Switchaudio-osx 1.1.0 -- zstd 1.5.0 +- zstd 1.5.1 ### Tools - Aliyun CLI 3.0.102 -- App Center CLI 2.10.6 -- AWS CLI 2.4.6 -- AWS SAM CLI 1.36.0 +- App Center CLI 2.10.8 +- AWS CLI 2.4.9 +- AWS SAM CLI 1.37.0 - AWS Session Manager CLI 1.2.279.0 -- Azure CLI 2.31.0 +- Azure CLI 2.32.0 - Bicep CLI 0.4.1124 - Cabal 3.6.2.0 - Cmake 3.22.1 @@ -116,18 +118,18 @@ ### Browsers - Safari 15.2 (16612.3.6.1.8) - SafariDriver 15.2 (16612.3.6.1.8) -- Google Chrome 96.0.4664.110 -- ChromeDriver 96.0.4664.45 -- Microsoft Edge 96.0.1054.62 -- MSEdgeDriver 96.0.1054.62 -- Mozilla Firefox 95.0.1 +- Google Chrome 97.0.4692.71 +- ChromeDriver 97.0.4692.71 +- Microsoft Edge 97.0.1072.55 +- MSEdgeDriver 97.0.1072.55 +- Mozilla Firefox 95.0.2 - geckodriver 0.30.0 -- Selenium server 4.1.0 +- Selenium server 4.1.1 #### Environment variables | Name | Value | | --------------- | --------------------------------------------- | -| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/96.0.4664.45 | +| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/97.0.4692.71 | | EDGEWEBDRIVER | /usr/local/share/edge_driver | | GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | @@ -150,7 +152,7 @@ - 3.7.12 - 3.8.12 - 3.9.9 -- 3.10.0 +- 3.10.1 #### PyPy - 2.7.18 [PyPy 7.3.6] @@ -166,8 +168,8 @@ | Version | Architecture | Environment Variable | | ------- | ------------ | -------------------- | | 1.15.15 (Default) | x64 | GOROOT_1_15_X64 | -| 1.16.12 | x64 | GOROOT_1_16_X64 | -| 1.17.5 | x64 | GOROOT_1_17_X64 | +| 1.16.13 | x64 | GOROOT_1_16_X64 | +| 1.17.6 | x64 | GOROOT_1_17_X64 | ### Rust Tools - Cargo 1.57.0 @@ -197,8 +199,8 @@ ### Web Servers | Name | Version | ConfigFile | ServiceStatus | ListenPort | | ----- | ------- | ------------------------------- | ------------- | ---------- | -| httpd | 2.4.51 | /usr/local/etc/httpd/httpd.conf | none | 80 | -| nginx | 1.21.4 | /usr/local/etc/nginx/nginx.conf | none | 80 | +| httpd | 2.4.52 | /usr/local/etc/httpd/httpd.conf | none | 80 | +| nginx | 1.21.5 | /usr/local/etc/nginx/nginx.conf | none | 80 | ### Xamarin #### Visual Studio for Mac @@ -207,6 +209,7 @@ #### Xamarin bundles | symlink | Xamarin.Mono | Xamarin.iOS | Xamarin.Mac | Xamarin.Android | | ----------------- | ------------ | ----------- | ----------- | --------------- | +| 6_12_12 | 6.12 | 15.4 | 8.4 | 12.0 | | 6_12_11 | 6.12 | 15.2 | 8.2 | 12.0 | | 6_12_10 (default) | 6.12 | 15.0 | 7.14 | 11.3 | | 6_12_9 | 6.12 | 14.20 | 7.14 | 11.3 | @@ -328,6 +331,8 @@ | ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | ### Miscellaneous +- libXext 1.3.4 +- libXft 2.3.4 - Zlib 1.2.11 From 37d8c26d314e6799cb74ec8e378d05cbbaaa3b1a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 14 Jan 2022 07:49:59 +0000 Subject: [PATCH 0896/3485] Updating readme file for macOS-10.15 version 20220110.2 (#4859) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-10.15-Readme.md | 60 +++++++++++++++--------------- 1 file changed, 31 insertions(+), 29 deletions(-) diff --git a/images/macos/macos-10.15-Readme.md b/images/macos/macos-10.15-Readme.md index e101c7c647a3..338b732d02d5 100644 --- a/images/macos/macos-10.15-Readme.md +++ b/images/macos/macos-10.15-Readme.md @@ -1,12 +1,14 @@ | Announcements | |-| +| [[All OSs] Az PowerShell Module will be upgraded to 7.1.0 on January, 17](https://github.com/actions/virtual-environments/issues/4841) | +| [[macOS] Default Xcode on Big Sur image will be set to Xcode 13.2.1 on January, 24](https://github.com/actions/virtual-environments/issues/4800) | | [[All OSs] Python version 3.5 will be removed from the images on January 24, 2022](https://github.com/actions/virtual-environments/issues/4744) | | [macOS-latest workflows will use macOS-11](https://github.com/actions/virtual-environments/issues/4060) | *** # macOS 10.15 info - System Version: macOS 10.15.7 (19H1615) - Kernel Version: Darwin 19.6.0 -- Image Version: 20211220.1 +- Image Version: 20220110.2 ## Installed Software ### Language and Runtime @@ -21,12 +23,12 @@ - GNU Fortran (Homebrew GCC 10.3.0) 10.3.0 - available by `gfortran-10` alias - GNU Fortran (Homebrew GCC 11.2.0_3) 11.2.0 - available by `gfortran-11` alias - Go 1.15.15 -- julia 1.7.0 +- julia 1.7.1 - Kotlin 1.6.10-release-923 - MSBuild 16.10.1.58001 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) - Node.js v16.13.1 - NVM 0.39.1 -- NVM - Cached node versions: v12.22.8 v14.18.2 v16.13.1 +- NVM - Cached node versions: v12.22.9 v14.18.3 v16.13.2 - Perl 5.34.0 - PHP 8.1.1 - Python 2.7.18 @@ -35,19 +37,19 @@ - Ruby 2.7.5p203 ### Package Management -- Bundler version 2.2.33 +- Bundler version 2.3.4 - Carthage 0.38.0 - CocoaPods 1.11.2 -- Composer 2.1.14 +- Composer 2.2.4 - Homebrew 3.3.9 - Miniconda 4.10.3 - NPM 8.1.2 - NuGet 5.9.0.7134 - Pip 20.3.4 (python 2.7) - Pip 21.3.1 (python 3.9) -- Pipx 0.16.4 +- Pipx 1.0.0 - RubyGems 3.2.33 -- Vcpkg 2021 (build from master \<cf43cf71c>) +- Vcpkg 2021 (build from master \<5edd518dc>) - Yarn 1.22.17 #### Environment variables @@ -59,8 +61,8 @@ ### Project Management - Apache Ant(TM) 1.10.12 - Apache Maven 3.8.4 -- Gradle 7.3.2 -- Sbt 1.5.7 +- Gradle 7.3.3 +- Sbt 1.6.1 ### Utilities - 7-Zip 17.04 @@ -69,20 +71,20 @@ - bazel 4.2.2 - bazelisk 1.11.0 - bsdtar 3.3.2 - available by 'tar' alias -- Curl 7.80.0 +- Curl 7.81.0 - Git LFS: 3.0.2 - Git: 2.34.1 -- GitHub CLI: 2.3.0 -- GNU parallel 20211122 +- GitHub CLI: 2.4.0 +- GNU parallel 20211222 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.2 -- gpg (GnuPG) 2.3.3 +- gpg (GnuPG) 2.3.4 - helm v3.7.2+g663a896 - Hub CLI: 2.14.2 - jq 1.6 - mongo v5.0.4 - mongod v5.0.4 -- Newman 5.3.0 +- Newman 5.3.1 - OpenSSL 1.1.1m 14 Dec 2021 `(/usr/local/opt/openssl@1.1 -> ../Cellar/openssl@1.1/1.1.1m)` - Packer 1.7.8 - PostgreSQL 14.1 @@ -92,15 +94,15 @@ - Switchaudio-osx 1.1.0 - Vagrant 2.2.19 - virtualbox 6.1.30r148432 -- zstd 1.5.0 +- zstd 1.5.1 ### Tools - Aliyun CLI 3.0.102 -- App Center CLI 2.10.7 -- AWS CLI 2.4.6 -- AWS SAM CLI 1.36.0 +- App Center CLI 2.10.8 +- AWS CLI 2.4.9 +- AWS SAM CLI 1.37.0 - AWS Session Manager CLI 1.2.279.0 -- Azure CLI 2.31.0 +- Azure CLI 2.32.0 - Bicep CLI 0.4.1124 - Cabal 3.6.2.0 - Cmake 3.22.1 @@ -120,18 +122,18 @@ ### Browsers - Safari 15.2 (15612.3.6.1.8) - SafariDriver 15.2 (15612.3.6.1.8) -- Google Chrome 96.0.4664.110 -- ChromeDriver 96.0.4664.45 -- Microsoft Edge 96.0.1054.62 -- MSEdgeDriver 96.0.1054.62 +- Google Chrome 97.0.4692.71 +- ChromeDriver 97.0.4692.71 +- Microsoft Edge 97.0.1072.55 +- MSEdgeDriver 97.0.1072.55 - Mozilla Firefox 95.0.2 - geckodriver 0.30.0 -- Selenium server 4.1.0 +- Selenium server 4.1.1 #### Environment variables | Name | Value | | --------------- | --------------------------------------------- | -| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/96.0.4664.45 | +| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/97.0.4692.71 | | EDGEWEBDRIVER | /usr/local/share/edge_driver | | GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | @@ -160,7 +162,7 @@ - 3.7.12 - 3.8.12 - 3.9.9 -- 3.10.0 +- 3.10.1 #### PyPy - 2.7.18 [PyPy 7.3.6] @@ -177,8 +179,8 @@ | Version | Architecture | Environment Variable | | ------- | ------------ | -------------------- | | 1.15.15 (Default) | x64 | GOROOT_1_15_X64 | -| 1.16.12 | x64 | GOROOT_1_16_X64 | -| 1.17.5 | x64 | GOROOT_1_17_X64 | +| 1.16.13 | x64 | GOROOT_1_16_X64 | +| 1.17.6 | x64 | GOROOT_1_17_X64 | ### Rust Tools - Cargo 1.57.0 @@ -209,7 +211,7 @@ | Name | Version | ConfigFile | ServiceStatus | ListenPort | | ----- | ------- | ------------------------------- | ------------- | ---------- | | httpd | 2.4.52 | /usr/local/etc/httpd/httpd.conf | none | 80 | -| nginx | 1.21.4 | /usr/local/etc/nginx/nginx.conf | none | 80 | +| nginx | 1.21.5 | /usr/local/etc/nginx/nginx.conf | none | 80 | ### Xamarin #### Visual Studio for Mac From 9b6af5b76eee1c6d7ef95b086a6a740c4fec7443 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Sim=C3=B5es?= <jose.simoes@eclo.solutions> Date: Tue, 18 Jan 2022 13:31:51 +0000 Subject: [PATCH 0897/3485] Add install of dotnet tools (#4820) * Add install of dotnet tools - Add new section under dotnet. - Add installer for dotnet tools. - Add tests for dotnet tools. - Add dotnet tools to software report. * Fixes from code review * Add test and version check to dotnet tool json - Rework installer to use tool name. - Rework test to call tool test. - Rework software report to use tool specific command to get version. * Fixes from code review * Fix test for nbgv * Fix linux installer * Fix name for test context. * Update images/linux/scripts/installers/dotnetcore-sdk.sh Co-authored-by: PJ <me@panekj.dev> * Update images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 Co-authored-by: PJ <me@panekj.dev> * Update images/win/scripts/Tests/DotnetSDK.Tests.ps1 Co-authored-by: PJ <me@panekj.dev> * Aligning PS1 between win and linux * Remove out * Add Nuget.org as feed source for installing tool * Fix tests * Fix getting tool version * Change from code review * Update images/win/toolsets/toolset-2022.json Co-authored-by: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> * Update images/win/toolsets/toolset-2019.json Co-authored-by: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> * Update images/win/toolsets/toolset-2016.json Co-authored-by: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> * Changes from code review * Change from code revision * Fix tests * dotnet tool is now installed to a tool path * Move dotnet tools install - Need to install the dotnet tools AFTER post install steps otherwise dotnet is not in the path. * Fxi typo in path * Add path to software report for dotnet tools * Remove new line (from code review) * Add progress output message to dotnet tools install * Change install path for tool * New updating PATH with dotnet tools location * Remove duplicated assigment * Remove output message and add back Out-null Co-authored-by: PJ <me@panekj.dev> Co-authored-by: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> --- .../SoftwareReport/SoftwareReport.Common.psm1 | 14 ++++++++++++++ .../SoftwareReport/SoftwareReport.Generator.ps1 | 4 ++++ images/linux/scripts/installers/dotnetcore-sdk.sh | 7 +++++++ images/linux/scripts/tests/DotnetSDK.Tests.ps1 | 13 ++++++++++++- images/linux/toolsets/toolset-1804.json | 3 +++ images/linux/toolsets/toolset-2004.json | 3 +++ .../win/scripts/Installers/Install-DotnetSDK.ps1 | 11 +++++++++++ .../SoftwareReport/SoftwareReport.Common.psm1 | 12 ++++++++++++ .../SoftwareReport/SoftwareReport.Generator.ps1 | 4 ++++ images/win/scripts/Tests/DotnetSDK.Tests.ps1 | 14 ++++++++++++-- images/win/toolsets/toolset-2016.json | 3 +++ images/win/toolsets/toolset-2019.json | 3 +++ images/win/toolsets/toolset-2022.json | 3 +++ 13 files changed, 91 insertions(+), 3 deletions(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 index ccff2b02bb7c..c97a23c54612 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 @@ -331,6 +331,20 @@ function Get-DotNetCoreSdkVersions { return $dotNetCoreSdkVersion } +function Get-DotnetTools { + $env:PATH = "/etc/skel/.dotnet/tools:$($env:PATH)" + + $dotnetTools = (Get-ToolsetContent).dotnet.tools + + $toolsList = @() + + ForEach ($dotnetTool in $dotnetTools) { + $toolsList += $dotnetTool.name + " " + (Invoke-Expression $dotnetTool.getversion) + } + + return $toolsList +} + function Get-CachedDockerImages { $toolsetJson = Get-ToolsetContent $images = $toolsetJson.docker.images diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index 38452bfcf97e..3fac0b7160c6 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -230,6 +230,10 @@ $markdown += New-MDList -Style Unordered -Lines @( (Get-DotNetCoreSdkVersions) ) +$markdown += New-MDHeader ".NET tools" -Level 3 +$tools = Get-DotnetTools +$markdown += New-MDList -Lines $tools -Style Unordered + $markdown += New-MDHeader "Databases" -Level 3 $markdown += New-MDList -Style Unordered -Lines (@( (Get-PostgreSqlVersion), diff --git a/images/linux/scripts/installers/dotnetcore-sdk.sh b/images/linux/scripts/installers/dotnetcore-sdk.sh index bcbcde99cd16..69af71797782 100644 --- a/images/linux/scripts/installers/dotnetcore-sdk.sh +++ b/images/linux/scripts/installers/dotnetcore-sdk.sh @@ -11,6 +11,7 @@ source $HELPER_SCRIPTS/os.sh # Ubuntu 20 doesn't support EOL versions LATEST_DOTNET_PACKAGES=$(get_toolset_value '.dotnet.aptPackages[]') DOTNET_VERSIONS=$(get_toolset_value '.dotnet.versions[]') +DOTNET_TOOLS=$(get_toolset_value '.dotnet.tools[].name') # Disable telemetry export DOTNET_CLI_TELEMETRY_OPTOUT=1 @@ -67,4 +68,10 @@ setEtcEnvironmentVariable DOTNET_NOLOGO 1 setEtcEnvironmentVariable DOTNET_MULTILEVEL_LOOKUP 0 prependEtcEnvironmentPath '$HOME/.dotnet/tools' +# install dotnet tools +for dotnet_tool in ${DOTNET_TOOLS[@]}; do + echo "Installing dotnet tool $dotnet_tool" + dotnet tool install $dotnet_tool --tool-path '/etc/skel/.dotnet/tools' +done + invoke_tests "DotnetSDK" diff --git a/images/linux/scripts/tests/DotnetSDK.Tests.ps1 b/images/linux/scripts/tests/DotnetSDK.Tests.ps1 index 61eb7bf94f23..d2d90daddf86 100644 --- a/images/linux/scripts/tests/DotnetSDK.Tests.ps1 +++ b/images/linux/scripts/tests/DotnetSDK.Tests.ps1 @@ -1,8 +1,9 @@ Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" -Describe "Dotnet" { +Describe "Dotnet and tools" { BeforeAll { + $env:PATH = "/etc/skel/.dotnet/tools:$($env:PATH)" $dotnetSDKs = dotnet --list-sdks | ConvertTo-Json $dotnetRuntimes = dotnet --list-runtimes | ConvertTo-Json } @@ -28,4 +29,14 @@ Describe "Dotnet" { } } } + + Context "Dotnet tools" { + $dotnetTools = (Get-ToolsetContent).dotnet.tools + $testCases = $dotnetTools | ForEach-Object { @{ ToolName = $_.name; TestInstance = $_.test }} + + It "<ToolName> is available" -TestCases $testCases { + "$TestInstance" | Should -ReturnZeroExitCode + } + } + } \ No newline at end of file diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index 1f4915c8ce4a..c91e95ae3f59 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -254,6 +254,9 @@ "2.1", "3.1", "5.0" + ], + "tools": [ + { "name": "nbgv", "test": "nbgv --version", "getversion" : "nbgv --version" } ] }, "clang": { diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index 0947c7cf7e78..c2b212ed2b78 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -254,6 +254,9 @@ "2.1", "3.1", "5.0" + ], + "tools": [ + { "name": "nbgv", "test": "nbgv --version", "getversion" : "nbgv --version" } ] }, "clang": { diff --git a/images/win/scripts/Installers/Install-DotnetSDK.ps1 b/images/win/scripts/Installers/Install-DotnetSDK.ps1 index 1b802e24fe7a..6a4ced4561ee 100644 --- a/images/win/scripts/Installers/Install-DotnetSDK.ps1 +++ b/images/win/scripts/Installers/Install-DotnetSDK.ps1 @@ -108,6 +108,16 @@ function InstallAllValidSdks() } } +function InstallTools() +{ + $dotnetTools = (Get-ToolsetContent).dotnet.tools + + ForEach ($dotnetTool in $dotnetTools) + { + dotnet tool install $($dotnetTool.name) --tool-path "C:\Users\Default.dotnet\tools" --add-source https://api.nuget.org/v3/index.json | Out-Null + } +} + function RunPostInstallationSteps() { # Add dotnet to PATH @@ -129,5 +139,6 @@ function RunPostInstallationSteps() InstallAllValidSdks RunPostInstallationSteps +InstallTools Invoke-PesterTests -TestFile "DotnetSDK" \ No newline at end of file diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 index 68b838640895..172244c4ba2a 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 @@ -200,6 +200,18 @@ function Get-DotnetSdks { } } +function Get-DotnetTools { + $env:Path += ";C:\Users\Default.dotnet\tools" + $dotnetTools = (Get-ToolsetContent).dotnet.tools + + $toolsList = @() + + foreach ($dotnetTool in $dotnetTools) { + $toolsList += $dotnetTool.name + " " + (Invoke-Expression $dotnetTool.getversion) + } + return $toolsList +} + function Get-DotnetRuntimes { $runtimesRawList = dotnet --list-runtimes $runtimesRawList | Group-Object {$_.Split()[0]} | ForEach-Object { diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index 1e0d7abf4af5..2f9d0f65e9e0 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -261,6 +261,10 @@ $markdown += "``Location $($frameworks.Path)``" $markdown += New-MDNewLine $markdown += New-MDList -Lines $frameworks.Versions -Style Unordered +$markdown += New-MDHeader ".NET tools" -Level 3 +$tools = Get-DotnetTools +$markdown += New-MDList -Lines $tools -Style Unordered + # PowerShell Tools $markdown += New-MDHeader "PowerShell Tools" -Level 3 $markdown += New-MDList -Lines (Get-PowershellCoreVersion) -Style Unordered diff --git a/images/win/scripts/Tests/DotnetSDK.Tests.ps1 b/images/win/scripts/Tests/DotnetSDK.Tests.ps1 index 903be287062b..3ad3e7420e70 100644 --- a/images/win/scripts/Tests/DotnetSDK.Tests.ps1 +++ b/images/win/scripts/Tests/DotnetSDK.Tests.ps1 @@ -1,6 +1,7 @@ $dotnetVersions = (Get-ToolsetContent).dotnet.versions +$dotnetTools = (Get-ToolsetContent).dotnet.tools -Describe "Dotnet SDK" { +Describe "Dotnet SDK and tools" { Context "Default" { It "Default Dotnet SDK is available" { @@ -21,4 +22,13 @@ Describe "Dotnet SDK" { } } } -} \ No newline at end of file + + Context "Dotnet tools" { + $env:Path += ";C:\Users\Default.dotnet\tools" + $testCases = $dotnetTools | ForEach-Object { @{ ToolName = $_.name; TestInstance = $_.test }} + + It "<ToolName> is available" -TestCases $testCases { + "$TestInstance" | Should -ReturnZeroExitCode + } + } +} diff --git a/images/win/toolsets/toolset-2016.json b/images/win/toolsets/toolset-2016.json index a1b063d7d2f5..0a35fcfc193b 100644 --- a/images/win/toolsets/toolset-2016.json +++ b/images/win/toolsets/toolset-2016.json @@ -387,6 +387,9 @@ "3.1", "5.0" ], + "tools": [ + { "name": "nbgv", "test": "nbgv --version", "getversion": "nbgv --version" } + ], "warmup": true }, "choco": { diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index d87af251c37b..fd0681769a2a 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -422,6 +422,9 @@ "3.1", "5.0" ], + "tools": [ + { "name": "nbgv", "test": "nbgv --version", "getversion": "nbgv --version" } + ], "warmup": true }, "choco": { diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index c0ad5f95f4a9..1a73b3f7c7c2 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -283,6 +283,9 @@ "3.1", "5.0" ], + "tools": [ + { "name": "nbgv", "test": "nbgv --version", "getversion": "nbgv --version" } + ], "warmup": false }, "choco": { From 84c135f86ff08cf802a89a71b22c5935104f84f2 Mon Sep 17 00:00:00 2001 From: Mariusz Ferdyn <MariuszFerdyn@users.noreply.github.com> Date: Tue, 18 Jan 2022 15:55:31 +0000 Subject: [PATCH 0898/3485] Added AAD Service Principals to the command (#4886) * Added AAD Service Principals to the command Added: -AzureClientId {AADApplicationID} -AzureClientSecret {AADApplicationSecret} -AzureTenantId {AADTenantID} to the command. * Update docs/create-image-and-azure-resources.md Agree - better. Co-authored-by: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Co-authored-by: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> --- docs/create-image-and-azure-resources.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/docs/create-image-and-azure-resources.md b/docs/create-image-and-azure-resources.md index 912def66630a..21ba92d8adc9 100644 --- a/docs/create-image-and-azure-resources.md +++ b/docs/create-image-and-azure-resources.md @@ -66,6 +66,12 @@ Where: The function automatically creates all required Azure resources and kicks off packer image generation for the selected image type. +For optional authentication via service principal make sure to provide the following params — `AzureClientId`, `AzureClientSecret`, `AzureTenantId`, so the whole command will be: + +``` +GenerateResourcesAndImage -SubscriptionId {YourSubscriptionId} -ResourceGroupName "myTestResourceGroup" -ImageGenerationRepositoryRoot "$pwd" -ImageType Ubuntu1804 -AzureLocation "East US" -AzureClientId {AADApplicationID} -AzureClientSecret {AADApplicationSecret} -AzureTenantId {AADTenantID} +``` + *Please, check synopsis of `GenerateResourcesAndImage` for details about non-mandatory parameters.* #### Generated VM Deployment From 7ef06a9879fbc525aa858354ca7ad934826749f4 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Wed, 19 Jan 2022 10:58:23 +0300 Subject: [PATCH 0899/3485] [Packer] Add info about build_resource_group_name option (#4900) * Add info about build_resource_group_name option * Update docs/create-image-and-azure-resources.md Co-authored-by: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Co-authored-by: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> --- docs/create-image-and-azure-resources.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/create-image-and-azure-resources.md b/docs/create-image-and-azure-resources.md index 21ba92d8adc9..ae25ed00ffce 100644 --- a/docs/create-image-and-azure-resources.md +++ b/docs/create-image-and-azure-resources.md @@ -101,6 +101,7 @@ The function creates an Azure VM from a template and generates network resources ### User variables The Packer template includes `variables` section containing user variables used in image generation. Each variable is defined as a key/value strings. User variables can be passed to packer via predefined environment variables, or as direct arguments, in case if packer started manually. +- `build_resource_group_name` - Specify an existing resource group to run the build in it. By default, a temporary resource group will be created and destroyed as part of the build. If you do not have permission to do so, use build_resource_group_name to specify an existing resource group to run the build in it. - `client_id` - The application ID of the AAD Service Principal. Requires `client_secret`. - `object_id` - The object ID for the AAD SP. Will be derived from the oAuth token if empty. - `client_secret` - A password/secret registered for the AAD SP. From bdeb91b5d728aa057fd42a81b1b41740eefcc321 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Wed, 19 Jan 2022 22:19:01 +0300 Subject: [PATCH 0900/3485] [Ubuntu] Switch java default back to 11 on 20.04 (#4903) --- images/linux/toolsets/toolset-2004.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index c2b212ed2b78..5bc5bfbbedb3 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -71,7 +71,7 @@ } ], "java": { - "default": "8", + "default": "11", "default_vendor": "Temurin-Hotspot", "vendors": [ { From c1e7f3a462aaba2036a3182b2184c433cf637dc7 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 20 Jan 2022 10:07:13 +0000 Subject: [PATCH 0901/3485] Updating readme file for macOS-10.15 version 20220118.8 (#4910) Co-authored-by: Image generation service account <no-reply@microsoft.com> --- images/macos/macos-10.15-Readme.md | 55 +++++++++++++++--------------- 1 file changed, 28 insertions(+), 27 deletions(-) diff --git a/images/macos/macos-10.15-Readme.md b/images/macos/macos-10.15-Readme.md index 338b732d02d5..8b2cf90f7787 100644 --- a/images/macos/macos-10.15-Readme.md +++ b/images/macos/macos-10.15-Readme.md @@ -1,5 +1,6 @@ | Announcements | |-| +| [[All OSs] .NET 2.1 will be removed from the images on February, 21](https://github.com/actions/virtual-environments/issues/4871) | | [[All OSs] Az PowerShell Module will be upgraded to 7.1.0 on January, 17](https://github.com/actions/virtual-environments/issues/4841) | | [[macOS] Default Xcode on Big Sur image will be set to Xcode 13.2.1 on January, 24](https://github.com/actions/virtual-environments/issues/4800) | | [[All OSs] Python version 3.5 will be removed from the images on January 24, 2022](https://github.com/actions/virtual-environments/issues/4744) | @@ -8,7 +9,7 @@ # macOS 10.15 info - System Version: macOS 10.15.7 (19H1615) - Kernel Version: Darwin 19.6.0 -- Image Version: 20220110.2 +- Image Version: 20220118.8 ## Installed Software ### Language and Runtime @@ -26,22 +27,22 @@ - julia 1.7.1 - Kotlin 1.6.10-release-923 - MSBuild 16.10.1.58001 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) -- Node.js v16.13.1 +- Node.js v16.13.2 - NVM 0.39.1 - NVM - Cached node versions: v12.22.9 v14.18.3 v16.13.2 - Perl 5.34.0 - PHP 8.1.1 - Python 2.7.18 -- Python 3.9.9 +- Python 3.9.10 - R 4.1.2 - Ruby 2.7.5p203 ### Package Management -- Bundler version 2.3.4 +- Bundler version 2.3.5 - Carthage 0.38.0 - CocoaPods 1.11.2 - Composer 2.2.4 -- Homebrew 3.3.9 +- Homebrew 3.3.11 - Miniconda 4.10.3 - NPM 8.1.2 - NuGet 5.9.0.7134 @@ -49,7 +50,7 @@ - Pip 21.3.1 (python 3.9) - Pipx 1.0.0 - RubyGems 3.2.33 -- Vcpkg 2021 (build from master \<5edd518dc>) +- Vcpkg 2021 (build from master \<4184491f0>) - Yarn 1.22.17 #### Environment variables @@ -82,8 +83,8 @@ - helm v3.7.2+g663a896 - Hub CLI: 2.14.2 - jq 1.6 -- mongo v5.0.4 -- mongod v5.0.4 +- mongo v5.0.5 +- mongod v5.0.5 - Newman 5.3.1 - OpenSSL 1.1.1m 14 Dec 2021 `(/usr/local/opt/openssl@1.1 -> ../Cellar/openssl@1.1/1.1.1m)` - Packer 1.7.8 @@ -97,21 +98,21 @@ - zstd 1.5.1 ### Tools -- Aliyun CLI 3.0.102 +- Aliyun CLI 3.0.104 - App Center CLI 2.10.8 -- AWS CLI 2.4.9 +- AWS CLI 2.4.11 - AWS SAM CLI 1.37.0 -- AWS Session Manager CLI 1.2.279.0 +- AWS Session Manager CLI 1.2.295.0 - Azure CLI 2.32.0 - Bicep CLI 0.4.1124 - Cabal 3.6.2.0 - Cmake 3.22.1 -- Fastlane 2.199.0 +- Fastlane 2.200.0 - GHC 9.2.1 - GHCup 0.1.17.4 - Jazzy 0.14.1 - Stack 2.7.3 -- SwiftFormat 0.49.1 +- SwiftFormat 0.49.2 - Swig 4.0.2 - Xcode Command Line Tools 12.4.0.0.1.1610135815 @@ -124,9 +125,9 @@ - SafariDriver 15.2 (15612.3.6.1.8) - Google Chrome 97.0.4692.71 - ChromeDriver 97.0.4692.71 -- Microsoft Edge 97.0.1072.55 -- MSEdgeDriver 97.0.1072.55 -- Mozilla Firefox 95.0.2 +- Microsoft Edge 97.0.1072.62 +- MSEdgeDriver 97.0.1072.62 +- Mozilla Firefox 96.0.1 - geckodriver 0.30.0 - Selenium server 4.1.1 @@ -161,8 +162,8 @@ - 3.6.15 - 3.7.12 - 3.8.12 -- 3.9.9 -- 3.10.1 +- 3.9.10 +- 3.10.2 #### PyPy - 2.7.18 [PyPy 7.3.6] @@ -171,9 +172,9 @@ - 3.8.12 [PyPy 7.3.7] #### Node.js -- 12.22.8 -- 14.18.2 -- 16.13.1 +- 12.22.9 +- 14.18.3 +- 16.13.2 #### Go | Version | Architecture | Environment Variable | @@ -183,9 +184,9 @@ | 1.17.6 | x64 | GOROOT_1_17_X64 | ### Rust Tools -- Cargo 1.57.0 -- Rust 1.57.0 -- Rustdoc 1.57.0 +- Cargo 1.58.0 +- Rust 1.58.0 +- Rustdoc 1.58.0 - Rustup 1.24.3 #### Packages @@ -193,8 +194,8 @@ - Cargo-audit 0.16.0 - Cargo-outdated v0.10.2 - Cbindgen 0.20.0 -- Clippy 0.1.57 -- Rustfmt 1.4.37-stable +- Clippy 0.1.58 +- Rustfmt 1.4.38-stable ### PowerShell Tools - PowerShell 7.2.1 @@ -202,7 +203,7 @@ #### PowerShell Modules | Module | Version | | ---------------- | ------- | -| Az | 6.1.0 | +| Az | 7.1.0 | | MarkdownPS | 1.9 | | Pester | 5.3.1 | | PSScriptAnalyzer | 1.20.0 | From 73ef0e730c5d514777637a8bef0e73c21a4f6876 Mon Sep 17 00:00:00 2001 From: V-Zabayrachny <79155496+V-Zabayrachny@users.noreply.github.com> Date: Thu, 20 Jan 2022 13:11:21 +0300 Subject: [PATCH 0902/3485] [MacOS] Update Xcode to 13.2.1 on macOS 11 (#4914) * Xcode update to 13.2.1 on macOS 11 * Xcode update to 13.2.1 on macOS 12 --- images/macos/toolsets/toolset-11.json | 4 ++-- images/macos/toolsets/toolset-12.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index 94c33602fc83..e602f81c0ad8 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -1,6 +1,6 @@ { "xcode": { - "default": "13.1", + "default": "13.2.1", "versions": [ { "link": "13.2.1", "version": "13.2.1" }, { "link": "13.2", "version": "13.2.0" }, @@ -25,7 +25,7 @@ "android-versions": [ "12.0.0.3", "11.3.0.4", "11.2.2.1", "11.1.0.26", "11.0.2.0" ], - "bundle-default": "6_12_10", + "bundle-default": "6_12_12", "bundles": [ { "symlink": "6_12_12", diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index 665f4c471ae3..1e549b9f6ab9 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -1,6 +1,6 @@ { "xcode": { - "default": "13.1", + "default": "13.2.1", "versions": [ { "link": "13.2.1", "version": "13.2.1" }, { "link": "13.2", "version": "13.2.0" }, @@ -21,7 +21,7 @@ "android-versions": [ "12.0.0.3", "11.3.0.4" ], - "bundle-default": "6_12_10", + "bundle-default": "6_12_12", "bundles": [ { "symlink": "6_12_12", From cdd8150e00d4f0d8e90bcffd147e798199b8a864 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Thu, 20 Jan 2022 13:41:21 +0300 Subject: [PATCH 0903/3485] [macOS] Allow using GitHub PAT to enlarge api requests limit (#4917) * Use gh api pat * Add gh token to 10.15 * Add github_api_pat for macos-12 --- images/macos/provision/core/nvm.sh | 2 +- images/macos/provision/core/powershell.sh | 2 +- images/macos/provision/core/ruby.sh | 2 +- images/macos/provision/core/stack.sh | 2 +- images/macos/provision/core/swiftlint.sh | 2 +- images/macos/templates/macOS-10.15.json | 9 ++++++++- images/macos/templates/macOS-11.json | 7 +++++++ images/macos/templates/macOS-12.json | 9 ++++++++- 8 files changed, 28 insertions(+), 7 deletions(-) diff --git a/images/macos/provision/core/nvm.sh b/images/macos/provision/core/nvm.sh index 16252a029178..d2e552fea13c 100755 --- a/images/macos/provision/core/nvm.sh +++ b/images/macos/provision/core/nvm.sh @@ -5,7 +5,7 @@ ########################################################################### source ~/utils/utils.sh -VERSION=$(curl -s https://api.github.com/repos/nvm-sh/nvm/releases/latest | jq -r '.tag_name') +VERSION=$(curl -H "Authorization: token $API_PAT" -s https://api.github.com/repos/nvm-sh/nvm/releases/latest | jq -r '.tag_name') curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/$VERSION/install.sh | bash if [ $? -eq 0 ]; then diff --git a/images/macos/provision/core/powershell.sh b/images/macos/provision/core/powershell.sh index fc6d6ffca3d6..d674fccb3c6c 100644 --- a/images/macos/provision/core/powershell.sh +++ b/images/macos/provision/core/powershell.sh @@ -2,7 +2,7 @@ source ~/utils/utils.sh echo Installing PowerShell... -psRelease=$(curl -s "https://api.github.com/repos/PowerShell/PowerShell/releases/latest") +psRelease=$(curl -H "Authorization: token $API_PAT" -s "https://api.github.com/repos/PowerShell/PowerShell/releases/latest") psDownloadUrl=$(echo $psRelease | jq -r '.assets[].browser_download_url | select(contains("osx-x64.pkg"))' | head -n 1) download_with_retries $psDownloadUrl "/tmp" "powershell.pkg" diff --git a/images/macos/provision/core/ruby.sh b/images/macos/provision/core/ruby.sh index e4c198a6a873..cae43e949b89 100755 --- a/images/macos/provision/core/ruby.sh +++ b/images/macos/provision/core/ruby.sh @@ -10,7 +10,7 @@ echo "GEM_PATH=$GEM_PATH" >> "$HOME/.bashrc" echo 'export PATH="$GEM_PATH:/usr/local/opt/ruby@'${DEFAULT_RUBY_VERSION}'/bin:$PATH"' >> "$HOME/.bashrc" echo "Install Ruby from toolset..." -PACKAGE_TAR_NAMES=$(curl -s "https://api.github.com/repos/ruby/ruby-builder/releases/latest" | jq -r '.assets[].name') +PACKAGE_TAR_NAMES=$(curl -H "Authorization: token $API_PAT" -s "https://api.github.com/repos/ruby/ruby-builder/releases/latest" | jq -r '.assets[].name') TOOLSET_VERSIONS=$(get_toolset_value '.toolcache[] | select(.name | contains("Ruby")) | .versions[]') RUBY_PATH="$AGENT_TOOLSDIRECTORY/Ruby" diff --git a/images/macos/provision/core/stack.sh b/images/macos/provision/core/stack.sh index bdb22a56c4cc..7dfa8328d0ac 100644 --- a/images/macos/provision/core/stack.sh +++ b/images/macos/provision/core/stack.sh @@ -2,7 +2,7 @@ source ~/utils/utils.sh echo "Get the latest Stack version..." -StackRelease=$(curl -s "https://api.github.com/repos/commercialhaskell/stack/releases/latest") +StackRelease=$(curl -H "Authorization: token $API_PAT" -s "https://api.github.com/repos/commercialhaskell/stack/releases/latest") DownloadUrl=$(echo $StackRelease | jq -r '.assets[].browser_download_url | select(contains("osx-x86_64.tar.gz"))' | head -n 1) StackVersion=$(echo $StackRelease | jq -r '.name' | cut -c2-) StackArchive="/tmp/stack.tar.gz" diff --git a/images/macos/provision/core/swiftlint.sh b/images/macos/provision/core/swiftlint.sh index c9c2fdc05a48..b4bb7e3f4143 100644 --- a/images/macos/provision/core/swiftlint.sh +++ b/images/macos/provision/core/swiftlint.sh @@ -2,7 +2,7 @@ source ~/utils/utils.sh echo "Install SwiftLint" -swiftlintUrl=$(curl -s "https://api.github.com/repos/realm/SwiftLint/releases/latest" | jq -r '.assets[].browser_download_url | select(contains("SwiftLint.pkg"))') +swiftlintUrl=$(curl -H "Authorization: token $API_PAT" -s "https://api.github.com/repos/realm/SwiftLint/releases/latest" | jq -r '.assets[].browser_download_url | select(contains("SwiftLint.pkg"))') download_with_retries $swiftlintUrl "/tmp" "SwiftLint.pkg" sudo installer -pkg /tmp/SwiftLint.pkg -target / rm -rf /tmp/SwiftLint.pkg diff --git a/images/macos/templates/macOS-10.15.json b/images/macos/templates/macOS-10.15.json index d6f57c07f8fb..9f130ad8ed27 100644 --- a/images/macos/templates/macOS-10.15.json +++ b/images/macos/templates/macOS-10.15.json @@ -11,6 +11,7 @@ "output_folder": null, "vm_username": null, "vm_password": null, + "github_api_pat": null, "xcode_install_user": null, "xcode_install_password": null, "image_os": "macos1015" @@ -138,6 +139,9 @@ "./provision/core/rubygem.sh", "./provision/core/git.sh", "./provision/core/node.sh" + ], + "environment_vars": [ + "API_PAT={{user `github_api_pat`}}" ] }, { @@ -191,12 +195,15 @@ "./provision/core/pypy.sh", "./provision/core/pipx-packages.sh", "./provision/core/bicep.sh" + ], + "environment_vars": [ + "API_PAT={{user `github_api_pat`}}" ] }, { "type": "shell", "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} pwsh -f {{ .Path }}", - "scripts": [ + "scripts": [ "./provision/core/toolset.ps1", "./provision/core/configure-toolset.ps1" ] diff --git a/images/macos/templates/macOS-11.json b/images/macos/templates/macOS-11.json index bebcfc2d7626..01a086ac5ea0 100644 --- a/images/macos/templates/macOS-11.json +++ b/images/macos/templates/macOS-11.json @@ -11,6 +11,7 @@ "output_folder": null, "vm_username": null, "vm_password": null, + "github_api_pat": null, "xcode_install_user": null, "xcode_install_password": null, "image_os": "macos11" @@ -143,6 +144,9 @@ "./provision/core/rubygem.sh", "./provision/core/git.sh", "./provision/core/node.sh" + ], + "environment_vars": [ + "API_PAT={{user `github_api_pat`}}" ] }, { @@ -194,6 +198,9 @@ "./provision/core/pypy.sh", "./provision/core/pipx-packages.sh", "./provision/core/bicep.sh" + ], + "environment_vars": [ + "API_PAT={{user `github_api_pat`}}" ] }, { diff --git a/images/macos/templates/macOS-12.json b/images/macos/templates/macOS-12.json index 2d3c1768687f..e9c1de9d73a0 100644 --- a/images/macos/templates/macOS-12.json +++ b/images/macos/templates/macOS-12.json @@ -11,6 +11,7 @@ "output_folder": null, "vm_username": null, "vm_password": null, + "github_api_pat": null, "xcode_install_user": null, "xcode_install_password": null, "image_os": "macos12" @@ -143,6 +144,9 @@ "./provision/core/rubygem.sh", "./provision/core/git.sh", "./provision/core/node.sh" + ], + "environment_vars": [ + "API_PAT={{user `github_api_pat`}}" ] }, { @@ -193,12 +197,15 @@ "./provision/core/pypy.sh", "./provision/core/pipx-packages.sh", "./provision/core/bicep.sh" + ], + "environment_vars": [ + "API_PAT={{user `github_api_pat`}}" ] }, { "type": "shell", "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} pwsh -f {{ .Path }}", - "scripts": [ + "scripts": [ "./provision/core/toolset.ps1", "./provision/core/configure-toolset.ps1" ] From 6af7ac92b640a2ebd3cafca447766fce49eb1685 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 20 Jan 2022 12:26:52 +0000 Subject: [PATCH 0904/3485] Updating readme file for win19 version 20220116.1 (#4892) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2019-Readme.md | 78 +++++++++++++++++--------------- 1 file changed, 41 insertions(+), 37 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index 4fb5df3127d3..fec1c92621b0 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -1,13 +1,14 @@ | Announcements | |-| +| [[All OSs] .NET 2.1 will be removed from the images on February, 21](https://github.com/actions/virtual-environments/issues/4871) | | [windows-latest workflows will use Windows Server 2022](https://github.com/actions/virtual-environments/issues/4856) | | [[All OSs] Az PowerShell Module will be upgraded to 7.1.0 on January, 17](https://github.com/actions/virtual-environments/issues/4841) | | [[All OSs] Python version 3.5 will be removed from the images on January 24, 2022](https://github.com/actions/virtual-environments/issues/4744) | | [Windows-2016 environment will be removed on March 15, 2022](https://github.com/actions/virtual-environments/issues/4312) | *** # Microsoft Windows Server 2019 Datacenter -- OS Version: 10.0.17763 Build 2366 -- Image Version: 20220110.1 +- OS Version: 10.0.17763 Build 2452 +- Image Version: 20220116.1 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -28,14 +29,14 @@ ### Package Management - Chocolatey 0.11.3 - Composer 2.2.4 -- Helm 3.7.1 +- Helm 3.7.2 - Miniconda 4.10.3 (pre-installed on the image but not added to PATH) - NPM 8.1.2 - NuGet 6.0.0.280 - pip 21.3.1 (python 3.7) - Pipx 1.0.0 - RubyGems 2.7.6.3 -- Vcpkg (build from master \<9f04533f3>) +- Vcpkg (build from master \<bba8794b8>) - Yarn 1.22.17 #### Environment variables @@ -66,7 +67,7 @@ - ghc 9.2.1 - Git 2.34.1 - Git LFS 3.0.2 -- Google Cloud SDK 367.0.0 +- Google Cloud SDK 368.0.0 - InnoSetup 6.2.0 - jq 1.6 - Kind 0.11.1 @@ -77,8 +78,8 @@ - NSIS v3.08 - OpenSSL 1.1.1 - Packer 1.7.8 -- Parcel 2.1.1 -- Pulumi v3.21.1 +- Parcel 2.2.0 +- Pulumi v3.22.1 - R 4.1.2 - Service Fabric SDK 8.2.1363.9590 - Stack 2.7.3 @@ -91,10 +92,10 @@ - zstd 1.5.1 ### CLI Tools -- Alibaba Cloud CLI 3.0.102 -- AWS CLI 2.4.9 +- Alibaba Cloud CLI 3.0.104 +- AWS CLI 2.4.11 - AWS SAM CLI 1.37.0 -- AWS Session Manager CLI 1.2.279.0 +- AWS Session Manager CLI 1.2.295.0 - Azure CLI 2.32.0 - Azure DevOps CLI extension 0.22.0 - Cloud Foundry CLI 6.53.0 @@ -102,9 +103,9 @@ - Hub CLI 2.14.2 ### Rust Tools -- Cargo 1.57.0 -- Rust 1.57.0 -- Rustdoc 1.57.0 +- Cargo 1.58.0 +- Rust 1.58.0 +- Rustdoc 1.58.0 - Rustup 1.24.3 #### Packages @@ -112,15 +113,15 @@ - cargo-audit 0.16.0 - cargo-outdated v0.10.2 - cbindgen 0.20.0 -- Clippy 0.1.57 -- Rustfmt 1.4.37 +- Clippy 0.1.58 +- Rustfmt 1.4.38 ### Browsers and webdrivers - Google Chrome 97.0.4692.71 - Chrome Driver 97.0.4692.71 -- Microsoft Edge 97.0.1072.55 -- Microsoft Edge Driver 97.0.1072.55 -- Mozilla Firefox 95.0.2 +- Microsoft Edge 97.0.1072.62 +- Microsoft Edge Driver 97.0.1072.62 +- Mozilla Firefox 96.0.1 - Gecko Driver 0.30.0 - IE Driver 3.150.1.1 - Selenium server 4.1.0 @@ -237,12 +238,12 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Visual Studio Enterprise 2019 | Name | Version | Path | | ----------------------------- | --------------- | -------------------------------------------------------------- | -| Visual Studio Enterprise 2019 | 16.11.32002.261 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | +| Visual Studio Enterprise 2019 | 16.11.32106.194 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | #### Workloads, components and extensions: | Package | Version | | ------------------------------------------------------------------------- | --------------- | -| Component.Android.NDK.R16B | 16.11.32001.129 | +| Component.Android.NDK.R16B | 16.11.32104.304 | | Component.Android.SDK25.Private | 16.0.28625.61 | | Component.Android.SDK30 | 16.10.31205.252 | | Component.Ant | 1.9.3.8 | @@ -299,7 +300,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.NetCore.Component.DevelopmentTools | 16.10.31303.231 | | Microsoft.NetCore.Component.Runtime.3.1 | 16.11.32002.110 | | Microsoft.NetCore.Component.Runtime.5.0 | 16.11.32002.110 | -| Microsoft.NetCore.Component.SDK | 16.11.32002.110 | +| Microsoft.NetCore.Component.SDK | 16.11.32105.334 | | Microsoft.NetCore.Component.Web | 16.10.31303.231 | | Microsoft.VisualStudio.Component.AppInsights.Tools | 16.5.29515.121 | | Microsoft.VisualStudio.Component.AspNet45 | 16.10.31205.252 | @@ -386,6 +387,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Component.VC.MFC.ARM.Spectre | 16.5.29721.120 | | Microsoft.VisualStudio.Component.VC.MFC.ARM64 | 16.4.29313.120 | | Microsoft.VisualStudio.Component.VC.MFC.ARM64.Spectre | 16.5.29721.120 | +| Microsoft.VisualStudio.Component.VC.Modules.x86.x64 | 16.0.28625.61 | | Microsoft.VisualStudio.Component.VC.Redist.14.Latest | 16.5.29515.121 | | Microsoft.VisualStudio.Component.VC.Redist.MSM | 16.5.29515.121 | | Microsoft.VisualStudio.Component.VC.Runtimes.ARM.Spectre | 16.10.31205.252 | @@ -401,7 +403,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Component.VC.v141.ARM64 | 16.10.31205.252 | | Microsoft.VisualStudio.Component.VC.v141.ARM64.Spectre | 16.5.29515.121 | | Microsoft.VisualStudio.Component.VC.v141.ATL | 16.0.28625.61 | +| Microsoft.VisualStudio.Component.VC.v141.ATL.ARM | 16.0.28625.61 | | Microsoft.VisualStudio.Component.VC.v141.ATL.ARM.Spectre | 16.5.29721.120 | +| Microsoft.VisualStudio.Component.VC.v141.ATL.ARM64 | 16.0.28625.61 | | Microsoft.VisualStudio.Component.VC.v141.ATL.ARM64.Spectre | 16.0.28625.61 | | Microsoft.VisualStudio.Component.VC.v141.ATL.Spectre | 16.0.28625.61 | | Microsoft.VisualStudio.Component.VC.v141.MFC | 16.0.28625.61 | @@ -483,12 +487,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 Debug Runtime | x64 | 14.29.30135 | -| Microsoft Visual C++ 2019 Debug Runtime | x86 | 14.29.30135 | -| Microsoft Visual C++ 2022 Additional Runtime | x64 | 14.30.30704 | -| Microsoft Visual C++ 2022 Minimum Runtime | x64 | 14.30.30704 | -| Microsoft Visual C++ 2022 Additional Runtime | x86 | 14.30.30704 | -| Microsoft Visual C++ 2022 Minimum Runtime | x86 | 14.30.30704 | +| Microsoft Visual C++ 2019 Debug Runtime | x64 | 14.29.30139 | +| Microsoft Visual C++ 2019 Debug Runtime | x86 | 14.29.30139 | +| Microsoft Visual C++ 2022 Additional Runtime | x64 | 14.30.30708 | +| Microsoft Visual C++ 2022 Minimum Runtime | x64 | 14.30.30708 | +| Microsoft Visual C++ 2022 Additional Runtime | x86 | 14.30.30708 | +| Microsoft Visual C++ 2022 Minimum Runtime | x86 | 14.30.30708 | ### .NET Core SDK `Location C:\Program Files\dotnet\sdk` @@ -516,11 +520,11 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - PowerShell 7.2.1 #### Azure Powershell Modules -| Module | Version | Path | -| ------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------ | -| Az | 1.0.0.zip<br>1.6.0.zip<br>2.3.2.zip<br>2.6.0.zip<br>3.1.0.zip<br>3.5.0.zip<br>3.8.0.zip<br>4.3.0.zip<br>4.4.0.zip<br>4.7.0.zip<br>5.5.0.zip<br>5.9.0.zip<br>6.5.0 | C:\Modules\az_\<version\> | -| Azure | 2.1.0 [Installed]<br>3.8.0.zip<br>4.2.1.zip<br>5.1.1.zip<br>5.3.0 | C:\Modules\azure_\<version\> | -| AzureRM | 2.1.0 [Installed]<br>3.8.0.zip<br>4.2.1.zip<br>5.1.1.zip<br>6.7.0.zip<br>6.13.1 | C:\Modules\azurerm_\<version\> | +| Module | Version | Path | +| ------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ------------------------------ | +| Az | 1.0.0.zip<br>1.6.0.zip<br>2.3.2.zip<br>2.6.0.zip<br>3.1.0.zip<br>3.5.0.zip<br>3.8.0.zip<br>4.3.0.zip<br>4.4.0.zip<br>4.7.0.zip<br>5.5.0.zip<br>5.9.0.zip<br>6.6.0.zip<br>7.1.0 | C:\Modules\az_\<version\> | +| Azure | 2.1.0 [Installed]<br>3.8.0.zip<br>4.2.1.zip<br>5.1.1.zip<br>5.3.0 | C:\Modules\azure_\<version\> | +| AzureRM | 2.1.0 [Installed]<br>3.8.0.zip<br>4.2.1.zip<br>5.1.1.zip<br>6.7.0.zip<br>6.13.1 | C:\Modules\azurerm_\<version\> | ``` Azure PowerShell module 2.1.0 and AzureRM PowerShell module 2.1.0 are installed and are available via 'Get-Module -ListAvailable'. @@ -569,10 +573,10 @@ All other versions are saved but not installed. ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:0fbc7569a9acf9c18dbbfed30a223a6c9dc1d6aa3f7249ee830ce5de4d918e0a | 2021-12-14 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:a2b50c6addd83abb16c9ab8a8c31de983e1646f16306bb33dc8d6a8f5b779c4a | 2021-12-14 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:f983e03922d3686cd04467130cdeb731aaae23d6eaf237c0fa8da38e69931eab | 2021-12-14 | -| mcr.microsoft.com/windows/nanoserver:1809 | sha256:e2ab5e142f95316001aae073e28ace8a8315a79c33afd510ca2774d1b0764573 | 2021-12-07 | -| mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:50a88017fa694dd52cb1644a6d204f5305f78cce356f588dae0be983485065b2 | 2021-12-07 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:734b4d925e1dcd6c60d7a1bc61c67d6d1cb6160fd178954c6d71cd42b335e274 | 2022-01-12 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:197c6b07cf3093847fa6daeb389304c8ae5f9a90484f51fed83c13bb1ea73e19 | 2022-01-12 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:e02e0953f0476a685c0ab485f06a246c32329760f5cfb76d3fc7bdc47633f5d2 | 2022-01-12 | +| mcr.microsoft.com/windows/nanoserver:1809 | sha256:f19f6870d061a5e630263e5fb716dd1cab4921691ef2fbea05c102544e244979 | 2022-01-07 | +| mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:4735f8590820d8741a94524e8ad53921ed0fea0002cc5214f594861ad9ee1f3d | 2022-01-07 | From afc8bd66cc4050c3e0045b18811d572770b7ab4b Mon Sep 17 00:00:00 2001 From: Maksim Shilov <89912354+shilovmaksim@users.noreply.github.com> Date: Thu, 20 Jan 2022 15:59:37 +0300 Subject: [PATCH 0905/3485] [Windows] Add SQL OLEDB Driver to win19 and win22 (#4893) * Add SQL OLEDB Driver to win19 and win22 * Update installation, improve install-binary and resolve comments * Slight improvement of the installation. Fixing argument list for the WebPI * Fix argument list for AzureCLI * Fix software report --- images/win/scripts/ImageHelpers/InstallHelpers.ps1 | 5 ++++- images/win/scripts/Installers/Install-AzureCli.ps1 | 2 +- .../win/scripts/Installers/Install-SQLOLEDBDriver.ps1 | 8 ++++++++ .../Installers/Install-WebPlatformInstaller.ps1 | 2 +- .../SoftwareReport/SoftwareReport.Generator.ps1 | 10 ++++++++-- .../scripts/SoftwareReport/SoftwareReport.Tools.psm1 | 5 +++++ images/win/scripts/Tests/Tools.Tests.ps1 | 6 ++++++ images/win/windows2019.json | 1 + images/win/windows2022.json | 1 + 9 files changed, 35 insertions(+), 5 deletions(-) create mode 100644 images/win/scripts/Installers/Install-SQLOLEDBDriver.ps1 diff --git a/images/win/scripts/ImageHelpers/InstallHelpers.ps1 b/images/win/scripts/ImageHelpers/InstallHelpers.ps1 index 30084aa477fc..7c1f1ba89ee1 100644 --- a/images/win/scripts/ImageHelpers/InstallHelpers.ps1 +++ b/images/win/scripts/ImageHelpers/InstallHelpers.ps1 @@ -45,7 +45,10 @@ function Install-Binary $fileExtension = ([System.IO.Path]::GetExtension($Name)).Replace(".", "") if ($fileExtension -eq "msi") { - $ArgumentList = ('/i', $filePath, '/QN', '/norestart') + if (-not $ArgumentList) + { + $ArgumentList = ('/i', $filePath, '/QN', '/norestart') + } $filePath = "msiexec.exe" } diff --git a/images/win/scripts/Installers/Install-AzureCli.ps1 b/images/win/scripts/Installers/Install-AzureCli.ps1 index 1c8013340fe3..71bb8f2765d2 100644 --- a/images/win/scripts/Installers/Install-AzureCli.ps1 +++ b/images/win/scripts/Installers/Install-AzureCli.ps1 @@ -5,7 +5,7 @@ Write-Host "Install the latest Azure CLI release" $azCliUrl = "https://aka.ms/installazurecliwindows" -Install-Binary -Url $azCliUrl -Name "azure-cli.msi" -ArgumentList ("/qn", "/norestart") +Install-Binary -Url $azCliUrl -Name "azure-cli.msi" $azureCliExtensionPath = Join-Path $Env:CommonProgramFiles 'AzureCliExtensionDirectory' $null = New-Item -ItemType "Directory" -Path $azureCliExtensionPath diff --git a/images/win/scripts/Installers/Install-SQLOLEDBDriver.ps1 b/images/win/scripts/Installers/Install-SQLOLEDBDriver.ps1 new file mode 100644 index 000000000000..93df7f5264e9 --- /dev/null +++ b/images/win/scripts/Installers/Install-SQLOLEDBDriver.ps1 @@ -0,0 +1,8 @@ +################################################################################ +## File: Install-SQLOLEDBDriver.ps1 +## Desc: Install SQL OLEDB Driver +################################################################################ + +$binaryDownloadPath = Start-DownloadWithRetry "https://go.microsoft.com/fwlink/?linkid=2183083" "msoledbsql.msi" +$ArgumentList = ("/i", "$binaryDownloadPath", "ADDLOCAL=ALL", "IACCEPTMSOLEDBSQLLICENSETERMS=YES", "/qn") +Install-Binary -FilePath msiexec.exe -ArgumentList $ArgumentList \ No newline at end of file diff --git a/images/win/scripts/Installers/Install-WebPlatformInstaller.ps1 b/images/win/scripts/Installers/Install-WebPlatformInstaller.ps1 index 2263b3a9a140..90e102d00138 100644 --- a/images/win/scripts/Installers/Install-WebPlatformInstaller.ps1 +++ b/images/win/scripts/Installers/Install-WebPlatformInstaller.ps1 @@ -6,6 +6,6 @@ # Download and install WebPlatformInstaller $webPlatformInstallerFile = "WebPlatformInstaller_x64_en-US.msi" $webPlatformInstallerUrl = "http://go.microsoft.com/fwlink/?LinkId=287166" -Install-Binary -Url $webPlatformInstallerUrl -Name $webPlatformInstallerFile -ArgumentList ("/silent", "/install") +Install-Binary -Url $webPlatformInstallerUrl -Name $webPlatformInstallerFile Invoke-PesterTests -TestFile "Tools" -TestName "WebPlatformInstaller" \ No newline at end of file diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index 2f9d0f65e9e0..13ec855616bd 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -215,14 +215,20 @@ $markdown += New-MDHeader "Databases" -Level 3 $markdown += Build-DatabasesMarkdown $markdown += New-MDHeader "Database tools" -Level 3 -$markdown += New-MDList -Style Unordered -Lines (@( +$databaseTools = @( (Get-AzCosmosDBEmulatorVersion), (Get-DacFxVersion), (Get-MySQLVersion), (Get-SQLPSVersion) - ) | Sort-Object ) +if (-not (Test-IsWin16)) +{ + $databaseTools += Get-SQLOLEDBDriverVersion +} + +$markdown += New-MDList -Style Unordered -Lines ($databaseTools | Sort-Object) + $markdown += Build-WebServersSection $vs = Get-VisualStudioVersion diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 index f69aee1d17a4..a6b83f761ac3 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 @@ -111,6 +111,11 @@ function Get-MySQLVersion { return "MySQL $mysqlVersion" } +function Get-SQLOLEDBDriverVersion { + $SQLOLEDBDriverVersion = (Get-ItemProperty -Path 'Registry::HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MSOLEDBSQL' InstalledVersion).InstalledVersion + return "SQL OLEDB Driver $SQLOLEDBDriverVersion" +} + function Get-MercurialVersion { ($(hg --version) | Out-String) -match "version (?<version>\d+\.\d+\.?\d*)" | Out-Null $mercurialVersion = $Matches.Version diff --git a/images/win/scripts/Tests/Tools.Tests.ps1 b/images/win/scripts/Tests/Tools.Tests.ps1 index 1773a4fb33a0..ca3ebecbdbd9 100644 --- a/images/win/scripts/Tests/Tools.Tests.ps1 +++ b/images/win/scripts/Tests/Tools.Tests.ps1 @@ -201,3 +201,9 @@ Describe "Kotlin" { "$toolName -version" | Should -ReturnZeroExitCode } } + +Describe "SQL OLEDB Driver" { + It "SQL OLEDB Driver" { + "HKLM:\SOFTWARE\Microsoft\MSOLEDBSQL" | Should -Exist + } +} \ No newline at end of file diff --git a/images/win/windows2019.json b/images/win/windows2019.json index 2efe458dc7be..577bf1f30d05 100644 --- a/images/win/windows2019.json +++ b/images/win/windows2019.json @@ -229,6 +229,7 @@ "{{ template_dir }}/scripts/Installers/Install-DACFx.ps1", "{{ template_dir }}/scripts/Installers/Install-MysqlCli.ps1", "{{ template_dir }}/scripts/Installers/Install-SQLPowerShellTools.ps1", + "{{ template_dir }}/scripts/Installers/Install-SQLOLEDBDriver.ps1", "{{ template_dir }}/scripts/Installers/Install-DotnetSDK.ps1", "{{ template_dir }}/scripts/Installers/Install-Mingw64.ps1", "{{ template_dir }}/scripts/Installers/Install-Haskell.ps1", diff --git a/images/win/windows2022.json b/images/win/windows2022.json index d38ce154c552..9a21b4c21036 100644 --- a/images/win/windows2022.json +++ b/images/win/windows2022.json @@ -228,6 +228,7 @@ "{{ template_dir }}/scripts/Installers/Install-DACFx.ps1", "{{ template_dir }}/scripts/Installers/Install-MysqlCli.ps1", "{{ template_dir }}/scripts/Installers/Install-SQLPowerShellTools.ps1", + "{{ template_dir }}/scripts/Installers/Install-SQLOLEDBDriver.ps1", "{{ template_dir }}/scripts/Installers/Install-DotnetSDK.ps1", "{{ template_dir }}/scripts/Installers/Install-Mingw64.ps1", "{{ template_dir }}/scripts/Installers/Install-Haskell.ps1", From 825eebf51df2612dfe894f1fbdcb29b1a90d3fd8 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 20 Jan 2022 15:45:01 +0000 Subject: [PATCH 0906/3485] Updating readme file for ubuntu18 version 20220116.1 (#4888) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu1804-Readme.md | 64 ++++++++++++++++--------------- 1 file changed, 33 insertions(+), 31 deletions(-) diff --git a/images/linux/Ubuntu1804-Readme.md b/images/linux/Ubuntu1804-Readme.md index 58b1e49d6734..225e0e5e207d 100644 --- a/images/linux/Ubuntu1804-Readme.md +++ b/images/linux/Ubuntu1804-Readme.md @@ -1,19 +1,20 @@ | Announcements | |-| +| [[All OSs] .NET 2.1 will be removed from the images on February, 21](https://github.com/actions/virtual-environments/issues/4871) | | [[All OSs] Az PowerShell Module will be upgraded to 7.1.0 on January, 17](https://github.com/actions/virtual-environments/issues/4841) | | [[Ubuntu] Issue with libstdc++ cannot allocate memory in static TLS block](https://github.com/actions/virtual-environments/issues/4799) | | [[All OSs] Python version 3.5 will be removed from the images on January 24, 2022](https://github.com/actions/virtual-environments/issues/4744) | *** # Ubuntu 18.04.6 LTS - Linux kernel version: 5.4.0-1065-azure -- Image Version: 20220111.1 +- Image Version: 20220116.1 ## Installed Software ### Language and Runtime - Bash 4.4.20(1)-release - Clang 9.0.0 - Clang-format 9.0.0 -- Erlang 24.1.7 (Eshell 12.1.5) +- Erlang 24.2 (Eshell 12.2) - Erlang rebar3 3.18.0 - GNU C++ 7.5.0, 9.4.0, 10.3.0 - GNU Fortran 7.5.0, 9.4.0, 10.3.0 @@ -38,7 +39,7 @@ - Pip3 9.0.1 - Pipx 1.0.0 - RubyGems 2.7.6 -- Vcpkg (build from master \<b8b1217bd>) +- Vcpkg (build from master \<bba8794b8>) - Yarn 1.22.17 #### Environment variables @@ -55,7 +56,7 @@ ### Tools - Ansible 2.11.7 -- apt-fast 1.9.11 +- apt-fast 1.9.12 - AzCopy 10.13.0 (available by `azcopy` and `azcopy10` aliases) - Bazel 4.2.2 - Bazelisk 1.11.0 @@ -64,7 +65,7 @@ - CMake 3.22.1 - CodeQL Action Bundle 2.7.3 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.2.2+azure-1 +- Docker Compose v2 2.2.3+azure-1 - Docker-Buildx 0.7.1 - Docker-Moby Client 20.10.11+azure-3 - Docker-Moby Server 20.10.11+azure-3 @@ -73,7 +74,7 @@ - Git-ftp 1.3.1 - Haveged 1.9.1 - Heroku 7.59.2 -- HHVM (HipHop VM) 4.143.0 +- HHVM (HipHop VM) 4.144.0 - jq 1.5 - Kind 0.11.1 - Kubectl 1.23.1 @@ -87,10 +88,10 @@ - nvm 0.39.1 - OpenSSL 1.1.1 11 Sep 2018 - Packer 1.7.8 -- Parcel 2.1.1 +- Parcel 2.2.0 - PhantomJS 2.1.1 - Podman 3.0.1 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- Pulumi 3.21.1 +- Pulumi 3.22.0 - R 4.1.2 - Skopeo 1.2.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 @@ -101,8 +102,8 @@ - zstd 1.5.1 (homebrew) ### CLI Tools -- Alibaba Cloud CLI 3.0.102 -- AWS CLI 1.22.33 +- Alibaba Cloud CLI 3.0.104 +- AWS CLI 1.22.37 - AWS CLI Session manager plugin 1.2.295.0 - AWS SAM CLI 1.37.0 - Azure CLI (azure-cli) 2.32.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) @@ -110,17 +111,18 @@ - GitHub CLI 2.4.0 - Google Cloud SDK 368.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 8.6.21 +- Netlify CLI 8.8.2 - OpenShift CLI 4.9.13 - ORAS CLI 0.12.0 - Vercel CLI 23.1.2 ### Java -| Version | Vendor | Environment Variable | -| ------------------- | ------------- | -------------------- | -| 8.0.292+1 (default) | Adopt OpenJDK | JAVA_HOME_8_X64 | -| 11.0.11+9 | Adopt OpenJDK | JAVA_HOME_11_X64 | -| 12.0.2+10 | Adopt OpenJDK | JAVA_HOME_12_X64 | +| Version | Vendor | Environment Variable | +| ------------------- | --------------- | -------------------- | +| 8.0.312+7 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | +| 11.0.13+8 | Eclipse Temurin | JAVA_HOME_11_X64 | +| 12.0.2+10 | Adopt OpenJDK | JAVA_HOME_12_X64 | +| 17.0.1+12 | Eclipse Temurin | JAVA_HOME_17_X64 | ### PHP | Tool | Version | @@ -138,23 +140,23 @@ - Stack 2.7.3 ### Rust Tools -- Cargo 1.57.0 -- Rust 1.57.0 -- Rustdoc 1.57.0 +- Cargo 1.58.0 +- Rust 1.58.0 +- Rustdoc 1.58.0 - Rustup 1.24.3 #### Packages - Bindgen 0.59.2 - Cargo audit 0.16.0 -- Cargo clippy 0.1.57 +- Cargo clippy 0.1.58 - Cargo outdated 0.10.2 - Cbindgen 0.20.0 -- Rustfmt 1.4.37 +- Rustfmt 1.4.38 ### Browsers and Drivers - Google Chrome 97.0.4692.71 - ChromeDriver 97.0.4692.71 -- Mozilla Firefox 95.0.1 +- Mozilla Firefox 96.0 - Geckodriver 0.30.0 - Chromium 97.0.4692.0 - Selenium server 4.1.0 @@ -206,8 +208,8 @@ - 3.6.15 - 3.7.12 - 3.8.12 -- 3.9.9 -- 3.10.1 +- 3.9.10 +- 3.10.2 #### Ruby - 2.4.10 @@ -233,7 +235,7 @@ | Pester | 5.3.1 | #### Az PowerShell Modules -- 6.4.0 3.1.0.zip 4.4.0.zip 5.9.0.zip +- 7.1.0 3.1.0.zip 4.4.0.zip 5.9.0.zip 6.6.0.zip ### Web Servers | Name | Version | ConfigFile | ServiceStatus | ListenPort | @@ -280,12 +282,12 @@ | debian:11 | sha256:2906804d2a64e8a13a434a1a127fe3f6a28bf7cf3696be4223b06276f32f1f2d | 2021-12-21 | | debian:9 | sha256:54284a7a45383b407c1968657e8f1c50dc25b82d8d56b3812e46ad19f8bcfd83 | 2021-12-21 | | moby/buildkit:latest | sha256:d6c89b7085b106301645ddcc77cf64eb7b705ab507b72d52d130ac33f1300417 | 2021-11-18 | -| node:12 | sha256:36b3ee4724ab60ac5f288d22999074437ed517e8d1bd2e24ab19609479d39c81 | 2021-12-21 | -| node:12-alpine | sha256:05d61228b85c54b5527e74afc54153eb3572aae005948fb068a0f4ebe01f7c1e | 2022-01-03 | -| node:14 | sha256:e5c6aac226819f88d6431a56f502972d323d052b1b6108094ba7e6b07154a542 | 2021-12-21 | -| node:14-alpine | sha256:1e7481a9a977d8e4160a73ed6a0e726724570bf7d941adbec63a82cf7c07ae19 | 2022-01-03 | -| node:16 | sha256:32605ead97ed57bd39a8a7b0e919240e1a3218974dfc6965e61b54a801753131 | 2021-12-21 | -| node:16-alpine | sha256:0e071f3c5c84cffa6b1035023e1956cf28d48f4b36e229cef328772da81ec0c5 | 2022-01-03 | +| node:12 | sha256:04334b2efca8f5f23d246ce8818fe358c2c0116819e5fd043e7929cae6ca7398 | 2022-01-11 | +| node:12-alpine | sha256:c3e7817c8fd124f1597cd66124d247db8e138e8ef311ba085b7104d900129d0b | 2022-01-12 | +| node:14 | sha256:50d4540794db9bdbd423a5823c4d840fc2ba0b9c82d71b059ff34b4aeb3e328f | 2022-01-11 | +| node:14-alpine | sha256:a9b200d25469261a4cccde176db08ec9f0b5799fa4220d8edfe57e69684c6dad | 2022-01-11 | +| node:16 | sha256:4b0b5c3db44f567d5d25c80a6fe33a981d911cdae20b39d2395be268aea2cb97 | 2022-01-11 | +| node:16-alpine | sha256:2f50f4a428f8b5280817c9d4d896dbee03f072e93f4e0c70b90cc84bd1fcfe0d | 2022-01-12 | | ubuntu:16.04 | sha256:0f71fa8d4d2d4292c3c617fda2b36f6dabe5c8b6e34c3dc5b0d17d4e704bd39c | 2021-08-31 | | ubuntu:18.04 | sha256:37b7471c1945a2a12e5a57488ee4e3e216a8369d0b9ee1ec2e41db9c2c1e3d22 | 2022-01-07 | | ubuntu:20.04 | sha256:b5a61709a9a44284d88fb12e5c48db0409cfad5b69d4ff8224077c57302df9cf | 2022-01-07 | From 3a86950eb0da2bb5361b75e9fb766db39d676832 Mon Sep 17 00:00:00 2001 From: V-Zabayrachny <79155496+V-Zabayrachny@users.noreply.github.com> Date: Thu, 20 Jan 2022 19:39:19 +0300 Subject: [PATCH 0907/3485] [MacOS] Remove python 3.5 on MacOS 10.15 (#4919) --- images/macos/toolsets/toolset-10.15.json | 1 - 1 file changed, 1 deletion(-) diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index 994e7bd47379..88433678dea1 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -251,7 +251,6 @@ "platform" : "darwin", "versions": [ "2.7.*", - "3.5.*", "3.6.*", "3.7.*", "3.8.*", From 39fd1a04b6e4ddec7ef40ef44fd76e9b5bd45b54 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 20 Jan 2022 17:18:10 +0000 Subject: [PATCH 0908/3485] Updating readme file for macOS-11 version 20220118.8 (#4907) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-11-Readme.md | 55 +++++++++++++++++---------------- 1 file changed, 28 insertions(+), 27 deletions(-) diff --git a/images/macos/macos-11-Readme.md b/images/macos/macos-11-Readme.md index 4f137fe7be17..8d868a88b078 100644 --- a/images/macos/macos-11-Readme.md +++ b/images/macos/macos-11-Readme.md @@ -1,5 +1,6 @@ | Announcements | |-| +| [[All OSs] .NET 2.1 will be removed from the images on February, 21](https://github.com/actions/virtual-environments/issues/4871) | | [[All OSs] Az PowerShell Module will be upgraded to 7.1.0 on January, 17](https://github.com/actions/virtual-environments/issues/4841) | | [[macOS] Default Xcode on Big Sur image will be set to Xcode 13.2.1 on January, 24](https://github.com/actions/virtual-environments/issues/4800) | | [[All OSs] Python version 3.5 will be removed from the images on January 24, 2022](https://github.com/actions/virtual-environments/issues/4744) | @@ -8,7 +9,7 @@ # macOS 11.6 info - System Version: macOS 11.6.2 (20G314) - Kernel Version: Darwin 20.6.0 -- Image Version: 20220110.2 +- Image Version: 20220118.8 ## Installed Software ### Language and Runtime @@ -26,21 +27,21 @@ - julia 1.7.1 - Kotlin 1.6.10-release-923 - MSBuild 16.10.1.58001 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) -- Node.js v16.13.1 +- Node.js v16.13.2 - NVM 0.39.1 - NVM - Cached node versions: v12.22.9 v14.18.3 v16.13.2 - Perl 5.34.0 - PHP 8.1.1 - Python 2.7.18 -- Python 3.9.9 +- Python 3.9.10 - Ruby 2.7.5p203 ### Package Management -- Bundler version 2.3.4 +- Bundler version 2.3.5 - Carthage 0.38.0 - CocoaPods 1.11.2 - Composer 2.2.4 -- Homebrew 3.3.9 +- Homebrew 3.3.11 - Miniconda 4.10.3 - NPM 8.1.2 - NuGet 5.9.0.7134 @@ -48,7 +49,7 @@ - Pip 21.3.1 (python 3.9) - Pipx 1.0.0 - RubyGems 3.2.33 -- Vcpkg 2021 (build from master \<9f04533f3>) +- Vcpkg 2021 (build from master \<4184491f0>) - Yarn 1.22.17 #### Environment variables @@ -80,8 +81,8 @@ - helm v3.7.2+g663a896 - Hub CLI: 2.14.2 - jq 1.6 -- mongo v5.0.4 -- mongod v5.0.4 +- mongo v5.0.5 +- mongod v5.0.5 - Newman 5.3.1 - OpenSSL 1.1.1m 14 Dec 2021 `(/usr/local/opt/openssl@1.1 -> ../Cellar/openssl@1.1/1.1.1m)` - Packer 1.7.8 @@ -93,21 +94,21 @@ - zstd 1.5.1 ### Tools -- Aliyun CLI 3.0.102 +- Aliyun CLI 3.0.104 - App Center CLI 2.10.8 -- AWS CLI 2.4.9 +- AWS CLI 2.4.11 - AWS SAM CLI 1.37.0 -- AWS Session Manager CLI 1.2.279.0 +- AWS Session Manager CLI 1.2.295.0 - Azure CLI 2.32.0 - Bicep CLI 0.4.1124 - Cabal 3.6.2.0 - Cmake 3.22.1 -- Fastlane 2.199.0 +- Fastlane 2.200.0 - GHC 9.2.1 - GHCup 0.1.17.4 - Jazzy 0.14.1 - Stack 2.7.3 -- SwiftFormat 0.49.1 +- SwiftFormat 0.49.2 - Swig 4.0.2 - Xcode Command Line Tools 13.2.0.0.1.1638488800 @@ -120,9 +121,9 @@ - SafariDriver 15.2 (16612.3.6.1.8) - Google Chrome 97.0.4692.71 - ChromeDriver 97.0.4692.71 -- Microsoft Edge 97.0.1072.55 -- MSEdgeDriver 97.0.1072.55 -- Mozilla Firefox 95.0.2 +- Microsoft Edge 97.0.1072.62 +- MSEdgeDriver 97.0.1072.62 +- Mozilla Firefox 96.0.1 - geckodriver 0.30.0 - Selenium server 4.1.1 @@ -151,8 +152,8 @@ #### Python - 3.7.12 - 3.8.12 -- 3.9.9 -- 3.10.1 +- 3.9.10 +- 3.10.2 #### PyPy - 2.7.18 [PyPy 7.3.6] @@ -160,9 +161,9 @@ - 3.8.12 [PyPy 7.3.7] #### Node.js -- 12.22.8 -- 14.18.2 -- 16.13.1 +- 12.22.9 +- 14.18.3 +- 16.13.2 #### Go | Version | Architecture | Environment Variable | @@ -172,9 +173,9 @@ | 1.17.6 | x64 | GOROOT_1_17_X64 | ### Rust Tools -- Cargo 1.57.0 -- Rust 1.57.0 -- Rustdoc 1.57.0 +- Cargo 1.58.0 +- Rust 1.58.0 +- Rustdoc 1.58.0 - Rustup 1.24.3 #### Packages @@ -182,8 +183,8 @@ - Cargo-audit 0.16.0 - Cargo-outdated v0.10.2 - Cbindgen 0.20.0 -- Clippy 0.1.57 -- Rustfmt 1.4.37-stable +- Clippy 0.1.58 +- Rustfmt 1.4.38-stable ### PowerShell Tools - PowerShell 7.2.1 @@ -191,7 +192,7 @@ #### PowerShell Modules | Module | Version | | ---------------- | ------- | -| Az | 6.1.0 | +| Az | 7.1.0 | | MarkdownPS | 1.9 | | Pester | 5.3.1 | | PSScriptAnalyzer | 1.20.0 | From 9c73205ecc26fe61fc3ca674204262878fe0f062 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 20 Jan 2022 17:19:19 +0000 Subject: [PATCH 0909/3485] Updating readme file for win16 version 20220116.1 (#4890) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2016-Readme.md | 73 ++++++++++++++++---------------- 1 file changed, 37 insertions(+), 36 deletions(-) diff --git a/images/win/Windows2016-Readme.md b/images/win/Windows2016-Readme.md index f273654dc870..e3e9dc36bd8f 100644 --- a/images/win/Windows2016-Readme.md +++ b/images/win/Windows2016-Readme.md @@ -1,13 +1,14 @@ | Announcements | |-| +| [[All OSs] .NET 2.1 will be removed from the images on February, 21](https://github.com/actions/virtual-environments/issues/4871) | | [windows-latest workflows will use Windows Server 2022](https://github.com/actions/virtual-environments/issues/4856) | | [[All OSs] Az PowerShell Module will be upgraded to 7.1.0 on January, 17](https://github.com/actions/virtual-environments/issues/4841) | | [[All OSs] Python version 3.5 will be removed from the images on January 24, 2022](https://github.com/actions/virtual-environments/issues/4744) | | [Windows-2016 environment will be removed on March 15, 2022](https://github.com/actions/virtual-environments/issues/4312) | *** # Microsoft Windows Server 2016 Datacenter -- OS Version: 10.0.14393 Build 4825 -- Image Version: 20220110.1 +- OS Version: 10.0.14393 Build 4886 +- Image Version: 20220116.1 ## Installed Software ### Language and Runtime @@ -16,7 +17,7 @@ - Julia 1.7.1 - Kotlin 1.6.10 - LLVM 13.0.0 -- Node 16.13.1 +- Node 16.13.2 - Perl 5.32.1 - PHP 8.1.1 - Python 3.7.9 @@ -25,14 +26,14 @@ ### Package Management - Chocolatey 0.11.3 - Composer 2.2.4 -- Helm 3.7.1 +- Helm 3.7.2 - Miniconda 4.10.3 (pre-installed on the image but not added to PATH) - NPM 8.1.2 - NuGet 6.0.0.280 - pip 21.3.1 (python 3.7) - Pipx 1.0.0 - RubyGems 2.7.6.3 -- Vcpkg (build from master \<5edd518dc>) +- Vcpkg (build from master \<bba8794b8>) - Yarn 1.22.17 #### Environment variables @@ -63,7 +64,7 @@ - ghc 9.2.1 - Git 2.34.1 - Git LFS 3.0.2 -- Google Cloud SDK 367.0.0 +- Google Cloud SDK 368.0.0 - InnoSetup 6.2.0 - jq 1.6 - Kind 0.11.1 @@ -74,8 +75,8 @@ - NSIS v3.08 - OpenSSL 1.1.1 - Packer 1.7.8 -- Parcel 2.1.1 -- Pulumi v3.21.1 +- Parcel 2.2.0 +- Pulumi v3.22.1 - R 4.1.2 - Service Fabric SDK 8.2.1363.9590 - Stack 2.7.3 @@ -88,10 +89,10 @@ - zstd 1.5.1 ### CLI Tools -- Alibaba Cloud CLI 3.0.102 -- AWS CLI 2.4.9 +- Alibaba Cloud CLI 3.0.104 +- AWS CLI 2.4.11 - AWS SAM CLI 1.37.0 -- AWS Session Manager CLI 1.2.279.0 +- AWS Session Manager CLI 1.2.295.0 - Azure CLI 2.32.0 - Azure DevOps CLI extension 0.22.0 - Cloud Foundry CLI 6.53.0 @@ -99,9 +100,9 @@ - Hub CLI 2.14.2 ### Rust Tools -- Cargo 1.57.0 -- Rust 1.57.0 -- Rustdoc 1.57.0 +- Cargo 1.58.0 +- Rust 1.58.0 +- Rustdoc 1.58.0 - Rustup 1.24.3 #### Packages @@ -109,15 +110,15 @@ - cargo-audit 0.16.0 - cargo-outdated v0.10.2 - cbindgen 0.20.0 -- Clippy 0.1.57 -- Rustfmt 1.4.37 +- Clippy 0.1.58 +- Rustfmt 1.4.38 ### Browsers and webdrivers - Google Chrome 97.0.4692.71 - Chrome Driver 97.0.4692.71 -- Microsoft Edge 97.0.1072.55 -- Microsoft Edge Driver 97.0.1072.55 -- Mozilla Firefox 95.0.2 +- Microsoft Edge 97.0.1072.62 +- Microsoft Edge Driver 97.0.1072.62 +- Mozilla Firefox 96.0.1 - Gecko Driver 0.30.0 - IE Driver 3.150.1.1 - Selenium server 4.1.0 @@ -165,9 +166,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Node | Version | Architecture | | ------- | ------------ | -| 12.22.8 | x64 | -| 14.18.2 | x64 | -| 16.13.1 | x64 | +| 12.22.9 | x64 | +| 14.18.3 | x64 | +| 16.13.2 | x64 | #### Python | Version | Architecture | @@ -230,7 +231,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Visual Studio Enterprise 2017 | Name | Version | Path | | ----------------------------- | --------------- | -------------------------------------------------------------- | -| Visual Studio Enterprise 2017 | 15.9.28307.1759 | C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise | +| Visual Studio Enterprise 2017 | 15.9.28307.1778 | C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise | #### Workloads, components and extensions: | Package | Version | @@ -489,10 +490,10 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft Visual C++ 2013 Minimum Runtime | x86 | 12.0.21005 | | Microsoft Visual C++ 2017 Debug Runtime | x64 | 14.16.27033 | | Microsoft Visual C++ 2017 Debug Runtime | x86 | 14.16.27033 | -| Microsoft Visual C++ 2022 Additional Runtime | x64 | 14.30.30704 | -| Microsoft Visual C++ 2022 Minimum Runtime | x64 | 14.30.30704 | -| Microsoft Visual C++ 2022 Additional Runtime | x86 | 14.30.30704 | -| Microsoft Visual C++ 2022 Minimum Runtime | x86 | 14.30.30704 | +| Microsoft Visual C++ 2022 Additional Runtime | x64 | 14.30.30708 | +| Microsoft Visual C++ 2022 Minimum Runtime | x64 | 14.30.30708 | +| Microsoft Visual C++ 2022 Additional Runtime | x86 | 14.30.30708 | +| Microsoft Visual C++ 2022 Minimum Runtime | x86 | 14.30.30708 | ### .NET Core SDK `Location C:\Program Files\dotnet\sdk` @@ -520,11 +521,11 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - PowerShell 7.2.1 #### Azure Powershell Modules -| Module | Version | Path | -| ------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------ | -| Az | 1.0.0.zip<br>1.6.0.zip<br>2.3.2.zip<br>2.6.0.zip<br>3.1.0.zip<br>3.5.0.zip<br>3.8.0.zip<br>4.3.0.zip<br>4.4.0.zip<br>4.7.0.zip<br>5.5.0.zip<br>5.9.0.zip<br>6.5.0 | C:\Modules\az_\<version\> | -| Azure | 2.1.0 [Installed]<br>3.8.0.zip<br>4.2.1.zip<br>5.1.1.zip<br>5.3.0 | C:\Modules\azure_\<version\> | -| AzureRM | 2.1.0 [Installed]<br>3.8.0.zip<br>4.2.1.zip<br>5.1.1.zip<br>6.7.0.zip<br>6.13.1 | C:\Modules\azurerm_\<version\> | +| Module | Version | Path | +| ------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ------------------------------ | +| Az | 1.0.0.zip<br>1.6.0.zip<br>2.3.2.zip<br>2.6.0.zip<br>3.1.0.zip<br>3.5.0.zip<br>3.8.0.zip<br>4.3.0.zip<br>4.4.0.zip<br>4.7.0.zip<br>5.5.0.zip<br>5.9.0.zip<br>6.6.0.zip<br>7.1.0 | C:\Modules\az_\<version\> | +| Azure | 2.1.0 [Installed]<br>3.8.0.zip<br>4.2.1.zip<br>5.1.1.zip<br>5.3.0 | C:\Modules\azure_\<version\> | +| AzureRM | 2.1.0 [Installed]<br>3.8.0.zip<br>4.2.1.zip<br>5.1.1.zip<br>6.7.0.zip<br>6.13.1 | C:\Modules\azurerm_\<version\> | ``` Azure PowerShell module 2.1.0 and AzureRM PowerShell module 2.1.0 are installed and are available via 'Get-Module -ListAvailable'. @@ -573,10 +574,10 @@ All other versions are saved but not installed. ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2016 | sha256:4176e79680e8f3e20bf4b15edb5fb38643045ed58a943fa92be08fd961895e81 | 2021-12-14 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2016 | sha256:02e765bcfd4119f165d465519f17ac2b7ac034bdbb724a9bbb873fcdd3dcdd2c | 2021-12-14 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2016 | sha256:db6a24255fb8212eac322d43f3b1a38380a25015bfbacfe4cad1e80f5b78dbc7 | 2021-12-14 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2016 | sha256:2cfe85aef99ac48a49490b1fa19108247ee70b3d2351a10b870bbc27563858d1 | 2022-01-12 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2016 | sha256:cf7e5a3d03b001856ed0e1527ae05b06d48a9430b655dfc2f7448ec2e8365bae | 2022-01-12 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2016 | sha256:3158b7cb02ff259ffceb26d1ec89328067aecf552b71fae056e611042b62375d | 2022-01-12 | | mcr.microsoft.com/windows/nanoserver:10.0.14393.953 | sha256:fc60bd5ae0e61b334ce1cf1bcbf20c10c36b4c5482a01da319c9c989f9e6e268 | 2017-03-08 | -| mcr.microsoft.com/windows/servercore:ltsc2016 | sha256:1f6d7cef5d9d46603bb02d8e8c5df131ed3da729f2d6d2055cdb6594fc1c1c1a | 2021-12-08 | +| mcr.microsoft.com/windows/servercore:ltsc2016 | sha256:2c653377ee72b9a0b4c115d2875333f1b27fed507a12443c02c2a036e6da00b0 | 2022-01-06 | From 023104e40772fdf74eb69d6a6c6d5e30a13dad48 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Thu, 20 Jan 2022 22:23:57 +0300 Subject: [PATCH 0910/3485] Wait for Windows Updates (#4924) --- images/win/windows2016.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/images/win/windows2016.json b/images/win/windows2016.json index e2aaa2d66a37..eeb8973a2401 100644 --- a/images/win/windows2016.json +++ b/images/win/windows2016.json @@ -258,11 +258,15 @@ }, { "type": "windows-restart", + "check_registry": true, + "restart_check_command": "powershell -command \"& {if ((-not (Get-Process TiWorker.exe -ErrorAction SilentlyContinue)) -and (-not [System.Environment]::HasShutdownStarted) ) { Write-Output 'Restart complete' }}\"", "restart_timeout": "30m" }, { "type": "powershell", + "pause_before": "2m", "scripts": [ + "{{ template_dir }}/scripts/Installers/Wait-WindowsUpdatesForInstall.ps1", "{{ template_dir }}/scripts/Tests/RunAll-Tests.ps1" ] }, From 42597cc6c5740b4755203dae4d4649393c8cb91e Mon Sep 17 00:00:00 2001 From: V-Zabayrachny <79155496+V-Zabayrachny@users.noreply.github.com> Date: Thu, 20 Jan 2022 22:51:43 +0300 Subject: [PATCH 0911/3485] [Windows] Remove python 3.5 on Windows 16, 19 (#4921) --- images/win/toolsets/toolset-2016.json | 2 -- images/win/toolsets/toolset-2019.json | 2 -- 2 files changed, 4 deletions(-) diff --git a/images/win/toolsets/toolset-2016.json b/images/win/toolsets/toolset-2016.json index 0a35fcfc193b..e937129c365e 100644 --- a/images/win/toolsets/toolset-2016.json +++ b/images/win/toolsets/toolset-2016.json @@ -20,7 +20,6 @@ "platform" : "win32", "versions": [ "2.7.*", - "3.5.*", "3.6.*", "3.7.*", "3.8.*", @@ -36,7 +35,6 @@ "platform" : "win32", "versions": [ "2.7.*", - "3.5.*", "3.6.*", "3.7.*", "3.8.*", diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index fd0681769a2a..86fad6a8e129 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -20,7 +20,6 @@ "platform" : "win32", "versions": [ "2.7.*", - "3.5.*", "3.6.*", "3.7.*", "3.8.*", @@ -36,7 +35,6 @@ "platform" : "win32", "versions": [ "2.7.*", - "3.5.*", "3.6.*", "3.7.*", "3.8.*", From 480bba15df129ba69acff6d980f006df8346b1b4 Mon Sep 17 00:00:00 2001 From: V-Zabayrachny <79155496+V-Zabayrachny@users.noreply.github.com> Date: Thu, 20 Jan 2022 22:52:00 +0300 Subject: [PATCH 0912/3485] [Ubuntu] Remove python 3.5 (#4922) --- images/linux/toolsets/toolset-1804.json | 1 - images/linux/toolsets/toolset-2004.json | 1 - 2 files changed, 2 deletions(-) diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index c91e95ae3f59..8f7185b466e9 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -8,7 +8,6 @@ "arch": "x64", "versions": [ "2.7.*", - "3.5.*", "3.6.*", "3.7.*", "3.8.*", diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index 5bc5bfbbedb3..2f0cd4a1e4f7 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -8,7 +8,6 @@ "arch": "x64", "versions": [ "2.7.*", - "3.5.*", "3.6.*", "3.7.*", "3.8.*", From 05fc7efd600bc4b6832e123637e87187ef01f4e0 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Fri, 21 Jan 2022 10:01:24 +0300 Subject: [PATCH 0913/3485] [Windows] Skip windows-2016 in the test (#4925) --- images/win/scripts/Tests/Tools.Tests.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/win/scripts/Tests/Tools.Tests.ps1 b/images/win/scripts/Tests/Tools.Tests.ps1 index ca3ebecbdbd9..712dda60147d 100644 --- a/images/win/scripts/Tests/Tools.Tests.ps1 +++ b/images/win/scripts/Tests/Tools.Tests.ps1 @@ -202,7 +202,7 @@ Describe "Kotlin" { } } -Describe "SQL OLEDB Driver" { +Describe "SQL OLEDB Driver" -Skip:(Test-IsWin16) { It "SQL OLEDB Driver" { "HKLM:\SOFTWARE\Microsoft\MSOLEDBSQL" | Should -Exist } From e2ebfcd1e966e4c6368abc73df87638facdf1671 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 21 Jan 2022 11:56:20 +0000 Subject: [PATCH 0914/3485] Updating readme file for win22 version 20220116.1 (#4891) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2022-Readme.md | 121 +++++++++++++++++-------------- 1 file changed, 65 insertions(+), 56 deletions(-) diff --git a/images/win/Windows2022-Readme.md b/images/win/Windows2022-Readme.md index a970b4495dc8..42ac6bd0f0d4 100644 --- a/images/win/Windows2022-Readme.md +++ b/images/win/Windows2022-Readme.md @@ -1,11 +1,14 @@ | Announcements | |-| +| [[All OSs] .NET 2.1 will be removed from the images on February, 21](https://github.com/actions/virtual-environments/issues/4871) | +| [windows-latest workflows will use Windows Server 2022](https://github.com/actions/virtual-environments/issues/4856) | +| [[All OSs] Az PowerShell Module will be upgraded to 7.1.0 on January, 17](https://github.com/actions/virtual-environments/issues/4841) | | [[All OSs] Python version 3.5 will be removed from the images on January 24, 2022](https://github.com/actions/virtual-environments/issues/4744) | | [Windows-2016 environment will be removed on March 15, 2022](https://github.com/actions/virtual-environments/issues/4312) | *** # Microsoft Windows Server 2022 Datacenter -- OS Version: 10.0.20348 Build 405 -- Image Version: 20211219.1 +- OS Version: 10.0.20348 Build 469 +- Image Version: 20220116.1 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -13,26 +16,27 @@ ## Installed Software ### Language and Runtime - Bash 4.4.23(1)-release -- Go 1.16.12 -- Julia 1.7.0 +- Go 1.16.13 +- Julia 1.7.1 - Kotlin 1.6.10 - LLVM 13.0.0 -- Node 16.13.1 +- Node 16.13.2 +- Perl 5.32.1 - PHP 8.1.1 - Python 3.9.9 - Ruby 3.0.3p157 ### Package Management - Chocolatey 0.11.3 -- Composer 2.1.14 -- Helm 3.7.1 +- Composer 2.2.4 +- Helm 3.7.2 - Miniconda 4.10.3 (pre-installed on the image but not added to PATH) - NPM 8.1.2 - NuGet 6.0.0.280 - pip 21.3.1 (python 3.9) -- Pipx 0.16.4 +- Pipx 1.0.0 - RubyGems 3.2.32 -- Vcpkg (build from master \<50fd3d995>) +- Vcpkg (build from master \<bba8794b8>) - Yarn 1.22.17 #### Environment variables @@ -44,10 +48,10 @@ - Ant 1.10.12 - Gradle 7.3 - Maven 3.8.4 -- sbt 1.5.7 +- sbt 1.6.1 ### Tools -- 7zip 21.06 +- 7zip 21.07 - aria2 1.36.0 - azcopy 10.13.0 - Bazel 4.2.2 @@ -67,12 +71,13 @@ - Kubectl 1.23.1 - Mercurial 5.0 - Mingw-w64 8.1.0 -- Newman 5.3.0 +- Newman 5.3.1 - NSIS v3.08 - OpenSSL 1.1.1 - Packer 1.7.8 -- Pulumi v3.20.0 +- Pulumi v3.22.1 - R 4.1.2 +- Service Fabric SDK 8.2.1363.9590 - Stack 2.7.3 - Subversion (SVN) 1.14.1 - Swig 4.0.2 @@ -80,22 +85,22 @@ - WinAppDriver 1.2.2009.02003 - WiX Toolset v3.11.2.4516 - yamllint 1.26.3 -- zstd 1.5.0 +- zstd 1.5.1 ### CLI Tools -- Alibaba Cloud CLI 3.0.102 -- AWS CLI 2.4.6 -- AWS SAM CLI 1.36.0 -- AWS Session Manager CLI 1.2.279.0 -- Azure CLI 2.31.0 +- Alibaba Cloud CLI 3.0.104 +- AWS CLI 2.4.11 +- AWS SAM CLI 1.37.0 +- AWS Session Manager CLI 1.2.295.0 +- Azure CLI 2.32.0 - Azure DevOps CLI extension 0.22.0 -- GitHub CLI 2.3.0 +- GitHub CLI 2.4.0 - Hub CLI 2.14.2 ### Rust Tools -- Cargo 1.57.0 -- Rust 1.57.0 -- Rustdoc 1.57.0 +- Cargo 1.58.0 +- Rust 1.58.0 +- Rustdoc 1.58.0 - Rustup 1.24.3 #### Packages @@ -103,15 +108,15 @@ - cargo-audit 0.16.0 - cargo-outdated v0.10.2 - cbindgen 0.20.0 -- Clippy 0.1.57 -- Rustfmt 1.4.37 +- Clippy 0.1.58 +- Rustfmt 1.4.38 ### Browsers and webdrivers -- Google Chrome 96.0.4664.110 -- Chrome Driver 96.0.4664.45 -- Microsoft Edge 96.0.1054.62 -- Microsoft Edge Driver 96.0.1054.62 -- Mozilla Firefox 95.0.2 +- Google Chrome 97.0.4692.71 +- Chrome Driver 97.0.4692.71 +- Microsoft Edge 97.0.1072.62 +- Microsoft Edge Driver 97.0.1072.62 +- Mozilla Firefox 96.0.1 - Gecko Driver 0.30.0 - IE Driver 3.150.1.1 - Selenium server 4.1.0 @@ -153,15 +158,15 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Version | Architecture | Environment Variable | | ------- | ------------ | -------------------- | | 1.15.15 | x64 | GOROOT_1_15_X64 | -| 1.16.12 (Default) | x64 | GOROOT_1_16_X64 | -| 1.17.5 | x64 | GOROOT_1_17_X64 | +| 1.16.13 (Default) | x64 | GOROOT_1_16_X64 | +| 1.17.6 | x64 | GOROOT_1_17_X64 | #### Node | Version | Architecture | | ------- | ------------ | -| 12.22.8 | x64 | -| 14.18.2 | x64 | -| 16.13.1 | x64 | +| 12.22.9 | x64 | +| 14.18.3 | x64 | +| 16.13.2 | x64 | #### Python | Version | Architecture | @@ -211,13 +216,13 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Web Servers | Name | Version | ConfigFile | ServiceName | ServiceStatus | ListenPort | | ------ | ------- | ------------------------------------- | ----------- | ------------- | ---------- | -| Apache | 2.4.51 | C:\tools\Apache24\conf\httpd.conf | Apache | Stopped | 80 | -| Nginx | 1.21.4 | C:\tools\nginx-1.21.4\conf\nginx.conf | nginx | Stopped | 80 | +| Apache | 2.4.52 | C:\tools\Apache24\conf\httpd.conf | Apache | Stopped | 80 | +| Nginx | 1.21.5 | C:\tools\nginx-1.21.5\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2022 | Name | Version | Path | | ----------------------------- | -------------- | -------------------------------------------------------- | -| Visual Studio Enterprise 2022 | 17.0.32014.148 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | +| Visual Studio Enterprise 2022 | 17.0.32112.339 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | #### Workloads, components and extensions: | Package | Version | @@ -238,7 +243,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Component.UnityEngine.x64 | 17.0.31804.368 | | Component.Unreal | 17.0.31804.368 | | Component.Unreal.Android | 17.0.31804.368 | -| Component.VSInstallerProjects2022 | 0.1.0 | +| Component.VSInstallerProjects2022 | 2.0.0 | | Component.Xamarin | 17.0.31804.368 | | Component.Xamarin.RemotedSimulator | 17.0.31807.282 | | Microsoft.Component.Azure.DataLake.Tools | 17.0.31805.14 | @@ -255,6 +260,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.Net.Component.4.6.TargetingPack | 17.0.31804.368 | | Microsoft.Net.Component.4.7.1.TargetingPack | 17.0.31804.368 | | Microsoft.Net.Component.4.7.2.TargetingPack | 17.0.31804.368 | +| Microsoft.Net.Component.4.7.TargetingPack | 17.0.31804.368 | | Microsoft.Net.Component.4.8.SDK | 17.0.31804.368 | | Microsoft.Net.Component.4.8.TargetingPack | 17.0.31804.368 | | Microsoft.Net.ComponentGroup.4.8.DeveloperTools | 17.0.31804.368 | @@ -264,7 +270,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | microsoft.net.sdk.emscripten | 6.0.5.2003 | | Microsoft.NetCore.Component.DevelopmentTools | 17.0.31804.368 | | Microsoft.NetCore.Component.Runtime.6.0 | 17.0.32002.159 | -| Microsoft.NetCore.Component.SDK | 17.0.32002.159 | +| Microsoft.NetCore.Component.SDK | 17.0.32106.176 | | Microsoft.NetCore.Component.Web | 17.0.31804.368 | | Microsoft.VisualStudio.Component.AppInsights.Tools | 17.0.31804.368 | | Microsoft.VisualStudio.Component.AspNet | 17.0.31804.368 | @@ -347,6 +353,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Component.VC.MFC.ARM | 17.0.31804.368 | | Microsoft.VisualStudio.Component.VC.MFC.ARM64 | 17.0.31804.368 | | Microsoft.VisualStudio.Component.VC.MFC.ARM64EC | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.VC.Modules.x86.x64 | 17.0.31804.368 | | Microsoft.VisualStudio.Component.VC.Redist.14.Latest | 17.0.31804.368 | | Microsoft.VisualStudio.Component.VC.Runtimes.ARM64.Spectre | 17.0.31804.368 | | Microsoft.VisualStudio.Component.VC.Runtimes.x86.x64.Spectre | 17.0.31804.368 | @@ -407,19 +414,21 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Workload.Universal | 17.0.31804.368 | | Microsoft.VisualStudio.Workload.VisualStudioExtension | 17.0.31804.368 | | wasm.tools | 6.0.121.56705 | -| VisualStudioClient.MicrosoftVisualStudio2022InstallerProjects | 0.1.0 | +| VisualStudioClient.MicrosoftVisualStudio2022InstallerProjects | 2.0.0 | #### Microsoft Visual C++: | Name | Architecture | Version | | -------------------------------------------- | ------------ | ----------- | +| Microsoft Visual C++ 2012 Additional Runtime | x64 | 11.0.61030 | +| Microsoft Visual C++ 2012 Minimum Runtime | x64 | 11.0.61030 | | Microsoft Visual C++ 2013 Additional Runtime | x64 | 12.0.40660 | | Microsoft Visual C++ 2013 Minimum Runtime | x64 | 12.0.40660 | -| Microsoft Visual C++ 2022 Additional Runtime | x64 | 14.30.30704 | -| Microsoft Visual C++ 2022 Debug Runtime | x64 | 14.30.30704 | -| Microsoft Visual C++ 2022 Minimum Runtime | x64 | 14.30.30704 | -| Microsoft Visual C++ 2022 Additional Runtime | x86 | 14.30.30704 | -| Microsoft Visual C++ 2022 Debug Runtime | x86 | 14.30.30704 | -| Microsoft Visual C++ 2022 Minimum Runtime | x86 | 14.30.30704 | +| Microsoft Visual C++ 2022 Additional Runtime | x64 | 14.30.30708 | +| Microsoft Visual C++ 2022 Debug Runtime | x64 | 14.30.30708 | +| Microsoft Visual C++ 2022 Minimum Runtime | x64 | 14.30.30708 | +| Microsoft Visual C++ 2022 Additional Runtime | x86 | 14.30.30708 | +| Microsoft Visual C++ 2022 Debug Runtime | x86 | 14.30.30708 | +| Microsoft Visual C++ 2022 Minimum Runtime | x86 | 14.30.30708 | ### .NET Core SDK `Location C:\Program Files\dotnet\sdk` @@ -427,10 +436,10 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### .NET Core Runtime `Location: C:\Program Files\dotnet\shared\Microsoft.AspNetCore.App` -- 3.1.4 3.1.6 3.1.20 3.1.21 3.1.22 5.0.4 5.0.9 5.0.12 5.0.13 6.0.1 +- 3.1.4 3.1.6 3.1.20 3.1.22 5.0.4 5.0.9 5.0.13 6.0.1 `Location: C:\Program Files\dotnet\shared\Microsoft.NETCore.App` -- 3.1.4 3.1.6 3.1.20 3.1.21 3.1.22 5.0.4 5.0.9 5.0.12 5.0.13 6.0.1 +- 3.1.4 3.1.6 3.1.20 3.1.22 5.0.4 5.0.9 5.0.13 6.0.1 `Location: C:\Program Files\dotnet\shared\Microsoft.WindowsDesktop.App` - 3.1.4 3.1.6 3.1.20 3.1.22 5.0.4 5.0.9 5.0.13 6.0.1 @@ -446,7 +455,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Azure Powershell Modules | Module | Version | Path | | ------- | ------------------------------------------------------------------------------- | ------------------------------ | -| Az | 6.5.0 | C:\Modules\az_\<version\> | +| Az | 6.6.0.zip<br>7.1.0 | C:\Modules\az_\<version\> | | Azure | 2.1.0 [Installed]<br>3.8.0.zip<br>4.2.1.zip<br>5.1.1.zip<br>5.3.0 | C:\Modules\azure_\<version\> | | AzureRM | 2.1.0 [Installed]<br>3.8.0.zip<br>4.2.1.zip<br>5.1.1.zip<br>6.7.0.zip<br>6.13.1 | C:\Modules\azurerm_\<version\> | ``` @@ -460,7 +469,7 @@ All other versions are saved but not installed. | ------------------ | ---------------- | | DockerMsftProvider | 1.0.0.8 | | MarkdownPS | 1.9 | -| Microsoft.Graph | 1.9.0 | +| Microsoft.Graph | 1.9.1 | | Pester | 3.4.0<br>5.3.1 | | PowerShellGet | 1.0.0.1<br>2.2.5 | | PSScriptAnalyzer | 1.20.0 | @@ -496,10 +505,10 @@ All other versions are saved but not installed. ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2022 | sha256:f361f9071edda48d05910f4e77f17f7bdb83f75e3f5504c70b31eb3efa784d09 | 2021-12-14 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2022 | sha256:6e9e92babd4d6ea9b1b79bb4c39b8eebff794923368b7602fdecc2fda7811855 | 2021-12-14 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:26d0f5d9c0287dd89900e8d82a59cef31d8e62dcd624227d286654ac618cc4c2 | 2021-12-14 | -| mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:802c38698f46f154711a18c4ac31b224e05159dd287e662d2a16a1ffc4be7d15 | 2021-12-08 | -| mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:1f8965b9b4e2097ac78590ba652f069eafd5b6a0a4e9e603a415d362bfb7638c | 2021-12-08 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2022 | sha256:74a2826e180a8efd15c094f8c0395d751354a17ed971b73dc08643f2eff934f5 | 2022-01-12 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2022 | sha256:4991bb905c1e24a93768c85c4ee41e911ec94211636113944441b6ece1793325 | 2022-01-12 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:b64cd92d5e28816760c8055053013f54488bdba2b788f6d7db1f1aa26c8ff1f8 | 2022-01-12 | +| mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:e5f029ba86d30704103c8f7dbde99dd3e05579917ebf3cae4872859e2c542e04 | 2022-01-06 | +| mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:51dfdaaa8e4ba5a3bc9177a4d4908623a0b98a7b42b458b424a7a88dcdb09375 | 2022-01-06 | From df0e83c8f71990a7dad883fe913b507c8d6b007e Mon Sep 17 00:00:00 2001 From: V-Zabayrachny <79155496+V-Zabayrachny@users.noreply.github.com> Date: Fri, 21 Jan 2022 18:40:37 +0300 Subject: [PATCH 0915/3485] [Windows] Add WiX to VS on Windows-2022 (#4895) * [Windows] Add wix to VS on Windows-2022 * [Windows] Move WiX in toolset on windows 16, 19 --- images/win/scripts/Installers/Install-Wix.ps1 | 19 ------------------- images/win/scripts/Tests/Wix.Tests.ps1 | 12 ------------ images/win/toolsets/toolset-2016.json | 1 + images/win/toolsets/toolset-2019.json | 3 ++- images/win/toolsets/toolset-2022.json | 3 ++- 5 files changed, 5 insertions(+), 33 deletions(-) diff --git a/images/win/scripts/Installers/Install-Wix.ps1 b/images/win/scripts/Installers/Install-Wix.ps1 index 5758cfc73eb0..c5865af80924 100644 --- a/images/win/scripts/Installers/Install-Wix.ps1 +++ b/images/win/scripts/Installers/Install-Wix.ps1 @@ -5,23 +5,4 @@ Choco-Install -PackageName wixtoolset -ArgumentList "--force" -if (Test-IsWin19) -{ - $extensionUrl = "https://wixtoolset.gallerycdn.vsassets.io/extensions/wixtoolset/wixtoolsetvisualstudio2019extension/1.0.0.4/1563296438961/Votive2019.vsix" - $VSver = "2019" -} -elseif (Test-IsWin16) -{ - $extensionUrl = "https://robmensching.gallerycdn.vsassets.io/extensions/robmensching/wixtoolsetvisualstudio2017extension/0.9.21.62588/1494013210879/250616/4/Votive2017.vsix" - $VSver = "2017" -} - -if (-not (Test-IsWin22)) -{ - $extensionName = "Votive$VSver.vsix" - - #Installing VS extension 'Wix Toolset Visual Studio Extension' - Install-VsixExtension -Url $extensionUrl -Name $extensionName -VSversion $VSver -} - Invoke-PesterTests -TestFile "Wix" diff --git a/images/win/scripts/Tests/Wix.Tests.ps1 b/images/win/scripts/Tests/Wix.Tests.ps1 index 7b7f7cdae720..66937f696969 100644 --- a/images/win/scripts/Tests/Wix.Tests.ps1 +++ b/images/win/scripts/Tests/Wix.Tests.ps1 @@ -8,16 +8,4 @@ Describe "Wix" { It "Wix Toolset version from registry" { $version | Should -Not -BeNullOrEmpty } - - It "Wix Toolset version from system" -Skip:(Test-IsWin22) { - if (Test-IsWin19) - { - $exVersion = Get-VSExtensionVersion -packageName "WixToolset.VisualStudioExtension.Dev16" - } - else - { - $exVersion = Get-VSExtensionVersion -packageName "WixToolset.VisualStudioExtension.Dev15" - } - $exVersion | Should -Not -BeNullOrEmpty - } } diff --git a/images/win/toolsets/toolset-2016.json b/images/win/toolsets/toolset-2016.json index e937129c365e..e8d8a7be174d 100644 --- a/images/win/toolsets/toolset-2016.json +++ b/images/win/toolsets/toolset-2016.json @@ -343,6 +343,7 @@ "Microsoft.VisualStudio.Workload.Office" ], "vsix": [ + "WixToolset.WixToolsetVisualStudio2017Extension" ] }, "docker": { diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index 86fad6a8e129..caf928b559c0 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -377,7 +377,8 @@ "SSIS.SqlServerIntegrationServicesProjects", "ProBITools.MicrosoftReportProjectsforVisualStudio", "VisualStudioClient.MicrosoftVisualStudio2017InstallerProjects", - "ms-biztalk.BizTalk" + "ms-biztalk.BizTalk", + "WixToolset.WixToolsetVisualStudio2019Extension" ] }, "docker": { diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index 1a73b3f7c7c2..4fedb5e3eb8d 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -247,7 +247,8 @@ "wasm.tools" ], "vsix": [ - "VisualStudioClient.MicrosoftVisualStudio2022InstallerProjects" + "VisualStudioClient.MicrosoftVisualStudio2022InstallerProjects", + "WixToolset.WixToolsetVisualStudio2022Extension" ] }, "docker": { From 129a56046f637d39f8835c202520cb2c5532d6b9 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 24 Jan 2022 07:39:52 +0000 Subject: [PATCH 0916/3485] Updating readme file for ubuntu20 version 20220119.1 (#4916) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2004-Readme.md | 85 ++++++++++++++++--------------- 1 file changed, 45 insertions(+), 40 deletions(-) diff --git a/images/linux/Ubuntu2004-Readme.md b/images/linux/Ubuntu2004-Readme.md index c5353a850d47..e44043d589f1 100644 --- a/images/linux/Ubuntu2004-Readme.md +++ b/images/linux/Ubuntu2004-Readme.md @@ -1,19 +1,20 @@ | Announcements | |-| +| [[All OSs] .NET 2.1 will be removed from the images on February, 21](https://github.com/actions/virtual-environments/issues/4871) | | [[All OSs] Az PowerShell Module will be upgraded to 7.1.0 on January, 17](https://github.com/actions/virtual-environments/issues/4841) | | [[Ubuntu] Issue with libstdc++ cannot allocate memory in static TLS block](https://github.com/actions/virtual-environments/issues/4799) | | [[All OSs] Python version 3.5 will be removed from the images on January 24, 2022](https://github.com/actions/virtual-environments/issues/4744) | *** # Ubuntu 20.04.3 LTS -- Linux kernel version: 5.11.0-1025-azure -- Image Version: 20220111.1 +- Linux kernel version: 5.11.0-1027-azure +- Image Version: 20220119.1 ## Installed Software ### Language and Runtime - Bash 5.0.17(1)-release - Clang 10.0.0, 11.0.0, 12.0.0 - Clang-format 10.0.0, 11.0.0, 12.0.0 -- Erlang 24.1.7 (Eshell 12.1.5) +- Erlang 24.2 (Eshell 12.2) - Erlang rebar3 3.18.0 - GNU C++ 9.3.0, 10.3.0 - GNU Fortran 9.3.0, 10.3.0 @@ -31,14 +32,14 @@ ### Package Management - cpan 1.64 - Helm 3.7.2 -- Homebrew 3.3.10 +- Homebrew 3.3.11 - Miniconda 4.10.3 - Npm 8.1.2 - Pip 20.0.2 - Pip3 20.0.2 - Pipx 1.0.0 - RubyGems 3.1.2 -- Vcpkg (build from master \<b8b1217bd>) +- Vcpkg (build from master \<5ef52b5b7>) - Yarn 1.22.17 #### Environment variables @@ -56,29 +57,29 @@ ### Tools - Ansible 2.12.1 -- apt-fast 1.9.11 +- apt-fast 1.9.12 - AzCopy 10.13.0 (available by `azcopy` and `azcopy10` aliases) -- Bazel 4.2.2 +- Bazel 5.0.0 - Bazelisk 1.11.0 - Bicep 0.4.1124 - Buildah 1.21.3 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - CMake 3.22.1 -- CodeQL Action Bundle 2.7.3 +- CodeQL Action Bundle 2.7.5 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.2.2+azure-1 +- Docker Compose v2 2.2.3+azure-1 - Docker-Buildx 0.7.1 - Docker-Moby Client 20.10.11+azure-3 - Docker-Moby Server 20.10.11+azure-3 -- Fastlane 2.199.0 +- Fastlane 2.200.0 - Git 2.34.1 (apt source repository: ppa:git-core/ppa) - Git LFS 3.0.2 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.6.0 - Haveged 1.9.1 - Heroku 7.59.2 -- HHVM (HipHop VM) 4.143.0 +- HHVM (HipHop VM) 4.144.0 - jq 1.6 - Kind 0.11.1 -- Kubectl 1.23.1 +- Kubectl 1.23.2 - Kustomize 4.4.1 - Leiningen 2.9.8 - MediaInfo 19.09 @@ -88,40 +89,41 @@ - Newman 5.3.1 - nvm 0.39.1 - OpenSSL 1.1.1f 31 Mar 2020 -- Packer 1.7.8 -- Parcel 2.1.1 +- Packer 1.7.9 +- Parcel 2.2.1 - PhantomJS 2.1.1 - Podman 3.4.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- Pulumi 3.21.1 +- Pulumi 3.22.1 - R 4.1.2 - Skopeo 1.3.0 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 -- Terraform 1.1.3 +- Terraform 1.1.4 - yamllint 1.26.3 - yq 4.16.2 - zstd 1.5.1 (homebrew) ### CLI Tools -- Alibaba Cloud CLI 3.0.102 -- AWS CLI 2.4.9 +- Alibaba Cloud CLI 3.0.104 +- AWS CLI 2.4.12 - AWS CLI Session manager plugin 1.2.295.0 - AWS SAM CLI 1.37.0 - Azure CLI (azure-cli) 2.32.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.22.0 - GitHub CLI 2.4.0 -- Google Cloud SDK 368.0.0 (apt source repository: https://packages.cloud.google.com/apt) +- Google Cloud SDK 369.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 8.6.21 -- OpenShift CLI 4.9.13 +- Netlify CLI 8.10.2 +- OpenShift CLI 4.9.15 - ORAS CLI 0.12.0 - Vercel CLI 23.1.2 ### Java -| Version | Vendor | Environment Variable | -| ------------------- | ------------- | -------------------- | -| 8.0.292+1 | Adopt OpenJDK | JAVA_HOME_8_X64 | -| 11.0.11+9 (default) | Adopt OpenJDK | JAVA_HOME_11_X64 | +| Version | Vendor | Environment Variable | +| ------------------- | --------------- | -------------------- | +| 8.0.312+7 | Eclipse Temurin | JAVA_HOME_8_X64 | +| 11.0.13+8 (default) | Eclipse Temurin | JAVA_HOME_11_X64 | +| 17.0.1+12 | Eclipse Temurin | JAVA_HOME_17_X64 | ### GraalVM | Version | Environment variables | @@ -144,23 +146,23 @@ - Stack 2.7.3 ### Rust Tools -- Cargo 1.57.0 -- Rust 1.57.0 -- Rustdoc 1.57.0 +- Cargo 1.58.0 +- Rust 1.58.0 +- Rustdoc 1.58.0 - Rustup 1.24.3 #### Packages - Bindgen 0.59.2 - Cargo audit 0.16.0 -- Cargo clippy 0.1.57 +- Cargo clippy 0.1.58 - Cargo outdated 0.10.2 - Cbindgen 0.20.0 -- Rustfmt 1.4.37 +- Rustfmt 1.4.38 ### Browsers and Drivers - Google Chrome 97.0.4692.71 - ChromeDriver 97.0.4692.71 -- Mozilla Firefox 95.0.1 +- Mozilla Firefox 96.0 - Geckodriver 0.30.0 - Chromium 97.0.4692.0 - Selenium server 4.1.0 @@ -175,6 +177,9 @@ ### .NET Core SDK - 2.1.302 2.1.403 2.1.526 2.1.617 2.1.701 2.1.818 3.1.120 3.1.202 3.1.302 3.1.416 5.0.104 5.0.210 5.0.303 5.0.404 +### .NET tools +- nbgv 3.4.255+06fb9182bf + ### Databases - MongoDB 5.0.5 (apt source repository: https://repo.mongodb.org/apt/ubuntu) - PostgreSQL 14.1 (apt source repository: https://apt.postgresql.org/pub/repos/apt/) @@ -214,8 +219,8 @@ - 3.6.15 - 3.7.12 - 3.8.12 -- 3.9.9 -- 3.10.1 +- 3.9.10 +- 3.10.2 #### Ruby - 2.5.9 @@ -241,7 +246,7 @@ | PSScriptAnalyzer | 1.20.0 | #### Az PowerShell Modules -- 6.4.0 3.1.0.zip 4.4.0.zip 5.9.0.zip +- 7.1.0 3.1.0.zip 4.4.0.zip 5.9.0.zip 6.6.0.zip ### Web Servers | Name | Version | ConfigFile | ServiceStatus | ListenPort | @@ -288,12 +293,12 @@ | debian:11 | sha256:2906804d2a64e8a13a434a1a127fe3f6a28bf7cf3696be4223b06276f32f1f2d | 2021-12-21 | | debian:9 | sha256:54284a7a45383b407c1968657e8f1c50dc25b82d8d56b3812e46ad19f8bcfd83 | 2021-12-21 | | moby/buildkit:latest | sha256:d6c89b7085b106301645ddcc77cf64eb7b705ab507b72d52d130ac33f1300417 | 2021-11-18 | -| node:12 | sha256:36b3ee4724ab60ac5f288d22999074437ed517e8d1bd2e24ab19609479d39c81 | 2021-12-21 | -| node:12-alpine | sha256:05d61228b85c54b5527e74afc54153eb3572aae005948fb068a0f4ebe01f7c1e | 2022-01-03 | -| node:14 | sha256:e5c6aac226819f88d6431a56f502972d323d052b1b6108094ba7e6b07154a542 | 2021-12-21 | -| node:14-alpine | sha256:1e7481a9a977d8e4160a73ed6a0e726724570bf7d941adbec63a82cf7c07ae19 | 2022-01-03 | -| node:16 | sha256:32605ead97ed57bd39a8a7b0e919240e1a3218974dfc6965e61b54a801753131 | 2021-12-21 | -| node:16-alpine | sha256:0e071f3c5c84cffa6b1035023e1956cf28d48f4b36e229cef328772da81ec0c5 | 2022-01-03 | +| node:12 | sha256:04334b2efca8f5f23d246ce8818fe358c2c0116819e5fd043e7929cae6ca7398 | 2022-01-11 | +| node:12-alpine | sha256:c3e7817c8fd124f1597cd66124d247db8e138e8ef311ba085b7104d900129d0b | 2022-01-12 | +| node:14 | sha256:50d4540794db9bdbd423a5823c4d840fc2ba0b9c82d71b059ff34b4aeb3e328f | 2022-01-11 | +| node:14-alpine | sha256:a9b200d25469261a4cccde176db08ec9f0b5799fa4220d8edfe57e69684c6dad | 2022-01-11 | +| node:16 | sha256:4b0b5c3db44f567d5d25c80a6fe33a981d911cdae20b39d2395be268aea2cb97 | 2022-01-11 | +| node:16-alpine | sha256:2f50f4a428f8b5280817c9d4d896dbee03f072e93f4e0c70b90cc84bd1fcfe0d | 2022-01-12 | | ubuntu:16.04 | sha256:0f71fa8d4d2d4292c3c617fda2b36f6dabe5c8b6e34c3dc5b0d17d4e704bd39c | 2021-08-31 | | ubuntu:18.04 | sha256:37b7471c1945a2a12e5a57488ee4e3e216a8369d0b9ee1ec2e41db9c2c1e3d22 | 2022-01-07 | | ubuntu:20.04 | sha256:b5a61709a9a44284d88fb12e5c48db0409cfad5b69d4ff8224077c57302df9cf | 2022-01-07 | From 4585d058c8f93d4193bd008499d4710a9f1543c8 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Tue, 25 Jan 2022 20:29:59 +0300 Subject: [PATCH 0917/3485] [macOS] create tcl/tk symlinks for cached python (#4943) * [macOS] create tcl/tk symlinks for cached python * add workaround notice * move symlynks creation to commonutils --- images/macos/provision/core/commonutils.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/images/macos/provision/core/commonutils.sh b/images/macos/provision/core/commonutils.sh index 9b8df533447c..946dd4807ef9 100644 --- a/images/macos/provision/core/commonutils.sh +++ b/images/macos/provision/core/commonutils.sh @@ -19,5 +19,13 @@ done # Invoke bazel to download bazel version via bazelisk bazel +# Workaround https://github.com/actions/virtual-environments/issues/4931 +# by making Tcl/Tk paths the same on macOS 10.15 and macOS 11 +if is_BigSur; then + version=$(brew info tcl-tk --json | jq -r '.[].installed[].version') + ln -s /usr/local/Cellar/tcl-tk/$version/lib/libtcl8.6.dylib /usr/local/lib/libtcl8.6.dylib + ln -s /usr/local/Cellar/tcl-tk/$version/lib/libtk8.6.dylib /usr/local/lib/libtk8.6.dylib +fi + # Invoke tests for all basic tools invoke_tests "BasicTools" From 736f2fa165d50ddfeb2bbc996a37d62d135ab37e Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Wed, 26 Jan 2022 11:19:05 +0300 Subject: [PATCH 0918/3485] Hardcode swiftlint 0.46.0 (#4953) --- images/macos/provision/core/swiftlint.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/images/macos/provision/core/swiftlint.sh b/images/macos/provision/core/swiftlint.sh index b4bb7e3f4143..b3f742b70810 100644 --- a/images/macos/provision/core/swiftlint.sh +++ b/images/macos/provision/core/swiftlint.sh @@ -2,7 +2,9 @@ source ~/utils/utils.sh echo "Install SwiftLint" -swiftlintUrl=$(curl -H "Authorization: token $API_PAT" -s "https://api.github.com/repos/realm/SwiftLint/releases/latest" | jq -r '.assets[].browser_download_url | select(contains("SwiftLint.pkg"))') +# Temporary hardcode swiftlint version due to the issues with installer https://github.com/realm/SwiftLint/issues/3815 +swiftlintUrl="https://github.com/realm/SwiftLint/releases/download/0.46.0/SwiftLint.pkg" +#swiftlintUrl=$(curl -H "Authorization: token $API_PAT" -s "https://api.github.com/repos/realm/SwiftLint/releases/latest" | jq -r '.assets[].browser_download_url | select(contains("SwiftLint.pkg"))') download_with_retries $swiftlintUrl "/tmp" "SwiftLint.pkg" sudo installer -pkg /tmp/SwiftLint.pkg -target / rm -rf /tmp/SwiftLint.pkg From 28f8c710df10c20de29737918bbed657d499d838 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 27 Jan 2022 17:06:43 +0000 Subject: [PATCH 0919/3485] Updating readme file for macOS-10.15 version 20220124.1 (#4951) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-10.15-Readme.md | 40 ++++++++++++++---------------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/images/macos/macos-10.15-Readme.md b/images/macos/macos-10.15-Readme.md index 8b2cf90f7787..3bc259b749b7 100644 --- a/images/macos/macos-10.15-Readme.md +++ b/images/macos/macos-10.15-Readme.md @@ -1,7 +1,6 @@ | Announcements | |-| | [[All OSs] .NET 2.1 will be removed from the images on February, 21](https://github.com/actions/virtual-environments/issues/4871) | -| [[All OSs] Az PowerShell Module will be upgraded to 7.1.0 on January, 17](https://github.com/actions/virtual-environments/issues/4841) | | [[macOS] Default Xcode on Big Sur image will be set to Xcode 13.2.1 on January, 24](https://github.com/actions/virtual-environments/issues/4800) | | [[All OSs] Python version 3.5 will be removed from the images on January 24, 2022](https://github.com/actions/virtual-environments/issues/4744) | | [macOS-latest workflows will use macOS-11](https://github.com/actions/virtual-environments/issues/4060) | @@ -9,7 +8,7 @@ # macOS 10.15 info - System Version: macOS 10.15.7 (19H1615) - Kernel Version: Darwin 19.6.0 -- Image Version: 20220118.8 +- Image Version: 20220124.1 ## Installed Software ### Language and Runtime @@ -31,7 +30,7 @@ - NVM 0.39.1 - NVM - Cached node versions: v12.22.9 v14.18.3 v16.13.2 - Perl 5.34.0 -- PHP 8.1.1 +- PHP 8.1.2 - Python 2.7.18 - Python 3.9.10 - R 4.1.2 @@ -41,7 +40,7 @@ - Bundler version 2.3.5 - Carthage 0.38.0 - CocoaPods 1.11.2 -- Composer 2.2.4 +- Composer 2.2.5 - Homebrew 3.3.11 - Miniconda 4.10.3 - NPM 8.1.2 @@ -50,7 +49,7 @@ - Pip 21.3.1 (python 3.9) - Pipx 1.0.0 - RubyGems 3.2.33 -- Vcpkg 2021 (build from master \<4184491f0>) +- Vcpkg 2021 (build from master \<3afbc7b28>) - Yarn 1.22.17 #### Environment variables @@ -69,14 +68,14 @@ - 7-Zip 17.04 - aria2 1.36.0 - azcopy 10.13.0 -- bazel 4.2.2 +- bazel 5.0.0 - bazelisk 1.11.0 - bsdtar 3.3.2 - available by 'tar' alias - Curl 7.81.0 - Git LFS: 3.0.2 - Git: 2.34.1 - GitHub CLI: 2.4.0 -- GNU parallel 20211222 +- GNU parallel 20220122 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.2 - gpg (GnuPG) 2.3.4 @@ -94,20 +93,20 @@ - Subversion (SVN) 1.14.1 - Switchaudio-osx 1.1.0 - Vagrant 2.2.19 -- virtualbox 6.1.30r148432 -- zstd 1.5.1 +- virtualbox 6.1.32r149290 +- zstd 1.5.2 ### Tools - Aliyun CLI 3.0.104 - App Center CLI 2.10.8 -- AWS CLI 2.4.11 +- AWS CLI 2.4.13 - AWS SAM CLI 1.37.0 - AWS Session Manager CLI 1.2.295.0 - Azure CLI 2.32.0 - Bicep CLI 0.4.1124 - Cabal 3.6.2.0 - Cmake 3.22.1 -- Fastlane 2.200.0 +- Fastlane 2.201.1 - GHC 9.2.1 - GHCup 0.1.17.4 - Jazzy 0.14.1 @@ -117,17 +116,17 @@ - Xcode Command Line Tools 12.4.0.0.1.1610135815 ### Linters -- SwiftLint 0.45.1 +- SwiftLint 0.46.0 - yamllint 1.26.3 ### Browsers - Safari 15.2 (15612.3.6.1.8) - SafariDriver 15.2 (15612.3.6.1.8) -- Google Chrome 97.0.4692.71 +- Google Chrome 97.0.4692.99 - ChromeDriver 97.0.4692.71 -- Microsoft Edge 97.0.1072.62 -- MSEdgeDriver 97.0.1072.62 -- Mozilla Firefox 96.0.1 +- Microsoft Edge 97.0.1072.69 +- MSEdgeDriver 97.0.1072.69 +- Mozilla Firefox 96.0.2 - geckodriver 0.30.0 - Selenium server 4.1.1 @@ -142,7 +141,7 @@ | Version | Vendor | Environment Variable | | ------------------- | --------------- | -------------------- | | 8.0.312+7 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | -| 11.0.13+8 | Eclipse Temurin | JAVA_HOME_11_X64 | +| 11.0.14+9 | Eclipse Temurin | JAVA_HOME_11_X64 | | 12.0.2+10.3 | Adopt OpenJDK | JAVA_HOME_12_X64 | | 13.0.2+8.1 | Adopt OpenJDK | JAVA_HOME_13_X64 | | 14.0.2+12 | Adopt OpenJDK | JAVA_HOME_14_X64 | @@ -158,7 +157,6 @@ #### Python - 2.7.18 -- 3.5.10 - 3.6.15 - 3.7.12 - 3.8.12 @@ -185,8 +183,8 @@ ### Rust Tools - Cargo 1.58.0 -- Rust 1.58.0 -- Rustdoc 1.58.0 +- Rust 1.58.1 +- Rustdoc 1.58.1 - Rustup 1.24.3 #### Packages @@ -216,7 +214,7 @@ ### Xamarin #### Visual Studio for Mac -- 8.10.16.2 +- 8.10.17.2 #### Xamarin bundles | symlink | Xamarin.Mono | Xamarin.iOS | Xamarin.Mac | Xamarin.Android | From 5d614aa865b03c69d34d8d89ec4ca4f4fd9a03a0 Mon Sep 17 00:00:00 2001 From: Steve-Glass <84886334+Steve-Glass@users.noreply.github.com> Date: Thu, 27 Jan 2022 14:00:43 -0500 Subject: [PATCH 0920/3485] Update to macos-latest to run on macOS 11 (#4048) * Update to macos-latest to run on macOS 11 Co-authored-by: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index a815af66b745..02151db23250 100644 --- a/README.md +++ b/README.md @@ -12,8 +12,8 @@ For general questions about using the virtual environments or writing your Actio | --------------------|---------------------|--------------------|---------------------| | Ubuntu 20.04 | `ubuntu-latest` or `ubuntu-20.04` | [ubuntu-20.04] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu20&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu20&redirect=1) | Ubuntu 18.04 | `ubuntu-18.04` | [ubuntu-18.04] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu18&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu18&redirect=1) -| macOS 11 | `macos-11` | [macOS-11] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-11&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-11&redirect=1) -| macOS 10.15 | `macos-latest` or `macos-10.15` | [macOS-10.15] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-10.15&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-10.15&redirect=1) +| macOS 11 | `macos-latest` or `macos-11`| [macOS-11] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-11&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-11&redirect=1) +| macOS 10.15 | `macos-10.15` | [macOS-10.15] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-10.15&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-10.15&redirect=1) | Windows Server 2022 | `windows-2022` | [windows-2022] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=windows-2022&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=windows-2022&redirect=1) | | Windows Server 2019 | `windows-latest` or `windows-2019` | [windows-2019] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=windows-2019&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=windows-2019&redirect=1) | Windows Server 2016 | `windows-2016` | [windows-2016] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=windows-2016&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=windows-2016&redirect=1) From ec3c8b5326efa8b305fa63d40dbf02a8058d3252 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 27 Jan 2022 19:57:46 +0000 Subject: [PATCH 0921/3485] Updating readme file for ubuntu18 version 20220123.1 (#4939) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu1804-Readme.md | 52 ++++++++++++++++--------------- 1 file changed, 27 insertions(+), 25 deletions(-) diff --git a/images/linux/Ubuntu1804-Readme.md b/images/linux/Ubuntu1804-Readme.md index 225e0e5e207d..03af7ae80a78 100644 --- a/images/linux/Ubuntu1804-Readme.md +++ b/images/linux/Ubuntu1804-Readme.md @@ -6,8 +6,8 @@ | [[All OSs] Python version 3.5 will be removed from the images on January 24, 2022](https://github.com/actions/virtual-environments/issues/4744) | *** # Ubuntu 18.04.6 LTS -- Linux kernel version: 5.4.0-1065-azure -- Image Version: 20220116.1 +- Linux kernel version: 5.4.0-1067-azure +- Image Version: 20220123.1 ## Installed Software ### Language and Runtime @@ -32,14 +32,14 @@ ### Package Management - cpan 1.64 - Helm 3.7.2 -- Homebrew 3.3.10 +- Homebrew 3.3.11 - Miniconda 4.10.3 - Npm 8.1.2 - Pip 9.0.1 - Pip3 9.0.1 - Pipx 1.0.0 - RubyGems 2.7.6 -- Vcpkg (build from master \<bba8794b8>) +- Vcpkg (build from master \<df40d1c47>) - Yarn 1.22.17 #### Environment variables @@ -58,12 +58,12 @@ - Ansible 2.11.7 - apt-fast 1.9.12 - AzCopy 10.13.0 (available by `azcopy` and `azcopy10` aliases) -- Bazel 4.2.2 +- Bazel 5.0.0 - Bazelisk 1.11.0 - Bicep 0.4.1124 - Buildah 1.19.6 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - CMake 3.22.1 -- CodeQL Action Bundle 2.7.3 +- CodeQL Action Bundle 2.7.5 - Docker Compose v1 1.29.2 - Docker Compose v2 2.2.3+azure-1 - Docker-Buildx 0.7.1 @@ -74,45 +74,45 @@ - Git-ftp 1.3.1 - Haveged 1.9.1 - Heroku 7.59.2 -- HHVM (HipHop VM) 4.144.0 +- HHVM (HipHop VM) 4.145.0 - jq 1.5 - Kind 0.11.1 -- Kubectl 1.23.1 +- Kubectl 1.23.2 - Kustomize 4.4.1 - Leiningen 2.9.8 - MediaInfo 17.12 - Mercurial 4.5.3 -- Minikube 1.24.0 +- Minikube 1.25.1 - n 8.0.2 - Newman 5.3.1 - nvm 0.39.1 - OpenSSL 1.1.1 11 Sep 2018 -- Packer 1.7.8 -- Parcel 2.2.0 +- Packer 1.7.9 +- Parcel 2.2.1 - PhantomJS 2.1.1 - Podman 3.0.1 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- Pulumi 3.22.0 +- Pulumi 3.22.1 - R 4.1.2 - Skopeo 1.2.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 - SVN 1.9.7 -- Terraform 1.1.3 +- Terraform 1.1.4 - yamllint 1.26.3 -- yq 4.16.2 -- zstd 1.5.1 (homebrew) +- yq 4.17.2 +- zstd 1.5.2 (homebrew) ### CLI Tools - Alibaba Cloud CLI 3.0.104 -- AWS CLI 1.22.37 +- AWS CLI 1.22.41 - AWS CLI Session manager plugin 1.2.295.0 - AWS SAM CLI 1.37.0 - Azure CLI (azure-cli) 2.32.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.22.0 - GitHub CLI 2.4.0 -- Google Cloud SDK 368.0.0 (apt source repository: https://packages.cloud.google.com/apt) +- Google Cloud SDK 369.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 8.8.2 -- OpenShift CLI 4.9.13 +- Netlify CLI 8.13.0 +- OpenShift CLI 4.9.15 - ORAS CLI 0.12.0 - Vercel CLI 23.1.2 @@ -128,8 +128,8 @@ | Tool | Version | | -------- | ---------------------------------------- | | PHP | 7.1.33 7.2.34 7.3.33 7.4.27 8.0.14 8.1.1 | -| Composer | 2.2.4 | -| PHPUnit | 8.5.22 | +| Composer | 2.2.5 | +| PHPUnit | 8.5.23 | ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ``` @@ -141,8 +141,8 @@ ### Rust Tools - Cargo 1.58.0 -- Rust 1.58.0 -- Rustdoc 1.58.0 +- Rust 1.58.1 +- Rustdoc 1.58.1 - Rustup 1.24.3 #### Packages @@ -154,7 +154,7 @@ - Rustfmt 1.4.38 ### Browsers and Drivers -- Google Chrome 97.0.4692.71 +- Google Chrome 97.0.4692.99 - ChromeDriver 97.0.4692.71 - Mozilla Firefox 96.0 - Geckodriver 0.30.0 @@ -171,6 +171,9 @@ ### .NET Core SDK - 2.1.302 2.1.403 2.1.526 2.1.617 2.1.701 2.1.818 3.1.120 3.1.202 3.1.302 3.1.416 5.0.104 5.0.210 5.0.303 5.0.404 +### .NET tools +- nbgv 3.4.255+06fb9182bf + ### Databases - MongoDB 5.0.5 (apt source repository: https://repo.mongodb.org/apt/ubuntu) - PostgreSQL 14.1 (apt source repository: https://apt.postgresql.org/pub/repos/apt/) @@ -204,7 +207,6 @@ #### Python - 2.7.18 -- 3.5.10 - 3.6.15 - 3.7.12 - 3.8.12 From abc6b7b793d9d9cfdce2a6a23f369c22cabf0ac2 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Thu, 27 Jan 2022 23:13:11 +0300 Subject: [PATCH 0922/3485] Revert "Hardcode swiftlint 0.46.0 (#4953)" (#4962) This reverts commit 736f2fa165d50ddfeb2bbc996a37d62d135ab37e. --- images/macos/provision/core/swiftlint.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/images/macos/provision/core/swiftlint.sh b/images/macos/provision/core/swiftlint.sh index b3f742b70810..b4bb7e3f4143 100644 --- a/images/macos/provision/core/swiftlint.sh +++ b/images/macos/provision/core/swiftlint.sh @@ -2,9 +2,7 @@ source ~/utils/utils.sh echo "Install SwiftLint" -# Temporary hardcode swiftlint version due to the issues with installer https://github.com/realm/SwiftLint/issues/3815 -swiftlintUrl="https://github.com/realm/SwiftLint/releases/download/0.46.0/SwiftLint.pkg" -#swiftlintUrl=$(curl -H "Authorization: token $API_PAT" -s "https://api.github.com/repos/realm/SwiftLint/releases/latest" | jq -r '.assets[].browser_download_url | select(contains("SwiftLint.pkg"))') +swiftlintUrl=$(curl -H "Authorization: token $API_PAT" -s "https://api.github.com/repos/realm/SwiftLint/releases/latest" | jq -r '.assets[].browser_download_url | select(contains("SwiftLint.pkg"))') download_with_retries $swiftlintUrl "/tmp" "SwiftLint.pkg" sudo installer -pkg /tmp/SwiftLint.pkg -target / rm -rf /tmp/SwiftLint.pkg From f299f00c879204cae62645da4b7754f32073aea1 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 27 Jan 2022 20:31:14 +0000 Subject: [PATCH 0923/3485] Updating readme file for ubuntu20 version 20220123.1 (#4940) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2004-Readme.md | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/images/linux/Ubuntu2004-Readme.md b/images/linux/Ubuntu2004-Readme.md index e44043d589f1..76d918175fb9 100644 --- a/images/linux/Ubuntu2004-Readme.md +++ b/images/linux/Ubuntu2004-Readme.md @@ -7,7 +7,7 @@ *** # Ubuntu 20.04.3 LTS - Linux kernel version: 5.11.0-1027-azure -- Image Version: 20220119.1 +- Image Version: 20220123.1 ## Installed Software ### Language and Runtime @@ -39,7 +39,7 @@ - Pip3 20.0.2 - Pipx 1.0.0 - RubyGems 3.1.2 -- Vcpkg (build from master \<5ef52b5b7>) +- Vcpkg (build from master \<df40d1c47>) - Yarn 1.22.17 #### Environment variables @@ -70,13 +70,13 @@ - Docker-Buildx 0.7.1 - Docker-Moby Client 20.10.11+azure-3 - Docker-Moby Server 20.10.11+azure-3 -- Fastlane 2.200.0 +- Fastlane 2.201.1 - Git 2.34.1 (apt source repository: ppa:git-core/ppa) - Git LFS 3.0.2 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.6.0 - Haveged 1.9.1 - Heroku 7.59.2 -- HHVM (HipHop VM) 4.144.0 +- HHVM (HipHop VM) 4.145.0 - jq 1.6 - Kind 0.11.1 - Kubectl 1.23.2 @@ -84,7 +84,7 @@ - Leiningen 2.9.8 - MediaInfo 19.09 - Mercurial 5.3.1 -- Minikube 1.24.0 +- Minikube 1.25.1 - n 8.0.2 - Newman 5.3.1 - nvm 0.39.1 @@ -100,12 +100,12 @@ - SVN 1.13.0 - Terraform 1.1.4 - yamllint 1.26.3 -- yq 4.16.2 -- zstd 1.5.1 (homebrew) +- yq 4.17.2 +- zstd 1.5.2 (homebrew) ### CLI Tools - Alibaba Cloud CLI 3.0.104 -- AWS CLI 2.4.12 +- AWS CLI 2.4.13 - AWS CLI Session manager plugin 1.2.295.0 - AWS SAM CLI 1.37.0 - Azure CLI (azure-cli) 2.32.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) @@ -113,7 +113,7 @@ - GitHub CLI 2.4.0 - Google Cloud SDK 369.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 8.10.2 +- Netlify CLI 8.13.0 - OpenShift CLI 4.9.15 - ORAS CLI 0.12.0 - Vercel CLI 23.1.2 @@ -134,8 +134,8 @@ | Tool | Version | | -------- | ------------------- | | PHP | 7.4.27 8.0.14 8.1.1 | -| Composer | 2.2.4 | -| PHPUnit | 8.5.22 | +| Composer | 2.2.5 | +| PHPUnit | 8.5.23 | ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ``` @@ -147,8 +147,8 @@ ### Rust Tools - Cargo 1.58.0 -- Rust 1.58.0 -- Rustdoc 1.58.0 +- Rust 1.58.1 +- Rustdoc 1.58.1 - Rustup 1.24.3 #### Packages @@ -160,7 +160,7 @@ - Rustfmt 1.4.38 ### Browsers and Drivers -- Google Chrome 97.0.4692.71 +- Google Chrome 97.0.4692.99 - ChromeDriver 97.0.4692.71 - Mozilla Firefox 96.0 - Geckodriver 0.30.0 @@ -215,7 +215,6 @@ #### Python - 2.7.18 -- 3.5.10 - 3.6.15 - 3.7.12 - 3.8.12 From 16848183dd9899306de2777f3160f5ed71c86adf Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 27 Jan 2022 21:32:03 +0000 Subject: [PATCH 0924/3485] Updating readme file for win16 version 20220123.1 (#4941) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2016-Readme.md | 66 +++++++++++++++++--------------- 1 file changed, 35 insertions(+), 31 deletions(-) diff --git a/images/win/Windows2016-Readme.md b/images/win/Windows2016-Readme.md index e3e9dc36bd8f..0c7a0fb00bb4 100644 --- a/images/win/Windows2016-Readme.md +++ b/images/win/Windows2016-Readme.md @@ -2,13 +2,12 @@ |-| | [[All OSs] .NET 2.1 will be removed from the images on February, 21](https://github.com/actions/virtual-environments/issues/4871) | | [windows-latest workflows will use Windows Server 2022](https://github.com/actions/virtual-environments/issues/4856) | -| [[All OSs] Az PowerShell Module will be upgraded to 7.1.0 on January, 17](https://github.com/actions/virtual-environments/issues/4841) | | [[All OSs] Python version 3.5 will be removed from the images on January 24, 2022](https://github.com/actions/virtual-environments/issues/4744) | | [Windows-2016 environment will be removed on March 15, 2022](https://github.com/actions/virtual-environments/issues/4312) | *** # Microsoft Windows Server 2016 Datacenter -- OS Version: 10.0.14393 Build 4886 -- Image Version: 20220116.1 +- OS Version: 10.0.14393 Build 4889 +- Image Version: 20220123.1 ## Installed Software ### Language and Runtime @@ -19,13 +18,13 @@ - LLVM 13.0.0 - Node 16.13.2 - Perl 5.32.1 -- PHP 8.1.1 +- PHP 8.1.2 - Python 3.7.9 - Ruby 2.5.9p229 ### Package Management -- Chocolatey 0.11.3 -- Composer 2.2.4 +- Chocolatey 0.12.0 +- Composer 2.2.5 - Helm 3.7.2 - Miniconda 4.10.3 (pre-installed on the image but not added to PATH) - NPM 8.1.2 @@ -33,7 +32,7 @@ - pip 21.3.1 (python 3.7) - Pipx 1.0.0 - RubyGems 2.7.6.3 -- Vcpkg (build from master \<bba8794b8>) +- Vcpkg (build from master \<df40d1c47>) - Yarn 1.22.17 #### Environment variables @@ -52,30 +51,30 @@ - 7zip 21.07 - aria2 1.36.0 - azcopy 10.13.0 -- Bazel 4.2.2 +- Bazel 5.0.0 - Bazelisk 1.11.0 - Bicep 0.4.1124 - Cabal 3.6.2.0 - CMake 3.22.1 -- CodeQL Action Bundle 2.7.3 +- CodeQL Action Bundle 2.7.5 - Docker 20.10.7 - Docker-compose 1.29.2 - Docker-wincred 0.6.4 - ghc 9.2.1 - Git 2.34.1 - Git LFS 3.0.2 -- Google Cloud SDK 368.0.0 +- Google Cloud SDK 369.0.0 - InnoSetup 6.2.0 - jq 1.6 - Kind 0.11.1 -- Kubectl 1.23.1 +- Kubectl 1.23.2 - Mercurial 5.0 - Mingw-w64 8.1.0 - Newman 5.3.1 - NSIS v3.08 - OpenSSL 1.1.1 - Packer 1.7.8 -- Parcel 2.2.0 +- Parcel 2.2.1 - Pulumi v3.22.1 - R 4.1.2 - Service Fabric SDK 8.2.1363.9590 @@ -86,11 +85,11 @@ - WinAppDriver 1.2.2009.02003 - WiX Toolset v3.11.2.4516 - yamllint 1.26.3 -- zstd 1.5.1 +- zstd 1.5.2 ### CLI Tools - Alibaba Cloud CLI 3.0.104 -- AWS CLI 2.4.11 +- AWS CLI 2.4.13 - AWS SAM CLI 1.37.0 - AWS Session Manager CLI 1.2.295.0 - Azure CLI 2.32.0 @@ -101,8 +100,8 @@ ### Rust Tools - Cargo 1.58.0 -- Rust 1.58.0 -- Rustdoc 1.58.0 +- Rust 1.58.1 +- Rustdoc 1.58.1 - Rustup 1.24.3 #### Packages @@ -114,11 +113,11 @@ - Rustfmt 1.4.38 ### Browsers and webdrivers -- Google Chrome 97.0.4692.71 +- Google Chrome 97.0.4692.99 - Chrome Driver 97.0.4692.71 -- Microsoft Edge 97.0.1072.62 -- Microsoft Edge Driver 97.0.1072.62 -- Mozilla Firefox 96.0.1 +- Microsoft Edge 97.0.1072.69 +- Microsoft Edge Driver 97.0.1072.69 +- Mozilla Firefox 96.0.2 - Gecko Driver 0.30.0 - IE Driver 3.150.1.1 - Selenium server 4.1.0 @@ -135,7 +134,7 @@ | Version | Vendor | Environment Variable | | ------------------- | --------------- | -------------------- | | 8.0.312+7 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | -| 11.0.13+8 | Eclipse Temurin | JAVA_HOME_11_X64 | +| 11.0.14+9 | Eclipse Temurin | JAVA_HOME_11_X64 | | 13.0.2+8.1 | Adopt OpenJDK | JAVA_HOME_13_X64 | | 17.0.1+12 | Eclipse Temurin | JAVA_HOME_17_X64 | @@ -174,7 +173,6 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Version | Architecture | | ------- | ------------ | | 2.7.18 | x64, x86 | -| 3.5.4 | x64, x86 | | 3.6.8 | x64, x86 | | 3.7.9 (Default) | x64, x86 | | 3.8.10 | x64, x86 | @@ -217,9 +215,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | 5.0.5.0 | MongoDB | Running | Automatic | ### Database tools -- Azure CosmosDb Emulator 2.14.4.0 +- Azure CosmosDb Emulator 2.14.5.0 - DacFx 15.0.5282.3 -- MySQL 5.7.36.0 +- MySQL 5.7.37.0 - SQLPS 1.0 ### Web Servers @@ -266,7 +264,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Component.UnityEngine.x64 | 15.9.28307.616 | | Component.Unreal | 15.8.27729.1 | | Component.Unreal.Android | 15.9.28307.341 | -| Component.WixToolset.VisualStudioExtension.Dev15 | 0.9.21.62588 | +| Component.WixToolset.VisualStudioExtension.Dev15 | 1.0.0.18 | +| Component.WixToolset.VisualStudioExtension.Schemas3 | 1.0.0.18 | +| Component.WixToolset.VisualStudioExtension.Schemas4 | 1.0.0.18 | | Component.Xamarin | 15.9.28307.1177 | | Component.Xamarin.Profiler | 15.0.27005.2 | | Component.Xamarin.RemotedSimulator | 15.6.27323.2 | @@ -475,7 +475,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | SSDT SQL Server Integration Services Projects | 2.6.3 | | Windows Driver Kit | 10.0.17740.0 | | Windows Driver Kit Visual Studio Extension | 10.1.17763.1 | -| WIX Toolset Studio 2017 Extension | 0.9.21.62588 | +| WIX Toolset Studio 2017 Extension | 1.0.0.18 | +| WixToolset.WixToolsetVisualStudio2017Extension | 1.0.0.18 | #### Microsoft Visual C++: | Name | Architecture | Version | @@ -517,6 +518,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. `Location C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX <version> Tools` - 4.6.1 4.6.2 4.7 4.7.1 4.7.2 4.8 +### .NET tools +- nbgv 3.4.255+06fb9182bf + ### PowerShell Tools - PowerShell 7.2.1 @@ -537,7 +541,7 @@ All other versions are saved but not installed. | ------------------ | ---------------- | | DockerMsftProvider | 1.0.0.8 | | MarkdownPS | 1.9 | -| Microsoft.Graph | 1.9.1 | +| Microsoft.Graph | 1.9.2 | | Pester | 3.4.0<br>5.3.1 | | PowerShellGet | 1.0.0.1<br>2.2.5 | | PSScriptAnalyzer | 1.20.0 | @@ -574,10 +578,10 @@ All other versions are saved but not installed. ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2016 | sha256:2cfe85aef99ac48a49490b1fa19108247ee70b3d2351a10b870bbc27563858d1 | 2022-01-12 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2016 | sha256:cf7e5a3d03b001856ed0e1527ae05b06d48a9430b655dfc2f7448ec2e8365bae | 2022-01-12 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2016 | sha256:3158b7cb02ff259ffceb26d1ec89328067aecf552b71fae056e611042b62375d | 2022-01-12 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2016 | sha256:c78a21380f0bc64b51a45c606040ed66b80a0fb51d83dfed281e44bcf16d2d7b | 2022-01-20 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2016 | sha256:9582e7a50284e118e6aa139e2a84275e7fee09e995c4e98d17784db2b0d179e4 | 2022-01-20 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2016 | sha256:d379501cc3fffb1689cbbc34c84e38edbb93edc35b58ba8df2c6637f99d889ca | 2022-01-20 | | mcr.microsoft.com/windows/nanoserver:10.0.14393.953 | sha256:fc60bd5ae0e61b334ce1cf1bcbf20c10c36b4c5482a01da319c9c989f9e6e268 | 2017-03-08 | -| mcr.microsoft.com/windows/servercore:ltsc2016 | sha256:2c653377ee72b9a0b4c115d2875333f1b27fed507a12443c02c2a036e6da00b0 | 2022-01-06 | +| mcr.microsoft.com/windows/servercore:ltsc2016 | sha256:bce670d46d87c39b8d8d1a0b8d3229b96654b969c4ea55513faa36ac9506e01c | 2022-01-16 | From 3351872cbebeb034a8b8708f53d2f454ae4c5529 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 28 Jan 2022 08:56:59 +0000 Subject: [PATCH 0925/3485] Updating readme file for macOS-11 version 20220124.1 (#4950) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-11-Readme.md | 57 ++++++++++++++++----------------- 1 file changed, 28 insertions(+), 29 deletions(-) diff --git a/images/macos/macos-11-Readme.md b/images/macos/macos-11-Readme.md index 8d868a88b078..d60b90f73c91 100644 --- a/images/macos/macos-11-Readme.md +++ b/images/macos/macos-11-Readme.md @@ -1,7 +1,6 @@ | Announcements | |-| | [[All OSs] .NET 2.1 will be removed from the images on February, 21](https://github.com/actions/virtual-environments/issues/4871) | -| [[All OSs] Az PowerShell Module will be upgraded to 7.1.0 on January, 17](https://github.com/actions/virtual-environments/issues/4841) | | [[macOS] Default Xcode on Big Sur image will be set to Xcode 13.2.1 on January, 24](https://github.com/actions/virtual-environments/issues/4800) | | [[All OSs] Python version 3.5 will be removed from the images on January 24, 2022](https://github.com/actions/virtual-environments/issues/4744) | | [macOS-latest workflows will use macOS-11](https://github.com/actions/virtual-environments/issues/4060) | @@ -9,7 +8,7 @@ # macOS 11.6 info - System Version: macOS 11.6.2 (20G314) - Kernel Version: Darwin 20.6.0 -- Image Version: 20220118.8 +- Image Version: 20220124.1 ## Installed Software ### Language and Runtime @@ -31,7 +30,7 @@ - NVM 0.39.1 - NVM - Cached node versions: v12.22.9 v14.18.3 v16.13.2 - Perl 5.34.0 -- PHP 8.1.1 +- PHP 8.1.2 - Python 2.7.18 - Python 3.9.10 - Ruby 2.7.5p203 @@ -40,7 +39,7 @@ - Bundler version 2.3.5 - Carthage 0.38.0 - CocoaPods 1.11.2 -- Composer 2.2.4 +- Composer 2.2.5 - Homebrew 3.3.11 - Miniconda 4.10.3 - NPM 8.1.2 @@ -49,7 +48,7 @@ - Pip 21.3.1 (python 3.9) - Pipx 1.0.0 - RubyGems 3.2.33 -- Vcpkg 2021 (build from master \<4184491f0>) +- Vcpkg 2021 (build from master \<3afbc7b28>) - Yarn 1.22.17 #### Environment variables @@ -68,7 +67,7 @@ - 7-Zip 17.04 - aria2 1.36.0 - azcopy 10.13.0 -- bazel 4.2.2 +- bazel 5.0.0 - bazelisk 1.11.0 - bsdtar 3.3.2 - available by 'tar' alias - Curl 7.81.0 @@ -91,19 +90,19 @@ - Sox 14.4.2 - Subversion (SVN) 1.14.1 - Switchaudio-osx 1.1.0 -- zstd 1.5.1 +- zstd 1.5.2 ### Tools - Aliyun CLI 3.0.104 - App Center CLI 2.10.8 -- AWS CLI 2.4.11 +- AWS CLI 2.4.13 - AWS SAM CLI 1.37.0 - AWS Session Manager CLI 1.2.295.0 - Azure CLI 2.32.0 - Bicep CLI 0.4.1124 - Cabal 3.6.2.0 - Cmake 3.22.1 -- Fastlane 2.200.0 +- Fastlane 2.201.1 - GHC 9.2.1 - GHCup 0.1.17.4 - Jazzy 0.14.1 @@ -113,17 +112,17 @@ - Xcode Command Line Tools 13.2.0.0.1.1638488800 ### Linters -- SwiftLint 0.45.1 +- SwiftLint 0.46.0 - yamllint 1.26.3 ### Browsers - Safari 15.2 (16612.3.6.1.8) - SafariDriver 15.2 (16612.3.6.1.8) -- Google Chrome 97.0.4692.71 +- Google Chrome 97.0.4692.99 - ChromeDriver 97.0.4692.71 -- Microsoft Edge 97.0.1072.62 -- MSEdgeDriver 97.0.1072.62 -- Mozilla Firefox 96.0.1 +- Microsoft Edge 97.0.1072.69 +- MSEdgeDriver 97.0.1072.69 +- Mozilla Firefox 96.0.2 - geckodriver 0.30.0 - Selenium server 4.1.1 @@ -138,7 +137,7 @@ | Version | Vendor | Environment Variable | | ------------------- | --------------- | -------------------- | | 8.0.312+7 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | -| 11.0.13+8 | Eclipse Temurin | JAVA_HOME_11_X64 | +| 11.0.14+9 | Eclipse Temurin | JAVA_HOME_11_X64 | | 17.0.1+12 | Eclipse Temurin | JAVA_HOME_17_X64 | ### Cached Tools @@ -174,8 +173,8 @@ ### Rust Tools - Cargo 1.58.0 -- Rust 1.58.0 -- Rustdoc 1.58.0 +- Rust 1.58.1 +- Rustdoc 1.58.1 - Rustup 1.24.3 #### Packages @@ -205,14 +204,14 @@ ### Xamarin #### Visual Studio for Mac -- 8.10.16.2 +- 8.10.17.2 #### Xamarin bundles | symlink | Xamarin.Mono | Xamarin.iOS | Xamarin.Mac | Xamarin.Android | | ----------------- | ------------ | ----------- | ----------- | --------------- | -| 6_12_12 | 6.12 | 15.4 | 8.4 | 12.0 | +| 6_12_12 (default) | 6.12 | 15.4 | 8.4 | 12.0 | | 6_12_11 | 6.12 | 15.2 | 8.2 | 12.0 | -| 6_12_10 (default) | 6.12 | 15.0 | 7.14 | 11.3 | +| 6_12_10 | 6.12 | 15.0 | 7.14 | 11.3 | | 6_12_9 | 6.12 | 14.20 | 7.14 | 11.3 | | 6_12_8 | 6.12 | 14.16 | 7.10 | 11.2 | | 6_12_7 | 6.12 | 14.14 | 7.8 | 11.2 | @@ -228,15 +227,15 @@ - NUnit 3.6.1 ### Xcode -| Version | Build | Path | -| -------------- | -------- | ------------------------------ | -| 13.2.1 | 13C100 | /Applications/Xcode_13.2.1.app | -| 13.2 | 13C90 | /Applications/Xcode_13.2.app | -| 13.1 (default) | 13A1030d | /Applications/Xcode_13.1.app | -| 13.0 | 13A233 | /Applications/Xcode_13.0.app | -| 12.5.1 | 12E507 | /Applications/Xcode_12.5.1.app | -| 12.4 | 12D4e | /Applications/Xcode_12.4.app | -| 11.7 | 11E801a | /Applications/Xcode_11.7.app | +| Version | Build | Path | +| ---------------- | -------- | ------------------------------ | +| 13.2.1 (default) | 13C100 | /Applications/Xcode_13.2.1.app | +| 13.2 | 13C90 | /Applications/Xcode_13.2.app | +| 13.1 | 13A1030d | /Applications/Xcode_13.1.app | +| 13.0 | 13A233 | /Applications/Xcode_13.0.app | +| 12.5.1 | 12E507 | /Applications/Xcode_12.5.1.app | +| 12.4 | 12D4e | /Applications/Xcode_12.4.app | +| 11.7 | 11E801a | /Applications/Xcode_11.7.app | #### Xcode Support Tools - xcpretty 0.3.0 From f54d2c7df55ea4ca2941446aff33ca03b4e2942f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 28 Jan 2022 09:21:09 +0000 Subject: [PATCH 0926/3485] Updating readme file for win19 version 20220123.1 (#4945) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2019-Readme.md | 71 +++++++++++++++++--------------- 1 file changed, 37 insertions(+), 34 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index fec1c92621b0..cfc2ccf0e613 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -2,13 +2,12 @@ |-| | [[All OSs] .NET 2.1 will be removed from the images on February, 21](https://github.com/actions/virtual-environments/issues/4871) | | [windows-latest workflows will use Windows Server 2022](https://github.com/actions/virtual-environments/issues/4856) | -| [[All OSs] Az PowerShell Module will be upgraded to 7.1.0 on January, 17](https://github.com/actions/virtual-environments/issues/4841) | | [[All OSs] Python version 3.5 will be removed from the images on January 24, 2022](https://github.com/actions/virtual-environments/issues/4744) | | [Windows-2016 environment will be removed on March 15, 2022](https://github.com/actions/virtual-environments/issues/4312) | *** # Microsoft Windows Server 2019 Datacenter -- OS Version: 10.0.17763 Build 2452 -- Image Version: 20220116.1 +- OS Version: 10.0.17763 Build 2458 +- Image Version: 20220123.1 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -22,13 +21,13 @@ - LLVM 13.0.0 - Node 16.13.2 - Perl 5.32.1 -- PHP 8.1.1 +- PHP 8.1.2 - Python 3.7.9 - Ruby 2.5.9p229 ### Package Management -- Chocolatey 0.11.3 -- Composer 2.2.4 +- Chocolatey 0.12.0 +- Composer 2.2.5 - Helm 3.7.2 - Miniconda 4.10.3 (pre-installed on the image but not added to PATH) - NPM 8.1.2 @@ -36,7 +35,7 @@ - pip 21.3.1 (python 3.7) - Pipx 1.0.0 - RubyGems 2.7.6.3 -- Vcpkg (build from master \<bba8794b8>) +- Vcpkg (build from master \<df40d1c47>) - Yarn 1.22.17 #### Environment variables @@ -55,30 +54,30 @@ - 7zip 21.07 - aria2 1.36.0 - azcopy 10.13.0 -- Bazel 4.2.2 +- Bazel 5.0.0 - Bazelisk 1.11.0 - Bicep 0.4.1124 - Cabal 3.6.2.0 - CMake 3.22.1 -- CodeQL Action Bundle 2.7.3 +- CodeQL Action Bundle 2.7.5 - Docker 20.10.7 - Docker-compose 1.29.2 - Docker-wincred 0.6.4 - ghc 9.2.1 - Git 2.34.1 - Git LFS 3.0.2 -- Google Cloud SDK 368.0.0 +- Google Cloud SDK 369.0.0 - InnoSetup 6.2.0 - jq 1.6 - Kind 0.11.1 -- Kubectl 1.23.1 +- Kubectl 1.23.2 - Mercurial 5.0 - Mingw-w64 8.1.0 - Newman 5.3.1 - NSIS v3.08 - OpenSSL 1.1.1 - Packer 1.7.8 -- Parcel 2.2.0 +- Parcel 2.2.1 - Pulumi v3.22.1 - R 4.1.2 - Service Fabric SDK 8.2.1363.9590 @@ -89,11 +88,11 @@ - WinAppDriver 1.2.2009.02003 - WiX Toolset v3.11.2.4516 - yamllint 1.26.3 -- zstd 1.5.1 +- zstd 1.5.2 ### CLI Tools - Alibaba Cloud CLI 3.0.104 -- AWS CLI 2.4.11 +- AWS CLI 2.4.13 - AWS SAM CLI 1.37.0 - AWS Session Manager CLI 1.2.295.0 - Azure CLI 2.32.0 @@ -104,8 +103,8 @@ ### Rust Tools - Cargo 1.58.0 -- Rust 1.58.0 -- Rustdoc 1.58.0 +- Rust 1.58.1 +- Rustdoc 1.58.1 - Rustup 1.24.3 #### Packages @@ -117,11 +116,11 @@ - Rustfmt 1.4.38 ### Browsers and webdrivers -- Google Chrome 97.0.4692.71 +- Google Chrome 97.0.4692.99 - Chrome Driver 97.0.4692.71 -- Microsoft Edge 97.0.1072.62 -- Microsoft Edge Driver 97.0.1072.62 -- Mozilla Firefox 96.0.1 +- Microsoft Edge 97.0.1072.69 +- Microsoft Edge Driver 97.0.1072.69 +- Mozilla Firefox 96.0.2 - Gecko Driver 0.30.0 - IE Driver 3.150.1.1 - Selenium server 4.1.0 @@ -138,7 +137,7 @@ | Version | Vendor | Environment Variable | | ------------------- | --------------- | -------------------- | | 8.0.312+7 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | -| 11.0.13+8 | Eclipse Temurin | JAVA_HOME_11_X64 | +| 11.0.14+9 | Eclipse Temurin | JAVA_HOME_11_X64 | | 13.0.2+8.1 | Adopt OpenJDK | JAVA_HOME_13_X64 | | 17.0.1+12 | Eclipse Temurin | JAVA_HOME_17_X64 | @@ -181,7 +180,6 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Version | Architecture | | ------- | ------------ | | 2.7.18 | x64, x86 | -| 3.5.4 | x64, x86 | | 3.6.8 | x64, x86 | | 3.7.9 (Default) | x64, x86 | | 3.8.10 | x64, x86 | @@ -224,9 +222,10 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | 5.0.5.0 | MongoDB | Running | Automatic | ### Database tools -- Azure CosmosDb Emulator 2.14.4.0 +- Azure CosmosDb Emulator 2.14.5.0 - DacFx 15.0.5282.3 -- MySQL 5.7.36.0 +- MySQL 5.7.37.0 +- SQL OLEDB Driver 18.6.3.0 - SQLPS 1.0 ### Web Servers @@ -264,9 +263,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Component.Unreal | 16.1.28810.153 | | Component.Unreal.Android | 16.1.28810.153 | | Component.VSInstallerProjects | 1.0.1 | -| Component.WixToolset.VisualStudioExtension.Dev16 | 1.0.0.4 | -| Component.WixToolset.VisualStudioExtension.Schemas3 | 1.0.0.4 | -| Component.WixToolset.VisualStudioExtension.Schemas4 | 1.0.0.4 | +| Component.WixToolset.VisualStudioExtension.Dev16 | 1.0.0.18 | +| Component.WixToolset.VisualStudioExtension.Schemas3 | 1.0.0.18 | +| Component.WixToolset.VisualStudioExtension.Schemas4 | 1.0.0.18 | | Component.Xamarin | 16.10.31205.252 | | Component.Xamarin.RemotedSimulator | 16.10.31205.252 | | Microsoft.Component.Azure.DataLake.Tools | 16.10.31205.252 | @@ -474,7 +473,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Windows Driver Kit | 10.0.21381.0 | | Windows Driver Kit Visual Studio Extension | 10.1.22000.1 | | Windows Software Development Kit Extension | 10.1.22000.194 | -| WIX Toolset Studio 2019 Extension | 1.0.0.4 | +| WIX Toolset Studio 2019 Extension | 1.0.0.18 | +| WixToolset.WixToolsetVisualStudio2019Extension | 1.0.0.18 | #### Microsoft Visual C++: | Name | Architecture | Version | @@ -516,6 +516,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. `Location C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX <version> Tools` - 4.7.2 4.8 +### .NET tools +- nbgv 3.4.255+06fb9182bf + ### PowerShell Tools - PowerShell 7.2.1 @@ -536,7 +539,7 @@ All other versions are saved but not installed. | ------------------ | ---------------- | | DockerMsftProvider | 1.0.0.8 | | MarkdownPS | 1.9 | -| Microsoft.Graph | 1.9.1 | +| Microsoft.Graph | 1.9.2 | | Pester | 3.4.0<br>5.3.1 | | PowerShellGet | 1.0.0.1<br>2.2.5 | | PSScriptAnalyzer | 1.20.0 | @@ -573,10 +576,10 @@ All other versions are saved but not installed. ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:734b4d925e1dcd6c60d7a1bc61c67d6d1cb6160fd178954c6d71cd42b335e274 | 2022-01-12 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:197c6b07cf3093847fa6daeb389304c8ae5f9a90484f51fed83c13bb1ea73e19 | 2022-01-12 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:e02e0953f0476a685c0ab485f06a246c32329760f5cfb76d3fc7bdc47633f5d2 | 2022-01-12 | -| mcr.microsoft.com/windows/nanoserver:1809 | sha256:f19f6870d061a5e630263e5fb716dd1cab4921691ef2fbea05c102544e244979 | 2022-01-07 | -| mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:4735f8590820d8741a94524e8ad53921ed0fea0002cc5214f594861ad9ee1f3d | 2022-01-07 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:04a11344139d5af207a1e9197878475b88560e67c85ecbcd6e8b87d45a8fa98f | 2022-01-20 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:7ef94f677d6a5d3c075c8206cdea1452a72e95b4fb9c0bd4f4d51df7a6ba166a | 2022-01-20 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:a4f0c42bae2e533d46ea6a898741cd2b10e11a2c505e8c4ff23329cc3605eb64 | 2022-01-20 | +| mcr.microsoft.com/windows/nanoserver:1809 | sha256:a608d7e96462ad9de894c98de74ac5c08c4624a40c6332d78d3a38c1939e1f62 | 2022-01-18 | +| mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:ab693245cc2f6c018a5718b9ded9eac109629e207907df81991f449d138cd85c | 2022-01-18 | From 6865a4ccfe6c5bcf5ac3a96c4eb84d035136903c Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Fri, 28 Jan 2022 14:18:57 +0300 Subject: [PATCH 0927/3485] Update DACX 150 -> 160 path (#4966) --- images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 | 2 +- images/win/scripts/Tests/Tools.Tests.ps1 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 index a6b83f761ac3..c092494b7d24 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 @@ -292,7 +292,7 @@ function Get-VisualCPPComponents { } function Get-DacFxVersion { - $dacfxversion = & "$env:ProgramFiles\Microsoft SQL Server\150\DAC\bin\sqlpackage.exe" /version + $dacfxversion = & "$env:ProgramFiles\Microsoft SQL Server\160\DAC\bin\sqlpackage.exe" /version return "DacFx $dacfxversion" } diff --git a/images/win/scripts/Tests/Tools.Tests.ps1 b/images/win/scripts/Tests/Tools.Tests.ps1 index 712dda60147d..4476a43b3f8c 100644 --- a/images/win/scripts/Tests/Tools.Tests.ps1 +++ b/images/win/scripts/Tests/Tools.Tests.ps1 @@ -41,7 +41,7 @@ Describe "R" { Describe "DACFx" { It "DACFx" { (Get-ItemProperty HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\*).DisplayName -Contains "Microsoft SQL Server Data-Tier Application Framework (x64)" | Should -BeTrue - $sqlPackagePath = 'C:\Program Files\Microsoft SQL Server\150\DAC\bin\SqlPackage.exe' + $sqlPackagePath = 'C:\Program Files\Microsoft SQL Server\160\DAC\bin\SqlPackage.exe' "${sqlPackagePath}" | Should -Exist } From e5d8f5af5c5dfef051432b3cd33d5078331cc1b5 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Fri, 28 Jan 2022 16:20:44 +0300 Subject: [PATCH 0928/3485] [macOS] upgrade xcode to 13.3_beta1 (#4969) * [macOS] upgrade xcode to 13.3_beta1 * fix versioning --- images/macos/toolsets/toolset-12.json | 1 + 1 file changed, 1 insertion(+) diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index 1e549b9f6ab9..f6c8c1f1592f 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -2,6 +2,7 @@ "xcode": { "default": "13.2.1", "versions": [ + { "link": "13.3", "version": "13.3.0" }, { "link": "13.2.1", "version": "13.2.1" }, { "link": "13.2", "version": "13.2.0" }, { "link": "13.1", "version": "13.1.0" } From f09c8ab9f2be2e6ccdd502d53dec2aafc7cfe992 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Fri, 28 Jan 2022 21:08:32 +0300 Subject: [PATCH 0929/3485] Change installation method to portable (#4967) --- images/macos/provision/core/swiftlint.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/images/macos/provision/core/swiftlint.sh b/images/macos/provision/core/swiftlint.sh index b4bb7e3f4143..4fc0b62ed590 100644 --- a/images/macos/provision/core/swiftlint.sh +++ b/images/macos/provision/core/swiftlint.sh @@ -2,9 +2,11 @@ source ~/utils/utils.sh echo "Install SwiftLint" -swiftlintUrl=$(curl -H "Authorization: token $API_PAT" -s "https://api.github.com/repos/realm/SwiftLint/releases/latest" | jq -r '.assets[].browser_download_url | select(contains("SwiftLint.pkg"))') -download_with_retries $swiftlintUrl "/tmp" "SwiftLint.pkg" -sudo installer -pkg /tmp/SwiftLint.pkg -target / -rm -rf /tmp/SwiftLint.pkg +swiftlintUrl=$(curl -H "Authorization: token $API_PAT" -s "https://api.github.com/repos/realm/SwiftLint/releases/latest" | jq -r '.assets[].browser_download_url | select(contains("portable_swiftlint.zip"))') +download_with_retries $swiftlintUrl "/tmp" "portable_swiftlint.zip" +unzip -q "/tmp/portable_swiftlint.zip" -d /usr/local/bin +# Remove the LICENSE file that comes along with the binary and the downloaded archive +rm -rf "/usr/local/bin/LICENSE" +rm -rf "/tmp/portable_swiftlint.zip" invoke_tests "Linters" "SwiftLint" From 1a20af2405464a0377748f5ec3f0b64c7242efef Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Sat, 29 Jan 2022 13:00:14 +0300 Subject: [PATCH 0930/3485] Update dotnet tool path (#4961) --- images/win/scripts/Installers/Install-DotnetSDK.ps1 | 2 +- images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 | 2 +- images/win/scripts/Tests/DotnetSDK.Tests.ps1 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/images/win/scripts/Installers/Install-DotnetSDK.ps1 b/images/win/scripts/Installers/Install-DotnetSDK.ps1 index 6a4ced4561ee..54f7f40b8cb0 100644 --- a/images/win/scripts/Installers/Install-DotnetSDK.ps1 +++ b/images/win/scripts/Installers/Install-DotnetSDK.ps1 @@ -114,7 +114,7 @@ function InstallTools() ForEach ($dotnetTool in $dotnetTools) { - dotnet tool install $($dotnetTool.name) --tool-path "C:\Users\Default.dotnet\tools" --add-source https://api.nuget.org/v3/index.json | Out-Null + dotnet tool install $($dotnetTool.name) --tool-path "C:\Users\Default\.dotnet\tools" --add-source https://api.nuget.org/v3/index.json | Out-Null } } diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 index 172244c4ba2a..7c3d879f4f80 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 @@ -201,7 +201,7 @@ function Get-DotnetSdks { } function Get-DotnetTools { - $env:Path += ";C:\Users\Default.dotnet\tools" + $env:Path += ";C:\Users\Default\.dotnet\tools" $dotnetTools = (Get-ToolsetContent).dotnet.tools $toolsList = @() diff --git a/images/win/scripts/Tests/DotnetSDK.Tests.ps1 b/images/win/scripts/Tests/DotnetSDK.Tests.ps1 index 3ad3e7420e70..b7f3649988b2 100644 --- a/images/win/scripts/Tests/DotnetSDK.Tests.ps1 +++ b/images/win/scripts/Tests/DotnetSDK.Tests.ps1 @@ -24,7 +24,7 @@ Describe "Dotnet SDK and tools" { } Context "Dotnet tools" { - $env:Path += ";C:\Users\Default.dotnet\tools" + $env:Path += ";C:\Users\Default\.dotnet\tools" $testCases = $dotnetTools | ForEach-Object { @{ ToolName = $_.name; TestInstance = $_.test }} It "<ToolName> is available" -TestCases $testCases { From e6c832339c75e8da7f7417e197783e506834966d Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Sat, 29 Jan 2022 16:21:25 +0300 Subject: [PATCH 0931/3485] [macOS] change miniconda directory permissions (#4963) --- images/macos/provision/core/miniconda.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/images/macos/provision/core/miniconda.sh b/images/macos/provision/core/miniconda.sh index 86f1c90dd6c2..c6eda7377c25 100644 --- a/images/macos/provision/core/miniconda.sh +++ b/images/macos/provision/core/miniconda.sh @@ -5,6 +5,9 @@ curl -sL https://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh chmod +x $MINICONDA_INSTALLER sudo $MINICONDA_INSTALLER -b -p /usr/local/miniconda +# Chmod with full permissions recursively to avoid permissions restrictions +sudo chmod 777 -R /usr/local/miniconda + sudo ln -s /usr/local/miniconda/bin/conda /usr/local/bin/conda if [ -d "$HOME/.conda" ]; then From 02547255ff32628a1584be67e1b337b2be49785d Mon Sep 17 00:00:00 2001 From: Nikolay Frolov <90333448+nikolai-frolov@users.noreply.github.com> Date: Sat, 29 Jan 2022 19:28:21 +0300 Subject: [PATCH 0932/3485] [Ubuntu] Add .NET SDK 6.0 (#4958) --- images/linux/scripts/installers/dotnetcore-sdk.sh | 10 +++++++--- images/linux/toolsets/toolset-1804.json | 6 ++++-- images/linux/toolsets/toolset-2004.json | 6 ++++-- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/images/linux/scripts/installers/dotnetcore-sdk.sh b/images/linux/scripts/installers/dotnetcore-sdk.sh index 69af71797782..36c50d4a8bfb 100644 --- a/images/linux/scripts/installers/dotnetcore-sdk.sh +++ b/images/linux/scripts/installers/dotnetcore-sdk.sh @@ -32,12 +32,16 @@ for version in ${DOTNET_VERSIONS[@]}; do release_url="https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/${version}/releases.json" download_with_retries "${release_url}" "." "${version}.json" releases=$(cat "./${version}.json") - sdks=("${sdks[@]}" $(echo "${releases}" | jq '.releases[]' | jq '.sdk.version')) - sdks=("${sdks[@]}" $(echo "${releases}" | jq '.releases[]' | jq '.sdks[]?' | jq '.version')) + if [[ $version == "6.0" ]]; then + sdks=("${sdks[@]}" $(echo "${releases}" | jq -r 'first(.releases[].sdks[]?.version | select(contains("preview") or contains("rc") | not))')) + else + sdks=("${sdks[@]}" $(echo "${releases}" | jq -r '.releases[].sdk.version | select(contains("preview") or contains("rc") | not)')) + sdks=("${sdks[@]}" $(echo "${releases}" | jq -r '.releases[].sdks[]?.version | select(contains("preview") or contains("rc") | not)')) + fi rm ./${version}.json done -sortedSdks=$(echo ${sdks[@]} | tr ' ' '\n' | grep -v preview | grep -v rc | grep -v display | cut -d\" -f2 | sort -r | uniq -w 5) +sortedSdks=$(echo ${sdks[@]} | tr ' ' '\n' | sort -r | uniq -w 5) extract_dotnet_sdk() { local ARCHIVE_NAME="$1" diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index 8f7185b466e9..7110cd3b8372 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -247,12 +247,14 @@ "dotnet": { "aptPackages": [ "dotnet-sdk-3.1", - "dotnet-sdk-5.0" + "dotnet-sdk-5.0", + "dotnet-sdk-6.0" ], "versions": [ "2.1", "3.1", - "5.0" + "5.0", + "6.0" ], "tools": [ { "name": "nbgv", "test": "nbgv --version", "getversion" : "nbgv --version" } diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index 2f0cd4a1e4f7..5a4d140cd8cf 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -247,12 +247,14 @@ "dotnet": { "aptPackages": [ "dotnet-sdk-3.1", - "dotnet-sdk-5.0" + "dotnet-sdk-5.0", + "dotnet-sdk-6.0" ], "versions": [ "2.1", "3.1", - "5.0" + "5.0", + "6.0" ], "tools": [ { "name": "nbgv", "test": "nbgv --version", "getversion" : "nbgv --version" } From b8d14c9f54ee71b2a4320ef312d25d5cb736b295 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Mon, 31 Jan 2022 20:23:56 +0300 Subject: [PATCH 0933/3485] [Ubuntu] bind google-cloud-sdk version (#4984) * [Ubuntu] bind google-cloud-sdk version * Update google-cloud-sdk.sh --- images/linux/scripts/installers/google-cloud-sdk.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/images/linux/scripts/installers/google-cloud-sdk.sh b/images/linux/scripts/installers/google-cloud-sdk.sh index f2b826264f34..bb11df28db08 100644 --- a/images/linux/scripts/installers/google-cloud-sdk.sh +++ b/images/linux/scripts/installers/google-cloud-sdk.sh @@ -10,7 +10,8 @@ REPO_URL="https://packages.cloud.google.com/apt" echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] $REPO_URL cloud-sdk main" | sudo tee -a /etc/apt/sources.list.d/google-cloud-sdk.list curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | sudo apt-key --keyring /usr/share/keyrings/cloud.google.gpg add - sudo apt-get update -y -sudo apt-get install -y google-cloud-sdk +# temporary downgrade google-cloud-sdk as python component has linking bugs +sudo apt-get install -y google-cloud-sdk=369.0.0-0 # remove apt rm /etc/apt/sources.list.d/google-cloud-sdk.list @@ -19,4 +20,4 @@ rm /usr/share/keyrings/cloud.google.gpg /usr/share/keyrings/cloud.google.gpg~ # add repo to the apt-sources.txt echo "google-cloud-sdk $REPO_URL" >> $HELPER_SCRIPTS/apt-sources.txt -invoke_tests "CLI.Tools" "Google Cloud SDK" \ No newline at end of file +invoke_tests "CLI.Tools" "Google Cloud SDK" From 447d3b898898dff7f2acc9f9d6051bd2cf0e31bf Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Tue, 1 Feb 2022 11:23:03 +0300 Subject: [PATCH 0934/3485] [macOS] fix operands order on miniconda (#4989) --- images/macos/provision/core/miniconda.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/macos/provision/core/miniconda.sh b/images/macos/provision/core/miniconda.sh index c6eda7377c25..1032afdf8da1 100644 --- a/images/macos/provision/core/miniconda.sh +++ b/images/macos/provision/core/miniconda.sh @@ -6,7 +6,7 @@ chmod +x $MINICONDA_INSTALLER sudo $MINICONDA_INSTALLER -b -p /usr/local/miniconda # Chmod with full permissions recursively to avoid permissions restrictions -sudo chmod 777 -R /usr/local/miniconda +sudo chmod -R 777 /usr/local/miniconda sudo ln -s /usr/local/miniconda/bin/conda /usr/local/bin/conda From 05025ab26361f1734e6bd119004034d04acfd360 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Tue, 1 Feb 2022 16:27:06 +0300 Subject: [PATCH 0935/3485] Add bug report label and mention discussions (#4995) --- .github/ISSUE_TEMPLATE/bug-report.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml index fea945a8cf11..8d1c78b7e40f 100644 --- a/.github/ISSUE_TEMPLATE/bug-report.yml +++ b/.github/ISSUE_TEMPLATE/bug-report.yml @@ -1,6 +1,6 @@ name: Bug Report -description: Submit a bug report -labels: [needs triage] +description: Submit a bug report. If you have a question please use [the discussions](https://github.com/actions/virtual-environments/discussions) section. +labels: [bug report, needs triage] body: - type: textarea attributes: @@ -28,7 +28,7 @@ body: Image version where you are experiencing the issue. Where to find image version in build logs: 1. For GitHub Actions, under "Set up job" -> "Virtual Environment" -> "Version". 2. For Azure DevOps, under "Initialize job" -> "Virtual Environment" -> "Version". - + If you have a public example, please, provide a link to the failed build. validations: required: true @@ -51,5 +51,5 @@ body: A description with steps to reproduce the issue. 1. Step 1 2. Step 2 - validations: + validations: required: true \ No newline at end of file From aeebda1fcf2c3706478dc0eab06d49d192b0bebc Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Tue, 1 Feb 2022 19:30:12 +0300 Subject: [PATCH 0936/3485] Add an option to proceed to the discussions sections (#4997) * Update bug-report.yml * Update config.yml --- .github/ISSUE_TEMPLATE/bug-report.yml | 4 ++-- .github/ISSUE_TEMPLATE/config.yml | 7 ++++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml index 8d1c78b7e40f..be9e46b67bc3 100644 --- a/.github/ISSUE_TEMPLATE/bug-report.yml +++ b/.github/ISSUE_TEMPLATE/bug-report.yml @@ -1,5 +1,5 @@ name: Bug Report -description: Submit a bug report. If you have a question please use [the discussions](https://github.com/actions/virtual-environments/discussions) section. +description: Submit a bug report. labels: [bug report, needs triage] body: - type: textarea @@ -52,4 +52,4 @@ body: 1. Step 1 2. Step 2 validations: - required: true \ No newline at end of file + required: true diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index ec4bb386bcf8..63ccb7950c99 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -1 +1,6 @@ -blank_issues_enabled: false \ No newline at end of file +blank_issues_enabled: false + +contact_links: + - name: Get help in GitHub Discussions + url: https://github.com/actions/virtual-environments/discussions + about: Have a question? Feel free to ask in the virtual-environments GitHub Discussions! From 8eabd4605b2bd6009894926aeb32c7acea6d1e81 Mon Sep 17 00:00:00 2001 From: Maksim Shilov <89912354+shilovmaksim@users.noreply.github.com> Date: Wed, 2 Feb 2022 11:02:55 +0300 Subject: [PATCH 0937/3485] [MacOS] Add GraalVM to macOS 1015 and 11 images (#4959) * Add GraalVM to macOS 1015 and 11 images * Replace graalVM tests * Resolve comments * Fix native image install command path * Fixing graalvm root path in tests * Fix GRAALVM_11_ROOT path for software report * Fix function name --- images/macos/provision/core/graalvm.sh | 20 +++++++++++++++++++ .../SoftwareReport.Common.psm1 | 15 ++++++++++++++ .../SoftwareReport.Generator.ps1 | 4 ++++ images/macos/templates/macOS-10.15.json | 3 ++- images/macos/templates/macOS-11.json | 3 ++- images/macos/templates/macOS-12.json | 3 ++- images/macos/tests/Common.Tests.ps1 | 10 ++++++++++ 7 files changed, 55 insertions(+), 3 deletions(-) create mode 100644 images/macos/provision/core/graalvm.sh diff --git a/images/macos/provision/core/graalvm.sh b/images/macos/provision/core/graalvm.sh new file mode 100644 index 000000000000..62c8b2aba8e6 --- /dev/null +++ b/images/macos/provision/core/graalvm.sh @@ -0,0 +1,20 @@ +#!/bin/bash -e -o pipefail +source ~/utils/utils.sh + +echo Installing GraalVM... +brew install --cask graalvm/tap/graalvm-ce-java11 + +exportPath=$(echo /Library/Java/JavaVirtualMachines/graalvm-ce-java*/Contents/Home/bin) +echo "Setting up GRAALVM_11_ROOT variable to ${exportPath}" +echo "export GRAALVM_11_ROOT=${exportPath}" >> "${HOME}/.bashrc" + +# GraalVM not being signed and notarized yet on macOS Catalina +if is_Catalina; then + quarantinePath=$(echo /Library/Java/JavaVirtualMachines/graalvm-ce-java*) + sudo xattr -rd com.apple.quarantine $quarantinePath +fi + +# Install Native Image +$exportPath/gu install native-image + +invoke_tests "Common" "GraalVM" \ No newline at end of file diff --git a/images/macos/software-report/SoftwareReport.Common.psm1 b/images/macos/software-report/SoftwareReport.Common.psm1 index 2b30c2e72d47..290f934c23fa 100644 --- a/images/macos/software-report/SoftwareReport.Common.psm1 +++ b/images/macos/software-report/SoftwareReport.Common.psm1 @@ -549,3 +549,18 @@ function Build-PackageManagementEnvironmentTable { } } } + +function Get-GraalVMVersion { + $version = & "$env:GRAALVM_11_ROOT\java" --version | Select-String -Pattern "GraalVM" | Take-Part -Part 5,6 + return $version +} + +function Build-GraalVMTable { + $version = Get-GraalVMVersion + $envVariables = "GRAALVM_11_ROOT" + + return [PSCustomObject] @{ + "Version" = $version + "Environment variables" = $envVariables + } +} \ No newline at end of file diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1 index f77bc980e2e8..93154dfd813e 100644 --- a/images/macos/software-report/SoftwareReport.Generator.ps1 +++ b/images/macos/software-report/SoftwareReport.Generator.ps1 @@ -208,6 +208,10 @@ $markdown += New-MDHeader "Java" -Level 3 $markdown += Get-JavaVersions | New-MDTable $markdown += New-MDNewLine +$markdown += New-MDHeader "GraalVM" -Level 3 +$markdown += Build-GraalVMTable | New-MDTable +$markdown += New-MDNewLine + # Toolcache $markdown += Build-ToolcacheSection $markdown += New-MDNewLine diff --git a/images/macos/templates/macOS-10.15.json b/images/macos/templates/macOS-10.15.json index 9f130ad8ed27..4edf744a8d84 100644 --- a/images/macos/templates/macOS-10.15.json +++ b/images/macos/templates/macOS-10.15.json @@ -194,7 +194,8 @@ "./provision/core/xcode-postbuild.sh", "./provision/core/pypy.sh", "./provision/core/pipx-packages.sh", - "./provision/core/bicep.sh" + "./provision/core/bicep.sh", + "./provision/core/graalvm.sh" ], "environment_vars": [ "API_PAT={{user `github_api_pat`}}" diff --git a/images/macos/templates/macOS-11.json b/images/macos/templates/macOS-11.json index 01a086ac5ea0..10046d35b015 100644 --- a/images/macos/templates/macOS-11.json +++ b/images/macos/templates/macOS-11.json @@ -197,7 +197,8 @@ "./provision/core/firefox.sh", "./provision/core/pypy.sh", "./provision/core/pipx-packages.sh", - "./provision/core/bicep.sh" + "./provision/core/bicep.sh", + "./provision/core/graalvm.sh" ], "environment_vars": [ "API_PAT={{user `github_api_pat`}}" diff --git a/images/macos/templates/macOS-12.json b/images/macos/templates/macOS-12.json index e9c1de9d73a0..d79e86bc6393 100644 --- a/images/macos/templates/macOS-12.json +++ b/images/macos/templates/macOS-12.json @@ -196,7 +196,8 @@ "./provision/core/firefox.sh", "./provision/core/pypy.sh", "./provision/core/pipx-packages.sh", - "./provision/core/bicep.sh" + "./provision/core/bicep.sh", + "./provision/core/graalvm.sh" ], "environment_vars": [ "API_PAT={{user `github_api_pat`}}" diff --git a/images/macos/tests/Common.Tests.ps1 b/images/macos/tests/Common.Tests.ps1 index 9d05270fe67d..3c9a717e7cd0 100644 --- a/images/macos/tests/Common.Tests.ps1 +++ b/images/macos/tests/Common.Tests.ps1 @@ -103,4 +103,14 @@ Describe "Go" { It "Go" { "go version" | Should -ReturnZeroExitCode } +} + +Describe "GraalVM" { + It "graalvm" { + '$GRAALVM_11_ROOT/java -version' | Should -ReturnZeroExitCode + } + + It "native-image" { + '$GRAALVM_11_ROOT/native-image --version' | Should -ReturnZeroExitCode + } } \ No newline at end of file From 7dd1fab9d45982ad2c9e95c3782270b55ac490a3 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Wed, 2 Feb 2022 12:16:38 +0300 Subject: [PATCH 0938/3485] Add DslTools Component (#4988) --- images/win/toolsets/toolset-2022.json | 1 + 1 file changed, 1 insertion(+) diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index 4fedb5e3eb8d..9243b80c2111 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -183,6 +183,7 @@ "Microsoft.VisualStudio.Component.Azure.ServiceFabric.Tools", "Microsoft.VisualStudio.Component.Debugger.JustInTime", "Microsoft.VisualStudio.Component.EntityFramework", + "Microsoft.VisualStudio.Component.DslTools", "Microsoft.VisualStudio.Component.LinqToSql", "Microsoft.VisualStudio.Component.SQL.SSDT", "Microsoft.VisualStudio.Component.Sharepoint.Tools", From 3433056f5086c2ca21a9b336eade2ee17b0fbe79 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Wed, 2 Feb 2022 18:41:02 +0300 Subject: [PATCH 0939/3485] Add Component.MDD.Linux.GCC.arm component (#5000) --- images/win/toolsets/toolset-2022.json | 1 + 1 file changed, 1 insertion(+) diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index 9243b80c2111..efebe97ca54d 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -245,6 +245,7 @@ "Microsoft.VisualStudio.Workload.Universal", "Microsoft.VisualStudio.Workload.VisualStudioExtension", "Component.MDD.Linux", + "Component.MDD.Linux.GCC.arm", "wasm.tools" ], "vsix": [ From 3259f338d1d4cc0d32f4832efe581579e485abd3 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 3 Feb 2022 08:36:35 +0000 Subject: [PATCH 0940/3485] Updating readme file for ubuntu18 version 20220131.1 (#4994) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu1804-Readme.md | 67 +++++++++++++++---------------- 1 file changed, 33 insertions(+), 34 deletions(-) diff --git a/images/linux/Ubuntu1804-Readme.md b/images/linux/Ubuntu1804-Readme.md index 03af7ae80a78..1740af00787f 100644 --- a/images/linux/Ubuntu1804-Readme.md +++ b/images/linux/Ubuntu1804-Readme.md @@ -1,20 +1,19 @@ | Announcements | |-| | [[All OSs] .NET 2.1 will be removed from the images on February, 21](https://github.com/actions/virtual-environments/issues/4871) | -| [[All OSs] Az PowerShell Module will be upgraded to 7.1.0 on January, 17](https://github.com/actions/virtual-environments/issues/4841) | | [[Ubuntu] Issue with libstdc++ cannot allocate memory in static TLS block](https://github.com/actions/virtual-environments/issues/4799) | | [[All OSs] Python version 3.5 will be removed from the images on January 24, 2022](https://github.com/actions/virtual-environments/issues/4744) | *** # Ubuntu 18.04.6 LTS -- Linux kernel version: 5.4.0-1067-azure -- Image Version: 20220123.1 +- Linux kernel version: 5.4.0-1068-azure +- Image Version: 20220131.1 ## Installed Software ### Language and Runtime - Bash 4.4.20(1)-release - Clang 9.0.0 - Clang-format 9.0.0 -- Erlang 24.2 (Eshell 12.2) +- Erlang 24.2.1 (Eshell 12.2.1) - Erlang rebar3 3.18.0 - GNU C++ 7.5.0, 9.4.0, 10.3.0 - GNU Fortran 7.5.0, 9.4.0, 10.3.0 @@ -31,15 +30,15 @@ ### Package Management - cpan 1.64 -- Helm 3.7.2 -- Homebrew 3.3.11 +- Helm 3.8.0 +- Homebrew 3.3.13 - Miniconda 4.10.3 - Npm 8.1.2 - Pip 9.0.1 - Pip3 9.0.1 - Pipx 1.0.0 - RubyGems 2.7.6 -- Vcpkg (build from master \<df40d1c47>) +- Vcpkg (build from master \<ec7906796>) - Yarn 1.22.17 #### Environment variables @@ -55,29 +54,29 @@ - Sbt 1.6.1 ### Tools -- Ansible 2.11.7 +- Ansible 2.11.8 - apt-fast 1.9.12 - AzCopy 10.13.0 (available by `azcopy` and `azcopy10` aliases) - Bazel 5.0.0 - Bazelisk 1.11.0 - Bicep 0.4.1124 - Buildah 1.19.6 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- CMake 3.22.1 -- CodeQL Action Bundle 2.7.5 +- CMake 3.22.2 +- CodeQL Action Bundle 2.7.6 - Docker Compose v1 1.29.2 - Docker Compose v2 2.2.3+azure-1 - Docker-Buildx 0.7.1 - Docker-Moby Client 20.10.11+azure-3 - Docker-Moby Server 20.10.11+azure-3 -- Git 2.34.1 (apt source repository: ppa:git-core/ppa) +- Git 2.35.1 (apt source repository: ppa:git-core/ppa) - Git LFS 3.0.2 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.3.1 - Haveged 1.9.1 - Heroku 7.59.2 -- HHVM (HipHop VM) 4.145.0 +- HHVM (HipHop VM) 4.146.0 - jq 1.5 - Kind 0.11.1 -- Kubectl 1.23.2 +- Kubectl 1.23.3 - Kustomize 4.4.1 - Leiningen 2.9.8 - MediaInfo 17.12 @@ -91,19 +90,19 @@ - Parcel 2.2.1 - PhantomJS 2.1.1 - Podman 3.0.1 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- Pulumi 3.22.1 +- Pulumi 3.23.2 - R 4.1.2 - Skopeo 1.2.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 - SVN 1.9.7 - Terraform 1.1.4 - yamllint 1.26.3 -- yq 4.17.2 +- yq 4.18.1 - zstd 1.5.2 (homebrew) ### CLI Tools -- Alibaba Cloud CLI 3.0.104 -- AWS CLI 1.22.41 +- Alibaba Cloud CLI 3.0.107 +- AWS CLI 1.22.46 - AWS CLI Session manager plugin 1.2.295.0 - AWS SAM CLI 1.37.0 - Azure CLI (azure-cli) 2.32.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) @@ -111,8 +110,8 @@ - GitHub CLI 2.4.0 - Google Cloud SDK 369.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 8.13.0 -- OpenShift CLI 4.9.15 +- Netlify CLI 8.15.1 +- OpenShift CLI 4.9.17 - ORAS CLI 0.12.0 - Vercel CLI 23.1.2 @@ -127,7 +126,7 @@ ### PHP | Tool | Version | | -------- | ---------------------------------------- | -| PHP | 7.1.33 7.2.34 7.3.33 7.4.27 8.0.14 8.1.1 | +| PHP | 7.1.33 7.2.34 7.3.33 7.4.27 8.0.15 8.1.2 | | Composer | 2.2.5 | | PHPUnit | 8.5.23 | ``` @@ -169,13 +168,13 @@ | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | ### .NET Core SDK -- 2.1.302 2.1.403 2.1.526 2.1.617 2.1.701 2.1.818 3.1.120 3.1.202 3.1.302 3.1.416 5.0.104 5.0.210 5.0.303 5.0.404 +- 2.1.302 2.1.403 2.1.526 2.1.617 2.1.701 2.1.818 3.1.120 3.1.202 3.1.302 3.1.416 5.0.104 5.0.210 5.0.303 5.0.404 6.0.101 ### .NET tools - nbgv 3.4.255+06fb9182bf ### Databases -- MongoDB 5.0.5 (apt source repository: https://repo.mongodb.org/apt/ubuntu) +- MongoDB 5.0.6 (apt source repository: https://repo.mongodb.org/apt/ubuntu) - PostgreSQL 14.1 (apt source repository: https://apt.postgresql.org/pub/repos/apt/) - sqlite3 3.22.0 @@ -188,7 +187,7 @@ ``` #### MS SQL Server Client Tools - sqlcmd 17.8.0001.1 -- SqlPackage 15.0.5282.3 +- SqlPackage 16.0.5400.1 ### Cached Tools #### Go @@ -249,9 +248,9 @@ | Package Name | Version | | -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 4.0 | -| Android Emulator | 31.1.4 | +| Android Emulator | 31.2.6 | | Android SDK Build-tools | 32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3<br>26.0.0 26.0.1 26.0.2 26.0.3<br>25.0.0 25.0.1 25.0.2 25.0.3<br>24.0.0 24.0.1 24.0.2 24.0.3<br>23.0.1 23.0.2 23.0.3 | -| Android SDK Platform-Tools | 31.0.3 | +| Android SDK Platform-Tools | 32.0.0 | | Android SDK Platforms | android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3)<br>android-26 (rev 2)<br>android-25 (rev 3)<br>android-24 (rev 2)<br>android-23 (rev 3) | | Android SDK Tools | 26.1.1 | | Android Support Repository | 47.0.0 | @@ -277,18 +276,18 @@ | alpine:3.12 | sha256:d9459083f962de6bd980ae6a05be2a4cf670df6a1d898157bceb420342bec280 | 2021-11-12 | | alpine:3.13 | sha256:026f721af4cf2843e07bba648e158fb35ecc876d822130633cc49f707f0fc88c | 2021-11-12 | | alpine:3.14 | sha256:635f0aa53d99017b38d1a0aa5b2082f7812b03e3cdb299103fe77b5c8a07f1d2 | 2021-11-12 | -| buildpack-deps:bullseye | sha256:8cca6f729d85d572000a436eac498ff5358eeee5a0fa7b3e2b6668620c6ac06e | 2021-12-21 | -| buildpack-deps:buster | sha256:24cf4668129a284b9b960ffaa5e79f9654d7d040708721c8e7708811e362a9d9 | 2021-12-21 | -| buildpack-deps:stretch | sha256:19610095f7d1718c20d79e5109c42f64dabea9fdf104221394acdf2999170c51 | 2021-12-21 | -| debian:10 | sha256:94ccfd1c5115a6903cbb415f043a0b04e307be3f37b768cf6d6d3edff0021da3 | 2021-12-21 | -| debian:11 | sha256:2906804d2a64e8a13a434a1a127fe3f6a28bf7cf3696be4223b06276f32f1f2d | 2021-12-21 | -| debian:9 | sha256:54284a7a45383b407c1968657e8f1c50dc25b82d8d56b3812e46ad19f8bcfd83 | 2021-12-21 | +| buildpack-deps:bullseye | sha256:159126fd9e3b05c16a9cc4c2655e4a447effd7892e62b74b933e4a6cb370138e | 2022-01-26 | +| buildpack-deps:buster | sha256:64b00dac65b9ed4db078361a816e24e888e6ae926e43524b79f6fba424e8b6c8 | 2022-01-26 | +| buildpack-deps:stretch | sha256:3004c958ffa89199f04e8735d583c42ee3885c9c77daa4134930fe68eeee59c4 | 2022-01-26 | +| debian:10 | sha256:fde7a280413ec0122bd3a14dc76ba152f89cae999f3b8efe8784100df3640763 | 2022-01-26 | +| debian:11 | sha256:fb45fd4e25abe55a656ca69a7bef70e62099b8bb42a279a5e0ea4ae1ab410e0d | 2022-01-26 | +| debian:9 | sha256:4bb600434787c903886fe33526d19ff33114a33b433a4a4cdbdf9b8543f1ab5d | 2022-01-26 | | moby/buildkit:latest | sha256:d6c89b7085b106301645ddcc77cf64eb7b705ab507b72d52d130ac33f1300417 | 2021-11-18 | -| node:12 | sha256:04334b2efca8f5f23d246ce8818fe358c2c0116819e5fd043e7929cae6ca7398 | 2022-01-11 | +| node:12 | sha256:07ae688134d80b6359311641cc6fff6947108213367f7f3e0002a829464700dc | 2022-01-27 | | node:12-alpine | sha256:c3e7817c8fd124f1597cd66124d247db8e138e8ef311ba085b7104d900129d0b | 2022-01-12 | -| node:14 | sha256:50d4540794db9bdbd423a5823c4d840fc2ba0b9c82d71b059ff34b4aeb3e328f | 2022-01-11 | +| node:14 | sha256:252f6cef16c7f9abde7c10c983c02d6db8638c8caf559865a5958339b6575059 | 2022-01-27 | | node:14-alpine | sha256:a9b200d25469261a4cccde176db08ec9f0b5799fa4220d8edfe57e69684c6dad | 2022-01-11 | -| node:16 | sha256:4b0b5c3db44f567d5d25c80a6fe33a981d911cdae20b39d2395be268aea2cb97 | 2022-01-11 | +| node:16 | sha256:2033f4cc18f9d8b5d0baa7f276aaeffd202e1a2c6fe9af408af05a34fe68cbfb | 2022-01-27 | | node:16-alpine | sha256:2f50f4a428f8b5280817c9d4d896dbee03f072e93f4e0c70b90cc84bd1fcfe0d | 2022-01-12 | | ubuntu:16.04 | sha256:0f71fa8d4d2d4292c3c617fda2b36f6dabe5c8b6e34c3dc5b0d17d4e704bd39c | 2021-08-31 | | ubuntu:18.04 | sha256:37b7471c1945a2a12e5a57488ee4e3e216a8369d0b9ee1ec2e41db9c2c1e3d22 | 2022-01-07 | From 29907e0bf074d38f5569b40e0b7df6e11b881db3 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 3 Feb 2022 11:08:21 +0000 Subject: [PATCH 0941/3485] Updating readme file for win16 version 20220131.1 (#4990) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2016-Readme.md | 44 ++++++++++++++++---------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/images/win/Windows2016-Readme.md b/images/win/Windows2016-Readme.md index 0c7a0fb00bb4..b46da1bb82fd 100644 --- a/images/win/Windows2016-Readme.md +++ b/images/win/Windows2016-Readme.md @@ -7,11 +7,11 @@ *** # Microsoft Windows Server 2016 Datacenter - OS Version: 10.0.14393 Build 4889 -- Image Version: 20220123.1 +- Image Version: 20220131.1 ## Installed Software ### Language and Runtime -- Bash 4.4.23(1)-release +- Bash 4.4.23(2)-release - Go 1.15.15 - Julia 1.7.1 - Kotlin 1.6.10 @@ -23,16 +23,16 @@ - Ruby 2.5.9p229 ### Package Management -- Chocolatey 0.12.0 +- Chocolatey 0.12.1 - Composer 2.2.5 - Helm 3.7.2 - Miniconda 4.10.3 (pre-installed on the image but not added to PATH) - NPM 8.1.2 - NuGet 6.0.0.280 -- pip 21.3.1 (python 3.7) +- pip 22.0.2 (python 3.7) - Pipx 1.0.0 - RubyGems 2.7.6.3 -- Vcpkg (build from master \<df40d1c47>) +- Vcpkg (build from master \<8518284c1>) - Yarn 1.22.17 #### Environment variables @@ -55,19 +55,19 @@ - Bazelisk 1.11.0 - Bicep 0.4.1124 - Cabal 3.6.2.0 -- CMake 3.22.1 -- CodeQL Action Bundle 2.7.5 +- CMake 3.22.2 +- CodeQL Action Bundle 2.7.6 - Docker 20.10.7 - Docker-compose 1.29.2 - Docker-wincred 0.6.4 - ghc 9.2.1 -- Git 2.34.1 +- Git 2.35.1 - Git LFS 3.0.2 -- Google Cloud SDK 369.0.0 +- Google Cloud SDK 370.0.0 - InnoSetup 6.2.0 - jq 1.6 - Kind 0.11.1 -- Kubectl 1.23.2 +- Kubectl 1.23.3 - Mercurial 5.0 - Mingw-w64 8.1.0 - Newman 5.3.1 @@ -75,7 +75,7 @@ - OpenSSL 1.1.1 - Packer 1.7.8 - Parcel 2.2.1 -- Pulumi v3.22.1 +- Pulumi v3.23.0 - R 4.1.2 - Service Fabric SDK 8.2.1363.9590 - Stack 2.7.3 @@ -88,8 +88,8 @@ - zstd 1.5.2 ### CLI Tools -- Alibaba Cloud CLI 3.0.104 -- AWS CLI 2.4.13 +- Alibaba Cloud CLI 3.0.107 +- AWS CLI 2.4.15 - AWS SAM CLI 1.37.0 - AWS Session Manager CLI 1.2.295.0 - Azure CLI 2.32.0 @@ -115,9 +115,9 @@ ### Browsers and webdrivers - Google Chrome 97.0.4692.99 - Chrome Driver 97.0.4692.71 -- Microsoft Edge 97.0.1072.69 -- Microsoft Edge Driver 97.0.1072.69 -- Mozilla Firefox 96.0.2 +- Microsoft Edge 97.0.1072.76 +- Microsoft Edge Driver 97.0.1072.76 +- Mozilla Firefox 96.0.3 - Gecko Driver 0.30.0 - IE Driver 3.150.1.1 - Selenium server 4.1.0 @@ -133,10 +133,10 @@ ### Java | Version | Vendor | Environment Variable | | ------------------- | --------------- | -------------------- | -| 8.0.312+7 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | +| 8.0.322+6 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | | 11.0.14+9 | Eclipse Temurin | JAVA_HOME_11_X64 | | 13.0.2+8.1 | Adopt OpenJDK | JAVA_HOME_13_X64 | -| 17.0.1+12 | Eclipse Temurin | JAVA_HOME_17_X64 | +| 17.0.2+8 | Eclipse Temurin | JAVA_HOME_17_X64 | ### Shells | Name | Target | @@ -212,11 +212,11 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### MongoDB | Version | ServiceName | ServiceStatus | ServiceStartType | | ------- | ----------- | ------------- | ---------------- | -| 5.0.5.0 | MongoDB | Running | Automatic | +| 5.0.6.0 | MongoDB | Running | Automatic | ### Database tools - Azure CosmosDb Emulator 2.14.5.0 -- DacFx 15.0.5282.3 +- DacFx 16.0.5400.1 - MySQL 5.7.37.0 - SQLPS 1.0 @@ -224,7 +224,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Name | Version | ConfigFile | ServiceName | ServiceStatus | ListenPort | | ------ | ------- | ------------------------------------- | ----------- | ------------- | ---------- | | Apache | 2.4.52 | C:\tools\Apache24\conf\httpd.conf | Apache | Stopped | 80 | -| Nginx | 1.21.5 | C:\tools\nginx-1.21.5\conf\nginx.conf | nginx | Stopped | 80 | +| Nginx | 1.21.6 | C:\tools\nginx-1.21.6\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2017 | Name | Version | Path | @@ -555,7 +555,7 @@ All other versions are saved but not installed. | Android Command Line Tools | 4.0 | | Android SDK Build-tools | 32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3<br>26.0.0 26.0.1 26.0.2 26.0.3<br>25.0.0 25.0.1 25.0.2 25.0.3<br>24.0.0 24.0.1 24.0.2 24.0.3<br>23.0.1 23.0.2 23.0.3<br>22.0.1<br>21.1.2<br>20.0.0<br>19.1.0 | | Android SDK Platforms | android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3)<br>android-26 (rev 2)<br>android-25 (rev 3)<br>android-24 (rev 2)<br>android-23 (rev 3)<br>android-22 (rev 2)<br>android-21 (rev 2)<br>android-20 (rev 2)<br>android-19 (rev 4) | -| Android SDK Platform-Tools | 31.0.3 | +| Android SDK Platform-Tools | 32.0.0 | | Android SDK Tools | 25.2.5 | | Android Support Repository | 47.0.0 | | CMake | 3.10.2<br>3.18.1 | From 2ffa5631f5e997669dbf079f7bcb3aab602e31b1 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 3 Feb 2022 14:01:48 +0000 Subject: [PATCH 0942/3485] Updating readme file for win19 version 20220131.1 (#4991) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2019-Readme.md | 48 ++++++++++++++++---------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index cfc2ccf0e613..7e25c17404ae 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -7,14 +7,14 @@ *** # Microsoft Windows Server 2019 Datacenter - OS Version: 10.0.17763 Build 2458 -- Image Version: 20220123.1 +- Image Version: 20220131.1 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] ## Installed Software ### Language and Runtime -- Bash 4.4.23(1)-release +- Bash 4.4.23(2)-release - Go 1.15.15 - Julia 1.7.1 - Kotlin 1.6.10 @@ -26,16 +26,16 @@ - Ruby 2.5.9p229 ### Package Management -- Chocolatey 0.12.0 +- Chocolatey 0.12.1 - Composer 2.2.5 - Helm 3.7.2 - Miniconda 4.10.3 (pre-installed on the image but not added to PATH) - NPM 8.1.2 - NuGet 6.0.0.280 -- pip 21.3.1 (python 3.7) +- pip 22.0.2 (python 3.7) - Pipx 1.0.0 - RubyGems 2.7.6.3 -- Vcpkg (build from master \<df40d1c47>) +- Vcpkg (build from master \<8518284c1>) - Yarn 1.22.17 #### Environment variables @@ -58,19 +58,19 @@ - Bazelisk 1.11.0 - Bicep 0.4.1124 - Cabal 3.6.2.0 -- CMake 3.22.1 -- CodeQL Action Bundle 2.7.5 +- CMake 3.22.2 +- CodeQL Action Bundle 2.7.6 - Docker 20.10.7 - Docker-compose 1.29.2 - Docker-wincred 0.6.4 - ghc 9.2.1 -- Git 2.34.1 +- Git 2.35.1 - Git LFS 3.0.2 -- Google Cloud SDK 369.0.0 +- Google Cloud SDK 370.0.0 - InnoSetup 6.2.0 - jq 1.6 - Kind 0.11.1 -- Kubectl 1.23.2 +- Kubectl 1.23.3 - Mercurial 5.0 - Mingw-w64 8.1.0 - Newman 5.3.1 @@ -78,7 +78,7 @@ - OpenSSL 1.1.1 - Packer 1.7.8 - Parcel 2.2.1 -- Pulumi v3.22.1 +- Pulumi v3.23.0 - R 4.1.2 - Service Fabric SDK 8.2.1363.9590 - Stack 2.7.3 @@ -91,8 +91,8 @@ - zstd 1.5.2 ### CLI Tools -- Alibaba Cloud CLI 3.0.104 -- AWS CLI 2.4.13 +- Alibaba Cloud CLI 3.0.107 +- AWS CLI 2.4.15 - AWS SAM CLI 1.37.0 - AWS Session Manager CLI 1.2.295.0 - Azure CLI 2.32.0 @@ -118,9 +118,9 @@ ### Browsers and webdrivers - Google Chrome 97.0.4692.99 - Chrome Driver 97.0.4692.71 -- Microsoft Edge 97.0.1072.69 -- Microsoft Edge Driver 97.0.1072.69 -- Mozilla Firefox 96.0.2 +- Microsoft Edge 97.0.1072.76 +- Microsoft Edge Driver 97.0.1072.76 +- Mozilla Firefox 96.0.3 - Gecko Driver 0.30.0 - IE Driver 3.150.1.1 - Selenium server 4.1.0 @@ -136,10 +136,10 @@ ### Java | Version | Vendor | Environment Variable | | ------------------- | --------------- | -------------------- | -| 8.0.312+7 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | +| 8.0.322+6 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | | 11.0.14+9 | Eclipse Temurin | JAVA_HOME_11_X64 | | 13.0.2+8.1 | Adopt OpenJDK | JAVA_HOME_13_X64 | -| 17.0.1+12 | Eclipse Temurin | JAVA_HOME_17_X64 | +| 17.0.2+8 | Eclipse Temurin | JAVA_HOME_17_X64 | ### Shells | Name | Target | @@ -219,11 +219,11 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### MongoDB | Version | ServiceName | ServiceStatus | ServiceStartType | | ------- | ----------- | ------------- | ---------------- | -| 5.0.5.0 | MongoDB | Running | Automatic | +| 5.0.6.0 | MongoDB | Running | Automatic | ### Database tools - Azure CosmosDb Emulator 2.14.5.0 -- DacFx 15.0.5282.3 +- DacFx 16.0.5400.1 - MySQL 5.7.37.0 - SQL OLEDB Driver 18.6.3.0 - SQLPS 1.0 @@ -232,7 +232,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Name | Version | ConfigFile | ServiceName | ServiceStatus | ListenPort | | ------ | ------- | ------------------------------------- | ----------- | ------------- | ---------- | | Apache | 2.4.52 | C:\tools\Apache24\conf\httpd.conf | Apache | Stopped | 80 | -| Nginx | 1.21.5 | C:\tools\nginx-1.21.5\conf\nginx.conf | nginx | Stopped | 80 | +| Nginx | 1.21.6 | C:\tools\nginx-1.21.6\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2019 | Name | Version | Path | @@ -262,7 +262,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Component.UnityEngine.x64 | 16.10.31205.252 | | Component.Unreal | 16.1.28810.153 | | Component.Unreal.Android | 16.1.28810.153 | -| Component.VSInstallerProjects | 1.0.1 | +| Component.VSInstallerProjects | 1.0.2 | | Component.WixToolset.VisualStudioExtension.Dev16 | 1.0.0.18 | | Component.WixToolset.VisualStudioExtension.Schemas3 | 1.0.0.18 | | Component.WixToolset.VisualStudioExtension.Schemas4 | 1.0.0.18 | @@ -469,7 +469,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | ProBITools.MicrosoftAnalysisServicesModelingProjects | 2.9.18 | | ProBITools.MicrosoftReportProjectsforVisualStudio | 2.6.11 | | SSIS.SqlServerIntegrationServicesProjects | 3.15 | -| VisualStudioClient.MicrosoftVisualStudio2017InstallerProjects | 1.0.1 | +| VisualStudioClient.MicrosoftVisualStudio2017InstallerProjects | 1.0.2 | | Windows Driver Kit | 10.0.21381.0 | | Windows Driver Kit Visual Studio Extension | 10.1.22000.1 | | Windows Software Development Kit Extension | 10.1.22000.194 | @@ -553,7 +553,7 @@ All other versions are saved but not installed. | Android Command Line Tools | 4.0 | | Android SDK Build-tools | 32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3<br>26.0.0 26.0.1 26.0.2 26.0.3<br>25.0.0 25.0.1 25.0.2 25.0.3<br>24.0.0 24.0.1 24.0.2 24.0.3<br>23.0.1 23.0.2 23.0.3<br>22.0.1<br>21.1.2<br>20.0.0<br>19.1.0 | | Android SDK Platforms | android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3)<br>android-26 (rev 2)<br>android-25 (rev 3)<br>android-24 (rev 2)<br>android-23 (rev 3)<br>android-22 (rev 2)<br>android-21 (rev 2)<br>android-20 (rev 2)<br>android-19 (rev 4) | -| Android SDK Platform-Tools | 31.0.3 | +| Android SDK Platform-Tools | 32.0.0 | | Android SDK Tools | 26.1.1 | | Android Support Repository | 47.0.0 | | CMake | 3.10.2<br>3.18.1 | From 9f9633ce6f0385f75fd3a66db9a50c7902e4a686 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 3 Feb 2022 14:19:01 +0000 Subject: [PATCH 0943/3485] Updating readme file for win22 version 20220131.1 (#4992) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2022-Readme.md | 85 +++++++++++++++++--------------- 1 file changed, 46 insertions(+), 39 deletions(-) diff --git a/images/win/Windows2022-Readme.md b/images/win/Windows2022-Readme.md index 42ac6bd0f0d4..d1884674bfeb 100644 --- a/images/win/Windows2022-Readme.md +++ b/images/win/Windows2022-Readme.md @@ -2,41 +2,40 @@ |-| | [[All OSs] .NET 2.1 will be removed from the images on February, 21](https://github.com/actions/virtual-environments/issues/4871) | | [windows-latest workflows will use Windows Server 2022](https://github.com/actions/virtual-environments/issues/4856) | -| [[All OSs] Az PowerShell Module will be upgraded to 7.1.0 on January, 17](https://github.com/actions/virtual-environments/issues/4841) | | [[All OSs] Python version 3.5 will be removed from the images on January 24, 2022](https://github.com/actions/virtual-environments/issues/4744) | | [Windows-2016 environment will be removed on March 15, 2022](https://github.com/actions/virtual-environments/issues/4312) | *** # Microsoft Windows Server 2022 Datacenter -- OS Version: 10.0.20348 Build 469 -- Image Version: 20220116.1 +- OS Version: 10.0.20348 Build 473 +- Image Version: 20220131.1 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] ## Installed Software ### Language and Runtime -- Bash 4.4.23(1)-release +- Bash 4.4.23(2)-release - Go 1.16.13 - Julia 1.7.1 - Kotlin 1.6.10 - LLVM 13.0.0 - Node 16.13.2 - Perl 5.32.1 -- PHP 8.1.1 +- PHP 8.1.2 - Python 3.9.9 - Ruby 3.0.3p157 ### Package Management -- Chocolatey 0.11.3 -- Composer 2.2.4 +- Chocolatey 0.12.1 +- Composer 2.2.5 - Helm 3.7.2 - Miniconda 4.10.3 (pre-installed on the image but not added to PATH) - NPM 8.1.2 - NuGet 6.0.0.280 -- pip 21.3.1 (python 3.9) +- pip 22.0.2 (python 3.9) - Pipx 1.0.0 - RubyGems 3.2.32 -- Vcpkg (build from master \<bba8794b8>) +- Vcpkg (build from master \<8518284c1>) - Yarn 1.22.17 #### Environment variables @@ -54,28 +53,28 @@ - 7zip 21.07 - aria2 1.36.0 - azcopy 10.13.0 -- Bazel 4.2.2 +- Bazel 5.0.0 - Bazelisk 1.11.0 - Bicep 0.4.1124 - Cabal 3.6.2.0 -- CMake 3.22.1 -- CodeQL Action Bundle 2.7.3 +- CMake 3.22.2 +- CodeQL Action Bundle 2.7.6 - Docker 20.10.7 - Docker-compose 1.29.2 - Docker-wincred 0.6.4 - ghc 9.2.1 -- Git 2.34.1 +- Git 2.35.1 - Git LFS 3.0.2 - jq 1.6 - Kind 0.11.1 -- Kubectl 1.23.1 +- Kubectl 1.23.3 - Mercurial 5.0 - Mingw-w64 8.1.0 - Newman 5.3.1 - NSIS v3.08 - OpenSSL 1.1.1 - Packer 1.7.8 -- Pulumi v3.22.1 +- Pulumi v3.23.0 - R 4.1.2 - Service Fabric SDK 8.2.1363.9590 - Stack 2.7.3 @@ -85,11 +84,11 @@ - WinAppDriver 1.2.2009.02003 - WiX Toolset v3.11.2.4516 - yamllint 1.26.3 -- zstd 1.5.1 +- zstd 1.5.2 ### CLI Tools -- Alibaba Cloud CLI 3.0.104 -- AWS CLI 2.4.11 +- Alibaba Cloud CLI 3.0.107 +- AWS CLI 2.4.15 - AWS SAM CLI 1.37.0 - AWS Session Manager CLI 1.2.295.0 - Azure CLI 2.32.0 @@ -99,8 +98,8 @@ ### Rust Tools - Cargo 1.58.0 -- Rust 1.58.0 -- Rustdoc 1.58.0 +- Rust 1.58.1 +- Rustdoc 1.58.1 - Rustup 1.24.3 #### Packages @@ -112,11 +111,11 @@ - Rustfmt 1.4.38 ### Browsers and webdrivers -- Google Chrome 97.0.4692.71 +- Google Chrome 97.0.4692.99 - Chrome Driver 97.0.4692.71 -- Microsoft Edge 97.0.1072.62 -- Microsoft Edge Driver 97.0.1072.62 -- Mozilla Firefox 96.0.1 +- Microsoft Edge 97.0.1072.76 +- Microsoft Edge Driver 97.0.1072.76 +- Mozilla Firefox 96.0.3 - Gecko Driver 0.30.0 - IE Driver 3.150.1.1 - Selenium server 4.1.0 @@ -132,9 +131,9 @@ ### Java | Version | Vendor | Environment Variable | | ------------------- | --------------- | -------------------- | -| 8.0.312+7 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | -| 11.0.13+8 | Eclipse Temurin | JAVA_HOME_11_X64 | -| 17.0.1+12 | Eclipse Temurin | JAVA_HOME_17_X64 | +| 8.0.322+6 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | +| 11.0.14+9 | Eclipse Temurin | JAVA_HOME_11_X64 | +| 17.0.2+8 | Eclipse Temurin | JAVA_HOME_17_X64 | ### Shells | Name | Target | @@ -205,19 +204,20 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### MongoDB | Version | ServiceName | ServiceStatus | ServiceStartType | | ------- | ----------- | ------------- | ---------------- | -| 5.0.5.0 | MongoDB | Running | Automatic | +| 5.0.6.0 | MongoDB | Running | Automatic | ### Database tools -- Azure CosmosDb Emulator 2.14.4.0 -- DacFx 15.0.5282.3 +- Azure CosmosDb Emulator 2.14.5.0 +- DacFx 16.0.5400.1 - MySQL 8.0.26.0 +- SQL OLEDB Driver 18.6.3.0 - SQLPS 1.0 ### Web Servers | Name | Version | ConfigFile | ServiceName | ServiceStatus | ListenPort | | ------ | ------- | ------------------------------------- | ----------- | ------------- | ---------- | | Apache | 2.4.52 | C:\tools\Apache24\conf\httpd.conf | Apache | Stopped | 80 | -| Nginx | 1.21.5 | C:\tools\nginx-1.21.5\conf\nginx.conf | nginx | Stopped | 80 | +| Nginx | 1.21.6 | C:\tools\nginx-1.21.6\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2022 | Name | Version | Path | @@ -244,6 +244,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Component.Unreal | 17.0.31804.368 | | Component.Unreal.Android | 17.0.31804.368 | | Component.VSInstallerProjects2022 | 2.0.0 | +| Component.WixToolset.VisualStudioExtension.Dev17 | 1.0.0.18 | +| Component.WixToolset.VisualStudioExtension.Schemas3 | 1.0.0.18 | +| Component.WixToolset.VisualStudioExtension.Schemas4 | 1.0.0.18 | | Component.Xamarin | 17.0.31804.368 | | Component.Xamarin.RemotedSimulator | 17.0.31807.282 | | Microsoft.Component.Azure.DataLake.Tools | 17.0.31805.14 | @@ -415,6 +418,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Workload.VisualStudioExtension | 17.0.31804.368 | | wasm.tools | 6.0.121.56705 | | VisualStudioClient.MicrosoftVisualStudio2022InstallerProjects | 2.0.0 | +| WixToolset.WixToolsetVisualStudio2022Extension | 1.0.0.18 | #### Microsoft Visual C++: | Name | Architecture | Version | @@ -449,6 +453,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. `Location C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX <version> Tools` - 4.8 +### .NET tools +- nbgv 3.4.255+06fb9182bf + ### PowerShell Tools - PowerShell 7.2.1 @@ -469,7 +476,7 @@ All other versions are saved but not installed. | ------------------ | ---------------- | | DockerMsftProvider | 1.0.0.8 | | MarkdownPS | 1.9 | -| Microsoft.Graph | 1.9.1 | +| Microsoft.Graph | 1.9.2 | | Pester | 3.4.0<br>5.3.1 | | PowerShellGet | 1.0.0.1<br>2.2.5 | | PSScriptAnalyzer | 1.20.0 | @@ -481,10 +488,10 @@ All other versions are saved but not installed. | Package Name | Version | | -------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 4.0 | -| Android Emulator | 31.1.4 | +| Android Emulator | 31.2.6 | | Android SDK Build-tools | 32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | | Android SDK Platforms | android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | -| Android SDK Platform-Tools | 31.0.3 | +| Android SDK Platform-Tools | 32.0.0 | | Android Support Repository | 47.0.0 | | CMake | 3.18.1 | | Google Play services | 49 | @@ -505,10 +512,10 @@ All other versions are saved but not installed. ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2022 | sha256:74a2826e180a8efd15c094f8c0395d751354a17ed971b73dc08643f2eff934f5 | 2022-01-12 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2022 | sha256:4991bb905c1e24a93768c85c4ee41e911ec94211636113944441b6ece1793325 | 2022-01-12 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:b64cd92d5e28816760c8055053013f54488bdba2b788f6d7db1f1aa26c8ff1f8 | 2022-01-12 | -| mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:e5f029ba86d30704103c8f7dbde99dd3e05579917ebf3cae4872859e2c542e04 | 2022-01-06 | -| mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:51dfdaaa8e4ba5a3bc9177a4d4908623a0b98a7b42b458b424a7a88dcdb09375 | 2022-01-06 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2022 | sha256:4e2d2bfda651c33e406015676c4f6cd91a58741812a613b7aaa688097dc9211a | 2022-01-20 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2022 | sha256:5ec4722ef299457d69a7186d3da503a947584aa1a5bfc0bfc021fe115dc2a76b | 2022-01-20 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:93d713a7cfaf1d0898e375533c5fd931b8e89914deea1ba1e6e41d6beb898131 | 2022-01-20 | +| mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:b3c25b3a5fe2c55a3e341d8c3164e404bc1cad6aa1902eff715f11e1ca004fb8 | 2022-01-16 | +| mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:08d5f2a16e6a588ee9ed2a6d1a89cca1749f93773997507a73449f7eb16afba4 | 2022-01-16 | From 5cdc2e5f50ec21dbac1d3b475ae0fe364f4a2d12 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 3 Feb 2022 14:20:13 +0000 Subject: [PATCH 0944/3485] Updating readme file for ubuntu20 version 20220131.1 (#4993) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2004-Readme.md | 77 +++++++++++++++---------------- 1 file changed, 38 insertions(+), 39 deletions(-) diff --git a/images/linux/Ubuntu2004-Readme.md b/images/linux/Ubuntu2004-Readme.md index 76d918175fb9..1df3270dda32 100644 --- a/images/linux/Ubuntu2004-Readme.md +++ b/images/linux/Ubuntu2004-Readme.md @@ -1,20 +1,19 @@ | Announcements | |-| | [[All OSs] .NET 2.1 will be removed from the images on February, 21](https://github.com/actions/virtual-environments/issues/4871) | -| [[All OSs] Az PowerShell Module will be upgraded to 7.1.0 on January, 17](https://github.com/actions/virtual-environments/issues/4841) | | [[Ubuntu] Issue with libstdc++ cannot allocate memory in static TLS block](https://github.com/actions/virtual-environments/issues/4799) | | [[All OSs] Python version 3.5 will be removed from the images on January 24, 2022](https://github.com/actions/virtual-environments/issues/4744) | *** # Ubuntu 20.04.3 LTS -- Linux kernel version: 5.11.0-1027-azure -- Image Version: 20220123.1 +- Linux kernel version: 5.11.0-1028-azure +- Image Version: 20220131.1 ## Installed Software ### Language and Runtime - Bash 5.0.17(1)-release - Clang 10.0.0, 11.0.0, 12.0.0 - Clang-format 10.0.0, 11.0.0, 12.0.0 -- Erlang 24.2 (Eshell 12.2) +- Erlang 24.2.1 (Eshell 12.2.1) - Erlang rebar3 3.18.0 - GNU C++ 9.3.0, 10.3.0 - GNU Fortran 9.3.0, 10.3.0 @@ -31,15 +30,15 @@ ### Package Management - cpan 1.64 -- Helm 3.7.2 -- Homebrew 3.3.11 +- Helm 3.8.0 +- Homebrew 3.3.13 - Miniconda 4.10.3 - Npm 8.1.2 - Pip 20.0.2 - Pip3 20.0.2 - Pipx 1.0.0 - RubyGems 3.1.2 -- Vcpkg (build from master \<df40d1c47>) +- Vcpkg (build from master \<2b543e52d>) - Yarn 1.22.17 #### Environment variables @@ -53,33 +52,33 @@ - Gradle 7.3.3 - Lerna 4.0.0 - Maven 3.8.4 -- Sbt 1.6.1 +- Sbt 1.6.2 ### Tools -- Ansible 2.12.1 +- Ansible 2.12.2 - apt-fast 1.9.12 - AzCopy 10.13.0 (available by `azcopy` and `azcopy10` aliases) - Bazel 5.0.0 - Bazelisk 1.11.0 - Bicep 0.4.1124 - Buildah 1.21.3 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- CMake 3.22.1 -- CodeQL Action Bundle 2.7.5 +- CMake 3.22.2 +- CodeQL Action Bundle 2.7.6 - Docker Compose v1 1.29.2 - Docker Compose v2 2.2.3+azure-1 - Docker-Buildx 0.7.1 - Docker-Moby Client 20.10.11+azure-3 - Docker-Moby Server 20.10.11+azure-3 -- Fastlane 2.201.1 -- Git 2.34.1 (apt source repository: ppa:git-core/ppa) +- Fastlane 2.203.0 +- Git 2.35.1 (apt source repository: ppa:git-core/ppa) - Git LFS 3.0.2 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.6.0 - Haveged 1.9.1 - Heroku 7.59.2 -- HHVM (HipHop VM) 4.145.0 +- HHVM (HipHop VM) 4.146.0 - jq 1.6 - Kind 0.11.1 -- Kubectl 1.23.2 +- Kubectl 1.23.3 - Kustomize 4.4.1 - Leiningen 2.9.8 - MediaInfo 19.09 @@ -93,19 +92,19 @@ - Parcel 2.2.1 - PhantomJS 2.1.1 - Podman 3.4.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- Pulumi 3.22.1 +- Pulumi 3.23.2 - R 4.1.2 - Skopeo 1.3.0 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 - Terraform 1.1.4 - yamllint 1.26.3 -- yq 4.17.2 +- yq 4.18.1 - zstd 1.5.2 (homebrew) ### CLI Tools -- Alibaba Cloud CLI 3.0.104 -- AWS CLI 2.4.13 +- Alibaba Cloud CLI 3.0.107 +- AWS CLI 2.4.15 - AWS CLI Session manager plugin 1.2.295.0 - AWS SAM CLI 1.37.0 - Azure CLI (azure-cli) 2.32.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) @@ -113,8 +112,8 @@ - GitHub CLI 2.4.0 - Google Cloud SDK 369.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 8.13.0 -- OpenShift CLI 4.9.15 +- Netlify CLI 8.15.1 +- OpenShift CLI 4.9.17 - ORAS CLI 0.12.0 - Vercel CLI 23.1.2 @@ -126,14 +125,14 @@ | 17.0.1+12 | Eclipse Temurin | JAVA_HOME_17_X64 | ### GraalVM -| Version | Environment variables | -| --------- | --------------------- | -| CE 21.3.0 | GRAALVM_11_ROOT | +| Version | Environment variables | +| ----------- | --------------------- | +| CE 22.0.0.2 | GRAALVM_11_ROOT | ### PHP | Tool | Version | | -------- | ------------------- | -| PHP | 7.4.27 8.0.14 8.1.1 | +| PHP | 7.4.27 8.0.15 8.1.2 | | Composer | 2.2.5 | | PHPUnit | 8.5.23 | ``` @@ -175,13 +174,13 @@ | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | ### .NET Core SDK -- 2.1.302 2.1.403 2.1.526 2.1.617 2.1.701 2.1.818 3.1.120 3.1.202 3.1.302 3.1.416 5.0.104 5.0.210 5.0.303 5.0.404 +- 2.1.302 2.1.403 2.1.526 2.1.617 2.1.701 2.1.818 3.1.120 3.1.202 3.1.302 3.1.416 5.0.104 5.0.210 5.0.303 5.0.404 6.0.101 ### .NET tools - nbgv 3.4.255+06fb9182bf ### Databases -- MongoDB 5.0.5 (apt source repository: https://repo.mongodb.org/apt/ubuntu) +- MongoDB 5.0.6 (apt source repository: https://repo.mongodb.org/apt/ubuntu) - PostgreSQL 14.1 (apt source repository: https://apt.postgresql.org/pub/repos/apt/) - sqlite3 3.31.1 @@ -194,7 +193,7 @@ ``` #### MS SQL Server Client Tools - sqlcmd 17.8.0001.1 -- SqlPackage 15.0.5282.3 +- SqlPackage 16.0.5400.1 ### Cached Tools #### Go @@ -258,9 +257,9 @@ | Package Name | Version | | -------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 4.0 | -| Android Emulator | 31.1.4 | +| Android Emulator | 31.2.6 | | Android SDK Build-tools | 32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | -| Android SDK Platform-Tools | 31.0.3 | +| Android SDK Platform-Tools | 32.0.0 | | Android SDK Platforms | android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | | Android SDK Tools | 26.1.1 | | Android Support Repository | 47.0.0 | @@ -285,18 +284,18 @@ | alpine:3.12 | sha256:d9459083f962de6bd980ae6a05be2a4cf670df6a1d898157bceb420342bec280 | 2021-11-12 | | alpine:3.13 | sha256:026f721af4cf2843e07bba648e158fb35ecc876d822130633cc49f707f0fc88c | 2021-11-12 | | alpine:3.14 | sha256:635f0aa53d99017b38d1a0aa5b2082f7812b03e3cdb299103fe77b5c8a07f1d2 | 2021-11-12 | -| buildpack-deps:bullseye | sha256:8cca6f729d85d572000a436eac498ff5358eeee5a0fa7b3e2b6668620c6ac06e | 2021-12-21 | -| buildpack-deps:buster | sha256:24cf4668129a284b9b960ffaa5e79f9654d7d040708721c8e7708811e362a9d9 | 2021-12-21 | -| buildpack-deps:stretch | sha256:19610095f7d1718c20d79e5109c42f64dabea9fdf104221394acdf2999170c51 | 2021-12-21 | -| debian:10 | sha256:94ccfd1c5115a6903cbb415f043a0b04e307be3f37b768cf6d6d3edff0021da3 | 2021-12-21 | -| debian:11 | sha256:2906804d2a64e8a13a434a1a127fe3f6a28bf7cf3696be4223b06276f32f1f2d | 2021-12-21 | -| debian:9 | sha256:54284a7a45383b407c1968657e8f1c50dc25b82d8d56b3812e46ad19f8bcfd83 | 2021-12-21 | +| buildpack-deps:bullseye | sha256:159126fd9e3b05c16a9cc4c2655e4a447effd7892e62b74b933e4a6cb370138e | 2022-01-26 | +| buildpack-deps:buster | sha256:64b00dac65b9ed4db078361a816e24e888e6ae926e43524b79f6fba424e8b6c8 | 2022-01-26 | +| buildpack-deps:stretch | sha256:3004c958ffa89199f04e8735d583c42ee3885c9c77daa4134930fe68eeee59c4 | 2022-01-26 | +| debian:10 | sha256:fde7a280413ec0122bd3a14dc76ba152f89cae999f3b8efe8784100df3640763 | 2022-01-26 | +| debian:11 | sha256:fb45fd4e25abe55a656ca69a7bef70e62099b8bb42a279a5e0ea4ae1ab410e0d | 2022-01-26 | +| debian:9 | sha256:4bb600434787c903886fe33526d19ff33114a33b433a4a4cdbdf9b8543f1ab5d | 2022-01-26 | | moby/buildkit:latest | sha256:d6c89b7085b106301645ddcc77cf64eb7b705ab507b72d52d130ac33f1300417 | 2021-11-18 | -| node:12 | sha256:04334b2efca8f5f23d246ce8818fe358c2c0116819e5fd043e7929cae6ca7398 | 2022-01-11 | +| node:12 | sha256:07ae688134d80b6359311641cc6fff6947108213367f7f3e0002a829464700dc | 2022-01-27 | | node:12-alpine | sha256:c3e7817c8fd124f1597cd66124d247db8e138e8ef311ba085b7104d900129d0b | 2022-01-12 | -| node:14 | sha256:50d4540794db9bdbd423a5823c4d840fc2ba0b9c82d71b059ff34b4aeb3e328f | 2022-01-11 | +| node:14 | sha256:252f6cef16c7f9abde7c10c983c02d6db8638c8caf559865a5958339b6575059 | 2022-01-27 | | node:14-alpine | sha256:a9b200d25469261a4cccde176db08ec9f0b5799fa4220d8edfe57e69684c6dad | 2022-01-11 | -| node:16 | sha256:4b0b5c3db44f567d5d25c80a6fe33a981d911cdae20b39d2395be268aea2cb97 | 2022-01-11 | +| node:16 | sha256:2033f4cc18f9d8b5d0baa7f276aaeffd202e1a2c6fe9af408af05a34fe68cbfb | 2022-01-27 | | node:16-alpine | sha256:2f50f4a428f8b5280817c9d4d896dbee03f072e93f4e0c70b90cc84bd1fcfe0d | 2022-01-12 | | ubuntu:16.04 | sha256:0f71fa8d4d2d4292c3c617fda2b36f6dabe5c8b6e34c3dc5b0d17d4e704bd39c | 2021-08-31 | | ubuntu:18.04 | sha256:37b7471c1945a2a12e5a57488ee4e3e216a8369d0b9ee1ec2e41db9c2c1e3d22 | 2022-01-07 | From a79f657a9fee78e1bcd22ffca27ac69afdd2da61 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Thu, 3 Feb 2022 18:09:29 +0300 Subject: [PATCH 0945/3485] Add InnoSetup to windows-2022 (#5007) --- images/win/scripts/Tests/ChocoPackages.Tests.ps1 | 2 +- images/win/toolsets/toolset-2022.json | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/images/win/scripts/Tests/ChocoPackages.Tests.ps1 b/images/win/scripts/Tests/ChocoPackages.Tests.ps1 index 1d30d71858ee..949f29ef7478 100644 --- a/images/win/scripts/Tests/ChocoPackages.Tests.ps1 +++ b/images/win/scripts/Tests/ChocoPackages.Tests.ps1 @@ -28,7 +28,7 @@ Describe "GitVersion" -Skip:(Test-IsWin22) { } } -Describe "InnoSetup" -Skip:(Test-IsWin22) { +Describe "InnoSetup" { It "InnoSetup" { (Get-Command -Name iscc).CommandType | Should -BeExactly "Application" } diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index efebe97ca54d..b8a447cad14c 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -297,6 +297,7 @@ { "name": "aria2" }, { "name": "azcopy10" }, { "name": "Bicep" }, + { "name": "innosetup" }, { "name": "jq" }, { "name": "llvm" }, { "name": "NuGet.CommandLine" }, From 754215539971e726fa6989689246a2da00544c57 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 3 Feb 2022 17:07:09 +0000 Subject: [PATCH 0946/3485] Updating readme file for macOS-10.15 version 20220201.2 (#5001) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-10.15-Readme.md | 64 +++++++++++++++--------------- 1 file changed, 31 insertions(+), 33 deletions(-) diff --git a/images/macos/macos-10.15-Readme.md b/images/macos/macos-10.15-Readme.md index 3bc259b749b7..5948e4b94b0f 100644 --- a/images/macos/macos-10.15-Readme.md +++ b/images/macos/macos-10.15-Readme.md @@ -1,14 +1,12 @@ | Announcements | |-| | [[All OSs] .NET 2.1 will be removed from the images on February, 21](https://github.com/actions/virtual-environments/issues/4871) | -| [[macOS] Default Xcode on Big Sur image will be set to Xcode 13.2.1 on January, 24](https://github.com/actions/virtual-environments/issues/4800) | | [[All OSs] Python version 3.5 will be removed from the images on January 24, 2022](https://github.com/actions/virtual-environments/issues/4744) | -| [macOS-latest workflows will use macOS-11](https://github.com/actions/virtual-environments/issues/4060) | *** # macOS 10.15 info -- System Version: macOS 10.15.7 (19H1615) +- System Version: macOS 10.15.7 (19H1713) - Kernel Version: Darwin 19.6.0 -- Image Version: 20220124.1 +- Image Version: 20220201.2 ## Installed Software ### Language and Runtime @@ -28,7 +26,7 @@ - MSBuild 16.10.1.58001 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) - Node.js v16.13.2 - NVM 0.39.1 -- NVM - Cached node versions: v12.22.9 v14.18.3 v16.13.2 +- NVM - Cached node versions: v12.22.10 v14.19.0 v16.13.2 - Perl 5.34.0 - PHP 8.1.2 - Python 2.7.18 @@ -37,11 +35,11 @@ - Ruby 2.7.5p203 ### Package Management -- Bundler version 2.3.5 +- Bundler version 2.3.6 - Carthage 0.38.0 - CocoaPods 1.11.2 - Composer 2.2.5 -- Homebrew 3.3.11 +- Homebrew 3.3.13 - Miniconda 4.10.3 - NPM 8.1.2 - NuGet 5.9.0.7134 @@ -49,7 +47,7 @@ - Pip 21.3.1 (python 3.9) - Pipx 1.0.0 - RubyGems 3.2.33 -- Vcpkg 2021 (build from master \<3afbc7b28>) +- Vcpkg 2021 (build from master \<8f315e852>) - Yarn 1.22.17 #### Environment variables @@ -62,7 +60,7 @@ - Apache Ant(TM) 1.10.12 - Apache Maven 3.8.4 - Gradle 7.3.3 -- Sbt 1.6.1 +- Sbt 1.6.2 ### Utilities - 7-Zip 17.04 @@ -73,17 +71,17 @@ - bsdtar 3.3.2 - available by 'tar' alias - Curl 7.81.0 - Git LFS: 3.0.2 -- Git: 2.34.1 -- GitHub CLI: 2.4.0 +- Git: 2.35.1 +- GitHub CLI: 2.5.0 - GNU parallel 20220122 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.2 - gpg (GnuPG) 2.3.4 -- helm v3.7.2+g663a896 +- helm v3.8.0+gd141386 - Hub CLI: 2.14.2 - jq 1.6 -- mongo v5.0.5 -- mongod v5.0.5 +- mongo v5.0.6 +- mongod v5.0.6 - Newman 5.3.1 - OpenSSL 1.1.1m 14 Dec 2021 `(/usr/local/opt/openssl@1.1 -> ../Cellar/openssl@1.1/1.1.1m)` - Packer 1.7.8 @@ -97,38 +95,38 @@ - zstd 1.5.2 ### Tools -- Aliyun CLI 3.0.104 +- Aliyun CLI 3.0.107 - App Center CLI 2.10.8 -- AWS CLI 2.4.13 +- AWS CLI 2.4.15 - AWS SAM CLI 1.37.0 - AWS Session Manager CLI 1.2.295.0 - Azure CLI 2.32.0 - Bicep CLI 0.4.1124 - Cabal 3.6.2.0 -- Cmake 3.22.1 -- Fastlane 2.201.1 +- Cmake 3.22.2 +- Fastlane 2.203.0 - GHC 9.2.1 - GHCup 0.1.17.4 - Jazzy 0.14.1 - Stack 2.7.3 -- SwiftFormat 0.49.2 +- SwiftFormat 0.49.3 - Swig 4.0.2 - Xcode Command Line Tools 12.4.0.0.1.1610135815 ### Linters -- SwiftLint 0.46.0 +- SwiftLint 0.46.2 - yamllint 1.26.3 ### Browsers -- Safari 15.2 (15612.3.6.1.8) -- SafariDriver 15.2 (15612.3.6.1.8) -- Google Chrome 97.0.4692.99 +- Safari 15.3 (15612.4.9.1.7) +- SafariDriver 15.3 (15612.4.9.1.7) +- Google Chrome 98.0.4758.80 - ChromeDriver 97.0.4692.71 -- Microsoft Edge 97.0.1072.69 -- MSEdgeDriver 97.0.1072.69 -- Mozilla Firefox 96.0.2 +- Microsoft Edge 97.0.1072.76 +- MSEdgeDriver 97.0.1072.76 +- Mozilla Firefox 96.0.3 - geckodriver 0.30.0 -- Selenium server 4.1.1 +- Selenium server 4.1.2 #### Environment variables | Name | Value | @@ -140,12 +138,12 @@ ### Java | Version | Vendor | Environment Variable | | ------------------- | --------------- | -------------------- | -| 8.0.312+7 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | +| 8.0.322+6 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | | 11.0.14+9 | Eclipse Temurin | JAVA_HOME_11_X64 | | 12.0.2+10.3 | Adopt OpenJDK | JAVA_HOME_12_X64 | | 13.0.2+8.1 | Adopt OpenJDK | JAVA_HOME_13_X64 | | 14.0.2+12 | Adopt OpenJDK | JAVA_HOME_14_X64 | -| 17.0.1+12 | Eclipse Temurin | JAVA_HOME_17_X64 | +| 17.0.2+8 | Eclipse Temurin | JAVA_HOME_17_X64 | ### Cached Tools #### Ruby @@ -171,7 +169,7 @@ #### Node.js - 12.22.9 -- 14.18.3 +- 14.19.0 - 16.13.2 #### Go @@ -210,7 +208,7 @@ | Name | Version | ConfigFile | ServiceStatus | ListenPort | | ----- | ------- | ------------------------------- | ------------- | ---------- | | httpd | 2.4.52 | /usr/local/etc/httpd/httpd.conf | none | 80 | -| nginx | 1.21.5 | /usr/local/etc/nginx/nginx.conf | none | 80 | +| nginx | 1.21.6 | /usr/local/etc/nginx/nginx.conf | none | 80 | ### Xamarin #### Visual Studio for Mac @@ -353,10 +351,10 @@ | Package Name | Version | | -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 4.0 | -| Android Emulator | 31.1.4 | +| Android Emulator | 31.2.6 | | Android SDK Build-tools | 32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3<br>26.0.0 26.0.1 26.0.2 26.0.3<br>25.0.0 25.0.1 25.0.2 25.0.3<br>24.0.0 24.0.1 24.0.2 24.0.3 | | Android SDK Platforms | android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3)<br>android-26 (rev 2)<br>android-25 (rev 3)<br>android-24 (rev 2) | -| Android SDK Platform-Tools | 31.0.3 | +| Android SDK Platform-Tools | 32.0.0 | | Android Support Repository | 47.0.0 | | CMake | 3.10.2<br>3.18.1 | | Google APIs | addon-google_apis-google-21<br>addon-google_apis-google-22<br>addon-google_apis-google-23<br>addon-google_apis-google-24 | From a7650603511df3004af1edb6bf4cf4ee9fc98e27 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 4 Feb 2022 07:50:21 +0000 Subject: [PATCH 0947/3485] Updating readme file for macOS-11 version 20220201.3 (#5002) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-11-Readme.md | 64 ++++++++++++++++----------------- 1 file changed, 31 insertions(+), 33 deletions(-) diff --git a/images/macos/macos-11-Readme.md b/images/macos/macos-11-Readme.md index d60b90f73c91..5f5d76263a8b 100644 --- a/images/macos/macos-11-Readme.md +++ b/images/macos/macos-11-Readme.md @@ -1,14 +1,12 @@ | Announcements | |-| | [[All OSs] .NET 2.1 will be removed from the images on February, 21](https://github.com/actions/virtual-environments/issues/4871) | -| [[macOS] Default Xcode on Big Sur image will be set to Xcode 13.2.1 on January, 24](https://github.com/actions/virtual-environments/issues/4800) | | [[All OSs] Python version 3.5 will be removed from the images on January 24, 2022](https://github.com/actions/virtual-environments/issues/4744) | -| [macOS-latest workflows will use macOS-11](https://github.com/actions/virtual-environments/issues/4060) | *** # macOS 11.6 info -- System Version: macOS 11.6.2 (20G314) +- System Version: macOS 11.6.3 (20G415) - Kernel Version: Darwin 20.6.0 -- Image Version: 20220124.1 +- Image Version: 20220201.3 ## Installed Software ### Language and Runtime @@ -28,7 +26,7 @@ - MSBuild 16.10.1.58001 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) - Node.js v16.13.2 - NVM 0.39.1 -- NVM - Cached node versions: v12.22.9 v14.18.3 v16.13.2 +- NVM - Cached node versions: v12.22.10 v14.19.0 v16.13.2 - Perl 5.34.0 - PHP 8.1.2 - Python 2.7.18 @@ -36,11 +34,11 @@ - Ruby 2.7.5p203 ### Package Management -- Bundler version 2.3.5 +- Bundler version 2.3.6 - Carthage 0.38.0 - CocoaPods 1.11.2 - Composer 2.2.5 -- Homebrew 3.3.11 +- Homebrew 3.3.13 - Miniconda 4.10.3 - NPM 8.1.2 - NuGet 5.9.0.7134 @@ -48,7 +46,7 @@ - Pip 21.3.1 (python 3.9) - Pipx 1.0.0 - RubyGems 3.2.33 -- Vcpkg 2021 (build from master \<3afbc7b28>) +- Vcpkg 2021 (build from master \<8f315e852>) - Yarn 1.22.17 #### Environment variables @@ -61,7 +59,7 @@ - Apache Ant(TM) 1.10.12 - Apache Maven 3.8.4 - Gradle 7.3.3 -- Sbt 1.6.1 +- Sbt 1.6.2 ### Utilities - 7-Zip 17.04 @@ -72,16 +70,16 @@ - bsdtar 3.3.2 - available by 'tar' alias - Curl 7.81.0 - Git LFS: 3.0.2 -- Git: 2.34.1 -- GitHub CLI: 2.4.0 +- Git: 2.35.1 +- GitHub CLI: 2.5.0 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.2 - gpg (GnuPG) 2.3.4 -- helm v3.7.2+g663a896 +- helm v3.8.0+gd141386 - Hub CLI: 2.14.2 - jq 1.6 -- mongo v5.0.5 -- mongod v5.0.5 +- mongo v5.0.6 +- mongod v5.0.6 - Newman 5.3.1 - OpenSSL 1.1.1m 14 Dec 2021 `(/usr/local/opt/openssl@1.1 -> ../Cellar/openssl@1.1/1.1.1m)` - Packer 1.7.8 @@ -93,38 +91,38 @@ - zstd 1.5.2 ### Tools -- Aliyun CLI 3.0.104 +- Aliyun CLI 3.0.107 - App Center CLI 2.10.8 -- AWS CLI 2.4.13 +- AWS CLI 2.4.15 - AWS SAM CLI 1.37.0 - AWS Session Manager CLI 1.2.295.0 - Azure CLI 2.32.0 - Bicep CLI 0.4.1124 - Cabal 3.6.2.0 -- Cmake 3.22.1 -- Fastlane 2.201.1 +- Cmake 3.22.2 +- Fastlane 2.203.0 - GHC 9.2.1 - GHCup 0.1.17.4 - Jazzy 0.14.1 - Stack 2.7.3 -- SwiftFormat 0.49.2 +- SwiftFormat 0.49.3 - Swig 4.0.2 - Xcode Command Line Tools 13.2.0.0.1.1638488800 ### Linters -- SwiftLint 0.46.0 +- SwiftLint 0.46.2 - yamllint 1.26.3 ### Browsers -- Safari 15.2 (16612.3.6.1.8) -- SafariDriver 15.2 (16612.3.6.1.8) -- Google Chrome 97.0.4692.99 +- Safari 15.3 (16612.4.9.1.7) +- SafariDriver 15.3 (16612.4.9.1.7) +- Google Chrome 98.0.4758.80 - ChromeDriver 97.0.4692.71 -- Microsoft Edge 97.0.1072.69 -- MSEdgeDriver 97.0.1072.69 -- Mozilla Firefox 96.0.2 +- Microsoft Edge 97.0.1072.76 +- MSEdgeDriver 97.0.1072.76 +- Mozilla Firefox 96.0.3 - geckodriver 0.30.0 -- Selenium server 4.1.1 +- Selenium server 4.1.2 #### Environment variables | Name | Value | @@ -136,9 +134,9 @@ ### Java | Version | Vendor | Environment Variable | | ------------------- | --------------- | -------------------- | -| 8.0.312+7 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | +| 8.0.322+6 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | | 11.0.14+9 | Eclipse Temurin | JAVA_HOME_11_X64 | -| 17.0.1+12 | Eclipse Temurin | JAVA_HOME_17_X64 | +| 17.0.2+8 | Eclipse Temurin | JAVA_HOME_17_X64 | ### Cached Tools #### Ruby @@ -161,7 +159,7 @@ #### Node.js - 12.22.9 -- 14.18.3 +- 14.19.0 - 16.13.2 #### Go @@ -200,7 +198,7 @@ | Name | Version | ConfigFile | ServiceStatus | ListenPort | | ----- | ------- | ------------------------------- | ------------- | ---------- | | httpd | 2.4.52 | /usr/local/etc/httpd/httpd.conf | none | 80 | -| nginx | 1.21.5 | /usr/local/etc/nginx/nginx.conf | none | 80 | +| nginx | 1.21.6 | /usr/local/etc/nginx/nginx.conf | none | 80 | ### Xamarin #### Visual Studio for Mac @@ -310,10 +308,10 @@ | Package Name | Version | | -------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 4.0 | -| Android Emulator | 31.1.4 | +| Android Emulator | 31.2.6 | | Android SDK Build-tools | 32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | | Android SDK Platforms | android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | -| Android SDK Platform-Tools | 31.0.3 | +| Android SDK Platform-Tools | 32.0.0 | | Android Support Repository | 47.0.0 | | CMake | 3.10.2<br>3.18.1 | | Google Play services | 49 | From b53758f5a5b6e6aae789fa91624ad49666416dc6 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Fri, 4 Feb 2022 10:54:06 +0300 Subject: [PATCH 0948/3485] Add UWP.VC.v142 VS22 component (#5012) --- images/win/toolsets/toolset-2022.json | 1 + 1 file changed, 1 insertion(+) diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index b8a447cad14c..a3530c89f9de 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -228,6 +228,7 @@ "Microsoft.VisualStudio.ComponentGroup.Azure.CloudServices", "Microsoft.VisualStudio.ComponentGroup.Azure.ResourceManager.Tools", "Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Llvm.Clang", + "Microsoft.VisualStudio.ComponentGroup.UWP.VC.v142", "Microsoft.VisualStudio.ComponentGroup.Web.CloudTools", "Microsoft.VisualStudio.Workload.Azure", "Microsoft.VisualStudio.Workload.Data", From c01e7d1ed83866321e41d5774f53c52db02234e1 Mon Sep 17 00:00:00 2001 From: Maksim Shilov <89912354+shilovmaksim@users.noreply.github.com> Date: Fri, 4 Feb 2022 21:00:07 +0300 Subject: [PATCH 0949/3485] [MacOS] Add R to macOS images (#4996) * Add R to macOS images * Remove redundant already existing functions and tests --- images/macos/software-report/SoftwareReport.Generator.ps1 | 7 +------ images/macos/tests/BasicTools.Tests.ps1 | 2 +- images/macos/toolsets/toolset-11.json | 3 ++- images/macos/toolsets/toolset-12.json | 3 ++- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1 index 93154dfd813e..47a2c7c17baa 100644 --- a/images/macos/software-report/SoftwareReport.Generator.ps1 +++ b/images/macos/software-report/SoftwareReport.Generator.ps1 @@ -48,14 +48,9 @@ $languageAndRuntimeList = @( (Get-ClangLLVMVersion) (Get-GccVersion) (Get-FortranVersion) + (Get-RVersion) ) -if ($os.IsCatalina) { - $languageAndRuntimeList += @( - (Get-RVersion) - ) -} - # To sort GCC and Gfortran correctly, we need to use natural sort https://gist.github.com/markwragg/e2a9dc05f3464103d6998298fb575d4e#file-sort-natural-ps1 $toNatural = { [regex]::Replace($_, '\d+', { $args[0].Value.PadLeft(20) }) } $markdown += New-MDList -Style Unordered -Lines ($languageAndRuntimeList | Sort-Object $toNatural) diff --git a/images/macos/tests/BasicTools.Tests.ps1 b/images/macos/tests/BasicTools.Tests.ps1 index bc6845117e70..96d4f6e81af1 100644 --- a/images/macos/tests/BasicTools.Tests.ps1 +++ b/images/macos/tests/BasicTools.Tests.ps1 @@ -150,7 +150,7 @@ Describe "xctool" -Skip:($os.IsHigherThanCatalina) { } } -Describe "R" -Skip:($os.IsHigherThanCatalina) { +Describe "R" { It "R" { "R --version" | Should -ReturnZeroExitCode } diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index e602f81c0ad8..e1b5fdda24a0 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -194,7 +194,8 @@ "zstd", "zlib", "libxext", - "libxft" + "libxft", + "r" ], "cask_packages": [ "julia" diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index f6c8c1f1592f..198e4cbedbf6 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -110,7 +110,8 @@ "gmp", "zlib", "libxext", - "libxft" + "libxft", + "r" ], "cask_packages": [ "julia" From 30ffa3484986f90fa35d6e0fcfc875b1f04d1215 Mon Sep 17 00:00:00 2001 From: Maksim Shilov <89912354+shilovmaksim@users.noreply.github.com> Date: Mon, 7 Feb 2022 10:30:14 +0300 Subject: [PATCH 0950/3485] Improve select-datastore with cluster based filtering (#5013) --- .../macos/azure-pipelines/image-generation.yml | 10 ++++++---- images.CI/macos/select-datastore.ps1 | 14 +++++++++----- images/macos/templates/macOS-10.15.json | 3 ++- images/macos/templates/macOS-11.json | 3 ++- images/macos/templates/macOS-12.json | 3 ++- 5 files changed, 21 insertions(+), 12 deletions(-) diff --git a/images.CI/macos/azure-pipelines/image-generation.yml b/images.CI/macos/azure-pipelines/image-generation.yml index 8c53af415c7a..654832797e71 100644 --- a/images.CI/macos/azure-pipelines/image-generation.yml +++ b/images.CI/macos/azure-pipelines/image-generation.yml @@ -55,7 +55,8 @@ jobs: arguments: -VMName "$(VirtualMachineName)" ` -VIServer "$(vcenter-server-v2)" ` -VIUserName "$(vcenter-username-v2)" ` - -VIPassword "$(vcenter-password-v2)" + -VIPassword '$(vcenter-password-v2)' ` + -Cluster "$(esxi-cluster-v2)" - pwsh: | $SensitiveData = @( @@ -66,13 +67,14 @@ jobs: packer build -on-error=abort ` -var="vcenter_server=$(vcenter-server-v2)" ` -var="vcenter_username=$(vcenter-username-v2)" ` - -var="vcenter_password=$(vcenter-password-v2)" ` + -var='vcenter_password=$(vcenter-password-v2)' ` -var="vcenter_datacenter=$(vcenter-datacenter-v2)" ` -var="cluster_or_esxi_host=$(esxi-cluster-v2)" ` -var="esxi_datastore=$(buildDatastore)" ` -var="output_folder=$(output-folder)" ` -var="vm_username=$(vm-username)" ` -var="vm_password=$(vm-password)" ` + -var="github_api_pat=$(github_api_pat)" ` -var="build_id=$(VirtualMachineName)" ` -var="baseimage_name=${{ parameters.base_image_name }}" ` -var="xcode_install_user=$(xcode-installation-user)" ` @@ -130,7 +132,7 @@ jobs: -TargetDataStore "${{ parameters.target_datastore }}" ` -VIServer "$(vcenter-server-v2)" ` -VIUserName "$(vcenter-username-v2)" ` - -VIPassword "$(vcenter-password-v2)" + -VIPassword '$(vcenter-password-v2)' ` -CpuCount "$(cpu-count)" ` -CoresPerSocketCount "$(cores-per-socket-count)" ` -Memory "$(memory)" @@ -144,4 +146,4 @@ jobs: arguments: -VMName "$(VirtualMachineName)" ` -VIServer "$(vcenter-server-v2)" ` -VIUserName "$(vcenter-username-v2)" ` - -VIPassword "$(vcenter-password-v2)" + -VIPassword '$(vcenter-password-v2)' diff --git a/images.CI/macos/select-datastore.ps1 b/images.CI/macos/select-datastore.ps1 index 1d9a898adce1..23b5fb5a4a76 100644 --- a/images.CI/macos/select-datastore.ps1 +++ b/images.CI/macos/select-datastore.ps1 @@ -36,7 +36,9 @@ param( [ValidateNotNullOrEmpty()] [string]$VIPassword, - [string]$TagCategory = "Busy" + [string]$TagCategory = "Busy", + + [string]$Cluster ) # Import helpers module @@ -47,6 +49,7 @@ function Select-DataStore { [string]$VMName, [string]$TagCategory, [string]$TemplateDatastore = "ds-local-Datastore-*", + [string]$Cluster, [int]$ThresholdInGb = 400, [int]$VMCount = 2, [int]$Retries = 5 @@ -57,8 +60,9 @@ function Select-DataStore { # 3. Choose a datastore with the minimal VM count < 2 Write-Host "Start Datastore selection process..." - $allDatastores = Get-Datastore -Name $templateDatastore | Where-Object { $_.State -eq "Available" } - $availableDatastores = $allDatastores ` + $clusterHosts = Get-Cluster -Name $Cluster | Get-VMHost + $availableClusterDatastores = $clusterHosts | Get-Datastore -Name $TemplateDatastore | Where-Object -Property State -eq "Available" + $availableDatastores = $availableClusterDatastores ` | Where-Object { $_.FreeSpaceGB -ge $thresholdInGb } ` | Where-Object { $vmOnDatastore = @((Get-ChildItem -Path $_.DatastoreBrowserPath).Name -notmatch "^\.").Count @@ -101,11 +105,11 @@ function Select-DataStore { } Write-Host "Datastore select failed, $retries left" - Select-DataStore -VMName $VMName -TagCategory $TagCategory -Retries $retries + Select-DataStore -VMName $VMName -Cluster $Cluster -TagCategory $TagCategory -Retries $retries } # Connection to a vCenter Server system Connect-VCServer -VIServer $VIServer -VIUserName $VIUserName -VIPassword $VIPassword # Get a target datastore for current deployment -Select-DataStore -VMName $VMName -TagCategory $TagCategory +Select-DataStore -VMName $VMName -Cluster $Cluster -TagCategory $TagCategory diff --git a/images/macos/templates/macOS-10.15.json b/images/macos/templates/macOS-10.15.json index 4edf744a8d84..c55bb3f58a99 100644 --- a/images/macos/templates/macOS-10.15.json +++ b/images/macos/templates/macOS-10.15.json @@ -31,7 +31,8 @@ "vm_name": "{{user `build_id`}}", "ssh_username": "{{user `vm_username`}}", "ssh_password": "{{user `vm_password`}}", - "CPUs": "10", + "CPUs": "5", + "cpu_cores": "5", "RAM": "24576", "NestedHV": "true", "shutdown_timeout": "15m" diff --git a/images/macos/templates/macOS-11.json b/images/macos/templates/macOS-11.json index 10046d35b015..082228f72f1e 100644 --- a/images/macos/templates/macOS-11.json +++ b/images/macos/templates/macOS-11.json @@ -31,7 +31,8 @@ "vm_name": "{{user `build_id`}}", "ssh_username": "{{user `vm_username`}}", "ssh_password": "{{user `vm_password`}}", - "CPUs": "10", + "CPUs": "5", + "cpu_cores": "5", "RAM": "24576", "NestedHV": "true", "shutdown_timeout": "15m" diff --git a/images/macos/templates/macOS-12.json b/images/macos/templates/macOS-12.json index d79e86bc6393..b10aa4fa19c4 100644 --- a/images/macos/templates/macOS-12.json +++ b/images/macos/templates/macOS-12.json @@ -31,7 +31,8 @@ "vm_name": "{{user `build_id`}}", "ssh_username": "{{user `vm_username`}}", "ssh_password": "{{user `vm_password`}}", - "CPUs": "10", + "CPUs": "5", + "cpu_cores": "5", "RAM": "24576", "NestedHV": "true", "shutdown_timeout": "15m" From 0740ab86e66cf20519735fbbbce2f7ecc69ab102 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Mon, 7 Feb 2022 11:12:13 +0300 Subject: [PATCH 0951/3485] [macOS] install tcl-tk explicitly (#5014) --- images/macos/software-report/SoftwareReport.Common.psm1 | 5 +++++ images/macos/software-report/SoftwareReport.Generator.ps1 | 3 ++- images/macos/toolsets/toolset-10.15.json | 3 ++- images/macos/toolsets/toolset-11.json | 1 + images/macos/toolsets/toolset-12.json | 1 + 5 files changed, 11 insertions(+), 2 deletions(-) diff --git a/images/macos/software-report/SoftwareReport.Common.psm1 b/images/macos/software-report/SoftwareReport.Common.psm1 index 290f934c23fa..129ebdd3328a 100644 --- a/images/macos/software-report/SoftwareReport.Common.psm1 +++ b/images/macos/software-report/SoftwareReport.Common.psm1 @@ -532,6 +532,11 @@ function Get-LibXextVersion { return "libXext $libXextVersion" } +function Get-TclTkVersion { + $tcltkVersion = (brew info tcl-tk)[0] | Take-Part -Part 2 + return "Tcl/Tk $tcltkVersion" +} + function Build-PackageManagementEnvironmentTable { return @( @{ diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1 index 47a2c7c17baa..22a99a027e21 100644 --- a/images/macos/software-report/SoftwareReport.Generator.ps1 +++ b/images/macos/software-report/SoftwareReport.Generator.ps1 @@ -288,7 +288,8 @@ $markdown += New-MDHeader "Miscellaneous" -Level 3 $markdown += New-MDList -Style Unordered -Lines (@( (Get-ZlibVersion), (Get-LibXextVersion), - (Get-LibXftVersion) + (Get-LibXftVersion), + (Get-TclTkVersion) ) | Sort-Object ) diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index 88433678dea1..2c86913f0b9d 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -227,7 +227,8 @@ "zstd", "zlib", "libxext", - "libxft" + "libxft", + "tcl-tk" ], "cask_packages": [ "julia", diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index e1b5fdda24a0..35944fb5f968 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -195,6 +195,7 @@ "zlib", "libxext", "libxft", + "tcl-tk", "r" ], "cask_packages": [ diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index 198e4cbedbf6..0263fd4224fd 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -111,6 +111,7 @@ "zlib", "libxext", "libxft", + "tcl-tk", "r" ], "cask_packages": [ From bb66e542a3dcc9311c29e72b2c92d943ef2e6a27 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Mon, 7 Feb 2022 12:08:46 +0300 Subject: [PATCH 0952/3485] Make auth optional for nvm and ruby scripts (#5030) --- images/macos/provision/core/nvm.sh | 3 ++- images/macos/provision/core/ruby.sh | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/images/macos/provision/core/nvm.sh b/images/macos/provision/core/nvm.sh index d2e552fea13c..098861139c04 100755 --- a/images/macos/provision/core/nvm.sh +++ b/images/macos/provision/core/nvm.sh @@ -5,7 +5,8 @@ ########################################################################### source ~/utils/utils.sh -VERSION=$(curl -H "Authorization: token $API_PAT" -s https://api.github.com/repos/nvm-sh/nvm/releases/latest | jq -r '.tag_name') +[ -n "$API_PAT" ] && authString=(-H "Authorization: token ${API_PAT}") +VERSION=$(curl "${authString[@]}" -s https://api.github.com/repos/nvm-sh/nvm/releases/latest | jq -r '.tag_name') curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/$VERSION/install.sh | bash if [ $? -eq 0 ]; then diff --git a/images/macos/provision/core/ruby.sh b/images/macos/provision/core/ruby.sh index cae43e949b89..0b60142ff445 100755 --- a/images/macos/provision/core/ruby.sh +++ b/images/macos/provision/core/ruby.sh @@ -10,7 +10,8 @@ echo "GEM_PATH=$GEM_PATH" >> "$HOME/.bashrc" echo 'export PATH="$GEM_PATH:/usr/local/opt/ruby@'${DEFAULT_RUBY_VERSION}'/bin:$PATH"' >> "$HOME/.bashrc" echo "Install Ruby from toolset..." -PACKAGE_TAR_NAMES=$(curl -H "Authorization: token $API_PAT" -s "https://api.github.com/repos/ruby/ruby-builder/releases/latest" | jq -r '.assets[].name') +[ -n "$API_PAT" ] && authString=(-H "Authorization: token ${API_PAT}") +PACKAGE_TAR_NAMES=$(curl "${authString[@]}" -s "https://api.github.com/repos/ruby/ruby-builder/releases/latest" | jq -r '.assets[].name') TOOLSET_VERSIONS=$(get_toolset_value '.toolcache[] | select(.name | contains("Ruby")) | .versions[]') RUBY_PATH="$AGENT_TOOLSDIRECTORY/Ruby" From 9cd0d1ab642155662f3b870110cd250364b8d4a4 Mon Sep 17 00:00:00 2001 From: Maxim Lobanov <maxim-lobanov@github.com> Date: Mon, 7 Feb 2022 13:44:34 +0100 Subject: [PATCH 0953/3485] [macOS] Update TCC.db to bypass Microsoft Defender installation (#5018) * Approve Microsoft Defender installation * Add comment --- .../macos/provision/configuration/configure-tccdb-macos11.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/images/macos/provision/configuration/configure-tccdb-macos11.sh b/images/macos/provision/configuration/configure-tccdb-macos11.sh index 3448cd2ee533..ad2e186b0998 100644 --- a/images/macos/provision/configuration/configure-tccdb-macos11.sh +++ b/images/macos/provision/configuration/configure-tccdb-macos11.sh @@ -16,6 +16,9 @@ systemValuesArray=( "'kTCCServiceAccessibility','/bin/bash',1,2,0,1,NULL,NULL,NULL,'UNUSED',NULL,0,1583997993" "'kTCCServiceMicrophone','/usr/local/opt/runner/runprovisioner.sh',1,2,0,1,NULL,NULL,NULL,'UNUSED',NULL,NULL,1576661342" "'kTCCServiceScreenCapture','/bin/bash',1,2,0,1,NULL,NULL,NULL,'UNUSED',NULL,0,1599831148" + # Allow Full Disk Access for "Microsoft Defender for macOS" to bypass installation on-flight + "'kTCCServiceSystemPolicyAllFiles','com.microsoft.wdav',0,2,4,1,NULL,NULL,NULL,'UNUSED',NULL,0,1643970979" + "'kTCCServiceSystemPolicyAllFiles','com.microsoft.wdav.epsext',0,2,4,1,NULL,NULL,NULL,'UNUSED',NULL,0,1643970979" ) for values in "${systemValuesArray[@]}"; do configure_system_tccdb "$values" From 5217af8068d32480afa801bbf64697440663e0e3 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Mon, 7 Feb 2022 17:04:11 +0300 Subject: [PATCH 0954/3485] Add GraalVM into Anka template (#5035) --- images/macos/templates/macOS-11.pkr.hcl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/images/macos/templates/macOS-11.pkr.hcl b/images/macos/templates/macOS-11.pkr.hcl index 6cdea6efe1f7..774856ecae7a 100644 --- a/images/macos/templates/macOS-11.pkr.hcl +++ b/images/macos/templates/macOS-11.pkr.hcl @@ -191,7 +191,8 @@ build { "./provision/core/firefox.sh", "./provision/core/pypy.sh", "./provision/core/pipx-packages.sh", - "./provision/core/bicep.sh" + "./provision/core/bicep.sh", + "./provision/core/graalvm.sh" ] execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" } From f747f0983b8bd7d182869c830ae39ea75894453b Mon Sep 17 00:00:00 2001 From: Dibir Magomedsaygitov <61747324+dibir-magomedsaygitov@users.noreply.github.com> Date: Mon, 7 Feb 2022 17:19:09 +0300 Subject: [PATCH 0955/3485] [macOS] Implement helper to get GitHub package download URL (#4923) --- images/macos/provision/core/powershell.sh | 3 +-- images/macos/provision/core/stack.sh | 23 +++++++++++------------ images/macos/provision/core/swiftlint.sh | 2 +- images/macos/provision/utils/utils.sh | 23 +++++++++++++++++++++++ 4 files changed, 36 insertions(+), 15 deletions(-) diff --git a/images/macos/provision/core/powershell.sh b/images/macos/provision/core/powershell.sh index d674fccb3c6c..1083df085f88 100644 --- a/images/macos/provision/core/powershell.sh +++ b/images/macos/provision/core/powershell.sh @@ -2,8 +2,7 @@ source ~/utils/utils.sh echo Installing PowerShell... -psRelease=$(curl -H "Authorization: token $API_PAT" -s "https://api.github.com/repos/PowerShell/PowerShell/releases/latest") -psDownloadUrl=$(echo $psRelease | jq -r '.assets[].browser_download_url | select(contains("osx-x64.pkg"))' | head -n 1) +psDownloadUrl=$(get_github_package_download_url "PowerShell" "PowerShell" "contains(\"osx-x64.pkg\")" "latest" "$API_PAT") download_with_retries $psDownloadUrl "/tmp" "powershell.pkg" # Work around the issue on macOS Big Sur 11.5 or higher for possible error message ("can't be opened because Apple cannot check it for malicious software") when installing the package diff --git a/images/macos/provision/core/stack.sh b/images/macos/provision/core/stack.sh index 7dfa8328d0ac..4b4815c8bb67 100644 --- a/images/macos/provision/core/stack.sh +++ b/images/macos/provision/core/stack.sh @@ -2,24 +2,23 @@ source ~/utils/utils.sh echo "Get the latest Stack version..." -StackRelease=$(curl -H "Authorization: token $API_PAT" -s "https://api.github.com/repos/commercialhaskell/stack/releases/latest") -DownloadUrl=$(echo $StackRelease | jq -r '.assets[].browser_download_url | select(contains("osx-x86_64.tar.gz"))' | head -n 1) -StackVersion=$(echo $StackRelease | jq -r '.name' | cut -c2-) -StackArchive="/tmp/stack.tar.gz" +stackDownloadUrl=$(get_github_package_download_url "commercialhaskell" "stack" "contains(\"osx-x86_64.tar.gz\")" "latest" "$API_PAT") +stackVersion=$(echo $stackDownloadUrl | cut -d "/" -f8 | tr -d "v") +stackArchive="/tmp/stack.tar.gz" -echo "Download stack version $StackVersion..." -download_with_retries $DownloadUrl "/tmp" "stack.tar.gz" +echo "Download stack version $stackVersion..." +download_with_retries $stackDownloadUrl "/tmp" "stack.tar.gz" -StackToolcachePath="$AGENT_TOOLSDIRECTORY/stack/$StackVersion" -DestinationPath="$StackToolcachePath/x64" +stackToolcachePath="$AGENT_TOOLSDIRECTORY/stack/$stackVersion" +destinationPath="$stackToolcachePath/x64" -mkdir -p $DestinationPath +mkdir -p $destinationPath echo "Unzip stack archive..." -tar -xzf $StackArchive -C $DestinationPath --strip 1 +tar -xzf $stackArchive -C $destinationPath --strip 1 -touch $StackToolcachePath/x64.complete +touch $stackToolcachePath/x64.complete -echo "export PATH="\$PATH":$DestinationPath" >> "$HOME/.bashrc" +echo "export PATH="\$PATH":$destinationPath" >> "$HOME/.bashrc" invoke_tests "Common" "Stack" diff --git a/images/macos/provision/core/swiftlint.sh b/images/macos/provision/core/swiftlint.sh index 4fc0b62ed590..fa3c65820423 100644 --- a/images/macos/provision/core/swiftlint.sh +++ b/images/macos/provision/core/swiftlint.sh @@ -2,7 +2,7 @@ source ~/utils/utils.sh echo "Install SwiftLint" -swiftlintUrl=$(curl -H "Authorization: token $API_PAT" -s "https://api.github.com/repos/realm/SwiftLint/releases/latest" | jq -r '.assets[].browser_download_url | select(contains("portable_swiftlint.zip"))') +swiftlintUrl=$(get_github_package_download_url "realm" "SwiftLint" "contains(\"portable_swiftlint.zip\")" "latest" "$API_PAT") download_with_retries $swiftlintUrl "/tmp" "portable_swiftlint.zip" unzip -q "/tmp/portable_swiftlint.zip" -d /usr/local/bin # Remove the LICENSE file that comes along with the binary and the downloaded archive diff --git a/images/macos/provision/utils/utils.sh b/images/macos/provision/utils/utils.sh index 2e2789667439..2bd88647ce02 100755 --- a/images/macos/provision/utils/utils.sh +++ b/images/macos/provision/utils/utils.sh @@ -171,3 +171,26 @@ configure_user_tccdb () { local sqlQuery="INSERT OR IGNORE INTO access VALUES($values);" sqlite3 "$dbPath" "$sqlQuery" } + +get_github_package_download_url() { + local REPO_OWNER=$1 + local REPO_NAME=$2 + local FILTER=$3 + local VERSION=$4 + local API_PAT=$5 + local SEARCH_IN_COUNT="100" + + [ -n "$API_PAT" ] && authString=(-H "Authorization: token ${API_PAT}") + + json=$(curl "${authString[@]}" -s "https://api.github.com/repos/${REPO_OWNER}/${REPO_NAME}/releases?per_page=${SEARCH_IN_COUNT}") + + if [[ "$VERSION" == "latest" ]]; then + tagName=$(echo $json | jq -r '.[] | select(.prerelease==false).tag_name' | sort --unique --version-sort | egrep -v ".*-[a-z]" | tail -1) + else + tagName=$(echo $json | jq -r '.[] | select(.prerelease==false).tag_name' | sort --unique --version-sort | egrep -v ".*-[a-z]" | egrep "\w*${VERSION}" | tail -1) + fi + + downloadUrl=$(echo $json | jq -r ".[] | select(.tag_name==\"${tagName}\").assets[].browser_download_url | select(${FILTER})" | head -n 1) + + echo $downloadUrl +} \ No newline at end of file From f160c496ffa5afeee12d2c4a089cc5188a79d6be Mon Sep 17 00:00:00 2001 From: Nikolay Frolov <90333448+nikolai-frolov@users.noreply.github.com> Date: Mon, 7 Feb 2022 20:53:07 +0300 Subject: [PATCH 0956/3485] [Windows] Add Windows10SDK.17763 to Win22 (#4980) --- images/win/scripts/Installers/Install-VS.ps1 | 8 ++++++++ .../scripts/SoftwareReport/SoftwareReport.Generator.ps1 | 6 ++++++ .../SoftwareReport/SoftwareReport.VisualStudio.psm1 | 8 ++++++++ images/win/scripts/Tests/VisualStudio.Tests.ps1 | 6 ++++++ 4 files changed, 28 insertions(+) diff --git a/images/win/scripts/Installers/Install-VS.ps1 b/images/win/scripts/Installers/Install-VS.ps1 index 2017dbb81458..0f4550e4e54a 100644 --- a/images/win/scripts/Installers/Install-VS.ps1 +++ b/images/win/scripts/Installers/Install-VS.ps1 @@ -44,4 +44,12 @@ if (Test-IsWin19) { Install-Binary -Url $sdkUrl -Name $sdkFileName -ArgumentList $argumentList } +if (Test-IsWin22) { + # Install Windows 10 SDK version 10.0.17763 + $sdkUrl = "https://go.microsoft.com/fwlink/p/?LinkID=2033908" + $sdkFileName = "sdksetup17763.exe" + $argumentList = ("/q", "/norestart", "/ceip off", "/features OptionId.UWPManaged OptionId.UWPCPP OptionId.UWPLocalized OptionId.DesktopCPPx86 OptionId.DesktopCPPx64 OptionId.DesktopCPParm64") + Install-Binary -Url $sdkUrl -Name $sdkFileName -ArgumentList $argumentList +} + Invoke-PesterTests -TestFile "VisualStudio" diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index 13ec855616bd..cdff2962aa02 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -244,6 +244,12 @@ $markdown += New-MDHeader "Microsoft Visual C++:" -Level 4 $markdown += Get-VisualCPPComponents | New-MDTable $markdown += New-MDNewLine +$markdown += New-MDHeader "Installed Windows SDKs" -Level 4 +$sdk = Get-WindowsSDKs +$markdown += "``Location $($sdk.Path)``" +$markdown += New-MDNewLine +$markdown += New-MDList -Lines $sdk.Versions -Style Unordered + $markdown += New-MDHeader ".NET Core SDK" -Level 3 $sdk = Get-DotnetSdks $markdown += "``Location $($sdk.Path)``" diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.VisualStudio.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.VisualStudio.psm1 index dc3dc031d106..b085433c3297 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.VisualStudio.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.VisualStudio.psm1 @@ -88,4 +88,12 @@ function Get-VisualStudioExtensions { $extensions | Foreach-Object { [PSCustomObject]$_ } | Select-Object Package, Version | Sort-Object Package +} + +function Get-WindowsSDKs { + $path = "${env:ProgramFiles(x86)}\Windows Kits\10\Extension SDKs\WindowsDesktop" + return [PSCustomObject]@{ + Path = $path + Versions = $(Get-ChildItem $path).Name + } } \ No newline at end of file diff --git a/images/win/scripts/Tests/VisualStudio.Tests.ps1 b/images/win/scripts/Tests/VisualStudio.Tests.ps1 index a9f02cfa30c5..e60fce92b5c8 100644 --- a/images/win/scripts/Tests/VisualStudio.Tests.ps1 +++ b/images/win/scripts/Tests/VisualStudio.Tests.ps1 @@ -22,4 +22,10 @@ Describe "Visual Studio" { $installedComponents | Should -Contain $ComponentName } } +} + +Describe "Windows 10 SDK" { + It "Verifies 17763 SDK is installed" -Skip:((Test-IsWin16) -or (Test-IsWin19)) { + "${env:ProgramFiles(x86)}\Windows Kits\10\DesignTime\CommonConfiguration\Neutral\UAP\10.0.17763.0\UAP.props" | Should -Exist + } } \ No newline at end of file From cb8931646fd2a679f676122db5c6896933969b98 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Tue, 8 Feb 2022 17:09:32 +0300 Subject: [PATCH 0957/3485] [Windows] Configure Windows settings,disable services and scheduled tasks (#5017) * Configure Windows settings,disable services and scheduled tasks * some settings are not available on Win16 * Add import New-ItemPath function * Suppress output * Disable Chrome and Edge tasks --- .../scripts/ImageHelpers/ImageHelpers.psm1 | 1 + .../win/scripts/ImageHelpers/PathHelpers.ps1 | 10 ++ .../Installers/Configure-Antivirus.ps1 | 27 ++++- images/win/scripts/Installers/Finalize-VM.ps1 | 102 ++++++++++++++++++ 4 files changed, 137 insertions(+), 3 deletions(-) diff --git a/images/win/scripts/ImageHelpers/ImageHelpers.psm1 b/images/win/scripts/ImageHelpers/ImageHelpers.psm1 index 531530f4b0ca..94cd2ea4b9eb 100644 --- a/images/win/scripts/ImageHelpers/ImageHelpers.psm1 +++ b/images/win/scripts/ImageHelpers/ImageHelpers.psm1 @@ -53,4 +53,5 @@ Export-ModuleMember -Function @( 'Get-VisualStudioInstance' 'Get-VisualStudioComponents' 'Get-WindowsUpdatesHistory' + 'New-ItemPath' ) diff --git a/images/win/scripts/ImageHelpers/PathHelpers.ps1 b/images/win/scripts/ImageHelpers/PathHelpers.ps1 index af4bd5ef5fc8..f8dc0ecb93ad 100644 --- a/images/win/scripts/ImageHelpers/PathHelpers.ps1 +++ b/images/win/scripts/ImageHelpers/PathHelpers.ps1 @@ -134,3 +134,13 @@ function Add-DefaultPathItem { Set-DefaultPath -NewPath $newPath Disconnect-Hive } + +function New-ItemPath { + param ( + [string]$Path + ) + + if (-not (Test-Path $Path)) { + New-Item -Path $Path -Force -ErrorAction Ignore | Out-Null + } +} diff --git a/images/win/scripts/Installers/Configure-Antivirus.ps1 b/images/win/scripts/Installers/Configure-Antivirus.ps1 index 7cbf43b39e1a..cca4a09b84e9 100644 --- a/images/win/scripts/Installers/Configure-Antivirus.ps1 +++ b/images/win/scripts/Installers/Configure-Antivirus.ps1 @@ -1,9 +1,30 @@ -Write-Host "Set antivirus parameters" +Write-Host "Disable Windows Defender..." +Set-MpPreference -DisableArchiveScanning $true +Set-MpPreference -DisableAutoExclusions $true +Set-MpPreference -DisableBehaviorMonitoring $true +Set-MpPreference -DisableBlockAtFirstSeen $true +Set-MpPreference -DisableCatchupFullScan $true +Set-MpPreference -DisableCatchupQuickScan $true +Set-MpPreference -DisableIntrusionPreventionSystem $true +Set-MpPreference -DisableIOAVProtection $true +Set-MpPreference -DisablePrivacyMode $true +Set-MpPreference -DisableScanningNetworkFiles $true +Set-MpPreference -DisableScriptScanning $true +Set-MpPreference -MAPSReporting 0 +Set-MpPreference -PUAProtection 0 +Set-MpPreference -SignatureDisableUpdateOnStartupWithoutEngine $true +Set-MpPreference -SubmitSamplesConsent 2 Set-MpPreference -ScanAvgCPULoadFactor 5 -ExclusionPath "D:\", "C:\" - -Write-Host "Disable Antivirus" Set-MpPreference -DisableRealtimeMonitoring $true +if (-not (Test-IsWin16)) { + Set-MpPreference -EnableControlledFolderAccess Disable + Set-MpPreference -EnableNetworkProtection Disabled +} + +Write-Host "Disable Windows Defender scheduled tasks" +Get-ScheduledTask -TaskPath '\Microsoft\Windows\Windows Defender\' | Disable-ScheduledTask | Out-Null + # https://github.com/actions/virtual-environments/issues/4277 # https://docs.microsoft.com/en-us/microsoft-365/security/defender-endpoint/microsoft-defender-antivirus-compatibility?view=o365-worldwide $atpRegPath = 'HKLM:\SOFTWARE\Policies\Microsoft\Windows Advanced Threat Protection' diff --git a/images/win/scripts/Installers/Finalize-VM.ps1 b/images/win/scripts/Installers/Finalize-VM.ps1 index 7ff69f898614..dd78ba826b2f 100644 --- a/images/win/scripts/Installers/Finalize-VM.ps1 +++ b/images/win/scripts/Installers/Finalize-VM.ps1 @@ -36,4 +36,106 @@ cmd /c "npm cache clean --force 2>&1" | Out-Null # see https://github.com/actions/virtual-environments/issues/1704 cmd /c "icacls $env:SystemRoot\Temp /grant Users:f /t /c /q 2>&1" | Out-Null +# Registry settings +$registrySettings = @( + @{Path = "HKLM:\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU"; Name = "AUOptions"; Value = 1; PropertyType = "DWORD"} + @{Path = "HKLM:\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU"; Name = "NoAutoUpdate"; Value = 1; PropertyType = "DWORD"} + @{Path = "HKLM:\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate"; Name = "DoNotConnectToWindowsUpdateInternetLocations"; Value = 1; PropertyType = "DWORD"} + @{Path = "HKLM:\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate"; Name = "DisableWindowsUpdateAccess"; Value = 1; PropertyType = "DWORD"} + @{Path = "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Device Metadata"; Name = "PreventDeviceMetadataFromNetwork"; Value = 1; PropertyType = "DWORD"} + @{Path = "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\DataCollection"; Name = "AllowTelemetry"; Value = 0; PropertyType = "DWORD"} + @{Path = "HKLM:\SOFTWARE\Policies\Microsoft\SQMClient\Windows"; Name = "CEIPEnable"; Value = 0; PropertyType = "DWORD"} + @{Path = "HKLM:\SOFTWARE\Policies\Microsoft\Windows\AppCompat"; Name = "AITEnable"; Value = 0; PropertyType = "DWORD"} + @{Path = "HKLM:\SOFTWARE\Policies\Microsoft\Windows\AppCompat"; Name = "DisableUAR"; Value = 1; PropertyType = "DWORD"} + @{Path = "HKLM:\Software\Policies\Microsoft\Windows\DataCollection"; Name = "AllowTelemetry"; Value = 0; PropertyType = "DWORD"} + @{Path = "HKLM:\SOFTWARE\Wow6432Node\Policies\Microsoft\Windows\DataCollection"; Name = "AllowTelemetry"; Value = 0; PropertyType = "DWORD"} + @{Path = "HKLM:\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Schedule\Maintenance"; Name = "MaintenanceDisabled"; Value = 1; PropertyType = "DWORD"} + @{Path = "HKLM:\SOFTWARE\Policies\Microsoft\MRT"; Name = "DontOfferThroughWUAU"; Value = 1; PropertyType = "DWORD"} + @{Path = "HKLM:\SOFTWARE\Policies\Microsoft\MRT"; Name = "DontReportInfectionInformation"; Value = 1; PropertyType = "DWORD"} + @{Path = "HKLM:\SOFTWARE\Policies\Microsoft\Windows\Windows Search"; Name = "AllowCortana"; Value = 0; PropertyType = "DWORD"} + @{Path = "HKLM:\SYSTEM\CurrentControlSet\Control"; Name = "ServicesPipeTimeout"; Value = 120000; PropertyType = "DWORD"} + @{Path = "HKLM:\SYSTEM\CurrentControlSet\Control\WMI\AutoLogger\AutoLogger-Diagtrack-Listener"; Name = "Start"; Value = 0; PropertyType = "DWORD"} + @{Path = "HKLM:\SYSTEM\CurrentControlSet\Control\WMI\AutoLogger\SQMLogger"; Name = "Start"; Value = 0; PropertyType = "DWORD"} +) + +$registrySettings | ForEach-Object { + $regPath = $PSItem.Path + New-ItemPath -Path $regPath + New-ItemProperty @PSItem -Force -ErrorAction Ignore +} | Out-Null + +# Disable Template Services / User Services added by Desktop Experience +$regUserServicesToDisables = @( + "HKLM:\SYSTEM\CurrentControlSet\Services\CDPUserSvc" + "HKLM:\SYSTEM\CurrentControlSet\Services\OneSyncSvc" + "HKLM:\SYSTEM\CurrentControlSet\Services\PimIndexMaintenanceSvc" + "HKLM:\SYSTEM\CurrentControlSet\Services\UnistoreSvc" + "HKLM:\SYSTEM\CurrentControlSet\Services\UserDataSvc" + "HKLM:\SYSTEM\CurrentControlSet\Services\WpnUserService" +) + +$regUserServicesToDisables | ForEach-Object { + $regPath = $_ + New-ItemPath -Path $regPath + New-ItemProperty -Path $regPath -Name "Start" -Value 4 -PropertyType DWORD -Force -ErrorAction Ignore + New-ItemProperty -Path $regPath -Name "UserServiceFlags" -Value 0 -PropertyType DWORD -Force -ErrorAction Ignore +} | Out-Null + + +# Disabled services +$servicesToDisable = @( + "wuauserv" + "DiagTrack" + "dmwappushservice" + "PcaSvc" + "SysMain" + "gupdate" + "gupdatem" +) + +$servicesToDisable | ForEach-Object { + Set-Service -Name $_ -StartupType Disabled -ErrorAction Ignore +} | Out-Null + +# Disable scheduled tasks +$allTasksInTaskPath = @( + "\" + "\Microsoft\Azure\Security\" + "\Microsoft\VisualStudio\" + "\Microsoft\VisualStudio\Updates\" + "\Microsoft\Windows\Application Experience\" + "\Microsoft\Windows\ApplicationData\" + "\Microsoft\Windows\Autochk\" + "\Microsoft\Windows\Chkdsk\" + "\Microsoft\Windows\Customer Experience Improvement Program\" + "\Microsoft\Windows\Data Integrity Scan\" + "\Microsoft\Windows\Defrag\" + "\Microsoft\Windows\Diagnosis\" + "\Microsoft\Windows\DiskCleanup\" + "\Microsoft\Windows\DiskDiagnostic\" + "\Microsoft\Windows\Maintenance\" + "\Microsoft\Windows\PI\" + "\Microsoft\Windows\Power Efficiency Diagnostics\" + "\Microsoft\Windows\Server Manager\" + "\Microsoft\Windows\Speech\" + "\Microsoft\Windows\UpdateOrchestrator\" + "\Microsoft\Windows\Windows Error Reporting\" + "\Microsoft\Windows\WindowsUpdate\" + "\Microsoft\XblGameSave\" +) + +$allTasksInTaskPath | ForEach-Object { + Get-ScheduledTask -TaskPath $_ -ErrorAction Ignore | Disable-ScheduledTask -ErrorAction Ignore +} | Out-Null + +$disableTaskNames = @( + @{TaskPath = "\Microsoft\Windows\.NET Framework\"; TaskName = ".NET Framework NGEN v4.0.30319"} + @{TaskPath = "\Microsoft\Windows\.NET Framework\"; TaskName = ".NET Framework NGEN v4.0.30319 64"} + @{TaskPath = "\Microsoft\Windows\AppID\"; TaskName = "SmartScreenSpecific"} +) + +$disableTaskNames | ForEach-Object { + Disable-ScheduledTask @PSItem -ErrorAction Ignore +} | Out-Null + Write-Host "Finalize-VM.ps1 - completed" From 404da76e175a33fc9588a55d35c9be28f8fa42d7 Mon Sep 17 00:00:00 2001 From: Dibir Magomedsaygitov <61747324+dibir-magomedsaygitov@users.noreply.github.com> Date: Tue, 8 Feb 2022 19:41:23 +0300 Subject: [PATCH 0958/3485] [Ubuntu] Implement helper to get GitHub package download URL (#4947) --- images/linux/scripts/helpers/install.sh | 19 +++++++++++++++++++ images/linux/scripts/installers/aliyun-cli.sh | 4 ++-- images/linux/scripts/installers/cmake.sh | 9 +++++---- images/linux/scripts/installers/erlang.sh | 4 +--- images/linux/scripts/installers/firefox.sh | 6 +++--- images/linux/scripts/installers/git.sh | 4 ++-- images/linux/scripts/installers/github-cli.sh | 4 ++-- images/linux/scripts/installers/graalvm.sh | 7 ++----- images/linux/scripts/installers/kotlin.sh | 7 ++----- .../scripts/installers/kubernetes-tools.sh | 5 ++++- images/linux/scripts/installers/oras-cli.sh | 3 +-- images/linux/scripts/installers/sbt.sh | 4 ++-- images/linux/scripts/installers/selenium.sh | 3 +-- images/linux/scripts/installers/yq.sh | 2 +- 14 files changed, 47 insertions(+), 34 deletions(-) diff --git a/images/linux/scripts/helpers/install.sh b/images/linux/scripts/helpers/install.sh index 434dcad97a41..222fc592ad76 100644 --- a/images/linux/scripts/helpers/install.sh +++ b/images/linux/scripts/helpers/install.sh @@ -66,3 +66,22 @@ get_toolset_value() { local query=$1 echo "$(jq -r "$query" $toolset_path)" } + +get_github_package_download_url() { + local REPO_ORG=$1 + local FILTER=$2 + local VERSION=$3 + local SEARCH_IN_COUNT="100" + + json=$(curl -s "https://api.github.com/repos/${REPO_ORG}/releases?per_page=${SEARCH_IN_COUNT}") + + if [ -n "$VERSION" ]; then + tagName=$(echo $json | jq -r '.[] | select(.prerelease==false).tag_name' | sort --unique --version-sort | egrep -v ".*-[a-z]|beta" | egrep "\w*${VERSION}" | tail -1) + else + tagName=$(echo $json | jq -r '.[] | select(.prerelease==false).tag_name' | sort --unique --version-sort | egrep -v ".*-[a-z]|beta" | tail -1) + fi + + downloadUrl=$(echo $json | jq -r ".[] | select(.tag_name==\"${tagName}\").assets[].browser_download_url | select(${FILTER})" | head -n 1) + + echo $downloadUrl +} \ No newline at end of file diff --git a/images/linux/scripts/installers/aliyun-cli.sh b/images/linux/scripts/installers/aliyun-cli.sh index b5dd9f9347da..6617967199d9 100644 --- a/images/linux/scripts/installers/aliyun-cli.sh +++ b/images/linux/scripts/installers/aliyun-cli.sh @@ -8,8 +8,8 @@ source $HELPER_SCRIPTS/install.sh # Install Alibaba Cloud CLI -URL=$(curl -s https://api.github.com/repos/aliyun/aliyun-cli/releases/latest | jq -r '.assets[].browser_download_url | select(contains("aliyun-cli-linux") and endswith("amd64.tgz"))') -download_with_retries $URL "/tmp" +downloadUrl=$(get_github_package_download_url "aliyun/aliyun-cli" "contains(\"aliyun-cli-linux\") and endswith(\"amd64.tgz\")") +download_with_retries $downloadUrl "/tmp" tar xzf /tmp/aliyun-cli-linux-*-amd64.tgz mv aliyun /usr/local/bin diff --git a/images/linux/scripts/installers/cmake.sh b/images/linux/scripts/installers/cmake.sh index 10b2287f949f..51aab62503ba 100644 --- a/images/linux/scripts/installers/cmake.sh +++ b/images/linux/scripts/installers/cmake.sh @@ -4,15 +4,16 @@ ## Desc: Installs CMake ################################################################################ +# Source the helpers for use with the script +source $HELPER_SCRIPTS/install.sh + # Test to see if the software in question is already installed, if not install it echo "Checking to see if the installer script has already been run" if command -v cmake; then echo "cmake is already installed" else - json=$(curl -s "https://api.github.com/repos/Kitware/CMake/releases") - latest_tag=$(echo $json | jq -r '.[] | select(.prerelease==false).tag_name' | sort --unique --version-sort | grep -v "rc" | tail -1) - sh_url=$(echo $json | jq -r ".[] | select(.tag_name==\"${latest_tag}\").assets[].browser_download_url | select(endswith(\"inux-x86_64.sh\"))") - curl -sL ${sh_url} -o cmakeinstall.sh \ + downloadUrl=$(get_github_package_download_url "Kitware/CMake" "endswith(\"inux-x86_64.sh\")") + curl -sL ${downloadUrl} -o cmakeinstall.sh \ && chmod +x cmakeinstall.sh \ && ./cmakeinstall.sh --prefix=/usr/local --exclude-subdir \ && rm cmakeinstall.sh diff --git a/images/linux/scripts/installers/erlang.sh b/images/linux/scripts/installers/erlang.sh index 1eef1cb5a3e6..bb0e74ebb7f5 100644 --- a/images/linux/scripts/installers/erlang.sh +++ b/images/linux/scripts/installers/erlang.sh @@ -16,9 +16,7 @@ apt-get update apt-get install -y --no-install-recommends esl-erlang # Install rebar3 -json=$(curl -sL "https://api.github.com/repos/erlang/rebar3/releases") -rebar3Version=$(echo $json | jq -r '.[] | select(.tag_name | contains("-") | not).tag_name' | sort -V | tail -n1) -rebar3DownloadUrl=$(echo $json | jq -r ".[] | select(.tag_name==\"$rebar3Version\").assets[].browser_download_url") +rebar3DownloadUrl=$(get_github_package_download_url "erlang/rebar3" "endswith(\"rebar3\")") download_with_retries $rebar3DownloadUrl "/tmp" mv /tmp/rebar3 /usr/local/bin/rebar3 chmod +x /usr/local/bin/rebar3 diff --git a/images/linux/scripts/installers/firefox.sh b/images/linux/scripts/installers/firefox.sh index d7fe92dce9de..968bd84ac037 100644 --- a/images/linux/scripts/installers/firefox.sh +++ b/images/linux/scripts/installers/firefox.sh @@ -15,9 +15,9 @@ apt-get install -y firefox echo 'pref("intl.locale.requested","en_US");' >> "/usr/lib/firefox/browser/defaults/preferences/syspref.js" # Download and unpack latest release of geckodriver -URL=$(curl -s https://api.github.com/repos/mozilla/geckodriver/releases/latest | jq -r '.assets[].browser_download_url | select(test("linux64.tar.gz$"))') -echo "Downloading geckodriver $URL" -download_with_retries "$URL" "/tmp" geckodriver.tar.gz +downloadUrl=$(get_github_package_download_url "mozilla/geckodriver" "test(\"linux64.tar.gz$\")") +echo "Downloading geckodriver $downloadUrl" +download_with_retries "$downloadUrl" "/tmp" geckodriver.tar.gz GECKODRIVER_DIR="/usr/local/share/gecko_driver" GECKODRIVER_BIN="$GECKODRIVER_DIR/geckodriver" diff --git a/images/linux/scripts/installers/git.sh b/images/linux/scripts/installers/git.sh index d878862cbc93..be496eb63f6f 100644 --- a/images/linux/scripts/installers/git.sh +++ b/images/linux/scripts/installers/git.sh @@ -34,8 +34,8 @@ echo "git-lfs $GIT_LFS_REPO" >> $HELPER_SCRIPTS/apt-sources.txt #Install hub tmp_hub="/tmp/hub" mkdir -p "$tmp_hub" -url=$(curl -s https://api.github.com/repos/github/hub/releases/latest | jq -r '.assets[].browser_download_url | select(contains("hub-linux-amd64"))') -download_with_retries "$url" "$tmp_hub" +downloadUrl=$(get_github_package_download_url "github/hub" "contains(\"hub-linux-amd64\")") +download_with_retries "$downloadUrl" "$tmp_hub" tar xzf "$tmp_hub"/hub-linux-amd64-*.tgz --strip-components 1 -C "$tmp_hub" mv "$tmp_hub"/bin/hub /usr/local/bin diff --git a/images/linux/scripts/installers/github-cli.sh b/images/linux/scripts/installers/github-cli.sh index 02f98daffe1a..c27e690c6350 100644 --- a/images/linux/scripts/installers/github-cli.sh +++ b/images/linux/scripts/installers/github-cli.sh @@ -9,8 +9,8 @@ source $HELPER_SCRIPTS/install.sh # Install GitHub CLI -url=$(curl -s https://api.github.com/repos/cli/cli/releases/latest | jq -r '.assets[].browser_download_url|select(contains("linux") and contains("amd64") and contains(".deb"))') -download_with_retries $url "/tmp" +downloadUrl=$(get_github_package_download_url "cli/cli" "contains(\"linux\") and contains(\"amd64\") and contains(\".deb\")") +download_with_retries $downloadUrl "/tmp" apt install /tmp/gh_*_linux_amd64.deb invoke_tests "CLI.Tools" "GitHub CLI" diff --git a/images/linux/scripts/installers/graalvm.sh b/images/linux/scripts/installers/graalvm.sh index b66eeb452d9b..6a79032b50c2 100644 --- a/images/linux/scripts/installers/graalvm.sh +++ b/images/linux/scripts/installers/graalvm.sh @@ -7,11 +7,8 @@ source $HELPER_SCRIPTS/etc-environment.sh GRAALVM_ROOT=/usr/local/graalvm export GRAALVM_11_ROOT=$GRAALVM_ROOT/graalvm-ce-java11* -json=$(curl -s "https://api.github.com/repos/graalvm/graalvm-ce-builds/releases") -latest_tag=$(echo $json | jq -r '.[] | select(.prerelease==false).tag_name' | sort --unique --version-sort | tail -1) -url=$(echo $json | jq -r ".[] | select(.tag_name==\"${latest_tag}\").assets[].browser_download_url | select(contains(\"graalvm-ce-java11-linux-amd64\") and endswith(\"tar.gz\"))") - -download_with_retries "$url" "/tmp" "graalvm-archive.tar.gz" +downloadUrl=$(get_github_package_download_url "graalvm/graalvm-ce-builds" "contains(\"graalvm-ce-java11-linux-amd64\") and endswith(\"tar.gz\")") +download_with_retries "$downloadUrl" "/tmp" "graalvm-archive.tar.gz" mkdir $GRAALVM_ROOT tar -xzf "/tmp/graalvm-archive.tar.gz" -C $GRAALVM_ROOT diff --git a/images/linux/scripts/installers/kotlin.sh b/images/linux/scripts/installers/kotlin.sh index 2b07521900c4..c7d0253f8ae2 100644 --- a/images/linux/scripts/installers/kotlin.sh +++ b/images/linux/scripts/installers/kotlin.sh @@ -7,11 +7,8 @@ source $HELPER_SCRIPTS/install.sh KOTLIN_ROOT="/usr/share" - -kotlinReleasesUrl="https://api.github.com/repos/JetBrains/kotlin/releases" -latestRelease=$(curl -s $kotlinReleasesUrl | jq -r 'map(select(.prerelease == false)) | sort_by(.target_commitish)[-1]') -URL=$(echo $latestRelease | jq -r '.assets[].browser_download_url | select(contains("kotlin-compiler"))') -download_with_retries $URL "/tmp" +downloadUrl=$(get_github_package_download_url "JetBrains/kotlin" "contains(\"kotlin-compiler\")") +download_with_retries "$downloadUrl" "/tmp" unzip -qq /tmp/kotlin-compiler*.zip -d $KOTLIN_ROOT rm $KOTLIN_ROOT/kotlinc/bin/*.bat diff --git a/images/linux/scripts/installers/kubernetes-tools.sh b/images/linux/scripts/installers/kubernetes-tools.sh index 06d35ff918c4..83be26728ac5 100644 --- a/images/linux/scripts/installers/kubernetes-tools.sh +++ b/images/linux/scripts/installers/kubernetes-tools.sh @@ -4,8 +4,11 @@ ## Desc: Installs kubectl, helm, kustomize ################################################################################ +# Source the helpers for use with the script +source $HELPER_SCRIPTS/install.sh + # Install KIND -URL=$(curl -s https://api.github.com/repos/kubernetes-sigs/kind/releases/latest | jq -r '.assets[].browser_download_url | select(contains("kind-linux-amd64"))') +URL=$(get_github_package_download_url "kubernetes-sigs/kind" "contains(\"kind-linux-amd64\")") curl -L -o /usr/local/bin/kind $URL chmod +x /usr/local/bin/kind diff --git a/images/linux/scripts/installers/oras-cli.sh b/images/linux/scripts/installers/oras-cli.sh index 5f96e334f7a2..5db36a9a86b2 100644 --- a/images/linux/scripts/installers/oras-cli.sh +++ b/images/linux/scripts/installers/oras-cli.sh @@ -7,8 +7,7 @@ source $HELPER_SCRIPTS/install.sh # Determine latest ORAS CLI version -ORAS_CLI_LATEST_VERSION_URL=https://api.github.com/repos/oras-project/oras/releases/latest -ORAS_CLI_DOWNLOAD_URL=$(curl -sfL $ORAS_CLI_LATEST_VERSION_URL | jq -r '.assets[].browser_download_url | select(endswith("linux_amd64.tar.gz"))') +ORAS_CLI_DOWNLOAD_URL=$(get_github_package_download_url "oras-project/oras" "endswith(\"linux_amd64.tar.gz\")") ORAS_CLI_ARCHIVE=$(basename $ORAS_CLI_DOWNLOAD_URL) # Install ORAS CLI diff --git a/images/linux/scripts/installers/sbt.sh b/images/linux/scripts/installers/sbt.sh index 65f9d00c2241..0353961a4ace 100644 --- a/images/linux/scripts/installers/sbt.sh +++ b/images/linux/scripts/installers/sbt.sh @@ -7,8 +7,8 @@ source $HELPER_SCRIPTS/install.sh # Install latest sbt release -sbtVersion=$(curl -s -L "https://api.github.com/repos/sbt/sbt/releases" | jq -r '.[] | select(.prerelease==false).name' | sort --unique --version-sort | grep -ve "-.*" | tail -1) -download_with_retries "https://github.com/sbt/sbt/releases/download/v${sbtVersion}/sbt-${sbtVersion}.tgz" "/tmp" "sbt.tgz" +downloadUrl=$(get_github_package_download_url "sbt/sbt" "endswith(\".tgz\")") +download_with_retries "$downloadUrl" "/tmp" "sbt.tgz" tar zxf /tmp/sbt.tgz -C /usr/share ln -s /usr/share/sbt/bin/sbt /usr/bin/sbt diff --git a/images/linux/scripts/installers/selenium.sh b/images/linux/scripts/installers/selenium.sh index 23e723a4bc7a..494c19ce150c 100644 --- a/images/linux/scripts/installers/selenium.sh +++ b/images/linux/scripts/installers/selenium.sh @@ -12,8 +12,7 @@ SELENIUM_MAJOR_VERSION=$(get_toolset_value '.selenium.version') SELENIUM_BINARY_NAME=$(get_toolset_value '.selenium.binary_name') SELENIUM_JAR_PATH="/usr/share/java" SELENIUM_JAR_NAME="$SELENIUM_BINARY_NAME.jar" -json=$(curl -s "https://api.github.com/repos/SeleniumHQ/selenium/releases?per_page=100") -SELENIUM_DOWNLOAD_URL=$(echo $json | jq -r ".[] | select(.prerelease==false).assets[].browser_download_url | select(contains(\"${SELENIUM_BINARY_NAME}-${SELENIUM_MAJOR_VERSION}\") and endswith(\".jar\"))" | head -1) +SELENIUM_DOWNLOAD_URL=$(get_github_package_download_url "SeleniumHQ/selenium" "contains(\"${SELENIUM_BINARY_NAME}-${SELENIUM_MAJOR_VERSION}\") and endswith(\".jar\")") download_with_retries $SELENIUM_DOWNLOAD_URL $SELENIUM_JAR_PATH $SELENIUM_JAR_NAME # Create an epmty file to retrive selenium version diff --git a/images/linux/scripts/installers/yq.sh b/images/linux/scripts/installers/yq.sh index ae633dae88f7..0f7089b82958 100644 --- a/images/linux/scripts/installers/yq.sh +++ b/images/linux/scripts/installers/yq.sh @@ -6,7 +6,7 @@ source $HELPER_SCRIPTS/install.sh YQ_BINARY=yq_linux_amd64 # As per https://github.com/mikefarah/yq#wget -YQ_URL=$(curl -s https://api.github.com/repos/mikefarah/yq/releases/latest | jq -r ".assets[].browser_download_url | select(endswith(\"$YQ_BINARY.tar.gz\"))") +YQ_URL=$(get_github_package_download_url "mikefarah/yq" "endswith(\"$YQ_BINARY.tar.gz\")") echo "Downloading latest yq from $YQ_URL" download_with_retries "$YQ_URL" "/tmp" "${YQ_BINARY}.tar.gz" From a9fba6b110de9990ed037ab9c2db5de49f047b16 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Wed, 9 Feb 2022 10:34:31 +0300 Subject: [PATCH 0959/3485] [macOS] Add DeveloperIDG2CA.cer certificate (#5044) * Add DeveloperIDG2CA.cer certificate * Update certificate test --- .../configuration/configure-machine.sh | 30 ++++++++++++++----- images/macos/tests/System.Tests.ps1 | 6 ++++ 2 files changed, 28 insertions(+), 8 deletions(-) diff --git a/images/macos/provision/configuration/configure-machine.sh b/images/macos/provision/configuration/configure-machine.sh index a3b7c039d6d4..fe489e7629c7 100644 --- a/images/macos/provision/configuration/configure-machine.sh +++ b/images/macos/provision/configuration/configure-machine.sh @@ -30,16 +30,30 @@ defaults write com.apple.VoiceOver4/default SCREnableAppleScript -bool YES # Rotate the certificate before expiration to ensure your apps are installed and signed with an active certificate. # Confirm that the correct intermediate certificate is installed by verifying the expiration date is set to 2030. # sudo security delete-certificate -Z FF6797793A3CD798DC5B2ABEF56F73EDC9F83A64 /Library/Keychains/System.keychain -curl https://www.apple.com/certificateauthority/AppleWWDRCAG3.cer --output $HOME/AppleWWDRCAG3.cer --silent # Big Sur requires user interaction to add a cert https://developer.apple.com/forums/thread/671582, we need to use a workaround with SecItemAdd swift method -if is_Catalina; then - sudo security add-trusted-cert -d -r unspecified -k /Library/Keychains/System.keychain $HOME/AppleWWDRCAG3.cer -else - swiftc $HOME/image-generation/add-certificate.swift - sudo ./add-certificate $HOME/AppleWWDRCAG3.cer - rm add-certificate +if ! is_Catalina; then + swiftc "${HOME}/image-generation/add-certificate.swift" fi -rm $HOME/AppleWWDRCAG3.cer + +certs=( + AppleWWDRCAG3.cer + DeveloperIDG2CA.cer +) +for cert in ${certs[@]}; do + echo "Adding ${cert} certificate" + cert_path="${HOME}/${cert}" + curl "https://www.apple.com/certificateauthority/${cert}" --output ${cert_path} --silent + + if is_Catalina; then + sudo security add-trusted-cert -d -r unspecified -k /Library/Keychains/System.keychain ${cert_path} + else + sudo ./add-certificate ${cert_path} + fi + + rm ${cert_path} +done + +rm -f ./add-certificate # Create symlink for tests running if [ ! -d "/usr/local/bin" ];then diff --git a/images/macos/tests/System.Tests.ps1 b/images/macos/tests/System.Tests.ps1 index a067fb5f4d75..f72ba8292fe3 100644 --- a/images/macos/tests/System.Tests.ps1 +++ b/images/macos/tests/System.Tests.ps1 @@ -15,6 +15,12 @@ Describe "Certificate" { $certs = security find-certificate -a -c Worldwide -p -Z | Out-String $certs | Should -Match $sha1Hash } + + It "Developer ID Certification Authority[expired: 2031-09] is installed" { + $sha1Hash = "5B45F61068B29FCC8FFFF1A7E99B78DA9E9C4635" + $certs = security find-certificate -a -c "Developer ID" -p -Z | Out-String + $certs | Should -Match $sha1Hash + } } Describe "Audio device" { From 52011e5c44240b1b77ee56c8d664d353172ac1ff Mon Sep 17 00:00:00 2001 From: Dibir Magomedsaygitov <61747324+dibir-magomedsaygitov@users.noreply.github.com> Date: Wed, 9 Feb 2022 15:52:28 +0300 Subject: [PATCH 0960/3485] update get_github_package_download_url helper (#5051) --- images/macos/provision/core/powershell.sh | 2 +- images/macos/provision/core/stack.sh | 2 +- images/macos/provision/core/swiftlint.sh | 2 +- images/macos/provision/utils/utils.sh | 11 +++++------ 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/images/macos/provision/core/powershell.sh b/images/macos/provision/core/powershell.sh index 1083df085f88..e3fdc86bd116 100644 --- a/images/macos/provision/core/powershell.sh +++ b/images/macos/provision/core/powershell.sh @@ -2,7 +2,7 @@ source ~/utils/utils.sh echo Installing PowerShell... -psDownloadUrl=$(get_github_package_download_url "PowerShell" "PowerShell" "contains(\"osx-x64.pkg\")" "latest" "$API_PAT") +psDownloadUrl=$(get_github_package_download_url "PowerShell/PowerShell" "contains(\"osx-x64.pkg\")" "latest" "$API_PAT") download_with_retries $psDownloadUrl "/tmp" "powershell.pkg" # Work around the issue on macOS Big Sur 11.5 or higher for possible error message ("can't be opened because Apple cannot check it for malicious software") when installing the package diff --git a/images/macos/provision/core/stack.sh b/images/macos/provision/core/stack.sh index 4b4815c8bb67..c84cd2646f0f 100644 --- a/images/macos/provision/core/stack.sh +++ b/images/macos/provision/core/stack.sh @@ -2,7 +2,7 @@ source ~/utils/utils.sh echo "Get the latest Stack version..." -stackDownloadUrl=$(get_github_package_download_url "commercialhaskell" "stack" "contains(\"osx-x86_64.tar.gz\")" "latest" "$API_PAT") +stackDownloadUrl=$(get_github_package_download_url "commercialhaskell/stack" "contains(\"osx-x86_64.tar.gz\")" "latest" "$API_PAT") stackVersion=$(echo $stackDownloadUrl | cut -d "/" -f8 | tr -d "v") stackArchive="/tmp/stack.tar.gz" diff --git a/images/macos/provision/core/swiftlint.sh b/images/macos/provision/core/swiftlint.sh index fa3c65820423..b4cea6851384 100644 --- a/images/macos/provision/core/swiftlint.sh +++ b/images/macos/provision/core/swiftlint.sh @@ -2,7 +2,7 @@ source ~/utils/utils.sh echo "Install SwiftLint" -swiftlintUrl=$(get_github_package_download_url "realm" "SwiftLint" "contains(\"portable_swiftlint.zip\")" "latest" "$API_PAT") +swiftlintUrl=$(get_github_package_download_url "realm/SwiftLint" "contains(\"portable_swiftlint.zip\")" "latest" "$API_PAT") download_with_retries $swiftlintUrl "/tmp" "portable_swiftlint.zip" unzip -q "/tmp/portable_swiftlint.zip" -d /usr/local/bin # Remove the LICENSE file that comes along with the binary and the downloaded archive diff --git a/images/macos/provision/utils/utils.sh b/images/macos/provision/utils/utils.sh index 2bd88647ce02..4b844a41e10d 100755 --- a/images/macos/provision/utils/utils.sh +++ b/images/macos/provision/utils/utils.sh @@ -173,16 +173,15 @@ configure_user_tccdb () { } get_github_package_download_url() { - local REPO_OWNER=$1 - local REPO_NAME=$2 - local FILTER=$3 - local VERSION=$4 - local API_PAT=$5 + local REPO_ORG=$1 + local FILTER=$2 + local VERSION=$3 + local API_PAT=$4 local SEARCH_IN_COUNT="100" [ -n "$API_PAT" ] && authString=(-H "Authorization: token ${API_PAT}") - json=$(curl "${authString[@]}" -s "https://api.github.com/repos/${REPO_OWNER}/${REPO_NAME}/releases?per_page=${SEARCH_IN_COUNT}") + json=$(curl "${authString[@]}" -s "https://api.github.com/repos/${REPO_ORG}/releases?per_page=${SEARCH_IN_COUNT}") if [[ "$VERSION" == "latest" ]]; then tagName=$(echo $json | jq -r '.[] | select(.prerelease==false).tag_name' | sort --unique --version-sort | egrep -v ".*-[a-z]" | tail -1) From 6fd48d0a3a0e9d7d0f2d9f1fcfeaa5c0d177b3da Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 10 Feb 2022 08:37:35 +0000 Subject: [PATCH 0961/3485] Updating readme file for ubuntu18 version 20220207.1 (#5041) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu1804-Readme.md | 65 +++++++++++++++---------------- 1 file changed, 32 insertions(+), 33 deletions(-) diff --git a/images/linux/Ubuntu1804-Readme.md b/images/linux/Ubuntu1804-Readme.md index 1740af00787f..ed2b34ee91fa 100644 --- a/images/linux/Ubuntu1804-Readme.md +++ b/images/linux/Ubuntu1804-Readme.md @@ -2,11 +2,10 @@ |-| | [[All OSs] .NET 2.1 will be removed from the images on February, 21](https://github.com/actions/virtual-environments/issues/4871) | | [[Ubuntu] Issue with libstdc++ cannot allocate memory in static TLS block](https://github.com/actions/virtual-environments/issues/4799) | -| [[All OSs] Python version 3.5 will be removed from the images on January 24, 2022](https://github.com/actions/virtual-environments/issues/4744) | *** # Ubuntu 18.04.6 LTS - Linux kernel version: 5.4.0-1068-azure -- Image Version: 20220131.1 +- Image Version: 20220207.1 ## Installed Software ### Language and Runtime @@ -31,14 +30,14 @@ ### Package Management - cpan 1.64 - Helm 3.8.0 -- Homebrew 3.3.13 +- Homebrew 3.3.14 - Miniconda 4.10.3 - Npm 8.1.2 - Pip 9.0.1 - Pip3 9.0.1 - Pipx 1.0.0 - RubyGems 2.7.6 -- Vcpkg (build from master \<ec7906796>) +- Vcpkg (build from master \<d2b22891a>) - Yarn 1.22.17 #### Environment variables @@ -51,7 +50,7 @@ - Ant 1.10.5 - Gradle 7.3.3 - Maven 3.8.4 -- Sbt 1.6.1 +- Sbt 1.6.2 ### Tools - Ansible 2.11.8 @@ -62,7 +61,7 @@ - Bicep 0.4.1124 - Buildah 1.19.6 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - CMake 3.22.2 -- CodeQL Action Bundle 2.7.6 +- CodeQL Action Bundle 2.8.0 - Docker Compose v1 1.29.2 - Docker Compose v2 2.2.3+azure-1 - Docker-Buildx 0.7.1 @@ -73,11 +72,11 @@ - Git-ftp 1.3.1 - Haveged 1.9.1 - Heroku 7.59.2 -- HHVM (HipHop VM) 4.146.0 +- HHVM (HipHop VM) 4.147.0 - jq 1.5 - Kind 0.11.1 - Kubectl 1.23.3 -- Kustomize 4.4.1 +- Kustomize 4.5.1 - Leiningen 2.9.8 - MediaInfo 17.12 - Mercurial 4.5.3 @@ -86,32 +85,32 @@ - Newman 5.3.1 - nvm 0.39.1 - OpenSSL 1.1.1 11 Sep 2018 -- Packer 1.7.9 +- Packer 1.7.10 - Parcel 2.2.1 - PhantomJS 2.1.1 - Podman 3.0.1 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- Pulumi 3.23.2 +- Pulumi 3.24.1 - R 4.1.2 - Skopeo 1.2.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 - SVN 1.9.7 -- Terraform 1.1.4 +- Terraform 1.1.5 - yamllint 1.26.3 -- yq 4.18.1 +- yq 4.19.1 - zstd 1.5.2 (homebrew) ### CLI Tools - Alibaba Cloud CLI 3.0.107 -- AWS CLI 1.22.46 +- AWS CLI 1.22.50 - AWS CLI Session manager plugin 1.2.295.0 - AWS SAM CLI 1.37.0 - Azure CLI (azure-cli) 2.32.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) -- Azure CLI (azure-devops) 0.22.0 -- GitHub CLI 2.4.0 +- Azure CLI (azure-devops) 0.23.0 +- GitHub CLI 2.5.0 - Google Cloud SDK 369.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 8.15.1 -- OpenShift CLI 4.9.17 +- Netlify CLI 8.18.1 +- OpenShift CLI 4.9.18 - ORAS CLI 0.12.0 - Vercel CLI 23.1.2 @@ -119,15 +118,15 @@ | Version | Vendor | Environment Variable | | ------------------- | --------------- | -------------------- | | 8.0.312+7 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | -| 11.0.13+8 | Eclipse Temurin | JAVA_HOME_11_X64 | +| 11.0.14+9 | Eclipse Temurin | JAVA_HOME_11_X64 | | 12.0.2+10 | Adopt OpenJDK | JAVA_HOME_12_X64 | -| 17.0.1+12 | Eclipse Temurin | JAVA_HOME_17_X64 | +| 17.0.2+8 | Eclipse Temurin | JAVA_HOME_17_X64 | ### PHP | Tool | Version | | -------- | ---------------------------------------- | | PHP | 7.1.33 7.2.34 7.3.33 7.4.27 8.0.15 8.1.2 | -| Composer | 2.2.5 | +| Composer | 2.2.6 | | PHPUnit | 8.5.23 | ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. @@ -153,11 +152,11 @@ - Rustfmt 1.4.38 ### Browsers and Drivers -- Google Chrome 97.0.4692.99 -- ChromeDriver 97.0.4692.71 +- Google Chrome 98.0.4758.80 +- ChromeDriver 98.0.4758.80 - Mozilla Firefox 96.0 - Geckodriver 0.30.0 -- Chromium 97.0.4692.0 +- Chromium 98.0.4758.0 - Selenium server 4.1.0 #### Environment variables @@ -179,7 +178,7 @@ - sqlite3 3.22.0 #### MySQL -- MySQL 5.7.36 +- MySQL 5.7.37 - MySQL Server (user:root password:root) ``` @@ -196,8 +195,8 @@ - 1.17.6 #### Node.js -- 12.22.9 -- 14.18.3 +- 12.22.10 +- 14.19.0 - 16.13.2 #### PyPy @@ -248,7 +247,7 @@ | Package Name | Version | | -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 4.0 | -| Android Emulator | 31.2.6 | +| Android Emulator | 31.2.8 | | Android SDK Build-tools | 32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3<br>26.0.0 26.0.1 26.0.2 26.0.3<br>25.0.0 25.0.1 25.0.2 25.0.3<br>24.0.0 24.0.1 24.0.2 24.0.3<br>23.0.1 23.0.2 23.0.3 | | Android SDK Platform-Tools | 32.0.0 | | Android SDK Platforms | android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3)<br>android-26 (rev 2)<br>android-25 (rev 3)<br>android-24 (rev 2)<br>android-23 (rev 3) | @@ -283,15 +282,15 @@ | debian:11 | sha256:fb45fd4e25abe55a656ca69a7bef70e62099b8bb42a279a5e0ea4ae1ab410e0d | 2022-01-26 | | debian:9 | sha256:4bb600434787c903886fe33526d19ff33114a33b433a4a4cdbdf9b8543f1ab5d | 2022-01-26 | | moby/buildkit:latest | sha256:d6c89b7085b106301645ddcc77cf64eb7b705ab507b72d52d130ac33f1300417 | 2021-11-18 | -| node:12 | sha256:07ae688134d80b6359311641cc6fff6947108213367f7f3e0002a829464700dc | 2022-01-27 | -| node:12-alpine | sha256:c3e7817c8fd124f1597cd66124d247db8e138e8ef311ba085b7104d900129d0b | 2022-01-12 | -| node:14 | sha256:252f6cef16c7f9abde7c10c983c02d6db8638c8caf559865a5958339b6575059 | 2022-01-27 | -| node:14-alpine | sha256:a9b200d25469261a4cccde176db08ec9f0b5799fa4220d8edfe57e69684c6dad | 2022-01-11 | +| node:12 | sha256:7e1786920f4ebd88f8cc2dc9906f3c85ac78674cb29dcced535ff150a96f0873 | 2022-02-04 | +| node:12-alpine | sha256:dfa564312367b1a8fca8db7ae4bae102b28e68b39ebcb7b17022c938f105846b | 2022-02-04 | +| node:14 | sha256:b2c75df8c9706156c38b4f1f678d00e11cb2bfda09fc4ab6e36ec17ac9163865 | 2022-02-02 | +| node:14-alpine | sha256:9a2aa545388a135b496bd55cef2be920b96c4526c99c140170e05a8de3fce653 | 2022-02-02 | | node:16 | sha256:2033f4cc18f9d8b5d0baa7f276aaeffd202e1a2c6fe9af408af05a34fe68cbfb | 2022-01-27 | | node:16-alpine | sha256:2f50f4a428f8b5280817c9d4d896dbee03f072e93f4e0c70b90cc84bd1fcfe0d | 2022-01-12 | | ubuntu:16.04 | sha256:0f71fa8d4d2d4292c3c617fda2b36f6dabe5c8b6e34c3dc5b0d17d4e704bd39c | 2021-08-31 | -| ubuntu:18.04 | sha256:37b7471c1945a2a12e5a57488ee4e3e216a8369d0b9ee1ec2e41db9c2c1e3d22 | 2022-01-07 | -| ubuntu:20.04 | sha256:b5a61709a9a44284d88fb12e5c48db0409cfad5b69d4ff8224077c57302df9cf | 2022-01-07 | +| ubuntu:18.04 | sha256:c2aa13782650aa7ade424b12008128b60034c795f25456e8eb552d0a0f447cad | 2022-02-02 | +| ubuntu:20.04 | sha256:669e010b58baf5beb2836b253c1fd5768333f0d1dbcb834f7c07a4dc93f474be | 2022-02-02 | ### Installed apt packages | Name | Version | From 84450e8a9dbeb46e68fa6c2484d7d02e21c87546 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 10 Feb 2022 12:39:17 +0000 Subject: [PATCH 0962/3485] Updating readme file for ubuntu20 version 20220207.1 (#5040) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2004-Readme.md | 63 +++++++++++++++---------------- 1 file changed, 31 insertions(+), 32 deletions(-) diff --git a/images/linux/Ubuntu2004-Readme.md b/images/linux/Ubuntu2004-Readme.md index 1df3270dda32..11b99a6328cd 100644 --- a/images/linux/Ubuntu2004-Readme.md +++ b/images/linux/Ubuntu2004-Readme.md @@ -2,11 +2,10 @@ |-| | [[All OSs] .NET 2.1 will be removed from the images on February, 21](https://github.com/actions/virtual-environments/issues/4871) | | [[Ubuntu] Issue with libstdc++ cannot allocate memory in static TLS block](https://github.com/actions/virtual-environments/issues/4799) | -| [[All OSs] Python version 3.5 will be removed from the images on January 24, 2022](https://github.com/actions/virtual-environments/issues/4744) | *** # Ubuntu 20.04.3 LTS - Linux kernel version: 5.11.0-1028-azure -- Image Version: 20220131.1 +- Image Version: 20220207.1 ## Installed Software ### Language and Runtime @@ -31,14 +30,14 @@ ### Package Management - cpan 1.64 - Helm 3.8.0 -- Homebrew 3.3.13 +- Homebrew 3.3.14 - Miniconda 4.10.3 - Npm 8.1.2 - Pip 20.0.2 - Pip3 20.0.2 - Pipx 1.0.0 - RubyGems 3.1.2 -- Vcpkg (build from master \<2b543e52d>) +- Vcpkg (build from master \<d2b22891a>) - Yarn 1.22.17 #### Environment variables @@ -63,23 +62,23 @@ - Bicep 0.4.1124 - Buildah 1.21.3 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - CMake 3.22.2 -- CodeQL Action Bundle 2.7.6 +- CodeQL Action Bundle 2.8.0 - Docker Compose v1 1.29.2 - Docker Compose v2 2.2.3+azure-1 - Docker-Buildx 0.7.1 - Docker-Moby Client 20.10.11+azure-3 - Docker-Moby Server 20.10.11+azure-3 -- Fastlane 2.203.0 +- Fastlane 2.204.2 - Git 2.35.1 (apt source repository: ppa:git-core/ppa) - Git LFS 3.0.2 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.6.0 - Haveged 1.9.1 - Heroku 7.59.2 -- HHVM (HipHop VM) 4.146.0 +- HHVM (HipHop VM) 4.147.0 - jq 1.6 - Kind 0.11.1 - Kubectl 1.23.3 -- Kustomize 4.4.1 +- Kustomize 4.5.1 - Leiningen 2.9.8 - MediaInfo 19.09 - Mercurial 5.3.1 @@ -88,32 +87,32 @@ - Newman 5.3.1 - nvm 0.39.1 - OpenSSL 1.1.1f 31 Mar 2020 -- Packer 1.7.9 +- Packer 1.7.10 - Parcel 2.2.1 - PhantomJS 2.1.1 - Podman 3.4.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- Pulumi 3.23.2 +- Pulumi 3.24.1 - R 4.1.2 - Skopeo 1.3.0 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 -- Terraform 1.1.4 +- Terraform 1.1.5 - yamllint 1.26.3 -- yq 4.18.1 +- yq 4.19.1 - zstd 1.5.2 (homebrew) ### CLI Tools - Alibaba Cloud CLI 3.0.107 -- AWS CLI 2.4.15 +- AWS CLI 2.4.16 - AWS CLI Session manager plugin 1.2.295.0 - AWS SAM CLI 1.37.0 - Azure CLI (azure-cli) 2.32.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) -- Azure CLI (azure-devops) 0.22.0 -- GitHub CLI 2.4.0 +- Azure CLI (azure-devops) 0.23.0 +- GitHub CLI 2.5.0 - Google Cloud SDK 369.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 8.15.1 -- OpenShift CLI 4.9.17 +- Netlify CLI 8.18.1 +- OpenShift CLI 4.9.18 - ORAS CLI 0.12.0 - Vercel CLI 23.1.2 @@ -121,8 +120,8 @@ | Version | Vendor | Environment Variable | | ------------------- | --------------- | -------------------- | | 8.0.312+7 | Eclipse Temurin | JAVA_HOME_8_X64 | -| 11.0.13+8 (default) | Eclipse Temurin | JAVA_HOME_11_X64 | -| 17.0.1+12 | Eclipse Temurin | JAVA_HOME_17_X64 | +| 11.0.14+9 (default) | Eclipse Temurin | JAVA_HOME_11_X64 | +| 17.0.2+8 | Eclipse Temurin | JAVA_HOME_17_X64 | ### GraalVM | Version | Environment variables | @@ -133,7 +132,7 @@ | Tool | Version | | -------- | ------------------- | | PHP | 7.4.27 8.0.15 8.1.2 | -| Composer | 2.2.5 | +| Composer | 2.2.6 | | PHPUnit | 8.5.23 | ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. @@ -159,11 +158,11 @@ - Rustfmt 1.4.38 ### Browsers and Drivers -- Google Chrome 97.0.4692.99 -- ChromeDriver 97.0.4692.71 +- Google Chrome 98.0.4758.80 +- ChromeDriver 98.0.4758.80 - Mozilla Firefox 96.0 - Geckodriver 0.30.0 -- Chromium 97.0.4692.0 +- Chromium 98.0.4758.0 - Selenium server 4.1.0 #### Environment variables @@ -202,8 +201,8 @@ - 1.17.6 #### Node.js -- 12.22.9 -- 14.18.3 +- 12.22.10 +- 14.19.0 - 16.13.2 #### PyPy @@ -257,7 +256,7 @@ | Package Name | Version | | -------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 4.0 | -| Android Emulator | 31.2.6 | +| Android Emulator | 31.2.8 | | Android SDK Build-tools | 32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | | Android SDK Platform-Tools | 32.0.0 | | Android SDK Platforms | android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | @@ -291,15 +290,15 @@ | debian:11 | sha256:fb45fd4e25abe55a656ca69a7bef70e62099b8bb42a279a5e0ea4ae1ab410e0d | 2022-01-26 | | debian:9 | sha256:4bb600434787c903886fe33526d19ff33114a33b433a4a4cdbdf9b8543f1ab5d | 2022-01-26 | | moby/buildkit:latest | sha256:d6c89b7085b106301645ddcc77cf64eb7b705ab507b72d52d130ac33f1300417 | 2021-11-18 | -| node:12 | sha256:07ae688134d80b6359311641cc6fff6947108213367f7f3e0002a829464700dc | 2022-01-27 | -| node:12-alpine | sha256:c3e7817c8fd124f1597cd66124d247db8e138e8ef311ba085b7104d900129d0b | 2022-01-12 | -| node:14 | sha256:252f6cef16c7f9abde7c10c983c02d6db8638c8caf559865a5958339b6575059 | 2022-01-27 | -| node:14-alpine | sha256:a9b200d25469261a4cccde176db08ec9f0b5799fa4220d8edfe57e69684c6dad | 2022-01-11 | +| node:12 | sha256:7e1786920f4ebd88f8cc2dc9906f3c85ac78674cb29dcced535ff150a96f0873 | 2022-02-04 | +| node:12-alpine | sha256:dfa564312367b1a8fca8db7ae4bae102b28e68b39ebcb7b17022c938f105846b | 2022-02-04 | +| node:14 | sha256:b2c75df8c9706156c38b4f1f678d00e11cb2bfda09fc4ab6e36ec17ac9163865 | 2022-02-02 | +| node:14-alpine | sha256:9a2aa545388a135b496bd55cef2be920b96c4526c99c140170e05a8de3fce653 | 2022-02-02 | | node:16 | sha256:2033f4cc18f9d8b5d0baa7f276aaeffd202e1a2c6fe9af408af05a34fe68cbfb | 2022-01-27 | | node:16-alpine | sha256:2f50f4a428f8b5280817c9d4d896dbee03f072e93f4e0c70b90cc84bd1fcfe0d | 2022-01-12 | | ubuntu:16.04 | sha256:0f71fa8d4d2d4292c3c617fda2b36f6dabe5c8b6e34c3dc5b0d17d4e704bd39c | 2021-08-31 | -| ubuntu:18.04 | sha256:37b7471c1945a2a12e5a57488ee4e3e216a8369d0b9ee1ec2e41db9c2c1e3d22 | 2022-01-07 | -| ubuntu:20.04 | sha256:b5a61709a9a44284d88fb12e5c48db0409cfad5b69d4ff8224077c57302df9cf | 2022-01-07 | +| ubuntu:18.04 | sha256:c2aa13782650aa7ade424b12008128b60034c795f25456e8eb552d0a0f447cad | 2022-02-02 | +| ubuntu:20.04 | sha256:669e010b58baf5beb2836b253c1fd5768333f0d1dbcb834f7c07a4dc93f474be | 2022-02-02 | ### Installed apt packages | Name | Version | From a31ed06b100f23780aba4852bae10932115a6a33 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Thu, 10 Feb 2022 18:10:43 +0300 Subject: [PATCH 0963/3485] [macOS] Add test to check opened windows (#5052) * Add test to check opened windows * Move check before xcode * Move check after homebrew * Exclude NotificationCenter * Update pester test --- .../provision/core/open_windows_check.sh | 21 +++++++++++++++++++ images/macos/templates/macOS-10.15.json | 1 + images/macos/templates/macOS-11.json | 1 + images/macos/templates/macOS-11.pkr.hcl | 1 + images/macos/templates/macOS-12.json | 1 + images/macos/tests/System.Tests.ps1 | 8 +++++++ 6 files changed, 33 insertions(+) create mode 100644 images/macos/provision/core/open_windows_check.sh diff --git a/images/macos/provision/core/open_windows_check.sh b/images/macos/provision/core/open_windows_check.sh new file mode 100644 index 000000000000..1392e0654744 --- /dev/null +++ b/images/macos/provision/core/open_windows_check.sh @@ -0,0 +1,21 @@ +#!/bin/bash -e -o pipefail + +openwindows=$(osascript -e 'tell application "System Events" to get every window of (every process whose class of windows contains window)') +IFS=',' read -r -a windowslist <<< "$openwindows" + +if [ -n "${openwindows}" ]; then + echo "Found opened window:" +fi + +for window in "${windowslist[@]}"; do + if [[ $window =~ "NotificationCenter" ]]; then + echo "[Warning] $window" + else + echo " - ${window}" | xargs + scripterror=true + fi +done + +if [ "${scripterror}" = true ]; then + exit 1 +fi diff --git a/images/macos/templates/macOS-10.15.json b/images/macos/templates/macOS-10.15.json index c55bb3f58a99..cc67e74ce0e8 100644 --- a/images/macos/templates/macOS-10.15.json +++ b/images/macos/templates/macOS-10.15.json @@ -131,6 +131,7 @@ "scripts": [ "./provision/core/xcode-clt.sh", "./provision/core/homebrew.sh", + "./provision/core/open_windows_check.sh", "./provision/core/powershell.sh", "./provision/core/dotnet.sh", "./provision/core/python.sh", diff --git a/images/macos/templates/macOS-11.json b/images/macos/templates/macOS-11.json index 082228f72f1e..ed7b80dbe8db 100644 --- a/images/macos/templates/macOS-11.json +++ b/images/macos/templates/macOS-11.json @@ -136,6 +136,7 @@ "pause_before": "30s", "scripts": [ "./provision/core/homebrew.sh", + "./provision/core/open_windows_check.sh", "./provision/core/powershell.sh", "./provision/core/dotnet.sh", "./provision/core/python.sh", diff --git a/images/macos/templates/macOS-11.pkr.hcl b/images/macos/templates/macOS-11.pkr.hcl index 774856ecae7a..72bc9d59b74b 100644 --- a/images/macos/templates/macOS-11.pkr.hcl +++ b/images/macos/templates/macOS-11.pkr.hcl @@ -135,6 +135,7 @@ build { pause_before = "30s" scripts = [ "./provision/core/homebrew.sh", + "./provision/core/open_windows_check.sh", "./provision/core/powershell.sh", "./provision/core/dotnet.sh", "./provision/core/python.sh", diff --git a/images/macos/templates/macOS-12.json b/images/macos/templates/macOS-12.json index b10aa4fa19c4..8c54b7c1004e 100644 --- a/images/macos/templates/macOS-12.json +++ b/images/macos/templates/macOS-12.json @@ -136,6 +136,7 @@ "pause_before": "30s", "scripts": [ "./provision/core/homebrew.sh", + "./provision/core/open_windows_check.sh", "./provision/core/powershell.sh", "./provision/core/dotnet.sh", "./provision/core/python.sh", diff --git a/images/macos/tests/System.Tests.ps1 b/images/macos/tests/System.Tests.ps1 index f72ba8292fe3..ea96602e36c2 100644 --- a/images/macos/tests/System.Tests.ps1 +++ b/images/macos/tests/System.Tests.ps1 @@ -46,3 +46,11 @@ Describe "Screen Resolution" { system_profiler SPDisplaysDataType | Select-String "Resolution" | Should -Match "1176 x 885|1920 x 1080" } } + +Describe "Open windows" { + It "Opened windows not found" { + $cmd = "osascript -e 'tell application \""System Events\"" to get every window of (every process whose class of windows contains window)'" + $openWindows = bash -c $cmd + $openWindows.Split(",").Trim() | Where-Object { $_ -notmatch "NotificationCenter" } | Should -BeNullOrEmpty + } +} From 391111576403bced6ab5cb4a2aecd26f45d12899 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 10 Feb 2022 16:06:57 +0000 Subject: [PATCH 0964/3485] Updating readme file for macOS-11 version 20220207.1 (#5043) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-11-Readme.md | 34 +++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/images/macos/macos-11-Readme.md b/images/macos/macos-11-Readme.md index 5f5d76263a8b..23d1053bee0e 100644 --- a/images/macos/macos-11-Readme.md +++ b/images/macos/macos-11-Readme.md @@ -1,19 +1,18 @@ | Announcements | |-| | [[All OSs] .NET 2.1 will be removed from the images on February, 21](https://github.com/actions/virtual-environments/issues/4871) | -| [[All OSs] Python version 3.5 will be removed from the images on January 24, 2022](https://github.com/actions/virtual-environments/issues/4744) | *** # macOS 11.6 info - System Version: macOS 11.6.3 (20G415) - Kernel Version: Darwin 20.6.0 -- Image Version: 20220201.3 +- Image Version: 20220207.1 ## Installed Software ### Language and Runtime - .NET SDK 2.1.302 2.1.403 2.1.507 2.1.607 2.1.701 2.1.818 3.1.101 3.1.201 3.1.302 3.1.416 5.0.102 5.0.202 5.0.302 5.0.404 - Bash 3.2.57(1)-release -- Clang/LLVM 13.0.0 is available on `'$(brew --prefix llvm)/bin/clang'` - Clang/LLVM 13.0.0 is default +- Clang/LLVM 13.0.1 is available on `'$(brew --prefix llvm)/bin/clang'` - gcc-9 (Homebrew GCC 9.4.0) 9.4.0 - available by `gcc-9` alias - gcc-10 (Homebrew GCC 10.3.0) 10.3.0 - available by `gcc-10` alias - gcc-11 (Homebrew GCC 11.2.0_3) 11.2.0 - available by `gcc-11` alias @@ -31,13 +30,14 @@ - PHP 8.1.2 - Python 2.7.18 - Python 3.9.10 +- R 4.1.2 - Ruby 2.7.5p203 ### Package Management - Bundler version 2.3.6 - Carthage 0.38.0 - CocoaPods 1.11.2 -- Composer 2.2.5 +- Composer 2.2.6 - Homebrew 3.3.13 - Miniconda 4.10.3 - NPM 8.1.2 @@ -46,7 +46,7 @@ - Pip 21.3.1 (python 3.9) - Pipx 1.0.0 - RubyGems 3.2.33 -- Vcpkg 2021 (build from master \<8f315e852>) +- Vcpkg 2022 (build from master \<7e7dad5fe>) - Yarn 1.22.17 #### Environment variables @@ -82,7 +82,7 @@ - mongod v5.0.6 - Newman 5.3.1 - OpenSSL 1.1.1m 14 Dec 2021 `(/usr/local/opt/openssl@1.1 -> ../Cellar/openssl@1.1/1.1.1m)` -- Packer 1.7.8 +- Packer 1.7.10 - PostgreSQL 14.1 - psql (PostgreSQL) 14.1 - Sox 14.4.2 @@ -93,14 +93,14 @@ ### Tools - Aliyun CLI 3.0.107 - App Center CLI 2.10.8 -- AWS CLI 2.4.15 +- AWS CLI 2.4.16 - AWS SAM CLI 1.37.0 - AWS Session Manager CLI 1.2.295.0 - Azure CLI 2.32.0 - Bicep CLI 0.4.1124 - Cabal 3.6.2.0 - Cmake 3.22.2 -- Fastlane 2.203.0 +- Fastlane 2.204.2 - GHC 9.2.1 - GHCup 0.1.17.4 - Jazzy 0.14.1 @@ -117,9 +117,9 @@ - Safari 15.3 (16612.4.9.1.7) - SafariDriver 15.3 (16612.4.9.1.7) - Google Chrome 98.0.4758.80 -- ChromeDriver 97.0.4692.71 -- Microsoft Edge 97.0.1072.76 -- MSEdgeDriver 97.0.1072.76 +- ChromeDriver 98.0.4758.80 +- Microsoft Edge 98.0.1108.43 +- MSEdgeDriver 98.0.1108.43 - Mozilla Firefox 96.0.3 - geckodriver 0.30.0 - Selenium server 4.1.2 @@ -127,7 +127,7 @@ #### Environment variables | Name | Value | | --------------- | --------------------------------------------- | -| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/97.0.4692.71 | +| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/98.0.4758.80 | | EDGEWEBDRIVER | /usr/local/share/edge_driver | | GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | @@ -138,6 +138,11 @@ | 11.0.14+9 | Eclipse Temurin | JAVA_HOME_11_X64 | | 17.0.2+8 | Eclipse Temurin | JAVA_HOME_17_X64 | +### GraalVM +| Version | Environment variables | +| ----------- | --------------------- | +| CE 22.0.0.2 | GRAALVM_11_ROOT | + ### Cached Tools #### Ruby - 2.4.10 @@ -158,7 +163,7 @@ - 3.8.12 [PyPy 7.3.7] #### Node.js -- 12.22.9 +- 12.22.10 - 14.19.0 - 16.13.2 @@ -308,7 +313,7 @@ | Package Name | Version | | -------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 4.0 | -| Android Emulator | 31.2.6 | +| Android Emulator | 31.2.7 | | Android SDK Build-tools | 32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | | Android SDK Platforms | android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | | Android SDK Platform-Tools | 32.0.0 | @@ -331,6 +336,7 @@ ### Miscellaneous - libXext 1.3.4 - libXft 2.3.4 +- Tcl/Tk 8.6.12 - Zlib 1.2.11 From 62363d802198a663f5c912464c52e133143b9ad2 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 10 Feb 2022 16:07:18 +0000 Subject: [PATCH 0965/3485] Updating readme file for macOS-10.15 version 20220207.1 (#5042) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-10.15-Readme.md | 35 +++++++++++++++++------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/images/macos/macos-10.15-Readme.md b/images/macos/macos-10.15-Readme.md index 5948e4b94b0f..e7ad69d92b2c 100644 --- a/images/macos/macos-10.15-Readme.md +++ b/images/macos/macos-10.15-Readme.md @@ -1,19 +1,18 @@ | Announcements | |-| | [[All OSs] .NET 2.1 will be removed from the images on February, 21](https://github.com/actions/virtual-environments/issues/4871) | -| [[All OSs] Python version 3.5 will be removed from the images on January 24, 2022](https://github.com/actions/virtual-environments/issues/4744) | *** # macOS 10.15 info - System Version: macOS 10.15.7 (19H1713) - Kernel Version: Darwin 19.6.0 -- Image Version: 20220201.2 +- Image Version: 20220207.1 ## Installed Software ### Language and Runtime - .NET SDK 2.1.302 2.1.403 2.1.507 2.1.607 2.1.701 2.1.818 3.1.101 3.1.201 3.1.302 3.1.416 5.0.102 5.0.202 5.0.302 5.0.404 - Bash 3.2.57(1)-release - Clang/LLVM 12.0.0 is default -- Clang/LLVM 13.0.0 is available on `'$(brew --prefix llvm)/bin/clang'` +- Clang/LLVM 13.0.1 is available on `'$(brew --prefix llvm)/bin/clang'` - gcc-9 (Homebrew GCC 9.4.0) 9.4.0 - available by `gcc-9` alias - gcc-10 (Homebrew GCC 10.3.0) 10.3.0 - available by `gcc-10` alias - gcc-11 (Homebrew GCC 11.2.0_3) 11.2.0 - available by `gcc-11` alias @@ -38,8 +37,8 @@ - Bundler version 2.3.6 - Carthage 0.38.0 - CocoaPods 1.11.2 -- Composer 2.2.5 -- Homebrew 3.3.13 +- Composer 2.2.6 +- Homebrew 3.3.14 - Miniconda 4.10.3 - NPM 8.1.2 - NuGet 5.9.0.7134 @@ -47,7 +46,7 @@ - Pip 21.3.1 (python 3.9) - Pipx 1.0.0 - RubyGems 3.2.33 -- Vcpkg 2021 (build from master \<8f315e852>) +- Vcpkg 2022 (build from master \<d2b22891a>) - Yarn 1.22.17 #### Environment variables @@ -84,7 +83,7 @@ - mongod v5.0.6 - Newman 5.3.1 - OpenSSL 1.1.1m 14 Dec 2021 `(/usr/local/opt/openssl@1.1 -> ../Cellar/openssl@1.1/1.1.1m)` -- Packer 1.7.8 +- Packer 1.7.10 - PostgreSQL 14.1 - psql (PostgreSQL) 14.1 - Sox 14.4.2 @@ -97,14 +96,14 @@ ### Tools - Aliyun CLI 3.0.107 - App Center CLI 2.10.8 -- AWS CLI 2.4.15 +- AWS CLI 2.4.16 - AWS SAM CLI 1.37.0 - AWS Session Manager CLI 1.2.295.0 - Azure CLI 2.32.0 - Bicep CLI 0.4.1124 - Cabal 3.6.2.0 - Cmake 3.22.2 -- Fastlane 2.203.0 +- Fastlane 2.204.2 - GHC 9.2.1 - GHCup 0.1.17.4 - Jazzy 0.14.1 @@ -121,9 +120,9 @@ - Safari 15.3 (15612.4.9.1.7) - SafariDriver 15.3 (15612.4.9.1.7) - Google Chrome 98.0.4758.80 -- ChromeDriver 97.0.4692.71 -- Microsoft Edge 97.0.1072.76 -- MSEdgeDriver 97.0.1072.76 +- ChromeDriver 98.0.4758.80 +- Microsoft Edge 98.0.1108.43 +- MSEdgeDriver 98.0.1108.43 - Mozilla Firefox 96.0.3 - geckodriver 0.30.0 - Selenium server 4.1.2 @@ -131,7 +130,7 @@ #### Environment variables | Name | Value | | --------------- | --------------------------------------------- | -| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/97.0.4692.71 | +| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/98.0.4758.80 | | EDGEWEBDRIVER | /usr/local/share/edge_driver | | GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | @@ -145,6 +144,11 @@ | 14.0.2+12 | Adopt OpenJDK | JAVA_HOME_14_X64 | | 17.0.2+8 | Eclipse Temurin | JAVA_HOME_17_X64 | +### GraalVM +| Version | Environment variables | +| ----------- | --------------------- | +| CE 22.0.0.2 | GRAALVM_11_ROOT | + ### Cached Tools #### Ruby - 2.4.10 @@ -168,7 +172,7 @@ - 3.8.12 [PyPy 7.3.7] #### Node.js -- 12.22.9 +- 12.22.10 - 14.19.0 - 16.13.2 @@ -351,7 +355,7 @@ | Package Name | Version | | -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 4.0 | -| Android Emulator | 31.2.6 | +| Android Emulator | 31.2.8 | | Android SDK Build-tools | 32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3<br>26.0.0 26.0.1 26.0.2 26.0.3<br>25.0.0 25.0.1 25.0.2 25.0.3<br>24.0.0 24.0.1 24.0.2 24.0.3 | | Android SDK Platforms | android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3)<br>android-26 (rev 2)<br>android-25 (rev 3)<br>android-24 (rev 2) | | Android SDK Platform-Tools | 32.0.0 | @@ -377,6 +381,7 @@ ### Miscellaneous - libXext 1.3.4 - libXft 2.3.4 +- Tcl/Tk 8.6.12 - Zlib 1.2.11 From 63f134ecf5d24c708ab3e369bda318ad275ccb9e Mon Sep 17 00:00:00 2001 From: Rob Mensching <rob@firegiant.com> Date: Thu, 10 Feb 2022 08:26:58 -0800 Subject: [PATCH 0966/3485] [Windows] Add ARM/ARM64 libraries to windows-2022 (#5056) (#5058) --- images/win/toolsets/toolset-2022.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index a3530c89f9de..826380265c42 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -211,6 +211,8 @@ "Microsoft.VisualStudio.Component.VC.Tools.ARM64EC", "Microsoft.VisualStudio.Component.VC.v141.x86.x64", "Microsoft.VisualStudio.Component.VC.v141.x86.x64.Spectre", + "Microsoft.VisualStudio.Component.VC.v141.ARM.Spectre", + "Microsoft.VisualStudio.Component.VC.v141.ARM64.Spectre", "Microsoft.VisualStudio.Component.VC.v141.MFC", "Microsoft.VisualStudio.Component.VC.v141.MFC.Spectre", "Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM", From 8dfa279755d2a93f5e57f68af8e1dbd30a1128fb Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Fri, 11 Feb 2022 11:49:12 +0300 Subject: [PATCH 0967/3485] Add tccdb permissions for Anka (#5061) --- .../provision/configuration/configure-tccdb-macos11.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/images/macos/provision/configuration/configure-tccdb-macos11.sh b/images/macos/provision/configuration/configure-tccdb-macos11.sh index ad2e186b0998..449fd8a55427 100644 --- a/images/macos/provision/configuration/configure-tccdb-macos11.sh +++ b/images/macos/provision/configuration/configure-tccdb-macos11.sh @@ -11,11 +11,13 @@ systemValuesArray=( "'kTCCServiceSystemPolicyAllFiles','/usr/local/opt/runner/runprovisioner.sh',1,2,0,1,NULL,NULL,NULL,'UNUSED',NULL,0,1583997993" "'kTCCServiceAccessibility','com.apple.dt.Xcode-Helper',0,2,0,1,NULL,NULL,NULL,'UNUSED',NULL,NULL,1551941368" "'kTCCServiceSystemPolicyAllFiles','/bin/bash',1,2,0,1,NULL,NULL,NULL,'UNUSED',NULL,0,1583997993" - "'kTCCServiceAccessibility','/usr/libexec/sshd-keygen-wrapper',1,2,0,1,X'fade0c000000003c0000000100000006000000020000001d636f6d2e6170706c652e737368642d6b657967656e2d7772617070657200000000000003',NULL,NULL,'UNUSED',NULL,0,1591112564" + "'kTCCServiceSystemPolicyAllFiles','/usr/libexec/sshd-keygen-wrapper',1,0,4,1,X'fade0c000000003c0000000100000006000000020000001d636f6d2e6170706c652e737368642d6b657967656e2d7772617070657200000000000003',NULL,0,'UNUSED',NULL,0,1639660695" + "'kTCCServiceAccessibility','/usr/libexec/sshd-keygen-wrapper',1,2,4,1,X'fade0c000000003c0000000100000006000000020000001d636f6d2e6170706c652e737368642d6b657967656e2d7772617070657200000000000003',NULL,0,'UNUSED',NULL,0,1644564233" "'kTCCServiceAccessibility','com.apple.Terminal',0,2,0,1,X'fade0c000000003000000001000000060000000200000012636f6d2e6170706c652e5465726d696e616c000000000003',NULL,NULL,'UNUSED',NULL,0,1591180502" "'kTCCServiceAccessibility','/bin/bash',1,2,0,1,NULL,NULL,NULL,'UNUSED',NULL,0,1583997993" "'kTCCServiceMicrophone','/usr/local/opt/runner/runprovisioner.sh',1,2,0,1,NULL,NULL,NULL,'UNUSED',NULL,NULL,1576661342" "'kTCCServiceScreenCapture','/bin/bash',1,2,0,1,NULL,NULL,NULL,'UNUSED',NULL,0,1599831148" + "'kTCCServiceAccessibility','/Library/Application Support/Veertu/Anka/addons/ankarund',1,2,4,1,X'fade0c00000000ac0000000100000006000000020000001e636f6d2e7665657274752e616e6b612e6164646f6e732e616e6b6172756e0000000000060000000f000000060000000e000000010000000a2a864886f76364060206000000000000000000060000000e000000000000000a2a864886f7636406010d0000000000000000000b000000000000000a7375626a6563742e4f550000000000010000000a545439464157503656340000',NULL,0,'UNUSED',NULL,0,1644565949" # Allow Full Disk Access for "Microsoft Defender for macOS" to bypass installation on-flight "'kTCCServiceSystemPolicyAllFiles','com.microsoft.wdav',0,2,4,1,NULL,NULL,NULL,'UNUSED',NULL,0,1643970979" "'kTCCServiceSystemPolicyAllFiles','com.microsoft.wdav.epsext',0,2,4,1,NULL,NULL,NULL,'UNUSED',NULL,0,1643970979" @@ -31,7 +33,7 @@ userValuesArray=( "'kTCCServiceUbiquity','com.apple.CloudDocs.MobileDocumentsFileProvider',0,2,0,1,X'fade0c000000004c0000000100000006000000020000002f636f6d2e6170706c652e436c6f7564446f63732e4d6f62696c65446f63756d656e747346696c6550726f76696465720000000003',NULL,NULL,'UNUSED',NULL,0,1570793290" "'kTCCServiceAppleEvents','/usr/local/opt/runner/runprovisioner.sh',1,2,0,1,NULL,NULL,0,'com.apple.systemevents',NULL,NULL,1574241374" "'kTCCServiceSystemPolicyAllFiles','/usr/local/opt/runner/runprovisioner.sh',1,2,0,1,NULL,NULL,NULL,'UNUSED',NULL,0,1583997993" - "'kTCCServiceAppleEvents','/usr/libexec/sshd-keygen-wrapper',1,2,0,1,X'fade0c000000003c0000000100000006000000020000001d636f6d2e6170706c652e737368642d6b657967656e2d7772617070657200000000000003',NULL,0,'com.apple.systemevents',X'fade0c000000003400000001000000060000000200000016636f6d2e6170706c652e73797374656d6576656e7473000000000003',NULL,1591112538" + "'kTCCServiceAppleEvents','/usr/libexec/sshd-keygen-wrapper',1,2,3,1,X'fade0c000000003c0000000100000006000000020000001d636f6d2e6170706c652e737368642d6b657967656e2d7772617070657200000000000003',NULL,0,'com.apple.systemevents',X'fade0c000000003400000001000000060000000200000016636f6d2e6170706c652e73797374656d6576656e7473000000000003',NULL,1644564201" "'kTCCServiceAppleEvents','com.apple.Terminal',0,2,0,1,X'fade0c000000003000000001000000060000000200000012636f6d2e6170706c652e5465726d696e616c000000000003',NULL,0,'com.apple.systemevents',X'fade0c000000003400000001000000060000000200000016636f6d2e6170706c652e73797374656d6576656e7473000000000003',NULL,1591180478" "'kTCCServiceAppleEvents','/usr/libexec/sshd-keygen-wrapper',1,2,0,1,X'fade0c000000003c0000000100000006000000020000001d636f6d2e6170706c652e737368642d6b657967656e2d7772617070657200000000000003',NULL,0,'com.apple.finder',X'fade0c000000002c00000001000000060000000200000010636f6d2e6170706c652e66696e64657200000003',NULL,1591357685" "'kTCCServiceAppleEvents','/bin/bash',1,2,0,1,NULL,NULL,0,'com.apple.systemevents',NULL,NULL,1591532620" @@ -41,6 +43,7 @@ userValuesArray=( "'kTCCServiceUbiquity','/System/Library/PrivateFrameworks/PhotoLibraryServices.framework/Versions/A/Support/photolibraryd',1,2,5,1,NULL,NULL,NULL,'UNUSED',NULL,0,1619461750" "'kTCCServiceUbiquity','com.apple.PassKitCore',0,2,5,1,NULL,NULL,NULL,'UNUSED',NULL,0,1619516250" "'kTCCServiceAppleEvents','/Library/Application Support/Veertu/Anka/addons/ankarund',1,2,3,1,X'fade0c00000000ac0000000100000006000000020000001e636f6d2e7665657274752e616e6b612e6164646f6e732e616e6b6172756e0000000000060000000f000000060000000e000000010000000a2a864886f76364060206000000000000000000060000000e000000000000000a2a864886f7636406010d0000000000000000000b000000000000000a7375626a6563742e4f550000000000010000000a545439464157503656340000',NULL,0,'com.apple.finder',X'fade0c000000002c00000001000000060000000200000010636f6d2e6170706c652e66696e64657200000003',NULL,1629294900" + "'kTCCServiceAppleEvents','/Library/Application Support/Veertu/Anka/addons/ankarund',1,2,3,1,X'fade0c00000000ac0000000100000006000000020000001e636f6d2e7665657274752e616e6b612e6164646f6e732e616e6b6172756e0000000000060000000f000000060000000e000000010000000a2a864886f76364060206000000000000000000060000000e000000000000000a2a864886f7636406010d0000000000000000000b000000000000000a7375626a6563742e4f550000000000010000000a545439464157503656340000',NULL,0,'com.apple.systemevents',X'fade0c000000003400000001000000060000000200000016636f6d2e6170706c652e73797374656d6576656e7473000000000003',NULL,164456761" ) for values in "${userValuesArray[@]}"; do configure_user_tccdb "$values" From cd64c6838ee8009084ba4a203f473b48853cad22 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Fri, 11 Feb 2022 12:53:36 +0300 Subject: [PATCH 0968/3485] Install Azure DevOps extension for AZ CLI (#5057) --- images/macos/provision/core/commonutils.sh | 3 +++ images/macos/software-report/SoftwareReport.Common.psm1 | 5 +++++ images/macos/software-report/SoftwareReport.Generator.ps1 | 1 + images/macos/tests/BasicTools.Tests.ps1 | 6 ++++++ 4 files changed, 15 insertions(+) diff --git a/images/macos/provision/core/commonutils.sh b/images/macos/provision/core/commonutils.sh index 946dd4807ef9..f51d9b9ecbb5 100644 --- a/images/macos/provision/core/commonutils.sh +++ b/images/macos/provision/core/commonutils.sh @@ -19,6 +19,9 @@ done # Invoke bazel to download bazel version via bazelisk bazel +# Install Azure DevOps extension for Azure Command Line Interface +az extension add -n azure-devops + # Workaround https://github.com/actions/virtual-environments/issues/4931 # by making Tcl/Tk paths the same on macOS 10.15 and macOS 11 if is_BigSur; then diff --git a/images/macos/software-report/SoftwareReport.Common.psm1 b/images/macos/software-report/SoftwareReport.Common.psm1 index 129ebdd3328a..b3282b10936b 100644 --- a/images/macos/software-report/SoftwareReport.Common.psm1 +++ b/images/macos/software-report/SoftwareReport.Common.psm1 @@ -422,6 +422,11 @@ function Get-AzureCLIVersion { return "Azure CLI $azureCLIVersion" } +function Get-AzureDevopsVersion { + $azdevopsVersion = (az version | ConvertFrom-Json).extensions.'azure-devops' + return "Azure CLI (azure-devops) $azdevopsVersion" +} + function Get-AWSCLIVersion { $awsVersion = Run-Command "aws --version" | Take-Part -Part 0 | Take-Part -Delimiter "/" -Part 1 return "AWS CLI $awsVersion" diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1 index 22a99a027e21..e74d87816551 100644 --- a/images/macos/software-report/SoftwareReport.Generator.ps1 +++ b/images/macos/software-report/SoftwareReport.Generator.ps1 @@ -155,6 +155,7 @@ $toolsList = @( (Get-CmakeVersion), (Get-AppCenterCLIVersion), (Get-AzureCLIVersion), + (Get-AzureDevopsVersion), (Get-AWSCLIVersion), (Get-AWSSAMCLIVersion), (Get-AWSSessionManagerCLIVersion) diff --git a/images/macos/tests/BasicTools.Tests.ps1 b/images/macos/tests/BasicTools.Tests.ps1 index 96d4f6e81af1..7815ae9b5704 100644 --- a/images/macos/tests/BasicTools.Tests.ps1 +++ b/images/macos/tests/BasicTools.Tests.ps1 @@ -6,6 +6,12 @@ Describe "Azure CLI" { } } +Describe "Azure DevOps CLI" { + It "az devops" { + "az devops -h" | Should -ReturnZeroExitCode + } +} + Describe "Carthage" { It "Carthage" { "carthage version" | Should -ReturnZeroExitCode From 6d6a64bbbebe0671359524af0ab63614c534cd22 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Fri, 11 Feb 2022 19:23:37 +0300 Subject: [PATCH 0969/3485] Anka disable keyboard window (#5062) --- images/macos/provision/configuration/configure-machine.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/images/macos/provision/configuration/configure-machine.sh b/images/macos/provision/configuration/configure-machine.sh index fe489e7629c7..e9c193d6e1ae 100644 --- a/images/macos/provision/configuration/configure-machine.sh +++ b/images/macos/provision/configuration/configure-machine.sh @@ -12,6 +12,11 @@ sudo rm -f /var/vm/sleepimage # Disable App Nap System Wide defaults write NSGlobalDomain NSAppSleepDisabled -bool YES +# Disable Keyboard Setup Assistant window +if [ -d "/Library/Application Support/Veertu" ]; then + sudo defaults write /Library/Preferences/com.apple.keyboardtype "keyboardtype" -dict-add "3-7582-0" -int 40 +fi + # Change screen resolution to the maximum supported for 4Mb video memory if [ -d "/Library/Application Support/VMware Tools" ]; then sudo "/Library/Application Support/VMware Tools/vmware-resolutionSet" 1176 885 From 7f1bc9ed1e3cff016136346e8f12eec301c6c11f Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Mon, 14 Feb 2022 12:07:00 +0300 Subject: [PATCH 0970/3485] Set condition to install 98.0.1108.50 instead of 98.0.1108.51 (#5070) --- images/win/scripts/Installers/Install-Edge.ps1 | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/images/win/scripts/Installers/Install-Edge.ps1 b/images/win/scripts/Installers/Install-Edge.ps1 index 5b1e3a4449c8..32eb8c60ab9d 100644 --- a/images/win/scripts/Installers/Install-Edge.ps1 +++ b/images/win/scripts/Installers/Install-Edge.ps1 @@ -27,6 +27,14 @@ $EdgeDriverVersionFile = Start-DownloadWithRetry -Url $EdgeDriverVersionUrl -Nam Write-Host "Download Microsoft Edge WebDriver..." $EdgeDriverLatestVersion = Get-Content -Path $EdgeDriverVersionFile $EdgeDriverArchName = "edgedriver_win64.zip" + +# A temporary workaround to install the previous driver version because 98.0.1108.51 for win64 doesn't exist +if ($EdgeDriverLatestVersion -eq "98.0.1108.51") +{ + $EdgeDriverLatestVersion = "98.0.1108.50" + Set-Content -Path "${EdgeDriverPath}\versioninfo.txt" -Value $EdgeDriverLatestVersion +} + $EdgeDriverDownloadUrl = "https://msedgedriver.azureedge.net/${EdgeDriverLatestVersion}/${EdgeDriverArchName}" $EdgeDriverArchPath = Start-DownloadWithRetry -Url $EdgeDriverDownloadUrl -Name $EdgeDriverArchName From 182b14b8ec1701db42d2749aa3c18ba6afd02045 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 16 Feb 2022 06:43:28 +0000 Subject: [PATCH 0971/3485] Updating readme file for win22 version 20220207.1 (#5050) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2022-Readme.md | 59 +++++++++++++++++++------------- 1 file changed, 36 insertions(+), 23 deletions(-) diff --git a/images/win/Windows2022-Readme.md b/images/win/Windows2022-Readme.md index d1884674bfeb..b1d3977e46aa 100644 --- a/images/win/Windows2022-Readme.md +++ b/images/win/Windows2022-Readme.md @@ -2,12 +2,11 @@ |-| | [[All OSs] .NET 2.1 will be removed from the images on February, 21](https://github.com/actions/virtual-environments/issues/4871) | | [windows-latest workflows will use Windows Server 2022](https://github.com/actions/virtual-environments/issues/4856) | -| [[All OSs] Python version 3.5 will be removed from the images on January 24, 2022](https://github.com/actions/virtual-environments/issues/4744) | | [Windows-2016 environment will be removed on March 15, 2022](https://github.com/actions/virtual-environments/issues/4312) | *** # Microsoft Windows Server 2022 Datacenter - OS Version: 10.0.20348 Build 473 -- Image Version: 20220131.1 +- Image Version: 20220207.1 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -16,26 +15,26 @@ ### Language and Runtime - Bash 4.4.23(2)-release - Go 1.16.13 -- Julia 1.7.1 +- Julia 1.7.2 - Kotlin 1.6.10 - LLVM 13.0.0 - Node 16.13.2 - Perl 5.32.1 - PHP 8.1.2 -- Python 3.9.9 +- Python 3.9.10 - Ruby 3.0.3p157 ### Package Management - Chocolatey 0.12.1 -- Composer 2.2.5 +- Composer 2.2.6 - Helm 3.7.2 - Miniconda 4.10.3 (pre-installed on the image but not added to PATH) - NPM 8.1.2 - NuGet 6.0.0.280 -- pip 22.0.2 (python 3.9) +- pip 22.0.3 (python 3.9) - Pipx 1.0.0 - RubyGems 3.2.32 -- Vcpkg (build from master \<8518284c1>) +- Vcpkg (build from master \<afb2279ad>) - Yarn 1.22.17 #### Environment variables @@ -47,7 +46,7 @@ - Ant 1.10.12 - Gradle 7.3 - Maven 3.8.4 -- sbt 1.6.1 +- sbt 1.6.2 ### Tools - 7zip 21.07 @@ -58,13 +57,14 @@ - Bicep 0.4.1124 - Cabal 3.6.2.0 - CMake 3.22.2 -- CodeQL Action Bundle 2.7.6 +- CodeQL Action Bundle 2.8.0 - Docker 20.10.7 - Docker-compose 1.29.2 - Docker-wincred 0.6.4 - ghc 9.2.1 - Git 2.35.1 - Git LFS 3.0.2 +- InnoSetup 6.2.0 - jq 1.6 - Kind 0.11.1 - Kubectl 1.23.3 @@ -74,7 +74,7 @@ - NSIS v3.08 - OpenSSL 1.1.1 - Packer 1.7.8 -- Pulumi v3.23.0 +- Pulumi v3.24.1 - R 4.1.2 - Service Fabric SDK 8.2.1363.9590 - Stack 2.7.3 @@ -88,12 +88,12 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.107 -- AWS CLI 2.4.15 +- AWS CLI 2.4.16 - AWS SAM CLI 1.37.0 - AWS Session Manager CLI 1.2.295.0 -- Azure CLI 2.32.0 -- Azure DevOps CLI extension 0.22.0 -- GitHub CLI 2.4.0 +- Azure CLI 2.33.0 +- Azure DevOps CLI extension 0.23.0 +- GitHub CLI 2.5.0 - Hub CLI 2.14.2 ### Rust Tools @@ -111,10 +111,10 @@ - Rustfmt 1.4.38 ### Browsers and webdrivers -- Google Chrome 97.0.4692.99 -- Chrome Driver 97.0.4692.71 -- Microsoft Edge 97.0.1072.76 -- Microsoft Edge Driver 97.0.1072.76 +- Google Chrome 98.0.4758.80 +- Chrome Driver 98.0.4758.80 +- Microsoft Edge 98.0.1108.43 +- Microsoft Edge Driver 98.0.1108.43 - Mozilla Firefox 96.0.3 - Gecko Driver 0.30.0 - IE Driver 3.150.1.1 @@ -163,8 +163,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Node | Version | Architecture | | ------- | ------------ | -| 12.22.9 | x64 | -| 14.18.3 | x64 | +| 12.22.10 | x64 | +| 14.19.0 | x64 | | 16.13.2 | x64 | #### Python @@ -172,8 +172,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | ------- | ------------ | | 3.7.9 | x64, x86 | | 3.8.10 | x64, x86 | -| 3.9.9 (Default) | x64, x86 | -| 3.10.1 | x64, x86 | +| 3.9.10 (Default) | x64, x86 | +| 3.10.2 | x64, x86 | #### Ruby | Version | Architecture | @@ -234,11 +234,13 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Component.Linux.CMake | 17.0.31804.368 | | Component.MDD.Android | 17.0.31804.368 | | Component.MDD.Linux | 17.0.31804.368 | +| Component.MDD.Linux.GCC.arm | 17.0.31804.368 | | Component.Microsoft.VisualStudio.LiveShare.2022 | 1.0.4647 | | Component.Microsoft.VisualStudio.RazorExtension | 17.0.31804.368 | | Component.Microsoft.VisualStudio.Web.AzureFunctions | 17.0.31804.368 | | Component.Microsoft.Web.LibraryManager | 17.0.31804.368 | | Component.Microsoft.WebTools.BrowserLink.WebLivePreview | 17.0.31.12604 | +| Component.Microsoft.Windows.CppWinRT | 2.0.210806.1 | | Component.OpenJDK | 17.0.31804.368 | | Component.UnityEngine.x64 | 17.0.31804.368 | | Component.Unreal | 17.0.31804.368 | @@ -295,6 +297,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Component.DiagnosticTools | 17.0.31804.368 | | Microsoft.VisualStudio.Component.DockerTools | 17.0.31804.368 | | Microsoft.VisualStudio.Component.DotNetModelBuilder | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.DslTools | 17.0.31804.368 | | Microsoft.VisualStudio.Component.EntityFramework | 17.0.31804.368 | | Microsoft.VisualStudio.Component.FSharp | 17.0.31804.368 | | Microsoft.VisualStudio.Component.FSharp.Desktop | 17.0.31804.368 | @@ -349,6 +352,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Component.VC.ATLMFC.Spectre | 17.0.31804.368 | | Microsoft.VisualStudio.Component.VC.CLI.Support | 17.0.31804.368 | | Microsoft.VisualStudio.Component.VC.CMake.Project | 17.0.31804.368 | +| Microsoft.VisualStudio.Component.VC.CoreBuildTools | 17.0.31804.368 | | Microsoft.VisualStudio.Component.VC.CoreIde | 17.0.31804.368 | | Microsoft.VisualStudio.Component.VC.DiagnosticTools | 17.0.31804.368 | | Microsoft.VisualStudio.Component.VC.Llvm.Clang | 17.0.31804.368 | @@ -392,7 +396,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Llvm.Clang | 17.0.31804.368 | | Microsoft.VisualStudio.ComponentGroup.UWP.NetCoreAndStandard | 17.0.31804.368 | | Microsoft.VisualStudio.ComponentGroup.UWP.Support | 17.0.31804.368 | +| Microsoft.VisualStudio.ComponentGroup.UWP.VC.v142 | 17.0.31804.368 | | Microsoft.VisualStudio.ComponentGroup.UWP.Xamarin | 17.0.31804.368 | +| Microsoft.VisualStudio.ComponentGroup.VC.Tools.142.x86.x64 | 17.0.31821.396 | | Microsoft.VisualStudio.ComponentGroup.VisualStudioExtension.Prerequisites | 17.0.31804.368 | | Microsoft.VisualStudio.ComponentGroup.Web | 17.0.31804.368 | | Microsoft.VisualStudio.ComponentGroup.Web.CloudTools | 17.0.31804.368 | @@ -434,6 +440,13 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft Visual C++ 2022 Debug Runtime | x86 | 14.30.30708 | | Microsoft Visual C++ 2022 Minimum Runtime | x86 | 14.30.30708 | +#### Installed Windows SDKs +`Location C:\Program Files (x86)\Windows Kits\10\Extension SDKs\WindowsDesktop` +- 10.0.17763.0 +- 10.0.19041.0 +- 10.0.20348.0 +- 10.0.22000.0 + ### .NET Core SDK `Location C:\Program Files\dotnet\sdk` - 3.1.120 3.1.202 3.1.302 3.1.416 5.0.104 5.0.210 5.0.303 5.0.404 6.0.101 @@ -488,7 +501,7 @@ All other versions are saved but not installed. | Package Name | Version | | -------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 4.0 | -| Android Emulator | 31.2.6 | +| Android Emulator | 31.2.8 | | Android SDK Build-tools | 32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | | Android SDK Platforms | android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | | Android SDK Platform-Tools | 32.0.0 | From db5ec5cf33847a88b23bb33bb6e92d1bc12f3f9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Dunglas?= <dunglas@gmail.com> Date: Wed, 16 Feb 2022 08:55:13 +0100 Subject: [PATCH 0972/3485] feat: explain how to start PostgreSQL (#4909) --- .../SoftwareReport/SoftwareReport.Databases.psm1 | 15 +++++++++++++++ .../SoftwareReport/SoftwareReport.Generator.ps1 | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Databases.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Databases.psm1 index 5cdfddc2b033..6966527f7f43 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Databases.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Databases.psm1 @@ -33,6 +33,21 @@ function Get-SqlPackageVersion { return "SqlPackage $sqlPackageVersion" } +function Build-PostgreSqlSection { + $output = "" + + $output += New-MDHeader "PostgreSQL" -Level 4 + $output += New-MDList -Style Unordered -Lines @( + (Get-PostgreSqlVersion ), + "PostgreSQL Server (user:postgres)" + ) + $output += New-MDCode -Lines @( + "PostgreSQL service is disabled by default. Use the following command as a part of your job to start the service: 'sudo systemctl start postgresql.service'" + ) + + return $output +} + function Build-MySQLSection { $output = "" diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index 3fac0b7160c6..d824002ef9f4 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -236,12 +236,12 @@ $markdown += New-MDList -Lines $tools -Style Unordered $markdown += New-MDHeader "Databases" -Level 3 $markdown += New-MDList -Style Unordered -Lines (@( - (Get-PostgreSqlVersion), (Get-MongoDbVersion), (Get-SqliteVersion) ) | Sort-Object ) +$markdown += Build-PostgreSqlSection $markdown += Build-MySQLSection $markdown += Build-MSSQLToolsSection From 5e8049b8dc84d5a0a171476029af40a08e3d2de8 Mon Sep 17 00:00:00 2001 From: igorboskovic3 <Igor.boskovic@akvelon.com> Date: Wed, 16 Feb 2022 16:59:56 +0100 Subject: [PATCH 0973/3485] Remove .NET 2.1.x from images (#5080) Co-authored-by: Igor Boskovic <igor.boskovic3@outlook.com> --- images/macos/toolsets/toolset-10.15.json | 1 - images/macos/toolsets/toolset-11.json | 1 - 2 files changed, 2 deletions(-) diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index 2c86913f0b9d..6f955a250989 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -313,7 +313,6 @@ ], "dotnet": { "versions": [ - "2.1", "3.1", "5.0" ] diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index 35944fb5f968..afb72f5f9d65 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -275,7 +275,6 @@ ], "dotnet": { "versions": [ - "2.1", "3.1", "5.0" ] From 000b8058037257b15ff37f893d9405f9f66d8681 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Wed, 16 Feb 2022 19:56:48 +0300 Subject: [PATCH 0974/3485] Add exit 1 to each error case (#5092) --- images.CI/macos/move-vm.ps1 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/images.CI/macos/move-vm.ps1 b/images.CI/macos/move-vm.ps1 index 8e8c3b74963b..4128c36b7559 100644 --- a/images.CI/macos/move-vm.ps1 +++ b/images.CI/macos/move-vm.ps1 @@ -71,6 +71,7 @@ if ($env:AGENT_JOBSTATUS -eq 'Failed') { Write-Host "VM has been successfully powered off and renamed to [${VMName}_failed]" } catch { Write-Host "##vso[task.LogIssue type=error;]Failed to power off and rename VM '$VMName'" + exit 1 } } @@ -79,6 +80,7 @@ try { Write-Host "VM has been moved successfully to target datastore '$TargetDataStore'" } catch { Write-Host "##vso[task.LogIssue type=error;]Failed to move VM '$VMName' to target datastore '$TargetDataStore'" + exit 1 } try { @@ -86,4 +88,5 @@ try { $vm | Set-VM -NumCPU $CpuCount -CoresPerSocket $CoresPerSocketCount -MemoryMB $Memory -Confirm:$false -ErrorAction Stop | Out-Null } catch { Write-Host "##vso[task.LogIssue type=error;]Failed to change specs for VM '$VMName'" + exit 1 } From cc2a6e1158e7745bb2d86904eb235800a9cbb194 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Wed, 16 Feb 2022 22:23:56 +0300 Subject: [PATCH 0975/3485] Skip preview android sdk platforms installation (#5089) --- images/win/scripts/Installers/Install-AndroidSDK.ps1 | 5 +---- images/win/scripts/Tests/Android.Tests.ps1 | 6 ++---- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/images/win/scripts/Installers/Install-AndroidSDK.ps1 b/images/win/scripts/Installers/Install-AndroidSDK.ps1 index dfb163cf1026..6f70e77a43dc 100644 --- a/images/win/scripts/Installers/Install-AndroidSDK.ps1 +++ b/images/win/scripts/Installers/Install-AndroidSDK.ps1 @@ -58,14 +58,11 @@ $androidPackages = Get-AndroidPackages -AndroidSDKManagerPath $sdkManager # platforms [int]$platformMinVersion = $androidToolset.platform_min_version -$platformListByVersion = Get-AndroidPackagesByVersion -AndroidPackages $androidPackages ` +$platformList = Get-AndroidPackagesByVersion -AndroidPackages $androidPackages ` -PrefixPackageName "platforms;" ` -MinimumVersion $platformMinVersion ` -Delimiter "-" ` -Index 1 -$platformListByName = Get-AndroidPackagesByName -AndroidPackages $androidPackages ` - -PrefixPackageName "platforms;" | Where-Object {$_ -match "-\D+$"} -$platformList = $platformListByVersion + $platformListByName # build-tools [version]$buildToolsMinVersion = $androidToolset.build_tools_min_version diff --git a/images/win/scripts/Tests/Android.Tests.ps1 b/images/win/scripts/Tests/Android.Tests.ps1 index 6ca51c2fe805..89f08d59e03e 100644 --- a/images/win/scripts/Tests/Android.Tests.ps1 +++ b/images/win/scripts/Tests/Android.Tests.ps1 @@ -14,14 +14,12 @@ Describe "Android SDK" { $platformTestCases = @() [int]$platformMinVersion = $androidToolset.platform_min_version - $platformListByVersion = Get-AndroidPackagesByVersion -AndroidPackages $androidPackages ` + $platformList = Get-AndroidPackagesByVersion -AndroidPackages $androidPackages ` -PrefixPackageName "platforms;" ` -MinimumVersion $platformMinVersion ` -Delimiter "-" ` -Index 1 - $platformListByName = Get-AndroidPackagesByName -AndroidPackages $androidPackages ` - -PrefixPackageName "platforms;" | Where-Object {$_ -match "-\D+$"} - $platformList = $platformListByVersion + $platformListByName + $platformList | ForEach-Object { $platformTestCases += @{ platformVersion = $_; installedPackages = $androidInstalledPackages } } From cb5ab38b093b7d42f7e6e34a033eb3a537950262 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Thu, 17 Feb 2022 11:40:06 +0300 Subject: [PATCH 0976/3485] Run osascript with retry (#5090) --- images/macos/provision/core/open_windows_check.sh | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/images/macos/provision/core/open_windows_check.sh b/images/macos/provision/core/open_windows_check.sh index 1392e0654744..002c254bdf9c 100644 --- a/images/macos/provision/core/open_windows_check.sh +++ b/images/macos/provision/core/open_windows_check.sh @@ -1,6 +1,16 @@ #!/bin/bash -e -o pipefail -openwindows=$(osascript -e 'tell application "System Events" to get every window of (every process whose class of windows contains window)') +retry=10 +while [ $retry -gt 0 ]; do + openwindows=$(osascript -e 'tell application "System Events" to get every window of (every process whose class of windows contains window)') && break + + retry=$((retry-1)) + if [ $retry -eq 0 ]; then + echo "No retry attempts left" + exit 1 + fi + sleep 30 +done IFS=',' read -r -a windowslist <<< "$openwindows" if [ -n "${openwindows}" ]; then From c344d3b25ac57031d49f323e0fd35132f5287136 Mon Sep 17 00:00:00 2001 From: Joshua Miner <animus_yosho@msn.com> Date: Thu, 17 Feb 2022 02:41:07 -0600 Subject: [PATCH 0977/3485] add AWSPowershell module (#5091) * add AWSPowershell module * remove readme changes because they are auto genera Co-authored-by: Joshua Miner <josh.miner@teleopti.com> --- images/win/toolsets/toolset-2016.json | 3 ++- images/win/toolsets/toolset-2019.json | 3 ++- images/win/toolsets/toolset-2022.json | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/images/win/toolsets/toolset-2016.json b/images/win/toolsets/toolset-2016.json index e8d8a7be174d..0e2b153dc22e 100644 --- a/images/win/toolsets/toolset-2016.json +++ b/images/win/toolsets/toolset-2016.json @@ -85,7 +85,8 @@ {"name": "PSWindowsUpdate"}, {"name": "SqlServer"}, {"name": "VSSetup"}, - {"name": "Microsoft.Graph"} + {"name": "Microsoft.Graph"}, + {"name": "AWSPowershell"} ], "azureModules": [ { diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index caf928b559c0..273f5cd70ba0 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -86,7 +86,8 @@ {"name": "PSWindowsUpdate"}, {"name": "SqlServer"}, {"name": "VSSetup"}, - {"name": "Microsoft.Graph"} + {"name": "Microsoft.Graph"}, + {"name": "AWSPowershell"} ], "azureModules": [ { diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index 826380265c42..4a5d61361164 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -78,7 +78,8 @@ { "name": "PSWindowsUpdate" }, { "name": "SqlServer" }, { "name": "VSSetup" }, - { "name": "Microsoft.Graph" } + { "name": "Microsoft.Graph" }, + {"name": "AWSPowershell"} ], "azureModules": [ { From c5f3a44d5598eb5b3cdaa1a7f8f3c22e53a4e239 Mon Sep 17 00:00:00 2001 From: igorboskovic3 <Igor.boskovic@akvelon.com> Date: Thu, 17 Feb 2022 09:42:43 +0100 Subject: [PATCH 0978/3485] Remove .NET 2.1.x from image (#5086) Co-authored-by: Igor Boskovic <igor.boskovic3@outlook.com> --- images/linux/toolsets/toolset-1804.json | 1 - images/linux/toolsets/toolset-2004.json | 1 - 2 files changed, 2 deletions(-) diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index 7110cd3b8372..bad264fd438d 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -251,7 +251,6 @@ "dotnet-sdk-6.0" ], "versions": [ - "2.1", "3.1", "5.0", "6.0" diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index 5a4d140cd8cf..ea9d237761d3 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -251,7 +251,6 @@ "dotnet-sdk-6.0" ], "versions": [ - "2.1", "3.1", "5.0", "6.0" From bf9a61a3c2eba1a6a0fd56435fa7d1e14052b349 Mon Sep 17 00:00:00 2001 From: igorboskovic3 <Igor.boskovic@akvelon.com> Date: Thu, 17 Feb 2022 09:42:56 +0100 Subject: [PATCH 0979/3485] Remove .NET 2.1.x from images (#5087) Co-authored-by: Igor Boskovic <igor.boskovic3@outlook.com> --- images/win/toolsets/toolset-2016.json | 1 - images/win/toolsets/toolset-2019.json | 1 - 2 files changed, 2 deletions(-) diff --git a/images/win/toolsets/toolset-2016.json b/images/win/toolsets/toolset-2016.json index 0e2b153dc22e..9b5015eebe30 100644 --- a/images/win/toolsets/toolset-2016.json +++ b/images/win/toolsets/toolset-2016.json @@ -383,7 +383,6 @@ }, "dotnet": { "versions": [ - "2.1", "3.1", "5.0" ], diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index 273f5cd70ba0..db2a57f54790 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -418,7 +418,6 @@ }, "dotnet": { "versions": [ - "2.1", "3.1", "5.0" ], From 054dab12c8210233228f765d997b061ac0e486d2 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 17 Feb 2022 11:21:45 +0000 Subject: [PATCH 0980/3485] Updating readme file for macOS-11 version 20220212.1 (#5075) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-11-Readme.md | 53 +++++++++++++++++---------------- 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/images/macos/macos-11-Readme.md b/images/macos/macos-11-Readme.md index 23d1053bee0e..4820acf7cd98 100644 --- a/images/macos/macos-11-Readme.md +++ b/images/macos/macos-11-Readme.md @@ -5,11 +5,11 @@ # macOS 11.6 info - System Version: macOS 11.6.3 (20G415) - Kernel Version: Darwin 20.6.0 -- Image Version: 20220207.1 +- Image Version: 20220212.1 ## Installed Software ### Language and Runtime -- .NET SDK 2.1.302 2.1.403 2.1.507 2.1.607 2.1.701 2.1.818 3.1.101 3.1.201 3.1.302 3.1.416 5.0.102 5.0.202 5.0.302 5.0.404 +- .NET SDK 2.1.302 2.1.403 2.1.507 2.1.607 2.1.701 2.1.818 3.1.101 3.1.201 3.1.302 3.1.416 5.0.102 5.0.202 5.0.302 5.0.405 - Bash 3.2.57(1)-release - Clang/LLVM 13.0.0 is default - Clang/LLVM 13.0.1 is available on `'$(brew --prefix llvm)/bin/clang'` @@ -20,12 +20,12 @@ - GNU Fortran (Homebrew GCC 10.3.0) 10.3.0 - available by `gfortran-10` alias - GNU Fortran (Homebrew GCC 11.2.0_3) 11.2.0 - available by `gfortran-11` alias - Go 1.15.15 -- julia 1.7.1 +- julia 1.7.2 - Kotlin 1.6.10-release-923 - MSBuild 16.10.1.58001 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) -- Node.js v16.13.2 +- Node.js v16.14.0 - NVM 0.39.1 -- NVM - Cached node versions: v12.22.10 v14.19.0 v16.13.2 +- NVM - Cached node versions: v12.22.10 v14.19.0 v16.14.0 - Perl 5.34.0 - PHP 8.1.2 - Python 2.7.18 @@ -34,19 +34,19 @@ - Ruby 2.7.5p203 ### Package Management -- Bundler version 2.3.6 +- Bundler version 2.3.7 - Carthage 0.38.0 - CocoaPods 1.11.2 - Composer 2.2.6 -- Homebrew 3.3.13 +- Homebrew 3.3.14 - Miniconda 4.10.3 -- NPM 8.1.2 +- NPM 8.3.1 - NuGet 5.9.0.7134 - Pip 20.3.4 (python 2.7) - Pip 21.3.1 (python 3.9) - Pipx 1.0.0 - RubyGems 3.2.33 -- Vcpkg 2022 (build from master \<7e7dad5fe>) +- Vcpkg 2022 (build from master \<8dbd66f5a>) - Yarn 1.22.17 #### Environment variables @@ -58,7 +58,7 @@ ### Project Management - Apache Ant(TM) 1.10.12 - Apache Maven 3.8.4 -- Gradle 7.3.3 +- Gradle 7.4 - Sbt 1.6.2 ### Utilities @@ -83,8 +83,8 @@ - Newman 5.3.1 - OpenSSL 1.1.1m 14 Dec 2021 `(/usr/local/opt/openssl@1.1 -> ../Cellar/openssl@1.1/1.1.1m)` - Packer 1.7.10 -- PostgreSQL 14.1 -- psql (PostgreSQL) 14.1 +- PostgreSQL 14.2 +- psql (PostgreSQL) 14.2 - Sox 14.4.2 - Subversion (SVN) 1.14.1 - Switchaudio-osx 1.1.0 @@ -93,19 +93,20 @@ ### Tools - Aliyun CLI 3.0.107 - App Center CLI 2.10.8 -- AWS CLI 2.4.16 +- AWS CLI 2.4.18 - AWS SAM CLI 1.37.0 - AWS Session Manager CLI 1.2.295.0 -- Azure CLI 2.32.0 -- Bicep CLI 0.4.1124 +- Azure CLI (azure-devops) 0.23.0 +- Azure CLI 2.33.0 +- Bicep CLI 0.4.1272 - Cabal 3.6.2.0 - Cmake 3.22.2 -- Fastlane 2.204.2 +- Fastlane 2.204.3 - GHC 9.2.1 - GHCup 0.1.17.4 - Jazzy 0.14.1 - Stack 2.7.3 -- SwiftFormat 0.49.3 +- SwiftFormat 0.49.4 - Swig 4.0.2 - Xcode Command Line Tools 13.2.0.0.1.1638488800 @@ -114,13 +115,13 @@ - yamllint 1.26.3 ### Browsers -- Safari 15.3 (16612.4.9.1.7) -- SafariDriver 15.3 (16612.4.9.1.7) +- Safari 15.3 (16612.4.9.1.8) +- SafariDriver 15.3 (16612.4.9.1.8) - Google Chrome 98.0.4758.80 - ChromeDriver 98.0.4758.80 - Microsoft Edge 98.0.1108.43 - MSEdgeDriver 98.0.1108.43 -- Mozilla Firefox 96.0.3 +- Mozilla Firefox 97.0 - geckodriver 0.30.0 - Selenium server 4.1.2 @@ -135,7 +136,7 @@ | Version | Vendor | Environment Variable | | ------------------- | --------------- | -------------------- | | 8.0.322+6 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | -| 11.0.14+9 | Eclipse Temurin | JAVA_HOME_11_X64 | +| 11.0.14+101 | Eclipse Temurin | JAVA_HOME_11_X64 | | 17.0.2+8 | Eclipse Temurin | JAVA_HOME_17_X64 | ### GraalVM @@ -165,14 +166,14 @@ #### Node.js - 12.22.10 - 14.19.0 -- 16.13.2 +- 16.14.0 #### Go | Version | Architecture | Environment Variable | | ------- | ------------ | -------------------- | | 1.15.15 (Default) | x64 | GOROOT_1_15_X64 | -| 1.16.13 | x64 | GOROOT_1_16_X64 | -| 1.17.6 | x64 | GOROOT_1_17_X64 | +| 1.16.14 | x64 | GOROOT_1_16_X64 | +| 1.17.7 | x64 | GOROOT_1_17_X64 | ### Rust Tools - Cargo 1.58.0 @@ -207,7 +208,7 @@ ### Xamarin #### Visual Studio for Mac -- 8.10.17.2 +- 8.10.18.11 #### Xamarin bundles | symlink | Xamarin.Mono | Xamarin.iOS | Xamarin.Mac | Xamarin.Android | @@ -313,7 +314,7 @@ | Package Name | Version | | -------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 4.0 | -| Android Emulator | 31.2.7 | +| Android Emulator | 31.2.8 | | Android SDK Build-tools | 32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | | Android SDK Platforms | android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | | Android SDK Platform-Tools | 32.0.0 | From 0a3da31bf96af36ec09ba2740686924fccbb6729 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 17 Feb 2022 11:25:45 +0000 Subject: [PATCH 0981/3485] Updating readme file for macOS-10.15 version 20220213.1 (#5074) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-10.15-Readme.md | 53 +++++++++++++++--------------- 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/images/macos/macos-10.15-Readme.md b/images/macos/macos-10.15-Readme.md index e7ad69d92b2c..6c07973800c0 100644 --- a/images/macos/macos-10.15-Readme.md +++ b/images/macos/macos-10.15-Readme.md @@ -5,11 +5,11 @@ # macOS 10.15 info - System Version: macOS 10.15.7 (19H1713) - Kernel Version: Darwin 19.6.0 -- Image Version: 20220207.1 +- Image Version: 20220213.1 ## Installed Software ### Language and Runtime -- .NET SDK 2.1.302 2.1.403 2.1.507 2.1.607 2.1.701 2.1.818 3.1.101 3.1.201 3.1.302 3.1.416 5.0.102 5.0.202 5.0.302 5.0.404 +- .NET SDK 2.1.302 2.1.403 2.1.507 2.1.607 2.1.701 2.1.818 3.1.101 3.1.201 3.1.302 3.1.416 5.0.102 5.0.202 5.0.302 5.0.405 - Bash 3.2.57(1)-release - Clang/LLVM 12.0.0 is default - Clang/LLVM 13.0.1 is available on `'$(brew --prefix llvm)/bin/clang'` @@ -20,12 +20,12 @@ - GNU Fortran (Homebrew GCC 10.3.0) 10.3.0 - available by `gfortran-10` alias - GNU Fortran (Homebrew GCC 11.2.0_3) 11.2.0 - available by `gfortran-11` alias - Go 1.15.15 -- julia 1.7.1 +- julia 1.7.2 - Kotlin 1.6.10-release-923 - MSBuild 16.10.1.58001 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) -- Node.js v16.13.2 +- Node.js v16.14.0 - NVM 0.39.1 -- NVM - Cached node versions: v12.22.10 v14.19.0 v16.13.2 +- NVM - Cached node versions: v12.22.10 v14.19.0 v16.14.0 - Perl 5.34.0 - PHP 8.1.2 - Python 2.7.18 @@ -34,19 +34,19 @@ - Ruby 2.7.5p203 ### Package Management -- Bundler version 2.3.6 +- Bundler version 2.3.7 - Carthage 0.38.0 - CocoaPods 1.11.2 - Composer 2.2.6 - Homebrew 3.3.14 - Miniconda 4.10.3 -- NPM 8.1.2 +- NPM 8.3.1 - NuGet 5.9.0.7134 - Pip 20.3.4 (python 2.7) - Pip 21.3.1 (python 3.9) - Pipx 1.0.0 - RubyGems 3.2.33 -- Vcpkg 2022 (build from master \<d2b22891a>) +- Vcpkg 2022 (build from master \<8dbd66f5a>) - Yarn 1.22.17 #### Environment variables @@ -58,7 +58,7 @@ ### Project Management - Apache Ant(TM) 1.10.12 - Apache Maven 3.8.4 -- Gradle 7.3.3 +- Gradle 7.4 - Sbt 1.6.2 ### Utilities @@ -84,8 +84,8 @@ - Newman 5.3.1 - OpenSSL 1.1.1m 14 Dec 2021 `(/usr/local/opt/openssl@1.1 -> ../Cellar/openssl@1.1/1.1.1m)` - Packer 1.7.10 -- PostgreSQL 14.1 -- psql (PostgreSQL) 14.1 +- PostgreSQL 14.2 +- psql (PostgreSQL) 14.2 - Sox 14.4.2 - Subversion (SVN) 1.14.1 - Switchaudio-osx 1.1.0 @@ -96,19 +96,20 @@ ### Tools - Aliyun CLI 3.0.107 - App Center CLI 2.10.8 -- AWS CLI 2.4.16 +- AWS CLI 2.4.18 - AWS SAM CLI 1.37.0 - AWS Session Manager CLI 1.2.295.0 -- Azure CLI 2.32.0 -- Bicep CLI 0.4.1124 +- Azure CLI (azure-devops) 0.23.0 +- Azure CLI 2.33.0 +- Bicep CLI 0.4.1272 - Cabal 3.6.2.0 - Cmake 3.22.2 -- Fastlane 2.204.2 +- Fastlane 2.204.3 - GHC 9.2.1 - GHCup 0.1.17.4 - Jazzy 0.14.1 - Stack 2.7.3 -- SwiftFormat 0.49.3 +- SwiftFormat 0.49.4 - Swig 4.0.2 - Xcode Command Line Tools 12.4.0.0.1.1610135815 @@ -117,13 +118,13 @@ - yamllint 1.26.3 ### Browsers -- Safari 15.3 (15612.4.9.1.7) -- SafariDriver 15.3 (15612.4.9.1.7) +- Safari 15.3 (15612.4.9.1.8) +- SafariDriver 15.3 (15612.4.9.1.8) - Google Chrome 98.0.4758.80 - ChromeDriver 98.0.4758.80 -- Microsoft Edge 98.0.1108.43 -- MSEdgeDriver 98.0.1108.43 -- Mozilla Firefox 96.0.3 +- Microsoft Edge 98.0.1108.51 +- MSEdgeDriver 98.0.1108.51 +- Mozilla Firefox 97.0 - geckodriver 0.30.0 - Selenium server 4.1.2 @@ -138,7 +139,7 @@ | Version | Vendor | Environment Variable | | ------------------- | --------------- | -------------------- | | 8.0.322+6 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | -| 11.0.14+9 | Eclipse Temurin | JAVA_HOME_11_X64 | +| 11.0.14+101 | Eclipse Temurin | JAVA_HOME_11_X64 | | 12.0.2+10.3 | Adopt OpenJDK | JAVA_HOME_12_X64 | | 13.0.2+8.1 | Adopt OpenJDK | JAVA_HOME_13_X64 | | 14.0.2+12 | Adopt OpenJDK | JAVA_HOME_14_X64 | @@ -174,14 +175,14 @@ #### Node.js - 12.22.10 - 14.19.0 -- 16.13.2 +- 16.14.0 #### Go | Version | Architecture | Environment Variable | | ------- | ------------ | -------------------- | | 1.15.15 (Default) | x64 | GOROOT_1_15_X64 | -| 1.16.13 | x64 | GOROOT_1_16_X64 | -| 1.17.6 | x64 | GOROOT_1_17_X64 | +| 1.16.14 | x64 | GOROOT_1_16_X64 | +| 1.17.7 | x64 | GOROOT_1_17_X64 | ### Rust Tools - Cargo 1.58.0 @@ -216,7 +217,7 @@ ### Xamarin #### Visual Studio for Mac -- 8.10.17.2 +- 8.10.18.11 #### Xamarin bundles | symlink | Xamarin.Mono | Xamarin.iOS | Xamarin.Mac | Xamarin.Android | From 6f2c6fa6d10d99ee2bb88135116977f8d841dfa7 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Thu, 17 Feb 2022 16:06:29 +0300 Subject: [PATCH 0982/3485] [macOS] Software Updates 2022 Week 8 (#5094) --- images/macos/toolsets/toolset-11.json | 11 +++++++++-- images/macos/toolsets/toolset-12.json | 11 +++++++++-- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index afb72f5f9d65..47ba9c508fb9 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -17,16 +17,23 @@ "6.12.0.162" ], "ios-versions": [ - "15.4.0.0", "15.2.0.17", "15.0.0.6", "14.20.0.24", "14.16.0.5", "14.14.2.5", "14.10.0.4", "14.8.0.3", "14.6.0.15", "14.4.1.3", "14.2.0.12", "14.0.0.0", "13.20.2.2" + "15.6.0.3", "15.4.0.0", "15.2.0.17", "15.0.0.6", "14.20.0.24", "14.16.0.5", "14.14.2.5", "14.10.0.4", "14.8.0.3", "14.6.0.15", "14.4.1.3", "14.2.0.12", "14.0.0.0", "13.20.2.2" ], "mac-versions": [ - "8.4.0.0", "8.2.0.17", "7.14.0.27", "7.10.0.5", "7.8.2.5", "7.4.0.10", "7.2.0.3", "7.0.0.15", "6.22.1.26", "6.20.2.2" + "8.6.0.3", "8.4.0.0", "8.2.0.17", "7.14.0.27", "7.10.0.5", "7.8.2.5", "7.4.0.10", "7.2.0.3", "7.0.0.15", "6.22.1.26", "6.20.2.2" ], "android-versions": [ "12.0.0.3", "11.3.0.4", "11.2.2.1", "11.1.0.26", "11.0.2.0" ], "bundle-default": "6_12_12", "bundles": [ + { + "symlink": "6_12_13", + "mono":"6.12", + "ios": "15.6", + "mac": "8.6", + "android": "12.0" + }, { "symlink": "6_12_12", "mono":"6.12", diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index 0263fd4224fd..25b838b57916 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -14,16 +14,23 @@ "6.12.0.162" ], "ios-versions": [ - "15.4.0.0", "15.2.0.17", "15.0.0.6" + "15.6.0.3", "15.4.0.0", "15.2.0.17", "15.0.0.6" ], "mac-versions": [ - "8.4.0.0", "8.2.0.17", "7.14.0.27" + "8.6.0.3", "8.4.0.0", "8.2.0.17", "7.14.0.27" ], "android-versions": [ "12.0.0.3", "11.3.0.4" ], "bundle-default": "6_12_12", "bundles": [ + { + "symlink": "6_12_13", + "mono":"6.12", + "ios": "15.6", + "mac": "8.6", + "android": "12.0" + }, { "symlink": "6_12_12", "mono":"6.12", From 8432c6614bcaa7c8c9ea1a02c0f6ee706fe0a347 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 17 Feb 2022 18:43:23 +0000 Subject: [PATCH 0983/3485] Updating readme file for ubuntu18 version 20220213.1 (#5072) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu1804-Readme.md | 56 +++++++++++++++---------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/images/linux/Ubuntu1804-Readme.md b/images/linux/Ubuntu1804-Readme.md index ed2b34ee91fa..371244ec0efa 100644 --- a/images/linux/Ubuntu1804-Readme.md +++ b/images/linux/Ubuntu1804-Readme.md @@ -4,8 +4,8 @@ | [[Ubuntu] Issue with libstdc++ cannot allocate memory in static TLS block](https://github.com/actions/virtual-environments/issues/4799) | *** # Ubuntu 18.04.6 LTS -- Linux kernel version: 5.4.0-1068-azure -- Image Version: 20220207.1 +- Linux kernel version: 5.4.0-1069-azure +- Image Version: 20220213.1 ## Installed Software ### Language and Runtime @@ -16,28 +16,28 @@ - Erlang rebar3 3.18.0 - GNU C++ 7.5.0, 9.4.0, 10.3.0 - GNU Fortran 7.5.0, 9.4.0, 10.3.0 -- Julia 1.7.1 -- Kotlin 1.6.0-release-798 +- Julia 1.7.2 +- Kotlin 1.6.10-release-923 - Mono 6.12.0.122 (apt source repository: https://download.mono-project.com/repo/ubuntu stable-bionic main) - MSBuild 16.6.0.15201 (from /usr/lib/mono/msbuild/15.0/bin/MSBuild.dll) -- Node 16.13.2 +- Node 16.14.0 - Perl 5.26.1 - Python 2.7.17 - Python3 3.6.9 - Ruby 2.5.1p57 -- Swift 5.5.2 +- Swift 5.5.3 ### Package Management - cpan 1.64 - Helm 3.8.0 - Homebrew 3.3.14 - Miniconda 4.10.3 -- Npm 8.1.2 +- Npm 8.3.1 - Pip 9.0.1 - Pip3 9.0.1 - Pipx 1.0.0 - RubyGems 2.7.6 -- Vcpkg (build from master \<d2b22891a>) +- Vcpkg (build from master \<8dbd66f5a>) - Yarn 1.22.17 #### Environment variables @@ -48,7 +48,7 @@ ### Project Management - Ant 1.10.5 -- Gradle 7.3.3 +- Gradle 7.4 - Maven 3.8.4 - Sbt 1.6.2 @@ -58,7 +58,7 @@ - AzCopy 10.13.0 (available by `azcopy` and `azcopy10` aliases) - Bazel 5.0.0 - Bazelisk 1.11.0 -- Bicep 0.4.1124 +- Bicep 0.4.1272 - Buildah 1.19.6 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - CMake 3.22.2 - CodeQL Action Bundle 2.8.0 @@ -72,11 +72,11 @@ - Git-ftp 1.3.1 - Haveged 1.9.1 - Heroku 7.59.2 -- HHVM (HipHop VM) 4.147.0 +- HHVM (HipHop VM) 4.148.0 - jq 1.5 - Kind 0.11.1 - Kubectl 1.23.3 -- Kustomize 4.5.1 +- Kustomize 4.5.2 - Leiningen 2.9.8 - MediaInfo 17.12 - Mercurial 4.5.3 @@ -86,7 +86,7 @@ - nvm 0.39.1 - OpenSSL 1.1.1 11 Sep 2018 - Packer 1.7.10 -- Parcel 2.2.1 +- Parcel 2.3.1 - PhantomJS 2.1.1 - Podman 3.0.1 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Pulumi 3.24.1 @@ -101,24 +101,24 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.107 -- AWS CLI 1.22.50 +- AWS CLI 1.22.54 - AWS CLI Session manager plugin 1.2.295.0 - AWS SAM CLI 1.37.0 -- Azure CLI (azure-cli) 2.32.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) +- Azure CLI (azure-cli) 2.33.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.23.0 - GitHub CLI 2.5.0 - Google Cloud SDK 369.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 8.18.1 -- OpenShift CLI 4.9.18 +- Netlify CLI 9.4.0 +- OpenShift CLI 4.9.19 - ORAS CLI 0.12.0 - Vercel CLI 23.1.2 ### Java | Version | Vendor | Environment Variable | | ------------------- | --------------- | -------------------- | -| 8.0.312+7 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | -| 11.0.14+9 | Eclipse Temurin | JAVA_HOME_11_X64 | +| 8.0.322+6 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | +| 11.0.14.1+1 | Eclipse Temurin | JAVA_HOME_11_X64 | | 12.0.2+10 | Adopt OpenJDK | JAVA_HOME_12_X64 | | 17.0.2+8 | Eclipse Temurin | JAVA_HOME_17_X64 | @@ -167,14 +167,14 @@ | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | ### .NET Core SDK -- 2.1.302 2.1.403 2.1.526 2.1.617 2.1.701 2.1.818 3.1.120 3.1.202 3.1.302 3.1.416 5.0.104 5.0.210 5.0.303 5.0.404 6.0.101 +- 2.1.302 2.1.403 2.1.526 2.1.617 2.1.701 2.1.818 3.1.120 3.1.202 3.1.302 3.1.416 5.0.104 5.0.211 5.0.303 5.0.405 6.0.102 ### .NET tools - nbgv 3.4.255+06fb9182bf ### Databases - MongoDB 5.0.6 (apt source repository: https://repo.mongodb.org/apt/ubuntu) -- PostgreSQL 14.1 (apt source repository: https://apt.postgresql.org/pub/repos/apt/) +- PostgreSQL 14.2 (apt source repository: https://apt.postgresql.org/pub/repos/apt/) - sqlite3 3.22.0 #### MySQL @@ -191,13 +191,13 @@ ### Cached Tools #### Go - 1.15.15 -- 1.16.13 -- 1.17.6 +- 1.16.14 +- 1.17.7 #### Node.js - 12.22.10 - 14.19.0 -- 16.13.2 +- 16.14.0 #### PyPy - 2.7.18 [PyPy 7.3.6] @@ -222,8 +222,8 @@ | Name | Value | Architecture | | --------------- | ----------------------------------- | ------------ | | GOROOT_1_15_X64 | /opt/hostedtoolcache/go/1.15.15/x64 | x64 | -| GOROOT_1_16_X64 | /opt/hostedtoolcache/go/1.16.13/x64 | x64 | -| GOROOT_1_17_X64 | /opt/hostedtoolcache/go/1.17.6/x64 | x64 | +| GOROOT_1_16_X64 | /opt/hostedtoolcache/go/1.16.14/x64 | x64 | +| GOROOT_1_17_X64 | /opt/hostedtoolcache/go/1.17.7/x64 | x64 | ### PowerShell Tools - PowerShell 7.2.1 @@ -286,8 +286,8 @@ | node:12-alpine | sha256:dfa564312367b1a8fca8db7ae4bae102b28e68b39ebcb7b17022c938f105846b | 2022-02-04 | | node:14 | sha256:b2c75df8c9706156c38b4f1f678d00e11cb2bfda09fc4ab6e36ec17ac9163865 | 2022-02-02 | | node:14-alpine | sha256:9a2aa545388a135b496bd55cef2be920b96c4526c99c140170e05a8de3fce653 | 2022-02-02 | -| node:16 | sha256:2033f4cc18f9d8b5d0baa7f276aaeffd202e1a2c6fe9af408af05a34fe68cbfb | 2022-01-27 | -| node:16-alpine | sha256:2f50f4a428f8b5280817c9d4d896dbee03f072e93f4e0c70b90cc84bd1fcfe0d | 2022-01-12 | +| node:16 | sha256:fd86131ddf8e0faa8ba7a3e49b6bf571745946e663e4065f3bff0a07204c1dde | 2022-02-09 | +| node:16-alpine | sha256:2c6c59cf4d34d4f937ddfcf33bab9d8bbad8658d1b9de7b97622566a52167f2b | 2022-02-09 | | ubuntu:16.04 | sha256:0f71fa8d4d2d4292c3c617fda2b36f6dabe5c8b6e34c3dc5b0d17d4e704bd39c | 2021-08-31 | | ubuntu:18.04 | sha256:c2aa13782650aa7ade424b12008128b60034c795f25456e8eb552d0a0f447cad | 2022-02-02 | | ubuntu:20.04 | sha256:669e010b58baf5beb2836b253c1fd5768333f0d1dbcb834f7c07a4dc93f474be | 2022-02-02 | From 2269ded8569318587c5ae344fc58116a14cab85e Mon Sep 17 00:00:00 2001 From: Jacob Blanco <82254995+jacob-blanc@users.noreply.github.com> Date: Fri, 18 Feb 2022 08:22:33 +0100 Subject: [PATCH 0984/3485] FIX: Write-Host Incorrect calls to variables. (#5102) --- helpers/CreateAzureVMFromPackerTemplate.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helpers/CreateAzureVMFromPackerTemplate.ps1 b/helpers/CreateAzureVMFromPackerTemplate.ps1 index 3206216e594c..f5041f6c440e 100644 --- a/helpers/CreateAzureVMFromPackerTemplate.ps1 +++ b/helpers/CreateAzureVMFromPackerTemplate.ps1 @@ -72,5 +72,5 @@ Function CreateAzureVMFromPackerTemplate { Write-Host "`nCreating the VM" az group deployment create -g $ResourceGroupName -n $VirtualMachineName --subscription $subscriptionId --template-file $templateFilePath --parameters vmSize=$vmSize vmName=$VirtualMachineName adminUserName=$AdminUsername adminPassword=$AdminPassword networkInterfaceId=$networkId - Write-Host "`nCreated in $(ResourceGroupName):`n vnet $(vnetName)`n subnet $(subnetName)`n nic $(nicName)`n publicip $(publicIpName)`n vm $(VirtualMachineName)" + Write-Host "`nCreated in ${ResourceGroupName}:`n vnet ${vnetName}`n subnet ${subnetName}`n nic ${nicName}`n publicip ${publicIpName}`n vm ${VirtualMachineName}" } From 4d4f45442416b0f5f266f743dd62e1ee79d14f71 Mon Sep 17 00:00:00 2001 From: Maksim Shilov <89912354+shilovmaksim@users.noreply.github.com> Date: Fri, 18 Feb 2022 10:23:34 +0300 Subject: [PATCH 0985/3485] [All OS] Output full version of git to software report (#5097) --- .../scripts/SoftwareReport/SoftwareReport.Tools.psm1 | 3 +-- .../macos/software-report/SoftwareReport.Common.psm1 | 4 ++-- .../SoftwareReport/SoftwareReport.Helpers.psm1 | 12 ++++++++++++ .../scripts/SoftwareReport/SoftwareReport.Tools.psm1 | 3 +-- 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 index fa6cea41aaac..bcfe1b84a0d9 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 @@ -89,8 +89,7 @@ function Get-DockerBuildxVersion { } function Get-GitVersion { - $result = Get-CommandResult "git --version" - $gitVersion = $result.Output | Take-OutputPart -Part 2 + $gitVersion = git --version | Take-OutputPart -Part -1 $aptSourceRepo = Get-AptSourceRepository -PackageName "git-core" return "Git $gitVersion (apt source repository: $aptSourceRepo)" } diff --git a/images/macos/software-report/SoftwareReport.Common.psm1 b/images/macos/software-report/SoftwareReport.Common.psm1 index b3282b10936b..df7ff83efca0 100644 --- a/images/macos/software-report/SoftwareReport.Common.psm1 +++ b/images/macos/software-report/SoftwareReport.Common.psm1 @@ -266,8 +266,8 @@ function Get-CurlVersion { } function Get-GitVersion { - $gitVersion = Run-Command "git --version" | Take-Part -Part 2 - return "Git: $gitVersion" + $gitVersion = Run-Command "git --version" | Take-Part -Part -1 + return "Git $gitVersion" } function Get-GitLFSVersion { diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Helpers.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Helpers.psm1 index b62fda7eb794..1318d72753f4 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Helpers.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Helpers.psm1 @@ -161,3 +161,15 @@ function Test-BlankElement { exit 1 } } + +function Take-Part { + param ( + [Parameter(ValueFromPipeline)] + [string] $toolOutput, + [string] $Delimiter = " ", + [int[]] $Part + ) + $parts = $toolOutput.Split($Delimiter, [System.StringSplitOptions]::RemoveEmptyEntries) + $selectedParts = $parts[$Part] + return [string]::Join($Delimiter, $selectedParts) +} \ No newline at end of file diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 index c092494b7d24..d714f83c7183 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 @@ -67,8 +67,7 @@ function Get-DockerWincredVersion { } function Get-GitVersion { - $(git version) -match "git version (?<version>\d+\.\d+\.\d+)" | Out-Null - $gitVersion = $Matches.Version + $gitVersion = git --version | Take-Part -Part -1 return "Git $gitVersion" } From 60dc1b5f7a1a046eceaea0e5667beefdead26d65 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 18 Feb 2022 09:23:18 +0000 Subject: [PATCH 0986/3485] Updating readme file for ubuntu20 version 20220213.1 (#5071) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2004-Readme.md | 64 +++++++++++++++---------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/images/linux/Ubuntu2004-Readme.md b/images/linux/Ubuntu2004-Readme.md index 11b99a6328cd..cf2240dc94ab 100644 --- a/images/linux/Ubuntu2004-Readme.md +++ b/images/linux/Ubuntu2004-Readme.md @@ -5,7 +5,7 @@ *** # Ubuntu 20.04.3 LTS - Linux kernel version: 5.11.0-1028-azure -- Image Version: 20220207.1 +- Image Version: 20220213.1 ## Installed Software ### Language and Runtime @@ -16,28 +16,28 @@ - Erlang rebar3 3.18.0 - GNU C++ 9.3.0, 10.3.0 - GNU Fortran 9.3.0, 10.3.0 -- Julia 1.7.1 -- Kotlin 1.6.0-release-798 +- Julia 1.7.2 +- Kotlin 1.6.10-release-923 - Mono 6.12.0.122 (apt source repository: https://download.mono-project.com/repo/ubuntu stable-focal main) - MSBuild 16.6.0.15201 (from /usr/lib/mono/msbuild/15.0/bin/MSBuild.dll) -- Node 16.13.2 +- Node 16.14.0 - Perl 5.30.0 - Python 3.8.10 - Python3 3.8.10 - Ruby 2.7.0p0 -- Swift 5.5.2 +- Swift 5.5.3 ### Package Management - cpan 1.64 - Helm 3.8.0 - Homebrew 3.3.14 - Miniconda 4.10.3 -- Npm 8.1.2 +- Npm 8.3.1 - Pip 20.0.2 - Pip3 20.0.2 - Pipx 1.0.0 - RubyGems 3.1.2 -- Vcpkg (build from master \<d2b22891a>) +- Vcpkg (build from master \<8dbd66f5a>) - Yarn 1.22.17 #### Environment variables @@ -48,7 +48,7 @@ ### Project Management - Ant 1.10.7 -- Gradle 7.3.3 +- Gradle 7.4 - Lerna 4.0.0 - Maven 3.8.4 - Sbt 1.6.2 @@ -59,7 +59,7 @@ - AzCopy 10.13.0 (available by `azcopy` and `azcopy10` aliases) - Bazel 5.0.0 - Bazelisk 1.11.0 -- Bicep 0.4.1124 +- Bicep 0.4.1272 - Buildah 1.21.3 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - CMake 3.22.2 - CodeQL Action Bundle 2.8.0 @@ -68,17 +68,17 @@ - Docker-Buildx 0.7.1 - Docker-Moby Client 20.10.11+azure-3 - Docker-Moby Server 20.10.11+azure-3 -- Fastlane 2.204.2 +- Fastlane 2.204.3 - Git 2.35.1 (apt source repository: ppa:git-core/ppa) - Git LFS 3.0.2 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.6.0 - Haveged 1.9.1 - Heroku 7.59.2 -- HHVM (HipHop VM) 4.147.0 +- HHVM (HipHop VM) 4.148.0 - jq 1.6 - Kind 0.11.1 - Kubectl 1.23.3 -- Kustomize 4.5.1 +- Kustomize 4.5.2 - Leiningen 2.9.8 - MediaInfo 19.09 - Mercurial 5.3.1 @@ -88,7 +88,7 @@ - nvm 0.39.1 - OpenSSL 1.1.1f 31 Mar 2020 - Packer 1.7.10 -- Parcel 2.2.1 +- Parcel 2.3.1 - PhantomJS 2.1.1 - Podman 3.4.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Pulumi 3.24.1 @@ -103,25 +103,25 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.107 -- AWS CLI 2.4.16 +- AWS CLI 2.4.18 - AWS CLI Session manager plugin 1.2.295.0 - AWS SAM CLI 1.37.0 -- Azure CLI (azure-cli) 2.32.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) +- Azure CLI (azure-cli) 2.33.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.23.0 - GitHub CLI 2.5.0 - Google Cloud SDK 369.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 8.18.1 -- OpenShift CLI 4.9.18 +- Netlify CLI 9.4.0 +- OpenShift CLI 4.9.19 - ORAS CLI 0.12.0 - Vercel CLI 23.1.2 ### Java -| Version | Vendor | Environment Variable | -| ------------------- | --------------- | -------------------- | -| 8.0.312+7 | Eclipse Temurin | JAVA_HOME_8_X64 | -| 11.0.14+9 (default) | Eclipse Temurin | JAVA_HOME_11_X64 | -| 17.0.2+8 | Eclipse Temurin | JAVA_HOME_17_X64 | +| Version | Vendor | Environment Variable | +| --------------------- | --------------- | -------------------- | +| 8.0.322+6 | Eclipse Temurin | JAVA_HOME_8_X64 | +| 11.0.14.1+1 (default) | Eclipse Temurin | JAVA_HOME_11_X64 | +| 17.0.2+8 | Eclipse Temurin | JAVA_HOME_17_X64 | ### GraalVM | Version | Environment variables | @@ -173,14 +173,14 @@ | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | ### .NET Core SDK -- 2.1.302 2.1.403 2.1.526 2.1.617 2.1.701 2.1.818 3.1.120 3.1.202 3.1.302 3.1.416 5.0.104 5.0.210 5.0.303 5.0.404 6.0.101 +- 2.1.302 2.1.403 2.1.526 2.1.617 2.1.701 2.1.818 3.1.120 3.1.202 3.1.302 3.1.416 5.0.104 5.0.211 5.0.303 5.0.405 6.0.102 ### .NET tools - nbgv 3.4.255+06fb9182bf ### Databases - MongoDB 5.0.6 (apt source repository: https://repo.mongodb.org/apt/ubuntu) -- PostgreSQL 14.1 (apt source repository: https://apt.postgresql.org/pub/repos/apt/) +- PostgreSQL 14.2 (apt source repository: https://apt.postgresql.org/pub/repos/apt/) - sqlite3 3.31.1 #### MySQL @@ -197,13 +197,13 @@ ### Cached Tools #### Go - 1.15.15 -- 1.16.13 -- 1.17.6 +- 1.16.14 +- 1.17.7 #### Node.js - 12.22.10 - 14.19.0 -- 16.13.2 +- 16.14.0 #### PyPy - 2.7.18 [PyPy 7.3.6] @@ -229,8 +229,8 @@ | Name | Value | Architecture | | --------------- | ----------------------------------- | ------------ | | GOROOT_1_15_X64 | /opt/hostedtoolcache/go/1.15.15/x64 | x64 | -| GOROOT_1_16_X64 | /opt/hostedtoolcache/go/1.16.13/x64 | x64 | -| GOROOT_1_17_X64 | /opt/hostedtoolcache/go/1.17.6/x64 | x64 | +| GOROOT_1_16_X64 | /opt/hostedtoolcache/go/1.16.14/x64 | x64 | +| GOROOT_1_17_X64 | /opt/hostedtoolcache/go/1.17.7/x64 | x64 | ### PowerShell Tools - PowerShell 7.2.1 @@ -294,8 +294,8 @@ | node:12-alpine | sha256:dfa564312367b1a8fca8db7ae4bae102b28e68b39ebcb7b17022c938f105846b | 2022-02-04 | | node:14 | sha256:b2c75df8c9706156c38b4f1f678d00e11cb2bfda09fc4ab6e36ec17ac9163865 | 2022-02-02 | | node:14-alpine | sha256:9a2aa545388a135b496bd55cef2be920b96c4526c99c140170e05a8de3fce653 | 2022-02-02 | -| node:16 | sha256:2033f4cc18f9d8b5d0baa7f276aaeffd202e1a2c6fe9af408af05a34fe68cbfb | 2022-01-27 | -| node:16-alpine | sha256:2f50f4a428f8b5280817c9d4d896dbee03f072e93f4e0c70b90cc84bd1fcfe0d | 2022-01-12 | +| node:16 | sha256:fd86131ddf8e0faa8ba7a3e49b6bf571745946e663e4065f3bff0a07204c1dde | 2022-02-09 | +| node:16-alpine | sha256:2c6c59cf4d34d4f937ddfcf33bab9d8bbad8658d1b9de7b97622566a52167f2b | 2022-02-09 | | ubuntu:16.04 | sha256:0f71fa8d4d2d4292c3c617fda2b36f6dabe5c8b6e34c3dc5b0d17d4e704bd39c | 2021-08-31 | | ubuntu:18.04 | sha256:c2aa13782650aa7ade424b12008128b60034c795f25456e8eb552d0a0f447cad | 2022-02-02 | | ubuntu:20.04 | sha256:669e010b58baf5beb2836b253c1fd5768333f0d1dbcb834f7c07a4dc93f474be | 2022-02-02 | @@ -330,7 +330,7 @@ | libc++-dev | 1:10.0-50\~exp1 | | libc++abi-dev | 1:10.0-50\~exp1 | | libcurl4 | 7.68.0-1ubuntu2.7 | -| libgbm-dev | 21.0.3-0ubuntu0.3\~20.04.5 | +| libgbm-dev | 21.2.6-0ubuntu0.1\~20.04.1 | | libgconf-2-4 | 3.2.6-6ubuntu1 | | libgsl-dev | 2.5+dfsg-6build1 | | libgtk-3-0 | 3.24.20-0ubuntu1 | From d20a8350a13442db8619130dd3164599b8939e82 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 22 Feb 2022 07:55:49 +0000 Subject: [PATCH 0987/3485] Updating readme file for ubuntu18 version 20220220.1 (#5112) Co-authored-by: Image generation service account <no-reply@microsoft.com> --- images/linux/Ubuntu1804-Readme.md | 64 +++++++++++++++++-------------- 1 file changed, 35 insertions(+), 29 deletions(-) diff --git a/images/linux/Ubuntu1804-Readme.md b/images/linux/Ubuntu1804-Readme.md index 371244ec0efa..474471134173 100644 --- a/images/linux/Ubuntu1804-Readme.md +++ b/images/linux/Ubuntu1804-Readme.md @@ -5,7 +5,7 @@ *** # Ubuntu 18.04.6 LTS - Linux kernel version: 5.4.0-1069-azure -- Image Version: 20220213.1 +- Image Version: 20220220.1 ## Installed Software ### Language and Runtime @@ -30,14 +30,14 @@ ### Package Management - cpan 1.64 - Helm 3.8.0 -- Homebrew 3.3.14 -- Miniconda 4.10.3 +- Homebrew 3.3.15 +- Miniconda 4.11.0 - Npm 8.3.1 - Pip 9.0.1 - Pip3 9.0.1 - Pipx 1.0.0 - RubyGems 2.7.6 -- Vcpkg (build from master \<8dbd66f5a>) +- Vcpkg (build from master \<5cf60186a>) - Yarn 1.22.17 #### Environment variables @@ -61,21 +61,21 @@ - Bicep 0.4.1272 - Buildah 1.19.6 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - CMake 3.22.2 -- CodeQL Action Bundle 2.8.0 +- CodeQL Action Bundle 2.8.1 - Docker Compose v1 1.29.2 - Docker Compose v2 2.2.3+azure-1 - Docker-Buildx 0.7.1 - Docker-Moby Client 20.10.11+azure-3 - Docker-Moby Server 20.10.11+azure-3 - Git 2.35.1 (apt source repository: ppa:git-core/ppa) -- Git LFS 3.0.2 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) +- Git LFS 3.1.2 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.3.1 - Haveged 1.9.1 - Heroku 7.59.2 -- HHVM (HipHop VM) 4.148.0 +- HHVM (HipHop VM) 4.149.0 - jq 1.5 - Kind 0.11.1 -- Kubectl 1.23.3 +- Kubectl 1.23.4 - Kustomize 4.5.2 - Leiningen 2.9.8 - MediaInfo 17.12 @@ -86,7 +86,7 @@ - nvm 0.39.1 - OpenSSL 1.1.1 11 Sep 2018 - Packer 1.7.10 -- Parcel 2.3.1 +- Parcel 2.3.2 - PhantomJS 2.1.1 - Podman 3.0.1 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Pulumi 3.24.1 @@ -94,25 +94,25 @@ - Skopeo 1.2.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 - SVN 1.9.7 -- Terraform 1.1.5 +- Terraform 1.1.6 - yamllint 1.26.3 -- yq 4.19.1 +- yq 4.20.2 - zstd 1.5.2 (homebrew) ### CLI Tools -- Alibaba Cloud CLI 3.0.107 -- AWS CLI 1.22.54 +- Alibaba Cloud CLI 3.0.109 +- AWS CLI 1.22.58 - AWS CLI Session manager plugin 1.2.295.0 -- AWS SAM CLI 1.37.0 -- Azure CLI (azure-cli) 2.33.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) +- AWS SAM CLI 1.38.1 +- Azure CLI (azure-cli) 2.33.1 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.23.0 -- GitHub CLI 2.5.0 +- GitHub CLI 2.5.1 - Google Cloud SDK 369.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 9.4.0 -- OpenShift CLI 4.9.19 +- Netlify CLI 9.6.5 +- OpenShift CLI 4.9.21 - ORAS CLI 0.12.0 -- Vercel CLI 23.1.2 +- Vercel CLI 24.0.0 ### Java | Version | Vendor | Environment Variable | @@ -125,7 +125,7 @@ ### PHP | Tool | Version | | -------- | ---------------------------------------- | -| PHP | 7.1.33 7.2.34 7.3.33 7.4.27 8.0.15 8.1.2 | +| PHP | 7.1.33 7.2.34 7.3.33 7.4.28 8.0.15 8.1.2 | | Composer | 2.2.6 | | PHPUnit | 8.5.23 | ``` @@ -152,9 +152,9 @@ - Rustfmt 1.4.38 ### Browsers and Drivers -- Google Chrome 98.0.4758.80 -- ChromeDriver 98.0.4758.80 -- Mozilla Firefox 96.0 +- Google Chrome 98.0.4758.102 +- ChromeDriver 98.0.4758.102 +- Mozilla Firefox 97.0 - Geckodriver 0.30.0 - Chromium 98.0.4758.0 - Selenium server 4.1.0 @@ -167,16 +167,22 @@ | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | ### .NET Core SDK -- 2.1.302 2.1.403 2.1.526 2.1.617 2.1.701 2.1.818 3.1.120 3.1.202 3.1.302 3.1.416 5.0.104 5.0.211 5.0.303 5.0.405 6.0.102 +- 3.1.120 3.1.202 3.1.302 3.1.416 5.0.104 5.0.211 5.0.303 5.0.405 6.0.200 ### .NET tools - nbgv 3.4.255+06fb9182bf ### Databases - MongoDB 5.0.6 (apt source repository: https://repo.mongodb.org/apt/ubuntu) -- PostgreSQL 14.2 (apt source repository: https://apt.postgresql.org/pub/repos/apt/) - sqlite3 3.22.0 +#### PostgreSQL +- PostgreSQL 14.2 (apt source repository: https://apt.postgresql.org/pub/repos/apt/) +- PostgreSQL Server (user:postgres) + +``` + PostgreSQL service is disabled by default. Use the following command as a part of your job to start the service: 'sudo systemctl start postgresql.service' +``` #### MySQL - MySQL 5.7.37 - MySQL Server (user:root password:root) @@ -185,7 +191,7 @@ MySQL service is disabled by default. Use the following command as a part of your job to start the service: 'sudo systemctl start mysql.service' ``` #### MS SQL Server Client Tools -- sqlcmd 17.8.0001.1 +- sqlcmd 17.9.0001.1 - SqlPackage 16.0.5400.1 ### Cached Tools @@ -200,7 +206,7 @@ - 16.14.0 #### PyPy -- 2.7.18 [PyPy 7.3.6] +- 2.7.18 [PyPy 7.3.8] - 3.6.12 [PyPy 7.3.3] #### Python @@ -338,7 +344,7 @@ | mercurial | 4.5.3-1ubuntu2.2 | | net-tools | 1.60+git20161116.90da8a0-1ubuntu1 | | netcat | 1.10-41.1 | -| openssh-client | 1:7.6p1-4ubuntu0.5 | +| openssh-client | 1:7.6p1-4ubuntu0.6 | | p7zip-full | 16.02+dfsg-6 | | p7zip-rar | 16.02-2 | | parallel | 20161222-1 | @@ -352,7 +358,7 @@ | shellcheck | 0.4.6-1 | | sphinxsearch | 2.2.11-2 | | sqlite3 | 3.22.0-1ubuntu0.4 | -| ssh | 1:7.6p1-4ubuntu0.5 | +| ssh | 1:7.6p1-4ubuntu0.6 | | sshpass | 1.06-1 | | subversion | 1.9.7-4ubuntu1 | | sudo | 1.8.21p2-3ubuntu1.4 | From bb7ee95a7b956b912b977b45a75e6ec90e70cae2 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 22 Feb 2022 08:11:34 +0000 Subject: [PATCH 0988/3485] Updating readme file for ubuntu20 version 20220220.1 (#5111) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2004-Readme.md | 64 +++++++++++++++++-------------- 1 file changed, 35 insertions(+), 29 deletions(-) diff --git a/images/linux/Ubuntu2004-Readme.md b/images/linux/Ubuntu2004-Readme.md index cf2240dc94ab..adb9038eedd6 100644 --- a/images/linux/Ubuntu2004-Readme.md +++ b/images/linux/Ubuntu2004-Readme.md @@ -5,7 +5,7 @@ *** # Ubuntu 20.04.3 LTS - Linux kernel version: 5.11.0-1028-azure -- Image Version: 20220213.1 +- Image Version: 20220220.1 ## Installed Software ### Language and Runtime @@ -30,14 +30,14 @@ ### Package Management - cpan 1.64 - Helm 3.8.0 -- Homebrew 3.3.14 -- Miniconda 4.10.3 +- Homebrew 3.3.15 +- Miniconda 4.11.0 - Npm 8.3.1 - Pip 20.0.2 - Pip3 20.0.2 - Pipx 1.0.0 - RubyGems 3.1.2 -- Vcpkg (build from master \<8dbd66f5a>) +- Vcpkg (build from master \<5cf60186a>) - Yarn 1.22.17 #### Environment variables @@ -62,7 +62,7 @@ - Bicep 0.4.1272 - Buildah 1.21.3 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - CMake 3.22.2 -- CodeQL Action Bundle 2.8.0 +- CodeQL Action Bundle 2.8.1 - Docker Compose v1 1.29.2 - Docker Compose v2 2.2.3+azure-1 - Docker-Buildx 0.7.1 @@ -70,14 +70,14 @@ - Docker-Moby Server 20.10.11+azure-3 - Fastlane 2.204.3 - Git 2.35.1 (apt source repository: ppa:git-core/ppa) -- Git LFS 3.0.2 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) +- Git LFS 3.1.2 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.6.0 - Haveged 1.9.1 - Heroku 7.59.2 -- HHVM (HipHop VM) 4.148.0 +- HHVM (HipHop VM) 4.149.0 - jq 1.6 - Kind 0.11.1 -- Kubectl 1.23.3 +- Kubectl 1.23.4 - Kustomize 4.5.2 - Leiningen 2.9.8 - MediaInfo 19.09 @@ -88,7 +88,7 @@ - nvm 0.39.1 - OpenSSL 1.1.1f 31 Mar 2020 - Packer 1.7.10 -- Parcel 2.3.1 +- Parcel 2.3.2 - PhantomJS 2.1.1 - Podman 3.4.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Pulumi 3.24.1 @@ -96,25 +96,25 @@ - Skopeo 1.3.0 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 -- Terraform 1.1.5 +- Terraform 1.1.6 - yamllint 1.26.3 -- yq 4.19.1 +- yq 4.20.2 - zstd 1.5.2 (homebrew) ### CLI Tools -- Alibaba Cloud CLI 3.0.107 -- AWS CLI 2.4.18 +- Alibaba Cloud CLI 3.0.109 +- AWS CLI 2.4.19 - AWS CLI Session manager plugin 1.2.295.0 -- AWS SAM CLI 1.37.0 -- Azure CLI (azure-cli) 2.33.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) +- AWS SAM CLI 1.38.1 +- Azure CLI (azure-cli) 2.33.1 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.23.0 -- GitHub CLI 2.5.0 +- GitHub CLI 2.5.1 - Google Cloud SDK 369.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 9.4.0 -- OpenShift CLI 4.9.19 +- Netlify CLI 9.6.5 +- OpenShift CLI 4.9.21 - ORAS CLI 0.12.0 -- Vercel CLI 23.1.2 +- Vercel CLI 24.0.0 ### Java | Version | Vendor | Environment Variable | @@ -131,7 +131,7 @@ ### PHP | Tool | Version | | -------- | ------------------- | -| PHP | 7.4.27 8.0.15 8.1.2 | +| PHP | 7.4.28 8.0.15 8.1.2 | | Composer | 2.2.6 | | PHPUnit | 8.5.23 | ``` @@ -158,9 +158,9 @@ - Rustfmt 1.4.38 ### Browsers and Drivers -- Google Chrome 98.0.4758.80 -- ChromeDriver 98.0.4758.80 -- Mozilla Firefox 96.0 +- Google Chrome 98.0.4758.102 +- ChromeDriver 98.0.4758.102 +- Mozilla Firefox 97.0 - Geckodriver 0.30.0 - Chromium 98.0.4758.0 - Selenium server 4.1.0 @@ -173,16 +173,22 @@ | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | ### .NET Core SDK -- 2.1.302 2.1.403 2.1.526 2.1.617 2.1.701 2.1.818 3.1.120 3.1.202 3.1.302 3.1.416 5.0.104 5.0.211 5.0.303 5.0.405 6.0.102 +- 3.1.120 3.1.202 3.1.302 3.1.416 5.0.104 5.0.211 5.0.303 5.0.405 6.0.200 ### .NET tools - nbgv 3.4.255+06fb9182bf ### Databases - MongoDB 5.0.6 (apt source repository: https://repo.mongodb.org/apt/ubuntu) -- PostgreSQL 14.2 (apt source repository: https://apt.postgresql.org/pub/repos/apt/) - sqlite3 3.31.1 +#### PostgreSQL +- PostgreSQL 14.2 (apt source repository: https://apt.postgresql.org/pub/repos/apt/) +- PostgreSQL Server (user:postgres) + +``` + PostgreSQL service is disabled by default. Use the following command as a part of your job to start the service: 'sudo systemctl start postgresql.service' +``` #### MySQL - MySQL 8.0.26 - MySQL Server (user:root password:root) @@ -191,7 +197,7 @@ MySQL service is disabled by default. Use the following command as a part of your job to start the service: 'sudo systemctl start mysql.service' ``` #### MS SQL Server Client Tools -- sqlcmd 17.8.0001.1 +- sqlcmd 17.9.0001.1 - SqlPackage 16.0.5400.1 ### Cached Tools @@ -206,10 +212,10 @@ - 16.14.0 #### PyPy -- 2.7.18 [PyPy 7.3.6] +- 2.7.18 [PyPy 7.3.8] - 3.6.12 [PyPy 7.3.3] -- 3.7.12 [PyPy 7.3.7] -- 3.8.12 [PyPy 7.3.7] +- 3.7.12 [PyPy 7.3.8] +- 3.8.12 [PyPy 7.3.8] #### Python - 2.7.18 From 55a07214fe4de5e8ef263ecffe23964db3ac18f7 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Tue, 22 Feb 2022 19:20:26 +0300 Subject: [PATCH 0989/3485] [Windows] Update cabal pester test (#5121) * [Windows] Update cabal pester test * Add CABAL_DIR test --- images/win/scripts/Tests/Haskell.Tests.ps1 | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/images/win/scripts/Tests/Haskell.Tests.ps1 b/images/win/scripts/Tests/Haskell.Tests.ps1 index db93e36d53eb..5893af28ec77 100644 --- a/images/win/scripts/Tests/Haskell.Tests.ps1 +++ b/images/win/scripts/Tests/Haskell.Tests.ps1 @@ -49,9 +49,12 @@ Describe "Haskell" { "cabal --version" | Should -ReturnZeroExitCode } - It "cabal config was modified and exists" { - $env:CABAL_DIR | Should -Exist - "cabal user-config diff" | Should -ReturnZeroExitCode + It "cabal folder does not exist" { + $env:CABAL_DIR | Should -Not -Exist + } + + It "CABAL_DIR environment variable exists" { + Get-EnvironmentVariable CABAL_DIR | Should -BeExactly "C:\cabal" } It "ghcup is installed" { From c0d57013e10dfe6a30cfb78f135e7f54f081671d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 22 Feb 2022 19:48:30 +0000 Subject: [PATCH 0990/3485] Updating readme file for win22 version 20220220.1 (#5113) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2022-Readme.md | 489 ++++++++++++++++--------------- 1 file changed, 248 insertions(+), 241 deletions(-) diff --git a/images/win/Windows2022-Readme.md b/images/win/Windows2022-Readme.md index b1d3977e46aa..98348187cf33 100644 --- a/images/win/Windows2022-Readme.md +++ b/images/win/Windows2022-Readme.md @@ -5,8 +5,8 @@ | [Windows-2016 environment will be removed on March 15, 2022](https://github.com/actions/virtual-environments/issues/4312) | *** # Microsoft Windows Server 2022 Datacenter -- OS Version: 10.0.20348 Build 473 -- Image Version: 20220207.1 +- OS Version: 10.0.20348 Build 524 +- Image Version: 20220220.1 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -14,27 +14,27 @@ ## Installed Software ### Language and Runtime - Bash 4.4.23(2)-release -- Go 1.16.13 +- Go 1.16.14 - Julia 1.7.2 - Kotlin 1.6.10 -- LLVM 13.0.0 -- Node 16.13.2 +- LLVM 13.0.1 +- Node 16.14.0 - Perl 5.32.1 -- PHP 8.1.2 +- PHP 8.1.3 - Python 3.9.10 - Ruby 3.0.3p157 ### Package Management - Chocolatey 0.12.1 - Composer 2.2.6 -- Helm 3.7.2 -- Miniconda 4.10.3 (pre-installed on the image but not added to PATH) -- NPM 8.1.2 -- NuGet 6.0.0.280 +- Helm 3.8.0 +- Miniconda 4.11.0 (pre-installed on the image but not added to PATH) +- NPM 8.3.1 +- NuGet 6.1.0.106 - pip 22.0.3 (python 3.9) - Pipx 1.0.0 - RubyGems 3.2.32 -- Vcpkg (build from master \<afb2279ad>) +- Vcpkg (build from master \<5cf60186a>) - Yarn 1.22.17 #### Environment variables @@ -54,29 +54,29 @@ - azcopy 10.13.0 - Bazel 5.0.0 - Bazelisk 1.11.0 -- Bicep 0.4.1124 +- Bicep 0.4.1272 - Cabal 3.6.2.0 - CMake 3.22.2 -- CodeQL Action Bundle 2.8.0 +- CodeQL Action Bundle 2.8.1 - Docker 20.10.7 - Docker-compose 1.29.2 - Docker-wincred 0.6.4 - ghc 9.2.1 -- Git 2.35.1 +- Git 2.35.1.windows.2 - Git LFS 3.0.2 - InnoSetup 6.2.0 - jq 1.6 - Kind 0.11.1 -- Kubectl 1.23.3 +- Kubectl 1.23.4 - Mercurial 5.0 - Mingw-w64 8.1.0 - Newman 5.3.1 - NSIS v3.08 - OpenSSL 1.1.1 -- Packer 1.7.8 +- Packer 1.7.10 - Pulumi v3.24.1 - R 4.1.2 -- Service Fabric SDK 8.2.1363.9590 +- Service Fabric SDK 8.2.1486.9590 - Stack 2.7.3 - Subversion (SVN) 1.14.1 - Swig 4.0.2 @@ -87,13 +87,13 @@ - zstd 1.5.2 ### CLI Tools -- Alibaba Cloud CLI 3.0.107 -- AWS CLI 2.4.16 -- AWS SAM CLI 1.37.0 +- Alibaba Cloud CLI 3.0.109 +- AWS CLI 2.4.19 +- AWS SAM CLI 1.38.1 - AWS Session Manager CLI 1.2.295.0 -- Azure CLI 2.33.0 +- Azure CLI 2.33.1 - Azure DevOps CLI extension 0.23.0 -- GitHub CLI 2.5.0 +- GitHub CLI 2.5.1 - Hub CLI 2.14.2 ### Rust Tools @@ -111,11 +111,11 @@ - Rustfmt 1.4.38 ### Browsers and webdrivers -- Google Chrome 98.0.4758.80 -- Chrome Driver 98.0.4758.80 -- Microsoft Edge 98.0.1108.43 -- Microsoft Edge Driver 98.0.1108.43 -- Mozilla Firefox 96.0.3 +- Google Chrome 98.0.4758.102 +- Chrome Driver 98.0.4758.102 +- Microsoft Edge 98.0.1108.56 +- Microsoft Edge Driver 98.0.1108.56 +- Mozilla Firefox 97.0.1 - Gecko Driver 0.30.0 - IE Driver 3.150.1.1 - Selenium server 4.1.0 @@ -132,7 +132,7 @@ | Version | Vendor | Environment Variable | | ------------------- | --------------- | -------------------- | | 8.0.322+6 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | -| 11.0.14+9 | Eclipse Temurin | JAVA_HOME_11_X64 | +| 11.0.14+101 | Eclipse Temurin | JAVA_HOME_11_X64 | | 17.0.2+8 | Eclipse Temurin | JAVA_HOME_17_X64 | ### Shells @@ -157,15 +157,15 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Version | Architecture | Environment Variable | | ------- | ------------ | -------------------- | | 1.15.15 | x64 | GOROOT_1_15_X64 | -| 1.16.13 (Default) | x64 | GOROOT_1_16_X64 | -| 1.17.6 | x64 | GOROOT_1_17_X64 | +| 1.16.14 (Default) | x64 | GOROOT_1_16_X64 | +| 1.17.7 | x64 | GOROOT_1_17_X64 | #### Node | Version | Architecture | | ------- | ------------ | | 12.22.10 | x64 | | 14.19.0 | x64 | -| 16.13.2 | x64 | +| 16.14.0 | x64 | #### Python | Version | Architecture | @@ -184,16 +184,16 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### PyPy | Python Version | PyPy Version | | -------------- | ------------ | -| 2.7.18 | PyPy 7.3.6 with MSC v.1929 64 bit (AMD64) | -| 3.7.12 | PyPy 7.3.7 with MSC v.1929 64 bit (AMD64) | -| 3.8.12 | PyPy 7.3.7 with MSC v.1929 64 bit (AMD64) | +| 2.7.18 | PyPy 7.3.8 with MSC v.1929 64 bit (AMD64) | +| 3.7.12 | PyPy 7.3.8 with MSC v.1929 64 bit (AMD64) | +| 3.8.12 | PyPy 7.3.8 with MSC v.1929 64 bit (AMD64) | ### Databases #### PostgreSQL | Property | Value | | -------------------- | ------------------------------------------------------------------------------------------------------------------------------------ | | ServiceName | postgresql-x64-14 | -| Version | 14.1 | +| Version | 14.2 | | ServiceStatus | Stopped | | ServiceStartType | Disabled | | EnvironmentVariables | PGBIN=C:\Program Files\PostgreSQL\14\bin <br> PGDATA=C:\Program Files\PostgreSQL\14\data <br> PGROOT=C:\Program Files\PostgreSQL\14 | @@ -222,207 +222,213 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Visual Studio Enterprise 2022 | Name | Version | Path | | ----------------------------- | -------------- | -------------------------------------------------------- | -| Visual Studio Enterprise 2022 | 17.0.32112.339 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | +| Visual Studio Enterprise 2022 | 17.1.32210.238 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | #### Workloads, components and extensions: | Package | Version | | ------------------------------------------------------------------------- | -------------- | -| Component.Android.NDK.R21E | 17.0.31804.368 | -| Component.Android.SDK.MAUI | 17.0.31804.368 | -| Component.Android.SDK25.Private | 17.0.31804.368 | +| Component.Android.NDK.R21E | 17.1.32112.364 | +| Component.Android.SDK.MAUI | 17.1.32112.364 | +| Component.Android.SDK25.Private | 17.1.32112.364 | | Component.Ant | 1.9.3.8 | -| Component.Linux.CMake | 17.0.31804.368 | -| Component.MDD.Android | 17.0.31804.368 | -| Component.MDD.Linux | 17.0.31804.368 | -| Component.MDD.Linux.GCC.arm | 17.0.31804.368 | -| Component.Microsoft.VisualStudio.LiveShare.2022 | 1.0.4647 | -| Component.Microsoft.VisualStudio.RazorExtension | 17.0.31804.368 | -| Component.Microsoft.VisualStudio.Web.AzureFunctions | 17.0.31804.368 | -| Component.Microsoft.Web.LibraryManager | 17.0.31804.368 | -| Component.Microsoft.WebTools.BrowserLink.WebLivePreview | 17.0.31.12604 | +| Component.Linux.CMake | 17.1.32112.364 | +| Component.MDD.Android | 17.1.32112.364 | +| Component.MDD.Linux | 17.1.32112.364 | +| Component.MDD.Linux.GCC.arm | 17.1.32112.364 | +| Component.Microsoft.VisualStudio.LiveShare.2022 | 1.0.5117 | +| Component.Microsoft.VisualStudio.RazorExtension | 17.1.32112.364 | +| Component.Microsoft.VisualStudio.Web.AzureFunctions | 17.1.32112.364 | +| Component.Microsoft.Web.LibraryManager | 17.1.32112.364 | +| Component.Microsoft.WebTools.BrowserLink.WebLivePreview | 17.1.70.52095 | | Component.Microsoft.Windows.CppWinRT | 2.0.210806.1 | -| Component.OpenJDK | 17.0.31804.368 | -| Component.UnityEngine.x64 | 17.0.31804.368 | -| Component.Unreal | 17.0.31804.368 | -| Component.Unreal.Android | 17.0.31804.368 | +| Component.OpenJDK | 17.1.32112.364 | +| Component.UnityEngine.x64 | 17.1.32112.364 | +| Component.Unreal | 17.1.32112.364 | +| Component.Unreal.Android | 17.1.32112.364 | | Component.VSInstallerProjects2022 | 2.0.0 | | Component.WixToolset.VisualStudioExtension.Dev17 | 1.0.0.18 | | Component.WixToolset.VisualStudioExtension.Schemas3 | 1.0.0.18 | | Component.WixToolset.VisualStudioExtension.Schemas4 | 1.0.0.18 | -| Component.Xamarin | 17.0.31804.368 | -| Component.Xamarin.RemotedSimulator | 17.0.31807.282 | -| Microsoft.Component.Azure.DataLake.Tools | 17.0.31805.14 | -| Microsoft.Component.ClickOnce | 17.0.31804.368 | -| Microsoft.Component.MSBuild | 17.0.31804.368 | -| Microsoft.Component.NetFX.Native | 17.0.31804.368 | -| Microsoft.Component.PythonTools | 17.0.31804.368 | -| Microsoft.Component.PythonTools.Web | 17.0.31804.368 | -| Microsoft.Component.VC.Runtime.UCRTSDK | 17.0.31804.368 | -| Microsoft.ComponentGroup.Blend | 17.0.31804.368 | -| Microsoft.ComponentGroup.ClickOnce.Publish | 17.0.31804.368 | -| Microsoft.Net.Component.4.5.2.TargetingPack | 17.0.31804.368 | -| Microsoft.Net.Component.4.6.2.TargetingPack | 17.0.31804.368 | -| Microsoft.Net.Component.4.6.TargetingPack | 17.0.31804.368 | -| Microsoft.Net.Component.4.7.1.TargetingPack | 17.0.31804.368 | -| Microsoft.Net.Component.4.7.2.TargetingPack | 17.0.31804.368 | -| Microsoft.Net.Component.4.7.TargetingPack | 17.0.31804.368 | -| Microsoft.Net.Component.4.8.SDK | 17.0.31804.368 | -| Microsoft.Net.Component.4.8.TargetingPack | 17.0.31804.368 | -| Microsoft.Net.ComponentGroup.4.8.DeveloperTools | 17.0.31804.368 | -| Microsoft.Net.ComponentGroup.DevelopmentPrerequisites | 17.0.31804.368 | -| Microsoft.Net.ComponentGroup.TargetingPacks.Common | 17.0.31804.368 | -| microsoft.net.runtime.mono.tooling | 6.0.121.56705 | -| microsoft.net.sdk.emscripten | 6.0.5.2003 | -| Microsoft.NetCore.Component.DevelopmentTools | 17.0.31804.368 | -| Microsoft.NetCore.Component.Runtime.6.0 | 17.0.32002.159 | -| Microsoft.NetCore.Component.SDK | 17.0.32106.176 | -| Microsoft.NetCore.Component.Web | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.AppInsights.Tools | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.AspNet | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.AspNet45 | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.Azure.AuthoringTools | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.Azure.ClientLibs | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.Azure.Compute.Emulator | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.Azure.Powershell | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.Azure.ResourceManager.Tools | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.Azure.ServiceFabric.Tools | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.Azure.Waverton | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.Azure.Waverton.BuildTools | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.ClassDesigner | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.CodeMap | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.Common.Azure.Tools | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.CoreEditor | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.Debugger.JustInTime | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.Debugger.Snapshot | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.DiagnosticTools | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.DockerTools | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.DotNetModelBuilder | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.DslTools | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.EntityFramework | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.FSharp | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.FSharp.Desktop | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.FSharp.WebTemplates | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.GraphDocument | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.Graphics | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.Graphics.Tools | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.IISExpress | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.IntelliCode | 17.0.31821.396 | -| Microsoft.VisualStudio.Component.IntelliTrace.FrontEnd | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.JavaScript.Diagnostics | 17.0.32001.416 | -| Microsoft.VisualStudio.Component.JavaScript.TypeScript | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.LinqToSql | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.LiveUnitTesting | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.ManagedDesktop.Core | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.ManagedDesktop.Prerequisites | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.Merq | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.MonoDebugger | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.MSODBC.SQL | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.MSSQL.CMDLnUtils | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.Node.Tools | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.NuGet | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.NuGet.BuildTools | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.PortableLibrary | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.Roslyn.Compiler | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.Roslyn.LanguageServices | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.Sharepoint.Tools | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.SQL.CLR | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.SQL.DataSources | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.SQL.LocalDB.Runtime | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.SQL.SSDT | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.TeamOffice | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.TestTools.CodedUITest | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.TestTools.WebLoadTest | 17.0.32001.416 | -| Microsoft.VisualStudio.Component.TextTemplating | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.TypeScript.TSServer | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.Unity | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.UWP.VC.ARM64 | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM.Spectre | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM64 | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM64.Spectre | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64 | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64.Spectre | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.VC.ASAN | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.VC.ATL | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.VC.ATL.ARM | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.VC.ATL.ARM64 | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.VC.ATL.ARM64EC | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.VC.ATL.Spectre | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.VC.ATLMFC | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.VC.ATLMFC.Spectre | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.VC.CLI.Support | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.VC.CMake.Project | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.VC.CoreBuildTools | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.VC.CoreIde | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.VC.DiagnosticTools | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.VC.Llvm.Clang | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.VC.Llvm.ClangToolset | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.VC.MFC.ARM | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.VC.MFC.ARM64 | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.VC.MFC.ARM64EC | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.VC.Modules.x86.x64 | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.VC.Redist.14.Latest | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.VC.Runtimes.ARM64.Spectre | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.VC.Runtimes.x86.x64.Spectre | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.VC.TestAdapterForBoostTest | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.VC.TestAdapterForGoogleTest | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.VC.Tools.ARM | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.VC.Tools.ARM64 | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.VC.Tools.ARM64EC | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.VC.Tools.x86.x64 | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.VC.v141.ATL | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.VC.v141.ATL.Spectre | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.VC.v141.MFC | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.VC.v141.MFC.Spectre | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.VC.v141.x86.x64 | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.VC.v141.x86.x64.Spectre | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.VSSDK | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.Wcf.Tooling | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.Web | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.WebDeploy | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.Windows10SDK | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.Windows10SDK.19041 | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.Windows10SDK.20348 | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.Windows11SDK.22000 | 17.0.31821.396 | -| Microsoft.VisualStudio.Component.Workflow | 17.0.31804.368 | -| Microsoft.VisualStudio.Component.WslDebugging | 17.0.31804.368 | -| Microsoft.VisualStudio.ComponentGroup.ArchitectureTools.Native | 17.0.31804.368 | -| Microsoft.VisualStudio.ComponentGroup.Azure.CloudServices | 17.0.31804.368 | -| Microsoft.VisualStudio.ComponentGroup.Azure.Prerequisites | 17.0.31804.368 | -| Microsoft.VisualStudio.ComponentGroup.Azure.ResourceManager.Tools | 17.0.31804.368 | -| Microsoft.VisualStudio.ComponentGroup.AzureFunctions | 17.0.31804.368 | -| Microsoft.VisualStudio.ComponentGroup.MSIX.Packaging | 17.0.31806.525 | -| Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core | 17.0.31804.368 | -| Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Llvm.Clang | 17.0.31804.368 | -| Microsoft.VisualStudio.ComponentGroup.UWP.NetCoreAndStandard | 17.0.31804.368 | -| Microsoft.VisualStudio.ComponentGroup.UWP.Support | 17.0.31804.368 | -| Microsoft.VisualStudio.ComponentGroup.UWP.VC.v142 | 17.0.31804.368 | -| Microsoft.VisualStudio.ComponentGroup.UWP.Xamarin | 17.0.31804.368 | -| Microsoft.VisualStudio.ComponentGroup.VC.Tools.142.x86.x64 | 17.0.31821.396 | -| Microsoft.VisualStudio.ComponentGroup.VisualStudioExtension.Prerequisites | 17.0.31804.368 | -| Microsoft.VisualStudio.ComponentGroup.Web | 17.0.31804.368 | -| Microsoft.VisualStudio.ComponentGroup.Web.CloudTools | 17.0.31804.368 | -| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions | 17.0.31804.368 | -| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.CMake | 17.0.31804.368 | -| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.TemplateEngine | 17.0.31804.368 | -| Microsoft.VisualStudio.Workload.Azure | 17.0.31804.368 | -| Microsoft.VisualStudio.Workload.CoreEditor | 17.0.31804.368 | -| Microsoft.VisualStudio.Workload.Data | 17.0.31804.368 | -| Microsoft.VisualStudio.Workload.DataScience | 17.0.31821.396 | -| Microsoft.VisualStudio.Workload.ManagedDesktop | 17.0.31804.368 | -| Microsoft.VisualStudio.Workload.ManagedGame | 17.0.31804.368 | -| Microsoft.VisualStudio.Workload.NativeCrossPlat | 17.0.31804.368 | -| Microsoft.VisualStudio.Workload.NativeDesktop | 17.0.31804.368 | -| Microsoft.VisualStudio.Workload.NativeGame | 17.0.31804.368 | -| Microsoft.VisualStudio.Workload.NativeMobile | 17.0.31804.368 | -| Microsoft.VisualStudio.Workload.NetCrossPlat | 17.0.31902.203 | -| Microsoft.VisualStudio.Workload.NetWeb | 17.0.31804.368 | -| Microsoft.VisualStudio.Workload.Node | 17.0.31804.368 | -| Microsoft.VisualStudio.Workload.Office | 17.0.31804.368 | -| Microsoft.VisualStudio.Workload.Python | 17.0.31919.74 | -| Microsoft.VisualStudio.Workload.Universal | 17.0.31804.368 | -| Microsoft.VisualStudio.Workload.VisualStudioExtension | 17.0.31804.368 | -| wasm.tools | 6.0.121.56705 | +| Component.Xamarin | 17.1.32112.364 | +| Component.Xamarin.RemotedSimulator | 17.1.32112.364 | +| Microsoft.Component.Azure.DataLake.Tools | 17.1.32112.364 | +| Microsoft.Component.ClickOnce | 17.1.32112.364 | +| Microsoft.Component.CodeAnalysis.SDK | 17.1.32112.364 | +| Microsoft.Component.MSBuild | 17.1.32112.364 | +| Microsoft.Component.NetFX.Native | 17.1.32112.364 | +| Microsoft.Component.PythonTools | 17.1.32112.364 | +| Microsoft.Component.PythonTools.Web | 17.1.32112.364 | +| Microsoft.Component.VC.Runtime.UCRTSDK | 17.1.32112.364 | +| Microsoft.ComponentGroup.Blend | 17.1.32112.364 | +| Microsoft.ComponentGroup.ClickOnce.Publish | 17.1.32112.364 | +| Microsoft.Net.Component.4.5.2.TargetingPack | 17.1.32112.364 | +| Microsoft.Net.Component.4.6.2.TargetingPack | 17.1.32112.364 | +| Microsoft.Net.Component.4.6.TargetingPack | 17.1.32112.364 | +| Microsoft.Net.Component.4.7.1.TargetingPack | 17.1.32112.364 | +| Microsoft.Net.Component.4.7.2.TargetingPack | 17.1.32112.364 | +| Microsoft.Net.Component.4.7.TargetingPack | 17.1.32112.364 | +| Microsoft.Net.Component.4.8.SDK | 17.1.32112.364 | +| Microsoft.Net.Component.4.8.TargetingPack | 17.1.32112.364 | +| Microsoft.Net.ComponentGroup.4.8.DeveloperTools | 17.1.32112.364 | +| Microsoft.Net.ComponentGroup.DevelopmentPrerequisites | 17.1.32112.364 | +| Microsoft.Net.ComponentGroup.TargetingPacks.Common | 17.1.32112.364 | +| microsoft.net.runtime.mono.tooling | 6.0.222.10215 | +| microsoft.net.sdk.emscripten | 6.0.6.10204 | +| Microsoft.NetCore.Component.DevelopmentTools | 17.1.32112.364 | +| Microsoft.NetCore.Component.Runtime.6.0 | 17.1.32210.238 | +| Microsoft.NetCore.Component.SDK | 17.1.32210.238 | +| Microsoft.NetCore.Component.Web | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.AppInsights.Tools | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.AspNet | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.AspNet45 | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.Azure.AuthoringTools | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.Azure.ClientLibs | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.Azure.Compute.Emulator | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.Azure.Powershell | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.Azure.ResourceManager.Tools | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.Azure.ServiceFabric.Tools | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.Azure.Waverton | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.Azure.Waverton.BuildTools | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.ClassDesigner | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.CodeMap | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.Common.Azure.Tools | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.CoreEditor | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.Debugger.JustInTime | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.Debugger.Snapshot | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.DiagnosticTools | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.DockerTools | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.DotNetModelBuilder | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.DslTools | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.Embedded | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.EntityFramework | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.FSharp | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.FSharp.Desktop | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.FSharp.WebTemplates | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.GraphDocument | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.Graphics | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.Graphics.Tools | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.IISExpress | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.IntelliCode | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.IntelliTrace.FrontEnd | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.JavaScript.Diagnostics | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.JavaScript.TypeScript | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.LinqToSql | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.LiveUnitTesting | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.ManagedDesktop.Core | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.ManagedDesktop.Prerequisites | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.Merq | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.MonoDebugger | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.MSODBC.SQL | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.MSSQL.CMDLnUtils | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.Node.Tools | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.NuGet | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.NuGet.BuildTools | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.PortableLibrary | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.Roslyn.Compiler | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.Roslyn.LanguageServices | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.Sharepoint.Tools | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.SQL.CLR | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.SQL.DataSources | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.SQL.LocalDB.Runtime | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.SQL.SSDT | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.TeamOffice | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.TestTools.CodedUITest | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.TestTools.WebLoadTest | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.TextTemplating | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.TypeScript.TSServer | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.Unity | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.UWP.VC.ARM64 | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM.Spectre | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM64 | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM64.Spectre | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64 | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64.Spectre | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.VC.ASAN | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.VC.ATL | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.VC.ATL.ARM | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.VC.ATL.ARM64 | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.VC.ATL.ARM64EC | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.VC.ATL.Spectre | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.VC.ATLMFC | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.VC.ATLMFC.Spectre | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.VC.CLI.Support | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.VC.CMake.Project | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.VC.CoreBuildTools | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.VC.CoreIde | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.VC.DiagnosticTools | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.VC.Llvm.Clang | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.VC.Llvm.ClangToolset | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.VC.MFC.ARM | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.VC.MFC.ARM64 | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.VC.MFC.ARM64EC | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.VC.Modules.x86.x64 | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.VC.Redist.14.Latest | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.VC.Runtimes.ARM64.Spectre | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.VC.Runtimes.x86.x64.Spectre | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.VC.TestAdapterForBoostTest | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.VC.TestAdapterForGoogleTest | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.VC.Tools.ARM | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.VC.Tools.ARM64 | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.VC.Tools.ARM64EC | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.VC.Tools.x86.x64 | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.VC.v141.ARM | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.VC.v141.ARM.Spectre | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.VC.v141.ARM64 | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.VC.v141.ARM64.Spectre | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.VC.v141.ATL | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.VC.v141.ATL.Spectre | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.VC.v141.MFC | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.VC.v141.MFC.Spectre | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.VC.v141.x86.x64 | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.VC.v141.x86.x64.Spectre | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.VSSDK | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.Wcf.Tooling | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.Web | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.WebDeploy | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.Windows10SDK | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.Windows10SDK.19041 | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.Windows10SDK.20348 | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.Windows11SDK.22000 | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.Workflow | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.WslDebugging | 17.1.32112.364 | +| Microsoft.VisualStudio.ComponentGroup.ArchitectureTools.Native | 17.1.32112.364 | +| Microsoft.VisualStudio.ComponentGroup.Azure.CloudServices | 17.1.32112.364 | +| Microsoft.VisualStudio.ComponentGroup.Azure.Prerequisites | 17.1.32112.364 | +| Microsoft.VisualStudio.ComponentGroup.Azure.ResourceManager.Tools | 17.1.32112.364 | +| Microsoft.VisualStudio.ComponentGroup.AzureFunctions | 17.1.32112.364 | +| Microsoft.VisualStudio.ComponentGroup.MSIX.Packaging | 17.1.32112.364 | +| Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core | 17.1.32112.364 | +| Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Llvm.Clang | 17.1.32112.364 | +| Microsoft.VisualStudio.ComponentGroup.UWP.NetCoreAndStandard | 17.1.32112.364 | +| Microsoft.VisualStudio.ComponentGroup.UWP.Support | 17.1.32112.364 | +| Microsoft.VisualStudio.ComponentGroup.UWP.VC.v142 | 17.1.32112.364 | +| Microsoft.VisualStudio.ComponentGroup.UWP.Xamarin | 17.1.32112.364 | +| Microsoft.VisualStudio.ComponentGroup.VC.Tools.142.x86.x64 | 17.1.32112.364 | +| Microsoft.VisualStudio.ComponentGroup.VisualStudioExtension.Prerequisites | 17.1.32112.364 | +| Microsoft.VisualStudio.ComponentGroup.Web | 17.1.32112.364 | +| Microsoft.VisualStudio.ComponentGroup.Web.CloudTools | 17.1.32112.364 | +| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions | 17.1.32112.364 | +| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.CMake | 17.1.32112.364 | +| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.TemplateEngine | 17.1.32112.364 | +| Microsoft.VisualStudio.Workload.Azure | 17.1.32112.364 | +| Microsoft.VisualStudio.Workload.CoreEditor | 17.1.32112.364 | +| Microsoft.VisualStudio.Workload.Data | 17.1.32112.364 | +| Microsoft.VisualStudio.Workload.DataScience | 17.1.32112.364 | +| Microsoft.VisualStudio.Workload.ManagedDesktop | 17.1.32112.364 | +| Microsoft.VisualStudio.Workload.ManagedGame | 17.1.32112.364 | +| Microsoft.VisualStudio.Workload.NativeCrossPlat | 17.1.32112.364 | +| Microsoft.VisualStudio.Workload.NativeDesktop | 17.1.32112.364 | +| Microsoft.VisualStudio.Workload.NativeGame | 17.1.32112.364 | +| Microsoft.VisualStudio.Workload.NativeMobile | 17.1.32112.364 | +| Microsoft.VisualStudio.Workload.NetCrossPlat | 17.1.32126.369 | +| Microsoft.VisualStudio.Workload.NetWeb | 17.1.32112.364 | +| Microsoft.VisualStudio.Workload.Node | 17.1.32112.364 | +| Microsoft.VisualStudio.Workload.Office | 17.1.32112.364 | +| Microsoft.VisualStudio.Workload.Python | 17.1.32112.364 | +| Microsoft.VisualStudio.Workload.Universal | 17.1.32112.364 | +| Microsoft.VisualStudio.Workload.VisualStudioExtension | 17.1.32112.364 | +| wasm.tools | 6.0.222.10215 | | VisualStudioClient.MicrosoftVisualStudio2022InstallerProjects | 2.0.0 | | WixToolset.WixToolsetVisualStudio2022Extension | 1.0.0.18 | @@ -433,12 +439,12 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft Visual C++ 2012 Minimum Runtime | x64 | 11.0.61030 | | Microsoft Visual C++ 2013 Additional Runtime | x64 | 12.0.40660 | | Microsoft Visual C++ 2013 Minimum Runtime | x64 | 12.0.40660 | -| Microsoft Visual C++ 2022 Additional Runtime | x64 | 14.30.30708 | -| Microsoft Visual C++ 2022 Debug Runtime | x64 | 14.30.30708 | -| Microsoft Visual C++ 2022 Minimum Runtime | x64 | 14.30.30708 | -| Microsoft Visual C++ 2022 Additional Runtime | x86 | 14.30.30708 | -| Microsoft Visual C++ 2022 Debug Runtime | x86 | 14.30.30708 | -| Microsoft Visual C++ 2022 Minimum Runtime | x86 | 14.30.30708 | +| Microsoft Visual C++ 2022 Additional Runtime | x64 | 14.31.31103 | +| Microsoft Visual C++ 2022 Debug Runtime | x64 | 14.31.31103 | +| Microsoft Visual C++ 2022 Minimum Runtime | x64 | 14.31.31103 | +| Microsoft Visual C++ 2022 Additional Runtime | x86 | 14.31.31103 | +| Microsoft Visual C++ 2022 Debug Runtime | x86 | 14.31.31103 | +| Microsoft Visual C++ 2022 Minimum Runtime | x86 | 14.31.31103 | #### Installed Windows SDKs `Location C:\Program Files (x86)\Windows Kits\10\Extension SDKs\WindowsDesktop` @@ -449,17 +455,17 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### .NET Core SDK `Location C:\Program Files\dotnet\sdk` -- 3.1.120 3.1.202 3.1.302 3.1.416 5.0.104 5.0.210 5.0.303 5.0.404 6.0.101 +- 3.1.120 3.1.202 3.1.302 3.1.416 5.0.104 5.0.211 5.0.303 5.0.405 6.0.200 ### .NET Core Runtime `Location: C:\Program Files\dotnet\shared\Microsoft.AspNetCore.App` -- 3.1.4 3.1.6 3.1.20 3.1.22 5.0.4 5.0.9 5.0.13 6.0.1 +- 3.1.4 3.1.6 3.1.20 3.1.22 5.0.4 5.0.9 5.0.13 5.0.14 6.0.2 `Location: C:\Program Files\dotnet\shared\Microsoft.NETCore.App` -- 3.1.4 3.1.6 3.1.20 3.1.22 5.0.4 5.0.9 5.0.13 6.0.1 +- 3.1.4 3.1.6 3.1.20 3.1.22 5.0.4 5.0.9 5.0.13 5.0.14 6.0.2 `Location: C:\Program Files\dotnet\shared\Microsoft.WindowsDesktop.App` -- 3.1.4 3.1.6 3.1.20 3.1.22 5.0.4 5.0.9 5.0.13 6.0.1 +- 3.1.4 3.1.6 3.1.20 3.1.22 5.0.4 5.0.9 5.0.14 6.0.2 ### .NET Framework `Type: Developer Pack` @@ -487,6 +493,7 @@ All other versions are saved but not installed. #### Powershell Modules | Module | Version | | ------------------ | ---------------- | +| AWSPowerShell | 4.1.27.0 | | DockerMsftProvider | 1.0.0.8 | | MarkdownPS | 1.9 | | Microsoft.Graph | 1.9.2 | @@ -525,10 +532,10 @@ All other versions are saved but not installed. ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2022 | sha256:4e2d2bfda651c33e406015676c4f6cd91a58741812a613b7aaa688097dc9211a | 2022-01-20 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2022 | sha256:5ec4722ef299457d69a7186d3da503a947584aa1a5bfc0bfc021fe115dc2a76b | 2022-01-20 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:93d713a7cfaf1d0898e375533c5fd931b8e89914deea1ba1e6e41d6beb898131 | 2022-01-20 | -| mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:b3c25b3a5fe2c55a3e341d8c3164e404bc1cad6aa1902eff715f11e1ca004fb8 | 2022-01-16 | -| mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:08d5f2a16e6a588ee9ed2a6d1a89cca1749f93773997507a73449f7eb16afba4 | 2022-01-16 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2022 | sha256:e4efd2e7d1a15825818255d8761481dc9b9edcc05c8fa9537e610edd311f7e9b | 2022-02-10 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2022 | sha256:aac1e1ee170c024e17745ee7109559f257a7c0dbf2e08245de387aad51e61b0d | 2022-02-10 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:bc33b197a4976dbedcb044af20a5b28db00b9b5677d6212b7cbbab9fad4e2f2d | 2022-02-16 | +| mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:8aa115e244add588e9a71a38d302e8fc801f2e986be83a58d5e015e4cba8f613 | 2022-02-01 | +| mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:720729320e08bdf14b6bc16444be6a3b74a457bd0584fee5124e6073e9f8f1cf | 2022-02-01 | From 547b6890b95ac52275c7a8eb82c6ca7abe631397 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 24 Feb 2022 16:32:49 +0000 Subject: [PATCH 0991/3485] Updating readme file for macOS-10.15 version 20220219.1 (#5114) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-10.15-Readme.md | 50 +++++++++++++++--------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/images/macos/macos-10.15-Readme.md b/images/macos/macos-10.15-Readme.md index 6c07973800c0..01e22a9212bd 100644 --- a/images/macos/macos-10.15-Readme.md +++ b/images/macos/macos-10.15-Readme.md @@ -3,13 +3,13 @@ | [[All OSs] .NET 2.1 will be removed from the images on February, 21](https://github.com/actions/virtual-environments/issues/4871) | *** # macOS 10.15 info -- System Version: macOS 10.15.7 (19H1713) +- System Version: macOS 10.15.7 (19H1715) - Kernel Version: Darwin 19.6.0 -- Image Version: 20220213.1 +- Image Version: 20220219.1 ## Installed Software ### Language and Runtime -- .NET SDK 2.1.302 2.1.403 2.1.507 2.1.607 2.1.701 2.1.818 3.1.101 3.1.201 3.1.302 3.1.416 5.0.102 5.0.202 5.0.302 5.0.405 +- .NET SDK 3.1.101 3.1.201 3.1.302 3.1.416 5.0.102 5.0.202 5.0.302 5.0.405 - Bash 3.2.57(1)-release - Clang/LLVM 12.0.0 is default - Clang/LLVM 13.0.1 is available on `'$(brew --prefix llvm)/bin/clang'` @@ -27,7 +27,7 @@ - NVM 0.39.1 - NVM - Cached node versions: v12.22.10 v14.19.0 v16.14.0 - Perl 5.34.0 -- PHP 8.1.2 +- PHP 8.1.3 - Python 2.7.18 - Python 3.9.10 - R 4.1.2 @@ -38,15 +38,15 @@ - Carthage 0.38.0 - CocoaPods 1.11.2 - Composer 2.2.6 -- Homebrew 3.3.14 -- Miniconda 4.10.3 +- Homebrew 3.3.15 +- Miniconda 4.11.0 - NPM 8.3.1 - NuGet 5.9.0.7134 - Pip 20.3.4 (python 2.7) - Pip 21.3.1 (python 3.9) - Pipx 1.0.0 - RubyGems 3.2.33 -- Vcpkg 2022 (build from master \<8dbd66f5a>) +- Vcpkg 2022 (build from master \<5cf60186a>) - Yarn 1.22.17 #### Environment variables @@ -69,9 +69,9 @@ - bazelisk 1.11.0 - bsdtar 3.3.2 - available by 'tar' alias - Curl 7.81.0 -- Git LFS: 3.0.2 -- Git: 2.35.1 -- GitHub CLI: 2.5.0 +- Git 2.35.1 +- Git LFS: 3.1.2 +- GitHub CLI: 2.5.1 - GNU parallel 20220122 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.2 @@ -94,13 +94,13 @@ - zstd 1.5.2 ### Tools -- Aliyun CLI 3.0.107 +- Aliyun CLI 3.0.109 - App Center CLI 2.10.8 -- AWS CLI 2.4.18 -- AWS SAM CLI 1.37.0 +- AWS CLI 2.4.19 +- AWS SAM CLI 1.38.1 - AWS Session Manager CLI 1.2.295.0 - Azure CLI (azure-devops) 0.23.0 -- Azure CLI 2.33.0 +- Azure CLI 2.33.1 - Bicep CLI 0.4.1272 - Cabal 3.6.2.0 - Cmake 3.22.2 @@ -120,20 +120,20 @@ ### Browsers - Safari 15.3 (15612.4.9.1.8) - SafariDriver 15.3 (15612.4.9.1.8) -- Google Chrome 98.0.4758.80 -- ChromeDriver 98.0.4758.80 -- Microsoft Edge 98.0.1108.51 -- MSEdgeDriver 98.0.1108.51 -- Mozilla Firefox 97.0 +- Google Chrome 98.0.4758.102 +- ChromeDriver 98.0.4758.102 +- Microsoft Edge 98.0.1108.56 +- MSEdgeDriver 98.0.1108.56 +- Mozilla Firefox 97.0.1 - geckodriver 0.30.0 - Selenium server 4.1.2 #### Environment variables -| Name | Value | -| --------------- | --------------------------------------------- | -| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/98.0.4758.80 | -| EDGEWEBDRIVER | /usr/local/share/edge_driver | -| GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | +| Name | Value | +| --------------- | ---------------------------------------------- | +| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/98.0.4758.102 | +| EDGEWEBDRIVER | /usr/local/share/edge_driver | +| GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | ### Java | Version | Vendor | Environment Variable | @@ -217,7 +217,7 @@ ### Xamarin #### Visual Studio for Mac -- 8.10.18.11 +- 8.10.19.2 #### Xamarin bundles | symlink | Xamarin.Mono | Xamarin.iOS | Xamarin.Mac | Xamarin.Android | From de56bc6444e5eb9f9121c7e81d1c7e72efa80053 Mon Sep 17 00:00:00 2001 From: Nikolay Frolov <90333448+nikolai-frolov@users.noreply.github.com> Date: Thu, 24 Feb 2022 19:45:57 +0300 Subject: [PATCH 0992/3485] [Windows] Update Intstall Edge logic (#5106) --- images/win/scripts/Installers/Install-Edge.ps1 | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/images/win/scripts/Installers/Install-Edge.ps1 b/images/win/scripts/Installers/Install-Edge.ps1 index 32eb8c60ab9d..317ff0501678 100644 --- a/images/win/scripts/Installers/Install-Edge.ps1 +++ b/images/win/scripts/Installers/Install-Edge.ps1 @@ -20,7 +20,7 @@ Write-Host "Get the Microsoft Edge WebDriver version..." $RegistryPath = "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths" $EdgePath = (Get-ItemProperty "$RegistryPath\msedge.exe").'(default)' [version]$EdgeVersion = [System.Diagnostics.FileVersionInfo]::GetVersionInfo($EdgePath).ProductVersion -$EdgeDriverVersionUrl = "https://msedgedriver.azureedge.net/LATEST_RELEASE_$($EdgeVersion.Major)" +$EdgeDriverVersionUrl = "https://msedgedriver.azureedge.net/LATEST_RELEASE_$($EdgeVersion.Major)_WINDOWS" $EdgeDriverVersionFile = Start-DownloadWithRetry -Url $EdgeDriverVersionUrl -Name "versioninfo.txt" -DownloadPath $EdgeDriverPath @@ -28,13 +28,6 @@ Write-Host "Download Microsoft Edge WebDriver..." $EdgeDriverLatestVersion = Get-Content -Path $EdgeDriverVersionFile $EdgeDriverArchName = "edgedriver_win64.zip" -# A temporary workaround to install the previous driver version because 98.0.1108.51 for win64 doesn't exist -if ($EdgeDriverLatestVersion -eq "98.0.1108.51") -{ - $EdgeDriverLatestVersion = "98.0.1108.50" - Set-Content -Path "${EdgeDriverPath}\versioninfo.txt" -Value $EdgeDriverLatestVersion -} - $EdgeDriverDownloadUrl = "https://msedgedriver.azureedge.net/${EdgeDriverLatestVersion}/${EdgeDriverArchName}" $EdgeDriverArchPath = Start-DownloadWithRetry -Url $EdgeDriverDownloadUrl -Name $EdgeDriverArchName From 009a1bea389b962c1e2b3b6330269542f024db29 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 24 Feb 2022 16:48:38 +0000 Subject: [PATCH 0993/3485] Updating readme file for macOS-11 version 20220220.1 (#5118) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-11-Readme.md | 57 +++++++++++++++++---------------- 1 file changed, 29 insertions(+), 28 deletions(-) diff --git a/images/macos/macos-11-Readme.md b/images/macos/macos-11-Readme.md index 4820acf7cd98..d9b2bb96ed0f 100644 --- a/images/macos/macos-11-Readme.md +++ b/images/macos/macos-11-Readme.md @@ -3,13 +3,13 @@ | [[All OSs] .NET 2.1 will be removed from the images on February, 21](https://github.com/actions/virtual-environments/issues/4871) | *** # macOS 11.6 info -- System Version: macOS 11.6.3 (20G415) +- System Version: macOS 11.6.4 (20G417) - Kernel Version: Darwin 20.6.0 -- Image Version: 20220212.1 +- Image Version: 20220220.1 ## Installed Software ### Language and Runtime -- .NET SDK 2.1.302 2.1.403 2.1.507 2.1.607 2.1.701 2.1.818 3.1.101 3.1.201 3.1.302 3.1.416 5.0.102 5.0.202 5.0.302 5.0.405 +- .NET SDK 3.1.101 3.1.201 3.1.302 3.1.416 5.0.102 5.0.202 5.0.302 5.0.405 - Bash 3.2.57(1)-release - Clang/LLVM 13.0.0 is default - Clang/LLVM 13.0.1 is available on `'$(brew --prefix llvm)/bin/clang'` @@ -27,7 +27,7 @@ - NVM 0.39.1 - NVM - Cached node versions: v12.22.10 v14.19.0 v16.14.0 - Perl 5.34.0 -- PHP 8.1.2 +- PHP 8.1.3 - Python 2.7.18 - Python 3.9.10 - R 4.1.2 @@ -38,15 +38,15 @@ - Carthage 0.38.0 - CocoaPods 1.11.2 - Composer 2.2.6 -- Homebrew 3.3.14 -- Miniconda 4.10.3 +- Homebrew 3.3.15 +- Miniconda 4.11.0 - NPM 8.3.1 - NuGet 5.9.0.7134 - Pip 20.3.4 (python 2.7) - Pip 21.3.1 (python 3.9) - Pipx 1.0.0 - RubyGems 3.2.33 -- Vcpkg 2022 (build from master \<8dbd66f5a>) +- Vcpkg 2022 (build from master \<5cf60186a>) - Yarn 1.22.17 #### Environment variables @@ -69,9 +69,9 @@ - bazelisk 1.11.0 - bsdtar 3.3.2 - available by 'tar' alias - Curl 7.81.0 -- Git LFS: 3.0.2 -- Git: 2.35.1 -- GitHub CLI: 2.5.0 +- Git 2.35.1 +- Git LFS: 3.1.2 +- GitHub CLI: 2.5.1 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.2 - gpg (GnuPG) 2.3.4 @@ -91,13 +91,13 @@ - zstd 1.5.2 ### Tools -- Aliyun CLI 3.0.107 +- Aliyun CLI 3.0.109 - App Center CLI 2.10.8 -- AWS CLI 2.4.18 -- AWS SAM CLI 1.37.0 +- AWS CLI 2.4.19 +- AWS SAM CLI 1.38.1 - AWS Session Manager CLI 1.2.295.0 - Azure CLI (azure-devops) 0.23.0 -- Azure CLI 2.33.0 +- Azure CLI 2.33.1 - Bicep CLI 0.4.1272 - Cabal 3.6.2.0 - Cmake 3.22.2 @@ -117,20 +117,20 @@ ### Browsers - Safari 15.3 (16612.4.9.1.8) - SafariDriver 15.3 (16612.4.9.1.8) -- Google Chrome 98.0.4758.80 -- ChromeDriver 98.0.4758.80 -- Microsoft Edge 98.0.1108.43 -- MSEdgeDriver 98.0.1108.43 -- Mozilla Firefox 97.0 +- Google Chrome 98.0.4758.102 +- ChromeDriver 98.0.4758.102 +- Microsoft Edge 98.0.1108.56 +- MSEdgeDriver 98.0.1108.56 +- Mozilla Firefox 97.0.1 - geckodriver 0.30.0 - Selenium server 4.1.2 #### Environment variables -| Name | Value | -| --------------- | --------------------------------------------- | -| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/98.0.4758.80 | -| EDGEWEBDRIVER | /usr/local/share/edge_driver | -| GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | +| Name | Value | +| --------------- | ---------------------------------------------- | +| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/98.0.4758.102 | +| EDGEWEBDRIVER | /usr/local/share/edge_driver | +| GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | ### Java | Version | Vendor | Environment Variable | @@ -159,9 +159,9 @@ - 3.10.2 #### PyPy -- 2.7.18 [PyPy 7.3.6] -- 3.7.12 [PyPy 7.3.7] -- 3.8.12 [PyPy 7.3.7] +- 2.7.18 [PyPy 7.3.8] +- 3.7.12 [PyPy 7.3.8] +- 3.8.12 [PyPy 7.3.8] #### Node.js - 12.22.10 @@ -208,11 +208,12 @@ ### Xamarin #### Visual Studio for Mac -- 8.10.18.11 +- 8.10.19.2 #### Xamarin bundles | symlink | Xamarin.Mono | Xamarin.iOS | Xamarin.Mac | Xamarin.Android | | ----------------- | ------------ | ----------- | ----------- | --------------- | +| 6_12_13 | 6.12 | 15.6 | 8.6 | 12.0 | | 6_12_12 (default) | 6.12 | 15.4 | 8.4 | 12.0 | | 6_12_11 | 6.12 | 15.2 | 8.2 | 12.0 | | 6_12_10 | 6.12 | 15.0 | 7.14 | 11.3 | From c2797f37cdef66b0c3e6ea41c8bdec543f2152f9 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Thu, 24 Feb 2022 20:05:24 +0300 Subject: [PATCH 0994/3485] [macOS] Migrating python 2 scripts to python 3 (#5115) --- .../provision/bootstrap-provisioner/change_password | 13 ++----------- .../provision/bootstrap-provisioner/kcpassword.py | 2 +- images/macos/provision/configuration/autologin.sh | 2 +- .../provision/configuration/configure-hostname.sh | 2 +- images/macos/templates/macOS-10.15.json | 2 +- images/macos/templates/macOS-11.json | 2 +- images/macos/templates/macOS-11.pkr.hcl | 2 +- images/macos/templates/macOS-12.json | 2 +- 8 files changed, 9 insertions(+), 18 deletions(-) diff --git a/images/macos/provision/bootstrap-provisioner/change_password b/images/macos/provision/bootstrap-provisioner/change_password index 3235834cc0ea..eda188471d2d 100755 --- a/images/macos/provision/bootstrap-provisioner/change_password +++ b/images/macos/provision/bootstrap-provisioner/change_password @@ -4,17 +4,8 @@ OLD_PASSWD="$2" NEW_PASSWD="$3" UPDATE_LOGIN_KEYCHAIN="${4:-true}" -export PATH=/usr/bin:/usr/sbin:/usr/local/bin:/bin:/sbin - -macosver="$(sw_vers | grep ProductVersion | awk {'print $2'})" - -if [[ $macosver =~ 10.13.* ]]; then - sudo /usr/bin/dscl . -passwd /Users/$USERNAME "$NEW_PASSWD" -else - sudo /usr/sbin/sysadminctl -resetPasswordFor $USERNAME -newPassword "$NEW_PASSWD" -adminUser $USERNAME -adminPassword "$OLD_PASSWD" -fi - -sudo /usr/bin/python /Users/$USERNAME/bootstrap/kcpassword.py "$NEW_PASSWD" +sudo /usr/sbin/sysadminctl -resetPasswordFor $USERNAME -newPassword "$NEW_PASSWD" -adminUser $USERNAME -adminPassword "$OLD_PASSWD" +sudo /usr/bin/python3 /Users/$USERNAME/bootstrap/kcpassword.py "$NEW_PASSWD" sudo /usr/bin/defaults write /Library/Preferences/com.apple.loginwindow autoLoginUser "$USERNAME" if [[ $UPDATE_LOGIN_KEYCHAIN == "true" ]]; then diff --git a/images/macos/provision/bootstrap-provisioner/kcpassword.py b/images/macos/provision/bootstrap-provisioner/kcpassword.py index 6b34121e1b59..386d33c4428f 100755 --- a/images/macos/provision/bootstrap-provisioner/kcpassword.py +++ b/images/macos/provision/bootstrap-provisioner/kcpassword.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Port of Gavin Brock's Perl kcpassword generator to Python, by Tom Taylor # <tom@tomtaylor.co.uk>. diff --git a/images/macos/provision/configuration/autologin.sh b/images/macos/provision/configuration/autologin.sh index 02f2f06d90eb..2e962490cec3 100755 --- a/images/macos/provision/configuration/autologin.sh +++ b/images/macos/provision/configuration/autologin.sh @@ -5,7 +5,7 @@ echo "Enabling automatic GUI login for the '$USERNAME' user.." -python $HOME/bootstrap/kcpassword.py "$PASSWORD" +python3 $HOME/bootstrap/kcpassword.py "$PASSWORD" /usr/bin/defaults write /Library/Preferences/com.apple.loginwindow autoLoginUser "$USERNAME" diff --git a/images/macos/provision/configuration/configure-hostname.sh b/images/macos/provision/configuration/configure-hostname.sh index e0de0bf8ea76..fef3bb2e2fda 100644 --- a/images/macos/provision/configuration/configure-hostname.sh +++ b/images/macos/provision/configuration/configure-hostname.sh @@ -4,7 +4,7 @@ tee -a /usr/local/bin/change_hostname.sh > /dev/null <<\EOF #!/bin/bash -e -o pipefail -name="Mac-$(python -c 'from time import time; print int(round(time() * 1000))')" +name="Mac-$(python3 -c 'from time import time; print(int(round(time() * 1000)))')" scutil --set HostName "${name}.local" scutil --set LocalHostName $name scutil --set ComputerName "${name}.local" diff --git a/images/macos/templates/macOS-10.15.json b/images/macos/templates/macOS-10.15.json index cc67e74ce0e8..9d051353a9d0 100644 --- a/images/macos/templates/macOS-10.15.json +++ b/images/macos/templates/macOS-10.15.json @@ -92,6 +92,7 @@ "type": "shell", "execute_command": "chmod +x {{ .Path }}; sudo {{ .Vars }} {{ .Path }}", "scripts": [ + "./provision/core/xcode-clt.sh", "./provision/configuration/add-network-interface-detection.sh", "./provision/configuration/autologin.sh", "./provision/configuration/disable-auto-updates.sh", @@ -129,7 +130,6 @@ "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}", "pause_before": "30s", "scripts": [ - "./provision/core/xcode-clt.sh", "./provision/core/homebrew.sh", "./provision/core/open_windows_check.sh", "./provision/core/powershell.sh", diff --git a/images/macos/templates/macOS-11.json b/images/macos/templates/macOS-11.json index ed7b80dbe8db..a62b26a97b4c 100644 --- a/images/macos/templates/macOS-11.json +++ b/images/macos/templates/macOS-11.json @@ -97,6 +97,7 @@ "type": "shell", "execute_command": "chmod +x {{ .Path }}; sudo {{ .Vars }} {{ .Path }}", "scripts": [ + "./provision/core/xcode-clt.sh", "./provision/configuration/add-network-interface-detection.sh", "./provision/configuration/autologin.sh", "./provision/configuration/disable-auto-updates.sh", @@ -116,7 +117,6 @@ "scripts": [ "./provision/configuration/preimagedata.sh", "./provision/configuration/configure-ssh.sh", - "./provision/core/xcode-clt.sh", "./provision/configuration/configure-machine.sh" ], "environment_vars": [ diff --git a/images/macos/templates/macOS-11.pkr.hcl b/images/macos/templates/macOS-11.pkr.hcl index 72bc9d59b74b..bbc65e2b682a 100644 --- a/images/macos/templates/macOS-11.pkr.hcl +++ b/images/macos/templates/macOS-11.pkr.hcl @@ -98,6 +98,7 @@ build { } provisioner "shell" { scripts = [ + "./provision/core/xcode-clt.sh", "./provision/configuration/configure-tccdb-macos11.sh", "./provision/configuration/add-network-interface-detection.sh", "./provision/configuration/autologin.sh", @@ -117,7 +118,6 @@ build { scripts = [ "./provision/configuration/preimagedata.sh", "./provision/configuration/configure-ssh.sh", - "./provision/core/xcode-clt.sh", "./provision/configuration/configure-machine.sh" ] environment_vars = [ diff --git a/images/macos/templates/macOS-12.json b/images/macos/templates/macOS-12.json index 8c54b7c1004e..c9477bb6b03a 100644 --- a/images/macos/templates/macOS-12.json +++ b/images/macos/templates/macOS-12.json @@ -97,6 +97,7 @@ "type": "shell", "execute_command": "chmod +x {{ .Path }}; sudo {{ .Vars }} {{ .Path }}", "scripts": [ + "./provision/core/xcode-clt.sh", "./provision/configuration/add-network-interface-detection.sh", "./provision/configuration/autologin.sh", "./provision/configuration/disable-auto-updates.sh", @@ -116,7 +117,6 @@ "scripts": [ "./provision/configuration/preimagedata.sh", "./provision/configuration/configure-ssh.sh", - "./provision/core/xcode-clt.sh", "./provision/configuration/configure-machine.sh" ], "environment_vars": [ From 95a5527ae91ab9186ce306e3793279fabce5e9e7 Mon Sep 17 00:00:00 2001 From: Steve-Glass <84886334+Steve-Glass@users.noreply.github.com> Date: Thu, 24 Feb 2022 15:36:50 -0500 Subject: [PATCH 0995/3485] Update deprecation guidance (#5127) * Update deprecation guidance * Update docs/software-and-images-guidelines.md Co-authored-by: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Co-authored-by: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> --- docs/software-and-images-guidelines.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/software-and-images-guidelines.md b/docs/software-and-images-guidelines.md index 3ca201c63031..0d7509e9422f 100644 --- a/docs/software-and-images-guidelines.md +++ b/docs/software-and-images-guidelines.md @@ -17,7 +17,7 @@ In general, these are the guidelines we consider when deciding what to pre-insta ## Software and images support policy These are the guidelines we follow in software and images supporting routine: - Tools and versions will typically be removed 6 months after they are deprecated or have reached end-of-life. -- We support at least 2 latest OS versions (LTS only for Ubuntu) and initiate deprecation process for the oldest one when image usage drops below 5%. +- We support at least 2 latest OS versions. We begin the deprecation process of the oldest image label once a new OS version has been released. - The images generally contain the latest versions of packages installed except for Ubuntu LTS where we rely on the Canonical-provided repositories mostly. - Popular tools can have several versions installed side-by-side with the following strategy: From 0ecbd128e3d289b64f8fa95d343091f0c6aae0dd Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Fri, 25 Feb 2022 00:23:26 +0300 Subject: [PATCH 0996/3485] Use mode:vm in sysprep to skip modules installation (#5136) --- images/win/windows2022.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/win/windows2022.json b/images/win/windows2022.json index 9a21b4c21036..db33e7b0b18c 100644 --- a/images/win/windows2022.json +++ b/images/win/windows2022.json @@ -317,7 +317,7 @@ "type": "powershell", "inline": [ "if( Test-Path $Env:SystemRoot\\System32\\Sysprep\\unattend.xml ){ rm $Env:SystemRoot\\System32\\Sysprep\\unattend.xml -Force}", - "& $env:SystemRoot\\System32\\Sysprep\\Sysprep.exe /oobe /generalize /quiet /quit", + "& $env:SystemRoot\\System32\\Sysprep\\Sysprep.exe /oobe /generalize /mode:vm /quiet /quit", "while($true) { $imageState = Get-ItemProperty HKLM:\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Setup\\State | Select ImageState; if($imageState.ImageState -ne 'IMAGE_STATE_GENERALIZE_RESEAL_TO_OOBE') { Write-Output $imageState.ImageState; Start-Sleep -s 10 } else { break } }" ] } From b410b609eb2117007c3ba135b49fa41211d9f8d1 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 25 Feb 2022 06:40:15 +0000 Subject: [PATCH 0997/3485] Updating readme file for win19 version 20220223.1 (#5129) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2019-Readme.md | 148 ++++++++++++++++--------------- 1 file changed, 78 insertions(+), 70 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index 7e25c17404ae..c9f3697b2c2b 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -2,12 +2,11 @@ |-| | [[All OSs] .NET 2.1 will be removed from the images on February, 21](https://github.com/actions/virtual-environments/issues/4871) | | [windows-latest workflows will use Windows Server 2022](https://github.com/actions/virtual-environments/issues/4856) | -| [[All OSs] Python version 3.5 will be removed from the images on January 24, 2022](https://github.com/actions/virtual-environments/issues/4744) | | [Windows-2016 environment will be removed on March 15, 2022](https://github.com/actions/virtual-environments/issues/4312) | *** # Microsoft Windows Server 2019 Datacenter -- OS Version: 10.0.17763 Build 2458 -- Image Version: 20220131.1 +- OS Version: 10.0.17763 Build 2565 +- Image Version: 20220223.1 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -16,26 +15,26 @@ ### Language and Runtime - Bash 4.4.23(2)-release - Go 1.15.15 -- Julia 1.7.1 +- Julia 1.7.2 - Kotlin 1.6.10 -- LLVM 13.0.0 -- Node 16.13.2 +- LLVM 13.0.1 +- Node 16.14.0 - Perl 5.32.1 -- PHP 8.1.2 +- PHP 8.1.3 - Python 3.7.9 - Ruby 2.5.9p229 ### Package Management - Chocolatey 0.12.1 -- Composer 2.2.5 -- Helm 3.7.2 -- Miniconda 4.10.3 (pre-installed on the image but not added to PATH) -- NPM 8.1.2 -- NuGet 6.0.0.280 -- pip 22.0.2 (python 3.7) +- Composer 2.2.6 +- Helm 3.8.0 +- Miniconda 4.11.0 (pre-installed on the image but not added to PATH) +- NPM 8.3.1 +- NuGet 6.1.0.106 +- pip 22.0.3 (python 3.7) - Pipx 1.0.0 - RubyGems 2.7.6.3 -- Vcpkg (build from master \<8518284c1>) +- Vcpkg (build from master \<7249fa4d6>) - Yarn 1.22.17 #### Environment variables @@ -48,7 +47,7 @@ - Ant 1.10.12 - Gradle 7.3 - Maven 3.8.4 -- sbt 1.6.1 +- sbt 1.6.2 ### Tools - 7zip 21.07 @@ -56,31 +55,31 @@ - azcopy 10.13.0 - Bazel 5.0.0 - Bazelisk 1.11.0 -- Bicep 0.4.1124 +- Bicep 0.4.1272 - Cabal 3.6.2.0 - CMake 3.22.2 -- CodeQL Action Bundle 2.7.6 +- CodeQL Action Bundle 2.8.1 - Docker 20.10.7 - Docker-compose 1.29.2 - Docker-wincred 0.6.4 - ghc 9.2.1 -- Git 2.35.1 +- Git 2.35.1.windows.2 - Git LFS 3.0.2 -- Google Cloud SDK 370.0.0 +- Google Cloud SDK 374.0.0 - InnoSetup 6.2.0 - jq 1.6 - Kind 0.11.1 -- Kubectl 1.23.3 +- Kubectl 1.23.4 - Mercurial 5.0 - Mingw-w64 8.1.0 - Newman 5.3.1 - NSIS v3.08 - OpenSSL 1.1.1 -- Packer 1.7.8 -- Parcel 2.2.1 -- Pulumi v3.23.0 +- Packer 1.7.10 +- Parcel 2.3.2 +- Pulumi v3.24.1 - R 4.1.2 -- Service Fabric SDK 8.2.1363.9590 +- Service Fabric SDK 8.2.1486.9590 - Stack 2.7.3 - Subversion (SVN) 1.14.1 - Swig 4.0.2 @@ -91,14 +90,14 @@ - zstd 1.5.2 ### CLI Tools -- Alibaba Cloud CLI 3.0.107 -- AWS CLI 2.4.15 -- AWS SAM CLI 1.37.0 +- Alibaba Cloud CLI 3.0.109 +- AWS CLI 2.4.20 +- AWS SAM CLI 1.39.0 - AWS Session Manager CLI 1.2.295.0 -- Azure CLI 2.32.0 -- Azure DevOps CLI extension 0.22.0 +- Azure CLI 2.33.1 +- Azure DevOps CLI extension 0.23.0 - Cloud Foundry CLI 6.53.0 -- GitHub CLI 2.4.0 +- GitHub CLI 2.5.1 - Hub CLI 2.14.2 ### Rust Tools @@ -116,11 +115,11 @@ - Rustfmt 1.4.38 ### Browsers and webdrivers -- Google Chrome 97.0.4692.99 -- Chrome Driver 97.0.4692.71 -- Microsoft Edge 97.0.1072.76 -- Microsoft Edge Driver 97.0.1072.76 -- Mozilla Firefox 96.0.3 +- Google Chrome 98.0.4758.102 +- Chrome Driver 98.0.4758.102 +- Microsoft Edge 98.0.1108.56 +- Microsoft Edge Driver 98.0.1108.56 +- Mozilla Firefox 97.0.1 - Gecko Driver 0.30.0 - IE Driver 3.150.1.1 - Selenium server 4.1.0 @@ -137,7 +136,7 @@ | Version | Vendor | Environment Variable | | ------------------- | --------------- | -------------------- | | 8.0.322+6 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | -| 11.0.14+9 | Eclipse Temurin | JAVA_HOME_11_X64 | +| 11.0.14+101 | Eclipse Temurin | JAVA_HOME_11_X64 | | 13.0.2+8.1 | Adopt OpenJDK | JAVA_HOME_13_X64 | | 17.0.2+8 | Eclipse Temurin | JAVA_HOME_17_X64 | @@ -166,15 +165,15 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Version | Architecture | Environment Variable | | ------- | ------------ | -------------------- | | 1.15.15 (Default) | x64 | GOROOT_1_15_X64 | -| 1.16.13 | x64 | GOROOT_1_16_X64 | -| 1.17.6 | x64 | GOROOT_1_17_X64 | +| 1.16.14 | x64 | GOROOT_1_16_X64 | +| 1.17.7 | x64 | GOROOT_1_17_X64 | #### Node | Version | Architecture | | ------- | ------------ | -| 12.22.9 | x64 | -| 14.18.3 | x64 | -| 16.13.2 | x64 | +| 12.22.10 | x64 | +| 14.19.0 | x64 | +| 16.14.0 | x64 | #### Python | Version | Architecture | @@ -183,8 +182,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | 3.6.8 | x64, x86 | | 3.7.9 (Default) | x64, x86 | | 3.8.10 | x64, x86 | -| 3.9.9 | x64, x86 | -| 3.10.1 | x64, x86 | +| 3.9.10 | x64, x86 | +| 3.10.2 | x64, x86 | #### Ruby | Version | Architecture | @@ -198,17 +197,17 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### PyPy | Python Version | PyPy Version | | -------------- | ------------ | -| 2.7.18 | PyPy 7.3.6 with MSC v.1929 64 bit (AMD64) | +| 2.7.18 | PyPy 7.3.8 with MSC v.1929 64 bit (AMD64) | | 3.6.12 | PyPy 7.3.3 with MSC v.1927 32 bit | -| 3.7.12 | PyPy 7.3.7 with MSC v.1929 64 bit (AMD64) | -| 3.8.12 | PyPy 7.3.7 with MSC v.1929 64 bit (AMD64) | +| 3.7.12 | PyPy 7.3.8 with MSC v.1929 64 bit (AMD64) | +| 3.8.12 | PyPy 7.3.8 with MSC v.1929 64 bit (AMD64) | ### Databases #### PostgreSQL | Property | Value | | -------------------- | ------------------------------------------------------------------------------------------------------------------------------------ | | ServiceName | postgresql-x64-14 | -| Version | 14.1 | +| Version | 14.2 | | ServiceStatus | Stopped | | ServiceStartType | Disabled | | EnvironmentVariables | PGBIN=C:\Program Files\PostgreSQL\14\bin <br> PGDATA=C:\Program Files\PostgreSQL\14\data <br> PGROOT=C:\Program Files\PostgreSQL\14 | @@ -237,12 +236,12 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Visual Studio Enterprise 2019 | Name | Version | Path | | ----------------------------- | --------------- | -------------------------------------------------------------- | -| Visual Studio Enterprise 2019 | 16.11.32106.194 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | +| Visual Studio Enterprise 2019 | 16.11.32126.315 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | #### Workloads, components and extensions: | Package | Version | | ------------------------------------------------------------------------- | --------------- | -| Component.Android.NDK.R16B | 16.11.32104.304 | +| Component.Android.NDK.R16B | 16.11.32126.126 | | Component.Android.SDK25.Private | 16.0.28625.61 | | Component.Android.SDK30 | 16.10.31205.252 | | Component.Ant | 1.9.3.8 | @@ -297,9 +296,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.Net.ComponentGroup.DevelopmentPrerequisites | 16.3.29207.166 | | Microsoft.Net.ComponentGroup.TargetingPacks.Common | 16.0.28516.191 | | Microsoft.NetCore.Component.DevelopmentTools | 16.10.31303.231 | -| Microsoft.NetCore.Component.Runtime.3.1 | 16.11.32002.110 | -| Microsoft.NetCore.Component.Runtime.5.0 | 16.11.32002.110 | -| Microsoft.NetCore.Component.SDK | 16.11.32105.334 | +| Microsoft.NetCore.Component.Runtime.3.1 | 16.11.32126.315 | +| Microsoft.NetCore.Component.Runtime.5.0 | 16.11.32126.315 | +| Microsoft.NetCore.Component.SDK | 16.11.32126.315 | | Microsoft.NetCore.Component.Web | 16.10.31303.231 | | Microsoft.VisualStudio.Component.AppInsights.Tools | 16.5.29515.121 | | Microsoft.VisualStudio.Component.AspNet45 | 16.10.31205.252 | @@ -468,7 +467,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | ms-biztalk.BizTalk | 3.13.2.0 | | ProBITools.MicrosoftAnalysisServicesModelingProjects | 2.9.18 | | ProBITools.MicrosoftReportProjectsforVisualStudio | 2.6.11 | -| SSIS.SqlServerIntegrationServicesProjects | 3.15 | +| SSIS.SqlServerIntegrationServicesProjects | 3.16 | | VisualStudioClient.MicrosoftVisualStudio2017InstallerProjects | 1.0.2 | | Windows Driver Kit | 10.0.21381.0 | | Windows Driver Kit Visual Studio Extension | 10.1.22000.1 | @@ -489,27 +488,35 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft Visual C++ 2013 Minimum Runtime | x86 | 12.0.21005 | | Microsoft Visual C++ 2019 Debug Runtime | x64 | 14.29.30139 | | Microsoft Visual C++ 2019 Debug Runtime | x86 | 14.29.30139 | -| Microsoft Visual C++ 2022 Additional Runtime | x64 | 14.30.30708 | -| Microsoft Visual C++ 2022 Minimum Runtime | x64 | 14.30.30708 | -| Microsoft Visual C++ 2022 Additional Runtime | x86 | 14.30.30708 | -| Microsoft Visual C++ 2022 Minimum Runtime | x86 | 14.30.30708 | +| Microsoft Visual C++ 2022 Additional Runtime | x64 | 14.31.31103 | +| Microsoft Visual C++ 2022 Minimum Runtime | x64 | 14.31.31103 | +| Microsoft Visual C++ 2022 Additional Runtime | x86 | 14.31.31103 | +| Microsoft Visual C++ 2022 Minimum Runtime | x86 | 14.31.31103 | + +#### Installed Windows SDKs +`Location C:\Program Files (x86)\Windows Kits\10\Extension SDKs\WindowsDesktop` +- 10.0.14393.0 +- 10.0.16299.0 +- 10.0.17134.0 +- 10.0.17763.0 +- 10.0.18362.0 +- 10.0.19041.0 +- 10.0.20348.0 +- 10.0.22000.0 ### .NET Core SDK `Location C:\Program Files\dotnet\sdk` -- 2.1.302 2.1.403 2.1.526 2.1.617 2.1.701 2.1.818 3.1.120 3.1.202 3.1.302 3.1.416 5.0.104 5.0.210 5.0.303 5.0.404 +- 3.1.120 3.1.202 3.1.302 3.1.416 5.0.104 5.0.211 5.0.303 5.0.405 ### .NET Core Runtime -`Location: C:\Program Files\dotnet\shared\Microsoft.AspNetCore.All` -- 2.1.2 2.1.5 2.1.12 2.1.24 2.1.30 - `Location: C:\Program Files\dotnet\shared\Microsoft.AspNetCore.App` -- 2.1.2 2.1.5 2.1.12 2.1.24 2.1.30 3.1.4 3.1.6 3.1.20 3.1.22 5.0.4 5.0.9 5.0.13 +- 3.1.4 3.1.6 3.1.20 3.1.22 5.0.4 5.0.9 5.0.14 `Location: C:\Program Files\dotnet\shared\Microsoft.NETCore.App` -- 2.1.2 2.1.5 2.1.12 2.1.24 2.1.30 3.1.4 3.1.6 3.1.20 3.1.22 5.0.4 5.0.9 5.0.13 +- 3.1.4 3.1.6 3.1.20 3.1.22 5.0.4 5.0.9 5.0.14 `Location: C:\Program Files\dotnet\shared\Microsoft.WindowsDesktop.App` -- 3.1.4 3.1.6 3.1.20 3.1.22 5.0.4 5.0.9 5.0.13 +- 3.1.4 3.1.6 3.1.20 3.1.22 5.0.4 5.0.9 5.0.14 ### .NET Framework `Type: Developer Pack` @@ -537,6 +544,7 @@ All other versions are saved but not installed. #### Powershell Modules | Module | Version | | ------------------ | ---------------- | +| AWSPowerShell | 4.1.29.0 | | DockerMsftProvider | 1.0.0.8 | | MarkdownPS | 1.9 | | Microsoft.Graph | 1.9.2 | @@ -553,7 +561,7 @@ All other versions are saved but not installed. | Android Command Line Tools | 4.0 | | Android SDK Build-tools | 32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3<br>26.0.0 26.0.1 26.0.2 26.0.3<br>25.0.0 25.0.1 25.0.2 25.0.3<br>24.0.0 24.0.1 24.0.2 24.0.3<br>23.0.1 23.0.2 23.0.3<br>22.0.1<br>21.1.2<br>20.0.0<br>19.1.0 | | Android SDK Platforms | android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3)<br>android-26 (rev 2)<br>android-25 (rev 3)<br>android-24 (rev 2)<br>android-23 (rev 3)<br>android-22 (rev 2)<br>android-21 (rev 2)<br>android-20 (rev 2)<br>android-19 (rev 4) | -| Android SDK Platform-Tools | 32.0.0 | +| Android SDK Platform-Tools | 33.0.0 | | Android SDK Tools | 26.1.1 | | Android Support Repository | 47.0.0 | | CMake | 3.10.2<br>3.18.1 | @@ -576,10 +584,10 @@ All other versions are saved but not installed. ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:04a11344139d5af207a1e9197878475b88560e67c85ecbcd6e8b87d45a8fa98f | 2022-01-20 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:7ef94f677d6a5d3c075c8206cdea1452a72e95b4fb9c0bd4f4d51df7a6ba166a | 2022-01-20 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:a4f0c42bae2e533d46ea6a898741cd2b10e11a2c505e8c4ff23329cc3605eb64 | 2022-01-20 | -| mcr.microsoft.com/windows/nanoserver:1809 | sha256:a608d7e96462ad9de894c98de74ac5c08c4624a40c6332d78d3a38c1939e1f62 | 2022-01-18 | -| mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:ab693245cc2f6c018a5718b9ded9eac109629e207907df81991f449d138cd85c | 2022-01-18 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:37a12f8f6d6bd9aef41c3ca37e3085d3c79ee309644d87f964e99fafe47df6ec | 2022-02-10 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:b7e797ce41cf3aa60de873750cbd0942021e64a54e5883e893becf7a7c905f81 | 2022-02-10 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:a230142ea0331493f01885d4910270de94e9eaacffaf594127c09c5d0f7c5368 | 2022-02-16 | +| mcr.microsoft.com/windows/nanoserver:1809 | sha256:1c73d8891bbbf862c2a52ed0bcde3d9592c07fe375d5a52d85cb94165846ea26 | 2022-02-02 | +| mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:d8c2b69511a49e9eb6fd2a17f2727ae011b0382cd11562fa5cb4c70bb460cf12 | 2022-02-02 | From 02c5be558e9a42394093a6eb54dd614c3b88a489 Mon Sep 17 00:00:00 2001 From: Nikolay Frolov <90333448+nikolai-frolov@users.noreply.github.com> Date: Fri, 25 Feb 2022 10:50:38 +0300 Subject: [PATCH 0998/3485] [Windows] Add PyPy 3.9 (#5133) --- images/win/toolsets/toolset-2016.json | 3 ++- images/win/toolsets/toolset-2019.json | 3 ++- images/win/toolsets/toolset-2022.json | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/images/win/toolsets/toolset-2016.json b/images/win/toolsets/toolset-2016.json index 9b5015eebe30..9af5642bd47b 100644 --- a/images/win/toolsets/toolset-2016.json +++ b/images/win/toolsets/toolset-2016.json @@ -49,7 +49,8 @@ "2.7", "3.6", "3.7", - "3.8" + "3.8", + "3.9" ] }, { diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index db2a57f54790..8b3d17383eeb 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -50,7 +50,8 @@ "2.7", "3.6", "3.7", - "3.8" + "3.8", + "3.9" ] }, { diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index 4a5d61361164..c835aca94f26 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -42,7 +42,8 @@ "versions": [ "2.7", "3.7", - "3.8" + "3.8", + "3.9" ] }, { From 6f729635350827b82316fba46ca79f00a3a78518 Mon Sep 17 00:00:00 2001 From: Nikolay Frolov <90333448+nikolai-frolov@users.noreply.github.com> Date: Fri, 25 Feb 2022 10:50:52 +0300 Subject: [PATCH 0999/3485] [Ubuntu] Add PyPy 3.9 (#5134) --- images/linux/toolsets/toolset-1804.json | 3 ++- images/linux/toolsets/toolset-2004.json | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index bad264fd438d..09b2c4da081f 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -21,7 +21,8 @@ "platform" : "linux", "versions": [ "2.7", - "3.6" + "3.6", + "3.9" ] }, { diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index ea9d237761d3..5a45d5b4fa73 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -23,7 +23,8 @@ "2.7", "3.6", "3.7", - "3.8" + "3.8", + "3.9" ] }, { From b2999beaf8620c0e2afdb09048120638183066ce Mon Sep 17 00:00:00 2001 From: Nikolay Frolov <90333448+nikolai-frolov@users.noreply.github.com> Date: Fri, 25 Feb 2022 10:51:43 +0300 Subject: [PATCH 1000/3485] [macOS] Add PyPy 3.9 (#5132) --- images/macos/toolsets/toolset-10.15.json | 3 ++- images/macos/toolsets/toolset-11.json | 3 ++- images/macos/toolsets/toolset-12.json | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index 6f955a250989..d3c5d4959bd0 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -267,7 +267,8 @@ "2.7", "3.6", "3.7", - "3.8" + "3.8", + "3.9" ] }, { diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index 47ba9c508fb9..15d3c14ce940 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -236,7 +236,8 @@ "versions": [ "2.7", "3.7", - "3.8" + "3.8", + "3.9" ] }, { diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index 25b838b57916..91977f76b299 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -150,7 +150,8 @@ "versions": [ "2.7", "3.7", - "3.8" + "3.8", + "3.9" ] }, { From 32b225ca7fcc45ba0127ae9f92d8d3cc9d24835a Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Fri, 25 Feb 2022 10:55:47 +0300 Subject: [PATCH 1001/3485] Anka close Python 2.7 window (#5135) --- .../provision/configuration/configure-machine.sh | 2 +- .../macos/provision/configuration/finalize-vm.sh | 2 +- images/macos/provision/core/python.sh | 5 +++++ images/macos/provision/utils/utils.sh | 15 ++++++++++++++- 4 files changed, 21 insertions(+), 3 deletions(-) diff --git a/images/macos/provision/configuration/configure-machine.sh b/images/macos/provision/configuration/configure-machine.sh index e9c193d6e1ae..8cbf869c8d1d 100644 --- a/images/macos/provision/configuration/configure-machine.sh +++ b/images/macos/provision/configuration/configure-machine.sh @@ -13,7 +13,7 @@ sudo rm -f /var/vm/sleepimage defaults write NSGlobalDomain NSAppSleepDisabled -bool YES # Disable Keyboard Setup Assistant window -if [ -d "/Library/Application Support/Veertu" ]; then +if is_Veertu; then sudo defaults write /Library/Preferences/com.apple.keyboardtype "keyboardtype" -dict-add "3-7582-0" -int 40 fi diff --git a/images/macos/provision/configuration/finalize-vm.sh b/images/macos/provision/configuration/finalize-vm.sh index e7af07eb3e00..acc498f9a677 100644 --- a/images/macos/provision/configuration/finalize-vm.sh +++ b/images/macos/provision/configuration/finalize-vm.sh @@ -3,7 +3,7 @@ source ~/utils/utils.sh # Close all finder windows because they can interfere with UI tests -osascript -e 'tell application "Finder" to close windows' +close_finder_window if is_Catalina; then # Ignore available updates to prevent system pop-ups diff --git a/images/macos/provision/core/python.sh b/images/macos/provision/core/python.sh index 9c83caf99197..1cd2fd83d732 100755 --- a/images/macos/provision/core/python.sh +++ b/images/macos/provision/core/python.sh @@ -12,6 +12,11 @@ pip install --upgrade pip echo "Install Python2 certificates" bash -c "/Applications/Python\ 2.7/Install\ Certificates.command" +# Close Finder window +if is_Veertu; then + close_finder_window +fi + # Explicitly overwrite symlinks created by Python2 such as /usr/local/bin/2to3 since they conflict with symlinks from Python3 # https://github.com/actions/virtual-environments/issues/2322 echo "Brew Installing Python 3" diff --git a/images/macos/provision/utils/utils.sh b/images/macos/provision/utils/utils.sh index 4b844a41e10d..a3ee128b7934 100755 --- a/images/macos/provision/utils/utils.sh +++ b/images/macos/provision/utils/utils.sh @@ -71,6 +71,14 @@ is_Less_Monterey() { fi } +is_Veertu() { + if [ -d "/Library/Application Support/Veertu" ]; then + true + else + false + fi +} + get_toolset_path() { echo "$HOME/image-generation/toolset.json" } @@ -192,4 +200,9 @@ get_github_package_download_url() { downloadUrl=$(echo $json | jq -r ".[] | select(.tag_name==\"${tagName}\").assets[].browser_download_url | select(${FILTER})" | head -n 1) echo $downloadUrl -} \ No newline at end of file +} + +# Close all finder windows because they can interfere with UI tests +close_finder_window() { + osascript -e 'tell application "Finder" to close windows' +} From 5b141f6a20d0164c25d7417cccc934c6207b8a92 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 25 Feb 2022 10:16:09 +0000 Subject: [PATCH 1002/3485] Updating readme file for win16 version 20220223.1 (#5130) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2016-Readme.md | 134 +++++++++++++++++-------------- 1 file changed, 72 insertions(+), 62 deletions(-) diff --git a/images/win/Windows2016-Readme.md b/images/win/Windows2016-Readme.md index b46da1bb82fd..adab1fd74028 100644 --- a/images/win/Windows2016-Readme.md +++ b/images/win/Windows2016-Readme.md @@ -2,37 +2,36 @@ |-| | [[All OSs] .NET 2.1 will be removed from the images on February, 21](https://github.com/actions/virtual-environments/issues/4871) | | [windows-latest workflows will use Windows Server 2022](https://github.com/actions/virtual-environments/issues/4856) | -| [[All OSs] Python version 3.5 will be removed from the images on January 24, 2022](https://github.com/actions/virtual-environments/issues/4744) | | [Windows-2016 environment will be removed on March 15, 2022](https://github.com/actions/virtual-environments/issues/4312) | *** # Microsoft Windows Server 2016 Datacenter -- OS Version: 10.0.14393 Build 4889 -- Image Version: 20220131.1 +- OS Version: 10.0.14393 Build 4946 +- Image Version: 20220223.1 ## Installed Software ### Language and Runtime - Bash 4.4.23(2)-release - Go 1.15.15 -- Julia 1.7.1 +- Julia 1.7.2 - Kotlin 1.6.10 -- LLVM 13.0.0 -- Node 16.13.2 +- LLVM 13.0.1 +- Node 16.14.0 - Perl 5.32.1 -- PHP 8.1.2 +- PHP 8.1.3 - Python 3.7.9 - Ruby 2.5.9p229 ### Package Management - Chocolatey 0.12.1 -- Composer 2.2.5 -- Helm 3.7.2 -- Miniconda 4.10.3 (pre-installed on the image but not added to PATH) -- NPM 8.1.2 -- NuGet 6.0.0.280 -- pip 22.0.2 (python 3.7) +- Composer 2.2.6 +- Helm 3.8.0 +- Miniconda 4.11.0 (pre-installed on the image but not added to PATH) +- NPM 8.3.1 +- NuGet 6.1.0.106 +- pip 22.0.3 (python 3.7) - Pipx 1.0.0 - RubyGems 2.7.6.3 -- Vcpkg (build from master \<8518284c1>) +- Vcpkg (build from master \<7249fa4d6>) - Yarn 1.22.17 #### Environment variables @@ -45,7 +44,7 @@ - Ant 1.10.12 - Gradle 7.3 - Maven 3.8.4 -- sbt 1.6.1 +- sbt 1.6.2 ### Tools - 7zip 21.07 @@ -53,31 +52,31 @@ - azcopy 10.13.0 - Bazel 5.0.0 - Bazelisk 1.11.0 -- Bicep 0.4.1124 +- Bicep 0.4.1272 - Cabal 3.6.2.0 - CMake 3.22.2 -- CodeQL Action Bundle 2.7.6 +- CodeQL Action Bundle 2.8.1 - Docker 20.10.7 - Docker-compose 1.29.2 - Docker-wincred 0.6.4 - ghc 9.2.1 -- Git 2.35.1 +- Git 2.35.1.windows.2 - Git LFS 3.0.2 -- Google Cloud SDK 370.0.0 +- Google Cloud SDK 374.0.0 - InnoSetup 6.2.0 - jq 1.6 - Kind 0.11.1 -- Kubectl 1.23.3 +- Kubectl 1.23.4 - Mercurial 5.0 - Mingw-w64 8.1.0 - Newman 5.3.1 - NSIS v3.08 - OpenSSL 1.1.1 -- Packer 1.7.8 -- Parcel 2.2.1 -- Pulumi v3.23.0 +- Packer 1.7.10 +- Parcel 2.3.2 +- Pulumi v3.24.1 - R 4.1.2 -- Service Fabric SDK 8.2.1363.9590 +- Service Fabric SDK 8.2.1486.9590 - Stack 2.7.3 - Subversion (SVN) 1.14.1 - Swig 4.0.2 @@ -88,14 +87,14 @@ - zstd 1.5.2 ### CLI Tools -- Alibaba Cloud CLI 3.0.107 -- AWS CLI 2.4.15 -- AWS SAM CLI 1.37.0 +- Alibaba Cloud CLI 3.0.109 +- AWS CLI 2.4.20 +- AWS SAM CLI 1.39.0 - AWS Session Manager CLI 1.2.295.0 -- Azure CLI 2.32.0 -- Azure DevOps CLI extension 0.22.0 +- Azure CLI 2.33.1 +- Azure DevOps CLI extension 0.23.0 - Cloud Foundry CLI 6.53.0 -- GitHub CLI 2.4.0 +- GitHub CLI 2.5.1 - Hub CLI 2.14.2 ### Rust Tools @@ -113,11 +112,11 @@ - Rustfmt 1.4.38 ### Browsers and webdrivers -- Google Chrome 97.0.4692.99 -- Chrome Driver 97.0.4692.71 -- Microsoft Edge 97.0.1072.76 -- Microsoft Edge Driver 97.0.1072.76 -- Mozilla Firefox 96.0.3 +- Google Chrome 98.0.4758.102 +- Chrome Driver 98.0.4758.102 +- Microsoft Edge 98.0.1108.56 +- Microsoft Edge Driver 98.0.1108.56 +- Mozilla Firefox 97.0.1 - Gecko Driver 0.30.0 - IE Driver 3.150.1.1 - Selenium server 4.1.0 @@ -134,7 +133,7 @@ | Version | Vendor | Environment Variable | | ------------------- | --------------- | -------------------- | | 8.0.322+6 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | -| 11.0.14+9 | Eclipse Temurin | JAVA_HOME_11_X64 | +| 11.0.14+101 | Eclipse Temurin | JAVA_HOME_11_X64 | | 13.0.2+8.1 | Adopt OpenJDK | JAVA_HOME_13_X64 | | 17.0.2+8 | Eclipse Temurin | JAVA_HOME_17_X64 | @@ -159,15 +158,15 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Version | Architecture | Environment Variable | | ------- | ------------ | -------------------- | | 1.15.15 (Default) | x64 | GOROOT_1_15_X64 | -| 1.16.13 | x64 | GOROOT_1_16_X64 | -| 1.17.6 | x64 | GOROOT_1_17_X64 | +| 1.16.14 | x64 | GOROOT_1_16_X64 | +| 1.17.7 | x64 | GOROOT_1_17_X64 | #### Node | Version | Architecture | | ------- | ------------ | -| 12.22.9 | x64 | -| 14.18.3 | x64 | -| 16.13.2 | x64 | +| 12.22.10 | x64 | +| 14.19.0 | x64 | +| 16.14.0 | x64 | #### Python | Version | Architecture | @@ -176,8 +175,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | 3.6.8 | x64, x86 | | 3.7.9 (Default) | x64, x86 | | 3.8.10 | x64, x86 | -| 3.9.9 | x64, x86 | -| 3.10.1 | x64 | +| 3.9.10 | x64, x86 | +| 3.10.2 | x64 | #### Ruby | Version | Architecture | @@ -191,17 +190,17 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### PyPy | Python Version | PyPy Version | | -------------- | ------------ | -| 2.7.18 | PyPy 7.3.6 with MSC v.1929 64 bit (AMD64) | +| 2.7.18 | PyPy 7.3.8 with MSC v.1929 64 bit (AMD64) | | 3.6.12 | PyPy 7.3.3 with MSC v.1927 32 bit | -| 3.7.12 | PyPy 7.3.7 with MSC v.1929 64 bit (AMD64) | -| 3.8.12 | PyPy 7.3.7 with MSC v.1929 64 bit (AMD64) | +| 3.7.12 | PyPy 7.3.8 with MSC v.1929 64 bit (AMD64) | +| 3.8.12 | PyPy 7.3.8 with MSC v.1929 64 bit (AMD64) | ### Databases #### PostgreSQL | Property | Value | | -------------------- | ------------------------------------------------------------------------------------------------------------------------------------ | | ServiceName | postgresql-x64-14 | -| Version | 14.1 | +| Version | 14.2 | | ServiceStatus | Stopped | | ServiceStartType | Disabled | | EnvironmentVariables | PGBIN=C:\Program Files\PostgreSQL\14\bin <br> PGDATA=C:\Program Files\PostgreSQL\14\data <br> PGROOT=C:\Program Files\PostgreSQL\14 | @@ -229,7 +228,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Visual Studio Enterprise 2017 | Name | Version | Path | | ----------------------------- | --------------- | -------------------------------------------------------------- | -| Visual Studio Enterprise 2017 | 15.9.28307.1778 | C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise | +| Visual Studio Enterprise 2017 | 15.9.28307.1800 | C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise | #### Workloads, components and extensions: | Package | Version | @@ -491,27 +490,37 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft Visual C++ 2013 Minimum Runtime | x86 | 12.0.21005 | | Microsoft Visual C++ 2017 Debug Runtime | x64 | 14.16.27033 | | Microsoft Visual C++ 2017 Debug Runtime | x86 | 14.16.27033 | -| Microsoft Visual C++ 2022 Additional Runtime | x64 | 14.30.30708 | -| Microsoft Visual C++ 2022 Minimum Runtime | x64 | 14.30.30708 | -| Microsoft Visual C++ 2022 Additional Runtime | x86 | 14.30.30708 | -| Microsoft Visual C++ 2022 Minimum Runtime | x86 | 14.30.30708 | +| Microsoft Visual C++ 2022 Additional Runtime | x64 | 14.31.31103 | +| Microsoft Visual C++ 2022 Minimum Runtime | x64 | 14.31.31103 | +| Microsoft Visual C++ 2022 Additional Runtime | x86 | 14.31.31103 | +| Microsoft Visual C++ 2022 Minimum Runtime | x86 | 14.31.31103 | + +#### Installed Windows SDKs +`Location C:\Program Files (x86)\Windows Kits\10\Extension SDKs\WindowsDesktop` +- 10.0.10240.0 +- 10.0.10586.0 +- 10.0.14393.0 +- 10.0.15063.0 +- 10.0.16299.0 +- 10.0.17134.0 +- 10.0.17763.0 ### .NET Core SDK `Location C:\Program Files\dotnet\sdk` -- 1.1.14 2.1.302 2.1.403 2.1.526 2.1.617 2.1.701 2.1.818 3.1.120 3.1.202 3.1.302 3.1.416 5.0.104 5.0.210 5.0.303 5.0.404 +- 1.1.14 2.1.526 3.1.120 3.1.202 3.1.302 3.1.416 5.0.104 5.0.211 5.0.303 5.0.405 ### .NET Core Runtime `Location: C:\Program Files\dotnet\shared\Microsoft.AspNetCore.All` -- 2.1.2 2.1.5 2.1.12 2.1.24 2.1.30 +- 2.1.30 `Location: C:\Program Files\dotnet\shared\Microsoft.AspNetCore.App` -- 2.1.2 2.1.5 2.1.12 2.1.24 2.1.30 3.1.4 3.1.6 3.1.20 3.1.22 5.0.4 5.0.9 5.0.13 +- 2.1.30 3.1.4 3.1.6 3.1.20 3.1.22 5.0.4 5.0.9 5.0.14 `Location: C:\Program Files\dotnet\shared\Microsoft.NETCore.App` -- 1.0.16 1.1.13 2.1.2 2.1.5 2.1.12 2.1.24 2.1.30 3.1.4 3.1.6 3.1.20 3.1.22 5.0.4 5.0.9 5.0.13 +- 1.0.16 1.1.13 2.1.30 3.1.4 3.1.6 3.1.20 3.1.22 5.0.4 5.0.9 5.0.14 `Location: C:\Program Files\dotnet\shared\Microsoft.WindowsDesktop.App` -- 3.1.4 3.1.6 3.1.20 3.1.22 5.0.4 5.0.9 5.0.13 +- 3.1.4 3.1.6 3.1.20 3.1.22 5.0.4 5.0.9 5.0.14 ### .NET Framework `Type: Developer Pack` @@ -539,6 +548,7 @@ All other versions are saved but not installed. #### Powershell Modules | Module | Version | | ------------------ | ---------------- | +| AWSPowerShell | 4.1.29.0 | | DockerMsftProvider | 1.0.0.8 | | MarkdownPS | 1.9 | | Microsoft.Graph | 1.9.2 | @@ -555,7 +565,7 @@ All other versions are saved but not installed. | Android Command Line Tools | 4.0 | | Android SDK Build-tools | 32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3<br>26.0.0 26.0.1 26.0.2 26.0.3<br>25.0.0 25.0.1 25.0.2 25.0.3<br>24.0.0 24.0.1 24.0.2 24.0.3<br>23.0.1 23.0.2 23.0.3<br>22.0.1<br>21.1.2<br>20.0.0<br>19.1.0 | | Android SDK Platforms | android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3)<br>android-26 (rev 2)<br>android-25 (rev 3)<br>android-24 (rev 2)<br>android-23 (rev 3)<br>android-22 (rev 2)<br>android-21 (rev 2)<br>android-20 (rev 2)<br>android-19 (rev 4) | -| Android SDK Platform-Tools | 32.0.0 | +| Android SDK Platform-Tools | 33.0.0 | | Android SDK Tools | 25.2.5 | | Android Support Repository | 47.0.0 | | CMake | 3.10.2<br>3.18.1 | @@ -578,10 +588,10 @@ All other versions are saved but not installed. ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2016 | sha256:c78a21380f0bc64b51a45c606040ed66b80a0fb51d83dfed281e44bcf16d2d7b | 2022-01-20 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2016 | sha256:9582e7a50284e118e6aa139e2a84275e7fee09e995c4e98d17784db2b0d179e4 | 2022-01-20 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2016 | sha256:d379501cc3fffb1689cbbc34c84e38edbb93edc35b58ba8df2c6637f99d889ca | 2022-01-20 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2016 | sha256:b9e3d42db02f6ea7ac05eb244e5c588076997e92513b88a46b0a0bfd04a5b8e1 | 2022-02-08 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2016 | sha256:ca99697a9354bbe9045512201be313167c74e65d6d6d2fe68d60f37629b3becc | 2022-02-08 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2016 | sha256:88439200c6701c2654ea0b5abc61f17df59966b0c27209137da8db4426dcbdec | 2022-02-16 | | mcr.microsoft.com/windows/nanoserver:10.0.14393.953 | sha256:fc60bd5ae0e61b334ce1cf1bcbf20c10c36b4c5482a01da319c9c989f9e6e268 | 2017-03-08 | -| mcr.microsoft.com/windows/servercore:ltsc2016 | sha256:bce670d46d87c39b8d8d1a0b8d3229b96654b969c4ea55513faa36ac9506e01c | 2022-01-16 | +| mcr.microsoft.com/windows/servercore:ltsc2016 | sha256:fad7ed8aa70fd6748bc814dc872a431c34136bdded9476386a5ff2e73d6ba9f0 | 2022-02-02 | From b7e6ffd8d32cb9dab59063e03dd941464f45f375 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Fri, 25 Feb 2022 15:55:30 +0300 Subject: [PATCH 1003/3485] [Ubuntu] Convert non valid java semver (#5131) * Convert non valid java semver * remove whitespace * Update regex --- images/linux/scripts/installers/java-tools.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/images/linux/scripts/installers/java-tools.sh b/images/linux/scripts/installers/java-tools.sh index 2ac4817d0040..b4567d96f629 100644 --- a/images/linux/scripts/installers/java-tools.sh +++ b/images/linux/scripts/installers/java-tools.sh @@ -76,6 +76,10 @@ installOpenJDK() { # If there is no semver in java release, then extract java version from -fullversion [[ -z ${fullJavaVersion} ]] && fullJavaVersion=$(${javaVersionPath}/bin/java -fullversion 2>&1 | tr -d "\"" | tr "+" "-" | awk '{print $4}') + # Convert non valid semver like 11.0.14.1-9 -> 11.0.14-9 + # https://github.com/adoptium/temurin-build/issues/2248 + [[ ${fullJavaVersion} =~ ^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+ ]] && fullJavaVersion=$(echo $fullJavaVersion | sed -E 's/\.[0-9]+-/-/') + javaToolcacheVersionPath="${JAVA_TOOLCACHE_PATH}/${fullJavaVersion}" mkdir -p "${javaToolcacheVersionPath}" From 305d2ef6204470bd2d7ee6dd44101318a16bd0e2 Mon Sep 17 00:00:00 2001 From: Alex Gaynor <alex.gaynor@gmail.com> Date: Mon, 28 Feb 2022 09:45:24 -0500 Subject: [PATCH 1004/3485] [windows] When installing Rust, add the i686 target to enable building 32-bit binaries (#5116) * [windows] When installing Rust, add the i686 target to enable building 32-bit binaries * Move code so that rustup is on the path --- images/win/scripts/Installers/Install-Rust.ps1 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/images/win/scripts/Installers/Install-Rust.ps1 b/images/win/scripts/Installers/Install-Rust.ps1 index 73b5abb3f33a..d9b43311a1d7 100644 --- a/images/win/scripts/Installers/Install-Rust.ps1 +++ b/images/win/scripts/Installers/Install-Rust.ps1 @@ -19,6 +19,9 @@ Add-DefaultPathItem "%USERPROFILE%\.cargo\bin" # Add Rust binaries to the path $env:Path += ";$env:CARGO_HOME\bin" +# Add i686 target for building 32-bit binaries +rustup target add i686-pc-windows-msvc + # Install common tools rustup component add rustfmt clippy cargo install --locked bindgen cbindgen cargo-audit cargo-outdated From bbc911bacaf802fe776bc49536afa481adf6d0f6 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Tue, 1 Mar 2022 15:13:02 +0300 Subject: [PATCH 1005/3485] [Anka] Add setup autologin bash script (#5153) --- images.CI/macos/anka/Service.Helpers.psm1 | 6 +- .../bootstrap-provisioner/setAutoLogin.sh | 64 +++++++++++++++++++ 2 files changed, 66 insertions(+), 4 deletions(-) create mode 100644 images/macos/provision/bootstrap-provisioner/setAutoLogin.sh diff --git a/images.CI/macos/anka/Service.Helpers.psm1 b/images.CI/macos/anka/Service.Helpers.psm1 index 855b754faa7f..27f74ddac525 100644 --- a/images.CI/macos/anka/Service.Helpers.psm1 +++ b/images.CI/macos/anka/Service.Helpers.psm1 @@ -13,12 +13,10 @@ function Enable-AutoLogon { [string] $Password ) - $url = "https://raw.githubusercontent.com/actions/virtual-environments/main/images/macos/provision/bootstrap-provisioner/kcpassword.py" + $url = "https://raw.githubusercontent.com/actions/virtual-environments/main/images/macos/provision/bootstrap-provisioner/setAutoLogin.sh" $script = Invoke-RestMethod -Uri $url $base64 = [Convert]::ToBase64String($script.ToCharArray()) - $kcpassword = "echo $base64 | base64 --decode > ~/kcpassword;sudo python ./kcpassword '${Password}';rm ./kcpassword" - $loginwindow = "sudo /usr/bin/defaults write /Library/Preferences/com.apple.loginwindow autoLoginUser '${UserName}';sudo /usr/bin/defaults write /Library/Preferences/com.apple.loginwindow autoLoginUserScreenLocked -bool false" - $command = "${kcpassword};$loginwindow" + $command = "echo $base64 | base64 --decode > ./setAutoLogin.sh;sudo bash ./setAutoLogin.sh '${UserName}' '${Password}';rm ./setAutoLogin.sh" Invoke-SSHPassCommand -HostName $HostName -Command $command } diff --git a/images/macos/provision/bootstrap-provisioner/setAutoLogin.sh b/images/macos/provision/bootstrap-provisioner/setAutoLogin.sh new file mode 100644 index 000000000000..d9beee9973c8 --- /dev/null +++ b/images/macos/provision/bootstrap-provisioner/setAutoLogin.sh @@ -0,0 +1,64 @@ +#!/bin/bash -e -o pipefail +: <<-LICENSE_BLOCK +setAutoLogin (20210911) - Copyright (c) 2021 Joel Bruner (https://github.com/brunerd) +Licensed under the MIT License + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +LICENSE_BLOCK + +USERNAME="${1}" +PW="${2}" + +function kcpasswordEncode { + #ascii string + local thisString="${1}" + local i + + #macOS cipher hex ascii representation array + local cipherHex_array=( 7D 89 52 23 D2 BC DD EA A3 B9 1F ) + + #converted to hex representation with spaces + local thisStringHex_array=( $(echo -n "${thisString}" | xxd -p -u | sed 's/../& /g') ) + + #get padding by subtraction if under 12 + if [ "${#thisStringHex_array[@]}" -lt 12 ]; then + local padding=$(( 12 - ${#thisStringHex_array[@]} )) + #get padding by subtracting remainder of modulo 12 if over 12 + elif [ "$(( ${#thisStringHex_array[@]} % 12 ))" -ne 0 ]; then + local padding=$(( (12 - ${#thisStringHex_array[@]} % 12) )) + #otherwise even multiples of 12 still need 12 padding + else + local padding=12 + fi + + #cycle through each element of the array + padding + for ((i=0; i < $(( ${#thisStringHex_array[@]} + ${padding})); i++)); do + #use modulus to loop through the cipher array elements + local charHex_cipher=${cipherHex_array[$(( $i % 11 ))]} + + #get the current hex representation element + local charHex=${thisStringHex_array[$i]} + + #use $(( shell Aritmethic )) to ^ XOR the two 0x## values (extra padding is 0x00) + #take decimal value and printf convert to two char hex value + #use xxd to convert hex to actual value and append to the encodedString variable + local encodedString+=$(printf "%02X" "$(( 0x${charHex_cipher} ^ 0x${charHex:-00} ))" | xxd -r -p) + done + + #return the string without a newline + echo -n "${encodedString}" +} + +#encode password and write file +kcpasswordEncode "${PW}" > /etc/kcpassword + +#ensure ownership and permissions (600) +chown root:wheel /etc/kcpassword +chmod u=rw,go= /etc/kcpassword + +#turn on auto login +/usr/bin/defaults write /Library/Preferences/com.apple.loginwindow autoLoginUser -string "${USERNAME}" +/usr/bin/defaults write /Library/Preferences/com.apple.loginwindow autoLoginUserScreenLocked -bool false +echo "Auto login enabled for '${USERNAME}'" From 2a1712d0f3f467065bc2c45b7fa864ba8f908b3f Mon Sep 17 00:00:00 2001 From: Image generation service account <no-reply@microsoft.com> Date: Mon, 7 Mar 2022 16:43:24 +0000 Subject: [PATCH 1006/3485] Updating readme file for win22 version 20220306.1 --- images/win/Windows2022-Readme.md | 56 ++++++++++++++++---------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/images/win/Windows2022-Readme.md b/images/win/Windows2022-Readme.md index 98348187cf33..22c356b05ed5 100644 --- a/images/win/Windows2022-Readme.md +++ b/images/win/Windows2022-Readme.md @@ -1,12 +1,11 @@ | Announcements | |-| -| [[All OSs] .NET 2.1 will be removed from the images on February, 21](https://github.com/actions/virtual-environments/issues/4871) | | [windows-latest workflows will use Windows Server 2022](https://github.com/actions/virtual-environments/issues/4856) | | [Windows-2016 environment will be removed on March 15, 2022](https://github.com/actions/virtual-environments/issues/4312) | *** # Microsoft Windows Server 2022 Datacenter - OS Version: 10.0.20348 Build 524 -- Image Version: 20220220.1 +- Image Version: 20220306.1 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -26,7 +25,7 @@ ### Package Management - Chocolatey 0.12.1 -- Composer 2.2.6 +- Composer 2.2.7 - Helm 3.8.0 - Miniconda 4.11.0 (pre-installed on the image but not added to PATH) - NPM 8.3.1 @@ -34,7 +33,7 @@ - pip 22.0.3 (python 3.9) - Pipx 1.0.0 - RubyGems 3.2.32 -- Vcpkg (build from master \<5cf60186a>) +- Vcpkg (build from master \<bd602277b>) - Yarn 1.22.17 #### Environment variables @@ -44,19 +43,19 @@ ### Project Management - Ant 1.10.12 -- Gradle 7.3 +- Gradle 7.4 - Maven 3.8.4 - sbt 1.6.2 ### Tools - 7zip 21.07 - aria2 1.36.0 -- azcopy 10.13.0 +- azcopy 10.14.0 - Bazel 5.0.0 - Bazelisk 1.11.0 - Bicep 0.4.1272 - Cabal 3.6.2.0 -- CMake 3.22.2 +- CMake 3.22.3 - CodeQL Action Bundle 2.8.1 - Docker 20.10.7 - Docker-compose 1.29.2 @@ -70,52 +69,52 @@ - Kubectl 1.23.4 - Mercurial 5.0 - Mingw-w64 8.1.0 -- Newman 5.3.1 +- Newman 5.3.2 - NSIS v3.08 - OpenSSL 1.1.1 - Packer 1.7.10 -- Pulumi v3.24.1 +- Pulumi v3.25.1 - R 4.1.2 - Service Fabric SDK 8.2.1486.9590 -- Stack 2.7.3 +- Stack 2.7.5 - Subversion (SVN) 1.14.1 - Swig 4.0.2 -- VSWhere 2.8.4 +- VSWhere 3.0.1 - WinAppDriver 1.2.2009.02003 - WiX Toolset v3.11.2.4516 - yamllint 1.26.3 - zstd 1.5.2 ### CLI Tools -- Alibaba Cloud CLI 3.0.109 -- AWS CLI 2.4.19 -- AWS SAM CLI 1.38.1 +- Alibaba Cloud CLI 3.0.110 +- AWS CLI 2.4.23 +- AWS SAM CLI 1.40.1 - AWS Session Manager CLI 1.2.295.0 -- Azure CLI 2.33.1 +- Azure CLI 2.34.1 - Azure DevOps CLI extension 0.23.0 -- GitHub CLI 2.5.1 +- GitHub CLI 2.5.2 - Hub CLI 2.14.2 ### Rust Tools -- Cargo 1.58.0 -- Rust 1.58.1 -- Rustdoc 1.58.1 +- Cargo 1.59.0 +- Rust 1.59.0 +- Rustdoc 1.59.0 - Rustup 1.24.3 #### Packages - bindgen 0.59.2 - cargo-audit 0.16.0 -- cargo-outdated v0.10.2 +- cargo-outdated 0.11.0 - cbindgen 0.20.0 -- Clippy 0.1.58 +- Clippy 0.1.59 - Rustfmt 1.4.38 ### Browsers and webdrivers -- Google Chrome 98.0.4758.102 -- Chrome Driver 98.0.4758.102 -- Microsoft Edge 98.0.1108.56 -- Microsoft Edge Driver 98.0.1108.56 -- Mozilla Firefox 97.0.1 +- Google Chrome 99.0.4844.51 +- Chrome Driver 99.0.4844.51 +- Microsoft Edge 99.0.1150.30 +- Microsoft Edge Driver 99.0.1150.30 +- Mozilla Firefox 97.0.2 - Gecko Driver 0.30.0 - IE Driver 3.150.1.1 - Selenium server 4.1.0 @@ -187,6 +186,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | 2.7.18 | PyPy 7.3.8 with MSC v.1929 64 bit (AMD64) | | 3.7.12 | PyPy 7.3.8 with MSC v.1929 64 bit (AMD64) | | 3.8.12 | PyPy 7.3.8 with MSC v.1929 64 bit (AMD64) | +| 3.9.10 | PyPy 7.3.8 with MSC v.1929 64 bit (AMD64) | ### Databases #### PostgreSQL @@ -493,7 +493,7 @@ All other versions are saved but not installed. #### Powershell Modules | Module | Version | | ------------------ | ---------------- | -| AWSPowerShell | 4.1.27.0 | +| AWSPowerShell | 4.1.37 | | DockerMsftProvider | 1.0.0.8 | | MarkdownPS | 1.9 | | Microsoft.Graph | 1.9.2 | @@ -511,7 +511,7 @@ All other versions are saved but not installed. | Android Emulator | 31.2.8 | | Android SDK Build-tools | 32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | | Android SDK Platforms | android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | -| Android SDK Platform-Tools | 32.0.0 | +| Android SDK Platform-Tools | 33.0.0 | | Android Support Repository | 47.0.0 | | CMake | 3.18.1 | | Google Play services | 49 | From a018d0a18d112442cf9162892048c4df94aa3e3f Mon Sep 17 00:00:00 2001 From: Image generation service account <no-reply@microsoft.com> Date: Mon, 7 Mar 2022 16:44:09 +0000 Subject: [PATCH 1007/3485] Updating readme file for win19 version 20220306.1 --- images/win/Windows2019-Readme.md | 56 ++++++++++++++++---------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index c9f3697b2c2b..7899a1afff9a 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -1,12 +1,11 @@ | Announcements | |-| -| [[All OSs] .NET 2.1 will be removed from the images on February, 21](https://github.com/actions/virtual-environments/issues/4871) | | [windows-latest workflows will use Windows Server 2022](https://github.com/actions/virtual-environments/issues/4856) | | [Windows-2016 environment will be removed on March 15, 2022](https://github.com/actions/virtual-environments/issues/4312) | *** # Microsoft Windows Server 2019 Datacenter - OS Version: 10.0.17763 Build 2565 -- Image Version: 20220223.1 +- Image Version: 20220306.1 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -26,7 +25,7 @@ ### Package Management - Chocolatey 0.12.1 -- Composer 2.2.6 +- Composer 2.2.7 - Helm 3.8.0 - Miniconda 4.11.0 (pre-installed on the image but not added to PATH) - NPM 8.3.1 @@ -34,7 +33,7 @@ - pip 22.0.3 (python 3.7) - Pipx 1.0.0 - RubyGems 2.7.6.3 -- Vcpkg (build from master \<7249fa4d6>) +- Vcpkg (build from master \<bd602277b>) - Yarn 1.22.17 #### Environment variables @@ -45,19 +44,19 @@ ### Project Management - Ant 1.10.12 -- Gradle 7.3 +- Gradle 7.4 - Maven 3.8.4 - sbt 1.6.2 ### Tools - 7zip 21.07 - aria2 1.36.0 -- azcopy 10.13.0 +- azcopy 10.14.0 - Bazel 5.0.0 - Bazelisk 1.11.0 - Bicep 0.4.1272 - Cabal 3.6.2.0 -- CMake 3.22.2 +- CMake 3.22.3 - CodeQL Action Bundle 2.8.1 - Docker 20.10.7 - Docker-compose 1.29.2 @@ -65,61 +64,61 @@ - ghc 9.2.1 - Git 2.35.1.windows.2 - Git LFS 3.0.2 -- Google Cloud SDK 374.0.0 +- Google Cloud SDK 375.0.0 - InnoSetup 6.2.0 - jq 1.6 - Kind 0.11.1 - Kubectl 1.23.4 - Mercurial 5.0 - Mingw-w64 8.1.0 -- Newman 5.3.1 +- Newman 5.3.2 - NSIS v3.08 - OpenSSL 1.1.1 - Packer 1.7.10 - Parcel 2.3.2 -- Pulumi v3.24.1 +- Pulumi v3.25.1 - R 4.1.2 - Service Fabric SDK 8.2.1486.9590 -- Stack 2.7.3 +- Stack 2.7.5 - Subversion (SVN) 1.14.1 - Swig 4.0.2 -- VSWhere 2.8.4 +- VSWhere 3.0.1 - WinAppDriver 1.2.2009.02003 - WiX Toolset v3.11.2.4516 - yamllint 1.26.3 - zstd 1.5.2 ### CLI Tools -- Alibaba Cloud CLI 3.0.109 -- AWS CLI 2.4.20 -- AWS SAM CLI 1.39.0 +- Alibaba Cloud CLI 3.0.110 +- AWS CLI 2.4.23 +- AWS SAM CLI 1.40.1 - AWS Session Manager CLI 1.2.295.0 -- Azure CLI 2.33.1 +- Azure CLI 2.34.1 - Azure DevOps CLI extension 0.23.0 - Cloud Foundry CLI 6.53.0 -- GitHub CLI 2.5.1 +- GitHub CLI 2.5.2 - Hub CLI 2.14.2 ### Rust Tools -- Cargo 1.58.0 -- Rust 1.58.1 -- Rustdoc 1.58.1 +- Cargo 1.59.0 +- Rust 1.59.0 +- Rustdoc 1.59.0 - Rustup 1.24.3 #### Packages - bindgen 0.59.2 - cargo-audit 0.16.0 -- cargo-outdated v0.10.2 +- cargo-outdated 0.11.0 - cbindgen 0.20.0 -- Clippy 0.1.58 +- Clippy 0.1.59 - Rustfmt 1.4.38 ### Browsers and webdrivers -- Google Chrome 98.0.4758.102 -- Chrome Driver 98.0.4758.102 -- Microsoft Edge 98.0.1108.56 -- Microsoft Edge Driver 98.0.1108.56 -- Mozilla Firefox 97.0.1 +- Google Chrome 99.0.4844.51 +- Chrome Driver 99.0.4844.51 +- Microsoft Edge 99.0.1150.30 +- Microsoft Edge Driver 99.0.1150.30 +- Mozilla Firefox 97.0.2 - Gecko Driver 0.30.0 - IE Driver 3.150.1.1 - Selenium server 4.1.0 @@ -201,6 +200,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | 3.6.12 | PyPy 7.3.3 with MSC v.1927 32 bit | | 3.7.12 | PyPy 7.3.8 with MSC v.1929 64 bit (AMD64) | | 3.8.12 | PyPy 7.3.8 with MSC v.1929 64 bit (AMD64) | +| 3.9.10 | PyPy 7.3.8 with MSC v.1929 64 bit (AMD64) | ### Databases #### PostgreSQL @@ -544,7 +544,7 @@ All other versions are saved but not installed. #### Powershell Modules | Module | Version | | ------------------ | ---------------- | -| AWSPowerShell | 4.1.29.0 | +| AWSPowerShell | 4.1.37 | | DockerMsftProvider | 1.0.0.8 | | MarkdownPS | 1.9 | | Microsoft.Graph | 1.9.2 | From 12fa229b4a3eebb871ed90ef2c45c897a4fd728d Mon Sep 17 00:00:00 2001 From: Image generation service account <no-reply@microsoft.com> Date: Mon, 7 Mar 2022 16:44:49 +0000 Subject: [PATCH 1008/3485] Updating readme file for ubuntu20 version 20220306.1 --- images/linux/Ubuntu2004-Readme.md | 112 +++++++++++++++--------------- 1 file changed, 56 insertions(+), 56 deletions(-) diff --git a/images/linux/Ubuntu2004-Readme.md b/images/linux/Ubuntu2004-Readme.md index adb9038eedd6..03ce077bc7ba 100644 --- a/images/linux/Ubuntu2004-Readme.md +++ b/images/linux/Ubuntu2004-Readme.md @@ -1,11 +1,10 @@ | Announcements | |-| -| [[All OSs] .NET 2.1 will be removed from the images on February, 21](https://github.com/actions/virtual-environments/issues/4871) | | [[Ubuntu] Issue with libstdc++ cannot allocate memory in static TLS block](https://github.com/actions/virtual-environments/issues/4799) | *** -# Ubuntu 20.04.3 LTS -- Linux kernel version: 5.11.0-1028-azure -- Image Version: 20220220.1 +# Ubuntu 20.04.4 LTS +- Linux kernel version: 5.13.0-1014-azure +- Image Version: 20220306.1 ## Installed Software ### Language and Runtime @@ -30,14 +29,14 @@ ### Package Management - cpan 1.64 - Helm 3.8.0 -- Homebrew 3.3.15 +- Homebrew 3.4.0 - Miniconda 4.11.0 - Npm 8.3.1 - Pip 20.0.2 - Pip3 20.0.2 - Pipx 1.0.0 - RubyGems 3.1.2 -- Vcpkg (build from master \<5cf60186a>) +- Vcpkg (build from master \<bd602277b>) - Yarn 1.22.17 #### Environment variables @@ -54,14 +53,14 @@ - Sbt 1.6.2 ### Tools -- Ansible 2.12.2 +- Ansible 2.12.3 - apt-fast 1.9.12 -- AzCopy 10.13.0 (available by `azcopy` and `azcopy10` aliases) +- AzCopy 10.14.0 (available by `azcopy` and `azcopy10` aliases) - Bazel 5.0.0 - Bazelisk 1.11.0 - Bicep 0.4.1272 - Buildah 1.21.3 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- CMake 3.22.2 +- CMake 3.22.3 - CodeQL Action Bundle 2.8.1 - Docker Compose v1 1.29.2 - Docker Compose v2 2.2.3+azure-1 @@ -74,7 +73,7 @@ - Git-ftp 1.6.0 - Haveged 1.9.1 - Heroku 7.59.2 -- HHVM (HipHop VM) 4.149.0 +- HHVM (HipHop VM) 4.151.0 - jq 1.6 - Kind 0.11.1 - Kubectl 1.23.4 @@ -82,46 +81,46 @@ - Leiningen 2.9.8 - MediaInfo 19.09 - Mercurial 5.3.1 -- Minikube 1.25.1 +- Minikube 1.25.2 - n 8.0.2 -- Newman 5.3.1 +- Newman 5.3.2 - nvm 0.39.1 - OpenSSL 1.1.1f 31 Mar 2020 -- Packer 1.7.10 +- Packer 1.8.0 - Parcel 2.3.2 - PhantomJS 2.1.1 - Podman 3.4.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- Pulumi 3.24.1 +- Pulumi 3.25.1 - R 4.1.2 - Skopeo 1.3.0 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 -- Terraform 1.1.6 +- Terraform 1.1.7 - yamllint 1.26.3 -- yq 4.20.2 +- yq 4.21.1 - zstd 1.5.2 (homebrew) ### CLI Tools -- Alibaba Cloud CLI 3.0.109 -- AWS CLI 2.4.19 +- Alibaba Cloud CLI 3.0.110 +- AWS CLI 2.4.23 - AWS CLI Session manager plugin 1.2.295.0 -- AWS SAM CLI 1.38.1 -- Azure CLI (azure-cli) 2.33.1 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) +- AWS SAM CLI 1.40.1 +- Azure CLI (azure-cli) 2.34.1 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.23.0 -- GitHub CLI 2.5.1 +- GitHub CLI 2.5.2 - Google Cloud SDK 369.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 9.6.5 -- OpenShift CLI 4.9.21 +- Netlify CLI 9.12.3 +- OpenShift CLI 4.9.23 - ORAS CLI 0.12.0 - Vercel CLI 24.0.0 ### Java -| Version | Vendor | Environment Variable | -| --------------------- | --------------- | -------------------- | -| 8.0.322+6 | Eclipse Temurin | JAVA_HOME_8_X64 | -| 11.0.14.1+1 (default) | Eclipse Temurin | JAVA_HOME_11_X64 | -| 17.0.2+8 | Eclipse Temurin | JAVA_HOME_17_X64 | +| Version | Vendor | Environment Variable | +| ------------------- | --------------- | -------------------- | +| 8.0.322+6 | Eclipse Temurin | JAVA_HOME_8_X64 | +| 11.0.14+1 (default) | Eclipse Temurin | JAVA_HOME_11_X64 | +| 17.0.2+8 | Eclipse Temurin | JAVA_HOME_17_X64 | ### GraalVM | Version | Environment variables | @@ -131,38 +130,38 @@ ### PHP | Tool | Version | | -------- | ------------------- | -| PHP | 7.4.28 8.0.15 8.1.2 | -| Composer | 2.2.6 | -| PHPUnit | 8.5.23 | +| PHP | 7.4.28 8.0.16 8.1.3 | +| Composer | 2.2.7 | +| PHPUnit | 8.5.24 | ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ``` ### Haskell - Cabal 3.6.2.0 - GHC 9.2.1 -- GHCup 0.1.17.4 -- Stack 2.7.3 +- GHCup 0.1.17.5 +- Stack 2.7.5 ### Rust Tools -- Cargo 1.58.0 -- Rust 1.58.1 -- Rustdoc 1.58.1 +- Cargo 1.59.0 +- Rust 1.59.0 +- Rustdoc 1.59.0 - Rustup 1.24.3 #### Packages - Bindgen 0.59.2 - Cargo audit 0.16.0 -- Cargo clippy 0.1.58 -- Cargo outdated 0.10.2 +- Cargo clippy 0.1.59 +- Cargo outdated - Cbindgen 0.20.0 - Rustfmt 1.4.38 ### Browsers and Drivers -- Google Chrome 98.0.4758.102 -- ChromeDriver 98.0.4758.102 -- Mozilla Firefox 97.0 +- Google Chrome 99.0.4844.51 +- ChromeDriver 99.0.4844.51 +- Mozilla Firefox 97.0.2 - Geckodriver 0.30.0 -- Chromium 98.0.4758.0 +- Chromium 99.0.4844.0 - Selenium server 4.1.0 #### Environment variables @@ -216,6 +215,7 @@ - 3.6.12 [PyPy 7.3.3] - 3.7.12 [PyPy 7.3.8] - 3.8.12 [PyPy 7.3.8] +- 3.9.10 [PyPy 7.3.8] #### Python - 2.7.18 @@ -264,7 +264,7 @@ | Android Command Line Tools | 4.0 | | Android Emulator | 31.2.8 | | Android SDK Build-tools | 32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | -| Android SDK Platform-Tools | 32.0.0 | +| Android SDK Platform-Tools | 33.0.0 | | Android SDK Platforms | android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | | Android SDK Tools | 26.1.1 | | Android Support Repository | 47.0.0 | @@ -289,22 +289,22 @@ | alpine:3.12 | sha256:d9459083f962de6bd980ae6a05be2a4cf670df6a1d898157bceb420342bec280 | 2021-11-12 | | alpine:3.13 | sha256:026f721af4cf2843e07bba648e158fb35ecc876d822130633cc49f707f0fc88c | 2021-11-12 | | alpine:3.14 | sha256:635f0aa53d99017b38d1a0aa5b2082f7812b03e3cdb299103fe77b5c8a07f1d2 | 2021-11-12 | -| buildpack-deps:bullseye | sha256:159126fd9e3b05c16a9cc4c2655e4a447effd7892e62b74b933e4a6cb370138e | 2022-01-26 | -| buildpack-deps:buster | sha256:64b00dac65b9ed4db078361a816e24e888e6ae926e43524b79f6fba424e8b6c8 | 2022-01-26 | -| buildpack-deps:stretch | sha256:3004c958ffa89199f04e8735d583c42ee3885c9c77daa4134930fe68eeee59c4 | 2022-01-26 | -| debian:10 | sha256:fde7a280413ec0122bd3a14dc76ba152f89cae999f3b8efe8784100df3640763 | 2022-01-26 | -| debian:11 | sha256:fb45fd4e25abe55a656ca69a7bef70e62099b8bb42a279a5e0ea4ae1ab410e0d | 2022-01-26 | -| debian:9 | sha256:4bb600434787c903886fe33526d19ff33114a33b433a4a4cdbdf9b8543f1ab5d | 2022-01-26 | +| buildpack-deps:bullseye | sha256:b0410921e9d888bd213492157e876988dfd2c4fe2724d63a2f6120381ac1881c | 2022-03-01 | +| buildpack-deps:buster | sha256:4b80c38e9bef63839e3d36de8419fb46e126b7b19b8f45b7b2cade51d193465e | 2022-03-01 | +| buildpack-deps:stretch | sha256:bf54440111c18564fd89db7f98a0c09b14af25a699d72e19752ab7ca6933a34f | 2022-03-01 | +| debian:10 | sha256:fd510d85d7e0691ca551fe08e8a2516a86c7f24601a940a299b5fe5cdd22c03a | 2022-03-01 | +| debian:11 | sha256:10b622c6cf6daa0a295be74c0e412ed20e10f91ae4c6f3ce6ff0c9c04f77cbf6 | 2022-03-01 | +| debian:9 | sha256:54f2c31487af733ad08e62af6a77ccddcbc8895857edc54768ba0020991950f9 | 2022-03-01 | | moby/buildkit:latest | sha256:d6c89b7085b106301645ddcc77cf64eb7b705ab507b72d52d130ac33f1300417 | 2021-11-18 | -| node:12 | sha256:7e1786920f4ebd88f8cc2dc9906f3c85ac78674cb29dcced535ff150a96f0873 | 2022-02-04 | +| node:12 | sha256:cc4adb82efc04b74b9f96326e682ad04be2df84d23e40609802eb6d6c207abde | 2022-03-02 | | node:12-alpine | sha256:dfa564312367b1a8fca8db7ae4bae102b28e68b39ebcb7b17022c938f105846b | 2022-02-04 | -| node:14 | sha256:b2c75df8c9706156c38b4f1f678d00e11cb2bfda09fc4ab6e36ec17ac9163865 | 2022-02-02 | +| node:14 | sha256:d3f3c5105b1defedbdd7a8c6a4184d11e65f246d0dfd798e6f0fabc4b5326d46 | 2022-03-02 | | node:14-alpine | sha256:9a2aa545388a135b496bd55cef2be920b96c4526c99c140170e05a8de3fce653 | 2022-02-02 | -| node:16 | sha256:fd86131ddf8e0faa8ba7a3e49b6bf571745946e663e4065f3bff0a07204c1dde | 2022-02-09 | +| node:16 | sha256:61b6cc81ecc3f94f614dca6bfdc5262d15a6618f7aabfbfc6f9f05c935ee753c | 2022-03-02 | | node:16-alpine | sha256:2c6c59cf4d34d4f937ddfcf33bab9d8bbad8658d1b9de7b97622566a52167f2b | 2022-02-09 | | ubuntu:16.04 | sha256:0f71fa8d4d2d4292c3c617fda2b36f6dabe5c8b6e34c3dc5b0d17d4e704bd39c | 2021-08-31 | -| ubuntu:18.04 | sha256:c2aa13782650aa7ade424b12008128b60034c795f25456e8eb552d0a0f447cad | 2022-02-02 | -| ubuntu:20.04 | sha256:669e010b58baf5beb2836b253c1fd5768333f0d1dbcb834f7c07a4dc93f474be | 2022-02-02 | +| ubuntu:18.04 | sha256:42cd9143b6060261187a72716906187294b8b66653b50d70bc7a90ccade5c984 | 2022-03-03 | +| ubuntu:20.04 | sha256:8ae9bafbb64f63a50caab98fd3a5e37b3eb837a3e0780b78e5218e63193961f9 | 2022-03-03 | ### Installed apt packages | Name | Version | @@ -339,7 +339,7 @@ | libgbm-dev | 21.2.6-0ubuntu0.1\~20.04.1 | | libgconf-2-4 | 3.2.6-6ubuntu1 | | libgsl-dev | 2.5+dfsg-6build1 | -| libgtk-3-0 | 3.24.20-0ubuntu1 | +| libgtk-3-0 | 3.24.20-0ubuntu1.1 | | libmagic-dev | 1:5.38-4 | | libmagickcore-dev | 8:6.9.10.23+dfsg-2.1ubuntu11.4 | | libmagickwand-dev | 8:6.9.10.23+dfsg-2.1ubuntu11.4 | @@ -348,7 +348,7 @@ | libunwind8 | 1.2.1-9build1 | | libxkbfile-dev | 1:1.1.0-1 | | libxss1 | 1:1.2.3-1 | -| locales | 2.31-0ubuntu9.2 | +| locales | 2.31-0ubuntu9.7 | | m4 | 1.4.18-4 | | mediainfo | 19.09-1build1 | | mercurial | 5.3.1-1ubuntu1 | From c9f328930d24562ddba15274bf176609a76f1c5f Mon Sep 17 00:00:00 2001 From: Alejandro Pauly <alepauly@github.com> Date: Thu, 10 Mar 2022 09:23:12 -0500 Subject: [PATCH 1009/3485] Fix match regex in Kubernetes tools downloads. --- images/win/scripts/Installers/Install-KubernetesTools.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/win/scripts/Installers/Install-KubernetesTools.ps1 b/images/win/scripts/Installers/Install-KubernetesTools.ps1 index 968cc5362e95..e0482bb1deac 100644 --- a/images/win/scripts/Installers/Install-KubernetesTools.ps1 +++ b/images/win/scripts/Installers/Install-KubernetesTools.ps1 @@ -6,7 +6,7 @@ Write-Host "Install Kind" # Choco installation can't be used because it depends on docker-desktop $url = 'https://api.github.com/repos/kubernetes-sigs/kind/releases/latest' -[System.String] $kindDownloadLink = (Invoke-RestMethod -Uri $url).assets.browser_download_url -match "kind-windows-amd64" +[System.String] $kindDownloadLink = (Invoke-RestMethod -Uri $url).assets.browser_download_url -match "kind-windows-amd64$" $destFilePath = "C:\ProgramData\kind" $null = New-Item -Path $destFilePath -ItemType Directory -Force Start-DownloadWithRetry -Url $kindDownloadLink -Name "kind.exe" -DownloadPath $destFilePath From 0e307e3de2b760aae4fac2b693a1c89e4f0277a0 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 10 Mar 2022 16:00:28 +0000 Subject: [PATCH 1010/3485] Updating readme file for ubuntu18 version 20220306.1 (#5190) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu1804-Readme.md | 102 +++++++++++++++--------------- 1 file changed, 51 insertions(+), 51 deletions(-) diff --git a/images/linux/Ubuntu1804-Readme.md b/images/linux/Ubuntu1804-Readme.md index 474471134173..c862f8663492 100644 --- a/images/linux/Ubuntu1804-Readme.md +++ b/images/linux/Ubuntu1804-Readme.md @@ -1,11 +1,10 @@ | Announcements | |-| -| [[All OSs] .NET 2.1 will be removed from the images on February, 21](https://github.com/actions/virtual-environments/issues/4871) | | [[Ubuntu] Issue with libstdc++ cannot allocate memory in static TLS block](https://github.com/actions/virtual-environments/issues/4799) | *** # Ubuntu 18.04.6 LTS -- Linux kernel version: 5.4.0-1069-azure -- Image Version: 20220220.1 +- Linux kernel version: 5.4.0-1070-azure +- Image Version: 20220306.1 ## Installed Software ### Language and Runtime @@ -30,14 +29,14 @@ ### Package Management - cpan 1.64 - Helm 3.8.0 -- Homebrew 3.3.15 +- Homebrew 3.4.0 - Miniconda 4.11.0 - Npm 8.3.1 - Pip 9.0.1 - Pip3 9.0.1 - Pipx 1.0.0 - RubyGems 2.7.6 -- Vcpkg (build from master \<5cf60186a>) +- Vcpkg (build from master \<bd602277b>) - Yarn 1.22.17 #### Environment variables @@ -53,14 +52,14 @@ - Sbt 1.6.2 ### Tools -- Ansible 2.11.8 +- Ansible 2.11.9 - apt-fast 1.9.12 -- AzCopy 10.13.0 (available by `azcopy` and `azcopy10` aliases) +- AzCopy 10.14.0 (available by `azcopy` and `azcopy10` aliases) - Bazel 5.0.0 - Bazelisk 1.11.0 - Bicep 0.4.1272 - Buildah 1.19.6 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- CMake 3.22.2 +- CMake 3.22.3 - CodeQL Action Bundle 2.8.1 - Docker Compose v1 1.29.2 - Docker Compose v2 2.2.3+azure-1 @@ -72,7 +71,7 @@ - Git-ftp 1.3.1 - Haveged 1.9.1 - Heroku 7.59.2 -- HHVM (HipHop VM) 4.149.0 +- HHVM (HipHop VM) 4.151.0 - jq 1.5 - Kind 0.11.1 - Kubectl 1.23.4 @@ -80,37 +79,37 @@ - Leiningen 2.9.8 - MediaInfo 17.12 - Mercurial 4.5.3 -- Minikube 1.25.1 +- Minikube 1.25.2 - n 8.0.2 -- Newman 5.3.1 +- Newman 5.3.2 - nvm 0.39.1 - OpenSSL 1.1.1 11 Sep 2018 -- Packer 1.7.10 +- Packer 1.8.0 - Parcel 2.3.2 - PhantomJS 2.1.1 - Podman 3.0.1 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- Pulumi 3.24.1 +- Pulumi 3.25.1 - R 4.1.2 - Skopeo 1.2.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 - SVN 1.9.7 -- Terraform 1.1.6 +- Terraform 1.1.7 - yamllint 1.26.3 -- yq 4.20.2 +- yq 4.21.1 - zstd 1.5.2 (homebrew) ### CLI Tools -- Alibaba Cloud CLI 3.0.109 -- AWS CLI 1.22.58 +- Alibaba Cloud CLI 3.0.110 +- AWS CLI 1.22.68 - AWS CLI Session manager plugin 1.2.295.0 -- AWS SAM CLI 1.38.1 -- Azure CLI (azure-cli) 2.33.1 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) +- AWS SAM CLI 1.40.1 +- Azure CLI (azure-cli) 2.34.1 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.23.0 -- GitHub CLI 2.5.1 +- GitHub CLI 2.5.2 - Google Cloud SDK 369.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 9.6.5 -- OpenShift CLI 4.9.21 +- Netlify CLI 9.12.3 +- OpenShift CLI 4.9.23 - ORAS CLI 0.12.0 - Vercel CLI 24.0.0 @@ -118,45 +117,45 @@ | Version | Vendor | Environment Variable | | ------------------- | --------------- | -------------------- | | 8.0.322+6 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | -| 11.0.14.1+1 | Eclipse Temurin | JAVA_HOME_11_X64 | +| 11.0.14+1 | Eclipse Temurin | JAVA_HOME_11_X64 | | 12.0.2+10 | Adopt OpenJDK | JAVA_HOME_12_X64 | | 17.0.2+8 | Eclipse Temurin | JAVA_HOME_17_X64 | ### PHP | Tool | Version | | -------- | ---------------------------------------- | -| PHP | 7.1.33 7.2.34 7.3.33 7.4.28 8.0.15 8.1.2 | -| Composer | 2.2.6 | -| PHPUnit | 8.5.23 | +| PHP | 7.1.33 7.2.34 7.3.33 7.4.28 8.0.16 8.1.3 | +| Composer | 2.2.7 | +| PHPUnit | 8.5.24 | ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ``` ### Haskell - Cabal 3.6.2.0 - GHC 9.2.1 -- GHCup 0.1.17.4 -- Stack 2.7.3 +- GHCup 0.1.17.5 +- Stack 2.7.5 ### Rust Tools -- Cargo 1.58.0 -- Rust 1.58.1 -- Rustdoc 1.58.1 +- Cargo 1.59.0 +- Rust 1.59.0 +- Rustdoc 1.59.0 - Rustup 1.24.3 #### Packages - Bindgen 0.59.2 - Cargo audit 0.16.0 -- Cargo clippy 0.1.58 -- Cargo outdated 0.10.2 +- Cargo clippy 0.1.59 +- Cargo outdated - Cbindgen 0.20.0 - Rustfmt 1.4.38 ### Browsers and Drivers -- Google Chrome 98.0.4758.102 -- ChromeDriver 98.0.4758.102 -- Mozilla Firefox 97.0 +- Google Chrome 99.0.4844.51 +- ChromeDriver 99.0.4844.51 +- Mozilla Firefox 97.0.2 - Geckodriver 0.30.0 -- Chromium 98.0.4758.0 +- Chromium 99.0.4844.0 - Selenium server 4.1.0 #### Environment variables @@ -208,6 +207,7 @@ #### PyPy - 2.7.18 [PyPy 7.3.8] - 3.6.12 [PyPy 7.3.3] +- 3.9.10 [PyPy 7.3.8] #### Python - 2.7.18 @@ -255,7 +255,7 @@ | Android Command Line Tools | 4.0 | | Android Emulator | 31.2.8 | | Android SDK Build-tools | 32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3<br>26.0.0 26.0.1 26.0.2 26.0.3<br>25.0.0 25.0.1 25.0.2 25.0.3<br>24.0.0 24.0.1 24.0.2 24.0.3<br>23.0.1 23.0.2 23.0.3 | -| Android SDK Platform-Tools | 32.0.0 | +| Android SDK Platform-Tools | 33.0.0 | | Android SDK Platforms | android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3)<br>android-26 (rev 2)<br>android-25 (rev 3)<br>android-24 (rev 2)<br>android-23 (rev 3) | | Android SDK Tools | 26.1.1 | | Android Support Repository | 47.0.0 | @@ -281,22 +281,22 @@ | alpine:3.12 | sha256:d9459083f962de6bd980ae6a05be2a4cf670df6a1d898157bceb420342bec280 | 2021-11-12 | | alpine:3.13 | sha256:026f721af4cf2843e07bba648e158fb35ecc876d822130633cc49f707f0fc88c | 2021-11-12 | | alpine:3.14 | sha256:635f0aa53d99017b38d1a0aa5b2082f7812b03e3cdb299103fe77b5c8a07f1d2 | 2021-11-12 | -| buildpack-deps:bullseye | sha256:159126fd9e3b05c16a9cc4c2655e4a447effd7892e62b74b933e4a6cb370138e | 2022-01-26 | -| buildpack-deps:buster | sha256:64b00dac65b9ed4db078361a816e24e888e6ae926e43524b79f6fba424e8b6c8 | 2022-01-26 | -| buildpack-deps:stretch | sha256:3004c958ffa89199f04e8735d583c42ee3885c9c77daa4134930fe68eeee59c4 | 2022-01-26 | -| debian:10 | sha256:fde7a280413ec0122bd3a14dc76ba152f89cae999f3b8efe8784100df3640763 | 2022-01-26 | -| debian:11 | sha256:fb45fd4e25abe55a656ca69a7bef70e62099b8bb42a279a5e0ea4ae1ab410e0d | 2022-01-26 | -| debian:9 | sha256:4bb600434787c903886fe33526d19ff33114a33b433a4a4cdbdf9b8543f1ab5d | 2022-01-26 | +| buildpack-deps:bullseye | sha256:b0410921e9d888bd213492157e876988dfd2c4fe2724d63a2f6120381ac1881c | 2022-03-01 | +| buildpack-deps:buster | sha256:4b80c38e9bef63839e3d36de8419fb46e126b7b19b8f45b7b2cade51d193465e | 2022-03-01 | +| buildpack-deps:stretch | sha256:bf54440111c18564fd89db7f98a0c09b14af25a699d72e19752ab7ca6933a34f | 2022-03-01 | +| debian:10 | sha256:fd510d85d7e0691ca551fe08e8a2516a86c7f24601a940a299b5fe5cdd22c03a | 2022-03-01 | +| debian:11 | sha256:10b622c6cf6daa0a295be74c0e412ed20e10f91ae4c6f3ce6ff0c9c04f77cbf6 | 2022-03-01 | +| debian:9 | sha256:54f2c31487af733ad08e62af6a77ccddcbc8895857edc54768ba0020991950f9 | 2022-03-01 | | moby/buildkit:latest | sha256:d6c89b7085b106301645ddcc77cf64eb7b705ab507b72d52d130ac33f1300417 | 2021-11-18 | -| node:12 | sha256:7e1786920f4ebd88f8cc2dc9906f3c85ac78674cb29dcced535ff150a96f0873 | 2022-02-04 | +| node:12 | sha256:cc4adb82efc04b74b9f96326e682ad04be2df84d23e40609802eb6d6c207abde | 2022-03-02 | | node:12-alpine | sha256:dfa564312367b1a8fca8db7ae4bae102b28e68b39ebcb7b17022c938f105846b | 2022-02-04 | -| node:14 | sha256:b2c75df8c9706156c38b4f1f678d00e11cb2bfda09fc4ab6e36ec17ac9163865 | 2022-02-02 | +| node:14 | sha256:d3f3c5105b1defedbdd7a8c6a4184d11e65f246d0dfd798e6f0fabc4b5326d46 | 2022-03-02 | | node:14-alpine | sha256:9a2aa545388a135b496bd55cef2be920b96c4526c99c140170e05a8de3fce653 | 2022-02-02 | -| node:16 | sha256:fd86131ddf8e0faa8ba7a3e49b6bf571745946e663e4065f3bff0a07204c1dde | 2022-02-09 | +| node:16 | sha256:61b6cc81ecc3f94f614dca6bfdc5262d15a6618f7aabfbfc6f9f05c935ee753c | 2022-03-02 | | node:16-alpine | sha256:2c6c59cf4d34d4f937ddfcf33bab9d8bbad8658d1b9de7b97622566a52167f2b | 2022-02-09 | | ubuntu:16.04 | sha256:0f71fa8d4d2d4292c3c617fda2b36f6dabe5c8b6e34c3dc5b0d17d4e704bd39c | 2021-08-31 | -| ubuntu:18.04 | sha256:c2aa13782650aa7ade424b12008128b60034c795f25456e8eb552d0a0f447cad | 2022-02-02 | -| ubuntu:20.04 | sha256:669e010b58baf5beb2836b253c1fd5768333f0d1dbcb834f7c07a4dc93f474be | 2022-02-02 | +| ubuntu:18.04 | sha256:42cd9143b6060261187a72716906187294b8b66653b50d70bc7a90ccade5c984 | 2022-03-03 | +| ubuntu:20.04 | sha256:8ae9bafbb64f63a50caab98fd3a5e37b3eb837a3e0780b78e5218e63193961f9 | 2022-03-03 | ### Installed apt packages | Name | Version | @@ -338,7 +338,7 @@ | libunwind8 | 1.2.1-8 | | libxkbfile-dev | 1:1.0.9-2 | | libxss1 | 1:1.2.2-1 | -| locales | 2.27-3ubuntu1.4 | +| locales | 2.27-3ubuntu1.5 | | m4 | 1.4.18-1 | | mediainfo | 17.12-1 | | mercurial | 4.5.3-1ubuntu2.2 | @@ -354,7 +354,7 @@ | pollinate | 4.33-0ubuntu1\~18.04.2 | | python-setuptools | 39.0.1-2 | | rpm | 4.14.1+dfsg1-2 | -| rsync | 3.1.2-2.1ubuntu1.2 | +| rsync | 3.1.2-2.1ubuntu1.3 | | shellcheck | 0.4.6-1 | | sphinxsearch | 2.2.11-2 | | sqlite3 | 3.22.0-1ubuntu0.4 | From d6a40056d2c600226aa8967ac887226a7374d72e Mon Sep 17 00:00:00 2001 From: Matthew Rosenbaum <8013350+mgrosen@users.noreply.github.com> Date: Fri, 11 Mar 2022 21:46:12 +0000 Subject: [PATCH 1011/3485] Revert "Updating readme file for ubuntu20 version 20220306.1" This reverts commit 12fa229b4a3eebb871ed90ef2c45c897a4fd728d. --- images/linux/Ubuntu2004-Readme.md | 112 +++++++++++++++--------------- 1 file changed, 56 insertions(+), 56 deletions(-) diff --git a/images/linux/Ubuntu2004-Readme.md b/images/linux/Ubuntu2004-Readme.md index 03ce077bc7ba..adb9038eedd6 100644 --- a/images/linux/Ubuntu2004-Readme.md +++ b/images/linux/Ubuntu2004-Readme.md @@ -1,10 +1,11 @@ | Announcements | |-| +| [[All OSs] .NET 2.1 will be removed from the images on February, 21](https://github.com/actions/virtual-environments/issues/4871) | | [[Ubuntu] Issue with libstdc++ cannot allocate memory in static TLS block](https://github.com/actions/virtual-environments/issues/4799) | *** -# Ubuntu 20.04.4 LTS -- Linux kernel version: 5.13.0-1014-azure -- Image Version: 20220306.1 +# Ubuntu 20.04.3 LTS +- Linux kernel version: 5.11.0-1028-azure +- Image Version: 20220220.1 ## Installed Software ### Language and Runtime @@ -29,14 +30,14 @@ ### Package Management - cpan 1.64 - Helm 3.8.0 -- Homebrew 3.4.0 +- Homebrew 3.3.15 - Miniconda 4.11.0 - Npm 8.3.1 - Pip 20.0.2 - Pip3 20.0.2 - Pipx 1.0.0 - RubyGems 3.1.2 -- Vcpkg (build from master \<bd602277b>) +- Vcpkg (build from master \<5cf60186a>) - Yarn 1.22.17 #### Environment variables @@ -53,14 +54,14 @@ - Sbt 1.6.2 ### Tools -- Ansible 2.12.3 +- Ansible 2.12.2 - apt-fast 1.9.12 -- AzCopy 10.14.0 (available by `azcopy` and `azcopy10` aliases) +- AzCopy 10.13.0 (available by `azcopy` and `azcopy10` aliases) - Bazel 5.0.0 - Bazelisk 1.11.0 - Bicep 0.4.1272 - Buildah 1.21.3 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- CMake 3.22.3 +- CMake 3.22.2 - CodeQL Action Bundle 2.8.1 - Docker Compose v1 1.29.2 - Docker Compose v2 2.2.3+azure-1 @@ -73,7 +74,7 @@ - Git-ftp 1.6.0 - Haveged 1.9.1 - Heroku 7.59.2 -- HHVM (HipHop VM) 4.151.0 +- HHVM (HipHop VM) 4.149.0 - jq 1.6 - Kind 0.11.1 - Kubectl 1.23.4 @@ -81,46 +82,46 @@ - Leiningen 2.9.8 - MediaInfo 19.09 - Mercurial 5.3.1 -- Minikube 1.25.2 +- Minikube 1.25.1 - n 8.0.2 -- Newman 5.3.2 +- Newman 5.3.1 - nvm 0.39.1 - OpenSSL 1.1.1f 31 Mar 2020 -- Packer 1.8.0 +- Packer 1.7.10 - Parcel 2.3.2 - PhantomJS 2.1.1 - Podman 3.4.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- Pulumi 3.25.1 +- Pulumi 3.24.1 - R 4.1.2 - Skopeo 1.3.0 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 -- Terraform 1.1.7 +- Terraform 1.1.6 - yamllint 1.26.3 -- yq 4.21.1 +- yq 4.20.2 - zstd 1.5.2 (homebrew) ### CLI Tools -- Alibaba Cloud CLI 3.0.110 -- AWS CLI 2.4.23 +- Alibaba Cloud CLI 3.0.109 +- AWS CLI 2.4.19 - AWS CLI Session manager plugin 1.2.295.0 -- AWS SAM CLI 1.40.1 -- Azure CLI (azure-cli) 2.34.1 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) +- AWS SAM CLI 1.38.1 +- Azure CLI (azure-cli) 2.33.1 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.23.0 -- GitHub CLI 2.5.2 +- GitHub CLI 2.5.1 - Google Cloud SDK 369.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 9.12.3 -- OpenShift CLI 4.9.23 +- Netlify CLI 9.6.5 +- OpenShift CLI 4.9.21 - ORAS CLI 0.12.0 - Vercel CLI 24.0.0 ### Java -| Version | Vendor | Environment Variable | -| ------------------- | --------------- | -------------------- | -| 8.0.322+6 | Eclipse Temurin | JAVA_HOME_8_X64 | -| 11.0.14+1 (default) | Eclipse Temurin | JAVA_HOME_11_X64 | -| 17.0.2+8 | Eclipse Temurin | JAVA_HOME_17_X64 | +| Version | Vendor | Environment Variable | +| --------------------- | --------------- | -------------------- | +| 8.0.322+6 | Eclipse Temurin | JAVA_HOME_8_X64 | +| 11.0.14.1+1 (default) | Eclipse Temurin | JAVA_HOME_11_X64 | +| 17.0.2+8 | Eclipse Temurin | JAVA_HOME_17_X64 | ### GraalVM | Version | Environment variables | @@ -130,38 +131,38 @@ ### PHP | Tool | Version | | -------- | ------------------- | -| PHP | 7.4.28 8.0.16 8.1.3 | -| Composer | 2.2.7 | -| PHPUnit | 8.5.24 | +| PHP | 7.4.28 8.0.15 8.1.2 | +| Composer | 2.2.6 | +| PHPUnit | 8.5.23 | ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ``` ### Haskell - Cabal 3.6.2.0 - GHC 9.2.1 -- GHCup 0.1.17.5 -- Stack 2.7.5 +- GHCup 0.1.17.4 +- Stack 2.7.3 ### Rust Tools -- Cargo 1.59.0 -- Rust 1.59.0 -- Rustdoc 1.59.0 +- Cargo 1.58.0 +- Rust 1.58.1 +- Rustdoc 1.58.1 - Rustup 1.24.3 #### Packages - Bindgen 0.59.2 - Cargo audit 0.16.0 -- Cargo clippy 0.1.59 -- Cargo outdated +- Cargo clippy 0.1.58 +- Cargo outdated 0.10.2 - Cbindgen 0.20.0 - Rustfmt 1.4.38 ### Browsers and Drivers -- Google Chrome 99.0.4844.51 -- ChromeDriver 99.0.4844.51 -- Mozilla Firefox 97.0.2 +- Google Chrome 98.0.4758.102 +- ChromeDriver 98.0.4758.102 +- Mozilla Firefox 97.0 - Geckodriver 0.30.0 -- Chromium 99.0.4844.0 +- Chromium 98.0.4758.0 - Selenium server 4.1.0 #### Environment variables @@ -215,7 +216,6 @@ - 3.6.12 [PyPy 7.3.3] - 3.7.12 [PyPy 7.3.8] - 3.8.12 [PyPy 7.3.8] -- 3.9.10 [PyPy 7.3.8] #### Python - 2.7.18 @@ -264,7 +264,7 @@ | Android Command Line Tools | 4.0 | | Android Emulator | 31.2.8 | | Android SDK Build-tools | 32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | -| Android SDK Platform-Tools | 33.0.0 | +| Android SDK Platform-Tools | 32.0.0 | | Android SDK Platforms | android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | | Android SDK Tools | 26.1.1 | | Android Support Repository | 47.0.0 | @@ -289,22 +289,22 @@ | alpine:3.12 | sha256:d9459083f962de6bd980ae6a05be2a4cf670df6a1d898157bceb420342bec280 | 2021-11-12 | | alpine:3.13 | sha256:026f721af4cf2843e07bba648e158fb35ecc876d822130633cc49f707f0fc88c | 2021-11-12 | | alpine:3.14 | sha256:635f0aa53d99017b38d1a0aa5b2082f7812b03e3cdb299103fe77b5c8a07f1d2 | 2021-11-12 | -| buildpack-deps:bullseye | sha256:b0410921e9d888bd213492157e876988dfd2c4fe2724d63a2f6120381ac1881c | 2022-03-01 | -| buildpack-deps:buster | sha256:4b80c38e9bef63839e3d36de8419fb46e126b7b19b8f45b7b2cade51d193465e | 2022-03-01 | -| buildpack-deps:stretch | sha256:bf54440111c18564fd89db7f98a0c09b14af25a699d72e19752ab7ca6933a34f | 2022-03-01 | -| debian:10 | sha256:fd510d85d7e0691ca551fe08e8a2516a86c7f24601a940a299b5fe5cdd22c03a | 2022-03-01 | -| debian:11 | sha256:10b622c6cf6daa0a295be74c0e412ed20e10f91ae4c6f3ce6ff0c9c04f77cbf6 | 2022-03-01 | -| debian:9 | sha256:54f2c31487af733ad08e62af6a77ccddcbc8895857edc54768ba0020991950f9 | 2022-03-01 | +| buildpack-deps:bullseye | sha256:159126fd9e3b05c16a9cc4c2655e4a447effd7892e62b74b933e4a6cb370138e | 2022-01-26 | +| buildpack-deps:buster | sha256:64b00dac65b9ed4db078361a816e24e888e6ae926e43524b79f6fba424e8b6c8 | 2022-01-26 | +| buildpack-deps:stretch | sha256:3004c958ffa89199f04e8735d583c42ee3885c9c77daa4134930fe68eeee59c4 | 2022-01-26 | +| debian:10 | sha256:fde7a280413ec0122bd3a14dc76ba152f89cae999f3b8efe8784100df3640763 | 2022-01-26 | +| debian:11 | sha256:fb45fd4e25abe55a656ca69a7bef70e62099b8bb42a279a5e0ea4ae1ab410e0d | 2022-01-26 | +| debian:9 | sha256:4bb600434787c903886fe33526d19ff33114a33b433a4a4cdbdf9b8543f1ab5d | 2022-01-26 | | moby/buildkit:latest | sha256:d6c89b7085b106301645ddcc77cf64eb7b705ab507b72d52d130ac33f1300417 | 2021-11-18 | -| node:12 | sha256:cc4adb82efc04b74b9f96326e682ad04be2df84d23e40609802eb6d6c207abde | 2022-03-02 | +| node:12 | sha256:7e1786920f4ebd88f8cc2dc9906f3c85ac78674cb29dcced535ff150a96f0873 | 2022-02-04 | | node:12-alpine | sha256:dfa564312367b1a8fca8db7ae4bae102b28e68b39ebcb7b17022c938f105846b | 2022-02-04 | -| node:14 | sha256:d3f3c5105b1defedbdd7a8c6a4184d11e65f246d0dfd798e6f0fabc4b5326d46 | 2022-03-02 | +| node:14 | sha256:b2c75df8c9706156c38b4f1f678d00e11cb2bfda09fc4ab6e36ec17ac9163865 | 2022-02-02 | | node:14-alpine | sha256:9a2aa545388a135b496bd55cef2be920b96c4526c99c140170e05a8de3fce653 | 2022-02-02 | -| node:16 | sha256:61b6cc81ecc3f94f614dca6bfdc5262d15a6618f7aabfbfc6f9f05c935ee753c | 2022-03-02 | +| node:16 | sha256:fd86131ddf8e0faa8ba7a3e49b6bf571745946e663e4065f3bff0a07204c1dde | 2022-02-09 | | node:16-alpine | sha256:2c6c59cf4d34d4f937ddfcf33bab9d8bbad8658d1b9de7b97622566a52167f2b | 2022-02-09 | | ubuntu:16.04 | sha256:0f71fa8d4d2d4292c3c617fda2b36f6dabe5c8b6e34c3dc5b0d17d4e704bd39c | 2021-08-31 | -| ubuntu:18.04 | sha256:42cd9143b6060261187a72716906187294b8b66653b50d70bc7a90ccade5c984 | 2022-03-03 | -| ubuntu:20.04 | sha256:8ae9bafbb64f63a50caab98fd3a5e37b3eb837a3e0780b78e5218e63193961f9 | 2022-03-03 | +| ubuntu:18.04 | sha256:c2aa13782650aa7ade424b12008128b60034c795f25456e8eb552d0a0f447cad | 2022-02-02 | +| ubuntu:20.04 | sha256:669e010b58baf5beb2836b253c1fd5768333f0d1dbcb834f7c07a4dc93f474be | 2022-02-02 | ### Installed apt packages | Name | Version | @@ -339,7 +339,7 @@ | libgbm-dev | 21.2.6-0ubuntu0.1\~20.04.1 | | libgconf-2-4 | 3.2.6-6ubuntu1 | | libgsl-dev | 2.5+dfsg-6build1 | -| libgtk-3-0 | 3.24.20-0ubuntu1.1 | +| libgtk-3-0 | 3.24.20-0ubuntu1 | | libmagic-dev | 1:5.38-4 | | libmagickcore-dev | 8:6.9.10.23+dfsg-2.1ubuntu11.4 | | libmagickwand-dev | 8:6.9.10.23+dfsg-2.1ubuntu11.4 | @@ -348,7 +348,7 @@ | libunwind8 | 1.2.1-9build1 | | libxkbfile-dev | 1:1.1.0-1 | | libxss1 | 1:1.2.3-1 | -| locales | 2.31-0ubuntu9.7 | +| locales | 2.31-0ubuntu9.2 | | m4 | 1.4.18-4 | | mediainfo | 19.09-1build1 | | mercurial | 5.3.1-1ubuntu1 | From fdd56cacb318864b573b7bf6f04c1d02eb5b9b28 Mon Sep 17 00:00:00 2001 From: Henry Buckle <h.buckle@outlook.com> Date: Mon, 14 Mar 2022 09:11:12 +0000 Subject: [PATCH 1012/3485] maven 3.8.5 --- images/linux/toolsets/toolset-1804.json | 2 +- images/linux/toolsets/toolset-2004.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index 09b2c4da081f..052d2ae52f80 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -82,7 +82,7 @@ "versions": [ "8", "11", "12" ] } ], - "maven": "3.8.4" + "maven": "3.8.5" }, "android": { "platform_min_version": "23", diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index 5a45d5b4fa73..746db845920b 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -83,7 +83,7 @@ "versions": [ "8", "11" ] } ], - "maven": "3.8.4" + "maven": "3.8.5" }, "android": { "platform_min_version": "27", From 8c9430638e7a58aa7d3fe243e6a094b2e9632a97 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 15 Mar 2022 00:36:04 +0000 Subject: [PATCH 1013/3485] Updating readme file for macOS-10.15 version 20220307.1 (#5201) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-10.15-Readme.md | 97 +++++++++++++++--------------- 1 file changed, 47 insertions(+), 50 deletions(-) diff --git a/images/macos/macos-10.15-Readme.md b/images/macos/macos-10.15-Readme.md index 01e22a9212bd..bda9393130d7 100644 --- a/images/macos/macos-10.15-Readme.md +++ b/images/macos/macos-10.15-Readme.md @@ -1,11 +1,7 @@ -| Announcements | -|-| -| [[All OSs] .NET 2.1 will be removed from the images on February, 21](https://github.com/actions/virtual-environments/issues/4871) | -*** # macOS 10.15 info -- System Version: macOS 10.15.7 (19H1715) +- System Version: macOS 10.15.7 (19H1713) - Kernel Version: Darwin 19.6.0 -- Image Version: 20220219.1 +- Image Version: 20220307.1 ## Installed Software ### Language and Runtime @@ -34,11 +30,11 @@ - Ruby 2.7.5p203 ### Package Management -- Bundler version 2.3.7 +- Bundler version 2.3.8 - Carthage 0.38.0 - CocoaPods 1.11.2 -- Composer 2.2.6 -- Homebrew 3.3.15 +- Composer 2.2.7 +- Homebrew 3.4.0 - Miniconda 4.11.0 - NPM 8.3.1 - NuGet 5.9.0.7134 @@ -46,7 +42,7 @@ - Pip 21.3.1 (python 3.9) - Pipx 1.0.0 - RubyGems 3.2.33 -- Vcpkg 2022 (build from master \<5cf60186a>) +- Vcpkg 2022 (build from master \<bd602277b>) - Yarn 1.22.17 #### Environment variables @@ -64,26 +60,26 @@ ### Utilities - 7-Zip 17.04 - aria2 1.36.0 -- azcopy 10.13.0 +- azcopy 10.14.0 - bazel 5.0.0 - bazelisk 1.11.0 - bsdtar 3.3.2 - available by 'tar' alias -- Curl 7.81.0 +- Curl 7.82.0 - Git 2.35.1 - Git LFS: 3.1.2 -- GitHub CLI: 2.5.1 -- GNU parallel 20220122 +- GitHub CLI: 2.5.2 +- GNU parallel 20220222 - GNU Tar 1.34 - available by 'gtar' alias -- GNU Wget 1.21.2 +- GNU Wget 1.21.3 - gpg (GnuPG) 2.3.4 - helm v3.8.0+gd141386 - Hub CLI: 2.14.2 - jq 1.6 - mongo v5.0.6 - mongod v5.0.6 -- Newman 5.3.1 +- Newman 5.3.2 - OpenSSL 1.1.1m 14 Dec 2021 `(/usr/local/opt/openssl@1.1 -> ../Cellar/openssl@1.1/1.1.1m)` -- Packer 1.7.10 +- Packer 1.8.0 - PostgreSQL 14.2 - psql (PostgreSQL) 14.2 - Sox 14.4.2 @@ -94,46 +90,46 @@ - zstd 1.5.2 ### Tools -- Aliyun CLI 3.0.109 +- Aliyun CLI 3.0.110 - App Center CLI 2.10.8 -- AWS CLI 2.4.19 -- AWS SAM CLI 1.38.1 +- AWS CLI 2.4.23 +- AWS SAM CLI 1.40.1 - AWS Session Manager CLI 1.2.295.0 - Azure CLI (azure-devops) 0.23.0 -- Azure CLI 2.33.1 +- Azure CLI 2.34.1 - Bicep CLI 0.4.1272 - Cabal 3.6.2.0 -- Cmake 3.22.2 +- Cmake 3.22.3 - Fastlane 2.204.3 -- GHC 9.2.1 -- GHCup 0.1.17.4 +- GHC 9.2.2 +- GHCup v0.1.17.5 - Jazzy 0.14.1 -- Stack 2.7.3 -- SwiftFormat 0.49.4 +- Stack 2.7.5 +- SwiftFormat 0.49.5 - Swig 4.0.2 - Xcode Command Line Tools 12.4.0.0.1.1610135815 ### Linters -- SwiftLint 0.46.2 +- SwiftLint 0.46.3 - yamllint 1.26.3 ### Browsers - Safari 15.3 (15612.4.9.1.8) - SafariDriver 15.3 (15612.4.9.1.8) -- Google Chrome 98.0.4758.102 -- ChromeDriver 98.0.4758.102 -- Microsoft Edge 98.0.1108.56 -- MSEdgeDriver 98.0.1108.56 -- Mozilla Firefox 97.0.1 +- Google Chrome 99.0.4844.51 +- ChromeDriver 99.0.4844.51 +- Microsoft Edge 98.0.1108.62 +- MSEdgeDriver 98.0.1108.62 +- Mozilla Firefox 97.0.2 - geckodriver 0.30.0 - Selenium server 4.1.2 #### Environment variables -| Name | Value | -| --------------- | ---------------------------------------------- | -| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/98.0.4758.102 | -| EDGEWEBDRIVER | /usr/local/share/edge_driver | -| GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | +| Name | Value | +| --------------- | --------------------------------------------- | +| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/99.0.4844.51 | +| EDGEWEBDRIVER | /usr/local/share/edge_driver | +| GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | ### Java | Version | Vendor | Environment Variable | @@ -167,10 +163,11 @@ - 3.10.2 #### PyPy -- 2.7.18 [PyPy 7.3.6] +- 2.7.18 [PyPy 7.3.8] - 3.6.12 [PyPy 7.3.3] -- 3.7.12 [PyPy 7.3.7] -- 3.8.12 [PyPy 7.3.7] +- 3.7.12 [PyPy 7.3.8] +- 3.8.12 [PyPy 7.3.8] +- 3.9.10 [PyPy 7.3.8] #### Node.js - 12.22.10 @@ -185,17 +182,17 @@ | 1.17.7 | x64 | GOROOT_1_17_X64 | ### Rust Tools -- Cargo 1.58.0 -- Rust 1.58.1 -- Rustdoc 1.58.1 +- Cargo 1.59.0 +- Rust 1.59.0 +- Rustdoc 1.59.0 - Rustup 1.24.3 #### Packages - Bindgen 0.59.2 - Cargo-audit 0.16.0 -- Cargo-outdated v0.10.2 +- Cargo-outdated 0.11.0 - Cbindgen 0.20.0 -- Clippy 0.1.58 +- Clippy 0.1.59 - Rustfmt 1.4.38-stable ### PowerShell Tools @@ -210,10 +207,10 @@ | PSScriptAnalyzer | 1.20.0 | ### Web Servers -| Name | Version | ConfigFile | ServiceStatus | ListenPort | -| ----- | ------- | ------------------------------- | ------------- | ---------- | -| httpd | 2.4.52 | /usr/local/etc/httpd/httpd.conf | none | 80 | -| nginx | 1.21.6 | /usr/local/etc/nginx/nginx.conf | none | 80 | +| Name | Version | ConfigFile | ServiceStatus | ListenPort | +| ----- | -------- | ------------------------------- | ------------- | ---------- | +| httpd | 2.4.52 | /usr/local/etc/httpd/httpd.conf | none | 80 | +| nginx | 1.21.6_1 | /usr/local/etc/nginx/nginx.conf | none | 80 | ### Xamarin #### Visual Studio for Mac @@ -359,7 +356,7 @@ | Android Emulator | 31.2.8 | | Android SDK Build-tools | 32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3<br>26.0.0 26.0.1 26.0.2 26.0.3<br>25.0.0 25.0.1 25.0.2 25.0.3<br>24.0.0 24.0.1 24.0.2 24.0.3 | | Android SDK Platforms | android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3)<br>android-26 (rev 2)<br>android-25 (rev 3)<br>android-24 (rev 2) | -| Android SDK Platform-Tools | 32.0.0 | +| Android SDK Platform-Tools | 33.0.0 | | Android Support Repository | 47.0.0 | | CMake | 3.10.2<br>3.18.1 | | Google APIs | addon-google_apis-google-21<br>addon-google_apis-google-22<br>addon-google_apis-google-23<br>addon-google_apis-google-24 | From 826e19618ff27146c7788b9578e668fd9997161e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 15 Mar 2022 11:24:38 +0000 Subject: [PATCH 1014/3485] Updating readme file for macOS-11 version 20220307.1 (#5200) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-11-Readme.md | 87 ++++++++++++++++----------------- 1 file changed, 42 insertions(+), 45 deletions(-) diff --git a/images/macos/macos-11-Readme.md b/images/macos/macos-11-Readme.md index d9b2bb96ed0f..542f8d56b2d8 100644 --- a/images/macos/macos-11-Readme.md +++ b/images/macos/macos-11-Readme.md @@ -1,11 +1,7 @@ -| Announcements | -|-| -| [[All OSs] .NET 2.1 will be removed from the images on February, 21](https://github.com/actions/virtual-environments/issues/4871) | -*** # macOS 11.6 info - System Version: macOS 11.6.4 (20G417) - Kernel Version: Darwin 20.6.0 -- Image Version: 20220220.1 +- Image Version: 20220307.1 ## Installed Software ### Language and Runtime @@ -34,11 +30,11 @@ - Ruby 2.7.5p203 ### Package Management -- Bundler version 2.3.7 +- Bundler version 2.3.8 - Carthage 0.38.0 - CocoaPods 1.11.2 -- Composer 2.2.6 -- Homebrew 3.3.15 +- Composer 2.2.7 +- Homebrew 3.4.0 - Miniconda 4.11.0 - NPM 8.3.1 - NuGet 5.9.0.7134 @@ -46,7 +42,7 @@ - Pip 21.3.1 (python 3.9) - Pipx 1.0.0 - RubyGems 3.2.33 -- Vcpkg 2022 (build from master \<5cf60186a>) +- Vcpkg 2022 (build from master \<c8baa4708>) - Yarn 1.22.17 #### Environment variables @@ -64,25 +60,25 @@ ### Utilities - 7-Zip 17.04 - aria2 1.36.0 -- azcopy 10.13.0 +- azcopy 10.14.0 - bazel 5.0.0 - bazelisk 1.11.0 - bsdtar 3.3.2 - available by 'tar' alias -- Curl 7.81.0 +- Curl 7.82.0 - Git 2.35.1 - Git LFS: 3.1.2 -- GitHub CLI: 2.5.1 +- GitHub CLI: 2.5.2 - GNU Tar 1.34 - available by 'gtar' alias -- GNU Wget 1.21.2 +- GNU Wget 1.21.3 - gpg (GnuPG) 2.3.4 - helm v3.8.0+gd141386 - Hub CLI: 2.14.2 - jq 1.6 - mongo v5.0.6 - mongod v5.0.6 -- Newman 5.3.1 +- Newman 5.3.2 - OpenSSL 1.1.1m 14 Dec 2021 `(/usr/local/opt/openssl@1.1 -> ../Cellar/openssl@1.1/1.1.1m)` -- Packer 1.7.10 +- Packer 1.8.0 - PostgreSQL 14.2 - psql (PostgreSQL) 14.2 - Sox 14.4.2 @@ -91,46 +87,46 @@ - zstd 1.5.2 ### Tools -- Aliyun CLI 3.0.109 +- Aliyun CLI 3.0.110 - App Center CLI 2.10.8 -- AWS CLI 2.4.19 -- AWS SAM CLI 1.38.1 +- AWS CLI 2.4.23 +- AWS SAM CLI 1.40.1 - AWS Session Manager CLI 1.2.295.0 - Azure CLI (azure-devops) 0.23.0 -- Azure CLI 2.33.1 +- Azure CLI 2.34.1 - Bicep CLI 0.4.1272 - Cabal 3.6.2.0 -- Cmake 3.22.2 +- Cmake 3.22.3 - Fastlane 2.204.3 -- GHC 9.2.1 -- GHCup 0.1.17.4 +- GHC 9.2.2 +- GHCup v0.1.17.5 - Jazzy 0.14.1 -- Stack 2.7.3 -- SwiftFormat 0.49.4 +- Stack 2.7.5 +- SwiftFormat 0.49.5 - Swig 4.0.2 - Xcode Command Line Tools 13.2.0.0.1.1638488800 ### Linters -- SwiftLint 0.46.2 +- SwiftLint 0.46.4 - yamllint 1.26.3 ### Browsers - Safari 15.3 (16612.4.9.1.8) - SafariDriver 15.3 (16612.4.9.1.8) -- Google Chrome 98.0.4758.102 -- ChromeDriver 98.0.4758.102 -- Microsoft Edge 98.0.1108.56 -- MSEdgeDriver 98.0.1108.56 -- Mozilla Firefox 97.0.1 +- Google Chrome 99.0.4844.51 +- ChromeDriver 99.0.4844.51 +- Microsoft Edge 98.0.1108.62 +- MSEdgeDriver 98.0.1108.62 +- Mozilla Firefox 97.0.2 - geckodriver 0.30.0 - Selenium server 4.1.2 #### Environment variables -| Name | Value | -| --------------- | ---------------------------------------------- | -| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/98.0.4758.102 | -| EDGEWEBDRIVER | /usr/local/share/edge_driver | -| GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | +| Name | Value | +| --------------- | --------------------------------------------- | +| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/99.0.4844.51 | +| EDGEWEBDRIVER | /usr/local/share/edge_driver | +| GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | ### Java | Version | Vendor | Environment Variable | @@ -162,6 +158,7 @@ - 2.7.18 [PyPy 7.3.8] - 3.7.12 [PyPy 7.3.8] - 3.8.12 [PyPy 7.3.8] +- 3.9.10 [PyPy 7.3.8] #### Node.js - 12.22.10 @@ -176,17 +173,17 @@ | 1.17.7 | x64 | GOROOT_1_17_X64 | ### Rust Tools -- Cargo 1.58.0 -- Rust 1.58.1 -- Rustdoc 1.58.1 +- Cargo 1.59.0 +- Rust 1.59.0 +- Rustdoc 1.59.0 - Rustup 1.24.3 #### Packages - Bindgen 0.59.2 - Cargo-audit 0.16.0 -- Cargo-outdated v0.10.2 +- Cargo-outdated 0.11.0 - Cbindgen 0.20.0 -- Clippy 0.1.58 +- Clippy 0.1.59 - Rustfmt 1.4.38-stable ### PowerShell Tools @@ -201,10 +198,10 @@ | PSScriptAnalyzer | 1.20.0 | ### Web Servers -| Name | Version | ConfigFile | ServiceStatus | ListenPort | -| ----- | ------- | ------------------------------- | ------------- | ---------- | -| httpd | 2.4.52 | /usr/local/etc/httpd/httpd.conf | none | 80 | -| nginx | 1.21.6 | /usr/local/etc/nginx/nginx.conf | none | 80 | +| Name | Version | ConfigFile | ServiceStatus | ListenPort | +| ----- | -------- | ------------------------------- | ------------- | ---------- | +| httpd | 2.4.52 | /usr/local/etc/httpd/httpd.conf | none | 80 | +| nginx | 1.21.6_1 | /usr/local/etc/nginx/nginx.conf | none | 80 | ### Xamarin #### Visual Studio for Mac @@ -318,7 +315,7 @@ | Android Emulator | 31.2.8 | | Android SDK Build-tools | 32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | | Android SDK Platforms | android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | -| Android SDK Platform-Tools | 32.0.0 | +| Android SDK Platform-Tools | 33.0.0 | | Android Support Repository | 47.0.0 | | CMake | 3.10.2<br>3.18.1 | | Google Play services | 49 | From 00131be3360b8e7337fae88899325fd6fa8bf1c8 Mon Sep 17 00:00:00 2001 From: Maxim Lobanov <maxim-lobanov@github.com> Date: Wed, 16 Mar 2022 11:23:28 +0100 Subject: [PATCH 1015/3485] Make kcpassword works with Python 3 (#5234) --- images/macos/provision/bootstrap-provisioner/kcpassword.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/images/macos/provision/bootstrap-provisioner/kcpassword.py b/images/macos/provision/bootstrap-provisioner/kcpassword.py index 386d33c4428f..6de2f02a2756 100755 --- a/images/macos/provision/bootstrap-provisioner/kcpassword.py +++ b/images/macos/provision/bootstrap-provisioner/kcpassword.py @@ -27,13 +27,13 @@ def kcpassword(passwd): passwd[j] = passwd[j] ^ key[ki] ki += 1 - passwd = [chr(x) for x in passwd] - return "".join(passwd) + return bytearray(passwd) if __name__ == "__main__": passwd = kcpassword(sys.argv[1]) fd = os.open('/etc/kcpassword', os.O_WRONLY | os.O_CREAT, 0o600) - file = os.fdopen(fd, 'w') + file = os.fdopen(fd, 'wb') + file.truncate(0) file.write(passwd) file.close() From 9042e01fb9d29bbe8f665451e9d303b4efc8e40a Mon Sep 17 00:00:00 2001 From: Igor Boskovic <Igor.boskovic@akvelon.com> Date: Mon, 21 Mar 2022 18:21:32 +0100 Subject: [PATCH 1016/3485] Update toolset-2022.json (#5171) --- images/win/toolsets/toolset-2022.json | 1 + 1 file changed, 1 insertion(+) diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index c835aca94f26..dbf2663455b8 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -211,6 +211,7 @@ "Microsoft.VisualStudio.Component.VC.Modules.x86.x64", "Microsoft.VisualStudio.Component.VC.Tools.ARM64", "Microsoft.VisualStudio.Component.VC.Tools.ARM64EC", + "Microsoft.VisualStudio.Component.VC.Redist.MSM", "Microsoft.VisualStudio.Component.VC.v141.x86.x64", "Microsoft.VisualStudio.Component.VC.v141.x86.x64.Spectre", "Microsoft.VisualStudio.Component.VC.v141.ARM.Spectre", From 87fa95250bbdf45f1eef4e20928fb18674da8678 Mon Sep 17 00:00:00 2001 From: Andre Hofmeister <9199345+HofmeisterAn@users.noreply.github.com> Date: Mon, 21 Mar 2022 18:51:07 +0100 Subject: [PATCH 1017/3485] [Windows] Use Chrome standalone installer (#5203) (#5252) --- images/win/scripts/Installers/Install-Chrome.ps1 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/images/win/scripts/Installers/Install-Chrome.ps1 b/images/win/scripts/Installers/Install-Chrome.ps1 index 790ec09f0c66..756c7321f0d2 100644 --- a/images/win/scripts/Installers/Install-Chrome.ps1 +++ b/images/win/scripts/Installers/Install-Chrome.ps1 @@ -4,9 +4,9 @@ ################################################################################ # Download and install latest Chrome browser -$ChromeInstallerFile = "chrome_installer.exe" -$ChromeInstallerUrl = "https://dl.google.com/chrome/install/375.126/${ChromeInstallerFile}" -Install-Binary -Url $ChromeInstallerUrl -Name $ChromeInstallerFile -ArgumentList ("/silent", "/install") +$ChromeInstallerFile = "googlechromestandaloneenterprise64.msi" +$ChromeInstallerUrl = "https://dl.google.com/tag/s/dl/chrome/install/${ChromeInstallerFile}" +Install-Binary -Url $ChromeInstallerUrl -Name $ChromeInstallerFile -ArgumentList @() # Prepare firewall rules Write-Host "Adding the firewall rule for Google update blocking..." From af8332e66d6fc43f786eba49c0d7480c5f9de1b8 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 21 Mar 2022 21:03:22 +0000 Subject: [PATCH 1018/3485] Updating readme file for win16 version 20220306.1 (#5204) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2016-Readme.md | 56 ++++++++++++++++---------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/images/win/Windows2016-Readme.md b/images/win/Windows2016-Readme.md index adab1fd74028..a8619806615c 100644 --- a/images/win/Windows2016-Readme.md +++ b/images/win/Windows2016-Readme.md @@ -1,12 +1,11 @@ | Announcements | |-| -| [[All OSs] .NET 2.1 will be removed from the images on February, 21](https://github.com/actions/virtual-environments/issues/4871) | | [windows-latest workflows will use Windows Server 2022](https://github.com/actions/virtual-environments/issues/4856) | | [Windows-2016 environment will be removed on March 15, 2022](https://github.com/actions/virtual-environments/issues/4312) | *** # Microsoft Windows Server 2016 Datacenter - OS Version: 10.0.14393 Build 4946 -- Image Version: 20220223.1 +- Image Version: 20220306.1 ## Installed Software ### Language and Runtime @@ -23,7 +22,7 @@ ### Package Management - Chocolatey 0.12.1 -- Composer 2.2.6 +- Composer 2.2.7 - Helm 3.8.0 - Miniconda 4.11.0 (pre-installed on the image but not added to PATH) - NPM 8.3.1 @@ -31,7 +30,7 @@ - pip 22.0.3 (python 3.7) - Pipx 1.0.0 - RubyGems 2.7.6.3 -- Vcpkg (build from master \<7249fa4d6>) +- Vcpkg (build from master \<bd602277b>) - Yarn 1.22.17 #### Environment variables @@ -42,19 +41,19 @@ ### Project Management - Ant 1.10.12 -- Gradle 7.3 +- Gradle 7.4 - Maven 3.8.4 - sbt 1.6.2 ### Tools - 7zip 21.07 - aria2 1.36.0 -- azcopy 10.13.0 +- azcopy 10.14.0 - Bazel 5.0.0 - Bazelisk 1.11.0 - Bicep 0.4.1272 - Cabal 3.6.2.0 -- CMake 3.22.2 +- CMake 3.22.3 - CodeQL Action Bundle 2.8.1 - Docker 20.10.7 - Docker-compose 1.29.2 @@ -62,61 +61,61 @@ - ghc 9.2.1 - Git 2.35.1.windows.2 - Git LFS 3.0.2 -- Google Cloud SDK 374.0.0 +- Google Cloud SDK 375.0.0 - InnoSetup 6.2.0 - jq 1.6 - Kind 0.11.1 - Kubectl 1.23.4 - Mercurial 5.0 - Mingw-w64 8.1.0 -- Newman 5.3.1 +- Newman 5.3.2 - NSIS v3.08 - OpenSSL 1.1.1 - Packer 1.7.10 - Parcel 2.3.2 -- Pulumi v3.24.1 +- Pulumi v3.25.1 - R 4.1.2 - Service Fabric SDK 8.2.1486.9590 -- Stack 2.7.3 +- Stack 2.7.5 - Subversion (SVN) 1.14.1 - Swig 4.0.2 -- VSWhere 2.8.4 +- VSWhere 3.0.1 - WinAppDriver 1.2.2009.02003 - WiX Toolset v3.11.2.4516 - yamllint 1.26.3 - zstd 1.5.2 ### CLI Tools -- Alibaba Cloud CLI 3.0.109 -- AWS CLI 2.4.20 -- AWS SAM CLI 1.39.0 +- Alibaba Cloud CLI 3.0.110 +- AWS CLI 2.4.23 +- AWS SAM CLI 1.40.1 - AWS Session Manager CLI 1.2.295.0 -- Azure CLI 2.33.1 +- Azure CLI 2.34.1 - Azure DevOps CLI extension 0.23.0 - Cloud Foundry CLI 6.53.0 -- GitHub CLI 2.5.1 +- GitHub CLI 2.5.2 - Hub CLI 2.14.2 ### Rust Tools -- Cargo 1.58.0 -- Rust 1.58.1 -- Rustdoc 1.58.1 +- Cargo 1.59.0 +- Rust 1.59.0 +- Rustdoc 1.59.0 - Rustup 1.24.3 #### Packages - bindgen 0.59.2 - cargo-audit 0.16.0 -- cargo-outdated v0.10.2 +- cargo-outdated 0.11.0 - cbindgen 0.20.0 -- Clippy 0.1.58 +- Clippy 0.1.59 - Rustfmt 1.4.38 ### Browsers and webdrivers -- Google Chrome 98.0.4758.102 -- Chrome Driver 98.0.4758.102 -- Microsoft Edge 98.0.1108.56 -- Microsoft Edge Driver 98.0.1108.56 -- Mozilla Firefox 97.0.1 +- Google Chrome 99.0.4844.51 +- Chrome Driver 99.0.4844.51 +- Microsoft Edge 99.0.1150.30 +- Microsoft Edge Driver 99.0.1150.30 +- Mozilla Firefox 97.0.2 - Gecko Driver 0.30.0 - IE Driver 3.150.1.1 - Selenium server 4.1.0 @@ -194,6 +193,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | 3.6.12 | PyPy 7.3.3 with MSC v.1927 32 bit | | 3.7.12 | PyPy 7.3.8 with MSC v.1929 64 bit (AMD64) | | 3.8.12 | PyPy 7.3.8 with MSC v.1929 64 bit (AMD64) | +| 3.9.10 | PyPy 7.3.8 with MSC v.1929 64 bit (AMD64) | ### Databases #### PostgreSQL @@ -548,7 +548,7 @@ All other versions are saved but not installed. #### Powershell Modules | Module | Version | | ------------------ | ---------------- | -| AWSPowerShell | 4.1.29.0 | +| AWSPowerShell | 4.1.37 | | DockerMsftProvider | 1.0.0.8 | | MarkdownPS | 1.9 | | Microsoft.Graph | 1.9.2 | From f439d173c2b2da344a1e5900ff2df12155a842e4 Mon Sep 17 00:00:00 2001 From: Igor Boskovic <igorboskovic3@github.com> Date: Wed, 23 Mar 2022 11:20:36 +0100 Subject: [PATCH 1019/3485] [MacOS] Add YQ tool to macOS images(#5144) (#5173) * Update toolset-10.15.json * Update toolset-11.json * Added Pester test and documentation update for YQ tool. * Change YQ version to full description with URL. * Add YQ to MacOS 12 --- images/macos/software-report/SoftwareReport.Common.psm1 | 5 +++++ images/macos/software-report/SoftwareReport.Generator.ps1 | 3 ++- images/macos/tests/BasicTools.Tests.ps1 | 6 ++++++ images/macos/toolsets/toolset-10.15.json | 5 +++-- images/macos/toolsets/toolset-11.json | 3 ++- images/macos/toolsets/toolset-12.json | 3 ++- 6 files changed, 20 insertions(+), 5 deletions(-) diff --git a/images/macos/software-report/SoftwareReport.Common.psm1 b/images/macos/software-report/SoftwareReport.Common.psm1 index df7ff83efca0..69588aa0a9a7 100644 --- a/images/macos/software-report/SoftwareReport.Common.psm1 +++ b/images/macos/software-report/SoftwareReport.Common.psm1 @@ -542,6 +542,11 @@ function Get-TclTkVersion { return "Tcl/Tk $tcltkVersion" } +function Get-YqVersion { + $yqVersion = Run-Command "yq --version" + return "$yqVersion" +} + function Build-PackageManagementEnvironmentTable { return @( @{ diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1 index e74d87816551..857b69a6220f 100644 --- a/images/macos/software-report/SoftwareReport.Generator.ps1 +++ b/images/macos/software-report/SoftwareReport.Generator.ps1 @@ -122,7 +122,8 @@ $utilitiesList = @( (Get-GnuTarVersion), (Get-GPGVersion), (Get-SwitchAudioOsxVersion), - (Get-SoxVersion) + (Get-SoxVersion), + (Get-YqVersion) ) if ($os.IsLessThanMonterey) { diff --git a/images/macos/tests/BasicTools.Tests.ps1 b/images/macos/tests/BasicTools.Tests.ps1 index 7815ae9b5704..f40a484bd665 100644 --- a/images/macos/tests/BasicTools.Tests.ps1 +++ b/images/macos/tests/BasicTools.Tests.ps1 @@ -180,4 +180,10 @@ Describe "sbt" { It "sbt" { "sbt -version" | Should -ReturnZeroExitCode } +} + +Describe "yq" { + It "yq" { + "yq --version" | Should -ReturnZeroExitCode + } } \ No newline at end of file diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index d3c5d4959bd0..7a956f54aa97 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -228,7 +228,8 @@ "zlib", "libxext", "libxft", - "tcl-tk" + "tcl-tk", + "yq" ], "cask_packages": [ "julia", @@ -353,4 +354,4 @@ "postgresql": { "version": "14" } -} \ No newline at end of file +} diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index 15d3c14ce940..c268e9d32258 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -203,7 +203,8 @@ "libxext", "libxft", "tcl-tk", - "r" + "r", + "yq" ], "cask_packages": [ "julia" diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index 91977f76b299..674d2cb6befb 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -119,7 +119,8 @@ "libxext", "libxft", "tcl-tk", - "r" + "r", + "yq" ], "cask_packages": [ "julia" From c117abf0abe4a77512c2e98934e18db06e3a335b Mon Sep 17 00:00:00 2001 From: Maxim Lobanov <maxim-lobanov@github.com> Date: Wed, 23 Mar 2022 12:17:31 +0100 Subject: [PATCH 1020/3485] Add docs for macOS 12 preview (#5270) --- images/macos/macos-12-Readme.md | 289 ++++++++++++++++++++++++++++++++ 1 file changed, 289 insertions(+) create mode 100644 images/macos/macos-12-Readme.md diff --git a/images/macos/macos-12-Readme.md b/images/macos/macos-12-Readme.md new file mode 100644 index 000000000000..d76f6eef1357 --- /dev/null +++ b/images/macos/macos-12-Readme.md @@ -0,0 +1,289 @@ +| Announcements | +|-| +| [[All OSs] .NET 2.1 will be removed from the images on February, 21](https://github.com/actions/virtual-environments/issues/4871) | +*** +# macOS 12.2 info +- System Version: macOS 12.2.1 (21D62) +- Kernel Version: Darwin 21.3.0 +- Image Version: 20220220.1 + +## Installed Software +### Language and Runtime +- .NET SDK 3.1.101 3.1.201 3.1.302 3.1.416 5.0.102 5.0.202 5.0.302 5.0.405 +- Bash 3.2.57(1)-release +- Clang/LLVM 13.0.0 is default +- Clang/LLVM 13.0.1 is available on `'$(brew --prefix llvm)/bin/clang'` +- gcc-11 (Homebrew GCC 11.2.0_3) 11.2.0 - available by `gcc-11` alias +- GNU Fortran (Homebrew GCC 11.2.0_3) 11.2.0 - available by `gfortran-11` alias +- Go 1.17.6 +- julia 1.7.2 +- Kotlin 1.6.10-release-923 +- MSBuild 16.10.1.58001 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) +- Node.js v16.14.0 +- NVM 0.39.1 +- NVM - Cached node versions: v12.22.10 v14.19.0 v16.14.0 +- Perl 5.34.0 +- PHP 8.1.3 +- Python 2.7.18 +- Python 3.9.10 +- R 4.1.2 +- Ruby 3.0.3p157 + +### Package Management +- Bundler version 2.3.7 +- Carthage 0.38.0 +- CocoaPods 1.11.2 +- Composer 2.2.6 +- Homebrew 3.3.15 +- NPM 8.3.1 +- NuGet 5.9.0.7134 +- Pip 20.3.4 (python 2.7) +- Pip 21.3.1 (python 3.9) +- Pipx 1.0.0 +- RubyGems 3.2.33 +- Vcpkg 2022 (build from master \<5cf60186a>) +- Yarn 1.22.17 + +### Project Management +- Apache Ant(TM) 1.10.12 +- Apache Maven 3.8.4 +- Gradle 7.4 +- Sbt 1.6.2 + +### Utilities +- 7-Zip 17.04 +- aria2 1.36.0 +- azcopy 10.13.0 +- bazel 5.0.0 +- bazelisk 1.11.0 +- bsdtar 3.5.1 - available by 'tar' alias +- Curl 7.81.0 +- Git 2.35.1 +- Git LFS: 3.1.2 +- GitHub CLI: 2.5.1 +- GNU Tar 1.34 - available by 'gtar' alias +- GNU Wget 1.21.2 +- gpg (GnuPG) 2.3.4 +- Hub CLI: 2.14.2 +- jq 1.6 +- mongo v5.0.6 +- mongod v5.0.6 +- OpenSSL 1.1.1m 14 Dec 2021 `(/usr/local/opt/openssl@1.1 -> ../Cellar/openssl@1.1/1.1.1m)` +- Packer 1.7.10 +- PostgreSQL 14.2 +- psql (PostgreSQL) 14.2 +- Sox 14.4.2 +- Subversion (SVN) 1.14.1 +- Switchaudio-osx 1.1.0 +- zstd 1.5.2 + +### Tools +- App Center CLI command +- AWS CLI 2.4.19 +- AWS SAM CLI 1.38.1 +- AWS Session Manager CLI 1.2.295.0 +- Azure CLI (azure-devops) 0.23.0 +- Azure CLI 2.33.1 +- Bicep CLI 0.4.1272 +- Cabal 3.6.2.0 +- Cmake 3.22.2 +- Fastlane 2.204.3 +- GHC 9.2.1 +- GHCup 0.1.17.4 +- Jazzy 0.14.1 +- Stack 2.7.3 +- Swig 4.0.2 +- Xcode Command Line Tools 13.2.0.0.1.1638488800 + +### Linters +- SwiftLint 0.46.2 +- yamllint 1.26.3 + +### Browsers +- Safari 15.3 (17612.4.9.1.8) +- SafariDriver 15.3 (17612.4.9.1.8) +- Google Chrome 98.0.4758.102 +- ChromeDriver 98.0.4758.102 +- Microsoft Edge 98.0.1108.56 +- MSEdgeDriver 98.0.1108.56 +- Mozilla Firefox 97.0.1 +- geckodriver 0.30.0 +- Selenium server 4.1.2 + +#### Environment variables +| Name | Value | +| --------------- | ---------------------------------------------- | +| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/98.0.4758.102 | +| EDGEWEBDRIVER | /usr/local/share/edge_driver | +| GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | + +### Java +| Version | Vendor | Environment Variable | +| ------------------- | --------------- | -------------------- | +| 8.0.322+6 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | +| 11.0.14+101 | Eclipse Temurin | JAVA_HOME_11_X64 | +| 17.0.2+8 | Eclipse Temurin | JAVA_HOME_17_X64 | + +### GraalVM +| Version | Environment variables | +| ----------- | --------------------- | +| CE 22.0.0.2 | GRAALVM_11_ROOT | + +### Cached Tools +#### Ruby +- 2.7.5 +- 3.0.3 + +#### Python +- 3.7.12 +- 3.8.12 +- 3.9.10 +- 3.10.2 + +#### PyPy +- 2.7.18 [PyPy 7.3.8] +- 3.7.12 [PyPy 7.3.8] +- 3.8.12 [PyPy 7.3.8] + +#### Node.js +- 12.22.10 +- 14.19.0 +- 16.14.0 + +#### Go +| Version | Architecture | Environment Variable | +| ------- | ------------ | -------------------- | +| 1.15.15 | x64 | GOROOT_1_15_X64 | +| 1.16.14 | x64 | GOROOT_1_16_X64 | +| 1.17.7 | x64 | GOROOT_1_17_X64 | + +### Rust Tools +- Cargo 1.58.0 +- Rust 1.58.1 +- Rustdoc 1.58.1 +- Rustup 1.24.3 + +#### Packages +- Bindgen 0.59.2 +- Cargo-audit 0.16.0 +- Cargo-outdated v0.10.2 +- Cbindgen 0.20.0 +- Clippy 0.1.58 +- Rustfmt 1.4.38-stable + +### PowerShell Tools +- PowerShell 7.2.1 + +#### PowerShell Modules +| Module | Version | +| ---------------- | ------- | +| Az | 7.2.1 | +| MarkdownPS | 1.9 | +| Pester | 5.3.1 | +| PSScriptAnalyzer | 1.20.0 | + +### Web Servers +| Name | Version | ConfigFile | ServiceStatus | ListenPort | +| ----- | ------- | ------------------------------- | ------------- | ---------- | +| httpd | 2.4.52 | /usr/local/etc/httpd/httpd.conf | none | 80 | +| nginx | 1.21.6 | /usr/local/etc/nginx/nginx.conf | none | 80 | + +### Xamarin +#### Visual Studio for Mac +- 8.10.19.2 + +#### Xamarin bundles +| symlink | Xamarin.Mono | Xamarin.iOS | Xamarin.Mac | Xamarin.Android | +| ----------------- | ------------ | ----------- | ----------- | --------------- | +| 6_12_13 | 6.12 | 15.6 | 8.6 | 12.0 | +| 6_12_12 (default) | 6.12 | 15.4 | 8.4 | 12.0 | +| 6_12_11 | 6.12 | 15.2 | 8.2 | 12.0 | +| 6_12_10 | 6.12 | 15.0 | 7.14 | 11.3 | + +#### Unit Test Framework +- NUnit 3.6.1 + +### Xcode +| Version | Build | Path | +| ---------------- | -------- | ------------------------------ | +| 13.3 (beta) | 13E5095k | /Applications/Xcode_13.3.app | +| 13.2.1 (default) | 13C100 | /Applications/Xcode_13.2.1.app | +| 13.2 | 13C90 | /Applications/Xcode_13.2.app | +| 13.1 | 13A1030d | /Applications/Xcode_13.1.app | + +#### Xcode Support Tools +- xcpretty 0.3.0 +- xcversion 2.8.0 + +#### Installed SDKs +| SDK | SDK Name | Xcode Version | +| ----------------------- | -------------------- | ------------- | +| macOS 12.0 | macosx12.0 | 13.1 | +| macOS 12.1 | macosx12.1 | 13.2, 13.2.1 | +| macOS 12.3 | macosx12.3 | 13.3 | +| iOS 15.0 | iphoneos15.0 | 13.1 | +| iOS 15.2 | iphoneos15.2 | 13.2, 13.2.1 | +| iOS 15.4 | iphoneos15.4 | 13.3 | +| Simulator - iOS 15.0 | iphonesimulator15.0 | 13.1 | +| Simulator - iOS 15.2 | iphonesimulator15.2 | 13.2, 13.2.1 | +| Simulator - iOS 15.4 | iphonesimulator15.4 | 13.3 | +| tvOS 15.0 | appletvos15.0 | 13.1 | +| tvOS 15.2 | appletvos15.2 | 13.2, 13.2.1 | +| tvOS 15.4 | appletvos15.4 | 13.3 | +| Simulator - tvOS 15.0 | appletvsimulator15.0 | 13.1 | +| Simulator - tvOS 15.2 | appletvsimulator15.2 | 13.2, 13.2.1 | +| Simulator - tvOS 15.4 | appletvsimulator15.4 | 13.3 | +| watchOS 8.0 | watchos8.0 | 13.1 | +| watchOS 8.3 | watchos8.3 | 13.2, 13.2.1 | +| watchOS 8.5 | watchos8.5 | 13.3 | +| Simulator - watchOS 8.0 | watchsimulator8.0 | 13.1 | +| Simulator - watchOS 8.3 | watchsimulator8.3 | 13.2, 13.2.1 | +| Simulator - watchOS 8.5 | watchsimulator8.5 | 13.3 | +| DriverKit 21.0.1 | driverkit21.0.1 | 13.1 | +| DriverKit 21.2 | driverkit21.2 | 13.2, 13.2.1 | +| DriverKit 21.4 | driverkit21.4 | 13.3 | + +#### Installed Simulators +| OS | Xcode Version | Simulators | +| ----------- | -------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | +| iOS 15.0 | 13.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | +| iOS 15.2 | 13.2<br>13.2.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | +| iOS 15.4 | 13.3 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | +| tvOS 15.0 | 13.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | +| tvOS 15.2 | 13.2<br>13.2.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | +| tvOS 15.4 | 13.3 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | +| watchOS 8.0 | 13.1 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | +| watchOS 8.3 | 13.2<br>13.2.1 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | +| watchOS 8.5 | 13.3 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | + +### Android +| Package Name | Version | +| -------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 4.0 | +| Android Emulator | 31.2.8 | +| Android SDK Build-tools | 32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | +| Android SDK Platforms | android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | +| Android SDK Platform-Tools | 32.0.0 | +| Android Support Repository | 47.0.0 | +| CMake | 3.18.1 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 21.4.7075529 (default)<br>22.1.7171670<br>23.1.7779620 | +| SDK Patch Applier v4 | 1 | + +#### Environment variables +| Name | Value | +| ----------------------- | -------------------------------------------------------------------------------------------------- | +| ANDROID_HOME | /Users/runner/Library/Android/sdk | +| ANDROID_NDK_HOME | /Users/runner/Library/Android/sdk/ndk-bundle -> /Users/runner/Library/Android/sdk/ndk/21.4.7075529 | +| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/23.1.7779620 | +| ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk-bundle -> /Users/runner/Library/Android/sdk/ndk/21.4.7075529 | +| ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | + +### Miscellaneous +- libXext 1.3.4 +- libXft 2.3.4 +- Tcl/Tk 8.6.12 +- Zlib 1.2.11 + + From 837669d1ac304dd8b3a4e24ecbc65ca686c13da4 Mon Sep 17 00:00:00 2001 From: Igor Boskovic <igorboskovic3@github.com> Date: Wed, 23 Mar 2022 21:16:32 +0100 Subject: [PATCH 1021/3485] [Ubuntu] Fix issues with aliyun-cli URL #3468 (#5272) --- images/linux/scripts/installers/aliyun-cli.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/linux/scripts/installers/aliyun-cli.sh b/images/linux/scripts/installers/aliyun-cli.sh index 6617967199d9..63b98ecad955 100644 --- a/images/linux/scripts/installers/aliyun-cli.sh +++ b/images/linux/scripts/installers/aliyun-cli.sh @@ -8,7 +8,7 @@ source $HELPER_SCRIPTS/install.sh # Install Alibaba Cloud CLI -downloadUrl=$(get_github_package_download_url "aliyun/aliyun-cli" "contains(\"aliyun-cli-linux\") and endswith(\"amd64.tgz\")") +downloadUrl="https://aliyuncli.alicdn.com/aliyun-cli-linux-latest-amd64.tgz" download_with_retries $downloadUrl "/tmp" tar xzf /tmp/aliyun-cli-linux-*-amd64.tgz mv aliyun /usr/local/bin From c0e7d2e45ddb42ddc1578d2a9bd5a82894fcbe49 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Wed, 23 Mar 2022 21:34:40 +0100 Subject: [PATCH 1022/3485] [Windows] use latest version of alyuin-cli from CDN (#5271) --- images/win/scripts/Installers/Install-AliyunCli.ps1 | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/images/win/scripts/Installers/Install-AliyunCli.ps1 b/images/win/scripts/Installers/Install-AliyunCli.ps1 index 025f7f3e1342..d46622e2ecd5 100644 --- a/images/win/scripts/Installers/Install-AliyunCli.ps1 +++ b/images/win/scripts/Installers/Install-AliyunCli.ps1 @@ -4,10 +4,8 @@ ################################################################################ Write-Host "Download Latest aliyun-cli archive" -$url = 'https://api.github.com/repos/aliyun/aliyun-cli/releases/latest' -# Explicitly set type to string since match returns array by default -[System.String] $aliyunLatest = (Invoke-RestMethod -Uri $url).assets.browser_download_url -match "aliyun-cli-windows" -$aliyunArchivePath = Start-DownloadWithRetry -Url $aliyunLatest -Name "aliyun-cli.zip" +$ZipballUrl = 'https://aliyuncli.alicdn.com/aliyun-cli-windows-latest-amd64.zip' +$aliyunArchivePath = Start-DownloadWithRetry -Url $ZipballUrl -Name "aliyun-cli.zip" Write-Host "Expand aliyun-cli archive" $aliyunPath = "C:\aliyun-cli" From 0448e95fef4f8f70f58cb590dd8665887a6bfcc9 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Thu, 24 Mar 2022 12:44:59 +0400 Subject: [PATCH 1023/3485] Fix issues with release version and apply pattern (#5265) --- images/linux/scripts/installers/google-chrome.sh | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/images/linux/scripts/installers/google-chrome.sh b/images/linux/scripts/installers/google-chrome.sh index ee34de334f94..3fb2a01989c5 100644 --- a/images/linux/scripts/installers/google-chrome.sh +++ b/images/linux/scripts/installers/google-chrome.sh @@ -14,12 +14,18 @@ function GetChromiumRevision { URL="https://omahaproxy.appspot.com/deps.json?version=${CHROME_VERSION}" REVISION=$(curl -s $URL | jq -r '.chromium_base_position') + # Google chrome 99.0.4844.82 based on the 1060 chromium revision, but there is chromium release with such number, use the previous release for that case + # https://github.com/actions/virtual-environments/issues/5256 + if [ $REVISION -eq "1060" ]; then + REVISION="961656" + fi # Take the first part of the revision variable to search not only for a specific version, # but also for similar ones, so that we can get a previous one if the required revision is not found FIRST_PART_OF_REVISION=${REVISION:0:${#REVISION}/2} FIRST_PART_OF_PREVIOUS_REVISION=$(expr $FIRST_PART_OF_REVISION - 1) URL="https://www.googleapis.com/storage/v1/b/chromium-browser-snapshots/o?delimiter=/&prefix=Linux_x64" - VERSIONS=$((curl -s $URL/${FIRST_PART_OF_REVISION} | jq -r '.prefixes[]' && curl -s $URL/${FIRST_PART_OF_PREVIOUS_REVISION} | jq -r '.prefixes[]') | cut -d "/" -f 2 | sort --version-sort) + # Revision can include a hash instead of a number. Need to filter it out https://github.com/actions/virtual-environments/issues/5256 + VERSIONS=$((curl -s $URL/${FIRST_PART_OF_REVISION} | jq -r '.prefixes[]' && curl -s $URL/${FIRST_PART_OF_PREVIOUS_REVISION} | jq -r '.prefixes[]') | grep -E "Linux_x64\/[0-9]+\/"| cut -d "/" -f 2 | sort --version-sort) # If required Chromium revision is not found in the list # we should have to decrement the revision number until we find one. @@ -27,7 +33,7 @@ function GetChromiumRevision { # https://www.chromium.org/getting-involved/download-chromium RIGHT_REVISION=$(echo $VERSIONS | cut -f 1 -d " ") for version in $VERSIONS; do - if [ $REVISION -lt $version ]; then + if [ $REVISION -lt $version ]; then echo $RIGHT_REVISION return fi From 9e380e00a9f209ec9db9350410dc26eb20cc82b2 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Thu, 24 Mar 2022 12:24:20 +0100 Subject: [PATCH 1024/3485] Add Microsoft.Graph module (#5277) --- images/linux/toolsets/toolset-1804.json | 1 + images/linux/toolsets/toolset-2004.json | 1 + 2 files changed, 2 insertions(+) diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index 052d2ae52f80..44322bc3dee3 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -111,6 +111,7 @@ }, "powershellModules": [ {"name": "MarkdownPS"}, + {"name": "Microsoft.Graph"}, {"name": "Pester"} ], "azureModules": [ diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index 746db845920b..20f1bf5ee9a6 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -108,6 +108,7 @@ }, "powershellModules": [ {"name": "MarkdownPS"}, + {"name": "Microsoft.Graph"}, {"name": "Pester"}, {"name": "PSScriptAnalyzer"} ], From 113127583a1a74e6c1e929806fc24529f7183597 Mon Sep 17 00:00:00 2001 From: Andre Hofmeister <9199345+HofmeisterAn@users.noreply.github.com> Date: Thu, 24 Mar 2022 19:09:18 +0100 Subject: [PATCH 1025/3485] [Windows] CPack command alias is not part of Choco anymore (#5278) --- images/win/scripts/Installers/Install-Choco.ps1 | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/images/win/scripts/Installers/Install-Choco.ps1 b/images/win/scripts/Installers/Install-Choco.ps1 index dfa1c13cc6ef..4aa814a56b1e 100644 --- a/images/win/scripts/Installers/Install-Choco.ps1 +++ b/images/win/scripts/Installers/Install-Choco.ps1 @@ -23,10 +23,6 @@ Invoke-Expression ((new-object net.webclient).DownloadString('https://chocolatey # Turn off confirmation choco feature enable -n allowGlobalConfirmation -# https://github.com/chocolatey/choco/issues/89 -# Remove some of the command aliases, like `cpack` #89 -Remove-Item -Path $env:ChocolateyInstall\bin\cpack.exe -Force - # Initialize environmental variable ChocolateyToolsLocation by invoking choco Get-ToolsLocation function Import-Module "$env:ChocolateyInstall\helpers\chocolateyInstaller.psm1" -Force -Get-ToolsLocation \ No newline at end of file +Get-ToolsLocation From fcb51fbe6d0283e786bde400958fd93d9a245fdb Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 25 Mar 2022 07:55:11 +0000 Subject: [PATCH 1026/3485] Updating readme file for macOS-10.15 version 20220322.1 (#5273) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-10.15-Readme.md | 92 +++++++++++++++--------------- 1 file changed, 46 insertions(+), 46 deletions(-) diff --git a/images/macos/macos-10.15-Readme.md b/images/macos/macos-10.15-Readme.md index bda9393130d7..ddb385e1b3ed 100644 --- a/images/macos/macos-10.15-Readme.md +++ b/images/macos/macos-10.15-Readme.md @@ -1,11 +1,11 @@ # macOS 10.15 info -- System Version: macOS 10.15.7 (19H1713) +- System Version: macOS 10.15.7 (19H1824) - Kernel Version: Darwin 19.6.0 -- Image Version: 20220307.1 +- Image Version: 20220322.1 ## Installed Software ### Language and Runtime -- .NET SDK 3.1.101 3.1.201 3.1.302 3.1.416 5.0.102 5.0.202 5.0.302 5.0.405 +- .NET SDK 3.1.101 3.1.201 3.1.302 3.1.417 5.0.102 5.0.202 5.0.302 5.0.406 - Bash 3.2.57(1)-release - Clang/LLVM 12.0.0 is default - Clang/LLVM 13.0.1 is available on `'$(brew --prefix llvm)/bin/clang'` @@ -19,31 +19,31 @@ - julia 1.7.2 - Kotlin 1.6.10-release-923 - MSBuild 16.10.1.58001 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) -- Node.js v16.14.0 +- Node.js v16.14.2 - NVM 0.39.1 -- NVM - Cached node versions: v12.22.10 v14.19.0 v16.14.0 +- NVM - Cached node versions: v12.22.11 v14.19.1 v16.14.2 - Perl 5.34.0 -- PHP 8.1.3 +- PHP 8.1.4 - Python 2.7.18 - Python 3.9.10 -- R 4.1.2 +- R 4.1.3 - Ruby 2.7.5p203 ### Package Management -- Bundler version 2.3.8 +- Bundler version 2.3.9 - Carthage 0.38.0 -- CocoaPods 1.11.2 -- Composer 2.2.7 -- Homebrew 3.4.0 +- CocoaPods 1.11.3 +- Composer 2.2.9 +- Homebrew 3.4.3 - Miniconda 4.11.0 -- NPM 8.3.1 +- NPM 8.5.0 - NuGet 5.9.0.7134 - Pip 20.3.4 (python 2.7) - Pip 21.3.1 (python 3.9) - Pipx 1.0.0 - RubyGems 3.2.33 -- Vcpkg 2022 (build from master \<bd602277b>) -- Yarn 1.22.17 +- Vcpkg 2022 (build from master \<6065e5175>) +- Yarn 1.22.18 #### Environment variables | Name | Value | @@ -53,32 +53,32 @@ ### Project Management - Apache Ant(TM) 1.10.12 -- Apache Maven 3.8.4 -- Gradle 7.4 +- Apache Maven 3.8.5 +- Gradle 7.4.1 - Sbt 1.6.2 ### Utilities - 7-Zip 17.04 - aria2 1.36.0 -- azcopy 10.14.0 +- azcopy 10.14.1 - bazel 5.0.0 - bazelisk 1.11.0 - bsdtar 3.3.2 - available by 'tar' alias - Curl 7.82.0 - Git 2.35.1 - Git LFS: 3.1.2 -- GitHub CLI: 2.5.2 +- GitHub CLI: 2.6.0 - GNU parallel 20220222 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.3 - gpg (GnuPG) 2.3.4 -- helm v3.8.0+gd141386 +- helm v3.8.1+g5cb9af4 - Hub CLI: 2.14.2 - jq 1.6 - mongo v5.0.6 - mongod v5.0.6 - Newman 5.3.2 -- OpenSSL 1.1.1m 14 Dec 2021 `(/usr/local/opt/openssl@1.1 -> ../Cellar/openssl@1.1/1.1.1m)` +- OpenSSL 1.1.1n 15 Mar 2022 `(/usr/local/opt/openssl@1.1 -> ../Cellar/openssl@1.1/1.1.1n)` - Packer 1.8.0 - PostgreSQL 14.2 - psql (PostgreSQL) 14.2 @@ -90,37 +90,37 @@ - zstd 1.5.2 ### Tools -- Aliyun CLI 3.0.110 +- Aliyun CLI 3.0.112 - App Center CLI 2.10.8 -- AWS CLI 2.4.23 -- AWS SAM CLI 1.40.1 +- AWS CLI 2.4.27 +- AWS SAM CLI 1.41.0 - AWS Session Manager CLI 1.2.295.0 -- Azure CLI (azure-devops) 0.23.0 +- Azure CLI (azure-devops) 0.24.0 - Azure CLI 2.34.1 - Bicep CLI 0.4.1272 - Cabal 3.6.2.0 - Cmake 3.22.3 -- Fastlane 2.204.3 +- Fastlane 2.205.0 - GHC 9.2.2 -- GHCup v0.1.17.5 -- Jazzy 0.14.1 +- GHCup v0.1.17.6 +- Jazzy 0.14.2 - Stack 2.7.5 -- SwiftFormat 0.49.5 +- SwiftFormat 0.49.6 - Swig 4.0.2 - Xcode Command Line Tools 12.4.0.0.1.1610135815 ### Linters -- SwiftLint 0.46.3 +- SwiftLint 0.46.5 - yamllint 1.26.3 ### Browsers -- Safari 15.3 (15612.4.9.1.8) -- SafariDriver 15.3 (15612.4.9.1.8) -- Google Chrome 99.0.4844.51 +- Safari 15.4 (15613.1.17.1.11) +- SafariDriver 15.4 (15613.1.17.1.11) +- Google Chrome 99.0.4844.83 - ChromeDriver 99.0.4844.51 -- Microsoft Edge 98.0.1108.62 -- MSEdgeDriver 98.0.1108.62 -- Mozilla Firefox 97.0.2 +- Microsoft Edge 99.0.1150.46 +- MSEdgeDriver 99.0.1150.46 +- Mozilla Firefox 98.0.1 - geckodriver 0.30.0 - Selenium server 4.1.2 @@ -159,8 +159,8 @@ - 3.6.15 - 3.7.12 - 3.8.12 -- 3.9.10 -- 3.10.2 +- 3.9.11 +- 3.10.3 #### PyPy - 2.7.18 [PyPy 7.3.8] @@ -170,16 +170,16 @@ - 3.9.10 [PyPy 7.3.8] #### Node.js -- 12.22.10 -- 14.19.0 -- 16.14.0 +- 12.22.11 +- 14.19.1 +- 16.14.2 #### Go | Version | Architecture | Environment Variable | | ------- | ------------ | -------------------- | | 1.15.15 (Default) | x64 | GOROOT_1_15_X64 | -| 1.16.14 | x64 | GOROOT_1_16_X64 | -| 1.17.7 | x64 | GOROOT_1_17_X64 | +| 1.16.15 | x64 | GOROOT_1_16_X64 | +| 1.17.8 | x64 | GOROOT_1_17_X64 | ### Rust Tools - Cargo 1.59.0 @@ -196,7 +196,7 @@ - Rustfmt 1.4.38-stable ### PowerShell Tools -- PowerShell 7.2.1 +- PowerShell 7.2.2 #### PowerShell Modules | Module | Version | @@ -209,12 +209,12 @@ ### Web Servers | Name | Version | ConfigFile | ServiceStatus | ListenPort | | ----- | -------- | ------------------------------- | ------------- | ---------- | -| httpd | 2.4.52 | /usr/local/etc/httpd/httpd.conf | none | 80 | +| httpd | 2.4.53 | /usr/local/etc/httpd/httpd.conf | none | 80 | | nginx | 1.21.6_1 | /usr/local/etc/nginx/nginx.conf | none | 80 | ### Xamarin #### Visual Studio for Mac -- 8.10.19.2 +- 8.10.21.4 #### Xamarin bundles | symlink | Xamarin.Mono | Xamarin.iOS | Xamarin.Mac | Xamarin.Android | @@ -356,7 +356,7 @@ | Android Emulator | 31.2.8 | | Android SDK Build-tools | 32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3<br>26.0.0 26.0.1 26.0.2 26.0.3<br>25.0.0 25.0.1 25.0.2 25.0.3<br>24.0.0 24.0.1 24.0.2 24.0.3 | | Android SDK Platforms | android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3)<br>android-26 (rev 2)<br>android-25 (rev 3)<br>android-24 (rev 2) | -| Android SDK Platform-Tools | 33.0.0 | +| Android SDK Platform-Tools | 33.0.1 | | Android Support Repository | 47.0.0 | | CMake | 3.10.2<br>3.18.1 | | Google APIs | addon-google_apis-google-21<br>addon-google_apis-google-22<br>addon-google_apis-google-23<br>addon-google_apis-google-24 | From 4a39d1de00f21e996d803c4f0462185a9f316e72 Mon Sep 17 00:00:00 2001 From: giacomofurlan <56687012+g14com0@users.noreply.github.com> Date: Fri, 25 Mar 2022 12:58:49 +0100 Subject: [PATCH 1027/3485] Update Go to version 1.18.* (#5261) * changed go default version to v1.16 * removed mac changes * added go 1.18 and move default version to 1.17 * fixed default version in readme * update ubuntu2004 readme to golang 1.17.8 * removed changes on readme and moved default version back to 1.15 --- images/linux/toolsets/toolset-1804.json | 3 ++- images/linux/toolsets/toolset-2004.json | 3 ++- images/win/toolsets/toolset-2016.json | 3 ++- images/win/toolsets/toolset-2019.json | 3 ++- images/win/toolsets/toolset-2022.json | 3 ++- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index 44322bc3dee3..a0ed0db18e5a 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -44,7 +44,8 @@ "versions": [ "1.15.*", "1.16.*", - "1.17.*" + "1.17.*", + "1.18.*" ], "default": "1.15.*" }, diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index 20f1bf5ee9a6..4bacd146e47d 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -46,7 +46,8 @@ "versions": [ "1.15.*", "1.16.*", - "1.17.*" + "1.17.*", + "1.18.*" ], "default": "1.15.*" }, diff --git a/images/win/toolsets/toolset-2016.json b/images/win/toolsets/toolset-2016.json index 9af5642bd47b..936ceecce2f5 100644 --- a/images/win/toolsets/toolset-2016.json +++ b/images/win/toolsets/toolset-2016.json @@ -72,7 +72,8 @@ "versions": [ "1.15.*", "1.16.*", - "1.17.*" + "1.17.*", + "1.18.*" ], "default": "1.15.*" } diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index 8b3d17383eeb..e1477d36af7b 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -73,7 +73,8 @@ "versions": [ "1.15.*", "1.16.*", - "1.17.*" + "1.17.*", + "1.18.*" ], "default": "1.15.*" } diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index dbf2663455b8..1bc9df9dc506 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -65,7 +65,8 @@ "versions": [ "1.15.*", "1.16.*", - "1.17.*" + "1.17.*", + "1.18.*" ], "default": "1.16.*" } From 7fc477ed2018755408f9c03aec06238e5fe6c64d Mon Sep 17 00:00:00 2001 From: ddobranic <101048884+ddobranic@users.noreply.github.com> Date: Sat, 26 Mar 2022 16:19:37 +0100 Subject: [PATCH 1028/3485] Add go 1.18 to MacOS (#5281) --- images/macos/toolsets/toolset-10.15.json | 3 ++- images/macos/toolsets/toolset-11.json | 3 ++- images/macos/toolsets/toolset-12.json | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index 7a956f54aa97..48e60f7d83f9 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -292,7 +292,8 @@ "versions": [ "1.15.*", "1.16.*", - "1.17.*" + "1.17.*", + "1.18.*" ] }, { diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index c268e9d32258..13dbba39aa73 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -261,7 +261,8 @@ "versions": [ "1.15.*", "1.16.*", - "1.17.*" + "1.17.*", + "1.18.*" ] }, { diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index 674d2cb6befb..b38a523573bc 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -175,7 +175,8 @@ "versions": [ "1.15.*", "1.16.*", - "1.17.*" + "1.17.*", + "1.18.*" ] }, { From bdd8f813294f003a4fc26d416bd9622d39123cf2 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Sat, 26 Mar 2022 23:24:26 +0400 Subject: [PATCH 1029/3485] Install llvm version correctly (#5288) * Install llvm version correctly * Move llvm installation to script for win22 --- images/win/scripts/Installers/Install-LLVM.ps1 | 2 +- images/win/toolsets/toolset-2022.json | 4 +++- images/win/windows2022.json | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/images/win/scripts/Installers/Install-LLVM.ps1 b/images/win/scripts/Installers/Install-LLVM.ps1 index 07c7c46e2de6..f039a9421ef4 100644 --- a/images/win/scripts/Installers/Install-LLVM.ps1 +++ b/images/win/scripts/Installers/Install-LLVM.ps1 @@ -5,6 +5,6 @@ $llvmVersion = (Get-ToolsetContent).llvm.version $latestChocoVersion = Get-LatestChocoPackageVersion -TargetVersion $llvmVersion -PackageName "llvm" -Choco-Install -PackageName llvm -ArgumentList "--version $latestChocoVersion" +Choco-Install -PackageName llvm -ArgumentList '--version', $latestChocoVersion Invoke-PesterTests -TestFile "LLVM" diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index 1bc9df9dc506..bc02df030a1b 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -306,7 +306,6 @@ { "name": "Bicep" }, { "name": "innosetup" }, { "name": "jq" }, - { "name": "llvm" }, { "name": "NuGet.CommandLine" }, { "name": "openssl.light", @@ -340,6 +339,9 @@ "nsis": { "version": "3.08" }, + "llvm": { + "version": "13" + }, "php": { "version": "8.1" }, diff --git a/images/win/windows2022.json b/images/win/windows2022.json index db33e7b0b18c..858a18ff8089 100644 --- a/images/win/windows2022.json +++ b/images/win/windows2022.json @@ -255,7 +255,8 @@ "{{ template_dir }}/scripts/Installers/Configure-DynamicPort.ps1", "{{ template_dir }}/scripts/Installers/Configure-GDIProcessHandleQuota.ps1", "{{ template_dir }}/scripts/Installers/Configure-Shell.ps1", - "{{ template_dir }}/scripts/Installers/Enable-DeveloperMode.ps1" + "{{ template_dir }}/scripts/Installers/Enable-DeveloperMode.ps1", + "{{ template_dir }}/scripts/Installers/Install-LLVM.ps1" ], "elevated_user": "{{user `install_user`}}", "elevated_password": "{{user `install_password`}}" From 0d6b2761a24af7bf4dc4b0fa73d15a8a5fc402f7 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 28 Mar 2022 14:50:44 +0000 Subject: [PATCH 1030/3485] Updating readme file for win22 version 20220316.1 (#5249) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2022-Readme.md | 93 ++++++++++++++++---------------- 1 file changed, 46 insertions(+), 47 deletions(-) diff --git a/images/win/Windows2022-Readme.md b/images/win/Windows2022-Readme.md index 22c356b05ed5..d3296b0951ea 100644 --- a/images/win/Windows2022-Readme.md +++ b/images/win/Windows2022-Readme.md @@ -1,11 +1,10 @@ | Announcements | |-| | [windows-latest workflows will use Windows Server 2022](https://github.com/actions/virtual-environments/issues/4856) | -| [Windows-2016 environment will be removed on March 15, 2022](https://github.com/actions/virtual-environments/issues/4312) | *** # Microsoft Windows Server 2022 Datacenter -- OS Version: 10.0.20348 Build 524 -- Image Version: 20220306.1 +- OS Version: 10.0.20348 Build 587 +- Image Version: 20220316.1 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -13,27 +12,27 @@ ## Installed Software ### Language and Runtime - Bash 4.4.23(2)-release -- Go 1.16.14 +- Go 1.16.15 - Julia 1.7.2 - Kotlin 1.6.10 - LLVM 13.0.1 -- Node 16.14.0 +- Node 16.14.1 - Perl 5.32.1 -- PHP 8.1.3 +- PHP 8.1.4 - Python 3.9.10 - Ruby 3.0.3p157 ### Package Management - Chocolatey 0.12.1 -- Composer 2.2.7 +- Composer 2.2.9 - Helm 3.8.0 - Miniconda 4.11.0 (pre-installed on the image but not added to PATH) -- NPM 8.3.1 +- NPM 8.5.0 - NuGet 6.1.0.106 -- pip 22.0.3 (python 3.9) +- pip 22.0.4 (python 3.9) - Pipx 1.0.0 - RubyGems 3.2.32 -- Vcpkg (build from master \<bd602277b>) +- Vcpkg (build from master \<71d274d7c>) - Yarn 1.22.17 #### Environment variables @@ -44,28 +43,28 @@ ### Project Management - Ant 1.10.12 - Gradle 7.4 -- Maven 3.8.4 +- Maven 3.8.5 - sbt 1.6.2 ### Tools - 7zip 21.07 - aria2 1.36.0 -- azcopy 10.14.0 +- azcopy 10.14.1 - Bazel 5.0.0 - Bazelisk 1.11.0 -- Bicep 0.4.1272 +- Bicep 0.4.1318 - Cabal 3.6.2.0 - CMake 3.22.3 -- CodeQL Action Bundle 2.8.1 +- CodeQL Action Bundle 2.8.3 - Docker 20.10.7 - Docker-compose 1.29.2 - Docker-wincred 0.6.4 -- ghc 9.2.1 +- ghc 9.2.2 - Git 2.35.1.windows.2 - Git LFS 3.0.2 - InnoSetup 6.2.0 - jq 1.6 -- Kind 0.11.1 +- Kind 0.12.0 - Kubectl 1.23.4 - Mercurial 5.0 - Mingw-w64 8.1.0 @@ -73,9 +72,9 @@ - NSIS v3.08 - OpenSSL 1.1.1 - Packer 1.7.10 -- Pulumi v3.25.1 -- R 4.1.2 -- Service Fabric SDK 8.2.1486.9590 +- Pulumi v3.26.1 +- R 4.1.3 +- Service Fabric SDK 8.2.1571.9590 - Stack 2.7.5 - Subversion (SVN) 1.14.1 - Swig 4.0.2 @@ -86,13 +85,13 @@ - zstd 1.5.2 ### CLI Tools -- Alibaba Cloud CLI 3.0.110 -- AWS CLI 2.4.23 +- Alibaba Cloud CLI 3.0.112 +- AWS CLI 2.4.25 - AWS SAM CLI 1.40.1 - AWS Session Manager CLI 1.2.295.0 - Azure CLI 2.34.1 - Azure DevOps CLI extension 0.23.0 -- GitHub CLI 2.5.2 +- GitHub CLI 2.6.0 - Hub CLI 2.14.2 ### Rust Tools @@ -110,11 +109,11 @@ - Rustfmt 1.4.38 ### Browsers and webdrivers -- Google Chrome 99.0.4844.51 +- Google Chrome 99.0.4844.74 - Chrome Driver 99.0.4844.51 -- Microsoft Edge 99.0.1150.30 -- Microsoft Edge Driver 99.0.1150.30 -- Mozilla Firefox 97.0.2 +- Microsoft Edge 99.0.1150.39 +- Microsoft Edge Driver 99.0.1150.39 +- Mozilla Firefox 98.0.1 - Gecko Driver 0.30.0 - IE Driver 3.150.1.1 - Selenium server 4.1.0 @@ -156,8 +155,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Version | Architecture | Environment Variable | | ------- | ------------ | -------------------- | | 1.15.15 | x64 | GOROOT_1_15_X64 | -| 1.16.14 (Default) | x64 | GOROOT_1_16_X64 | -| 1.17.7 | x64 | GOROOT_1_17_X64 | +| 1.16.15 (Default) | x64 | GOROOT_1_16_X64 | +| 1.17.8 | x64 | GOROOT_1_17_X64 | #### Node | Version | Architecture | @@ -207,7 +206,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | 5.0.6.0 | MongoDB | Running | Automatic | ### Database tools -- Azure CosmosDb Emulator 2.14.5.0 +- Azure CosmosDb Emulator 2.14.6.0 - DacFx 16.0.5400.1 - MySQL 8.0.26.0 - SQL OLEDB Driver 18.6.3.0 @@ -216,13 +215,13 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Web Servers | Name | Version | ConfigFile | ServiceName | ServiceStatus | ListenPort | | ------ | ------- | ------------------------------------- | ----------- | ------------- | ---------- | -| Apache | 2.4.52 | C:\tools\Apache24\conf\httpd.conf | Apache | Stopped | 80 | +| Apache | 2.4.53 | C:\tools\Apache24\conf\httpd.conf | Apache | Stopped | 80 | | Nginx | 1.21.6 | C:\tools\nginx-1.21.6\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2022 | Name | Version | Path | | ----------------------------- | -------------- | -------------------------------------------------------- | -| Visual Studio Enterprise 2022 | 17.1.32210.238 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | +| Visual Studio Enterprise 2022 | 17.1.32228.430 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | #### Workloads, components and extensions: | Package | Version | @@ -272,11 +271,11 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.Net.ComponentGroup.4.8.DeveloperTools | 17.1.32112.364 | | Microsoft.Net.ComponentGroup.DevelopmentPrerequisites | 17.1.32112.364 | | Microsoft.Net.ComponentGroup.TargetingPacks.Common | 17.1.32112.364 | -| microsoft.net.runtime.mono.tooling | 6.0.222.10215 | -| microsoft.net.sdk.emscripten | 6.0.6.10204 | +| microsoft.net.runtime.mono.tooling | 6.0.322.12309 | +| microsoft.net.sdk.emscripten | 6.0.6.10801 | | Microsoft.NetCore.Component.DevelopmentTools | 17.1.32112.364 | -| Microsoft.NetCore.Component.Runtime.6.0 | 17.1.32210.238 | -| Microsoft.NetCore.Component.SDK | 17.1.32210.238 | +| Microsoft.NetCore.Component.Runtime.6.0 | 17.1.32228.430 | +| Microsoft.NetCore.Component.SDK | 17.1.32228.430 | | Microsoft.NetCore.Component.Web | 17.1.32112.364 | | Microsoft.VisualStudio.Component.AppInsights.Tools | 17.1.32112.364 | | Microsoft.VisualStudio.Component.AspNet | 17.1.32112.364 | @@ -428,7 +427,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Workload.Python | 17.1.32112.364 | | Microsoft.VisualStudio.Workload.Universal | 17.1.32112.364 | | Microsoft.VisualStudio.Workload.VisualStudioExtension | 17.1.32112.364 | -| wasm.tools | 6.0.222.10215 | +| wasm.tools | 6.0.322.12309 | | VisualStudioClient.MicrosoftVisualStudio2022InstallerProjects | 2.0.0 | | WixToolset.WixToolsetVisualStudio2022Extension | 1.0.0.18 | @@ -455,17 +454,17 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### .NET Core SDK `Location C:\Program Files\dotnet\sdk` -- 3.1.120 3.1.202 3.1.302 3.1.416 5.0.104 5.0.211 5.0.303 5.0.405 6.0.200 +- 3.1.120 3.1.202 3.1.302 3.1.417 5.0.104 5.0.212 5.0.303 5.0.406 6.0.201 ### .NET Core Runtime `Location: C:\Program Files\dotnet\shared\Microsoft.AspNetCore.App` -- 3.1.4 3.1.6 3.1.20 3.1.22 5.0.4 5.0.9 5.0.13 5.0.14 6.0.2 +- 3.1.4 3.1.6 3.1.20 3.1.22 3.1.23 5.0.4 5.0.9 5.0.14 5.0.15 6.0.3 `Location: C:\Program Files\dotnet\shared\Microsoft.NETCore.App` -- 3.1.4 3.1.6 3.1.20 3.1.22 5.0.4 5.0.9 5.0.13 5.0.14 6.0.2 +- 3.1.4 3.1.6 3.1.20 3.1.22 3.1.23 5.0.4 5.0.9 5.0.14 5.0.15 6.0.3 `Location: C:\Program Files\dotnet\shared\Microsoft.WindowsDesktop.App` -- 3.1.4 3.1.6 3.1.20 3.1.22 5.0.4 5.0.9 5.0.14 6.0.2 +- 3.1.4 3.1.6 3.1.20 3.1.23 5.0.4 5.0.9 5.0.15 6.0.3 ### .NET Framework `Type: Developer Pack` @@ -493,10 +492,10 @@ All other versions are saved but not installed. #### Powershell Modules | Module | Version | | ------------------ | ---------------- | -| AWSPowerShell | 4.1.37 | +| AWSPowerShell | 4.1.44 | | DockerMsftProvider | 1.0.0.8 | | MarkdownPS | 1.9 | -| Microsoft.Graph | 1.9.2 | +| Microsoft.Graph | 1.9.3 | | Pester | 3.4.0<br>5.3.1 | | PowerShellGet | 1.0.0.1<br>2.2.5 | | PSScriptAnalyzer | 1.20.0 | @@ -532,10 +531,10 @@ All other versions are saved but not installed. ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2022 | sha256:e4efd2e7d1a15825818255d8761481dc9b9edcc05c8fa9537e610edd311f7e9b | 2022-02-10 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2022 | sha256:aac1e1ee170c024e17745ee7109559f257a7c0dbf2e08245de387aad51e61b0d | 2022-02-10 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:bc33b197a4976dbedcb044af20a5b28db00b9b5677d6212b7cbbab9fad4e2f2d | 2022-02-16 | -| mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:8aa115e244add588e9a71a38d302e8fc801f2e986be83a58d5e015e4cba8f613 | 2022-02-01 | -| mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:720729320e08bdf14b6bc16444be6a3b74a457bd0584fee5124e6073e9f8f1cf | 2022-02-01 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2022 | sha256:1c06a5c6b2f4ef64ca2efa246a8d8e9882f3d44e2f874dccfa71e2c6b3692e6c | 2022-03-08 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2022 | sha256:8a3249fe6b8d2df1631df08097b776e4bae524b8ab6f1ede8f9a10e0302bd30f | 2022-03-08 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:ba09875e33b4d23d202edee998e8736e921224a53ee32b6e8cebe9be177b886b | 2022-03-08 | +| mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:496f77fac70d6e109d6673aaf640a7d5b6bfe2f0f861735f72c0f66840ba7f71 | 2022-03-03 | +| mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:343f8c95ec604913c74597f6d541e388f83bc0ce373ee8ea5bb26d268879f338 | 2022-03-03 | From 8d2a20ab9be4f50a7eb5d27452ce221123aa3e42 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 28 Mar 2022 16:10:17 +0000 Subject: [PATCH 1031/3485] Updating readme file for ubuntu18 version 20220316.1 (#5248) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu1804-Readme.md | 70 +++++++++++++++---------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/images/linux/Ubuntu1804-Readme.md b/images/linux/Ubuntu1804-Readme.md index c862f8663492..326a08d19dda 100644 --- a/images/linux/Ubuntu1804-Readme.md +++ b/images/linux/Ubuntu1804-Readme.md @@ -3,8 +3,8 @@ | [[Ubuntu] Issue with libstdc++ cannot allocate memory in static TLS block](https://github.com/actions/virtual-environments/issues/4799) | *** # Ubuntu 18.04.6 LTS -- Linux kernel version: 5.4.0-1070-azure -- Image Version: 20220306.1 +- Linux kernel version: 5.4.0-1072-azure +- Image Version: 20220316.1 ## Installed Software ### Language and Runtime @@ -19,24 +19,24 @@ - Kotlin 1.6.10-release-923 - Mono 6.12.0.122 (apt source repository: https://download.mono-project.com/repo/ubuntu stable-bionic main) - MSBuild 16.6.0.15201 (from /usr/lib/mono/msbuild/15.0/bin/MSBuild.dll) -- Node 16.14.0 +- Node 16.14.1 - Perl 5.26.1 - Python 2.7.17 - Python3 3.6.9 - Ruby 2.5.1p57 -- Swift 5.5.3 +- Swift 5.6 ### Package Management - cpan 1.64 -- Helm 3.8.0 -- Homebrew 3.4.0 +- Helm 3.8.1 +- Homebrew 3.4.2 - Miniconda 4.11.0 -- Npm 8.3.1 +- Npm 8.5.0 - Pip 9.0.1 - Pip3 9.0.1 - Pipx 1.0.0 - RubyGems 2.7.6 -- Vcpkg (build from master \<bd602277b>) +- Vcpkg (build from master \<8522c65ea>) - Yarn 1.22.17 #### Environment variables @@ -47,20 +47,20 @@ ### Project Management - Ant 1.10.5 -- Gradle 7.4 -- Maven 3.8.4 +- Gradle 7.4.1 +- Maven 3.8.5 - Sbt 1.6.2 ### Tools - Ansible 2.11.9 - apt-fast 1.9.12 -- AzCopy 10.14.0 (available by `azcopy` and `azcopy10` aliases) +- AzCopy 10.14.1 (available by `azcopy` and `azcopy10` aliases) - Bazel 5.0.0 - Bazelisk 1.11.0 -- Bicep 0.4.1272 +- Bicep 0.4.1318 - Buildah 1.19.6 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - CMake 3.22.3 -- CodeQL Action Bundle 2.8.1 +- CodeQL Action Bundle 2.8.3 - Docker Compose v1 1.29.2 - Docker Compose v2 2.2.3+azure-1 - Docker-Buildx 0.7.1 @@ -70,10 +70,10 @@ - Git LFS 3.1.2 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.3.1 - Haveged 1.9.1 -- Heroku 7.59.2 -- HHVM (HipHop VM) 4.151.0 +- Heroku 7.59.4 +- HHVM (HipHop VM) 4.153.0 - jq 1.5 -- Kind 0.11.1 +- Kind 0.12.0 - Kubectl 1.23.4 - Kustomize 4.5.2 - Leiningen 2.9.8 @@ -88,28 +88,28 @@ - Parcel 2.3.2 - PhantomJS 2.1.1 - Podman 3.0.1 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- Pulumi 3.25.1 +- Pulumi 3.26.1 - R 4.1.2 - Skopeo 1.2.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 - SVN 1.9.7 - Terraform 1.1.7 - yamllint 1.26.3 -- yq 4.21.1 +- yq 4.22.1 - zstd 1.5.2 (homebrew) ### CLI Tools -- Alibaba Cloud CLI 3.0.110 -- AWS CLI 1.22.68 +- Alibaba Cloud CLI 3.0.112 +- AWS CLI 1.22.76 - AWS CLI Session manager plugin 1.2.295.0 - AWS SAM CLI 1.40.1 - Azure CLI (azure-cli) 2.34.1 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.23.0 -- GitHub CLI 2.5.2 +- GitHub CLI 2.6.0 - Google Cloud SDK 369.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 9.12.3 -- OpenShift CLI 4.9.23 +- Netlify CLI 9.13.2 +- OpenShift CLI 4.10.4 - ORAS CLI 0.12.0 - Vercel CLI 24.0.0 @@ -125,14 +125,14 @@ | Tool | Version | | -------- | ---------------------------------------- | | PHP | 7.1.33 7.2.34 7.3.33 7.4.28 8.0.16 8.1.3 | -| Composer | 2.2.7 | -| PHPUnit | 8.5.24 | +| Composer | 2.2.9 | +| PHPUnit | 8.5.25 | ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ``` ### Haskell - Cabal 3.6.2.0 -- GHC 9.2.1 +- GHC 9.2.2 - GHCup 0.1.17.5 - Stack 2.7.5 @@ -151,9 +151,9 @@ - Rustfmt 1.4.38 ### Browsers and Drivers -- Google Chrome 99.0.4844.51 +- Google Chrome 99.0.4844.74 - ChromeDriver 99.0.4844.51 -- Mozilla Firefox 97.0.2 +- Mozilla Firefox 98.0 - Geckodriver 0.30.0 - Chromium 99.0.4844.0 - Selenium server 4.1.0 @@ -166,7 +166,7 @@ | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | ### .NET Core SDK -- 3.1.120 3.1.202 3.1.302 3.1.416 5.0.104 5.0.211 5.0.303 5.0.405 6.0.200 +- 3.1.120 3.1.202 3.1.302 3.1.417 5.0.104 5.0.212 5.0.303 5.0.406 6.0.201 ### .NET tools - nbgv 3.4.255+06fb9182bf @@ -196,8 +196,8 @@ ### Cached Tools #### Go - 1.15.15 -- 1.16.14 -- 1.17.7 +- 1.16.15 +- 1.17.8 #### Node.js - 12.22.10 @@ -228,11 +228,11 @@ | Name | Value | Architecture | | --------------- | ----------------------------------- | ------------ | | GOROOT_1_15_X64 | /opt/hostedtoolcache/go/1.15.15/x64 | x64 | -| GOROOT_1_16_X64 | /opt/hostedtoolcache/go/1.16.14/x64 | x64 | -| GOROOT_1_17_X64 | /opt/hostedtoolcache/go/1.17.7/x64 | x64 | +| GOROOT_1_16_X64 | /opt/hostedtoolcache/go/1.16.15/x64 | x64 | +| GOROOT_1_17_X64 | /opt/hostedtoolcache/go/1.17.8/x64 | x64 | ### PowerShell Tools -- PowerShell 7.2.1 +- PowerShell 7.2.2 #### PowerShell Modules | Module | Version | @@ -287,7 +287,7 @@ | debian:10 | sha256:fd510d85d7e0691ca551fe08e8a2516a86c7f24601a940a299b5fe5cdd22c03a | 2022-03-01 | | debian:11 | sha256:10b622c6cf6daa0a295be74c0e412ed20e10f91ae4c6f3ce6ff0c9c04f77cbf6 | 2022-03-01 | | debian:9 | sha256:54f2c31487af733ad08e62af6a77ccddcbc8895857edc54768ba0020991950f9 | 2022-03-01 | -| moby/buildkit:latest | sha256:d6c89b7085b106301645ddcc77cf64eb7b705ab507b72d52d130ac33f1300417 | 2021-11-18 | +| moby/buildkit:latest | sha256:c2aeafaed434edfde90706b5cf9a56935c389192858d1090e17a1440a6e96482 | 2022-03-09 | | node:12 | sha256:cc4adb82efc04b74b9f96326e682ad04be2df84d23e40609802eb6d6c207abde | 2022-03-02 | | node:12-alpine | sha256:dfa564312367b1a8fca8db7ae4bae102b28e68b39ebcb7b17022c938f105846b | 2022-02-04 | | node:14 | sha256:d3f3c5105b1defedbdd7a8c6a4184d11e65f246d0dfd798e6f0fabc4b5326d46 | 2022-03-02 | From 0e61e0bbc08e19bb57cfd7b1569f18f0bbfe44b5 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 28 Mar 2022 22:46:09 +0000 Subject: [PATCH 1032/3485] Updating readme file for win19 version 20220316.1 (#5246) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2019-Readme.md | 91 ++++++++++++++++---------------- 1 file changed, 45 insertions(+), 46 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index 7899a1afff9a..b9df9d4f2683 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -1,11 +1,10 @@ | Announcements | |-| | [windows-latest workflows will use Windows Server 2022](https://github.com/actions/virtual-environments/issues/4856) | -| [Windows-2016 environment will be removed on March 15, 2022](https://github.com/actions/virtual-environments/issues/4312) | *** # Microsoft Windows Server 2019 Datacenter -- OS Version: 10.0.17763 Build 2565 -- Image Version: 20220306.1 +- OS Version: 10.0.17763 Build 2686 +- Image Version: 20220316.1 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -17,23 +16,23 @@ - Julia 1.7.2 - Kotlin 1.6.10 - LLVM 13.0.1 -- Node 16.14.0 +- Node 16.14.1 - Perl 5.32.1 -- PHP 8.1.3 +- PHP 8.1.4 - Python 3.7.9 - Ruby 2.5.9p229 ### Package Management - Chocolatey 0.12.1 -- Composer 2.2.7 +- Composer 2.2.9 - Helm 3.8.0 - Miniconda 4.11.0 (pre-installed on the image but not added to PATH) -- NPM 8.3.1 +- NPM 8.5.0 - NuGet 6.1.0.106 -- pip 22.0.3 (python 3.7) +- pip 22.0.4 (python 3.7) - Pipx 1.0.0 - RubyGems 2.7.6.3 -- Vcpkg (build from master \<bd602277b>) +- Vcpkg (build from master \<6b6f5a82d>) - Yarn 1.22.17 #### Environment variables @@ -45,29 +44,29 @@ ### Project Management - Ant 1.10.12 - Gradle 7.4 -- Maven 3.8.4 +- Maven 3.8.5 - sbt 1.6.2 ### Tools - 7zip 21.07 - aria2 1.36.0 -- azcopy 10.14.0 +- azcopy 10.14.1 - Bazel 5.0.0 - Bazelisk 1.11.0 -- Bicep 0.4.1272 +- Bicep 0.4.1318 - Cabal 3.6.2.0 - CMake 3.22.3 -- CodeQL Action Bundle 2.8.1 +- CodeQL Action Bundle 2.8.3 - Docker 20.10.7 - Docker-compose 1.29.2 - Docker-wincred 0.6.4 -- ghc 9.2.1 +- ghc 9.2.2 - Git 2.35.1.windows.2 - Git LFS 3.0.2 -- Google Cloud SDK 375.0.0 +- Google Cloud SDK 377.0.0 - InnoSetup 6.2.0 - jq 1.6 -- Kind 0.11.1 +- Kind 0.12.0 - Kubectl 1.23.4 - Mercurial 5.0 - Mingw-w64 8.1.0 @@ -76,9 +75,9 @@ - OpenSSL 1.1.1 - Packer 1.7.10 - Parcel 2.3.2 -- Pulumi v3.25.1 -- R 4.1.2 -- Service Fabric SDK 8.2.1486.9590 +- Pulumi v3.26.1 +- R 4.1.3 +- Service Fabric SDK 8.2.1571.9590 - Stack 2.7.5 - Subversion (SVN) 1.14.1 - Swig 4.0.2 @@ -89,14 +88,14 @@ - zstd 1.5.2 ### CLI Tools -- Alibaba Cloud CLI 3.0.110 -- AWS CLI 2.4.23 +- Alibaba Cloud CLI 3.0.112 +- AWS CLI 2.4.25 - AWS SAM CLI 1.40.1 - AWS Session Manager CLI 1.2.295.0 - Azure CLI 2.34.1 - Azure DevOps CLI extension 0.23.0 - Cloud Foundry CLI 6.53.0 -- GitHub CLI 2.5.2 +- GitHub CLI 2.6.0 - Hub CLI 2.14.2 ### Rust Tools @@ -114,11 +113,11 @@ - Rustfmt 1.4.38 ### Browsers and webdrivers -- Google Chrome 99.0.4844.51 +- Google Chrome 99.0.4844.74 - Chrome Driver 99.0.4844.51 -- Microsoft Edge 99.0.1150.30 -- Microsoft Edge Driver 99.0.1150.30 -- Mozilla Firefox 97.0.2 +- Microsoft Edge 99.0.1150.39 +- Microsoft Edge Driver 99.0.1150.39 +- Mozilla Firefox 98.0.1 - Gecko Driver 0.30.0 - IE Driver 3.150.1.1 - Selenium server 4.1.0 @@ -164,8 +163,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Version | Architecture | Environment Variable | | ------- | ------------ | -------------------- | | 1.15.15 (Default) | x64 | GOROOT_1_15_X64 | -| 1.16.14 | x64 | GOROOT_1_16_X64 | -| 1.17.7 | x64 | GOROOT_1_17_X64 | +| 1.16.15 | x64 | GOROOT_1_16_X64 | +| 1.17.8 | x64 | GOROOT_1_17_X64 | #### Node | Version | Architecture | @@ -221,7 +220,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | 5.0.6.0 | MongoDB | Running | Automatic | ### Database tools -- Azure CosmosDb Emulator 2.14.5.0 +- Azure CosmosDb Emulator 2.14.6.0 - DacFx 16.0.5400.1 - MySQL 5.7.37.0 - SQL OLEDB Driver 18.6.3.0 @@ -230,18 +229,18 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Web Servers | Name | Version | ConfigFile | ServiceName | ServiceStatus | ListenPort | | ------ | ------- | ------------------------------------- | ----------- | ------------- | ---------- | -| Apache | 2.4.52 | C:\tools\Apache24\conf\httpd.conf | Apache | Stopped | 80 | +| Apache | 2.4.53 | C:\tools\Apache24\conf\httpd.conf | Apache | Stopped | 80 | | Nginx | 1.21.6 | C:\tools\nginx-1.21.6\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2019 | Name | Version | Path | | ----------------------------- | --------------- | -------------------------------------------------------------- | -| Visual Studio Enterprise 2019 | 16.11.32126.315 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | +| Visual Studio Enterprise 2019 | 16.11.32228.343 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | #### Workloads, components and extensions: | Package | Version | | ------------------------------------------------------------------------- | --------------- | -| Component.Android.NDK.R16B | 16.11.32126.126 | +| Component.Android.NDK.R16B | 16.11.32228.297 | | Component.Android.SDK25.Private | 16.0.28625.61 | | Component.Android.SDK30 | 16.10.31205.252 | | Component.Ant | 1.9.3.8 | @@ -296,9 +295,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.Net.ComponentGroup.DevelopmentPrerequisites | 16.3.29207.166 | | Microsoft.Net.ComponentGroup.TargetingPacks.Common | 16.0.28516.191 | | Microsoft.NetCore.Component.DevelopmentTools | 16.10.31303.231 | -| Microsoft.NetCore.Component.Runtime.3.1 | 16.11.32126.315 | -| Microsoft.NetCore.Component.Runtime.5.0 | 16.11.32126.315 | -| Microsoft.NetCore.Component.SDK | 16.11.32126.315 | +| Microsoft.NetCore.Component.Runtime.3.1 | 16.11.32228.343 | +| Microsoft.NetCore.Component.Runtime.5.0 | 16.11.32228.343 | +| Microsoft.NetCore.Component.SDK | 16.11.32228.343 | | Microsoft.NetCore.Component.Web | 16.10.31303.231 | | Microsoft.VisualStudio.Component.AppInsights.Tools | 16.5.29515.121 | | Microsoft.VisualStudio.Component.AspNet45 | 16.10.31205.252 | @@ -506,17 +505,17 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### .NET Core SDK `Location C:\Program Files\dotnet\sdk` -- 3.1.120 3.1.202 3.1.302 3.1.416 5.0.104 5.0.211 5.0.303 5.0.405 +- 3.1.120 3.1.202 3.1.302 3.1.417 5.0.104 5.0.212 5.0.303 5.0.406 ### .NET Core Runtime `Location: C:\Program Files\dotnet\shared\Microsoft.AspNetCore.App` -- 3.1.4 3.1.6 3.1.20 3.1.22 5.0.4 5.0.9 5.0.14 +- 3.1.4 3.1.6 3.1.20 3.1.23 5.0.4 5.0.9 5.0.15 `Location: C:\Program Files\dotnet\shared\Microsoft.NETCore.App` -- 3.1.4 3.1.6 3.1.20 3.1.22 5.0.4 5.0.9 5.0.14 +- 3.1.4 3.1.6 3.1.20 3.1.23 5.0.4 5.0.9 5.0.15 `Location: C:\Program Files\dotnet\shared\Microsoft.WindowsDesktop.App` -- 3.1.4 3.1.6 3.1.20 3.1.22 5.0.4 5.0.9 5.0.14 +- 3.1.4 3.1.6 3.1.20 3.1.23 5.0.4 5.0.9 5.0.15 ### .NET Framework `Type: Developer Pack` @@ -544,10 +543,10 @@ All other versions are saved but not installed. #### Powershell Modules | Module | Version | | ------------------ | ---------------- | -| AWSPowerShell | 4.1.37 | +| AWSPowerShell | 4.1.44 | | DockerMsftProvider | 1.0.0.8 | | MarkdownPS | 1.9 | -| Microsoft.Graph | 1.9.2 | +| Microsoft.Graph | 1.9.3 | | Pester | 3.4.0<br>5.3.1 | | PowerShellGet | 1.0.0.1<br>2.2.5 | | PSScriptAnalyzer | 1.20.0 | @@ -584,10 +583,10 @@ All other versions are saved but not installed. ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:37a12f8f6d6bd9aef41c3ca37e3085d3c79ee309644d87f964e99fafe47df6ec | 2022-02-10 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:b7e797ce41cf3aa60de873750cbd0942021e64a54e5883e893becf7a7c905f81 | 2022-02-10 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:a230142ea0331493f01885d4910270de94e9eaacffaf594127c09c5d0f7c5368 | 2022-02-16 | -| mcr.microsoft.com/windows/nanoserver:1809 | sha256:1c73d8891bbbf862c2a52ed0bcde3d9592c07fe375d5a52d85cb94165846ea26 | 2022-02-02 | -| mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:d8c2b69511a49e9eb6fd2a17f2727ae011b0382cd11562fa5cb4c70bb460cf12 | 2022-02-02 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:3d199041f4a1a21bbe1383dc8535664661908a5024be1be763446d8b1d1a6c07 | 2022-03-08 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:21ba7b1464733f7076c149ffa40f52a6d207a5ae78e636cf0bb0e19d8c38934b | 2022-03-08 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:f828494b61e4059d13f3733a899ab6a64a0160408d519721c79273a45bb0bda5 | 2022-03-08 | +| mcr.microsoft.com/windows/nanoserver:1809 | sha256:e508123972ca40c7662658ee1893a8d20f44a9dcd49be3ffa9dec559e525b71d | 2022-03-03 | +| mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:33d7abef52e917a19145873e9ed487055cb55ce3ccf3056ea189b0eb5e4e3683 | 2022-03-03 | From 40f823846d6ca9fbf418a4561659e976cbb040e1 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Tue, 29 Mar 2022 09:31:12 +0200 Subject: [PATCH 1033/3485] Fix setAutoLogin.sh script (#5298) --- .../bootstrap-provisioner/setAutoLogin.sh | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/images/macos/provision/bootstrap-provisioner/setAutoLogin.sh b/images/macos/provision/bootstrap-provisioner/setAutoLogin.sh index d9beee9973c8..bafb263cb990 100644 --- a/images/macos/provision/bootstrap-provisioner/setAutoLogin.sh +++ b/images/macos/provision/bootstrap-provisioner/setAutoLogin.sh @@ -22,15 +22,11 @@ function kcpasswordEncode { #converted to hex representation with spaces local thisStringHex_array=( $(echo -n "${thisString}" | xxd -p -u | sed 's/../& /g') ) - #get padding by subtraction if under 12 - if [ "${#thisStringHex_array[@]}" -lt 12 ]; then - local padding=$(( 12 - ${#thisStringHex_array[@]} )) - #get padding by subtracting remainder of modulo 12 if over 12 - elif [ "$(( ${#thisStringHex_array[@]} % 12 ))" -ne 0 ]; then - local padding=$(( (12 - ${#thisStringHex_array[@]} % 12) )) - #otherwise even multiples of 12 still need 12 padding - else - local padding=12 + #get padding by subtraction if under 11 + local r=$(( ${#thisStringHex_array[@]} % 11 )) + local padding=0 + if [ $r -gt 0 ]; then + local padding=$(( 11 - $r )) fi #cycle through each element of the array + padding @@ -44,7 +40,7 @@ function kcpasswordEncode { #use $(( shell Aritmethic )) to ^ XOR the two 0x## values (extra padding is 0x00) #take decimal value and printf convert to two char hex value #use xxd to convert hex to actual value and append to the encodedString variable - local encodedString+=$(printf "%02X" "$(( 0x${charHex_cipher} ^ 0x${charHex:-00} ))" | xxd -r -p) + local encodedString+=$(printf "%02X" "$(( 0x${charHex_cipher} ^ 0x${charHex:-00} ))") done #return the string without a newline @@ -52,7 +48,7 @@ function kcpasswordEncode { } #encode password and write file -kcpasswordEncode "${PW}" > /etc/kcpassword +kcpasswordEncode "${PW}" | xxd -r -p > /etc/kcpassword #ensure ownership and permissions (600) chown root:wheel /etc/kcpassword From b1fae5fe509257684309c195c0a1d713e830e025 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 29 Mar 2022 12:49:02 +0000 Subject: [PATCH 1034/3485] Updating readme file for macOS-12 version 20220323.2 (#5276) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-12-Readme.md | 168 ++++++++++++++++---------------- 1 file changed, 83 insertions(+), 85 deletions(-) diff --git a/images/macos/macos-12-Readme.md b/images/macos/macos-12-Readme.md index d76f6eef1357..6948f29a213b 100644 --- a/images/macos/macos-12-Readme.md +++ b/images/macos/macos-12-Readme.md @@ -1,75 +1,71 @@ -| Announcements | -|-| -| [[All OSs] .NET 2.1 will be removed from the images on February, 21](https://github.com/actions/virtual-environments/issues/4871) | -*** -# macOS 12.2 info -- System Version: macOS 12.2.1 (21D62) -- Kernel Version: Darwin 21.3.0 -- Image Version: 20220220.1 +# macOS 12.3 info +- System Version: macOS 12.3 (21E230) +- Kernel Version: Darwin 21.4.0 +- Image Version: 20220323.2 ## Installed Software ### Language and Runtime -- .NET SDK 3.1.101 3.1.201 3.1.302 3.1.416 5.0.102 5.0.202 5.0.302 5.0.405 +- .NET SDK 3.1.101 3.1.201 3.1.302 3.1.417 5.0.102 5.0.202 5.0.302 5.0.406 - Bash 3.2.57(1)-release - Clang/LLVM 13.0.0 is default - Clang/LLVM 13.0.1 is available on `'$(brew --prefix llvm)/bin/clang'` - gcc-11 (Homebrew GCC 11.2.0_3) 11.2.0 - available by `gcc-11` alias - GNU Fortran (Homebrew GCC 11.2.0_3) 11.2.0 - available by `gfortran-11` alias -- Go 1.17.6 +- Go 1.17.8 - julia 1.7.2 - Kotlin 1.6.10-release-923 - MSBuild 16.10.1.58001 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) -- Node.js v16.14.0 +- Node.js v16.14.2 - NVM 0.39.1 -- NVM - Cached node versions: v12.22.10 v14.19.0 v16.14.0 +- NVM - Cached node versions: v12.22.11 v14.19.1 v16.14.2 - Perl 5.34.0 -- PHP 8.1.3 +- PHP 8.1.4 - Python 2.7.18 - Python 3.9.10 -- R 4.1.2 +- R 4.1.3 - Ruby 3.0.3p157 ### Package Management -- Bundler version 2.3.7 +- Bundler version 2.3.9 - Carthage 0.38.0 -- CocoaPods 1.11.2 -- Composer 2.2.6 -- Homebrew 3.3.15 -- NPM 8.3.1 +- CocoaPods 1.11.3 +- Composer 2.2.9 +- Homebrew 3.4.3 +- NPM 8.5.0 - NuGet 5.9.0.7134 - Pip 20.3.4 (python 2.7) - Pip 21.3.1 (python 3.9) - Pipx 1.0.0 - RubyGems 3.2.33 -- Vcpkg 2022 (build from master \<5cf60186a>) -- Yarn 1.22.17 +- Vcpkg 2022 (build from master \<ee2fa5303>) +- Yarn 1.22.18 ### Project Management - Apache Ant(TM) 1.10.12 -- Apache Maven 3.8.4 -- Gradle 7.4 +- Apache Maven 3.8.5 +- Gradle 7.4.1 - Sbt 1.6.2 ### Utilities - 7-Zip 17.04 - aria2 1.36.0 -- azcopy 10.13.0 +- azcopy 10.14.1 - bazel 5.0.0 - bazelisk 1.11.0 - bsdtar 3.5.1 - available by 'tar' alias -- Curl 7.81.0 +- Curl 7.82.0 - Git 2.35.1 - Git LFS: 3.1.2 -- GitHub CLI: 2.5.1 +- GitHub CLI: 2.6.0 - GNU Tar 1.34 - available by 'gtar' alias -- GNU Wget 1.21.2 +- GNU Wget 1.21.3 - gpg (GnuPG) 2.3.4 - Hub CLI: 2.14.2 - jq 1.6 - mongo v5.0.6 - mongod v5.0.6 -- OpenSSL 1.1.1m 14 Dec 2021 `(/usr/local/opt/openssl@1.1 -> ../Cellar/openssl@1.1/1.1.1m)` -- Packer 1.7.10 +- OpenSSL 1.1.1n 15 Mar 2022 `(/usr/local/opt/openssl@1.1 -> ../Cellar/openssl@1.1/1.1.1n)` +- Packer 1.8.0 - PostgreSQL 14.2 - psql (PostgreSQL) 14.2 - Sox 14.4.2 @@ -79,43 +75,43 @@ ### Tools - App Center CLI command -- AWS CLI 2.4.19 -- AWS SAM CLI 1.38.1 +- AWS CLI 2.4.28 +- AWS SAM CLI 1.41.0 - AWS Session Manager CLI 1.2.295.0 -- Azure CLI (azure-devops) 0.23.0 -- Azure CLI 2.33.1 +- Azure CLI (azure-devops) 0.24.0 +- Azure CLI 2.34.1 - Bicep CLI 0.4.1272 - Cabal 3.6.2.0 -- Cmake 3.22.2 -- Fastlane 2.204.3 -- GHC 9.2.1 -- GHCup 0.1.17.4 -- Jazzy 0.14.1 -- Stack 2.7.3 +- Cmake 3.22.3 +- Fastlane 2.205.0 +- GHC 9.2.2 +- GHCup v0.1.17.6 +- Jazzy 0.14.2 +- Stack 2.7.5 - Swig 4.0.2 -- Xcode Command Line Tools 13.2.0.0.1.1638488800 +- Xcode Command Line Tools 13.3.0.0.1.1645755326 ### Linters -- SwiftLint 0.46.2 +- SwiftLint 0.47.0 - yamllint 1.26.3 ### Browsers -- Safari 15.3 (17612.4.9.1.8) -- SafariDriver 15.3 (17612.4.9.1.8) -- Google Chrome 98.0.4758.102 -- ChromeDriver 98.0.4758.102 -- Microsoft Edge 98.0.1108.56 -- MSEdgeDriver 98.0.1108.56 -- Mozilla Firefox 97.0.1 +- Safari 15.4 (17613.1.17.1.6) +- SafariDriver 15.4 (17613.1.17.1.6) +- Google Chrome 99.0.4844.83 +- ChromeDriver 99.0.4844.51 +- Microsoft Edge 99.0.1150.46 +- MSEdgeDriver 99.0.1150.46 +- Mozilla Firefox 98.0.1 - geckodriver 0.30.0 - Selenium server 4.1.2 #### Environment variables -| Name | Value | -| --------------- | ---------------------------------------------- | -| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/98.0.4758.102 | -| EDGEWEBDRIVER | /usr/local/share/edge_driver | -| GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | +| Name | Value | +| --------------- | --------------------------------------------- | +| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/99.0.4844.51 | +| EDGEWEBDRIVER | /usr/local/share/edge_driver | +| GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | ### Java | Version | Vendor | Environment Variable | @@ -137,60 +133,61 @@ #### Python - 3.7.12 - 3.8.12 -- 3.9.10 -- 3.10.2 +- 3.9.11 +- 3.10.3 #### PyPy - 2.7.18 [PyPy 7.3.8] - 3.7.12 [PyPy 7.3.8] - 3.8.12 [PyPy 7.3.8] +- 3.9.10 [PyPy 7.3.8] #### Node.js -- 12.22.10 -- 14.19.0 -- 16.14.0 +- 12.22.11 +- 14.19.1 +- 16.14.2 #### Go | Version | Architecture | Environment Variable | | ------- | ------------ | -------------------- | | 1.15.15 | x64 | GOROOT_1_15_X64 | -| 1.16.14 | x64 | GOROOT_1_16_X64 | -| 1.17.7 | x64 | GOROOT_1_17_X64 | +| 1.16.15 | x64 | GOROOT_1_16_X64 | +| 1.17.8 (Default) | x64 | GOROOT_1_17_X64 | ### Rust Tools -- Cargo 1.58.0 -- Rust 1.58.1 -- Rustdoc 1.58.1 +- Cargo 1.59.0 +- Rust 1.59.0 +- Rustdoc 1.59.0 - Rustup 1.24.3 #### Packages - Bindgen 0.59.2 - Cargo-audit 0.16.0 -- Cargo-outdated v0.10.2 +- Cargo-outdated 0.11.0 - Cbindgen 0.20.0 -- Clippy 0.1.58 +- Clippy 0.1.59 - Rustfmt 1.4.38-stable ### PowerShell Tools -- PowerShell 7.2.1 +- PowerShell 7.2.2 #### PowerShell Modules | Module | Version | | ---------------- | ------- | -| Az | 7.2.1 | +| Az | 7.3.2 | | MarkdownPS | 1.9 | | Pester | 5.3.1 | | PSScriptAnalyzer | 1.20.0 | ### Web Servers -| Name | Version | ConfigFile | ServiceStatus | ListenPort | -| ----- | ------- | ------------------------------- | ------------- | ---------- | -| httpd | 2.4.52 | /usr/local/etc/httpd/httpd.conf | none | 80 | -| nginx | 1.21.6 | /usr/local/etc/nginx/nginx.conf | none | 80 | +| Name | Version | ConfigFile | ServiceStatus | ListenPort | +| ----- | -------- | ------------------------------- | ------------- | ---------- | +| httpd | 2.4.53 | /usr/local/etc/httpd/httpd.conf | none | 80 | +| nginx | 1.21.6_1 | /usr/local/etc/nginx/nginx.conf | none | 80 | ### Xamarin #### Visual Studio for Mac -- 8.10.19.2 +- 8.10.21.4 #### Xamarin bundles | symlink | Xamarin.Mono | Xamarin.iOS | Xamarin.Mac | Xamarin.Android | @@ -206,7 +203,7 @@ ### Xcode | Version | Build | Path | | ---------------- | -------- | ------------------------------ | -| 13.3 (beta) | 13E5095k | /Applications/Xcode_13.3.app | +| 13.3 | 13E113 | /Applications/Xcode_13.3.app | | 13.2.1 (default) | 13C100 | /Applications/Xcode_13.2.1.app | | 13.2 | 13C90 | /Applications/Xcode_13.2.app | | 13.1 | 13A1030d | /Applications/Xcode_13.1.app | @@ -244,17 +241,17 @@ | DriverKit 21.4 | driverkit21.4 | 13.3 | #### Installed Simulators -| OS | Xcode Version | Simulators | -| ----------- | -------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | -| iOS 15.0 | 13.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | -| iOS 15.2 | 13.2<br>13.2.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | -| iOS 15.4 | 13.3 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | -| tvOS 15.0 | 13.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | -| tvOS 15.2 | 13.2<br>13.2.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | -| tvOS 15.4 | 13.3 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | -| watchOS 8.0 | 13.1 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | -| watchOS 8.3 | 13.2<br>13.2.1 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | -| watchOS 8.5 | 13.3 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | +| OS | Xcode Version | Simulators | +| ----------- | -------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| iOS 15.0 | 13.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | +| iOS 15.2 | 13.2<br>13.2.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | +| iOS 15.4 | 13.3 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPhone SE (3rd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | +| tvOS 15.0 | 13.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | +| tvOS 15.2 | 13.2<br>13.2.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | +| tvOS 15.4 | 13.3 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | +| watchOS 8.0 | 13.1 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | +| watchOS 8.3 | 13.2<br>13.2.1 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | +| watchOS 8.5 | 13.3 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | ### Android | Package Name | Version | @@ -263,7 +260,7 @@ | Android Emulator | 31.2.8 | | Android SDK Build-tools | 32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | | Android SDK Platforms | android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | -| Android SDK Platform-Tools | 32.0.0 | +| Android SDK Platform-Tools | 33.0.1 | | Android Support Repository | 47.0.0 | | CMake | 3.18.1 | | Google Play services | 49 | @@ -287,3 +284,4 @@ - Zlib 1.2.11 + From d1a2a0f1343a1844d8691f16e050db589e275559 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Wed, 30 Mar 2022 10:29:25 +0200 Subject: [PATCH 1035/3485] [macOS] Update dotnet-install.sh download link (#5302) * [macOS] Update dotnet-install.sh download link * remove space in url --- images/macos/provision/core/dotnet.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/macos/provision/core/dotnet.sh b/images/macos/provision/core/dotnet.sh index 1dad1c91479d..c00a34607dfb 100755 --- a/images/macos/provision/core/dotnet.sh +++ b/images/macos/provision/core/dotnet.sh @@ -11,7 +11,7 @@ source ~/utils/utils.sh export DOTNET_CLI_TELEMETRY_OPTOUT=1 # Download installer from dot.net and keep it locally -DOTNET_INSTALL_SCRIPT="https://dotnet.microsoft.com/download/dotnet-core/scripts/v1/dotnet-install.sh" +DOTNET_INSTALL_SCRIPT="https://dot.net/v1/dotnet-install.sh" curl -L -o "dotnet-install.sh" "$DOTNET_INSTALL_SCRIPT" chmod +x ./dotnet-install.sh From e4da6b34996a791c410c6bbf86daf4b406b06430 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 30 Mar 2022 08:37:50 +0000 Subject: [PATCH 1036/3485] Updating readme file for macOS-11 version 20220322.1 (#5269) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-11-Readme.md | 92 ++++++++++++++++----------------- 1 file changed, 46 insertions(+), 46 deletions(-) diff --git a/images/macos/macos-11-Readme.md b/images/macos/macos-11-Readme.md index 542f8d56b2d8..714aa3c39a53 100644 --- a/images/macos/macos-11-Readme.md +++ b/images/macos/macos-11-Readme.md @@ -1,11 +1,11 @@ # macOS 11.6 info -- System Version: macOS 11.6.4 (20G417) +- System Version: macOS 11.6.5 (20G527) - Kernel Version: Darwin 20.6.0 -- Image Version: 20220307.1 +- Image Version: 20220322.1 ## Installed Software ### Language and Runtime -- .NET SDK 3.1.101 3.1.201 3.1.302 3.1.416 5.0.102 5.0.202 5.0.302 5.0.405 +- .NET SDK 3.1.101 3.1.201 3.1.302 3.1.417 5.0.102 5.0.202 5.0.302 5.0.406 - Bash 3.2.57(1)-release - Clang/LLVM 13.0.0 is default - Clang/LLVM 13.0.1 is available on `'$(brew --prefix llvm)/bin/clang'` @@ -19,31 +19,31 @@ - julia 1.7.2 - Kotlin 1.6.10-release-923 - MSBuild 16.10.1.58001 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) -- Node.js v16.14.0 +- Node.js v16.14.2 - NVM 0.39.1 -- NVM - Cached node versions: v12.22.10 v14.19.0 v16.14.0 +- NVM - Cached node versions: v12.22.11 v14.19.1 v16.14.2 - Perl 5.34.0 -- PHP 8.1.3 +- PHP 8.1.4 - Python 2.7.18 - Python 3.9.10 -- R 4.1.2 +- R 4.1.3 - Ruby 2.7.5p203 ### Package Management -- Bundler version 2.3.8 +- Bundler version 2.3.9 - Carthage 0.38.0 -- CocoaPods 1.11.2 -- Composer 2.2.7 -- Homebrew 3.4.0 +- CocoaPods 1.11.3 +- Composer 2.2.9 +- Homebrew 3.4.3 - Miniconda 4.11.0 -- NPM 8.3.1 +- NPM 8.5.0 - NuGet 5.9.0.7134 - Pip 20.3.4 (python 2.7) - Pip 21.3.1 (python 3.9) - Pipx 1.0.0 - RubyGems 3.2.33 -- Vcpkg 2022 (build from master \<c8baa4708>) -- Yarn 1.22.17 +- Vcpkg 2022 (build from master \<6065e5175>) +- Yarn 1.22.18 #### Environment variables | Name | Value | @@ -53,31 +53,31 @@ ### Project Management - Apache Ant(TM) 1.10.12 -- Apache Maven 3.8.4 -- Gradle 7.4 +- Apache Maven 3.8.5 +- Gradle 7.4.1 - Sbt 1.6.2 ### Utilities - 7-Zip 17.04 - aria2 1.36.0 -- azcopy 10.14.0 +- azcopy 10.14.1 - bazel 5.0.0 - bazelisk 1.11.0 - bsdtar 3.3.2 - available by 'tar' alias - Curl 7.82.0 - Git 2.35.1 - Git LFS: 3.1.2 -- GitHub CLI: 2.5.2 +- GitHub CLI: 2.6.0 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.3 - gpg (GnuPG) 2.3.4 -- helm v3.8.0+gd141386 +- helm v3.8.1+g5cb9af4 - Hub CLI: 2.14.2 - jq 1.6 - mongo v5.0.6 - mongod v5.0.6 - Newman 5.3.2 -- OpenSSL 1.1.1m 14 Dec 2021 `(/usr/local/opt/openssl@1.1 -> ../Cellar/openssl@1.1/1.1.1m)` +- OpenSSL 1.1.1n 15 Mar 2022 `(/usr/local/opt/openssl@1.1 -> ../Cellar/openssl@1.1/1.1.1n)` - Packer 1.8.0 - PostgreSQL 14.2 - psql (PostgreSQL) 14.2 @@ -87,37 +87,37 @@ - zstd 1.5.2 ### Tools -- Aliyun CLI 3.0.110 +- Aliyun CLI 3.0.112 - App Center CLI 2.10.8 -- AWS CLI 2.4.23 -- AWS SAM CLI 1.40.1 +- AWS CLI 2.4.27 +- AWS SAM CLI 1.41.0 - AWS Session Manager CLI 1.2.295.0 -- Azure CLI (azure-devops) 0.23.0 +- Azure CLI (azure-devops) 0.24.0 - Azure CLI 2.34.1 - Bicep CLI 0.4.1272 - Cabal 3.6.2.0 - Cmake 3.22.3 -- Fastlane 2.204.3 +- Fastlane 2.205.0 - GHC 9.2.2 -- GHCup v0.1.17.5 -- Jazzy 0.14.1 +- GHCup v0.1.17.6 +- Jazzy 0.14.2 - Stack 2.7.5 -- SwiftFormat 0.49.5 +- SwiftFormat 0.49.6 - Swig 4.0.2 - Xcode Command Line Tools 13.2.0.0.1.1638488800 ### Linters -- SwiftLint 0.46.4 +- SwiftLint 0.46.5 - yamllint 1.26.3 ### Browsers -- Safari 15.3 (16612.4.9.1.8) -- SafariDriver 15.3 (16612.4.9.1.8) -- Google Chrome 99.0.4844.51 +- Safari 15.4 (16613.1.17.1.11) +- SafariDriver 15.4 (16613.1.17.1.11) +- Google Chrome 99.0.4844.83 - ChromeDriver 99.0.4844.51 -- Microsoft Edge 98.0.1108.62 -- MSEdgeDriver 98.0.1108.62 -- Mozilla Firefox 97.0.2 +- Microsoft Edge 99.0.1150.46 +- MSEdgeDriver 99.0.1150.46 +- Mozilla Firefox 98.0.1 - geckodriver 0.30.0 - Selenium server 4.1.2 @@ -151,8 +151,8 @@ #### Python - 3.7.12 - 3.8.12 -- 3.9.10 -- 3.10.2 +- 3.9.11 +- 3.10.3 #### PyPy - 2.7.18 [PyPy 7.3.8] @@ -161,16 +161,16 @@ - 3.9.10 [PyPy 7.3.8] #### Node.js -- 12.22.10 -- 14.19.0 -- 16.14.0 +- 12.22.11 +- 14.19.1 +- 16.14.2 #### Go | Version | Architecture | Environment Variable | | ------- | ------------ | -------------------- | | 1.15.15 (Default) | x64 | GOROOT_1_15_X64 | -| 1.16.14 | x64 | GOROOT_1_16_X64 | -| 1.17.7 | x64 | GOROOT_1_17_X64 | +| 1.16.15 | x64 | GOROOT_1_16_X64 | +| 1.17.8 | x64 | GOROOT_1_17_X64 | ### Rust Tools - Cargo 1.59.0 @@ -187,7 +187,7 @@ - Rustfmt 1.4.38-stable ### PowerShell Tools -- PowerShell 7.2.1 +- PowerShell 7.2.2 #### PowerShell Modules | Module | Version | @@ -200,12 +200,12 @@ ### Web Servers | Name | Version | ConfigFile | ServiceStatus | ListenPort | | ----- | -------- | ------------------------------- | ------------- | ---------- | -| httpd | 2.4.52 | /usr/local/etc/httpd/httpd.conf | none | 80 | +| httpd | 2.4.53 | /usr/local/etc/httpd/httpd.conf | none | 80 | | nginx | 1.21.6_1 | /usr/local/etc/nginx/nginx.conf | none | 80 | ### Xamarin #### Visual Studio for Mac -- 8.10.19.2 +- 8.10.21.4 #### Xamarin bundles | symlink | Xamarin.Mono | Xamarin.iOS | Xamarin.Mac | Xamarin.Android | @@ -315,7 +315,7 @@ | Android Emulator | 31.2.8 | | Android SDK Build-tools | 32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | | Android SDK Platforms | android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | -| Android SDK Platform-Tools | 33.0.0 | +| Android SDK Platform-Tools | 33.0.1 | | Android Support Repository | 47.0.0 | | CMake | 3.10.2<br>3.18.1 | | Google Play services | 49 | From 63cd495e981b2e38aa4766940a7a7e224b9472fa Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Wed, 30 Mar 2022 12:04:17 +0200 Subject: [PATCH 1037/3485] [macOS] fix kcpassword issue for passwords exactly 11 bytes long (#5305) --- images/macos/provision/bootstrap-provisioner/kcpassword.py | 4 +++- images/macos/provision/bootstrap-provisioner/setAutoLogin.sh | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/images/macos/provision/bootstrap-provisioner/kcpassword.py b/images/macos/provision/bootstrap-provisioner/kcpassword.py index 6de2f02a2756..6ab3a51b9a8b 100755 --- a/images/macos/provision/bootstrap-provisioner/kcpassword.py +++ b/images/macos/provision/bootstrap-provisioner/kcpassword.py @@ -18,7 +18,9 @@ def kcpassword(passwd): passwd = [ord(x) for x in list(passwd)] # pad passwd length out to an even multiple of key length r = len(passwd) % key_len - if (r > 0): + if len(passwd) == 11: + passwd += [0] + elif (r > 0): passwd = passwd + [0] * (key_len - r) for n in range(0, len(passwd), len(key)): diff --git a/images/macos/provision/bootstrap-provisioner/setAutoLogin.sh b/images/macos/provision/bootstrap-provisioner/setAutoLogin.sh index bafb263cb990..d8e1b186fa4f 100644 --- a/images/macos/provision/bootstrap-provisioner/setAutoLogin.sh +++ b/images/macos/provision/bootstrap-provisioner/setAutoLogin.sh @@ -25,7 +25,9 @@ function kcpasswordEncode { #get padding by subtraction if under 11 local r=$(( ${#thisStringHex_array[@]} % 11 )) local padding=0 - if [ $r -gt 0 ]; then + if [ ${#thisStringHex_array[@]} -eq 11 ]; + local padding=1 + elif [ $r -gt 0 ]; then local padding=$(( 11 - $r )) fi From e7a6a9a375ca22e89f677db1114f06b3c0003da4 Mon Sep 17 00:00:00 2001 From: Edoardo Pirovano <6748066+edoardopirovano@users.noreply.github.com> Date: Wed, 30 Mar 2022 13:29:42 +0100 Subject: [PATCH 1038/3485] Use `v2` branch to get CodeQL bundle (#5307) --- images/win/scripts/Installers/Install-CodeQLBundle.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/win/scripts/Installers/Install-CodeQLBundle.ps1 b/images/win/scripts/Installers/Install-CodeQLBundle.ps1 index a70a12ac1539..b53f7d015f1b 100644 --- a/images/win/scripts/Installers/Install-CodeQLBundle.ps1 +++ b/images/win/scripts/Installers/Install-CodeQLBundle.ps1 @@ -4,7 +4,7 @@ ################################################################################ # Retrieve the name of the CodeQL bundle preferred by the Action (in the format codeql-bundle-YYYYMMDD). -$CodeQLBundleName = (Invoke-RestMethod "https://raw.githubusercontent.com/github/codeql-action/v1/src/defaults.json").bundleVersion +$CodeQLBundleName = (Invoke-RestMethod "https://raw.githubusercontent.com/github/codeql-action/v2/src/defaults.json").bundleVersion # Convert the bundle name to a version number (0.0.0-YYYYMMDD). $CodeQLBundleVersion = "0.0.0-" + $CodeQLBundleName.split("-")[-1] From 69e130c7049552d59df8ab61094886f05ba267e9 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Wed, 30 Mar 2022 16:03:23 +0200 Subject: [PATCH 1039/3485] [Windows] Add pip.exe alias if missing (#5308) --- images/win/scripts/Installers/Install-PyPy.ps1 | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/images/win/scripts/Installers/Install-PyPy.ps1 b/images/win/scripts/Installers/Install-PyPy.ps1 index dd7d8efb2dd7..eb31c86f4e18 100644 --- a/images/win/scripts/Installers/Install-PyPy.ps1 +++ b/images/win/scripts/Installers/Install-PyPy.ps1 @@ -52,6 +52,14 @@ function Install-PyPy cmd.exe /c "cd /d $pypyArchPath && mklink python.exe $pypyName && python.exe -m ensurepip && python.exe -m pip install --upgrade pip" } + # Create pip.exe if missing + $pipPath = Join-Path -Path $pypyArchPath -ChildPath "Scripts/pip.exe" + if (-not (Test-Path $pipPath)) + { + $pip3Path = Join-Path -Path $pypyArchPath -ChildPath "Scripts/pip3.exe" + Copy-Item -Path $pip3Path -Destination $pipPath + } + if ($LASTEXITCODE -ne 0) { Throw "Error happened during PyPy installation" From 0193114231767d568aa8fc7f7b47dbab7081b324 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Wed, 30 Mar 2022 18:22:24 +0400 Subject: [PATCH 1040/3485] Change windows-latest agentspec in the Readme (#5312) --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 02151db23250..54f663cc3706 100644 --- a/README.md +++ b/README.md @@ -14,8 +14,8 @@ For general questions about using the virtual environments or writing your Actio | Ubuntu 18.04 | `ubuntu-18.04` | [ubuntu-18.04] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu18&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu18&redirect=1) | macOS 11 | `macos-latest` or `macos-11`| [macOS-11] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-11&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-11&redirect=1) | macOS 10.15 | `macos-10.15` | [macOS-10.15] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-10.15&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-10.15&redirect=1) -| Windows Server 2022 | `windows-2022` | [windows-2022] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=windows-2022&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=windows-2022&redirect=1) | -| Windows Server 2019 | `windows-latest` or `windows-2019` | [windows-2019] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=windows-2019&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=windows-2019&redirect=1) +| Windows Server 2022 | `windows-latest` or `windows-2022` | [windows-2022] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=windows-2022&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=windows-2022&redirect=1) | +| Windows Server 2019 | `windows-2019` | [windows-2019] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=windows-2019&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=windows-2019&redirect=1) | Windows Server 2016 | `windows-2016` | [windows-2016] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=windows-2016&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=windows-2016&redirect=1) <b>Note:</b> Beta and Preview images are provided "as-is", "with all faults" and "as available" and are excluded from the service level agreement and warranty. Beta and Preview images may not be covered by customer support. From 137c29497d4b02e00551c45bc94e469bc90f12c0 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Wed, 30 Mar 2022 20:28:46 +0200 Subject: [PATCH 1041/3485] [Windows] Fix composer output version (#5313) --- images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 index 7c3d879f4f80..4960269d833b 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 @@ -158,9 +158,7 @@ function Get-CondaVersion { } function Get-ComposerVersion { - ($(composer --version)) -match "Composer version (?<version>\d+\.\d+\.\d+)" | Out-Null - $composerVersion = $Matches.Version - return "Composer $composerVersion" + composer --version | Take-Part -Part 0,1 } function Get-NugetVersion { From 52f93c6183bf951befba9dbf3e2df625f0075971 Mon Sep 17 00:00:00 2001 From: Dusko Dobranic <101048884+ddobranic@users.noreply.github.com> Date: Thu, 31 Mar 2022 08:11:08 +0200 Subject: [PATCH 1042/3485] Remove Ubuntu20 mysql workaround (#5306) * Remove Ubuntu20 mysql workaround * Removing unneded init script and related test --- .../scripts/helpers/mysql-service-helper.sh | 193 ------------------ images/linux/scripts/installers/mysql.sh | 60 +----- .../linux/scripts/tests/Databases.Tests.ps1 | 7 - 3 files changed, 7 insertions(+), 253 deletions(-) delete mode 100644 images/linux/scripts/helpers/mysql-service-helper.sh diff --git a/images/linux/scripts/helpers/mysql-service-helper.sh b/images/linux/scripts/helpers/mysql-service-helper.sh deleted file mode 100644 index 9c184a4c41cd..000000000000 --- a/images/linux/scripts/helpers/mysql-service-helper.sh +++ /dev/null @@ -1,193 +0,0 @@ -#!/bin/bash -e -# -# Temporary fix for the https://github.com/actions/virtual-environments/issues/4732 issue -# Taken from the official ubuntu:20.04 docker container -### BEGIN INIT INFO -# Provides: mysql -# Required-Start: $remote_fs $syslog -# Required-Stop: $remote_fs $syslog -# Should-Start: $network $time -# Should-Stop: $network $time -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: Start and stop the mysql database server daemon -# Description: Controls the main MySQL database server daemon "mysqld" -# and its wrapper script "mysqld_safe". -### END INIT INFO -# -set -e -set -u -${DEBIAN_SCRIPT_DEBUG:+ set -v -x} - -test -x /usr/bin/mysqld_safe || exit 0 - -. /lib/lsb/init-functions - -SELF=$(cd $(dirname $0); pwd -P)/$(basename $0) -CONF=/etc/mysql/my.cnf -MYADMIN="/usr/bin/mysqladmin --defaults-file=/etc/mysql/debian.cnf" - -# priority can be overriden and "-s" adds output to stderr -ERR_LOGGER="logger -p daemon.err -t /etc/init.d/mysql -i" - -# Safeguard (relative paths, core dumps..) -cd / -umask 077 - -# mysqladmin likes to read /root/.my.cnf. This is usually not what I want -# as many admins e.g. only store a password without a username there and -# so break my scripts. -export HOME=/etc/mysql/ - -## Fetch a particular option from mysql's invocation. -# -# Usage: void mysqld_get_param option -mysqld_get_param() { - /usr/sbin/mysqld --print-defaults \ - | tr " " "\n" \ - | grep -- "--$1" \ - | tail -n 1 \ - | cut -d= -f2 -} - -## Do some sanity checks before even trying to start mysqld. -sanity_checks() { - # check for config file - if [ ! -r /etc/mysql/my.cnf ]; then - log_warning_msg "$0: WARNING: /etc/mysql/my.cnf cannot be read. See README.Debian.gz" - echo "WARNING: /etc/mysql/my.cnf cannot be read. See README.Debian.gz" | $ERR_LOGGER - fi - - # check for diskspace shortage - datadir=`mysqld_get_param datadir` - if LC_ALL=C BLOCKSIZE= df --portability $datadir/. | tail -n 1 | awk '{ exit ($4>4096) }'; then - log_failure_msg "$0: ERROR: The partition with $datadir is too full!" - echo "ERROR: The partition with $datadir is too full!" | $ERR_LOGGER - exit 1 - fi -} - -## Checks if there is a server running and if so if it is accessible. -# -# check_alive insists on a pingable server -# check_dead also fails if there is a lost mysqld in the process list -# -# Usage: boolean mysqld_status [check_alive|check_dead] [warn|nowarn] -mysqld_status () { - ping_output=`$MYADMIN ping 2>&1`; ping_alive=$(( ! $? )) - - ps_alive=0 - pidfile=`mysqld_get_param pid-file` - if [ -f "$pidfile" ] && ps `cat $pidfile` >/dev/null 2>&1; then ps_alive=1; fi - - if [ "$1" = "check_alive" -a $ping_alive = 1 ] || - [ "$1" = "check_dead" -a $ping_alive = 0 -a $ps_alive = 0 ]; then - return 0 # EXIT_SUCCESS - else - if [ "$2" = "warn" ]; then - echo -e "$ps_alive processes alive and '$MYADMIN ping' resulted in\n$ping_output\n" | $ERR_LOGGER -p daemon.debug - fi - return 1 # EXIT_FAILURE - fi -} - -# -# main() -# - -case "${1:-''}" in - 'start') - sanity_checks; - # Start daemon - log_daemon_msg "Starting MySQL database server" "mysqld" - if mysqld_status check_alive nowarn; then - log_progress_msg "already running" - log_end_msg 0 - else - # Could be removed during boot - test -e /var/run/mysqld || install -m 755 -o mysql -g root -d /var/run/mysqld - - # Start MySQL! - su - mysql -s /bin/sh -c "/usr/bin/mysqld_safe > /dev/null 2>&1 &" - - # 6s was reported in #352070 to be too few when using ndbcluster - # 14s was reported in #736452 to be too few with large installs - for i in $(seq 1 30); do - sleep 1 - if mysqld_status check_alive nowarn ; then break; fi - log_progress_msg "." - done - if mysqld_status check_alive warn; then - log_end_msg 0 - # Now start mysqlcheck or whatever the admin wants. - output=$(/etc/mysql/debian-start) - [ -n "$output" ] && log_action_msg "$output" - else - log_end_msg 1 - log_failure_msg "Please take a look at the syslog" - fi - fi - ;; - - 'stop') - # * As a passwordless mysqladmin (e.g. via ~/.my.cnf) must be possible - # at least for cron, we can rely on it here, too. (although we have - # to specify it explicit as e.g. sudo environments points to the normal - # users home and not /root) - log_daemon_msg "Stopping MySQL database server" "mysqld" - if ! mysqld_status check_dead nowarn; then - set +e - shutdown_out=`$MYADMIN shutdown 2>&1`; r=$? - set -e - if [ "$r" -ne 0 ]; then - log_end_msg 1 - [ "$VERBOSE" != "no" ] && log_failure_msg "Error: $shutdown_out" - log_daemon_msg "Killing MySQL database server by signal" "mysqld" - killall -15 mysqld - server_down= - for i in 1 2 3 4 5 6 7 8 9 10; do - sleep 1 - if mysqld_status check_dead nowarn; then server_down=1; break; fi - done - if test -z "$server_down"; then killall -9 mysqld; fi - fi - fi - - if ! mysqld_status check_dead warn; then - log_end_msg 1 - log_failure_msg "Please stop MySQL manually and read /usr/share/doc/mysql-server-5.7/README.Debian.gz!" - exit -1 - else - log_end_msg 0 - fi - ;; - - 'restart') - set +e; $SELF stop; set -e - $SELF start - ;; - - 'reload'|'force-reload') - log_daemon_msg "Reloading MySQL database server" "mysqld" - $MYADMIN reload - log_end_msg 0 - ;; - - 'status') - if mysqld_status check_alive nowarn; then - log_action_msg "$($MYADMIN version)" - else - log_action_msg "MySQL is stopped." - exit 3 - fi - ;; - - *) - echo "Usage: $SELF start|stop|restart|reload|force-reload|status" - exit 1 - ;; -esac - -# Some success paths end up returning non-zero so exit 0 explicitly. See -# bug #739846. -exit 0 diff --git a/images/linux/scripts/installers/mysql.sh b/images/linux/scripts/installers/mysql.sh index ebe57cd6d64c..893915118d0d 100644 --- a/images/linux/scripts/installers/mysql.sh +++ b/images/linux/scripts/installers/mysql.sh @@ -12,62 +12,16 @@ MYSQL_ROOT_PASSWORD=root echo "mysql-server mysql-server/root_password password $MYSQL_ROOT_PASSWORD" | debconf-set-selections echo "mysql-server mysql-server/root_password_again password $MYSQL_ROOT_PASSWORD" | debconf-set-selections -# Ubuntu's repo now contains 8.0.28 which is buggy, -# see https://bugs.mysql.com/bug.php?id=105288 +export ACCEPT_EULA=Y -if isUbuntu20 ; then - mkdir -p /tmp/mysql - pushd /tmp +# Install MySQL Client +apt-get install mysql-client -y - # Mandatory dependency - apt-get install -y libmecab2 libaio1 +# Install MySQL Server +apt-get install -y mysql-server - wget -q https://downloads.mysql.com/archives/get/p/23/file/mysql-server_8.0.26-1ubuntu${VERSION_ID}_amd64.deb-bundle.tar - tar -xf mysql-server_8.0.26-1ubuntu${VERSION_ID}_amd64.deb-bundle.tar -C /tmp/mysql - - pushd mysql - - # Remove debs with debug info - rm mysql-community-*debug*.deb - - mysql_debs=( - mysql-common* - mysql-community-client-plugins* - mysql-community-client-core* - mysql-community-client* - mysql-client* - mysql-community-server-core* - mysql-community-server* - mysql-server* - libmysqlclient21* - libmysqlclient-dev* - ) - - for package in ${mysql_debs[@]}; do - dpkg -i $package - done - - # Install the /etc/init.d/mysql script for backward compatibility with sysVinit - cp $HELPER_SCRIPTS/mysql-service-helper.sh /etc/init.d/mysql - # Fix permission - chmod 755 /etc/init.d/mysql - - # Start mysql to change its settings - systemctl start mysql.service - # Enable mysql log-in without sudo by activation of the mysql_native_password plugin - mysql -s -N -h localhost -uroot -proot -e "ALTER USER 'root'@'localhost' IDENTIFIED WITH mysql_native_password BY 'root'; FLUSH PRIVILEGES;" -else - export ACCEPT_EULA=Y - - # Install MySQL Client - apt-get install mysql-client -y - - # Install MySQL Server - apt-get install -y mysql-server - - #Install MySQL Dev tools - apt install libmysqlclient-dev -y -fi +#Install MySQL Dev tools +apt install libmysqlclient-dev -y # Disable mysql.service systemctl is-active --quiet mysql.service && systemctl stop mysql.service diff --git a/images/linux/scripts/tests/Databases.Tests.ps1 b/images/linux/scripts/tests/Databases.Tests.ps1 index 4b004963a265..1108a0ed432f 100644 --- a/images/linux/scripts/tests/Databases.Tests.ps1 +++ b/images/linux/scripts/tests/Databases.Tests.ps1 @@ -36,11 +36,4 @@ Describe "MySQL" { "sudo mysql -vvv -e 'DROP DATABASE smoke_test' -uroot -proot" | Should -ReturnZeroExitCode "sudo systemctl stop mysql" | Should -ReturnZeroExitCode } - - It "MySQL sysVinit script works" { - sudo /etc/init.d/mysql start | Out-Null - systemctl is-active mysql | Should -Be "active" - sudo /etc/init.d/mysql stop | Out-Null - systemctl is-active mysql | Should -Be "inactive" - } } From d3de894568d2662083e3515b884c86e9326ea255 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Thu, 31 Mar 2022 17:51:18 +0400 Subject: [PATCH 1043/3485] Install latest 8.0.* version for windows 2022 (#5318) --- images/win/toolsets/toolset-2022.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index bc02df030a1b..dcb609269eaf 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -331,7 +331,7 @@ "default": "16" }, "mysql": { - "version": "8.0.26" + "version": "8.0" }, "mongodb": { "version": "5.0" From a5d2e20fbcdd1783546d8b032a7918eed6642129 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Fri, 1 Apr 2022 10:06:09 +0200 Subject: [PATCH 1044/3485] [macOS] Software Updates 2022 Week 14 (#5327) --- images/macos/toolsets/toolset-11.json | 11 +++++++++-- images/macos/toolsets/toolset-12.json | 15 +++++++++++---- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index 13dbba39aa73..b2e83641b7e6 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -17,16 +17,23 @@ "6.12.0.162" ], "ios-versions": [ - "15.6.0.3", "15.4.0.0", "15.2.0.17", "15.0.0.6", "14.20.0.24", "14.16.0.5", "14.14.2.5", "14.10.0.4", "14.8.0.3", "14.6.0.15", "14.4.1.3", "14.2.0.12", "14.0.0.0", "13.20.2.2" + "15.8.0.0", "15.6.0.3", "15.4.0.0", "15.2.0.17", "15.0.0.6", "14.20.0.24", "14.16.0.5", "14.14.2.5", "14.10.0.4", "14.8.0.3", "14.6.0.15", "14.4.1.3", "14.2.0.12", "14.0.0.0", "13.20.2.2" ], "mac-versions": [ - "8.6.0.3", "8.4.0.0", "8.2.0.17", "7.14.0.27", "7.10.0.5", "7.8.2.5", "7.4.0.10", "7.2.0.3", "7.0.0.15", "6.22.1.26", "6.20.2.2" + "8.8.0.0", "8.6.0.3", "8.4.0.0", "8.2.0.17", "7.14.0.27", "7.10.0.5", "7.8.2.5", "7.4.0.10", "7.2.0.3", "7.0.0.15", "6.22.1.26", "6.20.2.2" ], "android-versions": [ "12.0.0.3", "11.3.0.4", "11.2.2.1", "11.1.0.26", "11.0.2.0" ], "bundle-default": "6_12_12", "bundles": [ + { + "symlink": "6_12_14", + "mono":"6.12", + "ios": "15.8", + "mac": "8.8", + "android": "12.0" + }, { "symlink": "6_12_13", "mono":"6.12", diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index b38a523573bc..558ed471fa9a 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -1,6 +1,6 @@ { "xcode": { - "default": "13.2.1", + "default": "13.3", "versions": [ { "link": "13.3", "version": "13.3.0" }, { "link": "13.2.1", "version": "13.2.1" }, @@ -14,16 +14,23 @@ "6.12.0.162" ], "ios-versions": [ - "15.6.0.3", "15.4.0.0", "15.2.0.17", "15.0.0.6" + "15.8.0.0", "15.6.0.3", "15.4.0.0", "15.2.0.17", "15.0.0.6" ], "mac-versions": [ - "8.6.0.3", "8.4.0.0", "8.2.0.17", "7.14.0.27" + "8.8.0.0", "8.6.0.3", "8.4.0.0", "8.2.0.17", "7.14.0.27" ], "android-versions": [ "12.0.0.3", "11.3.0.4" ], - "bundle-default": "6_12_12", + "bundle-default": "6_12_14", "bundles": [ + { + "symlink": "6_12_14", + "mono":"6.12", + "ios": "15.8", + "mac": "8.8", + "android": "12.0" + }, { "symlink": "6_12_13", "mono":"6.12", From f052b4c10f773abe3279853fbeacceb0b2355e70 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Fri, 1 Apr 2022 10:18:38 +0200 Subject: [PATCH 1045/3485] [Ubuntu] Tight composer version to 2.2.9 for Ubuntu Server 18 (#5321) * [Ubuntu] Tight composer verstion to 2.2.9 for Ubuntu Server 18 * Remove extra line * remove double quotes --- .../scripts/SoftwareReport/SoftwareReport.Common.psm1 | 10 ++++++++-- images/linux/scripts/installers/php.sh | 7 ++++++- images/linux/scripts/tests/Common.Tests.ps1 | 4 ++++ 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 index c97a23c54612..6a17b9c8dc1a 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 @@ -236,8 +236,14 @@ function Get-PHPVersions { } function Get-ComposerVersion { - $(composer --version) -match "Composer version (?<version>\d+\.\d+\.\d+)\s" | Out-Null - return $Matches.version + $rawVersion = composer --version + if (Test-IsUbuntu18) { + $rawVersion -match "Composer version (?<version>\d+\.\d+\.\d+)\s" | Out-Null + $composerVersion = $Matches.version + } else { + $composerVersion = $rawVersion | Take-OutputPart -Part 1 + } + return $composerVersion } function Get-PHPUnitVersion { diff --git a/images/linux/scripts/installers/php.sh b/images/linux/scripts/installers/php.sh index c11eb620dd1b..01aebd79b7e3 100644 --- a/images/linux/scripts/installers/php.sh +++ b/images/linux/scripts/installers/php.sh @@ -96,7 +96,12 @@ apt-get install -y --no-install-recommends snmp # Install composer php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" php -r "if (hash_file('sha384', 'composer-setup.php') === file_get_contents('https://composer.github.io/installer.sig')) { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" -php composer-setup.php +# Composer 2.3 increased the required PHP version to >=7.2.5 and thus stop supporting PHP 5.3.2 - 7.2.4 +if isUbuntu18; then + php composer-setup.php --version=2.2.9 +else + php composer-setup.php +fi sudo mv composer.phar /usr/bin/composer php -r "unlink('composer-setup.php');" diff --git a/images/linux/scripts/tests/Common.Tests.ps1 b/images/linux/scripts/tests/Common.Tests.ps1 index ccd1efd0452d..783e122d4554 100644 --- a/images/linux/scripts/tests/Common.Tests.ps1 +++ b/images/linux/scripts/tests/Common.Tests.ps1 @@ -20,6 +20,10 @@ Describe "PHP" { "composer --version" | Should -ReturnZeroExitCode } + It "Composer 2.2.9 on Ubuntu Server 18" -Skip:(-not (Test-IsUbuntu18)) { + composer --version | Should -Match "2.2.9" + } + It "Pear" { "pear" | Should -ReturnZeroExitCode } From 062b07565eb02cabb896a440c06af76fd99b9430 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Fri, 1 Apr 2022 12:19:04 +0400 Subject: [PATCH 1046/3485] Add macOS-12, remove win-16 in the issue templates (#5329) --- .github/ISSUE_TEMPLATE/announcement.yml | 2 +- .github/ISSUE_TEMPLATE/bug-report.yml | 2 +- .github/ISSUE_TEMPLATE/tool-request.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/announcement.yml b/.github/ISSUE_TEMPLATE/announcement.yml index ba4b53b87537..28632ddd1c4f 100644 --- a/.github/ISSUE_TEMPLATE/announcement.yml +++ b/.github/ISSUE_TEMPLATE/announcement.yml @@ -34,7 +34,7 @@ body: - label: Ubuntu 20.04 - label: macOS 10.15 - label: macOS 11 - - label: Windows Server 2016 + - label: macOS 12 - label: Windows Server 2019 - label: Windows Server 2022 validations: diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml index be9e46b67bc3..0ca377fdca02 100644 --- a/.github/ISSUE_TEMPLATE/bug-report.yml +++ b/.github/ISSUE_TEMPLATE/bug-report.yml @@ -16,7 +16,7 @@ body: - label: Ubuntu 20.04 - label: macOS 10.15 - label: macOS 11 - - label: Windows Server 2016 + - label: macOS 12 - label: Windows Server 2019 - label: Windows Server 2022 validations: diff --git a/.github/ISSUE_TEMPLATE/tool-request.yml b/.github/ISSUE_TEMPLATE/tool-request.yml index 9c2a86d5f3be..af2e04785460 100644 --- a/.github/ISSUE_TEMPLATE/tool-request.yml +++ b/.github/ISSUE_TEMPLATE/tool-request.yml @@ -55,7 +55,7 @@ body: - label: Ubuntu 20.04 - label: macOS 10.15 - label: macOS 11 - - label: Windows Server 2016 + - label: macOS 12 - label: Windows Server 2019 - label: Windows Server 2022 validations: From 710d5de922d30d49f416b679f3f2ff1a95f54613 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Mon, 4 Apr 2022 11:26:27 +0200 Subject: [PATCH 1047/3485] [Ubuntu] Fix composer version (#5335) --- .../scripts/SoftwareReport/SoftwareReport.Common.psm1 | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 index 6a17b9c8dc1a..7dd80a97d886 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 @@ -236,13 +236,7 @@ function Get-PHPVersions { } function Get-ComposerVersion { - $rawVersion = composer --version - if (Test-IsUbuntu18) { - $rawVersion -match "Composer version (?<version>\d+\.\d+\.\d+)\s" | Out-Null - $composerVersion = $Matches.version - } else { - $composerVersion = $rawVersion | Take-OutputPart -Part 1 - } + $composerVersion = (composer --version) -replace " version" | Take-OutputPart -Part 1 return $composerVersion } From 2f36af5003d5ac789222709f22d0b935759f6613 Mon Sep 17 00:00:00 2001 From: Martin G <martin.gemme@outlook.com> Date: Mon, 4 Apr 2022 05:29:17 -0400 Subject: [PATCH 1048/3485] Fixed Composer "empty" version (#5334) Although https://github.com/martingem/virtual-environments/commit/137c29497d4b02e00551c45bc94e469bc90f12c0 fixed the previous issue, they've done something: https://github.com/composer/composer/commit/03b7882ac231d19e9373ed33a8e71d7bb5b280c1 Returns "Composer 2.3.3" as expected. --- images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 index 4960269d833b..a4379c0b5c41 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 @@ -158,7 +158,7 @@ function Get-CondaVersion { } function Get-ComposerVersion { - composer --version | Take-Part -Part 0,1 + composer --version | Take-Part -Part 0,2 } function Get-NugetVersion { From 8863b25212b3dbe2ed5065479fa591457d13757b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 4 Apr 2022 09:33:51 +0000 Subject: [PATCH 1049/3485] Updating readme file for ubuntu18 version 20220330.0 (#5315) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu1804-Readme.md | 140 +++++++++++++++--------------- 1 file changed, 72 insertions(+), 68 deletions(-) diff --git a/images/linux/Ubuntu1804-Readme.md b/images/linux/Ubuntu1804-Readme.md index 326a08d19dda..9a2b7798c1a1 100644 --- a/images/linux/Ubuntu1804-Readme.md +++ b/images/linux/Ubuntu1804-Readme.md @@ -1,17 +1,18 @@ | Announcements | |-| +| [[All OSs] Go versions less than 1.16 will be removed on April, 11](https://github.com/actions/virtual-environments/issues/5280) | | [[Ubuntu] Issue with libstdc++ cannot allocate memory in static TLS block](https://github.com/actions/virtual-environments/issues/4799) | *** # Ubuntu 18.04.6 LTS -- Linux kernel version: 5.4.0-1072-azure -- Image Version: 20220316.1 +- Linux kernel version: 5.4.0-1073-azure +- Image Version: 20220330.0 ## Installed Software ### Language and Runtime - Bash 4.4.20(1)-release - Clang 9.0.0 - Clang-format 9.0.0 -- Erlang 24.2.1 (Eshell 12.2.1) +- Erlang 24.3.2 (Eshell 12.3) - Erlang rebar3 3.18.0 - GNU C++ 7.5.0, 9.4.0, 10.3.0 - GNU Fortran 7.5.0, 9.4.0, 10.3.0 @@ -19,7 +20,7 @@ - Kotlin 1.6.10-release-923 - Mono 6.12.0.122 (apt source repository: https://download.mono-project.com/repo/ubuntu stable-bionic main) - MSBuild 16.6.0.15201 (from /usr/lib/mono/msbuild/15.0/bin/MSBuild.dll) -- Node 16.14.1 +- Node 16.14.2 - Perl 5.26.1 - Python 2.7.17 - Python3 3.6.9 @@ -29,15 +30,15 @@ ### Package Management - cpan 1.64 - Helm 3.8.1 -- Homebrew 3.4.2 +- Homebrew 3.4.4 - Miniconda 4.11.0 - Npm 8.5.0 - Pip 9.0.1 - Pip3 9.0.1 - Pipx 1.0.0 - RubyGems 2.7.6 -- Vcpkg (build from master \<8522c65ea>) -- Yarn 1.22.17 +- Vcpkg (build from master \<4f778cf09>) +- Yarn 1.22.18 #### Environment variables | Name | Value | @@ -52,66 +53,66 @@ - Sbt 1.6.2 ### Tools -- Ansible 2.11.9 +- Ansible 2.11.10 - apt-fast 1.9.12 - AzCopy 10.14.1 (available by `azcopy` and `azcopy10` aliases) -- Bazel 5.0.0 +- Bazel 5.1.0 - Bazelisk 1.11.0 - Bicep 0.4.1318 - Buildah 1.19.6 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- CMake 3.22.3 +- CMake 3.23.0 - CodeQL Action Bundle 2.8.3 - Docker Compose v1 1.29.2 - Docker Compose v2 2.2.3+azure-1 -- Docker-Buildx 0.7.1 -- Docker-Moby Client 20.10.11+azure-3 -- Docker-Moby Server 20.10.11+azure-3 +- Docker-Buildx 0.8.1 +- Docker-Moby Client 20.10.14+azure-1 +- Docker-Moby Server 20.10.14+azure-1 - Git 2.35.1 (apt source repository: ppa:git-core/ppa) - Git LFS 3.1.2 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.3.1 - Haveged 1.9.1 - Heroku 7.59.4 -- HHVM (HipHop VM) 4.153.0 +- HHVM (HipHop VM) 4.154.1 - jq 1.5 - Kind 0.12.0 -- Kubectl 1.23.4 -- Kustomize 4.5.2 +- Kubectl 1.23.5 +- Kustomize 4.5.4 - Leiningen 2.9.8 - MediaInfo 17.12 - Mercurial 4.5.3 - Minikube 1.25.2 -- n 8.0.2 +- n 8.1.0 - Newman 5.3.2 - nvm 0.39.1 - OpenSSL 1.1.1 11 Sep 2018 - Packer 1.8.0 -- Parcel 2.3.2 +- Parcel 2.4.0 - PhantomJS 2.1.1 - Podman 3.0.1 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- Pulumi 3.26.1 -- R 4.1.2 +- Pulumi 3.27.0 +- R 4.1.3 - Skopeo 1.2.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 - SVN 1.9.7 - Terraform 1.1.7 - yamllint 1.26.3 -- yq 4.22.1 +- yq 4.24.2 - zstd 1.5.2 (homebrew) ### CLI Tools -- Alibaba Cloud CLI 3.0.112 -- AWS CLI 1.22.76 +- Alibaba Cloud CLI 3.0.114 +- AWS CLI 1.22.84 - AWS CLI Session manager plugin 1.2.295.0 -- AWS SAM CLI 1.40.1 +- AWS SAM CLI 1.43.0 - Azure CLI (azure-cli) 2.34.1 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) -- Azure CLI (azure-devops) 0.23.0 +- Azure CLI (azure-devops) 0.25.0 - GitHub CLI 2.6.0 - Google Cloud SDK 369.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 9.13.2 -- OpenShift CLI 4.10.4 +- Netlify CLI 9.13.6 +- OpenShift CLI 4.10.6 - ORAS CLI 0.12.0 -- Vercel CLI 24.0.0 +- Vercel CLI 24.0.1 ### Java | Version | Vendor | Environment Variable | @@ -124,8 +125,8 @@ ### PHP | Tool | Version | | -------- | ---------------------------------------- | -| PHP | 7.1.33 7.2.34 7.3.33 7.4.28 8.0.16 8.1.3 | -| Composer | 2.2.9 | +| PHP | 7.1.33 7.2.34 7.3.33 7.4.28 8.0.17 8.1.3 | +| Composer | 2.2.10 | | PHPUnit | 8.5.25 | ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. @@ -133,7 +134,7 @@ ### Haskell - Cabal 3.6.2.0 - GHC 9.2.2 -- GHCup 0.1.17.5 +- GHCup 0.1.17.6 - Stack 2.7.5 ### Rust Tools @@ -147,15 +148,15 @@ - Cargo audit 0.16.0 - Cargo clippy 0.1.59 - Cargo outdated -- Cbindgen 0.20.0 +- Cbindgen 0.21.0 - Rustfmt 1.4.38 ### Browsers and Drivers -- Google Chrome 99.0.4844.74 -- ChromeDriver 99.0.4844.51 -- Mozilla Firefox 98.0 +- Google Chrome 100.0.4896.60 +- ChromeDriver 100.0.4896.60 +- Mozilla Firefox 98.0.2 - Geckodriver 0.30.0 -- Chromium 99.0.4844.0 +- Chromium 100.0.4896.0 - Selenium server 4.1.0 #### Environment variables @@ -198,24 +199,25 @@ - 1.15.15 - 1.16.15 - 1.17.8 +- 1.18.0 #### Node.js -- 12.22.10 -- 14.19.0 -- 16.14.0 +- 12.22.11 +- 14.19.1 +- 16.14.2 #### PyPy -- 2.7.18 [PyPy 7.3.8] +- 2.7.18 [PyPy 7.3.9] - 3.6.12 [PyPy 7.3.3] -- 3.9.10 [PyPy 7.3.8] +- 3.9.12 [PyPy 7.3.9] #### Python - 2.7.18 - 3.6.15 - 3.7.12 - 3.8.12 -- 3.9.10 -- 3.10.2 +- 3.9.12 +- 3.10.4 #### Ruby - 2.4.10 @@ -230,15 +232,17 @@ | GOROOT_1_15_X64 | /opt/hostedtoolcache/go/1.15.15/x64 | x64 | | GOROOT_1_16_X64 | /opt/hostedtoolcache/go/1.16.15/x64 | x64 | | GOROOT_1_17_X64 | /opt/hostedtoolcache/go/1.17.8/x64 | x64 | +| GOROOT_1_18_X64 | /opt/hostedtoolcache/go/1.18.0/x64 | x64 | ### PowerShell Tools - PowerShell 7.2.2 #### PowerShell Modules -| Module | Version | -| ---------- | ------- | -| MarkdownPS | 1.9 | -| Pester | 5.3.1 | +| Module | Version | +| --------------- | ------- | +| MarkdownPS | 1.9 | +| Microsoft.Graph | 1.9.3 | +| Pester | 5.3.1 | #### Az PowerShell Modules - 7.1.0 3.1.0.zip 4.4.0.zip 5.9.0.zip 6.6.0.zip @@ -253,9 +257,9 @@ | Package Name | Version | | -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 4.0 | -| Android Emulator | 31.2.8 | +| Android Emulator | 31.2.9 | | Android SDK Build-tools | 32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3<br>26.0.0 26.0.1 26.0.2 26.0.3<br>25.0.0 25.0.1 25.0.2 25.0.3<br>24.0.0 24.0.1 24.0.2 24.0.3<br>23.0.1 23.0.2 23.0.3 | -| Android SDK Platform-Tools | 33.0.0 | +| Android SDK Platform-Tools | 33.0.1 | | Android SDK Platforms | android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3)<br>android-26 (rev 2)<br>android-25 (rev 3)<br>android-24 (rev 2)<br>android-23 (rev 3) | | Android SDK Tools | 26.1.1 | | Android Support Repository | 47.0.0 | @@ -278,25 +282,25 @@ ### Cached Docker images | Repository:Tag | Digest | Created | | ----------------------- | ------------------------------------------------------------------------ | ---------- | -| alpine:3.12 | sha256:d9459083f962de6bd980ae6a05be2a4cf670df6a1d898157bceb420342bec280 | 2021-11-12 | -| alpine:3.13 | sha256:026f721af4cf2843e07bba648e158fb35ecc876d822130633cc49f707f0fc88c | 2021-11-12 | -| alpine:3.14 | sha256:635f0aa53d99017b38d1a0aa5b2082f7812b03e3cdb299103fe77b5c8a07f1d2 | 2021-11-12 | -| buildpack-deps:bullseye | sha256:b0410921e9d888bd213492157e876988dfd2c4fe2724d63a2f6120381ac1881c | 2022-03-01 | -| buildpack-deps:buster | sha256:4b80c38e9bef63839e3d36de8419fb46e126b7b19b8f45b7b2cade51d193465e | 2022-03-01 | -| buildpack-deps:stretch | sha256:bf54440111c18564fd89db7f98a0c09b14af25a699d72e19752ab7ca6933a34f | 2022-03-01 | -| debian:10 | sha256:fd510d85d7e0691ca551fe08e8a2516a86c7f24601a940a299b5fe5cdd22c03a | 2022-03-01 | -| debian:11 | sha256:10b622c6cf6daa0a295be74c0e412ed20e10f91ae4c6f3ce6ff0c9c04f77cbf6 | 2022-03-01 | -| debian:9 | sha256:54f2c31487af733ad08e62af6a77ccddcbc8895857edc54768ba0020991950f9 | 2022-03-01 | +| alpine:3.12 | sha256:e42c1b8e03bdaa471deb198d981b52ac421441975195a20004aea624890f8b1c | 2022-03-29 | +| alpine:3.13 | sha256:6b6249407a7901591e094262327b79de21f2bfb9f597866f0a2bbb3b3d98e00c | 2022-03-29 | +| alpine:3.14 | sha256:85c63ff404e9b4daf18f264447161b50ffa70047cc4c03381478cf2c6edfa9da | 2022-03-29 | +| buildpack-deps:bullseye | sha256:95d2b7161b408f8b6941489d1000fc6348d6d358eb71c31fdf835575a5c120e9 | 2022-03-29 | +| buildpack-deps:buster | sha256:985480f24616ea7e388136cc5f1412c2ffba5e6cf38bd647859ad63f3d8ac16a | 2022-03-29 | +| buildpack-deps:stretch | sha256:b4087d6c971248c3eb86ee7f06b71b3cd20c7b721807dc1ebe83ba7dce76c500 | 2022-03-29 | +| debian:10 | sha256:1b236b48c1ef66fa08535a5153266f4959bf58f948db3e68f7d678b651d8e33a | 2022-03-29 | +| debian:11 | sha256:87eefc7c15610cca61db5c0fd280911c6a737c0680d807432c0bd80cd0cca39b | 2022-03-29 | +| debian:9 | sha256:a8cc1744bbdd5266678e3e8b3e6387e45c053218438897e86876f2eb104e5534 | 2022-03-29 | | moby/buildkit:latest | sha256:c2aeafaed434edfde90706b5cf9a56935c389192858d1090e17a1440a6e96482 | 2022-03-09 | -| node:12 | sha256:cc4adb82efc04b74b9f96326e682ad04be2df84d23e40609802eb6d6c207abde | 2022-03-02 | -| node:12-alpine | sha256:dfa564312367b1a8fca8db7ae4bae102b28e68b39ebcb7b17022c938f105846b | 2022-02-04 | -| node:14 | sha256:d3f3c5105b1defedbdd7a8c6a4184d11e65f246d0dfd798e6f0fabc4b5326d46 | 2022-03-02 | -| node:14-alpine | sha256:9a2aa545388a135b496bd55cef2be920b96c4526c99c140170e05a8de3fce653 | 2022-02-02 | -| node:16 | sha256:61b6cc81ecc3f94f614dca6bfdc5262d15a6618f7aabfbfc6f9f05c935ee753c | 2022-03-02 | -| node:16-alpine | sha256:2c6c59cf4d34d4f937ddfcf33bab9d8bbad8658d1b9de7b97622566a52167f2b | 2022-02-09 | +| node:12 | sha256:e88281f7b3947019c8b5fe750a06122ac3c2612fe00719a133ea5bf8bfedafbb | 2022-03-18 | +| node:12-alpine | sha256:41a1b6dd829a9a1b3da8817809c3ddf5e97c8bc66cbc84363f697e31c0adab4b | 2022-03-29 | +| node:14 | sha256:7d38b5ed42b2ac006c3a79ef8ad9f1e912bde6cb4cb4243c188689d5aa1aa437 | 2022-03-18 | +| node:14-alpine | sha256:d9e58586730f7eb7c885f515f703f4a88e4a3ad8bf982aa5bb4ab6a1111aed79 | 2022-03-29 | +| node:16 | sha256:68e34cfcd8276ad531b12b3454af5c24cd028752dfccacce4e19efef6f7cdbe0 | 2022-03-18 | +| node:16-alpine | sha256:51542061b77f105c2db658035ac6070229f9ea1d3270ab78775df9a825d9a759 | 2022-03-29 | | ubuntu:16.04 | sha256:0f71fa8d4d2d4292c3c617fda2b36f6dabe5c8b6e34c3dc5b0d17d4e704bd39c | 2021-08-31 | -| ubuntu:18.04 | sha256:42cd9143b6060261187a72716906187294b8b66653b50d70bc7a90ccade5c984 | 2022-03-03 | -| ubuntu:20.04 | sha256:8ae9bafbb64f63a50caab98fd3a5e37b3eb837a3e0780b78e5218e63193961f9 | 2022-03-03 | +| ubuntu:18.04 | sha256:d8ac28b7bec51664c6b71a9dd1d8f788127ff310b8af30820560973bcfc605a0 | 2022-03-18 | +| ubuntu:20.04 | sha256:bea6d19168bbfd6af8d77c2cc3c572114eb5d113e6f422573c93cb605a0e2ffb | 2022-03-18 | ### Installed apt packages | Name | Version | @@ -310,7 +314,7 @@ | coreutils | 8.28-1ubuntu1 | | curl | 7.58.0-2ubuntu3.16 | | dbus | 1.12.2-1ubuntu1.2 | -| dnsutils | 1:9.11.3+dfsg-1ubuntu1.16 | +| dnsutils | 1:9.11.3+dfsg-1ubuntu1.17 | | dpkg | 1.19.0.5ubuntu2.3 | | fakeroot | 1.22-2ubuntu1 | | file | 1:5.32-2ubuntu0.4 | @@ -367,7 +371,7 @@ | texinfo | 6.5.0.dfsg.1-2 | | time | 1.7-25.1build1 | | tk | 8.6.0+9 | -| tzdata | 2021e-0ubuntu0.18.04 | +| tzdata | 2022a-0ubuntu0.18.04 | | unzip | 6.0-21ubuntu1.1 | | upx | 3.94-4 | | wget | 1.19.4-1ubuntu2.2 | From 1ede8085f53bf7b38163389282bed3b8173b4d62 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 4 Apr 2022 09:43:46 +0000 Subject: [PATCH 1050/3485] Updating readme file for ubuntu20 version 20220330.0 (#5314) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2004-Readme.md | 226 +++++++++++++++--------------- 1 file changed, 115 insertions(+), 111 deletions(-) diff --git a/images/linux/Ubuntu2004-Readme.md b/images/linux/Ubuntu2004-Readme.md index adb9038eedd6..c236f7244d22 100644 --- a/images/linux/Ubuntu2004-Readme.md +++ b/images/linux/Ubuntu2004-Readme.md @@ -1,44 +1,44 @@ | Announcements | |-| -| [[All OSs] .NET 2.1 will be removed from the images on February, 21](https://github.com/actions/virtual-environments/issues/4871) | +| [[All OSs] Go versions less than 1.16 will be removed on April, 11](https://github.com/actions/virtual-environments/issues/5280) | | [[Ubuntu] Issue with libstdc++ cannot allocate memory in static TLS block](https://github.com/actions/virtual-environments/issues/4799) | *** -# Ubuntu 20.04.3 LTS -- Linux kernel version: 5.11.0-1028-azure -- Image Version: 20220220.1 +# Ubuntu 20.04.4 LTS +- Linux kernel version: 5.13.0-1017-azure +- Image Version: 20220330.0 ## Installed Software ### Language and Runtime - Bash 5.0.17(1)-release - Clang 10.0.0, 11.0.0, 12.0.0 - Clang-format 10.0.0, 11.0.0, 12.0.0 -- Erlang 24.2.1 (Eshell 12.2.1) +- Erlang 24.3.2 (Eshell 12.3) - Erlang rebar3 3.18.0 -- GNU C++ 9.3.0, 10.3.0 -- GNU Fortran 9.3.0, 10.3.0 +- GNU C++ 9.4.0, 10.3.0 +- GNU Fortran 9.4.0, 10.3.0 - Julia 1.7.2 - Kotlin 1.6.10-release-923 - Mono 6.12.0.122 (apt source repository: https://download.mono-project.com/repo/ubuntu stable-focal main) - MSBuild 16.6.0.15201 (from /usr/lib/mono/msbuild/15.0/bin/MSBuild.dll) -- Node 16.14.0 +- Node 16.14.2 - Perl 5.30.0 - Python 3.8.10 - Python3 3.8.10 - Ruby 2.7.0p0 -- Swift 5.5.3 +- Swift 5.6 ### Package Management - cpan 1.64 -- Helm 3.8.0 -- Homebrew 3.3.15 +- Helm 3.8.1 +- Homebrew 3.4.4 - Miniconda 4.11.0 -- Npm 8.3.1 +- Npm 8.5.0 - Pip 20.0.2 - Pip3 20.0.2 - Pipx 1.0.0 - RubyGems 3.1.2 -- Vcpkg (build from master \<5cf60186a>) -- Yarn 1.22.17 +- Vcpkg (build from master \<4f778cf09>) +- Yarn 1.22.18 #### Environment variables | Name | Value | @@ -48,80 +48,80 @@ ### Project Management - Ant 1.10.7 -- Gradle 7.4 +- Gradle 7.4.1 - Lerna 4.0.0 -- Maven 3.8.4 +- Maven 3.8.5 - Sbt 1.6.2 ### Tools -- Ansible 2.12.2 +- Ansible 2.12.4 - apt-fast 1.9.12 -- AzCopy 10.13.0 (available by `azcopy` and `azcopy10` aliases) -- Bazel 5.0.0 +- AzCopy 10.14.1 (available by `azcopy` and `azcopy10` aliases) +- Bazel 5.1.0 - Bazelisk 1.11.0 -- Bicep 0.4.1272 +- Bicep 0.4.1318 - Buildah 1.21.3 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- CMake 3.22.2 -- CodeQL Action Bundle 2.8.1 +- CMake 3.23.0 +- CodeQL Action Bundle 2.8.3 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.2.3+azure-1 -- Docker-Buildx 0.7.1 -- Docker-Moby Client 20.10.11+azure-3 -- Docker-Moby Server 20.10.11+azure-3 -- Fastlane 2.204.3 +- Docker Compose v2 2.3.3+azure-1 +- Docker-Buildx 0.8.1 +- Docker-Moby Client 20.10.14+azure-1 +- Docker-Moby Server 20.10.14+azure-1 +- Fastlane 2.205.1 - Git 2.35.1 (apt source repository: ppa:git-core/ppa) - Git LFS 3.1.2 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.6.0 - Haveged 1.9.1 -- Heroku 7.59.2 -- HHVM (HipHop VM) 4.149.0 +- Heroku 7.59.4 +- HHVM (HipHop VM) 4.154.1 - jq 1.6 -- Kind 0.11.1 -- Kubectl 1.23.4 -- Kustomize 4.5.2 +- Kind 0.12.0 +- Kubectl 1.23.5 +- Kustomize 4.5.4 - Leiningen 2.9.8 - MediaInfo 19.09 - Mercurial 5.3.1 -- Minikube 1.25.1 -- n 8.0.2 -- Newman 5.3.1 +- Minikube 1.25.2 +- n 8.1.0 +- Newman 5.3.2 - nvm 0.39.1 - OpenSSL 1.1.1f 31 Mar 2020 -- Packer 1.7.10 -- Parcel 2.3.2 +- Packer 1.8.0 +- Parcel 2.4.0 - PhantomJS 2.1.1 - Podman 3.4.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- Pulumi 3.24.1 -- R 4.1.2 +- Pulumi 3.27.0 +- R 4.1.3 - Skopeo 1.3.0 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 -- Terraform 1.1.6 +- Terraform 1.1.7 - yamllint 1.26.3 -- yq 4.20.2 +- yq 4.24.2 - zstd 1.5.2 (homebrew) ### CLI Tools -- Alibaba Cloud CLI 3.0.109 -- AWS CLI 2.4.19 +- Alibaba Cloud CLI 3.0.114 +- AWS CLI 2.5.0 - AWS CLI Session manager plugin 1.2.295.0 -- AWS SAM CLI 1.38.1 -- Azure CLI (azure-cli) 2.33.1 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) -- Azure CLI (azure-devops) 0.23.0 -- GitHub CLI 2.5.1 +- AWS SAM CLI 1.43.0 +- Azure CLI (azure-cli) 2.34.1 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) +- Azure CLI (azure-devops) 0.25.0 +- GitHub CLI 2.6.0 - Google Cloud SDK 369.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 9.6.5 -- OpenShift CLI 4.9.21 +- Netlify CLI 9.13.6 +- OpenShift CLI 4.10.6 - ORAS CLI 0.12.0 -- Vercel CLI 24.0.0 +- Vercel CLI 24.0.1 ### Java -| Version | Vendor | Environment Variable | -| --------------------- | --------------- | -------------------- | -| 8.0.322+6 | Eclipse Temurin | JAVA_HOME_8_X64 | -| 11.0.14.1+1 (default) | Eclipse Temurin | JAVA_HOME_11_X64 | -| 17.0.2+8 | Eclipse Temurin | JAVA_HOME_17_X64 | +| Version | Vendor | Environment Variable | +| ------------------- | --------------- | -------------------- | +| 8.0.322+6 | Eclipse Temurin | JAVA_HOME_8_X64 | +| 11.0.14+1 (default) | Eclipse Temurin | JAVA_HOME_11_X64 | +| 17.0.2+8 | Eclipse Temurin | JAVA_HOME_17_X64 | ### GraalVM | Version | Environment variables | @@ -131,38 +131,38 @@ ### PHP | Tool | Version | | -------- | ------------------- | -| PHP | 7.4.28 8.0.15 8.1.2 | -| Composer | 2.2.6 | -| PHPUnit | 8.5.23 | +| PHP | 7.4.28 8.0.17 8.1.3 | +| Composer | 2.2.10 | +| PHPUnit | 8.5.25 | ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ``` ### Haskell - Cabal 3.6.2.0 -- GHC 9.2.1 -- GHCup 0.1.17.4 -- Stack 2.7.3 +- GHC 9.2.2 +- GHCup 0.1.17.6 +- Stack 2.7.5 ### Rust Tools -- Cargo 1.58.0 -- Rust 1.58.1 -- Rustdoc 1.58.1 +- Cargo 1.59.0 +- Rust 1.59.0 +- Rustdoc 1.59.0 - Rustup 1.24.3 #### Packages - Bindgen 0.59.2 - Cargo audit 0.16.0 -- Cargo clippy 0.1.58 -- Cargo outdated 0.10.2 -- Cbindgen 0.20.0 +- Cargo clippy 0.1.59 +- Cargo outdated +- Cbindgen 0.21.0 - Rustfmt 1.4.38 ### Browsers and Drivers -- Google Chrome 98.0.4758.102 -- ChromeDriver 98.0.4758.102 -- Mozilla Firefox 97.0 +- Google Chrome 100.0.4896.60 +- ChromeDriver 100.0.4896.20 +- Mozilla Firefox 98.0.2 - Geckodriver 0.30.0 -- Chromium 98.0.4758.0 +- Chromium 100.0.4896.0 - Selenium server 4.1.0 #### Environment variables @@ -173,7 +173,7 @@ | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | ### .NET Core SDK -- 3.1.120 3.1.202 3.1.302 3.1.416 5.0.104 5.0.211 5.0.303 5.0.405 6.0.200 +- 3.1.120 3.1.202 3.1.302 3.1.417 5.0.104 5.0.212 5.0.303 5.0.406 6.0.201 ### .NET tools - nbgv 3.4.255+06fb9182bf @@ -203,27 +203,29 @@ ### Cached Tools #### Go - 1.15.15 -- 1.16.14 -- 1.17.7 +- 1.16.15 +- 1.17.8 +- 1.18.0 #### Node.js -- 12.22.10 -- 14.19.0 -- 16.14.0 +- 12.22.11 +- 14.19.1 +- 16.14.2 #### PyPy -- 2.7.18 [PyPy 7.3.8] +- 2.7.18 [PyPy 7.3.9] - 3.6.12 [PyPy 7.3.3] -- 3.7.12 [PyPy 7.3.8] -- 3.8.12 [PyPy 7.3.8] +- 3.7.13 [PyPy 7.3.9] +- 3.8.13 [PyPy 7.3.9] +- 3.9.12 [PyPy 7.3.9] #### Python - 2.7.18 - 3.6.15 - 3.7.12 - 3.8.12 -- 3.9.10 -- 3.10.2 +- 3.9.12 +- 3.10.4 #### Ruby - 2.5.9 @@ -235,16 +237,18 @@ | Name | Value | Architecture | | --------------- | ----------------------------------- | ------------ | | GOROOT_1_15_X64 | /opt/hostedtoolcache/go/1.15.15/x64 | x64 | -| GOROOT_1_16_X64 | /opt/hostedtoolcache/go/1.16.14/x64 | x64 | -| GOROOT_1_17_X64 | /opt/hostedtoolcache/go/1.17.7/x64 | x64 | +| GOROOT_1_16_X64 | /opt/hostedtoolcache/go/1.16.15/x64 | x64 | +| GOROOT_1_17_X64 | /opt/hostedtoolcache/go/1.17.8/x64 | x64 | +| GOROOT_1_18_X64 | /opt/hostedtoolcache/go/1.18.0/x64 | x64 | ### PowerShell Tools -- PowerShell 7.2.1 +- PowerShell 7.2.2 #### PowerShell Modules | Module | Version | | ---------------- | ------- | | MarkdownPS | 1.9 | +| Microsoft.Graph | 1.9.3 | | Pester | 5.3.1 | | PSScriptAnalyzer | 1.20.0 | @@ -262,9 +266,9 @@ | Package Name | Version | | -------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 4.0 | -| Android Emulator | 31.2.8 | +| Android Emulator | 31.2.9 | | Android SDK Build-tools | 32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | -| Android SDK Platform-Tools | 32.0.0 | +| Android SDK Platform-Tools | 33.0.1 | | Android SDK Platforms | android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | | Android SDK Tools | 26.1.1 | | Android Support Repository | 47.0.0 | @@ -286,25 +290,25 @@ ### Cached Docker images | Repository:Tag | Digest | Created | | ----------------------- | ------------------------------------------------------------------------ | ---------- | -| alpine:3.12 | sha256:d9459083f962de6bd980ae6a05be2a4cf670df6a1d898157bceb420342bec280 | 2021-11-12 | -| alpine:3.13 | sha256:026f721af4cf2843e07bba648e158fb35ecc876d822130633cc49f707f0fc88c | 2021-11-12 | -| alpine:3.14 | sha256:635f0aa53d99017b38d1a0aa5b2082f7812b03e3cdb299103fe77b5c8a07f1d2 | 2021-11-12 | -| buildpack-deps:bullseye | sha256:159126fd9e3b05c16a9cc4c2655e4a447effd7892e62b74b933e4a6cb370138e | 2022-01-26 | -| buildpack-deps:buster | sha256:64b00dac65b9ed4db078361a816e24e888e6ae926e43524b79f6fba424e8b6c8 | 2022-01-26 | -| buildpack-deps:stretch | sha256:3004c958ffa89199f04e8735d583c42ee3885c9c77daa4134930fe68eeee59c4 | 2022-01-26 | -| debian:10 | sha256:fde7a280413ec0122bd3a14dc76ba152f89cae999f3b8efe8784100df3640763 | 2022-01-26 | -| debian:11 | sha256:fb45fd4e25abe55a656ca69a7bef70e62099b8bb42a279a5e0ea4ae1ab410e0d | 2022-01-26 | -| debian:9 | sha256:4bb600434787c903886fe33526d19ff33114a33b433a4a4cdbdf9b8543f1ab5d | 2022-01-26 | -| moby/buildkit:latest | sha256:d6c89b7085b106301645ddcc77cf64eb7b705ab507b72d52d130ac33f1300417 | 2021-11-18 | -| node:12 | sha256:7e1786920f4ebd88f8cc2dc9906f3c85ac78674cb29dcced535ff150a96f0873 | 2022-02-04 | -| node:12-alpine | sha256:dfa564312367b1a8fca8db7ae4bae102b28e68b39ebcb7b17022c938f105846b | 2022-02-04 | -| node:14 | sha256:b2c75df8c9706156c38b4f1f678d00e11cb2bfda09fc4ab6e36ec17ac9163865 | 2022-02-02 | -| node:14-alpine | sha256:9a2aa545388a135b496bd55cef2be920b96c4526c99c140170e05a8de3fce653 | 2022-02-02 | -| node:16 | sha256:fd86131ddf8e0faa8ba7a3e49b6bf571745946e663e4065f3bff0a07204c1dde | 2022-02-09 | -| node:16-alpine | sha256:2c6c59cf4d34d4f937ddfcf33bab9d8bbad8658d1b9de7b97622566a52167f2b | 2022-02-09 | +| alpine:3.12 | sha256:e42c1b8e03bdaa471deb198d981b52ac421441975195a20004aea624890f8b1c | 2022-03-29 | +| alpine:3.13 | sha256:6b6249407a7901591e094262327b79de21f2bfb9f597866f0a2bbb3b3d98e00c | 2022-03-29 | +| alpine:3.14 | sha256:85c63ff404e9b4daf18f264447161b50ffa70047cc4c03381478cf2c6edfa9da | 2022-03-29 | +| buildpack-deps:bullseye | sha256:841f6d3f91c1a25f362291ff6d6fcc755b78d9882da71621f06a7ca855abe060 | 2022-03-29 | +| buildpack-deps:buster | sha256:985480f24616ea7e388136cc5f1412c2ffba5e6cf38bd647859ad63f3d8ac16a | 2022-03-29 | +| buildpack-deps:stretch | sha256:b4087d6c971248c3eb86ee7f06b71b3cd20c7b721807dc1ebe83ba7dce76c500 | 2022-03-29 | +| debian:10 | sha256:1b236b48c1ef66fa08535a5153266f4959bf58f948db3e68f7d678b651d8e33a | 2022-03-29 | +| debian:11 | sha256:87eefc7c15610cca61db5c0fd280911c6a737c0680d807432c0bd80cd0cca39b | 2022-03-29 | +| debian:9 | sha256:a8cc1744bbdd5266678e3e8b3e6387e45c053218438897e86876f2eb104e5534 | 2022-03-29 | +| moby/buildkit:latest | sha256:c2aeafaed434edfde90706b5cf9a56935c389192858d1090e17a1440a6e96482 | 2022-03-09 | +| node:12 | sha256:e88281f7b3947019c8b5fe750a06122ac3c2612fe00719a133ea5bf8bfedafbb | 2022-03-18 | +| node:12-alpine | sha256:41a1b6dd829a9a1b3da8817809c3ddf5e97c8bc66cbc84363f697e31c0adab4b | 2022-03-29 | +| node:14 | sha256:7d38b5ed42b2ac006c3a79ef8ad9f1e912bde6cb4cb4243c188689d5aa1aa437 | 2022-03-18 | +| node:14-alpine | sha256:d9e58586730f7eb7c885f515f703f4a88e4a3ad8bf982aa5bb4ab6a1111aed79 | 2022-03-29 | +| node:16 | sha256:68e34cfcd8276ad531b12b3454af5c24cd028752dfccacce4e19efef6f7cdbe0 | 2022-03-18 | +| node:16-alpine | sha256:51542061b77f105c2db658035ac6070229f9ea1d3270ab78775df9a825d9a759 | 2022-03-29 | | ubuntu:16.04 | sha256:0f71fa8d4d2d4292c3c617fda2b36f6dabe5c8b6e34c3dc5b0d17d4e704bd39c | 2021-08-31 | -| ubuntu:18.04 | sha256:c2aa13782650aa7ade424b12008128b60034c795f25456e8eb552d0a0f447cad | 2022-02-02 | -| ubuntu:20.04 | sha256:669e010b58baf5beb2836b253c1fd5768333f0d1dbcb834f7c07a4dc93f474be | 2022-02-02 | +| ubuntu:18.04 | sha256:d8ac28b7bec51664c6b71a9dd1d8f788127ff310b8af30820560973bcfc605a0 | 2022-03-18 | +| ubuntu:20.04 | sha256:bea6d19168bbfd6af8d77c2cc3c572114eb5d113e6f422573c93cb605a0e2ffb | 2022-03-18 | ### Installed apt packages | Name | Version | @@ -319,7 +323,7 @@ | coreutils | 8.30-3ubuntu2 | | curl | 7.68.0-1ubuntu2.7 | | dbus | 1.12.16-2ubuntu2.1 | -| dnsutils | 1:9.16.1-0ubuntu2.9 | +| dnsutils | 1:9.16.1-0ubuntu2.10 | | dpkg | 1.19.7ubuntu3 | | fakeroot | 1.24-1 | | file | 1:5.38-4 | @@ -336,10 +340,10 @@ | libc++-dev | 1:10.0-50\~exp1 | | libc++abi-dev | 1:10.0-50\~exp1 | | libcurl4 | 7.68.0-1ubuntu2.7 | -| libgbm-dev | 21.2.6-0ubuntu0.1\~20.04.1 | +| libgbm-dev | 21.2.6-0ubuntu0.1\~20.04.2 | | libgconf-2-4 | 3.2.6-6ubuntu1 | | libgsl-dev | 2.5+dfsg-6build1 | -| libgtk-3-0 | 3.24.20-0ubuntu1 | +| libgtk-3-0 | 3.24.20-0ubuntu1.1 | | libmagic-dev | 1:5.38-4 | | libmagickcore-dev | 8:6.9.10.23+dfsg-2.1ubuntu11.4 | | libmagickwand-dev | 8:6.9.10.23+dfsg-2.1ubuntu11.4 | @@ -348,7 +352,7 @@ | libunwind8 | 1.2.1-9build1 | | libxkbfile-dev | 1:1.1.0-1 | | libxss1 | 1:1.2.3-1 | -| locales | 2.31-0ubuntu9.2 | +| locales | 2.31-0ubuntu9.7 | | m4 | 1.4.18-4 | | mediainfo | 19.09-1build1 | | mercurial | 5.3.1-1ubuntu1 | @@ -364,7 +368,7 @@ | pollinate | 4.33-3ubuntu1.20.04.1 | | python-is-python3 | 3.8.2-4 | | rpm | 4.14.2.1+dfsg1-1build2 | -| rsync | 3.1.3-8ubuntu0.1 | +| rsync | 3.1.3-8ubuntu0.2 | | shellcheck | 0.7.0-2build2 | | sphinxsearch | 2.2.11-2ubuntu2 | | sqlite3 | 3.31.1-4ubuntu0.2 | @@ -377,7 +381,7 @@ | texinfo | 6.7.0.dfsg.2-5 | | time | 1.7-25.1build1 | | tk | 8.6.9+1 | -| tzdata | 2021e-0ubuntu0.20.04 | +| tzdata | 2022a-0ubuntu0.20.04 | | unzip | 6.0-25ubuntu1 | | upx | 3.95-2build1 | | wget | 1.20.3-1ubuntu2 | From c382ff1308d34640d3b707be1c1b400eb3d8cde8 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 6 Apr 2022 14:51:42 +0000 Subject: [PATCH 1051/3485] Updating readme file for win22 version 20220330.1 (#5325) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2022-Readme.md | 83 +++++++++++++++++--------------- 1 file changed, 43 insertions(+), 40 deletions(-) diff --git a/images/win/Windows2022-Readme.md b/images/win/Windows2022-Readme.md index d3296b0951ea..eabdc7a63651 100644 --- a/images/win/Windows2022-Readme.md +++ b/images/win/Windows2022-Readme.md @@ -1,10 +1,11 @@ | Announcements | |-| +| [[All OSs] Go versions less than 1.16 will be removed on April, 11](https://github.com/actions/virtual-environments/issues/5280) | | [windows-latest workflows will use Windows Server 2022](https://github.com/actions/virtual-environments/issues/4856) | *** # Microsoft Windows Server 2022 Datacenter - OS Version: 10.0.20348 Build 587 -- Image Version: 20220316.1 +- Image Version: 20220330.1 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -16,15 +17,15 @@ - Julia 1.7.2 - Kotlin 1.6.10 - LLVM 13.0.1 -- Node 16.14.1 +- Node 16.14.2 - Perl 5.32.1 - PHP 8.1.4 -- Python 3.9.10 +- Python 3.9.12 - Ruby 3.0.3p157 ### Package Management -- Chocolatey 0.12.1 -- Composer 2.2.9 +- Chocolatey 1.1.0 +- Composer 2.3.2 - Helm 3.8.0 - Miniconda 4.11.0 (pre-installed on the image but not added to PATH) - NPM 8.5.0 @@ -32,8 +33,8 @@ - pip 22.0.4 (python 3.9) - Pipx 1.0.0 - RubyGems 3.2.32 -- Vcpkg (build from master \<71d274d7c>) -- Yarn 1.22.17 +- Vcpkg (build from master \<9d9a6f486>) +- Yarn 1.22.18 #### Environment variables | Name | Value | @@ -50,12 +51,12 @@ - 7zip 21.07 - aria2 1.36.0 - azcopy 10.14.1 -- Bazel 5.0.0 +- Bazel 5.1.0 - Bazelisk 1.11.0 - Bicep 0.4.1318 - Cabal 3.6.2.0 -- CMake 3.22.3 -- CodeQL Action Bundle 2.8.3 +- CMake 3.23.0 +- CodeQL Action Bundle 2.8.4 - Docker 20.10.7 - Docker-compose 1.29.2 - Docker-wincred 0.6.4 @@ -65,14 +66,14 @@ - InnoSetup 6.2.0 - jq 1.6 - Kind 0.12.0 -- Kubectl 1.23.4 +- Kubectl 1.23.5 - Mercurial 5.0 - Mingw-w64 8.1.0 - Newman 5.3.2 - NSIS v3.08 - OpenSSL 1.1.1 -- Packer 1.7.10 -- Pulumi v3.26.1 +- Packer 1.8.0 +- Pulumi v3.27.0 - R 4.1.3 - Service Fabric SDK 8.2.1571.9590 - Stack 2.7.5 @@ -85,13 +86,13 @@ - zstd 1.5.2 ### CLI Tools -- Alibaba Cloud CLI 3.0.112 -- AWS CLI 2.4.25 -- AWS SAM CLI 1.40.1 +- Alibaba Cloud CLI 3.0.114 +- AWS CLI 2.5.0 +- AWS SAM CLI 1.43.0 - AWS Session Manager CLI 1.2.295.0 - Azure CLI 2.34.1 -- Azure DevOps CLI extension 0.23.0 -- GitHub CLI 2.6.0 +- Azure DevOps CLI extension 0.25.0 +- GitHub CLI 2.7.0 - Hub CLI 2.14.2 ### Rust Tools @@ -104,16 +105,16 @@ - bindgen 0.59.2 - cargo-audit 0.16.0 - cargo-outdated 0.11.0 -- cbindgen 0.20.0 +- cbindgen 0.21.0 - Clippy 0.1.59 - Rustfmt 1.4.38 ### Browsers and webdrivers -- Google Chrome 99.0.4844.74 -- Chrome Driver 99.0.4844.51 -- Microsoft Edge 99.0.1150.39 -- Microsoft Edge Driver 99.0.1150.39 -- Mozilla Firefox 98.0.1 +- Google Chrome 100.0.4896.60 +- Chrome Driver 100.0.4896.60 +- Microsoft Edge 99.0.1150.55 +- Microsoft Edge Driver 99.0.1150.55 +- Mozilla Firefox 98.0.2 - Gecko Driver 0.30.0 - IE Driver 3.150.1.1 - Selenium server 4.1.0 @@ -157,21 +158,22 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | 1.15.15 | x64 | GOROOT_1_15_X64 | | 1.16.15 (Default) | x64 | GOROOT_1_16_X64 | | 1.17.8 | x64 | GOROOT_1_17_X64 | +| 1.18.0 | x64 | GOROOT_1_18_X64 | #### Node | Version | Architecture | | ------- | ------------ | -| 12.22.10 | x64 | -| 14.19.0 | x64 | -| 16.14.0 | x64 | +| 12.22.11 | x64 | +| 14.19.1 | x64 | +| 16.14.2 | x64 | #### Python | Version | Architecture | | ------- | ------------ | | 3.7.9 | x64, x86 | | 3.8.10 | x64, x86 | -| 3.9.10 (Default) | x64, x86 | -| 3.10.2 | x64, x86 | +| 3.9.12 (Default) | x64, x86 | +| 3.10.4 | x64, x86 | #### Ruby | Version | Architecture | @@ -182,10 +184,10 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### PyPy | Python Version | PyPy Version | | -------------- | ------------ | -| 2.7.18 | PyPy 7.3.8 with MSC v.1929 64 bit (AMD64) | -| 3.7.12 | PyPy 7.3.8 with MSC v.1929 64 bit (AMD64) | -| 3.8.12 | PyPy 7.3.8 with MSC v.1929 64 bit (AMD64) | -| 3.9.10 | PyPy 7.3.8 with MSC v.1929 64 bit (AMD64) | +| 2.7.18 | PyPy 7.3.9 with MSC v.1929 64 bit (AMD64) | +| 3.7.13 | PyPy 7.3.9 with MSC v.1929 64 bit (AMD64) | +| 3.8.12 | PyPy 7.3.9 with MSC v.1929 64 bit (AMD64) | +| 3.9.10 | PyPy 7.3.9 with MSC v.1929 64 bit (AMD64) | ### Databases #### PostgreSQL @@ -219,9 +221,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Nginx | 1.21.6 | C:\tools\nginx-1.21.6\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2022 -| Name | Version | Path | -| ----------------------------- | -------------- | -------------------------------------------------------- | -| Visual Studio Enterprise 2022 | 17.1.32228.430 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | +| Name | Version | Path | +| ----------------------------- | ------------- | -------------------------------------------------------- | +| Visual Studio Enterprise 2022 | 17.1.32319.34 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | #### Workloads, components and extensions: | Package | Version | @@ -363,6 +365,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Component.VC.MFC.ARM64EC | 17.1.32112.364 | | Microsoft.VisualStudio.Component.VC.Modules.x86.x64 | 17.1.32112.364 | | Microsoft.VisualStudio.Component.VC.Redist.14.Latest | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.VC.Redist.MSM | 17.1.32112.364 | | Microsoft.VisualStudio.Component.VC.Runtimes.ARM64.Spectre | 17.1.32112.364 | | Microsoft.VisualStudio.Component.VC.Runtimes.x86.x64.Spectre | 17.1.32112.364 | | Microsoft.VisualStudio.Component.VC.TestAdapterForBoostTest | 17.1.32112.364 | @@ -475,7 +478,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - nbgv 3.4.255+06fb9182bf ### PowerShell Tools -- PowerShell 7.2.1 +- PowerShell 7.2.2 #### Azure Powershell Modules | Module | Version | Path | @@ -492,7 +495,7 @@ All other versions are saved but not installed. #### Powershell Modules | Module | Version | | ------------------ | ---------------- | -| AWSPowerShell | 4.1.44 | +| AWSPowerShell | 4.1.53 | | DockerMsftProvider | 1.0.0.8 | | MarkdownPS | 1.9 | | Microsoft.Graph | 1.9.3 | @@ -507,10 +510,10 @@ All other versions are saved but not installed. | Package Name | Version | | -------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 4.0 | -| Android Emulator | 31.2.8 | +| Android Emulator | 31.2.9 | | Android SDK Build-tools | 32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | | Android SDK Platforms | android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | -| Android SDK Platform-Tools | 33.0.0 | +| Android SDK Platform-Tools | 33.0.1 | | Android Support Repository | 47.0.0 | | CMake | 3.18.1 | | Google Play services | 49 | From 702823499e66b6b60b9c7688c1e5a7ffb87d4ffc Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 6 Apr 2022 15:38:23 +0000 Subject: [PATCH 1052/3485] Updating readme file for win19 version 20220330.1 (#5324) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2019-Readme.md | 76 ++++++++++++++++---------------- 1 file changed, 39 insertions(+), 37 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index b9df9d4f2683..d68acf8e8d22 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -1,10 +1,11 @@ | Announcements | |-| +| [[All OSs] Go versions less than 1.16 will be removed on April, 11](https://github.com/actions/virtual-environments/issues/5280) | | [windows-latest workflows will use Windows Server 2022](https://github.com/actions/virtual-environments/issues/4856) | *** # Microsoft Windows Server 2019 Datacenter - OS Version: 10.0.17763 Build 2686 -- Image Version: 20220316.1 +- Image Version: 20220330.1 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -16,15 +17,15 @@ - Julia 1.7.2 - Kotlin 1.6.10 - LLVM 13.0.1 -- Node 16.14.1 +- Node 16.14.2 - Perl 5.32.1 - PHP 8.1.4 - Python 3.7.9 - Ruby 2.5.9p229 ### Package Management -- Chocolatey 0.12.1 -- Composer 2.2.9 +- Chocolatey 1.1.0 +- Composer 2.3.2 - Helm 3.8.0 - Miniconda 4.11.0 (pre-installed on the image but not added to PATH) - NPM 8.5.0 @@ -32,8 +33,8 @@ - pip 22.0.4 (python 3.7) - Pipx 1.0.0 - RubyGems 2.7.6.3 -- Vcpkg (build from master \<6b6f5a82d>) -- Yarn 1.22.17 +- Vcpkg (build from master \<9d9a6f486>) +- Yarn 1.22.18 #### Environment variables | Name | Value | @@ -51,31 +52,31 @@ - 7zip 21.07 - aria2 1.36.0 - azcopy 10.14.1 -- Bazel 5.0.0 +- Bazel 5.1.0 - Bazelisk 1.11.0 - Bicep 0.4.1318 - Cabal 3.6.2.0 -- CMake 3.22.3 -- CodeQL Action Bundle 2.8.3 +- CMake 3.23.0 +- CodeQL Action Bundle 2.8.4 - Docker 20.10.7 - Docker-compose 1.29.2 - Docker-wincred 0.6.4 - ghc 9.2.2 - Git 2.35.1.windows.2 - Git LFS 3.0.2 -- Google Cloud SDK 377.0.0 +- Google Cloud SDK 379.0.0 - InnoSetup 6.2.0 - jq 1.6 - Kind 0.12.0 -- Kubectl 1.23.4 +- Kubectl 1.23.5 - Mercurial 5.0 - Mingw-w64 8.1.0 - Newman 5.3.2 - NSIS v3.08 - OpenSSL 1.1.1 -- Packer 1.7.10 -- Parcel 2.3.2 -- Pulumi v3.26.1 +- Packer 1.8.0 +- Parcel 2.4.0 +- Pulumi v3.27.0 - R 4.1.3 - Service Fabric SDK 8.2.1571.9590 - Stack 2.7.5 @@ -88,14 +89,14 @@ - zstd 1.5.2 ### CLI Tools -- Alibaba Cloud CLI 3.0.112 -- AWS CLI 2.4.25 -- AWS SAM CLI 1.40.1 +- Alibaba Cloud CLI 3.0.114 +- AWS CLI 2.5.0 +- AWS SAM CLI 1.43.0 - AWS Session Manager CLI 1.2.295.0 - Azure CLI 2.34.1 -- Azure DevOps CLI extension 0.23.0 +- Azure DevOps CLI extension 0.25.0 - Cloud Foundry CLI 6.53.0 -- GitHub CLI 2.6.0 +- GitHub CLI 2.7.0 - Hub CLI 2.14.2 ### Rust Tools @@ -108,16 +109,16 @@ - bindgen 0.59.2 - cargo-audit 0.16.0 - cargo-outdated 0.11.0 -- cbindgen 0.20.0 +- cbindgen 0.21.0 - Clippy 0.1.59 - Rustfmt 1.4.38 ### Browsers and webdrivers -- Google Chrome 99.0.4844.74 -- Chrome Driver 99.0.4844.51 -- Microsoft Edge 99.0.1150.39 -- Microsoft Edge Driver 99.0.1150.39 -- Mozilla Firefox 98.0.1 +- Google Chrome 100.0.4896.60 +- Chrome Driver 100.0.4896.60 +- Microsoft Edge 99.0.1150.55 +- Microsoft Edge Driver 99.0.1150.55 +- Mozilla Firefox 98.0.2 - Gecko Driver 0.30.0 - IE Driver 3.150.1.1 - Selenium server 4.1.0 @@ -165,13 +166,14 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | 1.15.15 (Default) | x64 | GOROOT_1_15_X64 | | 1.16.15 | x64 | GOROOT_1_16_X64 | | 1.17.8 | x64 | GOROOT_1_17_X64 | +| 1.18.0 | x64 | GOROOT_1_18_X64 | #### Node | Version | Architecture | | ------- | ------------ | -| 12.22.10 | x64 | -| 14.19.0 | x64 | -| 16.14.0 | x64 | +| 12.22.11 | x64 | +| 14.19.1 | x64 | +| 16.14.2 | x64 | #### Python | Version | Architecture | @@ -180,8 +182,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | 3.6.8 | x64, x86 | | 3.7.9 (Default) | x64, x86 | | 3.8.10 | x64, x86 | -| 3.9.10 | x64, x86 | -| 3.10.2 | x64, x86 | +| 3.9.12 | x64, x86 | +| 3.10.4 | x64, x86 | #### Ruby | Version | Architecture | @@ -195,11 +197,11 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### PyPy | Python Version | PyPy Version | | -------------- | ------------ | -| 2.7.18 | PyPy 7.3.8 with MSC v.1929 64 bit (AMD64) | +| 2.7.18 | PyPy 7.3.9 with MSC v.1929 64 bit (AMD64) | | 3.6.12 | PyPy 7.3.3 with MSC v.1927 32 bit | -| 3.7.12 | PyPy 7.3.8 with MSC v.1929 64 bit (AMD64) | -| 3.8.12 | PyPy 7.3.8 with MSC v.1929 64 bit (AMD64) | -| 3.9.10 | PyPy 7.3.8 with MSC v.1929 64 bit (AMD64) | +| 3.7.13 | PyPy 7.3.9 with MSC v.1929 64 bit (AMD64) | +| 3.8.12 | PyPy 7.3.9 with MSC v.1929 64 bit (AMD64) | +| 3.9.10 | PyPy 7.3.9 with MSC v.1929 64 bit (AMD64) | ### Databases #### PostgreSQL @@ -526,7 +528,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - nbgv 3.4.255+06fb9182bf ### PowerShell Tools -- PowerShell 7.2.1 +- PowerShell 7.2.2 #### Azure Powershell Modules | Module | Version | Path | @@ -543,7 +545,7 @@ All other versions are saved but not installed. #### Powershell Modules | Module | Version | | ------------------ | ---------------- | -| AWSPowerShell | 4.1.44 | +| AWSPowerShell | 4.1.53 | | DockerMsftProvider | 1.0.0.8 | | MarkdownPS | 1.9 | | Microsoft.Graph | 1.9.3 | @@ -560,7 +562,7 @@ All other versions are saved but not installed. | Android Command Line Tools | 4.0 | | Android SDK Build-tools | 32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3<br>26.0.0 26.0.1 26.0.2 26.0.3<br>25.0.0 25.0.1 25.0.2 25.0.3<br>24.0.0 24.0.1 24.0.2 24.0.3<br>23.0.1 23.0.2 23.0.3<br>22.0.1<br>21.1.2<br>20.0.0<br>19.1.0 | | Android SDK Platforms | android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3)<br>android-26 (rev 2)<br>android-25 (rev 3)<br>android-24 (rev 2)<br>android-23 (rev 3)<br>android-22 (rev 2)<br>android-21 (rev 2)<br>android-20 (rev 2)<br>android-19 (rev 4) | -| Android SDK Platform-Tools | 33.0.0 | +| Android SDK Platform-Tools | 33.0.1 | | Android SDK Tools | 26.1.1 | | Android Support Repository | 47.0.0 | | CMake | 3.10.2<br>3.18.1 | From e822ae7acba731c6f29b9ad756b280e3ab70e371 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Thu, 7 Apr 2022 08:27:58 +0200 Subject: [PATCH 1053/3485] [Windows] Add V142 ATL/MFC Component (#5358) --- images/win/toolsets/toolset-2022.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index dcb609269eaf..ab8ac80f1f95 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -225,6 +225,10 @@ "Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM64.Spectre", "Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64", "Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64.Spectre", + "Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL", + "Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.Spectre", + "Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC", + "Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.Spectre", "Microsoft.VisualStudio.Component.VC.ATLMFC", "Microsoft.VisualStudio.Component.VC.ATLMFC.Spectre", "Microsoft.VisualStudio.Component.Windows10SDK.19041", From 5e72f7eb77dd570aae55d5afe3f1ddd2cf4b0d2b Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Thu, 7 Apr 2022 12:49:19 +0200 Subject: [PATCH 1054/3485] [Ubuntu] Add automake autoconf libtool output version (#5362) --- images/linux/toolsets/toolset-1804.json | 3 +++ images/linux/toolsets/toolset-2004.json | 3 +++ 2 files changed, 6 insertions(+) diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index a0ed0db18e5a..67ebf9eb7a22 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -132,6 +132,8 @@ ], "apt": { "common_packages": [ + "autoconf", + "automake", "build-essential", "dbus", "dnsutils", @@ -154,6 +156,7 @@ "libmagickwand-dev", "libsecret-1-dev", "libsqlite3-dev", + "libtool", "libunwind8", "libxkbfile-dev", "libxss1", diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index 4bacd146e47d..88e85429365b 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -130,6 +130,8 @@ ], "apt": { "common_packages": [ + "autoconf", + "automake", "build-essential", "dbus", "dnsutils", @@ -153,6 +155,7 @@ "libmagickwand-dev", "libsecret-1-dev", "libsqlite3-dev", + "libtool", "libunwind8", "libxkbfile-dev", "libxss1", From 4d0aaf97de8bf88d85ceb8c77838bceec3b62fa1 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 7 Apr 2022 14:43:52 +0000 Subject: [PATCH 1055/3485] Updating readme file for ubuntu18 version 20220405.3 (#5356) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu1804-Readme.md | 71 ++++++++++++++++--------------- 1 file changed, 36 insertions(+), 35 deletions(-) diff --git a/images/linux/Ubuntu1804-Readme.md b/images/linux/Ubuntu1804-Readme.md index 9a2b7798c1a1..8e54b09512f2 100644 --- a/images/linux/Ubuntu1804-Readme.md +++ b/images/linux/Ubuntu1804-Readme.md @@ -1,23 +1,24 @@ | Announcements | |-| -| [[All OSs] Go versions less than 1.16 will be removed on April, 11](https://github.com/actions/virtual-environments/issues/5280) | +| [[Ubuntu] PHP 7.1 will be removed from Ubuntu 18 on April, 18](https://github.com/actions/virtual-environments/issues/5326) | +| [[All OSs] Go versions less than 1.16 will be removed and the default will be set to 1.17 on April, 11](https://github.com/actions/virtual-environments/issues/5280) | | [[Ubuntu] Issue with libstdc++ cannot allocate memory in static TLS block](https://github.com/actions/virtual-environments/issues/4799) | *** # Ubuntu 18.04.6 LTS -- Linux kernel version: 5.4.0-1073-azure -- Image Version: 20220330.0 +- Linux kernel version: 5.4.0-1074-azure +- Image Version: 20220405.3 ## Installed Software ### Language and Runtime - Bash 4.4.20(1)-release - Clang 9.0.0 - Clang-format 9.0.0 -- Erlang 24.3.2 (Eshell 12.3) +- Erlang 24.3.3 (Eshell 12.3.1) - Erlang rebar3 3.18.0 - GNU C++ 7.5.0, 9.4.0, 10.3.0 - GNU Fortran 7.5.0, 9.4.0, 10.3.0 - Julia 1.7.2 -- Kotlin 1.6.10-release-923 +- Kotlin 1.6.20-release-275 - Mono 6.12.0.122 (apt source repository: https://download.mono-project.com/repo/ubuntu stable-bionic main) - MSBuild 16.6.0.15201 (from /usr/lib/mono/msbuild/15.0/bin/MSBuild.dll) - Node 16.14.2 @@ -30,14 +31,14 @@ ### Package Management - cpan 1.64 - Helm 3.8.1 -- Homebrew 3.4.4 +- Homebrew 3.4.5 - Miniconda 4.11.0 - Npm 8.5.0 - Pip 9.0.1 - Pip3 9.0.1 - Pipx 1.0.0 - RubyGems 2.7.6 -- Vcpkg (build from master \<4f778cf09>) +- Vcpkg (build from master \<e79aaaaf3>) - Yarn 1.22.18 #### Environment variables @@ -48,7 +49,7 @@ ### Project Management - Ant 1.10.5 -- Gradle 7.4.1 +- Gradle 7.4.2 - Maven 3.8.5 - Sbt 1.6.2 @@ -61,7 +62,7 @@ - Bicep 0.4.1318 - Buildah 1.19.6 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - CMake 3.23.0 -- CodeQL Action Bundle 2.8.3 +- CodeQL Action Bundle 2.8.4 - Docker Compose v1 1.29.2 - Docker Compose v2 2.2.3+azure-1 - Docker-Buildx 0.8.1 @@ -71,8 +72,8 @@ - Git LFS 3.1.2 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.3.1 - Haveged 1.9.1 -- Heroku 7.59.4 -- HHVM (HipHop VM) 4.154.1 +- Heroku 7.60.1 +- HHVM (HipHop VM) 4.155.0 - jq 1.5 - Kind 0.12.0 - Kubectl 1.23.5 @@ -86,10 +87,10 @@ - nvm 0.39.1 - OpenSSL 1.1.1 11 Sep 2018 - Packer 1.8.0 -- Parcel 2.4.0 +- Parcel 2.4.1 - PhantomJS 2.1.1 - Podman 3.0.1 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- Pulumi 3.27.0 +- Pulumi 3.28.0 - R 4.1.3 - Skopeo 1.2.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 @@ -101,15 +102,15 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.114 -- AWS CLI 1.22.84 -- AWS CLI Session manager plugin 1.2.295.0 +- AWS CLI 1.22.89 +- AWS CLI Session manager plugin 1.2.312.0 - AWS SAM CLI 1.43.0 - Azure CLI (azure-cli) 2.34.1 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.25.0 -- GitHub CLI 2.6.0 +- GitHub CLI 2.7.0 - Google Cloud SDK 369.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 9.13.6 +- Netlify CLI 9.16.3 - OpenShift CLI 4.10.6 - ORAS CLI 0.12.0 - Vercel CLI 24.0.1 @@ -125,9 +126,9 @@ ### PHP | Tool | Version | | -------- | ---------------------------------------- | -| PHP | 7.1.33 7.2.34 7.3.33 7.4.28 8.0.17 8.1.3 | -| Composer | 2.2.10 | -| PHPUnit | 8.5.25 | +| PHP | 7.1.33 7.2.34 7.3.33 7.4.28 8.0.17 8.1.4 | +| Composer | 2.2.9 | +| PHPUnit | 8.5.26 | ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ``` @@ -152,7 +153,7 @@ - Rustfmt 1.4.38 ### Browsers and Drivers -- Google Chrome 100.0.4896.60 +- Google Chrome 100.0.4896.75 - ChromeDriver 100.0.4896.60 - Mozilla Firefox 98.0.2 - Geckodriver 0.30.0 @@ -282,22 +283,22 @@ ### Cached Docker images | Repository:Tag | Digest | Created | | ----------------------- | ------------------------------------------------------------------------ | ---------- | -| alpine:3.12 | sha256:e42c1b8e03bdaa471deb198d981b52ac421441975195a20004aea624890f8b1c | 2022-03-29 | -| alpine:3.13 | sha256:6b6249407a7901591e094262327b79de21f2bfb9f597866f0a2bbb3b3d98e00c | 2022-03-29 | -| alpine:3.14 | sha256:85c63ff404e9b4daf18f264447161b50ffa70047cc4c03381478cf2c6edfa9da | 2022-03-29 | -| buildpack-deps:bullseye | sha256:95d2b7161b408f8b6941489d1000fc6348d6d358eb71c31fdf835575a5c120e9 | 2022-03-29 | -| buildpack-deps:buster | sha256:985480f24616ea7e388136cc5f1412c2ffba5e6cf38bd647859ad63f3d8ac16a | 2022-03-29 | -| buildpack-deps:stretch | sha256:b4087d6c971248c3eb86ee7f06b71b3cd20c7b721807dc1ebe83ba7dce76c500 | 2022-03-29 | +| alpine:3.12 | sha256:c75ac27b49326926b803b9ed43bf088bc220d22556de1bc5f72d742c91398f69 | 2022-04-05 | +| alpine:3.13 | sha256:ccf92aa53bc6c3b25be2ad0cce80baec1778f007f7e076b0ffbd1b225d0b3a9b | 2022-04-05 | +| alpine:3.14 | sha256:06b5d462c92fc39303e6363c65e074559f8d6b1363250027ed5053557e3398c5 | 2022-04-05 | +| buildpack-deps:bullseye | sha256:b22e1a6daf16ea7e682e1d813aac528bb027f0772dc819716b4f41fbb06a3ffc | 2022-03-29 | +| buildpack-deps:buster | sha256:2c7b57f137d4ec1346ab226acd3eeac4f143ae2adc65a8abbd64489233065773 | 2022-03-29 | +| buildpack-deps:stretch | sha256:9cee83a572cc5f844548ee5f29eb0284772a162f312d7f049ad178207a0bae6d | 2022-03-29 | | debian:10 | sha256:1b236b48c1ef66fa08535a5153266f4959bf58f948db3e68f7d678b651d8e33a | 2022-03-29 | | debian:11 | sha256:87eefc7c15610cca61db5c0fd280911c6a737c0680d807432c0bd80cd0cca39b | 2022-03-29 | | debian:9 | sha256:a8cc1744bbdd5266678e3e8b3e6387e45c053218438897e86876f2eb104e5534 | 2022-03-29 | | moby/buildkit:latest | sha256:c2aeafaed434edfde90706b5cf9a56935c389192858d1090e17a1440a6e96482 | 2022-03-09 | -| node:12 | sha256:e88281f7b3947019c8b5fe750a06122ac3c2612fe00719a133ea5bf8bfedafbb | 2022-03-18 | -| node:12-alpine | sha256:41a1b6dd829a9a1b3da8817809c3ddf5e97c8bc66cbc84363f697e31c0adab4b | 2022-03-29 | -| node:14 | sha256:7d38b5ed42b2ac006c3a79ef8ad9f1e912bde6cb4cb4243c188689d5aa1aa437 | 2022-03-18 | -| node:14-alpine | sha256:d9e58586730f7eb7c885f515f703f4a88e4a3ad8bf982aa5bb4ab6a1111aed79 | 2022-03-29 | -| node:16 | sha256:68e34cfcd8276ad531b12b3454af5c24cd028752dfccacce4e19efef6f7cdbe0 | 2022-03-18 | -| node:16-alpine | sha256:51542061b77f105c2db658035ac6070229f9ea1d3270ab78775df9a825d9a759 | 2022-03-29 | +| node:12 | sha256:461c7f8b5e042fa7f47620cbee7772e76ce3fa0891edaab29bf7ebf0e84b9a1a | 2022-03-31 | +| node:12-alpine | sha256:788968a212353a7fc208ec02bdb7b7c87714df933b5ed3b122d6bb39ac9b2156 | 2022-04-05 | +| node:14 | sha256:b2d1c5df5e001b694115f64f4532c7eec2e5dbd73db6e0caacf0049bd0aed7d2 | 2022-03-31 | +| node:14-alpine | sha256:694a6537eb8ff4856e905c14fc9b658723380721d4057f4b7d8bcbcb114c9257 | 2022-04-05 | +| node:16 | sha256:ffe804d6fcced29bcfc3477de079d03a9c2b0e4917e44bfeafb1a6b0f875e383 | 2022-03-31 | +| node:16-alpine | sha256:cdf8c05b081837d7afe63e0ae0711152e60a30f3711b5050f9108def2025d513 | 2022-04-05 | | ubuntu:16.04 | sha256:0f71fa8d4d2d4292c3c617fda2b36f6dabe5c8b6e34c3dc5b0d17d4e704bd39c | 2021-08-31 | | ubuntu:18.04 | sha256:d8ac28b7bec51664c6b71a9dd1d8f788127ff310b8af30820560973bcfc605a0 | 2022-03-18 | | ubuntu:20.04 | sha256:bea6d19168bbfd6af8d77c2cc3c572114eb5d113e6f422573c93cb605a0e2ffb | 2022-03-18 | @@ -326,7 +327,7 @@ | iproute2 | 4.15.0-2ubuntu1.3 | | iputils-ping | 3:20161105-1ubuntu3 | | jq | 1.5+dfsg-2 | -| lib32z1 | 1:1.2.11.dfsg-0ubuntu2 | +| lib32z1 | 1:1.2.11.dfsg-0ubuntu2.1 | | libc++-dev | 6.0-2 | | libc++abi-dev | 6.0-2 | | libcurl3 | 7.58.0-2ubuntu3.16 | @@ -358,7 +359,7 @@ | pollinate | 4.33-0ubuntu1\~18.04.2 | | python-setuptools | 39.0.1-2 | | rpm | 4.14.1+dfsg1-2 | -| rsync | 3.1.2-2.1ubuntu1.3 | +| rsync | 3.1.2-2.1ubuntu1.4 | | shellcheck | 0.4.6-1 | | sphinxsearch | 2.2.11-2 | | sqlite3 | 3.22.0-1ubuntu0.4 | From aa79acfab250222a66ba0bb7daa0187a019b8c94 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 7 Apr 2022 18:59:34 +0000 Subject: [PATCH 1056/3485] Updating readme file for macOS-10.15 version 20220403.1 (#5339) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-10.15-Readme.md | 83 ++++++++++++++++-------------- 1 file changed, 45 insertions(+), 38 deletions(-) diff --git a/images/macos/macos-10.15-Readme.md b/images/macos/macos-10.15-Readme.md index ddb385e1b3ed..6377cf31aa59 100644 --- a/images/macos/macos-10.15-Readme.md +++ b/images/macos/macos-10.15-Readme.md @@ -1,7 +1,12 @@ +| Announcements | +|-| +| [[macOS] Default Xcode on Monterey image will be set to Xcode 13.3 on April, 11](https://github.com/actions/virtual-environments/issues/5328) | +| [[All OSs] Go versions less than 1.16 will be removed on April, 11](https://github.com/actions/virtual-environments/issues/5280) | +*** # macOS 10.15 info - System Version: macOS 10.15.7 (19H1824) - Kernel Version: Darwin 19.6.0 -- Image Version: 20220322.1 +- Image Version: 20220403.1 ## Installed Software ### Language and Runtime @@ -25,24 +30,24 @@ - Perl 5.34.0 - PHP 8.1.4 - Python 2.7.18 -- Python 3.9.10 +- Python 3.9.12 - R 4.1.3 - Ruby 2.7.5p203 ### Package Management -- Bundler version 2.3.9 +- Bundler version 2.3.10 - Carthage 0.38.0 - CocoaPods 1.11.3 -- Composer 2.2.9 -- Homebrew 3.4.3 +- Composer 2.3.3 +- Homebrew 3.4.4 - Miniconda 4.11.0 - NPM 8.5.0 - NuGet 5.9.0.7134 - Pip 20.3.4 (python 2.7) -- Pip 21.3.1 (python 3.9) +- Pip 22.0.4 (python 3.9) - Pipx 1.0.0 - RubyGems 3.2.33 -- Vcpkg 2022 (build from master \<6065e5175>) +- Vcpkg 2022 (build from master \<01d6f6ff1>) - Yarn 1.22.18 #### Environment variables @@ -54,21 +59,21 @@ ### Project Management - Apache Ant(TM) 1.10.12 - Apache Maven 3.8.5 -- Gradle 7.4.1 +- Gradle 7.4.2 - Sbt 1.6.2 ### Utilities - 7-Zip 17.04 - aria2 1.36.0 - azcopy 10.14.1 -- bazel 5.0.0 +- bazel 5.1.0 - bazelisk 1.11.0 - bsdtar 3.3.2 - available by 'tar' alias - Curl 7.82.0 - Git 2.35.1 - Git LFS: 3.1.2 -- GitHub CLI: 2.6.0 -- GNU parallel 20220222 +- GitHub CLI: 2.7.0 +- GNU parallel 20220322 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.3 - gpg (GnuPG) 2.3.4 @@ -87,20 +92,21 @@ - Switchaudio-osx 1.1.0 - Vagrant 2.2.19 - virtualbox 6.1.32r149290 +- yq (https://github.com/mikefarah/yq/) version 4.24.2 - zstd 1.5.2 ### Tools -- Aliyun CLI 3.0.112 +- Aliyun CLI 3.0.113 - App Center CLI 2.10.8 -- AWS CLI 2.4.27 -- AWS SAM CLI 1.41.0 +- AWS CLI 2.5.2 +- AWS SAM CLI 1.43.0 - AWS Session Manager CLI 1.2.295.0 -- Azure CLI (azure-devops) 0.24.0 +- Azure CLI (azure-devops) 0.25.0 - Azure CLI 2.34.1 -- Bicep CLI 0.4.1272 +- Bicep CLI 0.4.1318 - Cabal 3.6.2.0 -- Cmake 3.22.3 -- Fastlane 2.205.0 +- Cmake 3.23.0 +- Fastlane 2.205.1 - GHC 9.2.2 - GHCup v0.1.17.6 - Jazzy 0.14.2 @@ -110,26 +116,26 @@ - Xcode Command Line Tools 12.4.0.0.1.1610135815 ### Linters -- SwiftLint 0.46.5 +- SwiftLint 0.47.0 - yamllint 1.26.3 ### Browsers - Safari 15.4 (15613.1.17.1.11) - SafariDriver 15.4 (15613.1.17.1.11) -- Google Chrome 99.0.4844.83 -- ChromeDriver 99.0.4844.51 -- Microsoft Edge 99.0.1150.46 -- MSEdgeDriver 99.0.1150.46 -- Mozilla Firefox 98.0.1 +- Google Chrome 100.0.4896.60 +- ChromeDriver 100.0.4896.60 +- Microsoft Edge 100.0.1185.29 +- MSEdgeDriver 100.0.1185.29 +- Mozilla Firefox 98.0.2 - geckodriver 0.30.0 -- Selenium server 4.1.2 +- Selenium server 4.1.3 #### Environment variables -| Name | Value | -| --------------- | --------------------------------------------- | -| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/99.0.4844.51 | -| EDGEWEBDRIVER | /usr/local/share/edge_driver | -| GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | +| Name | Value | +| --------------- | ---------------------------------------------- | +| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/100.0.4896.60 | +| EDGEWEBDRIVER | /usr/local/share/edge_driver | +| GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | ### Java | Version | Vendor | Environment Variable | @@ -159,15 +165,15 @@ - 3.6.15 - 3.7.12 - 3.8.12 -- 3.9.11 -- 3.10.3 +- 3.9.12 +- 3.10.4 #### PyPy -- 2.7.18 [PyPy 7.3.8] +- 2.7.18 [PyPy 7.3.9] - 3.6.12 [PyPy 7.3.3] -- 3.7.12 [PyPy 7.3.8] -- 3.8.12 [PyPy 7.3.8] -- 3.9.10 [PyPy 7.3.8] +- 3.7.13 [PyPy 7.3.9] +- 3.8.13 [PyPy 7.3.9] +- 3.9.12 [PyPy 7.3.9] #### Node.js - 12.22.11 @@ -180,6 +186,7 @@ | 1.15.15 (Default) | x64 | GOROOT_1_15_X64 | | 1.16.15 | x64 | GOROOT_1_16_X64 | | 1.17.8 | x64 | GOROOT_1_17_X64 | +| 1.18.0 | x64 | GOROOT_1_18_X64 | ### Rust Tools - Cargo 1.59.0 @@ -191,7 +198,7 @@ - Bindgen 0.59.2 - Cargo-audit 0.16.0 - Cargo-outdated 0.11.0 -- Cbindgen 0.20.0 +- Cbindgen 0.21.0 - Clippy 0.1.59 - Rustfmt 1.4.38-stable @@ -353,7 +360,7 @@ | Package Name | Version | | -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 4.0 | -| Android Emulator | 31.2.8 | +| Android Emulator | 31.2.9 | | Android SDK Build-tools | 32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3<br>26.0.0 26.0.1 26.0.2 26.0.3<br>25.0.0 25.0.1 25.0.2 25.0.3<br>24.0.0 24.0.1 24.0.2 24.0.3 | | Android SDK Platforms | android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3)<br>android-26 (rev 2)<br>android-25 (rev 3)<br>android-24 (rev 2) | | Android SDK Platform-Tools | 33.0.1 | From 417ce97d0584b7d7f949374dcdb54e7d19075ee7 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 7 Apr 2022 19:01:51 +0000 Subject: [PATCH 1057/3485] Updating readme file for macOS-12 version 20220403.1 (#5338) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-12-Readme.md | 100 +++++++++++++++++--------------- 1 file changed, 54 insertions(+), 46 deletions(-) diff --git a/images/macos/macos-12-Readme.md b/images/macos/macos-12-Readme.md index 6948f29a213b..e7965fd3fe1e 100644 --- a/images/macos/macos-12-Readme.md +++ b/images/macos/macos-12-Readme.md @@ -1,14 +1,19 @@ +| Announcements | +|-| +| [[macOS] Default Xcode on Monterey image will be set to Xcode 13.3 on April, 11](https://github.com/actions/virtual-environments/issues/5328) | +| [[All OSs] Go versions less than 1.16 will be removed on April, 11](https://github.com/actions/virtual-environments/issues/5280) | +*** # macOS 12.3 info -- System Version: macOS 12.3 (21E230) +- System Version: macOS 12.3.1 (21E258) - Kernel Version: Darwin 21.4.0 -- Image Version: 20220323.2 +- Image Version: 20220403.1 ## Installed Software ### Language and Runtime - .NET SDK 3.1.101 3.1.201 3.1.302 3.1.417 5.0.102 5.0.202 5.0.302 5.0.406 - Bash 3.2.57(1)-release -- Clang/LLVM 13.0.0 is default - Clang/LLVM 13.0.1 is available on `'$(brew --prefix llvm)/bin/clang'` +- Clang/LLVM 13.1.6 is default - gcc-11 (Homebrew GCC 11.2.0_3) 11.2.0 - available by `gcc-11` alias - GNU Fortran (Homebrew GCC 11.2.0_3) 11.2.0 - available by `gfortran-11` alias - Go 1.17.8 @@ -21,42 +26,42 @@ - Perl 5.34.0 - PHP 8.1.4 - Python 2.7.18 -- Python 3.9.10 +- Python 3.9.12 - R 4.1.3 - Ruby 3.0.3p157 ### Package Management -- Bundler version 2.3.9 +- Bundler version 2.3.10 - Carthage 0.38.0 - CocoaPods 1.11.3 -- Composer 2.2.9 -- Homebrew 3.4.3 +- Composer 2.3.3 +- Homebrew 3.4.4 - NPM 8.5.0 - NuGet 5.9.0.7134 - Pip 20.3.4 (python 2.7) -- Pip 21.3.1 (python 3.9) +- Pip 22.0.4 (python 3.9) - Pipx 1.0.0 - RubyGems 3.2.33 -- Vcpkg 2022 (build from master \<ee2fa5303>) +- Vcpkg 2022 (build from master \<01d6f6ff1>) - Yarn 1.22.18 ### Project Management - Apache Ant(TM) 1.10.12 - Apache Maven 3.8.5 -- Gradle 7.4.1 +- Gradle 7.4.2 - Sbt 1.6.2 ### Utilities - 7-Zip 17.04 - aria2 1.36.0 - azcopy 10.14.1 -- bazel 5.0.0 +- bazel 5.1.0 - bazelisk 1.11.0 - bsdtar 3.5.1 - available by 'tar' alias - Curl 7.82.0 - Git 2.35.1 - Git LFS: 3.1.2 -- GitHub CLI: 2.6.0 +- GitHub CLI: 2.7.0 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.3 - gpg (GnuPG) 2.3.4 @@ -71,19 +76,20 @@ - Sox 14.4.2 - Subversion (SVN) 1.14.1 - Switchaudio-osx 1.1.0 +- yq (https://github.com/mikefarah/yq/) version 4.24.2 - zstd 1.5.2 ### Tools - App Center CLI command -- AWS CLI 2.4.28 -- AWS SAM CLI 1.41.0 +- AWS CLI 2.5.2 +- AWS SAM CLI 1.43.0 - AWS Session Manager CLI 1.2.295.0 -- Azure CLI (azure-devops) 0.24.0 +- Azure CLI (azure-devops) 0.25.0 - Azure CLI 2.34.1 -- Bicep CLI 0.4.1272 +- Bicep CLI 0.4.1318 - Cabal 3.6.2.0 -- Cmake 3.22.3 -- Fastlane 2.205.0 +- Cmake 3.23.0 +- Fastlane 2.205.1 - GHC 9.2.2 - GHCup v0.1.17.6 - Jazzy 0.14.2 @@ -96,22 +102,22 @@ - yamllint 1.26.3 ### Browsers -- Safari 15.4 (17613.1.17.1.6) -- SafariDriver 15.4 (17613.1.17.1.6) -- Google Chrome 99.0.4844.83 -- ChromeDriver 99.0.4844.51 -- Microsoft Edge 99.0.1150.46 -- MSEdgeDriver 99.0.1150.46 -- Mozilla Firefox 98.0.1 +- Safari 15.4 (17613.1.17.1.13) +- SafariDriver 15.4 (17613.1.17.1.13) +- Google Chrome 100.0.4896.60 +- ChromeDriver 100.0.4896.60 +- Microsoft Edge 100.0.1185.29 +- MSEdgeDriver 100.0.1185.29 +- Mozilla Firefox 98.0.2 - geckodriver 0.30.0 -- Selenium server 4.1.2 +- Selenium server 4.1.3 #### Environment variables -| Name | Value | -| --------------- | --------------------------------------------- | -| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/99.0.4844.51 | -| EDGEWEBDRIVER | /usr/local/share/edge_driver | -| GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | +| Name | Value | +| --------------- | ---------------------------------------------- | +| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/100.0.4896.60 | +| EDGEWEBDRIVER | /usr/local/share/edge_driver | +| GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | ### Java | Version | Vendor | Environment Variable | @@ -133,14 +139,14 @@ #### Python - 3.7.12 - 3.8.12 -- 3.9.11 -- 3.10.3 +- 3.9.12 +- 3.10.4 #### PyPy -- 2.7.18 [PyPy 7.3.8] -- 3.7.12 [PyPy 7.3.8] -- 3.8.12 [PyPy 7.3.8] -- 3.9.10 [PyPy 7.3.8] +- 2.7.18 [PyPy 7.3.9] +- 3.7.13 [PyPy 7.3.9] +- 3.8.13 [PyPy 7.3.9] +- 3.9.12 [PyPy 7.3.9] #### Node.js - 12.22.11 @@ -153,6 +159,7 @@ | 1.15.15 | x64 | GOROOT_1_15_X64 | | 1.16.15 | x64 | GOROOT_1_16_X64 | | 1.17.8 (Default) | x64 | GOROOT_1_17_X64 | +| 1.18.0 | x64 | GOROOT_1_18_X64 | ### Rust Tools - Cargo 1.59.0 @@ -164,7 +171,7 @@ - Bindgen 0.59.2 - Cargo-audit 0.16.0 - Cargo-outdated 0.11.0 -- Cbindgen 0.20.0 +- Cbindgen 0.21.0 - Clippy 0.1.59 - Rustfmt 1.4.38-stable @@ -192,8 +199,9 @@ #### Xamarin bundles | symlink | Xamarin.Mono | Xamarin.iOS | Xamarin.Mac | Xamarin.Android | | ----------------- | ------------ | ----------- | ----------- | --------------- | +| 6_12_14 (default) | 6.12 | 15.8 | 8.8 | 12.0 | | 6_12_13 | 6.12 | 15.6 | 8.6 | 12.0 | -| 6_12_12 (default) | 6.12 | 15.4 | 8.4 | 12.0 | +| 6_12_12 | 6.12 | 15.4 | 8.4 | 12.0 | | 6_12_11 | 6.12 | 15.2 | 8.2 | 12.0 | | 6_12_10 | 6.12 | 15.0 | 7.14 | 11.3 | @@ -201,12 +209,12 @@ - NUnit 3.6.1 ### Xcode -| Version | Build | Path | -| ---------------- | -------- | ------------------------------ | -| 13.3 | 13E113 | /Applications/Xcode_13.3.app | -| 13.2.1 (default) | 13C100 | /Applications/Xcode_13.2.1.app | -| 13.2 | 13C90 | /Applications/Xcode_13.2.app | -| 13.1 | 13A1030d | /Applications/Xcode_13.1.app | +| Version | Build | Path | +| -------------- | -------- | ------------------------------ | +| 13.3 (default) | 13E113 | /Applications/Xcode_13.3.app | +| 13.2.1 | 13C100 | /Applications/Xcode_13.2.1.app | +| 13.2 | 13C90 | /Applications/Xcode_13.2.app | +| 13.1 | 13A1030d | /Applications/Xcode_13.1.app | #### Xcode Support Tools - xcpretty 0.3.0 @@ -257,7 +265,7 @@ | Package Name | Version | | -------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 4.0 | -| Android Emulator | 31.2.8 | +| Android Emulator | 31.2.9 | | Android SDK Build-tools | 32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | | Android SDK Platforms | android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | | Android SDK Platform-Tools | 33.0.1 | From fe1ff6476cf35950c0230a5d2ba108170bc75ea7 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 7 Apr 2022 19:44:28 +0000 Subject: [PATCH 1058/3485] Updating readme file for ubuntu20 version 20220405.4 (#5355) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2004-Readme.md | 79 ++++++++++++++++--------------- 1 file changed, 40 insertions(+), 39 deletions(-) diff --git a/images/linux/Ubuntu2004-Readme.md b/images/linux/Ubuntu2004-Readme.md index c236f7244d22..c23a3f28c20e 100644 --- a/images/linux/Ubuntu2004-Readme.md +++ b/images/linux/Ubuntu2004-Readme.md @@ -1,23 +1,24 @@ | Announcements | |-| -| [[All OSs] Go versions less than 1.16 will be removed on April, 11](https://github.com/actions/virtual-environments/issues/5280) | +| [[Ubuntu] PHP 7.1 will be removed from Ubuntu 18 on April, 18](https://github.com/actions/virtual-environments/issues/5326) | +| [[All OSs] Go versions less than 1.16 will be removed and the default will be set to 1.17 on April, 11](https://github.com/actions/virtual-environments/issues/5280) | | [[Ubuntu] Issue with libstdc++ cannot allocate memory in static TLS block](https://github.com/actions/virtual-environments/issues/4799) | *** # Ubuntu 20.04.4 LTS -- Linux kernel version: 5.13.0-1017-azure -- Image Version: 20220330.0 +- Linux kernel version: 5.13.0-1021-azure +- Image Version: 20220405.4 ## Installed Software ### Language and Runtime - Bash 5.0.17(1)-release - Clang 10.0.0, 11.0.0, 12.0.0 - Clang-format 10.0.0, 11.0.0, 12.0.0 -- Erlang 24.3.2 (Eshell 12.3) +- Erlang 24.3.3 (Eshell 12.3.1) - Erlang rebar3 3.18.0 - GNU C++ 9.4.0, 10.3.0 - GNU Fortran 9.4.0, 10.3.0 - Julia 1.7.2 -- Kotlin 1.6.10-release-923 +- Kotlin 1.6.20-release-275 - Mono 6.12.0.122 (apt source repository: https://download.mono-project.com/repo/ubuntu stable-focal main) - MSBuild 16.6.0.15201 (from /usr/lib/mono/msbuild/15.0/bin/MSBuild.dll) - Node 16.14.2 @@ -30,14 +31,14 @@ ### Package Management - cpan 1.64 - Helm 3.8.1 -- Homebrew 3.4.4 +- Homebrew 3.4.5 - Miniconda 4.11.0 - Npm 8.5.0 - Pip 20.0.2 - Pip3 20.0.2 - Pipx 1.0.0 - RubyGems 3.1.2 -- Vcpkg (build from master \<4f778cf09>) +- Vcpkg (build from master \<e79aaaaf3>) - Yarn 1.22.18 #### Environment variables @@ -48,7 +49,7 @@ ### Project Management - Ant 1.10.7 -- Gradle 7.4.1 +- Gradle 7.4.2 - Lerna 4.0.0 - Maven 3.8.5 - Sbt 1.6.2 @@ -62,10 +63,10 @@ - Bicep 0.4.1318 - Buildah 1.21.3 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - CMake 3.23.0 -- CodeQL Action Bundle 2.8.3 +- CodeQL Action Bundle 2.8.4 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.3.3+azure-1 -- Docker-Buildx 0.8.1 +- Docker Compose v2 2.4.1+azure-1 +- Docker-Buildx 0.8.2 - Docker-Moby Client 20.10.14+azure-1 - Docker-Moby Server 20.10.14+azure-1 - Fastlane 2.205.1 @@ -73,8 +74,8 @@ - Git LFS 3.1.2 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.6.0 - Haveged 1.9.1 -- Heroku 7.59.4 -- HHVM (HipHop VM) 4.154.1 +- Heroku 7.60.1 +- HHVM (HipHop VM) 4.155.0 - jq 1.6 - Kind 0.12.0 - Kubectl 1.23.5 @@ -88,10 +89,10 @@ - nvm 0.39.1 - OpenSSL 1.1.1f 31 Mar 2020 - Packer 1.8.0 -- Parcel 2.4.0 +- Parcel 2.4.1 - PhantomJS 2.1.1 - Podman 3.4.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- Pulumi 3.27.0 +- Pulumi 3.28.0 - R 4.1.3 - Skopeo 1.3.0 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 @@ -103,15 +104,15 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.114 -- AWS CLI 2.5.0 -- AWS CLI Session manager plugin 1.2.295.0 +- AWS CLI 2.5.2 +- AWS CLI Session manager plugin 1.2.312.0 - AWS SAM CLI 1.43.0 - Azure CLI (azure-cli) 2.34.1 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.25.0 -- GitHub CLI 2.6.0 +- GitHub CLI 2.7.0 - Google Cloud SDK 369.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 9.13.6 +- Netlify CLI 9.16.3 - OpenShift CLI 4.10.6 - ORAS CLI 0.12.0 - Vercel CLI 24.0.1 @@ -131,9 +132,9 @@ ### PHP | Tool | Version | | -------- | ------------------- | -| PHP | 7.4.28 8.0.17 8.1.3 | -| Composer | 2.2.10 | -| PHPUnit | 8.5.25 | +| PHP | 7.4.28 8.0.17 8.1.4 | +| Composer | 2.3.3 | +| PHPUnit | 8.5.26 | ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ``` @@ -158,8 +159,8 @@ - Rustfmt 1.4.38 ### Browsers and Drivers -- Google Chrome 100.0.4896.60 -- ChromeDriver 100.0.4896.20 +- Google Chrome 100.0.4896.75 +- ChromeDriver 100.0.4896.60 - Mozilla Firefox 98.0.2 - Geckodriver 0.30.0 - Chromium 100.0.4896.0 @@ -190,7 +191,7 @@ PostgreSQL service is disabled by default. Use the following command as a part of your job to start the service: 'sudo systemctl start postgresql.service' ``` #### MySQL -- MySQL 8.0.26 +- MySQL 8.0.28-0ubuntu0.20.04.3 - MySQL Server (user:root password:root) ``` @@ -290,22 +291,22 @@ ### Cached Docker images | Repository:Tag | Digest | Created | | ----------------------- | ------------------------------------------------------------------------ | ---------- | -| alpine:3.12 | sha256:e42c1b8e03bdaa471deb198d981b52ac421441975195a20004aea624890f8b1c | 2022-03-29 | -| alpine:3.13 | sha256:6b6249407a7901591e094262327b79de21f2bfb9f597866f0a2bbb3b3d98e00c | 2022-03-29 | -| alpine:3.14 | sha256:85c63ff404e9b4daf18f264447161b50ffa70047cc4c03381478cf2c6edfa9da | 2022-03-29 | -| buildpack-deps:bullseye | sha256:841f6d3f91c1a25f362291ff6d6fcc755b78d9882da71621f06a7ca855abe060 | 2022-03-29 | -| buildpack-deps:buster | sha256:985480f24616ea7e388136cc5f1412c2ffba5e6cf38bd647859ad63f3d8ac16a | 2022-03-29 | -| buildpack-deps:stretch | sha256:b4087d6c971248c3eb86ee7f06b71b3cd20c7b721807dc1ebe83ba7dce76c500 | 2022-03-29 | +| alpine:3.12 | sha256:c75ac27b49326926b803b9ed43bf088bc220d22556de1bc5f72d742c91398f69 | 2022-04-05 | +| alpine:3.13 | sha256:ccf92aa53bc6c3b25be2ad0cce80baec1778f007f7e076b0ffbd1b225d0b3a9b | 2022-04-05 | +| alpine:3.14 | sha256:06b5d462c92fc39303e6363c65e074559f8d6b1363250027ed5053557e3398c5 | 2022-04-05 | +| buildpack-deps:bullseye | sha256:b22e1a6daf16ea7e682e1d813aac528bb027f0772dc819716b4f41fbb06a3ffc | 2022-03-29 | +| buildpack-deps:buster | sha256:2c7b57f137d4ec1346ab226acd3eeac4f143ae2adc65a8abbd64489233065773 | 2022-03-29 | +| buildpack-deps:stretch | sha256:9cee83a572cc5f844548ee5f29eb0284772a162f312d7f049ad178207a0bae6d | 2022-03-29 | | debian:10 | sha256:1b236b48c1ef66fa08535a5153266f4959bf58f948db3e68f7d678b651d8e33a | 2022-03-29 | | debian:11 | sha256:87eefc7c15610cca61db5c0fd280911c6a737c0680d807432c0bd80cd0cca39b | 2022-03-29 | | debian:9 | sha256:a8cc1744bbdd5266678e3e8b3e6387e45c053218438897e86876f2eb104e5534 | 2022-03-29 | | moby/buildkit:latest | sha256:c2aeafaed434edfde90706b5cf9a56935c389192858d1090e17a1440a6e96482 | 2022-03-09 | -| node:12 | sha256:e88281f7b3947019c8b5fe750a06122ac3c2612fe00719a133ea5bf8bfedafbb | 2022-03-18 | -| node:12-alpine | sha256:41a1b6dd829a9a1b3da8817809c3ddf5e97c8bc66cbc84363f697e31c0adab4b | 2022-03-29 | -| node:14 | sha256:7d38b5ed42b2ac006c3a79ef8ad9f1e912bde6cb4cb4243c188689d5aa1aa437 | 2022-03-18 | -| node:14-alpine | sha256:d9e58586730f7eb7c885f515f703f4a88e4a3ad8bf982aa5bb4ab6a1111aed79 | 2022-03-29 | -| node:16 | sha256:68e34cfcd8276ad531b12b3454af5c24cd028752dfccacce4e19efef6f7cdbe0 | 2022-03-18 | -| node:16-alpine | sha256:51542061b77f105c2db658035ac6070229f9ea1d3270ab78775df9a825d9a759 | 2022-03-29 | +| node:12 | sha256:461c7f8b5e042fa7f47620cbee7772e76ce3fa0891edaab29bf7ebf0e84b9a1a | 2022-03-31 | +| node:12-alpine | sha256:bbc10cf532971046b490806de40f5959fa3bdd0acb82955847bdb0ffd1ab4854 | 2022-04-05 | +| node:14 | sha256:b2d1c5df5e001b694115f64f4532c7eec2e5dbd73db6e0caacf0049bd0aed7d2 | 2022-03-31 | +| node:14-alpine | sha256:8845b4f88f64f8c56a39236648ba22946e806a6153c10911f77b70e5a2edb4ca | 2022-04-05 | +| node:16 | sha256:ffe804d6fcced29bcfc3477de079d03a9c2b0e4917e44bfeafb1a6b0f875e383 | 2022-03-31 | +| node:16-alpine | sha256:28bed508446db2ee028d08e76fb47b935defa26a84986ca050d2596ea67fd506 | 2022-04-05 | | ubuntu:16.04 | sha256:0f71fa8d4d2d4292c3c617fda2b36f6dabe5c8b6e34c3dc5b0d17d4e704bd39c | 2021-08-31 | | ubuntu:18.04 | sha256:d8ac28b7bec51664c6b71a9dd1d8f788127ff310b8af30820560973bcfc605a0 | 2022-03-18 | | ubuntu:20.04 | sha256:bea6d19168bbfd6af8d77c2cc3c572114eb5d113e6f422573c93cb605a0e2ffb | 2022-03-18 | @@ -336,7 +337,7 @@ | iproute2 | 5.5.0-1ubuntu1 | | iputils-ping | 3:20190709-3 | | jq | 1.6-1ubuntu0.20.04.1 | -| lib32z1 | 1:1.2.11.dfsg-2ubuntu1.2 | +| lib32z1 | 1:1.2.11.dfsg-2ubuntu1.3 | | libc++-dev | 1:10.0-50\~exp1 | | libc++abi-dev | 1:10.0-50\~exp1 | | libcurl4 | 7.68.0-1ubuntu2.7 | @@ -368,7 +369,7 @@ | pollinate | 4.33-3ubuntu1.20.04.1 | | python-is-python3 | 3.8.2-4 | | rpm | 4.14.2.1+dfsg1-1build2 | -| rsync | 3.1.3-8ubuntu0.2 | +| rsync | 3.1.3-8ubuntu0.3 | | shellcheck | 0.7.0-2build2 | | sphinxsearch | 2.2.11-2ubuntu2 | | sqlite3 | 3.31.1-4ubuntu0.2 | From b13a40744d7af3ed5ed4756ebfea353dfe7948e8 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Fri, 8 Apr 2022 09:01:34 +0200 Subject: [PATCH 1059/3485] [Windows] Update Az module to 7.3.2 version (#5346) --- images/win/toolsets/toolset-2019.json | 2 +- images/win/toolsets/toolset-2022.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index e1477d36af7b..e65a43257df2 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -125,7 +125,7 @@ "name": "az", "url" : "https://raw.githubusercontent.com/Azure/az-ps-module-versions/main/versions-manifest.json", "versions": [ - "7.1.0" + "7.3.2" ], "zip_versions": [ "1.0.0", diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index ab8ac80f1f95..1a010cccb8a3 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -117,7 +117,7 @@ "name": "az", "url" : "https://raw.githubusercontent.com/Azure/az-ps-module-versions/main/versions-manifest.json", "versions": [ - "7.1.0" + "7.3.2" ], "zip_versions": [ "6.6.0" From f9eb5d95a59e0451b72c02edff3305de8678a1d5 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 8 Apr 2022 12:10:54 +0000 Subject: [PATCH 1060/3485] Updating readme file for macOS-11 version 20220402.1 (#5337) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-11-Readme.md | 82 ++++++++++++++++++--------------- 1 file changed, 45 insertions(+), 37 deletions(-) diff --git a/images/macos/macos-11-Readme.md b/images/macos/macos-11-Readme.md index 714aa3c39a53..a6bff24596cd 100644 --- a/images/macos/macos-11-Readme.md +++ b/images/macos/macos-11-Readme.md @@ -1,7 +1,12 @@ +| Announcements | +|-| +| [[macOS] Default Xcode on Monterey image will be set to Xcode 13.3 on April, 11](https://github.com/actions/virtual-environments/issues/5328) | +| [[All OSs] Go versions less than 1.16 will be removed on April, 11](https://github.com/actions/virtual-environments/issues/5280) | +*** # macOS 11.6 info - System Version: macOS 11.6.5 (20G527) - Kernel Version: Darwin 20.6.0 -- Image Version: 20220322.1 +- Image Version: 20220402.1 ## Installed Software ### Language and Runtime @@ -25,24 +30,24 @@ - Perl 5.34.0 - PHP 8.1.4 - Python 2.7.18 -- Python 3.9.10 +- Python 3.9.12 - R 4.1.3 - Ruby 2.7.5p203 ### Package Management -- Bundler version 2.3.9 +- Bundler version 2.3.10 - Carthage 0.38.0 - CocoaPods 1.11.3 -- Composer 2.2.9 -- Homebrew 3.4.3 +- Composer 2.3.3 +- Homebrew 3.4.4 - Miniconda 4.11.0 - NPM 8.5.0 - NuGet 5.9.0.7134 - Pip 20.3.4 (python 2.7) -- Pip 21.3.1 (python 3.9) +- Pip 22.0.4 (python 3.9) - Pipx 1.0.0 - RubyGems 3.2.33 -- Vcpkg 2022 (build from master \<6065e5175>) +- Vcpkg 2022 (build from master \<01d6f6ff1>) - Yarn 1.22.18 #### Environment variables @@ -54,20 +59,20 @@ ### Project Management - Apache Ant(TM) 1.10.12 - Apache Maven 3.8.5 -- Gradle 7.4.1 +- Gradle 7.4.2 - Sbt 1.6.2 ### Utilities - 7-Zip 17.04 - aria2 1.36.0 - azcopy 10.14.1 -- bazel 5.0.0 +- bazel 5.1.0 - bazelisk 1.11.0 - bsdtar 3.3.2 - available by 'tar' alias - Curl 7.82.0 - Git 2.35.1 - Git LFS: 3.1.2 -- GitHub CLI: 2.6.0 +- GitHub CLI: 2.7.0 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.3 - gpg (GnuPG) 2.3.4 @@ -84,20 +89,21 @@ - Sox 14.4.2 - Subversion (SVN) 1.14.1 - Switchaudio-osx 1.1.0 +- yq (https://github.com/mikefarah/yq/) version 4.24.2 - zstd 1.5.2 ### Tools -- Aliyun CLI 3.0.112 +- Aliyun CLI 3.0.113 - App Center CLI 2.10.8 -- AWS CLI 2.4.27 -- AWS SAM CLI 1.41.0 +- AWS CLI 2.5.2 +- AWS SAM CLI 1.43.0 - AWS Session Manager CLI 1.2.295.0 -- Azure CLI (azure-devops) 0.24.0 +- Azure CLI (azure-devops) 0.25.0 - Azure CLI 2.34.1 -- Bicep CLI 0.4.1272 +- Bicep CLI 0.4.1318 - Cabal 3.6.2.0 -- Cmake 3.22.3 -- Fastlane 2.205.0 +- Cmake 3.23.0 +- Fastlane 2.205.1 - GHC 9.2.2 - GHCup v0.1.17.6 - Jazzy 0.14.2 @@ -107,26 +113,26 @@ - Xcode Command Line Tools 13.2.0.0.1.1638488800 ### Linters -- SwiftLint 0.46.5 +- SwiftLint 0.47.0 - yamllint 1.26.3 ### Browsers - Safari 15.4 (16613.1.17.1.11) - SafariDriver 15.4 (16613.1.17.1.11) -- Google Chrome 99.0.4844.83 -- ChromeDriver 99.0.4844.51 -- Microsoft Edge 99.0.1150.46 -- MSEdgeDriver 99.0.1150.46 -- Mozilla Firefox 98.0.1 +- Google Chrome 100.0.4896.60 +- ChromeDriver 100.0.4896.60 +- Microsoft Edge 99.0.1150.55 +- MSEdgeDriver 99.0.1150.55 +- Mozilla Firefox 98.0.2 - geckodriver 0.30.0 -- Selenium server 4.1.2 +- Selenium server 4.1.3 #### Environment variables -| Name | Value | -| --------------- | --------------------------------------------- | -| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/99.0.4844.51 | -| EDGEWEBDRIVER | /usr/local/share/edge_driver | -| GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | +| Name | Value | +| --------------- | ---------------------------------------------- | +| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/100.0.4896.60 | +| EDGEWEBDRIVER | /usr/local/share/edge_driver | +| GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | ### Java | Version | Vendor | Environment Variable | @@ -151,14 +157,14 @@ #### Python - 3.7.12 - 3.8.12 -- 3.9.11 -- 3.10.3 +- 3.9.12 +- 3.10.4 #### PyPy -- 2.7.18 [PyPy 7.3.8] -- 3.7.12 [PyPy 7.3.8] -- 3.8.12 [PyPy 7.3.8] -- 3.9.10 [PyPy 7.3.8] +- 2.7.18 [PyPy 7.3.9] +- 3.7.13 [PyPy 7.3.9] +- 3.8.13 [PyPy 7.3.9] +- 3.9.12 [PyPy 7.3.9] #### Node.js - 12.22.11 @@ -171,6 +177,7 @@ | 1.15.15 (Default) | x64 | GOROOT_1_15_X64 | | 1.16.15 | x64 | GOROOT_1_16_X64 | | 1.17.8 | x64 | GOROOT_1_17_X64 | +| 1.18.0 | x64 | GOROOT_1_18_X64 | ### Rust Tools - Cargo 1.59.0 @@ -182,7 +189,7 @@ - Bindgen 0.59.2 - Cargo-audit 0.16.0 - Cargo-outdated 0.11.0 -- Cbindgen 0.20.0 +- Cbindgen 0.21.0 - Clippy 0.1.59 - Rustfmt 1.4.38-stable @@ -210,6 +217,7 @@ #### Xamarin bundles | symlink | Xamarin.Mono | Xamarin.iOS | Xamarin.Mac | Xamarin.Android | | ----------------- | ------------ | ----------- | ----------- | --------------- | +| 6_12_14 | 6.12 | 15.8 | 8.8 | 12.0 | | 6_12_13 | 6.12 | 15.6 | 8.6 | 12.0 | | 6_12_12 (default) | 6.12 | 15.4 | 8.4 | 12.0 | | 6_12_11 | 6.12 | 15.2 | 8.2 | 12.0 | @@ -312,7 +320,7 @@ | Package Name | Version | | -------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 4.0 | -| Android Emulator | 31.2.8 | +| Android Emulator | 31.2.9 | | Android SDK Build-tools | 32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | | Android SDK Platforms | android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | | Android SDK Platform-Tools | 33.0.1 | From 06446ddb68fa8afa21cd8d2676a1757cbf6e9ce3 Mon Sep 17 00:00:00 2001 From: Dusko Dobranic <101048884+ddobranic@users.noreply.github.com> Date: Fri, 8 Apr 2022 18:03:25 +0200 Subject: [PATCH 1061/3485] Update default Go version to 1.16 or higher (#5336) --- images/linux/toolsets/toolset-1804.json | 3 +-- images/linux/toolsets/toolset-2004.json | 3 +-- images/macos/toolsets/toolset-10.15.json | 3 +-- images/macos/toolsets/toolset-11.json | 3 +-- images/macos/toolsets/toolset-12.json | 1 - images/win/toolsets/toolset-2016.json | 3 +-- images/win/toolsets/toolset-2019.json | 3 +-- images/win/toolsets/toolset-2022.json | 3 +-- 8 files changed, 7 insertions(+), 15 deletions(-) diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index 67ebf9eb7a22..bfb7bb7f658c 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -42,12 +42,11 @@ "arch": "x64", "platform" : "linux", "versions": [ - "1.15.*", "1.16.*", "1.17.*", "1.18.*" ], - "default": "1.15.*" + "default": "1.17.*" }, { "name": "Ruby", diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index 88e85429365b..4198c2b24e11 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -44,12 +44,11 @@ "arch": "x64", "platform" : "linux", "versions": [ - "1.15.*", "1.16.*", "1.17.*", "1.18.*" ], - "default": "1.15.*" + "default": "1.17.*" }, { "name": "Ruby", diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index 48e60f7d83f9..3dfb00317601 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -290,7 +290,6 @@ "platform" : "darwin", "variable_template" : "GOROOT_{0}_{1}_X64", "versions": [ - "1.15.*", "1.16.*", "1.17.*", "1.18.*" @@ -333,7 +332,7 @@ ] }, "go": { - "default": "1.15" + "default": "1.17" }, "node": { "default": "16", diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index b2e83641b7e6..9a71b116675e 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -266,7 +266,6 @@ "platform" : "darwin", "variable_template" : "GOROOT_{0}_{1}_X64", "versions": [ - "1.15.*", "1.16.*", "1.17.*", "1.18.*" @@ -309,7 +308,7 @@ ] }, "go": { - "default": "1.15" + "default": "1.17" }, "node": { "default": "16", diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index 558ed471fa9a..97bccf171e93 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -180,7 +180,6 @@ "platform" : "darwin", "variable_template" : "GOROOT_{0}_{1}_X64", "versions": [ - "1.15.*", "1.16.*", "1.17.*", "1.18.*" diff --git a/images/win/toolsets/toolset-2016.json b/images/win/toolsets/toolset-2016.json index 936ceecce2f5..285c9582caac 100644 --- a/images/win/toolsets/toolset-2016.json +++ b/images/win/toolsets/toolset-2016.json @@ -70,12 +70,11 @@ "arch": "x64", "platform" : "win32", "versions": [ - "1.15.*", "1.16.*", "1.17.*", "1.18.*" ], - "default": "1.15.*" + "default": "1.17.*" } ], "powershellModules": [ diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index e65a43257df2..aab1861a3544 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -71,12 +71,11 @@ "arch": "x64", "platform" : "win32", "versions": [ - "1.15.*", "1.16.*", "1.17.*", "1.18.*" ], - "default": "1.15.*" + "default": "1.17.*" } ], "powershellModules": [ diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index 1a010cccb8a3..b5c6be82c65b 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -63,12 +63,11 @@ "arch": "x64", "platform" : "win32", "versions": [ - "1.15.*", "1.16.*", "1.17.*", "1.18.*" ], - "default": "1.16.*" + "default": "1.17.*" } ], "powershellModules": [ From 1ce167f82d749f09c49fb8ae7a6ce4829b59ed1f Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Mon, 11 Apr 2022 23:46:50 +0400 Subject: [PATCH 1062/3485] Add Xcode 13.3.1 (#5387) --- images/macos/toolsets/toolset-12.json | 1 + 1 file changed, 1 insertion(+) diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index 97bccf171e93..4985b7cae8cd 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -2,6 +2,7 @@ "xcode": { "default": "13.3", "versions": [ + { "link": "13.3.1", "version": "13.3.1" }, { "link": "13.3", "version": "13.3.0" }, { "link": "13.2.1", "version": "13.2.1" }, { "link": "13.2", "version": "13.2.0" }, From f5ca411fa71be3c65914465d9e28901bb25233e9 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Tue, 12 Apr 2022 10:03:33 +0200 Subject: [PATCH 1063/3485] [Ubuntu] Use OpenSSL package version in output (#5384) --- images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 index 7dd80a97d886..07356a30d10a 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 @@ -83,7 +83,7 @@ function Get-NodeVersion { } function Get-OpensslVersion { - return $(openssl version) + return "OpenSSL $(dpkg-query -W -f '${Version}' openssl)" } function Get-PerlVersion { From a388002a5722cdeab7bf7501f3dcd7f86da1223a Mon Sep 17 00:00:00 2001 From: Pat Myron <PatMyron@users.noreply.github.com> Date: Tue, 12 Apr 2022 08:59:55 -0700 Subject: [PATCH 1064/3485] toolcache ruby 3.1 (#5375) --- images/linux/toolsets/toolset-1804.json | 3 ++- images/linux/toolsets/toolset-2004.json | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index bfb7bb7f658c..2ff083ce41b8 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -57,7 +57,8 @@ "2.5.*", "2.6.*", "2.7.*", - "3.0.*" + "3.0.*", + "3.1.*" ] }, { diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index 4198c2b24e11..b5f83bef265a 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -58,7 +58,8 @@ "2.5.*", "2.6.*", "2.7.*", - "3.0.*" + "3.0.*", + "3.1.*" ] }, { From 11d669e34b70fe1e6a85014bba7564ece4a98c51 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Tue, 12 Apr 2022 20:29:43 +0200 Subject: [PATCH 1065/3485] [Ubuntu] remove php 7.1 from Bionic Beaver (#5390) --- images/linux/scripts/installers/php.sh | 20 +++++--------------- images/linux/toolsets/toolset-1804.json | 1 - 2 files changed, 5 insertions(+), 16 deletions(-) diff --git a/images/linux/scripts/installers/php.sh b/images/linux/scripts/installers/php.sh index 01aebd79b7e3..a2ebeeb2ae52 100644 --- a/images/linux/scripts/installers/php.sh +++ b/images/linux/scripts/installers/php.sh @@ -64,28 +64,18 @@ for version in $php_versions; do php$version-zip \ php$version-zmq - if [[ $version == "5.6" || $version == "7.0" || $version == "7.1" ]]; then - apt-get install -y --no-install-recommends php$version-mcrypt php$version-recode - fi - - if [[ $version == "7.2" || $version == "7.3" ]]; then - apt-get install -y --no-install-recommends php$version-recode - fi - - if [[ $version != "8.0" && $version != "8.1" ]]; then - apt-get install -y --no-install-recommends php$version-xmlrpc php$version-json - fi - - if [[ $version != "5.6" && $version != "7.0" ]]; then apt-get install -y --no-install-recommends php$version-pcov # Disable PCOV, as Xdebug is enabled by default # https://github.com/krakjoe/pcov#interoperability phpdismod -v $version pcov + + if [[ $version == "7.2" || $version == "7.3" ]]; then + apt-get install -y --no-install-recommends php$version-recode fi - if [[ $version = "7.0" || $version = "7.1" ]]; then - apt-get install -y --no-install-recommends php$version-sodium + if [[ $version != "8.0" && $version != "8.1" ]]; then + apt-get install -y --no-install-recommends php$version-xmlrpc php$version-json fi done diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index 2ff083ce41b8..10523a61423d 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -285,7 +285,6 @@ }, "php": { "versions": [ - "7.1", "7.2", "7.3", "7.4", From 4f62f8e9999a0c4cbe8d68518f2344a1c0d9dbfc Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Wed, 13 Apr 2022 10:05:32 +0200 Subject: [PATCH 1066/3485] Fix missing then (#5400) --- images/macos/provision/bootstrap-provisioner/setAutoLogin.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/macos/provision/bootstrap-provisioner/setAutoLogin.sh b/images/macos/provision/bootstrap-provisioner/setAutoLogin.sh index d8e1b186fa4f..e2880e157028 100644 --- a/images/macos/provision/bootstrap-provisioner/setAutoLogin.sh +++ b/images/macos/provision/bootstrap-provisioner/setAutoLogin.sh @@ -25,7 +25,7 @@ function kcpasswordEncode { #get padding by subtraction if under 11 local r=$(( ${#thisStringHex_array[@]} % 11 )) local padding=0 - if [ ${#thisStringHex_array[@]} -eq 11 ]; + if [ ${#thisStringHex_array[@]} -eq 11 ]; then local padding=1 elif [ $r -gt 0 ]; then local padding=$(( 11 - $r )) From 5da7f5bd603fed4b425ca62acd18fca2e7f71b87 Mon Sep 17 00:00:00 2001 From: Teemu Tapanila <teemu@tapanila.net> Date: Wed, 13 Apr 2022 11:57:22 +0300 Subject: [PATCH 1067/3485] Limit storageaccount name length to 24 characters (#5396) * Limit storageaccount name length to 24 characters * Check if the length of storageAccountName is more than 24 --- helpers/GenerateResourcesAndImage.ps1 | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/helpers/GenerateResourcesAndImage.ps1 b/helpers/GenerateResourcesAndImage.ps1 index d023e103937b..36515dcd5281 100644 --- a/helpers/GenerateResourcesAndImage.ps1 +++ b/helpers/GenerateResourcesAndImage.ps1 @@ -192,6 +192,12 @@ Function GenerateResourcesAndImage { # Resource group names may contain special characters, that are not allowed in the storage account name $storageAccountName = $storageAccountName.Replace("-", "").Replace("_", "").Replace("(", "").Replace(")", "").ToLower() $storageAccountName += "001" + + + # Storage Account Name can only be 24 characters long + if ($storageAccountName.Length -gt 24){ + $storageAccountName = $storageAccountName.Substring(0, 24) + } New-AzStorageAccount -ResourceGroupName $ResourceGroupName -AccountName $storageAccountName -Location $AzureLocation -SkuName "Standard_LRS" -AllowBlobPublicAccess $AllowBlobPublicAccess -EnableHttpsTrafficOnly $EnableHttpsTrafficOnly @@ -268,4 +274,4 @@ Function GenerateResourcesAndImage { -var "install_password=$($InstallPassword)" ` -var "allowed_inbound_ip_addresses=$($AgentIp)" ` $builderScriptPath -} \ No newline at end of file +} From 01f34021dc937a147be6e74f3002e0961d27fa06 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Wed, 13 Apr 2022 12:04:04 +0200 Subject: [PATCH 1068/3485] [Ubuntu] Remove hard-coded composer version (#5399) --- images/linux/scripts/installers/php.sh | 7 +------ images/linux/scripts/tests/Common.Tests.ps1 | 4 ---- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/images/linux/scripts/installers/php.sh b/images/linux/scripts/installers/php.sh index a2ebeeb2ae52..e230a3808678 100644 --- a/images/linux/scripts/installers/php.sh +++ b/images/linux/scripts/installers/php.sh @@ -86,12 +86,7 @@ apt-get install -y --no-install-recommends snmp # Install composer php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" php -r "if (hash_file('sha384', 'composer-setup.php') === file_get_contents('https://composer.github.io/installer.sig')) { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" -# Composer 2.3 increased the required PHP version to >=7.2.5 and thus stop supporting PHP 5.3.2 - 7.2.4 -if isUbuntu18; then - php composer-setup.php --version=2.2.9 -else - php composer-setup.php -fi +php composer-setup.php sudo mv composer.phar /usr/bin/composer php -r "unlink('composer-setup.php');" diff --git a/images/linux/scripts/tests/Common.Tests.ps1 b/images/linux/scripts/tests/Common.Tests.ps1 index 783e122d4554..ccd1efd0452d 100644 --- a/images/linux/scripts/tests/Common.Tests.ps1 +++ b/images/linux/scripts/tests/Common.Tests.ps1 @@ -20,10 +20,6 @@ Describe "PHP" { "composer --version" | Should -ReturnZeroExitCode } - It "Composer 2.2.9 on Ubuntu Server 18" -Skip:(-not (Test-IsUbuntu18)) { - composer --version | Should -Match "2.2.9" - } - It "Pear" { "pear" | Should -ReturnZeroExitCode } From 8a42776d3f08fa65896a7622ae881faaf00f71d2 Mon Sep 17 00:00:00 2001 From: Zoran Bjelica <100371150+zoran-bjelica@users.noreply.github.com> Date: Wed, 13 Apr 2022 14:48:06 +0200 Subject: [PATCH 1069/3485] [Windows] Add Ruby 3.1 to Windows 2019/2022 (#5392) * [Windows] Add Microsoft Reporting Services Projects support * [Windows] Add Ruby 3.1 to Windows 2019/2022 --- images/win/toolsets/toolset-2019.json | 3 ++- images/win/toolsets/toolset-2022.json | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index aab1861a3544..8830b4925ea1 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -9,7 +9,8 @@ "2.5", "2.6", "2.7", - "3.0" + "3.0", + "3.1" ], "default": "2.5" }, diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index b5c6be82c65b..00b8468c1488 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -6,7 +6,8 @@ "platform" : "win32", "versions": [ "2.7", - "3.0" + "3.0", + "3.1" ], "default": "3.0" }, From 1da2217ce856691f909a32e241efb2474b274f3d Mon Sep 17 00:00:00 2001 From: Zoran Bjelica <100371150+zoran-bjelica@users.noreply.github.com> Date: Wed, 13 Apr 2022 18:37:54 +0200 Subject: [PATCH 1070/3485] [MacOS] Add Ruby 3.1 to 11/12 (#5395) --- images/macos/toolsets/toolset-11.json | 3 ++- images/macos/toolsets/toolset-12.json | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index 9a71b116675e..81b54cde61dd 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -279,7 +279,8 @@ "2.5.*", "2.6.*", "2.7.*", - "3.0.*" + "3.0.*", + "3.1.*" ] } ], diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index 4985b7cae8cd..f3ed7f2c5f9d 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -191,7 +191,8 @@ "arch": "x64", "versions": [ "2.7.*", - "3.0.*" + "3.0.*", + "3.1.*" ] } ], From 4549caa5708a8383487173629d8e521790000132 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 13 Apr 2022 19:19:32 +0000 Subject: [PATCH 1071/3485] Updating readme file for macOS-12 version 20220412.1 (#5397) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-12-Readme.md | 75 ++++++++++++++++----------------- 1 file changed, 37 insertions(+), 38 deletions(-) diff --git a/images/macos/macos-12-Readme.md b/images/macos/macos-12-Readme.md index e7965fd3fe1e..8b57c374b6ee 100644 --- a/images/macos/macos-12-Readme.md +++ b/images/macos/macos-12-Readme.md @@ -1,12 +1,11 @@ | Announcements | |-| -| [[macOS] Default Xcode on Monterey image will be set to Xcode 13.3 on April, 11](https://github.com/actions/virtual-environments/issues/5328) | -| [[All OSs] Go versions less than 1.16 will be removed on April, 11](https://github.com/actions/virtual-environments/issues/5280) | +| [[All OSs] Go versions less than 1.16 will be removed and the default will be set to 1.17 on April, 11](https://github.com/actions/virtual-environments/issues/5280) | *** # macOS 12.3 info - System Version: macOS 12.3.1 (21E258) - Kernel Version: Darwin 21.4.0 -- Image Version: 20220403.1 +- Image Version: 20220412.1 ## Installed Software ### Language and Runtime @@ -18,11 +17,11 @@ - GNU Fortran (Homebrew GCC 11.2.0_3) 11.2.0 - available by `gfortran-11` alias - Go 1.17.8 - julia 1.7.2 -- Kotlin 1.6.10-release-923 +- Kotlin 1.6.20-release-275 - MSBuild 16.10.1.58001 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) - Node.js v16.14.2 - NVM 0.39.1 -- NVM - Cached node versions: v12.22.11 v14.19.1 v16.14.2 +- NVM - Cached node versions: v12.22.12 v14.19.1 v16.14.2 - Perl 5.34.0 - PHP 8.1.4 - Python 2.7.18 @@ -31,18 +30,18 @@ - Ruby 3.0.3p157 ### Package Management -- Bundler version 2.3.10 +- Bundler version 2.3.11 - Carthage 0.38.0 - CocoaPods 1.11.3 -- Composer 2.3.3 -- Homebrew 3.4.4 +- Composer 2.3.4 +- Homebrew 3.4.6 - NPM 8.5.0 - NuGet 5.9.0.7134 - Pip 20.3.4 (python 2.7) - Pip 22.0.4 (python 3.9) - Pipx 1.0.0 - RubyGems 3.2.33 -- Vcpkg 2022 (build from master \<01d6f6ff1>) +- Vcpkg 2022 (build from master \<4415a0f31>) - Yarn 1.22.18 ### Project Management @@ -55,7 +54,7 @@ - 7-Zip 17.04 - aria2 1.36.0 - azcopy 10.14.1 -- bazel 5.1.0 +- bazel 5.1.1 - bazelisk 1.11.0 - bsdtar 3.5.1 - available by 'tar' alias - Curl 7.82.0 @@ -81,12 +80,12 @@ ### Tools - App Center CLI command -- AWS CLI 2.5.2 -- AWS SAM CLI 1.43.0 -- AWS Session Manager CLI 1.2.295.0 +- AWS CLI 2.5.4 +- AWS SAM CLI 1.46.0 +- AWS Session Manager CLI 1.2.312.0 - Azure CLI (azure-devops) 0.25.0 -- Azure CLI 2.34.1 -- Bicep CLI 0.4.1318 +- Azure CLI 2.35.0 +- Bicep CLI 0.5.6 - Cabal 3.6.2.0 - Cmake 3.23.0 - Fastlane 2.205.1 @@ -95,7 +94,7 @@ - Jazzy 0.14.2 - Stack 2.7.5 - Swig 4.0.2 -- Xcode Command Line Tools 13.3.0.0.1.1645755326 +- Xcode Command Line Tools 13.3.1.0.1.1648687083 ### Linters - SwiftLint 0.47.0 @@ -104,11 +103,11 @@ ### Browsers - Safari 15.4 (17613.1.17.1.13) - SafariDriver 15.4 (17613.1.17.1.13) -- Google Chrome 100.0.4896.60 +- Google Chrome 100.0.4896.88 - ChromeDriver 100.0.4896.60 -- Microsoft Edge 100.0.1185.29 -- MSEdgeDriver 100.0.1185.29 -- Mozilla Firefox 98.0.2 +- Microsoft Edge 100.0.1185.39 +- MSEdgeDriver 100.0.1185.39 +- Mozilla Firefox 99.0 - geckodriver 0.30.0 - Selenium server 4.1.3 @@ -149,22 +148,21 @@ - 3.9.12 [PyPy 7.3.9] #### Node.js -- 12.22.11 +- 12.22.12 - 14.19.1 - 16.14.2 #### Go | Version | Architecture | Environment Variable | | ------- | ------------ | -------------------- | -| 1.15.15 | x64 | GOROOT_1_15_X64 | | 1.16.15 | x64 | GOROOT_1_16_X64 | | 1.17.8 (Default) | x64 | GOROOT_1_17_X64 | | 1.18.0 | x64 | GOROOT_1_18_X64 | ### Rust Tools -- Cargo 1.59.0 -- Rust 1.59.0 -- Rustdoc 1.59.0 +- Cargo 1.60.0 +- Rust 1.60.0 +- Rustdoc 1.60.0 - Rustup 1.24.3 #### Packages @@ -172,7 +170,7 @@ - Cargo-audit 0.16.0 - Cargo-outdated 0.11.0 - Cbindgen 0.21.0 -- Clippy 0.1.59 +- Clippy 0.1.60 - Rustfmt 1.4.38-stable ### PowerShell Tools @@ -181,7 +179,7 @@ #### PowerShell Modules | Module | Version | | ---------------- | ------- | -| Az | 7.3.2 | +| Az | 7.4.0 | | MarkdownPS | 1.9 | | Pester | 5.3.1 | | PSScriptAnalyzer | 1.20.0 | @@ -211,6 +209,7 @@ ### Xcode | Version | Build | Path | | -------------- | -------- | ------------------------------ | +| 13.3.1 | 13E500a | /Applications/Xcode_13.3.1.app | | 13.3 (default) | 13E113 | /Applications/Xcode_13.3.app | | 13.2.1 | 13C100 | /Applications/Xcode_13.2.1.app | | 13.2 | 13C90 | /Applications/Xcode_13.2.app | @@ -225,41 +224,41 @@ | ----------------------- | -------------------- | ------------- | | macOS 12.0 | macosx12.0 | 13.1 | | macOS 12.1 | macosx12.1 | 13.2, 13.2.1 | -| macOS 12.3 | macosx12.3 | 13.3 | +| macOS 12.3 | macosx12.3 | 13.3, 13.3.1 | | iOS 15.0 | iphoneos15.0 | 13.1 | | iOS 15.2 | iphoneos15.2 | 13.2, 13.2.1 | -| iOS 15.4 | iphoneos15.4 | 13.3 | +| iOS 15.4 | iphoneos15.4 | 13.3, 13.3.1 | | Simulator - iOS 15.0 | iphonesimulator15.0 | 13.1 | | Simulator - iOS 15.2 | iphonesimulator15.2 | 13.2, 13.2.1 | -| Simulator - iOS 15.4 | iphonesimulator15.4 | 13.3 | +| Simulator - iOS 15.4 | iphonesimulator15.4 | 13.3, 13.3.1 | | tvOS 15.0 | appletvos15.0 | 13.1 | | tvOS 15.2 | appletvos15.2 | 13.2, 13.2.1 | -| tvOS 15.4 | appletvos15.4 | 13.3 | +| tvOS 15.4 | appletvos15.4 | 13.3, 13.3.1 | | Simulator - tvOS 15.0 | appletvsimulator15.0 | 13.1 | | Simulator - tvOS 15.2 | appletvsimulator15.2 | 13.2, 13.2.1 | -| Simulator - tvOS 15.4 | appletvsimulator15.4 | 13.3 | +| Simulator - tvOS 15.4 | appletvsimulator15.4 | 13.3, 13.3.1 | | watchOS 8.0 | watchos8.0 | 13.1 | | watchOS 8.3 | watchos8.3 | 13.2, 13.2.1 | -| watchOS 8.5 | watchos8.5 | 13.3 | +| watchOS 8.5 | watchos8.5 | 13.3, 13.3.1 | | Simulator - watchOS 8.0 | watchsimulator8.0 | 13.1 | | Simulator - watchOS 8.3 | watchsimulator8.3 | 13.2, 13.2.1 | -| Simulator - watchOS 8.5 | watchsimulator8.5 | 13.3 | +| Simulator - watchOS 8.5 | watchsimulator8.5 | 13.3, 13.3.1 | | DriverKit 21.0.1 | driverkit21.0.1 | 13.1 | | DriverKit 21.2 | driverkit21.2 | 13.2, 13.2.1 | -| DriverKit 21.4 | driverkit21.4 | 13.3 | +| DriverKit 21.4 | driverkit21.4 | 13.3, 13.3.1 | #### Installed Simulators | OS | Xcode Version | Simulators | | ----------- | -------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | iOS 15.0 | 13.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | | iOS 15.2 | 13.2<br>13.2.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | -| iOS 15.4 | 13.3 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPhone SE (3rd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | +| iOS 15.4 | 13.3<br>13.3.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPhone SE (3rd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | | tvOS 15.0 | 13.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | | tvOS 15.2 | 13.2<br>13.2.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | -| tvOS 15.4 | 13.3 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | +| tvOS 15.4 | 13.3<br>13.3.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | | watchOS 8.0 | 13.1 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | | watchOS 8.3 | 13.2<br>13.2.1 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | -| watchOS 8.5 | 13.3 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | +| watchOS 8.5 | 13.3<br>13.3.1 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | ### Android | Package Name | Version | From ce72be82fb2483e3ddc9fe41c401b8340c7e99f6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 13 Apr 2022 19:33:02 +0000 Subject: [PATCH 1072/3485] Updating readme file for macOS-10.15 version 20220408.1 (#5380) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-10.15-Readme.md | 62 +++++++++++++++--------------- 1 file changed, 30 insertions(+), 32 deletions(-) diff --git a/images/macos/macos-10.15-Readme.md b/images/macos/macos-10.15-Readme.md index 6377cf31aa59..5bb4bb8af0b6 100644 --- a/images/macos/macos-10.15-Readme.md +++ b/images/macos/macos-10.15-Readme.md @@ -1,12 +1,11 @@ | Announcements | |-| -| [[macOS] Default Xcode on Monterey image will be set to Xcode 13.3 on April, 11](https://github.com/actions/virtual-environments/issues/5328) | -| [[All OSs] Go versions less than 1.16 will be removed on April, 11](https://github.com/actions/virtual-environments/issues/5280) | +| [[All OSs] Go versions less than 1.16 will be removed and the default will be set to 1.17 on April, 11](https://github.com/actions/virtual-environments/issues/5280) | *** # macOS 10.15 info - System Version: macOS 10.15.7 (19H1824) - Kernel Version: Darwin 19.6.0 -- Image Version: 20220403.1 +- Image Version: 20220408.1 ## Installed Software ### Language and Runtime @@ -20,13 +19,13 @@ - GNU Fortran (Homebrew GCC 9.4.0) 9.4.0 - available by `gfortran-9` alias - GNU Fortran (Homebrew GCC 10.3.0) 10.3.0 - available by `gfortran-10` alias - GNU Fortran (Homebrew GCC 11.2.0_3) 11.2.0 - available by `gfortran-11` alias -- Go 1.15.15 +- Go 1.17.8 - julia 1.7.2 -- Kotlin 1.6.10-release-923 +- Kotlin 1.6.20-release-275 - MSBuild 16.10.1.58001 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) - Node.js v16.14.2 - NVM 0.39.1 -- NVM - Cached node versions: v12.22.11 v14.19.1 v16.14.2 +- NVM - Cached node versions: v12.22.12 v14.19.1 v16.14.2 - Perl 5.34.0 - PHP 8.1.4 - Python 2.7.18 @@ -35,11 +34,11 @@ - Ruby 2.7.5p203 ### Package Management -- Bundler version 2.3.10 +- Bundler version 2.3.11 - Carthage 0.38.0 - CocoaPods 1.11.3 -- Composer 2.3.3 -- Homebrew 3.4.4 +- Composer 2.3.4 +- Homebrew 3.4.5 - Miniconda 4.11.0 - NPM 8.5.0 - NuGet 5.9.0.7134 @@ -47,7 +46,7 @@ - Pip 22.0.4 (python 3.9) - Pipx 1.0.0 - RubyGems 3.2.33 -- Vcpkg 2022 (build from master \<01d6f6ff1>) +- Vcpkg 2022 (build from master \<bd1ef2df4>) - Yarn 1.22.18 #### Environment variables @@ -66,7 +65,7 @@ - 7-Zip 17.04 - aria2 1.36.0 - azcopy 10.14.1 -- bazel 5.1.0 +- bazel 5.1.1 - bazelisk 1.11.0 - bsdtar 3.3.2 - available by 'tar' alias - Curl 7.82.0 @@ -96,14 +95,14 @@ - zstd 1.5.2 ### Tools -- Aliyun CLI 3.0.113 -- App Center CLI 2.10.8 -- AWS CLI 2.5.2 -- AWS SAM CLI 1.43.0 -- AWS Session Manager CLI 1.2.295.0 +- Aliyun CLI 3.0.115 +- App Center CLI 2.10.9 +- AWS CLI 2.5.4 +- AWS SAM CLI 1.46.0 +- AWS Session Manager CLI 1.2.312.0 - Azure CLI (azure-devops) 0.25.0 -- Azure CLI 2.34.1 -- Bicep CLI 0.4.1318 +- Azure CLI 2.35.0 +- Bicep CLI 0.5.6 - Cabal 3.6.2.0 - Cmake 3.23.0 - Fastlane 2.205.1 @@ -111,7 +110,7 @@ - GHCup v0.1.17.6 - Jazzy 0.14.2 - Stack 2.7.5 -- SwiftFormat 0.49.6 +- SwiftFormat 0.49.7 - Swig 4.0.2 - Xcode Command Line Tools 12.4.0.0.1.1610135815 @@ -120,13 +119,13 @@ - yamllint 1.26.3 ### Browsers -- Safari 15.4 (15613.1.17.1.11) -- SafariDriver 15.4 (15613.1.17.1.11) -- Google Chrome 100.0.4896.60 +- Safari 15.4 (15613.1.17.1.13) +- SafariDriver 15.4 (15613.1.17.1.13) +- Google Chrome 100.0.4896.75 - ChromeDriver 100.0.4896.60 -- Microsoft Edge 100.0.1185.29 -- MSEdgeDriver 100.0.1185.29 -- Mozilla Firefox 98.0.2 +- Microsoft Edge 100.0.1185.36 +- MSEdgeDriver 100.0.1185.36 +- Mozilla Firefox 99.0 - geckodriver 0.30.0 - Selenium server 4.1.3 @@ -176,22 +175,21 @@ - 3.9.12 [PyPy 7.3.9] #### Node.js -- 12.22.11 +- 12.22.12 - 14.19.1 - 16.14.2 #### Go | Version | Architecture | Environment Variable | | ------- | ------------ | -------------------- | -| 1.15.15 (Default) | x64 | GOROOT_1_15_X64 | | 1.16.15 | x64 | GOROOT_1_16_X64 | -| 1.17.8 | x64 | GOROOT_1_17_X64 | +| 1.17.8 (Default) | x64 | GOROOT_1_17_X64 | | 1.18.0 | x64 | GOROOT_1_18_X64 | ### Rust Tools -- Cargo 1.59.0 -- Rust 1.59.0 -- Rustdoc 1.59.0 +- Cargo 1.60.0 +- Rust 1.60.0 +- Rustdoc 1.60.0 - Rustup 1.24.3 #### Packages @@ -199,7 +197,7 @@ - Cargo-audit 0.16.0 - Cargo-outdated 0.11.0 - Cbindgen 0.21.0 -- Clippy 0.1.59 +- Clippy 0.1.60 - Rustfmt 1.4.38-stable ### PowerShell Tools From be94fa2215a24673dad1a5897acfe68185c1d49a Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Thu, 14 Apr 2022 09:02:56 +0200 Subject: [PATCH 1073/3485] [macOS] Install Az module latest version (#5401) --- images/macos/toolsets/toolset-10.15.json | 7 +------ images/macos/toolsets/toolset-11.json | 7 +------ 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index 3dfb00317601..52950bffe931 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -182,12 +182,7 @@ } }, "powershellModules": [ - { - "name": "Az", - "versions": [ - "7.1.0" - ] - }, + {"name": "Az"}, {"name": "MarkdownPS"}, {"name": "Pester"}, {"name": "PSScriptAnalyzer"} diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index 81b54cde61dd..e48f6c9043c9 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -167,12 +167,7 @@ } }, "powershellModules": [ - { - "name": "Az", - "versions": [ - "7.1.0" - ] - }, + {"name": "Az"}, {"name": "MarkdownPS"}, {"name": "Pester"}, {"name": "PSScriptAnalyzer"} From a5e931f672ef34e8273c12d7149177b23cb0a53c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 14 Apr 2022 12:16:16 +0000 Subject: [PATCH 1074/3485] Updating readme file for ubuntu18 version 20220410.2 (#5389) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu1804-Readme.md | 70 +++++++++++++++---------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/images/linux/Ubuntu1804-Readme.md b/images/linux/Ubuntu1804-Readme.md index 8e54b09512f2..c5001ac9f696 100644 --- a/images/linux/Ubuntu1804-Readme.md +++ b/images/linux/Ubuntu1804-Readme.md @@ -2,11 +2,10 @@ |-| | [[Ubuntu] PHP 7.1 will be removed from Ubuntu 18 on April, 18](https://github.com/actions/virtual-environments/issues/5326) | | [[All OSs] Go versions less than 1.16 will be removed and the default will be set to 1.17 on April, 11](https://github.com/actions/virtual-environments/issues/5280) | -| [[Ubuntu] Issue with libstdc++ cannot allocate memory in static TLS block](https://github.com/actions/virtual-environments/issues/4799) | *** # Ubuntu 18.04.6 LTS - Linux kernel version: 5.4.0-1074-azure -- Image Version: 20220405.3 +- Image Version: 20220410.2 ## Installed Software ### Language and Runtime @@ -26,19 +25,19 @@ - Python 2.7.17 - Python3 3.6.9 - Ruby 2.5.1p57 -- Swift 5.6 +- Swift 5.6.1 ### Package Management - cpan 1.64 - Helm 3.8.1 -- Homebrew 3.4.5 +- Homebrew 3.4.6 - Miniconda 4.11.0 - Npm 8.5.0 - Pip 9.0.1 - Pip3 9.0.1 - Pipx 1.0.0 - RubyGems 2.7.6 -- Vcpkg (build from master \<e79aaaaf3>) +- Vcpkg (build from master \<f6af75acc>) - Yarn 1.22.18 #### Environment variables @@ -57,15 +56,15 @@ - Ansible 2.11.10 - apt-fast 1.9.12 - AzCopy 10.14.1 (available by `azcopy` and `azcopy10` aliases) -- Bazel 5.1.0 +- Bazel 5.1.1 - Bazelisk 1.11.0 -- Bicep 0.4.1318 +- Bicep 0.5.6 - Buildah 1.19.6 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - CMake 3.23.0 -- CodeQL Action Bundle 2.8.4 +- CodeQL Action Bundle 2.8.5 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.2.3+azure-1 -- Docker-Buildx 0.8.1 +- Docker Compose v2 2.4.1+azure-1 +- Docker-Buildx 0.8.2 - Docker-Moby Client 20.10.14+azure-1 - Docker-Moby Server 20.10.14+azure-1 - Git 2.35.1 (apt source repository: ppa:git-core/ppa) @@ -73,7 +72,7 @@ - Git-ftp 1.3.1 - Haveged 1.9.1 - Heroku 7.60.1 -- HHVM (HipHop VM) 4.155.0 +- HHVM (HipHop VM) 4.156.0 - jq 1.5 - Kind 0.12.0 - Kubectl 1.23.5 @@ -95,23 +94,23 @@ - Skopeo 1.2.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 - SVN 1.9.7 -- Terraform 1.1.7 +- Terraform 1.1.8 - yamllint 1.26.3 - yq 4.24.2 - zstd 1.5.2 (homebrew) ### CLI Tools -- Alibaba Cloud CLI 3.0.114 -- AWS CLI 1.22.89 +- Alibaba Cloud CLI 3.0.116 +- AWS CLI 1.22.92 - AWS CLI Session manager plugin 1.2.312.0 -- AWS SAM CLI 1.43.0 -- Azure CLI (azure-cli) 2.34.1 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) +- AWS SAM CLI 1.46.0 +- Azure CLI (azure-cli) 2.35.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.25.0 - GitHub CLI 2.7.0 - Google Cloud SDK 369.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 9.16.3 -- OpenShift CLI 4.10.6 +- Netlify CLI 9.16.4 +- OpenShift CLI 4.10.8 - ORAS CLI 0.12.0 - Vercel CLI 24.0.1 @@ -139,15 +138,15 @@ - Stack 2.7.5 ### Rust Tools -- Cargo 1.59.0 -- Rust 1.59.0 -- Rustdoc 1.59.0 +- Cargo 1.60.0 +- Rust 1.60.0 +- Rustdoc 1.60.0 - Rustup 1.24.3 #### Packages - Bindgen 0.59.2 - Cargo audit 0.16.0 -- Cargo clippy 0.1.59 +- Cargo clippy 0.1.60 - Cargo outdated - Cbindgen 0.21.0 - Rustfmt 1.4.38 @@ -155,8 +154,8 @@ ### Browsers and Drivers - Google Chrome 100.0.4896.75 - ChromeDriver 100.0.4896.60 -- Mozilla Firefox 98.0.2 -- Geckodriver 0.30.0 +- Mozilla Firefox 99.0 +- Geckodriver 0.31.0 - Chromium 100.0.4896.0 - Selenium server 4.1.0 @@ -174,7 +173,7 @@ - nbgv 3.4.255+06fb9182bf ### Databases -- MongoDB 5.0.6 (apt source repository: https://repo.mongodb.org/apt/ubuntu) +- MongoDB 5.0.7 (apt source repository: https://repo.mongodb.org/apt/ubuntu) - sqlite3 3.22.0 #### PostgreSQL @@ -197,13 +196,12 @@ ### Cached Tools #### Go -- 1.15.15 - 1.16.15 - 1.17.8 - 1.18.0 #### Node.js -- 12.22.11 +- 12.22.12 - 14.19.1 - 16.14.2 @@ -230,7 +228,6 @@ #### Environment variables | Name | Value | Architecture | | --------------- | ----------------------------------- | ------------ | -| GOROOT_1_15_X64 | /opt/hostedtoolcache/go/1.15.15/x64 | x64 | | GOROOT_1_16_X64 | /opt/hostedtoolcache/go/1.16.15/x64 | x64 | | GOROOT_1_17_X64 | /opt/hostedtoolcache/go/1.17.8/x64 | x64 | | GOROOT_1_18_X64 | /opt/hostedtoolcache/go/1.18.0/x64 | x64 | @@ -292,21 +289,23 @@ | debian:10 | sha256:1b236b48c1ef66fa08535a5153266f4959bf58f948db3e68f7d678b651d8e33a | 2022-03-29 | | debian:11 | sha256:87eefc7c15610cca61db5c0fd280911c6a737c0680d807432c0bd80cd0cca39b | 2022-03-29 | | debian:9 | sha256:a8cc1744bbdd5266678e3e8b3e6387e45c053218438897e86876f2eb104e5534 | 2022-03-29 | -| moby/buildkit:latest | sha256:c2aeafaed434edfde90706b5cf9a56935c389192858d1090e17a1440a6e96482 | 2022-03-09 | +| moby/buildkit:latest | sha256:bd37f0b5567084cd6f4b1c73b7fed9e12258441d064cc2add29a7dd32243ff86 | 2022-04-07 | | node:12 | sha256:461c7f8b5e042fa7f47620cbee7772e76ce3fa0891edaab29bf7ebf0e84b9a1a | 2022-03-31 | -| node:12-alpine | sha256:788968a212353a7fc208ec02bdb7b7c87714df933b5ed3b122d6bb39ac9b2156 | 2022-04-05 | +| node:12-alpine | sha256:bbc10cf532971046b490806de40f5959fa3bdd0acb82955847bdb0ffd1ab4854 | 2022-04-05 | | node:14 | sha256:b2d1c5df5e001b694115f64f4532c7eec2e5dbd73db6e0caacf0049bd0aed7d2 | 2022-03-31 | -| node:14-alpine | sha256:694a6537eb8ff4856e905c14fc9b658723380721d4057f4b7d8bcbcb114c9257 | 2022-04-05 | +| node:14-alpine | sha256:8845b4f88f64f8c56a39236648ba22946e806a6153c10911f77b70e5a2edb4ca | 2022-04-05 | | node:16 | sha256:ffe804d6fcced29bcfc3477de079d03a9c2b0e4917e44bfeafb1a6b0f875e383 | 2022-03-31 | -| node:16-alpine | sha256:cdf8c05b081837d7afe63e0ae0711152e60a30f3711b5050f9108def2025d513 | 2022-04-05 | -| ubuntu:16.04 | sha256:0f71fa8d4d2d4292c3c617fda2b36f6dabe5c8b6e34c3dc5b0d17d4e704bd39c | 2021-08-31 | -| ubuntu:18.04 | sha256:d8ac28b7bec51664c6b71a9dd1d8f788127ff310b8af30820560973bcfc605a0 | 2022-03-18 | -| ubuntu:20.04 | sha256:bea6d19168bbfd6af8d77c2cc3c572114eb5d113e6f422573c93cb605a0e2ffb | 2022-03-18 | +| node:16-alpine | sha256:28bed508446db2ee028d08e76fb47b935defa26a84986ca050d2596ea67fd506 | 2022-04-05 | +| ubuntu:16.04 | sha256:20858ebbc96215d6c3c574f781133ebffdc7c18d98af4f294cc4c04871a6fe61 | 2021-08-31 | +| ubuntu:18.04 | sha256:982d72c16416b09ffd2f71aa381f761422085eda1379dc66b668653607969e38 | 2022-04-05 | +| ubuntu:20.04 | sha256:9101220a875cee98b016668342c489ff0674f247f6ca20dfc91b91c0f28581ae | 2022-04-05 | ### Installed apt packages | Name | Version | | ----------------- | --------------------------------- | | aria2 | 1.33.1-1 | +| autoconf | 2.69-11 | +| automake | 1:1.15.1-3ubuntu2 | | binutils | 2.30-21ubuntu1\~18.04.7 | | bison | 2:3.0.4.dfsg-1build1 | | brotli | 1.0.3-1ubuntu1.3 | @@ -340,6 +339,7 @@ | libmagickwand-dev | 8:6.9.7.4+dfsg-16ubuntu6.12 | | libsecret-1-dev | 0.18.6-1 | | libsqlite3-dev | 3.22.0-1ubuntu0.4 | +| libtool | 2.4.6-2 | | libunwind8 | 1.2.1-8 | | libxkbfile-dev | 1:1.0.9-2 | | libxss1 | 1:1.2.2-1 | From 2154ca5deaeae3dba8d7903b50e541bb7eab19a4 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 14 Apr 2022 14:20:03 +0000 Subject: [PATCH 1075/3485] Updating readme file for win22 version 20220410.1 (#5378) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2022-Readme.md | 70 ++++++++++++++++---------------- 1 file changed, 36 insertions(+), 34 deletions(-) diff --git a/images/win/Windows2022-Readme.md b/images/win/Windows2022-Readme.md index eabdc7a63651..e0ee3788b7ff 100644 --- a/images/win/Windows2022-Readme.md +++ b/images/win/Windows2022-Readme.md @@ -1,11 +1,10 @@ | Announcements | |-| -| [[All OSs] Go versions less than 1.16 will be removed on April, 11](https://github.com/actions/virtual-environments/issues/5280) | -| [windows-latest workflows will use Windows Server 2022](https://github.com/actions/virtual-environments/issues/4856) | +| [[All OSs] Go versions less than 1.16 will be removed and the default will be set to 1.17 on April, 11](https://github.com/actions/virtual-environments/issues/5280) | *** # Microsoft Windows Server 2022 Datacenter - OS Version: 10.0.20348 Build 587 -- Image Version: 20220330.1 +- Image Version: 20220410.1 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -13,9 +12,9 @@ ## Installed Software ### Language and Runtime - Bash 4.4.23(2)-release -- Go 1.16.15 +- Go 1.17.8 - Julia 1.7.2 -- Kotlin 1.6.10 +- Kotlin 1.6.20 - LLVM 13.0.1 - Node 16.14.2 - Perl 5.32.1 @@ -25,7 +24,7 @@ ### Package Management - Chocolatey 1.1.0 -- Composer 2.3.2 +- Composer 2.3.4 - Helm 3.8.0 - Miniconda 4.11.0 (pre-installed on the image but not added to PATH) - NPM 8.5.0 @@ -33,7 +32,7 @@ - pip 22.0.4 (python 3.9) - Pipx 1.0.0 - RubyGems 3.2.32 -- Vcpkg (build from master \<9d9a6f486>) +- Vcpkg (build from master \<f6af75acc>) - Yarn 1.22.18 #### Environment variables @@ -51,12 +50,12 @@ - 7zip 21.07 - aria2 1.36.0 - azcopy 10.14.1 -- Bazel 5.1.0 +- Bazel 5.1.1 - Bazelisk 1.11.0 -- Bicep 0.4.1318 +- Bicep 0.5.6 - Cabal 3.6.2.0 - CMake 3.23.0 -- CodeQL Action Bundle 2.8.4 +- CodeQL Action Bundle 2.8.5 - Docker 20.10.7 - Docker-compose 1.29.2 - Docker-wincred 0.6.4 @@ -73,7 +72,7 @@ - NSIS v3.08 - OpenSSL 1.1.1 - Packer 1.8.0 -- Pulumi v3.27.0 +- Pulumi v3.28.0 - R 4.1.3 - Service Fabric SDK 8.2.1571.9590 - Stack 2.7.5 @@ -86,19 +85,19 @@ - zstd 1.5.2 ### CLI Tools -- Alibaba Cloud CLI 3.0.114 -- AWS CLI 2.5.0 -- AWS SAM CLI 1.43.0 -- AWS Session Manager CLI 1.2.295.0 -- Azure CLI 2.34.1 +- Alibaba Cloud CLI 3.0.115 +- AWS CLI 2.5.4 +- AWS SAM CLI 1.46.0 +- AWS Session Manager CLI 1.2.312.0 +- Azure CLI 2.35.0 - Azure DevOps CLI extension 0.25.0 - GitHub CLI 2.7.0 - Hub CLI 2.14.2 ### Rust Tools -- Cargo 1.59.0 -- Rust 1.59.0 -- Rustdoc 1.59.0 +- Cargo 1.60.0 +- Rust 1.60.0 +- Rustdoc 1.60.0 - Rustup 1.24.3 #### Packages @@ -106,15 +105,15 @@ - cargo-audit 0.16.0 - cargo-outdated 0.11.0 - cbindgen 0.21.0 -- Clippy 0.1.59 +- Clippy 0.1.60 - Rustfmt 1.4.38 ### Browsers and webdrivers -- Google Chrome 100.0.4896.60 +- Google Chrome 100.0.4896.75 - Chrome Driver 100.0.4896.60 -- Microsoft Edge 99.0.1150.55 -- Microsoft Edge Driver 99.0.1150.55 -- Mozilla Firefox 98.0.2 +- Microsoft Edge 100.0.1185.36 +- Microsoft Edge Driver 100.0.1185.36 +- Mozilla Firefox 99.0 - Gecko Driver 0.30.0 - IE Driver 3.150.1.1 - Selenium server 4.1.0 @@ -155,15 +154,14 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Go | Version | Architecture | Environment Variable | | ------- | ------------ | -------------------- | -| 1.15.15 | x64 | GOROOT_1_15_X64 | -| 1.16.15 (Default) | x64 | GOROOT_1_16_X64 | -| 1.17.8 | x64 | GOROOT_1_17_X64 | +| 1.16.15 | x64 | GOROOT_1_16_X64 | +| 1.17.8 (Default) | x64 | GOROOT_1_17_X64 | | 1.18.0 | x64 | GOROOT_1_18_X64 | #### Node | Version | Architecture | | ------- | ------------ | -| 12.22.11 | x64 | +| 12.22.12 | x64 | | 14.19.1 | x64 | | 16.14.2 | x64 | @@ -210,7 +208,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Database tools - Azure CosmosDb Emulator 2.14.6.0 - DacFx 16.0.5400.1 -- MySQL 8.0.26.0 +- MySQL 8.0.28.0 - SQL OLEDB Driver 18.6.3.0 - SQLPS 1.0 @@ -221,9 +219,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Nginx | 1.21.6 | C:\tools\nginx-1.21.6\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2022 -| Name | Version | Path | -| ----------------------------- | ------------- | -------------------------------------------------------- | -| Visual Studio Enterprise 2022 | 17.1.32319.34 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | +| Name | Version | Path | +| ----------------------------- | -------------- | -------------------------------------------------------- | +| Visual Studio Enterprise 2022 | 17.1.32328.378 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | #### Workloads, components and extensions: | Package | Version | @@ -343,6 +341,10 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM.Spectre | 17.1.32112.364 | | Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM64 | 17.1.32112.364 | | Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM64.Spectre | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.Spectre | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.Spectre | 17.1.32112.364 | | Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64 | 17.1.32112.364 | | Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64.Spectre | 17.1.32112.364 | | Microsoft.VisualStudio.Component.VC.ASAN | 17.1.32112.364 | @@ -483,7 +485,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Azure Powershell Modules | Module | Version | Path | | ------- | ------------------------------------------------------------------------------- | ------------------------------ | -| Az | 6.6.0.zip<br>7.1.0 | C:\Modules\az_\<version\> | +| Az | 6.6.0.zip<br>7.3.2 | C:\Modules\az_\<version\> | | Azure | 2.1.0 [Installed]<br>3.8.0.zip<br>4.2.1.zip<br>5.1.1.zip<br>5.3.0 | C:\Modules\azure_\<version\> | | AzureRM | 2.1.0 [Installed]<br>3.8.0.zip<br>4.2.1.zip<br>5.1.1.zip<br>6.7.0.zip<br>6.13.1 | C:\Modules\azurerm_\<version\> | ``` @@ -495,7 +497,7 @@ All other versions are saved but not installed. #### Powershell Modules | Module | Version | | ------------------ | ---------------- | -| AWSPowerShell | 4.1.53 | +| AWSPowerShell | 4.1.61 | | DockerMsftProvider | 1.0.0.8 | | MarkdownPS | 1.9 | | Microsoft.Graph | 1.9.3 | From 631fc5df2fb8965a7c5b67d230714367df40e324 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 14 Apr 2022 14:47:51 +0000 Subject: [PATCH 1076/3485] Updating readme file for ubuntu20 version 20220410.2 (#5388) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2004-Readme.md | 62 +++++++++++++++---------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/images/linux/Ubuntu2004-Readme.md b/images/linux/Ubuntu2004-Readme.md index c23a3f28c20e..16395d549a3c 100644 --- a/images/linux/Ubuntu2004-Readme.md +++ b/images/linux/Ubuntu2004-Readme.md @@ -2,11 +2,10 @@ |-| | [[Ubuntu] PHP 7.1 will be removed from Ubuntu 18 on April, 18](https://github.com/actions/virtual-environments/issues/5326) | | [[All OSs] Go versions less than 1.16 will be removed and the default will be set to 1.17 on April, 11](https://github.com/actions/virtual-environments/issues/5280) | -| [[Ubuntu] Issue with libstdc++ cannot allocate memory in static TLS block](https://github.com/actions/virtual-environments/issues/4799) | *** # Ubuntu 20.04.4 LTS - Linux kernel version: 5.13.0-1021-azure -- Image Version: 20220405.4 +- Image Version: 20220410.2 ## Installed Software ### Language and Runtime @@ -26,19 +25,19 @@ - Python 3.8.10 - Python3 3.8.10 - Ruby 2.7.0p0 -- Swift 5.6 +- Swift 5.6.1 ### Package Management - cpan 1.64 - Helm 3.8.1 -- Homebrew 3.4.5 +- Homebrew 3.4.6 - Miniconda 4.11.0 - Npm 8.5.0 - Pip 20.0.2 - Pip3 20.0.2 - Pipx 1.0.0 - RubyGems 3.1.2 -- Vcpkg (build from master \<e79aaaaf3>) +- Vcpkg (build from master \<f6af75acc>) - Yarn 1.22.18 #### Environment variables @@ -58,12 +57,12 @@ - Ansible 2.12.4 - apt-fast 1.9.12 - AzCopy 10.14.1 (available by `azcopy` and `azcopy10` aliases) -- Bazel 5.1.0 +- Bazel 5.1.1 - Bazelisk 1.11.0 -- Bicep 0.4.1318 +- Bicep 0.5.6 - Buildah 1.21.3 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - CMake 3.23.0 -- CodeQL Action Bundle 2.8.4 +- CodeQL Action Bundle 2.8.5 - Docker Compose v1 1.29.2 - Docker Compose v2 2.4.1+azure-1 - Docker-Buildx 0.8.2 @@ -75,7 +74,7 @@ - Git-ftp 1.6.0 - Haveged 1.9.1 - Heroku 7.60.1 -- HHVM (HipHop VM) 4.155.0 +- HHVM (HipHop VM) 4.156.0 - jq 1.6 - Kind 0.12.0 - Kubectl 1.23.5 @@ -97,23 +96,23 @@ - Skopeo 1.3.0 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 -- Terraform 1.1.7 +- Terraform 1.1.8 - yamllint 1.26.3 - yq 4.24.2 - zstd 1.5.2 (homebrew) ### CLI Tools -- Alibaba Cloud CLI 3.0.114 -- AWS CLI 2.5.2 +- Alibaba Cloud CLI 3.0.116 +- AWS CLI 2.5.4 - AWS CLI Session manager plugin 1.2.312.0 -- AWS SAM CLI 1.43.0 -- Azure CLI (azure-cli) 2.34.1 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) +- AWS SAM CLI 1.46.0 +- Azure CLI (azure-cli) 2.35.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.25.0 - GitHub CLI 2.7.0 - Google Cloud SDK 369.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 9.16.3 -- OpenShift CLI 4.10.6 +- Netlify CLI 9.16.5 +- OpenShift CLI 4.10.8 - ORAS CLI 0.12.0 - Vercel CLI 24.0.1 @@ -133,7 +132,7 @@ | Tool | Version | | -------- | ------------------- | | PHP | 7.4.28 8.0.17 8.1.4 | -| Composer | 2.3.3 | +| Composer | 2.3.4 | | PHPUnit | 8.5.26 | ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. @@ -145,15 +144,15 @@ - Stack 2.7.5 ### Rust Tools -- Cargo 1.59.0 -- Rust 1.59.0 -- Rustdoc 1.59.0 +- Cargo 1.60.0 +- Rust 1.60.0 +- Rustdoc 1.60.0 - Rustup 1.24.3 #### Packages - Bindgen 0.59.2 - Cargo audit 0.16.0 -- Cargo clippy 0.1.59 +- Cargo clippy 0.1.60 - Cargo outdated - Cbindgen 0.21.0 - Rustfmt 1.4.38 @@ -161,8 +160,8 @@ ### Browsers and Drivers - Google Chrome 100.0.4896.75 - ChromeDriver 100.0.4896.60 -- Mozilla Firefox 98.0.2 -- Geckodriver 0.30.0 +- Mozilla Firefox 99.0 +- Geckodriver 0.31.0 - Chromium 100.0.4896.0 - Selenium server 4.1.0 @@ -180,7 +179,7 @@ - nbgv 3.4.255+06fb9182bf ### Databases -- MongoDB 5.0.6 (apt source repository: https://repo.mongodb.org/apt/ubuntu) +- MongoDB 5.0.7 (apt source repository: https://repo.mongodb.org/apt/ubuntu) - sqlite3 3.31.1 #### PostgreSQL @@ -203,13 +202,12 @@ ### Cached Tools #### Go -- 1.15.15 - 1.16.15 - 1.17.8 - 1.18.0 #### Node.js -- 12.22.11 +- 12.22.12 - 14.19.1 - 16.14.2 @@ -237,7 +235,6 @@ #### Environment variables | Name | Value | Architecture | | --------------- | ----------------------------------- | ------------ | -| GOROOT_1_15_X64 | /opt/hostedtoolcache/go/1.15.15/x64 | x64 | | GOROOT_1_16_X64 | /opt/hostedtoolcache/go/1.16.15/x64 | x64 | | GOROOT_1_17_X64 | /opt/hostedtoolcache/go/1.17.8/x64 | x64 | | GOROOT_1_18_X64 | /opt/hostedtoolcache/go/1.18.0/x64 | x64 | @@ -300,22 +297,24 @@ | debian:10 | sha256:1b236b48c1ef66fa08535a5153266f4959bf58f948db3e68f7d678b651d8e33a | 2022-03-29 | | debian:11 | sha256:87eefc7c15610cca61db5c0fd280911c6a737c0680d807432c0bd80cd0cca39b | 2022-03-29 | | debian:9 | sha256:a8cc1744bbdd5266678e3e8b3e6387e45c053218438897e86876f2eb104e5534 | 2022-03-29 | -| moby/buildkit:latest | sha256:c2aeafaed434edfde90706b5cf9a56935c389192858d1090e17a1440a6e96482 | 2022-03-09 | +| moby/buildkit:latest | sha256:bd37f0b5567084cd6f4b1c73b7fed9e12258441d064cc2add29a7dd32243ff86 | 2022-04-07 | | node:12 | sha256:461c7f8b5e042fa7f47620cbee7772e76ce3fa0891edaab29bf7ebf0e84b9a1a | 2022-03-31 | | node:12-alpine | sha256:bbc10cf532971046b490806de40f5959fa3bdd0acb82955847bdb0ffd1ab4854 | 2022-04-05 | | node:14 | sha256:b2d1c5df5e001b694115f64f4532c7eec2e5dbd73db6e0caacf0049bd0aed7d2 | 2022-03-31 | | node:14-alpine | sha256:8845b4f88f64f8c56a39236648ba22946e806a6153c10911f77b70e5a2edb4ca | 2022-04-05 | | node:16 | sha256:ffe804d6fcced29bcfc3477de079d03a9c2b0e4917e44bfeafb1a6b0f875e383 | 2022-03-31 | | node:16-alpine | sha256:28bed508446db2ee028d08e76fb47b935defa26a84986ca050d2596ea67fd506 | 2022-04-05 | -| ubuntu:16.04 | sha256:0f71fa8d4d2d4292c3c617fda2b36f6dabe5c8b6e34c3dc5b0d17d4e704bd39c | 2021-08-31 | -| ubuntu:18.04 | sha256:d8ac28b7bec51664c6b71a9dd1d8f788127ff310b8af30820560973bcfc605a0 | 2022-03-18 | -| ubuntu:20.04 | sha256:bea6d19168bbfd6af8d77c2cc3c572114eb5d113e6f422573c93cb605a0e2ffb | 2022-03-18 | +| ubuntu:16.04 | sha256:20858ebbc96215d6c3c574f781133ebffdc7c18d98af4f294cc4c04871a6fe61 | 2021-08-31 | +| ubuntu:18.04 | sha256:982d72c16416b09ffd2f71aa381f761422085eda1379dc66b668653607969e38 | 2022-04-05 | +| ubuntu:20.04 | sha256:9101220a875cee98b016668342c489ff0674f247f6ca20dfc91b91c0f28581ae | 2022-04-05 | ### Installed apt packages | Name | Version | | ---------------------- | --------------------------------- | | acl | 2.2.53-6 | | aria2 | 1.35.0-1build1 | +| autoconf | 2.69-11.1 | +| automake | 1:1.16.1-4ubuntu6 | | binutils | 2.34-6ubuntu1.3 | | bison | 2:3.5.1+dfsg-1 | | brotli | 1.0.7-6ubuntu0.1 | @@ -350,6 +349,7 @@ | libmagickwand-dev | 8:6.9.10.23+dfsg-2.1ubuntu11.4 | | libsecret-1-dev | 0.20.4-0ubuntu1 | | libsqlite3-dev | 3.31.1-4ubuntu0.2 | +| libtool | 2.4.6-14 | | libunwind8 | 1.2.1-9build1 | | libxkbfile-dev | 1:1.1.0-1 | | libxss1 | 1:1.2.3-1 | From d8f7b14d80a695536f4dfd7df5c556655e8b6217 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 14 Apr 2022 15:34:17 +0000 Subject: [PATCH 1077/3485] Updating readme file for win19 version 20220410.1 (#5379) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2019-Readme.md | 62 ++++++++++++++++---------------- 1 file changed, 30 insertions(+), 32 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index d68acf8e8d22..a15a962f715c 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -1,11 +1,10 @@ | Announcements | |-| -| [[All OSs] Go versions less than 1.16 will be removed on April, 11](https://github.com/actions/virtual-environments/issues/5280) | -| [windows-latest workflows will use Windows Server 2022](https://github.com/actions/virtual-environments/issues/4856) | +| [[All OSs] Go versions less than 1.16 will be removed and the default will be set to 1.17 on April, 11](https://github.com/actions/virtual-environments/issues/5280) | *** # Microsoft Windows Server 2019 Datacenter - OS Version: 10.0.17763 Build 2686 -- Image Version: 20220330.1 +- Image Version: 20220410.1 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -13,9 +12,9 @@ ## Installed Software ### Language and Runtime - Bash 4.4.23(2)-release -- Go 1.15.15 +- Go 1.17.8 - Julia 1.7.2 -- Kotlin 1.6.10 +- Kotlin 1.6.20 - LLVM 13.0.1 - Node 16.14.2 - Perl 5.32.1 @@ -25,7 +24,7 @@ ### Package Management - Chocolatey 1.1.0 -- Composer 2.3.2 +- Composer 2.3.4 - Helm 3.8.0 - Miniconda 4.11.0 (pre-installed on the image but not added to PATH) - NPM 8.5.0 @@ -33,7 +32,7 @@ - pip 22.0.4 (python 3.7) - Pipx 1.0.0 - RubyGems 2.7.6.3 -- Vcpkg (build from master \<9d9a6f486>) +- Vcpkg (build from master \<f6af75acc>) - Yarn 1.22.18 #### Environment variables @@ -52,19 +51,19 @@ - 7zip 21.07 - aria2 1.36.0 - azcopy 10.14.1 -- Bazel 5.1.0 +- Bazel 5.1.1 - Bazelisk 1.11.0 -- Bicep 0.4.1318 +- Bicep 0.5.6 - Cabal 3.6.2.0 - CMake 3.23.0 -- CodeQL Action Bundle 2.8.4 +- CodeQL Action Bundle 2.8.5 - Docker 20.10.7 - Docker-compose 1.29.2 - Docker-wincred 0.6.4 - ghc 9.2.2 - Git 2.35.1.windows.2 - Git LFS 3.0.2 -- Google Cloud SDK 379.0.0 +- Google Cloud SDK 380.0.0 - InnoSetup 6.2.0 - jq 1.6 - Kind 0.12.0 @@ -75,8 +74,8 @@ - NSIS v3.08 - OpenSSL 1.1.1 - Packer 1.8.0 -- Parcel 2.4.0 -- Pulumi v3.27.0 +- Parcel 2.4.1 +- Pulumi v3.28.0 - R 4.1.3 - Service Fabric SDK 8.2.1571.9590 - Stack 2.7.5 @@ -89,20 +88,20 @@ - zstd 1.5.2 ### CLI Tools -- Alibaba Cloud CLI 3.0.114 -- AWS CLI 2.5.0 -- AWS SAM CLI 1.43.0 -- AWS Session Manager CLI 1.2.295.0 -- Azure CLI 2.34.1 +- Alibaba Cloud CLI 3.0.115 +- AWS CLI 2.5.4 +- AWS SAM CLI 1.46.0 +- AWS Session Manager CLI 1.2.312.0 +- Azure CLI 2.35.0 - Azure DevOps CLI extension 0.25.0 - Cloud Foundry CLI 6.53.0 - GitHub CLI 2.7.0 - Hub CLI 2.14.2 ### Rust Tools -- Cargo 1.59.0 -- Rust 1.59.0 -- Rustdoc 1.59.0 +- Cargo 1.60.0 +- Rust 1.60.0 +- Rustdoc 1.60.0 - Rustup 1.24.3 #### Packages @@ -110,15 +109,15 @@ - cargo-audit 0.16.0 - cargo-outdated 0.11.0 - cbindgen 0.21.0 -- Clippy 0.1.59 +- Clippy 0.1.60 - Rustfmt 1.4.38 ### Browsers and webdrivers -- Google Chrome 100.0.4896.60 +- Google Chrome 100.0.4896.75 - Chrome Driver 100.0.4896.60 -- Microsoft Edge 99.0.1150.55 -- Microsoft Edge Driver 99.0.1150.55 -- Mozilla Firefox 98.0.2 +- Microsoft Edge 100.0.1185.36 +- Microsoft Edge Driver 100.0.1185.36 +- Mozilla Firefox 99.0 - Gecko Driver 0.30.0 - IE Driver 3.150.1.1 - Selenium server 4.1.0 @@ -157,21 +156,20 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ``` ### BizTalk Server -- BizTalk Server Project Build Component 3.13.765.0 +- BizTalk Server Project Build Component 3.13.832.0 ### Cached Tools #### Go | Version | Architecture | Environment Variable | | ------- | ------------ | -------------------- | -| 1.15.15 (Default) | x64 | GOROOT_1_15_X64 | | 1.16.15 | x64 | GOROOT_1_16_X64 | -| 1.17.8 | x64 | GOROOT_1_17_X64 | +| 1.17.8 (Default) | x64 | GOROOT_1_17_X64 | | 1.18.0 | x64 | GOROOT_1_18_X64 | #### Node | Version | Architecture | | ------- | ------------ | -| 12.22.11 | x64 | +| 12.22.12 | x64 | | 14.19.1 | x64 | | 16.14.2 | x64 | @@ -533,7 +531,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Azure Powershell Modules | Module | Version | Path | | ------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ------------------------------ | -| Az | 1.0.0.zip<br>1.6.0.zip<br>2.3.2.zip<br>2.6.0.zip<br>3.1.0.zip<br>3.5.0.zip<br>3.8.0.zip<br>4.3.0.zip<br>4.4.0.zip<br>4.7.0.zip<br>5.5.0.zip<br>5.9.0.zip<br>6.6.0.zip<br>7.1.0 | C:\Modules\az_\<version\> | +| Az | 1.0.0.zip<br>1.6.0.zip<br>2.3.2.zip<br>2.6.0.zip<br>3.1.0.zip<br>3.5.0.zip<br>3.8.0.zip<br>4.3.0.zip<br>4.4.0.zip<br>4.7.0.zip<br>5.5.0.zip<br>5.9.0.zip<br>6.6.0.zip<br>7.3.2 | C:\Modules\az_\<version\> | | Azure | 2.1.0 [Installed]<br>3.8.0.zip<br>4.2.1.zip<br>5.1.1.zip<br>5.3.0 | C:\Modules\azure_\<version\> | | AzureRM | 2.1.0 [Installed]<br>3.8.0.zip<br>4.2.1.zip<br>5.1.1.zip<br>6.7.0.zip<br>6.13.1 | C:\Modules\azurerm_\<version\> | ``` @@ -545,7 +543,7 @@ All other versions are saved but not installed. #### Powershell Modules | Module | Version | | ------------------ | ---------------- | -| AWSPowerShell | 4.1.53 | +| AWSPowerShell | 4.1.61 | | DockerMsftProvider | 1.0.0.8 | | MarkdownPS | 1.9 | | Microsoft.Graph | 1.9.3 | From e6517681d6c250eff9b0bfab9172548a65e9879c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 14 Apr 2022 20:55:48 +0000 Subject: [PATCH 1078/3485] Updating readme file for macOS-11 version 20220410.1 (#5382) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-11-Readme.md | 62 ++++++++++++++++----------------- 1 file changed, 30 insertions(+), 32 deletions(-) diff --git a/images/macos/macos-11-Readme.md b/images/macos/macos-11-Readme.md index a6bff24596cd..c979771e3c3e 100644 --- a/images/macos/macos-11-Readme.md +++ b/images/macos/macos-11-Readme.md @@ -1,12 +1,11 @@ | Announcements | |-| -| [[macOS] Default Xcode on Monterey image will be set to Xcode 13.3 on April, 11](https://github.com/actions/virtual-environments/issues/5328) | -| [[All OSs] Go versions less than 1.16 will be removed on April, 11](https://github.com/actions/virtual-environments/issues/5280) | +| [[All OSs] Go versions less than 1.16 will be removed and the default will be set to 1.17 on April, 11](https://github.com/actions/virtual-environments/issues/5280) | *** # macOS 11.6 info - System Version: macOS 11.6.5 (20G527) - Kernel Version: Darwin 20.6.0 -- Image Version: 20220402.1 +- Image Version: 20220410.1 ## Installed Software ### Language and Runtime @@ -20,13 +19,13 @@ - GNU Fortran (Homebrew GCC 9.4.0) 9.4.0 - available by `gfortran-9` alias - GNU Fortran (Homebrew GCC 10.3.0) 10.3.0 - available by `gfortran-10` alias - GNU Fortran (Homebrew GCC 11.2.0_3) 11.2.0 - available by `gfortran-11` alias -- Go 1.15.15 +- Go 1.17.8 - julia 1.7.2 -- Kotlin 1.6.10-release-923 +- Kotlin 1.6.20-release-275 - MSBuild 16.10.1.58001 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) - Node.js v16.14.2 - NVM 0.39.1 -- NVM - Cached node versions: v12.22.11 v14.19.1 v16.14.2 +- NVM - Cached node versions: v12.22.12 v14.19.1 v16.14.2 - Perl 5.34.0 - PHP 8.1.4 - Python 2.7.18 @@ -35,11 +34,11 @@ - Ruby 2.7.5p203 ### Package Management -- Bundler version 2.3.10 +- Bundler version 2.3.11 - Carthage 0.38.0 - CocoaPods 1.11.3 -- Composer 2.3.3 -- Homebrew 3.4.4 +- Composer 2.3.4 +- Homebrew 3.4.5 - Miniconda 4.11.0 - NPM 8.5.0 - NuGet 5.9.0.7134 @@ -47,7 +46,7 @@ - Pip 22.0.4 (python 3.9) - Pipx 1.0.0 - RubyGems 3.2.33 -- Vcpkg 2022 (build from master \<01d6f6ff1>) +- Vcpkg 2022 (build from master \<f6af75acc>) - Yarn 1.22.18 #### Environment variables @@ -66,7 +65,7 @@ - 7-Zip 17.04 - aria2 1.36.0 - azcopy 10.14.1 -- bazel 5.1.0 +- bazel 5.1.1 - bazelisk 1.11.0 - bsdtar 3.3.2 - available by 'tar' alias - Curl 7.82.0 @@ -93,14 +92,14 @@ - zstd 1.5.2 ### Tools -- Aliyun CLI 3.0.113 -- App Center CLI 2.10.8 -- AWS CLI 2.5.2 -- AWS SAM CLI 1.43.0 -- AWS Session Manager CLI 1.2.295.0 +- Aliyun CLI 3.0.115 +- App Center CLI 2.10.9 +- AWS CLI 2.5.4 +- AWS SAM CLI 1.46.0 +- AWS Session Manager CLI 1.2.312.0 - Azure CLI (azure-devops) 0.25.0 -- Azure CLI 2.34.1 -- Bicep CLI 0.4.1318 +- Azure CLI 2.35.0 +- Bicep CLI 0.5.6 - Cabal 3.6.2.0 - Cmake 3.23.0 - Fastlane 2.205.1 @@ -108,7 +107,7 @@ - GHCup v0.1.17.6 - Jazzy 0.14.2 - Stack 2.7.5 -- SwiftFormat 0.49.6 +- SwiftFormat 0.49.7 - Swig 4.0.2 - Xcode Command Line Tools 13.2.0.0.1.1638488800 @@ -117,13 +116,13 @@ - yamllint 1.26.3 ### Browsers -- Safari 15.4 (16613.1.17.1.11) -- SafariDriver 15.4 (16613.1.17.1.11) -- Google Chrome 100.0.4896.60 +- Safari 15.4 (16613.1.17.1.13) +- SafariDriver 15.4 (16613.1.17.1.13) +- Google Chrome 100.0.4896.75 - ChromeDriver 100.0.4896.60 -- Microsoft Edge 99.0.1150.55 -- MSEdgeDriver 99.0.1150.55 -- Mozilla Firefox 98.0.2 +- Microsoft Edge 100.0.1185.36 +- MSEdgeDriver 100.0.1185.36 +- Mozilla Firefox 99.0 - geckodriver 0.30.0 - Selenium server 4.1.3 @@ -167,22 +166,21 @@ - 3.9.12 [PyPy 7.3.9] #### Node.js -- 12.22.11 +- 12.22.12 - 14.19.1 - 16.14.2 #### Go | Version | Architecture | Environment Variable | | ------- | ------------ | -------------------- | -| 1.15.15 (Default) | x64 | GOROOT_1_15_X64 | | 1.16.15 | x64 | GOROOT_1_16_X64 | -| 1.17.8 | x64 | GOROOT_1_17_X64 | +| 1.17.8 (Default) | x64 | GOROOT_1_17_X64 | | 1.18.0 | x64 | GOROOT_1_18_X64 | ### Rust Tools -- Cargo 1.59.0 -- Rust 1.59.0 -- Rustdoc 1.59.0 +- Cargo 1.60.0 +- Rust 1.60.0 +- Rustdoc 1.60.0 - Rustup 1.24.3 #### Packages @@ -190,7 +188,7 @@ - Cargo-audit 0.16.0 - Cargo-outdated 0.11.0 - Cbindgen 0.21.0 -- Clippy 0.1.59 +- Clippy 0.1.60 - Rustfmt 1.4.38-stable ### PowerShell Tools From ff63cfd0723e7b08e6bac9e6d1276fa3e0dec4c7 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Mon, 18 Apr 2022 12:07:09 +0200 Subject: [PATCH 1079/3485] Create codeql workflow (#5411) --- .github/workflows/codeql-analysis.yml | 70 +++++++++++++++++++ .../bootstrap-provisioner/kcpassword.py | 6 +- 2 files changed, 73 insertions(+), 3 deletions(-) create mode 100644 .github/workflows/codeql-analysis.yml diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml new file mode 100644 index 000000000000..4d3140b2e8c1 --- /dev/null +++ b/.github/workflows/codeql-analysis.yml @@ -0,0 +1,70 @@ +# For most projects, this workflow file will not need changing; you simply need +# to commit it to your repository. +# +# You may wish to alter this file to override the set of languages analyzed, +# or to provide custom queries or build logic. +# +# ******** NOTE ******** +# We have attempted to detect the languages in your repository. Please check +# the `language` matrix defined below to confirm you have the correct set of +# supported CodeQL languages. +# +name: "CodeQL" + +on: + push: + branches: [ main ] + pull_request: + # The branches below must be a subset of the branches above + branches: [ main ] + schedule: + - cron: '32 4 * * 0' + +jobs: + analyze: + name: Analyze + runs-on: ubuntu-latest + permissions: + actions: read + contents: read + security-events: write + + strategy: + fail-fast: false + matrix: + language: [ 'python', 'ruby' ] + # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ] + # Learn more about CodeQL language support at https://git.io/codeql-language-support + + steps: + - name: Checkout repository + uses: actions/checkout@v3 + + # Initializes the CodeQL tools for scanning. + - name: Initialize CodeQL + uses: github/codeql-action/init@v1 + with: + languages: ${{ matrix.language }} + # If you wish to specify custom queries, you can do so here or in a config file. + # By default, queries listed here will override any specified in a config file. + # Prefix the list here with "+" to use these queries and those in the config file. + # queries: ./path/to/local/query, your-org/your-repo/queries@main + + # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). + # If this step fails, then you should remove it and run the build manually (see below) + - name: Autobuild + uses: github/codeql-action/autobuild@v1 + + # ℹ️ Command-line programs to run using the OS shell. + # 📚 https://git.io/JvXDl + + # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines + # and modify them (or add more) to build your code if your project + # uses a compiled language + + #- run: | + # make bootstrap + # make release + + - name: Perform CodeQL Analysis + uses: github/codeql-action/analyze@v1 \ No newline at end of file diff --git a/images/macos/provision/bootstrap-provisioner/kcpassword.py b/images/macos/provision/bootstrap-provisioner/kcpassword.py index 6ab3a51b9a8b..8b50a3e26a1a 100755 --- a/images/macos/provision/bootstrap-provisioner/kcpassword.py +++ b/images/macos/provision/bootstrap-provisioner/kcpassword.py @@ -9,7 +9,7 @@ import sys import os -def kcpassword(passwd): +def encode_data(passwd): # The magic 11 bytes - these are just repeated # 0x7D 0x89 0x52 0x23 0xD2 0xBC 0xDD 0xEA 0xA3 0xB9 0x1F key = [125,137,82,35,210,188,221,234,163,185,31] @@ -32,11 +32,11 @@ def kcpassword(passwd): return bytearray(passwd) if __name__ == "__main__": - passwd = kcpassword(sys.argv[1]) + runner_pwd_encoded = encode_data(sys.argv[1]) fd = os.open('/etc/kcpassword', os.O_WRONLY | os.O_CREAT, 0o600) file = os.fdopen(fd, 'wb') file.truncate(0) - file.write(passwd) + file.write(runner_pwd_encoded) file.close() """ From 9364605355051aa302a3005ea262de8d8080726c Mon Sep 17 00:00:00 2001 From: Davide Maccarrone <damaccar@microsoft.com> Date: Tue, 19 Apr 2022 09:04:36 +0200 Subject: [PATCH 1080/3485] [Ubuntu] Pull previous version of Chromium if revision is 4 digits long (#5407) * pull previous version of chromium if revision is 4 digits long * add example revisions that break build * use json instead of csv when retrieving previous versions * grab revision, not version --- images/linux/scripts/installers/google-chrome.sh | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/images/linux/scripts/installers/google-chrome.sh b/images/linux/scripts/installers/google-chrome.sh index 3fb2a01989c5..29ad946e0fe2 100644 --- a/images/linux/scripts/installers/google-chrome.sh +++ b/images/linux/scripts/installers/google-chrome.sh @@ -14,10 +14,14 @@ function GetChromiumRevision { URL="https://omahaproxy.appspot.com/deps.json?version=${CHROME_VERSION}" REVISION=$(curl -s $URL | jq -r '.chromium_base_position') - # Google chrome 99.0.4844.82 based on the 1060 chromium revision, but there is chromium release with such number, use the previous release for that case - # https://github.com/actions/virtual-environments/issues/5256 - if [ $REVISION -eq "1060" ]; then - REVISION="961656" + # Some Google Chrome versions are based on Chromium revisions for which a (usually very old) Chromium release with the same number exist. So far this has heppened with 4 digits long Chromium revisions (1060, 1086). + # Use the previous Chromium release when this happens to avoid downloading and installing very old Chromium releases that would break image build because of incompatibilities. + # First reported with: https://github.com/actions/virtual-environments/issues/5256 + if [ ${#REVISION} -eq 4 ]; then + CURRENT_REVISIONS=$(curl -s "https://omahaproxy.appspot.com/all.json?os=linux&channel=stable") + PREVIOUS_VERSION=$(echo "$CURRENT_REVISIONS" | jq -r '.[].versions[].previous_version') + URL="https://omahaproxy.appspot.com/deps.json?version=${PREVIOUS_VERSION}" + REVISION=$(curl -s $URL | jq -r '.chromium_base_position') fi # Take the first part of the revision variable to search not only for a specific version, # but also for similar ones, so that we can get a previous one if the required revision is not found From 6645a9fa931e9151d9f9cabdb4834a4132afd957 Mon Sep 17 00:00:00 2001 From: Igor Boskovic <igorboskovic3@github.com> Date: Tue, 19 Apr 2022 12:15:12 +0200 Subject: [PATCH 1081/3485] [macOS] Software Updates 2022 Week 16 (#5406) --- images/macos/toolsets/toolset-11.json | 15 +++++++++++---- images/macos/toolsets/toolset-12.json | 17 ++++++++++++----- 2 files changed, 23 insertions(+), 9 deletions(-) diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index e48f6c9043c9..5927c3607e4f 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -14,19 +14,26 @@ "xamarin": { "vsmac": "latest", "mono-versions": [ - "6.12.0.162" + "6.12.0.174" ], "ios-versions": [ - "15.8.0.0", "15.6.0.3", "15.4.0.0", "15.2.0.17", "15.0.0.6", "14.20.0.24", "14.16.0.5", "14.14.2.5", "14.10.0.4", "14.8.0.3", "14.6.0.15", "14.4.1.3", "14.2.0.12", "14.0.0.0", "13.20.2.2" + "15.8.0.3", "15.6.0.3", "15.4.0.0", "15.2.0.17", "15.0.0.6", "14.20.0.24", "14.16.0.5", "14.14.2.5", "14.10.0.4", "14.8.0.3", "14.6.0.15", "14.4.1.3", "14.2.0.12", "14.0.0.0", "13.20.2.2" ], "mac-versions": [ - "8.8.0.0", "8.6.0.3", "8.4.0.0", "8.2.0.17", "7.14.0.27", "7.10.0.5", "7.8.2.5", "7.4.0.10", "7.2.0.3", "7.0.0.15", "6.22.1.26", "6.20.2.2" + "8.8.0.3", "8.6.0.3", "8.4.0.0", "8.2.0.17", "7.14.0.27", "7.10.0.5", "7.8.2.5", "7.4.0.10", "7.2.0.3", "7.0.0.15", "6.22.1.26", "6.20.2.2" ], "android-versions": [ - "12.0.0.3", "11.3.0.4", "11.2.2.1", "11.1.0.26", "11.0.2.0" + "12.2.4.3", "12.0.0.3", "11.3.0.4", "11.2.2.1", "11.1.0.26", "11.0.2.0" ], "bundle-default": "6_12_12", "bundles": [ + { + "symlink": "6_12_15", + "mono":"6.12", + "ios": "15.8", + "mac": "8.8", + "android": "12.2" + }, { "symlink": "6_12_14", "mono":"6.12", diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index f3ed7f2c5f9d..5ded72699b42 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -12,19 +12,26 @@ "xamarin": { "vsmac": "latest", "mono-versions": [ - "6.12.0.162" + "6.12.0.174" ], "ios-versions": [ - "15.8.0.0", "15.6.0.3", "15.4.0.0", "15.2.0.17", "15.0.0.6" + "15.8.0.3", "15.6.0.3", "15.4.0.0", "15.2.0.17", "15.0.0.6" ], "mac-versions": [ - "8.8.0.0", "8.6.0.3", "8.4.0.0", "8.2.0.17", "7.14.0.27" + "8.8.0.3", "8.6.0.3", "8.4.0.0", "8.2.0.17", "7.14.0.27" ], "android-versions": [ - "12.0.0.3", "11.3.0.4" + "12.2.4.3", "12.0.0.3", "11.3.0.4" ], - "bundle-default": "6_12_14", + "bundle-default": "6_12_15", "bundles": [ + { + "symlink": "6_12_15", + "mono":"6.12", + "ios": "15.8", + "mac": "8.8", + "android": "12.2" + }, { "symlink": "6_12_14", "mono":"6.12", From a7e8bf34bc0359816e89a79a65a8970815508e23 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Tue, 19 Apr 2022 13:40:06 +0200 Subject: [PATCH 1082/3485] [macOS] Install git 2.35.1 for macOS (#5415) --- images/macos/provision/core/git.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/images/macos/provision/core/git.sh b/images/macos/provision/core/git.sh index 7443e4778dfb..0dd8ba73956e 100644 --- a/images/macos/provision/core/git.sh +++ b/images/macos/provision/core/git.sh @@ -2,7 +2,11 @@ source ~/utils/utils.sh echo Installing Git... -brew_smart_install "git" +# Temporary hardcode version 2.35.1 due to the issue with the actions\checkout https://github.com/actions/checkout/issues/76 +brew tap-new local/git +brew extract --version=2.35.1 git local/git +brew install git@2.35.1 +brew untap -f local/homebrew-git echo Installing Git LFS brew_smart_install "git-lfs" From 4e34a258062807222521da23a25597c5c5ede527 Mon Sep 17 00:00:00 2001 From: Zoran Bjelica <100371150+zoran-bjelica@users.noreply.github.com> Date: Tue, 19 Apr 2022 20:49:37 +0200 Subject: [PATCH 1083/3485] [Ubuntu] Add AzModule 7.3.2 (#5405) --- images/linux/toolsets/toolset-1804.json | 2 +- images/linux/toolsets/toolset-2004.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index 10523a61423d..0e914d720ef0 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -120,7 +120,7 @@ "name": "az", "url" : "https://raw.githubusercontent.com/Azure/az-ps-module-versions/main/versions-manifest.json", "versions": [ - "7.1.0" + "7.3.2" ], "zip_versions": [ "3.1.0", diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index b5f83bef265a..0c5b19f99df4 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -118,7 +118,7 @@ "name": "az", "url" : "https://raw.githubusercontent.com/Azure/az-ps-module-versions/main/versions-manifest.json", "versions": [ - "7.1.0" + "7.3.2" ], "zip_versions": [ "3.1.0", From 503b916ab7a4b5cf62bba690b447114a51da0805 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Tue, 19 Apr 2022 22:59:08 +0400 Subject: [PATCH 1084/3485] Install git 2.35.1 for windows (#5414) --- images/win/scripts/Installers/Install-Git.ps1 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/images/win/scripts/Installers/Install-Git.ps1 b/images/win/scripts/Installers/Install-Git.ps1 index f48daf620612..2a0c769a0138 100644 --- a/images/win/scripts/Installers/Install-Git.ps1 +++ b/images/win/scripts/Installers/Install-Git.ps1 @@ -4,7 +4,8 @@ ################################################################################ # Install git -Choco-Install -PackageName git -ArgumentList '--installargs="/VERYSILENT /NORESTART /NOCANCEL /SP- /CLOSEAPPLICATIONS /RESTARTAPPLICATIONS /o:PathOption=CmdTools /o:BashTerminalOption=ConHost /o:EnableSymlinks=Enabled /COMPONENTS=gitlfs"' +# Temporary hardcode version 2.35.1 due to the issue with the actions\checkout https://github.com/actions/checkout/issues/760 +Choco-Install -PackageName git -ArgumentList '--version', "2.35.1.2", '--installargs="/VERYSILENT /NORESTART /NOCANCEL /SP- /CLOSEAPPLICATIONS /RESTARTAPPLICATIONS /o:PathOption=CmdTools /o:BashTerminalOption=ConHost /o:EnableSymlinks=Enabled /COMPONENTS=gitlfs"' # Install hub Choco-Install -PackageName hub From e1b218a38a634e6d8d141791d6d5059a6b636652 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Wed, 20 Apr 2022 16:23:32 +0400 Subject: [PATCH 1085/3485] [Windows] Add retries to Get-VsixExtenstionFromMarketplace function (#5418) * Add retries to Get-VsixExtenstionFromMarketplace * Use Invoke-SBWithRetry function --- images/win/scripts/ImageHelpers/InstallHelpers.ps1 | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/images/win/scripts/ImageHelpers/InstallHelpers.ps1 b/images/win/scripts/ImageHelpers/InstallHelpers.ps1 index 7c1f1ba89ee1..6de28c6d0bb5 100644 --- a/images/win/scripts/ImageHelpers/InstallHelpers.ps1 +++ b/images/win/scripts/ImageHelpers/InstallHelpers.ps1 @@ -186,7 +186,7 @@ function Start-DownloadWithRetry $filePath = Join-Path -Path $DownloadPath -ChildPath $Name $downloadStartTime = Get-Date - + # Default retry logic for the package. while ($Retries -gt 0) { @@ -229,7 +229,7 @@ function Get-VsixExtenstionFromMarketplace { ) $extensionUri = $MarketplaceUri + $ExtensionMarketPlaceName - $request = Invoke-WebRequest -Uri $extensionUri -UseBasicParsing + $request = Invoke-SBWithRetry -Command { Invoke-WebRequest -Uri $extensionUri -UseBasicParsing } -RetryCount 20 -RetryIntervalSeconds 30 $request -match 'UniqueIdentifierValue":"(?<extensionname>[^"]*)' | Out-Null $extensionName = $Matches.extensionname $request -match 'VsixId":"(?<vsixid>[^"]*)' | Out-Null @@ -274,12 +274,12 @@ function Install-VsixExtension try { $installPath = ${env:ProgramFiles(x86)} - + if (Test-IsWin22) { $installPath = ${env:ProgramFiles} } - + #There are 2 types of packages at the moment - exe and vsix if ($Name -match "vsix") { @@ -581,8 +581,8 @@ function Get-GitHubPackageDownloadUrl { [int]$SearchInCount = 100 ) - if ($Version -eq "latest") { - $Version = "*" + if ($Version -eq "latest") { + $Version = "*" } $json = Invoke-RestMethod -Uri "https://api.github.com/repos/${RepoOwner}/${RepoName}/releases?per_page=${SearchInCount}" $versionToDownload = ($json.Where{ $_.prerelease -eq $IsPrerelease }.tag_name | From 961aac86a39843ef5b5abb22f07d6b178b9166f9 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Wed, 20 Apr 2022 17:25:58 +0200 Subject: [PATCH 1086/3485] [macOS] enable automationmode without authentication (#5417) --- .../configuration/configure-machine.sh | 38 +++++++++++++++++++ .../configuration/configure-tccdb-macos11.sh | 1 + images/macos/templates/macOS-12.json | 3 +- images/macos/tests/System.Tests.ps1 | 6 +++ 4 files changed, 47 insertions(+), 1 deletion(-) diff --git a/images/macos/provision/configuration/configure-machine.sh b/images/macos/provision/configuration/configure-machine.sh index 8cbf869c8d1d..ab8b2d8d9b89 100644 --- a/images/macos/provision/configuration/configure-machine.sh +++ b/images/macos/provision/configuration/configure-machine.sh @@ -60,6 +60,44 @@ done rm -f ./add-certificate +# enable-automationmode-without-authentication +if is_Monterey; then +retry=10 +while [ $retry -gt 0 ]; do +{ +osascript <<EOF + tell application "Terminal" + activate + do script "automationmodetool enable-automationmode-without-authentication" + delay 2 + tell application "System Events" + keystroke "${PASSWORD}" + keystroke return + end tell + end tell + delay 5 +EOF +} && break + + retry=$((retry-1)) + if [ $retry -eq 0 ]; then + echo "No retry attempts left" + exit 1 + fi + sleep 10 +done + + term_service=$(launchctl list | grep -i terminal | cut -f3) + echo "Close terminal windows: gui/501/${term_service}" + launchctl bootout gui/501/${term_service} && sleep 5 + + # test enable-automationmode-without-authentication + if [[ ! "$(automationmodetool)" =~ "DOES NOT REQUIRE" ]]; then + echo "Failed to enable enable-automationmode-without-authentication option" + exit 1 + fi +fi + # Create symlink for tests running if [ ! -d "/usr/local/bin" ];then sudo mkdir -p -m 775 /usr/local/bin diff --git a/images/macos/provision/configuration/configure-tccdb-macos11.sh b/images/macos/provision/configuration/configure-tccdb-macos11.sh index 449fd8a55427..35525bd805c6 100644 --- a/images/macos/provision/configuration/configure-tccdb-macos11.sh +++ b/images/macos/provision/configuration/configure-tccdb-macos11.sh @@ -44,6 +44,7 @@ userValuesArray=( "'kTCCServiceUbiquity','com.apple.PassKitCore',0,2,5,1,NULL,NULL,NULL,'UNUSED',NULL,0,1619516250" "'kTCCServiceAppleEvents','/Library/Application Support/Veertu/Anka/addons/ankarund',1,2,3,1,X'fade0c00000000ac0000000100000006000000020000001e636f6d2e7665657274752e616e6b612e6164646f6e732e616e6b6172756e0000000000060000000f000000060000000e000000010000000a2a864886f76364060206000000000000000000060000000e000000000000000a2a864886f7636406010d0000000000000000000b000000000000000a7375626a6563742e4f550000000000010000000a545439464157503656340000',NULL,0,'com.apple.finder',X'fade0c000000002c00000001000000060000000200000010636f6d2e6170706c652e66696e64657200000003',NULL,1629294900" "'kTCCServiceAppleEvents','/Library/Application Support/Veertu/Anka/addons/ankarund',1,2,3,1,X'fade0c00000000ac0000000100000006000000020000001e636f6d2e7665657274752e616e6b612e6164646f6e732e616e6b6172756e0000000000060000000f000000060000000e000000010000000a2a864886f76364060206000000000000000000060000000e000000000000000a2a864886f7636406010d0000000000000000000b000000000000000a7375626a6563742e4f550000000000010000000a545439464157503656340000',NULL,0,'com.apple.systemevents',X'fade0c000000003400000001000000060000000200000016636f6d2e6170706c652e73797374656d6576656e7473000000000003',NULL,164456761" + "'kTCCServiceAppleEvents','/usr/libexec/sshd-keygen-wrapper',1,2,3,1,X'fade0c000000003c0000000100000006000000020000001d636f6d2e6170706c652e737368642d6b657967656e2d7772617070657200000000000003',NULL,0,'com.apple.Terminal',X'fade0c000000003000000001000000060000000200000012636f6d2e6170706c652e5465726d696e616c000000000003',NULL,1650386089" ) for values in "${userValuesArray[@]}"; do configure_user_tccdb "$values" diff --git a/images/macos/templates/macOS-12.json b/images/macos/templates/macOS-12.json index c9477bb6b03a..e9117a80b9f2 100644 --- a/images/macos/templates/macOS-12.json +++ b/images/macos/templates/macOS-12.json @@ -121,7 +121,8 @@ ], "environment_vars": [ "IMAGE_VERSION={{user `build_id`}}", - "IMAGE_OS={{user `image_os`}}" + "IMAGE_OS={{user `image_os`}}", + "PASSWORD={{user `vm_password`}}" ] }, { diff --git a/images/macos/tests/System.Tests.ps1 b/images/macos/tests/System.Tests.ps1 index ea96602e36c2..50fa16f8d5f5 100644 --- a/images/macos/tests/System.Tests.ps1 +++ b/images/macos/tests/System.Tests.ps1 @@ -54,3 +54,9 @@ Describe "Open windows" { $openWindows.Split(",").Trim() | Where-Object { $_ -notmatch "NotificationCenter" } | Should -BeNullOrEmpty } } + +Describe "AutomationModeTool" { + It "Does not require user authentication" -Skip:(-not $os.IsMonterey) { + automationmodetool | Out-String | Should -Match "DOES NOT REQUIRE" + } +} From 1e6e5cf82ee380b55da17955c5c738c1f5af8b96 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Thu, 21 Apr 2022 02:15:17 +0400 Subject: [PATCH 1087/3485] [Ubuntu] Add safe directory setting to git config (#5420) * Add safe directory setting to git config * Change git config file to /etc/gitconfig --- images/linux/scripts/installers/git.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/images/linux/scripts/installers/git.sh b/images/linux/scripts/installers/git.sh index be496eb63f6f..e3e821c830ad 100644 --- a/images/linux/scripts/installers/git.sh +++ b/images/linux/scripts/installers/git.sh @@ -15,6 +15,11 @@ add-apt-repository $GIT_REPO -y apt-get update apt-get install git -y git --version +# Git version 2.35.2 introduces security fix that breaks action\checkout https://github.com/actions/checkout/issues/760 +cat <<EOF >> /etc/gitconfig +[safe] + directory = * +EOF # Install git-lfs curl -s $GIT_LFS_REPO/script.deb.sh | bash From b40f9b9685a0acb9a749afe1d7d21b92658df121 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 21 Apr 2022 18:33:57 +0000 Subject: [PATCH 1088/3485] Updating readme file for macOS-12 version 20220419.1 (#5421) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-12-Readme.md | 66 ++++++++++++++++----------------- 1 file changed, 32 insertions(+), 34 deletions(-) diff --git a/images/macos/macos-12-Readme.md b/images/macos/macos-12-Readme.md index 8b57c374b6ee..64f3dac1f9b8 100644 --- a/images/macos/macos-12-Readme.md +++ b/images/macos/macos-12-Readme.md @@ -1,47 +1,43 @@ -| Announcements | -|-| -| [[All OSs] Go versions less than 1.16 will be removed and the default will be set to 1.17 on April, 11](https://github.com/actions/virtual-environments/issues/5280) | -*** # macOS 12.3 info - System Version: macOS 12.3.1 (21E258) - Kernel Version: Darwin 21.4.0 -- Image Version: 20220412.1 +- Image Version: 20220419.1 ## Installed Software ### Language and Runtime -- .NET SDK 3.1.101 3.1.201 3.1.302 3.1.417 5.0.102 5.0.202 5.0.302 5.0.406 +- .NET SDK 3.1.101 3.1.201 3.1.302 3.1.418 5.0.102 5.0.202 5.0.302 5.0.407 - Bash 3.2.57(1)-release - Clang/LLVM 13.0.1 is available on `'$(brew --prefix llvm)/bin/clang'` - Clang/LLVM 13.1.6 is default - gcc-11 (Homebrew GCC 11.2.0_3) 11.2.0 - available by `gcc-11` alias - GNU Fortran (Homebrew GCC 11.2.0_3) 11.2.0 - available by `gfortran-11` alias -- Go 1.17.8 +- Go 1.17.9 - julia 1.7.2 - Kotlin 1.6.20-release-275 -- MSBuild 16.10.1.58001 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) +- MSBuild 16.10.1.17201 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) - Node.js v16.14.2 - NVM 0.39.1 - NVM - Cached node versions: v12.22.12 v14.19.1 v16.14.2 - Perl 5.34.0 -- PHP 8.1.4 +- PHP 8.1.5 - Python 2.7.18 - Python 3.9.12 - R 4.1.3 -- Ruby 3.0.3p157 +- Ruby 3.0.4p208 ### Package Management - Bundler version 2.3.11 - Carthage 0.38.0 - CocoaPods 1.11.3 -- Composer 2.3.4 -- Homebrew 3.4.6 +- Composer 2.3.5 +- Homebrew 3.4.7 - NPM 8.5.0 - NuGet 5.9.0.7134 - Pip 20.3.4 (python 2.7) - Pip 22.0.4 (python 3.9) - Pipx 1.0.0 - RubyGems 3.2.33 -- Vcpkg 2022 (build from master \<4415a0f31>) +- Vcpkg 2022 (build from master \<c25761eb7>) - Yarn 1.22.18 ### Project Management @@ -60,34 +56,34 @@ - Curl 7.82.0 - Git 2.35.1 - Git LFS: 3.1.2 -- GitHub CLI: 2.7.0 +- GitHub CLI: 2.8.0 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.3 - gpg (GnuPG) 2.3.4 - Hub CLI: 2.14.2 - jq 1.6 -- mongo v5.0.6 -- mongod v5.0.6 +- mongo v5.0.7 +- mongod v5.0.7 - OpenSSL 1.1.1n 15 Mar 2022 `(/usr/local/opt/openssl@1.1 -> ../Cellar/openssl@1.1/1.1.1n)` - Packer 1.8.0 - PostgreSQL 14.2 - psql (PostgreSQL) 14.2 - Sox 14.4.2 -- Subversion (SVN) 1.14.1 +- Subversion (SVN) 1.14.2 - Switchaudio-osx 1.1.0 -- yq (https://github.com/mikefarah/yq/) version 4.24.2 +- yq (https://github.com/mikefarah/yq/) version 4.24.5 - zstd 1.5.2 ### Tools - App Center CLI command -- AWS CLI 2.5.4 +- AWS CLI 2.5.6 - AWS SAM CLI 1.46.0 - AWS Session Manager CLI 1.2.312.0 - Azure CLI (azure-devops) 0.25.0 - Azure CLI 2.35.0 - Bicep CLI 0.5.6 - Cabal 3.6.2.0 -- Cmake 3.23.0 +- Cmake 3.23.1 - Fastlane 2.205.1 - GHC 9.2.2 - GHCup v0.1.17.6 @@ -103,12 +99,12 @@ ### Browsers - Safari 15.4 (17613.1.17.1.13) - SafariDriver 15.4 (17613.1.17.1.13) -- Google Chrome 100.0.4896.88 +- Google Chrome 100.0.4896.127 - ChromeDriver 100.0.4896.60 -- Microsoft Edge 100.0.1185.39 -- MSEdgeDriver 100.0.1185.39 -- Mozilla Firefox 99.0 -- geckodriver 0.30.0 +- Microsoft Edge 100.0.1185.44 +- MSEdgeDriver 100.0.1185.44 +- Mozilla Firefox 99.0.1 +- geckodriver 0.31.0 - Selenium server 4.1.3 #### Environment variables @@ -132,8 +128,9 @@ ### Cached Tools #### Ruby -- 2.7.5 -- 3.0.3 +- 2.7.6 +- 3.0.4 +- 3.1.2 #### Python - 3.7.12 @@ -156,8 +153,8 @@ | Version | Architecture | Environment Variable | | ------- | ------------ | -------------------- | | 1.16.15 | x64 | GOROOT_1_16_X64 | -| 1.17.8 (Default) | x64 | GOROOT_1_17_X64 | -| 1.18.0 | x64 | GOROOT_1_18_X64 | +| 1.17.9 (Default) | x64 | GOROOT_1_17_X64 | +| 1.18.1 | x64 | GOROOT_1_18_X64 | ### Rust Tools - Cargo 1.60.0 @@ -168,8 +165,8 @@ #### Packages - Bindgen 0.59.2 - Cargo-audit 0.16.0 -- Cargo-outdated 0.11.0 -- Cbindgen 0.21.0 +- Cargo-outdated 0.11.1 +- Cbindgen 0.22.0 - Clippy 0.1.60 - Rustfmt 1.4.38-stable @@ -187,17 +184,18 @@ ### Web Servers | Name | Version | ConfigFile | ServiceStatus | ListenPort | | ----- | -------- | ------------------------------- | ------------- | ---------- | -| httpd | 2.4.53 | /usr/local/etc/httpd/httpd.conf | none | 80 | +| httpd | 2.4.53_1 | /usr/local/etc/httpd/httpd.conf | none | 80 | | nginx | 1.21.6_1 | /usr/local/etc/nginx/nginx.conf | none | 80 | ### Xamarin #### Visual Studio for Mac -- 8.10.21.4 +- 8.10.22.11 #### Xamarin bundles | symlink | Xamarin.Mono | Xamarin.iOS | Xamarin.Mac | Xamarin.Android | | ----------------- | ------------ | ----------- | ----------- | --------------- | -| 6_12_14 (default) | 6.12 | 15.8 | 8.8 | 12.0 | +| 6_12_15 (default) | 6.12 | 15.8 | 8.8 | 12.2 | +| 6_12_14 | 6.12 | 15.8 | 8.8 | 12.0 | | 6_12_13 | 6.12 | 15.6 | 8.6 | 12.0 | | 6_12_12 | 6.12 | 15.4 | 8.4 | 12.0 | | 6_12_11 | 6.12 | 15.2 | 8.2 | 12.0 | From 6b8f86f1deb3c8b9843ee5fee77f25b0d66d3f1b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 22 Apr 2022 05:04:58 +0000 Subject: [PATCH 1089/3485] Updating readme file for macOS-10.15 version 20220419.2 (#5423) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-10.15-Readme.md | 70 ++++++++++++++---------------- 1 file changed, 33 insertions(+), 37 deletions(-) diff --git a/images/macos/macos-10.15-Readme.md b/images/macos/macos-10.15-Readme.md index 5bb4bb8af0b6..499f71a35516 100644 --- a/images/macos/macos-10.15-Readme.md +++ b/images/macos/macos-10.15-Readme.md @@ -1,15 +1,11 @@ -| Announcements | -|-| -| [[All OSs] Go versions less than 1.16 will be removed and the default will be set to 1.17 on April, 11](https://github.com/actions/virtual-environments/issues/5280) | -*** # macOS 10.15 info - System Version: macOS 10.15.7 (19H1824) - Kernel Version: Darwin 19.6.0 -- Image Version: 20220408.1 +- Image Version: 20220419.2 ## Installed Software ### Language and Runtime -- .NET SDK 3.1.101 3.1.201 3.1.302 3.1.417 5.0.102 5.0.202 5.0.302 5.0.406 +- .NET SDK 3.1.101 3.1.201 3.1.302 3.1.418 5.0.102 5.0.202 5.0.302 5.0.407 - Bash 3.2.57(1)-release - Clang/LLVM 12.0.0 is default - Clang/LLVM 13.0.1 is available on `'$(brew --prefix llvm)/bin/clang'` @@ -19,7 +15,7 @@ - GNU Fortran (Homebrew GCC 9.4.0) 9.4.0 - available by `gfortran-9` alias - GNU Fortran (Homebrew GCC 10.3.0) 10.3.0 - available by `gfortran-10` alias - GNU Fortran (Homebrew GCC 11.2.0_3) 11.2.0 - available by `gfortran-11` alias -- Go 1.17.8 +- Go 1.17.9 - julia 1.7.2 - Kotlin 1.6.20-release-275 - MSBuild 16.10.1.58001 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) @@ -27,18 +23,18 @@ - NVM 0.39.1 - NVM - Cached node versions: v12.22.12 v14.19.1 v16.14.2 - Perl 5.34.0 -- PHP 8.1.4 +- PHP 8.1.5 - Python 2.7.18 - Python 3.9.12 - R 4.1.3 -- Ruby 2.7.5p203 +- Ruby 2.7.6p219 ### Package Management - Bundler version 2.3.11 - Carthage 0.38.0 - CocoaPods 1.11.3 -- Composer 2.3.4 -- Homebrew 3.4.5 +- Composer 2.3.5 +- Homebrew 3.4.7 - Miniconda 4.11.0 - NPM 8.5.0 - NuGet 5.9.0.7134 @@ -46,7 +42,7 @@ - Pip 22.0.4 (python 3.9) - Pipx 1.0.0 - RubyGems 3.2.33 -- Vcpkg 2022 (build from master \<bd1ef2df4>) +- Vcpkg 2022 (build from master \<c37cc7836>) - Yarn 1.22.18 #### Environment variables @@ -71,40 +67,40 @@ - Curl 7.82.0 - Git 2.35.1 - Git LFS: 3.1.2 -- GitHub CLI: 2.7.0 +- GitHub CLI: 2.8.0 - GNU parallel 20220322 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.3 - gpg (GnuPG) 2.3.4 -- helm v3.8.1+g5cb9af4 +- helm v3.8.2+g6e3701e - Hub CLI: 2.14.2 - jq 1.6 -- mongo v5.0.6 -- mongod v5.0.6 +- mongo v5.0.7 +- mongod v5.0.7 - Newman 5.3.2 - OpenSSL 1.1.1n 15 Mar 2022 `(/usr/local/opt/openssl@1.1 -> ../Cellar/openssl@1.1/1.1.1n)` - Packer 1.8.0 - PostgreSQL 14.2 - psql (PostgreSQL) 14.2 - Sox 14.4.2 -- Subversion (SVN) 1.14.1 +- Subversion (SVN) 1.14.2 - Switchaudio-osx 1.1.0 - Vagrant 2.2.19 - virtualbox 6.1.32r149290 -- yq (https://github.com/mikefarah/yq/) version 4.24.2 +- yq (https://github.com/mikefarah/yq/) version 4.24.5 - zstd 1.5.2 ### Tools -- Aliyun CLI 3.0.115 -- App Center CLI 2.10.9 -- AWS CLI 2.5.4 +- Aliyun CLI 3.0.117 +- App Center CLI 2.10.10 +- AWS CLI 2.5.6 - AWS SAM CLI 1.46.0 - AWS Session Manager CLI 1.2.312.0 - Azure CLI (azure-devops) 0.25.0 - Azure CLI 2.35.0 - Bicep CLI 0.5.6 - Cabal 3.6.2.0 -- Cmake 3.23.0 +- Cmake 3.23.1 - Fastlane 2.205.1 - GHC 9.2.2 - GHCup v0.1.17.6 @@ -121,12 +117,12 @@ ### Browsers - Safari 15.4 (15613.1.17.1.13) - SafariDriver 15.4 (15613.1.17.1.13) -- Google Chrome 100.0.4896.75 +- Google Chrome 100.0.4896.127 - ChromeDriver 100.0.4896.60 -- Microsoft Edge 100.0.1185.36 -- MSEdgeDriver 100.0.1185.36 -- Mozilla Firefox 99.0 -- geckodriver 0.30.0 +- Microsoft Edge 100.0.1185.44 +- MSEdgeDriver 100.0.1185.44 +- Mozilla Firefox 99.0.1 +- geckodriver 0.31.0 - Selenium server 4.1.3 #### Environment variables @@ -155,9 +151,9 @@ #### Ruby - 2.4.10 - 2.5.9 -- 2.6.9 -- 2.7.5 -- 3.0.3 +- 2.6.10 +- 2.7.6 +- 3.0.4 #### Python - 2.7.18 @@ -183,8 +179,8 @@ | Version | Architecture | Environment Variable | | ------- | ------------ | -------------------- | | 1.16.15 | x64 | GOROOT_1_16_X64 | -| 1.17.8 (Default) | x64 | GOROOT_1_17_X64 | -| 1.18.0 | x64 | GOROOT_1_18_X64 | +| 1.17.9 (Default) | x64 | GOROOT_1_17_X64 | +| 1.18.1 | x64 | GOROOT_1_18_X64 | ### Rust Tools - Cargo 1.60.0 @@ -195,8 +191,8 @@ #### Packages - Bindgen 0.59.2 - Cargo-audit 0.16.0 -- Cargo-outdated 0.11.0 -- Cbindgen 0.21.0 +- Cargo-outdated 0.11.1 +- Cbindgen 0.22.0 - Clippy 0.1.60 - Rustfmt 1.4.38-stable @@ -206,7 +202,7 @@ #### PowerShell Modules | Module | Version | | ---------------- | ------- | -| Az | 7.1.0 | +| Az | 7.4.0 | | MarkdownPS | 1.9 | | Pester | 5.3.1 | | PSScriptAnalyzer | 1.20.0 | @@ -214,12 +210,12 @@ ### Web Servers | Name | Version | ConfigFile | ServiceStatus | ListenPort | | ----- | -------- | ------------------------------- | ------------- | ---------- | -| httpd | 2.4.53 | /usr/local/etc/httpd/httpd.conf | none | 80 | +| httpd | 2.4.53_1 | /usr/local/etc/httpd/httpd.conf | none | 80 | | nginx | 1.21.6_1 | /usr/local/etc/nginx/nginx.conf | none | 80 | ### Xamarin #### Visual Studio for Mac -- 8.10.21.4 +- 8.10.22.11 #### Xamarin bundles | symlink | Xamarin.Mono | Xamarin.iOS | Xamarin.Mac | Xamarin.Android | From 7f12aaf402ba26b02899c17d8cf0cdae96a716ed Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 23 Apr 2022 20:29:37 +0000 Subject: [PATCH 1090/3485] Updating readme file for macOS-11 version 20220419.3 (#5422) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-11-Readme.md | 74 ++++++++++++++++----------------- 1 file changed, 36 insertions(+), 38 deletions(-) diff --git a/images/macos/macos-11-Readme.md b/images/macos/macos-11-Readme.md index c979771e3c3e..c1cf16bb05b6 100644 --- a/images/macos/macos-11-Readme.md +++ b/images/macos/macos-11-Readme.md @@ -1,15 +1,11 @@ -| Announcements | -|-| -| [[All OSs] Go versions less than 1.16 will be removed and the default will be set to 1.17 on April, 11](https://github.com/actions/virtual-environments/issues/5280) | -*** # macOS 11.6 info - System Version: macOS 11.6.5 (20G527) - Kernel Version: Darwin 20.6.0 -- Image Version: 20220410.1 +- Image Version: 20220419.3 ## Installed Software ### Language and Runtime -- .NET SDK 3.1.101 3.1.201 3.1.302 3.1.417 5.0.102 5.0.202 5.0.302 5.0.406 +- .NET SDK 3.1.101 3.1.201 3.1.302 3.1.418 5.0.102 5.0.202 5.0.302 5.0.407 - Bash 3.2.57(1)-release - Clang/LLVM 13.0.0 is default - Clang/LLVM 13.0.1 is available on `'$(brew --prefix llvm)/bin/clang'` @@ -19,26 +15,26 @@ - GNU Fortran (Homebrew GCC 9.4.0) 9.4.0 - available by `gfortran-9` alias - GNU Fortran (Homebrew GCC 10.3.0) 10.3.0 - available by `gfortran-10` alias - GNU Fortran (Homebrew GCC 11.2.0_3) 11.2.0 - available by `gfortran-11` alias -- Go 1.17.8 +- Go 1.17.9 - julia 1.7.2 - Kotlin 1.6.20-release-275 -- MSBuild 16.10.1.58001 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) +- MSBuild 16.10.1.17201 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) - Node.js v16.14.2 - NVM 0.39.1 - NVM - Cached node versions: v12.22.12 v14.19.1 v16.14.2 - Perl 5.34.0 -- PHP 8.1.4 +- PHP 8.1.5 - Python 2.7.18 - Python 3.9.12 - R 4.1.3 -- Ruby 2.7.5p203 +- Ruby 2.7.6p219 ### Package Management - Bundler version 2.3.11 - Carthage 0.38.0 - CocoaPods 1.11.3 -- Composer 2.3.4 -- Homebrew 3.4.5 +- Composer 2.3.5 +- Homebrew 3.4.7 - Miniconda 4.11.0 - NPM 8.5.0 - NuGet 5.9.0.7134 @@ -46,7 +42,7 @@ - Pip 22.0.4 (python 3.9) - Pipx 1.0.0 - RubyGems 3.2.33 -- Vcpkg 2022 (build from master \<f6af75acc>) +- Vcpkg 2022 (build from master \<c37cc7836>) - Yarn 1.22.18 #### Environment variables @@ -71,37 +67,37 @@ - Curl 7.82.0 - Git 2.35.1 - Git LFS: 3.1.2 -- GitHub CLI: 2.7.0 +- GitHub CLI: 2.8.0 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.3 - gpg (GnuPG) 2.3.4 -- helm v3.8.1+g5cb9af4 +- helm v3.8.2+g6e3701e - Hub CLI: 2.14.2 - jq 1.6 -- mongo v5.0.6 -- mongod v5.0.6 +- mongo v5.0.7 +- mongod v5.0.7 - Newman 5.3.2 - OpenSSL 1.1.1n 15 Mar 2022 `(/usr/local/opt/openssl@1.1 -> ../Cellar/openssl@1.1/1.1.1n)` - Packer 1.8.0 - PostgreSQL 14.2 - psql (PostgreSQL) 14.2 - Sox 14.4.2 -- Subversion (SVN) 1.14.1 +- Subversion (SVN) 1.14.2 - Switchaudio-osx 1.1.0 -- yq (https://github.com/mikefarah/yq/) version 4.24.2 +- yq (https://github.com/mikefarah/yq/) version 4.24.5 - zstd 1.5.2 ### Tools -- Aliyun CLI 3.0.115 -- App Center CLI 2.10.9 -- AWS CLI 2.5.4 +- Aliyun CLI 3.0.117 +- App Center CLI 2.10.10 +- AWS CLI 2.5.6 - AWS SAM CLI 1.46.0 - AWS Session Manager CLI 1.2.312.0 - Azure CLI (azure-devops) 0.25.0 - Azure CLI 2.35.0 - Bicep CLI 0.5.6 - Cabal 3.6.2.0 -- Cmake 3.23.0 +- Cmake 3.23.1 - Fastlane 2.205.1 - GHC 9.2.2 - GHCup v0.1.17.6 @@ -118,12 +114,12 @@ ### Browsers - Safari 15.4 (16613.1.17.1.13) - SafariDriver 15.4 (16613.1.17.1.13) -- Google Chrome 100.0.4896.75 +- Google Chrome 100.0.4896.127 - ChromeDriver 100.0.4896.60 -- Microsoft Edge 100.0.1185.36 -- MSEdgeDriver 100.0.1185.36 -- Mozilla Firefox 99.0 -- geckodriver 0.30.0 +- Microsoft Edge 100.0.1185.44 +- MSEdgeDriver 100.0.1185.44 +- Mozilla Firefox 99.0.1 +- geckodriver 0.31.0 - Selenium server 4.1.3 #### Environment variables @@ -149,9 +145,10 @@ #### Ruby - 2.4.10 - 2.5.9 -- 2.6.9 -- 2.7.5 -- 3.0.3 +- 2.6.10 +- 2.7.6 +- 3.0.4 +- 3.1.2 #### Python - 3.7.12 @@ -174,8 +171,8 @@ | Version | Architecture | Environment Variable | | ------- | ------------ | -------------------- | | 1.16.15 | x64 | GOROOT_1_16_X64 | -| 1.17.8 (Default) | x64 | GOROOT_1_17_X64 | -| 1.18.0 | x64 | GOROOT_1_18_X64 | +| 1.17.9 (Default) | x64 | GOROOT_1_17_X64 | +| 1.18.1 | x64 | GOROOT_1_18_X64 | ### Rust Tools - Cargo 1.60.0 @@ -186,8 +183,8 @@ #### Packages - Bindgen 0.59.2 - Cargo-audit 0.16.0 -- Cargo-outdated 0.11.0 -- Cbindgen 0.21.0 +- Cargo-outdated 0.11.1 +- Cbindgen 0.22.0 - Clippy 0.1.60 - Rustfmt 1.4.38-stable @@ -197,7 +194,7 @@ #### PowerShell Modules | Module | Version | | ---------------- | ------- | -| Az | 7.1.0 | +| Az | 7.4.0 | | MarkdownPS | 1.9 | | Pester | 5.3.1 | | PSScriptAnalyzer | 1.20.0 | @@ -205,16 +202,17 @@ ### Web Servers | Name | Version | ConfigFile | ServiceStatus | ListenPort | | ----- | -------- | ------------------------------- | ------------- | ---------- | -| httpd | 2.4.53 | /usr/local/etc/httpd/httpd.conf | none | 80 | +| httpd | 2.4.53_1 | /usr/local/etc/httpd/httpd.conf | none | 80 | | nginx | 1.21.6_1 | /usr/local/etc/nginx/nginx.conf | none | 80 | ### Xamarin #### Visual Studio for Mac -- 8.10.21.4 +- 8.10.22.11 #### Xamarin bundles | symlink | Xamarin.Mono | Xamarin.iOS | Xamarin.Mac | Xamarin.Android | | ----------------- | ------------ | ----------- | ----------- | --------------- | +| 6_12_15 | 6.12 | 15.8 | 8.8 | 12.2 | | 6_12_14 | 6.12 | 15.8 | 8.8 | 12.0 | | 6_12_13 | 6.12 | 15.6 | 8.6 | 12.0 | | 6_12_12 (default) | 6.12 | 15.4 | 8.4 | 12.0 | From d6ddbcd278fd03cec014d3596dce618cca969046 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Mon, 25 Apr 2022 23:09:04 +0400 Subject: [PATCH 1091/3485] Install Xcodeclt & Homebrew first (#5430) --- images/macos/templates/macOS-10.15.json | 11 +++++++++-- images/macos/templates/macOS-11.json | 9 ++++++++- images/macos/templates/macOS-11.pkr.hcl | 7 ++++++- images/macos/templates/macOS-12.json | 10 ++++++++-- 4 files changed, 31 insertions(+), 6 deletions(-) diff --git a/images/macos/templates/macOS-10.15.json b/images/macos/templates/macOS-10.15.json index 9d051353a9d0..201bb31d3fd9 100644 --- a/images/macos/templates/macOS-10.15.json +++ b/images/macos/templates/macOS-10.15.json @@ -90,9 +90,17 @@ }, { "type": "shell", - "execute_command": "chmod +x {{ .Path }}; sudo {{ .Vars }} {{ .Path }}", + "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}", + "pause_before": "30s", "scripts": [ "./provision/core/xcode-clt.sh", + "./provision/core/homebrew.sh" + ] + }, + { + "type": "shell", + "execute_command": "chmod +x {{ .Path }}; sudo {{ .Vars }} {{ .Path }}", + "scripts": [ "./provision/configuration/add-network-interface-detection.sh", "./provision/configuration/autologin.sh", "./provision/configuration/disable-auto-updates.sh", @@ -130,7 +138,6 @@ "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}", "pause_before": "30s", "scripts": [ - "./provision/core/homebrew.sh", "./provision/core/open_windows_check.sh", "./provision/core/powershell.sh", "./provision/core/dotnet.sh", diff --git a/images/macos/templates/macOS-11.json b/images/macos/templates/macOS-11.json index a62b26a97b4c..684e3d46ad36 100644 --- a/images/macos/templates/macOS-11.json +++ b/images/macos/templates/macOS-11.json @@ -93,6 +93,14 @@ "source": "./toolsets/toolset-11.json", "destination": "~/image-generation/toolset.json" }, + { + "type": "shell", + "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}", + "scripts": [ + "./provision/core/xcode-clt.sh", + "./provision/core/homebrew.sh" + ] + }, { "type": "shell", "execute_command": "chmod +x {{ .Path }}; sudo {{ .Vars }} {{ .Path }}", @@ -135,7 +143,6 @@ "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}", "pause_before": "30s", "scripts": [ - "./provision/core/homebrew.sh", "./provision/core/open_windows_check.sh", "./provision/core/powershell.sh", "./provision/core/dotnet.sh", diff --git a/images/macos/templates/macOS-11.pkr.hcl b/images/macos/templates/macOS-11.pkr.hcl index bbc65e2b682a..cd4db2c07837 100644 --- a/images/macos/templates/macOS-11.pkr.hcl +++ b/images/macos/templates/macOS-11.pkr.hcl @@ -99,6 +99,12 @@ build { provisioner "shell" { scripts = [ "./provision/core/xcode-clt.sh", + "./provision/core/homebrew.sh" + ] + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" + } + provisioner "shell" { + scripts = [ "./provision/configuration/configure-tccdb-macos11.sh", "./provision/configuration/add-network-interface-detection.sh", "./provision/configuration/autologin.sh", @@ -134,7 +140,6 @@ build { provisioner "shell" { pause_before = "30s" scripts = [ - "./provision/core/homebrew.sh", "./provision/core/open_windows_check.sh", "./provision/core/powershell.sh", "./provision/core/dotnet.sh", diff --git a/images/macos/templates/macOS-12.json b/images/macos/templates/macOS-12.json index e9117a80b9f2..19cacb0e45b8 100644 --- a/images/macos/templates/macOS-12.json +++ b/images/macos/templates/macOS-12.json @@ -95,9 +95,16 @@ }, { "type": "shell", - "execute_command": "chmod +x {{ .Path }}; sudo {{ .Vars }} {{ .Path }}", + "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}", "scripts": [ "./provision/core/xcode-clt.sh", + "./provision/core/homebrew.sh" + ] + }, + { + "type": "shell", + "execute_command": "chmod +x {{ .Path }}; sudo {{ .Vars }} {{ .Path }}", + "scripts": [ "./provision/configuration/add-network-interface-detection.sh", "./provision/configuration/autologin.sh", "./provision/configuration/disable-auto-updates.sh", @@ -136,7 +143,6 @@ "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}", "pause_before": "30s", "scripts": [ - "./provision/core/homebrew.sh", "./provision/core/open_windows_check.sh", "./provision/core/powershell.sh", "./provision/core/dotnet.sh", From 94788ae5eaa9837d4b9c59f203bb8fde7b3b9df2 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Tue, 26 Apr 2022 16:26:51 +0400 Subject: [PATCH 1092/3485] Change pattern for Rscript output (#5437) --- images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 index d714f83c7183..af06164c4640 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 @@ -31,7 +31,7 @@ function Get-BicepVersion { } function Get-RVersion { - ($(cmd /c "Rscript --version 2>&1") | Out-String) -match "R scripting front-end version (?<version>\d+\.\d+\.\d+)" | Out-Null + ($(cmd /c "Rscript --version 2>&1") | Out-String) -match "Rscript .* version (?<version>\d+\.\d+\.\d+)" | Out-Null $rVersion = $Matches.Version return "R $rVersion" } From c2f87e917034ea15a7c1161eef7fb3d117b69512 Mon Sep 17 00:00:00 2001 From: Steve-Glass <84886334+Steve-Glass@users.noreply.github.com> Date: Tue, 26 Apr 2022 13:49:54 -0400 Subject: [PATCH 1093/3485] Update table with macOS 12 Public Beta info (#5438) * Update table with macOS 12 Public Beta info * Add link to the badge Co-authored-by: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 54f663cc3706..13e6bb26b952 100644 --- a/README.md +++ b/README.md @@ -12,6 +12,7 @@ For general questions about using the virtual environments or writing your Actio | --------------------|---------------------|--------------------|---------------------| | Ubuntu 20.04 | `ubuntu-latest` or `ubuntu-20.04` | [ubuntu-20.04] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu20&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu20&redirect=1) | Ubuntu 18.04 | `ubuntu-18.04` | [ubuntu-18.04] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu18&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu18&redirect=1) +| macOS 12 | `macos-12`| [macOS-12] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-12&badge=1)] | macOS 11 | `macos-latest` or `macos-11`| [macOS-11] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-11&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-11&redirect=1) | macOS 10.15 | `macos-10.15` | [macOS-10.15] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-10.15&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-10.15&redirect=1) | Windows Server 2022 | `windows-latest` or `windows-2022` | [windows-2022] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=windows-2022&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=windows-2022&redirect=1) | @@ -52,6 +53,7 @@ You can also track upcoming changes using the [awaiting-deployment](https://gith [windows-2019]: https://github.com/actions/virtual-environments/blob/main/images/win/Windows2019-Readme.md [windows-2016]: https://github.com/actions/virtual-environments/blob/main/images/win/Windows2016-Readme.md [macOS-11]: https://github.com/actions/virtual-environments/blob/main/images/macos/macos-11-Readme.md +[macOS-12]: https://github.com/actions/virtual-environments/blob/main/images/macos/macos-12-Readme.md [macOS-10.15]: https://github.com/actions/virtual-environments/blob/main/images/macos/macos-10.15-Readme.md [self-hosted runners]: https://help.github.com/en/actions/hosting-your-own-runners From 99997cd292598cc5223020a32265fd99b2c7d40e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 27 Apr 2022 09:55:11 +0000 Subject: [PATCH 1094/3485] Updating readme file for macOS-12 version 20220425.3 (#5443) Co-authored-by: Image generation service account <no-reply@microsoft.com> --- images/macos/macos-12-Readme.md | 40 ++++++++++++++++----------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/images/macos/macos-12-Readme.md b/images/macos/macos-12-Readme.md index 64f3dac1f9b8..7f28f1574f49 100644 --- a/images/macos/macos-12-Readme.md +++ b/images/macos/macos-12-Readme.md @@ -1,7 +1,7 @@ # macOS 12.3 info - System Version: macOS 12.3.1 (21E258) - Kernel Version: Darwin 21.4.0 -- Image Version: 20220419.1 +- Image Version: 20220425.3 ## Installed Software ### Language and Runtime @@ -13,7 +13,7 @@ - GNU Fortran (Homebrew GCC 11.2.0_3) 11.2.0 - available by `gfortran-11` alias - Go 1.17.9 - julia 1.7.2 -- Kotlin 1.6.20-release-275 +- Kotlin 1.6.21-release-334 - MSBuild 16.10.1.17201 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) - Node.js v16.14.2 - NVM 0.39.1 @@ -22,22 +22,22 @@ - PHP 8.1.5 - Python 2.7.18 - Python 3.9.12 -- R 4.1.3 +- R 4.2.0 - Ruby 3.0.4p208 ### Package Management -- Bundler version 2.3.11 +- Bundler version 2.3.12 - Carthage 0.38.0 - CocoaPods 1.11.3 - Composer 2.3.5 -- Homebrew 3.4.7 +- Homebrew 3.4.8 - NPM 8.5.0 - NuGet 5.9.0.7134 - Pip 20.3.4 (python 2.7) - Pip 22.0.4 (python 3.9) - Pipx 1.0.0 - RubyGems 3.2.33 -- Vcpkg 2022 (build from master \<c25761eb7>) +- Vcpkg 2022 (build from master \<94c728df6>) - Yarn 1.22.18 ### Project Management @@ -55,11 +55,11 @@ - bsdtar 3.5.1 - available by 'tar' alias - Curl 7.82.0 - Git 2.35.1 -- Git LFS: 3.1.2 +- Git LFS: 3.1.4 - GitHub CLI: 2.8.0 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.3 -- gpg (GnuPG) 2.3.4 +- gpg (GnuPG) 2.3.6 - Hub CLI: 2.14.2 - jq 1.6 - mongo v5.0.7 @@ -76,24 +76,24 @@ ### Tools - App Center CLI command -- AWS CLI 2.5.6 +- AWS CLI 2.5.8 - AWS SAM CLI 1.46.0 - AWS Session Manager CLI 1.2.312.0 - Azure CLI (azure-devops) 0.25.0 -- Azure CLI 2.35.0 +- Azure CLI 2.36.0 - Bicep CLI 0.5.6 - Cabal 3.6.2.0 - Cmake 3.23.1 -- Fastlane 2.205.1 +- Fastlane 2.205.2 - GHC 9.2.2 -- GHCup v0.1.17.6 +- GHCup v0.1.17.7 - Jazzy 0.14.2 - Stack 2.7.5 - Swig 4.0.2 - Xcode Command Line Tools 13.3.1.0.1.1648687083 ### Linters -- SwiftLint 0.47.0 +- SwiftLint 0.47.1 - yamllint 1.26.3 ### Browsers @@ -101,8 +101,8 @@ - SafariDriver 15.4 (17613.1.17.1.13) - Google Chrome 100.0.4896.127 - ChromeDriver 100.0.4896.60 -- Microsoft Edge 100.0.1185.44 -- MSEdgeDriver 100.0.1185.44 +- Microsoft Edge 100.0.1185.50 +- MSEdgeDriver 100.0.1185.50 - Mozilla Firefox 99.0.1 - geckodriver 0.31.0 - Selenium server 4.1.3 @@ -119,7 +119,7 @@ | ------------------- | --------------- | -------------------- | | 8.0.322+6 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | | 11.0.14+101 | Eclipse Temurin | JAVA_HOME_11_X64 | -| 17.0.2+8 | Eclipse Temurin | JAVA_HOME_17_X64 | +| 17.0.3+7 | Eclipse Temurin | JAVA_HOME_17_X64 | ### GraalVM | Version | Environment variables | @@ -166,7 +166,7 @@ - Bindgen 0.59.2 - Cargo-audit 0.16.0 - Cargo-outdated 0.11.1 -- Cbindgen 0.22.0 +- Cbindgen 0.23.0 - Clippy 0.1.60 - Rustfmt 1.4.38-stable @@ -176,9 +176,9 @@ #### PowerShell Modules | Module | Version | | ---------------- | ------- | -| Az | 7.4.0 | +| Az | 7.5.0 | | MarkdownPS | 1.9 | -| Pester | 5.3.1 | +| Pester | 5.3.2 | | PSScriptAnalyzer | 1.20.0 | ### Web Servers @@ -262,7 +262,7 @@ | Package Name | Version | | -------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 4.0 | -| Android Emulator | 31.2.9 | +| Android Emulator | 31.2.10 | | Android SDK Build-tools | 32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | | Android SDK Platforms | android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | | Android SDK Platform-Tools | 33.0.1 | From 546688dac44b5cdec48f4876de590ee9cc592a0d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 27 Apr 2022 11:16:53 +0000 Subject: [PATCH 1095/3485] Updating readme file for macOS-10.15 version 20220424.1 (#5440) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-10.15-Readme.md | 36 +++++++++++++++--------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/images/macos/macos-10.15-Readme.md b/images/macos/macos-10.15-Readme.md index 499f71a35516..12dc412f615c 100644 --- a/images/macos/macos-10.15-Readme.md +++ b/images/macos/macos-10.15-Readme.md @@ -1,7 +1,7 @@ # macOS 10.15 info - System Version: macOS 10.15.7 (19H1824) - Kernel Version: Darwin 19.6.0 -- Image Version: 20220419.2 +- Image Version: 20220424.1 ## Installed Software ### Language and Runtime @@ -17,7 +17,7 @@ - GNU Fortran (Homebrew GCC 11.2.0_3) 11.2.0 - available by `gfortran-11` alias - Go 1.17.9 - julia 1.7.2 -- Kotlin 1.6.20-release-275 +- Kotlin 1.6.21-release-334 - MSBuild 16.10.1.58001 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) - Node.js v16.14.2 - NVM 0.39.1 @@ -26,11 +26,11 @@ - PHP 8.1.5 - Python 2.7.18 - Python 3.9.12 -- R 4.1.3 +- R 4.2.0 - Ruby 2.7.6p219 ### Package Management -- Bundler version 2.3.11 +- Bundler version 2.3.12 - Carthage 0.38.0 - CocoaPods 1.11.3 - Composer 2.3.5 @@ -42,7 +42,7 @@ - Pip 22.0.4 (python 3.9) - Pipx 1.0.0 - RubyGems 3.2.33 -- Vcpkg 2022 (build from master \<c37cc7836>) +- Vcpkg 2022 (build from master \<2ac61f87f>) - Yarn 1.22.18 #### Environment variables @@ -66,12 +66,12 @@ - bsdtar 3.3.2 - available by 'tar' alias - Curl 7.82.0 - Git 2.35.1 -- Git LFS: 3.1.2 +- Git LFS: 3.1.4 - GitHub CLI: 2.8.0 -- GNU parallel 20220322 +- GNU parallel 20220422 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.3 -- gpg (GnuPG) 2.3.4 +- gpg (GnuPG) 2.3.5 - helm v3.8.2+g6e3701e - Hub CLI: 2.14.2 - jq 1.6 @@ -86,14 +86,14 @@ - Subversion (SVN) 1.14.2 - Switchaudio-osx 1.1.0 - Vagrant 2.2.19 -- virtualbox 6.1.32r149290 +- virtualbox 6.1.34r150636 - yq (https://github.com/mikefarah/yq/) version 4.24.5 - zstd 1.5.2 ### Tools - Aliyun CLI 3.0.117 - App Center CLI 2.10.10 -- AWS CLI 2.5.6 +- AWS CLI 2.5.8 - AWS SAM CLI 1.46.0 - AWS Session Manager CLI 1.2.312.0 - Azure CLI (azure-devops) 0.25.0 @@ -101,9 +101,9 @@ - Bicep CLI 0.5.6 - Cabal 3.6.2.0 - Cmake 3.23.1 -- Fastlane 2.205.1 +- Fastlane 2.205.2 - GHC 9.2.2 -- GHCup v0.1.17.6 +- GHCup v0.1.17.7 - Jazzy 0.14.2 - Stack 2.7.5 - SwiftFormat 0.49.7 @@ -119,8 +119,8 @@ - SafariDriver 15.4 (15613.1.17.1.13) - Google Chrome 100.0.4896.127 - ChromeDriver 100.0.4896.60 -- Microsoft Edge 100.0.1185.44 -- MSEdgeDriver 100.0.1185.44 +- Microsoft Edge 100.0.1185.50 +- MSEdgeDriver 100.0.1185.50 - Mozilla Firefox 99.0.1 - geckodriver 0.31.0 - Selenium server 4.1.3 @@ -140,7 +140,7 @@ | 12.0.2+10.3 | Adopt OpenJDK | JAVA_HOME_12_X64 | | 13.0.2+8.1 | Adopt OpenJDK | JAVA_HOME_13_X64 | | 14.0.2+12 | Adopt OpenJDK | JAVA_HOME_14_X64 | -| 17.0.2+8 | Eclipse Temurin | JAVA_HOME_17_X64 | +| 17.0.3+7 | Eclipse Temurin | JAVA_HOME_17_X64 | ### GraalVM | Version | Environment variables | @@ -192,7 +192,7 @@ - Bindgen 0.59.2 - Cargo-audit 0.16.0 - Cargo-outdated 0.11.1 -- Cbindgen 0.22.0 +- Cbindgen 0.23.0 - Clippy 0.1.60 - Rustfmt 1.4.38-stable @@ -204,7 +204,7 @@ | ---------------- | ------- | | Az | 7.4.0 | | MarkdownPS | 1.9 | -| Pester | 5.3.1 | +| Pester | 5.3.2 | | PSScriptAnalyzer | 1.20.0 | ### Web Servers @@ -354,7 +354,7 @@ | Package Name | Version | | -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 4.0 | -| Android Emulator | 31.2.9 | +| Android Emulator | 31.2.10 | | Android SDK Build-tools | 32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3<br>26.0.0 26.0.1 26.0.2 26.0.3<br>25.0.0 25.0.1 25.0.2 25.0.3<br>24.0.0 24.0.1 24.0.2 24.0.3 | | Android SDK Platforms | android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3)<br>android-26 (rev 2)<br>android-25 (rev 3)<br>android-24 (rev 2) | | Android SDK Platform-Tools | 33.0.1 | From 95b5b968a6349472197962cfccb19868aa25fd72 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 27 Apr 2022 13:01:41 +0000 Subject: [PATCH 1096/3485] Updating readme file for macOS-11 version 20220424.1 (#5441) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-11-Readme.md | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/images/macos/macos-11-Readme.md b/images/macos/macos-11-Readme.md index c1cf16bb05b6..1b629203fb88 100644 --- a/images/macos/macos-11-Readme.md +++ b/images/macos/macos-11-Readme.md @@ -1,7 +1,7 @@ # macOS 11.6 info - System Version: macOS 11.6.5 (20G527) - Kernel Version: Darwin 20.6.0 -- Image Version: 20220419.3 +- Image Version: 20220424.1 ## Installed Software ### Language and Runtime @@ -17,7 +17,7 @@ - GNU Fortran (Homebrew GCC 11.2.0_3) 11.2.0 - available by `gfortran-11` alias - Go 1.17.9 - julia 1.7.2 -- Kotlin 1.6.20-release-275 +- Kotlin 1.6.21-release-334 - MSBuild 16.10.1.17201 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) - Node.js v16.14.2 - NVM 0.39.1 @@ -26,11 +26,11 @@ - PHP 8.1.5 - Python 2.7.18 - Python 3.9.12 -- R 4.1.3 +- R 4.2.0 - Ruby 2.7.6p219 ### Package Management -- Bundler version 2.3.11 +- Bundler version 2.3.12 - Carthage 0.38.0 - CocoaPods 1.11.3 - Composer 2.3.5 @@ -42,7 +42,7 @@ - Pip 22.0.4 (python 3.9) - Pipx 1.0.0 - RubyGems 3.2.33 -- Vcpkg 2022 (build from master \<c37cc7836>) +- Vcpkg 2022 (build from master \<2ac61f87f>) - Yarn 1.22.18 #### Environment variables @@ -66,11 +66,11 @@ - bsdtar 3.3.2 - available by 'tar' alias - Curl 7.82.0 - Git 2.35.1 -- Git LFS: 3.1.2 +- Git LFS: 3.1.4 - GitHub CLI: 2.8.0 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.3 -- gpg (GnuPG) 2.3.4 +- gpg (GnuPG) 2.3.5 - helm v3.8.2+g6e3701e - Hub CLI: 2.14.2 - jq 1.6 @@ -90,7 +90,7 @@ ### Tools - Aliyun CLI 3.0.117 - App Center CLI 2.10.10 -- AWS CLI 2.5.6 +- AWS CLI 2.5.8 - AWS SAM CLI 1.46.0 - AWS Session Manager CLI 1.2.312.0 - Azure CLI (azure-devops) 0.25.0 @@ -98,9 +98,9 @@ - Bicep CLI 0.5.6 - Cabal 3.6.2.0 - Cmake 3.23.1 -- Fastlane 2.205.1 +- Fastlane 2.205.2 - GHC 9.2.2 -- GHCup v0.1.17.6 +- GHCup v0.1.17.7 - Jazzy 0.14.2 - Stack 2.7.5 - SwiftFormat 0.49.7 @@ -116,8 +116,8 @@ - SafariDriver 15.4 (16613.1.17.1.13) - Google Chrome 100.0.4896.127 - ChromeDriver 100.0.4896.60 -- Microsoft Edge 100.0.1185.44 -- MSEdgeDriver 100.0.1185.44 +- Microsoft Edge 100.0.1185.50 +- MSEdgeDriver 100.0.1185.50 - Mozilla Firefox 99.0.1 - geckodriver 0.31.0 - Selenium server 4.1.3 @@ -134,7 +134,7 @@ | ------------------- | --------------- | -------------------- | | 8.0.322+6 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | | 11.0.14+101 | Eclipse Temurin | JAVA_HOME_11_X64 | -| 17.0.2+8 | Eclipse Temurin | JAVA_HOME_17_X64 | +| 17.0.3+7 | Eclipse Temurin | JAVA_HOME_17_X64 | ### GraalVM | Version | Environment variables | @@ -184,7 +184,7 @@ - Bindgen 0.59.2 - Cargo-audit 0.16.0 - Cargo-outdated 0.11.1 -- Cbindgen 0.22.0 +- Cbindgen 0.23.0 - Clippy 0.1.60 - Rustfmt 1.4.38-stable @@ -196,7 +196,7 @@ | ---------------- | ------- | | Az | 7.4.0 | | MarkdownPS | 1.9 | -| Pester | 5.3.1 | +| Pester | 5.3.2 | | PSScriptAnalyzer | 1.20.0 | ### Web Servers @@ -316,7 +316,7 @@ | Package Name | Version | | -------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 4.0 | -| Android Emulator | 31.2.9 | +| Android Emulator | 31.2.10 | | Android SDK Build-tools | 32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | | Android SDK Platforms | android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | | Android SDK Platform-Tools | 33.0.1 | From b2b196182cab5ac45f6d4b5a9c263e8526cb7be0 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Wed, 27 Apr 2022 16:01:45 +0200 Subject: [PATCH 1097/3485] Add README redirect to macOS 12 badge (#5450) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 13e6bb26b952..6eec73c354b1 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ For general questions about using the virtual environments or writing your Actio | --------------------|---------------------|--------------------|---------------------| | Ubuntu 20.04 | `ubuntu-latest` or `ubuntu-20.04` | [ubuntu-20.04] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu20&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu20&redirect=1) | Ubuntu 18.04 | `ubuntu-18.04` | [ubuntu-18.04] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu18&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu18&redirect=1) -| macOS 12 | `macos-12`| [macOS-12] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-12&badge=1)] +| macOS 12 | `macos-12`| [macOS-12] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-12&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-12&redirect=1) | macOS 11 | `macos-latest` or `macos-11`| [macOS-11] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-11&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-11&redirect=1) | macOS 10.15 | `macos-10.15` | [macOS-10.15] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-10.15&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-10.15&redirect=1) | Windows Server 2022 | `windows-latest` or `windows-2022` | [windows-2022] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=windows-2022&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=windows-2022&redirect=1) | From cd32655cd2fdb29ead7543784cd4415508917921 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Wed, 27 Apr 2022 16:12:04 +0200 Subject: [PATCH 1098/3485] LICENSE: update year (#5451) --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index 1606539a1952..fac6e630f9dd 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2021 GitHub +Copyright (c) 2022 GitHub Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal From 23358eeb170773e5a8f18db1c5f3ae46d4618d8d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 28 Apr 2022 09:03:25 +0000 Subject: [PATCH 1099/3485] Updating readme file for ubuntu18 version 20220426.1 (#5447) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu1804-Readme.md | 124 +++++++++++++++--------------- 1 file changed, 62 insertions(+), 62 deletions(-) diff --git a/images/linux/Ubuntu1804-Readme.md b/images/linux/Ubuntu1804-Readme.md index c5001ac9f696..28bc3b9e9cff 100644 --- a/images/linux/Ubuntu1804-Readme.md +++ b/images/linux/Ubuntu1804-Readme.md @@ -1,11 +1,10 @@ | Announcements | |-| | [[Ubuntu] PHP 7.1 will be removed from Ubuntu 18 on April, 18](https://github.com/actions/virtual-environments/issues/5326) | -| [[All OSs] Go versions less than 1.16 will be removed and the default will be set to 1.17 on April, 11](https://github.com/actions/virtual-environments/issues/5280) | *** # Ubuntu 18.04.6 LTS -- Linux kernel version: 5.4.0-1074-azure -- Image Version: 20220410.2 +- Linux kernel version: 5.4.0-1077-azure +- Image Version: 20220426.1 ## Installed Software ### Language and Runtime @@ -17,7 +16,7 @@ - GNU C++ 7.5.0, 9.4.0, 10.3.0 - GNU Fortran 7.5.0, 9.4.0, 10.3.0 - Julia 1.7.2 -- Kotlin 1.6.20-release-275 +- Kotlin 1.6.21-release-334 - Mono 6.12.0.122 (apt source repository: https://download.mono-project.com/repo/ubuntu stable-bionic main) - MSBuild 16.6.0.15201 (from /usr/lib/mono/msbuild/15.0/bin/MSBuild.dll) - Node 16.14.2 @@ -29,15 +28,15 @@ ### Package Management - cpan 1.64 -- Helm 3.8.1 -- Homebrew 3.4.6 +- Helm 3.8.2 +- Homebrew 3.4.8 - Miniconda 4.11.0 - Npm 8.5.0 - Pip 9.0.1 - Pip3 9.0.1 - Pipx 1.0.0 - RubyGems 2.7.6 -- Vcpkg (build from master \<f6af75acc>) +- Vcpkg (build from master \<9f643818c>) - Yarn 1.22.18 #### Environment variables @@ -53,66 +52,66 @@ - Sbt 1.6.2 ### Tools -- Ansible 2.11.10 +- Ansible 2.11.11 - apt-fast 1.9.12 - AzCopy 10.14.1 (available by `azcopy` and `azcopy10` aliases) - Bazel 5.1.1 - Bazelisk 1.11.0 - Bicep 0.5.6 - Buildah 1.19.6 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- CMake 3.23.0 +- CMake 3.23.1 - CodeQL Action Bundle 2.8.5 - Docker Compose v1 1.29.2 - Docker Compose v2 2.4.1+azure-1 - Docker-Buildx 0.8.2 - Docker-Moby Client 20.10.14+azure-1 - Docker-Moby Server 20.10.14+azure-1 -- Git 2.35.1 (apt source repository: ppa:git-core/ppa) -- Git LFS 3.1.2 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) +- Git 2.36.0 (apt source repository: ppa:git-core/ppa) +- Git LFS 3.1.4 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.3.1 - Haveged 1.9.1 - Heroku 7.60.1 -- HHVM (HipHop VM) 4.156.0 +- HHVM (HipHop VM) 4.159.0 - jq 1.5 - Kind 0.12.0 -- Kubectl 1.23.5 +- Kubectl 1.23.6 - Kustomize 4.5.4 - Leiningen 2.9.8 - MediaInfo 17.12 - Mercurial 4.5.3 - Minikube 1.25.2 -- n 8.1.0 +- n 8.2.0 - Newman 5.3.2 - nvm 0.39.1 -- OpenSSL 1.1.1 11 Sep 2018 +- OpenSSL 1.1.1-1ubuntu2.1~18.04.15 - Packer 1.8.0 -- Parcel 2.4.1 +- Parcel 2.5.0 - PhantomJS 2.1.1 - Podman 3.0.1 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- Pulumi 3.28.0 +- Pulumi 3.30.0 - R 4.1.3 - Skopeo 1.2.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 - SVN 1.9.7 -- Terraform 1.1.8 +- Terraform 1.1.9 - yamllint 1.26.3 -- yq 4.24.2 +- yq 4.24.5 - zstd 1.5.2 (homebrew) ### CLI Tools -- Alibaba Cloud CLI 3.0.116 -- AWS CLI 1.22.92 +- Alibaba Cloud CLI 3.0.118 +- AWS CLI 1.23.1 - AWS CLI Session manager plugin 1.2.312.0 - AWS SAM CLI 1.46.0 -- Azure CLI (azure-cli) 2.35.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) +- Azure CLI (azure-cli) 2.36.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.25.0 -- GitHub CLI 2.7.0 +- GitHub CLI 2.9.0 - Google Cloud SDK 369.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 9.16.4 -- OpenShift CLI 4.10.8 +- Netlify CLI 10.0.0 +- OpenShift CLI 4.10.11 - ORAS CLI 0.12.0 -- Vercel CLI 24.0.1 +- Vercel CLI 24.1.0 ### Java | Version | Vendor | Environment Variable | @@ -123,18 +122,18 @@ | 17.0.2+8 | Eclipse Temurin | JAVA_HOME_17_X64 | ### PHP -| Tool | Version | -| -------- | ---------------------------------------- | -| PHP | 7.1.33 7.2.34 7.3.33 7.4.28 8.0.17 8.1.4 | -| Composer | 2.2.9 | -| PHPUnit | 8.5.26 | +| Tool | Version | +| -------- | --------------------------------- | +| PHP | 7.2.34 7.3.33 7.4.29 8.0.18 8.1.5 | +| Composer | 2.3.5 | +| PHPUnit | 8.5.26 | ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ``` ### Haskell - Cabal 3.6.2.0 - GHC 9.2.2 -- GHCup 0.1.17.6 +- GHCup 0.1.17.7 - Stack 2.7.5 ### Rust Tools @@ -148,15 +147,15 @@ - Cargo audit 0.16.0 - Cargo clippy 0.1.60 - Cargo outdated -- Cbindgen 0.21.0 +- Cbindgen 0.23.0 - Rustfmt 1.4.38 ### Browsers and Drivers -- Google Chrome 100.0.4896.75 -- ChromeDriver 100.0.4896.60 +- Google Chrome 101.0.4951.41 +- ChromeDriver 101.0.4951.15 - Mozilla Firefox 99.0 - Geckodriver 0.31.0 -- Chromium 100.0.4896.0 +- Chromium 101.0.4951.0 - Selenium server 4.1.0 #### Environment variables @@ -167,13 +166,13 @@ | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | ### .NET Core SDK -- 3.1.120 3.1.202 3.1.302 3.1.417 5.0.104 5.0.212 5.0.303 5.0.406 6.0.201 +- 3.1.120 3.1.202 3.1.302 3.1.418 5.0.104 5.0.213 5.0.303 5.0.407 6.0.202 ### .NET tools - nbgv 3.4.255+06fb9182bf ### Databases -- MongoDB 5.0.7 (apt source repository: https://repo.mongodb.org/apt/ubuntu) +- MongoDB 5.0.8 (apt source repository: https://repo.mongodb.org/apt/ubuntu) - sqlite3 3.22.0 #### PostgreSQL @@ -197,8 +196,8 @@ ### Cached Tools #### Go - 1.16.15 -- 1.17.8 -- 1.18.0 +- 1.17.9 +- 1.18.1 #### Node.js - 12.22.12 @@ -221,16 +220,17 @@ #### Ruby - 2.4.10 - 2.5.9 -- 2.6.9 -- 2.7.5 -- 3.0.3 +- 2.6.10 +- 2.7.6 +- 3.0.4 +- 3.1.2 #### Environment variables | Name | Value | Architecture | | --------------- | ----------------------------------- | ------------ | | GOROOT_1_16_X64 | /opt/hostedtoolcache/go/1.16.15/x64 | x64 | -| GOROOT_1_17_X64 | /opt/hostedtoolcache/go/1.17.8/x64 | x64 | -| GOROOT_1_18_X64 | /opt/hostedtoolcache/go/1.18.0/x64 | x64 | +| GOROOT_1_17_X64 | /opt/hostedtoolcache/go/1.17.9/x64 | x64 | +| GOROOT_1_18_X64 | /opt/hostedtoolcache/go/1.18.1/x64 | x64 | ### PowerShell Tools - PowerShell 7.2.2 @@ -239,11 +239,11 @@ | Module | Version | | --------------- | ------- | | MarkdownPS | 1.9 | -| Microsoft.Graph | 1.9.3 | -| Pester | 5.3.1 | +| Microsoft.Graph | 1.9.5 | +| Pester | 5.3.2 | #### Az PowerShell Modules -- 7.1.0 3.1.0.zip 4.4.0.zip 5.9.0.zip 6.6.0.zip +- 7.3.2 3.1.0.zip 4.4.0.zip 5.9.0.zip 6.6.0.zip ### Web Servers | Name | Version | ConfigFile | ServiceStatus | ListenPort | @@ -255,7 +255,7 @@ | Package Name | Version | | -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 4.0 | -| Android Emulator | 31.2.9 | +| Android Emulator | 31.2.10 | | Android SDK Build-tools | 32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3<br>26.0.0 26.0.1 26.0.2 26.0.3<br>25.0.0 25.0.1 25.0.2 25.0.3<br>24.0.0 24.0.1 24.0.2 24.0.3<br>23.0.1 23.0.2 23.0.3 | | Android SDK Platform-Tools | 33.0.1 | | Android SDK Platforms | android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3)<br>android-26 (rev 2)<br>android-25 (rev 3)<br>android-24 (rev 2)<br>android-23 (rev 3) | @@ -283,22 +283,22 @@ | alpine:3.12 | sha256:c75ac27b49326926b803b9ed43bf088bc220d22556de1bc5f72d742c91398f69 | 2022-04-05 | | alpine:3.13 | sha256:ccf92aa53bc6c3b25be2ad0cce80baec1778f007f7e076b0ffbd1b225d0b3a9b | 2022-04-05 | | alpine:3.14 | sha256:06b5d462c92fc39303e6363c65e074559f8d6b1363250027ed5053557e3398c5 | 2022-04-05 | -| buildpack-deps:bullseye | sha256:b22e1a6daf16ea7e682e1d813aac528bb027f0772dc819716b4f41fbb06a3ffc | 2022-03-29 | -| buildpack-deps:buster | sha256:2c7b57f137d4ec1346ab226acd3eeac4f143ae2adc65a8abbd64489233065773 | 2022-03-29 | -| buildpack-deps:stretch | sha256:9cee83a572cc5f844548ee5f29eb0284772a162f312d7f049ad178207a0bae6d | 2022-03-29 | -| debian:10 | sha256:1b236b48c1ef66fa08535a5153266f4959bf58f948db3e68f7d678b651d8e33a | 2022-03-29 | -| debian:11 | sha256:87eefc7c15610cca61db5c0fd280911c6a737c0680d807432c0bd80cd0cca39b | 2022-03-29 | -| debian:9 | sha256:a8cc1744bbdd5266678e3e8b3e6387e45c053218438897e86876f2eb104e5534 | 2022-03-29 | +| buildpack-deps:bullseye | sha256:f26b9bcb6722fd59888caf4f4c1d4990799e3e83d804a83b7b58b4be949dc75e | 2022-04-20 | +| buildpack-deps:buster | sha256:b971efe3151fcfb10d0b7dfc739d081a9f9d9413195aa9b80224a66f4a651b4a | 2022-04-20 | +| buildpack-deps:stretch | sha256:fd003a4b08626dd6e5a59c61de0639243909644344a5bada501bf42e9982eac6 | 2022-04-20 | +| debian:10 | sha256:ebe4b9831fb22dfa778de4ffcb8ea0ad69b5d782d4e86cab14cc1fded5d8e761 | 2022-04-20 | +| debian:11 | sha256:6846593d7d8613e5dcc68c8f7d8b8e3179c7f3397b84a47c5b2ce989ef1075a0 | 2022-04-20 | +| debian:9 | sha256:cebe6e1c30384958d471467e231f740e8f0fd92cbfd2a435a186e9bada3aee1c | 2022-04-20 | | moby/buildkit:latest | sha256:bd37f0b5567084cd6f4b1c73b7fed9e12258441d064cc2add29a7dd32243ff86 | 2022-04-07 | -| node:12 | sha256:461c7f8b5e042fa7f47620cbee7772e76ce3fa0891edaab29bf7ebf0e84b9a1a | 2022-03-31 | -| node:12-alpine | sha256:bbc10cf532971046b490806de40f5959fa3bdd0acb82955847bdb0ffd1ab4854 | 2022-04-05 | -| node:14 | sha256:b2d1c5df5e001b694115f64f4532c7eec2e5dbd73db6e0caacf0049bd0aed7d2 | 2022-03-31 | +| node:12 | sha256:01627afeb110b3054ba4a1405541ca095c8bfca1cb6f2be9479c767a2711879e | 2022-04-20 | +| node:12-alpine | sha256:d4b15b3d48f42059a15bd659be60afe21762aae9d6cbea6f124440895c27db68 | 2022-04-11 | +| node:14 | sha256:2f39686f6d0b2687550659367fa11f56018a0f782b7e30f1a0ea56b11dece124 | 2022-04-20 | | node:14-alpine | sha256:8845b4f88f64f8c56a39236648ba22946e806a6153c10911f77b70e5a2edb4ca | 2022-04-05 | -| node:16 | sha256:ffe804d6fcced29bcfc3477de079d03a9c2b0e4917e44bfeafb1a6b0f875e383 | 2022-03-31 | +| node:16 | sha256:6e54786b2ad01667d46524e82806298714f50d2be72b39706770aed55faedbd7 | 2022-04-20 | | node:16-alpine | sha256:28bed508446db2ee028d08e76fb47b935defa26a84986ca050d2596ea67fd506 | 2022-04-05 | | ubuntu:16.04 | sha256:20858ebbc96215d6c3c574f781133ebffdc7c18d98af4f294cc4c04871a6fe61 | 2021-08-31 | -| ubuntu:18.04 | sha256:982d72c16416b09ffd2f71aa381f761422085eda1379dc66b668653607969e38 | 2022-04-05 | -| ubuntu:20.04 | sha256:9101220a875cee98b016668342c489ff0674f247f6ca20dfc91b91c0f28581ae | 2022-04-05 | +| ubuntu:18.04 | sha256:627b1184c9100a22ba9dcf531908b9e24af99fa54e45c10f57852fb890a57ea6 | 2022-04-21 | +| ubuntu:20.04 | sha256:115822d64890aae5cde3c1e85ace4cc97308bb1fd884dac62f4db0a16dbddb36 | 2022-04-21 | ### Installed apt packages | Name | Version | @@ -378,7 +378,7 @@ | wget | 1.19.4-1ubuntu2.2 | | xorriso | 1.4.8-3 | | xvfb | 2:1.19.6-1ubuntu4.10 | -| xz-utils | 5.2.2-1.3 | +| xz-utils | 5.2.2-1.3ubuntu0.1 | | zip | 3.0-11build1 | | zsync | 0.6.2-3ubuntu1 | From 3d7addb8fc369f737b8bfa135cae5fed752671a3 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 28 Apr 2022 18:53:00 +0000 Subject: [PATCH 1100/3485] Updating readme file for win22 version 20220426.1 (#5449) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2022-Readme.md | 131 ++++++++++++++++--------------- 1 file changed, 66 insertions(+), 65 deletions(-) diff --git a/images/win/Windows2022-Readme.md b/images/win/Windows2022-Readme.md index e0ee3788b7ff..5105212e1e7e 100644 --- a/images/win/Windows2022-Readme.md +++ b/images/win/Windows2022-Readme.md @@ -1,10 +1,10 @@ | Announcements | |-| -| [[All OSs] Go versions less than 1.16 will be removed and the default will be set to 1.17 on April, 11](https://github.com/actions/virtual-environments/issues/5280) | +| [[Azure DevOps] Windows-2016 environment removal postponed until June 30, 2022](https://github.com/actions/virtual-environments/issues/5403) | *** # Microsoft Windows Server 2022 Datacenter -- OS Version: 10.0.20348 Build 587 -- Image Version: 20220410.1 +- OS Version: 10.0.20348 Build 643 +- Image Version: 20220426.1 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -12,27 +12,27 @@ ## Installed Software ### Language and Runtime - Bash 4.4.23(2)-release -- Go 1.17.8 +- Go 1.17.9 - Julia 1.7.2 -- Kotlin 1.6.20 +- Kotlin 1.6.21 - LLVM 13.0.1 - Node 16.14.2 - Perl 5.32.1 -- PHP 8.1.4 +- PHP 8.1.5 - Python 3.9.12 -- Ruby 3.0.3p157 +- Ruby 3.0.4p208 ### Package Management - Chocolatey 1.1.0 -- Composer 2.3.4 -- Helm 3.8.0 +- Composer 2.3.5 +- Helm 3.8.2 - Miniconda 4.11.0 (pre-installed on the image but not added to PATH) - NPM 8.5.0 - NuGet 6.1.0.106 - pip 22.0.4 (python 3.9) - Pipx 1.0.0 -- RubyGems 3.2.32 -- Vcpkg (build from master \<f6af75acc>) +- RubyGems 3.2.33 +- Vcpkg (build from master \<9f643818c>) - Yarn 1.22.18 #### Environment variables @@ -54,7 +54,7 @@ - Bazelisk 1.11.0 - Bicep 0.5.6 - Cabal 3.6.2.0 -- CMake 3.23.0 +- CMake 3.23.1 - CodeQL Action Bundle 2.8.5 - Docker 20.10.7 - Docker-compose 1.29.2 @@ -62,21 +62,21 @@ - ghc 9.2.2 - Git 2.35.1.windows.2 - Git LFS 3.0.2 -- InnoSetup 6.2.0 +- InnoSetup 6.2.1 - jq 1.6 - Kind 0.12.0 -- Kubectl 1.23.5 +- Kubectl 1.23.6 - Mercurial 5.0 - Mingw-w64 8.1.0 - Newman 5.3.2 - NSIS v3.08 - OpenSSL 1.1.1 - Packer 1.8.0 -- Pulumi v3.28.0 -- R 4.1.3 -- Service Fabric SDK 8.2.1571.9590 +- Pulumi v3.30.0 +- R 4.2.0 +- Service Fabric SDK 9.0.1017.9590 - Stack 2.7.5 -- Subversion (SVN) 1.14.1 +- Subversion (SVN) 1.14.2 - Swig 4.0.2 - VSWhere 3.0.1 - WinAppDriver 1.2.2009.02003 @@ -85,13 +85,13 @@ - zstd 1.5.2 ### CLI Tools -- Alibaba Cloud CLI 3.0.115 -- AWS CLI 2.5.4 +- Alibaba Cloud CLI 3.0.118 +- AWS CLI 2.5.8 - AWS SAM CLI 1.46.0 - AWS Session Manager CLI 1.2.312.0 -- Azure CLI 2.35.0 +- Azure CLI 2.36.0 - Azure DevOps CLI extension 0.25.0 -- GitHub CLI 2.7.0 +- GitHub CLI 2.9.0 - Hub CLI 2.14.2 ### Rust Tools @@ -103,18 +103,18 @@ #### Packages - bindgen 0.59.2 - cargo-audit 0.16.0 -- cargo-outdated 0.11.0 -- cbindgen 0.21.0 +- cargo-outdated 0.11.1 +- cbindgen 0.23.0 - Clippy 0.1.60 - Rustfmt 1.4.38 ### Browsers and webdrivers -- Google Chrome 100.0.4896.75 -- Chrome Driver 100.0.4896.60 -- Microsoft Edge 100.0.1185.36 -- Microsoft Edge Driver 100.0.1185.36 -- Mozilla Firefox 99.0 -- Gecko Driver 0.30.0 +- Google Chrome 101.0.4951.41 +- Chrome Driver 101.0.4951.15 +- Microsoft Edge 100.0.1185.50 +- Microsoft Edge Driver 100.0.1185.50 +- Mozilla Firefox 99.0.1 +- Gecko Driver 0.31.0 - IE Driver 3.150.1.1 - Selenium server 4.1.0 @@ -130,8 +130,8 @@ | Version | Vendor | Environment Variable | | ------------------- | --------------- | -------------------- | | 8.0.322+6 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | -| 11.0.14+101 | Eclipse Temurin | JAVA_HOME_11_X64 | -| 17.0.2+8 | Eclipse Temurin | JAVA_HOME_17_X64 | +| 11.0.15+10 | Eclipse Temurin | JAVA_HOME_11_X64 | +| 17.0.3+7 | Eclipse Temurin | JAVA_HOME_17_X64 | ### Shells | Name | Target | @@ -155,8 +155,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Version | Architecture | Environment Variable | | ------- | ------------ | -------------------- | | 1.16.15 | x64 | GOROOT_1_16_X64 | -| 1.17.8 (Default) | x64 | GOROOT_1_17_X64 | -| 1.18.0 | x64 | GOROOT_1_18_X64 | +| 1.17.9 (Default) | x64 | GOROOT_1_17_X64 | +| 1.18.1 | x64 | GOROOT_1_18_X64 | #### Node | Version | Architecture | @@ -176,8 +176,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Ruby | Version | Architecture | | ------- | ------------ | -| 2.7.5 | x64 | -| 3.0.3 (Default) | x64 | +| 2.7.6 | x64 | +| 3.0.4 (Default) | x64 | +| 3.1.2 | x64 | #### PyPy | Python Version | PyPy Version | @@ -203,12 +204,12 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### MongoDB | Version | ServiceName | ServiceStatus | ServiceStartType | | ------- | ----------- | ------------- | ---------------- | -| 5.0.6.0 | MongoDB | Running | Automatic | +| 5.0.8.0 | MongoDB | Running | Automatic | ### Database tools - Azure CosmosDb Emulator 2.14.6.0 - DacFx 16.0.5400.1 -- MySQL 8.0.28.0 +- MySQL 8.0.29.0 - SQL OLEDB Driver 18.6.3.0 - SQLPS 1.0 @@ -219,9 +220,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Nginx | 1.21.6 | C:\tools\nginx-1.21.6\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2022 -| Name | Version | Path | -| ----------------------------- | -------------- | -------------------------------------------------------- | -| Visual Studio Enterprise 2022 | 17.1.32328.378 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | +| Name | Version | Path | +| ----------------------------- | ------------- | -------------------------------------------------------- | +| Visual Studio Enterprise 2022 | 17.1.32421.90 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | #### Workloads, components and extensions: | Package | Version | @@ -234,7 +235,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Component.MDD.Android | 17.1.32112.364 | | Component.MDD.Linux | 17.1.32112.364 | | Component.MDD.Linux.GCC.arm | 17.1.32112.364 | -| Component.Microsoft.VisualStudio.LiveShare.2022 | 1.0.5117 | +| Component.Microsoft.VisualStudio.LiveShare.2022 | 1.0.5431 | | Component.Microsoft.VisualStudio.RazorExtension | 17.1.32112.364 | | Component.Microsoft.VisualStudio.Web.AzureFunctions | 17.1.32112.364 | | Component.Microsoft.Web.LibraryManager | 17.1.32112.364 | @@ -271,11 +272,11 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.Net.ComponentGroup.4.8.DeveloperTools | 17.1.32112.364 | | Microsoft.Net.ComponentGroup.DevelopmentPrerequisites | 17.1.32112.364 | | Microsoft.Net.ComponentGroup.TargetingPacks.Common | 17.1.32112.364 | -| microsoft.net.runtime.mono.tooling | 6.0.322.12309 | -| microsoft.net.sdk.emscripten | 6.0.6.10801 | +| microsoft.net.runtime.mono.tooling | 6.0.422.16404 | +| microsoft.net.sdk.emscripten | 6.0.6.16102 | | Microsoft.NetCore.Component.DevelopmentTools | 17.1.32112.364 | -| Microsoft.NetCore.Component.Runtime.6.0 | 17.1.32228.430 | -| Microsoft.NetCore.Component.SDK | 17.1.32228.430 | +| Microsoft.NetCore.Component.Runtime.6.0 | 17.1.32406.283 | +| Microsoft.NetCore.Component.SDK | 17.1.32406.283 | | Microsoft.NetCore.Component.Web | 17.1.32112.364 | | Microsoft.VisualStudio.Component.AppInsights.Tools | 17.1.32112.364 | | Microsoft.VisualStudio.Component.AspNet | 17.1.32112.364 | @@ -309,7 +310,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Component.IISExpress | 17.1.32112.364 | | Microsoft.VisualStudio.Component.IntelliCode | 17.1.32112.364 | | Microsoft.VisualStudio.Component.IntelliTrace.FrontEnd | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.JavaScript.Diagnostics | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.JavaScript.Diagnostics | 17.1.32406.283 | | Microsoft.VisualStudio.Component.JavaScript.TypeScript | 17.1.32112.364 | | Microsoft.VisualStudio.Component.LinqToSql | 17.1.32112.364 | | Microsoft.VisualStudio.Component.LiveUnitTesting | 17.1.32112.364 | @@ -332,7 +333,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Component.SQL.SSDT | 17.1.32112.364 | | Microsoft.VisualStudio.Component.TeamOffice | 17.1.32112.364 | | Microsoft.VisualStudio.Component.TestTools.CodedUITest | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.TestTools.WebLoadTest | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.TestTools.WebLoadTest | 17.1.32406.283 | | Microsoft.VisualStudio.Component.TextTemplating | 17.1.32112.364 | | Microsoft.VisualStudio.Component.TypeScript.TSServer | 17.1.32112.364 | | Microsoft.VisualStudio.Component.Unity | 17.1.32112.364 | @@ -372,8 +373,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Component.VC.Runtimes.x86.x64.Spectre | 17.1.32112.364 | | Microsoft.VisualStudio.Component.VC.TestAdapterForBoostTest | 17.1.32112.364 | | Microsoft.VisualStudio.Component.VC.TestAdapterForGoogleTest | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.VC.Tools.ARM | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.VC.Tools.ARM64 | 17.1.32112.364 | +| Microsoft.VisualStudio.Component.VC.Tools.ARM | 17.1.32406.283 | +| Microsoft.VisualStudio.Component.VC.Tools.ARM64 | 17.1.32406.283 | | Microsoft.VisualStudio.Component.VC.Tools.ARM64EC | 17.1.32112.364 | | Microsoft.VisualStudio.Component.VC.Tools.x86.x64 | 17.1.32112.364 | | Microsoft.VisualStudio.Component.VC.v141.ARM | 17.1.32112.364 | @@ -432,7 +433,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Workload.Python | 17.1.32112.364 | | Microsoft.VisualStudio.Workload.Universal | 17.1.32112.364 | | Microsoft.VisualStudio.Workload.VisualStudioExtension | 17.1.32112.364 | -| wasm.tools | 6.0.322.12309 | +| wasm.tools | 6.0.422.16404 | | VisualStudioClient.MicrosoftVisualStudio2022InstallerProjects | 2.0.0 | | WixToolset.WixToolsetVisualStudio2022Extension | 1.0.0.18 | @@ -459,17 +460,17 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### .NET Core SDK `Location C:\Program Files\dotnet\sdk` -- 3.1.120 3.1.202 3.1.302 3.1.417 5.0.104 5.0.212 5.0.303 5.0.406 6.0.201 +- 3.1.120 3.1.202 3.1.302 3.1.418 5.0.104 5.0.213 5.0.303 5.0.407 6.0.202 ### .NET Core Runtime `Location: C:\Program Files\dotnet\shared\Microsoft.AspNetCore.App` -- 3.1.4 3.1.6 3.1.20 3.1.22 3.1.23 5.0.4 5.0.9 5.0.14 5.0.15 6.0.3 +- 3.1.4 3.1.6 3.1.20 3.1.23 3.1.24 5.0.4 5.0.9 5.0.15 5.0.16 6.0.4 `Location: C:\Program Files\dotnet\shared\Microsoft.NETCore.App` -- 3.1.4 3.1.6 3.1.20 3.1.22 3.1.23 5.0.4 5.0.9 5.0.14 5.0.15 6.0.3 +- 3.1.4 3.1.6 3.1.20 3.1.23 3.1.24 5.0.4 5.0.9 5.0.15 5.0.16 6.0.4 `Location: C:\Program Files\dotnet\shared\Microsoft.WindowsDesktop.App` -- 3.1.4 3.1.6 3.1.20 3.1.23 5.0.4 5.0.9 5.0.15 6.0.3 +- 3.1.4 3.1.6 3.1.20 3.1.24 5.0.4 5.0.9 5.0.16 6.0.4 ### .NET Framework `Type: Developer Pack` @@ -497,14 +498,14 @@ All other versions are saved but not installed. #### Powershell Modules | Module | Version | | ------------------ | ---------------- | -| AWSPowerShell | 4.1.61 | +| AWSPowerShell | 4.1.71 | | DockerMsftProvider | 1.0.0.8 | | MarkdownPS | 1.9 | -| Microsoft.Graph | 1.9.3 | -| Pester | 3.4.0<br>5.3.1 | +| Microsoft.Graph | 1.9.5 | +| Pester | 3.4.0<br>5.3.2 | | PowerShellGet | 1.0.0.1<br>2.2.5 | | PSScriptAnalyzer | 1.20.0 | -| PSWindowsUpdate | 2.2.0.2 | +| PSWindowsUpdate | 2.2.0.3 | | SqlServer | 21.1.18256 | | VSSetup | 2.2.16 | @@ -512,7 +513,7 @@ All other versions are saved but not installed. | Package Name | Version | | -------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 4.0 | -| Android Emulator | 31.2.9 | +| Android Emulator | 31.2.10 | | Android SDK Build-tools | 32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | | Android SDK Platforms | android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | | Android SDK Platform-Tools | 33.0.1 | @@ -536,10 +537,10 @@ All other versions are saved but not installed. ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2022 | sha256:1c06a5c6b2f4ef64ca2efa246a8d8e9882f3d44e2f874dccfa71e2c6b3692e6c | 2022-03-08 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2022 | sha256:8a3249fe6b8d2df1631df08097b776e4bae524b8ab6f1ede8f9a10e0302bd30f | 2022-03-08 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:ba09875e33b4d23d202edee998e8736e921224a53ee32b6e8cebe9be177b886b | 2022-03-08 | -| mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:496f77fac70d6e109d6673aaf640a7d5b6bfe2f0f861735f72c0f66840ba7f71 | 2022-03-03 | -| mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:343f8c95ec604913c74597f6d541e388f83bc0ce373ee8ea5bb26d268879f338 | 2022-03-03 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2022 | sha256:dfa767f6e419df8d9957173b1c48a6b3916b97e18ae40b0084ee47243f913a60 | 2022-04-12 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2022 | sha256:c9166ab07f16f0b35225354b00b9a589ca45fbd604da7beb26ac6869728eac6e | 2022-04-12 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:3cf54a7662ebc23c1198b97d1d38c05eae346a1a16b634db5ddd7db6a12127a5 | 2022-04-12 | +| mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:9c9ed294412e94762469596d89c19fceae13b29509d14ca88c099aee178e9167 | 2022-04-03 | +| mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:378d85bd8e7388a777d25009f8523d1e95a5f544f131eaada83171045d5b2c1e | 2022-04-03 | From 623df76820f64093285a6507fc3f5d58ca2b85a7 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 28 Apr 2022 19:46:00 +0000 Subject: [PATCH 1101/3485] Updating readme file for ubuntu20 version 20220425.1 (#5442) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2004-Readme.md | 116 +++++++++++++++--------------- 1 file changed, 58 insertions(+), 58 deletions(-) diff --git a/images/linux/Ubuntu2004-Readme.md b/images/linux/Ubuntu2004-Readme.md index 16395d549a3c..d4f02cdc6d15 100644 --- a/images/linux/Ubuntu2004-Readme.md +++ b/images/linux/Ubuntu2004-Readme.md @@ -1,11 +1,10 @@ | Announcements | |-| | [[Ubuntu] PHP 7.1 will be removed from Ubuntu 18 on April, 18](https://github.com/actions/virtual-environments/issues/5326) | -| [[All OSs] Go versions less than 1.16 will be removed and the default will be set to 1.17 on April, 11](https://github.com/actions/virtual-environments/issues/5280) | *** # Ubuntu 20.04.4 LTS -- Linux kernel version: 5.13.0-1021-azure -- Image Version: 20220410.2 +- Linux kernel version: 5.13.0-1022-azure +- Image Version: 20220425.1 ## Installed Software ### Language and Runtime @@ -17,7 +16,7 @@ - GNU C++ 9.4.0, 10.3.0 - GNU Fortran 9.4.0, 10.3.0 - Julia 1.7.2 -- Kotlin 1.6.20-release-275 +- Kotlin 1.6.21-release-334 - Mono 6.12.0.122 (apt source repository: https://download.mono-project.com/repo/ubuntu stable-focal main) - MSBuild 16.6.0.15201 (from /usr/lib/mono/msbuild/15.0/bin/MSBuild.dll) - Node 16.14.2 @@ -29,15 +28,15 @@ ### Package Management - cpan 1.64 -- Helm 3.8.1 -- Homebrew 3.4.6 +- Helm 3.8.2 +- Homebrew 3.4.8 - Miniconda 4.11.0 - Npm 8.5.0 - Pip 20.0.2 - Pip3 20.0.2 - Pipx 1.0.0 - RubyGems 3.1.2 -- Vcpkg (build from master \<f6af75acc>) +- Vcpkg (build from master \<d4a516114>) - Yarn 1.22.18 #### Environment variables @@ -54,67 +53,67 @@ - Sbt 1.6.2 ### Tools -- Ansible 2.12.4 +- Ansible 2.12.5 - apt-fast 1.9.12 - AzCopy 10.14.1 (available by `azcopy` and `azcopy10` aliases) - Bazel 5.1.1 - Bazelisk 1.11.0 - Bicep 0.5.6 - Buildah 1.21.3 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- CMake 3.23.0 +- CMake 3.23.1 - CodeQL Action Bundle 2.8.5 - Docker Compose v1 1.29.2 - Docker Compose v2 2.4.1+azure-1 - Docker-Buildx 0.8.2 - Docker-Moby Client 20.10.14+azure-1 - Docker-Moby Server 20.10.14+azure-1 -- Fastlane 2.205.1 -- Git 2.35.1 (apt source repository: ppa:git-core/ppa) -- Git LFS 3.1.2 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) +- Fastlane 2.205.2 +- Git 2.36.0 (apt source repository: ppa:git-core/ppa) +- Git LFS 3.1.4 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.6.0 - Haveged 1.9.1 - Heroku 7.60.1 -- HHVM (HipHop VM) 4.156.0 +- HHVM (HipHop VM) 4.158.0 - jq 1.6 - Kind 0.12.0 -- Kubectl 1.23.5 +- Kubectl 1.23.6 - Kustomize 4.5.4 - Leiningen 2.9.8 - MediaInfo 19.09 - Mercurial 5.3.1 - Minikube 1.25.2 -- n 8.1.0 +- n 8.2.0 - Newman 5.3.2 - nvm 0.39.1 -- OpenSSL 1.1.1f 31 Mar 2020 +- OpenSSL 1.1.1f-1ubuntu2.12 - Packer 1.8.0 -- Parcel 2.4.1 +- Parcel 2.5.0 - PhantomJS 2.1.1 - Podman 3.4.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- Pulumi 3.28.0 +- Pulumi 3.30.0 - R 4.1.3 - Skopeo 1.3.0 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 -- Terraform 1.1.8 +- Terraform 1.1.9 - yamllint 1.26.3 -- yq 4.24.2 +- yq 4.24.5 - zstd 1.5.2 (homebrew) ### CLI Tools -- Alibaba Cloud CLI 3.0.116 -- AWS CLI 2.5.4 +- Alibaba Cloud CLI 3.0.118 +- AWS CLI 2.5.8 - AWS CLI Session manager plugin 1.2.312.0 - AWS SAM CLI 1.46.0 - Azure CLI (azure-cli) 2.35.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.25.0 -- GitHub CLI 2.7.0 +- GitHub CLI 2.8.0 - Google Cloud SDK 369.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 9.16.5 -- OpenShift CLI 4.10.8 +- Netlify CLI 10.0.0 +- OpenShift CLI 4.10.11 - ORAS CLI 0.12.0 -- Vercel CLI 24.0.1 +- Vercel CLI 24.1.0 ### Java | Version | Vendor | Environment Variable | @@ -131,8 +130,8 @@ ### PHP | Tool | Version | | -------- | ------------------- | -| PHP | 7.4.28 8.0.17 8.1.4 | -| Composer | 2.3.4 | +| PHP | 7.4.29 8.0.18 8.1.5 | +| Composer | 2.3.5 | | PHPUnit | 8.5.26 | ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. @@ -140,7 +139,7 @@ ### Haskell - Cabal 3.6.2.0 - GHC 9.2.2 -- GHCup 0.1.17.6 +- GHCup 0.1.17.7 - Stack 2.7.5 ### Rust Tools @@ -154,11 +153,11 @@ - Cargo audit 0.16.0 - Cargo clippy 0.1.60 - Cargo outdated -- Cbindgen 0.21.0 +- Cbindgen 0.23.0 - Rustfmt 1.4.38 ### Browsers and Drivers -- Google Chrome 100.0.4896.75 +- Google Chrome 100.0.4896.127 - ChromeDriver 100.0.4896.60 - Mozilla Firefox 99.0 - Geckodriver 0.31.0 @@ -173,13 +172,13 @@ | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | ### .NET Core SDK -- 3.1.120 3.1.202 3.1.302 3.1.417 5.0.104 5.0.212 5.0.303 5.0.406 6.0.201 +- 3.1.120 3.1.202 3.1.302 3.1.418 5.0.104 5.0.213 5.0.303 5.0.407 6.0.202 ### .NET tools - nbgv 3.4.255+06fb9182bf ### Databases -- MongoDB 5.0.7 (apt source repository: https://repo.mongodb.org/apt/ubuntu) +- MongoDB 5.0.8 (apt source repository: https://repo.mongodb.org/apt/ubuntu) - sqlite3 3.31.1 #### PostgreSQL @@ -203,8 +202,8 @@ ### Cached Tools #### Go - 1.16.15 -- 1.17.8 -- 1.18.0 +- 1.17.9 +- 1.18.1 #### Node.js - 12.22.12 @@ -228,16 +227,17 @@ #### Ruby - 2.5.9 -- 2.6.9 -- 2.7.5 -- 3.0.3 +- 2.6.10 +- 2.7.6 +- 3.0.4 +- 3.1.2 #### Environment variables | Name | Value | Architecture | | --------------- | ----------------------------------- | ------------ | | GOROOT_1_16_X64 | /opt/hostedtoolcache/go/1.16.15/x64 | x64 | -| GOROOT_1_17_X64 | /opt/hostedtoolcache/go/1.17.8/x64 | x64 | -| GOROOT_1_18_X64 | /opt/hostedtoolcache/go/1.18.0/x64 | x64 | +| GOROOT_1_17_X64 | /opt/hostedtoolcache/go/1.17.9/x64 | x64 | +| GOROOT_1_18_X64 | /opt/hostedtoolcache/go/1.18.1/x64 | x64 | ### PowerShell Tools - PowerShell 7.2.2 @@ -246,12 +246,12 @@ | Module | Version | | ---------------- | ------- | | MarkdownPS | 1.9 | -| Microsoft.Graph | 1.9.3 | -| Pester | 5.3.1 | +| Microsoft.Graph | 1.9.5 | +| Pester | 5.3.2 | | PSScriptAnalyzer | 1.20.0 | #### Az PowerShell Modules -- 7.1.0 3.1.0.zip 4.4.0.zip 5.9.0.zip 6.6.0.zip +- 7.3.2 3.1.0.zip 4.4.0.zip 5.9.0.zip 6.6.0.zip ### Web Servers | Name | Version | ConfigFile | ServiceStatus | ListenPort | @@ -264,7 +264,7 @@ | Package Name | Version | | -------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 4.0 | -| Android Emulator | 31.2.9 | +| Android Emulator | 31.2.10 | | Android SDK Build-tools | 32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | | Android SDK Platform-Tools | 33.0.1 | | Android SDK Platforms | android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | @@ -291,22 +291,22 @@ | alpine:3.12 | sha256:c75ac27b49326926b803b9ed43bf088bc220d22556de1bc5f72d742c91398f69 | 2022-04-05 | | alpine:3.13 | sha256:ccf92aa53bc6c3b25be2ad0cce80baec1778f007f7e076b0ffbd1b225d0b3a9b | 2022-04-05 | | alpine:3.14 | sha256:06b5d462c92fc39303e6363c65e074559f8d6b1363250027ed5053557e3398c5 | 2022-04-05 | -| buildpack-deps:bullseye | sha256:b22e1a6daf16ea7e682e1d813aac528bb027f0772dc819716b4f41fbb06a3ffc | 2022-03-29 | -| buildpack-deps:buster | sha256:2c7b57f137d4ec1346ab226acd3eeac4f143ae2adc65a8abbd64489233065773 | 2022-03-29 | -| buildpack-deps:stretch | sha256:9cee83a572cc5f844548ee5f29eb0284772a162f312d7f049ad178207a0bae6d | 2022-03-29 | -| debian:10 | sha256:1b236b48c1ef66fa08535a5153266f4959bf58f948db3e68f7d678b651d8e33a | 2022-03-29 | -| debian:11 | sha256:87eefc7c15610cca61db5c0fd280911c6a737c0680d807432c0bd80cd0cca39b | 2022-03-29 | -| debian:9 | sha256:a8cc1744bbdd5266678e3e8b3e6387e45c053218438897e86876f2eb104e5534 | 2022-03-29 | +| buildpack-deps:bullseye | sha256:f26b9bcb6722fd59888caf4f4c1d4990799e3e83d804a83b7b58b4be949dc75e | 2022-04-20 | +| buildpack-deps:buster | sha256:b971efe3151fcfb10d0b7dfc739d081a9f9d9413195aa9b80224a66f4a651b4a | 2022-04-20 | +| buildpack-deps:stretch | sha256:fd003a4b08626dd6e5a59c61de0639243909644344a5bada501bf42e9982eac6 | 2022-04-20 | +| debian:10 | sha256:ebe4b9831fb22dfa778de4ffcb8ea0ad69b5d782d4e86cab14cc1fded5d8e761 | 2022-04-20 | +| debian:11 | sha256:6846593d7d8613e5dcc68c8f7d8b8e3179c7f3397b84a47c5b2ce989ef1075a0 | 2022-04-20 | +| debian:9 | sha256:cebe6e1c30384958d471467e231f740e8f0fd92cbfd2a435a186e9bada3aee1c | 2022-04-20 | | moby/buildkit:latest | sha256:bd37f0b5567084cd6f4b1c73b7fed9e12258441d064cc2add29a7dd32243ff86 | 2022-04-07 | -| node:12 | sha256:461c7f8b5e042fa7f47620cbee7772e76ce3fa0891edaab29bf7ebf0e84b9a1a | 2022-03-31 | -| node:12-alpine | sha256:bbc10cf532971046b490806de40f5959fa3bdd0acb82955847bdb0ffd1ab4854 | 2022-04-05 | -| node:14 | sha256:b2d1c5df5e001b694115f64f4532c7eec2e5dbd73db6e0caacf0049bd0aed7d2 | 2022-03-31 | +| node:12 | sha256:01627afeb110b3054ba4a1405541ca095c8bfca1cb6f2be9479c767a2711879e | 2022-04-20 | +| node:12-alpine | sha256:d4b15b3d48f42059a15bd659be60afe21762aae9d6cbea6f124440895c27db68 | 2022-04-11 | +| node:14 | sha256:2f39686f6d0b2687550659367fa11f56018a0f782b7e30f1a0ea56b11dece124 | 2022-04-20 | | node:14-alpine | sha256:8845b4f88f64f8c56a39236648ba22946e806a6153c10911f77b70e5a2edb4ca | 2022-04-05 | -| node:16 | sha256:ffe804d6fcced29bcfc3477de079d03a9c2b0e4917e44bfeafb1a6b0f875e383 | 2022-03-31 | +| node:16 | sha256:6e54786b2ad01667d46524e82806298714f50d2be72b39706770aed55faedbd7 | 2022-04-20 | | node:16-alpine | sha256:28bed508446db2ee028d08e76fb47b935defa26a84986ca050d2596ea67fd506 | 2022-04-05 | | ubuntu:16.04 | sha256:20858ebbc96215d6c3c574f781133ebffdc7c18d98af4f294cc4c04871a6fe61 | 2021-08-31 | -| ubuntu:18.04 | sha256:982d72c16416b09ffd2f71aa381f761422085eda1379dc66b668653607969e38 | 2022-04-05 | -| ubuntu:20.04 | sha256:9101220a875cee98b016668342c489ff0674f247f6ca20dfc91b91c0f28581ae | 2022-04-05 | +| ubuntu:18.04 | sha256:627b1184c9100a22ba9dcf531908b9e24af99fa54e45c10f57852fb890a57ea6 | 2022-04-21 | +| ubuntu:20.04 | sha256:115822d64890aae5cde3c1e85ace4cc97308bb1fd884dac62f4db0a16dbddb36 | 2022-04-21 | ### Installed apt packages | Name | Version | @@ -375,7 +375,7 @@ | sqlite3 | 3.31.1-4ubuntu0.2 | | ssh | 1:8.2p1-4ubuntu0.4 | | sshpass | 1.06-1 | -| subversion | 1.13.0-3 | +| subversion | 1.13.0-3ubuntu0.1 | | sudo | 1.8.31-1ubuntu1.2 | | swig | 4.0.1-5build1 | | telnet | 0.17-41.2build1 | @@ -388,7 +388,7 @@ | wget | 1.20.3-1ubuntu2 | | xorriso | 1.5.2-1 | | xvfb | 2:1.20.13-1ubuntu1\~20.04.2 | -| xz-utils | 5.2.4-1ubuntu1 | +| xz-utils | 5.2.4-1ubuntu1.1 | | zip | 3.0-11build1 | | zsync | 0.6.2-3ubuntu1 | From 9d80842cc3658660a5378cf5562d2a725c9a6917 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Mon, 2 May 2022 10:46:10 +0200 Subject: [PATCH 1102/3485] [Ubuntu] Add Ubuntu Server 22.04 LTS template (#5454) --- .../azure-pipelines/ubuntu2204.yml | 20 + images/linux/config/ubuntu2204.conf | 2 + .../SoftwareReport.CachedTools.psm1 | 16 +- .../SoftwareReport.Databases.psm1 | 2 +- .../SoftwareReport.Generator.ps1 | 106 +++-- .../scripts/base/configure-legacy-ssh.sh | 4 + .../linux/scripts/helpers/Common.Helpers.psm1 | 6 +- images/linux/scripts/helpers/os.sh | 5 + images/linux/scripts/installers/android.sh | 2 +- images/linux/scripts/installers/aws.sh | 12 +- images/linux/scripts/installers/php.sh | 4 +- .../scripts/installers/powershellcore.sh | 18 +- images/linux/scripts/installers/rust.sh | 8 +- images/linux/scripts/tests/Android.Tests.ps1 | 2 + images/linux/scripts/tests/Browsers.Tests.ps1 | 2 +- images/linux/scripts/tests/Common.Tests.ps1 | 2 +- .../linux/scripts/tests/Databases.Tests.ps1 | 2 +- images/linux/scripts/tests/Java.Tests.ps1 | 2 +- images/linux/scripts/tests/Tools.Tests.ps1 | 20 +- images/linux/toolsets/toolset-2204.json | 301 ++++++++++++++ images/linux/ubuntu1804.json | 10 +- images/linux/ubuntu2004.json | 10 +- images/linux/ubuntu2204.json | 366 ++++++++++++++++++ 23 files changed, 833 insertions(+), 89 deletions(-) create mode 100644 images.CI/linux-and-win/azure-pipelines/ubuntu2204.yml create mode 100644 images/linux/config/ubuntu2204.conf create mode 100644 images/linux/scripts/base/configure-legacy-ssh.sh create mode 100644 images/linux/toolsets/toolset-2204.json create mode 100644 images/linux/ubuntu2204.json diff --git a/images.CI/linux-and-win/azure-pipelines/ubuntu2204.yml b/images.CI/linux-and-win/azure-pipelines/ubuntu2204.yml new file mode 100644 index 000000000000..8fc4c7b69f79 --- /dev/null +++ b/images.CI/linux-and-win/azure-pipelines/ubuntu2204.yml @@ -0,0 +1,20 @@ +schedules: +- cron: "0 0 * * *" + displayName: Daily + branches: + include: + - main + always: true + +trigger: none +pr: + autoCancel: true + branches: + include: + - main + +jobs: +- template: image-generation.yml + parameters: + image_type: ubuntu2204 + image_readme_name: Ubuntu2204-Readme.md \ No newline at end of file diff --git a/images/linux/config/ubuntu2204.conf b/images/linux/config/ubuntu2204.conf new file mode 100644 index 000000000000..8a7f60ed6b61 --- /dev/null +++ b/images/linux/config/ubuntu2204.conf @@ -0,0 +1,2 @@ +# Name of pool supported by this image +POOL_NAME="Ubuntu 2204" diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.CachedTools.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.CachedTools.psm1 index 66b85a38a205..bb184ba4f5cb 100755 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.CachedTools.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.CachedTools.psm1 @@ -47,17 +47,21 @@ function Build-CachedToolsSection { $output += New-MDHeader "Go" -Level 4 $output += New-MDList -Lines (Get-ToolcacheGoVersions) -Style Unordered - $output += New-MDHeader "Node.js" -Level 4 - $output += New-MDList -Lines (Get-ToolcacheNodeVersions) -Style Unordered + if ((Test-IsUbuntu18) -or (Test-IsUbuntu20)) { + $output += New-MDHeader "Node.js" -Level 4 + $output += New-MDList -Lines (Get-ToolcacheNodeVersions) -Style Unordered + } $output += New-MDHeader "PyPy" -Level 4 $output += New-MDList -Lines (Get-ToolcachePyPyVersions) -Style Unordered - $output += New-MDHeader "Python" -Level 4 - $output += New-MDList -Lines (Get-ToolcachePythonVersions) -Style Unordered + if ((Test-IsUbuntu18) -or (Test-IsUbuntu20)) { + $output += New-MDHeader "Python" -Level 4 + $output += New-MDList -Lines (Get-ToolcachePythonVersions) -Style Unordered - $output += New-MDHeader "Ruby" -Level 4 - $output += New-MDList -Lines (Get-ToolcacheRubyVersions) -Style Unordered + $output += New-MDHeader "Ruby" -Level 4 + $output += New-MDList -Lines (Get-ToolcacheRubyVersions) -Style Unordered + } return $output } diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Databases.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Databases.psm1 index 6966527f7f43..8ba9ea1510db 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Databases.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Databases.psm1 @@ -17,7 +17,7 @@ function Get-SqliteVersion { function Get-MySQLVersion { $mySQLVersion = mysqld --version | Take-OutputPart -Part 2 - if (-not (Test-IsUbuntu20)) { + if (Test-IsUbuntu18) { $mySQLVersion = $mySQLVersion | Take-OutputPart -Part 0 -Delimiter "-" } return "MySQL $mySQLVersion" diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index d824002ef9f4..1e146b1289aa 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -41,22 +41,27 @@ $runtimesList = @( (Get-BashVersion), (Get-CPPVersions), (Get-FortranVersions), - (Get-ErlangVersion), - (Get-ErlangRebar3Version), - (Get-MonoVersion), - (Get-MsbuildVersion), (Get-NodeVersion), (Get-PerlVersion), (Get-PythonVersion), (Get-Python3Version), (Get-RubyVersion), - (Get-SwiftVersion), (Get-JuliaVersion), - (Get-KotlinVersion), (Get-ClangVersions), (Get-ClangFormatVersions) ) +if ((Test-IsUbuntu18) -or (Test-IsUbuntu20)) { + $runtimesList += @( + (Get-MsbuildVersion), + (Get-KotlinVersion), + (Get-MonoVersion), + (Get-ErlangVersion), + (Get-ErlangRebar3Version), + (Get-SwiftVersion) + ) +} + $markdown += New-MDList -Style Unordered -Lines ($runtimesList | Sort-Object) $markdown += New-MDHeader "Package Management" -Level 3 @@ -81,14 +86,17 @@ $markdown += Build-PackageManagementEnvironmentTable | New-MDTable $markdown += New-MDNewLine $markdown += New-MDHeader "Project Management" -Level 3 -$projectManagementList = @( - (Get-AntVersion), - (Get-GradleVersion), - (Get-MavenVersion), - (Get-SbtVersion) -) +$projectManagementList = @() +if ((Test-IsUbuntu18) -or (Test-IsUbuntu20)) { + $projectManagementList += @( + (Get-AntVersion), + (Get-GradleVersion), + (Get-MavenVersion), + (Get-SbtVersion) + ) +} -if (Test-IsUbuntu20) { +if ((Test-IsUbuntu20) -or (Test-IsUbuntu22)) { $projectManagementList += @( (Get-LernaVersion) ) @@ -103,7 +111,6 @@ $toolsList = @( (Get-BazelVersion), (Get-BazeliskVersion), (Get-BicepVersion), - (Get-BuildahVersion), (Get-CodeQLBundleVersion), (Get-CMakeVersion), (Get-DockerMobyClientVersion), @@ -116,14 +123,12 @@ $toolsList = @( (Get-GitFTPVersion), (Get-HavegedVersion), (Get-HerokuVersion), - (Get-HHVMVersion), (Get-SVNVersion), (Get-JqVersion), (Get-YqVersion), (Get-KindVersion), (Get-KubectlVersion), (Get-KustomizeVersion), - (Get-LeiningenVersion), (Get-MediainfoVersion), (Get-HGVersion), (Get-MinikubeVersion), @@ -133,18 +138,26 @@ $toolsList = @( (Get-OpensslVersion), (Get-PackerVersion), (Get-ParcelVersion), - (Get-PhantomJSVersion), - (Get-PodManVersion), (Get-PulumiVersion), (Get-RVersion), - (Get-SkopeoVersion), (Get-SphinxVersion), (Get-TerraformVersion), (Get-YamllintVersion), (Get-ZstdVersion) ) -if (Test-IsUbuntu20) { +if ((Test-IsUbuntu18) -or (Test-IsUbuntu20)) { + $toolsList += @( + (Get-BuildahVersion), + (Get-PhantomJSVersion), + (Get-LeiningenVersion), + (Get-HHVMVersion), + (Get-PodManVersion), + (Get-SkopeoVersion) + ) +} + +if ((Test-IsUbuntu20) -or (Test-IsUbuntu22)) { $toolsList += (Get-FastlaneVersion) } @@ -168,11 +181,13 @@ $markdown += New-MDList -Style Unordered -Lines (@( ) | Sort-Object ) -$markdown += New-MDHeader "Java" -Level 3 -$markdown += Get-JavaVersions | New-MDTable -$markdown += New-MDNewLine +if ((Test-IsUbuntu18) -or (Test-IsUbuntu20)) { + $markdown += New-MDHeader "Java" -Level 3 + $markdown += Get-JavaVersions | New-MDTable + $markdown += New-MDNewLine +} -if (Test-IsUbuntu20) { +if ((Test-IsUbuntu20) -or (Test-IsUbuntu22)) { $markdown += New-MDHeader "GraalVM" -Level 3 $markdown += Build-GraalVMTable | New-MDTable $markdown += New-MDNewLine @@ -214,12 +229,17 @@ $markdown += New-MDHeader "Browsers and Drivers" -Level 3 $browsersAndDriversList = @( (Get-ChromeVersion), (Get-ChromeDriverVersion), - (Get-FirefoxVersion), - (Get-GeckodriverVersion), - (Get-ChromiumVersion), - (Get-SeleniumVersion) + (Get-ChromiumVersion) ) +if ((Test-IsUbuntu18) -or (Test-IsUbuntu20)) { + $browsersAndDriversList += @( + (Get-FirefoxVersion), + (Get-GeckodriverVersion), + (Get-SeleniumVersion) + ) +} + $markdown += New-MDList -Style Unordered -Lines $browsersAndDriversList $markdown += New-MDHeader "Environment variables" -Level 4 $markdown += Build-BrowserWebdriversEnvironmentTable | New-MDTable @@ -235,15 +255,23 @@ $tools = Get-DotnetTools $markdown += New-MDList -Lines $tools -Style Unordered $markdown += New-MDHeader "Databases" -Level 3 -$markdown += New-MDList -Style Unordered -Lines (@( - (Get-MongoDbVersion), +$databaseLists = @( (Get-SqliteVersion) - ) | Sort-Object ) +if ((Test-IsUbuntu18) -or (Test-IsUbuntu20)) { + $databaseLists += @( + (Get-MongoDbVersion) + ) +} + +$markdown += New-MDList -Style Unordered -Lines ( $databaseLists | Sort-Object ) + $markdown += Build-PostgreSqlSection $markdown += Build-MySQLSection -$markdown += Build-MSSQLToolsSection +if ((Test-IsUbuntu18) -or (Test-IsUbuntu20)) { + $markdown += Build-MSSQLToolsSection +} $markdown += New-MDHeader "Cached Tools" -Level 3 $markdown += Build-CachedToolsSection @@ -265,12 +293,14 @@ $markdown += New-MDList -Style Unordered -Lines @( $markdown += Build-WebServersSection -$markdown += New-MDHeader "Android" -Level 3 -$markdown += Build-AndroidTable | New-MDTable -$markdown += New-MDNewLine -$markdown += New-MDHeader "Environment variables" -Level 4 -$markdown += Build-AndroidEnvironmentTable | New-MDTable -$markdown += New-MDNewLine +if ((Test-IsUbuntu18) -or (Test-IsUbuntu20)) { + $markdown += New-MDHeader "Android" -Level 3 + $markdown += Build-AndroidTable | New-MDTable + $markdown += New-MDNewLine + $markdown += New-MDHeader "Environment variables" -Level 4 + $markdown += Build-AndroidEnvironmentTable | New-MDTable + $markdown += New-MDNewLine +} $markdown += New-MDHeader "Cached Docker images" -Level 3 $markdown += Get-CachedDockerImagesTableData | New-MDTable diff --git a/images/linux/scripts/base/configure-legacy-ssh.sh b/images/linux/scripts/base/configure-legacy-ssh.sh new file mode 100644 index 000000000000..a59e9b7d41cd --- /dev/null +++ b/images/linux/scripts/base/configure-legacy-ssh.sh @@ -0,0 +1,4 @@ +#!/bin/bash -e +# https://github.com/hashicorp/packer/issues/11656 +echo PubkeyAcceptedKeyTypes=+ssh-rsa >> /etc/ssh/sshd_config +systemctl reload sshd.service \ No newline at end of file diff --git a/images/linux/scripts/helpers/Common.Helpers.psm1 b/images/linux/scripts/helpers/Common.Helpers.psm1 index eab83e2044f8..b55a910be3d8 100644 --- a/images/linux/scripts/helpers/Common.Helpers.psm1 +++ b/images/linux/scripts/helpers/Common.Helpers.psm1 @@ -46,6 +46,10 @@ function Test-IsUbuntu20 { return (lsb_release -rs) -eq "20.04" } +function Test-IsUbuntu22 { + return (lsb_release -rs) -eq "22.04" +} + function Get-ToolsetContent { $toolset = Join-Path $env:INSTALLER_SCRIPT_FOLDER "toolset.json" Get-Content $toolset -Raw | ConvertFrom-Json @@ -69,7 +73,7 @@ function Get-ToolsetValue { function Get-AndroidPackages { $androidSDKManagerPath = "/usr/local/lib/android/sdk/cmdline-tools/latest/bin/sdkmanager" - $androidPackages = & $androidSDKManagerPath --list --verbose + $androidPackages = & $androidSDKManagerPath --list --verbose 2>&1 return $androidPackages } diff --git a/images/linux/scripts/helpers/os.sh b/images/linux/scripts/helpers/os.sh index 6bb38f51ad61..f3a71bbd9b79 100644 --- a/images/linux/scripts/helpers/os.sh +++ b/images/linux/scripts/helpers/os.sh @@ -14,6 +14,11 @@ function isUbuntu20 lsb_release -d | grep -q 'Ubuntu 20' } +function isUbuntu22 +{ + lsb_release -d | grep -q 'Ubuntu 22' +} + function getOSVersionLabel { lsb_release -cs diff --git a/images/linux/scripts/installers/android.sh b/images/linux/scripts/installers/android.sh index cb56acde7d85..3c44f86dc5a3 100644 --- a/images/linux/scripts/installers/android.sh +++ b/images/linux/scripts/installers/android.sh @@ -102,7 +102,7 @@ filter_components_by_version $minimumBuildToolVersion "${availableBuildTools[@]} echo "y" | $SDKMANAGER ${components[@]} # Old skdmanager from sdk tools doesn't work with Java > 8, set version 8 explicitly -if isUbuntu20; then +if isUbuntu20 || isUbuntu22; then sed -i "2i export JAVA_HOME=${JAVA_HOME_8_X64}" ${ANDROID_SDK_ROOT}/tools/bin/sdkmanager fi diff --git a/images/linux/scripts/installers/aws.sh b/images/linux/scripts/installers/aws.sh index c7f851e64426..0549180b7b59 100644 --- a/images/linux/scripts/installers/aws.sh +++ b/images/linux/scripts/installers/aws.sh @@ -8,18 +8,16 @@ source $HELPER_SCRIPTS/os.sh source $HELPER_SCRIPTS/install.sh -# Install the AWS CLI v1 Ubuntu18 and AWS CLI v2 on Ubuntu20 -if isUbuntu20 ; then - download_with_retries "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" "/tmp" "awscliv2.zip" - unzip -qq /tmp/awscliv2.zip -d /tmp - /tmp/aws/install -i /usr/local/aws-cli -b /usr/local/bin -fi - +# Install the AWS CLI v1 Ubuntu18 and AWS CLI v2 on Ubuntu20, Ubuntu22 # The installation should be run after python3 is installed as aws-cli V1 dropped python2 support if isUbuntu18 ; then download_with_retries "https://s3.amazonaws.com/aws-cli/awscli-bundle.zip" "/tmp" "awscli-bundle.zip" unzip -qq /tmp/awscli-bundle.zip -d /tmp python3 /tmp/awscli-bundle/install -i /usr/local/aws -b /usr/local/bin/aws +else + download_with_retries "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" "/tmp" "awscliv2.zip" + unzip -qq /tmp/awscliv2.zip -d /tmp + /tmp/aws/install -i /usr/local/aws-cli -b /usr/local/bin fi download_with_retries "https://s3.amazonaws.com/session-manager-downloads/plugin/latest/ubuntu_64bit/session-manager-plugin.deb" "/tmp" "session-manager-plugin.deb" diff --git a/images/linux/scripts/installers/php.sh b/images/linux/scripts/installers/php.sh index e230a3808678..12101b40cee5 100644 --- a/images/linux/scripts/installers/php.sh +++ b/images/linux/scripts/installers/php.sh @@ -103,8 +103,8 @@ mv phpunit /usr/local/bin/phpunit # ubuntu 20.04 libzip-dev is libzip5 based and is not compatible libzip-dev of ppa:ondrej/php # see https://github.com/actions/virtual-environments/issues/1084 -if isUbuntu20 ; then - rm /etc/apt/sources.list.d/ondrej-ubuntu-php-focal.list +if isUbuntu20 || isUbuntu22; then + rm /etc/apt/sources.list.d/ondrej-*.list apt-get update fi diff --git a/images/linux/scripts/installers/powershellcore.sh b/images/linux/scripts/installers/powershellcore.sh index fa319c40c91a..9aa3fe705003 100644 --- a/images/linux/scripts/installers/powershellcore.sh +++ b/images/linux/scripts/installers/powershellcore.sh @@ -4,5 +4,19 @@ ## Desc: Installs powershellcore ################################################################################ -# Install Powershell -apt-get install -y powershell \ No newline at end of file +# Source the helpers for use with the script +source $HELPER_SCRIPTS/os.sh +source $HELPER_SCRIPTS/install.sh + +if isUbuntu22; then + # Install libssl1.1 + download_with_retries "http://security.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.1l-1ubuntu1.2_amd64.deb" "/tmp" + dpkg -i /tmp/libssl1.1_1.1.1l-1ubuntu1.2_amd64.deb + + # Install Powershell + download_with_retries "https://github.com/PowerShell/PowerShell/releases/download/v7.2.3/powershell-lts_7.2.3-1.deb_amd64.deb" "/tmp" + dpkg -i /tmp/powershell-lts_7.2.3-1.deb_amd64.deb +else + # Install Powershell + apt-get install -y powershell +fi diff --git a/images/linux/scripts/installers/rust.sh b/images/linux/scripts/installers/rust.sh index 123c0362e971..515525ffda3f 100644 --- a/images/linux/scripts/installers/rust.sh +++ b/images/linux/scripts/installers/rust.sh @@ -6,6 +6,7 @@ # Source the helpers for use with the script source $HELPER_SCRIPTS/etc-environment.sh +source $HELPER_SCRIPTS/os.sh export RUSTUP_HOME=/etc/skel/.rustup export CARGO_HOME=/etc/skel/.cargo @@ -17,7 +18,12 @@ source $CARGO_HOME/env # Install common tools rustup component add rustfmt clippy -cargo install --locked bindgen cbindgen cargo-audit cargo-outdated + +if isUbuntu22; then + cargo install bindgen cbindgen cargo-audit cargo-outdated +else + cargo install --locked bindgen cbindgen cargo-audit cargo-outdated +fi # Cleanup Cargo cache rm -rf ${CARGO_HOME}/registry/* diff --git a/images/linux/scripts/tests/Android.Tests.ps1 b/images/linux/scripts/tests/Android.Tests.ps1 index 3d530a0b990e..028ea5518233 100644 --- a/images/linux/scripts/tests/Android.Tests.ps1 +++ b/images/linux/scripts/tests/Android.Tests.ps1 @@ -1,4 +1,6 @@ Describe "Android" { + if (Test-IsUbuntu22) { return } + $androidSdkManagerPackages = Get-AndroidPackages [int]$platformMinVersion = Get-ToolsetValue "android.platform_min_version" [version]$buildToolsMinVersion = Get-ToolsetValue "android.build_tools_min_version" diff --git a/images/linux/scripts/tests/Browsers.Tests.ps1 b/images/linux/scripts/tests/Browsers.Tests.ps1 index 11b523d94d5a..e6e77bbf037b 100644 --- a/images/linux/scripts/tests/Browsers.Tests.ps1 +++ b/images/linux/scripts/tests/Browsers.Tests.ps1 @@ -1,4 +1,4 @@ -Describe "Firefox" { +Describe "Firefox" -Skip:(Test-IsUbuntu22) { It "Firefox" { "sudo -i firefox --version" | Should -ReturnZeroExitCode } diff --git a/images/linux/scripts/tests/Common.Tests.ps1 b/images/linux/scripts/tests/Common.Tests.ps1 index ccd1efd0452d..c4bf5897ad26 100644 --- a/images/linux/scripts/tests/Common.Tests.ps1 +++ b/images/linux/scripts/tests/Common.Tests.ps1 @@ -29,7 +29,7 @@ Describe "PHP" { } } -Describe "Swift" { +Describe "Swift" -Skip:(Test-IsUbuntu22) { It "swift" { "swift --version" | Should -ReturnZeroExitCode } diff --git a/images/linux/scripts/tests/Databases.Tests.ps1 b/images/linux/scripts/tests/Databases.Tests.ps1 index 1108a0ed432f..9145312ba6b8 100644 --- a/images/linux/scripts/tests/Databases.Tests.ps1 +++ b/images/linux/scripts/tests/Databases.Tests.ps1 @@ -1,4 +1,4 @@ -Describe "MongoDB" { +Describe "MongoDB" -Skip:(Test-IsUbuntu22) { It "<ToolName>" -TestCases @( @{ ToolName = "mongo" } @{ ToolName = "mongod" } diff --git a/images/linux/scripts/tests/Java.Tests.ps1 b/images/linux/scripts/tests/Java.Tests.ps1 index 67fa7929560d..2621a58436d6 100644 --- a/images/linux/scripts/tests/Java.Tests.ps1 +++ b/images/linux/scripts/tests/Java.Tests.ps1 @@ -1,6 +1,6 @@ Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" -DisableNameChecking -Describe "Java" { +Describe "Java" -Skip:(Test-IsUbuntu22) { $toolsetJava = (Get-ToolsetContent).java $defaultVersion = $toolsetJava.default $defaultVendor = $toolsetJava.default_vendor diff --git a/images/linux/scripts/tests/Tools.Tests.ps1 b/images/linux/scripts/tests/Tools.Tests.ps1 index 56596be32f2c..3b1a8cf0b2ee 100644 --- a/images/linux/scripts/tests/Tools.Tests.ps1 +++ b/images/linux/scripts/tests/Tools.Tests.ps1 @@ -126,7 +126,7 @@ Describe "Cmake" { } } -Describe "erlang" { +Describe "erlang" -Skip:(Test-IsUbuntu22) { $testCases = @("erl -version", "erlc -v", "rebar3 -v") | ForEach-Object { @{ErlangCommand = $_} } It "erlang <ErlangCommand>" -TestCases $testCases { @@ -162,7 +162,7 @@ Describe "gfortran" { } } -Describe "Mono" { +Describe "Mono" -Skip:(Test-IsUbuntu22) { It "mono" { "mono --version" | Should -ReturnZeroExitCode } @@ -176,7 +176,7 @@ Describe "Mono" { } } -Describe "MSSQLCommandLineTools" { +Describe "MSSQLCommandLineTools" -Skip:(Test-IsUbuntu22) { It "sqlcmd" { "sqlcmd -?" | Should -ReturnZeroExitCode } @@ -200,7 +200,7 @@ Describe "Sbt" { } } -Describe "Selenium" { +Describe "Selenium" -Skip:(Test-IsUbuntu22) { It "Selenium is installed" { $seleniumBinaryName = (Get-ToolsetContent).selenium.binary_name $seleniumPath = Join-Path "/usr/share/java" "$seleniumBinaryName.jar" @@ -244,7 +244,7 @@ Describe "Heroku" { } } -Describe "HHVM" { +Describe "HHVM" -Skip:(Test-IsUbuntu22) { It "hhvm" { "hhvm --version" | Should -ReturnZeroExitCode } @@ -292,7 +292,7 @@ Describe "Kubernetes tools" { } } -Describe "Leiningen" { +Describe "Leiningen" -Skip:(Test-IsUbuntu22) { It "leiningen" { "lein --version" | Should -ReturnZeroExitCode } @@ -316,13 +316,13 @@ Describe "Pulumi" { } } -Describe "Phantomjs" { +Describe "Phantomjs" -Skip:(Test-IsUbuntu22) { It "phantomjs" { "phantomjs --version" | Should -ReturnZeroExitCode } } -Describe "GraalVM" -Skip:(-not (Test-IsUbuntu20)) { +Describe "GraalVM" -Skip:(Test-IsUbuntu18) { It "graalvm" { '$GRAALVM_11_ROOT/bin/java -version' | Should -ReturnZeroExitCode } @@ -332,7 +332,7 @@ Describe "GraalVM" -Skip:(-not (Test-IsUbuntu20)) { } } -Describe "Containers" { +Describe "Containers" -Skip:(Test-IsUbuntu22) { $testCases = @("podman", "buildah", "skopeo") | ForEach-Object { @{ContainerCommand = $_} } It "<ContainerCommand>" -TestCases $testCases { @@ -391,7 +391,7 @@ Describe "yq" { } } -Describe "Kotlin" { +Describe "Kotlin" -Skip:(Test-IsUbuntu22) { It "kapt" { "kapt -version"| Should -ReturnZeroExitCode } diff --git a/images/linux/toolsets/toolset-2204.json b/images/linux/toolsets/toolset-2204.json new file mode 100644 index 000000000000..c031f5c9e4a8 --- /dev/null +++ b/images/linux/toolsets/toolset-2204.json @@ -0,0 +1,301 @@ +{ + "toolcache": [ + { + "name": "PyPy", + "arch": "x64", + "platform" : "linux", + "versions": [ + "3.7", + "3.8", + "3.9" + ] + }, + { + "name": "go", + "url" : "https://raw.githubusercontent.com/actions/go-versions/main/versions-manifest.json", + "arch": "x64", + "platform" : "linux", + "versions": [ + "1.17.*", + "1.18.*" + ], + "default": "1.18.*" + }, + { + "name": "CodeQL", + "platform" : "linux", + "arch": "x64", + "versions": [ + "*" + ] + } + ], + "java": { + "default": "11", + "default_vendor": "Temurin-Hotspot", + "vendors": [ + { + "name": "Temurin-Hotspot", + "versions": [ "8", "11", "17" ] + } + ], + "maven": "3.8.5" + }, + "android": { + "platform_min_version": "27", + "build_tools_min_version": "27.0.0", + "extra_list": [ + "android;m2repository", + "google;m2repository", + "google;google_play_services" + ], + "addon_list": [ + ], + "additional_tools": [ + "cmake;3.10.2.4988404", + "cmake;3.18.1" + ], + "ndk": { + "default": "21", + "versions": [ + "21", "22", "23" + ] + } + }, + "powershellModules": [ + {"name": "MarkdownPS"}, + {"name": "Microsoft.Graph"}, + {"name": "Pester"}, + {"name": "PSScriptAnalyzer"} + ], + "azureModules": [ + { + "name": "az", + "url" : "https://raw.githubusercontent.com/Azure/az-ps-module-versions/main/versions-manifest.json", + "versions": [ + "7.3.2" + ], + "zip_versions": [ + ] + } + ], + "apt": { + "common_packages": [ + "autoconf", + "automake", + "build-essential", + "dbus", + "dnsutils", + "dpkg", + "fakeroot", + "fonts-noto-color-emoji", + "gnupg2", + "imagemagick", + "iproute2", + "iputils-ping", + "lib32z1", + "libc++abi-dev", + "libc++-dev", + "libcurl4", + "libgbm-dev", + "libgconf-2-4", + "libgsl-dev", + "libgtk-3-0", + "libmagic-dev", + "libmagickcore-dev", + "libmagickwand-dev", + "libsecret-1-dev", + "libsqlite3-dev", + "libtool", + "libunwind8", + "libxkbfile-dev", + "libxss1", + "libssl-dev", + "locales", + "mercurial", + "openssh-client", + "p7zip-rar", + "pkg-config", + "python-is-python3", + "rpm", + "texinfo", + "tk", + "tzdata", + "upx", + "xorriso", + "xvfb", + "xz-utils", + "zsync" + ], + "cmd_packages": [ + "acl", + "aria2", + "binutils", + "bison", + "brotli", + "bzip2", + "coreutils", + "curl", + "file", + "flex", + "ftp", + "haveged", + "jq", + "m4", + "mediainfo", + "netcat", + "net-tools", + "p7zip-full", + "parallel", + "pass", + "patchelf", + "pollinate", + "rsync", + "shellcheck", + "sphinxsearch", + "sqlite3", + "ssh", + "sshpass", + "subversion", + "sudo", + "swig", + "telnet", + "time", + "unzip", + "wget", + "zip" + ] + }, + "brew": [ + {"name": "zstd"} + ], + "docker": { + "images": [ + "alpine:3.14", + "alpine:3.15", + "buildpack-deps:buster", + "buildpack-deps:bullseye", + "debian:10", + "debian:11", + "moby/buildkit:latest", + "node:14", + "node:16", + "node:14-alpine", + "node:16-alpine", + "ubuntu:18.04", + "ubuntu:20.04", + "ubuntu:22.04" + ] + }, + "pipx": [ + { + "package": "yamllint", + "cmd": "yamllint" + }, + { + "package": "ansible-core", + "cmd": "ansible" + } + ], + "dotnet": { + "aptPackages": [ + "dotnet-sdk-6.0" + ], + "versions": [ + "6.0" + ], + "tools": [ + { "name": "nbgv", "test": "nbgv --version", "getversion" : "nbgv --version" } + ] + }, + "clang": { + "versions": [ + "11", + "12" + ], + "default_version": "11" + }, + "gcc": { + "versions": [ + "g++-9", + "g++-10" + ] + }, + "gfortran": { + "versions": [ + "gfortran-9", + "gfortran-10" + ] + }, + "php": { + "versions": [ + "8.1" + ] + }, + "rubygems": [ + {"name": "fastlane"} + ], + "selenium": { + "version": "4", + "binary_name": "selenium-server" + }, + "node": { + "default": "16" + }, + "node_modules": [ + { + "name": "grunt", + "command": "grunt" + }, + { + "name": "gulp", + "command": "gulp" + }, + { + "name": "n", + "command": "n" + }, + { + "name": "parcel", + "command": "parcel" + }, + { + "name": "typescript", + "command": "tsc" + }, + { + "name": "newman", + "command": "newman" + }, + { + "name": "vercel", + "command": "vercel" + }, + { + "name": "webpack", + "command": "webpack" + }, + { + "name": "webpack-cli", + "command": "webpack-cli" + }, + { + "name": "netlify-cli", + "command": "netlify" + }, + { + "name": "lerna", + "command": "lerna" + }, + { + "name": "yarn", + "command": "yarn" + } + ], + "mongodb": { + "version": "5.0" + }, + "postgresql": { + "version": "14" + } +} diff --git a/images/linux/ubuntu1804.json b/images/linux/ubuntu1804.json index 538f8019e640..201ae94c1959 100644 --- a/images/linux/ubuntu1804.json +++ b/images/linux/ubuntu1804.json @@ -149,20 +149,14 @@ { "type": "shell", "scripts": [ - "{{template_dir}}/scripts/installers/complete-snap-setup.sh" + "{{template_dir}}/scripts/installers/complete-snap-setup.sh", + "{{template_dir}}/scripts/installers/powershellcore.sh" ], "environment_vars": [ "HELPER_SCRIPTS={{user `helper_script_folder`}}" ], "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" }, - { - "type": "shell", - "scripts": [ - "{{template_dir}}/scripts/installers/powershellcore.sh" - ], - "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" - }, { "type": "shell", "scripts": [ diff --git a/images/linux/ubuntu2004.json b/images/linux/ubuntu2004.json index a44f7402d981..248620fc4e0c 100644 --- a/images/linux/ubuntu2004.json +++ b/images/linux/ubuntu2004.json @@ -149,20 +149,14 @@ { "type": "shell", "scripts": [ - "{{template_dir}}/scripts/installers/complete-snap-setup.sh" + "{{template_dir}}/scripts/installers/complete-snap-setup.sh", + "{{template_dir}}/scripts/installers/powershellcore.sh" ], "environment_vars": [ "HELPER_SCRIPTS={{user `helper_script_folder`}}" ], "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" }, - { - "type": "shell", - "scripts": [ - "{{template_dir}}/scripts/installers/powershellcore.sh" - ], - "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" - }, { "type": "shell", "scripts": [ diff --git a/images/linux/ubuntu2204.json b/images/linux/ubuntu2204.json new file mode 100644 index 000000000000..f5479e2189fb --- /dev/null +++ b/images/linux/ubuntu2204.json @@ -0,0 +1,366 @@ +{ + "variables": { + "client_id": "{{env `ARM_CLIENT_ID`}}", + "client_secret": "{{env `ARM_CLIENT_SECRET`}}", + "subscription_id": "{{env `ARM_SUBSCRIPTION_ID`}}", + "tenant_id": "{{env `ARM_TENANT_ID`}}", + "resource_group": "{{env `ARM_RESOURCE_GROUP`}}", + "storage_account": "{{env `ARM_STORAGE_ACCOUNT`}}", + "build_resource_group_name": "{{env `BUILD_RESOURCE_GROUP_NAME`}}", + "temp_resource_group_name": "{{env `TEMP_RESOURCE_GROUP_NAME`}}", + "location": "{{env `ARM_RESOURCE_LOCATION`}}", + "virtual_network_name": "{{env `VNET_NAME`}}", + "virtual_network_resource_group_name": "{{env `VNET_RESOURCE_GROUP`}}", + "virtual_network_subnet_name": "{{env `VNET_SUBNET`}}", + "private_virtual_network_with_public_ip": "{{env `PRIVATE_VIRTUAL_NETWORK_WITH_PUBLIC_IP`}}", + "allowed_inbound_ip_addresses": "{{env `AGENT_IP`}}", + "image_folder": "/imagegeneration", + "imagedata_file": "/imagegeneration/imagedata.json", + "installer_script_folder": "/imagegeneration/installers", + "helper_script_folder": "/imagegeneration/helpers", + "vm_size": "Standard_D4s_v4", + "capture_name_prefix": "packer", + "image_version": "dev", + "image_os": "ubuntu22", + "run_validation_diskspace": "false", + "dockerhub_login": "{{env `DOCKERHUB_LOGIN`}}", + "dockerhub_password": "{{env `DOCKERHUB_PASSWORD`}}" + }, + "sensitive-variables": [ + "client_secret" + ], + "builders": [ + { + "type": "azure-arm", + "client_id": "{{user `client_id`}}", + "client_secret": "{{user `client_secret`}}", + "subscription_id": "{{user `subscription_id`}}", + "tenant_id": "{{user `tenant_id`}}", + "location": "{{user `location`}}", + "vm_size": "{{user `vm_size`}}", + "resource_group_name": "{{user `resource_group`}}", + "storage_account": "{{user `storage_account`}}", + "build_resource_group_name": "{{user `build_resource_group_name`}}", + "temp_resource_group_name": "{{user `temp_resource_group_name`}}", + "capture_container_name": "images", + "capture_name_prefix": "{{user `capture_name_prefix`}}", + "virtual_network_name": "{{user `virtual_network_name`}}", + "virtual_network_resource_group_name": "{{user `virtual_network_resource_group_name`}}", + "virtual_network_subnet_name": "{{user `virtual_network_subnet_name`}}", + "private_virtual_network_with_public_ip": "{{user `private_virtual_network_with_public_ip`}}", + "allowed_inbound_ip_addresses": "{{user `allowed_inbound_ip_addresses`}}", + "user_data_file": "./images/linux/scripts/base/configure-legacy-ssh.sh", + "os_type": "Linux", + "image_publisher": "canonical", + "image_offer": "0001-com-ubuntu-server-jammy", + "image_sku": "22_04-lts", + "os_disk_size_gb": "86" + } + ], + "provisioners": [ + { + "type": "shell", + "inline": [ + "mkdir {{user `image_folder`}}", + "chmod 777 {{user `image_folder`}}" + ], + "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" + }, + { + "type": "shell", + "script": "{{template_dir}}/scripts/base/apt-mock.sh", + "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" + }, + { + "type": "shell", + "scripts": [ + "{{template_dir}}/scripts/base/repos.sh" + ], + "environment_vars": [ + "DEBIAN_FRONTEND=noninteractive" + ], + "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" + }, + { + "type": "shell", + "script": "{{template_dir}}/scripts/base/apt.sh", + "environment_vars": [ + "DEBIAN_FRONTEND=noninteractive" + ], + "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" + }, + { + "type": "shell", + "script": "{{template_dir}}/scripts/base/limits.sh", + "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" + }, + { + "type": "file", + "source": "{{template_dir}}/scripts/helpers", + "destination": "{{user `helper_script_folder`}}" + }, + { + "type": "file", + "source": "{{template_dir}}/scripts/installers", + "destination": "{{user `installer_script_folder`}}" + }, + { + "type": "file", + "source": "{{ template_dir }}/post-generation", + "destination": "{{user `image_folder`}}" + }, + { + "type": "file", + "source": "{{template_dir}}/scripts/tests", + "destination": "{{user `image_folder`}}" + }, + { + "type": "file", + "source": "{{ template_dir }}/scripts/SoftwareReport", + "destination": "{{user `image_folder`}}" + }, + { + "type": "file", + "source": "{{template_dir}}/toolsets/toolset-2204.json", + "destination": "{{user `installer_script_folder`}}/toolset.json" + }, + { + "type": "shell", + "scripts": [ + "{{template_dir}}/scripts/installers/preimagedata.sh" + ], + "environment_vars": [ + "IMAGE_VERSION={{user `image_version`}}", + "IMAGEDATA_FILE={{user `imagedata_file`}}" + ], + "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" + }, + { + "type": "shell", + "scripts": [ + "{{template_dir}}/scripts/installers/configure-environment.sh" + ], + "environment_vars": [ + "IMAGE_VERSION={{user `image_version`}}", + "IMAGE_OS={{user `image_os`}}", + "HELPER_SCRIPTS={{user `helper_script_folder`}}" + ], + "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" + }, + { + "type": "shell", + "scripts": [ + "{{template_dir}}/scripts/installers/complete-snap-setup.sh", + "{{template_dir}}/scripts/installers/powershellcore.sh" + ], + "environment_vars": [ + "HELPER_SCRIPTS={{user `helper_script_folder`}}" + ], + "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" + }, + { + "type": "shell", + "scripts": [ + "{{template_dir}}/scripts/installers/Install-PowerShellModules.ps1", + "{{template_dir}}/scripts/installers/Install-AzureModules.ps1" + ], + "environment_vars": [ + "HELPER_SCRIPTS={{user `helper_script_folder`}}", + "INSTALLER_SCRIPT_FOLDER={{user `installer_script_folder`}}" + ], + "execute_command": "sudo sh -c '{{ .Vars }} pwsh -f {{ .Path }}'" + }, + { + "type": "shell", + "scripts": [ + "{{template_dir}}/scripts/installers/docker-compose.sh", + "{{template_dir}}/scripts/installers/docker-moby.sh" + ], + "environment_vars": [ + "HELPER_SCRIPTS={{user `helper_script_folder`}}", + "INSTALLER_SCRIPT_FOLDER={{user `installer_script_folder`}}", + "DOCKERHUB_LOGIN={{user `dockerhub_login`}}", + "DOCKERHUB_PASSWORD={{user `dockerhub_password`}}" + ], + "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" + }, + { + "type": "shell", + "scripts": [ + "{{template_dir}}/scripts/installers/azcopy.sh", + "{{template_dir}}/scripts/installers/azure-cli.sh", + "{{template_dir}}/scripts/installers/azure-devops-cli.sh", + "{{template_dir}}/scripts/installers/basic.sh", + "{{template_dir}}/scripts/installers/bicep.sh", + "{{template_dir}}/scripts/installers/aliyun-cli.sh", + "{{template_dir}}/scripts/installers/apache.sh", + "{{template_dir}}/scripts/installers/aws.sh", + "{{template_dir}}/scripts/installers/clang.sh", + "{{template_dir}}/scripts/installers/cmake.sh", + "{{template_dir}}/scripts/installers/codeql-bundle.sh", + "{{template_dir}}/scripts/installers/dotnetcore-sdk.sh", + "{{template_dir}}/scripts/installers/gcc.sh", + "{{template_dir}}/scripts/installers/gfortran.sh", + "{{template_dir}}/scripts/installers/git.sh", + "{{template_dir}}/scripts/installers/github-cli.sh", + "{{template_dir}}/scripts/installers/google-chrome.sh", + "{{template_dir}}/scripts/installers/google-cloud-sdk.sh", + "{{template_dir}}/scripts/installers/haskell.sh", + "{{template_dir}}/scripts/installers/heroku.sh", + "{{template_dir}}/scripts/installers/kubernetes-tools.sh", + "{{template_dir}}/scripts/installers/oc.sh", + "{{template_dir}}/scripts/installers/miniconda.sh", + "{{template_dir}}/scripts/installers/mysql.sh", + "{{template_dir}}/scripts/installers/sqlpackage.sh", + "{{template_dir}}/scripts/installers/nginx.sh", + "{{template_dir}}/scripts/installers/nvm.sh", + "{{template_dir}}/scripts/installers/nodejs.sh", + "{{template_dir}}/scripts/installers/bazel.sh", + "{{template_dir}}/scripts/installers/oras-cli.sh", + "{{template_dir}}/scripts/installers/php.sh", + "{{template_dir}}/scripts/installers/postgresql.sh", + "{{template_dir}}/scripts/installers/pulumi.sh", + "{{template_dir}}/scripts/installers/ruby.sh", + "{{template_dir}}/scripts/installers/r.sh", + "{{template_dir}}/scripts/installers/rust.sh", + "{{template_dir}}/scripts/installers/julia.sh", + "{{template_dir}}/scripts/installers/sbt.sh", + "{{template_dir}}/scripts/installers/terraform.sh", + "{{template_dir}}/scripts/installers/packer.sh", + "{{template_dir}}/scripts/installers/vcpkg.sh", + "{{template_dir}}/scripts/installers/dpkg-config.sh", + "{{template_dir}}/scripts/installers/yq.sh", + "{{template_dir}}/scripts/installers/pypy.sh", + "{{template_dir}}/scripts/installers/python.sh", + "{{template_dir}}/scripts/installers/graalvm.sh" + ], + "environment_vars": [ + "HELPER_SCRIPTS={{user `helper_script_folder`}}", + "INSTALLER_SCRIPT_FOLDER={{user `installer_script_folder`}}", + "DEBIAN_FRONTEND=noninteractive" + ], + "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" + }, + { + "type": "shell", + "scripts": [ + "{{template_dir}}/scripts/installers/Install-Toolset.ps1", + "{{template_dir}}/scripts/installers/Configure-Toolset.ps1" + ], + "environment_vars": [ + "HELPER_SCRIPTS={{user `helper_script_folder`}}", + "INSTALLER_SCRIPT_FOLDER={{user `installer_script_folder`}}" + ], + "execute_command": "sudo sh -c '{{ .Vars }} pwsh -f {{ .Path }}'" + }, + { + "type": "shell", + "scripts": [ + "{{template_dir}}/scripts/installers/pipx-packages.sh" + ], + "environment_vars": [ + "HELPER_SCRIPTS={{user `helper_script_folder`}}", + "INSTALLER_SCRIPT_FOLDER={{user `installer_script_folder`}}" + ], + "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" + }, + { + "type": "shell", + "scripts": [ + "{{template_dir}}/scripts/installers/homebrew.sh" + ], + "environment_vars": [ + "HELPER_SCRIPTS={{user `helper_script_folder`}}", + "DEBIAN_FRONTEND=noninteractive", + "INSTALLER_SCRIPT_FOLDER={{user `installer_script_folder`}}" + ], + "execute_command": "/bin/sh -c '{{ .Vars }} {{ .Path }}'" + }, + { + "type": "shell", + "script": "{{template_dir}}/scripts/base/snap.sh", + "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" + }, + { + "type": "shell", + "expect_disconnect": true, + "scripts": [ + "{{template_dir}}/scripts/base/reboot.sh" + ], + "execute_command": "/bin/sh -c '{{ .Vars }} {{ .Path }}'" + }, + { + "type": "shell", + "pause_before": "60s", + "start_retry_timeout": "10m", + "scripts": [ + "{{template_dir}}/scripts/installers/cleanup.sh" + ], + "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" + }, + { + "type": "shell", + "script": "{{template_dir}}/scripts/base/apt-mock-remove.sh", + "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" + }, + { + "type": "shell", + "inline": [ + "pwsh -File {{user `image_folder`}}/SoftwareReport/SoftwareReport.Generator.ps1 -OutputDirectory {{user `image_folder`}}", + "pwsh -File {{user `image_folder`}}/tests/RunAll-Tests.ps1 -OutputDirectory {{user `image_folder`}}" + ], + "environment_vars": [ + "IMAGE_VERSION={{user `image_version`}}", + "INSTALLER_SCRIPT_FOLDER={{user `installer_script_folder`}}" + ] + }, + { + "type": "file", + "source": "{{user `image_folder`}}/Ubuntu-Readme.md", + "destination": "{{template_dir}}/Ubuntu2204-Readme.md", + "direction": "download" + }, + { + "type": "shell", + "scripts":[ + "{{template_dir}}/scripts/installers/post-deployment.sh" + ], + "environment_vars":[ + "HELPER_SCRIPT_FOLDER={{user `helper_script_folder`}}", + "INSTALLER_SCRIPT_FOLDER={{user `installer_script_folder`}}", + "IMAGE_FOLDER={{user `image_folder`}}" + ], + "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" + }, + { + "type": "shell", + "scripts":[ + "{{template_dir}}/scripts/installers/validate-disk-space.sh" + ], + "environment_vars": [ + "RUN_VALIDATION={{user `run_validation_diskspace`}}" + ] + }, + { + "type": "file", + "source": "{{template_dir}}/config/ubuntu2204.conf", + "destination": "/tmp/" + }, + { + "type": "shell", + "inline": [ + "mkdir -p /etc/vsts", + "cp /tmp/ubuntu2204.conf /etc/vsts/machine_instance.conf" + ], + "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" + }, + { + "type": "shell", + "inline": [ + "sleep 30", + "/usr/sbin/waagent -force -deprovision+user && export HISTSIZE=0 && sync" + ], + "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" + } + ] +} From 8573385d4c2405a45ac3904cd9777a366f4124fc Mon Sep 17 00:00:00 2001 From: Zoran Bjelica <100371150+zoran-bjelica@users.noreply.github.com> Date: Mon, 2 May 2022 11:05:31 +0200 Subject: [PATCH 1103/3485] [MacOS] Add ImageMagick (#5445) --- images/macos/software-report/SoftwareReport.Common.psm1 | 5 +++++ images/macos/software-report/SoftwareReport.Generator.ps1 | 3 ++- images/macos/tests/BasicTools.Tests.ps1 | 6 ++++++ images/macos/toolsets/toolset-10.15.json | 3 ++- images/macos/toolsets/toolset-11.json | 3 ++- images/macos/toolsets/toolset-12.json | 3 ++- 6 files changed, 19 insertions(+), 4 deletions(-) diff --git a/images/macos/software-report/SoftwareReport.Common.psm1 b/images/macos/software-report/SoftwareReport.Common.psm1 index 69588aa0a9a7..6efb0c6c36ce 100644 --- a/images/macos/software-report/SoftwareReport.Common.psm1 +++ b/images/macos/software-report/SoftwareReport.Common.psm1 @@ -547,6 +547,11 @@ function Get-YqVersion { return "$yqVersion" } +function Get-ImageMagickVersion { + $imagemagickVersion = Run-Command "magick --version" | Select-Object -First 1 | Take-Part -Part 1,2 + return "$imagemagickVersion" +} + function Build-PackageManagementEnvironmentTable { return @( @{ diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1 index 857b69a6220f..d1ac84e64355 100644 --- a/images/macos/software-report/SoftwareReport.Generator.ps1 +++ b/images/macos/software-report/SoftwareReport.Generator.ps1 @@ -123,7 +123,8 @@ $utilitiesList = @( (Get-GPGVersion), (Get-SwitchAudioOsxVersion), (Get-SoxVersion), - (Get-YqVersion) + (Get-YqVersion), + (Get-ImageMagickVersion) ) if ($os.IsLessThanMonterey) { diff --git a/images/macos/tests/BasicTools.Tests.ps1 b/images/macos/tests/BasicTools.Tests.ps1 index f40a484bd665..77788ad70429 100644 --- a/images/macos/tests/BasicTools.Tests.ps1 +++ b/images/macos/tests/BasicTools.Tests.ps1 @@ -186,4 +186,10 @@ Describe "yq" { It "yq" { "yq --version" | Should -ReturnZeroExitCode } +} + +Describe "imagemagick" { + It "imagemagick" { + "magick -version" | Should -ReturnZeroExitCode + } } \ No newline at end of file diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index 52950bffe931..9361449de2c4 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -224,7 +224,8 @@ "libxext", "libxft", "tcl-tk", - "yq" + "yq", + "imagemagick" ], "cask_packages": [ "julia", diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index 5927c3607e4f..9d60f9edfbab 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -213,7 +213,8 @@ "libxft", "tcl-tk", "r", - "yq" + "yq", + "imagemagick" ], "cask_packages": [ "julia" diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index 5ded72699b42..ce56009f5e1c 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -135,7 +135,8 @@ "libxft", "tcl-tk", "r", - "yq" + "yq", + "imagemagick" ], "cask_packages": [ "julia" From ed9d42f0337478be9170b19a22fe502fe7a04572 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Mon, 2 May 2022 18:51:16 +0400 Subject: [PATCH 1104/3485] Add ImageRepositoryPath env variable for Ubuntu 22 (#5462) * Use image_repository_path variable * Add ImageRepositoryPath to build image script --- images.CI/linux-and-win/build-image.ps1 | 3 +++ images/linux/ubuntu2204.json | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/images.CI/linux-and-win/build-image.ps1 b/images.CI/linux-and-win/build-image.ps1 index 1ea82791c337..41d03190d387 100644 --- a/images.CI/linux-and-win/build-image.ps1 +++ b/images.CI/linux-and-win/build-image.ps1 @@ -19,6 +19,9 @@ if (-not (Test-Path $TemplatePath)) exit 1 } +# Set Image repository path env variable, this is a workaround for Ubuntu 22.04 until this is fixed https://github.com/hashicorp/packer/issues/11733 +$env:ImageRepositoryPath = "." + $Image = [io.path]::GetFileNameWithoutExtension($TemplatePath) $TempResourceGroupName = "${ResourcesNamePrefix}_${Image}" $InstallPassword = [System.GUID]::NewGuid().ToString().ToUpper() diff --git a/images/linux/ubuntu2204.json b/images/linux/ubuntu2204.json index f5479e2189fb..518eb059aa9b 100644 --- a/images/linux/ubuntu2204.json +++ b/images/linux/ubuntu2204.json @@ -14,6 +14,7 @@ "virtual_network_subnet_name": "{{env `VNET_SUBNET`}}", "private_virtual_network_with_public_ip": "{{env `PRIVATE_VIRTUAL_NETWORK_WITH_PUBLIC_IP`}}", "allowed_inbound_ip_addresses": "{{env `AGENT_IP`}}", + "image_repository_path": "{{env `IMAGEREPOSITORYPATH`}}", "image_folder": "/imagegeneration", "imagedata_file": "/imagegeneration/imagedata.json", "installer_script_folder": "/imagegeneration/installers", @@ -49,7 +50,7 @@ "virtual_network_subnet_name": "{{user `virtual_network_subnet_name`}}", "private_virtual_network_with_public_ip": "{{user `private_virtual_network_with_public_ip`}}", "allowed_inbound_ip_addresses": "{{user `allowed_inbound_ip_addresses`}}", - "user_data_file": "./images/linux/scripts/base/configure-legacy-ssh.sh", + "user_data_file": "{{user `image_repository_path`}}/images/linux/scripts/base/configure-legacy-ssh.sh", "os_type": "Linux", "image_publisher": "canonical", "image_offer": "0001-com-ubuntu-server-jammy", From db20cb8390fe9b50a48ad779a9f609fc104f64a1 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 4 May 2022 07:36:57 +0000 Subject: [PATCH 1105/3485] Updating readme file for macOS-12 version 20220429.1 (#5465) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-12-Readme.md | 63 ++++++++++++++++++--------------- 1 file changed, 34 insertions(+), 29 deletions(-) diff --git a/images/macos/macos-12-Readme.md b/images/macos/macos-12-Readme.md index 7f28f1574f49..0f507a5cb7ed 100644 --- a/images/macos/macos-12-Readme.md +++ b/images/macos/macos-12-Readme.md @@ -1,7 +1,12 @@ +| Announcements | +|-| +| [[macOS] Xcode versions 13.2 & 13.3 will be removed, 13.3.1 will be set as the default one on May, 16](https://github.com/actions/virtual-environments/issues/5463) | +| [macOS 12 (Monterey) is available as a public beta in GitHub Actions](https://github.com/actions/virtual-environments/issues/5446) | +*** # macOS 12.3 info - System Version: macOS 12.3.1 (21E258) - Kernel Version: Darwin 21.4.0 -- Image Version: 20220425.3 +- Image Version: 20220429.1 ## Installed Software ### Language and Runtime @@ -9,15 +14,15 @@ - Bash 3.2.57(1)-release - Clang/LLVM 13.0.1 is available on `'$(brew --prefix llvm)/bin/clang'` - Clang/LLVM 13.1.6 is default -- gcc-11 (Homebrew GCC 11.2.0_3) 11.2.0 - available by `gcc-11` alias -- GNU Fortran (Homebrew GCC 11.2.0_3) 11.2.0 - available by `gfortran-11` alias +- gcc-11 (Homebrew GCC 11.3.0) 11.3.0 - available by `gcc-11` alias +- GNU Fortran (Homebrew GCC 11.3.0) 11.3.0 - available by `gfortran-11` alias - Go 1.17.9 - julia 1.7.2 - Kotlin 1.6.21-release-334 - MSBuild 16.10.1.17201 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) -- Node.js v16.14.2 +- Node.js v16.15.0 - NVM 0.39.1 -- NVM - Cached node versions: v12.22.12 v14.19.1 v16.14.2 +- NVM - Cached node versions: v12.22.12 v14.19.1 v16.15.0 - Perl 5.34.0 - PHP 8.1.5 - Python 2.7.18 @@ -30,14 +35,14 @@ - Carthage 0.38.0 - CocoaPods 1.11.3 - Composer 2.3.5 -- Homebrew 3.4.8 -- NPM 8.5.0 +- Homebrew 3.4.9 +- NPM 8.5.5 - NuGet 5.9.0.7134 - Pip 20.3.4 (python 2.7) - Pip 22.0.4 (python 3.9) - Pipx 1.0.0 - RubyGems 3.2.33 -- Vcpkg 2022 (build from master \<94c728df6>) +- Vcpkg 2022 (build from master \<c8a56fdc1>) - Yarn 1.22.18 ### Project Management @@ -53,10 +58,10 @@ - bazel 5.1.1 - bazelisk 1.11.0 - bsdtar 3.5.1 - available by 'tar' alias -- Curl 7.82.0 +- Curl 7.83.0 - Git 2.35.1 - Git LFS: 3.1.4 -- GitHub CLI: 2.8.0 +- GitHub CLI: 2.9.0 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.3 - gpg (GnuPG) 2.3.6 @@ -71,13 +76,13 @@ - Sox 14.4.2 - Subversion (SVN) 1.14.2 - Switchaudio-osx 1.1.0 -- yq (https://github.com/mikefarah/yq/) version 4.24.5 +- yq (https://github.com/mikefarah/yq/) version 4.25.1 - zstd 1.5.2 ### Tools - App Center CLI command -- AWS CLI 2.5.8 -- AWS SAM CLI 1.46.0 +- AWS CLI 2.6.1 +- AWS SAM CLI 1.47.0 - AWS Session Manager CLI 1.2.312.0 - Azure CLI (azure-devops) 0.25.0 - Azure CLI 2.36.0 @@ -99,18 +104,18 @@ ### Browsers - Safari 15.4 (17613.1.17.1.13) - SafariDriver 15.4 (17613.1.17.1.13) -- Google Chrome 100.0.4896.127 -- ChromeDriver 100.0.4896.60 -- Microsoft Edge 100.0.1185.50 -- MSEdgeDriver 100.0.1185.50 +- Google Chrome 101.0.4951.41 +- ChromeDriver 101.0.4951.41 +- Microsoft Edge 101.0.1210.32 +- MSEdgeDriver 101.0.1210.32 - Mozilla Firefox 99.0.1 - geckodriver 0.31.0 -- Selenium server 4.1.3 +- Selenium server 4.1.4 #### Environment variables | Name | Value | | --------------- | ---------------------------------------------- | -| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/100.0.4896.60 | +| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/101.0.4951.41 | | EDGEWEBDRIVER | /usr/local/share/edge_driver | | GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | @@ -118,13 +123,13 @@ | Version | Vendor | Environment Variable | | ------------------- | --------------- | -------------------- | | 8.0.322+6 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | -| 11.0.14+101 | Eclipse Temurin | JAVA_HOME_11_X64 | +| 11.0.15+10 | Eclipse Temurin | JAVA_HOME_11_X64 | | 17.0.3+7 | Eclipse Temurin | JAVA_HOME_17_X64 | ### GraalVM -| Version | Environment variables | -| ----------- | --------------------- | -| CE 22.0.0.2 | GRAALVM_11_ROOT | +| Version | Environment variables | +| --------- | --------------------- | +| CE 22.1.0 | GRAALVM_11_ROOT | ### Cached Tools #### Ruby @@ -133,7 +138,7 @@ - 3.1.2 #### Python -- 3.7.12 +- 3.7.13 - 3.8.12 - 3.9.12 - 3.10.4 @@ -147,7 +152,7 @@ #### Node.js - 12.22.12 - 14.19.1 -- 16.14.2 +- 16.15.0 #### Go | Version | Architecture | Environment Variable | @@ -171,20 +176,20 @@ - Rustfmt 1.4.38-stable ### PowerShell Tools -- PowerShell 7.2.2 +- PowerShell 7.2.3 #### PowerShell Modules | Module | Version | | ---------------- | ------- | | Az | 7.5.0 | | MarkdownPS | 1.9 | -| Pester | 5.3.2 | +| Pester | 5.3.3 | | PSScriptAnalyzer | 1.20.0 | ### Web Servers | Name | Version | ConfigFile | ServiceStatus | ListenPort | | ----- | -------- | ------------------------------- | ------------- | ---------- | -| httpd | 2.4.53_1 | /usr/local/etc/httpd/httpd.conf | none | 80 | +| httpd | 2.4.53_2 | /usr/local/etc/httpd/httpd.conf | none | 80 | | nginx | 1.21.6_1 | /usr/local/etc/nginx/nginx.conf | none | 80 | ### Xamarin @@ -286,7 +291,7 @@ - libXext 1.3.4 - libXft 2.3.4 - Tcl/Tk 8.6.12 -- Zlib 1.2.11 +- Zlib 1.2.12 From f1b7652904dad4ca03937400b9346108b6d1dbb7 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 4 May 2022 10:33:53 +0200 Subject: [PATCH 1106/3485] Ubuntu 18.04 (20220503 update) (#5473) * Updating readme file for ubuntu18 version 20220503.1 * Update Ubuntu1804-Readme.md Fix kubectl version. Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Dusko Dobranic <101048884+ddobranic@users.noreply.github.com> --- images/linux/Ubuntu1804-Readme.md | 75 +++++++++++++++---------------- 1 file changed, 35 insertions(+), 40 deletions(-) diff --git a/images/linux/Ubuntu1804-Readme.md b/images/linux/Ubuntu1804-Readme.md index 28bc3b9e9cff..0098acd64169 100644 --- a/images/linux/Ubuntu1804-Readme.md +++ b/images/linux/Ubuntu1804-Readme.md @@ -1,10 +1,6 @@ -| Announcements | -|-| -| [[Ubuntu] PHP 7.1 will be removed from Ubuntu 18 on April, 18](https://github.com/actions/virtual-environments/issues/5326) | -*** # Ubuntu 18.04.6 LTS - Linux kernel version: 5.4.0-1077-azure -- Image Version: 20220426.1 +- Image Version: 20220503.1 ## Installed Software ### Language and Runtime @@ -19,7 +15,7 @@ - Kotlin 1.6.21-release-334 - Mono 6.12.0.122 (apt source repository: https://download.mono-project.com/repo/ubuntu stable-bionic main) - MSBuild 16.6.0.15201 (from /usr/lib/mono/msbuild/15.0/bin/MSBuild.dll) -- Node 16.14.2 +- Node 16.15.0 - Perl 5.26.1 - Python 2.7.17 - Python3 3.6.9 @@ -29,14 +25,14 @@ ### Package Management - cpan 1.64 - Helm 3.8.2 -- Homebrew 3.4.8 +- Homebrew 3.4.10 - Miniconda 4.11.0 -- Npm 8.5.0 +- Npm 8.5.5 - Pip 9.0.1 - Pip3 9.0.1 - Pipx 1.0.0 - RubyGems 2.7.6 -- Vcpkg (build from master \<9f643818c>) +- Vcpkg (build from master \<b98afc9f1>) - Yarn 1.22.18 #### Environment variables @@ -57,10 +53,10 @@ - AzCopy 10.14.1 (available by `azcopy` and `azcopy10` aliases) - Bazel 5.1.1 - Bazelisk 1.11.0 -- Bicep 0.5.6 +- Bicep 0.6.1 - Buildah 1.19.6 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - CMake 3.23.1 -- CodeQL Action Bundle 2.8.5 +- CodeQL Action Bundle 2.9.0 - Docker Compose v1 1.29.2 - Docker Compose v2 2.4.1+azure-1 - Docker-Buildx 0.8.2 @@ -70,11 +66,11 @@ - Git LFS 3.1.4 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.3.1 - Haveged 1.9.1 -- Heroku 7.60.1 +- Heroku 7.60.2 - HHVM (HipHop VM) 4.159.0 - jq 1.5 - Kind 0.12.0 -- Kubectl 1.23.6 +- Kubectl 1.24.0 - Kustomize 4.5.4 - Leiningen 2.9.8 - MediaInfo 17.12 @@ -88,38 +84,38 @@ - Parcel 2.5.0 - PhantomJS 2.1.1 - Podman 3.0.1 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- Pulumi 3.30.0 -- R 4.1.3 +- Pulumi 3.31.0 +- R 4.2.0 - Skopeo 1.2.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 - SVN 1.9.7 - Terraform 1.1.9 - yamllint 1.26.3 -- yq 4.24.5 +- yq 4.25.1 - zstd 1.5.2 (homebrew) ### CLI Tools - Alibaba Cloud CLI 3.0.118 -- AWS CLI 1.23.1 +- AWS CLI 1.23.6 - AWS CLI Session manager plugin 1.2.312.0 -- AWS SAM CLI 1.46.0 +- AWS SAM CLI 1.47.0 - Azure CLI (azure-cli) 2.36.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.25.0 - GitHub CLI 2.9.0 - Google Cloud SDK 369.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 10.0.0 -- OpenShift CLI 4.10.11 +- Netlify CLI 10.1.0 +- OpenShift CLI 4.10.12 - ORAS CLI 0.12.0 -- Vercel CLI 24.1.0 +- Vercel CLI 24.2.0 ### Java | Version | Vendor | Environment Variable | | ------------------- | --------------- | -------------------- | | 8.0.322+6 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | -| 11.0.14+1 | Eclipse Temurin | JAVA_HOME_11_X64 | +| 11.0.15+10 | Eclipse Temurin | JAVA_HOME_11_X64 | | 12.0.2+10 | Adopt OpenJDK | JAVA_HOME_12_X64 | -| 17.0.2+8 | Eclipse Temurin | JAVA_HOME_17_X64 | +| 17.0.3+7 | Eclipse Temurin | JAVA_HOME_17_X64 | ### PHP | Tool | Version | @@ -151,11 +147,11 @@ - Rustfmt 1.4.38 ### Browsers and Drivers -- Google Chrome 101.0.4951.41 -- ChromeDriver 101.0.4951.15 +- Google Chrome 101.0.4951.54 +- ChromeDriver 101.0.4951.41 +- Chromium 101.0.4951.0 - Mozilla Firefox 99.0 - Geckodriver 0.31.0 -- Chromium 101.0.4951.0 - Selenium server 4.1.0 #### Environment variables @@ -169,7 +165,7 @@ - 3.1.120 3.1.202 3.1.302 3.1.418 5.0.104 5.0.213 5.0.303 5.0.407 6.0.202 ### .NET tools -- nbgv 3.4.255+06fb9182bf +- nbgv 3.5.103+351d94e36c ### Databases - MongoDB 5.0.8 (apt source repository: https://repo.mongodb.org/apt/ubuntu) @@ -183,7 +179,7 @@ PostgreSQL service is disabled by default. Use the following command as a part of your job to start the service: 'sudo systemctl start postgresql.service' ``` #### MySQL -- MySQL 5.7.37 +- MySQL 5.7.38 - MySQL Server (user:root password:root) ``` @@ -202,7 +198,7 @@ #### Node.js - 12.22.12 - 14.19.1 -- 16.14.2 +- 16.15.0 #### PyPy - 2.7.18 [PyPy 7.3.9] @@ -212,7 +208,7 @@ #### Python - 2.7.18 - 3.6.15 -- 3.7.12 +- 3.7.13 - 3.8.12 - 3.9.12 - 3.10.4 @@ -233,14 +229,14 @@ | GOROOT_1_18_X64 | /opt/hostedtoolcache/go/1.18.1/x64 | x64 | ### PowerShell Tools -- PowerShell 7.2.2 +- PowerShell 7.2.3 #### PowerShell Modules | Module | Version | | --------------- | ------- | | MarkdownPS | 1.9 | | Microsoft.Graph | 1.9.5 | -| Pester | 5.3.2 | +| Pester | 5.3.3 | #### Az PowerShell Modules - 7.3.2 3.1.0.zip 4.4.0.zip 5.9.0.zip 6.6.0.zip @@ -289,16 +285,16 @@ | debian:10 | sha256:ebe4b9831fb22dfa778de4ffcb8ea0ad69b5d782d4e86cab14cc1fded5d8e761 | 2022-04-20 | | debian:11 | sha256:6846593d7d8613e5dcc68c8f7d8b8e3179c7f3397b84a47c5b2ce989ef1075a0 | 2022-04-20 | | debian:9 | sha256:cebe6e1c30384958d471467e231f740e8f0fd92cbfd2a435a186e9bada3aee1c | 2022-04-20 | -| moby/buildkit:latest | sha256:bd37f0b5567084cd6f4b1c73b7fed9e12258441d064cc2add29a7dd32243ff86 | 2022-04-07 | +| moby/buildkit:latest | sha256:3fbc9b9d9a74ab650eea43610ed880e51cdc05282d61f83c2e0a3b2e9ed3a344 | 2022-04-27 | | node:12 | sha256:01627afeb110b3054ba4a1405541ca095c8bfca1cb6f2be9479c767a2711879e | 2022-04-20 | | node:12-alpine | sha256:d4b15b3d48f42059a15bd659be60afe21762aae9d6cbea6f124440895c27db68 | 2022-04-11 | | node:14 | sha256:2f39686f6d0b2687550659367fa11f56018a0f782b7e30f1a0ea56b11dece124 | 2022-04-20 | | node:14-alpine | sha256:8845b4f88f64f8c56a39236648ba22946e806a6153c10911f77b70e5a2edb4ca | 2022-04-05 | -| node:16 | sha256:6e54786b2ad01667d46524e82806298714f50d2be72b39706770aed55faedbd7 | 2022-04-20 | -| node:16-alpine | sha256:28bed508446db2ee028d08e76fb47b935defa26a84986ca050d2596ea67fd506 | 2022-04-05 | +| node:16 | sha256:a6c217d7c8f001dc6fc081d55c2dd7fb3fefe871d5aa7be9c0c16bd62bea8e0c | 2022-04-27 | +| node:16-alpine | sha256:1a9a71ea86aad332aa7740316d4111ee1bd4e890df47d3b5eff3e5bded3b3d10 | 2022-04-27 | | ubuntu:16.04 | sha256:20858ebbc96215d6c3c574f781133ebffdc7c18d98af4f294cc4c04871a6fe61 | 2021-08-31 | -| ubuntu:18.04 | sha256:627b1184c9100a22ba9dcf531908b9e24af99fa54e45c10f57852fb890a57ea6 | 2022-04-21 | -| ubuntu:20.04 | sha256:115822d64890aae5cde3c1e85ace4cc97308bb1fd884dac62f4db0a16dbddb36 | 2022-04-21 | +| ubuntu:18.04 | sha256:d21b6ba9e19feffa328cb3864316e6918e30acfd55e285b5d3df1d8ca3c7fd3f | 2022-04-29 | +| ubuntu:20.04 | sha256:47f14534bda344d9fe6ffd6effb95eefe579f4be0d508b7445cf77f61a0e5724 | 2022-04-29 | ### Installed apt packages | Name | Version | @@ -312,7 +308,7 @@ | build-essential | 12.4ubuntu1 | | bzip2 | 1.0.6-8.1ubuntu0.2 | | coreutils | 8.28-1ubuntu1 | -| curl | 7.58.0-2ubuntu3.16 | +| curl | 7.58.0-2ubuntu3.17 | | dbus | 1.12.2-1ubuntu1.2 | | dnsutils | 1:9.11.3+dfsg-1ubuntu1.17 | | dpkg | 1.19.0.5ubuntu2.3 | @@ -329,7 +325,7 @@ | lib32z1 | 1:1.2.11.dfsg-0ubuntu2.1 | | libc++-dev | 6.0-2 | | libc++abi-dev | 6.0-2 | -| libcurl3 | 7.58.0-2ubuntu3.16 | +| libcurl3 | 7.58.0-2ubuntu3.17 | | libgbm-dev | 20.0.8-0ubuntu1\~18.04.1 | | libgconf-2-4 | 3.2.6-4ubuntu1 | | libgsl-dev | 2.4+dfsg-6 | @@ -382,4 +378,3 @@ | zip | 3.0-11build1 | | zsync | 0.6.2-3ubuntu1 | - From a27099b057088cccb69d429784107ca43e964a43 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Wed, 4 May 2022 11:19:49 +0200 Subject: [PATCH 1107/3485] Add Ubuntu2204 ImageType (#5476) * Add Ubuntu2204 ImageType * Update json path --- docs/create-image-and-azure-resources.md | 2 +- helpers/GenerateResourcesAndImage.ps1 | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/docs/create-image-and-azure-resources.md b/docs/create-image-and-azure-resources.md index ae25ed00ffce..2727d7309c58 100644 --- a/docs/create-image-and-azure-resources.md +++ b/docs/create-image-and-azure-resources.md @@ -61,7 +61,7 @@ Where: - `SubscriptionId` - The Azure subscription Id where resources will be created. - `ResourceGroupName` - The Azure resource group name where the Azure resources will be created. - `ImageGenerationRepositoryRoot` - The root path of the image generation repository source. -- `ImageType` - The type of the image being generated. Valid options are: "Windows2016", "Windows2019", "Windows2022", "Ubuntu1804", "Ubuntu2004". +- `ImageType` - The type of the image being generated. Valid options are: "Windows2016", "Windows2019", "Windows2022", "Ubuntu1804", "Ubuntu2004", "Ubuntu2204". - `AzureLocation` - The location of the resources being created in Azure. For example "East US". The function automatically creates all required Azure resources and kicks off packer image generation for the selected image type. diff --git a/helpers/GenerateResourcesAndImage.ps1 b/helpers/GenerateResourcesAndImage.ps1 index 36515dcd5281..921650010ecc 100644 --- a/helpers/GenerateResourcesAndImage.ps1 +++ b/helpers/GenerateResourcesAndImage.ps1 @@ -6,6 +6,7 @@ enum ImageType { Windows2022 = 2 Ubuntu1804 = 3 Ubuntu2004 = 4 + Ubuntu2204 = 5 } Function Get-PackerTemplatePath { @@ -32,6 +33,9 @@ Function Get-PackerTemplatePath { ([ImageType]::Ubuntu2004) { $relativeTemplatePath = Join-Path "linux" "ubuntu2004.json" } + ([ImageType]::Ubuntu2204) { + $relativeTemplatePath = Join-Path "linux" "ubuntu2204.json" + } default { throw "Unknown type of image" } } From 30007c570303fe3ca1f13fc1de787667623a2e25 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 4 May 2022 09:19:56 +0000 Subject: [PATCH 1108/3485] Updating readme file for macOS-10.15 version 20220501.1 (#5466) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-10.15-Readme.md | 71 ++++++++++++++++-------------- 1 file changed, 38 insertions(+), 33 deletions(-) diff --git a/images/macos/macos-10.15-Readme.md b/images/macos/macos-10.15-Readme.md index 12dc412f615c..4c9ec4e6df0e 100644 --- a/images/macos/macos-10.15-Readme.md +++ b/images/macos/macos-10.15-Readme.md @@ -1,7 +1,12 @@ +| Announcements | +|-| +| [[macOS] Xcode versions 13.2 & 13.3 will be removed, 13.3.1 will be set as the default one on May, 16](https://github.com/actions/virtual-environments/issues/5463) | +| [macOS 12 (Monterey) is available as a public beta in GitHub Actions](https://github.com/actions/virtual-environments/issues/5446) | +*** # macOS 10.15 info - System Version: macOS 10.15.7 (19H1824) - Kernel Version: Darwin 19.6.0 -- Image Version: 20220424.1 +- Image Version: 20220501.1 ## Installed Software ### Language and Runtime @@ -11,17 +16,17 @@ - Clang/LLVM 13.0.1 is available on `'$(brew --prefix llvm)/bin/clang'` - gcc-9 (Homebrew GCC 9.4.0) 9.4.0 - available by `gcc-9` alias - gcc-10 (Homebrew GCC 10.3.0) 10.3.0 - available by `gcc-10` alias -- gcc-11 (Homebrew GCC 11.2.0_3) 11.2.0 - available by `gcc-11` alias +- gcc-11 (Homebrew GCC 11.3.0) 11.3.0 - available by `gcc-11` alias - GNU Fortran (Homebrew GCC 9.4.0) 9.4.0 - available by `gfortran-9` alias - GNU Fortran (Homebrew GCC 10.3.0) 10.3.0 - available by `gfortran-10` alias -- GNU Fortran (Homebrew GCC 11.2.0_3) 11.2.0 - available by `gfortran-11` alias +- GNU Fortran (Homebrew GCC 11.3.0) 11.3.0 - available by `gfortran-11` alias - Go 1.17.9 - julia 1.7.2 - Kotlin 1.6.21-release-334 - MSBuild 16.10.1.58001 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) -- Node.js v16.14.2 +- Node.js v16.15.0 - NVM 0.39.1 -- NVM - Cached node versions: v12.22.12 v14.19.1 v16.14.2 +- NVM - Cached node versions: v12.22.12 v14.19.1 v16.15.0 - Perl 5.34.0 - PHP 8.1.5 - Python 2.7.18 @@ -34,15 +39,15 @@ - Carthage 0.38.0 - CocoaPods 1.11.3 - Composer 2.3.5 -- Homebrew 3.4.7 +- Homebrew 3.4.9 - Miniconda 4.11.0 -- NPM 8.5.0 +- NPM 8.5.5 - NuGet 5.9.0.7134 - Pip 20.3.4 (python 2.7) - Pip 22.0.4 (python 3.9) - Pipx 1.0.0 - RubyGems 3.2.33 -- Vcpkg 2022 (build from master \<2ac61f87f>) +- Vcpkg 2022 (build from master \<c8a56fdc1>) - Yarn 1.22.18 #### Environment variables @@ -64,14 +69,14 @@ - bazel 5.1.1 - bazelisk 1.11.0 - bsdtar 3.3.2 - available by 'tar' alias -- Curl 7.82.0 +- Curl 7.83.0 - Git 2.35.1 - Git LFS: 3.1.4 -- GitHub CLI: 2.8.0 +- GitHub CLI: 2.9.0 - GNU parallel 20220422 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.3 -- gpg (GnuPG) 2.3.5 +- gpg (GnuPG) 2.3.6 - helm v3.8.2+g6e3701e - Hub CLI: 2.14.2 - jq 1.6 @@ -87,17 +92,17 @@ - Switchaudio-osx 1.1.0 - Vagrant 2.2.19 - virtualbox 6.1.34r150636 -- yq (https://github.com/mikefarah/yq/) version 4.24.5 +- yq (https://github.com/mikefarah/yq/) version 4.25.1 - zstd 1.5.2 ### Tools - Aliyun CLI 3.0.117 - App Center CLI 2.10.10 -- AWS CLI 2.5.8 -- AWS SAM CLI 1.46.0 +- AWS CLI 2.6.1 +- AWS SAM CLI 1.47.0 - AWS Session Manager CLI 1.2.312.0 - Azure CLI (azure-devops) 0.25.0 -- Azure CLI 2.35.0 +- Azure CLI 2.36.0 - Bicep CLI 0.5.6 - Cabal 3.6.2.0 - Cmake 3.23.1 @@ -111,24 +116,24 @@ - Xcode Command Line Tools 12.4.0.0.1.1610135815 ### Linters -- SwiftLint 0.47.0 +- SwiftLint 0.47.1 - yamllint 1.26.3 ### Browsers - Safari 15.4 (15613.1.17.1.13) - SafariDriver 15.4 (15613.1.17.1.13) -- Google Chrome 100.0.4896.127 -- ChromeDriver 100.0.4896.60 -- Microsoft Edge 100.0.1185.50 -- MSEdgeDriver 100.0.1185.50 +- Google Chrome 101.0.4951.41 +- ChromeDriver 101.0.4951.41 +- Microsoft Edge 101.0.1210.32 +- MSEdgeDriver 101.0.1210.32 - Mozilla Firefox 99.0.1 - geckodriver 0.31.0 -- Selenium server 4.1.3 +- Selenium server 4.1.4 #### Environment variables | Name | Value | | --------------- | ---------------------------------------------- | -| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/100.0.4896.60 | +| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/101.0.4951.41 | | EDGEWEBDRIVER | /usr/local/share/edge_driver | | GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | @@ -136,16 +141,16 @@ | Version | Vendor | Environment Variable | | ------------------- | --------------- | -------------------- | | 8.0.322+6 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | -| 11.0.14+101 | Eclipse Temurin | JAVA_HOME_11_X64 | +| 11.0.15+10 | Eclipse Temurin | JAVA_HOME_11_X64 | | 12.0.2+10.3 | Adopt OpenJDK | JAVA_HOME_12_X64 | | 13.0.2+8.1 | Adopt OpenJDK | JAVA_HOME_13_X64 | | 14.0.2+12 | Adopt OpenJDK | JAVA_HOME_14_X64 | | 17.0.3+7 | Eclipse Temurin | JAVA_HOME_17_X64 | ### GraalVM -| Version | Environment variables | -| ----------- | --------------------- | -| CE 22.0.0.2 | GRAALVM_11_ROOT | +| Version | Environment variables | +| --------- | --------------------- | +| CE 22.1.0 | GRAALVM_11_ROOT | ### Cached Tools #### Ruby @@ -158,7 +163,7 @@ #### Python - 2.7.18 - 3.6.15 -- 3.7.12 +- 3.7.13 - 3.8.12 - 3.9.12 - 3.10.4 @@ -173,7 +178,7 @@ #### Node.js - 12.22.12 - 14.19.1 -- 16.14.2 +- 16.15.0 #### Go | Version | Architecture | Environment Variable | @@ -197,20 +202,20 @@ - Rustfmt 1.4.38-stable ### PowerShell Tools -- PowerShell 7.2.2 +- PowerShell 7.2.3 #### PowerShell Modules | Module | Version | | ---------------- | ------- | -| Az | 7.4.0 | +| Az | 7.5.0 | | MarkdownPS | 1.9 | -| Pester | 5.3.2 | +| Pester | 5.3.3 | | PSScriptAnalyzer | 1.20.0 | ### Web Servers | Name | Version | ConfigFile | ServiceStatus | ListenPort | | ----- | -------- | ------------------------------- | ------------- | ---------- | -| httpd | 2.4.53_1 | /usr/local/etc/httpd/httpd.conf | none | 80 | +| httpd | 2.4.53_2 | /usr/local/etc/httpd/httpd.conf | none | 80 | | nginx | 1.21.6_1 | /usr/local/etc/nginx/nginx.conf | none | 80 | ### Xamarin @@ -381,7 +386,7 @@ - libXext 1.3.4 - libXft 2.3.4 - Tcl/Tk 8.6.12 -- Zlib 1.2.11 +- Zlib 1.2.12 From 97fd5e03b48a2fcdf278f1ed592e858a71d4e3ab Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Wed, 4 May 2022 13:54:56 +0200 Subject: [PATCH 1109/3485] [Ubuntu] Add python toolcache to 22.04 (#5478) --- .../SoftwareReport/SoftwareReport.CachedTools.psm1 | 6 +++--- images/linux/toolsets/toolset-2204.json | 13 +++++++++++++ 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.CachedTools.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.CachedTools.psm1 index bb184ba4f5cb..1a5a95ea063d 100755 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.CachedTools.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.CachedTools.psm1 @@ -55,10 +55,10 @@ function Build-CachedToolsSection { $output += New-MDHeader "PyPy" -Level 4 $output += New-MDList -Lines (Get-ToolcachePyPyVersions) -Style Unordered - if ((Test-IsUbuntu18) -or (Test-IsUbuntu20)) { - $output += New-MDHeader "Python" -Level 4 - $output += New-MDList -Lines (Get-ToolcachePythonVersions) -Style Unordered + $output += New-MDHeader "Python" -Level 4 + $output += New-MDList -Lines (Get-ToolcachePythonVersions) -Style Unordered + if ((Test-IsUbuntu18) -or (Test-IsUbuntu20)) { $output += New-MDHeader "Ruby" -Level 4 $output += New-MDList -Lines (Get-ToolcacheRubyVersions) -Style Unordered } diff --git a/images/linux/toolsets/toolset-2204.json b/images/linux/toolsets/toolset-2204.json index c031f5c9e4a8..103d1d0884d8 100644 --- a/images/linux/toolsets/toolset-2204.json +++ b/images/linux/toolsets/toolset-2204.json @@ -1,5 +1,18 @@ { "toolcache": [ + { + "name": "Python", + "url" : "https://raw.githubusercontent.com/actions/python-versions/main/versions-manifest.json", + "platform" : "linux", + "platform_version": "22.04", + "arch": "x64", + "versions": [ + "3.7.*", + "3.8.*", + "3.9.*", + "3.10.*" + ] + }, { "name": "PyPy", "arch": "x64", From c4f55aa749ae7e4da34db28ec483f98dcd699614 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Wed, 4 May 2022 15:26:55 +0200 Subject: [PATCH 1110/3485] [Ubuntu] Add node toolcache to 22.04 (#5480) --- .../SoftwareReport/SoftwareReport.CachedTools.psm1 | 6 ++---- images/linux/toolsets/toolset-2204.json | 10 ++++++++++ 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.CachedTools.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.CachedTools.psm1 index 1a5a95ea063d..c842508ba957 100755 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.CachedTools.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.CachedTools.psm1 @@ -47,10 +47,8 @@ function Build-CachedToolsSection { $output += New-MDHeader "Go" -Level 4 $output += New-MDList -Lines (Get-ToolcacheGoVersions) -Style Unordered - if ((Test-IsUbuntu18) -or (Test-IsUbuntu20)) { - $output += New-MDHeader "Node.js" -Level 4 - $output += New-MDList -Lines (Get-ToolcacheNodeVersions) -Style Unordered - } + $output += New-MDHeader "Node.js" -Level 4 + $output += New-MDList -Lines (Get-ToolcacheNodeVersions) -Style Unordered $output += New-MDHeader "PyPy" -Level 4 $output += New-MDList -Lines (Get-ToolcachePyPyVersions) -Style Unordered diff --git a/images/linux/toolsets/toolset-2204.json b/images/linux/toolsets/toolset-2204.json index 103d1d0884d8..3caeceddd1a0 100644 --- a/images/linux/toolsets/toolset-2204.json +++ b/images/linux/toolsets/toolset-2204.json @@ -23,6 +23,16 @@ "3.9" ] }, + { + "name": "node", + "url" : "https://raw.githubusercontent.com/actions/node-versions/main/versions-manifest.json", + "platform" : "linux", + "arch": "x64", + "versions": [ + "14.*", + "16.*" + ] + }, { "name": "go", "url" : "https://raw.githubusercontent.com/actions/go-versions/main/versions-manifest.json", From ba6c9512a375900e374891a6c59d67565b3d5f47 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Wed, 4 May 2022 16:30:11 +0200 Subject: [PATCH 1111/3485] [CI] Set TLS12 (#5482) --- images.CI/linux-and-win/create-release.ps1 | 1 + 1 file changed, 1 insertion(+) diff --git a/images.CI/linux-and-win/create-release.ps1 b/images.CI/linux-and-win/create-release.ps1 index 72d0db4e1c06..f32974c2d3c0 100644 --- a/images.CI/linux-and-win/create-release.ps1 +++ b/images.CI/linux-and-win/create-release.ps1 @@ -26,6 +26,7 @@ $headers = @{ Authorization = "Basic ${base64AuthInfo}" } +[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 -bor [Net.SecurityProtocolType]::Tls13 $NewRelease = Invoke-RestMethod $URL -Body $Body -Method "POST" -Headers $headers -ContentType "application/json" Write-Host "Created release: $($NewRelease._links.web.href)" \ No newline at end of file From b86d5523dd936143ea65269868e95b871c131289 Mon Sep 17 00:00:00 2001 From: Dusko Dobranic <101048884+ddobranic@users.noreply.github.com> Date: Wed, 4 May 2022 17:09:51 +0200 Subject: [PATCH 1112/3485] [Ubuntu] Fix kubectl version report (#5479) --- images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 index bcfe1b84a0d9..c8921d10df9e 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 @@ -142,7 +142,7 @@ function Get-KindVersion { } function Get-KubectlVersion { - $kubectlVersion = kubectl version --client --short | Take-OutputPart -Part 2 | Take-OutputPart -Part 0 -Delimiter "v" + $kubectlVersion = (kubectl version --client --output=json | ConvertFrom-Json).clientVersion.gitVersion.Replace('v','') return "Kubectl $kubectlVersion" } From ef69c49622a8b79dda9467f1afb8607ec9605817 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Wed, 4 May 2022 21:07:06 +0200 Subject: [PATCH 1113/3485] [Ubuntu] Add Ruby 3.1 to 22.04 toolcache (#5486) --- .../SoftwareReport/SoftwareReport.CachedTools.psm1 | 6 ++---- images/linux/toolsets/toolset-2204.json | 8 ++++++++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.CachedTools.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.CachedTools.psm1 index c842508ba957..66b85a38a205 100755 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.CachedTools.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.CachedTools.psm1 @@ -56,10 +56,8 @@ function Build-CachedToolsSection { $output += New-MDHeader "Python" -Level 4 $output += New-MDList -Lines (Get-ToolcachePythonVersions) -Style Unordered - if ((Test-IsUbuntu18) -or (Test-IsUbuntu20)) { - $output += New-MDHeader "Ruby" -Level 4 - $output += New-MDList -Lines (Get-ToolcacheRubyVersions) -Style Unordered - } + $output += New-MDHeader "Ruby" -Level 4 + $output += New-MDList -Lines (Get-ToolcacheRubyVersions) -Style Unordered return $output } diff --git a/images/linux/toolsets/toolset-2204.json b/images/linux/toolsets/toolset-2204.json index 3caeceddd1a0..395f79a689a3 100644 --- a/images/linux/toolsets/toolset-2204.json +++ b/images/linux/toolsets/toolset-2204.json @@ -44,6 +44,14 @@ ], "default": "1.18.*" }, + { + "name": "Ruby", + "platform_version": "22.04", + "arch": "x64", + "versions": [ + "3.1.*" + ] + }, { "name": "CodeQL", "platform" : "linux", From 03116894b34e0bd69b4ed803dcc43d0307414595 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 5 May 2022 02:38:19 +0000 Subject: [PATCH 1114/3485] Updating readme file for macOS-11 version 20220501.1 (#5471) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-11-Readme.md | 71 ++++++++++++++++++--------------- 1 file changed, 38 insertions(+), 33 deletions(-) diff --git a/images/macos/macos-11-Readme.md b/images/macos/macos-11-Readme.md index 1b629203fb88..53bff2685407 100644 --- a/images/macos/macos-11-Readme.md +++ b/images/macos/macos-11-Readme.md @@ -1,7 +1,12 @@ +| Announcements | +|-| +| [[macOS] Xcode versions 13.2 & 13.3 will be removed, 13.3.1 will be set as the default one on May, 16](https://github.com/actions/virtual-environments/issues/5463) | +| [macOS 12 (Monterey) is available as a public beta in GitHub Actions](https://github.com/actions/virtual-environments/issues/5446) | +*** # macOS 11.6 info - System Version: macOS 11.6.5 (20G527) - Kernel Version: Darwin 20.6.0 -- Image Version: 20220424.1 +- Image Version: 20220501.1 ## Installed Software ### Language and Runtime @@ -11,17 +16,17 @@ - Clang/LLVM 13.0.1 is available on `'$(brew --prefix llvm)/bin/clang'` - gcc-9 (Homebrew GCC 9.4.0) 9.4.0 - available by `gcc-9` alias - gcc-10 (Homebrew GCC 10.3.0) 10.3.0 - available by `gcc-10` alias -- gcc-11 (Homebrew GCC 11.2.0_3) 11.2.0 - available by `gcc-11` alias +- gcc-11 (Homebrew GCC 11.3.0) 11.3.0 - available by `gcc-11` alias - GNU Fortran (Homebrew GCC 9.4.0) 9.4.0 - available by `gfortran-9` alias - GNU Fortran (Homebrew GCC 10.3.0) 10.3.0 - available by `gfortran-10` alias -- GNU Fortran (Homebrew GCC 11.2.0_3) 11.2.0 - available by `gfortran-11` alias +- GNU Fortran (Homebrew GCC 11.3.0) 11.3.0 - available by `gfortran-11` alias - Go 1.17.9 - julia 1.7.2 - Kotlin 1.6.21-release-334 - MSBuild 16.10.1.17201 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) -- Node.js v16.14.2 +- Node.js v16.15.0 - NVM 0.39.1 -- NVM - Cached node versions: v12.22.12 v14.19.1 v16.14.2 +- NVM - Cached node versions: v12.22.12 v14.19.1 v16.15.0 - Perl 5.34.0 - PHP 8.1.5 - Python 2.7.18 @@ -34,15 +39,15 @@ - Carthage 0.38.0 - CocoaPods 1.11.3 - Composer 2.3.5 -- Homebrew 3.4.7 +- Homebrew 3.4.9 - Miniconda 4.11.0 -- NPM 8.5.0 +- NPM 8.5.5 - NuGet 5.9.0.7134 - Pip 20.3.4 (python 2.7) - Pip 22.0.4 (python 3.9) - Pipx 1.0.0 - RubyGems 3.2.33 -- Vcpkg 2022 (build from master \<2ac61f87f>) +- Vcpkg 2022 (build from master \<c8a56fdc1>) - Yarn 1.22.18 #### Environment variables @@ -64,13 +69,13 @@ - bazel 5.1.1 - bazelisk 1.11.0 - bsdtar 3.3.2 - available by 'tar' alias -- Curl 7.82.0 +- Curl 7.83.0 - Git 2.35.1 - Git LFS: 3.1.4 -- GitHub CLI: 2.8.0 +- GitHub CLI: 2.9.0 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.3 -- gpg (GnuPG) 2.3.5 +- gpg (GnuPG) 2.3.6 - helm v3.8.2+g6e3701e - Hub CLI: 2.14.2 - jq 1.6 @@ -84,17 +89,17 @@ - Sox 14.4.2 - Subversion (SVN) 1.14.2 - Switchaudio-osx 1.1.0 -- yq (https://github.com/mikefarah/yq/) version 4.24.5 +- yq (https://github.com/mikefarah/yq/) version 4.25.1 - zstd 1.5.2 ### Tools - Aliyun CLI 3.0.117 - App Center CLI 2.10.10 -- AWS CLI 2.5.8 -- AWS SAM CLI 1.46.0 +- AWS CLI 2.6.1 +- AWS SAM CLI 1.47.0 - AWS Session Manager CLI 1.2.312.0 - Azure CLI (azure-devops) 0.25.0 -- Azure CLI 2.35.0 +- Azure CLI 2.36.0 - Bicep CLI 0.5.6 - Cabal 3.6.2.0 - Cmake 3.23.1 @@ -108,24 +113,24 @@ - Xcode Command Line Tools 13.2.0.0.1.1638488800 ### Linters -- SwiftLint 0.47.0 +- SwiftLint 0.47.1 - yamllint 1.26.3 ### Browsers - Safari 15.4 (16613.1.17.1.13) - SafariDriver 15.4 (16613.1.17.1.13) -- Google Chrome 100.0.4896.127 -- ChromeDriver 100.0.4896.60 -- Microsoft Edge 100.0.1185.50 -- MSEdgeDriver 100.0.1185.50 +- Google Chrome 101.0.4951.41 +- ChromeDriver 101.0.4951.41 +- Microsoft Edge 101.0.1210.32 +- MSEdgeDriver 101.0.1210.32 - Mozilla Firefox 99.0.1 - geckodriver 0.31.0 -- Selenium server 4.1.3 +- Selenium server 4.1.4 #### Environment variables | Name | Value | | --------------- | ---------------------------------------------- | -| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/100.0.4896.60 | +| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/101.0.4951.41 | | EDGEWEBDRIVER | /usr/local/share/edge_driver | | GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | @@ -133,13 +138,13 @@ | Version | Vendor | Environment Variable | | ------------------- | --------------- | -------------------- | | 8.0.322+6 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | -| 11.0.14+101 | Eclipse Temurin | JAVA_HOME_11_X64 | +| 11.0.15+10 | Eclipse Temurin | JAVA_HOME_11_X64 | | 17.0.3+7 | Eclipse Temurin | JAVA_HOME_17_X64 | ### GraalVM -| Version | Environment variables | -| ----------- | --------------------- | -| CE 22.0.0.2 | GRAALVM_11_ROOT | +| Version | Environment variables | +| --------- | --------------------- | +| CE 22.1.0 | GRAALVM_11_ROOT | ### Cached Tools #### Ruby @@ -151,7 +156,7 @@ - 3.1.2 #### Python -- 3.7.12 +- 3.7.13 - 3.8.12 - 3.9.12 - 3.10.4 @@ -165,7 +170,7 @@ #### Node.js - 12.22.12 - 14.19.1 -- 16.14.2 +- 16.15.0 #### Go | Version | Architecture | Environment Variable | @@ -189,20 +194,20 @@ - Rustfmt 1.4.38-stable ### PowerShell Tools -- PowerShell 7.2.2 +- PowerShell 7.2.3 #### PowerShell Modules | Module | Version | | ---------------- | ------- | -| Az | 7.4.0 | +| Az | 7.5.0 | | MarkdownPS | 1.9 | -| Pester | 5.3.2 | +| Pester | 5.3.3 | | PSScriptAnalyzer | 1.20.0 | ### Web Servers | Name | Version | ConfigFile | ServiceStatus | ListenPort | | ----- | -------- | ------------------------------- | ------------- | ---------- | -| httpd | 2.4.53_1 | /usr/local/etc/httpd/httpd.conf | none | 80 | +| httpd | 2.4.53_2 | /usr/local/etc/httpd/httpd.conf | none | 80 | | nginx | 1.21.6_1 | /usr/local/etc/nginx/nginx.conf | none | 80 | ### Xamarin @@ -340,7 +345,7 @@ - libXext 1.3.4 - libXft 2.3.4 - Tcl/Tk 8.6.12 -- Zlib 1.2.11 +- Zlib 1.2.12 From 3514f6ff69f1acac1839ccdda131a4dcfa731929 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Thu, 5 May 2022 11:37:47 +0400 Subject: [PATCH 1115/3485] Add readme for Ubuntu 22 image (#5488) --- images/linux/Ubuntu2204-Readme.md | 317 ++++++++++++++++++++++++++++++ 1 file changed, 317 insertions(+) create mode 100644 images/linux/Ubuntu2204-Readme.md diff --git a/images/linux/Ubuntu2204-Readme.md b/images/linux/Ubuntu2204-Readme.md new file mode 100644 index 000000000000..22a397c4e11c --- /dev/null +++ b/images/linux/Ubuntu2204-Readme.md @@ -0,0 +1,317 @@ +# Ubuntu 22.04 LTS +- Linux kernel version: 5.15.0-1005-azure +- Image Version: 20220504.1 + +## Installed Software +### Language and Runtime +- Bash 5.1.16(1)-release +- Clang 11.1.0, 12.0.1 +- Clang-format 11.1.0, 12.0.1 +- GNU C++ 9.4.0, 10.3.0, 11.2.0 +- GNU Fortran 9.4.0, 10.3.0, 11.2.0 +- Julia 1.7.2 +- Node 16.15.0 +- Perl 5.34.0 +- Python 3.10.4 +- Python3 3.10.4 +- Ruby 3.0.2p107 + +### Package Management +- cpan 1.64 +- Helm 3.8.2 +- Homebrew 3.4.10 +- Miniconda 4.11.0 +- Npm 8.5.5 +- Pip 22.0.2 +- Pip3 22.0.2 +- Pipx 1.0.0 +- RubyGems 3.3.5 +- Vcpkg (build from master \<b98afc9f1>) +- Yarn 1.22.18 + +#### Environment variables +| Name | Value | +| ----------------------- | ---------------------- | +| CONDA | /usr/share/miniconda | +| VCPKG_INSTALLATION_ROOT | /usr/local/share/vcpkg | + +### Project Management +- Lerna 4.0.0 + +### Tools +- Ansible 2.12.5 +- apt-fast 1.9.12 +- AzCopy 10.14.1 (available by `azcopy` and `azcopy10` aliases) +- Bazel 5.1.1 +- Bazelisk 1.11.0 +- Bicep 0.6.1 +- CMake 3.23.1 +- CodeQL Action Bundle 2.9.0 +- Docker Compose v1 1.29.2 +- Docker Compose v2 2.4.1+azure-1 +- Docker-Buildx 0.8.2 +- Docker-Moby Client 20.10.14+azure-1 +- Docker-Moby Server 20.10.14+azure-1 +- Fastlane 2.205.2 +- Git 2.36.0 (apt source repository: ppa:git-core/ppa) +- Git LFS 3.1.4 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) +- Git-ftp 1.6.0 +- Haveged 1.9.14 +- Heroku 7.60.2 +- jq 1.6 +- Kind 0.12.0 +- Kubectl 1.24.0 +- Kustomize 4.5.4 +- MediaInfo 21.09 +- Mercurial 6.1.1 +- Minikube 1.25.2 +- n 8.2.0 +- Newman 5.3.2 +- nvm 0.39.1 +- OpenSSL 3.0.2-0ubuntu1.1 +- Packer 1.8.0 +- Parcel 2.5.0 +- Pulumi 3.32.0 +- R 4.2.0 +- Sphinx Open Source Search Server 2.2.11 +- SVN 1.14.1 +- Terraform 1.1.9 +- yamllint 1.26.3 +- yq 4.25.1 +- zstd 1.5.2 (homebrew) + +### CLI Tools +- Alibaba Cloud CLI 3.0.118 +- AWS CLI 2.6.2 +- AWS CLI Session manager plugin 1.2.312.0 +- AWS SAM CLI 1.48.0 +- Azure CLI (azure-cli) 2.36.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) +- Azure CLI (azure-devops) 0.25.0 +- GitHub CLI 2.9.0 +- Google Cloud SDK 369.0.0 (apt source repository: https://packages.cloud.google.com/apt) +- Hub CLI 2.14.2 +- Netlify CLI 10.2.0 +- OpenShift CLI 4.10.12 +- ORAS CLI 0.12.0 +- Vercel CLI 24.2.0 + +### GraalVM +| Version | Environment variables | +| --------- | --------------------- | +| CE 22.1.0 | GRAALVM_11_ROOT | + +### PHP +| Tool | Version | +| -------- | ------- | +| PHP | 8.1.5 | +| Composer | 2.3.5 | +| PHPUnit | 8.5.26 | +``` + Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. +``` +### Haskell +- Cabal 3.6.2.0 +- GHC 9.2.2 +- GHCup 0.1.17.7 +- Stack 2.7.5 + +### Rust Tools +- Cargo 1.60.0 +- Rust 1.60.0 +- Rustdoc 1.60.0 +- Rustup 1.24.3 + +#### Packages +- Bindgen 0.59.2 +- Cargo audit 0.16.0 +- Cargo clippy 0.1.60 +- Cbindgen 0.23.0 +- Rustfmt 1.4.38 + +### Browsers and Drivers +- Google Chrome 101.0.4951.54 +- ChromeDriver 101.0.4951.41 +- Chromium 101.0.4951.0 + +#### Environment variables +| Name | Value | +| ----------------- | ------------------------------ | +| CHROMEWEBDRIVER | /usr/local/share/chrome_driver | +| GECKOWEBDRIVER | | +| SELENIUM_JAR_PATH | | + +### .NET Core SDK +- 6.0.202 + +### .NET tools +- nbgv 3.5.103+351d94e36c + +### Databases +- sqlite3 3.37.2 + +#### PostgreSQL +- PostgreSQL 14.2 (apt source repository: https://apt.postgresql.org/pub/repos/apt/) +- PostgreSQL Server (user:postgres) + +``` + PostgreSQL service is disabled by default. Use the following command as a part of your job to start the service: 'sudo systemctl start postgresql.service' +``` +#### MySQL +- MySQL 8.0.29-0ubuntu0.22.04.1 +- MySQL Server (user:root password:root) + +``` + MySQL service is disabled by default. Use the following command as a part of your job to start the service: 'sudo systemctl start mysql.service' +``` +### Cached Tools +#### Go +- 1.17.9 +- 1.18.1 + +#### Node.js +- 14.19.1 +- 16.15.0 + +#### PyPy +- 3.7.13 [PyPy 7.3.9] +- 3.8.13 [PyPy 7.3.9] +- 3.9.12 [PyPy 7.3.9] + +#### Python +- 3.7.13 +- 3.8.12 +- 3.9.12 +- 3.10.4 + +#### Ruby +- 3.1.2 + +#### Environment variables +| Name | Value | Architecture | +| --------------- | ---------------------------------- | ------------ | +| GOROOT_1_17_X64 | /opt/hostedtoolcache/go/1.17.9/x64 | x64 | +| GOROOT_1_18_X64 | /opt/hostedtoolcache/go/1.18.1/x64 | x64 | + +### PowerShell Tools +- PowerShell 7.2.3 + +#### PowerShell Modules +| Module | Version | +| ---------------- | ------- | +| MarkdownPS | 1.9 | +| Microsoft.Graph | 1.9.5 | +| Pester | 5.3.3 | +| PSScriptAnalyzer | 1.20.0 | + +#### Az PowerShell Modules +- 7.3.2 + +### Web Servers +| Name | Version | ConfigFile | ServiceStatus | ListenPort | +| ------- | ------- | ------------------------- | ------------- | ---------- | +| apache2 | 2.4.52 | /etc/apache2/apache2.conf | inactive | 80 | +| nginx | 1.18.0 | /etc/nginx/nginx.conf | inactive | 80 | + +### Cached Docker images +| Repository:Tag | Digest | Created | +| ----------------------- | ------------------------------------------------------------------------ | ---------- | +| alpine:3.14 | sha256:06b5d462c92fc39303e6363c65e074559f8d6b1363250027ed5053557e3398c5 | 2022-04-05 | +| alpine:3.15 | sha256:4edbd2beb5f78b1014028f4fbb99f3237d9561100b6881aabbf5acce2c4f9454 | 2022-04-05 | +| buildpack-deps:bullseye | sha256:f26b9bcb6722fd59888caf4f4c1d4990799e3e83d804a83b7b58b4be949dc75e | 2022-04-20 | +| buildpack-deps:buster | sha256:b971efe3151fcfb10d0b7dfc739d081a9f9d9413195aa9b80224a66f4a651b4a | 2022-04-20 | +| debian:10 | sha256:ebe4b9831fb22dfa778de4ffcb8ea0ad69b5d782d4e86cab14cc1fded5d8e761 | 2022-04-20 | +| debian:11 | sha256:6846593d7d8613e5dcc68c8f7d8b8e3179c7f3397b84a47c5b2ce989ef1075a0 | 2022-04-20 | +| moby/buildkit:latest | sha256:3fbc9b9d9a74ab650eea43610ed880e51cdc05282d61f83c2e0a3b2e9ed3a344 | 2022-04-27 | +| node:14 | sha256:2f39686f6d0b2687550659367fa11f56018a0f782b7e30f1a0ea56b11dece124 | 2022-04-20 | +| node:14-alpine | sha256:8845b4f88f64f8c56a39236648ba22946e806a6153c10911f77b70e5a2edb4ca | 2022-04-05 | +| node:16 | sha256:a6c217d7c8f001dc6fc081d55c2dd7fb3fefe871d5aa7be9c0c16bd62bea8e0c | 2022-04-27 | +| node:16-alpine | sha256:1a9a71ea86aad332aa7740316d4111ee1bd4e890df47d3b5eff3e5bded3b3d10 | 2022-04-27 | +| ubuntu:18.04 | sha256:d21b6ba9e19feffa328cb3864316e6918e30acfd55e285b5d3df1d8ca3c7fd3f | 2022-04-29 | +| ubuntu:20.04 | sha256:47f14534bda344d9fe6ffd6effb95eefe579f4be0d508b7445cf77f61a0e5724 | 2022-04-29 | +| ubuntu:22.04 | sha256:26c68657ccce2cb0a31b330cb0be2b5e108d467f641c62e13ab40cbec258c68d | 2022-04-29 | + +### Installed apt packages +| Name | Version | +| ---------------------- | --------------------------------- | +| acl | 2.3.1-1 | +| aria2 | 1.36.0-1 | +| autoconf | 2.71-2 | +| automake | 1:1.16.5-1.3 | +| binutils | 2.38-3ubuntu1 | +| bison | 2:3.8.2+dfsg-1build1 | +| brotli | 1.0.9-2build6 | +| build-essential | 12.9ubuntu3 | +| bzip2 | 1.0.8-5build1 | +| coreutils | 8.32-4.1ubuntu1 | +| curl | 7.81.0-1ubuntu1.1 | +| dbus | 1.12.20-2ubuntu4 | +| dnsutils | 1:9.18.1-1ubuntu1 | +| dpkg | 1.21.1ubuntu2 | +| fakeroot | 1.28-1ubuntu1 | +| file | 1:5.41-3 | +| flex | 2.6.4-8build2 | +| fonts-noto-color-emoji | 2.034-1 | +| ftp | 20210827-4build1 | +| gnupg2 | 2.2.27-3ubuntu2 | +| haveged | 1.9.14-1ubuntu1 | +| imagemagick | 8:6.9.11.60+dfsg-1.3build2 | +| iproute2 | 5.15.0-1ubuntu2 | +| iputils-ping | 3:20211215-1 | +| jq | 1.6-2.1ubuntu3 | +| lib32z1 | 1:1.2.11.dfsg-2ubuntu9 | +| libc++-dev | 1:14.0-55\~exp2 | +| libc++abi-dev | 1:14.0-55\~exp2 | +| libcurl4 | 7.81.0-1ubuntu1.1 | +| libgbm-dev | 22.0.1-1ubuntu2 | +| libgconf-2-4 | 3.2.6-7ubuntu2 | +| libgsl-dev | 2.7.1+dfsg-3 | +| libgtk-3-0 | 3.24.33-1ubuntu1 | +| libmagic-dev | 1:5.41-3 | +| libmagickcore-dev | 8:6.9.11.60+dfsg-1.3build2 | +| libmagickwand-dev | 8:6.9.11.60+dfsg-1.3build2 | +| libsecret-1-dev | 0.20.5-2 | +| libsqlite3-dev | 3.37.2-2 | +| libssl-dev | 3.0.2-0ubuntu1.1 | +| libtool | 2.4.6-15build2 | +| libunwind8 | 1.3.2-2build2 | +| libxkbfile-dev | 1:1.1.0-1build3 | +| libxss1 | 1:1.2.3-1build2 | +| locales | 2.35-0ubuntu3 | +| m4 | 1.4.18-5ubuntu2 | +| mediainfo | 22.03-1 | +| mercurial | 6.1.1-1ubuntu1 | +| net-tools | 1.60+git20181103.0eebece-1ubuntu5 | +| netcat | 1.218-4ubuntu1 | +| openssh-client | 1:8.9p1-3 | +| p7zip-full | 16.02+dfsg-8 | +| p7zip-rar | 16.02-3build1 | +| parallel | 20210822+ds-2 | +| pass | 1.7.4-5 | +| patchelf | 0.14.3-1 | +| pkg-config | 0.29.2-1ubuntu3 | +| pollinate | 4.33-3ubuntu2 | +| python-is-python3 | 3.9.2-2 | +| rpm | 4.17.0+dfsg1-4build1 | +| rsync | 3.2.3-8ubuntu3 | +| shellcheck | 0.8.0-2 | +| sphinxsearch | 2.2.11-8 | +| sqlite3 | 3.37.2-2 | +| ssh | 1:8.9p1-3 | +| sshpass | 1.09-1 | +| subversion | 1.14.1-3build4 | +| sudo | 1.9.9-1ubuntu2 | +| swig | 4.0.2-1ubuntu1 | +| telnet | 0.17-44build1 | +| texinfo | 6.8-4build1 | +| time | 1.9-0.1build2 | +| tk | 8.6.11+1build2 | +| tzdata | 2022a-0ubuntu1 | +| unzip | 6.0-26ubuntu3 | +| upx | 3.96-3 | +| wget | 1.21.2-2ubuntu1 | +| xorriso | 1.5.4-2 | +| xvfb | 2:21.1.3-2ubuntu2 | +| xz-utils | 5.2.5-2ubuntu1 | +| zip | 3.0-12build2 | +| zsync | 0.6.2-3ubuntu1 | + From d87f781615d14351fcc90eb8270c8a44841b049c Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Thu, 5 May 2022 11:57:34 +0400 Subject: [PATCH 1116/3485] Add ubuntu 22 to issue templates (#5492) --- .github/ISSUE_TEMPLATE/announcement.yml | 1 + .github/ISSUE_TEMPLATE/bug-report.yml | 1 + .github/ISSUE_TEMPLATE/tool-request.yml | 1 + 3 files changed, 3 insertions(+) diff --git a/.github/ISSUE_TEMPLATE/announcement.yml b/.github/ISSUE_TEMPLATE/announcement.yml index 28632ddd1c4f..08f3f7325e62 100644 --- a/.github/ISSUE_TEMPLATE/announcement.yml +++ b/.github/ISSUE_TEMPLATE/announcement.yml @@ -32,6 +32,7 @@ body: options: - label: Ubuntu 18.04 - label: Ubuntu 20.04 + - label: Ubuntu 22.04 - label: macOS 10.15 - label: macOS 11 - label: macOS 12 diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml index 0ca377fdca02..e9aaf723dca8 100644 --- a/.github/ISSUE_TEMPLATE/bug-report.yml +++ b/.github/ISSUE_TEMPLATE/bug-report.yml @@ -14,6 +14,7 @@ body: options: - label: Ubuntu 18.04 - label: Ubuntu 20.04 + - label: Ubuntu 22.04 - label: macOS 10.15 - label: macOS 11 - label: macOS 12 diff --git a/.github/ISSUE_TEMPLATE/tool-request.yml b/.github/ISSUE_TEMPLATE/tool-request.yml index af2e04785460..b55b075a84fb 100644 --- a/.github/ISSUE_TEMPLATE/tool-request.yml +++ b/.github/ISSUE_TEMPLATE/tool-request.yml @@ -53,6 +53,7 @@ body: options: - label: Ubuntu 18.04 - label: Ubuntu 20.04 + - label: Ubuntu 22.04 - label: macOS 10.15 - label: macOS 11 - label: macOS 12 From ad831b8f26dfdbedce8a9a8e4ca9ab86499e5936 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 5 May 2022 10:04:47 +0000 Subject: [PATCH 1117/3485] Ubuntu 20.04 (20220503 update) (#5474) * Updating readme file for ubuntu20 version 20220503.1 * Update Ubuntu2004-Readme.md Updated kubectl version. Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Dusko Dobranic <101048884+ddobranic@users.noreply.github.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2004-Readme.md | 93 +++++++++++++++---------------- 1 file changed, 44 insertions(+), 49 deletions(-) diff --git a/images/linux/Ubuntu2004-Readme.md b/images/linux/Ubuntu2004-Readme.md index d4f02cdc6d15..b5e287ae9726 100644 --- a/images/linux/Ubuntu2004-Readme.md +++ b/images/linux/Ubuntu2004-Readme.md @@ -1,10 +1,6 @@ -| Announcements | -|-| -| [[Ubuntu] PHP 7.1 will be removed from Ubuntu 18 on April, 18](https://github.com/actions/virtual-environments/issues/5326) | -*** # Ubuntu 20.04.4 LTS - Linux kernel version: 5.13.0-1022-azure -- Image Version: 20220425.1 +- Image Version: 20220503.1 ## Installed Software ### Language and Runtime @@ -19,7 +15,7 @@ - Kotlin 1.6.21-release-334 - Mono 6.12.0.122 (apt source repository: https://download.mono-project.com/repo/ubuntu stable-focal main) - MSBuild 16.6.0.15201 (from /usr/lib/mono/msbuild/15.0/bin/MSBuild.dll) -- Node 16.14.2 +- Node 16.15.0 - Perl 5.30.0 - Python 3.8.10 - Python3 3.8.10 @@ -29,14 +25,14 @@ ### Package Management - cpan 1.64 - Helm 3.8.2 -- Homebrew 3.4.8 +- Homebrew 3.4.10 - Miniconda 4.11.0 -- Npm 8.5.0 +- Npm 8.5.5 - Pip 20.0.2 - Pip3 20.0.2 - Pipx 1.0.0 - RubyGems 3.1.2 -- Vcpkg (build from master \<d4a516114>) +- Vcpkg (build from master \<b98afc9f1>) - Yarn 1.22.18 #### Environment variables @@ -58,10 +54,10 @@ - AzCopy 10.14.1 (available by `azcopy` and `azcopy10` aliases) - Bazel 5.1.1 - Bazelisk 1.11.0 -- Bicep 0.5.6 +- Bicep 0.6.1 - Buildah 1.21.3 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - CMake 3.23.1 -- CodeQL Action Bundle 2.8.5 +- CodeQL Action Bundle 2.9.0 - Docker Compose v1 1.29.2 - Docker Compose v2 2.4.1+azure-1 - Docker-Buildx 0.8.2 @@ -72,11 +68,11 @@ - Git LFS 3.1.4 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.6.0 - Haveged 1.9.1 -- Heroku 7.60.1 -- HHVM (HipHop VM) 4.158.0 +- Heroku 7.60.2 +- HHVM (HipHop VM) 4.159.0 - jq 1.6 - Kind 0.12.0 -- Kubectl 1.23.6 +- Kubectl 1.24.0 - Kustomize 4.5.4 - Leiningen 2.9.8 - MediaInfo 19.09 @@ -90,42 +86,42 @@ - Parcel 2.5.0 - PhantomJS 2.1.1 - Podman 3.4.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- Pulumi 3.30.0 -- R 4.1.3 +- Pulumi 3.31.0 +- R 4.2.0 - Skopeo 1.3.0 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 - Terraform 1.1.9 - yamllint 1.26.3 -- yq 4.24.5 +- yq 4.25.1 - zstd 1.5.2 (homebrew) ### CLI Tools - Alibaba Cloud CLI 3.0.118 -- AWS CLI 2.5.8 +- AWS CLI 2.6.1 - AWS CLI Session manager plugin 1.2.312.0 -- AWS SAM CLI 1.46.0 -- Azure CLI (azure-cli) 2.35.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) +- AWS SAM CLI 1.47.0 +- Azure CLI (azure-cli) 2.36.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.25.0 -- GitHub CLI 2.8.0 +- GitHub CLI 2.9.0 - Google Cloud SDK 369.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 10.0.0 -- OpenShift CLI 4.10.11 +- Netlify CLI 10.1.0 +- OpenShift CLI 4.10.12 - ORAS CLI 0.12.0 -- Vercel CLI 24.1.0 +- Vercel CLI 24.2.0 ### Java -| Version | Vendor | Environment Variable | -| ------------------- | --------------- | -------------------- | -| 8.0.322+6 | Eclipse Temurin | JAVA_HOME_8_X64 | -| 11.0.14+1 (default) | Eclipse Temurin | JAVA_HOME_11_X64 | -| 17.0.2+8 | Eclipse Temurin | JAVA_HOME_17_X64 | +| Version | Vendor | Environment Variable | +| -------------------- | --------------- | -------------------- | +| 8.0.322+6 | Eclipse Temurin | JAVA_HOME_8_X64 | +| 11.0.15+10 (default) | Eclipse Temurin | JAVA_HOME_11_X64 | +| 17.0.3+7 | Eclipse Temurin | JAVA_HOME_17_X64 | ### GraalVM -| Version | Environment variables | -| ----------- | --------------------- | -| CE 22.0.0.2 | GRAALVM_11_ROOT | +| Version | Environment variables | +| --------- | --------------------- | +| CE 22.1.0 | GRAALVM_11_ROOT | ### PHP | Tool | Version | @@ -157,11 +153,11 @@ - Rustfmt 1.4.38 ### Browsers and Drivers -- Google Chrome 100.0.4896.127 -- ChromeDriver 100.0.4896.60 +- Google Chrome 101.0.4951.54 +- ChromeDriver 101.0.4951.41 +- Chromium 101.0.4951.0 - Mozilla Firefox 99.0 - Geckodriver 0.31.0 -- Chromium 100.0.4896.0 - Selenium server 4.1.0 #### Environment variables @@ -175,7 +171,7 @@ - 3.1.120 3.1.202 3.1.302 3.1.418 5.0.104 5.0.213 5.0.303 5.0.407 6.0.202 ### .NET tools -- nbgv 3.4.255+06fb9182bf +- nbgv 3.5.103+351d94e36c ### Databases - MongoDB 5.0.8 (apt source repository: https://repo.mongodb.org/apt/ubuntu) @@ -189,7 +185,7 @@ PostgreSQL service is disabled by default. Use the following command as a part of your job to start the service: 'sudo systemctl start postgresql.service' ``` #### MySQL -- MySQL 8.0.28-0ubuntu0.20.04.3 +- MySQL 8.0.29-0ubuntu0.20.04.2 - MySQL Server (user:root password:root) ``` @@ -208,7 +204,7 @@ #### Node.js - 12.22.12 - 14.19.1 -- 16.14.2 +- 16.15.0 #### PyPy - 2.7.18 [PyPy 7.3.9] @@ -220,7 +216,7 @@ #### Python - 2.7.18 - 3.6.15 -- 3.7.12 +- 3.7.13 - 3.8.12 - 3.9.12 - 3.10.4 @@ -240,14 +236,14 @@ | GOROOT_1_18_X64 | /opt/hostedtoolcache/go/1.18.1/x64 | x64 | ### PowerShell Tools -- PowerShell 7.2.2 +- PowerShell 7.2.3 #### PowerShell Modules | Module | Version | | ---------------- | ------- | | MarkdownPS | 1.9 | | Microsoft.Graph | 1.9.5 | -| Pester | 5.3.2 | +| Pester | 5.3.3 | | PSScriptAnalyzer | 1.20.0 | #### Az PowerShell Modules @@ -297,16 +293,16 @@ | debian:10 | sha256:ebe4b9831fb22dfa778de4ffcb8ea0ad69b5d782d4e86cab14cc1fded5d8e761 | 2022-04-20 | | debian:11 | sha256:6846593d7d8613e5dcc68c8f7d8b8e3179c7f3397b84a47c5b2ce989ef1075a0 | 2022-04-20 | | debian:9 | sha256:cebe6e1c30384958d471467e231f740e8f0fd92cbfd2a435a186e9bada3aee1c | 2022-04-20 | -| moby/buildkit:latest | sha256:bd37f0b5567084cd6f4b1c73b7fed9e12258441d064cc2add29a7dd32243ff86 | 2022-04-07 | +| moby/buildkit:latest | sha256:3fbc9b9d9a74ab650eea43610ed880e51cdc05282d61f83c2e0a3b2e9ed3a344 | 2022-04-27 | | node:12 | sha256:01627afeb110b3054ba4a1405541ca095c8bfca1cb6f2be9479c767a2711879e | 2022-04-20 | | node:12-alpine | sha256:d4b15b3d48f42059a15bd659be60afe21762aae9d6cbea6f124440895c27db68 | 2022-04-11 | | node:14 | sha256:2f39686f6d0b2687550659367fa11f56018a0f782b7e30f1a0ea56b11dece124 | 2022-04-20 | | node:14-alpine | sha256:8845b4f88f64f8c56a39236648ba22946e806a6153c10911f77b70e5a2edb4ca | 2022-04-05 | -| node:16 | sha256:6e54786b2ad01667d46524e82806298714f50d2be72b39706770aed55faedbd7 | 2022-04-20 | -| node:16-alpine | sha256:28bed508446db2ee028d08e76fb47b935defa26a84986ca050d2596ea67fd506 | 2022-04-05 | +| node:16 | sha256:a6c217d7c8f001dc6fc081d55c2dd7fb3fefe871d5aa7be9c0c16bd62bea8e0c | 2022-04-27 | +| node:16-alpine | sha256:1a9a71ea86aad332aa7740316d4111ee1bd4e890df47d3b5eff3e5bded3b3d10 | 2022-04-27 | | ubuntu:16.04 | sha256:20858ebbc96215d6c3c574f781133ebffdc7c18d98af4f294cc4c04871a6fe61 | 2021-08-31 | -| ubuntu:18.04 | sha256:627b1184c9100a22ba9dcf531908b9e24af99fa54e45c10f57852fb890a57ea6 | 2022-04-21 | -| ubuntu:20.04 | sha256:115822d64890aae5cde3c1e85ace4cc97308bb1fd884dac62f4db0a16dbddb36 | 2022-04-21 | +| ubuntu:18.04 | sha256:d21b6ba9e19feffa328cb3864316e6918e30acfd55e285b5d3df1d8ca3c7fd3f | 2022-04-29 | +| ubuntu:20.04 | sha256:47f14534bda344d9fe6ffd6effb95eefe579f4be0d508b7445cf77f61a0e5724 | 2022-04-29 | ### Installed apt packages | Name | Version | @@ -321,7 +317,7 @@ | build-essential | 12.8ubuntu1.1 | | bzip2 | 1.0.8-2 | | coreutils | 8.30-3ubuntu2 | -| curl | 7.68.0-1ubuntu2.7 | +| curl | 7.68.0-1ubuntu2.10 | | dbus | 1.12.16-2ubuntu2.1 | | dnsutils | 1:9.16.1-0ubuntu2.10 | | dpkg | 1.19.7ubuntu3 | @@ -339,7 +335,7 @@ | lib32z1 | 1:1.2.11.dfsg-2ubuntu1.3 | | libc++-dev | 1:10.0-50\~exp1 | | libc++abi-dev | 1:10.0-50\~exp1 | -| libcurl4 | 7.68.0-1ubuntu2.7 | +| libcurl4 | 7.68.0-1ubuntu2.10 | | libgbm-dev | 21.2.6-0ubuntu0.1\~20.04.2 | | libgconf-2-4 | 3.2.6-6ubuntu1 | | libgsl-dev | 2.5+dfsg-6build1 | @@ -392,4 +388,3 @@ | zip | 3.0-11build1 | | zsync | 0.6.2-3ubuntu1 | - From ad4871d86cbdb95f13e9a5a7f1c146ee1bf80342 Mon Sep 17 00:00:00 2001 From: Dusko Dobranic <101048884+ddobranic@users.noreply.github.com> Date: Thu, 5 May 2022 16:04:43 +0200 Subject: [PATCH 1118/3485] Fix kubectl version in software report (#5491) --- images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 index af06164c4640..d14a9adc0c89 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 @@ -87,8 +87,7 @@ function Get-JQVersion { } function Get-KubectlVersion { - $(kubectl version --client=true --short=true) -match "Client Version: v(?<version>.+)" | Out-Null - $kubectlVersion = $Matches.Version + $kubectlVersion = (kubectl version --client --output=json | ConvertFrom-Json).clientVersion.gitVersion.Replace('v','') return "Kubectl $kubectlVersion" } From ea50637d16e6911b243277607feb650be85c8b3b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 5 May 2022 14:30:24 +0000 Subject: [PATCH 1119/3485] Updating readme file for win22 version 20220503.1 (#5475) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2022-Readme.md | 34 ++++++++++++++++---------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/images/win/Windows2022-Readme.md b/images/win/Windows2022-Readme.md index 5105212e1e7e..7f2c32efe252 100644 --- a/images/win/Windows2022-Readme.md +++ b/images/win/Windows2022-Readme.md @@ -4,7 +4,7 @@ *** # Microsoft Windows Server 2022 Datacenter - OS Version: 10.0.20348 Build 643 -- Image Version: 20220426.1 +- Image Version: 20220503.1 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -32,7 +32,7 @@ - pip 22.0.4 (python 3.9) - Pipx 1.0.0 - RubyGems 3.2.33 -- Vcpkg (build from master \<9f643818c>) +- Vcpkg (build from master \<b98afc9f1>) - Yarn 1.22.18 #### Environment variables @@ -55,7 +55,7 @@ - Bicep 0.5.6 - Cabal 3.6.2.0 - CMake 3.23.1 -- CodeQL Action Bundle 2.8.5 +- CodeQL Action Bundle 2.9.0 - Docker 20.10.7 - Docker-compose 1.29.2 - Docker-wincred 0.6.4 @@ -72,13 +72,13 @@ - NSIS v3.08 - OpenSSL 1.1.1 - Packer 1.8.0 -- Pulumi v3.30.0 +- Pulumi v3.31.0 - R 4.2.0 - Service Fabric SDK 9.0.1017.9590 - Stack 2.7.5 - Subversion (SVN) 1.14.2 - Swig 4.0.2 -- VSWhere 3.0.1 +- VSWhere 3.0.2 - WinAppDriver 1.2.2009.02003 - WiX Toolset v3.11.2.4516 - yamllint 1.26.3 @@ -86,8 +86,8 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.118 -- AWS CLI 2.5.8 -- AWS SAM CLI 1.46.0 +- AWS CLI 2.6.1 +- AWS SAM CLI 1.48.0 - AWS Session Manager CLI 1.2.312.0 - Azure CLI 2.36.0 - Azure DevOps CLI extension 0.25.0 @@ -109,11 +109,11 @@ - Rustfmt 1.4.38 ### Browsers and webdrivers -- Google Chrome 101.0.4951.41 -- Chrome Driver 101.0.4951.15 -- Microsoft Edge 100.0.1185.50 -- Microsoft Edge Driver 100.0.1185.50 -- Mozilla Firefox 99.0.1 +- Google Chrome 101.0.4951.54 +- Chrome Driver 101.0.4951.41 +- Microsoft Edge 101.0.1210.32 +- Microsoft Edge Driver 101.0.1210.32 +- Mozilla Firefox 100.0 - Gecko Driver 0.31.0 - IE Driver 3.150.1.1 - Selenium server 4.1.0 @@ -163,7 +163,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | ------- | ------------ | | 12.22.12 | x64 | | 14.19.1 | x64 | -| 16.14.2 | x64 | +| 16.15.0 | x64 | #### Python | Version | Architecture | @@ -478,10 +478,10 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 4.8 ### .NET tools -- nbgv 3.4.255+06fb9182bf +- nbgv 3.5.103+351d94e36c ### PowerShell Tools -- PowerShell 7.2.2 +- PowerShell 7.2.3 #### Azure Powershell Modules | Module | Version | Path | @@ -498,11 +498,11 @@ All other versions are saved but not installed. #### Powershell Modules | Module | Version | | ------------------ | ---------------- | -| AWSPowerShell | 4.1.71 | +| AWSPowerShell | 4.1.76 | | DockerMsftProvider | 1.0.0.8 | | MarkdownPS | 1.9 | | Microsoft.Graph | 1.9.5 | -| Pester | 3.4.0<br>5.3.2 | +| Pester | 3.4.0<br>5.3.3 | | PowerShellGet | 1.0.0.1<br>2.2.5 | | PSScriptAnalyzer | 1.20.0 | | PSWindowsUpdate | 2.2.0.3 | From df8580f2f095420873177e17932da1de0799f827 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 5 May 2022 14:51:29 +0000 Subject: [PATCH 1120/3485] Updating readme file for win19 version 20220503.1 (#5477) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2019-Readme.md | 141 ++++++++++++++++--------------- 1 file changed, 71 insertions(+), 70 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index a15a962f715c..a3916c79f8b1 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -1,10 +1,10 @@ | Announcements | |-| -| [[All OSs] Go versions less than 1.16 will be removed and the default will be set to 1.17 on April, 11](https://github.com/actions/virtual-environments/issues/5280) | +| [[Azure DevOps] Windows-2016 environment removal postponed until June 30, 2022](https://github.com/actions/virtual-environments/issues/5403) | *** # Microsoft Windows Server 2019 Datacenter -- OS Version: 10.0.17763 Build 2686 -- Image Version: 20220410.1 +- OS Version: 10.0.17763 Build 2803 +- Image Version: 20220503.1 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -12,27 +12,27 @@ ## Installed Software ### Language and Runtime - Bash 4.4.23(2)-release -- Go 1.17.8 +- Go 1.17.9 - Julia 1.7.2 -- Kotlin 1.6.20 +- Kotlin 1.6.21 - LLVM 13.0.1 - Node 16.14.2 - Perl 5.32.1 -- PHP 8.1.4 +- PHP 8.1.5 - Python 3.7.9 - Ruby 2.5.9p229 ### Package Management - Chocolatey 1.1.0 -- Composer 2.3.4 -- Helm 3.8.0 +- Composer 2.3.5 +- Helm 3.8.2 - Miniconda 4.11.0 (pre-installed on the image but not added to PATH) - NPM 8.5.0 - NuGet 6.1.0.106 - pip 22.0.4 (python 3.7) - Pipx 1.0.0 - RubyGems 2.7.6.3 -- Vcpkg (build from master \<f6af75acc>) +- Vcpkg (build from master \<b98afc9f1>) - Yarn 1.22.18 #### Environment variables @@ -55,47 +55,47 @@ - Bazelisk 1.11.0 - Bicep 0.5.6 - Cabal 3.6.2.0 -- CMake 3.23.0 -- CodeQL Action Bundle 2.8.5 +- CMake 3.23.1 +- CodeQL Action Bundle 2.9.0 - Docker 20.10.7 - Docker-compose 1.29.2 - Docker-wincred 0.6.4 - ghc 9.2.2 - Git 2.35.1.windows.2 - Git LFS 3.0.2 -- Google Cloud SDK 380.0.0 -- InnoSetup 6.2.0 +- Google Cloud SDK 384.0.0 +- InnoSetup 6.2.1 - jq 1.6 - Kind 0.12.0 -- Kubectl 1.23.5 +- Kubectl 1.23.6 - Mercurial 5.0 - Mingw-w64 8.1.0 - Newman 5.3.2 - NSIS v3.08 - OpenSSL 1.1.1 - Packer 1.8.0 -- Parcel 2.4.1 -- Pulumi v3.28.0 -- R 4.1.3 -- Service Fabric SDK 8.2.1571.9590 +- Parcel 2.5.0 +- Pulumi v3.31.0 +- R 4.2.0 +- Service Fabric SDK 9.0.1017.9590 - Stack 2.7.5 -- Subversion (SVN) 1.14.1 +- Subversion (SVN) 1.14.2 - Swig 4.0.2 -- VSWhere 3.0.1 +- VSWhere 3.0.2 - WinAppDriver 1.2.2009.02003 - WiX Toolset v3.11.2.4516 - yamllint 1.26.3 - zstd 1.5.2 ### CLI Tools -- Alibaba Cloud CLI 3.0.115 -- AWS CLI 2.5.4 -- AWS SAM CLI 1.46.0 +- Alibaba Cloud CLI 3.0.118 +- AWS CLI 2.6.1 +- AWS SAM CLI 1.48.0 - AWS Session Manager CLI 1.2.312.0 -- Azure CLI 2.35.0 +- Azure CLI 2.36.0 - Azure DevOps CLI extension 0.25.0 - Cloud Foundry CLI 6.53.0 -- GitHub CLI 2.7.0 +- GitHub CLI 2.9.0 - Hub CLI 2.14.2 ### Rust Tools @@ -107,18 +107,18 @@ #### Packages - bindgen 0.59.2 - cargo-audit 0.16.0 -- cargo-outdated 0.11.0 -- cbindgen 0.21.0 +- cargo-outdated 0.11.1 +- cbindgen 0.23.0 - Clippy 0.1.60 - Rustfmt 1.4.38 ### Browsers and webdrivers -- Google Chrome 100.0.4896.75 -- Chrome Driver 100.0.4896.60 -- Microsoft Edge 100.0.1185.36 -- Microsoft Edge Driver 100.0.1185.36 -- Mozilla Firefox 99.0 -- Gecko Driver 0.30.0 +- Google Chrome 101.0.4951.54 +- Chrome Driver 101.0.4951.41 +- Microsoft Edge 101.0.1210.32 +- Microsoft Edge Driver 101.0.1210.32 +- Mozilla Firefox 100.0 +- Gecko Driver 0.31.0 - IE Driver 3.150.1.1 - Selenium server 4.1.0 @@ -134,9 +134,9 @@ | Version | Vendor | Environment Variable | | ------------------- | --------------- | -------------------- | | 8.0.322+6 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | -| 11.0.14+101 | Eclipse Temurin | JAVA_HOME_11_X64 | +| 11.0.15+10 | Eclipse Temurin | JAVA_HOME_11_X64 | | 13.0.2+8.1 | Adopt OpenJDK | JAVA_HOME_13_X64 | -| 17.0.2+8 | Eclipse Temurin | JAVA_HOME_17_X64 | +| 17.0.3+7 | Eclipse Temurin | JAVA_HOME_17_X64 | ### Shells | Name | Target | @@ -163,15 +163,15 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Version | Architecture | Environment Variable | | ------- | ------------ | -------------------- | | 1.16.15 | x64 | GOROOT_1_16_X64 | -| 1.17.8 (Default) | x64 | GOROOT_1_17_X64 | -| 1.18.0 | x64 | GOROOT_1_18_X64 | +| 1.17.9 (Default) | x64 | GOROOT_1_17_X64 | +| 1.18.1 | x64 | GOROOT_1_18_X64 | #### Node | Version | Architecture | | ------- | ------------ | | 12.22.12 | x64 | | 14.19.1 | x64 | -| 16.14.2 | x64 | +| 16.15.0 | x64 | #### Python | Version | Architecture | @@ -188,9 +188,10 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | ------- | ------------ | | 2.4.10 | x64 | | 2.5.9 (Default) | x64 | -| 2.6.9 | x64 | -| 2.7.5 | x64 | -| 3.0.3 | x64 | +| 2.6.10 | x64 | +| 2.7.6 | x64 | +| 3.0.4 | x64 | +| 3.1.2 | x64 | #### PyPy | Python Version | PyPy Version | @@ -217,12 +218,12 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### MongoDB | Version | ServiceName | ServiceStatus | ServiceStartType | | ------- | ----------- | ------------- | ---------------- | -| 5.0.6.0 | MongoDB | Running | Automatic | +| 5.0.8.0 | MongoDB | Running | Automatic | ### Database tools - Azure CosmosDb Emulator 2.14.6.0 - DacFx 16.0.5400.1 -- MySQL 5.7.37.0 +- MySQL 5.7.38.0 - SQL OLEDB Driver 18.6.3.0 - SQLPS 1.0 @@ -235,12 +236,12 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Visual Studio Enterprise 2019 | Name | Version | Path | | ----------------------------- | --------------- | -------------------------------------------------------------- | -| Visual Studio Enterprise 2019 | 16.11.32228.343 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | +| Visual Studio Enterprise 2019 | 16.11.32413.511 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | #### Workloads, components and extensions: | Package | Version | | ------------------------------------------------------------------------- | --------------- | -| Component.Android.NDK.R16B | 16.11.32228.297 | +| Component.Android.NDK.R16B | 16.11.32413.511 | | Component.Android.SDK25.Private | 16.0.28625.61 | | Component.Android.SDK30 | 16.10.31205.252 | | Component.Ant | 1.9.3.8 | @@ -249,7 +250,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Component.MDD.Android | 16.0.28517.75 | | Component.MDD.Linux | 16.5.29515.121 | | Component.MDD.Linux.GCC.arm | 16.5.29515.121 | -| Component.Microsoft.VisualStudio.LiveShare | 1.0.4438 | +| Component.Microsoft.VisualStudio.LiveShare | 1.0.4440 | | Component.Microsoft.VisualStudio.RazorExtension | 16.10.31205.252 | | Component.Microsoft.VisualStudio.Tools.Applications | 16.0.31110.1 | | Component.Microsoft.VisualStudio.Web.AzureFunctions | 16.10.31205.252 | @@ -295,9 +296,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.Net.ComponentGroup.DevelopmentPrerequisites | 16.3.29207.166 | | Microsoft.Net.ComponentGroup.TargetingPacks.Common | 16.0.28516.191 | | Microsoft.NetCore.Component.DevelopmentTools | 16.10.31303.231 | -| Microsoft.NetCore.Component.Runtime.3.1 | 16.11.32228.343 | -| Microsoft.NetCore.Component.Runtime.5.0 | 16.11.32228.343 | -| Microsoft.NetCore.Component.SDK | 16.11.32228.343 | +| Microsoft.NetCore.Component.Runtime.3.1 | 16.11.32406.258 | +| Microsoft.NetCore.Component.Runtime.5.0 | 16.11.32406.258 | +| Microsoft.NetCore.Component.SDK | 16.11.32406.258 | | Microsoft.NetCore.Component.Web | 16.10.31303.231 | | Microsoft.VisualStudio.Component.AppInsights.Tools | 16.5.29515.121 | | Microsoft.VisualStudio.Component.AspNet45 | 16.10.31205.252 | @@ -392,9 +393,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Component.VC.Runtimes.x86.x64.Spectre | 16.10.31205.252 | | Microsoft.VisualStudio.Component.VC.TestAdapterForBoostTest | 16.0.28517.75 | | Microsoft.VisualStudio.Component.VC.TestAdapterForGoogleTest | 16.0.28517.75 | -| Microsoft.VisualStudio.Component.VC.Tools.ARM | 16.10.31205.252 | -| Microsoft.VisualStudio.Component.VC.Tools.ARM64 | 16.10.31205.252 | -| Microsoft.VisualStudio.Component.VC.Tools.x86.x64 | 16.11.31317.239 | +| Microsoft.VisualStudio.Component.VC.Tools.ARM | 16.11.32406.258 | +| Microsoft.VisualStudio.Component.VC.Tools.ARM64 | 16.11.32406.258 | +| Microsoft.VisualStudio.Component.VC.Tools.x86.x64 | 16.11.32406.258 | | Microsoft.VisualStudio.Component.VC.v141.ARM | 16.10.31205.252 | | Microsoft.VisualStudio.Component.VC.v141.ARM.Spectre | 16.5.29515.121 | | Microsoft.VisualStudio.Component.VC.v141.ARM64 | 16.10.31205.252 | @@ -442,9 +443,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.ComponentGroup.Web | 16.10.31205.180 | | Microsoft.VisualStudio.ComponentGroup.Web.Client | 16.10.31205.180 | | Microsoft.VisualStudio.ComponentGroup.Web.CloudTools | 16.10.31205.180 | -| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions | 16.10.31205.180 | -| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.CMake | 16.10.31205.180 | -| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.TemplateEngine | 16.10.31205.180 | +| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions | 16.11.32413.511 | +| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.CMake | 16.11.32413.511 | +| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.TemplateEngine | 16.11.32413.511 | | Microsoft.VisualStudio.Workload.Azure | 16.11.31503.43 | | Microsoft.VisualStudio.Workload.CoreEditor | 16.10.31205.180 | | Microsoft.VisualStudio.Workload.Data | 16.0.28720.110 | @@ -505,17 +506,17 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### .NET Core SDK `Location C:\Program Files\dotnet\sdk` -- 3.1.120 3.1.202 3.1.302 3.1.417 5.0.104 5.0.212 5.0.303 5.0.406 +- 3.1.120 3.1.202 3.1.302 3.1.418 5.0.104 5.0.213 5.0.303 5.0.407 ### .NET Core Runtime `Location: C:\Program Files\dotnet\shared\Microsoft.AspNetCore.App` -- 3.1.4 3.1.6 3.1.20 3.1.23 5.0.4 5.0.9 5.0.15 +- 3.1.4 3.1.6 3.1.20 3.1.24 5.0.4 5.0.9 5.0.16 `Location: C:\Program Files\dotnet\shared\Microsoft.NETCore.App` -- 3.1.4 3.1.6 3.1.20 3.1.23 5.0.4 5.0.9 5.0.15 +- 3.1.4 3.1.6 3.1.20 3.1.24 5.0.4 5.0.9 5.0.16 `Location: C:\Program Files\dotnet\shared\Microsoft.WindowsDesktop.App` -- 3.1.4 3.1.6 3.1.20 3.1.23 5.0.4 5.0.9 5.0.15 +- 3.1.4 3.1.6 3.1.20 3.1.24 5.0.4 5.0.9 5.0.16 ### .NET Framework `Type: Developer Pack` @@ -523,10 +524,10 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 4.7.2 4.8 ### .NET tools -- nbgv 3.4.255+06fb9182bf +- nbgv 3.5.103+351d94e36c ### PowerShell Tools -- PowerShell 7.2.2 +- PowerShell 7.2.3 #### Azure Powershell Modules | Module | Version | Path | @@ -543,14 +544,14 @@ All other versions are saved but not installed. #### Powershell Modules | Module | Version | | ------------------ | ---------------- | -| AWSPowerShell | 4.1.61 | +| AWSPowerShell | 4.1.76 | | DockerMsftProvider | 1.0.0.8 | | MarkdownPS | 1.9 | -| Microsoft.Graph | 1.9.3 | -| Pester | 3.4.0<br>5.3.1 | +| Microsoft.Graph | 1.9.5 | +| Pester | 3.4.0<br>5.3.3 | | PowerShellGet | 1.0.0.1<br>2.2.5 | | PSScriptAnalyzer | 1.20.0 | -| PSWindowsUpdate | 2.2.0.2 | +| PSWindowsUpdate | 2.2.0.3 | | SqlServer | 21.1.18256 | | VSSetup | 2.2.16 | @@ -583,10 +584,10 @@ All other versions are saved but not installed. ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:3d199041f4a1a21bbe1383dc8535664661908a5024be1be763446d8b1d1a6c07 | 2022-03-08 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:21ba7b1464733f7076c149ffa40f52a6d207a5ae78e636cf0bb0e19d8c38934b | 2022-03-08 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:f828494b61e4059d13f3733a899ab6a64a0160408d519721c79273a45bb0bda5 | 2022-03-08 | -| mcr.microsoft.com/windows/nanoserver:1809 | sha256:e508123972ca40c7662658ee1893a8d20f44a9dcd49be3ffa9dec559e525b71d | 2022-03-03 | -| mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:33d7abef52e917a19145873e9ed487055cb55ce3ccf3056ea189b0eb5e4e3683 | 2022-03-03 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:8962b347e0df025ee5a887e5b23e305a80384e174ba1a3165e94a8b17f49390f | 2022-04-12 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:60a315c1e051420094c58a2fb1959b421348ae809f8d37f7147b8800baac4500 | 2022-04-12 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:d91ffeee472a34f8d7ff717fef54422be2ad87e59478c2e507c59eed8aaaa02e | 2022-04-12 | +| mcr.microsoft.com/windows/nanoserver:1809 | sha256:62a8d022600141cd93d7e74cb190de58c9ad273ca238424028af88ad46495ca7 | 2022-04-04 | +| mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:8b98b3d621f5e6edc3639c7e90f63473c8f717a01e2a0c65b122fae827bd1c5a | 2022-04-04 | From 17e6dc829878d9323dcc2f08d76522e410aff95d Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Fri, 6 May 2022 09:15:33 +0200 Subject: [PATCH 1121/3485] [macOS] Add SwiftFormat for macOS 12 (#5495) * Add SwiftFormat for macOS 12 * Update docs and pester test --- .../macos/software-report/SoftwareReport.Generator.ps1 | 9 ++------- images/macos/tests/BasicTools.Tests.ps1 | 2 +- images/macos/toolsets/toolset-12.json | 1 + 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1 index d1ac84e64355..cb740aaec0c9 100644 --- a/images/macos/software-report/SoftwareReport.Generator.ps1 +++ b/images/macos/software-report/SoftwareReport.Generator.ps1 @@ -176,15 +176,10 @@ $toolsList += @( (Get-GHCupVersion), (Get-GHCVersion), (Get-CabalVersion), - (Get-StackVersion) + (Get-StackVersion), + (Get-SwiftFormatVersion) ) -if($os.IsLessThanMonterey) { - $toolsList += @( - (Get-SwiftFormatVersion) - ) -} - $markdown += New-MDList -Style Unordered -Lines ($toolsList | Sort-Object) # Linters diff --git a/images/macos/tests/BasicTools.Tests.ps1 b/images/macos/tests/BasicTools.Tests.ps1 index 77788ad70429..21f6de5e017d 100644 --- a/images/macos/tests/BasicTools.Tests.ps1 +++ b/images/macos/tests/BasicTools.Tests.ps1 @@ -30,7 +30,7 @@ Describe "Subversion" { } } -Describe "SwiftFormat" -Skip:($os.IsMonterey) { +Describe "SwiftFormat" { It "SwiftFormat" { "swiftformat --version" | Should -ReturnZeroExitCode } diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index ce56009f5e1c..84dc9a6a25d5 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -127,6 +127,7 @@ "perl", "sbt", "subversion", + "swiftformat", "swig", "zstd", "gmp", From 8ee6ce76e4af65af664522c7982feaf842eb7d36 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Fri, 6 May 2022 10:11:47 +0200 Subject: [PATCH 1122/3485] Update libssl for Ubuntu22 (#5497) --- images/linux/scripts/installers/powershellcore.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/linux/scripts/installers/powershellcore.sh b/images/linux/scripts/installers/powershellcore.sh index 9aa3fe705003..09129f7e51c9 100644 --- a/images/linux/scripts/installers/powershellcore.sh +++ b/images/linux/scripts/installers/powershellcore.sh @@ -10,8 +10,8 @@ source $HELPER_SCRIPTS/install.sh if isUbuntu22; then # Install libssl1.1 - download_with_retries "http://security.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.1l-1ubuntu1.2_amd64.deb" "/tmp" - dpkg -i /tmp/libssl1.1_1.1.1l-1ubuntu1.2_amd64.deb + download_with_retries "http://security.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.1l-1ubuntu1.3_amd64.deb" "/tmp" + dpkg -i /tmp/libssl1.1_1.1.1l-1ubuntu1.3_amd64.deb # Install Powershell download_with_retries "https://github.com/PowerShell/PowerShell/releases/download/v7.2.3/powershell-lts_7.2.3-1.deb_amd64.deb" "/tmp" From 5a2cb18a48bce5da183486b95f5494e4fd0c0640 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Fri, 6 May 2022 12:54:50 +0200 Subject: [PATCH 1123/3485] [Ubuntu] OpenSSL disable to load providers (#5496) * [Ubuntu] OpenSSL disable to load providers * Add link to vsts-agent issue * Add Ubuntu22 check condition --- images/linux/scripts/installers/configure-environment.sh | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/images/linux/scripts/installers/configure-environment.sh b/images/linux/scripts/installers/configure-environment.sh index 851e113a8420..47bebc0e0d7b 100644 --- a/images/linux/scripts/installers/configure-environment.sh +++ b/images/linux/scripts/installers/configure-environment.sh @@ -1,5 +1,8 @@ #!/bin/bash -e +# Source the helpers for use with the script +source $HELPER_SCRIPTS/os.sh + # Set ImageVersion and ImageOS env variables echo ImageVersion=$IMAGE_VERSION | tee -a /etc/environment echo ImageOS=$IMAGE_OS | tee -a /etc/environment @@ -40,3 +43,9 @@ if [[ -f "/etc/fwupd/daemon.conf" ]]; then sed -i 's/UpdateMotd=true/UpdateMotd=false/g' /etc/fwupd/daemon.conf systemctl mask fwupd-refresh.timer fi + +# Disable to load providers +# https://github.com/microsoft/azure-pipelines-agent/issues/3834 +if isUbuntu22; then + sed -i 's/openssl_conf = openssl_init/#openssl_conf = openssl_init/g' /etc/ssl/openssl.cnf +fi From 54dc44b7a26d417e128f380927d78e2093e470d3 Mon Sep 17 00:00:00 2001 From: AlexanderGitin <102294679+AlexanderGitin@users.noreply.github.com> Date: Sun, 8 May 2022 09:32:24 +0300 Subject: [PATCH 1124/3485] [macOS] Fix GHCup version output (#5455) * [macOS] Fix GHCup version output * Remove 'v' in GHCup version * Revert GHCup version --- images/macos/software-report/SoftwareReport.Common.psm1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/macos/software-report/SoftwareReport.Common.psm1 b/images/macos/software-report/SoftwareReport.Common.psm1 index 6efb0c6c36ce..d4cf17e326e0 100644 --- a/images/macos/software-report/SoftwareReport.Common.psm1 +++ b/images/macos/software-report/SoftwareReport.Common.psm1 @@ -448,7 +448,7 @@ function Get-AliyunCLIVersion { } function Get-GHCupVersion { - $ghcUpVersion = Run-Command "ghcup --version" | Take-Part -Part 5 + $ghcUpVersion = (Run-Command "ghcup --version" | Take-Part -Part 5).Replace('v','') return "GHCup $ghcUpVersion" } From 75a62205e95553ce49d6f302a2cf89693c83340c Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Mon, 9 May 2022 12:43:19 +0200 Subject: [PATCH 1125/3485] Update cobertura link (#5502) --- images/win/scripts/Installers/Install-JavaTools.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/win/scripts/Installers/Install-JavaTools.ps1 b/images/win/scripts/Installers/Install-JavaTools.ps1 index 0cc61a7b47f0..5d531c4eabc9 100644 --- a/images/win/scripts/Installers/Install-JavaTools.ps1 +++ b/images/win/scripts/Installers/Install-JavaTools.ps1 @@ -148,7 +148,7 @@ setx M2_REPO $m2_repo /M setx MAVEN_OPTS $maven_opts /M # Download cobertura jars -$uri = 'https://downloads.sourceforge.net/project/cobertura/cobertura/2.1.1/cobertura-2.1.1-bin.zip' +$uri = 'https://repo1.maven.org/maven2/net/sourceforge/cobertura/cobertura/2.1.1/cobertura-2.1.1-bin.zip' $coberturaPath = "C:\cobertura-2.1.1" $archivePath = Start-DownloadWithRetry -Url $uri -Name "cobertura.zip" From 3caf4a3e5cd316be9f1f1264b97b85ad37da8cfd Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Tue, 10 May 2022 10:23:19 +0200 Subject: [PATCH 1126/3485] [Windows] Add docker-compose v2 (#5504) --- images/win/scripts/Installers/Install-Docker.ps1 | 6 +++++- .../SoftwareReport/SoftwareReport.Generator.ps1 | 1 + .../scripts/SoftwareReport/SoftwareReport.Tools.psm1 | 10 +++++++--- images/win/scripts/Tests/Docker.Tests.ps1 | 4 ++++ 4 files changed, 17 insertions(+), 4 deletions(-) diff --git a/images/win/scripts/Installers/Install-Docker.ps1 b/images/win/scripts/Installers/Install-Docker.ps1 index fa0dcaf63abe..e1ddf9c9c582 100644 --- a/images/win/scripts/Installers/Install-Docker.ps1 +++ b/images/win/scripts/Installers/Install-Docker.ps1 @@ -11,9 +11,13 @@ Write-Host "Install-Package Docker" Install-Package -Name docker -ProviderName DockerMsftProvider -RequiredVersion 20.10.7 -Force Start-Service docker -Write-Host "Install-Package Docker-Compose" +Write-Host "Install-Package Docker-Compose v1" Choco-Install -PackageName docker-compose +Write-Host "Install-Package Docker-Compose v2" +$dockerComposev2Url = "https://github.com/docker/compose/releases/latest/download/docker-compose-windows-x86_64.exe" +Start-DownloadWithRetry -Url $dockerComposev2Url -Name docker-compose.exe -DownloadPath "C:\Program Files\Docker\cli-plugins" + Write-Host "Install docker-wincred" $dockerCredLatestRelease = Invoke-RestMethod -Uri "https://api.github.com/repos/docker/docker-credential-helpers/releases/latest" $dockerCredDownloadUrl = $dockerCredLatestRelease.assets.browser_download_url -match "docker-credential-wincred-.+\.zip" | Select-Object -First 1 diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index cdff2962aa02..3af3f431ebf9 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -94,6 +94,7 @@ $toolsList = @( (Get-CodeQLBundleVersion), (Get-DockerVersion), (Get-DockerComposeVersion), + (Get-DockerComposeVersionV2), (Get-DockerWincredVersion), (Get-GHCVersion), (Get-GitVersion), diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 index d14a9adc0c89..175ff9c4c33b 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 @@ -56,9 +56,13 @@ function Get-DockerVersion { } function Get-DockerComposeVersion { - $(docker-compose --version) -match "docker-compose version (?<version>\d+\.\d+\.\d+)" | Out-Null - $dockerComposeVersion = $Matches.Version - return "Docker-compose $dockerComposeVersion" + $dockerComposeVersion = docker-compose version --short + return "Docker Compose v1 $dockerComposeVersion" +} + +function Get-DockerComposeVersionV2 { + $dockerComposeVersion = docker compose version --short + return "Docker Compose v2 $dockerComposeVersion" } function Get-DockerWincredVersion { diff --git a/images/win/scripts/Tests/Docker.Tests.ps1 b/images/win/scripts/Tests/Docker.Tests.ps1 index 1a87c924fbbd..4e6a27cdee0e 100644 --- a/images/win/scripts/Tests/Docker.Tests.ps1 +++ b/images/win/scripts/Tests/Docker.Tests.ps1 @@ -10,6 +10,10 @@ Describe "Docker" { "docker-credential-wincred version" | Should -ReturnZeroExitCode } + It "docker compose v2" { + "docker compose version" | Should -ReturnZeroExitCode + } + It "docker service is up" { "docker images" | Should -ReturnZeroExitCode } From f2c7e4b9296f932de35cee49628a2a494239139b Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Tue, 10 May 2022 10:26:57 +0200 Subject: [PATCH 1127/3485] Cleanup AD principal resources (#5481) --- helpers/GenerateResourcesAndImage.ps1 | 272 ++++++++++++++------------ 1 file changed, 147 insertions(+), 125 deletions(-) diff --git a/helpers/GenerateResourcesAndImage.ps1 b/helpers/GenerateResourcesAndImage.ps1 index 921650010ecc..9e88e8a8d13a 100644 --- a/helpers/GenerateResourcesAndImage.ps1 +++ b/helpers/GenerateResourcesAndImage.ps1 @@ -132,150 +132,172 @@ Function GenerateResourcesAndImage { [bool] $EnableHttpsTrafficOnly = $False ) - $builderScriptPath = Get-PackerTemplatePath -RepositoryRoot $ImageGenerationRepositoryRoot -ImageType $ImageType - $ServicePrincipalClientSecret = $env:UserName + [System.GUID]::NewGuid().ToString().ToUpper() - $InstallPassword = $env:UserName + [System.GUID]::NewGuid().ToString().ToUpper() - - if ([string]::IsNullOrEmpty($AzureClientId)) - { - Connect-AzAccount - } else { - $AzSecureSecret = ConvertTo-SecureString $AzureClientSecret -AsPlainText -Force - $AzureAppCred = New-Object System.Management.Automation.PSCredential($AzureClientId, $AzSecureSecret) - Connect-AzAccount -ServicePrincipal -Credential $AzureAppCred -Tenant $AzureTenantId - } - Set-AzContext -SubscriptionId $SubscriptionId - - $alreadyExists = $true; try { - Get-AzResourceGroup -Name $ResourceGroupName - Write-Verbose "Resource group was found, will delete and recreate it." - } - catch { - Write-Verbose "Resource group was not found, will create it." - $alreadyExists = $false; - } + $builderScriptPath = Get-PackerTemplatePath -RepositoryRoot $ImageGenerationRepositoryRoot -ImageType $ImageType + $ServicePrincipalClientSecret = $env:UserName + [System.GUID]::NewGuid().ToString().ToUpper() + $InstallPassword = $env:UserName + [System.GUID]::NewGuid().ToString().ToUpper() - if ($alreadyExists) { - if($Force -eq $true) { - # Cleanup the resource group if it already exitsted before - Remove-AzResourceGroup -Name $ResourceGroupName -Force - New-AzResourceGroup -Name $ResourceGroupName -Location $AzureLocation + if ([string]::IsNullOrEmpty($AzureClientId)) + { + Connect-AzAccount } else { - $title = "Delete Resource Group" - $message = "The resource group you specified already exists. Do you want to clean it up?" + $AzSecureSecret = ConvertTo-SecureString $AzureClientSecret -AsPlainText -Force + $AzureAppCred = New-Object System.Management.Automation.PSCredential($AzureClientId, $AzSecureSecret) + Connect-AzAccount -ServicePrincipal -Credential $AzureAppCred -Tenant $AzureTenantId + } + Set-AzContext -SubscriptionId $SubscriptionId - $yes = New-Object System.Management.Automation.Host.ChoiceDescription "&Yes", ` - "Delete the resource group including all resources." + $alreadyExists = $true; + try { + Get-AzResourceGroup -Name $ResourceGroupName + Write-Verbose "Resource group was found, will delete and recreate it." + } + catch { + Write-Verbose "Resource group was not found, will create it." + $alreadyExists = $false; + } - $no = New-Object System.Management.Automation.Host.ChoiceDescription "&No", ` - "Keep the resource group and continue." + if ($alreadyExists) { + if($Force -eq $true) { + # Cleanup the resource group if it already exitsted before + Remove-AzResourceGroup -Name $ResourceGroupName -Force + New-AzResourceGroup -Name $ResourceGroupName -Location $AzureLocation + } else { + $title = "Delete Resource Group" + $message = "The resource group you specified already exists. Do you want to clean it up?" + + $yes = New-Object System.Management.Automation.Host.ChoiceDescription "&Yes", ` + "Delete the resource group including all resources." + + $no = New-Object System.Management.Automation.Host.ChoiceDescription "&No", ` + "Keep the resource group and continue." + + $stop = New-Object System.Management.Automation.Host.ChoiceDescription "&Stop", ` + "Stop the current action." + + $options = [System.Management.Automation.Host.ChoiceDescription[]]($yes, $no, $stop) + $result = $host.ui.PromptForChoice($title, $message, $options, 0) + + switch ($result) + { + 0 { Remove-AzResourceGroup -Name $ResourceGroupName -Force; New-AzResourceGroup -Name $ResourceGroupName -Location $AzureLocation } + 1 { <# Do nothing #> } + 2 { exit } + } + } + } else { + New-AzResourceGroup -Name $ResourceGroupName -Location $AzureLocation + } - $stop = New-Object System.Management.Automation.Host.ChoiceDescription "&Stop", ` - "Stop the current action." + # This script should follow the recommended naming conventions for azure resources + $storageAccountName = if($ResourceGroupName.EndsWith("-rg")) { + $ResourceGroupName.Substring(0, $ResourceGroupName.Length -3) + } else { $ResourceGroupName } - $options = [System.Management.Automation.Host.ChoiceDescription[]]($yes, $no, $stop) - $result = $host.ui.PromptForChoice($title, $message, $options, 0) + # Resource group names may contain special characters, that are not allowed in the storage account name + $storageAccountName = $storageAccountName.Replace("-", "").Replace("_", "").Replace("(", "").Replace(")", "").ToLower() + $storageAccountName += "001" + + + # Storage Account Name can only be 24 characters long + if ($storageAccountName.Length -gt 24){ + $storageAccountName = $storageAccountName.Substring(0, 24) + } - switch ($result) - { - 0 { Remove-AzResourceGroup -Name $ResourceGroupName -Force; New-AzResourceGroup -Name $ResourceGroupName -Location $AzureLocation } - 1 { <# Do nothing #> } - 2 { exit } + New-AzStorageAccount -ResourceGroupName $ResourceGroupName -AccountName $storageAccountName -Location $AzureLocation -SkuName "Standard_LRS" -AllowBlobPublicAccess $AllowBlobPublicAccess -EnableHttpsTrafficOnly $EnableHttpsTrafficOnly + + if ([string]::IsNullOrEmpty($AzureClientId)) { + # Interactive authentication: A service principal is created during runtime. + $spDisplayName = [System.GUID]::NewGuid().ToString().ToUpper() + $startDate = Get-Date + $endDate = $startDate.AddYears(1) + + if ('Microsoft.Azure.Commands.ActiveDirectory.PSADPasswordCredential' -as [type]) { + $credentials = [Microsoft.Azure.Commands.ActiveDirectory.PSADPasswordCredential]@{ + StartDate = $startDate + EndDate = $endDate + Password = $ServicePrincipalClientSecret + } + $sp = New-AzADServicePrincipal -DisplayName $spDisplayName -PasswordCredential $credentials + $spClientId = $sp.ApplicationId + $azRoleParam = @{ + RoleDefinitionName = "Contributor" + ServicePrincipalName = $spClientId + } } - } - } else { - New-AzResourceGroup -Name $ResourceGroupName -Location $AzureLocation - } - # This script should follow the recommended naming conventions for azure resources - $storageAccountName = if($ResourceGroupName.EndsWith("-rg")) { - $ResourceGroupName.Substring(0, $ResourceGroupName.Length -3) - } else { $ResourceGroupName } - - # Resource group names may contain special characters, that are not allowed in the storage account name - $storageAccountName = $storageAccountName.Replace("-", "").Replace("_", "").Replace("(", "").Replace(")", "").ToLower() - $storageAccountName += "001" - - - # Storage Account Name can only be 24 characters long - if ($storageAccountName.Length -gt 24){ - $storageAccountName = $storageAccountName.Substring(0, 24) - } + if ('Microsoft.Azure.PowerShell.Cmdlets.Resources.MSGraph.Models.ApiV10.MicrosoftGraphPasswordCredential' -as [type]) { + $credentials = [Microsoft.Azure.PowerShell.Cmdlets.Resources.MSGraph.Models.ApiV10.MicrosoftGraphPasswordCredential]@{ + StartDateTime = $startDate + EndDateTime = $endDate + } + $sp = New-AzADServicePrincipal -DisplayName $spDisplayName + $appCred = New-AzADAppCredential -ApplicationId $sp.AppId -PasswordCredentials $credentials + $spClientId = $sp.AppId + $azRoleParam = @{ + RoleDefinitionName = "Contributor" + PrincipalId = $sp.Id + } + $ServicePrincipalClientSecret = $appCred.SecretText + } - New-AzStorageAccount -ResourceGroupName $ResourceGroupName -AccountName $storageAccountName -Location $AzureLocation -SkuName "Standard_LRS" -AllowBlobPublicAccess $AllowBlobPublicAccess -EnableHttpsTrafficOnly $EnableHttpsTrafficOnly + Start-Sleep -Seconds $SecondsToWaitForServicePrincipalSetup + New-AzRoleAssignment @azRoleParam + Start-Sleep -Seconds $SecondsToWaitForServicePrincipalSetup + $sub = Get-AzSubscription -SubscriptionId $SubscriptionId + $tenantId = $sub.TenantId - if ([string]::IsNullOrEmpty($AzureClientId)) { - # Interactive authentication: A service principal is created during runtime. - $spDisplayName = [System.GUID]::NewGuid().ToString().ToUpper() - $startDate = Get-Date - $endDate = $startDate.AddYears(1) + # Remove ADPrincipal after the script completed + $isCleanupADPrincipal = $true + } else { + # Parametrized Authentication via given service principal: The service principal with the data provided via the command line + # is used for all authentication purposes. + $spClientId = $AzureClientId + $credentials = $AzureAppCred + $ServicePrincipalClientSecret = $AzureClientSecret + $tenantId = $AzureTenantId + } - if ('Microsoft.Azure.Commands.ActiveDirectory.PSADPasswordCredential' -as [type]) { - $credentials = [Microsoft.Azure.Commands.ActiveDirectory.PSADPasswordCredential]@{ - StartDate = $startDate - EndDate = $endDate - Password = $ServicePrincipalClientSecret - } - $sp = New-AzADServicePrincipal -DisplayName $spDisplayName -PasswordCredential $credentials - $spClientId = $sp.ApplicationId - $azRoleParam = @{ - RoleDefinitionName = "Contributor" - ServicePrincipalName = $spClientId - } + Get-LatestCommit -ErrorAction SilentlyContinue + + $packerBinary = Get-Command "packer" + if (-not ($packerBinary)) { + throw "'packer' binary is not found on PATH" } - if ('Microsoft.Azure.PowerShell.Cmdlets.Resources.MSGraph.Models.ApiV10.MicrosoftGraphPasswordCredential' -as [type]) { - $credentials = [Microsoft.Azure.PowerShell.Cmdlets.Resources.MSGraph.Models.ApiV10.MicrosoftGraphPasswordCredential]@{ - StartDateTime = $startDate - EndDateTime = $endDate - } - $sp = New-AzADServicePrincipal -DisplayName $spDisplayName - $appCred = New-AzADAppCredential -ApplicationId $sp.AppId -PasswordCredentials $credentials - $spClientId = $sp.AppId - $azRoleParam = @{ - RoleDefinitionName = "Contributor" - PrincipalId = $sp.Id - } - $ServicePrincipalClientSecret = $appCred.SecretText + if($RestrictToAgentIpAddress -eq $true) { + $AgentIp = (Invoke-RestMethod http://ipinfo.io/json).ip + Write-Host "Restricting access to packer generated VM to agent IP Address: $AgentIp" } - Start-Sleep -Seconds $SecondsToWaitForServicePrincipalSetup - New-AzRoleAssignment @azRoleParam - Start-Sleep -Seconds $SecondsToWaitForServicePrincipalSetup - $sub = Get-AzSubscription -SubscriptionId $SubscriptionId - $tenantId = $sub.TenantId - # "", "Note this variable-setting script for running Packer with these Azure resources in the future:", "==============================================================================================", "`$spClientId = `"$spClientId`"", "`$ServicePrincipalClientSecret = `"$ServicePrincipalClientSecret`"", "`$SubscriptionId = `"$SubscriptionId`"", "`$tenantId = `"$tenantId`"", "`$spObjectId = `"$spObjectId`"", "`$AzureLocation = `"$AzureLocation`"", "`$ResourceGroupName = `"$ResourceGroupName`"", "`$storageAccountName = `"$storageAccountName`"", "`$install_password = `"$install_password`"", "" - } else { - # Parametrized Authentication via given service principal: The service principal with the data provided via the command line - # is used for all authentication purposes. - $spClientId = $AzureClientId - $credentials = $AzureAppCred - $ServicePrincipalClientSecret = $AzureClientSecret - $tenantId = $AzureTenantId + & $packerBinary build -on-error=ask ` + -var "client_id=$($spClientId)" ` + -var "client_secret=$($ServicePrincipalClientSecret)" ` + -var "subscription_id=$($SubscriptionId)" ` + -var "tenant_id=$($tenantId)" ` + -var "location=$($AzureLocation)" ` + -var "resource_group=$($ResourceGroupName)" ` + -var "storage_account=$($storageAccountName)" ` + -var "install_password=$($InstallPassword)" ` + -var "allowed_inbound_ip_addresses=$($AgentIp)" ` + $builderScriptPath } - - Get-LatestCommit -ErrorAction SilentlyContinue - - $packerBinary = Get-Command "packer" - if (-not ($packerBinary)) { - throw "'packer' binary is not found on PATH" + catch { + Write-Error $_ } + finally { + # Remove ADServicePrincipal and ADApplication + if ($isCleanupADPrincipal) { + Write-Host "`nRemoving ${spDisplayName}/${spClientId}:" + if (Get-AzADServicePrincipal -DisplayName $spDisplayName) { + Write-Host " [+] ADServicePrincipal" + Remove-AzADServicePrincipal -DisplayName $spDisplayName -Confirm:$false + } - if($RestrictToAgentIpAddress -eq $true) { - $AgentIp = (Invoke-RestMethod http://ipinfo.io/json).ip - Write-Host "Restricting access to packer generated VM to agent IP Address: $AgentIp" + if (Get-AzADApplication -DisplayName $spDisplayName) { + Write-Host " [+] ADApplication" + Remove-AzADApplication -DisplayName $spDisplayName -Confirm:$false + } + } } - - & $packerBinary build -on-error=ask ` - -var "client_id=$($spClientId)" ` - -var "client_secret=$($ServicePrincipalClientSecret)" ` - -var "subscription_id=$($SubscriptionId)" ` - -var "tenant_id=$($tenantId)" ` - -var "location=$($AzureLocation)" ` - -var "resource_group=$($ResourceGroupName)" ` - -var "storage_account=$($storageAccountName)" ` - -var "install_password=$($InstallPassword)" ` - -var "allowed_inbound_ip_addresses=$($AgentIp)" ` - $builderScriptPath } From 0576062396eac88970d07cf833081ca6bd8143a2 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Wed, 11 May 2022 15:53:55 +0200 Subject: [PATCH 1128/3485] [Ubuntu] Migrate 22.04 from json to hcl (#5517) --- .../azure-pipelines/image-generation.yml | 5 +- images.CI/linux-and-win/build-image.ps1 | 4 +- images/linux/ubuntu2204.json | 367 ----------------- images/linux/ubuntu2204.pkr.hcl | 389 ++++++++++++++++++ 4 files changed, 395 insertions(+), 370 deletions(-) delete mode 100644 images/linux/ubuntu2204.json create mode 100644 images/linux/ubuntu2204.pkr.hcl diff --git a/images.CI/linux-and-win/azure-pipelines/image-generation.yml b/images.CI/linux-and-win/azure-pipelines/image-generation.yml index 9cc38d5efa4b..2e31962fd8a2 100644 --- a/images.CI/linux-and-win/azure-pipelines/image-generation.yml +++ b/images.CI/linux-and-win/azure-pipelines/image-generation.yml @@ -31,7 +31,10 @@ jobs: $ImageType = "${{ parameters.image_type }}" $TemplateDirectoryName = if ($ImageType.StartsWith("ubuntu")) { "linux" } else { "win" } $TemplateDirectoryPath = Join-Path "images" $TemplateDirectoryName | Resolve-Path - $TemplatePath = Join-Path $TemplateDirectoryPath "$ImageType.json" + $TemplatePath = Join-Path $TemplateDirectoryPath "$ImageType.pkr.hcl" + if ( -not (Test-Path $TemplatePath) ) { + $TemplatePath = Join-Path $TemplateDirectoryPath "$ImageType.json" + } Write-Host "##vso[task.setvariable variable=TemplateDirectoryPath;]$TemplateDirectoryPath" Write-Host "##vso[task.setvariable variable=TemplatePath;]$TemplatePath" diff --git a/images.CI/linux-and-win/build-image.ps1 b/images.CI/linux-and-win/build-image.ps1 index 41d03190d387..27b414d8fff3 100644 --- a/images.CI/linux-and-win/build-image.ps1 +++ b/images.CI/linux-and-win/build-image.ps1 @@ -22,7 +22,7 @@ if (-not (Test-Path $TemplatePath)) # Set Image repository path env variable, this is a workaround for Ubuntu 22.04 until this is fixed https://github.com/hashicorp/packer/issues/11733 $env:ImageRepositoryPath = "." -$Image = [io.path]::GetFileNameWithoutExtension($TemplatePath) +$Image = [io.path]::GetFileName($TemplatePath).Split(".")[0] $TempResourceGroupName = "${ResourcesNamePrefix}_${Image}" $InstallPassword = [System.GUID]::NewGuid().ToString().ToUpper() @@ -62,4 +62,4 @@ packer build -var "capture_name_prefix=$ResourcesNamePrefix" ` $currentString = $_ $sensitiveString = $SensitiveData | Where-Object { $currentString -match $_ } $sensitiveString -eq $null - } \ No newline at end of file + } diff --git a/images/linux/ubuntu2204.json b/images/linux/ubuntu2204.json deleted file mode 100644 index 518eb059aa9b..000000000000 --- a/images/linux/ubuntu2204.json +++ /dev/null @@ -1,367 +0,0 @@ -{ - "variables": { - "client_id": "{{env `ARM_CLIENT_ID`}}", - "client_secret": "{{env `ARM_CLIENT_SECRET`}}", - "subscription_id": "{{env `ARM_SUBSCRIPTION_ID`}}", - "tenant_id": "{{env `ARM_TENANT_ID`}}", - "resource_group": "{{env `ARM_RESOURCE_GROUP`}}", - "storage_account": "{{env `ARM_STORAGE_ACCOUNT`}}", - "build_resource_group_name": "{{env `BUILD_RESOURCE_GROUP_NAME`}}", - "temp_resource_group_name": "{{env `TEMP_RESOURCE_GROUP_NAME`}}", - "location": "{{env `ARM_RESOURCE_LOCATION`}}", - "virtual_network_name": "{{env `VNET_NAME`}}", - "virtual_network_resource_group_name": "{{env `VNET_RESOURCE_GROUP`}}", - "virtual_network_subnet_name": "{{env `VNET_SUBNET`}}", - "private_virtual_network_with_public_ip": "{{env `PRIVATE_VIRTUAL_NETWORK_WITH_PUBLIC_IP`}}", - "allowed_inbound_ip_addresses": "{{env `AGENT_IP`}}", - "image_repository_path": "{{env `IMAGEREPOSITORYPATH`}}", - "image_folder": "/imagegeneration", - "imagedata_file": "/imagegeneration/imagedata.json", - "installer_script_folder": "/imagegeneration/installers", - "helper_script_folder": "/imagegeneration/helpers", - "vm_size": "Standard_D4s_v4", - "capture_name_prefix": "packer", - "image_version": "dev", - "image_os": "ubuntu22", - "run_validation_diskspace": "false", - "dockerhub_login": "{{env `DOCKERHUB_LOGIN`}}", - "dockerhub_password": "{{env `DOCKERHUB_PASSWORD`}}" - }, - "sensitive-variables": [ - "client_secret" - ], - "builders": [ - { - "type": "azure-arm", - "client_id": "{{user `client_id`}}", - "client_secret": "{{user `client_secret`}}", - "subscription_id": "{{user `subscription_id`}}", - "tenant_id": "{{user `tenant_id`}}", - "location": "{{user `location`}}", - "vm_size": "{{user `vm_size`}}", - "resource_group_name": "{{user `resource_group`}}", - "storage_account": "{{user `storage_account`}}", - "build_resource_group_name": "{{user `build_resource_group_name`}}", - "temp_resource_group_name": "{{user `temp_resource_group_name`}}", - "capture_container_name": "images", - "capture_name_prefix": "{{user `capture_name_prefix`}}", - "virtual_network_name": "{{user `virtual_network_name`}}", - "virtual_network_resource_group_name": "{{user `virtual_network_resource_group_name`}}", - "virtual_network_subnet_name": "{{user `virtual_network_subnet_name`}}", - "private_virtual_network_with_public_ip": "{{user `private_virtual_network_with_public_ip`}}", - "allowed_inbound_ip_addresses": "{{user `allowed_inbound_ip_addresses`}}", - "user_data_file": "{{user `image_repository_path`}}/images/linux/scripts/base/configure-legacy-ssh.sh", - "os_type": "Linux", - "image_publisher": "canonical", - "image_offer": "0001-com-ubuntu-server-jammy", - "image_sku": "22_04-lts", - "os_disk_size_gb": "86" - } - ], - "provisioners": [ - { - "type": "shell", - "inline": [ - "mkdir {{user `image_folder`}}", - "chmod 777 {{user `image_folder`}}" - ], - "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" - }, - { - "type": "shell", - "script": "{{template_dir}}/scripts/base/apt-mock.sh", - "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" - }, - { - "type": "shell", - "scripts": [ - "{{template_dir}}/scripts/base/repos.sh" - ], - "environment_vars": [ - "DEBIAN_FRONTEND=noninteractive" - ], - "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" - }, - { - "type": "shell", - "script": "{{template_dir}}/scripts/base/apt.sh", - "environment_vars": [ - "DEBIAN_FRONTEND=noninteractive" - ], - "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" - }, - { - "type": "shell", - "script": "{{template_dir}}/scripts/base/limits.sh", - "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" - }, - { - "type": "file", - "source": "{{template_dir}}/scripts/helpers", - "destination": "{{user `helper_script_folder`}}" - }, - { - "type": "file", - "source": "{{template_dir}}/scripts/installers", - "destination": "{{user `installer_script_folder`}}" - }, - { - "type": "file", - "source": "{{ template_dir }}/post-generation", - "destination": "{{user `image_folder`}}" - }, - { - "type": "file", - "source": "{{template_dir}}/scripts/tests", - "destination": "{{user `image_folder`}}" - }, - { - "type": "file", - "source": "{{ template_dir }}/scripts/SoftwareReport", - "destination": "{{user `image_folder`}}" - }, - { - "type": "file", - "source": "{{template_dir}}/toolsets/toolset-2204.json", - "destination": "{{user `installer_script_folder`}}/toolset.json" - }, - { - "type": "shell", - "scripts": [ - "{{template_dir}}/scripts/installers/preimagedata.sh" - ], - "environment_vars": [ - "IMAGE_VERSION={{user `image_version`}}", - "IMAGEDATA_FILE={{user `imagedata_file`}}" - ], - "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" - }, - { - "type": "shell", - "scripts": [ - "{{template_dir}}/scripts/installers/configure-environment.sh" - ], - "environment_vars": [ - "IMAGE_VERSION={{user `image_version`}}", - "IMAGE_OS={{user `image_os`}}", - "HELPER_SCRIPTS={{user `helper_script_folder`}}" - ], - "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" - }, - { - "type": "shell", - "scripts": [ - "{{template_dir}}/scripts/installers/complete-snap-setup.sh", - "{{template_dir}}/scripts/installers/powershellcore.sh" - ], - "environment_vars": [ - "HELPER_SCRIPTS={{user `helper_script_folder`}}" - ], - "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" - }, - { - "type": "shell", - "scripts": [ - "{{template_dir}}/scripts/installers/Install-PowerShellModules.ps1", - "{{template_dir}}/scripts/installers/Install-AzureModules.ps1" - ], - "environment_vars": [ - "HELPER_SCRIPTS={{user `helper_script_folder`}}", - "INSTALLER_SCRIPT_FOLDER={{user `installer_script_folder`}}" - ], - "execute_command": "sudo sh -c '{{ .Vars }} pwsh -f {{ .Path }}'" - }, - { - "type": "shell", - "scripts": [ - "{{template_dir}}/scripts/installers/docker-compose.sh", - "{{template_dir}}/scripts/installers/docker-moby.sh" - ], - "environment_vars": [ - "HELPER_SCRIPTS={{user `helper_script_folder`}}", - "INSTALLER_SCRIPT_FOLDER={{user `installer_script_folder`}}", - "DOCKERHUB_LOGIN={{user `dockerhub_login`}}", - "DOCKERHUB_PASSWORD={{user `dockerhub_password`}}" - ], - "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" - }, - { - "type": "shell", - "scripts": [ - "{{template_dir}}/scripts/installers/azcopy.sh", - "{{template_dir}}/scripts/installers/azure-cli.sh", - "{{template_dir}}/scripts/installers/azure-devops-cli.sh", - "{{template_dir}}/scripts/installers/basic.sh", - "{{template_dir}}/scripts/installers/bicep.sh", - "{{template_dir}}/scripts/installers/aliyun-cli.sh", - "{{template_dir}}/scripts/installers/apache.sh", - "{{template_dir}}/scripts/installers/aws.sh", - "{{template_dir}}/scripts/installers/clang.sh", - "{{template_dir}}/scripts/installers/cmake.sh", - "{{template_dir}}/scripts/installers/codeql-bundle.sh", - "{{template_dir}}/scripts/installers/dotnetcore-sdk.sh", - "{{template_dir}}/scripts/installers/gcc.sh", - "{{template_dir}}/scripts/installers/gfortran.sh", - "{{template_dir}}/scripts/installers/git.sh", - "{{template_dir}}/scripts/installers/github-cli.sh", - "{{template_dir}}/scripts/installers/google-chrome.sh", - "{{template_dir}}/scripts/installers/google-cloud-sdk.sh", - "{{template_dir}}/scripts/installers/haskell.sh", - "{{template_dir}}/scripts/installers/heroku.sh", - "{{template_dir}}/scripts/installers/kubernetes-tools.sh", - "{{template_dir}}/scripts/installers/oc.sh", - "{{template_dir}}/scripts/installers/miniconda.sh", - "{{template_dir}}/scripts/installers/mysql.sh", - "{{template_dir}}/scripts/installers/sqlpackage.sh", - "{{template_dir}}/scripts/installers/nginx.sh", - "{{template_dir}}/scripts/installers/nvm.sh", - "{{template_dir}}/scripts/installers/nodejs.sh", - "{{template_dir}}/scripts/installers/bazel.sh", - "{{template_dir}}/scripts/installers/oras-cli.sh", - "{{template_dir}}/scripts/installers/php.sh", - "{{template_dir}}/scripts/installers/postgresql.sh", - "{{template_dir}}/scripts/installers/pulumi.sh", - "{{template_dir}}/scripts/installers/ruby.sh", - "{{template_dir}}/scripts/installers/r.sh", - "{{template_dir}}/scripts/installers/rust.sh", - "{{template_dir}}/scripts/installers/julia.sh", - "{{template_dir}}/scripts/installers/sbt.sh", - "{{template_dir}}/scripts/installers/terraform.sh", - "{{template_dir}}/scripts/installers/packer.sh", - "{{template_dir}}/scripts/installers/vcpkg.sh", - "{{template_dir}}/scripts/installers/dpkg-config.sh", - "{{template_dir}}/scripts/installers/yq.sh", - "{{template_dir}}/scripts/installers/pypy.sh", - "{{template_dir}}/scripts/installers/python.sh", - "{{template_dir}}/scripts/installers/graalvm.sh" - ], - "environment_vars": [ - "HELPER_SCRIPTS={{user `helper_script_folder`}}", - "INSTALLER_SCRIPT_FOLDER={{user `installer_script_folder`}}", - "DEBIAN_FRONTEND=noninteractive" - ], - "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" - }, - { - "type": "shell", - "scripts": [ - "{{template_dir}}/scripts/installers/Install-Toolset.ps1", - "{{template_dir}}/scripts/installers/Configure-Toolset.ps1" - ], - "environment_vars": [ - "HELPER_SCRIPTS={{user `helper_script_folder`}}", - "INSTALLER_SCRIPT_FOLDER={{user `installer_script_folder`}}" - ], - "execute_command": "sudo sh -c '{{ .Vars }} pwsh -f {{ .Path }}'" - }, - { - "type": "shell", - "scripts": [ - "{{template_dir}}/scripts/installers/pipx-packages.sh" - ], - "environment_vars": [ - "HELPER_SCRIPTS={{user `helper_script_folder`}}", - "INSTALLER_SCRIPT_FOLDER={{user `installer_script_folder`}}" - ], - "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" - }, - { - "type": "shell", - "scripts": [ - "{{template_dir}}/scripts/installers/homebrew.sh" - ], - "environment_vars": [ - "HELPER_SCRIPTS={{user `helper_script_folder`}}", - "DEBIAN_FRONTEND=noninteractive", - "INSTALLER_SCRIPT_FOLDER={{user `installer_script_folder`}}" - ], - "execute_command": "/bin/sh -c '{{ .Vars }} {{ .Path }}'" - }, - { - "type": "shell", - "script": "{{template_dir}}/scripts/base/snap.sh", - "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" - }, - { - "type": "shell", - "expect_disconnect": true, - "scripts": [ - "{{template_dir}}/scripts/base/reboot.sh" - ], - "execute_command": "/bin/sh -c '{{ .Vars }} {{ .Path }}'" - }, - { - "type": "shell", - "pause_before": "60s", - "start_retry_timeout": "10m", - "scripts": [ - "{{template_dir}}/scripts/installers/cleanup.sh" - ], - "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" - }, - { - "type": "shell", - "script": "{{template_dir}}/scripts/base/apt-mock-remove.sh", - "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" - }, - { - "type": "shell", - "inline": [ - "pwsh -File {{user `image_folder`}}/SoftwareReport/SoftwareReport.Generator.ps1 -OutputDirectory {{user `image_folder`}}", - "pwsh -File {{user `image_folder`}}/tests/RunAll-Tests.ps1 -OutputDirectory {{user `image_folder`}}" - ], - "environment_vars": [ - "IMAGE_VERSION={{user `image_version`}}", - "INSTALLER_SCRIPT_FOLDER={{user `installer_script_folder`}}" - ] - }, - { - "type": "file", - "source": "{{user `image_folder`}}/Ubuntu-Readme.md", - "destination": "{{template_dir}}/Ubuntu2204-Readme.md", - "direction": "download" - }, - { - "type": "shell", - "scripts":[ - "{{template_dir}}/scripts/installers/post-deployment.sh" - ], - "environment_vars":[ - "HELPER_SCRIPT_FOLDER={{user `helper_script_folder`}}", - "INSTALLER_SCRIPT_FOLDER={{user `installer_script_folder`}}", - "IMAGE_FOLDER={{user `image_folder`}}" - ], - "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" - }, - { - "type": "shell", - "scripts":[ - "{{template_dir}}/scripts/installers/validate-disk-space.sh" - ], - "environment_vars": [ - "RUN_VALIDATION={{user `run_validation_diskspace`}}" - ] - }, - { - "type": "file", - "source": "{{template_dir}}/config/ubuntu2204.conf", - "destination": "/tmp/" - }, - { - "type": "shell", - "inline": [ - "mkdir -p /etc/vsts", - "cp /tmp/ubuntu2204.conf /etc/vsts/machine_instance.conf" - ], - "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" - }, - { - "type": "shell", - "inline": [ - "sleep 30", - "/usr/sbin/waagent -force -deprovision+user && export HISTSIZE=0 && sync" - ], - "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" - } - ] -} diff --git a/images/linux/ubuntu2204.pkr.hcl b/images/linux/ubuntu2204.pkr.hcl new file mode 100644 index 000000000000..4b1f303078be --- /dev/null +++ b/images/linux/ubuntu2204.pkr.hcl @@ -0,0 +1,389 @@ + +variable "allowed_inbound_ip_addresses" { + default = [] +} + +variable "build_resource_group_name" { + type = string + default = "${env("BUILD_RESOURCE_GROUP_NAME")}" +} + +variable "capture_name_prefix" { + type = string + default = "packer" +} + +variable "client_id" { + type = string + default = "${env("ARM_CLIENT_ID")}" +} + +variable "client_secret" { + type = string + default = "${env("ARM_CLIENT_SECRET")}" + sensitive = true +} + +variable "commit_url" { + type = string + default = "" +} + +variable "dockerhub_login" { + type = string + default = "${env("DOCKERHUB_LOGIN")}" +} + +variable "dockerhub_password" { + type = string + default = "${env("DOCKERHUB_PASSWORD")}" +} + +variable "helper_script_folder" { + type = string + default = "/imagegeneration/helpers" +} + +variable "image_folder" { + type = string + default = "/imagegeneration" +} + +variable "image_os" { + type = string + default = "ubuntu22" +} + +variable "image_repository_path" { + type = string + default = "${env("IMAGEREPOSITORYPATH")}" +} + +variable "image_version" { + type = string + default = "dev" +} + +variable "imagedata_file" { + type = string + default = "/imagegeneration/imagedata.json" +} + +variable "installer_script_folder" { + type = string + default = "/imagegeneration/installers" +} + +variable "install_password" { + type = string + default = "" +} + +variable "location" { + type = string + default = "${env("ARM_RESOURCE_LOCATION")}" +} + +variable "private_virtual_network_with_public_ip" { + type = bool + default = false +} + +variable "resource_group" { + type = string + default = "${env("ARM_RESOURCE_GROUP")}" +} + +variable "run_validation_diskspace" { + type = bool + default = false +} + +variable "storage_account" { + type = string + default = "${env("ARM_STORAGE_ACCOUNT")}" +} + +variable "subscription_id" { + type = string + default = "${env("ARM_SUBSCRIPTION_ID")}" +} + +variable "temp_resource_group_name" { + type = string + default = "${env("TEMP_RESOURCE_GROUP_NAME")}" +} + +variable "tenant_id" { + type = string + default = "${env("ARM_TENANT_ID")}" +} + +variable "virtual_network_name" { + type = string + default = "${env("VNET_NAME")}" +} + +variable "virtual_network_resource_group_name" { + type = string + default = "${env("VNET_RESOURCE_GROUP")}" +} + +variable "virtual_network_subnet_name" { + type = string + default = "${env("VNET_SUBNET")}" +} + +variable "vm_size" { + type = string + default = "Standard_D4s_v4" +} + +source "azure-arm" "build_vhd" { + allowed_inbound_ip_addresses = "${var.allowed_inbound_ip_addresses}" + build_resource_group_name = "${var.build_resource_group_name}" + capture_container_name = "images" + capture_name_prefix = "${var.capture_name_prefix}" + client_id = "${var.client_id}" + client_secret = "${var.client_secret}" + image_offer = "0001-com-ubuntu-server-jammy" + image_publisher = "canonical" + image_sku = "22_04-lts" + location = "${var.location}" + os_disk_size_gb = "86" + os_type = "Linux" + private_virtual_network_with_public_ip = "${var.private_virtual_network_with_public_ip}" + resource_group_name = "${var.resource_group}" + storage_account = "${var.storage_account}" + subscription_id = "${var.subscription_id}" + temp_resource_group_name = "${var.temp_resource_group_name}" + tenant_id = "${var.tenant_id}" + user_data_file = "${var.image_repository_path}/images/linux/scripts/base/configure-legacy-ssh.sh" + virtual_network_name = "${var.virtual_network_name}" + virtual_network_resource_group_name = "${var.virtual_network_resource_group_name}" + virtual_network_subnet_name = "${var.virtual_network_subnet_name}" + vm_size = "${var.vm_size}" +} + +build { + sources = ["source.azure-arm.build_vhd"] + + provisioner "shell" { + execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" + inline = ["mkdir ${var.image_folder}", "chmod 777 ${var.image_folder}"] + } + + provisioner "shell" { + execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" + script = "${path.root}/scripts/base/apt-mock.sh" + } + + provisioner "shell" { + environment_vars = ["DEBIAN_FRONTEND=noninteractive"] + execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" + scripts = ["${path.root}/scripts/base/repos.sh"] + } + + provisioner "shell" { + environment_vars = ["DEBIAN_FRONTEND=noninteractive"] + execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" + script = "${path.root}/scripts/base/apt.sh" + } + + provisioner "shell" { + execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" + script = "${path.root}/scripts/base/limits.sh" + } + + provisioner "file" { + destination = "${var.helper_script_folder}" + source = "${path.root}/scripts/helpers" + } + + provisioner "file" { + destination = "${var.installer_script_folder}" + source = "${path.root}/scripts/installers" + } + + provisioner "file" { + destination = "${var.image_folder}" + source = "${path.root}/post-generation" + } + + provisioner "file" { + destination = "${var.image_folder}" + source = "${path.root}/scripts/tests" + } + + provisioner "file" { + destination = "${var.image_folder}" + source = "${path.root}/scripts/SoftwareReport" + } + + provisioner "file" { + destination = "${var.installer_script_folder}/toolset.json" + source = "${path.root}/toolsets/toolset-2204.json" + } + + provisioner "shell" { + environment_vars = ["IMAGE_VERSION=${var.image_version}", "IMAGEDATA_FILE=${var.imagedata_file}"] + execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" + scripts = ["${path.root}/scripts/installers/preimagedata.sh"] + } + + provisioner "shell" { + environment_vars = ["IMAGE_VERSION=${var.image_version}", "IMAGE_OS=${var.image_os}", "HELPER_SCRIPTS=${var.helper_script_folder}"] + execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" + scripts = ["${path.root}/scripts/installers/configure-environment.sh"] + } + + provisioner "shell" { + environment_vars = ["HELPER_SCRIPTS=${var.helper_script_folder}"] + execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" + scripts = ["${path.root}/scripts/installers/complete-snap-setup.sh", "${path.root}/scripts/installers/powershellcore.sh"] + } + + provisioner "shell" { + environment_vars = ["HELPER_SCRIPTS=${var.helper_script_folder}", "INSTALLER_SCRIPT_FOLDER=${var.installer_script_folder}"] + execute_command = "sudo sh -c '{{ .Vars }} pwsh -f {{ .Path }}'" + scripts = ["${path.root}/scripts/installers/Install-PowerShellModules.ps1", "${path.root}/scripts/installers/Install-AzureModules.ps1"] + } + + provisioner "shell" { + environment_vars = ["HELPER_SCRIPTS=${var.helper_script_folder}", "INSTALLER_SCRIPT_FOLDER=${var.installer_script_folder}", "DOCKERHUB_LOGIN=${var.dockerhub_login}", "DOCKERHUB_PASSWORD=${var.dockerhub_password}"] + execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" + scripts = ["${path.root}/scripts/installers/docker-compose.sh", "${path.root}/scripts/installers/docker-moby.sh"] + } + + provisioner "shell" { + environment_vars = ["HELPER_SCRIPTS=${var.helper_script_folder}", "INSTALLER_SCRIPT_FOLDER=${var.installer_script_folder}", "DEBIAN_FRONTEND=noninteractive"] + execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" + scripts = [ + "${path.root}/scripts/installers/azcopy.sh", + "${path.root}/scripts/installers/azure-cli.sh", + "${path.root}/scripts/installers/azure-devops-cli.sh", + "${path.root}/scripts/installers/basic.sh", + "${path.root}/scripts/installers/bicep.sh", + "${path.root}/scripts/installers/aliyun-cli.sh", + "${path.root}/scripts/installers/apache.sh", + "${path.root}/scripts/installers/aws.sh", + "${path.root}/scripts/installers/clang.sh", + "${path.root}/scripts/installers/cmake.sh", + "${path.root}/scripts/installers/codeql-bundle.sh", + "${path.root}/scripts/installers/dotnetcore-sdk.sh", + "${path.root}/scripts/installers/gcc.sh", + "${path.root}/scripts/installers/gfortran.sh", + "${path.root}/scripts/installers/git.sh", + "${path.root}/scripts/installers/github-cli.sh", + "${path.root}/scripts/installers/google-chrome.sh", + "${path.root}/scripts/installers/google-cloud-sdk.sh", + "${path.root}/scripts/installers/haskell.sh", + "${path.root}/scripts/installers/heroku.sh", + "${path.root}/scripts/installers/kubernetes-tools.sh", + "${path.root}/scripts/installers/oc.sh", + "${path.root}/scripts/installers/miniconda.sh", + "${path.root}/scripts/installers/mysql.sh", + "${path.root}/scripts/installers/sqlpackage.sh", + "${path.root}/scripts/installers/nginx.sh", + "${path.root}/scripts/installers/nvm.sh", + "${path.root}/scripts/installers/nodejs.sh", + "${path.root}/scripts/installers/bazel.sh", + "${path.root}/scripts/installers/oras-cli.sh", + "${path.root}/scripts/installers/php.sh", + "${path.root}/scripts/installers/postgresql.sh", + "${path.root}/scripts/installers/pulumi.sh", + "${path.root}/scripts/installers/ruby.sh", + "${path.root}/scripts/installers/r.sh", + "${path.root}/scripts/installers/rust.sh", + "${path.root}/scripts/installers/julia.sh", + "${path.root}/scripts/installers/sbt.sh", + "${path.root}/scripts/installers/terraform.sh", + "${path.root}/scripts/installers/packer.sh", + "${path.root}/scripts/installers/vcpkg.sh", + "${path.root}/scripts/installers/dpkg-config.sh", + "${path.root}/scripts/installers/yq.sh", + "${path.root}/scripts/installers/pypy.sh", + "${path.root}/scripts/installers/python.sh", + "${path.root}/scripts/installers/graalvm.sh" + ] + } + + provisioner "shell" { + environment_vars = ["HELPER_SCRIPTS=${var.helper_script_folder}", "INSTALLER_SCRIPT_FOLDER=${var.installer_script_folder}"] + execute_command = "sudo sh -c '{{ .Vars }} pwsh -f {{ .Path }}'" + scripts = ["${path.root}/scripts/installers/Install-Toolset.ps1", "${path.root}/scripts/installers/Configure-Toolset.ps1"] + } + + provisioner "shell" { + environment_vars = ["HELPER_SCRIPTS=${var.helper_script_folder}", "INSTALLER_SCRIPT_FOLDER=${var.installer_script_folder}"] + execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" + scripts = ["${path.root}/scripts/installers/pipx-packages.sh"] + } + + provisioner "shell" { + environment_vars = ["HELPER_SCRIPTS=${var.helper_script_folder}", "DEBIAN_FRONTEND=noninteractive", "INSTALLER_SCRIPT_FOLDER=${var.installer_script_folder}"] + execute_command = "/bin/sh -c '{{ .Vars }} {{ .Path }}'" + scripts = ["${path.root}/scripts/installers/homebrew.sh"] + } + + provisioner "shell" { + execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" + script = "${path.root}/scripts/base/snap.sh" + } + + provisioner "shell" { + execute_command = "/bin/sh -c '{{ .Vars }} {{ .Path }}'" + expect_disconnect = true + scripts = ["${path.root}/scripts/base/reboot.sh"] + } + + provisioner "shell" { + execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" + pause_before = "1m0s" + scripts = ["${path.root}/scripts/installers/cleanup.sh"] + start_retry_timeout = "10m" + } + + provisioner "shell" { + execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" + script = "${path.root}/scripts/base/apt-mock-remove.sh" + } + + provisioner "shell" { + environment_vars = ["IMAGE_VERSION=${var.image_version}", "INSTALLER_SCRIPT_FOLDER=${var.installer_script_folder}"] + inline = ["pwsh -File ${var.image_folder}/SoftwareReport/SoftwareReport.Generator.ps1 -OutputDirectory ${var.image_folder}", "pwsh -File ${var.image_folder}/tests/RunAll-Tests.ps1 -OutputDirectory ${var.image_folder}"] + } + + provisioner "file" { + destination = "${path.root}/Ubuntu2204-Readme.md" + direction = "download" + source = "${var.image_folder}/Ubuntu-Readme.md" + } + + provisioner "shell" { + environment_vars = ["HELPER_SCRIPT_FOLDER=${var.helper_script_folder}", "INSTALLER_SCRIPT_FOLDER=${var.installer_script_folder}", "IMAGE_FOLDER=${var.image_folder}"] + execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" + scripts = ["${path.root}/scripts/installers/post-deployment.sh"] + } + + provisioner "shell" { + environment_vars = ["RUN_VALIDATION=${var.run_validation_diskspace}"] + scripts = ["${path.root}/scripts/installers/validate-disk-space.sh"] + } + + provisioner "file" { + destination = "/tmp/" + source = "${path.root}/config/ubuntu2204.conf" + } + + provisioner "shell" { + execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" + inline = ["mkdir -p /etc/vsts", "cp /tmp/ubuntu2204.conf /etc/vsts/machine_instance.conf"] + } + + provisioner "shell" { + execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" + inline = ["sleep 30", "/usr/sbin/waagent -force -deprovision+user && export HISTSIZE=0 && sync"] + } + +} From 63c06b0c58ace31b24ba387184f4b419e977e414 Mon Sep 17 00:00:00 2001 From: AlexanderGitin <102294679+AlexanderGitin@users.noreply.github.com> Date: Wed, 11 May 2022 18:55:42 +0300 Subject: [PATCH 1129/3485] [MacOS] Add safe directory setting to git config (#5452) --- images/macos/provision/core/git.sh | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/images/macos/provision/core/git.sh b/images/macos/provision/core/git.sh index 0dd8ba73956e..3a62d85e13d4 100644 --- a/images/macos/provision/core/git.sh +++ b/images/macos/provision/core/git.sh @@ -2,11 +2,9 @@ source ~/utils/utils.sh echo Installing Git... -# Temporary hardcode version 2.35.1 due to the issue with the actions\checkout https://github.com/actions/checkout/issues/76 -brew tap-new local/git -brew extract --version=2.35.1 git local/git -brew install git@2.35.1 -brew untap -f local/homebrew-git +brew_smart_install "git" + +git config --global --add safe.directory "*" echo Installing Git LFS brew_smart_install "git-lfs" From 0ca5e834c0ef6befe6058203d810af1ae9a0c4ac Mon Sep 17 00:00:00 2001 From: Alexis Saettler <alexis@saettler.org> Date: Wed, 11 May 2022 17:59:46 +0200 Subject: [PATCH 1130/3485] Refactor Get-DotnetFrameworkTools and allow multiple SDKs installation (#5464) --- .../SoftwareReport/SoftwareReport.Common.psm1 | 13 ++++++------- .../SoftwareReport/SoftwareReport.Generator.ps1 | 11 +++++++---- images/win/scripts/Tests/Tools.Tests.ps1 | 3 +-- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 index a4379c0b5c41..33530d33cc94 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 @@ -226,15 +226,14 @@ function Get-DotnetRuntimes { function Get-DotnetFrameworkTools { $path = "${env:ProgramFiles(x86)}\Microsoft SDKs\Windows\*\*\NETFX*" - $frameworkVersions = @() - Get-ChildItem -Path $path -Directory | ForEach-Object { - $frameworkVersions += ($_.Name -Split(" "))[1] - $frameworkPath = $_.Fullname -Replace " \d+\.\d+(\.\d+)?", " <version>" - } + Get-ChildItem -Path $path -Directory | Group-Object { + $_.Fullname -Replace " \d+\.\d+(\.\d+)?", " <version>" + } | ForEach-Object { [PSCustomObject]@{ - Versions = $frameworkVersions -Join " " - Path = $frameworkPath + Versions = $_.Group.Name | ForEach-Object { $_.Split(" ")[1] } + Path = $_.Name } + } } function Get-PowerShellAzureModules { diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index 3af3f431ebf9..cf34a2fa487d 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -267,12 +267,15 @@ Get-DotnetRuntimes | Foreach-Object { } $markdown += New-MDHeader ".NET Framework" -Level 3 -$frameworks = Get-DotnetFrameworkTools $markdown += "``Type: Developer Pack``" $markdown += New-MDNewLine -$markdown += "``Location $($frameworks.Path)``" -$markdown += New-MDNewLine -$markdown += New-MDList -Lines $frameworks.Versions -Style Unordered +Get-DotnetFrameworkTools | Foreach-Object { + $path = $_.Path + $versions = $_.Versions + $markdown += "``Location: $path``" + $markdown += New-MDNewLine + $markdown += New-MDList -Lines $versions -Style Unordered +} $markdown += New-MDHeader ".NET tools" -Level 3 $tools = Get-DotnetTools diff --git a/images/win/scripts/Tests/Tools.Tests.ps1 b/images/win/scripts/Tests/Tools.Tests.ps1 index 4476a43b3f8c..515df57a2363 100644 --- a/images/win/scripts/Tests/Tools.Tests.ps1 +++ b/images/win/scripts/Tests/Tools.Tests.ps1 @@ -103,8 +103,7 @@ Describe "GoogleCloudSDK" -Skip:(Test-IsWin22) { Describe "NET48" { It "NET48" { - $netPath = (Get-DotnetFrameworkTools).Path.Split("<")[0] - ${netPath} + "4.8 Tools" | Should -Exist + (Get-DotnetFrameworkTools).Versions | Should -Contain "4.8" } } From 459f6845b1554e17bf1783690d47417069feb208 Mon Sep 17 00:00:00 2001 From: Ross Smith II <ross@smithii.com> Date: Thu, 12 May 2022 00:29:08 -0700 Subject: [PATCH 1131/3485] Fix: typo in create-image-and-azure-resources.md (#5527) --- docs/create-image-and-azure-resources.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/create-image-and-azure-resources.md b/docs/create-image-and-azure-resources.md index 2727d7309c58..f079a1fe8c63 100644 --- a/docs/create-image-and-azure-resources.md +++ b/docs/create-image-and-azure-resources.md @@ -27,7 +27,7 @@ Detailed instruction can be found in [Azure documentation](https://docs.microsof #### How to prepare Windows build agent Local machine or [Azure VM](https://docs.microsoft.com/en-us/azure/virtual-machines/windows/quick-create-cli) can be used as a build agent. -Download `packer` from https://www.packer.io/downloads, or install it via Chocolately. +Download `packer` from https://www.packer.io/downloads, or install it via [Chocolatey](https://chocolatey.org/): ``` choco install packer ``` From 7b9a92f7193a7bde2c4332d8d3aa3c80104370d9 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 12 May 2022 08:19:40 +0000 Subject: [PATCH 1132/3485] Updating readme file for ubuntu18 version 20220511.2 (#5524) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu1804-Readme.md | 81 ++++++++++++++++--------------- 1 file changed, 43 insertions(+), 38 deletions(-) diff --git a/images/linux/Ubuntu1804-Readme.md b/images/linux/Ubuntu1804-Readme.md index 0098acd64169..5f2b079ab3a4 100644 --- a/images/linux/Ubuntu1804-Readme.md +++ b/images/linux/Ubuntu1804-Readme.md @@ -1,6 +1,10 @@ +| Announcements | +|-| +| [(Public Beta) Ubuntu 22.04 is now available](https://github.com/actions/virtual-environments/issues/5490) | +*** # Ubuntu 18.04.6 LTS -- Linux kernel version: 5.4.0-1077-azure -- Image Version: 20220503.1 +- Linux kernel version: 5.4.0-1078-azure +- Image Version: 20220511.2 ## Installed Software ### Language and Runtime @@ -25,14 +29,14 @@ ### Package Management - cpan 1.64 - Helm 3.8.2 -- Homebrew 3.4.10 +- Homebrew 3.4.11 - Miniconda 4.11.0 - Npm 8.5.5 - Pip 9.0.1 - Pip3 9.0.1 - Pipx 1.0.0 - RubyGems 2.7.6 -- Vcpkg (build from master \<b98afc9f1>) +- Vcpkg (build from master \<0a1420dc4>) - Yarn 1.22.18 #### Environment variables @@ -60,16 +64,16 @@ - Docker Compose v1 1.29.2 - Docker Compose v2 2.4.1+azure-1 - Docker-Buildx 0.8.2 -- Docker-Moby Client 20.10.14+azure-1 -- Docker-Moby Server 20.10.14+azure-1 -- Git 2.36.0 (apt source repository: ppa:git-core/ppa) +- Docker-Moby Client 20.10.15+azure-1 +- Docker-Moby Server 20.10.15+azure-2 +- Git 2.36.1 (apt source repository: ppa:git-core/ppa) - Git LFS 3.1.4 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.3.1 - Haveged 1.9.1 - Heroku 7.60.2 - HHVM (HipHop VM) 4.159.0 - jq 1.5 -- Kind 0.12.0 +- Kind 0.13.0 - Kubectl 1.24.0 - Kustomize 4.5.4 - Leiningen 2.9.8 @@ -79,12 +83,12 @@ - n 8.2.0 - Newman 5.3.2 - nvm 0.39.1 -- OpenSSL 1.1.1-1ubuntu2.1~18.04.15 +- OpenSSL 1.1.1-1ubuntu2.1~18.04.17 - Packer 1.8.0 - Parcel 2.5.0 - PhantomJS 2.1.1 - Podman 3.0.1 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- Pulumi 3.31.0 +- Pulumi 3.32.1 - R 4.2.0 - Skopeo 1.2.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 @@ -95,24 +99,24 @@ - zstd 1.5.2 (homebrew) ### CLI Tools -- Alibaba Cloud CLI 3.0.118 -- AWS CLI 1.23.6 +- Alibaba Cloud CLI 3.0.119 +- AWS CLI 1.23.11 - AWS CLI Session manager plugin 1.2.312.0 -- AWS SAM CLI 1.47.0 +- AWS SAM CLI 1.49.0 - Azure CLI (azure-cli) 2.36.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.25.0 -- GitHub CLI 2.9.0 +- GitHub CLI 2.10.1 - Google Cloud SDK 369.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 10.1.0 +- Netlify CLI 10.3.0 - OpenShift CLI 4.10.12 - ORAS CLI 0.12.0 -- Vercel CLI 24.2.0 +- Vercel CLI 24.2.1 ### Java | Version | Vendor | Environment Variable | | ------------------- | --------------- | -------------------- | -| 8.0.322+6 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | +| 8.0.332+9 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | | 11.0.15+10 | Eclipse Temurin | JAVA_HOME_11_X64 | | 12.0.2+10 | Adopt OpenJDK | JAVA_HOME_12_X64 | | 17.0.3+7 | Eclipse Temurin | JAVA_HOME_17_X64 | @@ -147,7 +151,7 @@ - Rustfmt 1.4.38 ### Browsers and Drivers -- Google Chrome 101.0.4951.54 +- Google Chrome 101.0.4951.64 - ChromeDriver 101.0.4951.41 - Chromium 101.0.4951.0 - Mozilla Firefox 99.0 @@ -162,10 +166,10 @@ | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | ### .NET Core SDK -- 3.1.120 3.1.202 3.1.302 3.1.418 5.0.104 5.0.213 5.0.303 5.0.407 6.0.202 +- 3.1.120 3.1.202 3.1.302 3.1.419 5.0.104 5.0.214 5.0.303 5.0.408 6.0.300 ### .NET tools -- nbgv 3.5.103+351d94e36c +- nbgv 3.5.104+d0b7c362ff ### Databases - MongoDB 5.0.8 (apt source repository: https://repo.mongodb.org/apt/ubuntu) @@ -192,12 +196,12 @@ ### Cached Tools #### Go - 1.16.15 -- 1.17.9 -- 1.18.1 +- 1.17.10 +- 1.18.2 #### Node.js - 12.22.12 -- 14.19.1 +- 14.19.2 - 16.15.0 #### PyPy @@ -225,8 +229,8 @@ | Name | Value | Architecture | | --------------- | ----------------------------------- | ------------ | | GOROOT_1_16_X64 | /opt/hostedtoolcache/go/1.16.15/x64 | x64 | -| GOROOT_1_17_X64 | /opt/hostedtoolcache/go/1.17.9/x64 | x64 | -| GOROOT_1_18_X64 | /opt/hostedtoolcache/go/1.18.1/x64 | x64 | +| GOROOT_1_17_X64 | /opt/hostedtoolcache/go/1.17.10/x64 | x64 | +| GOROOT_1_18_X64 | /opt/hostedtoolcache/go/1.18.2/x64 | x64 | ### PowerShell Tools - PowerShell 7.2.3 @@ -235,7 +239,7 @@ | Module | Version | | --------------- | ------- | | MarkdownPS | 1.9 | -| Microsoft.Graph | 1.9.5 | +| Microsoft.Graph | 1.9.6 | | Pester | 5.3.3 | #### Az PowerShell Modules @@ -279,18 +283,18 @@ | alpine:3.12 | sha256:c75ac27b49326926b803b9ed43bf088bc220d22556de1bc5f72d742c91398f69 | 2022-04-05 | | alpine:3.13 | sha256:ccf92aa53bc6c3b25be2ad0cce80baec1778f007f7e076b0ffbd1b225d0b3a9b | 2022-04-05 | | alpine:3.14 | sha256:06b5d462c92fc39303e6363c65e074559f8d6b1363250027ed5053557e3398c5 | 2022-04-05 | -| buildpack-deps:bullseye | sha256:f26b9bcb6722fd59888caf4f4c1d4990799e3e83d804a83b7b58b4be949dc75e | 2022-04-20 | -| buildpack-deps:buster | sha256:b971efe3151fcfb10d0b7dfc739d081a9f9d9413195aa9b80224a66f4a651b4a | 2022-04-20 | -| buildpack-deps:stretch | sha256:fd003a4b08626dd6e5a59c61de0639243909644344a5bada501bf42e9982eac6 | 2022-04-20 | -| debian:10 | sha256:ebe4b9831fb22dfa778de4ffcb8ea0ad69b5d782d4e86cab14cc1fded5d8e761 | 2022-04-20 | -| debian:11 | sha256:6846593d7d8613e5dcc68c8f7d8b8e3179c7f3397b84a47c5b2ce989ef1075a0 | 2022-04-20 | -| debian:9 | sha256:cebe6e1c30384958d471467e231f740e8f0fd92cbfd2a435a186e9bada3aee1c | 2022-04-20 | -| moby/buildkit:latest | sha256:3fbc9b9d9a74ab650eea43610ed880e51cdc05282d61f83c2e0a3b2e9ed3a344 | 2022-04-27 | +| buildpack-deps:bullseye | sha256:f4369ea9e313fc97029c736d68a9ea705d14fd1884a70be33aae25196d59288b | 2022-05-11 | +| buildpack-deps:buster | sha256:3485150b7bd19da1e2ddbf567ee47c5ebd1ed62d55a334ff363a718057d713c3 | 2022-05-11 | +| buildpack-deps:stretch | sha256:1929159d9dfd9fc9cc8f6fb0c8414452ec4613b824e152b87e24de9a6e3b5879 | 2022-05-11 | +| debian:10 | sha256:405f48fbb359190809bd91aac79c3f6c346c1e79878c839351c6a817db5e9fc4 | 2022-05-11 | +| debian:11 | sha256:6137c67e2009e881526386c42ba99b3657e4f92f546814a33d35b14e60579777 | 2022-05-11 | +| debian:9 | sha256:3487fb8dc9312f88dd4aa03364c15d98a998c5c7c3453f0469002f9d593916f6 | 2022-05-11 | +| moby/buildkit:latest | sha256:0dc312b04eac1b44cd2cad566deb1e886c753109208affbbec8384f381ff7f38 | 2022-05-06 | | node:12 | sha256:01627afeb110b3054ba4a1405541ca095c8bfca1cb6f2be9479c767a2711879e | 2022-04-20 | | node:12-alpine | sha256:d4b15b3d48f42059a15bd659be60afe21762aae9d6cbea6f124440895c27db68 | 2022-04-11 | -| node:14 | sha256:2f39686f6d0b2687550659367fa11f56018a0f782b7e30f1a0ea56b11dece124 | 2022-04-20 | +| node:14 | sha256:3a01c30e387a7a94184a9a34a977474aaa1a1be8c5be0d94ff0590d57b3503ed | 2022-05-11 | | node:14-alpine | sha256:8845b4f88f64f8c56a39236648ba22946e806a6153c10911f77b70e5a2edb4ca | 2022-04-05 | -| node:16 | sha256:a6c217d7c8f001dc6fc081d55c2dd7fb3fefe871d5aa7be9c0c16bd62bea8e0c | 2022-04-27 | +| node:16 | sha256:a7e2fb81f46803cb0db58759465754a4d313eff5747c15360f684a0902f22fb1 | 2022-05-11 | | node:16-alpine | sha256:1a9a71ea86aad332aa7740316d4111ee1bd4e890df47d3b5eff3e5bded3b3d10 | 2022-04-27 | | ubuntu:16.04 | sha256:20858ebbc96215d6c3c574f781133ebffdc7c18d98af4f294cc4c04871a6fe61 | 2021-08-31 | | ubuntu:18.04 | sha256:d21b6ba9e19feffa328cb3864316e6918e30acfd55e285b5d3df1d8ca3c7fd3f | 2022-04-29 | @@ -309,7 +313,7 @@ | bzip2 | 1.0.6-8.1ubuntu0.2 | | coreutils | 8.28-1ubuntu1 | | curl | 7.58.0-2ubuntu3.17 | -| dbus | 1.12.2-1ubuntu1.2 | +| dbus | 1.12.2-1ubuntu1.3 | | dnsutils | 1:9.11.3+dfsg-1ubuntu1.17 | | dpkg | 1.19.0.5ubuntu2.3 | | fakeroot | 1.22-2ubuntu1 | @@ -334,7 +338,7 @@ | libmagickcore-dev | 8:6.9.7.4+dfsg-16ubuntu6.12 | | libmagickwand-dev | 8:6.9.7.4+dfsg-16ubuntu6.12 | | libsecret-1-dev | 0.18.6-1 | -| libsqlite3-dev | 3.22.0-1ubuntu0.4 | +| libsqlite3-dev | 3.22.0-1ubuntu0.5 | | libtool | 2.4.6-2 | | libunwind8 | 1.2.1-8 | | libxkbfile-dev | 1:1.0.9-2 | @@ -358,7 +362,7 @@ | rsync | 3.1.2-2.1ubuntu1.4 | | shellcheck | 0.4.6-1 | | sphinxsearch | 2.2.11-2 | -| sqlite3 | 3.22.0-1ubuntu0.4 | +| sqlite3 | 3.22.0-1ubuntu0.5 | | ssh | 1:7.6p1-4ubuntu0.6 | | sshpass | 1.06-1 | | subversion | 1.9.7-4ubuntu1 | @@ -378,3 +382,4 @@ | zip | 3.0-11build1 | | zsync | 0.6.2-3ubuntu1 | + From 1bd639f31dff07399bee0f45e48213aa41515b13 Mon Sep 17 00:00:00 2001 From: Rob Herley <robherley@github.com> Date: Thu, 12 May 2022 04:53:25 -0400 Subject: [PATCH 1133/3485] add ecdsa & ed25519 gh host keys (#5520) --- images/linux/scripts/installers/git.sh | 2 +- images/macos/provision/configuration/configure-ssh.sh | 2 +- images/win/scripts/Installers/Install-Git.ps1 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/images/linux/scripts/installers/git.sh b/images/linux/scripts/installers/git.sh index e3e821c830ad..2d2a030a74f2 100644 --- a/images/linux/scripts/installers/git.sh +++ b/images/linux/scripts/installers/git.sh @@ -45,7 +45,7 @@ tar xzf "$tmp_hub"/hub-linux-amd64-*.tgz --strip-components 1 -C "$tmp_hub" mv "$tmp_hub"/bin/hub /usr/local/bin # Add well-known SSH host keys to known_hosts -ssh-keyscan -t rsa github.com >> /etc/ssh/ssh_known_hosts +ssh-keyscan -t rsa,ecdsa,ed25519 github.com >> /etc/ssh/ssh_known_hosts ssh-keyscan -t rsa ssh.dev.azure.com >> /etc/ssh/ssh_known_hosts invoke_tests "Tools" "Git" \ No newline at end of file diff --git a/images/macos/provision/configuration/configure-ssh.sh b/images/macos/provision/configuration/configure-ssh.sh index 73095f551549..0e448d85f966 100755 --- a/images/macos/provision/configuration/configure-ssh.sh +++ b/images/macos/provision/configuration/configure-ssh.sh @@ -3,5 +3,5 @@ [[ ! -d ~/.ssh ]] && mkdir ~/.ssh 2>/dev/null chmod 777 ~/.ssh -ssh-keyscan -t rsa github.com >> ~/.ssh/known_hosts +ssh-keyscan -t rsa,ecdsa,ed25519 github.com >> ~/.ssh/known_hosts ssh-keyscan -t rsa ssh.dev.azure.com >> ~/.ssh/known_hosts diff --git a/images/win/scripts/Installers/Install-Git.ps1 b/images/win/scripts/Installers/Install-Git.ps1 index 2a0c769a0138..839f3751d458 100644 --- a/images/win/scripts/Installers/Install-Git.ps1 +++ b/images/win/scripts/Installers/Install-Git.ps1 @@ -21,7 +21,7 @@ if (Test-IsWin16) { } # 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,ecdsa,ed25519 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" Invoke-PesterTests -TestFile "Git" From 632693ff4adda75ab8f1fbd8a1bea89d1c1a04f3 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Thu, 12 May 2022 10:55:22 +0200 Subject: [PATCH 1134/3485] [macOS] set Xcode-13.3.1 as default (#5523) --- images/macos/toolsets/toolset-12.json | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index 84dc9a6a25d5..7a53bd6a868d 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -1,11 +1,9 @@ { "xcode": { - "default": "13.3", + "default": "13.3.1", "versions": [ - { "link": "13.3.1", "version": "13.3.1" }, - { "link": "13.3", "version": "13.3.0" }, - { "link": "13.2.1", "version": "13.2.1" }, - { "link": "13.2", "version": "13.2.0" }, + { "link": "13.3.1", "version": "13.3.1", "symlinks": ["13.3"] }, + { "link": "13.2.1", "version": "13.2.1", "symlinks": ["13.2"] }, { "link": "13.1", "version": "13.1.0" } ] }, From 453dccc462b476f054169aa628ebecb8184fb283 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 12 May 2022 10:37:36 +0000 Subject: [PATCH 1135/3485] Updating readme file for macOS-12 version 20220508.1 (#5505) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-12-Readme.md | 34 +++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/images/macos/macos-12-Readme.md b/images/macos/macos-12-Readme.md index 0f507a5cb7ed..a19969f329fb 100644 --- a/images/macos/macos-12-Readme.md +++ b/images/macos/macos-12-Readme.md @@ -6,7 +6,7 @@ # macOS 12.3 info - System Version: macOS 12.3.1 (21E258) - Kernel Version: Darwin 21.4.0 -- Image Version: 20220429.1 +- Image Version: 20220508.1 ## Installed Software ### Language and Runtime @@ -22,7 +22,7 @@ - MSBuild 16.10.1.17201 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) - Node.js v16.15.0 - NVM 0.39.1 -- NVM - Cached node versions: v12.22.12 v14.19.1 v16.15.0 +- NVM - Cached node versions: v12.22.12 v14.19.2 v16.15.0 - Perl 5.34.0 - PHP 8.1.5 - Python 2.7.18 @@ -31,18 +31,18 @@ - Ruby 3.0.4p208 ### Package Management -- Bundler version 2.3.12 +- Bundler version 2.3.13 - Carthage 0.38.0 - CocoaPods 1.11.3 - Composer 2.3.5 -- Homebrew 3.4.9 +- Homebrew 3.4.10 - NPM 8.5.5 - NuGet 5.9.0.7134 - Pip 20.3.4 (python 2.7) - Pip 22.0.4 (python 3.9) - Pipx 1.0.0 - RubyGems 3.2.33 -- Vcpkg 2022 (build from master \<c8a56fdc1>) +- Vcpkg 2022 (build from master \<a5d6d1451>) - Yarn 1.22.18 ### Project Management @@ -66,10 +66,11 @@ - GNU Wget 1.21.3 - gpg (GnuPG) 2.3.6 - Hub CLI: 2.14.2 +- ImageMagick 7.1.0-32 - jq 1.6 - mongo v5.0.7 - mongod v5.0.7 -- OpenSSL 1.1.1n 15 Mar 2022 `(/usr/local/opt/openssl@1.1 -> ../Cellar/openssl@1.1/1.1.1n)` +- OpenSSL 1.1.1o 3 May 2022 `(/usr/local/opt/openssl@1.1 -> ../Cellar/openssl@1.1/1.1.1o)` - Packer 1.8.0 - PostgreSQL 14.2 - psql (PostgreSQL) 14.2 @@ -81,19 +82,20 @@ ### Tools - App Center CLI command -- AWS CLI 2.6.1 -- AWS SAM CLI 1.47.0 +- AWS CLI 2.6.3 +- AWS SAM CLI 1.48.0 - AWS Session Manager CLI 1.2.312.0 - Azure CLI (azure-devops) 0.25.0 - Azure CLI 2.36.0 -- Bicep CLI 0.5.6 +- Bicep CLI 0.6.1 - Cabal 3.6.2.0 - Cmake 3.23.1 - Fastlane 2.205.2 - GHC 9.2.2 -- GHCup v0.1.17.7 +- GHCup 0.1.17.7 - Jazzy 0.14.2 - Stack 2.7.5 +- SwiftFormat 0.49.8 - Swig 4.0.2 - Xcode Command Line Tools 13.3.1.0.1.1648687083 @@ -104,11 +106,11 @@ ### Browsers - Safari 15.4 (17613.1.17.1.13) - SafariDriver 15.4 (17613.1.17.1.13) -- Google Chrome 101.0.4951.41 +- Google Chrome 101.0.4951.54 - ChromeDriver 101.0.4951.41 -- Microsoft Edge 101.0.1210.32 -- MSEdgeDriver 101.0.1210.32 -- Mozilla Firefox 99.0.1 +- Microsoft Edge 101.0.1210.39 +- MSEdgeDriver 101.0.1210.39 +- Mozilla Firefox 100.0 - geckodriver 0.31.0 - Selenium server 4.1.4 @@ -122,7 +124,7 @@ ### Java | Version | Vendor | Environment Variable | | ------------------- | --------------- | -------------------- | -| 8.0.322+6 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | +| 8.0.332+9 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | | 11.0.15+10 | Eclipse Temurin | JAVA_HOME_11_X64 | | 17.0.3+7 | Eclipse Temurin | JAVA_HOME_17_X64 | @@ -151,7 +153,7 @@ #### Node.js - 12.22.12 -- 14.19.1 +- 14.19.2 - 16.15.0 #### Go From 66359f61ec7a062dbc1616c4dae5ca96b77b77ad Mon Sep 17 00:00:00 2001 From: alex-3sr <38663389+alex-3sr@users.noreply.github.com> Date: Thu, 12 May 2022 12:49:15 +0200 Subject: [PATCH 1136/3485] Add new feature for permit azure tags (#5467) --- .gitignore | 5 +++- docs/create-image-and-azure-resources.md | 6 ++++ helpers/GenerateResourcesAndImage.ps1 | 37 +++++++++++++----------- 3 files changed, 30 insertions(+), 18 deletions(-) diff --git a/.gitignore b/.gitignore index a327f4562019..e56257596ab5 100644 --- a/.gitignore +++ b/.gitignore @@ -387,4 +387,7 @@ public .dynamodb/ # visual studio code launch configuration -launch.json \ No newline at end of file +launch.json + +# Ignore dynamic template +images/*/*-temp.json diff --git a/docs/create-image-and-azure-resources.md b/docs/create-image-and-azure-resources.md index f079a1fe8c63..2f8f93fceb33 100644 --- a/docs/create-image-and-azure-resources.md +++ b/docs/create-image-and-azure-resources.md @@ -72,6 +72,12 @@ For optional authentication via service principal make sure to provide the follo GenerateResourcesAndImage -SubscriptionId {YourSubscriptionId} -ResourceGroupName "myTestResourceGroup" -ImageGenerationRepositoryRoot "$pwd" -ImageType Ubuntu1804 -AzureLocation "East US" -AzureClientId {AADApplicationID} -AzureClientSecret {AADApplicationSecret} -AzureTenantId {AADTenantID} ``` +As extra options, you can add more params for permit to add Azure Tags on resources and enable https for Storage Account. It could be helpful on some tenants with hardenning policy. Params are — `EnableHttpsTrafficOnly` (Boolean) and `tags` (HashTable), so the whole command will be: + +``` +GenerateResourcesAndImage -SubscriptionId {YourSubscriptionId} -ResourceGroupName "myTestResourceGroup" -ImageGenerationRepositoryRoot "$pwd" -ImageType Ubuntu1804 -AzureLocation "East US" -EnableHttpsTrafficOnly $true -tags @{dept="devops";env="prod"} +``` + *Please, check synopsis of `GenerateResourcesAndImage` for details about non-mandatory parameters.* #### Generated VM Deployment diff --git a/helpers/GenerateResourcesAndImage.ps1 b/helpers/GenerateResourcesAndImage.ps1 index 9e88e8a8d13a..5166d454298b 100644 --- a/helpers/GenerateResourcesAndImage.ps1 +++ b/helpers/GenerateResourcesAndImage.ps1 @@ -62,44 +62,32 @@ Function GenerateResourcesAndImage { <# .SYNOPSIS A helper function to help generate an image. - .DESCRIPTION Creates Azure resources and kicks off a packer image generation for the selected image type. - .PARAMETER SubscriptionId The Azure subscription Id where resources will be created. - .PARAMETER ResourceGroupName The Azure resource group name where the Azure resources will be created. - .PARAMETER ImageGenerationRepositoryRoot The root path of the image generation repository source. - .PARAMETER ImageType The type of the image being generated. Valid options are: {"Windows2016", "Windows2019", "Windows2022", "Ubuntu1804", "Ubuntu2004"}. - .PARAMETER AzureLocation The location of the resources being created in Azure. For example "East US". - .PARAMETER Force Delete the resource group if it exists without user confirmation. - .PARAMETER AzureClientId Client id needs to be provided for optional authentication via service principal. Example: "11111111-1111-1111-1111-111111111111" - .PARAMETER AzureClientSecret Client secret needs to be provided for optional authentication via service principal. Example: "11111111-1111-1111-1111-111111111111" - .PARAMETER AzureTenantId Tenant needs to be provided for optional authentication via service principal. Example: "11111111-1111-1111-1111-111111111111" - .PARAMETER RestrictToAgentIpAddress If set, access to the VM used by packer to generate the image is restricted to the public IP address this script is run from. This parameter cannot be used in combination with the virtual_network_name packer parameter. .PARAMETER AllowBlobPublicAccess The Azure storage account will be created with this option. - .EXAMPLE GenerateResourcesAndImage -SubscriptionId {YourSubscriptionId} -ResourceGroupName "shsamytest1" -ImageGenerationRepositoryRoot "C:\virtual-environments" -ImageType Ubuntu1804 -AzureLocation "East US" #> @@ -129,7 +117,9 @@ Function GenerateResourcesAndImage { [Parameter(Mandatory = $False)] [bool] $AllowBlobPublicAccess = $False, [Parameter(Mandatory = $False)] - [bool] $EnableHttpsTrafficOnly = $False + [bool] $EnableHttpsTrafficOnly = $False, + [Parameter(Mandatory = $False)] + [Hashtable] $tags ) try { @@ -161,7 +151,8 @@ Function GenerateResourcesAndImage { if($Force -eq $true) { # Cleanup the resource group if it already exitsted before Remove-AzResourceGroup -Name $ResourceGroupName -Force - New-AzResourceGroup -Name $ResourceGroupName -Location $AzureLocation + New-AzResourceGroup -Name $ResourceGroupName -Location $AzureLocation -Tag $tags + } else { $title = "Delete Resource Group" $message = "The resource group you specified already exists. Do you want to clean it up?" @@ -180,13 +171,13 @@ Function GenerateResourcesAndImage { switch ($result) { - 0 { Remove-AzResourceGroup -Name $ResourceGroupName -Force; New-AzResourceGroup -Name $ResourceGroupName -Location $AzureLocation } + 0 { Remove-AzResourceGroup -Name $ResourceGroupName -Force; New-AzResourceGroup -Name $ResourceGroupName -Location $AzureLocation -Tag $tags } 1 { <# Do nothing #> } 2 { exit } } } } else { - New-AzResourceGroup -Name $ResourceGroupName -Location $AzureLocation + New-AzResourceGroup -Name $ResourceGroupName -Location $AzureLocation -Tag $tags } # This script should follow the recommended naming conventions for azure resources @@ -204,7 +195,11 @@ Function GenerateResourcesAndImage { $storageAccountName = $storageAccountName.Substring(0, 24) } - New-AzStorageAccount -ResourceGroupName $ResourceGroupName -AccountName $storageAccountName -Location $AzureLocation -SkuName "Standard_LRS" -AllowBlobPublicAccess $AllowBlobPublicAccess -EnableHttpsTrafficOnly $EnableHttpsTrafficOnly + if ($tags) { + New-AzStorageAccount -ResourceGroupName $ResourceGroupName -AccountName $storageAccountName -Location $AzureLocation -SkuName "Standard_LRS" -AllowBlobPublicAccess $AllowBlobPublicAccess -EnableHttpsTrafficOnly $EnableHttpsTrafficOnly -Tag $tags + } else { + New-AzStorageAccount -ResourceGroupName $ResourceGroupName -AccountName $storageAccountName -Location $AzureLocation -SkuName "Standard_LRS" -AllowBlobPublicAccess $AllowBlobPublicAccess -EnableHttpsTrafficOnly $EnableHttpsTrafficOnly + } if ([string]::IsNullOrEmpty($AzureClientId)) { # Interactive authentication: A service principal is created during runtime. @@ -269,6 +264,14 @@ Function GenerateResourcesAndImage { $AgentIp = (Invoke-RestMethod http://ipinfo.io/json).ip Write-Host "Restricting access to packer generated VM to agent IP Address: $AgentIp" } + + if ($tags) { + $builderScriptPath_temp = $builderScriptPath.Replace(".json", "-temp.json") + $packer_script = Get-Content -Path $builderScriptPath | ConvertFrom-Json + $packer_script.builders | Add-Member -Name "azure_tags" -Value $tags -MemberType NoteProperty + $packer_script | ConvertTo-Json -Depth 3 | Out-File $builderScriptPath_temp + $builderScriptPath = $builderScriptPath_temp + } & $packerBinary build -on-error=ask ` -var "client_id=$($spClientId)" ` From 70118fee998a6c489dc04e1ad42957d41fa6be54 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 12 May 2022 12:29:05 +0000 Subject: [PATCH 1137/3485] Updating readme file for macOS-11 version 20220508.1 (#5509) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-11-Readme.md | 35 +++++++++++++++++---------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/images/macos/macos-11-Readme.md b/images/macos/macos-11-Readme.md index 53bff2685407..fd92f50f8d84 100644 --- a/images/macos/macos-11-Readme.md +++ b/images/macos/macos-11-Readme.md @@ -6,7 +6,7 @@ # macOS 11.6 info - System Version: macOS 11.6.5 (20G527) - Kernel Version: Darwin 20.6.0 -- Image Version: 20220501.1 +- Image Version: 20220508.1 ## Installed Software ### Language and Runtime @@ -26,7 +26,7 @@ - MSBuild 16.10.1.17201 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) - Node.js v16.15.0 - NVM 0.39.1 -- NVM - Cached node versions: v12.22.12 v14.19.1 v16.15.0 +- NVM - Cached node versions: v12.22.12 v14.19.2 v16.15.0 - Perl 5.34.0 - PHP 8.1.5 - Python 2.7.18 @@ -35,11 +35,11 @@ - Ruby 2.7.6p219 ### Package Management -- Bundler version 2.3.12 +- Bundler version 2.3.13 - Carthage 0.38.0 - CocoaPods 1.11.3 - Composer 2.3.5 -- Homebrew 3.4.9 +- Homebrew 3.4.10 - Miniconda 4.11.0 - NPM 8.5.5 - NuGet 5.9.0.7134 @@ -47,7 +47,7 @@ - Pip 22.0.4 (python 3.9) - Pipx 1.0.0 - RubyGems 3.2.33 -- Vcpkg 2022 (build from master \<c8a56fdc1>) +- Vcpkg 2022 (build from master \<a5d6d1451>) - Yarn 1.22.18 #### Environment variables @@ -78,11 +78,12 @@ - gpg (GnuPG) 2.3.6 - helm v3.8.2+g6e3701e - Hub CLI: 2.14.2 +- ImageMagick 7.1.0-32 - jq 1.6 - mongo v5.0.7 - mongod v5.0.7 - Newman 5.3.2 -- OpenSSL 1.1.1n 15 Mar 2022 `(/usr/local/opt/openssl@1.1 -> ../Cellar/openssl@1.1/1.1.1n)` +- OpenSSL 1.1.1o 3 May 2022 `(/usr/local/opt/openssl@1.1 -> ../Cellar/openssl@1.1/1.1.1o)` - Packer 1.8.0 - PostgreSQL 14.2 - psql (PostgreSQL) 14.2 @@ -95,20 +96,20 @@ ### Tools - Aliyun CLI 3.0.117 - App Center CLI 2.10.10 -- AWS CLI 2.6.1 -- AWS SAM CLI 1.47.0 +- AWS CLI 2.6.3 +- AWS SAM CLI 1.48.0 - AWS Session Manager CLI 1.2.312.0 - Azure CLI (azure-devops) 0.25.0 - Azure CLI 2.36.0 -- Bicep CLI 0.5.6 +- Bicep CLI 0.6.1 - Cabal 3.6.2.0 - Cmake 3.23.1 - Fastlane 2.205.2 - GHC 9.2.2 -- GHCup v0.1.17.7 +- GHCup 0.1.17.7 - Jazzy 0.14.2 - Stack 2.7.5 -- SwiftFormat 0.49.7 +- SwiftFormat 0.49.8 - Swig 4.0.2 - Xcode Command Line Tools 13.2.0.0.1.1638488800 @@ -119,11 +120,11 @@ ### Browsers - Safari 15.4 (16613.1.17.1.13) - SafariDriver 15.4 (16613.1.17.1.13) -- Google Chrome 101.0.4951.41 +- Google Chrome 101.0.4951.54 - ChromeDriver 101.0.4951.41 -- Microsoft Edge 101.0.1210.32 -- MSEdgeDriver 101.0.1210.32 -- Mozilla Firefox 99.0.1 +- Microsoft Edge 101.0.1210.39 +- MSEdgeDriver 101.0.1210.39 +- Mozilla Firefox 100.0 - geckodriver 0.31.0 - Selenium server 4.1.4 @@ -137,7 +138,7 @@ ### Java | Version | Vendor | Environment Variable | | ------------------- | --------------- | -------------------- | -| 8.0.322+6 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | +| 8.0.332+9 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | | 11.0.15+10 | Eclipse Temurin | JAVA_HOME_11_X64 | | 17.0.3+7 | Eclipse Temurin | JAVA_HOME_17_X64 | @@ -169,7 +170,7 @@ #### Node.js - 12.22.12 -- 14.19.1 +- 14.19.2 - 16.15.0 #### Go From bf517ce489edb90107e4d9b482d7628282299115 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 12 May 2022 14:13:55 +0000 Subject: [PATCH 1138/3485] Updating readme file for macOS-10.15 version 20220508.1 (#5508) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-10.15-Readme.md | 35 +++++++++++++++--------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/images/macos/macos-10.15-Readme.md b/images/macos/macos-10.15-Readme.md index 4c9ec4e6df0e..fbf748b05f3e 100644 --- a/images/macos/macos-10.15-Readme.md +++ b/images/macos/macos-10.15-Readme.md @@ -6,7 +6,7 @@ # macOS 10.15 info - System Version: macOS 10.15.7 (19H1824) - Kernel Version: Darwin 19.6.0 -- Image Version: 20220501.1 +- Image Version: 20220508.1 ## Installed Software ### Language and Runtime @@ -26,7 +26,7 @@ - MSBuild 16.10.1.58001 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) - Node.js v16.15.0 - NVM 0.39.1 -- NVM - Cached node versions: v12.22.12 v14.19.1 v16.15.0 +- NVM - Cached node versions: v12.22.12 v14.19.2 v16.15.0 - Perl 5.34.0 - PHP 8.1.5 - Python 2.7.18 @@ -35,11 +35,11 @@ - Ruby 2.7.6p219 ### Package Management -- Bundler version 2.3.12 +- Bundler version 2.3.13 - Carthage 0.38.0 - CocoaPods 1.11.3 - Composer 2.3.5 -- Homebrew 3.4.9 +- Homebrew 3.4.10 - Miniconda 4.11.0 - NPM 8.5.5 - NuGet 5.9.0.7134 @@ -47,7 +47,7 @@ - Pip 22.0.4 (python 3.9) - Pipx 1.0.0 - RubyGems 3.2.33 -- Vcpkg 2022 (build from master \<c8a56fdc1>) +- Vcpkg 2022 (build from master \<a5d6d1451>) - Yarn 1.22.18 #### Environment variables @@ -79,11 +79,12 @@ - gpg (GnuPG) 2.3.6 - helm v3.8.2+g6e3701e - Hub CLI: 2.14.2 +- ImageMagick 7.1.0-32 - jq 1.6 - mongo v5.0.7 - mongod v5.0.7 - Newman 5.3.2 -- OpenSSL 1.1.1n 15 Mar 2022 `(/usr/local/opt/openssl@1.1 -> ../Cellar/openssl@1.1/1.1.1n)` +- OpenSSL 1.1.1o 3 May 2022 `(/usr/local/opt/openssl@1.1 -> ../Cellar/openssl@1.1/1.1.1o)` - Packer 1.8.0 - PostgreSQL 14.2 - psql (PostgreSQL) 14.2 @@ -98,20 +99,20 @@ ### Tools - Aliyun CLI 3.0.117 - App Center CLI 2.10.10 -- AWS CLI 2.6.1 -- AWS SAM CLI 1.47.0 +- AWS CLI 2.6.3 +- AWS SAM CLI 1.48.0 - AWS Session Manager CLI 1.2.312.0 - Azure CLI (azure-devops) 0.25.0 - Azure CLI 2.36.0 -- Bicep CLI 0.5.6 +- Bicep CLI 0.6.1 - Cabal 3.6.2.0 - Cmake 3.23.1 - Fastlane 2.205.2 - GHC 9.2.2 -- GHCup v0.1.17.7 +- GHCup 0.1.17.7 - Jazzy 0.14.2 - Stack 2.7.5 -- SwiftFormat 0.49.7 +- SwiftFormat 0.49.8 - Swig 4.0.2 - Xcode Command Line Tools 12.4.0.0.1.1610135815 @@ -122,11 +123,11 @@ ### Browsers - Safari 15.4 (15613.1.17.1.13) - SafariDriver 15.4 (15613.1.17.1.13) -- Google Chrome 101.0.4951.41 +- Google Chrome 101.0.4951.54 - ChromeDriver 101.0.4951.41 -- Microsoft Edge 101.0.1210.32 -- MSEdgeDriver 101.0.1210.32 -- Mozilla Firefox 99.0.1 +- Microsoft Edge 101.0.1210.39 +- MSEdgeDriver 101.0.1210.39 +- Mozilla Firefox 100.0 - geckodriver 0.31.0 - Selenium server 4.1.4 @@ -140,7 +141,7 @@ ### Java | Version | Vendor | Environment Variable | | ------------------- | --------------- | -------------------- | -| 8.0.322+6 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | +| 8.0.332+9 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | | 11.0.15+10 | Eclipse Temurin | JAVA_HOME_11_X64 | | 12.0.2+10.3 | Adopt OpenJDK | JAVA_HOME_12_X64 | | 13.0.2+8.1 | Adopt OpenJDK | JAVA_HOME_13_X64 | @@ -177,7 +178,7 @@ #### Node.js - 12.22.12 -- 14.19.1 +- 14.19.2 - 16.15.0 #### Go From 78d8bca4d39f7b8be4449f1c331dc66532e9d2b1 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 12 May 2022 15:42:00 +0000 Subject: [PATCH 1139/3485] Updating readme file for win22 version 20220511.2 (#5526) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2022-Readme.md | 477 ++++++++++++++++--------------- 1 file changed, 239 insertions(+), 238 deletions(-) diff --git a/images/win/Windows2022-Readme.md b/images/win/Windows2022-Readme.md index 7f2c32efe252..153833c8ee1d 100644 --- a/images/win/Windows2022-Readme.md +++ b/images/win/Windows2022-Readme.md @@ -3,8 +3,8 @@ | [[Azure DevOps] Windows-2016 environment removal postponed until June 30, 2022](https://github.com/actions/virtual-environments/issues/5403) | *** # Microsoft Windows Server 2022 Datacenter -- OS Version: 10.0.20348 Build 643 -- Image Version: 20220503.1 +- OS Version: 10.0.20348 Build 707 +- Image Version: 20220511.2 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -12,7 +12,7 @@ ## Installed Software ### Language and Runtime - Bash 4.4.23(2)-release -- Go 1.17.9 +- Go 1.17.10 - Julia 1.7.2 - Kotlin 1.6.21 - LLVM 13.0.1 @@ -32,7 +32,7 @@ - pip 22.0.4 (python 3.9) - Pipx 1.0.0 - RubyGems 3.2.33 -- Vcpkg (build from master \<b98afc9f1>) +- Vcpkg (build from master \<0a1420dc4>) - Yarn 1.22.18 #### Environment variables @@ -52,27 +52,28 @@ - azcopy 10.14.1 - Bazel 5.1.1 - Bazelisk 1.11.0 -- Bicep 0.5.6 +- Bicep 0.6.1 - Cabal 3.6.2.0 - CMake 3.23.1 -- CodeQL Action Bundle 2.9.0 +- CodeQL Action Bundle 2.9.1 - Docker 20.10.7 -- Docker-compose 1.29.2 +- Docker Compose v1 1.29.2 +- Docker Compose v2 2.5.0 - Docker-wincred 0.6.4 - ghc 9.2.2 - Git 2.35.1.windows.2 - Git LFS 3.0.2 - InnoSetup 6.2.1 - jq 1.6 -- Kind 0.12.0 -- Kubectl 1.23.6 +- Kind 0.13.0 +- Kubectl 1.24.0 - Mercurial 5.0 - Mingw-w64 8.1.0 - Newman 5.3.2 - NSIS v3.08 - OpenSSL 1.1.1 - Packer 1.8.0 -- Pulumi v3.31.0 +- Pulumi v3.32.1 - R 4.2.0 - Service Fabric SDK 9.0.1017.9590 - Stack 2.7.5 @@ -85,13 +86,13 @@ - zstd 1.5.2 ### CLI Tools -- Alibaba Cloud CLI 3.0.118 -- AWS CLI 2.6.1 -- AWS SAM CLI 1.48.0 +- Alibaba Cloud CLI 3.0.119 +- AWS CLI 2.6.3 +- AWS SAM CLI 1.49.0 - AWS Session Manager CLI 1.2.312.0 - Azure CLI 2.36.0 - Azure DevOps CLI extension 0.25.0 -- GitHub CLI 2.9.0 +- GitHub CLI 2.10.1 - Hub CLI 2.14.2 ### Rust Tools @@ -109,10 +110,10 @@ - Rustfmt 1.4.38 ### Browsers and webdrivers -- Google Chrome 101.0.4951.54 +- Google Chrome 101.0.4951.64 - Chrome Driver 101.0.4951.41 -- Microsoft Edge 101.0.1210.32 -- Microsoft Edge Driver 101.0.1210.32 +- Microsoft Edge 101.0.1210.39 +- Microsoft Edge Driver 101.0.1210.39 - Mozilla Firefox 100.0 - Gecko Driver 0.31.0 - IE Driver 3.150.1.1 @@ -129,7 +130,7 @@ ### Java | Version | Vendor | Environment Variable | | ------------------- | --------------- | -------------------- | -| 8.0.322+6 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | +| 8.0.332+9 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | | 11.0.15+10 | Eclipse Temurin | JAVA_HOME_11_X64 | | 17.0.3+7 | Eclipse Temurin | JAVA_HOME_17_X64 | @@ -155,14 +156,14 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Version | Architecture | Environment Variable | | ------- | ------------ | -------------------- | | 1.16.15 | x64 | GOROOT_1_16_X64 | -| 1.17.9 (Default) | x64 | GOROOT_1_17_X64 | -| 1.18.1 | x64 | GOROOT_1_18_X64 | +| 1.17.10 (Default) | x64 | GOROOT_1_17_X64 | +| 1.18.2 | x64 | GOROOT_1_18_X64 | #### Node | Version | Architecture | | ------- | ------------ | | 12.22.12 | x64 | -| 14.19.1 | x64 | +| 14.19.2 | x64 | | 16.15.0 | x64 | #### Python @@ -207,7 +208,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | 5.0.8.0 | MongoDB | Running | Automatic | ### Database tools -- Azure CosmosDb Emulator 2.14.6.0 +- Azure CosmosDb Emulator 2.14.7.0 - DacFx 16.0.5400.1 - MySQL 8.0.29.0 - SQL OLEDB Driver 18.6.3.0 @@ -220,219 +221,219 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Nginx | 1.21.6 | C:\tools\nginx-1.21.6\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2022 -| Name | Version | Path | -| ----------------------------- | ------------- | -------------------------------------------------------- | -| Visual Studio Enterprise 2022 | 17.1.32421.90 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | +| Name | Version | Path | +| ----------------------------- | -------------- | -------------------------------------------------------- | +| Visual Studio Enterprise 2022 | 17.2.32505.173 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | #### Workloads, components and extensions: | Package | Version | | ------------------------------------------------------------------------- | -------------- | -| Component.Android.NDK.R21E | 17.1.32112.364 | -| Component.Android.SDK.MAUI | 17.1.32112.364 | -| Component.Android.SDK25.Private | 17.1.32112.364 | +| Component.Android.NDK.R21E | 17.2.32408.312 | +| Component.Android.SDK.MAUI | 17.2.32408.312 | +| Component.Android.SDK25.Private | 17.2.32408.312 | | Component.Ant | 1.9.3.8 | -| Component.Linux.CMake | 17.1.32112.364 | -| Component.MDD.Android | 17.1.32112.364 | -| Component.MDD.Linux | 17.1.32112.364 | -| Component.MDD.Linux.GCC.arm | 17.1.32112.364 | -| Component.Microsoft.VisualStudio.LiveShare.2022 | 1.0.5431 | -| Component.Microsoft.VisualStudio.RazorExtension | 17.1.32112.364 | -| Component.Microsoft.VisualStudio.Web.AzureFunctions | 17.1.32112.364 | -| Component.Microsoft.Web.LibraryManager | 17.1.32112.364 | -| Component.Microsoft.WebTools.BrowserLink.WebLivePreview | 17.1.70.52095 | +| Component.Linux.CMake | 17.2.32408.312 | +| Component.MDD.Android | 17.2.32408.312 | +| Component.MDD.Linux | 17.2.32408.312 | +| Component.MDD.Linux.GCC.arm | 17.2.32408.312 | +| Component.Microsoft.VisualStudio.LiveShare.2022 | 1.0.5545 | +| Component.Microsoft.VisualStudio.RazorExtension | 17.2.32408.312 | +| Component.Microsoft.VisualStudio.Web.AzureFunctions | 17.2.32408.312 | +| Component.Microsoft.Web.LibraryManager | 17.2.32408.312 | +| Component.Microsoft.WebTools.BrowserLink.WebLivePreview | 17.2.91.23537 | | Component.Microsoft.Windows.CppWinRT | 2.0.210806.1 | -| Component.OpenJDK | 17.1.32112.364 | -| Component.UnityEngine.x64 | 17.1.32112.364 | -| Component.Unreal | 17.1.32112.364 | -| Component.Unreal.Android | 17.1.32112.364 | +| Component.OpenJDK | 17.2.32408.312 | +| Component.UnityEngine.x64 | 17.2.32408.312 | +| Component.Unreal | 17.2.32408.312 | +| Component.Unreal.Android | 17.2.32408.312 | | Component.VSInstallerProjects2022 | 2.0.0 | | Component.WixToolset.VisualStudioExtension.Dev17 | 1.0.0.18 | | Component.WixToolset.VisualStudioExtension.Schemas3 | 1.0.0.18 | | Component.WixToolset.VisualStudioExtension.Schemas4 | 1.0.0.18 | -| Component.Xamarin | 17.1.32112.364 | -| Component.Xamarin.RemotedSimulator | 17.1.32112.364 | -| Microsoft.Component.Azure.DataLake.Tools | 17.1.32112.364 | -| Microsoft.Component.ClickOnce | 17.1.32112.364 | -| Microsoft.Component.CodeAnalysis.SDK | 17.1.32112.364 | -| Microsoft.Component.MSBuild | 17.1.32112.364 | -| Microsoft.Component.NetFX.Native | 17.1.32112.364 | -| Microsoft.Component.PythonTools | 17.1.32112.364 | -| Microsoft.Component.PythonTools.Web | 17.1.32112.364 | -| Microsoft.Component.VC.Runtime.UCRTSDK | 17.1.32112.364 | -| Microsoft.ComponentGroup.Blend | 17.1.32112.364 | -| Microsoft.ComponentGroup.ClickOnce.Publish | 17.1.32112.364 | -| Microsoft.Net.Component.4.5.2.TargetingPack | 17.1.32112.364 | -| Microsoft.Net.Component.4.6.2.TargetingPack | 17.1.32112.364 | -| Microsoft.Net.Component.4.6.TargetingPack | 17.1.32112.364 | -| Microsoft.Net.Component.4.7.1.TargetingPack | 17.1.32112.364 | -| Microsoft.Net.Component.4.7.2.TargetingPack | 17.1.32112.364 | -| Microsoft.Net.Component.4.7.TargetingPack | 17.1.32112.364 | -| Microsoft.Net.Component.4.8.SDK | 17.1.32112.364 | -| Microsoft.Net.Component.4.8.TargetingPack | 17.1.32112.364 | -| Microsoft.Net.ComponentGroup.4.8.DeveloperTools | 17.1.32112.364 | -| Microsoft.Net.ComponentGroup.DevelopmentPrerequisites | 17.1.32112.364 | -| Microsoft.Net.ComponentGroup.TargetingPacks.Common | 17.1.32112.364 | +| Component.Xamarin | 17.2.32408.312 | +| Component.Xamarin.RemotedSimulator | 17.2.32408.312 | +| Microsoft.Component.Azure.DataLake.Tools | 17.2.32408.312 | +| Microsoft.Component.ClickOnce | 17.2.32408.312 | +| Microsoft.Component.CodeAnalysis.SDK | 17.2.32408.312 | +| Microsoft.Component.MSBuild | 17.2.32408.312 | +| Microsoft.Component.NetFX.Native | 17.2.32408.312 | +| Microsoft.Component.PythonTools | 17.2.32408.312 | +| Microsoft.Component.PythonTools.Web | 17.2.32408.312 | +| Microsoft.Component.VC.Runtime.UCRTSDK | 17.2.32408.312 | +| Microsoft.ComponentGroup.Blend | 17.2.32408.312 | +| Microsoft.ComponentGroup.ClickOnce.Publish | 17.2.32408.312 | +| Microsoft.Net.Component.4.5.2.TargetingPack | 17.2.32408.312 | +| Microsoft.Net.Component.4.6.2.TargetingPack | 17.2.32408.312 | +| Microsoft.Net.Component.4.6.TargetingPack | 17.2.32408.312 | +| Microsoft.Net.Component.4.7.1.TargetingPack | 17.2.32408.312 | +| Microsoft.Net.Component.4.7.2.TargetingPack | 17.2.32408.312 | +| Microsoft.Net.Component.4.7.TargetingPack | 17.2.32408.312 | +| Microsoft.Net.Component.4.8.SDK | 17.2.32408.312 | +| Microsoft.Net.Component.4.8.TargetingPack | 17.2.32408.312 | +| Microsoft.Net.ComponentGroup.4.8.DeveloperTools | 17.2.32408.312 | +| Microsoft.Net.ComponentGroup.DevelopmentPrerequisites | 17.2.32408.312 | +| Microsoft.Net.ComponentGroup.TargetingPacks.Common | 17.2.32408.312 | | microsoft.net.runtime.mono.tooling | 6.0.422.16404 | | microsoft.net.sdk.emscripten | 6.0.6.16102 | -| Microsoft.NetCore.Component.DevelopmentTools | 17.1.32112.364 | -| Microsoft.NetCore.Component.Runtime.6.0 | 17.1.32406.283 | -| Microsoft.NetCore.Component.SDK | 17.1.32406.283 | -| Microsoft.NetCore.Component.Web | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.AppInsights.Tools | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.AspNet | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.AspNet45 | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.Azure.AuthoringTools | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.Azure.ClientLibs | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.Azure.Compute.Emulator | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.Azure.Powershell | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.Azure.ResourceManager.Tools | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.Azure.ServiceFabric.Tools | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.Azure.Waverton | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.Azure.Waverton.BuildTools | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.ClassDesigner | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.CodeMap | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.Common.Azure.Tools | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.CoreEditor | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.Debugger.JustInTime | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.Debugger.Snapshot | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.DiagnosticTools | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.DockerTools | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.DotNetModelBuilder | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.DslTools | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.Embedded | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.EntityFramework | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.FSharp | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.FSharp.Desktop | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.FSharp.WebTemplates | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.GraphDocument | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.Graphics | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.Graphics.Tools | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.IISExpress | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.IntelliCode | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.IntelliTrace.FrontEnd | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.JavaScript.Diagnostics | 17.1.32406.283 | -| Microsoft.VisualStudio.Component.JavaScript.TypeScript | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.LinqToSql | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.LiveUnitTesting | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.ManagedDesktop.Core | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.ManagedDesktop.Prerequisites | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.Merq | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.MonoDebugger | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.MSODBC.SQL | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.MSSQL.CMDLnUtils | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.Node.Tools | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.NuGet | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.NuGet.BuildTools | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.PortableLibrary | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.Roslyn.Compiler | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.Roslyn.LanguageServices | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.Sharepoint.Tools | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.SQL.CLR | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.SQL.DataSources | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.SQL.LocalDB.Runtime | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.SQL.SSDT | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.TeamOffice | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.TestTools.CodedUITest | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.TestTools.WebLoadTest | 17.1.32406.283 | -| Microsoft.VisualStudio.Component.TextTemplating | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.TypeScript.TSServer | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.Unity | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.UWP.VC.ARM64 | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM.Spectre | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM64 | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM64.Spectre | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.Spectre | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.Spectre | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64 | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64.Spectre | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.VC.ASAN | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.VC.ATL | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.VC.ATL.ARM | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.VC.ATL.ARM64 | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.VC.ATL.ARM64EC | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.VC.ATL.Spectre | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.VC.ATLMFC | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.VC.ATLMFC.Spectre | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.VC.CLI.Support | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.VC.CMake.Project | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.VC.CoreBuildTools | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.VC.CoreIde | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.VC.DiagnosticTools | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.VC.Llvm.Clang | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.VC.Llvm.ClangToolset | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.VC.MFC.ARM | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.VC.MFC.ARM64 | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.VC.MFC.ARM64EC | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.VC.Modules.x86.x64 | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.VC.Redist.14.Latest | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.VC.Redist.MSM | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.VC.Runtimes.ARM64.Spectre | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.VC.Runtimes.x86.x64.Spectre | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.VC.TestAdapterForBoostTest | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.VC.TestAdapterForGoogleTest | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.VC.Tools.ARM | 17.1.32406.283 | -| Microsoft.VisualStudio.Component.VC.Tools.ARM64 | 17.1.32406.283 | -| Microsoft.VisualStudio.Component.VC.Tools.ARM64EC | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.VC.Tools.x86.x64 | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.VC.v141.ARM | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.VC.v141.ARM.Spectre | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.VC.v141.ARM64 | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.VC.v141.ARM64.Spectre | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.VC.v141.ATL | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.VC.v141.ATL.Spectre | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.VC.v141.MFC | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.VC.v141.MFC.Spectre | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.VC.v141.x86.x64 | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.VC.v141.x86.x64.Spectre | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.VSSDK | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.Wcf.Tooling | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.Web | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.WebDeploy | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.Windows10SDK | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.Windows10SDK.19041 | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.Windows10SDK.20348 | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.Windows11SDK.22000 | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.Workflow | 17.1.32112.364 | -| Microsoft.VisualStudio.Component.WslDebugging | 17.1.32112.364 | -| Microsoft.VisualStudio.ComponentGroup.ArchitectureTools.Native | 17.1.32112.364 | -| Microsoft.VisualStudio.ComponentGroup.Azure.CloudServices | 17.1.32112.364 | -| Microsoft.VisualStudio.ComponentGroup.Azure.Prerequisites | 17.1.32112.364 | -| Microsoft.VisualStudio.ComponentGroup.Azure.ResourceManager.Tools | 17.1.32112.364 | -| Microsoft.VisualStudio.ComponentGroup.AzureFunctions | 17.1.32112.364 | -| Microsoft.VisualStudio.ComponentGroup.MSIX.Packaging | 17.1.32112.364 | -| Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core | 17.1.32112.364 | -| Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Llvm.Clang | 17.1.32112.364 | -| Microsoft.VisualStudio.ComponentGroup.UWP.NetCoreAndStandard | 17.1.32112.364 | -| Microsoft.VisualStudio.ComponentGroup.UWP.Support | 17.1.32112.364 | -| Microsoft.VisualStudio.ComponentGroup.UWP.VC.v142 | 17.1.32112.364 | -| Microsoft.VisualStudio.ComponentGroup.UWP.Xamarin | 17.1.32112.364 | -| Microsoft.VisualStudio.ComponentGroup.VC.Tools.142.x86.x64 | 17.1.32112.364 | -| Microsoft.VisualStudio.ComponentGroup.VisualStudioExtension.Prerequisites | 17.1.32112.364 | -| Microsoft.VisualStudio.ComponentGroup.Web | 17.1.32112.364 | -| Microsoft.VisualStudio.ComponentGroup.Web.CloudTools | 17.1.32112.364 | -| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions | 17.1.32112.364 | -| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.CMake | 17.1.32112.364 | -| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.TemplateEngine | 17.1.32112.364 | -| Microsoft.VisualStudio.Workload.Azure | 17.1.32112.364 | -| Microsoft.VisualStudio.Workload.CoreEditor | 17.1.32112.364 | -| Microsoft.VisualStudio.Workload.Data | 17.1.32112.364 | -| Microsoft.VisualStudio.Workload.DataScience | 17.1.32112.364 | -| Microsoft.VisualStudio.Workload.ManagedDesktop | 17.1.32112.364 | -| Microsoft.VisualStudio.Workload.ManagedGame | 17.1.32112.364 | -| Microsoft.VisualStudio.Workload.NativeCrossPlat | 17.1.32112.364 | -| Microsoft.VisualStudio.Workload.NativeDesktop | 17.1.32112.364 | -| Microsoft.VisualStudio.Workload.NativeGame | 17.1.32112.364 | -| Microsoft.VisualStudio.Workload.NativeMobile | 17.1.32112.364 | -| Microsoft.VisualStudio.Workload.NetCrossPlat | 17.1.32126.369 | -| Microsoft.VisualStudio.Workload.NetWeb | 17.1.32112.364 | -| Microsoft.VisualStudio.Workload.Node | 17.1.32112.364 | -| Microsoft.VisualStudio.Workload.Office | 17.1.32112.364 | -| Microsoft.VisualStudio.Workload.Python | 17.1.32112.364 | -| Microsoft.VisualStudio.Workload.Universal | 17.1.32112.364 | -| Microsoft.VisualStudio.Workload.VisualStudioExtension | 17.1.32112.364 | +| Microsoft.NetCore.Component.DevelopmentTools | 17.2.32408.312 | +| Microsoft.NetCore.Component.Runtime.6.0 | 17.2.32503.368 | +| Microsoft.NetCore.Component.SDK | 17.2.32503.368 | +| Microsoft.NetCore.Component.Web | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.AppInsights.Tools | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.AspNet | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.AspNet45 | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.Azure.AuthoringTools | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.Azure.ClientLibs | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.Azure.Compute.Emulator | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.Azure.Powershell | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.Azure.ResourceManager.Tools | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.Azure.ServiceFabric.Tools | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.Azure.Waverton | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.Azure.Waverton.BuildTools | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.ClassDesigner | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.CodeMap | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.Common.Azure.Tools | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.CoreEditor | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.Debugger.JustInTime | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.Debugger.Snapshot | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.DiagnosticTools | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.DockerTools | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.DotNetModelBuilder | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.DslTools | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.Embedded | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.EntityFramework | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.FSharp | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.FSharp.Desktop | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.FSharp.WebTemplates | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.GraphDocument | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.Graphics | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.Graphics.Tools | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.IISExpress | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.IntelliCode | 17.2.32414.121 | +| Microsoft.VisualStudio.Component.IntelliTrace.FrontEnd | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.JavaScript.Diagnostics | 17.2.32427.441 | +| Microsoft.VisualStudio.Component.JavaScript.TypeScript | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.LinqToSql | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.LiveUnitTesting | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.ManagedDesktop.Core | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.ManagedDesktop.Prerequisites | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.Merq | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.MonoDebugger | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.MSODBC.SQL | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.MSSQL.CMDLnUtils | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.Node.Tools | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.NuGet | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.NuGet.BuildTools | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.PortableLibrary | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.Roslyn.Compiler | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.Roslyn.LanguageServices | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.Sharepoint.Tools | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.SQL.CLR | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.SQL.DataSources | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.SQL.LocalDB.Runtime | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.SQL.SSDT | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.TeamOffice | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.TestTools.CodedUITest | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.TestTools.WebLoadTest | 17.2.32427.441 | +| Microsoft.VisualStudio.Component.TextTemplating | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.TypeScript.TSServer | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.Unity | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.UWP.VC.ARM64 | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM.Spectre | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM64 | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM64.Spectre | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.Spectre | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.Spectre | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64 | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64.Spectre | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.VC.ASAN | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.VC.ATL | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.VC.ATL.ARM | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.VC.ATL.ARM64 | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.VC.ATL.ARM64EC | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.VC.ATL.Spectre | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.VC.ATLMFC | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.VC.ATLMFC.Spectre | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.VC.CLI.Support | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.VC.CMake.Project | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.VC.CoreBuildTools | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.VC.CoreIde | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.VC.DiagnosticTools | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.VC.Llvm.Clang | 17.2.32422.2 | +| Microsoft.VisualStudio.Component.VC.Llvm.ClangToolset | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.VC.MFC.ARM | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.VC.MFC.ARM64 | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.VC.MFC.ARM64EC | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.VC.Modules.x86.x64 | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.VC.Redist.14.Latest | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.VC.Redist.MSM | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.VC.Runtimes.ARM64.Spectre | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.VC.Runtimes.x86.x64.Spectre | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.VC.TestAdapterForBoostTest | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.VC.TestAdapterForGoogleTest | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.VC.Tools.ARM | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.VC.Tools.ARM64 | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.VC.Tools.ARM64EC | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.VC.Tools.x86.x64 | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.VC.v141.ARM | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.VC.v141.ARM.Spectre | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.VC.v141.ARM64 | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.VC.v141.ARM64.Spectre | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.VC.v141.ATL | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.VC.v141.ATL.Spectre | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.VC.v141.MFC | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.VC.v141.MFC.Spectre | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.VC.v141.x86.x64 | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.VC.v141.x86.x64.Spectre | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.VSSDK | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.Wcf.Tooling | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.Web | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.WebDeploy | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.Windows10SDK | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.Windows10SDK.19041 | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.Windows10SDK.20348 | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.Windows11SDK.22000 | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.Workflow | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.WslDebugging | 17.2.32408.312 | +| Microsoft.VisualStudio.ComponentGroup.ArchitectureTools.Native | 17.2.32408.312 | +| Microsoft.VisualStudio.ComponentGroup.Azure.CloudServices | 17.2.32408.312 | +| Microsoft.VisualStudio.ComponentGroup.Azure.Prerequisites | 17.2.32408.312 | +| Microsoft.VisualStudio.ComponentGroup.Azure.ResourceManager.Tools | 17.2.32408.312 | +| Microsoft.VisualStudio.ComponentGroup.AzureFunctions | 17.2.32408.312 | +| Microsoft.VisualStudio.ComponentGroup.MSIX.Packaging | 17.2.32408.312 | +| Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core | 17.2.32408.312 | +| Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Llvm.Clang | 17.2.32422.2 | +| Microsoft.VisualStudio.ComponentGroup.UWP.NetCoreAndStandard | 17.2.32408.312 | +| Microsoft.VisualStudio.ComponentGroup.UWP.Support | 17.2.32408.312 | +| Microsoft.VisualStudio.ComponentGroup.UWP.VC.v142 | 17.2.32408.312 | +| Microsoft.VisualStudio.ComponentGroup.UWP.Xamarin | 17.2.32408.312 | +| Microsoft.VisualStudio.ComponentGroup.VC.Tools.142.x86.x64 | 17.2.32408.312 | +| Microsoft.VisualStudio.ComponentGroup.VisualStudioExtension.Prerequisites | 17.2.32408.312 | +| Microsoft.VisualStudio.ComponentGroup.Web | 17.2.32408.312 | +| Microsoft.VisualStudio.ComponentGroup.Web.CloudTools | 17.2.32408.312 | +| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions | 17.2.32408.312 | +| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.CMake | 17.2.32408.312 | +| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.TemplateEngine | 17.2.32408.312 | +| Microsoft.VisualStudio.Workload.Azure | 17.2.32408.312 | +| Microsoft.VisualStudio.Workload.CoreEditor | 17.2.32408.312 | +| Microsoft.VisualStudio.Workload.Data | 17.2.32408.312 | +| Microsoft.VisualStudio.Workload.DataScience | 17.2.32408.312 | +| Microsoft.VisualStudio.Workload.ManagedDesktop | 17.2.32408.312 | +| Microsoft.VisualStudio.Workload.ManagedGame | 17.2.32408.312 | +| Microsoft.VisualStudio.Workload.NativeCrossPlat | 17.2.32408.312 | +| Microsoft.VisualStudio.Workload.NativeDesktop | 17.2.32408.312 | +| Microsoft.VisualStudio.Workload.NativeGame | 17.2.32408.312 | +| Microsoft.VisualStudio.Workload.NativeMobile | 17.2.32408.312 | +| Microsoft.VisualStudio.Workload.NetCrossPlat | 17.2.32503.295 | +| Microsoft.VisualStudio.Workload.NetWeb | 17.2.32408.312 | +| Microsoft.VisualStudio.Workload.Node | 17.2.32408.312 | +| Microsoft.VisualStudio.Workload.Office | 17.2.32408.312 | +| Microsoft.VisualStudio.Workload.Python | 17.2.32408.312 | +| Microsoft.VisualStudio.Workload.Universal | 17.2.32408.312 | +| Microsoft.VisualStudio.Workload.VisualStudioExtension | 17.2.32408.312 | | wasm.tools | 6.0.422.16404 | | VisualStudioClient.MicrosoftVisualStudio2022InstallerProjects | 2.0.0 | | WixToolset.WixToolsetVisualStudio2022Extension | 1.0.0.18 | @@ -444,12 +445,12 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft Visual C++ 2012 Minimum Runtime | x64 | 11.0.61030 | | Microsoft Visual C++ 2013 Additional Runtime | x64 | 12.0.40660 | | Microsoft Visual C++ 2013 Minimum Runtime | x64 | 12.0.40660 | -| Microsoft Visual C++ 2022 Additional Runtime | x64 | 14.31.31103 | -| Microsoft Visual C++ 2022 Debug Runtime | x64 | 14.31.31103 | -| Microsoft Visual C++ 2022 Minimum Runtime | x64 | 14.31.31103 | -| Microsoft Visual C++ 2022 Additional Runtime | x86 | 14.31.31103 | -| Microsoft Visual C++ 2022 Debug Runtime | x86 | 14.31.31103 | -| Microsoft Visual C++ 2022 Minimum Runtime | x86 | 14.31.31103 | +| Microsoft Visual C++ 2022 Additional Runtime | x64 | 14.32.31326 | +| Microsoft Visual C++ 2022 Debug Runtime | x64 | 14.32.31326 | +| Microsoft Visual C++ 2022 Minimum Runtime | x64 | 14.32.31326 | +| Microsoft Visual C++ 2022 Additional Runtime | x86 | 14.32.31326 | +| Microsoft Visual C++ 2022 Debug Runtime | x86 | 14.32.31326 | +| Microsoft Visual C++ 2022 Minimum Runtime | x86 | 14.32.31326 | #### Installed Windows SDKs `Location C:\Program Files (x86)\Windows Kits\10\Extension SDKs\WindowsDesktop` @@ -460,17 +461,17 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### .NET Core SDK `Location C:\Program Files\dotnet\sdk` -- 3.1.120 3.1.202 3.1.302 3.1.418 5.0.104 5.0.213 5.0.303 5.0.407 6.0.202 +- 3.1.120 3.1.202 3.1.302 3.1.419 5.0.104 5.0.214 5.0.303 5.0.408 6.0.300 ### .NET Core Runtime `Location: C:\Program Files\dotnet\shared\Microsoft.AspNetCore.App` -- 3.1.4 3.1.6 3.1.20 3.1.23 3.1.24 5.0.4 5.0.9 5.0.15 5.0.16 6.0.4 +- 3.1.4 3.1.6 3.1.20 3.1.25 5.0.4 5.0.9 5.0.17 6.0.5 `Location: C:\Program Files\dotnet\shared\Microsoft.NETCore.App` -- 3.1.4 3.1.6 3.1.20 3.1.23 3.1.24 5.0.4 5.0.9 5.0.15 5.0.16 6.0.4 +- 3.1.4 3.1.6 3.1.20 3.1.25 5.0.4 5.0.9 5.0.17 6.0.5 `Location: C:\Program Files\dotnet\shared\Microsoft.WindowsDesktop.App` -- 3.1.4 3.1.6 3.1.20 3.1.24 5.0.4 5.0.9 5.0.16 6.0.4 +- 3.1.4 3.1.6 3.1.20 3.1.25 5.0.4 5.0.9 5.0.17 6.0.5 ### .NET Framework `Type: Developer Pack` @@ -478,7 +479,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 4.8 ### .NET tools -- nbgv 3.5.103+351d94e36c +- nbgv 3.5.104+d0b7c362ff ### PowerShell Tools - PowerShell 7.2.3 @@ -498,10 +499,10 @@ All other versions are saved but not installed. #### Powershell Modules | Module | Version | | ------------------ | ---------------- | -| AWSPowerShell | 4.1.76 | +| AWSPowerShell | 4.1.82 | | DockerMsftProvider | 1.0.0.8 | | MarkdownPS | 1.9 | -| Microsoft.Graph | 1.9.5 | +| Microsoft.Graph | 1.9.6 | | Pester | 3.4.0<br>5.3.3 | | PowerShellGet | 1.0.0.1<br>2.2.5 | | PSScriptAnalyzer | 1.20.0 | @@ -540,7 +541,7 @@ All other versions are saved but not installed. | mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2022 | sha256:dfa767f6e419df8d9957173b1c48a6b3916b97e18ae40b0084ee47243f913a60 | 2022-04-12 | | mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2022 | sha256:c9166ab07f16f0b35225354b00b9a589ca45fbd604da7beb26ac6869728eac6e | 2022-04-12 | | mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:3cf54a7662ebc23c1198b97d1d38c05eae346a1a16b634db5ddd7db6a12127a5 | 2022-04-12 | -| mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:9c9ed294412e94762469596d89c19fceae13b29509d14ca88c099aee178e9167 | 2022-04-03 | -| mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:378d85bd8e7388a777d25009f8523d1e95a5f544f131eaada83171045d5b2c1e | 2022-04-03 | +| mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:f677b64d44434c6850f075630c3a7b3f9be284d32003c2cc6ea93130f619152f | 2022-05-05 | +| mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:93373be6f6c576ef3f778b9d5e7b54231975bb6876a07d90c4e4599a29a65d54 | 2022-05-05 | From 511d9fa7bab621c2cec31bdee8b1d186a99ab364 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 13 May 2022 04:38:25 +0000 Subject: [PATCH 1140/3485] Updating readme file for win19 version 20220511.2 (#5528) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2019-Readme.md | 85 ++++++++++++++++---------------- 1 file changed, 43 insertions(+), 42 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index a3916c79f8b1..f64d23d7ec62 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -3,8 +3,8 @@ | [[Azure DevOps] Windows-2016 environment removal postponed until June 30, 2022](https://github.com/actions/virtual-environments/issues/5403) | *** # Microsoft Windows Server 2019 Datacenter -- OS Version: 10.0.17763 Build 2803 -- Image Version: 20220503.1 +- OS Version: 10.0.17763 Build 2928 +- Image Version: 20220511.2 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -12,7 +12,7 @@ ## Installed Software ### Language and Runtime - Bash 4.4.23(2)-release -- Go 1.17.9 +- Go 1.17.10 - Julia 1.7.2 - Kotlin 1.6.21 - LLVM 13.0.1 @@ -32,7 +32,7 @@ - pip 22.0.4 (python 3.7) - Pipx 1.0.0 - RubyGems 2.7.6.3 -- Vcpkg (build from master \<b98afc9f1>) +- Vcpkg (build from master \<0a1420dc4>) - Yarn 1.22.18 #### Environment variables @@ -53,21 +53,22 @@ - azcopy 10.14.1 - Bazel 5.1.1 - Bazelisk 1.11.0 -- Bicep 0.5.6 +- Bicep 0.6.1 - Cabal 3.6.2.0 - CMake 3.23.1 -- CodeQL Action Bundle 2.9.0 +- CodeQL Action Bundle 2.9.1 - Docker 20.10.7 -- Docker-compose 1.29.2 +- Docker Compose v1 1.29.2 +- Docker Compose v2 2.5.0 - Docker-wincred 0.6.4 - ghc 9.2.2 - Git 2.35.1.windows.2 - Git LFS 3.0.2 -- Google Cloud SDK 384.0.0 +- Google Cloud SDK 385.0.0 - InnoSetup 6.2.1 - jq 1.6 -- Kind 0.12.0 -- Kubectl 1.23.6 +- Kind 0.13.0 +- Kubectl 1.24.0 - Mercurial 5.0 - Mingw-w64 8.1.0 - Newman 5.3.2 @@ -75,7 +76,7 @@ - OpenSSL 1.1.1 - Packer 1.8.0 - Parcel 2.5.0 -- Pulumi v3.31.0 +- Pulumi v3.32.1 - R 4.2.0 - Service Fabric SDK 9.0.1017.9590 - Stack 2.7.5 @@ -88,14 +89,14 @@ - zstd 1.5.2 ### CLI Tools -- Alibaba Cloud CLI 3.0.118 -- AWS CLI 2.6.1 -- AWS SAM CLI 1.48.0 +- Alibaba Cloud CLI 3.0.119 +- AWS CLI 2.6.3 +- AWS SAM CLI 1.49.0 - AWS Session Manager CLI 1.2.312.0 - Azure CLI 2.36.0 - Azure DevOps CLI extension 0.25.0 - Cloud Foundry CLI 6.53.0 -- GitHub CLI 2.9.0 +- GitHub CLI 2.10.1 - Hub CLI 2.14.2 ### Rust Tools @@ -113,10 +114,10 @@ - Rustfmt 1.4.38 ### Browsers and webdrivers -- Google Chrome 101.0.4951.54 +- Google Chrome 101.0.4951.64 - Chrome Driver 101.0.4951.41 -- Microsoft Edge 101.0.1210.32 -- Microsoft Edge Driver 101.0.1210.32 +- Microsoft Edge 101.0.1210.39 +- Microsoft Edge Driver 101.0.1210.39 - Mozilla Firefox 100.0 - Gecko Driver 0.31.0 - IE Driver 3.150.1.1 @@ -133,7 +134,7 @@ ### Java | Version | Vendor | Environment Variable | | ------------------- | --------------- | -------------------- | -| 8.0.322+6 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | +| 8.0.332+9 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | | 11.0.15+10 | Eclipse Temurin | JAVA_HOME_11_X64 | | 13.0.2+8.1 | Adopt OpenJDK | JAVA_HOME_13_X64 | | 17.0.3+7 | Eclipse Temurin | JAVA_HOME_17_X64 | @@ -163,14 +164,14 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Version | Architecture | Environment Variable | | ------- | ------------ | -------------------- | | 1.16.15 | x64 | GOROOT_1_16_X64 | -| 1.17.9 (Default) | x64 | GOROOT_1_17_X64 | -| 1.18.1 | x64 | GOROOT_1_18_X64 | +| 1.17.10 (Default) | x64 | GOROOT_1_17_X64 | +| 1.18.2 | x64 | GOROOT_1_18_X64 | #### Node | Version | Architecture | | ------- | ------------ | | 12.22.12 | x64 | -| 14.19.1 | x64 | +| 14.19.2 | x64 | | 16.15.0 | x64 | #### Python @@ -221,7 +222,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | 5.0.8.0 | MongoDB | Running | Automatic | ### Database tools -- Azure CosmosDb Emulator 2.14.6.0 +- Azure CosmosDb Emulator 2.14.7.0 - DacFx 16.0.5400.1 - MySQL 5.7.38.0 - SQL OLEDB Driver 18.6.3.0 @@ -236,12 +237,12 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Visual Studio Enterprise 2019 | Name | Version | Path | | ----------------------------- | --------------- | -------------------------------------------------------------- | -| Visual Studio Enterprise 2019 | 16.11.32413.511 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | +| Visual Studio Enterprise 2019 | 16.11.32428.217 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | #### Workloads, components and extensions: | Package | Version | | ------------------------------------------------------------------------- | --------------- | -| Component.Android.NDK.R16B | 16.11.32413.511 | +| Component.Android.NDK.R16B | 16.11.32425.466 | | Component.Android.SDK25.Private | 16.0.28625.61 | | Component.Android.SDK30 | 16.10.31205.252 | | Component.Ant | 1.9.3.8 | @@ -296,9 +297,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.Net.ComponentGroup.DevelopmentPrerequisites | 16.3.29207.166 | | Microsoft.Net.ComponentGroup.TargetingPacks.Common | 16.0.28516.191 | | Microsoft.NetCore.Component.DevelopmentTools | 16.10.31303.231 | -| Microsoft.NetCore.Component.Runtime.3.1 | 16.11.32406.258 | -| Microsoft.NetCore.Component.Runtime.5.0 | 16.11.32406.258 | -| Microsoft.NetCore.Component.SDK | 16.11.32406.258 | +| Microsoft.NetCore.Component.Runtime.3.1 | 16.11.32428.217 | +| Microsoft.NetCore.Component.Runtime.5.0 | 16.11.32428.217 | +| Microsoft.NetCore.Component.SDK | 16.11.32428.217 | | Microsoft.NetCore.Component.Web | 16.10.31303.231 | | Microsoft.VisualStudio.Component.AppInsights.Tools | 16.5.29515.121 | | Microsoft.VisualStudio.Component.AspNet45 | 16.10.31205.252 | @@ -364,7 +365,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Component.TypeScript.4.3 | 16.0.31506.151 | | Microsoft.VisualStudio.Component.Unity | 16.0.28315.86 | | Microsoft.VisualStudio.Component.UWP.VC.ARM64 | 16.3.29207.166 | -| Microsoft.VisualStudio.Component.VC.14.25.x86.x64 | 16.11.31317.239 | +| Microsoft.VisualStudio.Component.VC.14.25.x86.x64 | 16.11.32428.96 | | Microsoft.VisualStudio.Component.VC.140 | 16.10.31205.252 | | Microsoft.VisualStudio.Component.VC.ASAN | 16.10.31205.252 | | Microsoft.VisualStudio.Component.VC.ATL | 16.4.29313.120 | @@ -488,10 +489,10 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft Visual C++ 2013 Minimum Runtime | x86 | 12.0.21005 | | Microsoft Visual C++ 2019 Debug Runtime | x64 | 14.29.30139 | | Microsoft Visual C++ 2019 Debug Runtime | x86 | 14.29.30139 | -| Microsoft Visual C++ 2022 Additional Runtime | x64 | 14.31.31103 | -| Microsoft Visual C++ 2022 Minimum Runtime | x64 | 14.31.31103 | -| Microsoft Visual C++ 2022 Additional Runtime | x86 | 14.31.31103 | -| Microsoft Visual C++ 2022 Minimum Runtime | x86 | 14.31.31103 | +| Microsoft Visual C++ 2022 Additional Runtime | x64 | 14.32.31326 | +| Microsoft Visual C++ 2022 Minimum Runtime | x64 | 14.32.31326 | +| Microsoft Visual C++ 2022 Additional Runtime | x86 | 14.32.31326 | +| Microsoft Visual C++ 2022 Minimum Runtime | x86 | 14.32.31326 | #### Installed Windows SDKs `Location C:\Program Files (x86)\Windows Kits\10\Extension SDKs\WindowsDesktop` @@ -506,17 +507,17 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### .NET Core SDK `Location C:\Program Files\dotnet\sdk` -- 3.1.120 3.1.202 3.1.302 3.1.418 5.0.104 5.0.213 5.0.303 5.0.407 +- 3.1.120 3.1.202 3.1.302 3.1.419 5.0.104 5.0.214 5.0.303 5.0.408 ### .NET Core Runtime `Location: C:\Program Files\dotnet\shared\Microsoft.AspNetCore.App` -- 3.1.4 3.1.6 3.1.20 3.1.24 5.0.4 5.0.9 5.0.16 +- 3.1.4 3.1.6 3.1.20 3.1.25 5.0.4 5.0.9 5.0.17 `Location: C:\Program Files\dotnet\shared\Microsoft.NETCore.App` -- 3.1.4 3.1.6 3.1.20 3.1.24 5.0.4 5.0.9 5.0.16 +- 3.1.4 3.1.6 3.1.20 3.1.25 5.0.4 5.0.9 5.0.17 `Location: C:\Program Files\dotnet\shared\Microsoft.WindowsDesktop.App` -- 3.1.4 3.1.6 3.1.20 3.1.24 5.0.4 5.0.9 5.0.16 +- 3.1.4 3.1.6 3.1.20 3.1.25 5.0.4 5.0.9 5.0.17 ### .NET Framework `Type: Developer Pack` @@ -524,7 +525,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 4.7.2 4.8 ### .NET tools -- nbgv 3.5.103+351d94e36c +- nbgv 3.5.104+d0b7c362ff ### PowerShell Tools - PowerShell 7.2.3 @@ -544,10 +545,10 @@ All other versions are saved but not installed. #### Powershell Modules | Module | Version | | ------------------ | ---------------- | -| AWSPowerShell | 4.1.76 | +| AWSPowerShell | 4.1.82 | | DockerMsftProvider | 1.0.0.8 | | MarkdownPS | 1.9 | -| Microsoft.Graph | 1.9.5 | +| Microsoft.Graph | 1.9.6 | | Pester | 3.4.0<br>5.3.3 | | PowerShellGet | 1.0.0.1<br>2.2.5 | | PSScriptAnalyzer | 1.20.0 | @@ -587,7 +588,7 @@ All other versions are saved but not installed. | mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:8962b347e0df025ee5a887e5b23e305a80384e174ba1a3165e94a8b17f49390f | 2022-04-12 | | mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:60a315c1e051420094c58a2fb1959b421348ae809f8d37f7147b8800baac4500 | 2022-04-12 | | mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:d91ffeee472a34f8d7ff717fef54422be2ad87e59478c2e507c59eed8aaaa02e | 2022-04-12 | -| mcr.microsoft.com/windows/nanoserver:1809 | sha256:62a8d022600141cd93d7e74cb190de58c9ad273ca238424028af88ad46495ca7 | 2022-04-04 | -| mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:8b98b3d621f5e6edc3639c7e90f63473c8f717a01e2a0c65b122fae827bd1c5a | 2022-04-04 | +| mcr.microsoft.com/windows/nanoserver:1809 | sha256:fb16d42712f3599c849723d365a7ddc5fb95e8bf1674d97e9f9cbcb726e7525d | 2022-05-05 | +| mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:b474e47f6f8bdb110068684ab8cebbadb5806e641fe6dba0169555981f6520ef | 2022-05-05 | From 6c66ae2ee43173d2387bc33081f3d4caddb99749 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 13 May 2022 06:31:50 +0000 Subject: [PATCH 1141/3485] Updating readme file for ubuntu20 version 20220508.1 (#5503) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2004-Readme.md | 35 ++++++++++++++++++------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/images/linux/Ubuntu2004-Readme.md b/images/linux/Ubuntu2004-Readme.md index b5e287ae9726..89eb72e0a09c 100644 --- a/images/linux/Ubuntu2004-Readme.md +++ b/images/linux/Ubuntu2004-Readme.md @@ -1,6 +1,10 @@ +| Announcements | +|-| +| [(Public Beta) Ubuntu 22.04 is now available](https://github.com/actions/virtual-environments/issues/5490) | +*** # Ubuntu 20.04.4 LTS - Linux kernel version: 5.13.0-1022-azure -- Image Version: 20220503.1 +- Image Version: 20220508.1 ## Installed Software ### Language and Runtime @@ -32,7 +36,7 @@ - Pip3 20.0.2 - Pipx 1.0.0 - RubyGems 3.1.2 -- Vcpkg (build from master \<b98afc9f1>) +- Vcpkg (build from master \<a5d6d1451>) - Yarn 1.22.18 #### Environment variables @@ -64,7 +68,7 @@ - Docker-Moby Client 20.10.14+azure-1 - Docker-Moby Server 20.10.14+azure-1 - Fastlane 2.205.2 -- Git 2.36.0 (apt source repository: ppa:git-core/ppa) +- Git 2.36.1 (apt source repository: ppa:git-core/ppa) - Git LFS 3.1.4 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.6.0 - Haveged 1.9.1 @@ -81,12 +85,12 @@ - n 8.2.0 - Newman 5.3.2 - nvm 0.39.1 -- OpenSSL 1.1.1f-1ubuntu2.12 +- OpenSSL 1.1.1f-1ubuntu2.13 - Packer 1.8.0 - Parcel 2.5.0 - PhantomJS 2.1.1 - Podman 3.4.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- Pulumi 3.31.0 +- Pulumi 3.32.1 - R 4.2.0 - Skopeo 1.3.0 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 @@ -98,15 +102,15 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.118 -- AWS CLI 2.6.1 +- AWS CLI 2.6.3 - AWS CLI Session manager plugin 1.2.312.0 -- AWS SAM CLI 1.47.0 +- AWS SAM CLI 1.48.0 - Azure CLI (azure-cli) 2.36.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.25.0 - GitHub CLI 2.9.0 - Google Cloud SDK 369.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 10.1.0 +- Netlify CLI 10.3.0 - OpenShift CLI 4.10.12 - ORAS CLI 0.12.0 - Vercel CLI 24.2.0 @@ -114,7 +118,7 @@ ### Java | Version | Vendor | Environment Variable | | -------------------- | --------------- | -------------------- | -| 8.0.322+6 | Eclipse Temurin | JAVA_HOME_8_X64 | +| 8.0.332+9 | Eclipse Temurin | JAVA_HOME_8_X64 | | 11.0.15+10 (default) | Eclipse Temurin | JAVA_HOME_11_X64 | | 17.0.3+7 | Eclipse Temurin | JAVA_HOME_17_X64 | @@ -185,7 +189,7 @@ PostgreSQL service is disabled by default. Use the following command as a part of your job to start the service: 'sudo systemctl start postgresql.service' ``` #### MySQL -- MySQL 8.0.29-0ubuntu0.20.04.2 +- MySQL 8.0.29-0ubuntu0.20.04.3 - MySQL Server (user:root password:root) ``` @@ -203,7 +207,7 @@ #### Node.js - 12.22.12 -- 14.19.1 +- 14.19.2 - 16.15.0 #### PyPy @@ -242,7 +246,7 @@ | Module | Version | | ---------------- | ------- | | MarkdownPS | 1.9 | -| Microsoft.Graph | 1.9.5 | +| Microsoft.Graph | 1.9.6 | | Pester | 5.3.3 | | PSScriptAnalyzer | 1.20.0 | @@ -293,7 +297,7 @@ | debian:10 | sha256:ebe4b9831fb22dfa778de4ffcb8ea0ad69b5d782d4e86cab14cc1fded5d8e761 | 2022-04-20 | | debian:11 | sha256:6846593d7d8613e5dcc68c8f7d8b8e3179c7f3397b84a47c5b2ce989ef1075a0 | 2022-04-20 | | debian:9 | sha256:cebe6e1c30384958d471467e231f740e8f0fd92cbfd2a435a186e9bada3aee1c | 2022-04-20 | -| moby/buildkit:latest | sha256:3fbc9b9d9a74ab650eea43610ed880e51cdc05282d61f83c2e0a3b2e9ed3a344 | 2022-04-27 | +| moby/buildkit:latest | sha256:0dc312b04eac1b44cd2cad566deb1e886c753109208affbbec8384f381ff7f38 | 2022-05-06 | | node:12 | sha256:01627afeb110b3054ba4a1405541ca095c8bfca1cb6f2be9479c767a2711879e | 2022-04-20 | | node:12-alpine | sha256:d4b15b3d48f42059a15bd659be60afe21762aae9d6cbea6f124440895c27db68 | 2022-04-11 | | node:14 | sha256:2f39686f6d0b2687550659367fa11f56018a0f782b7e30f1a0ea56b11dece124 | 2022-04-20 | @@ -344,7 +348,7 @@ | libmagickcore-dev | 8:6.9.10.23+dfsg-2.1ubuntu11.4 | | libmagickwand-dev | 8:6.9.10.23+dfsg-2.1ubuntu11.4 | | libsecret-1-dev | 0.20.4-0ubuntu1 | -| libsqlite3-dev | 3.31.1-4ubuntu0.2 | +| libsqlite3-dev | 3.31.1-4ubuntu0.3 | | libtool | 2.4.6-14 | | libunwind8 | 1.2.1-9build1 | | libxkbfile-dev | 1:1.1.0-1 | @@ -368,7 +372,7 @@ | rsync | 3.1.3-8ubuntu0.3 | | shellcheck | 0.7.0-2build2 | | sphinxsearch | 2.2.11-2ubuntu2 | -| sqlite3 | 3.31.1-4ubuntu0.2 | +| sqlite3 | 3.31.1-4ubuntu0.3 | | ssh | 1:8.2p1-4ubuntu0.4 | | sshpass | 1.06-1 | | subversion | 1.13.0-3ubuntu0.1 | @@ -388,3 +392,4 @@ | zip | 3.0-11build1 | | zsync | 0.6.2-3ubuntu1 | + From 16fb116cf0032eec57907dd164cf797e9d23aaac Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Fri, 13 May 2022 19:55:13 +0400 Subject: [PATCH 1142/3485] Add Xcode 13.4 to macOS-12 image (#5534) --- images/macos/toolsets/toolset-12.json | 1 + 1 file changed, 1 insertion(+) diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index 7a53bd6a868d..411f4e5e94a1 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -2,6 +2,7 @@ "xcode": { "default": "13.3.1", "versions": [ + { "link": "13.4", "version": "13.4.0" }, { "link": "13.3.1", "version": "13.3.1", "symlinks": ["13.3"] }, { "link": "13.2.1", "version": "13.2.1", "symlinks": ["13.2"] }, { "link": "13.1", "version": "13.1.0" } From 888d89126b790c36fce2045a2702d77e0cc8f735 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Fri, 13 May 2022 23:37:07 +0400 Subject: [PATCH 1143/3485] Add MFC ARM Spectre components (#5536) --- images/win/toolsets/toolset-2022.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index 00b8468c1488..58ad44965b0f 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -206,8 +206,10 @@ "Microsoft.VisualStudio.Component.VC.TestAdapterForGoogleTest", "Microsoft.VisualStudio.Component.VC.Tools.ARM", "Microsoft.VisualStudio.Component.VC.MFC.ARM", + "Microsoft.VisualStudio.Component.VC.MFC.ARM.Spectre", "Microsoft.VisualStudio.Component.VC.ATL.ARM64", "Microsoft.VisualStudio.Component.VC.MFC.ARM64", + "Microsoft.VisualStudio.Component.VC.MFC.ARM64.Spectre", "Microsoft.VisualStudio.Component.VC.MFC.ARM64EC", "Microsoft.VisualStudio.Component.VC.Modules.x86.x64", "Microsoft.VisualStudio.Component.VC.Tools.ARM64", From 17d10f6889941d57e4bd25284b736c9aaf6046f3 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Mon, 16 May 2022 17:49:51 +0200 Subject: [PATCH 1144/3485] Add amazon-ecr-credential-helper (#5544) --- .../scripts/SoftwareReport/SoftwareReport.Generator.ps1 | 1 + .../linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 | 5 +++++ images/linux/scripts/installers/docker-moby.sh | 6 ++++++ images/linux/scripts/tests/Tools.Tests.ps1 | 4 ++++ 4 files changed, 16 insertions(+) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index 1e146b1289aa..d17c07d5d6f9 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -118,6 +118,7 @@ $toolsList = @( (Get-DockerComposeV1Version), (Get-DockerComposeV2Version), (Get-DockerBuildxVersion), + (Get-DockerAmazonECRCredHelperVersion), (Get-GitVersion), (Get-GitLFSVersion), (Get-GitFTPVersion), diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 index c8921d10df9e..7eeb9e307560 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 @@ -88,6 +88,11 @@ function Get-DockerBuildxVersion { return "Docker-Buildx $buildxVersion" } +function Get-DockerAmazonECRCredHelperVersion { + $ecrVersion = docker-credential-ecr-login -v | Select-String "Version:" | Take-OutputPart -Part 1 + return "Docker Amazon ECR Credential Helper $ecrVersion" +} + function Get-GitVersion { $gitVersion = git --version | Take-OutputPart -Part -1 $aptSourceRepo = Get-AptSourceRepository -PackageName "git-core" diff --git a/images/linux/scripts/installers/docker-moby.sh b/images/linux/scripts/installers/docker-moby.sh index 57617774fab1..ea16f65a0aa1 100644 --- a/images/linux/scripts/installers/docker-moby.sh +++ b/images/linux/scripts/installers/docker-moby.sh @@ -46,4 +46,10 @@ done # stored from earlier. docker logout +# Install amazon-ecr-credential-helper +aws_latest_release_url="https://api.github.com/repos/awslabs/amazon-ecr-credential-helper/releases/latest" +aws_helper_url=$(curl "${authString[@]}" -sL $aws_latest_release_url | jq -r '.body' | awk -F'[()]' '/linux-amd64/ {print $2}') +download_with_retries "$aws_helper_url" "/usr/bin" docker-credential-ecr-login +chmod +x /usr/bin/docker-credential-ecr-login + invoke_tests "Tools" "Docker" diff --git a/images/linux/scripts/tests/Tools.Tests.ps1 b/images/linux/scripts/tests/Tools.Tests.ps1 index 3b1a8cf0b2ee..7f22857a75de 100644 --- a/images/linux/scripts/tests/Tools.Tests.ps1 +++ b/images/linux/scripts/tests/Tools.Tests.ps1 @@ -77,6 +77,10 @@ Describe "Docker" { "docker compose" | Should -ReturnZeroExitCode } + It "docker-credential-ecr-login" { + "docker-credential-ecr-login -v" | Should -ReturnZeroExitCode + } + Context "docker images" { $testCases = (Get-ToolsetContent).docker.images | ForEach-Object { @{ ImageName = $_ } } From bc7bb8bf96c292ed48f8dca1e7aac8fe180653c5 Mon Sep 17 00:00:00 2001 From: Dusko Dobranic <101048884+ddobranic@users.noreply.github.com> Date: Mon, 16 May 2022 19:41:45 +0200 Subject: [PATCH 1145/3485] [Ubuntu] Fix cargo outdated version in report (#5550) --- images/linux/scripts/SoftwareReport/SoftwareReport.Rust.psm1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Rust.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Rust.psm1 index a556bf4c88c5..21b65d638c19 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Rust.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Rust.psm1 @@ -26,7 +26,7 @@ function Get-CargoAuditVersion { } function Get-CargoOutdatedVersion { - $cargoOutdatedVersion = $(cargo outdated --version) | Take-OutputPart -Part 1 -Delimiter "v" + $cargoOutdatedVersion = cargo outdated --version | Take-OutputPart -Part 1 return "Cargo outdated $cargoOutdatedVersion" } From 260acc1b51a5f80a18cf9676f022b9282f360f50 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Mon, 16 May 2022 21:50:16 +0200 Subject: [PATCH 1146/3485] [macOS] Add Xamarin.Android 12.1 & bump bundle to 6.12.16 (#5548) --- images/macos/toolsets/toolset-11.json | 11 +++++++++-- images/macos/toolsets/toolset-12.json | 13 ++++++++++--- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index 9d60f9edfbab..985201ec700e 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -23,17 +23,24 @@ "8.8.0.3", "8.6.0.3", "8.4.0.0", "8.2.0.17", "7.14.0.27", "7.10.0.5", "7.8.2.5", "7.4.0.10", "7.2.0.3", "7.0.0.15", "6.22.1.26", "6.20.2.2" ], "android-versions": [ - "12.2.4.3", "12.0.0.3", "11.3.0.4", "11.2.2.1", "11.1.0.26", "11.0.2.0" + "12.2.4.3", "12.1.0.2", "12.0.0.3", "11.3.0.4", "11.2.2.1", "11.1.0.26", "11.0.2.0" ], "bundle-default": "6_12_12", "bundles": [ { - "symlink": "6_12_15", + "symlink": "6_12_16", "mono":"6.12", "ios": "15.8", "mac": "8.8", "android": "12.2" }, + { + "symlink": "6_12_15", + "mono":"6.12", + "ios": "15.8", + "mac": "8.8", + "android": "12.1" + }, { "symlink": "6_12_14", "mono":"6.12", diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index 411f4e5e94a1..a9ffcbcd422a 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -20,17 +20,24 @@ "8.8.0.3", "8.6.0.3", "8.4.0.0", "8.2.0.17", "7.14.0.27" ], "android-versions": [ - "12.2.4.3", "12.0.0.3", "11.3.0.4" + "12.2.4.3", "12.1.0.2", "12.0.0.3", "11.3.0.4" ], - "bundle-default": "6_12_15", + "bundle-default": "6_12_16", "bundles": [ { - "symlink": "6_12_15", + "symlink": "6_12_16", "mono":"6.12", "ios": "15.8", "mac": "8.8", "android": "12.2" }, + { + "symlink": "6_12_15", + "mono":"6.12", + "ios": "15.8", + "mac": "8.8", + "android": "12.1" + }, { "symlink": "6_12_14", "mono":"6.12", From 5f0efafcaacce8e7ce583a71e79959920fcfd8a3 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Tue, 17 May 2022 13:39:04 +0200 Subject: [PATCH 1147/3485] Add Microsoft.VisualStudio.Component.VC.Runtimes.ARM.Spectre (#5559) --- images/win/toolsets/toolset-2022.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index 58ad44965b0f..b9d8b5e64036 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -200,7 +200,9 @@ "Microsoft.VisualStudio.Component.VC.DiagnosticTools", "Microsoft.VisualStudio.Component.VC.Llvm.Clang", "Microsoft.VisualStudio.Component.VC.Llvm.ClangToolset", + "Microsoft.VisualStudio.Component.VC.Runtimes.ARM.Spectre", "Microsoft.VisualStudio.Component.VC.Runtimes.ARM64.Spectre", + "Microsoft.VisualStudio.Component.VC.Runtimes.ARM64EC.Spectre", "Microsoft.VisualStudio.Component.VC.Runtimes.x86.x64.Spectre", "Microsoft.VisualStudio.Component.VC.TestAdapterForBoostTest", "Microsoft.VisualStudio.Component.VC.TestAdapterForGoogleTest", From 20158a6906fb1fe881c23adfb0887c6818ac43f5 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 17 May 2022 11:53:43 +0000 Subject: [PATCH 1148/3485] Updating readme file for macOS-12 version 20220516.1 (#5557) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-12-Readme.md | 115 ++++++++++++++++---------------- 1 file changed, 59 insertions(+), 56 deletions(-) diff --git a/images/macos/macos-12-Readme.md b/images/macos/macos-12-Readme.md index a19969f329fb..0025c6e51b0f 100644 --- a/images/macos/macos-12-Readme.md +++ b/images/macos/macos-12-Readme.md @@ -1,22 +1,22 @@ | Announcements | |-| | [[macOS] Xcode versions 13.2 & 13.3 will be removed, 13.3.1 will be set as the default one on May, 16](https://github.com/actions/virtual-environments/issues/5463) | -| [macOS 12 (Monterey) is available as a public beta in GitHub Actions](https://github.com/actions/virtual-environments/issues/5446) | +| [macOS 12 (Monterey) is available as a public beta in GitHub Actions and Azure DevOps](https://github.com/actions/virtual-environments/issues/5446) | *** # macOS 12.3 info - System Version: macOS 12.3.1 (21E258) - Kernel Version: Darwin 21.4.0 -- Image Version: 20220508.1 +- Image Version: 20220516.1 ## Installed Software ### Language and Runtime -- .NET SDK 3.1.101 3.1.201 3.1.302 3.1.418 5.0.102 5.0.202 5.0.302 5.0.407 +- .NET SDK 3.1.101 3.1.201 3.1.302 3.1.419 5.0.102 5.0.202 5.0.302 5.0.408 - Bash 3.2.57(1)-release - Clang/LLVM 13.0.1 is available on `'$(brew --prefix llvm)/bin/clang'` - Clang/LLVM 13.1.6 is default - gcc-11 (Homebrew GCC 11.3.0) 11.3.0 - available by `gcc-11` alias - GNU Fortran (Homebrew GCC 11.3.0) 11.3.0 - available by `gfortran-11` alias -- Go 1.17.9 +- Go 1.17.10 - julia 1.7.2 - Kotlin 1.6.21-release-334 - MSBuild 16.10.1.17201 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) @@ -24,7 +24,7 @@ - NVM 0.39.1 - NVM - Cached node versions: v12.22.12 v14.19.2 v16.15.0 - Perl 5.34.0 -- PHP 8.1.5 +- PHP 8.1.6 - Python 2.7.18 - Python 3.9.12 - R 4.2.0 @@ -35,15 +35,15 @@ - Carthage 0.38.0 - CocoaPods 1.11.3 - Composer 2.3.5 -- Homebrew 3.4.10 +- Homebrew 3.4.11 - NPM 8.5.5 - NuGet 5.9.0.7134 - Pip 20.3.4 (python 2.7) - Pip 22.0.4 (python 3.9) - Pipx 1.0.0 - RubyGems 3.2.33 -- Vcpkg 2022 (build from master \<a5d6d1451>) -- Yarn 1.22.18 +- Vcpkg 2022 (build from master \<306c9a9e2>) +- Yarn 1.22.19 ### Project Management - Apache Ant(TM) 1.10.12 @@ -54,26 +54,26 @@ ### Utilities - 7-Zip 17.04 - aria2 1.36.0 -- azcopy 10.14.1 +- azcopy 10.15.0 - bazel 5.1.1 - bazelisk 1.11.0 - bsdtar 3.5.1 - available by 'tar' alias -- Curl 7.83.0 -- Git 2.35.1 +- Curl 7.83.1 +- Git 2.36.1 - Git LFS: 3.1.4 -- GitHub CLI: 2.9.0 +- GitHub CLI: 2.10.1 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.3 - gpg (GnuPG) 2.3.6 - Hub CLI: 2.14.2 -- ImageMagick 7.1.0-32 +- ImageMagick 7.1.0-33 - jq 1.6 - mongo v5.0.7 - mongod v5.0.7 - OpenSSL 1.1.1o 3 May 2022 `(/usr/local/opt/openssl@1.1 -> ../Cellar/openssl@1.1/1.1.1o)` - Packer 1.8.0 -- PostgreSQL 14.2 -- psql (PostgreSQL) 14.2 +- PostgreSQL 14.3 +- psql (PostgreSQL) 14.3 - Sox 14.4.2 - Subversion (SVN) 1.14.2 - Switchaudio-osx 1.1.0 @@ -82,22 +82,22 @@ ### Tools - App Center CLI command -- AWS CLI 2.6.3 -- AWS SAM CLI 1.48.0 +- AWS CLI 2.7.0 +- AWS SAM CLI 1.50.0 - AWS Session Manager CLI 1.2.312.0 - Azure CLI (azure-devops) 0.25.0 - Azure CLI 2.36.0 -- Bicep CLI 0.6.1 +- Bicep CLI 0.6.18 - Cabal 3.6.2.0 - Cmake 3.23.1 - Fastlane 2.205.2 - GHC 9.2.2 -- GHCup 0.1.17.7 +- GHCup 0.1.17.8 - Jazzy 0.14.2 - Stack 2.7.5 - SwiftFormat 0.49.8 - Swig 4.0.2 -- Xcode Command Line Tools 13.3.1.0.1.1648687083 +- Xcode Command Line Tools 13.4.0.0.1.1651278267 ### Linters - SwiftLint 0.47.1 @@ -106,10 +106,10 @@ ### Browsers - Safari 15.4 (17613.1.17.1.13) - SafariDriver 15.4 (17613.1.17.1.13) -- Google Chrome 101.0.4951.54 +- Google Chrome 101.0.4951.64 - ChromeDriver 101.0.4951.41 -- Microsoft Edge 101.0.1210.39 -- MSEdgeDriver 101.0.1210.39 +- Microsoft Edge 101.0.1210.47 +- MSEdgeDriver 101.0.1210.47 - Mozilla Firefox 100.0 - geckodriver 0.31.0 - Selenium server 4.1.4 @@ -160,8 +160,8 @@ | Version | Architecture | Environment Variable | | ------- | ------------ | -------------------- | | 1.16.15 | x64 | GOROOT_1_16_X64 | -| 1.17.9 (Default) | x64 | GOROOT_1_17_X64 | -| 1.18.1 | x64 | GOROOT_1_18_X64 | +| 1.17.10 (Default) | x64 | GOROOT_1_17_X64 | +| 1.18.2 | x64 | GOROOT_1_18_X64 | ### Rust Tools - Cargo 1.60.0 @@ -196,12 +196,13 @@ ### Xamarin #### Visual Studio for Mac -- 8.10.22.11 +- 8.10.23.7 #### Xamarin bundles | symlink | Xamarin.Mono | Xamarin.iOS | Xamarin.Mac | Xamarin.Android | | ----------------- | ------------ | ----------- | ----------- | --------------- | -| 6_12_15 (default) | 6.12 | 15.8 | 8.8 | 12.2 | +| 6_12_16 (default) | 6.12 | 15.8 | 8.8 | 12.2 | +| 6_12_15 | 6.12 | 15.8 | 8.8 | 12.1 | | 6_12_14 | 6.12 | 15.8 | 8.8 | 12.0 | | 6_12_13 | 6.12 | 15.6 | 8.6 | 12.0 | | 6_12_12 | 6.12 | 15.4 | 8.4 | 12.0 | @@ -212,13 +213,12 @@ - NUnit 3.6.1 ### Xcode -| Version | Build | Path | -| -------------- | -------- | ------------------------------ | -| 13.3.1 | 13E500a | /Applications/Xcode_13.3.1.app | -| 13.3 (default) | 13E113 | /Applications/Xcode_13.3.app | -| 13.2.1 | 13C100 | /Applications/Xcode_13.2.1.app | -| 13.2 | 13C90 | /Applications/Xcode_13.2.app | -| 13.1 | 13A1030d | /Applications/Xcode_13.1.app | +| Version | Build | Path | +| ---------------- | -------- | ------------------------------ | +| 13.4 | 13F17a | /Applications/Xcode_13.4.app | +| 13.3.1 (default) | 13E500a | /Applications/Xcode_13.3.1.app | +| 13.2.1 | 13C100 | /Applications/Xcode_13.2.1.app | +| 13.1 | 13A1030d | /Applications/Xcode_13.1.app | #### Xcode Support Tools - xcpretty 0.3.0 @@ -228,42 +228,45 @@ | SDK | SDK Name | Xcode Version | | ----------------------- | -------------------- | ------------- | | macOS 12.0 | macosx12.0 | 13.1 | -| macOS 12.1 | macosx12.1 | 13.2, 13.2.1 | -| macOS 12.3 | macosx12.3 | 13.3, 13.3.1 | +| macOS 12.1 | macosx12.1 | 13.2.1 | +| macOS 12.3 | macosx12.3 | 13.3.1, 13.4 | | iOS 15.0 | iphoneos15.0 | 13.1 | -| iOS 15.2 | iphoneos15.2 | 13.2, 13.2.1 | -| iOS 15.4 | iphoneos15.4 | 13.3, 13.3.1 | +| iOS 15.2 | iphoneos15.2 | 13.2.1 | +| iOS 15.4 | iphoneos15.4 | 13.3.1 | +| iOS 15.5 | iphoneos15.5 | 13.4 | | Simulator - iOS 15.0 | iphonesimulator15.0 | 13.1 | -| Simulator - iOS 15.2 | iphonesimulator15.2 | 13.2, 13.2.1 | -| Simulator - iOS 15.4 | iphonesimulator15.4 | 13.3, 13.3.1 | +| Simulator - iOS 15.2 | iphonesimulator15.2 | 13.2.1 | +| Simulator - iOS 15.4 | iphonesimulator15.4 | 13.3.1 | +| Simulator - iOS 15.5 | iphonesimulator15.5 | 13.4 | | tvOS 15.0 | appletvos15.0 | 13.1 | -| tvOS 15.2 | appletvos15.2 | 13.2, 13.2.1 | -| tvOS 15.4 | appletvos15.4 | 13.3, 13.3.1 | +| tvOS 15.2 | appletvos15.2 | 13.2.1 | +| tvOS 15.4 | appletvos15.4 | 13.3.1, 13.4 | | Simulator - tvOS 15.0 | appletvsimulator15.0 | 13.1 | -| Simulator - tvOS 15.2 | appletvsimulator15.2 | 13.2, 13.2.1 | -| Simulator - tvOS 15.4 | appletvsimulator15.4 | 13.3, 13.3.1 | +| Simulator - tvOS 15.2 | appletvsimulator15.2 | 13.2.1 | +| Simulator - tvOS 15.4 | appletvsimulator15.4 | 13.3.1, 13.4 | | watchOS 8.0 | watchos8.0 | 13.1 | -| watchOS 8.3 | watchos8.3 | 13.2, 13.2.1 | -| watchOS 8.5 | watchos8.5 | 13.3, 13.3.1 | +| watchOS 8.3 | watchos8.3 | 13.2.1 | +| watchOS 8.5 | watchos8.5 | 13.3.1, 13.4 | | Simulator - watchOS 8.0 | watchsimulator8.0 | 13.1 | -| Simulator - watchOS 8.3 | watchsimulator8.3 | 13.2, 13.2.1 | -| Simulator - watchOS 8.5 | watchsimulator8.5 | 13.3, 13.3.1 | +| Simulator - watchOS 8.3 | watchsimulator8.3 | 13.2.1 | +| Simulator - watchOS 8.5 | watchsimulator8.5 | 13.3.1, 13.4 | | DriverKit 21.0.1 | driverkit21.0.1 | 13.1 | -| DriverKit 21.2 | driverkit21.2 | 13.2, 13.2.1 | -| DriverKit 21.4 | driverkit21.4 | 13.3, 13.3.1 | +| DriverKit 21.2 | driverkit21.2 | 13.2.1 | +| DriverKit 21.4 | driverkit21.4 | 13.3.1, 13.4 | #### Installed Simulators | OS | Xcode Version | Simulators | | ----------- | -------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | iOS 15.0 | 13.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | -| iOS 15.2 | 13.2<br>13.2.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | -| iOS 15.4 | 13.3<br>13.3.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPhone SE (3rd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | +| iOS 15.2 | 13.2.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | +| iOS 15.4 | 13.3.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPhone SE (3rd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | +| iOS 15.5 | 13.4 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPhone SE (3rd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | | tvOS 15.0 | 13.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | -| tvOS 15.2 | 13.2<br>13.2.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | -| tvOS 15.4 | 13.3<br>13.3.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | +| tvOS 15.2 | 13.2.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | +| tvOS 15.4 | 13.3.1<br>13.4 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | | watchOS 8.0 | 13.1 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | -| watchOS 8.3 | 13.2<br>13.2.1 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | -| watchOS 8.5 | 13.3<br>13.3.1 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | +| watchOS 8.3 | 13.2.1 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | +| watchOS 8.5 | 13.3.1<br>13.4 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | ### Android | Package Name | Version | From 536cfa24b0714ec26c8b46129913efa22562fd8e Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Wed, 18 May 2022 14:39:37 +0200 Subject: [PATCH 1149/3485] [Ubuntu] Revert powershell fix for Ubuntu 22.04 (#5567) * Revert powershell fix for Ubuntu 22.04 * Move libssl1.1 dependency * fix typo * remove comment --- .../linux/scripts/installers/powershellcore.sh | 18 ++---------------- images/linux/scripts/installers/sqlpackage.sh | 7 +++++++ 2 files changed, 9 insertions(+), 16 deletions(-) diff --git a/images/linux/scripts/installers/powershellcore.sh b/images/linux/scripts/installers/powershellcore.sh index 09129f7e51c9..e228d9121a80 100644 --- a/images/linux/scripts/installers/powershellcore.sh +++ b/images/linux/scripts/installers/powershellcore.sh @@ -4,19 +4,5 @@ ## Desc: Installs powershellcore ################################################################################ -# Source the helpers for use with the script -source $HELPER_SCRIPTS/os.sh -source $HELPER_SCRIPTS/install.sh - -if isUbuntu22; then - # Install libssl1.1 - download_with_retries "http://security.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.1l-1ubuntu1.3_amd64.deb" "/tmp" - dpkg -i /tmp/libssl1.1_1.1.1l-1ubuntu1.3_amd64.deb - - # Install Powershell - download_with_retries "https://github.com/PowerShell/PowerShell/releases/download/v7.2.3/powershell-lts_7.2.3-1.deb_amd64.deb" "/tmp" - dpkg -i /tmp/powershell-lts_7.2.3-1.deb_amd64.deb -else - # Install Powershell - apt-get install -y powershell -fi +# Install Powershell +apt-get install -y powershell diff --git a/images/linux/scripts/installers/sqlpackage.sh b/images/linux/scripts/installers/sqlpackage.sh index 86a1a49956fc..9e5cc9f0a17c 100644 --- a/images/linux/scripts/installers/sqlpackage.sh +++ b/images/linux/scripts/installers/sqlpackage.sh @@ -6,6 +6,13 @@ # Source the helpers for use with the script source $HELPER_SCRIPTS/install.sh +source $HELPER_SCRIPTS/os.sh + +# Install libssl1.1 dependency +if isUbuntu22; then + download_with_retries "http://security.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.1l-1ubuntu1.3_amd64.deb" "/tmp" + dpkg -i /tmp/libssl1.1_1.1.1l-1ubuntu1.3_amd64.deb +fi # Install SqlPackage download_with_retries "https://aka.ms/sqlpackage-linux" "." "sqlpackage.zip" From 82d69fd301389dfde695f3c45eef102bff6e7eee Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Wed, 18 May 2022 16:49:37 +0200 Subject: [PATCH 1150/3485] [macOS] Add VSForMac 2022 Preview (#5561) --- images/macos/provision/core/vsmac.sh | 55 +++++++++++++------ .../SoftwareReport.Generator.ps1 | 8 ++- .../SoftwareReport.Xamarin.psm1 | 7 ++- images/macos/tests/Common.Tests.ps1 | 7 +++ images/macos/toolsets/toolset-12.json | 1 + 5 files changed, 57 insertions(+), 21 deletions(-) diff --git a/images/macos/provision/core/vsmac.sh b/images/macos/provision/core/vsmac.sh index f4f914566b76..2ab38f6e66fa 100644 --- a/images/macos/provision/core/vsmac.sh +++ b/images/macos/provision/core/vsmac.sh @@ -2,28 +2,47 @@ source ~/utils/utils.sh source ~/utils/xamarin-utils.sh -VSMAC_VERSION=$(get_toolset_value '.xamarin.vsmac') -if [ $VSMAC_VERSION == "latest" ]; then - VSMAC_VERSION=$(curl -L "http://aka.ms/manifest/stable" | jq -r ".items[] | select(.genericName==\"VisualStudioMac\").version") -fi -VSMAC_DOWNLOAD_URL=$(buildVSMacDownloadUrl $VSMAC_VERSION) +install_vsmac() { + local VSMAC_VERSION=$1 + if [ $VSMAC_VERSION == "latest" ]; then + VSMAC_DOWNLOAD_URL=$(curl -sL "https://aka.ms/manifest/stable" | jq -r '.items[] | select(.genericName=="VisualStudioMac").url') + elif [ $VSMAC_VERSION == "preview" ]; then + VSMAC_DOWNLOAD_URL=$(curl -sL "https://aka.ms/manifest/preview" | jq -r '.items[] | select(.genericName=="VisualStudioMac").url') + else + VSMAC_DOWNLOAD_URL=$(buildVSMacDownloadUrl $VSMAC_VERSION) + fi + + TMPMOUNT=`/usr/bin/mktemp -d /tmp/visualstudio.XXXX` + TMPMOUNT_DOWNLOADS="$TMPMOUNT/downloads" + mkdir $TMPMOUNT_DOWNLOADS + + download_with_retries $VSMAC_DOWNLOAD_URL $TMPMOUNT_DOWNLOADS -TMPMOUNT=`/usr/bin/mktemp -d /tmp/visualstudio.XXXX` -TMPMOUNT_DOWNLOADS="$TMPMOUNT/downloads" -mkdir $TMPMOUNT_DOWNLOADS + echo "Mounting Visual Studio..." + VISUAL_STUDIO_NAME=${VSMAC_DOWNLOAD_URL##*/} + hdiutil attach "$TMPMOUNT_DOWNLOADS/$VISUAL_STUDIO_NAME" -mountpoint "$TMPMOUNT" -download_with_retries $VSMAC_DOWNLOAD_URL $TMPMOUNT_DOWNLOADS + echo "Moving Visual Studio to /Applications/..." + pushd $TMPMOUNT + tar cf - "./Visual Studio.app" | tar xf - -C /Applications/ -echo "Mounting Visual studio..." -VISUAL_STUDIO_NAME=${VSMAC_DOWNLOAD_URL##*/} -hdiutil attach "$TMPMOUNT_DOWNLOADS/$VISUAL_STUDIO_NAME" -mountpoint "$TMPMOUNT" + if [ $VSMAC_VERSION == "preview" ]; then + mv "/Applications/Visual Studio.app" "/Applications/Visual Studio Preview.app" + fi -echo "Moving Visual Studio to /Applications/..." -pushd $TMPMOUNT -tar cf - "./Visual Studio.app" | tar xf - -C /Applications/ + popd + sudo hdiutil detach "$TMPMOUNT" + sudo rm -rf "$TMPMOUNT" +} + +VSMAC_VERSION_PREVIEW=$(get_toolset_value '.xamarin.vsmac_preview') +if [ $VSMAC_VERSION_PREVIEW != "null" ];then + echo "Installing Visual Studio 2022 for Mac Preview" + install_vsmac $VSMAC_VERSION_PREVIEW +fi -popd -sudo hdiutil detach "$TMPMOUNT" -sudo rm -rf "$TMPMOUNT" +echo "Installing Visual Studio 2019 for Mac Stable" +VSMAC_VERSION_STABLE=$(get_toolset_value '.xamarin.vsmac') +install_vsmac $VSMAC_VERSION_STABLE invoke_tests "Common" "VSMac" diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1 index cb740aaec0c9..a97a29906ee0 100644 --- a/images/macos/software-report/SoftwareReport.Generator.ps1 +++ b/images/macos/software-report/SoftwareReport.Generator.ps1 @@ -242,8 +242,12 @@ $markdown += Build-WebServersSection # Xamarin section $markdown += New-MDHeader "Xamarin" -Level 3 -$markdown += New-MDHeader "Visual Studio for Mac" -Level 4 -$markdown += New-MDList -Lines @(Get-VSMacVersion) -Style Unordered +$markdown += New-MDHeader "Visual Studio 2019 for Mac" -Level 4 +$markdown += New-MDList -Lines @(Get-VSMac2019Version) -Style Unordered +if ($os.IsMonterey) { + $markdown += New-MDHeader "Visual Studio 2022 for Mac" -Level 4 + $markdown += New-MDList -Lines @(Get-VSMac2022Version) -Style Unordered +} $markdown += New-MDHeader "Xamarin bundles" -Level 4 $markdown += Build-XamarinTable | New-MDTable diff --git a/images/macos/software-report/SoftwareReport.Xamarin.psm1 b/images/macos/software-report/SoftwareReport.Xamarin.psm1 index 2bd1b54763ae..42010359352c 100644 --- a/images/macos/software-report/SoftwareReport.Xamarin.psm1 +++ b/images/macos/software-report/SoftwareReport.Xamarin.psm1 @@ -1,10 +1,15 @@ Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" -function Get-VSMacVersion { +function Get-VSMac2019Version { $plistPath = "/Applications/Visual Studio.app/Contents/Info.plist" return Run-Command "/usr/libexec/PlistBuddy -c 'Print CFBundleVersion' '$plistPath'" } +function Get-VSMac2022Version { + $plistPath = "/Applications/Visual Studio Preview.app/Contents/Info.plist" + return Run-Command "/usr/libexec/PlistBuddy -c 'Print CFBundleVersion' '$plistPath'" +} + function Get-NUnitVersion { $version = Run-Command "nunit3-console --version" | Select-Object -First 1 | Take-Part -Part 3 return "NUnit ${version}" diff --git a/images/macos/tests/Common.Tests.ps1 b/images/macos/tests/Common.Tests.ps1 index 3c9a717e7cd0..7938abfa95ba 100644 --- a/images/macos/tests/Common.Tests.ps1 +++ b/images/macos/tests/Common.Tests.ps1 @@ -85,6 +85,13 @@ Describe "VSMac" { $vsPath | Should -Exist $vstoolPath | Should -Exist } + + It "VS4Mac Preview is installed" -Skip:(-not $os.IsMonterey) { + $vsPath = "/Applications/Visual Studio Preview.app" + $vstoolPath = Join-Path $vsPath "Contents/MacOS/vstool" + $vsPath | Should -Exist + $vstoolPath | Should -Exist + } } Describe "Swig" { diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index a9ffcbcd422a..b093504d788c 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -10,6 +10,7 @@ }, "xamarin": { "vsmac": "latest", + "vsmac_preview": "preview", "mono-versions": [ "6.12.0.174" ], From 74d2bc3b8b0bd2699f35ef6bd616436661aecbca Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 18 May 2022 20:57:08 +0000 Subject: [PATCH 1151/3485] Ubuntu 22.04 (20220515 update) (#5547) * Updating readme file for ubuntu22 version 20220515.1 * Update Ubuntu2204-Readme.md Fix cargo outdated version Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Dusko Dobranic <101048884+ddobranic@users.noreply.github.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2204-Readme.md | 88 +++++++++++++++++-------------- 1 file changed, 47 insertions(+), 41 deletions(-) diff --git a/images/linux/Ubuntu2204-Readme.md b/images/linux/Ubuntu2204-Readme.md index 22a397c4e11c..d2736a2baedb 100644 --- a/images/linux/Ubuntu2204-Readme.md +++ b/images/linux/Ubuntu2204-Readme.md @@ -1,6 +1,10 @@ +| Announcements | +|-| +| [(Public Beta) Ubuntu 22.04 is now available](https://github.com/actions/virtual-environments/issues/5490) | +*** # Ubuntu 22.04 LTS - Linux kernel version: 5.15.0-1005-azure -- Image Version: 20220504.1 +- Image Version: 20220515.1 ## Installed Software ### Language and Runtime @@ -19,14 +23,14 @@ ### Package Management - cpan 1.64 - Helm 3.8.2 -- Homebrew 3.4.10 +- Homebrew 3.4.11 - Miniconda 4.11.0 - Npm 8.5.5 - Pip 22.0.2 - Pip3 22.0.2 - Pipx 1.0.0 - RubyGems 3.3.5 -- Vcpkg (build from master \<b98afc9f1>) +- Vcpkg (build from master \<0cf5b4305>) - Yarn 1.22.18 #### Environment variables @@ -41,25 +45,25 @@ ### Tools - Ansible 2.12.5 - apt-fast 1.9.12 -- AzCopy 10.14.1 (available by `azcopy` and `azcopy10` aliases) +- AzCopy 10.15.0 (available by `azcopy` and `azcopy10` aliases) - Bazel 5.1.1 - Bazelisk 1.11.0 -- Bicep 0.6.1 +- Bicep 0.6.18 - CMake 3.23.1 -- CodeQL Action Bundle 2.9.0 +- CodeQL Action Bundle 2.9.1 - Docker Compose v1 1.29.2 - Docker Compose v2 2.4.1+azure-1 - Docker-Buildx 0.8.2 -- Docker-Moby Client 20.10.14+azure-1 -- Docker-Moby Server 20.10.14+azure-1 +- Docker-Moby Client 20.10.15+azure-1 +- Docker-Moby Server 20.10.15+azure-2 - Fastlane 2.205.2 -- Git 2.36.0 (apt source repository: ppa:git-core/ppa) +- Git 2.36.1 (apt source repository: ppa:git-core/ppa) - Git LFS 3.1.4 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.6.0 - Haveged 1.9.14 - Heroku 7.60.2 - jq 1.6 -- Kind 0.12.0 +- Kind 0.13.0 - Kubectl 1.24.0 - Kustomize 4.5.4 - MediaInfo 21.09 @@ -71,7 +75,7 @@ - OpenSSL 3.0.2-0ubuntu1.1 - Packer 1.8.0 - Parcel 2.5.0 -- Pulumi 3.32.0 +- Pulumi 3.32.1 - R 4.2.0 - Sphinx Open Source Search Server 2.2.11 - SVN 1.14.1 @@ -81,19 +85,19 @@ - zstd 1.5.2 (homebrew) ### CLI Tools -- Alibaba Cloud CLI 3.0.118 -- AWS CLI 2.6.2 +- Alibaba Cloud CLI 3.0.119 +- AWS CLI 2.7.0 - AWS CLI Session manager plugin 1.2.312.0 -- AWS SAM CLI 1.48.0 +- AWS SAM CLI 1.50.0 - Azure CLI (azure-cli) 2.36.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.25.0 -- GitHub CLI 2.9.0 +- GitHub CLI 2.10.1 - Google Cloud SDK 369.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 10.2.0 -- OpenShift CLI 4.10.12 +- Netlify CLI 10.3.1 +- OpenShift CLI 4.10.13 - ORAS CLI 0.12.0 -- Vercel CLI 24.2.0 +- Vercel CLI 24.2.3 ### GraalVM | Version | Environment variables | @@ -112,7 +116,7 @@ ### Haskell - Cabal 3.6.2.0 - GHC 9.2.2 -- GHCup 0.1.17.7 +- GHCup 0.1.17.8 - Stack 2.7.5 ### Rust Tools @@ -125,11 +129,12 @@ - Bindgen 0.59.2 - Cargo audit 0.16.0 - Cargo clippy 0.1.60 +- Cargo outdated 0.11.1 - Cbindgen 0.23.0 - Rustfmt 1.4.38 ### Browsers and Drivers -- Google Chrome 101.0.4951.54 +- Google Chrome 101.0.4951.64 - ChromeDriver 101.0.4951.41 - Chromium 101.0.4951.0 @@ -141,23 +146,23 @@ | SELENIUM_JAR_PATH | | ### .NET Core SDK -- 6.0.202 +- 6.0.300 ### .NET tools -- nbgv 3.5.103+351d94e36c +- nbgv 3.5.104+d0b7c362ff ### Databases - sqlite3 3.37.2 #### PostgreSQL -- PostgreSQL 14.2 (apt source repository: https://apt.postgresql.org/pub/repos/apt/) +- PostgreSQL 14.3 (apt source repository: https://apt.postgresql.org/pub/repos/apt/) - PostgreSQL Server (user:postgres) ``` PostgreSQL service is disabled by default. Use the following command as a part of your job to start the service: 'sudo systemctl start postgresql.service' ``` #### MySQL -- MySQL 8.0.29-0ubuntu0.22.04.1 +- MySQL 8.0.29-0ubuntu0.22.04.2 - MySQL Server (user:root password:root) ``` @@ -165,11 +170,11 @@ ``` ### Cached Tools #### Go -- 1.17.9 -- 1.18.1 +- 1.17.10 +- 1.18.2 #### Node.js -- 14.19.1 +- 14.19.2 - 16.15.0 #### PyPy @@ -187,10 +192,10 @@ - 3.1.2 #### Environment variables -| Name | Value | Architecture | -| --------------- | ---------------------------------- | ------------ | -| GOROOT_1_17_X64 | /opt/hostedtoolcache/go/1.17.9/x64 | x64 | -| GOROOT_1_18_X64 | /opt/hostedtoolcache/go/1.18.1/x64 | x64 | +| Name | Value | Architecture | +| --------------- | ----------------------------------- | ------------ | +| GOROOT_1_17_X64 | /opt/hostedtoolcache/go/1.17.10/x64 | x64 | +| GOROOT_1_18_X64 | /opt/hostedtoolcache/go/1.18.2/x64 | x64 | ### PowerShell Tools - PowerShell 7.2.3 @@ -199,7 +204,7 @@ | Module | Version | | ---------------- | ------- | | MarkdownPS | 1.9 | -| Microsoft.Graph | 1.9.5 | +| Microsoft.Graph | 1.9.6 | | Pester | 5.3.3 | | PSScriptAnalyzer | 1.20.0 | @@ -217,14 +222,14 @@ | ----------------------- | ------------------------------------------------------------------------ | ---------- | | alpine:3.14 | sha256:06b5d462c92fc39303e6363c65e074559f8d6b1363250027ed5053557e3398c5 | 2022-04-05 | | alpine:3.15 | sha256:4edbd2beb5f78b1014028f4fbb99f3237d9561100b6881aabbf5acce2c4f9454 | 2022-04-05 | -| buildpack-deps:bullseye | sha256:f26b9bcb6722fd59888caf4f4c1d4990799e3e83d804a83b7b58b4be949dc75e | 2022-04-20 | -| buildpack-deps:buster | sha256:b971efe3151fcfb10d0b7dfc739d081a9f9d9413195aa9b80224a66f4a651b4a | 2022-04-20 | -| debian:10 | sha256:ebe4b9831fb22dfa778de4ffcb8ea0ad69b5d782d4e86cab14cc1fded5d8e761 | 2022-04-20 | -| debian:11 | sha256:6846593d7d8613e5dcc68c8f7d8b8e3179c7f3397b84a47c5b2ce989ef1075a0 | 2022-04-20 | -| moby/buildkit:latest | sha256:3fbc9b9d9a74ab650eea43610ed880e51cdc05282d61f83c2e0a3b2e9ed3a344 | 2022-04-27 | -| node:14 | sha256:2f39686f6d0b2687550659367fa11f56018a0f782b7e30f1a0ea56b11dece124 | 2022-04-20 | +| buildpack-deps:bullseye | sha256:f4369ea9e313fc97029c736d68a9ea705d14fd1884a70be33aae25196d59288b | 2022-05-11 | +| buildpack-deps:buster | sha256:3485150b7bd19da1e2ddbf567ee47c5ebd1ed62d55a334ff363a718057d713c3 | 2022-05-11 | +| debian:10 | sha256:405f48fbb359190809bd91aac79c3f6c346c1e79878c839351c6a817db5e9fc4 | 2022-05-11 | +| debian:11 | sha256:6137c67e2009e881526386c42ba99b3657e4f92f546814a33d35b14e60579777 | 2022-05-11 | +| moby/buildkit:latest | sha256:0dc312b04eac1b44cd2cad566deb1e886c753109208affbbec8384f381ff7f38 | 2022-05-06 | +| node:14 | sha256:61168c39af89331ffaa6ba41c2a44f4d5132a857a6034175f994948b5798b588 | 2022-05-11 | | node:14-alpine | sha256:8845b4f88f64f8c56a39236648ba22946e806a6153c10911f77b70e5a2edb4ca | 2022-04-05 | -| node:16 | sha256:a6c217d7c8f001dc6fc081d55c2dd7fb3fefe871d5aa7be9c0c16bd62bea8e0c | 2022-04-27 | +| node:16 | sha256:1817bb941c9a30fe2a6d75ff8675a8f6def408efe3d3ff43dbb006e2b534fa14 | 2022-05-11 | | node:16-alpine | sha256:1a9a71ea86aad332aa7740316d4111ee1bd4e890df47d3b5eff3e5bded3b3d10 | 2022-04-27 | | ubuntu:18.04 | sha256:d21b6ba9e19feffa328cb3864316e6918e30acfd55e285b5d3df1d8ca3c7fd3f | 2022-04-29 | | ubuntu:20.04 | sha256:47f14534bda344d9fe6ffd6effb95eefe579f4be0d508b7445cf77f61a0e5724 | 2022-04-29 | @@ -243,7 +248,7 @@ | build-essential | 12.9ubuntu3 | | bzip2 | 1.0.8-5build1 | | coreutils | 8.32-4.1ubuntu1 | -| curl | 7.81.0-1ubuntu1.1 | +| curl | 7.81.0-1ubuntu1.2 | | dbus | 1.12.20-2ubuntu4 | | dnsutils | 1:9.18.1-1ubuntu1 | | dpkg | 1.21.1ubuntu2 | @@ -261,7 +266,7 @@ | lib32z1 | 1:1.2.11.dfsg-2ubuntu9 | | libc++-dev | 1:14.0-55\~exp2 | | libc++abi-dev | 1:14.0-55\~exp2 | -| libcurl4 | 7.81.0-1ubuntu1.1 | +| libcurl4 | 7.81.0-1ubuntu1.2 | | libgbm-dev | 22.0.1-1ubuntu2 | | libgconf-2-4 | 3.2.6-7ubuntu2 | | libgsl-dev | 2.7.1+dfsg-3 | @@ -315,3 +320,4 @@ | zip | 3.0-12build2 | | zsync | 0.6.2-3ubuntu1 | + From 9aa72c448245fa4a285645a739b39698b81dd53e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 19 May 2022 07:46:58 +0000 Subject: [PATCH 1152/3485] Updating readme file for ubuntu18 version 20220515.1 (#5545) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu1804-Readme.md | 40 +++++++++++++++---------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/images/linux/Ubuntu1804-Readme.md b/images/linux/Ubuntu1804-Readme.md index 5f2b079ab3a4..ccea3ad5265f 100644 --- a/images/linux/Ubuntu1804-Readme.md +++ b/images/linux/Ubuntu1804-Readme.md @@ -4,7 +4,7 @@ *** # Ubuntu 18.04.6 LTS - Linux kernel version: 5.4.0-1078-azure -- Image Version: 20220511.2 +- Image Version: 20220515.1 ## Installed Software ### Language and Runtime @@ -36,7 +36,7 @@ - Pip3 9.0.1 - Pipx 1.0.0 - RubyGems 2.7.6 -- Vcpkg (build from master \<0a1420dc4>) +- Vcpkg (build from master \<0cf5b4305>) - Yarn 1.22.18 #### Environment variables @@ -54,13 +54,13 @@ ### Tools - Ansible 2.11.11 - apt-fast 1.9.12 -- AzCopy 10.14.1 (available by `azcopy` and `azcopy10` aliases) +- AzCopy 10.15.0 (available by `azcopy` and `azcopy10` aliases) - Bazel 5.1.1 - Bazelisk 1.11.0 -- Bicep 0.6.1 +- Bicep 0.6.18 - Buildah 1.19.6 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - CMake 3.23.1 -- CodeQL Action Bundle 2.9.0 +- CodeQL Action Bundle 2.9.1 - Docker Compose v1 1.29.2 - Docker Compose v2 2.4.1+azure-1 - Docker-Buildx 0.8.2 @@ -71,7 +71,7 @@ - Git-ftp 1.3.1 - Haveged 1.9.1 - Heroku 7.60.2 -- HHVM (HipHop VM) 4.159.0 +- HHVM (HipHop VM) 4.160.0 - jq 1.5 - Kind 0.13.0 - Kubectl 1.24.0 @@ -100,18 +100,18 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.119 -- AWS CLI 1.23.11 +- AWS CLI 1.24.0 - AWS CLI Session manager plugin 1.2.312.0 -- AWS SAM CLI 1.49.0 +- AWS SAM CLI 1.50.0 - Azure CLI (azure-cli) 2.36.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.25.0 - GitHub CLI 2.10.1 - Google Cloud SDK 369.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 10.3.0 -- OpenShift CLI 4.10.12 +- Netlify CLI 10.3.1 +- OpenShift CLI 4.10.13 - ORAS CLI 0.12.0 -- Vercel CLI 24.2.1 +- Vercel CLI 24.2.3 ### Java | Version | Vendor | Environment Variable | @@ -133,7 +133,7 @@ ### Haskell - Cabal 3.6.2.0 - GHC 9.2.2 -- GHCup 0.1.17.7 +- GHCup 0.1.17.8 - Stack 2.7.5 ### Rust Tools @@ -154,7 +154,7 @@ - Google Chrome 101.0.4951.64 - ChromeDriver 101.0.4951.41 - Chromium 101.0.4951.0 -- Mozilla Firefox 99.0 +- Mozilla Firefox 100.0 - Geckodriver 0.31.0 - Selenium server 4.1.0 @@ -176,7 +176,7 @@ - sqlite3 3.22.0 #### PostgreSQL -- PostgreSQL 14.2 (apt source repository: https://apt.postgresql.org/pub/repos/apt/) +- PostgreSQL 14.3 (apt source repository: https://apt.postgresql.org/pub/repos/apt/) - PostgreSQL Server (user:postgres) ``` @@ -292,9 +292,9 @@ | moby/buildkit:latest | sha256:0dc312b04eac1b44cd2cad566deb1e886c753109208affbbec8384f381ff7f38 | 2022-05-06 | | node:12 | sha256:01627afeb110b3054ba4a1405541ca095c8bfca1cb6f2be9479c767a2711879e | 2022-04-20 | | node:12-alpine | sha256:d4b15b3d48f42059a15bd659be60afe21762aae9d6cbea6f124440895c27db68 | 2022-04-11 | -| node:14 | sha256:3a01c30e387a7a94184a9a34a977474aaa1a1be8c5be0d94ff0590d57b3503ed | 2022-05-11 | +| node:14 | sha256:61168c39af89331ffaa6ba41c2a44f4d5132a857a6034175f994948b5798b588 | 2022-05-11 | | node:14-alpine | sha256:8845b4f88f64f8c56a39236648ba22946e806a6153c10911f77b70e5a2edb4ca | 2022-04-05 | -| node:16 | sha256:a7e2fb81f46803cb0db58759465754a4d313eff5747c15360f684a0902f22fb1 | 2022-05-11 | +| node:16 | sha256:1817bb941c9a30fe2a6d75ff8675a8f6def408efe3d3ff43dbb006e2b534fa14 | 2022-05-11 | | node:16-alpine | sha256:1a9a71ea86aad332aa7740316d4111ee1bd4e890df47d3b5eff3e5bded3b3d10 | 2022-04-27 | | ubuntu:16.04 | sha256:20858ebbc96215d6c3c574f781133ebffdc7c18d98af4f294cc4c04871a6fe61 | 2021-08-31 | | ubuntu:18.04 | sha256:d21b6ba9e19feffa328cb3864316e6918e30acfd55e285b5d3df1d8ca3c7fd3f | 2022-04-29 | @@ -312,7 +312,7 @@ | build-essential | 12.4ubuntu1 | | bzip2 | 1.0.6-8.1ubuntu0.2 | | coreutils | 8.28-1ubuntu1 | -| curl | 7.58.0-2ubuntu3.17 | +| curl | 7.58.0-2ubuntu3.18 | | dbus | 1.12.2-1ubuntu1.3 | | dnsutils | 1:9.11.3+dfsg-1ubuntu1.17 | | dpkg | 1.19.0.5ubuntu2.3 | @@ -329,7 +329,7 @@ | lib32z1 | 1:1.2.11.dfsg-0ubuntu2.1 | | libc++-dev | 6.0-2 | | libc++abi-dev | 6.0-2 | -| libcurl3 | 7.58.0-2ubuntu3.17 | +| libcurl3 | 7.58.0-2ubuntu3.18 | | libgbm-dev | 20.0.8-0ubuntu1\~18.04.1 | | libgconf-2-4 | 3.2.6-4ubuntu1 | | libgsl-dev | 2.4+dfsg-6 | @@ -349,7 +349,7 @@ | mercurial | 4.5.3-1ubuntu2.2 | | net-tools | 1.60+git20161116.90da8a0-1ubuntu1 | | netcat | 1.10-41.1 | -| openssh-client | 1:7.6p1-4ubuntu0.6 | +| openssh-client | 1:7.6p1-4ubuntu0.7 | | p7zip-full | 16.02+dfsg-6 | | p7zip-rar | 16.02-2 | | parallel | 20161222-1 | @@ -363,7 +363,7 @@ | shellcheck | 0.4.6-1 | | sphinxsearch | 2.2.11-2 | | sqlite3 | 3.22.0-1ubuntu0.5 | -| ssh | 1:7.6p1-4ubuntu0.6 | +| ssh | 1:7.6p1-4ubuntu0.7 | | sshpass | 1.06-1 | | subversion | 1.9.7-4ubuntu1 | | sudo | 1.8.21p2-3ubuntu1.4 | From e3079f0476cf3a5d8a0120c86e136e9f2c272c09 Mon Sep 17 00:00:00 2001 From: AlexanderGitin <102294679+AlexanderGitin@users.noreply.github.com> Date: Thu, 19 May 2022 11:07:43 +0300 Subject: [PATCH 1153/3485] [Windows] Add safe directory to gitconfig (#5453) --- images/win/scripts/Installers/Install-Git.ps1 | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/images/win/scripts/Installers/Install-Git.ps1 b/images/win/scripts/Installers/Install-Git.ps1 index 839f3751d458..e2d3cd4353bc 100644 --- a/images/win/scripts/Installers/Install-Git.ps1 +++ b/images/win/scripts/Installers/Install-Git.ps1 @@ -2,10 +2,14 @@ ## File: Install-Git.ps1 ## Desc: Install Git for Windows ################################################################################ +Import-Module "$env:ChocolateyInstall\helpers\chocolateyProfile.psm1" # Install git -# Temporary hardcode version 2.35.1 due to the issue with the actions\checkout https://github.com/actions/checkout/issues/760 -Choco-Install -PackageName git -ArgumentList '--version', "2.35.1.2", '--installargs="/VERYSILENT /NORESTART /NOCANCEL /SP- /CLOSEAPPLICATIONS /RESTARTAPPLICATIONS /o:PathOption=CmdTools /o:BashTerminalOption=ConHost /o:EnableSymlinks=Enabled /COMPONENTS=gitlfs"' +Choco-Install -PackageName git -ArgumentList '--installargs="/VERYSILENT /NORESTART /NOCANCEL /SP- /CLOSEAPPLICATIONS /RESTARTAPPLICATIONS /o:PathOption=CmdTools /o:BashTerminalOption=ConHost /o:EnableSymlinks=Enabled /COMPONENTS=gitlfs"' + +Update-SessionEnvironment + +git config --system --add safe.directory "*" # Install hub Choco-Install -PackageName hub From ca7fca068a97ce32129becf00426abf1c4d4bba3 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 19 May 2022 08:08:45 +0000 Subject: [PATCH 1154/3485] Updating readme file for ubuntu20 version 20220515.1 (#5546) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2004-Readme.md | 84 +++++++++++++++---------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/images/linux/Ubuntu2004-Readme.md b/images/linux/Ubuntu2004-Readme.md index 89eb72e0a09c..3b2bf8cc3824 100644 --- a/images/linux/Ubuntu2004-Readme.md +++ b/images/linux/Ubuntu2004-Readme.md @@ -3,8 +3,8 @@ | [(Public Beta) Ubuntu 22.04 is now available](https://github.com/actions/virtual-environments/issues/5490) | *** # Ubuntu 20.04.4 LTS -- Linux kernel version: 5.13.0-1022-azure -- Image Version: 20220508.1 +- Linux kernel version: 5.13.0-1023-azure +- Image Version: 20220515.1 ## Installed Software ### Language and Runtime @@ -29,14 +29,14 @@ ### Package Management - cpan 1.64 - Helm 3.8.2 -- Homebrew 3.4.10 +- Homebrew 3.4.11 - Miniconda 4.11.0 - Npm 8.5.5 - Pip 20.0.2 - Pip3 20.0.2 - Pipx 1.0.0 - RubyGems 3.1.2 -- Vcpkg (build from master \<a5d6d1451>) +- Vcpkg (build from master \<0cf5b4305>) - Yarn 1.22.18 #### Environment variables @@ -55,27 +55,27 @@ ### Tools - Ansible 2.12.5 - apt-fast 1.9.12 -- AzCopy 10.14.1 (available by `azcopy` and `azcopy10` aliases) +- AzCopy 10.15.0 (available by `azcopy` and `azcopy10` aliases) - Bazel 5.1.1 - Bazelisk 1.11.0 -- Bicep 0.6.1 +- Bicep 0.6.18 - Buildah 1.21.3 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - CMake 3.23.1 -- CodeQL Action Bundle 2.9.0 +- CodeQL Action Bundle 2.9.1 - Docker Compose v1 1.29.2 - Docker Compose v2 2.4.1+azure-1 - Docker-Buildx 0.8.2 -- Docker-Moby Client 20.10.14+azure-1 -- Docker-Moby Server 20.10.14+azure-1 +- Docker-Moby Client 20.10.15+azure-1 +- Docker-Moby Server 20.10.15+azure-2 - Fastlane 2.205.2 - Git 2.36.1 (apt source repository: ppa:git-core/ppa) - Git LFS 3.1.4 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.6.0 - Haveged 1.9.1 - Heroku 7.60.2 -- HHVM (HipHop VM) 4.159.0 +- HHVM (HipHop VM) 4.160.0 - jq 1.6 -- Kind 0.12.0 +- Kind 0.13.0 - Kubectl 1.24.0 - Kustomize 4.5.4 - Leiningen 2.9.8 @@ -101,19 +101,19 @@ - zstd 1.5.2 (homebrew) ### CLI Tools -- Alibaba Cloud CLI 3.0.118 -- AWS CLI 2.6.3 +- Alibaba Cloud CLI 3.0.119 +- AWS CLI 2.7.0 - AWS CLI Session manager plugin 1.2.312.0 -- AWS SAM CLI 1.48.0 +- AWS SAM CLI 1.50.0 - Azure CLI (azure-cli) 2.36.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.25.0 -- GitHub CLI 2.9.0 +- GitHub CLI 2.10.1 - Google Cloud SDK 369.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 10.3.0 -- OpenShift CLI 4.10.12 +- Netlify CLI 10.3.1 +- OpenShift CLI 4.10.13 - ORAS CLI 0.12.0 -- Vercel CLI 24.2.0 +- Vercel CLI 24.2.3 ### Java | Version | Vendor | Environment Variable | @@ -139,7 +139,7 @@ ### Haskell - Cabal 3.6.2.0 - GHC 9.2.2 -- GHCup 0.1.17.7 +- GHCup 0.1.17.8 - Stack 2.7.5 ### Rust Tools @@ -157,10 +157,10 @@ - Rustfmt 1.4.38 ### Browsers and Drivers -- Google Chrome 101.0.4951.54 +- Google Chrome 101.0.4951.64 - ChromeDriver 101.0.4951.41 - Chromium 101.0.4951.0 -- Mozilla Firefox 99.0 +- Mozilla Firefox 100.0 - Geckodriver 0.31.0 - Selenium server 4.1.0 @@ -172,17 +172,17 @@ | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | ### .NET Core SDK -- 3.1.120 3.1.202 3.1.302 3.1.418 5.0.104 5.0.213 5.0.303 5.0.407 6.0.202 +- 3.1.120 3.1.202 3.1.302 3.1.419 5.0.104 5.0.214 5.0.303 5.0.408 6.0.300 ### .NET tools -- nbgv 3.5.103+351d94e36c +- nbgv 3.5.104+d0b7c362ff ### Databases - MongoDB 5.0.8 (apt source repository: https://repo.mongodb.org/apt/ubuntu) - sqlite3 3.31.1 #### PostgreSQL -- PostgreSQL 14.2 (apt source repository: https://apt.postgresql.org/pub/repos/apt/) +- PostgreSQL 14.3 (apt source repository: https://apt.postgresql.org/pub/repos/apt/) - PostgreSQL Server (user:postgres) ``` @@ -202,8 +202,8 @@ ### Cached Tools #### Go - 1.16.15 -- 1.17.9 -- 1.18.1 +- 1.17.10 +- 1.18.2 #### Node.js - 12.22.12 @@ -236,8 +236,8 @@ | Name | Value | Architecture | | --------------- | ----------------------------------- | ------------ | | GOROOT_1_16_X64 | /opt/hostedtoolcache/go/1.16.15/x64 | x64 | -| GOROOT_1_17_X64 | /opt/hostedtoolcache/go/1.17.9/x64 | x64 | -| GOROOT_1_18_X64 | /opt/hostedtoolcache/go/1.18.1/x64 | x64 | +| GOROOT_1_17_X64 | /opt/hostedtoolcache/go/1.17.10/x64 | x64 | +| GOROOT_1_18_X64 | /opt/hostedtoolcache/go/1.18.2/x64 | x64 | ### PowerShell Tools - PowerShell 7.2.3 @@ -291,18 +291,18 @@ | alpine:3.12 | sha256:c75ac27b49326926b803b9ed43bf088bc220d22556de1bc5f72d742c91398f69 | 2022-04-05 | | alpine:3.13 | sha256:ccf92aa53bc6c3b25be2ad0cce80baec1778f007f7e076b0ffbd1b225d0b3a9b | 2022-04-05 | | alpine:3.14 | sha256:06b5d462c92fc39303e6363c65e074559f8d6b1363250027ed5053557e3398c5 | 2022-04-05 | -| buildpack-deps:bullseye | sha256:f26b9bcb6722fd59888caf4f4c1d4990799e3e83d804a83b7b58b4be949dc75e | 2022-04-20 | -| buildpack-deps:buster | sha256:b971efe3151fcfb10d0b7dfc739d081a9f9d9413195aa9b80224a66f4a651b4a | 2022-04-20 | -| buildpack-deps:stretch | sha256:fd003a4b08626dd6e5a59c61de0639243909644344a5bada501bf42e9982eac6 | 2022-04-20 | -| debian:10 | sha256:ebe4b9831fb22dfa778de4ffcb8ea0ad69b5d782d4e86cab14cc1fded5d8e761 | 2022-04-20 | -| debian:11 | sha256:6846593d7d8613e5dcc68c8f7d8b8e3179c7f3397b84a47c5b2ce989ef1075a0 | 2022-04-20 | -| debian:9 | sha256:cebe6e1c30384958d471467e231f740e8f0fd92cbfd2a435a186e9bada3aee1c | 2022-04-20 | +| buildpack-deps:bullseye | sha256:f4369ea9e313fc97029c736d68a9ea705d14fd1884a70be33aae25196d59288b | 2022-05-11 | +| buildpack-deps:buster | sha256:3485150b7bd19da1e2ddbf567ee47c5ebd1ed62d55a334ff363a718057d713c3 | 2022-05-11 | +| buildpack-deps:stretch | sha256:1929159d9dfd9fc9cc8f6fb0c8414452ec4613b824e152b87e24de9a6e3b5879 | 2022-05-11 | +| debian:10 | sha256:405f48fbb359190809bd91aac79c3f6c346c1e79878c839351c6a817db5e9fc4 | 2022-05-11 | +| debian:11 | sha256:6137c67e2009e881526386c42ba99b3657e4f92f546814a33d35b14e60579777 | 2022-05-11 | +| debian:9 | sha256:3487fb8dc9312f88dd4aa03364c15d98a998c5c7c3453f0469002f9d593916f6 | 2022-05-11 | | moby/buildkit:latest | sha256:0dc312b04eac1b44cd2cad566deb1e886c753109208affbbec8384f381ff7f38 | 2022-05-06 | | node:12 | sha256:01627afeb110b3054ba4a1405541ca095c8bfca1cb6f2be9479c767a2711879e | 2022-04-20 | | node:12-alpine | sha256:d4b15b3d48f42059a15bd659be60afe21762aae9d6cbea6f124440895c27db68 | 2022-04-11 | -| node:14 | sha256:2f39686f6d0b2687550659367fa11f56018a0f782b7e30f1a0ea56b11dece124 | 2022-04-20 | +| node:14 | sha256:61168c39af89331ffaa6ba41c2a44f4d5132a857a6034175f994948b5798b588 | 2022-05-11 | | node:14-alpine | sha256:8845b4f88f64f8c56a39236648ba22946e806a6153c10911f77b70e5a2edb4ca | 2022-04-05 | -| node:16 | sha256:a6c217d7c8f001dc6fc081d55c2dd7fb3fefe871d5aa7be9c0c16bd62bea8e0c | 2022-04-27 | +| node:16 | sha256:1817bb941c9a30fe2a6d75ff8675a8f6def408efe3d3ff43dbb006e2b534fa14 | 2022-05-11 | | node:16-alpine | sha256:1a9a71ea86aad332aa7740316d4111ee1bd4e890df47d3b5eff3e5bded3b3d10 | 2022-04-27 | | ubuntu:16.04 | sha256:20858ebbc96215d6c3c574f781133ebffdc7c18d98af4f294cc4c04871a6fe61 | 2021-08-31 | | ubuntu:18.04 | sha256:d21b6ba9e19feffa328cb3864316e6918e30acfd55e285b5d3df1d8ca3c7fd3f | 2022-04-29 | @@ -321,8 +321,8 @@ | build-essential | 12.8ubuntu1.1 | | bzip2 | 1.0.8-2 | | coreutils | 8.30-3ubuntu2 | -| curl | 7.68.0-1ubuntu2.10 | -| dbus | 1.12.16-2ubuntu2.1 | +| curl | 7.68.0-1ubuntu2.11 | +| dbus | 1.12.16-2ubuntu2.2 | | dnsutils | 1:9.16.1-0ubuntu2.10 | | dpkg | 1.19.7ubuntu3 | | fakeroot | 1.24-1 | @@ -339,7 +339,7 @@ | lib32z1 | 1:1.2.11.dfsg-2ubuntu1.3 | | libc++-dev | 1:10.0-50\~exp1 | | libc++abi-dev | 1:10.0-50\~exp1 | -| libcurl4 | 7.68.0-1ubuntu2.10 | +| libcurl4 | 7.68.0-1ubuntu2.11 | | libgbm-dev | 21.2.6-0ubuntu0.1\~20.04.2 | | libgconf-2-4 | 3.2.6-6ubuntu1 | | libgsl-dev | 2.5+dfsg-6build1 | @@ -353,13 +353,13 @@ | libunwind8 | 1.2.1-9build1 | | libxkbfile-dev | 1:1.1.0-1 | | libxss1 | 1:1.2.3-1 | -| locales | 2.31-0ubuntu9.7 | +| locales | 2.31-0ubuntu9.9 | | m4 | 1.4.18-4 | | mediainfo | 19.09-1build1 | | mercurial | 5.3.1-1ubuntu1 | | net-tools | 1.60+git20180626.aebd88e-1ubuntu1 | | netcat | 1.206-1ubuntu1 | -| openssh-client | 1:8.2p1-4ubuntu0.4 | +| openssh-client | 1:8.2p1-4ubuntu0.5 | | p7zip-full | 16.02+dfsg-7build1 | | p7zip-rar | 16.02-3build1 | | parallel | 20161222-1.1 | @@ -373,7 +373,7 @@ | shellcheck | 0.7.0-2build2 | | sphinxsearch | 2.2.11-2ubuntu2 | | sqlite3 | 3.31.1-4ubuntu0.3 | -| ssh | 1:8.2p1-4ubuntu0.4 | +| ssh | 1:8.2p1-4ubuntu0.5 | | sshpass | 1.06-1 | | subversion | 1.13.0-3ubuntu0.1 | | sudo | 1.8.31-1ubuntu1.2 | From 17ccb0bc752dd24b242e0cf206479aef1bf68166 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 19 May 2022 09:11:58 +0000 Subject: [PATCH 1155/3485] Updating readme file for win19 version 20220515.1 (#5551) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2019-Readme.md | 39 ++++++++++++++++---------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index f64d23d7ec62..04e0ba5ea867 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 2928 -- Image Version: 20220511.2 +- Image Version: 20220515.1 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -18,7 +18,7 @@ - LLVM 13.0.1 - Node 16.14.2 - Perl 5.32.1 -- PHP 8.1.5 +- PHP 8.1.6 - Python 3.7.9 - Ruby 2.5.9p229 @@ -28,11 +28,11 @@ - Helm 3.8.2 - Miniconda 4.11.0 (pre-installed on the image but not added to PATH) - NPM 8.5.0 -- NuGet 6.1.0.106 -- pip 22.0.4 (python 3.7) +- NuGet 6.2.0.146 +- pip 22.1 (python 3.7) - Pipx 1.0.0 - RubyGems 2.7.6.3 -- Vcpkg (build from master \<0a1420dc4>) +- Vcpkg (build from master \<0cf5b4305>) - Yarn 1.22.18 #### Environment variables @@ -50,10 +50,10 @@ ### Tools - 7zip 21.07 - aria2 1.36.0 -- azcopy 10.14.1 +- azcopy 10.15.0 - Bazel 5.1.1 - Bazelisk 1.11.0 -- Bicep 0.6.1 +- Bicep 0.6.18 - Cabal 3.6.2.0 - CMake 3.23.1 - CodeQL Action Bundle 2.9.1 @@ -90,8 +90,8 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.119 -- AWS CLI 2.6.3 -- AWS SAM CLI 1.49.0 +- AWS CLI 2.7.0 +- AWS SAM CLI 1.50.0 - AWS Session Manager CLI 1.2.312.0 - Azure CLI 2.36.0 - Azure DevOps CLI extension 0.25.0 @@ -114,10 +114,10 @@ - Rustfmt 1.4.38 ### Browsers and webdrivers -- Google Chrome 101.0.4951.64 +- Google Chrome 101.0.4951.67 - Chrome Driver 101.0.4951.41 -- Microsoft Edge 101.0.1210.39 -- Microsoft Edge Driver 101.0.1210.39 +- Microsoft Edge 101.0.1210.47 +- Microsoft Edge Driver 101.0.1210.47 - Mozilla Firefox 100.0 - Gecko Driver 0.31.0 - IE Driver 3.150.1.1 @@ -208,7 +208,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Property | Value | | -------------------- | ------------------------------------------------------------------------------------------------------------------------------------ | | ServiceName | postgresql-x64-14 | -| Version | 14.2 | +| Version | 14.3 | | ServiceStatus | Stopped | | ServiceStartType | Disabled | | EnvironmentVariables | PGBIN=C:\Program Files\PostgreSQL\14\bin <br> PGDATA=C:\Program Files\PostgreSQL\14\data <br> PGROOT=C:\Program Files\PostgreSQL\14 | @@ -521,8 +521,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### .NET Framework `Type: Developer Pack` -`Location C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX <version> Tools` -- 4.7.2 4.8 +`Location: C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX <version> Tools` +- 4.7.2 +- 4.8 ### .NET tools - nbgv 3.5.104+d0b7c362ff @@ -545,7 +546,7 @@ All other versions are saved but not installed. #### Powershell Modules | Module | Version | | ------------------ | ---------------- | -| AWSPowerShell | 4.1.82 | +| AWSPowerShell | 4.1.85 | | DockerMsftProvider | 1.0.0.8 | | MarkdownPS | 1.9 | | Microsoft.Graph | 1.9.6 | @@ -585,9 +586,9 @@ All other versions are saved but not installed. ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:8962b347e0df025ee5a887e5b23e305a80384e174ba1a3165e94a8b17f49390f | 2022-04-12 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:60a315c1e051420094c58a2fb1959b421348ae809f8d37f7147b8800baac4500 | 2022-04-12 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:d91ffeee472a34f8d7ff717fef54422be2ad87e59478c2e507c59eed8aaaa02e | 2022-04-12 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:a108b8cd955bc84813eda0aab41d514887ef0b4a2e2bbbca6965ec09d4da2c0c | 2022-05-11 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:9e0351236b319aba13cfec412d94df47cf4220cc909cdef6bb0aaaf31f2fb741 | 2022-05-11 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:fa53215891bfa80f70d5266f08942dd6e83a7b61f3701b700b19b4aba2dc1060 | 2022-05-11 | | mcr.microsoft.com/windows/nanoserver:1809 | sha256:fb16d42712f3599c849723d365a7ddc5fb95e8bf1674d97e9f9cbcb726e7525d | 2022-05-05 | | mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:b474e47f6f8bdb110068684ab8cebbadb5806e641fe6dba0169555981f6520ef | 2022-05-05 | From 8f236daf09a19237d58d4616b9663e33da85d638 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 19 May 2022 12:41:29 +0000 Subject: [PATCH 1156/3485] Updating readme file for win22 version 20220515.1 (#5558) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2022-Readme.md | 42 +++++++++++++++++--------------- 1 file changed, 23 insertions(+), 19 deletions(-) diff --git a/images/win/Windows2022-Readme.md b/images/win/Windows2022-Readme.md index 153833c8ee1d..14620790d7e6 100644 --- a/images/win/Windows2022-Readme.md +++ b/images/win/Windows2022-Readme.md @@ -4,7 +4,7 @@ *** # Microsoft Windows Server 2022 Datacenter - OS Version: 10.0.20348 Build 707 -- Image Version: 20220511.2 +- Image Version: 20220515.1 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -18,7 +18,7 @@ - LLVM 13.0.1 - Node 16.14.2 - Perl 5.32.1 -- PHP 8.1.5 +- PHP 8.1.6 - Python 3.9.12 - Ruby 3.0.4p208 @@ -28,11 +28,11 @@ - Helm 3.8.2 - Miniconda 4.11.0 (pre-installed on the image but not added to PATH) - NPM 8.5.0 -- NuGet 6.1.0.106 -- pip 22.0.4 (python 3.9) +- NuGet 6.2.0.146 +- pip 22.1 (python 3.9) - Pipx 1.0.0 - RubyGems 3.2.33 -- Vcpkg (build from master \<0a1420dc4>) +- Vcpkg (build from master \<5e7cbdcea>) - Yarn 1.22.18 #### Environment variables @@ -49,10 +49,10 @@ ### Tools - 7zip 21.07 - aria2 1.36.0 -- azcopy 10.14.1 +- azcopy 10.15.0 - Bazel 5.1.1 - Bazelisk 1.11.0 -- Bicep 0.6.1 +- Bicep 0.6.18 - Cabal 3.6.2.0 - CMake 3.23.1 - CodeQL Action Bundle 2.9.1 @@ -87,8 +87,8 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.119 -- AWS CLI 2.6.3 -- AWS SAM CLI 1.49.0 +- AWS CLI 2.7.0 +- AWS SAM CLI 1.50.0 - AWS Session Manager CLI 1.2.312.0 - Azure CLI 2.36.0 - Azure DevOps CLI extension 0.25.0 @@ -110,11 +110,11 @@ - Rustfmt 1.4.38 ### Browsers and webdrivers -- Google Chrome 101.0.4951.64 +- Google Chrome 101.0.4951.67 - Chrome Driver 101.0.4951.41 -- Microsoft Edge 101.0.1210.39 -- Microsoft Edge Driver 101.0.1210.39 -- Mozilla Firefox 100.0 +- Microsoft Edge 101.0.1210.47 +- Microsoft Edge Driver 101.0.1210.47 +- Mozilla Firefox 100.0.1 - Gecko Driver 0.31.0 - IE Driver 3.150.1.1 - Selenium server 4.1.0 @@ -194,7 +194,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Property | Value | | -------------------- | ------------------------------------------------------------------------------------------------------------------------------------ | | ServiceName | postgresql-x64-14 | -| Version | 14.2 | +| Version | 14.3 | | ServiceStatus | Stopped | | ServiceStartType | Disabled | | EnvironmentVariables | PGBIN=C:\Program Files\PostgreSQL\14\bin <br> PGDATA=C:\Program Files\PostgreSQL\14\data <br> PGROOT=C:\Program Files\PostgreSQL\14 | @@ -352,7 +352,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Component.VC.ASAN | 17.2.32408.312 | | Microsoft.VisualStudio.Component.VC.ATL | 17.2.32408.312 | | Microsoft.VisualStudio.Component.VC.ATL.ARM | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.VC.ATL.ARM.Spectre | 17.2.32408.312 | | Microsoft.VisualStudio.Component.VC.ATL.ARM64 | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.VC.ATL.ARM64.Spectre | 17.2.32408.312 | | Microsoft.VisualStudio.Component.VC.ATL.ARM64EC | 17.2.32408.312 | | Microsoft.VisualStudio.Component.VC.ATL.Spectre | 17.2.32408.312 | | Microsoft.VisualStudio.Component.VC.ATLMFC | 17.2.32408.312 | @@ -365,7 +367,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Component.VC.Llvm.Clang | 17.2.32422.2 | | Microsoft.VisualStudio.Component.VC.Llvm.ClangToolset | 17.2.32408.312 | | Microsoft.VisualStudio.Component.VC.MFC.ARM | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.VC.MFC.ARM.Spectre | 17.2.32408.312 | | Microsoft.VisualStudio.Component.VC.MFC.ARM64 | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.VC.MFC.ARM64.Spectre | 17.2.32408.312 | | Microsoft.VisualStudio.Component.VC.MFC.ARM64EC | 17.2.32408.312 | | Microsoft.VisualStudio.Component.VC.Modules.x86.x64 | 17.2.32408.312 | | Microsoft.VisualStudio.Component.VC.Redist.14.Latest | 17.2.32408.312 | @@ -475,7 +479,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### .NET Framework `Type: Developer Pack` -`Location C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX <version> Tools` +`Location: C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX <version> Tools` - 4.8 ### .NET tools @@ -499,7 +503,7 @@ All other versions are saved but not installed. #### Powershell Modules | Module | Version | | ------------------ | ---------------- | -| AWSPowerShell | 4.1.82 | +| AWSPowerShell | 4.1.85 | | DockerMsftProvider | 1.0.0.8 | | MarkdownPS | 1.9 | | Microsoft.Graph | 1.9.6 | @@ -538,9 +542,9 @@ All other versions are saved but not installed. ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2022 | sha256:dfa767f6e419df8d9957173b1c48a6b3916b97e18ae40b0084ee47243f913a60 | 2022-04-12 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2022 | sha256:c9166ab07f16f0b35225354b00b9a589ca45fbd604da7beb26ac6869728eac6e | 2022-04-12 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:3cf54a7662ebc23c1198b97d1d38c05eae346a1a16b634db5ddd7db6a12127a5 | 2022-04-12 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2022 | sha256:1182bfe22daba321fccb5caf93bfedc912c817a91d4c9aa5b45ea3823cb7a5c0 | 2022-05-11 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2022 | sha256:9bba2824988fa141d187315336055c068dadae6b84e86fb5d13291fd2245a8dd | 2022-05-11 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:f3dcc7d94e1631213f2349851f3415d8850d45ebd411e4ca68a0a5fa73ebffe8 | 2022-05-11 | | mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:f677b64d44434c6850f075630c3a7b3f9be284d32003c2cc6ea93130f619152f | 2022-05-05 | | mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:93373be6f6c576ef3f778b9d5e7b54231975bb6876a07d90c4e4599a29a65d54 | 2022-05-05 | From 9a469f0216fabf11b03dd73d48da26409e0ad9d2 Mon Sep 17 00:00:00 2001 From: Igor Boskovic <igorboskovic3@github.com> Date: Thu, 19 May 2022 16:27:55 +0200 Subject: [PATCH 1157/3485] add Ubuntu 22.04 badge readme url (#5570) --- README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 6eec73c354b1..ca5f8d89f12b 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,6 @@ # GitHub Actions Virtual Environments -This repository contains the source used to create the [virtual environments](https://help.github.com/en/actions/reference/virtual-environments-for-github-hosted-runners) for GitHub Actions hosted runners, as well as the VM images of [Microsoft-hosted agents](https://docs.microsoft.com/en-us/azure/devops/pipelines/agents/hosted?view=azure-devops#use-a-microsoft-hosted-agent) used for Azure Pipelines. To build a VM machine from this repo's source, see the [instructions](docs/create-image-and-azure-resources.md). +Repository contains the source used to create the [virtual environments](https://help.github.com/en/actions/reference/virtual-environments-for-github-hosted-runners) for GitHub Actions hosted runners, as well as the VM images of [Microsoft-hosted agents](https://docs.microsoft.com/en-us/azure/devops/pipelines/agents/hosted?view=azure-devops#use-a-microsoft-hosted-agent) used for Azure Pipelines. +To build a VM machine from this repo's source, see the [instructions](docs/create-image-and-azure-resources.md). How to get in touch with us: - To file a bug report, or request tools to be added/updated, please [open an issue using the appropriate template](https://github.com/actions/virtual-environments/issues/new/choose) @@ -10,6 +11,7 @@ For general questions about using the virtual environments or writing your Actio ## Available Environments | Environment | YAML Label | Included Software | Latest Release & Rollout Progress | | --------------------|---------------------|--------------------|---------------------| +| Ubuntu 22.04 | `ubuntu-22.04` | [ubuntu-22.04] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu22&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu22&redirect=1) | Ubuntu 20.04 | `ubuntu-latest` or `ubuntu-20.04` | [ubuntu-20.04] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu20&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu20&redirect=1) | Ubuntu 18.04 | `ubuntu-18.04` | [ubuntu-18.04] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu18&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu18&redirect=1) | macOS 12 | `macos-12`| [macOS-12] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-12&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-12&redirect=1) @@ -47,6 +49,7 @@ we pin the tool to specific version(s). * **Regular Weekly Rhythm** can be followed by watching [Releases](https://github.com/actions/virtual-environments/releases). Pre-release is created when deployment is started. As soon as deployment is finished, it is converted to release. You can also track upcoming changes using the [awaiting-deployment](https://github.com/actions/virtual-environments/labels/awaiting-deployment) label. +[ubuntu-22.04]: https://github.com/actions/virtual-environments/blob/main/images/linux/Ubuntu2204-Readme.md [ubuntu-20.04]: https://github.com/actions/virtual-environments/blob/main/images/linux/Ubuntu2004-Readme.md [ubuntu-18.04]: https://github.com/actions/virtual-environments/blob/main/images/linux/Ubuntu1804-Readme.md [windows-2022]: https://github.com/actions/virtual-environments/blob/main/images/win/Windows2022-Readme.md From 0dd8232afe34ae91e8fe3f2db83d269be09bdeb4 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 19 May 2022 14:45:03 +0000 Subject: [PATCH 1158/3485] Updating readme file for macOS-11 version 20220517.4 (#5568) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-11-Readme.md | 65 +++++++++++++++++---------------- 1 file changed, 33 insertions(+), 32 deletions(-) diff --git a/images/macos/macos-11-Readme.md b/images/macos/macos-11-Readme.md index fd92f50f8d84..afb78850cfb5 100644 --- a/images/macos/macos-11-Readme.md +++ b/images/macos/macos-11-Readme.md @@ -1,16 +1,16 @@ | Announcements | |-| | [[macOS] Xcode versions 13.2 & 13.3 will be removed, 13.3.1 will be set as the default one on May, 16](https://github.com/actions/virtual-environments/issues/5463) | -| [macOS 12 (Monterey) is available as a public beta in GitHub Actions](https://github.com/actions/virtual-environments/issues/5446) | +| [macOS 12 (Monterey) is available as a public beta in GitHub Actions and Azure DevOps](https://github.com/actions/virtual-environments/issues/5446) | *** # macOS 11.6 info - System Version: macOS 11.6.5 (20G527) - Kernel Version: Darwin 20.6.0 -- Image Version: 20220508.1 +- Image Version: 20220517.4 ## Installed Software ### Language and Runtime -- .NET SDK 3.1.101 3.1.201 3.1.302 3.1.418 5.0.102 5.0.202 5.0.302 5.0.407 +- .NET SDK 3.1.101 3.1.201 3.1.302 3.1.419 5.0.102 5.0.202 5.0.302 5.0.408 - Bash 3.2.57(1)-release - Clang/LLVM 13.0.0 is default - Clang/LLVM 13.0.1 is available on `'$(brew --prefix llvm)/bin/clang'` @@ -20,15 +20,15 @@ - GNU Fortran (Homebrew GCC 9.4.0) 9.4.0 - available by `gfortran-9` alias - GNU Fortran (Homebrew GCC 10.3.0) 10.3.0 - available by `gfortran-10` alias - GNU Fortran (Homebrew GCC 11.3.0) 11.3.0 - available by `gfortran-11` alias -- Go 1.17.9 +- Go 1.17.10 - julia 1.7.2 - Kotlin 1.6.21-release-334 - MSBuild 16.10.1.17201 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) - Node.js v16.15.0 - NVM 0.39.1 -- NVM - Cached node versions: v12.22.12 v14.19.2 v16.15.0 +- NVM - Cached node versions: v12.22.12 v14.19.3 v16.15.0 - Perl 5.34.0 -- PHP 8.1.5 +- PHP 8.1.6 - Python 2.7.18 - Python 3.9.12 - R 4.2.0 @@ -39,16 +39,16 @@ - Carthage 0.38.0 - CocoaPods 1.11.3 - Composer 2.3.5 -- Homebrew 3.4.10 -- Miniconda 4.11.0 +- Homebrew 3.4.11 +- Miniconda 4.12.0 - NPM 8.5.5 - NuGet 5.9.0.7134 - Pip 20.3.4 (python 2.7) - Pip 22.0.4 (python 3.9) - Pipx 1.0.0 - RubyGems 3.2.33 -- Vcpkg 2022 (build from master \<a5d6d1451>) -- Yarn 1.22.18 +- Vcpkg 2022 (build from master \<22b403386>) +- Yarn 1.22.19 #### Environment variables | Name | Value | @@ -65,28 +65,28 @@ ### Utilities - 7-Zip 17.04 - aria2 1.36.0 -- azcopy 10.14.1 +- azcopy 10.15.0 - bazel 5.1.1 - bazelisk 1.11.0 - bsdtar 3.3.2 - available by 'tar' alias -- Curl 7.83.0 -- Git 2.35.1 +- Curl 7.83.1 +- Git 2.36.1 - Git LFS: 3.1.4 -- GitHub CLI: 2.9.0 +- GitHub CLI: 2.10.1 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.3 - gpg (GnuPG) 2.3.6 - helm v3.8.2+g6e3701e - Hub CLI: 2.14.2 -- ImageMagick 7.1.0-32 +- ImageMagick 7.1.0-33 - jq 1.6 - mongo v5.0.7 - mongod v5.0.7 - Newman 5.3.2 - OpenSSL 1.1.1o 3 May 2022 `(/usr/local/opt/openssl@1.1 -> ../Cellar/openssl@1.1/1.1.1o)` - Packer 1.8.0 -- PostgreSQL 14.2 -- psql (PostgreSQL) 14.2 +- PostgreSQL 14.3 +- psql (PostgreSQL) 14.3 - Sox 14.4.2 - Subversion (SVN) 1.14.2 - Switchaudio-osx 1.1.0 @@ -94,22 +94,22 @@ - zstd 1.5.2 ### Tools -- Aliyun CLI 3.0.117 +- Aliyun CLI 3.0.119 - App Center CLI 2.10.10 -- AWS CLI 2.6.3 -- AWS SAM CLI 1.48.0 +- AWS CLI 2.7.0 +- AWS SAM CLI 1.50.0 - AWS Session Manager CLI 1.2.312.0 - Azure CLI (azure-devops) 0.25.0 - Azure CLI 2.36.0 -- Bicep CLI 0.6.1 +- Bicep CLI 0.6.18 - Cabal 3.6.2.0 - Cmake 3.23.1 - Fastlane 2.205.2 - GHC 9.2.2 -- GHCup 0.1.17.7 +- GHCup 0.1.17.8 - Jazzy 0.14.2 - Stack 2.7.5 -- SwiftFormat 0.49.8 +- SwiftFormat 0.49.9 - Swig 4.0.2 - Xcode Command Line Tools 13.2.0.0.1.1638488800 @@ -120,11 +120,11 @@ ### Browsers - Safari 15.4 (16613.1.17.1.13) - SafariDriver 15.4 (16613.1.17.1.13) -- Google Chrome 101.0.4951.54 +- Google Chrome 101.0.4951.64 - ChromeDriver 101.0.4951.41 -- Microsoft Edge 101.0.1210.39 -- MSEdgeDriver 101.0.1210.39 -- Mozilla Firefox 100.0 +- Microsoft Edge 101.0.1210.47 +- MSEdgeDriver 101.0.1210.47 +- Mozilla Firefox 100.0.1 - geckodriver 0.31.0 - Selenium server 4.1.4 @@ -177,8 +177,8 @@ | Version | Architecture | Environment Variable | | ------- | ------------ | -------------------- | | 1.16.15 | x64 | GOROOT_1_16_X64 | -| 1.17.9 (Default) | x64 | GOROOT_1_17_X64 | -| 1.18.1 | x64 | GOROOT_1_18_X64 | +| 1.17.10 (Default) | x64 | GOROOT_1_17_X64 | +| 1.18.2 | x64 | GOROOT_1_18_X64 | ### Rust Tools - Cargo 1.60.0 @@ -195,7 +195,7 @@ - Rustfmt 1.4.38-stable ### PowerShell Tools -- PowerShell 7.2.3 +- PowerShell 7.2.4 #### PowerShell Modules | Module | Version | @@ -213,12 +213,13 @@ ### Xamarin #### Visual Studio for Mac -- 8.10.22.11 +- 8.10.23.7 #### Xamarin bundles | symlink | Xamarin.Mono | Xamarin.iOS | Xamarin.Mac | Xamarin.Android | | ----------------- | ------------ | ----------- | ----------- | --------------- | -| 6_12_15 | 6.12 | 15.8 | 8.8 | 12.2 | +| 6_12_16 | 6.12 | 15.8 | 8.8 | 12.2 | +| 6_12_15 | 6.12 | 15.8 | 8.8 | 12.1 | | 6_12_14 | 6.12 | 15.8 | 8.8 | 12.0 | | 6_12_13 | 6.12 | 15.6 | 8.6 | 12.0 | | 6_12_12 (default) | 6.12 | 15.4 | 8.4 | 12.0 | From 0aa72a7eba7a821b852bd8ba2390ac2ff17fab6e Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Thu, 19 May 2022 18:53:47 +0200 Subject: [PATCH 1159/3485] Add appcenter-cli (#5571) --- images/macos/toolsets/toolset-12.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index b093504d788c..b152660de645 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -114,7 +114,9 @@ { "name": "PSScriptAnalyzer" } ], "npm": { - "global_packages": [] + "global_packages": [ + { "name": "appcenter-cli", "test": "appcenter --version" } + ] }, "brew": { "common_packages": [ From dc7d03e49dbd68522f68a9b1b4d197c41b990f8a Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Thu, 19 May 2022 23:47:48 +0400 Subject: [PATCH 1160/3485] [Ubuntu] Make software and release URLs using variables instead of hardcode (#5572) * Make urls using variables instead of hardcode * Simplify versions retrieval --- images/linux/scripts/installers/preimagedata.sh | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/images/linux/scripts/installers/preimagedata.sh b/images/linux/scripts/installers/preimagedata.sh index c494bed97d51..ba52da6dfc3a 100644 --- a/images/linux/scripts/installers/preimagedata.sh +++ b/images/linux/scripts/installers/preimagedata.sh @@ -3,18 +3,14 @@ imagedata_file=$IMAGEDATA_FILE image_version=$IMAGE_VERSION os_name=$(lsb_release -ds | sed "s/ /\\\n/g") -image_label="ubuntu-$(lsb_release -rs)" +os_version=$(lsb_release -rs) +image_label="ubuntu-${os_version}" +version_major=${os_version/.*/} +version_wo_dot=${os_version/./} github_url="https://github.com/actions/virtual-environments/blob" -if [[ "$image_label" =~ "ubuntu-20" ]]; then - software_url="${github_url}/ubuntu20/${image_version}/images/linux/Ubuntu2004-Readme.md" - releaseUrl="https://github.com/actions/virtual-environments/releases/tag/ubuntu20%2F${image_version}" -fi - -if [[ "$image_label" =~ "ubuntu-18" ]]; then - software_url="${github_url}/ubuntu18/${image_version}/images/linux/Ubuntu1804-Readme.md" - releaseUrl="https://github.com/actions/virtual-environments/releases/tag/ubuntu18%2F${image_version}" -fi +software_url="${github_url}/ubuntu${version_major}/${image_version}/images/linux/Ubuntu${version_wo_dot}-Readme.md" +releaseUrl="https://github.com/actions/virtual-environments/releases/tag/ubuntu${version_major}%2F${image_version}" cat <<EOF > $imagedata_file [ From c93738bd53875f00258b56c3dd9526b7349dd112 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Fri, 20 May 2022 12:51:55 +0200 Subject: [PATCH 1161/3485] Replace client_secret to client_cert_path (#5579) --- docs/create-image-and-azure-resources.md | 3 ++- images/linux/ubuntu1804.json | 2 ++ images/linux/ubuntu2004.json | 2 ++ images/linux/ubuntu2204.pkr.hcl | 6 ++++++ images/win/windows2016.json | 2 ++ images/win/windows2019.json | 2 ++ images/win/windows2022.json | 2 ++ 7 files changed, 18 insertions(+), 1 deletion(-) diff --git a/docs/create-image-and-azure-resources.md b/docs/create-image-and-azure-resources.md index 2f8f93fceb33..5815eb15a435 100644 --- a/docs/create-image-and-azure-resources.md +++ b/docs/create-image-and-azure-resources.md @@ -110,7 +110,8 @@ The Packer template includes `variables` section containing user variables used - `build_resource_group_name` - Specify an existing resource group to run the build in it. By default, a temporary resource group will be created and destroyed as part of the build. If you do not have permission to do so, use build_resource_group_name to specify an existing resource group to run the build in it. - `client_id` - The application ID of the AAD Service Principal. Requires `client_secret`. - `object_id` - The object ID for the AAD SP. Will be derived from the oAuth token if empty. -- `client_secret` - A password/secret registered for the AAD SP. +- `client_secret` - The password or secret for your service principal. +- `client_cert_path` - The location of a PEM file containing a certificate and private key for service principal. - `subscription_id` - The subscription to use. - `tenant_id` - The Active Directory tenant identifier with which your `client_id` and `subscription_id` are associated. If not specified, `tenant_id` will be looked up using `subscription_id`. - `resource_group` - Resource group under which the final artifact will be stored. diff --git a/images/linux/ubuntu1804.json b/images/linux/ubuntu1804.json index 201ae94c1959..bdd5847ab8e5 100644 --- a/images/linux/ubuntu1804.json +++ b/images/linux/ubuntu1804.json @@ -2,6 +2,7 @@ "variables": { "client_id": "{{env `ARM_CLIENT_ID`}}", "client_secret": "{{env `ARM_CLIENT_SECRET`}}", + "client_cert_path": "{{env `ARM_CLIENT_CERT_PATH`}}", "subscription_id": "{{env `ARM_SUBSCRIPTION_ID`}}", "tenant_id": "{{env `ARM_TENANT_ID`}}", "resource_group": "{{env `ARM_RESOURCE_GROUP`}}", @@ -34,6 +35,7 @@ "type": "azure-arm", "client_id": "{{user `client_id`}}", "client_secret": "{{user `client_secret`}}", + "client_cert_path": "{{user `client_cert_path`}}", "subscription_id": "{{user `subscription_id`}}", "tenant_id": "{{user `tenant_id`}}", "location": "{{user `location`}}", diff --git a/images/linux/ubuntu2004.json b/images/linux/ubuntu2004.json index 248620fc4e0c..ee9fb00f7be6 100644 --- a/images/linux/ubuntu2004.json +++ b/images/linux/ubuntu2004.json @@ -2,6 +2,7 @@ "variables": { "client_id": "{{env `ARM_CLIENT_ID`}}", "client_secret": "{{env `ARM_CLIENT_SECRET`}}", + "client_cert_path": "{{env `ARM_CLIENT_CERT_PATH`}}", "subscription_id": "{{env `ARM_SUBSCRIPTION_ID`}}", "tenant_id": "{{env `ARM_TENANT_ID`}}", "resource_group": "{{env `ARM_RESOURCE_GROUP`}}", @@ -34,6 +35,7 @@ "type": "azure-arm", "client_id": "{{user `client_id`}}", "client_secret": "{{user `client_secret`}}", + "client_cert_path": "{{user `client_cert_path`}}", "subscription_id": "{{user `subscription_id`}}", "tenant_id": "{{user `tenant_id`}}", "location": "{{user `location`}}", diff --git a/images/linux/ubuntu2204.pkr.hcl b/images/linux/ubuntu2204.pkr.hcl index 4b1f303078be..b443dd0c094d 100644 --- a/images/linux/ubuntu2204.pkr.hcl +++ b/images/linux/ubuntu2204.pkr.hcl @@ -24,6 +24,11 @@ variable "client_secret" { sensitive = true } +variable "client_cert_path" { + type = string + default = "${env("ARM_CLIENT_CERT_PATH")}" +} + variable "commit_url" { type = string default = "" @@ -146,6 +151,7 @@ source "azure-arm" "build_vhd" { capture_name_prefix = "${var.capture_name_prefix}" client_id = "${var.client_id}" client_secret = "${var.client_secret}" + client_cert_path = "${var.client_cert_path}" image_offer = "0001-com-ubuntu-server-jammy" image_publisher = "canonical" image_sku = "22_04-lts" diff --git a/images/win/windows2016.json b/images/win/windows2016.json index eeb8973a2401..f9b5d363a680 100644 --- a/images/win/windows2016.json +++ b/images/win/windows2016.json @@ -2,6 +2,7 @@ "variables": { "client_id": "{{env `ARM_CLIENT_ID`}}", "client_secret": "{{env `ARM_CLIENT_SECRET`}}", + "client_cert_path": "{{env `ARM_CLIENT_CERT_PATH`}}", "subscription_id": "{{env `ARM_SUBSCRIPTION_ID`}}", "tenant_id": "{{env `ARM_TENANT_ID`}}", "object_id": "{{env `ARM_OBJECT_ID`}}", @@ -37,6 +38,7 @@ "type": "azure-arm", "client_id": "{{user `client_id`}}", "client_secret": "{{user `client_secret`}}", + "client_cert_path": "{{user `client_cert_path`}}", "subscription_id": "{{user `subscription_id`}}", "object_id": "{{user `object_id`}}", "tenant_id": "{{user `tenant_id`}}", diff --git a/images/win/windows2019.json b/images/win/windows2019.json index 577bf1f30d05..306ea7dba44c 100644 --- a/images/win/windows2019.json +++ b/images/win/windows2019.json @@ -2,6 +2,7 @@ "variables": { "client_id": "{{env `ARM_CLIENT_ID`}}", "client_secret": "{{env `ARM_CLIENT_SECRET`}}", + "client_cert_path": "{{env `ARM_CLIENT_CERT_PATH`}}", "subscription_id": "{{env `ARM_SUBSCRIPTION_ID`}}", "tenant_id": "{{env `ARM_TENANT_ID`}}", "object_id": "{{env `ARM_OBJECT_ID`}}", @@ -36,6 +37,7 @@ "type": "azure-arm", "client_id": "{{user `client_id`}}", "client_secret": "{{user `client_secret`}}", + "client_cert_path": "{{user `client_cert_path`}}", "subscription_id": "{{user `subscription_id`}}", "object_id": "{{user `object_id`}}", "tenant_id": "{{user `tenant_id`}}", diff --git a/images/win/windows2022.json b/images/win/windows2022.json index 858a18ff8089..216eeb19362d 100644 --- a/images/win/windows2022.json +++ b/images/win/windows2022.json @@ -2,6 +2,7 @@ "variables": { "client_id": "{{env `ARM_CLIENT_ID`}}", "client_secret": "{{env `ARM_CLIENT_SECRET`}}", + "client_cert_path": "{{env `ARM_CLIENT_CERT_PATH`}}", "subscription_id": "{{env `ARM_SUBSCRIPTION_ID`}}", "tenant_id": "{{env `ARM_TENANT_ID`}}", "object_id": "{{env `ARM_OBJECT_ID`}}", @@ -36,6 +37,7 @@ "type": "azure-arm", "client_id": "{{user `client_id`}}", "client_secret": "{{user `client_secret`}}", + "client_cert_path": "{{user `client_cert_path`}}", "subscription_id": "{{user `subscription_id`}}", "object_id": "{{user `object_id`}}", "tenant_id": "{{user `tenant_id`}}", From 984b0a83de5b36982423cb1e8c7bd7f1e238953b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 20 May 2022 11:24:00 +0000 Subject: [PATCH 1162/3485] Updating readme file for macOS-10.15 version 20220515.1 (#5552) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-10.15-Readme.md | 52 +++++++++++++++--------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/images/macos/macos-10.15-Readme.md b/images/macos/macos-10.15-Readme.md index fbf748b05f3e..34b082549ecc 100644 --- a/images/macos/macos-10.15-Readme.md +++ b/images/macos/macos-10.15-Readme.md @@ -1,16 +1,16 @@ | Announcements | |-| | [[macOS] Xcode versions 13.2 & 13.3 will be removed, 13.3.1 will be set as the default one on May, 16](https://github.com/actions/virtual-environments/issues/5463) | -| [macOS 12 (Monterey) is available as a public beta in GitHub Actions](https://github.com/actions/virtual-environments/issues/5446) | +| [macOS 12 (Monterey) is available as a public beta in GitHub Actions and Azure DevOps](https://github.com/actions/virtual-environments/issues/5446) | *** # macOS 10.15 info - System Version: macOS 10.15.7 (19H1824) - Kernel Version: Darwin 19.6.0 -- Image Version: 20220508.1 +- Image Version: 20220515.1 ## Installed Software ### Language and Runtime -- .NET SDK 3.1.101 3.1.201 3.1.302 3.1.418 5.0.102 5.0.202 5.0.302 5.0.407 +- .NET SDK 3.1.101 3.1.201 3.1.302 3.1.419 5.0.102 5.0.202 5.0.302 5.0.408 - Bash 3.2.57(1)-release - Clang/LLVM 12.0.0 is default - Clang/LLVM 13.0.1 is available on `'$(brew --prefix llvm)/bin/clang'` @@ -20,7 +20,7 @@ - GNU Fortran (Homebrew GCC 9.4.0) 9.4.0 - available by `gfortran-9` alias - GNU Fortran (Homebrew GCC 10.3.0) 10.3.0 - available by `gfortran-10` alias - GNU Fortran (Homebrew GCC 11.3.0) 11.3.0 - available by `gfortran-11` alias -- Go 1.17.9 +- Go 1.17.10 - julia 1.7.2 - Kotlin 1.6.21-release-334 - MSBuild 16.10.1.58001 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) @@ -28,7 +28,7 @@ - NVM 0.39.1 - NVM - Cached node versions: v12.22.12 v14.19.2 v16.15.0 - Perl 5.34.0 -- PHP 8.1.5 +- PHP 8.1.6 - Python 2.7.18 - Python 3.9.12 - R 4.2.0 @@ -39,7 +39,7 @@ - Carthage 0.38.0 - CocoaPods 1.11.3 - Composer 2.3.5 -- Homebrew 3.4.10 +- Homebrew 3.4.11 - Miniconda 4.11.0 - NPM 8.5.5 - NuGet 5.9.0.7134 @@ -47,8 +47,8 @@ - Pip 22.0.4 (python 3.9) - Pipx 1.0.0 - RubyGems 3.2.33 -- Vcpkg 2022 (build from master \<a5d6d1451>) -- Yarn 1.22.18 +- Vcpkg 2022 (build from master \<0cf5b4305>) +- Yarn 1.22.19 #### Environment variables | Name | Value | @@ -65,29 +65,29 @@ ### Utilities - 7-Zip 17.04 - aria2 1.36.0 -- azcopy 10.14.1 +- azcopy 10.15.0 - bazel 5.1.1 - bazelisk 1.11.0 - bsdtar 3.3.2 - available by 'tar' alias -- Curl 7.83.0 -- Git 2.35.1 +- Curl 7.83.1 +- Git 2.36.1 - Git LFS: 3.1.4 -- GitHub CLI: 2.9.0 +- GitHub CLI: 2.10.1 - GNU parallel 20220422 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.3 - gpg (GnuPG) 2.3.6 - helm v3.8.2+g6e3701e - Hub CLI: 2.14.2 -- ImageMagick 7.1.0-32 +- ImageMagick 7.1.0-33 - jq 1.6 - mongo v5.0.7 - mongod v5.0.7 - Newman 5.3.2 - OpenSSL 1.1.1o 3 May 2022 `(/usr/local/opt/openssl@1.1 -> ../Cellar/openssl@1.1/1.1.1o)` - Packer 1.8.0 -- PostgreSQL 14.2 -- psql (PostgreSQL) 14.2 +- PostgreSQL 14.3 +- psql (PostgreSQL) 14.3 - Sox 14.4.2 - Subversion (SVN) 1.14.2 - Switchaudio-osx 1.1.0 @@ -97,19 +97,19 @@ - zstd 1.5.2 ### Tools -- Aliyun CLI 3.0.117 +- Aliyun CLI 3.0.119 - App Center CLI 2.10.10 -- AWS CLI 2.6.3 -- AWS SAM CLI 1.48.0 +- AWS CLI 2.7.0 +- AWS SAM CLI 1.50.0 - AWS Session Manager CLI 1.2.312.0 - Azure CLI (azure-devops) 0.25.0 - Azure CLI 2.36.0 -- Bicep CLI 0.6.1 +- Bicep CLI 0.6.18 - Cabal 3.6.2.0 - Cmake 3.23.1 - Fastlane 2.205.2 - GHC 9.2.2 -- GHCup 0.1.17.7 +- GHCup 0.1.17.8 - Jazzy 0.14.2 - Stack 2.7.5 - SwiftFormat 0.49.8 @@ -123,10 +123,10 @@ ### Browsers - Safari 15.4 (15613.1.17.1.13) - SafariDriver 15.4 (15613.1.17.1.13) -- Google Chrome 101.0.4951.54 +- Google Chrome 101.0.4951.64 - ChromeDriver 101.0.4951.41 -- Microsoft Edge 101.0.1210.39 -- MSEdgeDriver 101.0.1210.39 +- Microsoft Edge 101.0.1210.47 +- MSEdgeDriver 101.0.1210.47 - Mozilla Firefox 100.0 - geckodriver 0.31.0 - Selenium server 4.1.4 @@ -185,8 +185,8 @@ | Version | Architecture | Environment Variable | | ------- | ------------ | -------------------- | | 1.16.15 | x64 | GOROOT_1_16_X64 | -| 1.17.9 (Default) | x64 | GOROOT_1_17_X64 | -| 1.18.1 | x64 | GOROOT_1_18_X64 | +| 1.17.10 (Default) | x64 | GOROOT_1_17_X64 | +| 1.18.2 | x64 | GOROOT_1_18_X64 | ### Rust Tools - Cargo 1.60.0 @@ -221,7 +221,7 @@ ### Xamarin #### Visual Studio for Mac -- 8.10.22.11 +- 8.10.23.7 #### Xamarin bundles | symlink | Xamarin.Mono | Xamarin.iOS | Xamarin.Mac | Xamarin.Android | From e4d58452f4d4fc085b24c7be9bb6d57a3ba4d3ec Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Fri, 20 May 2022 15:40:31 +0200 Subject: [PATCH 1163/3485] [Ubuntu] Rework podman and tools installation (#5580) --- .../SoftwareReport/SoftwareReport.Generator.ps1 | 8 ++++++-- .../SoftwareReport/SoftwareReport.Tools.psm1 | 9 +++------ images/linux/scripts/installers/containers.sh | 16 +--------------- images/linux/scripts/tests/Tools.Tests.ps1 | 9 ++++----- images/linux/ubuntu1804.json | 1 - images/linux/ubuntu2004.json | 1 - images/linux/ubuntu2204.pkr.hcl | 1 + 7 files changed, 15 insertions(+), 30 deletions(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index d17c07d5d6f9..96faa99023ac 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -149,10 +149,14 @@ $toolsList = @( if ((Test-IsUbuntu18) -or (Test-IsUbuntu20)) { $toolsList += @( - (Get-BuildahVersion), (Get-PhantomJSVersion), (Get-LeiningenVersion), - (Get-HHVMVersion), + (Get-HHVMVersion) + ) +} +if (Test-IsUbuntu22) { + $toolsList += @( + (Get-BuildahVersion), (Get-PodManVersion), (Get-SkopeoVersion) ) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 index 7eeb9e307560..383c113a8626 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 @@ -42,20 +42,17 @@ function Get-CodeQLBundleVersion { function Get-PodManVersion { $podmanVersion = podman --version | Take-OutputPart -Part 2 - $aptSourceRepo = Get-AptSourceRepository -PackageName "containers" - return "Podman $podmanVersion (apt source repository: $aptSourceRepo)" + return "Podman $podmanVersion" } function Get-BuildahVersion { $buildahVersion = buildah --version | Take-OutputPart -Part 2 - $aptSourceRepo = Get-AptSourceRepository -PackageName "containers" - return "Buildah $buildahVersion (apt source repository: $aptSourceRepo)" + return "Buildah $buildahVersion" } function Get-SkopeoVersion { $skopeoVersion = skopeo --version | Take-OutputPart -Part 2 - $aptSourceRepo = Get-AptSourceRepository -PackageName "containers" - return "Skopeo $skopeoVersion (apt source repository: $aptSourceRepo)" + return "Skopeo $skopeoVersion" } function Get-CMakeVersion { diff --git a/images/linux/scripts/installers/containers.sh b/images/linux/scripts/installers/containers.sh index edeb0f78b942..ebd42cabfdb3 100644 --- a/images/linux/scripts/installers/containers.sh +++ b/images/linux/scripts/installers/containers.sh @@ -4,25 +4,11 @@ ## Desc: Installs container tools: podman, buildah and skopeo onto the image ################################################################################ -source $HELPER_SCRIPTS/os.sh - install_packages=(podman buildah skopeo) -REPO_URL="https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable" -# Install podman, buildah, scopeo container's tools (on Ubuntu20 these tools can be installed without adding new repository) -source /etc/os-release -sh -c "echo 'deb ${REPO_URL}/x${NAME}_${VERSION_ID}/ /' > /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list" -wget -qnv https://download.opensuse.org/repositories/devel:kubic:libcontainers:stable/x${NAME}_${VERSION_ID}/Release.key -O Release.key -apt-key add Release.key -apt-get update -qq +# Install podman, buildah, scopeo container's tools apt-get -qq -y install ${install_packages[@]} mkdir -p /etc/containers echo -e "[registries.search]\nregistries = ['docker.io', 'quay.io']" | tee /etc/containers/registries.conf -# Remove source repo -rm /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list - -# Document source repo -echo "containers $REPO_URL" >> $HELPER_SCRIPTS/apt-sources.txt - invoke_tests "Tools" "Containers" diff --git a/images/linux/scripts/tests/Tools.Tests.ps1 b/images/linux/scripts/tests/Tools.Tests.ps1 index 7f22857a75de..178eac1ec529 100644 --- a/images/linux/scripts/tests/Tools.Tests.ps1 +++ b/images/linux/scripts/tests/Tools.Tests.ps1 @@ -20,8 +20,7 @@ Describe "Rust" { $env:RUSTUP_HOME = "/etc/skel/.rustup" $env:CARGO_HOME = "/etc/skel/.cargo" } - - + It "Rustup is installed" { "rustup --version" | Should -ReturnZeroExitCode } @@ -121,7 +120,7 @@ Describe "clang" { "clang-$ClangVersion --version" | Should -ReturnZeroExitCode "clang++-$ClangVersion --version" | Should -ReturnZeroExitCode - } + } } Describe "Cmake" { @@ -336,7 +335,7 @@ Describe "GraalVM" -Skip:(Test-IsUbuntu18) { } } -Describe "Containers" -Skip:(Test-IsUbuntu22) { +Describe "Containers" -Skip:(-not (Test-IsUbuntu22)) { $testCases = @("podman", "buildah", "skopeo") | ForEach-Object { @{ContainerCommand = $_} } It "<ContainerCommand>" -TestCases $testCases { @@ -345,7 +344,7 @@ Describe "Containers" -Skip:(Test-IsUbuntu22) { ) "$ContainerCommand -v" | Should -ReturnZeroExitCode - } + } } Describe "nvm" { diff --git a/images/linux/ubuntu1804.json b/images/linux/ubuntu1804.json index bdd5847ab8e5..8b8a0a166828 100644 --- a/images/linux/ubuntu1804.json +++ b/images/linux/ubuntu1804.json @@ -199,7 +199,6 @@ "{{template_dir}}/scripts/installers/swift.sh", "{{template_dir}}/scripts/installers/cmake.sh", "{{template_dir}}/scripts/installers/codeql-bundle.sh", - "{{template_dir}}/scripts/installers/containers.sh", "{{template_dir}}/scripts/installers/dotnetcore-sdk.sh", "{{template_dir}}/scripts/installers/erlang.sh", "{{template_dir}}/scripts/installers/firefox.sh", diff --git a/images/linux/ubuntu2004.json b/images/linux/ubuntu2004.json index ee9fb00f7be6..1b1b1d7087ca 100644 --- a/images/linux/ubuntu2004.json +++ b/images/linux/ubuntu2004.json @@ -200,7 +200,6 @@ "{{template_dir}}/scripts/installers/swift.sh", "{{template_dir}}/scripts/installers/cmake.sh", "{{template_dir}}/scripts/installers/codeql-bundle.sh", - "{{template_dir}}/scripts/installers/containers.sh", "{{template_dir}}/scripts/installers/dotnetcore-sdk.sh", "{{template_dir}}/scripts/installers/erlang.sh", "{{template_dir}}/scripts/installers/firefox.sh", diff --git a/images/linux/ubuntu2204.pkr.hcl b/images/linux/ubuntu2204.pkr.hcl index b443dd0c094d..7c50638ecfe5 100644 --- a/images/linux/ubuntu2204.pkr.hcl +++ b/images/linux/ubuntu2204.pkr.hcl @@ -276,6 +276,7 @@ build { "${path.root}/scripts/installers/clang.sh", "${path.root}/scripts/installers/cmake.sh", "${path.root}/scripts/installers/codeql-bundle.sh", + "${path.root}/scripts/installers/containers.sh", "${path.root}/scripts/installers/dotnetcore-sdk.sh", "${path.root}/scripts/installers/gcc.sh", "${path.root}/scripts/installers/gfortran.sh", From 1996a78b430925e338824b0f0a59d7ba4716b8af Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Mon, 23 May 2022 14:04:06 +0200 Subject: [PATCH 1164/3485] fix Ubuntu 22.04 template extension (#5591) --- helpers/GenerateResourcesAndImage.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helpers/GenerateResourcesAndImage.ps1 b/helpers/GenerateResourcesAndImage.ps1 index 5166d454298b..e62dd4ad66d8 100644 --- a/helpers/GenerateResourcesAndImage.ps1 +++ b/helpers/GenerateResourcesAndImage.ps1 @@ -34,7 +34,7 @@ Function Get-PackerTemplatePath { $relativeTemplatePath = Join-Path "linux" "ubuntu2004.json" } ([ImageType]::Ubuntu2204) { - $relativeTemplatePath = Join-Path "linux" "ubuntu2204.json" + $relativeTemplatePath = Join-Path "linux" "ubuntu2204.pkr.hcl" } default { throw "Unknown type of image" } } From f8f8c9350953fc343a352ed78c41432aac70281f Mon Sep 17 00:00:00 2001 From: Shohei Maeda <11495867+smaeda-ks@users.noreply.github.com> Date: Mon, 23 May 2022 22:47:07 +0900 Subject: [PATCH 1165/3485] [Ubuntu] Use new Hashicorp Releases API (#5587) --- images/linux/scripts/installers/packer.sh | 11 +++++++---- images/linux/scripts/installers/terraform.sh | 11 +++++++---- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/images/linux/scripts/installers/packer.sh b/images/linux/scripts/installers/packer.sh index 1a15ee4c3546..34c7f01ebd56 100644 --- a/images/linux/scripts/installers/packer.sh +++ b/images/linux/scripts/installers/packer.sh @@ -4,10 +4,13 @@ ## Desc: Installs packer ################################################################################ +source $HELPER_SCRIPTS/install.sh + # Install Packer -PACKER_VERSION=$(curl -s https://checkpoint-api.hashicorp.com/v1/check/packer | jq -r .current_version) -curl -LO "https://releases.hashicorp.com/packer/${PACKER_VERSION}/packer_${PACKER_VERSION}_linux_amd64.zip" -unzip -qq "packer_${PACKER_VERSION}_linux_amd64.zip" -d /usr/local/bin -rm -f "packer_${PACKER_VERSION}_linux_amd64.zip" +URL=$(curl -s https://api.releases.hashicorp.com/v1/releases/packer/latest | jq -r '.builds[] | select((.arch=="amd64") and (.os=="linux")).url') +ZIP_NAME="packer_linux_amd64.zip" +download_with_retries "${URL}" "/tmp" "${ZIP_NAME}" +unzip -qq "/tmp/${ZIP_NAME}" -d /usr/local/bin +rm -f "/tmp/${ZIP_NAME}" invoke_tests "Tools" "Packer" \ No newline at end of file diff --git a/images/linux/scripts/installers/terraform.sh b/images/linux/scripts/installers/terraform.sh index d2b621ae76e5..bed616fb84c6 100644 --- a/images/linux/scripts/installers/terraform.sh +++ b/images/linux/scripts/installers/terraform.sh @@ -4,10 +4,13 @@ ## Desc: Installs terraform ################################################################################ +source $HELPER_SCRIPTS/install.sh + # Install Terraform -TERRAFORM_VERSION=$(curl -s https://checkpoint-api.hashicorp.com/v1/check/terraform | jq -r .current_version) -curl -LO "https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_linux_amd64.zip" -unzip -qq "terraform_${TERRAFORM_VERSION}_linux_amd64.zip" -d /usr/local/bin -rm -f "terraform_${TERRAFORM_VERSION}_linux_amd64.zip" +URL=$(curl -s https://api.releases.hashicorp.com/v1/releases/terraform/latest | jq -r '.builds[] | select((.arch=="amd64") and (.os=="linux")).url') +ZIP_NAME="terraform_linux_amd64.zip" +download_with_retries "${URL}" "/tmp" "${ZIP_NAME}" +unzip -qq "/tmp/${ZIP_NAME}" -d /usr/local/bin +rm -f "/tmp/${ZIP_NAME}" invoke_tests "Tools" "Terraform" \ No newline at end of file From 64e497aba9254bc120d3587f22724ae96588c134 Mon Sep 17 00:00:00 2001 From: juliancarrivick <jcarrivick@outlook.com> Date: Mon, 23 May 2022 21:50:28 +0800 Subject: [PATCH 1166/3485] Add clang-tidy to Ubuntu images (#5541) --- .../SoftwareReport/SoftwareReport.Common.psm1 | 14 ++++++++++---- .../SoftwareReport/SoftwareReport.Generator.ps1 | 3 ++- images/linux/scripts/installers/clang.sh | 4 +++- images/linux/scripts/tests/Tools.Tests.ps1 | 3 +++ 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 index 07356a30d10a..5941b309a8d2 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 @@ -24,14 +24,15 @@ function Get-ClangToolVersions { param ( [Parameter(Mandatory = $true)] [string] $ToolName, + [string] $VersionLineMatcher = "${ToolName} version", [string] $VersionPattern = "\d+\.\d+\.\d+)-" ) $result = Get-CommandResult "apt list --installed" -Multiline $toolVersions = $result.Output | Where-Object { $_ -match "^${ToolName}-\d+"} | ForEach-Object { $clangCommand = ($_ -Split "/")[0] - Invoke-Expression "$clangCommand --version" | Where-Object { $_ -match "${ToolName} version" } | ForEach-Object { - $_ -match "${ToolName} version (?<version>${VersionPattern}" | Out-Null + Invoke-Expression "$clangCommand --version" | Where-Object { $_ -match "${VersionLineMatcher}" } | ForEach-Object { + $_ -match "${VersionLineMatcher} (?<version>${VersionPattern}" | Out-Null $Matches.version } } | Sort-Object {[Version]$_} @@ -41,12 +42,17 @@ function Get-ClangToolVersions { function Get-ClangVersions { $clangVersions = Get-ClangToolVersions -ToolName "clang" - return "Clang " + $clangVersions + return "Clang $clangVersions" } function Get-ClangFormatVersions { $clangFormatVersions = Get-ClangToolVersions -ToolName "clang-format" - return "Clang-format " + $clangFormatVersions + return "Clang-format $clangFormatVersions" +} + +function Get-ClangTidyVersions { + $clangFormatVersions = Get-ClangToolVersions -ToolName "clang-tidy" -VersionLineMatcher "LLVM version" -VersionPattern "\d+\.\d+\.\d+)" + return "Clang-tidy $clangFormatVersions" } diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index 96faa99023ac..dc0f9a8f1f11 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -48,7 +48,8 @@ $runtimesList = @( (Get-RubyVersion), (Get-JuliaVersion), (Get-ClangVersions), - (Get-ClangFormatVersions) + (Get-ClangFormatVersions), + (Get-ClangTidyVersions) ) if ((Test-IsUbuntu18) -or (Test-IsUbuntu20)) { diff --git a/images/linux/scripts/installers/clang.sh b/images/linux/scripts/installers/clang.sh index 91f5b962a2ba..1c97364fdc3f 100644 --- a/images/linux/scripts/installers/clang.sh +++ b/images/linux/scripts/installers/clang.sh @@ -11,7 +11,7 @@ function InstallClang { local version=$1 echo "Installing clang-$version..." - apt-get install -y "clang-$version" "lldb-$version" "lld-$version" "clang-format-$version" + apt-get install -y "clang-$version" "lldb-$version" "lld-$version" "clang-format-$version" "clang-tidy-$version" } function SetDefaultClang { @@ -21,6 +21,8 @@ function SetDefaultClang { update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-${version} 100 update-alternatives --install /usr/bin/clang clang /usr/bin/clang-${version} 100 update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-${version} 100 + update-alternatives --install /usr/bin/clang-tidy clang-tidy /usr/bin/clang-tidy-${version} 100 + update-alternatives --install /usr/bin/run-clang-tidy run-clang-tidy /usr/bin/run-clang-tidy-${version} 100 } versions=$(get_toolset_value '.clang.versions[]') diff --git a/images/linux/scripts/tests/Tools.Tests.ps1 b/images/linux/scripts/tests/Tools.Tests.ps1 index 178eac1ec529..582da0ea6cb0 100644 --- a/images/linux/scripts/tests/Tools.Tests.ps1 +++ b/images/linux/scripts/tests/Tools.Tests.ps1 @@ -120,6 +120,9 @@ Describe "clang" { "clang-$ClangVersion --version" | Should -ReturnZeroExitCode "clang++-$ClangVersion --version" | Should -ReturnZeroExitCode + "clang-format-$ClangVersion --version" | Should -ReturnZeroExitCode + "clang-tidy-$ClangVersion --version" | Should -ReturnZeroExitCode + "run-clang-tidy-$ClangVersion --help" | Should -ReturnZeroExitCode } } From de68d8faeaea0ce463577abd39cd0044b32b6b21 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 24 May 2022 08:41:22 +0000 Subject: [PATCH 1167/3485] Updating readme file for ubuntu22 version 20220522.1 (#5589) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2204-Readme.md | 65 +++++++++++++++++-------------- 1 file changed, 35 insertions(+), 30 deletions(-) diff --git a/images/linux/Ubuntu2204-Readme.md b/images/linux/Ubuntu2204-Readme.md index d2736a2baedb..8c6e7590cdbf 100644 --- a/images/linux/Ubuntu2204-Readme.md +++ b/images/linux/Ubuntu2204-Readme.md @@ -1,10 +1,11 @@ | Announcements | |-| +| [[Ubuntu] Container tools (buildah, podman, skopeo) will be removed from Ubuntu 18 & 20 images](https://github.com/actions/virtual-environments/issues/5578) | | [(Public Beta) Ubuntu 22.04 is now available](https://github.com/actions/virtual-environments/issues/5490) | *** # Ubuntu 22.04 LTS - Linux kernel version: 5.15.0-1005-azure -- Image Version: 20220515.1 +- Image Version: 20220522.1 ## Installed Software ### Language and Runtime @@ -22,15 +23,15 @@ ### Package Management - cpan 1.64 -- Helm 3.8.2 +- Helm 3.9.0 - Homebrew 3.4.11 -- Miniconda 4.11.0 +- Miniconda 4.12.0 - Npm 8.5.5 - Pip 22.0.2 - Pip3 22.0.2 - Pipx 1.0.0 - RubyGems 3.3.5 -- Vcpkg (build from master \<0cf5b4305>) +- Vcpkg (build from master \<314018fef>) - Yarn 1.22.18 #### Environment variables @@ -49,45 +50,49 @@ - Bazel 5.1.1 - Bazelisk 1.11.0 - Bicep 0.6.18 +- Buildah 1.23.1 - CMake 3.23.1 -- CodeQL Action Bundle 2.9.1 +- CodeQL Action Bundle 2.9.2 +- Docker Amazon ECR Credential Helper 0.6.0 - Docker Compose v1 1.29.2 - Docker Compose v2 2.4.1+azure-1 - Docker-Buildx 0.8.2 - Docker-Moby Client 20.10.15+azure-1 -- Docker-Moby Server 20.10.15+azure-2 -- Fastlane 2.205.2 +- Docker-Moby Server 20.10.16+azure-2 +- Fastlane 2.206.1 - Git 2.36.1 (apt source repository: ppa:git-core/ppa) - Git LFS 3.1.4 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.6.0 - Haveged 1.9.14 - Heroku 7.60.2 - jq 1.6 -- Kind 0.13.0 +- Kind 0.14.0 - Kubectl 1.24.0 -- Kustomize 4.5.4 +- Kustomize 4.5.5 - MediaInfo 21.09 - Mercurial 6.1.1 - Minikube 1.25.2 - n 8.2.0 - Newman 5.3.2 - nvm 0.39.1 -- OpenSSL 3.0.2-0ubuntu1.1 +- OpenSSL 3.0.2-0ubuntu1.2 - Packer 1.8.0 - Parcel 2.5.0 -- Pulumi 3.32.1 +- Podman 3.4.4 +- Pulumi 3.33.1 - R 4.2.0 +- Skopeo 1.4.1 - Sphinx Open Source Search Server 2.2.11 - SVN 1.14.1 -- Terraform 1.1.9 +- Terraform 1.2.0 - yamllint 1.26.3 - yq 4.25.1 - zstd 1.5.2 (homebrew) ### CLI Tools -- Alibaba Cloud CLI 3.0.119 -- AWS CLI 2.7.0 -- AWS CLI Session manager plugin 1.2.312.0 +- Alibaba Cloud CLI 3.0.120 +- AWS CLI 2.7.2 +- AWS CLI Session manager plugin 1.2.323.0 - AWS SAM CLI 1.50.0 - Azure CLI (azure-cli) 2.36.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.25.0 @@ -95,9 +100,9 @@ - Google Cloud SDK 369.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 - Netlify CLI 10.3.1 -- OpenShift CLI 4.10.13 +- OpenShift CLI 4.10.14 - ORAS CLI 0.12.0 -- Vercel CLI 24.2.3 +- Vercel CLI 24.2.4 ### GraalVM | Version | Environment variables | @@ -107,7 +112,7 @@ ### PHP | Tool | Version | | -------- | ------- | -| PHP | 8.1.5 | +| PHP | 8.1.6 | | Composer | 2.3.5 | | PHPUnit | 8.5.26 | ``` @@ -120,15 +125,15 @@ - Stack 2.7.5 ### Rust Tools -- Cargo 1.60.0 -- Rust 1.60.0 -- Rustdoc 1.60.0 +- Cargo 1.61.0 +- Rust 1.61.0 +- Rustdoc 1.61.0 - Rustup 1.24.3 #### Packages - Bindgen 0.59.2 - Cargo audit 0.16.0 -- Cargo clippy 0.1.60 +- Cargo clippy 0.1.61 - Cargo outdated 0.11.1 - Cbindgen 0.23.0 - Rustfmt 1.4.38 @@ -149,7 +154,7 @@ - 6.0.300 ### .NET tools -- nbgv 3.5.104+d0b7c362ff +- nbgv 3.5.107+6463ef6068 ### Databases - sqlite3 3.37.2 @@ -174,7 +179,7 @@ - 1.18.2 #### Node.js -- 14.19.2 +- 14.19.3 - 16.15.0 #### PyPy @@ -185,7 +190,7 @@ #### Python - 3.7.13 - 3.8.12 -- 3.9.12 +- 3.9.13 - 3.10.4 #### Ruby @@ -198,7 +203,7 @@ | GOROOT_1_18_X64 | /opt/hostedtoolcache/go/1.18.2/x64 | x64 | ### PowerShell Tools -- PowerShell 7.2.3 +- PowerShell 7.2.4 #### PowerShell Modules | Module | Version | @@ -227,8 +232,8 @@ | debian:10 | sha256:405f48fbb359190809bd91aac79c3f6c346c1e79878c839351c6a817db5e9fc4 | 2022-05-11 | | debian:11 | sha256:6137c67e2009e881526386c42ba99b3657e4f92f546814a33d35b14e60579777 | 2022-05-11 | | moby/buildkit:latest | sha256:0dc312b04eac1b44cd2cad566deb1e886c753109208affbbec8384f381ff7f38 | 2022-05-06 | -| node:14 | sha256:61168c39af89331ffaa6ba41c2a44f4d5132a857a6034175f994948b5798b588 | 2022-05-11 | -| node:14-alpine | sha256:8845b4f88f64f8c56a39236648ba22946e806a6153c10911f77b70e5a2edb4ca | 2022-04-05 | +| node:14 | sha256:42353ba2f129758dd5df19c6bcc3107d519436585467b231883b07f21336a484 | 2022-05-18 | +| node:14-alpine | sha256:c9b8829068199346e2a9ae46f870bbb82ce44de6580321300bf3945d00dee0f1 | 2022-05-18 | | node:16 | sha256:1817bb941c9a30fe2a6d75ff8675a8f6def408efe3d3ff43dbb006e2b534fa14 | 2022-05-11 | | node:16-alpine | sha256:1a9a71ea86aad332aa7740316d4111ee1bd4e890df47d3b5eff3e5bded3b3d10 | 2022-04-27 | | ubuntu:18.04 | sha256:d21b6ba9e19feffa328cb3864316e6918e30acfd55e285b5d3df1d8ca3c7fd3f | 2022-04-29 | @@ -250,7 +255,7 @@ | coreutils | 8.32-4.1ubuntu1 | | curl | 7.81.0-1ubuntu1.2 | | dbus | 1.12.20-2ubuntu4 | -| dnsutils | 1:9.18.1-1ubuntu1 | +| dnsutils | 1:9.18.1-1ubuntu1.1 | | dpkg | 1.21.1ubuntu2 | | fakeroot | 1.28-1ubuntu1 | | file | 1:5.41-3 | @@ -276,7 +281,7 @@ | libmagickwand-dev | 8:6.9.11.60+dfsg-1.3build2 | | libsecret-1-dev | 0.20.5-2 | | libsqlite3-dev | 3.37.2-2 | -| libssl-dev | 3.0.2-0ubuntu1.1 | +| libssl-dev | 3.0.2-0ubuntu1.2 | | libtool | 2.4.6-15build2 | | libunwind8 | 1.3.2-2build2 | | libxkbfile-dev | 1:1.1.0-1build3 | From c3fb682f73f0baff6423bdc59d92fe36563eb18e Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Tue, 24 May 2022 13:30:13 +0200 Subject: [PATCH 1168/3485] [ImageGen] Fix allowed_inbound_ip_addresses error (#5597) * Fix allowed_inbound_ip_addresses error * Add space --- helpers/GenerateResourcesAndImage.ps1 | 12 ++++++++---- images/linux/ubuntu2204.pkr.hcl | 1 + 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/helpers/GenerateResourcesAndImage.ps1 b/helpers/GenerateResourcesAndImage.ps1 index e62dd4ad66d8..6a7f864d1dbe 100644 --- a/helpers/GenerateResourcesAndImage.ps1 +++ b/helpers/GenerateResourcesAndImage.ps1 @@ -119,7 +119,7 @@ Function GenerateResourcesAndImage { [Parameter(Mandatory = $False)] [bool] $EnableHttpsTrafficOnly = $False, [Parameter(Mandatory = $False)] - [Hashtable] $tags + [hashtable] $Tags ) try { @@ -260,15 +260,19 @@ Function GenerateResourcesAndImage { throw "'packer' binary is not found on PATH" } - if($RestrictToAgentIpAddress -eq $true) { + if ($RestrictToAgentIpAddress) { $AgentIp = (Invoke-RestMethod http://ipinfo.io/json).ip Write-Host "Restricting access to packer generated VM to agent IP Address: $AgentIp" } - if ($tags) { + if ($builderScriptPath.Contains("pkr.hcl")) { + $AgentIp = '[ \"{0}\" ]' -f $AgentIp + } + + if ($Tags) { $builderScriptPath_temp = $builderScriptPath.Replace(".json", "-temp.json") $packer_script = Get-Content -Path $builderScriptPath | ConvertFrom-Json - $packer_script.builders | Add-Member -Name "azure_tags" -Value $tags -MemberType NoteProperty + $packer_script.builders | Add-Member -Name "azure_tags" -Value $Tags -MemberType NoteProperty $packer_script | ConvertTo-Json -Depth 3 | Out-File $builderScriptPath_temp $builderScriptPath = $builderScriptPath_temp } diff --git a/images/linux/ubuntu2204.pkr.hcl b/images/linux/ubuntu2204.pkr.hcl index 7c50638ecfe5..b82227ec5b4a 100644 --- a/images/linux/ubuntu2204.pkr.hcl +++ b/images/linux/ubuntu2204.pkr.hcl @@ -1,5 +1,6 @@ variable "allowed_inbound_ip_addresses" { + type = list(string) default = [] } From 12cbf387cabe5494daf18f449097bc6eb899cb27 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Tue, 24 May 2022 18:40:15 +0200 Subject: [PATCH 1169/3485] Update allowed_inbound_ip_addresses default condition (#5602) --- helpers/GenerateResourcesAndImage.ps1 | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/helpers/GenerateResourcesAndImage.ps1 b/helpers/GenerateResourcesAndImage.ps1 index 6a7f864d1dbe..d90dc87c67be 100644 --- a/helpers/GenerateResourcesAndImage.ps1 +++ b/helpers/GenerateResourcesAndImage.ps1 @@ -266,7 +266,11 @@ Function GenerateResourcesAndImage { } if ($builderScriptPath.Contains("pkr.hcl")) { - $AgentIp = '[ \"{0}\" ]' -f $AgentIp + if ($AgentIp) { + $AgentIp = '[ \"{0}\" ]' -f $AgentIp + } else { + $AgentIp = "[]" + } } if ($Tags) { From 7a7fafda99ef4ddb3539fc19596dd1cfc1ab0edc Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Tue, 24 May 2022 23:48:57 +0400 Subject: [PATCH 1170/3485] [macOS] Add virtualbox to macOS-12 (#5594) * Add virtualbox to macOS-12 * Fix Get_OSVersion function as isBigSur didn't work * Use proper comparison --- images/macos/helpers/Common.Helpers.psm1 | 11 ++-- images/macos/provision/core/commonutils.sh | 6 +++ .../utils/confirm-identified-developers.scpt | 53 +++++++++++++++++++ .../SoftwareReport.Common.psm1 | 2 +- .../SoftwareReport.Generator.ps1 | 7 ++- images/macos/templates/macOS-12.json | 7 +-- images/macos/tests/BasicTools.Tests.ps1 | 2 +- images/macos/tests/Common.Tests.ps1 | 6 +++ images/macos/toolsets/toolset-12.json | 3 +- 9 files changed, 83 insertions(+), 14 deletions(-) create mode 100644 images/macos/provision/utils/confirm-identified-developers.scpt diff --git a/images/macos/helpers/Common.Helpers.psm1 b/images/macos/helpers/Common.Helpers.psm1 index f8d758b3b26e..0dbe2383169c 100644 --- a/images/macos/helpers/Common.Helpers.psm1 +++ b/images/macos/helpers/Common.Helpers.psm1 @@ -28,17 +28,14 @@ function Get-EnvironmentVariable($variable) { function Get-OSVersion { $osVersion = [Environment]::OSVersion $osVersionMajorMinor = $osVersion.Version.ToString(2) - # Monterey needs future review: - # [Environment]::OSVersion returns 11.0 for Monterey preview. - [SemVer]$osMontereyVersion = sw_vers -productVersion return [PSCustomObject]@{ Version = $osVersion.Version Platform = $osVersion.Platform IsCatalina = $osVersionMajorMinor -eq "10.15" - IsBigSur = $osVersionMajorMinor -eq "11.0" - IsMonterey = $osMontereyVersion.Major -eq "12" - IsLessThanMonterey = $osMontereyVersion -lt "12.0" - IsHigherThanCatalina = [SemVer]$osVersion.Version -ge "11.0" + IsBigSur = $osVersion.Version.Major -eq "11" + IsMonterey = $osVersion.Version.Major -eq "12" + IsLessThanMonterey = $osVersion.Version.Major -lt "12" + IsHigherThanCatalina = $osVersion.Version.Major -ge "11" } } diff --git a/images/macos/provision/core/commonutils.sh b/images/macos/provision/core/commonutils.sh index f51d9b9ecbb5..daa06627afe4 100644 --- a/images/macos/provision/core/commonutils.sh +++ b/images/macos/provision/core/commonutils.sh @@ -16,6 +16,12 @@ for package in $cask_packages; do brew install --cask $package done +# Execute AppleScript to change security preferences for virtualbox +# System Preferences -> Security & Privacy -> General -> Unlock -> Allow -> Not now +if is_Monterey; then + osascript $HOME/utils/confirm-identified-developers.scpt $USER_PASSWORD +fi + # Invoke bazel to download bazel version via bazelisk bazel diff --git a/images/macos/provision/utils/confirm-identified-developers.scpt b/images/macos/provision/utils/confirm-identified-developers.scpt new file mode 100644 index 000000000000..a445d8be1b25 --- /dev/null +++ b/images/macos/provision/utils/confirm-identified-developers.scpt @@ -0,0 +1,53 @@ +# This AppleScript confirms developers in security preferences via macOS UI. +# It uses after VirtualBox installation to add 'Oracle Inc' as identified developer. +# Steps: +# - Close security preferences pop-up (it can be open after VirtualBox installation) +# - Open System Preferences -> Security & Privacy -> General +# - Unlock security preferences with user password (button 'Click the lock to make changes') +# - Click 'Allow' or 'Details…' button to confirm developers +# - Click 'Not now' button on restarting pop-up +# - Close System Preferences + +on run argv + set userpassword to item 1 of argv + set secpane to "Security & Privacy" + + tell application "System Events" + tell security preferences + keystroke return + delay 5 + end tell + end tell + + activate application "System Preferences" + delay 5 + tell application "System Events" + tell process "System Preferences" + click menu item secpane of menu "View" of menu bar 1 + delay 5 + click button 1 of window 1 + delay 5 + keystroke userpassword + delay 5 + keystroke return + delay 5 + click radio button "General" of tab group 1 of window 1 + delay 5 + if exists of UI element "Details…" of tab group 1 of window 1 then + click button "Details…" of tab group 1 of window 1 + delay 5 + keystroke return + delay 5 + keystroke return + delay 5 + end if + if exists of UI element "Allow" of tab group 1 of window 1 then + click button "Allow" of tab group 1 of window 1 + delay 5 + keystroke return + delay 5 + end if + click button 5 of window 1 + end tell + end tell +end run \ No newline at end of file diff --git a/images/macos/software-report/SoftwareReport.Common.psm1 b/images/macos/software-report/SoftwareReport.Common.psm1 index d4cf17e326e0..c2dc9234d0b5 100644 --- a/images/macos/software-report/SoftwareReport.Common.psm1 +++ b/images/macos/software-report/SoftwareReport.Common.psm1 @@ -389,7 +389,7 @@ function Get-NewmanVersion { function Get-VirtualBoxVersion { $virtualBox = Run-Command "vboxmanage -v" - return "virtualbox $virtualBox" + return "VirtualBox $virtualBox" } function Get-VagrantVersion { diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1 index a97a29906ee0..fb974d7ef61b 100644 --- a/images/macos/software-report/SoftwareReport.Generator.ps1 +++ b/images/macos/software-report/SoftwareReport.Generator.ps1 @@ -141,12 +141,17 @@ if ($os.IsLessThanMonterey) { if ($os.IsCatalina) { $utilitiesList += @( - (Get-VirtualBoxVersion), (Get-VagrantVersion), (Get-ParallelVersion) ) } +if (-not $os.IsBigSur) { + $utilitiesList += @( + (Get-VirtualBoxVersion) + ) +} + $markdown += New-MDList -Style Unordered -Lines ($utilitiesList | Sort-Object) # Tools diff --git a/images/macos/templates/macOS-12.json b/images/macos/templates/macOS-12.json index 19cacb0e45b8..e4b980b086aa 100644 --- a/images/macos/templates/macOS-12.json +++ b/images/macos/templates/macOS-12.json @@ -152,10 +152,12 @@ "./provision/core/ruby.sh", "./provision/core/rubygem.sh", "./provision/core/git.sh", - "./provision/core/node.sh" + "./provision/core/node.sh", + "./provision/core/commonutils.sh" ], "environment_vars": [ - "API_PAT={{user `github_api_pat`}}" + "API_PAT={{user `github_api_pat`}}", + "USER_PASSWORD={{user `vm_password`}}" ] }, { @@ -177,7 +179,6 @@ "type": "shell", "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}", "scripts": [ - "./provision/core/commonutils.sh", "./provision/core/llvm.sh", "./provision/core/golang.sh", "./provision/core/swiftlint.sh", diff --git a/images/macos/tests/BasicTools.Tests.ps1 b/images/macos/tests/BasicTools.Tests.ps1 index 21f6de5e017d..8bfa45aea000 100644 --- a/images/macos/tests/BasicTools.Tests.ps1 +++ b/images/macos/tests/BasicTools.Tests.ps1 @@ -144,7 +144,7 @@ Describe "vagrant" -Skip:($os.IsHigherThanCatalina) { } } -Describe "virtualbox" -Skip:($os.IsHigherThanCatalina) { +Describe "virtualbox" -Skip:($os.IsBigSur) { It "virtualbox" { "vboxmanage -v" | Should -ReturnZeroExitCode } diff --git a/images/macos/tests/Common.Tests.ps1 b/images/macos/tests/Common.Tests.ps1 index 7938abfa95ba..88f148e057bd 100644 --- a/images/macos/tests/Common.Tests.ps1 +++ b/images/macos/tests/Common.Tests.ps1 @@ -120,4 +120,10 @@ Describe "GraalVM" { It "native-image" { '$GRAALVM_11_ROOT/native-image --version' | Should -ReturnZeroExitCode } +} + +Describe "VirtualBox" -Skip:($os.IsBigSur) { + It "Check kext kernel modules" { + kextstat | Out-String | Should -Match "org.virtualbox.kext" + } } \ No newline at end of file diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index b152660de645..1cb3633a172e 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -149,7 +149,8 @@ "imagemagick" ], "cask_packages": [ - "julia" + "julia", + "virtualbox" ] }, "gcc": { From 102af04076eb0617fc1277009ee49dc74c5d9c32 Mon Sep 17 00:00:00 2001 From: Dusko Dobranic <101048884+ddobranic@users.noreply.github.com> Date: Wed, 25 May 2022 16:04:34 +0200 Subject: [PATCH 1171/3485] [macOS] Fix cargo audit version in software report (#5606) --- images/macos/software-report/SoftwareReport.Common.psm1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/macos/software-report/SoftwareReport.Common.psm1 b/images/macos/software-report/SoftwareReport.Common.psm1 index c2dc9234d0b5..ebed0576e2c1 100644 --- a/images/macos/software-report/SoftwareReport.Common.psm1 +++ b/images/macos/software-report/SoftwareReport.Common.psm1 @@ -64,7 +64,7 @@ function Get-Cargooutdated { } function Get-Cargoaudit { - $cargoAuditVersion = Run-Command "cargo audit --version" | Take-Part -Part 1 + $cargoAuditVersion = Run-Command "cargo-audit --version" | Take-Part -Part 1 return "Cargo-audit $cargoAuditVersion" } From 4393b58dced4a0674f341dd573d9b18daa305fc1 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Wed, 25 May 2022 20:25:12 +0400 Subject: [PATCH 1172/3485] Get back container tools on Ubuntu 18&20 (#5611) --- .../SoftwareReport.Generator.ps1 | 10 +++------ .../SoftwareReport/SoftwareReport.Tools.psm1 | 12 +++++++++++ images/linux/scripts/installers/containers.sh | 21 ++++++++++++++++++- images/linux/scripts/tests/Tools.Tests.ps1 | 2 +- images/linux/ubuntu1804.json | 1 + images/linux/ubuntu2004.json | 1 + 6 files changed, 38 insertions(+), 9 deletions(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index dc0f9a8f1f11..4671f90bdcce 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -120,6 +120,9 @@ $toolsList = @( (Get-DockerComposeV2Version), (Get-DockerBuildxVersion), (Get-DockerAmazonECRCredHelperVersion), + (Get-BuildahVersion), + (Get-PodManVersion), + (Get-SkopeoVersion), (Get-GitVersion), (Get-GitLFSVersion), (Get-GitFTPVersion), @@ -155,13 +158,6 @@ if ((Test-IsUbuntu18) -or (Test-IsUbuntu20)) { (Get-HHVMVersion) ) } -if (Test-IsUbuntu22) { - $toolsList += @( - (Get-BuildahVersion), - (Get-PodManVersion), - (Get-SkopeoVersion) - ) -} if ((Test-IsUbuntu20) -or (Test-IsUbuntu22)) { $toolsList += (Get-FastlaneVersion) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 index 383c113a8626..ca119f67b0f9 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 @@ -42,16 +42,28 @@ function Get-CodeQLBundleVersion { function Get-PodManVersion { $podmanVersion = podman --version | Take-OutputPart -Part 2 + if ((Test-IsUbuntu18) -or (Test-IsUbuntu20)) { + $aptSourceRepo = Get-AptSourceRepository -PackageName "containers" + return "Podman $podmanVersion (apt source repository: $aptSourceRepo)" + } return "Podman $podmanVersion" } function Get-BuildahVersion { $buildahVersion = buildah --version | Take-OutputPart -Part 2 + if ((Test-IsUbuntu18) -or (Test-IsUbuntu20)) { + $aptSourceRepo = Get-AptSourceRepository -PackageName "containers" + return "Buildah $buildahVersion (apt source repository: $aptSourceRepo)" + } return "Buildah $buildahVersion" } function Get-SkopeoVersion { $skopeoVersion = skopeo --version | Take-OutputPart -Part 2 + if ((Test-IsUbuntu18) -or (Test-IsUbuntu20)) { + $aptSourceRepo = Get-AptSourceRepository -PackageName "containers" + return "Skopeo $skopeoVersion (apt source repository: $aptSourceRepo)" + } return "Skopeo $skopeoVersion" } diff --git a/images/linux/scripts/installers/containers.sh b/images/linux/scripts/installers/containers.sh index ebd42cabfdb3..00595b319a9b 100644 --- a/images/linux/scripts/installers/containers.sh +++ b/images/linux/scripts/installers/containers.sh @@ -4,11 +4,30 @@ ## Desc: Installs container tools: podman, buildah and skopeo onto the image ################################################################################ +source $HELPER_SCRIPTS/os.sh + install_packages=(podman buildah skopeo) +# Packages is available in the official Ubuntu upstream starting from Ubuntu 21 +if isUbuntu18 || isUbuntu20; then + REPO_URL="https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable" + source /etc/os-release + sh -c "echo 'deb ${REPO_URL}/x${NAME}_${VERSION_ID}/ /' > /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list" + wget -qnv https://download.opensuse.org/repositories/devel:kubic:libcontainers:stable/x${NAME}_${VERSION_ID}/Release.key -O Release.key + apt-key add Release.key +fi + # Install podman, buildah, scopeo container's tools -apt-get -qq -y install ${install_packages[@]} +apt-get update +apt-get -y install ${install_packages[@]} mkdir -p /etc/containers echo -e "[registries.search]\nregistries = ['docker.io', 'quay.io']" | tee /etc/containers/registries.conf +if isUbuntu18 || isUbuntu20; then + # Remove source repo + rm /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list + # Document source repo + echo "containers $REPO_URL" >> $HELPER_SCRIPTS/apt-sources.txt +fi + invoke_tests "Tools" "Containers" diff --git a/images/linux/scripts/tests/Tools.Tests.ps1 b/images/linux/scripts/tests/Tools.Tests.ps1 index 582da0ea6cb0..16a7e57cf67d 100644 --- a/images/linux/scripts/tests/Tools.Tests.ps1 +++ b/images/linux/scripts/tests/Tools.Tests.ps1 @@ -338,7 +338,7 @@ Describe "GraalVM" -Skip:(Test-IsUbuntu18) { } } -Describe "Containers" -Skip:(-not (Test-IsUbuntu22)) { +Describe "Containers" { $testCases = @("podman", "buildah", "skopeo") | ForEach-Object { @{ContainerCommand = $_} } It "<ContainerCommand>" -TestCases $testCases { diff --git a/images/linux/ubuntu1804.json b/images/linux/ubuntu1804.json index 8b8a0a166828..bdd5847ab8e5 100644 --- a/images/linux/ubuntu1804.json +++ b/images/linux/ubuntu1804.json @@ -199,6 +199,7 @@ "{{template_dir}}/scripts/installers/swift.sh", "{{template_dir}}/scripts/installers/cmake.sh", "{{template_dir}}/scripts/installers/codeql-bundle.sh", + "{{template_dir}}/scripts/installers/containers.sh", "{{template_dir}}/scripts/installers/dotnetcore-sdk.sh", "{{template_dir}}/scripts/installers/erlang.sh", "{{template_dir}}/scripts/installers/firefox.sh", diff --git a/images/linux/ubuntu2004.json b/images/linux/ubuntu2004.json index 1b1b1d7087ca..ee9fb00f7be6 100644 --- a/images/linux/ubuntu2004.json +++ b/images/linux/ubuntu2004.json @@ -200,6 +200,7 @@ "{{template_dir}}/scripts/installers/swift.sh", "{{template_dir}}/scripts/installers/cmake.sh", "{{template_dir}}/scripts/installers/codeql-bundle.sh", + "{{template_dir}}/scripts/installers/containers.sh", "{{template_dir}}/scripts/installers/dotnetcore-sdk.sh", "{{template_dir}}/scripts/installers/erlang.sh", "{{template_dir}}/scripts/installers/firefox.sh", From 9e72341e344f7754774f142f956443f936249460 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Wed, 25 May 2022 21:28:50 +0400 Subject: [PATCH 1173/3485] Add clang 13&14 instead of 10&11, make 14 default (#5610) --- images/linux/toolsets/toolset-2204.json | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/images/linux/toolsets/toolset-2204.json b/images/linux/toolsets/toolset-2204.json index 395f79a689a3..213080d04503 100644 --- a/images/linux/toolsets/toolset-2204.json +++ b/images/linux/toolsets/toolset-2204.json @@ -241,10 +241,11 @@ }, "clang": { "versions": [ - "11", - "12" + "12", + "13", + "14" ], - "default_version": "11" + "default_version": "14" }, "gcc": { "versions": [ From eabc37ce4159ffdf96eb0032190b27aa67e8336d Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Thu, 26 May 2022 00:11:06 +0400 Subject: [PATCH 1174/3485] Add java tools installation to Ubuntu22 (#5612) --- .../scripts/SoftwareReport/SoftwareReport.Generator.ps1 | 8 +++----- images/linux/scripts/tests/Java.Tests.ps1 | 4 ++-- images/linux/ubuntu2204.pkr.hcl | 1 + 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index 4671f90bdcce..030bfec07714 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -183,11 +183,9 @@ $markdown += New-MDList -Style Unordered -Lines (@( ) | Sort-Object ) -if ((Test-IsUbuntu18) -or (Test-IsUbuntu20)) { - $markdown += New-MDHeader "Java" -Level 3 - $markdown += Get-JavaVersions | New-MDTable - $markdown += New-MDNewLine -} +$markdown += New-MDHeader "Java" -Level 3 +$markdown += Get-JavaVersions | New-MDTable +$markdown += New-MDNewLine if ((Test-IsUbuntu20) -or (Test-IsUbuntu22)) { $markdown += New-MDHeader "GraalVM" -Level 3 diff --git a/images/linux/scripts/tests/Java.Tests.ps1 b/images/linux/scripts/tests/Java.Tests.ps1 index 2621a58436d6..9a16b566d905 100644 --- a/images/linux/scripts/tests/Java.Tests.ps1 +++ b/images/linux/scripts/tests/Java.Tests.ps1 @@ -1,6 +1,6 @@ Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" -DisableNameChecking -Describe "Java" -Skip:(Test-IsUbuntu22) { +Describe "Java" { $toolsetJava = (Get-ToolsetContent).java $defaultVersion = $toolsetJava.default $defaultVendor = $toolsetJava.default_vendor @@ -50,7 +50,7 @@ Describe "Java" -Skip:(Test-IsUbuntu22) { "`"$javaPath`" -version" | Should -MatchCommandOutput ([regex]::Escape("openjdk version `"${Version}.")) } - It "Java Adopt <Version>" -TestCases $adoptJdkVersions { + It "Java Adopt <Version>" -TestCases $adoptJdkVersions -Skip:(Test-IsUbuntu22) { $javaPath = Join-Path (Get-ChildItem ${env:AGENT_TOOLSDIRECTORY}\Java_Adopt_jdk\${Version}*) "x64\bin\java" "`"$javaPath`" -version" | Should -ReturnZeroExitCode diff --git a/images/linux/ubuntu2204.pkr.hcl b/images/linux/ubuntu2204.pkr.hcl index b82227ec5b4a..dffb9c3f3752 100644 --- a/images/linux/ubuntu2204.pkr.hcl +++ b/images/linux/ubuntu2204.pkr.hcl @@ -287,6 +287,7 @@ build { "${path.root}/scripts/installers/google-cloud-sdk.sh", "${path.root}/scripts/installers/haskell.sh", "${path.root}/scripts/installers/heroku.sh", + "${path.root}/scripts/installers/java-tools.sh", "${path.root}/scripts/installers/kubernetes-tools.sh", "${path.root}/scripts/installers/oc.sh", "${path.root}/scripts/installers/miniconda.sh", From 65955e2fb17dceb1ce4fbc40a17c321839371b5a Mon Sep 17 00:00:00 2001 From: Igor Boskovic <igorboskovic3@github.com> Date: Thu, 26 May 2022 11:53:27 +0200 Subject: [PATCH 1175/3485] image build issue (#5613) --- images/win/scripts/Tests/Tools.Tests.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/win/scripts/Tests/Tools.Tests.ps1 b/images/win/scripts/Tests/Tools.Tests.ps1 index 515df57a2363..08f27f715133 100644 --- a/images/win/scripts/Tests/Tools.Tests.ps1 +++ b/images/win/scripts/Tests/Tools.Tests.ps1 @@ -40,7 +40,7 @@ Describe "R" { Describe "DACFx" { It "DACFx" { - (Get-ItemProperty HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\*).DisplayName -Contains "Microsoft SQL Server Data-Tier Application Framework (x64)" | Should -BeTrue + (Get-ItemProperty HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\*).DisplayName -Contains "Microsoft SQL Server Data-Tier Application Framework" | Should -BeTrue $sqlPackagePath = 'C:\Program Files\Microsoft SQL Server\160\DAC\bin\SqlPackage.exe' "${sqlPackagePath}" | Should -Exist } From 189927b46f3660b1f652d41af9c50c41ecb48f24 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 26 May 2022 10:48:15 +0000 Subject: [PATCH 1176/3485] Updating readme file for win22 version 20220522.1 (#5588) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2022-Readme.md | 62 ++++++++++++++++---------------- 1 file changed, 32 insertions(+), 30 deletions(-) diff --git a/images/win/Windows2022-Readme.md b/images/win/Windows2022-Readme.md index 14620790d7e6..c59086448480 100644 --- a/images/win/Windows2022-Readme.md +++ b/images/win/Windows2022-Readme.md @@ -4,14 +4,14 @@ *** # Microsoft Windows Server 2022 Datacenter - OS Version: 10.0.20348 Build 707 -- Image Version: 20220515.1 +- Image Version: 20220522.1 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] ## Installed Software ### Language and Runtime -- Bash 4.4.23(2)-release +- Bash 4.4.23(1)-release - Go 1.17.10 - Julia 1.7.2 - Kotlin 1.6.21 @@ -19,20 +19,20 @@ - Node 16.14.2 - Perl 5.32.1 - PHP 8.1.6 -- Python 3.9.12 +- Python 3.9.13 - Ruby 3.0.4p208 ### Package Management - Chocolatey 1.1.0 - Composer 2.3.5 - Helm 3.8.2 -- Miniconda 4.11.0 (pre-installed on the image but not added to PATH) +- Miniconda 4.12.0 (pre-installed on the image but not added to PATH) - NPM 8.5.0 - NuGet 6.2.0.146 -- pip 22.1 (python 3.9) +- pip 22.1.1 (python 3.9) - Pipx 1.0.0 - RubyGems 3.2.33 -- Vcpkg (build from master \<5e7cbdcea>) +- Vcpkg (build from master \<314018fef>) - Yarn 1.22.18 #### Environment variables @@ -55,17 +55,17 @@ - Bicep 0.6.18 - Cabal 3.6.2.0 - CMake 3.23.1 -- CodeQL Action Bundle 2.9.1 +- CodeQL Action Bundle 2.9.2 - Docker 20.10.7 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.5.0 +- Docker Compose v2 2.5.1 - Docker-wincred 0.6.4 - ghc 9.2.2 -- Git 2.35.1.windows.2 -- Git LFS 3.0.2 +- Git 2.36.0.windows.1 +- Git LFS 3.1.4 - InnoSetup 6.2.1 - jq 1.6 -- Kind 0.13.0 +- Kind 0.14.0 - Kubectl 1.24.0 - Mercurial 5.0 - Mingw-w64 8.1.0 @@ -73,7 +73,7 @@ - NSIS v3.08 - OpenSSL 1.1.1 - Packer 1.8.0 -- Pulumi v3.32.1 +- Pulumi v3.33.1 - R 4.2.0 - Service Fabric SDK 9.0.1017.9590 - Stack 2.7.5 @@ -86,19 +86,19 @@ - zstd 1.5.2 ### CLI Tools -- Alibaba Cloud CLI 3.0.119 -- AWS CLI 2.7.0 +- Alibaba Cloud CLI 3.0.120 +- AWS CLI 2.7.2 - AWS SAM CLI 1.50.0 -- AWS Session Manager CLI 1.2.312.0 +- AWS Session Manager CLI 1.2.323.0 - Azure CLI 2.36.0 - Azure DevOps CLI extension 0.25.0 - GitHub CLI 2.10.1 - Hub CLI 2.14.2 ### Rust Tools -- Cargo 1.60.0 -- Rust 1.60.0 -- Rustdoc 1.60.0 +- Cargo 1.61.0 +- Rust 1.61.0 +- Rustdoc 1.61.0 - Rustup 1.24.3 #### Packages @@ -106,15 +106,15 @@ - cargo-audit 0.16.0 - cargo-outdated 0.11.1 - cbindgen 0.23.0 -- Clippy 0.1.60 +- Clippy 0.1.61 - Rustfmt 1.4.38 ### Browsers and webdrivers - Google Chrome 101.0.4951.67 - Chrome Driver 101.0.4951.41 -- Microsoft Edge 101.0.1210.47 -- Microsoft Edge Driver 101.0.1210.47 -- Mozilla Firefox 100.0.1 +- Microsoft Edge 101.0.1210.53 +- Microsoft Edge Driver 101.0.1210.53 +- Mozilla Firefox 100.0.2 - Gecko Driver 0.31.0 - IE Driver 3.150.1.1 - Selenium server 4.1.0 @@ -163,7 +163,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Version | Architecture | | ------- | ------------ | | 12.22.12 | x64 | -| 14.19.2 | x64 | +| 14.19.3 | x64 | | 16.15.0 | x64 | #### Python @@ -171,7 +171,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | ------- | ------------ | | 3.7.9 | x64, x86 | | 3.8.10 | x64, x86 | -| 3.9.12 (Default) | x64, x86 | +| 3.9.13 (Default) | x64, x86 | | 3.10.4 | x64, x86 | #### Ruby @@ -221,9 +221,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Nginx | 1.21.6 | C:\tools\nginx-1.21.6\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2022 -| Name | Version | Path | -| ----------------------------- | -------------- | -------------------------------------------------------- | -| Visual Studio Enterprise 2022 | 17.2.32505.173 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | +| Name | Version | Path | +| ----------------------------- | ------------- | -------------------------------------------------------- | +| Visual Studio Enterprise 2022 | 17.2.32516.85 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | #### Workloads, components and extensions: | Package | Version | @@ -374,7 +374,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Component.VC.Modules.x86.x64 | 17.2.32408.312 | | Microsoft.VisualStudio.Component.VC.Redist.14.Latest | 17.2.32408.312 | | Microsoft.VisualStudio.Component.VC.Redist.MSM | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.VC.Runtimes.ARM.Spectre | 17.2.32408.312 | | Microsoft.VisualStudio.Component.VC.Runtimes.ARM64.Spectre | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.VC.Runtimes.ARM64EC.Spectre | 17.2.32408.312 | | Microsoft.VisualStudio.Component.VC.Runtimes.x86.x64.Spectre | 17.2.32408.312 | | Microsoft.VisualStudio.Component.VC.TestAdapterForBoostTest | 17.2.32408.312 | | Microsoft.VisualStudio.Component.VC.TestAdapterForGoogleTest | 17.2.32408.312 | @@ -483,10 +485,10 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 4.8 ### .NET tools -- nbgv 3.5.104+d0b7c362ff +- nbgv 3.5.107+6463ef6068 ### PowerShell Tools -- PowerShell 7.2.3 +- PowerShell 7.2.4 #### Azure Powershell Modules | Module | Version | Path | @@ -503,7 +505,7 @@ All other versions are saved but not installed. #### Powershell Modules | Module | Version | | ------------------ | ---------------- | -| AWSPowerShell | 4.1.85 | +| AWSPowerShell | 4.1.90 | | DockerMsftProvider | 1.0.0.8 | | MarkdownPS | 1.9 | | Microsoft.Graph | 1.9.6 | From 5db9b2ac4c071584948977e61d10ea5fac3c10dc Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 26 May 2022 11:18:36 +0000 Subject: [PATCH 1177/3485] Updating readme file for win19 version 20220522.1 (#5599) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2019-Readme.md | 59 ++++++++++++++++---------------- 1 file changed, 30 insertions(+), 29 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index 04e0ba5ea867..531bab355e11 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -1,17 +1,18 @@ | Announcements | |-| +| [[all OSs] Android NDK 22 will be replaced in favor of 24, version 23 will be set as the default one](https://github.com/actions/virtual-environments/issues/5595) | | [[Azure DevOps] Windows-2016 environment removal postponed until June 30, 2022](https://github.com/actions/virtual-environments/issues/5403) | *** # Microsoft Windows Server 2019 Datacenter - OS Version: 10.0.17763 Build 2928 -- Image Version: 20220515.1 +- Image Version: 20220522.1 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] ## Installed Software ### Language and Runtime -- Bash 4.4.23(2)-release +- Bash 4.4.23(1)-release - Go 1.17.10 - Julia 1.7.2 - Kotlin 1.6.21 @@ -26,13 +27,13 @@ - Chocolatey 1.1.0 - Composer 2.3.5 - Helm 3.8.2 -- Miniconda 4.11.0 (pre-installed on the image but not added to PATH) +- Miniconda 4.12.0 (pre-installed on the image but not added to PATH) - NPM 8.5.0 - NuGet 6.2.0.146 -- pip 22.1 (python 3.7) +- pip 22.1.1 (python 3.7) - Pipx 1.0.0 - RubyGems 2.7.6.3 -- Vcpkg (build from master \<0cf5b4305>) +- Vcpkg (build from master \<314018fef>) - Yarn 1.22.18 #### Environment variables @@ -56,18 +57,18 @@ - Bicep 0.6.18 - Cabal 3.6.2.0 - CMake 3.23.1 -- CodeQL Action Bundle 2.9.1 +- CodeQL Action Bundle 2.9.2 - Docker 20.10.7 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.5.0 +- Docker Compose v2 2.5.1 - Docker-wincred 0.6.4 - ghc 9.2.2 -- Git 2.35.1.windows.2 -- Git LFS 3.0.2 -- Google Cloud SDK 385.0.0 +- Git 2.36.0.windows.1 +- Git LFS 3.1.4 +- Google Cloud SDK 386.0.0 - InnoSetup 6.2.1 - jq 1.6 -- Kind 0.13.0 +- Kind 0.14.0 - Kubectl 1.24.0 - Mercurial 5.0 - Mingw-w64 8.1.0 @@ -76,7 +77,7 @@ - OpenSSL 1.1.1 - Packer 1.8.0 - Parcel 2.5.0 -- Pulumi v3.32.1 +- Pulumi v3.33.1 - R 4.2.0 - Service Fabric SDK 9.0.1017.9590 - Stack 2.7.5 @@ -89,10 +90,10 @@ - zstd 1.5.2 ### CLI Tools -- Alibaba Cloud CLI 3.0.119 -- AWS CLI 2.7.0 +- Alibaba Cloud CLI 3.0.120 +- AWS CLI 2.7.2 - AWS SAM CLI 1.50.0 -- AWS Session Manager CLI 1.2.312.0 +- AWS Session Manager CLI 1.2.323.0 - Azure CLI 2.36.0 - Azure DevOps CLI extension 0.25.0 - Cloud Foundry CLI 6.53.0 @@ -100,9 +101,9 @@ - Hub CLI 2.14.2 ### Rust Tools -- Cargo 1.60.0 -- Rust 1.60.0 -- Rustdoc 1.60.0 +- Cargo 1.61.0 +- Rust 1.61.0 +- Rustdoc 1.61.0 - Rustup 1.24.3 #### Packages @@ -110,15 +111,15 @@ - cargo-audit 0.16.0 - cargo-outdated 0.11.1 - cbindgen 0.23.0 -- Clippy 0.1.60 +- Clippy 0.1.61 - Rustfmt 1.4.38 ### Browsers and webdrivers - Google Chrome 101.0.4951.67 - Chrome Driver 101.0.4951.41 -- Microsoft Edge 101.0.1210.47 -- Microsoft Edge Driver 101.0.1210.47 -- Mozilla Firefox 100.0 +- Microsoft Edge 101.0.1210.53 +- Microsoft Edge Driver 101.0.1210.53 +- Mozilla Firefox 100.0.2 - Gecko Driver 0.31.0 - IE Driver 3.150.1.1 - Selenium server 4.1.0 @@ -171,7 +172,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Version | Architecture | | ------- | ------------ | | 12.22.12 | x64 | -| 14.19.2 | x64 | +| 14.19.3 | x64 | | 16.15.0 | x64 | #### Python @@ -181,7 +182,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | 3.6.8 | x64, x86 | | 3.7.9 (Default) | x64, x86 | | 3.8.10 | x64, x86 | -| 3.9.12 | x64, x86 | +| 3.9.13 | x64, x86 | | 3.10.4 | x64, x86 | #### Ruby @@ -237,12 +238,12 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Visual Studio Enterprise 2019 | Name | Version | Path | | ----------------------------- | --------------- | -------------------------------------------------------------- | -| Visual Studio Enterprise 2019 | 16.11.32428.217 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | +| Visual Studio Enterprise 2019 | 16.11.32510.428 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | #### Workloads, components and extensions: | Package | Version | | ------------------------------------------------------------------------- | --------------- | -| Component.Android.NDK.R16B | 16.11.32425.466 | +| Component.Android.NDK.R16B | 16.11.32510.428 | | Component.Android.SDK25.Private | 16.0.28625.61 | | Component.Android.SDK30 | 16.10.31205.252 | | Component.Ant | 1.9.3.8 | @@ -526,10 +527,10 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 4.8 ### .NET tools -- nbgv 3.5.104+d0b7c362ff +- nbgv 3.5.107+6463ef6068 ### PowerShell Tools -- PowerShell 7.2.3 +- PowerShell 7.2.4 #### Azure Powershell Modules | Module | Version | Path | @@ -546,7 +547,7 @@ All other versions are saved but not installed. #### Powershell Modules | Module | Version | | ------------------ | ---------------- | -| AWSPowerShell | 4.1.85 | +| AWSPowerShell | 4.1.90 | | DockerMsftProvider | 1.0.0.8 | | MarkdownPS | 1.9 | | Microsoft.Graph | 1.9.6 | From 0f372a0a73323d92cb0f74223176619766a30ad7 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 26 May 2022 13:01:55 +0000 Subject: [PATCH 1178/3485] macOS 11 (20220523 update) (#5605) * Updating readme file for macOS-11 version 20220523.2 * Update macos-11-Readme.md Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Dusko Dobranic <101048884+ddobranic@users.noreply.github.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-11-Readme.md | 53 +++++++++++++++++---------------- 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/images/macos/macos-11-Readme.md b/images/macos/macos-11-Readme.md index afb78850cfb5..b508af3bbb6e 100644 --- a/images/macos/macos-11-Readme.md +++ b/images/macos/macos-11-Readme.md @@ -1,12 +1,13 @@ | Announcements | |-| -| [[macOS] Xcode versions 13.2 & 13.3 will be removed, 13.3.1 will be set as the default one on May, 16](https://github.com/actions/virtual-environments/issues/5463) | +| [[macOS] Default Visual studio for mac will be changed to version 2022 for macOS 11&12 on May, 30](https://github.com/actions/virtual-environments/issues/5601) | +| [[all OSs] Android NDK 22 will be replaced in favor of 24, version 23 will be set as the default one](https://github.com/actions/virtual-environments/issues/5595) | | [macOS 12 (Monterey) is available as a public beta in GitHub Actions and Azure DevOps](https://github.com/actions/virtual-environments/issues/5446) | *** # macOS 11.6 info -- System Version: macOS 11.6.5 (20G527) +- System Version: macOS 11.6.6 (20G624) - Kernel Version: Darwin 20.6.0 -- Image Version: 20220517.4 +- Image Version: 20220523.2 ## Installed Software ### Language and Runtime @@ -16,10 +17,10 @@ - Clang/LLVM 13.0.1 is available on `'$(brew --prefix llvm)/bin/clang'` - gcc-9 (Homebrew GCC 9.4.0) 9.4.0 - available by `gcc-9` alias - gcc-10 (Homebrew GCC 10.3.0) 10.3.0 - available by `gcc-10` alias -- gcc-11 (Homebrew GCC 11.3.0) 11.3.0 - available by `gcc-11` alias +- gcc-11 (Homebrew GCC 11.3.0_1) 11.3.0 - available by `gcc-11` alias - GNU Fortran (Homebrew GCC 9.4.0) 9.4.0 - available by `gfortran-9` alias - GNU Fortran (Homebrew GCC 10.3.0) 10.3.0 - available by `gfortran-10` alias -- GNU Fortran (Homebrew GCC 11.3.0) 11.3.0 - available by `gfortran-11` alias +- GNU Fortran (Homebrew GCC 11.3.0_1) 11.3.0 - available by `gfortran-11` alias - Go 1.17.10 - julia 1.7.2 - Kotlin 1.6.21-release-334 @@ -30,12 +31,12 @@ - Perl 5.34.0 - PHP 8.1.6 - Python 2.7.18 -- Python 3.9.12 +- Python 3.9.13 - R 4.2.0 - Ruby 2.7.6p219 ### Package Management -- Bundler version 2.3.13 +- Bundler version 2.3.14 - Carthage 0.38.0 - CocoaPods 1.11.3 - Composer 2.3.5 @@ -44,10 +45,10 @@ - NPM 8.5.5 - NuGet 5.9.0.7134 - Pip 20.3.4 (python 2.7) -- Pip 22.0.4 (python 3.9) +- Pip 22.1 (python 3.9) - Pipx 1.0.0 - RubyGems 3.2.33 -- Vcpkg 2022 (build from master \<22b403386>) +- Vcpkg 2022 (build from master \<840f701d8>) - Yarn 1.22.19 #### Environment variables @@ -76,7 +77,7 @@ - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.3 - gpg (GnuPG) 2.3.6 -- helm v3.8.2+g6e3701e +- helm v3.9.0+g7ceeda6 - Hub CLI: 2.14.2 - ImageMagick 7.1.0-33 - jq 1.6 @@ -96,15 +97,15 @@ ### Tools - Aliyun CLI 3.0.119 - App Center CLI 2.10.10 -- AWS CLI 2.7.0 +- AWS CLI 2.7.2 - AWS SAM CLI 1.50.0 -- AWS Session Manager CLI 1.2.312.0 +- AWS Session Manager CLI 1.2.323.0 - Azure CLI (azure-devops) 0.25.0 - Azure CLI 2.36.0 - Bicep CLI 0.6.18 - Cabal 3.6.2.0 - Cmake 3.23.1 -- Fastlane 2.205.2 +- Fastlane 2.206.1 - GHC 9.2.2 - GHCup 0.1.17.8 - Jazzy 0.14.2 @@ -118,13 +119,13 @@ - yamllint 1.26.3 ### Browsers -- Safari 15.4 (16613.1.17.1.13) -- SafariDriver 15.4 (16613.1.17.1.13) +- Safari 15.5 (16613.2.7.1.9) +- SafariDriver 15.5 (16613.2.7.1.9) - Google Chrome 101.0.4951.64 - ChromeDriver 101.0.4951.41 -- Microsoft Edge 101.0.1210.47 -- MSEdgeDriver 101.0.1210.47 -- Mozilla Firefox 100.0.1 +- Microsoft Edge 101.0.1210.53 +- MSEdgeDriver 101.0.1210.53 +- Mozilla Firefox 100.0.2 - geckodriver 0.31.0 - Selenium server 4.1.4 @@ -159,7 +160,7 @@ #### Python - 3.7.13 - 3.8.12 -- 3.9.12 +- 3.9.13 - 3.10.4 #### PyPy @@ -170,7 +171,7 @@ #### Node.js - 12.22.12 -- 14.19.2 +- 14.19.3 - 16.15.0 #### Go @@ -181,17 +182,17 @@ | 1.18.2 | x64 | GOROOT_1_18_X64 | ### Rust Tools -- Cargo 1.60.0 -- Rust 1.60.0 -- Rustdoc 1.60.0 +- Cargo 1.61.0 +- Rust 1.61.0 +- Rustdoc 1.61.0 - Rustup 1.24.3 #### Packages - Bindgen 0.59.2 -- Cargo-audit 0.16.0 +- Cargo-audit 0.17.0 - Cargo-outdated 0.11.1 - Cbindgen 0.23.0 -- Clippy 0.1.60 +- Clippy 0.1.61 - Rustfmt 1.4.38-stable ### PowerShell Tools @@ -212,7 +213,7 @@ | nginx | 1.21.6_1 | /usr/local/etc/nginx/nginx.conf | none | 80 | ### Xamarin -#### Visual Studio for Mac +#### Visual Studio 2019 for Mac - 8.10.23.7 #### Xamarin bundles From bf4c35eee5f96f91b4b067ceb71f41c9238876db Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 26 May 2022 13:09:41 +0000 Subject: [PATCH 1179/3485] Updating readme file for macOS-12 version 20220523.1 (#5596) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-12-Readme.md | 63 +++++++++++++++++---------------- 1 file changed, 33 insertions(+), 30 deletions(-) diff --git a/images/macos/macos-12-Readme.md b/images/macos/macos-12-Readme.md index 0025c6e51b0f..2ec0588b48d5 100644 --- a/images/macos/macos-12-Readme.md +++ b/images/macos/macos-12-Readme.md @@ -1,12 +1,12 @@ | Announcements | |-| -| [[macOS] Xcode versions 13.2 & 13.3 will be removed, 13.3.1 will be set as the default one on May, 16](https://github.com/actions/virtual-environments/issues/5463) | +| [[all OSs] Android NDK 22 will be replaced in favor of 24, version 23 will be set as the default one](https://github.com/actions/virtual-environments/issues/5595) | | [macOS 12 (Monterey) is available as a public beta in GitHub Actions and Azure DevOps](https://github.com/actions/virtual-environments/issues/5446) | *** -# macOS 12.3 info -- System Version: macOS 12.3.1 (21E258) -- Kernel Version: Darwin 21.4.0 -- Image Version: 20220516.1 +# macOS 12.4 info +- System Version: macOS 12.4 (21F79) +- Kernel Version: Darwin 21.5.0 +- Image Version: 20220523.1 ## Installed Software ### Language and Runtime @@ -14,24 +14,24 @@ - Bash 3.2.57(1)-release - Clang/LLVM 13.0.1 is available on `'$(brew --prefix llvm)/bin/clang'` - Clang/LLVM 13.1.6 is default -- gcc-11 (Homebrew GCC 11.3.0) 11.3.0 - available by `gcc-11` alias -- GNU Fortran (Homebrew GCC 11.3.0) 11.3.0 - available by `gfortran-11` alias +- gcc-11 (Homebrew GCC 11.3.0_1) 11.3.0 - available by `gcc-11` alias +- GNU Fortran (Homebrew GCC 11.3.0_1) 11.3.0 - available by `gfortran-11` alias - Go 1.17.10 - julia 1.7.2 - Kotlin 1.6.21-release-334 - MSBuild 16.10.1.17201 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) - Node.js v16.15.0 - NVM 0.39.1 -- NVM - Cached node versions: v12.22.12 v14.19.2 v16.15.0 +- NVM - Cached node versions: v12.22.12 v14.19.3 v16.15.0 - Perl 5.34.0 - PHP 8.1.6 - Python 2.7.18 -- Python 3.9.12 +- Python 3.9.13 - R 4.2.0 - Ruby 3.0.4p208 ### Package Management -- Bundler version 2.3.13 +- Bundler version 2.3.14 - Carthage 0.38.0 - CocoaPods 1.11.3 - Composer 2.3.5 @@ -39,10 +39,10 @@ - NPM 8.5.5 - NuGet 5.9.0.7134 - Pip 20.3.4 (python 2.7) -- Pip 22.0.4 (python 3.9) +- Pip 22.1 (python 3.9) - Pipx 1.0.0 - RubyGems 3.2.33 -- Vcpkg 2022 (build from master \<306c9a9e2>) +- Vcpkg 2022 (build from master \<314018fef>) - Yarn 1.22.19 ### Project Management @@ -81,21 +81,21 @@ - zstd 1.5.2 ### Tools -- App Center CLI command -- AWS CLI 2.7.0 +- App Center CLI 2.10.10 +- AWS CLI 2.7.2 - AWS SAM CLI 1.50.0 -- AWS Session Manager CLI 1.2.312.0 +- AWS Session Manager CLI 1.2.323.0 - Azure CLI (azure-devops) 0.25.0 - Azure CLI 2.36.0 - Bicep CLI 0.6.18 - Cabal 3.6.2.0 - Cmake 3.23.1 -- Fastlane 2.205.2 +- Fastlane 2.206.1 - GHC 9.2.2 - GHCup 0.1.17.8 - Jazzy 0.14.2 - Stack 2.7.5 -- SwiftFormat 0.49.8 +- SwiftFormat 0.49.9 - Swig 4.0.2 - Xcode Command Line Tools 13.4.0.0.1.1651278267 @@ -104,13 +104,13 @@ - yamllint 1.26.3 ### Browsers -- Safari 15.4 (17613.1.17.1.13) -- SafariDriver 15.4 (17613.1.17.1.13) +- Safari 15.5 (17613.2.7.1.8) +- SafariDriver 15.5 (17613.2.7.1.8) - Google Chrome 101.0.4951.64 - ChromeDriver 101.0.4951.41 -- Microsoft Edge 101.0.1210.47 -- MSEdgeDriver 101.0.1210.47 -- Mozilla Firefox 100.0 +- Microsoft Edge 101.0.1210.53 +- MSEdgeDriver 101.0.1210.53 +- Mozilla Firefox 100.0.2 - geckodriver 0.31.0 - Selenium server 4.1.4 @@ -142,7 +142,7 @@ #### Python - 3.7.13 - 3.8.12 -- 3.9.12 +- 3.9.13 - 3.10.4 #### PyPy @@ -153,7 +153,7 @@ #### Node.js - 12.22.12 -- 14.19.2 +- 14.19.3 - 16.15.0 #### Go @@ -164,9 +164,9 @@ | 1.18.2 | x64 | GOROOT_1_18_X64 | ### Rust Tools -- Cargo 1.60.0 -- Rust 1.60.0 -- Rustdoc 1.60.0 +- Cargo 1.61.0 +- Rust 1.61.0 +- Rustdoc 1.61.0 - Rustup 1.24.3 #### Packages @@ -174,11 +174,11 @@ - Cargo-audit 0.16.0 - Cargo-outdated 0.11.1 - Cbindgen 0.23.0 -- Clippy 0.1.60 +- Clippy 0.1.61 - Rustfmt 1.4.38-stable ### PowerShell Tools -- PowerShell 7.2.3 +- PowerShell 7.2.4 #### PowerShell Modules | Module | Version | @@ -195,9 +195,12 @@ | nginx | 1.21.6_1 | /usr/local/etc/nginx/nginx.conf | none | 80 | ### Xamarin -#### Visual Studio for Mac +#### Visual Studio 2019 for Mac - 8.10.23.7 +#### Visual Studio 2022 for Mac +- 17.0.0.8989 + #### Xamarin bundles | symlink | Xamarin.Mono | Xamarin.iOS | Xamarin.Mac | Xamarin.Android | | ----------------- | ------------ | ----------- | ----------- | --------------- | From 1d519b89d7d61c90213ccda6a331fcdf4ef0e379 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Thu, 26 May 2022 17:05:57 +0200 Subject: [PATCH 1180/3485] [macOS] Set Visual Studio 2022 for Mac by default (#5614) * Set Visual Studio 2022 for Mac by default * add isDefault --- images/macos/provision/core/vsmac.sh | 23 +++++++-------- .../SoftwareReport.Generator.ps1 | 9 ++---- .../SoftwareReport.Xamarin.psm1 | 28 +++++++++++++------ images/macos/tests/Common.Tests.ps1 | 19 ++++++++++--- images/macos/toolsets/toolset-10.15.json | 5 +++- images/macos/toolsets/toolset-11.json | 5 +++- images/macos/toolsets/toolset-12.json | 6 ++-- 7 files changed, 62 insertions(+), 33 deletions(-) diff --git a/images/macos/provision/core/vsmac.sh b/images/macos/provision/core/vsmac.sh index 2ab38f6e66fa..dfcb37ba9abf 100644 --- a/images/macos/provision/core/vsmac.sh +++ b/images/macos/provision/core/vsmac.sh @@ -4,14 +4,18 @@ source ~/utils/xamarin-utils.sh install_vsmac() { local VSMAC_VERSION=$1 - if [ $VSMAC_VERSION == "latest" ]; then + local VSMAC_DEFAULT=$2 + if [ $VSMAC_VERSION == "2019" ]; then VSMAC_DOWNLOAD_URL=$(curl -sL "https://aka.ms/manifest/stable" | jq -r '.items[] | select(.genericName=="VisualStudioMac").url') + elif [ $VSMAC_VERSION == "2022" ]; then + VSMAC_DOWNLOAD_URL=$(curl -sL "https://aka.ms/manifest/stable-2022" | jq -r '.items[] | select(.genericName=="VisualStudioMac").url') elif [ $VSMAC_VERSION == "preview" ]; then VSMAC_DOWNLOAD_URL=$(curl -sL "https://aka.ms/manifest/preview" | jq -r '.items[] | select(.genericName=="VisualStudioMac").url') else VSMAC_DOWNLOAD_URL=$(buildVSMacDownloadUrl $VSMAC_VERSION) fi + echo "Installing Visual Studio ${VSMAC_VERSION} for Mac" TMPMOUNT=`/usr/bin/mktemp -d /tmp/visualstudio.XXXX` TMPMOUNT_DOWNLOADS="$TMPMOUNT/downloads" mkdir $TMPMOUNT_DOWNLOADS @@ -26,8 +30,8 @@ install_vsmac() { pushd $TMPMOUNT tar cf - "./Visual Studio.app" | tar xf - -C /Applications/ - if [ $VSMAC_VERSION == "preview" ]; then - mv "/Applications/Visual Studio.app" "/Applications/Visual Studio Preview.app" + if [ $VSMAC_VERSION != $VSMAC_DEFAULT ]; then + mv "/Applications/Visual Studio.app" "/Applications/Visual Studio ${VSMAC_VERSION}.app" fi popd @@ -35,14 +39,11 @@ install_vsmac() { sudo rm -rf "$TMPMOUNT" } -VSMAC_VERSION_PREVIEW=$(get_toolset_value '.xamarin.vsmac_preview') -if [ $VSMAC_VERSION_PREVIEW != "null" ];then - echo "Installing Visual Studio 2022 for Mac Preview" - install_vsmac $VSMAC_VERSION_PREVIEW -fi +VSMAC_VERSIONS=($(get_toolset_value '.xamarin.vsmac.versions[]')) +DEFAULT_VSMAC_VERSION=$(get_toolset_value '.xamarin.vsmac.default') -echo "Installing Visual Studio 2019 for Mac Stable" -VSMAC_VERSION_STABLE=$(get_toolset_value '.xamarin.vsmac') -install_vsmac $VSMAC_VERSION_STABLE +for VERSION in "${VSMAC_VERSIONS[@]}"; do + install_vsmac $VERSION $DEFAULT_VSMAC_VERSION +done invoke_tests "Common" "VSMac" diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1 index fb974d7ef61b..17d8566097a3 100644 --- a/images/macos/software-report/SoftwareReport.Generator.ps1 +++ b/images/macos/software-report/SoftwareReport.Generator.ps1 @@ -247,12 +247,9 @@ $markdown += Build-WebServersSection # Xamarin section $markdown += New-MDHeader "Xamarin" -Level 3 -$markdown += New-MDHeader "Visual Studio 2019 for Mac" -Level 4 -$markdown += New-MDList -Lines @(Get-VSMac2019Version) -Style Unordered -if ($os.IsMonterey) { - $markdown += New-MDHeader "Visual Studio 2022 for Mac" -Level 4 - $markdown += New-MDList -Lines @(Get-VSMac2022Version) -Style Unordered -} +$markdown += New-MDHeader "Visual Studio for Mac" -Level 4 +$markdown += Build-VSMacTable | New-MDTable +$markdown += New-MDNewLine $markdown += New-MDHeader "Xamarin bundles" -Level 4 $markdown += Build-XamarinTable | New-MDTable diff --git a/images/macos/software-report/SoftwareReport.Xamarin.psm1 b/images/macos/software-report/SoftwareReport.Xamarin.psm1 index 42010359352c..09cac32095b9 100644 --- a/images/macos/software-report/SoftwareReport.Xamarin.psm1 +++ b/images/macos/software-report/SoftwareReport.Xamarin.psm1 @@ -1,13 +1,26 @@ Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" -function Get-VSMac2019Version { - $plistPath = "/Applications/Visual Studio.app/Contents/Info.plist" - return Run-Command "/usr/libexec/PlistBuddy -c 'Print CFBundleVersion' '$plistPath'" -} +function Build-VSMacTable { + $vsMacVersions = Get-ToolsetValue "xamarin.vsmac.versions" + $defaultVSMacVersion = Get-ToolsetValue "xamarin.vsmac.default" + + $vsMacVersions | ForEach-Object { + $isDefault = $_ -eq $defaultVSMacVersion + $vsPath = "/Applications/Visual Studio $_.app" + if ($isDefault) { + $vsPath = "/Applications/Visual Studio.app" + } + + $plistPath = "$vsPath/Contents/Info.plist" + $build = Run-Command "/usr/libexec/PlistBuddy -c 'Print CFBundleVersion' '$plistPath'" + $defaultPostfix = $isDefault ? " (default)" : "" -function Get-VSMac2022Version { - $plistPath = "/Applications/Visual Studio Preview.app/Contents/Info.plist" - return Run-Command "/usr/libexec/PlistBuddy -c 'Print CFBundleVersion' '$plistPath'" + [PSCustomObject] @{ + "Version" = $_ + $defaultPostfix + "Build" = $build + "Path" = $vsPath + } + } } function Get-NUnitVersion { @@ -33,4 +46,3 @@ function Build-XamarinTable { } } } - diff --git a/images/macos/tests/Common.Tests.ps1 b/images/macos/tests/Common.Tests.ps1 index 88f148e057bd..4a348e73c62a 100644 --- a/images/macos/tests/Common.Tests.ps1 +++ b/images/macos/tests/Common.Tests.ps1 @@ -79,15 +79,26 @@ Describe "CocoaPods" { } Describe "VSMac" { - It "VS4Mac is installed" { - $vsPath = "/Applications/Visual Studio.app" + $vsMacVersions = Get-ToolsetValue "xamarin.vsmac.versions" + $defaultVSMacVersion = Get-ToolsetValue "xamarin.vsmac.default" + + $testCases = $vsMacVersions | ForEach-Object { + $vsPath = "/Applications/Visual Studio $_.app" + if ($_ -eq $defaultVSMacVersion) { + $vsPath = "/Applications/Visual Studio.app" + } + + @{ vsversion = $_ ; vspath = $vsPath } + } + + It "Visual Studio <vsversion> for Mac is installed" -TestCases $testCases { $vstoolPath = Join-Path $vsPath "Contents/MacOS/vstool" $vsPath | Should -Exist $vstoolPath | Should -Exist } - It "VS4Mac Preview is installed" -Skip:(-not $os.IsMonterey) { - $vsPath = "/Applications/Visual Studio Preview.app" + It "Visual Studio $defaultVSMacVersion for Mac is default" { + $vsPath = "/Applications/Visual Studio.app" $vstoolPath = Join-Path $vsPath "Contents/MacOS/vstool" $vsPath | Should -Exist $vstoolPath | Should -Exist diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index 9361449de2c4..096a85ebbcc4 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -18,7 +18,10 @@ ] }, "xamarin": { - "vsmac": "latest", + "vsmac": { + "default": "2019", + "versions": [ "2019" ] + }, "mono-versions": [ "6.12.0.162", "6.10.0.106", "6.8.0.123", "6.6.0.166", "6.4.0.208" ], diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index 985201ec700e..4be38c19863a 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -12,7 +12,10 @@ ] }, "xamarin": { - "vsmac": "latest", + "vsmac": { + "default": "2022", + "versions": [ "2019", "2022" ] + }, "mono-versions": [ "6.12.0.174" ], diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index 1cb3633a172e..c367898f9df2 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -9,8 +9,10 @@ ] }, "xamarin": { - "vsmac": "latest", - "vsmac_preview": "preview", + "vsmac": { + "default": "2022", + "versions": [ "2019", "2022" ] + }, "mono-versions": [ "6.12.0.174" ], From c61cbbf2969503f4c55637476c75947da3c01073 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Fri, 27 May 2022 10:46:59 +0400 Subject: [PATCH 1181/3485] [Ubuntu] Add java dependent tools back to ubuntu 22 (#5618) * Get back kotlin and selenium * Get back leiningen and android tools --- .../SoftwareReport.Generator.ps1 | 26 +++++++++---------- images/linux/scripts/tests/Android.Tests.ps1 | 2 -- images/linux/scripts/tests/Tools.Tests.ps1 | 6 ++--- images/linux/toolsets/toolset-2204.json | 4 +-- images/linux/ubuntu2204.pkr.hcl | 4 +++ 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index 030bfec07714..d09faa335b11 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -49,13 +49,13 @@ $runtimesList = @( (Get-JuliaVersion), (Get-ClangVersions), (Get-ClangFormatVersions), - (Get-ClangTidyVersions) + (Get-ClangTidyVersions), + (Get-KotlinVersion) ) if ((Test-IsUbuntu18) -or (Test-IsUbuntu20)) { $runtimesList += @( (Get-MsbuildVersion), - (Get-KotlinVersion), (Get-MonoVersion), (Get-ErlangVersion), (Get-ErlangRebar3Version), @@ -128,6 +128,7 @@ $toolsList = @( (Get-GitFTPVersion), (Get-HavegedVersion), (Get-HerokuVersion), + (Get-LeiningenVersion), (Get-SVNVersion), (Get-JqVersion), (Get-YqVersion), @@ -154,7 +155,6 @@ $toolsList = @( if ((Test-IsUbuntu18) -or (Test-IsUbuntu20)) { $toolsList += @( (Get-PhantomJSVersion), - (Get-LeiningenVersion), (Get-HHVMVersion) ) } @@ -229,14 +229,14 @@ $markdown += New-MDHeader "Browsers and Drivers" -Level 3 $browsersAndDriversList = @( (Get-ChromeVersion), (Get-ChromeDriverVersion), - (Get-ChromiumVersion) + (Get-ChromiumVersion), + (Get-SeleniumVersion) ) if ((Test-IsUbuntu18) -or (Test-IsUbuntu20)) { $browsersAndDriversList += @( (Get-FirefoxVersion), - (Get-GeckodriverVersion), - (Get-SeleniumVersion) + (Get-GeckodriverVersion) ) } @@ -293,14 +293,12 @@ $markdown += New-MDList -Style Unordered -Lines @( $markdown += Build-WebServersSection -if ((Test-IsUbuntu18) -or (Test-IsUbuntu20)) { - $markdown += New-MDHeader "Android" -Level 3 - $markdown += Build-AndroidTable | New-MDTable - $markdown += New-MDNewLine - $markdown += New-MDHeader "Environment variables" -Level 4 - $markdown += Build-AndroidEnvironmentTable | New-MDTable - $markdown += New-MDNewLine -} +$markdown += New-MDHeader "Android" -Level 3 +$markdown += Build-AndroidTable | New-MDTable +$markdown += New-MDNewLine +$markdown += New-MDHeader "Environment variables" -Level 4 +$markdown += Build-AndroidEnvironmentTable | New-MDTable +$markdown += New-MDNewLine $markdown += New-MDHeader "Cached Docker images" -Level 3 $markdown += Get-CachedDockerImagesTableData | New-MDTable diff --git a/images/linux/scripts/tests/Android.Tests.ps1 b/images/linux/scripts/tests/Android.Tests.ps1 index 028ea5518233..3d530a0b990e 100644 --- a/images/linux/scripts/tests/Android.Tests.ps1 +++ b/images/linux/scripts/tests/Android.Tests.ps1 @@ -1,6 +1,4 @@ Describe "Android" { - if (Test-IsUbuntu22) { return } - $androidSdkManagerPackages = Get-AndroidPackages [int]$platformMinVersion = Get-ToolsetValue "android.platform_min_version" [version]$buildToolsMinVersion = Get-ToolsetValue "android.build_tools_min_version" diff --git a/images/linux/scripts/tests/Tools.Tests.ps1 b/images/linux/scripts/tests/Tools.Tests.ps1 index 16a7e57cf67d..a155221e6f6a 100644 --- a/images/linux/scripts/tests/Tools.Tests.ps1 +++ b/images/linux/scripts/tests/Tools.Tests.ps1 @@ -206,7 +206,7 @@ Describe "Sbt" { } } -Describe "Selenium" -Skip:(Test-IsUbuntu22) { +Describe "Selenium" { It "Selenium is installed" { $seleniumBinaryName = (Get-ToolsetContent).selenium.binary_name $seleniumPath = Join-Path "/usr/share/java" "$seleniumBinaryName.jar" @@ -298,7 +298,7 @@ Describe "Kubernetes tools" { } } -Describe "Leiningen" -Skip:(Test-IsUbuntu22) { +Describe "Leiningen" { It "leiningen" { "lein --version" | Should -ReturnZeroExitCode } @@ -397,7 +397,7 @@ Describe "yq" { } } -Describe "Kotlin" -Skip:(Test-IsUbuntu22) { +Describe "Kotlin" { It "kapt" { "kapt -version"| Should -ReturnZeroExitCode } diff --git a/images/linux/toolsets/toolset-2204.json b/images/linux/toolsets/toolset-2204.json index 213080d04503..8bea46597d73 100644 --- a/images/linux/toolsets/toolset-2204.json +++ b/images/linux/toolsets/toolset-2204.json @@ -87,9 +87,9 @@ "cmake;3.18.1" ], "ndk": { - "default": "21", + "default": "23", "versions": [ - "21", "22", "23" + "21", "23", "24" ] } }, diff --git a/images/linux/ubuntu2204.pkr.hcl b/images/linux/ubuntu2204.pkr.hcl index dffb9c3f3752..22c5ae652484 100644 --- a/images/linux/ubuntu2204.pkr.hcl +++ b/images/linux/ubuntu2204.pkr.hcl @@ -290,7 +290,9 @@ build { "${path.root}/scripts/installers/java-tools.sh", "${path.root}/scripts/installers/kubernetes-tools.sh", "${path.root}/scripts/installers/oc.sh", + "${path.root}/scripts/installers/leiningen.sh", "${path.root}/scripts/installers/miniconda.sh", + "${path.root}/scripts/installers/kotlin.sh", "${path.root}/scripts/installers/mysql.sh", "${path.root}/scripts/installers/sqlpackage.sh", "${path.root}/scripts/installers/nginx.sh", @@ -306,10 +308,12 @@ build { "${path.root}/scripts/installers/rust.sh", "${path.root}/scripts/installers/julia.sh", "${path.root}/scripts/installers/sbt.sh", + "${path.root}/scripts/installers/selenium.sh", "${path.root}/scripts/installers/terraform.sh", "${path.root}/scripts/installers/packer.sh", "${path.root}/scripts/installers/vcpkg.sh", "${path.root}/scripts/installers/dpkg-config.sh", + "${path.root}/scripts/installers/android.sh", "${path.root}/scripts/installers/yq.sh", "${path.root}/scripts/installers/pypy.sh", "${path.root}/scripts/installers/python.sh", From 3c0d3f87092a2cfdd156a1939a0a9e8eec587590 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Fri, 27 May 2022 12:14:16 +0400 Subject: [PATCH 1182/3485] Fix software report for cargo audit (#5624) --- images/linux/scripts/SoftwareReport/SoftwareReport.Rust.psm1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Rust.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Rust.psm1 index 21b65d638c19..d4b4b1db0472 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Rust.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Rust.psm1 @@ -21,7 +21,7 @@ function Get-CargoVersion { } function Get-CargoAuditVersion { - $cargoAuditVersion = $(cargo audit --version) | Take-OutputPart -Part 1 + $cargoAuditVersion = $(cargo-audit --version) | Take-OutputPart -Part 1 return "Cargo audit $cargoAuditVersion" } From 992c2d35085a08cec1f1bec161372afb87375247 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Fri, 27 May 2022 14:01:49 +0400 Subject: [PATCH 1183/3485] Fix software report output for cargo audit package (#5625) --- images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 index 33530d33cc94..980dd2dc722c 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 @@ -60,7 +60,7 @@ function Get-CbindgenVersion { } function Get-CargoAuditVersion { - return cargo audit --version + return cargo-audit --version } function Get-CargoOutdatedVersion { From 6b6c1beded483306c386b6611a01b3952a341eb5 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 27 May 2022 11:34:52 +0000 Subject: [PATCH 1184/3485] macOS 10.15 (20220523 update) (#5604) * Updating readme file for macOS-10.15 version 20220523.3 * Update macos-10.15-Readme.md Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Dusko Dobranic <101048884+ddobranic@users.noreply.github.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-10.15-Readme.md | 61 +++++++++++++++--------------- 1 file changed, 31 insertions(+), 30 deletions(-) diff --git a/images/macos/macos-10.15-Readme.md b/images/macos/macos-10.15-Readme.md index 34b082549ecc..f0c9011d3913 100644 --- a/images/macos/macos-10.15-Readme.md +++ b/images/macos/macos-10.15-Readme.md @@ -1,12 +1,13 @@ | Announcements | |-| -| [[macOS] Xcode versions 13.2 & 13.3 will be removed, 13.3.1 will be set as the default one on May, 16](https://github.com/actions/virtual-environments/issues/5463) | +| [[macOS] Default Visual studio for mac will be changed to version 2022 for macOS 11&12 on May, 30](https://github.com/actions/virtual-environments/issues/5601) | +| [[all OSs] Android NDK 22 will be replaced in favor of 24, version 23 will be set as the default one](https://github.com/actions/virtual-environments/issues/5595) | | [macOS 12 (Monterey) is available as a public beta in GitHub Actions and Azure DevOps](https://github.com/actions/virtual-environments/issues/5446) | *** # macOS 10.15 info -- System Version: macOS 10.15.7 (19H1824) +- System Version: macOS 10.15.7 (19H1922) - Kernel Version: Darwin 19.6.0 -- Image Version: 20220515.1 +- Image Version: 20220523.3 ## Installed Software ### Language and Runtime @@ -16,38 +17,38 @@ - Clang/LLVM 13.0.1 is available on `'$(brew --prefix llvm)/bin/clang'` - gcc-9 (Homebrew GCC 9.4.0) 9.4.0 - available by `gcc-9` alias - gcc-10 (Homebrew GCC 10.3.0) 10.3.0 - available by `gcc-10` alias -- gcc-11 (Homebrew GCC 11.3.0) 11.3.0 - available by `gcc-11` alias +- gcc-11 (Homebrew GCC 11.3.0_1) 11.3.0 - available by `gcc-11` alias - GNU Fortran (Homebrew GCC 9.4.0) 9.4.0 - available by `gfortran-9` alias - GNU Fortran (Homebrew GCC 10.3.0) 10.3.0 - available by `gfortran-10` alias -- GNU Fortran (Homebrew GCC 11.3.0) 11.3.0 - available by `gfortran-11` alias +- GNU Fortran (Homebrew GCC 11.3.0_1) 11.3.0 - available by `gfortran-11` alias - Go 1.17.10 - julia 1.7.2 - Kotlin 1.6.21-release-334 - MSBuild 16.10.1.58001 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) - Node.js v16.15.0 - NVM 0.39.1 -- NVM - Cached node versions: v12.22.12 v14.19.2 v16.15.0 +- NVM - Cached node versions: v12.22.12 v14.19.3 v16.15.0 - Perl 5.34.0 - PHP 8.1.6 - Python 2.7.18 -- Python 3.9.12 +- Python 3.9.13 - R 4.2.0 - Ruby 2.7.6p219 ### Package Management -- Bundler version 2.3.13 +- Bundler version 2.3.14 - Carthage 0.38.0 - CocoaPods 1.11.3 - Composer 2.3.5 - Homebrew 3.4.11 -- Miniconda 4.11.0 +- Miniconda 4.12.0 - NPM 8.5.5 - NuGet 5.9.0.7134 - Pip 20.3.4 (python 2.7) -- Pip 22.0.4 (python 3.9) +- Pip 22.1 (python 3.9) - Pipx 1.0.0 - RubyGems 3.2.33 -- Vcpkg 2022 (build from master \<0cf5b4305>) +- Vcpkg 2022 (build from master \<840f701d8>) - Yarn 1.22.19 #### Environment variables @@ -77,7 +78,7 @@ - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.3 - gpg (GnuPG) 2.3.6 -- helm v3.8.2+g6e3701e +- helm v3.9.0+g7ceeda6 - Hub CLI: 2.14.2 - ImageMagick 7.1.0-33 - jq 1.6 @@ -99,20 +100,20 @@ ### Tools - Aliyun CLI 3.0.119 - App Center CLI 2.10.10 -- AWS CLI 2.7.0 +- AWS CLI 2.7.2 - AWS SAM CLI 1.50.0 -- AWS Session Manager CLI 1.2.312.0 +- AWS Session Manager CLI 1.2.323.0 - Azure CLI (azure-devops) 0.25.0 - Azure CLI 2.36.0 - Bicep CLI 0.6.18 - Cabal 3.6.2.0 - Cmake 3.23.1 -- Fastlane 2.205.2 +- Fastlane 2.206.1 - GHC 9.2.2 - GHCup 0.1.17.8 - Jazzy 0.14.2 - Stack 2.7.5 -- SwiftFormat 0.49.8 +- SwiftFormat 0.49.9 - Swig 4.0.2 - Xcode Command Line Tools 12.4.0.0.1.1610135815 @@ -121,13 +122,13 @@ - yamllint 1.26.3 ### Browsers -- Safari 15.4 (15613.1.17.1.13) -- SafariDriver 15.4 (15613.1.17.1.13) +- Safari 15.5 (15613.2.7.1.9) +- SafariDriver 15.5 (15613.2.7.1.9) - Google Chrome 101.0.4951.64 - ChromeDriver 101.0.4951.41 -- Microsoft Edge 101.0.1210.47 -- MSEdgeDriver 101.0.1210.47 -- Mozilla Firefox 100.0 +- Microsoft Edge 101.0.1210.53 +- MSEdgeDriver 101.0.1210.53 +- Mozilla Firefox 100.0.2 - geckodriver 0.31.0 - Selenium server 4.1.4 @@ -166,7 +167,7 @@ - 3.6.15 - 3.7.13 - 3.8.12 -- 3.9.12 +- 3.9.13 - 3.10.4 #### PyPy @@ -178,7 +179,7 @@ #### Node.js - 12.22.12 -- 14.19.2 +- 14.19.3 - 16.15.0 #### Go @@ -189,21 +190,21 @@ | 1.18.2 | x64 | GOROOT_1_18_X64 | ### Rust Tools -- Cargo 1.60.0 -- Rust 1.60.0 -- Rustdoc 1.60.0 +- Cargo 1.61.0 +- Rust 1.61.0 +- Rustdoc 1.61.0 - Rustup 1.24.3 #### Packages - Bindgen 0.59.2 -- Cargo-audit 0.16.0 +- Cargo-audit 0.17.0 - Cargo-outdated 0.11.1 - Cbindgen 0.23.0 -- Clippy 0.1.60 +- Clippy 0.1.61 - Rustfmt 1.4.38-stable ### PowerShell Tools -- PowerShell 7.2.3 +- PowerShell 7.2.4 #### PowerShell Modules | Module | Version | @@ -220,7 +221,7 @@ | nginx | 1.21.6_1 | /usr/local/etc/nginx/nginx.conf | none | 80 | ### Xamarin -#### Visual Studio for Mac +#### Visual Studio 2019 for Mac - 8.10.23.7 #### Xamarin bundles From 0d30c1390db83160e686999c3195d26214577cc1 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Fri, 27 May 2022 16:50:29 +0400 Subject: [PATCH 1185/3485] Downgrade parcel to 2.5.0 (#5627) --- images/win/toolsets/toolset-2016.json | 2 +- images/win/toolsets/toolset-2019.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/images/win/toolsets/toolset-2016.json b/images/win/toolsets/toolset-2016.json index 285c9582caac..2abb40872078 100644 --- a/images/win/toolsets/toolset-2016.json +++ b/images/win/toolsets/toolset-2016.json @@ -376,7 +376,7 @@ { "name": "cordova" }, { "name": "grunt-cli", "test": "grunt --version" }, { "name": "gulp-cli", "test": "gulp --version" }, - { "name": "parcel", "test": "parcel --version" }, + { "name": "parcel@2.5.0", "test": "parcel --version" }, { "name": "webpack" }, { "name": "webpack-cli" }, { "name": "node-sass" } diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index 8830b4925ea1..d0ed50ab7547 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -412,7 +412,7 @@ { "name": "cordova" }, { "name": "grunt-cli", "test": "grunt --version" }, { "name": "gulp-cli", "test": "gulp --version" }, - { "name": "parcel", "test": "parcel --version"}, + { "name": "parcel@2.5.0", "test": "parcel --version"}, { "name": "webpack" }, { "name": "webpack-cli" }, { "name": "node-sass" } From a814bcd5134b607cd09e188d99ac0e95ef33d8af Mon Sep 17 00:00:00 2001 From: Larissa Fortuna <56982181+lkfortuna@users.noreply.github.com> Date: Sat, 28 May 2022 00:14:05 -0700 Subject: [PATCH 1186/3485] Adding beta indicator (#5628) Ubuntu 22 and macOS12 are in beta - we need to indicate that here. --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index ca5f8d89f12b..ccf671a63f9b 100644 --- a/README.md +++ b/README.md @@ -11,10 +11,10 @@ For general questions about using the virtual environments or writing your Actio ## Available Environments | Environment | YAML Label | Included Software | Latest Release & Rollout Progress | | --------------------|---------------------|--------------------|---------------------| -| Ubuntu 22.04 | `ubuntu-22.04` | [ubuntu-22.04] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu22&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu22&redirect=1) +| Ubuntu 22.04 <sup>beta</sup> | `ubuntu-22.04` | [ubuntu-22.04] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu22&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu22&redirect=1) | Ubuntu 20.04 | `ubuntu-latest` or `ubuntu-20.04` | [ubuntu-20.04] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu20&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu20&redirect=1) | Ubuntu 18.04 | `ubuntu-18.04` | [ubuntu-18.04] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu18&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu18&redirect=1) -| macOS 12 | `macos-12`| [macOS-12] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-12&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-12&redirect=1) +| macOS 12 <sup>beta</sup>| `macos-12`| [macOS-12] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-12&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-12&redirect=1) | macOS 11 | `macos-latest` or `macos-11`| [macOS-11] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-11&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-11&redirect=1) | macOS 10.15 | `macos-10.15` | [macOS-10.15] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-10.15&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-10.15&redirect=1) | Windows Server 2022 | `windows-latest` or `windows-2022` | [windows-2022] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=windows-2022&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=windows-2022&redirect=1) | From 520f852a2148f06a8538309bc57b76b4f5b96431 Mon Sep 17 00:00:00 2001 From: jeffpuckett <jeffpuckett@users.noreply.github.com> Date: Mon, 30 May 2022 08:40:06 -0400 Subject: [PATCH 1187/3485] Add option to auto clean up packer resources if there is an error during packer image creation (#5635) * Add option to auto clean up packer resources if there is an error during packer image creation * Add option to auto clean up packer resources if there is an error during packer image creation * Add option to auto clean up packer resources if there is an error during packer image creation Co-authored-by: Jeff Puckett <jpuckett@yprime.com> --- helpers/GenerateResourcesAndImage.ps1 | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/helpers/GenerateResourcesAndImage.ps1 b/helpers/GenerateResourcesAndImage.ps1 index d90dc87c67be..27659c9ce195 100644 --- a/helpers/GenerateResourcesAndImage.ps1 +++ b/helpers/GenerateResourcesAndImage.ps1 @@ -88,6 +88,8 @@ Function GenerateResourcesAndImage { .PARAMETER AllowBlobPublicAccess The Azure storage account will be created with this option. + .PARAMETER OnError + Specify how packer handles an error during image creation. .EXAMPLE GenerateResourcesAndImage -SubscriptionId {YourSubscriptionId} -ResourceGroupName "shsamytest1" -ImageGenerationRepositoryRoot "C:\virtual-environments" -ImageType Ubuntu1804 -AzureLocation "East US" #> @@ -119,6 +121,9 @@ Function GenerateResourcesAndImage { [Parameter(Mandatory = $False)] [bool] $EnableHttpsTrafficOnly = $False, [Parameter(Mandatory = $False)] + [ValidateSet("abort","ask","cleanup","run-cleanup-provisioner")] + [string] $OnError = "ask", + [Parameter(Mandatory = $False)] [hashtable] $Tags ) @@ -281,7 +286,7 @@ Function GenerateResourcesAndImage { $builderScriptPath = $builderScriptPath_temp } - & $packerBinary build -on-error=ask ` + & $packerBinary build -on-error=$($OnError) ` -var "client_id=$($spClientId)" ` -var "client_secret=$($ServicePrincipalClientSecret)" ` -var "subscription_id=$($SubscriptionId)" ` From 47e8783e7e99926f3b0195935376912a047bd1f7 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Mon, 30 May 2022 15:49:56 +0200 Subject: [PATCH 1188/3485] [macOS] deprecate xcode 13.2 on Big Sur (#5638) --- images/macos/toolsets/toolset-11.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index 4be38c19863a..ef0df2fbf903 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -2,8 +2,7 @@ "xcode": { "default": "13.2.1", "versions": [ - { "link": "13.2.1", "version": "13.2.1" }, - { "link": "13.2", "version": "13.2.0" }, + { "link": "13.2.1", "version": "13.2.1", "symlinks": ["13.2"] }, { "link": "13.1", "version": "13.1.0" }, { "link": "13.0", "version": "13.0.0" }, { "link": "12.5.1", "version": "12.5.1", "symlinks": ["12.5"] }, From f4e9588993b1509bf8bb01428029f86b8e099cd5 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Mon, 30 May 2022 16:39:37 +0200 Subject: [PATCH 1189/3485] [Windows] Install latest Android cmdline-tools (#5619) * Install latest Android cmdline-tools * Use Get-ToolsetContent * Fix variable typo * replace variable * Fix Windows 2016 --- .../scripts/Installers/Install-AndroidSDK.ps1 | 23 +++++++++++++++---- images/win/toolsets/toolset-2016.json | 1 + images/win/toolsets/toolset-2019.json | 1 + images/win/toolsets/toolset-2022.json | 1 + 4 files changed, 21 insertions(+), 5 deletions(-) diff --git a/images/win/scripts/Installers/Install-AndroidSDK.ps1 b/images/win/scripts/Installers/Install-AndroidSDK.ps1 index 6f70e77a43dc..7ec7812de633 100644 --- a/images/win/scripts/Installers/Install-AndroidSDK.ps1 +++ b/images/win/scripts/Installers/Install-AndroidSDK.ps1 @@ -3,8 +3,24 @@ ## Desc: Install and update Android SDK and tools ################################################################################ -# install command-line tools -$cmdlineToolsUrl = "https://dl.google.com/android/repository/commandlinetools-win-7302050_latest.zip" +# get packages to install from the toolset +$androidToolset = (Get-ToolsetContent).android + +# install latest command-line tools +$cmdlineToolsVersion = $androidToolset."cmdline-tools" +if ($cmdlineToolsVersion -eq "latest") { + $googlePkgs = Invoke-RestMethod "https://dl.google.com/android/repository/repository2-1.xml" + $cmdlineToolsVersion = $googlePkgs.SelectSingleNode( + "//remotePackage[@path='cmdline-tools;latest']/archives/archive/complete/url[starts-with(text(), 'commandlinetools-win-')]" + ).'#text' + + if (-not $cmdlineToolsVersion) { + Write-Host "Failed to parse latest command-line tools version" + exit 1 + } +} + +$cmdlineToolsUrl = "https://dl.google.com/android/repository/${cmdlineToolsVersion}" $cmdlineToolsArchPath = Start-DownloadWithRetry -Url $cmdlineToolsUrl -Name "cmdline-tools.zip" $sdkInstallRoot = "C:\Program Files (x86)\Android\android-sdk" $sdkRoot = "C:\Android\android-sdk" @@ -50,9 +66,6 @@ Install-AndroidSDKPackages -AndroidSDKManagerPath $sdkManager ` -AndroidSDKRootPath $sdkRoot ` -AndroidPackages "platform-tools" -# get packages to install from the toolset -$androidToolset = (Get-ToolsetContent).android - # get packages info $androidPackages = Get-AndroidPackages -AndroidSDKManagerPath $sdkManager diff --git a/images/win/toolsets/toolset-2016.json b/images/win/toolsets/toolset-2016.json index 2abb40872078..f0677d55f7b2 100644 --- a/images/win/toolsets/toolset-2016.json +++ b/images/win/toolsets/toolset-2016.json @@ -157,6 +157,7 @@ ] }, "android": { + "cmdline-tools": "latest", "platform_min_version": "19", "build_tools_min_version": "19.1.0", "extra_list": [ diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index d0ed50ab7547..88273c5d8ccd 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -159,6 +159,7 @@ ] }, "android": { + "cmdline-tools": "latest", "platform_min_version": "19", "build_tools_min_version": "19.1.0", "extra_list": [ diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index b9d8b5e64036..6d384e7f1d57 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -139,6 +139,7 @@ ] }, "android": { + "cmdline-tools": "latest", "platform_min_version": "27", "build_tools_min_version": "27.0.0", "extra_list": [ From f61057f208fceb7fdce33eec7d3379a972f13b88 Mon Sep 17 00:00:00 2001 From: Blake <blakewills@outlook.com> Date: Mon, 30 May 2022 22:41:16 +0100 Subject: [PATCH 1190/3485] fix script (#5644) --- helpers/GenerateResourcesAndImage.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helpers/GenerateResourcesAndImage.ps1 b/helpers/GenerateResourcesAndImage.ps1 index 27659c9ce195..f51c6cf0ac17 100644 --- a/helpers/GenerateResourcesAndImage.ps1 +++ b/helpers/GenerateResourcesAndImage.ps1 @@ -286,7 +286,7 @@ Function GenerateResourcesAndImage { $builderScriptPath = $builderScriptPath_temp } - & $packerBinary build -on-error=$($OnError) ` + & $packerBinary build -on-error="$($OnError)" ` -var "client_id=$($spClientId)" ` -var "client_secret=$($ServicePrincipalClientSecret)" ` -var "subscription_id=$($SubscriptionId)" ` From b07aceb7a4ce2c4e0caf38cbf03bd3f662308c61 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Tue, 31 May 2022 01:24:33 +0200 Subject: [PATCH 1191/3485] [Windows] Install parcel after python3 (#5629) --- images/win/toolsets/toolset-2016.json | 2 +- images/win/toolsets/toolset-2019.json | 2 +- images/win/windows2016.json | 4 ++-- images/win/windows2019.json | 2 +- images/win/windows2022.json | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/images/win/toolsets/toolset-2016.json b/images/win/toolsets/toolset-2016.json index f0677d55f7b2..1325b6c2967a 100644 --- a/images/win/toolsets/toolset-2016.json +++ b/images/win/toolsets/toolset-2016.json @@ -377,7 +377,7 @@ { "name": "cordova" }, { "name": "grunt-cli", "test": "grunt --version" }, { "name": "gulp-cli", "test": "gulp --version" }, - { "name": "parcel@2.5.0", "test": "parcel --version" }, + { "name": "parcel", "test": "parcel --version" }, { "name": "webpack" }, { "name": "webpack-cli" }, { "name": "node-sass" } diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index 88273c5d8ccd..38c8d87aae6f 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -413,7 +413,7 @@ { "name": "cordova" }, { "name": "grunt-cli", "test": "grunt --version" }, { "name": "gulp-cli", "test": "gulp --version" }, - { "name": "parcel@2.5.0", "test": "parcel --version"}, + { "name": "parcel", "test": "parcel --version"}, { "name": "webpack" }, { "name": "webpack-cli" }, { "name": "node-sass" } diff --git a/images/win/windows2016.json b/images/win/windows2016.json index f9b5d363a680..901d164d457a 100644 --- a/images/win/windows2016.json +++ b/images/win/windows2016.json @@ -183,8 +183,6 @@ "{{ template_dir }}/scripts/Installers/Install-Vsix.ps1", "{{ template_dir }}/scripts/Installers/Install-AzureCli.ps1", "{{ template_dir }}/scripts/Installers/Install-AzureDevOpsCli.ps1", - "{{ template_dir }}/scripts/Installers/Install-NodeLts.ps1", - "{{ template_dir }}/scripts/Installers/Install-Bazel.ps1", "{{ template_dir }}/scripts/Installers/Install-CommonUtils.ps1", "{{ template_dir }}/scripts/Installers/Install-AliyunCli.ps1", "{{ template_dir }}/scripts/Installers/Install-PostgreSQL.ps1", @@ -194,6 +192,8 @@ "{{ template_dir }}/scripts/Installers/Install-PyPy.ps1", "{{ template_dir }}/scripts/Installers/Install-Toolset.ps1", "{{ template_dir }}/scripts/Installers/Configure-Toolset.ps1", + "{{ template_dir }}/scripts/Installers/Install-NodeLts.ps1", + "{{ template_dir }}/scripts/Installers/Install-Bazel.ps1", "{{ template_dir }}/scripts/Installers/Install-AndroidSDK.ps1", "{{ template_dir }}/scripts/Installers/Install-Pipx.ps1", "{{ template_dir }}/scripts/Installers/Install-PipxPackages.ps1", diff --git a/images/win/windows2019.json b/images/win/windows2019.json index 306ea7dba44c..f2a50f970c6f 100644 --- a/images/win/windows2019.json +++ b/images/win/windows2019.json @@ -178,7 +178,6 @@ "{{ template_dir }}/scripts/Installers/Install-Vsix.ps1", "{{ template_dir }}/scripts/Installers/Install-AzureCli.ps1", "{{ template_dir }}/scripts/Installers/Install-AzureDevOpsCli.ps1", - "{{ template_dir }}/scripts/Installers/Install-NodeLts.ps1", "{{ template_dir }}/scripts/Installers/Install-CommonUtils.ps1", "{{ template_dir }}/scripts/Installers/Install-JavaTools.ps1", "{{ template_dir }}/scripts/Installers/Install-Kotlin.ps1" @@ -208,6 +207,7 @@ "{{ template_dir }}/scripts/Installers/Install-PyPy.ps1", "{{ template_dir }}/scripts/Installers/Install-Toolset.ps1", "{{ template_dir }}/scripts/Installers/Configure-Toolset.ps1", + "{{ template_dir }}/scripts/Installers/Install-NodeLts.ps1", "{{ template_dir }}/scripts/Installers/Install-AndroidSDK.ps1", "{{ template_dir }}/scripts/Installers/Install-AzureModules.ps1", "{{ template_dir }}/scripts/Installers/Install-Pipx.ps1", diff --git a/images/win/windows2022.json b/images/win/windows2022.json index 216eeb19362d..a427e2399d56 100644 --- a/images/win/windows2022.json +++ b/images/win/windows2022.json @@ -177,7 +177,6 @@ "{{ template_dir }}/scripts/Installers/Install-Vsix.ps1", "{{ template_dir }}/scripts/Installers/Install-AzureCli.ps1", "{{ template_dir }}/scripts/Installers/Install-AzureDevOpsCli.ps1", - "{{ template_dir }}/scripts/Installers/Install-NodeLts.ps1", "{{ template_dir }}/scripts/Installers/Install-CommonUtils.ps1", "{{ template_dir }}/scripts/Installers/Install-JavaTools.ps1", "{{ template_dir }}/scripts/Installers/Install-Kotlin.ps1" @@ -207,6 +206,7 @@ "{{ template_dir }}/scripts/Installers/Install-PyPy.ps1", "{{ template_dir }}/scripts/Installers/Install-Toolset.ps1", "{{ template_dir }}/scripts/Installers/Configure-Toolset.ps1", + "{{ template_dir }}/scripts/Installers/Install-NodeLts.ps1", "{{ template_dir }}/scripts/Installers/Install-AndroidSDK.ps1", "{{ template_dir }}/scripts/Installers/Install-AzureModules.ps1", "{{ template_dir }}/scripts/Installers/Install-Pipx.ps1", From 1938bdf8416a031c137ee51a567a83120837d5c1 Mon Sep 17 00:00:00 2001 From: Bryan Ricker <978899+bricker@users.noreply.github.com> Date: Mon, 30 May 2022 23:50:57 -0700 Subject: [PATCH 1192/3485] [Ubuntu] add out-of-the-box SourceKitten support (#5634) [SourceKitten](https://github.com/jpsim/SourceKitten), a popular Swift library for interacting with SourceKit, needs to know (or be told) the location of the sourcekitd framework. SourceKitten is somewhat [ubiquitous](https://github.com/jpsim/SourceKitten#projects-built-with-sourcekitten); most Swift projects I've seen or worked on used SourceKitten in some way. On macOS, the sourcekit framework is baked-in to the Xcode toolchain(s) and therefore its location is generally known. On Linux, the location of the sourcekit framework is wherever swift is installed, which is unknown to libraries like SourceKitten. SourceKitten searches for the sourcekit framework in [a few locations](https://github.com/jpsim/SourceKitten/blob/f7cf1e3b6328f21e344e83450ae1298af69de281/Source/SourceKittenFramework/library_wrapper.swift#L51-L104), but it's unable to infer the location of the framework on these ubuntu images. The result when attempting to run any SourceKitten-based tool in Github Actions on an ubuntu VM is the following error: ``` SourceKittenFramework/library_wrapper.swift:31: Fatal error: Loading libsourcekitdInProc.so failed /home/runner/work/_temp/cb002a5e-1916-4e05-ba4d-f70ad3bb2266.sh: line 1: 3944 Illegal instruction (core dumped) mint run swiftlint . ``` (to be clear, this error is not specific to the Github Actions ubuntu VMs. The same error occurs on any Ubuntu system). Individual users can work around this by setting the following environment variable: ``` LINUX_SOURCEKIT_LIB_PATH="/usr/share/swift/usr/lib" ``` This is not a good workaround for the following reasons: 1. The end user doesn't necessarily know where swift is installed. 2. A change to the location of the swift installation would break this workaround. 3. The error will occur virtually 100% of the time on a user's first attempt to run SourceKitten on ubuntu, and takes at least a few minutes to troubleshoot. This will quickly add up to a non-trivial amount of lost productivity. So, anyways, my proposal is to just link sourcekitd to a location where SourceKitten will find it, so most developers don't have to think about it. `LINUX_SOURCEKIT_LIB_PATH` can be defined by the user if they have an unusual setup. Alternative: - Don't symlink, add `LINUX_SOURCEKIT_LIB_PATH` to `/etc/environment`. --- images/linux/scripts/installers/swift.sh | 21 +++++++++++++-------- images/linux/scripts/tests/Common.Tests.ps1 | 4 ++++ 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/images/linux/scripts/installers/swift.sh b/images/linux/scripts/installers/swift.sh index ac8e87c6b4ce..f482d6021a59 100644 --- a/images/linux/scripts/installers/swift.sh +++ b/images/linux/scripts/installers/swift.sh @@ -16,13 +16,18 @@ swift_tar_url="https://swift.org/builds/swift-$swift_version-release/ubuntu${ima download_with_retries $swift_tar_url "/tmp" "$swift_tar_name" tar xzf /tmp/$swift_tar_name -mv swift-$swift_version-RELEASE-ubuntu$image_label /usr/share/swift - -SWIFT_PATH="/usr/share/swift/usr/bin" -SWIFT_BIN="$SWIFT_PATH/swift" -SWIFTC_BIN="$SWIFT_PATH/swiftc" -ln -s "$SWIFT_BIN" /usr/local/bin/swift -ln -s "$SWIFTC_BIN" /usr/local/bin/swiftc -echo "SWIFT_PATH=$SWIFT_PATH" | tee -a /etc/environment + +SWIFT_INSTALL_ROOT="/usr/share/swift" +SWIFT_BIN_ROOT="$SWIFT_INSTALL_ROOT/usr/bin" +SWIFT_LIB_ROOT="$SWIFT_INSTALL_ROOT/usr/lib" + +mv swift-$swift_version-RELEASE-ubuntu$image_label $SWIFT_INSTALL_ROOT +mkdir -p /usr/local/lib + +ln -s "$SWIFT_BIN_ROOT/swift" /usr/local/bin/swift +ln -s "$SWIFT_BIN_ROOT/swiftc" /usr/local/bin/swiftc +ln -s "$SWIFT_LIB_ROOT/libsourcekitdInProc.so" /usr/local/lib/libsourcekitdInProc.so + +echo "SWIFT_PATH=$SWIFT_BIN_ROOT" | tee -a /etc/environment invoke_tests "Common" "Swift" diff --git a/images/linux/scripts/tests/Common.Tests.ps1 b/images/linux/scripts/tests/Common.Tests.ps1 index c4bf5897ad26..b396f5b05edd 100644 --- a/images/linux/scripts/tests/Common.Tests.ps1 +++ b/images/linux/scripts/tests/Common.Tests.ps1 @@ -37,6 +37,10 @@ Describe "Swift" -Skip:(Test-IsUbuntu22) { It "swiftc" { "swiftc --version" | Should -ReturnZeroExitCode } + + It "libsourcekitd" { + "/usr/local/lib/libsourcekitdInProc.so" | Should -Exist + } } Describe "PipxPackages" { From 82d552ac5644334a88c55779a54540df13f56fad Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Tue, 31 May 2022 10:05:22 +0200 Subject: [PATCH 1193/3485] [Ubuntu] Install latest Android cmdline-tools (#5639) * [Ubuntu] Install latest Android cmdline-tools * Move yq installation --- images/linux/scripts/installers/android.sh | 18 +++++++++++++++++- images/linux/toolsets/toolset-1804.json | 1 + images/linux/toolsets/toolset-2004.json | 1 + images/linux/toolsets/toolset-2204.json | 1 + images/linux/ubuntu1804.json | 2 +- images/linux/ubuntu2004.json | 2 +- images/linux/ubuntu2204.pkr.hcl | 2 +- 7 files changed, 23 insertions(+), 4 deletions(-) diff --git a/images/linux/scripts/installers/android.sh b/images/linux/scripts/installers/android.sh index 3c44f86dc5a3..4b292d3f77e5 100644 --- a/images/linux/scripts/installers/android.sh +++ b/images/linux/scripts/installers/android.sh @@ -50,8 +50,24 @@ mkdir -p ${ANDROID_SDK_ROOT} # Download the latest command line tools so that we can accept all of the licenses. # See https://developer.android.com/studio/#command-tools +cmdlineToolsVersion=$(get_toolset_value '.android."cmdline-tools"') +if [[ $cmdlineToolsVersion == "latest" ]]; then + repositoryXmlUrl="https://dl.google.com/android/repository/repository2-1.xml" + download_with_retries $repositoryXmlUrl "/tmp" "repository2-1.xml" + cmdlineToolsVersion=$( + yq -p=xml \ + '.sdk-repository.remotePackage[] | select(."+path" == "cmdline-tools;latest").archives.archive[].complete.url | select(contains("commandlinetools-linux"))' \ + /tmp/repository2-1.xml + ) + + if [[ -z $cmdlineToolsVersion ]]; then + echo "Failed to parse latest command-line tools version" + exit 1 + fi +fi + cmdlineTools="android-cmdline-tools.zip" -download_with_retries https://dl.google.com/android/repository/commandlinetools-linux-7302050_latest.zip "." $cmdlineTools +download_with_retries "https://dl.google.com/android/repository/${cmdlineToolsVersion}" "." $cmdlineTools unzip -qq $cmdlineTools -d ${ANDROID_SDK_ROOT}/cmdline-tools # Command line tools need to be placed in ${ANDROID_SDK_ROOT}/sdk/cmdline-tools/latest to determine SDK root mv ${ANDROID_SDK_ROOT}/cmdline-tools/cmdline-tools ${ANDROID_SDK_ROOT}/cmdline-tools/latest diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index 0e914d720ef0..ba9bbcb84461 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -86,6 +86,7 @@ "maven": "3.8.5" }, "android": { + "cmdline-tools": "latest", "platform_min_version": "23", "build_tools_min_version": "23.0.1", "extra_list": [ diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index 0c5b19f99df4..92acdeca3d74 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -87,6 +87,7 @@ "maven": "3.8.5" }, "android": { + "cmdline-tools": "latest", "platform_min_version": "27", "build_tools_min_version": "27.0.0", "extra_list": [ diff --git a/images/linux/toolsets/toolset-2204.json b/images/linux/toolsets/toolset-2204.json index 8bea46597d73..2477ee697ae9 100644 --- a/images/linux/toolsets/toolset-2204.json +++ b/images/linux/toolsets/toolset-2204.json @@ -73,6 +73,7 @@ "maven": "3.8.5" }, "android": { + "cmdline-tools": "latest", "platform_min_version": "27", "build_tools_min_version": "27.0.0", "extra_list": [ diff --git a/images/linux/ubuntu1804.json b/images/linux/ubuntu1804.json index bdd5847ab8e5..1f64a3365c06 100644 --- a/images/linux/ubuntu1804.json +++ b/images/linux/ubuntu1804.json @@ -242,8 +242,8 @@ "{{template_dir}}/scripts/installers/vcpkg.sh", "{{template_dir}}/scripts/installers/dpkg-config.sh", "{{template_dir}}/scripts/installers/mongodb.sh", - "{{template_dir}}/scripts/installers/android.sh", "{{template_dir}}/scripts/installers/yq.sh", + "{{template_dir}}/scripts/installers/android.sh", "{{template_dir}}/scripts/installers/pypy.sh", "{{template_dir}}/scripts/installers/python.sh", "{{template_dir}}/scripts/installers/aws.sh" diff --git a/images/linux/ubuntu2004.json b/images/linux/ubuntu2004.json index ee9fb00f7be6..7c386927ec89 100644 --- a/images/linux/ubuntu2004.json +++ b/images/linux/ubuntu2004.json @@ -243,8 +243,8 @@ "{{template_dir}}/scripts/installers/vcpkg.sh", "{{template_dir}}/scripts/installers/dpkg-config.sh", "{{template_dir}}/scripts/installers/mongodb.sh", - "{{template_dir}}/scripts/installers/android.sh", "{{template_dir}}/scripts/installers/yq.sh", + "{{template_dir}}/scripts/installers/android.sh", "{{template_dir}}/scripts/installers/pypy.sh", "{{template_dir}}/scripts/installers/python.sh", "{{template_dir}}/scripts/installers/graalvm.sh" diff --git a/images/linux/ubuntu2204.pkr.hcl b/images/linux/ubuntu2204.pkr.hcl index 22c5ae652484..570629ed98cb 100644 --- a/images/linux/ubuntu2204.pkr.hcl +++ b/images/linux/ubuntu2204.pkr.hcl @@ -313,8 +313,8 @@ build { "${path.root}/scripts/installers/packer.sh", "${path.root}/scripts/installers/vcpkg.sh", "${path.root}/scripts/installers/dpkg-config.sh", - "${path.root}/scripts/installers/android.sh", "${path.root}/scripts/installers/yq.sh", + "${path.root}/scripts/installers/android.sh", "${path.root}/scripts/installers/pypy.sh", "${path.root}/scripts/installers/python.sh", "${path.root}/scripts/installers/graalvm.sh" From fbbf35456f27c94768a7614e2b10644a552da477 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Tue, 31 May 2022 10:07:01 +0200 Subject: [PATCH 1194/3485] [macOS] Install latest Android cmdline-tools (#5641) * Install latest Android cmdline-tools * Use cmdlineToolsVersion variable --- .../macos/provision/core/android-toolsets.sh | 18 +++++++++++++++++- images/macos/toolsets/toolset-10.15.json | 1 + images/macos/toolsets/toolset-11.json | 1 + images/macos/toolsets/toolset-12.json | 1 + 4 files changed, 20 insertions(+), 1 deletion(-) diff --git a/images/macos/provision/core/android-toolsets.sh b/images/macos/provision/core/android-toolsets.sh index 0fe237ffbaeb..3507a4a6b0c9 100755 --- a/images/macos/provision/core/android-toolsets.sh +++ b/images/macos/provision/core/android-toolsets.sh @@ -35,7 +35,23 @@ ANDROID_NDK_MAJOR_VERSIONS=($(get_toolset_value '.android.ndk."versions"[]')) ANDROID_NDK_MAJOR_DEFAULT=$(get_toolset_value '.android.ndk.default') ANDROID_NDK_MAJOR_LATEST=$(get_toolset_value '.android.ndk."versions"[-1]') # Get the latest command line tools from https://developer.android.com/studio#cmdline-tools -ANDROID_OSX_SDK_URL="https://dl.google.com/android/repository/commandlinetools-mac-7302050_latest.zip" +cmdlineToolsVersion=$(get_toolset_value '.android."cmdline-tools"') +if [[ $cmdlineToolsVersion == "latest" ]]; then + repositoryXmlUrl="https://dl.google.com/android/repository/repository2-1.xml" + download_with_retries $repositoryXmlUrl "/tmp" "repository2-1.xml" + cmdlineToolsVersion=$( + yq -p=xml \ + '.sdk-repository.remotePackage[] | select(."+path" == "cmdline-tools;latest").archives.archive[].complete.url | select(contains("commandlinetools-mac"))' \ + /tmp/repository2-1.xml + ) + + if [[ -z $cmdlineToolsVersion ]]; then + echo "Failed to parse latest command-line tools version" + exit 1 + fi +fi + +ANDROID_OSX_SDK_URL="https://dl.google.com/android/repository/${cmdlineToolsVersion}" ANDROID_HOME=$HOME/Library/Android/sdk ANDROID_OSX_SDK_FILE=tools-macosx.zip diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index 096a85ebbcc4..a68e74eae733 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -165,6 +165,7 @@ ] }, "android": { + "cmdline-tools": "latest", "platform_min_version": "24", "build_tools_min_version": "24.0.0", "extra-list": [ diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index ef0df2fbf903..07e54464a5a8 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -165,6 +165,7 @@ ] }, "android": { + "cmdline-tools": "latest", "platform_min_version": "27", "build_tools_min_version": "27.0.0", "extra-list": [ diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index c367898f9df2..8e5a6626dd10 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -93,6 +93,7 @@ ] }, "android": { + "cmdline-tools": "latest", "platform_min_version": "27", "build_tools_min_version": "27.0.0", "extra-list": [ From 0fec5d815224c1175b232db5beac4640b0270b94 Mon Sep 17 00:00:00 2001 From: Dusko Dobranic <101048884+ddobranic@users.noreply.github.com> Date: Tue, 31 May 2022 20:35:28 +0200 Subject: [PATCH 1195/3485] Fix PHP8.0.x version in software report (#5653) * Fix PHP8.0.x version in software report * Remove hardcoded value for epoch * Using updated regex to match epoch version --- images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 index 5941b309a8d2..bb5bda569490 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 @@ -236,7 +236,7 @@ function Get-SbtVersion { function Get-PHPVersions { $result = Get-CommandResult "apt list --installed" -Multiline return $result.Output | Where-Object { $_ -match "^php\d+\.\d+/"} | ForEach-Object { - $_ -match "now (?<version>\d+\.\d+\.\d+)-" | Out-Null + $_ -match "now (\d+:)?(?<version>\d+\.\d+\.\d+)-" | Out-Null $Matches.version } } From 36ddf7491f8887921d7033739fcca013d31f9399 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Wed, 1 Jun 2022 10:08:42 +0200 Subject: [PATCH 1196/3485] Remove ssh legacy fix for Ubuntu Server 22.04 (#5645) --- images.CI/linux-and-win/build-image.ps1 | 3 --- images/linux/scripts/base/configure-legacy-ssh.sh | 4 ---- images/linux/ubuntu2204.pkr.hcl | 6 ------ 3 files changed, 13 deletions(-) delete mode 100644 images/linux/scripts/base/configure-legacy-ssh.sh diff --git a/images.CI/linux-and-win/build-image.ps1 b/images.CI/linux-and-win/build-image.ps1 index 27b414d8fff3..932745d09f79 100644 --- a/images.CI/linux-and-win/build-image.ps1 +++ b/images.CI/linux-and-win/build-image.ps1 @@ -19,9 +19,6 @@ if (-not (Test-Path $TemplatePath)) exit 1 } -# Set Image repository path env variable, this is a workaround for Ubuntu 22.04 until this is fixed https://github.com/hashicorp/packer/issues/11733 -$env:ImageRepositoryPath = "." - $Image = [io.path]::GetFileName($TemplatePath).Split(".")[0] $TempResourceGroupName = "${ResourcesNamePrefix}_${Image}" $InstallPassword = [System.GUID]::NewGuid().ToString().ToUpper() diff --git a/images/linux/scripts/base/configure-legacy-ssh.sh b/images/linux/scripts/base/configure-legacy-ssh.sh deleted file mode 100644 index a59e9b7d41cd..000000000000 --- a/images/linux/scripts/base/configure-legacy-ssh.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -e -# https://github.com/hashicorp/packer/issues/11656 -echo PubkeyAcceptedKeyTypes=+ssh-rsa >> /etc/ssh/sshd_config -systemctl reload sshd.service \ No newline at end of file diff --git a/images/linux/ubuntu2204.pkr.hcl b/images/linux/ubuntu2204.pkr.hcl index 570629ed98cb..d21eb0d3b505 100644 --- a/images/linux/ubuntu2204.pkr.hcl +++ b/images/linux/ubuntu2204.pkr.hcl @@ -60,11 +60,6 @@ variable "image_os" { default = "ubuntu22" } -variable "image_repository_path" { - type = string - default = "${env("IMAGEREPOSITORYPATH")}" -} - variable "image_version" { type = string default = "dev" @@ -165,7 +160,6 @@ source "azure-arm" "build_vhd" { subscription_id = "${var.subscription_id}" temp_resource_group_name = "${var.temp_resource_group_name}" tenant_id = "${var.tenant_id}" - user_data_file = "${var.image_repository_path}/images/linux/scripts/base/configure-legacy-ssh.sh" virtual_network_name = "${var.virtual_network_name}" virtual_network_resource_group_name = "${var.virtual_network_resource_group_name}" virtual_network_subnet_name = "${var.virtual_network_subnet_name}" From d929386a18b7b275c6fe751b514cd2773eb4e7c2 Mon Sep 17 00:00:00 2001 From: AlexanderGitin <102294679+AlexanderGitin@users.noreply.github.com> Date: Wed, 1 Jun 2022 11:17:05 +0300 Subject: [PATCH 1197/3485] [Windows] Add Microsoft Reporting Services Projects support (#5485) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [Windows] Add Microsoft Reporting Services Projects support * Hardcode MSReport URL for VS2022 * Сhanged MSReport URL for VS2022 --- images/win/scripts/ImageHelpers/InstallHelpers.ps1 | 6 ++++++ images/win/toolsets/toolset-2022.json | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/images/win/scripts/ImageHelpers/InstallHelpers.ps1 b/images/win/scripts/ImageHelpers/InstallHelpers.ps1 index 6de28c6d0bb5..7d845621a21f 100644 --- a/images/win/scripts/ImageHelpers/InstallHelpers.ps1 +++ b/images/win/scripts/ImageHelpers/InstallHelpers.ps1 @@ -239,6 +239,12 @@ function Get-VsixExtenstionFromMarketplace { $request -match 'Microsoft\.VisualStudio\.Services\.Payload\.FileName":"(?<filename>[^"]*)' | Out-Null $fileName = $Matches.filename $downloadUri = $assetUri + "/" + $fileName + # ProBITools.MicrosoftReportProjectsforVisualStudio2022 has different URL https://github.com/actions/virtual-environments/issues/5340 + if ($ExtensionMarketPlaceName -eq "ProBITools.MicrosoftReportProjectsforVisualStudio2022") + { + $fileName = "Microsoft.DataTools.ReportingServices.vsix" + $downloadUri = "https://download.microsoft.com/download/b/b/5/bb57be7e-ae72-4fc0-b528-d0ec224997bd/Microsoft.DataTools.ReportingServices.vsix" + } return [PSCustomObject] @{ "ExtensionName" = $extensionName diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index 6d384e7f1d57..8a7e0bcf9bf7 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -266,7 +266,8 @@ ], "vsix": [ "VisualStudioClient.MicrosoftVisualStudio2022InstallerProjects", - "WixToolset.WixToolsetVisualStudio2022Extension" + "WixToolset.WixToolsetVisualStudio2022Extension", + "ProBITools.MicrosoftReportProjectsforVisualStudio2022" ] }, "docker": { From e27faa696e337c3bcf1c0d760e2875193e6c6179 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Wed, 1 Jun 2022 12:46:04 +0200 Subject: [PATCH 1198/3485] [Ubuntu] Do not add adoptopenjdk ppa to Ubuntu Server 22.04 (#5659) * Do not add adoptopenjdk ppa to Ubuntu Server 22.04 * typo fi --- images/linux/scripts/installers/java-tools.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/images/linux/scripts/installers/java-tools.sh b/images/linux/scripts/installers/java-tools.sh index b4567d96f629..d5ccd1c7c2a5 100644 --- a/images/linux/scripts/installers/java-tools.sh +++ b/images/linux/scripts/installers/java-tools.sh @@ -38,9 +38,11 @@ createJavaEnvironmentalVariable() { } enableRepositories() { - # Add Adopt PPA - wget -qO - "https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public" | apt-key add - - add-apt-repository --yes https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ + if isUbuntu18 || isUbuntu20; then + # Add Adopt PPA + wget -qO - "https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public" | apt-key add - + add-apt-repository --yes https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ + fi # Add Addoptium PPA wget -qO - "https://packages.adoptium.net/artifactory/api/gpg/key/public" | apt-key add - From 16f6912f370f47c8ecb000226c66c941e092fea3 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Wed, 1 Jun 2022 15:13:31 +0200 Subject: [PATCH 1199/3485] Add WDK on Windows Server 2022 (#5652) --- images/win/scripts/Installers/Install-WDK.ps1 | 12 ++++++-- .../SoftwareReport.VisualStudio.psm1 | 29 +++++++++---------- images/win/scripts/Tests/WDK.Tests.ps1 | 6 ++-- images/win/toolsets/toolset-2022.json | 5 ++++ images/win/windows2022.json | 1 + 5 files changed, 33 insertions(+), 20 deletions(-) diff --git a/images/win/scripts/Installers/Install-WDK.ps1 b/images/win/scripts/Installers/Install-WDK.ps1 index 139f50c13c13..1a6a32346520 100644 --- a/images/win/scripts/Installers/Install-WDK.ps1 +++ b/images/win/scripts/Installers/Install-WDK.ps1 @@ -4,7 +4,14 @@ ################################################################################ # Requires Windows SDK with the same version number as the WDK -if (Test-IsWin19) +if (Test-IsWin22) +{ + $winSdkUrl = "https://go.microsoft.com/fwlink/p/?linkid=2196241" + $wdkUrl = "https://go.microsoft.com/fwlink/?linkid=2196230" + $FilePath = "C:\Program Files (x86)\Windows Kits\10\Vsix\VS2022\*\WDK.vsix" + $VSver = "2022" +} +elseif (Test-IsWin19) { $winSdkUrl = "https://go.microsoft.com/fwlink/?linkid=2173743" $wdkUrl = "https://go.microsoft.com/fwlink/?linkid=2166289" @@ -20,7 +27,7 @@ elseif (Test-IsWin16) } else { - throw "Invalid version of Visual Studio is found. Either 2017 or 2019 are required" + throw "Invalid version of Visual Studio is found. Either 2017,2019 or 2022 are required" } $argumentList = ("/features", "+", "/quiet") @@ -32,6 +39,7 @@ Install-Binary -Url $winSdkUrl -Name "winsdksetup.exe" -ArgumentList $argumentLi Install-Binary -Url $wdkUrl -Name "wdksetup.exe" -ArgumentList $argumentList # Need to install the VSIX to get the build targets when running VSBuild +$FilePath = Resolve-Path -Path $FilePath Install-VsixExtension -FilePath $FilePath -Name "WDK.vsix" -VSversion $VSver -InstallOnly Invoke-PesterTests -TestFile "WDK" diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.VisualStudio.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.VisualStudio.psm1 index b085433c3297..f02e4ef84d99 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.VisualStudio.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.VisualStudio.psm1 @@ -53,29 +53,26 @@ function Get-VisualStudioExtensions { } # SDK - if (Test-IsWin19) { + if ((Test-IsWin19) -or (Test-IsWin22)) { $sdkPackageVersion = Get-SDKVersion $sdkPackages = @( @{Package = 'Windows Software Development Kit Extension'; Version = $sdkPackageVersion} ) } - if ((Test-IsWin16) -or (Test-IsWin19)) { - # Wix - $wixExtensionVersion = ($vsPackages | Where-Object {$_.Id -match 'WixToolset.VisualStudioExtension.Dev' -and $_.type -eq 'vsix'}).Version - $wixPackages = @( - @{Package = "WIX Toolset Studio $vs Extension"; Version = $wixExtensionVersion} - ) + # Wix + $wixExtensionVersion = ($vsPackages | Where-Object {$_.Id -match 'WixToolset.VisualStudioExtension.Dev' -and $_.type -eq 'vsix'}).Version + $wixPackages = @( + @{Package = "WIX Toolset Studio $vs Extension"; Version = $wixExtensionVersion} + ) - # WDK - $wdkPackageVersion = Get-VSExtensionVersion -packageName 'Microsoft.Windows.DriverKit' - $wdkExtensionVersion = Get-WDKVersion - $wdkPackages = @( - @{Package = 'Windows Driver Kit'; Version = $wdkPackageVersion} - @{Package = 'Windows Driver Kit Visual Studio Extension'; Version = $wdkExtensionVersion} - ) - } - + # WDK + $wdkPackageVersion = Get-VSExtensionVersion -packageName 'Microsoft.Windows.DriverKit' + $wdkExtensionVersion = Get-WDKVersion + $wdkPackages = @( + @{Package = 'Windows Driver Kit'; Version = $wdkPackageVersion} + @{Package = 'Windows Driver Kit Visual Studio Extension'; Version = $wdkExtensionVersion} + ) $extensions = @( $vsixs diff --git a/images/win/scripts/Tests/WDK.Tests.ps1 b/images/win/scripts/Tests/WDK.Tests.ps1 index 6c5dc32953c0..b12005dae985 100644 --- a/images/win/scripts/Tests/WDK.Tests.ps1 +++ b/images/win/scripts/Tests/WDK.Tests.ps1 @@ -1,6 +1,8 @@ -Describe "WDK" -Skip:(Test-IsWin22) { +Describe "WDK" { It "WDK exists" { - $WDKVersion = (Get-CimInstance -ClassName Win32_Product -Filter "Name = 'Windows Driver Kit'").Version + $regKey = "HKLM:\Software\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall\*" + $installedApplications = Get-ItemProperty -Path $regKey + $WDKVersion = $installedApplications | Where-Object DisplayName -eq 'Windows Driver Kit' | Select-Object -First 1 -ExpandProperty DisplayVersion $WDKVersion| Should -Not -BeNullOrEmpty } diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index 8a7e0bcf9bf7..a9a7127ebfe8 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -196,6 +196,7 @@ "Microsoft.VisualStudio.Component.TestTools.CodedUITest", "Microsoft.VisualStudio.Component.TestTools.WebLoadTest", "Microsoft.VisualStudio.Component.UWP.VC.ARM64", + "Microsoft.VisualStudio.Component.UWP.VC.ARM64EC", "Microsoft.VisualStudio.Component.VC.CLI.Support", "Microsoft.VisualStudio.Component.VC.CMake.Project", "Microsoft.VisualStudio.Component.VC.DiagnosticTools", @@ -211,9 +212,13 @@ "Microsoft.VisualStudio.Component.VC.MFC.ARM", "Microsoft.VisualStudio.Component.VC.MFC.ARM.Spectre", "Microsoft.VisualStudio.Component.VC.ATL.ARM64", + "Microsoft.VisualStudio.Component.VC.ATL.ARM64.Spectre", + "Microsoft.VisualStudio.Component.VC.ATL.ARM64EC", + "Microsoft.VisualStudio.Component.VC.ATL.ARM64EC.Spectre", "Microsoft.VisualStudio.Component.VC.MFC.ARM64", "Microsoft.VisualStudio.Component.VC.MFC.ARM64.Spectre", "Microsoft.VisualStudio.Component.VC.MFC.ARM64EC", + "Microsoft.VisualStudio.Component.VC.MFC.ARM64EC.Spectre", "Microsoft.VisualStudio.Component.VC.Modules.x86.x64", "Microsoft.VisualStudio.Component.VC.Tools.ARM64", "Microsoft.VisualStudio.Component.VC.Tools.ARM64EC", diff --git a/images/win/windows2022.json b/images/win/windows2022.json index a427e2399d56..703e4a1c9af7 100644 --- a/images/win/windows2022.json +++ b/images/win/windows2022.json @@ -174,6 +174,7 @@ "type": "powershell", "scripts": [ "{{ template_dir }}/scripts/Installers/Install-Wix.ps1", + "{{ template_dir }}/scripts/Installers/Install-WDK.ps1", "{{ template_dir }}/scripts/Installers/Install-Vsix.ps1", "{{ template_dir }}/scripts/Installers/Install-AzureCli.ps1", "{{ template_dir }}/scripts/Installers/Install-AzureDevOpsCli.ps1", From 6f162dda048fc5662d3843cbf4d7a5e4519d3a25 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Wed, 1 Jun 2022 16:27:13 +0200 Subject: [PATCH 1200/3485] Downgrade aws cli v1 to 1.24.10 (#5663) --- images/linux/scripts/installers/aws.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/images/linux/scripts/installers/aws.sh b/images/linux/scripts/installers/aws.sh index 0549180b7b59..784bd4314d95 100644 --- a/images/linux/scripts/installers/aws.sh +++ b/images/linux/scripts/installers/aws.sh @@ -10,8 +10,9 @@ source $HELPER_SCRIPTS/install.sh # Install the AWS CLI v1 Ubuntu18 and AWS CLI v2 on Ubuntu20, Ubuntu22 # The installation should be run after python3 is installed as aws-cli V1 dropped python2 support +# 1.25.0+ Dropped support for Python 3.6 - https://github.com/aws/aws-cli/blob/develop/CHANGELOG.rst if isUbuntu18 ; then - download_with_retries "https://s3.amazonaws.com/aws-cli/awscli-bundle.zip" "/tmp" "awscli-bundle.zip" + download_with_retries "https://s3.amazonaws.com/aws-cli/awscli-bundle-1.24.10.zip" "/tmp" "awscli-bundle.zip" unzip -qq /tmp/awscli-bundle.zip -d /tmp python3 /tmp/awscli-bundle/install -i /usr/local/aws -b /usr/local/bin/aws else From 5da9968af3c815220288b47091dbd1e8afdf317b Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Wed, 1 Jun 2022 23:49:17 +0400 Subject: [PATCH 1201/3485] Add platform field, rework some points (#5660) --- .github/ISSUE_TEMPLATE/announcement.yml | 8 ++++++-- .github/ISSUE_TEMPLATE/bug-report.yml | 14 ++++++++++++-- .github/ISSUE_TEMPLATE/tool-request.yml | 12 ++++++++---- 3 files changed, 26 insertions(+), 8 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/announcement.yml b/.github/ISSUE_TEMPLATE/announcement.yml index 08f3f7325e62..13cbb1f7cbe2 100644 --- a/.github/ISSUE_TEMPLATE/announcement.yml +++ b/.github/ISSUE_TEMPLATE/announcement.yml @@ -26,6 +26,12 @@ body: placeholder: Description of who might be impacted by this change validations: required: true + - type: checkboxes + attributes: + label: Platforms affected + options: + - label: Azure DevOps + - label: GitHub Actions - type: checkboxes attributes: label: Virtual environments affected @@ -38,8 +44,6 @@ body: - label: macOS 12 - label: Windows Server 2019 - label: Windows Server 2022 - validations: - required: true - type: textarea attributes: label: Mitigation ways diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml index e9aaf723dca8..9dad29ae9ada 100644 --- a/.github/ISSUE_TEMPLATE/bug-report.yml +++ b/.github/ISSUE_TEMPLATE/bug-report.yml @@ -8,6 +8,12 @@ body: description: A clear and concise description of what the bug is, and why you consider it to be a bug. validations: required: true + - type: checkboxes + attributes: + label: Platforms affected + options: + - label: Azure DevOps + - label: GitHub Actions - type: checkboxes attributes: label: Virtual environments affected @@ -20,8 +26,6 @@ body: - label: macOS 12 - label: Windows Server 2019 - label: Windows Server 2022 - validations: - required: true - type: textarea attributes: label: Image version and build link @@ -37,14 +41,20 @@ body: attributes: label: Is it regression? description: If yes, please, provide the latest image version where the issue didn't persist, and a link to the latest successful build. + validations: + required: true - type: textarea attributes: label: Expected behavior description: A description of what you expected to happen. + validations: + required: true - type: textarea attributes: label: Actual behavior description: A description of what is actually happening. + validations: + required: true - type: textarea attributes: label: Repro steps diff --git a/.github/ISSUE_TEMPLATE/tool-request.yml b/.github/ISSUE_TEMPLATE/tool-request.yml index b55b075a84fb..90eaea4c9bf0 100644 --- a/.github/ISSUE_TEMPLATE/tool-request.yml +++ b/.github/ISSUE_TEMPLATE/tool-request.yml @@ -44,12 +44,18 @@ body: label: URL for tool's homepage - type: textarea attributes: - label: Provide a basic test case to validate the tool's functionality. + label: Provide a basic test case to validate the tool's functionality. description: This will be automatically formatted into code. render: bash - type: checkboxes attributes: - label: Virtual environments affected + label: Platforms where you need the tool + options: + - label: Azure DevOps + - label: GitHub Actions + - type: checkboxes + attributes: + label: Virtual environments where you need the tool options: - label: Ubuntu 18.04 - label: Ubuntu 20.04 @@ -59,8 +65,6 @@ body: - label: macOS 12 - label: Windows Server 2019 - label: Windows Server 2022 - validations: - required: true - type: textarea attributes: label: Can this tool be installed during the build? From e9c9ab26f171a189a19e7162938584335f3d8c47 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Wed, 1 Jun 2022 23:50:20 +0400 Subject: [PATCH 1202/3485] Fix msedge driver output in readme (#5664) --- images/macos/software-report/SoftwareReport.Browsers.psm1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/macos/software-report/SoftwareReport.Browsers.psm1 b/images/macos/software-report/SoftwareReport.Browsers.psm1 index 7f6fdccc4a0f..72589c4ccffd 100644 --- a/images/macos/software-report/SoftwareReport.Browsers.psm1 +++ b/images/macos/software-report/SoftwareReport.Browsers.psm1 @@ -40,7 +40,7 @@ function Get-EdgeVersion { } function Get-EdgeDriverVersion { - return Run-Command "msedgedriver --version" | Take-Part -Part 0,1 + return Run-Command "msedgedriver --version" | Take-Part -Part 0,1,2,3 } function Get-FirefoxVersion { From a0452b1439aee3cc994f3e53da249522f8f15e0e Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Wed, 1 Jun 2022 21:56:32 +0200 Subject: [PATCH 1203/3485] [Ubuntu] add Android NDK 24 (#5670) --- images/linux/toolsets/toolset-1804.json | 4 ++-- images/linux/toolsets/toolset-2004.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index ba9bbcb84461..f6fb6e20cb1e 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -105,9 +105,9 @@ "cmake;3.18.1" ], "ndk": { - "default": "21", + "default": "23", "versions": [ - "21", "23" + "21", "23", "24" ] } }, diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index 92acdeca3d74..316a9e2b6c74 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -102,9 +102,9 @@ "cmake;3.18.1" ], "ndk": { - "default": "21", + "default": "23", "versions": [ - "21", "22", "23" + "21", "23", "24" ] } }, From 044a4394ad0a71f20bcf6edca64f8712863e3f17 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Wed, 1 Jun 2022 22:09:55 +0200 Subject: [PATCH 1204/3485] [Windows] Add Android NDK 24 (#5672) --- images/win/toolsets/toolset-2019.json | 4 ++-- images/win/toolsets/toolset-2022.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index 38c8d87aae6f..fb15f058279e 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -183,9 +183,9 @@ "patcher;v4" ], "ndk": { - "default": "21", + "default": "23", "versions": [ - "21", "22", "23" + "21", "23", "24" ] } }, diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index a9a7127ebfe8..d516ec905fea 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -153,9 +153,9 @@ "patcher;v4" ], "ndk": { - "default": "21", + "default": "23", "versions": [ - "21", "22", "23" + "21", "23", "24" ] } }, From ebef5188d064d107708def36f31b18a5c5d1c445 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Wed, 1 Jun 2022 23:00:09 +0200 Subject: [PATCH 1205/3485] [macOS] Add Android NDK 24 (#5671) --- images/macos/toolsets/toolset-10.15.json | 4 ++-- images/macos/toolsets/toolset-11.json | 4 ++-- images/macos/toolsets/toolset-12.json | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index a68e74eae733..7814909c63ef 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -179,9 +179,9 @@ "cmake;3.18.1" ], "ndk": { - "default": "21", + "default": "23", "versions": [ - "21", "22", "23" + "21", "23", "24" ] } }, diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index 07e54464a5a8..84f9bb4e84f7 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -177,9 +177,9 @@ "cmake;3.18.1" ], "ndk": { - "default": "21", + "default": "23", "versions": [ - "21", "22", "23" + "21", "23", "24" ] } }, diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index 8e5a6626dd10..0a1a53e6e169 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -104,9 +104,9 @@ "cmake;3.18.1" ], "ndk": { - "default": "21", + "default": "23", "versions": [ - "21", "22", "23" + "21", "23", "24" ] } }, From ee0e8358f22d5e37371d68d594209e1a83a7885b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 2 Jun 2022 06:20:49 +0000 Subject: [PATCH 1206/3485] macOS 12 (20220531 update) (#5662) * Updating readme file for macOS-12 version 20220531.1 * Add Microsoft Edge WebDriver 102.0.1245.2 Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-12-Readme.md | 72 +++++++++++++++++---------------- 1 file changed, 37 insertions(+), 35 deletions(-) diff --git a/images/macos/macos-12-Readme.md b/images/macos/macos-12-Readme.md index 2ec0588b48d5..8d94d90851f8 100644 --- a/images/macos/macos-12-Readme.md +++ b/images/macos/macos-12-Readme.md @@ -1,12 +1,13 @@ | Announcements | |-| -| [[all OSs] Android NDK 22 will be replaced in favor of 24, version 23 will be set as the default one](https://github.com/actions/virtual-environments/issues/5595) | +| [[macOS] Default Visual studio for mac will be changed to version 2022 for macOS 11&12 on May, 30](https://github.com/actions/virtual-environments/issues/5601) | +| [[all OSs] Android NDK 22 will be replaced in favor of 24, version 23 will be set as the default one on June, 6](https://github.com/actions/virtual-environments/issues/5595) | | [macOS 12 (Monterey) is available as a public beta in GitHub Actions and Azure DevOps](https://github.com/actions/virtual-environments/issues/5446) | *** # macOS 12.4 info - System Version: macOS 12.4 (21F79) - Kernel Version: Darwin 21.5.0 -- Image Version: 20220523.1 +- Image Version: 20220531.1 ## Installed Software ### Language and Runtime @@ -17,7 +18,7 @@ - gcc-11 (Homebrew GCC 11.3.0_1) 11.3.0 - available by `gcc-11` alias - GNU Fortran (Homebrew GCC 11.3.0_1) 11.3.0 - available by `gfortran-11` alias - Go 1.17.10 -- julia 1.7.2 +- julia 1.7.3 - Kotlin 1.6.21-release-334 - MSBuild 16.10.1.17201 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) - Node.js v16.15.0 @@ -39,10 +40,10 @@ - NPM 8.5.5 - NuGet 5.9.0.7134 - Pip 20.3.4 (python 2.7) -- Pip 22.1 (python 3.9) -- Pipx 1.0.0 +- Pip 22.1.1 (python 3.9) +- Pipx 1.1.0 - RubyGems 3.2.33 -- Vcpkg 2022 (build from master \<314018fef>) +- Vcpkg 2022 (build from master \<f78f4440d>) - Yarn 1.22.19 ### Project Management @@ -60,8 +61,8 @@ - bsdtar 3.5.1 - available by 'tar' alias - Curl 7.83.1 - Git 2.36.1 -- Git LFS: 3.1.4 -- GitHub CLI: 2.10.1 +- Git LFS: 3.2.0 +- GitHub CLI: 2.11.3 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.3 - gpg (GnuPG) 2.3.6 @@ -71,27 +72,28 @@ - mongo v5.0.7 - mongod v5.0.7 - OpenSSL 1.1.1o 3 May 2022 `(/usr/local/opt/openssl@1.1 -> ../Cellar/openssl@1.1/1.1.1o)` -- Packer 1.8.0 +- Packer 1.8.1 - PostgreSQL 14.3 - psql (PostgreSQL) 14.3 - Sox 14.4.2 - Subversion (SVN) 1.14.2 - Switchaudio-osx 1.1.0 -- yq (https://github.com/mikefarah/yq/) version 4.25.1 +- VirtualBox 6.1.34r150636 +- yq (https://github.com/mikefarah/yq/) version 4.25.2 - zstd 1.5.2 ### Tools - App Center CLI 2.10.10 -- AWS CLI 2.7.2 -- AWS SAM CLI 1.50.0 -- AWS Session Manager CLI 1.2.323.0 +- AWS CLI 2.7.4 +- AWS SAM CLI 1.51.0 +- AWS Session Manager CLI 1.2.331.0 - Azure CLI (azure-devops) 0.25.0 -- Azure CLI 2.36.0 +- Azure CLI 2.37.0 - Bicep CLI 0.6.18 - Cabal 3.6.2.0 -- Cmake 3.23.1 -- Fastlane 2.206.1 -- GHC 9.2.2 +- Cmake 3.23.2 +- Fastlane 2.206.2 +- GHC 9.2.3 - GHCup 0.1.17.8 - Jazzy 0.14.2 - Stack 2.7.5 @@ -106,18 +108,18 @@ ### Browsers - Safari 15.5 (17613.2.7.1.8) - SafariDriver 15.5 (17613.2.7.1.8) -- Google Chrome 101.0.4951.64 -- ChromeDriver 101.0.4951.41 -- Microsoft Edge 101.0.1210.53 -- MSEdgeDriver 101.0.1210.53 -- Mozilla Firefox 100.0.2 +- Google Chrome 102.0.5005.61 +- ChromeDriver 102.0.5005.61 +- Microsoft Edge 102.0.1245.30 +- Microsoft Edge WebDriver 102.0.1245.2 +- Mozilla Firefox 101.0 - geckodriver 0.31.0 -- Selenium server 4.1.4 +- Selenium server 4.2.0 #### Environment variables | Name | Value | | --------------- | ---------------------------------------------- | -| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/101.0.4951.41 | +| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/102.0.5005.61 | | EDGEWEBDRIVER | /usr/local/share/edge_driver | | GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | @@ -171,7 +173,7 @@ #### Packages - Bindgen 0.59.2 -- Cargo-audit 0.16.0 +- Cargo-audit 0.17.0 - Cargo-outdated 0.11.1 - Cbindgen 0.23.0 - Clippy 0.1.61 @@ -183,7 +185,7 @@ #### PowerShell Modules | Module | Version | | ---------------- | ------- | -| Az | 7.5.0 | +| Az | 8.0.0 | | MarkdownPS | 1.9 | | Pester | 5.3.3 | | PSScriptAnalyzer | 1.20.0 | @@ -195,11 +197,11 @@ | nginx | 1.21.6_1 | /usr/local/etc/nginx/nginx.conf | none | 80 | ### Xamarin -#### Visual Studio 2019 for Mac -- 8.10.23.7 - -#### Visual Studio 2022 for Mac -- 17.0.0.8989 +#### Visual Studio for Mac +| Version | Build | Path | +| -------------- | --------- | ------------------------------------ | +| 2019 | 8.10.23.7 | /Applications/Visual Studio 2019.app | +| 2022 (default) | 17.0.1.72 | /Applications/Visual Studio.app | #### Xamarin bundles | symlink | Xamarin.Mono | Xamarin.iOS | Xamarin.Mac | Xamarin.Android | @@ -274,16 +276,16 @@ ### Android | Package Name | Version | | -------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 4.0 | +| Android Command Line Tools | 7.0 | | Android Emulator | 31.2.10 | | Android SDK Build-tools | 32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | | Android SDK Platforms | android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | -| Android SDK Platform-Tools | 33.0.1 | +| Android SDK Platform-Tools | 33.0.2 | | Android Support Repository | 47.0.0 | | CMake | 3.18.1 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 21.4.7075529 (default)<br>22.1.7171670<br>23.1.7779620 | +| NDK | 21.4.7075529 (default)<br>22.1.7171670<br>23.2.8568313 | | SDK Patch Applier v4 | 1 | #### Environment variables @@ -291,7 +293,7 @@ | ----------------------- | -------------------------------------------------------------------------------------------------- | | ANDROID_HOME | /Users/runner/Library/Android/sdk | | ANDROID_NDK_HOME | /Users/runner/Library/Android/sdk/ndk-bundle -> /Users/runner/Library/Android/sdk/ndk/21.4.7075529 | -| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/23.1.7779620 | +| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/23.2.8568313 | | ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk-bundle -> /Users/runner/Library/Android/sdk/ndk/21.4.7075529 | | ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | From 3b183c64ee8c6d44c4283bcb428efaf1965b951b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 2 Jun 2022 08:37:00 +0000 Subject: [PATCH 1207/3485] Updating readme file for ubuntu22 version 20220601.2 (#5665) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2204-Readme.md | 130 +++++++++++++++++++----------- 1 file changed, 83 insertions(+), 47 deletions(-) diff --git a/images/linux/Ubuntu2204-Readme.md b/images/linux/Ubuntu2204-Readme.md index 8c6e7590cdbf..16658075ffc6 100644 --- a/images/linux/Ubuntu2204-Readme.md +++ b/images/linux/Ubuntu2204-Readme.md @@ -1,20 +1,22 @@ | Announcements | |-| -| [[Ubuntu] Container tools (buildah, podman, skopeo) will be removed from Ubuntu 18 & 20 images](https://github.com/actions/virtual-environments/issues/5578) | +| [[all OSs] Android NDK 22 will be replaced in favor of 24, version 23 will be set as the default one on June, 6](https://github.com/actions/virtual-environments/issues/5595) | | [(Public Beta) Ubuntu 22.04 is now available](https://github.com/actions/virtual-environments/issues/5490) | *** # Ubuntu 22.04 LTS -- Linux kernel version: 5.15.0-1005-azure -- Image Version: 20220522.1 +- Linux kernel version: 5.15.0-1007-azure +- Image Version: 20220601.2 ## Installed Software ### Language and Runtime - Bash 5.1.16(1)-release -- Clang 11.1.0, 12.0.1 -- Clang-format 11.1.0, 12.0.1 +- Clang 12.0.1, 13.0.1, 14.0.0 +- Clang-format 12.0.1, 13.0.1, 14.0.0 +- Clang-tidy 12.0.1, 13.0.1, 14.0.0 - GNU C++ 9.4.0, 10.3.0, 11.2.0 - GNU Fortran 9.4.0, 10.3.0, 11.2.0 -- Julia 1.7.2 +- Julia 1.7.3 +- Kotlin 1.6.21-release-334 - Node 16.15.0 - Perl 5.34.0 - Python 3.10.4 @@ -29,9 +31,9 @@ - Npm 8.5.5 - Pip 22.0.2 - Pip3 22.0.2 -- Pipx 1.0.0 +- Pipx 1.1.0 - RubyGems 3.3.5 -- Vcpkg (build from master \<314018fef>) +- Vcpkg (build from master \<f78f4440d>) - Yarn 1.22.18 #### Environment variables @@ -41,17 +43,17 @@ | VCPKG_INSTALLATION_ROOT | /usr/local/share/vcpkg | ### Project Management -- Lerna 4.0.0 +- Lerna 5.0.0 ### Tools -- Ansible 2.12.5 +- Ansible 2.12.6 - apt-fast 1.9.12 - AzCopy 10.15.0 (available by `azcopy` and `azcopy10` aliases) - Bazel 5.1.1 - Bazelisk 1.11.0 - Bicep 0.6.18 - Buildah 1.23.1 -- CMake 3.23.1 +- CMake 3.23.2 - CodeQL Action Bundle 2.9.2 - Docker Amazon ECR Credential Helper 0.6.0 - Docker Compose v1 1.29.2 @@ -59,16 +61,17 @@ - Docker-Buildx 0.8.2 - Docker-Moby Client 20.10.15+azure-1 - Docker-Moby Server 20.10.16+azure-2 -- Fastlane 2.206.1 +- Fastlane 2.206.2 - Git 2.36.1 (apt source repository: ppa:git-core/ppa) -- Git LFS 3.1.4 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) +- Git LFS 3.2.0 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.6.0 - Haveged 1.9.14 - Heroku 7.60.2 - jq 1.6 - Kind 0.14.0 -- Kubectl 1.24.0 +- Kubectl 1.24.1 - Kustomize 4.5.5 +- Leiningen 2.9.8 - MediaInfo 21.09 - Mercurial 6.1.1 - Minikube 1.25.2 @@ -76,33 +79,40 @@ - Newman 5.3.2 - nvm 0.39.1 - OpenSSL 3.0.2-0ubuntu1.2 -- Packer 1.8.0 -- Parcel 2.5.0 +- Packer 1.8.1 +- Parcel 2.6.0 - Podman 3.4.4 -- Pulumi 3.33.1 +- Pulumi 3.33.2 - R 4.2.0 - Skopeo 1.4.1 - Sphinx Open Source Search Server 2.2.11 - SVN 1.14.1 -- Terraform 1.2.0 +- Terraform 1.2.1 - yamllint 1.26.3 -- yq 4.25.1 +- yq 4.25.2 - zstd 1.5.2 (homebrew) ### CLI Tools -- Alibaba Cloud CLI 3.0.120 -- AWS CLI 2.7.2 -- AWS CLI Session manager plugin 1.2.323.0 -- AWS SAM CLI 1.50.0 -- Azure CLI (azure-cli) 2.36.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) +- Alibaba Cloud CLI 3.0.121 +- AWS CLI 2.7.4 +- AWS CLI Session manager plugin 1.2.331.0 +- AWS SAM CLI 1.51.0 +- Azure CLI (azure-cli) 2.37.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.25.0 -- GitHub CLI 2.10.1 +- GitHub CLI 2.11.3 - Google Cloud SDK 369.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 10.3.1 -- OpenShift CLI 4.10.14 +- Netlify CLI 10.4.0 +- OpenShift CLI 4.10.15 - ORAS CLI 0.12.0 -- Vercel CLI 24.2.4 +- Vercel CLI 24.2.5 + +### Java +| Version | Vendor | Environment Variable | +| -------------------- | --------------- | -------------------- | +| 8.0.332+9 | Eclipse Temurin | JAVA_HOME_8_X64 | +| 11.0.15+10 (default) | Eclipse Temurin | JAVA_HOME_11_X64 | +| 17.0.3+7 | Eclipse Temurin | JAVA_HOME_17_X64 | ### GraalVM | Version | Environment variables | @@ -120,7 +130,7 @@ ``` ### Haskell - Cabal 3.6.2.0 -- GHC 9.2.2 +- GHC 9.2.3 - GHCup 0.1.17.8 - Stack 2.7.5 @@ -132,23 +142,24 @@ #### Packages - Bindgen 0.59.2 -- Cargo audit 0.16.0 +- Cargo audit 0.17.0 - Cargo clippy 0.1.61 - Cargo outdated 0.11.1 - Cbindgen 0.23.0 - Rustfmt 1.4.38 ### Browsers and Drivers -- Google Chrome 101.0.4951.64 -- ChromeDriver 101.0.4951.41 -- Chromium 101.0.4951.0 +- Google Chrome 102.0.5005.61 +- ChromeDriver 102.0.5005.61 +- Chromium 102.0.5005.0 +- Selenium server 4.2.0 #### Environment variables -| Name | Value | -| ----------------- | ------------------------------ | -| CHROMEWEBDRIVER | /usr/local/share/chrome_driver | -| GECKOWEBDRIVER | | -| SELENIUM_JAR_PATH | | +| Name | Value | +| ----------------- | ----------------------------------- | +| CHROMEWEBDRIVER | /usr/local/share/chrome_driver | +| GECKOWEBDRIVER | | +| SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | ### .NET Core SDK - 6.0.300 @@ -222,19 +233,44 @@ | apache2 | 2.4.52 | /etc/apache2/apache2.conf | inactive | 80 | | nginx | 1.18.0 | /etc/nginx/nginx.conf | inactive | 80 | +### Android +| Package Name | Version | +| -------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 7.0 | +| Android Emulator | 31.2.10 | +| Android SDK Build-tools | 32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | +| Android SDK Platform-Tools | 33.0.2 | +| Android SDK Platforms | android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | +| Android SDK Tools | 26.1.1 | +| Android Support Repository | 47.0.0 | +| CMake | 3.10.2<br>3.18.1 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 21.4.7075529<br>23.2.8568313 (default)<br>24.0.8215888 | +| SDK Patch Applier v4 | 1 | + +#### Environment variables +| Name | Value | +| ----------------------- | ------------------------------------------------------------------------------------ | +| ANDROID_HOME | /usr/local/lib/android/sdk | +| ANDROID_NDK_HOME | /usr/local/lib/android/sdk/ndk-bundle -> /usr/local/lib/android/sdk/ndk/23.2.8568313 | +| ANDROID_NDK_LATEST_HOME | /usr/local/lib/android/sdk/ndk/24.0.8215888 | +| ANDROID_NDK_ROOT | /usr/local/lib/android/sdk/ndk-bundle -> /usr/local/lib/android/sdk/ndk/23.2.8568313 | +| ANDROID_SDK_ROOT | /usr/local/lib/android/sdk | + ### Cached Docker images | Repository:Tag | Digest | Created | | ----------------------- | ------------------------------------------------------------------------ | ---------- | | alpine:3.14 | sha256:06b5d462c92fc39303e6363c65e074559f8d6b1363250027ed5053557e3398c5 | 2022-04-05 | | alpine:3.15 | sha256:4edbd2beb5f78b1014028f4fbb99f3237d9561100b6881aabbf5acce2c4f9454 | 2022-04-05 | -| buildpack-deps:bullseye | sha256:f4369ea9e313fc97029c736d68a9ea705d14fd1884a70be33aae25196d59288b | 2022-05-11 | -| buildpack-deps:buster | sha256:3485150b7bd19da1e2ddbf567ee47c5ebd1ed62d55a334ff363a718057d713c3 | 2022-05-11 | -| debian:10 | sha256:405f48fbb359190809bd91aac79c3f6c346c1e79878c839351c6a817db5e9fc4 | 2022-05-11 | -| debian:11 | sha256:6137c67e2009e881526386c42ba99b3657e4f92f546814a33d35b14e60579777 | 2022-05-11 | +| buildpack-deps:bullseye | sha256:898c2264db514062f89391a9ae58e25bfcaa94d9fed04abf789a4abb53ee2fd6 | 2022-05-28 | +| buildpack-deps:buster | sha256:3a56627334c11ff56aa16fa7c8922cfc17d506fe41f9155e350b1e02edb0e77d | 2022-05-28 | +| debian:10 | sha256:e5b41ae2b4cf0d04b80cd2f89724e9cfc09e334ac64f188b9808929c748af526 | 2022-05-28 | +| debian:11 | sha256:3f1d6c17773a45c97bd8f158d665c9709d7b29ed7917ac934086ad96f92e4510 | 2022-05-28 | | moby/buildkit:latest | sha256:0dc312b04eac1b44cd2cad566deb1e886c753109208affbbec8384f381ff7f38 | 2022-05-06 | -| node:14 | sha256:42353ba2f129758dd5df19c6bcc3107d519436585467b231883b07f21336a484 | 2022-05-18 | +| node:14 | sha256:3324c688c0e98888f8938509f35356acf69a3e1f9f385d85f7e6086b137c17e3 | 2022-05-28 | | node:14-alpine | sha256:c9b8829068199346e2a9ae46f870bbb82ce44de6580321300bf3945d00dee0f1 | 2022-05-18 | -| node:16 | sha256:1817bb941c9a30fe2a6d75ff8675a8f6def408efe3d3ff43dbb006e2b534fa14 | 2022-05-11 | +| node:16 | sha256:59eb4e9d6a344ae1161e7d6d8af831cb50713cc631889a5a8c2d438d6ec6aa0f | 2022-05-28 | | node:16-alpine | sha256:1a9a71ea86aad332aa7740316d4111ee1bd4e890df47d3b5eff3e5bded3b3d10 | 2022-04-27 | | ubuntu:18.04 | sha256:d21b6ba9e19feffa328cb3864316e6918e30acfd55e285b5d3df1d8ca3c7fd3f | 2022-04-29 | | ubuntu:20.04 | sha256:47f14534bda344d9fe6ffd6effb95eefe579f4be0d508b7445cf77f61a0e5724 | 2022-04-29 | @@ -256,7 +292,7 @@ | curl | 7.81.0-1ubuntu1.2 | | dbus | 1.12.20-2ubuntu4 | | dnsutils | 1:9.18.1-1ubuntu1.1 | -| dpkg | 1.21.1ubuntu2 | +| dpkg | 1.21.1ubuntu2.1 | | fakeroot | 1.28-1ubuntu1 | | file | 1:5.41-3 | | flex | 2.6.4-8build2 | @@ -275,7 +311,7 @@ | libgbm-dev | 22.0.1-1ubuntu2 | | libgconf-2-4 | 3.2.6-7ubuntu2 | | libgsl-dev | 2.7.1+dfsg-3 | -| libgtk-3-0 | 3.24.33-1ubuntu1 | +| libgtk-3-0 | 3.24.33-1ubuntu2 | | libmagic-dev | 1:5.41-3 | | libmagickcore-dev | 8:6.9.11.60+dfsg-1.3build2 | | libmagickwand-dev | 8:6.9.11.60+dfsg-1.3build2 | @@ -308,7 +344,7 @@ | sqlite3 | 3.37.2-2 | | ssh | 1:8.9p1-3 | | sshpass | 1.09-1 | -| subversion | 1.14.1-3build4 | +| subversion | 1.14.1-3ubuntu0.22.04.1 | | sudo | 1.9.9-1ubuntu2 | | swig | 4.0.2-1ubuntu1 | | telnet | 0.17-44build1 | From 5e4e06dbc3d7adbc43f64daeb4b9dd897f10d8e4 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 2 Jun 2022 08:37:37 +0000 Subject: [PATCH 1208/3485] Ubuntu 18.04 (20220529 update) (#5650) * Updating readme file for ubuntu18 version 20220529.1 * Add php 8.0.19 Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu1804-Readme.md | 145 +++++++++++++++--------------- 1 file changed, 74 insertions(+), 71 deletions(-) diff --git a/images/linux/Ubuntu1804-Readme.md b/images/linux/Ubuntu1804-Readme.md index ccea3ad5265f..7cfe765bdfc5 100644 --- a/images/linux/Ubuntu1804-Readme.md +++ b/images/linux/Ubuntu1804-Readme.md @@ -1,24 +1,26 @@ | Announcements | |-| +| [[all OSs] Android NDK 22 will be replaced in favor of 24, version 23 will be set as the default one on June, 6](https://github.com/actions/virtual-environments/issues/5595) | | [(Public Beta) Ubuntu 22.04 is now available](https://github.com/actions/virtual-environments/issues/5490) | *** # Ubuntu 18.04.6 LTS -- Linux kernel version: 5.4.0-1078-azure -- Image Version: 20220515.1 +- Linux kernel version: 5.4.0-1080-azure +- Image Version: 20220529.1 ## Installed Software ### Language and Runtime - Bash 4.4.20(1)-release - Clang 9.0.0 - Clang-format 9.0.0 -- Erlang 24.3.3 (Eshell 12.3.1) +- Clang-tidy 9.0.0 +- Erlang 25.0 (Eshell 13.0) - Erlang rebar3 3.18.0 - GNU C++ 7.5.0, 9.4.0, 10.3.0 - GNU Fortran 7.5.0, 9.4.0, 10.3.0 -- Julia 1.7.2 +- Julia 1.7.3 - Kotlin 1.6.21-release-334 -- Mono 6.12.0.122 (apt source repository: https://download.mono-project.com/repo/ubuntu stable-bionic main) -- MSBuild 16.6.0.15201 (from /usr/lib/mono/msbuild/15.0/bin/MSBuild.dll) +- Mono 6.12.0.179 (apt source repository: https://download.mono-project.com/repo/ubuntu stable-bionic main) +- MSBuild 16.10.1.31701 (from /usr/lib/mono/msbuild/15.0/bin/MSBuild.dll) - Node 16.15.0 - Perl 5.26.1 - Python 2.7.17 @@ -28,15 +30,15 @@ ### Package Management - cpan 1.64 -- Helm 3.8.2 +- Helm 3.9.0 - Homebrew 3.4.11 -- Miniconda 4.11.0 +- Miniconda 4.12.0 - Npm 8.5.5 - Pip 9.0.1 - Pip3 9.0.1 - Pipx 1.0.0 - RubyGems 2.7.6 -- Vcpkg (build from master \<0cf5b4305>) +- Vcpkg (build from master \<d953973cf>) - Yarn 1.22.18 #### Environment variables @@ -52,30 +54,31 @@ - Sbt 1.6.2 ### Tools -- Ansible 2.11.11 +- Ansible 2.11.12 - apt-fast 1.9.12 - AzCopy 10.15.0 (available by `azcopy` and `azcopy10` aliases) - Bazel 5.1.1 - Bazelisk 1.11.0 - Bicep 0.6.18 -- Buildah 1.19.6 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- CMake 3.23.1 -- CodeQL Action Bundle 2.9.1 +- Buildah 1.22.3 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) +- CMake 3.23.2 +- CodeQL Action Bundle 2.9.2 +- Docker Amazon ECR Credential Helper 0.6.0 - Docker Compose v1 1.29.2 - Docker Compose v2 2.4.1+azure-1 - Docker-Buildx 0.8.2 -- Docker-Moby Client 20.10.15+azure-1 -- Docker-Moby Server 20.10.15+azure-2 +- Docker-Moby Client 20.10.16+azure-3 +- Docker-Moby Server 20.10.16+azure-2 - Git 2.36.1 (apt source repository: ppa:git-core/ppa) -- Git LFS 3.1.4 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) +- Git LFS 3.2.0 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.3.1 - Haveged 1.9.1 - Heroku 7.60.2 - HHVM (HipHop VM) 4.160.0 - jq 1.5 -- Kind 0.13.0 -- Kubectl 1.24.0 -- Kustomize 4.5.4 +- Kind 0.14.0 +- Kubectl 1.24.1 +- Kustomize 4.5.5 - Leiningen 2.9.8 - MediaInfo 17.12 - Mercurial 4.5.3 @@ -84,34 +87,34 @@ - Newman 5.3.2 - nvm 0.39.1 - OpenSSL 1.1.1-1ubuntu2.1~18.04.17 -- Packer 1.8.0 -- Parcel 2.5.0 +- Packer 1.8.1 +- Parcel 2.6.0 - PhantomJS 2.1.1 -- Podman 3.0.1 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- Pulumi 3.32.1 +- Podman 3.4.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) +- Pulumi 3.33.2 - R 4.2.0 -- Skopeo 1.2.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) +- Skopeo 1.5.0 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 - SVN 1.9.7 -- Terraform 1.1.9 +- Terraform 1.2.1 - yamllint 1.26.3 -- yq 4.25.1 +- yq 4.25.2 - zstd 1.5.2 (homebrew) ### CLI Tools -- Alibaba Cloud CLI 3.0.119 -- AWS CLI 1.24.0 -- AWS CLI Session manager plugin 1.2.312.0 +- Alibaba Cloud CLI 3.0.121 +- AWS CLI 1.24.10 +- AWS CLI Session manager plugin 1.2.331.0 - AWS SAM CLI 1.50.0 -- Azure CLI (azure-cli) 2.36.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) +- Azure CLI (azure-cli) 2.37.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.25.0 -- GitHub CLI 2.10.1 +- GitHub CLI 2.11.3 - Google Cloud SDK 369.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 10.3.1 -- OpenShift CLI 4.10.13 +- Netlify CLI 10.3.3 +- OpenShift CLI 4.10.15 - ORAS CLI 0.12.0 -- Vercel CLI 24.2.3 +- Vercel CLI 24.2.4 ### Java | Version | Vendor | Environment Variable | @@ -122,41 +125,41 @@ | 17.0.3+7 | Eclipse Temurin | JAVA_HOME_17_X64 | ### PHP -| Tool | Version | -| -------- | --------------------------------- | -| PHP | 7.2.34 7.3.33 7.4.29 8.0.18 8.1.5 | -| Composer | 2.3.5 | -| PHPUnit | 8.5.26 | +| Tool | Version | +| -------- | --------------------------- | +| PHP | 7.2.34 7.3.33 7.4.29 8.0.19 8.1.6 | +| Composer | 2.3.5 | +| PHPUnit | 8.5.26 | ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ``` ### Haskell - Cabal 3.6.2.0 -- GHC 9.2.2 +- GHC 9.2.3 - GHCup 0.1.17.8 - Stack 2.7.5 ### Rust Tools -- Cargo 1.60.0 -- Rust 1.60.0 -- Rustdoc 1.60.0 +- Cargo 1.61.0 +- Rust 1.61.0 +- Rustdoc 1.61.0 - Rustup 1.24.3 #### Packages - Bindgen 0.59.2 -- Cargo audit 0.16.0 -- Cargo clippy 0.1.60 -- Cargo outdated +- Cargo audit 0.17.0 +- Cargo clippy 0.1.61 +- Cargo outdated 0.11.1 - Cbindgen 0.23.0 - Rustfmt 1.4.38 ### Browsers and Drivers -- Google Chrome 101.0.4951.64 -- ChromeDriver 101.0.4951.41 -- Chromium 101.0.4951.0 -- Mozilla Firefox 100.0 +- Google Chrome 102.0.5005.61 +- ChromeDriver 102.0.5005.61 +- Chromium 102.0.5005.0 +- Selenium server 4.2.0 +- Mozilla Firefox 100.0.2 - Geckodriver 0.31.0 -- Selenium server 4.1.0 #### Environment variables | Name | Value | @@ -169,7 +172,7 @@ - 3.1.120 3.1.202 3.1.302 3.1.419 5.0.104 5.0.214 5.0.303 5.0.408 6.0.300 ### .NET tools -- nbgv 3.5.104+d0b7c362ff +- nbgv 3.5.107+6463ef6068 ### Databases - MongoDB 5.0.8 (apt source repository: https://repo.mongodb.org/apt/ubuntu) @@ -191,7 +194,7 @@ ``` #### MS SQL Server Client Tools - sqlcmd 17.9.0001.1 -- SqlPackage 16.0.5400.1 +- SqlPackage 16.0.6161.0 ### Cached Tools #### Go @@ -201,7 +204,7 @@ #### Node.js - 12.22.12 -- 14.19.2 +- 14.19.3 - 16.15.0 #### PyPy @@ -214,7 +217,7 @@ - 3.6.15 - 3.7.13 - 3.8.12 -- 3.9.12 +- 3.9.13 - 3.10.4 #### Ruby @@ -233,7 +236,7 @@ | GOROOT_1_18_X64 | /opt/hostedtoolcache/go/1.18.2/x64 | x64 | ### PowerShell Tools -- PowerShell 7.2.3 +- PowerShell 7.2.4 #### PowerShell Modules | Module | Version | @@ -257,7 +260,7 @@ | Android Command Line Tools | 4.0 | | Android Emulator | 31.2.10 | | Android SDK Build-tools | 32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3<br>26.0.0 26.0.1 26.0.2 26.0.3<br>25.0.0 25.0.1 25.0.2 25.0.3<br>24.0.0 24.0.1 24.0.2 24.0.3<br>23.0.1 23.0.2 23.0.3 | -| Android SDK Platform-Tools | 33.0.1 | +| Android SDK Platform-Tools | 33.0.2 | | Android SDK Platforms | android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3)<br>android-26 (rev 2)<br>android-25 (rev 3)<br>android-24 (rev 2)<br>android-23 (rev 3) | | Android SDK Tools | 26.1.1 | | Android Support Repository | 47.0.0 | @@ -265,7 +268,7 @@ | Google APIs | addon-google_apis-google-21<br>addon-google_apis-google-22<br>addon-google_apis-google-23<br>addon-google_apis-google-24 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 21.4.7075529 (default)<br>23.1.7779620 | +| NDK | 21.4.7075529 (default)<br>23.2.8568313 | | SDK Patch Applier v4 | 1 | #### Environment variables @@ -273,7 +276,7 @@ | ----------------------- | ------------------------------------------------------------------------------------ | | ANDROID_HOME | /usr/local/lib/android/sdk | | ANDROID_NDK_HOME | /usr/local/lib/android/sdk/ndk-bundle -> /usr/local/lib/android/sdk/ndk/21.4.7075529 | -| ANDROID_NDK_LATEST_HOME | /usr/local/lib/android/sdk/ndk/23.1.7779620 | +| ANDROID_NDK_LATEST_HOME | /usr/local/lib/android/sdk/ndk/23.2.8568313 | | ANDROID_NDK_ROOT | /usr/local/lib/android/sdk/ndk-bundle -> /usr/local/lib/android/sdk/ndk/21.4.7075529 | | ANDROID_SDK_ROOT | /usr/local/lib/android/sdk | @@ -283,18 +286,18 @@ | alpine:3.12 | sha256:c75ac27b49326926b803b9ed43bf088bc220d22556de1bc5f72d742c91398f69 | 2022-04-05 | | alpine:3.13 | sha256:ccf92aa53bc6c3b25be2ad0cce80baec1778f007f7e076b0ffbd1b225d0b3a9b | 2022-04-05 | | alpine:3.14 | sha256:06b5d462c92fc39303e6363c65e074559f8d6b1363250027ed5053557e3398c5 | 2022-04-05 | -| buildpack-deps:bullseye | sha256:f4369ea9e313fc97029c736d68a9ea705d14fd1884a70be33aae25196d59288b | 2022-05-11 | -| buildpack-deps:buster | sha256:3485150b7bd19da1e2ddbf567ee47c5ebd1ed62d55a334ff363a718057d713c3 | 2022-05-11 | -| buildpack-deps:stretch | sha256:1929159d9dfd9fc9cc8f6fb0c8414452ec4613b824e152b87e24de9a6e3b5879 | 2022-05-11 | -| debian:10 | sha256:405f48fbb359190809bd91aac79c3f6c346c1e79878c839351c6a817db5e9fc4 | 2022-05-11 | -| debian:11 | sha256:6137c67e2009e881526386c42ba99b3657e4f92f546814a33d35b14e60579777 | 2022-05-11 | -| debian:9 | sha256:3487fb8dc9312f88dd4aa03364c15d98a998c5c7c3453f0469002f9d593916f6 | 2022-05-11 | +| buildpack-deps:bullseye | sha256:898c2264db514062f89391a9ae58e25bfcaa94d9fed04abf789a4abb53ee2fd6 | 2022-05-28 | +| buildpack-deps:buster | sha256:3a56627334c11ff56aa16fa7c8922cfc17d506fe41f9155e350b1e02edb0e77d | 2022-05-28 | +| buildpack-deps:stretch | sha256:a87bd91f037696862c341a73f6607cfb5d462ffcec16de34f59bab0f21b61868 | 2022-05-28 | +| debian:10 | sha256:e5b41ae2b4cf0d04b80cd2f89724e9cfc09e334ac64f188b9808929c748af526 | 2022-05-28 | +| debian:11 | sha256:3f1d6c17773a45c97bd8f158d665c9709d7b29ed7917ac934086ad96f92e4510 | 2022-05-28 | +| debian:9 | sha256:22cb208880101b9a665332a9360ba4c5c021e3ed2f791638369e9a9418dac981 | 2022-05-28 | | moby/buildkit:latest | sha256:0dc312b04eac1b44cd2cad566deb1e886c753109208affbbec8384f381ff7f38 | 2022-05-06 | | node:12 | sha256:01627afeb110b3054ba4a1405541ca095c8bfca1cb6f2be9479c767a2711879e | 2022-04-20 | | node:12-alpine | sha256:d4b15b3d48f42059a15bd659be60afe21762aae9d6cbea6f124440895c27db68 | 2022-04-11 | -| node:14 | sha256:61168c39af89331ffaa6ba41c2a44f4d5132a857a6034175f994948b5798b588 | 2022-05-11 | -| node:14-alpine | sha256:8845b4f88f64f8c56a39236648ba22946e806a6153c10911f77b70e5a2edb4ca | 2022-04-05 | -| node:16 | sha256:1817bb941c9a30fe2a6d75ff8675a8f6def408efe3d3ff43dbb006e2b534fa14 | 2022-05-11 | +| node:14 | sha256:3324c688c0e98888f8938509f35356acf69a3e1f9f385d85f7e6086b137c17e3 | 2022-05-28 | +| node:14-alpine | sha256:c9b8829068199346e2a9ae46f870bbb82ce44de6580321300bf3945d00dee0f1 | 2022-05-18 | +| node:16 | sha256:59eb4e9d6a344ae1161e7d6d8af831cb50713cc631889a5a8c2d438d6ec6aa0f | 2022-05-28 | | node:16-alpine | sha256:1a9a71ea86aad332aa7740316d4111ee1bd4e890df47d3b5eff3e5bded3b3d10 | 2022-04-27 | | ubuntu:16.04 | sha256:20858ebbc96215d6c3c574f781133ebffdc7c18d98af4f294cc4c04871a6fe61 | 2021-08-31 | | ubuntu:18.04 | sha256:d21b6ba9e19feffa328cb3864316e6918e30acfd55e285b5d3df1d8ca3c7fd3f | 2022-04-29 | @@ -315,7 +318,7 @@ | curl | 7.58.0-2ubuntu3.18 | | dbus | 1.12.2-1ubuntu1.3 | | dnsutils | 1:9.11.3+dfsg-1ubuntu1.17 | -| dpkg | 1.19.0.5ubuntu2.3 | +| dpkg | 1.19.0.5ubuntu2.4 | | fakeroot | 1.22-2ubuntu1 | | file | 1:5.32-2ubuntu0.4 | | flex | 2.6.4-6 | @@ -343,7 +346,7 @@ | libunwind8 | 1.2.1-8 | | libxkbfile-dev | 1:1.0.9-2 | | libxss1 | 1:1.2.2-1 | -| locales | 2.27-3ubuntu1.5 | +| locales | 2.27-3ubuntu1.6 | | m4 | 1.4.18-1 | | mediainfo | 17.12-1 | | mercurial | 4.5.3-1ubuntu2.2 | @@ -365,7 +368,7 @@ | sqlite3 | 3.22.0-1ubuntu0.5 | | ssh | 1:7.6p1-4ubuntu0.7 | | sshpass | 1.06-1 | -| subversion | 1.9.7-4ubuntu1 | +| subversion | 1.9.7-4ubuntu1.1 | | sudo | 1.8.21p2-3ubuntu1.4 | | swig | 3.0.12-1 | | telnet | 0.17-41 | From 51480d45733fb8e915d05e3269c14ef1ba09a39f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 2 Jun 2022 09:31:59 +0000 Subject: [PATCH 1209/3485] Updating readme file for macOS-11 version 20220530.2 (#5673) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-11-Readme.md | 112 ++++++++++++++++---------------- 1 file changed, 57 insertions(+), 55 deletions(-) diff --git a/images/macos/macos-11-Readme.md b/images/macos/macos-11-Readme.md index b508af3bbb6e..740ef3534f8a 100644 --- a/images/macos/macos-11-Readme.md +++ b/images/macos/macos-11-Readme.md @@ -1,13 +1,13 @@ | Announcements | |-| | [[macOS] Default Visual studio for mac will be changed to version 2022 for macOS 11&12 on May, 30](https://github.com/actions/virtual-environments/issues/5601) | -| [[all OSs] Android NDK 22 will be replaced in favor of 24, version 23 will be set as the default one](https://github.com/actions/virtual-environments/issues/5595) | +| [[all OSs] Android NDK 22 will be replaced in favor of 24, version 23 will be set as the default one on June, 6](https://github.com/actions/virtual-environments/issues/5595) | | [macOS 12 (Monterey) is available as a public beta in GitHub Actions and Azure DevOps](https://github.com/actions/virtual-environments/issues/5446) | *** # macOS 11.6 info - System Version: macOS 11.6.6 (20G624) - Kernel Version: Darwin 20.6.0 -- Image Version: 20220523.2 +- Image Version: 20220530.2 ## Installed Software ### Language and Runtime @@ -15,14 +15,14 @@ - Bash 3.2.57(1)-release - Clang/LLVM 13.0.0 is default - Clang/LLVM 13.0.1 is available on `'$(brew --prefix llvm)/bin/clang'` -- gcc-9 (Homebrew GCC 9.4.0) 9.4.0 - available by `gcc-9` alias +- gcc-9 (Homebrew GCC 9.5.0) 9.5.0 - available by `gcc-9` alias - gcc-10 (Homebrew GCC 10.3.0) 10.3.0 - available by `gcc-10` alias - gcc-11 (Homebrew GCC 11.3.0_1) 11.3.0 - available by `gcc-11` alias -- GNU Fortran (Homebrew GCC 9.4.0) 9.4.0 - available by `gfortran-9` alias +- GNU Fortran (Homebrew GCC 9.5.0) 9.5.0 - available by `gfortran-9` alias - GNU Fortran (Homebrew GCC 10.3.0) 10.3.0 - available by `gfortran-10` alias - GNU Fortran (Homebrew GCC 11.3.0_1) 11.3.0 - available by `gfortran-11` alias - Go 1.17.10 -- julia 1.7.2 +- julia 1.7.3 - Kotlin 1.6.21-release-334 - MSBuild 16.10.1.17201 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) - Node.js v16.15.0 @@ -45,10 +45,10 @@ - NPM 8.5.5 - NuGet 5.9.0.7134 - Pip 20.3.4 (python 2.7) -- Pip 22.1 (python 3.9) -- Pipx 1.0.0 +- Pip 22.1.1 (python 3.9) +- Pipx 1.1.0 - RubyGems 3.2.33 -- Vcpkg 2022 (build from master \<840f701d8>) +- Vcpkg 2022 (build from master \<d953973cf>) - Yarn 1.22.19 #### Environment variables @@ -72,8 +72,8 @@ - bsdtar 3.3.2 - available by 'tar' alias - Curl 7.83.1 - Git 2.36.1 -- Git LFS: 3.1.4 -- GitHub CLI: 2.10.1 +- Git LFS: 3.2.0 +- GitHub CLI: 2.11.3 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.3 - gpg (GnuPG) 2.3.6 @@ -85,28 +85,28 @@ - mongod v5.0.7 - Newman 5.3.2 - OpenSSL 1.1.1o 3 May 2022 `(/usr/local/opt/openssl@1.1 -> ../Cellar/openssl@1.1/1.1.1o)` -- Packer 1.8.0 +- Packer 1.8.1 - PostgreSQL 14.3 - psql (PostgreSQL) 14.3 - Sox 14.4.2 - Subversion (SVN) 1.14.2 - Switchaudio-osx 1.1.0 -- yq (https://github.com/mikefarah/yq/) version 4.25.1 +- yq (https://github.com/mikefarah/yq/) version 4.25.2 - zstd 1.5.2 ### Tools -- Aliyun CLI 3.0.119 +- Aliyun CLI 3.0.121 - App Center CLI 2.10.10 -- AWS CLI 2.7.2 +- AWS CLI 2.7.4 - AWS SAM CLI 1.50.0 -- AWS Session Manager CLI 1.2.323.0 +- AWS Session Manager CLI 1.2.331.0 - Azure CLI (azure-devops) 0.25.0 -- Azure CLI 2.36.0 +- Azure CLI 2.37.0 - Bicep CLI 0.6.18 - Cabal 3.6.2.0 -- Cmake 3.23.1 -- Fastlane 2.206.1 -- GHC 9.2.2 +- Cmake 3.23.2 +- Fastlane 2.206.2 +- GHC 9.2.3 - GHCup 0.1.17.8 - Jazzy 0.14.2 - Stack 2.7.5 @@ -121,18 +121,18 @@ ### Browsers - Safari 15.5 (16613.2.7.1.9) - SafariDriver 15.5 (16613.2.7.1.9) -- Google Chrome 101.0.4951.64 -- ChromeDriver 101.0.4951.41 +- Google Chrome 102.0.5005.61 +- ChromeDriver 102.0.5005.61 - Microsoft Edge 101.0.1210.53 - MSEdgeDriver 101.0.1210.53 - Mozilla Firefox 100.0.2 - geckodriver 0.31.0 -- Selenium server 4.1.4 +- Selenium server 4.2.0 #### Environment variables | Name | Value | | --------------- | ---------------------------------------------- | -| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/101.0.4951.41 | +| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/102.0.5005.61 | | EDGEWEBDRIVER | /usr/local/share/edge_driver | | GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | @@ -201,7 +201,7 @@ #### PowerShell Modules | Module | Version | | ---------------- | ------- | -| Az | 7.5.0 | +| Az | 8.0.0 | | MarkdownPS | 1.9 | | Pester | 5.3.3 | | PSScriptAnalyzer | 1.20.0 | @@ -213,8 +213,11 @@ | nginx | 1.21.6_1 | /usr/local/etc/nginx/nginx.conf | none | 80 | ### Xamarin -#### Visual Studio 2019 for Mac -- 8.10.23.7 +#### Visual Studio for Mac +| Version | Build | Path | +| -------------- | ----------- | ------------------------------------ | +| 2019 | 8.10.23.7 | /Applications/Visual Studio 2019.app | +| 2022 (default) | 17.0.0.8989 | /Applications/Visual Studio.app | #### Xamarin bundles | symlink | Xamarin.Mono | Xamarin.iOS | Xamarin.Mac | Xamarin.Android | @@ -244,7 +247,6 @@ | Version | Build | Path | | ---------------- | -------- | ------------------------------ | | 13.2.1 (default) | 13C100 | /Applications/Xcode_13.2.1.app | -| 13.2 | 13C90 | /Applications/Xcode_13.2.app | | 13.1 | 13A1030d | /Applications/Xcode_13.1.app | | 13.0 | 13A233 | /Applications/Xcode_13.0.app | | 12.5.1 | 12E507 | /Applications/Xcode_12.5.1.app | @@ -264,61 +266,61 @@ | macOS 11.1 | macosx11.1 | 12.4 | | macOS 11.3 | macosx11.3 | 12.5.1, 13.0 | | macOS 12.0 | macosx12.0 | 13.1 | -| macOS 12.1 | macosx12.1 | 13.2, 13.2.1 | +| macOS 12.1 | macosx12.1 | 13.2.1 | | iOS 13.7 | iphoneos13.7 | 11.7 | | iOS 14.4 | iphoneos14.4 | 12.4 | | iOS 14.5 | iphoneos14.5 | 12.5.1 | | iOS 15.0 | iphoneos15.0 | 13.0, 13.1 | -| iOS 15.2 | iphoneos15.2 | 13.2, 13.2.1 | +| iOS 15.2 | iphoneos15.2 | 13.2.1 | | Simulator - iOS 13.7 | iphonesimulator13.7 | 11.7 | | Simulator - iOS 14.4 | iphonesimulator14.4 | 12.4 | | Simulator - iOS 14.5 | iphonesimulator14.5 | 12.5.1 | | Simulator - iOS 15.0 | iphonesimulator15.0 | 13.0, 13.1 | -| Simulator - iOS 15.2 | iphonesimulator15.2 | 13.2, 13.2.1 | +| Simulator - iOS 15.2 | iphonesimulator15.2 | 13.2.1 | | tvOS 13.4 | appletvos13.4 | 11.7 | | tvOS 14.3 | appletvos14.3 | 12.4 | | tvOS 14.5 | appletvos14.5 | 12.5.1 | | tvOS 15.0 | appletvos15.0 | 13.0, 13.1 | -| tvOS 15.2 | appletvos15.2 | 13.2, 13.2.1 | +| tvOS 15.2 | appletvos15.2 | 13.2.1 | | Simulator - tvOS 13.4 | appletvsimulator13.4 | 11.7 | | Simulator - tvOS 14.3 | appletvsimulator14.3 | 12.4 | | Simulator - tvOS 14.5 | appletvsimulator14.5 | 12.5.1 | | Simulator - tvOS 15.0 | appletvsimulator15.0 | 13.0, 13.1 | -| Simulator - tvOS 15.2 | appletvsimulator15.2 | 13.2, 13.2.1 | +| Simulator - tvOS 15.2 | appletvsimulator15.2 | 13.2.1 | | watchOS 6.2 | watchos6.2 | 11.7 | | watchOS 7.2 | watchos7.2 | 12.4 | | watchOS 7.4 | watchos7.4 | 12.5.1 | | watchOS 8.0 | watchos8.0 | 13.0, 13.1 | -| watchOS 8.3 | watchos8.3 | 13.2, 13.2.1 | +| watchOS 8.3 | watchos8.3 | 13.2.1 | | Simulator - watchOS 6.2 | watchsimulator6.2 | 11.7 | | Simulator - watchOS 7.2 | watchsimulator7.2 | 12.4 | | Simulator - watchOS 7.4 | watchsimulator7.4 | 12.5.1 | | Simulator - watchOS 8.0 | watchsimulator8.0 | 13.0, 13.1 | -| Simulator - watchOS 8.3 | watchsimulator8.3 | 13.2, 13.2.1 | +| Simulator - watchOS 8.3 | watchsimulator8.3 | 13.2.1 | | DriverKit 19.0 | driverkit.macosx19.0 | 11.7 | | DriverKit 20.2 | driverkit.macosx20.2 | 12.4 | | DriverKit 20.4 | driverkit.macosx20.4 | 12.5.1, 13.0 | | DriverKit 21.0.1 | driverkit21.0.1 | 13.1 | -| DriverKit 21.2 | driverkit21.2 | 13.2, 13.2.1 | +| DriverKit 21.2 | driverkit21.2 | 13.2.1 | #### Installed Simulators -| OS | Xcode Version | Simulators | -| ----------- | -------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| iOS 13.7 | 11.7 | iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (7th generation)<br>iPad Air (3rd generation)<br>iPad Pro (11-inch) (2nd generation)<br>iPad Pro (12.9-inch) (4th generation)<br>iPad Pro (9.7-inch) | -| iOS 14.4 | 12.4 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (7th generation)<br>iPad (8th generation)<br>iPad Air (3rd generation)<br>iPad Air (4th generation)<br>iPad Pro (11-inch) (2nd generation)<br>iPad Pro (12.9-inch) (4th generation)<br>iPad Pro (9.7-inch) | -| iOS 14.5 | 12.5.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (7th generation)<br>iPad (8th generation)<br>iPad Air (3rd generation)<br>iPad Air (4th generation)<br>iPad Pro (11-inch) (2nd generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (4th generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | -| iOS 15.0 | 13.0<br>13.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (7th generation)<br>iPad (8th generation)<br>iPad (9th generation)<br>iPad Air (3rd generation)<br>iPad Air (4th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (2nd generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (4th generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | -| iOS 15.2 | 13.2<br>13.2.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (7th generation)<br>iPad (8th generation)<br>iPad (9th generation)<br>iPad Air (3rd generation)<br>iPad Air (4th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (2nd generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (4th generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | -| tvOS 13.4 | 11.7 | Apple TV<br>Apple TV 4K<br>Apple TV 4K (at 1080p) | -| tvOS 14.3 | 12.4 | Apple TV<br>Apple TV 4K<br>Apple TV 4K (at 1080p) | -| tvOS 14.5 | 12.5.1 | Apple TV<br>Apple TV 4K<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p)<br>Apple TV 4K (at 1080p) (2nd generation) | -| tvOS 15.0 | 13.0<br>13.1 | Apple TV<br>Apple TV 4K<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p)<br>Apple TV 4K (at 1080p) (2nd generation) | -| tvOS 15.2 | 13.2<br>13.2.1 | Apple TV<br>Apple TV 4K<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p)<br>Apple TV 4K (at 1080p) (2nd generation) | -| watchOS 6.2 | 11.7 | Apple Watch Series 4 - 40mm<br>Apple Watch Series 4 - 44mm<br>Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm | -| watchOS 7.2 | 12.4 | Apple Watch Series 4 - 40mm<br>Apple Watch Series 4 - 44mm<br>Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm | -| watchOS 7.4 | 12.5.1 | Apple Watch Series 4 - 40mm<br>Apple Watch Series 4 - 44mm<br>Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm | -| watchOS 8.0 | 13.0<br>13.1 | Apple Watch Series 4 - 40mm<br>Apple Watch Series 4 - 44mm<br>Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | -| watchOS 8.3 | 13.2<br>13.2.1 | Apple Watch Series 4 - 40mm<br>Apple Watch Series 4 - 44mm<br>Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | +| OS | Xcode Version | Simulators | +| ----------- | ------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| iOS 13.7 | 11.7 | iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (7th generation)<br>iPad Air (3rd generation)<br>iPad Pro (11-inch) (2nd generation)<br>iPad Pro (12.9-inch) (4th generation)<br>iPad Pro (9.7-inch) | +| iOS 14.4 | 12.4 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (7th generation)<br>iPad (8th generation)<br>iPad Air (3rd generation)<br>iPad Air (4th generation)<br>iPad Pro (11-inch) (2nd generation)<br>iPad Pro (12.9-inch) (4th generation)<br>iPad Pro (9.7-inch) | +| iOS 14.5 | 12.5.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (7th generation)<br>iPad (8th generation)<br>iPad Air (3rd generation)<br>iPad Air (4th generation)<br>iPad Pro (11-inch) (2nd generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (4th generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | +| iOS 15.0 | 13.0<br>13.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (7th generation)<br>iPad (8th generation)<br>iPad (9th generation)<br>iPad Air (3rd generation)<br>iPad Air (4th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (2nd generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (4th generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | +| iOS 15.2 | 13.2.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (7th generation)<br>iPad (8th generation)<br>iPad (9th generation)<br>iPad Air (3rd generation)<br>iPad Air (4th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (2nd generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (4th generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | +| tvOS 13.4 | 11.7 | Apple TV<br>Apple TV 4K<br>Apple TV 4K (at 1080p) | +| tvOS 14.3 | 12.4 | Apple TV<br>Apple TV 4K<br>Apple TV 4K (at 1080p) | +| tvOS 14.5 | 12.5.1 | Apple TV<br>Apple TV 4K<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p)<br>Apple TV 4K (at 1080p) (2nd generation) | +| tvOS 15.0 | 13.0<br>13.1 | Apple TV<br>Apple TV 4K<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p)<br>Apple TV 4K (at 1080p) (2nd generation) | +| tvOS 15.2 | 13.2.1 | Apple TV<br>Apple TV 4K<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p)<br>Apple TV 4K (at 1080p) (2nd generation) | +| watchOS 6.2 | 11.7 | Apple Watch Series 4 - 40mm<br>Apple Watch Series 4 - 44mm<br>Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm | +| watchOS 7.2 | 12.4 | Apple Watch Series 4 - 40mm<br>Apple Watch Series 4 - 44mm<br>Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm | +| watchOS 7.4 | 12.5.1 | Apple Watch Series 4 - 40mm<br>Apple Watch Series 4 - 44mm<br>Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm | +| watchOS 8.0 | 13.0<br>13.1 | Apple Watch Series 4 - 40mm<br>Apple Watch Series 4 - 44mm<br>Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | +| watchOS 8.3 | 13.2.1 | Apple Watch Series 4 - 40mm<br>Apple Watch Series 4 - 44mm<br>Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | ### Android | Package Name | Version | @@ -327,12 +329,12 @@ | Android Emulator | 31.2.10 | | Android SDK Build-tools | 32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | | Android SDK Platforms | android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | -| Android SDK Platform-Tools | 33.0.1 | +| Android SDK Platform-Tools | 33.0.2 | | Android Support Repository | 47.0.0 | | CMake | 3.10.2<br>3.18.1 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 21.4.7075529 (default)<br>22.1.7171670<br>23.1.7779620 | +| NDK | 21.4.7075529 (default)<br>22.1.7171670<br>23.2.8568313 | | SDK Patch Applier v4 | 1 | #### Environment variables @@ -340,7 +342,7 @@ | ----------------------- | -------------------------------------------------------------------------------------------------- | | ANDROID_HOME | /Users/runner/Library/Android/sdk | | ANDROID_NDK_HOME | /Users/runner/Library/Android/sdk/ndk-bundle -> /Users/runner/Library/Android/sdk/ndk/21.4.7075529 | -| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/23.1.7779620 | +| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/23.2.8568313 | | ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk-bundle -> /Users/runner/Library/Android/sdk/ndk/21.4.7075529 | | ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | From b0853ccdf39626feeac6a3272f84015e159f1bef Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 2 Jun 2022 09:41:00 +0000 Subject: [PATCH 1210/3485] Ubuntu 20.04 (20220529 update) (#5649) * Updating readme file for ubuntu20 version 20220529.1 * Add php 8.0.19 Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2004-Readme.md | 147 +++++++++++++++--------------- 1 file changed, 75 insertions(+), 72 deletions(-) diff --git a/images/linux/Ubuntu2004-Readme.md b/images/linux/Ubuntu2004-Readme.md index 3b2bf8cc3824..f78adfa26183 100644 --- a/images/linux/Ubuntu2004-Readme.md +++ b/images/linux/Ubuntu2004-Readme.md @@ -1,24 +1,26 @@ | Announcements | |-| +| [[all OSs] Android NDK 22 will be replaced in favor of 24, version 23 will be set as the default one on June, 6](https://github.com/actions/virtual-environments/issues/5595) | | [(Public Beta) Ubuntu 22.04 is now available](https://github.com/actions/virtual-environments/issues/5490) | *** # Ubuntu 20.04.4 LTS -- Linux kernel version: 5.13.0-1023-azure -- Image Version: 20220515.1 +- Linux kernel version: 5.13.0-1025-azure +- Image Version: 20220529.1 ## Installed Software ### Language and Runtime - Bash 5.0.17(1)-release - Clang 10.0.0, 11.0.0, 12.0.0 - Clang-format 10.0.0, 11.0.0, 12.0.0 -- Erlang 24.3.3 (Eshell 12.3.1) +- Clang-tidy 10.0.0, 11.0.0, 12.0.0 +- Erlang 25.0 (Eshell 13.0) - Erlang rebar3 3.18.0 - GNU C++ 9.4.0, 10.3.0 - GNU Fortran 9.4.0, 10.3.0 -- Julia 1.7.2 +- Julia 1.7.3 - Kotlin 1.6.21-release-334 -- Mono 6.12.0.122 (apt source repository: https://download.mono-project.com/repo/ubuntu stable-focal main) -- MSBuild 16.6.0.15201 (from /usr/lib/mono/msbuild/15.0/bin/MSBuild.dll) +- Mono 6.12.0.179 (apt source repository: https://download.mono-project.com/repo/ubuntu stable-focal main) +- MSBuild 16.10.1.31701 (from /usr/lib/mono/msbuild/15.0/bin/MSBuild.dll) - Node 16.15.0 - Perl 5.30.0 - Python 3.8.10 @@ -28,15 +30,15 @@ ### Package Management - cpan 1.64 -- Helm 3.8.2 +- Helm 3.9.0 - Homebrew 3.4.11 -- Miniconda 4.11.0 +- Miniconda 4.12.0 - Npm 8.5.5 - Pip 20.0.2 - Pip3 20.0.2 -- Pipx 1.0.0 +- Pipx 1.1.0 - RubyGems 3.1.2 -- Vcpkg (build from master \<0cf5b4305>) +- Vcpkg (build from master \<d953973cf>) - Yarn 1.22.18 #### Environment variables @@ -48,36 +50,37 @@ ### Project Management - Ant 1.10.7 - Gradle 7.4.2 -- Lerna 4.0.0 +- Lerna 5.0.0 - Maven 3.8.5 - Sbt 1.6.2 ### Tools -- Ansible 2.12.5 +- Ansible 2.12.6 - apt-fast 1.9.12 - AzCopy 10.15.0 (available by `azcopy` and `azcopy10` aliases) - Bazel 5.1.1 - Bazelisk 1.11.0 - Bicep 0.6.18 -- Buildah 1.21.3 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- CMake 3.23.1 -- CodeQL Action Bundle 2.9.1 +- Buildah 1.22.3 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) +- CMake 3.23.2 +- CodeQL Action Bundle 2.9.2 +- Docker Amazon ECR Credential Helper 0.6.0 - Docker Compose v1 1.29.2 - Docker Compose v2 2.4.1+azure-1 - Docker-Buildx 0.8.2 -- Docker-Moby Client 20.10.15+azure-1 -- Docker-Moby Server 20.10.15+azure-2 -- Fastlane 2.205.2 +- Docker-Moby Client 20.10.16+azure-3 +- Docker-Moby Server 20.10.16+azure-2 +- Fastlane 2.206.2 - Git 2.36.1 (apt source repository: ppa:git-core/ppa) -- Git LFS 3.1.4 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) +- Git LFS 3.2.0 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.6.0 - Haveged 1.9.1 - Heroku 7.60.2 - HHVM (HipHop VM) 4.160.0 - jq 1.6 -- Kind 0.13.0 -- Kubectl 1.24.0 -- Kustomize 4.5.4 +- Kind 0.14.0 +- Kubectl 1.24.1 +- Kustomize 4.5.5 - Leiningen 2.9.8 - MediaInfo 19.09 - Mercurial 5.3.1 @@ -86,34 +89,34 @@ - Newman 5.3.2 - nvm 0.39.1 - OpenSSL 1.1.1f-1ubuntu2.13 -- Packer 1.8.0 -- Parcel 2.5.0 +- Packer 1.8.1 +- Parcel 2.6.0 - PhantomJS 2.1.1 - Podman 3.4.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- Pulumi 3.32.1 +- Pulumi 3.33.2 - R 4.2.0 -- Skopeo 1.3.0 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) +- Skopeo 1.5.0 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 -- Terraform 1.1.9 +- Terraform 1.2.1 - yamllint 1.26.3 -- yq 4.25.1 +- yq 4.25.2 - zstd 1.5.2 (homebrew) ### CLI Tools -- Alibaba Cloud CLI 3.0.119 -- AWS CLI 2.7.0 -- AWS CLI Session manager plugin 1.2.312.0 +- Alibaba Cloud CLI 3.0.121 +- AWS CLI 2.7.4 +- AWS CLI Session manager plugin 1.2.331.0 - AWS SAM CLI 1.50.0 -- Azure CLI (azure-cli) 2.36.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) +- Azure CLI (azure-cli) 2.37.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.25.0 -- GitHub CLI 2.10.1 +- GitHub CLI 2.11.3 - Google Cloud SDK 369.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 10.3.1 -- OpenShift CLI 4.10.13 +- Netlify CLI 10.3.3 +- OpenShift CLI 4.10.15 - ORAS CLI 0.12.0 -- Vercel CLI 24.2.3 +- Vercel CLI 24.2.4 ### Java | Version | Vendor | Environment Variable | @@ -128,41 +131,41 @@ | CE 22.1.0 | GRAALVM_11_ROOT | ### PHP -| Tool | Version | -| -------- | ------------------- | -| PHP | 7.4.29 8.0.18 8.1.5 | -| Composer | 2.3.5 | -| PHPUnit | 8.5.26 | +| Tool | Version | +| -------- | ------------- | +| PHP | 7.4.29 8.0.19 8.1.6 | +| Composer | 2.3.5 | +| PHPUnit | 8.5.26 | ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ``` ### Haskell - Cabal 3.6.2.0 -- GHC 9.2.2 +- GHC 9.2.3 - GHCup 0.1.17.8 - Stack 2.7.5 ### Rust Tools -- Cargo 1.60.0 -- Rust 1.60.0 -- Rustdoc 1.60.0 +- Cargo 1.61.0 +- Rust 1.61.0 +- Rustdoc 1.61.0 - Rustup 1.24.3 #### Packages - Bindgen 0.59.2 -- Cargo audit 0.16.0 -- Cargo clippy 0.1.60 -- Cargo outdated +- Cargo audit 0.17.0 +- Cargo clippy 0.1.61 +- Cargo outdated 0.11.1 - Cbindgen 0.23.0 - Rustfmt 1.4.38 ### Browsers and Drivers -- Google Chrome 101.0.4951.64 -- ChromeDriver 101.0.4951.41 -- Chromium 101.0.4951.0 -- Mozilla Firefox 100.0 +- Google Chrome 102.0.5005.61 +- ChromeDriver 102.0.5005.61 +- Chromium 102.0.5005.0 +- Selenium server 4.2.0 +- Mozilla Firefox 100.0.2 - Geckodriver 0.31.0 -- Selenium server 4.1.0 #### Environment variables | Name | Value | @@ -175,7 +178,7 @@ - 3.1.120 3.1.202 3.1.302 3.1.419 5.0.104 5.0.214 5.0.303 5.0.408 6.0.300 ### .NET tools -- nbgv 3.5.104+d0b7c362ff +- nbgv 3.5.107+6463ef6068 ### Databases - MongoDB 5.0.8 (apt source repository: https://repo.mongodb.org/apt/ubuntu) @@ -197,7 +200,7 @@ ``` #### MS SQL Server Client Tools - sqlcmd 17.9.0001.1 -- SqlPackage 16.0.5400.1 +- SqlPackage 16.0.6161.0 ### Cached Tools #### Go @@ -207,7 +210,7 @@ #### Node.js - 12.22.12 -- 14.19.2 +- 14.19.3 - 16.15.0 #### PyPy @@ -222,7 +225,7 @@ - 3.6.15 - 3.7.13 - 3.8.12 -- 3.9.12 +- 3.9.13 - 3.10.4 #### Ruby @@ -240,7 +243,7 @@ | GOROOT_1_18_X64 | /opt/hostedtoolcache/go/1.18.2/x64 | x64 | ### PowerShell Tools -- PowerShell 7.2.3 +- PowerShell 7.2.4 #### PowerShell Modules | Module | Version | @@ -266,14 +269,14 @@ | Android Command Line Tools | 4.0 | | Android Emulator | 31.2.10 | | Android SDK Build-tools | 32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | -| Android SDK Platform-Tools | 33.0.1 | +| Android SDK Platform-Tools | 33.0.2 | | Android SDK Platforms | android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | | Android SDK Tools | 26.1.1 | | Android Support Repository | 47.0.0 | | CMake | 3.10.2<br>3.18.1 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 21.4.7075529 (default)<br>22.1.7171670<br>23.1.7779620 | +| NDK | 21.4.7075529 (default)<br>22.1.7171670<br>23.2.8568313 | | SDK Patch Applier v4 | 1 | #### Environment variables @@ -281,7 +284,7 @@ | ----------------------- | ------------------------------------------------------------------------------------ | | ANDROID_HOME | /usr/local/lib/android/sdk | | ANDROID_NDK_HOME | /usr/local/lib/android/sdk/ndk-bundle -> /usr/local/lib/android/sdk/ndk/21.4.7075529 | -| ANDROID_NDK_LATEST_HOME | /usr/local/lib/android/sdk/ndk/23.1.7779620 | +| ANDROID_NDK_LATEST_HOME | /usr/local/lib/android/sdk/ndk/23.2.8568313 | | ANDROID_NDK_ROOT | /usr/local/lib/android/sdk/ndk-bundle -> /usr/local/lib/android/sdk/ndk/21.4.7075529 | | ANDROID_SDK_ROOT | /usr/local/lib/android/sdk | @@ -291,18 +294,18 @@ | alpine:3.12 | sha256:c75ac27b49326926b803b9ed43bf088bc220d22556de1bc5f72d742c91398f69 | 2022-04-05 | | alpine:3.13 | sha256:ccf92aa53bc6c3b25be2ad0cce80baec1778f007f7e076b0ffbd1b225d0b3a9b | 2022-04-05 | | alpine:3.14 | sha256:06b5d462c92fc39303e6363c65e074559f8d6b1363250027ed5053557e3398c5 | 2022-04-05 | -| buildpack-deps:bullseye | sha256:f4369ea9e313fc97029c736d68a9ea705d14fd1884a70be33aae25196d59288b | 2022-05-11 | -| buildpack-deps:buster | sha256:3485150b7bd19da1e2ddbf567ee47c5ebd1ed62d55a334ff363a718057d713c3 | 2022-05-11 | -| buildpack-deps:stretch | sha256:1929159d9dfd9fc9cc8f6fb0c8414452ec4613b824e152b87e24de9a6e3b5879 | 2022-05-11 | -| debian:10 | sha256:405f48fbb359190809bd91aac79c3f6c346c1e79878c839351c6a817db5e9fc4 | 2022-05-11 | -| debian:11 | sha256:6137c67e2009e881526386c42ba99b3657e4f92f546814a33d35b14e60579777 | 2022-05-11 | -| debian:9 | sha256:3487fb8dc9312f88dd4aa03364c15d98a998c5c7c3453f0469002f9d593916f6 | 2022-05-11 | +| buildpack-deps:bullseye | sha256:898c2264db514062f89391a9ae58e25bfcaa94d9fed04abf789a4abb53ee2fd6 | 2022-05-28 | +| buildpack-deps:buster | sha256:3a56627334c11ff56aa16fa7c8922cfc17d506fe41f9155e350b1e02edb0e77d | 2022-05-28 | +| buildpack-deps:stretch | sha256:a87bd91f037696862c341a73f6607cfb5d462ffcec16de34f59bab0f21b61868 | 2022-05-28 | +| debian:10 | sha256:e5b41ae2b4cf0d04b80cd2f89724e9cfc09e334ac64f188b9808929c748af526 | 2022-05-28 | +| debian:11 | sha256:3f1d6c17773a45c97bd8f158d665c9709d7b29ed7917ac934086ad96f92e4510 | 2022-05-28 | +| debian:9 | sha256:22cb208880101b9a665332a9360ba4c5c021e3ed2f791638369e9a9418dac981 | 2022-05-28 | | moby/buildkit:latest | sha256:0dc312b04eac1b44cd2cad566deb1e886c753109208affbbec8384f381ff7f38 | 2022-05-06 | | node:12 | sha256:01627afeb110b3054ba4a1405541ca095c8bfca1cb6f2be9479c767a2711879e | 2022-04-20 | | node:12-alpine | sha256:d4b15b3d48f42059a15bd659be60afe21762aae9d6cbea6f124440895c27db68 | 2022-04-11 | -| node:14 | sha256:61168c39af89331ffaa6ba41c2a44f4d5132a857a6034175f994948b5798b588 | 2022-05-11 | -| node:14-alpine | sha256:8845b4f88f64f8c56a39236648ba22946e806a6153c10911f77b70e5a2edb4ca | 2022-04-05 | -| node:16 | sha256:1817bb941c9a30fe2a6d75ff8675a8f6def408efe3d3ff43dbb006e2b534fa14 | 2022-05-11 | +| node:14 | sha256:3324c688c0e98888f8938509f35356acf69a3e1f9f385d85f7e6086b137c17e3 | 2022-05-28 | +| node:14-alpine | sha256:c9b8829068199346e2a9ae46f870bbb82ce44de6580321300bf3945d00dee0f1 | 2022-05-18 | +| node:16 | sha256:59eb4e9d6a344ae1161e7d6d8af831cb50713cc631889a5a8c2d438d6ec6aa0f | 2022-05-28 | | node:16-alpine | sha256:1a9a71ea86aad332aa7740316d4111ee1bd4e890df47d3b5eff3e5bded3b3d10 | 2022-04-27 | | ubuntu:16.04 | sha256:20858ebbc96215d6c3c574f781133ebffdc7c18d98af4f294cc4c04871a6fe61 | 2021-08-31 | | ubuntu:18.04 | sha256:d21b6ba9e19feffa328cb3864316e6918e30acfd55e285b5d3df1d8ca3c7fd3f | 2022-04-29 | @@ -324,7 +327,7 @@ | curl | 7.68.0-1ubuntu2.11 | | dbus | 1.12.16-2ubuntu2.2 | | dnsutils | 1:9.16.1-0ubuntu2.10 | -| dpkg | 1.19.7ubuntu3 | +| dpkg | 1.19.7ubuntu3.2 | | fakeroot | 1.24-1 | | file | 1:5.38-4 | | flex | 2.6.4-6.2 | @@ -375,7 +378,7 @@ | sqlite3 | 3.31.1-4ubuntu0.3 | | ssh | 1:8.2p1-4ubuntu0.5 | | sshpass | 1.06-1 | -| subversion | 1.13.0-3ubuntu0.1 | +| subversion | 1.13.0-3ubuntu0.2 | | sudo | 1.8.31-1ubuntu1.2 | | swig | 4.0.1-5build1 | | telnet | 0.17-41.2build1 | From 3c0d5a6a78537ef672d3c3e047c5b83aaf262290 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 2 Jun 2022 09:54:36 +0000 Subject: [PATCH 1211/3485] macOS 10.15 (20220531 update) (#5667) * Updating readme file for macOS-10.15 version 20220531.1 * Update macos-10.15-Readme.md Add Microsoft Edge WebDriver 102.0.1245.2 Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Dusko Dobranic <101048884+ddobranic@users.noreply.github.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-10.15-Readme.md | 74 +++++++++++++++--------------- 1 file changed, 38 insertions(+), 36 deletions(-) diff --git a/images/macos/macos-10.15-Readme.md b/images/macos/macos-10.15-Readme.md index f0c9011d3913..51c71b60adec 100644 --- a/images/macos/macos-10.15-Readme.md +++ b/images/macos/macos-10.15-Readme.md @@ -1,13 +1,13 @@ | Announcements | |-| | [[macOS] Default Visual studio for mac will be changed to version 2022 for macOS 11&12 on May, 30](https://github.com/actions/virtual-environments/issues/5601) | -| [[all OSs] Android NDK 22 will be replaced in favor of 24, version 23 will be set as the default one](https://github.com/actions/virtual-environments/issues/5595) | +| [[all OSs] Android NDK 22 will be replaced in favor of 24, version 23 will be set as the default one on June, 6](https://github.com/actions/virtual-environments/issues/5595) | | [macOS 12 (Monterey) is available as a public beta in GitHub Actions and Azure DevOps](https://github.com/actions/virtual-environments/issues/5446) | *** # macOS 10.15 info - System Version: macOS 10.15.7 (19H1922) - Kernel Version: Darwin 19.6.0 -- Image Version: 20220523.3 +- Image Version: 20220531.1 ## Installed Software ### Language and Runtime @@ -15,14 +15,14 @@ - Bash 3.2.57(1)-release - Clang/LLVM 12.0.0 is default - Clang/LLVM 13.0.1 is available on `'$(brew --prefix llvm)/bin/clang'` -- gcc-9 (Homebrew GCC 9.4.0) 9.4.0 - available by `gcc-9` alias +- gcc-9 (Homebrew GCC 9.5.0) 9.5.0 - available by `gcc-9` alias - gcc-10 (Homebrew GCC 10.3.0) 10.3.0 - available by `gcc-10` alias - gcc-11 (Homebrew GCC 11.3.0_1) 11.3.0 - available by `gcc-11` alias -- GNU Fortran (Homebrew GCC 9.4.0) 9.4.0 - available by `gfortran-9` alias +- GNU Fortran (Homebrew GCC 9.5.0) 9.5.0 - available by `gfortran-9` alias - GNU Fortran (Homebrew GCC 10.3.0) 10.3.0 - available by `gfortran-10` alias - GNU Fortran (Homebrew GCC 11.3.0_1) 11.3.0 - available by `gfortran-11` alias - Go 1.17.10 -- julia 1.7.2 +- julia 1.7.3 - Kotlin 1.6.21-release-334 - MSBuild 16.10.1.58001 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) - Node.js v16.15.0 @@ -45,10 +45,10 @@ - NPM 8.5.5 - NuGet 5.9.0.7134 - Pip 20.3.4 (python 2.7) -- Pip 22.1 (python 3.9) -- Pipx 1.0.0 +- Pip 22.1.1 (python 3.9) +- Pipx 1.1.0 - RubyGems 3.2.33 -- Vcpkg 2022 (build from master \<840f701d8>) +- Vcpkg 2022 (build from master \<f78f4440d>) - Yarn 1.22.19 #### Environment variables @@ -72,9 +72,9 @@ - bsdtar 3.3.2 - available by 'tar' alias - Curl 7.83.1 - Git 2.36.1 -- Git LFS: 3.1.4 -- GitHub CLI: 2.10.1 -- GNU parallel 20220422 +- Git LFS: 3.2.0 +- GitHub CLI: 2.11.3 +- GNU parallel 20220522 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.3 - gpg (GnuPG) 2.3.6 @@ -86,30 +86,30 @@ - mongod v5.0.7 - Newman 5.3.2 - OpenSSL 1.1.1o 3 May 2022 `(/usr/local/opt/openssl@1.1 -> ../Cellar/openssl@1.1/1.1.1o)` -- Packer 1.8.0 +- Packer 1.8.1 - PostgreSQL 14.3 - psql (PostgreSQL) 14.3 - Sox 14.4.2 - Subversion (SVN) 1.14.2 - Switchaudio-osx 1.1.0 - Vagrant 2.2.19 -- virtualbox 6.1.34r150636 -- yq (https://github.com/mikefarah/yq/) version 4.25.1 +- VirtualBox 6.1.34r150636 +- yq (https://github.com/mikefarah/yq/) version 4.25.2 - zstd 1.5.2 ### Tools -- Aliyun CLI 3.0.119 +- Aliyun CLI 3.0.121 - App Center CLI 2.10.10 -- AWS CLI 2.7.2 -- AWS SAM CLI 1.50.0 -- AWS Session Manager CLI 1.2.323.0 +- AWS CLI 2.7.4 +- AWS SAM CLI 1.51.0 +- AWS Session Manager CLI 1.2.331.0 - Azure CLI (azure-devops) 0.25.0 -- Azure CLI 2.36.0 +- Azure CLI 2.37.0 - Bicep CLI 0.6.18 - Cabal 3.6.2.0 -- Cmake 3.23.1 -- Fastlane 2.206.1 -- GHC 9.2.2 +- Cmake 3.23.2 +- Fastlane 2.206.2 +- GHC 9.2.3 - GHCup 0.1.17.8 - Jazzy 0.14.2 - Stack 2.7.5 @@ -124,18 +124,18 @@ ### Browsers - Safari 15.5 (15613.2.7.1.9) - SafariDriver 15.5 (15613.2.7.1.9) -- Google Chrome 101.0.4951.64 -- ChromeDriver 101.0.4951.41 -- Microsoft Edge 101.0.1210.53 -- MSEdgeDriver 101.0.1210.53 -- Mozilla Firefox 100.0.2 +- Google Chrome 102.0.5005.61 +- ChromeDriver 102.0.5005.61 +- Microsoft Edge 102.0.1245.30 +- Microsoft Edge WebDriver 102.0.1245.2 +- Mozilla Firefox 101.0 - geckodriver 0.31.0 -- Selenium server 4.1.4 +- Selenium server 4.2.0 #### Environment variables | Name | Value | | --------------- | ---------------------------------------------- | -| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/101.0.4951.41 | +| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/102.0.5005.61 | | EDGEWEBDRIVER | /usr/local/share/edge_driver | | GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | @@ -209,7 +209,7 @@ #### PowerShell Modules | Module | Version | | ---------------- | ------- | -| Az | 7.5.0 | +| Az | 8.0.0 | | MarkdownPS | 1.9 | | Pester | 5.3.3 | | PSScriptAnalyzer | 1.20.0 | @@ -221,8 +221,10 @@ | nginx | 1.21.6_1 | /usr/local/etc/nginx/nginx.conf | none | 80 | ### Xamarin -#### Visual Studio 2019 for Mac -- 8.10.23.7 +#### Visual Studio for Mac +| Version | Build | Path | +| -------------- | --------- | ------------------------------- | +| 2019 (default) | 8.10.23.7 | /Applications/Visual Studio.app | #### Xamarin bundles | symlink | Xamarin.Mono | Xamarin.iOS | Xamarin.Mac | Xamarin.Android | @@ -360,17 +362,17 @@ ### Android | Package Name | Version | | -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 4.0 | +| Android Command Line Tools | 7.0 | | Android Emulator | 31.2.10 | | Android SDK Build-tools | 32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3<br>26.0.0 26.0.1 26.0.2 26.0.3<br>25.0.0 25.0.1 25.0.2 25.0.3<br>24.0.0 24.0.1 24.0.2 24.0.3 | | Android SDK Platforms | android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3)<br>android-26 (rev 2)<br>android-25 (rev 3)<br>android-24 (rev 2) | -| Android SDK Platform-Tools | 33.0.1 | +| Android SDK Platform-Tools | 33.0.2 | | Android Support Repository | 47.0.0 | | CMake | 3.10.2<br>3.18.1 | | Google APIs | addon-google_apis-google-21<br>addon-google_apis-google-22<br>addon-google_apis-google-23<br>addon-google_apis-google-24 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 15.2.4203891<br>18.1.5063045<br>21.4.7075529 (default)<br>22.1.7171670<br>23.1.7779620 | +| NDK | 15.2.4203891<br>18.1.5063045<br>21.4.7075529 (default)<br>22.1.7171670<br>23.2.8568313 | | SDK Patch Applier v4 | 1 | | Intel HAXM | 7.6.5 | @@ -380,7 +382,7 @@ | ANDROID_HOME | /Users/runner/Library/Android/sdk | | ANDROID_NDK_18R_PATH | /Users/runner/Library/Android/sdk/ndk/18.1.5063045 | | ANDROID_NDK_HOME | /Users/runner/Library/Android/sdk/ndk-bundle -> /Users/runner/Library/Android/sdk/ndk/21.4.7075529 | -| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/23.1.7779620 | +| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/23.2.8568313 | | ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk-bundle -> /Users/runner/Library/Android/sdk/ndk/21.4.7075529 | | ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | From 37ee31328798204ee921be30f9c4df32c0b792b0 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 2 Jun 2022 09:58:40 +0000 Subject: [PATCH 1212/3485] Updating readme file for win19 version 20220529.1 (#5646) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2019-Readme.md | 48 ++++++++++++++++---------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index 531bab355e11..48a3a19c1ab9 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -1,11 +1,11 @@ | Announcements | |-| -| [[all OSs] Android NDK 22 will be replaced in favor of 24, version 23 will be set as the default one](https://github.com/actions/virtual-environments/issues/5595) | +| [[all OSs] Android NDK 22 will be replaced in favor of 24, version 23 will be set as the default one on June, 6](https://github.com/actions/virtual-environments/issues/5595) | | [[Azure DevOps] Windows-2016 environment removal postponed until June 30, 2022](https://github.com/actions/virtual-environments/issues/5403) | *** # Microsoft Windows Server 2019 Datacenter - OS Version: 10.0.17763 Build 2928 -- Image Version: 20220522.1 +- Image Version: 20220529.1 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -14,7 +14,7 @@ ### Language and Runtime - Bash 4.4.23(1)-release - Go 1.17.10 -- Julia 1.7.2 +- Julia 1.7.3 - Kotlin 1.6.21 - LLVM 13.0.1 - Node 16.14.2 @@ -31,9 +31,9 @@ - NPM 8.5.0 - NuGet 6.2.0.146 - pip 22.1.1 (python 3.7) -- Pipx 1.0.0 +- Pipx 1.1.0 - RubyGems 2.7.6.3 -- Vcpkg (build from master \<314018fef>) +- Vcpkg (build from master \<d953973cf>) - Yarn 1.22.18 #### Environment variables @@ -56,20 +56,20 @@ - Bazelisk 1.11.0 - Bicep 0.6.18 - Cabal 3.6.2.0 -- CMake 3.23.1 +- CMake 3.23.2 - CodeQL Action Bundle 2.9.2 - Docker 20.10.7 - Docker Compose v1 1.29.2 - Docker Compose v2 2.5.1 - Docker-wincred 0.6.4 -- ghc 9.2.2 +- ghc 9.2.3 - Git 2.36.0.windows.1 - Git LFS 3.1.4 -- Google Cloud SDK 386.0.0 +- Google Cloud SDK 387.0.0 - InnoSetup 6.2.1 - jq 1.6 - Kind 0.14.0 -- Kubectl 1.24.0 +- Kubectl 1.24.1 - Mercurial 5.0 - Mingw-w64 8.1.0 - Newman 5.3.2 @@ -77,7 +77,7 @@ - OpenSSL 1.1.1 - Packer 1.8.0 - Parcel 2.5.0 -- Pulumi v3.33.1 +- Pulumi v3.33.2 - R 4.2.0 - Service Fabric SDK 9.0.1017.9590 - Stack 2.7.5 @@ -90,14 +90,14 @@ - zstd 1.5.2 ### CLI Tools -- Alibaba Cloud CLI 3.0.120 -- AWS CLI 2.7.2 +- Alibaba Cloud CLI 3.0.121 +- AWS CLI 2.7.4 - AWS SAM CLI 1.50.0 -- AWS Session Manager CLI 1.2.323.0 -- Azure CLI 2.36.0 +- AWS Session Manager CLI 1.2.331.0 +- Azure CLI 2.37.0 - Azure DevOps CLI extension 0.25.0 - Cloud Foundry CLI 6.53.0 -- GitHub CLI 2.10.1 +- GitHub CLI 2.11.3 - Hub CLI 2.14.2 ### Rust Tools @@ -108,21 +108,21 @@ #### Packages - bindgen 0.59.2 -- cargo-audit 0.16.0 +- cargo-audit 0.17.0 - cargo-outdated 0.11.1 - cbindgen 0.23.0 - Clippy 0.1.61 - Rustfmt 1.4.38 ### Browsers and webdrivers -- Google Chrome 101.0.4951.67 -- Chrome Driver 101.0.4951.41 +- Google Chrome 102.0.5005.63 +- Chrome Driver 102.0.5005.61 - Microsoft Edge 101.0.1210.53 - Microsoft Edge Driver 101.0.1210.53 - Mozilla Firefox 100.0.2 - Gecko Driver 0.31.0 - IE Driver 3.150.1.1 -- Selenium server 4.1.0 +- Selenium server 4.2.0 #### Environment variables | Name | Value | @@ -224,7 +224,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Database tools - Azure CosmosDb Emulator 2.14.7.0 -- DacFx 16.0.5400.1 +- DacFx 16.0.6161.0 - MySQL 5.7.38.0 - SQL OLEDB Driver 18.6.3.0 - SQLPS 1.0 @@ -547,7 +547,7 @@ All other versions are saved but not installed. #### Powershell Modules | Module | Version | | ------------------ | ---------------- | -| AWSPowerShell | 4.1.90 | +| AWSPowerShell | 4.1.95 | | DockerMsftProvider | 1.0.0.8 | | MarkdownPS | 1.9 | | Microsoft.Graph | 1.9.6 | @@ -564,14 +564,14 @@ All other versions are saved but not installed. | Android Command Line Tools | 4.0 | | Android SDK Build-tools | 32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3<br>26.0.0 26.0.1 26.0.2 26.0.3<br>25.0.0 25.0.1 25.0.2 25.0.3<br>24.0.0 24.0.1 24.0.2 24.0.3<br>23.0.1 23.0.2 23.0.3<br>22.0.1<br>21.1.2<br>20.0.0<br>19.1.0 | | Android SDK Platforms | android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3)<br>android-26 (rev 2)<br>android-25 (rev 3)<br>android-24 (rev 2)<br>android-23 (rev 3)<br>android-22 (rev 2)<br>android-21 (rev 2)<br>android-20 (rev 2)<br>android-19 (rev 4) | -| Android SDK Platform-Tools | 33.0.1 | +| Android SDK Platform-Tools | 33.0.2 | | Android SDK Tools | 26.1.1 | | Android Support Repository | 47.0.0 | | CMake | 3.10.2<br>3.18.1 | | Google APIs | addon-google_apis-google-21<br>addon-google_apis-google-22<br>addon-google_apis-google-23<br>addon-google_apis-google-24 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 21.4.7075529 (default)<br>22.1.7171670<br>23.1.7779620 | +| NDK | 21.4.7075529 (default)<br>22.1.7171670<br>23.2.8568313 | | SDK Patch Applier v4 | 1 | #### Environment variables @@ -579,7 +579,7 @@ All other versions are saved but not installed. | ----------------------- | ---------------------------------------------------------------------------- | | ANDROID_HOME | C:\Android\android-sdk | | ANDROID_NDK_HOME | C:\Android\android-sdk\ndk-bundle -> C:\Android\android-sdk\ndk\21.4.7075529 | -| ANDROID_NDK_LATEST_HOME | C:\Android\android-sdk\ndk\23.1.7779620 | +| ANDROID_NDK_LATEST_HOME | C:\Android\android-sdk\ndk\23.2.8568313 | | ANDROID_NDK_PATH | C:\Android\android-sdk\ndk-bundle -> C:\Android\android-sdk\ndk\21.4.7075529 | | ANDROID_NDK_ROOT | C:\Android\android-sdk\ndk-bundle -> C:\Android\android-sdk\ndk\21.4.7075529 | | ANDROID_SDK_ROOT | C:\Android\android-sdk | From 36df9267d047407c6726d11639504455127b0d40 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 2 Jun 2022 12:58:33 +0000 Subject: [PATCH 1213/3485] Updating readme file for win22 version 20220529.1 (#5647) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2022-Readme.md | 51 ++++++++++++++++---------------- 1 file changed, 26 insertions(+), 25 deletions(-) diff --git a/images/win/Windows2022-Readme.md b/images/win/Windows2022-Readme.md index c59086448480..22f93b812f02 100644 --- a/images/win/Windows2022-Readme.md +++ b/images/win/Windows2022-Readme.md @@ -1,10 +1,11 @@ | Announcements | |-| +| [[all OSs] Android NDK 22 will be replaced in favor of 24, version 23 will be set as the default one on June, 6](https://github.com/actions/virtual-environments/issues/5595) | | [[Azure DevOps] Windows-2016 environment removal postponed until June 30, 2022](https://github.com/actions/virtual-environments/issues/5403) | *** # Microsoft Windows Server 2022 Datacenter - OS Version: 10.0.20348 Build 707 -- Image Version: 20220522.1 +- Image Version: 20220529.1 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -13,7 +14,7 @@ ### Language and Runtime - Bash 4.4.23(1)-release - Go 1.17.10 -- Julia 1.7.2 +- Julia 1.7.3 - Kotlin 1.6.21 - LLVM 13.0.1 - Node 16.14.2 @@ -30,9 +31,9 @@ - NPM 8.5.0 - NuGet 6.2.0.146 - pip 22.1.1 (python 3.9) -- Pipx 1.0.0 +- Pipx 1.1.0 - RubyGems 3.2.33 -- Vcpkg (build from master \<314018fef>) +- Vcpkg (build from master \<d953973cf>) - Yarn 1.22.18 #### Environment variables @@ -54,26 +55,26 @@ - Bazelisk 1.11.0 - Bicep 0.6.18 - Cabal 3.6.2.0 -- CMake 3.23.1 +- CMake 3.23.2 - CodeQL Action Bundle 2.9.2 - Docker 20.10.7 - Docker Compose v1 1.29.2 - Docker Compose v2 2.5.1 - Docker-wincred 0.6.4 -- ghc 9.2.2 +- ghc 9.2.3 - Git 2.36.0.windows.1 - Git LFS 3.1.4 - InnoSetup 6.2.1 - jq 1.6 - Kind 0.14.0 -- Kubectl 1.24.0 +- Kubectl 1.24.1 - Mercurial 5.0 - Mingw-w64 8.1.0 - Newman 5.3.2 - NSIS v3.08 - OpenSSL 1.1.1 - Packer 1.8.0 -- Pulumi v3.33.1 +- Pulumi v3.33.2 - R 4.2.0 - Service Fabric SDK 9.0.1017.9590 - Stack 2.7.5 @@ -86,13 +87,13 @@ - zstd 1.5.2 ### CLI Tools -- Alibaba Cloud CLI 3.0.120 -- AWS CLI 2.7.2 +- Alibaba Cloud CLI 3.0.121 +- AWS CLI 2.7.4 - AWS SAM CLI 1.50.0 -- AWS Session Manager CLI 1.2.323.0 -- Azure CLI 2.36.0 +- AWS Session Manager CLI 1.2.331.0 +- Azure CLI 2.37.0 - Azure DevOps CLI extension 0.25.0 -- GitHub CLI 2.10.1 +- GitHub CLI 2.11.3 - Hub CLI 2.14.2 ### Rust Tools @@ -103,21 +104,21 @@ #### Packages - bindgen 0.59.2 -- cargo-audit 0.16.0 +- cargo-audit 0.17.0 - cargo-outdated 0.11.1 - cbindgen 0.23.0 - Clippy 0.1.61 - Rustfmt 1.4.38 ### Browsers and webdrivers -- Google Chrome 101.0.4951.67 -- Chrome Driver 101.0.4951.41 +- Google Chrome 102.0.5005.63 +- Chrome Driver 102.0.5005.61 - Microsoft Edge 101.0.1210.53 - Microsoft Edge Driver 101.0.1210.53 - Mozilla Firefox 100.0.2 - Gecko Driver 0.31.0 - IE Driver 3.150.1.1 -- Selenium server 4.1.0 +- Selenium server 4.2.0 #### Environment variables | Name | Value | @@ -209,7 +210,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Database tools - Azure CosmosDb Emulator 2.14.7.0 -- DacFx 16.0.5400.1 +- DacFx 16.0.6161.0 - MySQL 8.0.29.0 - SQL OLEDB Driver 18.6.3.0 - SQLPS 1.0 @@ -221,9 +222,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Nginx | 1.21.6 | C:\tools\nginx-1.21.6\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2022 -| Name | Version | Path | -| ----------------------------- | ------------- | -------------------------------------------------------- | -| Visual Studio Enterprise 2022 | 17.2.32516.85 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | +| Name | Version | Path | +| ----------------------------- | -------------- | -------------------------------------------------------- | +| Visual Studio Enterprise 2022 | 17.2.32519.379 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | #### Workloads, components and extensions: | Package | Version | @@ -505,7 +506,7 @@ All other versions are saved but not installed. #### Powershell Modules | Module | Version | | ------------------ | ---------------- | -| AWSPowerShell | 4.1.90 | +| AWSPowerShell | 4.1.95 | | DockerMsftProvider | 1.0.0.8 | | MarkdownPS | 1.9 | | Microsoft.Graph | 1.9.6 | @@ -523,12 +524,12 @@ All other versions are saved but not installed. | Android Emulator | 31.2.10 | | Android SDK Build-tools | 32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | | Android SDK Platforms | android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | -| Android SDK Platform-Tools | 33.0.1 | +| Android SDK Platform-Tools | 33.0.2 | | Android Support Repository | 47.0.0 | | CMake | 3.18.1 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 21.4.7075529 (default)<br>22.1.7171670<br>23.1.7779620 | +| NDK | 21.4.7075529 (default)<br>22.1.7171670<br>23.2.8568313 | | SDK Patch Applier v4 | 1 | #### Environment variables @@ -536,7 +537,7 @@ All other versions are saved but not installed. | ----------------------- | ---------------------------------------------------------------------------- | | ANDROID_HOME | C:\Android\android-sdk | | ANDROID_NDK_HOME | C:\Android\android-sdk\ndk-bundle -> C:\Android\android-sdk\ndk\21.4.7075529 | -| ANDROID_NDK_LATEST_HOME | C:\Android\android-sdk\ndk\23.1.7779620 | +| ANDROID_NDK_LATEST_HOME | C:\Android\android-sdk\ndk\23.2.8568313 | | ANDROID_NDK_PATH | C:\Android\android-sdk\ndk-bundle -> C:\Android\android-sdk\ndk\21.4.7075529 | | ANDROID_NDK_ROOT | C:\Android\android-sdk\ndk-bundle -> C:\Android\android-sdk\ndk\21.4.7075529 | | ANDROID_SDK_ROOT | C:\Android\android-sdk | From 9e4822e54ea9177023f46556c87d7fbbdf237dd7 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Fri, 3 Jun 2022 13:48:40 +0200 Subject: [PATCH 1214/3485] [Ubuntu] rework Microsoft repo installation (#5680) --- images/linux/scripts/base/repos.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/images/linux/scripts/base/repos.sh b/images/linux/scripts/base/repos.sh index a489c62aea42..c6541b7786c8 100644 --- a/images/linux/scripts/base/repos.sh +++ b/images/linux/scripts/base/repos.sh @@ -12,9 +12,7 @@ dpkg -i packages-microsoft-prod.deb apt-get install -y apt-transport-https ca-certificates curl software-properties-common # Install Microsoft GPG public key -curl -L https://packages.microsoft.com/keys/microsoft.asc | apt-key add - - -curl https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > microsoft.gpg +wget -qO - https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > microsoft.gpg mv microsoft.gpg /etc/apt/trusted.gpg.d/microsoft.gpg # update From 184da3fa5c67ee72fa457024c6f0cea6e5a27b74 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Fri, 3 Jun 2022 15:49:13 +0400 Subject: [PATCH 1215/3485] Add xcode 13.4.1 to macOS12 image (#5684) --- images/macos/toolsets/toolset-12.json | 1 + 1 file changed, 1 insertion(+) diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index 0a1a53e6e169..7c4ae21b2524 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -2,6 +2,7 @@ "xcode": { "default": "13.3.1", "versions": [ + { "link": "13.4.1", "version": "13.4.1" }, { "link": "13.4", "version": "13.4.0" }, { "link": "13.3.1", "version": "13.3.1", "symlinks": ["13.3"] }, { "link": "13.2.1", "version": "13.2.1", "symlinks": ["13.2"] }, From d63f3cf0f4482ec63dac6a22636614594c2a0cba Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Mon, 6 Jun 2022 09:30:14 +0200 Subject: [PATCH 1216/3485] Use direct link to download latest yq version (#5689) --- images/linux/scripts/installers/yq.sh | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/images/linux/scripts/installers/yq.sh b/images/linux/scripts/installers/yq.sh index 0f7089b82958..3c9138736fe7 100644 --- a/images/linux/scripts/installers/yq.sh +++ b/images/linux/scripts/installers/yq.sh @@ -3,14 +3,8 @@ # Source the helpers for use with the script source $HELPER_SCRIPTS/install.sh -YQ_BINARY=yq_linux_amd64 - -# As per https://github.com/mikefarah/yq#wget -YQ_URL=$(get_github_package_download_url "mikefarah/yq" "endswith(\"$YQ_BINARY.tar.gz\")") -echo "Downloading latest yq from $YQ_URL" - -download_with_retries "$YQ_URL" "/tmp" "${YQ_BINARY}.tar.gz" -tar xzf "/tmp/${YQ_BINARY}.tar.gz" -C "/tmp" -mv /tmp/${YQ_BINARY} /usr/bin/yq +YQ_URL="https://github.com/mikefarah/yq/releases/latest/download/yq_linux_amd64" +download_with_retries "$YQ_URL" "/usr/bin" "yq" +chmod +x /usr/bin/yq invoke_tests "Tools" "yq" From 1583fd17e7cd86804c3bf11f8eb213bb411933fc Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Mon, 6 Jun 2022 12:32:21 +0200 Subject: [PATCH 1217/3485] [Ubuntu] Remove apt-key from postgresql installer (#5686) --- images/linux/scripts/installers/postgresql.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/images/linux/scripts/installers/postgresql.sh b/images/linux/scripts/installers/postgresql.sh index f3d38cf21d3e..845adffc6278 100644 --- a/images/linux/scripts/installers/postgresql.sh +++ b/images/linux/scripts/installers/postgresql.sh @@ -11,8 +11,8 @@ source $HELPER_SCRIPTS/install.sh REPO_URL="https://apt.postgresql.org/pub/repos/apt/" # Preparing repo for PostgreSQL -wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - -echo "deb $REPO_URL $(getOSVersionLabel)-pgdg main" | tee /etc/apt/sources.list.d/pgdg.list +wget -qO - https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor > /usr/share/keyrings/postgresql.gpg +echo "deb [signed-by=/usr/share/keyrings/postgresql.gpg] $REPO_URL $(getOSVersionLabel)-pgdg main" > /etc/apt/sources.list.d/pgdg.list # Fetch PostgreSQL version to install from the toolset toolsetVersion=$(get_toolset_value '.postgresql.version') @@ -30,6 +30,7 @@ systemctl is-active --quiet postgresql.service && systemctl stop postgresql.serv systemctl disable postgresql.service rm /etc/apt/sources.list.d/pgdg.list +rm /usr/share/keyrings/postgresql.gpg echo "postgresql $REPO_URL" >> $HELPER_SCRIPTS/apt-sources.txt From 7d31b635ea815e66f8732f70dd573ad71de069f9 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Mon, 6 Jun 2022 12:32:35 +0200 Subject: [PATCH 1218/3485] [Ubuntu] Remove apt-key from rlang install script (#5685) --- images/linux/scripts/installers/r.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/images/linux/scripts/installers/r.sh b/images/linux/scripts/installers/r.sh index ee23b3c4820b..c7c84c997ffd 100644 --- a/images/linux/scripts/installers/r.sh +++ b/images/linux/scripts/installers/r.sh @@ -6,10 +6,13 @@ source $HELPER_SCRIPTS/os.sh # install R osLabel=$(getOSVersionLabel) -sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys E298A3A825C0D65DFD57CBB651716619E084DAB9 -sudo add-apt-repository "deb https://cloud.r-project.org/bin/linux/ubuntu $osLabel-cran40/" +wget -qO- https://cloud.r-project.org/bin/linux/ubuntu/marutter_pubkey.asc | gpg --dearmor > /usr/share/keyrings/rlang.gpg +echo "deb [signed-by=/usr/share/keyrings/rlang.gpg] https://cloud.r-project.org/bin/linux/ubuntu $osLabel-cran40/" > /etc/apt/sources.list.d/rlang.list -sudo apt update -sudo apt install r-base +apt-get update +apt-get install r-base + +rm /etc/apt/sources.list.d/rlang.list +rm /usr/share/keyrings/rlang.gpg invoke_tests "Tools" "R" \ No newline at end of file From 787d6f6ee7e52e260bb0d69c83277ef5308e4ce6 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Mon, 6 Jun 2022 12:49:12 +0200 Subject: [PATCH 1219/3485] [Ubuntu] install Temurin gpg key manually on 22.04 (#5676) --- images/linux/scripts/installers/java-tools.sh | 24 ++++++++++++++----- 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/images/linux/scripts/installers/java-tools.sh b/images/linux/scripts/installers/java-tools.sh index d5ccd1c7c2a5..527d27e55544 100644 --- a/images/linux/scripts/installers/java-tools.sh +++ b/images/linux/scripts/installers/java-tools.sh @@ -38,20 +38,24 @@ createJavaEnvironmentalVariable() { } enableRepositories() { + +osLabel=$(getOSVersionLabel) + if isUbuntu18 || isUbuntu20; then # Add Adopt PPA - wget -qO - "https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public" | apt-key add - - add-apt-repository --yes https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ + wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | gpg --dearmor > /usr/share/keyrings/adopt.gpg + echo "deb [signed-by=/usr/share/keyrings/adopt.gpg] https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ $osLabel main" > /etc/apt/sources.list.d/adopt.list fi # Add Addoptium PPA - wget -qO - "https://packages.adoptium.net/artifactory/api/gpg/key/public" | apt-key add - - add-apt-repository --yes https://packages.adoptium.net/artifactory/deb/ + # apt-key is deprecated, dearmor and add manually + wget -qO - https://packages.adoptium.net/artifactory/api/gpg/key/public | gpg --dearmor > /usr/share/keyrings/adoptium.gpg + echo "deb [signed-by=/usr/share/keyrings/adoptium.gpg] https://packages.adoptium.net/artifactory/deb/ $osLabel main" > /etc/apt/sources.list.d/adoptium.list if isUbuntu18 ; then # Install GPG Key for Azul Open JDK. See https://www.azul.com/downloads/azure-only/zulu/ - apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0xB1998361219BD9C9 - apt-add-repository "deb https://repos.azul.com/azure-only/zulu/apt stable main" + wget -qO - https://www.azul.com/wp-content/uploads/2021/05/0xB1998361219BD9C9.txt | gpg --dearmor > /usr/share/keyrings/zulu.gpg + echo "deb [signed-by=/usr/share/keyrings/zulu.gpg] https://repos.azul.com/azure-only/zulu/apt stable main" > /etc/apt/sources.list.d/zulu.list fi } @@ -152,5 +156,13 @@ unzip -qq -d /usr/share /tmp/gradleLatest.zip ln -s /usr/share/gradle-"${gradleLatestVersion}"/bin/gradle /usr/bin/gradle echo "GRADLE_HOME=$(find /usr/share -depth -maxdepth 1 -name "gradle*")" | tee -a /etc/environment +# Delete java repositories and keys +rm -f /etc/apt/sources.list.d/adopt.list +rm -f /etc/apt/sources.list.d/adoptium.list +rm -f /etc/apt/sources.list.d/zulu.list +rm -f /usr/share/keyrings/adopt.gpg +rm -f /usr/share/keyrings/adoptium.gpg +rm -f /usr/share/keyrings/zulu.gpg + reloadEtcEnvironment invoke_tests "Java" From f380cc103142f672509d9a4e80f6b8777de85e2e Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Mon, 6 Jun 2022 14:39:50 +0200 Subject: [PATCH 1220/3485] Add miniconda to macOS 12 (#5693) --- .../software-report/SoftwareReport.Generator.ps1 | 16 +++++----------- images/macos/templates/macOS-12.json | 1 + images/macos/tests/Common.Tests.ps1 | 2 +- 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1 index 17d8566097a3..60bca7adae67 100644 --- a/images/macos/software-report/SoftwareReport.Generator.ps1 +++ b/images/macos/software-report/SoftwareReport.Generator.ps1 @@ -63,6 +63,7 @@ $packageManagementList = @( (Get-PipxVersion), (Get-BundlerVersion), (Get-CocoaPodsVersion), + (Get-CondaVersion), (Get-HomebrewVersion), (Get-NPMVersion), (Get-YarnVersion), @@ -73,18 +74,11 @@ $packageManagementList = @( (Get-VcpkgVersion) ) -if ($os.IsLessThanMonterey) { - $packageManagementList += @( - (Get-CondaVersion) - ) -} - $markdown += New-MDList -Style Unordered -Lines ($packageManagementList | Sort-Object) -if ($os.IsLessThanMonterey) { - $markdown += New-MDHeader "Environment variables" -Level 4 - $markdown += Build-PackageManagementEnvironmentTable | New-MDTable - $markdown += New-MDNewLine -} +$markdown += New-MDHeader "Environment variables" -Level 4 +$markdown += Build-PackageManagementEnvironmentTable | New-MDTable +$markdown += New-MDNewLine + # Project Management $markdown += New-MDHeader "Project Management" -Level 3 $markdown += New-MDList -Style Unordered -Lines (@( diff --git a/images/macos/templates/macOS-12.json b/images/macos/templates/macOS-12.json index e4b980b086aa..ee63e98205be 100644 --- a/images/macos/templates/macOS-12.json +++ b/images/macos/templates/macOS-12.json @@ -200,6 +200,7 @@ "./provision/core/mongodb.sh", "./provision/core/audiodevice.sh", "./provision/core/vcpkg.sh", + "./provision/core/miniconda.sh", "./provision/core/safari.sh", "./provision/core/chrome.sh", "./provision/core/edge.sh", diff --git a/images/macos/tests/Common.Tests.ps1 b/images/macos/tests/Common.Tests.ps1 index 4a348e73c62a..7e78b182d0f4 100644 --- a/images/macos/tests/Common.Tests.ps1 +++ b/images/macos/tests/Common.Tests.ps1 @@ -58,7 +58,7 @@ Describe "AzCopy" { } } -Describe "Miniconda" -Skip:($os.IsMonterey) { +Describe "Miniconda" { It "Conda" { Get-EnvironmentVariable "CONDA" | Should -Not -BeNullOrEmpty $condaBinPath = Join-Path $env:CONDA "bin" "conda" From 8b4d799f257647237afcb09c1e79dfb33865b73b Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Mon, 6 Jun 2022 16:06:55 +0200 Subject: [PATCH 1221/3485] [Ubuntu] Remove apt-key from GCP installer (#5687) --- images/linux/scripts/installers/google-cloud-sdk.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/images/linux/scripts/installers/google-cloud-sdk.sh b/images/linux/scripts/installers/google-cloud-sdk.sh index bb11df28db08..867bc9cc3987 100644 --- a/images/linux/scripts/installers/google-cloud-sdk.sh +++ b/images/linux/scripts/installers/google-cloud-sdk.sh @@ -7,15 +7,15 @@ REPO_URL="https://packages.cloud.google.com/apt" # Install the Google Cloud SDK -echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] $REPO_URL cloud-sdk main" | sudo tee -a /etc/apt/sources.list.d/google-cloud-sdk.list -curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | sudo apt-key --keyring /usr/share/keyrings/cloud.google.gpg add - -sudo apt-get update -y +echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] $REPO_URL cloud-sdk main" > /etc/apt/sources.list.d/google-cloud-sdk.list +wget -q https://packages.cloud.google.com/apt/doc/apt-key.gpg -O /usr/share/keyrings/cloud.google.gpg +apt-get update -y # temporary downgrade google-cloud-sdk as python component has linking bugs -sudo apt-get install -y google-cloud-sdk=369.0.0-0 +apt-get install -y google-cloud-sdk=369.0.0-0 # remove apt rm /etc/apt/sources.list.d/google-cloud-sdk.list -rm /usr/share/keyrings/cloud.google.gpg /usr/share/keyrings/cloud.google.gpg~ +rm /usr/share/keyrings/cloud.google.gpg # add repo to the apt-sources.txt echo "google-cloud-sdk $REPO_URL" >> $HELPER_SCRIPTS/apt-sources.txt From 5bb008fe600d8ab882c061a6f92b83340c6dc1a6 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Tue, 7 Jun 2022 10:36:34 +0400 Subject: [PATCH 1222/3485] Add Xcode 14 to macOS 12 image (#5703) --- images/macos/toolsets/toolset-12.json | 1 + 1 file changed, 1 insertion(+) diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index 7c4ae21b2524..abff00f1805a 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -2,6 +2,7 @@ "xcode": { "default": "13.3.1", "versions": [ + { "link": "14.0", "version": "14.0.0" }, { "link": "13.4.1", "version": "13.4.1" }, { "link": "13.4", "version": "13.4.0" }, { "link": "13.3.1", "version": "13.3.1", "symlinks": ["13.3"] }, From 76f5a7d73e94092c91f345919f94fc425a6f760b Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Tue, 7 Jun 2022 10:37:38 +0400 Subject: [PATCH 1223/3485] Add a note about VS 2019 usage (#5701) --- .../software-report/SoftwareReport.Generator.ps1 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1 index 60bca7adae67..4cc62783ccbb 100644 --- a/images/macos/software-report/SoftwareReport.Generator.ps1 +++ b/images/macos/software-report/SoftwareReport.Generator.ps1 @@ -244,6 +244,17 @@ $markdown += New-MDHeader "Xamarin" -Level 3 $markdown += New-MDHeader "Visual Studio for Mac" -Level 4 $markdown += Build-VSMacTable | New-MDTable $markdown += New-MDNewLine +if (-not $os.Catalina) { +$markdown += New-MDHeader "Notes:" -Level 5 +$reportVS = @' +``` +To use Visual Studio 2019 by default rename the app: +mv "/Applications/Visual Studio.app" "/Applications/Visual Studio 2022.app" +mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" +``` +'@ +$markdown += New-MDParagraph -Lines $reportVS +} $markdown += New-MDHeader "Xamarin bundles" -Level 4 $markdown += Build-XamarinTable | New-MDTable From 5690ae918350fa3a27805b6397e9e2e7acc035c8 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Wed, 8 Jun 2022 16:26:18 +0200 Subject: [PATCH 1224/3485] Revert "Add WDK on Windows Server 2022 (#5652)" (#5711) This reverts commit 16f6912f370f47c8ecb000226c66c941e092fea3. --- images/win/scripts/Installers/Install-WDK.ps1 | 12 ++------ .../SoftwareReport.VisualStudio.psm1 | 29 ++++++++++--------- images/win/scripts/Tests/WDK.Tests.ps1 | 6 ++-- images/win/toolsets/toolset-2022.json | 5 ---- images/win/windows2022.json | 1 - 5 files changed, 20 insertions(+), 33 deletions(-) diff --git a/images/win/scripts/Installers/Install-WDK.ps1 b/images/win/scripts/Installers/Install-WDK.ps1 index 1a6a32346520..139f50c13c13 100644 --- a/images/win/scripts/Installers/Install-WDK.ps1 +++ b/images/win/scripts/Installers/Install-WDK.ps1 @@ -4,14 +4,7 @@ ################################################################################ # Requires Windows SDK with the same version number as the WDK -if (Test-IsWin22) -{ - $winSdkUrl = "https://go.microsoft.com/fwlink/p/?linkid=2196241" - $wdkUrl = "https://go.microsoft.com/fwlink/?linkid=2196230" - $FilePath = "C:\Program Files (x86)\Windows Kits\10\Vsix\VS2022\*\WDK.vsix" - $VSver = "2022" -} -elseif (Test-IsWin19) +if (Test-IsWin19) { $winSdkUrl = "https://go.microsoft.com/fwlink/?linkid=2173743" $wdkUrl = "https://go.microsoft.com/fwlink/?linkid=2166289" @@ -27,7 +20,7 @@ elseif (Test-IsWin16) } else { - throw "Invalid version of Visual Studio is found. Either 2017,2019 or 2022 are required" + throw "Invalid version of Visual Studio is found. Either 2017 or 2019 are required" } $argumentList = ("/features", "+", "/quiet") @@ -39,7 +32,6 @@ Install-Binary -Url $winSdkUrl -Name "winsdksetup.exe" -ArgumentList $argumentLi Install-Binary -Url $wdkUrl -Name "wdksetup.exe" -ArgumentList $argumentList # Need to install the VSIX to get the build targets when running VSBuild -$FilePath = Resolve-Path -Path $FilePath Install-VsixExtension -FilePath $FilePath -Name "WDK.vsix" -VSversion $VSver -InstallOnly Invoke-PesterTests -TestFile "WDK" diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.VisualStudio.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.VisualStudio.psm1 index f02e4ef84d99..b085433c3297 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.VisualStudio.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.VisualStudio.psm1 @@ -53,26 +53,29 @@ function Get-VisualStudioExtensions { } # SDK - if ((Test-IsWin19) -or (Test-IsWin22)) { + if (Test-IsWin19) { $sdkPackageVersion = Get-SDKVersion $sdkPackages = @( @{Package = 'Windows Software Development Kit Extension'; Version = $sdkPackageVersion} ) } - # Wix - $wixExtensionVersion = ($vsPackages | Where-Object {$_.Id -match 'WixToolset.VisualStudioExtension.Dev' -and $_.type -eq 'vsix'}).Version - $wixPackages = @( - @{Package = "WIX Toolset Studio $vs Extension"; Version = $wixExtensionVersion} - ) + if ((Test-IsWin16) -or (Test-IsWin19)) { + # Wix + $wixExtensionVersion = ($vsPackages | Where-Object {$_.Id -match 'WixToolset.VisualStudioExtension.Dev' -and $_.type -eq 'vsix'}).Version + $wixPackages = @( + @{Package = "WIX Toolset Studio $vs Extension"; Version = $wixExtensionVersion} + ) - # WDK - $wdkPackageVersion = Get-VSExtensionVersion -packageName 'Microsoft.Windows.DriverKit' - $wdkExtensionVersion = Get-WDKVersion - $wdkPackages = @( - @{Package = 'Windows Driver Kit'; Version = $wdkPackageVersion} - @{Package = 'Windows Driver Kit Visual Studio Extension'; Version = $wdkExtensionVersion} - ) + # WDK + $wdkPackageVersion = Get-VSExtensionVersion -packageName 'Microsoft.Windows.DriverKit' + $wdkExtensionVersion = Get-WDKVersion + $wdkPackages = @( + @{Package = 'Windows Driver Kit'; Version = $wdkPackageVersion} + @{Package = 'Windows Driver Kit Visual Studio Extension'; Version = $wdkExtensionVersion} + ) + } + $extensions = @( $vsixs diff --git a/images/win/scripts/Tests/WDK.Tests.ps1 b/images/win/scripts/Tests/WDK.Tests.ps1 index b12005dae985..6c5dc32953c0 100644 --- a/images/win/scripts/Tests/WDK.Tests.ps1 +++ b/images/win/scripts/Tests/WDK.Tests.ps1 @@ -1,8 +1,6 @@ -Describe "WDK" { +Describe "WDK" -Skip:(Test-IsWin22) { It "WDK exists" { - $regKey = "HKLM:\Software\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall\*" - $installedApplications = Get-ItemProperty -Path $regKey - $WDKVersion = $installedApplications | Where-Object DisplayName -eq 'Windows Driver Kit' | Select-Object -First 1 -ExpandProperty DisplayVersion + $WDKVersion = (Get-CimInstance -ClassName Win32_Product -Filter "Name = 'Windows Driver Kit'").Version $WDKVersion| Should -Not -BeNullOrEmpty } diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index d516ec905fea..06af656b031b 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -196,7 +196,6 @@ "Microsoft.VisualStudio.Component.TestTools.CodedUITest", "Microsoft.VisualStudio.Component.TestTools.WebLoadTest", "Microsoft.VisualStudio.Component.UWP.VC.ARM64", - "Microsoft.VisualStudio.Component.UWP.VC.ARM64EC", "Microsoft.VisualStudio.Component.VC.CLI.Support", "Microsoft.VisualStudio.Component.VC.CMake.Project", "Microsoft.VisualStudio.Component.VC.DiagnosticTools", @@ -212,13 +211,9 @@ "Microsoft.VisualStudio.Component.VC.MFC.ARM", "Microsoft.VisualStudio.Component.VC.MFC.ARM.Spectre", "Microsoft.VisualStudio.Component.VC.ATL.ARM64", - "Microsoft.VisualStudio.Component.VC.ATL.ARM64.Spectre", - "Microsoft.VisualStudio.Component.VC.ATL.ARM64EC", - "Microsoft.VisualStudio.Component.VC.ATL.ARM64EC.Spectre", "Microsoft.VisualStudio.Component.VC.MFC.ARM64", "Microsoft.VisualStudio.Component.VC.MFC.ARM64.Spectre", "Microsoft.VisualStudio.Component.VC.MFC.ARM64EC", - "Microsoft.VisualStudio.Component.VC.MFC.ARM64EC.Spectre", "Microsoft.VisualStudio.Component.VC.Modules.x86.x64", "Microsoft.VisualStudio.Component.VC.Tools.ARM64", "Microsoft.VisualStudio.Component.VC.Tools.ARM64EC", diff --git a/images/win/windows2022.json b/images/win/windows2022.json index 703e4a1c9af7..a427e2399d56 100644 --- a/images/win/windows2022.json +++ b/images/win/windows2022.json @@ -174,7 +174,6 @@ "type": "powershell", "scripts": [ "{{ template_dir }}/scripts/Installers/Install-Wix.ps1", - "{{ template_dir }}/scripts/Installers/Install-WDK.ps1", "{{ template_dir }}/scripts/Installers/Install-Vsix.ps1", "{{ template_dir }}/scripts/Installers/Install-AzureCli.ps1", "{{ template_dir }}/scripts/Installers/Install-AzureDevOpsCli.ps1", From 7aa16adef053db041887df8f59128c5d3c2f4993 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Wed, 8 Jun 2022 16:30:31 +0200 Subject: [PATCH 1225/3485] Update bazel cache once (#5709) --- images/linux/scripts/installers/bazel.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/linux/scripts/installers/bazel.sh b/images/linux/scripts/installers/bazel.sh index ac8bf096fbe9..4596b9122105 100644 --- a/images/linux/scripts/installers/bazel.sh +++ b/images/linux/scripts/installers/bazel.sh @@ -10,6 +10,6 @@ source $HELPER_SCRIPTS/install.sh npm install -g @bazel/bazelisk # run bazelisk once in order to instal /usr/local/bin/bazel binary -bazelisk +sudo -u $SUDO_USER bazel version invoke_tests "Tools" "Bazel" From 9f92c57e695e8950765b3596e1add8b31d657df6 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Wed, 8 Jun 2022 16:31:08 +0200 Subject: [PATCH 1226/3485] Remove step to install Microsoft GPG public key (#5710) --- images/linux/scripts/base/repos.sh | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/images/linux/scripts/base/repos.sh b/images/linux/scripts/base/repos.sh index c6541b7786c8..0a2a08138c57 100644 --- a/images/linux/scripts/base/repos.sh +++ b/images/linux/scripts/base/repos.sh @@ -9,12 +9,8 @@ LSB_RELEASE=$(lsb_release -rs) # Install Microsoft repository wget https://packages.microsoft.com/config/ubuntu/$LSB_RELEASE/packages-microsoft-prod.deb dpkg -i packages-microsoft-prod.deb -apt-get install -y apt-transport-https ca-certificates curl software-properties-common - -# Install Microsoft GPG public key -wget -qO - https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > microsoft.gpg -mv microsoft.gpg /etc/apt/trusted.gpg.d/microsoft.gpg # update +apt-get install -y apt-transport-https ca-certificates curl software-properties-common apt-get -yq update apt-get -yq dist-upgrade From 0db794c553f61e2966609063c31a7279f19cf3ca Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 9 Jun 2022 11:19:07 +0000 Subject: [PATCH 1227/3485] Updating readme file for macOS-10.15 version 20220605.1 (#5697) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-10.15-Readme.md | 41 +++++++++++++++--------------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/images/macos/macos-10.15-Readme.md b/images/macos/macos-10.15-Readme.md index 51c71b60adec..247aa02a8b5a 100644 --- a/images/macos/macos-10.15-Readme.md +++ b/images/macos/macos-10.15-Readme.md @@ -1,13 +1,12 @@ | Announcements | |-| -| [[macOS] Default Visual studio for mac will be changed to version 2022 for macOS 11&12 on May, 30](https://github.com/actions/virtual-environments/issues/5601) | | [[all OSs] Android NDK 22 will be replaced in favor of 24, version 23 will be set as the default one on June, 6](https://github.com/actions/virtual-environments/issues/5595) | | [macOS 12 (Monterey) is available as a public beta in GitHub Actions and Azure DevOps](https://github.com/actions/virtual-environments/issues/5446) | *** # macOS 10.15 info - System Version: macOS 10.15.7 (19H1922) - Kernel Version: Darwin 19.6.0 -- Image Version: 20220531.1 +- Image Version: 20220605.1 ## Installed Software ### Language and Runtime @@ -21,13 +20,13 @@ - GNU Fortran (Homebrew GCC 9.5.0) 9.5.0 - available by `gfortran-9` alias - GNU Fortran (Homebrew GCC 10.3.0) 10.3.0 - available by `gfortran-10` alias - GNU Fortran (Homebrew GCC 11.3.0_1) 11.3.0 - available by `gfortran-11` alias -- Go 1.17.10 +- Go 1.17.11 - julia 1.7.3 - Kotlin 1.6.21-release-334 - MSBuild 16.10.1.58001 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) -- Node.js v16.15.0 +- Node.js v16.15.1 - NVM 0.39.1 -- NVM - Cached node versions: v12.22.12 v14.19.3 v16.15.0 +- NVM - Cached node versions: v12.22.12 v14.19.3 v16.15.1 - Perl 5.34.0 - PHP 8.1.6 - Python 2.7.18 @@ -36,19 +35,19 @@ - Ruby 2.7.6p219 ### Package Management -- Bundler version 2.3.14 +- Bundler version 2.3.15 - Carthage 0.38.0 - CocoaPods 1.11.3 -- Composer 2.3.5 +- Composer 2.3.6 - Homebrew 3.4.11 - Miniconda 4.12.0 -- NPM 8.5.5 +- NPM 8.11.0 - NuGet 5.9.0.7134 - Pip 20.3.4 (python 2.7) - Pip 22.1.1 (python 3.9) - Pipx 1.1.0 - RubyGems 3.2.33 -- Vcpkg 2022 (build from master \<f78f4440d>) +- Vcpkg 2022 (build from master \<faed44dfa>) - Yarn 1.22.19 #### Environment variables @@ -80,7 +79,7 @@ - gpg (GnuPG) 2.3.6 - helm v3.9.0+g7ceeda6 - Hub CLI: 2.14.2 -- ImageMagick 7.1.0-33 +- ImageMagick 7.1.0-36 - jq 1.6 - mongo v5.0.7 - mongod v5.0.7 @@ -100,7 +99,7 @@ ### Tools - Aliyun CLI 3.0.121 - App Center CLI 2.10.10 -- AWS CLI 2.7.4 +- AWS CLI 2.7.6 - AWS SAM CLI 1.51.0 - AWS Session Manager CLI 1.2.331.0 - Azure CLI (azure-devops) 0.25.0 @@ -126,8 +125,8 @@ - SafariDriver 15.5 (15613.2.7.1.9) - Google Chrome 102.0.5005.61 - ChromeDriver 102.0.5005.61 -- Microsoft Edge 102.0.1245.30 -- Microsoft Edge WebDriver 102.0.1245.2 +- Microsoft Edge 102.0.1245.33 +- Microsoft Edge WebDriver 102.0.1245.33 - Mozilla Firefox 101.0 - geckodriver 0.31.0 - Selenium server 4.2.0 @@ -180,14 +179,14 @@ #### Node.js - 12.22.12 - 14.19.3 -- 16.15.0 +- 16.15.1 #### Go | Version | Architecture | Environment Variable | | ------- | ------------ | -------------------- | | 1.16.15 | x64 | GOROOT_1_16_X64 | -| 1.17.10 (Default) | x64 | GOROOT_1_17_X64 | -| 1.18.2 | x64 | GOROOT_1_18_X64 | +| 1.17.11 (Default) | x64 | GOROOT_1_17_X64 | +| 1.18.3 | x64 | GOROOT_1_18_X64 | ### Rust Tools - Cargo 1.61.0 @@ -196,7 +195,7 @@ - Rustup 1.24.3 #### Packages -- Bindgen 0.59.2 +- Bindgen 0.60.0 - Cargo-audit 0.17.0 - Cargo-outdated 0.11.1 - Cbindgen 0.23.0 @@ -372,7 +371,7 @@ | Google APIs | addon-google_apis-google-21<br>addon-google_apis-google-22<br>addon-google_apis-google-23<br>addon-google_apis-google-24 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 15.2.4203891<br>18.1.5063045<br>21.4.7075529 (default)<br>22.1.7171670<br>23.2.8568313 | +| NDK | 15.2.4203891<br>18.1.5063045<br>21.4.7075529<br>23.2.8568313 (default)<br>24.0.8215888 | | SDK Patch Applier v4 | 1 | | Intel HAXM | 7.6.5 | @@ -381,9 +380,9 @@ | ----------------------- | -------------------------------------------------------------------------------------------------- | | ANDROID_HOME | /Users/runner/Library/Android/sdk | | ANDROID_NDK_18R_PATH | /Users/runner/Library/Android/sdk/ndk/18.1.5063045 | -| ANDROID_NDK_HOME | /Users/runner/Library/Android/sdk/ndk-bundle -> /Users/runner/Library/Android/sdk/ndk/21.4.7075529 | -| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/23.2.8568313 | -| ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk-bundle -> /Users/runner/Library/Android/sdk/ndk/21.4.7075529 | +| ANDROID_NDK_HOME | /Users/runner/Library/Android/sdk/ndk-bundle -> /Users/runner/Library/Android/sdk/ndk/23.2.8568313 | +| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/24.0.8215888 | +| ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk-bundle -> /Users/runner/Library/Android/sdk/ndk/23.2.8568313 | | ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | ### Miscellaneous From e636e5e9b4d936f93ed8dc49f0928c8fed6ffa84 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 9 Jun 2022 14:20:05 +0000 Subject: [PATCH 1228/3485] Updating readme file for win19 version 20220606.1 (#5705) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2019-Readme.md | 62 ++++++++++++++++---------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index 48a3a19c1ab9..8ae31874bad7 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -5,7 +5,7 @@ *** # Microsoft Windows Server 2019 Datacenter - OS Version: 10.0.17763 Build 2928 -- Image Version: 20220529.1 +- Image Version: 20220606.1 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -13,11 +13,11 @@ ## Installed Software ### Language and Runtime - Bash 4.4.23(1)-release -- Go 1.17.10 +- Go 1.17.11 - Julia 1.7.3 - Kotlin 1.6.21 - LLVM 13.0.1 -- Node 16.14.2 +- Node 16.15.1 - Perl 5.32.1 - PHP 8.1.6 - Python 3.7.9 @@ -25,15 +25,15 @@ ### Package Management - Chocolatey 1.1.0 -- Composer 2.3.5 +- Composer 2.3.7 - Helm 3.8.2 - Miniconda 4.12.0 (pre-installed on the image but not added to PATH) -- NPM 8.5.0 +- NPM 8.11.0 - NuGet 6.2.0.146 -- pip 22.1.1 (python 3.7) +- pip 22.1.2 (python 3.7) - Pipx 1.1.0 - RubyGems 2.7.6.3 -- Vcpkg (build from master \<d953973cf>) +- Vcpkg (build from master \<203f5f3be>) - Yarn 1.22.18 #### Environment variables @@ -57,15 +57,15 @@ - Bicep 0.6.18 - Cabal 3.6.2.0 - CMake 3.23.2 -- CodeQL Action Bundle 2.9.2 +- CodeQL Action Bundle 2.9.3 - Docker 20.10.7 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.5.1 +- Docker Compose v2 2.6.0 - Docker-wincred 0.6.4 - ghc 9.2.3 - Git 2.36.0.windows.1 - Git LFS 3.1.4 -- Google Cloud SDK 387.0.0 +- Google Cloud SDK 388.0.0 - InnoSetup 6.2.1 - jq 1.6 - Kind 0.14.0 @@ -76,14 +76,14 @@ - NSIS v3.08 - OpenSSL 1.1.1 - Packer 1.8.0 -- Parcel 2.5.0 +- Parcel 2.6.0 - Pulumi v3.33.2 - R 4.2.0 -- Service Fabric SDK 9.0.1017.9590 +- Service Fabric SDK 9.0.1028.9590 - Stack 2.7.5 - Subversion (SVN) 1.14.2 - Swig 4.0.2 -- VSWhere 3.0.2 +- VSWhere 3.0.3 - WinAppDriver 1.2.2009.02003 - WiX Toolset v3.11.2.4516 - yamllint 1.26.3 @@ -91,8 +91,8 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.121 -- AWS CLI 2.7.4 -- AWS SAM CLI 1.50.0 +- AWS CLI 2.7.6 +- AWS SAM CLI 1.51.0 - AWS Session Manager CLI 1.2.331.0 - Azure CLI 2.37.0 - Azure DevOps CLI extension 0.25.0 @@ -107,7 +107,7 @@ - Rustup 1.24.3 #### Packages -- bindgen 0.59.2 +- bindgen 0.60.1 - cargo-audit 0.17.0 - cargo-outdated 0.11.1 - cbindgen 0.23.0 @@ -117,9 +117,9 @@ ### Browsers and webdrivers - Google Chrome 102.0.5005.63 - Chrome Driver 102.0.5005.61 -- Microsoft Edge 101.0.1210.53 -- Microsoft Edge Driver 101.0.1210.53 -- Mozilla Firefox 100.0.2 +- Microsoft Edge 102.0.1245.33 +- Microsoft Edge Driver 102.0.1245.33 +- Mozilla Firefox 101.0 - Gecko Driver 0.31.0 - IE Driver 3.150.1.1 - Selenium server 4.2.0 @@ -165,15 +165,15 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Version | Architecture | Environment Variable | | ------- | ------------ | -------------------- | | 1.16.15 | x64 | GOROOT_1_16_X64 | -| 1.17.10 (Default) | x64 | GOROOT_1_17_X64 | -| 1.18.2 | x64 | GOROOT_1_18_X64 | +| 1.17.11 (Default) | x64 | GOROOT_1_17_X64 | +| 1.18.3 | x64 | GOROOT_1_18_X64 | #### Node | Version | Architecture | | ------- | ------------ | | 12.22.12 | x64 | | 14.19.3 | x64 | -| 16.15.0 | x64 | +| 16.15.1 | x64 | #### Python | Version | Architecture | @@ -220,7 +220,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### MongoDB | Version | ServiceName | ServiceStatus | ServiceStartType | | ------- | ----------- | ------------- | ---------------- | -| 5.0.8.0 | MongoDB | Running | Automatic | +| 5.0.9.0 | MongoDB | Running | Automatic | ### Database tools - Azure CosmosDb Emulator 2.14.7.0 @@ -469,7 +469,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | ms-biztalk.BizTalk | 3.13.2.0 | | ProBITools.MicrosoftAnalysisServicesModelingProjects | 2.9.18 | | ProBITools.MicrosoftReportProjectsforVisualStudio | 2.6.11 | -| SSIS.SqlServerIntegrationServicesProjects | 3.16 | +| SSIS.SqlServerIntegrationServicesProjects | 4.0 | | VisualStudioClient.MicrosoftVisualStudio2017InstallerProjects | 1.0.2 | | Windows Driver Kit | 10.0.21381.0 | | Windows Driver Kit Visual Studio Extension | 10.1.22000.1 | @@ -547,7 +547,7 @@ All other versions are saved but not installed. #### Powershell Modules | Module | Version | | ------------------ | ---------------- | -| AWSPowerShell | 4.1.95 | +| AWSPowerShell | 4.1.98 | | DockerMsftProvider | 1.0.0.8 | | MarkdownPS | 1.9 | | Microsoft.Graph | 1.9.6 | @@ -561,7 +561,7 @@ All other versions are saved but not installed. ### Android | Package Name | Version | | -------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 4.0 | +| Android Command Line Tools | 7.0 | | Android SDK Build-tools | 32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3<br>26.0.0 26.0.1 26.0.2 26.0.3<br>25.0.0 25.0.1 25.0.2 25.0.3<br>24.0.0 24.0.1 24.0.2 24.0.3<br>23.0.1 23.0.2 23.0.3<br>22.0.1<br>21.1.2<br>20.0.0<br>19.1.0 | | Android SDK Platforms | android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3)<br>android-26 (rev 2)<br>android-25 (rev 3)<br>android-24 (rev 2)<br>android-23 (rev 3)<br>android-22 (rev 2)<br>android-21 (rev 2)<br>android-20 (rev 2)<br>android-19 (rev 4) | | Android SDK Platform-Tools | 33.0.2 | @@ -571,17 +571,17 @@ All other versions are saved but not installed. | Google APIs | addon-google_apis-google-21<br>addon-google_apis-google-22<br>addon-google_apis-google-23<br>addon-google_apis-google-24 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 21.4.7075529 (default)<br>22.1.7171670<br>23.2.8568313 | +| NDK | 21.4.7075529<br>23.2.8568313 (default)<br>24.0.8215888 | | SDK Patch Applier v4 | 1 | #### Environment variables | Name | Value | | ----------------------- | ---------------------------------------------------------------------------- | | ANDROID_HOME | C:\Android\android-sdk | -| ANDROID_NDK_HOME | C:\Android\android-sdk\ndk-bundle -> C:\Android\android-sdk\ndk\21.4.7075529 | -| ANDROID_NDK_LATEST_HOME | C:\Android\android-sdk\ndk\23.2.8568313 | -| ANDROID_NDK_PATH | C:\Android\android-sdk\ndk-bundle -> C:\Android\android-sdk\ndk\21.4.7075529 | -| ANDROID_NDK_ROOT | C:\Android\android-sdk\ndk-bundle -> C:\Android\android-sdk\ndk\21.4.7075529 | +| ANDROID_NDK_HOME | C:\Android\android-sdk\ndk-bundle -> C:\Android\android-sdk\ndk\23.2.8568313 | +| ANDROID_NDK_LATEST_HOME | C:\Android\android-sdk\ndk\24.0.8215888 | +| ANDROID_NDK_PATH | C:\Android\android-sdk\ndk-bundle -> C:\Android\android-sdk\ndk\23.2.8568313 | +| ANDROID_NDK_ROOT | C:\Android\android-sdk\ndk-bundle -> C:\Android\android-sdk\ndk\23.2.8568313 | | ANDROID_SDK_ROOT | C:\Android\android-sdk | ### Cached Docker images From 161fb6f4d10591cb47f46b6a9a298466ad066883 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 9 Jun 2022 15:55:10 +0000 Subject: [PATCH 1229/3485] Updating readme file for macOS-11 version 20220605.1 (#5698) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-11-Readme.md | 55 ++++++++++++++++----------------- 1 file changed, 27 insertions(+), 28 deletions(-) diff --git a/images/macos/macos-11-Readme.md b/images/macos/macos-11-Readme.md index 740ef3534f8a..22fc62c5208e 100644 --- a/images/macos/macos-11-Readme.md +++ b/images/macos/macos-11-Readme.md @@ -1,13 +1,12 @@ | Announcements | |-| -| [[macOS] Default Visual studio for mac will be changed to version 2022 for macOS 11&12 on May, 30](https://github.com/actions/virtual-environments/issues/5601) | | [[all OSs] Android NDK 22 will be replaced in favor of 24, version 23 will be set as the default one on June, 6](https://github.com/actions/virtual-environments/issues/5595) | | [macOS 12 (Monterey) is available as a public beta in GitHub Actions and Azure DevOps](https://github.com/actions/virtual-environments/issues/5446) | *** # macOS 11.6 info - System Version: macOS 11.6.6 (20G624) - Kernel Version: Darwin 20.6.0 -- Image Version: 20220530.2 +- Image Version: 20220605.1 ## Installed Software ### Language and Runtime @@ -21,13 +20,13 @@ - GNU Fortran (Homebrew GCC 9.5.0) 9.5.0 - available by `gfortran-9` alias - GNU Fortran (Homebrew GCC 10.3.0) 10.3.0 - available by `gfortran-10` alias - GNU Fortran (Homebrew GCC 11.3.0_1) 11.3.0 - available by `gfortran-11` alias -- Go 1.17.10 +- Go 1.17.11 - julia 1.7.3 - Kotlin 1.6.21-release-334 - MSBuild 16.10.1.17201 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) -- Node.js v16.15.0 +- Node.js v16.15.1 - NVM 0.39.1 -- NVM - Cached node versions: v12.22.12 v14.19.3 v16.15.0 +- NVM - Cached node versions: v12.22.12 v14.19.3 v16.15.1 - Perl 5.34.0 - PHP 8.1.6 - Python 2.7.18 @@ -36,19 +35,19 @@ - Ruby 2.7.6p219 ### Package Management -- Bundler version 2.3.14 +- Bundler version 2.3.15 - Carthage 0.38.0 - CocoaPods 1.11.3 -- Composer 2.3.5 +- Composer 2.3.6 - Homebrew 3.4.11 - Miniconda 4.12.0 -- NPM 8.5.5 +- NPM 8.11.0 - NuGet 5.9.0.7134 - Pip 20.3.4 (python 2.7) - Pip 22.1.1 (python 3.9) - Pipx 1.1.0 - RubyGems 3.2.33 -- Vcpkg 2022 (build from master \<d953973cf>) +- Vcpkg 2022 (build from master \<faed44dfa>) - Yarn 1.22.19 #### Environment variables @@ -79,7 +78,7 @@ - gpg (GnuPG) 2.3.6 - helm v3.9.0+g7ceeda6 - Hub CLI: 2.14.2 -- ImageMagick 7.1.0-33 +- ImageMagick 7.1.0-36 - jq 1.6 - mongo v5.0.7 - mongod v5.0.7 @@ -97,8 +96,8 @@ ### Tools - Aliyun CLI 3.0.121 - App Center CLI 2.10.10 -- AWS CLI 2.7.4 -- AWS SAM CLI 1.50.0 +- AWS CLI 2.7.6 +- AWS SAM CLI 1.51.0 - AWS Session Manager CLI 1.2.331.0 - Azure CLI (azure-devops) 0.25.0 - Azure CLI 2.37.0 @@ -123,9 +122,9 @@ - SafariDriver 15.5 (16613.2.7.1.9) - Google Chrome 102.0.5005.61 - ChromeDriver 102.0.5005.61 -- Microsoft Edge 101.0.1210.53 -- MSEdgeDriver 101.0.1210.53 -- Mozilla Firefox 100.0.2 +- Microsoft Edge 102.0.1245.33 +- Microsoft Edge WebDriver 102.0.1245.33 +- Mozilla Firefox 101.0 - geckodriver 0.31.0 - Selenium server 4.2.0 @@ -172,14 +171,14 @@ #### Node.js - 12.22.12 - 14.19.3 -- 16.15.0 +- 16.15.1 #### Go | Version | Architecture | Environment Variable | | ------- | ------------ | -------------------- | | 1.16.15 | x64 | GOROOT_1_16_X64 | -| 1.17.10 (Default) | x64 | GOROOT_1_17_X64 | -| 1.18.2 | x64 | GOROOT_1_18_X64 | +| 1.17.11 (Default) | x64 | GOROOT_1_17_X64 | +| 1.18.3 | x64 | GOROOT_1_18_X64 | ### Rust Tools - Cargo 1.61.0 @@ -188,7 +187,7 @@ - Rustup 1.24.3 #### Packages -- Bindgen 0.59.2 +- Bindgen 0.60.0 - Cargo-audit 0.17.0 - Cargo-outdated 0.11.1 - Cbindgen 0.23.0 @@ -214,10 +213,10 @@ ### Xamarin #### Visual Studio for Mac -| Version | Build | Path | -| -------------- | ----------- | ------------------------------------ | -| 2019 | 8.10.23.7 | /Applications/Visual Studio 2019.app | -| 2022 (default) | 17.0.0.8989 | /Applications/Visual Studio.app | +| Version | Build | Path | +| -------------- | --------- | ------------------------------------ | +| 2019 | 8.10.23.7 | /Applications/Visual Studio 2019.app | +| 2022 (default) | 17.0.1.72 | /Applications/Visual Studio.app | #### Xamarin bundles | symlink | Xamarin.Mono | Xamarin.iOS | Xamarin.Mac | Xamarin.Android | @@ -325,7 +324,7 @@ ### Android | Package Name | Version | | -------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 4.0 | +| Android Command Line Tools | 7.0 | | Android Emulator | 31.2.10 | | Android SDK Build-tools | 32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | | Android SDK Platforms | android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | @@ -334,16 +333,16 @@ | CMake | 3.10.2<br>3.18.1 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 21.4.7075529 (default)<br>22.1.7171670<br>23.2.8568313 | +| NDK | 21.4.7075529<br>23.2.8568313 (default)<br>24.0.8215888 | | SDK Patch Applier v4 | 1 | #### Environment variables | Name | Value | | ----------------------- | -------------------------------------------------------------------------------------------------- | | ANDROID_HOME | /Users/runner/Library/Android/sdk | -| ANDROID_NDK_HOME | /Users/runner/Library/Android/sdk/ndk-bundle -> /Users/runner/Library/Android/sdk/ndk/21.4.7075529 | -| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/23.2.8568313 | -| ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk-bundle -> /Users/runner/Library/Android/sdk/ndk/21.4.7075529 | +| ANDROID_NDK_HOME | /Users/runner/Library/Android/sdk/ndk-bundle -> /Users/runner/Library/Android/sdk/ndk/23.2.8568313 | +| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/24.0.8215888 | +| ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk-bundle -> /Users/runner/Library/Android/sdk/ndk/23.2.8568313 | | ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | ### Miscellaneous From f015f9e6602242564481b1c63021bd73531083ac Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 9 Jun 2022 17:21:23 +0000 Subject: [PATCH 1230/3485] Updating readme file for ubuntu22 version 20220605.1 (#5695) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2204-Readme.md | 35 ++++++++++++++++--------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/images/linux/Ubuntu2204-Readme.md b/images/linux/Ubuntu2204-Readme.md index 16658075ffc6..8baa8b8fbc43 100644 --- a/images/linux/Ubuntu2204-Readme.md +++ b/images/linux/Ubuntu2204-Readme.md @@ -1,11 +1,12 @@ | Announcements | |-| +| [[Ubuntu] AWS CLI on Ubuntu18 image will be upgraded to V2 on June 20](https://github.com/actions/virtual-environments/issues/5679) | | [[all OSs] Android NDK 22 will be replaced in favor of 24, version 23 will be set as the default one on June, 6](https://github.com/actions/virtual-environments/issues/5595) | | [(Public Beta) Ubuntu 22.04 is now available](https://github.com/actions/virtual-environments/issues/5490) | *** # Ubuntu 22.04 LTS -- Linux kernel version: 5.15.0-1007-azure -- Image Version: 20220601.2 +- Linux kernel version: 5.15.0-1008-azure +- Image Version: 20220605.1 ## Installed Software ### Language and Runtime @@ -17,7 +18,7 @@ - GNU Fortran 9.4.0, 10.3.0, 11.2.0 - Julia 1.7.3 - Kotlin 1.6.21-release-334 -- Node 16.15.0 +- Node 16.15.1 - Perl 5.34.0 - Python 3.10.4 - Python3 3.10.4 @@ -28,12 +29,12 @@ - Helm 3.9.0 - Homebrew 3.4.11 - Miniconda 4.12.0 -- Npm 8.5.5 +- Npm 8.11.0 - Pip 22.0.2 - Pip3 22.0.2 - Pipx 1.1.0 - RubyGems 3.3.5 -- Vcpkg (build from master \<f78f4440d>) +- Vcpkg (build from master \<faed44dfa>) - Yarn 1.22.18 #### Environment variables @@ -54,7 +55,7 @@ - Bicep 0.6.18 - Buildah 1.23.1 - CMake 3.23.2 -- CodeQL Action Bundle 2.9.2 +- CodeQL Action Bundle 2.9.3 - Docker Amazon ECR Credential Helper 0.6.0 - Docker Compose v1 1.29.2 - Docker Compose v2 2.4.1+azure-1 @@ -87,14 +88,14 @@ - Skopeo 1.4.1 - Sphinx Open Source Search Server 2.2.11 - SVN 1.14.1 -- Terraform 1.2.1 +- Terraform 1.2.2 - yamllint 1.26.3 - yq 4.25.2 - zstd 1.5.2 (homebrew) ### CLI Tools - Alibaba Cloud CLI 3.0.121 -- AWS CLI 2.7.4 +- AWS CLI 2.7.6 - AWS CLI Session manager plugin 1.2.331.0 - AWS SAM CLI 1.51.0 - Azure CLI (azure-cli) 2.37.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) @@ -103,9 +104,9 @@ - Google Cloud SDK 369.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 - Netlify CLI 10.4.0 -- OpenShift CLI 4.10.15 +- OpenShift CLI 4.10.16 - ORAS CLI 0.12.0 -- Vercel CLI 24.2.5 +- Vercel CLI 25.0.0 ### Java | Version | Vendor | Environment Variable | @@ -123,7 +124,7 @@ | Tool | Version | | -------- | ------- | | PHP | 8.1.6 | -| Composer | 2.3.5 | +| Composer | 2.3.6 | | PHPUnit | 8.5.26 | ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. @@ -141,7 +142,7 @@ - Rustup 1.24.3 #### Packages -- Bindgen 0.59.2 +- Bindgen 0.60.0 - Cargo audit 0.17.0 - Cargo clippy 0.1.61 - Cargo outdated 0.11.1 @@ -186,12 +187,12 @@ ``` ### Cached Tools #### Go -- 1.17.10 -- 1.18.2 +- 1.17.11 +- 1.18.3 #### Node.js - 14.19.3 -- 16.15.0 +- 16.15.1 #### PyPy - 3.7.13 [PyPy 7.3.9] @@ -210,8 +211,8 @@ #### Environment variables | Name | Value | Architecture | | --------------- | ----------------------------------- | ------------ | -| GOROOT_1_17_X64 | /opt/hostedtoolcache/go/1.17.10/x64 | x64 | -| GOROOT_1_18_X64 | /opt/hostedtoolcache/go/1.18.2/x64 | x64 | +| GOROOT_1_17_X64 | /opt/hostedtoolcache/go/1.17.11/x64 | x64 | +| GOROOT_1_18_X64 | /opt/hostedtoolcache/go/1.18.3/x64 | x64 | ### PowerShell Tools - PowerShell 7.2.4 From 6466abe35ea7a2c2c98c01f1ed552214a5aed44d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 9 Jun 2022 18:27:47 +0000 Subject: [PATCH 1231/3485] Updating readme file for ubuntu18 version 20220605.1 (#5694) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu1804-Readme.md | 63 ++++++++++++++++--------------- 1 file changed, 32 insertions(+), 31 deletions(-) diff --git a/images/linux/Ubuntu1804-Readme.md b/images/linux/Ubuntu1804-Readme.md index 7cfe765bdfc5..5a04676d1ccb 100644 --- a/images/linux/Ubuntu1804-Readme.md +++ b/images/linux/Ubuntu1804-Readme.md @@ -1,11 +1,12 @@ | Announcements | |-| +| [[Ubuntu] AWS CLI on Ubuntu18 image will be upgraded to V2 on June 20](https://github.com/actions/virtual-environments/issues/5679) | | [[all OSs] Android NDK 22 will be replaced in favor of 24, version 23 will be set as the default one on June, 6](https://github.com/actions/virtual-environments/issues/5595) | | [(Public Beta) Ubuntu 22.04 is now available](https://github.com/actions/virtual-environments/issues/5490) | *** # Ubuntu 18.04.6 LTS - Linux kernel version: 5.4.0-1080-azure -- Image Version: 20220529.1 +- Image Version: 20220605.1 ## Installed Software ### Language and Runtime @@ -21,7 +22,7 @@ - Kotlin 1.6.21-release-334 - Mono 6.12.0.179 (apt source repository: https://download.mono-project.com/repo/ubuntu stable-bionic main) - MSBuild 16.10.1.31701 (from /usr/lib/mono/msbuild/15.0/bin/MSBuild.dll) -- Node 16.15.0 +- Node 16.15.1 - Perl 5.26.1 - Python 2.7.17 - Python3 3.6.9 @@ -33,12 +34,12 @@ - Helm 3.9.0 - Homebrew 3.4.11 - Miniconda 4.12.0 -- Npm 8.5.5 +- Npm 8.11.0 - Pip 9.0.1 - Pip3 9.0.1 - Pipx 1.0.0 - RubyGems 2.7.6 -- Vcpkg (build from master \<d953973cf>) +- Vcpkg (build from master \<faed44dfa>) - Yarn 1.22.18 #### Environment variables @@ -62,7 +63,7 @@ - Bicep 0.6.18 - Buildah 1.22.3 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - CMake 3.23.2 -- CodeQL Action Bundle 2.9.2 +- CodeQL Action Bundle 2.9.3 - Docker Amazon ECR Credential Helper 0.6.0 - Docker Compose v1 1.29.2 - Docker Compose v2 2.4.1+azure-1 @@ -74,7 +75,7 @@ - Git-ftp 1.3.1 - Haveged 1.9.1 - Heroku 7.60.2 -- HHVM (HipHop VM) 4.160.0 +- HHVM (HipHop VM) 4.161.0 - jq 1.5 - Kind 0.14.0 - Kubectl 1.24.1 @@ -96,7 +97,7 @@ - Skopeo 1.5.0 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 - SVN 1.9.7 -- Terraform 1.2.1 +- Terraform 1.2.2 - yamllint 1.26.3 - yq 4.25.2 - zstd 1.5.2 (homebrew) @@ -105,16 +106,16 @@ - Alibaba Cloud CLI 3.0.121 - AWS CLI 1.24.10 - AWS CLI Session manager plugin 1.2.331.0 -- AWS SAM CLI 1.50.0 +- AWS SAM CLI 1.51.0 - Azure CLI (azure-cli) 2.37.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.25.0 - GitHub CLI 2.11.3 - Google Cloud SDK 369.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 10.3.3 -- OpenShift CLI 4.10.15 +- Netlify CLI 10.4.0 +- OpenShift CLI 4.10.16 - ORAS CLI 0.12.0 -- Vercel CLI 24.2.4 +- Vercel CLI 25.0.0 ### Java | Version | Vendor | Environment Variable | @@ -125,11 +126,11 @@ | 17.0.3+7 | Eclipse Temurin | JAVA_HOME_17_X64 | ### PHP -| Tool | Version | -| -------- | --------------------------- | +| Tool | Version | +| -------- | --------------------------------- | | PHP | 7.2.34 7.3.33 7.4.29 8.0.19 8.1.6 | -| Composer | 2.3.5 | -| PHPUnit | 8.5.26 | +| Composer | 2.3.6 | +| PHPUnit | 8.5.26 | ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ``` @@ -146,7 +147,7 @@ - Rustup 1.24.3 #### Packages -- Bindgen 0.59.2 +- Bindgen 0.60.0 - Cargo audit 0.17.0 - Cargo clippy 0.1.61 - Cargo outdated 0.11.1 @@ -175,7 +176,7 @@ - nbgv 3.5.107+6463ef6068 ### Databases -- MongoDB 5.0.8 (apt source repository: https://repo.mongodb.org/apt/ubuntu) +- MongoDB 5.0.9 (apt source repository: https://repo.mongodb.org/apt/ubuntu) - sqlite3 3.22.0 #### PostgreSQL @@ -199,13 +200,13 @@ ### Cached Tools #### Go - 1.16.15 -- 1.17.10 -- 1.18.2 +- 1.17.11 +- 1.18.3 #### Node.js - 12.22.12 - 14.19.3 -- 16.15.0 +- 16.15.1 #### PyPy - 2.7.18 [PyPy 7.3.9] @@ -232,8 +233,8 @@ | Name | Value | Architecture | | --------------- | ----------------------------------- | ------------ | | GOROOT_1_16_X64 | /opt/hostedtoolcache/go/1.16.15/x64 | x64 | -| GOROOT_1_17_X64 | /opt/hostedtoolcache/go/1.17.10/x64 | x64 | -| GOROOT_1_18_X64 | /opt/hostedtoolcache/go/1.18.2/x64 | x64 | +| GOROOT_1_17_X64 | /opt/hostedtoolcache/go/1.17.11/x64 | x64 | +| GOROOT_1_18_X64 | /opt/hostedtoolcache/go/1.18.3/x64 | x64 | ### PowerShell Tools - PowerShell 7.2.4 @@ -257,7 +258,7 @@ ### Android | Package Name | Version | | -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 4.0 | +| Android Command Line Tools | 7.0 | | Android Emulator | 31.2.10 | | Android SDK Build-tools | 32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3<br>26.0.0 26.0.1 26.0.2 26.0.3<br>25.0.0 25.0.1 25.0.2 25.0.3<br>24.0.0 24.0.1 24.0.2 24.0.3<br>23.0.1 23.0.2 23.0.3 | | Android SDK Platform-Tools | 33.0.2 | @@ -268,16 +269,16 @@ | Google APIs | addon-google_apis-google-21<br>addon-google_apis-google-22<br>addon-google_apis-google-23<br>addon-google_apis-google-24 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 21.4.7075529 (default)<br>23.2.8568313 | +| NDK | 21.4.7075529<br>23.2.8568313 (default)<br>24.0.8215888 | | SDK Patch Applier v4 | 1 | #### Environment variables | Name | Value | | ----------------------- | ------------------------------------------------------------------------------------ | | ANDROID_HOME | /usr/local/lib/android/sdk | -| ANDROID_NDK_HOME | /usr/local/lib/android/sdk/ndk-bundle -> /usr/local/lib/android/sdk/ndk/21.4.7075529 | -| ANDROID_NDK_LATEST_HOME | /usr/local/lib/android/sdk/ndk/23.2.8568313 | -| ANDROID_NDK_ROOT | /usr/local/lib/android/sdk/ndk-bundle -> /usr/local/lib/android/sdk/ndk/21.4.7075529 | +| ANDROID_NDK_HOME | /usr/local/lib/android/sdk/ndk-bundle -> /usr/local/lib/android/sdk/ndk/23.2.8568313 | +| ANDROID_NDK_LATEST_HOME | /usr/local/lib/android/sdk/ndk/24.0.8215888 | +| ANDROID_NDK_ROOT | /usr/local/lib/android/sdk/ndk-bundle -> /usr/local/lib/android/sdk/ndk/23.2.8568313 | | ANDROID_SDK_ROOT | /usr/local/lib/android/sdk | ### Cached Docker images @@ -323,9 +324,9 @@ | file | 1:5.32-2ubuntu0.4 | | flex | 2.6.4-6 | | ftp | 0.17-34 | -| gnupg2 | 2.2.4-1ubuntu1.4 | +| gnupg2 | 2.2.4-1ubuntu1.5 | | haveged | 1.9.1-6 | -| imagemagick | 8:6.9.7.4+dfsg-16ubuntu6.12 | +| imagemagick | 8:6.9.7.4+dfsg-16ubuntu6.13 | | iproute2 | 4.15.0-2ubuntu1.3 | | iputils-ping | 3:20161105-1ubuntu3 | | jq | 1.5+dfsg-2 | @@ -338,8 +339,8 @@ | libgsl-dev | 2.4+dfsg-6 | | libgtk-3-0 | 3.22.30-1ubuntu4 | | libmagic-dev | 1:5.32-2ubuntu0.4 | -| libmagickcore-dev | 8:6.9.7.4+dfsg-16ubuntu6.12 | -| libmagickwand-dev | 8:6.9.7.4+dfsg-16ubuntu6.12 | +| libmagickcore-dev | 8:6.9.7.4+dfsg-16ubuntu6.13 | +| libmagickwand-dev | 8:6.9.7.4+dfsg-16ubuntu6.13 | | libsecret-1-dev | 0.18.6-1 | | libsqlite3-dev | 3.22.0-1ubuntu0.5 | | libtool | 2.4.6-2 | From 95feb85cb813ee268ac5755d294f1fac438caceb Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 9 Jun 2022 18:33:23 +0000 Subject: [PATCH 1232/3485] Updating readme file for ubuntu20 version 20220605.1 (#5696) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2004-Readme.md | 57 ++++++++++++++++--------------- 1 file changed, 29 insertions(+), 28 deletions(-) diff --git a/images/linux/Ubuntu2004-Readme.md b/images/linux/Ubuntu2004-Readme.md index f78adfa26183..21288ae35277 100644 --- a/images/linux/Ubuntu2004-Readme.md +++ b/images/linux/Ubuntu2004-Readme.md @@ -1,11 +1,12 @@ | Announcements | |-| +| [[Ubuntu] AWS CLI on Ubuntu18 image will be upgraded to V2 on June 20](https://github.com/actions/virtual-environments/issues/5679) | | [[all OSs] Android NDK 22 will be replaced in favor of 24, version 23 will be set as the default one on June, 6](https://github.com/actions/virtual-environments/issues/5595) | | [(Public Beta) Ubuntu 22.04 is now available](https://github.com/actions/virtual-environments/issues/5490) | *** # Ubuntu 20.04.4 LTS - Linux kernel version: 5.13.0-1025-azure -- Image Version: 20220529.1 +- Image Version: 20220605.1 ## Installed Software ### Language and Runtime @@ -21,7 +22,7 @@ - Kotlin 1.6.21-release-334 - Mono 6.12.0.179 (apt source repository: https://download.mono-project.com/repo/ubuntu stable-focal main) - MSBuild 16.10.1.31701 (from /usr/lib/mono/msbuild/15.0/bin/MSBuild.dll) -- Node 16.15.0 +- Node 16.15.1 - Perl 5.30.0 - Python 3.8.10 - Python3 3.8.10 @@ -33,12 +34,12 @@ - Helm 3.9.0 - Homebrew 3.4.11 - Miniconda 4.12.0 -- Npm 8.5.5 +- Npm 8.11.0 - Pip 20.0.2 - Pip3 20.0.2 - Pipx 1.1.0 - RubyGems 3.1.2 -- Vcpkg (build from master \<d953973cf>) +- Vcpkg (build from master \<faed44dfa>) - Yarn 1.22.18 #### Environment variables @@ -63,7 +64,7 @@ - Bicep 0.6.18 - Buildah 1.22.3 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - CMake 3.23.2 -- CodeQL Action Bundle 2.9.2 +- CodeQL Action Bundle 2.9.3 - Docker Amazon ECR Credential Helper 0.6.0 - Docker Compose v1 1.29.2 - Docker Compose v2 2.4.1+azure-1 @@ -76,7 +77,7 @@ - Git-ftp 1.6.0 - Haveged 1.9.1 - Heroku 7.60.2 -- HHVM (HipHop VM) 4.160.0 +- HHVM (HipHop VM) 4.161.0 - jq 1.6 - Kind 0.14.0 - Kubectl 1.24.1 @@ -98,25 +99,25 @@ - Skopeo 1.5.0 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 -- Terraform 1.2.1 +- Terraform 1.2.2 - yamllint 1.26.3 - yq 4.25.2 - zstd 1.5.2 (homebrew) ### CLI Tools - Alibaba Cloud CLI 3.0.121 -- AWS CLI 2.7.4 +- AWS CLI 2.7.6 - AWS CLI Session manager plugin 1.2.331.0 -- AWS SAM CLI 1.50.0 +- AWS SAM CLI 1.51.0 - Azure CLI (azure-cli) 2.37.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.25.0 - GitHub CLI 2.11.3 - Google Cloud SDK 369.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 10.3.3 -- OpenShift CLI 4.10.15 +- Netlify CLI 10.4.0 +- OpenShift CLI 4.10.16 - ORAS CLI 0.12.0 -- Vercel CLI 24.2.4 +- Vercel CLI 25.0.0 ### Java | Version | Vendor | Environment Variable | @@ -131,11 +132,11 @@ | CE 22.1.0 | GRAALVM_11_ROOT | ### PHP -| Tool | Version | -| -------- | ------------- | +| Tool | Version | +| -------- | ------------------- | | PHP | 7.4.29 8.0.19 8.1.6 | -| Composer | 2.3.5 | -| PHPUnit | 8.5.26 | +| Composer | 2.3.6 | +| PHPUnit | 8.5.26 | ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ``` @@ -152,7 +153,7 @@ - Rustup 1.24.3 #### Packages -- Bindgen 0.59.2 +- Bindgen 0.60.0 - Cargo audit 0.17.0 - Cargo clippy 0.1.61 - Cargo outdated 0.11.1 @@ -181,7 +182,7 @@ - nbgv 3.5.107+6463ef6068 ### Databases -- MongoDB 5.0.8 (apt source repository: https://repo.mongodb.org/apt/ubuntu) +- MongoDB 5.0.9 (apt source repository: https://repo.mongodb.org/apt/ubuntu) - sqlite3 3.31.1 #### PostgreSQL @@ -205,13 +206,13 @@ ### Cached Tools #### Go - 1.16.15 -- 1.17.10 -- 1.18.2 +- 1.17.11 +- 1.18.3 #### Node.js - 12.22.12 - 14.19.3 -- 16.15.0 +- 16.15.1 #### PyPy - 2.7.18 [PyPy 7.3.9] @@ -239,8 +240,8 @@ | Name | Value | Architecture | | --------------- | ----------------------------------- | ------------ | | GOROOT_1_16_X64 | /opt/hostedtoolcache/go/1.16.15/x64 | x64 | -| GOROOT_1_17_X64 | /opt/hostedtoolcache/go/1.17.10/x64 | x64 | -| GOROOT_1_18_X64 | /opt/hostedtoolcache/go/1.18.2/x64 | x64 | +| GOROOT_1_17_X64 | /opt/hostedtoolcache/go/1.17.11/x64 | x64 | +| GOROOT_1_18_X64 | /opt/hostedtoolcache/go/1.18.3/x64 | x64 | ### PowerShell Tools - PowerShell 7.2.4 @@ -266,7 +267,7 @@ ### Android | Package Name | Version | | -------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 4.0 | +| Android Command Line Tools | 7.0 | | Android Emulator | 31.2.10 | | Android SDK Build-tools | 32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | | Android SDK Platform-Tools | 33.0.2 | @@ -276,16 +277,16 @@ | CMake | 3.10.2<br>3.18.1 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 21.4.7075529 (default)<br>22.1.7171670<br>23.2.8568313 | +| NDK | 21.4.7075529<br>23.2.8568313 (default)<br>24.0.8215888 | | SDK Patch Applier v4 | 1 | #### Environment variables | Name | Value | | ----------------------- | ------------------------------------------------------------------------------------ | | ANDROID_HOME | /usr/local/lib/android/sdk | -| ANDROID_NDK_HOME | /usr/local/lib/android/sdk/ndk-bundle -> /usr/local/lib/android/sdk/ndk/21.4.7075529 | -| ANDROID_NDK_LATEST_HOME | /usr/local/lib/android/sdk/ndk/23.2.8568313 | -| ANDROID_NDK_ROOT | /usr/local/lib/android/sdk/ndk-bundle -> /usr/local/lib/android/sdk/ndk/21.4.7075529 | +| ANDROID_NDK_HOME | /usr/local/lib/android/sdk/ndk-bundle -> /usr/local/lib/android/sdk/ndk/23.2.8568313 | +| ANDROID_NDK_LATEST_HOME | /usr/local/lib/android/sdk/ndk/24.0.8215888 | +| ANDROID_NDK_ROOT | /usr/local/lib/android/sdk/ndk-bundle -> /usr/local/lib/android/sdk/ndk/23.2.8568313 | | ANDROID_SDK_ROOT | /usr/local/lib/android/sdk | ### Cached Docker images From 2950cbfeab88a6a6202fa31d7371e574dbe2dc51 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 9 Jun 2022 18:43:35 +0000 Subject: [PATCH 1233/3485] Updating readme file for win22 version 20220607.3 (#5713) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2022-Readme.md | 79 ++++++++++++++++---------------- 1 file changed, 40 insertions(+), 39 deletions(-) diff --git a/images/win/Windows2022-Readme.md b/images/win/Windows2022-Readme.md index 22f93b812f02..37eb9e9c1198 100644 --- a/images/win/Windows2022-Readme.md +++ b/images/win/Windows2022-Readme.md @@ -5,7 +5,7 @@ *** # Microsoft Windows Server 2022 Datacenter - OS Version: 10.0.20348 Build 707 -- Image Version: 20220529.1 +- Image Version: 20220607.3 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -13,28 +13,28 @@ ## Installed Software ### Language and Runtime - Bash 4.4.23(1)-release -- Go 1.17.10 +- Go 1.17.11 - Julia 1.7.3 - Kotlin 1.6.21 - LLVM 13.0.1 -- Node 16.14.2 +- Node 16.15.1 - Perl 5.32.1 -- PHP 8.1.6 +- PHP 8.1.7 - Python 3.9.13 - Ruby 3.0.4p208 ### Package Management - Chocolatey 1.1.0 -- Composer 2.3.5 +- Composer 2.3.7 - Helm 3.8.2 - Miniconda 4.12.0 (pre-installed on the image but not added to PATH) -- NPM 8.5.0 +- NPM 8.11.0 - NuGet 6.2.0.146 -- pip 22.1.1 (python 3.9) +- pip 22.1.2 (python 3.9) - Pipx 1.1.0 - RubyGems 3.2.33 -- Vcpkg (build from master \<d953973cf>) -- Yarn 1.22.18 +- Vcpkg (build from master \<a15782fee>) +- Yarn 1.22.19 #### Environment variables | Name | Value | @@ -51,15 +51,15 @@ - 7zip 21.07 - aria2 1.36.0 - azcopy 10.15.0 -- Bazel 5.1.1 +- Bazel 5.2.0 - Bazelisk 1.11.0 - Bicep 0.6.18 - Cabal 3.6.2.0 - CMake 3.23.2 -- CodeQL Action Bundle 2.9.2 +- CodeQL Action Bundle 2.9.3 - Docker 20.10.7 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.5.1 +- Docker Compose v2 2.6.0 - Docker-wincred 0.6.4 - ghc 9.2.3 - Git 2.36.0.windows.1 @@ -74,13 +74,13 @@ - NSIS v3.08 - OpenSSL 1.1.1 - Packer 1.8.0 -- Pulumi v3.33.2 +- Pulumi v3.34.0 - R 4.2.0 -- Service Fabric SDK 9.0.1017.9590 +- Service Fabric SDK 9.0.1028.9590 - Stack 2.7.5 - Subversion (SVN) 1.14.2 - Swig 4.0.2 -- VSWhere 3.0.2 +- VSWhere 3.0.3 - WinAppDriver 1.2.2009.02003 - WiX Toolset v3.11.2.4516 - yamllint 1.26.3 @@ -88,12 +88,12 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.121 -- AWS CLI 2.7.4 -- AWS SAM CLI 1.50.0 +- AWS CLI 2.7.6 +- AWS SAM CLI 1.51.0 - AWS Session Manager CLI 1.2.331.0 - Azure CLI 2.37.0 - Azure DevOps CLI extension 0.25.0 -- GitHub CLI 2.11.3 +- GitHub CLI 2.12.0 - Hub CLI 2.14.2 ### Rust Tools @@ -103,19 +103,19 @@ - Rustup 1.24.3 #### Packages -- bindgen 0.59.2 +- bindgen 0.60.1 - cargo-audit 0.17.0 - cargo-outdated 0.11.1 -- cbindgen 0.23.0 +- cbindgen 0.24.2 - Clippy 0.1.61 - Rustfmt 1.4.38 ### Browsers and webdrivers - Google Chrome 102.0.5005.63 - Chrome Driver 102.0.5005.61 -- Microsoft Edge 101.0.1210.53 -- Microsoft Edge Driver 101.0.1210.53 -- Mozilla Firefox 100.0.2 +- Microsoft Edge 102.0.1245.33 +- Microsoft Edge Driver 102.0.1245.33 +- Mozilla Firefox 101.0 - Gecko Driver 0.31.0 - IE Driver 3.150.1.1 - Selenium server 4.2.0 @@ -157,15 +157,15 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Version | Architecture | Environment Variable | | ------- | ------------ | -------------------- | | 1.16.15 | x64 | GOROOT_1_16_X64 | -| 1.17.10 (Default) | x64 | GOROOT_1_17_X64 | -| 1.18.2 | x64 | GOROOT_1_18_X64 | +| 1.17.11 (Default) | x64 | GOROOT_1_17_X64 | +| 1.18.3 | x64 | GOROOT_1_18_X64 | #### Node | Version | Architecture | | ------- | ------------ | | 12.22.12 | x64 | | 14.19.3 | x64 | -| 16.15.0 | x64 | +| 16.15.1 | x64 | #### Python | Version | Architecture | @@ -173,7 +173,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | 3.7.9 | x64, x86 | | 3.8.10 | x64, x86 | | 3.9.13 (Default) | x64, x86 | -| 3.10.4 | x64, x86 | +| 3.10.5 | x64, x86 | #### Ruby | Version | Architecture | @@ -206,7 +206,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### MongoDB | Version | ServiceName | ServiceStatus | ServiceStartType | | ------- | ----------- | ------------- | ---------------- | -| 5.0.8.0 | MongoDB | Running | Automatic | +| 5.0.9.0 | MongoDB | Running | Automatic | ### Database tools - Azure CosmosDb Emulator 2.14.7.0 @@ -224,7 +224,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Visual Studio Enterprise 2022 | Name | Version | Path | | ----------------------------- | -------------- | -------------------------------------------------------- | -| Visual Studio Enterprise 2022 | 17.2.32519.379 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | +| Visual Studio Enterprise 2022 | 17.2.32526.322 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | #### Workloads, components and extensions: | Package | Version | @@ -431,17 +431,18 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Workload.ManagedDesktop | 17.2.32408.312 | | Microsoft.VisualStudio.Workload.ManagedGame | 17.2.32408.312 | | Microsoft.VisualStudio.Workload.NativeCrossPlat | 17.2.32408.312 | -| Microsoft.VisualStudio.Workload.NativeDesktop | 17.2.32408.312 | -| Microsoft.VisualStudio.Workload.NativeGame | 17.2.32408.312 | +| Microsoft.VisualStudio.Workload.NativeDesktop | 17.2.32526.322 | +| Microsoft.VisualStudio.Workload.NativeGame | 17.2.32526.322 | | Microsoft.VisualStudio.Workload.NativeMobile | 17.2.32408.312 | | Microsoft.VisualStudio.Workload.NetCrossPlat | 17.2.32503.295 | | Microsoft.VisualStudio.Workload.NetWeb | 17.2.32408.312 | | Microsoft.VisualStudio.Workload.Node | 17.2.32408.312 | | Microsoft.VisualStudio.Workload.Office | 17.2.32408.312 | | Microsoft.VisualStudio.Workload.Python | 17.2.32408.312 | -| Microsoft.VisualStudio.Workload.Universal | 17.2.32408.312 | +| Microsoft.VisualStudio.Workload.Universal | 17.2.32526.322 | | Microsoft.VisualStudio.Workload.VisualStudioExtension | 17.2.32408.312 | | wasm.tools | 6.0.422.16404 | +| ProBITools.MicrosoftReportProjectsforVisualStudio2022 | 3.0.1 | | VisualStudioClient.MicrosoftVisualStudio2022InstallerProjects | 2.0.0 | | WixToolset.WixToolsetVisualStudio2022Extension | 1.0.0.18 | @@ -506,7 +507,7 @@ All other versions are saved but not installed. #### Powershell Modules | Module | Version | | ------------------ | ---------------- | -| AWSPowerShell | 4.1.95 | +| AWSPowerShell | 4.1.100 | | DockerMsftProvider | 1.0.0.8 | | MarkdownPS | 1.9 | | Microsoft.Graph | 1.9.6 | @@ -520,7 +521,7 @@ All other versions are saved but not installed. ### Android | Package Name | Version | | -------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 4.0 | +| Android Command Line Tools | 7.0 | | Android Emulator | 31.2.10 | | Android SDK Build-tools | 32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | | Android SDK Platforms | android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | @@ -529,17 +530,17 @@ All other versions are saved but not installed. | CMake | 3.18.1 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 21.4.7075529 (default)<br>22.1.7171670<br>23.2.8568313 | +| NDK | 21.4.7075529<br>23.2.8568313 (default)<br>24.0.8215888 | | SDK Patch Applier v4 | 1 | #### Environment variables | Name | Value | | ----------------------- | ---------------------------------------------------------------------------- | | ANDROID_HOME | C:\Android\android-sdk | -| ANDROID_NDK_HOME | C:\Android\android-sdk\ndk-bundle -> C:\Android\android-sdk\ndk\21.4.7075529 | -| ANDROID_NDK_LATEST_HOME | C:\Android\android-sdk\ndk\23.2.8568313 | -| ANDROID_NDK_PATH | C:\Android\android-sdk\ndk-bundle -> C:\Android\android-sdk\ndk\21.4.7075529 | -| ANDROID_NDK_ROOT | C:\Android\android-sdk\ndk-bundle -> C:\Android\android-sdk\ndk\21.4.7075529 | +| ANDROID_NDK_HOME | C:\Android\android-sdk\ndk-bundle -> C:\Android\android-sdk\ndk\23.2.8568313 | +| ANDROID_NDK_LATEST_HOME | C:\Android\android-sdk\ndk\24.0.8215888 | +| ANDROID_NDK_PATH | C:\Android\android-sdk\ndk-bundle -> C:\Android\android-sdk\ndk\23.2.8568313 | +| ANDROID_NDK_ROOT | C:\Android\android-sdk\ndk-bundle -> C:\Android\android-sdk\ndk\23.2.8568313 | | ANDROID_SDK_ROOT | C:\Android\android-sdk | ### Cached Docker images From 5181bf0714e118b8eff1286bf3fb006ec692223e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 9 Jun 2022 23:09:51 +0000 Subject: [PATCH 1234/3485] Updating readme file for macOS-12 version 20220605.1 (#5714) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-12-Readme.md | 122 ++++++++++++++++---------------- 1 file changed, 61 insertions(+), 61 deletions(-) diff --git a/images/macos/macos-12-Readme.md b/images/macos/macos-12-Readme.md index 8d94d90851f8..318961b57021 100644 --- a/images/macos/macos-12-Readme.md +++ b/images/macos/macos-12-Readme.md @@ -1,13 +1,12 @@ | Announcements | |-| -| [[macOS] Default Visual studio for mac will be changed to version 2022 for macOS 11&12 on May, 30](https://github.com/actions/virtual-environments/issues/5601) | | [[all OSs] Android NDK 22 will be replaced in favor of 24, version 23 will be set as the default one on June, 6](https://github.com/actions/virtual-environments/issues/5595) | | [macOS 12 (Monterey) is available as a public beta in GitHub Actions and Azure DevOps](https://github.com/actions/virtual-environments/issues/5446) | *** # macOS 12.4 info - System Version: macOS 12.4 (21F79) - Kernel Version: Darwin 21.5.0 -- Image Version: 20220531.1 +- Image Version: 20220605.1 ## Installed Software ### Language and Runtime @@ -17,13 +16,13 @@ - Clang/LLVM 13.1.6 is default - gcc-11 (Homebrew GCC 11.3.0_1) 11.3.0 - available by `gcc-11` alias - GNU Fortran (Homebrew GCC 11.3.0_1) 11.3.0 - available by `gfortran-11` alias -- Go 1.17.10 +- Go 1.17.11 - julia 1.7.3 - Kotlin 1.6.21-release-334 - MSBuild 16.10.1.17201 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) -- Node.js v16.15.0 +- Node.js v16.15.1 - NVM 0.39.1 -- NVM - Cached node versions: v12.22.12 v14.19.3 v16.15.0 +- NVM - Cached node versions: v12.22.12 v14.19.3 v16.15.1 - Perl 5.34.0 - PHP 8.1.6 - Python 2.7.18 @@ -32,18 +31,18 @@ - Ruby 3.0.4p208 ### Package Management -- Bundler version 2.3.14 +- Bundler version 2.3.15 - Carthage 0.38.0 - CocoaPods 1.11.3 -- Composer 2.3.5 +- Composer 2.3.6 - Homebrew 3.4.11 -- NPM 8.5.5 +- NPM 8.11.0 - NuGet 5.9.0.7134 - Pip 20.3.4 (python 2.7) - Pip 22.1.1 (python 3.9) - Pipx 1.1.0 - RubyGems 3.2.33 -- Vcpkg 2022 (build from master \<f78f4440d>) +- Vcpkg 2022 (build from master \<faed44dfa>) - Yarn 1.22.19 ### Project Management @@ -67,7 +66,7 @@ - GNU Wget 1.21.3 - gpg (GnuPG) 2.3.6 - Hub CLI: 2.14.2 -- ImageMagick 7.1.0-33 +- ImageMagick 7.1.0-36 - jq 1.6 - mongo v5.0.7 - mongod v5.0.7 @@ -84,7 +83,7 @@ ### Tools - App Center CLI 2.10.10 -- AWS CLI 2.7.4 +- AWS CLI 2.7.6 - AWS SAM CLI 1.51.0 - AWS Session Manager CLI 1.2.331.0 - Azure CLI (azure-devops) 0.25.0 @@ -110,8 +109,8 @@ - SafariDriver 15.5 (17613.2.7.1.8) - Google Chrome 102.0.5005.61 - ChromeDriver 102.0.5005.61 -- Microsoft Edge 102.0.1245.30 -- Microsoft Edge WebDriver 102.0.1245.2 +- Microsoft Edge 102.0.1245.33 +- Microsoft Edge WebDriver 102.0.1245.33 - Mozilla Firefox 101.0 - geckodriver 0.31.0 - Selenium server 4.2.0 @@ -156,14 +155,14 @@ #### Node.js - 12.22.12 - 14.19.3 -- 16.15.0 +- 16.15.1 #### Go | Version | Architecture | Environment Variable | | ------- | ------------ | -------------------- | | 1.16.15 | x64 | GOROOT_1_16_X64 | -| 1.17.10 (Default) | x64 | GOROOT_1_17_X64 | -| 1.18.2 | x64 | GOROOT_1_18_X64 | +| 1.17.11 (Default) | x64 | GOROOT_1_17_X64 | +| 1.18.3 | x64 | GOROOT_1_18_X64 | ### Rust Tools - Cargo 1.61.0 @@ -172,7 +171,7 @@ - Rustup 1.24.3 #### Packages -- Bindgen 0.59.2 +- Bindgen 0.60.0 - Cargo-audit 0.17.0 - Cargo-outdated 0.11.1 - Cbindgen 0.23.0 @@ -220,6 +219,7 @@ ### Xcode | Version | Build | Path | | ---------------- | -------- | ------------------------------ | +| 13.4.1 | 13F100 | /Applications/Xcode_13.4.1.app | | 13.4 | 13F17a | /Applications/Xcode_13.4.app | | 13.3.1 (default) | 13E500a | /Applications/Xcode_13.3.1.app | | 13.2.1 | 13C100 | /Applications/Xcode_13.2.1.app | @@ -230,48 +230,48 @@ - xcversion 2.8.0 #### Installed SDKs -| SDK | SDK Name | Xcode Version | -| ----------------------- | -------------------- | ------------- | -| macOS 12.0 | macosx12.0 | 13.1 | -| macOS 12.1 | macosx12.1 | 13.2.1 | -| macOS 12.3 | macosx12.3 | 13.3.1, 13.4 | -| iOS 15.0 | iphoneos15.0 | 13.1 | -| iOS 15.2 | iphoneos15.2 | 13.2.1 | -| iOS 15.4 | iphoneos15.4 | 13.3.1 | -| iOS 15.5 | iphoneos15.5 | 13.4 | -| Simulator - iOS 15.0 | iphonesimulator15.0 | 13.1 | -| Simulator - iOS 15.2 | iphonesimulator15.2 | 13.2.1 | -| Simulator - iOS 15.4 | iphonesimulator15.4 | 13.3.1 | -| Simulator - iOS 15.5 | iphonesimulator15.5 | 13.4 | -| tvOS 15.0 | appletvos15.0 | 13.1 | -| tvOS 15.2 | appletvos15.2 | 13.2.1 | -| tvOS 15.4 | appletvos15.4 | 13.3.1, 13.4 | -| Simulator - tvOS 15.0 | appletvsimulator15.0 | 13.1 | -| Simulator - tvOS 15.2 | appletvsimulator15.2 | 13.2.1 | -| Simulator - tvOS 15.4 | appletvsimulator15.4 | 13.3.1, 13.4 | -| watchOS 8.0 | watchos8.0 | 13.1 | -| watchOS 8.3 | watchos8.3 | 13.2.1 | -| watchOS 8.5 | watchos8.5 | 13.3.1, 13.4 | -| Simulator - watchOS 8.0 | watchsimulator8.0 | 13.1 | -| Simulator - watchOS 8.3 | watchsimulator8.3 | 13.2.1 | -| Simulator - watchOS 8.5 | watchsimulator8.5 | 13.3.1, 13.4 | -| DriverKit 21.0.1 | driverkit21.0.1 | 13.1 | -| DriverKit 21.2 | driverkit21.2 | 13.2.1 | -| DriverKit 21.4 | driverkit21.4 | 13.3.1, 13.4 | +| SDK | SDK Name | Xcode Version | +| ----------------------- | -------------------- | -------------------- | +| macOS 12.0 | macosx12.0 | 13.1 | +| macOS 12.1 | macosx12.1 | 13.2.1 | +| macOS 12.3 | macosx12.3 | 13.3.1, 13.4, 13.4.1 | +| iOS 15.0 | iphoneos15.0 | 13.1 | +| iOS 15.2 | iphoneos15.2 | 13.2.1 | +| iOS 15.4 | iphoneos15.4 | 13.3.1 | +| iOS 15.5 | iphoneos15.5 | 13.4, 13.4.1 | +| Simulator - iOS 15.0 | iphonesimulator15.0 | 13.1 | +| Simulator - iOS 15.2 | iphonesimulator15.2 | 13.2.1 | +| Simulator - iOS 15.4 | iphonesimulator15.4 | 13.3.1 | +| Simulator - iOS 15.5 | iphonesimulator15.5 | 13.4, 13.4.1 | +| tvOS 15.0 | appletvos15.0 | 13.1 | +| tvOS 15.2 | appletvos15.2 | 13.2.1 | +| tvOS 15.4 | appletvos15.4 | 13.3.1, 13.4, 13.4.1 | +| Simulator - tvOS 15.0 | appletvsimulator15.0 | 13.1 | +| Simulator - tvOS 15.2 | appletvsimulator15.2 | 13.2.1 | +| Simulator - tvOS 15.4 | appletvsimulator15.4 | 13.3.1, 13.4, 13.4.1 | +| watchOS 8.0 | watchos8.0 | 13.1 | +| watchOS 8.3 | watchos8.3 | 13.2.1 | +| watchOS 8.5 | watchos8.5 | 13.3.1, 13.4, 13.4.1 | +| Simulator - watchOS 8.0 | watchsimulator8.0 | 13.1 | +| Simulator - watchOS 8.3 | watchsimulator8.3 | 13.2.1 | +| Simulator - watchOS 8.5 | watchsimulator8.5 | 13.3.1, 13.4, 13.4.1 | +| DriverKit 21.0.1 | driverkit21.0.1 | 13.1 | +| DriverKit 21.2 | driverkit21.2 | 13.2.1 | +| DriverKit 21.4 | driverkit21.4 | 13.3.1, 13.4, 13.4.1 | #### Installed Simulators -| OS | Xcode Version | Simulators | -| ----------- | -------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| iOS 15.0 | 13.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | -| iOS 15.2 | 13.2.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | -| iOS 15.4 | 13.3.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPhone SE (3rd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | -| iOS 15.5 | 13.4 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPhone SE (3rd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | -| tvOS 15.0 | 13.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | -| tvOS 15.2 | 13.2.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | -| tvOS 15.4 | 13.3.1<br>13.4 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | -| watchOS 8.0 | 13.1 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | -| watchOS 8.3 | 13.2.1 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | -| watchOS 8.5 | 13.3.1<br>13.4 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | +| OS | Xcode Version | Simulators | +| ----------- | ------------------------ | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| iOS 15.0 | 13.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | +| iOS 15.2 | 13.2.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | +| iOS 15.4 | 13.3.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPhone SE (3rd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | +| iOS 15.5 | 13.4<br>13.4.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPhone SE (3rd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | +| tvOS 15.0 | 13.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | +| tvOS 15.2 | 13.2.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | +| tvOS 15.4 | 13.3.1<br>13.4<br>13.4.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | +| watchOS 8.0 | 13.1 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | +| watchOS 8.3 | 13.2.1 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | +| watchOS 8.5 | 13.3.1<br>13.4<br>13.4.1 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | ### Android | Package Name | Version | @@ -285,16 +285,16 @@ | CMake | 3.18.1 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 21.4.7075529 (default)<br>22.1.7171670<br>23.2.8568313 | +| NDK | 21.4.7075529<br>23.2.8568313 (default)<br>24.0.8215888 | | SDK Patch Applier v4 | 1 | #### Environment variables | Name | Value | | ----------------------- | -------------------------------------------------------------------------------------------------- | | ANDROID_HOME | /Users/runner/Library/Android/sdk | -| ANDROID_NDK_HOME | /Users/runner/Library/Android/sdk/ndk-bundle -> /Users/runner/Library/Android/sdk/ndk/21.4.7075529 | -| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/23.2.8568313 | -| ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk-bundle -> /Users/runner/Library/Android/sdk/ndk/21.4.7075529 | +| ANDROID_NDK_HOME | /Users/runner/Library/Android/sdk/ndk-bundle -> /Users/runner/Library/Android/sdk/ndk/23.2.8568313 | +| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/24.0.8215888 | +| ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk-bundle -> /Users/runner/Library/Android/sdk/ndk/23.2.8568313 | | ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | ### Miscellaneous From 2b9e9f430235c0ec774226373218b6357fc6616b Mon Sep 17 00:00:00 2001 From: Dusko Dobranic <101048884+ddobranic@users.noreply.github.com> Date: Mon, 13 Jun 2022 11:43:08 +0200 Subject: [PATCH 1235/3485] Fix maven install on Ubuntu (#5721) --- images/linux/toolsets/toolset-1804.json | 2 +- images/linux/toolsets/toolset-2004.json | 2 +- images/linux/toolsets/toolset-2204.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index f6fb6e20cb1e..590ddcaf0903 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -83,7 +83,7 @@ "versions": [ "8", "11", "12" ] } ], - "maven": "3.8.5" + "maven": "3.8.6" }, "android": { "cmdline-tools": "latest", diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index 316a9e2b6c74..d60510a06d11 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -84,7 +84,7 @@ "versions": [ "8", "11" ] } ], - "maven": "3.8.5" + "maven": "3.8.6" }, "android": { "cmdline-tools": "latest", diff --git a/images/linux/toolsets/toolset-2204.json b/images/linux/toolsets/toolset-2204.json index 2477ee697ae9..53416c925442 100644 --- a/images/linux/toolsets/toolset-2204.json +++ b/images/linux/toolsets/toolset-2204.json @@ -70,7 +70,7 @@ "versions": [ "8", "11", "17" ] } ], - "maven": "3.8.5" + "maven": "3.8.6" }, "android": { "cmdline-tools": "latest", From be40e97a97f07b38fa039c650a1ab114c7045584 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Mon, 13 Jun 2022 13:37:41 +0200 Subject: [PATCH 1236/3485] Update erlang repo (#5722) --- images/linux/scripts/installers/erlang.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/images/linux/scripts/installers/erlang.sh b/images/linux/scripts/installers/erlang.sh index bb0e74ebb7f5..6aaa4a86b746 100644 --- a/images/linux/scripts/installers/erlang.sh +++ b/images/linux/scripts/installers/erlang.sh @@ -8,20 +8,21 @@ source $HELPER_SCRIPTS/install.sh source_list=/etc/apt/sources.list.d/eslerlang.list +source_key=/usr/share/keyrings/eslerlang.gpg # Install Erlang -echo "deb https://binaries.erlang-solutions.com/debian $(lsb_release -cs) contrib" > $source_list -wget -q -O - https://binaries.erlang-solutions.com/debian/erlang_solutions.asc | apt-key add - +wget -q -O - https://packages.erlang-solutions.com/ubuntu/erlang_solutions.asc | gpg --dearmor > $source_key +echo "deb [signed-by=$source_key] https://packages.erlang-solutions.com/ubuntu $(lsb_release -cs) contrib" > $source_list apt-get update apt-get install -y --no-install-recommends esl-erlang # Install rebar3 -rebar3DownloadUrl=$(get_github_package_download_url "erlang/rebar3" "endswith(\"rebar3\")") -download_with_retries $rebar3DownloadUrl "/tmp" -mv /tmp/rebar3 /usr/local/bin/rebar3 +rebar3_url="https://github.com/erlang/rebar3/releases/latest/download/rebar3" +download_with_retries $rebar3_url "/usr/local/bin" "rebar3" chmod +x /usr/local/bin/rebar3 # Clean up source list rm $source_list +rm $source_key invoke_tests "Tools" "erlang" From 38ada90269f90adf78401874b4279197be34e1f1 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Mon, 13 Jun 2022 16:49:22 +0200 Subject: [PATCH 1237/3485] fix SW report regarding VS for macOS (#5727) --- images/macos/software-report/SoftwareReport.Generator.ps1 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1 index 4cc62783ccbb..ccc73b550b71 100644 --- a/images/macos/software-report/SoftwareReport.Generator.ps1 +++ b/images/macos/software-report/SoftwareReport.Generator.ps1 @@ -244,13 +244,13 @@ $markdown += New-MDHeader "Xamarin" -Level 3 $markdown += New-MDHeader "Visual Studio for Mac" -Level 4 $markdown += Build-VSMacTable | New-MDTable $markdown += New-MDNewLine -if (-not $os.Catalina) { +if (-not $os.IsCatalina) { $markdown += New-MDHeader "Notes:" -Level 5 $reportVS = @' ``` To use Visual Studio 2019 by default rename the app: -mv "/Applications/Visual Studio.app" "/Applications/Visual Studio 2022.app" -mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" +mv '/Applications/Visual Studio.app' '/Applications/Visual Studio 2022.app' +mv '/Applications/Visual Studio 2019.app' '/Applications/Visual Studio.app' ``` '@ $markdown += New-MDParagraph -Lines $reportVS From 9cf1ebd754807fba137c8ce9fa2140311609fdd6 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Mon, 13 Jun 2022 16:54:27 +0200 Subject: [PATCH 1238/3485] Improve github releases parser (#5717) --- images/linux/scripts/helpers/install.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/images/linux/scripts/helpers/install.sh b/images/linux/scripts/helpers/install.sh index 222fc592ad76..00678e495701 100644 --- a/images/linux/scripts/helpers/install.sh +++ b/images/linux/scripts/helpers/install.sh @@ -78,10 +78,13 @@ get_github_package_download_url() { if [ -n "$VERSION" ]; then tagName=$(echo $json | jq -r '.[] | select(.prerelease==false).tag_name' | sort --unique --version-sort | egrep -v ".*-[a-z]|beta" | egrep "\w*${VERSION}" | tail -1) else - tagName=$(echo $json | jq -r '.[] | select(.prerelease==false).tag_name' | sort --unique --version-sort | egrep -v ".*-[a-z]|beta" | tail -1) - fi + tagName=$(echo $json | jq -r '.[] | select((.prerelease==false) and (.assets | length > 0)).tag_name' | sort --unique --version-sort | egrep -v ".*-[a-z]|beta" | tail -1) + fi downloadUrl=$(echo $json | jq -r ".[] | select(.tag_name==\"${tagName}\").assets[].browser_download_url | select(${FILTER})" | head -n 1) - + if [ -z "$downloadUrl" ]; then + echo "Failed to parse a download url for the '${tagName}' tag using '${FILTER}' filter" + exit 1 + fi echo $downloadUrl -} \ No newline at end of file +} From 04f68be19ee050dc32bf06a77833feea06a96fe0 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Tue, 14 Jun 2022 09:34:46 +0200 Subject: [PATCH 1239/3485] [Windows] Improve Get-GitHubPackageDownloadUrl function (#5724) * Improve Get-GitHubPackageDownloadUrl function * Use Select-String --- .../win/scripts/ImageHelpers/InstallHelpers.ps1 | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/images/win/scripts/ImageHelpers/InstallHelpers.ps1 b/images/win/scripts/ImageHelpers/InstallHelpers.ps1 index 7d845621a21f..338bff001f9b 100644 --- a/images/win/scripts/ImageHelpers/InstallHelpers.ps1 +++ b/images/win/scripts/ImageHelpers/InstallHelpers.ps1 @@ -590,13 +590,21 @@ function Get-GitHubPackageDownloadUrl { if ($Version -eq "latest") { $Version = "*" } + $json = Invoke-RestMethod -Uri "https://api.github.com/repos/${RepoOwner}/${RepoName}/releases?per_page=${SearchInCount}" - $versionToDownload = ($json.Where{ $_.prerelease -eq $IsPrerelease }.tag_name | - Select-String -Pattern "\d+.\d+.\d+").Matches.Value | - Where-Object {$_ -Like "${Version}.*" -or $_ -eq ${Version}} | - Sort-Object {[version]$_} | + $tags = $json.Where{ $_.prerelease -eq $IsPrerelease -and $_.assets }.tag_name + $versionToDownload = $tags | + Select-String -Pattern "\d+.\d+.\d+" | + ForEach-Object { $_.Matches.Value } | + Where-Object { $_ -like "$Version.*" -or $_ -eq $Version } | + Sort-Object { [version]$_ } | Select-Object -Last 1 + if (-not $versionToDownload) { + Write-Host "Failed to get a tag name from ${RepoOwner}/${RepoName} releases" + exit 1 + } + $UrlFilter = $UrlFilter -replace "{BinaryName}",$BinaryName -replace "{Version}",$versionToDownload $downloadUrl = $json.assets.browser_download_url -like $UrlFilter From bf4d034f1ddb31712e466e96a162ffa6518efed7 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Tue, 14 Jun 2022 13:14:05 +0200 Subject: [PATCH 1240/3485] [macOS] get double quotes back in sw report for VS (#5741) --- images/macos/software-report/SoftwareReport.Generator.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1 index ccc73b550b71..df8fe824dd79 100644 --- a/images/macos/software-report/SoftwareReport.Generator.ps1 +++ b/images/macos/software-report/SoftwareReport.Generator.ps1 @@ -249,8 +249,8 @@ $markdown += New-MDHeader "Notes:" -Level 5 $reportVS = @' ``` To use Visual Studio 2019 by default rename the app: -mv '/Applications/Visual Studio.app' '/Applications/Visual Studio 2022.app' -mv '/Applications/Visual Studio 2019.app' '/Applications/Visual Studio.app' +mv "/Applications/Visual Studio.app" "/Applications/Visual Studio 2022.app" +mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" ``` '@ $markdown += New-MDParagraph -Lines $reportVS From 959274c3fc4caa2657aa7ca2d7a69988e4fb47a0 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Tue, 14 Jun 2022 14:52:15 +0200 Subject: [PATCH 1241/3485] Improve github releases parser (#5738) --- images/macos/provision/utils/utils.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/images/macos/provision/utils/utils.sh b/images/macos/provision/utils/utils.sh index a3ee128b7934..beb7677b656c 100755 --- a/images/macos/provision/utils/utils.sh +++ b/images/macos/provision/utils/utils.sh @@ -192,13 +192,16 @@ get_github_package_download_url() { json=$(curl "${authString[@]}" -s "https://api.github.com/repos/${REPO_ORG}/releases?per_page=${SEARCH_IN_COUNT}") if [[ "$VERSION" == "latest" ]]; then - tagName=$(echo $json | jq -r '.[] | select(.prerelease==false).tag_name' | sort --unique --version-sort | egrep -v ".*-[a-z]" | tail -1) + tagName=$(echo $json | jq -r '.[] | select((.prerelease==false) and (.assets | length > 0)).tag_name' | sort --unique --version-sort | egrep -v ".*-[a-z]" | tail -1) else tagName=$(echo $json | jq -r '.[] | select(.prerelease==false).tag_name' | sort --unique --version-sort | egrep -v ".*-[a-z]" | egrep "\w*${VERSION}" | tail -1) fi downloadUrl=$(echo $json | jq -r ".[] | select(.tag_name==\"${tagName}\").assets[].browser_download_url | select(${FILTER})" | head -n 1) - + if [ -z "$downloadUrl" ]; then + echo "Failed to parse a download url for the '${tagName}' tag using '${FILTER}' filter" + exit 1 + fi echo $downloadUrl } From 65f4b8310365c98106c5930c3d9a20b9bcfaea22 Mon Sep 17 00:00:00 2001 From: Steve-Glass <84886334+Steve-Glass@users.noreply.github.com> Date: Tue, 14 Jun 2022 09:16:13 -0400 Subject: [PATCH 1242/3485] Remove macOS 12 beta reference (#5732) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ccf671a63f9b..802a81e3deda 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ For general questions about using the virtual environments or writing your Actio | Ubuntu 22.04 <sup>beta</sup> | `ubuntu-22.04` | [ubuntu-22.04] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu22&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu22&redirect=1) | Ubuntu 20.04 | `ubuntu-latest` or `ubuntu-20.04` | [ubuntu-20.04] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu20&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu20&redirect=1) | Ubuntu 18.04 | `ubuntu-18.04` | [ubuntu-18.04] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu18&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu18&redirect=1) -| macOS 12 <sup>beta</sup>| `macos-12`| [macOS-12] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-12&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-12&redirect=1) +| macOS 12 | `macos-12`| [macOS-12] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-12&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-12&redirect=1) | macOS 11 | `macos-latest` or `macos-11`| [macOS-11] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-11&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-11&redirect=1) | macOS 10.15 | `macos-10.15` | [macOS-10.15] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-10.15&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-10.15&redirect=1) | Windows Server 2022 | `windows-latest` or `windows-2022` | [windows-2022] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=windows-2022&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=windows-2022&redirect=1) | From c9a93eb735fa5264acca9afd5c0c6b9348c8e407 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Tue, 14 Jun 2022 17:16:43 +0400 Subject: [PATCH 1243/3485] Revert "Add Xcode 14 to macOS 12 image (#5703)" (#5742) This reverts commit 5bb008fe600d8ab882c061a6f92b83340c6dc1a6. --- images/macos/toolsets/toolset-12.json | 1 - 1 file changed, 1 deletion(-) diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index abff00f1805a..7c4ae21b2524 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -2,7 +2,6 @@ "xcode": { "default": "13.3.1", "versions": [ - { "link": "14.0", "version": "14.0.0" }, { "link": "13.4.1", "version": "13.4.1" }, { "link": "13.4", "version": "13.4.0" }, { "link": "13.3.1", "version": "13.3.1", "symlinks": ["13.3"] }, From cdde5f7f12b65d0e057ff720370562d9e2adb331 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 16 Jun 2022 08:33:08 +0000 Subject: [PATCH 1244/3485] Updating readme file for ubuntu22 version 20220614.0 (#5750) Co-authored-by: Image generation service account <no-reply@microsoft.com> --- images/linux/Ubuntu2204-Readme.md | 95 +++++++++++++++---------------- 1 file changed, 47 insertions(+), 48 deletions(-) diff --git a/images/linux/Ubuntu2204-Readme.md b/images/linux/Ubuntu2204-Readme.md index 8baa8b8fbc43..2a94e7cb714b 100644 --- a/images/linux/Ubuntu2204-Readme.md +++ b/images/linux/Ubuntu2204-Readme.md @@ -1,12 +1,11 @@ | Announcements | |-| | [[Ubuntu] AWS CLI on Ubuntu18 image will be upgraded to V2 on June 20](https://github.com/actions/virtual-environments/issues/5679) | -| [[all OSs] Android NDK 22 will be replaced in favor of 24, version 23 will be set as the default one on June, 6](https://github.com/actions/virtual-environments/issues/5595) | | [(Public Beta) Ubuntu 22.04 is now available](https://github.com/actions/virtual-environments/issues/5490) | *** # Ubuntu 22.04 LTS -- Linux kernel version: 5.15.0-1008-azure -- Image Version: 20220605.1 +- Linux kernel version: 5.15.0-1010-azure +- Image Version: 20220614.0 ## Installed Software ### Language and Runtime @@ -17,7 +16,7 @@ - GNU C++ 9.4.0, 10.3.0, 11.2.0 - GNU Fortran 9.4.0, 10.3.0, 11.2.0 - Julia 1.7.3 -- Kotlin 1.6.21-release-334 +- Kotlin 1.7.0-release-281 - Node 16.15.1 - Perl 5.34.0 - Python 3.10.4 @@ -27,15 +26,15 @@ ### Package Management - cpan 1.64 - Helm 3.9.0 -- Homebrew 3.4.11 +- Homebrew 3.5.2 - Miniconda 4.12.0 - Npm 8.11.0 - Pip 22.0.2 - Pip3 22.0.2 - Pipx 1.1.0 - RubyGems 3.3.5 -- Vcpkg (build from master \<faed44dfa>) -- Yarn 1.22.18 +- Vcpkg (build from master \<06acb79f7>) +- Yarn 1.22.19 #### Environment variables | Name | Value | @@ -44,24 +43,24 @@ | VCPKG_INSTALLATION_ROOT | /usr/local/share/vcpkg | ### Project Management -- Lerna 5.0.0 +- Lerna 5.1.2 ### Tools - Ansible 2.12.6 - apt-fast 1.9.12 - AzCopy 10.15.0 (available by `azcopy` and `azcopy10` aliases) -- Bazel 5.1.1 +- Bazel 5.2.0 - Bazelisk 1.11.0 -- Bicep 0.6.18 +- Bicep 0.7.4 - Buildah 1.23.1 - CMake 3.23.2 - CodeQL Action Bundle 2.9.3 - Docker Amazon ECR Credential Helper 0.6.0 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.4.1+azure-1 +- Docker Compose v2 2.6.0+azure-1 - Docker-Buildx 0.8.2 -- Docker-Moby Client 20.10.15+azure-1 -- Docker-Moby Server 20.10.16+azure-2 +- Docker-Moby Client 20.10.17+azure-1 +- Docker-Moby Server 20.10.17+azure-1 - Fastlane 2.206.2 - Git 2.36.1 (apt source repository: ppa:git-core/ppa) - Git LFS 3.2.0 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) @@ -83,7 +82,7 @@ - Packer 1.8.1 - Parcel 2.6.0 - Podman 3.4.4 -- Pulumi 3.33.2 +- Pulumi 3.34.1 - R 4.2.0 - Skopeo 1.4.1 - Sphinx Open Source Search Server 2.2.11 @@ -95,18 +94,18 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.121 -- AWS CLI 2.7.6 +- AWS CLI 2.7.7 - AWS CLI Session manager plugin 1.2.331.0 -- AWS SAM CLI 1.51.0 +- AWS SAM CLI 1.52.0 - Azure CLI (azure-cli) 2.37.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.25.0 -- GitHub CLI 2.11.3 +- GitHub CLI 2.12.1 - Google Cloud SDK 369.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 10.4.0 -- OpenShift CLI 4.10.16 +- Netlify CLI 10.5.1 +- OpenShift CLI 4.10.18 - ORAS CLI 0.12.0 -- Vercel CLI 25.0.0 +- Vercel CLI 25.1.0 ### Java | Version | Vendor | Environment Variable | @@ -123,8 +122,8 @@ ### PHP | Tool | Version | | -------- | ------- | -| PHP | 8.1.6 | -| Composer | 2.3.6 | +| PHP | 8.1.7 | +| Composer | 2.3.7 | | PHPUnit | 8.5.26 | ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. @@ -142,15 +141,15 @@ - Rustup 1.24.3 #### Packages -- Bindgen 0.60.0 +- Bindgen 0.60.1 - Cargo audit 0.17.0 - Cargo clippy 0.1.61 - Cargo outdated 0.11.1 -- Cbindgen 0.23.0 +- Cbindgen 0.24.3 - Rustfmt 1.4.38 ### Browsers and Drivers -- Google Chrome 102.0.5005.61 +- Google Chrome 102.0.5005.115 - ChromeDriver 102.0.5005.61 - Chromium 102.0.5005.0 - Selenium server 4.2.0 @@ -163,7 +162,7 @@ | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | ### .NET Core SDK -- 6.0.300 +- 6.0.301 ### .NET tools - nbgv 3.5.107+6463ef6068 @@ -203,7 +202,7 @@ - 3.7.13 - 3.8.12 - 3.9.13 -- 3.10.4 +- 3.10.5 #### Ruby - 3.1.2 @@ -235,20 +234,20 @@ | nginx | 1.18.0 | /etc/nginx/nginx.conf | inactive | 80 | ### Android -| Package Name | Version | -| -------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 7.0 | -| Android Emulator | 31.2.10 | -| Android SDK Build-tools | 32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | -| Android SDK Platform-Tools | 33.0.2 | -| Android SDK Platforms | android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | -| Android SDK Tools | 26.1.1 | -| Android Support Repository | 47.0.0 | -| CMake | 3.10.2<br>3.18.1 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 21.4.7075529<br>23.2.8568313 (default)<br>24.0.8215888 | -| SDK Patch Applier v4 | 1 | +| Package Name | Version | +| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------ | +| Android Command Line Tools | 7.0 | +| Android Emulator | 31.2.10 | +| Android SDK Build-tools | 33.0.0<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | +| Android SDK Platform-Tools | 33.0.2 | +| Android SDK Platforms | android-33 (rev 1)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | +| Android SDK Tools | 26.1.1 | +| Android Support Repository | 47.0.0 | +| CMake | 3.10.2<br>3.18.1 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 21.4.7075529<br>23.2.8568313 (default)<br>24.0.8215888 | +| SDK Patch Applier v4 | 1 | #### Environment variables | Name | Value | @@ -270,12 +269,12 @@ | debian:11 | sha256:3f1d6c17773a45c97bd8f158d665c9709d7b29ed7917ac934086ad96f92e4510 | 2022-05-28 | | moby/buildkit:latest | sha256:0dc312b04eac1b44cd2cad566deb1e886c753109208affbbec8384f381ff7f38 | 2022-05-06 | | node:14 | sha256:3324c688c0e98888f8938509f35356acf69a3e1f9f385d85f7e6086b137c17e3 | 2022-05-28 | -| node:14-alpine | sha256:c9b8829068199346e2a9ae46f870bbb82ce44de6580321300bf3945d00dee0f1 | 2022-05-18 | -| node:16 | sha256:59eb4e9d6a344ae1161e7d6d8af831cb50713cc631889a5a8c2d438d6ec6aa0f | 2022-05-28 | -| node:16-alpine | sha256:1a9a71ea86aad332aa7740316d4111ee1bd4e890df47d3b5eff3e5bded3b3d10 | 2022-04-27 | -| ubuntu:18.04 | sha256:d21b6ba9e19feffa328cb3864316e6918e30acfd55e285b5d3df1d8ca3c7fd3f | 2022-04-29 | -| ubuntu:20.04 | sha256:47f14534bda344d9fe6ffd6effb95eefe579f4be0d508b7445cf77f61a0e5724 | 2022-04-29 | -| ubuntu:22.04 | sha256:26c68657ccce2cb0a31b330cb0be2b5e108d467f641c62e13ab40cbec258c68d | 2022-04-29 | +| node:14-alpine | sha256:6b87d16e4ce20cacd6f1f662f66c821e4c3c41c2903daeace52d818ec3f4bbdd | 2022-06-07 | +| node:16 | sha256:6155ff062c403e99c1da7c317710c5c838c1e060f526d98baea6ee921ca61729 | 2022-06-06 | +| node:16-alpine | sha256:c785e617c8d7015190c0d41af52cc69be8a16e3d9eb7cb21f0bb58bcfca14d6b | 2022-06-07 | +| ubuntu:18.04 | sha256:478caf1bec1afd54a58435ec681c8755883b7eb843a8630091890130b15a79af | 2022-06-06 | +| ubuntu:20.04 | sha256:fd92c36d3cb9b1d027c4d2a72c6bf0125da82425fc2ca37c414d4f010180dc19 | 2022-06-06 | +| ubuntu:22.04 | sha256:b6b83d3c331794420340093eb706a6f152d9c1fa51b262d9bf34594887c2c7ac | 2022-06-06 | ### Installed apt packages | Name | Version | @@ -309,7 +308,7 @@ | libc++-dev | 1:14.0-55\~exp2 | | libc++abi-dev | 1:14.0-55\~exp2 | | libcurl4 | 7.81.0-1ubuntu1.2 | -| libgbm-dev | 22.0.1-1ubuntu2 | +| libgbm-dev | 22.0.1-1ubuntu2.1 | | libgconf-2-4 | 3.2.6-7ubuntu2 | | libgsl-dev | 2.7.1+dfsg-3 | | libgtk-3-0 | 3.24.33-1ubuntu2 | From 4bbb6eb6ae0fcf9b93d7784387dc0cacd3ed568e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 16 Jun 2022 09:06:15 +0000 Subject: [PATCH 1245/3485] Updating readme file for win22 version 20220614.0 (#5745) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2022-Readme.md | 89 ++++++++++++++++---------------- 1 file changed, 44 insertions(+), 45 deletions(-) diff --git a/images/win/Windows2022-Readme.md b/images/win/Windows2022-Readme.md index 37eb9e9c1198..50384eebf40e 100644 --- a/images/win/Windows2022-Readme.md +++ b/images/win/Windows2022-Readme.md @@ -1,11 +1,10 @@ | Announcements | |-| -| [[all OSs] Android NDK 22 will be replaced in favor of 24, version 23 will be set as the default one on June, 6](https://github.com/actions/virtual-environments/issues/5595) | | [[Azure DevOps] Windows-2016 environment removal postponed until June 30, 2022](https://github.com/actions/virtual-environments/issues/5403) | *** # Microsoft Windows Server 2022 Datacenter -- OS Version: 10.0.20348 Build 707 -- Image Version: 20220607.3 +- OS Version: 10.0.20348 Build 768 +- Image Version: 20220614.0 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -15,7 +14,7 @@ - Bash 4.4.23(1)-release - Go 1.17.11 - Julia 1.7.3 -- Kotlin 1.6.21 +- Kotlin 1.7.0 - LLVM 13.0.1 - Node 16.15.1 - Perl 5.32.1 @@ -29,11 +28,11 @@ - Helm 3.8.2 - Miniconda 4.12.0 (pre-installed on the image but not added to PATH) - NPM 8.11.0 -- NuGet 6.2.0.146 +- NuGet 6.2.1.2 - pip 22.1.2 (python 3.9) - Pipx 1.1.0 - RubyGems 3.2.33 -- Vcpkg (build from master \<a15782fee>) +- Vcpkg (build from master \<06acb79f7>) - Yarn 1.22.19 #### Environment variables @@ -44,7 +43,7 @@ ### Project Management - Ant 1.10.12 - Gradle 7.4 -- Maven 3.8.5 +- Maven 3.8.6 - sbt 1.6.2 ### Tools @@ -53,7 +52,7 @@ - azcopy 10.15.0 - Bazel 5.2.0 - Bazelisk 1.11.0 -- Bicep 0.6.18 +- Bicep 0.7.4 - Cabal 3.6.2.0 - CMake 3.23.2 - CodeQL Action Bundle 2.9.3 @@ -62,7 +61,7 @@ - Docker Compose v2 2.6.0 - Docker-wincred 0.6.4 - ghc 9.2.3 -- Git 2.36.0.windows.1 +- Git 2.36.1.windows.1 - Git LFS 3.1.4 - InnoSetup 6.2.1 - jq 1.6 @@ -74,7 +73,7 @@ - NSIS v3.08 - OpenSSL 1.1.1 - Packer 1.8.0 -- Pulumi v3.34.0 +- Pulumi v3.34.1 - R 4.2.0 - Service Fabric SDK 9.0.1028.9590 - Stack 2.7.5 @@ -88,12 +87,12 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.121 -- AWS CLI 2.7.6 -- AWS SAM CLI 1.51.0 +- AWS CLI 2.7.7 +- AWS SAM CLI 1.52.0 - AWS Session Manager CLI 1.2.331.0 - Azure CLI 2.37.0 - Azure DevOps CLI extension 0.25.0 -- GitHub CLI 2.12.0 +- GitHub CLI 2.12.1 - Hub CLI 2.14.2 ### Rust Tools @@ -106,16 +105,16 @@ - bindgen 0.60.1 - cargo-audit 0.17.0 - cargo-outdated 0.11.1 -- cbindgen 0.24.2 +- cbindgen 0.24.3 - Clippy 0.1.61 - Rustfmt 1.4.38 ### Browsers and webdrivers -- Google Chrome 102.0.5005.63 +- Google Chrome 102.0.5005.115 - Chrome Driver 102.0.5005.61 -- Microsoft Edge 102.0.1245.33 -- Microsoft Edge Driver 102.0.1245.33 -- Mozilla Firefox 101.0 +- Microsoft Edge 102.0.1245.39 +- Microsoft Edge Driver 102.0.1245.41 +- Mozilla Firefox 101.0.1 - Gecko Driver 0.31.0 - IE Driver 3.150.1.1 - Selenium server 4.2.0 @@ -224,7 +223,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Visual Studio Enterprise 2022 | Name | Version | Path | | ----------------------------- | -------------- | -------------------------------------------------------- | -| Visual Studio Enterprise 2022 | 17.2.32526.322 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | +| Visual Studio Enterprise 2022 | 17.2.32602.215 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | #### Workloads, components and extensions: | Package | Version | @@ -274,11 +273,11 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.Net.ComponentGroup.4.8.DeveloperTools | 17.2.32408.312 | | Microsoft.Net.ComponentGroup.DevelopmentPrerequisites | 17.2.32408.312 | | Microsoft.Net.ComponentGroup.TargetingPacks.Common | 17.2.32408.312 | -| microsoft.net.runtime.mono.tooling | 6.0.422.16404 | +| microsoft.net.runtime.mono.tooling | 6.0.622.26707 | | microsoft.net.sdk.emscripten | 6.0.6.16102 | | Microsoft.NetCore.Component.DevelopmentTools | 17.2.32408.312 | -| Microsoft.NetCore.Component.Runtime.6.0 | 17.2.32503.368 | -| Microsoft.NetCore.Component.SDK | 17.2.32503.368 | +| Microsoft.NetCore.Component.Runtime.6.0 | 17.2.32602.177 | +| Microsoft.NetCore.Component.SDK | 17.2.32602.177 | | Microsoft.NetCore.Component.Web | 17.2.32408.312 | | Microsoft.VisualStudio.Component.AppInsights.Tools | 17.2.32408.312 | | Microsoft.VisualStudio.Component.AspNet | 17.2.32408.312 | @@ -312,7 +311,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Component.IISExpress | 17.2.32408.312 | | Microsoft.VisualStudio.Component.IntelliCode | 17.2.32414.121 | | Microsoft.VisualStudio.Component.IntelliTrace.FrontEnd | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.JavaScript.Diagnostics | 17.2.32427.441 | +| Microsoft.VisualStudio.Component.JavaScript.Diagnostics | 17.2.32602.177 | | Microsoft.VisualStudio.Component.JavaScript.TypeScript | 17.2.32408.312 | | Microsoft.VisualStudio.Component.LinqToSql | 17.2.32408.312 | | Microsoft.VisualStudio.Component.LiveUnitTesting | 17.2.32408.312 | @@ -335,7 +334,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Component.SQL.SSDT | 17.2.32408.312 | | Microsoft.VisualStudio.Component.TeamOffice | 17.2.32408.312 | | Microsoft.VisualStudio.Component.TestTools.CodedUITest | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.TestTools.WebLoadTest | 17.2.32427.441 | +| Microsoft.VisualStudio.Component.TestTools.WebLoadTest | 17.2.32602.177 | | Microsoft.VisualStudio.Component.TextTemplating | 17.2.32408.312 | | Microsoft.VisualStudio.Component.TypeScript.TSServer | 17.2.32408.312 | | Microsoft.VisualStudio.Component.Unity | 17.2.32408.312 | @@ -441,7 +440,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Workload.Python | 17.2.32408.312 | | Microsoft.VisualStudio.Workload.Universal | 17.2.32526.322 | | Microsoft.VisualStudio.Workload.VisualStudioExtension | 17.2.32408.312 | -| wasm.tools | 6.0.422.16404 | +| wasm.tools | 6.0.622.26707 | | ProBITools.MicrosoftReportProjectsforVisualStudio2022 | 3.0.1 | | VisualStudioClient.MicrosoftVisualStudio2022InstallerProjects | 2.0.0 | | WixToolset.WixToolsetVisualStudio2022Extension | 1.0.0.18 | @@ -469,17 +468,17 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### .NET Core SDK `Location C:\Program Files\dotnet\sdk` -- 3.1.120 3.1.202 3.1.302 3.1.419 5.0.104 5.0.214 5.0.303 5.0.408 6.0.300 +- 3.1.120 3.1.202 3.1.302 3.1.420 5.0.104 5.0.214 5.0.303 5.0.408 6.0.301 ### .NET Core Runtime `Location: C:\Program Files\dotnet\shared\Microsoft.AspNetCore.App` -- 3.1.4 3.1.6 3.1.20 3.1.25 5.0.4 5.0.9 5.0.17 6.0.5 +- 3.1.4 3.1.6 3.1.20 3.1.25 3.1.26 5.0.4 5.0.9 5.0.17 6.0.6 `Location: C:\Program Files\dotnet\shared\Microsoft.NETCore.App` -- 3.1.4 3.1.6 3.1.20 3.1.25 5.0.4 5.0.9 5.0.17 6.0.5 +- 3.1.4 3.1.6 3.1.20 3.1.25 3.1.26 5.0.4 5.0.9 5.0.17 6.0.6 `Location: C:\Program Files\dotnet\shared\Microsoft.WindowsDesktop.App` -- 3.1.4 3.1.6 3.1.20 3.1.25 5.0.4 5.0.9 5.0.17 6.0.5 +- 3.1.4 3.1.6 3.1.20 3.1.26 5.0.4 5.0.9 5.0.17 6.0.6 ### .NET Framework `Type: Developer Pack` @@ -507,7 +506,7 @@ All other versions are saved but not installed. #### Powershell Modules | Module | Version | | ------------------ | ---------------- | -| AWSPowerShell | 4.1.100 | +| AWSPowerShell | 4.1.104 | | DockerMsftProvider | 1.0.0.8 | | MarkdownPS | 1.9 | | Microsoft.Graph | 1.9.6 | @@ -519,19 +518,19 @@ All other versions are saved but not installed. | VSSetup | 2.2.16 | ### Android -| Package Name | Version | -| -------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 7.0 | -| Android Emulator | 31.2.10 | -| Android SDK Build-tools | 32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | -| Android SDK Platforms | android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | -| Android SDK Platform-Tools | 33.0.2 | -| Android Support Repository | 47.0.0 | -| CMake | 3.18.1 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 21.4.7075529<br>23.2.8568313 (default)<br>24.0.8215888 | -| SDK Patch Applier v4 | 1 | +| Package Name | Version | +| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------ | +| Android Command Line Tools | 7.0 | +| Android Emulator | 31.2.10 | +| Android SDK Build-tools | 33.0.0<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | +| Android SDK Platforms | android-33 (rev 1)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | +| Android SDK Platform-Tools | 33.0.2 | +| Android Support Repository | 47.0.0 | +| CMake | 3.18.1 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 21.4.7075529<br>23.2.8568313 (default)<br>24.0.8215888 | +| SDK Patch Applier v4 | 1 | #### Environment variables | Name | Value | @@ -549,7 +548,7 @@ All other versions are saved but not installed. | mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2022 | sha256:1182bfe22daba321fccb5caf93bfedc912c817a91d4c9aa5b45ea3823cb7a5c0 | 2022-05-11 | | mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2022 | sha256:9bba2824988fa141d187315336055c068dadae6b84e86fb5d13291fd2245a8dd | 2022-05-11 | | mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:f3dcc7d94e1631213f2349851f3415d8850d45ebd411e4ca68a0a5fa73ebffe8 | 2022-05-11 | -| mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:f677b64d44434c6850f075630c3a7b3f9be284d32003c2cc6ea93130f619152f | 2022-05-05 | -| mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:93373be6f6c576ef3f778b9d5e7b54231975bb6876a07d90c4e4599a29a65d54 | 2022-05-05 | +| mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:5f36a555eeb0151d5c00c14b01c3d39d9e5dffc36e5b2039cfa6041b6dac2480 | 2022-06-09 | +| mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:b2162caa6da208d9dc10c99e18ee04aadcc4429b219cb316ea404fa9c4de53d1 | 2022-06-09 | From 199bdd9dd9a1ead06db65c60c32dab49106282a9 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Thu, 16 Jun 2022 11:09:45 +0200 Subject: [PATCH 1246/3485] [Ubuntu] Install aws-cli v2 on 18.04 (#5743) --- images/linux/scripts/installers/aws.sh | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/images/linux/scripts/installers/aws.sh b/images/linux/scripts/installers/aws.sh index 784bd4314d95..6bf8898f56d9 100644 --- a/images/linux/scripts/installers/aws.sh +++ b/images/linux/scripts/installers/aws.sh @@ -8,18 +8,9 @@ source $HELPER_SCRIPTS/os.sh source $HELPER_SCRIPTS/install.sh -# Install the AWS CLI v1 Ubuntu18 and AWS CLI v2 on Ubuntu20, Ubuntu22 -# The installation should be run after python3 is installed as aws-cli V1 dropped python2 support -# 1.25.0+ Dropped support for Python 3.6 - https://github.com/aws/aws-cli/blob/develop/CHANGELOG.rst -if isUbuntu18 ; then - download_with_retries "https://s3.amazonaws.com/aws-cli/awscli-bundle-1.24.10.zip" "/tmp" "awscli-bundle.zip" - unzip -qq /tmp/awscli-bundle.zip -d /tmp - python3 /tmp/awscli-bundle/install -i /usr/local/aws -b /usr/local/bin/aws -else - download_with_retries "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" "/tmp" "awscliv2.zip" - unzip -qq /tmp/awscliv2.zip -d /tmp - /tmp/aws/install -i /usr/local/aws-cli -b /usr/local/bin -fi +download_with_retries "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" "/tmp" "awscliv2.zip" +unzip -qq /tmp/awscliv2.zip -d /tmp +/tmp/aws/install -i /usr/local/aws-cli -b /usr/local/bin download_with_retries "https://s3.amazonaws.com/session-manager-downloads/plugin/latest/ubuntu_64bit/session-manager-plugin.deb" "/tmp" "session-manager-plugin.deb" apt install /tmp/session-manager-plugin.deb From 7de34e33a87a3142a38576970e61542902020766 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 16 Jun 2022 09:15:11 +0000 Subject: [PATCH 1247/3485] Updating readme file for ubuntu20 version 20220614.0 (#5747) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2004-Readme.md | 93 +++++++++++++++---------------- 1 file changed, 46 insertions(+), 47 deletions(-) diff --git a/images/linux/Ubuntu2004-Readme.md b/images/linux/Ubuntu2004-Readme.md index 21288ae35277..da1f5441366e 100644 --- a/images/linux/Ubuntu2004-Readme.md +++ b/images/linux/Ubuntu2004-Readme.md @@ -1,12 +1,11 @@ | Announcements | |-| | [[Ubuntu] AWS CLI on Ubuntu18 image will be upgraded to V2 on June 20](https://github.com/actions/virtual-environments/issues/5679) | -| [[all OSs] Android NDK 22 will be replaced in favor of 24, version 23 will be set as the default one on June, 6](https://github.com/actions/virtual-environments/issues/5595) | | [(Public Beta) Ubuntu 22.04 is now available](https://github.com/actions/virtual-environments/issues/5490) | *** # Ubuntu 20.04.4 LTS -- Linux kernel version: 5.13.0-1025-azure -- Image Version: 20220605.1 +- Linux kernel version: 5.13.0-1029-azure +- Image Version: 20220614.0 ## Installed Software ### Language and Runtime @@ -14,12 +13,12 @@ - Clang 10.0.0, 11.0.0, 12.0.0 - Clang-format 10.0.0, 11.0.0, 12.0.0 - Clang-tidy 10.0.0, 11.0.0, 12.0.0 -- Erlang 25.0 (Eshell 13.0) +- Erlang 25.0.1 (Eshell 13.0.1) - Erlang rebar3 3.18.0 - GNU C++ 9.4.0, 10.3.0 - GNU Fortran 9.4.0, 10.3.0 - Julia 1.7.3 -- Kotlin 1.6.21-release-334 +- Kotlin 1.7.0-release-281 - Mono 6.12.0.179 (apt source repository: https://download.mono-project.com/repo/ubuntu stable-focal main) - MSBuild 16.10.1.31701 (from /usr/lib/mono/msbuild/15.0/bin/MSBuild.dll) - Node 16.15.1 @@ -32,15 +31,15 @@ ### Package Management - cpan 1.64 - Helm 3.9.0 -- Homebrew 3.4.11 +- Homebrew 3.5.2 - Miniconda 4.12.0 - Npm 8.11.0 - Pip 20.0.2 - Pip3 20.0.2 - Pipx 1.1.0 - RubyGems 3.1.2 -- Vcpkg (build from master \<faed44dfa>) -- Yarn 1.22.18 +- Vcpkg (build from master \<06acb79f7>) +- Yarn 1.22.19 #### Environment variables | Name | Value | @@ -51,17 +50,17 @@ ### Project Management - Ant 1.10.7 - Gradle 7.4.2 -- Lerna 5.0.0 -- Maven 3.8.5 +- Lerna 5.1.2 +- Maven 3.8.6 - Sbt 1.6.2 ### Tools - Ansible 2.12.6 - apt-fast 1.9.12 - AzCopy 10.15.0 (available by `azcopy` and `azcopy10` aliases) -- Bazel 5.1.1 +- Bazel 5.2.0 - Bazelisk 1.11.0 -- Bicep 0.6.18 +- Bicep 0.7.4 - Buildah 1.22.3 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - CMake 3.23.2 - CodeQL Action Bundle 2.9.3 @@ -77,7 +76,7 @@ - Git-ftp 1.6.0 - Haveged 1.9.1 - Heroku 7.60.2 -- HHVM (HipHop VM) 4.161.0 +- HHVM (HipHop VM) 4.162.0 - jq 1.6 - Kind 0.14.0 - Kubectl 1.24.1 @@ -94,7 +93,7 @@ - Parcel 2.6.0 - PhantomJS 2.1.1 - Podman 3.4.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- Pulumi 3.33.2 +- Pulumi 3.34.1 - R 4.2.0 - Skopeo 1.5.0 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 @@ -106,18 +105,18 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.121 -- AWS CLI 2.7.6 +- AWS CLI 2.7.7 - AWS CLI Session manager plugin 1.2.331.0 -- AWS SAM CLI 1.51.0 +- AWS SAM CLI 1.52.0 - Azure CLI (azure-cli) 2.37.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.25.0 -- GitHub CLI 2.11.3 +- GitHub CLI 2.12.1 - Google Cloud SDK 369.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 10.4.0 -- OpenShift CLI 4.10.16 +- Netlify CLI 10.5.1 +- OpenShift CLI 4.10.18 - ORAS CLI 0.12.0 -- Vercel CLI 25.0.0 +- Vercel CLI 25.1.0 ### Java | Version | Vendor | Environment Variable | @@ -134,8 +133,8 @@ ### PHP | Tool | Version | | -------- | ------------------- | -| PHP | 7.4.29 8.0.19 8.1.6 | -| Composer | 2.3.6 | +| PHP | 7.4.30 8.0.20 8.1.7 | +| Composer | 2.3.7 | | PHPUnit | 8.5.26 | ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. @@ -153,19 +152,19 @@ - Rustup 1.24.3 #### Packages -- Bindgen 0.60.0 +- Bindgen 0.60.1 - Cargo audit 0.17.0 - Cargo clippy 0.1.61 - Cargo outdated 0.11.1 -- Cbindgen 0.23.0 +- Cbindgen 0.24.3 - Rustfmt 1.4.38 ### Browsers and Drivers -- Google Chrome 102.0.5005.61 +- Google Chrome 102.0.5005.115 - ChromeDriver 102.0.5005.61 - Chromium 102.0.5005.0 - Selenium server 4.2.0 -- Mozilla Firefox 100.0.2 +- Mozilla Firefox 101.0.1 - Geckodriver 0.31.0 #### Environment variables @@ -176,7 +175,7 @@ | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | ### .NET Core SDK -- 3.1.120 3.1.202 3.1.302 3.1.419 5.0.104 5.0.214 5.0.303 5.0.408 6.0.300 +- 3.1.120 3.1.202 3.1.302 3.1.420 5.0.104 5.0.214 5.0.303 5.0.408 6.0.301 ### .NET tools - nbgv 3.5.107+6463ef6068 @@ -227,7 +226,7 @@ - 3.7.13 - 3.8.12 - 3.9.13 -- 3.10.4 +- 3.10.5 #### Ruby - 2.5.9 @@ -265,20 +264,20 @@ | nginx | 1.18.0 | /etc/nginx/nginx.conf | inactive | 80 | ### Android -| Package Name | Version | -| -------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 7.0 | -| Android Emulator | 31.2.10 | -| Android SDK Build-tools | 32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | -| Android SDK Platform-Tools | 33.0.2 | -| Android SDK Platforms | android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | -| Android SDK Tools | 26.1.1 | -| Android Support Repository | 47.0.0 | -| CMake | 3.10.2<br>3.18.1 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 21.4.7075529<br>23.2.8568313 (default)<br>24.0.8215888 | -| SDK Patch Applier v4 | 1 | +| Package Name | Version | +| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------ | +| Android Command Line Tools | 7.0 | +| Android Emulator | 31.2.10 | +| Android SDK Build-tools | 33.0.0<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | +| Android SDK Platform-Tools | 33.0.2 | +| Android SDK Platforms | android-33 (rev 1)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | +| Android SDK Tools | 26.1.1 | +| Android Support Repository | 47.0.0 | +| CMake | 3.10.2<br>3.18.1 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 21.4.7075529<br>23.2.8568313 (default)<br>24.0.8215888 | +| SDK Patch Applier v4 | 1 | #### Environment variables | Name | Value | @@ -305,12 +304,12 @@ | node:12 | sha256:01627afeb110b3054ba4a1405541ca095c8bfca1cb6f2be9479c767a2711879e | 2022-04-20 | | node:12-alpine | sha256:d4b15b3d48f42059a15bd659be60afe21762aae9d6cbea6f124440895c27db68 | 2022-04-11 | | node:14 | sha256:3324c688c0e98888f8938509f35356acf69a3e1f9f385d85f7e6086b137c17e3 | 2022-05-28 | -| node:14-alpine | sha256:c9b8829068199346e2a9ae46f870bbb82ce44de6580321300bf3945d00dee0f1 | 2022-05-18 | -| node:16 | sha256:59eb4e9d6a344ae1161e7d6d8af831cb50713cc631889a5a8c2d438d6ec6aa0f | 2022-05-28 | -| node:16-alpine | sha256:1a9a71ea86aad332aa7740316d4111ee1bd4e890df47d3b5eff3e5bded3b3d10 | 2022-04-27 | +| node:14-alpine | sha256:6b87d16e4ce20cacd6f1f662f66c821e4c3c41c2903daeace52d818ec3f4bbdd | 2022-06-07 | +| node:16 | sha256:6155ff062c403e99c1da7c317710c5c838c1e060f526d98baea6ee921ca61729 | 2022-06-06 | +| node:16-alpine | sha256:c785e617c8d7015190c0d41af52cc69be8a16e3d9eb7cb21f0bb58bcfca14d6b | 2022-06-07 | | ubuntu:16.04 | sha256:20858ebbc96215d6c3c574f781133ebffdc7c18d98af4f294cc4c04871a6fe61 | 2021-08-31 | -| ubuntu:18.04 | sha256:d21b6ba9e19feffa328cb3864316e6918e30acfd55e285b5d3df1d8ca3c7fd3f | 2022-04-29 | -| ubuntu:20.04 | sha256:47f14534bda344d9fe6ffd6effb95eefe579f4be0d508b7445cf77f61a0e5724 | 2022-04-29 | +| ubuntu:18.04 | sha256:478caf1bec1afd54a58435ec681c8755883b7eb843a8630091890130b15a79af | 2022-06-06 | +| ubuntu:20.04 | sha256:fd92c36d3cb9b1d027c4d2a72c6bf0125da82425fc2ca37c414d4f010180dc19 | 2022-06-06 | ### Installed apt packages | Name | Version | From 58b9c4ec45405d14c3c7af03a7ac39d29f0aaa61 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 16 Jun 2022 09:21:48 +0000 Subject: [PATCH 1248/3485] Updating readme file for ubuntu18 version 20220614.0 (#5748) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu1804-Readme.md | 91 +++++++++++++++---------------- 1 file changed, 45 insertions(+), 46 deletions(-) diff --git a/images/linux/Ubuntu1804-Readme.md b/images/linux/Ubuntu1804-Readme.md index 5a04676d1ccb..b21a2282569f 100644 --- a/images/linux/Ubuntu1804-Readme.md +++ b/images/linux/Ubuntu1804-Readme.md @@ -1,12 +1,11 @@ | Announcements | |-| | [[Ubuntu] AWS CLI on Ubuntu18 image will be upgraded to V2 on June 20](https://github.com/actions/virtual-environments/issues/5679) | -| [[all OSs] Android NDK 22 will be replaced in favor of 24, version 23 will be set as the default one on June, 6](https://github.com/actions/virtual-environments/issues/5595) | | [(Public Beta) Ubuntu 22.04 is now available](https://github.com/actions/virtual-environments/issues/5490) | *** # Ubuntu 18.04.6 LTS -- Linux kernel version: 5.4.0-1080-azure -- Image Version: 20220605.1 +- Linux kernel version: 5.4.0-1083-azure +- Image Version: 20220614.0 ## Installed Software ### Language and Runtime @@ -14,12 +13,12 @@ - Clang 9.0.0 - Clang-format 9.0.0 - Clang-tidy 9.0.0 -- Erlang 25.0 (Eshell 13.0) +- Erlang 25.0.1 (Eshell 13.0.1) - Erlang rebar3 3.18.0 - GNU C++ 7.5.0, 9.4.0, 10.3.0 - GNU Fortran 7.5.0, 9.4.0, 10.3.0 - Julia 1.7.3 -- Kotlin 1.6.21-release-334 +- Kotlin 1.7.0-release-281 - Mono 6.12.0.179 (apt source repository: https://download.mono-project.com/repo/ubuntu stable-bionic main) - MSBuild 16.10.1.31701 (from /usr/lib/mono/msbuild/15.0/bin/MSBuild.dll) - Node 16.15.1 @@ -32,15 +31,15 @@ ### Package Management - cpan 1.64 - Helm 3.9.0 -- Homebrew 3.4.11 +- Homebrew 3.5.2 - Miniconda 4.12.0 - Npm 8.11.0 - Pip 9.0.1 - Pip3 9.0.1 - Pipx 1.0.0 - RubyGems 2.7.6 -- Vcpkg (build from master \<faed44dfa>) -- Yarn 1.22.18 +- Vcpkg (build from master \<06acb79f7>) +- Yarn 1.22.19 #### Environment variables | Name | Value | @@ -51,16 +50,16 @@ ### Project Management - Ant 1.10.5 - Gradle 7.4.2 -- Maven 3.8.5 +- Maven 3.8.6 - Sbt 1.6.2 ### Tools - Ansible 2.11.12 - apt-fast 1.9.12 - AzCopy 10.15.0 (available by `azcopy` and `azcopy10` aliases) -- Bazel 5.1.1 +- Bazel 5.2.0 - Bazelisk 1.11.0 -- Bicep 0.6.18 +- Bicep 0.7.4 - Buildah 1.22.3 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - CMake 3.23.2 - CodeQL Action Bundle 2.9.3 @@ -75,7 +74,7 @@ - Git-ftp 1.3.1 - Haveged 1.9.1 - Heroku 7.60.2 -- HHVM (HipHop VM) 4.161.0 +- HHVM (HipHop VM) 4.162.0 - jq 1.5 - Kind 0.14.0 - Kubectl 1.24.1 @@ -92,7 +91,7 @@ - Parcel 2.6.0 - PhantomJS 2.1.1 - Podman 3.4.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- Pulumi 3.33.2 +- Pulumi 3.34.1 - R 4.2.0 - Skopeo 1.5.0 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 @@ -106,16 +105,16 @@ - Alibaba Cloud CLI 3.0.121 - AWS CLI 1.24.10 - AWS CLI Session manager plugin 1.2.331.0 -- AWS SAM CLI 1.51.0 +- AWS SAM CLI 1.52.0 - Azure CLI (azure-cli) 2.37.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.25.0 -- GitHub CLI 2.11.3 +- GitHub CLI 2.12.1 - Google Cloud SDK 369.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 10.4.0 -- OpenShift CLI 4.10.16 +- Netlify CLI 10.5.1 +- OpenShift CLI 4.10.18 - ORAS CLI 0.12.0 -- Vercel CLI 25.0.0 +- Vercel CLI 25.1.0 ### Java | Version | Vendor | Environment Variable | @@ -128,8 +127,8 @@ ### PHP | Tool | Version | | -------- | --------------------------------- | -| PHP | 7.2.34 7.3.33 7.4.29 8.0.19 8.1.6 | -| Composer | 2.3.6 | +| PHP | 7.2.34 7.3.33 7.4.30 8.0.20 8.1.7 | +| Composer | 2.3.7 | | PHPUnit | 8.5.26 | ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. @@ -147,19 +146,19 @@ - Rustup 1.24.3 #### Packages -- Bindgen 0.60.0 +- Bindgen 0.60.1 - Cargo audit 0.17.0 - Cargo clippy 0.1.61 - Cargo outdated 0.11.1 -- Cbindgen 0.23.0 +- Cbindgen 0.24.3 - Rustfmt 1.4.38 ### Browsers and Drivers -- Google Chrome 102.0.5005.61 +- Google Chrome 102.0.5005.115 - ChromeDriver 102.0.5005.61 - Chromium 102.0.5005.0 - Selenium server 4.2.0 -- Mozilla Firefox 100.0.2 +- Mozilla Firefox 101.0.1 - Geckodriver 0.31.0 #### Environment variables @@ -170,7 +169,7 @@ | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | ### .NET Core SDK -- 3.1.120 3.1.202 3.1.302 3.1.419 5.0.104 5.0.214 5.0.303 5.0.408 6.0.300 +- 3.1.120 3.1.202 3.1.302 3.1.420 5.0.104 5.0.214 5.0.303 5.0.408 6.0.301 ### .NET tools - nbgv 3.5.107+6463ef6068 @@ -219,7 +218,7 @@ - 3.7.13 - 3.8.12 - 3.9.13 -- 3.10.4 +- 3.10.5 #### Ruby - 2.4.10 @@ -256,21 +255,21 @@ | nginx | 1.14.0 | /etc/nginx/nginx.conf | inactive | 80 | ### Android -| Package Name | Version | -| -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 7.0 | -| Android Emulator | 31.2.10 | -| Android SDK Build-tools | 32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3<br>26.0.0 26.0.1 26.0.2 26.0.3<br>25.0.0 25.0.1 25.0.2 25.0.3<br>24.0.0 24.0.1 24.0.2 24.0.3<br>23.0.1 23.0.2 23.0.3 | -| Android SDK Platform-Tools | 33.0.2 | -| Android SDK Platforms | android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3)<br>android-26 (rev 2)<br>android-25 (rev 3)<br>android-24 (rev 2)<br>android-23 (rev 3) | -| Android SDK Tools | 26.1.1 | -| Android Support Repository | 47.0.0 | -| CMake | 3.10.2<br>3.18.1 | -| Google APIs | addon-google_apis-google-21<br>addon-google_apis-google-22<br>addon-google_apis-google-23<br>addon-google_apis-google-24 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 21.4.7075529<br>23.2.8568313 (default)<br>24.0.8215888 | -| SDK Patch Applier v4 | 1 | +| Package Name | Version | +| -------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 7.0 | +| Android Emulator | 31.2.10 | +| Android SDK Build-tools | 33.0.0<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3<br>26.0.0 26.0.1 26.0.2 26.0.3<br>25.0.0 25.0.1 25.0.2 25.0.3<br>24.0.0 24.0.1 24.0.2 24.0.3<br>23.0.1 23.0.2 23.0.3 | +| Android SDK Platform-Tools | 33.0.2 | +| Android SDK Platforms | android-33 (rev 1)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3)<br>android-26 (rev 2)<br>android-25 (rev 3)<br>android-24 (rev 2)<br>android-23 (rev 3) | +| Android SDK Tools | 26.1.1 | +| Android Support Repository | 47.0.0 | +| CMake | 3.10.2<br>3.18.1 | +| Google APIs | addon-google_apis-google-21<br>addon-google_apis-google-22<br>addon-google_apis-google-23<br>addon-google_apis-google-24 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 21.4.7075529<br>23.2.8568313 (default)<br>24.0.8215888 | +| SDK Patch Applier v4 | 1 | #### Environment variables | Name | Value | @@ -297,12 +296,12 @@ | node:12 | sha256:01627afeb110b3054ba4a1405541ca095c8bfca1cb6f2be9479c767a2711879e | 2022-04-20 | | node:12-alpine | sha256:d4b15b3d48f42059a15bd659be60afe21762aae9d6cbea6f124440895c27db68 | 2022-04-11 | | node:14 | sha256:3324c688c0e98888f8938509f35356acf69a3e1f9f385d85f7e6086b137c17e3 | 2022-05-28 | -| node:14-alpine | sha256:c9b8829068199346e2a9ae46f870bbb82ce44de6580321300bf3945d00dee0f1 | 2022-05-18 | -| node:16 | sha256:59eb4e9d6a344ae1161e7d6d8af831cb50713cc631889a5a8c2d438d6ec6aa0f | 2022-05-28 | -| node:16-alpine | sha256:1a9a71ea86aad332aa7740316d4111ee1bd4e890df47d3b5eff3e5bded3b3d10 | 2022-04-27 | +| node:14-alpine | sha256:6b87d16e4ce20cacd6f1f662f66c821e4c3c41c2903daeace52d818ec3f4bbdd | 2022-06-07 | +| node:16 | sha256:6155ff062c403e99c1da7c317710c5c838c1e060f526d98baea6ee921ca61729 | 2022-06-06 | +| node:16-alpine | sha256:c785e617c8d7015190c0d41af52cc69be8a16e3d9eb7cb21f0bb58bcfca14d6b | 2022-06-07 | | ubuntu:16.04 | sha256:20858ebbc96215d6c3c574f781133ebffdc7c18d98af4f294cc4c04871a6fe61 | 2021-08-31 | -| ubuntu:18.04 | sha256:d21b6ba9e19feffa328cb3864316e6918e30acfd55e285b5d3df1d8ca3c7fd3f | 2022-04-29 | -| ubuntu:20.04 | sha256:47f14534bda344d9fe6ffd6effb95eefe579f4be0d508b7445cf77f61a0e5724 | 2022-04-29 | +| ubuntu:18.04 | sha256:478caf1bec1afd54a58435ec681c8755883b7eb843a8630091890130b15a79af | 2022-06-06 | +| ubuntu:20.04 | sha256:fd92c36d3cb9b1d027c4d2a72c6bf0125da82425fc2ca37c414d4f010180dc19 | 2022-06-06 | ### Installed apt packages | Name | Version | From 5edad1303c3ccc046bbf62866e14d5e0f83fa605 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 16 Jun 2022 09:27:55 +0000 Subject: [PATCH 1249/3485] Updating readme file for win19 version 20220614.0 (#5749) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2019-Readme.md | 95 ++++++++++++++++---------------- 1 file changed, 47 insertions(+), 48 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index 8ae31874bad7..f4096f0c9fa8 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -1,11 +1,10 @@ | Announcements | |-| -| [[all OSs] Android NDK 22 will be replaced in favor of 24, version 23 will be set as the default one on June, 6](https://github.com/actions/virtual-environments/issues/5595) | | [[Azure DevOps] Windows-2016 environment removal postponed until June 30, 2022](https://github.com/actions/virtual-environments/issues/5403) | *** # Microsoft Windows Server 2019 Datacenter - OS Version: 10.0.17763 Build 2928 -- Image Version: 20220606.1 +- Image Version: 20220614.0 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -15,11 +14,11 @@ - Bash 4.4.23(1)-release - Go 1.17.11 - Julia 1.7.3 -- Kotlin 1.6.21 +- Kotlin 1.7.0 - LLVM 13.0.1 - Node 16.15.1 - Perl 5.32.1 -- PHP 8.1.6 +- PHP 8.1.7 - Python 3.7.9 - Ruby 2.5.9p229 @@ -29,12 +28,12 @@ - Helm 3.8.2 - Miniconda 4.12.0 (pre-installed on the image but not added to PATH) - NPM 8.11.0 -- NuGet 6.2.0.146 +- NuGet 6.2.1.2 - pip 22.1.2 (python 3.7) - Pipx 1.1.0 - RubyGems 2.7.6.3 -- Vcpkg (build from master \<203f5f3be>) -- Yarn 1.22.18 +- Vcpkg (build from master \<06acb79f7>) +- Yarn 1.22.19 #### Environment variables | Name | Value | @@ -45,16 +44,16 @@ ### Project Management - Ant 1.10.12 - Gradle 7.4 -- Maven 3.8.5 +- Maven 3.8.6 - sbt 1.6.2 ### Tools - 7zip 21.07 - aria2 1.36.0 - azcopy 10.15.0 -- Bazel 5.1.1 +- Bazel 5.2.0 - Bazelisk 1.11.0 -- Bicep 0.6.18 +- Bicep 0.7.4 - Cabal 3.6.2.0 - CMake 3.23.2 - CodeQL Action Bundle 2.9.3 @@ -63,9 +62,9 @@ - Docker Compose v2 2.6.0 - Docker-wincred 0.6.4 - ghc 9.2.3 -- Git 2.36.0.windows.1 +- Git 2.36.1.windows.1 - Git LFS 3.1.4 -- Google Cloud SDK 388.0.0 +- Google Cloud SDK 390.0.0 - InnoSetup 6.2.1 - jq 1.6 - Kind 0.14.0 @@ -77,7 +76,7 @@ - OpenSSL 1.1.1 - Packer 1.8.0 - Parcel 2.6.0 -- Pulumi v3.33.2 +- Pulumi v3.34.1 - R 4.2.0 - Service Fabric SDK 9.0.1028.9590 - Stack 2.7.5 @@ -91,13 +90,13 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.121 -- AWS CLI 2.7.6 -- AWS SAM CLI 1.51.0 +- AWS CLI 2.7.7 +- AWS SAM CLI 1.52.0 - AWS Session Manager CLI 1.2.331.0 - Azure CLI 2.37.0 - Azure DevOps CLI extension 0.25.0 - Cloud Foundry CLI 6.53.0 -- GitHub CLI 2.11.3 +- GitHub CLI 2.12.1 - Hub CLI 2.14.2 ### Rust Tools @@ -110,16 +109,16 @@ - bindgen 0.60.1 - cargo-audit 0.17.0 - cargo-outdated 0.11.1 -- cbindgen 0.23.0 +- cbindgen 0.24.3 - Clippy 0.1.61 - Rustfmt 1.4.38 ### Browsers and webdrivers -- Google Chrome 102.0.5005.63 +- Google Chrome 102.0.5005.115 - Chrome Driver 102.0.5005.61 -- Microsoft Edge 102.0.1245.33 -- Microsoft Edge Driver 102.0.1245.33 -- Mozilla Firefox 101.0 +- Microsoft Edge 102.0.1245.41 +- Microsoft Edge Driver 102.0.1245.41 +- Mozilla Firefox 101.0.1 - Gecko Driver 0.31.0 - IE Driver 3.150.1.1 - Selenium server 4.2.0 @@ -183,7 +182,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | 3.7.9 (Default) | x64, x86 | | 3.8.10 | x64, x86 | | 3.9.13 | x64, x86 | -| 3.10.4 | x64, x86 | +| 3.10.5 | x64, x86 | #### Ruby | Version | Architecture | @@ -238,12 +237,12 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Visual Studio Enterprise 2019 | Name | Version | Path | | ----------------------------- | --------------- | -------------------------------------------------------------- | -| Visual Studio Enterprise 2019 | 16.11.32510.428 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | +| Visual Studio Enterprise 2019 | 16.11.32602.291 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | #### Workloads, components and extensions: | Package | Version | | ------------------------------------------------------------------------- | --------------- | -| Component.Android.NDK.R16B | 16.11.32510.428 | +| Component.Android.NDK.R16B | 16.11.32601.460 | | Component.Android.SDK25.Private | 16.0.28625.61 | | Component.Android.SDK30 | 16.10.31205.252 | | Component.Ant | 1.9.3.8 | @@ -298,9 +297,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.Net.ComponentGroup.DevelopmentPrerequisites | 16.3.29207.166 | | Microsoft.Net.ComponentGroup.TargetingPacks.Common | 16.0.28516.191 | | Microsoft.NetCore.Component.DevelopmentTools | 16.10.31303.231 | -| Microsoft.NetCore.Component.Runtime.3.1 | 16.11.32428.217 | -| Microsoft.NetCore.Component.Runtime.5.0 | 16.11.32428.217 | -| Microsoft.NetCore.Component.SDK | 16.11.32428.217 | +| Microsoft.NetCore.Component.Runtime.3.1 | 16.11.32602.291 | +| Microsoft.NetCore.Component.Runtime.6.0 | 16.11.32602.291 | +| Microsoft.NetCore.Component.SDK | 16.11.32602.291 | | Microsoft.NetCore.Component.Web | 16.10.31303.231 | | Microsoft.VisualStudio.Component.AppInsights.Tools | 16.5.29515.121 | | Microsoft.VisualStudio.Component.AspNet45 | 16.10.31205.252 | @@ -508,17 +507,17 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### .NET Core SDK `Location C:\Program Files\dotnet\sdk` -- 3.1.120 3.1.202 3.1.302 3.1.419 5.0.104 5.0.214 5.0.303 5.0.408 +- 3.1.120 3.1.202 3.1.302 3.1.420 5.0.104 5.0.214 5.0.303 5.0.408 5.0.409 ### .NET Core Runtime `Location: C:\Program Files\dotnet\shared\Microsoft.AspNetCore.App` -- 3.1.4 3.1.6 3.1.20 3.1.25 5.0.4 5.0.9 5.0.17 +- 3.1.4 3.1.6 3.1.20 3.1.26 5.0.4 5.0.9 5.0.17 6.0.6 `Location: C:\Program Files\dotnet\shared\Microsoft.NETCore.App` -- 3.1.4 3.1.6 3.1.20 3.1.25 5.0.4 5.0.9 5.0.17 +- 3.1.4 3.1.6 3.1.20 3.1.26 5.0.4 5.0.9 5.0.17 6.0.6 `Location: C:\Program Files\dotnet\shared\Microsoft.WindowsDesktop.App` -- 3.1.4 3.1.6 3.1.20 3.1.25 5.0.4 5.0.9 5.0.17 +- 3.1.4 3.1.6 3.1.20 3.1.26 5.0.4 5.0.9 5.0.17 6.0.6 ### .NET Framework `Type: Developer Pack` @@ -547,7 +546,7 @@ All other versions are saved but not installed. #### Powershell Modules | Module | Version | | ------------------ | ---------------- | -| AWSPowerShell | 4.1.98 | +| AWSPowerShell | 4.1.104 | | DockerMsftProvider | 1.0.0.8 | | MarkdownPS | 1.9 | | Microsoft.Graph | 1.9.6 | @@ -559,20 +558,20 @@ All other versions are saved but not installed. | VSSetup | 2.2.16 | ### Android -| Package Name | Version | -| -------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 7.0 | -| Android SDK Build-tools | 32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3<br>26.0.0 26.0.1 26.0.2 26.0.3<br>25.0.0 25.0.1 25.0.2 25.0.3<br>24.0.0 24.0.1 24.0.2 24.0.3<br>23.0.1 23.0.2 23.0.3<br>22.0.1<br>21.1.2<br>20.0.0<br>19.1.0 | -| Android SDK Platforms | android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3)<br>android-26 (rev 2)<br>android-25 (rev 3)<br>android-24 (rev 2)<br>android-23 (rev 3)<br>android-22 (rev 2)<br>android-21 (rev 2)<br>android-20 (rev 2)<br>android-19 (rev 4) | -| Android SDK Platform-Tools | 33.0.2 | -| Android SDK Tools | 26.1.1 | -| Android Support Repository | 47.0.0 | -| CMake | 3.10.2<br>3.18.1 | -| Google APIs | addon-google_apis-google-21<br>addon-google_apis-google-22<br>addon-google_apis-google-23<br>addon-google_apis-google-24 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 21.4.7075529<br>23.2.8568313 (default)<br>24.0.8215888 | -| SDK Patch Applier v4 | 1 | +| Package Name | Version | +| -------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 7.0 | +| Android SDK Build-tools | 33.0.0<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3<br>26.0.0 26.0.1 26.0.2 26.0.3<br>25.0.0 25.0.1 25.0.2 25.0.3<br>24.0.0 24.0.1 24.0.2 24.0.3<br>23.0.1 23.0.2 23.0.3<br>22.0.1<br>21.1.2<br>20.0.0<br>19.1.0 | +| Android SDK Platforms | android-33 (rev 1)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3)<br>android-26 (rev 2)<br>android-25 (rev 3)<br>android-24 (rev 2)<br>android-23 (rev 3)<br>android-22 (rev 2)<br>android-21 (rev 2)<br>android-20 (rev 2)<br>android-19 (rev 4) | +| Android SDK Platform-Tools | 33.0.2 | +| Android SDK Tools | 26.1.1 | +| Android Support Repository | 47.0.0 | +| CMake | 3.10.2<br>3.18.1 | +| Google APIs | addon-google_apis-google-21<br>addon-google_apis-google-22<br>addon-google_apis-google-23<br>addon-google_apis-google-24 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 21.4.7075529<br>23.2.8568313 (default)<br>24.0.8215888 | +| SDK Patch Applier v4 | 1 | #### Environment variables | Name | Value | @@ -590,7 +589,7 @@ All other versions are saved but not installed. | mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:a108b8cd955bc84813eda0aab41d514887ef0b4a2e2bbbca6965ec09d4da2c0c | 2022-05-11 | | mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:9e0351236b319aba13cfec412d94df47cf4220cc909cdef6bb0aaaf31f2fb741 | 2022-05-11 | | mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:fa53215891bfa80f70d5266f08942dd6e83a7b61f3701b700b19b4aba2dc1060 | 2022-05-11 | -| mcr.microsoft.com/windows/nanoserver:1809 | sha256:fb16d42712f3599c849723d365a7ddc5fb95e8bf1674d97e9f9cbcb726e7525d | 2022-05-05 | -| mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:b474e47f6f8bdb110068684ab8cebbadb5806e641fe6dba0169555981f6520ef | 2022-05-05 | +| mcr.microsoft.com/windows/nanoserver:1809 | sha256:1e03529d89a3ebab534c024b69dcc050757b285622aaecfe8d5d35e26fee50ac | 2022-06-09 | +| mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:e100aa542181a34add63bc38125ad57da16a7d1722dd965a888fde1b8d8c67bb | 2022-06-09 | From f8c0aa0241e605348c359bb3e61e3f78b47a3b14 Mon Sep 17 00:00:00 2001 From: Semen Zhydenko <simeon.zhidenko@gmail.com> Date: Thu, 16 Jun 2022 11:32:30 +0200 Subject: [PATCH 1250/3485] Ss18/typos (#5753) * FIX: typo becuase -> because * FIX: typo succesfully -> successfully --- images.CI/linux-and-win/cleanup.ps1 | 2 +- images/win/scripts/Installers/Install-Docker.ps1 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/images.CI/linux-and-win/cleanup.ps1 b/images.CI/linux-and-win/cleanup.ps1 index e83acafa22a5..0c91272d149f 100644 --- a/images.CI/linux-and-win/cleanup.ps1 +++ b/images.CI/linux-and-win/cleanup.ps1 @@ -17,7 +17,7 @@ if ($groupExist -eq "true") { $osDiskName = az group deployment list --resource-group $TempResourceGroupName --query "[].properties.parameters.osDiskName.value" -o tsv Write-Host "Found a match, deleting temporary files" az group delete --name $TempResourceGroupName --subscription $SubscriptionId --yes | Out-Null - Write-Host "Temporary group was deleted succesfully" + Write-Host "Temporary group was deleted successfully" Write-Host "Deleting OS disk" az storage remove --account-name $StorageAccount -c "images" -n "$osDiskName.vhd" --only-show-errors | Out-Null Write-Host "OS disk deleted" diff --git a/images/win/scripts/Installers/Install-Docker.ps1 b/images/win/scripts/Installers/Install-Docker.ps1 index e1ddf9c9c582..7d5e18a412fa 100644 --- a/images/win/scripts/Installers/Install-Docker.ps1 +++ b/images/win/scripts/Installers/Install-Docker.ps1 @@ -1,7 +1,7 @@ ################################################################################ ## File: Install-Docker.ps1 ## Desc: Install Docker. -## Must be an independent step becuase it requires a restart before we +## Must be an independent step because it requires a restart before we ## can continue. ################################################################################ From 70cbad1d25496a3048d84b882cc143bafcf23b70 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Thu, 16 Jun 2022 12:57:18 +0200 Subject: [PATCH 1251/3485] Rename macOS-11 anka hcl template (#5758) --- .../macos/templates/{macOS-11.pkr.hcl => macOS-11.anka.pkr.hcl} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename images/macos/templates/{macOS-11.pkr.hcl => macOS-11.anka.pkr.hcl} (100%) diff --git a/images/macos/templates/macOS-11.pkr.hcl b/images/macos/templates/macOS-11.anka.pkr.hcl similarity index 100% rename from images/macos/templates/macOS-11.pkr.hcl rename to images/macos/templates/macOS-11.anka.pkr.hcl From 89ee433676b033265dc2f7123adaecb73ce0e0f6 Mon Sep 17 00:00:00 2001 From: Andrew Brown <andrew.brown@intel.com> Date: Thu, 16 Jun 2022 08:15:38 -0700 Subject: [PATCH 1252/3485] Update MinGW on Windows 2022 (#5729) * Update MinGW on Windows 2022 Previously, the GitHub virtual environments only had MinGW v8.1.0 installed. That version was released in October of 2018 and, since then, MinGW has released versions all the way up to v11.2.0. This change updates the MinGW version to the latest available on Chocolatey for the Windows 2022 environment. Windows 2019 retains the current v8.1.0 version. Fixes #5530. * Update MinGW documentation * Additionally update win-2016 version * Revert "Update MinGW documentation" This reverts commit cb7a72ff0f33f8a5bbda15be677b348a05f9fee0. * fix: modify the pattern used for retrieving the MinGW version --- images/win/scripts/Installers/Install-Mingw64.ps1 | 3 ++- images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 | 4 ++-- images/win/toolsets/toolset-2016.json | 3 +++ images/win/toolsets/toolset-2019.json | 3 +++ images/win/toolsets/toolset-2022.json | 3 +++ 5 files changed, 13 insertions(+), 3 deletions(-) diff --git a/images/win/scripts/Installers/Install-Mingw64.ps1 b/images/win/scripts/Installers/Install-Mingw64.ps1 index 15bb31825d2a..6d9043a80ba3 100644 --- a/images/win/scripts/Installers/Install-Mingw64.ps1 +++ b/images/win/scripts/Installers/Install-Mingw64.ps1 @@ -3,7 +3,8 @@ ## Desc: Install GNU tools for Windows ################################################################################ -Choco-Install -PackageName mingw -ArgumentList "--version=8.1.0" +$toolsetVersion = (Get-ToolsetContent).mingw.version +Choco-Install -PackageName mingw -ArgumentList "--version=$toolsetVersion" # Make a copy of mingw32-make.exe to make.exe, which is a more discoverable name # and so the same command line can be used on Windows as on macOS and Linux diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 index 175ff9c4c33b..878a838c2278 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 @@ -102,7 +102,7 @@ function Get-KindVersion { } function Get-MinGWVersion { - (gcc --version | Select-String -Pattern "MinGW-W64 project") -match "(?<version>\d+\.\d+\.\d+)" | Out-Null + (gcc --version | Select-String -Pattern "MinGW-W64") -match "(?<version>\d+\.\d+\.\d+)" | Out-Null $mingwVersion = $Matches.Version return "Mingw-w64 $mingwVersion" } @@ -302,4 +302,4 @@ function Get-SwigVersion { (swig -version | Out-String) -match "version (?<version>\d+\.\d+\.\d+)" | Out-Null $swigVersion = $Matches.Version return "Swig $swigVersion" -} \ No newline at end of file +} diff --git a/images/win/toolsets/toolset-2016.json b/images/win/toolsets/toolset-2016.json index 1325b6c2967a..1a0aaab6df64 100644 --- a/images/win/toolsets/toolset-2016.json +++ b/images/win/toolsets/toolset-2016.json @@ -187,6 +187,9 @@ ] } }, + "mingw": { + "version": "8.1.0" + }, "MsysPackages": { "msys2": [ "base-devel", diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index fb15f058279e..39265c49ff6f 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -189,6 +189,9 @@ ] } }, + "mingw": { + "version": "8.1.0" + }, "MsysPackages": { "msys2": [ "base-devel", diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index 06af656b031b..93b451e00931 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -159,6 +159,9 @@ ] } }, + "mingw": { + "version": "11.2.0.07112021" + }, "MsysPackages": { "msys2": [], "mingw": [] From 6a2f3acb8890efd4b6ba9344d5f73af25e7a2bcf Mon Sep 17 00:00:00 2001 From: Johan Laanstra <jlaanstra1221@outlook.com> Date: Thu, 16 Jun 2022 08:16:25 -0700 Subject: [PATCH 1253/3485] Adds the Windows SDK (10.0.22621) for Windows 11, version 22H2 (#5755) --- images/win/toolsets/toolset-2022.json | 1 + 1 file changed, 1 insertion(+) diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index 93b451e00931..c17f6aa79f7d 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -242,6 +242,7 @@ "Microsoft.VisualStudio.Component.Windows10SDK.19041", "Microsoft.VisualStudio.Component.Windows10SDK.20348", "Microsoft.VisualStudio.Component.Windows11SDK.22000", + "Microsoft.VisualStudio.Component.Windows11SDK.22621", "Microsoft.VisualStudio.Component.Workflow", "Microsoft.VisualStudio.ComponentGroup.Azure.CloudServices", "Microsoft.VisualStudio.ComponentGroup.Azure.ResourceManager.Tools", From 4790ac0a20060b645abbcc0eae8e45b0a4987848 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 16 Jun 2022 23:02:04 +0000 Subject: [PATCH 1254/3485] Updating readme file for macOS-11 version 20220614.2 (#5757) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-11-Readme.md | 94 +++++++++++++++++---------------- 1 file changed, 48 insertions(+), 46 deletions(-) diff --git a/images/macos/macos-11-Readme.md b/images/macos/macos-11-Readme.md index 22fc62c5208e..9301e4747fa8 100644 --- a/images/macos/macos-11-Readme.md +++ b/images/macos/macos-11-Readme.md @@ -1,16 +1,11 @@ -| Announcements | -|-| -| [[all OSs] Android NDK 22 will be replaced in favor of 24, version 23 will be set as the default one on June, 6](https://github.com/actions/virtual-environments/issues/5595) | -| [macOS 12 (Monterey) is available as a public beta in GitHub Actions and Azure DevOps](https://github.com/actions/virtual-environments/issues/5446) | -*** # macOS 11.6 info - System Version: macOS 11.6.6 (20G624) - Kernel Version: Darwin 20.6.0 -- Image Version: 20220605.1 +- Image Version: 20220614.2 ## Installed Software ### Language and Runtime -- .NET SDK 3.1.101 3.1.201 3.1.302 3.1.419 5.0.102 5.0.202 5.0.302 5.0.408 +- .NET SDK 3.1.101 3.1.201 3.1.302 3.1.420 5.0.102 5.0.202 5.0.302 5.0.408 - Bash 3.2.57(1)-release - Clang/LLVM 13.0.0 is default - Clang/LLVM 13.0.1 is available on `'$(brew --prefix llvm)/bin/clang'` @@ -22,13 +17,13 @@ - GNU Fortran (Homebrew GCC 11.3.0_1) 11.3.0 - available by `gfortran-11` alias - Go 1.17.11 - julia 1.7.3 -- Kotlin 1.6.21-release-334 -- MSBuild 16.10.1.17201 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) +- Kotlin 1.7.0-release-281 +- MSBuild 16.10.1.31401 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) - Node.js v16.15.1 - NVM 0.39.1 - NVM - Cached node versions: v12.22.12 v14.19.3 v16.15.1 - Perl 5.34.0 -- PHP 8.1.6 +- PHP 8.1.7 - Python 2.7.18 - Python 3.9.13 - R 4.2.0 @@ -38,16 +33,16 @@ - Bundler version 2.3.15 - Carthage 0.38.0 - CocoaPods 1.11.3 -- Composer 2.3.6 -- Homebrew 3.4.11 +- Composer 2.3.7 +- Homebrew 3.5.2 - Miniconda 4.12.0 - NPM 8.11.0 -- NuGet 5.9.0.7134 +- NuGet 6.2.1.2 - Pip 20.3.4 (python 2.7) - Pip 22.1.1 (python 3.9) - Pipx 1.1.0 - RubyGems 3.2.33 -- Vcpkg 2022 (build from master \<faed44dfa>) +- Vcpkg 2022 (build from master \<06acb79f7>) - Yarn 1.22.19 #### Environment variables @@ -58,7 +53,7 @@ ### Project Management - Apache Ant(TM) 1.10.12 -- Apache Maven 3.8.5 +- Apache Maven 3.8.6 - Gradle 7.4.2 - Sbt 1.6.2 @@ -66,19 +61,19 @@ - 7-Zip 17.04 - aria2 1.36.0 - azcopy 10.15.0 -- bazel 5.1.1 +- bazel 5.2.0 - bazelisk 1.11.0 - bsdtar 3.3.2 - available by 'tar' alias - Curl 7.83.1 - Git 2.36.1 - Git LFS: 3.2.0 -- GitHub CLI: 2.11.3 +- GitHub CLI: 2.12.1 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.3 - gpg (GnuPG) 2.3.6 - helm v3.9.0+g7ceeda6 - Hub CLI: 2.14.2 -- ImageMagick 7.1.0-36 +- ImageMagick 7.1.0-37 - jq 1.6 - mongo v5.0.7 - mongod v5.0.7 @@ -96,12 +91,12 @@ ### Tools - Aliyun CLI 3.0.121 - App Center CLI 2.10.10 -- AWS CLI 2.7.6 -- AWS SAM CLI 1.51.0 +- AWS CLI 2.7.7 +- AWS SAM CLI 1.52.0 - AWS Session Manager CLI 1.2.331.0 - Azure CLI (azure-devops) 0.25.0 - Azure CLI 2.37.0 -- Bicep CLI 0.6.18 +- Bicep CLI 0.7.4 - Cabal 3.6.2.0 - Cmake 3.23.2 - Fastlane 2.206.2 @@ -120,11 +115,11 @@ ### Browsers - Safari 15.5 (16613.2.7.1.9) - SafariDriver 15.5 (16613.2.7.1.9) -- Google Chrome 102.0.5005.61 +- Google Chrome 102.0.5005.115 - ChromeDriver 102.0.5005.61 -- Microsoft Edge 102.0.1245.33 -- Microsoft Edge WebDriver 102.0.1245.33 -- Mozilla Firefox 101.0 +- Microsoft Edge 102.0.1245.41 +- Microsoft Edge WebDriver 102.0.1245.41 +- Mozilla Firefox 101.0.1 - geckodriver 0.31.0 - Selenium server 4.2.0 @@ -160,7 +155,7 @@ - 3.7.13 - 3.8.12 - 3.9.13 -- 3.10.4 +- 3.10.5 #### PyPy - 2.7.18 [PyPy 7.3.9] @@ -187,10 +182,10 @@ - Rustup 1.24.3 #### Packages -- Bindgen 0.60.0 +- Bindgen 0.60.1 - Cargo-audit 0.17.0 - Cargo-outdated 0.11.1 -- Cbindgen 0.23.0 +- Cbindgen 0.24.3 - Clippy 0.1.61 - Rustfmt 1.4.38-stable @@ -208,15 +203,22 @@ ### Web Servers | Name | Version | ConfigFile | ServiceStatus | ListenPort | | ----- | -------- | ------------------------------- | ------------- | ---------- | -| httpd | 2.4.53_2 | /usr/local/etc/httpd/httpd.conf | none | 80 | +| httpd | 2.4.54 | /usr/local/etc/httpd/httpd.conf | none | 80 | | nginx | 1.21.6_1 | /usr/local/etc/nginx/nginx.conf | none | 80 | ### Xamarin #### Visual Studio for Mac -| Version | Build | Path | -| -------------- | --------- | ------------------------------------ | -| 2019 | 8.10.23.7 | /Applications/Visual Studio 2019.app | -| 2022 (default) | 17.0.1.72 | /Applications/Visual Studio.app | +| Version | Build | Path | +| -------------- | ---------- | ------------------------------------ | +| 2019 | 8.10.24.14 | /Applications/Visual Studio 2019.app | +| 2022 (default) | 17.0.3.21 | /Applications/Visual Studio.app | + +##### Notes: +``` +To use Visual Studio 2019 by default rename the app: +mv "/Applications/Visual Studio.app" "/Applications/Visual Studio 2022.app" +mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" +``` #### Xamarin bundles | symlink | Xamarin.Mono | Xamarin.iOS | Xamarin.Mac | Xamarin.Android | @@ -322,19 +324,19 @@ | watchOS 8.3 | 13.2.1 | Apple Watch Series 4 - 40mm<br>Apple Watch Series 4 - 44mm<br>Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | ### Android -| Package Name | Version | -| -------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 7.0 | -| Android Emulator | 31.2.10 | -| Android SDK Build-tools | 32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | -| Android SDK Platforms | android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | -| Android SDK Platform-Tools | 33.0.2 | -| Android Support Repository | 47.0.0 | -| CMake | 3.10.2<br>3.18.1 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 21.4.7075529<br>23.2.8568313 (default)<br>24.0.8215888 | -| SDK Patch Applier v4 | 1 | +| Package Name | Version | +| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------ | +| Android Command Line Tools | 7.0 | +| Android Emulator | 31.2.10 | +| Android SDK Build-tools | 33.0.0<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | +| Android SDK Platforms | android-33 (rev 1)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | +| Android SDK Platform-Tools | 33.0.2 | +| Android Support Repository | 47.0.0 | +| CMake | 3.10.2<br>3.18.1 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 21.4.7075529<br>23.2.8568313 (default)<br>24.0.8215888 | +| SDK Patch Applier v4 | 1 | #### Environment variables | Name | Value | From a58f12fe95bf5cb4fdb0d306f3c6c0b36e6f2992 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 17 Jun 2022 05:51:58 +0000 Subject: [PATCH 1255/3485] Updating readme file for macOS-12 version 20220615.1 (#5756) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-12-Readme.md | 101 +++++++++++++++++--------------- 1 file changed, 55 insertions(+), 46 deletions(-) diff --git a/images/macos/macos-12-Readme.md b/images/macos/macos-12-Readme.md index 318961b57021..7c12b791c33b 100644 --- a/images/macos/macos-12-Readme.md +++ b/images/macos/macos-12-Readme.md @@ -1,16 +1,11 @@ -| Announcements | -|-| -| [[all OSs] Android NDK 22 will be replaced in favor of 24, version 23 will be set as the default one on June, 6](https://github.com/actions/virtual-environments/issues/5595) | -| [macOS 12 (Monterey) is available as a public beta in GitHub Actions and Azure DevOps](https://github.com/actions/virtual-environments/issues/5446) | -*** # macOS 12.4 info - System Version: macOS 12.4 (21F79) - Kernel Version: Darwin 21.5.0 -- Image Version: 20220605.1 +- Image Version: 20220615.1 ## Installed Software ### Language and Runtime -- .NET SDK 3.1.101 3.1.201 3.1.302 3.1.419 5.0.102 5.0.202 5.0.302 5.0.408 +- .NET SDK 3.1.101 3.1.201 3.1.302 3.1.420 5.0.102 5.0.202 5.0.302 5.0.408 - Bash 3.2.57(1)-release - Clang/LLVM 13.0.1 is available on `'$(brew --prefix llvm)/bin/clang'` - Clang/LLVM 13.1.6 is default @@ -18,13 +13,13 @@ - GNU Fortran (Homebrew GCC 11.3.0_1) 11.3.0 - available by `gfortran-11` alias - Go 1.17.11 - julia 1.7.3 -- Kotlin 1.6.21-release-334 -- MSBuild 16.10.1.17201 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) +- Kotlin 1.7.0-release-281 +- MSBuild 16.10.1.31401 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) - Node.js v16.15.1 - NVM 0.39.1 - NVM - Cached node versions: v12.22.12 v14.19.3 v16.15.1 - Perl 5.34.0 -- PHP 8.1.6 +- PHP 8.1.7 - Python 2.7.18 - Python 3.9.13 - R 4.2.0 @@ -34,20 +29,27 @@ - Bundler version 2.3.15 - Carthage 0.38.0 - CocoaPods 1.11.3 -- Composer 2.3.6 -- Homebrew 3.4.11 +- Composer 2.3.7 +- Homebrew 3.5.2 +- Miniconda 4.12.0 - NPM 8.11.0 -- NuGet 5.9.0.7134 +- NuGet 6.2.1.2 - Pip 20.3.4 (python 2.7) - Pip 22.1.1 (python 3.9) - Pipx 1.1.0 - RubyGems 3.2.33 -- Vcpkg 2022 (build from master \<faed44dfa>) +- Vcpkg 2022 (build from master \<06acb79f7>) - Yarn 1.22.19 +#### Environment variables +| Name | Value | +| ----------------------- | ---------------------- | +| CONDA | /usr/local/miniconda | +| VCPKG_INSTALLATION_ROOT | /usr/local/share/vcpkg | + ### Project Management - Apache Ant(TM) 1.10.12 -- Apache Maven 3.8.5 +- Apache Maven 3.8.6 - Gradle 7.4.2 - Sbt 1.6.2 @@ -55,18 +57,18 @@ - 7-Zip 17.04 - aria2 1.36.0 - azcopy 10.15.0 -- bazel 5.1.1 +- bazel 5.2.0 - bazelisk 1.11.0 - bsdtar 3.5.1 - available by 'tar' alias - Curl 7.83.1 - Git 2.36.1 - Git LFS: 3.2.0 -- GitHub CLI: 2.11.3 +- GitHub CLI: 2.12.1 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.3 - gpg (GnuPG) 2.3.6 - Hub CLI: 2.14.2 -- ImageMagick 7.1.0-36 +- ImageMagick 7.1.0-37 - jq 1.6 - mongo v5.0.7 - mongod v5.0.7 @@ -83,12 +85,12 @@ ### Tools - App Center CLI 2.10.10 -- AWS CLI 2.7.6 -- AWS SAM CLI 1.51.0 +- AWS CLI 2.7.7 +- AWS SAM CLI 1.52.0 - AWS Session Manager CLI 1.2.331.0 - Azure CLI (azure-devops) 0.25.0 - Azure CLI 2.37.0 -- Bicep CLI 0.6.18 +- Bicep CLI 0.7.4 - Cabal 3.6.2.0 - Cmake 3.23.2 - Fastlane 2.206.2 @@ -107,11 +109,11 @@ ### Browsers - Safari 15.5 (17613.2.7.1.8) - SafariDriver 15.5 (17613.2.7.1.8) -- Google Chrome 102.0.5005.61 +- Google Chrome 102.0.5005.115 - ChromeDriver 102.0.5005.61 -- Microsoft Edge 102.0.1245.33 -- Microsoft Edge WebDriver 102.0.1245.33 -- Mozilla Firefox 101.0 +- Microsoft Edge 102.0.1245.41 +- Microsoft Edge WebDriver 102.0.1245.41 +- Mozilla Firefox 101.0.1 - geckodriver 0.31.0 - Selenium server 4.2.0 @@ -144,7 +146,7 @@ - 3.7.13 - 3.8.12 - 3.9.13 -- 3.10.4 +- 3.10.5 #### PyPy - 2.7.18 [PyPy 7.3.9] @@ -171,10 +173,10 @@ - Rustup 1.24.3 #### Packages -- Bindgen 0.60.0 +- Bindgen 0.60.1 - Cargo-audit 0.17.0 - Cargo-outdated 0.11.1 -- Cbindgen 0.23.0 +- Cbindgen 0.24.3 - Clippy 0.1.61 - Rustfmt 1.4.38-stable @@ -192,15 +194,22 @@ ### Web Servers | Name | Version | ConfigFile | ServiceStatus | ListenPort | | ----- | -------- | ------------------------------- | ------------- | ---------- | -| httpd | 2.4.53_2 | /usr/local/etc/httpd/httpd.conf | none | 80 | +| httpd | 2.4.54 | /usr/local/etc/httpd/httpd.conf | none | 80 | | nginx | 1.21.6_1 | /usr/local/etc/nginx/nginx.conf | none | 80 | ### Xamarin #### Visual Studio for Mac -| Version | Build | Path | -| -------------- | --------- | ------------------------------------ | -| 2019 | 8.10.23.7 | /Applications/Visual Studio 2019.app | -| 2022 (default) | 17.0.1.72 | /Applications/Visual Studio.app | +| Version | Build | Path | +| -------------- | ---------- | ------------------------------------ | +| 2019 | 8.10.24.14 | /Applications/Visual Studio 2019.app | +| 2022 (default) | 17.0.3.21 | /Applications/Visual Studio.app | + +##### Notes: +``` +To use Visual Studio 2019 by default rename the app: +mv "/Applications/Visual Studio.app" "/Applications/Visual Studio 2022.app" +mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" +``` #### Xamarin bundles | symlink | Xamarin.Mono | Xamarin.iOS | Xamarin.Mac | Xamarin.Android | @@ -274,19 +283,19 @@ | watchOS 8.5 | 13.3.1<br>13.4<br>13.4.1 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | ### Android -| Package Name | Version | -| -------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 7.0 | -| Android Emulator | 31.2.10 | -| Android SDK Build-tools | 32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | -| Android SDK Platforms | android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | -| Android SDK Platform-Tools | 33.0.2 | -| Android Support Repository | 47.0.0 | -| CMake | 3.18.1 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 21.4.7075529<br>23.2.8568313 (default)<br>24.0.8215888 | -| SDK Patch Applier v4 | 1 | +| Package Name | Version | +| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------ | +| Android Command Line Tools | 7.0 | +| Android Emulator | 31.2.10 | +| Android SDK Build-tools | 33.0.0<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | +| Android SDK Platforms | android-33 (rev 1)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | +| Android SDK Platform-Tools | 33.0.2 | +| Android Support Repository | 47.0.0 | +| CMake | 3.18.1 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 21.4.7075529<br>23.2.8568313 (default)<br>24.0.8215888 | +| SDK Patch Applier v4 | 1 | #### Environment variables | Name | Value | From e42b6077901597c22dba43992955ad9f9ab7c4aa Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Fri, 17 Jun 2022 09:24:02 +0200 Subject: [PATCH 1256/3485] [Windows] Set WSLv1 version on Windows Server 2022 (#5762) * Set WSLv1 version on Windows Server 2022 * Create path if missing --- .../scripts/ImageHelpers/ImageHelpers.psm1 | 1 + .../win/scripts/ImageHelpers/PathHelpers.ps1 | 21 ++++++++++++++++++- images/win/scripts/Installers/Finalize-VM.ps1 | 7 +++++++ 3 files changed, 28 insertions(+), 1 deletion(-) diff --git a/images/win/scripts/ImageHelpers/ImageHelpers.psm1 b/images/win/scripts/ImageHelpers/ImageHelpers.psm1 index 94cd2ea4b9eb..cdd4ea5b3c52 100644 --- a/images/win/scripts/ImageHelpers/ImageHelpers.psm1 +++ b/images/win/scripts/ImageHelpers/ImageHelpers.psm1 @@ -17,6 +17,7 @@ Export-ModuleMember -Function @( 'Set-DefaultPath' 'Add-MachinePathItem' 'Add-DefaultPathItem' + 'Add-DefaultItem' 'Get-SystemVariable' 'Get-DefaultVariable' 'Set-SystemVariable' diff --git a/images/win/scripts/ImageHelpers/PathHelpers.ps1 b/images/win/scripts/ImageHelpers/PathHelpers.ps1 index f8dc0ecb93ad..df7ce10ed93e 100644 --- a/images/win/scripts/ImageHelpers/PathHelpers.ps1 +++ b/images/win/scripts/ImageHelpers/PathHelpers.ps1 @@ -75,7 +75,7 @@ function Set-DefaultVariable { $key = [Microsoft.Win32.Registry]::LocalMachine.OpenSubKey($Name, $Writable) $key.SetValue($DefaultVariable, $Value, $Kind) - Get-DefaultVariable $DefaultVariable + Get-DefaultVariable -DefaultVariable $DefaultVariable -Name $Name $key.Handle.Close() [System.GC]::Collect() } @@ -135,6 +135,25 @@ function Add-DefaultPathItem { Disconnect-Hive } +function Add-DefaultItem { + param( + [string]$DefaultVariable, + [string]$Value, + [string]$Name = "DEFAULT\Environment", + [string]$Kind = "ExpandString", + [bool]$Writable = $true + ) + + Connect-Hive + $regPath = Join-Path "HKLM:\" $Name + if (-not (Test-Path $Name)) { + Write-Host "Creating $regPath key" + New-Item -Path $regPath -Force | Out-Null + } + Set-DefaultVariable -DefaultVariable $DefaultVariable -Value $Value -Name $Name -Kind $Kind -Writable $Writable + Disconnect-Hive +} + function New-ItemPath { param ( [string]$Path diff --git a/images/win/scripts/Installers/Finalize-VM.ps1 b/images/win/scripts/Installers/Finalize-VM.ps1 index dd78ba826b2f..f759a0980eb1 100644 --- a/images/win/scripts/Installers/Finalize-VM.ps1 +++ b/images/win/scripts/Installers/Finalize-VM.ps1 @@ -6,6 +6,13 @@ Write-Host "Cleanup WinSxS" Dism.exe /online /Cleanup-Image /StartComponentCleanup /ResetBase +# Sets the default install version to v1 for new distributions +# https://github.com/actions/virtual-environments/issues/5760 +if (Test-IsWin22) { + Write-Host "Sets the default install version to v1 for new distributions" + Add-DefaultItem -DefaultVariable "DefaultVersion" -Value 1 -Name "DEFAULT\Software\Microsoft\Windows\CurrentVersion\Lxss" -Kind "DWord" +} + Write-Host "Clean up various directories" @( "$env:SystemDrive\Recovery", From 39c4b5ac9209f40202288418764197a63b7c4710 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Mon, 20 Jun 2022 08:32:07 +0200 Subject: [PATCH 1257/3485] [Packer] Add anka macos12 hcl template (#5765) * Add macOS-12 Anka packer template * Fix indenation * Update cpu and memory * Move ] to next line * Add default value --- ...db-macos11.sh => configure-tccdb-macos.sh} | 0 images/macos/templates/macOS-11.anka.pkr.hcl | 108 ++++---- images/macos/templates/macOS-12.anka.pkr.hcl | 243 ++++++++++++++++++ 3 files changed, 302 insertions(+), 49 deletions(-) rename images/macos/provision/configuration/{configure-tccdb-macos11.sh => configure-tccdb-macos.sh} (100%) create mode 100644 images/macos/templates/macOS-12.anka.pkr.hcl diff --git a/images/macos/provision/configuration/configure-tccdb-macos11.sh b/images/macos/provision/configuration/configure-tccdb-macos.sh similarity index 100% rename from images/macos/provision/configuration/configure-tccdb-macos11.sh rename to images/macos/provision/configuration/configure-tccdb-macos.sh diff --git a/images/macos/templates/macOS-11.anka.pkr.hcl b/images/macos/templates/macOS-11.anka.pkr.hcl index cd4db2c07837..c3f76512a771 100644 --- a/images/macos/templates/macOS-11.anka.pkr.hcl +++ b/images/macos/templates/macOS-11.anka.pkr.hcl @@ -20,6 +20,11 @@ variable "vm_password" { sensitive = true } +variable "github_api_pat" { + type = string + default = "" +} + variable "xcode_install_user" { type = string sensitive = true @@ -32,12 +37,12 @@ variable "xcode_install_password" { variable "vcpu_count" { type = string - default = "5" + default = "6" } variable "ram_size" { type = string - default = "12G" + default = "24G" } variable "image_os" { @@ -56,7 +61,7 @@ source "veertu-anka-vm-clone" "template" { build { sources = [ - "source.veertu-anka-vm-clone.template", + "source.veertu-anka-vm-clone.template" ] provisioner "shell" { inline = [ @@ -65,7 +70,12 @@ build { } provisioner "file" { destination = "image-generation/" - sources = [ "./provision/assets", "./tests", "./software-report", "./helpers" ] + sources = [ + "./provision/assets", + "./tests", + "./software-report", + "./helpers" + ] } provisioner "file" { destination = "image-generation/add-certificate.swift" @@ -105,32 +115,25 @@ build { } provisioner "shell" { scripts = [ - "./provision/configuration/configure-tccdb-macos11.sh", + "./provision/configuration/configure-tccdb-macos.sh", "./provision/configuration/add-network-interface-detection.sh", "./provision/configuration/autologin.sh", "./provision/configuration/disable-auto-updates.sh", "./provision/configuration/screensaver-off.sh", "./provision/configuration/ntpconf.sh", "./provision/configuration/max-files.sh", - "./provision/configuration/shell-change.sh" - ] - environment_vars = [ - "PASSWORD=${var.vm_password}", - "USERNAME=${var.vm_username}" - ] - execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}" - } - provisioner "shell" { - scripts = [ + "./provision/configuration/shell-change.sh", "./provision/configuration/preimagedata.sh", "./provision/configuration/configure-ssh.sh", "./provision/configuration/configure-machine.sh" ] environment_vars = [ "IMAGE_VERSION=${var.build_id}", - "IMAGE_OS=${var.image_os}" + "IMAGE_OS=${var.image_os}", + "PASSWORD=${var.vm_password}", + "USERNAME=${var.vm_username}" ] - execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}" } provisioner "shell" { script = "./provision/core/reboot.sh" @@ -149,7 +152,12 @@ build { "./provision/core/ruby.sh", "./provision/core/rubygem.sh", "./provision/core/git.sh", - "./provision/core/node.sh" + "./provision/core/node.sh", + "./provision/core/commonutils.sh", + ] + environment_vars = [ + "API_PAT=${var.github_api_pat}", + "USER_PASSWORD=${var.vm_password}" ] execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" } @@ -168,37 +176,39 @@ build { } provisioner "shell" { scripts = [ - "./provision/core/commonutils.sh", - "./provision/core/llvm.sh", - "./provision/core/golang.sh", - "./provision/core/swiftlint.sh", - "./provision/core/openjdk.sh", - "./provision/core/php.sh", - "./provision/core/aws.sh", - "./provision/core/rust.sh", - "./provision/core/gcc.sh", - "./provision/core/haskell.sh", - "./provision/core/stack.sh", - "./provision/core/cocoapods.sh", - "./provision/core/android-toolsets.sh", - "./provision/core/xamarin.sh", - "./provision/core/vsmac.sh", - "./provision/core/nvm.sh", - "./provision/core/apache.sh", - "./provision/core/nginx.sh", - "./provision/core/postgresql.sh", - "./provision/core/mongodb.sh", - "./provision/core/audiodevice.sh", - "./provision/core/vcpkg.sh", - "./provision/core/miniconda.sh", - "./provision/core/safari.sh", - "./provision/core/chrome.sh", - "./provision/core/edge.sh", - "./provision/core/firefox.sh", - "./provision/core/pypy.sh", - "./provision/core/pipx-packages.sh", - "./provision/core/bicep.sh", - "./provision/core/graalvm.sh" + "./provision/core/llvm.sh", + "./provision/core/golang.sh", + "./provision/core/swiftlint.sh", + "./provision/core/openjdk.sh", + "./provision/core/php.sh", + "./provision/core/aws.sh", + "./provision/core/rust.sh", + "./provision/core/gcc.sh", + "./provision/core/haskell.sh", + "./provision/core/stack.sh", + "./provision/core/cocoapods.sh", + "./provision/core/android-toolsets.sh", + "./provision/core/xamarin.sh", + "./provision/core/vsmac.sh", + "./provision/core/nvm.sh", + "./provision/core/apache.sh", + "./provision/core/nginx.sh", + "./provision/core/postgresql.sh", + "./provision/core/mongodb.sh", + "./provision/core/audiodevice.sh", + "./provision/core/vcpkg.sh", + "./provision/core/miniconda.sh", + "./provision/core/safari.sh", + "./provision/core/chrome.sh", + "./provision/core/edge.sh", + "./provision/core/firefox.sh", + "./provision/core/pypy.sh", + "./provision/core/pipx-packages.sh", + "./provision/core/bicep.sh", + "./provision/core/graalvm.sh" + ] + environment_vars = [ + "API_PAT=${var.github_api_pat}" ] execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" } diff --git a/images/macos/templates/macOS-12.anka.pkr.hcl b/images/macos/templates/macOS-12.anka.pkr.hcl new file mode 100644 index 000000000000..26dd0693fe58 --- /dev/null +++ b/images/macos/templates/macOS-12.anka.pkr.hcl @@ -0,0 +1,243 @@ +variable "source_vm_name" { + type = string +} + +variable "source_vm_tag" { + type = string +} + +variable "build_id" { + type = string +} + +variable "vm_username" { + type = string + sensitive = true +} + +variable "vm_password" { + type = string + sensitive = true +} + +variable "github_api_pat" { + type = string + default = "" +} + +variable "xcode_install_user" { + type = string + sensitive = true +} + +variable "xcode_install_password" { + type = string + sensitive = true +} + +variable "vcpu_count" { + type = string + default = "6" +} + +variable "ram_size" { + type = string + default = "24G" +} + +variable "image_os" { + type = string + default = "macos12" +} + +source "veertu-anka-vm-clone" "template" { + vm_name = "${var.build_id}" + source_vm_name = "${var.source_vm_name}" + source_vm_tag = "${var.source_vm_tag}" + vcpu_count = "${var.vcpu_count}" + ram_size = "${var.ram_size}" + stop_vm = "true" +} + +build { + sources = [ + "source.veertu-anka-vm-clone.template" + ] + provisioner "shell" { + inline = "mkdir ~/image-generation" + } + provisioner "file" { + destination = "~/image-generation/" + source = [ + "./provision/assets", + "./tests", + "./software-report", + "./helpers" + ] + } + provisioner "file" { + destination = "image-generation/add-certificate.swift" + source = "./provision/configuration/add-certificate.swift" + } + provisioner "file" { + destination = ".bashrc" + source = "./provision/configuration/environment/bashrc" + } + provisioner "file" { + destination = ".bash_profile" + source = "./provision/configuration/environment/bashprofile" + } + provisioner "file" { + destination = "./" + source = "./provision/utils" + } + provisioner "shell" { + inline = [ + "mkdir ~/bootstrap" + ] + } + provisioner "file" { + destination = "bootstrap" + source = "./provision/bootstrap-provisioner" + } + provisioner "file" { + destination = "image-generation/toolset.json" + source = "./toolsets/toolset-12.json" + } + provisioner "shell" { + scripts = [ + "./provision/core/xcode-clt.sh", + "./provision/core/homebrew.sh" + ] + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" + } + provisioner "shell" { + scripts = [ + "./provision/configuration/configure-tccdb-macos.sh", + "./provision/configuration/add-network-interface-detection.sh", + "./provision/configuration/autologin.sh", + "./provision/configuration/disable-auto-updates.sh", + "./provision/configuration/screensaver-off.sh", + "./provision/configuration/ntpconf.sh", + "./provision/configuration/max-files.sh", + "./provision/configuration/shell-change.sh", + "./provision/configuration/preimagedata.sh", + "./provision/configuration/configure-ssh.sh", + "./provision/configuration/configure-machine.sh" + ] + environment_vars = [ + "IMAGE_VERSION=${var.build_id}", + "IMAGE_OS=${var.image_os}", + "PASSWORD=${var.vm_password}", + "USERNAME=${var.vm_username}" + ] + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}" + } + provisioner "shell" { + script = "./provision/core/reboot.sh" + execute_command = execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}" + expect_disconnect = true + } + provisioner "shell" { + pause_before = "30s" + scripts = [ + "./provision/core/open_windows_check.sh", + "./provision/core/powershell.sh", + "./provision/core/dotnet.sh", + "./provision/core/python.sh", + "./provision/core/azcopy.sh", + "./provision/core/openssl.sh", + "./provision/core/ruby.sh", + "./provision/core/rubygem.sh", + "./provision/core/git.sh", + "./provision/core/node.sh", + "./provision/core/commonutils.sh" + ] + environment_vars = [ + "API_PAT=${var.github_api_pat}", + "USER_PASSWORD=${var.vm_password}" + ] + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" + } + provisioner "shell" { + script = "./provision/core/xcode.ps1" + environment_vars = [ + "XCODE_INSTALL_USER=${var.xcode_install_user}", + "XCODE_INSTALL_PASSWORD=${var.xcode_install_password}" + ] + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} pwsh -f {{ .Path }}" + } + provisioner "shell" { + script = "./provision/core/reboot.sh" + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}" + expect_disconnect = true + } + provisioner "shell" { + scripts = [ + "./provision/core/llvm.sh", + "./provision/core/golang.sh", + "./provision/core/swiftlint.sh", + "./provision/core/openjdk.sh", + "./provision/core/php.sh", + "./provision/core/aws.sh", + "./provision/core/rust.sh", + "./provision/core/gcc.sh", + "./provision/core/haskell.sh", + "./provision/core/stack.sh", + "./provision/core/cocoapods.sh", + "./provision/core/android-toolsets.sh", + "./provision/core/xamarin.sh", + "./provision/core/vsmac.sh", + "./provision/core/nvm.sh", + "./provision/core/apache.sh", + "./provision/core/nginx.sh", + "./provision/core/postgresql.sh", + "./provision/core/mongodb.sh", + "./provision/core/audiodevice.sh", + "./provision/core/vcpkg.sh", + "./provision/core/miniconda.sh", + "./provision/core/safari.sh", + "./provision/core/chrome.sh", + "./provision/core/edge.sh", + "./provision/core/firefox.sh", + "./provision/core/pypy.sh", + "./provision/core/pipx-packages.sh", + "./provision/core/bicep.sh", + "./provision/core/graalvm.sh" + ] + environment_vars = [ + "API_PAT=${var.github_api_pat}" + ] + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" + } + provisioner "shell" { + scripts = [ + "./provision/core/toolset.ps1", + "./provision/core/configure-toolset.ps1" + ] + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} pwsh -f {{ .Path }}" + } + provisioner "shell" { + scripts = "./provision/core/delete-duplicate-sims.rb" + execute_command = "source $HOME/.bash_profile; ruby {{ .Path }}" + } + provisioner "shell" { + inline = [ + "pwsh -File \"$HOME/image-generation/software-report/SoftwareReport.Generator.ps1\" -OutputDirectory \"$HOME/image-generation/output/software-report\" -ImageName ${var.build_id}", + "pwsh -File \"$HOME/image-generation/tests/RunAll-Tests.ps1\"" + ] + execute_command = "source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" + } + provisioner "file" { + destination = "../image-output/" + direction = "download" + source = "./image-generation/output/*" + } + provisioner "shell" { + scripts = [ + "./provision/configuration/configure-hostname.sh", + "./provision/configuration/finalize-vm.sh" + ] + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" + } +} From 2f3323ba686e4d95d85b0ab9a772e707a9557269 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 20 Jun 2022 06:39:07 +0000 Subject: [PATCH 1258/3485] Updating readme file for macOS-10.15 version 20220615.1 (#5761) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-10.15-Readme.md | 89 ++++++++++++++---------------- 1 file changed, 42 insertions(+), 47 deletions(-) diff --git a/images/macos/macos-10.15-Readme.md b/images/macos/macos-10.15-Readme.md index 247aa02a8b5a..a5228ef51d7c 100644 --- a/images/macos/macos-10.15-Readme.md +++ b/images/macos/macos-10.15-Readme.md @@ -1,16 +1,11 @@ -| Announcements | -|-| -| [[all OSs] Android NDK 22 will be replaced in favor of 24, version 23 will be set as the default one on June, 6](https://github.com/actions/virtual-environments/issues/5595) | -| [macOS 12 (Monterey) is available as a public beta in GitHub Actions and Azure DevOps](https://github.com/actions/virtual-environments/issues/5446) | -*** # macOS 10.15 info - System Version: macOS 10.15.7 (19H1922) - Kernel Version: Darwin 19.6.0 -- Image Version: 20220605.1 +- Image Version: 20220615.1 ## Installed Software ### Language and Runtime -- .NET SDK 3.1.101 3.1.201 3.1.302 3.1.419 5.0.102 5.0.202 5.0.302 5.0.408 +- .NET SDK 3.1.101 3.1.201 3.1.302 3.1.420 5.0.102 5.0.202 5.0.302 5.0.408 - Bash 3.2.57(1)-release - Clang/LLVM 12.0.0 is default - Clang/LLVM 13.0.1 is available on `'$(brew --prefix llvm)/bin/clang'` @@ -22,13 +17,13 @@ - GNU Fortran (Homebrew GCC 11.3.0_1) 11.3.0 - available by `gfortran-11` alias - Go 1.17.11 - julia 1.7.3 -- Kotlin 1.6.21-release-334 -- MSBuild 16.10.1.58001 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) +- Kotlin 1.7.0-release-281 +- MSBuild 16.10.1.31401 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) - Node.js v16.15.1 - NVM 0.39.1 - NVM - Cached node versions: v12.22.12 v14.19.3 v16.15.1 - Perl 5.34.0 -- PHP 8.1.6 +- PHP 8.1.7 - Python 2.7.18 - Python 3.9.13 - R 4.2.0 @@ -38,16 +33,16 @@ - Bundler version 2.3.15 - Carthage 0.38.0 - CocoaPods 1.11.3 -- Composer 2.3.6 -- Homebrew 3.4.11 +- Composer 2.3.7 +- Homebrew 3.5.2 - Miniconda 4.12.0 - NPM 8.11.0 -- NuGet 5.9.0.7134 +- NuGet 6.2.1.2 - Pip 20.3.4 (python 2.7) - Pip 22.1.1 (python 3.9) - Pipx 1.1.0 - RubyGems 3.2.33 -- Vcpkg 2022 (build from master \<faed44dfa>) +- Vcpkg 2022 (build from master \<d25fb81e9>) - Yarn 1.22.19 #### Environment variables @@ -58,7 +53,7 @@ ### Project Management - Apache Ant(TM) 1.10.12 -- Apache Maven 3.8.5 +- Apache Maven 3.8.6 - Gradle 7.4.2 - Sbt 1.6.2 @@ -66,20 +61,20 @@ - 7-Zip 17.04 - aria2 1.36.0 - azcopy 10.15.0 -- bazel 5.1.1 +- bazel 5.2.0 - bazelisk 1.11.0 - bsdtar 3.3.2 - available by 'tar' alias - Curl 7.83.1 - Git 2.36.1 - Git LFS: 3.2.0 -- GitHub CLI: 2.11.3 +- GitHub CLI: 2.12.1 - GNU parallel 20220522 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.3 - gpg (GnuPG) 2.3.6 - helm v3.9.0+g7ceeda6 - Hub CLI: 2.14.2 -- ImageMagick 7.1.0-36 +- ImageMagick 7.1.0-37 - jq 1.6 - mongo v5.0.7 - mongod v5.0.7 @@ -99,12 +94,12 @@ ### Tools - Aliyun CLI 3.0.121 - App Center CLI 2.10.10 -- AWS CLI 2.7.6 -- AWS SAM CLI 1.51.0 +- AWS CLI 2.7.7 +- AWS SAM CLI 1.52.0 - AWS Session Manager CLI 1.2.331.0 - Azure CLI (azure-devops) 0.25.0 - Azure CLI 2.37.0 -- Bicep CLI 0.6.18 +- Bicep CLI 0.7.4 - Cabal 3.6.2.0 - Cmake 3.23.2 - Fastlane 2.206.2 @@ -123,11 +118,11 @@ ### Browsers - Safari 15.5 (15613.2.7.1.9) - SafariDriver 15.5 (15613.2.7.1.9) -- Google Chrome 102.0.5005.61 +- Google Chrome 102.0.5005.115 - ChromeDriver 102.0.5005.61 -- Microsoft Edge 102.0.1245.33 -- Microsoft Edge WebDriver 102.0.1245.33 -- Mozilla Firefox 101.0 +- Microsoft Edge 102.0.1245.41 +- Microsoft Edge WebDriver 102.0.1245.41 +- Mozilla Firefox 101.0.1 - geckodriver 0.31.0 - Selenium server 4.2.0 @@ -167,7 +162,7 @@ - 3.7.13 - 3.8.12 - 3.9.13 -- 3.10.4 +- 3.10.5 #### PyPy - 2.7.18 [PyPy 7.3.9] @@ -195,10 +190,10 @@ - Rustup 1.24.3 #### Packages -- Bindgen 0.60.0 +- Bindgen 0.60.1 - Cargo-audit 0.17.0 - Cargo-outdated 0.11.1 -- Cbindgen 0.23.0 +- Cbindgen 0.24.3 - Clippy 0.1.61 - Rustfmt 1.4.38-stable @@ -216,14 +211,14 @@ ### Web Servers | Name | Version | ConfigFile | ServiceStatus | ListenPort | | ----- | -------- | ------------------------------- | ------------- | ---------- | -| httpd | 2.4.53_2 | /usr/local/etc/httpd/httpd.conf | none | 80 | +| httpd | 2.4.54 | /usr/local/etc/httpd/httpd.conf | none | 80 | | nginx | 1.21.6_1 | /usr/local/etc/nginx/nginx.conf | none | 80 | ### Xamarin #### Visual Studio for Mac -| Version | Build | Path | -| -------------- | --------- | ------------------------------- | -| 2019 (default) | 8.10.23.7 | /Applications/Visual Studio.app | +| Version | Build | Path | +| -------------- | ---------- | ------------------------------- | +| 2019 (default) | 8.10.24.14 | /Applications/Visual Studio.app | #### Xamarin bundles | symlink | Xamarin.Mono | Xamarin.iOS | Xamarin.Mac | Xamarin.Android | @@ -359,21 +354,21 @@ | watchOS 7.2 | 12.3<br>12.4 | Apple Watch Series 4 - 40mm<br>Apple Watch Series 4 - 44mm<br>Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm | ### Android -| Package Name | Version | -| -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 7.0 | -| Android Emulator | 31.2.10 | -| Android SDK Build-tools | 32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3<br>26.0.0 26.0.1 26.0.2 26.0.3<br>25.0.0 25.0.1 25.0.2 25.0.3<br>24.0.0 24.0.1 24.0.2 24.0.3 | -| Android SDK Platforms | android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3)<br>android-26 (rev 2)<br>android-25 (rev 3)<br>android-24 (rev 2) | -| Android SDK Platform-Tools | 33.0.2 | -| Android Support Repository | 47.0.0 | -| CMake | 3.10.2<br>3.18.1 | -| Google APIs | addon-google_apis-google-21<br>addon-google_apis-google-22<br>addon-google_apis-google-23<br>addon-google_apis-google-24 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 15.2.4203891<br>18.1.5063045<br>21.4.7075529<br>23.2.8568313 (default)<br>24.0.8215888 | -| SDK Patch Applier v4 | 1 | -| Intel HAXM | 7.6.5 | +| Package Name | Version | +| -------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 7.0 | +| Android Emulator | 31.2.10 | +| Android SDK Build-tools | 33.0.0<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3<br>26.0.0 26.0.1 26.0.2 26.0.3<br>25.0.0 25.0.1 25.0.2 25.0.3<br>24.0.0 24.0.1 24.0.2 24.0.3 | +| Android SDK Platforms | android-33 (rev 1)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3)<br>android-26 (rev 2)<br>android-25 (rev 3)<br>android-24 (rev 2) | +| Android SDK Platform-Tools | 33.0.2 | +| Android Support Repository | 47.0.0 | +| CMake | 3.10.2<br>3.18.1 | +| Google APIs | addon-google_apis-google-21<br>addon-google_apis-google-22<br>addon-google_apis-google-23<br>addon-google_apis-google-24 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 15.2.4203891<br>18.1.5063045<br>21.4.7075529<br>23.2.8568313 (default)<br>24.0.8215888 | +| SDK Patch Applier v4 | 1 | +| Intel HAXM | 7.6.5 | #### Environment variables | Name | Value | From ceb7831e508a0b36c397d7a914a2932a69d5efad Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Mon, 20 Jun 2022 18:40:42 +0200 Subject: [PATCH 1259/3485] [Packer] Fix anka packer template (#5778) * Fix anka packer template Fix indentation Use sources * Update boostrap path --- images/macos/templates/macOS-11.anka.pkr.hcl | 9 ++++++--- images/macos/templates/macOS-12.anka.pkr.hcl | 16 +++++++++------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/images/macos/templates/macOS-11.anka.pkr.hcl b/images/macos/templates/macOS-11.anka.pkr.hcl index c3f76512a771..2b17e98b6c90 100644 --- a/images/macos/templates/macOS-11.anka.pkr.hcl +++ b/images/macos/templates/macOS-11.anka.pkr.hcl @@ -70,11 +70,11 @@ build { } provisioner "file" { destination = "image-generation/" - sources = [ + sources = [ "./provision/assets", "./tests", "./software-report", - "./helpers" + "./helpers" ] } provisioner "file" { @@ -213,7 +213,10 @@ build { execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" } provisioner "shell" { - script = "./provision/core/toolset.ps1" + scripts = [ + "./provision/core/toolset.ps1", + "./provision/core/configure-toolset.ps1" + ] execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} pwsh -f {{ .Path }}" } provisioner "shell" { diff --git a/images/macos/templates/macOS-12.anka.pkr.hcl b/images/macos/templates/macOS-12.anka.pkr.hcl index 26dd0693fe58..e9ce7e6513b8 100644 --- a/images/macos/templates/macOS-12.anka.pkr.hcl +++ b/images/macos/templates/macOS-12.anka.pkr.hcl @@ -64,15 +64,17 @@ build { "source.veertu-anka-vm-clone.template" ] provisioner "shell" { - inline = "mkdir ~/image-generation" + inline = [ + "mkdir ~/image-generation" + ] } provisioner "file" { - destination = "~/image-generation/" - source = [ + destination = "image-generation/" + sources = [ "./provision/assets", "./tests", "./software-report", - "./helpers" + "./helpers" ] } provisioner "file" { @@ -98,7 +100,7 @@ build { } provisioner "file" { destination = "bootstrap" - source = "./provision/bootstrap-provisioner" + source = "./provision/bootstrap-provisioner/" } provisioner "file" { destination = "image-generation/toolset.json" @@ -135,7 +137,7 @@ build { } provisioner "shell" { script = "./provision/core/reboot.sh" - execute_command = execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}" + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}" expect_disconnect = true } provisioner "shell" { @@ -218,7 +220,7 @@ build { execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} pwsh -f {{ .Path }}" } provisioner "shell" { - scripts = "./provision/core/delete-duplicate-sims.rb" + script = "./provision/core/delete-duplicate-sims.rb" execute_command = "source $HOME/.bash_profile; ruby {{ .Path }}" } provisioner "shell" { From 02b78d07f41fc9a393619a23e9f10e15bd819575 Mon Sep 17 00:00:00 2001 From: AlexanderGitin <102294679+AlexanderGitin@users.noreply.github.com> Date: Wed, 22 Jun 2022 00:58:02 +0300 Subject: [PATCH 1260/3485] [MacOs] Add Xamarin & bump bundle to 6.12.17 (#5764) --- images/macos/provision/utils/xamarin-utils.sh | 6 +++++- images/macos/toolsets/toolset-10.15.json | 2 +- images/macos/toolsets/toolset-11.json | 4 ++-- images/macos/toolsets/toolset-12.json | 15 +++++++++++---- 4 files changed, 19 insertions(+), 8 deletions(-) diff --git a/images/macos/provision/utils/xamarin-utils.sh b/images/macos/provision/utils/xamarin-utils.sh index a004fd7613dc..f298d4959e7b 100644 --- a/images/macos/provision/utils/xamarin-utils.sh +++ b/images/macos/provision/utils/xamarin-utils.sh @@ -19,7 +19,11 @@ buildVSMacDownloadUrl() { } buildMonoDownloadUrl() { - echo "https://dl.xamarin.com/MonoFrameworkMDK/Macx86/MonoFramework-MDK-${1}.macos10.xamarin.universal.pkg" +if [[ $1 -eq 6.12.0.182 ]]; then + echo "https://download.mono-project.com/archive/6.12.0/macos-10-universal/MonoFramework-MDK-${1}.macos10.xamarin.universal.pkg" +else + echo "https://dl.xamarin.com/MonoFrameworkMDK/Macx86/MonoFramework-MDK-${1}.macos10.xamarin.universal.pkg" +fi } buildXamariniIOSDownloadUrl() { diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index 7814909c63ef..28e289c4cbbc 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -23,7 +23,7 @@ "versions": [ "2019" ] }, "mono-versions": [ - "6.12.0.162", "6.10.0.106", "6.8.0.123", "6.6.0.166", "6.4.0.208" + "6.12.0.182", "6.10.0.106", "6.8.0.123", "6.6.0.166", "6.4.0.208" ], "ios-versions": [ "14.14.2.5", "14.10.0.4", "14.8.0.3", "14.6.0.15", "14.4.1.3", "14.2.0.12", "14.0.0.0", "13.20.2.2", "13.18.2.1", "13.16.0.13", "13.14.1.39", "13.10.0.21", "13.8.3.0", "13.6.0.12", "13.4.0.2", "13.2.0.47" diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index 84f9bb4e84f7..87a87a509c52 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -16,7 +16,7 @@ "versions": [ "2019", "2022" ] }, "mono-versions": [ - "6.12.0.174" + "6.12.0.182" ], "ios-versions": [ "15.8.0.3", "15.6.0.3", "15.4.0.0", "15.2.0.17", "15.0.0.6", "14.20.0.24", "14.16.0.5", "14.14.2.5", "14.10.0.4", "14.8.0.3", "14.6.0.15", "14.4.1.3", "14.2.0.12", "14.0.0.0", "13.20.2.2" @@ -25,7 +25,7 @@ "8.8.0.3", "8.6.0.3", "8.4.0.0", "8.2.0.17", "7.14.0.27", "7.10.0.5", "7.8.2.5", "7.4.0.10", "7.2.0.3", "7.0.0.15", "6.22.1.26", "6.20.2.2" ], "android-versions": [ - "12.2.4.3", "12.1.0.2", "12.0.0.3", "11.3.0.4", "11.2.2.1", "11.1.0.26", "11.0.2.0" + "12.2.8.3", "12.1.0.2", "12.0.0.3", "11.3.0.4", "11.2.2.1", "11.1.0.26", "11.0.2.0" ], "bundle-default": "6_12_12", "bundles": [ diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index 7c4ae21b2524..c1b7c80e5a77 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -15,19 +15,26 @@ "versions": [ "2019", "2022" ] }, "mono-versions": [ - "6.12.0.174" + "6.12.0.182" ], "ios-versions": [ - "15.8.0.3", "15.6.0.3", "15.4.0.0", "15.2.0.17", "15.0.0.6" + "15.10.0.5", "15.8.0.3", "15.6.0.3", "15.4.0.0", "15.2.0.17", "15.0.0.6" ], "mac-versions": [ - "8.8.0.3", "8.6.0.3", "8.4.0.0", "8.2.0.17", "7.14.0.27" + "8.10.0.5", "8.8.0.3", "8.6.0.3", "8.4.0.0", "8.2.0.17", "7.14.0.27" ], "android-versions": [ - "12.2.4.3", "12.1.0.2", "12.0.0.3", "11.3.0.4" + "12.2.8.3", "12.1.0.2", "12.0.0.3", "11.3.0.4" ], "bundle-default": "6_12_16", "bundles": [ + { + "symlink": "6_12_17", + "mono":"6.12", + "ios": "15.10", + "mac": "8.10", + "android": "12.2" + }, { "symlink": "6_12_16", "mono":"6.12", From 03d3125c202c56d46b445644d4ee30479fa6fa19 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Wed, 22 Jun 2022 07:46:22 +0200 Subject: [PATCH 1261/3485] Add permissions and run configure-machine.sh without sudo (#5789) --- .../provision/configuration/configure-machine.sh | 1 + .../configuration/configure-tccdb-macos.sh | 1 + images/macos/templates/macOS-11.anka.pkr.hcl | 15 +++++++++++---- images/macos/templates/macOS-12.anka.pkr.hcl | 16 ++++++++++++---- 4 files changed, 25 insertions(+), 8 deletions(-) diff --git a/images/macos/provision/configuration/configure-machine.sh b/images/macos/provision/configuration/configure-machine.sh index ab8b2d8d9b89..3eadcc523667 100644 --- a/images/macos/provision/configuration/configure-machine.sh +++ b/images/macos/provision/configuration/configure-machine.sh @@ -87,6 +87,7 @@ EOF sleep 10 done + echo "Getting terminal windows" term_service=$(launchctl list | grep -i terminal | cut -f3) echo "Close terminal windows: gui/501/${term_service}" launchctl bootout gui/501/${term_service} && sleep 5 diff --git a/images/macos/provision/configuration/configure-tccdb-macos.sh b/images/macos/provision/configuration/configure-tccdb-macos.sh index 35525bd805c6..fe2151e7b184 100644 --- a/images/macos/provision/configuration/configure-tccdb-macos.sh +++ b/images/macos/provision/configuration/configure-tccdb-macos.sh @@ -44,6 +44,7 @@ userValuesArray=( "'kTCCServiceUbiquity','com.apple.PassKitCore',0,2,5,1,NULL,NULL,NULL,'UNUSED',NULL,0,1619516250" "'kTCCServiceAppleEvents','/Library/Application Support/Veertu/Anka/addons/ankarund',1,2,3,1,X'fade0c00000000ac0000000100000006000000020000001e636f6d2e7665657274752e616e6b612e6164646f6e732e616e6b6172756e0000000000060000000f000000060000000e000000010000000a2a864886f76364060206000000000000000000060000000e000000000000000a2a864886f7636406010d0000000000000000000b000000000000000a7375626a6563742e4f550000000000010000000a545439464157503656340000',NULL,0,'com.apple.finder',X'fade0c000000002c00000001000000060000000200000010636f6d2e6170706c652e66696e64657200000003',NULL,1629294900" "'kTCCServiceAppleEvents','/Library/Application Support/Veertu/Anka/addons/ankarund',1,2,3,1,X'fade0c00000000ac0000000100000006000000020000001e636f6d2e7665657274752e616e6b612e6164646f6e732e616e6b6172756e0000000000060000000f000000060000000e000000010000000a2a864886f76364060206000000000000000000060000000e000000000000000a2a864886f7636406010d0000000000000000000b000000000000000a7375626a6563742e4f550000000000010000000a545439464157503656340000',NULL,0,'com.apple.systemevents',X'fade0c000000003400000001000000060000000200000016636f6d2e6170706c652e73797374656d6576656e7473000000000003',NULL,164456761" + "'kTCCServiceAppleEvents','/Library/Application Support/Veertu/Anka/addons/ankarund',1,2,3,1,X'fade0c00000000ac0000000100000006000000020000001e636f6d2e7665657274752e616e6b612e6164646f6e732e616e6b6172756e0000000000060000000f000000060000000e000000010000000a2a864886f76364060206000000000000000000060000000e000000000000000a2a864886f7636406010d0000000000000000000b000000000000000a7375626a6563742e4f550000000000010000000a545439464157503656340000',NULL,0,'com.apple.Terminal',X'fade0c000000003000000001000000060000000200000012636f6d2e6170706c652e5465726d696e616c000000000003',NULL,1655808179" "'kTCCServiceAppleEvents','/usr/libexec/sshd-keygen-wrapper',1,2,3,1,X'fade0c000000003c0000000100000006000000020000001d636f6d2e6170706c652e737368642d6b657967656e2d7772617070657200000000000003',NULL,0,'com.apple.Terminal',X'fade0c000000003000000001000000060000000200000012636f6d2e6170706c652e5465726d696e616c000000000003',NULL,1650386089" ) for values in "${userValuesArray[@]}"; do diff --git a/images/macos/templates/macOS-11.anka.pkr.hcl b/images/macos/templates/macOS-11.anka.pkr.hcl index 2b17e98b6c90..48d49444a7a9 100644 --- a/images/macos/templates/macOS-11.anka.pkr.hcl +++ b/images/macos/templates/macOS-11.anka.pkr.hcl @@ -123,17 +123,24 @@ build { "./provision/configuration/ntpconf.sh", "./provision/configuration/max-files.sh", "./provision/configuration/shell-change.sh", + ] + environment_vars = [ + "PASSWORD=${var.vm_password}", + "USERNAME=${var.vm_username}" + ] + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}" + } + provisioner "shell" { + scripts = [ "./provision/configuration/preimagedata.sh", "./provision/configuration/configure-ssh.sh", "./provision/configuration/configure-machine.sh" ] environment_vars = [ "IMAGE_VERSION=${var.build_id}", - "IMAGE_OS=${var.image_os}", - "PASSWORD=${var.vm_password}", - "USERNAME=${var.vm_username}" + "IMAGE_OS=${var.image_os}" ] - execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}" + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" } provisioner "shell" { script = "./provision/core/reboot.sh" diff --git a/images/macos/templates/macOS-12.anka.pkr.hcl b/images/macos/templates/macOS-12.anka.pkr.hcl index e9ce7e6513b8..7a4d3c629cc6 100644 --- a/images/macos/templates/macOS-12.anka.pkr.hcl +++ b/images/macos/templates/macOS-12.anka.pkr.hcl @@ -122,7 +122,16 @@ build { "./provision/configuration/screensaver-off.sh", "./provision/configuration/ntpconf.sh", "./provision/configuration/max-files.sh", - "./provision/configuration/shell-change.sh", + "./provision/configuration/shell-change.sh" + ] + environment_vars = [ + "PASSWORD=${var.vm_password}", + "USERNAME=${var.vm_username}" + ] + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}" + } + provisioner "shell" { + scripts = [ "./provision/configuration/preimagedata.sh", "./provision/configuration/configure-ssh.sh", "./provision/configuration/configure-machine.sh" @@ -130,10 +139,9 @@ build { environment_vars = [ "IMAGE_VERSION=${var.build_id}", "IMAGE_OS=${var.image_os}", - "PASSWORD=${var.vm_password}", - "USERNAME=${var.vm_username}" + "PASSWORD=${var.vm_password}" ] - execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}" + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" } provisioner "shell" { script = "./provision/core/reboot.sh" From 220c7ad69bfe75d87eb46d02278c0868ffc5f97a Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Wed, 22 Jun 2022 17:23:30 +0200 Subject: [PATCH 1262/3485] Add dash version into documentation (#5796) --- .../linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 | 5 +++++ .../scripts/SoftwareReport/SoftwareReport.Generator.ps1 | 1 + 2 files changed, 6 insertions(+) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 index bb5bda569490..2a8c4bed1fd8 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 @@ -3,6 +3,11 @@ function Get-BashVersion { return "Bash $version" } +function Get-DashVersion { + $version = dpkg-query -W -f '${Version}' dash + return "Dash $version" +} + function Get-CPPVersions { $result = Get-CommandResult "apt list --installed" -Multiline $cppVersions = $result.Output | Where-Object { $_ -match "g\+\+-\d+"} | ForEach-Object { diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index d09faa335b11..0b4b432ad5c3 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -39,6 +39,7 @@ $markdown += New-MDHeader "Language and Runtime" -Level 3 $runtimesList = @( (Get-BashVersion), + (Get-DashVersion), (Get-CPPVersions), (Get-FortranVersions), (Get-NodeVersion), From 8fd4d28990ba13072eca502fabfced3d8d917cc7 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 22 Jun 2022 18:10:30 +0000 Subject: [PATCH 1263/3485] Updating readme file for ubuntu20 version 20220619.1 (#5786) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2004-Readme.md | 36 +++++++++++++++---------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/images/linux/Ubuntu2004-Readme.md b/images/linux/Ubuntu2004-Readme.md index da1f5441366e..3de1036c7336 100644 --- a/images/linux/Ubuntu2004-Readme.md +++ b/images/linux/Ubuntu2004-Readme.md @@ -4,8 +4,8 @@ | [(Public Beta) Ubuntu 22.04 is now available](https://github.com/actions/virtual-environments/issues/5490) | *** # Ubuntu 20.04.4 LTS -- Linux kernel version: 5.13.0-1029-azure -- Image Version: 20220614.0 +- Linux kernel version: 5.13.0-1031-azure +- Image Version: 20220619.1 ## Installed Software ### Language and Runtime @@ -14,12 +14,12 @@ - Clang-format 10.0.0, 11.0.0, 12.0.0 - Clang-tidy 10.0.0, 11.0.0, 12.0.0 - Erlang 25.0.1 (Eshell 13.0.1) -- Erlang rebar3 3.18.0 +- Erlang rebar3 3.19.0 - GNU C++ 9.4.0, 10.3.0 - GNU Fortran 9.4.0, 10.3.0 - Julia 1.7.3 - Kotlin 1.7.0-release-281 -- Mono 6.12.0.179 (apt source repository: https://download.mono-project.com/repo/ubuntu stable-focal main) +- Mono 6.12.0.182 (apt source repository: https://download.mono-project.com/repo/ubuntu stable-focal main) - MSBuild 16.10.1.31701 (from /usr/lib/mono/msbuild/15.0/bin/MSBuild.dll) - Node 16.15.1 - Perl 5.30.0 @@ -38,7 +38,7 @@ - Pip3 20.0.2 - Pipx 1.1.0 - RubyGems 3.1.2 -- Vcpkg (build from master \<06acb79f7>) +- Vcpkg (build from master \<b49b2bdf2>) - Yarn 1.22.19 #### Environment variables @@ -50,7 +50,7 @@ ### Project Management - Ant 1.10.7 - Gradle 7.4.2 -- Lerna 5.1.2 +- Lerna 5.1.4 - Maven 3.8.6 - Sbt 1.6.2 @@ -59,17 +59,17 @@ - apt-fast 1.9.12 - AzCopy 10.15.0 (available by `azcopy` and `azcopy10` aliases) - Bazel 5.2.0 -- Bazelisk 1.11.0 +- Bazelisk 1.12.0 - Bicep 0.7.4 - Buildah 1.22.3 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - CMake 3.23.2 - CodeQL Action Bundle 2.9.3 - Docker Amazon ECR Credential Helper 0.6.0 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.4.1+azure-1 +- Docker Compose v2 2.6.0+azure-1 - Docker-Buildx 0.8.2 -- Docker-Moby Client 20.10.16+azure-3 -- Docker-Moby Server 20.10.16+azure-2 +- Docker-Moby Client 20.10.17+azure-1 +- Docker-Moby Server 20.10.17+azure-1 - Fastlane 2.206.2 - Git 2.36.1 (apt source repository: ppa:git-core/ppa) - Git LFS 3.2.0 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) @@ -79,7 +79,7 @@ - HHVM (HipHop VM) 4.162.0 - jq 1.6 - Kind 0.14.0 -- Kubectl 1.24.1 +- Kubectl 1.24.2 - Kustomize 4.5.5 - Leiningen 2.9.8 - MediaInfo 19.09 @@ -90,7 +90,7 @@ - nvm 0.39.1 - OpenSSL 1.1.1f-1ubuntu2.13 - Packer 1.8.1 -- Parcel 2.6.0 +- Parcel 2.6.1 - PhantomJS 2.1.1 - Podman 3.4.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Pulumi 3.34.1 @@ -98,15 +98,15 @@ - Skopeo 1.5.0 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 -- Terraform 1.2.2 +- Terraform 1.2.3 - yamllint 1.26.3 - yq 4.25.2 - zstd 1.5.2 (homebrew) ### CLI Tools -- Alibaba Cloud CLI 3.0.121 -- AWS CLI 2.7.7 -- AWS CLI Session manager plugin 1.2.331.0 +- Alibaba Cloud CLI 3.0.122 +- AWS CLI 2.7.9 +- AWS CLI Session manager plugin 1.2.339.0 - AWS SAM CLI 1.52.0 - Azure CLI (azure-cli) 2.37.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.25.0 @@ -135,7 +135,7 @@ | -------- | ------------------- | | PHP | 7.4.30 8.0.20 8.1.7 | | Composer | 2.3.7 | -| PHPUnit | 8.5.26 | +| PHPUnit | 8.5.27 | ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ``` @@ -185,7 +185,7 @@ - sqlite3 3.31.1 #### PostgreSQL -- PostgreSQL 14.3 (apt source repository: https://apt.postgresql.org/pub/repos/apt/) +- PostgreSQL 14.4 (apt source repository: https://apt.postgresql.org/pub/repos/apt/) - PostgreSQL Server (user:postgres) ``` From 160d3cc82542c87312e9f9087e77f1730902995f Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Wed, 22 Jun 2022 22:20:37 +0400 Subject: [PATCH 1264/3485] Recreate nuget.config with a proper feed for macos (#5793) --- images/macos/provision/core/xamarin.sh | 4 +++ images/macos/tests/Xamarin.Tests.ps1 | 46 +++++++++++++++----------- 2 files changed, 30 insertions(+), 20 deletions(-) diff --git a/images/macos/provision/core/xamarin.sh b/images/macos/provision/core/xamarin.sh index b747faaa73fe..f738313fec6b 100755 --- a/images/macos/provision/core/xamarin.sh +++ b/images/macos/provision/core/xamarin.sh @@ -82,4 +82,8 @@ PREFERENCES_XAMARIN_DIR="${HOME}/Library/Preferences/Xamarin" mkdir -p $PREFERENCES_XAMARIN_DIR /usr/libexec/PlistBuddy -c "add :AppleSdkRoot string /Applications/Xcode_${DEFAULT_XCODE_VERSION}.app" $PREFERENCES_XAMARIN_DIR/Settings.plist +# Temporary workaround to recreate nuget.config file with a correct feed https://github.com/actions/virtual-environments/issues/5768 +rm -rf $HOME/.config/NuGet/NuGet.Config +nuget config + invoke_tests "Xamarin" diff --git a/images/macos/tests/Xamarin.Tests.ps1 b/images/macos/tests/Xamarin.Tests.ps1 index 3d7a97ddeb0d..9f523318226b 100644 --- a/images/macos/tests/Xamarin.Tests.ps1 +++ b/images/macos/tests/Xamarin.Tests.ps1 @@ -11,7 +11,7 @@ BeforeAll { param ( [string] $Version ) - + $versionParts = $Version.Split(".") return [String]::Join(".", $versionParts[0..1]) } @@ -90,28 +90,28 @@ Describe "Xamarin.iOS" { It "is installed" -TestCases $testCase { param ( [string] $VersionFolderPath ) - + $xamarinBinPath = Join-Path $VersionFolderPath "bin" $VersionFolderPath | Should -Exist $xamarinBinPath | Should -Exist } - + It "is available via short link" -TestCases $testCase { param ( [string] $XamarinIosVersion, [string] $IosVersionsPath, [string] $VersionFolderPath ) - + $shortSymlink = Get-ShortSymlink $XamarinIosVersion # only 'major.minor' $shortSymlinkFolderPath = Join-Path $IosVersionsPath $shortSymlink $shortVersionPath = Join-Path $shortSymlinkFolderPath "VERSION" $fullVersionPath = Join-Path $VersionFolderPath "VERSION" - + Validate-IdenticalFileContent -File1 $shortVersionPath -File2 $fullVersionPath } } - } + } } Describe "Xamarin.Mac" { @@ -120,7 +120,7 @@ Describe "Xamarin.Mac" { $XAMARIN_MAC_VERSIONS_PATH = "/Library/Frameworks/Xamarin.Mac.framework/Versions" $versionFolderPath = Join-Path $XAMARIN_MAC_VERSIONS_PATH $_ $testCase = @{ XamarinMacVersion = $_; VersionFolderPath = $versionFolderPath; MacVersionsPath = $XAMARIN_MAC_VERSIONS_PATH } - + It "is installed" -TestCases $testCase { param ( [string] $VersionFolderPath ) @@ -128,7 +128,7 @@ Describe "Xamarin.Mac" { $VersionFolderPath | Should -Exist $xamarinBinPath | Should -Exist } - + It "is available via short link" -TestCases $testCase { param ( [string] $XamarinMacVersion, @@ -140,7 +140,7 @@ Describe "Xamarin.Mac" { $shortSymlinkFolderPath = Join-Path $MacVersionsPath $shortSymlink $shortVersionPath = Join-Path $shortSymlinkFolderPath "VERSION" $fullVersionPath = Join-Path $VersionFolderPath "VERSION" - + Validate-IdenticalFileContent -File1 $shortVersionPath -File2 $fullVersionPath } } @@ -156,35 +156,35 @@ Describe "Xamarin.Android" { It "is installed" -TestCases $testCase { param ( [string] $VersionFolderPath ) - + $xamarinLibPath = Join-Path $VersionFolderPath "lib" $xamarinLibPath | Should -Exist } - + It "is available via short link" -TestCases $testCase { param ( [string] $XamarinAndroidVersion, [string] $AndroidVersionsPath, [string] $VersionFolderPath ) - + $shortSymlink = Get-ShortSymlink $XamarinAndroidVersion # only 'major.minor' $shortSymlinkFolderPath = Join-Path $AndroidVersionsPath $shortSymlink $shortVersionPath = Join-Path $shortSymlinkFolderPath "VERSION" $fullVersionPath = Join-Path $VersionFolderPath "VERSION" - + Validate-IdenticalFileContent -File1 $shortVersionPath -File2 $fullVersionPath } - + It "has correct symlinks" -TestCases $testCase { param ( [string] $VersionFolderPath ) - + $xamarinLibPath = Join-Path $VersionFolderPath "lib" Join-Path $xamarinLibPath "xbuild" | Should -Exist Join-Path $xamarinLibPath "xbuild-frameworks" | Should -Exist - } + } } - } + } } Describe "Xamarin Bundles" { @@ -194,11 +194,11 @@ Describe "Xamarin Bundles" { $XAMARIN_MAC_VERSIONS_PATH = "/Library/Frameworks/Xamarin.Mac.framework/Versions" $XAMARIN_ANDROID_VERSIONS_PATH = "/Library/Frameworks/Xamarin.Android.framework/Versions" } - + [array]$XAMARIN_BUNDLES = Get-ToolsetValue "xamarin.bundles" $XAMARIN_DEFAULT_BUNDLE = Get-ToolsetValue "xamarin.bundle-default" If ($XAMARIN_DEFAULT_BUNDLE -eq "latest") { $XAMARIN_DEFAULT_BUNDLE = $XAMARIN_BUNDLES[0].symlink } - + $currentBundle = [PSCustomObject] @{ symlink = "Current" mono = $XAMARIN_DEFAULT_BUNDLE @@ -220,7 +220,7 @@ Describe "Xamarin Bundles" { It "Mono symlink <BundleSymlink> exists" -TestCases $allBundles { param ( [string] $BundleSymlink ) - + (Join-Path $MONO_VERSIONS_PATH $BundleSymlink) | Should -Exist } @@ -290,4 +290,10 @@ Describe "Xamarin Bundles" { Validate-IdenticalFileContent -File1 $targetVersionPath -File2 $sourceVersionPath } +} + +Describe "Nuget" { + It "Nuget config contains nuget.org feed" { + Get-Content $env:HOME/.config/NuGet/NuGet.Config | Out-String | Should -Match "nuget.org" + } } \ No newline at end of file From f83d069814893c7d786a755cb96b925f2ee0bbcd Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Wed, 22 Jun 2022 21:07:48 +0200 Subject: [PATCH 1265/3485] [macOS] Fix utils.sh: line 130: null: command not found (#5790) * Fix utils.sh: line 130: null: command not found * revert changes --- images/macos/provision/utils/utils.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/macos/provision/utils/utils.sh b/images/macos/provision/utils/utils.sh index beb7677b656c..737102e07814 100755 --- a/images/macos/provision/utils/utils.sh +++ b/images/macos/provision/utils/utils.sh @@ -127,7 +127,7 @@ should_build_from_source() { # No need to build from source if a bottle is disabled # Use the simple 'brew install' command to download a package - if $bottle_disabled; then + if [[ $bottle_disabled == "true" ]]; then echo "false" return fi From 17683c89ff78fb10446d23204f908bb888a23730 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 23 Jun 2022 09:20:17 +0000 Subject: [PATCH 1266/3485] Updating readme file for ubuntu18 version 20220619.1 (#5787) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu1804-Readme.md | 34 +++++++++++++++---------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/images/linux/Ubuntu1804-Readme.md b/images/linux/Ubuntu1804-Readme.md index b21a2282569f..3fd1cae109fa 100644 --- a/images/linux/Ubuntu1804-Readme.md +++ b/images/linux/Ubuntu1804-Readme.md @@ -4,8 +4,8 @@ | [(Public Beta) Ubuntu 22.04 is now available](https://github.com/actions/virtual-environments/issues/5490) | *** # Ubuntu 18.04.6 LTS -- Linux kernel version: 5.4.0-1083-azure -- Image Version: 20220614.0 +- Linux kernel version: 5.4.0-1085-azure +- Image Version: 20220619.1 ## Installed Software ### Language and Runtime @@ -14,12 +14,12 @@ - Clang-format 9.0.0 - Clang-tidy 9.0.0 - Erlang 25.0.1 (Eshell 13.0.1) -- Erlang rebar3 3.18.0 +- Erlang rebar3 3.19.0 - GNU C++ 7.5.0, 9.4.0, 10.3.0 - GNU Fortran 7.5.0, 9.4.0, 10.3.0 - Julia 1.7.3 - Kotlin 1.7.0-release-281 -- Mono 6.12.0.179 (apt source repository: https://download.mono-project.com/repo/ubuntu stable-bionic main) +- Mono 6.12.0.182 (apt source repository: https://download.mono-project.com/repo/ubuntu stable-bionic main) - MSBuild 16.10.1.31701 (from /usr/lib/mono/msbuild/15.0/bin/MSBuild.dll) - Node 16.15.1 - Perl 5.26.1 @@ -38,7 +38,7 @@ - Pip3 9.0.1 - Pipx 1.0.0 - RubyGems 2.7.6 -- Vcpkg (build from master \<06acb79f7>) +- Vcpkg (build from master \<b49b2bdf2>) - Yarn 1.22.19 #### Environment variables @@ -58,17 +58,17 @@ - apt-fast 1.9.12 - AzCopy 10.15.0 (available by `azcopy` and `azcopy10` aliases) - Bazel 5.2.0 -- Bazelisk 1.11.0 +- Bazelisk 1.12.0 - Bicep 0.7.4 - Buildah 1.22.3 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - CMake 3.23.2 - CodeQL Action Bundle 2.9.3 - Docker Amazon ECR Credential Helper 0.6.0 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.4.1+azure-1 +- Docker Compose v2 2.6.0+azure-1 - Docker-Buildx 0.8.2 -- Docker-Moby Client 20.10.16+azure-3 -- Docker-Moby Server 20.10.16+azure-2 +- Docker-Moby Client 20.10.17+azure-1 +- Docker-Moby Server 20.10.17+azure-1 - Git 2.36.1 (apt source repository: ppa:git-core/ppa) - Git LFS 3.2.0 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.3.1 @@ -77,7 +77,7 @@ - HHVM (HipHop VM) 4.162.0 - jq 1.5 - Kind 0.14.0 -- Kubectl 1.24.1 +- Kubectl 1.24.2 - Kustomize 4.5.5 - Leiningen 2.9.8 - MediaInfo 17.12 @@ -88,7 +88,7 @@ - nvm 0.39.1 - OpenSSL 1.1.1-1ubuntu2.1~18.04.17 - Packer 1.8.1 -- Parcel 2.6.0 +- Parcel 2.6.1 - PhantomJS 2.1.1 - Podman 3.4.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Pulumi 3.34.1 @@ -96,15 +96,15 @@ - Skopeo 1.5.0 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 - SVN 1.9.7 -- Terraform 1.2.2 +- Terraform 1.2.3 - yamllint 1.26.3 - yq 4.25.2 - zstd 1.5.2 (homebrew) ### CLI Tools -- Alibaba Cloud CLI 3.0.121 -- AWS CLI 1.24.10 -- AWS CLI Session manager plugin 1.2.331.0 +- Alibaba Cloud CLI 3.0.122 +- AWS CLI 2.7.9 +- AWS CLI Session manager plugin 1.2.339.0 - AWS SAM CLI 1.52.0 - Azure CLI (azure-cli) 2.37.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.25.0 @@ -129,7 +129,7 @@ | -------- | --------------------------------- | | PHP | 7.2.34 7.3.33 7.4.30 8.0.20 8.1.7 | | Composer | 2.3.7 | -| PHPUnit | 8.5.26 | +| PHPUnit | 8.5.27 | ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ``` @@ -179,7 +179,7 @@ - sqlite3 3.22.0 #### PostgreSQL -- PostgreSQL 14.3 (apt source repository: https://apt.postgresql.org/pub/repos/apt/) +- PostgreSQL 14.4 (apt source repository: https://apt.postgresql.org/pub/repos/apt/) - PostgreSQL Server (user:postgres) ``` From 56dc323e71be82f405d499a98123266d2fc2798b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 23 Jun 2022 09:20:46 +0000 Subject: [PATCH 1267/3485] Updating readme file for ubuntu22 version 20220619.1 (#5785) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2204-Readme.md | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/images/linux/Ubuntu2204-Readme.md b/images/linux/Ubuntu2204-Readme.md index 2a94e7cb714b..da9407fa73ab 100644 --- a/images/linux/Ubuntu2204-Readme.md +++ b/images/linux/Ubuntu2204-Readme.md @@ -4,8 +4,8 @@ | [(Public Beta) Ubuntu 22.04 is now available](https://github.com/actions/virtual-environments/issues/5490) | *** # Ubuntu 22.04 LTS -- Linux kernel version: 5.15.0-1010-azure -- Image Version: 20220614.0 +- Linux kernel version: 5.15.0-1012-azure +- Image Version: 20220619.1 ## Installed Software ### Language and Runtime @@ -33,7 +33,7 @@ - Pip3 22.0.2 - Pipx 1.1.0 - RubyGems 3.3.5 -- Vcpkg (build from master \<06acb79f7>) +- Vcpkg (build from master \<b49b2bdf2>) - Yarn 1.22.19 #### Environment variables @@ -43,14 +43,14 @@ | VCPKG_INSTALLATION_ROOT | /usr/local/share/vcpkg | ### Project Management -- Lerna 5.1.2 +- Lerna 5.1.4 ### Tools - Ansible 2.12.6 - apt-fast 1.9.12 - AzCopy 10.15.0 (available by `azcopy` and `azcopy10` aliases) - Bazel 5.2.0 -- Bazelisk 1.11.0 +- Bazelisk 1.12.0 - Bicep 0.7.4 - Buildah 1.23.1 - CMake 3.23.2 @@ -69,7 +69,7 @@ - Heroku 7.60.2 - jq 1.6 - Kind 0.14.0 -- Kubectl 1.24.1 +- Kubectl 1.24.2 - Kustomize 4.5.5 - Leiningen 2.9.8 - MediaInfo 21.09 @@ -80,22 +80,22 @@ - nvm 0.39.1 - OpenSSL 3.0.2-0ubuntu1.2 - Packer 1.8.1 -- Parcel 2.6.0 +- Parcel 2.6.1 - Podman 3.4.4 - Pulumi 3.34.1 - R 4.2.0 - Skopeo 1.4.1 - Sphinx Open Source Search Server 2.2.11 - SVN 1.14.1 -- Terraform 1.2.2 +- Terraform 1.2.3 - yamllint 1.26.3 - yq 4.25.2 - zstd 1.5.2 (homebrew) ### CLI Tools -- Alibaba Cloud CLI 3.0.121 -- AWS CLI 2.7.7 -- AWS CLI Session manager plugin 1.2.331.0 +- Alibaba Cloud CLI 3.0.122 +- AWS CLI 2.7.9 +- AWS CLI Session manager plugin 1.2.339.0 - AWS SAM CLI 1.52.0 - Azure CLI (azure-cli) 2.37.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.25.0 @@ -124,7 +124,7 @@ | -------- | ------- | | PHP | 8.1.7 | | Composer | 2.3.7 | -| PHPUnit | 8.5.26 | +| PHPUnit | 8.5.27 | ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ``` @@ -171,7 +171,7 @@ - sqlite3 3.37.2 #### PostgreSQL -- PostgreSQL 14.3 (apt source repository: https://apt.postgresql.org/pub/repos/apt/) +- PostgreSQL 14.4 (apt source repository: https://apt.postgresql.org/pub/repos/apt/) - PostgreSQL Server (user:postgres) ``` From e38f75e512e8258ea7c5808c7e0a2b97a1ed7a30 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Thu, 23 Jun 2022 11:37:51 +0200 Subject: [PATCH 1268/3485] Update openssl 1.1 on Ubuntu 22.04 (#5798) --- images/linux/scripts/installers/sqlpackage.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/images/linux/scripts/installers/sqlpackage.sh b/images/linux/scripts/installers/sqlpackage.sh index 9e5cc9f0a17c..25dec14cf6f1 100644 --- a/images/linux/scripts/installers/sqlpackage.sh +++ b/images/linux/scripts/installers/sqlpackage.sh @@ -8,10 +8,10 @@ source $HELPER_SCRIPTS/install.sh source $HELPER_SCRIPTS/os.sh -# Install libssl1.1 dependency +# Install libssl1.1 dependency if isUbuntu22; then - download_with_retries "http://security.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.1l-1ubuntu1.3_amd64.deb" "/tmp" - dpkg -i /tmp/libssl1.1_1.1.1l-1ubuntu1.3_amd64.deb + download_with_retries "http://security.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.1l-1ubuntu1.5_amd64.deb" "/tmp" + dpkg -i /tmp/libssl1.1_1.1.1l-1ubuntu1.5_amd64.deb fi # Install SqlPackage From 86e4ccb246f6d1476f969b8c6ee1c05109f5ba8e Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Thu, 23 Jun 2022 12:58:16 +0200 Subject: [PATCH 1269/3485] Fix az cli warnings (#5803) --- helpers/CreateAzureVMFromPackerTemplate.ps1 | 8 ++++---- images.CI/linux-and-win/cleanup.ps1 | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/helpers/CreateAzureVMFromPackerTemplate.ps1 b/helpers/CreateAzureVMFromPackerTemplate.ps1 index f5041f6c440e..770161c2f6e2 100644 --- a/helpers/CreateAzureVMFromPackerTemplate.ps1 +++ b/helpers/CreateAzureVMFromPackerTemplate.ps1 @@ -28,7 +28,7 @@ Function CreateAzureVMFromPackerTemplate { The location where the Azure virtual machine will be provisioned. Example: "eastus" .EXAMPLE - CreateAzureVMFromPackerTemplate -SubscriptionId {YourSubscriptionId} -ResourceGroupName {ResourceGroupName} -TemplateFile "C:\BuildVmImages\temporaryTemplate.json" -VirtualMachineName "testvm1" -AdminUsername "shady1" -AdminPassword "SomeSecurePassword1" -AzureLocation "eastus" + CreateAzureVMFromPackerTemplate -SubscriptionId {YourSubscriptionId} -ResourceGroupName {ResourceGroupName} -TemplateFile "C:\BuildVmImages\temporaryTemplate.json" -VirtualMachineName "testvm1" -AdminUsername "shady1" -AdminPassword "SomeSecurePassword1" -AzureLocation "eastus" #> param ( [Parameter(Mandatory = $True)] @@ -63,14 +63,14 @@ Function CreateAzureVMFromPackerTemplate { $networkId = ($nic | ConvertFrom-Json).NewNIC.id Write-Host "`nCreating a public IP address" - ($publicIp = az network public-ip create -g $ResourceGroupName -l $AzureLocation -n $publicIpName --allocation-method Static --sku Standard --version IPv4 --subscription $subscriptionId -o json) + ($publicIp = az network public-ip create -g $ResourceGroupName -l $AzureLocation -n $publicIpName --allocation-method Static --sku Basic --version IPv4 --subscription $subscriptionId -o json) $publicIpId = ($publicIp | ConvertFrom-Json).publicIp.id Write-Host "`nAdding the public IP to the NIC" az network nic ip-config update -g $ResourceGroupName -n ipconfig1 --nic-name $nicName --public-ip-address $publicIpId --subscription $subscriptionId Write-Host "`nCreating the VM" - az group deployment create -g $ResourceGroupName -n $VirtualMachineName --subscription $subscriptionId --template-file $templateFilePath --parameters vmSize=$vmSize vmName=$VirtualMachineName adminUserName=$AdminUsername adminPassword=$AdminPassword networkInterfaceId=$networkId - + az deployment group create -g $ResourceGroupName -n $VirtualMachineName --subscription $subscriptionId --template-file $templateFilePath --parameters vmSize=$vmSize vmName=$VirtualMachineName adminUserName=$AdminUsername adminPassword=$AdminPassword networkInterfaceId=$networkId + Write-Host "`nCreated in ${ResourceGroupName}:`n vnet ${vnetName}`n subnet ${subnetName}`n nic ${nicName}`n publicip ${publicIpName}`n vm ${VirtualMachineName}" } diff --git a/images.CI/linux-and-win/cleanup.ps1 b/images.CI/linux-and-win/cleanup.ps1 index 0c91272d149f..8f7b35d5ce56 100644 --- a/images.CI/linux-and-win/cleanup.ps1 +++ b/images.CI/linux-and-win/cleanup.ps1 @@ -14,7 +14,7 @@ $TempResourceGroupName = "${ResourcesNamePrefix}_${Image}" $groupExist = az group exists --name $TempResourceGroupName --subscription $SubscriptionId if ($groupExist -eq "true") { - $osDiskName = az group deployment list --resource-group $TempResourceGroupName --query "[].properties.parameters.osDiskName.value" -o tsv + $osDiskName = az deployment group list --resource-group $TempResourceGroupName --query "[].properties.parameters.osDiskName.value" -o tsv Write-Host "Found a match, deleting temporary files" az group delete --name $TempResourceGroupName --subscription $SubscriptionId --yes | Out-Null Write-Host "Temporary group was deleted successfully" From a94f92b4f993cd7329364efa96ca27784bd62d16 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 23 Jun 2022 14:31:40 +0000 Subject: [PATCH 1270/3485] Updating readme file for win19 version 20220619.1 (#5784) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2019-Readme.md | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index f4096f0c9fa8..be714c8c6ef1 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -3,8 +3,8 @@ | [[Azure DevOps] Windows-2016 environment removal postponed until June 30, 2022](https://github.com/actions/virtual-environments/issues/5403) | *** # Microsoft Windows Server 2019 Datacenter -- OS Version: 10.0.17763 Build 2928 -- Image Version: 20220614.0 +- OS Version: 10.0.17763 Build 3046 +- Image Version: 20220619.1 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -32,7 +32,7 @@ - pip 22.1.2 (python 3.7) - Pipx 1.1.0 - RubyGems 2.7.6.3 -- Vcpkg (build from master \<06acb79f7>) +- Vcpkg (build from master \<b49b2bdf2>) - Yarn 1.22.19 #### Environment variables @@ -52,7 +52,7 @@ - aria2 1.36.0 - azcopy 10.15.0 - Bazel 5.2.0 -- Bazelisk 1.11.0 +- Bazelisk 1.12.0 - Bicep 0.7.4 - Cabal 3.6.2.0 - CMake 3.23.2 @@ -75,7 +75,7 @@ - NSIS v3.08 - OpenSSL 1.1.1 - Packer 1.8.0 -- Parcel 2.6.0 +- Parcel 2.6.1 - Pulumi v3.34.1 - R 4.2.0 - Service Fabric SDK 9.0.1028.9590 @@ -89,10 +89,10 @@ - zstd 1.5.2 ### CLI Tools -- Alibaba Cloud CLI 3.0.121 -- AWS CLI 2.7.7 +- Alibaba Cloud CLI 3.0.122 +- AWS CLI 2.7.9 - AWS SAM CLI 1.52.0 -- AWS Session Manager CLI 1.2.331.0 +- AWS Session Manager CLI 1.2.339.0 - Azure CLI 2.37.0 - Azure DevOps CLI extension 0.25.0 - Cloud Foundry CLI 6.53.0 @@ -116,8 +116,8 @@ ### Browsers and webdrivers - Google Chrome 102.0.5005.115 - Chrome Driver 102.0.5005.61 -- Microsoft Edge 102.0.1245.41 -- Microsoft Edge Driver 102.0.1245.41 +- Microsoft Edge 102.0.1245.44 +- Microsoft Edge Driver 102.0.1245.44 - Mozilla Firefox 101.0.1 - Gecko Driver 0.31.0 - IE Driver 3.150.1.1 @@ -208,7 +208,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Property | Value | | -------------------- | ------------------------------------------------------------------------------------------------------------------------------------ | | ServiceName | postgresql-x64-14 | -| Version | 14.3 | +| Version | 14.4 | | ServiceStatus | Stopped | | ServiceStartType | Disabled | | EnvironmentVariables | PGBIN=C:\Program Files\PostgreSQL\14\bin <br> PGDATA=C:\Program Files\PostgreSQL\14\data <br> PGROOT=C:\Program Files\PostgreSQL\14 | @@ -546,7 +546,7 @@ All other versions are saved but not installed. #### Powershell Modules | Module | Version | | ------------------ | ---------------- | -| AWSPowerShell | 4.1.104 | +| AWSPowerShell | 4.1.108 | | DockerMsftProvider | 1.0.0.8 | | MarkdownPS | 1.9 | | Microsoft.Graph | 1.9.6 | @@ -586,9 +586,9 @@ All other versions are saved but not installed. ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:a108b8cd955bc84813eda0aab41d514887ef0b4a2e2bbbca6965ec09d4da2c0c | 2022-05-11 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:9e0351236b319aba13cfec412d94df47cf4220cc909cdef6bb0aaaf31f2fb741 | 2022-05-11 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:fa53215891bfa80f70d5266f08942dd6e83a7b61f3701b700b19b4aba2dc1060 | 2022-05-11 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:e442e479cd27028f31eb797d367aec939acf5d334b365e391d7fa02acdfa73b6 | 2022-06-14 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:0828de81b4ff3c8036d4923dfe09518a5baee849915f9d3c8f20a502bc209e25 | 2022-06-14 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:82e0a5e2c8747b9f2c88a15e7f652fd4b437cbe0399ab15ac54a0680dde8b453 | 2022-06-14 | | mcr.microsoft.com/windows/nanoserver:1809 | sha256:1e03529d89a3ebab534c024b69dcc050757b285622aaecfe8d5d35e26fee50ac | 2022-06-09 | | mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:e100aa542181a34add63bc38125ad57da16a7d1722dd965a888fde1b8d8c67bb | 2022-06-09 | From 96c2ea89565b32d23595ce34732dc7539d67166e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 23 Jun 2022 14:37:16 +0000 Subject: [PATCH 1271/3485] Updating readme file for win22 version 20220619.1 (#5783) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2022-Readme.md | 34 +++++++++++++++++--------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/images/win/Windows2022-Readme.md b/images/win/Windows2022-Readme.md index 50384eebf40e..3c527e7be099 100644 --- a/images/win/Windows2022-Readme.md +++ b/images/win/Windows2022-Readme.md @@ -4,7 +4,7 @@ *** # Microsoft Windows Server 2022 Datacenter - OS Version: 10.0.20348 Build 768 -- Image Version: 20220614.0 +- Image Version: 20220619.1 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -32,7 +32,7 @@ - pip 22.1.2 (python 3.9) - Pipx 1.1.0 - RubyGems 3.2.33 -- Vcpkg (build from master \<06acb79f7>) +- Vcpkg (build from master \<b49b2bdf2>) - Yarn 1.22.19 #### Environment variables @@ -51,7 +51,7 @@ - aria2 1.36.0 - azcopy 10.15.0 - Bazel 5.2.0 -- Bazelisk 1.11.0 +- Bazelisk 1.12.0 - Bicep 0.7.4 - Cabal 3.6.2.0 - CMake 3.23.2 @@ -68,7 +68,7 @@ - Kind 0.14.0 - Kubectl 1.24.1 - Mercurial 5.0 -- Mingw-w64 8.1.0 +- Mingw-w64 11.2.0 - Newman 5.3.2 - NSIS v3.08 - OpenSSL 1.1.1 @@ -86,10 +86,10 @@ - zstd 1.5.2 ### CLI Tools -- Alibaba Cloud CLI 3.0.121 -- AWS CLI 2.7.7 +- Alibaba Cloud CLI 3.0.122 +- AWS CLI 2.7.9 - AWS SAM CLI 1.52.0 -- AWS Session Manager CLI 1.2.331.0 +- AWS Session Manager CLI 1.2.339.0 - Azure CLI 2.37.0 - Azure DevOps CLI extension 0.25.0 - GitHub CLI 2.12.1 @@ -112,8 +112,8 @@ ### Browsers and webdrivers - Google Chrome 102.0.5005.115 - Chrome Driver 102.0.5005.61 -- Microsoft Edge 102.0.1245.39 -- Microsoft Edge Driver 102.0.1245.41 +- Microsoft Edge 102.0.1245.44 +- Microsoft Edge Driver 102.0.1245.44 - Mozilla Firefox 101.0.1 - Gecko Driver 0.31.0 - IE Driver 3.150.1.1 @@ -194,7 +194,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Property | Value | | -------------------- | ------------------------------------------------------------------------------------------------------------------------------------ | | ServiceName | postgresql-x64-14 | -| Version | 14.3 | +| Version | 14.4 | | ServiceStatus | Stopped | | ServiceStartType | Disabled | | EnvironmentVariables | PGBIN=C:\Program Files\PostgreSQL\14\bin <br> PGDATA=C:\Program Files\PostgreSQL\14\data <br> PGROOT=C:\Program Files\PostgreSQL\14 | @@ -402,6 +402,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Component.Windows10SDK.19041 | 17.2.32408.312 | | Microsoft.VisualStudio.Component.Windows10SDK.20348 | 17.2.32408.312 | | Microsoft.VisualStudio.Component.Windows11SDK.22000 | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.Windows11SDK.22621 | 17.2.32526.322 | | Microsoft.VisualStudio.Component.Workflow | 17.2.32408.312 | | Microsoft.VisualStudio.Component.WslDebugging | 17.2.32408.312 | | Microsoft.VisualStudio.ComponentGroup.ArchitectureTools.Native | 17.2.32408.312 | @@ -465,6 +466,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 10.0.19041.0 - 10.0.20348.0 - 10.0.22000.0 +- 10.0.22621.0 ### .NET Core SDK `Location C:\Program Files\dotnet\sdk` @@ -472,10 +474,10 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### .NET Core Runtime `Location: C:\Program Files\dotnet\shared\Microsoft.AspNetCore.App` -- 3.1.4 3.1.6 3.1.20 3.1.25 3.1.26 5.0.4 5.0.9 5.0.17 6.0.6 +- 3.1.4 3.1.6 3.1.20 3.1.26 5.0.4 5.0.9 5.0.17 6.0.6 `Location: C:\Program Files\dotnet\shared\Microsoft.NETCore.App` -- 3.1.4 3.1.6 3.1.20 3.1.25 3.1.26 5.0.4 5.0.9 5.0.17 6.0.6 +- 3.1.4 3.1.6 3.1.20 3.1.26 5.0.4 5.0.9 5.0.17 6.0.6 `Location: C:\Program Files\dotnet\shared\Microsoft.WindowsDesktop.App` - 3.1.4 3.1.6 3.1.20 3.1.26 5.0.4 5.0.9 5.0.17 6.0.6 @@ -506,7 +508,7 @@ All other versions are saved but not installed. #### Powershell Modules | Module | Version | | ------------------ | ---------------- | -| AWSPowerShell | 4.1.104 | +| AWSPowerShell | 4.1.108 | | DockerMsftProvider | 1.0.0.8 | | MarkdownPS | 1.9 | | Microsoft.Graph | 1.9.6 | @@ -545,9 +547,9 @@ All other versions are saved but not installed. ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2022 | sha256:1182bfe22daba321fccb5caf93bfedc912c817a91d4c9aa5b45ea3823cb7a5c0 | 2022-05-11 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2022 | sha256:9bba2824988fa141d187315336055c068dadae6b84e86fb5d13291fd2245a8dd | 2022-05-11 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:f3dcc7d94e1631213f2349851f3415d8850d45ebd411e4ca68a0a5fa73ebffe8 | 2022-05-11 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2022 | sha256:31c66a698116346470a864eb3f58698a422e99e688a0b1b51fb178e2541ddc47 | 2022-06-14 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2022 | sha256:486be6bcb80ad5bae9854f7a022601fd93cf58b7b26fbdc70ca8533b88852ac7 | 2022-06-14 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:6c490f4528cb625c60aa119669830639ae3988c3c23dfb2f94a4ef19df2eb606 | 2022-06-14 | | mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:5f36a555eeb0151d5c00c14b01c3d39d9e5dffc36e5b2039cfa6041b6dac2480 | 2022-06-09 | | mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:b2162caa6da208d9dc10c99e18ee04aadcc4429b219cb316ea404fa9c4de53d1 | 2022-06-09 | From 35e579b61b27ee075dea04a0cfbedffd837d63cb Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 23 Jun 2022 19:20:01 +0000 Subject: [PATCH 1272/3485] Updating readme file for macOS-10.15 version 20220622.2 (#5804) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-10.15-Readme.md | 56 +++++++++++++++--------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/images/macos/macos-10.15-Readme.md b/images/macos/macos-10.15-Readme.md index a5228ef51d7c..011e4f6bb762 100644 --- a/images/macos/macos-10.15-Readme.md +++ b/images/macos/macos-10.15-Readme.md @@ -1,7 +1,7 @@ # macOS 10.15 info - System Version: macOS 10.15.7 (19H1922) - Kernel Version: Darwin 19.6.0 -- Image Version: 20220615.1 +- Image Version: 20220622.2 ## Installed Software ### Language and Runtime @@ -11,10 +11,10 @@ - Clang/LLVM 13.0.1 is available on `'$(brew --prefix llvm)/bin/clang'` - gcc-9 (Homebrew GCC 9.5.0) 9.5.0 - available by `gcc-9` alias - gcc-10 (Homebrew GCC 10.3.0) 10.3.0 - available by `gcc-10` alias -- gcc-11 (Homebrew GCC 11.3.0_1) 11.3.0 - available by `gcc-11` alias +- gcc-11 (Homebrew GCC 11.3.0_2) 11.3.0 - available by `gcc-11` alias - GNU Fortran (Homebrew GCC 9.5.0) 9.5.0 - available by `gfortran-9` alias - GNU Fortran (Homebrew GCC 10.3.0) 10.3.0 - available by `gfortran-10` alias -- GNU Fortran (Homebrew GCC 11.3.0_1) 11.3.0 - available by `gfortran-11` alias +- GNU Fortran (Homebrew GCC 11.3.0_2) 11.3.0 - available by `gfortran-11` alias - Go 1.17.11 - julia 1.7.3 - Kotlin 1.7.0-release-281 @@ -30,7 +30,7 @@ - Ruby 2.7.6p219 ### Package Management -- Bundler version 2.3.15 +- Bundler version 2.3.16 - Carthage 0.38.0 - CocoaPods 1.11.3 - Composer 2.3.7 @@ -42,7 +42,7 @@ - Pip 22.1.1 (python 3.9) - Pipx 1.1.0 - RubyGems 3.2.33 -- Vcpkg 2022 (build from master \<d25fb81e9>) +- Vcpkg 2022 (build from master \<5241c59aa>) - Yarn 1.22.19 #### Environment variables @@ -62,7 +62,7 @@ - aria2 1.36.0 - azcopy 10.15.0 - bazel 5.2.0 -- bazelisk 1.11.0 +- bazelisk 1.12.0 - bsdtar 3.3.2 - available by 'tar' alias - Curl 7.83.1 - Git 2.36.1 @@ -74,15 +74,15 @@ - gpg (GnuPG) 2.3.6 - helm v3.9.0+g7ceeda6 - Hub CLI: 2.14.2 -- ImageMagick 7.1.0-37 +- ImageMagick 7.1.0-39 - jq 1.6 - mongo v5.0.7 - mongod v5.0.7 - Newman 5.3.2 - OpenSSL 1.1.1o 3 May 2022 `(/usr/local/opt/openssl@1.1 -> ../Cellar/openssl@1.1/1.1.1o)` -- Packer 1.8.1 -- PostgreSQL 14.3 -- psql (PostgreSQL) 14.3 +- Packer 1.8.2 +- PostgreSQL 14.4 +- psql (PostgreSQL) 14.4 - Sox 14.4.2 - Subversion (SVN) 1.14.2 - Switchaudio-osx 1.1.0 @@ -92,11 +92,11 @@ - zstd 1.5.2 ### Tools -- Aliyun CLI 3.0.121 +- Aliyun CLI 3.0.123 - App Center CLI 2.10.10 -- AWS CLI 2.7.7 +- AWS CLI 2.7.9 - AWS SAM CLI 1.52.0 -- AWS Session Manager CLI 1.2.331.0 +- AWS Session Manager CLI 1.2.339.0 - Azure CLI (azure-devops) 0.25.0 - Azure CLI 2.37.0 - Bicep CLI 0.7.4 @@ -107,7 +107,7 @@ - GHCup 0.1.17.8 - Jazzy 0.14.2 - Stack 2.7.5 -- SwiftFormat 0.49.9 +- SwiftFormat 0.49.10 - Swig 4.0.2 - Xcode Command Line Tools 12.4.0.0.1.1610135815 @@ -118,10 +118,10 @@ ### Browsers - Safari 15.5 (15613.2.7.1.9) - SafariDriver 15.5 (15613.2.7.1.9) -- Google Chrome 102.0.5005.115 -- ChromeDriver 102.0.5005.61 -- Microsoft Edge 102.0.1245.41 -- Microsoft Edge WebDriver 102.0.1245.41 +- Google Chrome 103.0.5060.53 +- ChromeDriver 103.0.5060.53 +- Microsoft Edge 102.0.1245.44 +- Microsoft Edge WebDriver 102.0.1245.44 - Mozilla Firefox 101.0.1 - geckodriver 0.31.0 - Selenium server 4.2.0 @@ -129,7 +129,7 @@ #### Environment variables | Name | Value | | --------------- | ---------------------------------------------- | -| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/102.0.5005.61 | +| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/103.0.5060.53 | | EDGEWEBDRIVER | /usr/local/share/edge_driver | | GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | @@ -160,7 +160,7 @@ - 2.7.18 - 3.6.15 - 3.7.13 -- 3.8.12 +- 3.8.13 - 3.9.13 - 3.10.5 @@ -198,7 +198,7 @@ - Rustfmt 1.4.38-stable ### PowerShell Tools -- PowerShell 7.2.4 +- PowerShell 7.2.5 #### PowerShell Modules | Module | Version | @@ -209,16 +209,16 @@ | PSScriptAnalyzer | 1.20.0 | ### Web Servers -| Name | Version | ConfigFile | ServiceStatus | ListenPort | -| ----- | -------- | ------------------------------- | ------------- | ---------- | -| httpd | 2.4.54 | /usr/local/etc/httpd/httpd.conf | none | 80 | -| nginx | 1.21.6_1 | /usr/local/etc/nginx/nginx.conf | none | 80 | +| Name | Version | ConfigFile | ServiceStatus | ListenPort | +| ----- | ------- | ------------------------------- | ------------- | ---------- | +| httpd | 2.4.54 | /usr/local/etc/httpd/httpd.conf | none | 80 | +| nginx | 1.23.0 | /usr/local/etc/nginx/nginx.conf | none | 80 | ### Xamarin #### Visual Studio for Mac -| Version | Build | Path | -| -------------- | ---------- | ------------------------------- | -| 2019 (default) | 8.10.24.14 | /Applications/Visual Studio.app | +| Version | Build | Path | +| -------------- | --------- | ------------------------------- | +| 2019 (default) | 8.10.25.2 | /Applications/Visual Studio.app | #### Xamarin bundles | symlink | Xamarin.Mono | Xamarin.iOS | Xamarin.Mac | Xamarin.Android | From bc2fdf77fffcf94b90b7a86bf1a3397a75bf055d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 24 Jun 2022 09:36:17 +0000 Subject: [PATCH 1273/3485] Updating readme file for macOS-12 version 20220622.2 (#5801) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-12-Readme.md | 53 +++++++++++++++++---------------- 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/images/macos/macos-12-Readme.md b/images/macos/macos-12-Readme.md index 7c12b791c33b..2f1444196a5d 100644 --- a/images/macos/macos-12-Readme.md +++ b/images/macos/macos-12-Readme.md @@ -1,7 +1,7 @@ # macOS 12.4 info - System Version: macOS 12.4 (21F79) - Kernel Version: Darwin 21.5.0 -- Image Version: 20220615.1 +- Image Version: 20220622.2 ## Installed Software ### Language and Runtime @@ -9,8 +9,8 @@ - Bash 3.2.57(1)-release - Clang/LLVM 13.0.1 is available on `'$(brew --prefix llvm)/bin/clang'` - Clang/LLVM 13.1.6 is default -- gcc-11 (Homebrew GCC 11.3.0_1) 11.3.0 - available by `gcc-11` alias -- GNU Fortran (Homebrew GCC 11.3.0_1) 11.3.0 - available by `gfortran-11` alias +- gcc-11 (Homebrew GCC 11.3.0_2) 11.3.0 - available by `gcc-11` alias +- GNU Fortran (Homebrew GCC 11.3.0_2) 11.3.0 - available by `gfortran-11` alias - Go 1.17.11 - julia 1.7.3 - Kotlin 1.7.0-release-281 @@ -26,7 +26,7 @@ - Ruby 3.0.4p208 ### Package Management -- Bundler version 2.3.15 +- Bundler version 2.3.16 - Carthage 0.38.0 - CocoaPods 1.11.3 - Composer 2.3.7 @@ -38,7 +38,7 @@ - Pip 22.1.1 (python 3.9) - Pipx 1.1.0 - RubyGems 3.2.33 -- Vcpkg 2022 (build from master \<06acb79f7>) +- Vcpkg 2022 (build from master \<5241c59aa>) - Yarn 1.22.19 #### Environment variables @@ -58,7 +58,7 @@ - aria2 1.36.0 - azcopy 10.15.0 - bazel 5.2.0 -- bazelisk 1.11.0 +- bazelisk 1.12.0 - bsdtar 3.5.1 - available by 'tar' alias - Curl 7.83.1 - Git 2.36.1 @@ -68,14 +68,14 @@ - GNU Wget 1.21.3 - gpg (GnuPG) 2.3.6 - Hub CLI: 2.14.2 -- ImageMagick 7.1.0-37 +- ImageMagick 7.1.0-39 - jq 1.6 - mongo v5.0.7 - mongod v5.0.7 - OpenSSL 1.1.1o 3 May 2022 `(/usr/local/opt/openssl@1.1 -> ../Cellar/openssl@1.1/1.1.1o)` -- Packer 1.8.1 -- PostgreSQL 14.3 -- psql (PostgreSQL) 14.3 +- Packer 1.8.2 +- PostgreSQL 14.4 +- psql (PostgreSQL) 14.4 - Sox 14.4.2 - Subversion (SVN) 1.14.2 - Switchaudio-osx 1.1.0 @@ -85,9 +85,9 @@ ### Tools - App Center CLI 2.10.10 -- AWS CLI 2.7.7 +- AWS CLI 2.7.9 - AWS SAM CLI 1.52.0 -- AWS Session Manager CLI 1.2.331.0 +- AWS Session Manager CLI 1.2.339.0 - Azure CLI (azure-devops) 0.25.0 - Azure CLI 2.37.0 - Bicep CLI 0.7.4 @@ -98,7 +98,7 @@ - GHCup 0.1.17.8 - Jazzy 0.14.2 - Stack 2.7.5 -- SwiftFormat 0.49.9 +- SwiftFormat 0.49.10 - Swig 4.0.2 - Xcode Command Line Tools 13.4.0.0.1.1651278267 @@ -109,10 +109,10 @@ ### Browsers - Safari 15.5 (17613.2.7.1.8) - SafariDriver 15.5 (17613.2.7.1.8) -- Google Chrome 102.0.5005.115 +- Google Chrome 103.0.5060.53 - ChromeDriver 102.0.5005.61 -- Microsoft Edge 102.0.1245.41 -- Microsoft Edge WebDriver 102.0.1245.41 +- Microsoft Edge 102.0.1245.44 +- Microsoft Edge WebDriver 102.0.1245.44 - Mozilla Firefox 101.0.1 - geckodriver 0.31.0 - Selenium server 4.2.0 @@ -144,7 +144,7 @@ #### Python - 3.7.13 -- 3.8.12 +- 3.8.13 - 3.9.13 - 3.10.5 @@ -181,7 +181,7 @@ - Rustfmt 1.4.38-stable ### PowerShell Tools -- PowerShell 7.2.4 +- PowerShell 7.2.5 #### PowerShell Modules | Module | Version | @@ -192,17 +192,17 @@ | PSScriptAnalyzer | 1.20.0 | ### Web Servers -| Name | Version | ConfigFile | ServiceStatus | ListenPort | -| ----- | -------- | ------------------------------- | ------------- | ---------- | -| httpd | 2.4.54 | /usr/local/etc/httpd/httpd.conf | none | 80 | -| nginx | 1.21.6_1 | /usr/local/etc/nginx/nginx.conf | none | 80 | +| Name | Version | ConfigFile | ServiceStatus | ListenPort | +| ----- | ------- | ------------------------------- | ------------- | ---------- | +| httpd | 2.4.54 | /usr/local/etc/httpd/httpd.conf | none | 80 | +| nginx | 1.23.0 | /usr/local/etc/nginx/nginx.conf | none | 80 | ### Xamarin #### Visual Studio for Mac -| Version | Build | Path | -| -------------- | ---------- | ------------------------------------ | -| 2019 | 8.10.24.14 | /Applications/Visual Studio 2019.app | -| 2022 (default) | 17.0.3.21 | /Applications/Visual Studio.app | +| Version | Build | Path | +| -------------- | --------- | ------------------------------------ | +| 2019 | 8.10.25.2 | /Applications/Visual Studio 2019.app | +| 2022 (default) | 17.0.4.23 | /Applications/Visual Studio.app | ##### Notes: ``` @@ -214,6 +214,7 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" #### Xamarin bundles | symlink | Xamarin.Mono | Xamarin.iOS | Xamarin.Mac | Xamarin.Android | | ----------------- | ------------ | ----------- | ----------- | --------------- | +| 6_12_17 | 6.12 | 15.10 | 8.10 | 12.2 | | 6_12_16 (default) | 6.12 | 15.8 | 8.8 | 12.2 | | 6_12_15 | 6.12 | 15.8 | 8.8 | 12.1 | | 6_12_14 | 6.12 | 15.8 | 8.8 | 12.0 | From 1ede920d60d3a7f77937b888ea8ce5f156d4ce5c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 24 Jun 2022 11:29:53 +0000 Subject: [PATCH 1274/3485] Updating readme file for macOS-11 version 20220622.7 (#5805) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-11-Readme.md | 58 ++++++++++++++++----------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/images/macos/macos-11-Readme.md b/images/macos/macos-11-Readme.md index 9301e4747fa8..a310704894ea 100644 --- a/images/macos/macos-11-Readme.md +++ b/images/macos/macos-11-Readme.md @@ -1,7 +1,7 @@ # macOS 11.6 info - System Version: macOS 11.6.6 (20G624) - Kernel Version: Darwin 20.6.0 -- Image Version: 20220614.2 +- Image Version: 20220622.7 ## Installed Software ### Language and Runtime @@ -11,10 +11,10 @@ - Clang/LLVM 13.0.1 is available on `'$(brew --prefix llvm)/bin/clang'` - gcc-9 (Homebrew GCC 9.5.0) 9.5.0 - available by `gcc-9` alias - gcc-10 (Homebrew GCC 10.3.0) 10.3.0 - available by `gcc-10` alias -- gcc-11 (Homebrew GCC 11.3.0_1) 11.3.0 - available by `gcc-11` alias +- gcc-11 (Homebrew GCC 11.3.0_2) 11.3.0 - available by `gcc-11` alias - GNU Fortran (Homebrew GCC 9.5.0) 9.5.0 - available by `gfortran-9` alias - GNU Fortran (Homebrew GCC 10.3.0) 10.3.0 - available by `gfortran-10` alias -- GNU Fortran (Homebrew GCC 11.3.0_1) 11.3.0 - available by `gfortran-11` alias +- GNU Fortran (Homebrew GCC 11.3.0_2) 11.3.0 - available by `gfortran-11` alias - Go 1.17.11 - julia 1.7.3 - Kotlin 1.7.0-release-281 @@ -30,7 +30,7 @@ - Ruby 2.7.6p219 ### Package Management -- Bundler version 2.3.15 +- Bundler version 2.3.16 - Carthage 0.38.0 - CocoaPods 1.11.3 - Composer 2.3.7 @@ -42,7 +42,7 @@ - Pip 22.1.1 (python 3.9) - Pipx 1.1.0 - RubyGems 3.2.33 -- Vcpkg 2022 (build from master \<06acb79f7>) +- Vcpkg 2022 (build from master \<b0ea874c7>) - Yarn 1.22.19 #### Environment variables @@ -62,7 +62,7 @@ - aria2 1.36.0 - azcopy 10.15.0 - bazel 5.2.0 -- bazelisk 1.11.0 +- bazelisk 1.12.0 - bsdtar 3.3.2 - available by 'tar' alias - Curl 7.83.1 - Git 2.36.1 @@ -73,15 +73,15 @@ - gpg (GnuPG) 2.3.6 - helm v3.9.0+g7ceeda6 - Hub CLI: 2.14.2 -- ImageMagick 7.1.0-37 +- ImageMagick 7.1.0-39 - jq 1.6 - mongo v5.0.7 - mongod v5.0.7 - Newman 5.3.2 - OpenSSL 1.1.1o 3 May 2022 `(/usr/local/opt/openssl@1.1 -> ../Cellar/openssl@1.1/1.1.1o)` -- Packer 1.8.1 -- PostgreSQL 14.3 -- psql (PostgreSQL) 14.3 +- Packer 1.8.2 +- PostgreSQL 14.4 +- psql (PostgreSQL) 14.4 - Sox 14.4.2 - Subversion (SVN) 1.14.2 - Switchaudio-osx 1.1.0 @@ -89,11 +89,11 @@ - zstd 1.5.2 ### Tools -- Aliyun CLI 3.0.121 +- Aliyun CLI 3.0.123 - App Center CLI 2.10.10 -- AWS CLI 2.7.7 +- AWS CLI 2.7.9 - AWS SAM CLI 1.52.0 -- AWS Session Manager CLI 1.2.331.0 +- AWS Session Manager CLI 1.2.339.0 - Azure CLI (azure-devops) 0.25.0 - Azure CLI 2.37.0 - Bicep CLI 0.7.4 @@ -104,7 +104,7 @@ - GHCup 0.1.17.8 - Jazzy 0.14.2 - Stack 2.7.5 -- SwiftFormat 0.49.9 +- SwiftFormat 0.49.10 - Swig 4.0.2 - Xcode Command Line Tools 13.2.0.0.1.1638488800 @@ -115,10 +115,10 @@ ### Browsers - Safari 15.5 (16613.2.7.1.9) - SafariDriver 15.5 (16613.2.7.1.9) -- Google Chrome 102.0.5005.115 -- ChromeDriver 102.0.5005.61 -- Microsoft Edge 102.0.1245.41 -- Microsoft Edge WebDriver 102.0.1245.41 +- Google Chrome 103.0.5060.53 +- ChromeDriver 103.0.5060.53 +- Microsoft Edge 102.0.1245.44 +- Microsoft Edge WebDriver 102.0.1245.44 - Mozilla Firefox 101.0.1 - geckodriver 0.31.0 - Selenium server 4.2.0 @@ -126,7 +126,7 @@ #### Environment variables | Name | Value | | --------------- | ---------------------------------------------- | -| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/102.0.5005.61 | +| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/103.0.5060.53 | | EDGEWEBDRIVER | /usr/local/share/edge_driver | | GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | @@ -153,7 +153,7 @@ #### Python - 3.7.13 -- 3.8.12 +- 3.8.13 - 3.9.13 - 3.10.5 @@ -190,7 +190,7 @@ - Rustfmt 1.4.38-stable ### PowerShell Tools -- PowerShell 7.2.4 +- PowerShell 7.2.5 #### PowerShell Modules | Module | Version | @@ -201,17 +201,17 @@ | PSScriptAnalyzer | 1.20.0 | ### Web Servers -| Name | Version | ConfigFile | ServiceStatus | ListenPort | -| ----- | -------- | ------------------------------- | ------------- | ---------- | -| httpd | 2.4.54 | /usr/local/etc/httpd/httpd.conf | none | 80 | -| nginx | 1.21.6_1 | /usr/local/etc/nginx/nginx.conf | none | 80 | +| Name | Version | ConfigFile | ServiceStatus | ListenPort | +| ----- | ------- | ------------------------------- | ------------- | ---------- | +| httpd | 2.4.54 | /usr/local/etc/httpd/httpd.conf | none | 80 | +| nginx | 1.23.0 | /usr/local/etc/nginx/nginx.conf | none | 80 | ### Xamarin #### Visual Studio for Mac -| Version | Build | Path | -| -------------- | ---------- | ------------------------------------ | -| 2019 | 8.10.24.14 | /Applications/Visual Studio 2019.app | -| 2022 (default) | 17.0.3.21 | /Applications/Visual Studio.app | +| Version | Build | Path | +| -------------- | --------- | ------------------------------------ | +| 2019 | 8.10.25.2 | /Applications/Visual Studio 2019.app | +| 2022 (default) | 17.0.4.23 | /Applications/Visual Studio.app | ##### Notes: ``` From e40657de17dbd82f887b6fe1e027ea50219d0a72 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Mon, 27 Jun 2022 10:05:28 +0200 Subject: [PATCH 1275/3485] [Ubuntu] Enable systemd lingering (#5812) --- images/linux/post-generation/systemd-linger.sh | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 images/linux/post-generation/systemd-linger.sh diff --git a/images/linux/post-generation/systemd-linger.sh b/images/linux/post-generation/systemd-linger.sh new file mode 100644 index 000000000000..294c8f1ba502 --- /dev/null +++ b/images/linux/post-generation/systemd-linger.sh @@ -0,0 +1,5 @@ +#!/bin/bash + +# Enable user session on boot, not on login +UserId=$(cut -d: -f3 /etc/passwd | tail -1) +loginctl enable-linger $UserId From 5b652198feaf7db8c9d4d39a566fe541c121fed5 Mon Sep 17 00:00:00 2001 From: Sander Trijssenaar <sander@trijssenaar.net> Date: Mon, 27 Jun 2022 12:41:19 +0200 Subject: [PATCH 1276/3485] Removing mandatory VNET (#5821) --- images.CI/linux-and-win/build-image.ps1 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/images.CI/linux-and-win/build-image.ps1 b/images.CI/linux-and-win/build-image.ps1 index 932745d09f79..67a14db5a920 100644 --- a/images.CI/linux-and-win/build-image.ps1 +++ b/images.CI/linux-and-win/build-image.ps1 @@ -8,9 +8,9 @@ param( [String] [Parameter (Mandatory=$true)] $StorageAccount, [String] [Parameter (Mandatory=$true)] $SubscriptionId, [String] [Parameter (Mandatory=$true)] $TenantId, - [String] [Parameter (Mandatory=$true)] $VirtualNetworkName, - [String] [Parameter (Mandatory=$true)] $VirtualNetworkRG, - [String] [Parameter (Mandatory=$true)] $VirtualNetworkSubnet + [String] [Parameter (Mandatory=$false)] $VirtualNetworkName, + [String] [Parameter (Mandatory=$false)] $VirtualNetworkRG, + [String] [Parameter (Mandatory=$false)] $VirtualNetworkSubnet ) if (-not (Test-Path $TemplatePath)) From b495a035c4dc6970395b7345288cb7cf2acb96c7 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Tue, 28 Jun 2022 08:48:08 +0200 Subject: [PATCH 1277/3485] Update Clang/LLVM test to use absolute path (#5819) --- images/macos/tests/LLVM.Tests.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/macos/tests/LLVM.Tests.ps1 b/images/macos/tests/LLVM.Tests.ps1 index 0591d049a72c..2e371ef78fd0 100644 --- a/images/macos/tests/LLVM.Tests.ps1 +++ b/images/macos/tests/LLVM.Tests.ps1 @@ -3,7 +3,7 @@ $os = Get-OSVersion Describe "Clang/LLVM" { It "Clang/LLVM is installed and version is correct" { $toolsetVersion = Get-ToolsetValue 'llvm.version' - $clangVersion = & "$(brew --prefix llvm)/bin/clang" --version + $clangVersion = & "$(brew --prefix llvm@$toolsetVersion)/bin/clang" --version $clangVersion[0] | Should -BeLike "*${toolsetVersion}*" } } \ No newline at end of file From 2e10aa4cfd64f665e133fe292d0b7b4bbd0e00e1 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 28 Jun 2022 11:32:05 +0000 Subject: [PATCH 1278/3485] Updating readme file for ubuntu22 version 20220626.1 (#5827) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2204-Readme.md | 62 +++++++++++++++---------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/images/linux/Ubuntu2204-Readme.md b/images/linux/Ubuntu2204-Readme.md index da9407fa73ab..2181e302d0c9 100644 --- a/images/linux/Ubuntu2204-Readme.md +++ b/images/linux/Ubuntu2204-Readme.md @@ -1,11 +1,10 @@ | Announcements | |-| -| [[Ubuntu] AWS CLI on Ubuntu18 image will be upgraded to V2 on June 20](https://github.com/actions/virtual-environments/issues/5679) | | [(Public Beta) Ubuntu 22.04 is now available](https://github.com/actions/virtual-environments/issues/5490) | *** # Ubuntu 22.04 LTS -- Linux kernel version: 5.15.0-1012-azure -- Image Version: 20220619.1 +- Linux kernel version: 5.15.0-1013-azure +- Image Version: 20220626.1 ## Installed Software ### Language and Runtime @@ -13,6 +12,7 @@ - Clang 12.0.1, 13.0.1, 14.0.0 - Clang-format 12.0.1, 13.0.1, 14.0.0 - Clang-tidy 12.0.1, 13.0.1, 14.0.0 +- Dash 0.5.11+git20210903+057cd650a4ed-3build1 - GNU C++ 9.4.0, 10.3.0, 11.2.0 - GNU Fortran 9.4.0, 10.3.0, 11.2.0 - Julia 1.7.3 @@ -33,7 +33,7 @@ - Pip3 22.0.2 - Pipx 1.1.0 - RubyGems 3.3.5 -- Vcpkg (build from master \<b49b2bdf2>) +- Vcpkg (build from master \<c168ce4e7>) - Yarn 1.22.19 #### Environment variables @@ -43,10 +43,10 @@ | VCPKG_INSTALLATION_ROOT | /usr/local/share/vcpkg | ### Project Management -- Lerna 5.1.4 +- Lerna 5.1.6 ### Tools -- Ansible 2.12.6 +- Ansible 2.13.1 - apt-fast 1.9.12 - AzCopy 10.15.0 (available by `azcopy` and `azcopy10` aliases) - Bazel 5.2.0 @@ -54,7 +54,7 @@ - Bicep 0.7.4 - Buildah 1.23.1 - CMake 3.23.2 -- CodeQL Action Bundle 2.9.3 +- CodeQL Action Bundle 2.9.4 - Docker Amazon ECR Credential Helper 0.6.0 - Docker Compose v1 1.29.2 - Docker Compose v2 2.6.0+azure-1 @@ -74,35 +74,35 @@ - Leiningen 2.9.8 - MediaInfo 21.09 - Mercurial 6.1.1 -- Minikube 1.25.2 +- Minikube 1.26.0 - n 8.2.0 - Newman 5.3.2 - nvm 0.39.1 -- OpenSSL 3.0.2-0ubuntu1.2 -- Packer 1.8.1 -- Parcel 2.6.1 +- OpenSSL 3.0.2-0ubuntu1.5 +- Packer 1.8.2 +- Parcel 2.6.2 - Podman 3.4.4 -- Pulumi 3.34.1 +- Pulumi 3.35.1 - R 4.2.0 - Skopeo 1.4.1 - Sphinx Open Source Search Server 2.2.11 - SVN 1.14.1 - Terraform 1.2.3 - yamllint 1.26.3 -- yq 4.25.2 +- yq 4.25.3 - zstd 1.5.2 (homebrew) ### CLI Tools -- Alibaba Cloud CLI 3.0.122 -- AWS CLI 2.7.9 +- Alibaba Cloud CLI 3.0.124 +- AWS CLI 2.7.11 - AWS CLI Session manager plugin 1.2.339.0 - AWS SAM CLI 1.52.0 - Azure CLI (azure-cli) 2.37.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.25.0 -- GitHub CLI 2.12.1 +- GitHub CLI 2.13.0 - Google Cloud SDK 369.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 10.5.1 +- Netlify CLI 10.6.2 - OpenShift CLI 4.10.18 - ORAS CLI 0.12.0 - Vercel CLI 25.1.0 @@ -149,10 +149,10 @@ - Rustfmt 1.4.38 ### Browsers and Drivers -- Google Chrome 102.0.5005.115 -- ChromeDriver 102.0.5005.61 -- Chromium 102.0.5005.0 -- Selenium server 4.2.0 +- Google Chrome 103.0.5060.53 +- ChromeDriver 103.0.5060.53 +- Chromium 103.0.5060.0 +- Selenium server 4.3.0 #### Environment variables | Name | Value | @@ -200,7 +200,7 @@ #### Python - 3.7.13 -- 3.8.12 +- 3.8.13 - 3.9.13 - 3.10.5 @@ -214,13 +214,13 @@ | GOROOT_1_18_X64 | /opt/hostedtoolcache/go/1.18.3/x64 | x64 | ### PowerShell Tools -- PowerShell 7.2.4 +- PowerShell 7.2.5 #### PowerShell Modules | Module | Version | | ---------------- | ------- | | MarkdownPS | 1.9 | -| Microsoft.Graph | 1.9.6 | +| Microsoft.Graph | 1.10.0 | | Pester | 5.3.3 | | PSScriptAnalyzer | 1.20.0 | @@ -263,14 +263,14 @@ | ----------------------- | ------------------------------------------------------------------------ | ---------- | | alpine:3.14 | sha256:06b5d462c92fc39303e6363c65e074559f8d6b1363250027ed5053557e3398c5 | 2022-04-05 | | alpine:3.15 | sha256:4edbd2beb5f78b1014028f4fbb99f3237d9561100b6881aabbf5acce2c4f9454 | 2022-04-05 | -| buildpack-deps:bullseye | sha256:898c2264db514062f89391a9ae58e25bfcaa94d9fed04abf789a4abb53ee2fd6 | 2022-05-28 | -| buildpack-deps:buster | sha256:3a56627334c11ff56aa16fa7c8922cfc17d506fe41f9155e350b1e02edb0e77d | 2022-05-28 | -| debian:10 | sha256:e5b41ae2b4cf0d04b80cd2f89724e9cfc09e334ac64f188b9808929c748af526 | 2022-05-28 | -| debian:11 | sha256:3f1d6c17773a45c97bd8f158d665c9709d7b29ed7917ac934086ad96f92e4510 | 2022-05-28 | +| buildpack-deps:bullseye | sha256:7a78a5f716dd32b0eb89876f8c5cf5e443781a44b7fe12619e897bad9a642e14 | 2022-06-23 | +| buildpack-deps:buster | sha256:7f9a157d07e0a81a4e3130ce1490142b208155e09d1c3459b4213a5779e87546 | 2022-06-23 | +| debian:10 | sha256:9740683722a2a8aa497a5b23e4bc229fcf8b8991e26d3935540c7704ff24012e | 2022-06-23 | +| debian:11 | sha256:859ea45db307402ee024b153c7a63ad4888eb4751921abbef68679fc73c4c739 | 2022-06-23 | | moby/buildkit:latest | sha256:0dc312b04eac1b44cd2cad566deb1e886c753109208affbbec8384f381ff7f38 | 2022-05-06 | -| node:14 | sha256:3324c688c0e98888f8938509f35356acf69a3e1f9f385d85f7e6086b137c17e3 | 2022-05-28 | +| node:14 | sha256:ce156f9b2e9dbe73139cf0619a71188960e6c9eaba0ff832a5dfa0febf9eee27 | 2022-06-23 | | node:14-alpine | sha256:6b87d16e4ce20cacd6f1f662f66c821e4c3c41c2903daeace52d818ec3f4bbdd | 2022-06-07 | -| node:16 | sha256:6155ff062c403e99c1da7c317710c5c838c1e060f526d98baea6ee921ca61729 | 2022-06-06 | +| node:16 | sha256:a13d2d2aec7f0dae18a52ca4d38b592e45a45cc4456ffab82e5ff10d8a53d042 | 2022-06-23 | | node:16-alpine | sha256:c785e617c8d7015190c0d41af52cc69be8a16e3d9eb7cb21f0bb58bcfca14d6b | 2022-06-07 | | ubuntu:18.04 | sha256:478caf1bec1afd54a58435ec681c8755883b7eb843a8630091890130b15a79af | 2022-06-06 | | ubuntu:20.04 | sha256:fd92c36d3cb9b1d027c4d2a72c6bf0125da82425fc2ca37c414d4f010180dc19 | 2022-06-06 | @@ -317,7 +317,7 @@ | libmagickwand-dev | 8:6.9.11.60+dfsg-1.3build2 | | libsecret-1-dev | 0.20.5-2 | | libsqlite3-dev | 3.37.2-2 | -| libssl-dev | 3.0.2-0ubuntu1.2 | +| libssl-dev | 3.0.2-0ubuntu1.5 | | libtool | 2.4.6-15build2 | | libunwind8 | 1.3.2-2build2 | | libxkbfile-dev | 1:1.1.0-1build3 | From 6d1b6d0d02f37e34db40922c0c270c0d048c9f5d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 28 Jun 2022 13:46:57 +0000 Subject: [PATCH 1279/3485] Updating readme file for ubuntu18 version 20220626.1 (#5825) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu1804-Readme.md | 64 +++++++++++++++---------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/images/linux/Ubuntu1804-Readme.md b/images/linux/Ubuntu1804-Readme.md index 3fd1cae109fa..bb90451bafb5 100644 --- a/images/linux/Ubuntu1804-Readme.md +++ b/images/linux/Ubuntu1804-Readme.md @@ -1,11 +1,10 @@ | Announcements | |-| -| [[Ubuntu] AWS CLI on Ubuntu18 image will be upgraded to V2 on June 20](https://github.com/actions/virtual-environments/issues/5679) | | [(Public Beta) Ubuntu 22.04 is now available](https://github.com/actions/virtual-environments/issues/5490) | *** # Ubuntu 18.04.6 LTS - Linux kernel version: 5.4.0-1085-azure -- Image Version: 20220619.1 +- Image Version: 20220626.1 ## Installed Software ### Language and Runtime @@ -13,7 +12,8 @@ - Clang 9.0.0 - Clang-format 9.0.0 - Clang-tidy 9.0.0 -- Erlang 25.0.1 (Eshell 13.0.1) +- Dash 0.5.8-2.10 +- Erlang 25.0.2 (Eshell 13.0.2) - Erlang rebar3 3.19.0 - GNU C++ 7.5.0, 9.4.0, 10.3.0 - GNU Fortran 7.5.0, 9.4.0, 10.3.0 @@ -26,7 +26,7 @@ - Python 2.7.17 - Python3 3.6.9 - Ruby 2.5.1p57 -- Swift 5.6.1 +- Swift 5.6.2 ### Package Management - cpan 1.64 @@ -38,7 +38,7 @@ - Pip3 9.0.1 - Pipx 1.0.0 - RubyGems 2.7.6 -- Vcpkg (build from master \<b49b2bdf2>) +- Vcpkg (build from master \<c168ce4e7>) - Yarn 1.22.19 #### Environment variables @@ -62,7 +62,7 @@ - Bicep 0.7.4 - Buildah 1.22.3 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - CMake 3.23.2 -- CodeQL Action Bundle 2.9.3 +- CodeQL Action Bundle 2.9.4 - Docker Amazon ECR Credential Helper 0.6.0 - Docker Compose v1 1.29.2 - Docker Compose v2 2.6.0+azure-1 @@ -74,7 +74,7 @@ - Git-ftp 1.3.1 - Haveged 1.9.1 - Heroku 7.60.2 -- HHVM (HipHop VM) 4.162.0 +- HHVM (HipHop VM) 4.163.0 - jq 1.5 - Kind 0.14.0 - Kubectl 1.24.2 @@ -82,36 +82,36 @@ - Leiningen 2.9.8 - MediaInfo 17.12 - Mercurial 4.5.3 -- Minikube 1.25.2 +- Minikube 1.26.0 - n 8.2.0 - Newman 5.3.2 - nvm 0.39.1 -- OpenSSL 1.1.1-1ubuntu2.1~18.04.17 -- Packer 1.8.1 -- Parcel 2.6.1 +- OpenSSL 1.1.1-1ubuntu2.1~18.04.19 +- Packer 1.8.2 +- Parcel 2.6.2 - PhantomJS 2.1.1 - Podman 3.4.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- Pulumi 3.34.1 +- Pulumi 3.35.1 - R 4.2.0 - Skopeo 1.5.0 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 - SVN 1.9.7 - Terraform 1.2.3 - yamllint 1.26.3 -- yq 4.25.2 +- yq 4.25.3 - zstd 1.5.2 (homebrew) ### CLI Tools -- Alibaba Cloud CLI 3.0.122 -- AWS CLI 2.7.9 +- Alibaba Cloud CLI 3.0.124 +- AWS CLI 2.7.11 - AWS CLI Session manager plugin 1.2.339.0 - AWS SAM CLI 1.52.0 - Azure CLI (azure-cli) 2.37.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.25.0 -- GitHub CLI 2.12.1 +- GitHub CLI 2.13.0 - Google Cloud SDK 369.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 10.5.1 +- Netlify CLI 10.6.2 - OpenShift CLI 4.10.18 - ORAS CLI 0.12.0 - Vercel CLI 25.1.0 @@ -154,10 +154,10 @@ - Rustfmt 1.4.38 ### Browsers and Drivers -- Google Chrome 102.0.5005.115 -- ChromeDriver 102.0.5005.61 -- Chromium 102.0.5005.0 -- Selenium server 4.2.0 +- Google Chrome 103.0.5060.53 +- ChromeDriver 103.0.5060.53 +- Chromium 103.0.5060.0 +- Selenium server 4.3.0 - Mozilla Firefox 101.0.1 - Geckodriver 0.31.0 @@ -216,7 +216,7 @@ - 2.7.18 - 3.6.15 - 3.7.13 -- 3.8.12 +- 3.8.13 - 3.9.13 - 3.10.5 @@ -236,13 +236,13 @@ | GOROOT_1_18_X64 | /opt/hostedtoolcache/go/1.18.3/x64 | x64 | ### PowerShell Tools -- PowerShell 7.2.4 +- PowerShell 7.2.5 #### PowerShell Modules | Module | Version | | --------------- | ------- | | MarkdownPS | 1.9 | -| Microsoft.Graph | 1.9.6 | +| Microsoft.Graph | 1.10.0 | | Pester | 5.3.3 | #### Az PowerShell Modules @@ -286,18 +286,18 @@ | alpine:3.12 | sha256:c75ac27b49326926b803b9ed43bf088bc220d22556de1bc5f72d742c91398f69 | 2022-04-05 | | alpine:3.13 | sha256:ccf92aa53bc6c3b25be2ad0cce80baec1778f007f7e076b0ffbd1b225d0b3a9b | 2022-04-05 | | alpine:3.14 | sha256:06b5d462c92fc39303e6363c65e074559f8d6b1363250027ed5053557e3398c5 | 2022-04-05 | -| buildpack-deps:bullseye | sha256:898c2264db514062f89391a9ae58e25bfcaa94d9fed04abf789a4abb53ee2fd6 | 2022-05-28 | -| buildpack-deps:buster | sha256:3a56627334c11ff56aa16fa7c8922cfc17d506fe41f9155e350b1e02edb0e77d | 2022-05-28 | -| buildpack-deps:stretch | sha256:a87bd91f037696862c341a73f6607cfb5d462ffcec16de34f59bab0f21b61868 | 2022-05-28 | -| debian:10 | sha256:e5b41ae2b4cf0d04b80cd2f89724e9cfc09e334ac64f188b9808929c748af526 | 2022-05-28 | -| debian:11 | sha256:3f1d6c17773a45c97bd8f158d665c9709d7b29ed7917ac934086ad96f92e4510 | 2022-05-28 | -| debian:9 | sha256:22cb208880101b9a665332a9360ba4c5c021e3ed2f791638369e9a9418dac981 | 2022-05-28 | +| buildpack-deps:bullseye | sha256:7a78a5f716dd32b0eb89876f8c5cf5e443781a44b7fe12619e897bad9a642e14 | 2022-06-23 | +| buildpack-deps:buster | sha256:7f9a157d07e0a81a4e3130ce1490142b208155e09d1c3459b4213a5779e87546 | 2022-06-23 | +| buildpack-deps:stretch | sha256:78e995165a5788c2f55aed6e548d8f6c1534830d4310c870408fccb2da8c5b2e | 2022-06-23 | +| debian:10 | sha256:9740683722a2a8aa497a5b23e4bc229fcf8b8991e26d3935540c7704ff24012e | 2022-06-23 | +| debian:11 | sha256:859ea45db307402ee024b153c7a63ad4888eb4751921abbef68679fc73c4c739 | 2022-06-23 | +| debian:9 | sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be | 2022-06-23 | | moby/buildkit:latest | sha256:0dc312b04eac1b44cd2cad566deb1e886c753109208affbbec8384f381ff7f38 | 2022-05-06 | | node:12 | sha256:01627afeb110b3054ba4a1405541ca095c8bfca1cb6f2be9479c767a2711879e | 2022-04-20 | | node:12-alpine | sha256:d4b15b3d48f42059a15bd659be60afe21762aae9d6cbea6f124440895c27db68 | 2022-04-11 | -| node:14 | sha256:3324c688c0e98888f8938509f35356acf69a3e1f9f385d85f7e6086b137c17e3 | 2022-05-28 | +| node:14 | sha256:ce156f9b2e9dbe73139cf0619a71188960e6c9eaba0ff832a5dfa0febf9eee27 | 2022-06-23 | | node:14-alpine | sha256:6b87d16e4ce20cacd6f1f662f66c821e4c3c41c2903daeace52d818ec3f4bbdd | 2022-06-07 | -| node:16 | sha256:6155ff062c403e99c1da7c317710c5c838c1e060f526d98baea6ee921ca61729 | 2022-06-06 | +| node:16 | sha256:a13d2d2aec7f0dae18a52ca4d38b592e45a45cc4456ffab82e5ff10d8a53d042 | 2022-06-23 | | node:16-alpine | sha256:c785e617c8d7015190c0d41af52cc69be8a16e3d9eb7cb21f0bb58bcfca14d6b | 2022-06-07 | | ubuntu:16.04 | sha256:20858ebbc96215d6c3c574f781133ebffdc7c18d98af4f294cc4c04871a6fe61 | 2021-08-31 | | ubuntu:18.04 | sha256:478caf1bec1afd54a58435ec681c8755883b7eb843a8630091890130b15a79af | 2022-06-06 | From 3482f716a3c6c64023959a7c30d58a2727aa5178 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 28 Jun 2022 14:33:59 +0000 Subject: [PATCH 1280/3485] Updating readme file for ubuntu20 version 20220626.1 (#5828) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2004-Readme.md | 68 +++++++++++++++---------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/images/linux/Ubuntu2004-Readme.md b/images/linux/Ubuntu2004-Readme.md index 3de1036c7336..1852bd839a8b 100644 --- a/images/linux/Ubuntu2004-Readme.md +++ b/images/linux/Ubuntu2004-Readme.md @@ -1,11 +1,10 @@ | Announcements | |-| -| [[Ubuntu] AWS CLI on Ubuntu18 image will be upgraded to V2 on June 20](https://github.com/actions/virtual-environments/issues/5679) | | [(Public Beta) Ubuntu 22.04 is now available](https://github.com/actions/virtual-environments/issues/5490) | *** # Ubuntu 20.04.4 LTS - Linux kernel version: 5.13.0-1031-azure -- Image Version: 20220619.1 +- Image Version: 20220626.1 ## Installed Software ### Language and Runtime @@ -13,7 +12,8 @@ - Clang 10.0.0, 11.0.0, 12.0.0 - Clang-format 10.0.0, 11.0.0, 12.0.0 - Clang-tidy 10.0.0, 11.0.0, 12.0.0 -- Erlang 25.0.1 (Eshell 13.0.1) +- Dash 0.5.10.2-6 +- Erlang 25.0.2 (Eshell 13.0.2) - Erlang rebar3 3.19.0 - GNU C++ 9.4.0, 10.3.0 - GNU Fortran 9.4.0, 10.3.0 @@ -26,7 +26,7 @@ - Python 3.8.10 - Python3 3.8.10 - Ruby 2.7.0p0 -- Swift 5.6.1 +- Swift 5.6.2 ### Package Management - cpan 1.64 @@ -38,7 +38,7 @@ - Pip3 20.0.2 - Pipx 1.1.0 - RubyGems 3.1.2 -- Vcpkg (build from master \<b49b2bdf2>) +- Vcpkg (build from master \<c168ce4e7>) - Yarn 1.22.19 #### Environment variables @@ -50,12 +50,12 @@ ### Project Management - Ant 1.10.7 - Gradle 7.4.2 -- Lerna 5.1.4 +- Lerna 5.1.6 - Maven 3.8.6 - Sbt 1.6.2 ### Tools -- Ansible 2.12.6 +- Ansible 2.13.1 - apt-fast 1.9.12 - AzCopy 10.15.0 (available by `azcopy` and `azcopy10` aliases) - Bazel 5.2.0 @@ -63,7 +63,7 @@ - Bicep 0.7.4 - Buildah 1.22.3 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - CMake 3.23.2 -- CodeQL Action Bundle 2.9.3 +- CodeQL Action Bundle 2.9.4 - Docker Amazon ECR Credential Helper 0.6.0 - Docker Compose v1 1.29.2 - Docker Compose v2 2.6.0+azure-1 @@ -76,7 +76,7 @@ - Git-ftp 1.6.0 - Haveged 1.9.1 - Heroku 7.60.2 -- HHVM (HipHop VM) 4.162.0 +- HHVM (HipHop VM) 4.163.0 - jq 1.6 - Kind 0.14.0 - Kubectl 1.24.2 @@ -84,36 +84,36 @@ - Leiningen 2.9.8 - MediaInfo 19.09 - Mercurial 5.3.1 -- Minikube 1.25.2 +- Minikube 1.26.0 - n 8.2.0 - Newman 5.3.2 - nvm 0.39.1 -- OpenSSL 1.1.1f-1ubuntu2.13 -- Packer 1.8.1 -- Parcel 2.6.1 +- OpenSSL 1.1.1f-1ubuntu2.15 +- Packer 1.8.2 +- Parcel 2.6.2 - PhantomJS 2.1.1 - Podman 3.4.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- Pulumi 3.34.1 +- Pulumi 3.35.1 - R 4.2.0 - Skopeo 1.5.0 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 - Terraform 1.2.3 - yamllint 1.26.3 -- yq 4.25.2 +- yq 4.25.3 - zstd 1.5.2 (homebrew) ### CLI Tools -- Alibaba Cloud CLI 3.0.122 -- AWS CLI 2.7.9 +- Alibaba Cloud CLI 3.0.124 +- AWS CLI 2.7.11 - AWS CLI Session manager plugin 1.2.339.0 - AWS SAM CLI 1.52.0 - Azure CLI (azure-cli) 2.37.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.25.0 -- GitHub CLI 2.12.1 +- GitHub CLI 2.13.0 - Google Cloud SDK 369.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 10.5.1 +- Netlify CLI 10.6.2 - OpenShift CLI 4.10.18 - ORAS CLI 0.12.0 - Vercel CLI 25.1.0 @@ -160,10 +160,10 @@ - Rustfmt 1.4.38 ### Browsers and Drivers -- Google Chrome 102.0.5005.115 -- ChromeDriver 102.0.5005.61 -- Chromium 102.0.5005.0 -- Selenium server 4.2.0 +- Google Chrome 103.0.5060.53 +- ChromeDriver 103.0.5060.53 +- Chromium 103.0.5060.0 +- Selenium server 4.3.0 - Mozilla Firefox 101.0.1 - Geckodriver 0.31.0 @@ -224,7 +224,7 @@ - 2.7.18 - 3.6.15 - 3.7.13 -- 3.8.12 +- 3.8.13 - 3.9.13 - 3.10.5 @@ -243,13 +243,13 @@ | GOROOT_1_18_X64 | /opt/hostedtoolcache/go/1.18.3/x64 | x64 | ### PowerShell Tools -- PowerShell 7.2.4 +- PowerShell 7.2.5 #### PowerShell Modules | Module | Version | | ---------------- | ------- | | MarkdownPS | 1.9 | -| Microsoft.Graph | 1.9.6 | +| Microsoft.Graph | 1.10.0 | | Pester | 5.3.3 | | PSScriptAnalyzer | 1.20.0 | @@ -294,18 +294,18 @@ | alpine:3.12 | sha256:c75ac27b49326926b803b9ed43bf088bc220d22556de1bc5f72d742c91398f69 | 2022-04-05 | | alpine:3.13 | sha256:ccf92aa53bc6c3b25be2ad0cce80baec1778f007f7e076b0ffbd1b225d0b3a9b | 2022-04-05 | | alpine:3.14 | sha256:06b5d462c92fc39303e6363c65e074559f8d6b1363250027ed5053557e3398c5 | 2022-04-05 | -| buildpack-deps:bullseye | sha256:898c2264db514062f89391a9ae58e25bfcaa94d9fed04abf789a4abb53ee2fd6 | 2022-05-28 | -| buildpack-deps:buster | sha256:3a56627334c11ff56aa16fa7c8922cfc17d506fe41f9155e350b1e02edb0e77d | 2022-05-28 | -| buildpack-deps:stretch | sha256:a87bd91f037696862c341a73f6607cfb5d462ffcec16de34f59bab0f21b61868 | 2022-05-28 | -| debian:10 | sha256:e5b41ae2b4cf0d04b80cd2f89724e9cfc09e334ac64f188b9808929c748af526 | 2022-05-28 | -| debian:11 | sha256:3f1d6c17773a45c97bd8f158d665c9709d7b29ed7917ac934086ad96f92e4510 | 2022-05-28 | -| debian:9 | sha256:22cb208880101b9a665332a9360ba4c5c021e3ed2f791638369e9a9418dac981 | 2022-05-28 | +| buildpack-deps:bullseye | sha256:7a78a5f716dd32b0eb89876f8c5cf5e443781a44b7fe12619e897bad9a642e14 | 2022-06-23 | +| buildpack-deps:buster | sha256:7f9a157d07e0a81a4e3130ce1490142b208155e09d1c3459b4213a5779e87546 | 2022-06-23 | +| buildpack-deps:stretch | sha256:78e995165a5788c2f55aed6e548d8f6c1534830d4310c870408fccb2da8c5b2e | 2022-06-23 | +| debian:10 | sha256:9740683722a2a8aa497a5b23e4bc229fcf8b8991e26d3935540c7704ff24012e | 2022-06-23 | +| debian:11 | sha256:859ea45db307402ee024b153c7a63ad4888eb4751921abbef68679fc73c4c739 | 2022-06-23 | +| debian:9 | sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be | 2022-06-23 | | moby/buildkit:latest | sha256:0dc312b04eac1b44cd2cad566deb1e886c753109208affbbec8384f381ff7f38 | 2022-05-06 | | node:12 | sha256:01627afeb110b3054ba4a1405541ca095c8bfca1cb6f2be9479c767a2711879e | 2022-04-20 | | node:12-alpine | sha256:d4b15b3d48f42059a15bd659be60afe21762aae9d6cbea6f124440895c27db68 | 2022-04-11 | -| node:14 | sha256:3324c688c0e98888f8938509f35356acf69a3e1f9f385d85f7e6086b137c17e3 | 2022-05-28 | +| node:14 | sha256:ce156f9b2e9dbe73139cf0619a71188960e6c9eaba0ff832a5dfa0febf9eee27 | 2022-06-23 | | node:14-alpine | sha256:6b87d16e4ce20cacd6f1f662f66c821e4c3c41c2903daeace52d818ec3f4bbdd | 2022-06-07 | -| node:16 | sha256:6155ff062c403e99c1da7c317710c5c838c1e060f526d98baea6ee921ca61729 | 2022-06-06 | +| node:16 | sha256:a13d2d2aec7f0dae18a52ca4d38b592e45a45cc4456ffab82e5ff10d8a53d042 | 2022-06-23 | | node:16-alpine | sha256:c785e617c8d7015190c0d41af52cc69be8a16e3d9eb7cb21f0bb58bcfca14d6b | 2022-06-07 | | ubuntu:16.04 | sha256:20858ebbc96215d6c3c574f781133ebffdc7c18d98af4f294cc4c04871a6fe61 | 2021-08-31 | | ubuntu:18.04 | sha256:478caf1bec1afd54a58435ec681c8755883b7eb843a8630091890130b15a79af | 2022-06-06 | From adff5b464976d1aff98f9fa8ab35722d022b74e3 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Tue, 28 Jun 2022 17:54:57 +0200 Subject: [PATCH 1281/3485] Add llvm brew version (#5834) --- images/macos/software-report/SoftwareReport.Common.psm1 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/images/macos/software-report/SoftwareReport.Common.psm1 b/images/macos/software-report/SoftwareReport.Common.psm1 index ebed0576e2c1..56d68f6e161f 100644 --- a/images/macos/software-report/SoftwareReport.Common.psm1 +++ b/images/macos/software-report/SoftwareReport.Common.psm1 @@ -96,7 +96,8 @@ function Get-FortranVersion { } function Get-ClangLLVMVersion { - $locationsList = @("$((Get-Command clang).Source)", '$(brew --prefix llvm)/bin/clang') + $toolsetVersion = '$(brew --prefix llvm@{0})/bin/clang' -f (Get-ToolsetValue 'llvm.version') + $locationsList = @("$((Get-Command clang).Source)", $toolsetVersion) $locationsList | Foreach-Object { (Run-Command "${_} --version" | Out-String) -match "(?<version>\d+\.\d+\.\d+)" | Out-Null $version = $Matches.version From baa8144439cccb0ad62e1222ac0c282a2d429811 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Tue, 28 Jun 2022 22:37:33 +0400 Subject: [PATCH 1282/3485] Remove workaround for Mono download url (#5839) --- images/macos/provision/utils/xamarin-utils.sh | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/images/macos/provision/utils/xamarin-utils.sh b/images/macos/provision/utils/xamarin-utils.sh index f298d4959e7b..d52c83a1a10e 100644 --- a/images/macos/provision/utils/xamarin-utils.sh +++ b/images/macos/provision/utils/xamarin-utils.sh @@ -19,11 +19,7 @@ buildVSMacDownloadUrl() { } buildMonoDownloadUrl() { -if [[ $1 -eq 6.12.0.182 ]]; then - echo "https://download.mono-project.com/archive/6.12.0/macos-10-universal/MonoFramework-MDK-${1}.macos10.xamarin.universal.pkg" -else - echo "https://dl.xamarin.com/MonoFrameworkMDK/Macx86/MonoFramework-MDK-${1}.macos10.xamarin.universal.pkg" -fi + echo "https://dl.xamarin.com/MonoFrameworkMDK/Macx86/MonoFramework-MDK-${1}.macos10.xamarin.universal.pkg" } buildXamariniIOSDownloadUrl() { From 45da727c67d0c9b4532ccc1273b81ea46af6eb31 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 29 Jun 2022 09:52:43 +0000 Subject: [PATCH 1283/3485] macOS 12 (20220627 update) (#5833) * Updating readme file for macOS-12 version 20220627.3 * Update link to llvm@13 Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-12-Readme.md | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/images/macos/macos-12-Readme.md b/images/macos/macos-12-Readme.md index 2f1444196a5d..4280623922fa 100644 --- a/images/macos/macos-12-Readme.md +++ b/images/macos/macos-12-Readme.md @@ -1,13 +1,13 @@ # macOS 12.4 info - System Version: macOS 12.4 (21F79) - Kernel Version: Darwin 21.5.0 -- Image Version: 20220622.2 +- Image Version: 20220627.3 ## Installed Software ### Language and Runtime - .NET SDK 3.1.101 3.1.201 3.1.302 3.1.420 5.0.102 5.0.202 5.0.302 5.0.408 - Bash 3.2.57(1)-release -- Clang/LLVM 13.0.1 is available on `'$(brew --prefix llvm)/bin/clang'` +- Clang/LLVM 13.1.6 is available on `'$(brew --prefix llvm@13)/bin/clang'` - Clang/LLVM 13.1.6 is default - gcc-11 (Homebrew GCC 11.3.0_2) 11.3.0 - available by `gcc-11` alias - GNU Fortran (Homebrew GCC 11.3.0_2) 11.3.0 - available by `gfortran-11` alias @@ -22,7 +22,7 @@ - PHP 8.1.7 - Python 2.7.18 - Python 3.9.13 -- R 4.2.0 +- R 4.2.1 - Ruby 3.0.4p208 ### Package Management @@ -38,7 +38,7 @@ - Pip 22.1.1 (python 3.9) - Pipx 1.1.0 - RubyGems 3.2.33 -- Vcpkg 2022 (build from master \<5241c59aa>) +- Vcpkg 2022 (build from master \<320059c01>) - Yarn 1.22.19 #### Environment variables @@ -60,10 +60,10 @@ - bazel 5.2.0 - bazelisk 1.12.0 - bsdtar 3.5.1 - available by 'tar' alias -- Curl 7.83.1 +- Curl 7.84.0 - Git 2.36.1 - Git LFS: 3.2.0 -- GitHub CLI: 2.12.1 +- GitHub CLI: 2.13.0 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.3 - gpg (GnuPG) 2.3.6 @@ -72,7 +72,7 @@ - jq 1.6 - mongo v5.0.7 - mongod v5.0.7 -- OpenSSL 1.1.1o 3 May 2022 `(/usr/local/opt/openssl@1.1 -> ../Cellar/openssl@1.1/1.1.1o)` +- OpenSSL 1.1.1p 21 Jun 2022 `(/usr/local/opt/openssl@1.1 -> ../Cellar/openssl@1.1/1.1.1p)` - Packer 1.8.2 - PostgreSQL 14.4 - psql (PostgreSQL) 14.4 @@ -80,12 +80,12 @@ - Subversion (SVN) 1.14.2 - Switchaudio-osx 1.1.0 - VirtualBox 6.1.34r150636 -- yq (https://github.com/mikefarah/yq/) version 4.25.2 +- yq (https://github.com/mikefarah/yq/) version 4.25.3 - zstd 1.5.2 ### Tools - App Center CLI 2.10.10 -- AWS CLI 2.7.9 +- AWS CLI 2.7.11 - AWS SAM CLI 1.52.0 - AWS Session Manager CLI 1.2.339.0 - Azure CLI (azure-devops) 0.25.0 @@ -98,7 +98,7 @@ - GHCup 0.1.17.8 - Jazzy 0.14.2 - Stack 2.7.5 -- SwiftFormat 0.49.10 +- SwiftFormat 0.49.11 - Swig 4.0.2 - Xcode Command Line Tools 13.4.0.0.1.1651278267 @@ -110,17 +110,17 @@ - Safari 15.5 (17613.2.7.1.8) - SafariDriver 15.5 (17613.2.7.1.8) - Google Chrome 103.0.5060.53 -- ChromeDriver 102.0.5005.61 -- Microsoft Edge 102.0.1245.44 -- Microsoft Edge WebDriver 102.0.1245.44 +- ChromeDriver 103.0.5060.53 +- Microsoft Edge 103.0.1264.37 +- Microsoft Edge WebDriver 103.0.1264.37 - Mozilla Firefox 101.0.1 - geckodriver 0.31.0 -- Selenium server 4.2.0 +- Selenium server 4.3.0 #### Environment variables | Name | Value | | --------------- | ---------------------------------------------- | -| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/102.0.5005.61 | +| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/103.0.5060.53 | | EDGEWEBDRIVER | /usr/local/share/edge_driver | | GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | From 02d4539cae0356837308326f3f8b49ab74d839d7 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Wed, 29 Jun 2022 15:46:22 +0200 Subject: [PATCH 1284/3485] [Windows] Add WDK on Windows Server 2022 without VSIX (#5838) * Add WDK on Windows Server 2022 without VSIX * Fix extension names --- images/win/scripts/Installers/Install-WDK.ps1 | 31 ++++++++++++------- .../SoftwareReport.VisualStudio.psm1 | 19 ++++++++---- images/win/scripts/Tests/WDK.Tests.ps1 | 20 ++++++------ images/win/toolsets/toolset-2022.json | 5 +++ images/win/windows2022.json | 1 + 5 files changed, 49 insertions(+), 27 deletions(-) diff --git a/images/win/scripts/Installers/Install-WDK.ps1 b/images/win/scripts/Installers/Install-WDK.ps1 index 139f50c13c13..9528be45602a 100644 --- a/images/win/scripts/Installers/Install-WDK.ps1 +++ b/images/win/scripts/Installers/Install-WDK.ps1 @@ -4,34 +4,41 @@ ################################################################################ # Requires Windows SDK with the same version number as the WDK -if (Test-IsWin19) -{ +if (Test-IsWin22) { + # SDK available through Visual Studio + $wdkUrl = "https://go.microsoft.com/fwlink/?linkid=2196230" + $FilePath = "C:\Program Files (x86)\Windows Kits\10\Vsix\VS2022\*\WDK.vsix" + $VSver = "2022" +} elseif (Test-IsWin19) { $winSdkUrl = "https://go.microsoft.com/fwlink/?linkid=2173743" $wdkUrl = "https://go.microsoft.com/fwlink/?linkid=2166289" $FilePath = "C:\Program Files (x86)\Windows Kits\10\Vsix\VS2019\WDK.vsix" $VSver = "2019" -} -elseif (Test-IsWin16) -{ +} elseif (Test-IsWin16) { $winSdkUrl = "https://go.microsoft.com/fwlink/p/?LinkID=2023014" $wdkUrl = "https://go.microsoft.com/fwlink/?linkid=2026156" $FilePath = "C:\Program Files (x86)\Windows Kits\10\Vsix\WDK.vsix" $VSver = "2017" -} -else -{ - throw "Invalid version of Visual Studio is found. Either 2017 or 2019 are required" +} else { + throw "Invalid version of Visual Studio is found. Either 2017,2019 or 2022 are required" } $argumentList = ("/features", "+", "/quiet") -# `winsdksetup.exe /features + /quiet` installs all features without showing the GUI -Install-Binary -Url $winSdkUrl -Name "winsdksetup.exe" -ArgumentList $argumentList +if ((Test-IsWin16) -or (Test-IsWin19)) { + # `winsdksetup.exe /features + /quiet` installs all features without showing the GUI + Install-Binary -Url $winSdkUrl -Name "winsdksetup.exe" -ArgumentList $argumentList +} # `wdksetup.exe /features + /quiet` installs all features without showing the GUI Install-Binary -Url $wdkUrl -Name "wdksetup.exe" -ArgumentList $argumentList # Need to install the VSIX to get the build targets when running VSBuild -Install-VsixExtension -FilePath $FilePath -Name "WDK.vsix" -VSversion $VSver -InstallOnly +# Windows 2022 - Skip installation due to a regression +# https://docs.microsoft.com/en-us/windows-hardware/drivers/download-the-wdk +if ((Test-IsWin16) -or (Test-IsWin19)) { + $FilePath = Resolve-Path -Path $FilePath + Install-VsixExtension -FilePath $FilePath -Name "WDK.vsix" -VSversion $VSver -InstallOnly +} Invoke-PesterTests -TestFile "WDK" diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.VisualStudio.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.VisualStudio.psm1 index b085433c3297..a29f7e8c9707 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.VisualStudio.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.VisualStudio.psm1 @@ -54,9 +54,9 @@ function Get-VisualStudioExtensions { # SDK if (Test-IsWin19) { - $sdkPackageVersion = Get-SDKVersion + $sdkVersion = Get-SDKVersion $sdkPackages = @( - @{Package = 'Windows Software Development Kit Extension'; Version = $sdkPackageVersion} + @{Package = 'Windows Software Development Kit'; Version = $sdkVersion} ) } @@ -68,14 +68,21 @@ function Get-VisualStudioExtensions { ) # WDK - $wdkPackageVersion = Get-VSExtensionVersion -packageName 'Microsoft.Windows.DriverKit' - $wdkExtensionVersion = Get-WDKVersion + $wdkVersion = Get-WDKVersion + $wdkExtensionVersion = Get-VSExtensionVersion -packageName 'Microsoft.Windows.DriverKit' $wdkPackages = @( - @{Package = 'Windows Driver Kit'; Version = $wdkPackageVersion} + @{Package = 'Windows Driver Kit'; Version = $wdkVersion} @{Package = 'Windows Driver Kit Visual Studio Extension'; Version = $wdkExtensionVersion} ) } - + + if (Test-IsWin22) { + # WDK + $wdkVersion = Get-WDKVersion + $wdkPackages = @( + @{Package = 'Windows Driver Kit'; Version = $wdkVersion} + ) + } $extensions = @( $vsixs diff --git a/images/win/scripts/Tests/WDK.Tests.ps1 b/images/win/scripts/Tests/WDK.Tests.ps1 index 6c5dc32953c0..b58d018a1246 100644 --- a/images/win/scripts/Tests/WDK.Tests.ps1 +++ b/images/win/scripts/Tests/WDK.Tests.ps1 @@ -1,11 +1,13 @@ -Describe "WDK" -Skip:(Test-IsWin22) { - It "WDK exists" { - $WDKVersion = (Get-CimInstance -ClassName Win32_Product -Filter "Name = 'Windows Driver Kit'").Version - $WDKVersion| Should -Not -BeNullOrEmpty - } +Describe "WDK" { + It "WDK exists" { + $regKey = "HKLM:\Software\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall\*" + $installedApplications = Get-ItemProperty -Path $regKey + $WDKVersion = $installedApplications | Where-Object DisplayName -eq 'Windows Driver Kit' | Select-Object -First 1 -ExpandProperty DisplayVersion + $WDKVersion | Should -Not -BeNullOrEmpty + } - It "WDK version from system" { - $version = Get-VSExtensionVersion -packageName "Microsoft.Windows.DriverKit" - $version | Should -Not -BeNullOrEmpty - } + It "Windows Driver Kit VSIX extension" -Skip:(Test-IsWin22) { + $version = Get-VSExtensionVersion -packageName "Microsoft.Windows.DriverKit" + $version | Should -Not -BeNullOrEmpty + } } diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index c17f6aa79f7d..add06167efaa 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -199,6 +199,7 @@ "Microsoft.VisualStudio.Component.TestTools.CodedUITest", "Microsoft.VisualStudio.Component.TestTools.WebLoadTest", "Microsoft.VisualStudio.Component.UWP.VC.ARM64", + "Microsoft.VisualStudio.Component.UWP.VC.ARM64EC", "Microsoft.VisualStudio.Component.VC.CLI.Support", "Microsoft.VisualStudio.Component.VC.CMake.Project", "Microsoft.VisualStudio.Component.VC.DiagnosticTools", @@ -214,9 +215,13 @@ "Microsoft.VisualStudio.Component.VC.MFC.ARM", "Microsoft.VisualStudio.Component.VC.MFC.ARM.Spectre", "Microsoft.VisualStudio.Component.VC.ATL.ARM64", + "Microsoft.VisualStudio.Component.VC.ATL.ARM64.Spectre", + "Microsoft.VisualStudio.Component.VC.ATL.ARM64EC", + "Microsoft.VisualStudio.Component.VC.ATL.ARM64EC.Spectre", "Microsoft.VisualStudio.Component.VC.MFC.ARM64", "Microsoft.VisualStudio.Component.VC.MFC.ARM64.Spectre", "Microsoft.VisualStudio.Component.VC.MFC.ARM64EC", + "Microsoft.VisualStudio.Component.VC.MFC.ARM64EC.Spectre", "Microsoft.VisualStudio.Component.VC.Modules.x86.x64", "Microsoft.VisualStudio.Component.VC.Tools.ARM64", "Microsoft.VisualStudio.Component.VC.Tools.ARM64EC", diff --git a/images/win/windows2022.json b/images/win/windows2022.json index a427e2399d56..703e4a1c9af7 100644 --- a/images/win/windows2022.json +++ b/images/win/windows2022.json @@ -174,6 +174,7 @@ "type": "powershell", "scripts": [ "{{ template_dir }}/scripts/Installers/Install-Wix.ps1", + "{{ template_dir }}/scripts/Installers/Install-WDK.ps1", "{{ template_dir }}/scripts/Installers/Install-Vsix.ps1", "{{ template_dir }}/scripts/Installers/Install-AzureCli.ps1", "{{ template_dir }}/scripts/Installers/Install-AzureDevOpsCli.ps1", From 3a88a04e4740c8f7404746e2fdcfd83949a164ab Mon Sep 17 00:00:00 2001 From: Steve-Glass <84886334+Steve-Glass@users.noreply.github.com> Date: Wed, 29 Jun 2022 10:25:43 -0400 Subject: [PATCH 1285/3485] macOS 10.15 deprecation status (#5842) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 802a81e3deda..cbaf5b367430 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ For general questions about using the virtual environments or writing your Actio | Ubuntu 18.04 | `ubuntu-18.04` | [ubuntu-18.04] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu18&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu18&redirect=1) | macOS 12 | `macos-12`| [macOS-12] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-12&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-12&redirect=1) | macOS 11 | `macos-latest` or `macos-11`| [macOS-11] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-11&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-11&redirect=1) -| macOS 10.15 | `macos-10.15` | [macOS-10.15] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-10.15&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-10.15&redirect=1) +| macOS 10.15 <sup>deprecated</sup> | `macos-10.15` | [macOS-10.15] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-10.15&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-10.15&redirect=1) | Windows Server 2022 | `windows-latest` or `windows-2022` | [windows-2022] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=windows-2022&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=windows-2022&redirect=1) | | Windows Server 2019 | `windows-2019` | [windows-2019] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=windows-2019&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=windows-2019&redirect=1) | Windows Server 2016 | `windows-2016` | [windows-2016] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=windows-2016&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=windows-2016&redirect=1) From 7ff67b1a39fecb4c7965a305dc715676ecded01f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 30 Jun 2022 07:42:11 +0000 Subject: [PATCH 1286/3485] macOS 11 (20220627 update) (#5832) * Updating readme file for macOS-11 version 20220627.1 * Update link to llvm@13 * Fix brew clang version Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-11-Readme.md | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/images/macos/macos-11-Readme.md b/images/macos/macos-11-Readme.md index a310704894ea..b4088893e64e 100644 --- a/images/macos/macos-11-Readme.md +++ b/images/macos/macos-11-Readme.md @@ -1,14 +1,14 @@ # macOS 11.6 info - System Version: macOS 11.6.6 (20G624) - Kernel Version: Darwin 20.6.0 -- Image Version: 20220622.7 +- Image Version: 20220627.1 ## Installed Software ### Language and Runtime - .NET SDK 3.1.101 3.1.201 3.1.302 3.1.420 5.0.102 5.0.202 5.0.302 5.0.408 - Bash 3.2.57(1)-release +- Clang/LLVM 13.0.1 is available on `'$(brew --prefix llvm@13)/bin/clang'` - Clang/LLVM 13.0.0 is default -- Clang/LLVM 13.0.1 is available on `'$(brew --prefix llvm)/bin/clang'` - gcc-9 (Homebrew GCC 9.5.0) 9.5.0 - available by `gcc-9` alias - gcc-10 (Homebrew GCC 10.3.0) 10.3.0 - available by `gcc-10` alias - gcc-11 (Homebrew GCC 11.3.0_2) 11.3.0 - available by `gcc-11` alias @@ -26,7 +26,7 @@ - PHP 8.1.7 - Python 2.7.18 - Python 3.9.13 -- R 4.2.0 +- R 4.2.1 - Ruby 2.7.6p219 ### Package Management @@ -42,7 +42,7 @@ - Pip 22.1.1 (python 3.9) - Pipx 1.1.0 - RubyGems 3.2.33 -- Vcpkg 2022 (build from master \<b0ea874c7>) +- Vcpkg 2022 (build from master \<432037ce4>) - Yarn 1.22.19 #### Environment variables @@ -64,10 +64,10 @@ - bazel 5.2.0 - bazelisk 1.12.0 - bsdtar 3.3.2 - available by 'tar' alias -- Curl 7.83.1 +- Curl 7.84.0 - Git 2.36.1 - Git LFS: 3.2.0 -- GitHub CLI: 2.12.1 +- GitHub CLI: 2.13.0 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.3 - gpg (GnuPG) 2.3.6 @@ -78,20 +78,20 @@ - mongo v5.0.7 - mongod v5.0.7 - Newman 5.3.2 -- OpenSSL 1.1.1o 3 May 2022 `(/usr/local/opt/openssl@1.1 -> ../Cellar/openssl@1.1/1.1.1o)` +- OpenSSL 1.1.1p 21 Jun 2022 `(/usr/local/opt/openssl@1.1 -> ../Cellar/openssl@1.1/1.1.1p)` - Packer 1.8.2 - PostgreSQL 14.4 - psql (PostgreSQL) 14.4 - Sox 14.4.2 - Subversion (SVN) 1.14.2 - Switchaudio-osx 1.1.0 -- yq (https://github.com/mikefarah/yq/) version 4.25.2 +- yq (https://github.com/mikefarah/yq/) version 4.25.3 - zstd 1.5.2 ### Tools - Aliyun CLI 3.0.123 - App Center CLI 2.10.10 -- AWS CLI 2.7.9 +- AWS CLI 2.7.11 - AWS SAM CLI 1.52.0 - AWS Session Manager CLI 1.2.339.0 - Azure CLI (azure-devops) 0.25.0 @@ -104,7 +104,7 @@ - GHCup 0.1.17.8 - Jazzy 0.14.2 - Stack 2.7.5 -- SwiftFormat 0.49.10 +- SwiftFormat 0.49.11 - Swig 4.0.2 - Xcode Command Line Tools 13.2.0.0.1.1638488800 @@ -117,11 +117,11 @@ - SafariDriver 15.5 (16613.2.7.1.9) - Google Chrome 103.0.5060.53 - ChromeDriver 103.0.5060.53 -- Microsoft Edge 102.0.1245.44 -- Microsoft Edge WebDriver 102.0.1245.44 +- Microsoft Edge 103.0.1264.37 +- Microsoft Edge WebDriver 103.0.1264.37 - Mozilla Firefox 101.0.1 - geckodriver 0.31.0 -- Selenium server 4.2.0 +- Selenium server 4.3.0 #### Environment variables | Name | Value | From b3b4deba3b9fabc03ad98a21e1e8537f2b16d91e Mon Sep 17 00:00:00 2001 From: Henry Mercer <henry.mercer@me.com> Date: Thu, 30 Jun 2022 10:49:27 +0100 Subject: [PATCH 1287/3485] Use `v2` branch to get the Linux CodeQL bundle too (#5840) https://github.com/actions/virtual-environments/pull/5307 did this for Windows; let's do Linux too. --- images/linux/scripts/installers/codeql-bundle.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/linux/scripts/installers/codeql-bundle.sh b/images/linux/scripts/installers/codeql-bundle.sh index 46f53ca03b3a..f2167b8c4a88 100644 --- a/images/linux/scripts/installers/codeql-bundle.sh +++ b/images/linux/scripts/installers/codeql-bundle.sh @@ -7,7 +7,7 @@ source $HELPER_SCRIPTS/install.sh # Retrieve the name of the CodeQL bundle preferred by the Action (in the format codeql-bundle-YYYYMMDD). -codeql_bundle_name="$(curl -sSL https://raw.githubusercontent.com/github/codeql-action/v1/src/defaults.json | jq -r .bundleVersion)" +codeql_bundle_name="$(curl -sSL https://raw.githubusercontent.com/github/codeql-action/v2/src/defaults.json | jq -r .bundleVersion)" # Convert the bundle name to a version number (0.0.0-YYYYMMDD). codeql_bundle_version="0.0.0-${codeql_bundle_name##*-}" From 054266a4b32735a980117226ec5357419366e777 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 30 Jun 2022 10:19:48 +0000 Subject: [PATCH 1288/3485] macOS 10.15 (20220627 update) (#5837) * Updating readme file for macOS-10.15 version 20220627.1 * Update link to llvm@13 * Correct Clang/LLVM version Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Dusko Dobranic <101048884+ddobranic@users.noreply.github.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-10.15-Readme.md | 33 +++++++++++++++++------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/images/macos/macos-10.15-Readme.md b/images/macos/macos-10.15-Readme.md index 011e4f6bb762..0269b694ce37 100644 --- a/images/macos/macos-10.15-Readme.md +++ b/images/macos/macos-10.15-Readme.md @@ -1,14 +1,19 @@ +| Announcements | +|-| +| [[macOS] Default Xcode on Monterey image will be set to Xcode 13.4.1 on July, 11](https://github.com/actions/virtual-environments/issues/5836) | +| [[Windows, macOS] LLVM will be updated to version 14 on July, 11](https://github.com/actions/virtual-environments/issues/5835) | +*** # macOS 10.15 info - System Version: macOS 10.15.7 (19H1922) - Kernel Version: Darwin 19.6.0 -- Image Version: 20220622.2 +- Image Version: 20220627.1 ## Installed Software ### Language and Runtime - .NET SDK 3.1.101 3.1.201 3.1.302 3.1.420 5.0.102 5.0.202 5.0.302 5.0.408 - Bash 3.2.57(1)-release +- Clang/LLVM 13.0.1 is available on `'$(brew --prefix llvm@13)/bin/clang'` - Clang/LLVM 12.0.0 is default -- Clang/LLVM 13.0.1 is available on `'$(brew --prefix llvm)/bin/clang'` - gcc-9 (Homebrew GCC 9.5.0) 9.5.0 - available by `gcc-9` alias - gcc-10 (Homebrew GCC 10.3.0) 10.3.0 - available by `gcc-10` alias - gcc-11 (Homebrew GCC 11.3.0_2) 11.3.0 - available by `gcc-11` alias @@ -26,7 +31,7 @@ - PHP 8.1.7 - Python 2.7.18 - Python 3.9.13 -- R 4.2.0 +- R 4.2.1 - Ruby 2.7.6p219 ### Package Management @@ -42,7 +47,7 @@ - Pip 22.1.1 (python 3.9) - Pipx 1.1.0 - RubyGems 3.2.33 -- Vcpkg 2022 (build from master \<5241c59aa>) +- Vcpkg 2022 (build from master \<feecd1fb4>) - Yarn 1.22.19 #### Environment variables @@ -64,11 +69,11 @@ - bazel 5.2.0 - bazelisk 1.12.0 - bsdtar 3.3.2 - available by 'tar' alias -- Curl 7.83.1 +- Curl 7.84.0 - Git 2.36.1 - Git LFS: 3.2.0 -- GitHub CLI: 2.12.1 -- GNU parallel 20220522 +- GitHub CLI: 2.13.0 +- GNU parallel 20220622 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.3 - gpg (GnuPG) 2.3.6 @@ -79,7 +84,7 @@ - mongo v5.0.7 - mongod v5.0.7 - Newman 5.3.2 -- OpenSSL 1.1.1o 3 May 2022 `(/usr/local/opt/openssl@1.1 -> ../Cellar/openssl@1.1/1.1.1o)` +- OpenSSL 1.1.1p 21 Jun 2022 `(/usr/local/opt/openssl@1.1 -> ../Cellar/openssl@1.1/1.1.1p)` - Packer 1.8.2 - PostgreSQL 14.4 - psql (PostgreSQL) 14.4 @@ -88,13 +93,13 @@ - Switchaudio-osx 1.1.0 - Vagrant 2.2.19 - VirtualBox 6.1.34r150636 -- yq (https://github.com/mikefarah/yq/) version 4.25.2 +- yq (https://github.com/mikefarah/yq/) version 4.25.3 - zstd 1.5.2 ### Tools - Aliyun CLI 3.0.123 - App Center CLI 2.10.10 -- AWS CLI 2.7.9 +- AWS CLI 2.7.11 - AWS SAM CLI 1.52.0 - AWS Session Manager CLI 1.2.339.0 - Azure CLI (azure-devops) 0.25.0 @@ -107,7 +112,7 @@ - GHCup 0.1.17.8 - Jazzy 0.14.2 - Stack 2.7.5 -- SwiftFormat 0.49.10 +- SwiftFormat 0.49.11 - Swig 4.0.2 - Xcode Command Line Tools 12.4.0.0.1.1610135815 @@ -120,11 +125,11 @@ - SafariDriver 15.5 (15613.2.7.1.9) - Google Chrome 103.0.5060.53 - ChromeDriver 103.0.5060.53 -- Microsoft Edge 102.0.1245.44 -- Microsoft Edge WebDriver 102.0.1245.44 +- Microsoft Edge 103.0.1264.37 +- Microsoft Edge WebDriver 103.0.1264.37 - Mozilla Firefox 101.0.1 - geckodriver 0.31.0 -- Selenium server 4.2.0 +- Selenium server 4.3.0 #### Environment variables | Name | Value | From 64759ce1a38caa196b731b262db5dccfefccccde Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Fri, 1 Jul 2022 10:43:40 +0200 Subject: [PATCH 1289/3485] Create IIS Express Development Certificate (#5852) --- .../GenerateIISExpressCertificate.ps1 | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 images/win/post-generation/GenerateIISExpressCertificate.ps1 diff --git a/images/win/post-generation/GenerateIISExpressCertificate.ps1 b/images/win/post-generation/GenerateIISExpressCertificate.ps1 new file mode 100644 index 000000000000..609bbb40a346 --- /dev/null +++ b/images/win/post-generation/GenerateIISExpressCertificate.ps1 @@ -0,0 +1,40 @@ +$friendlyName = "IIS Express Development Certificate" +$certStore = "Cert:\LocalMachine\My" +$oldCert = Get-ChildItem $certStore | Where-Object FriendlyName -match $friendlyName + +if(-not $oldCert) { + Write-Host "$friendlyName certificate not found" + return +} + +Write-Host "Removing $($oldCert.Thumbprint) certificate" +Remove-Item -Path $oldCert.PSPath -Confirm:$false + +Write-Host "Creating $friendlyName certificate" +$selfSignedCertParam = @{ + Subject = "localhost" + DnsName = "localhost" + KeyAlgorithm = "RSA" + KeyLength = 2048 + NotBefore = (Get-Date) + NotAfter = (Get-Date).AddYears(5) + CertStoreLocation = $certStore + FriendlyName = $friendlyName + HashAlgorithm = "SHA256" + KeyUsage = "DigitalSignature", "KeyEncipherment", "DataEncipherment" + TextExtension = @("2.5.29.37={text}1.3.6.1.5.5.7.3.1") +} +$cert = New-SelfSignedCertificate @selfSignedCertParam + +# The app ID is the IIS Express app ID +$certThumbprint = $cert.Thumbprint +$appId = "{214124cd-d05b-4309-9af9-9caa44b2b74a}" +$startPort = 44300 +$endPort = 44399 + +Write-Host "Binding ${certThumbprint} certificate using netsh port=${startPort}:${endPort} and appID=${appId}" +$startPort..$endPort | ForEach-Object { + $port = $_ + cmd /c "netsh http delete sslcert ipport=0.0.0.0:$port > nul 2>&1" + cmd /c "netsh http add sslcert ipport=0.0.0.0:$port certhash=$certThumbprint appid=$appId certstorename=MY > nul 2>&1" +} From c7db1b7cbbe32b3b08a599521d1e0753e36ea45d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 2 Jul 2022 12:19:52 +0000 Subject: [PATCH 1290/3485] Updating readme file for win22 version 20220626.1 (#5826) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2022-Readme.md | 54 ++++++++++++++++---------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/images/win/Windows2022-Readme.md b/images/win/Windows2022-Readme.md index 3c527e7be099..8089e969cdba 100644 --- a/images/win/Windows2022-Readme.md +++ b/images/win/Windows2022-Readme.md @@ -4,7 +4,7 @@ *** # Microsoft Windows Server 2022 Datacenter - OS Version: 10.0.20348 Build 768 -- Image Version: 20220619.1 +- Image Version: 20220626.1 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -32,7 +32,7 @@ - pip 22.1.2 (python 3.9) - Pipx 1.1.0 - RubyGems 3.2.33 -- Vcpkg (build from master \<b49b2bdf2>) +- Vcpkg (build from master \<c168ce4e7>) - Yarn 1.22.19 #### Environment variables @@ -47,7 +47,7 @@ - sbt 1.6.2 ### Tools -- 7zip 21.07 +- 7zip 22.00 - aria2 1.36.0 - azcopy 10.15.0 - Bazel 5.2.0 @@ -55,10 +55,10 @@ - Bicep 0.7.4 - Cabal 3.6.2.0 - CMake 3.23.2 -- CodeQL Action Bundle 2.9.3 +- CodeQL Action Bundle 2.9.4 - Docker 20.10.7 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.6.0 +- Docker Compose v2 2.6.1 - Docker-wincred 0.6.4 - ghc 9.2.3 - Git 2.36.1.windows.1 @@ -72,9 +72,9 @@ - Newman 5.3.2 - NSIS v3.08 - OpenSSL 1.1.1 -- Packer 1.8.0 -- Pulumi v3.34.1 -- R 4.2.0 +- Packer 1.8.1 +- Pulumi v3.35.1 +- R 4.2.1 - Service Fabric SDK 9.0.1028.9590 - Stack 2.7.5 - Subversion (SVN) 1.14.2 @@ -86,13 +86,13 @@ - zstd 1.5.2 ### CLI Tools -- Alibaba Cloud CLI 3.0.122 -- AWS CLI 2.7.9 +- Alibaba Cloud CLI 3.0.124 +- AWS CLI 2.7.11 - AWS SAM CLI 1.52.0 - AWS Session Manager CLI 1.2.339.0 - Azure CLI 2.37.0 - Azure DevOps CLI extension 0.25.0 -- GitHub CLI 2.12.1 +- GitHub CLI 2.13.0 - Hub CLI 2.14.2 ### Rust Tools @@ -110,14 +110,14 @@ - Rustfmt 1.4.38 ### Browsers and webdrivers -- Google Chrome 102.0.5005.115 -- Chrome Driver 102.0.5005.61 -- Microsoft Edge 102.0.1245.44 -- Microsoft Edge Driver 102.0.1245.44 +- Google Chrome 103.0.5060.53 +- Chrome Driver 103.0.5060.53 +- Microsoft Edge 103.0.1264.37 +- Microsoft Edge Driver 103.0.1264.37 - Mozilla Firefox 101.0.1 - Gecko Driver 0.31.0 - IE Driver 3.150.1.1 -- Selenium server 4.2.0 +- Selenium server 4.3.0 #### Environment variables | Name | Value | @@ -218,12 +218,12 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Name | Version | ConfigFile | ServiceName | ServiceStatus | ListenPort | | ------ | ------- | ------------------------------------- | ----------- | ------------- | ---------- | | Apache | 2.4.53 | C:\tools\Apache24\conf\httpd.conf | Apache | Stopped | 80 | -| Nginx | 1.21.6 | C:\tools\nginx-1.21.6\conf\nginx.conf | nginx | Stopped | 80 | +| Nginx | 1.23.0 | C:\tools\nginx-1.23.0\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2022 | Name | Version | Path | | ----------------------------- | -------------- | -------------------------------------------------------- | -| Visual Studio Enterprise 2022 | 17.2.32602.215 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | +| Visual Studio Enterprise 2022 | 17.2.32616.157 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | #### Workloads, components and extensions: | Package | Version | @@ -453,12 +453,12 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft Visual C++ 2012 Minimum Runtime | x64 | 11.0.61030 | | Microsoft Visual C++ 2013 Additional Runtime | x64 | 12.0.40660 | | Microsoft Visual C++ 2013 Minimum Runtime | x64 | 12.0.40660 | -| Microsoft Visual C++ 2022 Additional Runtime | x64 | 14.32.31326 | -| Microsoft Visual C++ 2022 Debug Runtime | x64 | 14.32.31326 | -| Microsoft Visual C++ 2022 Minimum Runtime | x64 | 14.32.31326 | -| Microsoft Visual C++ 2022 Additional Runtime | x86 | 14.32.31326 | -| Microsoft Visual C++ 2022 Debug Runtime | x86 | 14.32.31326 | -| Microsoft Visual C++ 2022 Minimum Runtime | x86 | 14.32.31326 | +| Microsoft Visual C++ 2022 Additional Runtime | x64 | 14.32.31332 | +| Microsoft Visual C++ 2022 Debug Runtime | x64 | 14.32.31332 | +| Microsoft Visual C++ 2022 Minimum Runtime | x64 | 14.32.31332 | +| Microsoft Visual C++ 2022 Additional Runtime | x86 | 14.32.31332 | +| Microsoft Visual C++ 2022 Debug Runtime | x86 | 14.32.31332 | +| Microsoft Visual C++ 2022 Minimum Runtime | x86 | 14.32.31332 | #### Installed Windows SDKs `Location C:\Program Files (x86)\Windows Kits\10\Extension SDKs\WindowsDesktop` @@ -491,7 +491,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - nbgv 3.5.107+6463ef6068 ### PowerShell Tools -- PowerShell 7.2.4 +- PowerShell 7.2.5 #### Azure Powershell Modules | Module | Version | Path | @@ -508,10 +508,10 @@ All other versions are saved but not installed. #### Powershell Modules | Module | Version | | ------------------ | ---------------- | -| AWSPowerShell | 4.1.108 | +| AWSPowerShell | 4.1.113 | | DockerMsftProvider | 1.0.0.8 | | MarkdownPS | 1.9 | -| Microsoft.Graph | 1.9.6 | +| Microsoft.Graph | 1.10.0 | | Pester | 3.4.0<br>5.3.3 | | PowerShellGet | 1.0.0.1<br>2.2.5 | | PSScriptAnalyzer | 1.20.0 | From d5815d8d53190b9bb5f55f933298625bf4be2ac1 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 2 Jul 2022 13:03:30 +0000 Subject: [PATCH 1291/3485] Updating readme file for win19 version 20220626.1 (#5830) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2019-Readme.md | 44 ++++++++++++++++---------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index be714c8c6ef1..f19a3abaab36 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 3046 -- Image Version: 20220619.1 +- Image Version: 20220626.1 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -32,7 +32,7 @@ - pip 22.1.2 (python 3.7) - Pipx 1.1.0 - RubyGems 2.7.6.3 -- Vcpkg (build from master \<b49b2bdf2>) +- Vcpkg (build from master \<c168ce4e7>) - Yarn 1.22.19 #### Environment variables @@ -48,7 +48,7 @@ - sbt 1.6.2 ### Tools -- 7zip 21.07 +- 7zip 22.00 - aria2 1.36.0 - azcopy 10.15.0 - Bazel 5.2.0 @@ -56,15 +56,15 @@ - Bicep 0.7.4 - Cabal 3.6.2.0 - CMake 3.23.2 -- CodeQL Action Bundle 2.9.3 +- CodeQL Action Bundle 2.9.4 - Docker 20.10.7 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.6.0 +- Docker Compose v2 2.6.1 - Docker-wincred 0.6.4 - ghc 9.2.3 - Git 2.36.1.windows.1 - Git LFS 3.1.4 -- Google Cloud SDK 390.0.0 +- Google Cloud SDK 391.0.0 - InnoSetup 6.2.1 - jq 1.6 - Kind 0.14.0 @@ -74,10 +74,10 @@ - Newman 5.3.2 - NSIS v3.08 - OpenSSL 1.1.1 -- Packer 1.8.0 -- Parcel 2.6.1 -- Pulumi v3.34.1 -- R 4.2.0 +- Packer 1.8.1 +- Parcel 2.6.2 +- Pulumi v3.35.1 +- R 4.2.1 - Service Fabric SDK 9.0.1028.9590 - Stack 2.7.5 - Subversion (SVN) 1.14.2 @@ -89,14 +89,14 @@ - zstd 1.5.2 ### CLI Tools -- Alibaba Cloud CLI 3.0.122 -- AWS CLI 2.7.9 +- Alibaba Cloud CLI 3.0.124 +- AWS CLI 2.7.11 - AWS SAM CLI 1.52.0 - AWS Session Manager CLI 1.2.339.0 - Azure CLI 2.37.0 - Azure DevOps CLI extension 0.25.0 - Cloud Foundry CLI 6.53.0 -- GitHub CLI 2.12.1 +- GitHub CLI 2.13.0 - Hub CLI 2.14.2 ### Rust Tools @@ -114,14 +114,14 @@ - Rustfmt 1.4.38 ### Browsers and webdrivers -- Google Chrome 102.0.5005.115 -- Chrome Driver 102.0.5005.61 -- Microsoft Edge 102.0.1245.44 -- Microsoft Edge Driver 102.0.1245.44 +- Google Chrome 103.0.5060.53 +- Chrome Driver 103.0.5060.53 +- Microsoft Edge 103.0.1264.37 +- Microsoft Edge Driver 103.0.1264.37 - Mozilla Firefox 101.0.1 - Gecko Driver 0.31.0 - IE Driver 3.150.1.1 -- Selenium server 4.2.0 +- Selenium server 4.3.0 #### Environment variables | Name | Value | @@ -232,7 +232,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Name | Version | ConfigFile | ServiceName | ServiceStatus | ListenPort | | ------ | ------- | ------------------------------------- | ----------- | ------------- | ---------- | | Apache | 2.4.53 | C:\tools\Apache24\conf\httpd.conf | Apache | Stopped | 80 | -| Nginx | 1.21.6 | C:\tools\nginx-1.21.6\conf\nginx.conf | nginx | Stopped | 80 | +| Nginx | 1.23.0 | C:\tools\nginx-1.23.0\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2019 | Name | Version | Path | @@ -529,7 +529,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - nbgv 3.5.107+6463ef6068 ### PowerShell Tools -- PowerShell 7.2.4 +- PowerShell 7.2.5 #### Azure Powershell Modules | Module | Version | Path | @@ -546,10 +546,10 @@ All other versions are saved but not installed. #### Powershell Modules | Module | Version | | ------------------ | ---------------- | -| AWSPowerShell | 4.1.108 | +| AWSPowerShell | 4.1.113 | | DockerMsftProvider | 1.0.0.8 | | MarkdownPS | 1.9 | -| Microsoft.Graph | 1.9.6 | +| Microsoft.Graph | 1.10.0 | | Pester | 3.4.0<br>5.3.3 | | PowerShellGet | 1.0.0.1<br>2.2.5 | | PSScriptAnalyzer | 1.20.0 | From d0d2b9239f3153667e0d9e6ceca15f1b291a84b6 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Mon, 4 Jul 2022 14:35:52 +0400 Subject: [PATCH 1292/3485] Add vagrant to macOS-12 (#5854) --- images/macos/software-report/SoftwareReport.Generator.ps1 | 2 +- images/macos/tests/BasicTools.Tests.ps1 | 2 +- images/macos/toolsets/toolset-12.json | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1 index df8fe824dd79..199635d4f7f7 100644 --- a/images/macos/software-report/SoftwareReport.Generator.ps1 +++ b/images/macos/software-report/SoftwareReport.Generator.ps1 @@ -135,13 +135,13 @@ if ($os.IsLessThanMonterey) { if ($os.IsCatalina) { $utilitiesList += @( - (Get-VagrantVersion), (Get-ParallelVersion) ) } if (-not $os.IsBigSur) { $utilitiesList += @( + (Get-VagrantVersion), (Get-VirtualBoxVersion) ) } diff --git a/images/macos/tests/BasicTools.Tests.ps1 b/images/macos/tests/BasicTools.Tests.ps1 index 8bfa45aea000..df7045b50371 100644 --- a/images/macos/tests/BasicTools.Tests.ps1 +++ b/images/macos/tests/BasicTools.Tests.ps1 @@ -138,7 +138,7 @@ Describe "wget" { } } -Describe "vagrant" -Skip:($os.IsHigherThanCatalina) { +Describe "vagrant" -Skip:($os.IsBigSur) { It "vagrant" { "vagrant --version" | Should -ReturnZeroExitCode } diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index c1b7c80e5a77..b0bcdf3b226e 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -161,6 +161,7 @@ ], "cask_packages": [ "julia", + "vagrant", "virtualbox" ] }, From 24b25c7891ab76fca8a558ecaa669e867c4940a7 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Wed, 6 Jul 2022 00:59:38 +0200 Subject: [PATCH 1293/3485] [macOS] set Xcode 13.4.1 as default (#5864) --- images/macos/toolsets/toolset-12.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index b0bcdf3b226e..8ef373191aa5 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -1,6 +1,6 @@ { "xcode": { - "default": "13.3.1", + "default": "13.4.1", "versions": [ { "link": "13.4.1", "version": "13.4.1" }, { "link": "13.4", "version": "13.4.0" }, @@ -26,7 +26,7 @@ "android-versions": [ "12.2.8.3", "12.1.0.2", "12.0.0.3", "11.3.0.4" ], - "bundle-default": "6_12_16", + "bundle-default": "6_12_17", "bundles": [ { "symlink": "6_12_17", From 0dd1c396a1039160f696c5b5730510f2c30ad85d Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Wed, 6 Jul 2022 01:00:28 +0200 Subject: [PATCH 1294/3485] Update LLVM to version 14 (#5863) --- images/win/scripts/Tests/LLVM.Tests.ps1 | 7 +++++-- images/win/toolsets/toolset-2019.json | 2 +- images/win/toolsets/toolset-2022.json | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/images/win/scripts/Tests/LLVM.Tests.ps1 b/images/win/scripts/Tests/LLVM.Tests.ps1 index a20fd96098fb..c7a5df40e2b5 100644 --- a/images/win/scripts/Tests/LLVM.Tests.ps1 +++ b/images/win/scripts/Tests/LLVM.Tests.ps1 @@ -1,7 +1,10 @@ Describe "Clang/LLVM" { - It "Clang/LLVM installed and version is correct" { + BeforeAll { $toolsetVersion = (Get-ToolsetContent).llvm.version + } + + It "Clang/LLVM <toolsetVersion> installed and version is correct" { $clangVersion = clang --version $clangVersion[0] | Should -BeLike "*${toolsetVersion}*" } -} \ No newline at end of file +} diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index 39265c49ff6f..3ae51ce8a4c4 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -478,7 +478,7 @@ "version": "8.1" }, "llvm": { - "version": "13" + "version": "14" }, "postgresql": { "version": "14" diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index add06167efaa..26065e646f0e 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -359,7 +359,7 @@ "version": "3.08" }, "llvm": { - "version": "13" + "version": "14" }, "php": { "version": "8.1" From f62d8d956d7f01b05c82389e5f0f1d934166f828 Mon Sep 17 00:00:00 2001 From: Dusko Dobranic <101048884+ddobranic@users.noreply.github.com> Date: Wed, 6 Jul 2022 08:10:20 +0200 Subject: [PATCH 1295/3485] [Windows\Linux] Update Az powershell to 7.5 (#5858) --- images/linux/toolsets/toolset-1804.json | 2 +- images/linux/toolsets/toolset-2004.json | 2 +- images/linux/toolsets/toolset-2204.json | 2 +- images/win/toolsets/toolset-2019.json | 2 +- images/win/toolsets/toolset-2022.json | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index 590ddcaf0903..aac3736b924d 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -121,7 +121,7 @@ "name": "az", "url" : "https://raw.githubusercontent.com/Azure/az-ps-module-versions/main/versions-manifest.json", "versions": [ - "7.3.2" + "7.5.0" ], "zip_versions": [ "3.1.0", diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index d60510a06d11..1ffa6f199335 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -119,7 +119,7 @@ "name": "az", "url" : "https://raw.githubusercontent.com/Azure/az-ps-module-versions/main/versions-manifest.json", "versions": [ - "7.3.2" + "7.5.0" ], "zip_versions": [ "3.1.0", diff --git a/images/linux/toolsets/toolset-2204.json b/images/linux/toolsets/toolset-2204.json index 53416c925442..b5fa65dde716 100644 --- a/images/linux/toolsets/toolset-2204.json +++ b/images/linux/toolsets/toolset-2204.json @@ -105,7 +105,7 @@ "name": "az", "url" : "https://raw.githubusercontent.com/Azure/az-ps-module-versions/main/versions-manifest.json", "versions": [ - "7.3.2" + "7.5.0" ], "zip_versions": [ ] diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index 3ae51ce8a4c4..2581f69b95d6 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -125,7 +125,7 @@ "name": "az", "url" : "https://raw.githubusercontent.com/Azure/az-ps-module-versions/main/versions-manifest.json", "versions": [ - "7.3.2" + "7.5.0" ], "zip_versions": [ "1.0.0", diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index 26065e646f0e..ede4ed949041 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -117,7 +117,7 @@ "name": "az", "url" : "https://raw.githubusercontent.com/Azure/az-ps-module-versions/main/versions-manifest.json", "versions": [ - "7.3.2" + "7.5.0" ], "zip_versions": [ "6.6.0" From a1c2e5e24dc58241e4adef5c250657fddc788a1e Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Wed, 6 Jul 2022 11:52:52 +0200 Subject: [PATCH 1296/3485] Update LLVM to version 14 (#5862) --- images/macos/tests/LLVM.Tests.ps1 | 7 ++++--- images/macos/toolsets/toolset-10.15.json | 2 +- images/macos/toolsets/toolset-11.json | 2 +- images/macos/toolsets/toolset-12.json | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/images/macos/tests/LLVM.Tests.ps1 b/images/macos/tests/LLVM.Tests.ps1 index 2e371ef78fd0..af5b63535810 100644 --- a/images/macos/tests/LLVM.Tests.ps1 +++ b/images/macos/tests/LLVM.Tests.ps1 @@ -1,8 +1,9 @@ -$os = Get-OSVersion - Describe "Clang/LLVM" { - It "Clang/LLVM is installed and version is correct" { + BeforeAll { $toolsetVersion = Get-ToolsetValue 'llvm.version' + } + + It "Clang/LLVM <toolsetVersion> is installed and version is correct" { $clangVersion = & "$(brew --prefix llvm@$toolsetVersion)/bin/clang" --version $clangVersion[0] | Should -BeLike "*${toolsetVersion}*" } diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index 28e289c4cbbc..05874c59a594 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -343,7 +343,7 @@ ] }, "llvm": { - "version": "13" + "version": "14" }, "php": { "version": "8.1" diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index 87a87a509c52..c314ffc8edae 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -333,7 +333,7 @@ ] }, "llvm": { - "version": "13" + "version": "14" }, "php": { "version": "8.1" diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index 8ef373191aa5..c4eae4295941 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -262,7 +262,7 @@ ] }, "llvm": { - "version": "13" + "version": "14" }, "php": { "version": "8.1" From 4c876760cad802a2c2e21298497f82ab697b80cf Mon Sep 17 00:00:00 2001 From: AlexanderGitin <102294679+AlexanderGitin@users.noreply.github.com> Date: Wed, 6 Jul 2022 14:59:35 +0300 Subject: [PATCH 1297/3485] [macOS] Set properties for device set list (#5700) * [macOS] Set properties for device set list * replaced /Users/runner to $HOME * Added comment --- images/macos/provision/configuration/configure-machine.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/images/macos/provision/configuration/configure-machine.sh b/images/macos/provision/configuration/configure-machine.sh index 3eadcc523667..db8fd3410138 100644 --- a/images/macos/provision/configuration/configure-machine.sh +++ b/images/macos/provision/configuration/configure-machine.sh @@ -106,3 +106,6 @@ if [ ! -d "/usr/local/bin" ];then fi chmod +x $HOME/utils/invoke-tests.sh sudo ln -s $HOME/utils/invoke-tests.sh /usr/local/bin/invoke_tests + +# Disable the App Library for fix overloaded cpu +plutil -replace SuggestionsAppLibraryEnabled -bool NO $HOME/Library/Developer/CoreSimulator/Devices/device_set.plist \ No newline at end of file From 29468988d588aa97bef504789a476b7b9c233d40 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Wed, 6 Jul 2022 18:20:15 +0200 Subject: [PATCH 1298/3485] Fix output file (#5868) --- images/macos/templates/macOS-12.anka.pkr.hcl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/macos/templates/macOS-12.anka.pkr.hcl b/images/macos/templates/macOS-12.anka.pkr.hcl index 7a4d3c629cc6..2eb1366b0ffc 100644 --- a/images/macos/templates/macOS-12.anka.pkr.hcl +++ b/images/macos/templates/macOS-12.anka.pkr.hcl @@ -111,7 +111,7 @@ build { "./provision/core/xcode-clt.sh", "./provision/core/homebrew.sh" ] - execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" } provisioner "shell" { scripts = [ @@ -241,7 +241,7 @@ build { provisioner "file" { destination = "../image-output/" direction = "download" - source = "./image-generation/output/*" + source = "./image-generation/output/" } provisioner "shell" { scripts = [ From 8bef3e36510e61ac89cb853e426036489513ecb7 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Wed, 6 Jul 2022 18:59:48 +0200 Subject: [PATCH 1299/3485] [Ubuntu] Apply esl-erlang workaround for 20.04 (#5867) --- images/linux/scripts/installers/erlang.sh | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/images/linux/scripts/installers/erlang.sh b/images/linux/scripts/installers/erlang.sh index 6aaa4a86b746..00005f6f9f19 100644 --- a/images/linux/scripts/installers/erlang.sh +++ b/images/linux/scripts/installers/erlang.sh @@ -6,6 +6,7 @@ # Source the helpers for use with the script source $HELPER_SCRIPTS/install.sh +source $HELPER_SCRIPTS/os.sh source_list=/etc/apt/sources.list.d/eslerlang.list source_key=/usr/share/keyrings/eslerlang.gpg @@ -13,8 +14,28 @@ source_key=/usr/share/keyrings/eslerlang.gpg # Install Erlang wget -q -O - https://packages.erlang-solutions.com/ubuntu/erlang_solutions.asc | gpg --dearmor > $source_key echo "deb [signed-by=$source_key] https://packages.erlang-solutions.com/ubuntu $(lsb_release -cs) contrib" > $source_list + apt-get update -apt-get install -y --no-install-recommends esl-erlang + +if isUbuntu20; then + # https://github.com/actions/virtual-environments/issues/5859 + # hashes mismatch is going to happen due to not updated release file + # on the server side, + # pulling all the dependencies first without apt-cache parsing + # but ignore the error + apt-get install --no-install-recommends esl-erlang || true + + # Downoloading and installing a deb file manually, ignore deptree errors + esl_url="https://packages.erlang-solutions.com/ubuntu/pool/esl-erlang_25.0.2-1~ubuntu~focal_amd64.deb" + download_with_retries $esl_url "/tmp" + dpkg -i /tmp/esl-erlang_25.0.2-1~ubuntu~focal_amd64.deb || true + + # Restore a proper deptree which brings esl-erlang back in the loop + # but eleminate unwanted X.org dependencies + apt --no-install-recommends --fix-broken install +else + apt-get install --no-install-recommends esl-erlang +fi # Install rebar3 rebar3_url="https://github.com/erlang/rebar3/releases/latest/download/rebar3" From e657930a55f34cbd3502c04b762da4598f970526 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Thu, 7 Jul 2022 11:20:52 +0400 Subject: [PATCH 1300/3485] [Ubuntu] Update link to openssl (#5870) * Update link to openssl * Fix filename in dpkg invocation --- images/linux/scripts/installers/sqlpackage.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/linux/scripts/installers/sqlpackage.sh b/images/linux/scripts/installers/sqlpackage.sh index 25dec14cf6f1..12a3ba80f332 100644 --- a/images/linux/scripts/installers/sqlpackage.sh +++ b/images/linux/scripts/installers/sqlpackage.sh @@ -10,8 +10,8 @@ source $HELPER_SCRIPTS/os.sh # Install libssl1.1 dependency if isUbuntu22; then - download_with_retries "http://security.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.1l-1ubuntu1.5_amd64.deb" "/tmp" - dpkg -i /tmp/libssl1.1_1.1.1l-1ubuntu1.5_amd64.deb + download_with_retries "http://security.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.1l-1ubuntu1.6_amd64.deb" "/tmp" + dpkg -i /tmp/libssl1.1_1.1.1l-1ubuntu1.6_amd64.deb fi # Install SqlPackage From b87bdfb146bdd41a98f33fc9572a961e9a60e9dd Mon Sep 17 00:00:00 2001 From: Dusko Dobranic <101048884+ddobranic@users.noreply.github.com> Date: Thu, 7 Jul 2022 09:44:13 +0200 Subject: [PATCH 1301/3485] Revert "[macOS] Set properties for device set list (#5700)" (#5871) This reverts commit 4c876760cad802a2c2e21298497f82ab697b80cf. --- images/macos/provision/configuration/configure-machine.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/images/macos/provision/configuration/configure-machine.sh b/images/macos/provision/configuration/configure-machine.sh index db8fd3410138..3eadcc523667 100644 --- a/images/macos/provision/configuration/configure-machine.sh +++ b/images/macos/provision/configuration/configure-machine.sh @@ -106,6 +106,3 @@ if [ ! -d "/usr/local/bin" ];then fi chmod +x $HOME/utils/invoke-tests.sh sudo ln -s $HOME/utils/invoke-tests.sh /usr/local/bin/invoke_tests - -# Disable the App Library for fix overloaded cpu -plutil -replace SuggestionsAppLibraryEnabled -bool NO $HOME/Library/Developer/CoreSimulator/Devices/device_set.plist \ No newline at end of file From e91961e2f281b7e2888557bb27084fe060431510 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Fri, 8 Jul 2022 07:49:17 +0200 Subject: [PATCH 1302/3485] [Ubuntu] Add Microsoft Edge (#5874) trailing whitespace --- .../SoftwareReport.Browsers.psm1 | 6 +++++ .../SoftwareReport.Generator.ps1 | 1 + .../scripts/installers/microsoft-edge.sh | 24 +++++++++++++++++++ images/linux/scripts/tests/Browsers.Tests.ps1 | 8 ++++++- images/linux/ubuntu1804.json | 1 + images/linux/ubuntu2004.json | 1 + images/linux/ubuntu2204.pkr.hcl | 1 + 7 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 images/linux/scripts/installers/microsoft-edge.sh diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Browsers.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Browsers.psm1 index 8c60f8d731fb..b480419eaa56 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Browsers.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Browsers.psm1 @@ -23,6 +23,12 @@ function Get-ChromiumVersion { return $chromiumVersion } +function Get-EdgeVersion { + $edgeVersion = (microsoft-edge --version).trim() + $aptSourceRepo = Get-AptSourceRepository -PackageName "microsoft-edge" + return "$edgeVersion (apt source repository: $aptSourceRepo)" +} + function Get-SeleniumVersion { $seleniumBinaryName = Get-ToolsetValue "selenium.binary_name" $fullSeleniumVersion = (Get-ChildItem "/usr/share/java/${seleniumBinaryName}-*").Name -replace "${seleniumBinaryName}-" diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index 0b4b432ad5c3..b3a3a452fb56 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -231,6 +231,7 @@ $browsersAndDriversList = @( (Get-ChromeVersion), (Get-ChromeDriverVersion), (Get-ChromiumVersion), + (Get-EdgeVersion), (Get-SeleniumVersion) ) diff --git a/images/linux/scripts/installers/microsoft-edge.sh b/images/linux/scripts/installers/microsoft-edge.sh new file mode 100644 index 000000000000..40928991954b --- /dev/null +++ b/images/linux/scripts/installers/microsoft-edge.sh @@ -0,0 +1,24 @@ +#!/bin/bash -e +################################################################################ +## File: microsoft-edge.sh +## Desc: Installs Microsoft Edge +################################################################################ + +REPO_URL="https://packages.microsoft.com/repos/edge" +gpg_key="/usr/share/keyrings/microsoft-edge.gpg" +repo_path="/etc/apt/sources.list.d/microsoft-edge.list" + + +wget -qO- https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > $gpg_key +# Specify an arch as Microsoft repository supports armhf and arm64 as well +echo "deb [arch=amd64 signed-by=$gpg_key] $REPO_URL stable main" > $repo_path + +apt-get update +apt-get install --no-install-recommends microsoft-edge-stable + +rm $gpg_key +rm $repo_path + +echo "microsoft-edge $REPO_URL" >> $HELPER_SCRIPTS/apt-sources.txt + +invoke_tests "Browsers" "Edge" diff --git a/images/linux/scripts/tests/Browsers.Tests.ps1 b/images/linux/scripts/tests/Browsers.Tests.ps1 index e6e77bbf037b..abf4e4a392e1 100644 --- a/images/linux/scripts/tests/Browsers.Tests.ps1 +++ b/images/linux/scripts/tests/Browsers.Tests.ps1 @@ -18,8 +18,14 @@ Describe "Chrome" { } } +Describe "Edge" { + It "Edge" { + "microsoft-edge --version" | Should -ReturnZeroExitCode + } +} + Describe "Chromium" { It "Chromium" { "chromium-browser --version" | Should -ReturnZeroExitCode } -} +} diff --git a/images/linux/ubuntu1804.json b/images/linux/ubuntu1804.json index 1f64a3365c06..b36c1eb2cd57 100644 --- a/images/linux/ubuntu1804.json +++ b/images/linux/ubuntu1804.json @@ -203,6 +203,7 @@ "{{template_dir}}/scripts/installers/dotnetcore-sdk.sh", "{{template_dir}}/scripts/installers/erlang.sh", "{{template_dir}}/scripts/installers/firefox.sh", + "{{template_dir}}/scripts/installers/microsoft-edge.sh", "{{template_dir}}/scripts/installers/gcc.sh", "{{template_dir}}/scripts/installers/gfortran.sh", "{{template_dir}}/scripts/installers/git.sh", diff --git a/images/linux/ubuntu2004.json b/images/linux/ubuntu2004.json index 7c386927ec89..894de265aea4 100644 --- a/images/linux/ubuntu2004.json +++ b/images/linux/ubuntu2004.json @@ -204,6 +204,7 @@ "{{template_dir}}/scripts/installers/dotnetcore-sdk.sh", "{{template_dir}}/scripts/installers/erlang.sh", "{{template_dir}}/scripts/installers/firefox.sh", + "{{template_dir}}/scripts/installers/microsoft-edge.sh", "{{template_dir}}/scripts/installers/gcc.sh", "{{template_dir}}/scripts/installers/gfortran.sh", "{{template_dir}}/scripts/installers/git.sh", diff --git a/images/linux/ubuntu2204.pkr.hcl b/images/linux/ubuntu2204.pkr.hcl index d21eb0d3b505..776112ec0277 100644 --- a/images/linux/ubuntu2204.pkr.hcl +++ b/images/linux/ubuntu2204.pkr.hcl @@ -273,6 +273,7 @@ build { "${path.root}/scripts/installers/codeql-bundle.sh", "${path.root}/scripts/installers/containers.sh", "${path.root}/scripts/installers/dotnetcore-sdk.sh", + "${path.root}/scripts/installers/microsoft-edge.sh", "${path.root}/scripts/installers/gcc.sh", "${path.root}/scripts/installers/gfortran.sh", "${path.root}/scripts/installers/git.sh", From 6de62ee5a4159eae76dccaa301b85a082b7c69f7 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Fri, 8 Jul 2022 07:49:35 +0200 Subject: [PATCH 1303/3485] Apt Always-Include-Phased-Updates (#5873) --- images/linux/scripts/base/apt.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/images/linux/scripts/base/apt.sh b/images/linux/scripts/base/apt.sh index 05d08878c510..1f36b4a5f34d 100644 --- a/images/linux/scripts/base/apt.sh +++ b/images/linux/scripts/base/apt.sh @@ -14,6 +14,13 @@ echo "APT::Acquire::Retries \"10\";" > /etc/apt/apt.conf.d/80-retries # Configure apt to always assume Y echo "APT::Get::Assume-Yes \"true\";" > /etc/apt/apt.conf.d/90assumeyes +# APT understands a field called Phased-Update-Percentage which can be used to control the rollout of a new version. It is an integer between 0 and 100. +# In case you have multiple systems that you want to receive the same set of updates, +# you can set APT::Machine-ID to a UUID such that they all phase the same, +# or set APT::Get::Never-Include-Phased-Updates or APT::Get::Always-Include-Phased-Updates to true such that APT will never/always consider phased updates. +# apt-cache policy pkgname +echo 'APT::Get::Always-Include-Phased-Updates "true";' > /etc/apt/apt.conf.d/99-phased-updates + # Fix bad proxy and http headers settings cat <<EOF >> /etc/apt/apt.conf.d/99bad_proxy Acquire::http::Pipeline-Depth 0; From ae186119bed0fa53322f681511b45492897da3df Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Fri, 8 Jul 2022 10:40:48 +0200 Subject: [PATCH 1304/3485] Fix invoking confirm-identified-developers.scpt script (#5876) --- images/macos/provision/core/commonutils.sh | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/images/macos/provision/core/commonutils.sh b/images/macos/provision/core/commonutils.sh index daa06627afe4..3519e9c1a2ba 100644 --- a/images/macos/provision/core/commonutils.sh +++ b/images/macos/provision/core/commonutils.sh @@ -19,6 +19,22 @@ done # Execute AppleScript to change security preferences for virtualbox # System Preferences -> Security & Privacy -> General -> Unlock -> Allow -> Not now if is_Monterey; then + if is_Veertu; then + retry=10 + while [ $retry -gt 0 ]; do + { + osascript -e 'tell application "System Events" to get application processes where visible is true' + } && break + + retry=$((retry-1)) + if [ $retry -eq 0 ]; then + echo "No retry attempts left" + exit 1 + fi + sleep 10 + done + fi + osascript $HOME/utils/confirm-identified-developers.scpt $USER_PASSWORD fi From 82c8123cacdad6c0fa2717d261c430bb8e720207 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Sat, 9 Jul 2022 08:49:21 +0200 Subject: [PATCH 1305/3485] [Ubuntu] Add Microsoft Edge Web Driver (#5878) * [Ubuntu] Add Edge Web Driver * take part 0 in sw report --- .../SoftwareReport.Browsers.psm1 | 9 +++++++ .../SoftwareReport.Generator.ps1 | 1 + .../scripts/installers/microsoft-edge.sh | 25 +++++++++++++++++++ images/linux/scripts/tests/Browsers.Tests.ps1 | 4 +++ 4 files changed, 39 insertions(+) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Browsers.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Browsers.psm1 index b480419eaa56..9ba439062d79 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Browsers.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Browsers.psm1 @@ -29,6 +29,11 @@ function Get-EdgeVersion { return "$edgeVersion (apt source repository: $aptSourceRepo)" } +function Get-EdgeDriverVersion { + $edgeDriverVersion = msedgedriver --version | Take-OutputPart -Part 0,1,2,3 + return $edgeDriverVersion +} + function Get-SeleniumVersion { $seleniumBinaryName = Get-ToolsetValue "selenium.binary_name" $fullSeleniumVersion = (Get-ChildItem "/usr/share/java/${seleniumBinaryName}-*").Name -replace "${seleniumBinaryName}-" @@ -41,6 +46,10 @@ function Build-BrowserWebdriversEnvironmentTable { "Name" = "CHROMEWEBDRIVER" "Value" = $env:CHROMEWEBDRIVER }, + @{ + "Name" = "EDGEWEBDRIVER" + "Value" = $env:EDGEWEBDRIVER + }, @{ "Name" = "GECKOWEBDRIVER" "Value" = $env:GECKOWEBDRIVER diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index b3a3a452fb56..9442353271a0 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -232,6 +232,7 @@ $browsersAndDriversList = @( (Get-ChromeDriverVersion), (Get-ChromiumVersion), (Get-EdgeVersion), + (Get-EdgeDriverVersion), (Get-SeleniumVersion) ) diff --git a/images/linux/scripts/installers/microsoft-edge.sh b/images/linux/scripts/installers/microsoft-edge.sh index 40928991954b..dc3ef46f64f9 100644 --- a/images/linux/scripts/installers/microsoft-edge.sh +++ b/images/linux/scripts/installers/microsoft-edge.sh @@ -4,6 +4,8 @@ ## Desc: Installs Microsoft Edge ################################################################################ +source $HELPER_SCRIPTS/install.sh + REPO_URL="https://packages.microsoft.com/repos/edge" gpg_key="/usr/share/keyrings/microsoft-edge.gpg" repo_path="/etc/apt/sources.list.d/microsoft-edge.list" @@ -21,4 +23,27 @@ rm $repo_path echo "microsoft-edge $REPO_URL" >> $HELPER_SCRIPTS/apt-sources.txt +# Install Microsoft Edge Webdriver + +EDGEDRIVER_DIR="/usr/local/share/edge_driver" +EDGEDRIVER_BIN="$EDGEDRIVER_DIR/msedgedriver" + +mkdir -p $EDGEDRIVER_DIR + +EDGE_VERSION=$(microsoft-edge --version | cut -d' ' -f 3) +EDGE_VERSION_MAJOR=$(echo $EDGE_VERSION | cut -d'.' -f 1) + +EDGE_DRIVER_VERSION_URL="https://msedgedriver.azureedge.net/LATEST_RELEASE_${EDGE_VERSION_MAJOR}_LINUX" +# Convert a resulting file to normal UTF-8 +EDGE_DRIVER_LATEST_VERSION=$(curl -s "$EDGE_DRIVER_VERSION_URL" | iconv -f utf-16 -t utf-8 | tr -d '\r') + +EDGEDRIVER_URL="https://msedgedriver.azureedge.net/${EDGE_DRIVER_LATEST_VERSION}/edgedriver_linux64.zip" +download_with_retries $EDGEDRIVER_URL "/tmp" "edgedriver_linux64.zip" + +unzip -qq /tmp/edgedriver_linux64.zip -d $EDGEDRIVER_DIR +chmod +x $EDGEDRIVER_BIN +ln -s $EDGEDRIVER_BIN /usr/bin + +echo "EDGEWEBDRIVER=$EDGEDRIVER_DIR" | tee -a /etc/environment + invoke_tests "Browsers" "Edge" diff --git a/images/linux/scripts/tests/Browsers.Tests.ps1 b/images/linux/scripts/tests/Browsers.Tests.ps1 index abf4e4a392e1..1bb7b8f70631 100644 --- a/images/linux/scripts/tests/Browsers.Tests.ps1 +++ b/images/linux/scripts/tests/Browsers.Tests.ps1 @@ -22,6 +22,10 @@ Describe "Edge" { It "Edge" { "microsoft-edge --version" | Should -ReturnZeroExitCode } + + It "Edge Driver" { + "msedgedriver --version" | Should -ReturnZeroExitCode + } } Describe "Chromium" { From 70019eaa8fed396bce7b7965b07525c78fe47af6 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Tue, 12 Jul 2022 09:10:32 +0200 Subject: [PATCH 1306/3485] [Windows] Replace Win32_Product call to registry query (#5887) * Replace Win32_Product call to registry query * Update properties --- .../scripts/SoftwareReport/SoftwareReport.Tools.psm1 | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 index 878a838c2278..e85b328fee20 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 @@ -277,13 +277,17 @@ function Get-GHVersion { } function Get-VisualCPPComponents { - $vcpp = Get-CimInstance -ClassName Win32_Product -Filter "Name LIKE 'Microsoft Visual C++%'" - $vcpp | Sort-Object Name, Version | ForEach-Object { - $isMatch = $_.Name -match "^(?<Name>Microsoft Visual C\+\+ \d{4})\s+(?<Arch>\w{3})\s+(?<Ext>.+)\s+-" + $regKeys = @( + "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\*" + "HKLM:\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\*" + ) + $vcpp = Get-ItemProperty -Path $regKeys | Where-Object DisplayName -like "Microsoft Visual C++*" + $vcpp | Sort-Object DisplayName, DisplayVersion | ForEach-Object { + $isMatch = $_.DisplayName -match "^(?<Name>Microsoft Visual C\+\+ \d{4})\s+(?<Arch>\w{3})\s+(?<Ext>.+)\s+-" if ($isMatch) { $name = '{0} {1}' -f $matches["Name"], $matches["Ext"] $arch = $matches["Arch"].ToLower() - $version = $_.Version + $version = $_.DisplayVersion [PSCustomObject]@{ Name = $name Architecture = $arch From 0dac8e59cd4b7e7d7fd2d8765fdb23118a5691e9 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Tue, 12 Jul 2022 10:52:06 +0200 Subject: [PATCH 1307/3485] Check vm in failed status (#5893) --- images.CI/macos/anka/Anka.Helpers.psm1 | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/images.CI/macos/anka/Anka.Helpers.psm1 b/images.CI/macos/anka/Anka.Helpers.psm1 index dcf1550f2095..7e57f36bd2ff 100644 --- a/images.CI/macos/anka/Anka.Helpers.psm1 +++ b/images.CI/macos/anka/Anka.Helpers.psm1 @@ -197,7 +197,14 @@ function Wait-AnkaVMIPAddress { [int] $Seconds = 60 ) - $condition = { Get-AnkaVMIPAddress -VMName $VMName } + $condition = { + $vmStatus = Get-AnkaVMStatus -VMName $VMName + if ($vmStatus -eq "failed") { + Write-Host "`t [-] $VMName is in failed status" + exit 1 + } + Get-AnkaVMIPAddress -VMName $VMName + } $null = Invoke-WithRetry -BreakCondition $condition -RetryCount $RetryCount -Seconds $Seconds } From 4e593327cdfbb56fbf376fd93b2c2621caaccfac Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 12 Jul 2022 09:18:15 +0000 Subject: [PATCH 1308/3485] Updating readme file for ubuntu22 version 20220710.1 (#5883) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2204-Readme.md | 84 ++++++++++++++++--------------- 1 file changed, 44 insertions(+), 40 deletions(-) diff --git a/images/linux/Ubuntu2204-Readme.md b/images/linux/Ubuntu2204-Readme.md index 2181e302d0c9..68f2b7ec7f89 100644 --- a/images/linux/Ubuntu2204-Readme.md +++ b/images/linux/Ubuntu2204-Readme.md @@ -1,10 +1,11 @@ | Announcements | |-| +| [[all OSs] Android ndk-bundle along with old NDK versions will be deprecated on July, 24](https://github.com/actions/virtual-environments/issues/5879) | | [(Public Beta) Ubuntu 22.04 is now available](https://github.com/actions/virtual-environments/issues/5490) | *** # Ubuntu 22.04 LTS - Linux kernel version: 5.15.0-1013-azure -- Image Version: 20220626.1 +- Image Version: 20220710.1 ## Installed Software ### Language and Runtime @@ -16,8 +17,8 @@ - GNU C++ 9.4.0, 10.3.0, 11.2.0 - GNU Fortran 9.4.0, 10.3.0, 11.2.0 - Julia 1.7.3 -- Kotlin 1.7.0-release-281 -- Node 16.15.1 +- Kotlin 1.7.10-release-333 +- Node 16.16.0 - Perl 5.34.0 - Python 3.10.4 - Python3 3.10.4 @@ -26,14 +27,14 @@ ### Package Management - cpan 1.64 - Helm 3.9.0 -- Homebrew 3.5.2 +- Homebrew 3.5.4 - Miniconda 4.12.0 - Npm 8.11.0 - Pip 22.0.2 - Pip3 22.0.2 - Pipx 1.1.0 - RubyGems 3.3.5 -- Vcpkg (build from master \<c168ce4e7>) +- Vcpkg (build from master \<98f8d00e8>) - Yarn 1.22.19 #### Environment variables @@ -43,7 +44,7 @@ | VCPKG_INSTALLATION_ROOT | /usr/local/share/vcpkg | ### Project Management -- Lerna 5.1.6 +- Lerna 5.1.8 ### Tools - Ansible 2.13.1 @@ -51,18 +52,18 @@ - AzCopy 10.15.0 (available by `azcopy` and `azcopy10` aliases) - Bazel 5.2.0 - Bazelisk 1.12.0 -- Bicep 0.7.4 +- Bicep 0.8.9 - Buildah 1.23.1 - CMake 3.23.2 -- CodeQL Action Bundle 2.9.4 +- CodeQL Action Bundle 2.10.0 - Docker Amazon ECR Credential Helper 0.6.0 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.6.0+azure-1 +- Docker Compose v2 2.6.1+azure-1 - Docker-Buildx 0.8.2 - Docker-Moby Client 20.10.17+azure-1 - Docker-Moby Server 20.10.17+azure-1 -- Fastlane 2.206.2 -- Git 2.36.1 (apt source repository: ppa:git-core/ppa) +- Fastlane 2.207.0 +- Git 2.37.0 (apt source repository: ppa:git-core/ppa) - Git LFS 3.2.0 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.6.0 - Haveged 1.9.14 @@ -78,34 +79,34 @@ - n 8.2.0 - Newman 5.3.2 - nvm 0.39.1 -- OpenSSL 3.0.2-0ubuntu1.5 +- OpenSSL 3.0.2-0ubuntu1.6 - Packer 1.8.2 - Parcel 2.6.2 - Podman 3.4.4 -- Pulumi 3.35.1 -- R 4.2.0 +- Pulumi 3.35.3 +- R 4.2.1 - Skopeo 1.4.1 - Sphinx Open Source Search Server 2.2.11 - SVN 1.14.1 -- Terraform 1.2.3 -- yamllint 1.26.3 +- Terraform 1.2.4 +- yamllint 1.27.1 - yq 4.25.3 - zstd 1.5.2 (homebrew) ### CLI Tools - Alibaba Cloud CLI 3.0.124 -- AWS CLI 2.7.11 +- AWS CLI 2.7.14 - AWS CLI Session manager plugin 1.2.339.0 -- AWS SAM CLI 1.52.0 -- Azure CLI (azure-cli) 2.37.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) +- AWS SAM CLI 1.53.0 +- Azure CLI (azure-cli) 2.38.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.25.0 - GitHub CLI 2.13.0 - Google Cloud SDK 369.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 10.6.2 -- OpenShift CLI 4.10.18 -- ORAS CLI 0.12.0 -- Vercel CLI 25.1.0 +- Netlify CLI 10.7.1 +- OpenShift CLI 4.10.21 +- ORAS CLI 0.13.0 +- Vercel CLI 27.0.1 ### Java | Version | Vendor | Environment Variable | @@ -123,7 +124,7 @@ | Tool | Version | | -------- | ------- | | PHP | 8.1.7 | -| Composer | 2.3.7 | +| Composer | 2.3.9 | | PHPUnit | 8.5.27 | ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. @@ -135,29 +136,32 @@ - Stack 2.7.5 ### Rust Tools -- Cargo 1.61.0 -- Rust 1.61.0 -- Rustdoc 1.61.0 +- Cargo 1.62.0 +- Rust 1.62.0 +- Rustdoc 1.62.0 - Rustup 1.24.3 #### Packages - Bindgen 0.60.1 - Cargo audit 0.17.0 -- Cargo clippy 0.1.61 +- Cargo clippy 0.1.62 - Cargo outdated 0.11.1 - Cbindgen 0.24.3 - Rustfmt 1.4.38 ### Browsers and Drivers -- Google Chrome 103.0.5060.53 +- Google Chrome 103.0.5060.114 - ChromeDriver 103.0.5060.53 - Chromium 103.0.5060.0 +- Microsoft Edge 103.0.1264.51 (apt source repository: https://packages.microsoft.com/repos/edge) +- Microsoft Edge WebDriver 103.0.1264.51 - Selenium server 4.3.0 #### Environment variables | Name | Value | | ----------------- | ----------------------------------- | | CHROMEWEBDRIVER | /usr/local/share/chrome_driver | +| EDGEWEBDRIVER | /usr/local/share/edge_driver | | GECKOWEBDRIVER | | | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | @@ -190,8 +194,8 @@ - 1.18.3 #### Node.js -- 14.19.3 -- 16.15.1 +- 14.20.0 +- 16.16.0 #### PyPy - 3.7.13 [PyPy 7.3.9] @@ -225,7 +229,7 @@ | PSScriptAnalyzer | 1.20.0 | #### Az PowerShell Modules -- 7.3.2 +- 7.5.0 ### Web Servers | Name | Version | ConfigFile | ServiceStatus | ListenPort | @@ -268,10 +272,10 @@ | debian:10 | sha256:9740683722a2a8aa497a5b23e4bc229fcf8b8991e26d3935540c7704ff24012e | 2022-06-23 | | debian:11 | sha256:859ea45db307402ee024b153c7a63ad4888eb4751921abbef68679fc73c4c739 | 2022-06-23 | | moby/buildkit:latest | sha256:0dc312b04eac1b44cd2cad566deb1e886c753109208affbbec8384f381ff7f38 | 2022-05-06 | -| node:14 | sha256:ce156f9b2e9dbe73139cf0619a71188960e6c9eaba0ff832a5dfa0febf9eee27 | 2022-06-23 | -| node:14-alpine | sha256:6b87d16e4ce20cacd6f1f662f66c821e4c3c41c2903daeace52d818ec3f4bbdd | 2022-06-07 | -| node:16 | sha256:a13d2d2aec7f0dae18a52ca4d38b592e45a45cc4456ffab82e5ff10d8a53d042 | 2022-06-23 | -| node:16-alpine | sha256:c785e617c8d7015190c0d41af52cc69be8a16e3d9eb7cb21f0bb58bcfca14d6b | 2022-06-07 | +| node:14 | sha256:0c571044148fd772bbc03fd42d293939ce3e39d7aa1e095dd87c33ce89796829 | 2022-07-08 | +| node:14-alpine | sha256:2af507df45e7c0a46c6b3001ce0dbc6924f7b39864d442045f781361a1971975 | 2022-07-08 | +| node:16 | sha256:8951351b7c6a2f8ff9ec25eccc087d37a8aeccf9bf911888ff13c76223467466 | 2022-07-08 | +| node:16-alpine | sha256:554142f9a6367f1fbd776a1b2048fab3a2cc7aa477d7fe9c00ce0f110aa45716 | 2022-07-08 | | ubuntu:18.04 | sha256:478caf1bec1afd54a58435ec681c8755883b7eb843a8630091890130b15a79af | 2022-06-06 | | ubuntu:20.04 | sha256:fd92c36d3cb9b1d027c4d2a72c6bf0125da82425fc2ca37c414d4f010180dc19 | 2022-06-06 | | ubuntu:22.04 | sha256:b6b83d3c331794420340093eb706a6f152d9c1fa51b262d9bf34594887c2c7ac | 2022-06-06 | @@ -289,7 +293,7 @@ | build-essential | 12.9ubuntu3 | | bzip2 | 1.0.8-5build1 | | coreutils | 8.32-4.1ubuntu1 | -| curl | 7.81.0-1ubuntu1.2 | +| curl | 7.81.0-1ubuntu1.3 | | dbus | 1.12.20-2ubuntu4 | | dnsutils | 1:9.18.1-1ubuntu1.1 | | dpkg | 1.21.1ubuntu2.1 | @@ -298,7 +302,7 @@ | flex | 2.6.4-8build2 | | fonts-noto-color-emoji | 2.034-1 | | ftp | 20210827-4build1 | -| gnupg2 | 2.2.27-3ubuntu2 | +| gnupg2 | 2.2.27-3ubuntu2.1 | | haveged | 1.9.14-1ubuntu1 | | imagemagick | 8:6.9.11.60+dfsg-1.3build2 | | iproute2 | 5.15.0-1ubuntu2 | @@ -307,7 +311,7 @@ | lib32z1 | 1:1.2.11.dfsg-2ubuntu9 | | libc++-dev | 1:14.0-55\~exp2 | | libc++abi-dev | 1:14.0-55\~exp2 | -| libcurl4 | 7.81.0-1ubuntu1.2 | +| libcurl4 | 7.81.0-1ubuntu1.3 | | libgbm-dev | 22.0.1-1ubuntu2.1 | | libgconf-2-4 | 3.2.6-7ubuntu2 | | libgsl-dev | 2.7.1+dfsg-3 | @@ -317,7 +321,7 @@ | libmagickwand-dev | 8:6.9.11.60+dfsg-1.3build2 | | libsecret-1-dev | 0.20.5-2 | | libsqlite3-dev | 3.37.2-2 | -| libssl-dev | 3.0.2-0ubuntu1.5 | +| libssl-dev | 3.0.2-0ubuntu1.6 | | libtool | 2.4.6-15build2 | | libunwind8 | 1.3.2-2build2 | | libxkbfile-dev | 1:1.1.0-1build3 | From 1e586b007fd2f208f84c962545df5cedf58f471e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 12 Jul 2022 09:29:32 +0000 Subject: [PATCH 1309/3485] Updating readme file for ubuntu18 version 20220710.1 (#5882) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu1804-Readme.md | 84 ++++++++++++++++--------------- 1 file changed, 44 insertions(+), 40 deletions(-) diff --git a/images/linux/Ubuntu1804-Readme.md b/images/linux/Ubuntu1804-Readme.md index bb90451bafb5..5b048083889c 100644 --- a/images/linux/Ubuntu1804-Readme.md +++ b/images/linux/Ubuntu1804-Readme.md @@ -1,10 +1,11 @@ | Announcements | |-| +| [[all OSs] Android ndk-bundle along with old NDK versions will be deprecated on July, 24](https://github.com/actions/virtual-environments/issues/5879) | | [(Public Beta) Ubuntu 22.04 is now available](https://github.com/actions/virtual-environments/issues/5490) | *** # Ubuntu 18.04.6 LTS - Linux kernel version: 5.4.0-1085-azure -- Image Version: 20220626.1 +- Image Version: 20220710.1 ## Installed Software ### Language and Runtime @@ -18,10 +19,10 @@ - GNU C++ 7.5.0, 9.4.0, 10.3.0 - GNU Fortran 7.5.0, 9.4.0, 10.3.0 - Julia 1.7.3 -- Kotlin 1.7.0-release-281 +- Kotlin 1.7.10-release-333 - Mono 6.12.0.182 (apt source repository: https://download.mono-project.com/repo/ubuntu stable-bionic main) - MSBuild 16.10.1.31701 (from /usr/lib/mono/msbuild/15.0/bin/MSBuild.dll) -- Node 16.15.1 +- Node 16.16.0 - Perl 5.26.1 - Python 2.7.17 - Python3 3.6.9 @@ -31,14 +32,14 @@ ### Package Management - cpan 1.64 - Helm 3.9.0 -- Homebrew 3.5.2 +- Homebrew 3.5.4 - Miniconda 4.12.0 - Npm 8.11.0 - Pip 9.0.1 - Pip3 9.0.1 - Pipx 1.0.0 - RubyGems 2.7.6 -- Vcpkg (build from master \<c168ce4e7>) +- Vcpkg (build from master \<98f8d00e8>) - Yarn 1.22.19 #### Environment variables @@ -51,7 +52,7 @@ - Ant 1.10.5 - Gradle 7.4.2 - Maven 3.8.6 -- Sbt 1.6.2 +- Sbt 1.7.0 ### Tools - Ansible 2.11.12 @@ -59,22 +60,22 @@ - AzCopy 10.15.0 (available by `azcopy` and `azcopy10` aliases) - Bazel 5.2.0 - Bazelisk 1.12.0 -- Bicep 0.7.4 +- Bicep 0.8.9 - Buildah 1.22.3 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - CMake 3.23.2 -- CodeQL Action Bundle 2.9.4 +- CodeQL Action Bundle 2.10.0 - Docker Amazon ECR Credential Helper 0.6.0 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.6.0+azure-1 +- Docker Compose v2 2.6.1+azure-1 - Docker-Buildx 0.8.2 - Docker-Moby Client 20.10.17+azure-1 - Docker-Moby Server 20.10.17+azure-1 -- Git 2.36.1 (apt source repository: ppa:git-core/ppa) +- Git 2.37.0 (apt source repository: ppa:git-core/ppa) - Git LFS 3.2.0 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.3.1 - Haveged 1.9.1 - Heroku 7.60.2 -- HHVM (HipHop VM) 4.163.0 +- HHVM (HipHop VM) 4.164.0 - jq 1.5 - Kind 0.14.0 - Kubectl 1.24.2 @@ -86,35 +87,35 @@ - n 8.2.0 - Newman 5.3.2 - nvm 0.39.1 -- OpenSSL 1.1.1-1ubuntu2.1~18.04.19 +- OpenSSL 1.1.1-1ubuntu2.1~18.04.20 - Packer 1.8.2 - Parcel 2.6.2 - PhantomJS 2.1.1 - Podman 3.4.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- Pulumi 3.35.1 +- Pulumi 3.35.3 - R 4.2.0 - Skopeo 1.5.0 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 - SVN 1.9.7 -- Terraform 1.2.3 -- yamllint 1.26.3 +- Terraform 1.2.4 +- yamllint 1.27.1 - yq 4.25.3 - zstd 1.5.2 (homebrew) ### CLI Tools - Alibaba Cloud CLI 3.0.124 -- AWS CLI 2.7.11 +- AWS CLI 2.7.14 - AWS CLI Session manager plugin 1.2.339.0 -- AWS SAM CLI 1.52.0 -- Azure CLI (azure-cli) 2.37.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) +- AWS SAM CLI 1.53.0 +- Azure CLI (azure-cli) 2.38.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.25.0 - GitHub CLI 2.13.0 - Google Cloud SDK 369.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 10.6.2 -- OpenShift CLI 4.10.18 -- ORAS CLI 0.12.0 -- Vercel CLI 25.1.0 +- Netlify CLI 10.7.1 +- OpenShift CLI 4.10.21 +- ORAS CLI 0.13.0 +- Vercel CLI 27.0.1 ### Java | Version | Vendor | Environment Variable | @@ -128,7 +129,7 @@ | Tool | Version | | -------- | --------------------------------- | | PHP | 7.2.34 7.3.33 7.4.30 8.0.20 8.1.7 | -| Composer | 2.3.7 | +| Composer | 2.3.9 | | PHPUnit | 8.5.27 | ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. @@ -140,31 +141,34 @@ - Stack 2.7.5 ### Rust Tools -- Cargo 1.61.0 -- Rust 1.61.0 -- Rustdoc 1.61.0 +- Cargo 1.62.0 +- Rust 1.62.0 +- Rustdoc 1.62.0 - Rustup 1.24.3 #### Packages - Bindgen 0.60.1 - Cargo audit 0.17.0 -- Cargo clippy 0.1.61 +- Cargo clippy 0.1.62 - Cargo outdated 0.11.1 - Cbindgen 0.24.3 - Rustfmt 1.4.38 ### Browsers and Drivers -- Google Chrome 103.0.5060.53 +- Google Chrome 103.0.5060.114 - ChromeDriver 103.0.5060.53 - Chromium 103.0.5060.0 +- Microsoft Edge 103.0.1264.51 (apt source repository: https://packages.microsoft.com/repos/edge) +- Microsoft Edge WebDriver 103.0.1264.51 - Selenium server 4.3.0 -- Mozilla Firefox 101.0.1 +- Mozilla Firefox 102.0 - Geckodriver 0.31.0 #### Environment variables | Name | Value | | ----------------- | ----------------------------------- | | CHROMEWEBDRIVER | /usr/local/share/chrome_driver | +| EDGEWEBDRIVER | /usr/local/share/edge_driver | | GECKOWEBDRIVER | /usr/local/share/gecko_driver | | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | @@ -193,7 +197,7 @@ MySQL service is disabled by default. Use the following command as a part of your job to start the service: 'sudo systemctl start mysql.service' ``` #### MS SQL Server Client Tools -- sqlcmd 17.9.0001.1 +- sqlcmd 17.10.0001.1 - SqlPackage 16.0.6161.0 ### Cached Tools @@ -204,8 +208,8 @@ #### Node.js - 12.22.12 -- 14.19.3 -- 16.15.1 +- 14.20.0 +- 16.16.0 #### PyPy - 2.7.18 [PyPy 7.3.9] @@ -246,7 +250,7 @@ | Pester | 5.3.3 | #### Az PowerShell Modules -- 7.3.2 3.1.0.zip 4.4.0.zip 5.9.0.zip 6.6.0.zip +- 7.5.0 3.1.0.zip 4.4.0.zip 5.9.0.zip 6.6.0.zip ### Web Servers | Name | Version | ConfigFile | ServiceStatus | ListenPort | @@ -295,10 +299,10 @@ | moby/buildkit:latest | sha256:0dc312b04eac1b44cd2cad566deb1e886c753109208affbbec8384f381ff7f38 | 2022-05-06 | | node:12 | sha256:01627afeb110b3054ba4a1405541ca095c8bfca1cb6f2be9479c767a2711879e | 2022-04-20 | | node:12-alpine | sha256:d4b15b3d48f42059a15bd659be60afe21762aae9d6cbea6f124440895c27db68 | 2022-04-11 | -| node:14 | sha256:ce156f9b2e9dbe73139cf0619a71188960e6c9eaba0ff832a5dfa0febf9eee27 | 2022-06-23 | -| node:14-alpine | sha256:6b87d16e4ce20cacd6f1f662f66c821e4c3c41c2903daeace52d818ec3f4bbdd | 2022-06-07 | -| node:16 | sha256:a13d2d2aec7f0dae18a52ca4d38b592e45a45cc4456ffab82e5ff10d8a53d042 | 2022-06-23 | -| node:16-alpine | sha256:c785e617c8d7015190c0d41af52cc69be8a16e3d9eb7cb21f0bb58bcfca14d6b | 2022-06-07 | +| node:14 | sha256:0c571044148fd772bbc03fd42d293939ce3e39d7aa1e095dd87c33ce89796829 | 2022-07-08 | +| node:14-alpine | sha256:2af507df45e7c0a46c6b3001ce0dbc6924f7b39864d442045f781361a1971975 | 2022-07-08 | +| node:16 | sha256:8951351b7c6a2f8ff9ec25eccc087d37a8aeccf9bf911888ff13c76223467466 | 2022-07-08 | +| node:16-alpine | sha256:554142f9a6367f1fbd776a1b2048fab3a2cc7aa477d7fe9c00ce0f110aa45716 | 2022-07-08 | | ubuntu:16.04 | sha256:20858ebbc96215d6c3c574f781133ebffdc7c18d98af4f294cc4c04871a6fe61 | 2021-08-31 | | ubuntu:18.04 | sha256:478caf1bec1afd54a58435ec681c8755883b7eb843a8630091890130b15a79af | 2022-06-06 | | ubuntu:20.04 | sha256:fd92c36d3cb9b1d027c4d2a72c6bf0125da82425fc2ca37c414d4f010180dc19 | 2022-06-06 | @@ -315,7 +319,7 @@ | build-essential | 12.4ubuntu1 | | bzip2 | 1.0.6-8.1ubuntu0.2 | | coreutils | 8.28-1ubuntu1 | -| curl | 7.58.0-2ubuntu3.18 | +| curl | 7.58.0-2ubuntu3.19 | | dbus | 1.12.2-1ubuntu1.3 | | dnsutils | 1:9.11.3+dfsg-1ubuntu1.17 | | dpkg | 1.19.0.5ubuntu2.4 | @@ -323,7 +327,7 @@ | file | 1:5.32-2ubuntu0.4 | | flex | 2.6.4-6 | | ftp | 0.17-34 | -| gnupg2 | 2.2.4-1ubuntu1.5 | +| gnupg2 | 2.2.4-1ubuntu1.6 | | haveged | 1.9.1-6 | | imagemagick | 8:6.9.7.4+dfsg-16ubuntu6.13 | | iproute2 | 4.15.0-2ubuntu1.3 | @@ -332,7 +336,7 @@ | lib32z1 | 1:1.2.11.dfsg-0ubuntu2.1 | | libc++-dev | 6.0-2 | | libc++abi-dev | 6.0-2 | -| libcurl3 | 7.58.0-2ubuntu3.18 | +| libcurl3 | 7.58.0-2ubuntu3.19 | | libgbm-dev | 20.0.8-0ubuntu1\~18.04.1 | | libgconf-2-4 | 3.2.6-4ubuntu1 | | libgsl-dev | 2.4+dfsg-6 | From eb3d502914745c631d137166035549b7890ab61c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 12 Jul 2022 10:22:32 +0000 Subject: [PATCH 1310/3485] Updating readme file for ubuntu20 version 20220710.1 (#5885) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2004-Readme.md | 90 ++++++++++++++++--------------- 1 file changed, 47 insertions(+), 43 deletions(-) diff --git a/images/linux/Ubuntu2004-Readme.md b/images/linux/Ubuntu2004-Readme.md index 1852bd839a8b..4141298d8396 100644 --- a/images/linux/Ubuntu2004-Readme.md +++ b/images/linux/Ubuntu2004-Readme.md @@ -1,10 +1,11 @@ | Announcements | |-| +| [[all OSs] Android ndk-bundle along with old NDK versions will be deprecated on July, 24](https://github.com/actions/virtual-environments/issues/5879) | | [(Public Beta) Ubuntu 22.04 is now available](https://github.com/actions/virtual-environments/issues/5490) | *** # Ubuntu 20.04.4 LTS - Linux kernel version: 5.13.0-1031-azure -- Image Version: 20220626.1 +- Image Version: 20220710.1 ## Installed Software ### Language and Runtime @@ -18,10 +19,10 @@ - GNU C++ 9.4.0, 10.3.0 - GNU Fortran 9.4.0, 10.3.0 - Julia 1.7.3 -- Kotlin 1.7.0-release-281 +- Kotlin 1.7.10-release-333 - Mono 6.12.0.182 (apt source repository: https://download.mono-project.com/repo/ubuntu stable-focal main) - MSBuild 16.10.1.31701 (from /usr/lib/mono/msbuild/15.0/bin/MSBuild.dll) -- Node 16.15.1 +- Node 16.16.0 - Perl 5.30.0 - Python 3.8.10 - Python3 3.8.10 @@ -31,14 +32,14 @@ ### Package Management - cpan 1.64 - Helm 3.9.0 -- Homebrew 3.5.2 +- Homebrew 3.5.4 - Miniconda 4.12.0 - Npm 8.11.0 - Pip 20.0.2 - Pip3 20.0.2 - Pipx 1.1.0 - RubyGems 3.1.2 -- Vcpkg (build from master \<c168ce4e7>) +- Vcpkg (build from master \<98f8d00e8>) - Yarn 1.22.19 #### Environment variables @@ -50,9 +51,9 @@ ### Project Management - Ant 1.10.7 - Gradle 7.4.2 -- Lerna 5.1.6 +- Lerna 5.1.8 - Maven 3.8.6 -- Sbt 1.6.2 +- Sbt 1.7.0 ### Tools - Ansible 2.13.1 @@ -60,23 +61,23 @@ - AzCopy 10.15.0 (available by `azcopy` and `azcopy10` aliases) - Bazel 5.2.0 - Bazelisk 1.12.0 -- Bicep 0.7.4 +- Bicep 0.8.9 - Buildah 1.22.3 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - CMake 3.23.2 -- CodeQL Action Bundle 2.9.4 +- CodeQL Action Bundle 2.10.0 - Docker Amazon ECR Credential Helper 0.6.0 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.6.0+azure-1 +- Docker Compose v2 2.6.1+azure-1 - Docker-Buildx 0.8.2 - Docker-Moby Client 20.10.17+azure-1 - Docker-Moby Server 20.10.17+azure-1 -- Fastlane 2.206.2 -- Git 2.36.1 (apt source repository: ppa:git-core/ppa) +- Fastlane 2.207.0 +- Git 2.37.0 (apt source repository: ppa:git-core/ppa) - Git LFS 3.2.0 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.6.0 - Haveged 1.9.1 - Heroku 7.60.2 -- HHVM (HipHop VM) 4.163.0 +- HHVM (HipHop VM) 4.164.0 - jq 1.6 - Kind 0.14.0 - Kubectl 1.24.2 @@ -88,35 +89,35 @@ - n 8.2.0 - Newman 5.3.2 - nvm 0.39.1 -- OpenSSL 1.1.1f-1ubuntu2.15 +- OpenSSL 1.1.1f-1ubuntu2.16 - Packer 1.8.2 - Parcel 2.6.2 - PhantomJS 2.1.1 - Podman 3.4.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- Pulumi 3.35.1 -- R 4.2.0 +- Pulumi 3.35.3 +- R 4.2.1 - Skopeo 1.5.0 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 -- Terraform 1.2.3 -- yamllint 1.26.3 +- Terraform 1.2.4 +- yamllint 1.27.1 - yq 4.25.3 - zstd 1.5.2 (homebrew) ### CLI Tools - Alibaba Cloud CLI 3.0.124 -- AWS CLI 2.7.11 +- AWS CLI 2.7.14 - AWS CLI Session manager plugin 1.2.339.0 -- AWS SAM CLI 1.52.0 -- Azure CLI (azure-cli) 2.37.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) +- AWS SAM CLI 1.53.0 +- Azure CLI (azure-cli) 2.38.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.25.0 - GitHub CLI 2.13.0 - Google Cloud SDK 369.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 10.6.2 -- OpenShift CLI 4.10.18 -- ORAS CLI 0.12.0 -- Vercel CLI 25.1.0 +- Netlify CLI 10.7.1 +- OpenShift CLI 4.10.21 +- ORAS CLI 0.13.0 +- Vercel CLI 27.0.1 ### Java | Version | Vendor | Environment Variable | @@ -134,7 +135,7 @@ | Tool | Version | | -------- | ------------------- | | PHP | 7.4.30 8.0.20 8.1.7 | -| Composer | 2.3.7 | +| Composer | 2.3.9 | | PHPUnit | 8.5.27 | ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. @@ -146,31 +147,34 @@ - Stack 2.7.5 ### Rust Tools -- Cargo 1.61.0 -- Rust 1.61.0 -- Rustdoc 1.61.0 +- Cargo 1.62.0 +- Rust 1.62.0 +- Rustdoc 1.62.0 - Rustup 1.24.3 #### Packages - Bindgen 0.60.1 - Cargo audit 0.17.0 -- Cargo clippy 0.1.61 +- Cargo clippy 0.1.62 - Cargo outdated 0.11.1 - Cbindgen 0.24.3 - Rustfmt 1.4.38 ### Browsers and Drivers -- Google Chrome 103.0.5060.53 +- Google Chrome 103.0.5060.114 - ChromeDriver 103.0.5060.53 - Chromium 103.0.5060.0 +- Microsoft Edge 103.0.1264.51 (apt source repository: https://packages.microsoft.com/repos/edge) +- Microsoft Edge WebDriver 103.0.1264.51 - Selenium server 4.3.0 -- Mozilla Firefox 101.0.1 +- Mozilla Firefox 102.0 - Geckodriver 0.31.0 #### Environment variables | Name | Value | | ----------------- | ----------------------------------- | | CHROMEWEBDRIVER | /usr/local/share/chrome_driver | +| EDGEWEBDRIVER | /usr/local/share/edge_driver | | GECKOWEBDRIVER | /usr/local/share/gecko_driver | | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | @@ -199,7 +203,7 @@ MySQL service is disabled by default. Use the following command as a part of your job to start the service: 'sudo systemctl start mysql.service' ``` #### MS SQL Server Client Tools -- sqlcmd 17.9.0001.1 +- sqlcmd 17.10.0001.1 - SqlPackage 16.0.6161.0 ### Cached Tools @@ -210,8 +214,8 @@ #### Node.js - 12.22.12 -- 14.19.3 -- 16.15.1 +- 14.20.0 +- 16.16.0 #### PyPy - 2.7.18 [PyPy 7.3.9] @@ -254,7 +258,7 @@ | PSScriptAnalyzer | 1.20.0 | #### Az PowerShell Modules -- 7.3.2 3.1.0.zip 4.4.0.zip 5.9.0.zip 6.6.0.zip +- 7.5.0 3.1.0.zip 4.4.0.zip 5.9.0.zip 6.6.0.zip ### Web Servers | Name | Version | ConfigFile | ServiceStatus | ListenPort | @@ -303,10 +307,10 @@ | moby/buildkit:latest | sha256:0dc312b04eac1b44cd2cad566deb1e886c753109208affbbec8384f381ff7f38 | 2022-05-06 | | node:12 | sha256:01627afeb110b3054ba4a1405541ca095c8bfca1cb6f2be9479c767a2711879e | 2022-04-20 | | node:12-alpine | sha256:d4b15b3d48f42059a15bd659be60afe21762aae9d6cbea6f124440895c27db68 | 2022-04-11 | -| node:14 | sha256:ce156f9b2e9dbe73139cf0619a71188960e6c9eaba0ff832a5dfa0febf9eee27 | 2022-06-23 | -| node:14-alpine | sha256:6b87d16e4ce20cacd6f1f662f66c821e4c3c41c2903daeace52d818ec3f4bbdd | 2022-06-07 | -| node:16 | sha256:a13d2d2aec7f0dae18a52ca4d38b592e45a45cc4456ffab82e5ff10d8a53d042 | 2022-06-23 | -| node:16-alpine | sha256:c785e617c8d7015190c0d41af52cc69be8a16e3d9eb7cb21f0bb58bcfca14d6b | 2022-06-07 | +| node:14 | sha256:0c571044148fd772bbc03fd42d293939ce3e39d7aa1e095dd87c33ce89796829 | 2022-07-08 | +| node:14-alpine | sha256:2af507df45e7c0a46c6b3001ce0dbc6924f7b39864d442045f781361a1971975 | 2022-07-08 | +| node:16 | sha256:8951351b7c6a2f8ff9ec25eccc087d37a8aeccf9bf911888ff13c76223467466 | 2022-07-08 | +| node:16-alpine | sha256:554142f9a6367f1fbd776a1b2048fab3a2cc7aa477d7fe9c00ce0f110aa45716 | 2022-07-08 | | ubuntu:16.04 | sha256:20858ebbc96215d6c3c574f781133ebffdc7c18d98af4f294cc4c04871a6fe61 | 2021-08-31 | | ubuntu:18.04 | sha256:478caf1bec1afd54a58435ec681c8755883b7eb843a8630091890130b15a79af | 2022-06-06 | | ubuntu:20.04 | sha256:fd92c36d3cb9b1d027c4d2a72c6bf0125da82425fc2ca37c414d4f010180dc19 | 2022-06-06 | @@ -324,7 +328,7 @@ | build-essential | 12.8ubuntu1.1 | | bzip2 | 1.0.8-2 | | coreutils | 8.30-3ubuntu2 | -| curl | 7.68.0-1ubuntu2.11 | +| curl | 7.68.0-1ubuntu2.12 | | dbus | 1.12.16-2ubuntu2.2 | | dnsutils | 1:9.16.1-0ubuntu2.10 | | dpkg | 1.19.7ubuntu3.2 | @@ -333,7 +337,7 @@ | flex | 2.6.4-6.2 | | fonts-noto-color-emoji | 0\~20200916-1\~ubuntu20.04.1 | | ftp | 0.17-34.1 | -| gnupg2 | 2.2.19-3ubuntu2.1 | +| gnupg2 | 2.2.19-3ubuntu2.2 | | haveged | 1.9.1-6ubuntu1 | | imagemagick | 8:6.9.10.23+dfsg-2.1ubuntu11.4 | | iproute2 | 5.5.0-1ubuntu1 | @@ -342,7 +346,7 @@ | lib32z1 | 1:1.2.11.dfsg-2ubuntu1.3 | | libc++-dev | 1:10.0-50\~exp1 | | libc++abi-dev | 1:10.0-50\~exp1 | -| libcurl4 | 7.68.0-1ubuntu2.11 | +| libcurl4 | 7.68.0-1ubuntu2.12 | | libgbm-dev | 21.2.6-0ubuntu0.1\~20.04.2 | | libgconf-2-4 | 3.2.6-6ubuntu1 | | libgsl-dev | 2.5+dfsg-6build1 | From 0e0c1b467ad54f7169d1598d098f48e55e03017d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 12 Jul 2022 10:27:49 +0000 Subject: [PATCH 1311/3485] Updating readme file for win22 version 20220710.1 (#5886) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2022-Readme.md | 68 +++++++++++++++++--------------- 1 file changed, 37 insertions(+), 31 deletions(-) diff --git a/images/win/Windows2022-Readme.md b/images/win/Windows2022-Readme.md index 8089e969cdba..568fd6ccc79a 100644 --- a/images/win/Windows2022-Readme.md +++ b/images/win/Windows2022-Readme.md @@ -1,10 +1,12 @@ | Announcements | |-| +| [[all OSs] Android ndk-bundle along with old NDK versions will be deprecated on July, 24](https://github.com/actions/virtual-environments/issues/5879) | +| [[Windows, macOS] LLVM will be updated to version 14 on July, 11](https://github.com/actions/virtual-environments/issues/5835) | | [[Azure DevOps] Windows-2016 environment removal postponed until June 30, 2022](https://github.com/actions/virtual-environments/issues/5403) | *** # Microsoft Windows Server 2022 Datacenter - OS Version: 10.0.20348 Build 768 -- Image Version: 20220626.1 +- Image Version: 20220710.1 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -14,17 +16,17 @@ - Bash 4.4.23(1)-release - Go 1.17.11 - Julia 1.7.3 -- Kotlin 1.7.0 -- LLVM 13.0.1 -- Node 16.15.1 +- Kotlin 1.7.10 +- LLVM 14.0.6 +- Node 16.16.0 - Perl 5.32.1 -- PHP 8.1.7 +- PHP 8.1.8 - Python 3.9.13 - Ruby 3.0.4p208 ### Package Management - Chocolatey 1.1.0 -- Composer 2.3.7 +- Composer 2.3.9 - Helm 3.8.2 - Miniconda 4.12.0 (pre-installed on the image but not added to PATH) - NPM 8.11.0 @@ -32,7 +34,7 @@ - pip 22.1.2 (python 3.9) - Pipx 1.1.0 - RubyGems 3.2.33 -- Vcpkg (build from master \<c168ce4e7>) +- Vcpkg (build from master \<98f8d00e8>) - Yarn 1.22.19 #### Environment variables @@ -52,17 +54,17 @@ - azcopy 10.15.0 - Bazel 5.2.0 - Bazelisk 1.12.0 -- Bicep 0.7.4 +- Bicep 0.8.9 - Cabal 3.6.2.0 - CMake 3.23.2 -- CodeQL Action Bundle 2.9.4 +- CodeQL Action Bundle 2.10.0 - Docker 20.10.7 - Docker Compose v1 1.29.2 - Docker Compose v2 2.6.1 - Docker-wincred 0.6.4 - ghc 9.2.3 -- Git 2.36.1.windows.1 -- Git LFS 3.1.4 +- Git 2.37.0.windows.1 +- Git LFS 3.2.0 - InnoSetup 6.2.1 - jq 1.6 - Kind 0.14.0 @@ -72,8 +74,8 @@ - Newman 5.3.2 - NSIS v3.08 - OpenSSL 1.1.1 -- Packer 1.8.1 -- Pulumi v3.35.1 +- Packer 1.8.2 +- Pulumi v3.35.3 - R 4.2.1 - Service Fabric SDK 9.0.1028.9590 - Stack 2.7.5 @@ -82,23 +84,23 @@ - VSWhere 3.0.3 - WinAppDriver 1.2.2009.02003 - WiX Toolset v3.11.2.4516 -- yamllint 1.26.3 +- yamllint 1.27.1 - zstd 1.5.2 ### CLI Tools - Alibaba Cloud CLI 3.0.124 -- AWS CLI 2.7.11 -- AWS SAM CLI 1.52.0 +- AWS CLI 2.7.14 +- AWS SAM CLI 1.53.0 - AWS Session Manager CLI 1.2.339.0 -- Azure CLI 2.37.0 +- Azure CLI 2.38.0 - Azure DevOps CLI extension 0.25.0 - GitHub CLI 2.13.0 - Hub CLI 2.14.2 ### Rust Tools -- Cargo 1.61.0 -- Rust 1.61.0 -- Rustdoc 1.61.0 +- Cargo 1.62.0 +- Rust 1.62.0 +- Rustdoc 1.62.0 - Rustup 1.24.3 #### Packages @@ -106,15 +108,15 @@ - cargo-audit 0.17.0 - cargo-outdated 0.11.1 - cbindgen 0.24.3 -- Clippy 0.1.61 +- Clippy 0.1.62 - Rustfmt 1.4.38 ### Browsers and webdrivers -- Google Chrome 103.0.5060.53 +- Google Chrome 103.0.5060.114 - Chrome Driver 103.0.5060.53 -- Microsoft Edge 103.0.1264.37 -- Microsoft Edge Driver 103.0.1264.37 -- Mozilla Firefox 101.0.1 +- Microsoft Edge 103.0.1264.49 +- Microsoft Edge Driver 103.0.1264.49 +- Mozilla Firefox 102.0.1 - Gecko Driver 0.31.0 - IE Driver 3.150.1.1 - Selenium server 4.3.0 @@ -163,8 +165,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Version | Architecture | | ------- | ------------ | | 12.22.12 | x64 | -| 14.19.3 | x64 | -| 16.15.1 | x64 | +| 14.20.0 | x64 | +| 16.16.0 | x64 | #### Python | Version | Architecture | @@ -208,7 +210,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | 5.0.9.0 | MongoDB | Running | Automatic | ### Database tools -- Azure CosmosDb Emulator 2.14.7.0 +- Azure CosmosDb Emulator 2.14.9.0 - DacFx 16.0.6161.0 - MySQL 8.0.29.0 - SQL OLEDB Driver 18.6.3.0 @@ -217,7 +219,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Web Servers | Name | Version | ConfigFile | ServiceName | ServiceStatus | ListenPort | | ------ | ------- | ------------------------------------- | ----------- | ------------- | ---------- | -| Apache | 2.4.53 | C:\tools\Apache24\conf\httpd.conf | Apache | Stopped | 80 | +| Apache | 2.4.54 | C:\tools\Apache24\conf\httpd.conf | Apache | Stopped | 80 | | Nginx | 1.23.0 | C:\tools\nginx-1.23.0\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2022 @@ -339,6 +341,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Component.TypeScript.TSServer | 17.2.32408.312 | | Microsoft.VisualStudio.Component.Unity | 17.2.32408.312 | | Microsoft.VisualStudio.Component.UWP.VC.ARM64 | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.UWP.VC.ARM64EC | 17.2.32408.312 | | Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM | 17.2.32408.312 | | Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM.Spectre | 17.2.32408.312 | | Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM64 | 17.2.32408.312 | @@ -356,6 +359,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Component.VC.ATL.ARM64 | 17.2.32408.312 | | Microsoft.VisualStudio.Component.VC.ATL.ARM64.Spectre | 17.2.32408.312 | | Microsoft.VisualStudio.Component.VC.ATL.ARM64EC | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.VC.ATL.ARM64EC.Spectre | 17.2.32408.312 | | Microsoft.VisualStudio.Component.VC.ATL.Spectre | 17.2.32408.312 | | Microsoft.VisualStudio.Component.VC.ATLMFC | 17.2.32408.312 | | Microsoft.VisualStudio.Component.VC.ATLMFC.Spectre | 17.2.32408.312 | @@ -371,6 +375,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Component.VC.MFC.ARM64 | 17.2.32408.312 | | Microsoft.VisualStudio.Component.VC.MFC.ARM64.Spectre | 17.2.32408.312 | | Microsoft.VisualStudio.Component.VC.MFC.ARM64EC | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.VC.MFC.ARM64EC.Spectre | 17.2.32408.312 | | Microsoft.VisualStudio.Component.VC.Modules.x86.x64 | 17.2.32408.312 | | Microsoft.VisualStudio.Component.VC.Redist.14.Latest | 17.2.32408.312 | | Microsoft.VisualStudio.Component.VC.Redist.MSM | 17.2.32408.312 | @@ -444,6 +449,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | wasm.tools | 6.0.622.26707 | | ProBITools.MicrosoftReportProjectsforVisualStudio2022 | 3.0.1 | | VisualStudioClient.MicrosoftVisualStudio2022InstallerProjects | 2.0.0 | +| Windows Driver Kit | 10.1.22621.1 | | WixToolset.WixToolsetVisualStudio2022Extension | 1.0.0.18 | #### Microsoft Visual C++: @@ -496,7 +502,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Azure Powershell Modules | Module | Version | Path | | ------- | ------------------------------------------------------------------------------- | ------------------------------ | -| Az | 6.6.0.zip<br>7.3.2 | C:\Modules\az_\<version\> | +| Az | 6.6.0.zip<br>7.5.0 | C:\Modules\az_\<version\> | | Azure | 2.1.0 [Installed]<br>3.8.0.zip<br>4.2.1.zip<br>5.1.1.zip<br>5.3.0 | C:\Modules\azure_\<version\> | | AzureRM | 2.1.0 [Installed]<br>3.8.0.zip<br>4.2.1.zip<br>5.1.1.zip<br>6.7.0.zip<br>6.13.1 | C:\Modules\azurerm_\<version\> | ``` @@ -508,7 +514,7 @@ All other versions are saved but not installed. #### Powershell Modules | Module | Version | | ------------------ | ---------------- | -| AWSPowerShell | 4.1.113 | +| AWSPowerShell | 4.1.122 | | DockerMsftProvider | 1.0.0.8 | | MarkdownPS | 1.9 | | Microsoft.Graph | 1.10.0 | From 68eabdf497f4af6bf8211c5c65e9640b7ba53328 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 12 Jul 2022 10:55:46 +0000 Subject: [PATCH 1312/3485] Updating readme file for win19 version 20220710.1 (#5884) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2019-Readme.md | 80 ++++++++++++++++---------------- 1 file changed, 41 insertions(+), 39 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index f19a3abaab36..242dd3a547aa 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -1,10 +1,12 @@ | Announcements | |-| +| [[all OSs] Android ndk-bundle along with old NDK versions will be deprecated on July, 24](https://github.com/actions/virtual-environments/issues/5879) | +| [[Windows, macOS] LLVM will be updated to version 14 on July, 11](https://github.com/actions/virtual-environments/issues/5835) | | [[Azure DevOps] Windows-2016 environment removal postponed until June 30, 2022](https://github.com/actions/virtual-environments/issues/5403) | *** # Microsoft Windows Server 2019 Datacenter - OS Version: 10.0.17763 Build 3046 -- Image Version: 20220626.1 +- Image Version: 20220710.1 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -14,17 +16,17 @@ - Bash 4.4.23(1)-release - Go 1.17.11 - Julia 1.7.3 -- Kotlin 1.7.0 -- LLVM 13.0.1 -- Node 16.15.1 +- Kotlin 1.7.10 +- LLVM 14.0.6 +- Node 16.16.0 - Perl 5.32.1 -- PHP 8.1.7 +- PHP 8.1.8 - Python 3.7.9 - Ruby 2.5.9p229 ### Package Management - Chocolatey 1.1.0 -- Composer 2.3.7 +- Composer 2.3.9 - Helm 3.8.2 - Miniconda 4.12.0 (pre-installed on the image but not added to PATH) - NPM 8.11.0 @@ -32,7 +34,7 @@ - pip 22.1.2 (python 3.7) - Pipx 1.1.0 - RubyGems 2.7.6.3 -- Vcpkg (build from master \<c168ce4e7>) +- Vcpkg (build from master \<98f8d00e8>) - Yarn 1.22.19 #### Environment variables @@ -53,18 +55,18 @@ - azcopy 10.15.0 - Bazel 5.2.0 - Bazelisk 1.12.0 -- Bicep 0.7.4 +- Bicep 0.8.9 - Cabal 3.6.2.0 - CMake 3.23.2 -- CodeQL Action Bundle 2.9.4 +- CodeQL Action Bundle 2.10.0 - Docker 20.10.7 - Docker Compose v1 1.29.2 - Docker Compose v2 2.6.1 - Docker-wincred 0.6.4 - ghc 9.2.3 -- Git 2.36.1.windows.1 -- Git LFS 3.1.4 -- Google Cloud SDK 391.0.0 +- Git 2.37.0.windows.1 +- Git LFS 3.2.0 +- Google Cloud SDK 392.0.0 - InnoSetup 6.2.1 - jq 1.6 - Kind 0.14.0 @@ -74,9 +76,9 @@ - Newman 5.3.2 - NSIS v3.08 - OpenSSL 1.1.1 -- Packer 1.8.1 +- Packer 1.8.2 - Parcel 2.6.2 -- Pulumi v3.35.1 +- Pulumi v3.35.3 - R 4.2.1 - Service Fabric SDK 9.0.1028.9590 - Stack 2.7.5 @@ -85,24 +87,24 @@ - VSWhere 3.0.3 - WinAppDriver 1.2.2009.02003 - WiX Toolset v3.11.2.4516 -- yamllint 1.26.3 +- yamllint 1.27.1 - zstd 1.5.2 ### CLI Tools - Alibaba Cloud CLI 3.0.124 -- AWS CLI 2.7.11 -- AWS SAM CLI 1.52.0 +- AWS CLI 2.7.14 +- AWS SAM CLI 1.53.0 - AWS Session Manager CLI 1.2.339.0 -- Azure CLI 2.37.0 +- Azure CLI 2.38.0 - Azure DevOps CLI extension 0.25.0 - Cloud Foundry CLI 6.53.0 - GitHub CLI 2.13.0 - Hub CLI 2.14.2 ### Rust Tools -- Cargo 1.61.0 -- Rust 1.61.0 -- Rustdoc 1.61.0 +- Cargo 1.62.0 +- Rust 1.62.0 +- Rustdoc 1.62.0 - Rustup 1.24.3 #### Packages @@ -110,15 +112,15 @@ - cargo-audit 0.17.0 - cargo-outdated 0.11.1 - cbindgen 0.24.3 -- Clippy 0.1.61 +- Clippy 0.1.62 - Rustfmt 1.4.38 ### Browsers and webdrivers -- Google Chrome 103.0.5060.53 +- Google Chrome 103.0.5060.114 - Chrome Driver 103.0.5060.53 -- Microsoft Edge 103.0.1264.37 -- Microsoft Edge Driver 103.0.1264.37 -- Mozilla Firefox 101.0.1 +- Microsoft Edge 103.0.1264.49 +- Microsoft Edge Driver 103.0.1264.49 +- Mozilla Firefox 102.0.1 - Gecko Driver 0.31.0 - IE Driver 3.150.1.1 - Selenium server 4.3.0 @@ -171,8 +173,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Version | Architecture | | ------- | ------------ | | 12.22.12 | x64 | -| 14.19.3 | x64 | -| 16.15.1 | x64 | +| 14.20.0 | x64 | +| 16.16.0 | x64 | #### Python | Version | Architecture | @@ -222,7 +224,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | 5.0.9.0 | MongoDB | Running | Automatic | ### Database tools -- Azure CosmosDb Emulator 2.14.7.0 +- Azure CosmosDb Emulator 2.14.9.0 - DacFx 16.0.6161.0 - MySQL 5.7.38.0 - SQL OLEDB Driver 18.6.3.0 @@ -231,7 +233,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Web Servers | Name | Version | ConfigFile | ServiceName | ServiceStatus | ListenPort | | ------ | ------- | ------------------------------------- | ----------- | ------------- | ---------- | -| Apache | 2.4.53 | C:\tools\Apache24\conf\httpd.conf | Apache | Stopped | 80 | +| Apache | 2.4.54 | C:\tools\Apache24\conf\httpd.conf | Apache | Stopped | 80 | | Nginx | 1.23.0 | C:\tools\nginx-1.23.0\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2019 @@ -470,9 +472,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | ProBITools.MicrosoftReportProjectsforVisualStudio | 2.6.11 | | SSIS.SqlServerIntegrationServicesProjects | 4.0 | | VisualStudioClient.MicrosoftVisualStudio2017InstallerProjects | 1.0.2 | -| Windows Driver Kit | 10.0.21381.0 | -| Windows Driver Kit Visual Studio Extension | 10.1.22000.1 | -| Windows Software Development Kit Extension | 10.1.22000.194 | +| Windows Driver Kit | 10.1.22000.1 | +| Windows Driver Kit Visual Studio Extension | 10.0.21381.0 | +| Windows Software Development Kit | 10.1.22000.194 | | WIX Toolset Studio 2019 Extension | 1.0.0.18 | | WixToolset.WixToolsetVisualStudio2019Extension | 1.0.0.18 | @@ -489,10 +491,10 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft Visual C++ 2013 Minimum Runtime | x86 | 12.0.21005 | | Microsoft Visual C++ 2019 Debug Runtime | x64 | 14.29.30139 | | Microsoft Visual C++ 2019 Debug Runtime | x86 | 14.29.30139 | -| Microsoft Visual C++ 2022 Additional Runtime | x64 | 14.32.31326 | -| Microsoft Visual C++ 2022 Minimum Runtime | x64 | 14.32.31326 | -| Microsoft Visual C++ 2022 Additional Runtime | x86 | 14.32.31326 | -| Microsoft Visual C++ 2022 Minimum Runtime | x86 | 14.32.31326 | +| Microsoft Visual C++ 2022 Additional Runtime | x64 | 14.32.31332 | +| Microsoft Visual C++ 2022 Minimum Runtime | x64 | 14.32.31332 | +| Microsoft Visual C++ 2022 Additional Runtime | x86 | 14.32.31332 | +| Microsoft Visual C++ 2022 Minimum Runtime | x86 | 14.32.31332 | #### Installed Windows SDKs `Location C:\Program Files (x86)\Windows Kits\10\Extension SDKs\WindowsDesktop` @@ -534,7 +536,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Azure Powershell Modules | Module | Version | Path | | ------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ------------------------------ | -| Az | 1.0.0.zip<br>1.6.0.zip<br>2.3.2.zip<br>2.6.0.zip<br>3.1.0.zip<br>3.5.0.zip<br>3.8.0.zip<br>4.3.0.zip<br>4.4.0.zip<br>4.7.0.zip<br>5.5.0.zip<br>5.9.0.zip<br>6.6.0.zip<br>7.3.2 | C:\Modules\az_\<version\> | +| Az | 1.0.0.zip<br>1.6.0.zip<br>2.3.2.zip<br>2.6.0.zip<br>3.1.0.zip<br>3.5.0.zip<br>3.8.0.zip<br>4.3.0.zip<br>4.4.0.zip<br>4.7.0.zip<br>5.5.0.zip<br>5.9.0.zip<br>6.6.0.zip<br>7.5.0 | C:\Modules\az_\<version\> | | Azure | 2.1.0 [Installed]<br>3.8.0.zip<br>4.2.1.zip<br>5.1.1.zip<br>5.3.0 | C:\Modules\azure_\<version\> | | AzureRM | 2.1.0 [Installed]<br>3.8.0.zip<br>4.2.1.zip<br>5.1.1.zip<br>6.7.0.zip<br>6.13.1 | C:\Modules\azurerm_\<version\> | ``` @@ -546,7 +548,7 @@ All other versions are saved but not installed. #### Powershell Modules | Module | Version | | ------------------ | ---------------- | -| AWSPowerShell | 4.1.113 | +| AWSPowerShell | 4.1.122 | | DockerMsftProvider | 1.0.0.8 | | MarkdownPS | 1.9 | | Microsoft.Graph | 1.10.0 | From 76dc052e1520a5509e4f6e141e67409f5906b7f6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 13 Jul 2022 11:26:59 +0000 Subject: [PATCH 1313/3485] Updating readme file for macOS-12 version 20220710.1 (#5888) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-12-Readme.md | 77 ++++++++++++++++++--------------- 1 file changed, 42 insertions(+), 35 deletions(-) diff --git a/images/macos/macos-12-Readme.md b/images/macos/macos-12-Readme.md index 4280623922fa..78be57d719f0 100644 --- a/images/macos/macos-12-Readme.md +++ b/images/macos/macos-12-Readme.md @@ -1,36 +1,42 @@ +| Announcements | +|-| +| [[all OSs] Android ndk-bundle along with old NDK versions will be deprecated on July, 24](https://github.com/actions/virtual-environments/issues/5879) | +| [[macOS] Default Xcode on Monterey image will be set to Xcode 13.4.1 on July, 11](https://github.com/actions/virtual-environments/issues/5836) | +| [[Windows, macOS] LLVM will be updated to version 14 on July, 11](https://github.com/actions/virtual-environments/issues/5835) | +*** # macOS 12.4 info - System Version: macOS 12.4 (21F79) - Kernel Version: Darwin 21.5.0 -- Image Version: 20220627.3 +- Image Version: 20220710.1 ## Installed Software ### Language and Runtime - .NET SDK 3.1.101 3.1.201 3.1.302 3.1.420 5.0.102 5.0.202 5.0.302 5.0.408 - Bash 3.2.57(1)-release -- Clang/LLVM 13.1.6 is available on `'$(brew --prefix llvm@13)/bin/clang'` - Clang/LLVM 13.1.6 is default +- Clang/LLVM 14.0.6 is available on `'$(brew --prefix llvm@14)/bin/clang'` - gcc-11 (Homebrew GCC 11.3.0_2) 11.3.0 - available by `gcc-11` alias - GNU Fortran (Homebrew GCC 11.3.0_2) 11.3.0 - available by `gfortran-11` alias - Go 1.17.11 - julia 1.7.3 -- Kotlin 1.7.0-release-281 +- Kotlin 1.7.10-release-333 - MSBuild 16.10.1.31401 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) -- Node.js v16.15.1 +- Node.js v16.16.0 - NVM 0.39.1 -- NVM - Cached node versions: v12.22.12 v14.19.3 v16.15.1 +- NVM - Cached node versions: v12.22.12 v14.20.0 v16.16.0 - Perl 5.34.0 -- PHP 8.1.7 +- PHP 8.1.8 - Python 2.7.18 - Python 3.9.13 - R 4.2.1 - Ruby 3.0.4p208 ### Package Management -- Bundler version 2.3.16 +- Bundler version 2.3.17 - Carthage 0.38.0 - CocoaPods 1.11.3 -- Composer 2.3.7 -- Homebrew 3.5.2 +- Composer 2.3.9 +- Homebrew 3.5.4 - Miniconda 4.12.0 - NPM 8.11.0 - NuGet 6.2.1.2 @@ -38,7 +44,7 @@ - Pip 22.1.1 (python 3.9) - Pipx 1.1.0 - RubyGems 3.2.33 -- Vcpkg 2022 (build from master \<320059c01>) +- Vcpkg 2022 (build from master \<98f8d00e8>) - Yarn 1.22.19 #### Environment variables @@ -61,39 +67,40 @@ - bazelisk 1.12.0 - bsdtar 3.5.1 - available by 'tar' alias - Curl 7.84.0 -- Git 2.36.1 +- Git 2.37.0 - Git LFS: 3.2.0 - GitHub CLI: 2.13.0 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.3 - gpg (GnuPG) 2.3.6 - Hub CLI: 2.14.2 -- ImageMagick 7.1.0-39 +- ImageMagick 7.1.0-43 - jq 1.6 - mongo v5.0.7 - mongod v5.0.7 -- OpenSSL 1.1.1p 21 Jun 2022 `(/usr/local/opt/openssl@1.1 -> ../Cellar/openssl@1.1/1.1.1p)` +- OpenSSL 1.1.1q 5 Jul 2022 `(/usr/local/opt/openssl@1.1 -> ../Cellar/openssl@1.1/1.1.1q)` - Packer 1.8.2 - PostgreSQL 14.4 - psql (PostgreSQL) 14.4 - Sox 14.4.2 - Subversion (SVN) 1.14.2 - Switchaudio-osx 1.1.0 +- Vagrant 2.2.19 - VirtualBox 6.1.34r150636 - yq (https://github.com/mikefarah/yq/) version 4.25.3 - zstd 1.5.2 ### Tools - App Center CLI 2.10.10 -- AWS CLI 2.7.11 -- AWS SAM CLI 1.52.0 +- AWS CLI 2.7.14 +- AWS SAM CLI 1.53.0 - AWS Session Manager CLI 1.2.339.0 - Azure CLI (azure-devops) 0.25.0 -- Azure CLI 2.37.0 -- Bicep CLI 0.7.4 +- Azure CLI 2.38.0 +- Bicep CLI 0.8.9 - Cabal 3.6.2.0 - Cmake 3.23.2 -- Fastlane 2.206.2 +- Fastlane 2.207.0 - GHC 9.2.3 - GHCup 0.1.17.8 - Jazzy 0.14.2 @@ -104,16 +111,16 @@ ### Linters - SwiftLint 0.47.1 -- yamllint 1.26.3 +- yamllint 1.27.1 ### Browsers - Safari 15.5 (17613.2.7.1.8) - SafariDriver 15.5 (17613.2.7.1.8) -- Google Chrome 103.0.5060.53 +- Google Chrome 103.0.5060.114 - ChromeDriver 103.0.5060.53 -- Microsoft Edge 103.0.1264.37 -- Microsoft Edge WebDriver 103.0.1264.37 -- Mozilla Firefox 101.0.1 +- Microsoft Edge 103.0.1264.51 +- Microsoft Edge WebDriver 103.0.1264.51 +- Mozilla Firefox 102.0.1 - geckodriver 0.31.0 - Selenium server 4.3.0 @@ -156,8 +163,8 @@ #### Node.js - 12.22.12 -- 14.19.3 -- 16.15.1 +- 14.20.0 +- 16.16.0 #### Go | Version | Architecture | Environment Variable | @@ -167,9 +174,9 @@ | 1.18.3 | x64 | GOROOT_1_18_X64 | ### Rust Tools -- Cargo 1.61.0 -- Rust 1.61.0 -- Rustdoc 1.61.0 +- Cargo 1.62.0 +- Rust 1.62.0 +- Rustdoc 1.62.0 - Rustup 1.24.3 #### Packages @@ -177,7 +184,7 @@ - Cargo-audit 0.17.0 - Cargo-outdated 0.11.1 - Cbindgen 0.24.3 -- Clippy 0.1.61 +- Clippy 0.1.62 - Rustfmt 1.4.38-stable ### PowerShell Tools @@ -186,7 +193,7 @@ #### PowerShell Modules | Module | Version | | ---------------- | ------- | -| Az | 8.0.0 | +| Az | 8.1.0 | | MarkdownPS | 1.9 | | Pester | 5.3.3 | | PSScriptAnalyzer | 1.20.0 | @@ -202,7 +209,7 @@ | Version | Build | Path | | -------------- | --------- | ------------------------------------ | | 2019 | 8.10.25.2 | /Applications/Visual Studio 2019.app | -| 2022 (default) | 17.0.4.23 | /Applications/Visual Studio.app | +| 2022 (default) | 17.0.5.6 | /Applications/Visual Studio.app | ##### Notes: ``` @@ -214,8 +221,8 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" #### Xamarin bundles | symlink | Xamarin.Mono | Xamarin.iOS | Xamarin.Mac | Xamarin.Android | | ----------------- | ------------ | ----------- | ----------- | --------------- | -| 6_12_17 | 6.12 | 15.10 | 8.10 | 12.2 | -| 6_12_16 (default) | 6.12 | 15.8 | 8.8 | 12.2 | +| 6_12_17 (default) | 6.12 | 15.10 | 8.10 | 12.2 | +| 6_12_16 | 6.12 | 15.8 | 8.8 | 12.2 | | 6_12_15 | 6.12 | 15.8 | 8.8 | 12.1 | | 6_12_14 | 6.12 | 15.8 | 8.8 | 12.0 | | 6_12_13 | 6.12 | 15.6 | 8.6 | 12.0 | @@ -229,9 +236,9 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" ### Xcode | Version | Build | Path | | ---------------- | -------- | ------------------------------ | -| 13.4.1 | 13F100 | /Applications/Xcode_13.4.1.app | +| 13.4.1 (default) | 13F100 | /Applications/Xcode_13.4.1.app | | 13.4 | 13F17a | /Applications/Xcode_13.4.app | -| 13.3.1 (default) | 13E500a | /Applications/Xcode_13.3.1.app | +| 13.3.1 | 13E500a | /Applications/Xcode_13.3.1.app | | 13.2.1 | 13C100 | /Applications/Xcode_13.2.1.app | | 13.1 | 13A1030d | /Applications/Xcode_13.1.app | From 519c874a5bff33aedbf2ef502343271be1561ab7 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Wed, 13 Jul 2022 16:22:34 +0200 Subject: [PATCH 1314/3485] Add Microsoft Analysis Services Projects 2022 (#5898) --- images/win/scripts/ImageHelpers/InstallHelpers.ps1 | 13 +++++++++---- images/win/toolsets/toolset-2022.json | 3 ++- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/images/win/scripts/ImageHelpers/InstallHelpers.ps1 b/images/win/scripts/ImageHelpers/InstallHelpers.ps1 index 338bff001f9b..3bb83975b507 100644 --- a/images/win/scripts/ImageHelpers/InstallHelpers.ps1 +++ b/images/win/scripts/ImageHelpers/InstallHelpers.ps1 @@ -240,10 +240,15 @@ function Get-VsixExtenstionFromMarketplace { $fileName = $Matches.filename $downloadUri = $assetUri + "/" + $fileName # ProBITools.MicrosoftReportProjectsforVisualStudio2022 has different URL https://github.com/actions/virtual-environments/issues/5340 - if ($ExtensionMarketPlaceName -eq "ProBITools.MicrosoftReportProjectsforVisualStudio2022") - { - $fileName = "Microsoft.DataTools.ReportingServices.vsix" - $downloadUri = "https://download.microsoft.com/download/b/b/5/bb57be7e-ae72-4fc0-b528-d0ec224997bd/Microsoft.DataTools.ReportingServices.vsix" + switch ($ExtensionMarketPlaceName) { + "ProBITools.MicrosoftReportProjectsforVisualStudio2022" { + $fileName = "Microsoft.DataTools.ReportingServices.vsix" + $downloadUri = "https://download.microsoft.com/download/b/b/5/bb57be7e-ae72-4fc0-b528-d0ec224997bd/Microsoft.DataTools.ReportingServices.vsix" + } + "ProBITools.MicrosoftAnalysisServicesModelingProjects2022" { + $fileName = "Microsoft.DataTools.AnalysisServices.vsix" + $downloadUri = "https://download.microsoft.com/download/b/b/e/bbe90a41-d7c0-432b-9866-89f698405683/Microsoft.DataTools.AnalysisServices.vsix" + } } return [PSCustomObject] @{ diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index ede4ed949041..c5e745898e7a 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -276,7 +276,8 @@ "vsix": [ "VisualStudioClient.MicrosoftVisualStudio2022InstallerProjects", "WixToolset.WixToolsetVisualStudio2022Extension", - "ProBITools.MicrosoftReportProjectsforVisualStudio2022" + "ProBITools.MicrosoftReportProjectsforVisualStudio2022", + "ProBITools.MicrosoftAnalysisServicesModelingProjects2022" ] }, "docker": { From 5a92cfc1a012bb3a61c1b411bc22d0b34a7bed5f Mon Sep 17 00:00:00 2001 From: Suyash Saluja <suyash691@github.com> Date: Thu, 14 Jul 2022 20:58:42 +0530 Subject: [PATCH 1315/3485] Reverting ORAS CLI to version 0.12 (#5907) --- images/linux/scripts/installers/oras-cli.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/linux/scripts/installers/oras-cli.sh b/images/linux/scripts/installers/oras-cli.sh index 5db36a9a86b2..44c1b82b08c3 100644 --- a/images/linux/scripts/installers/oras-cli.sh +++ b/images/linux/scripts/installers/oras-cli.sh @@ -6,8 +6,8 @@ source $HELPER_SCRIPTS/install.sh -# Determine latest ORAS CLI version -ORAS_CLI_DOWNLOAD_URL=$(get_github_package_download_url "oras-project/oras" "endswith(\"linux_amd64.tar.gz\")") +# Download ORAS CLI version 0.12 since it is the version compatible with GHCR (Tracking issue to fix CLI for GHCR login https://github.com/oras-project/oras/issues/446) +ORAS_CLI_DOWNLOAD_URL=$(get_github_package_download_url "oras-project/oras" "endswith(\"linux_amd64.tar.gz\")" "0.12.0") ORAS_CLI_ARCHIVE=$(basename $ORAS_CLI_DOWNLOAD_URL) # Install ORAS CLI From e621b601101a7df329a43b2f6395ea9bb369557c Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Fri, 15 Jul 2022 08:04:15 +0200 Subject: [PATCH 1316/3485] Revert "[Ubuntu] Apply esl-erlang workaround for 20.04 (#5867)" (#5909) This reverts commit 8bef3e36510e61ac89cb853e426036489513ecb7. --- images/linux/scripts/installers/erlang.sh | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/images/linux/scripts/installers/erlang.sh b/images/linux/scripts/installers/erlang.sh index 00005f6f9f19..6aaa4a86b746 100644 --- a/images/linux/scripts/installers/erlang.sh +++ b/images/linux/scripts/installers/erlang.sh @@ -6,7 +6,6 @@ # Source the helpers for use with the script source $HELPER_SCRIPTS/install.sh -source $HELPER_SCRIPTS/os.sh source_list=/etc/apt/sources.list.d/eslerlang.list source_key=/usr/share/keyrings/eslerlang.gpg @@ -14,28 +13,8 @@ source_key=/usr/share/keyrings/eslerlang.gpg # Install Erlang wget -q -O - https://packages.erlang-solutions.com/ubuntu/erlang_solutions.asc | gpg --dearmor > $source_key echo "deb [signed-by=$source_key] https://packages.erlang-solutions.com/ubuntu $(lsb_release -cs) contrib" > $source_list - apt-get update - -if isUbuntu20; then - # https://github.com/actions/virtual-environments/issues/5859 - # hashes mismatch is going to happen due to not updated release file - # on the server side, - # pulling all the dependencies first without apt-cache parsing - # but ignore the error - apt-get install --no-install-recommends esl-erlang || true - - # Downoloading and installing a deb file manually, ignore deptree errors - esl_url="https://packages.erlang-solutions.com/ubuntu/pool/esl-erlang_25.0.2-1~ubuntu~focal_amd64.deb" - download_with_retries $esl_url "/tmp" - dpkg -i /tmp/esl-erlang_25.0.2-1~ubuntu~focal_amd64.deb || true - - # Restore a proper deptree which brings esl-erlang back in the loop - # but eleminate unwanted X.org dependencies - apt --no-install-recommends --fix-broken install -else - apt-get install --no-install-recommends esl-erlang -fi +apt-get install -y --no-install-recommends esl-erlang # Install rebar3 rebar3_url="https://github.com/erlang/rebar3/releases/latest/download/rebar3" From 907e9a0f30d88d9639a4413a52e9bf837b720fa8 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Fri, 15 Jul 2022 14:38:14 +0400 Subject: [PATCH 1317/3485] Revert "Reverting ORAS CLI to version 0.12 (#5907)" (#5914) This reverts commit 5a92cfc1a012bb3a61c1b411bc22d0b34a7bed5f. --- images/linux/scripts/installers/oras-cli.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/linux/scripts/installers/oras-cli.sh b/images/linux/scripts/installers/oras-cli.sh index 44c1b82b08c3..5db36a9a86b2 100644 --- a/images/linux/scripts/installers/oras-cli.sh +++ b/images/linux/scripts/installers/oras-cli.sh @@ -6,8 +6,8 @@ source $HELPER_SCRIPTS/install.sh -# Download ORAS CLI version 0.12 since it is the version compatible with GHCR (Tracking issue to fix CLI for GHCR login https://github.com/oras-project/oras/issues/446) -ORAS_CLI_DOWNLOAD_URL=$(get_github_package_download_url "oras-project/oras" "endswith(\"linux_amd64.tar.gz\")" "0.12.0") +# Determine latest ORAS CLI version +ORAS_CLI_DOWNLOAD_URL=$(get_github_package_download_url "oras-project/oras" "endswith(\"linux_amd64.tar.gz\")") ORAS_CLI_ARCHIVE=$(basename $ORAS_CLI_DOWNLOAD_URL) # Install ORAS CLI From 92f8e13d53b2ce986cdb8ff8cbaf05a670414b1a Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Fri, 15 Jul 2022 14:01:11 +0200 Subject: [PATCH 1318/3485] Add .Net 6.0 latest version (#5912) --- images/macos/provision/core/dotnet.sh | 17 ++++++++++++----- images/macos/toolsets/toolset-11.json | 3 ++- images/macos/toolsets/toolset-12.json | 3 ++- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/images/macos/provision/core/dotnet.sh b/images/macos/provision/core/dotnet.sh index c00a34607dfb..1bd612e9b9e7 100755 --- a/images/macos/provision/core/dotnet.sh +++ b/images/macos/provision/core/dotnet.sh @@ -22,11 +22,18 @@ DOTNET_VERSIONS=($(get_toolset_value '.dotnet.versions | .[]')) for DOTNET_VERSION in "${DOTNET_VERSIONS[@]}"; do RELEASE_URL="https://raw.githubusercontent.com/dotnet/core/master/release-notes/${DOTNET_VERSION}/releases.json" - ARGS_LIST+=( - $(curl -s "$RELEASE_URL" | \ - jq -r '.releases[].sdk."version"' | grep -v -E '\-(preview|rc)\d*' | \ - sort -r | rev | uniq -s 2 | rev) - ) + + if [[ $DOTNET_VERSION == "6.0" ]]; then + ARGS_LIST+=( + $(curl -s "$RELEASE_URL" | jq -r 'first(.releases[].sdks[]?.version | select(contains("preview") or contains("rc") | not))') + ) + else + ARGS_LIST+=( + $(curl -s "$RELEASE_URL" | \ + jq -r '.releases[].sdk."version"' | grep -v -E '\-(preview|rc)\d*' | \ + sort -r | rev | uniq -s 2 | rev) + ) + fi done for ARGS in "${ARGS_LIST[@]}"; do diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index c314ffc8edae..1306b902b5c5 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -306,7 +306,8 @@ "dotnet": { "versions": [ "3.1", - "5.0" + "5.0", + "6.0" ] }, "ruby": { diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index c4eae4295941..f8357ce22267 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -236,7 +236,8 @@ "dotnet": { "versions": [ "3.1", - "5.0" + "5.0", + "6.0" ] }, "ruby": { From ec11088c912bb00d8e2da936f19ef0a2da7dc3ff Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Fri, 15 Jul 2022 19:47:59 +0400 Subject: [PATCH 1319/3485] Xcversion is not depend on old CLAide version anymore (#5913) --- images/macos/provision/core/rubygem.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/images/macos/provision/core/rubygem.sh b/images/macos/provision/core/rubygem.sh index 73906297804d..60cd1c93dfd0 100755 --- a/images/macos/provision/core/rubygem.sh +++ b/images/macos/provision/core/rubygem.sh @@ -1,9 +1,8 @@ #!/bin/bash -e -o pipefail source ~/utils/utils.sh -# Temporarily downgrade RubyGems version to 3.2.33 due to issue with RubyGems 3.3.3 (https://github.com/actions/virtual-environments-internal/issues/3162) echo Updating RubyGems... -gem update --system 3.2.33 +gem update --system gemsToInstall=$(get_toolset_value '.ruby.rubygems | .[]') if [ -n "$gemsToInstall" ]; then From 0b9bb00cf4815b51f4b6e9ba36242b1d2670b5f2 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 19 Jul 2022 09:25:02 +0000 Subject: [PATCH 1320/3485] Updating readme file for ubuntu22 version 20220717.1 (#5923) Co-authored-by: Image generation service account <no-reply@microsoft.com> --- images/linux/Ubuntu2204-Readme.md | 68 +++++++++++++++---------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/images/linux/Ubuntu2204-Readme.md b/images/linux/Ubuntu2204-Readme.md index 68f2b7ec7f89..8bdef57f5874 100644 --- a/images/linux/Ubuntu2204-Readme.md +++ b/images/linux/Ubuntu2204-Readme.md @@ -4,8 +4,8 @@ | [(Public Beta) Ubuntu 22.04 is now available](https://github.com/actions/virtual-environments/issues/5490) | *** # Ubuntu 22.04 LTS -- Linux kernel version: 5.15.0-1013-azure -- Image Version: 20220710.1 +- Linux kernel version: 5.15.0-1014-azure +- Image Version: 20220717.1 ## Installed Software ### Language and Runtime @@ -26,7 +26,7 @@ ### Package Management - cpan 1.64 -- Helm 3.9.0 +- Helm 3.9.1 - Homebrew 3.5.4 - Miniconda 4.12.0 - Npm 8.11.0 @@ -34,7 +34,7 @@ - Pip3 22.0.2 - Pipx 1.1.0 - RubyGems 3.3.5 -- Vcpkg (build from master \<98f8d00e8>) +- Vcpkg (build from master \<68b7fec22>) - Yarn 1.22.19 #### Environment variables @@ -63,50 +63,50 @@ - Docker-Moby Client 20.10.17+azure-1 - Docker-Moby Server 20.10.17+azure-1 - Fastlane 2.207.0 -- Git 2.37.0 (apt source repository: ppa:git-core/ppa) +- Git 2.37.1 (apt source repository: ppa:git-core/ppa) - Git LFS 3.2.0 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.6.0 - Haveged 1.9.14 - Heroku 7.60.2 - jq 1.6 - Kind 0.14.0 -- Kubectl 1.24.2 +- Kubectl 1.24.3 - Kustomize 4.5.5 - Leiningen 2.9.8 - MediaInfo 21.09 - Mercurial 6.1.1 - Minikube 1.26.0 -- n 8.2.0 +- n 9.0.0 - Newman 5.3.2 - nvm 0.39.1 - OpenSSL 3.0.2-0ubuntu1.6 - Packer 1.8.2 - Parcel 2.6.2 - Podman 3.4.4 -- Pulumi 3.35.3 +- Pulumi 3.36.0 - R 4.2.1 - Skopeo 1.4.1 - Sphinx Open Source Search Server 2.2.11 - SVN 1.14.1 -- Terraform 1.2.4 +- Terraform 1.2.5 - yamllint 1.27.1 -- yq 4.25.3 +- yq 4.26.1 - zstd 1.5.2 (homebrew) ### CLI Tools - Alibaba Cloud CLI 3.0.124 -- AWS CLI 2.7.14 +- AWS CLI 2.7.16 - AWS CLI Session manager plugin 1.2.339.0 - AWS SAM CLI 1.53.0 - Azure CLI (azure-cli) 2.38.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.25.0 -- GitHub CLI 2.13.0 +- GitHub CLI 2.14.2 - Google Cloud SDK 369.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 10.7.1 -- OpenShift CLI 4.10.21 +- Netlify CLI 10.10.0 +- OpenShift CLI 4.10.22 - ORAS CLI 0.13.0 -- Vercel CLI 27.0.1 +- Vercel CLI 27.1.5 ### Java | Version | Vendor | Environment Variable | @@ -123,8 +123,8 @@ ### PHP | Tool | Version | | -------- | ------- | -| PHP | 8.1.7 | -| Composer | 2.3.9 | +| PHP | 8.1.8 | +| Composer | 2.3.10 | | PHPUnit | 8.5.27 | ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. @@ -139,7 +139,7 @@ - Cargo 1.62.0 - Rust 1.62.0 - Rustdoc 1.62.0 -- Rustup 1.24.3 +- Rustup 1.25.1 #### Packages - Bindgen 0.60.1 @@ -153,8 +153,8 @@ - Google Chrome 103.0.5060.114 - ChromeDriver 103.0.5060.53 - Chromium 103.0.5060.0 -- Microsoft Edge 103.0.1264.51 (apt source repository: https://packages.microsoft.com/repos/edge) -- Microsoft Edge WebDriver 103.0.1264.51 +- Microsoft Edge 103.0.1264.62 (apt source repository: https://packages.microsoft.com/repos/edge) +- Microsoft Edge WebDriver 103.0.1264.62 - Selenium server 4.3.0 #### Environment variables @@ -166,10 +166,10 @@ | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | ### .NET Core SDK -- 6.0.301 +- 6.0.302 ### .NET tools -- nbgv 3.5.107+6463ef6068 +- nbgv 3.5.108+6e793d63d3 ### Databases - sqlite3 3.37.2 @@ -190,8 +190,8 @@ ``` ### Cached Tools #### Go -- 1.17.11 -- 1.18.3 +- 1.17.12 +- 1.18.4 #### Node.js - 14.20.0 @@ -214,8 +214,8 @@ #### Environment variables | Name | Value | Architecture | | --------------- | ----------------------------------- | ------------ | -| GOROOT_1_17_X64 | /opt/hostedtoolcache/go/1.17.11/x64 | x64 | -| GOROOT_1_18_X64 | /opt/hostedtoolcache/go/1.18.3/x64 | x64 | +| GOROOT_1_17_X64 | /opt/hostedtoolcache/go/1.17.12/x64 | x64 | +| GOROOT_1_18_X64 | /opt/hostedtoolcache/go/1.18.4/x64 | x64 | ### PowerShell Tools - PowerShell 7.2.5 @@ -244,7 +244,7 @@ | Android Emulator | 31.2.10 | | Android SDK Build-tools | 33.0.0<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | | Android SDK Platform-Tools | 33.0.2 | -| Android SDK Platforms | android-33 (rev 1)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | +| Android SDK Platforms | android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | | Android SDK Tools | 26.1.1 | | Android Support Repository | 47.0.0 | | CMake | 3.10.2<br>3.18.1 | @@ -267,14 +267,14 @@ | ----------------------- | ------------------------------------------------------------------------ | ---------- | | alpine:3.14 | sha256:06b5d462c92fc39303e6363c65e074559f8d6b1363250027ed5053557e3398c5 | 2022-04-05 | | alpine:3.15 | sha256:4edbd2beb5f78b1014028f4fbb99f3237d9561100b6881aabbf5acce2c4f9454 | 2022-04-05 | -| buildpack-deps:bullseye | sha256:7a78a5f716dd32b0eb89876f8c5cf5e443781a44b7fe12619e897bad9a642e14 | 2022-06-23 | -| buildpack-deps:buster | sha256:7f9a157d07e0a81a4e3130ce1490142b208155e09d1c3459b4213a5779e87546 | 2022-06-23 | -| debian:10 | sha256:9740683722a2a8aa497a5b23e4bc229fcf8b8991e26d3935540c7704ff24012e | 2022-06-23 | -| debian:11 | sha256:859ea45db307402ee024b153c7a63ad4888eb4751921abbef68679fc73c4c739 | 2022-06-23 | +| buildpack-deps:bullseye | sha256:4cbb6d56f192ea1868bdbc441269d0343c90b201c973931aaa6722300118d463 | 2022-07-12 | +| buildpack-deps:buster | sha256:3ab2863d37b2d037440b4a153a8fb3c79e935030fd47cef21b698688ce72f66e | 2022-07-12 | +| debian:10 | sha256:0685c900f6e691bdda6980c0ed0779d20183bc58770059b64adb56cb8a3129f0 | 2022-07-12 | +| debian:11 | sha256:2ce44bbc00a79113c296d9d25524e15d423b23303fdbbe20190d2f96e0aeb251 | 2022-07-12 | | moby/buildkit:latest | sha256:0dc312b04eac1b44cd2cad566deb1e886c753109208affbbec8384f381ff7f38 | 2022-05-06 | -| node:14 | sha256:0c571044148fd772bbc03fd42d293939ce3e39d7aa1e095dd87c33ce89796829 | 2022-07-08 | +| node:14 | sha256:a086a11f7780399837ea0465ac8a8e8f14f2b66fe5a110fe0c24644d53a103c5 | 2022-07-12 | | node:14-alpine | sha256:2af507df45e7c0a46c6b3001ce0dbc6924f7b39864d442045f781361a1971975 | 2022-07-08 | -| node:16 | sha256:8951351b7c6a2f8ff9ec25eccc087d37a8aeccf9bf911888ff13c76223467466 | 2022-07-08 | +| node:16 | sha256:2e1b4542d4a06e0e0442dc38af1f4828760aecc9db2b95e7df87f573640d98cd | 2022-07-12 | | node:16-alpine | sha256:554142f9a6367f1fbd776a1b2048fab3a2cc7aa477d7fe9c00ce0f110aa45716 | 2022-07-08 | | ubuntu:18.04 | sha256:478caf1bec1afd54a58435ec681c8755883b7eb843a8630091890130b15a79af | 2022-06-06 | | ubuntu:20.04 | sha256:fd92c36d3cb9b1d027c4d2a72c6bf0125da82425fc2ca37c414d4f010180dc19 | 2022-06-06 | @@ -360,7 +360,7 @@ | upx | 3.96-3 | | wget | 1.21.2-2ubuntu1 | | xorriso | 1.5.4-2 | -| xvfb | 2:21.1.3-2ubuntu2 | +| xvfb | 2:21.1.3-2ubuntu2.1 | | xz-utils | 5.2.5-2ubuntu1 | | zip | 3.0-12build2 | | zsync | 0.6.2-3ubuntu1 | From ce779a6f6ea52b63a32ce2200a319be149c9203f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 19 Jul 2022 10:05:18 +0000 Subject: [PATCH 1321/3485] Updating readme file for ubuntu20 version 20220717.1 (#5922) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2004-Readme.md | 72 +++++++++++++++---------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/images/linux/Ubuntu2004-Readme.md b/images/linux/Ubuntu2004-Readme.md index 4141298d8396..33a1298228a0 100644 --- a/images/linux/Ubuntu2004-Readme.md +++ b/images/linux/Ubuntu2004-Readme.md @@ -4,8 +4,8 @@ | [(Public Beta) Ubuntu 22.04 is now available](https://github.com/actions/virtual-environments/issues/5490) | *** # Ubuntu 20.04.4 LTS -- Linux kernel version: 5.13.0-1031-azure -- Image Version: 20220710.1 +- Linux kernel version: 5.15.0-1014-azure +- Image Version: 20220717.1 ## Installed Software ### Language and Runtime @@ -31,7 +31,7 @@ ### Package Management - cpan 1.64 -- Helm 3.9.0 +- Helm 3.9.1 - Homebrew 3.5.4 - Miniconda 4.12.0 - Npm 8.11.0 @@ -39,7 +39,7 @@ - Pip3 20.0.2 - Pipx 1.1.0 - RubyGems 3.1.2 -- Vcpkg (build from master \<98f8d00e8>) +- Vcpkg (build from master \<68b7fec22>) - Yarn 1.22.19 #### Environment variables @@ -50,10 +50,10 @@ ### Project Management - Ant 1.10.7 -- Gradle 7.4.2 +- Gradle 7.5 - Lerna 5.1.8 - Maven 3.8.6 -- Sbt 1.7.0 +- Sbt 1.7.1 ### Tools - Ansible 2.13.1 @@ -72,7 +72,7 @@ - Docker-Moby Client 20.10.17+azure-1 - Docker-Moby Server 20.10.17+azure-1 - Fastlane 2.207.0 -- Git 2.37.0 (apt source repository: ppa:git-core/ppa) +- Git 2.37.1 (apt source repository: ppa:git-core/ppa) - Git LFS 3.2.0 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.6.0 - Haveged 1.9.1 @@ -80,13 +80,13 @@ - HHVM (HipHop VM) 4.164.0 - jq 1.6 - Kind 0.14.0 -- Kubectl 1.24.2 +- Kubectl 1.24.3 - Kustomize 4.5.5 - Leiningen 2.9.8 - MediaInfo 19.09 - Mercurial 5.3.1 - Minikube 1.26.0 -- n 8.2.0 +- n 9.0.0 - Newman 5.3.2 - nvm 0.39.1 - OpenSSL 1.1.1f-1ubuntu2.16 @@ -94,30 +94,30 @@ - Parcel 2.6.2 - PhantomJS 2.1.1 - Podman 3.4.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- Pulumi 3.35.3 +- Pulumi 3.36.0 - R 4.2.1 - Skopeo 1.5.0 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 -- Terraform 1.2.4 +- Terraform 1.2.5 - yamllint 1.27.1 -- yq 4.25.3 +- yq 4.26.1 - zstd 1.5.2 (homebrew) ### CLI Tools - Alibaba Cloud CLI 3.0.124 -- AWS CLI 2.7.14 +- AWS CLI 2.7.16 - AWS CLI Session manager plugin 1.2.339.0 - AWS SAM CLI 1.53.0 - Azure CLI (azure-cli) 2.38.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.25.0 -- GitHub CLI 2.13.0 +- GitHub CLI 2.14.2 - Google Cloud SDK 369.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 10.7.1 -- OpenShift CLI 4.10.21 +- Netlify CLI 10.10.0 +- OpenShift CLI 4.10.22 - ORAS CLI 0.13.0 -- Vercel CLI 27.0.1 +- Vercel CLI 27.1.5 ### Java | Version | Vendor | Environment Variable | @@ -134,8 +134,8 @@ ### PHP | Tool | Version | | -------- | ------------------- | -| PHP | 7.4.30 8.0.20 8.1.7 | -| Composer | 2.3.9 | +| PHP | 7.4.30 8.0.21 8.1.8 | +| Composer | 2.3.10 | | PHPUnit | 8.5.27 | ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. @@ -150,7 +150,7 @@ - Cargo 1.62.0 - Rust 1.62.0 - Rustdoc 1.62.0 -- Rustup 1.24.3 +- Rustup 1.25.1 #### Packages - Bindgen 0.60.1 @@ -164,8 +164,8 @@ - Google Chrome 103.0.5060.114 - ChromeDriver 103.0.5060.53 - Chromium 103.0.5060.0 -- Microsoft Edge 103.0.1264.51 (apt source repository: https://packages.microsoft.com/repos/edge) -- Microsoft Edge WebDriver 103.0.1264.51 +- Microsoft Edge 103.0.1264.62 (apt source repository: https://packages.microsoft.com/repos/edge) +- Microsoft Edge WebDriver 103.0.1264.62 - Selenium server 4.3.0 - Mozilla Firefox 102.0 - Geckodriver 0.31.0 @@ -179,10 +179,10 @@ | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | ### .NET Core SDK -- 3.1.120 3.1.202 3.1.302 3.1.420 5.0.104 5.0.214 5.0.303 5.0.408 6.0.301 +- 3.1.120 3.1.202 3.1.302 3.1.421 5.0.104 5.0.214 5.0.303 5.0.408 6.0.302 ### .NET tools -- nbgv 3.5.107+6463ef6068 +- nbgv 3.5.108+6e793d63d3 ### Databases - MongoDB 5.0.9 (apt source repository: https://repo.mongodb.org/apt/ubuntu) @@ -209,8 +209,8 @@ ### Cached Tools #### Go - 1.16.15 -- 1.17.11 -- 1.18.3 +- 1.17.12 +- 1.18.4 #### Node.js - 12.22.12 @@ -243,8 +243,8 @@ | Name | Value | Architecture | | --------------- | ----------------------------------- | ------------ | | GOROOT_1_16_X64 | /opt/hostedtoolcache/go/1.16.15/x64 | x64 | -| GOROOT_1_17_X64 | /opt/hostedtoolcache/go/1.17.11/x64 | x64 | -| GOROOT_1_18_X64 | /opt/hostedtoolcache/go/1.18.3/x64 | x64 | +| GOROOT_1_17_X64 | /opt/hostedtoolcache/go/1.17.12/x64 | x64 | +| GOROOT_1_18_X64 | /opt/hostedtoolcache/go/1.18.4/x64 | x64 | ### PowerShell Tools - PowerShell 7.2.5 @@ -274,7 +274,7 @@ | Android Emulator | 31.2.10 | | Android SDK Build-tools | 33.0.0<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | | Android SDK Platform-Tools | 33.0.2 | -| Android SDK Platforms | android-33 (rev 1)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | +| Android SDK Platforms | android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | | Android SDK Tools | 26.1.1 | | Android Support Repository | 47.0.0 | | CMake | 3.10.2<br>3.18.1 | @@ -298,18 +298,18 @@ | alpine:3.12 | sha256:c75ac27b49326926b803b9ed43bf088bc220d22556de1bc5f72d742c91398f69 | 2022-04-05 | | alpine:3.13 | sha256:ccf92aa53bc6c3b25be2ad0cce80baec1778f007f7e076b0ffbd1b225d0b3a9b | 2022-04-05 | | alpine:3.14 | sha256:06b5d462c92fc39303e6363c65e074559f8d6b1363250027ed5053557e3398c5 | 2022-04-05 | -| buildpack-deps:bullseye | sha256:7a78a5f716dd32b0eb89876f8c5cf5e443781a44b7fe12619e897bad9a642e14 | 2022-06-23 | -| buildpack-deps:buster | sha256:7f9a157d07e0a81a4e3130ce1490142b208155e09d1c3459b4213a5779e87546 | 2022-06-23 | +| buildpack-deps:bullseye | sha256:4cbb6d56f192ea1868bdbc441269d0343c90b201c973931aaa6722300118d463 | 2022-07-12 | +| buildpack-deps:buster | sha256:3ab2863d37b2d037440b4a153a8fb3c79e935030fd47cef21b698688ce72f66e | 2022-07-12 | | buildpack-deps:stretch | sha256:78e995165a5788c2f55aed6e548d8f6c1534830d4310c870408fccb2da8c5b2e | 2022-06-23 | -| debian:10 | sha256:9740683722a2a8aa497a5b23e4bc229fcf8b8991e26d3935540c7704ff24012e | 2022-06-23 | -| debian:11 | sha256:859ea45db307402ee024b153c7a63ad4888eb4751921abbef68679fc73c4c739 | 2022-06-23 | +| debian:10 | sha256:0685c900f6e691bdda6980c0ed0779d20183bc58770059b64adb56cb8a3129f0 | 2022-07-12 | +| debian:11 | sha256:2ce44bbc00a79113c296d9d25524e15d423b23303fdbbe20190d2f96e0aeb251 | 2022-07-12 | | debian:9 | sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be | 2022-06-23 | | moby/buildkit:latest | sha256:0dc312b04eac1b44cd2cad566deb1e886c753109208affbbec8384f381ff7f38 | 2022-05-06 | | node:12 | sha256:01627afeb110b3054ba4a1405541ca095c8bfca1cb6f2be9479c767a2711879e | 2022-04-20 | | node:12-alpine | sha256:d4b15b3d48f42059a15bd659be60afe21762aae9d6cbea6f124440895c27db68 | 2022-04-11 | -| node:14 | sha256:0c571044148fd772bbc03fd42d293939ce3e39d7aa1e095dd87c33ce89796829 | 2022-07-08 | +| node:14 | sha256:a086a11f7780399837ea0465ac8a8e8f14f2b66fe5a110fe0c24644d53a103c5 | 2022-07-12 | | node:14-alpine | sha256:2af507df45e7c0a46c6b3001ce0dbc6924f7b39864d442045f781361a1971975 | 2022-07-08 | -| node:16 | sha256:8951351b7c6a2f8ff9ec25eccc087d37a8aeccf9bf911888ff13c76223467466 | 2022-07-08 | +| node:16 | sha256:2e1b4542d4a06e0e0442dc38af1f4828760aecc9db2b95e7df87f573640d98cd | 2022-07-12 | | node:16-alpine | sha256:554142f9a6367f1fbd776a1b2048fab3a2cc7aa477d7fe9c00ce0f110aa45716 | 2022-07-08 | | ubuntu:16.04 | sha256:20858ebbc96215d6c3c574f781133ebffdc7c18d98af4f294cc4c04871a6fe61 | 2021-08-31 | | ubuntu:18.04 | sha256:478caf1bec1afd54a58435ec681c8755883b7eb843a8630091890130b15a79af | 2022-06-06 | @@ -394,7 +394,7 @@ | upx | 3.95-2build1 | | wget | 1.20.3-1ubuntu2 | | xorriso | 1.5.2-1 | -| xvfb | 2:1.20.13-1ubuntu1\~20.04.2 | +| xvfb | 2:1.20.13-1ubuntu1\~20.04.3 | | xz-utils | 5.2.4-1ubuntu1.1 | | zip | 3.0-11build1 | | zsync | 0.6.2-3ubuntu1 | From 893e347c8e357c9bda8afab7b56dea1c9cf0a990 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Tue, 19 Jul 2022 14:06:31 +0400 Subject: [PATCH 1322/3485] Remove ndk-bundle from ubuntu (#5926) --- .../SoftwareReport/SoftwareReport.Android.psm1 | 12 +++--------- images/linux/scripts/installers/android.sh | 12 ------------ images/linux/scripts/tests/Android.Tests.ps1 | 9 --------- images/linux/toolsets/toolset-1804.json | 1 - images/linux/toolsets/toolset-2004.json | 1 - images/linux/toolsets/toolset-2204.json | 1 - 6 files changed, 3 insertions(+), 33 deletions(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Android.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Android.psm1 index 5ba50848f40c..2c84696c4583 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Android.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Android.psm1 @@ -156,19 +156,13 @@ function Get-AndroidGoogleAPIsVersions { function Get-AndroidNDKVersions { $ndkFolderPath = Join-Path (Get-AndroidSDKRoot) "ndk" $versions = Get-ChildItem -Path $ndkFolderPath -Name - $ndkDefaultVersion = Get-ToolsetValue "android.ndk.default" - $ndkDefaultFullVersion = Get-ChildItem "$env:ANDROID_HOME/ndk/$ndkDefaultVersion.*" -Name | Select-Object -Last 1 - - return ($versions | ForEach-Object { - $defaultPostfix = ( $_ -eq $ndkDefaultFullVersion ) ? " (default)" : "" - $_ + $defaultPostfix - } | Join-String -Separator "<br>") + return ($versions | Join-String -Separator "<br>") } function Build-AndroidEnvironmentTable { - $androidVersions = Get-Item env:ANDROID_* + $androidVersions = Get-Item env:ANDROID_* - $shouldResolveLink = 'ANDROID_NDK_PATH', 'ANDROID_NDK_HOME', 'ANDROID_NDK_ROOT', 'ANDROID_NDK_LATEST_HOME' + $shouldResolveLink = 'ANDROID_NDK_LATEST_HOME' return $androidVersions | Sort-Object -Property Name | ForEach-Object { [PSCustomObject] @{ "Name" = $_.Name diff --git a/images/linux/scripts/installers/android.sh b/images/linux/scripts/installers/android.sh index 4b292d3f77e5..1d5d3d7eacd6 100644 --- a/images/linux/scripts/installers/android.sh +++ b/images/linux/scripts/installers/android.sh @@ -34,17 +34,12 @@ function get_full_ndk_version { # 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 -ANDROID_NDK_ROOT=${ANDROID_SDK_ROOT}/ndk-bundle SDKMANAGER=${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager echo "ANDROID_SDK_ROOT=${ANDROID_SDK_ROOT}" | tee -a /etc/environment # ANDROID_HOME is deprecated, but older versions of Gradle rely on it echo "ANDROID_HOME=${ANDROID_SDK_ROOT}" | tee -a /etc/environment -# Set env variables for NDK Root -echo "ANDROID_NDK_HOME=${ANDROID_NDK_ROOT}" | tee -a /etc/environment -echo "ANDROID_NDK_ROOT=${ANDROID_NDK_ROOT}" | tee -a /etc/environment - # Create android sdk directory mkdir -p ${ANDROID_SDK_ROOT} @@ -89,8 +84,6 @@ extras=$(get_toolset_value '.android.extra_list[]|"extras;" + .') addons=$(get_toolset_value '.android.addon_list[]|"add-ons;" + .') additional=$(get_toolset_value '.android.additional_tools[]') ANDROID_NDK_MAJOR_VERSIONS=($(get_toolset_value '.android.ndk.versions[]')) -ANDROID_NDK_MAJOR_DEFAULT=$(get_toolset_value '.android.ndk.default') -ndkDefaultFullVersion=$(get_full_ndk_version $ANDROID_NDK_MAJOR_DEFAULT) components=("${extras[@]}" "${addons[@]}" "${additional[@]}") for ndk_version in "${ANDROID_NDK_MAJOR_VERSIONS[@]}" @@ -99,11 +92,6 @@ do components+=("ndk;$ndk_full_version") done -# This changes were added due to incompatibility with android ndk-bundle (ndk;22.0.7026061). -# Link issue virtual-environments: https://github.com/actions/virtual-environments/issues/2481 -# Link issue xamarin-android: https://github.com/xamarin/xamarin-android/issues/5526 -ln -s $ANDROID_SDK_ROOT/ndk/$ndkDefaultFullVersion $ANDROID_NDK_ROOT - ANDROID_NDK_MAJOR_LATEST=(${ANDROID_NDK_MAJOR_VERSIONS[-1]}) ndkLatestFullVersion=$(get_full_ndk_version $ANDROID_NDK_MAJOR_LATEST) echo "ANDROID_NDK_LATEST_HOME=$ANDROID_SDK_ROOT/ndk/$ndkLatestFullVersion" | tee -a /etc/environment diff --git a/images/linux/scripts/tests/Android.Tests.ps1 b/images/linux/scripts/tests/Android.Tests.ps1 index 3d530a0b990e..a38465b8caf7 100644 --- a/images/linux/scripts/tests/Android.Tests.ps1 +++ b/images/linux/scripts/tests/Android.Tests.ps1 @@ -2,9 +2,7 @@ Describe "Android" { $androidSdkManagerPackages = Get-AndroidPackages [int]$platformMinVersion = Get-ToolsetValue "android.platform_min_version" [version]$buildToolsMinVersion = Get-ToolsetValue "android.build_tools_min_version" - [string]$ndkDefaultVersion = Get-ToolsetValue "android.ndk.default" [array]$ndkVersions = Get-ToolsetValue "android.ndk.versions" - $ndkDefaultFullVersion = Get-ChildItem "$env:ANDROID_HOME/ndk/$ndkDefaultVersion.*" -Name | Select-Object -Last 1 $ndkFullVersions = $ndkVersions | ForEach-Object { (Get-ChildItem "/usr/local/lib/android/sdk/ndk/${_}.*" | Select-Object -Last 1).Name } | ForEach-Object { "ndk/${_}" } # Platforms starting with a letter are the preview versions, which is not installed on the image $platformVersionsList = ($androidSdkManagerPackages | Where-Object { "$_".StartsWith("platforms;") }) -replace 'platforms;android-', '' | Where-Object { $_ -match "^\d+$" } | Sort-Object -Unique @@ -61,17 +59,10 @@ Describe "Android" { Context "Packages" { $testCases = $androidPackages | ForEach-Object { @{ PackageName = $_ } } - $defaultNdkTestCase = @{ NdkDefaultFullVersion = $ndkDefaultFullVersion } It "<PackageName>" -TestCases $testCases { param ([string] $PackageName) Validate-AndroidPackage $PackageName } - - It "ndk-bundle points to the default NDK version" -TestCases $defaultNdkTestCase { - $ndkLinkTarget = (Get-Item $env:ANDROID_NDK_HOME).Target - $ndkVersion = Split-Path -Path $ndkLinkTarget -Leaf - $ndkVersion | Should -BeExactly $NdkDefaultFullVersion - } } } \ No newline at end of file diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index aac3736b924d..92a5c556d658 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -105,7 +105,6 @@ "cmake;3.18.1" ], "ndk": { - "default": "23", "versions": [ "21", "23", "24" ] diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index 1ffa6f199335..a67e2faa2dd3 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -102,7 +102,6 @@ "cmake;3.18.1" ], "ndk": { - "default": "23", "versions": [ "21", "23", "24" ] diff --git a/images/linux/toolsets/toolset-2204.json b/images/linux/toolsets/toolset-2204.json index b5fa65dde716..884b0d0289c0 100644 --- a/images/linux/toolsets/toolset-2204.json +++ b/images/linux/toolsets/toolset-2204.json @@ -88,7 +88,6 @@ "cmake;3.18.1" ], "ndk": { - "default": "23", "versions": [ "21", "23", "24" ] From f4d7f82bf78c18bb780316331148afedef4c6513 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Tue, 19 Jul 2022 12:09:08 +0200 Subject: [PATCH 1323/3485] Remove ProBITools.MicrosoftAnalysisServicesModelingProjects2022 (#5933) --- images/win/toolsets/toolset-2022.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index c5e745898e7a..ede4ed949041 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -276,8 +276,7 @@ "vsix": [ "VisualStudioClient.MicrosoftVisualStudio2022InstallerProjects", "WixToolset.WixToolsetVisualStudio2022Extension", - "ProBITools.MicrosoftReportProjectsforVisualStudio2022", - "ProBITools.MicrosoftAnalysisServicesModelingProjects2022" + "ProBITools.MicrosoftReportProjectsforVisualStudio2022" ] }, "docker": { From 300269fa36ab8820ae936cd68975e59fea8426ff Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 19 Jul 2022 10:10:58 +0000 Subject: [PATCH 1324/3485] Updating readme file for ubuntu18 version 20220717.1 (#5921) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu1804-Readme.md | 72 +++++++++++++++---------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/images/linux/Ubuntu1804-Readme.md b/images/linux/Ubuntu1804-Readme.md index 5b048083889c..35eb7e5414b6 100644 --- a/images/linux/Ubuntu1804-Readme.md +++ b/images/linux/Ubuntu1804-Readme.md @@ -4,8 +4,8 @@ | [(Public Beta) Ubuntu 22.04 is now available](https://github.com/actions/virtual-environments/issues/5490) | *** # Ubuntu 18.04.6 LTS -- Linux kernel version: 5.4.0-1085-azure -- Image Version: 20220710.1 +- Linux kernel version: 5.4.0-1086-azure +- Image Version: 20220717.1 ## Installed Software ### Language and Runtime @@ -31,7 +31,7 @@ ### Package Management - cpan 1.64 -- Helm 3.9.0 +- Helm 3.9.1 - Homebrew 3.5.4 - Miniconda 4.12.0 - Npm 8.11.0 @@ -39,7 +39,7 @@ - Pip3 9.0.1 - Pipx 1.0.0 - RubyGems 2.7.6 -- Vcpkg (build from master \<98f8d00e8>) +- Vcpkg (build from master \<68b7fec22>) - Yarn 1.22.19 #### Environment variables @@ -50,9 +50,9 @@ ### Project Management - Ant 1.10.5 -- Gradle 7.4.2 +- Gradle 7.5 - Maven 3.8.6 -- Sbt 1.7.0 +- Sbt 1.7.1 ### Tools - Ansible 2.11.12 @@ -70,7 +70,7 @@ - Docker-Buildx 0.8.2 - Docker-Moby Client 20.10.17+azure-1 - Docker-Moby Server 20.10.17+azure-1 -- Git 2.37.0 (apt source repository: ppa:git-core/ppa) +- Git 2.37.1 (apt source repository: ppa:git-core/ppa) - Git LFS 3.2.0 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.3.1 - Haveged 1.9.1 @@ -78,13 +78,13 @@ - HHVM (HipHop VM) 4.164.0 - jq 1.5 - Kind 0.14.0 -- Kubectl 1.24.2 +- Kubectl 1.24.3 - Kustomize 4.5.5 - Leiningen 2.9.8 - MediaInfo 17.12 - Mercurial 4.5.3 - Minikube 1.26.0 -- n 8.2.0 +- n 9.0.0 - Newman 5.3.2 - nvm 0.39.1 - OpenSSL 1.1.1-1ubuntu2.1~18.04.20 @@ -92,30 +92,30 @@ - Parcel 2.6.2 - PhantomJS 2.1.1 - Podman 3.4.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- Pulumi 3.35.3 +- Pulumi 3.36.0 - R 4.2.0 - Skopeo 1.5.0 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 - SVN 1.9.7 -- Terraform 1.2.4 +- Terraform 1.2.5 - yamllint 1.27.1 -- yq 4.25.3 +- yq 4.26.1 - zstd 1.5.2 (homebrew) ### CLI Tools - Alibaba Cloud CLI 3.0.124 -- AWS CLI 2.7.14 +- AWS CLI 2.7.16 - AWS CLI Session manager plugin 1.2.339.0 - AWS SAM CLI 1.53.0 - Azure CLI (azure-cli) 2.38.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.25.0 -- GitHub CLI 2.13.0 +- GitHub CLI 2.14.2 - Google Cloud SDK 369.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 10.7.1 -- OpenShift CLI 4.10.21 +- Netlify CLI 10.10.0 +- OpenShift CLI 4.10.22 - ORAS CLI 0.13.0 -- Vercel CLI 27.0.1 +- Vercel CLI 27.1.5 ### Java | Version | Vendor | Environment Variable | @@ -128,8 +128,8 @@ ### PHP | Tool | Version | | -------- | --------------------------------- | -| PHP | 7.2.34 7.3.33 7.4.30 8.0.20 8.1.7 | -| Composer | 2.3.9 | +| PHP | 7.2.34 7.3.33 7.4.30 8.0.21 8.1.8 | +| Composer | 2.3.10 | | PHPUnit | 8.5.27 | ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. @@ -144,7 +144,7 @@ - Cargo 1.62.0 - Rust 1.62.0 - Rustdoc 1.62.0 -- Rustup 1.24.3 +- Rustup 1.25.1 #### Packages - Bindgen 0.60.1 @@ -158,8 +158,8 @@ - Google Chrome 103.0.5060.114 - ChromeDriver 103.0.5060.53 - Chromium 103.0.5060.0 -- Microsoft Edge 103.0.1264.51 (apt source repository: https://packages.microsoft.com/repos/edge) -- Microsoft Edge WebDriver 103.0.1264.51 +- Microsoft Edge 103.0.1264.62 (apt source repository: https://packages.microsoft.com/repos/edge) +- Microsoft Edge WebDriver 103.0.1264.62 - Selenium server 4.3.0 - Mozilla Firefox 102.0 - Geckodriver 0.31.0 @@ -173,10 +173,10 @@ | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | ### .NET Core SDK -- 3.1.120 3.1.202 3.1.302 3.1.420 5.0.104 5.0.214 5.0.303 5.0.408 6.0.301 +- 3.1.120 3.1.202 3.1.302 3.1.421 5.0.104 5.0.214 5.0.303 5.0.408 6.0.302 ### .NET tools -- nbgv 3.5.107+6463ef6068 +- nbgv 3.5.108+6e793d63d3 ### Databases - MongoDB 5.0.9 (apt source repository: https://repo.mongodb.org/apt/ubuntu) @@ -203,8 +203,8 @@ ### Cached Tools #### Go - 1.16.15 -- 1.17.11 -- 1.18.3 +- 1.17.12 +- 1.18.4 #### Node.js - 12.22.12 @@ -236,8 +236,8 @@ | Name | Value | Architecture | | --------------- | ----------------------------------- | ------------ | | GOROOT_1_16_X64 | /opt/hostedtoolcache/go/1.16.15/x64 | x64 | -| GOROOT_1_17_X64 | /opt/hostedtoolcache/go/1.17.11/x64 | x64 | -| GOROOT_1_18_X64 | /opt/hostedtoolcache/go/1.18.3/x64 | x64 | +| GOROOT_1_17_X64 | /opt/hostedtoolcache/go/1.17.12/x64 | x64 | +| GOROOT_1_18_X64 | /opt/hostedtoolcache/go/1.18.4/x64 | x64 | ### PowerShell Tools - PowerShell 7.2.5 @@ -265,7 +265,7 @@ | Android Emulator | 31.2.10 | | Android SDK Build-tools | 33.0.0<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3<br>26.0.0 26.0.1 26.0.2 26.0.3<br>25.0.0 25.0.1 25.0.2 25.0.3<br>24.0.0 24.0.1 24.0.2 24.0.3<br>23.0.1 23.0.2 23.0.3 | | Android SDK Platform-Tools | 33.0.2 | -| Android SDK Platforms | android-33 (rev 1)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3)<br>android-26 (rev 2)<br>android-25 (rev 3)<br>android-24 (rev 2)<br>android-23 (rev 3) | +| Android SDK Platforms | android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3)<br>android-26 (rev 2)<br>android-25 (rev 3)<br>android-24 (rev 2)<br>android-23 (rev 3) | | Android SDK Tools | 26.1.1 | | Android Support Repository | 47.0.0 | | CMake | 3.10.2<br>3.18.1 | @@ -290,18 +290,18 @@ | alpine:3.12 | sha256:c75ac27b49326926b803b9ed43bf088bc220d22556de1bc5f72d742c91398f69 | 2022-04-05 | | alpine:3.13 | sha256:ccf92aa53bc6c3b25be2ad0cce80baec1778f007f7e076b0ffbd1b225d0b3a9b | 2022-04-05 | | alpine:3.14 | sha256:06b5d462c92fc39303e6363c65e074559f8d6b1363250027ed5053557e3398c5 | 2022-04-05 | -| buildpack-deps:bullseye | sha256:7a78a5f716dd32b0eb89876f8c5cf5e443781a44b7fe12619e897bad9a642e14 | 2022-06-23 | -| buildpack-deps:buster | sha256:7f9a157d07e0a81a4e3130ce1490142b208155e09d1c3459b4213a5779e87546 | 2022-06-23 | +| buildpack-deps:bullseye | sha256:4cbb6d56f192ea1868bdbc441269d0343c90b201c973931aaa6722300118d463 | 2022-07-12 | +| buildpack-deps:buster | sha256:3ab2863d37b2d037440b4a153a8fb3c79e935030fd47cef21b698688ce72f66e | 2022-07-12 | | buildpack-deps:stretch | sha256:78e995165a5788c2f55aed6e548d8f6c1534830d4310c870408fccb2da8c5b2e | 2022-06-23 | -| debian:10 | sha256:9740683722a2a8aa497a5b23e4bc229fcf8b8991e26d3935540c7704ff24012e | 2022-06-23 | -| debian:11 | sha256:859ea45db307402ee024b153c7a63ad4888eb4751921abbef68679fc73c4c739 | 2022-06-23 | +| debian:10 | sha256:0685c900f6e691bdda6980c0ed0779d20183bc58770059b64adb56cb8a3129f0 | 2022-07-12 | +| debian:11 | sha256:2ce44bbc00a79113c296d9d25524e15d423b23303fdbbe20190d2f96e0aeb251 | 2022-07-12 | | debian:9 | sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be | 2022-06-23 | | moby/buildkit:latest | sha256:0dc312b04eac1b44cd2cad566deb1e886c753109208affbbec8384f381ff7f38 | 2022-05-06 | | node:12 | sha256:01627afeb110b3054ba4a1405541ca095c8bfca1cb6f2be9479c767a2711879e | 2022-04-20 | | node:12-alpine | sha256:d4b15b3d48f42059a15bd659be60afe21762aae9d6cbea6f124440895c27db68 | 2022-04-11 | -| node:14 | sha256:0c571044148fd772bbc03fd42d293939ce3e39d7aa1e095dd87c33ce89796829 | 2022-07-08 | +| node:14 | sha256:a086a11f7780399837ea0465ac8a8e8f14f2b66fe5a110fe0c24644d53a103c5 | 2022-07-12 | | node:14-alpine | sha256:2af507df45e7c0a46c6b3001ce0dbc6924f7b39864d442045f781361a1971975 | 2022-07-08 | -| node:16 | sha256:8951351b7c6a2f8ff9ec25eccc087d37a8aeccf9bf911888ff13c76223467466 | 2022-07-08 | +| node:16 | sha256:2e1b4542d4a06e0e0442dc38af1f4828760aecc9db2b95e7df87f573640d98cd | 2022-07-12 | | node:16-alpine | sha256:554142f9a6367f1fbd776a1b2048fab3a2cc7aa477d7fe9c00ce0f110aa45716 | 2022-07-08 | | ubuntu:16.04 | sha256:20858ebbc96215d6c3c574f781133ebffdc7c18d98af4f294cc4c04871a6fe61 | 2021-08-31 | | ubuntu:18.04 | sha256:478caf1bec1afd54a58435ec681c8755883b7eb843a8630091890130b15a79af | 2022-06-06 | @@ -384,7 +384,7 @@ | upx | 3.94-4 | | wget | 1.19.4-1ubuntu2.2 | | xorriso | 1.4.8-3 | -| xvfb | 2:1.19.6-1ubuntu4.10 | +| xvfb | 2:1.19.6-1ubuntu4.11 | | xz-utils | 5.2.2-1.3ubuntu0.1 | | zip | 3.0-11build1 | | zsync | 0.6.2-3ubuntu1 | From 595ca70a29f9a88c9390ed3589d858e387de1d71 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 19 Jul 2022 13:57:25 +0000 Subject: [PATCH 1325/3485] Updating readme file for win19 version 20220717.1 (#5928) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2019-Readme.md | 74 ++++++++++++++++---------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index 242dd3a547aa..b22c3c334f21 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -2,11 +2,11 @@ |-| | [[all OSs] Android ndk-bundle along with old NDK versions will be deprecated on July, 24](https://github.com/actions/virtual-environments/issues/5879) | | [[Windows, macOS] LLVM will be updated to version 14 on July, 11](https://github.com/actions/virtual-environments/issues/5835) | -| [[Azure DevOps] Windows-2016 environment removal postponed until June 30, 2022](https://github.com/actions/virtual-environments/issues/5403) | +| [[Azure DevOps] Windows-2016 environment removal postponed until July 22, 2022](https://github.com/actions/virtual-environments/issues/5403) | *** # Microsoft Windows Server 2019 Datacenter -- OS Version: 10.0.17763 Build 3046 -- Image Version: 20220710.1 +- OS Version: 10.0.17763 Build 3165 +- Image Version: 20220717.1 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -14,7 +14,7 @@ ## Installed Software ### Language and Runtime - Bash 4.4.23(1)-release -- Go 1.17.11 +- Go 1.17.12 - Julia 1.7.3 - Kotlin 1.7.10 - LLVM 14.0.6 @@ -26,15 +26,15 @@ ### Package Management - Chocolatey 1.1.0 -- Composer 2.3.9 -- Helm 3.8.2 +- Composer 2.3.10 +- Helm 3.9.0 - Miniconda 4.12.0 (pre-installed on the image but not added to PATH) - NPM 8.11.0 - NuGet 6.2.1.2 - pip 22.1.2 (python 3.7) - Pipx 1.1.0 - RubyGems 2.7.6.3 -- Vcpkg (build from master \<98f8d00e8>) +- Vcpkg (build from master \<68b7fec22>) - Yarn 1.22.19 #### Environment variables @@ -47,10 +47,10 @@ - Ant 1.10.12 - Gradle 7.4 - Maven 3.8.6 -- sbt 1.6.2 +- sbt 1.7.1 ### Tools -- 7zip 22.00 +- 7zip 22.01 - aria2 1.36.0 - azcopy 10.15.0 - Bazel 5.2.0 @@ -64,9 +64,9 @@ - Docker Compose v2 2.6.1 - Docker-wincred 0.6.4 - ghc 9.2.3 -- Git 2.37.0.windows.1 +- Git 2.37.1.windows.1 - Git LFS 3.2.0 -- Google Cloud SDK 392.0.0 +- Google Cloud SDK 393.0.0 - InnoSetup 6.2.1 - jq 1.6 - Kind 0.14.0 @@ -78,7 +78,7 @@ - OpenSSL 1.1.1 - Packer 1.8.2 - Parcel 2.6.2 -- Pulumi v3.35.3 +- Pulumi v3.36.0 - R 4.2.1 - Service Fabric SDK 9.0.1028.9590 - Stack 2.7.5 @@ -92,20 +92,20 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.124 -- AWS CLI 2.7.14 +- AWS CLI 2.7.16 - AWS SAM CLI 1.53.0 - AWS Session Manager CLI 1.2.339.0 - Azure CLI 2.38.0 - Azure DevOps CLI extension 0.25.0 - Cloud Foundry CLI 6.53.0 -- GitHub CLI 2.13.0 +- GitHub CLI 2.14.2 - Hub CLI 2.14.2 ### Rust Tools - Cargo 1.62.0 - Rust 1.62.0 - Rustdoc 1.62.0 -- Rustup 1.24.3 +- Rustup 1.25.1 #### Packages - bindgen 0.60.1 @@ -118,8 +118,8 @@ ### Browsers and webdrivers - Google Chrome 103.0.5060.114 - Chrome Driver 103.0.5060.53 -- Microsoft Edge 103.0.1264.49 -- Microsoft Edge Driver 103.0.1264.49 +- Microsoft Edge 103.0.1264.62 +- Microsoft Edge Driver 103.0.1264.62 - Mozilla Firefox 102.0.1 - Gecko Driver 0.31.0 - IE Driver 3.150.1.1 @@ -166,8 +166,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Version | Architecture | Environment Variable | | ------- | ------------ | -------------------- | | 1.16.15 | x64 | GOROOT_1_16_X64 | -| 1.17.11 (Default) | x64 | GOROOT_1_17_X64 | -| 1.18.3 | x64 | GOROOT_1_18_X64 | +| 1.17.12 (Default) | x64 | GOROOT_1_17_X64 | +| 1.18.4 | x64 | GOROOT_1_18_X64 | #### Node | Version | Architecture | @@ -239,12 +239,12 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Visual Studio Enterprise 2019 | Name | Version | Path | | ----------------------------- | --------------- | -------------------------------------------------------------- | -| Visual Studio Enterprise 2019 | 16.11.32602.291 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | +| Visual Studio Enterprise 2019 | 16.11.32630.194 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | #### Workloads, components and extensions: | Package | Version | | ------------------------------------------------------------------------- | --------------- | -| Component.Android.NDK.R16B | 16.11.32601.460 | +| Component.Android.NDK.R16B | 16.11.32629.160 | | Component.Android.SDK25.Private | 16.0.28625.61 | | Component.Android.SDK30 | 16.10.31205.252 | | Component.Ant | 1.9.3.8 | @@ -269,7 +269,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Component.WixToolset.VisualStudioExtension.Schemas3 | 1.0.0.18 | | Component.WixToolset.VisualStudioExtension.Schemas4 | 1.0.0.18 | | Component.Xamarin | 16.10.31205.252 | -| Component.Xamarin.RemotedSimulator | 16.10.31205.252 | +| Component.Xamarin.RemotedSimulator | 16.11.32629.160 | | Microsoft.Component.Azure.DataLake.Tools | 16.10.31205.252 | | Microsoft.Component.ClickOnce | 16.11.31603.221 | | Microsoft.Component.MSBuild | 16.5.29515.121 | @@ -299,9 +299,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.Net.ComponentGroup.DevelopmentPrerequisites | 16.3.29207.166 | | Microsoft.Net.ComponentGroup.TargetingPacks.Common | 16.0.28516.191 | | Microsoft.NetCore.Component.DevelopmentTools | 16.10.31303.231 | -| Microsoft.NetCore.Component.Runtime.3.1 | 16.11.32602.291 | -| Microsoft.NetCore.Component.Runtime.6.0 | 16.11.32602.291 | -| Microsoft.NetCore.Component.SDK | 16.11.32602.291 | +| Microsoft.NetCore.Component.Runtime.3.1 | 16.11.32630.194 | +| Microsoft.NetCore.Component.Runtime.6.0 | 16.11.32630.194 | +| Microsoft.NetCore.Component.SDK | 16.11.32630.194 | | Microsoft.NetCore.Component.Web | 16.10.31303.231 | | Microsoft.VisualStudio.Component.AppInsights.Tools | 16.5.29515.121 | | Microsoft.VisualStudio.Component.AspNet45 | 16.10.31205.252 | @@ -509,17 +509,17 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### .NET Core SDK `Location C:\Program Files\dotnet\sdk` -- 3.1.120 3.1.202 3.1.302 3.1.420 5.0.104 5.0.214 5.0.303 5.0.408 5.0.409 +- 3.1.120 3.1.202 3.1.302 3.1.421 5.0.104 5.0.214 5.0.303 5.0.408 5.0.410 ### .NET Core Runtime `Location: C:\Program Files\dotnet\shared\Microsoft.AspNetCore.App` -- 3.1.4 3.1.6 3.1.20 3.1.26 5.0.4 5.0.9 5.0.17 6.0.6 +- 3.1.4 3.1.6 3.1.20 3.1.27 5.0.4 5.0.9 5.0.17 6.0.7 `Location: C:\Program Files\dotnet\shared\Microsoft.NETCore.App` -- 3.1.4 3.1.6 3.1.20 3.1.26 5.0.4 5.0.9 5.0.17 6.0.6 +- 3.1.4 3.1.6 3.1.20 3.1.27 5.0.4 5.0.9 5.0.17 6.0.7 `Location: C:\Program Files\dotnet\shared\Microsoft.WindowsDesktop.App` -- 3.1.4 3.1.6 3.1.20 3.1.26 5.0.4 5.0.9 5.0.17 6.0.6 +- 3.1.4 3.1.6 3.1.20 3.1.27 5.0.4 5.0.9 5.0.17 6.0.7 ### .NET Framework `Type: Developer Pack` @@ -528,7 +528,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 4.8 ### .NET tools -- nbgv 3.5.107+6463ef6068 +- nbgv 3.5.108+6e793d63d3 ### PowerShell Tools - PowerShell 7.2.5 @@ -548,7 +548,7 @@ All other versions are saved but not installed. #### Powershell Modules | Module | Version | | ------------------ | ---------------- | -| AWSPowerShell | 4.1.122 | +| AWSPowerShell | 4.1.127 | | DockerMsftProvider | 1.0.0.8 | | MarkdownPS | 1.9 | | Microsoft.Graph | 1.10.0 | @@ -564,7 +564,7 @@ All other versions are saved but not installed. | -------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 7.0 | | Android SDK Build-tools | 33.0.0<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3<br>26.0.0 26.0.1 26.0.2 26.0.3<br>25.0.0 25.0.1 25.0.2 25.0.3<br>24.0.0 24.0.1 24.0.2 24.0.3<br>23.0.1 23.0.2 23.0.3<br>22.0.1<br>21.1.2<br>20.0.0<br>19.1.0 | -| Android SDK Platforms | android-33 (rev 1)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3)<br>android-26 (rev 2)<br>android-25 (rev 3)<br>android-24 (rev 2)<br>android-23 (rev 3)<br>android-22 (rev 2)<br>android-21 (rev 2)<br>android-20 (rev 2)<br>android-19 (rev 4) | +| Android SDK Platforms | android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3)<br>android-26 (rev 2)<br>android-25 (rev 3)<br>android-24 (rev 2)<br>android-23 (rev 3)<br>android-22 (rev 2)<br>android-21 (rev 2)<br>android-20 (rev 2)<br>android-19 (rev 4) | | Android SDK Platform-Tools | 33.0.2 | | Android SDK Tools | 26.1.1 | | Android Support Repository | 47.0.0 | @@ -588,10 +588,10 @@ All other versions are saved but not installed. ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:e442e479cd27028f31eb797d367aec939acf5d334b365e391d7fa02acdfa73b6 | 2022-06-14 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:0828de81b4ff3c8036d4923dfe09518a5baee849915f9d3c8f20a502bc209e25 | 2022-06-14 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:82e0a5e2c8747b9f2c88a15e7f652fd4b437cbe0399ab15ac54a0680dde8b453 | 2022-06-14 | -| mcr.microsoft.com/windows/nanoserver:1809 | sha256:1e03529d89a3ebab534c024b69dcc050757b285622aaecfe8d5d35e26fee50ac | 2022-06-09 | -| mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:e100aa542181a34add63bc38125ad57da16a7d1722dd965a888fde1b8d8c67bb | 2022-06-09 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:4b76efcb8239febd279f6c6ec4e1b84ea9e0b7e516fd7aba5ca1fa7c26b4643d | 2022-07-12 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:efb1e706571bbf485e9625b74ee4a81ff0b2e49dec5fec78a775066112548a54 | 2022-07-12 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:2d315059f5704a09c75dc45e12352e6a53ad6a208fdd5e79c4005dcdac1ac1de | 2022-07-12 | +| mcr.microsoft.com/windows/nanoserver:1809 | sha256:935da2b4778f3a67b484abc895ccbeca847be1625ee0ff10345fa8060dd51e5a | 2022-07-06 | +| mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:26c6c296a4737ba478fe3c3e531b098f89b5562c40b416ba6fb8177ac462d1af | 2022-07-06 | From 17dbe2ac547c277a29b1b5ba1415840b9e3dd7cf Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 20 Jul 2022 11:16:01 +0000 Subject: [PATCH 1326/3485] Updating readme file for macOS-11 version 20220710.1 (#5890) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-11-Readme.md | 74 ++++++++++++++++++--------------- 1 file changed, 40 insertions(+), 34 deletions(-) diff --git a/images/macos/macos-11-Readme.md b/images/macos/macos-11-Readme.md index b4088893e64e..eef5b1bb4e58 100644 --- a/images/macos/macos-11-Readme.md +++ b/images/macos/macos-11-Readme.md @@ -1,40 +1,46 @@ +| Announcements | +|-| +| [[all OSs] Android ndk-bundle along with old NDK versions will be deprecated on July, 24](https://github.com/actions/virtual-environments/issues/5879) | +| [[macOS] Default Xcode on Monterey image will be set to Xcode 13.4.1 on July, 11](https://github.com/actions/virtual-environments/issues/5836) | +| [[Windows, macOS] LLVM will be updated to version 14 on July, 11](https://github.com/actions/virtual-environments/issues/5835) | +*** # macOS 11.6 info -- System Version: macOS 11.6.6 (20G624) +- System Version: macOS 11.6.7 (20G630) - Kernel Version: Darwin 20.6.0 -- Image Version: 20220627.1 +- Image Version: 20220710.1 ## Installed Software ### Language and Runtime - .NET SDK 3.1.101 3.1.201 3.1.302 3.1.420 5.0.102 5.0.202 5.0.302 5.0.408 - Bash 3.2.57(1)-release -- Clang/LLVM 13.0.1 is available on `'$(brew --prefix llvm@13)/bin/clang'` - Clang/LLVM 13.0.0 is default +- Clang/LLVM 14.0.6 is available on `'$(brew --prefix llvm@14)/bin/clang'` - gcc-9 (Homebrew GCC 9.5.0) 9.5.0 - available by `gcc-9` alias -- gcc-10 (Homebrew GCC 10.3.0) 10.3.0 - available by `gcc-10` alias +- gcc-10 (Homebrew GCC 10.4.0) 10.4.0 - available by `gcc-10` alias - gcc-11 (Homebrew GCC 11.3.0_2) 11.3.0 - available by `gcc-11` alias - GNU Fortran (Homebrew GCC 9.5.0) 9.5.0 - available by `gfortran-9` alias -- GNU Fortran (Homebrew GCC 10.3.0) 10.3.0 - available by `gfortran-10` alias +- GNU Fortran (Homebrew GCC 10.4.0) 10.4.0 - available by `gfortran-10` alias - GNU Fortran (Homebrew GCC 11.3.0_2) 11.3.0 - available by `gfortran-11` alias - Go 1.17.11 - julia 1.7.3 -- Kotlin 1.7.0-release-281 +- Kotlin 1.7.10-release-333 - MSBuild 16.10.1.31401 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) -- Node.js v16.15.1 +- Node.js v16.16.0 - NVM 0.39.1 -- NVM - Cached node versions: v12.22.12 v14.19.3 v16.15.1 +- NVM - Cached node versions: v12.22.12 v14.20.0 v16.16.0 - Perl 5.34.0 -- PHP 8.1.7 +- PHP 8.1.8 - Python 2.7.18 - Python 3.9.13 - R 4.2.1 - Ruby 2.7.6p219 ### Package Management -- Bundler version 2.3.16 +- Bundler version 2.3.17 - Carthage 0.38.0 - CocoaPods 1.11.3 -- Composer 2.3.7 -- Homebrew 3.5.2 +- Composer 2.3.9 +- Homebrew 3.5.4 - Miniconda 4.12.0 - NPM 8.11.0 - NuGet 6.2.1.2 @@ -42,7 +48,7 @@ - Pip 22.1.1 (python 3.9) - Pipx 1.1.0 - RubyGems 3.2.33 -- Vcpkg 2022 (build from master \<432037ce4>) +- Vcpkg 2022 (build from master \<98f8d00e8>) - Yarn 1.22.19 #### Environment variables @@ -65,7 +71,7 @@ - bazelisk 1.12.0 - bsdtar 3.3.2 - available by 'tar' alias - Curl 7.84.0 -- Git 2.36.1 +- Git 2.37.0 - Git LFS: 3.2.0 - GitHub CLI: 2.13.0 - GNU Tar 1.34 - available by 'gtar' alias @@ -73,12 +79,12 @@ - gpg (GnuPG) 2.3.6 - helm v3.9.0+g7ceeda6 - Hub CLI: 2.14.2 -- ImageMagick 7.1.0-39 +- ImageMagick 7.1.0-43 - jq 1.6 - mongo v5.0.7 - mongod v5.0.7 - Newman 5.3.2 -- OpenSSL 1.1.1p 21 Jun 2022 `(/usr/local/opt/openssl@1.1 -> ../Cellar/openssl@1.1/1.1.1p)` +- OpenSSL 1.1.1q 5 Jul 2022 `(/usr/local/opt/openssl@1.1 -> ../Cellar/openssl@1.1/1.1.1q)` - Packer 1.8.2 - PostgreSQL 14.4 - psql (PostgreSQL) 14.4 @@ -91,15 +97,15 @@ ### Tools - Aliyun CLI 3.0.123 - App Center CLI 2.10.10 -- AWS CLI 2.7.11 -- AWS SAM CLI 1.52.0 +- AWS CLI 2.7.14 +- AWS SAM CLI 1.53.0 - AWS Session Manager CLI 1.2.339.0 - Azure CLI (azure-devops) 0.25.0 -- Azure CLI 2.37.0 -- Bicep CLI 0.7.4 +- Azure CLI 2.38.0 +- Bicep CLI 0.8.9 - Cabal 3.6.2.0 - Cmake 3.23.2 -- Fastlane 2.206.2 +- Fastlane 2.207.0 - GHC 9.2.3 - GHCup 0.1.17.8 - Jazzy 0.14.2 @@ -110,16 +116,16 @@ ### Linters - SwiftLint 0.47.1 -- yamllint 1.26.3 +- yamllint 1.27.1 ### Browsers - Safari 15.5 (16613.2.7.1.9) - SafariDriver 15.5 (16613.2.7.1.9) -- Google Chrome 103.0.5060.53 +- Google Chrome 103.0.5060.114 - ChromeDriver 103.0.5060.53 -- Microsoft Edge 103.0.1264.37 -- Microsoft Edge WebDriver 103.0.1264.37 -- Mozilla Firefox 101.0.1 +- Microsoft Edge 103.0.1264.51 +- Microsoft Edge WebDriver 103.0.1264.51 +- Mozilla Firefox 102.0.1 - geckodriver 0.31.0 - Selenium server 4.3.0 @@ -165,8 +171,8 @@ #### Node.js - 12.22.12 -- 14.19.3 -- 16.15.1 +- 14.20.0 +- 16.16.0 #### Go | Version | Architecture | Environment Variable | @@ -176,9 +182,9 @@ | 1.18.3 | x64 | GOROOT_1_18_X64 | ### Rust Tools -- Cargo 1.61.0 -- Rust 1.61.0 -- Rustdoc 1.61.0 +- Cargo 1.62.0 +- Rust 1.62.0 +- Rustdoc 1.62.0 - Rustup 1.24.3 #### Packages @@ -186,7 +192,7 @@ - Cargo-audit 0.17.0 - Cargo-outdated 0.11.1 - Cbindgen 0.24.3 -- Clippy 0.1.61 +- Clippy 0.1.62 - Rustfmt 1.4.38-stable ### PowerShell Tools @@ -195,7 +201,7 @@ #### PowerShell Modules | Module | Version | | ---------------- | ------- | -| Az | 8.0.0 | +| Az | 8.1.0 | | MarkdownPS | 1.9 | | Pester | 5.3.3 | | PSScriptAnalyzer | 1.20.0 | @@ -211,7 +217,7 @@ | Version | Build | Path | | -------------- | --------- | ------------------------------------ | | 2019 | 8.10.25.2 | /Applications/Visual Studio 2019.app | -| 2022 (default) | 17.0.4.23 | /Applications/Visual Studio.app | +| 2022 (default) | 17.0.5.6 | /Applications/Visual Studio.app | ##### Notes: ``` From ef8f8086d50cdaf3c4aaf1125030b5f4448aa180 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Wed, 20 Jul 2022 14:34:03 +0200 Subject: [PATCH 1327/3485] Add ProBITools.MicrosoftAnalysisServicesModelingProjects2022 3.0.4 (#5937) --- images/win/scripts/ImageHelpers/InstallHelpers.ps1 | 2 +- images/win/toolsets/toolset-2022.json | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/images/win/scripts/ImageHelpers/InstallHelpers.ps1 b/images/win/scripts/ImageHelpers/InstallHelpers.ps1 index 3bb83975b507..7ceb718a6a96 100644 --- a/images/win/scripts/ImageHelpers/InstallHelpers.ps1 +++ b/images/win/scripts/ImageHelpers/InstallHelpers.ps1 @@ -247,7 +247,7 @@ function Get-VsixExtenstionFromMarketplace { } "ProBITools.MicrosoftAnalysisServicesModelingProjects2022" { $fileName = "Microsoft.DataTools.AnalysisServices.vsix" - $downloadUri = "https://download.microsoft.com/download/b/b/e/bbe90a41-d7c0-432b-9866-89f698405683/Microsoft.DataTools.AnalysisServices.vsix" + $downloadUri = "https://download.microsoft.com/download/c/8/9/c896a7f2-d0fd-45ac-90e6-ff61f67523cb/Microsoft.DataTools.AnalysisServices.vsix" } } diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index ede4ed949041..c5e745898e7a 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -276,7 +276,8 @@ "vsix": [ "VisualStudioClient.MicrosoftVisualStudio2022InstallerProjects", "WixToolset.WixToolsetVisualStudio2022Extension", - "ProBITools.MicrosoftReportProjectsforVisualStudio2022" + "ProBITools.MicrosoftReportProjectsforVisualStudio2022", + "ProBITools.MicrosoftAnalysisServicesModelingProjects2022" ] }, "docker": { From 593ab19a0f3416e01d1389e9fb6e05a9b4ec65ec Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Thu, 21 Jul 2022 11:33:26 +0400 Subject: [PATCH 1328/3485] Remove ndk-bundle + old ndk versions from macOS (#5929) --- .../configuration/environment/bashrc | 4 +- .../macos/provision/core/android-toolsets.sh | 20 +----- .../provision/core/xamarin-android-ndk.sh | 66 ------------------- .../SoftwareReport.Android.psm1 | 22 ++----- images/macos/templates/macOS-10.15.json | 1 - images/macos/tests/Android.Tests.ps1 | 11 ---- images/macos/tests/XamarinNDK.Tests.ps1 | 32 --------- images/macos/toolsets/toolset-10.15.json | 1 - images/macos/toolsets/toolset-11.json | 1 - images/macos/toolsets/toolset-12.json | 1 - 10 files changed, 6 insertions(+), 153 deletions(-) delete mode 100644 images/macos/provision/core/xamarin-android-ndk.sh delete mode 100644 images/macos/tests/XamarinNDK.Tests.ps1 diff --git a/images/macos/provision/configuration/environment/bashrc b/images/macos/provision/configuration/environment/bashrc index 2ffdeb0bc606..65895e7b6625 100644 --- a/images/macos/provision/configuration/environment/bashrc +++ b/images/macos/provision/configuration/environment/bashrc @@ -4,8 +4,6 @@ export LANG=en_US.UTF-8 export ANDROID_HOME=${HOME}/Library/Android/sdk export ANDROID_SDK_ROOT=${HOME}/Library/Android/sdk -export ANDROID_NDK_HOME=${ANDROID_HOME}/ndk-bundle -export ANDROID_NDK_ROOT=${ANDROID_HOME}/ndk-bundle export VM_ASSETS=/usr/local/opt/$USER/scripts @@ -16,7 +14,7 @@ export AGENT_TOOLSDIRECTORY=$HOME/hostedtoolcache export RUNNER_TOOL_CACHE=$HOME/hostedtoolcache export PATH=/Library/Frameworks/Mono.framework/Versions/Current/Commands:$PATH -export PATH=$ANDROID_HOME/tools:$ANDROID_HOME/platform-tools:$ANDROID_NDK_HOME:$PATH +export PATH=$ANDROID_HOME/tools:$ANDROID_HOME/platform-tools:$PATH export PATH=/usr/local/bin:/usr/local/sbin:~/bin:~/.yarn/bin:$PATH export PATH="/usr/local/opt/curl/bin:$PATH" export PATH=$HOME/.cargo/bin:$PATH diff --git a/images/macos/provision/core/android-toolsets.sh b/images/macos/provision/core/android-toolsets.sh index 3507a4a6b0c9..c20dc7d77dec 100755 --- a/images/macos/provision/core/android-toolsets.sh +++ b/images/macos/provision/core/android-toolsets.sh @@ -32,7 +32,6 @@ ANDROID_EXTRA_LIST=($(get_toolset_value '.android."extra-list"[]')) ANDROID_ADDON_LIST=($(get_toolset_value '.android."addon-list"[]')) ANDROID_ADDITIONAL_TOOLS=($(get_toolset_value '.android."additional-tools"[]')) ANDROID_NDK_MAJOR_VERSIONS=($(get_toolset_value '.android.ndk."versions"[]')) -ANDROID_NDK_MAJOR_DEFAULT=$(get_toolset_value '.android.ndk.default') ANDROID_NDK_MAJOR_LATEST=$(get_toolset_value '.android.ndk."versions"[-1]') # Get the latest command line tools from https://developer.android.com/studio#cmdline-tools cmdlineToolsVersion=$(get_toolset_value '.android."cmdline-tools"') @@ -81,12 +80,8 @@ do ndk_full_version=$(get_full_ndk_version $ndk_version) echo y | $SDKMANAGER "ndk;$ndk_full_version" done -# This changes were added due to incompatibility with android ndk-bundle (ndk;22.0.7026061). -# Link issue virtual-environments: https://github.com/actions/virtual-environments/issues/2481 -# Link issue xamarin-android: https://github.com/xamarin/xamarin-android/issues/5526 -ndkDefault=$(get_full_ndk_version $ANDROID_NDK_MAJOR_DEFAULT) + ndkLatest=$(get_full_ndk_version $ANDROID_NDK_MAJOR_LATEST) -ln -s $ANDROID_HOME/ndk/$ndkDefault $ANDROID_HOME/ndk-bundle ANDROID_NDK_LATEST_HOME=$ANDROID_HOME/ndk/$ndkLatest echo "export ANDROID_NDK_LATEST_HOME=$ANDROID_NDK_LATEST_HOME" >> "${HOME}/.bashrc" @@ -126,17 +121,4 @@ do echo y | $SDKMANAGER "$tool_name" done -popd - -echo "Installing ProGuard-5..." -PROGUARD_LOCATION="https://github.com/Guardsquare/proguard/archive/proguard5.3.3.tar.gz" -pushd $ANDROID_HOME -cd tools -mv proguard proguard4 -mkdir proguard && cd proguard -curl -L -o proguard5.tgz $PROGUARD_LOCATION -tar xzf proguard5.tgz --strip 1 && rm -f proguard5.tgz -cp ../proguard4/proguard-*.txt . # Copy the Proguard Android definitions from the previous version -popd - invoke_tests "Android" diff --git a/images/macos/provision/core/xamarin-android-ndk.sh b/images/macos/provision/core/xamarin-android-ndk.sh deleted file mode 100644 index 82896b46c063..000000000000 --- a/images/macos/provision/core/xamarin-android-ndk.sh +++ /dev/null @@ -1,66 +0,0 @@ -#!/bin/bash -e -o pipefail -source ~/utils/utils.sh - -ANDROID_HOME=$HOME/Library/Android/sdk -ANDROID_NDK_HOME=$ANDROID_HOME/ndk-bundle -SDKMANAGER=$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager - -# Android NDK v16 is not compatible with old Xamarin.Android SDK -# and fails builds with BundleAssemblies enabled -ANDROID_NDK_15_HOME=$HOME/Library/Android/sdk/android-ndk-r15c -ANDROID_NDK_PACKAGE="android-ndk-r15c-darwin-x86_64.zip" -ANDROID_NDK_URL="https://dl.google.com/android/repository/${ANDROID_NDK_PACKAGE}" - -echo "Install and setup Android NDK v15..." -cd $HOME - -download_with_retries $ANDROID_NDK_URL - -echo "Unzipping $ANDROID_NDK_URL..." -unzip -q $ANDROID_NDK_PACKAGE -d ${ANDROID_HOME} - -echo "Removing $ANDROID_NDK_URL..." -rm -rf "$ANDROID_NDK_PACKAGE" - -XAMARIN_ANDROID_NDK_PATH=$HOME/Library/Developer/Xamarin -mkdir -p $XAMARIN_ANDROID_NDK_PATH - -echo "Preparing symlink for $ANDROID_NDK_15_HOME ..." -ln -s $ANDROID_NDK_15_HOME $XAMARIN_ANDROID_NDK_PATH/android-ndk - -# NDK r17 does not include MIPS/MIPS64 toolchains anymore, NDK r16b still provides this a supplement -echo "Checking NDK installation contains required MIPS toolchains…" -NDK_BUNDLE_TOOLCHAINS=$ANDROID_NDK_HOME/toolchains -ANDROID_NDK_R16B_PATH=$ANDROID_HOME/ndk/16.1.4479499 -MIPS64_TOOLCHAIN=$NDK_BUNDLE_TOOLCHAINS/mips64el-linux-android-4.9/prebuilt/darwin-x86_64/bin -MIPS_TOOLCHAIN=$NDK_BUNDLE_TOOLCHAINS/mipsel-linux-android-4.9/prebuilt/darwin-x86_64/bin - -if [ -d $MIPS64_TOOLCHAIN ] && [ -d $MIPS_TOOLCHAIN ]; then - echo "MIPS64 and MIPS toolchain already installed for NDK bundle - not reinstalling." -else - pushd $ANDROID_HOME - - echo "Installing ndk r16b..." - echo y | $SDKMANAGER "ndk;16.1.4479499" - - echo "Cleaning potential pre-existing MIPS toolchain directories" - rm -rf ndk-bundle/toolchains/mips* - - echo "Moving MIPS toolchains to $ANDROID_NDK_HOME/toolchains" - mv $ANDROID_NDK_R16B_PATH/toolchains/mips** ndk-bundle/toolchains/ - - echo "Delete ndk r16b..." - rm -rf $ANDROID_NDK_R16B_PATH - - if [ ! -d $MIPS64_TOOLCHAIN ] || [ ! -d $MIPS_TOOLCHAIN ]; then - echo "MIPS toolchains not installed correctly! Check whether $ANDROID_NDK_HOME/toolchains/mips* does not exist." - fi - popd -fi - -# Latest versions of NDK doesn't include GCC, NDK r18 does -echo "Installing ndk r18B..." -echo y | $SDKMANAGER "ndk;18.1.5063045" -echo "export ANDROID_NDK_18R_PATH=${ANDROID_HOME}/ndk/18.1.5063045" >> "${HOME}/.bashrc" - -invoke_tests "XamarinNDK" diff --git a/images/macos/software-report/SoftwareReport.Android.psm1 b/images/macos/software-report/SoftwareReport.Android.psm1 index 91973332271c..97b961483a9e 100644 --- a/images/macos/software-report/SoftwareReport.Android.psm1 +++ b/images/macos/software-report/SoftwareReport.Android.psm1 @@ -94,13 +94,13 @@ function Build-AndroidTable { } function Build-AndroidEnvironmentTable { - $androidVersions = Get-Item env:ANDROID_* + $androidVersions = Get-Item env:ANDROID_* - $shoulddResolveLink = 'ANDROID_NDK_PATH', 'ANDROID_NDK_HOME', 'ANDROID_NDK_ROOT', 'ANDROID_NDK_LATEST_HOME' + $shoulddResolveLink = 'ANDROID_NDK_LATEST_HOME' return $androidVersions | Sort-Object -Property Name | ForEach-Object { [PSCustomObject] @{ "Name" = $_.Name - "Value" = if ($shoulddResolveLink.Contains($_.Name )) { Get-PathWithLink($_.Value) } else {$_.Value} + "Value" = if ($shoulddResolveLink.Contains($_.Name )) { Get-PathWithLink($_.Value) } else { $_.Value } } } } @@ -175,23 +175,9 @@ function Get-AndroidGoogleAPIsVersions { } function Get-AndroidNDKVersions { - $os = Get-OSVersion - - if ($os.IsCatalina) { - # Hardcode NDK 15 as a separate case since it is installed manually without sdk-manager (to none default location) - $versions = @() - $versions += "15.2.4203891" - } - $ndkFolderPath = Join-Path (Get-AndroidSDKRoot) "ndk" $versions += Get-ChildItem -Path $ndkFolderPath -Name - $ndkDefaultVersion = Get-ToolsetValue "android.ndk.default" - $ndkDefaultFullVersion = Get-ChildItem "$env:ANDROID_HOME/ndk/$ndkDefaultVersion.*" -Name | Select-Object -Last 1 - - return ($versions | ForEach-Object { - $defaultPostfix = ( $_ -eq $ndkDefaultFullVersion ) ? " (default)" : "" - $_ + $defaultPostfix - } | Join-String -Separator "<br>") + return ($versions | Join-String -Separator "<br>") } function Get-IntelHaxmVersion { diff --git a/images/macos/templates/macOS-10.15.json b/images/macos/templates/macOS-10.15.json index 201bb31d3fd9..b876d53e95e6 100644 --- a/images/macos/templates/macOS-10.15.json +++ b/images/macos/templates/macOS-10.15.json @@ -186,7 +186,6 @@ "./provision/core/cocoapods.sh", "./provision/core/android-toolsets.sh", "./provision/core/xamarin.sh", - "./provision/core/xamarin-android-ndk.sh", "./provision/core/vsmac.sh", "./provision/core/nvm.sh", "./provision/core/apache.sh", diff --git a/images/macos/tests/Android.Tests.ps1 b/images/macos/tests/Android.Tests.ps1 index 8c9f97fab473..df1484e4c6f2 100644 --- a/images/macos/tests/Android.Tests.ps1 +++ b/images/macos/tests/Android.Tests.ps1 @@ -9,9 +9,7 @@ Describe "Android" { [int]$platformMinVersion = Get-ToolsetValue "android.platform_min_version" [version]$buildToolsMinVersion = Get-ToolsetValue "android.build_tools_min_version" [array]$ndkVersions = Get-ToolsetValue "android.ndk.versions" - [string]$ndkDefaultVersion = Get-ToolsetValue "android.ndk.default" $ndkFullVersions = $ndkVersions | ForEach-Object { Get-ChildItem "$env:ANDROID_HOME/ndk/${_}.*" -Name | Select-Object -Last 1} | ForEach-Object { "ndk/${_}" } - $ndkDefaultFullVersion = Get-ChildItem "$env:ANDROID_HOME/ndk/$ndkDefaultVersion.*" -Name | Select-Object -Last 1 # Platforms starting with a letter are the preview versions, which is not installed on the image $platformVersionsList = ($androidSdkManagerPackages | Where-Object { "$_".StartsWith("platforms;") }) -replace 'platforms;android-', '' | Where-Object { $_ -match "^\d+$" } | Sort-Object -Unique $platformsInstalled = $platformVersionsList | Where-Object { [int]$_ -ge $platformMinVersion } | ForEach-Object { "platforms/android-${_}" } @@ -23,8 +21,6 @@ Describe "Android" { $androidPackages = @( "tools", "platform-tools", - "tools/proguard", - "ndk-bundle", "cmake", $platformsInstalled, $buildTools, @@ -73,18 +69,11 @@ Describe "Android" { Context "Packages" { $testCases = $androidPackages | ForEach-Object { @{ PackageName = $_ } } - $defaultNdkTestCase = @{ NdkDefaultFullVersion = $ndkDefaultFullVersion } It "<PackageName>" -TestCases $testCases { param ([string] $PackageName) Validate-AndroidPackage $PackageName } - - It "ndk-bundle points to the default NDK version" -TestCases $defaultNdkTestCase { - $ndkLinkTarget = (Get-Item $env:ANDROID_NDK_HOME).Target - $ndkVersion = Split-Path -Path $ndkLinkTarget -Leaf - $ndkVersion | Should -BeExactly $NdkDefaultFullVersion - } } It "HAXM is installed" -Skip:($os.IsHigherThanCatalina) { diff --git a/images/macos/tests/XamarinNDK.Tests.ps1 b/images/macos/tests/XamarinNDK.Tests.ps1 deleted file mode 100644 index 05e87af52a57..000000000000 --- a/images/macos/tests/XamarinNDK.Tests.ps1 +++ /dev/null @@ -1,32 +0,0 @@ - -Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" -Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1" -DisableNameChecking -Import-Module "$PSScriptRoot/../software-report/SoftwareReport.Android.psm1" -DisableNameChecking - -$os = Get-OSVersion - -Describe "Xamarin NDK" { - BeforeAll { - $androidNdkToolchains = @("mips64el-linux-android-4.9", "mipsel-linux-android-4.9") - $ANDROID_SDK_DIR = Join-Path $env:HOME "Library" "Android" "sdk" - } - - Context "Xamarin NDK toolchains" -Skip:($os.IsHigherThanCatalina) { - $testCases = $androidNdkToolchains | ForEach-Object { @{AndroidNdkToolchain = $_} } - - It "<AndroidNdkToolchain>" -TestCases $testCases { - param ([string] $AndroidNdkToolchain) - - $toolchainPath = Join-Path $ANDROID_SDK_DIR "ndk-bundle" "toolchains" $AndroidNdkToolchain - $toolchainPath | Should -Exist - } - } - - Context "Xamarin Legacy NDK versions" -Skip:($os.IsHigherThanCatalina) { - It "Android NDK version r18b is installed" { - $ndk18BundlePath = Join-Path $ANDROID_SDK_DIR "ndk" "18.1.5063045" "source.properties" - $rawContent = Get-Content $ndk18BundlePath -Raw - $rawContent | Should -BeLikeExactly "*Revision = 18.*" - } - } -} \ No newline at end of file diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index 05874c59a594..51a1ff9802f4 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -179,7 +179,6 @@ "cmake;3.18.1" ], "ndk": { - "default": "23", "versions": [ "21", "23", "24" ] diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index 1306b902b5c5..1bd55f84d797 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -177,7 +177,6 @@ "cmake;3.18.1" ], "ndk": { - "default": "23", "versions": [ "21", "23", "24" ] diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index f8357ce22267..381291df29ae 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -112,7 +112,6 @@ "cmake;3.18.1" ], "ndk": { - "default": "23", "versions": [ "21", "23", "24" ] From a41909d0c56d1cff5b57fca2ee210e77de04e369 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Thu, 21 Jul 2022 11:33:38 +0400 Subject: [PATCH 1329/3485] [Windows] Remove ndk-bundle (#5927) * Remove ndk-bundle from windows * Remove NDK-related variables --- .../scripts/Installers/Install-AndroidSDK.ps1 | 23 +++---------------- .../SoftwareReport.Android.psm1 | 13 +++-------- images/win/scripts/Tests/Android.Tests.ps1 | 6 ----- images/win/toolsets/toolset-2019.json | 1 - images/win/toolsets/toolset-2022.json | 1 - 5 files changed, 6 insertions(+), 38 deletions(-) diff --git a/images/win/scripts/Installers/Install-AndroidSDK.ps1 b/images/win/scripts/Installers/Install-AndroidSDK.ps1 index 7ec7812de633..0401f4768d47 100644 --- a/images/win/scripts/Installers/Install-AndroidSDK.ps1 +++ b/images/win/scripts/Installers/Install-AndroidSDK.ps1 @@ -109,7 +109,6 @@ Install-AndroidSDKPackages -AndroidSDKManagerPath $sdkManager ` # NDKs $ndkMajorVersions = $androidToolset.ndk.versions -$ndkDefaultMajorVersion = $androidToolset.ndk.default $ndkLatestMajorVersion = $ndkMajorVersions | Select-Object -Last 1 $androidNDKs = $ndkMajorVersions | Foreach-Object { @@ -120,27 +119,11 @@ Install-AndroidSDKPackages -AndroidSDKManagerPath $sdkManager ` -AndroidSDKRootPath $sdkRoot ` -AndroidPackages $androidNDKs -$ndkDefaultVersion = ($androidNDKs | Where-Object { $_ -match "ndk;$ndkDefaultMajorVersion" }).Split(';')[1] $ndkLatestVersion = ($androidNDKs | Where-Object { $_ -match "ndk;$ndkLatestMajorVersion" }).Split(';')[1] -# Android NDK root path. -$ndkRoot = "$sdkRoot\ndk-bundle" -# This changes were added due to incompatibility with android ndk-bundle (ndk;22.0.7026061). -# Link issue virtual-environments: https://github.com/actions/virtual-environments/issues/2481 -# Link issue xamarin-android: https://github.com/xamarin/xamarin-android/issues/5526 -New-Item -Path $ndkRoot -ItemType SymbolicLink -Value "$sdkRoot\ndk\$ndkDefaultVersion" - -if (Test-Path $ndkRoot) { - setx ANDROID_HOME $sdkRoot /M - setx ANDROID_SDK_ROOT $sdkRoot /M - setx ANDROID_NDK_HOME $ndkRoot /M - setx ANDROID_NDK_PATH $ndkRoot /M - setx ANDROID_NDK_ROOT $ndkRoot /M - (Get-Content -Encoding UTF8 "${ndkRoot}\ndk-build.cmd").replace('%~dp0\build\ndk-build.cmd','"%~dp0\build\ndk-build.cmd"')|Set-Content -Encoding UTF8 "${ndkRoot}\ndk-build.cmd" -} else { - Write-Host "Default NDK $ndkDefaultVersion is not installed at path $ndkRoot" - exit 1 -} +# Create env variables +setx ANDROID_HOME $sdkRoot /M +setx ANDROID_SDK_ROOT $sdkRoot /M $ndkLatestPath = "$sdkRoot\ndk\$ndkLatestVersion" if (Test-Path $ndkLatestPath) { diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Android.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Android.psm1 index 9a24791a4a0e..404929c464af 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Android.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Android.psm1 @@ -164,23 +164,16 @@ function Get-AndroidNdkVersions { [object] $PackageInfo ) - $ndkLinkTarget = (Get-Item $env:ANDROID_NDK_HOME).Target - $ndkDefaultFullVersion = Split-Path -Path $ndkLinkTarget -Leaf - $versions = $packageInfo | Where-Object { $_ -Match "ndk;" } | ForEach-Object { - $version = (Split-TableRowByColumns $_)[1] - if ($version -eq $ndkDefaultFullVersion) { - $version += " (default)" - } - $version + (Split-TableRowByColumns $_)[1] } return ($versions -Join "<br>") } function Build-AndroidEnvironmentTable { - $androidVersions = Get-Item env:ANDROID_* + $androidVersions = Get-Item env:ANDROID_* - $shoulddResolveLink = 'ANDROID_NDK_PATH', 'ANDROID_NDK_HOME', 'ANDROID_NDK_ROOT', 'ANDROID_NDK_LATEST_HOME' + $shoulddResolveLink = 'ANDROID_NDK_LATEST_HOME' return $androidVersions | Sort-Object -Property Name | ForEach-Object { [PSCustomObject] @{ "Name" = $_.Name diff --git a/images/win/scripts/Tests/Android.Tests.ps1 b/images/win/scripts/Tests/Android.Tests.ps1 index 89f08d59e03e..b05668ce5951 100644 --- a/images/win/scripts/Tests/Android.Tests.ps1 +++ b/images/win/scripts/Tests/Android.Tests.ps1 @@ -96,11 +96,5 @@ Describe "Android SDK" { It "NDK <ndkPackage> is installed" -TestCases $ndkPackagesTestCases { "$installedPackages" | Should -Match "ndk;$ndkPackage" } - - It "ndk-bundle points to the default NDK version" -TestCases @{ ndkDefaultVersion = $ndkDefaultFullVersion } { - $ndkLinkTarget = (Get-Item $env:ANDROID_NDK_HOME).Target - $ndkVersion = Split-Path -Path $ndkLinkTarget -Leaf - $ndkVersion | Should -BeExactly $ndkDefaultVersion - } } } diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index 2581f69b95d6..652f5984e36c 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -183,7 +183,6 @@ "patcher;v4" ], "ndk": { - "default": "23", "versions": [ "21", "23", "24" ] diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index c5e745898e7a..a8e1a773f91e 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -153,7 +153,6 @@ "patcher;v4" ], "ndk": { - "default": "23", "versions": [ "21", "23", "24" ] From 150bd6d9225011447329db5f8e4aa13e485f509b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 21 Jul 2022 14:56:25 +0000 Subject: [PATCH 1330/3485] Updating readme file for macOS-12 version 20220717.1 (#5924) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-12-Readme.md | 48 ++++++++++++++++----------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/images/macos/macos-12-Readme.md b/images/macos/macos-12-Readme.md index 78be57d719f0..1d3820e92a27 100644 --- a/images/macos/macos-12-Readme.md +++ b/images/macos/macos-12-Readme.md @@ -1,23 +1,23 @@ | Announcements | |-| | [[all OSs] Android ndk-bundle along with old NDK versions will be deprecated on July, 24](https://github.com/actions/virtual-environments/issues/5879) | -| [[macOS] Default Xcode on Monterey image will be set to Xcode 13.4.1 on July, 11](https://github.com/actions/virtual-environments/issues/5836) | | [[Windows, macOS] LLVM will be updated to version 14 on July, 11](https://github.com/actions/virtual-environments/issues/5835) | +| [The macOS 10.15 Actions runner image will begin deprecation on 5/31/22 and will be fully unsupported by 8/30/22 in GitHub and by 9/30/22 in ADO](https://github.com/actions/virtual-environments/issues/5583) | *** # macOS 12.4 info - System Version: macOS 12.4 (21F79) - Kernel Version: Darwin 21.5.0 -- Image Version: 20220710.1 +- Image Version: 20220717.1 ## Installed Software ### Language and Runtime -- .NET SDK 3.1.101 3.1.201 3.1.302 3.1.420 5.0.102 5.0.202 5.0.302 5.0.408 +- .NET SDK 3.1.101 3.1.201 3.1.302 3.1.421 5.0.102 5.0.202 5.0.302 5.0.408 6.0.302 - Bash 3.2.57(1)-release - Clang/LLVM 13.1.6 is default - Clang/LLVM 14.0.6 is available on `'$(brew --prefix llvm@14)/bin/clang'` - gcc-11 (Homebrew GCC 11.3.0_2) 11.3.0 - available by `gcc-11` alias - GNU Fortran (Homebrew GCC 11.3.0_2) 11.3.0 - available by `gfortran-11` alias -- Go 1.17.11 +- Go 1.17.12 - julia 1.7.3 - Kotlin 1.7.10-release-333 - MSBuild 16.10.1.31401 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) @@ -32,10 +32,10 @@ - Ruby 3.0.4p208 ### Package Management -- Bundler version 2.3.17 +- Bundler version 2.3.18 - Carthage 0.38.0 - CocoaPods 1.11.3 -- Composer 2.3.9 +- Composer 2.3.10 - Homebrew 3.5.4 - Miniconda 4.12.0 - NPM 8.11.0 @@ -43,8 +43,8 @@ - Pip 20.3.4 (python 2.7) - Pip 22.1.1 (python 3.9) - Pipx 1.1.0 -- RubyGems 3.2.33 -- Vcpkg 2022 (build from master \<98f8d00e8>) +- RubyGems 3.3.18 +- Vcpkg 2022 (build from master \<de176433e>) - Yarn 1.22.19 #### Environment variables @@ -56,8 +56,8 @@ ### Project Management - Apache Ant(TM) 1.10.12 - Apache Maven 3.8.6 -- Gradle 7.4.2 -- Sbt 1.6.2 +- Gradle 7.5 +- Sbt 1.7.1 ### Utilities - 7-Zip 17.04 @@ -67,12 +67,12 @@ - bazelisk 1.12.0 - bsdtar 3.5.1 - available by 'tar' alias - Curl 7.84.0 -- Git 2.37.0 +- Git 2.37.1 - Git LFS: 3.2.0 -- GitHub CLI: 2.13.0 +- GitHub CLI: 2.14.2 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.3 -- gpg (GnuPG) 2.3.6 +- gpg (GnuPG) 2.3.7 - Hub CLI: 2.14.2 - ImageMagick 7.1.0-43 - jq 1.6 @@ -87,12 +87,12 @@ - Switchaudio-osx 1.1.0 - Vagrant 2.2.19 - VirtualBox 6.1.34r150636 -- yq (https://github.com/mikefarah/yq/) version 4.25.3 +- yq (https://github.com/mikefarah/yq/) version 4.26.1 - zstd 1.5.2 ### Tools - App Center CLI 2.10.10 -- AWS CLI 2.7.14 +- AWS CLI 2.7.16 - AWS SAM CLI 1.53.0 - AWS Session Manager CLI 1.2.339.0 - Azure CLI (azure-devops) 0.25.0 @@ -105,7 +105,7 @@ - GHCup 0.1.17.8 - Jazzy 0.14.2 - Stack 2.7.5 -- SwiftFormat 0.49.11 +- SwiftFormat 0.49.13 - Swig 4.0.2 - Xcode Command Line Tools 13.4.0.0.1.1651278267 @@ -118,8 +118,8 @@ - SafariDriver 15.5 (17613.2.7.1.8) - Google Chrome 103.0.5060.114 - ChromeDriver 103.0.5060.53 -- Microsoft Edge 103.0.1264.51 -- Microsoft Edge WebDriver 103.0.1264.51 +- Microsoft Edge 103.0.1264.62 +- Microsoft Edge WebDriver 103.0.1264.62 - Mozilla Firefox 102.0.1 - geckodriver 0.31.0 - Selenium server 4.3.0 @@ -170,14 +170,14 @@ | Version | Architecture | Environment Variable | | ------- | ------------ | -------------------- | | 1.16.15 | x64 | GOROOT_1_16_X64 | -| 1.17.11 (Default) | x64 | GOROOT_1_17_X64 | -| 1.18.3 | x64 | GOROOT_1_18_X64 | +| 1.17.12 (Default) | x64 | GOROOT_1_17_X64 | +| 1.18.4 | x64 | GOROOT_1_18_X64 | ### Rust Tools - Cargo 1.62.0 - Rust 1.62.0 - Rustdoc 1.62.0 -- Rustup 1.24.3 +- Rustup 1.25.1 #### Packages - Bindgen 0.60.1 @@ -209,7 +209,7 @@ | Version | Build | Path | | -------------- | --------- | ------------------------------------ | | 2019 | 8.10.25.2 | /Applications/Visual Studio 2019.app | -| 2022 (default) | 17.0.5.6 | /Applications/Visual Studio.app | +| 2022 (default) | 17.0.6.4 | /Applications/Visual Studio.app | ##### Notes: ``` @@ -244,7 +244,7 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" #### Xcode Support Tools - xcpretty 0.3.0 -- xcversion 2.8.0 +- xcversion 2.8.1 #### Installed SDKs | SDK | SDK Name | Xcode Version | @@ -296,7 +296,7 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" | Android Command Line Tools | 7.0 | | Android Emulator | 31.2.10 | | Android SDK Build-tools | 33.0.0<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | -| Android SDK Platforms | android-33 (rev 1)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | +| Android SDK Platforms | android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | | Android SDK Platform-Tools | 33.0.2 | | Android Support Repository | 47.0.0 | | CMake | 3.18.1 | From 5be8ca11a1aa143df650d94228d045813dc7dc54 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Thu, 21 Jul 2022 17:16:29 +0200 Subject: [PATCH 1331/3485] [Windows] Add MSVC++ 14.32 (#5939) * Add MSVC++ 14.32 * Remove duplicates and add ARM components * Add ATL and MFC ARM components * Remove ARM64EC --- images/win/toolsets/toolset-2022.json | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index a8e1a773f91e..90f49b51682c 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -241,6 +241,24 @@ "Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.Spectre", "Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC", "Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.Spectre", + "Microsoft.VisualStudio.Component.VC.14.32.17.2.ARM", + "Microsoft.VisualStudio.Component.VC.14.32.17.2.ARM.Spectre", + "Microsoft.VisualStudio.Component.VC.14.32.17.2.ARM64", + "Microsoft.VisualStudio.Component.VC.14.32.17.2.ARM64.Spectre", + "Microsoft.VisualStudio.Component.VC.14.32.17.2.x86.x64", + "Microsoft.VisualStudio.Component.VC.14.32.17.2.x86.x64.Spectre", + "Microsoft.VisualStudio.Component.VC.14.32.17.2.ATL", + "Microsoft.VisualStudio.Component.VC.14.32.17.2.ATL.Spectre", + "Microsoft.VisualStudio.Component.VC.14.32.17.2.ATL.ARM", + "Microsoft.VisualStudio.Component.VC.14.32.17.2.ATL.ARM.Spectre", + "Microsoft.VisualStudio.Component.VC.14.32.17.2.ATL.ARM64", + "Microsoft.VisualStudio.Component.VC.14.32.17.2.ATL.ARM64.Spectre", + "Microsoft.VisualStudio.Component.VC.14.32.17.2.MFC", + "Microsoft.VisualStudio.Component.VC.14.32.17.2.MFC.Spectre", + "Microsoft.VisualStudio.Component.VC.14.32.17.2.MFC.ARM", + "Microsoft.VisualStudio.Component.VC.14.32.17.2.MFC.ARM.Spectre", + "Microsoft.VisualStudio.Component.VC.14.32.17.2.MFC.ARM64", + "Microsoft.VisualStudio.Component.VC.14.32.17.2.MFC.ARM64.Spectre", "Microsoft.VisualStudio.Component.VC.ATLMFC", "Microsoft.VisualStudio.Component.VC.ATLMFC.Spectre", "Microsoft.VisualStudio.Component.Windows10SDK.19041", From a26e4247870fb93727fdfba655a33cd01c3a3c08 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Thu, 21 Jul 2022 21:11:00 +0400 Subject: [PATCH 1332/3485] Add dotfuscator component to VS2022 (#5944) --- images/win/toolsets/toolset-2022.json | 1 + 1 file changed, 1 insertion(+) diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index 90f49b51682c..b5a839a50811 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -179,6 +179,7 @@ "edition" : "Enterprise", "channel": "release", "workloads": [ + "Component.Dotfuscator", "Component.Linux.CMake", "Component.UnityEngine.x64", "Component.Unreal.Android", From 4f552247b10683b2151c18e9866dd6c4b593fc8e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 21 Jul 2022 18:21:18 +0000 Subject: [PATCH 1333/3485] Updating readme file for macOS-11 version 20220719.1 (#5940) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-11-Readme.md | 63 +++++++++++++++++---------------- 1 file changed, 32 insertions(+), 31 deletions(-) diff --git a/images/macos/macos-11-Readme.md b/images/macos/macos-11-Readme.md index eef5b1bb4e58..245bfd93ba9d 100644 --- a/images/macos/macos-11-Readme.md +++ b/images/macos/macos-11-Readme.md @@ -1,17 +1,18 @@ | Announcements | |-| +| [[all OSs] Android NDK 21 will be replaced in favor of 25 on August, 1st](https://github.com/actions/virtual-environments/issues/5930) | | [[all OSs] Android ndk-bundle along with old NDK versions will be deprecated on July, 24](https://github.com/actions/virtual-environments/issues/5879) | -| [[macOS] Default Xcode on Monterey image will be set to Xcode 13.4.1 on July, 11](https://github.com/actions/virtual-environments/issues/5836) | | [[Windows, macOS] LLVM will be updated to version 14 on July, 11](https://github.com/actions/virtual-environments/issues/5835) | +| [The macOS 10.15 Actions runner image will begin deprecation on 5/31/22 and will be fully unsupported by 8/30/22 in GitHub and by 9/30/22 in ADO](https://github.com/actions/virtual-environments/issues/5583) | *** # macOS 11.6 info - System Version: macOS 11.6.7 (20G630) - Kernel Version: Darwin 20.6.0 -- Image Version: 20220710.1 +- Image Version: 20220719.1 ## Installed Software ### Language and Runtime -- .NET SDK 3.1.101 3.1.201 3.1.302 3.1.420 5.0.102 5.0.202 5.0.302 5.0.408 +- .NET SDK 3.1.101 3.1.201 3.1.302 3.1.421 5.0.102 5.0.202 5.0.302 5.0.408 6.0.302 - Bash 3.2.57(1)-release - Clang/LLVM 13.0.0 is default - Clang/LLVM 14.0.6 is available on `'$(brew --prefix llvm@14)/bin/clang'` @@ -21,7 +22,7 @@ - GNU Fortran (Homebrew GCC 9.5.0) 9.5.0 - available by `gfortran-9` alias - GNU Fortran (Homebrew GCC 10.4.0) 10.4.0 - available by `gfortran-10` alias - GNU Fortran (Homebrew GCC 11.3.0_2) 11.3.0 - available by `gfortran-11` alias -- Go 1.17.11 +- Go 1.17.12 - julia 1.7.3 - Kotlin 1.7.10-release-333 - MSBuild 16.10.1.31401 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) @@ -36,19 +37,19 @@ - Ruby 2.7.6p219 ### Package Management -- Bundler version 2.3.17 +- Bundler version 2.3.18 - Carthage 0.38.0 - CocoaPods 1.11.3 -- Composer 2.3.9 -- Homebrew 3.5.4 +- Composer 2.3.10 +- Homebrew 3.5.5 - Miniconda 4.12.0 - NPM 8.11.0 - NuGet 6.2.1.2 - Pip 20.3.4 (python 2.7) - Pip 22.1.1 (python 3.9) - Pipx 1.1.0 -- RubyGems 3.2.33 -- Vcpkg 2022 (build from master \<98f8d00e8>) +- RubyGems 3.3.18 +- Vcpkg 2022 (build from master \<8ff168270>) - Yarn 1.22.19 #### Environment variables @@ -60,8 +61,8 @@ ### Project Management - Apache Ant(TM) 1.10.12 - Apache Maven 3.8.6 -- Gradle 7.4.2 -- Sbt 1.6.2 +- Gradle 7.5 +- Sbt 1.7.1 ### Utilities - 7-Zip 17.04 @@ -71,13 +72,13 @@ - bazelisk 1.12.0 - bsdtar 3.3.2 - available by 'tar' alias - Curl 7.84.0 -- Git 2.37.0 +- Git 2.37.1 - Git LFS: 3.2.0 -- GitHub CLI: 2.13.0 +- GitHub CLI: 2.14.2 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.3 -- gpg (GnuPG) 2.3.6 -- helm v3.9.0+g7ceeda6 +- gpg (GnuPG) 2.3.7 +- helm v3.9.1+ga7c043a - Hub CLI: 2.14.2 - ImageMagick 7.1.0-43 - jq 1.6 @@ -91,13 +92,13 @@ - Sox 14.4.2 - Subversion (SVN) 1.14.2 - Switchaudio-osx 1.1.0 -- yq (https://github.com/mikefarah/yq/) version 4.25.3 +- yq (https://github.com/mikefarah/yq/) version 4.26.1 - zstd 1.5.2 ### Tools - Aliyun CLI 3.0.123 - App Center CLI 2.10.10 -- AWS CLI 2.7.14 +- AWS CLI 2.7.16 - AWS SAM CLI 1.53.0 - AWS Session Manager CLI 1.2.339.0 - Azure CLI (azure-devops) 0.25.0 @@ -105,12 +106,12 @@ - Bicep CLI 0.8.9 - Cabal 3.6.2.0 - Cmake 3.23.2 -- Fastlane 2.207.0 +- Fastlane 2.208.0 - GHC 9.2.3 - GHCup 0.1.17.8 - Jazzy 0.14.2 - Stack 2.7.5 -- SwiftFormat 0.49.11 +- SwiftFormat 0.49.13 - Swig 4.0.2 - Xcode Command Line Tools 13.2.0.0.1.1638488800 @@ -121,10 +122,10 @@ ### Browsers - Safari 15.5 (16613.2.7.1.9) - SafariDriver 15.5 (16613.2.7.1.9) -- Google Chrome 103.0.5060.114 +- Google Chrome 103.0.5060.134 - ChromeDriver 103.0.5060.53 -- Microsoft Edge 103.0.1264.51 -- Microsoft Edge WebDriver 103.0.1264.51 +- Microsoft Edge 103.0.1264.62 +- Microsoft Edge WebDriver 103.0.1264.62 - Mozilla Firefox 102.0.1 - geckodriver 0.31.0 - Selenium server 4.3.0 @@ -178,14 +179,14 @@ | Version | Architecture | Environment Variable | | ------- | ------------ | -------------------- | | 1.16.15 | x64 | GOROOT_1_16_X64 | -| 1.17.11 (Default) | x64 | GOROOT_1_17_X64 | -| 1.18.3 | x64 | GOROOT_1_18_X64 | +| 1.17.12 (Default) | x64 | GOROOT_1_17_X64 | +| 1.18.4 | x64 | GOROOT_1_18_X64 | ### Rust Tools -- Cargo 1.62.0 -- Rust 1.62.0 -- Rustdoc 1.62.0 -- Rustup 1.24.3 +- Cargo 1.62.1 +- Rust 1.62.1 +- Rustdoc 1.62.1 +- Rustup 1.25.1 #### Packages - Bindgen 0.60.1 @@ -217,7 +218,7 @@ | Version | Build | Path | | -------------- | --------- | ------------------------------------ | | 2019 | 8.10.25.2 | /Applications/Visual Studio 2019.app | -| 2022 (default) | 17.0.5.6 | /Applications/Visual Studio.app | +| 2022 (default) | 17.0.6.4 | /Applications/Visual Studio.app | ##### Notes: ``` @@ -262,7 +263,7 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" #### Xcode Support Tools - xcpretty 0.3.0 -- xcversion 2.8.0 +- xcversion 2.8.1 - Nomad CLI 0.0.2 - Nomad shenzhen CLI 0.14.3 @@ -335,7 +336,7 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" | Android Command Line Tools | 7.0 | | Android Emulator | 31.2.10 | | Android SDK Build-tools | 33.0.0<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | -| Android SDK Platforms | android-33 (rev 1)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | +| Android SDK Platforms | android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | | Android SDK Platform-Tools | 33.0.2 | | Android Support Repository | 47.0.0 | | CMake | 3.10.2<br>3.18.1 | From 2226408acc8081532b828610adfbf88cbb924f2a Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Fri, 22 Jul 2022 11:53:00 +0200 Subject: [PATCH 1334/3485] Add azure_tag (#5946) Replace list to map Remove all values add space add space --- images/linux/ubuntu2204.pkr.hcl | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/images/linux/ubuntu2204.pkr.hcl b/images/linux/ubuntu2204.pkr.hcl index 776112ec0277..96f50fa278a3 100644 --- a/images/linux/ubuntu2204.pkr.hcl +++ b/images/linux/ubuntu2204.pkr.hcl @@ -4,6 +4,11 @@ variable "allowed_inbound_ip_addresses" { default = [] } +variable "azure_tag" { + type = map(string) + default = {} +} + variable "build_resource_group_name" { type = string default = "${env("BUILD_RESOURCE_GROUP_NAME")}" @@ -164,6 +169,14 @@ source "azure-arm" "build_vhd" { virtual_network_resource_group_name = "${var.virtual_network_resource_group_name}" virtual_network_subnet_name = "${var.virtual_network_subnet_name}" vm_size = "${var.vm_size}" + + dynamic "azure_tag" { + for_each = var.azure_tag + content { + name = azure_tag.key + value = azure_tag.value + } + } } build { From 79c921a4c1fbf5cb13390f2fc927e1ef40266e76 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 22 Jul 2022 19:41:34 +0000 Subject: [PATCH 1335/3485] Updating readme file for macOS-10.15 version 20220709.1 (#5889) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-10.15-Readme.md | 65 +++++++++++++++--------------- 1 file changed, 33 insertions(+), 32 deletions(-) diff --git a/images/macos/macos-10.15-Readme.md b/images/macos/macos-10.15-Readme.md index 0269b694ce37..8c01857eb39a 100644 --- a/images/macos/macos-10.15-Readme.md +++ b/images/macos/macos-10.15-Readme.md @@ -1,45 +1,46 @@ | Announcements | |-| +| [[all OSs] Android ndk-bundle along with old NDK versions will be deprecated on July, 24](https://github.com/actions/virtual-environments/issues/5879) | | [[macOS] Default Xcode on Monterey image will be set to Xcode 13.4.1 on July, 11](https://github.com/actions/virtual-environments/issues/5836) | | [[Windows, macOS] LLVM will be updated to version 14 on July, 11](https://github.com/actions/virtual-environments/issues/5835) | *** # macOS 10.15 info - System Version: macOS 10.15.7 (19H1922) - Kernel Version: Darwin 19.6.0 -- Image Version: 20220627.1 +- Image Version: 20220709.1 ## Installed Software ### Language and Runtime - .NET SDK 3.1.101 3.1.201 3.1.302 3.1.420 5.0.102 5.0.202 5.0.302 5.0.408 - Bash 3.2.57(1)-release -- Clang/LLVM 13.0.1 is available on `'$(brew --prefix llvm@13)/bin/clang'` - Clang/LLVM 12.0.0 is default +- Clang/LLVM 14.0.6 is available on `'$(brew --prefix llvm@14)/bin/clang'` - gcc-9 (Homebrew GCC 9.5.0) 9.5.0 - available by `gcc-9` alias -- gcc-10 (Homebrew GCC 10.3.0) 10.3.0 - available by `gcc-10` alias +- gcc-10 (Homebrew GCC 10.4.0) 10.4.0 - available by `gcc-10` alias - gcc-11 (Homebrew GCC 11.3.0_2) 11.3.0 - available by `gcc-11` alias - GNU Fortran (Homebrew GCC 9.5.0) 9.5.0 - available by `gfortran-9` alias -- GNU Fortran (Homebrew GCC 10.3.0) 10.3.0 - available by `gfortran-10` alias +- GNU Fortran (Homebrew GCC 10.4.0) 10.4.0 - available by `gfortran-10` alias - GNU Fortran (Homebrew GCC 11.3.0_2) 11.3.0 - available by `gfortran-11` alias - Go 1.17.11 - julia 1.7.3 -- Kotlin 1.7.0-release-281 +- Kotlin 1.7.10-release-333 - MSBuild 16.10.1.31401 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) -- Node.js v16.15.1 +- Node.js v16.16.0 - NVM 0.39.1 -- NVM - Cached node versions: v12.22.12 v14.19.3 v16.15.1 +- NVM - Cached node versions: v12.22.12 v14.20.0 v16.16.0 - Perl 5.34.0 -- PHP 8.1.7 +- PHP 8.1.8 - Python 2.7.18 - Python 3.9.13 - R 4.2.1 - Ruby 2.7.6p219 ### Package Management -- Bundler version 2.3.16 +- Bundler version 2.3.17 - Carthage 0.38.0 - CocoaPods 1.11.3 -- Composer 2.3.7 -- Homebrew 3.5.2 +- Composer 2.3.9 +- Homebrew 3.5.4 - Miniconda 4.12.0 - NPM 8.11.0 - NuGet 6.2.1.2 @@ -47,7 +48,7 @@ - Pip 22.1.1 (python 3.9) - Pipx 1.1.0 - RubyGems 3.2.33 -- Vcpkg 2022 (build from master \<feecd1fb4>) +- Vcpkg 2022 (build from master \<98f8d00e8>) - Yarn 1.22.19 #### Environment variables @@ -70,7 +71,7 @@ - bazelisk 1.12.0 - bsdtar 3.3.2 - available by 'tar' alias - Curl 7.84.0 -- Git 2.36.1 +- Git 2.37.0 - Git LFS: 3.2.0 - GitHub CLI: 2.13.0 - GNU parallel 20220622 @@ -79,12 +80,12 @@ - gpg (GnuPG) 2.3.6 - helm v3.9.0+g7ceeda6 - Hub CLI: 2.14.2 -- ImageMagick 7.1.0-39 +- ImageMagick 7.1.0-41 - jq 1.6 - mongo v5.0.7 - mongod v5.0.7 - Newman 5.3.2 -- OpenSSL 1.1.1p 21 Jun 2022 `(/usr/local/opt/openssl@1.1 -> ../Cellar/openssl@1.1/1.1.1p)` +- OpenSSL 1.1.1q 5 Jul 2022 `(/usr/local/opt/openssl@1.1 -> ../Cellar/openssl@1.1/1.1.1q)` - Packer 1.8.2 - PostgreSQL 14.4 - psql (PostgreSQL) 14.4 @@ -99,15 +100,15 @@ ### Tools - Aliyun CLI 3.0.123 - App Center CLI 2.10.10 -- AWS CLI 2.7.11 -- AWS SAM CLI 1.52.0 +- AWS CLI 2.7.14 +- AWS SAM CLI 1.53.0 - AWS Session Manager CLI 1.2.339.0 - Azure CLI (azure-devops) 0.25.0 -- Azure CLI 2.37.0 -- Bicep CLI 0.7.4 +- Azure CLI 2.38.0 +- Bicep CLI 0.8.9 - Cabal 3.6.2.0 - Cmake 3.23.2 -- Fastlane 2.206.2 +- Fastlane 2.207.0 - GHC 9.2.3 - GHCup 0.1.17.8 - Jazzy 0.14.2 @@ -118,16 +119,16 @@ ### Linters - SwiftLint 0.47.1 -- yamllint 1.26.3 +- yamllint 1.27.1 ### Browsers - Safari 15.5 (15613.2.7.1.9) - SafariDriver 15.5 (15613.2.7.1.9) -- Google Chrome 103.0.5060.53 +- Google Chrome 103.0.5060.114 - ChromeDriver 103.0.5060.53 -- Microsoft Edge 103.0.1264.37 -- Microsoft Edge WebDriver 103.0.1264.37 -- Mozilla Firefox 101.0.1 +- Microsoft Edge 103.0.1264.51 +- Microsoft Edge WebDriver 103.0.1264.51 +- Mozilla Firefox 102.0.1 - geckodriver 0.31.0 - Selenium server 4.3.0 @@ -178,8 +179,8 @@ #### Node.js - 12.22.12 -- 14.19.3 -- 16.15.1 +- 14.20.0 +- 16.16.0 #### Go | Version | Architecture | Environment Variable | @@ -189,9 +190,9 @@ | 1.18.3 | x64 | GOROOT_1_18_X64 | ### Rust Tools -- Cargo 1.61.0 -- Rust 1.61.0 -- Rustdoc 1.61.0 +- Cargo 1.62.0 +- Rust 1.62.0 +- Rustdoc 1.62.0 - Rustup 1.24.3 #### Packages @@ -199,7 +200,7 @@ - Cargo-audit 0.17.0 - Cargo-outdated 0.11.1 - Cbindgen 0.24.3 -- Clippy 0.1.61 +- Clippy 0.1.62 - Rustfmt 1.4.38-stable ### PowerShell Tools @@ -208,7 +209,7 @@ #### PowerShell Modules | Module | Version | | ---------------- | ------- | -| Az | 8.0.0 | +| Az | 8.1.0 | | MarkdownPS | 1.9 | | Pester | 5.3.3 | | PSScriptAnalyzer | 1.20.0 | From 4afedce20d3baf11ea96c2ae46d2ce29c4bc0003 Mon Sep 17 00:00:00 2001 From: Mariusz Ferdyn <MariuszFerdyn@users.noreply.github.com> Date: Mon, 25 Jul 2022 11:15:26 +0200 Subject: [PATCH 1336/3485] Added step for download & install git (#5955) --- docs/create-image-and-azure-resources.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/docs/create-image-and-azure-resources.md b/docs/create-image-and-azure-resources.md index 5815eb15a435..985b439f076b 100644 --- a/docs/create-image-and-azure-resources.md +++ b/docs/create-image-and-azure-resources.md @@ -27,11 +27,16 @@ Detailed instruction can be found in [Azure documentation](https://docs.microsof #### How to prepare Windows build agent Local machine or [Azure VM](https://docs.microsoft.com/en-us/azure/virtual-machines/windows/quick-create-cli) can be used as a build agent. -Download `packer` from https://www.packer.io/downloads, or install it via [Chocolatey](https://chocolatey.org/): +Download & install `packer` from https://www.packer.io/downloads, or install it via [Chocolatey](https://chocolatey.org/): ``` choco install packer ``` +Download & install `git` from https://github.com/git-for-windows/git/releases, or install it via [Chocolatey](https://chocolatey.org/): +``` +choco install git -params '"/GitAndUnixToolsOnPath"' +``` + Install the Azure Az PowerShell module - https://docs.microsoft.com/en-us/powershell/azure/install-az-ps. ``` Install-Module -Name Az -Repository PSGallery -Force From d746320dd3034c1d0482e8a9915db0f44974e055 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Mon, 25 Jul 2022 11:21:50 +0200 Subject: [PATCH 1337/3485] Fix libssl1.1 installation (#5956) --- images/linux/scripts/installers/sqlpackage.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/linux/scripts/installers/sqlpackage.sh b/images/linux/scripts/installers/sqlpackage.sh index 12a3ba80f332..d1f3572521af 100644 --- a/images/linux/scripts/installers/sqlpackage.sh +++ b/images/linux/scripts/installers/sqlpackage.sh @@ -10,8 +10,8 @@ source $HELPER_SCRIPTS/os.sh # Install libssl1.1 dependency if isUbuntu22; then - download_with_retries "http://security.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.1l-1ubuntu1.6_amd64.deb" "/tmp" - dpkg -i /tmp/libssl1.1_1.1.1l-1ubuntu1.6_amd64.deb + download_with_retries "http://security.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.1f-1ubuntu2.16_amd64.deb" "/tmp" + dpkg -i /tmp/libssl1.1_1.1.1f-1ubuntu2.16_amd64.deb fi # Install SqlPackage From 11cfd9eac020e50af89f0c68914c01f9db14bc01 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Mon, 25 Jul 2022 13:26:39 +0400 Subject: [PATCH 1338/3485] Add mono package to ubuntu 22 (#5950) --- .../scripts/SoftwareReport/SoftwareReport.Common.psm1 | 5 +++++ .../scripts/SoftwareReport/SoftwareReport.Generator.ps1 | 5 +++-- images/linux/scripts/installers/mono.sh | 7 +++++++ images/linux/scripts/tests/Tools.Tests.ps1 | 2 +- images/linux/ubuntu2204.pkr.hcl | 1 + 5 files changed, 17 insertions(+), 3 deletions(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 index 2a8c4bed1fd8..17ecd1933730 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 @@ -88,6 +88,11 @@ function Get-MsbuildVersion { return "MSBuild $msbuildVersion (from $msbuildPath)" } +function Get-NuGetVersion { + $nugetVersion = nuget help | Select-Object -First 1 | Take-OutputPart -Part 2 + return "NuGet $nugetVersion" +} + function Get-NodeVersion { $nodeVersion = $(node --version).Substring(1) return "Node $nodeVersion" diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index 9442353271a0..f2f28588fc38 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -42,6 +42,8 @@ $runtimesList = @( (Get-DashVersion), (Get-CPPVersions), (Get-FortranVersions), + (Get-MsbuildVersion), + (Get-MonoVersion), (Get-NodeVersion), (Get-PerlVersion), (Get-PythonVersion), @@ -56,8 +58,6 @@ $runtimesList = @( if ((Test-IsUbuntu18) -or (Test-IsUbuntu20)) { $runtimesList += @( - (Get-MsbuildVersion), - (Get-MonoVersion), (Get-ErlangVersion), (Get-ErlangRebar3Version), (Get-SwiftVersion) @@ -73,6 +73,7 @@ $packageManagementList = @( (Get-CpanVersion), (Get-GemVersion), (Get-MinicondaVersion), + (Get-NuGetVersion), (Get-HelmVersion), (Get-NpmVersion), (Get-YarnVersion), diff --git a/images/linux/scripts/installers/mono.sh b/images/linux/scripts/installers/mono.sh index 120f7ca4c9c8..6a54dc564731 100644 --- a/images/linux/scripts/installers/mono.sh +++ b/images/linux/scripts/installers/mono.sh @@ -4,8 +4,15 @@ ## Desc: Installs Mono ################################################################################ +source $HELPER_SCRIPTS/os.sh + LSB_CODENAME=$(lsb_release -cs) +# There are no packages for Ubuntu 22 in the repo, but developers confirmed that packages from Ubuntu 20 should work +if isUbuntu22; then + LSB_CODENAME="focal" +fi + # Test to see if the software in question is already installed, if not install it # wget "http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF" -O out && sudo apt-key add out && rm out diff --git a/images/linux/scripts/tests/Tools.Tests.ps1 b/images/linux/scripts/tests/Tools.Tests.ps1 index a155221e6f6a..13c8d95f9aee 100644 --- a/images/linux/scripts/tests/Tools.Tests.ps1 +++ b/images/linux/scripts/tests/Tools.Tests.ps1 @@ -168,7 +168,7 @@ Describe "gfortran" { } } -Describe "Mono" -Skip:(Test-IsUbuntu22) { +Describe "Mono" { It "mono" { "mono --version" | Should -ReturnZeroExitCode } diff --git a/images/linux/ubuntu2204.pkr.hcl b/images/linux/ubuntu2204.pkr.hcl index 96f50fa278a3..f48257ca579b 100644 --- a/images/linux/ubuntu2204.pkr.hcl +++ b/images/linux/ubuntu2204.pkr.hcl @@ -300,6 +300,7 @@ build { "${path.root}/scripts/installers/oc.sh", "${path.root}/scripts/installers/leiningen.sh", "${path.root}/scripts/installers/miniconda.sh", + "${path.root}/scripts/installers/mono.sh", "${path.root}/scripts/installers/kotlin.sh", "${path.root}/scripts/installers/mysql.sh", "${path.root}/scripts/installers/sqlpackage.sh", From cbcc50c80d8d6440f09aea3bf34aee1776f855b0 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Tue, 26 Jul 2022 09:09:24 +0200 Subject: [PATCH 1339/3485] Bypass Windows Defender false alarm (#5969) --- .../Installers/Configure-Antivirus.ps1 | 47 +++++++++++-------- 1 file changed, 28 insertions(+), 19 deletions(-) diff --git a/images/win/scripts/Installers/Configure-Antivirus.ps1 b/images/win/scripts/Installers/Configure-Antivirus.ps1 index cca4a09b84e9..34c78cef7b36 100644 --- a/images/win/scripts/Installers/Configure-Antivirus.ps1 +++ b/images/win/scripts/Installers/Configure-Antivirus.ps1 @@ -1,25 +1,34 @@ Write-Host "Disable Windows Defender..." -Set-MpPreference -DisableArchiveScanning $true -Set-MpPreference -DisableAutoExclusions $true -Set-MpPreference -DisableBehaviorMonitoring $true -Set-MpPreference -DisableBlockAtFirstSeen $true -Set-MpPreference -DisableCatchupFullScan $true -Set-MpPreference -DisableCatchupQuickScan $true -Set-MpPreference -DisableIntrusionPreventionSystem $true -Set-MpPreference -DisableIOAVProtection $true -Set-MpPreference -DisablePrivacyMode $true -Set-MpPreference -DisableScanningNetworkFiles $true -Set-MpPreference -DisableScriptScanning $true -Set-MpPreference -MAPSReporting 0 -Set-MpPreference -PUAProtection 0 -Set-MpPreference -SignatureDisableUpdateOnStartupWithoutEngine $true -Set-MpPreference -SubmitSamplesConsent 2 -Set-MpPreference -ScanAvgCPULoadFactor 5 -ExclusionPath "D:\", "C:\" -Set-MpPreference -DisableRealtimeMonitoring $true +$avPreference = @( + @{DisableArchiveScanning = $true} + @{DisableAutoExclusions = $true} + @{DisableBehaviorMonitoring = $true} + @{DisableBlockAtFirstSeen = $true} + @{DisableCatchupFullScan = $true} + @{DisableCatchupQuickScan = $true} + @{DisableIntrusionPreventionSystem = $true} + @{DisableIOAVProtection = $true} + @{DisablePrivacyMode = $true} + @{DisableScanningNetworkFiles = $true} + @{DisableScriptScanning = $true} + @{MAPSReporting = 0} + @{PUAProtection = 0} + @{SignatureDisableUpdateOnStartupWithoutEngine = $true} + @{SubmitSamplesConsent = 2} + @{ScanAvgCPULoadFactor = 5; ExclusionPath = @("D:\", "C:\")} + @{DisableRealtimeMonitoring = $true} +) if (-not (Test-IsWin16)) { - Set-MpPreference -EnableControlledFolderAccess Disable - Set-MpPreference -EnableNetworkProtection Disabled + $avPreference += @( + @{EnableControlledFolderAccess = "Disable"} + @{EnableNetworkProtection = "Disabled"} + ) +} + +$avPreference | Foreach-Object { + $avParams = $_ + Set-MpPreference @avParams } Write-Host "Disable Windows Defender scheduled tasks" From 22245583b471a42ef000d3caec9d8d01b2146b0e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 26 Jul 2022 09:27:52 +0000 Subject: [PATCH 1340/3485] Updating readme file for win19 version 20220724.1 (#5958) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2019-Readme.md | 58 +++++++++++++++----------------- 1 file changed, 28 insertions(+), 30 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index b22c3c334f21..d087860a13d5 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -1,12 +1,13 @@ | Announcements | |-| +| [[Windows] mongo service will be disabled by default on August, 8th](https://github.com/actions/virtual-environments/issues/5949) | +| [[all OSs] Android NDK 21 will be replaced in favor of 25 on August, 1st](https://github.com/actions/virtual-environments/issues/5930) | | [[all OSs] Android ndk-bundle along with old NDK versions will be deprecated on July, 24](https://github.com/actions/virtual-environments/issues/5879) | -| [[Windows, macOS] LLVM will be updated to version 14 on July, 11](https://github.com/actions/virtual-environments/issues/5835) | -| [[Azure DevOps] Windows-2016 environment removal postponed until July 22, 2022](https://github.com/actions/virtual-environments/issues/5403) | +| [[Azure DevOps] Windows-2016 environment removal postponed until July 31, 2022](https://github.com/actions/virtual-environments/issues/5403) | *** # Microsoft Windows Server 2019 Datacenter - OS Version: 10.0.17763 Build 3165 -- Image Version: 20220717.1 +- Image Version: 20220724.1 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -27,14 +28,14 @@ ### Package Management - Chocolatey 1.1.0 - Composer 2.3.10 -- Helm 3.9.0 +- Helm 3.9.1 - Miniconda 4.12.0 (pre-installed on the image but not added to PATH) - NPM 8.11.0 - NuGet 6.2.1.2 -- pip 22.1.2 (python 3.7) +- pip 22.2 (python 3.7) - Pipx 1.1.0 - RubyGems 2.7.6.3 -- Vcpkg (build from master \<68b7fec22>) +- Vcpkg (build from master \<f93ba152d>) - Yarn 1.22.19 #### Environment variables @@ -52,7 +53,7 @@ ### Tools - 7zip 22.01 - aria2 1.36.0 -- azcopy 10.15.0 +- azcopy 10.16.0 - Bazel 5.2.0 - Bazelisk 1.12.0 - Bicep 0.8.9 @@ -61,12 +62,12 @@ - CodeQL Action Bundle 2.10.0 - Docker 20.10.7 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.6.1 +- Docker Compose v2 2.7.0 - Docker-wincred 0.6.4 - ghc 9.2.3 - Git 2.37.1.windows.1 - Git LFS 3.2.0 -- Google Cloud SDK 393.0.0 +- Google Cloud SDK 394.0.0 - InnoSetup 6.2.1 - jq 1.6 - Kind 0.14.0 @@ -92,7 +93,7 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.124 -- AWS CLI 2.7.16 +- AWS CLI 2.7.18 - AWS SAM CLI 1.53.0 - AWS Session Manager CLI 1.2.339.0 - Azure CLI 2.38.0 @@ -102,9 +103,9 @@ - Hub CLI 2.14.2 ### Rust Tools -- Cargo 1.62.0 -- Rust 1.62.0 -- Rustdoc 1.62.0 +- Cargo 1.62.1 +- Rust 1.62.1 +- Rustdoc 1.62.1 - Rustup 1.25.1 #### Packages @@ -116,10 +117,10 @@ - Rustfmt 1.4.38 ### Browsers and webdrivers -- Google Chrome 103.0.5060.114 -- Chrome Driver 103.0.5060.53 -- Microsoft Edge 103.0.1264.62 -- Microsoft Edge Driver 103.0.1264.62 +- Google Chrome 103.0.5060.134 +- Chrome Driver 103.0.5060.134 +- Microsoft Edge 103.0.1264.71 +- Microsoft Edge Driver 103.0.1264.71 - Mozilla Firefox 102.0.1 - Gecko Driver 0.31.0 - IE Driver 3.150.1.1 @@ -137,9 +138,9 @@ | Version | Vendor | Environment Variable | | ------------------- | --------------- | -------------------- | | 8.0.332+9 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | -| 11.0.15+10 | Eclipse Temurin | JAVA_HOME_11_X64 | +| 11.0.16+8 | Eclipse Temurin | JAVA_HOME_11_X64 | | 13.0.2+8.1 | Adopt OpenJDK | JAVA_HOME_13_X64 | -| 17.0.3+7 | Eclipse Temurin | JAVA_HOME_17_X64 | +| 17.0.4+8 | Eclipse Temurin | JAVA_HOME_17_X64 | ### Shells | Name | Target | @@ -234,7 +235,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Name | Version | ConfigFile | ServiceName | ServiceStatus | ListenPort | | ------ | ------- | ------------------------------------- | ----------- | ------------- | ---------- | | Apache | 2.4.54 | C:\tools\Apache24\conf\httpd.conf | Apache | Stopped | 80 | -| Nginx | 1.23.0 | C:\tools\nginx-1.23.0\conf\nginx.conf | nginx | Stopped | 80 | +| Nginx | 1.23.1 | C:\tools\nginx-1.23.1\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2019 | Name | Version | Path | @@ -548,7 +549,7 @@ All other versions are saved but not installed. #### Powershell Modules | Module | Version | | ------------------ | ---------------- | -| AWSPowerShell | 4.1.127 | +| AWSPowerShell | 4.1.132 | | DockerMsftProvider | 1.0.0.8 | | MarkdownPS | 1.9 | | Microsoft.Graph | 1.10.0 | @@ -572,18 +573,15 @@ All other versions are saved but not installed. | Google APIs | addon-google_apis-google-21<br>addon-google_apis-google-22<br>addon-google_apis-google-23<br>addon-google_apis-google-24 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 21.4.7075529<br>23.2.8568313 (default)<br>24.0.8215888 | +| NDK | 21.4.7075529<br>23.2.8568313<br>24.0.8215888 | | SDK Patch Applier v4 | 1 | #### Environment variables -| Name | Value | -| ----------------------- | ---------------------------------------------------------------------------- | -| ANDROID_HOME | C:\Android\android-sdk | -| ANDROID_NDK_HOME | C:\Android\android-sdk\ndk-bundle -> C:\Android\android-sdk\ndk\23.2.8568313 | -| ANDROID_NDK_LATEST_HOME | C:\Android\android-sdk\ndk\24.0.8215888 | -| ANDROID_NDK_PATH | C:\Android\android-sdk\ndk-bundle -> C:\Android\android-sdk\ndk\23.2.8568313 | -| ANDROID_NDK_ROOT | C:\Android\android-sdk\ndk-bundle -> C:\Android\android-sdk\ndk\23.2.8568313 | -| ANDROID_SDK_ROOT | C:\Android\android-sdk | +| Name | Value | +| ----------------------- | --------------------------------------- | +| ANDROID_HOME | C:\Android\android-sdk | +| ANDROID_NDK_LATEST_HOME | C:\Android\android-sdk\ndk\24.0.8215888 | +| ANDROID_SDK_ROOT | C:\Android\android-sdk | ### Cached Docker images | Repository:Tag | Digest | Created | From 20aeea43aea6189ae878316f896216c259d96e7b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 26 Jul 2022 09:38:02 +0000 Subject: [PATCH 1341/3485] Updating readme file for ubuntu22 version 20220724.1 (#5961) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2204-Readme.md | 64 ++++++++++++++++--------------- 1 file changed, 33 insertions(+), 31 deletions(-) diff --git a/images/linux/Ubuntu2204-Readme.md b/images/linux/Ubuntu2204-Readme.md index 8bdef57f5874..9121ab584423 100644 --- a/images/linux/Ubuntu2204-Readme.md +++ b/images/linux/Ubuntu2204-Readme.md @@ -1,11 +1,12 @@ | Announcements | |-| +| [[all OSs] Android NDK 21 will be replaced in favor of 25 on August, 1st](https://github.com/actions/virtual-environments/issues/5930) | | [[all OSs] Android ndk-bundle along with old NDK versions will be deprecated on July, 24](https://github.com/actions/virtual-environments/issues/5879) | | [(Public Beta) Ubuntu 22.04 is now available](https://github.com/actions/virtual-environments/issues/5490) | *** # Ubuntu 22.04 LTS - Linux kernel version: 5.15.0-1014-azure -- Image Version: 20220717.1 +- Image Version: 20220724.1 ## Installed Software ### Language and Runtime @@ -18,6 +19,8 @@ - GNU Fortran 9.4.0, 10.3.0, 11.2.0 - Julia 1.7.3 - Kotlin 1.7.10-release-333 +- Mono 6.12.0.182 (apt source repository: https://download.mono-project.com/repo/ubuntu stable-focal main) +- MSBuild 16.10.1.31701 (from /usr/lib/mono/msbuild/15.0/bin/MSBuild.dll) - Node 16.16.0 - Perl 5.34.0 - Python 3.10.4 @@ -26,15 +29,16 @@ ### Package Management - cpan 1.64 -- Helm 3.9.1 -- Homebrew 3.5.4 +- Helm 3.9.2 +- Homebrew 3.5.6 - Miniconda 4.12.0 - Npm 8.11.0 +- NuGet 6.2.1.2 - Pip 22.0.2 - Pip3 22.0.2 - Pipx 1.1.0 - RubyGems 3.3.5 -- Vcpkg (build from master \<68b7fec22>) +- Vcpkg (build from master \<f93ba152d>) - Yarn 1.22.19 #### Environment variables @@ -44,12 +48,12 @@ | VCPKG_INSTALLATION_ROOT | /usr/local/share/vcpkg | ### Project Management -- Lerna 5.1.8 +- Lerna 5.2.0 ### Tools -- Ansible 2.13.1 +- Ansible 2.13.2 - apt-fast 1.9.12 -- AzCopy 10.15.0 (available by `azcopy` and `azcopy10` aliases) +- AzCopy 10.16.0 (available by `azcopy` and `azcopy10` aliases) - Bazel 5.2.0 - Bazelisk 1.12.0 - Bicep 0.8.9 @@ -62,7 +66,7 @@ - Docker-Buildx 0.8.2 - Docker-Moby Client 20.10.17+azure-1 - Docker-Moby Server 20.10.17+azure-1 -- Fastlane 2.207.0 +- Fastlane 2.208.0 - Git 2.37.1 (apt source repository: ppa:git-core/ppa) - Git LFS 3.2.0 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.6.0 @@ -95,7 +99,7 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.124 -- AWS CLI 2.7.16 +- AWS CLI 2.7.18 - AWS CLI Session manager plugin 1.2.339.0 - AWS SAM CLI 1.53.0 - Azure CLI (azure-cli) 2.38.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) @@ -103,10 +107,10 @@ - GitHub CLI 2.14.2 - Google Cloud SDK 369.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 10.10.0 -- OpenShift CLI 4.10.22 +- Netlify CLI 10.11.1 +- OpenShift CLI 4.10.24 - ORAS CLI 0.13.0 -- Vercel CLI 27.1.5 +- Vercel CLI 27.2.0 ### Java | Version | Vendor | Environment Variable | @@ -136,9 +140,9 @@ - Stack 2.7.5 ### Rust Tools -- Cargo 1.62.0 -- Rust 1.62.0 -- Rustdoc 1.62.0 +- Cargo 1.62.1 +- Rust 1.62.1 +- Rustdoc 1.62.1 - Rustup 1.25.1 #### Packages @@ -150,11 +154,11 @@ - Rustfmt 1.4.38 ### Browsers and Drivers -- Google Chrome 103.0.5060.114 -- ChromeDriver 103.0.5060.53 +- Google Chrome 103.0.5060.134 +- ChromeDriver 103.0.5060.134 - Chromium 103.0.5060.0 -- Microsoft Edge 103.0.1264.62 (apt source repository: https://packages.microsoft.com/repos/edge) -- Microsoft Edge WebDriver 103.0.1264.62 +- Microsoft Edge 103.0.1264.71 (apt source repository: https://packages.microsoft.com/repos/edge) +- Microsoft Edge WebDriver 103.0.1264.71 - Selenium server 4.3.0 #### Environment variables @@ -250,32 +254,30 @@ | CMake | 3.10.2<br>3.18.1 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 21.4.7075529<br>23.2.8568313 (default)<br>24.0.8215888 | +| NDK | 21.4.7075529<br>23.2.8568313<br>24.0.8215888 | | SDK Patch Applier v4 | 1 | #### Environment variables -| Name | Value | -| ----------------------- | ------------------------------------------------------------------------------------ | -| ANDROID_HOME | /usr/local/lib/android/sdk | -| ANDROID_NDK_HOME | /usr/local/lib/android/sdk/ndk-bundle -> /usr/local/lib/android/sdk/ndk/23.2.8568313 | -| ANDROID_NDK_LATEST_HOME | /usr/local/lib/android/sdk/ndk/24.0.8215888 | -| ANDROID_NDK_ROOT | /usr/local/lib/android/sdk/ndk-bundle -> /usr/local/lib/android/sdk/ndk/23.2.8568313 | -| ANDROID_SDK_ROOT | /usr/local/lib/android/sdk | +| Name | Value | +| ----------------------- | ------------------------------------------- | +| ANDROID_HOME | /usr/local/lib/android/sdk | +| ANDROID_NDK_LATEST_HOME | /usr/local/lib/android/sdk/ndk/24.0.8215888 | +| ANDROID_SDK_ROOT | /usr/local/lib/android/sdk | ### Cached Docker images | Repository:Tag | Digest | Created | | ----------------------- | ------------------------------------------------------------------------ | ---------- | -| alpine:3.14 | sha256:06b5d462c92fc39303e6363c65e074559f8d6b1363250027ed5053557e3398c5 | 2022-04-05 | -| alpine:3.15 | sha256:4edbd2beb5f78b1014028f4fbb99f3237d9561100b6881aabbf5acce2c4f9454 | 2022-04-05 | +| alpine:3.14 | sha256:43eb8f0d8215d8661f745f3d88563c026614d843b668b233bbe1666b6d026f61 | 2022-07-19 | +| alpine:3.15 | sha256:0483110c51a764abe175a8cefb941541ca0bc0f628ce418d3a660338abf4622a | 2022-07-19 | | buildpack-deps:bullseye | sha256:4cbb6d56f192ea1868bdbc441269d0343c90b201c973931aaa6722300118d463 | 2022-07-12 | | buildpack-deps:buster | sha256:3ab2863d37b2d037440b4a153a8fb3c79e935030fd47cef21b698688ce72f66e | 2022-07-12 | | debian:10 | sha256:0685c900f6e691bdda6980c0ed0779d20183bc58770059b64adb56cb8a3129f0 | 2022-07-12 | | debian:11 | sha256:2ce44bbc00a79113c296d9d25524e15d423b23303fdbbe20190d2f96e0aeb251 | 2022-07-12 | | moby/buildkit:latest | sha256:0dc312b04eac1b44cd2cad566deb1e886c753109208affbbec8384f381ff7f38 | 2022-05-06 | | node:14 | sha256:a086a11f7780399837ea0465ac8a8e8f14f2b66fe5a110fe0c24644d53a103c5 | 2022-07-12 | -| node:14-alpine | sha256:2af507df45e7c0a46c6b3001ce0dbc6924f7b39864d442045f781361a1971975 | 2022-07-08 | +| node:14-alpine | sha256:06bc5a651beb7db09a66ceb99a1d19275810d5c9dca8fb9e1ad6d69355a2f42e | 2022-07-18 | | node:16 | sha256:2e1b4542d4a06e0e0442dc38af1f4828760aecc9db2b95e7df87f573640d98cd | 2022-07-12 | -| node:16-alpine | sha256:554142f9a6367f1fbd776a1b2048fab3a2cc7aa477d7fe9c00ce0f110aa45716 | 2022-07-08 | +| node:16-alpine | sha256:da32af0cf608622b1550678b2552b7d997def7d0ada00e0eca0166ed2ea42186 | 2022-07-18 | | ubuntu:18.04 | sha256:478caf1bec1afd54a58435ec681c8755883b7eb843a8630091890130b15a79af | 2022-06-06 | | ubuntu:20.04 | sha256:fd92c36d3cb9b1d027c4d2a72c6bf0125da82425fc2ca37c414d4f010180dc19 | 2022-06-06 | | ubuntu:22.04 | sha256:b6b83d3c331794420340093eb706a6f152d9c1fa51b262d9bf34594887c2c7ac | 2022-06-06 | From 79a8a5a4e56447ab6b790e9682874f9ed42e4a1f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 26 Jul 2022 09:43:46 +0000 Subject: [PATCH 1342/3485] Updating readme file for ubuntu18 version 20220724.1 (#5962) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu1804-Readme.md | 57 +++++++++++++++---------------- 1 file changed, 28 insertions(+), 29 deletions(-) diff --git a/images/linux/Ubuntu1804-Readme.md b/images/linux/Ubuntu1804-Readme.md index 35eb7e5414b6..6f95b521f87d 100644 --- a/images/linux/Ubuntu1804-Readme.md +++ b/images/linux/Ubuntu1804-Readme.md @@ -1,11 +1,12 @@ | Announcements | |-| +| [[all OSs] Android NDK 21 will be replaced in favor of 25 on August, 1st](https://github.com/actions/virtual-environments/issues/5930) | | [[all OSs] Android ndk-bundle along with old NDK versions will be deprecated on July, 24](https://github.com/actions/virtual-environments/issues/5879) | | [(Public Beta) Ubuntu 22.04 is now available](https://github.com/actions/virtual-environments/issues/5490) | *** # Ubuntu 18.04.6 LTS - Linux kernel version: 5.4.0-1086-azure -- Image Version: 20220717.1 +- Image Version: 20220724.1 ## Installed Software ### Language and Runtime @@ -14,7 +15,7 @@ - Clang-format 9.0.0 - Clang-tidy 9.0.0 - Dash 0.5.8-2.10 -- Erlang 25.0.2 (Eshell 13.0.2) +- Erlang 25.0.3 (Eshell 13.0.3) - Erlang rebar3 3.19.0 - GNU C++ 7.5.0, 9.4.0, 10.3.0 - GNU Fortran 7.5.0, 9.4.0, 10.3.0 @@ -31,15 +32,15 @@ ### Package Management - cpan 1.64 -- Helm 3.9.1 -- Homebrew 3.5.4 +- Helm 3.9.2 +- Homebrew 3.5.6 - Miniconda 4.12.0 - Npm 8.11.0 - Pip 9.0.1 - Pip3 9.0.1 - Pipx 1.0.0 - RubyGems 2.7.6 -- Vcpkg (build from master \<68b7fec22>) +- Vcpkg (build from master \<f93ba152d>) - Yarn 1.22.19 #### Environment variables @@ -57,7 +58,7 @@ ### Tools - Ansible 2.11.12 - apt-fast 1.9.12 -- AzCopy 10.15.0 (available by `azcopy` and `azcopy10` aliases) +- AzCopy 10.16.0 (available by `azcopy` and `azcopy10` aliases) - Bazel 5.2.0 - Bazelisk 1.12.0 - Bicep 0.8.9 @@ -104,7 +105,7 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.124 -- AWS CLI 2.7.16 +- AWS CLI 2.7.18 - AWS CLI Session manager plugin 1.2.339.0 - AWS SAM CLI 1.53.0 - Azure CLI (azure-cli) 2.38.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) @@ -112,10 +113,10 @@ - GitHub CLI 2.14.2 - Google Cloud SDK 369.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 10.10.0 -- OpenShift CLI 4.10.22 +- Netlify CLI 10.11.1 +- OpenShift CLI 4.10.23 - ORAS CLI 0.13.0 -- Vercel CLI 27.1.5 +- Vercel CLI 27.2.0 ### Java | Version | Vendor | Environment Variable | @@ -141,9 +142,9 @@ - Stack 2.7.5 ### Rust Tools -- Cargo 1.62.0 -- Rust 1.62.0 -- Rustdoc 1.62.0 +- Cargo 1.62.1 +- Rust 1.62.1 +- Rustdoc 1.62.1 - Rustup 1.25.1 #### Packages @@ -155,11 +156,11 @@ - Rustfmt 1.4.38 ### Browsers and Drivers -- Google Chrome 103.0.5060.114 -- ChromeDriver 103.0.5060.53 +- Google Chrome 103.0.5060.134 +- ChromeDriver 103.0.5060.134 - Chromium 103.0.5060.0 -- Microsoft Edge 103.0.1264.62 (apt source repository: https://packages.microsoft.com/repos/edge) -- Microsoft Edge WebDriver 103.0.1264.62 +- Microsoft Edge 103.0.1264.71 (apt source repository: https://packages.microsoft.com/repos/edge) +- Microsoft Edge WebDriver 103.0.1264.71 - Selenium server 4.3.0 - Mozilla Firefox 102.0 - Geckodriver 0.31.0 @@ -272,24 +273,22 @@ | Google APIs | addon-google_apis-google-21<br>addon-google_apis-google-22<br>addon-google_apis-google-23<br>addon-google_apis-google-24 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 21.4.7075529<br>23.2.8568313 (default)<br>24.0.8215888 | +| NDK | 21.4.7075529<br>23.2.8568313<br>24.0.8215888 | | SDK Patch Applier v4 | 1 | #### Environment variables -| Name | Value | -| ----------------------- | ------------------------------------------------------------------------------------ | -| ANDROID_HOME | /usr/local/lib/android/sdk | -| ANDROID_NDK_HOME | /usr/local/lib/android/sdk/ndk-bundle -> /usr/local/lib/android/sdk/ndk/23.2.8568313 | -| ANDROID_NDK_LATEST_HOME | /usr/local/lib/android/sdk/ndk/24.0.8215888 | -| ANDROID_NDK_ROOT | /usr/local/lib/android/sdk/ndk-bundle -> /usr/local/lib/android/sdk/ndk/23.2.8568313 | -| ANDROID_SDK_ROOT | /usr/local/lib/android/sdk | +| Name | Value | +| ----------------------- | ------------------------------------------- | +| ANDROID_HOME | /usr/local/lib/android/sdk | +| ANDROID_NDK_LATEST_HOME | /usr/local/lib/android/sdk/ndk/24.0.8215888 | +| ANDROID_SDK_ROOT | /usr/local/lib/android/sdk | ### Cached Docker images | Repository:Tag | Digest | Created | | ----------------------- | ------------------------------------------------------------------------ | ---------- | | alpine:3.12 | sha256:c75ac27b49326926b803b9ed43bf088bc220d22556de1bc5f72d742c91398f69 | 2022-04-05 | -| alpine:3.13 | sha256:ccf92aa53bc6c3b25be2ad0cce80baec1778f007f7e076b0ffbd1b225d0b3a9b | 2022-04-05 | -| alpine:3.14 | sha256:06b5d462c92fc39303e6363c65e074559f8d6b1363250027ed5053557e3398c5 | 2022-04-05 | +| alpine:3.13 | sha256:7769c38ce671534a0ddbf98633f17edbbd4a4e99cbc77ef42f9f7b78b6a1c6c2 | 2022-07-19 | +| alpine:3.14 | sha256:43eb8f0d8215d8661f745f3d88563c026614d843b668b233bbe1666b6d026f61 | 2022-07-19 | | buildpack-deps:bullseye | sha256:4cbb6d56f192ea1868bdbc441269d0343c90b201c973931aaa6722300118d463 | 2022-07-12 | | buildpack-deps:buster | sha256:3ab2863d37b2d037440b4a153a8fb3c79e935030fd47cef21b698688ce72f66e | 2022-07-12 | | buildpack-deps:stretch | sha256:78e995165a5788c2f55aed6e548d8f6c1534830d4310c870408fccb2da8c5b2e | 2022-06-23 | @@ -300,9 +299,9 @@ | node:12 | sha256:01627afeb110b3054ba4a1405541ca095c8bfca1cb6f2be9479c767a2711879e | 2022-04-20 | | node:12-alpine | sha256:d4b15b3d48f42059a15bd659be60afe21762aae9d6cbea6f124440895c27db68 | 2022-04-11 | | node:14 | sha256:a086a11f7780399837ea0465ac8a8e8f14f2b66fe5a110fe0c24644d53a103c5 | 2022-07-12 | -| node:14-alpine | sha256:2af507df45e7c0a46c6b3001ce0dbc6924f7b39864d442045f781361a1971975 | 2022-07-08 | +| node:14-alpine | sha256:06bc5a651beb7db09a66ceb99a1d19275810d5c9dca8fb9e1ad6d69355a2f42e | 2022-07-18 | | node:16 | sha256:2e1b4542d4a06e0e0442dc38af1f4828760aecc9db2b95e7df87f573640d98cd | 2022-07-12 | -| node:16-alpine | sha256:554142f9a6367f1fbd776a1b2048fab3a2cc7aa477d7fe9c00ce0f110aa45716 | 2022-07-08 | +| node:16-alpine | sha256:da32af0cf608622b1550678b2552b7d997def7d0ada00e0eca0166ed2ea42186 | 2022-07-18 | | ubuntu:16.04 | sha256:20858ebbc96215d6c3c574f781133ebffdc7c18d98af4f294cc4c04871a6fe61 | 2021-08-31 | | ubuntu:18.04 | sha256:478caf1bec1afd54a58435ec681c8755883b7eb843a8630091890130b15a79af | 2022-06-06 | | ubuntu:20.04 | sha256:fd92c36d3cb9b1d027c4d2a72c6bf0125da82425fc2ca37c414d4f010180dc19 | 2022-06-06 | From ca5d04c7da260089447a4b445d6951e204373989 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 26 Jul 2022 10:14:32 +0000 Subject: [PATCH 1343/3485] Updating readme file for ubuntu20 version 20220724.1 (#5959) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2004-Readme.md | 63 +++++++++++++++---------------- 1 file changed, 31 insertions(+), 32 deletions(-) diff --git a/images/linux/Ubuntu2004-Readme.md b/images/linux/Ubuntu2004-Readme.md index 33a1298228a0..515b0e5edfbb 100644 --- a/images/linux/Ubuntu2004-Readme.md +++ b/images/linux/Ubuntu2004-Readme.md @@ -1,11 +1,12 @@ | Announcements | |-| +| [[all OSs] Android NDK 21 will be replaced in favor of 25 on August, 1st](https://github.com/actions/virtual-environments/issues/5930) | | [[all OSs] Android ndk-bundle along with old NDK versions will be deprecated on July, 24](https://github.com/actions/virtual-environments/issues/5879) | | [(Public Beta) Ubuntu 22.04 is now available](https://github.com/actions/virtual-environments/issues/5490) | *** # Ubuntu 20.04.4 LTS - Linux kernel version: 5.15.0-1014-azure -- Image Version: 20220717.1 +- Image Version: 20220724.1 ## Installed Software ### Language and Runtime @@ -14,7 +15,7 @@ - Clang-format 10.0.0, 11.0.0, 12.0.0 - Clang-tidy 10.0.0, 11.0.0, 12.0.0 - Dash 0.5.10.2-6 -- Erlang 25.0.2 (Eshell 13.0.2) +- Erlang 25.0.3 (Eshell 13.0.3) - Erlang rebar3 3.19.0 - GNU C++ 9.4.0, 10.3.0 - GNU Fortran 9.4.0, 10.3.0 @@ -31,15 +32,15 @@ ### Package Management - cpan 1.64 -- Helm 3.9.1 -- Homebrew 3.5.4 +- Helm 3.9.2 +- Homebrew 3.5.6 - Miniconda 4.12.0 - Npm 8.11.0 - Pip 20.0.2 - Pip3 20.0.2 - Pipx 1.1.0 - RubyGems 3.1.2 -- Vcpkg (build from master \<68b7fec22>) +- Vcpkg (build from master \<f93ba152d>) - Yarn 1.22.19 #### Environment variables @@ -51,14 +52,14 @@ ### Project Management - Ant 1.10.7 - Gradle 7.5 -- Lerna 5.1.8 +- Lerna 5.2.0 - Maven 3.8.6 - Sbt 1.7.1 ### Tools -- Ansible 2.13.1 +- Ansible 2.13.2 - apt-fast 1.9.12 -- AzCopy 10.15.0 (available by `azcopy` and `azcopy10` aliases) +- AzCopy 10.16.0 (available by `azcopy` and `azcopy10` aliases) - Bazel 5.2.0 - Bazelisk 1.12.0 - Bicep 0.8.9 @@ -71,7 +72,7 @@ - Docker-Buildx 0.8.2 - Docker-Moby Client 20.10.17+azure-1 - Docker-Moby Server 20.10.17+azure-1 -- Fastlane 2.207.0 +- Fastlane 2.208.0 - Git 2.37.1 (apt source repository: ppa:git-core/ppa) - Git LFS 3.2.0 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.6.0 @@ -106,7 +107,7 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.124 -- AWS CLI 2.7.16 +- AWS CLI 2.7.18 - AWS CLI Session manager plugin 1.2.339.0 - AWS SAM CLI 1.53.0 - Azure CLI (azure-cli) 2.38.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) @@ -114,10 +115,10 @@ - GitHub CLI 2.14.2 - Google Cloud SDK 369.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 10.10.0 -- OpenShift CLI 4.10.22 +- Netlify CLI 10.11.1 +- OpenShift CLI 4.10.23 - ORAS CLI 0.13.0 -- Vercel CLI 27.1.5 +- Vercel CLI 27.2.0 ### Java | Version | Vendor | Environment Variable | @@ -147,9 +148,9 @@ - Stack 2.7.5 ### Rust Tools -- Cargo 1.62.0 -- Rust 1.62.0 -- Rustdoc 1.62.0 +- Cargo 1.62.1 +- Rust 1.62.1 +- Rustdoc 1.62.1 - Rustup 1.25.1 #### Packages @@ -161,11 +162,11 @@ - Rustfmt 1.4.38 ### Browsers and Drivers -- Google Chrome 103.0.5060.114 -- ChromeDriver 103.0.5060.53 +- Google Chrome 103.0.5060.134 +- ChromeDriver 103.0.5060.134 - Chromium 103.0.5060.0 -- Microsoft Edge 103.0.1264.62 (apt source repository: https://packages.microsoft.com/repos/edge) -- Microsoft Edge WebDriver 103.0.1264.62 +- Microsoft Edge 103.0.1264.71 (apt source repository: https://packages.microsoft.com/repos/edge) +- Microsoft Edge WebDriver 103.0.1264.71 - Selenium server 4.3.0 - Mozilla Firefox 102.0 - Geckodriver 0.31.0 @@ -280,24 +281,22 @@ | CMake | 3.10.2<br>3.18.1 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 21.4.7075529<br>23.2.8568313 (default)<br>24.0.8215888 | +| NDK | 21.4.7075529<br>23.2.8568313<br>24.0.8215888 | | SDK Patch Applier v4 | 1 | #### Environment variables -| Name | Value | -| ----------------------- | ------------------------------------------------------------------------------------ | -| ANDROID_HOME | /usr/local/lib/android/sdk | -| ANDROID_NDK_HOME | /usr/local/lib/android/sdk/ndk-bundle -> /usr/local/lib/android/sdk/ndk/23.2.8568313 | -| ANDROID_NDK_LATEST_HOME | /usr/local/lib/android/sdk/ndk/24.0.8215888 | -| ANDROID_NDK_ROOT | /usr/local/lib/android/sdk/ndk-bundle -> /usr/local/lib/android/sdk/ndk/23.2.8568313 | -| ANDROID_SDK_ROOT | /usr/local/lib/android/sdk | +| Name | Value | +| ----------------------- | ------------------------------------------- | +| ANDROID_HOME | /usr/local/lib/android/sdk | +| ANDROID_NDK_LATEST_HOME | /usr/local/lib/android/sdk/ndk/24.0.8215888 | +| ANDROID_SDK_ROOT | /usr/local/lib/android/sdk | ### Cached Docker images | Repository:Tag | Digest | Created | | ----------------------- | ------------------------------------------------------------------------ | ---------- | | alpine:3.12 | sha256:c75ac27b49326926b803b9ed43bf088bc220d22556de1bc5f72d742c91398f69 | 2022-04-05 | -| alpine:3.13 | sha256:ccf92aa53bc6c3b25be2ad0cce80baec1778f007f7e076b0ffbd1b225d0b3a9b | 2022-04-05 | -| alpine:3.14 | sha256:06b5d462c92fc39303e6363c65e074559f8d6b1363250027ed5053557e3398c5 | 2022-04-05 | +| alpine:3.13 | sha256:7769c38ce671534a0ddbf98633f17edbbd4a4e99cbc77ef42f9f7b78b6a1c6c2 | 2022-07-19 | +| alpine:3.14 | sha256:43eb8f0d8215d8661f745f3d88563c026614d843b668b233bbe1666b6d026f61 | 2022-07-19 | | buildpack-deps:bullseye | sha256:4cbb6d56f192ea1868bdbc441269d0343c90b201c973931aaa6722300118d463 | 2022-07-12 | | buildpack-deps:buster | sha256:3ab2863d37b2d037440b4a153a8fb3c79e935030fd47cef21b698688ce72f66e | 2022-07-12 | | buildpack-deps:stretch | sha256:78e995165a5788c2f55aed6e548d8f6c1534830d4310c870408fccb2da8c5b2e | 2022-06-23 | @@ -308,9 +307,9 @@ | node:12 | sha256:01627afeb110b3054ba4a1405541ca095c8bfca1cb6f2be9479c767a2711879e | 2022-04-20 | | node:12-alpine | sha256:d4b15b3d48f42059a15bd659be60afe21762aae9d6cbea6f124440895c27db68 | 2022-04-11 | | node:14 | sha256:a086a11f7780399837ea0465ac8a8e8f14f2b66fe5a110fe0c24644d53a103c5 | 2022-07-12 | -| node:14-alpine | sha256:2af507df45e7c0a46c6b3001ce0dbc6924f7b39864d442045f781361a1971975 | 2022-07-08 | +| node:14-alpine | sha256:06bc5a651beb7db09a66ceb99a1d19275810d5c9dca8fb9e1ad6d69355a2f42e | 2022-07-18 | | node:16 | sha256:2e1b4542d4a06e0e0442dc38af1f4828760aecc9db2b95e7df87f573640d98cd | 2022-07-12 | -| node:16-alpine | sha256:554142f9a6367f1fbd776a1b2048fab3a2cc7aa477d7fe9c00ce0f110aa45716 | 2022-07-08 | +| node:16-alpine | sha256:da32af0cf608622b1550678b2552b7d997def7d0ada00e0eca0166ed2ea42186 | 2022-07-18 | | ubuntu:16.04 | sha256:20858ebbc96215d6c3c574f781133ebffdc7c18d98af4f294cc4c04871a6fe61 | 2021-08-31 | | ubuntu:18.04 | sha256:478caf1bec1afd54a58435ec681c8755883b7eb843a8630091890130b15a79af | 2022-06-06 | | ubuntu:20.04 | sha256:fd92c36d3cb9b1d027c4d2a72c6bf0125da82425fc2ca37c414d4f010180dc19 | 2022-06-06 | From 2e7646b11d24401c16f947cc7fa7bf82edae12b1 Mon Sep 17 00:00:00 2001 From: Igor Boskovic <igorboskovic3@github.com> Date: Tue, 26 Jul 2022 12:20:07 +0200 Subject: [PATCH 1344/3485] [Mac OS] add Android NDK 25 (#5951) --- images/macos/toolsets/toolset-10.15.json | 2 +- images/macos/toolsets/toolset-11.json | 2 +- images/macos/toolsets/toolset-12.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index 51a1ff9802f4..76e6810da727 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -180,7 +180,7 @@ ], "ndk": { "versions": [ - "21", "23", "24" + "23", "24", "25" ] } }, diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index 1bd55f84d797..9b0ad6b10916 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -178,7 +178,7 @@ ], "ndk": { "versions": [ - "21", "23", "24" + "23", "24", "25" ] } }, diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index 381291df29ae..457154206ee2 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -113,7 +113,7 @@ ], "ndk": { "versions": [ - "21", "23", "24" + "23", "24", "25" ] } }, From f1224c3d753a49fff1bcea06e0b877fe7ce61de2 Mon Sep 17 00:00:00 2001 From: LoveSy <631499712@qq.com> Date: Tue, 26 Jul 2022 18:20:30 +0800 Subject: [PATCH 1345/3485] [Ubuntu] add Android NDK 25 (#5902) --- images/linux/toolsets/toolset-1804.json | 2 +- images/linux/toolsets/toolset-2004.json | 2 +- images/linux/toolsets/toolset-2204.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index 92a5c556d658..d8f795391f68 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -106,7 +106,7 @@ ], "ndk": { "versions": [ - "21", "23", "24" + "23", "24", "25" ] } }, diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index a67e2faa2dd3..edc7b35c7b65 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -103,7 +103,7 @@ ], "ndk": { "versions": [ - "21", "23", "24" + "23", "24", "25" ] } }, diff --git a/images/linux/toolsets/toolset-2204.json b/images/linux/toolsets/toolset-2204.json index 884b0d0289c0..701cf3b3346d 100644 --- a/images/linux/toolsets/toolset-2204.json +++ b/images/linux/toolsets/toolset-2204.json @@ -89,7 +89,7 @@ ], "ndk": { "versions": [ - "21", "23", "24" + "23", "24", "25" ] } }, From 46c1fd7e8d743038824cdf4ad11f764580a19bb8 Mon Sep 17 00:00:00 2001 From: LoveSy <631499712@qq.com> Date: Tue, 26 Jul 2022 18:20:44 +0800 Subject: [PATCH 1346/3485] [Windows] add Android NDK 25 (#5905) * [Windows] add Android NDK 25 * Update toolset-2022.json --- images/win/toolsets/toolset-2019.json | 2 +- images/win/toolsets/toolset-2022.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index 652f5984e36c..a23aa3c80d4b 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -184,7 +184,7 @@ ], "ndk": { "versions": [ - "21", "23", "24" + "23", "24", "25" ] } }, diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index b5a839a50811..aa3094db3b80 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -154,7 +154,7 @@ ], "ndk": { "versions": [ - "21", "23", "24" + "23", "24", "25" ] } }, From 185a0cd1a01d7e2d88b101fa6dc4a1fc765af56b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 26 Jul 2022 13:00:50 +0000 Subject: [PATCH 1347/3485] Updating readme file for win22 version 20220724.1 (#5957) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2022-Readme.md | 130 ++++++++++++++++++------------- 1 file changed, 74 insertions(+), 56 deletions(-) diff --git a/images/win/Windows2022-Readme.md b/images/win/Windows2022-Readme.md index 568fd6ccc79a..12ae9711ed7e 100644 --- a/images/win/Windows2022-Readme.md +++ b/images/win/Windows2022-Readme.md @@ -1,12 +1,13 @@ | Announcements | |-| +| [[Windows] mongo service will be disabled by default on August, 8th](https://github.com/actions/virtual-environments/issues/5949) | +| [[all OSs] Android NDK 21 will be replaced in favor of 25 on August, 1st](https://github.com/actions/virtual-environments/issues/5930) | | [[all OSs] Android ndk-bundle along with old NDK versions will be deprecated on July, 24](https://github.com/actions/virtual-environments/issues/5879) | -| [[Windows, macOS] LLVM will be updated to version 14 on July, 11](https://github.com/actions/virtual-environments/issues/5835) | -| [[Azure DevOps] Windows-2016 environment removal postponed until June 30, 2022](https://github.com/actions/virtual-environments/issues/5403) | +| [[Azure DevOps] Windows-2016 environment removal postponed until July 31, 2022](https://github.com/actions/virtual-environments/issues/5403) | *** # Microsoft Windows Server 2022 Datacenter -- OS Version: 10.0.20348 Build 768 -- Image Version: 20220710.1 +- OS Version: 10.0.20348 Build 825 +- Image Version: 20220724.1 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -14,7 +15,7 @@ ## Installed Software ### Language and Runtime - Bash 4.4.23(1)-release -- Go 1.17.11 +- Go 1.17.12 - Julia 1.7.3 - Kotlin 1.7.10 - LLVM 14.0.6 @@ -26,15 +27,15 @@ ### Package Management - Chocolatey 1.1.0 -- Composer 2.3.9 -- Helm 3.8.2 +- Composer 2.3.10 +- Helm 3.9.1 - Miniconda 4.12.0 (pre-installed on the image but not added to PATH) - NPM 8.11.0 - NuGet 6.2.1.2 -- pip 22.1.2 (python 3.9) +- pip 22.2 (python 3.9) - Pipx 1.1.0 - RubyGems 3.2.33 -- Vcpkg (build from master \<98f8d00e8>) +- Vcpkg (build from master \<f93ba152d>) - Yarn 1.22.19 #### Environment variables @@ -46,12 +47,12 @@ - Ant 1.10.12 - Gradle 7.4 - Maven 3.8.6 -- sbt 1.6.2 +- sbt 1.7.1 ### Tools -- 7zip 22.00 +- 7zip 22.01 - aria2 1.36.0 -- azcopy 10.15.0 +- azcopy 10.16.0 - Bazel 5.2.0 - Bazelisk 1.12.0 - Bicep 0.8.9 @@ -60,10 +61,10 @@ - CodeQL Action Bundle 2.10.0 - Docker 20.10.7 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.6.1 +- Docker Compose v2 2.7.0 - Docker-wincred 0.6.4 - ghc 9.2.3 -- Git 2.37.0.windows.1 +- Git 2.37.1.windows.1 - Git LFS 3.2.0 - InnoSetup 6.2.1 - jq 1.6 @@ -75,7 +76,7 @@ - NSIS v3.08 - OpenSSL 1.1.1 - Packer 1.8.2 -- Pulumi v3.35.3 +- Pulumi v3.36.0 - R 4.2.1 - Service Fabric SDK 9.0.1028.9590 - Stack 2.7.5 @@ -89,19 +90,19 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.124 -- AWS CLI 2.7.14 +- AWS CLI 2.7.18 - AWS SAM CLI 1.53.0 - AWS Session Manager CLI 1.2.339.0 - Azure CLI 2.38.0 - Azure DevOps CLI extension 0.25.0 -- GitHub CLI 2.13.0 +- GitHub CLI 2.14.2 - Hub CLI 2.14.2 ### Rust Tools -- Cargo 1.62.0 -- Rust 1.62.0 -- Rustdoc 1.62.0 -- Rustup 1.24.3 +- Cargo 1.62.1 +- Rust 1.62.1 +- Rustdoc 1.62.1 +- Rustup 1.25.1 #### Packages - bindgen 0.60.1 @@ -112,10 +113,10 @@ - Rustfmt 1.4.38 ### Browsers and webdrivers -- Google Chrome 103.0.5060.114 -- Chrome Driver 103.0.5060.53 -- Microsoft Edge 103.0.1264.49 -- Microsoft Edge Driver 103.0.1264.49 +- Google Chrome 103.0.5060.134 +- Chrome Driver 103.0.5060.134 +- Microsoft Edge 103.0.1264.71 +- Microsoft Edge Driver 103.0.1264.71 - Mozilla Firefox 102.0.1 - Gecko Driver 0.31.0 - IE Driver 3.150.1.1 @@ -133,8 +134,8 @@ | Version | Vendor | Environment Variable | | ------------------- | --------------- | -------------------- | | 8.0.332+9 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | -| 11.0.15+10 | Eclipse Temurin | JAVA_HOME_11_X64 | -| 17.0.3+7 | Eclipse Temurin | JAVA_HOME_17_X64 | +| 11.0.16+8 | Eclipse Temurin | JAVA_HOME_11_X64 | +| 17.0.4+8 | Eclipse Temurin | JAVA_HOME_17_X64 | ### Shells | Name | Target | @@ -158,8 +159,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Version | Architecture | Environment Variable | | ------- | ------------ | -------------------- | | 1.16.15 | x64 | GOROOT_1_16_X64 | -| 1.17.11 (Default) | x64 | GOROOT_1_17_X64 | -| 1.18.3 | x64 | GOROOT_1_18_X64 | +| 1.17.12 (Default) | x64 | GOROOT_1_17_X64 | +| 1.18.4 | x64 | GOROOT_1_18_X64 | #### Node | Version | Architecture | @@ -220,12 +221,12 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Name | Version | ConfigFile | ServiceName | ServiceStatus | ListenPort | | ------ | ------- | ------------------------------------- | ----------- | ------------- | ---------- | | Apache | 2.4.54 | C:\tools\Apache24\conf\httpd.conf | Apache | Stopped | 80 | -| Nginx | 1.23.0 | C:\tools\nginx-1.23.0\conf\nginx.conf | nginx | Stopped | 80 | +| Nginx | 1.23.1 | C:\tools\nginx-1.23.1\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2022 | Name | Version | Path | | ----------------------------- | -------------- | -------------------------------------------------------- | -| Visual Studio Enterprise 2022 | 17.2.32616.157 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | +| Visual Studio Enterprise 2022 | 17.2.32630.192 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | #### Workloads, components and extensions: | Package | Version | @@ -234,6 +235,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Component.Android.SDK.MAUI | 17.2.32408.312 | | Component.Android.SDK25.Private | 17.2.32408.312 | | Component.Ant | 1.9.3.8 | +| Component.Dotfuscator | 17.2.32408.312 | | Component.Linux.CMake | 17.2.32408.312 | | Component.MDD.Android | 17.2.32408.312 | | Component.MDD.Linux | 17.2.32408.312 | @@ -275,11 +277,11 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.Net.ComponentGroup.4.8.DeveloperTools | 17.2.32408.312 | | Microsoft.Net.ComponentGroup.DevelopmentPrerequisites | 17.2.32408.312 | | Microsoft.Net.ComponentGroup.TargetingPacks.Common | 17.2.32408.312 | -| microsoft.net.runtime.mono.tooling | 6.0.622.26707 | +| microsoft.net.runtime.mono.tooling | 6.0.722.32202 | | microsoft.net.sdk.emscripten | 6.0.6.16102 | | Microsoft.NetCore.Component.DevelopmentTools | 17.2.32408.312 | -| Microsoft.NetCore.Component.Runtime.6.0 | 17.2.32602.177 | -| Microsoft.NetCore.Component.SDK | 17.2.32602.177 | +| Microsoft.NetCore.Component.Runtime.6.0 | 17.2.32630.192 | +| Microsoft.NetCore.Component.SDK | 17.2.32630.192 | | Microsoft.NetCore.Component.Web | 17.2.32408.312 | | Microsoft.VisualStudio.Component.AppInsights.Tools | 17.2.32408.312 | | Microsoft.VisualStudio.Component.AspNet | 17.2.32408.312 | @@ -352,6 +354,24 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.Spectre | 17.2.32408.312 | | Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64 | 17.2.32408.312 | | Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64.Spectre | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.VC.14.32.17.2.ARM | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.VC.14.32.17.2.ARM.Spectre | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.VC.14.32.17.2.ARM64 | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.VC.14.32.17.2.ARM64.Spectre | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.VC.14.32.17.2.ATL | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.VC.14.32.17.2.ATL.ARM | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.VC.14.32.17.2.ATL.ARM.Spectre | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.VC.14.32.17.2.ATL.ARM64 | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.VC.14.32.17.2.ATL.ARM64.Spectre | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.VC.14.32.17.2.ATL.Spectre | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.VC.14.32.17.2.MFC | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.VC.14.32.17.2.MFC.ARM | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.VC.14.32.17.2.MFC.ARM.Spectre | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.VC.14.32.17.2.MFC.ARM64 | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.VC.14.32.17.2.MFC.ARM64.Spectre | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.VC.14.32.17.2.MFC.Spectre | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.VC.14.32.17.2.x86.x64 | 17.2.32408.312 | +| Microsoft.VisualStudio.Component.VC.14.32.17.2.x86.x64.Spectre | 17.2.32408.312 | | Microsoft.VisualStudio.Component.VC.ASAN | 17.2.32408.312 | | Microsoft.VisualStudio.Component.VC.ATL | 17.2.32408.312 | | Microsoft.VisualStudio.Component.VC.ATL.ARM | 17.2.32408.312 | @@ -446,7 +466,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Workload.Python | 17.2.32408.312 | | Microsoft.VisualStudio.Workload.Universal | 17.2.32526.322 | | Microsoft.VisualStudio.Workload.VisualStudioExtension | 17.2.32408.312 | -| wasm.tools | 6.0.622.26707 | +| wasm.tools | 6.0.722.32202 | +| ProBITools.MicrosoftAnalysisServicesModelingProjects2022 | 3.0.4 | | ProBITools.MicrosoftReportProjectsforVisualStudio2022 | 3.0.1 | | VisualStudioClient.MicrosoftVisualStudio2022InstallerProjects | 2.0.0 | | Windows Driver Kit | 10.1.22621.1 | @@ -476,17 +497,17 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### .NET Core SDK `Location C:\Program Files\dotnet\sdk` -- 3.1.120 3.1.202 3.1.302 3.1.420 5.0.104 5.0.214 5.0.303 5.0.408 6.0.301 +- 3.1.120 3.1.202 3.1.302 3.1.421 5.0.104 5.0.214 5.0.303 5.0.408 6.0.302 ### .NET Core Runtime `Location: C:\Program Files\dotnet\shared\Microsoft.AspNetCore.App` -- 3.1.4 3.1.6 3.1.20 3.1.26 5.0.4 5.0.9 5.0.17 6.0.6 +- 3.1.4 3.1.6 3.1.20 3.1.26 3.1.27 5.0.4 5.0.9 5.0.17 6.0.6 6.0.7 `Location: C:\Program Files\dotnet\shared\Microsoft.NETCore.App` -- 3.1.4 3.1.6 3.1.20 3.1.26 5.0.4 5.0.9 5.0.17 6.0.6 +- 3.1.4 3.1.6 3.1.20 3.1.26 3.1.27 5.0.4 5.0.9 5.0.17 6.0.6 6.0.7 `Location: C:\Program Files\dotnet\shared\Microsoft.WindowsDesktop.App` -- 3.1.4 3.1.6 3.1.20 3.1.26 5.0.4 5.0.9 5.0.17 6.0.6 +- 3.1.4 3.1.6 3.1.20 3.1.27 5.0.4 5.0.9 5.0.17 6.0.7 ### .NET Framework `Type: Developer Pack` @@ -494,7 +515,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 4.8 ### .NET tools -- nbgv 3.5.107+6463ef6068 +- nbgv 3.5.108+6e793d63d3 ### PowerShell Tools - PowerShell 7.2.5 @@ -514,7 +535,7 @@ All other versions are saved but not installed. #### Powershell Modules | Module | Version | | ------------------ | ---------------- | -| AWSPowerShell | 4.1.122 | +| AWSPowerShell | 4.1.132 | | DockerMsftProvider | 1.0.0.8 | | MarkdownPS | 1.9 | | Microsoft.Graph | 1.10.0 | @@ -531,32 +552,29 @@ All other versions are saved but not installed. | Android Command Line Tools | 7.0 | | Android Emulator | 31.2.10 | | Android SDK Build-tools | 33.0.0<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | -| Android SDK Platforms | android-33 (rev 1)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | +| Android SDK Platforms | android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | | Android SDK Platform-Tools | 33.0.2 | | Android Support Repository | 47.0.0 | | CMake | 3.18.1 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 21.4.7075529<br>23.2.8568313 (default)<br>24.0.8215888 | +| NDK | 21.4.7075529<br>23.2.8568313<br>24.0.8215888 | | SDK Patch Applier v4 | 1 | #### Environment variables -| Name | Value | -| ----------------------- | ---------------------------------------------------------------------------- | -| ANDROID_HOME | C:\Android\android-sdk | -| ANDROID_NDK_HOME | C:\Android\android-sdk\ndk-bundle -> C:\Android\android-sdk\ndk\23.2.8568313 | -| ANDROID_NDK_LATEST_HOME | C:\Android\android-sdk\ndk\24.0.8215888 | -| ANDROID_NDK_PATH | C:\Android\android-sdk\ndk-bundle -> C:\Android\android-sdk\ndk\23.2.8568313 | -| ANDROID_NDK_ROOT | C:\Android\android-sdk\ndk-bundle -> C:\Android\android-sdk\ndk\23.2.8568313 | -| ANDROID_SDK_ROOT | C:\Android\android-sdk | +| Name | Value | +| ----------------------- | --------------------------------------- | +| ANDROID_HOME | C:\Android\android-sdk | +| ANDROID_NDK_LATEST_HOME | C:\Android\android-sdk\ndk\24.0.8215888 | +| ANDROID_SDK_ROOT | C:\Android\android-sdk | ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2022 | sha256:31c66a698116346470a864eb3f58698a422e99e688a0b1b51fb178e2541ddc47 | 2022-06-14 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2022 | sha256:486be6bcb80ad5bae9854f7a022601fd93cf58b7b26fbdc70ca8533b88852ac7 | 2022-06-14 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:6c490f4528cb625c60aa119669830639ae3988c3c23dfb2f94a4ef19df2eb606 | 2022-06-14 | -| mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:5f36a555eeb0151d5c00c14b01c3d39d9e5dffc36e5b2039cfa6041b6dac2480 | 2022-06-09 | -| mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:b2162caa6da208d9dc10c99e18ee04aadcc4429b219cb316ea404fa9c4de53d1 | 2022-06-09 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2022 | sha256:0ea7d5c616349fdb77a6cf13c6392277081fd6816ca922bed69083f395f7130b | 2022-07-12 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2022 | sha256:ec79d74665ee8812e3f2bf29e352975a938f670b6ddf968df5b1becf9e6283ed | 2022-07-12 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:8180531d4ac52f7c5bb8dc2864639ebb053081335d3c0558abb021a237770895 | 2022-07-12 | +| mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:81f3d891826a99e3a5742df69dcb4e6e44e177f817a0527c2b8dd5ef3c9eeaa8 | 2022-07-04 | +| mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:ffa814c9dbae448ee8a4dd5415952b3124adf0964b8c7c761b82d1e95f6f0acf | 2022-07-04 | From cafc23807341e3b17c838a6f4b43841c937f9de6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 26 Jul 2022 13:16:08 +0000 Subject: [PATCH 1348/3485] Updating readme file for macOS-10.15 version 20220724.1 (#5968) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-10.15-Readme.md | 108 ++++++++++++++--------------- 1 file changed, 53 insertions(+), 55 deletions(-) diff --git a/images/macos/macos-10.15-Readme.md b/images/macos/macos-10.15-Readme.md index 8c01857eb39a..a242b206cd3c 100644 --- a/images/macos/macos-10.15-Readme.md +++ b/images/macos/macos-10.15-Readme.md @@ -1,17 +1,18 @@ | Announcements | |-| +| ['virtual-environments' repository name will be changed to 'runner-images' on August, 8th](https://github.com/actions/virtual-environments/issues/5967) | +| [[all OSs] Android NDK 21 will be replaced in favor of 25 on August, 1st](https://github.com/actions/virtual-environments/issues/5930) | | [[all OSs] Android ndk-bundle along with old NDK versions will be deprecated on July, 24](https://github.com/actions/virtual-environments/issues/5879) | -| [[macOS] Default Xcode on Monterey image will be set to Xcode 13.4.1 on July, 11](https://github.com/actions/virtual-environments/issues/5836) | -| [[Windows, macOS] LLVM will be updated to version 14 on July, 11](https://github.com/actions/virtual-environments/issues/5835) | +| [The macOS 10.15 Actions runner image will begin deprecation on 5/31/22 and will be fully unsupported by 8/30/22 in GitHub and by 9/30/22 in ADO](https://github.com/actions/virtual-environments/issues/5583) | *** # macOS 10.15 info -- System Version: macOS 10.15.7 (19H1922) +- System Version: macOS 10.15.7 (19H2026) - Kernel Version: Darwin 19.6.0 -- Image Version: 20220709.1 +- Image Version: 20220724.1 ## Installed Software ### Language and Runtime -- .NET SDK 3.1.101 3.1.201 3.1.302 3.1.420 5.0.102 5.0.202 5.0.302 5.0.408 +- .NET SDK 3.1.101 3.1.201 3.1.302 3.1.421 5.0.102 5.0.202 5.0.302 5.0.408 - Bash 3.2.57(1)-release - Clang/LLVM 12.0.0 is default - Clang/LLVM 14.0.6 is available on `'$(brew --prefix llvm@14)/bin/clang'` @@ -21,7 +22,7 @@ - GNU Fortran (Homebrew GCC 9.5.0) 9.5.0 - available by `gfortran-9` alias - GNU Fortran (Homebrew GCC 10.4.0) 10.4.0 - available by `gfortran-10` alias - GNU Fortran (Homebrew GCC 11.3.0_2) 11.3.0 - available by `gfortran-11` alias -- Go 1.17.11 +- Go 1.17.12 - julia 1.7.3 - Kotlin 1.7.10-release-333 - MSBuild 16.10.1.31401 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) @@ -36,19 +37,19 @@ - Ruby 2.7.6p219 ### Package Management -- Bundler version 2.3.17 +- Bundler version 2.3.18 - Carthage 0.38.0 - CocoaPods 1.11.3 -- Composer 2.3.9 -- Homebrew 3.5.4 +- Composer 2.3.10 +- Homebrew 3.5.6 - Miniconda 4.12.0 - NPM 8.11.0 - NuGet 6.2.1.2 - Pip 20.3.4 (python 2.7) - Pip 22.1.1 (python 3.9) - Pipx 1.1.0 -- RubyGems 3.2.33 -- Vcpkg 2022 (build from master \<98f8d00e8>) +- RubyGems 3.3.18 +- Vcpkg 2022 (build from master \<f93ba152d>) - Yarn 1.22.19 #### Environment variables @@ -60,27 +61,27 @@ ### Project Management - Apache Ant(TM) 1.10.12 - Apache Maven 3.8.6 -- Gradle 7.4.2 -- Sbt 1.6.2 +- Gradle 7.5 +- Sbt 1.7.1 ### Utilities - 7-Zip 17.04 - aria2 1.36.0 -- azcopy 10.15.0 +- azcopy 10.16.0 - bazel 5.2.0 - bazelisk 1.12.0 - bsdtar 3.3.2 - available by 'tar' alias - Curl 7.84.0 -- Git 2.37.0 +- Git 2.37.1 - Git LFS: 3.2.0 -- GitHub CLI: 2.13.0 -- GNU parallel 20220622 +- GitHub CLI: 2.14.2 +- GNU parallel 20220722 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.3 -- gpg (GnuPG) 2.3.6 -- helm v3.9.0+g7ceeda6 +- gpg (GnuPG) 2.3.7 +- helm v3.9.2+g1addefb - Hub CLI: 2.14.2 -- ImageMagick 7.1.0-41 +- ImageMagick 7.1.0-43 - jq 1.6 - mongo v5.0.7 - mongod v5.0.7 @@ -93,14 +94,14 @@ - Subversion (SVN) 1.14.2 - Switchaudio-osx 1.1.0 - Vagrant 2.2.19 -- VirtualBox 6.1.34r150636 -- yq (https://github.com/mikefarah/yq/) version 4.25.3 +- VirtualBox 6.1.36r152435 +- yq (https://github.com/mikefarah/yq/) version 4.26.1 - zstd 1.5.2 ### Tools - Aliyun CLI 3.0.123 - App Center CLI 2.10.10 -- AWS CLI 2.7.14 +- AWS CLI 2.7.18 - AWS SAM CLI 1.53.0 - AWS Session Manager CLI 1.2.339.0 - Azure CLI (azure-devops) 0.25.0 @@ -108,12 +109,12 @@ - Bicep CLI 0.8.9 - Cabal 3.6.2.0 - Cmake 3.23.2 -- Fastlane 2.207.0 +- Fastlane 2.208.0 - GHC 9.2.3 - GHCup 0.1.17.8 - Jazzy 0.14.2 - Stack 2.7.5 -- SwiftFormat 0.49.11 +- SwiftFormat 0.49.13 - Swig 4.0.2 - Xcode Command Line Tools 12.4.0.0.1.1610135815 @@ -122,28 +123,28 @@ - yamllint 1.27.1 ### Browsers -- Safari 15.5 (15613.2.7.1.9) -- SafariDriver 15.5 (15613.2.7.1.9) -- Google Chrome 103.0.5060.114 -- ChromeDriver 103.0.5060.53 -- Microsoft Edge 103.0.1264.51 -- Microsoft Edge WebDriver 103.0.1264.51 +- Safari 15.6 (15613.3.9.1.7) +- SafariDriver 15.6 (15613.3.9.1.7) +- Google Chrome 103.0.5060.134 +- ChromeDriver 103.0.5060.134 +- Microsoft Edge 103.0.1264.71 +- Microsoft Edge WebDriver 103.0.1264.71 - Mozilla Firefox 102.0.1 - geckodriver 0.31.0 - Selenium server 4.3.0 #### Environment variables -| Name | Value | -| --------------- | ---------------------------------------------- | -| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/103.0.5060.53 | -| EDGEWEBDRIVER | /usr/local/share/edge_driver | -| GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | +| Name | Value | +| --------------- | ----------------------------------------------- | +| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/103.0.5060.134 | +| EDGEWEBDRIVER | /usr/local/share/edge_driver | +| GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | ### Java | Version | Vendor | Environment Variable | | ------------------- | --------------- | -------------------- | | 8.0.332+9 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | -| 11.0.15+10 | Eclipse Temurin | JAVA_HOME_11_X64 | +| 11.0.16+8 | Eclipse Temurin | JAVA_HOME_11_X64 | | 12.0.2+10.3 | Adopt OpenJDK | JAVA_HOME_12_X64 | | 13.0.2+8.1 | Adopt OpenJDK | JAVA_HOME_13_X64 | | 14.0.2+12 | Adopt OpenJDK | JAVA_HOME_14_X64 | @@ -186,14 +187,14 @@ | Version | Architecture | Environment Variable | | ------- | ------------ | -------------------- | | 1.16.15 | x64 | GOROOT_1_16_X64 | -| 1.17.11 (Default) | x64 | GOROOT_1_17_X64 | -| 1.18.3 | x64 | GOROOT_1_18_X64 | +| 1.17.12 (Default) | x64 | GOROOT_1_17_X64 | +| 1.18.4 | x64 | GOROOT_1_18_X64 | ### Rust Tools -- Cargo 1.62.0 -- Rust 1.62.0 -- Rustdoc 1.62.0 -- Rustup 1.24.3 +- Cargo 1.62.1 +- Rust 1.62.1 +- Rustdoc 1.62.1 +- Rustup 1.25.1 #### Packages - Bindgen 0.60.1 @@ -218,7 +219,7 @@ | Name | Version | ConfigFile | ServiceStatus | ListenPort | | ----- | ------- | ------------------------------- | ------------- | ---------- | | httpd | 2.4.54 | /usr/local/etc/httpd/httpd.conf | none | 80 | -| nginx | 1.23.0 | /usr/local/etc/nginx/nginx.conf | none | 80 | +| nginx | 1.23.1 | /usr/local/etc/nginx/nginx.conf | none | 80 | ### Xamarin #### Visual Studio for Mac @@ -268,7 +269,7 @@ #### Xcode Support Tools - xcpretty 0.3.0 -- xcversion 2.8.0 +- xcversion 2.8.1 - Nomad CLI 0.0.2 - Nomad shenzhen CLI 0.14.3 - xctool 0.3.7 @@ -365,26 +366,23 @@ | Android Command Line Tools | 7.0 | | Android Emulator | 31.2.10 | | Android SDK Build-tools | 33.0.0<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3<br>26.0.0 26.0.1 26.0.2 26.0.3<br>25.0.0 25.0.1 25.0.2 25.0.3<br>24.0.0 24.0.1 24.0.2 24.0.3 | -| Android SDK Platforms | android-33 (rev 1)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3)<br>android-26 (rev 2)<br>android-25 (rev 3)<br>android-24 (rev 2) | +| Android SDK Platforms | android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3)<br>android-26 (rev 2)<br>android-25 (rev 3)<br>android-24 (rev 2) | | Android SDK Platform-Tools | 33.0.2 | | Android Support Repository | 47.0.0 | | CMake | 3.10.2<br>3.18.1 | | Google APIs | addon-google_apis-google-21<br>addon-google_apis-google-22<br>addon-google_apis-google-23<br>addon-google_apis-google-24 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 15.2.4203891<br>18.1.5063045<br>21.4.7075529<br>23.2.8568313 (default)<br>24.0.8215888 | +| NDK | 21.4.7075529<br>23.2.8568313<br>24.0.8215888 | | SDK Patch Applier v4 | 1 | | Intel HAXM | 7.6.5 | #### Environment variables -| Name | Value | -| ----------------------- | -------------------------------------------------------------------------------------------------- | -| ANDROID_HOME | /Users/runner/Library/Android/sdk | -| ANDROID_NDK_18R_PATH | /Users/runner/Library/Android/sdk/ndk/18.1.5063045 | -| ANDROID_NDK_HOME | /Users/runner/Library/Android/sdk/ndk-bundle -> /Users/runner/Library/Android/sdk/ndk/23.2.8568313 | -| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/24.0.8215888 | -| ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk-bundle -> /Users/runner/Library/Android/sdk/ndk/23.2.8568313 | -| ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | +| Name | Value | +| ----------------------- | -------------------------------------------------- | +| ANDROID_HOME | /Users/runner/Library/Android/sdk | +| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/24.0.8215888 | +| ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | ### Miscellaneous - libXext 1.3.4 From 0f7e5403eb987b81e68f1cd7e36b35828085128a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 26 Jul 2022 17:22:40 +0000 Subject: [PATCH 1349/3485] Updating readme file for macOS-11 version 20220724.1 (#5965) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-11-Readme.md | 53 ++++++++++++++++----------------- 1 file changed, 25 insertions(+), 28 deletions(-) diff --git a/images/macos/macos-11-Readme.md b/images/macos/macos-11-Readme.md index 245bfd93ba9d..475c5aacdfec 100644 --- a/images/macos/macos-11-Readme.md +++ b/images/macos/macos-11-Readme.md @@ -2,13 +2,12 @@ |-| | [[all OSs] Android NDK 21 will be replaced in favor of 25 on August, 1st](https://github.com/actions/virtual-environments/issues/5930) | | [[all OSs] Android ndk-bundle along with old NDK versions will be deprecated on July, 24](https://github.com/actions/virtual-environments/issues/5879) | -| [[Windows, macOS] LLVM will be updated to version 14 on July, 11](https://github.com/actions/virtual-environments/issues/5835) | | [The macOS 10.15 Actions runner image will begin deprecation on 5/31/22 and will be fully unsupported by 8/30/22 in GitHub and by 9/30/22 in ADO](https://github.com/actions/virtual-environments/issues/5583) | *** # macOS 11.6 info -- System Version: macOS 11.6.7 (20G630) +- System Version: macOS 11.6.8 (20G730) - Kernel Version: Darwin 20.6.0 -- Image Version: 20220719.1 +- Image Version: 20220724.1 ## Installed Software ### Language and Runtime @@ -41,7 +40,7 @@ - Carthage 0.38.0 - CocoaPods 1.11.3 - Composer 2.3.10 -- Homebrew 3.5.5 +- Homebrew 3.5.6 - Miniconda 4.12.0 - NPM 8.11.0 - NuGet 6.2.1.2 @@ -49,7 +48,7 @@ - Pip 22.1.1 (python 3.9) - Pipx 1.1.0 - RubyGems 3.3.18 -- Vcpkg 2022 (build from master \<8ff168270>) +- Vcpkg 2022 (build from master \<f93ba152d>) - Yarn 1.22.19 #### Environment variables @@ -67,7 +66,7 @@ ### Utilities - 7-Zip 17.04 - aria2 1.36.0 -- azcopy 10.15.0 +- azcopy 10.16.0 - bazel 5.2.0 - bazelisk 1.12.0 - bsdtar 3.3.2 - available by 'tar' alias @@ -78,7 +77,7 @@ - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.3 - gpg (GnuPG) 2.3.7 -- helm v3.9.1+ga7c043a +- helm v3.9.2+g1addefb - Hub CLI: 2.14.2 - ImageMagick 7.1.0-43 - jq 1.6 @@ -98,7 +97,7 @@ ### Tools - Aliyun CLI 3.0.123 - App Center CLI 2.10.10 -- AWS CLI 2.7.16 +- AWS CLI 2.7.18 - AWS SAM CLI 1.53.0 - AWS Session Manager CLI 1.2.339.0 - Azure CLI (azure-devops) 0.25.0 @@ -120,28 +119,28 @@ - yamllint 1.27.1 ### Browsers -- Safari 15.5 (16613.2.7.1.9) -- SafariDriver 15.5 (16613.2.7.1.9) +- Safari 15.6 (16613.3.9.1.7) +- SafariDriver 15.6 (16613.3.9.1.7) - Google Chrome 103.0.5060.134 -- ChromeDriver 103.0.5060.53 -- Microsoft Edge 103.0.1264.62 -- Microsoft Edge WebDriver 103.0.1264.62 +- ChromeDriver 103.0.5060.134 +- Microsoft Edge 103.0.1264.71 +- Microsoft Edge WebDriver 103.0.1264.71 - Mozilla Firefox 102.0.1 - geckodriver 0.31.0 - Selenium server 4.3.0 #### Environment variables -| Name | Value | -| --------------- | ---------------------------------------------- | -| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/103.0.5060.53 | -| EDGEWEBDRIVER | /usr/local/share/edge_driver | -| GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | +| Name | Value | +| --------------- | ----------------------------------------------- | +| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/103.0.5060.134 | +| EDGEWEBDRIVER | /usr/local/share/edge_driver | +| GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | ### Java | Version | Vendor | Environment Variable | | ------------------- | --------------- | -------------------- | | 8.0.332+9 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | -| 11.0.15+10 | Eclipse Temurin | JAVA_HOME_11_X64 | +| 11.0.16+8 | Eclipse Temurin | JAVA_HOME_11_X64 | | 17.0.3+7 | Eclipse Temurin | JAVA_HOME_17_X64 | ### GraalVM @@ -211,7 +210,7 @@ | Name | Version | ConfigFile | ServiceStatus | ListenPort | | ----- | ------- | ------------------------------- | ------------- | ---------- | | httpd | 2.4.54 | /usr/local/etc/httpd/httpd.conf | none | 80 | -| nginx | 1.23.0 | /usr/local/etc/nginx/nginx.conf | none | 80 | +| nginx | 1.23.1 | /usr/local/etc/nginx/nginx.conf | none | 80 | ### Xamarin #### Visual Studio for Mac @@ -342,17 +341,15 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" | CMake | 3.10.2<br>3.18.1 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 21.4.7075529<br>23.2.8568313 (default)<br>24.0.8215888 | +| NDK | 21.4.7075529<br>23.2.8568313<br>24.0.8215888 | | SDK Patch Applier v4 | 1 | #### Environment variables -| Name | Value | -| ----------------------- | -------------------------------------------------------------------------------------------------- | -| ANDROID_HOME | /Users/runner/Library/Android/sdk | -| ANDROID_NDK_HOME | /Users/runner/Library/Android/sdk/ndk-bundle -> /Users/runner/Library/Android/sdk/ndk/23.2.8568313 | -| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/24.0.8215888 | -| ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk-bundle -> /Users/runner/Library/Android/sdk/ndk/23.2.8568313 | -| ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | +| Name | Value | +| ----------------------- | -------------------------------------------------- | +| ANDROID_HOME | /Users/runner/Library/Android/sdk | +| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/24.0.8215888 | +| ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | ### Miscellaneous - libXext 1.3.4 From f9f1f823745be1640b93562bd6d7e66a51188140 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 27 Jul 2022 11:13:47 +0000 Subject: [PATCH 1350/3485] Updating readme file for macOS-12 version 20220724.1 (#5963) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-12-Readme.md | 68 ++++++++++++++++----------------- 1 file changed, 33 insertions(+), 35 deletions(-) diff --git a/images/macos/macos-12-Readme.md b/images/macos/macos-12-Readme.md index 1d3820e92a27..ac06764c661c 100644 --- a/images/macos/macos-12-Readme.md +++ b/images/macos/macos-12-Readme.md @@ -1,13 +1,13 @@ | Announcements | |-| +| [[all OSs] Android NDK 21 will be replaced in favor of 25 on August, 1st](https://github.com/actions/virtual-environments/issues/5930) | | [[all OSs] Android ndk-bundle along with old NDK versions will be deprecated on July, 24](https://github.com/actions/virtual-environments/issues/5879) | -| [[Windows, macOS] LLVM will be updated to version 14 on July, 11](https://github.com/actions/virtual-environments/issues/5835) | | [The macOS 10.15 Actions runner image will begin deprecation on 5/31/22 and will be fully unsupported by 8/30/22 in GitHub and by 9/30/22 in ADO](https://github.com/actions/virtual-environments/issues/5583) | *** -# macOS 12.4 info -- System Version: macOS 12.4 (21F79) -- Kernel Version: Darwin 21.5.0 -- Image Version: 20220717.1 +# macOS 12.5 info +- System Version: macOS 12.5 (21G72) +- Kernel Version: Darwin 21.6.0 +- Image Version: 20220724.1 ## Installed Software ### Language and Runtime @@ -36,7 +36,7 @@ - Carthage 0.38.0 - CocoaPods 1.11.3 - Composer 2.3.10 -- Homebrew 3.5.4 +- Homebrew 3.5.6 - Miniconda 4.12.0 - NPM 8.11.0 - NuGet 6.2.1.2 @@ -44,7 +44,7 @@ - Pip 22.1.1 (python 3.9) - Pipx 1.1.0 - RubyGems 3.3.18 -- Vcpkg 2022 (build from master \<de176433e>) +- Vcpkg 2022 (build from master \<f93ba152d>) - Yarn 1.22.19 #### Environment variables @@ -62,7 +62,7 @@ ### Utilities - 7-Zip 17.04 - aria2 1.36.0 -- azcopy 10.15.0 +- azcopy 10.16.0 - bazel 5.2.0 - bazelisk 1.12.0 - bsdtar 3.5.1 - available by 'tar' alias @@ -86,13 +86,13 @@ - Subversion (SVN) 1.14.2 - Switchaudio-osx 1.1.0 - Vagrant 2.2.19 -- VirtualBox 6.1.34r150636 +- VirtualBox 6.1.36r152435 - yq (https://github.com/mikefarah/yq/) version 4.26.1 - zstd 1.5.2 ### Tools - App Center CLI 2.10.10 -- AWS CLI 2.7.16 +- AWS CLI 2.7.18 - AWS SAM CLI 1.53.0 - AWS Session Manager CLI 1.2.339.0 - Azure CLI (azure-devops) 0.25.0 @@ -100,7 +100,7 @@ - Bicep CLI 0.8.9 - Cabal 3.6.2.0 - Cmake 3.23.2 -- Fastlane 2.207.0 +- Fastlane 2.208.0 - GHC 9.2.3 - GHCup 0.1.17.8 - Jazzy 0.14.2 @@ -114,28 +114,28 @@ - yamllint 1.27.1 ### Browsers -- Safari 15.5 (17613.2.7.1.8) -- SafariDriver 15.5 (17613.2.7.1.8) -- Google Chrome 103.0.5060.114 -- ChromeDriver 103.0.5060.53 -- Microsoft Edge 103.0.1264.62 -- Microsoft Edge WebDriver 103.0.1264.62 +- Safari 15.6 (17613.3.9.1.5) +- SafariDriver 15.6 (17613.3.9.1.5) +- Google Chrome 103.0.5060.134 +- ChromeDriver 103.0.5060.134 +- Microsoft Edge 103.0.1264.71 +- Microsoft Edge WebDriver 103.0.1264.71 - Mozilla Firefox 102.0.1 - geckodriver 0.31.0 - Selenium server 4.3.0 #### Environment variables -| Name | Value | -| --------------- | ---------------------------------------------- | -| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/103.0.5060.53 | -| EDGEWEBDRIVER | /usr/local/share/edge_driver | -| GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | +| Name | Value | +| --------------- | ----------------------------------------------- | +| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/103.0.5060.134 | +| EDGEWEBDRIVER | /usr/local/share/edge_driver | +| GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | ### Java | Version | Vendor | Environment Variable | | ------------------- | --------------- | -------------------- | | 8.0.332+9 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | -| 11.0.15+10 | Eclipse Temurin | JAVA_HOME_11_X64 | +| 11.0.16+8 | Eclipse Temurin | JAVA_HOME_11_X64 | | 17.0.3+7 | Eclipse Temurin | JAVA_HOME_17_X64 | ### GraalVM @@ -174,9 +174,9 @@ | 1.18.4 | x64 | GOROOT_1_18_X64 | ### Rust Tools -- Cargo 1.62.0 -- Rust 1.62.0 -- Rustdoc 1.62.0 +- Cargo 1.62.1 +- Rust 1.62.1 +- Rustdoc 1.62.1 - Rustup 1.25.1 #### Packages @@ -202,7 +202,7 @@ | Name | Version | ConfigFile | ServiceStatus | ListenPort | | ----- | ------- | ------------------------------- | ------------- | ---------- | | httpd | 2.4.54 | /usr/local/etc/httpd/httpd.conf | none | 80 | -| nginx | 1.23.0 | /usr/local/etc/nginx/nginx.conf | none | 80 | +| nginx | 1.23.1 | /usr/local/etc/nginx/nginx.conf | none | 80 | ### Xamarin #### Visual Studio for Mac @@ -302,17 +302,15 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" | CMake | 3.18.1 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 21.4.7075529<br>23.2.8568313 (default)<br>24.0.8215888 | +| NDK | 21.4.7075529<br>23.2.8568313<br>24.0.8215888 | | SDK Patch Applier v4 | 1 | #### Environment variables -| Name | Value | -| ----------------------- | -------------------------------------------------------------------------------------------------- | -| ANDROID_HOME | /Users/runner/Library/Android/sdk | -| ANDROID_NDK_HOME | /Users/runner/Library/Android/sdk/ndk-bundle -> /Users/runner/Library/Android/sdk/ndk/23.2.8568313 | -| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/24.0.8215888 | -| ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk-bundle -> /Users/runner/Library/Android/sdk/ndk/23.2.8568313 | -| ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | +| Name | Value | +| ----------------------- | -------------------------------------------------- | +| ANDROID_HOME | /Users/runner/Library/Android/sdk | +| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/24.0.8215888 | +| ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | ### Miscellaneous - libXext 1.3.4 From 72b53f53debf88937bcae487d3448486a5bb0686 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Wed, 27 Jul 2022 13:56:25 +0200 Subject: [PATCH 1351/3485] Create symlink for mongodb@5.0 (#5972) --- images/macos/provision/core/mongodb.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/images/macos/provision/core/mongodb.sh b/images/macos/provision/core/mongodb.sh index a8522e56b95b..0b6b32a944c8 100644 --- a/images/macos/provision/core/mongodb.sh +++ b/images/macos/provision/core/mongodb.sh @@ -11,4 +11,8 @@ versionToInstall=$(brew search --formulae /mongodb-community@$toolsetVersion/ | echo "Installing mongodb $versionToInstall" brew_smart_install "$versionToInstall" +if ! which mongo ; then + brew link "$versionToInstall" +fi + invoke_tests "Databases" "MongoDB" From afa73a0f102694246816fcd7935d9adf1b851380 Mon Sep 17 00:00:00 2001 From: Dusko Dobranic <101048884+ddobranic@users.noreply.github.com> Date: Wed, 27 Jul 2022 15:40:35 +0200 Subject: [PATCH 1352/3485] [Ubuntu] Add Cmake 3.22.1 for Android (#5973) --- images/linux/toolsets/toolset-1804.json | 3 ++- images/linux/toolsets/toolset-2004.json | 3 ++- images/linux/toolsets/toolset-2204.json | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index d8f795391f68..9c268c2edc98 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -102,7 +102,8 @@ ], "additional_tools": [ "cmake;3.10.2.4988404", - "cmake;3.18.1" + "cmake;3.18.1", + "cmake;3.22.1" ], "ndk": { "versions": [ diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index edc7b35c7b65..1e8568e29fbe 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -99,7 +99,8 @@ ], "additional_tools": [ "cmake;3.10.2.4988404", - "cmake;3.18.1" + "cmake;3.18.1", + "cmake;3.22.1" ], "ndk": { "versions": [ diff --git a/images/linux/toolsets/toolset-2204.json b/images/linux/toolsets/toolset-2204.json index 701cf3b3346d..c1beb9f8d5b5 100644 --- a/images/linux/toolsets/toolset-2204.json +++ b/images/linux/toolsets/toolset-2204.json @@ -85,7 +85,8 @@ ], "additional_tools": [ "cmake;3.10.2.4988404", - "cmake;3.18.1" + "cmake;3.18.1", + "cmake;3.22.1" ], "ndk": { "versions": [ From 1711b3f569752f267ee7635ae901a62dbeaa8d63 Mon Sep 17 00:00:00 2001 From: Dusko Dobranic <101048884+ddobranic@users.noreply.github.com> Date: Wed, 27 Jul 2022 17:11:10 +0200 Subject: [PATCH 1353/3485] [Windows] Add Cmake 3.22.1 for Android (#5974) --- images/win/toolsets/toolset-2019.json | 1 + images/win/toolsets/toolset-2022.json | 1 + 2 files changed, 2 insertions(+) diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index a23aa3c80d4b..3024b66eca07 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -180,6 +180,7 @@ "additional_tools": [ "cmake;3.10.2.4988404", "cmake;3.18.1", + "cmake;3.22.1", "patcher;v4" ], "ndk": { diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index aa3094db3b80..43c5618dff52 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -150,6 +150,7 @@ "addon_list": [], "additional_tools": [ "cmake;3.18.1", + "cmake;3.22.1", "patcher;v4" ], "ndk": { From 394c19d40893ca8bf8903e7f845e5ab4a42222e5 Mon Sep 17 00:00:00 2001 From: Dusko Dobranic <101048884+ddobranic@users.noreply.github.com> Date: Wed, 27 Jul 2022 19:30:22 +0200 Subject: [PATCH 1354/3485] [macOS] Add Cmake 3.22.1 for Android (#5975) --- images/macos/toolsets/toolset-11.json | 3 ++- images/macos/toolsets/toolset-12.json | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index 9b0ad6b10916..290542b79ddd 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -174,7 +174,8 @@ "addon-list": [], "additional-tools": [ "cmake;3.10.2.4988404", - "cmake;3.18.1" + "cmake;3.18.1", + "cmake;3.22.1" ], "ndk": { "versions": [ diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index 457154206ee2..a098a1e0c63d 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -109,7 +109,8 @@ ], "addon-list": [], "additional-tools": [ - "cmake;3.18.1" + "cmake;3.18.1", + "cmake;3.22.1" ], "ndk": { "versions": [ From cd98711e9dbb26c69b8cfc9ebbec182d8e899f4c Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Thu, 28 Jul 2022 18:08:57 +0400 Subject: [PATCH 1355/3485] Add ndk-related environment variables to ubuntu (#5983) --- .../scripts/SoftwareReport/SoftwareReport.Android.psm1 | 10 ++++++++-- images/linux/scripts/installers/android.sh | 7 +++++++ images/linux/toolsets/toolset-1804.json | 1 + images/linux/toolsets/toolset-2004.json | 1 + images/linux/toolsets/toolset-2204.json | 1 + 5 files changed, 18 insertions(+), 2 deletions(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Android.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Android.psm1 index 2c84696c4583..b7ce2b8e15f9 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Android.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Android.psm1 @@ -156,13 +156,19 @@ function Get-AndroidGoogleAPIsVersions { function Get-AndroidNDKVersions { $ndkFolderPath = Join-Path (Get-AndroidSDKRoot) "ndk" $versions = Get-ChildItem -Path $ndkFolderPath -Name - return ($versions | Join-String -Separator "<br>") + $ndkDefaultVersion = Get-ToolsetValue "android.ndk.default" + $ndkDefaultFullVersion = Get-ChildItem "$env:ANDROID_HOME/ndk/$ndkDefaultVersion.*" -Name | Select-Object -Last 1 + + return ($versions | ForEach-Object { + $defaultPostfix = ( $_ -eq $ndkDefaultFullVersion ) ? " (default)" : "" + $_ + $defaultPostfix + } | Join-String -Separator "<br>") } function Build-AndroidEnvironmentTable { $androidVersions = Get-Item env:ANDROID_* - $shouldResolveLink = 'ANDROID_NDK_LATEST_HOME' + $shouldResolveLink = 'ANDROID_NDK', 'ANDROID_NDK_HOME', 'ANDROID_NDK_ROOT', 'ANDROID_NDK_LATEST_HOME' return $androidVersions | Sort-Object -Property Name | ForEach-Object { [PSCustomObject] @{ "Name" = $_.Name diff --git a/images/linux/scripts/installers/android.sh b/images/linux/scripts/installers/android.sh index 1d5d3d7eacd6..1a34bf2f0ff2 100644 --- a/images/linux/scripts/installers/android.sh +++ b/images/linux/scripts/installers/android.sh @@ -84,6 +84,7 @@ extras=$(get_toolset_value '.android.extra_list[]|"extras;" + .') addons=$(get_toolset_value '.android.addon_list[]|"add-ons;" + .') additional=$(get_toolset_value '.android.additional_tools[]') ANDROID_NDK_MAJOR_VERSIONS=($(get_toolset_value '.android.ndk.versions[]')) +ANDROID_NDK_MAJOR_DEFAULT=$(get_toolset_value '.android.ndk.default') components=("${extras[@]}" "${addons[@]}" "${additional[@]}") for ndk_version in "${ANDROID_NDK_MAJOR_VERSIONS[@]}" @@ -93,7 +94,13 @@ do done ANDROID_NDK_MAJOR_LATEST=(${ANDROID_NDK_MAJOR_VERSIONS[-1]}) +ndkDefaultFullVersion=$(get_full_ndk_version $ANDROID_NDK_MAJOR_DEFAULT) ndkLatestFullVersion=$(get_full_ndk_version $ANDROID_NDK_MAJOR_LATEST) +ANDROID_NDK="$ANDROID_SDK_ROOT/ndk/$ndkDefaultFullVersion" +# ANDROID_NDK, ANDROID_NDK_HOME, and ANDROID_NDK_LATEST_HOME variables should be set as many customer builds depend on them https://github.com/actions/virtual-environments/issues/5879 +echo "ANDROID_NDK=${ANDROID_NDK}" | tee -a /etc/environment +echo "ANDROID_NDK_HOME=${ANDROID_NDK}" | tee -a /etc/environment +echo "ANDROID_NDK_ROOT=${ANDROID_NDK}" | tee -a /etc/environment echo "ANDROID_NDK_LATEST_HOME=$ANDROID_SDK_ROOT/ndk/$ndkLatestFullVersion" | tee -a /etc/environment availablePlatforms=($($SDKMANAGER --list | sed -n '/Available Packages:/,/^$/p' | grep "platforms;android-[0-9]" | cut -d"|" -f 1)) diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index 9c268c2edc98..264c6d96acc3 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -106,6 +106,7 @@ "cmake;3.22.1" ], "ndk": { + "default": "25", "versions": [ "23", "24", "25" ] diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index 1e8568e29fbe..9ec9940b2277 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -103,6 +103,7 @@ "cmake;3.22.1" ], "ndk": { + "default": "25", "versions": [ "23", "24", "25" ] diff --git a/images/linux/toolsets/toolset-2204.json b/images/linux/toolsets/toolset-2204.json index c1beb9f8d5b5..1b8f528b2494 100644 --- a/images/linux/toolsets/toolset-2204.json +++ b/images/linux/toolsets/toolset-2204.json @@ -89,6 +89,7 @@ "cmake;3.22.1" ], "ndk": { + "default": "25", "versions": [ "23", "24", "25" ] From 1c6ef2dda5205bcf5bb9786a3a687084057339d3 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Fri, 29 Jul 2022 10:50:39 +0400 Subject: [PATCH 1356/3485] Add ndk-related environment variables (#5984) --- images/macos/provision/core/android-toolsets.sh | 7 +++++++ .../macos/software-report/SoftwareReport.Android.psm1 | 10 ++++++++-- images/macos/toolsets/toolset-10.15.json | 1 + images/macos/toolsets/toolset-11.json | 1 + images/macos/toolsets/toolset-12.json | 1 + 5 files changed, 18 insertions(+), 2 deletions(-) diff --git a/images/macos/provision/core/android-toolsets.sh b/images/macos/provision/core/android-toolsets.sh index c20dc7d77dec..ff5362fc49af 100755 --- a/images/macos/provision/core/android-toolsets.sh +++ b/images/macos/provision/core/android-toolsets.sh @@ -32,6 +32,7 @@ ANDROID_EXTRA_LIST=($(get_toolset_value '.android."extra-list"[]')) ANDROID_ADDON_LIST=($(get_toolset_value '.android."addon-list"[]')) ANDROID_ADDITIONAL_TOOLS=($(get_toolset_value '.android."additional-tools"[]')) ANDROID_NDK_MAJOR_VERSIONS=($(get_toolset_value '.android.ndk."versions"[]')) +ANDROID_NDK_MAJOR_DEFAULT=$(get_toolset_value '.android.ndk.default') ANDROID_NDK_MAJOR_LATEST=$(get_toolset_value '.android.ndk."versions"[-1]') # Get the latest command line tools from https://developer.android.com/studio#cmdline-tools cmdlineToolsVersion=$(get_toolset_value '.android."cmdline-tools"') @@ -81,8 +82,14 @@ do echo y | $SDKMANAGER "ndk;$ndk_full_version" done +ndkDefault=$(get_full_ndk_version $ANDROID_NDK_MAJOR_DEFAULT) +ANDROID_NDK_HOME=$ANDROID_HOME/ndk/$ndkDefault ndkLatest=$(get_full_ndk_version $ANDROID_NDK_MAJOR_LATEST) ANDROID_NDK_LATEST_HOME=$ANDROID_HOME/ndk/$ndkLatest +# ANDROID_NDK, ANDROID_NDK_HOME, and ANDROID_NDK_LATEST_HOME variables should be set as many customer builds depend on them https://github.com/actions/virtual-environments/issues/5879 +echo "export ANDROID_NDK=$ANDROID_NDK_HOME" >> "${HOME}/.bashrc" +echo "export ANDROID_NDK_HOME=$ANDROID_NDK_HOME" >> "${HOME}/.bashrc" +echo "export ANDROID_NDK_ROOT=$ANDROID_NDK_HOME" >> "${HOME}/.bashrc" echo "export ANDROID_NDK_LATEST_HOME=$ANDROID_NDK_LATEST_HOME" >> "${HOME}/.bashrc" availablePlatforms=($($SDKMANAGER --list | grep "platforms;android-[0-9]" | cut -d"|" -f 1 | sort -u)) diff --git a/images/macos/software-report/SoftwareReport.Android.psm1 b/images/macos/software-report/SoftwareReport.Android.psm1 index 97b961483a9e..e2db090fd229 100644 --- a/images/macos/software-report/SoftwareReport.Android.psm1 +++ b/images/macos/software-report/SoftwareReport.Android.psm1 @@ -96,7 +96,7 @@ function Build-AndroidTable { function Build-AndroidEnvironmentTable { $androidVersions = Get-Item env:ANDROID_* - $shoulddResolveLink = 'ANDROID_NDK_LATEST_HOME' + $shoulddResolveLink = 'ANDROID_NDK', 'ANDROID_NDK_HOME', 'ANDROID_NDK_ROOT', 'ANDROID_NDK_LATEST_HOME' return $androidVersions | Sort-Object -Property Name | ForEach-Object { [PSCustomObject] @{ "Name" = $_.Name @@ -177,7 +177,13 @@ function Get-AndroidGoogleAPIsVersions { function Get-AndroidNDKVersions { $ndkFolderPath = Join-Path (Get-AndroidSDKRoot) "ndk" $versions += Get-ChildItem -Path $ndkFolderPath -Name - return ($versions | Join-String -Separator "<br>") + $ndkDefaultVersion = Get-ToolsetValue "android.ndk.default" + $ndkDefaultFullVersion = Get-ChildItem "$env:ANDROID_HOME/ndk/$ndkDefaultVersion.*" -Name | Select-Object -Last 1 + + return ($versions | ForEach-Object { + $defaultPostfix = ( $_ -eq $ndkDefaultFullVersion ) ? " (default)" : "" + $_ + $defaultPostfix + } | Join-String -Separator "<br>") } function Get-IntelHaxmVersion { diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index 76e6810da727..a31f1c612385 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -179,6 +179,7 @@ "cmake;3.18.1" ], "ndk": { + "default": "25", "versions": [ "23", "24", "25" ] diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index 290542b79ddd..c79617d6d3a0 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -178,6 +178,7 @@ "cmake;3.22.1" ], "ndk": { + "default": "25", "versions": [ "23", "24", "25" ] diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index a098a1e0c63d..a2473b211299 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -113,6 +113,7 @@ "cmake;3.22.1" ], "ndk": { + "default": "25", "versions": [ "23", "24", "25" ] From 77dfaa7c15f613223e00a56440040c537bdf206b Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Fri, 29 Jul 2022 13:08:30 +0400 Subject: [PATCH 1357/3485] Add ndk-related environment variables to windows (#5985) --- images/win/scripts/Installers/Install-AndroidSDK.ps1 | 7 +++++++ .../scripts/SoftwareReport/SoftwareReport.Android.psm1 | 10 ++++++++-- images/win/toolsets/toolset-2019.json | 1 + images/win/toolsets/toolset-2022.json | 1 + 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/images/win/scripts/Installers/Install-AndroidSDK.ps1 b/images/win/scripts/Installers/Install-AndroidSDK.ps1 index 0401f4768d47..dbf2508f331d 100644 --- a/images/win/scripts/Installers/Install-AndroidSDK.ps1 +++ b/images/win/scripts/Installers/Install-AndroidSDK.ps1 @@ -109,6 +109,7 @@ Install-AndroidSDKPackages -AndroidSDKManagerPath $sdkManager ` # NDKs $ndkMajorVersions = $androidToolset.ndk.versions +$ndkDefaultMajorVersion = $androidToolset.ndk.default $ndkLatestMajorVersion = $ndkMajorVersions | Select-Object -Last 1 $androidNDKs = $ndkMajorVersions | Foreach-Object { @@ -120,10 +121,16 @@ Install-AndroidSDKPackages -AndroidSDKManagerPath $sdkManager ` -AndroidPackages $androidNDKs $ndkLatestVersion = ($androidNDKs | Where-Object { $_ -match "ndk;$ndkLatestMajorVersion" }).Split(';')[1] +$ndkDefaultVersion = ($androidNDKs | Where-Object { $_ -match "ndk;$ndkDefaultMajorVersion" }).Split(';')[1] +$ndkRoot = "$sdkRoot\ndk\$ndkDefaultVersion" # Create env variables setx ANDROID_HOME $sdkRoot /M setx ANDROID_SDK_ROOT $sdkRoot /M +# ANDROID_NDK, ANDROID_NDK_HOME, and ANDROID_NDK_LATEST_HOME variables should be set as many customer builds depend on them https://github.com/actions/virtual-environments/issues/5879 +setx ANDROID_NDK $ndkRoot /M +setx ANDROID_NDK_HOME $ndkRoot /M +setx ANDROID_NDK_ROOT $ndkRoot /M $ndkLatestPath = "$sdkRoot\ndk\$ndkLatestVersion" if (Test-Path $ndkLatestPath) { diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Android.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Android.psm1 index 404929c464af..ac614dd07e4a 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Android.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Android.psm1 @@ -164,8 +164,14 @@ function Get-AndroidNdkVersions { [object] $PackageInfo ) + $ndkDefaultFullVersion = Get-ChildItem $env:ANDROID_NDK_HOME -Name + $versions = $packageInfo | Where-Object { $_ -Match "ndk;" } | ForEach-Object { - (Split-TableRowByColumns $_)[1] + $version = (Split-TableRowByColumns $_)[1] + if ($version -eq $ndkDefaultFullVersion) { + $version += " (default)" + } + $version } return ($versions -Join "<br>") } @@ -173,7 +179,7 @@ function Get-AndroidNdkVersions { function Build-AndroidEnvironmentTable { $androidVersions = Get-Item env:ANDROID_* - $shoulddResolveLink = 'ANDROID_NDK_LATEST_HOME' + $shoulddResolveLink = 'ANDROID_NDK', 'ANDROID_NDK_HOME', 'ANDROID_NDK_ROOT', 'ANDROID_NDK_LATEST_HOME' return $androidVersions | Sort-Object -Property Name | ForEach-Object { [PSCustomObject] @{ "Name" = $_.Name diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index 3024b66eca07..9fcb2215398e 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -184,6 +184,7 @@ "patcher;v4" ], "ndk": { + "default": "25", "versions": [ "23", "24", "25" ] diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index 43c5618dff52..3b99dd55cc49 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -154,6 +154,7 @@ "patcher;v4" ], "ndk": { + "default": "25", "versions": [ "23", "24", "25" ] From 493f3c3ee19fc6f2f5456b1f8563f77f0096c3e1 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Fri, 29 Jul 2022 22:13:23 +0400 Subject: [PATCH 1358/3485] [windows] Add exe installation of MicrosoftAnalysisServices Visual Studio extension (#5989) * Add exe installation of MicrosoftAnalysisServices * Change condition to check FileName.EndsWith --- images/win/scripts/ImageHelpers/InstallHelpers.ps1 | 5 +++++ images/win/scripts/Installers/Install-Vsix.ps1 | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/images/win/scripts/ImageHelpers/InstallHelpers.ps1 b/images/win/scripts/ImageHelpers/InstallHelpers.ps1 index 7ceb718a6a96..e898be5c5239 100644 --- a/images/win/scripts/ImageHelpers/InstallHelpers.ps1 +++ b/images/win/scripts/ImageHelpers/InstallHelpers.ps1 @@ -249,6 +249,11 @@ function Get-VsixExtenstionFromMarketplace { $fileName = "Microsoft.DataTools.AnalysisServices.vsix" $downloadUri = "https://download.microsoft.com/download/c/8/9/c896a7f2-d0fd-45ac-90e6-ff61f67523cb/Microsoft.DataTools.AnalysisServices.vsix" } + # Starting from version 4.1 SqlServerIntegrationServicesProjects extension is distributed as exe file + "SSIS.SqlServerIntegrationServicesProjects" { + $fileName = "Microsoft.DataTools.IntegrationServices.exe" + $downloadUri = $assetUri + "/" + $fileName + } } return [PSCustomObject] @{ diff --git a/images/win/scripts/Installers/Install-Vsix.ps1 b/images/win/scripts/Installers/Install-Vsix.ps1 index 405a4562b47b..439fb291fdf2 100644 --- a/images/win/scripts/Installers/Install-Vsix.ps1 +++ b/images/win/scripts/Installers/Install-Vsix.ps1 @@ -14,7 +14,12 @@ $vsVersion = $toolset.visualStudio.Version $vsixPackagesList | ForEach-Object { # Retrieve cdn endpoint to avoid HTTP error 429 https://github.com/actions/virtual-environments/issues/3074 $vsixPackage = Get-VsixExtenstionFromMarketplace -ExtensionMarketPlaceName $_ - Install-VsixExtension -Url $vsixPackage.DownloadUri -Name $vsixPackage.FileName -VSversion $vsVersion + if ($vsixPackage.FileName.EndsWith(".vsix")) { + Install-VsixExtension -Url $vsixPackage.DownloadUri -Name $vsixPackage.FileName -VSversion $vsVersion + } else { + $argumentList = ('/install', '/quiet', '/norestart') + Install-Binary -Url $vsixPackage.DownloadUri -Name $vsixPackage.FileName -ArgumentList $argumentList + } } Invoke-PesterTests -TestFile "Vsix" \ No newline at end of file From 8c24b03a8df7e9923c69a4b1aed4313cf7679c20 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Mon, 1 Aug 2022 15:35:36 +0200 Subject: [PATCH 1359/3485] Remove Windows Server 2016 related code from the repository (#5994) --- CONTRIBUTING.md | 4 +- README.md | 2 - docs/create-image-and-azure-resources.md | 4 +- helpers/GenerateResourcesAndImage.ps1 | 6 +- .../azure-pipelines/windows2016.yml | 20 - images/win/Windows2016-Readme.md | 597 ------------------ .../scripts/ImageHelpers/ImageHelpers.psm1 | 1 - .../scripts/ImageHelpers/InstallHelpers.ps1 | 5 - .../Installers/Configure-Antivirus.ps1 | 10 +- .../scripts/Installers/Configure-Shell.ps1 | 8 +- .../scripts/Installers/Install-DotnetSDK.ps1 | 2 +- images/win/scripts/Installers/Install-Git.ps1 | 4 - .../scripts/Installers/Install-VCRedist.ps1 | 23 +- images/win/scripts/Installers/Install-WDK.ps1 | 9 +- .../scripts/Installers/Update-ImageData.ps1 | 6 +- .../Installers/Windows2016/Install-SSDT.ps1 | 19 - .../Windows2016/Install-Win81SDK.ps1 | 10 - .../SoftwareReport/SoftwareReport.Common.psm1 | 2 +- .../SoftwareReport.Generator.ps1 | 12 +- .../SoftwareReport.VisualStudio.psm1 | 16 +- images/win/scripts/Tests/MSYS2.Tests.ps1 | 2 +- images/win/scripts/Tests/Tools.Tests.ps1 | 10 +- .../win/scripts/Tests/VisualStudio.Tests.ps1 | 2 +- .../scripts/Tests/WindowsFeatures.Tests.ps1 | 2 +- images/win/toolsets/toolset-2016.json | 454 ------------- images/win/windows2016.json | 322 ---------- 26 files changed, 36 insertions(+), 1516 deletions(-) delete mode 100644 images.CI/linux-and-win/azure-pipelines/windows2016.yml delete mode 100644 images/win/Windows2016-Readme.md delete mode 100644 images/win/scripts/Installers/Windows2016/Install-SSDT.ps1 delete mode 100644 images/win/scripts/Installers/Windows2016/Install-Win81SDK.ps1 delete mode 100644 images/win/toolsets/toolset-2016.json delete mode 100644 images/win/windows2016.json diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 56e49a81d36e..6e8f00214300 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -32,13 +32,13 @@ Here are a few things you can do that will increase the likelihood of your pull ### General rules - For every new tool add validation scripts and update software report script to make sure that it is included to documentation - If the tool is available in other platforms (macOS, Windows, Linux), make sure you include it in as many as possible. -- If installing a few versions of the tool, consider putting the list of versions in the corresponding `toolset.json` file. It will help other customers to configure their builds flexibly. See [toolset-windows-2016.json](images/win/toolsets/toolset-2019.json) as example. +- If installing a few versions of the tool, consider putting the list of versions in the corresponding `toolset.json` file. It will help other customers to configure their builds flexibly. See [toolset-windows-2019.json](images/win/toolsets/toolset-2019.json) as example. - Use consistent naming across all files - Validation scripts should be simple and shouldn't change image content ### Windows - Add a script that will install the tool and put the script in the `scripts/Installers` folder. -There are a bunch of helper functions that could simplify your code: `Choco-Install`, `Install-Binary`, `Install-VsixExtension`, `Start-DownloadWithRetry`, `Test-IsWin16`, `Test-IsWin19` (find the full list of helpers in [ImageHelpers.psm1](images/win/scripts/ImageHelpers/ImageHelpers.psm1)). +There are a bunch of helper functions that could simplify your code: `Choco-Install`, `Install-Binary`, `Install-VsixExtension`, `Start-DownloadWithRetry`, `Test-IsWin19`, `Test-IsWin22` (find the full list of helpers in [ImageHelpers.psm1](images/win/scripts/ImageHelpers/ImageHelpers.psm1)). - Add a script that will validate the tool installation and put the script in the `scripts/Tests` folder. We use [Pester v5](https://github.com/pester/pester) for validation scripts. If the tests for the tool are complex enough, create a separate `*.Tests.ps1`. Otherwise, use `Tools.Tests.ps1` for simple tests. Add `Invoke-PesterTests -TestFile <testFileName> [-TestName <describeName>]` at the end of the installation script to make sure that your tests will be run. diff --git a/README.md b/README.md index cbaf5b367430..2a7f37c2acd5 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,6 @@ For general questions about using the virtual environments or writing your Actio | macOS 10.15 <sup>deprecated</sup> | `macos-10.15` | [macOS-10.15] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-10.15&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-10.15&redirect=1) | Windows Server 2022 | `windows-latest` or `windows-2022` | [windows-2022] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=windows-2022&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=windows-2022&redirect=1) | | Windows Server 2019 | `windows-2019` | [windows-2019] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=windows-2019&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=windows-2019&redirect=1) -| Windows Server 2016 | `windows-2016` | [windows-2016] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=windows-2016&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=windows-2016&redirect=1) <b>Note:</b> Beta and Preview images are provided "as-is", "with all faults" and "as available" and are excluded from the service level agreement and warranty. Beta and Preview images may not be covered by customer support. @@ -54,7 +53,6 @@ You can also track upcoming changes using the [awaiting-deployment](https://gith [ubuntu-18.04]: https://github.com/actions/virtual-environments/blob/main/images/linux/Ubuntu1804-Readme.md [windows-2022]: https://github.com/actions/virtual-environments/blob/main/images/win/Windows2022-Readme.md [windows-2019]: https://github.com/actions/virtual-environments/blob/main/images/win/Windows2019-Readme.md -[windows-2016]: https://github.com/actions/virtual-environments/blob/main/images/win/Windows2016-Readme.md [macOS-11]: https://github.com/actions/virtual-environments/blob/main/images/macos/macos-11-Readme.md [macOS-12]: https://github.com/actions/virtual-environments/blob/main/images/macos/macos-12-Readme.md [macOS-10.15]: https://github.com/actions/virtual-environments/blob/main/images/macos/macos-10.15-Readme.md diff --git a/docs/create-image-and-azure-resources.md b/docs/create-image-and-azure-resources.md index 985b439f076b..b9a3446fe184 100644 --- a/docs/create-image-and-azure-resources.md +++ b/docs/create-image-and-azure-resources.md @@ -1,5 +1,5 @@ # Virtual-Environments -The virtual-environments project uses [Packer](https://www.packer.io/) to generate disk images for the following platforms: Windows 2016/2019/2022, Ubuntu 18.04/20.04. +The virtual-environments project uses [Packer](https://www.packer.io/) to generate disk images for the following platforms: Windows 2019/2022, Ubuntu 18.04/20.04/22.04. Each image is configured through a JSON template that Packer understands and which specifies where to build the image (Azure in this case), and what scripts to run to install software and prepare the disk. The Packer process initializes a connection to Azure subscription via Azure CLI, and automatically creates the temporary Azure resources required to build the source VM(temporary resource group, network interfaces, and VM from the "clean" image specified in the template). If the VM deployment succeeds, the build agent connects to the VM and starts to execute installation steps from the JSON template. @@ -66,7 +66,7 @@ Where: - `SubscriptionId` - The Azure subscription Id where resources will be created. - `ResourceGroupName` - The Azure resource group name where the Azure resources will be created. - `ImageGenerationRepositoryRoot` - The root path of the image generation repository source. -- `ImageType` - The type of the image being generated. Valid options are: "Windows2016", "Windows2019", "Windows2022", "Ubuntu1804", "Ubuntu2004", "Ubuntu2204". +- `ImageType` - The type of the image being generated. Valid options are: "Windows2019", "Windows2022", "Ubuntu1804", "Ubuntu2004", "Ubuntu2204". - `AzureLocation` - The location of the resources being created in Azure. For example "East US". The function automatically creates all required Azure resources and kicks off packer image generation for the selected image type. diff --git a/helpers/GenerateResourcesAndImage.ps1 b/helpers/GenerateResourcesAndImage.ps1 index f51c6cf0ac17..f964e7670621 100644 --- a/helpers/GenerateResourcesAndImage.ps1 +++ b/helpers/GenerateResourcesAndImage.ps1 @@ -1,7 +1,6 @@ $ErrorActionPreference = 'Stop' enum ImageType { - Windows2016 = 0 Windows2019 = 1 Windows2022 = 2 Ubuntu1804 = 3 @@ -18,9 +17,6 @@ Function Get-PackerTemplatePath { ) switch ($ImageType) { - ([ImageType]::Windows2016) { - $relativeTemplatePath = Join-Path "win" "windows2016.json" - } ([ImageType]::Windows2019) { $relativeTemplatePath = Join-Path "win" "windows2019.json" } @@ -71,7 +67,7 @@ Function GenerateResourcesAndImage { .PARAMETER ImageGenerationRepositoryRoot The root path of the image generation repository source. .PARAMETER ImageType - The type of the image being generated. Valid options are: {"Windows2016", "Windows2019", "Windows2022", "Ubuntu1804", "Ubuntu2004"}. + The type of the image being generated. Valid options are: {"Windows2019", "Windows2022", "Ubuntu1804", "Ubuntu2004", "Ubuntu2204"}. .PARAMETER AzureLocation The location of the resources being created in Azure. For example "East US". .PARAMETER Force diff --git a/images.CI/linux-and-win/azure-pipelines/windows2016.yml b/images.CI/linux-and-win/azure-pipelines/windows2016.yml deleted file mode 100644 index 0220a38f2211..000000000000 --- a/images.CI/linux-and-win/azure-pipelines/windows2016.yml +++ /dev/null @@ -1,20 +0,0 @@ -schedules: -- cron: "0 0 * * *" - displayName: Daily - branches: - include: - - main - always: true - -trigger: none -pr: - autoCancel: true - branches: - include: - - main - -jobs: -- template: image-generation.yml - parameters: - image_type: windows2016 - image_readme_name: Windows2016-Readme.md \ No newline at end of file diff --git a/images/win/Windows2016-Readme.md b/images/win/Windows2016-Readme.md deleted file mode 100644 index a8619806615c..000000000000 --- a/images/win/Windows2016-Readme.md +++ /dev/null @@ -1,597 +0,0 @@ -| Announcements | -|-| -| [windows-latest workflows will use Windows Server 2022](https://github.com/actions/virtual-environments/issues/4856) | -| [Windows-2016 environment will be removed on March 15, 2022](https://github.com/actions/virtual-environments/issues/4312) | -*** -# Microsoft Windows Server 2016 Datacenter -- OS Version: 10.0.14393 Build 4946 -- Image Version: 20220306.1 - -## Installed Software -### Language and Runtime -- Bash 4.4.23(2)-release -- Go 1.15.15 -- Julia 1.7.2 -- Kotlin 1.6.10 -- LLVM 13.0.1 -- Node 16.14.0 -- Perl 5.32.1 -- PHP 8.1.3 -- Python 3.7.9 -- Ruby 2.5.9p229 - -### Package Management -- Chocolatey 0.12.1 -- Composer 2.2.7 -- Helm 3.8.0 -- Miniconda 4.11.0 (pre-installed on the image but not added to PATH) -- NPM 8.3.1 -- NuGet 6.1.0.106 -- pip 22.0.3 (python 3.7) -- Pipx 1.0.0 -- RubyGems 2.7.6.3 -- Vcpkg (build from master \<bd602277b>) -- Yarn 1.22.17 - -#### Environment variables -| Name | Value | -| ----------------------- | ------------ | -| VCPKG_INSTALLATION_ROOT | C:\vcpkg | -| CONDA | C:\Miniconda | - -### Project Management -- Ant 1.10.12 -- Gradle 7.4 -- Maven 3.8.4 -- sbt 1.6.2 - -### Tools -- 7zip 21.07 -- aria2 1.36.0 -- azcopy 10.14.0 -- Bazel 5.0.0 -- Bazelisk 1.11.0 -- Bicep 0.4.1272 -- Cabal 3.6.2.0 -- CMake 3.22.3 -- CodeQL Action Bundle 2.8.1 -- Docker 20.10.7 -- Docker-compose 1.29.2 -- Docker-wincred 0.6.4 -- ghc 9.2.1 -- Git 2.35.1.windows.2 -- Git LFS 3.0.2 -- Google Cloud SDK 375.0.0 -- InnoSetup 6.2.0 -- jq 1.6 -- Kind 0.11.1 -- Kubectl 1.23.4 -- Mercurial 5.0 -- Mingw-w64 8.1.0 -- Newman 5.3.2 -- NSIS v3.08 -- OpenSSL 1.1.1 -- Packer 1.7.10 -- Parcel 2.3.2 -- Pulumi v3.25.1 -- R 4.1.2 -- Service Fabric SDK 8.2.1486.9590 -- Stack 2.7.5 -- Subversion (SVN) 1.14.1 -- Swig 4.0.2 -- VSWhere 3.0.1 -- WinAppDriver 1.2.2009.02003 -- WiX Toolset v3.11.2.4516 -- yamllint 1.26.3 -- zstd 1.5.2 - -### CLI Tools -- Alibaba Cloud CLI 3.0.110 -- AWS CLI 2.4.23 -- AWS SAM CLI 1.40.1 -- AWS Session Manager CLI 1.2.295.0 -- Azure CLI 2.34.1 -- Azure DevOps CLI extension 0.23.0 -- Cloud Foundry CLI 6.53.0 -- GitHub CLI 2.5.2 -- Hub CLI 2.14.2 - -### Rust Tools -- Cargo 1.59.0 -- Rust 1.59.0 -- Rustdoc 1.59.0 -- Rustup 1.24.3 - -#### Packages -- bindgen 0.59.2 -- cargo-audit 0.16.0 -- cargo-outdated 0.11.0 -- cbindgen 0.20.0 -- Clippy 0.1.59 -- Rustfmt 1.4.38 - -### Browsers and webdrivers -- Google Chrome 99.0.4844.51 -- Chrome Driver 99.0.4844.51 -- Microsoft Edge 99.0.1150.30 -- Microsoft Edge Driver 99.0.1150.30 -- Mozilla Firefox 97.0.2 -- Gecko Driver 0.30.0 -- IE Driver 3.150.1.1 -- Selenium server 4.1.0 - -#### Environment variables -| Name | Value | -| ----------------- | ---------------------------------- | -| CHROMEWEBDRIVER | C:\SeleniumWebDrivers\ChromeDriver | -| EDGEWEBDRIVER | C:\SeleniumWebDrivers\EdgeDriver | -| GECKOWEBDRIVER | C:\SeleniumWebDrivers\GeckoDriver | -| SELENIUM_JAR_PATH | C:\selenium\selenium-server.jar | - -### Java -| Version | Vendor | Environment Variable | -| ------------------- | --------------- | -------------------- | -| 8.0.322+6 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | -| 11.0.14+101 | Eclipse Temurin | JAVA_HOME_11_X64 | -| 13.0.2+8.1 | Adopt OpenJDK | JAVA_HOME_13_X64 | -| 17.0.2+8 | Eclipse Temurin | JAVA_HOME_17_X64 | - -### Shells -| Name | Target | -| ------------- | --------------------------------- | -| gitbash.exe | C:\Program Files\Git\bin\bash.exe | -| msys2bash.cmd | C:\msys64\usr\bin\bash.exe | - -### MSYS2 -- Pacman 6.0.1 - -##### Notes: -``` -Location: C:\msys64 - -Note: MSYS2 is pre-installed on image but not added to PATH. -``` - -### Cached Tools -#### Go -| Version | Architecture | Environment Variable | -| ------- | ------------ | -------------------- | -| 1.15.15 (Default) | x64 | GOROOT_1_15_X64 | -| 1.16.14 | x64 | GOROOT_1_16_X64 | -| 1.17.7 | x64 | GOROOT_1_17_X64 | - -#### Node -| Version | Architecture | -| ------- | ------------ | -| 12.22.10 | x64 | -| 14.19.0 | x64 | -| 16.14.0 | x64 | - -#### Python -| Version | Architecture | -| ------- | ------------ | -| 2.7.18 | x64, x86 | -| 3.6.8 | x64, x86 | -| 3.7.9 (Default) | x64, x86 | -| 3.8.10 | x64, x86 | -| 3.9.10 | x64, x86 | -| 3.10.2 | x64 | - -#### Ruby -| Version | Architecture | -| ------- | ------------ | -| 2.4.10 | x64 | -| 2.5.9 (Default) | x64 | -| 2.6.9 | x64 | -| 2.7.5 | x64 | -| 3.0.3 | x64 | - -#### PyPy -| Python Version | PyPy Version | -| -------------- | ------------ | -| 2.7.18 | PyPy 7.3.8 with MSC v.1929 64 bit (AMD64) | -| 3.6.12 | PyPy 7.3.3 with MSC v.1927 32 bit | -| 3.7.12 | PyPy 7.3.8 with MSC v.1929 64 bit (AMD64) | -| 3.8.12 | PyPy 7.3.8 with MSC v.1929 64 bit (AMD64) | -| 3.9.10 | PyPy 7.3.8 with MSC v.1929 64 bit (AMD64) | - -### Databases -#### PostgreSQL -| Property | Value | -| -------------------- | ------------------------------------------------------------------------------------------------------------------------------------ | -| ServiceName | postgresql-x64-14 | -| Version | 14.2 | -| ServiceStatus | Stopped | -| ServiceStartType | Disabled | -| EnvironmentVariables | PGBIN=C:\Program Files\PostgreSQL\14\bin <br> PGDATA=C:\Program Files\PostgreSQL\14\data <br> PGROOT=C:\Program Files\PostgreSQL\14 | -| Path | C:\Program Files\PostgreSQL\14 | -| UserName | postgres | -| Password | root | - -#### MongoDB -| Version | ServiceName | ServiceStatus | ServiceStartType | -| ------- | ----------- | ------------- | ---------------- | -| 5.0.6.0 | MongoDB | Running | Automatic | - -### Database tools -- Azure CosmosDb Emulator 2.14.5.0 -- DacFx 16.0.5400.1 -- MySQL 5.7.37.0 -- SQLPS 1.0 - -### Web Servers -| Name | Version | ConfigFile | ServiceName | ServiceStatus | ListenPort | -| ------ | ------- | ------------------------------------- | ----------- | ------------- | ---------- | -| Apache | 2.4.52 | C:\tools\Apache24\conf\httpd.conf | Apache | Stopped | 80 | -| Nginx | 1.21.6 | C:\tools\nginx-1.21.6\conf\nginx.conf | nginx | Stopped | 80 | - -### Visual Studio Enterprise 2017 -| Name | Version | Path | -| ----------------------------- | --------------- | -------------------------------------------------------------- | -| Visual Studio Enterprise 2017 | 15.9.28307.1800 | C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise | - -#### Workloads, components and extensions: -| Package | Version | -| ------------------------------------------------------------------------- | ---------------- | -| Component.Anaconda3.x64 | 5.2.0 | -| Component.Android.NDK.R12B | 12.1.10 | -| Component.Android.NDK.R15C | 15.2.1 | -| Component.Android.SDK19.Private | 15.9.28107.0 | -| Component.Android.SDK21.Private | 15.9.28016.0 | -| Component.Android.SDK22.Private | 15.9.28016.0 | -| Component.Android.SDK23 | 15.9.28107.0 | -| Component.Android.SDK23.Private | 15.9.28016.0 | -| Component.Android.SDK25.Private | 15.9.28016.0 | -| Component.Android.SDK27 | 15.9.28016.0 | -| Component.Ant | 1.9.3.8 | -| Component.CordovaToolset.6.3.1 | 15.7.27625.0 | -| Component.Dotfuscator | 15.0.26208.0 | -| Component.Google.Android.Emulator.API27 | 15.9.28307.421 | -| Component.HAXM | 15.9.28307.421 | -| Component.Linux.CMake | 15.9.28307.102 | -| Component.MDD.Android | 15.0.26606.0 | -| Component.MDD.Linux | 15.6.27406.0 | -| Component.Microsoft.VisualStudio.RazorExtension | 15.0.26720.2 | -| Component.Microsoft.VisualStudio.Tools.Applications | 15.0.27520.3 | -| Component.Microsoft.VisualStudio.Web.AzureFunctions | 15.7.27617.1 | -| Component.Microsoft.Web.LibraryManager | 15.8.27705.0 | -| Component.Microsoft.Windows.DriverKit | 10.0.17740.0 | -| Component.OpenJDK | 15.9.28307.443 | -| Component.Redgate.ReadyRoll | 1.17.18155.10346 | -| Component.Redgate.SQLPrompt.VsPackage | 9.2.0.5601 | -| Component.Redgate.SQLSearch.VSExtension | 3.1.7.2062 | -| Component.UnityEngine.x64 | 15.9.28307.616 | -| Component.Unreal | 15.8.27729.1 | -| Component.Unreal.Android | 15.9.28307.341 | -| Component.WixToolset.VisualStudioExtension.Dev15 | 1.0.0.18 | -| Component.WixToolset.VisualStudioExtension.Schemas3 | 1.0.0.18 | -| Component.WixToolset.VisualStudioExtension.Schemas4 | 1.0.0.18 | -| Component.Xamarin | 15.9.28307.1177 | -| Component.Xamarin.Profiler | 15.0.27005.2 | -| Component.Xamarin.RemotedSimulator | 15.6.27323.2 | -| Microsoft.Component.Azure.DataLake.Tools | 15.9.28107.0 | -| Microsoft.Component.Blend.SDK.WPF | 15.6.27406.0 | -| Microsoft.Component.ClickOnce | 15.8.27825.0 | -| Microsoft.Component.CookiecutterTools | 15.9.28307.1500 | -| Microsoft.Component.MSBuild | 15.7.27520.0 | -| Microsoft.Component.NetFX.Core.Runtime | 15.0.26208.0 | -| Microsoft.Component.NetFX.Native | 15.0.26208.0 | -| Microsoft.Component.PythonTools | 15.9.28307.1500 | -| Microsoft.Component.PythonTools.UWP | 15.0.26606.0 | -| Microsoft.Component.PythonTools.Web | 15.9.28107.0 | -| Microsoft.Component.VC.Runtime.OSSupport | 15.6.27406.0 | -| Microsoft.Component.VC.Runtime.UCRTSDK | 15.6.27309.0 | -| Microsoft.ComponentGroup.Blend | 15.6.27406.0 | -| Microsoft.Net.Component.3.5.DeveloperTools | 15.6.27406.0 | -| Microsoft.Net.Component.4.5.1.TargetingPack | 15.6.27406.0 | -| Microsoft.Net.Component.4.5.2.TargetingPack | 15.6.27406.0 | -| Microsoft.Net.Component.4.5.TargetingPack | 15.6.27406.0 | -| Microsoft.Net.Component.4.6.1.SDK | 15.6.27406.0 | -| Microsoft.Net.Component.4.6.1.TargetingPack | 15.6.27406.0 | -| Microsoft.Net.Component.4.6.2.SDK | 15.6.27406.0 | -| Microsoft.Net.Component.4.6.2.TargetingPack | 15.6.27406.0 | -| Microsoft.Net.Component.4.6.TargetingPack | 15.6.27406.0 | -| Microsoft.Net.Component.4.7.1.SDK | 15.6.27406.0 | -| Microsoft.Net.Component.4.7.1.TargetingPack | 15.6.27406.0 | -| Microsoft.Net.Component.4.7.2.SDK | 15.8.27825.0 | -| Microsoft.Net.Component.4.7.2.TargetingPack | 15.8.27825.0 | -| Microsoft.Net.Component.4.7.SDK | 15.6.27406.0 | -| Microsoft.Net.Component.4.7.TargetingPack | 15.6.27406.0 | -| Microsoft.Net.Component.4.TargetingPack | 15.6.27406.0 | -| Microsoft.Net.ComponentGroup.4.6.2.DeveloperTools | 15.6.27406.0 | -| Microsoft.Net.ComponentGroup.4.7.1.DeveloperTools | 15.6.27406.0 | -| Microsoft.Net.ComponentGroup.4.7.2.DeveloperTools | 15.8.27825.0 | -| Microsoft.Net.ComponentGroup.4.7.DeveloperTools | 15.6.27406.0 | -| Microsoft.Net.ComponentGroup.DevelopmentPrerequisites | 15.8.27825.0 | -| Microsoft.Net.ComponentGroup.TargetingPacks.Common | 15.6.27406.0 | -| Microsoft.Net.Core.Component.SDK.1x | 15.9.28307.1259 | -| Microsoft.Net.Core.Component.SDK.2.1 | 15.9.28307.1684 | -| Microsoft.NetCore.1x.ComponentGroup.Web | 15.9.28307.1259 | -| Microsoft.NetCore.ComponentGroup.DevelopmentTools.2.1 | 15.9.28307.1684 | -| Microsoft.NetCore.ComponentGroup.Web.2.1 | 15.9.28307.1684 | -| Microsoft.VisualStudio.Component.AppInsights.Tools | 15.8.27825.0 | -| Microsoft.VisualStudio.Component.AspNet45 | 15.7.27625.0 | -| Microsoft.VisualStudio.Component.Azure.AuthoringTools | 15.9.28307.421 | -| Microsoft.VisualStudio.Component.Azure.ClientLibs | 15.0.26208.0 | -| Microsoft.VisualStudio.Component.Azure.Compute.Emulator | 15.9.28307.421 | -| Microsoft.VisualStudio.Component.Azure.MobileAppsSdk | 15.7.27625.0 | -| Microsoft.VisualStudio.Component.Azure.ResourceManager.Tools | 15.9.28107.0 | -| Microsoft.VisualStudio.Component.Azure.ServiceFabric.Tools | 15.8.27825.0 | -| Microsoft.VisualStudio.Component.Azure.Storage.AzCopy | 15.0.26906.1 | -| Microsoft.VisualStudio.Component.Azure.Storage.Emulator | 15.9.28125.51 | -| Microsoft.VisualStudio.Component.Azure.Waverton | 15.9.28107.0 | -| Microsoft.VisualStudio.Component.Azure.Waverton.BuildTools | 15.7.27617.1 | -| Microsoft.VisualStudio.Component.ClassDesigner | 15.0.26208.0 | -| Microsoft.VisualStudio.Component.CloudExplorer | 15.9.28230.55 | -| Microsoft.VisualStudio.Component.CodeClone | 15.0.26208.0 | -| Microsoft.VisualStudio.Component.CodeMap | 15.0.26208.0 | -| Microsoft.VisualStudio.Component.Common.Azure.Tools | 15.9.28107.0 | -| Microsoft.VisualStudio.Component.Cordova | 15.0.26606.0 | -| Microsoft.VisualStudio.Component.CoreEditor | 15.8.27729.1 | -| Microsoft.VisualStudio.Component.Debugger.JustInTime | 15.0.27005.2 | -| Microsoft.VisualStudio.Component.Debugger.Snapshot | 15.8.28010.0 | -| Microsoft.VisualStudio.Component.DependencyValidation.Enterprise | 15.0.26208.0 | -| Microsoft.VisualStudio.Component.DiagnosticTools | 15.8.27729.1 | -| Microsoft.VisualStudio.Component.DockerTools | 15.9.28307.1439 | -| Microsoft.VisualStudio.Component.DockerTools.BuildTools | 15.7.27617.1 | -| Microsoft.VisualStudio.Component.DslTools | 15.0.27005.2 | -| Microsoft.VisualStudio.Component.EntityFramework | 15.6.27406.0 | -| Microsoft.VisualStudio.Component.FSharp | 15.8.27825.0 | -| Microsoft.VisualStudio.Component.FSharp.Desktop | 15.8.27825.0 | -| Microsoft.VisualStudio.Component.FSharp.WebTemplates | 15.9.28307.421 | -| Microsoft.VisualStudio.Component.GraphDocument | 15.0.27005.2 | -| Microsoft.VisualStudio.Component.Graphics | 15.6.27406.0 | -| Microsoft.VisualStudio.Component.Graphics.Tools | 15.6.27406.0 | -| Microsoft.VisualStudio.Component.Graphics.Win81 | 15.6.27406.0 | -| Microsoft.VisualStudio.Component.IISExpress | 15.0.26208.0 | -| Microsoft.VisualStudio.Component.IntelliTrace.FrontEnd | 15.8.27729.1 | -| Microsoft.VisualStudio.Component.JavaScript.Diagnostics | 15.8.27729.1 | -| Microsoft.VisualStudio.Component.JavaScript.ProjectSystem | 15.0.26606.0 | -| Microsoft.VisualStudio.Component.JavaScript.TypeScript | 15.9.28125.51 | -| Microsoft.VisualStudio.Component.LinqToSql | 15.6.27406.0 | -| Microsoft.VisualStudio.Component.LiveUnitTesting | 15.0.26720.2 | -| Microsoft.VisualStudio.Component.ManagedDesktop.Core | 15.8.27729.1 | -| Microsoft.VisualStudio.Component.ManagedDesktop.Prerequisites | 15.7.27625.0 | -| Microsoft.VisualStudio.Component.Merq | 15.8.27924.0 | -| Microsoft.VisualStudio.Component.MonoDebugger | 15.0.26720.2 | -| Microsoft.VisualStudio.Component.Node.Build | 15.8.27825.0 | -| Microsoft.VisualStudio.Component.Node.Tools | 15.8.27825.0 | -| Microsoft.VisualStudio.Component.NuGet | 15.9.28016.0 | -| Microsoft.VisualStudio.Component.NuGet.BuildTools | 15.9.28016.0 | -| Microsoft.VisualStudio.Component.PortableLibrary | 15.6.27309.0 | -| Microsoft.VisualStudio.Component.R.Open | 15.6.27406.0 | -| Microsoft.VisualStudio.Component.RHost | 15.6.27406.0 | -| Microsoft.VisualStudio.Component.Roslyn.Compiler | 15.6.27309.0 | -| Microsoft.VisualStudio.Component.Roslyn.LanguageServices | 15.8.27729.1 | -| Microsoft.VisualStudio.Component.RTools | 15.0.26919.1 | -| Microsoft.VisualStudio.Component.Sharepoint.Tools | 15.8.27924.0 | -| Microsoft.VisualStudio.Component.SQL.ADAL | 15.6.27406.0 | -| Microsoft.VisualStudio.Component.SQL.CLR | 15.0.26208.0 | -| Microsoft.VisualStudio.Component.SQL.CMDUtils | 15.0.26208.0 | -| Microsoft.VisualStudio.Component.SQL.DataSources | 15.0.26621.2 | -| Microsoft.VisualStudio.Component.SQL.LocalDB.Runtime | 15.7.27617.1 | -| Microsoft.VisualStudio.Component.SQL.NCLI | 15.0.26208.0 | -| Microsoft.VisualStudio.Component.SQL.SSDT | 15.9.28107.0 | -| Microsoft.VisualStudio.Component.Static.Analysis.Tools | 15.0.26208.0 | -| Microsoft.VisualStudio.Component.TeamOffice | 15.7.27625.0 | -| Microsoft.VisualStudio.Component.TestTools.CodedUITest | 15.0.26606.0 | -| Microsoft.VisualStudio.Component.TestTools.Core | 15.7.27520.0 | -| Microsoft.VisualStudio.Component.TestTools.WebLoadTest | 15.8.27729.1 | -| Microsoft.VisualStudio.Component.TextTemplating | 15.0.26208.0 | -| Microsoft.VisualStudio.Component.TypeScript.2.0 | 15.8.27729.1 | -| Microsoft.VisualStudio.Component.TypeScript.2.1 | 15.8.27729.1 | -| Microsoft.VisualStudio.Component.TypeScript.2.2 | 15.8.27729.1 | -| Microsoft.VisualStudio.Component.TypeScript.2.3 | 15.8.27729.1 | -| Microsoft.VisualStudio.Component.TypeScript.3.1 | 15.0.28218.60 | -| Microsoft.VisualStudio.Component.Unity | 15.7.27617.1 | -| Microsoft.VisualStudio.Component.UWP.Support | 15.9.28119.51 | -| Microsoft.VisualStudio.Component.UWP.VC.ARM64 | 15.0.28125.51 | -| Microsoft.VisualStudio.Component.VC.140 | 15.7.27617.1 | -| Microsoft.VisualStudio.Component.VC.ATL | 15.7.27625.0 | -| Microsoft.VisualStudio.Component.VC.ATL.ARM | 15.7.27625.0 | -| Microsoft.VisualStudio.Component.VC.ATL.ARM.Spectre | 15.7.27625.0 | -| Microsoft.VisualStudio.Component.VC.ATL.ARM64 | 15.7.27625.0 | -| Microsoft.VisualStudio.Component.VC.ATL.ARM64.Spectre | 15.7.27625.0 | -| Microsoft.VisualStudio.Component.VC.ATL.Spectre | 15.7.27625.0 | -| Microsoft.VisualStudio.Component.VC.ATLMFC | 15.7.27625.0 | -| Microsoft.VisualStudio.Component.VC.ATLMFC.Spectre | 15.7.27625.0 | -| Microsoft.VisualStudio.Component.VC.ClangC2 | 15.7.27520.0 | -| Microsoft.VisualStudio.Component.VC.CLI.Support | 15.6.27309.0 | -| Microsoft.VisualStudio.Component.VC.CMake.Project | 15.9.28307.102 | -| Microsoft.VisualStudio.Component.VC.CoreIde | 15.6.27406.0 | -| Microsoft.VisualStudio.Component.VC.DiagnosticTools | 15.0.26823.1 | -| Microsoft.VisualStudio.Component.VC.Modules.x86.x64 | 15.6.27309.0 | -| Microsoft.VisualStudio.Component.VC.Redist.14.Latest | 15.6.27406.0 | -| Microsoft.VisualStudio.Component.VC.Runtimes.ARM.Spectre | 15.9.28230.55 | -| Microsoft.VisualStudio.Component.VC.Runtimes.ARM64.Spectre | 15.9.28230.55 | -| Microsoft.VisualStudio.Component.VC.Runtimes.x86.x64.Spectre | 15.9.28230.55 | -| Microsoft.VisualStudio.Component.VC.TestAdapterForBoostTest | 15.9.28307.616 | -| Microsoft.VisualStudio.Component.VC.TestAdapterForGoogleTest | 15.8.27906.1 | -| Microsoft.VisualStudio.Component.VC.Tools.ARM | 15.8.27825.0 | -| Microsoft.VisualStudio.Component.VC.Tools.ARM64 | 15.9.28230.55 | -| Microsoft.VisualStudio.Component.VC.Tools.x86.x64 | 15.9.28230.55 | -| Microsoft.VisualStudio.Component.VisualStudioData | 15.6.27406.0 | -| Microsoft.VisualStudio.Component.VSSDK | 15.8.27729.1 | -| Microsoft.VisualStudio.Component.Wcf.Tooling | 15.8.27924.0 | -| Microsoft.VisualStudio.Component.Web | 15.8.27825.0 | -| Microsoft.VisualStudio.Component.WebDeploy | 15.8.27729.1 | -| Microsoft.VisualStudio.Component.Windows10SDK | 15.6.27406.0 | -| Microsoft.VisualStudio.Component.Windows10SDK.10240 | 15.6.27406.0 | -| Microsoft.VisualStudio.Component.Windows10SDK.10586 | 15.6.27406.0 | -| Microsoft.VisualStudio.Component.Windows10SDK.14393 | 15.6.27406.0 | -| Microsoft.VisualStudio.Component.Windows10SDK.15063.Desktop | 15.6.27406.0 | -| Microsoft.VisualStudio.Component.Windows10SDK.15063.UWP | 15.6.27406.0 | -| Microsoft.VisualStudio.Component.Windows10SDK.15063.UWP.Native | 15.6.27406.0 | -| Microsoft.VisualStudio.Component.Windows10SDK.16299.Desktop | 15.6.27406.0 | -| Microsoft.VisualStudio.Component.Windows10SDK.16299.Desktop.arm | 15.6.27406.0 | -| Microsoft.VisualStudio.Component.Windows10SDK.16299.UWP | 15.6.27406.0 | -| Microsoft.VisualStudio.Component.Windows10SDK.16299.UWP.Native | 15.6.27406.0 | -| Microsoft.VisualStudio.Component.Windows10SDK.17134 | 15.9.28307.102 | -| Microsoft.VisualStudio.Component.Windows10SDK.17763 | 15.9.28307.102 | -| Microsoft.VisualStudio.Component.Windows81SDK | 15.6.27406.0 | -| Microsoft.VisualStudio.Component.WinXP | 15.8.27924.0 | -| Microsoft.VisualStudio.Component.Workflow | 15.8.27825.0 | -| Microsoft.VisualStudio.ComponentGroup.ArchitectureTools.Managed | 15.0.26208.0 | -| Microsoft.VisualStudio.ComponentGroup.ArchitectureTools.Native | 15.0.26208.0 | -| Microsoft.VisualStudio.ComponentGroup.Azure.CloudServices | 15.0.26504.0 | -| Microsoft.VisualStudio.ComponentGroup.Azure.Prerequisites | 15.9.28107.0 | -| Microsoft.VisualStudio.ComponentGroup.Azure.ResourceManager.Tools | 15.0.27005.2 | -| Microsoft.VisualStudio.ComponentGroup.AzureFunctions | 15.7.27617.1 | -| Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core | 15.8.27729.1 | -| Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Win81 | 15.6.27406.0 | -| Microsoft.VisualStudio.ComponentGroup.NativeDesktop.WinXP | 15.8.27705.0 | -| Microsoft.VisualStudio.ComponentGroup.UWP.Cordova | 15.9.28307.102 | -| Microsoft.VisualStudio.ComponentGroup.UWP.NetCoreAndStandard | 15.9.28307.1439 | -| Microsoft.VisualStudio.ComponentGroup.UWP.VC | 15.9.28307.102 | -| Microsoft.VisualStudio.ComponentGroup.UWP.Xamarin | 15.9.28307.102 | -| Microsoft.VisualStudio.ComponentGroup.VisualStudioExtension.Prerequisites | 15.7.27625.0 | -| Microsoft.VisualStudio.ComponentGroup.Web | 15.9.28219.51 | -| Microsoft.VisualStudio.ComponentGroup.Web.CloudTools | 15.8.27729.1 | -| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions | 15.8.27825.0 | -| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.TemplateEngine | 15.8.27729.1 | -| Microsoft.VisualStudio.Web.Mvc4.ComponentGroup | 15.6.27406.0 | -| Microsoft.VisualStudio.Workload.Azure | 15.9.28307.1684 | -| Microsoft.VisualStudio.Workload.CoreEditor | 15.0.27205.0 | -| Microsoft.VisualStudio.Workload.Data | 15.9.28307.1684 | -| Microsoft.VisualStudio.Workload.DataScience | 15.9.28307.421 | -| Microsoft.VisualStudio.Workload.ManagedDesktop | 15.9.28307.1062 | -| Microsoft.VisualStudio.Workload.ManagedGame | 15.0.27005.2 | -| Microsoft.VisualStudio.Workload.NativeCrossPlat | 15.0.27205.0 | -| Microsoft.VisualStudio.Workload.NativeDesktop | 15.9.28307.102 | -| Microsoft.VisualStudio.Workload.NativeGame | 15.9.28307.102 | -| Microsoft.VisualStudio.Workload.NativeMobile | 15.9.28107.0 | -| Microsoft.VisualStudio.Workload.NetCoreTools | 15.9.28307.1684 | -| Microsoft.VisualStudio.Workload.NetCrossPlat | 15.9.28307.1684 | -| Microsoft.VisualStudio.Workload.NetWeb | 15.9.28307.1684 | -| Microsoft.VisualStudio.Workload.Node | 15.9.28107.0 | -| Microsoft.VisualStudio.Workload.Office | 15.9.28307.1684 | -| Microsoft.VisualStudio.Workload.Python | 15.9.28307.1758 | -| Microsoft.VisualStudio.Workload.Universal | 15.9.28307.1684 | -| Microsoft.VisualStudio.Workload.VisualStudioExtension | 15.7.27625.0 | -| Microsoft.VisualStudio.Workload.WebCrossPlat | 15.9.28307.341 | -| SSDT Microsoft Analysis Services Projects | 2.9.6 | -| SSDT Microsoft Reporting Services Projects | 2.6 | -| SSDT SQL Server Integration Services Projects | 2.6.3 | -| Windows Driver Kit | 10.0.17740.0 | -| Windows Driver Kit Visual Studio Extension | 10.1.17763.1 | -| WIX Toolset Studio 2017 Extension | 1.0.0.18 | -| WixToolset.WixToolsetVisualStudio2017Extension | 1.0.0.18 | - -#### Microsoft Visual C++: -| Name | Architecture | Version | -| -------------------------------------------- | ------------ | ----------- | -| Microsoft Visual C++ 2010 Redistributable | x64 | 10.0.30319 | -| Microsoft Visual C++ 2010 Redistributable | x86 | 10.0.40219 | -| Microsoft Visual C++ 2012 Additional Runtime | x64 | 11.0.61030 | -| Microsoft Visual C++ 2012 Minimum Runtime | x64 | 11.0.61030 | -| Microsoft Visual C++ 2013 Additional Runtime | x64 | 12.0.40660 | -| 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++ 2017 Debug Runtime | x64 | 14.16.27033 | -| Microsoft Visual C++ 2017 Debug Runtime | x86 | 14.16.27033 | -| Microsoft Visual C++ 2022 Additional Runtime | x64 | 14.31.31103 | -| Microsoft Visual C++ 2022 Minimum Runtime | x64 | 14.31.31103 | -| Microsoft Visual C++ 2022 Additional Runtime | x86 | 14.31.31103 | -| Microsoft Visual C++ 2022 Minimum Runtime | x86 | 14.31.31103 | - -#### Installed Windows SDKs -`Location C:\Program Files (x86)\Windows Kits\10\Extension SDKs\WindowsDesktop` -- 10.0.10240.0 -- 10.0.10586.0 -- 10.0.14393.0 -- 10.0.15063.0 -- 10.0.16299.0 -- 10.0.17134.0 -- 10.0.17763.0 - -### .NET Core SDK -`Location C:\Program Files\dotnet\sdk` -- 1.1.14 2.1.526 3.1.120 3.1.202 3.1.302 3.1.416 5.0.104 5.0.211 5.0.303 5.0.405 - -### .NET Core Runtime -`Location: C:\Program Files\dotnet\shared\Microsoft.AspNetCore.All` -- 2.1.30 - -`Location: C:\Program Files\dotnet\shared\Microsoft.AspNetCore.App` -- 2.1.30 3.1.4 3.1.6 3.1.20 3.1.22 5.0.4 5.0.9 5.0.14 - -`Location: C:\Program Files\dotnet\shared\Microsoft.NETCore.App` -- 1.0.16 1.1.13 2.1.30 3.1.4 3.1.6 3.1.20 3.1.22 5.0.4 5.0.9 5.0.14 - -`Location: C:\Program Files\dotnet\shared\Microsoft.WindowsDesktop.App` -- 3.1.4 3.1.6 3.1.20 3.1.22 5.0.4 5.0.9 5.0.14 - -### .NET Framework -`Type: Developer Pack` -`Location C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX <version> Tools` -- 4.6.1 4.6.2 4.7 4.7.1 4.7.2 4.8 - -### .NET tools -- nbgv 3.4.255+06fb9182bf - -### PowerShell Tools -- PowerShell 7.2.1 - -#### Azure Powershell Modules -| Module | Version | Path | -| ------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ------------------------------ | -| Az | 1.0.0.zip<br>1.6.0.zip<br>2.3.2.zip<br>2.6.0.zip<br>3.1.0.zip<br>3.5.0.zip<br>3.8.0.zip<br>4.3.0.zip<br>4.4.0.zip<br>4.7.0.zip<br>5.5.0.zip<br>5.9.0.zip<br>6.6.0.zip<br>7.1.0 | C:\Modules\az_\<version\> | -| Azure | 2.1.0 [Installed]<br>3.8.0.zip<br>4.2.1.zip<br>5.1.1.zip<br>5.3.0 | C:\Modules\azure_\<version\> | -| AzureRM | 2.1.0 [Installed]<br>3.8.0.zip<br>4.2.1.zip<br>5.1.1.zip<br>6.7.0.zip<br>6.13.1 | C:\Modules\azurerm_\<version\> | -``` -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 | -| ------------------ | ---------------- | -| AWSPowerShell | 4.1.37 | -| DockerMsftProvider | 1.0.0.8 | -| MarkdownPS | 1.9 | -| Microsoft.Graph | 1.9.2 | -| Pester | 3.4.0<br>5.3.1 | -| PowerShellGet | 1.0.0.1<br>2.2.5 | -| PSScriptAnalyzer | 1.20.0 | -| PSWindowsUpdate | 2.2.0.2 | -| SqlServer | 21.1.18256 | -| VSSetup | 2.2.16 | - -### Android -| Package Name | Version | -| -------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 4.0 | -| Android SDK Build-tools | 32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3<br>26.0.0 26.0.1 26.0.2 26.0.3<br>25.0.0 25.0.1 25.0.2 25.0.3<br>24.0.0 24.0.1 24.0.2 24.0.3<br>23.0.1 23.0.2 23.0.3<br>22.0.1<br>21.1.2<br>20.0.0<br>19.1.0 | -| Android SDK Platforms | android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3)<br>android-26 (rev 2)<br>android-25 (rev 3)<br>android-24 (rev 2)<br>android-23 (rev 3)<br>android-22 (rev 2)<br>android-21 (rev 2)<br>android-20 (rev 2)<br>android-19 (rev 4) | -| Android SDK Platform-Tools | 33.0.0 | -| Android SDK Tools | 25.2.5 | -| Android Support Repository | 47.0.0 | -| CMake | 3.10.2<br>3.18.1 | -| Google APIs | addon-google_apis-google-21<br>addon-google_apis-google-22<br>addon-google_apis-google-23<br>addon-google_apis-google-24 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 21.4.7075529 (default)<br>22.1.7171670<br>23.1.7779620 | -| SDK Patch Applier v4 | 1 | - -#### Environment variables -| Name | Value | -| ----------------------- | ---------------------------------------------------------------------------- | -| ANDROID_HOME | C:\Android\android-sdk | -| ANDROID_NDK_HOME | C:\Android\android-sdk\ndk-bundle -> C:\Android\android-sdk\ndk\21.4.7075529 | -| ANDROID_NDK_LATEST_HOME | C:\Android\android-sdk\ndk\23.1.7779620 | -| ANDROID_NDK_PATH | C:\Android\android-sdk\ndk-bundle -> C:\Android\android-sdk\ndk\21.4.7075529 | -| ANDROID_NDK_ROOT | C:\Android\android-sdk\ndk-bundle -> C:\Android\android-sdk\ndk\21.4.7075529 | -| ANDROID_SDK_ROOT | C:\Android\android-sdk | - -### Cached Docker images -| Repository:Tag | Digest | Created | -| ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2016 | sha256:b9e3d42db02f6ea7ac05eb244e5c588076997e92513b88a46b0a0bfd04a5b8e1 | 2022-02-08 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2016 | sha256:ca99697a9354bbe9045512201be313167c74e65d6d6d2fe68d60f37629b3becc | 2022-02-08 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2016 | sha256:88439200c6701c2654ea0b5abc61f17df59966b0c27209137da8db4426dcbdec | 2022-02-16 | -| mcr.microsoft.com/windows/nanoserver:10.0.14393.953 | sha256:fc60bd5ae0e61b334ce1cf1bcbf20c10c36b4c5482a01da319c9c989f9e6e268 | 2017-03-08 | -| mcr.microsoft.com/windows/servercore:ltsc2016 | sha256:fad7ed8aa70fd6748bc814dc872a431c34136bdded9476386a5ff2e73d6ba9f0 | 2022-02-02 | - - diff --git a/images/win/scripts/ImageHelpers/ImageHelpers.psm1 b/images/win/scripts/ImageHelpers/ImageHelpers.psm1 index cdd4ea5b3c52..2a2b5131f660 100644 --- a/images/win/scripts/ImageHelpers/ImageHelpers.psm1 +++ b/images/win/scripts/ImageHelpers/ImageHelpers.psm1 @@ -35,7 +35,6 @@ Export-ModuleMember -Function @( 'Get-WinVersion' 'Test-IsWin22' 'Test-IsWin19' - 'Test-IsWin16' 'Choco-Install' 'Send-RequestToCocolateyPackages' 'Get-LatestChocoPackageVersion' diff --git a/images/win/scripts/ImageHelpers/InstallHelpers.ps1 b/images/win/scripts/ImageHelpers/InstallHelpers.ps1 index e898be5c5239..c163721516bc 100644 --- a/images/win/scripts/ImageHelpers/InstallHelpers.ps1 +++ b/images/win/scripts/ImageHelpers/InstallHelpers.ps1 @@ -436,11 +436,6 @@ function Test-IsWin19 (Get-WinVersion) -match "2019" } -function Test-IsWin16 -{ - (Get-WinVersion) -match "2016" -} - function Extract-7Zip { Param ( diff --git a/images/win/scripts/Installers/Configure-Antivirus.ps1 b/images/win/scripts/Installers/Configure-Antivirus.ps1 index 34c78cef7b36..c5fc2012ba1c 100644 --- a/images/win/scripts/Installers/Configure-Antivirus.ps1 +++ b/images/win/scripts/Installers/Configure-Antivirus.ps1 @@ -19,12 +19,10 @@ $avPreference = @( @{DisableRealtimeMonitoring = $true} ) -if (-not (Test-IsWin16)) { - $avPreference += @( - @{EnableControlledFolderAccess = "Disable"} - @{EnableNetworkProtection = "Disabled"} - ) -} +$avPreference += @( + @{EnableControlledFolderAccess = "Disable"} + @{EnableNetworkProtection = "Disabled"} +) $avPreference | Foreach-Object { $avParams = $_ diff --git a/images/win/scripts/Installers/Configure-Shell.ps1 b/images/win/scripts/Installers/Configure-Shell.ps1 index f72b7a3c2cd1..f9ac961557ef 100644 --- a/images/win/scripts/Installers/Configure-Shell.ps1 +++ b/images/win/scripts/Installers/Configure-Shell.ps1 @@ -15,9 +15,5 @@ C:\msys64\usr\bin\bash.exe -leo pipefail %* # gitbash <--> C:\Program Files\Git\bin\bash.exe New-Item -ItemType SymbolicLink -Path "$shellPath\gitbash.exe" -Target "$env:ProgramFiles\Git\bin\bash.exe" | Out-Null -# WSL is available on Windows Server 2019 and Windows Server 2022 -if (-not (Test-IsWin16)) -{ - # wslbash <--> C:\Windows\System32\bash.exe - New-Item -ItemType SymbolicLink -Path "$shellPath\wslbash.exe" -Target "$env:SystemRoot\System32\bash.exe" | Out-Null -} +# wslbash <--> C:\Windows\System32\bash.exe +New-Item -ItemType SymbolicLink -Path "$shellPath\wslbash.exe" -Target "$env:SystemRoot\System32\bash.exe" | Out-Null diff --git a/images/win/scripts/Installers/Install-DotnetSDK.ps1 b/images/win/scripts/Installers/Install-DotnetSDK.ps1 index 54f7f40b8cb0..2fde13dec557 100644 --- a/images/win/scripts/Installers/Install-DotnetSDK.ps1 +++ b/images/win/scripts/Installers/Install-DotnetSDK.ps1 @@ -53,7 +53,7 @@ function Invoke-Warmup ( function Fix-ImportPublishProfile ( $SdkVersion ) { - if ((Test-IsWin16) -or (Test-IsWin19)) { + if (Test-IsWin19) { # Fix for issue https://github.com/dotnet/sdk/issues/1276. This will be fixed in 3.1. $sdkTargetsName = "Microsoft.NET.Sdk.ImportPublishProfile.targets" $sdkTargetsUrl = "https://raw.githubusercontent.com/dotnet/sdk/82bc30c99f1325dfaa7ad450be96857a4fca2845/src/Tasks/Microsoft.NET.Build.Tasks/targets/${sdkTargetsName}" diff --git a/images/win/scripts/Installers/Install-Git.ps1 b/images/win/scripts/Installers/Install-Git.ps1 index e2d3cd4353bc..4bc561e0cac6 100644 --- a/images/win/scripts/Installers/Install-Git.ps1 +++ b/images/win/scripts/Installers/Install-Git.ps1 @@ -20,10 +20,6 @@ Choco-Install -PackageName hub # Add to PATH Add-MachinePathItem "C:\Program Files\Git\bin" -if (Test-IsWin16) { - $env:Path += ";$env:ProgramFiles\Git\usr\bin\" -} - # Add well-known SSH host keys to ssh_known_hosts ssh-keyscan -t rsa,ecdsa,ed25519 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" diff --git a/images/win/scripts/Installers/Install-VCRedist.ps1 b/images/win/scripts/Installers/Install-VCRedist.ps1 index 473fed3a299c..469dd24d1654 100644 --- a/images/win/scripts/Installers/Install-VCRedist.ps1 +++ b/images/win/scripts/Installers/Install-VCRedist.ps1 @@ -1,17 +1,10 @@ -if (Test-IsWin16) { - # Install vcredist140 - Choco-Install -PackageName vcredist140 -} - -if (Test-IsWin19) { - # Install vcredist2010 - $Vc2010x86Name = "vcredist_x86.exe" - $Vc2010x86URI = "https://download.microsoft.com/download/1/6/5/165255E7-1014-4D0A-B094-B6A430A6BFFC/${Vc2010x86Name}" - $Vc2010x64Name = "vcredist_x64.exe" - $Vc2010x64URI = "https://download.microsoft.com/download/1/6/5/165255E7-1014-4D0A-B094-B6A430A6BFFC/${Vc2010x64Name}" - $ArgumentList = ("/install", "/quiet", "/norestart") - Install-Binary -Url $Vc2010x86URI -Name $Vc2010x86Name -ArgumentList $ArgumentList - Install-Binary -Url $Vc2010x64URI -Name $Vc2010x64Name -ArgumentList $ArgumentList -} +# Install vcredist2010 +$Vc2010x86Name = "vcredist_x86.exe" +$Vc2010x86URI = "https://download.microsoft.com/download/1/6/5/165255E7-1014-4D0A-B094-B6A430A6BFFC/${Vc2010x86Name}" +$Vc2010x64Name = "vcredist_x64.exe" +$Vc2010x64URI = "https://download.microsoft.com/download/1/6/5/165255E7-1014-4D0A-B094-B6A430A6BFFC/${Vc2010x64Name}" +$ArgumentList = ("/install", "/quiet", "/norestart") +Install-Binary -Url $Vc2010x86URI -Name $Vc2010x86Name -ArgumentList $ArgumentList +Install-Binary -Url $Vc2010x64URI -Name $Vc2010x64Name -ArgumentList $ArgumentList Invoke-PesterTests -TestFile "Tools" -TestName "VCRedist" diff --git a/images/win/scripts/Installers/Install-WDK.ps1 b/images/win/scripts/Installers/Install-WDK.ps1 index 9528be45602a..d92d0d3a3ed4 100644 --- a/images/win/scripts/Installers/Install-WDK.ps1 +++ b/images/win/scripts/Installers/Install-WDK.ps1 @@ -14,18 +14,13 @@ if (Test-IsWin22) { $wdkUrl = "https://go.microsoft.com/fwlink/?linkid=2166289" $FilePath = "C:\Program Files (x86)\Windows Kits\10\Vsix\VS2019\WDK.vsix" $VSver = "2019" -} elseif (Test-IsWin16) { - $winSdkUrl = "https://go.microsoft.com/fwlink/p/?LinkID=2023014" - $wdkUrl = "https://go.microsoft.com/fwlink/?linkid=2026156" - $FilePath = "C:\Program Files (x86)\Windows Kits\10\Vsix\WDK.vsix" - $VSver = "2017" } else { throw "Invalid version of Visual Studio is found. Either 2017,2019 or 2022 are required" } $argumentList = ("/features", "+", "/quiet") -if ((Test-IsWin16) -or (Test-IsWin19)) { +if (Test-IsWin19) { # `winsdksetup.exe /features + /quiet` installs all features without showing the GUI Install-Binary -Url $winSdkUrl -Name "winsdksetup.exe" -ArgumentList $argumentList } @@ -36,7 +31,7 @@ Install-Binary -Url $wdkUrl -Name "wdksetup.exe" -ArgumentList $argumentList # Need to install the VSIX to get the build targets when running VSBuild # Windows 2022 - Skip installation due to a regression # https://docs.microsoft.com/en-us/windows-hardware/drivers/download-the-wdk -if ((Test-IsWin16) -or (Test-IsWin19)) { +if (Test-IsWin19) { $FilePath = Resolve-Path -Path $FilePath Install-VsixExtension -FilePath $FilePath -Name "WDK.vsix" -VSversion $VSver -InstallOnly } diff --git a/images/win/scripts/Installers/Update-ImageData.ps1 b/images/win/scripts/Installers/Update-ImageData.ps1 index 754ce77a1bd4..c2dc6e965189 100644 --- a/images/win/scripts/Installers/Update-ImageData.ps1 +++ b/images/win/scripts/Installers/Update-ImageData.ps1 @@ -15,12 +15,8 @@ if (Test-IsWin22) { $imageLabel = "windows-2019" $softwareUrl = "${githubUrl}/win19/${imageVersion}/images/win/Windows2019-Readme.md" $releaseUrl="https://github.com/actions/virtual-environments/releases/tag/win19%2F${imageVersion}" -} elseif (Test-IsWin16) { - $imageLabel = "windows-2016" - $softwareUrl = "${githubUrl}/win16/${imageVersion}/images/win/Windows2016-Readme.md" - $releaseUrl="https://github.com/actions/virtual-environments/releases/tag/win16%2F${imageVersion}" } else { - throw "Invalid platform version is found. Either Windows Server 2016 or 2019 or 2022 are required" + throw "Invalid platform version is found. Either Windows Server 2019 or 2022 are required" } $json = @" diff --git a/images/win/scripts/Installers/Windows2016/Install-SSDT.ps1 b/images/win/scripts/Installers/Windows2016/Install-SSDT.ps1 deleted file mode 100644 index e67d0cb2a3db..000000000000 --- a/images/win/scripts/Installers/Windows2016/Install-SSDT.ps1 +++ /dev/null @@ -1,19 +0,0 @@ -################################################################################ -## File: Install-SSDT.ps1 -## Desc: Install SQL Server Data Tools for Windows -################################################################################ - -#SSDT for Visual Studio 2017 -#The link down below points to the latest version of SSDT for Visual Studio 2017 -$InstallerName = "SSDT-Setup-ENU.exe" -$InstallerUrl = "https://go.microsoft.com/fwlink/?linkid=2124518" -$logFilePath = "$env:TEMP\ssdtlog.txt" -$ArgumentList = ("/install", "INSTALLALL", "/passive", "/norestart", "/log `"$logFilePath`"") - -Install-Binary -Url $InstallerUrl -Name $InstallerName -ArgumentList $ArgumentList - -Write-Host "******** SSDT SETUP LOG START ********" -Write-Host $(Get-Content $logFilePath | Out-String) -Write-Host "******** SSDT SETUP LOG END ********" - -Invoke-PesterTests -TestFile "SSDTExtensions" diff --git a/images/win/scripts/Installers/Windows2016/Install-Win81SDK.ps1 b/images/win/scripts/Installers/Windows2016/Install-Win81SDK.ps1 deleted file mode 100644 index 897b8bffefed..000000000000 --- a/images/win/scripts/Installers/Windows2016/Install-Win81SDK.ps1 +++ /dev/null @@ -1,10 +0,0 @@ -################################################################################ -## File: Install-Win81SDK.ps1 -## Desc: Install Windows 8.1 SDK -################################################################################ - -$InstallerName = "sdksetup.exe" -$InstallerUrl = "http://download.microsoft.com/download/B/0/C/B0C80BA3-8AD6-4958-810B-6882485230B5/standalonesdk/${InstallerName}" -$ArgumentList = ("/quiet", "/norestart") - -Install-Binary -Url $InstallerUrl -Name $InstallerName -ArgumentList $ArgumentList diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 index 980dd2dc722c..1c36a9844e19 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 @@ -349,7 +349,7 @@ function Build-PackageManagementEnvironmentTable { "Value" = $env:VCPKG_INSTALLATION_ROOT } ) - if ((Test-IsWin16) -or (Test-IsWin19)) { + if (Test-IsWin19) { $envVariables += @( @{ "Name" = "CONDA" diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index cf34a2fa487d..d659ac7b316b 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -121,7 +121,7 @@ $toolsList = @( (Get-ZstdVersion), (Get-YAMLLintVersion) ) -if ((Test-IsWin16) -or (Test-IsWin19)) { +if (Test-IsWin19) { $toolsList += @( (Get-GoogleCloudSDKVersion), (Get-ParcelVersion) @@ -140,7 +140,7 @@ $cliTools = @( (Get-GHVersion), (Get-HubVersion) ) -if ((Test-IsWin16) -or (Test-IsWin19)) { +if (Test-IsWin19) { $cliTools += @( (Get-CloudFoundryVersion) ) @@ -220,14 +220,10 @@ $databaseTools = @( (Get-AzCosmosDBEmulatorVersion), (Get-DacFxVersion), (Get-MySQLVersion), - (Get-SQLPSVersion) + (Get-SQLPSVersion), + (Get-SQLOLEDBDriverVersion) ) -if (-not (Test-IsWin16)) -{ - $databaseTools += Get-SQLOLEDBDriverVersion -} - $markdown += New-MDList -Style Unordered -Lines ($databaseTools | Sort-Object) $markdown += Build-WebServersSection diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.VisualStudio.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.VisualStudio.psm1 index a29f7e8c9707..f278098dcb59 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.VisualStudio.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.VisualStudio.psm1 @@ -38,19 +38,6 @@ function Get-VisualStudioExtensions { } } - # SSDT extensions for VS2017 - $vs = (Get-VisualStudioVersion).Name.Split()[-1] - if (Test-IsWin16) - { - $analysisPackageVersion = Get-VSExtensionVersion -packageName '04a86fc2-dbd5-4222-848e-911638e487fe' - $reportingPackageVersion = Get-VSExtensionVersion -packageName '717ad572-c4b7-435c-c166-c2969777f718' - $integrationPackageName = Get-VSExtensionVersion -packageName 'd1b09713-c12e-43cc-9ef4-6562298285ab' - $ssdtPackages = @( - @{Package = 'SSDT Microsoft Analysis Services Projects'; Version = $analysisPackageVersion} - @{Package = 'SSDT SQL Server Integration Services Projects'; Version = $reportingPackageVersion} - @{Package = 'SSDT Microsoft Reporting Services Projects'; Version = $integrationPackageName} - ) - } # SDK if (Test-IsWin19) { @@ -60,8 +47,9 @@ function Get-VisualStudioExtensions { ) } - if ((Test-IsWin16) -or (Test-IsWin19)) { + if (Test-IsWin19) { # Wix + $vs = (Get-VisualStudioVersion).Name.Split()[-1] $wixExtensionVersion = ($vsPackages | Where-Object {$_.Id -match 'WixToolset.VisualStudioExtension.Dev' -and $_.type -eq 'vsix'}).Version $wixPackages = @( @{Package = "WIX Toolset Studio $vs Extension"; Version = $wixExtensionVersion} diff --git a/images/win/scripts/Tests/MSYS2.Tests.ps1 b/images/win/scripts/Tests/MSYS2.Tests.ps1 index 85e1fc512842..da2444fdfb44 100644 --- a/images/win/scripts/Tests/MSYS2.Tests.ps1 +++ b/images/win/scripts/Tests/MSYS2.Tests.ps1 @@ -16,7 +16,7 @@ Describe "MSYS2 packages" { @{ ToolName = "bash.exe" } ) - if ((Test-IsWin16) -or (Test-IsWin19)) { + if (Test-IsWin19) { $TestCases += @( @{ ToolName = "tar.exe" } @{ ToolName = "make.exe" } diff --git a/images/win/scripts/Tests/Tools.Tests.ps1 b/images/win/scripts/Tests/Tools.Tests.ps1 index 08f27f715133..1086a3ec5051 100644 --- a/images/win/scripts/Tests/Tools.Tests.ps1 +++ b/images/win/scripts/Tests/Tools.Tests.ps1 @@ -160,16 +160,12 @@ Describe "Vcpkg" { } Describe "VCRedist" -Skip:(Test-IsWin22) { - It "vcredist_140" -Skip:(Test-IsWin19) { - "C:\Windows\System32\vcruntime140.dll" | Should -Exist - } - - It "vcredist_2010_x64" -Skip:(Test-IsWin16) { + It "vcredist_2010_x64" { "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{1D8E6291-B0D5-35EC-8441-6616F567A0F7}" | Should -Exist "C:\Windows\System32\msvcr100.dll" | Should -Exist } - It "vcredist_2010_x64" -Skip:(Test-IsWin16) { + It "vcredist_2010_x64" { "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{1D8E6291-B0D5-35EC-8441-6616F567A0F7}" | Should -Exist "C:\Windows\System32\msvcr100.dll" | Should -Exist } @@ -201,7 +197,7 @@ Describe "Kotlin" { } } -Describe "SQL OLEDB Driver" -Skip:(Test-IsWin16) { +Describe "SQL OLEDB Driver" { It "SQL OLEDB Driver" { "HKLM:\SOFTWARE\Microsoft\MSOLEDBSQL" | Should -Exist } diff --git a/images/win/scripts/Tests/VisualStudio.Tests.ps1 b/images/win/scripts/Tests/VisualStudio.Tests.ps1 index e60fce92b5c8..79643f0d2bd1 100644 --- a/images/win/scripts/Tests/VisualStudio.Tests.ps1 +++ b/images/win/scripts/Tests/VisualStudio.Tests.ps1 @@ -25,7 +25,7 @@ Describe "Visual Studio" { } Describe "Windows 10 SDK" { - It "Verifies 17763 SDK is installed" -Skip:((Test-IsWin16) -or (Test-IsWin19)) { + It "Verifies 17763 SDK is installed" -Skip:(Test-IsWin19) { "${env:ProgramFiles(x86)}\Windows Kits\10\DesignTime\CommonConfiguration\Neutral\UAP\10.0.17763.0\UAP.props" | Should -Exist } } \ No newline at end of file diff --git a/images/win/scripts/Tests/WindowsFeatures.Tests.ps1 b/images/win/scripts/Tests/WindowsFeatures.Tests.ps1 index 7c754967c005..973105396850 100644 --- a/images/win/scripts/Tests/WindowsFeatures.Tests.ps1 +++ b/images/win/scripts/Tests/WindowsFeatures.Tests.ps1 @@ -51,7 +51,7 @@ Describe "GDIProcessHandleQuota" { } } -Describe "Test Signed Drivers" -Skip:(Test-IsWin16) { +Describe "Test Signed Drivers" { It "bcdedit testsigning should be Yes"{ "$(bcdedit)" | Should -Match "testsigning\s+Yes" } diff --git a/images/win/toolsets/toolset-2016.json b/images/win/toolsets/toolset-2016.json deleted file mode 100644 index 1a0aaab6df64..000000000000 --- a/images/win/toolsets/toolset-2016.json +++ /dev/null @@ -1,454 +0,0 @@ -{ - "toolcache": [ - { - "name": "Ruby", - "arch": "x64", - "platform" : "win32", - "versions": [ - "2.4", - "2.5", - "2.6", - "2.7", - "3.0" - ], - "default": "2.5" - }, - { - "name": "Python", - "url" : "https://raw.githubusercontent.com/actions/python-versions/main/versions-manifest.json", - "arch": "x64", - "platform" : "win32", - "versions": [ - "2.7.*", - "3.6.*", - "3.7.*", - "3.8.*", - "3.9.*", - "3.10.*" - ], - "default": "3.7.*" - }, - { - "name": "Python", - "url" : "https://raw.githubusercontent.com/actions/python-versions/main/versions-manifest.json", - "arch": "x86", - "platform" : "win32", - "versions": [ - "2.7.*", - "3.6.*", - "3.7.*", - "3.8.*", - "3.9.*" - ] - }, - { - "name": "PyPy", - "arch": "x86", - "platform" : "win64", - "versions": [ - "2.7", - "3.6", - "3.7", - "3.8", - "3.9" - ] - }, - { - "name": "node", - "url" : "https://raw.githubusercontent.com/actions/node-versions/main/versions-manifest.json", - "arch": "x64", - "platform" : "win32", - "versions": [ - "12.*", - "14.*", - "16.*" - ] - }, - { - "name": "go", - "url" : "https://raw.githubusercontent.com/actions/go-versions/main/versions-manifest.json", - "arch": "x64", - "platform" : "win32", - "versions": [ - "1.16.*", - "1.17.*", - "1.18.*" - ], - "default": "1.17.*" - } - ], - "powershellModules": [ - {"name": "DockerMsftProvider"}, - {"name": "MarkdownPS"}, - {"name": "Pester"}, - {"name": "PowerShellGet"}, - {"name": "PSScriptAnalyzer"}, - {"name": "PSWindowsUpdate"}, - {"name": "SqlServer"}, - {"name": "VSSetup"}, - {"name": "Microsoft.Graph"}, - {"name": "AWSPowershell"} - ], - "azureModules": [ - { - "name": "azurerm", - "blob_url": "https://vstsagenttools.blob.core.windows.net/tools/azurepowershellmodules/", - "versions": [ - "2.1.0", - "6.13.1" - ], - "zip_versions": [ - "3.8.0", - "4.2.1", - "5.1.1", - "6.7.0" - ], - "default": "2.1.0" - }, - { - "name": "azure", - "blob_url": "https://vstsagenttools.blob.core.windows.net/tools/azurepowershellmodules/", - "versions": [ - "2.1.0", - "5.3.0" - ], - "zip_versions": [ - "3.8.0", - "4.2.1", - "5.1.1" - ], - "default": "2.1.0" - }, - { - "name": "az", - "url" : "https://raw.githubusercontent.com/Azure/az-ps-module-versions/main/versions-manifest.json", - "versions": [ - "7.1.0" - ], - "zip_versions": [ - "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.7.0", - "5.5.0", - "5.9.0", - "6.6.0" - ] - } - ], - "java": { - "default": "8", - "default_vendor": "Temurin-Hotspot", - "vendors": [ - { - "name": "Temurin-Hotspot", - "versions": [ "8", "11", "17" ] - }, - { - "name": "Adopt", - "versions": [ "8", "11", "13" ] - } - ] - }, - "android": { - "cmdline-tools": "latest", - "platform_min_version": "19", - "build_tools_min_version": "19.1.0", - "extra_list": [ - "android;m2repository", - "google;m2repository", - "google;google_play_services", - "m2repository;com;android;support;constraint;constraint-layout-solver;1.0.2", - "m2repository;com;android;support;constraint;constraint-layout-solver;1.0.1", - "m2repository;com;android;support;constraint;constraint-layout;1.0.2", - "m2repository;com;android;support;constraint;constraint-layout;1.0.1" - ], - "addon_list": [ - "addon-google_apis-google-24", - "addon-google_apis-google-23", - "addon-google_apis-google-22", - "addon-google_apis-google-21" - ], - "additional_tools": [ - "cmake;3.10.2.4988404", - "cmake;3.18.1", - "patcher;v4" - ], - "ndk": { - "default": "21", - "versions": [ - "21", "22", "23" - ] - } - }, - "mingw": { - "version": "8.1.0" - }, - "MsysPackages": { - "msys2": [ - "base-devel", - "compression" - ], - "mingw": [ - { - "arch": "mingw-w64-x86_64", - "exec_dir": "mingw64", - "runtime_packages": [ - { - "name": "clang", - "executables": [ - "clang", - "g++", - "gcc" - ] - }, - { - "name": "cmake", - "executables": [ - "cmake", - "cpack", - "ctest" - ] - }, - { - "name": "ragel", - "executables": [ - "ragel" - ] - } - ], - "additional_packages": [ - "clang-tools-extra", - "libxml2", - "llvm", - "toolchain" - ] - }, - { - "arch": "mingw-w64-i686", - "exec_dir": "mingw32", - "runtime_packages": [ - { - "name": "clang", - "executables": [ - "clang", - "g++", - "gcc" - ] - }, - { - "name": "cmake", - "executables": [ - "cmake", - "cpack", - "ctest" - ] - }, - { - "name": "ragel", - "executables": [ - "ragel" - ] - } - ], - "additional_packages": [ - "libxml2", - "llvm", - "toolchain" - ] - } - ] - }, - "windowsFeatures": [ - { "name": "NET-Framework-Features", "includeAllSubFeatures": true }, - { "name": "NET-Framework-45-Features", "includeAllSubFeatures": true }, - { "name": "BITS", "includeAllSubFeatures": true }, - { "name": "DSC-Service" }, - { "name": "FS-iSCSITarget-Server", "includeAllSubFeatures": true, "includeManagementTools": true }, - { "name": "Containers" } - ], - "visualStudio": { - "version" : "2017", - "subversion" : "15", - "edition" : "Enterprise", - "channel": "release", - "workloads": [ - "Microsoft.Net.Component.4.6.2.SDK", - "Microsoft.Net.Component.4.6.2.TargetingPack", - "Microsoft.Net.ComponentGroup.4.6.2.DeveloperTools", - "Microsoft.Net.Component.4.7.SDK", - "Microsoft.Net.Component.4.7.TargetingPack", - "Microsoft.Net.ComponentGroup.4.7.DeveloperTools", - "Microsoft.Net.Component.4.7.1.SDK", - "Microsoft.Net.Component.4.7.1.TargetingPack", - "Microsoft.Net.ComponentGroup.4.7.1.DeveloperTools", - "Microsoft.Net.Component.4.7.2.SDK", - "Microsoft.Net.Component.4.7.2.TargetingPack", - "Microsoft.Net.ComponentGroup.4.7.2.DeveloperTools", - "Microsoft.Net.Core.Component.SDK.1x", - "Microsoft.NetCore.1x.ComponentGroup.Web", - "Microsoft.VisualStudio.Component.Azure.Storage.AzCopy", - "Microsoft.VisualStudio.Component.VC.140", - "Component.Dotfuscator", - "Microsoft.VisualStudio.Component.VC.ATL", - "Microsoft.VisualStudio.Component.VC.ATL.ARM", - "Microsoft.VisualStudio.Component.VC.ATL.ARM64", - "Microsoft.VisualStudio.Component.VC.ATLMFC", - "Microsoft.VisualStudio.Component.VC.ClangC2", - "Microsoft.VisualStudio.Component.VC.CLI.Support", - "Microsoft.VisualStudio.Component.VC.Modules.x86.x64", - "Microsoft.VisualStudio.Component.Windows10SDK.10240", - "Microsoft.VisualStudio.Component.Windows10SDK.10586", - "Microsoft.VisualStudio.Component.Windows10SDK.14393", - "Microsoft.VisualStudio.Component.Windows10SDK.15063.Desktop", - "Component.Unreal", - "Component.Unreal.Android", - "Component.Android.SDK23", - "Microsoft.VisualStudio.Component.TestTools.WebLoadTest", - "Microsoft.VisualStudio.Web.Mvc4.ComponentGroup", - "Component.Linux.CMake", - "Microsoft.Component.PythonTools.UWP", - "Microsoft.Component.VC.Runtime.OSSupport", - "Microsoft.VisualStudio.Component.VC.Tools.ARM", - "Microsoft.VisualStudio.ComponentGroup.UWP.VC", - "Microsoft.VisualStudio.Component.VSSDK", - "Microsoft.VisualStudio.Component.LinqToSql", - "Microsoft.VisualStudio.Component.TestTools.CodedUITest", - "Microsoft.VisualStudio.Component.TestTools.Core", - "Microsoft.VisualStudio.Component.TypeScript.2.0", - "Microsoft.VisualStudio.Component.TypeScript.2.1", - "Microsoft.VisualStudio.Component.TypeScript.2.2", - "Microsoft.VisualStudio.Component.VC.Tools.ARM64", - "Microsoft.VisualStudio.Component.Windows10SDK.16299.Desktop.arm", - "Microsoft.VisualStudio.Component.DslTools", - "Microsoft.VisualStudio.Component.Windows81SDK", - "Microsoft.VisualStudio.Component.WinXP", - "Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Win81", - "Microsoft.VisualStudio.ComponentGroup.NativeDesktop.WinXP", - "Microsoft.VisualStudio.ComponentGroup.ArchitectureTools.Managed", - "Microsoft.Component.Blend.SDK.WPF", - "Microsoft.Component.VC.Runtime.UCRTSDK", - "Microsoft.VisualStudio.Component.Sharepoint.Tools", - "Microsoft.VisualStudio.Component.TeamOffice", - "Microsoft.VisualStudio.Component.VC.ATL.Spectre", - "Microsoft.VisualStudio.Component.VC.ATL.ARM.Spectre", - "Microsoft.VisualStudio.Component.VC.ATL.ARM64.Spectre", - "Microsoft.VisualStudio.Component.VC.ATLMFC.Spectre", - "Microsoft.VisualStudio.Component.Windows10SDK.17134", - "Microsoft.VisualStudio.Component.Windows10SDK.17763", - "Microsoft.VisualStudio.Component.VC.Runtimes.x86.x64.Spectre", - "Microsoft.VisualStudio.Component.VC.Runtimes.ARM.Spectre", - "Microsoft.VisualStudio.Component.VC.Runtimes.ARM64.Spectre", - "Microsoft.VisualStudio.Component.Workflow", - "Microsoft.VisualStudio.Workload.Office" - ], - "vsix": [ - "WixToolset.WixToolsetVisualStudio2017Extension" - ] - }, - "docker": { - "images": [ - "mcr.microsoft.com/windows/servercore:ltsc2016", - "mcr.microsoft.com/windows/nanoserver:10.0.14393.953", - "mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2016", - "mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2016", - "mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2016" - ] - }, - "pipx": [ - { - "package": "yamllint", - "cmd": "yamllint --version" - } - ], - "selenium": { - "version": "4", - "binary_name": "selenium-server" - }, - "npm": { - "global_packages": [ - { "name": "yarn", "test": "yarn --version" }, - { "name": "newman", "test": "newman --version" }, - { "name": "lerna", "test": "lerna --version" }, - { "name": "typescript", "test": "tsc --version" }, - { "name": "cordova" }, - { "name": "grunt-cli", "test": "grunt --version" }, - { "name": "gulp-cli", "test": "gulp --version" }, - { "name": "parcel", "test": "parcel --version" }, - { "name": "webpack" }, - { "name": "webpack-cli" }, - { "name": "node-sass" } - ] - }, - "dotnet": { - "versions": [ - "3.1", - "5.0" - ], - "tools": [ - { "name": "nbgv", "test": "nbgv --version", "getversion": "nbgv --version" } - ], - "warmup": true - }, - "choco": { - "common_packages": [ - { "name": "7zip.install" }, - { "name": "aria2" }, - { "name": "azcopy10" }, - { "name": "Bicep" }, - { "name": "gitversion.portable" }, - { "name": "innosetup" }, - { "name": "jq" }, - { "name": "NuGet.CommandLine" }, - { - "name": "openssl.light", - "args": [ "--version=1.1.1.20181020" ] - }, - { "name": "packer" }, - { "name": "strawberryperl" }, - { "name": "pulumi" }, - { "name": "tortoisesvn" }, - { "name": "swig" }, - { "name": "vswhere" }, - { - "name": "julia", - "args": [ "--ia", "/DIR=C:\\Julia" ] - }, - { - "name": "cmake.install", - "args": [ "--installargs", "ADD_CMAKE_TO_PATH=\"System\"" ] - } - ] - }, - "node": { - "default": "16" - }, - "mysql": { - "version": "5.7" - }, - "mongodb": { - "version": "5.0" - }, - "nsis": { - "version": "3.08" - }, - "php": { - "version": "8.1" - }, - "llvm": { - "version": "13" - }, - "postgresql": { - "version": "14" - }, - "kotlin": { - "version": "latest", - "binary_name": "kotlin-compiler" - } -} diff --git a/images/win/windows2016.json b/images/win/windows2016.json deleted file mode 100644 index 901d164d457a..000000000000 --- a/images/win/windows2016.json +++ /dev/null @@ -1,322 +0,0 @@ -{ - "variables": { - "client_id": "{{env `ARM_CLIENT_ID`}}", - "client_secret": "{{env `ARM_CLIENT_SECRET`}}", - "client_cert_path": "{{env `ARM_CLIENT_CERT_PATH`}}", - "subscription_id": "{{env `ARM_SUBSCRIPTION_ID`}}", - "tenant_id": "{{env `ARM_TENANT_ID`}}", - "object_id": "{{env `ARM_OBJECT_ID`}}", - "resource_group": "{{env `ARM_RESOURCE_GROUP`}}", - "storage_account": "{{env `ARM_STORAGE_ACCOUNT`}}", - "build_resource_group_name": "{{env `BUILD_RESOURCE_GROUP_NAME`}}", - "temp_resource_group_name": "{{env `TEMP_RESOURCE_GROUP_NAME`}}", - "location": "{{env `ARM_RESOURCE_LOCATION`}}", - "virtual_network_name": "{{env `VNET_NAME`}}", - "virtual_network_resource_group_name": "{{env `VNET_RESOURCE_GROUP`}}", - "virtual_network_subnet_name": "{{env `VNET_SUBNET`}}", - "private_virtual_network_with_public_ip": "{{env `PRIVATE_VIRTUAL_NETWORK_WITH_PUBLIC_IP`}}", - "allowed_inbound_ip_addresses": "{{env `AGENT_IP`}}", - "vm_size": "Standard_D8s_v4", - "image_folder": "C:\\image", - "imagedata_file": "C:\\imagedata.json", - "helper_script_folder": "C:\\Program Files\\WindowsPowerShell\\Modules\\", - "psmodules_root_folder": "C:\\Modules", - "agent_tools_directory": "C:\\hostedtoolcache\\windows", - "install_user": "installer", - "install_password": null, - "capture_name_prefix": "packer", - "image_version": "dev", - "image_os": "win16" - }, - "sensitive-variables": [ - "install_password", - "client_secret" - ], - "builders": [ - { - "name": "vhd", - "type": "azure-arm", - "client_id": "{{user `client_id`}}", - "client_secret": "{{user `client_secret`}}", - "client_cert_path": "{{user `client_cert_path`}}", - "subscription_id": "{{user `subscription_id`}}", - "object_id": "{{user `object_id`}}", - "tenant_id": "{{user `tenant_id`}}", - "os_disk_size_gb": "256", - "location": "{{user `location`}}", - "vm_size": "{{user `vm_size`}}", - "resource_group_name": "{{user `resource_group`}}", - "storage_account": "{{user `storage_account`}}", - "build_resource_group_name": "{{user `build_resource_group_name`}}", - "temp_resource_group_name": "{{user `temp_resource_group_name`}}", - "capture_container_name": "images", - "capture_name_prefix": "{{user `capture_name_prefix`}}", - "virtual_network_name": "{{user `virtual_network_name`}}", - "virtual_network_resource_group_name": "{{user `virtual_network_resource_group_name`}}", - "virtual_network_subnet_name": "{{user `virtual_network_subnet_name`}}", - "private_virtual_network_with_public_ip": "{{user `private_virtual_network_with_public_ip`}}", - "allowed_inbound_ip_addresses": "{{user `allowed_inbound_ip_addresses`}}", - "os_type": "Windows", - "image_publisher": "MicrosoftWindowsServer", - "image_offer": "WindowsServer", - "image_sku": "2016-Datacenter", - "communicator": "winrm", - "winrm_use_ssl": "true", - "winrm_insecure": "true", - "winrm_username": "packer" - } - ], - "provisioners": [ - { - "type": "powershell", - "inline": [ - "New-Item -Path {{user `image_folder`}} -ItemType Directory -Force" - ] - }, - { - "type": "file", - "source": "{{ template_dir }}/scripts/ImageHelpers", - "destination": "{{user `helper_script_folder`}}" - }, - { - "type": "file", - "source": "{{ template_dir }}/scripts/SoftwareReport", - "destination": "{{user `image_folder`}}" - }, - { - "type": "file", - "source": "{{ template_dir }}/post-generation", - "destination": "C:/" - }, - { - "type": "file", - "source": "{{ template_dir }}/scripts/Tests", - "destination": "{{user `image_folder`}}" - }, - { - "type": "file", - "source": "{{template_dir}}/toolsets/toolset-2016.json", - "destination": "{{user `image_folder`}}\\toolset.json" - }, - { - "type": "windows-shell", - "inline": [ - "net user {{user `install_user`}} {{user `install_password`}} /add /passwordchg:no /passwordreq:yes /active:yes /Y", - "net localgroup Administrators {{user `install_user`}} /add", - "winrm set winrm/config/service/auth @{Basic=\"true\"}", - "winrm get winrm/config/service/auth" - ] - }, - { - "type": "powershell", - "inline": [ - "if (-not ((net localgroup Administrators) -contains '{{user `install_user`}}')) { exit 1 }" - ] - }, - { - "type": "powershell", - "environment_vars": [ - "IMAGE_VERSION={{user `image_version`}}", - "IMAGE_OS={{user `image_os`}}", - "AGENT_TOOLSDIRECTORY={{user `agent_tools_directory`}}", - "IMAGEDATA_FILE={{user `imagedata_file`}}" - ], - "scripts": [ - "{{ template_dir }}/scripts/Installers/Configure-Antivirus.ps1", - "{{ template_dir }}/scripts/Installers/Install-PowerShellModules.ps1", - "{{ template_dir }}/scripts/Installers/Install-WindowsFeatures.ps1", - "{{ template_dir }}/scripts/Installers/Install-Choco.ps1", - "{{ template_dir }}/scripts/Installers/Initialize-VM.ps1", - "{{ template_dir }}/scripts/Installers/Update-ImageData.ps1", - "{{ template_dir }}/scripts/Installers/Update-DotnetTLS.ps1" - ], - "execution_policy": "unrestricted" - }, - { - "type": "windows-restart", - "restart_timeout": "30m" - }, - { - "type": "powershell", - "scripts": [ - "{{ template_dir }}/scripts/Installers/Install-VCRedist.ps1", - "{{ template_dir }}/scripts/Installers/Install-Docker.ps1", - "{{ template_dir }}/scripts/Installers/Install-PowershellCore.ps1", - "{{ template_dir }}/scripts/Installers/Install-WebPlatformInstaller.ps1" - ] - }, - { - "type": "windows-restart", - "restart_timeout": "30m" - }, - { - "type": "powershell", - "valid_exit_codes": [ - 0, - 3010 - ], - "scripts": [ - "{{ template_dir }}/scripts/Installers/Install-VS.ps1", - "{{ template_dir }}/scripts/Installers/Install-KubernetesTools.ps1", - "{{ template_dir }}/scripts/Installers/Install-NET48.ps1", - "{{ template_dir }}/scripts/Installers/Windows2016/Install-SSDT.ps1" - ], - "elevated_user": "{{user `install_user`}}", - "elevated_password": "{{user `install_password`}}" - }, - { - "type": "powershell", - "scripts": [ - "{{ template_dir }}/scripts/Installers/Install-ServiceFabricSDK.ps1" - ], - "execution_policy": "remotesigned" - }, - { - "type": "windows-restart", - "restart_timeout": "30m" - }, - { - "type": "powershell", - "scripts": [ - "{{ template_dir }}/scripts/Installers/Install-Wix.ps1", - "{{ template_dir }}/scripts/Installers/Install-WDK.ps1", - "{{ template_dir }}/scripts/Installers/Install-Vsix.ps1", - "{{ template_dir }}/scripts/Installers/Install-AzureCli.ps1", - "{{ template_dir }}/scripts/Installers/Install-AzureDevOpsCli.ps1", - "{{ template_dir }}/scripts/Installers/Install-CommonUtils.ps1", - "{{ template_dir }}/scripts/Installers/Install-AliyunCli.ps1", - "{{ template_dir }}/scripts/Installers/Install-PostgreSQL.ps1", - "{{ template_dir }}/scripts/Installers/Install-JavaTools.ps1", - "{{ template_dir }}/scripts/Installers/Install-Kotlin.ps1", - "{{ template_dir }}/scripts/Installers/Install-Ruby.ps1", - "{{ template_dir }}/scripts/Installers/Install-PyPy.ps1", - "{{ template_dir }}/scripts/Installers/Install-Toolset.ps1", - "{{ template_dir }}/scripts/Installers/Configure-Toolset.ps1", - "{{ template_dir }}/scripts/Installers/Install-NodeLts.ps1", - "{{ template_dir }}/scripts/Installers/Install-Bazel.ps1", - "{{ template_dir }}/scripts/Installers/Install-AndroidSDK.ps1", - "{{ template_dir }}/scripts/Installers/Install-Pipx.ps1", - "{{ template_dir }}/scripts/Installers/Install-PipxPackages.ps1", - "{{ template_dir }}/scripts/Installers/Install-Sbt.ps1", - "{{ template_dir }}/scripts/Installers/Install-Git.ps1", - "{{ template_dir }}/scripts/Installers/Install-GitHub-CLI.ps1", - "{{ template_dir }}/scripts/Installers/Install-PHP.ps1", - "{{ template_dir }}/scripts/Installers/Install-Rust.ps1", - "{{ template_dir }}/scripts/Installers/Install-Chrome.ps1", - "{{ template_dir }}/scripts/Installers/Install-Edge.ps1", - "{{ template_dir }}/scripts/Installers/Install-Firefox.ps1", - "{{ template_dir }}/scripts/Installers/Install-Selenium.ps1", - "{{ template_dir }}/scripts/Installers/Install-IEWebDriver.ps1", - "{{ template_dir }}/scripts/Installers/Install-Apache.ps1", - "{{ template_dir }}/scripts/Installers/Install-Nginx.ps1", - "{{ template_dir }}/scripts/Installers/Install-LLVM.ps1" - ] - }, - { - "type": "windows-shell", - "inline": [ - "wmic product where \"name like '%%microsoft azure powershell%%'\" call uninstall /nointeractive" - ] - }, - { - "type": "powershell", - "scripts": [ - "{{ template_dir }}/scripts/Installers/Install-AzureModules.ps1", - "{{ template_dir }}/scripts/Installers/Install-WinAppDriver.ps1", - "{{ template_dir }}/scripts/Installers/Install-R.ps1", - "{{ template_dir }}/scripts/Installers/Install-AWS.ps1", - "{{ template_dir }}/scripts/Installers/Install-DACFx.ps1", - "{{ template_dir }}/scripts/Installers/Install-MysqlCli.ps1", - "{{ template_dir }}/scripts/Installers/Install-SQLPowerShellTools.ps1", - "{{ template_dir }}/scripts/Installers/Install-DotnetSDK.ps1", - "{{ template_dir }}/scripts/Installers/Install-Msys2.ps1", - "{{ template_dir }}/scripts/Installers/Install-Mingw64.ps1", - "{{ template_dir }}/scripts/Installers/Install-Haskell.ps1", - "{{ template_dir }}/scripts/Installers/Install-Stack.ps1", - "{{ template_dir }}/scripts/Installers/Install-Miniconda.ps1", - "{{ template_dir }}/scripts/Installers/Install-AzureCosmosDbEmulator.ps1", - "{{ template_dir }}/scripts/Installers/Install-Mercurial.ps1", - "{{ template_dir }}/scripts/Installers/Install-Zstd.ps1", - "{{ template_dir }}/scripts/Installers/Install-NSIS.ps1", - "{{ template_dir }}/scripts/Installers/Install-CloudFoundryCli.ps1", - "{{ template_dir }}/scripts/Installers/Install-Vcpkg.ps1", - "{{ template_dir }}/scripts/Installers/Install-MongoDB.ps1", - "{{ template_dir }}/scripts/Installers/Install-GoogleCloudSDK.ps1", - "{{ template_dir }}/scripts/Installers/Install-CodeQLBundle.ps1", - "{{ template_dir }}/scripts/Installers/Disable-JITDebugger.ps1" - ] - }, - { - "type": "powershell", - "scripts": [ - "{{ template_dir }}/scripts/Installers/Install-WindowsUpdates.ps1", - "{{ template_dir }}/scripts/Installers/Configure-DynamicPort.ps1", - "{{ template_dir }}/scripts/Installers/Configure-GDIProcessHandleQuota.ps1", - "{{ template_dir }}/scripts/Installers/Configure-Shell.ps1", - "{{ template_dir }}/scripts/Installers/Enable-DeveloperMode.ps1" - ], - "elevated_user": "{{user `install_user`}}", - "elevated_password": "{{user `install_password`}}" - }, - { - "type": "windows-restart", - "check_registry": true, - "restart_check_command": "powershell -command \"& {if ((-not (Get-Process TiWorker.exe -ErrorAction SilentlyContinue)) -and (-not [System.Environment]::HasShutdownStarted) ) { Write-Output 'Restart complete' }}\"", - "restart_timeout": "30m" - }, - { - "type": "powershell", - "pause_before": "2m", - "scripts": [ - "{{ template_dir }}/scripts/Installers/Wait-WindowsUpdatesForInstall.ps1", - "{{ template_dir }}/scripts/Tests/RunAll-Tests.ps1" - ] - }, - { - "type": "powershell", - "inline": [ - "if (-not (Test-Path {{user `image_folder`}}\\Tests\\testResults.xml)) { throw '{{user `image_folder`}}\\Tests\\testResults.xml not found' }" - ] - }, - { - "type": "powershell", - "inline": [ - "pwsh -File '{{user `image_folder`}}\\SoftwareReport\\SoftwareReport.Generator.ps1'" - ], - "environment_vars": [ - "IMAGE_VERSION={{user `image_version`}}" - ] - }, - { - "type": "powershell", - "inline": [ - "if (-not (Test-Path C:\\InstalledSoftware.md)) { throw 'C:\\InstalledSoftware.md not found' }" - ] - }, - { - "type": "file", - "source": "C:\\InstalledSoftware.md", - "destination": "{{ template_dir }}/Windows2016-Readme.md", - "direction": "download" - }, - { - "type": "powershell", - "skip_clean": true, - "scripts": [ - "{{ template_dir }}/scripts/Installers/Finalize-VM.ps1" - ] - }, - { - "type": "windows-restart", - "restart_timeout": "30m" - }, - { - "type": "powershell", - "inline": [ - "if( Test-Path $Env:SystemRoot\\System32\\Sysprep\\unattend.xml ){ rm $Env:SystemRoot\\System32\\Sysprep\\unattend.xml -Force}", - "& $env:SystemRoot\\System32\\Sysprep\\Sysprep.exe /oobe /generalize /quiet /quit", - "while($true) { $imageState = Get-ItemProperty HKLM:\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Setup\\State | Select ImageState; if($imageState.ImageState -ne 'IMAGE_STATE_GENERALIZE_RESEAL_TO_OOBE') { Write-Output $imageState.ImageState; Start-Sleep -s 10 } else { break } }" - ] - } - ] -} From 7462d17cd2b3b54974b8ccc5eaeaa2118220953b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 2 Aug 2022 10:05:48 +0000 Subject: [PATCH 1360/3485] Updating readme file for ubuntu22 version 20220731.1 (#5995) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2204-Readme.md | 72 ++++++++++++++++--------------- 1 file changed, 38 insertions(+), 34 deletions(-) diff --git a/images/linux/Ubuntu2204-Readme.md b/images/linux/Ubuntu2204-Readme.md index 9121ab584423..9c92d678967f 100644 --- a/images/linux/Ubuntu2204-Readme.md +++ b/images/linux/Ubuntu2204-Readme.md @@ -1,12 +1,13 @@ | Announcements | |-| +| ['virtual-environments' repository name will be changed to 'runner-images' on August, 8th](https://github.com/actions/virtual-environments/issues/5967) | | [[all OSs] Android NDK 21 will be replaced in favor of 25 on August, 1st](https://github.com/actions/virtual-environments/issues/5930) | | [[all OSs] Android ndk-bundle along with old NDK versions will be deprecated on July, 24](https://github.com/actions/virtual-environments/issues/5879) | | [(Public Beta) Ubuntu 22.04 is now available](https://github.com/actions/virtual-environments/issues/5490) | *** # Ubuntu 22.04 LTS - Linux kernel version: 5.15.0-1014-azure -- Image Version: 20220724.1 +- Image Version: 20220731.1 ## Installed Software ### Language and Runtime @@ -38,7 +39,7 @@ - Pip3 22.0.2 - Pipx 1.1.0 - RubyGems 3.3.5 -- Vcpkg (build from master \<f93ba152d>) +- Vcpkg (build from master \<66045de4d>) - Yarn 1.22.19 #### Environment variables @@ -48,7 +49,7 @@ | VCPKG_INSTALLATION_ROOT | /usr/local/share/vcpkg | ### Project Management -- Lerna 5.2.0 +- Lerna 5.3.0 ### Tools - Ansible 2.13.2 @@ -58,8 +59,8 @@ - Bazelisk 1.12.0 - Bicep 0.8.9 - Buildah 1.23.1 -- CMake 3.23.2 -- CodeQL Action Bundle 2.10.0 +- CMake 3.23.3 +- CodeQL Action Bundle 2.10.1 - Docker Amazon ECR Credential Helper 0.6.0 - Docker Compose v1 1.29.2 - Docker Compose v2 2.6.1+azure-1 @@ -75,7 +76,7 @@ - jq 1.6 - Kind 0.14.0 - Kubectl 1.24.3 -- Kustomize 4.5.5 +- Kustomize 4.5.6 - Leiningen 2.9.8 - MediaInfo 21.09 - Mercurial 6.1.1 @@ -87,56 +88,56 @@ - Packer 1.8.2 - Parcel 2.6.2 - Podman 3.4.4 -- Pulumi 3.36.0 +- Pulumi 3.37.2 - R 4.2.1 - Skopeo 1.4.1 - Sphinx Open Source Search Server 2.2.11 - SVN 1.14.1 -- Terraform 1.2.5 +- Terraform 1.2.6 - yamllint 1.27.1 - yq 4.26.1 - zstd 1.5.2 (homebrew) ### CLI Tools - Alibaba Cloud CLI 3.0.124 -- AWS CLI 2.7.18 +- AWS CLI 2.7.20 - AWS CLI Session manager plugin 1.2.339.0 - AWS SAM CLI 1.53.0 - Azure CLI (azure-cli) 2.38.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.25.0 -- GitHub CLI 2.14.2 +- GitHub CLI 2.14.3 - Google Cloud SDK 369.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 10.11.1 +- Netlify CLI 10.13.0 - OpenShift CLI 4.10.24 - ORAS CLI 0.13.0 -- Vercel CLI 27.2.0 +- Vercel CLI 27.3.3 ### Java -| Version | Vendor | Environment Variable | -| -------------------- | --------------- | -------------------- | -| 8.0.332+9 | Eclipse Temurin | JAVA_HOME_8_X64 | -| 11.0.15+10 (default) | Eclipse Temurin | JAVA_HOME_11_X64 | -| 17.0.3+7 | Eclipse Temurin | JAVA_HOME_17_X64 | +| Version | Vendor | Environment Variable | +| ------------------- | --------------- | -------------------- | +| 8.0.332+9 | Eclipse Temurin | JAVA_HOME_8_X64 | +| 11.0.16+8 (default) | Eclipse Temurin | JAVA_HOME_11_X64 | +| 17.0.4+8 | Eclipse Temurin | JAVA_HOME_17_X64 | ### GraalVM | Version | Environment variables | | --------- | --------------------- | -| CE 22.1.0 | GRAALVM_11_ROOT | +| CE 22.2.0 | GRAALVM_11_ROOT | ### PHP | Tool | Version | | -------- | ------- | | PHP | 8.1.8 | | Composer | 2.3.10 | -| PHPUnit | 8.5.27 | +| PHPUnit | 8.5.28 | ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ``` ### Haskell - Cabal 3.6.2.0 -- GHC 9.2.3 -- GHCup 0.1.17.8 +- GHC 9.2.4 +- GHCup 0.1.18.0 - Stack 2.7.5 ### Rust Tools @@ -157,8 +158,8 @@ - Google Chrome 103.0.5060.134 - ChromeDriver 103.0.5060.134 - Chromium 103.0.5060.0 -- Microsoft Edge 103.0.1264.71 (apt source repository: https://packages.microsoft.com/repos/edge) -- Microsoft Edge WebDriver 103.0.1264.71 +- Microsoft Edge 103.0.1264.77 (apt source repository: https://packages.microsoft.com/repos/edge) +- Microsoft Edge WebDriver 103.0.1264.77 - Selenium server 4.3.0 #### Environment variables @@ -186,7 +187,7 @@ PostgreSQL service is disabled by default. Use the following command as a part of your job to start the service: 'sudo systemctl start postgresql.service' ``` #### MySQL -- MySQL 8.0.29-0ubuntu0.22.04.2 +- MySQL 8.0.30-0ubuntu0.22.04.1 - MySQL Server (user:root password:root) ``` @@ -251,17 +252,20 @@ | Android SDK Platforms | android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | | Android SDK Tools | 26.1.1 | | Android Support Repository | 47.0.0 | -| CMake | 3.10.2<br>3.18.1 | +| CMake | 3.10.2<br>3.18.1<br>3.22.1 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 21.4.7075529<br>23.2.8568313<br>24.0.8215888 | +| NDK | 23.2.8568313<br>24.0.8215888<br>25.0.8775105 (default) | | SDK Patch Applier v4 | 1 | #### Environment variables | Name | Value | | ----------------------- | ------------------------------------------- | | ANDROID_HOME | /usr/local/lib/android/sdk | -| ANDROID_NDK_LATEST_HOME | /usr/local/lib/android/sdk/ndk/24.0.8215888 | +| ANDROID_NDK | /usr/local/lib/android/sdk/ndk/25.0.8775105 | +| ANDROID_NDK_HOME | /usr/local/lib/android/sdk/ndk/25.0.8775105 | +| ANDROID_NDK_LATEST_HOME | /usr/local/lib/android/sdk/ndk/25.0.8775105 | +| ANDROID_NDK_ROOT | /usr/local/lib/android/sdk/ndk/25.0.8775105 | | ANDROID_SDK_ROOT | /usr/local/lib/android/sdk | ### Cached Docker images @@ -269,15 +273,15 @@ | ----------------------- | ------------------------------------------------------------------------ | ---------- | | alpine:3.14 | sha256:43eb8f0d8215d8661f745f3d88563c026614d843b668b233bbe1666b6d026f61 | 2022-07-19 | | alpine:3.15 | sha256:0483110c51a764abe175a8cefb941541ca0bc0f628ce418d3a660338abf4622a | 2022-07-19 | -| buildpack-deps:bullseye | sha256:4cbb6d56f192ea1868bdbc441269d0343c90b201c973931aaa6722300118d463 | 2022-07-12 | -| buildpack-deps:buster | sha256:3ab2863d37b2d037440b4a153a8fb3c79e935030fd47cef21b698688ce72f66e | 2022-07-12 | +| buildpack-deps:bullseye | sha256:025c1b80248fb37b1f5250aba9e578e1dc24066912d94d3fa37c21bf8ee98b30 | 2022-07-12 | +| buildpack-deps:buster | sha256:0adb423c3161e19606330068d8d3d7710f1bb1b2233e6964ba329c79a96babb2 | 2022-07-12 | | debian:10 | sha256:0685c900f6e691bdda6980c0ed0779d20183bc58770059b64adb56cb8a3129f0 | 2022-07-12 | | debian:11 | sha256:2ce44bbc00a79113c296d9d25524e15d423b23303fdbbe20190d2f96e0aeb251 | 2022-07-12 | | moby/buildkit:latest | sha256:0dc312b04eac1b44cd2cad566deb1e886c753109208affbbec8384f381ff7f38 | 2022-05-06 | -| node:14 | sha256:a086a11f7780399837ea0465ac8a8e8f14f2b66fe5a110fe0c24644d53a103c5 | 2022-07-12 | -| node:14-alpine | sha256:06bc5a651beb7db09a66ceb99a1d19275810d5c9dca8fb9e1ad6d69355a2f42e | 2022-07-18 | -| node:16 | sha256:2e1b4542d4a06e0e0442dc38af1f4828760aecc9db2b95e7df87f573640d98cd | 2022-07-12 | -| node:16-alpine | sha256:da32af0cf608622b1550678b2552b7d997def7d0ada00e0eca0166ed2ea42186 | 2022-07-18 | +| node:14 | sha256:8ae0e9298b6098f6641e35d0488477381f86fce04993a3f8060a7657db8fb928 | 2022-07-12 | +| node:14-alpine | sha256:e22ee6a906e823dc592d6022a3f520676575b50320fe2c3916c88acb16f471ce | 2022-07-18 | +| node:16 | sha256:4e85818bd0d023d4f9025730dc0640d3d8269e3d1a84ce6365eca8fbad7a3ee9 | 2022-07-12 | +| node:16-alpine | sha256:1908564153449b1c46b329e6ce2307e226bc566294f822f11c5a8bcef4eeaad7 | 2022-07-18 | | ubuntu:18.04 | sha256:478caf1bec1afd54a58435ec681c8755883b7eb843a8630091890130b15a79af | 2022-06-06 | | ubuntu:20.04 | sha256:fd92c36d3cb9b1d027c4d2a72c6bf0125da82425fc2ca37c414d4f010180dc19 | 2022-06-06 | | ubuntu:22.04 | sha256:b6b83d3c331794420340093eb706a6f152d9c1fa51b262d9bf34594887c2c7ac | 2022-06-06 | @@ -328,7 +332,7 @@ | libunwind8 | 1.3.2-2build2 | | libxkbfile-dev | 1:1.1.0-1build3 | | libxss1 | 1:1.2.3-1build2 | -| locales | 2.35-0ubuntu3 | +| locales | 2.35-0ubuntu3.1 | | m4 | 1.4.18-5ubuntu2 | | mediainfo | 22.03-1 | | mercurial | 6.1.1-1ubuntu1 | From 48e269b77702b770dcbd0eacded330f0ea7c1482 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Tue, 2 Aug 2022 12:51:54 +0200 Subject: [PATCH 1361/3485] Do not remove release doc refs manually (#6004) --- .github/workflows/merge_pull_request.yml | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/.github/workflows/merge_pull_request.yml b/.github/workflows/merge_pull_request.yml index c93437f59d4e..a227aa78ecda 100644 --- a/.github/workflows/merge_pull_request.yml +++ b/.github/workflows/merge_pull_request.yml @@ -46,14 +46,3 @@ jobs: pull_number: ${{ github.event.client_payload.PullRequestNumber }}, merge_method: "squash" }) - - - name: Delete docs branch ${{ github.event.client_payload.ReleaseBranchName }}-docs - uses: actions/github-script@v2 - with: - github-token: ${{secrets.GITHUB_TOKEN}} - script: | - github.git.deleteRef({ - owner: context.repo.owner, - repo: context.repo.repo, - ref: "heads/${{ github.event.client_payload.ReleaseBranchName }}-docs" - }) From 29009846626f499fbae885c06171f17b82ce7583 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 2 Aug 2022 15:11:51 +0000 Subject: [PATCH 1362/3485] Updating readme file for win22 version 20220731.1 (#5993) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2022-Readme.md | 48 +++++++++++++++++--------------- 1 file changed, 26 insertions(+), 22 deletions(-) diff --git a/images/win/Windows2022-Readme.md b/images/win/Windows2022-Readme.md index 12ae9711ed7e..f4e9e779cb2a 100644 --- a/images/win/Windows2022-Readme.md +++ b/images/win/Windows2022-Readme.md @@ -1,5 +1,6 @@ | Announcements | |-| +| ['virtual-environments' repository name will be changed to 'runner-images' on August, 8th](https://github.com/actions/virtual-environments/issues/5967) | | [[Windows] mongo service will be disabled by default on August, 8th](https://github.com/actions/virtual-environments/issues/5949) | | [[all OSs] Android NDK 21 will be replaced in favor of 25 on August, 1st](https://github.com/actions/virtual-environments/issues/5930) | | [[all OSs] Android ndk-bundle along with old NDK versions will be deprecated on July, 24](https://github.com/actions/virtual-environments/issues/5879) | @@ -7,7 +8,7 @@ *** # Microsoft Windows Server 2022 Datacenter - OS Version: 10.0.20348 Build 825 -- Image Version: 20220724.1 +- Image Version: 20220731.1 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -28,14 +29,14 @@ ### Package Management - Chocolatey 1.1.0 - Composer 2.3.10 -- Helm 3.9.1 +- Helm 3.9.2 - Miniconda 4.12.0 (pre-installed on the image but not added to PATH) - NPM 8.11.0 - NuGet 6.2.1.2 -- pip 22.2 (python 3.9) +- pip 22.2.1 (python 3.9) - Pipx 1.1.0 - RubyGems 3.2.33 -- Vcpkg (build from master \<f93ba152d>) +- Vcpkg (build from master \<66045de4d>) - Yarn 1.22.19 #### Environment variables @@ -57,11 +58,11 @@ - Bazelisk 1.12.0 - Bicep 0.8.9 - Cabal 3.6.2.0 -- CMake 3.23.2 -- CodeQL Action Bundle 2.10.0 +- CMake 3.23.3 +- CodeQL Action Bundle 2.10.1 - Docker 20.10.7 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.7.0 +- Docker Compose v2 2.8.0 - Docker-wincred 0.6.4 - ghc 9.2.3 - Git 2.37.1.windows.1 @@ -76,7 +77,7 @@ - NSIS v3.08 - OpenSSL 1.1.1 - Packer 1.8.2 -- Pulumi v3.36.0 +- Pulumi v3.37.1 - R 4.2.1 - Service Fabric SDK 9.0.1028.9590 - Stack 2.7.5 @@ -90,12 +91,12 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.124 -- AWS CLI 2.7.18 +- AWS CLI 2.7.20 - AWS SAM CLI 1.53.0 - AWS Session Manager CLI 1.2.339.0 - Azure CLI 2.38.0 - Azure DevOps CLI extension 0.25.0 -- GitHub CLI 2.14.2 +- GitHub CLI 2.14.3 - Hub CLI 2.14.2 ### Rust Tools @@ -115,9 +116,9 @@ ### Browsers and webdrivers - Google Chrome 103.0.5060.134 - Chrome Driver 103.0.5060.134 -- Microsoft Edge 103.0.1264.71 -- Microsoft Edge Driver 103.0.1264.71 -- Mozilla Firefox 102.0.1 +- Microsoft Edge 103.0.1264.77 +- Microsoft Edge Driver 103.0.1264.77 +- Mozilla Firefox 103.0 - Gecko Driver 0.31.0 - IE Driver 3.150.1.1 - Selenium server 4.3.0 @@ -133,7 +134,7 @@ ### Java | Version | Vendor | Environment Variable | | ------------------- | --------------- | -------------------- | -| 8.0.332+9 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | +| 8.0.342+7 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | | 11.0.16+8 | Eclipse Temurin | JAVA_HOME_11_X64 | | 17.0.4+8 | Eclipse Temurin | JAVA_HOME_17_X64 | @@ -206,14 +207,14 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Password | root | #### MongoDB -| Version | ServiceName | ServiceStatus | ServiceStartType | -| ------- | ----------- | ------------- | ---------------- | -| 5.0.9.0 | MongoDB | Running | Automatic | +| Version | ServiceName | ServiceStatus | ServiceStartType | +| -------- | ----------- | ------------- | ---------------- | +| 5.0.10.0 | MongoDB | Running | Automatic | ### Database tools - Azure CosmosDb Emulator 2.14.9.0 - DacFx 16.0.6161.0 -- MySQL 8.0.29.0 +- MySQL 8.0.30.0 - SQL OLEDB Driver 18.6.3.0 - SQLPS 1.0 @@ -535,7 +536,7 @@ All other versions are saved but not installed. #### Powershell Modules | Module | Version | | ------------------ | ---------------- | -| AWSPowerShell | 4.1.132 | +| AWSPowerShell | 4.1.137 | | DockerMsftProvider | 1.0.0.8 | | MarkdownPS | 1.9 | | Microsoft.Graph | 1.10.0 | @@ -555,17 +556,20 @@ All other versions are saved but not installed. | Android SDK Platforms | android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | | Android SDK Platform-Tools | 33.0.2 | | Android Support Repository | 47.0.0 | -| CMake | 3.18.1 | +| CMake | 3.18.1<br>3.22.1 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 21.4.7075529<br>23.2.8568313<br>24.0.8215888 | +| NDK | 23.2.8568313<br>24.0.8215888<br>25.0.8775105 | | SDK Patch Applier v4 | 1 | #### Environment variables | Name | Value | | ----------------------- | --------------------------------------- | | ANDROID_HOME | C:\Android\android-sdk | -| ANDROID_NDK_LATEST_HOME | C:\Android\android-sdk\ndk\24.0.8215888 | +| ANDROID_NDK | C:\Android\android-sdk\ndk\25.0.8775105 | +| ANDROID_NDK_HOME | C:\Android\android-sdk\ndk\25.0.8775105 | +| ANDROID_NDK_LATEST_HOME | C:\Android\android-sdk\ndk\25.0.8775105 | +| ANDROID_NDK_ROOT | C:\Android\android-sdk\ndk\25.0.8775105 | | ANDROID_SDK_ROOT | C:\Android\android-sdk | ### Cached Docker images From a6fdb2785e68dff3eeec2eeb0c25b6293b6da9c3 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 3 Aug 2022 09:25:47 +0000 Subject: [PATCH 1363/3485] Updating readme file for macOS-12 version 20220801.1 (#5997) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-12-Readme.md | 46 ++++++++++++++++++--------------- 1 file changed, 25 insertions(+), 21 deletions(-) diff --git a/images/macos/macos-12-Readme.md b/images/macos/macos-12-Readme.md index ac06764c661c..035bcea94e45 100644 --- a/images/macos/macos-12-Readme.md +++ b/images/macos/macos-12-Readme.md @@ -1,5 +1,6 @@ | Announcements | |-| +| ['virtual-environments' repository name will be changed to 'runner-images' on August, 8th](https://github.com/actions/virtual-environments/issues/5967) | | [[all OSs] Android NDK 21 will be replaced in favor of 25 on August, 1st](https://github.com/actions/virtual-environments/issues/5930) | | [[all OSs] Android ndk-bundle along with old NDK versions will be deprecated on July, 24](https://github.com/actions/virtual-environments/issues/5879) | | [The macOS 10.15 Actions runner image will begin deprecation on 5/31/22 and will be fully unsupported by 8/30/22 in GitHub and by 9/30/22 in ADO](https://github.com/actions/virtual-environments/issues/5583) | @@ -7,7 +8,7 @@ # macOS 12.5 info - System Version: macOS 12.5 (21G72) - Kernel Version: Darwin 21.6.0 -- Image Version: 20220724.1 +- Image Version: 20220801.1 ## Installed Software ### Language and Runtime @@ -32,7 +33,7 @@ - Ruby 3.0.4p208 ### Package Management -- Bundler version 2.3.18 +- Bundler version 2.3.19 - Carthage 0.38.0 - CocoaPods 1.11.3 - Composer 2.3.10 @@ -43,8 +44,8 @@ - Pip 20.3.4 (python 2.7) - Pip 22.1.1 (python 3.9) - Pipx 1.1.0 -- RubyGems 3.3.18 -- Vcpkg 2022 (build from master \<f93ba152d>) +- RubyGems 3.3.19 +- Vcpkg 2022 (build from master \<66045de4d>) - Yarn 1.22.19 #### Environment variables @@ -69,12 +70,12 @@ - Curl 7.84.0 - Git 2.37.1 - Git LFS: 3.2.0 -- GitHub CLI: 2.14.2 +- GitHub CLI: 2.14.3 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.3 - gpg (GnuPG) 2.3.7 - Hub CLI: 2.14.2 -- ImageMagick 7.1.0-43 +- ImageMagick 7.1.0-44 - jq 1.6 - mongo v5.0.7 - mongod v5.0.7 @@ -87,22 +88,22 @@ - Switchaudio-osx 1.1.0 - Vagrant 2.2.19 - VirtualBox 6.1.36r152435 -- yq (https://github.com/mikefarah/yq/) version 4.26.1 +- yq (https://github.com/mikefarah/yq/) version 4.27.1 - zstd 1.5.2 ### Tools - App Center CLI 2.10.10 -- AWS CLI 2.7.18 +- AWS CLI 2.7.20 - AWS SAM CLI 1.53.0 - AWS Session Manager CLI 1.2.339.0 - Azure CLI (azure-devops) 0.25.0 - Azure CLI 2.38.0 - Bicep CLI 0.8.9 - Cabal 3.6.2.0 -- Cmake 3.23.2 +- Cmake 3.23.3 - Fastlane 2.208.0 -- GHC 9.2.3 -- GHCup 0.1.17.8 +- GHC 9.2.4 +- GHCup 0.1.18.0 - Jazzy 0.14.2 - Stack 2.7.5 - SwiftFormat 0.49.13 @@ -110,7 +111,7 @@ - Xcode Command Line Tools 13.4.0.0.1.1651278267 ### Linters -- SwiftLint 0.47.1 +- SwiftLint 0.48.0 - yamllint 1.27.1 ### Browsers @@ -118,9 +119,9 @@ - SafariDriver 15.6 (17613.3.9.1.5) - Google Chrome 103.0.5060.134 - ChromeDriver 103.0.5060.134 -- Microsoft Edge 103.0.1264.71 -- Microsoft Edge WebDriver 103.0.1264.71 -- Mozilla Firefox 102.0.1 +- Microsoft Edge 103.0.1264.77 +- Microsoft Edge WebDriver 103.0.1264.77 +- Mozilla Firefox 103.0 - geckodriver 0.31.0 - Selenium server 4.3.0 @@ -136,12 +137,12 @@ | ------------------- | --------------- | -------------------- | | 8.0.332+9 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | | 11.0.16+8 | Eclipse Temurin | JAVA_HOME_11_X64 | -| 17.0.3+7 | Eclipse Temurin | JAVA_HOME_17_X64 | +| 17.0.4+8 | Eclipse Temurin | JAVA_HOME_17_X64 | ### GraalVM | Version | Environment variables | | --------- | --------------------- | -| CE 22.1.0 | GRAALVM_11_ROOT | +| CE 22.2.0 | GRAALVM_11_ROOT | ### Cached Tools #### Ruby @@ -209,7 +210,7 @@ | Version | Build | Path | | -------------- | --------- | ------------------------------------ | | 2019 | 8.10.25.2 | /Applications/Visual Studio 2019.app | -| 2022 (default) | 17.0.6.4 | /Applications/Visual Studio.app | +| 2022 (default) | 17.0.7.7 | /Applications/Visual Studio.app | ##### Notes: ``` @@ -299,17 +300,20 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" | Android SDK Platforms | android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | | Android SDK Platform-Tools | 33.0.2 | | Android Support Repository | 47.0.0 | -| CMake | 3.18.1 | +| CMake | 3.18.1<br>3.22.1 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 21.4.7075529<br>23.2.8568313<br>24.0.8215888 | +| NDK | 23.2.8568313<br>24.0.8215888<br>25.0.8775105 (default) | | SDK Patch Applier v4 | 1 | #### Environment variables | Name | Value | | ----------------------- | -------------------------------------------------- | | ANDROID_HOME | /Users/runner/Library/Android/sdk | -| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/24.0.8215888 | +| ANDROID_NDK | /Users/runner/Library/Android/sdk/ndk/25.0.8775105 | +| ANDROID_NDK_HOME | /Users/runner/Library/Android/sdk/ndk/25.0.8775105 | +| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/25.0.8775105 | +| ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk/25.0.8775105 | | ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | ### Miscellaneous From 6e9102ff564c0fe9951b0881078cedf860700620 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 3 Aug 2022 09:53:28 +0000 Subject: [PATCH 1364/3485] Updating readme file for ubuntu18 version 20220729.1 (#5999) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu1804-Readme.md | 66 +++++++++++++++++-------------- 1 file changed, 36 insertions(+), 30 deletions(-) diff --git a/images/linux/Ubuntu1804-Readme.md b/images/linux/Ubuntu1804-Readme.md index 6f95b521f87d..6509a7c50141 100644 --- a/images/linux/Ubuntu1804-Readme.md +++ b/images/linux/Ubuntu1804-Readme.md @@ -1,12 +1,14 @@ | Announcements | |-| +| [Ubuntu 22.04 is generally available starting from August, 8](https://github.com/actions/virtual-environments/issues/5998) | +| ['virtual-environments' repository name will be changed to 'runner-images' on August, 8th](https://github.com/actions/virtual-environments/issues/5967) | | [[all OSs] Android NDK 21 will be replaced in favor of 25 on August, 1st](https://github.com/actions/virtual-environments/issues/5930) | | [[all OSs] Android ndk-bundle along with old NDK versions will be deprecated on July, 24](https://github.com/actions/virtual-environments/issues/5879) | | [(Public Beta) Ubuntu 22.04 is now available](https://github.com/actions/virtual-environments/issues/5490) | *** # Ubuntu 18.04.6 LTS - Linux kernel version: 5.4.0-1086-azure -- Image Version: 20220724.1 +- Image Version: 20220729.1 ## Installed Software ### Language and Runtime @@ -36,11 +38,12 @@ - Homebrew 3.5.6 - Miniconda 4.12.0 - Npm 8.11.0 +- NuGet 6.2.1.2 - Pip 9.0.1 - Pip3 9.0.1 - Pipx 1.0.0 - RubyGems 2.7.6 -- Vcpkg (build from master \<f93ba152d>) +- Vcpkg (build from master \<281d2f2dc>) - Yarn 1.22.19 #### Environment variables @@ -63,8 +66,8 @@ - Bazelisk 1.12.0 - Bicep 0.8.9 - Buildah 1.22.3 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- CMake 3.23.2 -- CodeQL Action Bundle 2.10.0 +- CMake 3.23.3 +- CodeQL Action Bundle 2.10.1 - Docker Amazon ECR Credential Helper 0.6.0 - Docker Compose v1 1.29.2 - Docker Compose v2 2.6.1+azure-1 @@ -80,7 +83,7 @@ - jq 1.5 - Kind 0.14.0 - Kubectl 1.24.3 -- Kustomize 4.5.5 +- Kustomize 4.5.6 - Leiningen 2.9.8 - MediaInfo 17.12 - Mercurial 4.5.3 @@ -93,51 +96,51 @@ - Parcel 2.6.2 - PhantomJS 2.1.1 - Podman 3.4.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- Pulumi 3.36.0 +- Pulumi 3.37.1 - R 4.2.0 - Skopeo 1.5.0 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 - SVN 1.9.7 -- Terraform 1.2.5 +- Terraform 1.2.6 - yamllint 1.27.1 - yq 4.26.1 - zstd 1.5.2 (homebrew) ### CLI Tools - Alibaba Cloud CLI 3.0.124 -- AWS CLI 2.7.18 +- AWS CLI 2.7.20 - AWS CLI Session manager plugin 1.2.339.0 - AWS SAM CLI 1.53.0 - Azure CLI (azure-cli) 2.38.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.25.0 -- GitHub CLI 2.14.2 +- GitHub CLI 2.14.3 - Google Cloud SDK 369.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 10.11.1 -- OpenShift CLI 4.10.23 +- Netlify CLI 10.13.0 +- OpenShift CLI 4.10.24 - ORAS CLI 0.13.0 -- Vercel CLI 27.2.0 +- Vercel CLI 27.3.3 ### Java | Version | Vendor | Environment Variable | | ------------------- | --------------- | -------------------- | | 8.0.332+9 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | -| 11.0.15+10 | Eclipse Temurin | JAVA_HOME_11_X64 | +| 11.0.16+8 | Eclipse Temurin | JAVA_HOME_11_X64 | | 12.0.2+10 | Adopt OpenJDK | JAVA_HOME_12_X64 | -| 17.0.3+7 | Eclipse Temurin | JAVA_HOME_17_X64 | +| 17.0.4+8 | Eclipse Temurin | JAVA_HOME_17_X64 | ### PHP | Tool | Version | | -------- | --------------------------------- | | PHP | 7.2.34 7.3.33 7.4.30 8.0.21 8.1.8 | | Composer | 2.3.10 | -| PHPUnit | 8.5.27 | +| PHPUnit | 8.5.28 | ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ``` ### Haskell - Cabal 3.6.2.0 -- GHC 9.2.3 +- GHC 9.2.4 - GHCup 0.1.17.8 - Stack 2.7.5 @@ -159,10 +162,10 @@ - Google Chrome 103.0.5060.134 - ChromeDriver 103.0.5060.134 - Chromium 103.0.5060.0 -- Microsoft Edge 103.0.1264.71 (apt source repository: https://packages.microsoft.com/repos/edge) -- Microsoft Edge WebDriver 103.0.1264.71 +- Microsoft Edge 103.0.1264.77 (apt source repository: https://packages.microsoft.com/repos/edge) +- Microsoft Edge WebDriver 103.0.1264.77 - Selenium server 4.3.0 -- Mozilla Firefox 102.0 +- Mozilla Firefox 103.0 - Geckodriver 0.31.0 #### Environment variables @@ -180,7 +183,7 @@ - nbgv 3.5.108+6e793d63d3 ### Databases -- MongoDB 5.0.9 (apt source repository: https://repo.mongodb.org/apt/ubuntu) +- MongoDB 5.0.10 (apt source repository: https://repo.mongodb.org/apt/ubuntu) - sqlite3 3.22.0 #### PostgreSQL @@ -191,7 +194,7 @@ PostgreSQL service is disabled by default. Use the following command as a part of your job to start the service: 'sudo systemctl start postgresql.service' ``` #### MySQL -- MySQL 5.7.38 +- MySQL 5.7.39 - MySQL Server (user:root password:root) ``` @@ -269,18 +272,21 @@ | Android SDK Platforms | android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3)<br>android-26 (rev 2)<br>android-25 (rev 3)<br>android-24 (rev 2)<br>android-23 (rev 3) | | Android SDK Tools | 26.1.1 | | Android Support Repository | 47.0.0 | -| CMake | 3.10.2<br>3.18.1 | +| CMake | 3.10.2<br>3.18.1<br>3.22.1 | | Google APIs | addon-google_apis-google-21<br>addon-google_apis-google-22<br>addon-google_apis-google-23<br>addon-google_apis-google-24 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 21.4.7075529<br>23.2.8568313<br>24.0.8215888 | +| NDK | 23.2.8568313<br>24.0.8215888<br>25.0.8775105 (default) | | SDK Patch Applier v4 | 1 | #### Environment variables | Name | Value | | ----------------------- | ------------------------------------------- | | ANDROID_HOME | /usr/local/lib/android/sdk | -| ANDROID_NDK_LATEST_HOME | /usr/local/lib/android/sdk/ndk/24.0.8215888 | +| ANDROID_NDK | /usr/local/lib/android/sdk/ndk/25.0.8775105 | +| ANDROID_NDK_HOME | /usr/local/lib/android/sdk/ndk/25.0.8775105 | +| ANDROID_NDK_LATEST_HOME | /usr/local/lib/android/sdk/ndk/25.0.8775105 | +| ANDROID_NDK_ROOT | /usr/local/lib/android/sdk/ndk/25.0.8775105 | | ANDROID_SDK_ROOT | /usr/local/lib/android/sdk | ### Cached Docker images @@ -289,8 +295,8 @@ | alpine:3.12 | sha256:c75ac27b49326926b803b9ed43bf088bc220d22556de1bc5f72d742c91398f69 | 2022-04-05 | | alpine:3.13 | sha256:7769c38ce671534a0ddbf98633f17edbbd4a4e99cbc77ef42f9f7b78b6a1c6c2 | 2022-07-19 | | alpine:3.14 | sha256:43eb8f0d8215d8661f745f3d88563c026614d843b668b233bbe1666b6d026f61 | 2022-07-19 | -| buildpack-deps:bullseye | sha256:4cbb6d56f192ea1868bdbc441269d0343c90b201c973931aaa6722300118d463 | 2022-07-12 | -| buildpack-deps:buster | sha256:3ab2863d37b2d037440b4a153a8fb3c79e935030fd47cef21b698688ce72f66e | 2022-07-12 | +| buildpack-deps:bullseye | sha256:025c1b80248fb37b1f5250aba9e578e1dc24066912d94d3fa37c21bf8ee98b30 | 2022-07-12 | +| buildpack-deps:buster | sha256:0adb423c3161e19606330068d8d3d7710f1bb1b2233e6964ba329c79a96babb2 | 2022-07-12 | | buildpack-deps:stretch | sha256:78e995165a5788c2f55aed6e548d8f6c1534830d4310c870408fccb2da8c5b2e | 2022-06-23 | | debian:10 | sha256:0685c900f6e691bdda6980c0ed0779d20183bc58770059b64adb56cb8a3129f0 | 2022-07-12 | | debian:11 | sha256:2ce44bbc00a79113c296d9d25524e15d423b23303fdbbe20190d2f96e0aeb251 | 2022-07-12 | @@ -298,10 +304,10 @@ | moby/buildkit:latest | sha256:0dc312b04eac1b44cd2cad566deb1e886c753109208affbbec8384f381ff7f38 | 2022-05-06 | | node:12 | sha256:01627afeb110b3054ba4a1405541ca095c8bfca1cb6f2be9479c767a2711879e | 2022-04-20 | | node:12-alpine | sha256:d4b15b3d48f42059a15bd659be60afe21762aae9d6cbea6f124440895c27db68 | 2022-04-11 | -| node:14 | sha256:a086a11f7780399837ea0465ac8a8e8f14f2b66fe5a110fe0c24644d53a103c5 | 2022-07-12 | -| node:14-alpine | sha256:06bc5a651beb7db09a66ceb99a1d19275810d5c9dca8fb9e1ad6d69355a2f42e | 2022-07-18 | -| node:16 | sha256:2e1b4542d4a06e0e0442dc38af1f4828760aecc9db2b95e7df87f573640d98cd | 2022-07-12 | -| node:16-alpine | sha256:da32af0cf608622b1550678b2552b7d997def7d0ada00e0eca0166ed2ea42186 | 2022-07-18 | +| node:14 | sha256:8ae0e9298b6098f6641e35d0488477381f86fce04993a3f8060a7657db8fb928 | 2022-07-12 | +| node:14-alpine | sha256:e22ee6a906e823dc592d6022a3f520676575b50320fe2c3916c88acb16f471ce | 2022-07-18 | +| node:16 | sha256:4e85818bd0d023d4f9025730dc0640d3d8269e3d1a84ce6365eca8fbad7a3ee9 | 2022-07-12 | +| node:16-alpine | sha256:aadb411a5d398d2141f36a61f469ab91b971e43988d6c74aa5204986e5fe18a1 | 2022-07-18 | | ubuntu:16.04 | sha256:20858ebbc96215d6c3c574f781133ebffdc7c18d98af4f294cc4c04871a6fe61 | 2021-08-31 | | ubuntu:18.04 | sha256:478caf1bec1afd54a58435ec681c8755883b7eb843a8630091890130b15a79af | 2022-06-06 | | ubuntu:20.04 | sha256:fd92c36d3cb9b1d027c4d2a72c6bf0125da82425fc2ca37c414d4f010180dc19 | 2022-06-06 | From f4fb14342c5031decb2d5b7e293ac042b4613966 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 3 Aug 2022 10:05:48 +0000 Subject: [PATCH 1365/3485] Updating readme file for ubuntu20 version 20220729.1 (#6000) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2004-Readme.md | 78 +++++++++++++++++-------------- 1 file changed, 42 insertions(+), 36 deletions(-) diff --git a/images/linux/Ubuntu2004-Readme.md b/images/linux/Ubuntu2004-Readme.md index 515b0e5edfbb..ad70b5209336 100644 --- a/images/linux/Ubuntu2004-Readme.md +++ b/images/linux/Ubuntu2004-Readme.md @@ -1,12 +1,14 @@ | Announcements | |-| +| [Ubuntu 22.04 is generally available starting from August, 8](https://github.com/actions/virtual-environments/issues/5998) | +| ['virtual-environments' repository name will be changed to 'runner-images' on August, 8th](https://github.com/actions/virtual-environments/issues/5967) | | [[all OSs] Android NDK 21 will be replaced in favor of 25 on August, 1st](https://github.com/actions/virtual-environments/issues/5930) | | [[all OSs] Android ndk-bundle along with old NDK versions will be deprecated on July, 24](https://github.com/actions/virtual-environments/issues/5879) | | [(Public Beta) Ubuntu 22.04 is now available](https://github.com/actions/virtual-environments/issues/5490) | *** # Ubuntu 20.04.4 LTS - Linux kernel version: 5.15.0-1014-azure -- Image Version: 20220724.1 +- Image Version: 20220729.1 ## Installed Software ### Language and Runtime @@ -36,11 +38,12 @@ - Homebrew 3.5.6 - Miniconda 4.12.0 - Npm 8.11.0 +- NuGet 6.2.1.2 - Pip 20.0.2 - Pip3 20.0.2 - Pipx 1.1.0 - RubyGems 3.1.2 -- Vcpkg (build from master \<f93ba152d>) +- Vcpkg (build from master \<281d2f2dc>) - Yarn 1.22.19 #### Environment variables @@ -52,7 +55,7 @@ ### Project Management - Ant 1.10.7 - Gradle 7.5 -- Lerna 5.2.0 +- Lerna 5.3.0 - Maven 3.8.6 - Sbt 1.7.1 @@ -64,8 +67,8 @@ - Bazelisk 1.12.0 - Bicep 0.8.9 - Buildah 1.22.3 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- CMake 3.23.2 -- CodeQL Action Bundle 2.10.0 +- CMake 3.23.3 +- CodeQL Action Bundle 2.10.1 - Docker Amazon ECR Credential Helper 0.6.0 - Docker Compose v1 1.29.2 - Docker Compose v2 2.6.1+azure-1 @@ -78,11 +81,11 @@ - Git-ftp 1.6.0 - Haveged 1.9.1 - Heroku 7.60.2 -- HHVM (HipHop VM) 4.164.0 +- HHVM (HipHop VM) 4.165.0 - jq 1.6 - Kind 0.14.0 - Kubectl 1.24.3 -- Kustomize 4.5.5 +- Kustomize 4.5.6 - Leiningen 2.9.8 - MediaInfo 19.09 - Mercurial 5.3.1 @@ -95,55 +98,55 @@ - Parcel 2.6.2 - PhantomJS 2.1.1 - Podman 3.4.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- Pulumi 3.36.0 +- Pulumi 3.37.1 - R 4.2.1 - Skopeo 1.5.0 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 -- Terraform 1.2.5 +- Terraform 1.2.6 - yamllint 1.27.1 - yq 4.26.1 - zstd 1.5.2 (homebrew) ### CLI Tools - Alibaba Cloud CLI 3.0.124 -- AWS CLI 2.7.18 +- AWS CLI 2.7.20 - AWS CLI Session manager plugin 1.2.339.0 - AWS SAM CLI 1.53.0 - Azure CLI (azure-cli) 2.38.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.25.0 -- GitHub CLI 2.14.2 +- GitHub CLI 2.14.3 - Google Cloud SDK 369.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 10.11.1 -- OpenShift CLI 4.10.23 +- Netlify CLI 10.13.0 +- OpenShift CLI 4.10.24 - ORAS CLI 0.13.0 -- Vercel CLI 27.2.0 +- Vercel CLI 27.3.3 ### Java -| Version | Vendor | Environment Variable | -| -------------------- | --------------- | -------------------- | -| 8.0.332+9 | Eclipse Temurin | JAVA_HOME_8_X64 | -| 11.0.15+10 (default) | Eclipse Temurin | JAVA_HOME_11_X64 | -| 17.0.3+7 | Eclipse Temurin | JAVA_HOME_17_X64 | +| Version | Vendor | Environment Variable | +| ------------------- | --------------- | -------------------- | +| 8.0.332+9 | Eclipse Temurin | JAVA_HOME_8_X64 | +| 11.0.16+8 (default) | Eclipse Temurin | JAVA_HOME_11_X64 | +| 17.0.4+8 | Eclipse Temurin | JAVA_HOME_17_X64 | ### GraalVM | Version | Environment variables | | --------- | --------------------- | -| CE 22.1.0 | GRAALVM_11_ROOT | +| CE 22.2.0 | GRAALVM_11_ROOT | ### PHP | Tool | Version | | -------- | ------------------- | | PHP | 7.4.30 8.0.21 8.1.8 | | Composer | 2.3.10 | -| PHPUnit | 8.5.27 | +| PHPUnit | 8.5.28 | ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ``` ### Haskell - Cabal 3.6.2.0 -- GHC 9.2.3 +- GHC 9.2.4 - GHCup 0.1.17.8 - Stack 2.7.5 @@ -165,10 +168,10 @@ - Google Chrome 103.0.5060.134 - ChromeDriver 103.0.5060.134 - Chromium 103.0.5060.0 -- Microsoft Edge 103.0.1264.71 (apt source repository: https://packages.microsoft.com/repos/edge) -- Microsoft Edge WebDriver 103.0.1264.71 +- Microsoft Edge 103.0.1264.77 (apt source repository: https://packages.microsoft.com/repos/edge) +- Microsoft Edge WebDriver 103.0.1264.77 - Selenium server 4.3.0 -- Mozilla Firefox 102.0 +- Mozilla Firefox 103.0 - Geckodriver 0.31.0 #### Environment variables @@ -186,7 +189,7 @@ - nbgv 3.5.108+6e793d63d3 ### Databases -- MongoDB 5.0.9 (apt source repository: https://repo.mongodb.org/apt/ubuntu) +- MongoDB 5.0.10 (apt source repository: https://repo.mongodb.org/apt/ubuntu) - sqlite3 3.31.1 #### PostgreSQL @@ -197,7 +200,7 @@ PostgreSQL service is disabled by default. Use the following command as a part of your job to start the service: 'sudo systemctl start postgresql.service' ``` #### MySQL -- MySQL 8.0.29-0ubuntu0.20.04.3 +- MySQL 8.0.30-0ubuntu0.20.04.2 - MySQL Server (user:root password:root) ``` @@ -278,17 +281,20 @@ | Android SDK Platforms | android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | | Android SDK Tools | 26.1.1 | | Android Support Repository | 47.0.0 | -| CMake | 3.10.2<br>3.18.1 | +| CMake | 3.10.2<br>3.18.1<br>3.22.1 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 21.4.7075529<br>23.2.8568313<br>24.0.8215888 | +| NDK | 23.2.8568313<br>24.0.8215888<br>25.0.8775105 (default) | | SDK Patch Applier v4 | 1 | #### Environment variables | Name | Value | | ----------------------- | ------------------------------------------- | | ANDROID_HOME | /usr/local/lib/android/sdk | -| ANDROID_NDK_LATEST_HOME | /usr/local/lib/android/sdk/ndk/24.0.8215888 | +| ANDROID_NDK | /usr/local/lib/android/sdk/ndk/25.0.8775105 | +| ANDROID_NDK_HOME | /usr/local/lib/android/sdk/ndk/25.0.8775105 | +| ANDROID_NDK_LATEST_HOME | /usr/local/lib/android/sdk/ndk/25.0.8775105 | +| ANDROID_NDK_ROOT | /usr/local/lib/android/sdk/ndk/25.0.8775105 | | ANDROID_SDK_ROOT | /usr/local/lib/android/sdk | ### Cached Docker images @@ -297,8 +303,8 @@ | alpine:3.12 | sha256:c75ac27b49326926b803b9ed43bf088bc220d22556de1bc5f72d742c91398f69 | 2022-04-05 | | alpine:3.13 | sha256:7769c38ce671534a0ddbf98633f17edbbd4a4e99cbc77ef42f9f7b78b6a1c6c2 | 2022-07-19 | | alpine:3.14 | sha256:43eb8f0d8215d8661f745f3d88563c026614d843b668b233bbe1666b6d026f61 | 2022-07-19 | -| buildpack-deps:bullseye | sha256:4cbb6d56f192ea1868bdbc441269d0343c90b201c973931aaa6722300118d463 | 2022-07-12 | -| buildpack-deps:buster | sha256:3ab2863d37b2d037440b4a153a8fb3c79e935030fd47cef21b698688ce72f66e | 2022-07-12 | +| buildpack-deps:bullseye | sha256:025c1b80248fb37b1f5250aba9e578e1dc24066912d94d3fa37c21bf8ee98b30 | 2022-07-12 | +| buildpack-deps:buster | sha256:0adb423c3161e19606330068d8d3d7710f1bb1b2233e6964ba329c79a96babb2 | 2022-07-12 | | buildpack-deps:stretch | sha256:78e995165a5788c2f55aed6e548d8f6c1534830d4310c870408fccb2da8c5b2e | 2022-06-23 | | debian:10 | sha256:0685c900f6e691bdda6980c0ed0779d20183bc58770059b64adb56cb8a3129f0 | 2022-07-12 | | debian:11 | sha256:2ce44bbc00a79113c296d9d25524e15d423b23303fdbbe20190d2f96e0aeb251 | 2022-07-12 | @@ -306,10 +312,10 @@ | moby/buildkit:latest | sha256:0dc312b04eac1b44cd2cad566deb1e886c753109208affbbec8384f381ff7f38 | 2022-05-06 | | node:12 | sha256:01627afeb110b3054ba4a1405541ca095c8bfca1cb6f2be9479c767a2711879e | 2022-04-20 | | node:12-alpine | sha256:d4b15b3d48f42059a15bd659be60afe21762aae9d6cbea6f124440895c27db68 | 2022-04-11 | -| node:14 | sha256:a086a11f7780399837ea0465ac8a8e8f14f2b66fe5a110fe0c24644d53a103c5 | 2022-07-12 | -| node:14-alpine | sha256:06bc5a651beb7db09a66ceb99a1d19275810d5c9dca8fb9e1ad6d69355a2f42e | 2022-07-18 | -| node:16 | sha256:2e1b4542d4a06e0e0442dc38af1f4828760aecc9db2b95e7df87f573640d98cd | 2022-07-12 | -| node:16-alpine | sha256:da32af0cf608622b1550678b2552b7d997def7d0ada00e0eca0166ed2ea42186 | 2022-07-18 | +| node:14 | sha256:8ae0e9298b6098f6641e35d0488477381f86fce04993a3f8060a7657db8fb928 | 2022-07-12 | +| node:14-alpine | sha256:e22ee6a906e823dc592d6022a3f520676575b50320fe2c3916c88acb16f471ce | 2022-07-18 | +| node:16 | sha256:4e85818bd0d023d4f9025730dc0640d3d8269e3d1a84ce6365eca8fbad7a3ee9 | 2022-07-12 | +| node:16-alpine | sha256:aadb411a5d398d2141f36a61f469ab91b971e43988d6c74aa5204986e5fe18a1 | 2022-07-18 | | ubuntu:16.04 | sha256:20858ebbc96215d6c3c574f781133ebffdc7c18d98af4f294cc4c04871a6fe61 | 2021-08-31 | | ubuntu:18.04 | sha256:478caf1bec1afd54a58435ec681c8755883b7eb843a8630091890130b15a79af | 2022-06-06 | | ubuntu:20.04 | sha256:fd92c36d3cb9b1d027c4d2a72c6bf0125da82425fc2ca37c414d4f010180dc19 | 2022-06-06 | From 2ec5b2e02e4f8a55ada4229b442d2584257b310b Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Wed, 3 Aug 2022 12:12:07 +0200 Subject: [PATCH 1366/3485] Fix installer pattern to support macOS beta version (#6012) --- images.CI/macos/anka/Service.Helpers.psm1 | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/images.CI/macos/anka/Service.Helpers.psm1 b/images.CI/macos/anka/Service.Helpers.psm1 index 27f74ddac525..175f07f32f79 100644 --- a/images.CI/macos/anka/Service.Helpers.psm1 +++ b/images.CI/macos/anka/Service.Helpers.psm1 @@ -77,14 +77,14 @@ function Get-MacOSInstaller { Write-Host "`t[*] The 'DownloadLatestVersion' flag is set. Latest macOS version is '$MacOSVersion' now" } - $macOSName = $availableVersions.Where{ $MacOSVersion -eq $_.OSVersion }.OSName + $macOSName = $availableVersions.Where{ $MacOSVersion -eq $_.OSVersion }.OSName.Split(" ")[1] if (-not $macOSName) { Write-Host "`t[x] Requested macOS '$MacOSVersion' version not found in the list of available installers. Available versions are:`n$($availableVersions.OSVersion)" Write-Host "`t[x] Make sure to pass '-BetaSearch `$true' if you need a beta version installer" exit 1 } - $installerPathPattern = "/Applications/Install*${macOSName}.app" + $installerPathPattern = "/Applications/Install macOS ${macOSName}*.app" if (Test-Path $installerPathPattern) { $previousInstallerPath = Get-Item -Path $installerPathPattern Write-Host "`t[*] Removing '$previousInstallerPath' installation app before downloading the new one" @@ -104,6 +104,10 @@ function Get-MacOSInstaller { } $installerPath = (Get-Item -Path $installerPathPattern).FullName + if (-not $installerPath) { + Write-Host "`t[x] Path not found using '$installerPathPattern'" + exit 1 + } Write-Host "`t[*] Installer successfully downloaded to '$installerPath'" $installerPath From 191165a280368480dd0129dff16786201e8ef1fb Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 3 Aug 2022 13:39:11 +0000 Subject: [PATCH 1367/3485] Updating readme file for win19 version 20220801.1 (#6005) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2019-Readme.md | 54 +++++++++++++++++--------------- 1 file changed, 29 insertions(+), 25 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index d087860a13d5..619dd36d112c 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -1,5 +1,6 @@ | Announcements | |-| +| ['virtual-environments' repository name will be changed to 'runner-images' on August, 8th](https://github.com/actions/virtual-environments/issues/5967) | | [[Windows] mongo service will be disabled by default on August, 8th](https://github.com/actions/virtual-environments/issues/5949) | | [[all OSs] Android NDK 21 will be replaced in favor of 25 on August, 1st](https://github.com/actions/virtual-environments/issues/5930) | | [[all OSs] Android ndk-bundle along with old NDK versions will be deprecated on July, 24](https://github.com/actions/virtual-environments/issues/5879) | @@ -7,7 +8,7 @@ *** # Microsoft Windows Server 2019 Datacenter - OS Version: 10.0.17763 Build 3165 -- Image Version: 20220724.1 +- Image Version: 20220801.1 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -28,14 +29,14 @@ ### Package Management - Chocolatey 1.1.0 - Composer 2.3.10 -- Helm 3.9.1 +- Helm 3.9.2 - Miniconda 4.12.0 (pre-installed on the image but not added to PATH) - NPM 8.11.0 - NuGet 6.2.1.2 -- pip 22.2 (python 3.7) +- pip 22.2.1 (python 3.7) - Pipx 1.1.0 - RubyGems 2.7.6.3 -- Vcpkg (build from master \<f93ba152d>) +- Vcpkg (build from master \<48369f2a2>) - Yarn 1.22.19 #### Environment variables @@ -58,16 +59,16 @@ - Bazelisk 1.12.0 - Bicep 0.8.9 - Cabal 3.6.2.0 -- CMake 3.23.2 -- CodeQL Action Bundle 2.10.0 +- CMake 3.23.3 +- CodeQL Action Bundle 2.10.1 - Docker 20.10.7 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.7.0 +- Docker Compose v2 2.9.0 - Docker-wincred 0.6.4 - ghc 9.2.3 - Git 2.37.1.windows.1 - Git LFS 3.2.0 -- Google Cloud SDK 394.0.0 +- Google Cloud SDK 395.0.0 - InnoSetup 6.2.1 - jq 1.6 - Kind 0.14.0 @@ -79,7 +80,7 @@ - OpenSSL 1.1.1 - Packer 1.8.2 - Parcel 2.6.2 -- Pulumi v3.36.0 +- Pulumi v3.37.2 - R 4.2.1 - Service Fabric SDK 9.0.1028.9590 - Stack 2.7.5 @@ -93,13 +94,13 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.124 -- AWS CLI 2.7.18 +- AWS CLI 2.7.20 - AWS SAM CLI 1.53.0 - AWS Session Manager CLI 1.2.339.0 - Azure CLI 2.38.0 - Azure DevOps CLI extension 0.25.0 - Cloud Foundry CLI 6.53.0 -- GitHub CLI 2.14.2 +- GitHub CLI 2.14.3 - Hub CLI 2.14.2 ### Rust Tools @@ -119,9 +120,9 @@ ### Browsers and webdrivers - Google Chrome 103.0.5060.134 - Chrome Driver 103.0.5060.134 -- Microsoft Edge 103.0.1264.71 -- Microsoft Edge Driver 103.0.1264.71 -- Mozilla Firefox 102.0.1 +- Microsoft Edge 103.0.1264.77 +- Microsoft Edge Driver 103.0.1264.77 +- Mozilla Firefox 103.0.1 - Gecko Driver 0.31.0 - IE Driver 3.150.1.1 - Selenium server 4.3.0 @@ -137,7 +138,7 @@ ### Java | Version | Vendor | Environment Variable | | ------------------- | --------------- | -------------------- | -| 8.0.332+9 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | +| 8.0.342+7 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | | 11.0.16+8 | Eclipse Temurin | JAVA_HOME_11_X64 | | 13.0.2+8.1 | Adopt OpenJDK | JAVA_HOME_13_X64 | | 17.0.4+8 | Eclipse Temurin | JAVA_HOME_17_X64 | @@ -220,14 +221,14 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Password | root | #### MongoDB -| Version | ServiceName | ServiceStatus | ServiceStartType | -| ------- | ----------- | ------------- | ---------------- | -| 5.0.9.0 | MongoDB | Running | Automatic | +| Version | ServiceName | ServiceStatus | ServiceStartType | +| -------- | ----------- | ------------- | ---------------- | +| 5.0.10.0 | MongoDB | Running | Automatic | ### Database tools - Azure CosmosDb Emulator 2.14.9.0 - DacFx 16.0.6161.0 -- MySQL 5.7.38.0 +- MySQL 5.7.39.0 - SQL OLEDB Driver 18.6.3.0 - SQLPS 1.0 @@ -471,11 +472,11 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | ms-biztalk.BizTalk | 3.13.2.0 | | ProBITools.MicrosoftAnalysisServicesModelingProjects | 2.9.18 | | ProBITools.MicrosoftReportProjectsforVisualStudio | 2.6.11 | -| SSIS.SqlServerIntegrationServicesProjects | 4.0 | +| SSIS.SqlServerIntegrationServicesProjects | 4.1 | | VisualStudioClient.MicrosoftVisualStudio2017InstallerProjects | 1.0.2 | | Windows Driver Kit | 10.1.22000.1 | | Windows Driver Kit Visual Studio Extension | 10.0.21381.0 | -| Windows Software Development Kit | 10.1.22000.194 | +| Windows Software Development Kit | 10.1.22000.832 | | WIX Toolset Studio 2019 Extension | 1.0.0.18 | | WixToolset.WixToolsetVisualStudio2019Extension | 1.0.0.18 | @@ -549,7 +550,7 @@ All other versions are saved but not installed. #### Powershell Modules | Module | Version | | ------------------ | ---------------- | -| AWSPowerShell | 4.1.132 | +| AWSPowerShell | 4.1.137 | | DockerMsftProvider | 1.0.0.8 | | MarkdownPS | 1.9 | | Microsoft.Graph | 1.10.0 | @@ -569,18 +570,21 @@ All other versions are saved but not installed. | Android SDK Platform-Tools | 33.0.2 | | Android SDK Tools | 26.1.1 | | Android Support Repository | 47.0.0 | -| CMake | 3.10.2<br>3.18.1 | +| CMake | 3.10.2<br>3.18.1<br>3.22.1 | | Google APIs | addon-google_apis-google-21<br>addon-google_apis-google-22<br>addon-google_apis-google-23<br>addon-google_apis-google-24 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 21.4.7075529<br>23.2.8568313<br>24.0.8215888 | +| NDK | 23.2.8568313<br>24.0.8215888<br>25.0.8775105 | | SDK Patch Applier v4 | 1 | #### Environment variables | Name | Value | | ----------------------- | --------------------------------------- | | ANDROID_HOME | C:\Android\android-sdk | -| ANDROID_NDK_LATEST_HOME | C:\Android\android-sdk\ndk\24.0.8215888 | +| ANDROID_NDK | C:\Android\android-sdk\ndk\25.0.8775105 | +| ANDROID_NDK_HOME | C:\Android\android-sdk\ndk\25.0.8775105 | +| ANDROID_NDK_LATEST_HOME | C:\Android\android-sdk\ndk\25.0.8775105 | +| ANDROID_NDK_ROOT | C:\Android\android-sdk\ndk\25.0.8775105 | | ANDROID_SDK_ROOT | C:\Android\android-sdk | ### Cached Docker images From 3f18bb3a7fdc92a00fa5844d6729d528f837ff48 Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Thu, 4 Aug 2022 21:59:41 +0200 Subject: [PATCH 1368/3485] [Ubuntu] Add Go 1.19 (#6019) --- images/linux/toolsets/toolset-2004.json | 3 ++- images/linux/toolsets/toolset-2204.json | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index 9ec9940b2277..78a2fdd3e245 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -46,7 +46,8 @@ "versions": [ "1.16.*", "1.17.*", - "1.18.*" + "1.18.*", + "1.19.*" ], "default": "1.17.*" }, diff --git a/images/linux/toolsets/toolset-2204.json b/images/linux/toolsets/toolset-2204.json index 1b8f528b2494..3c3c4bb0509a 100644 --- a/images/linux/toolsets/toolset-2204.json +++ b/images/linux/toolsets/toolset-2204.json @@ -40,7 +40,8 @@ "platform" : "linux", "versions": [ "1.17.*", - "1.18.*" + "1.18.*", + "1.19.*" ], "default": "1.18.*" }, From 9405db0ad64a438253ce49c12373cf3913d32a72 Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Thu, 4 Aug 2022 22:00:05 +0200 Subject: [PATCH 1369/3485] [macOS] Add Go 1.19 (#6018) --- images/macos/toolsets/toolset-11.json | 3 ++- images/macos/toolsets/toolset-12.json | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index c79617d6d3a0..cf777afbfffc 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -282,7 +282,8 @@ "versions": [ "1.16.*", "1.17.*", - "1.18.*" + "1.18.*", + "1.19.*" ] }, { diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index a2473b211299..651e794cc0f6 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -215,7 +215,8 @@ "versions": [ "1.16.*", "1.17.*", - "1.18.*" + "1.18.*", + "1.19.*" ] }, { From aa72ffdfa5ca22b0f2abdc13b31c807b7a04b965 Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Thu, 4 Aug 2022 22:00:36 +0200 Subject: [PATCH 1370/3485] [Windows] Add go 1.19 (#6017) --- images/win/toolsets/toolset-2019.json | 3 ++- images/win/toolsets/toolset-2022.json | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index 9fcb2215398e..0fc1fce310a2 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -74,7 +74,8 @@ "versions": [ "1.16.*", "1.17.*", - "1.18.*" + "1.18.*", + "1.19.*" ], "default": "1.17.*" } diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index 3b99dd55cc49..49b0f02d6bb7 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -66,7 +66,8 @@ "versions": [ "1.16.*", "1.17.*", - "1.18.*" + "1.18.*", + "1.19.*" ], "default": "1.17.*" } From e033c5a56497d4959f4cd0a3a7c8b27f06c715c4 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Fri, 5 Aug 2022 14:36:32 +0400 Subject: [PATCH 1371/3485] Change NDK latest to NDK root (#6025) --- images/linux/scripts/installers/android.sh | 2 +- images/macos/provision/core/android-toolsets.sh | 2 +- images/win/scripts/Installers/Install-AndroidSDK.ps1 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/images/linux/scripts/installers/android.sh b/images/linux/scripts/installers/android.sh index 1a34bf2f0ff2..644ba4a160e4 100644 --- a/images/linux/scripts/installers/android.sh +++ b/images/linux/scripts/installers/android.sh @@ -97,7 +97,7 @@ ANDROID_NDK_MAJOR_LATEST=(${ANDROID_NDK_MAJOR_VERSIONS[-1]}) ndkDefaultFullVersion=$(get_full_ndk_version $ANDROID_NDK_MAJOR_DEFAULT) ndkLatestFullVersion=$(get_full_ndk_version $ANDROID_NDK_MAJOR_LATEST) ANDROID_NDK="$ANDROID_SDK_ROOT/ndk/$ndkDefaultFullVersion" -# ANDROID_NDK, ANDROID_NDK_HOME, and ANDROID_NDK_LATEST_HOME variables should be set as many customer builds depend on them https://github.com/actions/virtual-environments/issues/5879 +# ANDROID_NDK, ANDROID_NDK_HOME, and ANDROID_NDK_ROOT variables should be set as many customer builds depend on them https://github.com/actions/virtual-environments/issues/5879 echo "ANDROID_NDK=${ANDROID_NDK}" | tee -a /etc/environment echo "ANDROID_NDK_HOME=${ANDROID_NDK}" | tee -a /etc/environment echo "ANDROID_NDK_ROOT=${ANDROID_NDK}" | tee -a /etc/environment diff --git a/images/macos/provision/core/android-toolsets.sh b/images/macos/provision/core/android-toolsets.sh index ff5362fc49af..5a9429641262 100755 --- a/images/macos/provision/core/android-toolsets.sh +++ b/images/macos/provision/core/android-toolsets.sh @@ -86,7 +86,7 @@ ndkDefault=$(get_full_ndk_version $ANDROID_NDK_MAJOR_DEFAULT) ANDROID_NDK_HOME=$ANDROID_HOME/ndk/$ndkDefault ndkLatest=$(get_full_ndk_version $ANDROID_NDK_MAJOR_LATEST) ANDROID_NDK_LATEST_HOME=$ANDROID_HOME/ndk/$ndkLatest -# ANDROID_NDK, ANDROID_NDK_HOME, and ANDROID_NDK_LATEST_HOME variables should be set as many customer builds depend on them https://github.com/actions/virtual-environments/issues/5879 +# ANDROID_NDK, ANDROID_NDK_HOME, and ANDROID_NDK_ROOT variables should be set as many customer builds depend on them https://github.com/actions/virtual-environments/issues/5879 echo "export ANDROID_NDK=$ANDROID_NDK_HOME" >> "${HOME}/.bashrc" echo "export ANDROID_NDK_HOME=$ANDROID_NDK_HOME" >> "${HOME}/.bashrc" echo "export ANDROID_NDK_ROOT=$ANDROID_NDK_HOME" >> "${HOME}/.bashrc" diff --git a/images/win/scripts/Installers/Install-AndroidSDK.ps1 b/images/win/scripts/Installers/Install-AndroidSDK.ps1 index dbf2508f331d..0656b436c0b9 100644 --- a/images/win/scripts/Installers/Install-AndroidSDK.ps1 +++ b/images/win/scripts/Installers/Install-AndroidSDK.ps1 @@ -127,7 +127,7 @@ $ndkRoot = "$sdkRoot\ndk\$ndkDefaultVersion" # Create env variables setx ANDROID_HOME $sdkRoot /M setx ANDROID_SDK_ROOT $sdkRoot /M -# ANDROID_NDK, ANDROID_NDK_HOME, and ANDROID_NDK_LATEST_HOME variables should be set as many customer builds depend on them https://github.com/actions/virtual-environments/issues/5879 +# ANDROID_NDK, ANDROID_NDK_HOME, and ANDROID_NDK_ROOT variables should be set as many customer builds depend on them https://github.com/actions/virtual-environments/issues/5879 setx ANDROID_NDK $ndkRoot /M setx ANDROID_NDK_HOME $ndkRoot /M setx ANDROID_NDK_ROOT $ndkRoot /M From 58ba4559eb289540817c5cdf49c13c3810bfed71 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 5 Aug 2022 15:20:47 +0000 Subject: [PATCH 1372/3485] Updating readme file for macOS-11 version 20220801.1 (#5996) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-11-Readme.md | 46 ++++++++++++++++++--------------- 1 file changed, 25 insertions(+), 21 deletions(-) diff --git a/images/macos/macos-11-Readme.md b/images/macos/macos-11-Readme.md index 475c5aacdfec..221d33e697a2 100644 --- a/images/macos/macos-11-Readme.md +++ b/images/macos/macos-11-Readme.md @@ -1,5 +1,6 @@ | Announcements | |-| +| ['virtual-environments' repository name will be changed to 'runner-images' on August, 8th](https://github.com/actions/virtual-environments/issues/5967) | | [[all OSs] Android NDK 21 will be replaced in favor of 25 on August, 1st](https://github.com/actions/virtual-environments/issues/5930) | | [[all OSs] Android ndk-bundle along with old NDK versions will be deprecated on July, 24](https://github.com/actions/virtual-environments/issues/5879) | | [The macOS 10.15 Actions runner image will begin deprecation on 5/31/22 and will be fully unsupported by 8/30/22 in GitHub and by 9/30/22 in ADO](https://github.com/actions/virtual-environments/issues/5583) | @@ -7,7 +8,7 @@ # macOS 11.6 info - System Version: macOS 11.6.8 (20G730) - Kernel Version: Darwin 20.6.0 -- Image Version: 20220724.1 +- Image Version: 20220801.1 ## Installed Software ### Language and Runtime @@ -36,7 +37,7 @@ - Ruby 2.7.6p219 ### Package Management -- Bundler version 2.3.18 +- Bundler version 2.3.19 - Carthage 0.38.0 - CocoaPods 1.11.3 - Composer 2.3.10 @@ -47,8 +48,8 @@ - Pip 20.3.4 (python 2.7) - Pip 22.1.1 (python 3.9) - Pipx 1.1.0 -- RubyGems 3.3.18 -- Vcpkg 2022 (build from master \<f93ba152d>) +- RubyGems 3.3.19 +- Vcpkg 2022 (build from master \<66045de4d>) - Yarn 1.22.19 #### Environment variables @@ -73,13 +74,13 @@ - Curl 7.84.0 - Git 2.37.1 - Git LFS: 3.2.0 -- GitHub CLI: 2.14.2 +- GitHub CLI: 2.14.3 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.3 - gpg (GnuPG) 2.3.7 - helm v3.9.2+g1addefb - Hub CLI: 2.14.2 -- ImageMagick 7.1.0-43 +- ImageMagick 7.1.0-44 - jq 1.6 - mongo v5.0.7 - mongod v5.0.7 @@ -91,23 +92,23 @@ - Sox 14.4.2 - Subversion (SVN) 1.14.2 - Switchaudio-osx 1.1.0 -- yq (https://github.com/mikefarah/yq/) version 4.26.1 +- yq (https://github.com/mikefarah/yq/) version 4.27.1 - zstd 1.5.2 ### Tools - Aliyun CLI 3.0.123 - App Center CLI 2.10.10 -- AWS CLI 2.7.18 +- AWS CLI 2.7.20 - AWS SAM CLI 1.53.0 - AWS Session Manager CLI 1.2.339.0 - Azure CLI (azure-devops) 0.25.0 - Azure CLI 2.38.0 - Bicep CLI 0.8.9 - Cabal 3.6.2.0 -- Cmake 3.23.2 +- Cmake 3.23.3 - Fastlane 2.208.0 -- GHC 9.2.3 -- GHCup 0.1.17.8 +- GHC 9.2.4 +- GHCup 0.1.18.0 - Jazzy 0.14.2 - Stack 2.7.5 - SwiftFormat 0.49.13 @@ -115,7 +116,7 @@ - Xcode Command Line Tools 13.2.0.0.1.1638488800 ### Linters -- SwiftLint 0.47.1 +- SwiftLint 0.48.0 - yamllint 1.27.1 ### Browsers @@ -123,9 +124,9 @@ - SafariDriver 15.6 (16613.3.9.1.7) - Google Chrome 103.0.5060.134 - ChromeDriver 103.0.5060.134 -- Microsoft Edge 103.0.1264.71 -- Microsoft Edge WebDriver 103.0.1264.71 -- Mozilla Firefox 102.0.1 +- Microsoft Edge 103.0.1264.77 +- Microsoft Edge WebDriver 103.0.1264.77 +- Mozilla Firefox 103.0 - geckodriver 0.31.0 - Selenium server 4.3.0 @@ -141,12 +142,12 @@ | ------------------- | --------------- | -------------------- | | 8.0.332+9 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | | 11.0.16+8 | Eclipse Temurin | JAVA_HOME_11_X64 | -| 17.0.3+7 | Eclipse Temurin | JAVA_HOME_17_X64 | +| 17.0.4+8 | Eclipse Temurin | JAVA_HOME_17_X64 | ### GraalVM | Version | Environment variables | | --------- | --------------------- | -| CE 22.1.0 | GRAALVM_11_ROOT | +| CE 22.2.0 | GRAALVM_11_ROOT | ### Cached Tools #### Ruby @@ -217,7 +218,7 @@ | Version | Build | Path | | -------------- | --------- | ------------------------------------ | | 2019 | 8.10.25.2 | /Applications/Visual Studio 2019.app | -| 2022 (default) | 17.0.6.4 | /Applications/Visual Studio.app | +| 2022 (default) | 17.0.7.7 | /Applications/Visual Studio.app | ##### Notes: ``` @@ -338,17 +339,20 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" | Android SDK Platforms | android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | | Android SDK Platform-Tools | 33.0.2 | | Android Support Repository | 47.0.0 | -| CMake | 3.10.2<br>3.18.1 | +| CMake | 3.10.2<br>3.18.1<br>3.22.1 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 21.4.7075529<br>23.2.8568313<br>24.0.8215888 | +| NDK | 23.2.8568313<br>24.0.8215888<br>25.0.8775105 (default) | | SDK Patch Applier v4 | 1 | #### Environment variables | Name | Value | | ----------------------- | -------------------------------------------------- | | ANDROID_HOME | /Users/runner/Library/Android/sdk | -| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/24.0.8215888 | +| ANDROID_NDK | /Users/runner/Library/Android/sdk/ndk/25.0.8775105 | +| ANDROID_NDK_HOME | /Users/runner/Library/Android/sdk/ndk/25.0.8775105 | +| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/25.0.8775105 | +| ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk/25.0.8775105 | | ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | ### Miscellaneous From f1bb031e436bbb5c5645ddc366ca0856ddbf0131 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Fri, 5 Aug 2022 20:50:37 +0200 Subject: [PATCH 1373/3485] [Windows] Disable mongodb service by default (#6023) * Disable mongodb service by default * Add ErrorAction Ignore --- .../scripts/Installers/Install-MongoDB.ps1 | 10 +++++- images/win/scripts/Tests/Databases.Tests.ps1 | 31 +++++++++++++++---- 2 files changed, 34 insertions(+), 7 deletions(-) diff --git a/images/win/scripts/Installers/Install-MongoDB.ps1 b/images/win/scripts/Installers/Install-MongoDB.ps1 index 2265b40aaa4f..674207ed78bb 100644 --- a/images/win/scripts/Installers/Install-MongoDB.ps1 +++ b/images/win/scripts/Installers/Install-MongoDB.ps1 @@ -3,11 +3,19 @@ ## Desc: Install MongoDB #################################################################################### +# Install mongodb package $toolsetVersion = (Get-ToolsetContent).mongodb.version $latestChocoPackage = Get-LatestChocoPackageVersion -TargetVersion $toolsetVersion -PackageName "mongodb" Choco-Install -PackageName mongodb -ArgumentList "--version=$latestChocoPackage" -$mongoPath = (Get-CimInstance Win32_Service -Filter "Name LIKE 'mongodb'").PathName + +# Add mongodb to the PATH +$mongodbService = "mongodb" +$mongoPath = (Get-CimInstance Win32_Service -Filter "Name LIKE '$mongodbService'").PathName $mongoBin = Split-Path -Path $mongoPath.split('"')[1] Add-MachinePathItem "$mongoBin" +# Stop and disable mongodb service +Stop-Service -Name $mongodbService +Set-Service $mongodbService -StartupType Disabled + Invoke-PesterTests -TestFile "Databases" -TestName "MongoDB" \ No newline at end of file diff --git a/images/win/scripts/Tests/Databases.Tests.ps1 b/images/win/scripts/Tests/Databases.Tests.ps1 index 1e0c88a34a23..66e12105719b 100644 --- a/images/win/scripts/Tests/Databases.Tests.ps1 +++ b/images/win/scripts/Tests/Databases.Tests.ps1 @@ -1,10 +1,29 @@ Describe "MongoDB" { - It "<ToolName>" -TestCases @( - @{ ToolName = "mongo" } - @{ ToolName = "mongod" } - ) { - $toolsetVersion = (Get-ToolsetContent).mongodb.version - (&$ToolName --version)[2].Split('"')[-2] | Should -BeLike "$toolsetVersion*" + Context "Version" { + It "<ToolName>" -TestCases @( + @{ ToolName = "mongo" } + @{ ToolName = "mongod" } + ) { + $toolsetVersion = (Get-ToolsetContent).mongodb.version + (&$ToolName --version)[2].Split('"')[-2] | Should -BeLike "$toolsetVersion*" + } + } + + Context "Service" { + $mongoService = Get-Service -Name mongodb -ErrorAction Ignore + $mongoServiceTests = @{ + Name = $mongoService.Name + Status = $mongoService.Status + StartType = $mongoService.StartType + } + + It "<Name> service is stopped" -TestCases $mongoServiceTests { + $Status | Should -Be "Stopped" + } + + It "<Name> service is disabled" -TestCases $mongoServiceTests { + $StartType | Should -Be "Disabled" + } } } From bf34dfb00a0fa765bee014c087a2d7ede4bb1117 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Mon, 8 Aug 2022 15:55:18 +0200 Subject: [PATCH 1374/3485] Wait for mongodb service running (#6030) --- images/win/scripts/Installers/Install-MongoDB.ps1 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/images/win/scripts/Installers/Install-MongoDB.ps1 b/images/win/scripts/Installers/Install-MongoDB.ps1 index 674207ed78bb..ce73fe5a2dc1 100644 --- a/images/win/scripts/Installers/Install-MongoDB.ps1 +++ b/images/win/scripts/Installers/Install-MongoDB.ps1 @@ -14,6 +14,10 @@ $mongoPath = (Get-CimInstance Win32_Service -Filter "Name LIKE '$mongodbService' $mongoBin = Split-Path -Path $mongoPath.split('"')[1] Add-MachinePathItem "$mongoBin" +# Wait for mongodb service running +$svc = Get-Service $mongodbService +$svc.WaitForStatus('Running','00:01:00') + # Stop and disable mongodb service Stop-Service -Name $mongodbService Set-Service $mongodbService -StartupType Disabled From ce8db94ed2037e36e89ac9c578d8b4b888581d9b Mon Sep 17 00:00:00 2001 From: Larissa Fortuna <56982181+lkfortuna@users.noreply.github.com> Date: Mon, 8 Aug 2022 08:25:58 -0700 Subject: [PATCH 1375/3485] Virtual environment rebrand - readme updates (#6006) * Create release-preview.md * Update release-preview.md * Update release-preview.md * Update release-preview.md * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * update support policy wording * Update README.md * Preparing for upstream PR deleted a test file I made * fixing some linting errors * Update README.md * Apply suggestions from code review Co-authored-by: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> * Updating per PR suggestions * Delete software-and-images-guidelines.md * Updates per Steve's suggestion * Update README.md * Apply suggestions from code review Co-authored-by: Sam Tran <samvantran@github.com> * Update README.md * Revert "Update README.md" This reverts commit 9ff7d224e31957043d02c17b3d92a4283e010cc9. * docs: fix markdownlint errors Co-authored-by: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Co-authored-by: Sam Tran <samvantran@github.com> --- README.md | 200 +++++++++++++++++++------ docs/software-and-images-guidelines.md | 38 ----- 2 files changed, 158 insertions(+), 80 deletions(-) delete mode 100644 docs/software-and-images-guidelines.md diff --git a/README.md b/README.md index 2a7f37c2acd5..abb0053d48f7 100644 --- a/README.md +++ b/README.md @@ -1,52 +1,38 @@ -# GitHub Actions Virtual Environments -Repository contains the source used to create the [virtual environments](https://help.github.com/en/actions/reference/virtual-environments-for-github-hosted-runners) for GitHub Actions hosted runners, as well as the VM images of [Microsoft-hosted agents](https://docs.microsoft.com/en-us/azure/devops/pipelines/agents/hosted?view=azure-devops#use-a-microsoft-hosted-agent) used for Azure Pipelines. -To build a VM machine from this repo's source, see the [instructions](docs/create-image-and-azure-resources.md). -How to get in touch with us: -- To file a bug report, or request tools to be added/updated, please [open an issue using the appropriate template](https://github.com/actions/virtual-environments/issues/new/choose) -- If you want to share your thoughts about image configuration, installed software, or bring some idea, please, create a new topic in a [discussions section](https://github.com/actions/virtual-environments/discussions) for a corresponding category. Before making a new discussion please make sure no similar topics were created earlier. +# GitHub Actions Runner Images -For general questions about using the virtual environments or writing your Actions workflow, please open requests in the [GitHub Actions Community Forum](https://github.community/c/github-actions/41). +**Table of Contents** -## Available Environments -| Environment | YAML Label | Included Software | Latest Release & Rollout Progress | -| --------------------|---------------------|--------------------|---------------------| -| Ubuntu 22.04 <sup>beta</sup> | `ubuntu-22.04` | [ubuntu-22.04] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu22&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu22&redirect=1) -| Ubuntu 20.04 | `ubuntu-latest` or `ubuntu-20.04` | [ubuntu-20.04] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu20&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu20&redirect=1) -| Ubuntu 18.04 | `ubuntu-18.04` | [ubuntu-18.04] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu18&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu18&redirect=1) -| macOS 12 | `macos-12`| [macOS-12] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-12&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-12&redirect=1) -| macOS 11 | `macos-latest` or `macos-11`| [macOS-11] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-11&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-11&redirect=1) -| macOS 10.15 <sup>deprecated</sup> | `macos-10.15` | [macOS-10.15] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-10.15&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-10.15&redirect=1) -| Windows Server 2022 | `windows-latest` or `windows-2022` | [windows-2022] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=windows-2022&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=windows-2022&redirect=1) | -| Windows Server 2019 | `windows-2019` | [windows-2019] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=windows-2019&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=windows-2019&redirect=1) - -<b>Note:</b> Beta and Preview images are provided "as-is", "with all faults" and "as available" and are excluded from the service level agreement and warranty. Beta and Preview images may not be covered by customer support. - -***What images are available for GitHub Actions and Azure DevOps?*** -The availability of images for GitHub Actions and Azure DevOps is different. See documentation for more details: -- [GitHub Actions](https://docs.github.com/en/free-pro-team@latest/actions/reference/specifications-for-github-hosted-runners#supported-runners-and-hardware-resources) -- [Azure DevOps](https://docs.microsoft.com/en-us/azure/devops/pipelines/agents/hosted?view=azure-devops&tabs=yaml#software) +- [About](#about) +- [Available Images](#available-images) +- [Image Definitions](#image-definitions) +- [Image Releases](#image-releases) +- [Software and Image Support](#software-and-image-support) +- [How to Interact with the Repo](#how-to-interact-with-the-repo) +- [FAQs](#faqs) -***What image version is used in my build?*** Usually, image deployment takes 3-4 days, and documentation in the `main` branch is only updated when deployment is finished. To find out which image version and what software versions are used in a specific build, see `Set up job` (GitHub Actions) or `Initialize job` (Azure DevOps) step log. +## About -***Looking for other Linux distributions?*** We do not plan to offer other Linux distributions. We recommend using Docker if you'd like to build using other distributions with the hosted virtual environments. Alternatively, you can leverage [self-hosted runners] and fully customize your environment to your needs. - -***How to contribute to macOS source?*** macOS source lives in this repository and available for everyone. However, MacOS image-generation CI doesn't support external contributions yet so we are not able to accept pull-requests for now. -We are in the process of preparing MacOS CI to accept contributions. Until then, we appreciate your patience and ask you continue to make tool requests by filing issues. +This repository contains the source code used to create the VM images for [GitHub-hosted runners](https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners)used for Actions, as well as for [Microsoft-hosted agents](https://docs.microsoft.com/en-us/azure/devops/pipelines/agents/hosted?view=azure-devops#use-a-microsoft-hosted-agent) used for Azure Pipelines. +To build a VM machine from this repo's source, see the [instructions](docs/create-image-and-azure-resources.md). -## Updates to virtual environments -*Cadence* +## Available Images -We typically deploy weekly updates to the software on the virtual environments. -For some tools, we always install the latest at the time of the deployment; for others, -we pin the tool to specific version(s). +| Image | YAML Label | Included Software | Rollout Progress of Latest Image Release | +| --------------------|---------------------|--------------------|---------------------| +| Ubuntu 22.04 | `ubuntu-22.04` | [ubuntu-22.04] | [![status22](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu22&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu22&redirect=1) +| Ubuntu 20.04 | `ubuntu-latest` or `ubuntu-20.04` | [ubuntu-20.04] | [![status20](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu20&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu20&redirect=1) +| Ubuntu 18.04 <sup>deprecated</sup> | `ubuntu-18.04` | [ubuntu-18.04] | [![status18](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu18&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu18&redirect=1) +| macOS 12 | `macos-12`| [macOS-12] | [![statusumac12](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-12&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-12&redirect=1) +| macOS 11 | `macos-latest` or `macos-11`| [macOS-11] | [![statusmac11](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-11&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-11&redirect=1) +| macOS 10.15 <sup>deprecated</sup> | `macos-10.15` | [macOS-10.15] | [![statusmac10](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-10.15&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-10.15&redirect=1) +| Windows Server 2022 | `windows-latest` or `windows-2022` | [windows-2022] | [![statuswin22](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=windows-2022&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=windows-2022&redirect=1) | +| Windows Server 2019 | `windows-2019` | [windows-2019] | [![statuswin19](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=windows-2019&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=windows-2019&redirect=1) -*Following Along / Change Notifications* +### Label scheme -* **High Impact Changes** (ex. breaking changes, new or deprecated environments) will be posted to the GitHub Changelog on our [blog](https://github.blog/changelog/) and on [twitter](https://twitter.com/GHchangelog). -* **Low Impact Changes** will be pinned in this repository and marked with the [Announcement](https://github.com/actions/virtual-environments/labels/Announcement) label. -* **Regular Weekly Rhythm** can be followed by watching [Releases](https://github.com/actions/virtual-environments/releases). Pre-release is created when deployment is started. As soon as deployment is finished, it is converted to release. -You can also track upcoming changes using the [awaiting-deployment](https://github.com/actions/virtual-environments/labels/awaiting-deployment) label. +- In general the `-latest` label is used for the latest OS image version that is GA +- Before moving the`-latest` label to a new OS version we will announce the change and give sufficient lead time for users to update their workflows [ubuntu-22.04]: https://github.com/actions/virtual-environments/blob/main/images/linux/Ubuntu2204-Readme.md [ubuntu-20.04]: https://github.com/actions/virtual-environments/blob/main/images/linux/Ubuntu2004-Readme.md @@ -58,5 +44,135 @@ You can also track upcoming changes using the [awaiting-deployment](https://gith [macOS-10.15]: https://github.com/actions/virtual-environments/blob/main/images/macos/macos-10.15-Readme.md [self-hosted runners]: https://help.github.com/en/actions/hosting-your-own-runners -## Software and image guidelines -To learn more about tools and images support policy, see the [guidelines](./docs/software-and-images-guidelines.md). +## Image Definitions + +### Beta + +The purpose of a Beta is to collect feedback on an image before it is released to GA. The goal of a Beta is to identify and fix any potential issues that exist on that +image. Images are updated on a weekly cadence. Any workflows that run on a beta image do not fall under the customer [SLA](https://github.com/customer-terms/github-online-services-sla) in place for Actions. +Customers choosing to use Beta images are encouraged to provide feedback in the runner-images repo by creating an issue. A Beta may take on different availability, i.e. public vs private. + +### GA + +A GA (General Availability) image has been through a Beta period and is deemed ready for general use. Images are updated on a weekly cadence. In order to be moved to +GA the image must meet the following criteria: + +1. Has been through a Beta period (public or private) +2. Most major software we install on the image has a compatible +version for the underlying OS and +3. All major bugs reported during the Beta period have been addressed. + +This image type falls under the customer [SLA](https://github.com/customer-terms/github-online-services-sla) for actions. GA images are eventually deprecated according to our guidelines as we only support the +latest 2 versions of an OS. + +## Image Releases + +*How to best follow along with changes* + +1. Find the latest releases for this repository [here.](https://github.com/actions/virtual-environments/releases) +2. Subscribe to the releases coming out of this repository, instructions [here.](https://docs.github.com/en/account-and-profile/managing-subscriptions-and-notifications-on-github/setting-up-notifications/configuring-notifications#configuring-your-watch-settings-for-an-individual-repository) +3. Upcoming changes: A pre-release is created when the deployment of an image has started. As soon as the deployment is finished, the pre-release is converted to a release. If you have subscribed to releases, you will get notified of pre-releases as well. + + - You can also track upcoming changes using the [awaiting-deployment](https://github.com/actions/virtual-environments/labels/awaiting-deployment) label. +4. For high impact changes, we will post these in advance to the GitHub Changelog on our [blog](https://github.blog/changelog/) and on [twitter](https://twitter.com/GHchangelog). + - Ex: breaking changes, GA or deprecation of images +5. You can also view notable upcoming changes by viewing the [Announcement](https://github.com/actions/virtual-environments/labels/Announcement) label. + +*Cadence* + +- We typically deploy weekly updates to the software on the runner images. + +## Software and Image Support + +### Support Policy + +- Tools and versions will typically be removed 6 months after they are deprecated or have reached end-of-life +- We support (at maximum) 2 GA images and 1 beta image at a time. We begin the deprecation process of the oldest image label once the newest OS image label has been released to GA. +- The images generally contain the latest versions of packages installed except for Ubuntu LTS where we mostly rely on the Canonical-provided repositories. + +- Popular tools can have several versions installed side-by-side with the following strategy: + +| Tool name | Installation strategy | +|-----------|-----------------------| +| Docker images | not more than 3 latest LTS OS\tool versions. New images or new versions of current images are added using the standard tool request process | +| Java | all LTS versions | +| Node.js | 3 latest LTS versions | +| Go | 3 latest minor versions | +| Python <br/> Ruby | 5 most popular `major.minor` versions | +| PyPy | 3 most popular `major.minor` versions | +| .NET Core | 2 latest LTS versions and 1 latest version. For each feature version only latest patch is installed | +| GCC <br/> GNU Fortran <br/> Clang <br/> GNU C++ | 3 latest major versions | +| Android NDK | 1 latest non-LTS, 2 latest LTS versions | +| Xcode | - all OS compatible versions side-by-side <br/> - for beta, GM versions - latest beta only <br/> - old patch versions are deprecated in 3 months | + +### Image Deprecation Policy + +- Images begin the deprecation process of the oldest image label once a new GA OS version has been released. +- Deprecation process begins with an announcement that sets a date for deprecation +- As it gets closer to the date, GitHub begins doing scheduled brownouts of the image +- During this time there will be an Announcement pinned in the repo to remind users of the deprecation. +- Finally GitHub will deprecate the image and it will no longer be available + +### Preinstallation Policy + +In general, these are the guidelines we follow when deciding what to pre-install on our images: + +- Popularity: widely-used tools and ecosystems will be given priority. +- Latest Technology: recent versions of tools will be given priority. +- Deprecation: end-of-life tools and versions will not be added. +- Licensing: MIT, Apache, or GNU licenses are allowed. +- Time & Space on the Image: we will evaluate how much time is saved and how much space is used by having the tool pre-installed. +- Support: If a tool requires the support of more than one version, we will consider the cost of this maintenance. + +### Default Version Update Policy + +- In general, once a new version is installed on the image, we announce the default version update 2 weeks prior to deploying it. +- For potentially dangerous updates, we may extend the timeline up to 1 month between the announcement and deployment. + +## How to Interact with the Repo + +- **Issues**: To file a bug report, or request tools to be added/updated, please [open an issue using the appropriate template](https://github.com/actions/virtual-environments/issues/new/choose) +- **Discussions**: If you want to share your thoughts about image configuration, installed software, or bring a new idea, please create a new topic in a [discussion](https://github.com/actions/virtual-environments/discussions) for a corresponding category. Before making a new discussion please make sure no similar topics were created earlier. +- For general questions about using the runner images or writing your Actions workflow, please open requests in the [GitHub Actions Community Forum](https://github.community/c/github-actions/41). + +## FAQs + +<details> + <summary><b><i>What images are available for GitHub Actions and Azure DevOps?</b></i></summary> + +The availability of images for GitHub Actions and Azure DevOps is the same. However, deprecation polciies may differ. See documentation for more details: +- [GitHub Actions](https://docs.github.com/en/free-pro-team@latest/actions/reference/specifications-for-github-hosted-runners#supported-runners-and-hardware-resources) +- [Azure DevOps](https://docs.microsoft.com/en-us/azure/devops/pipelines/agents/hosted?view=azure-devops&tabs=yaml#software) +</details> + +<details> + <summary><b><i>What image version is used in my build?</b></i></summary> + +Usually, image deployment takes 2-3 days, and documentation in the `main` branch is only updated when deployment is finished. To find out which image version and what software versions are used in a specific build, see `Set up job` (GitHub Actions) or `Initialize job` (Azure DevOps) step log. +<img width="1440" alt="actions-runner-image" src="https://user-images.githubusercontent.com/56982181/169595536-91a8a79b-d5e0-47d1-a736-510cff6cfb83.png"> +</details> + +<details> + <summary><b><i>Looking for other Linux distributions?</b></i></summary> + +We do not plan to offer other Linux distributions. We recommend using Docker if you'd like to build using other distributions with the hosted runner images. Alternatively, you can leverage [self-hosted runners] and fully customize your VM image to your needs. +</details> + +<details> + <summary><b><i>How do I contribute to the macOS source?</b></i></summary> + +macOS source lives in this repository and is available for everyone. However, macOS image-generation CI doesn't support external contributions yet so we are not able to accept pull-requests for now. + +We are in the process of preparing macOS CI to accept contributions. Until then, we appreciate your patience and ask you to continue to make tool requests by filing issues. +</details> + +<details> + <summary><b><i>How does GitHub determine what tools are installed on the images?</b></i></summary> + +For some tools, we always install the latest at the time of the deployment; for others, we pin the tool to specific version(s). For more details please see the [Preinstallation Policy](#preinstallation-policy) +</details> + +<details> + <summary><b><i>How do I request that a new tool be pre-installed on the image?</b></i></summary> +Please create an issue and get an approval from us to add this tool to the image before creating the pull request. +</details> diff --git a/docs/software-and-images-guidelines.md b/docs/software-and-images-guidelines.md deleted file mode 100644 index 0d7509e9422f..000000000000 --- a/docs/software-and-images-guidelines.md +++ /dev/null @@ -1,38 +0,0 @@ -# Software and image guidelines - -## Software preinstallation policy -In general, these are the guidelines we consider when deciding what to pre-install: - -- Tools and ecosystems that are broadly popular and widely-used will be given priority. -- Recent versions of tools will be given priority over older versions. -- Tools and versions that are deprecated or have reached end-of-life will not be added. -- If a tool can be installed during the build, we will evaluate how much time is saved - and how much space is used by having the tool pre-installed. -- MIT, Apache, and GNU licenses are ok, anything else we'll have to check with lawyers. -- If a tool takes much space we will evaluate space usage and provide a decision if this tool can be pre-installed. -- If a tool requires the support of more than one version, we will consider the cost of this maintenance, how often new versions bring dangerous updates. - -**Note:** For new tools, please, create an issue and get an approval from us to add this tool to the image before creating the pull request. - -## Software and images support policy -These are the guidelines we follow in software and images supporting routine: -- Tools and versions will typically be removed 6 months after they are deprecated or have reached end-of-life. -- We support at least 2 latest OS versions. We begin the deprecation process of the oldest image label once a new OS version has been released. -- The images generally contain the latest versions of packages installed except for Ubuntu LTS where we rely on the Canonical-provided repositories mostly. -- Popular tools can have several versions installed side-by-side with the following strategy: - -| Tool name | Installation strategy | -|-----------|-----------------------| -| Docker images | not more than 3 latest LTS OS\tool versions. New images or new versions of current images are added using the standard tool request process | -| Java | all LTS versions | -| Node.js | 3 latest LTS versions | -| Go | 3 latest minor versions | -| Python <br/> Ruby | 5 most popular `major.minor` versions | -| PyPy | 3 most popular `major.minor` versions | -| .NET Core | 2 latest LTS versions and 1 latest version. For each feature version only latest patch is installed | -| GCC <br/> GNU Fortran <br/> Clang <br/> GNU C++ | 3 latest major versions | -| Android NDK | 1 latest non-LTS, 2 latest LTS versions | -| Xcode | - all OS compatible versions side-by-side <br/> - for beta, GM versions - latest beta only <br/> - old patch versions are deprecated in 3 months | - -## Software default versions update policy for tools with multiple versions installed -In general, once a new version is installed on the image, we announce the default version update 2 weeks prior to deploying it to give time to adapt to upcoming changes. For potentially dangerous updates, we can extend the timeline up to 1 month between the announcement and deployment. From 54ec59e5eeeec78bdf1424076214017a85313934 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 9 Aug 2022 09:16:53 +0000 Subject: [PATCH 1376/3485] Updating readme file for ubuntu20 version 20220807.1 (#6031) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2004-Readme.md | 94 ++++++++++++++++--------------- 1 file changed, 48 insertions(+), 46 deletions(-) diff --git a/images/linux/Ubuntu2004-Readme.md b/images/linux/Ubuntu2004-Readme.md index ad70b5209336..dc4c05b98b03 100644 --- a/images/linux/Ubuntu2004-Readme.md +++ b/images/linux/Ubuntu2004-Readme.md @@ -1,14 +1,14 @@ | Announcements | |-| +| [[All OSs] Go version 1.16 will be removed on August, 15th](https://github.com/actions/virtual-environments/issues/6024) | +| [The Ubuntu 18.04 Actions runner image will begin deprecation on 8/8/22 and will be fully unsupported by 12/1/22](https://github.com/actions/virtual-environments/issues/6002) | | [Ubuntu 22.04 is generally available starting from August, 8](https://github.com/actions/virtual-environments/issues/5998) | | ['virtual-environments' repository name will be changed to 'runner-images' on August, 8th](https://github.com/actions/virtual-environments/issues/5967) | | [[all OSs] Android NDK 21 will be replaced in favor of 25 on August, 1st](https://github.com/actions/virtual-environments/issues/5930) | -| [[all OSs] Android ndk-bundle along with old NDK versions will be deprecated on July, 24](https://github.com/actions/virtual-environments/issues/5879) | -| [(Public Beta) Ubuntu 22.04 is now available](https://github.com/actions/virtual-environments/issues/5490) | *** # Ubuntu 20.04.4 LTS - Linux kernel version: 5.15.0-1014-azure -- Image Version: 20220729.1 +- Image Version: 20220807.1 ## Installed Software ### Language and Runtime @@ -35,7 +35,7 @@ ### Package Management - cpan 1.64 - Helm 3.9.2 -- Homebrew 3.5.6 +- Homebrew 3.5.8 - Miniconda 4.12.0 - Npm 8.11.0 - NuGet 6.2.1.2 @@ -43,7 +43,7 @@ - Pip3 20.0.2 - Pipx 1.1.0 - RubyGems 3.1.2 -- Vcpkg (build from master \<281d2f2dc>) +- Vcpkg (build from master \<9b22b40c6>) - Yarn 1.22.19 #### Environment variables @@ -54,7 +54,7 @@ ### Project Management - Ant 1.10.7 -- Gradle 7.5 +- Gradle 7.5.1 - Lerna 5.3.0 - Maven 3.8.6 - Sbt 1.7.1 @@ -65,13 +65,13 @@ - AzCopy 10.16.0 (available by `azcopy` and `azcopy10` aliases) - Bazel 5.2.0 - Bazelisk 1.12.0 -- Bicep 0.8.9 +- Bicep 0.9.1 - Buildah 1.22.3 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- CMake 3.23.3 -- CodeQL Action Bundle 2.10.1 +- CMake 3.24.0 +- CodeQL Action Bundle 2.10.2 - Docker Amazon ECR Credential Helper 0.6.0 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.6.1+azure-1 +- Docker Compose v2 2.9.0+azure-1 - Docker-Buildx 0.8.2 - Docker-Moby Client 20.10.17+azure-1 - Docker-Moby Server 20.10.17+azure-1 @@ -80,48 +80,48 @@ - Git LFS 3.2.0 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.6.0 - Haveged 1.9.1 -- Heroku 7.60.2 +- Heroku 7.62.0 - HHVM (HipHop VM) 4.165.0 - jq 1.6 - Kind 0.14.0 - Kubectl 1.24.3 -- Kustomize 4.5.6 -- Leiningen 2.9.8 +- Kustomize 4.5.7 +- Leiningen 2.9.9 - MediaInfo 19.09 - Mercurial 5.3.1 -- Minikube 1.26.0 +- Minikube 1.26.1 - n 9.0.0 - Newman 5.3.2 - nvm 0.39.1 - OpenSSL 1.1.1f-1ubuntu2.16 -- Packer 1.8.2 -- Parcel 2.6.2 +- Packer 1.8.3 +- Parcel 2.7.0 - PhantomJS 2.1.1 - Podman 3.4.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- Pulumi 3.37.1 +- Pulumi 3.37.2 - R 4.2.1 - Skopeo 1.5.0 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 - Terraform 1.2.6 - yamllint 1.27.1 -- yq 4.26.1 +- yq 4.27.2 - zstd 1.5.2 (homebrew) ### CLI Tools - Alibaba Cloud CLI 3.0.124 -- AWS CLI 2.7.20 +- AWS CLI 2.7.21 - AWS CLI Session manager plugin 1.2.339.0 - AWS SAM CLI 1.53.0 -- Azure CLI (azure-cli) 2.38.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) +- Azure CLI (azure-cli) 2.39.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.25.0 - GitHub CLI 2.14.3 - Google Cloud SDK 369.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 10.13.0 -- OpenShift CLI 4.10.24 +- Netlify CLI 10.15.0 +- OpenShift CLI 4.10.25 - ORAS CLI 0.13.0 -- Vercel CLI 27.3.3 +- Vercel CLI 27.3.7 ### Java | Version | Vendor | Environment Variable | @@ -147,7 +147,7 @@ ### Haskell - Cabal 3.6.2.0 - GHC 9.2.4 -- GHCup 0.1.17.8 +- GHCup 0.1.18.0 - Stack 2.7.5 ### Rust Tools @@ -165,11 +165,11 @@ - Rustfmt 1.4.38 ### Browsers and Drivers -- Google Chrome 103.0.5060.134 -- ChromeDriver 103.0.5060.134 -- Chromium 103.0.5060.0 -- Microsoft Edge 103.0.1264.77 (apt source repository: https://packages.microsoft.com/repos/edge) -- Microsoft Edge WebDriver 103.0.1264.77 +- Google Chrome 104.0.5112.79 +- ChromeDriver 104.0.5112.79 +- Chromium 104.0.5112.0 +- Microsoft Edge 104.0.1293.47 (apt source repository: https://packages.microsoft.com/repos/edge) +- Microsoft Edge WebDriver 104.0.1293.47 - Selenium server 4.3.0 - Mozilla Firefox 103.0 - Geckodriver 0.31.0 @@ -186,7 +186,7 @@ - 3.1.120 3.1.202 3.1.302 3.1.421 5.0.104 5.0.214 5.0.303 5.0.408 6.0.302 ### .NET tools -- nbgv 3.5.108+6e793d63d3 +- nbgv 3.5.109+bdfbd7dea6 ### Databases - MongoDB 5.0.10 (apt source repository: https://repo.mongodb.org/apt/ubuntu) @@ -213,8 +213,9 @@ ### Cached Tools #### Go - 1.16.15 -- 1.17.12 -- 1.18.4 +- 1.17.13 +- 1.18.5 +- 1.19.0 #### Node.js - 12.22.12 @@ -234,7 +235,7 @@ - 3.7.13 - 3.8.13 - 3.9.13 -- 3.10.5 +- 3.10.6 #### Ruby - 2.5.9 @@ -247,8 +248,9 @@ | Name | Value | Architecture | | --------------- | ----------------------------------- | ------------ | | GOROOT_1_16_X64 | /opt/hostedtoolcache/go/1.16.15/x64 | x64 | -| GOROOT_1_17_X64 | /opt/hostedtoolcache/go/1.17.12/x64 | x64 | -| GOROOT_1_18_X64 | /opt/hostedtoolcache/go/1.18.4/x64 | x64 | +| GOROOT_1_17_X64 | /opt/hostedtoolcache/go/1.17.13/x64 | x64 | +| GOROOT_1_18_X64 | /opt/hostedtoolcache/go/1.18.5/x64 | x64 | +| GOROOT_1_19_X64 | /opt/hostedtoolcache/go/1.19.0/x64 | x64 | ### PowerShell Tools - PowerShell 7.2.5 @@ -257,7 +259,7 @@ | Module | Version | | ---------------- | ------- | | MarkdownPS | 1.9 | -| Microsoft.Graph | 1.10.0 | +| Microsoft.Graph | 1.11.0 | | Pester | 5.3.3 | | PSScriptAnalyzer | 1.20.0 | @@ -303,22 +305,22 @@ | alpine:3.12 | sha256:c75ac27b49326926b803b9ed43bf088bc220d22556de1bc5f72d742c91398f69 | 2022-04-05 | | alpine:3.13 | sha256:7769c38ce671534a0ddbf98633f17edbbd4a4e99cbc77ef42f9f7b78b6a1c6c2 | 2022-07-19 | | alpine:3.14 | sha256:43eb8f0d8215d8661f745f3d88563c026614d843b668b233bbe1666b6d026f61 | 2022-07-19 | -| buildpack-deps:bullseye | sha256:025c1b80248fb37b1f5250aba9e578e1dc24066912d94d3fa37c21bf8ee98b30 | 2022-07-12 | -| buildpack-deps:buster | sha256:0adb423c3161e19606330068d8d3d7710f1bb1b2233e6964ba329c79a96babb2 | 2022-07-12 | +| buildpack-deps:bullseye | sha256:d6974da710854c9c38d49666bd682abd99ef7aacdb92344d42a00f723e63cdb1 | 2022-08-02 | +| buildpack-deps:buster | sha256:9d806f4d80f19e3fd315bbe2ca1aa59a6c1ad18aff7b3d9696b407572608d61e | 2022-08-02 | | buildpack-deps:stretch | sha256:78e995165a5788c2f55aed6e548d8f6c1534830d4310c870408fccb2da8c5b2e | 2022-06-23 | -| debian:10 | sha256:0685c900f6e691bdda6980c0ed0779d20183bc58770059b64adb56cb8a3129f0 | 2022-07-12 | -| debian:11 | sha256:2ce44bbc00a79113c296d9d25524e15d423b23303fdbbe20190d2f96e0aeb251 | 2022-07-12 | +| debian:10 | sha256:fb9654aac57319592f1d51497c62001e7033eddf059355408a0b53f7c71f8d5f | 2022-08-02 | +| debian:11 | sha256:82bab30ed448b8e2509aabe21f40f0607d905b7fd0dec72802627a20274eba55 | 2022-08-02 | | debian:9 | sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be | 2022-06-23 | | moby/buildkit:latest | sha256:0dc312b04eac1b44cd2cad566deb1e886c753109208affbbec8384f381ff7f38 | 2022-05-06 | | node:12 | sha256:01627afeb110b3054ba4a1405541ca095c8bfca1cb6f2be9479c767a2711879e | 2022-04-20 | | node:12-alpine | sha256:d4b15b3d48f42059a15bd659be60afe21762aae9d6cbea6f124440895c27db68 | 2022-04-11 | -| node:14 | sha256:8ae0e9298b6098f6641e35d0488477381f86fce04993a3f8060a7657db8fb928 | 2022-07-12 | +| node:14 | sha256:7e1eabbcd7cbd0fdc296bc00fb2c80943ed0499c4ca3a148c83944708574dcf6 | 2022-08-02 | | node:14-alpine | sha256:e22ee6a906e823dc592d6022a3f520676575b50320fe2c3916c88acb16f471ce | 2022-07-18 | -| node:16 | sha256:4e85818bd0d023d4f9025730dc0640d3d8269e3d1a84ce6365eca8fbad7a3ee9 | 2022-07-12 | -| node:16-alpine | sha256:aadb411a5d398d2141f36a61f469ab91b971e43988d6c74aa5204986e5fe18a1 | 2022-07-18 | -| ubuntu:16.04 | sha256:20858ebbc96215d6c3c574f781133ebffdc7c18d98af4f294cc4c04871a6fe61 | 2021-08-31 | -| ubuntu:18.04 | sha256:478caf1bec1afd54a58435ec681c8755883b7eb843a8630091890130b15a79af | 2022-06-06 | -| ubuntu:20.04 | sha256:fd92c36d3cb9b1d027c4d2a72c6bf0125da82425fc2ca37c414d4f010180dc19 | 2022-06-06 | +| node:16 | sha256:1ed1e17ccabb09038cfb8a965337ebcda51ef9e9d32082164c502d44d9731a02 | 2022-08-02 | +| node:16-alpine | sha256:1908564153449b1c46b329e6ce2307e226bc566294f822f11c5a8bcef4eeaad7 | 2022-07-18 | +| ubuntu:16.04 | sha256:91bd29a464fdabfcf44e29e1f2a5f213c6dfa750b6290e40dd6998ac79da3c41 | 2021-08-31 | +| ubuntu:18.04 | sha256:eb1392bbdde63147bc2b4ff1a4053dcfe6d15e4dfd3cce29e9b9f52a4f88bc74 | 2022-08-02 | +| ubuntu:20.04 | sha256:af5efa9c28de78b754777af9b4d850112cad01899a5d37d2617bb94dc63a49aa | 2022-08-02 | ### Installed apt packages | Name | Version | From 03b7305ca100f08653d0d9f9ccc2844c75657f2c Mon Sep 17 00:00:00 2001 From: Vladimir Safonkin <vsafonkin@github.com> Date: Tue, 9 Aug 2022 22:11:16 +0200 Subject: [PATCH 1377/3485] Add Xcode 14 to macos-12 toolset (#6043) --- images/macos/toolsets/toolset-12.json | 1 + 1 file changed, 1 insertion(+) diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index 651e794cc0f6..6d02c956c938 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -2,6 +2,7 @@ "xcode": { "default": "13.4.1", "versions": [ + { "link": "14.0", "version": "14.0.0" }, { "link": "13.4.1", "version": "13.4.1" }, { "link": "13.4", "version": "13.4.0" }, { "link": "13.3.1", "version": "13.3.1", "symlinks": ["13.3"] }, From 4994130a965d5529b240818de583d48febefcfdf Mon Sep 17 00:00:00 2001 From: Casper da Costa-Luis <casper.dcl@physics.org> Date: Wed, 10 Aug 2022 13:55:34 +0100 Subject: [PATCH 1378/3485] virtual-environments => runner-images (#6033) * virtual-environments => runner-images - as per https://github.blog/changelog/2022-08-08-github-actions-runner-images-repository-refresh * revert readme changes - as per https://github.com/actions/runner-images/pull/6033#discussion_r941173809 --- .github/ISSUE_TEMPLATE/config.yml | 4 +-- CONTRIBUTING.md | 4 +-- README.md | 26 +++++++++---------- docs/create-image-and-azure-resources.md | 14 +++++----- helpers/GenerateResourcesAndImage.ps1 | 2 +- images.CI/macos/anka/Service.Helpers.psm1 | 2 +- images/linux/scripts/base/apt.sh | 2 +- images/linux/scripts/installers/android.sh | 2 +- .../installers/configure-environment.sh | 2 +- .../linux/scripts/installers/google-chrome.sh | 4 +-- images/linux/scripts/installers/nodejs.sh | 2 +- images/linux/scripts/installers/php.sh | 2 +- .../linux/scripts/installers/preimagedata.sh | 4 +-- .../provision/configuration/preimagedata.sh | 4 +-- .../macos/provision/core/android-toolsets.sh | 2 +- images/macos/provision/core/commonutils.sh | 2 +- images/macos/provision/core/gcc.sh | 2 +- images/macos/provision/core/python.sh | 2 +- images/macos/provision/core/xamarin.sh | 2 +- .../scripts/ImageHelpers/InstallHelpers.ps1 | 2 +- .../Installers/Configure-Antivirus.ps1 | 2 +- images/win/scripts/Installers/Finalize-VM.ps1 | 4 +-- .../scripts/Installers/Install-AndroidSDK.ps1 | 4 +-- .../scripts/Installers/Install-JavaTools.ps1 | 2 +- .../win/scripts/Installers/Install-Vsix.ps1 | 2 +- .../scripts/Installers/Update-ImageData.ps1 | 6 ++--- .../SoftwareReport/SoftwareReport.Java.psm1 | 2 +- 27 files changed, 54 insertions(+), 54 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index 63ccb7950c99..259e6201aa93 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -2,5 +2,5 @@ blank_issues_enabled: false contact_links: - name: Get help in GitHub Discussions - url: https://github.com/actions/virtual-environments/discussions - about: Have a question? Feel free to ask in the virtual-environments GitHub Discussions! + url: https://github.com/actions/runner-images/discussions + about: Have a question? Feel free to ask in the runner-images GitHub Discussions! diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 6e8f00214300..ccc992075754 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,7 +1,7 @@ ## Contributing -[fork]: https://github.com/actions/virtual-environments/fork -[pr]: https://github.com//actions/virtual-environments/compare +[fork]: https://github.com/actions/runner-images/fork +[pr]: https://github.com//actions/runner-images/compare [code-of-conduct]: CODE_OF_CONDUCT.md Hi there! We're thrilled that you'd like to contribute to this project. Your help is essential for keeping it great. diff --git a/README.md b/README.md index abb0053d48f7..7119aa9a4c98 100644 --- a/README.md +++ b/README.md @@ -34,14 +34,14 @@ To build a VM machine from this repo's source, see the [instructions](docs/creat - In general the `-latest` label is used for the latest OS image version that is GA - Before moving the`-latest` label to a new OS version we will announce the change and give sufficient lead time for users to update their workflows -[ubuntu-22.04]: https://github.com/actions/virtual-environments/blob/main/images/linux/Ubuntu2204-Readme.md -[ubuntu-20.04]: https://github.com/actions/virtual-environments/blob/main/images/linux/Ubuntu2004-Readme.md -[ubuntu-18.04]: https://github.com/actions/virtual-environments/blob/main/images/linux/Ubuntu1804-Readme.md -[windows-2022]: https://github.com/actions/virtual-environments/blob/main/images/win/Windows2022-Readme.md -[windows-2019]: https://github.com/actions/virtual-environments/blob/main/images/win/Windows2019-Readme.md -[macOS-11]: https://github.com/actions/virtual-environments/blob/main/images/macos/macos-11-Readme.md -[macOS-12]: https://github.com/actions/virtual-environments/blob/main/images/macos/macos-12-Readme.md -[macOS-10.15]: https://github.com/actions/virtual-environments/blob/main/images/macos/macos-10.15-Readme.md +[ubuntu-22.04]: https://github.com/actions/runner-images/blob/main/images/linux/Ubuntu2204-Readme.md +[ubuntu-20.04]: https://github.com/actions/runner-images/blob/main/images/linux/Ubuntu2004-Readme.md +[ubuntu-18.04]: https://github.com/actions/runner-images/blob/main/images/linux/Ubuntu1804-Readme.md +[windows-2022]: https://github.com/actions/runner-images/blob/main/images/win/Windows2022-Readme.md +[windows-2019]: https://github.com/actions/runner-images/blob/main/images/win/Windows2019-Readme.md +[macOS-11]: https://github.com/actions/runner-images/blob/main/images/macos/macos-11-Readme.md +[macOS-12]: https://github.com/actions/runner-images/blob/main/images/macos/macos-12-Readme.md +[macOS-10.15]: https://github.com/actions/runner-images/blob/main/images/macos/macos-10.15-Readme.md [self-hosted runners]: https://help.github.com/en/actions/hosting-your-own-runners ## Image Definitions @@ -69,14 +69,14 @@ latest 2 versions of an OS. *How to best follow along with changes* -1. Find the latest releases for this repository [here.](https://github.com/actions/virtual-environments/releases) +1. Find the latest releases for this repository [here.](https://github.com/actions/runner-images/releases) 2. Subscribe to the releases coming out of this repository, instructions [here.](https://docs.github.com/en/account-and-profile/managing-subscriptions-and-notifications-on-github/setting-up-notifications/configuring-notifications#configuring-your-watch-settings-for-an-individual-repository) 3. Upcoming changes: A pre-release is created when the deployment of an image has started. As soon as the deployment is finished, the pre-release is converted to a release. If you have subscribed to releases, you will get notified of pre-releases as well. - - You can also track upcoming changes using the [awaiting-deployment](https://github.com/actions/virtual-environments/labels/awaiting-deployment) label. + - You can also track upcoming changes using the [awaiting-deployment](https://github.com/actions/runner-images/labels/awaiting-deployment) label. 4. For high impact changes, we will post these in advance to the GitHub Changelog on our [blog](https://github.blog/changelog/) and on [twitter](https://twitter.com/GHchangelog). - Ex: breaking changes, GA or deprecation of images -5. You can also view notable upcoming changes by viewing the [Announcement](https://github.com/actions/virtual-environments/labels/Announcement) label. +5. You can also view notable upcoming changes by viewing the [Announcement](https://github.com/actions/runner-images/labels/Announcement) label. *Cadence* @@ -131,8 +131,8 @@ In general, these are the guidelines we follow when deciding what to pre-install ## How to Interact with the Repo -- **Issues**: To file a bug report, or request tools to be added/updated, please [open an issue using the appropriate template](https://github.com/actions/virtual-environments/issues/new/choose) -- **Discussions**: If you want to share your thoughts about image configuration, installed software, or bring a new idea, please create a new topic in a [discussion](https://github.com/actions/virtual-environments/discussions) for a corresponding category. Before making a new discussion please make sure no similar topics were created earlier. +- **Issues**: To file a bug report, or request tools to be added/updated, please [open an issue using the appropriate template](https://github.com/actions/runner-images/issues/new/choose) +- **Discussions**: If you want to share your thoughts about image configuration, installed software, or bring a new idea, please create a new topic in a [discussion](https://github.com/actions/runner-images/discussions) for a corresponding category. Before making a new discussion please make sure no similar topics were created earlier. - For general questions about using the runner images or writing your Actions workflow, please open requests in the [GitHub Actions Community Forum](https://github.community/c/github-actions/41). ## FAQs diff --git a/docs/create-image-and-azure-resources.md b/docs/create-image-and-azure-resources.md index b9a3446fe184..090b398083af 100644 --- a/docs/create-image-and-azure-resources.md +++ b/docs/create-image-and-azure-resources.md @@ -1,5 +1,5 @@ # Virtual-Environments -The virtual-environments project uses [Packer](https://www.packer.io/) to generate disk images for the following platforms: Windows 2019/2022, Ubuntu 18.04/20.04/22.04. +The runner-images project uses [Packer](https://www.packer.io/) to generate disk images for the following platforms: Windows 2019/2022, Ubuntu 18.04/20.04/22.04. Each image is configured through a JSON template that Packer understands and which specifies where to build the image (Azure in this case), and what scripts to run to install software and prepare the disk. The Packer process initializes a connection to Azure subscription via Azure CLI, and automatically creates the temporary Azure resources required to build the source VM(temporary resource group, network interfaces, and VM from the "clean" image specified in the template). If the VM deployment succeeds, the build agent connects to the VM and starts to execute installation steps from the JSON template. @@ -50,13 +50,13 @@ Invoke-WebRequest -Uri https://aka.ms/installazurecliwindows -OutFile .\AzureCLI Download Virtual-Environments repository. ``` Set-Location c:\ -git clone https://github.com/actions/virtual-environments.git +git clone https://github.com/actions/runner-images.git ``` Import [GenerateResourcesAndImage](../helpers/GenerateResourcesAndImage.ps1) script from `/helpers` folder, and run `GenerateResourcesAndImage` function via Powershell. ``` -Set-Location C:\virtual-environments +Set-Location C:\runner-images Import-Module .\helpers\GenerateResourcesAndImage.ps1 @@ -89,7 +89,7 @@ GenerateResourcesAndImage -SubscriptionId {YourSubscriptionId} -ResourceGroupNam After the successful image generation, Virtual Machine can be created from the generated VHD using [CreateAzureVMFromPackerTemplate](../helpers/CreateAzureVMFromPackerTemplate.ps1) script. ``` -Set-Location C:\virtual-environments +Set-Location C:\runner-images Import-Module .\helpers\CreateAzureVMFromPackerTemplate.ps1 @@ -151,8 +151,8 @@ Generated tool versions and details can be found in related projects: > :warning: These scripts are intended to run on a VM deployed in Azure The user, created during the image generation, does not exist in the result VHD hence some configuration files related to the user's home directory need to be changed as well as the file permissions for some directories. Scripts for that are located in the `post-generation` folder in the repository: -- Windows: https://github.com/actions/virtual-environments/tree/main/images/win/post-generation -- Linux: https://github.com/actions/virtual-environments/tree/main/images/linux/post-generation +- Windows: https://github.com/actions/runner-images/tree/main/images/win/post-generation +- Linux: https://github.com/actions/runner-images/tree/main/images/linux/post-generation **Note:** The default user for Linux should have `sudo privileges`. @@ -177,7 +177,7 @@ The scripts are copied to the VHD during the image generation process to the fol - **cleanup-logs.sh** - removes all build process logs from the machine - **environment-variables.sh** - replaces `$HOME` with the default user's home directory for environmental variables related to the default user home directory - **homebrew-permissions.sh** - Resets homebrew repository directory by running `git reset --hard` to make the working tree clean after chmoding /home and changes the repository directory owner to the current user -- **rust-permissions.sh** - fixes permissions for the Rust folder. Detailed issue explanation is provided in [virtual-environments/issues/572](https://github.com/actions/virtual-environments/issues/572). +- **rust-permissions.sh** - fixes permissions for the Rust folder. Detailed issue explanation is provided in [runner-images/issues/572](https://github.com/actions/runner-images/issues/572). ##### Windows diff --git a/helpers/GenerateResourcesAndImage.ps1 b/helpers/GenerateResourcesAndImage.ps1 index f964e7670621..822ff9d63235 100644 --- a/helpers/GenerateResourcesAndImage.ps1 +++ b/helpers/GenerateResourcesAndImage.ps1 @@ -87,7 +87,7 @@ Function GenerateResourcesAndImage { .PARAMETER OnError Specify how packer handles an error during image creation. .EXAMPLE - GenerateResourcesAndImage -SubscriptionId {YourSubscriptionId} -ResourceGroupName "shsamytest1" -ImageGenerationRepositoryRoot "C:\virtual-environments" -ImageType Ubuntu1804 -AzureLocation "East US" + GenerateResourcesAndImage -SubscriptionId {YourSubscriptionId} -ResourceGroupName "shsamytest1" -ImageGenerationRepositoryRoot "C:\runner-images" -ImageType Ubuntu1804 -AzureLocation "East US" #> param ( [Parameter(Mandatory = $True)] diff --git a/images.CI/macos/anka/Service.Helpers.psm1 b/images.CI/macos/anka/Service.Helpers.psm1 index 175f07f32f79..5d659d8dac4a 100644 --- a/images.CI/macos/anka/Service.Helpers.psm1 +++ b/images.CI/macos/anka/Service.Helpers.psm1 @@ -13,7 +13,7 @@ function Enable-AutoLogon { [string] $Password ) - $url = "https://raw.githubusercontent.com/actions/virtual-environments/main/images/macos/provision/bootstrap-provisioner/setAutoLogin.sh" + $url = "https://raw.githubusercontent.com/actions/runner-images/main/images/macos/provision/bootstrap-provisioner/setAutoLogin.sh" $script = Invoke-RestMethod -Uri $url $base64 = [Convert]::ToBase64String($script.ToCharArray()) $command = "echo $base64 | base64 --decode > ./setAutoLogin.sh;sudo bash ./setAutoLogin.sh '${UserName}' '${Password}';rm ./setAutoLogin.sh" diff --git a/images/linux/scripts/base/apt.sh b/images/linux/scripts/base/apt.sh index 1f36b4a5f34d..2ddac1af1acf 100644 --- a/images/linux/scripts/base/apt.sh +++ b/images/linux/scripts/base/apt.sh @@ -32,7 +32,7 @@ EOF apt-get purge unattended-upgrades # Need to limit arch for default apt repos due to -# https://github.com/actions/virtual-environments/issues/1961 +# https://github.com/actions/runner-images/issues/1961 sed -i'' -E 's/^deb http:\/\/(azure.archive|security).ubuntu.com/deb [arch=amd64,i386] http:\/\/\1.ubuntu.com/' /etc/apt/sources.list echo 'APT sources limited to the actual architectures' diff --git a/images/linux/scripts/installers/android.sh b/images/linux/scripts/installers/android.sh index 644ba4a160e4..aaf60c23f16e 100644 --- a/images/linux/scripts/installers/android.sh +++ b/images/linux/scripts/installers/android.sh @@ -97,7 +97,7 @@ ANDROID_NDK_MAJOR_LATEST=(${ANDROID_NDK_MAJOR_VERSIONS[-1]}) ndkDefaultFullVersion=$(get_full_ndk_version $ANDROID_NDK_MAJOR_DEFAULT) ndkLatestFullVersion=$(get_full_ndk_version $ANDROID_NDK_MAJOR_LATEST) ANDROID_NDK="$ANDROID_SDK_ROOT/ndk/$ndkDefaultFullVersion" -# ANDROID_NDK, ANDROID_NDK_HOME, and ANDROID_NDK_ROOT variables should be set as many customer builds depend on them https://github.com/actions/virtual-environments/issues/5879 +# ANDROID_NDK, ANDROID_NDK_HOME, and ANDROID_NDK_ROOT variables should be set as many customer builds depend on them https://github.com/actions/runner-images/issues/5879 echo "ANDROID_NDK=${ANDROID_NDK}" | tee -a /etc/environment echo "ANDROID_NDK_HOME=${ANDROID_NDK}" | tee -a /etc/environment echo "ANDROID_NDK_ROOT=${ANDROID_NDK}" | tee -a /etc/environment diff --git a/images/linux/scripts/installers/configure-environment.sh b/images/linux/scripts/installers/configure-environment.sh index 47bebc0e0d7b..05bf87ba10f6 100644 --- a/images/linux/scripts/installers/configure-environment.sh +++ b/images/linux/scripts/installers/configure-environment.sh @@ -10,7 +10,7 @@ echo ImageOS=$IMAGE_OS | tee -a /etc/environment # Set the ACCEPT_EULA variable to Y value to confirm your acceptance of the End-User Licensing Agreement echo ACCEPT_EULA=Y | tee -a /etc/environment -# This directory is supposed to be created in $HOME and owned by user(https://github.com/actions/virtual-environments/issues/491) +# This directory is supposed to be created in $HOME and owned by user(https://github.com/actions/runner-images/issues/491) mkdir -p /etc/skel/.config/configstore echo 'XDG_CONFIG_HOME=$HOME/.config' | tee -a /etc/environment diff --git a/images/linux/scripts/installers/google-chrome.sh b/images/linux/scripts/installers/google-chrome.sh index 29ad946e0fe2..889690cd4903 100644 --- a/images/linux/scripts/installers/google-chrome.sh +++ b/images/linux/scripts/installers/google-chrome.sh @@ -16,7 +16,7 @@ function GetChromiumRevision { # Some Google Chrome versions are based on Chromium revisions for which a (usually very old) Chromium release with the same number exist. So far this has heppened with 4 digits long Chromium revisions (1060, 1086). # Use the previous Chromium release when this happens to avoid downloading and installing very old Chromium releases that would break image build because of incompatibilities. - # First reported with: https://github.com/actions/virtual-environments/issues/5256 + # First reported with: https://github.com/actions/runner-images/issues/5256 if [ ${#REVISION} -eq 4 ]; then CURRENT_REVISIONS=$(curl -s "https://omahaproxy.appspot.com/all.json?os=linux&channel=stable") PREVIOUS_VERSION=$(echo "$CURRENT_REVISIONS" | jq -r '.[].versions[].previous_version') @@ -28,7 +28,7 @@ function GetChromiumRevision { FIRST_PART_OF_REVISION=${REVISION:0:${#REVISION}/2} FIRST_PART_OF_PREVIOUS_REVISION=$(expr $FIRST_PART_OF_REVISION - 1) URL="https://www.googleapis.com/storage/v1/b/chromium-browser-snapshots/o?delimiter=/&prefix=Linux_x64" - # Revision can include a hash instead of a number. Need to filter it out https://github.com/actions/virtual-environments/issues/5256 + # Revision can include a hash instead of a number. Need to filter it out https://github.com/actions/runner-images/issues/5256 VERSIONS=$((curl -s $URL/${FIRST_PART_OF_REVISION} | jq -r '.prefixes[]' && curl -s $URL/${FIRST_PART_OF_PREVIOUS_REVISION} | jq -r '.prefixes[]') | grep -E "Linux_x64\/[0-9]+\/"| cut -d "/" -f 2 | sort --version-sort) # If required Chromium revision is not found in the list diff --git a/images/linux/scripts/installers/nodejs.sh b/images/linux/scripts/installers/nodejs.sh index 8556a57ee678..97b82fed5a46 100644 --- a/images/linux/scripts/installers/nodejs.sh +++ b/images/linux/scripts/installers/nodejs.sh @@ -20,7 +20,7 @@ echo "Creating the symlink for [now] command to vercel CLI" ln -s /usr/local/bin/vercel /usr/local/bin/now # fix global modules installation as regular user -# related issue https://github.com/actions/virtual-environments/issues/3727 +# related issue https://github.com/actions/runner-images/issues/3727 sudo chmod -R 777 /usr/local/lib/node_modules sudo chmod -R 777 /usr/local/bin diff --git a/images/linux/scripts/installers/php.sh b/images/linux/scripts/installers/php.sh index 12101b40cee5..9347d462e148 100644 --- a/images/linux/scripts/installers/php.sh +++ b/images/linux/scripts/installers/php.sh @@ -102,7 +102,7 @@ chmod +x phpunit mv phpunit /usr/local/bin/phpunit # ubuntu 20.04 libzip-dev is libzip5 based and is not compatible libzip-dev of ppa:ondrej/php -# see https://github.com/actions/virtual-environments/issues/1084 +# see https://github.com/actions/runner-images/issues/1084 if isUbuntu20 || isUbuntu22; then rm /etc/apt/sources.list.d/ondrej-*.list apt-get update diff --git a/images/linux/scripts/installers/preimagedata.sh b/images/linux/scripts/installers/preimagedata.sh index ba52da6dfc3a..2d8d267512af 100644 --- a/images/linux/scripts/installers/preimagedata.sh +++ b/images/linux/scripts/installers/preimagedata.sh @@ -7,10 +7,10 @@ os_version=$(lsb_release -rs) image_label="ubuntu-${os_version}" version_major=${os_version/.*/} version_wo_dot=${os_version/./} -github_url="https://github.com/actions/virtual-environments/blob" +github_url="https://github.com/actions/runner-images/blob" software_url="${github_url}/ubuntu${version_major}/${image_version}/images/linux/Ubuntu${version_wo_dot}-Readme.md" -releaseUrl="https://github.com/actions/virtual-environments/releases/tag/ubuntu${version_major}%2F${image_version}" +releaseUrl="https://github.com/actions/runner-images/releases/tag/ubuntu${version_major}%2F${image_version}" cat <<EOF > $imagedata_file [ diff --git a/images/macos/provision/configuration/preimagedata.sh b/images/macos/provision/configuration/preimagedata.sh index 21d9654db0a4..0a739b9c42a4 100644 --- a/images/macos/provision/configuration/preimagedata.sh +++ b/images/macos/provision/configuration/preimagedata.sh @@ -15,8 +15,8 @@ else fi image_label="macos-${label_version}" release_label="macOS-${label_version}" -software_url="https://github.com/actions/virtual-environments/blob/${release_label}/${image_version}/images/macos/${image_label}-Readme.md" -releaseUrl="https://github.com/actions/virtual-environments/releases/tag/${release_label}%2F${image_version}" +software_url="https://github.com/actions/runner-images/blob/${release_label}/${image_version}/images/macos/${image_label}-Readme.md" +releaseUrl="https://github.com/actions/runner-images/releases/tag/${release_label}%2F${image_version}" cat <<EOF > $imagedata_file [ diff --git a/images/macos/provision/core/android-toolsets.sh b/images/macos/provision/core/android-toolsets.sh index 5a9429641262..f81827e16cad 100755 --- a/images/macos/provision/core/android-toolsets.sh +++ b/images/macos/provision/core/android-toolsets.sh @@ -86,7 +86,7 @@ ndkDefault=$(get_full_ndk_version $ANDROID_NDK_MAJOR_DEFAULT) ANDROID_NDK_HOME=$ANDROID_HOME/ndk/$ndkDefault ndkLatest=$(get_full_ndk_version $ANDROID_NDK_MAJOR_LATEST) ANDROID_NDK_LATEST_HOME=$ANDROID_HOME/ndk/$ndkLatest -# ANDROID_NDK, ANDROID_NDK_HOME, and ANDROID_NDK_ROOT variables should be set as many customer builds depend on them https://github.com/actions/virtual-environments/issues/5879 +# ANDROID_NDK, ANDROID_NDK_HOME, and ANDROID_NDK_ROOT variables should be set as many customer builds depend on them https://github.com/actions/runner-images/issues/5879 echo "export ANDROID_NDK=$ANDROID_NDK_HOME" >> "${HOME}/.bashrc" echo "export ANDROID_NDK_HOME=$ANDROID_NDK_HOME" >> "${HOME}/.bashrc" echo "export ANDROID_NDK_ROOT=$ANDROID_NDK_HOME" >> "${HOME}/.bashrc" diff --git a/images/macos/provision/core/commonutils.sh b/images/macos/provision/core/commonutils.sh index 3519e9c1a2ba..75639dcd3352 100644 --- a/images/macos/provision/core/commonutils.sh +++ b/images/macos/provision/core/commonutils.sh @@ -44,7 +44,7 @@ bazel # Install Azure DevOps extension for Azure Command Line Interface az extension add -n azure-devops -# Workaround https://github.com/actions/virtual-environments/issues/4931 +# Workaround https://github.com/actions/runner-images/issues/4931 # by making Tcl/Tk paths the same on macOS 10.15 and macOS 11 if is_BigSur; then version=$(brew info tcl-tk --json | jq -r '.[].installed[].version') diff --git a/images/macos/provision/core/gcc.sh b/images/macos/provision/core/gcc.sh index 6f96f2ae96ea..0fe468ffb94b 100644 --- a/images/macos/provision/core/gcc.sh +++ b/images/macos/provision/core/gcc.sh @@ -7,7 +7,7 @@ for gccVersion in $gccVersions; do brew_smart_install "gcc@${gccVersion}" done -# Delete default gfortran link if it exists https://github.com/actions/virtual-environments/issues/1280 +# Delete default gfortran link if it exists https://github.com/actions/runner-images/issues/1280 gfortranPath=$(which gfortran) if [ $gfortranPath ]; then rm $gfortranPath diff --git a/images/macos/provision/core/python.sh b/images/macos/provision/core/python.sh index 1cd2fd83d732..597362c01a5f 100755 --- a/images/macos/provision/core/python.sh +++ b/images/macos/provision/core/python.sh @@ -18,7 +18,7 @@ if is_Veertu; then fi # Explicitly overwrite symlinks created by Python2 such as /usr/local/bin/2to3 since they conflict with symlinks from Python3 -# https://github.com/actions/virtual-environments/issues/2322 +# https://github.com/actions/runner-images/issues/2322 echo "Brew Installing Python 3" brew_smart_install "python@3.9" || brew link --overwrite python@3.9 diff --git a/images/macos/provision/core/xamarin.sh b/images/macos/provision/core/xamarin.sh index f738313fec6b..a8e2692d9f31 100755 --- a/images/macos/provision/core/xamarin.sh +++ b/images/macos/provision/core/xamarin.sh @@ -82,7 +82,7 @@ PREFERENCES_XAMARIN_DIR="${HOME}/Library/Preferences/Xamarin" mkdir -p $PREFERENCES_XAMARIN_DIR /usr/libexec/PlistBuddy -c "add :AppleSdkRoot string /Applications/Xcode_${DEFAULT_XCODE_VERSION}.app" $PREFERENCES_XAMARIN_DIR/Settings.plist -# Temporary workaround to recreate nuget.config file with a correct feed https://github.com/actions/virtual-environments/issues/5768 +# Temporary workaround to recreate nuget.config file with a correct feed https://github.com/actions/runner-images/issues/5768 rm -rf $HOME/.config/NuGet/NuGet.Config nuget config diff --git a/images/win/scripts/ImageHelpers/InstallHelpers.ps1 b/images/win/scripts/ImageHelpers/InstallHelpers.ps1 index c163721516bc..0e5401c21d5f 100644 --- a/images/win/scripts/ImageHelpers/InstallHelpers.ps1 +++ b/images/win/scripts/ImageHelpers/InstallHelpers.ps1 @@ -239,7 +239,7 @@ function Get-VsixExtenstionFromMarketplace { $request -match 'Microsoft\.VisualStudio\.Services\.Payload\.FileName":"(?<filename>[^"]*)' | Out-Null $fileName = $Matches.filename $downloadUri = $assetUri + "/" + $fileName - # ProBITools.MicrosoftReportProjectsforVisualStudio2022 has different URL https://github.com/actions/virtual-environments/issues/5340 + # ProBITools.MicrosoftReportProjectsforVisualStudio2022 has different URL https://github.com/actions/runner-images/issues/5340 switch ($ExtensionMarketPlaceName) { "ProBITools.MicrosoftReportProjectsforVisualStudio2022" { $fileName = "Microsoft.DataTools.ReportingServices.vsix" diff --git a/images/win/scripts/Installers/Configure-Antivirus.ps1 b/images/win/scripts/Installers/Configure-Antivirus.ps1 index c5fc2012ba1c..6323fa1c75ed 100644 --- a/images/win/scripts/Installers/Configure-Antivirus.ps1 +++ b/images/win/scripts/Installers/Configure-Antivirus.ps1 @@ -32,7 +32,7 @@ $avPreference | Foreach-Object { Write-Host "Disable Windows Defender scheduled tasks" Get-ScheduledTask -TaskPath '\Microsoft\Windows\Windows Defender\' | Disable-ScheduledTask | Out-Null -# https://github.com/actions/virtual-environments/issues/4277 +# https://github.com/actions/runner-images/issues/4277 # https://docs.microsoft.com/en-us/microsoft-365/security/defender-endpoint/microsoft-defender-antivirus-compatibility?view=o365-worldwide $atpRegPath = 'HKLM:\SOFTWARE\Policies\Microsoft\Windows Advanced Threat Protection' if (Test-Path $atpRegPath) { diff --git a/images/win/scripts/Installers/Finalize-VM.ps1 b/images/win/scripts/Installers/Finalize-VM.ps1 index f759a0980eb1..19895c89fe4c 100644 --- a/images/win/scripts/Installers/Finalize-VM.ps1 +++ b/images/win/scripts/Installers/Finalize-VM.ps1 @@ -7,7 +7,7 @@ Write-Host "Cleanup WinSxS" Dism.exe /online /Cleanup-Image /StartComponentCleanup /ResetBase # Sets the default install version to v1 for new distributions -# https://github.com/actions/virtual-environments/issues/5760 +# https://github.com/actions/runner-images/issues/5760 if (Test-IsWin22) { Write-Host "Sets the default install version to v1 for new distributions" Add-DefaultItem -DefaultVariable "DefaultVersion" -Value 1 -Name "DEFAULT\Software\Microsoft\Windows\CurrentVersion\Lxss" -Kind "DWord" @@ -40,7 +40,7 @@ cmd /c "yarn cache clean 2>&1" | Out-Null cmd /c "npm cache clean --force 2>&1" | Out-Null # allow msi to write to temp folder -# see https://github.com/actions/virtual-environments/issues/1704 +# see https://github.com/actions/runner-images/issues/1704 cmd /c "icacls $env:SystemRoot\Temp /grant Users:f /t /c /q 2>&1" | Out-Null # Registry settings diff --git a/images/win/scripts/Installers/Install-AndroidSDK.ps1 b/images/win/scripts/Installers/Install-AndroidSDK.ps1 index 0656b436c0b9..baa20a3c830c 100644 --- a/images/win/scripts/Installers/Install-AndroidSDK.ps1 +++ b/images/win/scripts/Installers/Install-AndroidSDK.ps1 @@ -32,7 +32,7 @@ Invoke-SBWithRetry -Command { Rename-Item "${sdkInstallRoot}\cmdline-tools\cmdline-tools" "latest" -ErrorAction Stop } -# ANDROID_NDK_PATH/HOME should not contain spaces. Otherwise, the script ndk-build.cmd gives an error https://github.com/actions/virtual-environments/issues/1122 +# ANDROID_NDK_PATH/HOME should not contain spaces. Otherwise, the script ndk-build.cmd gives an error https://github.com/actions/runner-images/issues/1122 # create "C:\Android" directory and a hardlink inside pointed to sdk in Program Files New-Item -Path "C:\Android" -ItemType Directory New-Item -Path "$sdkRoot" -ItemType SymbolicLink -Value "$sdkInstallRoot" @@ -127,7 +127,7 @@ $ndkRoot = "$sdkRoot\ndk\$ndkDefaultVersion" # Create env variables setx ANDROID_HOME $sdkRoot /M setx ANDROID_SDK_ROOT $sdkRoot /M -# ANDROID_NDK, ANDROID_NDK_HOME, and ANDROID_NDK_ROOT variables should be set as many customer builds depend on them https://github.com/actions/virtual-environments/issues/5879 +# ANDROID_NDK, ANDROID_NDK_HOME, and ANDROID_NDK_ROOT variables should be set as many customer builds depend on them https://github.com/actions/runner-images/issues/5879 setx ANDROID_NDK $ndkRoot /M setx ANDROID_NDK_HOME $ndkRoot /M setx ANDROID_NDK_ROOT $ndkRoot /M diff --git a/images/win/scripts/Installers/Install-JavaTools.ps1 b/images/win/scripts/Installers/Install-JavaTools.ps1 index 5d531c4eabc9..50d16c523caf 100644 --- a/images/win/scripts/Installers/Install-JavaTools.ps1 +++ b/images/win/scripts/Installers/Install-JavaTools.ps1 @@ -74,7 +74,7 @@ function Install-JavaJDK { $downloadUrl = $asset.binary.package.link $archivePath = Start-DownloadWithRetry -Url $downloadUrl -Name $([IO.Path]::GetFileName($downloadUrl)) - # We have to replace '+' sign in the version to '-' due to the issue with incorrect path in Android builds https://github.com/actions/virtual-environments/issues/3014 + # We have to replace '+' sign in the version to '-' due to the issue with incorrect path in Android builds https://github.com/actions/runner-images/issues/3014 $fullJavaVersion = $asset.version.semver -replace '\+', '-' # Create directories in toolcache path $javaToolcachePath = Join-Path -Path $env:AGENT_TOOLSDIRECTORY -ChildPath "Java_${VendorName}_jdk" diff --git a/images/win/scripts/Installers/Install-Vsix.ps1 b/images/win/scripts/Installers/Install-Vsix.ps1 index 439fb291fdf2..5f3c2c59f40b 100644 --- a/images/win/scripts/Installers/Install-Vsix.ps1 +++ b/images/win/scripts/Installers/Install-Vsix.ps1 @@ -12,7 +12,7 @@ if (-not $vsixPackagesList) { $vsVersion = $toolset.visualStudio.Version $vsixPackagesList | ForEach-Object { - # Retrieve cdn endpoint to avoid HTTP error 429 https://github.com/actions/virtual-environments/issues/3074 + # Retrieve cdn endpoint to avoid HTTP error 429 https://github.com/actions/runner-images/issues/3074 $vsixPackage = Get-VsixExtenstionFromMarketplace -ExtensionMarketPlaceName $_ if ($vsixPackage.FileName.EndsWith(".vsix")) { Install-VsixExtension -Url $vsixPackage.DownloadUri -Name $vsixPackage.FileName -VSversion $vsVersion diff --git a/images/win/scripts/Installers/Update-ImageData.ps1 b/images/win/scripts/Installers/Update-ImageData.ps1 index c2dc6e965189..3aa489b82bbd 100644 --- a/images/win/scripts/Installers/Update-ImageData.ps1 +++ b/images/win/scripts/Installers/Update-ImageData.ps1 @@ -5,16 +5,16 @@ $osEdition = $caption.Substring($caption.LastIndexOf(" ")+1) $osVersion = $os.Version $imageVersion = $env:IMAGE_VERSION $imageDataFile = $env:IMAGEDATA_FILE -$githubUrl="https://github.com/actions/virtual-environments/blob" +$githubUrl="https://github.com/actions/runner-images/blob" if (Test-IsWin22) { $imageLabel = "windows-2022" $softwareUrl = "${githubUrl}/win22/${imageVersion}/images/win/Windows2022-Readme.md" - $releaseUrl="https://github.com/actions/virtual-environments/releases/tag/win22%2F${imageVersion}" + $releaseUrl="https://github.com/actions/runner-images/releases/tag/win22%2F${imageVersion}" } elseif (Test-IsWin19) { $imageLabel = "windows-2019" $softwareUrl = "${githubUrl}/win19/${imageVersion}/images/win/Windows2019-Readme.md" - $releaseUrl="https://github.com/actions/virtual-environments/releases/tag/win19%2F${imageVersion}" + $releaseUrl="https://github.com/actions/runner-images/releases/tag/win19%2F${imageVersion}" } else { throw "Invalid platform version is found. Either Windows Server 2019 or 2022 are required" } diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Java.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Java.psm1 index 5505097fa9d6..4fca13dc5ae7 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Java.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Java.psm1 @@ -9,7 +9,7 @@ function Get-JavaVersions { return $javaVersions | Sort-Object $sortRules | ForEach-Object { $javaPath = $_.Value # Take semver from the java path - # The path contains '-' sign in the version number instead of '+' due to the following issue, need to substitute it back https://github.com/actions/virtual-environments/issues/3014 + # The path contains '-' sign in the version number instead of '+' due to the following issue, need to substitute it back https://github.com/actions/runner-images/issues/3014 $versionInPath = (Split-Path $javaPath) -replace "\w:\\.*\\" $version = $versionInPath -replace '-', '+' $defaultPostfix = ($javaPath -eq $defaultJavaPath) ? " (default)" : "" From 9d12e06dbcec256e449c94f7cf48024ebf12f410 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 10 Aug 2022 13:49:37 +0000 Subject: [PATCH 1379/3485] Updating readme file for macOS-11 version 20220807.1 (#6040) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-11-Readme.md | 75 +++++++++++++++++---------------- 1 file changed, 38 insertions(+), 37 deletions(-) diff --git a/images/macos/macos-11-Readme.md b/images/macos/macos-11-Readme.md index 221d33e697a2..482975f0b892 100644 --- a/images/macos/macos-11-Readme.md +++ b/images/macos/macos-11-Readme.md @@ -1,14 +1,14 @@ | Announcements | |-| -| ['virtual-environments' repository name will be changed to 'runner-images' on August, 8th](https://github.com/actions/virtual-environments/issues/5967) | -| [[all OSs] Android NDK 21 will be replaced in favor of 25 on August, 1st](https://github.com/actions/virtual-environments/issues/5930) | -| [[all OSs] Android ndk-bundle along with old NDK versions will be deprecated on July, 24](https://github.com/actions/virtual-environments/issues/5879) | -| [The macOS 10.15 Actions runner image will begin deprecation on 5/31/22 and will be fully unsupported by 8/30/22 in GitHub and by 9/30/22 in ADO](https://github.com/actions/virtual-environments/issues/5583) | +| [[All OSs] Go version 1.16 will be removed on August, 15th](https://github.com/actions/runner-images/issues/6024) | +| ['virtual-environments' repository name will be changed to 'runner-images' on August, 8th](https://github.com/actions/runner-images/issues/5967) | +| [[all OSs] Android NDK 21 will be replaced in favor of 25 on August, 1st](https://github.com/actions/runner-images/issues/5930) | +| [The macOS 10.15 Actions runner image will begin deprecation on 5/31/22 and will be fully unsupported by 8/30/22 in GitHub and by 9/30/22 in ADO](https://github.com/actions/runner-images/issues/5583) | *** # macOS 11.6 info - System Version: macOS 11.6.8 (20G730) - Kernel Version: Darwin 20.6.0 -- Image Version: 20220801.1 +- Image Version: 20220807.1 ## Installed Software ### Language and Runtime @@ -18,11 +18,11 @@ - Clang/LLVM 14.0.6 is available on `'$(brew --prefix llvm@14)/bin/clang'` - gcc-9 (Homebrew GCC 9.5.0) 9.5.0 - available by `gcc-9` alias - gcc-10 (Homebrew GCC 10.4.0) 10.4.0 - available by `gcc-10` alias -- gcc-11 (Homebrew GCC 11.3.0_2) 11.3.0 - available by `gcc-11` alias +- gcc-11 (Homebrew GCC 11.3.0) 11.3.0 - available by `gcc-11` alias - GNU Fortran (Homebrew GCC 9.5.0) 9.5.0 - available by `gfortran-9` alias - GNU Fortran (Homebrew GCC 10.4.0) 10.4.0 - available by `gfortran-10` alias -- GNU Fortran (Homebrew GCC 11.3.0_2) 11.3.0 - available by `gfortran-11` alias -- Go 1.17.12 +- GNU Fortran (Homebrew GCC 11.3.0) 11.3.0 - available by `gfortran-11` alias +- Go 1.17.13 - julia 1.7.3 - Kotlin 1.7.10-release-333 - MSBuild 16.10.1.31401 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) @@ -30,7 +30,7 @@ - NVM 0.39.1 - NVM - Cached node versions: v12.22.12 v14.20.0 v16.16.0 - Perl 5.34.0 -- PHP 8.1.8 +- PHP 8.1.9 - Python 2.7.18 - Python 3.9.13 - R 4.2.1 @@ -41,15 +41,15 @@ - Carthage 0.38.0 - CocoaPods 1.11.3 - Composer 2.3.10 -- Homebrew 3.5.6 +- Homebrew 3.5.8 - Miniconda 4.12.0 - NPM 8.11.0 - NuGet 6.2.1.2 - Pip 20.3.4 (python 2.7) -- Pip 22.1.1 (python 3.9) +- Pip 22.2.1 (python 3.9) - Pipx 1.1.0 - RubyGems 3.3.19 -- Vcpkg 2022 (build from master \<66045de4d>) +- Vcpkg 2022 (build from master \<75260879e>) - Yarn 1.22.19 #### Environment variables @@ -61,7 +61,7 @@ ### Project Management - Apache Ant(TM) 1.10.12 - Apache Maven 3.8.6 -- Gradle 7.5 +- Gradle 7.5.1 - Sbt 1.7.1 ### Utilities @@ -80,38 +80,38 @@ - gpg (GnuPG) 2.3.7 - helm v3.9.2+g1addefb - Hub CLI: 2.14.2 -- ImageMagick 7.1.0-44 +- ImageMagick 7.1.0-45 - jq 1.6 -- mongo v5.0.7 -- mongod v5.0.7 +- mongo v5.0.10 +- mongod v5.0.10 - Newman 5.3.2 - OpenSSL 1.1.1q 5 Jul 2022 `(/usr/local/opt/openssl@1.1 -> ../Cellar/openssl@1.1/1.1.1q)` -- Packer 1.8.2 +- Packer 1.8.3 - PostgreSQL 14.4 - psql (PostgreSQL) 14.4 - Sox 14.4.2 - Subversion (SVN) 1.14.2 - Switchaudio-osx 1.1.0 -- yq (https://github.com/mikefarah/yq/) version 4.27.1 +- yq (https://github.com/mikefarah/yq/) version 4.27.2 - zstd 1.5.2 ### Tools - Aliyun CLI 3.0.123 - App Center CLI 2.10.10 -- AWS CLI 2.7.20 +- AWS CLI 2.7.21 - AWS SAM CLI 1.53.0 - AWS Session Manager CLI 1.2.339.0 - Azure CLI (azure-devops) 0.25.0 -- Azure CLI 2.38.0 -- Bicep CLI 0.8.9 +- Azure CLI 2.39.0 +- Bicep CLI 0.9.1 - Cabal 3.6.2.0 -- Cmake 3.23.3 +- Cmake 3.24.0 - Fastlane 2.208.0 - GHC 9.2.4 - GHCup 0.1.18.0 - Jazzy 0.14.2 - Stack 2.7.5 -- SwiftFormat 0.49.13 +- SwiftFormat 0.49.14 - Swig 4.0.2 - Xcode Command Line Tools 13.2.0.0.1.1638488800 @@ -122,20 +122,20 @@ ### Browsers - Safari 15.6 (16613.3.9.1.7) - SafariDriver 15.6 (16613.3.9.1.7) -- Google Chrome 103.0.5060.134 -- ChromeDriver 103.0.5060.134 -- Microsoft Edge 103.0.1264.77 -- Microsoft Edge WebDriver 103.0.1264.77 -- Mozilla Firefox 103.0 +- Google Chrome 104.0.5112.79 +- ChromeDriver 104.0.5112.79 +- Microsoft Edge 104.0.1293.47 +- Microsoft Edge WebDriver 104.0.1293.47 +- Mozilla Firefox 103.0.1 - geckodriver 0.31.0 - Selenium server 4.3.0 #### Environment variables -| Name | Value | -| --------------- | ----------------------------------------------- | -| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/103.0.5060.134 | -| EDGEWEBDRIVER | /usr/local/share/edge_driver | -| GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | +| Name | Value | +| --------------- | ---------------------------------------------- | +| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/104.0.5112.79 | +| EDGEWEBDRIVER | /usr/local/share/edge_driver | +| GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | ### Java | Version | Vendor | Environment Variable | @@ -162,7 +162,7 @@ - 3.7.13 - 3.8.13 - 3.9.13 -- 3.10.5 +- 3.10.6 #### PyPy - 2.7.18 [PyPy 7.3.9] @@ -179,8 +179,9 @@ | Version | Architecture | Environment Variable | | ------- | ------------ | -------------------- | | 1.16.15 | x64 | GOROOT_1_16_X64 | -| 1.17.12 (Default) | x64 | GOROOT_1_17_X64 | -| 1.18.4 | x64 | GOROOT_1_18_X64 | +| 1.17.13 (Default) | x64 | GOROOT_1_17_X64 | +| 1.18.5 | x64 | GOROOT_1_18_X64 | +| 1.19.0 | x64 | GOROOT_1_19_X64 | ### Rust Tools - Cargo 1.62.1 @@ -202,7 +203,7 @@ #### PowerShell Modules | Module | Version | | ---------------- | ------- | -| Az | 8.1.0 | +| Az | 8.2.0 | | MarkdownPS | 1.9 | | Pester | 5.3.3 | | PSScriptAnalyzer | 1.20.0 | From e19725fcbec1f33387e1e795970ed961eddc9801 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Wed, 10 Aug 2022 15:51:15 +0200 Subject: [PATCH 1380/3485] Replace virtual-environments to runner images (#6050) --- docs/create-image-and-azure-resources.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/create-image-and-azure-resources.md b/docs/create-image-and-azure-resources.md index 090b398083af..8b56129de27a 100644 --- a/docs/create-image-and-azure-resources.md +++ b/docs/create-image-and-azure-resources.md @@ -1,4 +1,4 @@ -# Virtual-Environments +# GitHub Actions Runner Images The runner-images project uses [Packer](https://www.packer.io/) to generate disk images for the following platforms: Windows 2019/2022, Ubuntu 18.04/20.04/22.04. Each image is configured through a JSON template that Packer understands and which specifies where to build the image (Azure in this case), and what scripts to run to install software and prepare the disk. The Packer process initializes a connection to Azure subscription via Azure CLI, and automatically creates the temporary Azure resources required to build the source VM(temporary resource group, network interfaces, and VM from the "clean" image specified in the template). @@ -47,7 +47,7 @@ Install Azure CLI - https://docs.microsoft.com/en-us/cli/azure/install-azure-cli Invoke-WebRequest -Uri https://aka.ms/installazurecliwindows -OutFile .\AzureCLI.msi; Start-Process msiexec.exe -Wait -ArgumentList '/I AzureCLI.msi /quiet'; rm .\AzureCLI.msi ``` -Download Virtual-Environments repository. +Download Runner Images repository. ``` Set-Location c:\ git clone https://github.com/actions/runner-images.git From 93791cc2a2dbdc61cabff54a0a4b5ed62e05f1f6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 10 Aug 2022 14:47:04 +0000 Subject: [PATCH 1381/3485] Updating readme file for macOS-12 version 20220809.1 (#6044) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-12-Readme.md | 91 ++++++++++++++++++--------------- 1 file changed, 51 insertions(+), 40 deletions(-) diff --git a/images/macos/macos-12-Readme.md b/images/macos/macos-12-Readme.md index 035bcea94e45..b7c1253747d5 100644 --- a/images/macos/macos-12-Readme.md +++ b/images/macos/macos-12-Readme.md @@ -1,14 +1,14 @@ | Announcements | |-| -| ['virtual-environments' repository name will be changed to 'runner-images' on August, 8th](https://github.com/actions/virtual-environments/issues/5967) | -| [[all OSs] Android NDK 21 will be replaced in favor of 25 on August, 1st](https://github.com/actions/virtual-environments/issues/5930) | -| [[all OSs] Android ndk-bundle along with old NDK versions will be deprecated on July, 24](https://github.com/actions/virtual-environments/issues/5879) | -| [The macOS 10.15 Actions runner image will begin deprecation on 5/31/22 and will be fully unsupported by 8/30/22 in GitHub and by 9/30/22 in ADO](https://github.com/actions/virtual-environments/issues/5583) | +| [[All OSs] Go version 1.16 will be removed on August, 15th](https://github.com/actions/runner-images/issues/6024) | +| ['virtual-environments' repository name will be changed to 'runner-images' on August, 8th](https://github.com/actions/runner-images/issues/5967) | +| [[all OSs] Android NDK 21 will be replaced in favor of 25 on August, 1st](https://github.com/actions/runner-images/issues/5930) | +| [The macOS 10.15 Actions runner image will begin deprecation on 5/31/22 and will be fully unsupported by 8/30/22 in GitHub and by 9/30/22 in ADO](https://github.com/actions/runner-images/issues/5583) | *** # macOS 12.5 info - System Version: macOS 12.5 (21G72) - Kernel Version: Darwin 21.6.0 -- Image Version: 20220801.1 +- Image Version: 20220809.1 ## Installed Software ### Language and Runtime @@ -16,9 +16,9 @@ - Bash 3.2.57(1)-release - Clang/LLVM 13.1.6 is default - Clang/LLVM 14.0.6 is available on `'$(brew --prefix llvm@14)/bin/clang'` -- gcc-11 (Homebrew GCC 11.3.0_2) 11.3.0 - available by `gcc-11` alias -- GNU Fortran (Homebrew GCC 11.3.0_2) 11.3.0 - available by `gfortran-11` alias -- Go 1.17.12 +- gcc-11 (Homebrew GCC 11.3.0) 11.3.0 - available by `gcc-11` alias +- GNU Fortran (Homebrew GCC 11.3.0) 11.3.0 - available by `gfortran-11` alias +- Go 1.17.13 - julia 1.7.3 - Kotlin 1.7.10-release-333 - MSBuild 16.10.1.31401 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) @@ -26,7 +26,7 @@ - NVM 0.39.1 - NVM - Cached node versions: v12.22.12 v14.20.0 v16.16.0 - Perl 5.34.0 -- PHP 8.1.8 +- PHP 8.1.9 - Python 2.7.18 - Python 3.9.13 - R 4.2.1 @@ -37,15 +37,15 @@ - Carthage 0.38.0 - CocoaPods 1.11.3 - Composer 2.3.10 -- Homebrew 3.5.6 +- Homebrew 3.5.8 - Miniconda 4.12.0 - NPM 8.11.0 - NuGet 6.2.1.2 - Pip 20.3.4 (python 2.7) -- Pip 22.1.1 (python 3.9) +- Pip 22.2.1 (python 3.9) - Pipx 1.1.0 - RubyGems 3.3.19 -- Vcpkg 2022 (build from master \<66045de4d>) +- Vcpkg 2022 (build from master \<a0454d6e1>) - Yarn 1.22.19 #### Environment variables @@ -57,7 +57,7 @@ ### Project Management - Apache Ant(TM) 1.10.12 - Apache Maven 3.8.6 -- Gradle 7.5 +- Gradle 7.5.1 - Sbt 1.7.1 ### Utilities @@ -75,12 +75,12 @@ - GNU Wget 1.21.3 - gpg (GnuPG) 2.3.7 - Hub CLI: 2.14.2 -- ImageMagick 7.1.0-44 +- ImageMagick 7.1.0-45 - jq 1.6 -- mongo v5.0.7 -- mongod v5.0.7 +- mongo v5.0.10 +- mongod v5.0.10 - OpenSSL 1.1.1q 5 Jul 2022 `(/usr/local/opt/openssl@1.1 -> ../Cellar/openssl@1.1/1.1.1q)` -- Packer 1.8.2 +- Packer 1.8.3 - PostgreSQL 14.4 - psql (PostgreSQL) 14.4 - Sox 14.4.2 @@ -88,25 +88,25 @@ - Switchaudio-osx 1.1.0 - Vagrant 2.2.19 - VirtualBox 6.1.36r152435 -- yq (https://github.com/mikefarah/yq/) version 4.27.1 +- yq (https://github.com/mikefarah/yq/) version 4.27.2 - zstd 1.5.2 ### Tools -- App Center CLI 2.10.10 -- AWS CLI 2.7.20 +- App Center CLI 2.11.0 +- AWS CLI 2.7.21 - AWS SAM CLI 1.53.0 - AWS Session Manager CLI 1.2.339.0 - Azure CLI (azure-devops) 0.25.0 -- Azure CLI 2.38.0 -- Bicep CLI 0.8.9 +- Azure CLI 2.39.0 +- Bicep CLI 0.9.1 - Cabal 3.6.2.0 -- Cmake 3.23.3 +- Cmake 3.24.0 - Fastlane 2.208.0 -- GHC 9.2.4 +- GHC 9.4.1 - GHCup 0.1.18.0 - Jazzy 0.14.2 - Stack 2.7.5 -- SwiftFormat 0.49.13 +- SwiftFormat 0.49.14 - Swig 4.0.2 - Xcode Command Line Tools 13.4.0.0.1.1651278267 @@ -117,25 +117,25 @@ ### Browsers - Safari 15.6 (17613.3.9.1.5) - SafariDriver 15.6 (17613.3.9.1.5) -- Google Chrome 103.0.5060.134 -- ChromeDriver 103.0.5060.134 -- Microsoft Edge 103.0.1264.77 -- Microsoft Edge WebDriver 103.0.1264.77 -- Mozilla Firefox 103.0 +- Google Chrome 104.0.5112.79 +- ChromeDriver 104.0.5112.79 +- Microsoft Edge 104.0.1293.47 +- Microsoft Edge WebDriver 104.0.1293.47 +- Mozilla Firefox 103.0.1 - geckodriver 0.31.0 - Selenium server 4.3.0 #### Environment variables -| Name | Value | -| --------------- | ----------------------------------------------- | -| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/103.0.5060.134 | -| EDGEWEBDRIVER | /usr/local/share/edge_driver | -| GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | +| Name | Value | +| --------------- | ---------------------------------------------- | +| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/104.0.5112.79 | +| EDGEWEBDRIVER | /usr/local/share/edge_driver | +| GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | ### Java | Version | Vendor | Environment Variable | | ------------------- | --------------- | -------------------- | -| 8.0.332+9 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | +| 8.0.345+1 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | | 11.0.16+8 | Eclipse Temurin | JAVA_HOME_11_X64 | | 17.0.4+8 | Eclipse Temurin | JAVA_HOME_17_X64 | @@ -154,7 +154,7 @@ - 3.7.13 - 3.8.13 - 3.9.13 -- 3.10.5 +- 3.10.6 #### PyPy - 2.7.18 [PyPy 7.3.9] @@ -171,8 +171,9 @@ | Version | Architecture | Environment Variable | | ------- | ------------ | -------------------- | | 1.16.15 | x64 | GOROOT_1_16_X64 | -| 1.17.12 (Default) | x64 | GOROOT_1_17_X64 | -| 1.18.4 | x64 | GOROOT_1_18_X64 | +| 1.17.13 (Default) | x64 | GOROOT_1_17_X64 | +| 1.18.5 | x64 | GOROOT_1_18_X64 | +| 1.19.0 | x64 | GOROOT_1_19_X64 | ### Rust Tools - Cargo 1.62.1 @@ -194,7 +195,7 @@ #### PowerShell Modules | Module | Version | | ---------------- | ------- | -| Az | 8.1.0 | +| Az | 8.2.0 | | MarkdownPS | 1.9 | | Pester | 5.3.3 | | PSScriptAnalyzer | 1.20.0 | @@ -237,6 +238,7 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" ### Xcode | Version | Build | Path | | ---------------- | -------- | ------------------------------ | +| 14.0 (beta) | 14A5294e | /Applications/Xcode_14.0.app | | 13.4.1 (default) | 13F100 | /Applications/Xcode_13.4.1.app | | 13.4 | 13F17a | /Applications/Xcode_13.4.app | | 13.3.1 | 13E500a | /Applications/Xcode_13.3.1.app | @@ -253,29 +255,37 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" | macOS 12.0 | macosx12.0 | 13.1 | | macOS 12.1 | macosx12.1 | 13.2.1 | | macOS 12.3 | macosx12.3 | 13.3.1, 13.4, 13.4.1 | +| macOS 13.0 | macosx13.0 | 14.0 | | iOS 15.0 | iphoneos15.0 | 13.1 | | iOS 15.2 | iphoneos15.2 | 13.2.1 | | iOS 15.4 | iphoneos15.4 | 13.3.1 | | iOS 15.5 | iphoneos15.5 | 13.4, 13.4.1 | +| iOS 16.0 | iphoneos16.0 | 14.0 | | Simulator - iOS 15.0 | iphonesimulator15.0 | 13.1 | | Simulator - iOS 15.2 | iphonesimulator15.2 | 13.2.1 | | Simulator - iOS 15.4 | iphonesimulator15.4 | 13.3.1 | | Simulator - iOS 15.5 | iphonesimulator15.5 | 13.4, 13.4.1 | +| Simulator - iOS 16.0 | iphonesimulator16.0 | 14.0 | | tvOS 15.0 | appletvos15.0 | 13.1 | | tvOS 15.2 | appletvos15.2 | 13.2.1 | | tvOS 15.4 | appletvos15.4 | 13.3.1, 13.4, 13.4.1 | +| tvOS 16.0 | appletvos16.0 | 14.0 | | Simulator - tvOS 15.0 | appletvsimulator15.0 | 13.1 | | Simulator - tvOS 15.2 | appletvsimulator15.2 | 13.2.1 | | Simulator - tvOS 15.4 | appletvsimulator15.4 | 13.3.1, 13.4, 13.4.1 | +| Simulator - tvOS 16.0 | appletvsimulator16.0 | 14.0 | | watchOS 8.0 | watchos8.0 | 13.1 | | watchOS 8.3 | watchos8.3 | 13.2.1 | | watchOS 8.5 | watchos8.5 | 13.3.1, 13.4, 13.4.1 | +| watchOS 9.0 | watchos9.0 | 14.0 | | Simulator - watchOS 8.0 | watchsimulator8.0 | 13.1 | | Simulator - watchOS 8.3 | watchsimulator8.3 | 13.2.1 | | Simulator - watchOS 8.5 | watchsimulator8.5 | 13.3.1, 13.4, 13.4.1 | +| Simulator - watchOS 9.0 | watchsimulator9.0 | 14.0 | | DriverKit 21.0.1 | driverkit21.0.1 | 13.1 | | DriverKit 21.2 | driverkit21.2 | 13.2.1 | | DriverKit 21.4 | driverkit21.4 | 13.3.1, 13.4, 13.4.1 | +| DriverKit 22.0 | driverkit22.0 | 14.0 | #### Installed Simulators | OS | Xcode Version | Simulators | @@ -284,6 +294,7 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" | iOS 15.2 | 13.2.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | | iOS 15.4 | 13.3.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPhone SE (3rd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | | iOS 15.5 | 13.4<br>13.4.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPhone SE (3rd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | +| iOS 16.0 | 14.0 | iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPhone SE (3rd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | | tvOS 15.0 | 13.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | | tvOS 15.2 | 13.2.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | | tvOS 15.4 | 13.3.1<br>13.4<br>13.4.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | From 40e93383ae0d51fdc2b95e29d7ab7656b3f024d2 Mon Sep 17 00:00:00 2001 From: Jacob Gillespie <jacobwgillespie@gmail.com> Date: Wed, 10 Aug 2022 15:57:04 +0100 Subject: [PATCH 1382/3485] Fix README typos (#6035) --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 7119aa9a4c98..c4e0c6a3cf50 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ ## About -This repository contains the source code used to create the VM images for [GitHub-hosted runners](https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners)used for Actions, as well as for [Microsoft-hosted agents](https://docs.microsoft.com/en-us/azure/devops/pipelines/agents/hosted?view=azure-devops#use-a-microsoft-hosted-agent) used for Azure Pipelines. +This repository contains the source code used to create the VM images for [GitHub-hosted runners](https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners) used for Actions, as well as for [Microsoft-hosted agents](https://docs.microsoft.com/en-us/azure/devops/pipelines/agents/hosted?view=azure-devops#use-a-microsoft-hosted-agent) used for Azure Pipelines. To build a VM machine from this repo's source, see the [instructions](docs/create-image-and-azure-resources.md). ## Available Images @@ -140,7 +140,7 @@ In general, these are the guidelines we follow when deciding what to pre-install <details> <summary><b><i>What images are available for GitHub Actions and Azure DevOps?</b></i></summary> -The availability of images for GitHub Actions and Azure DevOps is the same. However, deprecation polciies may differ. See documentation for more details: +The availability of images for GitHub Actions and Azure DevOps is the same. However, deprecation policies may differ. See documentation for more details: - [GitHub Actions](https://docs.github.com/en/free-pro-team@latest/actions/reference/specifications-for-github-hosted-runners#supported-runners-and-hardware-resources) - [Azure DevOps](https://docs.microsoft.com/en-us/azure/devops/pipelines/agents/hosted?view=azure-devops&tabs=yaml#software) </details> From bf8d2862f8b9608a0eadc27070fe578eaabf513e Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Wed, 10 Aug 2022 18:51:59 +0200 Subject: [PATCH 1383/3485] [Windows] remove go-1.16.x (#6046) --- images/win/toolsets/toolset-2019.json | 1 - images/win/toolsets/toolset-2022.json | 1 - 2 files changed, 2 deletions(-) diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index 0fc1fce310a2..0d65828e2561 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -72,7 +72,6 @@ "arch": "x64", "platform" : "win32", "versions": [ - "1.16.*", "1.17.*", "1.18.*", "1.19.*" diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index 49b0f02d6bb7..25c95dee43bc 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -64,7 +64,6 @@ "arch": "x64", "platform" : "win32", "versions": [ - "1.16.*", "1.17.*", "1.18.*", "1.19.*" From 662c5c52484c0dd406cc3fdf7e245d0af1831ae7 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Wed, 10 Aug 2022 18:53:00 +0200 Subject: [PATCH 1384/3485] [Ubuntu] remove go-1.16.x (#6047) --- images/linux/toolsets/toolset-2004.json | 1 - 1 file changed, 1 deletion(-) diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index 78a2fdd3e245..df9434cda742 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -44,7 +44,6 @@ "arch": "x64", "platform" : "linux", "versions": [ - "1.16.*", "1.17.*", "1.18.*", "1.19.*" From 8d5e233acf5951260d15b455cf5f64957f55ab58 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Wed, 10 Aug 2022 18:53:47 +0200 Subject: [PATCH 1385/3485] [macOS] remove go-1.16.x (#6048) --- images/macos/toolsets/toolset-11.json | 1 - images/macos/toolsets/toolset-12.json | 1 - 2 files changed, 2 deletions(-) diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index cf777afbfffc..51e7f8d616e4 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -280,7 +280,6 @@ "platform" : "darwin", "variable_template" : "GOROOT_{0}_{1}_X64", "versions": [ - "1.16.*", "1.17.*", "1.18.*", "1.19.*" diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index 6d02c956c938..266ffde662b7 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -214,7 +214,6 @@ "platform" : "darwin", "variable_template" : "GOROOT_{0}_{1}_X64", "versions": [ - "1.16.*", "1.17.*", "1.18.*", "1.19.*" From 35be8465eaed8adbf89c2bfd3c3430734ae02fc5 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Wed, 10 Aug 2022 19:42:33 +0200 Subject: [PATCH 1386/3485] [macOS] Software Updates 2022 Week 33 (#6045) * [macOS] Software Updates 2022 Week 33 * Set default bundle to 6_12_19 --- images/macos/toolsets/toolset-12.json | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index 266ffde662b7..96a5e6988d4b 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -19,16 +19,30 @@ "6.12.0.182" ], "ios-versions": [ - "15.10.0.5", "15.8.0.3", "15.6.0.3", "15.4.0.0", "15.2.0.17", "15.0.0.6" + "15.12.0.2", "15.10.0.5", "15.8.0.3", "15.6.0.3", "15.4.0.0", "15.2.0.17", "15.0.0.6" ], "mac-versions": [ - "8.10.0.5", "8.8.0.3", "8.6.0.3", "8.4.0.0", "8.2.0.17", "7.14.0.27" + "8.12.0.2", "8.10.0.5", "8.8.0.3", "8.6.0.3", "8.4.0.0", "8.2.0.17", "7.14.0.27" ], "android-versions": [ - "12.2.8.3", "12.1.0.2", "12.0.0.3", "11.3.0.4" + "13.0.0.0", "12.3.3.3", "12.2.8.3", "12.1.0.2", "12.0.0.3", "11.3.0.4" ], - "bundle-default": "6_12_17", + "bundle-default": "6_12_19", "bundles": [ + { + "symlink": "6_12_19", + "mono":"6.12", + "ios": "15.12", + "mac": "8.12", + "android": "13.0" + }, + { + "symlink": "6_12_18", + "mono":"6.12", + "ios": "15.10", + "mac": "8.10", + "android": "12.3" + }, { "symlink": "6_12_17", "mono":"6.12", From 2fd91c95fcfb4641380776c1e5a7795edb1da015 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Thu, 11 Aug 2022 10:09:05 +0200 Subject: [PATCH 1387/3485] [Packer] Disable colored output on Ubuntu (#6057) --- images.CI/linux-and-win/build-image.ps1 | 1 + 1 file changed, 1 insertion(+) diff --git a/images.CI/linux-and-win/build-image.ps1 b/images.CI/linux-and-win/build-image.ps1 index 67a14db5a920..8c0086597dc3 100644 --- a/images.CI/linux-and-win/build-image.ps1 +++ b/images.CI/linux-and-win/build-image.ps1 @@ -53,6 +53,7 @@ packer build -var "capture_name_prefix=$ResourcesNamePrefix" ` -var "virtual_network_resource_group_name=$VirtualNetworkRG" ` -var "virtual_network_subnet_name=$VirtualNetworkSubnet" ` -var "run_validation_diskspace=$env:RUN_VALIDATION_FLAG" ` + -color=false ` $TemplatePath ` | Where-Object { #Filter sensitive data from Packer logs From 52221a939c80a1ef8d0687867e9acfd747d149f9 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 11 Aug 2022 14:04:11 +0000 Subject: [PATCH 1388/3485] Updating readme file for win22 version 20220808.1 (#6037) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2022-Readme.md | 72 ++++++++++++++++---------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/images/win/Windows2022-Readme.md b/images/win/Windows2022-Readme.md index f4e9e779cb2a..da641b03488a 100644 --- a/images/win/Windows2022-Readme.md +++ b/images/win/Windows2022-Readme.md @@ -1,14 +1,13 @@ | Announcements | |-| -| ['virtual-environments' repository name will be changed to 'runner-images' on August, 8th](https://github.com/actions/virtual-environments/issues/5967) | -| [[Windows] mongo service will be disabled by default on August, 8th](https://github.com/actions/virtual-environments/issues/5949) | -| [[all OSs] Android NDK 21 will be replaced in favor of 25 on August, 1st](https://github.com/actions/virtual-environments/issues/5930) | -| [[all OSs] Android ndk-bundle along with old NDK versions will be deprecated on July, 24](https://github.com/actions/virtual-environments/issues/5879) | -| [[Azure DevOps] Windows-2016 environment removal postponed until July 31, 2022](https://github.com/actions/virtual-environments/issues/5403) | +| [[All OSs] Go version 1.16 will be removed on August, 15th](https://github.com/actions/runner-images/issues/6024) | +| ['virtual-environments' repository name will be changed to 'runner-images' on August, 8th](https://github.com/actions/runner-images/issues/5967) | +| [[Windows] mongo service will be disabled by default on August, 8th](https://github.com/actions/runner-images/issues/5949) | +| [[all OSs] Android NDK 21 will be replaced in favor of 25 on August, 1st](https://github.com/actions/runner-images/issues/5930) | *** # Microsoft Windows Server 2022 Datacenter - OS Version: 10.0.20348 Build 825 -- Image Version: 20220731.1 +- Image Version: 20220808.1 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -16,13 +15,13 @@ ## Installed Software ### Language and Runtime - Bash 4.4.23(1)-release -- Go 1.17.12 +- Go 1.17.13 - Julia 1.7.3 - Kotlin 1.7.10 - LLVM 14.0.6 - Node 16.16.0 - Perl 5.32.1 -- PHP 8.1.8 +- PHP 8.1.9 - Python 3.9.13 - Ruby 3.0.4p208 @@ -33,10 +32,10 @@ - Miniconda 4.12.0 (pre-installed on the image but not added to PATH) - NPM 8.11.0 - NuGet 6.2.1.2 -- pip 22.2.1 (python 3.9) +- pip 22.2.2 (python 3.9) - Pipx 1.1.0 - RubyGems 3.2.33 -- Vcpkg (build from master \<66045de4d>) +- Vcpkg (build from master \<a0454d6e1>) - Yarn 1.22.19 #### Environment variables @@ -56,28 +55,28 @@ - azcopy 10.16.0 - Bazel 5.2.0 - Bazelisk 1.12.0 -- Bicep 0.8.9 +- Bicep 0.9.1 - Cabal 3.6.2.0 -- CMake 3.23.3 -- CodeQL Action Bundle 2.10.1 +- CMake 3.24.0 +- CodeQL Action Bundle 2.10.2 - Docker 20.10.7 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.8.0 +- Docker Compose v2 2.9.0 - Docker-wincred 0.6.4 -- ghc 9.2.3 +- ghc 9.2.4 - Git 2.37.1.windows.1 - Git LFS 3.2.0 - InnoSetup 6.2.1 - jq 1.6 - Kind 0.14.0 -- Kubectl 1.24.1 +- Kubectl 1.24.3 - Mercurial 5.0 - Mingw-w64 11.2.0 - Newman 5.3.2 - NSIS v3.08 - OpenSSL 1.1.1 - Packer 1.8.2 -- Pulumi v3.37.1 +- Pulumi v3.37.2 - R 4.2.1 - Service Fabric SDK 9.0.1028.9590 - Stack 2.7.5 @@ -91,10 +90,10 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.124 -- AWS CLI 2.7.20 +- AWS CLI 2.7.21 - AWS SAM CLI 1.53.0 - AWS Session Manager CLI 1.2.339.0 -- Azure CLI 2.38.0 +- Azure CLI 2.39.0 - Azure DevOps CLI extension 0.25.0 - GitHub CLI 2.14.3 - Hub CLI 2.14.2 @@ -114,11 +113,11 @@ - Rustfmt 1.4.38 ### Browsers and webdrivers -- Google Chrome 103.0.5060.134 -- Chrome Driver 103.0.5060.134 -- Microsoft Edge 103.0.1264.77 -- Microsoft Edge Driver 103.0.1264.77 -- Mozilla Firefox 103.0 +- Google Chrome 104.0.5112.81 +- Chrome Driver 104.0.5112.79 +- Microsoft Edge 104.0.1293.47 +- Microsoft Edge Driver 104.0.1293.47 +- Mozilla Firefox 103.0.1 - Gecko Driver 0.31.0 - IE Driver 3.150.1.1 - Selenium server 4.3.0 @@ -132,11 +131,11 @@ | SELENIUM_JAR_PATH | C:\selenium\selenium-server.jar | ### Java -| Version | Vendor | Environment Variable | -| ------------------- | --------------- | -------------------- | -| 8.0.342+7 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | -| 11.0.16+8 | Eclipse Temurin | JAVA_HOME_11_X64 | -| 17.0.4+8 | Eclipse Temurin | JAVA_HOME_17_X64 | +| Version | Vendor | Environment Variable | +| --------------------- | --------------- | -------------------- | +| 8.0.345+1.1 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | +| 11.0.16+8 | Eclipse Temurin | JAVA_HOME_11_X64 | +| 17.0.4+8 | Eclipse Temurin | JAVA_HOME_17_X64 | ### Shells | Name | Target | @@ -160,8 +159,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Version | Architecture | Environment Variable | | ------- | ------------ | -------------------- | | 1.16.15 | x64 | GOROOT_1_16_X64 | -| 1.17.12 (Default) | x64 | GOROOT_1_17_X64 | -| 1.18.4 | x64 | GOROOT_1_18_X64 | +| 1.17.13 (Default) | x64 | GOROOT_1_17_X64 | +| 1.18.5 | x64 | GOROOT_1_18_X64 | +| 1.19.0 | x64 | GOROOT_1_19_X64 | #### Node | Version | Architecture | @@ -176,7 +176,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | 3.7.9 | x64, x86 | | 3.8.10 | x64, x86 | | 3.9.13 (Default) | x64, x86 | -| 3.10.5 | x64, x86 | +| 3.10.6 | x64, x86 | #### Ruby | Version | Architecture | @@ -209,7 +209,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### MongoDB | Version | ServiceName | ServiceStatus | ServiceStartType | | -------- | ----------- | ------------- | ---------------- | -| 5.0.10.0 | MongoDB | Running | Automatic | +| 5.0.10.0 | MongoDB | Stopped | Disabled | ### Database tools - Azure CosmosDb Emulator 2.14.9.0 @@ -516,7 +516,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 4.8 ### .NET tools -- nbgv 3.5.108+6e793d63d3 +- nbgv 3.5.109+bdfbd7dea6 ### PowerShell Tools - PowerShell 7.2.5 @@ -536,10 +536,10 @@ All other versions are saved but not installed. #### Powershell Modules | Module | Version | | ------------------ | ---------------- | -| AWSPowerShell | 4.1.137 | +| AWSPowerShell | 4.1.141 | | DockerMsftProvider | 1.0.0.8 | | MarkdownPS | 1.9 | -| Microsoft.Graph | 1.10.0 | +| Microsoft.Graph | 1.11.0 | | Pester | 3.4.0<br>5.3.3 | | PowerShellGet | 1.0.0.1<br>2.2.5 | | PSScriptAnalyzer | 1.20.0 | From 1c49c133eaac06d51a86621916e9bea71ee855d6 Mon Sep 17 00:00:00 2001 From: Alexis Saettler <alexis@saettler.org> Date: Thu, 11 Aug 2022 16:45:40 +0200 Subject: [PATCH 1389/3485] [Windows] remove vcredist_2010_x64 duplicate test (#6060) * [Windows] re-add vcredist_140 test * remove vcredist_140 test --- images/win/scripts/Tests/Tools.Tests.ps1 | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/images/win/scripts/Tests/Tools.Tests.ps1 b/images/win/scripts/Tests/Tools.Tests.ps1 index 1086a3ec5051..6296f07034ac 100644 --- a/images/win/scripts/Tests/Tools.Tests.ps1 +++ b/images/win/scripts/Tests/Tools.Tests.ps1 @@ -164,11 +164,6 @@ Describe "VCRedist" -Skip:(Test-IsWin22) { "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{1D8E6291-B0D5-35EC-8441-6616F567A0F7}" | Should -Exist "C:\Windows\System32\msvcr100.dll" | Should -Exist } - - It "vcredist_2010_x64" { - "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{1D8E6291-B0D5-35EC-8441-6616F567A0F7}" | Should -Exist - "C:\Windows\System32\msvcr100.dll" | Should -Exist - } } Describe "WebPlatformInstaller" { @@ -201,4 +196,4 @@ Describe "SQL OLEDB Driver" { It "SQL OLEDB Driver" { "HKLM:\SOFTWARE\Microsoft\MSOLEDBSQL" | Should -Exist } -} \ No newline at end of file +} From d2c52297ae370ed7d83cb2cd59aec7171beceba2 Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Thu, 11 Aug 2022 16:46:59 +0200 Subject: [PATCH 1390/3485] [macOS] Added CodeQL (#6059) * Go update to version 1.19 * Revert "Go update to version 1.19" This reverts commit ec418d789fc24ec3597d5c5d8cd1f98fea9ee7b4. * Update of Go packages. Version 1.19.0 added. * Revert "Update of Go packages. Version 1.19.0 added." This reverts commit cc970ae8296ac7c608ce2c0c29f60131cd4f9678. * [macOS] Added CodeQL to macOS 11 and 12. Co-authored-by: Erik Bershel <110455084+re-gent@users.noreply.github.com> --- images/macos/software-report/SoftwareReport.Common.psm1 | 5 +++++ images/macos/software-report/SoftwareReport.Generator.ps1 | 3 ++- images/macos/tests/Common.Tests.ps1 | 6 ++++++ images/macos/toolsets/toolset-11.json | 3 ++- images/macos/toolsets/toolset-12.json | 3 ++- 5 files changed, 17 insertions(+), 3 deletions(-) diff --git a/images/macos/software-report/SoftwareReport.Common.psm1 b/images/macos/software-report/SoftwareReport.Common.psm1 index 56d68f6e161f..a13e91b7b62a 100644 --- a/images/macos/software-report/SoftwareReport.Common.psm1 +++ b/images/macos/software-report/SoftwareReport.Common.psm1 @@ -584,4 +584,9 @@ function Build-GraalVMTable { "Version" = $version "Environment variables" = $envVariables } +} + +function Get-CodeQLVersion { + $codeqlVersion = Run-Command "codeql version --quiet" + return "$codeqlVersion" } \ No newline at end of file diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1 index 199635d4f7f7..9533fe3ecbc5 100644 --- a/images/macos/software-report/SoftwareReport.Generator.ps1 +++ b/images/macos/software-report/SoftwareReport.Generator.ps1 @@ -159,7 +159,8 @@ $toolsList = @( (Get-AzureDevopsVersion), (Get-AWSCLIVersion), (Get-AWSSAMCLIVersion), - (Get-AWSSessionManagerCLIVersion) + (Get-AWSSessionManagerCLIVersion), + (Get-CodeQLVersion) ) if ($os.IsLessThanMonterey) { diff --git a/images/macos/tests/Common.Tests.ps1 b/images/macos/tests/Common.Tests.ps1 index 7e78b182d0f4..6c3f02eddec1 100644 --- a/images/macos/tests/Common.Tests.ps1 +++ b/images/macos/tests/Common.Tests.ps1 @@ -137,4 +137,10 @@ Describe "VirtualBox" -Skip:($os.IsBigSur) { It "Check kext kernel modules" { kextstat | Out-String | Should -Match "org.virtualbox.kext" } +} + +Describe "codeql" { + It "codeql" { + "codeql version" | Should -ReturnZeroExitCode + } } \ No newline at end of file diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index 51e7f8d616e4..682fcc8b9240 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -228,7 +228,8 @@ "imagemagick" ], "cask_packages": [ - "julia" + "julia", + "codeql" ] }, "gcc": { diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index 96a5e6988d4b..4fa94d7110ff 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -178,7 +178,8 @@ "cask_packages": [ "julia", "vagrant", - "virtualbox" + "virtualbox", + "codeql" ] }, "gcc": { From fa638dd3d612be9099f0199b2142fadf6e09a3e9 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 11 Aug 2022 18:10:38 +0000 Subject: [PATCH 1391/3485] Updating readme file for ubuntu22 version 20220807.1 (#6032) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2204-Readme.md | 91 ++++++++++++++++--------------- 1 file changed, 47 insertions(+), 44 deletions(-) diff --git a/images/linux/Ubuntu2204-Readme.md b/images/linux/Ubuntu2204-Readme.md index 9c92d678967f..585b37e83956 100644 --- a/images/linux/Ubuntu2204-Readme.md +++ b/images/linux/Ubuntu2204-Readme.md @@ -1,13 +1,14 @@ | Announcements | |-| +| [[All OSs] Go version 1.16 will be removed on August, 15th](https://github.com/actions/virtual-environments/issues/6024) | +| [The Ubuntu 18.04 Actions runner image will begin deprecation on 8/8/22 and will be fully unsupported by 12/1/22](https://github.com/actions/virtual-environments/issues/6002) | +| [Ubuntu 22.04 is generally available starting from August, 8](https://github.com/actions/virtual-environments/issues/5998) | | ['virtual-environments' repository name will be changed to 'runner-images' on August, 8th](https://github.com/actions/virtual-environments/issues/5967) | | [[all OSs] Android NDK 21 will be replaced in favor of 25 on August, 1st](https://github.com/actions/virtual-environments/issues/5930) | -| [[all OSs] Android ndk-bundle along with old NDK versions will be deprecated on July, 24](https://github.com/actions/virtual-environments/issues/5879) | -| [(Public Beta) Ubuntu 22.04 is now available](https://github.com/actions/virtual-environments/issues/5490) | *** -# Ubuntu 22.04 LTS +# Ubuntu 22.04.1 LTS - Linux kernel version: 5.15.0-1014-azure -- Image Version: 20220731.1 +- Image Version: 20220807.1 ## Installed Software ### Language and Runtime @@ -31,7 +32,7 @@ ### Package Management - cpan 1.64 - Helm 3.9.2 -- Homebrew 3.5.6 +- Homebrew 3.5.8 - Miniconda 4.12.0 - Npm 8.11.0 - NuGet 6.2.1.2 @@ -39,7 +40,7 @@ - Pip3 22.0.2 - Pipx 1.1.0 - RubyGems 3.3.5 -- Vcpkg (build from master \<66045de4d>) +- Vcpkg (build from master \<9b22b40c6>) - Yarn 1.22.19 #### Environment variables @@ -57,13 +58,13 @@ - AzCopy 10.16.0 (available by `azcopy` and `azcopy10` aliases) - Bazel 5.2.0 - Bazelisk 1.12.0 -- Bicep 0.8.9 +- Bicep 0.9.1 - Buildah 1.23.1 -- CMake 3.23.3 -- CodeQL Action Bundle 2.10.1 +- CMake 3.24.0 +- CodeQL Action Bundle 2.10.2 - Docker Amazon ECR Credential Helper 0.6.0 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.6.1+azure-1 +- Docker Compose v2 2.9.0+azure-1 - Docker-Buildx 0.8.2 - Docker-Moby Client 20.10.17+azure-1 - Docker-Moby Server 20.10.17+azure-1 @@ -72,21 +73,21 @@ - Git LFS 3.2.0 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.6.0 - Haveged 1.9.14 -- Heroku 7.60.2 +- Heroku 7.62.0 - jq 1.6 - Kind 0.14.0 - Kubectl 1.24.3 -- Kustomize 4.5.6 -- Leiningen 2.9.8 +- Kustomize 4.5.7 +- Leiningen 2.9.9 - MediaInfo 21.09 - Mercurial 6.1.1 -- Minikube 1.26.0 +- Minikube 1.26.1 - n 9.0.0 - Newman 5.3.2 - nvm 0.39.1 - OpenSSL 3.0.2-0ubuntu1.6 -- Packer 1.8.2 -- Parcel 2.6.2 +- Packer 1.8.3 +- Parcel 2.7.0 - Podman 3.4.4 - Pulumi 3.37.2 - R 4.2.1 @@ -95,23 +96,23 @@ - SVN 1.14.1 - Terraform 1.2.6 - yamllint 1.27.1 -- yq 4.26.1 +- yq 4.27.2 - zstd 1.5.2 (homebrew) ### CLI Tools - Alibaba Cloud CLI 3.0.124 -- AWS CLI 2.7.20 +- AWS CLI 2.7.21 - AWS CLI Session manager plugin 1.2.339.0 - AWS SAM CLI 1.53.0 -- Azure CLI (azure-cli) 2.38.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) +- Azure CLI (azure-cli) 2.39.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.25.0 - GitHub CLI 2.14.3 - Google Cloud SDK 369.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 10.13.0 -- OpenShift CLI 4.10.24 +- Netlify CLI 10.15.0 +- OpenShift CLI 4.10.25 - ORAS CLI 0.13.0 -- Vercel CLI 27.3.3 +- Vercel CLI 27.3.7 ### Java | Version | Vendor | Environment Variable | @@ -155,11 +156,11 @@ - Rustfmt 1.4.38 ### Browsers and Drivers -- Google Chrome 103.0.5060.134 -- ChromeDriver 103.0.5060.134 -- Chromium 103.0.5060.0 -- Microsoft Edge 103.0.1264.77 (apt source repository: https://packages.microsoft.com/repos/edge) -- Microsoft Edge WebDriver 103.0.1264.77 +- Google Chrome 104.0.5112.79 +- ChromeDriver 104.0.5112.79 +- Chromium 104.0.5112.0 +- Microsoft Edge 104.0.1293.47 (apt source repository: https://packages.microsoft.com/repos/edge) +- Microsoft Edge WebDriver 104.0.1293.47 - Selenium server 4.3.0 #### Environment variables @@ -174,7 +175,7 @@ - 6.0.302 ### .NET tools -- nbgv 3.5.108+6e793d63d3 +- nbgv 3.5.109+bdfbd7dea6 ### Databases - sqlite3 3.37.2 @@ -195,8 +196,9 @@ ``` ### Cached Tools #### Go -- 1.17.12 -- 1.18.4 +- 1.17.13 +- 1.18.5 +- 1.19.0 #### Node.js - 14.20.0 @@ -211,7 +213,7 @@ - 3.7.13 - 3.8.13 - 3.9.13 -- 3.10.5 +- 3.10.6 #### Ruby - 3.1.2 @@ -219,8 +221,9 @@ #### Environment variables | Name | Value | Architecture | | --------------- | ----------------------------------- | ------------ | -| GOROOT_1_17_X64 | /opt/hostedtoolcache/go/1.17.12/x64 | x64 | -| GOROOT_1_18_X64 | /opt/hostedtoolcache/go/1.18.4/x64 | x64 | +| GOROOT_1_17_X64 | /opt/hostedtoolcache/go/1.17.13/x64 | x64 | +| GOROOT_1_18_X64 | /opt/hostedtoolcache/go/1.18.5/x64 | x64 | +| GOROOT_1_19_X64 | /opt/hostedtoolcache/go/1.19.0/x64 | x64 | ### PowerShell Tools - PowerShell 7.2.5 @@ -229,7 +232,7 @@ | Module | Version | | ---------------- | ------- | | MarkdownPS | 1.9 | -| Microsoft.Graph | 1.10.0 | +| Microsoft.Graph | 1.11.0 | | Pester | 5.3.3 | | PSScriptAnalyzer | 1.20.0 | @@ -273,18 +276,18 @@ | ----------------------- | ------------------------------------------------------------------------ | ---------- | | alpine:3.14 | sha256:43eb8f0d8215d8661f745f3d88563c026614d843b668b233bbe1666b6d026f61 | 2022-07-19 | | alpine:3.15 | sha256:0483110c51a764abe175a8cefb941541ca0bc0f628ce418d3a660338abf4622a | 2022-07-19 | -| buildpack-deps:bullseye | sha256:025c1b80248fb37b1f5250aba9e578e1dc24066912d94d3fa37c21bf8ee98b30 | 2022-07-12 | -| buildpack-deps:buster | sha256:0adb423c3161e19606330068d8d3d7710f1bb1b2233e6964ba329c79a96babb2 | 2022-07-12 | -| debian:10 | sha256:0685c900f6e691bdda6980c0ed0779d20183bc58770059b64adb56cb8a3129f0 | 2022-07-12 | -| debian:11 | sha256:2ce44bbc00a79113c296d9d25524e15d423b23303fdbbe20190d2f96e0aeb251 | 2022-07-12 | +| buildpack-deps:bullseye | sha256:d6974da710854c9c38d49666bd682abd99ef7aacdb92344d42a00f723e63cdb1 | 2022-08-02 | +| buildpack-deps:buster | sha256:9d806f4d80f19e3fd315bbe2ca1aa59a6c1ad18aff7b3d9696b407572608d61e | 2022-08-02 | +| debian:10 | sha256:fb9654aac57319592f1d51497c62001e7033eddf059355408a0b53f7c71f8d5f | 2022-08-02 | +| debian:11 | sha256:82bab30ed448b8e2509aabe21f40f0607d905b7fd0dec72802627a20274eba55 | 2022-08-02 | | moby/buildkit:latest | sha256:0dc312b04eac1b44cd2cad566deb1e886c753109208affbbec8384f381ff7f38 | 2022-05-06 | -| node:14 | sha256:8ae0e9298b6098f6641e35d0488477381f86fce04993a3f8060a7657db8fb928 | 2022-07-12 | +| node:14 | sha256:7e1eabbcd7cbd0fdc296bc00fb2c80943ed0499c4ca3a148c83944708574dcf6 | 2022-08-02 | | node:14-alpine | sha256:e22ee6a906e823dc592d6022a3f520676575b50320fe2c3916c88acb16f471ce | 2022-07-18 | -| node:16 | sha256:4e85818bd0d023d4f9025730dc0640d3d8269e3d1a84ce6365eca8fbad7a3ee9 | 2022-07-12 | +| node:16 | sha256:1ed1e17ccabb09038cfb8a965337ebcda51ef9e9d32082164c502d44d9731a02 | 2022-08-02 | | node:16-alpine | sha256:1908564153449b1c46b329e6ce2307e226bc566294f822f11c5a8bcef4eeaad7 | 2022-07-18 | -| ubuntu:18.04 | sha256:478caf1bec1afd54a58435ec681c8755883b7eb843a8630091890130b15a79af | 2022-06-06 | -| ubuntu:20.04 | sha256:fd92c36d3cb9b1d027c4d2a72c6bf0125da82425fc2ca37c414d4f010180dc19 | 2022-06-06 | -| ubuntu:22.04 | sha256:b6b83d3c331794420340093eb706a6f152d9c1fa51b262d9bf34594887c2c7ac | 2022-06-06 | +| ubuntu:18.04 | sha256:eb1392bbdde63147bc2b4ff1a4053dcfe6d15e4dfd3cce29e9b9f52a4f88bc74 | 2022-08-02 | +| ubuntu:20.04 | sha256:af5efa9c28de78b754777af9b4d850112cad01899a5d37d2617bb94dc63a49aa | 2022-08-02 | +| ubuntu:22.04 | sha256:34fea4f31bf187bc915536831fd0afc9d214755bf700b5cdb1336c82516d154e | 2022-08-02 | ### Installed apt packages | Name | Version | @@ -318,7 +321,7 @@ | libc++-dev | 1:14.0-55\~exp2 | | libc++abi-dev | 1:14.0-55\~exp2 | | libcurl4 | 7.81.0-1ubuntu1.3 | -| libgbm-dev | 22.0.1-1ubuntu2.1 | +| libgbm-dev | 22.0.5-0ubuntu0.1 | | libgconf-2-4 | 3.2.6-7ubuntu2 | | libgsl-dev | 2.7.1+dfsg-3 | | libgtk-3-0 | 3.24.33-1ubuntu2 | From d48bfb5671579e5db35ecc1b0ff422b19c313103 Mon Sep 17 00:00:00 2001 From: Dusko Dobranic <101048884+ddobranic@users.noreply.github.com> Date: Fri, 12 Aug 2022 09:46:38 +0200 Subject: [PATCH 1392/3485] Revert "[macOS] Added CodeQL (#6059)" (#6066) This reverts commit d2c52297ae370ed7d83cb2cd59aec7171beceba2. --- images/macos/software-report/SoftwareReport.Common.psm1 | 5 ----- images/macos/software-report/SoftwareReport.Generator.ps1 | 3 +-- images/macos/tests/Common.Tests.ps1 | 6 ------ images/macos/toolsets/toolset-11.json | 3 +-- images/macos/toolsets/toolset-12.json | 3 +-- 5 files changed, 3 insertions(+), 17 deletions(-) diff --git a/images/macos/software-report/SoftwareReport.Common.psm1 b/images/macos/software-report/SoftwareReport.Common.psm1 index a13e91b7b62a..56d68f6e161f 100644 --- a/images/macos/software-report/SoftwareReport.Common.psm1 +++ b/images/macos/software-report/SoftwareReport.Common.psm1 @@ -584,9 +584,4 @@ function Build-GraalVMTable { "Version" = $version "Environment variables" = $envVariables } -} - -function Get-CodeQLVersion { - $codeqlVersion = Run-Command "codeql version --quiet" - return "$codeqlVersion" } \ No newline at end of file diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1 index 9533fe3ecbc5..199635d4f7f7 100644 --- a/images/macos/software-report/SoftwareReport.Generator.ps1 +++ b/images/macos/software-report/SoftwareReport.Generator.ps1 @@ -159,8 +159,7 @@ $toolsList = @( (Get-AzureDevopsVersion), (Get-AWSCLIVersion), (Get-AWSSAMCLIVersion), - (Get-AWSSessionManagerCLIVersion), - (Get-CodeQLVersion) + (Get-AWSSessionManagerCLIVersion) ) if ($os.IsLessThanMonterey) { diff --git a/images/macos/tests/Common.Tests.ps1 b/images/macos/tests/Common.Tests.ps1 index 6c3f02eddec1..7e78b182d0f4 100644 --- a/images/macos/tests/Common.Tests.ps1 +++ b/images/macos/tests/Common.Tests.ps1 @@ -137,10 +137,4 @@ Describe "VirtualBox" -Skip:($os.IsBigSur) { It "Check kext kernel modules" { kextstat | Out-String | Should -Match "org.virtualbox.kext" } -} - -Describe "codeql" { - It "codeql" { - "codeql version" | Should -ReturnZeroExitCode - } } \ No newline at end of file diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index 682fcc8b9240..51e7f8d616e4 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -228,8 +228,7 @@ "imagemagick" ], "cask_packages": [ - "julia", - "codeql" + "julia" ] }, "gcc": { diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index 4fa94d7110ff..96a5e6988d4b 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -178,8 +178,7 @@ "cask_packages": [ "julia", "vagrant", - "virtualbox", - "codeql" + "virtualbox" ] }, "gcc": { From 31eba923af4cff4455b1a578413666962463b842 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Fri, 12 Aug 2022 19:25:31 +0200 Subject: [PATCH 1393/3485] Add VC.14.29.16.11.ARM component (#6064) --- images/win/toolsets/toolset-2022.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index 25c95dee43bc..49a7cf58118e 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -242,8 +242,16 @@ "Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64.Spectre", "Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL", "Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.Spectre", + "Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM", + "Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM.Spectre", + "Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM64", + "Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM64.Spectre", "Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC", "Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.Spectre", + "Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.ARM", + "Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.ARM.Spectre", + "Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.ARM64", + "Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.ARM64.Spectre", "Microsoft.VisualStudio.Component.VC.14.32.17.2.ARM", "Microsoft.VisualStudio.Component.VC.14.32.17.2.ARM.Spectre", "Microsoft.VisualStudio.Component.VC.14.32.17.2.ARM64", From 7ca1ca6a5c9d6545e136ca5b34d48c249371ac40 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Mon, 15 Aug 2022 13:19:48 +0200 Subject: [PATCH 1394/3485] Add ARM64EC workload for Visual Studio 2019 (#6075) --- images/win/toolsets/toolset-2019.json | 1 + 1 file changed, 1 insertion(+) diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index 0d65828e2561..a29fdc050412 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -324,6 +324,7 @@ "Microsoft.VisualStudio.Component.VC.MFC.ARM64", "Microsoft.VisualStudio.Component.VC.MFC.ARM64.Spectre", "Microsoft.VisualStudio.Component.VC.Modules.x86.x64", + "Microsoft.VisualStudio.Component.VC.Tools.ARM64EC", "Microsoft.VisualStudio.Component.VC.Redist.MSM", "Microsoft.VisualStudio.Component.VC.Runtimes.ARM.Spectre", "Microsoft.VisualStudio.Component.VC.Runtimes.ARM64.Spectre", From b135fb8a59a04353f4f2e7847731ba2c88477b7d Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Mon, 15 Aug 2022 14:56:29 +0200 Subject: [PATCH 1395/3485] Update python3 to 3.10 version (#6081) --- images/macos/provision/core/python.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/macos/provision/core/python.sh b/images/macos/provision/core/python.sh index 597362c01a5f..09de9c356c31 100755 --- a/images/macos/provision/core/python.sh +++ b/images/macos/provision/core/python.sh @@ -20,7 +20,7 @@ fi # Explicitly overwrite symlinks created by Python2 such as /usr/local/bin/2to3 since they conflict with symlinks from Python3 # https://github.com/actions/runner-images/issues/2322 echo "Brew Installing Python 3" -brew_smart_install "python@3.9" || brew link --overwrite python@3.9 +brew_smart_install "python@3.10" || brew link --overwrite python@3.10 echo "Installing pipx" export PIPX_BIN_DIR=/usr/local/opt/pipx_bin From c25ce452cbb534a43254faab5e39f91cf78311da Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Mon, 15 Aug 2022 19:36:32 +0200 Subject: [PATCH 1396/3485] [macOS] Added CodeQL Action Bundle to macOS 11 and macOS 12 (#6068) * [macOS] CodeQL Action Bundle added to macOS 11 and 12 images * [macOS] Added CodeQL Action Bundle to macOS 11 and macOS 12 * [macOS] Added CodeQL Action Bundle to macOS 11 and macOS 12 --- images/macos/provision/core/codeql-bundle.sh | 23 +++++++++++++++++++ .../SoftwareReport.Common.psm1 | 8 +++++++ .../SoftwareReport.Generator.ps1 | 3 ++- images/macos/templates/macOS-11.anka.pkr.hcl | 3 ++- images/macos/templates/macOS-11.json | 3 ++- images/macos/templates/macOS-12.anka.pkr.hcl | 3 ++- images/macos/templates/macOS-12.json | 3 ++- images/macos/tests/Common.Tests.ps1 | 9 ++++++++ 8 files changed, 50 insertions(+), 5 deletions(-) create mode 100644 images/macos/provision/core/codeql-bundle.sh diff --git a/images/macos/provision/core/codeql-bundle.sh b/images/macos/provision/core/codeql-bundle.sh new file mode 100644 index 000000000000..1b6e2c4053be --- /dev/null +++ b/images/macos/provision/core/codeql-bundle.sh @@ -0,0 +1,23 @@ +#!/bin/bash -e -o pipefail +source ~/utils/utils.sh + +# Retrieve the name of the CodeQL bundle preferred by the Action (in the format codeql-bundle-YYYYMMDD). +codeql_bundle_name="$(curl -sSL https://raw.githubusercontent.com/github/codeql-action/v2/src/defaults.json | jq -r .bundleVersion)" +# Convert the bundle name to a version number (0.0.0-YYYYMMDD). +codeql_bundle_version="0.0.0-${codeql_bundle_name##*-}" + +echo "Downloading CodeQL bundle $codeql_bundle_version..." +download_with_retries "https://github.com/github/codeql-action/releases/download/$codeql_bundle_name/codeql-bundle.tar.gz" "/tmp" "codeql-bundle.tar.gz" +codeqlArchive="/tmp/codeql-bundle.tar.gz" + +codeqlToolcachePath="$AGENT_TOOLSDIRECTORY/codeql/$codeql_bundle_version/x64" +mkdir -p $codeqlToolcachePath + +echo "Unpacking the downloaded CodeQL bundle archive..." +tar -xzf $codeqlArchive -C $codeqlToolcachePath + +# Touch a special file that indicates to the CodeQL Action that this bundle was baked-in to the hosted runner images. +touch "$codeqlToolcachePath/pinned-version" + +# Touch a file to indicate to the toolcache that setting up CodeQL is complete. +touch "$codeqlToolcachePath.complete" diff --git a/images/macos/software-report/SoftwareReport.Common.psm1 b/images/macos/software-report/SoftwareReport.Common.psm1 index 56d68f6e161f..ff949b008585 100644 --- a/images/macos/software-report/SoftwareReport.Common.psm1 +++ b/images/macos/software-report/SoftwareReport.Common.psm1 @@ -584,4 +584,12 @@ function Build-GraalVMTable { "Version" = $version "Environment variables" = $envVariables } +} + +function Get-CodeQLBundleVersion { + $CodeQLVersionWildcard = Join-Path $Env:AGENT_TOOLSDIRECTORY -ChildPath "CodeQL" | Join-Path -ChildPath "*" + $CodeQLVersionPath = Get-ChildItem $CodeQLVersionWildcard | Select-Object -First 1 -Expand FullName + $CodeQLPath = Join-Path $CodeQLVersionPath -ChildPath "x64" | Join-Path -ChildPath "codeql" | Join-Path -ChildPath "codeql" + $CodeQLVersion = & $CodeQLPath version --quiet + return "CodeQL Action Bundle $CodeQLVersion" } \ No newline at end of file diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1 index 199635d4f7f7..c83645f50b48 100644 --- a/images/macos/software-report/SoftwareReport.Generator.ps1 +++ b/images/macos/software-report/SoftwareReport.Generator.ps1 @@ -159,7 +159,8 @@ $toolsList = @( (Get-AzureDevopsVersion), (Get-AWSCLIVersion), (Get-AWSSAMCLIVersion), - (Get-AWSSessionManagerCLIVersion) + (Get-AWSSessionManagerCLIVersion), + (Get-CodeQLBundleVersion) ) if ($os.IsLessThanMonterey) { diff --git a/images/macos/templates/macOS-11.anka.pkr.hcl b/images/macos/templates/macOS-11.anka.pkr.hcl index 48d49444a7a9..387969d7fd7a 100644 --- a/images/macos/templates/macOS-11.anka.pkr.hcl +++ b/images/macos/templates/macOS-11.anka.pkr.hcl @@ -212,7 +212,8 @@ build { "./provision/core/pypy.sh", "./provision/core/pipx-packages.sh", "./provision/core/bicep.sh", - "./provision/core/graalvm.sh" + "./provision/core/graalvm.sh", + "./provision/core/codeql-bundle.sh" ] environment_vars = [ "API_PAT=${var.github_api_pat}" diff --git a/images/macos/templates/macOS-11.json b/images/macos/templates/macOS-11.json index 684e3d46ad36..b6ef7e8942ba 100644 --- a/images/macos/templates/macOS-11.json +++ b/images/macos/templates/macOS-11.json @@ -207,7 +207,8 @@ "./provision/core/pypy.sh", "./provision/core/pipx-packages.sh", "./provision/core/bicep.sh", - "./provision/core/graalvm.sh" + "./provision/core/graalvm.sh", + "./provision/core/codeql-bundle.sh" ], "environment_vars": [ "API_PAT={{user `github_api_pat`}}" diff --git a/images/macos/templates/macOS-12.anka.pkr.hcl b/images/macos/templates/macOS-12.anka.pkr.hcl index 2eb1366b0ffc..c612bcefa624 100644 --- a/images/macos/templates/macOS-12.anka.pkr.hcl +++ b/images/macos/templates/macOS-12.anka.pkr.hcl @@ -213,7 +213,8 @@ build { "./provision/core/pypy.sh", "./provision/core/pipx-packages.sh", "./provision/core/bicep.sh", - "./provision/core/graalvm.sh" + "./provision/core/graalvm.sh", + "./provision/core/codeql-bundle.sh" ] environment_vars = [ "API_PAT=${var.github_api_pat}" diff --git a/images/macos/templates/macOS-12.json b/images/macos/templates/macOS-12.json index ee63e98205be..5cd163ba2c6d 100644 --- a/images/macos/templates/macOS-12.json +++ b/images/macos/templates/macOS-12.json @@ -208,7 +208,8 @@ "./provision/core/pypy.sh", "./provision/core/pipx-packages.sh", "./provision/core/bicep.sh", - "./provision/core/graalvm.sh" + "./provision/core/graalvm.sh", + "./provision/core/codeql-bundle.sh" ], "environment_vars": [ "API_PAT={{user `github_api_pat`}}" diff --git a/images/macos/tests/Common.Tests.ps1 b/images/macos/tests/Common.Tests.ps1 index 7e78b182d0f4..bd1ab630e353 100644 --- a/images/macos/tests/Common.Tests.ps1 +++ b/images/macos/tests/Common.Tests.ps1 @@ -137,4 +137,13 @@ Describe "VirtualBox" -Skip:($os.IsBigSur) { It "Check kext kernel modules" { kextstat | Out-String | Should -Match "org.virtualbox.kext" } +} + +Describe "CodeQL Action Bundle" { + It "codeql" { + $CodeQLVersionWildcard = Join-Path $Env:AGENT_TOOLSDIRECTORY -ChildPath "CodeQL" | Join-Path -ChildPath "*" + $CodeQLVersionPath = Get-ChildItem $CodeQLVersionWildcard | Select-Object -First 1 -Expand FullName + $CodeQLPath = Join-Path $CodeQLVersionPath -ChildPath "x64" | Join-Path -ChildPath "codeql" | Join-Path -ChildPath "codeql" + "$CodeQLPath version --quiet" | Should -ReturnZeroExitCode + } } \ No newline at end of file From 47039fc7d47e16abfbe565a4f49e182702258646 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Tue, 16 Aug 2022 09:54:22 +0200 Subject: [PATCH 1397/3485] Add Component.Xamarin for Visual Studio 2022 (#6083) --- images/win/toolsets/toolset-2022.json | 1 + 1 file changed, 1 insertion(+) diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index 49a7cf58118e..a13e37fe036d 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -185,6 +185,7 @@ "Component.Linux.CMake", "Component.UnityEngine.x64", "Component.Unreal.Android", + "Component.Xamarin", "Microsoft.Component.VC.Runtime.UCRTSDK", "Microsoft.Net.Component.4.7.TargetingPack", "Microsoft.Net.Component.4.7.2.TargetingPack", From c733edf13ca752e99057b8ee3f400ee660d34333 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Tue, 16 Aug 2022 09:55:11 +0200 Subject: [PATCH 1398/3485] Set max_retries to 3 (#6085) --- images/linux/ubuntu2004.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/images/linux/ubuntu2004.json b/images/linux/ubuntu2004.json index 894de265aea4..e7029996736e 100644 --- a/images/linux/ubuntu2004.json +++ b/images/linux/ubuntu2004.json @@ -321,8 +321,12 @@ }, { "type": "shell", + "max_retries": 3, + "start_retry_timeout": "2m", "inline": [ + "pwsh -Command Write-Host Running SoftwareReport.Generator.ps1 script", "pwsh -File {{user `image_folder`}}/SoftwareReport/SoftwareReport.Generator.ps1 -OutputDirectory {{user `image_folder`}}", + "pwsh -Command Write-Host Running RunAll-Tests.ps1 script", "pwsh -File {{user `image_folder`}}/tests/RunAll-Tests.ps1 -OutputDirectory {{user `image_folder`}}" ], "environment_vars": [ From 14b3afe238ab62110bb863357f5c441432a1ca50 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Tue, 16 Aug 2022 11:03:03 +0200 Subject: [PATCH 1399/3485] [Ubuntu] put Microsoft repo higher for dotnet (#6084) --- .../linux/scripts/installers/dotnetcore-sdk.sh | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/images/linux/scripts/installers/dotnetcore-sdk.sh b/images/linux/scripts/installers/dotnetcore-sdk.sh index 36c50d4a8bfb..bc9cbd8e8be8 100644 --- a/images/linux/scripts/installers/dotnetcore-sdk.sh +++ b/images/linux/scripts/installers/dotnetcore-sdk.sh @@ -16,6 +16,19 @@ DOTNET_TOOLS=$(get_toolset_value '.dotnet.tools[].name') # Disable telemetry export DOTNET_CLI_TELEMETRY_OPTOUT=1 +# There is a versions conflict, that leads to +# Microsoft <-> Canonical repos dependencies mix up. +# Give Microsoft's repo higher priority to avoid collisions. +# See: https://github.com/dotnet/core/issues/7699 + +cat << EOF > /etc/apt/preferences.d/dotnet +Package: *net* +Pin: origin packages.microsoft.com +Pin-Priority: 1001 +EOF + +apt-get update + for latest_package in ${LATEST_DOTNET_PACKAGES[@]}; do echo "Determing if .NET Core ($latest_package) is installed" if ! IsPackageInstalled $latest_package; then @@ -26,6 +39,10 @@ for latest_package in ${LATEST_DOTNET_PACKAGES[@]}; do fi done +rm /etc/apt/preferences.d/dotnet + +apt-get update + # Get list of all released SDKs from channels which are not end-of-life or preview sdks=() for version in ${DOTNET_VERSIONS[@]}; do From 2309f23a2112b02194cdc2b4b48fd71df6b155da Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Tue, 16 Aug 2022 14:06:37 +0200 Subject: [PATCH 1400/3485] [Ubuntu] fix Software report for OpenShift CLI (#6080) --- images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 index ca119f67b0f9..3092e7ec58a1 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 @@ -264,7 +264,7 @@ function Get-NetlifyCliVersion { } function Get-OCCliVersion { - $ocVersion = oc version | Take-OutputPart -Part 2 | Take-OutputPart -Part 0 -Delimiter "-" + $ocVersion = oc version -o=json | jq -r '.releaseClientVersion' return "OpenShift CLI $ocVersion" } From df2b5440935c1ff4dd04b152ed8e0dff225463f4 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 16 Aug 2022 12:13:06 +0000 Subject: [PATCH 1401/3485] Updating readme file for ubuntu20 version 20220814.1 (#6077) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2004-Readme.md | 78 +++++++++++++++---------------- 1 file changed, 37 insertions(+), 41 deletions(-) diff --git a/images/linux/Ubuntu2004-Readme.md b/images/linux/Ubuntu2004-Readme.md index dc4c05b98b03..1587a7f40099 100644 --- a/images/linux/Ubuntu2004-Readme.md +++ b/images/linux/Ubuntu2004-Readme.md @@ -1,14 +1,12 @@ | Announcements | |-| -| [[All OSs] Go version 1.16 will be removed on August, 15th](https://github.com/actions/virtual-environments/issues/6024) | -| [The Ubuntu 18.04 Actions runner image will begin deprecation on 8/8/22 and will be fully unsupported by 12/1/22](https://github.com/actions/virtual-environments/issues/6002) | -| [Ubuntu 22.04 is generally available starting from August, 8](https://github.com/actions/virtual-environments/issues/5998) | -| ['virtual-environments' repository name will be changed to 'runner-images' on August, 8th](https://github.com/actions/virtual-environments/issues/5967) | -| [[all OSs] Android NDK 21 will be replaced in favor of 25 on August, 1st](https://github.com/actions/virtual-environments/issues/5930) | +| [[All OSs] Go version 1.16 will be removed on August, 15th](https://github.com/actions/runner-images/issues/6024) | +| [The Ubuntu 18.04 Actions runner image will begin deprecation on 8/8/22 and will be fully unsupported by 12/1/22](https://github.com/actions/runner-images/issues/6002) | +| [[all OSs] Android NDK 21 will be replaced in favor of 25 on August, 1st](https://github.com/actions/runner-images/issues/5930) | *** # Ubuntu 20.04.4 LTS -- Linux kernel version: 5.15.0-1014-azure -- Image Version: 20220807.1 +- Linux kernel version: 5.15.0-1017-azure +- Image Version: 20220814.1 ## Installed Software ### Language and Runtime @@ -34,8 +32,8 @@ ### Package Management - cpan 1.64 -- Helm 3.9.2 -- Homebrew 3.5.8 +- Helm 3.9.3 +- Homebrew 3.5.9 - Miniconda 4.12.0 - Npm 8.11.0 - NuGet 6.2.1.2 @@ -43,7 +41,7 @@ - Pip3 20.0.2 - Pipx 1.1.0 - RubyGems 3.1.2 -- Vcpkg (build from master \<9b22b40c6>) +- Vcpkg (build from master \<d293ac220>) - Yarn 1.22.19 #### Environment variables @@ -55,7 +53,7 @@ ### Project Management - Ant 1.10.7 - Gradle 7.5.1 -- Lerna 5.3.0 +- Lerna 5.4.2 - Maven 3.8.6 - Sbt 1.7.1 @@ -75,18 +73,18 @@ - Docker-Buildx 0.8.2 - Docker-Moby Client 20.10.17+azure-1 - Docker-Moby Server 20.10.17+azure-1 -- Fastlane 2.208.0 -- Git 2.37.1 (apt source repository: ppa:git-core/ppa) +- Fastlane 2.209.0 +- Git 2.37.2 (apt source repository: ppa:git-core/ppa) - Git LFS 3.2.0 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.6.0 - Haveged 1.9.1 - Heroku 7.62.0 -- HHVM (HipHop VM) 4.165.0 +- HHVM (HipHop VM) 4.166.0 - jq 1.6 - Kind 0.14.0 - Kubectl 1.24.3 - Kustomize 4.5.7 -- Leiningen 2.9.9 +- Leiningen 2.9.10 - MediaInfo 19.09 - Mercurial 5.3.1 - Minikube 1.26.1 @@ -103,30 +101,30 @@ - Skopeo 1.5.0 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 -- Terraform 1.2.6 +- Terraform 1.2.7 - yamllint 1.27.1 - yq 4.27.2 - zstd 1.5.2 (homebrew) ### CLI Tools - Alibaba Cloud CLI 3.0.124 -- AWS CLI 2.7.21 +- AWS CLI 2.7.22 - AWS CLI Session manager plugin 1.2.339.0 - AWS SAM CLI 1.53.0 - Azure CLI (azure-cli) 2.39.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.25.0 -- GitHub CLI 2.14.3 +- GitHub CLI 2.14.4 - Google Cloud SDK 369.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 10.15.0 -- OpenShift CLI 4.10.25 +- Netlify CLI 10.17.4 +- OpenShift CLI v4.5.4 - ORAS CLI 0.13.0 -- Vercel CLI 27.3.7 +- Vercel CLI 28.0.1 ### Java | Version | Vendor | Environment Variable | | ------------------- | --------------- | -------------------- | -| 8.0.332+9 | Eclipse Temurin | JAVA_HOME_8_X64 | +| 8.0.345+1 | Eclipse Temurin | JAVA_HOME_8_X64 | | 11.0.16+8 (default) | Eclipse Temurin | JAVA_HOME_11_X64 | | 17.0.4+8 | Eclipse Temurin | JAVA_HOME_17_X64 | @@ -146,31 +144,31 @@ ``` ### Haskell - Cabal 3.6.2.0 -- GHC 9.2.4 +- GHC 9.4.1 - GHCup 0.1.18.0 - Stack 2.7.5 ### Rust Tools -- Cargo 1.62.1 -- Rust 1.62.1 -- Rustdoc 1.62.1 +- Cargo 1.63.0 +- Rust 1.63.0 +- Rustdoc 1.63.0 - Rustup 1.25.1 #### Packages - Bindgen 0.60.1 - Cargo audit 0.17.0 -- Cargo clippy 0.1.62 +- Cargo clippy 0.1.63 - Cargo outdated 0.11.1 - Cbindgen 0.24.3 -- Rustfmt 1.4.38 +- Rustfmt 1.5.1 ### Browsers and Drivers - Google Chrome 104.0.5112.79 - ChromeDriver 104.0.5112.79 - Chromium 104.0.5112.0 -- Microsoft Edge 104.0.1293.47 (apt source repository: https://packages.microsoft.com/repos/edge) -- Microsoft Edge WebDriver 104.0.1293.47 -- Selenium server 4.3.0 +- Microsoft Edge 104.0.1293.54 (apt source repository: https://packages.microsoft.com/repos/edge) +- Microsoft Edge WebDriver 104.0.1293.54 +- Selenium server 4.4.0 - Mozilla Firefox 103.0 - Geckodriver 0.31.0 @@ -183,7 +181,7 @@ | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | ### .NET Core SDK -- 3.1.120 3.1.202 3.1.302 3.1.421 5.0.104 5.0.214 5.0.303 5.0.408 6.0.302 +- 3.1.120 3.1.202 3.1.302 3.1.422 5.0.104 5.0.214 5.0.303 5.0.408 6.0.400 ### .NET tools - nbgv 3.5.109+bdfbd7dea6 @@ -193,7 +191,7 @@ - sqlite3 3.31.1 #### PostgreSQL -- PostgreSQL 14.4 (apt source repository: https://apt.postgresql.org/pub/repos/apt/) +- PostgreSQL 14.5 (apt source repository: https://apt.postgresql.org/pub/repos/apt/) - PostgreSQL Server (user:postgres) ``` @@ -212,7 +210,6 @@ ### Cached Tools #### Go -- 1.16.15 - 1.17.13 - 1.18.5 - 1.19.0 @@ -247,13 +244,12 @@ #### Environment variables | Name | Value | Architecture | | --------------- | ----------------------------------- | ------------ | -| GOROOT_1_16_X64 | /opt/hostedtoolcache/go/1.16.15/x64 | x64 | | GOROOT_1_17_X64 | /opt/hostedtoolcache/go/1.17.13/x64 | x64 | | GOROOT_1_18_X64 | /opt/hostedtoolcache/go/1.18.5/x64 | x64 | | GOROOT_1_19_X64 | /opt/hostedtoolcache/go/1.19.0/x64 | x64 | ### PowerShell Tools -- PowerShell 7.2.5 +- PowerShell 7.2.6 #### PowerShell Modules | Module | Version | @@ -277,7 +273,7 @@ | Package Name | Version | | -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------ | | Android Command Line Tools | 7.0 | -| Android Emulator | 31.2.10 | +| Android Emulator | 31.3.10 | | Android SDK Build-tools | 33.0.0<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | | Android SDK Platform-Tools | 33.0.2 | | Android SDK Platforms | android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | @@ -303,8 +299,8 @@ | Repository:Tag | Digest | Created | | ----------------------- | ------------------------------------------------------------------------ | ---------- | | alpine:3.12 | sha256:c75ac27b49326926b803b9ed43bf088bc220d22556de1bc5f72d742c91398f69 | 2022-04-05 | -| alpine:3.13 | sha256:7769c38ce671534a0ddbf98633f17edbbd4a4e99cbc77ef42f9f7b78b6a1c6c2 | 2022-07-19 | -| alpine:3.14 | sha256:43eb8f0d8215d8661f745f3d88563c026614d843b668b233bbe1666b6d026f61 | 2022-07-19 | +| alpine:3.13 | sha256:100448e45467d4f3838fc8d95faab2965e22711b6edf67bbd8ec9c07f612b553 | 2022-08-09 | +| alpine:3.14 | sha256:1ab24b3b99320975cca71716a7475a65d263d0b6b604d9d14ce08f7a3f67595c | 2022-08-09 | | buildpack-deps:bullseye | sha256:d6974da710854c9c38d49666bd682abd99ef7aacdb92344d42a00f723e63cdb1 | 2022-08-02 | | buildpack-deps:buster | sha256:9d806f4d80f19e3fd315bbe2ca1aa59a6c1ad18aff7b3d9696b407572608d61e | 2022-08-02 | | buildpack-deps:stretch | sha256:78e995165a5788c2f55aed6e548d8f6c1534830d4310c870408fccb2da8c5b2e | 2022-06-23 | @@ -315,9 +311,9 @@ | node:12 | sha256:01627afeb110b3054ba4a1405541ca095c8bfca1cb6f2be9479c767a2711879e | 2022-04-20 | | node:12-alpine | sha256:d4b15b3d48f42059a15bd659be60afe21762aae9d6cbea6f124440895c27db68 | 2022-04-11 | | node:14 | sha256:7e1eabbcd7cbd0fdc296bc00fb2c80943ed0499c4ca3a148c83944708574dcf6 | 2022-08-02 | -| node:14-alpine | sha256:e22ee6a906e823dc592d6022a3f520676575b50320fe2c3916c88acb16f471ce | 2022-07-18 | +| node:14-alpine | sha256:4aff4ba0da347e51561587eba037a38db4eaa70e1a6c8334d66779fe963d5be7 | 2022-08-09 | | node:16 | sha256:1ed1e17ccabb09038cfb8a965337ebcda51ef9e9d32082164c502d44d9731a02 | 2022-08-02 | -| node:16-alpine | sha256:1908564153449b1c46b329e6ce2307e226bc566294f822f11c5a8bcef4eeaad7 | 2022-07-18 | +| node:16-alpine | sha256:1c8769a8c9ed57817ef07162744a3722421333a438185c560aa42a9a1fc6ea23 | 2022-08-09 | | ubuntu:16.04 | sha256:91bd29a464fdabfcf44e29e1f2a5f213c6dfa750b6290e40dd6998ac79da3c41 | 2021-08-31 | | ubuntu:18.04 | sha256:eb1392bbdde63147bc2b4ff1a4053dcfe6d15e4dfd3cce29e9b9f52a4f88bc74 | 2022-08-02 | | ubuntu:20.04 | sha256:af5efa9c28de78b754777af9b4d850112cad01899a5d37d2617bb94dc63a49aa | 2022-08-02 | From 55b724ed824f6381e31f6734f484d8703f523ffd Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Tue, 16 Aug 2022 14:32:34 +0200 Subject: [PATCH 1402/3485] [Ubuntu] fix README for 20.04 (#6093) --- images/linux/Ubuntu2004-Readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/linux/Ubuntu2004-Readme.md b/images/linux/Ubuntu2004-Readme.md index 1587a7f40099..218c179b6b07 100644 --- a/images/linux/Ubuntu2004-Readme.md +++ b/images/linux/Ubuntu2004-Readme.md @@ -117,7 +117,7 @@ - Google Cloud SDK 369.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 - Netlify CLI 10.17.4 -- OpenShift CLI v4.5.4 +- OpenShift CLI 4.11.0 - ORAS CLI 0.13.0 - Vercel CLI 28.0.1 From 0794fd91bdada60b1b0d7992359f214394f9d42a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 16 Aug 2022 13:06:08 +0000 Subject: [PATCH 1403/3485] Updating readme file for win22 version 20220814.1 (#6078) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2022-Readme.md | 564 ++++++++++++++++--------------- 1 file changed, 295 insertions(+), 269 deletions(-) diff --git a/images/win/Windows2022-Readme.md b/images/win/Windows2022-Readme.md index da641b03488a..5fdcf69348f8 100644 --- a/images/win/Windows2022-Readme.md +++ b/images/win/Windows2022-Readme.md @@ -1,20 +1,19 @@ | Announcements | |-| | [[All OSs] Go version 1.16 will be removed on August, 15th](https://github.com/actions/runner-images/issues/6024) | -| ['virtual-environments' repository name will be changed to 'runner-images' on August, 8th](https://github.com/actions/runner-images/issues/5967) | | [[Windows] mongo service will be disabled by default on August, 8th](https://github.com/actions/runner-images/issues/5949) | | [[all OSs] Android NDK 21 will be replaced in favor of 25 on August, 1st](https://github.com/actions/runner-images/issues/5930) | *** # Microsoft Windows Server 2022 Datacenter -- OS Version: 10.0.20348 Build 825 -- Image Version: 20220808.1 +- OS Version: 10.0.20348 Build 887 +- Image Version: 20220814.1 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] ## Installed Software ### Language and Runtime -- Bash 4.4.23(1)-release +- Bash 5.1.16(1)-release - Go 1.17.13 - Julia 1.7.3 - Kotlin 1.7.10 @@ -31,11 +30,11 @@ - Helm 3.9.2 - Miniconda 4.12.0 (pre-installed on the image but not added to PATH) - NPM 8.11.0 -- NuGet 6.2.1.2 +- NuGet 6.3.0.131 - pip 22.2.2 (python 3.9) - Pipx 1.1.0 - RubyGems 3.2.33 -- Vcpkg (build from master \<a0454d6e1>) +- Vcpkg (build from master \<d293ac220>) - Yarn 1.22.19 #### Environment variables @@ -56,15 +55,15 @@ - Bazel 5.2.0 - Bazelisk 1.12.0 - Bicep 0.9.1 -- Cabal 3.6.2.0 +- Cabal 3.8.1.0 - CMake 3.24.0 - CodeQL Action Bundle 2.10.2 - Docker 20.10.7 - Docker Compose v1 1.29.2 - Docker Compose v2 2.9.0 - Docker-wincred 0.6.4 -- ghc 9.2.4 -- Git 2.37.1.windows.1 +- ghc 9.4.1 +- Git 2.37.2.windows.2 - Git LFS 3.2.0 - InnoSetup 6.2.1 - jq 1.6 @@ -90,18 +89,18 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.124 -- AWS CLI 2.7.21 +- AWS CLI 2.7.22 - AWS SAM CLI 1.53.0 - AWS Session Manager CLI 1.2.339.0 - Azure CLI 2.39.0 - Azure DevOps CLI extension 0.25.0 -- GitHub CLI 2.14.3 +- GitHub CLI 2.14.4 - Hub CLI 2.14.2 ### Rust Tools -- Cargo 1.62.1 -- Rust 1.62.1 -- Rustdoc 1.62.1 +- Cargo 1.63.0 +- Rust 1.63.0 +- Rustdoc 1.63.0 - Rustup 1.25.1 #### Packages @@ -109,18 +108,18 @@ - cargo-audit 0.17.0 - cargo-outdated 0.11.1 - cbindgen 0.24.3 -- Clippy 0.1.62 -- Rustfmt 1.4.38 +- Clippy 0.1.63 +- Rustfmt 1.5.1 ### Browsers and webdrivers - Google Chrome 104.0.5112.81 - Chrome Driver 104.0.5112.79 -- Microsoft Edge 104.0.1293.47 -- Microsoft Edge Driver 104.0.1293.47 -- Mozilla Firefox 103.0.1 +- Microsoft Edge 104.0.1293.54 +- Microsoft Edge Driver 104.0.1293.54 +- Mozilla Firefox 103.0.2 - Gecko Driver 0.31.0 - IE Driver 3.150.1.1 -- Selenium server 4.3.0 +- Selenium server 4.4.0 #### Environment variables | Name | Value | @@ -131,11 +130,11 @@ | SELENIUM_JAR_PATH | C:\selenium\selenium-server.jar | ### Java -| Version | Vendor | Environment Variable | -| --------------------- | --------------- | -------------------- | -| 8.0.345+1.1 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | -| 11.0.16+8 | Eclipse Temurin | JAVA_HOME_11_X64 | -| 17.0.4+8 | Eclipse Temurin | JAVA_HOME_17_X64 | +| Version | Vendor | Environment Variable | +| ------------------- | --------------- | -------------------- | +| 8.0.345+1 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | +| 11.0.16+8 | Eclipse Temurin | JAVA_HOME_11_X64 | +| 17.0.4+8 | Eclipse Temurin | JAVA_HOME_17_X64 | ### Shells | Name | Target | @@ -158,7 +157,6 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Go | Version | Architecture | Environment Variable | | ------- | ------------ | -------------------- | -| 1.16.15 | x64 | GOROOT_1_16_X64 | | 1.17.13 (Default) | x64 | GOROOT_1_17_X64 | | 1.18.5 | x64 | GOROOT_1_18_X64 | | 1.19.0 | x64 | GOROOT_1_19_X64 | @@ -198,7 +196,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Property | Value | | -------------------- | ------------------------------------------------------------------------------------------------------------------------------------ | | ServiceName | postgresql-x64-14 | -| Version | 14.4 | +| Version | 14.5 | | ServiceStatus | Stopped | | ServiceStartType | Disabled | | EnvironmentVariables | PGBIN=C:\Program Files\PostgreSQL\14\bin <br> PGDATA=C:\Program Files\PostgreSQL\14\data <br> PGROOT=C:\Program Files\PostgreSQL\14 | @@ -227,247 +225,275 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Visual Studio Enterprise 2022 | Name | Version | Path | | ----------------------------- | -------------- | -------------------------------------------------------- | -| Visual Studio Enterprise 2022 | 17.2.32630.192 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | +| Visual Studio Enterprise 2022 | 17.3.32804.467 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | #### Workloads, components and extensions: | Package | Version | | ------------------------------------------------------------------------- | -------------- | -| Component.Android.NDK.R21E | 17.2.32408.312 | -| Component.Android.SDK.MAUI | 17.2.32408.312 | -| Component.Android.SDK25.Private | 17.2.32408.312 | +| android | 32.0.448.0 | +| Component.Android.NDK.R21E | 17.3.32708.82 | +| Component.Android.SDK.MAUI | 17.3.32708.82 | +| Component.Android.SDK25.Private | 17.3.32708.82 | | Component.Ant | 1.9.3.8 | -| Component.Dotfuscator | 17.2.32408.312 | -| Component.Linux.CMake | 17.2.32408.312 | -| Component.MDD.Android | 17.2.32408.312 | -| Component.MDD.Linux | 17.2.32408.312 | -| Component.MDD.Linux.GCC.arm | 17.2.32408.312 | +| Component.Dotfuscator | 17.3.32708.82 | +| Component.Linux.CMake | 17.3.32708.82 | +| Component.MDD.Android | 17.3.32708.82 | +| Component.MDD.Linux | 17.3.32708.82 | +| Component.MDD.Linux.GCC.arm | 17.3.32708.82 | | Component.Microsoft.VisualStudio.LiveShare.2022 | 1.0.5545 | -| Component.Microsoft.VisualStudio.RazorExtension | 17.2.32408.312 | -| Component.Microsoft.VisualStudio.Web.AzureFunctions | 17.2.32408.312 | -| Component.Microsoft.Web.LibraryManager | 17.2.32408.312 | -| Component.Microsoft.WebTools.BrowserLink.WebLivePreview | 17.2.91.23537 | -| Component.Microsoft.Windows.CppWinRT | 2.0.210806.1 | -| Component.OpenJDK | 17.2.32408.312 | -| Component.UnityEngine.x64 | 17.2.32408.312 | -| Component.Unreal | 17.2.32408.312 | -| Component.Unreal.Android | 17.2.32408.312 | +| Component.Microsoft.VisualStudio.RazorExtension | 17.3.32708.82 | +| Component.Microsoft.VisualStudio.Web.AzureFunctions | 17.3.32708.82 | +| Component.Microsoft.Web.LibraryManager | 17.3.32708.82 | +| Component.Microsoft.WebTools.BrowserLink.WebLivePreview | 17.3.58.47684 | +| Component.OpenJDK | 17.3.32708.82 | +| Component.UnityEngine.x64 | 17.3.32708.82 | +| Component.Unreal | 17.3.32708.82 | +| Component.Unreal.Android | 17.3.32708.82 | +| Component.Unreal.Ide | 17.3.32708.82 | | Component.VSInstallerProjects2022 | 2.0.0 | | Component.WixToolset.VisualStudioExtension.Dev17 | 1.0.0.18 | | Component.WixToolset.VisualStudioExtension.Schemas3 | 1.0.0.18 | | Component.WixToolset.VisualStudioExtension.Schemas4 | 1.0.0.18 | -| Component.Xamarin | 17.2.32408.312 | -| Component.Xamarin.RemotedSimulator | 17.2.32408.312 | -| Microsoft.Component.Azure.DataLake.Tools | 17.2.32408.312 | -| Microsoft.Component.ClickOnce | 17.2.32408.312 | -| Microsoft.Component.CodeAnalysis.SDK | 17.2.32408.312 | -| Microsoft.Component.MSBuild | 17.2.32408.312 | -| Microsoft.Component.NetFX.Native | 17.2.32408.312 | -| Microsoft.Component.PythonTools | 17.2.32408.312 | -| Microsoft.Component.PythonTools.Web | 17.2.32408.312 | -| Microsoft.Component.VC.Runtime.UCRTSDK | 17.2.32408.312 | -| Microsoft.ComponentGroup.Blend | 17.2.32408.312 | -| Microsoft.ComponentGroup.ClickOnce.Publish | 17.2.32408.312 | -| Microsoft.Net.Component.4.5.2.TargetingPack | 17.2.32408.312 | -| Microsoft.Net.Component.4.6.2.TargetingPack | 17.2.32408.312 | -| Microsoft.Net.Component.4.6.TargetingPack | 17.2.32408.312 | -| Microsoft.Net.Component.4.7.1.TargetingPack | 17.2.32408.312 | -| Microsoft.Net.Component.4.7.2.TargetingPack | 17.2.32408.312 | -| Microsoft.Net.Component.4.7.TargetingPack | 17.2.32408.312 | -| Microsoft.Net.Component.4.8.SDK | 17.2.32408.312 | -| Microsoft.Net.Component.4.8.TargetingPack | 17.2.32408.312 | -| Microsoft.Net.ComponentGroup.4.8.DeveloperTools | 17.2.32408.312 | -| Microsoft.Net.ComponentGroup.DevelopmentPrerequisites | 17.2.32408.312 | -| Microsoft.Net.ComponentGroup.TargetingPacks.Common | 17.2.32408.312 | -| microsoft.net.runtime.mono.tooling | 6.0.722.32202 | +| Component.Xamarin.RemotedSimulator | 17.3.32708.82 | +| ios | 15.4.446.446 | +| maccatalyst | 15.4.446.446 | +| maui.android | 6.0.486.0 | +| maui.blazor | 6.0.486.0 | +| maui.core | 6.0.486.0 | +| maui.ios | 6.0.486.0 | +| maui.maccatalyst | 6.0.486.0 | +| maui.windows | 6.0.486.0 | +| Microsoft.Component.Azure.DataLake.Tools | 17.3.32708.82 | +| Microsoft.Component.ClickOnce | 17.3.32708.82 | +| Microsoft.Component.CodeAnalysis.SDK | 17.3.32708.82 | +| Microsoft.Component.MSBuild | 17.3.32708.82 | +| Microsoft.Component.NetFX.Native | 17.3.32708.82 | +| Microsoft.Component.PythonTools | 17.3.32708.82 | +| Microsoft.Component.PythonTools.Web | 17.3.32708.82 | +| Microsoft.Component.VC.Runtime.UCRTSDK | 17.3.32708.82 | +| Microsoft.ComponentGroup.Blend | 17.3.32708.82 | +| Microsoft.ComponentGroup.ClickOnce.Publish | 17.3.32708.82 | +| Microsoft.Net.Component.4.5.2.TargetingPack | 17.3.32708.82 | +| Microsoft.Net.Component.4.6.2.TargetingPack | 17.3.32708.82 | +| Microsoft.Net.Component.4.6.TargetingPack | 17.3.32708.82 | +| Microsoft.Net.Component.4.7.1.TargetingPack | 17.3.32708.82 | +| Microsoft.Net.Component.4.7.2.TargetingPack | 17.3.32708.82 | +| Microsoft.Net.Component.4.7.TargetingPack | 17.3.32708.82 | +| Microsoft.Net.Component.4.8.SDK | 17.3.32708.82 | +| Microsoft.Net.Component.4.8.TargetingPack | 17.3.32708.82 | +| Microsoft.Net.ComponentGroup.4.8.DeveloperTools | 17.3.32708.82 | +| Microsoft.Net.ComponentGroup.DevelopmentPrerequisites | 17.3.32708.82 | +| Microsoft.Net.ComponentGroup.TargetingPacks.Common | 17.3.32708.82 | +| microsoft.net.runtime.android | 6.0.822.36306 | +| microsoft.net.runtime.android.aot | 6.0.822.36306 | +| microsoft.net.runtime.ios | 6.0.822.36306 | +| microsoft.net.runtime.maccatalyst | 6.0.822.36306 | +| microsoft.net.runtime.mono.tooling | 6.0.822.36306 | | microsoft.net.sdk.emscripten | 6.0.6.16102 | -| Microsoft.NetCore.Component.DevelopmentTools | 17.2.32408.312 | -| Microsoft.NetCore.Component.Runtime.6.0 | 17.2.32630.192 | -| Microsoft.NetCore.Component.SDK | 17.2.32630.192 | -| Microsoft.NetCore.Component.Web | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.AppInsights.Tools | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.AspNet | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.AspNet45 | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.Azure.AuthoringTools | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.Azure.ClientLibs | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.Azure.Compute.Emulator | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.Azure.Powershell | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.Azure.ResourceManager.Tools | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.Azure.ServiceFabric.Tools | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.Azure.Waverton | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.Azure.Waverton.BuildTools | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.ClassDesigner | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.CodeMap | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.Common.Azure.Tools | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.CoreEditor | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.Debugger.JustInTime | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.Debugger.Snapshot | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.DiagnosticTools | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.DockerTools | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.DotNetModelBuilder | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.DslTools | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.Embedded | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.EntityFramework | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.FSharp | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.FSharp.Desktop | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.FSharp.WebTemplates | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.GraphDocument | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.Graphics | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.Graphics.Tools | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.IISExpress | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.IntelliCode | 17.2.32414.121 | -| Microsoft.VisualStudio.Component.IntelliTrace.FrontEnd | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.JavaScript.Diagnostics | 17.2.32602.177 | -| Microsoft.VisualStudio.Component.JavaScript.TypeScript | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.LinqToSql | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.LiveUnitTesting | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.ManagedDesktop.Core | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.ManagedDesktop.Prerequisites | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.Merq | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.MonoDebugger | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.MSODBC.SQL | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.MSSQL.CMDLnUtils | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.Node.Tools | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.NuGet | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.NuGet.BuildTools | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.PortableLibrary | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.Roslyn.Compiler | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.Roslyn.LanguageServices | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.Sharepoint.Tools | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.SQL.CLR | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.SQL.DataSources | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.SQL.LocalDB.Runtime | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.SQL.SSDT | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.TeamOffice | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.TestTools.CodedUITest | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.TestTools.WebLoadTest | 17.2.32602.177 | -| Microsoft.VisualStudio.Component.TextTemplating | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.TypeScript.TSServer | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.Unity | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.UWP.VC.ARM64 | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.UWP.VC.ARM64EC | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM.Spectre | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM64 | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM64.Spectre | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.Spectre | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.Spectre | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64 | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64.Spectre | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.VC.14.32.17.2.ARM | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.VC.14.32.17.2.ARM.Spectre | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.VC.14.32.17.2.ARM64 | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.VC.14.32.17.2.ARM64.Spectre | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.VC.14.32.17.2.ATL | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.VC.14.32.17.2.ATL.ARM | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.VC.14.32.17.2.ATL.ARM.Spectre | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.VC.14.32.17.2.ATL.ARM64 | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.VC.14.32.17.2.ATL.ARM64.Spectre | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.VC.14.32.17.2.ATL.Spectre | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.VC.14.32.17.2.MFC | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.VC.14.32.17.2.MFC.ARM | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.VC.14.32.17.2.MFC.ARM.Spectre | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.VC.14.32.17.2.MFC.ARM64 | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.VC.14.32.17.2.MFC.ARM64.Spectre | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.VC.14.32.17.2.MFC.Spectre | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.VC.14.32.17.2.x86.x64 | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.VC.14.32.17.2.x86.x64.Spectre | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.VC.ASAN | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.VC.ATL | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.VC.ATL.ARM | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.VC.ATL.ARM.Spectre | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.VC.ATL.ARM64 | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.VC.ATL.ARM64.Spectre | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.VC.ATL.ARM64EC | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.VC.ATL.ARM64EC.Spectre | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.VC.ATL.Spectre | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.VC.ATLMFC | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.VC.ATLMFC.Spectre | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.VC.CLI.Support | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.VC.CMake.Project | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.VC.CoreBuildTools | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.VC.CoreIde | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.VC.DiagnosticTools | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.VC.Llvm.Clang | 17.2.32422.2 | -| Microsoft.VisualStudio.Component.VC.Llvm.ClangToolset | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.VC.MFC.ARM | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.VC.MFC.ARM.Spectre | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.VC.MFC.ARM64 | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.VC.MFC.ARM64.Spectre | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.VC.MFC.ARM64EC | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.VC.MFC.ARM64EC.Spectre | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.VC.Modules.x86.x64 | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.VC.Redist.14.Latest | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.VC.Redist.MSM | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.VC.Runtimes.ARM.Spectre | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.VC.Runtimes.ARM64.Spectre | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.VC.Runtimes.ARM64EC.Spectre | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.VC.Runtimes.x86.x64.Spectre | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.VC.TestAdapterForBoostTest | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.VC.TestAdapterForGoogleTest | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.VC.Tools.ARM | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.VC.Tools.ARM64 | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.VC.Tools.ARM64EC | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.VC.Tools.x86.x64 | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.VC.v141.ARM | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.VC.v141.ARM.Spectre | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.VC.v141.ARM64 | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.VC.v141.ARM64.Spectre | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.VC.v141.ATL | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.VC.v141.ATL.Spectre | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.VC.v141.MFC | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.VC.v141.MFC.Spectre | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.VC.v141.x86.x64 | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.VC.v141.x86.x64.Spectre | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.VSSDK | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.Wcf.Tooling | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.Web | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.WebDeploy | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.Windows10SDK | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.Windows10SDK.19041 | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.Windows10SDK.20348 | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.Windows11SDK.22000 | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.Windows11SDK.22621 | 17.2.32526.322 | -| Microsoft.VisualStudio.Component.Workflow | 17.2.32408.312 | -| Microsoft.VisualStudio.Component.WslDebugging | 17.2.32408.312 | -| Microsoft.VisualStudio.ComponentGroup.ArchitectureTools.Native | 17.2.32408.312 | -| Microsoft.VisualStudio.ComponentGroup.Azure.CloudServices | 17.2.32408.312 | -| Microsoft.VisualStudio.ComponentGroup.Azure.Prerequisites | 17.2.32408.312 | -| Microsoft.VisualStudio.ComponentGroup.Azure.ResourceManager.Tools | 17.2.32408.312 | -| Microsoft.VisualStudio.ComponentGroup.AzureFunctions | 17.2.32408.312 | -| Microsoft.VisualStudio.ComponentGroup.MSIX.Packaging | 17.2.32408.312 | -| Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core | 17.2.32408.312 | -| Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Llvm.Clang | 17.2.32422.2 | -| Microsoft.VisualStudio.ComponentGroup.UWP.NetCoreAndStandard | 17.2.32408.312 | -| Microsoft.VisualStudio.ComponentGroup.UWP.Support | 17.2.32408.312 | -| Microsoft.VisualStudio.ComponentGroup.UWP.VC.v142 | 17.2.32408.312 | -| Microsoft.VisualStudio.ComponentGroup.UWP.Xamarin | 17.2.32408.312 | -| Microsoft.VisualStudio.ComponentGroup.VC.Tools.142.x86.x64 | 17.2.32408.312 | -| Microsoft.VisualStudio.ComponentGroup.VisualStudioExtension.Prerequisites | 17.2.32408.312 | -| Microsoft.VisualStudio.ComponentGroup.Web | 17.2.32408.312 | -| Microsoft.VisualStudio.ComponentGroup.Web.CloudTools | 17.2.32408.312 | -| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions | 17.2.32408.312 | -| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.CMake | 17.2.32408.312 | -| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.TemplateEngine | 17.2.32408.312 | -| Microsoft.VisualStudio.Workload.Azure | 17.2.32408.312 | -| Microsoft.VisualStudio.Workload.CoreEditor | 17.2.32408.312 | -| Microsoft.VisualStudio.Workload.Data | 17.2.32408.312 | -| Microsoft.VisualStudio.Workload.DataScience | 17.2.32408.312 | -| Microsoft.VisualStudio.Workload.ManagedDesktop | 17.2.32408.312 | -| Microsoft.VisualStudio.Workload.ManagedGame | 17.2.32408.312 | -| Microsoft.VisualStudio.Workload.NativeCrossPlat | 17.2.32408.312 | -| Microsoft.VisualStudio.Workload.NativeDesktop | 17.2.32526.322 | -| Microsoft.VisualStudio.Workload.NativeGame | 17.2.32526.322 | -| Microsoft.VisualStudio.Workload.NativeMobile | 17.2.32408.312 | -| Microsoft.VisualStudio.Workload.NetCrossPlat | 17.2.32503.295 | -| Microsoft.VisualStudio.Workload.NetWeb | 17.2.32408.312 | -| Microsoft.VisualStudio.Workload.Node | 17.2.32408.312 | -| Microsoft.VisualStudio.Workload.Office | 17.2.32408.312 | -| Microsoft.VisualStudio.Workload.Python | 17.2.32408.312 | -| Microsoft.VisualStudio.Workload.Universal | 17.2.32526.322 | -| Microsoft.VisualStudio.Workload.VisualStudioExtension | 17.2.32408.312 | -| wasm.tools | 6.0.722.32202 | +| Microsoft.NetCore.Component.DevelopmentTools | 17.3.32708.82 | +| Microsoft.NetCore.Component.Runtime.6.0 | 17.3.32803.143 | +| Microsoft.NetCore.Component.SDK | 17.3.32803.143 | +| Microsoft.NetCore.Component.Web | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.AppInsights.Tools | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.AspNet | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.AspNet45 | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.Azure.AuthoringTools | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.Azure.ClientLibs | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.Azure.Compute.Emulator | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.Azure.Powershell | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.Azure.ResourceManager.Tools | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.Azure.ServiceFabric.Tools | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.Azure.Waverton | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.Azure.Waverton.BuildTools | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.ClassDesigner | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.CodeMap | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.Common.Azure.Tools | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.CoreEditor | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.Debugger.JustInTime | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.Debugger.Snapshot | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.DiagnosticTools | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.DockerTools | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.DotNetModelBuilder | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.DslTools | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.Embedded | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.EntityFramework | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.FSharp | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.FSharp.Desktop | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.FSharp.WebTemplates | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.GraphDocument | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.Graphics | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.Graphics.Tools | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.IISExpress | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.IntelliCode | 17.3.32804.24 | +| Microsoft.VisualStudio.Component.IntelliTrace.FrontEnd | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.JavaScript.Diagnostics | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.JavaScript.TypeScript | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.LinqToSql | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.LiveUnitTesting | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.ManagedDesktop.Core | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.ManagedDesktop.Prerequisites | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.Merq | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.MonoDebugger | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.MSODBC.SQL | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.MSSQL.CMDLnUtils | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.Node.Tools | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.NuGet | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.NuGet.BuildTools | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.PortableLibrary | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.Roslyn.Compiler | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.Roslyn.LanguageServices | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.Sharepoint.Tools | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.SQL.CLR | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.SQL.DataSources | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.SQL.LocalDB.Runtime | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.SQL.SSDT | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.TeamOffice | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.TestTools.CodedUITest | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.TestTools.WebLoadTest | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.TextTemplating | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.TypeScript.TSServer | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.Unity | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.UWP.VC.ARM64 | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.UWP.VC.ARM64EC | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM.Spectre | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM64 | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM64.Spectre | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM.Spectre | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM64 | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM64.Spectre | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.Spectre | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.ARM | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.ARM.Spectre | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.ARM64 | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.ARM64.Spectre | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.Spectre | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64 | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64.Spectre | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.VC.14.32.17.2.ARM | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.VC.14.32.17.2.ARM.Spectre | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.VC.14.32.17.2.ARM64 | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.VC.14.32.17.2.ARM64.Spectre | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.VC.14.32.17.2.ATL | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.VC.14.32.17.2.ATL.ARM | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.VC.14.32.17.2.ATL.ARM.Spectre | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.VC.14.32.17.2.ATL.ARM64 | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.VC.14.32.17.2.ATL.ARM64.Spectre | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.VC.14.32.17.2.ATL.Spectre | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.VC.14.32.17.2.MFC | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.VC.14.32.17.2.MFC.ARM | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.VC.14.32.17.2.MFC.ARM.Spectre | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.VC.14.32.17.2.MFC.ARM64 | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.VC.14.32.17.2.MFC.ARM64.Spectre | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.VC.14.32.17.2.MFC.Spectre | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.VC.14.32.17.2.x86.x64 | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.VC.14.32.17.2.x86.x64.Spectre | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.VC.ASAN | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.VC.ATL | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.VC.ATL.ARM | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.VC.ATL.ARM.Spectre | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.VC.ATL.ARM64 | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.VC.ATL.ARM64.Spectre | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.VC.ATL.ARM64EC | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.VC.ATL.ARM64EC.Spectre | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.VC.ATL.Spectre | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.VC.ATLMFC | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.VC.ATLMFC.Spectre | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.VC.CLI.Support | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.VC.CMake.Project | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.VC.CoreIde | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.VC.DiagnosticTools | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.VC.Llvm.Clang | 17.3.32714.208 | +| Microsoft.VisualStudio.Component.VC.Llvm.ClangToolset | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.VC.MFC.ARM | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.VC.MFC.ARM.Spectre | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.VC.MFC.ARM64 | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.VC.MFC.ARM64.Spectre | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.VC.MFC.ARM64EC | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.VC.MFC.ARM64EC.Spectre | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.VC.Modules.x86.x64 | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.VC.Redist.14.Latest | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.VC.Redist.MSM | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.VC.Runtimes.ARM.Spectre | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.VC.Runtimes.ARM64.Spectre | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.VC.Runtimes.ARM64EC.Spectre | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.VC.Runtimes.x86.x64.Spectre | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.VC.TestAdapterForBoostTest | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.VC.TestAdapterForGoogleTest | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.VC.Tools.ARM | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.VC.Tools.ARM64 | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.VC.Tools.ARM64EC | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.VC.Tools.x86.x64 | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.VC.v141.ARM | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.VC.v141.ARM.Spectre | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.VC.v141.ARM64 | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.VC.v141.ARM64.Spectre | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.VC.v141.ATL | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.VC.v141.ATL.Spectre | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.VC.v141.MFC | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.VC.v141.MFC.Spectre | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.VC.v141.x86.x64 | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.VC.v141.x86.x64.Spectre | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.VSSDK | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.Wcf.Tooling | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.Web | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.WebDeploy | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.Windows10SDK | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.Windows10SDK.19041 | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.Windows10SDK.20348 | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.Windows11SDK.22000 | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.Windows11SDK.22621 | 17.3.32720.241 | +| Microsoft.VisualStudio.Component.Workflow | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.WslDebugging | 17.3.32708.82 | +| Microsoft.VisualStudio.ComponentGroup.ArchitectureTools.Native | 17.3.32708.82 | +| Microsoft.VisualStudio.ComponentGroup.Azure.CloudServices | 17.3.32708.82 | +| Microsoft.VisualStudio.ComponentGroup.Azure.Prerequisites | 17.3.32708.82 | +| Microsoft.VisualStudio.ComponentGroup.Azure.ResourceManager.Tools | 17.3.32708.82 | +| Microsoft.VisualStudio.ComponentGroup.AzureFunctions | 17.3.32708.82 | +| Microsoft.VisualStudio.ComponentGroup.Maui.All | 17.3.32708.82 | +| Microsoft.VisualStudio.ComponentGroup.Maui.Android | 17.3.32708.82 | +| Microsoft.VisualStudio.ComponentGroup.Maui.Blazor | 17.3.32708.82 | +| Microsoft.VisualStudio.ComponentGroup.Maui.iOS | 17.3.32708.82 | +| Microsoft.VisualStudio.ComponentGroup.Maui.MacCatalyst | 17.3.32708.82 | +| Microsoft.VisualStudio.ComponentGroup.Maui.Shared | 17.3.32708.82 | +| Microsoft.VisualStudio.ComponentGroup.Maui.Windows | 17.3.32708.82 | +| Microsoft.VisualStudio.ComponentGroup.MSIX.Packaging | 17.3.32708.82 | +| Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core | 17.3.32708.82 | +| Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Llvm.Clang | 17.3.32714.208 | +| Microsoft.VisualStudio.ComponentGroup.UWP.NetCoreAndStandard | 17.3.32708.82 | +| Microsoft.VisualStudio.ComponentGroup.UWP.Support | 17.3.32708.82 | +| Microsoft.VisualStudio.ComponentGroup.UWP.VC.v142 | 17.3.32708.82 | +| Microsoft.VisualStudio.ComponentGroup.UWP.Xamarin | 17.3.32708.82 | +| Microsoft.VisualStudio.ComponentGroup.VC.Tools.142.x86.x64 | 17.3.32708.82 | +| Microsoft.VisualStudio.ComponentGroup.VisualStudioExtension.Prerequisites | 17.3.32708.82 | +| Microsoft.VisualStudio.ComponentGroup.Web | 17.3.32708.82 | +| Microsoft.VisualStudio.ComponentGroup.Web.CloudTools | 17.3.32708.82 | +| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions | 17.3.32708.82 | +| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.CMake | 17.3.32708.82 | +| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.TemplateEngine | 17.3.32708.82 | +| Microsoft.VisualStudio.Workload.Azure | 17.3.32708.82 | +| Microsoft.VisualStudio.Workload.CoreEditor | 17.3.32708.82 | +| Microsoft.VisualStudio.Workload.Data | 17.3.32708.82 | +| Microsoft.VisualStudio.Workload.DataScience | 17.3.32708.82 | +| Microsoft.VisualStudio.Workload.ManagedDesktop | 17.3.32728.75 | +| Microsoft.VisualStudio.Workload.ManagedGame | 17.3.32708.82 | +| Microsoft.VisualStudio.Workload.NativeCrossPlat | 17.3.32708.82 | +| Microsoft.VisualStudio.Workload.NativeDesktop | 17.3.32708.82 | +| Microsoft.VisualStudio.Workload.NativeGame | 17.3.32708.82 | +| Microsoft.VisualStudio.Workload.NativeMobile | 17.3.32708.82 | +| Microsoft.VisualStudio.Workload.NetCrossPlat | 17.3.32708.82 | +| Microsoft.VisualStudio.Workload.NetWeb | 17.3.32728.75 | +| Microsoft.VisualStudio.Workload.Node | 17.3.32708.82 | +| Microsoft.VisualStudio.Workload.Office | 17.3.32708.82 | +| Microsoft.VisualStudio.Workload.Python | 17.3.32708.82 | +| Microsoft.VisualStudio.Workload.Universal | 17.3.32708.82 | +| Microsoft.VisualStudio.Workload.VisualStudioExtension | 17.3.32708.82 | +| runtimes.ios | 6.0.822.36306 | +| runtimes.maccatalyst | 6.0.822.36306 | +| wasm.tools | 6.0.822.36306 | | ProBITools.MicrosoftAnalysisServicesModelingProjects2022 | 3.0.4 | | ProBITools.MicrosoftReportProjectsforVisualStudio2022 | 3.0.1 | | VisualStudioClient.MicrosoftVisualStudio2022InstallerProjects | 2.0.0 | @@ -498,17 +524,17 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### .NET Core SDK `Location C:\Program Files\dotnet\sdk` -- 3.1.120 3.1.202 3.1.302 3.1.421 5.0.104 5.0.214 5.0.303 5.0.408 6.0.302 +- 3.1.120 3.1.202 3.1.302 3.1.422 5.0.104 5.0.214 5.0.303 5.0.408 6.0.400 ### .NET Core Runtime `Location: C:\Program Files\dotnet\shared\Microsoft.AspNetCore.App` -- 3.1.4 3.1.6 3.1.20 3.1.26 3.1.27 5.0.4 5.0.9 5.0.17 6.0.6 6.0.7 +- 3.1.4 3.1.6 3.1.20 3.1.28 5.0.4 5.0.9 5.0.17 6.0.8 `Location: C:\Program Files\dotnet\shared\Microsoft.NETCore.App` -- 3.1.4 3.1.6 3.1.20 3.1.26 3.1.27 5.0.4 5.0.9 5.0.17 6.0.6 6.0.7 +- 3.1.4 3.1.6 3.1.20 3.1.28 5.0.4 5.0.9 5.0.17 6.0.8 `Location: C:\Program Files\dotnet\shared\Microsoft.WindowsDesktop.App` -- 3.1.4 3.1.6 3.1.20 3.1.27 5.0.4 5.0.9 5.0.17 6.0.7 +- 3.1.4 3.1.6 3.1.20 3.1.28 5.0.4 5.0.9 5.0.17 6.0.8 ### .NET Framework `Type: Developer Pack` @@ -519,7 +545,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - nbgv 3.5.109+bdfbd7dea6 ### PowerShell Tools -- PowerShell 7.2.5 +- PowerShell 7.2.6 #### Azure Powershell Modules | Module | Version | Path | @@ -536,7 +562,7 @@ All other versions are saved but not installed. #### Powershell Modules | Module | Version | | ------------------ | ---------------- | -| AWSPowerShell | 4.1.141 | +| AWSPowerShell | 4.1.146 | | DockerMsftProvider | 1.0.0.8 | | MarkdownPS | 1.9 | | Microsoft.Graph | 1.11.0 | @@ -551,7 +577,7 @@ All other versions are saved but not installed. | Package Name | Version | | -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------ | | Android Command Line Tools | 7.0 | -| Android Emulator | 31.2.10 | +| Android Emulator | 31.3.10 | | Android SDK Build-tools | 33.0.0<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | | Android SDK Platforms | android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | | Android SDK Platform-Tools | 33.0.2 | @@ -575,10 +601,10 @@ All other versions are saved but not installed. ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2022 | sha256:0ea7d5c616349fdb77a6cf13c6392277081fd6816ca922bed69083f395f7130b | 2022-07-12 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2022 | sha256:ec79d74665ee8812e3f2bf29e352975a938f670b6ddf968df5b1becf9e6283ed | 2022-07-12 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:8180531d4ac52f7c5bb8dc2864639ebb053081335d3c0558abb021a237770895 | 2022-07-12 | -| mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:81f3d891826a99e3a5742df69dcb4e6e44e177f817a0527c2b8dd5ef3c9eeaa8 | 2022-07-04 | -| mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:ffa814c9dbae448ee8a4dd5415952b3124adf0964b8c7c761b82d1e95f6f0acf | 2022-07-04 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2022 | sha256:22486118e240e0f107ada5fac9f0fbdacb02e8b18f65b48552a0c0b0960a9002 | 2022-08-09 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2022 | sha256:2117f997785dbd6e3a42b22261434dc8b0d082ed634a4edda9d1acd71b174187 | 2022-08-09 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:edc6558e8cd6f306854517048ef11a05129d3097f1e9f61b48c906ddc0d478cc | 2022-08-09 | +| mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:5f57ddc9a47d079398506a7613c8a3cb8b5bf3f97040f590871b61a15bd5a36a | 2022-08-06 | +| mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:35c3cb29ef2c9f05e36070d04c79d7fc861c035fa5df2df64ae607a276db42c6 | 2022-08-06 | From 2258424a3389b233c2b688ea735cc3b29ea4e814 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 16 Aug 2022 13:28:06 +0000 Subject: [PATCH 1404/3485] Updating readme file for win19 version 20220814.1 (#6079) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2019-Readme.md | 120 +++++++++++++++---------------- 1 file changed, 59 insertions(+), 61 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index 619dd36d112c..b5b9d74480da 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -1,28 +1,26 @@ | Announcements | |-| -| ['virtual-environments' repository name will be changed to 'runner-images' on August, 8th](https://github.com/actions/virtual-environments/issues/5967) | -| [[Windows] mongo service will be disabled by default on August, 8th](https://github.com/actions/virtual-environments/issues/5949) | -| [[all OSs] Android NDK 21 will be replaced in favor of 25 on August, 1st](https://github.com/actions/virtual-environments/issues/5930) | -| [[all OSs] Android ndk-bundle along with old NDK versions will be deprecated on July, 24](https://github.com/actions/virtual-environments/issues/5879) | -| [[Azure DevOps] Windows-2016 environment removal postponed until July 31, 2022](https://github.com/actions/virtual-environments/issues/5403) | +| [[All OSs] Go version 1.16 will be removed on August, 15th](https://github.com/actions/runner-images/issues/6024) | +| [[Windows] mongo service will be disabled by default on August, 8th](https://github.com/actions/runner-images/issues/5949) | +| [[all OSs] Android NDK 21 will be replaced in favor of 25 on August, 1st](https://github.com/actions/runner-images/issues/5930) | *** # Microsoft Windows Server 2019 Datacenter -- OS Version: 10.0.17763 Build 3165 -- Image Version: 20220801.1 +- OS Version: 10.0.17763 Build 3287 +- Image Version: 20220814.1 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] ## Installed Software ### Language and Runtime -- Bash 4.4.23(1)-release -- Go 1.17.12 +- Bash 5.1.16(1)-release +- Go 1.17.13 - Julia 1.7.3 - Kotlin 1.7.10 - LLVM 14.0.6 - Node 16.16.0 - Perl 5.32.1 -- PHP 8.1.8 +- PHP 8.1.9 - Python 3.7.9 - Ruby 2.5.9p229 @@ -32,11 +30,11 @@ - Helm 3.9.2 - Miniconda 4.12.0 (pre-installed on the image but not added to PATH) - NPM 8.11.0 -- NuGet 6.2.1.2 -- pip 22.2.1 (python 3.7) +- NuGet 6.3.0.131 +- pip 22.2.2 (python 3.7) - Pipx 1.1.0 - RubyGems 2.7.6.3 -- Vcpkg (build from master \<48369f2a2>) +- Vcpkg (build from master \<d293ac220>) - Yarn 1.22.19 #### Environment variables @@ -57,29 +55,29 @@ - azcopy 10.16.0 - Bazel 5.2.0 - Bazelisk 1.12.0 -- Bicep 0.8.9 -- Cabal 3.6.2.0 -- CMake 3.23.3 -- CodeQL Action Bundle 2.10.1 +- Bicep 0.9.1 +- Cabal 3.8.1.0 +- CMake 3.24.0 +- CodeQL Action Bundle 2.10.2 - Docker 20.10.7 - Docker Compose v1 1.29.2 - Docker Compose v2 2.9.0 - Docker-wincred 0.6.4 -- ghc 9.2.3 -- Git 2.37.1.windows.1 +- ghc 9.4.1 +- Git 2.37.2.windows.2 - Git LFS 3.2.0 -- Google Cloud SDK 395.0.0 +- Google Cloud SDK 397.0.0 - InnoSetup 6.2.1 - jq 1.6 - Kind 0.14.0 -- Kubectl 1.24.1 +- Kubectl 1.24.3 - Mercurial 5.0 - Mingw-w64 8.1.0 - Newman 5.3.2 - NSIS v3.08 - OpenSSL 1.1.1 - Packer 1.8.2 -- Parcel 2.6.2 +- Parcel 2.7.0 - Pulumi v3.37.2 - R 4.2.1 - Service Fabric SDK 9.0.1028.9590 @@ -94,19 +92,19 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.124 -- AWS CLI 2.7.20 +- AWS CLI 2.7.22 - AWS SAM CLI 1.53.0 - AWS Session Manager CLI 1.2.339.0 -- Azure CLI 2.38.0 +- Azure CLI 2.39.0 - Azure DevOps CLI extension 0.25.0 - Cloud Foundry CLI 6.53.0 -- GitHub CLI 2.14.3 +- GitHub CLI 2.14.4 - Hub CLI 2.14.2 ### Rust Tools -- Cargo 1.62.1 -- Rust 1.62.1 -- Rustdoc 1.62.1 +- Cargo 1.63.0 +- Rust 1.63.0 +- Rustdoc 1.63.0 - Rustup 1.25.1 #### Packages @@ -114,18 +112,18 @@ - cargo-audit 0.17.0 - cargo-outdated 0.11.1 - cbindgen 0.24.3 -- Clippy 0.1.62 -- Rustfmt 1.4.38 +- Clippy 0.1.63 +- Rustfmt 1.5.1 ### Browsers and webdrivers -- Google Chrome 103.0.5060.134 -- Chrome Driver 103.0.5060.134 -- Microsoft Edge 103.0.1264.77 -- Microsoft Edge Driver 103.0.1264.77 -- Mozilla Firefox 103.0.1 +- Google Chrome 104.0.5112.81 +- Chrome Driver 104.0.5112.79 +- Microsoft Edge 104.0.1293.54 +- Microsoft Edge Driver 104.0.1293.54 +- Mozilla Firefox 103.0.2 - Gecko Driver 0.31.0 - IE Driver 3.150.1.1 -- Selenium server 4.3.0 +- Selenium server 4.4.0 #### Environment variables | Name | Value | @@ -138,7 +136,7 @@ ### Java | Version | Vendor | Environment Variable | | ------------------- | --------------- | -------------------- | -| 8.0.342+7 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | +| 8.0.345+1 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | | 11.0.16+8 | Eclipse Temurin | JAVA_HOME_11_X64 | | 13.0.2+8.1 | Adopt OpenJDK | JAVA_HOME_13_X64 | | 17.0.4+8 | Eclipse Temurin | JAVA_HOME_17_X64 | @@ -167,9 +165,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Go | Version | Architecture | Environment Variable | | ------- | ------------ | -------------------- | -| 1.16.15 | x64 | GOROOT_1_16_X64 | -| 1.17.12 (Default) | x64 | GOROOT_1_17_X64 | -| 1.18.4 | x64 | GOROOT_1_18_X64 | +| 1.17.13 (Default) | x64 | GOROOT_1_17_X64 | +| 1.18.5 | x64 | GOROOT_1_18_X64 | +| 1.19.0 | x64 | GOROOT_1_19_X64 | #### Node | Version | Architecture | @@ -186,7 +184,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | 3.7.9 (Default) | x64, x86 | | 3.8.10 | x64, x86 | | 3.9.13 | x64, x86 | -| 3.10.5 | x64, x86 | +| 3.10.6 | x64, x86 | #### Ruby | Version | Architecture | @@ -212,7 +210,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Property | Value | | -------------------- | ------------------------------------------------------------------------------------------------------------------------------------ | | ServiceName | postgresql-x64-14 | -| Version | 14.4 | +| Version | 14.5 | | ServiceStatus | Stopped | | ServiceStartType | Disabled | | EnvironmentVariables | PGBIN=C:\Program Files\PostgreSQL\14\bin <br> PGDATA=C:\Program Files\PostgreSQL\14\data <br> PGROOT=C:\Program Files\PostgreSQL\14 | @@ -223,7 +221,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### MongoDB | Version | ServiceName | ServiceStatus | ServiceStartType | | -------- | ----------- | ------------- | ---------------- | -| 5.0.10.0 | MongoDB | Running | Automatic | +| 5.0.10.0 | MongoDB | Stopped | Disabled | ### Database tools - Azure CosmosDb Emulator 2.14.9.0 @@ -241,12 +239,12 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Visual Studio Enterprise 2019 | Name | Version | Path | | ----------------------------- | --------------- | -------------------------------------------------------------- | -| Visual Studio Enterprise 2019 | 16.11.32630.194 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | +| Visual Studio Enterprise 2019 | 16.11.32802.440 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | #### Workloads, components and extensions: | Package | Version | | ------------------------------------------------------------------------- | --------------- | -| Component.Android.NDK.R16B | 16.11.32629.160 | +| Component.Android.NDK.R16B | 16.11.32802.440 | | Component.Android.SDK25.Private | 16.0.28625.61 | | Component.Android.SDK30 | 16.10.31205.252 | | Component.Ant | 1.9.3.8 | @@ -301,9 +299,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.Net.ComponentGroup.DevelopmentPrerequisites | 16.3.29207.166 | | Microsoft.Net.ComponentGroup.TargetingPacks.Common | 16.0.28516.191 | | Microsoft.NetCore.Component.DevelopmentTools | 16.10.31303.231 | -| Microsoft.NetCore.Component.Runtime.3.1 | 16.11.32630.194 | -| Microsoft.NetCore.Component.Runtime.6.0 | 16.11.32630.194 | -| Microsoft.NetCore.Component.SDK | 16.11.32630.194 | +| Microsoft.NetCore.Component.Runtime.3.1 | 16.11.32802.440 | +| Microsoft.NetCore.Component.Runtime.6.0 | 16.11.32802.440 | +| Microsoft.NetCore.Component.SDK | 16.11.32802.440 | | Microsoft.NetCore.Component.Web | 16.10.31303.231 | | Microsoft.VisualStudio.Component.AppInsights.Tools | 16.5.29515.121 | | Microsoft.VisualStudio.Component.AspNet45 | 16.10.31205.252 | @@ -511,17 +509,17 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### .NET Core SDK `Location C:\Program Files\dotnet\sdk` -- 3.1.120 3.1.202 3.1.302 3.1.421 5.0.104 5.0.214 5.0.303 5.0.408 5.0.410 +- 3.1.120 3.1.202 3.1.302 3.1.422 5.0.104 5.0.214 5.0.303 5.0.408 5.0.411 ### .NET Core Runtime `Location: C:\Program Files\dotnet\shared\Microsoft.AspNetCore.App` -- 3.1.4 3.1.6 3.1.20 3.1.27 5.0.4 5.0.9 5.0.17 6.0.7 +- 3.1.4 3.1.6 3.1.20 3.1.28 5.0.4 5.0.9 5.0.17 6.0.8 `Location: C:\Program Files\dotnet\shared\Microsoft.NETCore.App` -- 3.1.4 3.1.6 3.1.20 3.1.27 5.0.4 5.0.9 5.0.17 6.0.7 +- 3.1.4 3.1.6 3.1.20 3.1.28 5.0.4 5.0.9 5.0.17 6.0.8 `Location: C:\Program Files\dotnet\shared\Microsoft.WindowsDesktop.App` -- 3.1.4 3.1.6 3.1.20 3.1.27 5.0.4 5.0.9 5.0.17 6.0.7 +- 3.1.4 3.1.6 3.1.20 3.1.28 5.0.4 5.0.9 5.0.17 6.0.8 ### .NET Framework `Type: Developer Pack` @@ -530,10 +528,10 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 4.8 ### .NET tools -- nbgv 3.5.108+6e793d63d3 +- nbgv 3.5.109+bdfbd7dea6 ### PowerShell Tools -- PowerShell 7.2.5 +- PowerShell 7.2.6 #### Azure Powershell Modules | Module | Version | Path | @@ -550,10 +548,10 @@ All other versions are saved but not installed. #### Powershell Modules | Module | Version | | ------------------ | ---------------- | -| AWSPowerShell | 4.1.137 | +| AWSPowerShell | 4.1.146 | | DockerMsftProvider | 1.0.0.8 | | MarkdownPS | 1.9 | -| Microsoft.Graph | 1.10.0 | +| Microsoft.Graph | 1.11.0 | | Pester | 3.4.0<br>5.3.3 | | PowerShellGet | 1.0.0.1<br>2.2.5 | | PSScriptAnalyzer | 1.20.0 | @@ -590,10 +588,10 @@ All other versions are saved but not installed. ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:4b76efcb8239febd279f6c6ec4e1b84ea9e0b7e516fd7aba5ca1fa7c26b4643d | 2022-07-12 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:efb1e706571bbf485e9625b74ee4a81ff0b2e49dec5fec78a775066112548a54 | 2022-07-12 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:2d315059f5704a09c75dc45e12352e6a53ad6a208fdd5e79c4005dcdac1ac1de | 2022-07-12 | -| mcr.microsoft.com/windows/nanoserver:1809 | sha256:935da2b4778f3a67b484abc895ccbeca847be1625ee0ff10345fa8060dd51e5a | 2022-07-06 | -| mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:26c6c296a4737ba478fe3c3e531b098f89b5562c40b416ba6fb8177ac462d1af | 2022-07-06 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:535e4f014434679c9d0257326214cb642c2bff9e57533ed911ffddc32ee3f9ee | 2022-08-09 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:30bd60e9e35abe424abaec9d802c1a38c8519496dca789333632357b98e33fad | 2022-08-09 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:c23dbc9c62503882128ca76917c074bf9f84a490195d76ef0f45a49091fca399 | 2022-08-09 | +| mcr.microsoft.com/windows/nanoserver:1809 | sha256:c827903a303cb7a76214adb4376e462a241b3cd763cb88655cd901c5a0e867a0 | 2022-08-06 | +| mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:8ca3aaeb91e7715a98a0769dc62ed69212aac3e0bbee12ffd13b5e36d992d127 | 2022-08-06 | From 2e8e30099e77728f0303acdaaa5a561999925fd8 Mon Sep 17 00:00:00 2001 From: Dusko Dobranic <101048884+ddobranic@users.noreply.github.com> Date: Tue, 16 Aug 2022 17:01:50 +0200 Subject: [PATCH 1405/3485] [all OSs] Change title in workflow log (#6058) * [all OSs] Change title in workflow log * Update images/linux/scripts/installers/preimagedata.sh Co-authored-by: Sam Tran <samvantran@github.com> * Resolve comments * Revert to 'Runner Image' and 'Image' labels Co-authored-by: Sam Tran <samvantran@github.com> --- images/linux/scripts/installers/preimagedata.sh | 4 ++-- images/macos/provision/configuration/preimagedata.sh | 4 ++-- images/win/scripts/Installers/Update-ImageData.ps1 | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/images/linux/scripts/installers/preimagedata.sh b/images/linux/scripts/installers/preimagedata.sh index 2d8d267512af..136bfefa8c55 100644 --- a/images/linux/scripts/installers/preimagedata.sh +++ b/images/linux/scripts/installers/preimagedata.sh @@ -19,8 +19,8 @@ cat <<EOF > $imagedata_file "detail": "${os_name}" }, { - "group": "Virtual Environment", - "detail": "Environment: ${image_label}\nVersion: ${image_version}\nIncluded Software: ${software_url}\nImage Release: ${releaseUrl}" + "group": "Runner Image", + "detail": "Image: ${image_label}\nVersion: ${image_version}\nIncluded Software: ${software_url}\nImage Release: ${releaseUrl}" } ] EOF diff --git a/images/macos/provision/configuration/preimagedata.sh b/images/macos/provision/configuration/preimagedata.sh index 0a739b9c42a4..6ce160f99fd3 100644 --- a/images/macos/provision/configuration/preimagedata.sh +++ b/images/macos/provision/configuration/preimagedata.sh @@ -25,8 +25,8 @@ cat <<EOF > $imagedata_file "detail": "${os_name}\n${os_version}\n${os_build}" }, { - "group": "Virtual Environment", - "detail": "Environment: ${image_label}\nVersion: ${image_version}\nIncluded Software: ${software_url}\nImage Release: ${releaseUrl}" + "group": "Runner Image", + "detail": "Image: ${image_label}\nVersion: ${image_version}\nIncluded Software: ${software_url}\nImage Release: ${releaseUrl}" } ] EOF diff --git a/images/win/scripts/Installers/Update-ImageData.ps1 b/images/win/scripts/Installers/Update-ImageData.ps1 index 3aa489b82bbd..dc9f1482cab2 100644 --- a/images/win/scripts/Installers/Update-ImageData.ps1 +++ b/images/win/scripts/Installers/Update-ImageData.ps1 @@ -26,8 +26,8 @@ $json = @" "detail": "${osName}\n${osVersion}\n${osEdition}" }, { - "group": "Virtual Environment", - "detail": "Environment: ${imageLabel}\nVersion: ${imageVersion}\nIncluded Software: ${softwareUrl}\nImage Release: ${releaseUrl}" + "group": "Runner Image", + "detail": "Image: ${imageLabel}\nVersion: ${imageVersion}\nIncluded Software: ${softwareUrl}\nImage Release: ${releaseUrl}" } ] "@ From 0f9ec68b4524db276a210fc2428c49c786ec44db Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 17 Aug 2022 09:00:29 +0000 Subject: [PATCH 1406/3485] Updating readme file for ubuntu22 version 20220815.3 (#6096) Co-authored-by: Image generation service account <no-reply@microsoft.com> --- images/linux/Ubuntu2204-Readme.md | 82 +++++++++++++++---------------- 1 file changed, 39 insertions(+), 43 deletions(-) diff --git a/images/linux/Ubuntu2204-Readme.md b/images/linux/Ubuntu2204-Readme.md index 585b37e83956..33c06187aa03 100644 --- a/images/linux/Ubuntu2204-Readme.md +++ b/images/linux/Ubuntu2204-Readme.md @@ -1,14 +1,10 @@ | Announcements | |-| -| [[All OSs] Go version 1.16 will be removed on August, 15th](https://github.com/actions/virtual-environments/issues/6024) | -| [The Ubuntu 18.04 Actions runner image will begin deprecation on 8/8/22 and will be fully unsupported by 12/1/22](https://github.com/actions/virtual-environments/issues/6002) | -| [Ubuntu 22.04 is generally available starting from August, 8](https://github.com/actions/virtual-environments/issues/5998) | -| ['virtual-environments' repository name will be changed to 'runner-images' on August, 8th](https://github.com/actions/virtual-environments/issues/5967) | -| [[all OSs] Android NDK 21 will be replaced in favor of 25 on August, 1st](https://github.com/actions/virtual-environments/issues/5930) | +| [The Ubuntu 18.04 Actions runner image will begin deprecation on 8/8/22 and will be fully unsupported by 12/1/22](https://github.com/actions/runner-images/issues/6002) | *** # Ubuntu 22.04.1 LTS -- Linux kernel version: 5.15.0-1014-azure -- Image Version: 20220807.1 +- Linux kernel version: 5.15.0-1017-azure +- Image Version: 20220815.3 ## Installed Software ### Language and Runtime @@ -23,7 +19,7 @@ - Kotlin 1.7.10-release-333 - Mono 6.12.0.182 (apt source repository: https://download.mono-project.com/repo/ubuntu stable-focal main) - MSBuild 16.10.1.31701 (from /usr/lib/mono/msbuild/15.0/bin/MSBuild.dll) -- Node 16.16.0 +- Node 16.17.0 - Perl 5.34.0 - Python 3.10.4 - Python3 3.10.4 @@ -31,16 +27,16 @@ ### Package Management - cpan 1.64 -- Helm 3.9.2 -- Homebrew 3.5.8 +- Helm 3.9.3 +- Homebrew 3.5.9 - Miniconda 4.12.0 -- Npm 8.11.0 +- Npm 8.15.0 - NuGet 6.2.1.2 - Pip 22.0.2 - Pip3 22.0.2 - Pipx 1.1.0 - RubyGems 3.3.5 -- Vcpkg (build from master \<9b22b40c6>) +- Vcpkg (build from master \<acc3bcf76>) - Yarn 1.22.19 #### Environment variables @@ -50,10 +46,10 @@ | VCPKG_INSTALLATION_ROOT | /usr/local/share/vcpkg | ### Project Management -- Lerna 5.3.0 +- Lerna 5.4.2 ### Tools -- Ansible 2.13.2 +- Ansible 2.13.3 - apt-fast 1.9.12 - AzCopy 10.16.0 (available by `azcopy` and `azcopy10` aliases) - Bazel 5.2.0 @@ -68,8 +64,8 @@ - Docker-Buildx 0.8.2 - Docker-Moby Client 20.10.17+azure-1 - Docker-Moby Server 20.10.17+azure-1 -- Fastlane 2.208.0 -- Git 2.37.1 (apt source repository: ppa:git-core/ppa) +- Fastlane 2.209.0 +- Git 2.37.2 (apt source repository: ppa:git-core/ppa) - Git LFS 3.2.0 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.6.0 - Haveged 1.9.14 @@ -78,7 +74,7 @@ - Kind 0.14.0 - Kubectl 1.24.3 - Kustomize 4.5.7 -- Leiningen 2.9.9 +- Leiningen 2.9.10 - MediaInfo 21.09 - Mercurial 6.1.1 - Minikube 1.26.1 @@ -94,30 +90,30 @@ - Skopeo 1.4.1 - Sphinx Open Source Search Server 2.2.11 - SVN 1.14.1 -- Terraform 1.2.6 +- Terraform 1.2.7 - yamllint 1.27.1 - yq 4.27.2 - zstd 1.5.2 (homebrew) ### CLI Tools - Alibaba Cloud CLI 3.0.124 -- AWS CLI 2.7.21 +- AWS CLI 2.7.23 - AWS CLI Session manager plugin 1.2.339.0 -- AWS SAM CLI 1.53.0 +- AWS SAM CLI 1.54.0 - Azure CLI (azure-cli) 2.39.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.25.0 -- GitHub CLI 2.14.3 +- GitHub CLI 2.14.4 - Google Cloud SDK 369.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 10.15.0 -- OpenShift CLI 4.10.25 +- Netlify CLI 10.17.7 +- OpenShift CLI 4.11.0 - ORAS CLI 0.13.0 -- Vercel CLI 27.3.7 +- Vercel CLI 28.0.2 ### Java | Version | Vendor | Environment Variable | | ------------------- | --------------- | -------------------- | -| 8.0.332+9 | Eclipse Temurin | JAVA_HOME_8_X64 | +| 8.0.345+1 | Eclipse Temurin | JAVA_HOME_8_X64 | | 11.0.16+8 (default) | Eclipse Temurin | JAVA_HOME_11_X64 | | 17.0.4+8 | Eclipse Temurin | JAVA_HOME_17_X64 | @@ -129,7 +125,7 @@ ### PHP | Tool | Version | | -------- | ------- | -| PHP | 8.1.8 | +| PHP | 8.1.9 | | Composer | 2.3.10 | | PHPUnit | 8.5.28 | ``` @@ -137,31 +133,31 @@ ``` ### Haskell - Cabal 3.6.2.0 -- GHC 9.2.4 +- GHC 9.4.1 - GHCup 0.1.18.0 - Stack 2.7.5 ### Rust Tools -- Cargo 1.62.1 -- Rust 1.62.1 -- Rustdoc 1.62.1 +- Cargo 1.63.0 +- Rust 1.63.0 +- Rustdoc 1.63.0 - Rustup 1.25.1 #### Packages - Bindgen 0.60.1 - Cargo audit 0.17.0 -- Cargo clippy 0.1.62 +- Cargo clippy 0.1.63 - Cargo outdated 0.11.1 - Cbindgen 0.24.3 -- Rustfmt 1.4.38 +- Rustfmt 1.5.1 ### Browsers and Drivers - Google Chrome 104.0.5112.79 - ChromeDriver 104.0.5112.79 - Chromium 104.0.5112.0 -- Microsoft Edge 104.0.1293.47 (apt source repository: https://packages.microsoft.com/repos/edge) -- Microsoft Edge WebDriver 104.0.1293.47 -- Selenium server 4.3.0 +- Microsoft Edge 104.0.1293.54 (apt source repository: https://packages.microsoft.com/repos/edge) +- Microsoft Edge WebDriver 104.0.1293.54 +- Selenium server 4.4.0 #### Environment variables | Name | Value | @@ -172,7 +168,7 @@ | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | ### .NET Core SDK -- 6.0.302 +- 6.0.400 ### .NET tools - nbgv 3.5.109+bdfbd7dea6 @@ -181,7 +177,7 @@ - sqlite3 3.37.2 #### PostgreSQL -- PostgreSQL 14.4 (apt source repository: https://apt.postgresql.org/pub/repos/apt/) +- PostgreSQL 14.5 (apt source repository: https://apt.postgresql.org/pub/repos/apt/) - PostgreSQL Server (user:postgres) ``` @@ -226,7 +222,7 @@ | GOROOT_1_19_X64 | /opt/hostedtoolcache/go/1.19.0/x64 | x64 | ### PowerShell Tools -- PowerShell 7.2.5 +- PowerShell 7.2.6 #### PowerShell Modules | Module | Version | @@ -249,7 +245,7 @@ | Package Name | Version | | -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------ | | Android Command Line Tools | 7.0 | -| Android Emulator | 31.2.10 | +| Android Emulator | 31.3.10 | | Android SDK Build-tools | 33.0.0<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | | Android SDK Platform-Tools | 33.0.2 | | Android SDK Platforms | android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | @@ -274,17 +270,17 @@ ### Cached Docker images | Repository:Tag | Digest | Created | | ----------------------- | ------------------------------------------------------------------------ | ---------- | -| alpine:3.14 | sha256:43eb8f0d8215d8661f745f3d88563c026614d843b668b233bbe1666b6d026f61 | 2022-07-19 | -| alpine:3.15 | sha256:0483110c51a764abe175a8cefb941541ca0bc0f628ce418d3a660338abf4622a | 2022-07-19 | +| alpine:3.14 | sha256:1ab24b3b99320975cca71716a7475a65d263d0b6b604d9d14ce08f7a3f67595c | 2022-08-09 | +| alpine:3.15 | sha256:69463fdff1f025c908939e86d4714b4d5518776954ca627cbeff4c74bcea5b22 | 2022-08-09 | | buildpack-deps:bullseye | sha256:d6974da710854c9c38d49666bd682abd99ef7aacdb92344d42a00f723e63cdb1 | 2022-08-02 | | buildpack-deps:buster | sha256:9d806f4d80f19e3fd315bbe2ca1aa59a6c1ad18aff7b3d9696b407572608d61e | 2022-08-02 | | debian:10 | sha256:fb9654aac57319592f1d51497c62001e7033eddf059355408a0b53f7c71f8d5f | 2022-08-02 | | debian:11 | sha256:82bab30ed448b8e2509aabe21f40f0607d905b7fd0dec72802627a20274eba55 | 2022-08-02 | | moby/buildkit:latest | sha256:0dc312b04eac1b44cd2cad566deb1e886c753109208affbbec8384f381ff7f38 | 2022-05-06 | | node:14 | sha256:7e1eabbcd7cbd0fdc296bc00fb2c80943ed0499c4ca3a148c83944708574dcf6 | 2022-08-02 | -| node:14-alpine | sha256:e22ee6a906e823dc592d6022a3f520676575b50320fe2c3916c88acb16f471ce | 2022-07-18 | +| node:14-alpine | sha256:4aff4ba0da347e51561587eba037a38db4eaa70e1a6c8334d66779fe963d5be7 | 2022-08-09 | | node:16 | sha256:1ed1e17ccabb09038cfb8a965337ebcda51ef9e9d32082164c502d44d9731a02 | 2022-08-02 | -| node:16-alpine | sha256:1908564153449b1c46b329e6ce2307e226bc566294f822f11c5a8bcef4eeaad7 | 2022-07-18 | +| node:16-alpine | sha256:1c8769a8c9ed57817ef07162744a3722421333a438185c560aa42a9a1fc6ea23 | 2022-08-09 | | ubuntu:18.04 | sha256:eb1392bbdde63147bc2b4ff1a4053dcfe6d15e4dfd3cce29e9b9f52a4f88bc74 | 2022-08-02 | | ubuntu:20.04 | sha256:af5efa9c28de78b754777af9b4d850112cad01899a5d37d2617bb94dc63a49aa | 2022-08-02 | | ubuntu:22.04 | sha256:34fea4f31bf187bc915536831fd0afc9d214755bf700b5cdb1336c82516d154e | 2022-08-02 | From c22e0f8ec89e7e8b6b1c870d59e3db3be3e37bc7 Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Wed, 17 Aug 2022 11:06:58 +0200 Subject: [PATCH 1407/3485] [macOS] CodeQL test correction (#6092) --- images/macos/provision/core/codeql-bundle.sh | 2 ++ images/macos/tests/Common.Tests.ps1 | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/images/macos/provision/core/codeql-bundle.sh b/images/macos/provision/core/codeql-bundle.sh index 1b6e2c4053be..1677363cf7e8 100644 --- a/images/macos/provision/core/codeql-bundle.sh +++ b/images/macos/provision/core/codeql-bundle.sh @@ -21,3 +21,5 @@ touch "$codeqlToolcachePath/pinned-version" # Touch a file to indicate to the toolcache that setting up CodeQL is complete. touch "$codeqlToolcachePath.complete" + +invoke_tests "Common" "CodeQL" diff --git a/images/macos/tests/Common.Tests.ps1 b/images/macos/tests/Common.Tests.ps1 index bd1ab630e353..aa5a9db45163 100644 --- a/images/macos/tests/Common.Tests.ps1 +++ b/images/macos/tests/Common.Tests.ps1 @@ -139,11 +139,14 @@ Describe "VirtualBox" -Skip:($os.IsBigSur) { } } -Describe "CodeQL Action Bundle" { +Describe "CodeQL" { It "codeql" { $CodeQLVersionWildcard = Join-Path $Env:AGENT_TOOLSDIRECTORY -ChildPath "CodeQL" | Join-Path -ChildPath "*" $CodeQLVersionPath = Get-ChildItem $CodeQLVersionWildcard | Select-Object -First 1 -Expand FullName $CodeQLPath = Join-Path $CodeQLVersionPath -ChildPath "x64" | Join-Path -ChildPath "codeql" | Join-Path -ChildPath "codeql" "$CodeQLPath version --quiet" | Should -ReturnZeroExitCode + + $CodeQLPacksPath = Join-Path $CodeQLVersionPath -ChildPath "x64" | Join-Path -ChildPath "codeql" | Join-Path -ChildPath "qlpacks" + $CodeQLPacksPath | Should -Exist } } \ No newline at end of file From b7e70987ffc60e0525222d5e5d512405d8fea2b1 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 17 Aug 2022 17:19:56 +0000 Subject: [PATCH 1408/3485] Updating readme file for win22 version 20220816.1 (#6102) Co-authored-by: Image generation service account <no-reply@microsoft.com> --- images/win/Windows2022-Readme.md | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/images/win/Windows2022-Readme.md b/images/win/Windows2022-Readme.md index 5fdcf69348f8..dee051d58d4c 100644 --- a/images/win/Windows2022-Readme.md +++ b/images/win/Windows2022-Readme.md @@ -1,12 +1,6 @@ -| Announcements | -|-| -| [[All OSs] Go version 1.16 will be removed on August, 15th](https://github.com/actions/runner-images/issues/6024) | -| [[Windows] mongo service will be disabled by default on August, 8th](https://github.com/actions/runner-images/issues/5949) | -| [[all OSs] Android NDK 21 will be replaced in favor of 25 on August, 1st](https://github.com/actions/runner-images/issues/5930) | -*** # Microsoft Windows Server 2022 Datacenter - OS Version: 10.0.20348 Build 887 -- Image Version: 20220814.1 +- Image Version: 20220816.1 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -18,7 +12,7 @@ - Julia 1.7.3 - Kotlin 1.7.10 - LLVM 14.0.6 -- Node 16.16.0 +- Node 16.17.0 - Perl 5.32.1 - PHP 8.1.9 - Python 3.9.13 @@ -26,15 +20,15 @@ ### Package Management - Chocolatey 1.1.0 -- Composer 2.3.10 +- Composer 2.4.0 - Helm 3.9.2 - Miniconda 4.12.0 (pre-installed on the image but not added to PATH) -- NPM 8.11.0 +- NPM 8.15.0 - NuGet 6.3.0.131 - pip 22.2.2 (python 3.9) - Pipx 1.1.0 - RubyGems 3.2.33 -- Vcpkg (build from master \<d293ac220>) +- Vcpkg (build from master \<23cc58477>) - Yarn 1.22.19 #### Environment variables @@ -53,7 +47,7 @@ - aria2 1.36.0 - azcopy 10.16.0 - Bazel 5.2.0 -- Bazelisk 1.12.0 +- Bazelisk 1.12.1 - Bicep 0.9.1 - Cabal 3.8.1.0 - CMake 3.24.0 @@ -90,7 +84,7 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.124 - AWS CLI 2.7.22 -- AWS SAM CLI 1.53.0 +- AWS SAM CLI 1.54.0 - AWS Session Manager CLI 1.2.339.0 - Azure CLI 2.39.0 - Azure DevOps CLI extension 0.25.0 @@ -112,7 +106,7 @@ - Rustfmt 1.5.1 ### Browsers and webdrivers -- Google Chrome 104.0.5112.81 +- Google Chrome 104.0.5112.102 - Chrome Driver 104.0.5112.79 - Microsoft Edge 104.0.1293.54 - Microsoft Edge Driver 104.0.1293.54 @@ -225,7 +219,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Visual Studio Enterprise 2022 | Name | Version | Path | | ----------------------------- | -------------- | -------------------------------------------------------- | -| Visual Studio Enterprise 2022 | 17.3.32804.467 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | +| Visual Studio Enterprise 2022 | 17.3.32811.315 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | #### Workloads, components and extensions: | Package | Version | @@ -254,6 +248,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Component.WixToolset.VisualStudioExtension.Dev17 | 1.0.0.18 | | Component.WixToolset.VisualStudioExtension.Schemas3 | 1.0.0.18 | | Component.WixToolset.VisualStudioExtension.Schemas4 | 1.0.0.18 | +| Component.Xamarin | 17.3.32708.82 | | Component.Xamarin.RemotedSimulator | 17.3.32708.82 | | ios | 15.4.446.446 | | maccatalyst | 15.4.446.446 | @@ -562,7 +557,7 @@ All other versions are saved but not installed. #### Powershell Modules | Module | Version | | ------------------ | ---------------- | -| AWSPowerShell | 4.1.146 | +| AWSPowerShell | 4.1.147 | | DockerMsftProvider | 1.0.0.8 | | MarkdownPS | 1.9 | | Microsoft.Graph | 1.11.0 | @@ -607,4 +602,3 @@ All other versions are saved but not installed. | mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:5f57ddc9a47d079398506a7613c8a3cb8b5bf3f97040f590871b61a15bd5a36a | 2022-08-06 | | mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:35c3cb29ef2c9f05e36070d04c79d7fc861c035fa5df2df64ae607a276db42c6 | 2022-08-06 | - From b4c27dac058ac68d12e89179024aa4bdfc1971b5 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 17 Aug 2022 18:19:36 +0000 Subject: [PATCH 1409/3485] Updating readme file for macOS-11 version 20220815.1 (#6095) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-11-Readme.md | 72 ++++++++++++++++----------------- 1 file changed, 35 insertions(+), 37 deletions(-) diff --git a/images/macos/macos-11-Readme.md b/images/macos/macos-11-Readme.md index 482975f0b892..4d9e1c4e3ef0 100644 --- a/images/macos/macos-11-Readme.md +++ b/images/macos/macos-11-Readme.md @@ -1,18 +1,16 @@ | Announcements | |-| -| [[All OSs] Go version 1.16 will be removed on August, 15th](https://github.com/actions/runner-images/issues/6024) | -| ['virtual-environments' repository name will be changed to 'runner-images' on August, 8th](https://github.com/actions/runner-images/issues/5967) | | [[all OSs] Android NDK 21 will be replaced in favor of 25 on August, 1st](https://github.com/actions/runner-images/issues/5930) | | [The macOS 10.15 Actions runner image will begin deprecation on 5/31/22 and will be fully unsupported by 8/30/22 in GitHub and by 9/30/22 in ADO](https://github.com/actions/runner-images/issues/5583) | *** # macOS 11.6 info - System Version: macOS 11.6.8 (20G730) - Kernel Version: Darwin 20.6.0 -- Image Version: 20220807.1 +- Image Version: 20220815.1 ## Installed Software ### Language and Runtime -- .NET SDK 3.1.101 3.1.201 3.1.302 3.1.421 5.0.102 5.0.202 5.0.302 5.0.408 6.0.302 +- .NET SDK 3.1.101 3.1.201 3.1.302 3.1.422 5.0.102 5.0.202 5.0.302 5.0.408 6.0.400 - Bash 3.2.57(1)-release - Clang/LLVM 13.0.0 is default - Clang/LLVM 14.0.6 is available on `'$(brew --prefix llvm@14)/bin/clang'` @@ -32,24 +30,24 @@ - Perl 5.34.0 - PHP 8.1.9 - Python 2.7.18 -- Python 3.9.13 +- Python 3.10.6 - R 4.2.1 - Ruby 2.7.6p219 ### Package Management -- Bundler version 2.3.19 +- Bundler version 2.3.20 - Carthage 0.38.0 - CocoaPods 1.11.3 - Composer 2.3.10 -- Homebrew 3.5.8 +- Homebrew 3.5.9 - Miniconda 4.12.0 - NPM 8.11.0 - NuGet 6.2.1.2 - Pip 20.3.4 (python 2.7) -- Pip 22.2.1 (python 3.9) +- Pip 22.2.2 (python 3.10) - Pipx 1.1.0 -- RubyGems 3.3.19 -- Vcpkg 2022 (build from master \<75260879e>) +- RubyGems 3.3.20 +- Vcpkg 2022 (build from master \<acc3bcf76>) - Yarn 1.22.19 #### Environment variables @@ -72,13 +70,13 @@ - bazelisk 1.12.0 - bsdtar 3.3.2 - available by 'tar' alias - Curl 7.84.0 -- Git 2.37.1 +- Git 2.37.2 - Git LFS: 3.2.0 -- GitHub CLI: 2.14.3 +- GitHub CLI: 2.14.4 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.3 - gpg (GnuPG) 2.3.7 -- helm v3.9.2+g1addefb +- helm v3.9.3+g414ff28 - Hub CLI: 2.14.2 - ImageMagick 7.1.0-45 - jq 1.6 @@ -96,22 +94,23 @@ - zstd 1.5.2 ### Tools -- Aliyun CLI 3.0.123 -- App Center CLI 2.10.10 -- AWS CLI 2.7.21 -- AWS SAM CLI 1.53.0 +- Aliyun CLI 3.0.124 +- App Center CLI 2.11.0 +- AWS CLI 2.7.23 +- AWS SAM CLI 1.54.0 - AWS Session Manager CLI 1.2.339.0 - Azure CLI (azure-devops) 0.25.0 - Azure CLI 2.39.0 - Bicep CLI 0.9.1 - Cabal 3.6.2.0 - Cmake 3.24.0 -- Fastlane 2.208.0 -- GHC 9.2.4 +- CodeQL Action Bundle 2.10.2 +- Fastlane 2.209.0 +- GHC 9.4.1 - GHCup 0.1.18.0 - Jazzy 0.14.2 - Stack 2.7.5 -- SwiftFormat 0.49.14 +- SwiftFormat 0.49.16 - Swig 4.0.2 - Xcode Command Line Tools 13.2.0.0.1.1638488800 @@ -124,11 +123,11 @@ - SafariDriver 15.6 (16613.3.9.1.7) - Google Chrome 104.0.5112.79 - ChromeDriver 104.0.5112.79 -- Microsoft Edge 104.0.1293.47 -- Microsoft Edge WebDriver 104.0.1293.47 -- Mozilla Firefox 103.0.1 +- Microsoft Edge 104.0.1293.54 +- Microsoft Edge WebDriver 104.0.1293.54 +- Mozilla Firefox 103.0.2 - geckodriver 0.31.0 -- Selenium server 4.3.0 +- Selenium server 4.4.0 #### Environment variables | Name | Value | @@ -140,7 +139,7 @@ ### Java | Version | Vendor | Environment Variable | | ------------------- | --------------- | -------------------- | -| 8.0.332+9 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | +| 8.0.345+1 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | | 11.0.16+8 | Eclipse Temurin | JAVA_HOME_11_X64 | | 17.0.4+8 | Eclipse Temurin | JAVA_HOME_17_X64 | @@ -178,15 +177,14 @@ #### Go | Version | Architecture | Environment Variable | | ------- | ------------ | -------------------- | -| 1.16.15 | x64 | GOROOT_1_16_X64 | | 1.17.13 (Default) | x64 | GOROOT_1_17_X64 | | 1.18.5 | x64 | GOROOT_1_18_X64 | | 1.19.0 | x64 | GOROOT_1_19_X64 | ### Rust Tools -- Cargo 1.62.1 -- Rust 1.62.1 -- Rustdoc 1.62.1 +- Cargo 1.63.0 +- Rust 1.63.0 +- Rustdoc 1.63.0 - Rustup 1.25.1 #### Packages @@ -194,11 +192,11 @@ - Cargo-audit 0.17.0 - Cargo-outdated 0.11.1 - Cbindgen 0.24.3 -- Clippy 0.1.62 -- Rustfmt 1.4.38-stable +- Clippy 0.1.63 +- Rustfmt 1.5.1-stable ### PowerShell Tools -- PowerShell 7.2.5 +- PowerShell 7.2.6 #### PowerShell Modules | Module | Version | @@ -216,10 +214,10 @@ ### Xamarin #### Visual Studio for Mac -| Version | Build | Path | -| -------------- | --------- | ------------------------------------ | -| 2019 | 8.10.25.2 | /Applications/Visual Studio 2019.app | -| 2022 (default) | 17.0.7.7 | /Applications/Visual Studio.app | +| Version | Build | Path | +| -------------- | ----------- | ------------------------------------ | +| 2019 | 8.10.25.2 | /Applications/Visual Studio 2019.app | +| 2022 (default) | 17.3.0.2102 | /Applications/Visual Studio.app | ##### Notes: ``` @@ -335,7 +333,7 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" | Package Name | Version | | -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------ | | Android Command Line Tools | 7.0 | -| Android Emulator | 31.2.10 | +| Android Emulator | 31.3.10 | | Android SDK Build-tools | 33.0.0<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | | Android SDK Platforms | android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | | Android SDK Platform-Tools | 33.0.2 | From 96fa9f747165f36dfc1544af070a7772fb75a518 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Thu, 18 Aug 2022 16:55:45 +0200 Subject: [PATCH 1410/3485] Update VC.14.32 to VC.14.33 (#6109) --- images/win/toolsets/toolset-2022.json | 36 +++++++++++++-------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index a13e37fe036d..5e258097d4d4 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -253,24 +253,24 @@ "Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.ARM.Spectre", "Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.ARM64", "Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.ARM64.Spectre", - "Microsoft.VisualStudio.Component.VC.14.32.17.2.ARM", - "Microsoft.VisualStudio.Component.VC.14.32.17.2.ARM.Spectre", - "Microsoft.VisualStudio.Component.VC.14.32.17.2.ARM64", - "Microsoft.VisualStudio.Component.VC.14.32.17.2.ARM64.Spectre", - "Microsoft.VisualStudio.Component.VC.14.32.17.2.x86.x64", - "Microsoft.VisualStudio.Component.VC.14.32.17.2.x86.x64.Spectre", - "Microsoft.VisualStudio.Component.VC.14.32.17.2.ATL", - "Microsoft.VisualStudio.Component.VC.14.32.17.2.ATL.Spectre", - "Microsoft.VisualStudio.Component.VC.14.32.17.2.ATL.ARM", - "Microsoft.VisualStudio.Component.VC.14.32.17.2.ATL.ARM.Spectre", - "Microsoft.VisualStudio.Component.VC.14.32.17.2.ATL.ARM64", - "Microsoft.VisualStudio.Component.VC.14.32.17.2.ATL.ARM64.Spectre", - "Microsoft.VisualStudio.Component.VC.14.32.17.2.MFC", - "Microsoft.VisualStudio.Component.VC.14.32.17.2.MFC.Spectre", - "Microsoft.VisualStudio.Component.VC.14.32.17.2.MFC.ARM", - "Microsoft.VisualStudio.Component.VC.14.32.17.2.MFC.ARM.Spectre", - "Microsoft.VisualStudio.Component.VC.14.32.17.2.MFC.ARM64", - "Microsoft.VisualStudio.Component.VC.14.32.17.2.MFC.ARM64.Spectre", + "Microsoft.VisualStudio.Component.VC.14.33.17.3.ARM", + "Microsoft.VisualStudio.Component.VC.14.33.17.3.ARM.Spectre", + "Microsoft.VisualStudio.Component.VC.14.33.17.3.ARM64", + "Microsoft.VisualStudio.Component.VC.14.33.17.3.ARM64.Spectre", + "Microsoft.VisualStudio.Component.VC.14.33.17.3.x86.x64", + "Microsoft.VisualStudio.Component.VC.14.33.17.3.x86.x64.Spectre", + "Microsoft.VisualStudio.Component.VC.14.33.17.3.ATL", + "Microsoft.VisualStudio.Component.VC.14.33.17.3.ATL.Spectre", + "Microsoft.VisualStudio.Component.VC.14.33.17.3.ATL.ARM", + "Microsoft.VisualStudio.Component.VC.14.33.17.3.ATL.ARM.Spectre", + "Microsoft.VisualStudio.Component.VC.14.33.17.3.ATL.ARM64", + "Microsoft.VisualStudio.Component.VC.14.33.17.3.ATL.ARM64.Spectre", + "Microsoft.VisualStudio.Component.VC.14.33.17.3.MFC", + "Microsoft.VisualStudio.Component.VC.14.33.17.3.MFC.Spectre", + "Microsoft.VisualStudio.Component.VC.14.33.17.3.MFC.ARM", + "Microsoft.VisualStudio.Component.VC.14.33.17.3.MFC.ARM.Spectre", + "Microsoft.VisualStudio.Component.VC.14.33.17.3.MFC.ARM64", + "Microsoft.VisualStudio.Component.VC.14.33.17.3.MFC.ARM64.Spectre", "Microsoft.VisualStudio.Component.VC.ATLMFC", "Microsoft.VisualStudio.Component.VC.ATLMFC.Spectre", "Microsoft.VisualStudio.Component.Windows10SDK.19041", From 7910ae15785ca7374003b8c7fc270fee6963410c Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Fri, 19 Aug 2022 13:56:31 +0200 Subject: [PATCH 1411/3485] select-datastore: make cluster parameter mandatory (#6112) --- images.CI/macos/select-datastore.ps1 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/images.CI/macos/select-datastore.ps1 b/images.CI/macos/select-datastore.ps1 index 23b5fb5a4a76..cc7af8efa3fe 100644 --- a/images.CI/macos/select-datastore.ps1 +++ b/images.CI/macos/select-datastore.ps1 @@ -36,9 +36,11 @@ param( [ValidateNotNullOrEmpty()] [string]$VIPassword, - [string]$TagCategory = "Busy", + [Parameter(Mandatory)] + [ValidateNotNullOrEmpty()] + [string]$Cluster, - [string]$Cluster + [string]$TagCategory = "Busy" ) # Import helpers module From 904b727ac037cc078d2d4009bcdde9b28936b862 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 19 Aug 2022 11:57:54 +0000 Subject: [PATCH 1412/3485] Updating readme file for macOS-12 version 20220815.1 (#6100) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-12-Readme.md | 69 ++++++++++++++++----------------- 1 file changed, 34 insertions(+), 35 deletions(-) diff --git a/images/macos/macos-12-Readme.md b/images/macos/macos-12-Readme.md index b7c1253747d5..4e410c48d033 100644 --- a/images/macos/macos-12-Readme.md +++ b/images/macos/macos-12-Readme.md @@ -1,18 +1,15 @@ | Announcements | |-| -| [[All OSs] Go version 1.16 will be removed on August, 15th](https://github.com/actions/runner-images/issues/6024) | -| ['virtual-environments' repository name will be changed to 'runner-images' on August, 8th](https://github.com/actions/runner-images/issues/5967) | -| [[all OSs] Android NDK 21 will be replaced in favor of 25 on August, 1st](https://github.com/actions/runner-images/issues/5930) | | [The macOS 10.15 Actions runner image will begin deprecation on 5/31/22 and will be fully unsupported by 8/30/22 in GitHub and by 9/30/22 in ADO](https://github.com/actions/runner-images/issues/5583) | *** # macOS 12.5 info - System Version: macOS 12.5 (21G72) - Kernel Version: Darwin 21.6.0 -- Image Version: 20220809.1 +- Image Version: 20220815.1 ## Installed Software ### Language and Runtime -- .NET SDK 3.1.101 3.1.201 3.1.302 3.1.421 5.0.102 5.0.202 5.0.302 5.0.408 6.0.302 +- .NET SDK 3.1.101 3.1.201 3.1.302 3.1.422 5.0.102 5.0.202 5.0.302 5.0.408 6.0.400 - Bash 3.2.57(1)-release - Clang/LLVM 13.1.6 is default - Clang/LLVM 14.0.6 is available on `'$(brew --prefix llvm@14)/bin/clang'` @@ -28,24 +25,24 @@ - Perl 5.34.0 - PHP 8.1.9 - Python 2.7.18 -- Python 3.9.13 +- Python 3.10.6 - R 4.2.1 - Ruby 3.0.4p208 ### Package Management -- Bundler version 2.3.19 +- Bundler version 2.3.20 - Carthage 0.38.0 - CocoaPods 1.11.3 - Composer 2.3.10 -- Homebrew 3.5.8 +- Homebrew 3.5.9 - Miniconda 4.12.0 - NPM 8.11.0 - NuGet 6.2.1.2 - Pip 20.3.4 (python 2.7) -- Pip 22.2.1 (python 3.9) +- Pip 22.2.2 (python 3.10) - Pipx 1.1.0 -- RubyGems 3.3.19 -- Vcpkg 2022 (build from master \<a0454d6e1>) +- RubyGems 3.3.20 +- Vcpkg 2022 (build from master \<acc3bcf76>) - Yarn 1.22.19 #### Environment variables @@ -68,9 +65,9 @@ - bazelisk 1.12.0 - bsdtar 3.5.1 - available by 'tar' alias - Curl 7.84.0 -- Git 2.37.1 +- Git 2.37.2 - Git LFS: 3.2.0 -- GitHub CLI: 2.14.3 +- GitHub CLI: 2.14.4 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.3 - gpg (GnuPG) 2.3.7 @@ -86,27 +83,28 @@ - Sox 14.4.2 - Subversion (SVN) 1.14.2 - Switchaudio-osx 1.1.0 -- Vagrant 2.2.19 +- Vagrant 2.3.0 - VirtualBox 6.1.36r152435 - yq (https://github.com/mikefarah/yq/) version 4.27.2 - zstd 1.5.2 ### Tools - App Center CLI 2.11.0 -- AWS CLI 2.7.21 -- AWS SAM CLI 1.53.0 +- AWS CLI 2.7.23 +- AWS SAM CLI 1.54.0 - AWS Session Manager CLI 1.2.339.0 - Azure CLI (azure-devops) 0.25.0 - Azure CLI 2.39.0 - Bicep CLI 0.9.1 - Cabal 3.6.2.0 - Cmake 3.24.0 -- Fastlane 2.208.0 +- CodeQL Action Bundle 2.10.2 +- Fastlane 2.209.0 - GHC 9.4.1 - GHCup 0.1.18.0 - Jazzy 0.14.2 - Stack 2.7.5 -- SwiftFormat 0.49.14 +- SwiftFormat 0.49.16 - Swig 4.0.2 - Xcode Command Line Tools 13.4.0.0.1.1651278267 @@ -119,11 +117,11 @@ - SafariDriver 15.6 (17613.3.9.1.5) - Google Chrome 104.0.5112.79 - ChromeDriver 104.0.5112.79 -- Microsoft Edge 104.0.1293.47 -- Microsoft Edge WebDriver 104.0.1293.47 -- Mozilla Firefox 103.0.1 +- Microsoft Edge 104.0.1293.54 +- Microsoft Edge WebDriver 104.0.1293.54 +- Mozilla Firefox 103.0.2 - geckodriver 0.31.0 -- Selenium server 4.3.0 +- Selenium server 4.4.0 #### Environment variables | Name | Value | @@ -170,15 +168,14 @@ #### Go | Version | Architecture | Environment Variable | | ------- | ------------ | -------------------- | -| 1.16.15 | x64 | GOROOT_1_16_X64 | | 1.17.13 (Default) | x64 | GOROOT_1_17_X64 | | 1.18.5 | x64 | GOROOT_1_18_X64 | | 1.19.0 | x64 | GOROOT_1_19_X64 | ### Rust Tools -- Cargo 1.62.1 -- Rust 1.62.1 -- Rustdoc 1.62.1 +- Cargo 1.63.0 +- Rust 1.63.0 +- Rustdoc 1.63.0 - Rustup 1.25.1 #### Packages @@ -186,11 +183,11 @@ - Cargo-audit 0.17.0 - Cargo-outdated 0.11.1 - Cbindgen 0.24.3 -- Clippy 0.1.62 -- Rustfmt 1.4.38-stable +- Clippy 0.1.63 +- Rustfmt 1.5.1-stable ### PowerShell Tools -- PowerShell 7.2.5 +- PowerShell 7.2.6 #### PowerShell Modules | Module | Version | @@ -208,10 +205,10 @@ ### Xamarin #### Visual Studio for Mac -| Version | Build | Path | -| -------------- | --------- | ------------------------------------ | -| 2019 | 8.10.25.2 | /Applications/Visual Studio 2019.app | -| 2022 (default) | 17.0.7.7 | /Applications/Visual Studio.app | +| Version | Build | Path | +| -------------- | ----------- | ------------------------------------ | +| 2019 | 8.10.25.2 | /Applications/Visual Studio 2019.app | +| 2022 (default) | 17.3.0.2102 | /Applications/Visual Studio.app | ##### Notes: ``` @@ -223,7 +220,9 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" #### Xamarin bundles | symlink | Xamarin.Mono | Xamarin.iOS | Xamarin.Mac | Xamarin.Android | | ----------------- | ------------ | ----------- | ----------- | --------------- | -| 6_12_17 (default) | 6.12 | 15.10 | 8.10 | 12.2 | +| 6_12_19 (default) | 6.12 | 15.12 | 8.12 | 13.0 | +| 6_12_18 | 6.12 | 15.10 | 8.10 | 12.3 | +| 6_12_17 | 6.12 | 15.10 | 8.10 | 12.2 | | 6_12_16 | 6.12 | 15.8 | 8.8 | 12.2 | | 6_12_15 | 6.12 | 15.8 | 8.8 | 12.1 | | 6_12_14 | 6.12 | 15.8 | 8.8 | 12.0 | @@ -306,7 +305,7 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" | Package Name | Version | | -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------ | | Android Command Line Tools | 7.0 | -| Android Emulator | 31.2.10 | +| Android Emulator | 31.3.10 | | Android SDK Build-tools | 33.0.0<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | | Android SDK Platforms | android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | | Android SDK Platform-Tools | 33.0.2 | From 7bcb155f6abbd7bc0751363f98050f5755e52a49 Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Mon, 22 Aug 2022 10:05:39 +0200 Subject: [PATCH 1413/3485] [actions] Update github/codeql-action release version from v1 to v2 (#6097) --- .github/workflows/codeql-analysis.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 4d3140b2e8c1..407f8f325351 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -25,8 +25,10 @@ jobs: name: Analyze runs-on: ubuntu-latest permissions: + # only required for workflows in private repositories actions: read contents: read + # required for all workflows security-events: write strategy: @@ -42,7 +44,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@v1 + uses: github/codeql-action/init@v2 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -53,7 +55,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@v1 + uses: github/codeql-action/autobuild@v2 # ℹ️ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -67,4 +69,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v1 \ No newline at end of file + uses: github/codeql-action/analyze@v2 \ No newline at end of file From c08d3333864a501c7e0a703c655e391d360da917 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Mon, 22 Aug 2022 14:56:33 +0200 Subject: [PATCH 1414/3485] [macOS] Remove bats formula installation (#6122) --- images/macos/toolsets/toolset-10.15.json | 1 - 1 file changed, 1 deletion(-) diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index a31f1c612385..b3050f77cdd9 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -204,7 +204,6 @@ "ant", "aria2", "azure-cli", - "bats", "bazelisk", "carthage", "cmake", From 38a1faf55dcfac744f1831cea1b1f4222b9cdb2a Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Mon, 22 Aug 2022 19:03:47 +0200 Subject: [PATCH 1415/3485] [macOS] Remove xctool formula installation (#6128) --- images/macos/software-report/SoftwareReport.Xcode.psm1 | 7 ------- images/macos/tests/BasicTools.Tests.ps1 | 6 ------ images/macos/toolsets/toolset-10.15.json | 1 - 3 files changed, 14 deletions(-) diff --git a/images/macos/software-report/SoftwareReport.Xcode.psm1 b/images/macos/software-report/SoftwareReport.Xcode.psm1 index b9ad8e834171..e6038fbd2333 100644 --- a/images/macos/software-report/SoftwareReport.Xcode.psm1 +++ b/images/macos/software-report/SoftwareReport.Xcode.psm1 @@ -246,13 +246,6 @@ function Build-XcodeSupportToolsSection { ) } - if ($os.IsCatalina) { - $xctool = Run-Command "xctool --version" - $toolList += @( - "xctool $xctool" - ) - } - $output = "" $output += New-MDHeader "Xcode Support Tools" -Level 4 $output += New-MDList -Style Unordered -Lines $toolList diff --git a/images/macos/tests/BasicTools.Tests.ps1 b/images/macos/tests/BasicTools.Tests.ps1 index df7045b50371..18b2003ad554 100644 --- a/images/macos/tests/BasicTools.Tests.ps1 +++ b/images/macos/tests/BasicTools.Tests.ps1 @@ -150,12 +150,6 @@ Describe "virtualbox" -Skip:($os.IsBigSur) { } } -Describe "xctool" -Skip:($os.IsHigherThanCatalina) { - It "xctool" { - "xctool --version" | Should -ReturnZeroExitCode - } -} - Describe "R" { It "R" { "R --version" | Should -ReturnZeroExitCode diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index b3050f77cdd9..da9f30401e84 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -221,7 +221,6 @@ "subversion", "swiftformat", "swig", - "xctool", "zstd", "zlib", "libxext", From b0b00d426cabb67c13f41c837e02cdca425d0047 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Tue, 23 Aug 2022 09:18:18 +0200 Subject: [PATCH 1416/3485] Add sqlcmd on Ubuntu Server 22.04 (#6127) --- .../linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 | 4 +--- images/linux/scripts/tests/Tools.Tests.ps1 | 2 +- images/linux/ubuntu2204.pkr.hcl | 1 + 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index f2f28588fc38..7a7fad07b2ed 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -273,9 +273,7 @@ $markdown += New-MDList -Style Unordered -Lines ( $databaseLists | Sort-Object ) $markdown += Build-PostgreSqlSection $markdown += Build-MySQLSection -if ((Test-IsUbuntu18) -or (Test-IsUbuntu20)) { - $markdown += Build-MSSQLToolsSection -} +$markdown += Build-MSSQLToolsSection $markdown += New-MDHeader "Cached Tools" -Level 3 $markdown += Build-CachedToolsSection diff --git a/images/linux/scripts/tests/Tools.Tests.ps1 b/images/linux/scripts/tests/Tools.Tests.ps1 index 13c8d95f9aee..97a364b14b49 100644 --- a/images/linux/scripts/tests/Tools.Tests.ps1 +++ b/images/linux/scripts/tests/Tools.Tests.ps1 @@ -182,7 +182,7 @@ Describe "Mono" { } } -Describe "MSSQLCommandLineTools" -Skip:(Test-IsUbuntu22) { +Describe "MSSQLCommandLineTools" { It "sqlcmd" { "sqlcmd -?" | Should -ReturnZeroExitCode } diff --git a/images/linux/ubuntu2204.pkr.hcl b/images/linux/ubuntu2204.pkr.hcl index f48257ca579b..bf957f6c4368 100644 --- a/images/linux/ubuntu2204.pkr.hcl +++ b/images/linux/ubuntu2204.pkr.hcl @@ -303,6 +303,7 @@ build { "${path.root}/scripts/installers/mono.sh", "${path.root}/scripts/installers/kotlin.sh", "${path.root}/scripts/installers/mysql.sh", + "${path.root}/scripts/installers/mssql-cmd-tools.sh", "${path.root}/scripts/installers/sqlpackage.sh", "${path.root}/scripts/installers/nginx.sh", "${path.root}/scripts/installers/nvm.sh", From 7f0109069b9366dac35bc04c26fb726a0886f18f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 23 Aug 2022 07:37:45 +0000 Subject: [PATCH 1417/3485] Updating readme file for ubuntu22 version 20220821.1 (#6121) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2204-Readme.md | 40 +++++++++++++++---------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/images/linux/Ubuntu2204-Readme.md b/images/linux/Ubuntu2204-Readme.md index 33c06187aa03..878f3bff65a4 100644 --- a/images/linux/Ubuntu2204-Readme.md +++ b/images/linux/Ubuntu2204-Readme.md @@ -4,7 +4,7 @@ *** # Ubuntu 22.04.1 LTS - Linux kernel version: 5.15.0-1017-azure -- Image Version: 20220815.3 +- Image Version: 20220821.1 ## Installed Software ### Language and Runtime @@ -15,7 +15,7 @@ - Dash 0.5.11+git20210903+057cd650a4ed-3build1 - GNU C++ 9.4.0, 10.3.0, 11.2.0 - GNU Fortran 9.4.0, 10.3.0, 11.2.0 -- Julia 1.7.3 +- Julia 1.8.0 - Kotlin 1.7.10-release-333 - Mono 6.12.0.182 (apt source repository: https://download.mono-project.com/repo/ubuntu stable-focal main) - MSBuild 16.10.1.31701 (from /usr/lib/mono/msbuild/15.0/bin/MSBuild.dll) @@ -36,7 +36,7 @@ - Pip3 22.0.2 - Pipx 1.1.0 - RubyGems 3.3.5 -- Vcpkg (build from master \<acc3bcf76>) +- Vcpkg (build from master \<9259a0719>) - Yarn 1.22.19 #### Environment variables @@ -46,22 +46,22 @@ | VCPKG_INSTALLATION_ROOT | /usr/local/share/vcpkg | ### Project Management -- Lerna 5.4.2 +- Lerna 5.4.3 ### Tools - Ansible 2.13.3 - apt-fast 1.9.12 - AzCopy 10.16.0 (available by `azcopy` and `azcopy10` aliases) - Bazel 5.2.0 -- Bazelisk 1.12.0 +- Bazelisk 1.12.1 - Bicep 0.9.1 - Buildah 1.23.1 -- CMake 3.24.0 -- CodeQL Action Bundle 2.10.2 +- CMake 3.24.1 +- CodeQL Action Bundle 2.10.3 - Docker Amazon ECR Credential Helper 0.6.0 - Docker Compose v1 1.29.2 - Docker Compose v2 2.9.0+azure-1 -- Docker-Buildx 0.8.2 +- Docker-Buildx 0.9.0 - Docker-Moby Client 20.10.17+azure-1 - Docker-Moby Server 20.10.17+azure-1 - Fastlane 2.209.0 @@ -72,7 +72,7 @@ - Heroku 7.62.0 - jq 1.6 - Kind 0.14.0 -- Kubectl 1.24.3 +- Kubectl 1.24.4 - Kustomize 4.5.7 - Leiningen 2.9.10 - MediaInfo 21.09 @@ -85,7 +85,7 @@ - Packer 1.8.3 - Parcel 2.7.0 - Podman 3.4.4 -- Pulumi 3.37.2 +- Pulumi 3.38.0 - R 4.2.1 - Skopeo 1.4.1 - Sphinx Open Source Search Server 2.2.11 @@ -97,18 +97,18 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.124 -- AWS CLI 2.7.23 +- AWS CLI 2.7.25 - AWS CLI Session manager plugin 1.2.339.0 -- AWS SAM CLI 1.54.0 +- AWS SAM CLI 1.55.0 - Azure CLI (azure-cli) 2.39.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.25.0 - GitHub CLI 2.14.4 - Google Cloud SDK 369.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 10.17.7 +- Netlify CLI 11.3.0 - OpenShift CLI 4.11.0 - ORAS CLI 0.13.0 -- Vercel CLI 28.0.2 +- Vercel CLI 28.1.0 ### Java | Version | Vendor | Environment Variable | @@ -126,7 +126,7 @@ | Tool | Version | | -------- | ------- | | PHP | 8.1.9 | -| Composer | 2.3.10 | +| Composer | 2.4.1 | | PHPUnit | 8.5.28 | ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. @@ -152,11 +152,11 @@ - Rustfmt 1.5.1 ### Browsers and Drivers -- Google Chrome 104.0.5112.79 +- Google Chrome 104.0.5112.101 - ChromeDriver 104.0.5112.79 - Chromium 104.0.5112.0 -- Microsoft Edge 104.0.1293.54 (apt source repository: https://packages.microsoft.com/repos/edge) -- Microsoft Edge WebDriver 104.0.1293.54 +- Microsoft Edge 104.0.1293.63 (apt source repository: https://packages.microsoft.com/repos/edge) +- Microsoft Edge WebDriver 104.0.1293.63 - Selenium server 4.4.0 #### Environment variables @@ -279,8 +279,8 @@ | moby/buildkit:latest | sha256:0dc312b04eac1b44cd2cad566deb1e886c753109208affbbec8384f381ff7f38 | 2022-05-06 | | node:14 | sha256:7e1eabbcd7cbd0fdc296bc00fb2c80943ed0499c4ca3a148c83944708574dcf6 | 2022-08-02 | | node:14-alpine | sha256:4aff4ba0da347e51561587eba037a38db4eaa70e1a6c8334d66779fe963d5be7 | 2022-08-09 | -| node:16 | sha256:1ed1e17ccabb09038cfb8a965337ebcda51ef9e9d32082164c502d44d9731a02 | 2022-08-02 | -| node:16-alpine | sha256:1c8769a8c9ed57817ef07162744a3722421333a438185c560aa42a9a1fc6ea23 | 2022-08-09 | +| node:16 | sha256:bf1609ac718dda03940e2be4deae1704fb77cd6de2bed8bf91d4bbbc9e88b497 | 2022-08-16 | +| node:16-alpine | sha256:2c405ed42fc0fd6aacbe5730042640450e5ec030bada7617beac88f742b6997b | 2022-08-16 | | ubuntu:18.04 | sha256:eb1392bbdde63147bc2b4ff1a4053dcfe6d15e4dfd3cce29e9b9f52a4f88bc74 | 2022-08-02 | | ubuntu:20.04 | sha256:af5efa9c28de78b754777af9b4d850112cad01899a5d37d2617bb94dc63a49aa | 2022-08-02 | | ubuntu:22.04 | sha256:34fea4f31bf187bc915536831fd0afc9d214755bf700b5cdb1336c82516d154e | 2022-08-02 | From 4346c1d6ad840daf2dc9789403846bfa000982eb Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 23 Aug 2022 08:23:19 +0000 Subject: [PATCH 1418/3485] Updating readme file for ubuntu20 version 20220821.1 (#6120) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2004-Readme.md | 54 +++++++++++++++---------------- 1 file changed, 26 insertions(+), 28 deletions(-) diff --git a/images/linux/Ubuntu2004-Readme.md b/images/linux/Ubuntu2004-Readme.md index 218c179b6b07..77f088789b48 100644 --- a/images/linux/Ubuntu2004-Readme.md +++ b/images/linux/Ubuntu2004-Readme.md @@ -1,12 +1,10 @@ | Announcements | |-| -| [[All OSs] Go version 1.16 will be removed on August, 15th](https://github.com/actions/runner-images/issues/6024) | | [The Ubuntu 18.04 Actions runner image will begin deprecation on 8/8/22 and will be fully unsupported by 12/1/22](https://github.com/actions/runner-images/issues/6002) | -| [[all OSs] Android NDK 21 will be replaced in favor of 25 on August, 1st](https://github.com/actions/runner-images/issues/5930) | *** # Ubuntu 20.04.4 LTS - Linux kernel version: 5.15.0-1017-azure -- Image Version: 20220814.1 +- Image Version: 20220821.1 ## Installed Software ### Language and Runtime @@ -19,11 +17,11 @@ - Erlang rebar3 3.19.0 - GNU C++ 9.4.0, 10.3.0 - GNU Fortran 9.4.0, 10.3.0 -- Julia 1.7.3 +- Julia 1.8.0 - Kotlin 1.7.10-release-333 - Mono 6.12.0.182 (apt source repository: https://download.mono-project.com/repo/ubuntu stable-focal main) - MSBuild 16.10.1.31701 (from /usr/lib/mono/msbuild/15.0/bin/MSBuild.dll) -- Node 16.16.0 +- Node 16.17.0 - Perl 5.30.0 - Python 3.8.10 - Python3 3.8.10 @@ -35,13 +33,13 @@ - Helm 3.9.3 - Homebrew 3.5.9 - Miniconda 4.12.0 -- Npm 8.11.0 +- Npm 8.15.0 - NuGet 6.2.1.2 - Pip 20.0.2 - Pip3 20.0.2 - Pipx 1.1.0 - RubyGems 3.1.2 -- Vcpkg (build from master \<d293ac220>) +- Vcpkg (build from master \<9259a0719>) - Yarn 1.22.19 #### Environment variables @@ -53,24 +51,24 @@ ### Project Management - Ant 1.10.7 - Gradle 7.5.1 -- Lerna 5.4.2 +- Lerna 5.4.3 - Maven 3.8.6 - Sbt 1.7.1 ### Tools -- Ansible 2.13.2 +- Ansible 2.13.3 - apt-fast 1.9.12 - AzCopy 10.16.0 (available by `azcopy` and `azcopy10` aliases) - Bazel 5.2.0 -- Bazelisk 1.12.0 +- Bazelisk 1.12.1 - Bicep 0.9.1 - Buildah 1.22.3 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- CMake 3.24.0 -- CodeQL Action Bundle 2.10.2 +- CMake 3.24.1 +- CodeQL Action Bundle 2.10.3 - Docker Amazon ECR Credential Helper 0.6.0 - Docker Compose v1 1.29.2 - Docker Compose v2 2.9.0+azure-1 -- Docker-Buildx 0.8.2 +- Docker-Buildx 0.9.0 - Docker-Moby Client 20.10.17+azure-1 - Docker-Moby Server 20.10.17+azure-1 - Fastlane 2.209.0 @@ -82,7 +80,7 @@ - HHVM (HipHop VM) 4.166.0 - jq 1.6 - Kind 0.14.0 -- Kubectl 1.24.3 +- Kubectl 1.24.4 - Kustomize 4.5.7 - Leiningen 2.9.10 - MediaInfo 19.09 @@ -96,7 +94,7 @@ - Parcel 2.7.0 - PhantomJS 2.1.1 - Podman 3.4.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- Pulumi 3.37.2 +- Pulumi 3.38.0 - R 4.2.1 - Skopeo 1.5.0 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 @@ -108,18 +106,18 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.124 -- AWS CLI 2.7.22 +- AWS CLI 2.7.25 - AWS CLI Session manager plugin 1.2.339.0 -- AWS SAM CLI 1.53.0 +- AWS SAM CLI 1.55.0 - Azure CLI (azure-cli) 2.39.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.25.0 - GitHub CLI 2.14.4 - Google Cloud SDK 369.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 10.17.4 +- Netlify CLI 11.3.0 - OpenShift CLI 4.11.0 - ORAS CLI 0.13.0 -- Vercel CLI 28.0.1 +- Vercel CLI 28.1.0 ### Java | Version | Vendor | Environment Variable | @@ -136,8 +134,8 @@ ### PHP | Tool | Version | | -------- | ------------------- | -| PHP | 7.4.30 8.0.21 8.1.8 | -| Composer | 2.3.10 | +| PHP | 7.4.30 8.0.22 8.1.9 | +| Composer | 2.4.1 | | PHPUnit | 8.5.28 | ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. @@ -163,11 +161,11 @@ - Rustfmt 1.5.1 ### Browsers and Drivers -- Google Chrome 104.0.5112.79 +- Google Chrome 104.0.5112.101 - ChromeDriver 104.0.5112.79 - Chromium 104.0.5112.0 -- Microsoft Edge 104.0.1293.54 (apt source repository: https://packages.microsoft.com/repos/edge) -- Microsoft Edge WebDriver 104.0.1293.54 +- Microsoft Edge 104.0.1293.63 (apt source repository: https://packages.microsoft.com/repos/edge) +- Microsoft Edge WebDriver 104.0.1293.63 - Selenium server 4.4.0 - Mozilla Firefox 103.0 - Geckodriver 0.31.0 @@ -187,7 +185,7 @@ - nbgv 3.5.109+bdfbd7dea6 ### Databases -- MongoDB 5.0.10 (apt source repository: https://repo.mongodb.org/apt/ubuntu) +- MongoDB 5.0.11 (apt source repository: https://repo.mongodb.org/apt/ubuntu) - sqlite3 3.31.1 #### PostgreSQL @@ -312,8 +310,8 @@ | node:12-alpine | sha256:d4b15b3d48f42059a15bd659be60afe21762aae9d6cbea6f124440895c27db68 | 2022-04-11 | | node:14 | sha256:7e1eabbcd7cbd0fdc296bc00fb2c80943ed0499c4ca3a148c83944708574dcf6 | 2022-08-02 | | node:14-alpine | sha256:4aff4ba0da347e51561587eba037a38db4eaa70e1a6c8334d66779fe963d5be7 | 2022-08-09 | -| node:16 | sha256:1ed1e17ccabb09038cfb8a965337ebcda51ef9e9d32082164c502d44d9731a02 | 2022-08-02 | -| node:16-alpine | sha256:1c8769a8c9ed57817ef07162744a3722421333a438185c560aa42a9a1fc6ea23 | 2022-08-09 | +| node:16 | sha256:bf1609ac718dda03940e2be4deae1704fb77cd6de2bed8bf91d4bbbc9e88b497 | 2022-08-16 | +| node:16-alpine | sha256:2c405ed42fc0fd6aacbe5730042640450e5ec030bada7617beac88f742b6997b | 2022-08-16 | | ubuntu:16.04 | sha256:91bd29a464fdabfcf44e29e1f2a5f213c6dfa750b6290e40dd6998ac79da3c41 | 2021-08-31 | | ubuntu:18.04 | sha256:eb1392bbdde63147bc2b4ff1a4053dcfe6d15e4dfd3cce29e9b9f52a4f88bc74 | 2022-08-02 | | ubuntu:20.04 | sha256:af5efa9c28de78b754777af9b4d850112cad01899a5d37d2617bb94dc63a49aa | 2022-08-02 | @@ -379,7 +377,7 @@ | pollinate | 4.33-3ubuntu1.20.04.1 | | python-is-python3 | 3.8.2-4 | | rpm | 4.14.2.1+dfsg1-1build2 | -| rsync | 3.1.3-8ubuntu0.3 | +| rsync | 3.1.3-8ubuntu0.4 | | shellcheck | 0.7.0-2build2 | | sphinxsearch | 2.2.11-2ubuntu2 | | sqlite3 | 3.31.1-4ubuntu0.3 | From f32d372a9a69f09d31fb43ca6f2f100e58e3dbe4 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 23 Aug 2022 09:12:52 +0000 Subject: [PATCH 1419/3485] Updating readme file for win22 version 20220821.1 (#6117) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2022-Readme.md | 70 ++++++++++++++++---------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/images/win/Windows2022-Readme.md b/images/win/Windows2022-Readme.md index dee051d58d4c..65d40bd2a4a2 100644 --- a/images/win/Windows2022-Readme.md +++ b/images/win/Windows2022-Readme.md @@ -1,6 +1,6 @@ # Microsoft Windows Server 2022 Datacenter - OS Version: 10.0.20348 Build 887 -- Image Version: 20220816.1 +- Image Version: 20220821.1 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -9,7 +9,7 @@ ### Language and Runtime - Bash 5.1.16(1)-release - Go 1.17.13 -- Julia 1.7.3 +- Julia 1.8.0 - Kotlin 1.7.10 - LLVM 14.0.6 - Node 16.17.0 @@ -20,7 +20,7 @@ ### Package Management - Chocolatey 1.1.0 -- Composer 2.4.0 +- Composer 2.4.1 - Helm 3.9.2 - Miniconda 4.12.0 (pre-installed on the image but not added to PATH) - NPM 8.15.0 @@ -28,7 +28,7 @@ - pip 22.2.2 (python 3.9) - Pipx 1.1.0 - RubyGems 3.2.33 -- Vcpkg (build from master \<23cc58477>) +- Vcpkg (build from master \<9259a0719>) - Yarn 1.22.19 #### Environment variables @@ -50,11 +50,11 @@ - Bazelisk 1.12.1 - Bicep 0.9.1 - Cabal 3.8.1.0 -- CMake 3.24.0 -- CodeQL Action Bundle 2.10.2 +- CMake 3.24.1 +- CodeQL Action Bundle 2.10.3 - Docker 20.10.7 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.9.0 +- Docker Compose v2 2.10.0 - Docker-wincred 0.6.4 - ghc 9.4.1 - Git 2.37.2.windows.2 @@ -62,14 +62,14 @@ - InnoSetup 6.2.1 - jq 1.6 - Kind 0.14.0 -- Kubectl 1.24.3 +- Kubectl 1.24.4 - Mercurial 5.0 - Mingw-w64 11.2.0 - Newman 5.3.2 - NSIS v3.08 - OpenSSL 1.1.1 - Packer 1.8.2 -- Pulumi v3.37.2 +- Pulumi v3.38.0 - R 4.2.1 - Service Fabric SDK 9.0.1028.9590 - Stack 2.7.5 @@ -83,8 +83,8 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.124 -- AWS CLI 2.7.22 -- AWS SAM CLI 1.54.0 +- AWS CLI 2.7.25 +- AWS SAM CLI 1.55.0 - AWS Session Manager CLI 1.2.339.0 - Azure CLI 2.39.0 - Azure DevOps CLI extension 0.25.0 @@ -108,8 +108,8 @@ ### Browsers and webdrivers - Google Chrome 104.0.5112.102 - Chrome Driver 104.0.5112.79 -- Microsoft Edge 104.0.1293.54 -- Microsoft Edge Driver 104.0.1293.54 +- Microsoft Edge 104.0.1293.63 +- Microsoft Edge Driver 104.0.1293.63 - Mozilla Firefox 103.0.2 - Gecko Driver 0.31.0 - IE Driver 3.150.1.1 @@ -127,7 +127,7 @@ | Version | Vendor | Environment Variable | | ------------------- | --------------- | -------------------- | | 8.0.345+1 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | -| 11.0.16+8 | Eclipse Temurin | JAVA_HOME_11_X64 | +| 11.0.16+101 | Eclipse Temurin | JAVA_HOME_11_X64 | | 17.0.4+8 | Eclipse Temurin | JAVA_HOME_17_X64 | ### Shells @@ -201,7 +201,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### MongoDB | Version | ServiceName | ServiceStatus | ServiceStartType | | -------- | ----------- | ------------- | ---------------- | -| 5.0.10.0 | MongoDB | Stopped | Disabled | +| 5.0.11.0 | MongoDB | Stopped | Disabled | ### Database tools - Azure CosmosDb Emulator 2.14.9.0 @@ -368,24 +368,24 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.Spectre | 17.3.32708.82 | | Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64 | 17.3.32708.82 | | Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64.Spectre | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.VC.14.32.17.2.ARM | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.VC.14.32.17.2.ARM.Spectre | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.VC.14.32.17.2.ARM64 | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.VC.14.32.17.2.ARM64.Spectre | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.VC.14.32.17.2.ATL | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.VC.14.32.17.2.ATL.ARM | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.VC.14.32.17.2.ATL.ARM.Spectre | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.VC.14.32.17.2.ATL.ARM64 | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.VC.14.32.17.2.ATL.ARM64.Spectre | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.VC.14.32.17.2.ATL.Spectre | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.VC.14.32.17.2.MFC | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.VC.14.32.17.2.MFC.ARM | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.VC.14.32.17.2.MFC.ARM.Spectre | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.VC.14.32.17.2.MFC.ARM64 | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.VC.14.32.17.2.MFC.ARM64.Spectre | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.VC.14.32.17.2.MFC.Spectre | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.VC.14.32.17.2.x86.x64 | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.VC.14.32.17.2.x86.x64.Spectre | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.VC.14.33.17.3.ARM | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.VC.14.33.17.3.ARM.Spectre | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.VC.14.33.17.3.ARM64 | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.VC.14.33.17.3.ARM64.Spectre | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.VC.14.33.17.3.ATL | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.VC.14.33.17.3.ATL.ARM | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.VC.14.33.17.3.ATL.ARM.Spectre | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.VC.14.33.17.3.ATL.ARM64 | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.VC.14.33.17.3.ATL.ARM64.Spectre | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.VC.14.33.17.3.ATL.Spectre | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.VC.14.33.17.3.MFC | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.VC.14.33.17.3.MFC.ARM | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.VC.14.33.17.3.MFC.ARM.Spectre | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.VC.14.33.17.3.MFC.ARM64 | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.VC.14.33.17.3.MFC.ARM64.Spectre | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.VC.14.33.17.3.MFC.Spectre | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.VC.14.33.17.3.x86.x64 | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.VC.14.33.17.3.x86.x64.Spectre | 17.3.32708.82 | | Microsoft.VisualStudio.Component.VC.ASAN | 17.3.32708.82 | | Microsoft.VisualStudio.Component.VC.ATL | 17.3.32708.82 | | Microsoft.VisualStudio.Component.VC.ATL.ARM | 17.3.32708.82 | @@ -492,7 +492,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | ProBITools.MicrosoftAnalysisServicesModelingProjects2022 | 3.0.4 | | ProBITools.MicrosoftReportProjectsforVisualStudio2022 | 3.0.1 | | VisualStudioClient.MicrosoftVisualStudio2022InstallerProjects | 2.0.0 | -| Windows Driver Kit | 10.1.22621.1 | +| Windows Driver Kit | 10.1.22621.382 | | WixToolset.WixToolsetVisualStudio2022Extension | 1.0.0.18 | #### Microsoft Visual C++: @@ -557,7 +557,7 @@ All other versions are saved but not installed. #### Powershell Modules | Module | Version | | ------------------ | ---------------- | -| AWSPowerShell | 4.1.147 | +| AWSPowerShell | 4.1.151 | | DockerMsftProvider | 1.0.0.8 | | MarkdownPS | 1.9 | | Microsoft.Graph | 1.11.0 | From 4de27cdee12be175a0e37116dfd31de733febd46 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 23 Aug 2022 13:41:37 +0000 Subject: [PATCH 1420/3485] Updating readme file for win19 version 20220821.1 (#6118) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2019-Readme.md | 50 ++++++++++++++------------------ 1 file changed, 22 insertions(+), 28 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index b5b9d74480da..6ef026518bc2 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -1,12 +1,6 @@ -| Announcements | -|-| -| [[All OSs] Go version 1.16 will be removed on August, 15th](https://github.com/actions/runner-images/issues/6024) | -| [[Windows] mongo service will be disabled by default on August, 8th](https://github.com/actions/runner-images/issues/5949) | -| [[all OSs] Android NDK 21 will be replaced in favor of 25 on August, 1st](https://github.com/actions/runner-images/issues/5930) | -*** # Microsoft Windows Server 2019 Datacenter - OS Version: 10.0.17763 Build 3287 -- Image Version: 20220814.1 +- Image Version: 20220821.1 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -15,10 +9,10 @@ ### Language and Runtime - Bash 5.1.16(1)-release - Go 1.17.13 -- Julia 1.7.3 +- Julia 1.8.0 - Kotlin 1.7.10 - LLVM 14.0.6 -- Node 16.16.0 +- Node 16.17.0 - Perl 5.32.1 - PHP 8.1.9 - Python 3.7.9 @@ -26,15 +20,15 @@ ### Package Management - Chocolatey 1.1.0 -- Composer 2.3.10 +- Composer 2.4.1 - Helm 3.9.2 - Miniconda 4.12.0 (pre-installed on the image but not added to PATH) -- NPM 8.11.0 +- NPM 8.15.0 - NuGet 6.3.0.131 - pip 22.2.2 (python 3.7) - Pipx 1.1.0 - RubyGems 2.7.6.3 -- Vcpkg (build from master \<d293ac220>) +- Vcpkg (build from master \<9259a0719>) - Yarn 1.22.19 #### Environment variables @@ -54,23 +48,23 @@ - aria2 1.36.0 - azcopy 10.16.0 - Bazel 5.2.0 -- Bazelisk 1.12.0 +- Bazelisk 1.12.1 - Bicep 0.9.1 - Cabal 3.8.1.0 -- CMake 3.24.0 -- CodeQL Action Bundle 2.10.2 +- CMake 3.24.1 +- CodeQL Action Bundle 2.10.3 - Docker 20.10.7 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.9.0 +- Docker Compose v2 2.10.0 - Docker-wincred 0.6.4 - ghc 9.4.1 - Git 2.37.2.windows.2 - Git LFS 3.2.0 -- Google Cloud SDK 397.0.0 +- Google Cloud SDK 398.0.0 - InnoSetup 6.2.1 - jq 1.6 - Kind 0.14.0 -- Kubectl 1.24.3 +- Kubectl 1.24.4 - Mercurial 5.0 - Mingw-w64 8.1.0 - Newman 5.3.2 @@ -78,7 +72,7 @@ - OpenSSL 1.1.1 - Packer 1.8.2 - Parcel 2.7.0 -- Pulumi v3.37.2 +- Pulumi v3.38.0 - R 4.2.1 - Service Fabric SDK 9.0.1028.9590 - Stack 2.7.5 @@ -92,8 +86,8 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.124 -- AWS CLI 2.7.22 -- AWS SAM CLI 1.53.0 +- AWS CLI 2.7.25 +- AWS SAM CLI 1.55.0 - AWS Session Manager CLI 1.2.339.0 - Azure CLI 2.39.0 - Azure DevOps CLI extension 0.25.0 @@ -116,10 +110,10 @@ - Rustfmt 1.5.1 ### Browsers and webdrivers -- Google Chrome 104.0.5112.81 +- Google Chrome 104.0.5112.102 - Chrome Driver 104.0.5112.79 -- Microsoft Edge 104.0.1293.54 -- Microsoft Edge Driver 104.0.1293.54 +- Microsoft Edge 104.0.1293.63 +- Microsoft Edge Driver 104.0.1293.63 - Mozilla Firefox 103.0.2 - Gecko Driver 0.31.0 - IE Driver 3.150.1.1 @@ -137,7 +131,7 @@ | Version | Vendor | Environment Variable | | ------------------- | --------------- | -------------------- | | 8.0.345+1 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | -| 11.0.16+8 | Eclipse Temurin | JAVA_HOME_11_X64 | +| 11.0.16+101 | Eclipse Temurin | JAVA_HOME_11_X64 | | 13.0.2+8.1 | Adopt OpenJDK | JAVA_HOME_13_X64 | | 17.0.4+8 | Eclipse Temurin | JAVA_HOME_17_X64 | @@ -221,7 +215,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### MongoDB | Version | ServiceName | ServiceStatus | ServiceStartType | | -------- | ----------- | ------------- | ---------------- | -| 5.0.10.0 | MongoDB | Stopped | Disabled | +| 5.0.11.0 | MongoDB | Stopped | Disabled | ### Database tools - Azure CosmosDb Emulator 2.14.9.0 @@ -398,6 +392,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Component.VC.TestAdapterForGoogleTest | 16.0.28517.75 | | Microsoft.VisualStudio.Component.VC.Tools.ARM | 16.11.32406.258 | | Microsoft.VisualStudio.Component.VC.Tools.ARM64 | 16.11.32406.258 | +| Microsoft.VisualStudio.Component.VC.Tools.ARM64EC | 16.10.31205.252 | | Microsoft.VisualStudio.Component.VC.Tools.x86.x64 | 16.11.32406.258 | | Microsoft.VisualStudio.Component.VC.v141.ARM | 16.10.31205.252 | | Microsoft.VisualStudio.Component.VC.v141.ARM.Spectre | 16.5.29515.121 | @@ -548,7 +543,7 @@ All other versions are saved but not installed. #### Powershell Modules | Module | Version | | ------------------ | ---------------- | -| AWSPowerShell | 4.1.146 | +| AWSPowerShell | 4.1.151 | | DockerMsftProvider | 1.0.0.8 | | MarkdownPS | 1.9 | | Microsoft.Graph | 1.11.0 | @@ -594,4 +589,3 @@ All other versions are saved but not installed. | mcr.microsoft.com/windows/nanoserver:1809 | sha256:c827903a303cb7a76214adb4376e462a241b3cd763cb88655cd901c5a0e867a0 | 2022-08-06 | | mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:8ca3aaeb91e7715a98a0769dc62ed69212aac3e0bbee12ffd13b5e36d992d127 | 2022-08-06 | - From af3dd14fe039b539ac16336e571f761173676b3e Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Tue, 23 Aug 2022 18:43:19 +0200 Subject: [PATCH 1421/3485] [macOS] always return True on gfortran check (#6133) --- images/macos/provision/core/gcc.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/macos/provision/core/gcc.sh b/images/macos/provision/core/gcc.sh index 0fe468ffb94b..a7fa06fd0235 100644 --- a/images/macos/provision/core/gcc.sh +++ b/images/macos/provision/core/gcc.sh @@ -8,7 +8,7 @@ for gccVersion in $gccVersions; do done # Delete default gfortran link if it exists https://github.com/actions/runner-images/issues/1280 -gfortranPath=$(which gfortran) +gfortranPath=$(which gfortran) || true if [ $gfortranPath ]; then rm $gfortranPath fi From ef55b435e5fc89df18f7fe01f9c6c9c5261a018d Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Wed, 24 Aug 2022 10:46:37 +0200 Subject: [PATCH 1422/3485] Update inotify resource limits (#6132) --- images/linux/scripts/installers/configure-environment.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/images/linux/scripts/installers/configure-environment.sh b/images/linux/scripts/installers/configure-environment.sh index 05bf87ba10f6..049283f67a90 100644 --- a/images/linux/scripts/installers/configure-environment.sh +++ b/images/linux/scripts/installers/configure-environment.sh @@ -32,6 +32,10 @@ chmod -R 777 $AGENT_TOOLSDIRECTORY # https://www.suse.com/support/kb/doc/?id=000016692 echo 'vm.max_map_count=262144' | tee -a /etc/sysctl.conf +# https://kind.sigs.k8s.io/docs/user/known-issues/#pod-errors-due-to-too-many-open-files +echo 'fs.inotify.max_user_watches=655360' | tee -a /etc/sysctl.conf +echo 'fs.inotify.max_user_instances=1280' | tee -a /etc/sysctl.conf + # Create symlink for tests running chmod +x $HELPER_SCRIPTS/invoke-tests.sh ln -s $HELPER_SCRIPTS/invoke-tests.sh /usr/local/bin/invoke_tests From 06dd4c14e4aa8c14febdd8d6cf123b8d770b4e4a Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Wed, 24 Aug 2022 17:17:18 +0200 Subject: [PATCH 1423/3485] [macOS] Don't show CodeQl in Catalina's sw report (#6139) --- .../macos/software-report/SoftwareReport.Generator.ps1 | 9 +++++++-- images/macos/tests/Common.Tests.ps1 | 4 ++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1 index c83645f50b48..d3e43733c205 100644 --- a/images/macos/software-report/SoftwareReport.Generator.ps1 +++ b/images/macos/software-report/SoftwareReport.Generator.ps1 @@ -159,10 +159,15 @@ $toolsList = @( (Get-AzureDevopsVersion), (Get-AWSCLIVersion), (Get-AWSSAMCLIVersion), - (Get-AWSSessionManagerCLIVersion), - (Get-CodeQLBundleVersion) + (Get-AWSSessionManagerCLIVersion) ) +if (-not $os.IsCatalina) { + $toolsList += @( + (Get-CodeQLBundleVersion) + ) +} + if ($os.IsLessThanMonterey) { $toolsList += @( (Get-AliyunCLIVersion) diff --git a/images/macos/tests/Common.Tests.ps1 b/images/macos/tests/Common.Tests.ps1 index aa5a9db45163..9ae2eaa9c3a4 100644 --- a/images/macos/tests/Common.Tests.ps1 +++ b/images/macos/tests/Common.Tests.ps1 @@ -139,13 +139,13 @@ Describe "VirtualBox" -Skip:($os.IsBigSur) { } } -Describe "CodeQL" { +Describe "CodeQL" -Skip:($os.IsCatalina) { It "codeql" { $CodeQLVersionWildcard = Join-Path $Env:AGENT_TOOLSDIRECTORY -ChildPath "CodeQL" | Join-Path -ChildPath "*" $CodeQLVersionPath = Get-ChildItem $CodeQLVersionWildcard | Select-Object -First 1 -Expand FullName $CodeQLPath = Join-Path $CodeQLVersionPath -ChildPath "x64" | Join-Path -ChildPath "codeql" | Join-Path -ChildPath "codeql" "$CodeQLPath version --quiet" | Should -ReturnZeroExitCode - + $CodeQLPacksPath = Join-Path $CodeQLVersionPath -ChildPath "x64" | Join-Path -ChildPath "codeql" | Join-Path -ChildPath "qlpacks" $CodeQLPacksPath | Should -Exist } From b23edef7232babfd5857add0c2451034dd74c747 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Thu, 25 Aug 2022 15:12:31 +0200 Subject: [PATCH 1424/3485] [macOS] Use json to parse libraries version (#6143) --- images/macos/software-report/SoftwareReport.Common.psm1 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/images/macos/software-report/SoftwareReport.Common.psm1 b/images/macos/software-report/SoftwareReport.Common.psm1 index ff949b008585..22c30c9d41a8 100644 --- a/images/macos/software-report/SoftwareReport.Common.psm1 +++ b/images/macos/software-report/SoftwareReport.Common.psm1 @@ -524,22 +524,22 @@ function Get-JazzyVersion { } function Get-ZlibVersion { - $zlibVersion = (brew info zlib)[0] | Take-Part -Part 2 + $zlibVersion = brew info --json zlib | jq -r '.[].installed[].version' return "Zlib $zlibVersion" } function Get-LibXftVersion { - $libXftVersion = (brew info libxft)[0] | Take-Part -Part 2 + $libXftVersion = brew info --json libxft | jq -r '.[].installed[].version' return "libXft $libXftVersion" } function Get-LibXextVersion { - $libXextVersion = (brew info libxext)[0] | Take-Part -Part 2 + $libXextVersion = brew info --json libxext | jq -r '.[].installed[].version' return "libXext $libXextVersion" } function Get-TclTkVersion { - $tcltkVersion = (brew info tcl-tk)[0] | Take-Part -Part 2 + $tcltkVersion = brew info --json tcl-tk | jq -r '.[].installed[].version' return "Tcl/Tk $tcltkVersion" } From 10f5bdffe284cc59d2f6d204ee58503c7c1afa30 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Thu, 25 Aug 2022 17:01:30 +0200 Subject: [PATCH 1425/3485] [Windows] Add Microsoft.Net.Component.4.8.1 (#6125) * Add Microsoft.Net.Component.4.8.1 * Add reboot step --- images/win/toolsets/toolset-2022.json | 2 ++ images/win/windows2022.json | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index 5e258097d4d4..fbac8fbb0bb1 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -189,6 +189,8 @@ "Microsoft.Component.VC.Runtime.UCRTSDK", "Microsoft.Net.Component.4.7.TargetingPack", "Microsoft.Net.Component.4.7.2.TargetingPack", + "Microsoft.Net.Component.4.8.1.SDK", + "Microsoft.Net.Component.4.8.1.TargetingPack", "Microsoft.VisualStudio.Component.AspNet45", "Microsoft.VisualStudio.Component.Azure.ServiceFabric.Tools", "Microsoft.VisualStudio.Component.Debugger.JustInTime", diff --git a/images/win/windows2022.json b/images/win/windows2022.json index 703e4a1c9af7..a47d6d36fb6f 100644 --- a/images/win/windows2022.json +++ b/images/win/windows2022.json @@ -170,8 +170,14 @@ "elevated_user": "{{user `install_user`}}", "elevated_password": "{{user `install_password`}}" }, + { + "type": "windows-restart", + "check_registry": true, + "restart_timeout": "10m" + }, { "type": "powershell", + "pause_before": "2m", "scripts": [ "{{ template_dir }}/scripts/Installers/Install-Wix.ps1", "{{ template_dir }}/scripts/Installers/Install-WDK.ps1", From bf3b49d23be89db69f791beb501af8c333a39efd Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 26 Aug 2022 08:20:24 +0000 Subject: [PATCH 1426/3485] macOS 12 (20220823 update) (#6142) * Updating readme file for macOS-12 version 20220823.1 * Update macos-12-Readme.md Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-12-Readme.md | 88 ++++++++++++++++----------------- 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/images/macos/macos-12-Readme.md b/images/macos/macos-12-Readme.md index 4e410c48d033..9309d6f789cc 100644 --- a/images/macos/macos-12-Readme.md +++ b/images/macos/macos-12-Readme.md @@ -1,11 +1,11 @@ | Announcements | |-| -| [The macOS 10.15 Actions runner image will begin deprecation on 5/31/22 and will be fully unsupported by 8/30/22 in GitHub and by 9/30/22 in ADO](https://github.com/actions/runner-images/issues/5583) | +| [The macOS 10.15 Actions runner image will begin deprecation on 5/31/22 and will be fully unsupported by 12/1/22 for GitHub and ADO](https://github.com/actions/runner-images/issues/5583) | *** # macOS 12.5 info -- System Version: macOS 12.5 (21G72) +- System Version: macOS 12.5.1 (21G83) - Kernel Version: Darwin 21.6.0 -- Image Version: 20220815.1 +- Image Version: 20220823.1 ## Installed Software ### Language and Runtime @@ -16,12 +16,12 @@ - gcc-11 (Homebrew GCC 11.3.0) 11.3.0 - available by `gcc-11` alias - GNU Fortran (Homebrew GCC 11.3.0) 11.3.0 - available by `gfortran-11` alias - Go 1.17.13 -- julia 1.7.3 +- julia 1.8.0 - Kotlin 1.7.10-release-333 - MSBuild 16.10.1.31401 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) -- Node.js v16.16.0 +- Node.js v16.17.0 - NVM 0.39.1 -- NVM - Cached node versions: v12.22.12 v14.20.0 v16.16.0 +- NVM - Cached node versions: v12.22.12 v14.20.0 v16.17.0 - Perl 5.34.0 - PHP 8.1.9 - Python 2.7.18 @@ -33,16 +33,16 @@ - Bundler version 2.3.20 - Carthage 0.38.0 - CocoaPods 1.11.3 -- Composer 2.3.10 -- Homebrew 3.5.9 +- Composer 2.4.1 +- Homebrew 3.5.10 - Miniconda 4.12.0 -- NPM 8.11.0 +- NPM 8.15.0 - NuGet 6.2.1.2 - Pip 20.3.4 (python 2.7) - Pip 22.2.2 (python 3.10) - Pipx 1.1.0 - RubyGems 3.3.20 -- Vcpkg 2022 (build from master \<acc3bcf76>) +- Vcpkg 2022 (build from master \<88b1071e3>) - Yarn 1.22.19 #### Environment variables @@ -61,25 +61,25 @@ - 7-Zip 17.04 - aria2 1.36.0 - azcopy 10.16.0 -- bazel 5.2.0 -- bazelisk 1.12.0 +- bazel 5.3.0 +- bazelisk 1.12.2 - bsdtar 3.5.1 - available by 'tar' alias - Curl 7.84.0 - Git 2.37.2 - Git LFS: 3.2.0 -- GitHub CLI: 2.14.4 +- GitHub CLI: 2.14.5 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.3 - gpg (GnuPG) 2.3.7 - Hub CLI: 2.14.2 -- ImageMagick 7.1.0-45 +- ImageMagick 7.1.0-46 - jq 1.6 -- mongo v5.0.10 -- mongod v5.0.10 +- mongo v5.0.11 +- mongod v5.0.11 - OpenSSL 1.1.1q 5 Jul 2022 `(/usr/local/opt/openssl@1.1 -> ../Cellar/openssl@1.1/1.1.1q)` - Packer 1.8.3 -- PostgreSQL 14.4 -- psql (PostgreSQL) 14.4 +- PostgreSQL 14.5 +- psql (PostgreSQL) 14.5 - Sox 14.4.2 - Subversion (SVN) 1.14.2 - Switchaudio-osx 1.1.0 @@ -90,21 +90,21 @@ ### Tools - App Center CLI 2.11.0 -- AWS CLI 2.7.23 -- AWS SAM CLI 1.54.0 +- AWS CLI 2.7.25 +- AWS SAM CLI 1.55.0 - AWS Session Manager CLI 1.2.339.0 - Azure CLI (azure-devops) 0.25.0 - Azure CLI 2.39.0 - Bicep CLI 0.9.1 - Cabal 3.6.2.0 -- Cmake 3.24.0 -- CodeQL Action Bundle 2.10.2 -- Fastlane 2.209.0 +- Cmake 3.24.1 +- CodeQL Action Bundle 2.10.3 +- Fastlane 2.209.1 - GHC 9.4.1 - GHCup 0.1.18.0 - Jazzy 0.14.2 - Stack 2.7.5 -- SwiftFormat 0.49.16 +- SwiftFormat 0.49.17 - Swig 4.0.2 - Xcode Command Line Tools 13.4.0.0.1.1651278267 @@ -113,12 +113,12 @@ - yamllint 1.27.1 ### Browsers -- Safari 15.6 (17613.3.9.1.5) -- SafariDriver 15.6 (17613.3.9.1.5) -- Google Chrome 104.0.5112.79 +- Safari 15.6.1 (17613.3.9.1.16) +- SafariDriver 15.6.1 (17613.3.9.1.16) +- Google Chrome 104.0.5112.101 - ChromeDriver 104.0.5112.79 -- Microsoft Edge 104.0.1293.54 -- Microsoft Edge WebDriver 104.0.1293.54 +- Microsoft Edge 104.0.1293.63 +- Microsoft Edge WebDriver 104.0.1293.63 - Mozilla Firefox 103.0.2 - geckodriver 0.31.0 - Selenium server 4.4.0 @@ -134,8 +134,8 @@ | Version | Vendor | Environment Variable | | ------------------- | --------------- | -------------------- | | 8.0.345+1 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | -| 11.0.16+8 | Eclipse Temurin | JAVA_HOME_11_X64 | -| 17.0.4+8 | Eclipse Temurin | JAVA_HOME_17_X64 | +| 11.0.16+101 | Eclipse Temurin | JAVA_HOME_11_X64 | +| 17.0.4+101 | Eclipse Temurin | JAVA_HOME_17_X64 | ### GraalVM | Version | Environment variables | @@ -163,7 +163,7 @@ #### Node.js - 12.22.12 - 14.20.0 -- 16.16.0 +- 16.17.0 #### Go | Version | Architecture | Environment Variable | @@ -205,10 +205,10 @@ ### Xamarin #### Visual Studio for Mac -| Version | Build | Path | -| -------------- | ----------- | ------------------------------------ | -| 2019 | 8.10.25.2 | /Applications/Visual Studio 2019.app | -| 2022 (default) | 17.3.0.2102 | /Applications/Visual Studio.app | +| Version | Build | Path | +| -------------- | --------- | ------------------------------------ | +| 2019 | 8.10.25.2 | /Applications/Visual Studio 2019.app | +| 2022 (default) | 17.3.2.24 | /Applications/Visual Studio.app | ##### Notes: ``` @@ -237,7 +237,7 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" ### Xcode | Version | Build | Path | | ---------------- | -------- | ------------------------------ | -| 14.0 (beta) | 14A5294e | /Applications/Xcode_14.0.app | +| 14.0 (beta) | 14A5294g | /Applications/Xcode_14.0.app | | 13.4.1 (default) | 13F100 | /Applications/Xcode_13.4.1.app | | 13.4 | 13F17a | /Applications/Xcode_13.4.app | | 13.3.1 | 13E500a | /Applications/Xcode_13.3.1.app | @@ -308,28 +308,28 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" | Android Emulator | 31.3.10 | | Android SDK Build-tools | 33.0.0<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | | Android SDK Platforms | android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | -| Android SDK Platform-Tools | 33.0.2 | +| Android SDK Platform-Tools | 33.0.3 | | Android Support Repository | 47.0.0 | | CMake | 3.18.1<br>3.22.1 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 23.2.8568313<br>24.0.8215888<br>25.0.8775105 (default) | +| NDK | 23.2.8568313<br>24.0.8215888<br>25.1.8937393 (default) | | SDK Patch Applier v4 | 1 | #### Environment variables | Name | Value | | ----------------------- | -------------------------------------------------- | | ANDROID_HOME | /Users/runner/Library/Android/sdk | -| ANDROID_NDK | /Users/runner/Library/Android/sdk/ndk/25.0.8775105 | -| ANDROID_NDK_HOME | /Users/runner/Library/Android/sdk/ndk/25.0.8775105 | -| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/25.0.8775105 | -| ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk/25.0.8775105 | +| ANDROID_NDK | /Users/runner/Library/Android/sdk/ndk/25.1.8937393 | +| ANDROID_NDK_HOME | /Users/runner/Library/Android/sdk/ndk/25.1.8937393 | +| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/25.1.8937393 | +| ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk/25.1.8937393 | | ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | ### Miscellaneous - libXext 1.3.4 - libXft 2.3.4 -- Tcl/Tk 8.6.12 +- Tcl/Tk 8.6.12_1 - Zlib 1.2.12 From 59cd4c1affed0298c18be6fada73b84785efbbe4 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Fri, 26 Aug 2022 10:29:28 +0200 Subject: [PATCH 1427/3485] [macOS] Install tvOS and watchOS runtime sims (#6140) --- images/macos/provision/core/xcode.ps1 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/images/macos/provision/core/xcode.ps1 b/images/macos/provision/core/xcode.ps1 index 802bb9af4392..2b0a709dc7b4 100644 --- a/images/macos/provision/core/xcode.ps1 +++ b/images/macos/provision/core/xcode.ps1 @@ -47,6 +47,16 @@ $xcodeVersions | ForEach-Object { } } +$xcodeVersions | ForEach-Object { + if ($_.link.StartsWith("14.")) { + Write-Host "Installing Simulator Runtimes..." + + # tvOS and watchOS simulators are not included by default + $xcodebuildPath = Get-XcodeToolPath -Version $_.link -ToolName "xcodebuild" + Invoke-ValidateCommand "$xcodebuildPath -downloadAllPlatforms" + } +} + Write-Host "Rebuilding Launch Services database ..." $xcodeVersions | ForEach-Object { Rebuild-XcodeLaunchServicesDb -Version $_.link From 190a1de6f7f996e0870c961872b2cc1b666079f1 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 26 Aug 2022 15:27:47 +0000 Subject: [PATCH 1428/3485] Updating readme file for macOS-11 version 20220822.4 (#6130) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-11-Readme.md | 57 ++++++++++++++++----------------- 1 file changed, 28 insertions(+), 29 deletions(-) diff --git a/images/macos/macos-11-Readme.md b/images/macos/macos-11-Readme.md index 4d9e1c4e3ef0..00fe4b87a9d1 100644 --- a/images/macos/macos-11-Readme.md +++ b/images/macos/macos-11-Readme.md @@ -1,12 +1,11 @@ | Announcements | |-| -| [[all OSs] Android NDK 21 will be replaced in favor of 25 on August, 1st](https://github.com/actions/runner-images/issues/5930) | -| [The macOS 10.15 Actions runner image will begin deprecation on 5/31/22 and will be fully unsupported by 8/30/22 in GitHub and by 9/30/22 in ADO](https://github.com/actions/runner-images/issues/5583) | +| [The macOS 10.15 Actions runner image will begin deprecation on 5/31/22 and will be fully unsupported by 12/1/22 for GitHub and ADO](https://github.com/actions/runner-images/issues/5583) | *** # macOS 11.6 info - System Version: macOS 11.6.8 (20G730) - Kernel Version: Darwin 20.6.0 -- Image Version: 20220815.1 +- Image Version: 20220822.4 ## Installed Software ### Language and Runtime @@ -21,12 +20,12 @@ - GNU Fortran (Homebrew GCC 10.4.0) 10.4.0 - available by `gfortran-10` alias - GNU Fortran (Homebrew GCC 11.3.0) 11.3.0 - available by `gfortran-11` alias - Go 1.17.13 -- julia 1.7.3 +- julia 1.8.0 - Kotlin 1.7.10-release-333 - MSBuild 16.10.1.31401 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) -- Node.js v16.16.0 +- Node.js v16.17.0 - NVM 0.39.1 -- NVM - Cached node versions: v12.22.12 v14.20.0 v16.16.0 +- NVM - Cached node versions: v12.22.12 v14.20.0 v16.17.0 - Perl 5.34.0 - PHP 8.1.9 - Python 2.7.18 @@ -38,16 +37,16 @@ - Bundler version 2.3.20 - Carthage 0.38.0 - CocoaPods 1.11.3 -- Composer 2.3.10 +- Composer 2.4.1 - Homebrew 3.5.9 - Miniconda 4.12.0 -- NPM 8.11.0 +- NPM 8.15.0 - NuGet 6.2.1.2 - Pip 20.3.4 (python 2.7) - Pip 22.2.2 (python 3.10) - Pipx 1.1.0 - RubyGems 3.3.20 -- Vcpkg 2022 (build from master \<acc3bcf76>) +- Vcpkg 2022 (build from master \<9259a0719>) - Yarn 1.22.19 #### Environment variables @@ -67,7 +66,7 @@ - aria2 1.36.0 - azcopy 10.16.0 - bazel 5.2.0 -- bazelisk 1.12.0 +- bazelisk 1.12.2 - bsdtar 3.3.2 - available by 'tar' alias - Curl 7.84.0 - Git 2.37.2 @@ -78,15 +77,15 @@ - gpg (GnuPG) 2.3.7 - helm v3.9.3+g414ff28 - Hub CLI: 2.14.2 -- ImageMagick 7.1.0-45 +- ImageMagick 7.1.0-46 - jq 1.6 - mongo v5.0.10 - mongod v5.0.10 - Newman 5.3.2 - OpenSSL 1.1.1q 5 Jul 2022 `(/usr/local/opt/openssl@1.1 -> ../Cellar/openssl@1.1/1.1.1q)` - Packer 1.8.3 -- PostgreSQL 14.4 -- psql (PostgreSQL) 14.4 +- PostgreSQL 14.5 +- psql (PostgreSQL) 14.5 - Sox 14.4.2 - Subversion (SVN) 1.14.2 - Switchaudio-osx 1.1.0 @@ -94,23 +93,23 @@ - zstd 1.5.2 ### Tools -- Aliyun CLI 3.0.124 +- Aliyun CLI 3.0.125 - App Center CLI 2.11.0 -- AWS CLI 2.7.23 -- AWS SAM CLI 1.54.0 +- AWS CLI 2.7.25 +- AWS SAM CLI 1.55.0 - AWS Session Manager CLI 1.2.339.0 - Azure CLI (azure-devops) 0.25.0 - Azure CLI 2.39.0 - Bicep CLI 0.9.1 - Cabal 3.6.2.0 -- Cmake 3.24.0 -- CodeQL Action Bundle 2.10.2 +- Cmake 3.24.1 +- CodeQL Action Bundle 2.10.3 - Fastlane 2.209.0 - GHC 9.4.1 - GHCup 0.1.18.0 - Jazzy 0.14.2 - Stack 2.7.5 -- SwiftFormat 0.49.16 +- SwiftFormat 0.49.17 - Swig 4.0.2 - Xcode Command Line Tools 13.2.0.0.1.1638488800 @@ -119,12 +118,12 @@ - yamllint 1.27.1 ### Browsers -- Safari 15.6 (16613.3.9.1.7) -- SafariDriver 15.6 (16613.3.9.1.7) -- Google Chrome 104.0.5112.79 +- Safari 15.6.1 (16613.3.9.1.16) +- SafariDriver 15.6.1 (16613.3.9.1.16) +- Google Chrome 104.0.5112.101 - ChromeDriver 104.0.5112.79 -- Microsoft Edge 104.0.1293.54 -- Microsoft Edge WebDriver 104.0.1293.54 +- Microsoft Edge 104.0.1293.63 +- Microsoft Edge WebDriver 104.0.1293.63 - Mozilla Firefox 103.0.2 - geckodriver 0.31.0 - Selenium server 4.4.0 @@ -172,7 +171,7 @@ #### Node.js - 12.22.12 - 14.20.0 -- 16.16.0 +- 16.17.0 #### Go | Version | Architecture | Environment Variable | @@ -214,10 +213,10 @@ ### Xamarin #### Visual Studio for Mac -| Version | Build | Path | -| -------------- | ----------- | ------------------------------------ | -| 2019 | 8.10.25.2 | /Applications/Visual Studio 2019.app | -| 2022 (default) | 17.3.0.2102 | /Applications/Visual Studio.app | +| Version | Build | Path | +| -------------- | ---------- | ------------------------------------ | +| 2019 | 8.10.25.2 | /Applications/Visual Studio 2019.app | +| 2022 (default) | 17.3.1.411 | /Applications/Visual Studio.app | ##### Notes: ``` From 2959f467cefba1f0bc26da2e9cecdc9255678d6b Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Sun, 28 Aug 2022 18:11:59 +0300 Subject: [PATCH 1429/3485] Install the latest swiftlint only for macOS 12 (#6151) --- images/macos/provision/core/swiftlint.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/images/macos/provision/core/swiftlint.sh b/images/macos/provision/core/swiftlint.sh index b4cea6851384..47259f3c647c 100644 --- a/images/macos/provision/core/swiftlint.sh +++ b/images/macos/provision/core/swiftlint.sh @@ -2,7 +2,14 @@ source ~/utils/utils.sh echo "Install SwiftLint" -swiftlintUrl=$(get_github_package_download_url "realm/SwiftLint" "contains(\"portable_swiftlint.zip\")" "latest" "$API_PAT") +# SwiftLint now requires Swift 5.6 or higher to build, and macOS 12 or higher to run https://github.com/realm/SwiftLint/releases/tag/0.49.0 +if is_Less_Monterey; then + version="0.48.0" +else + version="latest" +fi + +swiftlintUrl=$(get_github_package_download_url "realm/SwiftLint" "contains(\"portable_swiftlint.zip\")" "$version" "$API_PAT") download_with_retries $swiftlintUrl "/tmp" "portable_swiftlint.zip" unzip -q "/tmp/portable_swiftlint.zip" -d /usr/local/bin # Remove the LICENSE file that comes along with the binary and the downloaded archive From 30031f7d7b6161d5c2e0f4fa27924f70994db15b Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Mon, 29 Aug 2022 14:29:38 +0300 Subject: [PATCH 1430/3485] Take second split from the end (#6156) --- images/macos/tests/Databases.Tests.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/macos/tests/Databases.Tests.ps1 b/images/macos/tests/Databases.Tests.ps1 index 9c6f9a263bca..084b2d910ed0 100644 --- a/images/macos/tests/Databases.Tests.ps1 +++ b/images/macos/tests/Databases.Tests.ps1 @@ -12,8 +12,8 @@ Describe "PostgreSQL" { It "PostgreSQL version should correspond to the version in the toolset" { $toolsetVersion = Get-ToolsetValue 'postgresql.version' # Client version - (psql --version).split()[-1] | Should -BeLike "$toolsetVersion*" + (psql --version).split()[-2] | Should -BeLike "$toolsetVersion*" # Server version - (pg_config --version).split()[-1] | Should -BeLike "$toolsetVersion*" + (pg_config --version).split()[-2] | Should -BeLike "$toolsetVersion*" } } \ No newline at end of file From 22ec52bf2cb7cc3513642d1870a0738e19f02040 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Mon, 29 Aug 2022 20:21:08 +0300 Subject: [PATCH 1431/3485] Uninstall public_suffix 5.0 gem (#6150) --- images/macos/provision/core/rubygem.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/images/macos/provision/core/rubygem.sh b/images/macos/provision/core/rubygem.sh index 60cd1c93dfd0..237c2f52a64c 100755 --- a/images/macos/provision/core/rubygem.sh +++ b/images/macos/provision/core/rubygem.sh @@ -12,4 +12,7 @@ if [ -n "$gemsToInstall" ]; then done fi +# Temporary uninstall public_suffix 5.0 gem as Cocoapods is not compatible with it yet https://github.com/actions/runner-images/issues/6149 +gem uninstall public_suffix -v 5.0.0 + invoke_tests "RubyGem" From f76ec3d91cf2e8c6934b44173681e856a80b4e05 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 30 Aug 2022 07:39:30 +0000 Subject: [PATCH 1432/3485] Updating readme file for ubuntu22 version 20220828.1 (#6159) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2204-Readme.md | 84 ++++++++++++++++--------------- 1 file changed, 44 insertions(+), 40 deletions(-) diff --git a/images/linux/Ubuntu2204-Readme.md b/images/linux/Ubuntu2204-Readme.md index 878f3bff65a4..67c8c2b84141 100644 --- a/images/linux/Ubuntu2204-Readme.md +++ b/images/linux/Ubuntu2204-Readme.md @@ -1,10 +1,10 @@ | Announcements | |-| -| [The Ubuntu 18.04 Actions runner image will begin deprecation on 8/8/22 and will be fully unsupported by 12/1/22](https://github.com/actions/runner-images/issues/6002) | +| [The Ubuntu 18.04 Actions runner image will begin deprecation on 8/8/22 and will be fully unsupported by TBD](https://github.com/actions/runner-images/issues/6002) | *** # Ubuntu 22.04.1 LTS - Linux kernel version: 5.15.0-1017-azure -- Image Version: 20220821.1 +- Image Version: 20220828.1 ## Installed Software ### Language and Runtime @@ -27,8 +27,8 @@ ### Package Management - cpan 1.64 -- Helm 3.9.3 -- Homebrew 3.5.9 +- Helm 3.9.4 +- Homebrew 3.5.10 - Miniconda 4.12.0 - Npm 8.15.0 - NuGet 6.2.1.2 @@ -36,7 +36,7 @@ - Pip3 22.0.2 - Pipx 1.1.0 - RubyGems 3.3.5 -- Vcpkg (build from master \<9259a0719>) +- Vcpkg (build from master \<e85b5bb95>) - Yarn 1.22.19 #### Environment variables @@ -52,7 +52,7 @@ - Ansible 2.13.3 - apt-fast 1.9.12 - AzCopy 10.16.0 (available by `azcopy` and `azcopy10` aliases) -- Bazel 5.2.0 +- Bazel 5.3.0 - Bazelisk 1.12.1 - Bicep 0.9.1 - Buildah 1.23.1 @@ -60,11 +60,11 @@ - CodeQL Action Bundle 2.10.3 - Docker Amazon ECR Credential Helper 0.6.0 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.9.0+azure-1 -- Docker-Buildx 0.9.0 +- Docker Compose v2 2.10.1+azure-1 +- Docker-Buildx 0.9.1 - Docker-Moby Client 20.10.17+azure-1 -- Docker-Moby Server 20.10.17+azure-1 -- Fastlane 2.209.0 +- Docker-Moby Server 20.10.17+azure-3 +- Fastlane 2.209.1 - Git 2.37.2 (apt source repository: ppa:git-core/ppa) - Git LFS 3.2.0 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.6.0 @@ -72,7 +72,7 @@ - Heroku 7.62.0 - jq 1.6 - Kind 0.14.0 -- Kubectl 1.24.4 +- Kubectl 1.25.0 - Kustomize 4.5.7 - Leiningen 2.9.10 - MediaInfo 21.09 @@ -90,32 +90,32 @@ - Skopeo 1.4.1 - Sphinx Open Source Search Server 2.2.11 - SVN 1.14.1 -- Terraform 1.2.7 +- Terraform 1.2.8 - yamllint 1.27.1 - yq 4.27.2 - zstd 1.5.2 (homebrew) ### CLI Tools -- Alibaba Cloud CLI 3.0.124 -- AWS CLI 2.7.25 +- Alibaba Cloud CLI 3.0.125 +- AWS CLI 2.7.27 - AWS CLI Session manager plugin 1.2.339.0 - AWS SAM CLI 1.55.0 - Azure CLI (azure-cli) 2.39.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.25.0 -- GitHub CLI 2.14.4 +- GitHub CLI 2.14.7 - Google Cloud SDK 369.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 11.3.0 -- OpenShift CLI 4.11.0 -- ORAS CLI 0.13.0 -- Vercel CLI 28.1.0 +- Netlify CLI 11.5.0 +- OpenShift CLI 4.11.1 +- ORAS CLI 0.14.0 +- Vercel CLI 28.2.0 ### Java | Version | Vendor | Environment Variable | | ------------------- | --------------- | -------------------- | | 8.0.345+1 | Eclipse Temurin | JAVA_HOME_8_X64 | -| 11.0.16+8 (default) | Eclipse Temurin | JAVA_HOME_11_X64 | -| 17.0.4+8 | Eclipse Temurin | JAVA_HOME_17_X64 | +| 11.0.16+1 (default) | Eclipse Temurin | JAVA_HOME_11_X64 | +| 17.0.4+1 | Eclipse Temurin | JAVA_HOME_17_X64 | ### GraalVM | Version | Environment variables | @@ -127,13 +127,13 @@ | -------- | ------- | | PHP | 8.1.9 | | Composer | 2.4.1 | -| PHPUnit | 8.5.28 | +| PHPUnit | 8.5.29 | ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ``` ### Haskell - Cabal 3.6.2.0 -- GHC 9.4.1 +- GHC 9.4.2 - GHCup 0.1.18.0 - Stack 2.7.5 @@ -155,8 +155,8 @@ - Google Chrome 104.0.5112.101 - ChromeDriver 104.0.5112.79 - Chromium 104.0.5112.0 -- Microsoft Edge 104.0.1293.63 (apt source repository: https://packages.microsoft.com/repos/edge) -- Microsoft Edge WebDriver 104.0.1293.63 +- Microsoft Edge 104.0.1293.70 (apt source repository: https://packages.microsoft.com/repos/edge) +- Microsoft Edge WebDriver 104.0.1293.70 - Selenium server 4.4.0 #### Environment variables @@ -190,6 +190,10 @@ ``` MySQL service is disabled by default. Use the following command as a part of your job to start the service: 'sudo systemctl start mysql.service' ``` +#### MS SQL Server Client Tools +- sqlcmd 17.10.0001.1 +- SqlPackage 16.0.6161.0 + ### Cached Tools #### Go - 1.17.13 @@ -198,7 +202,7 @@ #### Node.js - 14.20.0 -- 16.16.0 +- 16.17.0 #### PyPy - 3.7.13 [PyPy 7.3.9] @@ -228,7 +232,7 @@ | Module | Version | | ---------------- | ------- | | MarkdownPS | 1.9 | -| Microsoft.Graph | 1.11.0 | +| Microsoft.Graph | 1.11.1 | | Pester | 5.3.3 | | PSScriptAnalyzer | 1.20.0 | @@ -247,24 +251,24 @@ | Android Command Line Tools | 7.0 | | Android Emulator | 31.3.10 | | Android SDK Build-tools | 33.0.0<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | -| Android SDK Platform-Tools | 33.0.2 | +| Android SDK Platform-Tools | 33.0.3 | | Android SDK Platforms | android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | | Android SDK Tools | 26.1.1 | | Android Support Repository | 47.0.0 | | CMake | 3.10.2<br>3.18.1<br>3.22.1 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 23.2.8568313<br>24.0.8215888<br>25.0.8775105 (default) | +| NDK | 23.2.8568313<br>24.0.8215888<br>25.1.8937393 (default) | | SDK Patch Applier v4 | 1 | #### Environment variables | Name | Value | | ----------------------- | ------------------------------------------- | | ANDROID_HOME | /usr/local/lib/android/sdk | -| ANDROID_NDK | /usr/local/lib/android/sdk/ndk/25.0.8775105 | -| ANDROID_NDK_HOME | /usr/local/lib/android/sdk/ndk/25.0.8775105 | -| ANDROID_NDK_LATEST_HOME | /usr/local/lib/android/sdk/ndk/25.0.8775105 | -| ANDROID_NDK_ROOT | /usr/local/lib/android/sdk/ndk/25.0.8775105 | +| ANDROID_NDK | /usr/local/lib/android/sdk/ndk/25.1.8937393 | +| ANDROID_NDK_HOME | /usr/local/lib/android/sdk/ndk/25.1.8937393 | +| ANDROID_NDK_LATEST_HOME | /usr/local/lib/android/sdk/ndk/25.1.8937393 | +| ANDROID_NDK_ROOT | /usr/local/lib/android/sdk/ndk/25.1.8937393 | | ANDROID_SDK_ROOT | /usr/local/lib/android/sdk | ### Cached Docker images @@ -272,14 +276,14 @@ | ----------------------- | ------------------------------------------------------------------------ | ---------- | | alpine:3.14 | sha256:1ab24b3b99320975cca71716a7475a65d263d0b6b604d9d14ce08f7a3f67595c | 2022-08-09 | | alpine:3.15 | sha256:69463fdff1f025c908939e86d4714b4d5518776954ca627cbeff4c74bcea5b22 | 2022-08-09 | -| buildpack-deps:bullseye | sha256:d6974da710854c9c38d49666bd682abd99ef7aacdb92344d42a00f723e63cdb1 | 2022-08-02 | -| buildpack-deps:buster | sha256:9d806f4d80f19e3fd315bbe2ca1aa59a6c1ad18aff7b3d9696b407572608d61e | 2022-08-02 | -| debian:10 | sha256:fb9654aac57319592f1d51497c62001e7033eddf059355408a0b53f7c71f8d5f | 2022-08-02 | -| debian:11 | sha256:82bab30ed448b8e2509aabe21f40f0607d905b7fd0dec72802627a20274eba55 | 2022-08-02 | -| moby/buildkit:latest | sha256:0dc312b04eac1b44cd2cad566deb1e886c753109208affbbec8384f381ff7f38 | 2022-05-06 | -| node:14 | sha256:7e1eabbcd7cbd0fdc296bc00fb2c80943ed0499c4ca3a148c83944708574dcf6 | 2022-08-02 | +| buildpack-deps:bullseye | sha256:872ba70b0805b817db42d9ea75f066b5fe2be82d04d0dab69e41810edd9aa3f9 | 2022-08-23 | +| buildpack-deps:buster | sha256:d73ba7863f3958cade1ef32f7620c3751ba5cd9653ff382a1b222ec17906884e | 2022-08-23 | +| debian:10 | sha256:fa8155031d12cd165c237e0b38688cade32912e990ffe21f9e31968d9a04da38 | 2022-08-23 | +| debian:11 | sha256:d52921d97310d0bd48dab928548ef539d5c88c743165754c57cfad003031386c | 2022-08-23 | +| moby/buildkit:latest | sha256:67c9251f9f2e103e1ee489b6cead518b6d82607ef485d3f1505fc4095a55ebeb | 2022-08-22 | +| node:14 | sha256:48ad857f33fb03f542133b1e0d3524b1fcf596fce29e212cd9b7abd22d3d9188 | 2022-08-23 | | node:14-alpine | sha256:4aff4ba0da347e51561587eba037a38db4eaa70e1a6c8334d66779fe963d5be7 | 2022-08-09 | -| node:16 | sha256:bf1609ac718dda03940e2be4deae1704fb77cd6de2bed8bf91d4bbbc9e88b497 | 2022-08-16 | +| node:16 | sha256:0c672d547405fe64808ea28b49c5772b1026f81b3b716ff44c10c96abf177d6a | 2022-08-23 | | node:16-alpine | sha256:2c405ed42fc0fd6aacbe5730042640450e5ec030bada7617beac88f742b6997b | 2022-08-16 | | ubuntu:18.04 | sha256:eb1392bbdde63147bc2b4ff1a4053dcfe6d15e4dfd3cce29e9b9f52a4f88bc74 | 2022-08-02 | | ubuntu:20.04 | sha256:af5efa9c28de78b754777af9b4d850112cad01899a5d37d2617bb94dc63a49aa | 2022-08-02 | From 0a705f29e4d90b2030290b97170cdfcf9da3281c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 30 Aug 2022 07:52:37 +0000 Subject: [PATCH 1433/3485] Updating readme file for ubuntu20 version 20220828.1 (#6158) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2004-Readme.md | 86 +++++++++++++++---------------- 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/images/linux/Ubuntu2004-Readme.md b/images/linux/Ubuntu2004-Readme.md index 77f088789b48..dc591eb0371b 100644 --- a/images/linux/Ubuntu2004-Readme.md +++ b/images/linux/Ubuntu2004-Readme.md @@ -1,10 +1,10 @@ | Announcements | |-| -| [The Ubuntu 18.04 Actions runner image will begin deprecation on 8/8/22 and will be fully unsupported by 12/1/22](https://github.com/actions/runner-images/issues/6002) | +| [The Ubuntu 18.04 Actions runner image will begin deprecation on 8/8/22 and will be fully unsupported by TBD](https://github.com/actions/runner-images/issues/6002) | *** # Ubuntu 20.04.4 LTS - Linux kernel version: 5.15.0-1017-azure -- Image Version: 20220821.1 +- Image Version: 20220828.1 ## Installed Software ### Language and Runtime @@ -13,7 +13,7 @@ - Clang-format 10.0.0, 11.0.0, 12.0.0 - Clang-tidy 10.0.0, 11.0.0, 12.0.0 - Dash 0.5.10.2-6 -- Erlang 25.0.3 (Eshell 13.0.3) +- Erlang 25.0.4 (Eshell 13.0.4) - Erlang rebar3 3.19.0 - GNU C++ 9.4.0, 10.3.0 - GNU Fortran 9.4.0, 10.3.0 @@ -30,8 +30,8 @@ ### Package Management - cpan 1.64 -- Helm 3.9.3 -- Homebrew 3.5.9 +- Helm 3.9.4 +- Homebrew 3.5.10 - Miniconda 4.12.0 - Npm 8.15.0 - NuGet 6.2.1.2 @@ -39,7 +39,7 @@ - Pip3 20.0.2 - Pipx 1.1.0 - RubyGems 3.1.2 -- Vcpkg (build from master \<9259a0719>) +- Vcpkg (build from master \<e85b5bb95>) - Yarn 1.22.19 #### Environment variables @@ -59,7 +59,7 @@ - Ansible 2.13.3 - apt-fast 1.9.12 - AzCopy 10.16.0 (available by `azcopy` and `azcopy10` aliases) -- Bazel 5.2.0 +- Bazel 5.3.0 - Bazelisk 1.12.1 - Bicep 0.9.1 - Buildah 1.22.3 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) @@ -67,20 +67,20 @@ - CodeQL Action Bundle 2.10.3 - Docker Amazon ECR Credential Helper 0.6.0 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.9.0+azure-1 -- Docker-Buildx 0.9.0 +- Docker Compose v2 2.10.1+azure-1 +- Docker-Buildx 0.9.1 - Docker-Moby Client 20.10.17+azure-1 -- Docker-Moby Server 20.10.17+azure-1 -- Fastlane 2.209.0 +- Docker-Moby Server 20.10.17+azure-3 +- Fastlane 2.209.1 - Git 2.37.2 (apt source repository: ppa:git-core/ppa) - Git LFS 3.2.0 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.6.0 - Haveged 1.9.1 - Heroku 7.62.0 -- HHVM (HipHop VM) 4.166.0 +- HHVM (HipHop VM) 4.167.0 - jq 1.6 - Kind 0.14.0 -- Kubectl 1.24.4 +- Kubectl 1.25.0 - Kustomize 4.5.7 - Leiningen 2.9.10 - MediaInfo 19.09 @@ -99,32 +99,32 @@ - Skopeo 1.5.0 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 -- Terraform 1.2.7 +- Terraform 1.2.8 - yamllint 1.27.1 - yq 4.27.2 - zstd 1.5.2 (homebrew) ### CLI Tools -- Alibaba Cloud CLI 3.0.124 -- AWS CLI 2.7.25 +- Alibaba Cloud CLI 3.0.125 +- AWS CLI 2.7.27 - AWS CLI Session manager plugin 1.2.339.0 - AWS SAM CLI 1.55.0 - Azure CLI (azure-cli) 2.39.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.25.0 -- GitHub CLI 2.14.4 +- GitHub CLI 2.14.7 - Google Cloud SDK 369.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 11.3.0 -- OpenShift CLI 4.11.0 -- ORAS CLI 0.13.0 -- Vercel CLI 28.1.0 +- Netlify CLI 11.5.0 +- OpenShift CLI 4.11.1 +- ORAS CLI 0.14.0 +- Vercel CLI 28.2.0 ### Java | Version | Vendor | Environment Variable | | ------------------- | --------------- | -------------------- | | 8.0.345+1 | Eclipse Temurin | JAVA_HOME_8_X64 | -| 11.0.16+8 (default) | Eclipse Temurin | JAVA_HOME_11_X64 | -| 17.0.4+8 | Eclipse Temurin | JAVA_HOME_17_X64 | +| 11.0.16+1 (default) | Eclipse Temurin | JAVA_HOME_11_X64 | +| 17.0.4+1 | Eclipse Temurin | JAVA_HOME_17_X64 | ### GraalVM | Version | Environment variables | @@ -136,13 +136,13 @@ | -------- | ------------------- | | PHP | 7.4.30 8.0.22 8.1.9 | | Composer | 2.4.1 | -| PHPUnit | 8.5.28 | +| PHPUnit | 8.5.29 | ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ``` ### Haskell - Cabal 3.6.2.0 -- GHC 9.4.1 +- GHC 9.4.2 - GHCup 0.1.18.0 - Stack 2.7.5 @@ -164,10 +164,10 @@ - Google Chrome 104.0.5112.101 - ChromeDriver 104.0.5112.79 - Chromium 104.0.5112.0 -- Microsoft Edge 104.0.1293.63 (apt source repository: https://packages.microsoft.com/repos/edge) -- Microsoft Edge WebDriver 104.0.1293.63 +- Microsoft Edge 104.0.1293.70 (apt source repository: https://packages.microsoft.com/repos/edge) +- Microsoft Edge WebDriver 104.0.1293.70 - Selenium server 4.4.0 -- Mozilla Firefox 103.0 +- Mozilla Firefox 104.0 - Geckodriver 0.31.0 #### Environment variables @@ -215,7 +215,7 @@ #### Node.js - 12.22.12 - 14.20.0 -- 16.16.0 +- 16.17.0 #### PyPy - 2.7.18 [PyPy 7.3.9] @@ -253,7 +253,7 @@ | Module | Version | | ---------------- | ------- | | MarkdownPS | 1.9 | -| Microsoft.Graph | 1.11.0 | +| Microsoft.Graph | 1.11.1 | | Pester | 5.3.3 | | PSScriptAnalyzer | 1.20.0 | @@ -273,24 +273,24 @@ | Android Command Line Tools | 7.0 | | Android Emulator | 31.3.10 | | Android SDK Build-tools | 33.0.0<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | -| Android SDK Platform-Tools | 33.0.2 | +| Android SDK Platform-Tools | 33.0.3 | | Android SDK Platforms | android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | | Android SDK Tools | 26.1.1 | | Android Support Repository | 47.0.0 | | CMake | 3.10.2<br>3.18.1<br>3.22.1 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 23.2.8568313<br>24.0.8215888<br>25.0.8775105 (default) | +| NDK | 23.2.8568313<br>24.0.8215888<br>25.1.8937393 (default) | | SDK Patch Applier v4 | 1 | #### Environment variables | Name | Value | | ----------------------- | ------------------------------------------- | | ANDROID_HOME | /usr/local/lib/android/sdk | -| ANDROID_NDK | /usr/local/lib/android/sdk/ndk/25.0.8775105 | -| ANDROID_NDK_HOME | /usr/local/lib/android/sdk/ndk/25.0.8775105 | -| ANDROID_NDK_LATEST_HOME | /usr/local/lib/android/sdk/ndk/25.0.8775105 | -| ANDROID_NDK_ROOT | /usr/local/lib/android/sdk/ndk/25.0.8775105 | +| ANDROID_NDK | /usr/local/lib/android/sdk/ndk/25.1.8937393 | +| ANDROID_NDK_HOME | /usr/local/lib/android/sdk/ndk/25.1.8937393 | +| ANDROID_NDK_LATEST_HOME | /usr/local/lib/android/sdk/ndk/25.1.8937393 | +| ANDROID_NDK_ROOT | /usr/local/lib/android/sdk/ndk/25.1.8937393 | | ANDROID_SDK_ROOT | /usr/local/lib/android/sdk | ### Cached Docker images @@ -299,18 +299,18 @@ | alpine:3.12 | sha256:c75ac27b49326926b803b9ed43bf088bc220d22556de1bc5f72d742c91398f69 | 2022-04-05 | | alpine:3.13 | sha256:100448e45467d4f3838fc8d95faab2965e22711b6edf67bbd8ec9c07f612b553 | 2022-08-09 | | alpine:3.14 | sha256:1ab24b3b99320975cca71716a7475a65d263d0b6b604d9d14ce08f7a3f67595c | 2022-08-09 | -| buildpack-deps:bullseye | sha256:d6974da710854c9c38d49666bd682abd99ef7aacdb92344d42a00f723e63cdb1 | 2022-08-02 | -| buildpack-deps:buster | sha256:9d806f4d80f19e3fd315bbe2ca1aa59a6c1ad18aff7b3d9696b407572608d61e | 2022-08-02 | +| buildpack-deps:bullseye | sha256:872ba70b0805b817db42d9ea75f066b5fe2be82d04d0dab69e41810edd9aa3f9 | 2022-08-23 | +| buildpack-deps:buster | sha256:d73ba7863f3958cade1ef32f7620c3751ba5cd9653ff382a1b222ec17906884e | 2022-08-23 | | buildpack-deps:stretch | sha256:78e995165a5788c2f55aed6e548d8f6c1534830d4310c870408fccb2da8c5b2e | 2022-06-23 | -| debian:10 | sha256:fb9654aac57319592f1d51497c62001e7033eddf059355408a0b53f7c71f8d5f | 2022-08-02 | -| debian:11 | sha256:82bab30ed448b8e2509aabe21f40f0607d905b7fd0dec72802627a20274eba55 | 2022-08-02 | +| debian:10 | sha256:fa8155031d12cd165c237e0b38688cade32912e990ffe21f9e31968d9a04da38 | 2022-08-23 | +| debian:11 | sha256:d52921d97310d0bd48dab928548ef539d5c88c743165754c57cfad003031386c | 2022-08-23 | | debian:9 | sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be | 2022-06-23 | -| moby/buildkit:latest | sha256:0dc312b04eac1b44cd2cad566deb1e886c753109208affbbec8384f381ff7f38 | 2022-05-06 | +| moby/buildkit:latest | sha256:67c9251f9f2e103e1ee489b6cead518b6d82607ef485d3f1505fc4095a55ebeb | 2022-08-22 | | node:12 | sha256:01627afeb110b3054ba4a1405541ca095c8bfca1cb6f2be9479c767a2711879e | 2022-04-20 | | node:12-alpine | sha256:d4b15b3d48f42059a15bd659be60afe21762aae9d6cbea6f124440895c27db68 | 2022-04-11 | -| node:14 | sha256:7e1eabbcd7cbd0fdc296bc00fb2c80943ed0499c4ca3a148c83944708574dcf6 | 2022-08-02 | +| node:14 | sha256:48ad857f33fb03f542133b1e0d3524b1fcf596fce29e212cd9b7abd22d3d9188 | 2022-08-23 | | node:14-alpine | sha256:4aff4ba0da347e51561587eba037a38db4eaa70e1a6c8334d66779fe963d5be7 | 2022-08-09 | -| node:16 | sha256:bf1609ac718dda03940e2be4deae1704fb77cd6de2bed8bf91d4bbbc9e88b497 | 2022-08-16 | +| node:16 | sha256:0c672d547405fe64808ea28b49c5772b1026f81b3b716ff44c10c96abf177d6a | 2022-08-23 | | node:16-alpine | sha256:2c405ed42fc0fd6aacbe5730042640450e5ec030bada7617beac88f742b6997b | 2022-08-16 | | ubuntu:16.04 | sha256:91bd29a464fdabfcf44e29e1f2a5f213c6dfa750b6290e40dd6998ac79da3c41 | 2021-08-31 | | ubuntu:18.04 | sha256:eb1392bbdde63147bc2b4ff1a4053dcfe6d15e4dfd3cce29e9b9f52a4f88bc74 | 2022-08-02 | From e70c75b60c4e134b4d17a08a98c63eb79d61a343 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Tue, 30 Aug 2022 13:31:30 +0300 Subject: [PATCH 1434/3485] Rename team in the PR creation (#6168) --- .github/workflows/create_pull_request.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/create_pull_request.yml b/.github/workflows/create_pull_request.yml index 14c460f6a697..f7f3e77ccf84 100644 --- a/.github/workflows/create_pull_request.yml +++ b/.github/workflows/create_pull_request.yml @@ -45,5 +45,5 @@ jobs: owner: context.repo.owner, repo: context.repo.repo, pull_number: ${{ steps.create-pr.outputs.result }}, - team_reviewers: ['virtual-environments-akvelon'] - }) \ No newline at end of file + team_reviewers: ['runner-images-team'] + }) From 31fc221295feeef25e3224001283926dcfd7075c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 30 Aug 2022 13:58:19 +0000 Subject: [PATCH 1435/3485] Updating readme file for win19 version 20220828.1 (#6160) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2019-Readme.md | 48 ++++++++++++++++---------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index 6ef026518bc2..64bf972c98c2 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -1,6 +1,6 @@ # Microsoft Windows Server 2019 Datacenter - OS Version: 10.0.17763 Build 3287 -- Image Version: 20220821.1 +- Image Version: 20220828.1 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -21,14 +21,14 @@ ### Package Management - Chocolatey 1.1.0 - Composer 2.4.1 -- Helm 3.9.2 +- Helm 3.9.3 - Miniconda 4.12.0 (pre-installed on the image but not added to PATH) - NPM 8.15.0 - NuGet 6.3.0.131 - pip 22.2.2 (python 3.7) - Pipx 1.1.0 - RubyGems 2.7.6.3 -- Vcpkg (build from master \<9259a0719>) +- Vcpkg (build from master \<e85b5bb95>) - Yarn 1.22.19 #### Environment variables @@ -47,7 +47,7 @@ - 7zip 22.01 - aria2 1.36.0 - azcopy 10.16.0 -- Bazel 5.2.0 +- Bazel 5.3.0 - Bazelisk 1.12.1 - Bicep 0.9.1 - Cabal 3.8.1.0 @@ -55,16 +55,16 @@ - CodeQL Action Bundle 2.10.3 - Docker 20.10.7 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.10.0 +- Docker Compose v2 2.10.2 - Docker-wincred 0.6.4 -- ghc 9.4.1 +- ghc 9.4.2 - Git 2.37.2.windows.2 - Git LFS 3.2.0 -- Google Cloud SDK 398.0.0 +- Google Cloud SDK 399.0.0 - InnoSetup 6.2.1 - jq 1.6 - Kind 0.14.0 -- Kubectl 1.24.4 +- Kubectl 1.25.0 - Mercurial 5.0 - Mingw-w64 8.1.0 - Newman 5.3.2 @@ -85,14 +85,14 @@ - zstd 1.5.2 ### CLI Tools -- Alibaba Cloud CLI 3.0.124 -- AWS CLI 2.7.25 +- Alibaba Cloud CLI 3.0.125 +- AWS CLI 2.7.26 - AWS SAM CLI 1.55.0 - AWS Session Manager CLI 1.2.339.0 - Azure CLI 2.39.0 - Azure DevOps CLI extension 0.25.0 - Cloud Foundry CLI 6.53.0 -- GitHub CLI 2.14.4 +- GitHub CLI 2.14.7 - Hub CLI 2.14.2 ### Rust Tools @@ -112,9 +112,9 @@ ### Browsers and webdrivers - Google Chrome 104.0.5112.102 - Chrome Driver 104.0.5112.79 -- Microsoft Edge 104.0.1293.63 -- Microsoft Edge Driver 104.0.1293.63 -- Mozilla Firefox 103.0.2 +- Microsoft Edge 104.0.1293.70 +- Microsoft Edge Driver 104.0.1293.70 +- Mozilla Firefox 104.0 - Gecko Driver 0.31.0 - IE Driver 3.150.1.1 - Selenium server 4.4.0 @@ -133,7 +133,7 @@ | 8.0.345+1 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | | 11.0.16+101 | Eclipse Temurin | JAVA_HOME_11_X64 | | 13.0.2+8.1 | Adopt OpenJDK | JAVA_HOME_13_X64 | -| 17.0.4+8 | Eclipse Temurin | JAVA_HOME_17_X64 | +| 17.0.4+101 | Eclipse Temurin | JAVA_HOME_17_X64 | ### Shells | Name | Target | @@ -168,7 +168,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | ------- | ------------ | | 12.22.12 | x64 | | 14.20.0 | x64 | -| 16.16.0 | x64 | +| 16.17.0 | x64 | #### Python | Version | Architecture | @@ -543,10 +543,10 @@ All other versions are saved but not installed. #### Powershell Modules | Module | Version | | ------------------ | ---------------- | -| AWSPowerShell | 4.1.151 | +| AWSPowerShell | 4.1.156 | | DockerMsftProvider | 1.0.0.8 | | MarkdownPS | 1.9 | -| Microsoft.Graph | 1.11.0 | +| Microsoft.Graph | 1.11.1 | | Pester | 3.4.0<br>5.3.3 | | PowerShellGet | 1.0.0.1<br>2.2.5 | | PSScriptAnalyzer | 1.20.0 | @@ -560,24 +560,24 @@ All other versions are saved but not installed. | Android Command Line Tools | 7.0 | | Android SDK Build-tools | 33.0.0<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3<br>26.0.0 26.0.1 26.0.2 26.0.3<br>25.0.0 25.0.1 25.0.2 25.0.3<br>24.0.0 24.0.1 24.0.2 24.0.3<br>23.0.1 23.0.2 23.0.3<br>22.0.1<br>21.1.2<br>20.0.0<br>19.1.0 | | Android SDK Platforms | android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3)<br>android-26 (rev 2)<br>android-25 (rev 3)<br>android-24 (rev 2)<br>android-23 (rev 3)<br>android-22 (rev 2)<br>android-21 (rev 2)<br>android-20 (rev 2)<br>android-19 (rev 4) | -| Android SDK Platform-Tools | 33.0.2 | +| Android SDK Platform-Tools | 33.0.3 | | Android SDK Tools | 26.1.1 | | Android Support Repository | 47.0.0 | | CMake | 3.10.2<br>3.18.1<br>3.22.1 | | Google APIs | addon-google_apis-google-21<br>addon-google_apis-google-22<br>addon-google_apis-google-23<br>addon-google_apis-google-24 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 23.2.8568313<br>24.0.8215888<br>25.0.8775105 | +| NDK | 23.2.8568313<br>24.0.8215888<br>25.1.8937393 | | SDK Patch Applier v4 | 1 | #### Environment variables | Name | Value | | ----------------------- | --------------------------------------- | | ANDROID_HOME | C:\Android\android-sdk | -| ANDROID_NDK | C:\Android\android-sdk\ndk\25.0.8775105 | -| ANDROID_NDK_HOME | C:\Android\android-sdk\ndk\25.0.8775105 | -| ANDROID_NDK_LATEST_HOME | C:\Android\android-sdk\ndk\25.0.8775105 | -| ANDROID_NDK_ROOT | C:\Android\android-sdk\ndk\25.0.8775105 | +| ANDROID_NDK | C:\Android\android-sdk\ndk\25.1.8937393 | +| ANDROID_NDK_HOME | C:\Android\android-sdk\ndk\25.1.8937393 | +| ANDROID_NDK_LATEST_HOME | C:\Android\android-sdk\ndk\25.1.8937393 | +| ANDROID_NDK_ROOT | C:\Android\android-sdk\ndk\25.1.8937393 | | ANDROID_SDK_ROOT | C:\Android\android-sdk | ### Cached Docker images From 566a276495a64073fd2febf247c0d8493e3898b6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 30 Aug 2022 15:21:45 +0000 Subject: [PATCH 1436/3485] Updating readme file for win22 version 20220828.1 (#6157) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2022-Readme.md | 51 +++++++++++++++++--------------- 1 file changed, 27 insertions(+), 24 deletions(-) diff --git a/images/win/Windows2022-Readme.md b/images/win/Windows2022-Readme.md index 65d40bd2a4a2..190c5b2e4607 100644 --- a/images/win/Windows2022-Readme.md +++ b/images/win/Windows2022-Readme.md @@ -1,6 +1,6 @@ # Microsoft Windows Server 2022 Datacenter - OS Version: 10.0.20348 Build 887 -- Image Version: 20220821.1 +- Image Version: 20220828.1 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -21,14 +21,14 @@ ### Package Management - Chocolatey 1.1.0 - Composer 2.4.1 -- Helm 3.9.2 +- Helm 3.9.3 - Miniconda 4.12.0 (pre-installed on the image but not added to PATH) - NPM 8.15.0 - NuGet 6.3.0.131 - pip 22.2.2 (python 3.9) - Pipx 1.1.0 - RubyGems 3.2.33 -- Vcpkg (build from master \<9259a0719>) +- Vcpkg (build from master \<e85b5bb95>) - Yarn 1.22.19 #### Environment variables @@ -46,7 +46,7 @@ - 7zip 22.01 - aria2 1.36.0 - azcopy 10.16.0 -- Bazel 5.2.0 +- Bazel 5.3.0 - Bazelisk 1.12.1 - Bicep 0.9.1 - Cabal 3.8.1.0 @@ -54,15 +54,15 @@ - CodeQL Action Bundle 2.10.3 - Docker 20.10.7 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.10.0 +- Docker Compose v2 2.10.2 - Docker-wincred 0.6.4 -- ghc 9.4.1 +- ghc 9.4.2 - Git 2.37.2.windows.2 - Git LFS 3.2.0 - InnoSetup 6.2.1 - jq 1.6 - Kind 0.14.0 -- Kubectl 1.24.4 +- Kubectl 1.25.0 - Mercurial 5.0 - Mingw-w64 11.2.0 - Newman 5.3.2 @@ -82,13 +82,13 @@ - zstd 1.5.2 ### CLI Tools -- Alibaba Cloud CLI 3.0.124 -- AWS CLI 2.7.25 +- Alibaba Cloud CLI 3.0.125 +- AWS CLI 2.7.26 - AWS SAM CLI 1.55.0 - AWS Session Manager CLI 1.2.339.0 - Azure CLI 2.39.0 - Azure DevOps CLI extension 0.25.0 -- GitHub CLI 2.14.4 +- GitHub CLI 2.14.7 - Hub CLI 2.14.2 ### Rust Tools @@ -108,9 +108,9 @@ ### Browsers and webdrivers - Google Chrome 104.0.5112.102 - Chrome Driver 104.0.5112.79 -- Microsoft Edge 104.0.1293.63 -- Microsoft Edge Driver 104.0.1293.63 -- Mozilla Firefox 103.0.2 +- Microsoft Edge 104.0.1293.70 +- Microsoft Edge Driver 104.0.1293.70 +- Mozilla Firefox 104.0 - Gecko Driver 0.31.0 - IE Driver 3.150.1.1 - Selenium server 4.4.0 @@ -128,7 +128,7 @@ | ------------------- | --------------- | -------------------- | | 8.0.345+1 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | | 11.0.16+101 | Eclipse Temurin | JAVA_HOME_11_X64 | -| 17.0.4+8 | Eclipse Temurin | JAVA_HOME_17_X64 | +| 17.0.4+101 | Eclipse Temurin | JAVA_HOME_17_X64 | ### Shells | Name | Target | @@ -160,7 +160,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | ------- | ------------ | | 12.22.12 | x64 | | 14.20.0 | x64 | -| 16.16.0 | x64 | +| 16.17.0 | x64 | #### Python | Version | Architecture | @@ -219,7 +219,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Visual Studio Enterprise 2022 | Name | Version | Path | | ----------------------------- | -------------- | -------------------------------------------------------- | -| Visual Studio Enterprise 2022 | 17.3.32811.315 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | +| Visual Studio Enterprise 2022 | 17.3.32819.101 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | #### Workloads, components and extensions: | Package | Version | @@ -274,6 +274,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.Net.Component.4.7.1.TargetingPack | 17.3.32708.82 | | Microsoft.Net.Component.4.7.2.TargetingPack | 17.3.32708.82 | | Microsoft.Net.Component.4.7.TargetingPack | 17.3.32708.82 | +| Microsoft.Net.Component.4.8.1.SDK | 17.3.32720.241 | +| Microsoft.Net.Component.4.8.1.TargetingPack | 17.3.32720.241 | | Microsoft.Net.Component.4.8.SDK | 17.3.32708.82 | | Microsoft.Net.Component.4.8.TargetingPack | 17.3.32708.82 | | Microsoft.Net.ComponentGroup.4.8.DeveloperTools | 17.3.32708.82 | @@ -535,6 +537,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. `Type: Developer Pack` `Location: C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX <version> Tools` - 4.8 +- 4.8.1 ### .NET tools - nbgv 3.5.109+bdfbd7dea6 @@ -557,10 +560,10 @@ All other versions are saved but not installed. #### Powershell Modules | Module | Version | | ------------------ | ---------------- | -| AWSPowerShell | 4.1.151 | +| AWSPowerShell | 4.1.156 | | DockerMsftProvider | 1.0.0.8 | | MarkdownPS | 1.9 | -| Microsoft.Graph | 1.11.0 | +| Microsoft.Graph | 1.11.1 | | Pester | 3.4.0<br>5.3.3 | | PowerShellGet | 1.0.0.1<br>2.2.5 | | PSScriptAnalyzer | 1.20.0 | @@ -575,22 +578,22 @@ All other versions are saved but not installed. | Android Emulator | 31.3.10 | | Android SDK Build-tools | 33.0.0<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | | Android SDK Platforms | android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | -| Android SDK Platform-Tools | 33.0.2 | +| Android SDK Platform-Tools | 33.0.3 | | Android Support Repository | 47.0.0 | | CMake | 3.18.1<br>3.22.1 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 23.2.8568313<br>24.0.8215888<br>25.0.8775105 | +| NDK | 23.2.8568313<br>24.0.8215888<br>25.1.8937393 | | SDK Patch Applier v4 | 1 | #### Environment variables | Name | Value | | ----------------------- | --------------------------------------- | | ANDROID_HOME | C:\Android\android-sdk | -| ANDROID_NDK | C:\Android\android-sdk\ndk\25.0.8775105 | -| ANDROID_NDK_HOME | C:\Android\android-sdk\ndk\25.0.8775105 | -| ANDROID_NDK_LATEST_HOME | C:\Android\android-sdk\ndk\25.0.8775105 | -| ANDROID_NDK_ROOT | C:\Android\android-sdk\ndk\25.0.8775105 | +| ANDROID_NDK | C:\Android\android-sdk\ndk\25.1.8937393 | +| ANDROID_NDK_HOME | C:\Android\android-sdk\ndk\25.1.8937393 | +| ANDROID_NDK_LATEST_HOME | C:\Android\android-sdk\ndk\25.1.8937393 | +| ANDROID_NDK_ROOT | C:\Android\android-sdk\ndk\25.1.8937393 | | ANDROID_SDK_ROOT | C:\Android\android-sdk | ### Cached Docker images From cda85a59ace88291b97fc600b9234576bb213007 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Tue, 30 Aug 2022 20:06:24 +0300 Subject: [PATCH 1437/3485] [macOS] Stop versioned postgresql service instead of the general one (#6166) * Stop versioned postgresql service instead of the general one * Start versioned postgres service --- images/macos/provision/core/postgresql.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/images/macos/provision/core/postgresql.sh b/images/macos/provision/core/postgresql.sh index 5a5c381f95bd..4d881486af49 100644 --- a/images/macos/provision/core/postgresql.sh +++ b/images/macos/provision/core/postgresql.sh @@ -8,7 +8,8 @@ toolsetVersion=$(get_toolset_value '.postgresql.version') brew_smart_install postgresql@$toolsetVersion # Service PostgreSQL should be started before use -brew services start postgresql +postgreService=$(brew services list | grep -oe "postgresql\S*") +brew services start $postgreService # Verify PostgreSQL is ready for accept incoming connections echo "Check PostgreSQL service is running" @@ -27,6 +28,6 @@ while [ $i -gt 0 ]; do done # Stop PostgreSQL -brew services stop postgresql +brew services stop $postgreService invoke_tests "Databases" "PostgreSQL" From e661113bbd0c1346384e2aef922d59513b7f6e26 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 31 Aug 2022 12:06:01 +0000 Subject: [PATCH 1438/3485] Updating readme file for macOS-12 version 20220829.1 (#6170) Co-authored-by: Image generation service account <no-reply@microsoft.com> --- images/macos/macos-12-Readme.md | 66 +++++++++++++++++---------------- 1 file changed, 34 insertions(+), 32 deletions(-) diff --git a/images/macos/macos-12-Readme.md b/images/macos/macos-12-Readme.md index 9309d6f789cc..766e575b8355 100644 --- a/images/macos/macos-12-Readme.md +++ b/images/macos/macos-12-Readme.md @@ -5,7 +5,7 @@ # macOS 12.5 info - System Version: macOS 12.5.1 (21G83) - Kernel Version: Darwin 21.6.0 -- Image Version: 20220823.1 +- Image Version: 20220829.1 ## Installed Software ### Language and Runtime @@ -30,7 +30,7 @@ - Ruby 3.0.4p208 ### Package Management -- Bundler version 2.3.20 +- Bundler version 2.3.21 - Carthage 0.38.0 - CocoaPods 1.11.3 - Composer 2.4.1 @@ -41,8 +41,8 @@ - Pip 20.3.4 (python 2.7) - Pip 22.2.2 (python 3.10) - Pipx 1.1.0 -- RubyGems 3.3.20 -- Vcpkg 2022 (build from master \<88b1071e3>) +- RubyGems 3.3.21 +- Vcpkg 2022 (build from master \<8a991b8d8>) - Yarn 1.22.19 #### Environment variables @@ -67,30 +67,30 @@ - Curl 7.84.0 - Git 2.37.2 - Git LFS: 3.2.0 -- GitHub CLI: 2.14.5 +- GitHub CLI: 2.14.7 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.3 - gpg (GnuPG) 2.3.7 - Hub CLI: 2.14.2 -- ImageMagick 7.1.0-46 +- ImageMagick 7.1.0-47 - jq 1.6 - mongo v5.0.11 - mongod v5.0.11 - OpenSSL 1.1.1q 5 Jul 2022 `(/usr/local/opt/openssl@1.1 -> ../Cellar/openssl@1.1/1.1.1q)` - Packer 1.8.3 -- PostgreSQL 14.5 -- psql (PostgreSQL) 14.5 +- PostgreSQL 14.5 (Homebrew) +- psql (PostgreSQL) 14.5 (Homebrew) - Sox 14.4.2 - Subversion (SVN) 1.14.2 - Switchaudio-osx 1.1.0 - Vagrant 2.3.0 - VirtualBox 6.1.36r152435 -- yq (https://github.com/mikefarah/yq/) version 4.27.2 +- yq (https://github.com/mikefarah/yq/) version 4.27.3 - zstd 1.5.2 ### Tools - App Center CLI 2.11.0 -- AWS CLI 2.7.25 +- AWS CLI 2.7.27 - AWS SAM CLI 1.55.0 - AWS Session Manager CLI 1.2.339.0 - Azure CLI (azure-devops) 0.25.0 @@ -100,7 +100,7 @@ - Cmake 3.24.1 - CodeQL Action Bundle 2.10.3 - Fastlane 2.209.1 -- GHC 9.4.1 +- GHC 9.4.2 - GHCup 0.1.18.0 - Jazzy 0.14.2 - Stack 2.7.5 @@ -109,7 +109,7 @@ - Xcode Command Line Tools 13.4.0.0.1.1651278267 ### Linters -- SwiftLint 0.48.0 +- SwiftLint 0.49.0 - yamllint 1.27.1 ### Browsers @@ -117,9 +117,9 @@ - SafariDriver 15.6.1 (17613.3.9.1.16) - Google Chrome 104.0.5112.101 - ChromeDriver 104.0.5112.79 -- Microsoft Edge 104.0.1293.63 -- Microsoft Edge WebDriver 104.0.1293.63 -- Mozilla Firefox 103.0.2 +- Microsoft Edge 104.0.1293.70 +- Microsoft Edge WebDriver 104.0.1293.70 +- Mozilla Firefox 104.0 - geckodriver 0.31.0 - Selenium server 4.4.0 @@ -198,10 +198,10 @@ | PSScriptAnalyzer | 1.20.0 | ### Web Servers -| Name | Version | ConfigFile | ServiceStatus | ListenPort | -| ----- | ------- | ------------------------------- | ------------- | ---------- | -| httpd | 2.4.54 | /usr/local/etc/httpd/httpd.conf | none | 80 | -| nginx | 1.23.1 | /usr/local/etc/nginx/nginx.conf | none | 80 | +| Name | Version | ConfigFile | ServiceStatus | ListenPort | +| ----- | -------- | ------------------------------- | ------------- | ---------- | +| httpd | 2.4.54_1 | /usr/local/etc/httpd/httpd.conf | none | 80 | +| nginx | 1.23.1 | /usr/local/etc/nginx/nginx.conf | none | 80 | ### Xamarin #### Visual Studio for Mac @@ -287,19 +287,21 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" | DriverKit 22.0 | driverkit22.0 | 14.0 | #### Installed Simulators -| OS | Xcode Version | Simulators | -| ----------- | ------------------------ | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| iOS 15.0 | 13.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | -| iOS 15.2 | 13.2.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | -| iOS 15.4 | 13.3.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPhone SE (3rd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | -| iOS 15.5 | 13.4<br>13.4.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPhone SE (3rd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | -| iOS 16.0 | 14.0 | iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPhone SE (3rd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | -| tvOS 15.0 | 13.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | -| tvOS 15.2 | 13.2.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | -| tvOS 15.4 | 13.3.1<br>13.4<br>13.4.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | -| watchOS 8.0 | 13.1 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | -| watchOS 8.3 | 13.2.1 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | -| watchOS 8.5 | 13.3.1<br>13.4<br>13.4.1 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | +| OS | Xcode Version | Simulators | +| ----------- | -------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| iOS 15.0 | 13.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | +| iOS 15.2 | 13.2.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | +| iOS 15.4 | 13.3.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPhone SE (3rd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | +| iOS 15.5 | 13.4<br>13.4.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPhone SE (3rd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | +| iOS 16.0 | 14.0 | iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPhone SE (3rd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | +| tvOS 15.0 | 13.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | +| tvOS 15.2 | 13.2.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | +| tvOS 15.4 | 13.3.1<br>13.4<br>13.4.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | +| tvOS 16.0 | 13.1<br>13.2.1<br>13.3.1<br>13.4<br>13.4.1<br>14.0 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | +| watchOS 8.0 | 13.1 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | +| watchOS 8.3 | 13.2.1 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | +| watchOS 8.5 | 13.3.1<br>13.4<br>13.4.1 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | +| watchOS 9.0 | 13.1<br>13.2.1<br>13.3.1<br>13.4<br>13.4.1<br>14.0 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | ### Android | Package Name | Version | From 2b9521644379489efbb13f648a53c6d919382f5d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 31 Aug 2022 16:47:21 +0000 Subject: [PATCH 1439/3485] Updating readme file for macOS-10.15 version 20220829.1 (#6167) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-10.15-Readme.md | 171 ++++++++++++++--------------- 1 file changed, 85 insertions(+), 86 deletions(-) diff --git a/images/macos/macos-10.15-Readme.md b/images/macos/macos-10.15-Readme.md index a242b206cd3c..378d3d0190c4 100644 --- a/images/macos/macos-10.15-Readme.md +++ b/images/macos/macos-10.15-Readme.md @@ -1,55 +1,52 @@ | Announcements | |-| -| ['virtual-environments' repository name will be changed to 'runner-images' on August, 8th](https://github.com/actions/virtual-environments/issues/5967) | -| [[all OSs] Android NDK 21 will be replaced in favor of 25 on August, 1st](https://github.com/actions/virtual-environments/issues/5930) | -| [[all OSs] Android ndk-bundle along with old NDK versions will be deprecated on July, 24](https://github.com/actions/virtual-environments/issues/5879) | -| [The macOS 10.15 Actions runner image will begin deprecation on 5/31/22 and will be fully unsupported by 8/30/22 in GitHub and by 9/30/22 in ADO](https://github.com/actions/virtual-environments/issues/5583) | +| [The macOS 10.15 Actions runner image will begin deprecation on 5/31/22 and will be fully unsupported by 12/1/22 for GitHub and ADO](https://github.com/actions/runner-images/issues/5583) | *** # macOS 10.15 info - System Version: macOS 10.15.7 (19H2026) - Kernel Version: Darwin 19.6.0 -- Image Version: 20220724.1 +- Image Version: 20220829.1 ## Installed Software ### Language and Runtime -- .NET SDK 3.1.101 3.1.201 3.1.302 3.1.421 5.0.102 5.0.202 5.0.302 5.0.408 +- .NET SDK 3.1.101 3.1.201 3.1.302 3.1.422 5.0.102 5.0.202 5.0.302 5.0.408 - Bash 3.2.57(1)-release - Clang/LLVM 12.0.0 is default - Clang/LLVM 14.0.6 is available on `'$(brew --prefix llvm@14)/bin/clang'` - gcc-9 (Homebrew GCC 9.5.0) 9.5.0 - available by `gcc-9` alias - gcc-10 (Homebrew GCC 10.4.0) 10.4.0 - available by `gcc-10` alias -- gcc-11 (Homebrew GCC 11.3.0_2) 11.3.0 - available by `gcc-11` alias +- gcc-11 (Homebrew GCC 11.3.0) 11.3.0 - available by `gcc-11` alias - GNU Fortran (Homebrew GCC 9.5.0) 9.5.0 - available by `gfortran-9` alias - GNU Fortran (Homebrew GCC 10.4.0) 10.4.0 - available by `gfortran-10` alias -- GNU Fortran (Homebrew GCC 11.3.0_2) 11.3.0 - available by `gfortran-11` alias -- Go 1.17.12 -- julia 1.7.3 +- GNU Fortran (Homebrew GCC 11.3.0) 11.3.0 - available by `gfortran-11` alias +- Go 1.17.13 +- julia 1.8.0 - Kotlin 1.7.10-release-333 - MSBuild 16.10.1.31401 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) -- Node.js v16.16.0 +- Node.js v16.17.0 - NVM 0.39.1 -- NVM - Cached node versions: v12.22.12 v14.20.0 v16.16.0 +- NVM - Cached node versions: v12.22.12 v14.20.0 v16.17.0 - Perl 5.34.0 -- PHP 8.1.8 +- PHP 8.1.9 - Python 2.7.18 -- Python 3.9.13 +- Python 3.10.6 - R 4.2.1 - Ruby 2.7.6p219 ### Package Management -- Bundler version 2.3.18 +- Bundler version 2.3.21 - Carthage 0.38.0 - CocoaPods 1.11.3 -- Composer 2.3.10 -- Homebrew 3.5.6 +- Composer 2.4.1 +- Homebrew 3.5.10 - Miniconda 4.12.0 -- NPM 8.11.0 +- NPM 8.15.0 - NuGet 6.2.1.2 - Pip 20.3.4 (python 2.7) -- Pip 22.1.1 (python 3.9) +- Pip 22.2.2 (python 3.10) - Pipx 1.1.0 -- RubyGems 3.3.18 -- Vcpkg 2022 (build from master \<f93ba152d>) +- RubyGems 3.3.21 +- Vcpkg 2022 (build from master \<ed0279d48>) - Yarn 1.22.19 #### Environment variables @@ -61,99 +58,99 @@ ### Project Management - Apache Ant(TM) 1.10.12 - Apache Maven 3.8.6 -- Gradle 7.5 +- Gradle 7.5.1 - Sbt 1.7.1 ### Utilities - 7-Zip 17.04 - aria2 1.36.0 - azcopy 10.16.0 -- bazel 5.2.0 -- bazelisk 1.12.0 +- bazel 5.3.0 +- bazelisk 1.12.2 - bsdtar 3.3.2 - available by 'tar' alias - Curl 7.84.0 -- Git 2.37.1 +- Git 2.37.2 - Git LFS: 3.2.0 -- GitHub CLI: 2.14.2 -- GNU parallel 20220722 +- GitHub CLI: 2.14.7 +- GNU parallel 20220822 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.3 - gpg (GnuPG) 2.3.7 -- helm v3.9.2+g1addefb +- helm v3.9.4+gdbc6d8e - Hub CLI: 2.14.2 -- ImageMagick 7.1.0-43 +- ImageMagick 7.1.0-47 - jq 1.6 -- mongo v5.0.7 -- mongod v5.0.7 +- mongo v5.0.11 +- mongod v5.0.11 - Newman 5.3.2 - OpenSSL 1.1.1q 5 Jul 2022 `(/usr/local/opt/openssl@1.1 -> ../Cellar/openssl@1.1/1.1.1q)` -- Packer 1.8.2 -- PostgreSQL 14.4 -- psql (PostgreSQL) 14.4 +- Packer 1.8.3 +- PostgreSQL 14.5 (Homebrew) +- psql (PostgreSQL) 14.5 (Homebrew) - Sox 14.4.2 - Subversion (SVN) 1.14.2 - Switchaudio-osx 1.1.0 -- Vagrant 2.2.19 +- Vagrant 2.3.0 - VirtualBox 6.1.36r152435 -- yq (https://github.com/mikefarah/yq/) version 4.26.1 +- yq (https://github.com/mikefarah/yq/) version 4.27.3 - zstd 1.5.2 ### Tools -- Aliyun CLI 3.0.123 -- App Center CLI 2.10.10 -- AWS CLI 2.7.18 -- AWS SAM CLI 1.53.0 +- Aliyun CLI 3.0.125 +- App Center CLI 2.11.0 +- AWS CLI 2.7.27 +- AWS SAM CLI 1.55.0 - AWS Session Manager CLI 1.2.339.0 - Azure CLI (azure-devops) 0.25.0 -- Azure CLI 2.38.0 -- Bicep CLI 0.8.9 +- Azure CLI 2.39.0 +- Bicep CLI 0.9.1 - Cabal 3.6.2.0 -- Cmake 3.23.2 -- Fastlane 2.208.0 -- GHC 9.2.3 -- GHCup 0.1.17.8 +- Cmake 3.24.1 +- Fastlane 2.209.1 +- GHC 9.4.2 +- GHCup 0.1.18.0 - Jazzy 0.14.2 - Stack 2.7.5 -- SwiftFormat 0.49.13 +- SwiftFormat 0.49.17 - Swig 4.0.2 - Xcode Command Line Tools 12.4.0.0.1.1610135815 ### Linters -- SwiftLint 0.47.1 +- SwiftLint 0.48.0 - yamllint 1.27.1 ### Browsers -- Safari 15.6 (15613.3.9.1.7) -- SafariDriver 15.6 (15613.3.9.1.7) -- Google Chrome 103.0.5060.134 -- ChromeDriver 103.0.5060.134 -- Microsoft Edge 103.0.1264.71 -- Microsoft Edge WebDriver 103.0.1264.71 -- Mozilla Firefox 102.0.1 +- Safari 15.6.1 (15613.3.9.1.16) +- SafariDriver 15.6.1 (15613.3.9.1.16) +- Google Chrome 104.0.5112.101 +- ChromeDriver 104.0.5112.79 +- Microsoft Edge 104.0.1293.70 +- Microsoft Edge WebDriver 104.0.1293.70 +- Mozilla Firefox 104.0 - geckodriver 0.31.0 -- Selenium server 4.3.0 +- Selenium server 4.4.0 #### Environment variables -| Name | Value | -| --------------- | ----------------------------------------------- | -| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/103.0.5060.134 | -| EDGEWEBDRIVER | /usr/local/share/edge_driver | -| GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | +| Name | Value | +| --------------- | ---------------------------------------------- | +| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/104.0.5112.79 | +| EDGEWEBDRIVER | /usr/local/share/edge_driver | +| GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | ### Java | Version | Vendor | Environment Variable | | ------------------- | --------------- | -------------------- | -| 8.0.332+9 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | -| 11.0.16+8 | Eclipse Temurin | JAVA_HOME_11_X64 | +| 8.0.345+1 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | +| 11.0.16+101 | Eclipse Temurin | JAVA_HOME_11_X64 | | 12.0.2+10.3 | Adopt OpenJDK | JAVA_HOME_12_X64 | | 13.0.2+8.1 | Adopt OpenJDK | JAVA_HOME_13_X64 | | 14.0.2+12 | Adopt OpenJDK | JAVA_HOME_14_X64 | -| 17.0.3+7 | Eclipse Temurin | JAVA_HOME_17_X64 | +| 17.0.4+101 | Eclipse Temurin | JAVA_HOME_17_X64 | ### GraalVM | Version | Environment variables | | --------- | --------------------- | -| CE 22.1.0 | GRAALVM_11_ROOT | +| CE 22.2.0 | GRAALVM_11_ROOT | ### Cached Tools #### Ruby @@ -169,7 +166,7 @@ - 3.7.13 - 3.8.13 - 3.9.13 -- 3.10.5 +- 3.10.6 #### PyPy - 2.7.18 [PyPy 7.3.9] @@ -181,19 +178,19 @@ #### Node.js - 12.22.12 - 14.20.0 -- 16.16.0 +- 16.17.0 #### Go | Version | Architecture | Environment Variable | | ------- | ------------ | -------------------- | | 1.16.15 | x64 | GOROOT_1_16_X64 | -| 1.17.12 (Default) | x64 | GOROOT_1_17_X64 | -| 1.18.4 | x64 | GOROOT_1_18_X64 | +| 1.17.13 (Default) | x64 | GOROOT_1_17_X64 | +| 1.18.5 | x64 | GOROOT_1_18_X64 | ### Rust Tools -- Cargo 1.62.1 -- Rust 1.62.1 -- Rustdoc 1.62.1 +- Cargo 1.63.0 +- Rust 1.63.0 +- Rustdoc 1.63.0 - Rustup 1.25.1 #### Packages @@ -201,25 +198,25 @@ - Cargo-audit 0.17.0 - Cargo-outdated 0.11.1 - Cbindgen 0.24.3 -- Clippy 0.1.62 -- Rustfmt 1.4.38-stable +- Clippy 0.1.63 +- Rustfmt 1.5.1-stable ### PowerShell Tools -- PowerShell 7.2.5 +- PowerShell 7.2.6 #### PowerShell Modules | Module | Version | | ---------------- | ------- | -| Az | 8.1.0 | +| Az | 8.2.0 | | MarkdownPS | 1.9 | | Pester | 5.3.3 | | PSScriptAnalyzer | 1.20.0 | ### Web Servers -| Name | Version | ConfigFile | ServiceStatus | ListenPort | -| ----- | ------- | ------------------------------- | ------------- | ---------- | -| httpd | 2.4.54 | /usr/local/etc/httpd/httpd.conf | none | 80 | -| nginx | 1.23.1 | /usr/local/etc/nginx/nginx.conf | none | 80 | +| Name | Version | ConfigFile | ServiceStatus | ListenPort | +| ----- | -------- | ------------------------------- | ------------- | ---------- | +| httpd | 2.4.54_1 | /usr/local/etc/httpd/httpd.conf | none | 80 | +| nginx | 1.23.1 | /usr/local/etc/nginx/nginx.conf | none | 80 | ### Xamarin #### Visual Studio for Mac @@ -272,7 +269,6 @@ - xcversion 2.8.1 - Nomad CLI 0.0.2 - Nomad shenzhen CLI 0.14.3 -- xctool 0.3.7 #### Installed SDKs | SDK | SDK Name | Xcode Version | @@ -364,16 +360,16 @@ | Package Name | Version | | -------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 7.0 | -| Android Emulator | 31.2.10 | +| Android Emulator | 31.3.10 | | Android SDK Build-tools | 33.0.0<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3<br>26.0.0 26.0.1 26.0.2 26.0.3<br>25.0.0 25.0.1 25.0.2 25.0.3<br>24.0.0 24.0.1 24.0.2 24.0.3 | | Android SDK Platforms | android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3)<br>android-26 (rev 2)<br>android-25 (rev 3)<br>android-24 (rev 2) | -| Android SDK Platform-Tools | 33.0.2 | +| Android SDK Platform-Tools | 33.0.3 | | Android Support Repository | 47.0.0 | | CMake | 3.10.2<br>3.18.1 | | Google APIs | addon-google_apis-google-21<br>addon-google_apis-google-22<br>addon-google_apis-google-23<br>addon-google_apis-google-24 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 21.4.7075529<br>23.2.8568313<br>24.0.8215888 | +| NDK | 23.2.8568313<br>24.0.8215888<br>25.1.8937393 (default) | | SDK Patch Applier v4 | 1 | | Intel HAXM | 7.6.5 | @@ -381,13 +377,16 @@ | Name | Value | | ----------------------- | -------------------------------------------------- | | ANDROID_HOME | /Users/runner/Library/Android/sdk | -| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/24.0.8215888 | +| ANDROID_NDK | /Users/runner/Library/Android/sdk/ndk/25.1.8937393 | +| ANDROID_NDK_HOME | /Users/runner/Library/Android/sdk/ndk/25.1.8937393 | +| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/25.1.8937393 | +| ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk/25.1.8937393 | | ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | ### Miscellaneous - libXext 1.3.4 - libXft 2.3.4 -- Tcl/Tk 8.6.12 +- Tcl/Tk 8.6.12_1 - Zlib 1.2.12 From 893683b5597150d126f87d8fb9a16653bbbf1cd1 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 1 Sep 2022 11:12:05 +0000 Subject: [PATCH 1440/3485] Updating readme file for macOS-11 version 20220829.1 (#6169) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-11-Readme.md | 74 ++++++++++++++++----------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/images/macos/macos-11-Readme.md b/images/macos/macos-11-Readme.md index 00fe4b87a9d1..4e00db25ffe5 100644 --- a/images/macos/macos-11-Readme.md +++ b/images/macos/macos-11-Readme.md @@ -5,7 +5,7 @@ # macOS 11.6 info - System Version: macOS 11.6.8 (20G730) - Kernel Version: Darwin 20.6.0 -- Image Version: 20220822.4 +- Image Version: 20220829.1 ## Installed Software ### Language and Runtime @@ -34,19 +34,19 @@ - Ruby 2.7.6p219 ### Package Management -- Bundler version 2.3.20 +- Bundler version 2.3.21 - Carthage 0.38.0 - CocoaPods 1.11.3 - Composer 2.4.1 -- Homebrew 3.5.9 +- Homebrew 3.5.10 - Miniconda 4.12.0 - NPM 8.15.0 - NuGet 6.2.1.2 - Pip 20.3.4 (python 2.7) - Pip 22.2.2 (python 3.10) - Pipx 1.1.0 -- RubyGems 3.3.20 -- Vcpkg 2022 (build from master \<9259a0719>) +- RubyGems 3.3.21 +- Vcpkg 2022 (build from master \<ed0279d48>) - Yarn 1.22.19 #### Environment variables @@ -65,37 +65,37 @@ - 7-Zip 17.04 - aria2 1.36.0 - azcopy 10.16.0 -- bazel 5.2.0 +- bazel 5.3.0 - bazelisk 1.12.2 - bsdtar 3.3.2 - available by 'tar' alias - Curl 7.84.0 - Git 2.37.2 - Git LFS: 3.2.0 -- GitHub CLI: 2.14.4 +- GitHub CLI: 2.14.7 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.3 - gpg (GnuPG) 2.3.7 -- helm v3.9.3+g414ff28 +- helm v3.9.4+gdbc6d8e - Hub CLI: 2.14.2 -- ImageMagick 7.1.0-46 +- ImageMagick 7.1.0-47 - jq 1.6 -- mongo v5.0.10 -- mongod v5.0.10 +- mongo v5.0.11 +- mongod v5.0.11 - Newman 5.3.2 - OpenSSL 1.1.1q 5 Jul 2022 `(/usr/local/opt/openssl@1.1 -> ../Cellar/openssl@1.1/1.1.1q)` - Packer 1.8.3 -- PostgreSQL 14.5 -- psql (PostgreSQL) 14.5 +- PostgreSQL 14.5 (Homebrew) +- psql (PostgreSQL) 14.5 (Homebrew) - Sox 14.4.2 - Subversion (SVN) 1.14.2 - Switchaudio-osx 1.1.0 -- yq (https://github.com/mikefarah/yq/) version 4.27.2 +- yq (https://github.com/mikefarah/yq/) version 4.27.3 - zstd 1.5.2 ### Tools - Aliyun CLI 3.0.125 - App Center CLI 2.11.0 -- AWS CLI 2.7.25 +- AWS CLI 2.7.27 - AWS SAM CLI 1.55.0 - AWS Session Manager CLI 1.2.339.0 - Azure CLI (azure-devops) 0.25.0 @@ -104,8 +104,8 @@ - Cabal 3.6.2.0 - Cmake 3.24.1 - CodeQL Action Bundle 2.10.3 -- Fastlane 2.209.0 -- GHC 9.4.1 +- Fastlane 2.209.1 +- GHC 9.4.2 - GHCup 0.1.18.0 - Jazzy 0.14.2 - Stack 2.7.5 @@ -122,9 +122,9 @@ - SafariDriver 15.6.1 (16613.3.9.1.16) - Google Chrome 104.0.5112.101 - ChromeDriver 104.0.5112.79 -- Microsoft Edge 104.0.1293.63 -- Microsoft Edge WebDriver 104.0.1293.63 -- Mozilla Firefox 103.0.2 +- Microsoft Edge 104.0.1293.70 +- Microsoft Edge WebDriver 104.0.1293.70 +- Mozilla Firefox 104.0 - geckodriver 0.31.0 - Selenium server 4.4.0 @@ -139,8 +139,8 @@ | Version | Vendor | Environment Variable | | ------------------- | --------------- | -------------------- | | 8.0.345+1 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | -| 11.0.16+8 | Eclipse Temurin | JAVA_HOME_11_X64 | -| 17.0.4+8 | Eclipse Temurin | JAVA_HOME_17_X64 | +| 11.0.16+101 | Eclipse Temurin | JAVA_HOME_11_X64 | +| 17.0.4+101 | Eclipse Temurin | JAVA_HOME_17_X64 | ### GraalVM | Version | Environment variables | @@ -206,17 +206,17 @@ | PSScriptAnalyzer | 1.20.0 | ### Web Servers -| Name | Version | ConfigFile | ServiceStatus | ListenPort | -| ----- | ------- | ------------------------------- | ------------- | ---------- | -| httpd | 2.4.54 | /usr/local/etc/httpd/httpd.conf | none | 80 | -| nginx | 1.23.1 | /usr/local/etc/nginx/nginx.conf | none | 80 | +| Name | Version | ConfigFile | ServiceStatus | ListenPort | +| ----- | -------- | ------------------------------- | ------------- | ---------- | +| httpd | 2.4.54_1 | /usr/local/etc/httpd/httpd.conf | none | 80 | +| nginx | 1.23.1 | /usr/local/etc/nginx/nginx.conf | none | 80 | ### Xamarin #### Visual Studio for Mac -| Version | Build | Path | -| -------------- | ---------- | ------------------------------------ | -| 2019 | 8.10.25.2 | /Applications/Visual Studio 2019.app | -| 2022 (default) | 17.3.1.411 | /Applications/Visual Studio.app | +| Version | Build | Path | +| -------------- | --------- | ------------------------------------ | +| 2019 | 8.10.25.2 | /Applications/Visual Studio 2019.app | +| 2022 (default) | 17.3.2.24 | /Applications/Visual Studio.app | ##### Notes: ``` @@ -335,28 +335,28 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" | Android Emulator | 31.3.10 | | Android SDK Build-tools | 33.0.0<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | | Android SDK Platforms | android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | -| Android SDK Platform-Tools | 33.0.2 | +| Android SDK Platform-Tools | 33.0.3 | | Android Support Repository | 47.0.0 | | CMake | 3.10.2<br>3.18.1<br>3.22.1 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 23.2.8568313<br>24.0.8215888<br>25.0.8775105 (default) | +| NDK | 23.2.8568313<br>24.0.8215888<br>25.1.8937393 (default) | | SDK Patch Applier v4 | 1 | #### Environment variables | Name | Value | | ----------------------- | -------------------------------------------------- | | ANDROID_HOME | /Users/runner/Library/Android/sdk | -| ANDROID_NDK | /Users/runner/Library/Android/sdk/ndk/25.0.8775105 | -| ANDROID_NDK_HOME | /Users/runner/Library/Android/sdk/ndk/25.0.8775105 | -| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/25.0.8775105 | -| ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk/25.0.8775105 | +| ANDROID_NDK | /Users/runner/Library/Android/sdk/ndk/25.1.8937393 | +| ANDROID_NDK_HOME | /Users/runner/Library/Android/sdk/ndk/25.1.8937393 | +| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/25.1.8937393 | +| ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk/25.1.8937393 | | ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | ### Miscellaneous - libXext 1.3.4 - libXft 2.3.4 -- Tcl/Tk 8.6.12 +- Tcl/Tk 8.6.12_1 - Zlib 1.2.12 From ef9c8bf522c85f22e8f520589ebe9abcc964e2ee Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Fri, 2 Sep 2022 18:59:40 +0200 Subject: [PATCH 1441/3485] [Windows] Add Windows11SDK.22621 to Win19 (#6148) * [Windows] Add Windows11SDK.22621 to Win19 * Code style fix Co-authored-by: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Co-authored-by: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> --- images/win/scripts/Installers/Install-VS.ps1 | 6 ++++++ images/win/scripts/Tests/VisualStudio.Tests.ps1 | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/images/win/scripts/Installers/Install-VS.ps1 b/images/win/scripts/Installers/Install-VS.ps1 index 0f4550e4e54a..1273975f61ff 100644 --- a/images/win/scripts/Installers/Install-VS.ps1 +++ b/images/win/scripts/Installers/Install-VS.ps1 @@ -42,6 +42,12 @@ if (Test-IsWin19) { $sdkFileName = "sdksetup14393.exe" $argumentList = ("/q", "/norestart", "/ceip off", "/features OptionId.WindowsSoftwareDevelopmentKit") Install-Binary -Url $sdkUrl -Name $sdkFileName -ArgumentList $argumentList + + # Install Windows 11 SDK version 10.0.22621.0 + $sdkUrl = "https://go.microsoft.com/fwlink/p/?linkid=2196241" + $sdkFileName = "sdksetup22621.exe" + $argumentList = ("/q", "/norestart", "/ceip off", "/features OptionId.UWPManaged OptionId.UWPCPP OptionId.UWPLocalized OptionId.DesktopCPPx86 OptionId.DesktopCPPx64 OptionId.DesktopCPParm64") + Install-Binary -Url $sdkUrl -Name $sdkFileName -ArgumentList $argumentList } if (Test-IsWin22) { diff --git a/images/win/scripts/Tests/VisualStudio.Tests.ps1 b/images/win/scripts/Tests/VisualStudio.Tests.ps1 index 79643f0d2bd1..57266fc2c426 100644 --- a/images/win/scripts/Tests/VisualStudio.Tests.ps1 +++ b/images/win/scripts/Tests/VisualStudio.Tests.ps1 @@ -28,4 +28,10 @@ Describe "Windows 10 SDK" { It "Verifies 17763 SDK is installed" -Skip:(Test-IsWin19) { "${env:ProgramFiles(x86)}\Windows Kits\10\DesignTime\CommonConfiguration\Neutral\UAP\10.0.17763.0\UAP.props" | Should -Exist } +} + +Describe "Windows 11 SDK" { + It "Verifies 22621 SDK is installed" -Skip:(Test-IsWin22) { + "${env:ProgramFiles(x86)}\Windows Kits\10\DesignTime\CommonConfiguration\Neutral\UAP\10.0.22621.0\UAP.props" | Should -Exist + } } \ No newline at end of file From f1abfa5fdef67ed2f06e93cea1fb01c0b44c1dcf Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Mon, 5 Sep 2022 12:54:06 +0200 Subject: [PATCH 1442/3485] Fix chromium revision parsing (#6182) --- images/linux/scripts/installers/google-chrome.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/linux/scripts/installers/google-chrome.sh b/images/linux/scripts/installers/google-chrome.sh index 889690cd4903..5a6ca806b070 100644 --- a/images/linux/scripts/installers/google-chrome.sh +++ b/images/linux/scripts/installers/google-chrome.sh @@ -17,7 +17,7 @@ function GetChromiumRevision { # Some Google Chrome versions are based on Chromium revisions for which a (usually very old) Chromium release with the same number exist. So far this has heppened with 4 digits long Chromium revisions (1060, 1086). # Use the previous Chromium release when this happens to avoid downloading and installing very old Chromium releases that would break image build because of incompatibilities. # First reported with: https://github.com/actions/runner-images/issues/5256 - if [ ${#REVISION} -eq 4 ]; then + if [ ${#REVISION} -le 4 ]; then CURRENT_REVISIONS=$(curl -s "https://omahaproxy.appspot.com/all.json?os=linux&channel=stable") PREVIOUS_VERSION=$(echo "$CURRENT_REVISIONS" | jq -r '.[].versions[].previous_version') URL="https://omahaproxy.appspot.com/deps.json?version=${PREVIOUS_VERSION}" From 9d9d80c1243f29200e4614b9d80a4f9aa0b95e45 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 6 Sep 2022 15:55:45 +0000 Subject: [PATCH 1443/3485] Updating readme file for macOS-12 version 20220904.1 (#6183) Co-authored-by: Image generation service account <no-reply@microsoft.com> --- images/macos/macos-12-Readme.md | 38 ++++++++++++++++----------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/images/macos/macos-12-Readme.md b/images/macos/macos-12-Readme.md index 766e575b8355..ce44eb58ecf9 100644 --- a/images/macos/macos-12-Readme.md +++ b/images/macos/macos-12-Readme.md @@ -5,7 +5,7 @@ # macOS 12.5 info - System Version: macOS 12.5.1 (21G83) - Kernel Version: Darwin 21.6.0 -- Image Version: 20220829.1 +- Image Version: 20220904.1 ## Installed Software ### Language and Runtime @@ -23,7 +23,7 @@ - NVM 0.39.1 - NVM - Cached node versions: v12.22.12 v14.20.0 v16.17.0 - Perl 5.34.0 -- PHP 8.1.9 +- PHP 8.1.10 - Python 2.7.18 - Python 3.10.6 - R 4.2.1 @@ -42,7 +42,7 @@ - Pip 22.2.2 (python 3.10) - Pipx 1.1.0 - RubyGems 3.3.21 -- Vcpkg 2022 (build from master \<8a991b8d8>) +- Vcpkg 2022 (build from master \<927006b24>) - Yarn 1.22.19 #### Environment variables @@ -62,10 +62,10 @@ - aria2 1.36.0 - azcopy 10.16.0 - bazel 5.3.0 -- bazelisk 1.12.2 +- bazelisk 1.13.0 - bsdtar 3.5.1 - available by 'tar' alias -- Curl 7.84.0 -- Git 2.37.2 +- Curl 7.85.0 +- Git 2.37.3 - Git LFS: 3.2.0 - GitHub CLI: 2.14.7 - GNU Tar 1.34 - available by 'gtar' alias @@ -84,49 +84,49 @@ - Subversion (SVN) 1.14.2 - Switchaudio-osx 1.1.0 - Vagrant 2.3.0 -- VirtualBox 6.1.36r152435 +- VirtualBox 6.1.38r153438 - yq (https://github.com/mikefarah/yq/) version 4.27.3 - zstd 1.5.2 ### Tools - App Center CLI 2.11.0 -- AWS CLI 2.7.27 -- AWS SAM CLI 1.55.0 +- AWS CLI 2.7.29 +- AWS SAM CLI 1.56.0 - AWS Session Manager CLI 1.2.339.0 - Azure CLI (azure-devops) 0.25.0 - Azure CLI 2.39.0 - Bicep CLI 0.9.1 - Cabal 3.6.2.0 - Cmake 3.24.1 -- CodeQL Action Bundle 2.10.3 +- CodeQL Action Bundle 2.10.4 - Fastlane 2.209.1 - GHC 9.4.2 - GHCup 0.1.18.0 - Jazzy 0.14.2 - Stack 2.7.5 -- SwiftFormat 0.49.17 +- SwiftFormat 0.49.18 - Swig 4.0.2 - Xcode Command Line Tools 13.4.0.0.1.1651278267 ### Linters -- SwiftLint 0.49.0 +- SwiftLint 0.49.1 - yamllint 1.27.1 ### Browsers - Safari 15.6.1 (17613.3.9.1.16) - SafariDriver 15.6.1 (17613.3.9.1.16) -- Google Chrome 104.0.5112.101 -- ChromeDriver 104.0.5112.79 -- Microsoft Edge 104.0.1293.70 -- Microsoft Edge WebDriver 104.0.1293.70 -- Mozilla Firefox 104.0 +- Google Chrome 105.0.5195.102 +- ChromeDriver 105.0.5195.52 +- Microsoft Edge 105.0.1343.27 +- Microsoft Edge WebDriver 105.0.1343.27 +- Mozilla Firefox 104.0.1 - geckodriver 0.31.0 - Selenium server 4.4.0 #### Environment variables | Name | Value | | --------------- | ---------------------------------------------- | -| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/104.0.5112.79 | +| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/105.0.5195.52 | | EDGEWEBDRIVER | /usr/local/share/edge_driver | | GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | @@ -208,7 +208,7 @@ | Version | Build | Path | | -------------- | --------- | ------------------------------------ | | 2019 | 8.10.25.2 | /Applications/Visual Studio 2019.app | -| 2022 (default) | 17.3.2.24 | /Applications/Visual Studio.app | +| 2022 (default) | 17.3.3.10 | /Applications/Visual Studio.app | ##### Notes: ``` From e295cb5837908738b0beabaa729425846fab9afc Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 7 Sep 2022 10:24:55 +0000 Subject: [PATCH 1444/3485] Updating readme file for ubuntu22 version 20220905.1 (#6189) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2204-Readme.md | 54 +++++++++++++++---------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/images/linux/Ubuntu2204-Readme.md b/images/linux/Ubuntu2204-Readme.md index 67c8c2b84141..888202f9b2d3 100644 --- a/images/linux/Ubuntu2204-Readme.md +++ b/images/linux/Ubuntu2204-Readme.md @@ -1,10 +1,10 @@ | Announcements | |-| -| [The Ubuntu 18.04 Actions runner image will begin deprecation on 8/8/22 and will be fully unsupported by TBD](https://github.com/actions/runner-images/issues/6002) | +| [The Ubuntu 18.04 Actions runner image will begin deprecation on 8/8/22 and will be fully unsupported by 4/1/2023](https://github.com/actions/runner-images/issues/6002) | *** # Ubuntu 22.04.1 LTS - Linux kernel version: 5.15.0-1017-azure -- Image Version: 20220828.1 +- Image Version: 20220905.1 ## Installed Software ### Language and Runtime @@ -36,7 +36,7 @@ - Pip3 22.0.2 - Pipx 1.1.0 - RubyGems 3.3.5 -- Vcpkg (build from master \<e85b5bb95>) +- Vcpkg (build from master \<927006b24>) - Yarn 1.22.19 #### Environment variables @@ -46,7 +46,7 @@ | VCPKG_INSTALLATION_ROOT | /usr/local/share/vcpkg | ### Project Management -- Lerna 5.4.3 +- Lerna 5.5.0 ### Tools - Ansible 2.13.3 @@ -57,21 +57,21 @@ - Bicep 0.9.1 - Buildah 1.23.1 - CMake 3.24.1 -- CodeQL Action Bundle 2.10.3 +- CodeQL Action Bundle 2.10.4 - Docker Amazon ECR Credential Helper 0.6.0 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.10.1+azure-1 +- Docker Compose v2 2.10.2+azure-1 - Docker-Buildx 0.9.1 - Docker-Moby Client 20.10.17+azure-1 - Docker-Moby Server 20.10.17+azure-3 - Fastlane 2.209.1 -- Git 2.37.2 (apt source repository: ppa:git-core/ppa) +- Git 2.37.3 (apt source repository: ppa:git-core/ppa) - Git LFS 3.2.0 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.6.0 - Haveged 1.9.14 -- Heroku 7.62.0 +- Heroku 7.63.0 - jq 1.6 -- Kind 0.14.0 +- Kind 0.15.0 - Kubectl 1.25.0 - Kustomize 4.5.7 - Leiningen 2.9.10 @@ -85,30 +85,30 @@ - Packer 1.8.3 - Parcel 2.7.0 - Podman 3.4.4 -- Pulumi 3.38.0 +- Pulumi 3.39.1 - R 4.2.1 - Skopeo 1.4.1 - Sphinx Open Source Search Server 2.2.11 - SVN 1.14.1 - Terraform 1.2.8 - yamllint 1.27.1 -- yq 4.27.2 +- yq 4.27.3 - zstd 1.5.2 (homebrew) ### CLI Tools - Alibaba Cloud CLI 3.0.125 -- AWS CLI 2.7.27 +- AWS CLI 2.7.29 - AWS CLI Session manager plugin 1.2.339.0 -- AWS SAM CLI 1.55.0 +- AWS SAM CLI 1.56.0 - Azure CLI (azure-cli) 2.39.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.25.0 - GitHub CLI 2.14.7 - Google Cloud SDK 369.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 11.5.0 +- Netlify CLI 11.5.1 - OpenShift CLI 4.11.1 -- ORAS CLI 0.14.0 -- Vercel CLI 28.2.0 +- ORAS CLI 0.14.1 +- Vercel CLI 28.2.2 ### Java | Version | Vendor | Environment Variable | @@ -152,11 +152,11 @@ - Rustfmt 1.5.1 ### Browsers and Drivers -- Google Chrome 104.0.5112.101 -- ChromeDriver 104.0.5112.79 -- Chromium 104.0.5112.0 -- Microsoft Edge 104.0.1293.70 (apt source repository: https://packages.microsoft.com/repos/edge) -- Microsoft Edge WebDriver 104.0.1293.70 +- Google Chrome 105.0.5195.102 +- ChromeDriver 105.0.5195.52 +- Chromium 105.0.5177.0 +- Microsoft Edge 105.0.1343.27 (apt source repository: https://packages.microsoft.com/repos/edge) +- Microsoft Edge WebDriver 105.0.1343.27 - Selenium server 4.4.0 #### Environment variables @@ -285,9 +285,9 @@ | node:14-alpine | sha256:4aff4ba0da347e51561587eba037a38db4eaa70e1a6c8334d66779fe963d5be7 | 2022-08-09 | | node:16 | sha256:0c672d547405fe64808ea28b49c5772b1026f81b3b716ff44c10c96abf177d6a | 2022-08-23 | | node:16-alpine | sha256:2c405ed42fc0fd6aacbe5730042640450e5ec030bada7617beac88f742b6997b | 2022-08-16 | -| ubuntu:18.04 | sha256:eb1392bbdde63147bc2b4ff1a4053dcfe6d15e4dfd3cce29e9b9f52a4f88bc74 | 2022-08-02 | -| ubuntu:20.04 | sha256:af5efa9c28de78b754777af9b4d850112cad01899a5d37d2617bb94dc63a49aa | 2022-08-02 | -| ubuntu:22.04 | sha256:34fea4f31bf187bc915536831fd0afc9d214755bf700b5cdb1336c82516d154e | 2022-08-02 | +| ubuntu:18.04 | sha256:3aa2ccb021969aadb28381fee1b247422e845b176e241cd1540c4b6831e000bb | 2022-09-01 | +| ubuntu:20.04 | sha256:35ab2bf57814e9ff49e365efd5a5935b6915eede5c7f8581e9e1b85e0eecbe16 | 2022-09-01 | +| ubuntu:22.04 | sha256:20fa2d7bb4de7723f542be5923b06c4d704370f0390e4ae9e1c833c8785644c1 | 2022-09-01 | ### Installed apt packages | Name | Version | @@ -302,7 +302,7 @@ | build-essential | 12.9ubuntu3 | | bzip2 | 1.0.8-5build1 | | coreutils | 8.32-4.1ubuntu1 | -| curl | 7.81.0-1ubuntu1.3 | +| curl | 7.81.0-1ubuntu1.4 | | dbus | 1.12.20-2ubuntu4 | | dnsutils | 1:9.18.1-1ubuntu1.1 | | dpkg | 1.21.1ubuntu2.1 | @@ -320,7 +320,7 @@ | lib32z1 | 1:1.2.11.dfsg-2ubuntu9 | | libc++-dev | 1:14.0-55\~exp2 | | libc++abi-dev | 1:14.0-55\~exp2 | -| libcurl4 | 7.81.0-1ubuntu1.3 | +| libcurl4 | 7.81.0-1ubuntu1.4 | | libgbm-dev | 22.0.5-0ubuntu0.1 | | libgconf-2-4 | 3.2.6-7ubuntu2 | | libgsl-dev | 2.7.1+dfsg-3 | @@ -364,7 +364,7 @@ | texinfo | 6.8-4build1 | | time | 1.9-0.1build2 | | tk | 8.6.11+1build2 | -| tzdata | 2022a-0ubuntu1 | +| tzdata | 2022c-0ubuntu0.22.04.0 | | unzip | 6.0-26ubuntu3 | | upx | 3.96-3 | | wget | 1.21.2-2ubuntu1 | From 212fa3171cf593fb1035fb6325f4b61c728a98d0 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 7 Sep 2022 14:52:41 +0000 Subject: [PATCH 1445/3485] Updating readme file for win22 version 20220905.1 (#6187) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2022-Readme.md | 37 ++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/images/win/Windows2022-Readme.md b/images/win/Windows2022-Readme.md index 190c5b2e4607..e51cbaeb2621 100644 --- a/images/win/Windows2022-Readme.md +++ b/images/win/Windows2022-Readme.md @@ -1,6 +1,10 @@ +| Announcements | +|-| +| [[Windows] Docker EE will be replaced with Docker CE / Moby on September, 19](https://github.com/actions/runner-images/issues/6181) | +*** # Microsoft Windows Server 2022 Datacenter - OS Version: 10.0.20348 Build 887 -- Image Version: 20220828.1 +- Image Version: 20220905.1 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -14,7 +18,7 @@ - LLVM 14.0.6 - Node 16.17.0 - Perl 5.32.1 -- PHP 8.1.9 +- PHP 8.1.10 - Python 3.9.13 - Ruby 3.0.4p208 @@ -28,7 +32,7 @@ - pip 22.2.2 (python 3.9) - Pipx 1.1.0 - RubyGems 3.2.33 -- Vcpkg (build from master \<e85b5bb95>) +- Vcpkg (build from master \<927006b24>) - Yarn 1.22.19 #### Environment variables @@ -51,17 +55,17 @@ - Bicep 0.9.1 - Cabal 3.8.1.0 - CMake 3.24.1 -- CodeQL Action Bundle 2.10.3 +- CodeQL Action Bundle 2.10.4 - Docker 20.10.7 - Docker Compose v1 1.29.2 - Docker Compose v2 2.10.2 - Docker-wincred 0.6.4 - ghc 9.4.2 -- Git 2.37.2.windows.2 +- Git 2.37.3.windows.1 - Git LFS 3.2.0 - InnoSetup 6.2.1 - jq 1.6 -- Kind 0.14.0 +- Kind 0.15.0 - Kubectl 1.25.0 - Mercurial 5.0 - Mingw-w64 11.2.0 @@ -69,7 +73,7 @@ - NSIS v3.08 - OpenSSL 1.1.1 - Packer 1.8.2 -- Pulumi v3.38.0 +- Pulumi v3.39.1 - R 4.2.1 - Service Fabric SDK 9.0.1028.9590 - Stack 2.7.5 @@ -83,8 +87,8 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.125 -- AWS CLI 2.7.26 -- AWS SAM CLI 1.55.0 +- AWS CLI 2.7.29 +- AWS SAM CLI 1.56.0 - AWS Session Manager CLI 1.2.339.0 - Azure CLI 2.39.0 - Azure DevOps CLI extension 0.25.0 @@ -106,11 +110,11 @@ - Rustfmt 1.5.1 ### Browsers and webdrivers -- Google Chrome 104.0.5112.102 -- Chrome Driver 104.0.5112.79 -- Microsoft Edge 104.0.1293.70 -- Microsoft Edge Driver 104.0.1293.70 -- Mozilla Firefox 104.0 +- Google Chrome 105.0.5195.102 +- Chrome Driver 105.0.5195.52 +- Microsoft Edge 105.0.1343.27 +- Microsoft Edge Driver 105.0.1343.27 +- Mozilla Firefox 104.0.1 - Gecko Driver 0.31.0 - IE Driver 3.150.1.1 - Selenium server 4.4.0 @@ -219,7 +223,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Visual Studio Enterprise 2022 | Name | Version | Path | | ----------------------------- | -------------- | -------------------------------------------------------- | -| Visual Studio Enterprise 2022 | 17.3.32819.101 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | +| Visual Studio Enterprise 2022 | 17.3.32825.248 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | #### Workloads, components and extensions: | Package | Version | @@ -560,7 +564,7 @@ All other versions are saved but not installed. #### Powershell Modules | Module | Version | | ------------------ | ---------------- | -| AWSPowerShell | 4.1.156 | +| AWSPowerShell | 4.1.161 | | DockerMsftProvider | 1.0.0.8 | | MarkdownPS | 1.9 | | Microsoft.Graph | 1.11.1 | @@ -605,3 +609,4 @@ All other versions are saved but not installed. | mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:5f57ddc9a47d079398506a7613c8a3cb8b5bf3f97040f590871b61a15bd5a36a | 2022-08-06 | | mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:35c3cb29ef2c9f05e36070d04c79d7fc861c035fa5df2df64ae607a276db42c6 | 2022-08-06 | + From 97c9723c8f057975056b1afe3b27c5afe5f7b6be Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 7 Sep 2022 20:55:18 +0000 Subject: [PATCH 1446/3485] Updating readme file for win19 version 20220905.1 (#6186) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2019-Readme.md | 40 ++++++++++++++++++-------------- 1 file changed, 23 insertions(+), 17 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index 64bf972c98c2..8732eba3440f 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -1,6 +1,10 @@ +| Announcements | +|-| +| [[Windows] Docker EE will be replaced with Docker CE / Moby on September, 19](https://github.com/actions/runner-images/issues/6181) | +*** # Microsoft Windows Server 2019 Datacenter - OS Version: 10.0.17763 Build 3287 -- Image Version: 20220828.1 +- Image Version: 20220905.1 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -14,7 +18,7 @@ - LLVM 14.0.6 - Node 16.17.0 - Perl 5.32.1 -- PHP 8.1.9 +- PHP 8.1.10 - Python 3.7.9 - Ruby 2.5.9p229 @@ -28,7 +32,7 @@ - pip 22.2.2 (python 3.7) - Pipx 1.1.0 - RubyGems 2.7.6.3 -- Vcpkg (build from master \<e85b5bb95>) +- Vcpkg (build from master \<927006b24>) - Yarn 1.22.19 #### Environment variables @@ -52,18 +56,18 @@ - Bicep 0.9.1 - Cabal 3.8.1.0 - CMake 3.24.1 -- CodeQL Action Bundle 2.10.3 +- CodeQL Action Bundle 2.10.4 - Docker 20.10.7 - Docker Compose v1 1.29.2 - Docker Compose v2 2.10.2 - Docker-wincred 0.6.4 - ghc 9.4.2 -- Git 2.37.2.windows.2 +- Git 2.37.3.windows.1 - Git LFS 3.2.0 -- Google Cloud SDK 399.0.0 +- Google Cloud SDK 400.0.0 - InnoSetup 6.2.1 - jq 1.6 -- Kind 0.14.0 +- Kind 0.15.0 - Kubectl 1.25.0 - Mercurial 5.0 - Mingw-w64 8.1.0 @@ -72,7 +76,7 @@ - OpenSSL 1.1.1 - Packer 1.8.2 - Parcel 2.7.0 -- Pulumi v3.38.0 +- Pulumi v3.39.1 - R 4.2.1 - Service Fabric SDK 9.0.1028.9590 - Stack 2.7.5 @@ -86,8 +90,8 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.125 -- AWS CLI 2.7.26 -- AWS SAM CLI 1.55.0 +- AWS CLI 2.7.29 +- AWS SAM CLI 1.56.0 - AWS Session Manager CLI 1.2.339.0 - Azure CLI 2.39.0 - Azure DevOps CLI extension 0.25.0 @@ -110,11 +114,11 @@ - Rustfmt 1.5.1 ### Browsers and webdrivers -- Google Chrome 104.0.5112.102 -- Chrome Driver 104.0.5112.79 -- Microsoft Edge 104.0.1293.70 -- Microsoft Edge Driver 104.0.1293.70 -- Mozilla Firefox 104.0 +- Google Chrome 105.0.5195.102 +- Chrome Driver 105.0.5195.52 +- Microsoft Edge 105.0.1343.27 +- Microsoft Edge Driver 105.0.1343.27 +- Mozilla Firefox 104.0.1 - Gecko Driver 0.31.0 - IE Driver 3.150.1.1 - Selenium server 4.4.0 @@ -469,7 +473,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | VisualStudioClient.MicrosoftVisualStudio2017InstallerProjects | 1.0.2 | | Windows Driver Kit | 10.1.22000.1 | | Windows Driver Kit Visual Studio Extension | 10.0.21381.0 | -| Windows Software Development Kit | 10.1.22000.832 | +| Windows Software Development Kit | 10.1.22621.1 | | WIX Toolset Studio 2019 Extension | 1.0.0.18 | | WixToolset.WixToolsetVisualStudio2019Extension | 1.0.0.18 | @@ -501,6 +505,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 10.0.19041.0 - 10.0.20348.0 - 10.0.22000.0 +- 10.0.22621.0 ### .NET Core SDK `Location C:\Program Files\dotnet\sdk` @@ -543,7 +548,7 @@ All other versions are saved but not installed. #### Powershell Modules | Module | Version | | ------------------ | ---------------- | -| AWSPowerShell | 4.1.156 | +| AWSPowerShell | 4.1.161 | | DockerMsftProvider | 1.0.0.8 | | MarkdownPS | 1.9 | | Microsoft.Graph | 1.11.1 | @@ -589,3 +594,4 @@ All other versions are saved but not installed. | mcr.microsoft.com/windows/nanoserver:1809 | sha256:c827903a303cb7a76214adb4376e462a241b3cd763cb88655cd901c5a0e867a0 | 2022-08-06 | | mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:8ca3aaeb91e7715a98a0769dc62ed69212aac3e0bbee12ffd13b5e36d992d127 | 2022-08-06 | + From 27d6979ea57e8b5949a56a0f847250112798e515 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 8 Sep 2022 08:50:51 +0000 Subject: [PATCH 1447/3485] Updating readme file for ubuntu20 version 20220905.1 (#6188) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2004-Readme.md | 58 +++++++++++++++---------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/images/linux/Ubuntu2004-Readme.md b/images/linux/Ubuntu2004-Readme.md index dc591eb0371b..22935972c814 100644 --- a/images/linux/Ubuntu2004-Readme.md +++ b/images/linux/Ubuntu2004-Readme.md @@ -1,10 +1,10 @@ | Announcements | |-| -| [The Ubuntu 18.04 Actions runner image will begin deprecation on 8/8/22 and will be fully unsupported by TBD](https://github.com/actions/runner-images/issues/6002) | +| [The Ubuntu 18.04 Actions runner image will begin deprecation on 8/8/22 and will be fully unsupported by 4/1/2023](https://github.com/actions/runner-images/issues/6002) | *** -# Ubuntu 20.04.4 LTS -- Linux kernel version: 5.15.0-1017-azure -- Image Version: 20220828.1 +# Ubuntu 20.04.5 LTS +- Linux kernel version: 5.15.0-1019-azure +- Image Version: 20220905.1 ## Installed Software ### Language and Runtime @@ -26,7 +26,7 @@ - Python 3.8.10 - Python3 3.8.10 - Ruby 2.7.0p0 -- Swift 5.6.2 +- Swift 5.6.3 ### Package Management - cpan 1.64 @@ -39,7 +39,7 @@ - Pip3 20.0.2 - Pipx 1.1.0 - RubyGems 3.1.2 -- Vcpkg (build from master \<e85b5bb95>) +- Vcpkg (build from master \<927006b24>) - Yarn 1.22.19 #### Environment variables @@ -51,7 +51,7 @@ ### Project Management - Ant 1.10.7 - Gradle 7.5.1 -- Lerna 5.4.3 +- Lerna 5.5.0 - Maven 3.8.6 - Sbt 1.7.1 @@ -64,22 +64,22 @@ - Bicep 0.9.1 - Buildah 1.22.3 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - CMake 3.24.1 -- CodeQL Action Bundle 2.10.3 +- CodeQL Action Bundle 2.10.4 - Docker Amazon ECR Credential Helper 0.6.0 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.10.1+azure-1 +- Docker Compose v2 2.10.2+azure-1 - Docker-Buildx 0.9.1 - Docker-Moby Client 20.10.17+azure-1 - Docker-Moby Server 20.10.17+azure-3 - Fastlane 2.209.1 -- Git 2.37.2 (apt source repository: ppa:git-core/ppa) +- Git 2.37.3 (apt source repository: ppa:git-core/ppa) - Git LFS 3.2.0 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.6.0 - Haveged 1.9.1 -- Heroku 7.62.0 +- Heroku 7.63.0 - HHVM (HipHop VM) 4.167.0 - jq 1.6 -- Kind 0.14.0 +- Kind 0.15.0 - Kubectl 1.25.0 - Kustomize 4.5.7 - Leiningen 2.9.10 @@ -94,30 +94,30 @@ - Parcel 2.7.0 - PhantomJS 2.1.1 - Podman 3.4.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- Pulumi 3.38.0 +- Pulumi 3.39.1 - R 4.2.1 - Skopeo 1.5.0 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 - Terraform 1.2.8 - yamllint 1.27.1 -- yq 4.27.2 +- yq 4.27.3 - zstd 1.5.2 (homebrew) ### CLI Tools - Alibaba Cloud CLI 3.0.125 -- AWS CLI 2.7.27 +- AWS CLI 2.7.29 - AWS CLI Session manager plugin 1.2.339.0 -- AWS SAM CLI 1.55.0 +- AWS SAM CLI 1.56.0 - Azure CLI (azure-cli) 2.39.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.25.0 - GitHub CLI 2.14.7 - Google Cloud SDK 369.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 11.5.0 +- Netlify CLI 11.5.1 - OpenShift CLI 4.11.1 -- ORAS CLI 0.14.0 -- Vercel CLI 28.2.0 +- ORAS CLI 0.14.1 +- Vercel CLI 28.2.2 ### Java | Version | Vendor | Environment Variable | @@ -161,11 +161,11 @@ - Rustfmt 1.5.1 ### Browsers and Drivers -- Google Chrome 104.0.5112.101 -- ChromeDriver 104.0.5112.79 -- Chromium 104.0.5112.0 -- Microsoft Edge 104.0.1293.70 (apt source repository: https://packages.microsoft.com/repos/edge) -- Microsoft Edge WebDriver 104.0.1293.70 +- Google Chrome 105.0.5195.102 +- ChromeDriver 105.0.5195.52 +- Chromium 105.0.5177.0 +- Microsoft Edge 105.0.1343.27 (apt source repository: https://packages.microsoft.com/repos/edge) +- Microsoft Edge WebDriver 105.0.1343.27 - Selenium server 4.4.0 - Mozilla Firefox 104.0 - Geckodriver 0.31.0 @@ -313,8 +313,8 @@ | node:16 | sha256:0c672d547405fe64808ea28b49c5772b1026f81b3b716ff44c10c96abf177d6a | 2022-08-23 | | node:16-alpine | sha256:2c405ed42fc0fd6aacbe5730042640450e5ec030bada7617beac88f742b6997b | 2022-08-16 | | ubuntu:16.04 | sha256:91bd29a464fdabfcf44e29e1f2a5f213c6dfa750b6290e40dd6998ac79da3c41 | 2021-08-31 | -| ubuntu:18.04 | sha256:eb1392bbdde63147bc2b4ff1a4053dcfe6d15e4dfd3cce29e9b9f52a4f88bc74 | 2022-08-02 | -| ubuntu:20.04 | sha256:af5efa9c28de78b754777af9b4d850112cad01899a5d37d2617bb94dc63a49aa | 2022-08-02 | +| ubuntu:18.04 | sha256:3aa2ccb021969aadb28381fee1b247422e845b176e241cd1540c4b6831e000bb | 2022-09-01 | +| ubuntu:20.04 | sha256:35ab2bf57814e9ff49e365efd5a5935b6915eede5c7f8581e9e1b85e0eecbe16 | 2022-09-01 | ### Installed apt packages | Name | Version | @@ -329,7 +329,7 @@ | build-essential | 12.8ubuntu1.1 | | bzip2 | 1.0.8-2 | | coreutils | 8.30-3ubuntu2 | -| curl | 7.68.0-1ubuntu2.12 | +| curl | 7.68.0-1ubuntu2.13 | | dbus | 1.12.16-2ubuntu2.2 | | dnsutils | 1:9.16.1-0ubuntu2.10 | | dpkg | 1.19.7ubuntu3.2 | @@ -347,7 +347,7 @@ | lib32z1 | 1:1.2.11.dfsg-2ubuntu1.3 | | libc++-dev | 1:10.0-50\~exp1 | | libc++abi-dev | 1:10.0-50\~exp1 | -| libcurl4 | 7.68.0-1ubuntu2.12 | +| libcurl4 | 7.68.0-1ubuntu2.13 | | libgbm-dev | 21.2.6-0ubuntu0.1\~20.04.2 | | libgconf-2-4 | 3.2.6-6ubuntu1 | | libgsl-dev | 2.5+dfsg-6build1 | @@ -390,7 +390,7 @@ | texinfo | 6.7.0.dfsg.2-5 | | time | 1.7-25.1build1 | | tk | 8.6.9+1 | -| tzdata | 2022a-0ubuntu0.20.04 | +| tzdata | 2022c-0ubuntu0.20.04.0 | | unzip | 6.0-25ubuntu1 | | upx | 3.95-2build1 | | wget | 1.20.3-1ubuntu2 | From a4b9a513045f0114e987d8b6dd55f6e750e2e892 Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Thu, 8 Sep 2022 17:29:02 +0200 Subject: [PATCH 1448/3485] [Windows] Add VCPKG_ROOT variable (#6192) --- images/win/scripts/Installers/Install-Vcpkg.ps1 | 1 + .../SoftwareReport/SoftwareReport.Common.psm1 | 4 ++++ images/win/scripts/Tests/Tools.Tests.ps1 | 12 ++++++++---- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/images/win/scripts/Installers/Install-Vcpkg.ps1 b/images/win/scripts/Installers/Install-Vcpkg.ps1 index 76e7d24f577c..a2e440dd105f 100644 --- a/images/win/scripts/Installers/Install-Vcpkg.ps1 +++ b/images/win/scripts/Installers/Install-Vcpkg.ps1 @@ -17,5 +17,6 @@ Invoke-Expression "$InstallDir\$VcpkgExecPath integrate install" Add-MachinePathItem $InstallDir $env:Path = Get-MachinePath setx VCPKG_INSTALLATION_ROOT $InstallDir /M +setx VCPKG_ROOT $InstallDir /M Invoke-PesterTests -TestFile "Tools" -TestName "Vcpkg" diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 index 1c36a9844e19..25aa98471d5e 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 @@ -347,6 +347,10 @@ function Build-PackageManagementEnvironmentTable { @{ "Name" = "VCPKG_INSTALLATION_ROOT" "Value" = $env:VCPKG_INSTALLATION_ROOT + }, + @{ + "Name" = "VCPKG_ROOT" + "Value" = $env:VCPKG_ROOT } ) if (Test-IsWin19) { diff --git a/images/win/scripts/Tests/Tools.Tests.ps1 b/images/win/scripts/Tests/Tools.Tests.ps1 index 6296f07034ac..a05f79249b68 100644 --- a/images/win/scripts/Tests/Tools.Tests.ps1 +++ b/images/win/scripts/Tests/Tools.Tests.ps1 @@ -147,15 +147,19 @@ Describe "Stack" { Describe "Vcpkg" { It "vcpkg" { - "vcpkg version" | Should -ReturnZeroExitCode + "vcpkg version" | Should -ReturnZeroExitCode } It "env variable VCPKG_INSTALLATION_ROOT is set" { - $env:VCPKG_INSTALLATION_ROOT | Should -Not -BeNullOrEmpty + $env:VCPKG_INSTALLATION_ROOT | Should -Not -BeNullOrEmpty } - It "VCPKG_INSTALLATION_ROOT directory" { - $env:VCPKG_INSTALLATION_ROOT | Should -Exist + It "env variable VCPKG_ROOT is set" { + $env:VCPKG_ROOT | Should -Not -BeNullOrEmpty + } + + It "VCPKG_ROOT directory" { + $env:VCPKG_ROOT | Should -Exist } } From 3414173a177deadd6bd07a8b05323b54d0f364bc Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 8 Sep 2022 16:43:58 +0000 Subject: [PATCH 1449/3485] Updating readme file for macOS-12 version 20220907.1 (#6201) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-12-Readme.md | 142 ++++++++++++++++---------------- 1 file changed, 70 insertions(+), 72 deletions(-) diff --git a/images/macos/macos-12-Readme.md b/images/macos/macos-12-Readme.md index ce44eb58ecf9..7d16d6843806 100644 --- a/images/macos/macos-12-Readme.md +++ b/images/macos/macos-12-Readme.md @@ -5,7 +5,7 @@ # macOS 12.5 info - System Version: macOS 12.5.1 (21G83) - Kernel Version: Darwin 21.6.0 -- Image Version: 20220904.1 +- Image Version: 20220907.1 ## Installed Software ### Language and Runtime @@ -30,19 +30,19 @@ - Ruby 3.0.4p208 ### Package Management -- Bundler version 2.3.21 +- Bundler version 2.3.22 - Carthage 0.38.0 - CocoaPods 1.11.3 - Composer 2.4.1 -- Homebrew 3.5.10 +- Homebrew 3.6.0 - Miniconda 4.12.0 - NPM 8.15.0 - NuGet 6.2.1.2 - Pip 20.3.4 (python 2.7) - Pip 22.2.2 (python 3.10) - Pipx 1.1.0 -- RubyGems 3.3.21 -- Vcpkg 2022 (build from master \<927006b24>) +- RubyGems 3.3.22 +- Vcpkg 2022 (build from master \<a291bcad8>) - Yarn 1.22.19 #### Environment variables @@ -62,12 +62,12 @@ - aria2 1.36.0 - azcopy 10.16.0 - bazel 5.3.0 -- bazelisk 1.13.0 +- bazelisk 1.13.2 - bsdtar 3.5.1 - available by 'tar' alias - Curl 7.85.0 - Git 2.37.3 - Git LFS: 3.2.0 -- GitHub CLI: 2.14.7 +- GitHub CLI: 2.15.0 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.3 - gpg (GnuPG) 2.3.7 @@ -90,11 +90,11 @@ ### Tools - App Center CLI 2.11.0 -- AWS CLI 2.7.29 -- AWS SAM CLI 1.56.0 +- AWS CLI 2.7.30 +- AWS SAM CLI 1.56.1 - AWS Session Manager CLI 1.2.339.0 - Azure CLI (azure-devops) 0.25.0 -- Azure CLI 2.39.0 +- Azure CLI 2.40.0 - Bicep CLI 0.9.1 - Cabal 3.6.2.0 - Cmake 3.24.1 @@ -119,7 +119,7 @@ - ChromeDriver 105.0.5195.52 - Microsoft Edge 105.0.1343.27 - Microsoft Edge WebDriver 105.0.1343.27 -- Mozilla Firefox 104.0.1 +- Mozilla Firefox 104.0.2 - geckodriver 0.31.0 - Selenium server 4.4.0 @@ -149,10 +149,10 @@ - 3.1.2 #### Python -- 3.7.13 -- 3.8.13 -- 3.9.13 -- 3.10.6 +- 3.7.14 +- 3.8.14 +- 3.9.14 +- 3.10.7 #### PyPy - 2.7.18 [PyPy 7.3.9] @@ -169,8 +169,8 @@ | Version | Architecture | Environment Variable | | ------- | ------------ | -------------------- | | 1.17.13 (Default) | x64 | GOROOT_1_17_X64 | -| 1.18.5 | x64 | GOROOT_1_18_X64 | -| 1.19.0 | x64 | GOROOT_1_19_X64 | +| 1.18.6 | x64 | GOROOT_1_18_X64 | +| 1.19.1 | x64 | GOROOT_1_19_X64 | ### Rust Tools - Cargo 1.63.0 @@ -192,7 +192,7 @@ #### PowerShell Modules | Module | Version | | ---------------- | ------- | -| Az | 8.2.0 | +| Az | 8.3.0 | | MarkdownPS | 1.9 | | Pester | 5.3.3 | | PSScriptAnalyzer | 1.20.0 | @@ -208,7 +208,7 @@ | Version | Build | Path | | -------------- | --------- | ------------------------------------ | | 2019 | 8.10.25.2 | /Applications/Visual Studio 2019.app | -| 2022 (default) | 17.3.3.10 | /Applications/Visual Studio.app | +| 2022 (default) | 17.3.4.4 | /Applications/Visual Studio.app | ##### Notes: ``` @@ -237,7 +237,7 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" ### Xcode | Version | Build | Path | | ---------------- | -------- | ------------------------------ | -| 14.0 (beta) | 14A5294g | /Applications/Xcode_14.0.app | +| 14.0 | 14A309 | /Applications/Xcode_14.0.app | | 13.4.1 (default) | 13F100 | /Applications/Xcode_13.4.1.app | | 13.4 | 13F17a | /Applications/Xcode_13.4.app | | 13.3.1 | 13E500a | /Applications/Xcode_13.3.1.app | @@ -249,59 +249,57 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" - xcversion 2.8.1 #### Installed SDKs -| SDK | SDK Name | Xcode Version | -| ----------------------- | -------------------- | -------------------- | -| macOS 12.0 | macosx12.0 | 13.1 | -| macOS 12.1 | macosx12.1 | 13.2.1 | -| macOS 12.3 | macosx12.3 | 13.3.1, 13.4, 13.4.1 | -| macOS 13.0 | macosx13.0 | 14.0 | -| iOS 15.0 | iphoneos15.0 | 13.1 | -| iOS 15.2 | iphoneos15.2 | 13.2.1 | -| iOS 15.4 | iphoneos15.4 | 13.3.1 | -| iOS 15.5 | iphoneos15.5 | 13.4, 13.4.1 | -| iOS 16.0 | iphoneos16.0 | 14.0 | -| Simulator - iOS 15.0 | iphonesimulator15.0 | 13.1 | -| Simulator - iOS 15.2 | iphonesimulator15.2 | 13.2.1 | -| Simulator - iOS 15.4 | iphonesimulator15.4 | 13.3.1 | -| Simulator - iOS 15.5 | iphonesimulator15.5 | 13.4, 13.4.1 | -| Simulator - iOS 16.0 | iphonesimulator16.0 | 14.0 | -| tvOS 15.0 | appletvos15.0 | 13.1 | -| tvOS 15.2 | appletvos15.2 | 13.2.1 | -| tvOS 15.4 | appletvos15.4 | 13.3.1, 13.4, 13.4.1 | -| tvOS 16.0 | appletvos16.0 | 14.0 | -| Simulator - tvOS 15.0 | appletvsimulator15.0 | 13.1 | -| Simulator - tvOS 15.2 | appletvsimulator15.2 | 13.2.1 | -| Simulator - tvOS 15.4 | appletvsimulator15.4 | 13.3.1, 13.4, 13.4.1 | -| Simulator - tvOS 16.0 | appletvsimulator16.0 | 14.0 | -| watchOS 8.0 | watchos8.0 | 13.1 | -| watchOS 8.3 | watchos8.3 | 13.2.1 | -| watchOS 8.5 | watchos8.5 | 13.3.1, 13.4, 13.4.1 | -| watchOS 9.0 | watchos9.0 | 14.0 | -| Simulator - watchOS 8.0 | watchsimulator8.0 | 13.1 | -| Simulator - watchOS 8.3 | watchsimulator8.3 | 13.2.1 | -| Simulator - watchOS 8.5 | watchsimulator8.5 | 13.3.1, 13.4, 13.4.1 | -| Simulator - watchOS 9.0 | watchsimulator9.0 | 14.0 | -| DriverKit 21.0.1 | driverkit21.0.1 | 13.1 | -| DriverKit 21.2 | driverkit21.2 | 13.2.1 | -| DriverKit 21.4 | driverkit21.4 | 13.3.1, 13.4, 13.4.1 | -| DriverKit 22.0 | driverkit22.0 | 14.0 | +| SDK | SDK Name | Xcode Version | +| ----------------------- | -------------------- | -------------------------- | +| macOS 12.0 | macosx12.0 | 13.1 | +| macOS 12.1 | macosx12.1 | 13.2.1 | +| macOS 12.3 | macosx12.3 | 13.3.1, 13.4, 13.4.1, 14.0 | +| iOS 15.0 | iphoneos15.0 | 13.1 | +| iOS 15.2 | iphoneos15.2 | 13.2.1 | +| iOS 15.4 | iphoneos15.4 | 13.3.1 | +| iOS 15.5 | iphoneos15.5 | 13.4, 13.4.1 | +| iOS 16.0 | iphoneos16.0 | 14.0 | +| Simulator - iOS 15.0 | iphonesimulator15.0 | 13.1 | +| Simulator - iOS 15.2 | iphonesimulator15.2 | 13.2.1 | +| Simulator - iOS 15.4 | iphonesimulator15.4 | 13.3.1 | +| Simulator - iOS 15.5 | iphonesimulator15.5 | 13.4, 13.4.1 | +| Simulator - iOS 16.0 | iphonesimulator16.0 | 14.0 | +| tvOS 15.0 | appletvos15.0 | 13.1 | +| tvOS 15.2 | appletvos15.2 | 13.2.1 | +| tvOS 15.4 | appletvos15.4 | 13.3.1, 13.4, 13.4.1 | +| tvOS 16.0 | appletvos16.0 | 14.0 | +| Simulator - tvOS 15.0 | appletvsimulator15.0 | 13.1 | +| Simulator - tvOS 15.2 | appletvsimulator15.2 | 13.2.1 | +| Simulator - tvOS 15.4 | appletvsimulator15.4 | 13.3.1, 13.4, 13.4.1 | +| Simulator - tvOS 16.0 | appletvsimulator16.0 | 14.0 | +| watchOS 8.0 | watchos8.0 | 13.1 | +| watchOS 8.3 | watchos8.3 | 13.2.1 | +| watchOS 8.5 | watchos8.5 | 13.3.1, 13.4, 13.4.1 | +| watchOS 9.0 | watchos9.0 | 14.0 | +| Simulator - watchOS 8.0 | watchsimulator8.0 | 13.1 | +| Simulator - watchOS 8.3 | watchsimulator8.3 | 13.2.1 | +| Simulator - watchOS 8.5 | watchsimulator8.5 | 13.3.1, 13.4, 13.4.1 | +| Simulator - watchOS 9.0 | watchsimulator9.0 | 14.0 | +| DriverKit 21.0.1 | driverkit21.0.1 | 13.1 | +| DriverKit 21.2 | driverkit21.2 | 13.2.1 | +| DriverKit 21.4 | driverkit21.4 | 13.3.1, 13.4, 13.4.1, 14.0 | #### Installed Simulators -| OS | Xcode Version | Simulators | -| ----------- | -------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| iOS 15.0 | 13.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | -| iOS 15.2 | 13.2.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | -| iOS 15.4 | 13.3.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPhone SE (3rd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | -| iOS 15.5 | 13.4<br>13.4.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPhone SE (3rd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | -| iOS 16.0 | 14.0 | iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPhone SE (3rd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | -| tvOS 15.0 | 13.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | -| tvOS 15.2 | 13.2.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | -| tvOS 15.4 | 13.3.1<br>13.4<br>13.4.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | -| tvOS 16.0 | 13.1<br>13.2.1<br>13.3.1<br>13.4<br>13.4.1<br>14.0 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | -| watchOS 8.0 | 13.1 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | -| watchOS 8.3 | 13.2.1 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | -| watchOS 8.5 | 13.3.1<br>13.4<br>13.4.1 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | -| watchOS 9.0 | 13.1<br>13.2.1<br>13.3.1<br>13.4<br>13.4.1<br>14.0 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | +| OS | Xcode Version | Simulators | +| ----------- | -------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| iOS 15.0 | 13.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | +| iOS 15.2 | 13.2.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | +| iOS 15.4 | 13.3.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPhone SE (3rd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | +| iOS 15.5 | 13.4<br>13.4.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPhone SE (3rd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | +| iOS 16.0 | 14.0 | iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPhone SE (3rd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | +| tvOS 15.0 | 13.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | +| tvOS 15.2 | 13.2.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | +| tvOS 15.4 | 13.3.1<br>13.4<br>13.4.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | +| tvOS 16.0 | 13.1<br>13.2.1<br>13.3.1<br>13.4<br>13.4.1<br>14.0 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | +| watchOS 8.0 | 13.1 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | +| watchOS 8.3 | 13.2.1 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | +| watchOS 8.5 | 13.3.1<br>13.4<br>13.4.1 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | +| watchOS 9.0 | 13.1<br>13.2.1<br>13.3.1<br>13.4<br>13.4.1<br>14.0 | Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | ### Android | Package Name | Version | @@ -330,7 +328,7 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" ### Miscellaneous - libXext 1.3.4 -- libXft 2.3.4 +- libXft 2.3.5 - Tcl/Tk 8.6.12_1 - Zlib 1.2.12 From 03c71fa64909fbf60de710f6159c81c4ab0c0bdc Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Fri, 9 Sep 2022 10:56:40 +0200 Subject: [PATCH 1450/3485] Install WDK.vsix on VS 2022 (#6203) --- images/win/scripts/Installers/Install-WDK.ps1 | 10 ++--- .../SoftwareReport.VisualStudio.psm1 | 43 +++++-------------- images/win/scripts/Tests/WDK.Tests.ps1 | 2 +- 3 files changed, 15 insertions(+), 40 deletions(-) diff --git a/images/win/scripts/Installers/Install-WDK.ps1 b/images/win/scripts/Installers/Install-WDK.ps1 index d92d0d3a3ed4..6682569882f4 100644 --- a/images/win/scripts/Installers/Install-WDK.ps1 +++ b/images/win/scripts/Installers/Install-WDK.ps1 @@ -15,7 +15,7 @@ if (Test-IsWin22) { $FilePath = "C:\Program Files (x86)\Windows Kits\10\Vsix\VS2019\WDK.vsix" $VSver = "2019" } else { - throw "Invalid version of Visual Studio is found. Either 2017,2019 or 2022 are required" + throw "Invalid version of Visual Studio is found. Either 2019 or 2022 are required" } $argumentList = ("/features", "+", "/quiet") @@ -29,11 +29,7 @@ if (Test-IsWin19) { Install-Binary -Url $wdkUrl -Name "wdksetup.exe" -ArgumentList $argumentList # Need to install the VSIX to get the build targets when running VSBuild -# Windows 2022 - Skip installation due to a regression -# https://docs.microsoft.com/en-us/windows-hardware/drivers/download-the-wdk -if (Test-IsWin19) { - $FilePath = Resolve-Path -Path $FilePath - Install-VsixExtension -FilePath $FilePath -Name "WDK.vsix" -VSversion $VSver -InstallOnly -} +$FilePath = Resolve-Path -Path $FilePath +Install-VsixExtension -FilePath $FilePath -Name "WDK.vsix" -VSversion $VSver -InstallOnly Invoke-PesterTests -TestFile "WDK" diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.VisualStudio.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.VisualStudio.psm1 index f278098dcb59..9a1bdd8256c5 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.VisualStudio.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.VisualStudio.psm1 @@ -38,45 +38,24 @@ function Get-VisualStudioExtensions { } } - # SDK - if (Test-IsWin19) { - $sdkVersion = Get-SDKVersion - $sdkPackages = @( - @{Package = 'Windows Software Development Kit'; Version = $sdkVersion} - ) - } - - if (Test-IsWin19) { - # Wix - $vs = (Get-VisualStudioVersion).Name.Split()[-1] - $wixExtensionVersion = ($vsPackages | Where-Object {$_.Id -match 'WixToolset.VisualStudioExtension.Dev' -and $_.type -eq 'vsix'}).Version - $wixPackages = @( - @{Package = "WIX Toolset Studio $vs Extension"; Version = $wixExtensionVersion} - ) - - # WDK - $wdkVersion = Get-WDKVersion - $wdkExtensionVersion = Get-VSExtensionVersion -packageName 'Microsoft.Windows.DriverKit' - $wdkPackages = @( - @{Package = 'Windows Driver Kit'; Version = $wdkVersion} - @{Package = 'Windows Driver Kit Visual Studio Extension'; Version = $wdkExtensionVersion} - ) - } + $sdkVersion = Get-SDKVersion + $sdkPackages = @( + @{Package = 'Windows Software Development Kit'; Version = $sdkVersion} + ) - if (Test-IsWin22) { - # WDK - $wdkVersion = Get-WDKVersion - $wdkPackages = @( - @{Package = 'Windows Driver Kit'; Version = $wdkVersion} - ) - } + # WDK + $wdkVersion = Get-WDKVersion + $wdkExtensionVersion = Get-VSExtensionVersion -packageName 'Microsoft.Windows.DriverKit' + $wdkPackages = @( + @{Package = 'Windows Driver Kit'; Version = $wdkVersion} + @{Package = 'Windows Driver Kit Visual Studio Extension'; Version = $wdkExtensionVersion} + ) $extensions = @( $vsixs $ssdtPackages $sdkPackages - $wixPackages $wdkPackages ) diff --git a/images/win/scripts/Tests/WDK.Tests.ps1 b/images/win/scripts/Tests/WDK.Tests.ps1 index b58d018a1246..6a5e61ddc666 100644 --- a/images/win/scripts/Tests/WDK.Tests.ps1 +++ b/images/win/scripts/Tests/WDK.Tests.ps1 @@ -6,7 +6,7 @@ Describe "WDK" { $WDKVersion | Should -Not -BeNullOrEmpty } - It "Windows Driver Kit VSIX extension" -Skip:(Test-IsWin22) { + It "Windows Driver Kit VSIX extension" { $version = Get-VSExtensionVersion -packageName "Microsoft.Windows.DriverKit" $version | Should -Not -BeNullOrEmpty } From 148eaf9c80af082b519d24f82f7c965cb5a320e9 Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Fri, 9 Sep 2022 11:04:46 +0200 Subject: [PATCH 1451/3485] Add VCPKG_ROOT variable (#6195) --- images/macos/provision/core/vcpkg.sh | 17 +++++++++-------- .../software-report/SoftwareReport.Common.psm1 | 4 ++++ 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/images/macos/provision/core/vcpkg.sh b/images/macos/provision/core/vcpkg.sh index a1ac7c254969..70e3371fa721 100644 --- a/images/macos/provision/core/vcpkg.sh +++ b/images/macos/provision/core/vcpkg.sh @@ -1,15 +1,16 @@ #!/bin/bash -e -o pipefail source ~/utils/utils.sh -# Set env variable for vcpkg -VCPKG_INSTALLATION_ROOT=/usr/local/share/vcpkg -echo "export VCPKG_INSTALLATION_ROOT=${VCPKG_INSTALLATION_ROOT}" | tee -a ~/.bashrc +# Set env variables for vcpkg +VCPKG_ROOT=/usr/local/share/vcpkg +echo "export VCPKG_INSTALLATION_ROOT=${VCPKG_ROOT}" | tee -a ~/.bashrc +echo "export VCPKG_ROOT=${VCPKG_ROOT}" | tee -a ~/.bashrc # Install vcpkg -git clone https://github.com/Microsoft/vcpkg $VCPKG_INSTALLATION_ROOT -$VCPKG_INSTALLATION_ROOT/bootstrap-vcpkg.sh -$VCPKG_INSTALLATION_ROOT/vcpkg integrate install -chmod -R 0777 $VCPKG_INSTALLATION_ROOT -ln -sf $VCPKG_INSTALLATION_ROOT/vcpkg /usr/local/bin +git clone https://github.com/Microsoft/vcpkg $VCPKG_ROOT +$VCPKG_ROOT/bootstrap-vcpkg.sh +$VCPKG_ROOT/vcpkg integrate install +chmod -R 0777 $VCPKG_ROOT +ln -sf $VCPKG_ROOT/vcpkg /usr/local/bin invoke_tests "Common" "vcpkg" diff --git a/images/macos/software-report/SoftwareReport.Common.psm1 b/images/macos/software-report/SoftwareReport.Common.psm1 index 22c30c9d41a8..2c36fd4dad86 100644 --- a/images/macos/software-report/SoftwareReport.Common.psm1 +++ b/images/macos/software-report/SoftwareReport.Common.psm1 @@ -562,6 +562,10 @@ function Build-PackageManagementEnvironmentTable { @{ "Name" = "VCPKG_INSTALLATION_ROOT" "Value" = $env:VCPKG_INSTALLATION_ROOT + }, + @{ + "Name" = "VCPKG_ROOT" + "Value" = $env:VCPKG_ROOT } ) | ForEach-Object { [PSCustomObject] @{ From b05ee61a9604422c81580954625c37bae97269d3 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Fri, 9 Sep 2022 12:48:50 +0300 Subject: [PATCH 1452/3485] Add Xcode 14 beta 6 in macOS 12 toolset (#6204) --- images/macos/toolsets/toolset-12.json | 1 + 1 file changed, 1 insertion(+) diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index 96a5e6988d4b..f433208773ec 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -3,6 +3,7 @@ "default": "13.4.1", "versions": [ { "link": "14.0", "version": "14.0.0" }, + { "link": "14.0_beta", "version": "14 beta 6", "skip-symlink": "true"}, { "link": "13.4.1", "version": "13.4.1" }, { "link": "13.4", "version": "13.4.0" }, { "link": "13.3.1", "version": "13.3.1", "symlinks": ["13.3"] }, From d2c7d51d002a7dbe7f4dc665f00c5f89ba19a874 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 9 Sep 2022 14:30:46 +0000 Subject: [PATCH 1453/3485] Updating readme file for macOS-11 version 20220906.1 (#6191) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-11-Readme.md | 38 ++++++++++++++++----------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/images/macos/macos-11-Readme.md b/images/macos/macos-11-Readme.md index 4e00db25ffe5..1ba271757b19 100644 --- a/images/macos/macos-11-Readme.md +++ b/images/macos/macos-11-Readme.md @@ -5,7 +5,7 @@ # macOS 11.6 info - System Version: macOS 11.6.8 (20G730) - Kernel Version: Darwin 20.6.0 -- Image Version: 20220829.1 +- Image Version: 20220906.1 ## Installed Software ### Language and Runtime @@ -27,7 +27,7 @@ - NVM 0.39.1 - NVM - Cached node versions: v12.22.12 v14.20.0 v16.17.0 - Perl 5.34.0 -- PHP 8.1.9 +- PHP 8.1.10 - Python 2.7.18 - Python 3.10.6 - R 4.2.1 @@ -46,7 +46,7 @@ - Pip 22.2.2 (python 3.10) - Pipx 1.1.0 - RubyGems 3.3.21 -- Vcpkg 2022 (build from master \<ed0279d48>) +- Vcpkg 2022 (build from master \<927006b24>) - Yarn 1.22.19 #### Environment variables @@ -66,10 +66,10 @@ - aria2 1.36.0 - azcopy 10.16.0 - bazel 5.3.0 -- bazelisk 1.12.2 +- bazelisk 1.13.1 - bsdtar 3.3.2 - available by 'tar' alias -- Curl 7.84.0 -- Git 2.37.2 +- Curl 7.85.0 +- Git 2.37.3 - Git LFS: 3.2.0 - GitHub CLI: 2.14.7 - GNU Tar 1.34 - available by 'gtar' alias @@ -95,21 +95,21 @@ ### Tools - Aliyun CLI 3.0.125 - App Center CLI 2.11.0 -- AWS CLI 2.7.27 -- AWS SAM CLI 1.55.0 +- AWS CLI 2.7.29 +- AWS SAM CLI 1.56.0 - AWS Session Manager CLI 1.2.339.0 - Azure CLI (azure-devops) 0.25.0 -- Azure CLI 2.39.0 +- Azure CLI 2.40.0 - Bicep CLI 0.9.1 - Cabal 3.6.2.0 - Cmake 3.24.1 -- CodeQL Action Bundle 2.10.3 +- CodeQL Action Bundle 2.10.4 - Fastlane 2.209.1 - GHC 9.4.2 - GHCup 0.1.18.0 - Jazzy 0.14.2 - Stack 2.7.5 -- SwiftFormat 0.49.17 +- SwiftFormat 0.49.18 - Swig 4.0.2 - Xcode Command Line Tools 13.2.0.0.1.1638488800 @@ -120,18 +120,18 @@ ### Browsers - Safari 15.6.1 (16613.3.9.1.16) - SafariDriver 15.6.1 (16613.3.9.1.16) -- Google Chrome 104.0.5112.101 -- ChromeDriver 104.0.5112.79 -- Microsoft Edge 104.0.1293.70 -- Microsoft Edge WebDriver 104.0.1293.70 -- Mozilla Firefox 104.0 +- Google Chrome 105.0.5195.102 +- ChromeDriver 105.0.5195.52 +- Microsoft Edge 105.0.1343.27 +- Microsoft Edge WebDriver 105.0.1343.27 +- Mozilla Firefox 104.0.1 - geckodriver 0.31.0 - Selenium server 4.4.0 #### Environment variables | Name | Value | | --------------- | ---------------------------------------------- | -| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/104.0.5112.79 | +| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/105.0.5195.52 | | EDGEWEBDRIVER | /usr/local/share/edge_driver | | GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | @@ -200,7 +200,7 @@ #### PowerShell Modules | Module | Version | | ---------------- | ------- | -| Az | 8.2.0 | +| Az | 8.3.0 | | MarkdownPS | 1.9 | | Pester | 5.3.3 | | PSScriptAnalyzer | 1.20.0 | @@ -216,7 +216,7 @@ | Version | Build | Path | | -------------- | --------- | ------------------------------------ | | 2019 | 8.10.25.2 | /Applications/Visual Studio 2019.app | -| 2022 (default) | 17.3.2.24 | /Applications/Visual Studio.app | +| 2022 (default) | 17.3.3.10 | /Applications/Visual Studio.app | ##### Notes: ``` From 812929556709b48410ec6ac2d3533762c35488a2 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Fri, 9 Sep 2022 16:58:47 +0200 Subject: [PATCH 1454/3485] Remove fastlane cached cookie (#6206) --- images/macos/provision/configuration/finalize-vm.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/images/macos/provision/configuration/finalize-vm.sh b/images/macos/provision/configuration/finalize-vm.sh index acc498f9a677..6770cef5fb21 100644 --- a/images/macos/provision/configuration/finalize-vm.sh +++ b/images/macos/provision/configuration/finalize-vm.sh @@ -22,6 +22,9 @@ mv $HOME/image-generation/assets/* /usr/local/opt/$USER/scripts find /usr/local/opt/$USER/scripts -type f -name "*\.sh" -exec chmod +x {} \; +# Remove fastlane cached cookie +rm -rf ~/.fastlane + # Clean up npm cache which collected during image-generation # we have to do that here because `npm install` is run in a few different places during image-generation npm cache clean --force From 88b883191bfde0a091f5f173410fe89df2413092 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Mon, 12 Sep 2022 08:26:03 +0200 Subject: [PATCH 1455/3485] Update file name comment (#6215) --- images/linux/scripts/installers/mongodb.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/linux/scripts/installers/mongodb.sh b/images/linux/scripts/installers/mongodb.sh index 524a211c301e..6491d6deed24 100644 --- a/images/linux/scripts/installers/mongodb.sh +++ b/images/linux/scripts/installers/mongodb.sh @@ -1,6 +1,6 @@ #!/bin/bash -e ################################################################################ -## File: homebrew.sh +## File: mongodb.sh ## Desc: Installs Mongo DB ################################################################################ From d2c84c9d4c30a469ab32e88d9118914a9380a53f Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Mon, 12 Sep 2022 17:31:28 +0200 Subject: [PATCH 1456/3485] [Ubuntu] install gcc@11 from brew (#6202) --- images/linux/scripts/tests/Tools.Tests.ps1 | 16 +++++++++++----- images/linux/toolsets/toolset-1804.json | 9 ++++++++- images/linux/toolsets/toolset-2004.json | 9 ++++++++- images/linux/toolsets/toolset-2204.json | 5 ++++- 4 files changed, 31 insertions(+), 8 deletions(-) diff --git a/images/linux/scripts/tests/Tools.Tests.ps1 b/images/linux/scripts/tests/Tools.Tests.ps1 index 97a364b14b49..5d7c5a85448c 100644 --- a/images/linux/scripts/tests/Tools.Tests.ps1 +++ b/images/linux/scripts/tests/Tools.Tests.ps1 @@ -257,16 +257,22 @@ Describe "HHVM" -Skip:(Test-IsUbuntu22) { } Describe "Homebrew" { + $brewToolset = (Get-ToolsetContent).brew + $testCases = $brewToolset | ForEach-Object { @{brewName = $_.name; brewCommand = $_.command} } + It "homebrew" { "brew --version" | Should -ReturnZeroExitCode } - Context "Packages" { - $testCases = (Get-ToolsetContent).brew | ForEach-Object { @{ ToolName = $_.name } } + It "zstd has /usr/local/bin symlink" { + "/usr/local/bin/zstd" | Should -Exist + } + + It "homebrew package <brewName>" -TestCases $testCases { + $brewPrefix = brew --prefix $brewName + $brewPackage = Join-Path $brewPrefix "bin" $brewCommand - It "<ToolName>" -TestCases $testCases { - "$ToolName --version" | Should -Not -BeNullOrEmpty - } + "$brewPackage --version" | Should -ReturnZeroExitCode } } diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index 264c6d96acc3..b4a42783be6e 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -217,7 +217,14 @@ ] }, "brew": [ - {"name": "zstd"} + { + "name": "gcc@11", + "command": "gcc-11" + }, + { + "name": "zstd", + "command": "zstd" + } ], "docker": { "images": [ diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index df9434cda742..01ae9d0f6190 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -217,7 +217,14 @@ ] }, "brew": [ - {"name": "zstd"} + { + "name": "gcc@11", + "command": "gcc-11" + }, + { + "name": "zstd", + "command": "zstd" + } ], "docker": { "images": [ diff --git a/images/linux/toolsets/toolset-2204.json b/images/linux/toolsets/toolset-2204.json index 3c3c4bb0509a..f16f0ec670aa 100644 --- a/images/linux/toolsets/toolset-2204.json +++ b/images/linux/toolsets/toolset-2204.json @@ -201,7 +201,10 @@ ] }, "brew": [ - {"name": "zstd"} + { + "name": "zstd", + "command": "zstd" + } ], "docker": { "images": [ From ce11b31f3bd85a4d2855d4f66b6a47c4d1768e0a Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Mon, 12 Sep 2022 19:17:10 +0200 Subject: [PATCH 1457/3485] [Ubuntu] Add VCPKG_ROOT variable (#6196) --- .../SoftwareReport/SoftwareReport.Common.psm1 | 4 ++++ images/linux/scripts/installers/vcpkg.sh | 17 +++++++++-------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 index 17ecd1933730..eb634bb93161 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 @@ -429,6 +429,10 @@ function Build-PackageManagementEnvironmentTable { @{ "Name" = "VCPKG_INSTALLATION_ROOT" "Value" = $env:VCPKG_INSTALLATION_ROOT + }, + @{ + "Name" = "VCPKG_ROOT" + "Value" = $env:VCPKG_ROOT } ) | ForEach-Object { [PSCustomObject] @{ diff --git a/images/linux/scripts/installers/vcpkg.sh b/images/linux/scripts/installers/vcpkg.sh index 731de8b1b432..39823e42f850 100644 --- a/images/linux/scripts/installers/vcpkg.sh +++ b/images/linux/scripts/installers/vcpkg.sh @@ -4,16 +4,17 @@ ## Desc: Installs vcpkg ################################################################################ -# Set env variable for vcpkg -VCPKG_INSTALLATION_ROOT=/usr/local/share/vcpkg -echo "VCPKG_INSTALLATION_ROOT=${VCPKG_INSTALLATION_ROOT}" | tee -a /etc/environment +# Set env variables for vcpkg +VCPKG_ROOT=/usr/local/share/vcpkg +echo "VCPKG_INSTALLATION_ROOT=${VCPKG_ROOT}" | tee -a /etc/environment +echo "VCPKG_ROOT=${VCPKG_ROOT}" | tee -a /etc/environment # Install vcpkg -git clone https://github.com/Microsoft/vcpkg $VCPKG_INSTALLATION_ROOT +git clone https://github.com/Microsoft/vcpkg $VCPKG_ROOT -$VCPKG_INSTALLATION_ROOT/bootstrap-vcpkg.sh -$VCPKG_INSTALLATION_ROOT/vcpkg integrate install -chmod 0777 -R $VCPKG_INSTALLATION_ROOT -ln -sf $VCPKG_INSTALLATION_ROOT/vcpkg /usr/local/bin +$VCPKG_ROOT/bootstrap-vcpkg.sh +$VCPKG_ROOT/vcpkg integrate install +chmod 0777 -R $VCPKG_ROOT +ln -sf $VCPKG_ROOT/vcpkg /usr/local/bin invoke_tests "Tools" "Vcpkg" \ No newline at end of file From cecc9022fa9d386f0c9e1c31c47c3f476c606f73 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Mon, 12 Sep 2022 20:28:26 +0200 Subject: [PATCH 1458/3485] [Ubuntu] Install latest google-cloud-sdk (#6222) --- images/linux/scripts/installers/google-cloud-sdk.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/images/linux/scripts/installers/google-cloud-sdk.sh b/images/linux/scripts/installers/google-cloud-sdk.sh index 867bc9cc3987..239349be4324 100644 --- a/images/linux/scripts/installers/google-cloud-sdk.sh +++ b/images/linux/scripts/installers/google-cloud-sdk.sh @@ -10,8 +10,7 @@ REPO_URL="https://packages.cloud.google.com/apt" echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] $REPO_URL cloud-sdk main" > /etc/apt/sources.list.d/google-cloud-sdk.list wget -q https://packages.cloud.google.com/apt/doc/apt-key.gpg -O /usr/share/keyrings/cloud.google.gpg apt-get update -y -# temporary downgrade google-cloud-sdk as python component has linking bugs -apt-get install -y google-cloud-sdk=369.0.0-0 +apt-get install -y google-cloud-sdk # remove apt rm /etc/apt/sources.list.d/google-cloud-sdk.list From 9d9b5da48994339756d04012ca1ebd121214e7eb Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Tue, 13 Sep 2022 08:13:08 +0300 Subject: [PATCH 1459/3485] [Windows] Replace Docker EE with Docker CE (#6220) --- images/win/scripts/Installers/Install-Docker.ps1 | 15 ++++++++------- .../SoftwareReport/SoftwareReport.Helpers.psm1 | 2 +- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/images/win/scripts/Installers/Install-Docker.ps1 b/images/win/scripts/Installers/Install-Docker.ps1 index 7d5e18a412fa..71dbd6cf41c9 100644 --- a/images/win/scripts/Installers/Install-Docker.ps1 +++ b/images/win/scripts/Installers/Install-Docker.ps1 @@ -5,24 +5,25 @@ ## can continue. ################################################################################ -# Docker EE 20.10.8 has the regression -# fatal: open C:\ProgramData\docker\panic.log: Access is denied. -Write-Host "Install-Package Docker" -Install-Package -Name docker -ProviderName DockerMsftProvider -RequiredVersion 20.10.7 -Force -Start-Service docker +Write-Host "Install Docker CE" +$instScriptUrl = "https://raw.githubusercontent.com/microsoft/Windows-Containers/Main/helpful_tools/Install-DockerCE/install-docker-ce.ps1" +$instScriptPath = Start-DownloadWithRetry -Url $instScriptUrl -Name "install-docker-ce.ps1" +& $instScriptPath Write-Host "Install-Package Docker-Compose v1" Choco-Install -PackageName docker-compose Write-Host "Install-Package Docker-Compose v2" $dockerComposev2Url = "https://github.com/docker/compose/releases/latest/download/docker-compose-windows-x86_64.exe" -Start-DownloadWithRetry -Url $dockerComposev2Url -Name docker-compose.exe -DownloadPath "C:\Program Files\Docker\cli-plugins" +$cliPluginsDir = "C:\ProgramData\docker\cli-plugins" +New-Item -Path $cliPluginsDir -ItemType Directory +Start-DownloadWithRetry -Url $dockerComposev2Url -Name docker-compose.exe -DownloadPath $cliPluginsDir Write-Host "Install docker-wincred" $dockerCredLatestRelease = Invoke-RestMethod -Uri "https://api.github.com/repos/docker/docker-credential-helpers/releases/latest" $dockerCredDownloadUrl = $dockerCredLatestRelease.assets.browser_download_url -match "docker-credential-wincred-.+\.zip" | Select-Object -First 1 $dockerCredArchive = Start-DownloadWithRetry -Url $dockerCredDownloadUrl -Expand-Archive -Path $dockerCredArchive -DestinationPath "C:\Program Files\Docker" +Expand-Archive -Path $dockerCredArchive -DestinationPath "C:\Windows\System32" Write-Host "Download docker images" $dockerImages = (Get-ToolsetContent).docker.images diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Helpers.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Helpers.psm1 index 1318d72753f4..0e366bd14fcb 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Helpers.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Helpers.psm1 @@ -122,7 +122,7 @@ function Test-BlankElement { $splitByLines = $Markdown.Split("`n") # Validate entry without version - $blankVersions = $splitByLines -match "^-" -notmatch "(OS|Image) Version|WSL|Vcpkg|\d\." | Out-String + $blankVersions = $splitByLines -match "^-" -notmatch "(OS|Image) Version|WSL|Vcpkg|Docker|\d\." | Out-String # Validate tables with blank rows $blankRows = "" From dd1f8458b481627d10131c194278ce30a7c3190e Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Tue, 13 Sep 2022 14:19:59 +0200 Subject: [PATCH 1460/3485] Rebrand templates (#6226) --- .github/CODEOWNERS | 2 +- .github/ISSUE_TEMPLATE/announcement.yml | 2 +- .github/ISSUE_TEMPLATE/bug-report.yml | 6 +++--- .github/ISSUE_TEMPLATE/tool-request.yml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index e230aaafb79c..0be687166769 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1 +1 @@ -* @actions/virtual-environments-owners +* @actions/runner-images-owners diff --git a/.github/ISSUE_TEMPLATE/announcement.yml b/.github/ISSUE_TEMPLATE/announcement.yml index 13cbb1f7cbe2..00ea1e712dd9 100644 --- a/.github/ISSUE_TEMPLATE/announcement.yml +++ b/.github/ISSUE_TEMPLATE/announcement.yml @@ -34,7 +34,7 @@ body: - label: GitHub Actions - type: checkboxes attributes: - label: Virtual environments affected + label: Runner images affected options: - label: Ubuntu 18.04 - label: Ubuntu 20.04 diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml index 9dad29ae9ada..f55ecb683c9b 100644 --- a/.github/ISSUE_TEMPLATE/bug-report.yml +++ b/.github/ISSUE_TEMPLATE/bug-report.yml @@ -16,7 +16,7 @@ body: - label: GitHub Actions - type: checkboxes attributes: - label: Virtual environments affected + label: Runner images affected options: - label: Ubuntu 18.04 - label: Ubuntu 20.04 @@ -31,8 +31,8 @@ body: label: Image version and build link description: | Image version where you are experiencing the issue. Where to find image version in build logs: - 1. For GitHub Actions, under "Set up job" -> "Virtual Environment" -> "Version". - 2. For Azure DevOps, under "Initialize job" -> "Virtual Environment" -> "Version". + 1. For GitHub Actions, under "Set up job" -> "Runner Image" -> "Version". + 2. For Azure DevOps, under "Initialize job" -> "Runner Image" -> "Version". If you have a public example, please, provide a link to the failed build. validations: diff --git a/.github/ISSUE_TEMPLATE/tool-request.yml b/.github/ISSUE_TEMPLATE/tool-request.yml index 90eaea4c9bf0..b0a4ff140841 100644 --- a/.github/ISSUE_TEMPLATE/tool-request.yml +++ b/.github/ISSUE_TEMPLATE/tool-request.yml @@ -55,7 +55,7 @@ body: - label: GitHub Actions - type: checkboxes attributes: - label: Virtual environments where you need the tool + label: Runner images where you need the tool options: - label: Ubuntu 18.04 - label: Ubuntu 20.04 From 2e3f36a95845b70668236910b20235e5e3e0835d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 13 Sep 2022 15:47:59 +0000 Subject: [PATCH 1461/3485] Updating readme file for win22 version 20220911.1 (#6218) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2022-Readme.md | 42 +++++++++++++++++--------------- 1 file changed, 23 insertions(+), 19 deletions(-) diff --git a/images/win/Windows2022-Readme.md b/images/win/Windows2022-Readme.md index e51cbaeb2621..5ddaff630f89 100644 --- a/images/win/Windows2022-Readme.md +++ b/images/win/Windows2022-Readme.md @@ -4,7 +4,7 @@ *** # Microsoft Windows Server 2022 Datacenter - OS Version: 10.0.20348 Build 887 -- Image Version: 20220905.1 +- Image Version: 20220911.1 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -13,7 +13,7 @@ ### Language and Runtime - Bash 5.1.16(1)-release - Go 1.17.13 -- Julia 1.8.0 +- Julia 1.8.1 - Kotlin 1.7.10 - LLVM 14.0.6 - Node 16.17.0 @@ -25,20 +25,21 @@ ### Package Management - Chocolatey 1.1.0 - Composer 2.4.1 -- Helm 3.9.3 +- Helm 3.9.4 - Miniconda 4.12.0 (pre-installed on the image but not added to PATH) - NPM 8.15.0 - NuGet 6.3.0.131 - pip 22.2.2 (python 3.9) - Pipx 1.1.0 - RubyGems 3.2.33 -- Vcpkg (build from master \<927006b24>) +- Vcpkg (build from master \<8e3595fad>) - Yarn 1.22.19 #### Environment variables | Name | Value | | ----------------------- | -------- | | VCPKG_INSTALLATION_ROOT | C:\vcpkg | +| VCPKG_ROOT | C:\vcpkg | ### Project Management - Ant 1.10.12 @@ -51,8 +52,8 @@ - aria2 1.36.0 - azcopy 10.16.0 - Bazel 5.3.0 -- Bazelisk 1.12.1 -- Bicep 0.9.1 +- Bazelisk 1.13.2 +- Bicep 0.10.13 - Cabal 3.8.1.0 - CMake 3.24.1 - CodeQL Action Bundle 2.10.4 @@ -73,7 +74,7 @@ - NSIS v3.08 - OpenSSL 1.1.1 - Packer 1.8.2 -- Pulumi v3.39.1 +- Pulumi v3.39.3 - R 4.2.1 - Service Fabric SDK 9.0.1028.9590 - Stack 2.7.5 @@ -87,12 +88,12 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.125 -- AWS CLI 2.7.29 -- AWS SAM CLI 1.56.0 +- AWS CLI 2.7.31 +- AWS SAM CLI 1.56.1 - AWS Session Manager CLI 1.2.339.0 -- Azure CLI 2.39.0 +- Azure CLI 2.40.0 - Azure DevOps CLI extension 0.25.0 -- GitHub CLI 2.14.7 +- GitHub CLI 2.15.0 - Hub CLI 2.14.2 ### Rust Tools @@ -112,9 +113,9 @@ ### Browsers and webdrivers - Google Chrome 105.0.5195.102 - Chrome Driver 105.0.5195.52 -- Microsoft Edge 105.0.1343.27 -- Microsoft Edge Driver 105.0.1343.27 -- Mozilla Firefox 104.0.1 +- Microsoft Edge 105.0.1343.33 +- Microsoft Edge Driver 105.0.1343.34 +- Mozilla Firefox 104.0.2 - Gecko Driver 0.31.0 - IE Driver 3.150.1.1 - Selenium server 4.4.0 @@ -156,8 +157,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Version | Architecture | Environment Variable | | ------- | ------------ | -------------------- | | 1.17.13 (Default) | x64 | GOROOT_1_17_X64 | -| 1.18.5 | x64 | GOROOT_1_18_X64 | -| 1.19.0 | x64 | GOROOT_1_19_X64 | +| 1.18.6 | x64 | GOROOT_1_18_X64 | +| 1.19.1 | x64 | GOROOT_1_19_X64 | #### Node | Version | Architecture | @@ -172,7 +173,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | 3.7.9 | x64, x86 | | 3.8.10 | x64, x86 | | 3.9.13 (Default) | x64, x86 | -| 3.10.6 | x64, x86 | +| 3.10.7 | x64, x86 | #### Ruby | Version | Architecture | @@ -205,7 +206,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### MongoDB | Version | ServiceName | ServiceStatus | ServiceStartType | | -------- | ----------- | ------------- | ---------------- | -| 5.0.11.0 | MongoDB | Stopped | Disabled | +| 5.0.12.0 | MongoDB | Stopped | Disabled | ### Database tools - Azure CosmosDb Emulator 2.14.9.0 @@ -243,6 +244,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Component.Microsoft.VisualStudio.Web.AzureFunctions | 17.3.32708.82 | | Component.Microsoft.Web.LibraryManager | 17.3.32708.82 | | Component.Microsoft.WebTools.BrowserLink.WebLivePreview | 17.3.58.47684 | +| Component.Microsoft.Windows.DriverKit | 10.0.22621.0 | | Component.OpenJDK | 17.3.32708.82 | | Component.UnityEngine.x64 | 17.3.32708.82 | | Component.Unreal | 17.3.32708.82 | @@ -499,6 +501,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | ProBITools.MicrosoftReportProjectsforVisualStudio2022 | 3.0.1 | | VisualStudioClient.MicrosoftVisualStudio2022InstallerProjects | 2.0.0 | | Windows Driver Kit | 10.1.22621.382 | +| Windows Driver Kit Visual Studio Extension | 10.0.22621.0 | +| Windows Software Development Kit | 10.1.22621.1 | | WixToolset.WixToolsetVisualStudio2022Extension | 1.0.0.18 | #### Microsoft Visual C++: @@ -564,7 +568,7 @@ All other versions are saved but not installed. #### Powershell Modules | Module | Version | | ------------------ | ---------------- | -| AWSPowerShell | 4.1.161 | +| AWSPowerShell | 4.1.165 | | DockerMsftProvider | 1.0.0.8 | | MarkdownPS | 1.9 | | Microsoft.Graph | 1.11.1 | From 6616fca6147fc1a02483ca6967f61ab233847dba Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 13 Sep 2022 15:49:27 +0000 Subject: [PATCH 1462/3485] Updating readme file for win19 version 20220911.1 (#6219) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2019-Readme.md | 44 ++++++++++++++++---------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index 8732eba3440f..a4763b0da139 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 3287 -- Image Version: 20220905.1 +- Image Version: 20220911.1 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -13,7 +13,7 @@ ### Language and Runtime - Bash 5.1.16(1)-release - Go 1.17.13 -- Julia 1.8.0 +- Julia 1.8.1 - Kotlin 1.7.10 - LLVM 14.0.6 - Node 16.17.0 @@ -25,20 +25,21 @@ ### Package Management - Chocolatey 1.1.0 - Composer 2.4.1 -- Helm 3.9.3 +- Helm 3.9.4 - Miniconda 4.12.0 (pre-installed on the image but not added to PATH) - NPM 8.15.0 - NuGet 6.3.0.131 - pip 22.2.2 (python 3.7) - Pipx 1.1.0 - RubyGems 2.7.6.3 -- Vcpkg (build from master \<927006b24>) +- Vcpkg (build from master \<8e3595fad>) - Yarn 1.22.19 #### Environment variables | Name | Value | | ----------------------- | ------------ | | VCPKG_INSTALLATION_ROOT | C:\vcpkg | +| VCPKG_ROOT | C:\vcpkg | | CONDA | C:\Miniconda | ### Project Management @@ -52,8 +53,8 @@ - aria2 1.36.0 - azcopy 10.16.0 - Bazel 5.3.0 -- Bazelisk 1.12.1 -- Bicep 0.9.1 +- Bazelisk 1.13.2 +- Bicep 0.10.13 - Cabal 3.8.1.0 - CMake 3.24.1 - CodeQL Action Bundle 2.10.4 @@ -64,7 +65,7 @@ - ghc 9.4.2 - Git 2.37.3.windows.1 - Git LFS 3.2.0 -- Google Cloud SDK 400.0.0 +- Google Cloud SDK 401.0.0 - InnoSetup 6.2.1 - jq 1.6 - Kind 0.15.0 @@ -76,7 +77,7 @@ - OpenSSL 1.1.1 - Packer 1.8.2 - Parcel 2.7.0 -- Pulumi v3.39.1 +- Pulumi v3.39.3 - R 4.2.1 - Service Fabric SDK 9.0.1028.9590 - Stack 2.7.5 @@ -90,13 +91,13 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.125 -- AWS CLI 2.7.29 -- AWS SAM CLI 1.56.0 +- AWS CLI 2.7.31 +- AWS SAM CLI 1.56.1 - AWS Session Manager CLI 1.2.339.0 -- Azure CLI 2.39.0 +- Azure CLI 2.40.0 - Azure DevOps CLI extension 0.25.0 - Cloud Foundry CLI 6.53.0 -- GitHub CLI 2.14.7 +- GitHub CLI 2.15.0 - Hub CLI 2.14.2 ### Rust Tools @@ -116,9 +117,9 @@ ### Browsers and webdrivers - Google Chrome 105.0.5195.102 - Chrome Driver 105.0.5195.52 -- Microsoft Edge 105.0.1343.27 -- Microsoft Edge Driver 105.0.1343.27 -- Mozilla Firefox 104.0.1 +- Microsoft Edge 105.0.1343.33 +- Microsoft Edge Driver 105.0.1343.34 +- Mozilla Firefox 104.0.2 - Gecko Driver 0.31.0 - IE Driver 3.150.1.1 - Selenium server 4.4.0 @@ -164,8 +165,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Version | Architecture | Environment Variable | | ------- | ------------ | -------------------- | | 1.17.13 (Default) | x64 | GOROOT_1_17_X64 | -| 1.18.5 | x64 | GOROOT_1_18_X64 | -| 1.19.0 | x64 | GOROOT_1_19_X64 | +| 1.18.6 | x64 | GOROOT_1_18_X64 | +| 1.19.1 | x64 | GOROOT_1_19_X64 | #### Node | Version | Architecture | @@ -182,7 +183,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | 3.7.9 (Default) | x64, x86 | | 3.8.10 | x64, x86 | | 3.9.13 | x64, x86 | -| 3.10.6 | x64, x86 | +| 3.10.7 | x64, x86 | #### Ruby | Version | Architecture | @@ -219,7 +220,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### MongoDB | Version | ServiceName | ServiceStatus | ServiceStartType | | -------- | ----------- | ------------- | ---------------- | -| 5.0.11.0 | MongoDB | Stopped | Disabled | +| 5.0.12.0 | MongoDB | Stopped | Disabled | ### Database tools - Azure CosmosDb Emulator 2.14.9.0 @@ -469,12 +470,11 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | ms-biztalk.BizTalk | 3.13.2.0 | | ProBITools.MicrosoftAnalysisServicesModelingProjects | 2.9.18 | | ProBITools.MicrosoftReportProjectsforVisualStudio | 2.6.11 | -| SSIS.SqlServerIntegrationServicesProjects | 4.1 | +| SSIS.SqlServerIntegrationServicesProjects | 4.2 | | VisualStudioClient.MicrosoftVisualStudio2017InstallerProjects | 1.0.2 | | Windows Driver Kit | 10.1.22000.1 | | Windows Driver Kit Visual Studio Extension | 10.0.21381.0 | | Windows Software Development Kit | 10.1.22621.1 | -| WIX Toolset Studio 2019 Extension | 1.0.0.18 | | WixToolset.WixToolsetVisualStudio2019Extension | 1.0.0.18 | #### Microsoft Visual C++: @@ -548,7 +548,7 @@ All other versions are saved but not installed. #### Powershell Modules | Module | Version | | ------------------ | ---------------- | -| AWSPowerShell | 4.1.161 | +| AWSPowerShell | 4.1.165 | | DockerMsftProvider | 1.0.0.8 | | MarkdownPS | 1.9 | | Microsoft.Graph | 1.11.1 | From dd51aedc2fa2ac86d3eae1c2797961babe7d65e7 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Tue, 13 Sep 2022 17:59:39 +0200 Subject: [PATCH 1463/3485] Revert "[Ubuntu] install gcc@11 from brew (#6202)" (#6232) This reverts commit d2c84c9d4c30a469ab32e88d9118914a9380a53f. --- images/linux/scripts/tests/Tools.Tests.ps1 | 16 +++++----------- images/linux/toolsets/toolset-1804.json | 9 +-------- images/linux/toolsets/toolset-2004.json | 9 +-------- images/linux/toolsets/toolset-2204.json | 5 +---- 4 files changed, 8 insertions(+), 31 deletions(-) diff --git a/images/linux/scripts/tests/Tools.Tests.ps1 b/images/linux/scripts/tests/Tools.Tests.ps1 index 5d7c5a85448c..97a364b14b49 100644 --- a/images/linux/scripts/tests/Tools.Tests.ps1 +++ b/images/linux/scripts/tests/Tools.Tests.ps1 @@ -257,22 +257,16 @@ Describe "HHVM" -Skip:(Test-IsUbuntu22) { } Describe "Homebrew" { - $brewToolset = (Get-ToolsetContent).brew - $testCases = $brewToolset | ForEach-Object { @{brewName = $_.name; brewCommand = $_.command} } - It "homebrew" { "brew --version" | Should -ReturnZeroExitCode } - It "zstd has /usr/local/bin symlink" { - "/usr/local/bin/zstd" | Should -Exist - } - - It "homebrew package <brewName>" -TestCases $testCases { - $brewPrefix = brew --prefix $brewName - $brewPackage = Join-Path $brewPrefix "bin" $brewCommand + Context "Packages" { + $testCases = (Get-ToolsetContent).brew | ForEach-Object { @{ ToolName = $_.name } } - "$brewPackage --version" | Should -ReturnZeroExitCode + It "<ToolName>" -TestCases $testCases { + "$ToolName --version" | Should -Not -BeNullOrEmpty + } } } diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index b4a42783be6e..264c6d96acc3 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -217,14 +217,7 @@ ] }, "brew": [ - { - "name": "gcc@11", - "command": "gcc-11" - }, - { - "name": "zstd", - "command": "zstd" - } + {"name": "zstd"} ], "docker": { "images": [ diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index 01ae9d0f6190..df9434cda742 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -217,14 +217,7 @@ ] }, "brew": [ - { - "name": "gcc@11", - "command": "gcc-11" - }, - { - "name": "zstd", - "command": "zstd" - } + {"name": "zstd"} ], "docker": { "images": [ diff --git a/images/linux/toolsets/toolset-2204.json b/images/linux/toolsets/toolset-2204.json index f16f0ec670aa..3c3c4bb0509a 100644 --- a/images/linux/toolsets/toolset-2204.json +++ b/images/linux/toolsets/toolset-2204.json @@ -201,10 +201,7 @@ ] }, "brew": [ - { - "name": "zstd", - "command": "zstd" - } + {"name": "zstd"} ], "docker": { "images": [ From 3f917ab01812a239c148f43c0cba4fad883036a8 Mon Sep 17 00:00:00 2001 From: Sam Tran <samvantran@github.com> Date: Tue, 13 Sep 2022 23:03:52 -0500 Subject: [PATCH 1464/3485] update codeowners to the right team for PR reviews (#6236) --- .github/CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 0be687166769..70bcba5ab51f 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1 +1 @@ -* @actions/runner-images-owners +* @actions/runner-images-team From b8fb0338e15819fd6f8f0852c51b3a1a56118659 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 14 Sep 2022 04:09:36 +0000 Subject: [PATCH 1465/3485] Updating readme file for ubuntu22 version 20220912.1 (#6228) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2204-Readme.md | 67 ++++++++++++++++--------------- 1 file changed, 34 insertions(+), 33 deletions(-) diff --git a/images/linux/Ubuntu2204-Readme.md b/images/linux/Ubuntu2204-Readme.md index 888202f9b2d3..a2b61cb75f6d 100644 --- a/images/linux/Ubuntu2204-Readme.md +++ b/images/linux/Ubuntu2204-Readme.md @@ -3,8 +3,8 @@ | [The Ubuntu 18.04 Actions runner image will begin deprecation on 8/8/22 and will be fully unsupported by 4/1/2023](https://github.com/actions/runner-images/issues/6002) | *** # Ubuntu 22.04.1 LTS -- Linux kernel version: 5.15.0-1017-azure -- Image Version: 20220905.1 +- Linux kernel version: 5.15.0-1019-azure +- Image Version: 20220912.1 ## Installed Software ### Language and Runtime @@ -15,7 +15,7 @@ - Dash 0.5.11+git20210903+057cd650a4ed-3build1 - GNU C++ 9.4.0, 10.3.0, 11.2.0 - GNU Fortran 9.4.0, 10.3.0, 11.2.0 -- Julia 1.8.0 +- Julia 1.8.1 - Kotlin 1.7.10-release-333 - Mono 6.12.0.182 (apt source repository: https://download.mono-project.com/repo/ubuntu stable-focal main) - MSBuild 16.10.1.31701 (from /usr/lib/mono/msbuild/15.0/bin/MSBuild.dll) @@ -28,7 +28,7 @@ ### Package Management - cpan 1.64 - Helm 3.9.4 -- Homebrew 3.5.10 +- Homebrew 3.6.1 - Miniconda 4.12.0 - Npm 8.15.0 - NuGet 6.2.1.2 @@ -36,7 +36,7 @@ - Pip3 22.0.2 - Pipx 1.1.0 - RubyGems 3.3.5 -- Vcpkg (build from master \<927006b24>) +- Vcpkg (build from master \<23905f6f8>) - Yarn 1.22.19 #### Environment variables @@ -44,17 +44,18 @@ | ----------------------- | ---------------------- | | CONDA | /usr/share/miniconda | | VCPKG_INSTALLATION_ROOT | /usr/local/share/vcpkg | +| VCPKG_ROOT | /usr/local/share/vcpkg | ### Project Management -- Lerna 5.5.0 +- Lerna 5.5.1 ### Tools -- Ansible 2.13.3 +- Ansible 2.13.4 - apt-fast 1.9.12 - AzCopy 10.16.0 (available by `azcopy` and `azcopy10` aliases) - Bazel 5.3.0 -- Bazelisk 1.12.1 -- Bicep 0.9.1 +- Bazelisk 1.13.2 +- Bicep 0.10.13 - Buildah 1.23.1 - CMake 3.24.1 - CodeQL Action Bundle 2.10.4 @@ -85,30 +86,30 @@ - Packer 1.8.3 - Parcel 2.7.0 - Podman 3.4.4 -- Pulumi 3.39.1 +- Pulumi 3.39.3 - R 4.2.1 - Skopeo 1.4.1 - Sphinx Open Source Search Server 2.2.11 - SVN 1.14.1 -- Terraform 1.2.8 -- yamllint 1.27.1 -- yq 4.27.3 +- Terraform 1.2.9 +- yamllint 1.28.0 +- yq 4.27.5 - zstd 1.5.2 (homebrew) ### CLI Tools - Alibaba Cloud CLI 3.0.125 -- AWS CLI 2.7.29 +- AWS CLI 2.7.31 - AWS CLI Session manager plugin 1.2.339.0 -- AWS SAM CLI 1.56.0 -- Azure CLI (azure-cli) 2.39.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) +- AWS SAM CLI 1.56.1 +- Azure CLI (azure-cli) 2.40.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.25.0 -- GitHub CLI 2.14.7 -- Google Cloud SDK 369.0.0 (apt source repository: https://packages.cloud.google.com/apt) +- GitHub CLI 2.15.0 +- Google Cloud SDK 401.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 11.5.1 -- OpenShift CLI 4.11.1 +- Netlify CLI 11.7.1 +- OpenShift CLI 4.11.4 - ORAS CLI 0.14.1 -- Vercel CLI 28.2.2 +- Vercel CLI 28.2.5 ### Java | Version | Vendor | Environment Variable | @@ -155,8 +156,8 @@ - Google Chrome 105.0.5195.102 - ChromeDriver 105.0.5195.52 - Chromium 105.0.5177.0 -- Microsoft Edge 105.0.1343.27 (apt source repository: https://packages.microsoft.com/repos/edge) -- Microsoft Edge WebDriver 105.0.1343.27 +- Microsoft Edge 105.0.1343.33 (apt source repository: https://packages.microsoft.com/repos/edge) +- Microsoft Edge WebDriver 105.0.1343.34 - Selenium server 4.4.0 #### Environment variables @@ -197,8 +198,8 @@ ### Cached Tools #### Go - 1.17.13 -- 1.18.5 -- 1.19.0 +- 1.18.6 +- 1.19.1 #### Node.js - 14.20.0 @@ -210,10 +211,10 @@ - 3.9.12 [PyPy 7.3.9] #### Python -- 3.7.13 -- 3.8.13 -- 3.9.13 -- 3.10.6 +- 3.7.14 +- 3.8.14 +- 3.9.14 +- 3.10.7 #### Ruby - 3.1.2 @@ -222,8 +223,8 @@ | Name | Value | Architecture | | --------------- | ----------------------------------- | ------------ | | GOROOT_1_17_X64 | /opt/hostedtoolcache/go/1.17.13/x64 | x64 | -| GOROOT_1_18_X64 | /opt/hostedtoolcache/go/1.18.5/x64 | x64 | -| GOROOT_1_19_X64 | /opt/hostedtoolcache/go/1.19.0/x64 | x64 | +| GOROOT_1_18_X64 | /opt/hostedtoolcache/go/1.18.6/x64 | x64 | +| GOROOT_1_19_X64 | /opt/hostedtoolcache/go/1.19.1/x64 | x64 | ### PowerShell Tools - PowerShell 7.2.6 @@ -285,7 +286,7 @@ | node:14-alpine | sha256:4aff4ba0da347e51561587eba037a38db4eaa70e1a6c8334d66779fe963d5be7 | 2022-08-09 | | node:16 | sha256:0c672d547405fe64808ea28b49c5772b1026f81b3b716ff44c10c96abf177d6a | 2022-08-23 | | node:16-alpine | sha256:2c405ed42fc0fd6aacbe5730042640450e5ec030bada7617beac88f742b6997b | 2022-08-16 | -| ubuntu:18.04 | sha256:3aa2ccb021969aadb28381fee1b247422e845b176e241cd1540c4b6831e000bb | 2022-09-01 | +| ubuntu:18.04 | sha256:6fec50623d6d37b7f3c14c5b6fc36c73fd04aa8173d59d54dba00da0e7ac50ee | 2022-09-06 | | ubuntu:20.04 | sha256:35ab2bf57814e9ff49e365efd5a5935b6915eede5c7f8581e9e1b85e0eecbe16 | 2022-09-01 | | ubuntu:22.04 | sha256:20fa2d7bb4de7723f542be5923b06c4d704370f0390e4ae9e1c833c8785644c1 | 2022-09-01 | @@ -317,7 +318,7 @@ | iproute2 | 5.15.0-1ubuntu2 | | iputils-ping | 3:20211215-1 | | jq | 1.6-2.1ubuntu3 | -| lib32z1 | 1:1.2.11.dfsg-2ubuntu9 | +| lib32z1 | 1:1.2.11.dfsg-2ubuntu9.1 | | libc++-dev | 1:14.0-55\~exp2 | | libc++abi-dev | 1:14.0-55\~exp2 | | libcurl4 | 7.81.0-1ubuntu1.4 | From 0b95b4b080c7b7b6df23cf72be8b04c18d546914 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 14 Sep 2022 11:05:15 +0000 Subject: [PATCH 1466/3485] Updating readme file for macOS-12 version 20220912.1 (#6237) Co-authored-by: Image generation service account <no-reply@microsoft.com> --- images/macos/macos-12-Readme.md | 99 +++++++++++++++++---------------- 1 file changed, 52 insertions(+), 47 deletions(-) diff --git a/images/macos/macos-12-Readme.md b/images/macos/macos-12-Readme.md index 7d16d6843806..e92ac2e4e772 100644 --- a/images/macos/macos-12-Readme.md +++ b/images/macos/macos-12-Readme.md @@ -1,11 +1,12 @@ | Announcements | |-| +| [[macOS] Default Xcode on macOS 12 Monterey will be set to Xcode 14.0 on September, 26](https://github.com/actions/runner-images/issues/6225) | | [The macOS 10.15 Actions runner image will begin deprecation on 5/31/22 and will be fully unsupported by 12/1/22 for GitHub and ADO](https://github.com/actions/runner-images/issues/5583) | *** -# macOS 12.5 info -- System Version: macOS 12.5.1 (21G83) +# macOS 12.6 info +- System Version: macOS 12.6 (21G115) - Kernel Version: Darwin 21.6.0 -- Image Version: 20220907.1 +- Image Version: 20220912.1 ## Installed Software ### Language and Runtime @@ -16,7 +17,7 @@ - gcc-11 (Homebrew GCC 11.3.0) 11.3.0 - available by `gcc-11` alias - GNU Fortran (Homebrew GCC 11.3.0) 11.3.0 - available by `gfortran-11` alias - Go 1.17.13 -- julia 1.8.0 +- julia 1.8.1 - Kotlin 1.7.10-release-333 - MSBuild 16.10.1.31401 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) - Node.js v16.17.0 @@ -34,7 +35,7 @@ - Carthage 0.38.0 - CocoaPods 1.11.3 - Composer 2.4.1 -- Homebrew 3.6.0 +- Homebrew 3.6.1 - Miniconda 4.12.0 - NPM 8.15.0 - NuGet 6.2.1.2 @@ -42,7 +43,7 @@ - Pip 22.2.2 (python 3.10) - Pipx 1.1.0 - RubyGems 3.3.22 -- Vcpkg 2022 (build from master \<a291bcad8>) +- Vcpkg 2022 (build from master \<23905f6f8>) - Yarn 1.22.19 #### Environment variables @@ -50,6 +51,7 @@ | ----------------------- | ---------------------- | | CONDA | /usr/local/miniconda | | VCPKG_INSTALLATION_ROOT | /usr/local/share/vcpkg | +| VCPKG_ROOT | /usr/local/share/vcpkg | ### Project Management - Apache Ant(TM) 1.10.12 @@ -62,7 +64,7 @@ - aria2 1.36.0 - azcopy 10.16.0 - bazel 5.3.0 -- bazelisk 1.13.2 +- bazelisk 1.14.0 - bsdtar 3.5.1 - available by 'tar' alias - Curl 7.85.0 - Git 2.37.3 @@ -85,40 +87,40 @@ - Switchaudio-osx 1.1.0 - Vagrant 2.3.0 - VirtualBox 6.1.38r153438 -- yq (https://github.com/mikefarah/yq/) version 4.27.3 +- yq (https://github.com/mikefarah/yq/) version 4.27.5 - zstd 1.5.2 ### Tools - App Center CLI 2.11.0 -- AWS CLI 2.7.30 +- AWS CLI 2.7.31 - AWS SAM CLI 1.56.1 - AWS Session Manager CLI 1.2.339.0 - Azure CLI (azure-devops) 0.25.0 - Azure CLI 2.40.0 -- Bicep CLI 0.9.1 +- Bicep CLI 0.10.13 - Cabal 3.6.2.0 - Cmake 3.24.1 - CodeQL Action Bundle 2.10.4 - Fastlane 2.209.1 - GHC 9.4.2 - GHCup 0.1.18.0 -- Jazzy 0.14.2 +- Jazzy 0.14.3 - Stack 2.7.5 - SwiftFormat 0.49.18 - Swig 4.0.2 -- Xcode Command Line Tools 13.4.0.0.1.1651278267 +- Xcode Command Line Tools 14.0.0.0.1.1661618636 ### Linters - SwiftLint 0.49.1 -- yamllint 1.27.1 +- yamllint 1.28.0 ### Browsers -- Safari 15.6.1 (17613.3.9.1.16) -- SafariDriver 15.6.1 (17613.3.9.1.16) +- Safari 16.0 (17614.1.25.9.10) +- SafariDriver 16.0 (17614.1.25.9.10) - Google Chrome 105.0.5195.102 - ChromeDriver 105.0.5195.52 -- Microsoft Edge 105.0.1343.27 -- Microsoft Edge WebDriver 105.0.1343.27 +- Microsoft Edge 105.0.1343.33 +- Microsoft Edge WebDriver 105.0.1343.34 - Mozilla Firefox 104.0.2 - geckodriver 0.31.0 - Selenium server 4.4.0 @@ -235,14 +237,15 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" - NUnit 3.6.1 ### Xcode -| Version | Build | Path | -| ---------------- | -------- | ------------------------------ | -| 14.0 | 14A309 | /Applications/Xcode_14.0.app | -| 13.4.1 (default) | 13F100 | /Applications/Xcode_13.4.1.app | -| 13.4 | 13F17a | /Applications/Xcode_13.4.app | -| 13.3.1 | 13E500a | /Applications/Xcode_13.3.1.app | -| 13.2.1 | 13C100 | /Applications/Xcode_13.2.1.app | -| 13.1 | 13A1030d | /Applications/Xcode_13.1.app | +| Version | Build | Path | +| ---------------- | -------- | --------------------------------- | +| 14.0 (beta) | 14A5294g | /Applications/Xcode_14.0_beta.app | +| 14.0 | 14A309 | /Applications/Xcode_14.0.app | +| 13.4.1 (default) | 13F100 | /Applications/Xcode_13.4.1.app | +| 13.4 | 13F17a | /Applications/Xcode_13.4.app | +| 13.3.1 | 13E500a | /Applications/Xcode_13.3.1.app | +| 13.2.1 | 13C100 | /Applications/Xcode_13.2.1.app | +| 13.1 | 13A1030d | /Applications/Xcode_13.1.app | #### Xcode Support Tools - xcpretty 0.3.0 @@ -254,52 +257,54 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" | macOS 12.0 | macosx12.0 | 13.1 | | macOS 12.1 | macosx12.1 | 13.2.1 | | macOS 12.3 | macosx12.3 | 13.3.1, 13.4, 13.4.1, 14.0 | +| macOS 13.0 | macosx13.0 | 14.0 | | iOS 15.0 | iphoneos15.0 | 13.1 | | iOS 15.2 | iphoneos15.2 | 13.2.1 | | iOS 15.4 | iphoneos15.4 | 13.3.1 | | iOS 15.5 | iphoneos15.5 | 13.4, 13.4.1 | -| iOS 16.0 | iphoneos16.0 | 14.0 | +| iOS 16.0 | iphoneos16.0 | 14.0, 14.0 | | Simulator - iOS 15.0 | iphonesimulator15.0 | 13.1 | | Simulator - iOS 15.2 | iphonesimulator15.2 | 13.2.1 | | Simulator - iOS 15.4 | iphonesimulator15.4 | 13.3.1 | | Simulator - iOS 15.5 | iphonesimulator15.5 | 13.4, 13.4.1 | -| Simulator - iOS 16.0 | iphonesimulator16.0 | 14.0 | +| Simulator - iOS 16.0 | iphonesimulator16.0 | 14.0, 14.0 | | tvOS 15.0 | appletvos15.0 | 13.1 | | tvOS 15.2 | appletvos15.2 | 13.2.1 | | tvOS 15.4 | appletvos15.4 | 13.3.1, 13.4, 13.4.1 | -| tvOS 16.0 | appletvos16.0 | 14.0 | +| tvOS 16.0 | appletvos16.0 | 14.0, 14.0 | | Simulator - tvOS 15.0 | appletvsimulator15.0 | 13.1 | | Simulator - tvOS 15.2 | appletvsimulator15.2 | 13.2.1 | | Simulator - tvOS 15.4 | appletvsimulator15.4 | 13.3.1, 13.4, 13.4.1 | -| Simulator - tvOS 16.0 | appletvsimulator16.0 | 14.0 | +| Simulator - tvOS 16.0 | appletvsimulator16.0 | 14.0, 14.0 | | watchOS 8.0 | watchos8.0 | 13.1 | | watchOS 8.3 | watchos8.3 | 13.2.1 | | watchOS 8.5 | watchos8.5 | 13.3.1, 13.4, 13.4.1 | -| watchOS 9.0 | watchos9.0 | 14.0 | +| watchOS 9.0 | watchos9.0 | 14.0, 14.0 | | Simulator - watchOS 8.0 | watchsimulator8.0 | 13.1 | | Simulator - watchOS 8.3 | watchsimulator8.3 | 13.2.1 | | Simulator - watchOS 8.5 | watchsimulator8.5 | 13.3.1, 13.4, 13.4.1 | -| Simulator - watchOS 9.0 | watchsimulator9.0 | 14.0 | +| Simulator - watchOS 9.0 | watchsimulator9.0 | 14.0, 14.0 | | DriverKit 21.0.1 | driverkit21.0.1 | 13.1 | | DriverKit 21.2 | driverkit21.2 | 13.2.1 | | DriverKit 21.4 | driverkit21.4 | 13.3.1, 13.4, 13.4.1, 14.0 | +| DriverKit 22.0 | driverkit22.0 | 14.0 | #### Installed Simulators -| OS | Xcode Version | Simulators | -| ----------- | -------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| iOS 15.0 | 13.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | -| iOS 15.2 | 13.2.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | -| iOS 15.4 | 13.3.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPhone SE (3rd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | -| iOS 15.5 | 13.4<br>13.4.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPhone SE (3rd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | -| iOS 16.0 | 14.0 | iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPhone SE (3rd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | -| tvOS 15.0 | 13.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | -| tvOS 15.2 | 13.2.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | -| tvOS 15.4 | 13.3.1<br>13.4<br>13.4.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | -| tvOS 16.0 | 13.1<br>13.2.1<br>13.3.1<br>13.4<br>13.4.1<br>14.0 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | -| watchOS 8.0 | 13.1 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | -| watchOS 8.3 | 13.2.1 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | -| watchOS 8.5 | 13.3.1<br>13.4<br>13.4.1 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | -| watchOS 9.0 | 13.1<br>13.2.1<br>13.3.1<br>13.4<br>13.4.1<br>14.0 | Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | +| OS | Xcode Version | Simulators | +| ----------- | ---------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| iOS 15.0 | 13.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | +| iOS 15.2 | 13.2.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | +| iOS 15.4 | 13.3.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPhone SE (3rd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | +| iOS 15.5 | 13.4<br>13.4.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPhone SE (3rd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | +| iOS 16.0 | 14.0<br>14.0 | iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPhone SE (3rd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | +| tvOS 15.0 | 13.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | +| tvOS 15.2 | 13.2.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | +| tvOS 15.4 | 13.3.1<br>13.4<br>13.4.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | +| tvOS 16.0 | 13.1<br>13.2.1<br>13.3.1<br>13.4<br>13.4.1<br>14.0<br>14.0 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | +| watchOS 8.0 | 13.1 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | +| watchOS 8.3 | 13.2.1 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | +| watchOS 8.5 | 13.3.1<br>13.4<br>13.4.1 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | +| watchOS 9.0 | 13.1<br>13.2.1<br>13.3.1<br>13.4<br>13.4.1<br>14.0<br>14.0 | Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | ### Android | Package Name | Version | @@ -328,7 +333,7 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" ### Miscellaneous - libXext 1.3.4 -- libXft 2.3.5 +- libXft 2.3.6 - Tcl/Tk 8.6.12_1 - Zlib 1.2.12 From ab39638013a788e650b9ffadf82f77e9361fdc8c Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Wed, 14 Sep 2022 17:37:36 +0200 Subject: [PATCH 1467/3485] [Ubuntu] Update file name comment - mono.sh (#6241) --- images/linux/scripts/installers/mono.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/linux/scripts/installers/mono.sh b/images/linux/scripts/installers/mono.sh index 6a54dc564731..4819765d6e71 100644 --- a/images/linux/scripts/installers/mono.sh +++ b/images/linux/scripts/installers/mono.sh @@ -1,6 +1,6 @@ #!/bin/bash -e ################################################################################ -## File: cmake.sh +## File: mono.sh ## Desc: Installs Mono ################################################################################ From 771b5010e79f6e4be3d65c02da9e9ebeaa7441a9 Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Wed, 14 Sep 2022 19:24:53 +0200 Subject: [PATCH 1468/3485] [Ubuntu] Update file name comment - sbt.sh (#6242) --- images/linux/scripts/installers/sbt.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/linux/scripts/installers/sbt.sh b/images/linux/scripts/installers/sbt.sh index 0353961a4ace..39734d532fc5 100644 --- a/images/linux/scripts/installers/sbt.sh +++ b/images/linux/scripts/installers/sbt.sh @@ -1,6 +1,6 @@ #!/bin/bash -e ################################################################################ -## File: scala.sh +## File: sbt.sh ## Desc: Installs sbt ################################################################################ From e3460fa423ce5995aa5a2845031eef73c2645a45 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Thu, 15 Sep 2022 09:17:39 +0200 Subject: [PATCH 1469/3485] Enable WpnUserService (#6246) --- images/win/scripts/Installers/Finalize-VM.ps1 | 1 - 1 file changed, 1 deletion(-) diff --git a/images/win/scripts/Installers/Finalize-VM.ps1 b/images/win/scripts/Installers/Finalize-VM.ps1 index 19895c89fe4c..be5200b9b3bf 100644 --- a/images/win/scripts/Installers/Finalize-VM.ps1 +++ b/images/win/scripts/Installers/Finalize-VM.ps1 @@ -78,7 +78,6 @@ $regUserServicesToDisables = @( "HKLM:\SYSTEM\CurrentControlSet\Services\PimIndexMaintenanceSvc" "HKLM:\SYSTEM\CurrentControlSet\Services\UnistoreSvc" "HKLM:\SYSTEM\CurrentControlSet\Services\UserDataSvc" - "HKLM:\SYSTEM\CurrentControlSet\Services\WpnUserService" ) $regUserServicesToDisables | ForEach-Object { From af77e4c2e422ba71b8cabc64260d7615d8373af9 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 15 Sep 2022 08:34:23 +0000 Subject: [PATCH 1470/3485] Updating readme file for macOS-10.15 version 20220912.1 (#6245) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-10.15-Readme.md | 68 +++++++++++++++--------------- 1 file changed, 35 insertions(+), 33 deletions(-) diff --git a/images/macos/macos-10.15-Readme.md b/images/macos/macos-10.15-Readme.md index 378d3d0190c4..928266159c21 100644 --- a/images/macos/macos-10.15-Readme.md +++ b/images/macos/macos-10.15-Readme.md @@ -1,11 +1,12 @@ | Announcements | |-| +| [[macOS] Default Xcode on macOS 12 Monterey will be set to Xcode 14.0 on September, 26](https://github.com/actions/runner-images/issues/6225) | | [The macOS 10.15 Actions runner image will begin deprecation on 5/31/22 and will be fully unsupported by 12/1/22 for GitHub and ADO](https://github.com/actions/runner-images/issues/5583) | *** # macOS 10.15 info - System Version: macOS 10.15.7 (19H2026) - Kernel Version: Darwin 19.6.0 -- Image Version: 20220829.1 +- Image Version: 20220912.1 ## Installed Software ### Language and Runtime @@ -20,33 +21,33 @@ - GNU Fortran (Homebrew GCC 10.4.0) 10.4.0 - available by `gfortran-10` alias - GNU Fortran (Homebrew GCC 11.3.0) 11.3.0 - available by `gfortran-11` alias - Go 1.17.13 -- julia 1.8.0 +- julia 1.8.1 - Kotlin 1.7.10-release-333 - MSBuild 16.10.1.31401 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) - Node.js v16.17.0 - NVM 0.39.1 - NVM - Cached node versions: v12.22.12 v14.20.0 v16.17.0 - Perl 5.34.0 -- PHP 8.1.9 +- PHP 8.1.10 - Python 2.7.18 - Python 3.10.6 - R 4.2.1 - Ruby 2.7.6p219 ### Package Management -- Bundler version 2.3.21 +- Bundler version 2.3.22 - Carthage 0.38.0 - CocoaPods 1.11.3 - Composer 2.4.1 -- Homebrew 3.5.10 +- Homebrew 3.6.1 - Miniconda 4.12.0 - NPM 8.15.0 - NuGet 6.2.1.2 - Pip 20.3.4 (python 2.7) - Pip 22.2.2 (python 3.10) - Pipx 1.1.0 -- RubyGems 3.3.21 -- Vcpkg 2022 (build from master \<ed0279d48>) +- RubyGems 3.3.22 +- Vcpkg 2022 (build from master \<23905f6f8>) - Yarn 1.22.19 #### Environment variables @@ -54,6 +55,7 @@ | ----------------------- | ---------------------- | | CONDA | /usr/local/miniconda | | VCPKG_INSTALLATION_ROOT | /usr/local/share/vcpkg | +| VCPKG_ROOT | /usr/local/share/vcpkg | ### Project Management - Apache Ant(TM) 1.10.12 @@ -66,12 +68,12 @@ - aria2 1.36.0 - azcopy 10.16.0 - bazel 5.3.0 -- bazelisk 1.12.2 +- bazelisk 1.14.0 - bsdtar 3.3.2 - available by 'tar' alias -- Curl 7.84.0 -- Git 2.37.2 +- Curl 7.85.0 +- Git 2.37.3 - Git LFS: 3.2.0 -- GitHub CLI: 2.14.7 +- GitHub CLI: 2.15.0 - GNU parallel 20220822 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.3 @@ -91,49 +93,49 @@ - Subversion (SVN) 1.14.2 - Switchaudio-osx 1.1.0 - Vagrant 2.3.0 -- VirtualBox 6.1.36r152435 -- yq (https://github.com/mikefarah/yq/) version 4.27.3 +- VirtualBox 6.1.38r153438 +- yq (https://github.com/mikefarah/yq/) version 4.27.5 - zstd 1.5.2 ### Tools - Aliyun CLI 3.0.125 - App Center CLI 2.11.0 -- AWS CLI 2.7.27 -- AWS SAM CLI 1.55.0 +- AWS CLI 2.7.31 +- AWS SAM CLI 1.56.1 - AWS Session Manager CLI 1.2.339.0 - Azure CLI (azure-devops) 0.25.0 -- Azure CLI 2.39.0 -- Bicep CLI 0.9.1 +- Azure CLI 2.40.0 +- Bicep CLI 0.10.13 - Cabal 3.6.2.0 - Cmake 3.24.1 - Fastlane 2.209.1 - GHC 9.4.2 - GHCup 0.1.18.0 -- Jazzy 0.14.2 +- Jazzy 0.14.3 - Stack 2.7.5 -- SwiftFormat 0.49.17 +- SwiftFormat 0.49.18 - Swig 4.0.2 - Xcode Command Line Tools 12.4.0.0.1.1610135815 ### Linters - SwiftLint 0.48.0 -- yamllint 1.27.1 +- yamllint 1.28.0 ### Browsers - Safari 15.6.1 (15613.3.9.1.16) - SafariDriver 15.6.1 (15613.3.9.1.16) -- Google Chrome 104.0.5112.101 -- ChromeDriver 104.0.5112.79 -- Microsoft Edge 104.0.1293.70 -- Microsoft Edge WebDriver 104.0.1293.70 -- Mozilla Firefox 104.0 +- Google Chrome 105.0.5195.102 +- ChromeDriver 105.0.5195.52 +- Microsoft Edge 105.0.1343.33 +- Microsoft Edge WebDriver 105.0.1343.34 +- Mozilla Firefox 104.0.2 - geckodriver 0.31.0 - Selenium server 4.4.0 #### Environment variables | Name | Value | | --------------- | ---------------------------------------------- | -| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/104.0.5112.79 | +| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/105.0.5195.52 | | EDGEWEBDRIVER | /usr/local/share/edge_driver | | GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | @@ -163,10 +165,10 @@ #### Python - 2.7.18 - 3.6.15 -- 3.7.13 -- 3.8.13 -- 3.9.13 -- 3.10.6 +- 3.7.14 +- 3.8.14 +- 3.9.14 +- 3.10.7 #### PyPy - 2.7.18 [PyPy 7.3.9] @@ -185,7 +187,7 @@ | ------- | ------------ | -------------------- | | 1.16.15 | x64 | GOROOT_1_16_X64 | | 1.17.13 (Default) | x64 | GOROOT_1_17_X64 | -| 1.18.5 | x64 | GOROOT_1_18_X64 | +| 1.18.6 | x64 | GOROOT_1_18_X64 | ### Rust Tools - Cargo 1.63.0 @@ -207,7 +209,7 @@ #### PowerShell Modules | Module | Version | | ---------------- | ------- | -| Az | 8.2.0 | +| Az | 8.3.0 | | MarkdownPS | 1.9 | | Pester | 5.3.3 | | PSScriptAnalyzer | 1.20.0 | @@ -385,7 +387,7 @@ ### Miscellaneous - libXext 1.3.4 -- libXft 2.3.4 +- libXft 2.3.6 - Tcl/Tk 8.6.12_1 - Zlib 1.2.12 From 4e92b11f0913efaae7c229fdbbfd360dce4dbf2e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 15 Sep 2022 14:41:14 +0000 Subject: [PATCH 1471/3485] Updating readme file for macOS-11 version 20220912.1 (#6238) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-11-Readme.md | 60 +++++++++++++++++---------------- 1 file changed, 31 insertions(+), 29 deletions(-) diff --git a/images/macos/macos-11-Readme.md b/images/macos/macos-11-Readme.md index 1ba271757b19..13fa0484c3bb 100644 --- a/images/macos/macos-11-Readme.md +++ b/images/macos/macos-11-Readme.md @@ -1,11 +1,12 @@ | Announcements | |-| +| [[macOS] Default Xcode on macOS 12 Monterey will be set to Xcode 14.0 on September, 26](https://github.com/actions/runner-images/issues/6225) | | [The macOS 10.15 Actions runner image will begin deprecation on 5/31/22 and will be fully unsupported by 12/1/22 for GitHub and ADO](https://github.com/actions/runner-images/issues/5583) | *** -# macOS 11.6 info -- System Version: macOS 11.6.8 (20G730) +# macOS 11.7 info +- System Version: macOS 11.7 (20G817) - Kernel Version: Darwin 20.6.0 -- Image Version: 20220906.1 +- Image Version: 20220912.1 ## Installed Software ### Language and Runtime @@ -20,7 +21,7 @@ - GNU Fortran (Homebrew GCC 10.4.0) 10.4.0 - available by `gfortran-10` alias - GNU Fortran (Homebrew GCC 11.3.0) 11.3.0 - available by `gfortran-11` alias - Go 1.17.13 -- julia 1.8.0 +- julia 1.8.1 - Kotlin 1.7.10-release-333 - MSBuild 16.10.1.31401 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) - Node.js v16.17.0 @@ -34,19 +35,19 @@ - Ruby 2.7.6p219 ### Package Management -- Bundler version 2.3.21 +- Bundler version 2.3.22 - Carthage 0.38.0 - CocoaPods 1.11.3 - Composer 2.4.1 -- Homebrew 3.5.10 +- Homebrew 3.6.1 - Miniconda 4.12.0 - NPM 8.15.0 - NuGet 6.2.1.2 - Pip 20.3.4 (python 2.7) - Pip 22.2.2 (python 3.10) - Pipx 1.1.0 -- RubyGems 3.3.21 -- Vcpkg 2022 (build from master \<927006b24>) +- RubyGems 3.3.22 +- Vcpkg 2022 (build from master \<23905f6f8>) - Yarn 1.22.19 #### Environment variables @@ -54,6 +55,7 @@ | ----------------------- | ---------------------- | | CONDA | /usr/local/miniconda | | VCPKG_INSTALLATION_ROOT | /usr/local/share/vcpkg | +| VCPKG_ROOT | /usr/local/share/vcpkg | ### Project Management - Apache Ant(TM) 1.10.12 @@ -66,12 +68,12 @@ - aria2 1.36.0 - azcopy 10.16.0 - bazel 5.3.0 -- bazelisk 1.13.1 +- bazelisk 1.14.0 - bsdtar 3.3.2 - available by 'tar' alias - Curl 7.85.0 - Git 2.37.3 - Git LFS: 3.2.0 -- GitHub CLI: 2.14.7 +- GitHub CLI: 2.15.0 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.3 - gpg (GnuPG) 2.3.7 @@ -89,25 +91,25 @@ - Sox 14.4.2 - Subversion (SVN) 1.14.2 - Switchaudio-osx 1.1.0 -- yq (https://github.com/mikefarah/yq/) version 4.27.3 +- yq (https://github.com/mikefarah/yq/) version 4.27.5 - zstd 1.5.2 ### Tools - Aliyun CLI 3.0.125 - App Center CLI 2.11.0 -- AWS CLI 2.7.29 -- AWS SAM CLI 1.56.0 +- AWS CLI 2.7.31 +- AWS SAM CLI 1.56.1 - AWS Session Manager CLI 1.2.339.0 - Azure CLI (azure-devops) 0.25.0 - Azure CLI 2.40.0 -- Bicep CLI 0.9.1 +- Bicep CLI 0.10.13 - Cabal 3.6.2.0 - Cmake 3.24.1 - CodeQL Action Bundle 2.10.4 - Fastlane 2.209.1 - GHC 9.4.2 - GHCup 0.1.18.0 -- Jazzy 0.14.2 +- Jazzy 0.14.3 - Stack 2.7.5 - SwiftFormat 0.49.18 - Swig 4.0.2 @@ -115,16 +117,16 @@ ### Linters - SwiftLint 0.48.0 -- yamllint 1.27.1 +- yamllint 1.28.0 ### Browsers -- Safari 15.6.1 (16613.3.9.1.16) -- SafariDriver 15.6.1 (16613.3.9.1.16) +- Safari 16.0 (16614.1.25.9.10) +- SafariDriver 16.0 (16614.1.25.9.10) - Google Chrome 105.0.5195.102 - ChromeDriver 105.0.5195.52 -- Microsoft Edge 105.0.1343.27 -- Microsoft Edge WebDriver 105.0.1343.27 -- Mozilla Firefox 104.0.1 +- Microsoft Edge 105.0.1343.33 +- Microsoft Edge WebDriver 105.0.1343.34 +- Mozilla Firefox 104.0.2 - geckodriver 0.31.0 - Selenium server 4.4.0 @@ -157,10 +159,10 @@ - 3.1.2 #### Python -- 3.7.13 -- 3.8.13 -- 3.9.13 -- 3.10.6 +- 3.7.14 +- 3.8.14 +- 3.9.14 +- 3.10.7 #### PyPy - 2.7.18 [PyPy 7.3.9] @@ -177,8 +179,8 @@ | Version | Architecture | Environment Variable | | ------- | ------------ | -------------------- | | 1.17.13 (Default) | x64 | GOROOT_1_17_X64 | -| 1.18.5 | x64 | GOROOT_1_18_X64 | -| 1.19.0 | x64 | GOROOT_1_19_X64 | +| 1.18.6 | x64 | GOROOT_1_18_X64 | +| 1.19.1 | x64 | GOROOT_1_19_X64 | ### Rust Tools - Cargo 1.63.0 @@ -216,7 +218,7 @@ | Version | Build | Path | | -------------- | --------- | ------------------------------------ | | 2019 | 8.10.25.2 | /Applications/Visual Studio 2019.app | -| 2022 (default) | 17.3.3.10 | /Applications/Visual Studio.app | +| 2022 (default) | 17.3.4.4 | /Applications/Visual Studio.app | ##### Notes: ``` @@ -355,7 +357,7 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" ### Miscellaneous - libXext 1.3.4 -- libXft 2.3.4 +- libXft 2.3.6 - Tcl/Tk 8.6.12_1 - Zlib 1.2.12 From 058d0730dd1d15f906cbb19628e2374841ae6c5c Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Thu, 15 Sep 2022 20:34:12 +0200 Subject: [PATCH 1472/3485] [macOS] Add Xcode 14.1 beta (#6249) --- images/macos/toolsets/toolset-12.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index f433208773ec..2d866b9f773d 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -2,8 +2,8 @@ "xcode": { "default": "13.4.1", "versions": [ + { "link": "14.1", "version": "14.1.0"}, { "link": "14.0", "version": "14.0.0" }, - { "link": "14.0_beta", "version": "14 beta 6", "skip-symlink": "true"}, { "link": "13.4.1", "version": "13.4.1" }, { "link": "13.4", "version": "13.4.0" }, { "link": "13.3.1", "version": "13.3.1", "symlinks": ["13.3"] }, From 7f10a5a590b81073d5d631797a4ed9df28803582 Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Fri, 16 Sep 2022 10:23:13 +0200 Subject: [PATCH 1473/3485] [Windows] Add ImageMagick tool (#6247) * Add ImageMagick tool * Add ImageMagick tool --- .../win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 | 3 ++- images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 | 6 ++++++ images/win/scripts/Tests/ChocoPackages.Tests.ps1 | 6 ++++++ images/win/toolsets/toolset-2019.json | 3 ++- images/win/toolsets/toolset-2022.json | 3 ++- 5 files changed, 18 insertions(+), 3 deletions(-) diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index d659ac7b316b..2decc97cf269 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -119,7 +119,8 @@ $toolsList = @( (Get-WinAppDriver), (Get-WixVersion), (Get-ZstdVersion), - (Get-YAMLLintVersion) + (Get-YAMLLintVersion), + (Get-ImageMagickVersion) ) if (Test-IsWin19) { $toolsList += @( diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 index e85b328fee20..1f553d110ed8 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 @@ -307,3 +307,9 @@ function Get-SwigVersion { $swigVersion = $Matches.Version return "Swig $swigVersion" } + +function Get-ImageMagickVersion { + (magick -version | Select-String -Pattern "Version") -match "(?<version>\d+\.\d+\.\d+-\d+)" | Out-Null + $magickVersion = $Matches.Version + return "ImageMagick $magickVersion" +} diff --git a/images/win/scripts/Tests/ChocoPackages.Tests.ps1 b/images/win/scripts/Tests/ChocoPackages.Tests.ps1 index 949f29ef7478..b6a1682847cb 100644 --- a/images/win/scripts/Tests/ChocoPackages.Tests.ps1 +++ b/images/win/scripts/Tests/ChocoPackages.Tests.ps1 @@ -102,4 +102,10 @@ Describe "CMake" { It "cmake" { "cmake --version" | Should -ReturnZeroExitCode } +} + +Describe "ImageMagick" { + It "ImageMagick" { + "magick -version" | Should -ReturnZeroExitCode + } } \ No newline at end of file diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index a29fdc050412..56e6a73ef4d0 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -461,7 +461,8 @@ { "name": "cmake.install", "args": [ "--installargs", "ADD_CMAKE_TO_PATH=\"System\"" ] - } + }, + { "name": "imagemagick" } ] }, "node": { diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index fbac8fbb0bb1..eb0839bcb4ea 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -375,7 +375,8 @@ { "name": "cmake.install", "args": [ "--installargs", "ADD_CMAKE_TO_PATH=\"System\"" ] - } + }, + { "name": "imagemagick" } ] }, "node": { From 518f5407fa7ceab1db937c0b99187c88f86a754f Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Sat, 17 Sep 2022 18:05:53 +0300 Subject: [PATCH 1474/3485] Add Xcode 14.0.1 to macOS 12 (#6255) --- images/macos/toolsets/toolset-12.json | 1 + 1 file changed, 1 insertion(+) diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index 2d866b9f773d..011764be8d4c 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -3,6 +3,7 @@ "default": "13.4.1", "versions": [ { "link": "14.1", "version": "14.1.0"}, + { "link": "14.0.1", "version": "14.0.1" }, { "link": "14.0", "version": "14.0.0" }, { "link": "13.4.1", "version": "13.4.1" }, { "link": "13.4", "version": "13.4.0" }, From 3fab712c1ea2e1261273bb11c48024b876f8556a Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Mon, 19 Sep 2022 15:36:04 +0200 Subject: [PATCH 1475/3485] [Ubuntu] Install gcc@12 from brew (#6258) --- images/linux/scripts/installers/homebrew.sh | 6 ++++++ images/linux/scripts/tests/Tools.Tests.ps1 | 16 +++++++++++----- images/linux/toolsets/toolset-1804.json | 9 ++++++++- images/linux/toolsets/toolset-2004.json | 9 ++++++++- images/linux/toolsets/toolset-2204.json | 5 ++++- 5 files changed, 37 insertions(+), 8 deletions(-) diff --git a/images/linux/scripts/installers/homebrew.sh b/images/linux/scripts/installers/homebrew.sh index cb81167e7e01..1396b60c95c3 100644 --- a/images/linux/scripts/installers/homebrew.sh +++ b/images/linux/scripts/installers/homebrew.sh @@ -27,6 +27,12 @@ echo "Validate the installation reloading /etc/environment" reloadEtcEnvironment # Install additional brew packages + +# brew GCC installation needed because the default Ubuntu components +# are too old for current brew software +# See: +# https://github.com/Homebrew/homebrew-core/issues/110877 + brew_packages=$(get_toolset_value .brew[].name) for package in $brew_packages; do echo "Install $package" diff --git a/images/linux/scripts/tests/Tools.Tests.ps1 b/images/linux/scripts/tests/Tools.Tests.ps1 index 97a364b14b49..5d7c5a85448c 100644 --- a/images/linux/scripts/tests/Tools.Tests.ps1 +++ b/images/linux/scripts/tests/Tools.Tests.ps1 @@ -257,16 +257,22 @@ Describe "HHVM" -Skip:(Test-IsUbuntu22) { } Describe "Homebrew" { + $brewToolset = (Get-ToolsetContent).brew + $testCases = $brewToolset | ForEach-Object { @{brewName = $_.name; brewCommand = $_.command} } + It "homebrew" { "brew --version" | Should -ReturnZeroExitCode } - Context "Packages" { - $testCases = (Get-ToolsetContent).brew | ForEach-Object { @{ ToolName = $_.name } } + It "zstd has /usr/local/bin symlink" { + "/usr/local/bin/zstd" | Should -Exist + } + + It "homebrew package <brewName>" -TestCases $testCases { + $brewPrefix = brew --prefix $brewName + $brewPackage = Join-Path $brewPrefix "bin" $brewCommand - It "<ToolName>" -TestCases $testCases { - "$ToolName --version" | Should -Not -BeNullOrEmpty - } + "$brewPackage --version" | Should -ReturnZeroExitCode } } diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index 264c6d96acc3..7e6c8261c8f1 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -217,7 +217,14 @@ ] }, "brew": [ - {"name": "zstd"} + { + "name": "gcc@12", + "command": "gcc-12" + }, + { + "name": "zstd", + "command": "zstd" + } ], "docker": { "images": [ diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index df9434cda742..bb02ac68adce 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -217,7 +217,14 @@ ] }, "brew": [ - {"name": "zstd"} + { + "name": "gcc@12", + "command": "gcc-12" + }, + { + "name": "zstd", + "command": "zstd" + } ], "docker": { "images": [ diff --git a/images/linux/toolsets/toolset-2204.json b/images/linux/toolsets/toolset-2204.json index 3c3c4bb0509a..f16f0ec670aa 100644 --- a/images/linux/toolsets/toolset-2204.json +++ b/images/linux/toolsets/toolset-2204.json @@ -201,7 +201,10 @@ ] }, "brew": [ - {"name": "zstd"} + { + "name": "zstd", + "command": "zstd" + } ], "docker": { "images": [ From 15f134a85a3fbfed9161d5f5e71eb6ce03dd4ddf Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Mon, 19 Sep 2022 17:44:38 +0200 Subject: [PATCH 1476/3485] Exclude Windows Defender update checking (#6259) --- images/win/scripts/Installers/Wait-WindowsUpdatesForInstall.ps1 | 2 +- images/win/scripts/Tests/WindowsFeatures.Tests.ps1 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/images/win/scripts/Installers/Wait-WindowsUpdatesForInstall.ps1 b/images/win/scripts/Installers/Wait-WindowsUpdatesForInstall.ps1 index 2039e9396458..912f884c9696 100644 --- a/images/win/scripts/Installers/Wait-WindowsUpdatesForInstall.ps1 +++ b/images/win/scripts/Installers/Wait-WindowsUpdatesForInstall.ps1 @@ -4,7 +4,7 @@ ################################################################################ Invoke-SBWithRetry -RetryCount 10 -RetryIntervalSeconds 120 -Command { - $inProgress = Get-WindowsUpdatesHistory | Where-Object Status -eq "InProgress" + $inProgress = Get-WindowsUpdatesHistory | Where-Object Status -eq "InProgress" | Where-Object Title -notmatch "Microsoft Defender Antivirus" if ( $inProgress ) { $title = $inProgress.Title -join "`n" throw "InProgress: $title" diff --git a/images/win/scripts/Tests/WindowsFeatures.Tests.ps1 b/images/win/scripts/Tests/WindowsFeatures.Tests.ps1 index 973105396850..14b708f96800 100644 --- a/images/win/scripts/Tests/WindowsFeatures.Tests.ps1 +++ b/images/win/scripts/Tests/WindowsFeatures.Tests.ps1 @@ -72,7 +72,7 @@ Describe "Windows Updates" { It "<Title>" -TestCases $testCases { $expect = "Successful" if ( $Title -match "Microsoft Defender Antivirus" ) { - $expect = "Successful", "Failure" + $expect = "Successful", "Failure", "InProgress" } $Status | Should -BeIn $expect From c0d68d79cce5ca9c704da5edf45b31472ba31de7 Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Tue, 20 Sep 2022 07:32:48 +0200 Subject: [PATCH 1477/3485] Update installers comments (#6262) --- images/linux/scripts/installers/graalvm.sh | 4 ++++ images/linux/scripts/installers/r.sh | 4 ++++ images/linux/scripts/installers/yq.sh | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/images/linux/scripts/installers/graalvm.sh b/images/linux/scripts/installers/graalvm.sh index 6a79032b50c2..0d50db2efb62 100644 --- a/images/linux/scripts/installers/graalvm.sh +++ b/images/linux/scripts/installers/graalvm.sh @@ -1,4 +1,8 @@ #!/bin/bash -e +################################################################################ +## File: graalvm.sh +## Desc: Installs GraalVM +################################################################################ source $HELPER_SCRIPTS/install.sh source $HELPER_SCRIPTS/etc-environment.sh diff --git a/images/linux/scripts/installers/r.sh b/images/linux/scripts/installers/r.sh index c7c84c997ffd..79ede293452f 100644 --- a/images/linux/scripts/installers/r.sh +++ b/images/linux/scripts/installers/r.sh @@ -1,4 +1,8 @@ #!/bin/bash -e +################################################################################ +## File: r.sh +## Desc: Installs R +################################################################################ # Source the helpers for use with the script source $HELPER_SCRIPTS/os.sh diff --git a/images/linux/scripts/installers/yq.sh b/images/linux/scripts/installers/yq.sh index 3c9138736fe7..19d4e976a7d3 100644 --- a/images/linux/scripts/installers/yq.sh +++ b/images/linux/scripts/installers/yq.sh @@ -1,4 +1,8 @@ #!/bin/bash -e +################################################################################ +## File: yq.sh +## Desc: Installs YQ +################################################################################ # Source the helpers for use with the script source $HELPER_SCRIPTS/install.sh From ab475d3ed707b236b0042140faab1a326c7dbe54 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 20 Sep 2022 08:54:08 +0000 Subject: [PATCH 1478/3485] Updating readme file for macOS-12 version 20220917.1 (#6267) Co-authored-by: Image generation service account <no-reply@microsoft.com> --- images/macos/macos-12-Readme.md | 162 +++++++++++++++++--------------- 1 file changed, 86 insertions(+), 76 deletions(-) diff --git a/images/macos/macos-12-Readme.md b/images/macos/macos-12-Readme.md index e92ac2e4e772..25add0d1c146 100644 --- a/images/macos/macos-12-Readme.md +++ b/images/macos/macos-12-Readme.md @@ -1,16 +1,16 @@ | Announcements | |-| -| [[macOS] Default Xcode on macOS 12 Monterey will be set to Xcode 14.0 on September, 26](https://github.com/actions/runner-images/issues/6225) | +| [[macOS] Default Xcode on macOS 12 Monterey will be set to Xcode 14.0.1 on September, 26](https://github.com/actions/runner-images/issues/6225) | | [The macOS 10.15 Actions runner image will begin deprecation on 5/31/22 and will be fully unsupported by 12/1/22 for GitHub and ADO](https://github.com/actions/runner-images/issues/5583) | *** # macOS 12.6 info - System Version: macOS 12.6 (21G115) - Kernel Version: Darwin 21.6.0 -- Image Version: 20220912.1 +- Image Version: 20220917.1 ## Installed Software ### Language and Runtime -- .NET SDK 3.1.101 3.1.201 3.1.302 3.1.422 5.0.102 5.0.202 5.0.302 5.0.408 6.0.400 +- .NET SDK 3.1.101 3.1.201 3.1.302 3.1.423 5.0.102 5.0.202 5.0.302 5.0.408 6.0.401 - Bash 3.2.57(1)-release - Clang/LLVM 13.1.6 is default - Clang/LLVM 14.0.6 is available on `'$(brew --prefix llvm@14)/bin/clang'` @@ -34,7 +34,7 @@ - Bundler version 2.3.22 - Carthage 0.38.0 - CocoaPods 1.11.3 -- Composer 2.4.1 +- Composer 2.4.2 - Homebrew 3.6.1 - Miniconda 4.12.0 - NPM 8.15.0 @@ -43,7 +43,7 @@ - Pip 22.2.2 (python 3.10) - Pipx 1.1.0 - RubyGems 3.3.22 -- Vcpkg 2022 (build from master \<23905f6f8>) +- Vcpkg 2022 (build from master \<01b29f6d8>) - Yarn 1.22.19 #### Environment variables @@ -74,7 +74,7 @@ - GNU Wget 1.21.3 - gpg (GnuPG) 2.3.7 - Hub CLI: 2.14.2 -- ImageMagick 7.1.0-47 +- ImageMagick 7.1.0-48 - jq 1.6 - mongo v5.0.11 - mongod v5.0.11 @@ -92,16 +92,16 @@ ### Tools - App Center CLI 2.11.0 -- AWS CLI 2.7.31 +- AWS CLI 2.7.33 - AWS SAM CLI 1.56.1 - AWS Session Manager CLI 1.2.339.0 - Azure CLI (azure-devops) 0.25.0 - Azure CLI 2.40.0 -- Bicep CLI 0.10.13 +- Bicep CLI 0.10.61 - Cabal 3.6.2.0 -- Cmake 3.24.1 -- CodeQL Action Bundle 2.10.4 -- Fastlane 2.209.1 +- Cmake 3.24.2 +- CodeQL Action Bundle 2.10.5 +- Fastlane 2.210.0 - GHC 9.4.2 - GHCup 0.1.18.0 - Jazzy 0.14.3 @@ -117,10 +117,10 @@ ### Browsers - Safari 16.0 (17614.1.25.9.10) - SafariDriver 16.0 (17614.1.25.9.10) -- Google Chrome 105.0.5195.102 +- Google Chrome 105.0.5195.125 - ChromeDriver 105.0.5195.52 -- Microsoft Edge 105.0.1343.33 -- Microsoft Edge WebDriver 105.0.1343.34 +- Microsoft Edge 105.0.1343.42 +- Microsoft Edge WebDriver 105.0.1343.42 - Mozilla Firefox 104.0.2 - geckodriver 0.31.0 - Selenium server 4.4.0 @@ -210,7 +210,7 @@ | Version | Build | Path | | -------------- | --------- | ------------------------------------ | | 2019 | 8.10.25.2 | /Applications/Visual Studio 2019.app | -| 2022 (default) | 17.3.4.4 | /Applications/Visual Studio.app | +| 2022 (default) | 17.3.5.0 | /Applications/Visual Studio.app | ##### Notes: ``` @@ -237,74 +237,84 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" - NUnit 3.6.1 ### Xcode -| Version | Build | Path | -| ---------------- | -------- | --------------------------------- | -| 14.0 (beta) | 14A5294g | /Applications/Xcode_14.0_beta.app | -| 14.0 | 14A309 | /Applications/Xcode_14.0.app | -| 13.4.1 (default) | 13F100 | /Applications/Xcode_13.4.1.app | -| 13.4 | 13F17a | /Applications/Xcode_13.4.app | -| 13.3.1 | 13E500a | /Applications/Xcode_13.3.1.app | -| 13.2.1 | 13C100 | /Applications/Xcode_13.2.1.app | -| 13.1 | 13A1030d | /Applications/Xcode_13.1.app | +| Version | Build | Path | +| ---------------- | -------- | ------------------------------ | +| 14.1 (beta) | 14B5024h | /Applications/Xcode_14.1.app | +| 14.0.1 | 14A400 | /Applications/Xcode_14.0.1.app | +| 14.0 | 14A309 | /Applications/Xcode_14.0.app | +| 13.4.1 (default) | 13F100 | /Applications/Xcode_13.4.1.app | +| 13.4 | 13F17a | /Applications/Xcode_13.4.app | +| 13.3.1 | 13E500a | /Applications/Xcode_13.3.1.app | +| 13.2.1 | 13C100 | /Applications/Xcode_13.2.1.app | +| 13.1 | 13A1030d | /Applications/Xcode_13.1.app | #### Xcode Support Tools - xcpretty 0.3.0 - xcversion 2.8.1 #### Installed SDKs -| SDK | SDK Name | Xcode Version | -| ----------------------- | -------------------- | -------------------------- | -| macOS 12.0 | macosx12.0 | 13.1 | -| macOS 12.1 | macosx12.1 | 13.2.1 | -| macOS 12.3 | macosx12.3 | 13.3.1, 13.4, 13.4.1, 14.0 | -| macOS 13.0 | macosx13.0 | 14.0 | -| iOS 15.0 | iphoneos15.0 | 13.1 | -| iOS 15.2 | iphoneos15.2 | 13.2.1 | -| iOS 15.4 | iphoneos15.4 | 13.3.1 | -| iOS 15.5 | iphoneos15.5 | 13.4, 13.4.1 | -| iOS 16.0 | iphoneos16.0 | 14.0, 14.0 | -| Simulator - iOS 15.0 | iphonesimulator15.0 | 13.1 | -| Simulator - iOS 15.2 | iphonesimulator15.2 | 13.2.1 | -| Simulator - iOS 15.4 | iphonesimulator15.4 | 13.3.1 | -| Simulator - iOS 15.5 | iphonesimulator15.5 | 13.4, 13.4.1 | -| Simulator - iOS 16.0 | iphonesimulator16.0 | 14.0, 14.0 | -| tvOS 15.0 | appletvos15.0 | 13.1 | -| tvOS 15.2 | appletvos15.2 | 13.2.1 | -| tvOS 15.4 | appletvos15.4 | 13.3.1, 13.4, 13.4.1 | -| tvOS 16.0 | appletvos16.0 | 14.0, 14.0 | -| Simulator - tvOS 15.0 | appletvsimulator15.0 | 13.1 | -| Simulator - tvOS 15.2 | appletvsimulator15.2 | 13.2.1 | -| Simulator - tvOS 15.4 | appletvsimulator15.4 | 13.3.1, 13.4, 13.4.1 | -| Simulator - tvOS 16.0 | appletvsimulator16.0 | 14.0, 14.0 | -| watchOS 8.0 | watchos8.0 | 13.1 | -| watchOS 8.3 | watchos8.3 | 13.2.1 | -| watchOS 8.5 | watchos8.5 | 13.3.1, 13.4, 13.4.1 | -| watchOS 9.0 | watchos9.0 | 14.0, 14.0 | -| Simulator - watchOS 8.0 | watchsimulator8.0 | 13.1 | -| Simulator - watchOS 8.3 | watchsimulator8.3 | 13.2.1 | -| Simulator - watchOS 8.5 | watchsimulator8.5 | 13.3.1, 13.4, 13.4.1 | -| Simulator - watchOS 9.0 | watchsimulator9.0 | 14.0, 14.0 | -| DriverKit 21.0.1 | driverkit21.0.1 | 13.1 | -| DriverKit 21.2 | driverkit21.2 | 13.2.1 | -| DriverKit 21.4 | driverkit21.4 | 13.3.1, 13.4, 13.4.1, 14.0 | -| DriverKit 22.0 | driverkit22.0 | 14.0 | +| SDK | SDK Name | Xcode Version | +| ----------------------- | -------------------- | ---------------------------------- | +| macOS 12.0 | macosx12.0 | 13.1 | +| macOS 12.1 | macosx12.1 | 13.2.1 | +| macOS 12.3 | macosx12.3 | 13.3.1, 13.4, 13.4.1, 14.0, 14.0.1 | +| macOS 13.0 | macosx13.0 | 14.1 | +| iOS 15.0 | iphoneos15.0 | 13.1 | +| iOS 15.2 | iphoneos15.2 | 13.2.1 | +| iOS 15.4 | iphoneos15.4 | 13.3.1 | +| iOS 15.5 | iphoneos15.5 | 13.4, 13.4.1 | +| iOS 16.0 | iphoneos16.0 | 14.0, 14.0.1 | +| iOS 16.1 | iphoneos16.1 | 14.1 | +| Simulator - iOS 15.0 | iphonesimulator15.0 | 13.1 | +| Simulator - iOS 15.2 | iphonesimulator15.2 | 13.2.1 | +| Simulator - iOS 15.4 | iphonesimulator15.4 | 13.3.1 | +| Simulator - iOS 15.5 | iphonesimulator15.5 | 13.4, 13.4.1 | +| Simulator - iOS 16.0 | iphonesimulator16.0 | 14.0, 14.0.1 | +| Simulator - iOS 16.1 | iphonesimulator16.1 | 14.1 | +| tvOS 15.0 | appletvos15.0 | 13.1 | +| tvOS 15.2 | appletvos15.2 | 13.2.1 | +| tvOS 15.4 | appletvos15.4 | 13.3.1, 13.4, 13.4.1 | +| tvOS 16.0 | appletvos16.0 | 14.0, 14.0.1 | +| tvOS 16.1 | appletvos16.1 | 14.1 | +| Simulator - tvOS 15.0 | appletvsimulator15.0 | 13.1 | +| Simulator - tvOS 15.2 | appletvsimulator15.2 | 13.2.1 | +| Simulator - tvOS 15.4 | appletvsimulator15.4 | 13.3.1, 13.4, 13.4.1 | +| Simulator - tvOS 16.0 | appletvsimulator16.0 | 14.0, 14.0.1 | +| Simulator - tvOS 16.1 | appletvsimulator16.1 | 14.1 | +| watchOS 8.0 | watchos8.0 | 13.1 | +| watchOS 8.3 | watchos8.3 | 13.2.1 | +| watchOS 8.5 | watchos8.5 | 13.3.1, 13.4, 13.4.1 | +| watchOS 9.0 | watchos9.0 | 14.0, 14.0.1 | +| watchOS 9.1 | watchos9.1 | 14.1 | +| Simulator - watchOS 8.0 | watchsimulator8.0 | 13.1 | +| Simulator - watchOS 8.3 | watchsimulator8.3 | 13.2.1 | +| Simulator - watchOS 8.5 | watchsimulator8.5 | 13.3.1, 13.4, 13.4.1 | +| Simulator - watchOS 9.0 | watchsimulator9.0 | 14.0, 14.0.1 | +| Simulator - watchOS 9.1 | watchsimulator9.1 | 14.1 | +| DriverKit 21.0.1 | driverkit21.0.1 | 13.1 | +| DriverKit 21.2 | driverkit21.2 | 13.2.1 | +| DriverKit 21.4 | driverkit21.4 | 13.3.1, 13.4, 13.4.1, 14.0, 14.0.1 | +| DriverKit 22.1 | driverkit22.1 | 14.1 | #### Installed Simulators -| OS | Xcode Version | Simulators | -| ----------- | ---------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| iOS 15.0 | 13.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | -| iOS 15.2 | 13.2.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | -| iOS 15.4 | 13.3.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPhone SE (3rd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | -| iOS 15.5 | 13.4<br>13.4.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPhone SE (3rd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | -| iOS 16.0 | 14.0<br>14.0 | iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPhone SE (3rd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | -| tvOS 15.0 | 13.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | -| tvOS 15.2 | 13.2.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | -| tvOS 15.4 | 13.3.1<br>13.4<br>13.4.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | -| tvOS 16.0 | 13.1<br>13.2.1<br>13.3.1<br>13.4<br>13.4.1<br>14.0<br>14.0 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | -| watchOS 8.0 | 13.1 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | -| watchOS 8.3 | 13.2.1 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | -| watchOS 8.5 | 13.3.1<br>13.4<br>13.4.1 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | -| watchOS 9.0 | 13.1<br>13.2.1<br>13.3.1<br>13.4<br>13.4.1<br>14.0<br>14.0 | Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | +| OS | Xcode Version | Simulators | +| ----------- | -------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| iOS 15.0 | 13.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | +| iOS 15.2 | 13.2.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | +| iOS 15.4 | 13.3.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPhone SE (3rd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | +| iOS 15.5 | 13.4<br>13.4.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPhone SE (3rd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | +| iOS 16.0 | 14.0<br>14.0.1 | iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPhone SE (3rd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | +| iOS 16.1 | 14.1 | iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPhone SE (3rd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | +| tvOS 15.0 | 13.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | +| tvOS 15.2 | 13.2.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | +| tvOS 15.4 | 13.3.1<br>13.4<br>13.4.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | +| tvOS 16.0 | 13.1<br>13.2.1<br>13.3.1<br>13.4<br>13.4.1<br>14.0<br>14.0.1<br>14.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | +| tvOS 16.1 | 13.1<br>13.2.1<br>13.3.1<br>13.4<br>13.4.1<br>14.0<br>14.0.1<br>14.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | +| watchOS 8.0 | 13.1 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | +| watchOS 8.3 | 13.2.1 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | +| watchOS 8.5 | 13.3.1<br>13.4<br>13.4.1 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | +| watchOS 9.0 | 13.1<br>13.2.1<br>13.3.1<br>13.4<br>13.4.1<br>14.0<br>14.0.1<br>14.1 | Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | +| watchOS 9.1 | 13.1<br>13.2.1<br>13.3.1<br>13.4<br>13.4.1<br>14.0<br>14.0.1<br>14.1 | Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | ### Android | Package Name | Version | @@ -335,7 +345,7 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" - libXext 1.3.4 - libXft 2.3.6 - Tcl/Tk 8.6.12_1 -- Zlib 1.2.12 +- Zlib 1.2.12_1 From 43242c8672da4b18bd5f16ddec3f25ead5128624 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 20 Sep 2022 18:59:14 +0000 Subject: [PATCH 1479/3485] Updating readme file for win19 version 20220918.1 (#6261) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2019-Readme.md | 69 ++++++++++++++++---------------- 1 file changed, 35 insertions(+), 34 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index a4763b0da139..88e98ad06981 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -3,8 +3,8 @@ | [[Windows] Docker EE will be replaced with Docker CE / Moby on September, 19](https://github.com/actions/runner-images/issues/6181) | *** # Microsoft Windows Server 2019 Datacenter -- OS Version: 10.0.17763 Build 3287 -- Image Version: 20220911.1 +- OS Version: 10.0.17763 Build 3406 +- Image Version: 20220918.1 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -24,7 +24,7 @@ ### Package Management - Chocolatey 1.1.0 -- Composer 2.4.1 +- Composer 2.4.2 - Helm 3.9.4 - Miniconda 4.12.0 (pre-installed on the image but not added to PATH) - NPM 8.15.0 @@ -32,7 +32,7 @@ - pip 22.2.2 (python 3.7) - Pipx 1.1.0 - RubyGems 2.7.6.3 -- Vcpkg (build from master \<8e3595fad>) +- Vcpkg (build from master \<01b29f6d8>) - Yarn 1.22.19 #### Environment variables @@ -54,22 +54,23 @@ - azcopy 10.16.0 - Bazel 5.3.0 - Bazelisk 1.13.2 -- Bicep 0.10.13 +- Bicep 0.10.61 - Cabal 3.8.1.0 -- CMake 3.24.1 -- CodeQL Action Bundle 2.10.4 -- Docker 20.10.7 +- CMake 3.24.2 +- CodeQL Action Bundle 2.10.5 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.10.2 +- Docker Compose v2 2.11.0 +- Docker master-dockerproject-2022-03-26 - Docker-wincred 0.6.4 - ghc 9.4.2 - Git 2.37.3.windows.1 - Git LFS 3.2.0 -- Google Cloud SDK 401.0.0 +- Google Cloud SDK 402.0.0 +- ImageMagick 7.1.0-48 - InnoSetup 6.2.1 - jq 1.6 - Kind 0.15.0 -- Kubectl 1.25.0 +- Kubectl 1.25.1 - Mercurial 5.0 - Mingw-w64 8.1.0 - Newman 5.3.2 @@ -77,7 +78,7 @@ - OpenSSL 1.1.1 - Packer 1.8.2 - Parcel 2.7.0 -- Pulumi v3.39.3 +- Pulumi v3.40.0 - R 4.2.1 - Service Fabric SDK 9.0.1028.9590 - Stack 2.7.5 @@ -86,12 +87,12 @@ - VSWhere 3.0.3 - WinAppDriver 1.2.2009.02003 - WiX Toolset v3.11.2.4516 -- yamllint 1.27.1 +- yamllint 1.28.0 - zstd 1.5.2 ### CLI Tools - Alibaba Cloud CLI 3.0.125 -- AWS CLI 2.7.31 +- AWS CLI 2.7.33 - AWS SAM CLI 1.56.1 - AWS Session Manager CLI 1.2.339.0 - Azure CLI 2.40.0 @@ -115,10 +116,10 @@ - Rustfmt 1.5.1 ### Browsers and webdrivers -- Google Chrome 105.0.5195.102 +- Google Chrome 105.0.5195.127 - Chrome Driver 105.0.5195.52 -- Microsoft Edge 105.0.1343.33 -- Microsoft Edge Driver 105.0.1343.34 +- Microsoft Edge 105.0.1343.42 +- Microsoft Edge Driver 105.0.1343.42 - Mozilla Firefox 104.0.2 - Gecko Driver 0.31.0 - IE Driver 3.150.1.1 @@ -236,14 +237,14 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Nginx | 1.23.1 | C:\tools\nginx-1.23.1\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2019 -| Name | Version | Path | -| ----------------------------- | --------------- | -------------------------------------------------------------- | -| Visual Studio Enterprise 2019 | 16.11.32802.440 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | +| Name | Version | Path | +| ----------------------------- | -------------- | -------------------------------------------------------------- | +| Visual Studio Enterprise 2019 | 16.11.32901.82 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | #### Workloads, components and extensions: | Package | Version | | ------------------------------------------------------------------------- | --------------- | -| Component.Android.NDK.R16B | 16.11.32802.440 | +| Component.Android.NDK.R16B | 16.11.32830.301 | | Component.Android.SDK25.Private | 16.0.28625.61 | | Component.Android.SDK30 | 16.10.31205.252 | | Component.Ant | 1.9.3.8 | @@ -298,9 +299,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.Net.ComponentGroup.DevelopmentPrerequisites | 16.3.29207.166 | | Microsoft.Net.ComponentGroup.TargetingPacks.Common | 16.0.28516.191 | | Microsoft.NetCore.Component.DevelopmentTools | 16.10.31303.231 | -| Microsoft.NetCore.Component.Runtime.3.1 | 16.11.32802.440 | -| Microsoft.NetCore.Component.Runtime.6.0 | 16.11.32802.440 | -| Microsoft.NetCore.Component.SDK | 16.11.32802.440 | +| Microsoft.NetCore.Component.Runtime.3.1 | 16.11.32901.82 | +| Microsoft.NetCore.Component.Runtime.6.0 | 16.11.32901.82 | +| Microsoft.NetCore.Component.SDK | 16.11.32901.82 | | Microsoft.NetCore.Component.Web | 16.10.31303.231 | | Microsoft.VisualStudio.Component.AppInsights.Tools | 16.5.29515.121 | | Microsoft.VisualStudio.Component.AspNet45 | 16.10.31205.252 | @@ -509,17 +510,17 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### .NET Core SDK `Location C:\Program Files\dotnet\sdk` -- 3.1.120 3.1.202 3.1.302 3.1.422 5.0.104 5.0.214 5.0.303 5.0.408 5.0.411 +- 3.1.120 3.1.202 3.1.302 3.1.423 5.0.104 5.0.214 5.0.303 5.0.408 5.0.412 ### .NET Core Runtime `Location: C:\Program Files\dotnet\shared\Microsoft.AspNetCore.App` -- 3.1.4 3.1.6 3.1.20 3.1.28 5.0.4 5.0.9 5.0.17 6.0.8 +- 3.1.4 3.1.6 3.1.20 3.1.29 5.0.4 5.0.9 5.0.17 6.0.9 `Location: C:\Program Files\dotnet\shared\Microsoft.NETCore.App` -- 3.1.4 3.1.6 3.1.20 3.1.28 5.0.4 5.0.9 5.0.17 6.0.8 +- 3.1.4 3.1.6 3.1.20 3.1.29 5.0.4 5.0.9 5.0.17 6.0.9 `Location: C:\Program Files\dotnet\shared\Microsoft.WindowsDesktop.App` -- 3.1.4 3.1.6 3.1.20 3.1.28 5.0.4 5.0.9 5.0.17 6.0.8 +- 3.1.4 3.1.6 3.1.20 3.1.29 5.0.4 5.0.9 5.0.17 6.0.9 ### .NET Framework `Type: Developer Pack` @@ -548,7 +549,7 @@ All other versions are saved but not installed. #### Powershell Modules | Module | Version | | ------------------ | ---------------- | -| AWSPowerShell | 4.1.165 | +| AWSPowerShell | 4.1.170 | | DockerMsftProvider | 1.0.0.8 | | MarkdownPS | 1.9 | | Microsoft.Graph | 1.11.1 | @@ -588,10 +589,10 @@ All other versions are saved but not installed. ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:535e4f014434679c9d0257326214cb642c2bff9e57533ed911ffddc32ee3f9ee | 2022-08-09 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:30bd60e9e35abe424abaec9d802c1a38c8519496dca789333632357b98e33fad | 2022-08-09 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:c23dbc9c62503882128ca76917c074bf9f84a490195d76ef0f45a49091fca399 | 2022-08-09 | -| mcr.microsoft.com/windows/nanoserver:1809 | sha256:c827903a303cb7a76214adb4376e462a241b3cd763cb88655cd901c5a0e867a0 | 2022-08-06 | -| mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:8ca3aaeb91e7715a98a0769dc62ed69212aac3e0bbee12ffd13b5e36d992d127 | 2022-08-06 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:7501f0b0b539d4a4d2da522e9981fd72bda1fa420cd95e69e1da7f9f8e407219 | 2022-09-13 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:18d9698bb0b80472d8993fc1fbd08e102982934ba80b19eef4a869537b83251d | 2022-09-13 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:9d1fde4186c74ad261923c583ddb6102e940cbb3929ce1d1bc0d245e745d61a3 | 2022-09-13 | +| mcr.microsoft.com/windows/nanoserver:1809 | sha256:92455b285ba046b1aecfd9ab598023c31bbea59149fcb7c02e4427abcbf44d37 | 2022-09-09 | +| mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:7450aeee8739b486e1493c44014e9c211cea8391aae7ec25416584b8f4301938 | 2022-09-09 | From 4369f2be152375f0fc989edc3641f8e4e024f9d3 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 21 Sep 2022 03:01:01 +0000 Subject: [PATCH 1480/3485] Updating readme file for win22 version 20220919.1 (#6271) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2022-Readme.md | 89 +++++++++++++++++--------------- 1 file changed, 46 insertions(+), 43 deletions(-) diff --git a/images/win/Windows2022-Readme.md b/images/win/Windows2022-Readme.md index 5ddaff630f89..643386cf8115 100644 --- a/images/win/Windows2022-Readme.md +++ b/images/win/Windows2022-Readme.md @@ -3,8 +3,8 @@ | [[Windows] Docker EE will be replaced with Docker CE / Moby on September, 19](https://github.com/actions/runner-images/issues/6181) | *** # Microsoft Windows Server 2022 Datacenter -- OS Version: 10.0.20348 Build 887 -- Image Version: 20220911.1 +- OS Version: 10.0.20348 Build 1006 +- Image Version: 20220919.1 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -24,7 +24,7 @@ ### Package Management - Chocolatey 1.1.0 -- Composer 2.4.1 +- Composer 2.4.2 - Helm 3.9.4 - Miniconda 4.12.0 (pre-installed on the image but not added to PATH) - NPM 8.15.0 @@ -32,7 +32,7 @@ - pip 22.2.2 (python 3.9) - Pipx 1.1.0 - RubyGems 3.2.33 -- Vcpkg (build from master \<8e3595fad>) +- Vcpkg (build from master \<4340582bc>) - Yarn 1.22.19 #### Environment variables @@ -43,7 +43,7 @@ ### Project Management - Ant 1.10.12 -- Gradle 7.4 +- Gradle 7.5 - Maven 3.8.6 - sbt 1.7.1 @@ -51,45 +51,46 @@ - 7zip 22.01 - aria2 1.36.0 - azcopy 10.16.0 -- Bazel 5.3.0 +- Bazel 5.3.1 - Bazelisk 1.13.2 -- Bicep 0.10.13 +- Bicep 0.10.61 - Cabal 3.8.1.0 -- CMake 3.24.1 -- CodeQL Action Bundle 2.10.4 -- Docker 20.10.7 +- CMake 3.24.2 +- CodeQL Action Bundle 2.10.5 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.10.2 +- Docker Compose v2 2.11.0 +- Docker master-dockerproject-2022-03-26 - Docker-wincred 0.6.4 - ghc 9.4.2 - Git 2.37.3.windows.1 - Git LFS 3.2.0 +- ImageMagick 7.1.0-48 - InnoSetup 6.2.1 - jq 1.6 - Kind 0.15.0 -- Kubectl 1.25.0 +- Kubectl 1.25.1 - Mercurial 5.0 - Mingw-w64 11.2.0 - Newman 5.3.2 - NSIS v3.08 - OpenSSL 1.1.1 - Packer 1.8.2 -- Pulumi v3.39.3 +- Pulumi v3.40.1 - R 4.2.1 - Service Fabric SDK 9.0.1028.9590 -- Stack 2.7.5 +- Stack 2.9.1 - Subversion (SVN) 1.14.2 - Swig 4.0.2 - VSWhere 3.0.3 - WinAppDriver 1.2.2009.02003 - WiX Toolset v3.11.2.4516 -- yamllint 1.27.1 +- yamllint 1.28.0 - zstd 1.5.2 ### CLI Tools - Alibaba Cloud CLI 3.0.125 -- AWS CLI 2.7.31 -- AWS SAM CLI 1.56.1 +- AWS CLI 2.7.33 +- AWS SAM CLI 1.57.0 - AWS Session Manager CLI 1.2.339.0 - Azure CLI 2.40.0 - Azure DevOps CLI extension 0.25.0 @@ -111,10 +112,10 @@ - Rustfmt 1.5.1 ### Browsers and webdrivers -- Google Chrome 105.0.5195.102 +- Google Chrome 105.0.5195.127 - Chrome Driver 105.0.5195.52 -- Microsoft Edge 105.0.1343.33 -- Microsoft Edge Driver 105.0.1343.34 +- Microsoft Edge 105.0.1343.42 +- Microsoft Edge Driver 105.0.1343.42 - Mozilla Firefox 104.0.2 - Gecko Driver 0.31.0 - IE Driver 3.150.1.1 @@ -224,7 +225,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Visual Studio Enterprise 2022 | Name | Version | Path | | ----------------------------- | -------------- | -------------------------------------------------------- | -| Visual Studio Enterprise 2022 | 17.3.32825.248 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | +| Visual Studio Enterprise 2022 | 17.3.32901.215 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | #### Workloads, components and extensions: | Package | Version | @@ -287,15 +288,15 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.Net.ComponentGroup.4.8.DeveloperTools | 17.3.32708.82 | | Microsoft.Net.ComponentGroup.DevelopmentPrerequisites | 17.3.32708.82 | | Microsoft.Net.ComponentGroup.TargetingPacks.Common | 17.3.32708.82 | -| microsoft.net.runtime.android | 6.0.822.36306 | -| microsoft.net.runtime.android.aot | 6.0.822.36306 | -| microsoft.net.runtime.ios | 6.0.822.36306 | -| microsoft.net.runtime.maccatalyst | 6.0.822.36306 | -| microsoft.net.runtime.mono.tooling | 6.0.822.36306 | -| microsoft.net.sdk.emscripten | 6.0.6.16102 | +| microsoft.net.runtime.android | 6.0.922.41905 | +| microsoft.net.runtime.android.aot | 6.0.922.41905 | +| microsoft.net.runtime.ios | 6.0.922.41905 | +| microsoft.net.runtime.maccatalyst | 6.0.922.41905 | +| microsoft.net.runtime.mono.tooling | 6.0.922.41905 | +| microsoft.net.sdk.emscripten | 6.0.6.41805 | | Microsoft.NetCore.Component.DevelopmentTools | 17.3.32708.82 | -| Microsoft.NetCore.Component.Runtime.6.0 | 17.3.32803.143 | -| Microsoft.NetCore.Component.SDK | 17.3.32803.143 | +| Microsoft.NetCore.Component.Runtime.6.0 | 17.3.32901.90 | +| Microsoft.NetCore.Component.SDK | 17.3.32901.90 | | Microsoft.NetCore.Component.Web | 17.3.32708.82 | | Microsoft.VisualStudio.Component.AppInsights.Tools | 17.3.32708.82 | | Microsoft.VisualStudio.Component.AspNet | 17.3.32708.82 | @@ -440,7 +441,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Component.VC.v141.MFC.Spectre | 17.3.32708.82 | | Microsoft.VisualStudio.Component.VC.v141.x86.x64 | 17.3.32708.82 | | Microsoft.VisualStudio.Component.VC.v141.x86.x64.Spectre | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.VSSDK | 17.3.32708.82 | +| Microsoft.VisualStudio.Component.VSSDK | 17.3.32901.149 | | Microsoft.VisualStudio.Component.Wcf.Tooling | 17.3.32708.82 | | Microsoft.VisualStudio.Component.Web | 17.3.32708.82 | | Microsoft.VisualStudio.Component.WebDeploy | 17.3.32708.82 | @@ -494,9 +495,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Workload.Python | 17.3.32708.82 | | Microsoft.VisualStudio.Workload.Universal | 17.3.32708.82 | | Microsoft.VisualStudio.Workload.VisualStudioExtension | 17.3.32708.82 | -| runtimes.ios | 6.0.822.36306 | -| runtimes.maccatalyst | 6.0.822.36306 | -| wasm.tools | 6.0.822.36306 | +| runtimes.ios | 6.0.922.41905 | +| runtimes.maccatalyst | 6.0.922.41905 | +| wasm.tools | 6.0.922.41905 | | ProBITools.MicrosoftAnalysisServicesModelingProjects2022 | 3.0.4 | | ProBITools.MicrosoftReportProjectsforVisualStudio2022 | 3.0.1 | | VisualStudioClient.MicrosoftVisualStudio2022InstallerProjects | 2.0.0 | @@ -508,6 +509,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Microsoft Visual C++: | Name | Architecture | Version | | -------------------------------------------- | ------------ | ----------- | +| Microsoft Visual C++ 2010 Redistributable | x64 | 10.0.40219 | +| Microsoft Visual C++ 2010 Redistributable | x86 | 10.0.40219 | | Microsoft Visual C++ 2012 Additional Runtime | x64 | 11.0.61030 | | Microsoft Visual C++ 2012 Minimum Runtime | x64 | 11.0.61030 | | Microsoft Visual C++ 2013 Additional Runtime | x64 | 12.0.40660 | @@ -529,17 +532,17 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### .NET Core SDK `Location C:\Program Files\dotnet\sdk` -- 3.1.120 3.1.202 3.1.302 3.1.422 5.0.104 5.0.214 5.0.303 5.0.408 6.0.400 +- 3.1.120 3.1.202 3.1.302 3.1.423 5.0.104 5.0.214 5.0.303 5.0.408 6.0.401 ### .NET Core Runtime `Location: C:\Program Files\dotnet\shared\Microsoft.AspNetCore.App` -- 3.1.4 3.1.6 3.1.20 3.1.28 5.0.4 5.0.9 5.0.17 6.0.8 +- 3.1.4 3.1.6 3.1.20 3.1.29 5.0.4 5.0.9 5.0.17 6.0.9 `Location: C:\Program Files\dotnet\shared\Microsoft.NETCore.App` -- 3.1.4 3.1.6 3.1.20 3.1.28 5.0.4 5.0.9 5.0.17 6.0.8 +- 3.1.4 3.1.6 3.1.20 3.1.29 5.0.4 5.0.9 5.0.17 6.0.9 `Location: C:\Program Files\dotnet\shared\Microsoft.WindowsDesktop.App` -- 3.1.4 3.1.6 3.1.20 3.1.28 5.0.4 5.0.9 5.0.17 6.0.8 +- 3.1.4 3.1.6 3.1.20 3.1.29 5.0.4 5.0.9 5.0.17 6.0.9 ### .NET Framework `Type: Developer Pack` @@ -568,7 +571,7 @@ All other versions are saved but not installed. #### Powershell Modules | Module | Version | | ------------------ | ---------------- | -| AWSPowerShell | 4.1.165 | +| AWSPowerShell | 4.1.170 | | DockerMsftProvider | 1.0.0.8 | | MarkdownPS | 1.9 | | Microsoft.Graph | 1.11.1 | @@ -607,10 +610,10 @@ All other versions are saved but not installed. ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2022 | sha256:22486118e240e0f107ada5fac9f0fbdacb02e8b18f65b48552a0c0b0960a9002 | 2022-08-09 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2022 | sha256:2117f997785dbd6e3a42b22261434dc8b0d082ed634a4edda9d1acd71b174187 | 2022-08-09 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:edc6558e8cd6f306854517048ef11a05129d3097f1e9f61b48c906ddc0d478cc | 2022-08-09 | -| mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:5f57ddc9a47d079398506a7613c8a3cb8b5bf3f97040f590871b61a15bd5a36a | 2022-08-06 | -| mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:35c3cb29ef2c9f05e36070d04c79d7fc861c035fa5df2df64ae607a276db42c6 | 2022-08-06 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2022 | sha256:545fd83fdb5ecbbc60fbcb86e16947e95f53739cae0715c191da58f12b5ae9c9 | 2022-09-13 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2022 | sha256:c763de073f4631d5e8511c4dd05fbf73cf6d91aef3313658ac3a87bc64626c3c | 2022-09-13 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:0fc848adcb5dae2b733bb39b2a0485c5a08f8c338309b48d85cfe0909492874f | 2022-09-13 | +| mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:ac76db222126ed259f8ac1ed42e7e4564509ea869ae535e3faae866c01cd7755 | 2022-09-08 | +| mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:2846453bcfaee661d563e29d6513191dccf7280bb826b2da9d6e7226fba2db94 | 2022-09-08 | From 4a83f39eb596361b9aa556322ac52bd9e8c09029 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Wed, 21 Sep 2022 10:44:01 +0200 Subject: [PATCH 1481/3485] [Ubuntu] remove gfortran symlink from brew (#6276) --- images/linux/scripts/installers/homebrew.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/images/linux/scripts/installers/homebrew.sh b/images/linux/scripts/installers/homebrew.sh index 1396b60c95c3..c37d3876bc45 100644 --- a/images/linux/scripts/installers/homebrew.sh +++ b/images/linux/scripts/installers/homebrew.sh @@ -43,4 +43,10 @@ for package in $brew_packages; do fi done +gfortran=$(brew --prefix)/bin/gfortran +# Remove gfortran symlink, not to conflict with system gfortran +if [[ -e $gfortran ]]; then + rm $gfortran +fi + invoke_tests "Tools" "Homebrew" From 90eed8c8ef819384a32ac226584a9d7f244dd6c8 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 21 Sep 2022 10:02:49 +0000 Subject: [PATCH 1482/3485] Updating readme file for macOS-11 version 20220918.1 (#6268) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-11-Readme.md | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/images/macos/macos-11-Readme.md b/images/macos/macos-11-Readme.md index 13fa0484c3bb..d08f56339f79 100644 --- a/images/macos/macos-11-Readme.md +++ b/images/macos/macos-11-Readme.md @@ -1,16 +1,16 @@ | Announcements | |-| -| [[macOS] Default Xcode on macOS 12 Monterey will be set to Xcode 14.0 on September, 26](https://github.com/actions/runner-images/issues/6225) | +| [[macOS] Default Xcode on macOS 12 Monterey will be set to Xcode 14.0.1 on September, 26](https://github.com/actions/runner-images/issues/6225) | | [The macOS 10.15 Actions runner image will begin deprecation on 5/31/22 and will be fully unsupported by 12/1/22 for GitHub and ADO](https://github.com/actions/runner-images/issues/5583) | *** # macOS 11.7 info - System Version: macOS 11.7 (20G817) - Kernel Version: Darwin 20.6.0 -- Image Version: 20220912.1 +- Image Version: 20220918.1 ## Installed Software ### Language and Runtime -- .NET SDK 3.1.101 3.1.201 3.1.302 3.1.422 5.0.102 5.0.202 5.0.302 5.0.408 6.0.400 +- .NET SDK 3.1.101 3.1.201 3.1.302 3.1.423 5.0.102 5.0.202 5.0.302 5.0.408 6.0.401 - Bash 3.2.57(1)-release - Clang/LLVM 13.0.0 is default - Clang/LLVM 14.0.6 is available on `'$(brew --prefix llvm@14)/bin/clang'` @@ -38,7 +38,7 @@ - Bundler version 2.3.22 - Carthage 0.38.0 - CocoaPods 1.11.3 -- Composer 2.4.1 +- Composer 2.4.2 - Homebrew 3.6.1 - Miniconda 4.12.0 - NPM 8.15.0 @@ -47,7 +47,7 @@ - Pip 22.2.2 (python 3.10) - Pipx 1.1.0 - RubyGems 3.3.22 -- Vcpkg 2022 (build from master \<23905f6f8>) +- Vcpkg 2022 (build from master \<01b29f6d8>) - Yarn 1.22.19 #### Environment variables @@ -79,7 +79,7 @@ - gpg (GnuPG) 2.3.7 - helm v3.9.4+gdbc6d8e - Hub CLI: 2.14.2 -- ImageMagick 7.1.0-47 +- ImageMagick 7.1.0-48 - jq 1.6 - mongo v5.0.11 - mongod v5.0.11 @@ -97,16 +97,16 @@ ### Tools - Aliyun CLI 3.0.125 - App Center CLI 2.11.0 -- AWS CLI 2.7.31 +- AWS CLI 2.7.33 - AWS SAM CLI 1.56.1 - AWS Session Manager CLI 1.2.339.0 - Azure CLI (azure-devops) 0.25.0 - Azure CLI 2.40.0 -- Bicep CLI 0.10.13 +- Bicep CLI 0.10.61 - Cabal 3.6.2.0 -- Cmake 3.24.1 -- CodeQL Action Bundle 2.10.4 -- Fastlane 2.209.1 +- Cmake 3.24.2 +- CodeQL Action Bundle 2.10.5 +- Fastlane 2.210.0 - GHC 9.4.2 - GHCup 0.1.18.0 - Jazzy 0.14.3 @@ -122,10 +122,10 @@ ### Browsers - Safari 16.0 (16614.1.25.9.10) - SafariDriver 16.0 (16614.1.25.9.10) -- Google Chrome 105.0.5195.102 +- Google Chrome 105.0.5195.125 - ChromeDriver 105.0.5195.52 -- Microsoft Edge 105.0.1343.33 -- Microsoft Edge WebDriver 105.0.1343.34 +- Microsoft Edge 105.0.1343.42 +- Microsoft Edge WebDriver 105.0.1343.42 - Mozilla Firefox 104.0.2 - geckodriver 0.31.0 - Selenium server 4.4.0 @@ -218,7 +218,7 @@ | Version | Build | Path | | -------------- | --------- | ------------------------------------ | | 2019 | 8.10.25.2 | /Applications/Visual Studio 2019.app | -| 2022 (default) | 17.3.4.4 | /Applications/Visual Studio.app | +| 2022 (default) | 17.3.5.0 | /Applications/Visual Studio.app | ##### Notes: ``` @@ -359,7 +359,7 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" - libXext 1.3.4 - libXft 2.3.6 - Tcl/Tk 8.6.12_1 -- Zlib 1.2.12 +- Zlib 1.2.12_1 From e89b790394df30e869df07df7e8c4628c0838aab Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 21 Sep 2022 10:22:07 +0000 Subject: [PATCH 1483/3485] Updating readme file for ubuntu22 version 20220919.1 (#6266) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2204-Readme.md | 66 +++++++++++++++---------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/images/linux/Ubuntu2204-Readme.md b/images/linux/Ubuntu2204-Readme.md index a2b61cb75f6d..cd657cbfee06 100644 --- a/images/linux/Ubuntu2204-Readme.md +++ b/images/linux/Ubuntu2204-Readme.md @@ -4,7 +4,7 @@ *** # Ubuntu 22.04.1 LTS - Linux kernel version: 5.15.0-1019-azure -- Image Version: 20220912.1 +- Image Version: 20220919.1 ## Installed Software ### Language and Runtime @@ -28,7 +28,7 @@ ### Package Management - cpan 1.64 - Helm 3.9.4 -- Homebrew 3.6.1 +- Homebrew 3.6.2 - Miniconda 4.12.0 - Npm 8.15.0 - NuGet 6.2.1.2 @@ -36,7 +36,7 @@ - Pip3 22.0.2 - Pipx 1.1.0 - RubyGems 3.3.5 -- Vcpkg (build from master \<23905f6f8>) +- Vcpkg (build from master \<4340582bc>) - Yarn 1.22.19 #### Environment variables @@ -53,32 +53,32 @@ - Ansible 2.13.4 - apt-fast 1.9.12 - AzCopy 10.16.0 (available by `azcopy` and `azcopy10` aliases) -- Bazel 5.3.0 +- Bazel 5.3.1 - Bazelisk 1.13.2 -- Bicep 0.10.13 +- Bicep 0.10.61 - Buildah 1.23.1 -- CMake 3.24.1 -- CodeQL Action Bundle 2.10.4 +- CMake 3.24.2 +- CodeQL Action Bundle 2.10.5 - Docker Amazon ECR Credential Helper 0.6.0 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.10.2+azure-1 +- Docker Compose v2 2.11.0+azure-1 - Docker-Buildx 0.9.1 -- Docker-Moby Client 20.10.17+azure-1 -- Docker-Moby Server 20.10.17+azure-3 -- Fastlane 2.209.1 +- Docker-Moby Client 20.10.18+azure-1 +- Docker-Moby Server 20.10.18+azure-1 +- Fastlane 2.210.0 - Git 2.37.3 (apt source repository: ppa:git-core/ppa) - Git LFS 3.2.0 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.6.0 - Haveged 1.9.14 -- Heroku 7.63.0 +- Heroku 7.63.4 - jq 1.6 - Kind 0.15.0 -- Kubectl 1.25.0 +- Kubectl 1.25.1 - Kustomize 4.5.7 - Leiningen 2.9.10 - MediaInfo 21.09 - Mercurial 6.1.1 -- Minikube 1.26.1 +- Minikube 1.27.0 - n 9.0.0 - Newman 5.3.2 - nvm 0.39.1 @@ -86,7 +86,7 @@ - Packer 1.8.3 - Parcel 2.7.0 - Podman 3.4.4 -- Pulumi 3.39.3 +- Pulumi 3.40.0 - R 4.2.1 - Skopeo 1.4.1 - Sphinx Open Source Search Server 2.2.11 @@ -98,18 +98,18 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.125 -- AWS CLI 2.7.31 +- AWS CLI 2.7.33 - AWS CLI Session manager plugin 1.2.339.0 -- AWS SAM CLI 1.56.1 +- AWS SAM CLI 1.57.0 - Azure CLI (azure-cli) 2.40.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.25.0 - GitHub CLI 2.15.0 -- Google Cloud SDK 401.0.0 (apt source repository: https://packages.cloud.google.com/apt) +- Google Cloud SDK 402.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 11.7.1 +- Netlify CLI 11.8.0 - OpenShift CLI 4.11.4 - ORAS CLI 0.14.1 -- Vercel CLI 28.2.5 +- Vercel CLI 28.3.0 ### Java | Version | Vendor | Environment Variable | @@ -126,8 +126,8 @@ ### PHP | Tool | Version | | -------- | ------- | -| PHP | 8.1.9 | -| Composer | 2.4.1 | +| PHP | 8.1.10 | +| Composer | 2.4.2 | | PHPUnit | 8.5.29 | ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. @@ -136,7 +136,7 @@ - Cabal 3.6.2.0 - GHC 9.4.2 - GHCup 0.1.18.0 -- Stack 2.7.5 +- Stack 2.9.1 ### Rust Tools - Cargo 1.63.0 @@ -153,11 +153,11 @@ - Rustfmt 1.5.1 ### Browsers and Drivers -- Google Chrome 105.0.5195.102 +- Google Chrome 105.0.5195.125 - ChromeDriver 105.0.5195.52 - Chromium 105.0.5177.0 -- Microsoft Edge 105.0.1343.33 (apt source repository: https://packages.microsoft.com/repos/edge) -- Microsoft Edge WebDriver 105.0.1343.34 +- Microsoft Edge 105.0.1343.42 (apt source repository: https://packages.microsoft.com/repos/edge) +- Microsoft Edge WebDriver 105.0.1343.42 - Selenium server 4.4.0 #### Environment variables @@ -169,7 +169,7 @@ | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | ### .NET Core SDK -- 6.0.400 +- 6.0.401 ### .NET tools - nbgv 3.5.109+bdfbd7dea6 @@ -277,14 +277,14 @@ | ----------------------- | ------------------------------------------------------------------------ | ---------- | | alpine:3.14 | sha256:1ab24b3b99320975cca71716a7475a65d263d0b6b604d9d14ce08f7a3f67595c | 2022-08-09 | | alpine:3.15 | sha256:69463fdff1f025c908939e86d4714b4d5518776954ca627cbeff4c74bcea5b22 | 2022-08-09 | -| buildpack-deps:bullseye | sha256:872ba70b0805b817db42d9ea75f066b5fe2be82d04d0dab69e41810edd9aa3f9 | 2022-08-23 | -| buildpack-deps:buster | sha256:d73ba7863f3958cade1ef32f7620c3751ba5cd9653ff382a1b222ec17906884e | 2022-08-23 | -| debian:10 | sha256:fa8155031d12cd165c237e0b38688cade32912e990ffe21f9e31968d9a04da38 | 2022-08-23 | -| debian:11 | sha256:d52921d97310d0bd48dab928548ef539d5c88c743165754c57cfad003031386c | 2022-08-23 | +| buildpack-deps:bullseye | sha256:19683807e2587d777766573697f9488b0c88677ee06313e69197fbaa42e80319 | 2022-09-13 | +| buildpack-deps:buster | sha256:caa4ae706b59e2ca4b7786a44a08617447f81b516507a70a4ca43665b479c4e3 | 2022-09-13 | +| debian:10 | sha256:2f35b84014a5389e2a940113c51586bc067a05040ba181dee92c5a9fa9b15dcb | 2022-09-13 | +| debian:11 | sha256:3e82b1af33607aebaeb3641b75d6e80fd28d36e17993ef13708e9493e30e8ff9 | 2022-09-13 | | moby/buildkit:latest | sha256:67c9251f9f2e103e1ee489b6cead518b6d82607ef485d3f1505fc4095a55ebeb | 2022-08-22 | -| node:14 | sha256:48ad857f33fb03f542133b1e0d3524b1fcf596fce29e212cd9b7abd22d3d9188 | 2022-08-23 | +| node:14 | sha256:6adfb0c2a9db12a06893974bb140493a7482e2b3df59c058590594ceecd0c99b | 2022-09-13 | | node:14-alpine | sha256:4aff4ba0da347e51561587eba037a38db4eaa70e1a6c8334d66779fe963d5be7 | 2022-08-09 | -| node:16 | sha256:0c672d547405fe64808ea28b49c5772b1026f81b3b716ff44c10c96abf177d6a | 2022-08-23 | +| node:16 | sha256:a5d9200d3b8c17f0f3d7717034a9c215015b7aae70cb2a9d5e5dae7ff8aa6ca8 | 2022-09-13 | | node:16-alpine | sha256:2c405ed42fc0fd6aacbe5730042640450e5ec030bada7617beac88f742b6997b | 2022-08-16 | | ubuntu:18.04 | sha256:6fec50623d6d37b7f3c14c5b6fc36c73fd04aa8173d59d54dba00da0e7ac50ee | 2022-09-06 | | ubuntu:20.04 | sha256:35ab2bf57814e9ff49e365efd5a5935b6915eede5c7f8581e9e1b85e0eecbe16 | 2022-09-01 | From 641fd77b4edf1a480e747ed3a242d02acbceaf98 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Thu, 22 Sep 2022 18:25:13 +0300 Subject: [PATCH 1484/3485] Set Xcode 14.0.1 as the default version (#6272) --- images/macos/toolsets/toolset-12.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index 011764be8d4c..4d41f9cc9829 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -1,6 +1,6 @@ { "xcode": { - "default": "13.4.1", + "default": "14.0.1", "versions": [ { "link": "14.1", "version": "14.1.0"}, { "link": "14.0.1", "version": "14.0.1" }, From 9efcd841b9a4de637c5af70e800fdac2d0f10976 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Thu, 22 Sep 2022 18:07:12 +0200 Subject: [PATCH 1485/3485] [Ubuntu] do not add homebrew to $PATH (#6240) --- .../SoftwareReport/SoftwareReport.Common.psm1 | 2 +- .../SoftwareReport/SoftwareReport.Generator.ps1 | 12 ++++++++++++ images/linux/scripts/installers/homebrew.sh | 12 ++++-------- images/linux/scripts/tests/Tools.Tests.ps1 | 4 ++-- 4 files changed, 19 insertions(+), 11 deletions(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 index eb634bb93161..773442105131 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 @@ -149,7 +149,7 @@ function Get-LernaVersion { } function Get-HomebrewVersion { - $result = Get-CommandResult "brew -v" + $result = Get-CommandResult "/home/linuxbrew/.linuxbrew/bin/brew -v" $result.Output -match "Homebrew (?<version>\d+\.\d+\.\d+)" | Out-Null $version = $Matches.version return "Homebrew $version" diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index 7a7fad07b2ed..872868170c12 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -84,6 +84,18 @@ $packageManagementList = @( ) $markdown += New-MDList -Style Unordered -Lines ($packageManagementList | Sort-Object) + +$markdown += New-MDHeader "Notes:" -Level 5 +$reportHomebrew = @' +``` +Location: /home/linuxbrew +Note: Homebrew is pre-installed on image but not added to PATH. +run the eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv) command +to accomplish this. +``` +'@ +$markdown += New-MDParagraph -Lines $reportHomebrew + $markdown += New-MDHeader "Environment variables" -Level 4 $markdown += Build-PackageManagementEnvironmentTable | New-MDTable $markdown += New-MDNewLine diff --git a/images/linux/scripts/installers/homebrew.sh b/images/linux/scripts/installers/homebrew.sh index c37d3876bc45..1b4cbd21cb2d 100644 --- a/images/linux/scripts/installers/homebrew.sh +++ b/images/linux/scripts/installers/homebrew.sh @@ -11,14 +11,10 @@ source $HELPER_SCRIPTS/install.sh # Install the Homebrew on Linux /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)" -brew_shellenv="/home/linuxbrew/.linuxbrew/bin/brew shellenv" - -# Update /etc/environment -## Put HOMEBREW_* variables. -$brew_shellenv | grep 'export HOMEBREW' | sed -E 's/^export (.*);$/\1/' | tr -d '"' | sudo tee -a /etc/environment -# add brew executables locations to PATH -brew_path=$($brew_shellenv | grep '^export PATH' | sed -E 's/^export PATH="([^$]+)\$.*/\1/') -prependEtcEnvironmentPath "$brew_path" + +# Invoke shellenv to make brew available during runnig session +eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)" + setEtcEnvironmentVariable HOMEBREW_NO_AUTO_UPDATE 1 setEtcEnvironmentVariable HOMEBREW_CLEANUP_PERIODIC_FULL_DAYS 3650 diff --git a/images/linux/scripts/tests/Tools.Tests.ps1 b/images/linux/scripts/tests/Tools.Tests.ps1 index 5d7c5a85448c..5e39bc871737 100644 --- a/images/linux/scripts/tests/Tools.Tests.ps1 +++ b/images/linux/scripts/tests/Tools.Tests.ps1 @@ -261,7 +261,7 @@ Describe "Homebrew" { $testCases = $brewToolset | ForEach-Object { @{brewName = $_.name; brewCommand = $_.command} } It "homebrew" { - "brew --version" | Should -ReturnZeroExitCode + "/home/linuxbrew/.linuxbrew/bin/brew --version" | Should -ReturnZeroExitCode } It "zstd has /usr/local/bin symlink" { @@ -269,7 +269,7 @@ Describe "Homebrew" { } It "homebrew package <brewName>" -TestCases $testCases { - $brewPrefix = brew --prefix $brewName + $brewPrefix = /home/linuxbrew/.linuxbrew/bin/brew --prefix $brewName $brewPackage = Join-Path $brewPrefix "bin" $brewCommand "$brewPackage --version" | Should -ReturnZeroExitCode From dc7240348ec20409c95a690d97e419fc343076d9 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Fri, 23 Sep 2022 09:50:33 +0200 Subject: [PATCH 1486/3485] [Ubuntu] fix sw generator for homebrew (#6288) --- .../linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index 872868170c12..c66bcdebb580 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -90,7 +90,7 @@ $reportHomebrew = @' ``` Location: /home/linuxbrew Note: Homebrew is pre-installed on image but not added to PATH. -run the eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv) command +run the eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)" command to accomplish this. ``` '@ From f412cb04d7697bd8615ecaa2482392883d58c890 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Sat, 24 Sep 2022 16:09:06 +0200 Subject: [PATCH 1487/3485] [Windows] Add docker symlink (#6287) --- images/win/scripts/Installers/Install-Docker.ps1 | 10 +++++++--- .../scripts/SoftwareReport/SoftwareReport.Tools.psm1 | 2 +- images/win/scripts/Tests/Docker.Tests.ps1 | 4 ++++ 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/images/win/scripts/Installers/Install-Docker.ps1 b/images/win/scripts/Installers/Install-Docker.ps1 index 71dbd6cf41c9..28efff98da85 100644 --- a/images/win/scripts/Installers/Install-Docker.ps1 +++ b/images/win/scripts/Installers/Install-Docker.ps1 @@ -10,6 +10,11 @@ $instScriptUrl = "https://raw.githubusercontent.com/microsoft/Windows-Containers $instScriptPath = Start-DownloadWithRetry -Url $instScriptUrl -Name "install-docker-ce.ps1" & $instScriptPath +# Fix AZ CLI DOCKER_COMMAND_ERROR +# cli.azure.cli.command_modules.acr.custom: Could not run 'docker.exe' command. +# https://github.com/Azure/azure-cli/issues/18766 +New-Item -ItemType SymbolicLink -Path "C:\Windows\SysWOW64\docker.exe" -Target "C:\Windows\System32\docker.exe" + Write-Host "Install-Package Docker-Compose v1" Choco-Install -PackageName docker-compose @@ -21,9 +26,8 @@ Start-DownloadWithRetry -Url $dockerComposev2Url -Name docker-compose.exe -Downl Write-Host "Install docker-wincred" $dockerCredLatestRelease = Invoke-RestMethod -Uri "https://api.github.com/repos/docker/docker-credential-helpers/releases/latest" -$dockerCredDownloadUrl = $dockerCredLatestRelease.assets.browser_download_url -match "docker-credential-wincred-.+\.zip" | Select-Object -First 1 -$dockerCredArchive = Start-DownloadWithRetry -Url $dockerCredDownloadUrl -Expand-Archive -Path $dockerCredArchive -DestinationPath "C:\Windows\System32" +$dockerCredDownloadUrl = $dockerCredLatestRelease.assets.browser_download_url -match "docker-credential-wincred-.+\.exe" | Select-Object -First 1 +Start-DownloadWithRetry -Url $dockerCredDownloadUrl -DownloadPath "C:\Windows\System32" -Name "docker-credential-wincred.exe" Write-Host "Download docker images" $dockerImages = (Get-ToolsetContent).docker.images diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 index 1f553d110ed8..30c5e495cea8 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 @@ -66,7 +66,7 @@ function Get-DockerComposeVersionV2 { } function Get-DockerWincredVersion { - $dockerCredVersion = $(docker-credential-wincred version) + $dockerCredVersion = docker-credential-wincred version | Take-Part -Part 2 | Take-Part -Part 0 -Delimiter "v" return "Docker-wincred $dockerCredVersion" } diff --git a/images/win/scripts/Tests/Docker.Tests.ps1 b/images/win/scripts/Tests/Docker.Tests.ps1 index 4e6a27cdee0e..4b4b2a36dde0 100644 --- a/images/win/scripts/Tests/Docker.Tests.ps1 +++ b/images/win/scripts/Tests/Docker.Tests.ps1 @@ -17,6 +17,10 @@ Describe "Docker" { It "docker service is up" { "docker images" | Should -ReturnZeroExitCode } + + It "docker symlink" { + "C:\Windows\SysWOW64\docker.exe ps" | Should -ReturnZeroExitCode + } } Describe "DockerImages" { From d22401090803e0b9135140b1089cc9e149622d58 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 26 Sep 2022 11:17:48 +0000 Subject: [PATCH 1488/3485] Ubuntu 20.04 (20220922 update) (#6291) * Updating readme file for ubuntu20 version 20220922.2 * Update Ubuntu2004-Readme.md Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2004-Readme.md | 150 ++++++++++++++++-------------- 1 file changed, 80 insertions(+), 70 deletions(-) diff --git a/images/linux/Ubuntu2004-Readme.md b/images/linux/Ubuntu2004-Readme.md index 22935972c814..67409623c211 100644 --- a/images/linux/Ubuntu2004-Readme.md +++ b/images/linux/Ubuntu2004-Readme.md @@ -1,10 +1,11 @@ | Announcements | |-| +| [[Ubuntu] homebrew will be removed from $PATH](https://github.com/actions/runner-images/issues/6283) | | [The Ubuntu 18.04 Actions runner image will begin deprecation on 8/8/22 and will be fully unsupported by 4/1/2023](https://github.com/actions/runner-images/issues/6002) | *** # Ubuntu 20.04.5 LTS -- Linux kernel version: 5.15.0-1019-azure -- Image Version: 20220905.1 +- Linux kernel version: 5.15.0-1020-azure +- Image Version: 20220922.2 ## Installed Software ### Language and Runtime @@ -17,7 +18,7 @@ - Erlang rebar3 3.19.0 - GNU C++ 9.4.0, 10.3.0 - GNU Fortran 9.4.0, 10.3.0 -- Julia 1.8.0 +- Julia 1.8.1 - Kotlin 1.7.10-release-333 - Mono 6.12.0.182 (apt source repository: https://download.mono-project.com/repo/ubuntu stable-focal main) - MSBuild 16.10.1.31701 (from /usr/lib/mono/msbuild/15.0/bin/MSBuild.dll) @@ -26,12 +27,12 @@ - Python 3.8.10 - Python3 3.8.10 - Ruby 2.7.0p0 -- Swift 5.6.3 +- Swift 5.7 ### Package Management - cpan 1.64 -- Helm 3.9.4 -- Homebrew 3.5.10 +- Helm 3.10.0 +- Homebrew 3.6.2 - Miniconda 4.12.0 - Npm 8.15.0 - NuGet 6.2.1.2 @@ -39,53 +40,62 @@ - Pip3 20.0.2 - Pipx 1.1.0 - RubyGems 3.1.2 -- Vcpkg (build from master \<927006b24>) +- Vcpkg (build from master \<d52632d9a>) - Yarn 1.22.19 +##### Notes: +``` +Location: /home/linuxbrew +Note: Homebrew is pre-installed on image but not added to PATH. +run the eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv) command +to accomplish this. +``` + #### Environment variables | Name | Value | | ----------------------- | ---------------------- | | CONDA | /usr/share/miniconda | | VCPKG_INSTALLATION_ROOT | /usr/local/share/vcpkg | +| VCPKG_ROOT | /usr/local/share/vcpkg | ### Project Management - Ant 1.10.7 - Gradle 7.5.1 -- Lerna 5.5.0 +- Lerna 5.5.2 - Maven 3.8.6 - Sbt 1.7.1 ### Tools -- Ansible 2.13.3 +- Ansible 2.13.4 - apt-fast 1.9.12 - AzCopy 10.16.0 (available by `azcopy` and `azcopy10` aliases) -- Bazel 5.3.0 -- Bazelisk 1.12.1 -- Bicep 0.9.1 +- Bazel 5.3.1 +- Bazelisk 1.13.2 +- Bicep 0.10.61 - Buildah 1.22.3 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- CMake 3.24.1 -- CodeQL Action Bundle 2.10.4 +- CMake 3.24.2 +- CodeQL Action Bundle 2.10.5 - Docker Amazon ECR Credential Helper 0.6.0 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.10.2+azure-1 +- Docker Compose v2 2.11.0+azure-1 - Docker-Buildx 0.9.1 -- Docker-Moby Client 20.10.17+azure-1 -- Docker-Moby Server 20.10.17+azure-3 -- Fastlane 2.209.1 +- Docker-Moby Client 20.10.18+azure-1 +- Docker-Moby Server 20.10.18+azure-1 +- Fastlane 2.210.1 - Git 2.37.3 (apt source repository: ppa:git-core/ppa) - Git LFS 3.2.0 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.6.0 - Haveged 1.9.1 -- Heroku 7.63.0 -- HHVM (HipHop VM) 4.167.0 +- Heroku 7.63.4 +- HHVM (HipHop VM) 4.169.0 - jq 1.6 - Kind 0.15.0 -- Kubectl 1.25.0 +- Kubectl 1.25.2 - Kustomize 4.5.7 - Leiningen 2.9.10 - MediaInfo 19.09 - Mercurial 5.3.1 -- Minikube 1.26.1 +- Minikube 1.27.0 - n 9.0.0 - Newman 5.3.2 - nvm 0.39.1 @@ -94,30 +104,30 @@ - Parcel 2.7.0 - PhantomJS 2.1.1 - Podman 3.4.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- Pulumi 3.39.1 +- Pulumi 3.40.1 - R 4.2.1 - Skopeo 1.5.0 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 -- Terraform 1.2.8 -- yamllint 1.27.1 -- yq 4.27.3 +- Terraform 1.3.0 +- yamllint 1.28.0 +- yq 4.27.5 - zstd 1.5.2 (homebrew) ### CLI Tools -- Alibaba Cloud CLI 3.0.125 -- AWS CLI 2.7.29 +- Alibaba Cloud CLI 3.0.127 +- AWS CLI 2.7.34 - AWS CLI Session manager plugin 1.2.339.0 -- AWS SAM CLI 1.56.0 -- Azure CLI (azure-cli) 2.39.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) +- AWS SAM CLI 1.57.0 +- Azure CLI (azure-cli) 2.40.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.25.0 -- GitHub CLI 2.14.7 -- Google Cloud SDK 369.0.0 (apt source repository: https://packages.cloud.google.com/apt) +- GitHub CLI 2.16.0 +- Google Cloud SDK 403.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 11.5.1 -- OpenShift CLI 4.11.1 +- Netlify CLI 11.8.2 +- OpenShift CLI 4.11.5 - ORAS CLI 0.14.1 -- Vercel CLI 28.2.2 +- Vercel CLI 28.4.1 ### Java | Version | Vendor | Environment Variable | @@ -132,11 +142,11 @@ | CE 22.2.0 | GRAALVM_11_ROOT | ### PHP -| Tool | Version | -| -------- | ------------------- | -| PHP | 7.4.30 8.0.22 8.1.9 | -| Composer | 2.4.1 | -| PHPUnit | 8.5.29 | +| Tool | Version | +| -------- | -------------------- | +| PHP | 7.4.30 8.0.23 8.1.10 | +| Composer | 2.4.2 | +| PHPUnit | 8.5.29 | ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ``` @@ -144,28 +154,28 @@ - Cabal 3.6.2.0 - GHC 9.4.2 - GHCup 0.1.18.0 -- Stack 2.7.5 +- Stack 2.9.1 ### Rust Tools -- Cargo 1.63.0 -- Rust 1.63.0 -- Rustdoc 1.63.0 +- Cargo 1.64.0 +- Rust 1.64.0 +- Rustdoc 1.64.0 - Rustup 1.25.1 #### Packages - Bindgen 0.60.1 - Cargo audit 0.17.0 -- Cargo clippy 0.1.63 +- Cargo clippy 0.1.64 - Cargo outdated 0.11.1 - Cbindgen 0.24.3 - Rustfmt 1.5.1 ### Browsers and Drivers -- Google Chrome 105.0.5195.102 +- Google Chrome 105.0.5195.125 - ChromeDriver 105.0.5195.52 - Chromium 105.0.5177.0 -- Microsoft Edge 105.0.1343.27 (apt source repository: https://packages.microsoft.com/repos/edge) -- Microsoft Edge WebDriver 105.0.1343.27 +- Microsoft Edge 105.0.1343.42 (apt source repository: https://packages.microsoft.com/repos/edge) +- Microsoft Edge WebDriver 105.0.1343.42 - Selenium server 4.4.0 - Mozilla Firefox 104.0 - Geckodriver 0.31.0 @@ -179,13 +189,13 @@ | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | ### .NET Core SDK -- 3.1.120 3.1.202 3.1.302 3.1.422 5.0.104 5.0.214 5.0.303 5.0.408 6.0.400 +- 3.1.120 3.1.202 3.1.302 3.1.423 5.0.104 5.0.214 5.0.303 5.0.408 6.0.401 ### .NET tools -- nbgv 3.5.109+bdfbd7dea6 +- nbgv 3.5.113+a908c6d9d2 ### Databases -- MongoDB 5.0.11 (apt source repository: https://repo.mongodb.org/apt/ubuntu) +- MongoDB 5.0.12 (apt source repository: https://repo.mongodb.org/apt/ubuntu) - sqlite3 3.31.1 #### PostgreSQL @@ -209,8 +219,8 @@ ### Cached Tools #### Go - 1.17.13 -- 1.18.5 -- 1.19.0 +- 1.18.6 +- 1.19.1 #### Node.js - 12.22.12 @@ -227,10 +237,10 @@ #### Python - 2.7.18 - 3.6.15 -- 3.7.13 -- 3.8.13 -- 3.9.13 -- 3.10.6 +- 3.7.14 +- 3.8.14 +- 3.9.14 +- 3.10.7 #### Ruby - 2.5.9 @@ -243,8 +253,8 @@ | Name | Value | Architecture | | --------------- | ----------------------------------- | ------------ | | GOROOT_1_17_X64 | /opt/hostedtoolcache/go/1.17.13/x64 | x64 | -| GOROOT_1_18_X64 | /opt/hostedtoolcache/go/1.18.5/x64 | x64 | -| GOROOT_1_19_X64 | /opt/hostedtoolcache/go/1.19.0/x64 | x64 | +| GOROOT_1_18_X64 | /opt/hostedtoolcache/go/1.18.6/x64 | x64 | +| GOROOT_1_19_X64 | /opt/hostedtoolcache/go/1.19.1/x64 | x64 | ### PowerShell Tools - PowerShell 7.2.6 @@ -253,7 +263,7 @@ | Module | Version | | ---------------- | ------- | | MarkdownPS | 1.9 | -| Microsoft.Graph | 1.11.1 | +| Microsoft.Graph | 1.12.0 | | Pester | 5.3.3 | | PSScriptAnalyzer | 1.20.0 | @@ -299,21 +309,21 @@ | alpine:3.12 | sha256:c75ac27b49326926b803b9ed43bf088bc220d22556de1bc5f72d742c91398f69 | 2022-04-05 | | alpine:3.13 | sha256:100448e45467d4f3838fc8d95faab2965e22711b6edf67bbd8ec9c07f612b553 | 2022-08-09 | | alpine:3.14 | sha256:1ab24b3b99320975cca71716a7475a65d263d0b6b604d9d14ce08f7a3f67595c | 2022-08-09 | -| buildpack-deps:bullseye | sha256:872ba70b0805b817db42d9ea75f066b5fe2be82d04d0dab69e41810edd9aa3f9 | 2022-08-23 | -| buildpack-deps:buster | sha256:d73ba7863f3958cade1ef32f7620c3751ba5cd9653ff382a1b222ec17906884e | 2022-08-23 | +| buildpack-deps:bullseye | sha256:19683807e2587d777766573697f9488b0c88677ee06313e69197fbaa42e80319 | 2022-09-13 | +| buildpack-deps:buster | sha256:caa4ae706b59e2ca4b7786a44a08617447f81b516507a70a4ca43665b479c4e3 | 2022-09-13 | | buildpack-deps:stretch | sha256:78e995165a5788c2f55aed6e548d8f6c1534830d4310c870408fccb2da8c5b2e | 2022-06-23 | -| debian:10 | sha256:fa8155031d12cd165c237e0b38688cade32912e990ffe21f9e31968d9a04da38 | 2022-08-23 | -| debian:11 | sha256:d52921d97310d0bd48dab928548ef539d5c88c743165754c57cfad003031386c | 2022-08-23 | +| debian:10 | sha256:2f35b84014a5389e2a940113c51586bc067a05040ba181dee92c5a9fa9b15dcb | 2022-09-13 | +| debian:11 | sha256:3e82b1af33607aebaeb3641b75d6e80fd28d36e17993ef13708e9493e30e8ff9 | 2022-09-13 | | debian:9 | sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be | 2022-06-23 | | moby/buildkit:latest | sha256:67c9251f9f2e103e1ee489b6cead518b6d82607ef485d3f1505fc4095a55ebeb | 2022-08-22 | | node:12 | sha256:01627afeb110b3054ba4a1405541ca095c8bfca1cb6f2be9479c767a2711879e | 2022-04-20 | | node:12-alpine | sha256:d4b15b3d48f42059a15bd659be60afe21762aae9d6cbea6f124440895c27db68 | 2022-04-11 | -| node:14 | sha256:48ad857f33fb03f542133b1e0d3524b1fcf596fce29e212cd9b7abd22d3d9188 | 2022-08-23 | +| node:14 | sha256:6adfb0c2a9db12a06893974bb140493a7482e2b3df59c058590594ceecd0c99b | 2022-09-13 | | node:14-alpine | sha256:4aff4ba0da347e51561587eba037a38db4eaa70e1a6c8334d66779fe963d5be7 | 2022-08-09 | -| node:16 | sha256:0c672d547405fe64808ea28b49c5772b1026f81b3b716ff44c10c96abf177d6a | 2022-08-23 | +| node:16 | sha256:a5d9200d3b8c17f0f3d7717034a9c215015b7aae70cb2a9d5e5dae7ff8aa6ca8 | 2022-09-13 | | node:16-alpine | sha256:2c405ed42fc0fd6aacbe5730042640450e5ec030bada7617beac88f742b6997b | 2022-08-16 | | ubuntu:16.04 | sha256:91bd29a464fdabfcf44e29e1f2a5f213c6dfa750b6290e40dd6998ac79da3c41 | 2021-08-31 | -| ubuntu:18.04 | sha256:3aa2ccb021969aadb28381fee1b247422e845b176e241cd1540c4b6831e000bb | 2022-09-01 | +| ubuntu:18.04 | sha256:6fec50623d6d37b7f3c14c5b6fc36c73fd04aa8173d59d54dba00da0e7ac50ee | 2022-09-06 | | ubuntu:20.04 | sha256:35ab2bf57814e9ff49e365efd5a5935b6915eede5c7f8581e9e1b85e0eecbe16 | 2022-09-01 | ### Installed apt packages @@ -331,7 +341,7 @@ | coreutils | 8.30-3ubuntu2 | | curl | 7.68.0-1ubuntu2.13 | | dbus | 1.12.16-2ubuntu2.2 | -| dnsutils | 1:9.16.1-0ubuntu2.10 | +| dnsutils | 1:9.16.1-0ubuntu2.11 | | dpkg | 1.19.7ubuntu3.2 | | fakeroot | 1.24-1 | | file | 1:5.38-4 | @@ -356,7 +366,7 @@ | libmagickcore-dev | 8:6.9.10.23+dfsg-2.1ubuntu11.4 | | libmagickwand-dev | 8:6.9.10.23+dfsg-2.1ubuntu11.4 | | libsecret-1-dev | 0.20.4-0ubuntu1 | -| libsqlite3-dev | 3.31.1-4ubuntu0.3 | +| libsqlite3-dev | 3.31.1-4ubuntu0.4 | | libtool | 2.4.6-14 | | libunwind8 | 1.2.1-9build1 | | libxkbfile-dev | 1:1.1.0-1 | @@ -380,7 +390,7 @@ | rsync | 3.1.3-8ubuntu0.4 | | shellcheck | 0.7.0-2build2 | | sphinxsearch | 2.2.11-2ubuntu2 | -| sqlite3 | 3.31.1-4ubuntu0.3 | +| sqlite3 | 3.31.1-4ubuntu0.4 | | ssh | 1:8.2p1-4ubuntu0.5 | | sshpass | 1.06-1 | | subversion | 1.13.0-3ubuntu0.2 | From 0f5b7340dd69477449450264ee890cb47b6d7265 Mon Sep 17 00:00:00 2001 From: Benedek Farkas <benedek.farkas@lombiq.com> Date: Tue, 27 Sep 2022 09:25:24 +0200 Subject: [PATCH 1489/3485] Actualizing the Windows post-generation scripts' documentation (#6309) --- docs/create-image-and-azure-resources.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/docs/create-image-and-azure-resources.md b/docs/create-image-and-azure-resources.md index 8b56129de27a..f198df2f6e5d 100644 --- a/docs/create-image-and-azure-resources.md +++ b/docs/create-image-and-azure-resources.md @@ -181,9 +181,7 @@ The scripts are copied to the VHD during the image generation process to the fol ##### Windows -- **Choco.ps1** - contains dummy command to cleanup orphaned packages to avoid initial delay for future choco commands -- **Dotnet.ps1** - adds `$env:USERPROFILE\.dotnet\tools` directory to the PATH +- **GenerateIISExpressCertificate.ps1** - generates and imports a certificate to run applications with IIS Express through HTTPS - **InternetExplorerConfiguration** - turns off the Internet Explorer Enhanced Security feature - **Msys2FirstLaunch.ps1** - initializes bash user profile in MSYS2 -- **RustJunction.ps1** - creates Rust junction points to cargo and rustup folders - **VSConfiguration.ps1** - performs initial Visual Studio configuration From 00b572dfdffd08097833314d518d6fd02241c438 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 27 Sep 2022 07:33:25 +0000 Subject: [PATCH 1490/3485] Ubuntu 22.04 (20220925 update) (#6308) * Updating readme file for ubuntu22 version 20220925.1 * Update Ubuntu2204-Readme.md Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2204-Readme.md | 77 +++++++++++++++++-------------- 1 file changed, 43 insertions(+), 34 deletions(-) diff --git a/images/linux/Ubuntu2204-Readme.md b/images/linux/Ubuntu2204-Readme.md index cd657cbfee06..d0c351447619 100644 --- a/images/linux/Ubuntu2204-Readme.md +++ b/images/linux/Ubuntu2204-Readme.md @@ -1,10 +1,11 @@ | Announcements | |-| +| [[Ubuntu] homebrew will be removed from $PATH](https://github.com/actions/runner-images/issues/6283) | | [The Ubuntu 18.04 Actions runner image will begin deprecation on 8/8/22 and will be fully unsupported by 4/1/2023](https://github.com/actions/runner-images/issues/6002) | *** # Ubuntu 22.04.1 LTS -- Linux kernel version: 5.15.0-1019-azure -- Image Version: 20220919.1 +- Linux kernel version: 5.15.0-1020-azure +- Image Version: 20220925.1 ## Installed Software ### Language and Runtime @@ -19,15 +20,15 @@ - Kotlin 1.7.10-release-333 - Mono 6.12.0.182 (apt source repository: https://download.mono-project.com/repo/ubuntu stable-focal main) - MSBuild 16.10.1.31701 (from /usr/lib/mono/msbuild/15.0/bin/MSBuild.dll) -- Node 16.17.0 +- Node 16.17.1 - Perl 5.34.0 -- Python 3.10.4 -- Python3 3.10.4 +- Python 3.10.6 +- Python3 3.10.6 - Ruby 3.0.2p107 ### Package Management - cpan 1.64 -- Helm 3.9.4 +- Helm 3.10.0 - Homebrew 3.6.2 - Miniconda 4.12.0 - Npm 8.15.0 @@ -36,9 +37,17 @@ - Pip3 22.0.2 - Pipx 1.1.0 - RubyGems 3.3.5 -- Vcpkg (build from master \<4340582bc>) +- Vcpkg (build from master \<57d3194e7>) - Yarn 1.22.19 +##### Notes: +``` +Location: /home/linuxbrew +Note: Homebrew is pre-installed on image but not added to PATH. +run the eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)" command +to accomplish this. +``` + #### Environment variables | Name | Value | | ----------------------- | ---------------------- | @@ -47,7 +56,7 @@ | VCPKG_ROOT | /usr/local/share/vcpkg | ### Project Management -- Lerna 5.5.1 +- Lerna 5.5.2 ### Tools - Ansible 2.13.4 @@ -61,19 +70,19 @@ - CodeQL Action Bundle 2.10.5 - Docker Amazon ECR Credential Helper 0.6.0 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.11.0+azure-1 +- Docker Compose v2 2.11.1+azure-1 - Docker-Buildx 0.9.1 - Docker-Moby Client 20.10.18+azure-1 - Docker-Moby Server 20.10.18+azure-1 -- Fastlane 2.210.0 +- Fastlane 2.210.1 - Git 2.37.3 (apt source repository: ppa:git-core/ppa) - Git LFS 3.2.0 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.6.0 - Haveged 1.9.14 - Heroku 7.63.4 - jq 1.6 -- Kind 0.15.0 -- Kubectl 1.25.1 +- Kind 0.16.0 +- Kubectl 1.25.2 - Kustomize 4.5.7 - Leiningen 2.9.10 - MediaInfo 21.09 @@ -86,30 +95,30 @@ - Packer 1.8.3 - Parcel 2.7.0 - Podman 3.4.4 -- Pulumi 3.40.0 +- Pulumi 3.40.1 - R 4.2.1 - Skopeo 1.4.1 - Sphinx Open Source Search Server 2.2.11 - SVN 1.14.1 -- Terraform 1.2.9 +- Terraform 1.3.0 - yamllint 1.28.0 - yq 4.27.5 - zstd 1.5.2 (homebrew) ### CLI Tools -- Alibaba Cloud CLI 3.0.125 -- AWS CLI 2.7.33 +- Alibaba Cloud CLI 3.0.127 +- AWS CLI 2.7.35 - AWS CLI Session manager plugin 1.2.339.0 - AWS SAM CLI 1.57.0 - Azure CLI (azure-cli) 2.40.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.25.0 -- GitHub CLI 2.15.0 -- Google Cloud SDK 402.0.0 (apt source repository: https://packages.cloud.google.com/apt) +- GitHub CLI 2.16.0 +- Google Cloud SDK 403.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 11.8.0 -- OpenShift CLI 4.11.4 +- Netlify CLI 11.8.3 +- OpenShift CLI 4.11.5 - ORAS CLI 0.14.1 -- Vercel CLI 28.3.0 +- Vercel CLI 28.4.2 ### Java | Version | Vendor | Environment Variable | @@ -128,7 +137,7 @@ | -------- | ------- | | PHP | 8.1.10 | | Composer | 2.4.2 | -| PHPUnit | 8.5.29 | +| PHPUnit | 8.5.30 | ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ``` @@ -139,15 +148,15 @@ - Stack 2.9.1 ### Rust Tools -- Cargo 1.63.0 -- Rust 1.63.0 -- Rustdoc 1.63.0 +- Cargo 1.64.0 +- Rust 1.64.0 +- Rustdoc 1.64.0 - Rustup 1.25.1 #### Packages - Bindgen 0.60.1 - Cargo audit 0.17.0 -- Cargo clippy 0.1.63 +- Cargo clippy 0.1.64 - Cargo outdated 0.11.1 - Cbindgen 0.24.3 - Rustfmt 1.5.1 @@ -156,8 +165,8 @@ - Google Chrome 105.0.5195.125 - ChromeDriver 105.0.5195.52 - Chromium 105.0.5177.0 -- Microsoft Edge 105.0.1343.42 (apt source repository: https://packages.microsoft.com/repos/edge) -- Microsoft Edge WebDriver 105.0.1343.42 +- Microsoft Edge 105.0.1343.50 (apt source repository: https://packages.microsoft.com/repos/edge) +- Microsoft Edge WebDriver 105.0.1343.50 - Selenium server 4.4.0 #### Environment variables @@ -172,7 +181,7 @@ - 6.0.401 ### .NET tools -- nbgv 3.5.109+bdfbd7dea6 +- nbgv 3.5.113+a908c6d9d2 ### Databases - sqlite3 3.37.2 @@ -193,7 +202,7 @@ ``` #### MS SQL Server Client Tools - sqlcmd 17.10.0001.1 -- SqlPackage 16.0.6161.0 +- SqlPackage 16.0.6296.0 ### Cached Tools #### Go @@ -202,8 +211,8 @@ - 1.19.1 #### Node.js -- 14.20.0 -- 16.17.0 +- 14.20.1 +- 16.17.1 #### PyPy - 3.7.13 [PyPy 7.3.9] @@ -250,7 +259,7 @@ | Package Name | Version | | -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------ | | Android Command Line Tools | 7.0 | -| Android Emulator | 31.3.10 | +| Android Emulator | 31.3.11 | | Android SDK Build-tools | 33.0.0<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | | Android SDK Platform-Tools | 33.0.3 | | Android SDK Platforms | android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | @@ -305,7 +314,7 @@ | coreutils | 8.32-4.1ubuntu1 | | curl | 7.81.0-1ubuntu1.4 | | dbus | 1.12.20-2ubuntu4 | -| dnsutils | 1:9.18.1-1ubuntu1.1 | +| dnsutils | 1:9.18.1-1ubuntu1.2 | | dpkg | 1.21.1ubuntu2.1 | | fakeroot | 1.28-1ubuntu1 | | file | 1:5.41-3 | From ab4f43d81821d77e0aacdd602bf629ee74a54ee2 Mon Sep 17 00:00:00 2001 From: bogdan-damian-bgd <108331162+bogdan-damian-bgd@users.noreply.github.com> Date: Tue, 27 Sep 2022 09:54:35 +0200 Subject: [PATCH 1491/3485] [macOS] Add Colima tool (#6285) * Add Colima tool to macos images * PR fixes: skip Catalina; switch to toolset json --- images/macos/software-report/SoftwareReport.Common.psm1 | 7 ++++++- images/macos/software-report/SoftwareReport.Generator.ps1 | 3 ++- images/macos/tests/Common.Tests.ps1 | 8 +++++++- images/macos/toolsets/toolset-11.json | 1 + images/macos/toolsets/toolset-12.json | 1 + 5 files changed, 17 insertions(+), 3 deletions(-) diff --git a/images/macos/software-report/SoftwareReport.Common.psm1 b/images/macos/software-report/SoftwareReport.Common.psm1 index 2c36fd4dad86..2012f889ceb6 100644 --- a/images/macos/software-report/SoftwareReport.Common.psm1 +++ b/images/macos/software-report/SoftwareReport.Common.psm1 @@ -596,4 +596,9 @@ function Get-CodeQLBundleVersion { $CodeQLPath = Join-Path $CodeQLVersionPath -ChildPath "x64" | Join-Path -ChildPath "codeql" | Join-Path -ChildPath "codeql" $CodeQLVersion = & $CodeQLPath version --quiet return "CodeQL Action Bundle $CodeQLVersion" -} \ No newline at end of file +} + +function Get-ColimaVersion { + $colimaVersion = Run-Command "colima version" | Select-String "colima version" | Take-Part -Part 2 + return "Colima $colimaVersion" +} diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1 index d3e43733c205..3169e43380ae 100644 --- a/images/macos/software-report/SoftwareReport.Generator.ps1 +++ b/images/macos/software-report/SoftwareReport.Generator.ps1 @@ -182,7 +182,8 @@ $toolsList += @( (Get-GHCVersion), (Get-CabalVersion), (Get-StackVersion), - (Get-SwiftFormatVersion) + (Get-SwiftFormatVersion), + (Get-ColimaVersion) ) $markdown += New-MDList -Style Unordered -Lines ($toolsList | Sort-Object) diff --git a/images/macos/tests/Common.Tests.ps1 b/images/macos/tests/Common.Tests.ps1 index 9ae2eaa9c3a4..0aaf45ecc060 100644 --- a/images/macos/tests/Common.Tests.ps1 +++ b/images/macos/tests/Common.Tests.ps1 @@ -149,4 +149,10 @@ Describe "CodeQL" -Skip:($os.IsCatalina) { $CodeQLPacksPath = Join-Path $CodeQLVersionPath -ChildPath "x64" | Join-Path -ChildPath "codeql" | Join-Path -ChildPath "qlpacks" $CodeQLPacksPath | Should -Exist } -} \ No newline at end of file +} + +Describe "Colima" { + It "Colima" { + "colima version" | Should -ReturnZeroExitCode + } +} diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index 51e7f8d616e4..0b6e2f9fcd9b 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -205,6 +205,7 @@ "bazelisk", "carthage", "cmake", + "colima", "gh", "gnupg", "gnu-tar", diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index 4d41f9cc9829..b45343442b03 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -155,6 +155,7 @@ "bazelisk", "carthage", "cmake", + "colima", "gh", "gnupg", "gnu-tar", From b0885e18a104fa27b7cb3b7cfa60b8963fdb7dca Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 28 Sep 2022 11:36:41 +0000 Subject: [PATCH 1492/3485] Updating readme file for macOS-11 version 20220925.1 (#6311) Co-authored-by: Image generation service account <no-reply@microsoft.com> --- images/macos/macos-11-Readme.md | 48 ++++++++++++++++----------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/images/macos/macos-11-Readme.md b/images/macos/macos-11-Readme.md index d08f56339f79..5207efd54480 100644 --- a/images/macos/macos-11-Readme.md +++ b/images/macos/macos-11-Readme.md @@ -6,7 +6,7 @@ # macOS 11.7 info - System Version: macOS 11.7 (20G817) - Kernel Version: Darwin 20.6.0 -- Image Version: 20220918.1 +- Image Version: 20220925.1 ## Installed Software ### Language and Runtime @@ -24,9 +24,9 @@ - julia 1.8.1 - Kotlin 1.7.10-release-333 - MSBuild 16.10.1.31401 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) -- Node.js v16.17.0 +- Node.js v16.17.1 - NVM 0.39.1 -- NVM - Cached node versions: v12.22.12 v14.20.0 v16.17.0 +- NVM - Cached node versions: v12.22.12 v14.20.1 v16.17.1 - Perl 5.34.0 - PHP 8.1.10 - Python 2.7.18 @@ -39,7 +39,7 @@ - Carthage 0.38.0 - CocoaPods 1.11.3 - Composer 2.4.2 -- Homebrew 3.6.1 +- Homebrew 3.6.2 - Miniconda 4.12.0 - NPM 8.15.0 - NuGet 6.2.1.2 @@ -47,7 +47,7 @@ - Pip 22.2.2 (python 3.10) - Pipx 1.1.0 - RubyGems 3.3.22 -- Vcpkg 2022 (build from master \<01b29f6d8>) +- Vcpkg 2022 (build from master \<57d3194e7>) - Yarn 1.22.19 #### Environment variables @@ -67,19 +67,19 @@ - 7-Zip 17.04 - aria2 1.36.0 - azcopy 10.16.0 -- bazel 5.3.0 +- bazel 5.3.1 - bazelisk 1.14.0 - bsdtar 3.3.2 - available by 'tar' alias - Curl 7.85.0 - Git 2.37.3 - Git LFS: 3.2.0 -- GitHub CLI: 2.15.0 +- GitHub CLI: 2.16.0 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.3 - gpg (GnuPG) 2.3.7 -- helm v3.9.4+gdbc6d8e +- helm v3.10.0+gce66412 - Hub CLI: 2.14.2 -- ImageMagick 7.1.0-48 +- ImageMagick 7.1.0-49 - jq 1.6 - mongo v5.0.11 - mongod v5.0.11 @@ -95,10 +95,10 @@ - zstd 1.5.2 ### Tools -- Aliyun CLI 3.0.125 +- Aliyun CLI 3.0.127 - App Center CLI 2.11.0 -- AWS CLI 2.7.33 -- AWS SAM CLI 1.56.1 +- AWS CLI 2.7.35 +- AWS SAM CLI 1.57.0 - AWS Session Manager CLI 1.2.339.0 - Azure CLI (azure-devops) 0.25.0 - Azure CLI 2.40.0 @@ -106,11 +106,11 @@ - Cabal 3.6.2.0 - Cmake 3.24.2 - CodeQL Action Bundle 2.10.5 -- Fastlane 2.210.0 +- Fastlane 2.210.1 - GHC 9.4.2 - GHCup 0.1.18.0 - Jazzy 0.14.3 -- Stack 2.7.5 +- Stack 2.9.1 - SwiftFormat 0.49.18 - Swig 4.0.2 - Xcode Command Line Tools 13.2.0.0.1.1638488800 @@ -124,9 +124,9 @@ - SafariDriver 16.0 (16614.1.25.9.10) - Google Chrome 105.0.5195.125 - ChromeDriver 105.0.5195.52 -- Microsoft Edge 105.0.1343.42 -- Microsoft Edge WebDriver 105.0.1343.42 -- Mozilla Firefox 104.0.2 +- Microsoft Edge 105.0.1343.50 +- Microsoft Edge WebDriver 105.0.1343.50 +- Mozilla Firefox 105.0.1 - geckodriver 0.31.0 - Selenium server 4.4.0 @@ -172,8 +172,8 @@ #### Node.js - 12.22.12 -- 14.20.0 -- 16.17.0 +- 14.20.1 +- 16.17.1 #### Go | Version | Architecture | Environment Variable | @@ -183,9 +183,9 @@ | 1.19.1 | x64 | GOROOT_1_19_X64 | ### Rust Tools -- Cargo 1.63.0 -- Rust 1.63.0 -- Rustdoc 1.63.0 +- Cargo 1.64.0 +- Rust 1.64.0 +- Rustdoc 1.64.0 - Rustup 1.25.1 #### Packages @@ -193,7 +193,7 @@ - Cargo-audit 0.17.0 - Cargo-outdated 0.11.1 - Cbindgen 0.24.3 -- Clippy 0.1.63 +- Clippy 0.1.64 - Rustfmt 1.5.1-stable ### PowerShell Tools @@ -334,7 +334,7 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" | Package Name | Version | | -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------ | | Android Command Line Tools | 7.0 | -| Android Emulator | 31.3.10 | +| Android Emulator | 31.3.11 | | Android SDK Build-tools | 33.0.0<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | | Android SDK Platforms | android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | | Android SDK Platform-Tools | 33.0.3 | From 3f0a28fe185dbb8a82d918c04373937f4e7eb278 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Wed, 28 Sep 2022 19:06:08 +0200 Subject: [PATCH 1493/3485] [macOS] Add Parallels Desktop extension (#6314) * Add Parallels Desktop extension * fix typo * remove new line --- .../provision/configuration/finalize-vm.sh | 6 +++++ images/macos/provision/core/commonutils.sh | 27 ++++++++++++++++++- .../utils/confirm-identified-developers.scpt | 10 +++---- .../SoftwareReport.Common.psm1 | 14 ++++++++++ .../SoftwareReport.Generator.ps1 | 15 +++++++++++ images/macos/toolsets/toolset-12.json | 3 ++- 6 files changed, 66 insertions(+), 9 deletions(-) diff --git a/images/macos/provision/configuration/finalize-vm.sh b/images/macos/provision/configuration/finalize-vm.sh index 6770cef5fb21..c3d72b7a8765 100644 --- a/images/macos/provision/configuration/finalize-vm.sh +++ b/images/macos/provision/configuration/finalize-vm.sh @@ -13,6 +13,12 @@ if is_Catalina; then fi fi +# Remove Parallels Desktop +# https://github.com/actions/runner-images/issues/6105 +if is_Monterey; then + brew uninstall parallels +fi + # Put documentation to $HOME root cp $HOME/image-generation/output/software-report/systeminfo.txt $HOME/image-generation/output/software-report/systeminfo.md $HOME/ diff --git a/images/macos/provision/core/commonutils.sh b/images/macos/provision/core/commonutils.sh index 75639dcd3352..5ec148514601 100644 --- a/images/macos/provision/core/commonutils.sh +++ b/images/macos/provision/core/commonutils.sh @@ -16,7 +16,12 @@ for package in $cask_packages; do brew install --cask $package done -# Execute AppleScript to change security preferences for virtualbox +# Load "Parallels International GmbH" +if is_Monterey; then + sudo kextload /Applications/Parallels\ Desktop.app/Contents/Library/Extensions/10.9/prl_hypervisor.kext || true +fi + +# Execute AppleScript to change security preferences # System Preferences -> Security & Privacy -> General -> Unlock -> Allow -> Not now if is_Monterey; then if is_Veertu; then @@ -38,6 +43,26 @@ if is_Monterey; then osascript $HOME/utils/confirm-identified-developers.scpt $USER_PASSWORD fi +# Validate "Parallels International GmbH" kext +if is_Monterey; then + dbName="/var/db/SystemPolicyConfiguration/KextPolicy" + dbQuery="SELECT * FROM kext_policy WHERE bundle_id LIKE 'com.parallels.kext.%';" + kext=$(sudo sqlite3 $dbName "$dbQuery") + + if [ -z "$kext" ]; then + echo "Parallels International GmbH not found" + exit 1 + fi + + # Create env variable + url=$(brew info --json=v2 --installed | jq -r '.casks[] | select(.name[] == "Parallels Desktop").url') + if [ -z "$url" ]; then + echo "Unable to parse url for Parallels Desktop cask" + exit 1 + fi + echo "export PARALLELS_DMG_URL=$url" >> "${HOME}/.bashrc" +fi + # Invoke bazel to download bazel version via bazelisk bazel diff --git a/images/macos/provision/utils/confirm-identified-developers.scpt b/images/macos/provision/utils/confirm-identified-developers.scpt index a445d8be1b25..31a650d761c6 100644 --- a/images/macos/provision/utils/confirm-identified-developers.scpt +++ b/images/macos/provision/utils/confirm-identified-developers.scpt @@ -12,17 +12,13 @@ on run argv set userpassword to item 1 of argv set secpane to "Security & Privacy" - tell application "System Events" - tell security preferences - keystroke return - delay 5 - end tell - end tell - activate application "System Preferences" delay 5 + tell application "System Events" tell process "System Preferences" + set frontmost to true + delay 2 click menu item secpane of menu "View" of menu bar 1 delay 5 click button 1 of window 1 diff --git a/images/macos/software-report/SoftwareReport.Common.psm1 b/images/macos/software-report/SoftwareReport.Common.psm1 index 2012f889ceb6..01955e019ec0 100644 --- a/images/macos/software-report/SoftwareReport.Common.psm1 +++ b/images/macos/software-report/SoftwareReport.Common.psm1 @@ -575,6 +575,20 @@ function Build-PackageManagementEnvironmentTable { } } +function Build-MiscellaneousEnvironmentTable { + return @( + @{ + "Name" = "PARALLELS_DMG_URL" + "Value" = $env:PARALLELS_DMG_URL + } + ) | ForEach-Object { + [PSCustomObject] @{ + "Name" = $_.Name + "Value" = $_.Value + } + } +} + function Get-GraalVMVersion { $version = & "$env:GRAALVM_11_ROOT\java" --version | Select-String -Pattern "GraalVM" | Take-Part -Part 5,6 return $version diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1 index 3169e43380ae..433b4ec31d76 100644 --- a/images/macos/software-report/SoftwareReport.Generator.ps1 +++ b/images/macos/software-report/SoftwareReport.Generator.ps1 @@ -309,6 +309,21 @@ $markdown += New-MDList -Style Unordered -Lines (@( ) | Sort-Object ) +if ($os.IsMonterey) { +$markdown += New-MDHeader "Environment variables" -Level 4 +$markdown += Build-MiscellaneousEnvironmentTable | New-MDTable +$markdown += New-MDNewLine + +$markdown += New-MDHeader "Notes:" -Level 5 +$misc = @' +``` +If you want to use Parallels Desktop you should download a package from URL stored in +PARALLELS_DMG_URL environment variable. A system extension is allowed for this version. +``` +'@ +$markdown += New-MDParagraph -Lines $misc +} + # # Generate systeminfo.txt with information about image (for debug purpose) # diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index b45343442b03..d69b6e1d2a02 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -181,7 +181,8 @@ "cask_packages": [ "julia", "vagrant", - "virtualbox" + "virtualbox", + "parallels" ] }, "gcc": { From fe5c2bcdc2866f92dd538a99092418da8d264901 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 28 Sep 2022 18:20:40 +0000 Subject: [PATCH 1494/3485] Updating readme file for win22 version 20220925.1 (#6307) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2022-Readme.md | 53 +++++++++++++++----------------- 1 file changed, 24 insertions(+), 29 deletions(-) diff --git a/images/win/Windows2022-Readme.md b/images/win/Windows2022-Readme.md index 643386cf8115..43a5cbfbf40d 100644 --- a/images/win/Windows2022-Readme.md +++ b/images/win/Windows2022-Readme.md @@ -1,10 +1,6 @@ -| Announcements | -|-| -| [[Windows] Docker EE will be replaced with Docker CE / Moby on September, 19](https://github.com/actions/runner-images/issues/6181) | -*** # Microsoft Windows Server 2022 Datacenter - OS Version: 10.0.20348 Build 1006 -- Image Version: 20220919.1 +- Image Version: 20220925.1 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -16,7 +12,7 @@ - Julia 1.8.1 - Kotlin 1.7.10 - LLVM 14.0.6 -- Node 16.17.0 +- Node 16.17.1 - Perl 5.32.1 - PHP 8.1.10 - Python 3.9.13 @@ -32,7 +28,7 @@ - pip 22.2.2 (python 3.9) - Pipx 1.1.0 - RubyGems 3.2.33 -- Vcpkg (build from master \<4340582bc>) +- Vcpkg (build from master \<57d3194e7>) - Yarn 1.22.19 #### Environment variables @@ -58,17 +54,17 @@ - CMake 3.24.2 - CodeQL Action Bundle 2.10.5 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.11.0 +- Docker Compose v2 2.11.1 - Docker master-dockerproject-2022-03-26 -- Docker-wincred 0.6.4 +- Docker-wincred 0.7.0 - ghc 9.4.2 - Git 2.37.3.windows.1 - Git LFS 3.2.0 -- ImageMagick 7.1.0-48 +- ImageMagick 7.1.0-49 - InnoSetup 6.2.1 - jq 1.6 -- Kind 0.15.0 -- Kubectl 1.25.1 +- Kind 0.16.0 +- Kubectl 1.25.2 - Mercurial 5.0 - Mingw-w64 11.2.0 - Newman 5.3.2 @@ -88,19 +84,19 @@ - zstd 1.5.2 ### CLI Tools -- Alibaba Cloud CLI 3.0.125 -- AWS CLI 2.7.33 +- Alibaba Cloud CLI 3.0.127 +- AWS CLI 2.7.35 - AWS SAM CLI 1.57.0 - AWS Session Manager CLI 1.2.339.0 - Azure CLI 2.40.0 - Azure DevOps CLI extension 0.25.0 -- GitHub CLI 2.15.0 +- GitHub CLI 2.16.0 - Hub CLI 2.14.2 ### Rust Tools -- Cargo 1.63.0 -- Rust 1.63.0 -- Rustdoc 1.63.0 +- Cargo 1.64.0 +- Rust 1.64.0 +- Rustdoc 1.64.0 - Rustup 1.25.1 #### Packages @@ -108,15 +104,15 @@ - cargo-audit 0.17.0 - cargo-outdated 0.11.1 - cbindgen 0.24.3 -- Clippy 0.1.63 +- Clippy 0.1.64 - Rustfmt 1.5.1 ### Browsers and webdrivers - Google Chrome 105.0.5195.127 - Chrome Driver 105.0.5195.52 -- Microsoft Edge 105.0.1343.42 -- Microsoft Edge Driver 105.0.1343.42 -- Mozilla Firefox 104.0.2 +- Microsoft Edge 105.0.1343.50 +- Microsoft Edge Driver 105.0.1343.50 +- Mozilla Firefox 105.0.1 - Gecko Driver 0.31.0 - IE Driver 3.150.1.1 - Selenium server 4.4.0 @@ -165,8 +161,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Version | Architecture | | ------- | ------------ | | 12.22.12 | x64 | -| 14.20.0 | x64 | -| 16.17.0 | x64 | +| 14.20.1 | x64 | +| 16.17.1 | x64 | #### Python | Version | Architecture | @@ -211,7 +207,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Database tools - Azure CosmosDb Emulator 2.14.9.0 -- DacFx 16.0.6161.0 +- DacFx 16.0.6296.0 - MySQL 8.0.30.0 - SQL OLEDB Driver 18.6.3.0 - SQLPS 1.0 @@ -551,7 +547,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 4.8.1 ### .NET tools -- nbgv 3.5.109+bdfbd7dea6 +- nbgv 3.5.113+a908c6d9d2 ### PowerShell Tools - PowerShell 7.2.6 @@ -571,7 +567,7 @@ All other versions are saved but not installed. #### Powershell Modules | Module | Version | | ------------------ | ---------------- | -| AWSPowerShell | 4.1.170 | +| AWSPowerShell | 4.1.175 | | DockerMsftProvider | 1.0.0.8 | | MarkdownPS | 1.9 | | Microsoft.Graph | 1.11.1 | @@ -586,7 +582,7 @@ All other versions are saved but not installed. | Package Name | Version | | -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------ | | Android Command Line Tools | 7.0 | -| Android Emulator | 31.3.10 | +| Android Emulator | 31.3.11 | | Android SDK Build-tools | 33.0.0<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | | Android SDK Platforms | android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | | Android SDK Platform-Tools | 33.0.3 | @@ -616,4 +612,3 @@ All other versions are saved but not installed. | mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:ac76db222126ed259f8ac1ed42e7e4564509ea869ae535e3faae866c01cd7755 | 2022-09-08 | | mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:2846453bcfaee661d563e29d6513191dccf7280bb826b2da9d6e7226fba2db94 | 2022-09-08 | - From 3dc0bd320a239ed57834dd6fea10e1905254c6ea Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 28 Sep 2022 19:15:49 +0000 Subject: [PATCH 1495/3485] Updating readme file for win19 version 20220925.1 (#6306) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2019-Readme.md | 63 +++++++++++++++----------------- 1 file changed, 29 insertions(+), 34 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index 88e98ad06981..ec7d7cfbc30a 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -1,10 +1,6 @@ -| Announcements | -|-| -| [[Windows] Docker EE will be replaced with Docker CE / Moby on September, 19](https://github.com/actions/runner-images/issues/6181) | -*** # Microsoft Windows Server 2019 Datacenter - OS Version: 10.0.17763 Build 3406 -- Image Version: 20220918.1 +- Image Version: 20220925.1 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -16,7 +12,7 @@ - Julia 1.8.1 - Kotlin 1.7.10 - LLVM 14.0.6 -- Node 16.17.0 +- Node 16.17.1 - Perl 5.32.1 - PHP 8.1.10 - Python 3.7.9 @@ -32,7 +28,7 @@ - pip 22.2.2 (python 3.7) - Pipx 1.1.0 - RubyGems 2.7.6.3 -- Vcpkg (build from master \<01b29f6d8>) +- Vcpkg (build from master \<57d3194e7>) - Yarn 1.22.19 #### Environment variables @@ -44,7 +40,7 @@ ### Project Management - Ant 1.10.12 -- Gradle 7.4 +- Gradle 7.5 - Maven 3.8.6 - sbt 1.7.1 @@ -52,25 +48,25 @@ - 7zip 22.01 - aria2 1.36.0 - azcopy 10.16.0 -- Bazel 5.3.0 +- Bazel 5.3.1 - Bazelisk 1.13.2 - Bicep 0.10.61 - Cabal 3.8.1.0 - CMake 3.24.2 - CodeQL Action Bundle 2.10.5 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.11.0 +- Docker Compose v2 2.11.1 - Docker master-dockerproject-2022-03-26 -- Docker-wincred 0.6.4 +- Docker-wincred 0.7.0 - ghc 9.4.2 - Git 2.37.3.windows.1 - Git LFS 3.2.0 -- Google Cloud SDK 402.0.0 -- ImageMagick 7.1.0-48 +- Google Cloud SDK 403.0.0 +- ImageMagick 7.1.0-49 - InnoSetup 6.2.1 - jq 1.6 -- Kind 0.15.0 -- Kubectl 1.25.1 +- Kind 0.16.0 +- Kubectl 1.25.2 - Mercurial 5.0 - Mingw-w64 8.1.0 - Newman 5.3.2 @@ -78,10 +74,10 @@ - OpenSSL 1.1.1 - Packer 1.8.2 - Parcel 2.7.0 -- Pulumi v3.40.0 +- Pulumi v3.40.1 - R 4.2.1 - Service Fabric SDK 9.0.1028.9590 -- Stack 2.7.5 +- Stack 2.9.1 - Subversion (SVN) 1.14.2 - Swig 4.0.2 - VSWhere 3.0.3 @@ -91,20 +87,20 @@ - zstd 1.5.2 ### CLI Tools -- Alibaba Cloud CLI 3.0.125 -- AWS CLI 2.7.33 -- AWS SAM CLI 1.56.1 +- Alibaba Cloud CLI 3.0.127 +- AWS CLI 2.7.35 +- AWS SAM CLI 1.57.0 - AWS Session Manager CLI 1.2.339.0 - Azure CLI 2.40.0 - Azure DevOps CLI extension 0.25.0 - Cloud Foundry CLI 6.53.0 -- GitHub CLI 2.15.0 +- GitHub CLI 2.16.0 - Hub CLI 2.14.2 ### Rust Tools -- Cargo 1.63.0 -- Rust 1.63.0 -- Rustdoc 1.63.0 +- Cargo 1.64.0 +- Rust 1.64.0 +- Rustdoc 1.64.0 - Rustup 1.25.1 #### Packages @@ -112,15 +108,15 @@ - cargo-audit 0.17.0 - cargo-outdated 0.11.1 - cbindgen 0.24.3 -- Clippy 0.1.63 +- Clippy 0.1.64 - Rustfmt 1.5.1 ### Browsers and webdrivers - Google Chrome 105.0.5195.127 - Chrome Driver 105.0.5195.52 -- Microsoft Edge 105.0.1343.42 -- Microsoft Edge Driver 105.0.1343.42 -- Mozilla Firefox 104.0.2 +- Microsoft Edge 105.0.1343.50 +- Microsoft Edge Driver 105.0.1343.50 +- Mozilla Firefox 105.0.1 - Gecko Driver 0.31.0 - IE Driver 3.150.1.1 - Selenium server 4.4.0 @@ -173,8 +169,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Version | Architecture | | ------- | ------------ | | 12.22.12 | x64 | -| 14.20.0 | x64 | -| 16.17.0 | x64 | +| 14.20.1 | x64 | +| 16.17.1 | x64 | #### Python | Version | Architecture | @@ -225,7 +221,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Database tools - Azure CosmosDb Emulator 2.14.9.0 -- DacFx 16.0.6161.0 +- DacFx 16.0.6296.0 - MySQL 5.7.39.0 - SQL OLEDB Driver 18.6.3.0 - SQLPS 1.0 @@ -529,7 +525,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 4.8 ### .NET tools -- nbgv 3.5.109+bdfbd7dea6 +- nbgv 3.5.113+a908c6d9d2 ### PowerShell Tools - PowerShell 7.2.6 @@ -549,7 +545,7 @@ All other versions are saved but not installed. #### Powershell Modules | Module | Version | | ------------------ | ---------------- | -| AWSPowerShell | 4.1.170 | +| AWSPowerShell | 4.1.175 | | DockerMsftProvider | 1.0.0.8 | | MarkdownPS | 1.9 | | Microsoft.Graph | 1.11.1 | @@ -595,4 +591,3 @@ All other versions are saved but not installed. | mcr.microsoft.com/windows/nanoserver:1809 | sha256:92455b285ba046b1aecfd9ab598023c31bbea59149fcb7c02e4427abcbf44d37 | 2022-09-09 | | mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:7450aeee8739b486e1493c44014e9c211cea8391aae7ec25416584b8f4301938 | 2022-09-09 | - From 7c44272788b000b70f9675a3e910c4567de7becb Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Thu, 29 Sep 2022 14:48:58 +0200 Subject: [PATCH 1496/3485] [macOS] Software Updates 2022 Week 40 (#6323) --- images/macos/toolsets/toolset-12.json | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index d69b6e1d2a02..85edcdcbc244 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -21,7 +21,7 @@ "6.12.0.182" ], "ios-versions": [ - "15.12.0.2", "15.10.0.5", "15.8.0.3", "15.6.0.3", "15.4.0.0", "15.2.0.17", "15.0.0.6" + "16.0.0.72", "15.12.0.2", "15.10.0.5", "15.8.0.3", "15.6.0.3", "15.4.0.0", "15.2.0.17", "15.0.0.6" ], "mac-versions": [ "8.12.0.2", "8.10.0.5", "8.8.0.3", "8.6.0.3", "8.4.0.0", "8.2.0.17", "7.14.0.27" @@ -29,8 +29,15 @@ "android-versions": [ "13.0.0.0", "12.3.3.3", "12.2.8.3", "12.1.0.2", "12.0.0.3", "11.3.0.4" ], - "bundle-default": "6_12_19", + "bundle-default": "6_12_20", "bundles": [ + { + "symlink": "6_12_20", + "mono":"6.12", + "ios": "16.0", + "mac": "8.12", + "android": "13.0" + }, { "symlink": "6_12_19", "mono":"6.12", From 4944af825e4e3613906f84079866d703e213f60e Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Thu, 29 Sep 2022 20:02:58 +0300 Subject: [PATCH 1497/3485] Add Chrome + Chromedriver test (#6326) --- images/macos/tests/Browsers.Tests.ps1 | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/images/macos/tests/Browsers.Tests.ps1 b/images/macos/tests/Browsers.Tests.ps1 index 6020a8df5286..cf8ce3a201cd 100644 --- a/images/macos/tests/Browsers.Tests.ps1 +++ b/images/macos/tests/Browsers.Tests.ps1 @@ -1,6 +1,9 @@ Describe "Chrome" { - It "Chrome" { + BeforeAll { $chromeLocation = "/Applications/Google Chrome.app/Contents/MacOS/Google Chrome" + } + + It "Chrome" { $chromeLocation | Should -Exist "'$chromeLocation' --version" | Should -ReturnZeroExitCode } @@ -8,6 +11,12 @@ Describe "Chrome" { It "Chrome Driver" { "chromedriver --version" | Should -ReturnZeroExitCode } + + It "Chrome and Chrome Driver major versions are the same" { + $chromeMajor = (& $chromeLocation --version).Trim("Google Chrome ").Split(".")[0] + $chromeDriverMajor = (chromedriver --version).Trim("ChromeDriver ").Split(".")[0] + $chromeMajor | Should -BeExactly $chromeDriverMajor + } } Describe "Selenium server" { From 0ca065b7c2c5f5d9aabe8d3c61969f772f215f2a Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Thu, 29 Sep 2022 21:58:02 +0200 Subject: [PATCH 1498/3485] Close System Preferences window (#6329) --- images/macos/provision/core/commonutils.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/images/macos/provision/core/commonutils.sh b/images/macos/provision/core/commonutils.sh index 5ec148514601..6e8af564fbbf 100644 --- a/images/macos/provision/core/commonutils.sh +++ b/images/macos/provision/core/commonutils.sh @@ -45,6 +45,10 @@ fi # Validate "Parallels International GmbH" kext if is_Monterey; then + echo "Closing System Preferences window if it is still opened" + killall "System Preferences" || true + + echo "Checking parallels kexts" dbName="/var/db/SystemPolicyConfiguration/KextPolicy" dbQuery="SELECT * FROM kext_policy WHERE bundle_id LIKE 'com.parallels.kext.%';" kext=$(sudo sqlite3 $dbName "$dbQuery") From 2ebc6b71c95518335aafff2f8d520b17310bfae7 Mon Sep 17 00:00:00 2001 From: bogdan-damian-bgd <108331162+bogdan-damian-bgd@users.noreply.github.com> Date: Fri, 30 Sep 2022 06:47:42 +0200 Subject: [PATCH 1499/3485] Exclude Colima from tests for macOS 10.15 (#6325) --- images/macos/tests/Common.Tests.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/macos/tests/Common.Tests.ps1 b/images/macos/tests/Common.Tests.ps1 index 0aaf45ecc060..ad1a19876f22 100644 --- a/images/macos/tests/Common.Tests.ps1 +++ b/images/macos/tests/Common.Tests.ps1 @@ -151,7 +151,7 @@ Describe "CodeQL" -Skip:($os.IsCatalina) { } } -Describe "Colima" { +Describe "Colima" -Skip:($os.IsCatalina) { It "Colima" { "colima version" | Should -ReturnZeroExitCode } From f535d0e8dd45fae19c763122ae0b514b1b1cee85 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Fri, 30 Sep 2022 07:48:15 +0300 Subject: [PATCH 1500/3485] Add Chrome + Chromedriver test (#6330) --- images/linux/scripts/tests/Browsers.Tests.ps1 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/images/linux/scripts/tests/Browsers.Tests.ps1 b/images/linux/scripts/tests/Browsers.Tests.ps1 index 1bb7b8f70631..db1c30ef615a 100644 --- a/images/linux/scripts/tests/Browsers.Tests.ps1 +++ b/images/linux/scripts/tests/Browsers.Tests.ps1 @@ -16,6 +16,12 @@ Describe "Chrome" { It "Chrome Driver" { "chromedriver --version" | Should -ReturnZeroExitCode } + + It "Chrome and Chrome Driver major versions are the same" { + $chromeMajor = (google-chrome --version).Trim("Google Chrome ").Split(".")[0] + $chromeDriverMajor = (chromedriver --version).Trim("ChromeDriver ").Split(".")[0] + $chromeMajor | Should -BeExactly $chromeDriverMajor + } } Describe "Edge" { From c675cda187f13224303c88786c25b427c6cd1647 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 30 Sep 2022 13:16:21 +0300 Subject: [PATCH 1501/3485] Ubuntu 18.04 (20220923 update) (#6294) * Updating readme file for ubuntu18 version 20220923.1 * Update Ubuntu1804-Readme.md Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> --- images/linux/Ubuntu1804-Readme.md | 240 +++++++++++++++--------------- 1 file changed, 123 insertions(+), 117 deletions(-) diff --git a/images/linux/Ubuntu1804-Readme.md b/images/linux/Ubuntu1804-Readme.md index 6509a7c50141..b06a0fefecee 100644 --- a/images/linux/Ubuntu1804-Readme.md +++ b/images/linux/Ubuntu1804-Readme.md @@ -1,14 +1,11 @@ | Announcements | |-| -| [Ubuntu 22.04 is generally available starting from August, 8](https://github.com/actions/virtual-environments/issues/5998) | -| ['virtual-environments' repository name will be changed to 'runner-images' on August, 8th](https://github.com/actions/virtual-environments/issues/5967) | -| [[all OSs] Android NDK 21 will be replaced in favor of 25 on August, 1st](https://github.com/actions/virtual-environments/issues/5930) | -| [[all OSs] Android ndk-bundle along with old NDK versions will be deprecated on July, 24](https://github.com/actions/virtual-environments/issues/5879) | -| [(Public Beta) Ubuntu 22.04 is now available](https://github.com/actions/virtual-environments/issues/5490) | +| [[Ubuntu] homebrew will be removed from $PATH](https://github.com/actions/runner-images/issues/6283) | +| [The Ubuntu 18.04 Actions runner image will begin deprecation on 8/8/22 and will be fully unsupported by 4/1/2023](https://github.com/actions/runner-images/issues/6002) | *** # Ubuntu 18.04.6 LTS -- Linux kernel version: 5.4.0-1086-azure -- Image Version: 20220729.1 +- Linux kernel version: 5.4.0-1091-azure +- Image Version: 20220923.1 ## Installed Software ### Language and Runtime @@ -17,44 +14,53 @@ - Clang-format 9.0.0 - Clang-tidy 9.0.0 - Dash 0.5.8-2.10 -- Erlang 25.0.3 (Eshell 13.0.3) +- Erlang 25.0.4 (Eshell 13.0.4) - Erlang rebar3 3.19.0 - GNU C++ 7.5.0, 9.4.0, 10.3.0 - GNU Fortran 7.5.0, 9.4.0, 10.3.0 -- Julia 1.7.3 +- Julia 1.8.1 - Kotlin 1.7.10-release-333 - Mono 6.12.0.182 (apt source repository: https://download.mono-project.com/repo/ubuntu stable-bionic main) - MSBuild 16.10.1.31701 (from /usr/lib/mono/msbuild/15.0/bin/MSBuild.dll) -- Node 16.16.0 +- Node 16.17.0 - Perl 5.26.1 - Python 2.7.17 - Python3 3.6.9 - Ruby 2.5.1p57 -- Swift 5.6.2 +- Swift 5.7 ### Package Management - cpan 1.64 -- Helm 3.9.2 -- Homebrew 3.5.6 +- Helm 3.10.0 +- Homebrew 3.6.2 - Miniconda 4.12.0 -- Npm 8.11.0 +- Npm 8.15.0 - NuGet 6.2.1.2 - Pip 9.0.1 - Pip3 9.0.1 - Pipx 1.0.0 - RubyGems 2.7.6 -- Vcpkg (build from master \<281d2f2dc>) +- Vcpkg (build from master \<86eb754bc>) - Yarn 1.22.19 +##### Notes: +``` +Location: /home/linuxbrew +Note: Homebrew is pre-installed on image but not added to PATH. +run the eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)" command +to accomplish this. +``` + #### Environment variables | Name | Value | | ----------------------- | ---------------------- | | CONDA | /usr/share/miniconda | | VCPKG_INSTALLATION_ROOT | /usr/local/share/vcpkg | +| VCPKG_ROOT | /usr/local/share/vcpkg | ### Project Management - Ant 1.10.5 -- Gradle 7.5 +- Gradle 7.5.1 - Maven 3.8.6 - Sbt 1.7.1 @@ -62,110 +68,110 @@ - Ansible 2.11.12 - apt-fast 1.9.12 - AzCopy 10.16.0 (available by `azcopy` and `azcopy10` aliases) -- Bazel 5.2.0 -- Bazelisk 1.12.0 -- Bicep 0.8.9 +- Bazel 5.3.1 +- Bazelisk 1.13.2 +- Bicep 0.10.61 - Buildah 1.22.3 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- CMake 3.23.3 -- CodeQL Action Bundle 2.10.1 +- CMake 3.24.2 +- CodeQL Action Bundle 2.10.5 - Docker Amazon ECR Credential Helper 0.6.0 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.6.1+azure-1 -- Docker-Buildx 0.8.2 -- Docker-Moby Client 20.10.17+azure-1 -- Docker-Moby Server 20.10.17+azure-1 -- Git 2.37.1 (apt source repository: ppa:git-core/ppa) +- Docker Compose v2 2.11.0+azure-1 +- Docker-Buildx 0.9.1 +- Docker-Moby Client 20.10.18+azure-1 +- Docker-Moby Server 20.10.18+azure-1 +- Git 2.37.3 (apt source repository: ppa:git-core/ppa) - Git LFS 3.2.0 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.3.1 - Haveged 1.9.1 -- Heroku 7.60.2 +- Heroku 7.63.4 - HHVM (HipHop VM) 4.164.0 - jq 1.5 -- Kind 0.14.0 -- Kubectl 1.24.3 -- Kustomize 4.5.6 -- Leiningen 2.9.8 +- Kind 0.16.0 +- Kubectl 1.25.2 +- Kustomize 4.5.7 +- Leiningen 2.9.10 - MediaInfo 17.12 - Mercurial 4.5.3 -- Minikube 1.26.0 +- Minikube 1.27.0 - n 9.0.0 - Newman 5.3.2 - nvm 0.39.1 - OpenSSL 1.1.1-1ubuntu2.1~18.04.20 -- Packer 1.8.2 -- Parcel 2.6.2 +- Packer 1.8.3 +- Parcel 2.7.0 - PhantomJS 2.1.1 - Podman 3.4.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- Pulumi 3.37.1 -- R 4.2.0 +- Pulumi 3.40.1 +- R 4.2.1 - Skopeo 1.5.0 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 - SVN 1.9.7 -- Terraform 1.2.6 -- yamllint 1.27.1 -- yq 4.26.1 +- Terraform 1.3.0 +- yamllint 1.28.0 +- yq 4.27.5 - zstd 1.5.2 (homebrew) ### CLI Tools -- Alibaba Cloud CLI 3.0.124 -- AWS CLI 2.7.20 +- Alibaba Cloud CLI 3.0.127 +- AWS CLI 2.7.34 - AWS CLI Session manager plugin 1.2.339.0 -- AWS SAM CLI 1.53.0 -- Azure CLI (azure-cli) 2.38.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) +- AWS SAM CLI 1.57.0 +- Azure CLI (azure-cli) 2.40.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.25.0 -- GitHub CLI 2.14.3 -- Google Cloud SDK 369.0.0 (apt source repository: https://packages.cloud.google.com/apt) +- GitHub CLI 2.16.0 +- Google Cloud SDK 403.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 10.13.0 -- OpenShift CLI 4.10.24 -- ORAS CLI 0.13.0 -- Vercel CLI 27.3.3 +- Netlify CLI 11.8.2 +- OpenShift CLI 4.11.5 +- ORAS CLI 0.14.1 +- Vercel CLI 28.4.2 ### Java | Version | Vendor | Environment Variable | | ------------------- | --------------- | -------------------- | -| 8.0.332+9 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | -| 11.0.16+8 | Eclipse Temurin | JAVA_HOME_11_X64 | +| 8.0.345+1 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | +| 11.0.16+1 | Eclipse Temurin | JAVA_HOME_11_X64 | | 12.0.2+10 | Adopt OpenJDK | JAVA_HOME_12_X64 | -| 17.0.4+8 | Eclipse Temurin | JAVA_HOME_17_X64 | +| 17.0.4+1 | Eclipse Temurin | JAVA_HOME_17_X64 | ### PHP -| Tool | Version | -| -------- | --------------------------------- | -| PHP | 7.2.34 7.3.33 7.4.30 8.0.21 8.1.8 | -| Composer | 2.3.10 | -| PHPUnit | 8.5.28 | +| Tool | Version | +| -------- | ---------------------------------- | +| PHP | 7.2.34 7.3.33 7.4.30 8.0.23 8.1.10 | +| Composer | 2.4.2 | +| PHPUnit | 8.5.29 | ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ``` ### Haskell - Cabal 3.6.2.0 -- GHC 9.2.4 -- GHCup 0.1.17.8 -- Stack 2.7.5 +- GHC 9.4.2 +- GHCup 0.1.18.0 +- Stack 2.9.1 ### Rust Tools -- Cargo 1.62.1 -- Rust 1.62.1 -- Rustdoc 1.62.1 +- Cargo 1.64.0 +- Rust 1.64.0 +- Rustdoc 1.64.0 - Rustup 1.25.1 #### Packages - Bindgen 0.60.1 - Cargo audit 0.17.0 -- Cargo clippy 0.1.62 +- Cargo clippy 0.1.64 - Cargo outdated 0.11.1 - Cbindgen 0.24.3 -- Rustfmt 1.4.38 +- Rustfmt 1.5.1 ### Browsers and Drivers -- Google Chrome 103.0.5060.134 -- ChromeDriver 103.0.5060.134 -- Chromium 103.0.5060.0 -- Microsoft Edge 103.0.1264.77 (apt source repository: https://packages.microsoft.com/repos/edge) -- Microsoft Edge WebDriver 103.0.1264.77 -- Selenium server 4.3.0 -- Mozilla Firefox 103.0 +- Google Chrome 105.0.5195.125 +- ChromeDriver 105.0.5195.52 +- Chromium 105.0.5177.0 +- Microsoft Edge 105.0.1343.50 (apt source repository: https://packages.microsoft.com/repos/edge) +- Microsoft Edge WebDriver 105.0.1343.42 +- Selenium server 4.4.0 +- Mozilla Firefox 104.0 - Geckodriver 0.31.0 #### Environment variables @@ -177,17 +183,17 @@ | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | ### .NET Core SDK -- 3.1.120 3.1.202 3.1.302 3.1.421 5.0.104 5.0.214 5.0.303 5.0.408 6.0.302 +- 3.1.120 3.1.202 3.1.302 3.1.423 5.0.104 5.0.214 5.0.303 5.0.408 6.0.401 ### .NET tools -- nbgv 3.5.108+6e793d63d3 +- nbgv 3.5.113+a908c6d9d2 ### Databases -- MongoDB 5.0.10 (apt source repository: https://repo.mongodb.org/apt/ubuntu) +- MongoDB 5.0.12 (apt source repository: https://repo.mongodb.org/apt/ubuntu) - sqlite3 3.22.0 #### PostgreSQL -- PostgreSQL 14.4 (apt source repository: https://apt.postgresql.org/pub/repos/apt/) +- PostgreSQL 14.5 (apt source repository: https://apt.postgresql.org/pub/repos/apt/) - PostgreSQL Server (user:postgres) ``` @@ -202,18 +208,18 @@ ``` #### MS SQL Server Client Tools - sqlcmd 17.10.0001.1 -- SqlPackage 16.0.6161.0 +- SqlPackage 16.0.6296.0 ### Cached Tools #### Go - 1.16.15 -- 1.17.12 -- 1.18.4 +- 1.17.13 +- 1.18.6 #### Node.js - 12.22.12 - 14.20.0 -- 16.16.0 +- 16.17.0 #### PyPy - 2.7.18 [PyPy 7.3.9] @@ -223,10 +229,10 @@ #### Python - 2.7.18 - 3.6.15 -- 3.7.13 -- 3.8.13 -- 3.9.13 -- 3.10.5 +- 3.7.14 +- 3.8.14 +- 3.9.14 +- 3.10.7 #### Ruby - 2.4.10 @@ -240,17 +246,17 @@ | Name | Value | Architecture | | --------------- | ----------------------------------- | ------------ | | GOROOT_1_16_X64 | /opt/hostedtoolcache/go/1.16.15/x64 | x64 | -| GOROOT_1_17_X64 | /opt/hostedtoolcache/go/1.17.12/x64 | x64 | -| GOROOT_1_18_X64 | /opt/hostedtoolcache/go/1.18.4/x64 | x64 | +| GOROOT_1_17_X64 | /opt/hostedtoolcache/go/1.17.13/x64 | x64 | +| GOROOT_1_18_X64 | /opt/hostedtoolcache/go/1.18.6/x64 | x64 | ### PowerShell Tools -- PowerShell 7.2.5 +- PowerShell 7.2.6 #### PowerShell Modules | Module | Version | | --------------- | ------- | | MarkdownPS | 1.9 | -| Microsoft.Graph | 1.10.0 | +| Microsoft.Graph | 1.12.1 | | Pester | 5.3.3 | #### Az PowerShell Modules @@ -266,9 +272,9 @@ | Package Name | Version | | -------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 7.0 | -| Android Emulator | 31.2.10 | +| Android Emulator | 31.3.11 | | Android SDK Build-tools | 33.0.0<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3<br>26.0.0 26.0.1 26.0.2 26.0.3<br>25.0.0 25.0.1 25.0.2 25.0.3<br>24.0.0 24.0.1 24.0.2 24.0.3<br>23.0.1 23.0.2 23.0.3 | -| Android SDK Platform-Tools | 33.0.2 | +| Android SDK Platform-Tools | 33.0.3 | | Android SDK Platforms | android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3)<br>android-26 (rev 2)<br>android-25 (rev 3)<br>android-24 (rev 2)<br>android-23 (rev 3) | | Android SDK Tools | 26.1.1 | | Android Support Repository | 47.0.0 | @@ -276,41 +282,41 @@ | Google APIs | addon-google_apis-google-21<br>addon-google_apis-google-22<br>addon-google_apis-google-23<br>addon-google_apis-google-24 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 23.2.8568313<br>24.0.8215888<br>25.0.8775105 (default) | +| NDK | 23.2.8568313<br>24.0.8215888<br>25.1.8937393 (default) | | SDK Patch Applier v4 | 1 | #### Environment variables | Name | Value | | ----------------------- | ------------------------------------------- | | ANDROID_HOME | /usr/local/lib/android/sdk | -| ANDROID_NDK | /usr/local/lib/android/sdk/ndk/25.0.8775105 | -| ANDROID_NDK_HOME | /usr/local/lib/android/sdk/ndk/25.0.8775105 | -| ANDROID_NDK_LATEST_HOME | /usr/local/lib/android/sdk/ndk/25.0.8775105 | -| ANDROID_NDK_ROOT | /usr/local/lib/android/sdk/ndk/25.0.8775105 | +| ANDROID_NDK | /usr/local/lib/android/sdk/ndk/25.1.8937393 | +| ANDROID_NDK_HOME | /usr/local/lib/android/sdk/ndk/25.1.8937393 | +| ANDROID_NDK_LATEST_HOME | /usr/local/lib/android/sdk/ndk/25.1.8937393 | +| ANDROID_NDK_ROOT | /usr/local/lib/android/sdk/ndk/25.1.8937393 | | ANDROID_SDK_ROOT | /usr/local/lib/android/sdk | ### Cached Docker images | Repository:Tag | Digest | Created | | ----------------------- | ------------------------------------------------------------------------ | ---------- | | alpine:3.12 | sha256:c75ac27b49326926b803b9ed43bf088bc220d22556de1bc5f72d742c91398f69 | 2022-04-05 | -| alpine:3.13 | sha256:7769c38ce671534a0ddbf98633f17edbbd4a4e99cbc77ef42f9f7b78b6a1c6c2 | 2022-07-19 | -| alpine:3.14 | sha256:43eb8f0d8215d8661f745f3d88563c026614d843b668b233bbe1666b6d026f61 | 2022-07-19 | -| buildpack-deps:bullseye | sha256:025c1b80248fb37b1f5250aba9e578e1dc24066912d94d3fa37c21bf8ee98b30 | 2022-07-12 | -| buildpack-deps:buster | sha256:0adb423c3161e19606330068d8d3d7710f1bb1b2233e6964ba329c79a96babb2 | 2022-07-12 | +| alpine:3.13 | sha256:100448e45467d4f3838fc8d95faab2965e22711b6edf67bbd8ec9c07f612b553 | 2022-08-09 | +| alpine:3.14 | sha256:1ab24b3b99320975cca71716a7475a65d263d0b6b604d9d14ce08f7a3f67595c | 2022-08-09 | +| buildpack-deps:bullseye | sha256:19683807e2587d777766573697f9488b0c88677ee06313e69197fbaa42e80319 | 2022-09-13 | +| buildpack-deps:buster | sha256:caa4ae706b59e2ca4b7786a44a08617447f81b516507a70a4ca43665b479c4e3 | 2022-09-13 | | buildpack-deps:stretch | sha256:78e995165a5788c2f55aed6e548d8f6c1534830d4310c870408fccb2da8c5b2e | 2022-06-23 | -| debian:10 | sha256:0685c900f6e691bdda6980c0ed0779d20183bc58770059b64adb56cb8a3129f0 | 2022-07-12 | -| debian:11 | sha256:2ce44bbc00a79113c296d9d25524e15d423b23303fdbbe20190d2f96e0aeb251 | 2022-07-12 | +| debian:10 | sha256:2f35b84014a5389e2a940113c51586bc067a05040ba181dee92c5a9fa9b15dcb | 2022-09-13 | +| debian:11 | sha256:3e82b1af33607aebaeb3641b75d6e80fd28d36e17993ef13708e9493e30e8ff9 | 2022-09-13 | | debian:9 | sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be | 2022-06-23 | -| moby/buildkit:latest | sha256:0dc312b04eac1b44cd2cad566deb1e886c753109208affbbec8384f381ff7f38 | 2022-05-06 | +| moby/buildkit:latest | sha256:67c9251f9f2e103e1ee489b6cead518b6d82607ef485d3f1505fc4095a55ebeb | 2022-08-22 | | node:12 | sha256:01627afeb110b3054ba4a1405541ca095c8bfca1cb6f2be9479c767a2711879e | 2022-04-20 | | node:12-alpine | sha256:d4b15b3d48f42059a15bd659be60afe21762aae9d6cbea6f124440895c27db68 | 2022-04-11 | -| node:14 | sha256:8ae0e9298b6098f6641e35d0488477381f86fce04993a3f8060a7657db8fb928 | 2022-07-12 | -| node:14-alpine | sha256:e22ee6a906e823dc592d6022a3f520676575b50320fe2c3916c88acb16f471ce | 2022-07-18 | -| node:16 | sha256:4e85818bd0d023d4f9025730dc0640d3d8269e3d1a84ce6365eca8fbad7a3ee9 | 2022-07-12 | -| node:16-alpine | sha256:aadb411a5d398d2141f36a61f469ab91b971e43988d6c74aa5204986e5fe18a1 | 2022-07-18 | -| ubuntu:16.04 | sha256:20858ebbc96215d6c3c574f781133ebffdc7c18d98af4f294cc4c04871a6fe61 | 2021-08-31 | -| ubuntu:18.04 | sha256:478caf1bec1afd54a58435ec681c8755883b7eb843a8630091890130b15a79af | 2022-06-06 | -| ubuntu:20.04 | sha256:fd92c36d3cb9b1d027c4d2a72c6bf0125da82425fc2ca37c414d4f010180dc19 | 2022-06-06 | +| node:14 | sha256:6adfb0c2a9db12a06893974bb140493a7482e2b3df59c058590594ceecd0c99b | 2022-09-13 | +| node:14-alpine | sha256:4aff4ba0da347e51561587eba037a38db4eaa70e1a6c8334d66779fe963d5be7 | 2022-08-09 | +| node:16 | sha256:a5d9200d3b8c17f0f3d7717034a9c215015b7aae70cb2a9d5e5dae7ff8aa6ca8 | 2022-09-13 | +| node:16-alpine | sha256:2c405ed42fc0fd6aacbe5730042640450e5ec030bada7617beac88f742b6997b | 2022-08-16 | +| ubuntu:16.04 | sha256:91bd29a464fdabfcf44e29e1f2a5f213c6dfa750b6290e40dd6998ac79da3c41 | 2021-08-31 | +| ubuntu:18.04 | sha256:6fec50623d6d37b7f3c14c5b6fc36c73fd04aa8173d59d54dba00da0e7ac50ee | 2022-09-06 | +| ubuntu:20.04 | sha256:35ab2bf57814e9ff49e365efd5a5935b6915eede5c7f8581e9e1b85e0eecbe16 | 2022-09-01 | ### Installed apt packages | Name | Version | @@ -324,9 +330,9 @@ | build-essential | 12.4ubuntu1 | | bzip2 | 1.0.6-8.1ubuntu0.2 | | coreutils | 8.28-1ubuntu1 | -| curl | 7.58.0-2ubuntu3.19 | +| curl | 7.58.0-2ubuntu3.20 | | dbus | 1.12.2-1ubuntu1.3 | -| dnsutils | 1:9.11.3+dfsg-1ubuntu1.17 | +| dnsutils | 1:9.11.3+dfsg-1ubuntu1.18 | | dpkg | 1.19.0.5ubuntu2.4 | | fakeroot | 1.22-2ubuntu1 | | file | 1:5.32-2ubuntu0.4 | @@ -338,10 +344,10 @@ | iproute2 | 4.15.0-2ubuntu1.3 | | iputils-ping | 3:20161105-1ubuntu3 | | jq | 1.5+dfsg-2 | -| lib32z1 | 1:1.2.11.dfsg-0ubuntu2.1 | +| lib32z1 | 1:1.2.11.dfsg-0ubuntu2.2 | | libc++-dev | 6.0-2 | | libc++abi-dev | 6.0-2 | -| libcurl3 | 7.58.0-2ubuntu3.19 | +| libcurl3 | 7.58.0-2ubuntu3.20 | | libgbm-dev | 20.0.8-0ubuntu1\~18.04.1 | | libgconf-2-4 | 3.2.6-4ubuntu1 | | libgsl-dev | 2.4+dfsg-6 | @@ -350,7 +356,7 @@ | libmagickcore-dev | 8:6.9.7.4+dfsg-16ubuntu6.13 | | libmagickwand-dev | 8:6.9.7.4+dfsg-16ubuntu6.13 | | libsecret-1-dev | 0.18.6-1 | -| libsqlite3-dev | 3.22.0-1ubuntu0.5 | +| libsqlite3-dev | 3.22.0-1ubuntu0.6 | | libtool | 2.4.6-2 | | libunwind8 | 1.2.1-8 | | libxkbfile-dev | 1:1.0.9-2 | @@ -371,10 +377,10 @@ | pollinate | 4.33-0ubuntu1\~18.04.2 | | python-setuptools | 39.0.1-2 | | rpm | 4.14.1+dfsg1-2 | -| rsync | 3.1.2-2.1ubuntu1.4 | +| rsync | 3.1.2-2.1ubuntu1.5 | | shellcheck | 0.4.6-1 | | sphinxsearch | 2.2.11-2 | -| sqlite3 | 3.22.0-1ubuntu0.5 | +| sqlite3 | 3.22.0-1ubuntu0.6 | | ssh | 1:7.6p1-4ubuntu0.7 | | sshpass | 1.06-1 | | subversion | 1.9.7-4ubuntu1.1 | @@ -384,7 +390,7 @@ | texinfo | 6.5.0.dfsg.1-2 | | time | 1.7-25.1build1 | | tk | 8.6.0+9 | -| tzdata | 2022a-0ubuntu0.18.04 | +| tzdata | 2022c-0ubuntu0.18.04.0 | | unzip | 6.0-21ubuntu1.1 | | upx | 3.94-4 | | wget | 1.19.4-1ubuntu2.2 | From 1def28243de16d4b555a9475f871bac5aad465fa Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Fri, 30 Sep 2022 21:07:26 +0300 Subject: [PATCH 1502/3485] [Windows] Test Chrome and Chrome Driver major versions are the same (#6332) * Add Chrome + Chromedriver test * Get chromedriver version from versioninfo.txt * Use VersionInfo.ProductMajorPart * Add missing test cases block --- images/win/scripts/Tests/Browsers.Tests.ps1 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/images/win/scripts/Tests/Browsers.Tests.ps1 b/images/win/scripts/Tests/Browsers.Tests.ps1 index 89fd9b5e6cdf..ba5db877abf0 100644 --- a/images/win/scripts/Tests/Browsers.Tests.ps1 +++ b/images/win/scripts/Tests/Browsers.Tests.ps1 @@ -47,6 +47,12 @@ Describe "Chrome" { $chromePath | Should -Exist $chromeName | Should -BeExactly "chrome.exe" } + + It "Chrome and Chrome Driver major versions are the same" -TestCases @{chromePath = $chromePath} { + $chromeMajor = (Get-Item $chromePath).VersionInfo.ProductMajorPart + $chromeDriverMajor = (Get-Content $env:ChromeWebDriver\versioninfo.txt).Split(".")[0] + $chromeMajor | Should -BeExactly $chromeDriverMajor + } } } From e39db348e52f9484333082e6f927c0a08f0dbd32 Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Tue, 4 Oct 2022 11:09:52 +0200 Subject: [PATCH 1503/3485] [Ubuntu] Add new alpine Docker images (#6343) --- images/linux/toolsets/toolset-2004.json | 2 ++ images/linux/toolsets/toolset-2204.json | 1 + 2 files changed, 3 insertions(+) diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index bb02ac68adce..8f1eabd8b655 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -231,6 +231,8 @@ "alpine:3.12", "alpine:3.13", "alpine:3.14", + "alpine:3.15", + "alpine:3.16", "buildpack-deps:stretch", "buildpack-deps:buster", "buildpack-deps:bullseye", diff --git a/images/linux/toolsets/toolset-2204.json b/images/linux/toolsets/toolset-2204.json index f16f0ec670aa..c9a54a7c7f2c 100644 --- a/images/linux/toolsets/toolset-2204.json +++ b/images/linux/toolsets/toolset-2204.json @@ -210,6 +210,7 @@ "images": [ "alpine:3.14", "alpine:3.15", + "alpine:3.16", "buildpack-deps:buster", "buildpack-deps:bullseye", "debian:10", From 9dcc6a79fa98209c2f605500b107b2f672ca12fc Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 4 Oct 2022 12:05:28 +0000 Subject: [PATCH 1504/3485] Updating readme file for macOS-12 version 20220929.2 (#6341) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-12-Readme.md | 123 ++++++++++++++++++-------------- 1 file changed, 68 insertions(+), 55 deletions(-) diff --git a/images/macos/macos-12-Readme.md b/images/macos/macos-12-Readme.md index 25add0d1c146..7b6093facb4c 100644 --- a/images/macos/macos-12-Readme.md +++ b/images/macos/macos-12-Readme.md @@ -1,18 +1,18 @@ | Announcements | |-| -| [[macOS] Default Xcode on macOS 12 Monterey will be set to Xcode 14.0.1 on September, 26](https://github.com/actions/runner-images/issues/6225) | +| [[macOS] Default Xcode on macOS 12 Monterey will be set to Xcode 14.0.1 on October, 3](https://github.com/actions/runner-images/issues/6225) | | [The macOS 10.15 Actions runner image will begin deprecation on 5/31/22 and will be fully unsupported by 12/1/22 for GitHub and ADO](https://github.com/actions/runner-images/issues/5583) | *** # macOS 12.6 info - System Version: macOS 12.6 (21G115) - Kernel Version: Darwin 21.6.0 -- Image Version: 20220917.1 +- Image Version: 20220929.2 ## Installed Software ### Language and Runtime - .NET SDK 3.1.101 3.1.201 3.1.302 3.1.423 5.0.102 5.0.202 5.0.302 5.0.408 6.0.401 - Bash 3.2.57(1)-release -- Clang/LLVM 13.1.6 is default +- Clang/LLVM 14.0.0 is default - Clang/LLVM 14.0.6 is available on `'$(brew --prefix llvm@14)/bin/clang'` - gcc-11 (Homebrew GCC 11.3.0) 11.3.0 - available by `gcc-11` alias - GNU Fortran (Homebrew GCC 11.3.0) 11.3.0 - available by `gfortran-11` alias @@ -20,11 +20,11 @@ - julia 1.8.1 - Kotlin 1.7.10-release-333 - MSBuild 16.10.1.31401 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) -- Node.js v16.17.0 +- Node.js v16.17.1 - NVM 0.39.1 -- NVM - Cached node versions: v12.22.12 v14.20.0 v16.17.0 +- NVM - Cached node versions: v12.22.12 v14.20.1 v16.17.1 - Perl 5.34.0 -- PHP 8.1.10 +- PHP 8.1.11 - Python 2.7.18 - Python 3.10.6 - R 4.2.1 @@ -35,7 +35,7 @@ - Carthage 0.38.0 - CocoaPods 1.11.3 - Composer 2.4.2 -- Homebrew 3.6.1 +- Homebrew 3.6.3 - Miniconda 4.12.0 - NPM 8.15.0 - NuGet 6.2.1.2 @@ -43,7 +43,7 @@ - Pip 22.2.2 (python 3.10) - Pipx 1.1.0 - RubyGems 3.3.22 -- Vcpkg 2022 (build from master \<01b29f6d8>) +- Vcpkg 2022 (build from master \<2f0a16b5a>) - Yarn 1.22.19 #### Environment variables @@ -63,18 +63,18 @@ - 7-Zip 17.04 - aria2 1.36.0 - azcopy 10.16.0 -- bazel 5.3.0 +- bazel 5.3.1 - bazelisk 1.14.0 - bsdtar 3.5.1 - available by 'tar' alias - Curl 7.85.0 - Git 2.37.3 - Git LFS: 3.2.0 -- GitHub CLI: 2.15.0 +- GitHub CLI: 2.16.1 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.3 - gpg (GnuPG) 2.3.7 - Hub CLI: 2.14.2 -- ImageMagick 7.1.0-48 +- ImageMagick 7.1.0-49 - jq 1.6 - mongo v5.0.11 - mongod v5.0.11 @@ -92,21 +92,22 @@ ### Tools - App Center CLI 2.11.0 -- AWS CLI 2.7.33 -- AWS SAM CLI 1.56.1 +- AWS CLI 2.7.35 +- AWS SAM CLI 1.58.0 - AWS Session Manager CLI 1.2.339.0 - Azure CLI (azure-devops) 0.25.0 - Azure CLI 2.40.0 - Bicep CLI 0.10.61 - Cabal 3.6.2.0 - Cmake 3.24.2 -- CodeQL Action Bundle 2.10.5 -- Fastlane 2.210.0 +- CodeQL Action Bundle 2.11.0 +- Colima 0.4.5 +- Fastlane 2.210.1 - GHC 9.4.2 - GHCup 0.1.18.0 - Jazzy 0.14.3 -- Stack 2.7.5 -- SwiftFormat 0.49.18 +- Stack 2.9.1 +- SwiftFormat 0.50.0 - Swig 4.0.2 - Xcode Command Line Tools 14.0.0.0.1.1661618636 @@ -117,18 +118,18 @@ ### Browsers - Safari 16.0 (17614.1.25.9.10) - SafariDriver 16.0 (17614.1.25.9.10) -- Google Chrome 105.0.5195.125 -- ChromeDriver 105.0.5195.52 -- Microsoft Edge 105.0.1343.42 -- Microsoft Edge WebDriver 105.0.1343.42 -- Mozilla Firefox 104.0.2 +- Google Chrome 106.0.5249.61 +- ChromeDriver 106.0.5249.61 +- Microsoft Edge 105.0.1343.53 +- Microsoft Edge WebDriver 105.0.1343.53 +- Mozilla Firefox 105.0.1 - geckodriver 0.31.0 -- Selenium server 4.4.0 +- Selenium server 4.5.0 #### Environment variables | Name | Value | | --------------- | ---------------------------------------------- | -| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/105.0.5195.52 | +| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/106.0.5249.61 | | EDGEWEBDRIVER | /usr/local/share/edge_driver | | GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | @@ -164,8 +165,8 @@ #### Node.js - 12.22.12 -- 14.20.0 -- 16.17.0 +- 14.20.1 +- 16.17.1 #### Go | Version | Architecture | Environment Variable | @@ -175,9 +176,9 @@ | 1.19.1 | x64 | GOROOT_1_19_X64 | ### Rust Tools -- Cargo 1.63.0 -- Rust 1.63.0 -- Rustdoc 1.63.0 +- Cargo 1.64.0 +- Rust 1.64.0 +- Rustdoc 1.64.0 - Rustup 1.25.1 #### Packages @@ -185,7 +186,7 @@ - Cargo-audit 0.17.0 - Cargo-outdated 0.11.1 - Cbindgen 0.24.3 -- Clippy 0.1.63 +- Clippy 0.1.64 - Rustfmt 1.5.1-stable ### PowerShell Tools @@ -197,7 +198,7 @@ | Az | 8.3.0 | | MarkdownPS | 1.9 | | Pester | 5.3.3 | -| PSScriptAnalyzer | 1.20.0 | +| PSScriptAnalyzer | 1.21.0 | ### Web Servers | Name | Version | ConfigFile | ServiceStatus | ListenPort | @@ -210,7 +211,7 @@ | Version | Build | Path | | -------------- | --------- | ------------------------------------ | | 2019 | 8.10.25.2 | /Applications/Visual Studio 2019.app | -| 2022 (default) | 17.3.5.0 | /Applications/Visual Studio.app | +| 2022 (default) | 17.3.6.20 | /Applications/Visual Studio.app | ##### Notes: ``` @@ -222,7 +223,8 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" #### Xamarin bundles | symlink | Xamarin.Mono | Xamarin.iOS | Xamarin.Mac | Xamarin.Android | | ----------------- | ------------ | ----------- | ----------- | --------------- | -| 6_12_19 (default) | 6.12 | 15.12 | 8.12 | 13.0 | +| 6_12_20 (default) | 6.12 | 16.0 | 8.12 | 13.0 | +| 6_12_19 | 6.12 | 15.12 | 8.12 | 13.0 | | 6_12_18 | 6.12 | 15.10 | 8.10 | 12.3 | | 6_12_17 | 6.12 | 15.10 | 8.10 | 12.2 | | 6_12_16 | 6.12 | 15.8 | 8.8 | 12.2 | @@ -239,10 +241,10 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" ### Xcode | Version | Build | Path | | ---------------- | -------- | ------------------------------ | -| 14.1 (beta) | 14B5024h | /Applications/Xcode_14.1.app | -| 14.0.1 | 14A400 | /Applications/Xcode_14.0.1.app | +| 14.1 (beta) | 14B5033e | /Applications/Xcode_14.1.app | +| 14.0.1 (default) | 14A400 | /Applications/Xcode_14.0.1.app | | 14.0 | 14A309 | /Applications/Xcode_14.0.app | -| 13.4.1 (default) | 13F100 | /Applications/Xcode_13.4.1.app | +| 13.4.1 | 13F100 | /Applications/Xcode_13.4.1.app | | 13.4 | 13F17a | /Applications/Xcode_13.4.app | | 13.3.1 | 13E500a | /Applications/Xcode_13.3.1.app | | 13.2.1 | 13C100 | /Applications/Xcode_13.2.1.app | @@ -297,30 +299,30 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" | DriverKit 22.1 | driverkit22.1 | 14.1 | #### Installed Simulators -| OS | Xcode Version | Simulators | -| ----------- | -------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| iOS 15.0 | 13.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | -| iOS 15.2 | 13.2.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | -| iOS 15.4 | 13.3.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPhone SE (3rd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | -| iOS 15.5 | 13.4<br>13.4.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPhone SE (3rd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | -| iOS 16.0 | 14.0<br>14.0.1 | iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPhone SE (3rd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | -| iOS 16.1 | 14.1 | iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPhone SE (3rd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | -| tvOS 15.0 | 13.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | -| tvOS 15.2 | 13.2.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | -| tvOS 15.4 | 13.3.1<br>13.4<br>13.4.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | -| tvOS 16.0 | 13.1<br>13.2.1<br>13.3.1<br>13.4<br>13.4.1<br>14.0<br>14.0.1<br>14.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | -| tvOS 16.1 | 13.1<br>13.2.1<br>13.3.1<br>13.4<br>13.4.1<br>14.0<br>14.0.1<br>14.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | -| watchOS 8.0 | 13.1 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | -| watchOS 8.3 | 13.2.1 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | -| watchOS 8.5 | 13.3.1<br>13.4<br>13.4.1 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | -| watchOS 9.0 | 13.1<br>13.2.1<br>13.3.1<br>13.4<br>13.4.1<br>14.0<br>14.0.1<br>14.1 | Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | -| watchOS 9.1 | 13.1<br>13.2.1<br>13.3.1<br>13.4<br>13.4.1<br>14.0<br>14.0.1<br>14.1 | Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | +| OS | Xcode Version | Simulators | +| ----------- | -------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| iOS 15.0 | 13.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | +| iOS 15.2 | 13.2.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | +| iOS 15.4 | 13.3.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPhone SE (3rd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | +| iOS 15.5 | 13.4<br>13.4.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPhone SE (3rd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | +| iOS 16.0 | 14.0<br>14.0.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPhone SE (3rd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | +| iOS 16.1 | 14.1 | iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPhone SE (3rd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | +| tvOS 15.0 | 13.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | +| tvOS 15.2 | 13.2.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | +| tvOS 15.4 | 13.3.1<br>13.4<br>13.4.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | +| tvOS 16.0 | 13.1<br>13.2.1<br>13.3.1<br>13.4<br>13.4.1<br>14.0<br>14.0.1<br>14.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | +| tvOS 16.1 | 13.1<br>13.2.1<br>13.3.1<br>13.4<br>13.4.1<br>14.0<br>14.0.1<br>14.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | +| watchOS 8.0 | 13.1 | Apple Watch Series 5 - 44mm<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 45mm<br>Apple Watch Series 7 (41mm) | +| watchOS 8.3 | 13.2.1 | Apple Watch Series 5 - 44mm<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 (45mm) | +| watchOS 8.5 | 13.3.1<br>13.4<br>13.4.1 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 (45mm) | +| watchOS 9.0 | 13.1<br>13.2.1<br>13.3.1<br>13.4<br>13.4.1<br>14.0<br>14.0.1<br>14.1 | Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | +| watchOS 9.1 | 13.1<br>13.2.1<br>13.3.1<br>13.4<br>13.4.1<br>14.0<br>14.0.1<br>14.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | ### Android | Package Name | Version | | -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------ | | Android Command Line Tools | 7.0 | -| Android Emulator | 31.3.10 | +| Android Emulator | 31.3.11 | | Android SDK Build-tools | 33.0.0<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | | Android SDK Platforms | android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | | Android SDK Platform-Tools | 33.0.3 | @@ -347,5 +349,16 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" - Tcl/Tk 8.6.12_1 - Zlib 1.2.12_1 +#### Environment variables +| Name | Value | +| ----------------- | ----------------------------------------------------------------------------------------- | +| PARALLELS_DMG_URL | https://download.parallels.com/desktop/v18/18.0.2-53077/ParallelsDesktop-18.0.2-53077.dmg | + +##### Notes: +``` +If you want to use Parallels Desktop you should download a package from URL stored in +PARALLELS_DMG_URL environment variable. A system extension is allowed for this version. +``` + From 9eaf3d8b71e7eadeee2b93c7d0adc1e36e96b0e1 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 5 Oct 2022 11:17:21 +0000 Subject: [PATCH 1505/3485] Updating readme file for ubuntu22 version 20221002.2 (#6346) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2204-Readme.md | 65 ++++++++++++++++--------------- 1 file changed, 33 insertions(+), 32 deletions(-) diff --git a/images/linux/Ubuntu2204-Readme.md b/images/linux/Ubuntu2204-Readme.md index d0c351447619..7e2dc12e20b9 100644 --- a/images/linux/Ubuntu2204-Readme.md +++ b/images/linux/Ubuntu2204-Readme.md @@ -1,11 +1,12 @@ | Announcements | |-| -| [[Ubuntu] homebrew will be removed from $PATH](https://github.com/actions/runner-images/issues/6283) | +| [Third party PHP repository will be removed from the Ubuntu 22.04 image](https://github.com/actions/runner-images/issues/6331) | +| [[Ubuntu] homebrew will be removed from ](https://github.com/actions/runner-images/issues/6283) | | [The Ubuntu 18.04 Actions runner image will begin deprecation on 8/8/22 and will be fully unsupported by 4/1/2023](https://github.com/actions/runner-images/issues/6002) | *** # Ubuntu 22.04.1 LTS - Linux kernel version: 5.15.0-1020-azure -- Image Version: 20220925.1 +- Image Version: 20221002.2 ## Installed Software ### Language and Runtime @@ -16,8 +17,8 @@ - Dash 0.5.11+git20210903+057cd650a4ed-3build1 - GNU C++ 9.4.0, 10.3.0, 11.2.0 - GNU Fortran 9.4.0, 10.3.0, 11.2.0 -- Julia 1.8.1 -- Kotlin 1.7.10-release-333 +- Julia 1.8.2 +- Kotlin 1.7.20-release-201 - Mono 6.12.0.182 (apt source repository: https://download.mono-project.com/repo/ubuntu stable-focal main) - MSBuild 16.10.1.31701 (from /usr/lib/mono/msbuild/15.0/bin/MSBuild.dll) - Node 16.17.1 @@ -29,7 +30,7 @@ ### Package Management - cpan 1.64 - Helm 3.10.0 -- Homebrew 3.6.2 +- Homebrew 3.6.3 - Miniconda 4.12.0 - Npm 8.15.0 - NuGet 6.2.1.2 @@ -37,7 +38,7 @@ - Pip3 22.0.2 - Pipx 1.1.0 - RubyGems 3.3.5 -- Vcpkg (build from master \<57d3194e7>) +- Vcpkg (build from master \<5f1441730>) - Yarn 1.22.19 ##### Notes: @@ -56,7 +57,7 @@ to accomplish this. | VCPKG_ROOT | /usr/local/share/vcpkg | ### Project Management -- Lerna 5.5.2 +- Lerna 5.5.4 ### Tools - Ansible 2.13.4 @@ -67,10 +68,10 @@ to accomplish this. - Bicep 0.10.61 - Buildah 1.23.1 - CMake 3.24.2 -- CodeQL Action Bundle 2.10.5 +- CodeQL Action Bundle 2.11.0 - Docker Amazon ECR Credential Helper 0.6.0 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.11.1+azure-1 +- Docker Compose v2 2.11.2+azure-1 - Docker-Buildx 0.9.1 - Docker-Moby Client 20.10.18+azure-1 - Docker-Moby Server 20.10.18+azure-1 @@ -95,30 +96,30 @@ to accomplish this. - Packer 1.8.3 - Parcel 2.7.0 - Podman 3.4.4 -- Pulumi 3.40.1 +- Pulumi 3.40.2 - R 4.2.1 - Skopeo 1.4.1 - Sphinx Open Source Search Server 2.2.11 - SVN 1.14.1 -- Terraform 1.3.0 +- Terraform 1.3.1 - yamllint 1.28.0 - yq 4.27.5 - zstd 1.5.2 (homebrew) ### CLI Tools - Alibaba Cloud CLI 3.0.127 -- AWS CLI 2.7.35 +- AWS CLI 2.8.0 - AWS CLI Session manager plugin 1.2.339.0 -- AWS SAM CLI 1.57.0 +- AWS SAM CLI 1.58.0 - Azure CLI (azure-cli) 2.40.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.25.0 -- GitHub CLI 2.16.0 -- Google Cloud SDK 403.0.0 (apt source repository: https://packages.cloud.google.com/apt) +- GitHub CLI 2.16.1 +- Google Cloud SDK 404.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 11.8.3 -- OpenShift CLI 4.11.5 -- ORAS CLI 0.14.1 -- Vercel CLI 28.4.2 +- Netlify CLI 12.0.2 +- OpenShift CLI 4.11.6 +- ORAS CLI 0.15.0 +- Vercel CLI 28.4.5 ### Java | Version | Vendor | Environment Variable | @@ -135,7 +136,7 @@ to accomplish this. ### PHP | Tool | Version | | -------- | ------- | -| PHP | 8.1.10 | +| PHP | 8.1.11 | | Composer | 2.4.2 | | PHPUnit | 8.5.30 | ``` @@ -162,12 +163,12 @@ to accomplish this. - Rustfmt 1.5.1 ### Browsers and Drivers -- Google Chrome 105.0.5195.125 -- ChromeDriver 105.0.5195.52 -- Chromium 105.0.5177.0 -- Microsoft Edge 105.0.1343.50 (apt source repository: https://packages.microsoft.com/repos/edge) -- Microsoft Edge WebDriver 105.0.1343.50 -- Selenium server 4.4.0 +- Google Chrome 106.0.5249.91 +- ChromeDriver 106.0.5249.61 +- Chromium 106.0.5235.0 +- Microsoft Edge 105.0.1343.53 (apt source repository: https://packages.microsoft.com/repos/edge) +- Microsoft Edge WebDriver 105.0.1343.53 +- Selenium server 4.5.0 #### Environment variables | Name | Value | @@ -242,9 +243,9 @@ to accomplish this. | Module | Version | | ---------------- | ------- | | MarkdownPS | 1.9 | -| Microsoft.Graph | 1.11.1 | +| Microsoft.Graph | 1.12.2 | | Pester | 5.3.3 | -| PSScriptAnalyzer | 1.20.0 | +| PSScriptAnalyzer | 1.21.0 | #### Az PowerShell Modules - 7.5.0 @@ -291,10 +292,10 @@ to accomplish this. | debian:10 | sha256:2f35b84014a5389e2a940113c51586bc067a05040ba181dee92c5a9fa9b15dcb | 2022-09-13 | | debian:11 | sha256:3e82b1af33607aebaeb3641b75d6e80fd28d36e17993ef13708e9493e30e8ff9 | 2022-09-13 | | moby/buildkit:latest | sha256:67c9251f9f2e103e1ee489b6cead518b6d82607ef485d3f1505fc4095a55ebeb | 2022-08-22 | -| node:14 | sha256:6adfb0c2a9db12a06893974bb140493a7482e2b3df59c058590594ceecd0c99b | 2022-09-13 | -| node:14-alpine | sha256:4aff4ba0da347e51561587eba037a38db4eaa70e1a6c8334d66779fe963d5be7 | 2022-08-09 | -| node:16 | sha256:a5d9200d3b8c17f0f3d7717034a9c215015b7aae70cb2a9d5e5dae7ff8aa6ca8 | 2022-09-13 | -| node:16-alpine | sha256:2c405ed42fc0fd6aacbe5730042640450e5ec030bada7617beac88f742b6997b | 2022-08-16 | +| node:14 | sha256:500c729bf9b75de8aee647d70b68dc16eb14991d74bbf033c5ffdb667bbef704 | 2022-09-26 | +| node:14-alpine | sha256:0a37794193aa27ba8af16a2da0998a3e0c551fcc4ebec2ce95b1615032daf820 | 2022-09-26 | +| node:16 | sha256:5968f50bda8ea8bdc65fd4208de287bbb25ca3ba81649494b1b6cf4b9203695e | 2022-09-26 | +| node:16-alpine | sha256:88d9d8da697877a4a771a40e5cbc10a12c2ad959e82f3b0f36ef35635e17f693 | 2022-09-26 | | ubuntu:18.04 | sha256:6fec50623d6d37b7f3c14c5b6fc36c73fd04aa8173d59d54dba00da0e7ac50ee | 2022-09-06 | | ubuntu:20.04 | sha256:35ab2bf57814e9ff49e365efd5a5935b6915eede5c7f8581e9e1b85e0eecbe16 | 2022-09-01 | | ubuntu:22.04 | sha256:20fa2d7bb4de7723f542be5923b06c4d704370f0390e4ae9e1c833c8785644c1 | 2022-09-01 | From 2aec524970584138c5986109ca7be7ae89b0899d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 5 Oct 2022 11:39:35 +0000 Subject: [PATCH 1506/3485] Updating readme file for ubuntu20 version 20221002.2 (#6347) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2004-Readme.md | 85 ++++++++++++++++--------------- 1 file changed, 43 insertions(+), 42 deletions(-) diff --git a/images/linux/Ubuntu2004-Readme.md b/images/linux/Ubuntu2004-Readme.md index 67409623c211..728cb6eb8f90 100644 --- a/images/linux/Ubuntu2004-Readme.md +++ b/images/linux/Ubuntu2004-Readme.md @@ -1,11 +1,12 @@ | Announcements | |-| -| [[Ubuntu] homebrew will be removed from $PATH](https://github.com/actions/runner-images/issues/6283) | +| [Third party PHP repository will be removed from the Ubuntu 22.04 image](https://github.com/actions/runner-images/issues/6331) | +| [[Ubuntu] homebrew will be removed from ](https://github.com/actions/runner-images/issues/6283) | | [The Ubuntu 18.04 Actions runner image will begin deprecation on 8/8/22 and will be fully unsupported by 4/1/2023](https://github.com/actions/runner-images/issues/6002) | *** # Ubuntu 20.04.5 LTS - Linux kernel version: 5.15.0-1020-azure -- Image Version: 20220922.2 +- Image Version: 20221002.2 ## Installed Software ### Language and Runtime @@ -18,11 +19,11 @@ - Erlang rebar3 3.19.0 - GNU C++ 9.4.0, 10.3.0 - GNU Fortran 9.4.0, 10.3.0 -- Julia 1.8.1 -- Kotlin 1.7.10-release-333 +- Julia 1.8.2 +- Kotlin 1.7.20-release-201 - Mono 6.12.0.182 (apt source repository: https://download.mono-project.com/repo/ubuntu stable-focal main) - MSBuild 16.10.1.31701 (from /usr/lib/mono/msbuild/15.0/bin/MSBuild.dll) -- Node 16.17.0 +- Node 16.17.1 - Perl 5.30.0 - Python 3.8.10 - Python3 3.8.10 @@ -32,7 +33,7 @@ ### Package Management - cpan 1.64 - Helm 3.10.0 -- Homebrew 3.6.2 +- Homebrew 3.6.3 - Miniconda 4.12.0 - Npm 8.15.0 - NuGet 6.2.1.2 @@ -40,14 +41,14 @@ - Pip3 20.0.2 - Pipx 1.1.0 - RubyGems 3.1.2 -- Vcpkg (build from master \<d52632d9a>) +- Vcpkg (build from master \<5f1441730>) - Yarn 1.22.19 ##### Notes: ``` Location: /home/linuxbrew Note: Homebrew is pre-installed on image but not added to PATH. -run the eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv) command +run the eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)" command to accomplish this. ``` @@ -61,7 +62,7 @@ to accomplish this. ### Project Management - Ant 1.10.7 - Gradle 7.5.1 -- Lerna 5.5.2 +- Lerna 5.5.4 - Maven 3.8.6 - Sbt 1.7.1 @@ -74,10 +75,10 @@ to accomplish this. - Bicep 0.10.61 - Buildah 1.22.3 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - CMake 3.24.2 -- CodeQL Action Bundle 2.10.5 +- CodeQL Action Bundle 2.11.0 - Docker Amazon ECR Credential Helper 0.6.0 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.11.0+azure-1 +- Docker Compose v2 2.11.2+azure-1 - Docker-Buildx 0.9.1 - Docker-Moby Client 20.10.18+azure-1 - Docker-Moby Server 20.10.18+azure-1 @@ -89,7 +90,7 @@ to accomplish this. - Heroku 7.63.4 - HHVM (HipHop VM) 4.169.0 - jq 1.6 -- Kind 0.15.0 +- Kind 0.16.0 - Kubectl 1.25.2 - Kustomize 4.5.7 - Leiningen 2.9.10 @@ -104,30 +105,30 @@ to accomplish this. - Parcel 2.7.0 - PhantomJS 2.1.1 - Podman 3.4.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- Pulumi 3.40.1 +- Pulumi 3.40.2 - R 4.2.1 - Skopeo 1.5.0 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 -- Terraform 1.3.0 +- Terraform 1.3.1 - yamllint 1.28.0 - yq 4.27.5 - zstd 1.5.2 (homebrew) ### CLI Tools - Alibaba Cloud CLI 3.0.127 -- AWS CLI 2.7.34 +- AWS CLI 2.8.0 - AWS CLI Session manager plugin 1.2.339.0 -- AWS SAM CLI 1.57.0 +- AWS SAM CLI 1.58.0 - Azure CLI (azure-cli) 2.40.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.25.0 -- GitHub CLI 2.16.0 -- Google Cloud SDK 403.0.0 (apt source repository: https://packages.cloud.google.com/apt) +- GitHub CLI 2.16.1 +- Google Cloud SDK 404.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 11.8.2 -- OpenShift CLI 4.11.5 -- ORAS CLI 0.14.1 -- Vercel CLI 28.4.1 +- Netlify CLI 12.0.2 +- OpenShift CLI 4.11.6 +- ORAS CLI 0.15.0 +- Vercel CLI 28.4.5 ### Java | Version | Vendor | Environment Variable | @@ -144,9 +145,9 @@ to accomplish this. ### PHP | Tool | Version | | -------- | -------------------- | -| PHP | 7.4.30 8.0.23 8.1.10 | +| PHP | 7.4.32 8.0.24 8.1.11 | | Composer | 2.4.2 | -| PHPUnit | 8.5.29 | +| PHPUnit | 8.5.30 | ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ``` @@ -171,13 +172,13 @@ to accomplish this. - Rustfmt 1.5.1 ### Browsers and Drivers -- Google Chrome 105.0.5195.125 -- ChromeDriver 105.0.5195.52 -- Chromium 105.0.5177.0 -- Microsoft Edge 105.0.1343.42 (apt source repository: https://packages.microsoft.com/repos/edge) -- Microsoft Edge WebDriver 105.0.1343.42 -- Selenium server 4.4.0 -- Mozilla Firefox 104.0 +- Google Chrome 106.0.5249.91 +- ChromeDriver 106.0.5249.61 +- Chromium 106.0.5235.0 +- Microsoft Edge 105.0.1343.53 (apt source repository: https://packages.microsoft.com/repos/edge) +- Microsoft Edge WebDriver 105.0.1343.53 +- Selenium server 4.5.0 +- Mozilla Firefox 105.0 - Geckodriver 0.31.0 #### Environment variables @@ -195,7 +196,7 @@ to accomplish this. - nbgv 3.5.113+a908c6d9d2 ### Databases -- MongoDB 5.0.12 (apt source repository: https://repo.mongodb.org/apt/ubuntu) +- MongoDB 5.0.13 (apt source repository: https://repo.mongodb.org/apt/ubuntu) - sqlite3 3.31.1 #### PostgreSQL @@ -214,7 +215,7 @@ to accomplish this. ``` #### MS SQL Server Client Tools - sqlcmd 17.10.0001.1 -- SqlPackage 16.0.6161.0 +- SqlPackage 16.0.6296.0 ### Cached Tools #### Go @@ -224,8 +225,8 @@ to accomplish this. #### Node.js - 12.22.12 -- 14.20.0 -- 16.17.0 +- 14.20.1 +- 16.17.1 #### PyPy - 2.7.18 [PyPy 7.3.9] @@ -263,9 +264,9 @@ to accomplish this. | Module | Version | | ---------------- | ------- | | MarkdownPS | 1.9 | -| Microsoft.Graph | 1.12.0 | +| Microsoft.Graph | 1.12.2 | | Pester | 5.3.3 | -| PSScriptAnalyzer | 1.20.0 | +| PSScriptAnalyzer | 1.21.0 | #### Az PowerShell Modules - 7.5.0 3.1.0.zip 4.4.0.zip 5.9.0.zip 6.6.0.zip @@ -281,7 +282,7 @@ to accomplish this. | Package Name | Version | | -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------ | | Android Command Line Tools | 7.0 | -| Android Emulator | 31.3.10 | +| Android Emulator | 31.3.11 | | Android SDK Build-tools | 33.0.0<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | | Android SDK Platform-Tools | 33.0.3 | | Android SDK Platforms | android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | @@ -318,10 +319,10 @@ to accomplish this. | moby/buildkit:latest | sha256:67c9251f9f2e103e1ee489b6cead518b6d82607ef485d3f1505fc4095a55ebeb | 2022-08-22 | | node:12 | sha256:01627afeb110b3054ba4a1405541ca095c8bfca1cb6f2be9479c767a2711879e | 2022-04-20 | | node:12-alpine | sha256:d4b15b3d48f42059a15bd659be60afe21762aae9d6cbea6f124440895c27db68 | 2022-04-11 | -| node:14 | sha256:6adfb0c2a9db12a06893974bb140493a7482e2b3df59c058590594ceecd0c99b | 2022-09-13 | -| node:14-alpine | sha256:4aff4ba0da347e51561587eba037a38db4eaa70e1a6c8334d66779fe963d5be7 | 2022-08-09 | -| node:16 | sha256:a5d9200d3b8c17f0f3d7717034a9c215015b7aae70cb2a9d5e5dae7ff8aa6ca8 | 2022-09-13 | -| node:16-alpine | sha256:2c405ed42fc0fd6aacbe5730042640450e5ec030bada7617beac88f742b6997b | 2022-08-16 | +| node:14 | sha256:500c729bf9b75de8aee647d70b68dc16eb14991d74bbf033c5ffdb667bbef704 | 2022-09-26 | +| node:14-alpine | sha256:0a37794193aa27ba8af16a2da0998a3e0c551fcc4ebec2ce95b1615032daf820 | 2022-09-26 | +| node:16 | sha256:5968f50bda8ea8bdc65fd4208de287bbb25ca3ba81649494b1b6cf4b9203695e | 2022-09-26 | +| node:16-alpine | sha256:88d9d8da697877a4a771a40e5cbc10a12c2ad959e82f3b0f36ef35635e17f693 | 2022-09-26 | | ubuntu:16.04 | sha256:91bd29a464fdabfcf44e29e1f2a5f213c6dfa750b6290e40dd6998ac79da3c41 | 2021-08-31 | | ubuntu:18.04 | sha256:6fec50623d6d37b7f3c14c5b6fc36c73fd04aa8173d59d54dba00da0e7ac50ee | 2022-09-06 | | ubuntu:20.04 | sha256:35ab2bf57814e9ff49e365efd5a5935b6915eede5c7f8581e9e1b85e0eecbe16 | 2022-09-01 | From e10aca5304ba1d30584b4daa74fc84feac565f33 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 5 Oct 2022 13:40:59 +0000 Subject: [PATCH 1507/3485] Updating readme file for win22 version 20221002.2 (#6340) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2022-Readme.md | 56 ++++++++++++++++---------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/images/win/Windows2022-Readme.md b/images/win/Windows2022-Readme.md index 43a5cbfbf40d..7baf941e39b6 100644 --- a/images/win/Windows2022-Readme.md +++ b/images/win/Windows2022-Readme.md @@ -1,6 +1,6 @@ # Microsoft Windows Server 2022 Datacenter - OS Version: 10.0.20348 Build 1006 -- Image Version: 20220925.1 +- Image Version: 20221002.2 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -9,12 +9,12 @@ ### Language and Runtime - Bash 5.1.16(1)-release - Go 1.17.13 -- Julia 1.8.1 -- Kotlin 1.7.10 +- Julia 1.8.2 +- Kotlin 1.7.20 - LLVM 14.0.6 - Node 16.17.1 - Perl 5.32.1 -- PHP 8.1.10 +- PHP 8.1.11 - Python 3.9.13 - Ruby 3.0.4p208 @@ -28,7 +28,7 @@ - pip 22.2.2 (python 3.9) - Pipx 1.1.0 - RubyGems 3.2.33 -- Vcpkg (build from master \<57d3194e7>) +- Vcpkg (build from master \<5f1441730>) - Yarn 1.22.19 #### Environment variables @@ -52,9 +52,9 @@ - Bicep 0.10.61 - Cabal 3.8.1.0 - CMake 3.24.2 -- CodeQL Action Bundle 2.10.5 +- CodeQL Action Bundle 2.11.0 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.11.1 +- Docker Compose v2 2.11.2 - Docker master-dockerproject-2022-03-26 - Docker-wincred 0.7.0 - ghc 9.4.2 @@ -71,7 +71,7 @@ - NSIS v3.08 - OpenSSL 1.1.1 - Packer 1.8.2 -- Pulumi v3.40.1 +- Pulumi v3.40.2 - R 4.2.1 - Service Fabric SDK 9.0.1028.9590 - Stack 2.9.1 @@ -85,12 +85,12 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.127 -- AWS CLI 2.7.35 -- AWS SAM CLI 1.57.0 +- AWS CLI 2.8.0 +- AWS SAM CLI 1.58.0 - AWS Session Manager CLI 1.2.339.0 - Azure CLI 2.40.0 - Azure DevOps CLI extension 0.25.0 -- GitHub CLI 2.16.0 +- GitHub CLI 2.16.1 - Hub CLI 2.14.2 ### Rust Tools @@ -108,14 +108,14 @@ - Rustfmt 1.5.1 ### Browsers and webdrivers -- Google Chrome 105.0.5195.127 -- Chrome Driver 105.0.5195.52 -- Microsoft Edge 105.0.1343.50 -- Microsoft Edge Driver 105.0.1343.50 +- Google Chrome 106.0.5249.91 +- Chrome Driver 106.0.5249.61 +- Microsoft Edge 105.0.1343.53 +- Microsoft Edge Driver 105.0.1343.53 - Mozilla Firefox 105.0.1 - Gecko Driver 0.31.0 - IE Driver 3.150.1.1 -- Selenium server 4.4.0 +- Selenium server 4.5.0 #### Environment variables | Name | Value | @@ -203,7 +203,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### MongoDB | Version | ServiceName | ServiceStatus | ServiceStartType | | -------- | ----------- | ------------- | ---------------- | -| 5.0.12.0 | MongoDB | Stopped | Disabled | +| 5.0.13.0 | MongoDB | Stopped | Disabled | ### Database tools - Azure CosmosDb Emulator 2.14.9.0 @@ -221,7 +221,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Visual Studio Enterprise 2022 | Name | Version | Path | | ----------------------------- | -------------- | -------------------------------------------------------- | -| Visual Studio Enterprise 2022 | 17.3.32901.215 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | +| Visual Studio Enterprise 2022 | 17.3.32922.545 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | #### Workloads, components and extensions: | Package | Version | @@ -255,12 +255,12 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Component.Xamarin.RemotedSimulator | 17.3.32708.82 | | ios | 15.4.446.446 | | maccatalyst | 15.4.446.446 | -| maui.android | 6.0.486.0 | -| maui.blazor | 6.0.486.0 | -| maui.core | 6.0.486.0 | -| maui.ios | 6.0.486.0 | -| maui.maccatalyst | 6.0.486.0 | -| maui.windows | 6.0.486.0 | +| maui.android | 6.0.536.0 | +| maui.blazor | 6.0.536.0 | +| maui.core | 6.0.536.0 | +| maui.ios | 6.0.536.0 | +| maui.maccatalyst | 6.0.536.0 | +| maui.windows | 6.0.536.0 | | Microsoft.Component.Azure.DataLake.Tools | 17.3.32708.82 | | Microsoft.Component.ClickOnce | 17.3.32708.82 | | Microsoft.Component.CodeAnalysis.SDK | 17.3.32708.82 | @@ -461,7 +461,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.ComponentGroup.Maui.Shared | 17.3.32708.82 | | Microsoft.VisualStudio.ComponentGroup.Maui.Windows | 17.3.32708.82 | | Microsoft.VisualStudio.ComponentGroup.MSIX.Packaging | 17.3.32708.82 | -| Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core | 17.3.32708.82 | +| Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core | 17.3.32921.402 | | Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Llvm.Clang | 17.3.32714.208 | | Microsoft.VisualStudio.ComponentGroup.UWP.NetCoreAndStandard | 17.3.32708.82 | | Microsoft.VisualStudio.ComponentGroup.UWP.Support | 17.3.32708.82 | @@ -567,13 +567,13 @@ All other versions are saved but not installed. #### Powershell Modules | Module | Version | | ------------------ | ---------------- | -| AWSPowerShell | 4.1.175 | +| AWSPowerShell | 4.1.179 | | DockerMsftProvider | 1.0.0.8 | | MarkdownPS | 1.9 | -| Microsoft.Graph | 1.11.1 | +| Microsoft.Graph | 1.12.2 | | Pester | 3.4.0<br>5.3.3 | | PowerShellGet | 1.0.0.1<br>2.2.5 | -| PSScriptAnalyzer | 1.20.0 | +| PSScriptAnalyzer | 1.21.0 | | PSWindowsUpdate | 2.2.0.3 | | SqlServer | 21.1.18256 | | VSSetup | 2.2.16 | From 95e62bec1f095421216b21fe776e41e345d1ebd6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 5 Oct 2022 13:49:09 +0000 Subject: [PATCH 1508/3485] Updating readme file for win19 version 20221002.2 (#6339) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2019-Readme.md | 42 ++++++++++++++++---------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index ec7d7cfbc30a..83ec1283f1ac 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -1,6 +1,6 @@ # Microsoft Windows Server 2019 Datacenter - OS Version: 10.0.17763 Build 3406 -- Image Version: 20220925.1 +- Image Version: 20221002.2 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -9,12 +9,12 @@ ### Language and Runtime - Bash 5.1.16(1)-release - Go 1.17.13 -- Julia 1.8.1 -- Kotlin 1.7.10 +- Julia 1.8.2 +- Kotlin 1.7.20 - LLVM 14.0.6 - Node 16.17.1 - Perl 5.32.1 -- PHP 8.1.10 +- PHP 8.1.11 - Python 3.7.9 - Ruby 2.5.9p229 @@ -28,7 +28,7 @@ - pip 22.2.2 (python 3.7) - Pipx 1.1.0 - RubyGems 2.7.6.3 -- Vcpkg (build from master \<57d3194e7>) +- Vcpkg (build from master \<5f1441730>) - Yarn 1.22.19 #### Environment variables @@ -53,15 +53,15 @@ - Bicep 0.10.61 - Cabal 3.8.1.0 - CMake 3.24.2 -- CodeQL Action Bundle 2.10.5 +- CodeQL Action Bundle 2.11.0 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.11.1 +- Docker Compose v2 2.11.2 - Docker master-dockerproject-2022-03-26 - Docker-wincred 0.7.0 - ghc 9.4.2 - Git 2.37.3.windows.1 - Git LFS 3.2.0 -- Google Cloud SDK 403.0.0 +- Google Cloud SDK 404.0.0 - ImageMagick 7.1.0-49 - InnoSetup 6.2.1 - jq 1.6 @@ -74,7 +74,7 @@ - OpenSSL 1.1.1 - Packer 1.8.2 - Parcel 2.7.0 -- Pulumi v3.40.1 +- Pulumi v3.40.2 - R 4.2.1 - Service Fabric SDK 9.0.1028.9590 - Stack 2.9.1 @@ -88,13 +88,13 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.127 -- AWS CLI 2.7.35 -- AWS SAM CLI 1.57.0 +- AWS CLI 2.8.0 +- AWS SAM CLI 1.58.0 - AWS Session Manager CLI 1.2.339.0 - Azure CLI 2.40.0 - Azure DevOps CLI extension 0.25.0 - Cloud Foundry CLI 6.53.0 -- GitHub CLI 2.16.0 +- GitHub CLI 2.16.1 - Hub CLI 2.14.2 ### Rust Tools @@ -112,14 +112,14 @@ - Rustfmt 1.5.1 ### Browsers and webdrivers -- Google Chrome 105.0.5195.127 -- Chrome Driver 105.0.5195.52 -- Microsoft Edge 105.0.1343.50 -- Microsoft Edge Driver 105.0.1343.50 +- Google Chrome 106.0.5249.91 +- Chrome Driver 106.0.5249.61 +- Microsoft Edge 105.0.1343.53 +- Microsoft Edge Driver 105.0.1343.53 - Mozilla Firefox 105.0.1 - Gecko Driver 0.31.0 - IE Driver 3.150.1.1 -- Selenium server 4.4.0 +- Selenium server 4.5.0 #### Environment variables | Name | Value | @@ -217,7 +217,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### MongoDB | Version | ServiceName | ServiceStatus | ServiceStartType | | -------- | ----------- | ------------- | ---------------- | -| 5.0.12.0 | MongoDB | Stopped | Disabled | +| 5.0.13.0 | MongoDB | Stopped | Disabled | ### Database tools - Azure CosmosDb Emulator 2.14.9.0 @@ -545,13 +545,13 @@ All other versions are saved but not installed. #### Powershell Modules | Module | Version | | ------------------ | ---------------- | -| AWSPowerShell | 4.1.175 | +| AWSPowerShell | 4.1.179 | | DockerMsftProvider | 1.0.0.8 | | MarkdownPS | 1.9 | -| Microsoft.Graph | 1.11.1 | +| Microsoft.Graph | 1.12.2 | | Pester | 3.4.0<br>5.3.3 | | PowerShellGet | 1.0.0.1<br>2.2.5 | -| PSScriptAnalyzer | 1.20.0 | +| PSScriptAnalyzer | 1.21.0 | | PSWindowsUpdate | 2.2.0.3 | | SqlServer | 21.1.18256 | | VSSetup | 2.2.16 | From 4a7932a15e3e2fa98954fe65a1ed415a204fa581 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 5 Oct 2022 14:13:04 +0000 Subject: [PATCH 1509/3485] Updating readme file for ubuntu18 version 20221003.1 (#6351) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu1804-Readme.md | 77 ++++++++++++++++--------------- 1 file changed, 39 insertions(+), 38 deletions(-) diff --git a/images/linux/Ubuntu1804-Readme.md b/images/linux/Ubuntu1804-Readme.md index b06a0fefecee..74802d8eb808 100644 --- a/images/linux/Ubuntu1804-Readme.md +++ b/images/linux/Ubuntu1804-Readme.md @@ -1,11 +1,12 @@ | Announcements | |-| -| [[Ubuntu] homebrew will be removed from $PATH](https://github.com/actions/runner-images/issues/6283) | +| [Third party PHP repository will be removed from the Ubuntu 22.04 image](https://github.com/actions/runner-images/issues/6331) | +| [[Ubuntu] homebrew will be removed from ](https://github.com/actions/runner-images/issues/6283) | | [The Ubuntu 18.04 Actions runner image will begin deprecation on 8/8/22 and will be fully unsupported by 4/1/2023](https://github.com/actions/runner-images/issues/6002) | *** # Ubuntu 18.04.6 LTS - Linux kernel version: 5.4.0-1091-azure -- Image Version: 20220923.1 +- Image Version: 20221003.1 ## Installed Software ### Language and Runtime @@ -18,11 +19,11 @@ - Erlang rebar3 3.19.0 - GNU C++ 7.5.0, 9.4.0, 10.3.0 - GNU Fortran 7.5.0, 9.4.0, 10.3.0 -- Julia 1.8.1 -- Kotlin 1.7.10-release-333 +- Julia 1.8.2 +- Kotlin 1.7.20-release-201 - Mono 6.12.0.182 (apt source repository: https://download.mono-project.com/repo/ubuntu stable-bionic main) - MSBuild 16.10.1.31701 (from /usr/lib/mono/msbuild/15.0/bin/MSBuild.dll) -- Node 16.17.0 +- Node 16.17.1 - Perl 5.26.1 - Python 2.7.17 - Python3 3.6.9 @@ -32,7 +33,7 @@ ### Package Management - cpan 1.64 - Helm 3.10.0 -- Homebrew 3.6.2 +- Homebrew 3.6.4 - Miniconda 4.12.0 - Npm 8.15.0 - NuGet 6.2.1.2 @@ -40,7 +41,7 @@ - Pip3 9.0.1 - Pipx 1.0.0 - RubyGems 2.7.6 -- Vcpkg (build from master \<86eb754bc>) +- Vcpkg (build from master \<779ce74ef>) - Yarn 1.22.19 ##### Notes: @@ -62,7 +63,7 @@ to accomplish this. - Ant 1.10.5 - Gradle 7.5.1 - Maven 3.8.6 -- Sbt 1.7.1 +- Sbt 1.7.2 ### Tools - Ansible 2.11.12 @@ -73,14 +74,14 @@ to accomplish this. - Bicep 0.10.61 - Buildah 1.22.3 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - CMake 3.24.2 -- CodeQL Action Bundle 2.10.5 +- CodeQL Action Bundle 2.11.0 - Docker Amazon ECR Credential Helper 0.6.0 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.11.0+azure-1 +- Docker Compose v2 2.11.2+azure-1 - Docker-Buildx 0.9.1 - Docker-Moby Client 20.10.18+azure-1 - Docker-Moby Server 20.10.18+azure-1 -- Git 2.37.3 (apt source repository: ppa:git-core/ppa) +- Git 2.38.0 (apt source repository: ppa:git-core/ppa) - Git LFS 3.2.0 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.3.1 - Haveged 1.9.1 @@ -102,30 +103,30 @@ to accomplish this. - Parcel 2.7.0 - PhantomJS 2.1.1 - Podman 3.4.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- Pulumi 3.40.1 +- Pulumi 3.40.2 - R 4.2.1 - Skopeo 1.5.0 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 - SVN 1.9.7 -- Terraform 1.3.0 +- Terraform 1.3.1 - yamllint 1.28.0 - yq 4.27.5 - zstd 1.5.2 (homebrew) ### CLI Tools - Alibaba Cloud CLI 3.0.127 -- AWS CLI 2.7.34 +- AWS CLI 2.8.0 - AWS CLI Session manager plugin 1.2.339.0 -- AWS SAM CLI 1.57.0 +- AWS SAM CLI 1.58.0 - Azure CLI (azure-cli) 2.40.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.25.0 -- GitHub CLI 2.16.0 -- Google Cloud SDK 403.0.0 (apt source repository: https://packages.cloud.google.com/apt) +- GitHub CLI 2.16.1 +- Google Cloud SDK 404.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 11.8.2 -- OpenShift CLI 4.11.5 -- ORAS CLI 0.14.1 -- Vercel CLI 28.4.2 +- Netlify CLI 12.0.4 +- OpenShift CLI 4.11.7 +- ORAS CLI 0.15.0 +- Vercel CLI 28.4.6 ### Java | Version | Vendor | Environment Variable | @@ -138,9 +139,9 @@ to accomplish this. ### PHP | Tool | Version | | -------- | ---------------------------------- | -| PHP | 7.2.34 7.3.33 7.4.30 8.0.23 8.1.10 | +| PHP | 7.2.34 7.3.33 7.4.32 8.0.24 8.1.11 | | Composer | 2.4.2 | -| PHPUnit | 8.5.29 | +| PHPUnit | 8.5.30 | ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ``` @@ -165,13 +166,13 @@ to accomplish this. - Rustfmt 1.5.1 ### Browsers and Drivers -- Google Chrome 105.0.5195.125 -- ChromeDriver 105.0.5195.52 -- Chromium 105.0.5177.0 -- Microsoft Edge 105.0.1343.50 (apt source repository: https://packages.microsoft.com/repos/edge) -- Microsoft Edge WebDriver 105.0.1343.42 -- Selenium server 4.4.0 -- Mozilla Firefox 104.0 +- Google Chrome 106.0.5249.91 +- ChromeDriver 106.0.5249.61 +- Chromium 106.0.5235.0 +- Microsoft Edge 106.0.1370.34 (apt source repository: https://packages.microsoft.com/repos/edge) +- Microsoft Edge WebDriver 106.0.1370.30 +- Selenium server 4.5.0 +- Mozilla Firefox 105.0 - Geckodriver 0.31.0 #### Environment variables @@ -189,7 +190,7 @@ to accomplish this. - nbgv 3.5.113+a908c6d9d2 ### Databases -- MongoDB 5.0.12 (apt source repository: https://repo.mongodb.org/apt/ubuntu) +- MongoDB 5.0.13 (apt source repository: https://repo.mongodb.org/apt/ubuntu) - sqlite3 3.22.0 #### PostgreSQL @@ -218,8 +219,8 @@ to accomplish this. #### Node.js - 12.22.12 -- 14.20.0 -- 16.17.0 +- 14.20.1 +- 16.17.1 #### PyPy - 2.7.18 [PyPy 7.3.9] @@ -256,7 +257,7 @@ to accomplish this. | Module | Version | | --------------- | ------- | | MarkdownPS | 1.9 | -| Microsoft.Graph | 1.12.1 | +| Microsoft.Graph | 1.12.2 | | Pester | 5.3.3 | #### Az PowerShell Modules @@ -310,10 +311,10 @@ to accomplish this. | moby/buildkit:latest | sha256:67c9251f9f2e103e1ee489b6cead518b6d82607ef485d3f1505fc4095a55ebeb | 2022-08-22 | | node:12 | sha256:01627afeb110b3054ba4a1405541ca095c8bfca1cb6f2be9479c767a2711879e | 2022-04-20 | | node:12-alpine | sha256:d4b15b3d48f42059a15bd659be60afe21762aae9d6cbea6f124440895c27db68 | 2022-04-11 | -| node:14 | sha256:6adfb0c2a9db12a06893974bb140493a7482e2b3df59c058590594ceecd0c99b | 2022-09-13 | -| node:14-alpine | sha256:4aff4ba0da347e51561587eba037a38db4eaa70e1a6c8334d66779fe963d5be7 | 2022-08-09 | -| node:16 | sha256:a5d9200d3b8c17f0f3d7717034a9c215015b7aae70cb2a9d5e5dae7ff8aa6ca8 | 2022-09-13 | -| node:16-alpine | sha256:2c405ed42fc0fd6aacbe5730042640450e5ec030bada7617beac88f742b6997b | 2022-08-16 | +| node:14 | sha256:500c729bf9b75de8aee647d70b68dc16eb14991d74bbf033c5ffdb667bbef704 | 2022-09-26 | +| node:14-alpine | sha256:0a37794193aa27ba8af16a2da0998a3e0c551fcc4ebec2ce95b1615032daf820 | 2022-09-26 | +| node:16 | sha256:5968f50bda8ea8bdc65fd4208de287bbb25ca3ba81649494b1b6cf4b9203695e | 2022-09-26 | +| node:16-alpine | sha256:88d9d8da697877a4a771a40e5cbc10a12c2ad959e82f3b0f36ef35635e17f693 | 2022-09-26 | | ubuntu:16.04 | sha256:91bd29a464fdabfcf44e29e1f2a5f213c6dfa750b6290e40dd6998ac79da3c41 | 2021-08-31 | | ubuntu:18.04 | sha256:6fec50623d6d37b7f3c14c5b6fc36c73fd04aa8173d59d54dba00da0e7ac50ee | 2022-09-06 | | ubuntu:20.04 | sha256:35ab2bf57814e9ff49e365efd5a5935b6915eede5c7f8581e9e1b85e0eecbe16 | 2022-09-01 | From 6701f53be9a5c3b16bf5148d52cef8ac4dafa844 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <mikhailkoliada@github.com> Date: Wed, 5 Oct 2022 14:29:41 +0200 Subject: [PATCH 1510/3485] [Ubuntu] fix readme files --- images/linux/Ubuntu2004-Readme.md | 2 +- images/linux/Ubuntu2204-Readme.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/images/linux/Ubuntu2004-Readme.md b/images/linux/Ubuntu2004-Readme.md index 728cb6eb8f90..9092aa4fd746 100644 --- a/images/linux/Ubuntu2004-Readme.md +++ b/images/linux/Ubuntu2004-Readme.md @@ -1,7 +1,7 @@ | Announcements | |-| | [Third party PHP repository will be removed from the Ubuntu 22.04 image](https://github.com/actions/runner-images/issues/6331) | -| [[Ubuntu] homebrew will be removed from ](https://github.com/actions/runner-images/issues/6283) | +| [[Ubuntu] homebrew will be removed from $PATH](https://github.com/actions/runner-images/issues/6283) | | [The Ubuntu 18.04 Actions runner image will begin deprecation on 8/8/22 and will be fully unsupported by 4/1/2023](https://github.com/actions/runner-images/issues/6002) | *** # Ubuntu 20.04.5 LTS diff --git a/images/linux/Ubuntu2204-Readme.md b/images/linux/Ubuntu2204-Readme.md index 7e2dc12e20b9..3202746bec37 100644 --- a/images/linux/Ubuntu2204-Readme.md +++ b/images/linux/Ubuntu2204-Readme.md @@ -1,7 +1,7 @@ | Announcements | |-| | [Third party PHP repository will be removed from the Ubuntu 22.04 image](https://github.com/actions/runner-images/issues/6331) | -| [[Ubuntu] homebrew will be removed from ](https://github.com/actions/runner-images/issues/6283) | +| [[Ubuntu] homebrew will be removed from $PATH ](https://github.com/actions/runner-images/issues/6283) | | [The Ubuntu 18.04 Actions runner image will begin deprecation on 8/8/22 and will be fully unsupported by 4/1/2023](https://github.com/actions/runner-images/issues/6002) | *** # Ubuntu 22.04.1 LTS From 4aae7a0129c13a921b850a98d2cff9dbb0771797 Mon Sep 17 00:00:00 2001 From: Dusko Dobranic <101048884+ddobranic@users.noreply.github.com> Date: Thu, 6 Oct 2022 09:52:08 +0200 Subject: [PATCH 1511/3485] Add 'Larger Runners' option (#6359) --- .github/ISSUE_TEMPLATE/bug-report.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml index f55ecb683c9b..cdda5b2c71db 100644 --- a/.github/ISSUE_TEMPLATE/bug-report.yml +++ b/.github/ISSUE_TEMPLATE/bug-report.yml @@ -13,7 +13,8 @@ body: label: Platforms affected options: - label: Azure DevOps - - label: GitHub Actions + - label: GitHub Actions - Standard Runners + - label: GitHub Actions - Larger Runners - type: checkboxes attributes: label: Runner images affected From 6cc874356c0341862bd695e13db58ce7c1cc72e4 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Thu, 6 Oct 2022 20:37:12 +0200 Subject: [PATCH 1512/3485] [Windows] Install latest release of Docker CE (#6360) --- .../win/scripts/Installers/Install-Docker.ps1 | 21 ++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/images/win/scripts/Installers/Install-Docker.ps1 b/images/win/scripts/Installers/Install-Docker.ps1 index 28efff98da85..ce28bdb6b1ea 100644 --- a/images/win/scripts/Installers/Install-Docker.ps1 +++ b/images/win/scripts/Installers/Install-Docker.ps1 @@ -5,10 +5,29 @@ ## can continue. ################################################################################ +Write-Host "Get latest release of Docker CE" +$mobyLatestReleaseVersion = (Invoke-RestMethod -Uri "https://api.github.com/repos/moby/moby/releases/latest").tag_name.Trim("v") +$dockerceUrl = "https://download.docker.com/win/static/stable/x86_64/" +$dockerceBinaries = Invoke-WebRequest -Uri $dockerceUrl -UseBasicParsing + +Write-Host "Checking $mobyLatestReleaseVersion version" +$mobyRelease = $dockerceBinaries.Links.href -match "${mobyLatestReleaseVersion}\.zip" | Select-Object -Last 1 +if (-not $mobyRelease) { + Write-Host "Release not found for $mobyLatestRelease version" + $versions = [regex]::Matches($dockerceBinaries.Links.href, "docker-(\d+\.\d+\.\d+)\.zip") | Sort-Object {[version]$_.Groups[1].Value} + $mobyRelease = $versions | Select-Object -ExpandProperty Value -Last 1 + Write-Host "Found $mobyRelease" +} +$mobyReleaseUrl = $dockerceUrl + $mobyRelease +$mobyArchivePath = Start-DownloadWithRetry -Url $mobyReleaseUrl -Name $mobyRelease +Expand-Archive -Path $mobyArchivePath -DestinationPath $env:TEMP +$dockerPath = "$env:TEMP\docker\docker.exe" +$dockerdPath = "$env:TEMP\docker\dockerd.exe" + Write-Host "Install Docker CE" $instScriptUrl = "https://raw.githubusercontent.com/microsoft/Windows-Containers/Main/helpful_tools/Install-DockerCE/install-docker-ce.ps1" $instScriptPath = Start-DownloadWithRetry -Url $instScriptUrl -Name "install-docker-ce.ps1" -& $instScriptPath +& $instScriptPath -DockerPath $dockerPath -DockerDPath $dockerdPath # Fix AZ CLI DOCKER_COMMAND_ERROR # cli.azure.cli.command_modules.acr.custom: Could not run 'docker.exe' command. From 26563d7f30529963c7c1f7491d657c55f5e1a818 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 7 Oct 2022 09:14:51 +0000 Subject: [PATCH 1513/3485] Updating readme file for macOS-11 version 20221002.2 (#6352) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-11-Readme.md | 43 +++++++++++++++++---------------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/images/macos/macos-11-Readme.md b/images/macos/macos-11-Readme.md index 5207efd54480..b757c81cfbb4 100644 --- a/images/macos/macos-11-Readme.md +++ b/images/macos/macos-11-Readme.md @@ -1,12 +1,12 @@ | Announcements | |-| -| [[macOS] Default Xcode on macOS 12 Monterey will be set to Xcode 14.0.1 on September, 26](https://github.com/actions/runner-images/issues/6225) | +| [[macOS] Default Xcode on macOS 12 Monterey will be set to Xcode 14.0.1 on October, 3](https://github.com/actions/runner-images/issues/6225) | | [The macOS 10.15 Actions runner image will begin deprecation on 5/31/22 and will be fully unsupported by 12/1/22 for GitHub and ADO](https://github.com/actions/runner-images/issues/5583) | *** # macOS 11.7 info - System Version: macOS 11.7 (20G817) - Kernel Version: Darwin 20.6.0 -- Image Version: 20220925.1 +- Image Version: 20221002.2 ## Installed Software ### Language and Runtime @@ -21,16 +21,16 @@ - GNU Fortran (Homebrew GCC 10.4.0) 10.4.0 - available by `gfortran-10` alias - GNU Fortran (Homebrew GCC 11.3.0) 11.3.0 - available by `gfortran-11` alias - Go 1.17.13 -- julia 1.8.1 -- Kotlin 1.7.10-release-333 +- julia 1.8.2 +- Kotlin 1.7.20-release-201 - MSBuild 16.10.1.31401 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) - Node.js v16.17.1 - NVM 0.39.1 - NVM - Cached node versions: v12.22.12 v14.20.1 v16.17.1 - Perl 5.34.0 -- PHP 8.1.10 +- PHP 8.1.11 - Python 2.7.18 -- Python 3.10.6 +- Python 3.10.7 - R 4.2.1 - Ruby 2.7.6p219 @@ -39,7 +39,7 @@ - Carthage 0.38.0 - CocoaPods 1.11.3 - Composer 2.4.2 -- Homebrew 3.6.2 +- Homebrew 3.6.3 - Miniconda 4.12.0 - NPM 8.15.0 - NuGet 6.2.1.2 @@ -47,7 +47,7 @@ - Pip 22.2.2 (python 3.10) - Pipx 1.1.0 - RubyGems 3.3.22 -- Vcpkg 2022 (build from master \<57d3194e7>) +- Vcpkg 2022 (build from master \<5f1441730>) - Yarn 1.22.19 #### Environment variables @@ -73,7 +73,7 @@ - Curl 7.85.0 - Git 2.37.3 - Git LFS: 3.2.0 -- GitHub CLI: 2.16.0 +- GitHub CLI: 2.16.1 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.3 - gpg (GnuPG) 2.3.7 @@ -97,21 +97,22 @@ ### Tools - Aliyun CLI 3.0.127 - App Center CLI 2.11.0 -- AWS CLI 2.7.35 -- AWS SAM CLI 1.57.0 +- AWS CLI 2.8.0 +- AWS SAM CLI 1.58.0 - AWS Session Manager CLI 1.2.339.0 - Azure CLI (azure-devops) 0.25.0 - Azure CLI 2.40.0 - Bicep CLI 0.10.61 - Cabal 3.6.2.0 - Cmake 3.24.2 -- CodeQL Action Bundle 2.10.5 +- CodeQL Action Bundle 2.11.0 +- Colima 0.4.5 - Fastlane 2.210.1 - GHC 9.4.2 - GHCup 0.1.18.0 - Jazzy 0.14.3 - Stack 2.9.1 -- SwiftFormat 0.49.18 +- SwiftFormat 0.50.0 - Swig 4.0.2 - Xcode Command Line Tools 13.2.0.0.1.1638488800 @@ -122,18 +123,18 @@ ### Browsers - Safari 16.0 (16614.1.25.9.10) - SafariDriver 16.0 (16614.1.25.9.10) -- Google Chrome 105.0.5195.125 -- ChromeDriver 105.0.5195.52 -- Microsoft Edge 105.0.1343.50 -- Microsoft Edge WebDriver 105.0.1343.50 +- Google Chrome 106.0.5249.91 +- ChromeDriver 106.0.5249.61 +- Microsoft Edge 105.0.1343.53 +- Microsoft Edge WebDriver 105.0.1343.53 - Mozilla Firefox 105.0.1 - geckodriver 0.31.0 -- Selenium server 4.4.0 +- Selenium server 4.5.0 #### Environment variables | Name | Value | | --------------- | ---------------------------------------------- | -| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/105.0.5195.52 | +| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/106.0.5249.61 | | EDGEWEBDRIVER | /usr/local/share/edge_driver | | GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | @@ -205,7 +206,7 @@ | Az | 8.3.0 | | MarkdownPS | 1.9 | | Pester | 5.3.3 | -| PSScriptAnalyzer | 1.20.0 | +| PSScriptAnalyzer | 1.21.0 | ### Web Servers | Name | Version | ConfigFile | ServiceStatus | ListenPort | @@ -218,7 +219,7 @@ | Version | Build | Path | | -------------- | --------- | ------------------------------------ | | 2019 | 8.10.25.2 | /Applications/Visual Studio 2019.app | -| 2022 (default) | 17.3.5.0 | /Applications/Visual Studio.app | +| 2022 (default) | 17.3.6.20 | /Applications/Visual Studio.app | ##### Notes: ``` From 1e628422a36a02c45d78a6933a5e0c7e654b004d Mon Sep 17 00:00:00 2001 From: Julian Ospald <hasufell@posteo.de> Date: Mon, 10 Oct 2022 13:18:09 +0800 Subject: [PATCH 1514/3485] Don't install stack install hook See https://github.com/commercialhaskell/stack/issues/5895 Stack feature is documented here: https://docs.haskellstack.org/en/stable/yaml_configuration/#ghc-installation-customisation It's recommended, but probably too unexpected for CI. It means stack will not install GHC on its own, but through GHCup. --- images/linux/scripts/installers/haskell.sh | 1 + images/linux/scripts/tests/Haskell.Tests.ps1 | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/images/linux/scripts/installers/haskell.sh b/images/linux/scripts/installers/haskell.sh index 702841e6da38..8d11b5df0338 100644 --- a/images/linux/scripts/installers/haskell.sh +++ b/images/linux/scripts/installers/haskell.sh @@ -9,6 +9,7 @@ source $HELPER_SCRIPTS/etc-environment.sh # Any nonzero value for noninteractive installation export BOOTSTRAP_HASKELL_NONINTERACTIVE=1 +export BOOTSTRAP_HASKELL_INSTALL_NO_STACK_HOOK=1 export GHCUP_INSTALL_BASE_PREFIX=/usr/local export BOOTSTRAP_HASKELL_GHC_VERSION=0 ghcup_bin=$GHCUP_INSTALL_BASE_PREFIX/.ghcup/bin diff --git a/images/linux/scripts/tests/Haskell.Tests.ps1 b/images/linux/scripts/tests/Haskell.Tests.ps1 index 21706bd86ee7..af05f9839ea2 100644 --- a/images/linux/scripts/tests/Haskell.Tests.ps1 +++ b/images/linux/scripts/tests/Haskell.Tests.ps1 @@ -31,4 +31,8 @@ Describe "Haskell" { It "Stack" { "stack --version" | Should -ReturnZeroExitCode } + + It "Stack hook is not installed" { + "$HOME/.stack/hooks/ghc-install.sh" | Should -Not -Exist + } } From dcc9b447cb013aa965e5f536810e745e3d7e9654 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Mon, 10 Oct 2022 16:17:51 +0200 Subject: [PATCH 1515/3485] [macOS] do not install stack install hook (#6377) --- images/macos/provision/configuration/environment/bashrc | 1 + images/macos/tests/Haskell.Tests.ps1 | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/images/macos/provision/configuration/environment/bashrc b/images/macos/provision/configuration/environment/bashrc index 65895e7b6625..95cdffb10f82 100644 --- a/images/macos/provision/configuration/environment/bashrc +++ b/images/macos/provision/configuration/environment/bashrc @@ -28,3 +28,4 @@ export HOMEBREW_CLEANUP_PERIODIC_FULL_DAYS=3650 export HOMEBREW_CASK_OPTS="--no-quarantine" export BOOTSTRAP_HASKELL_NONINTERACTIVE=1 +export BOOTSTRAP_HASKELL_INSTALL_NO_STACK_HOOK=1 diff --git a/images/macos/tests/Haskell.Tests.ps1 b/images/macos/tests/Haskell.Tests.ps1 index 525e8934211f..a0c11ce1ab65 100644 --- a/images/macos/tests/Haskell.Tests.ps1 +++ b/images/macos/tests/Haskell.Tests.ps1 @@ -16,4 +16,13 @@ Describe "Haskell" { "cabal --version" | Should -ReturnZeroExitCode } } + Context "Stack" { + It "Stack" { + "stack --version" | Should -ReturnZeroExitCode + } + + It "Stack hook is not installed" { + "$HOME/.stack/hooks/ghc-install.sh" | Should -Not -Exist + } + } } \ No newline at end of file From 704feb689c06a41e65eafff7e0365624add3b337 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <mikhailkoliada@github.com> Date: Wed, 12 Oct 2022 09:52:39 +0200 Subject: [PATCH 1516/3485] [Ubuntu] Document tar version --- images/linux/toolsets/toolset-1804.json | 1 + images/linux/toolsets/toolset-2004.json | 1 + images/linux/toolsets/toolset-2204.json | 1 + 3 files changed, 3 insertions(+) diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index 7e6c8261c8f1..ec42ff09c7b6 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -169,6 +169,7 @@ "pkg-config", "python-setuptools", "rpm", + "tar", "texinfo", "tk", "tzdata", diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index 8f1eabd8b655..0bf819094a5d 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -168,6 +168,7 @@ "pkg-config", "python-is-python3", "rpm", + "tar", "texinfo", "tk", "tzdata", diff --git a/images/linux/toolsets/toolset-2204.json b/images/linux/toolsets/toolset-2204.json index c9a54a7c7f2c..51f7deea765c 100644 --- a/images/linux/toolsets/toolset-2204.json +++ b/images/linux/toolsets/toolset-2204.json @@ -152,6 +152,7 @@ "pkg-config", "python-is-python3", "rpm", + "tar", "texinfo", "tk", "tzdata", From 3442a5c47566bf37f5fc9a55d42216b1e56d4b84 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Wed, 12 Oct 2022 16:03:27 +0200 Subject: [PATCH 1517/3485] Tight VirtualBox version to 6.1.38 (#6391) --- images/macos/provision/core/commonutils.sh | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/images/macos/provision/core/commonutils.sh b/images/macos/provision/core/commonutils.sh index 6e8af564fbbf..1d9dc8092217 100644 --- a/images/macos/provision/core/commonutils.sh +++ b/images/macos/provision/core/commonutils.sh @@ -13,7 +13,16 @@ done cask_packages=$(get_toolset_value '.brew.cask_packages[]') for package in $cask_packages; do echo "Installing $package..." - brew install --cask $package + if [[ $package == "virtualbox" ]]; then + # VirtualBox 7 crashes + # macOS host: Dropped all kernel extensions. VirtualBox relies fully on the hypervisor and vmnet frameworks provided by Apple now. + vbcask_url="https://raw.githubusercontent.com/Homebrew/homebrew-cask/aa3c55951fc9d687acce43e5c0338f42c1ddff7b/Casks/virtualbox.rb" + download_with_retries $vbcask_url + brew install ./virtualbox.rb + rm ./virtualbox.rb + else + brew install --cask $package + fi done # Load "Parallels International GmbH" From 866ccbe818eac94f4873a69f5a83daf58d2cd883 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Thu, 13 Oct 2022 13:45:14 +0200 Subject: [PATCH 1518/3485] [Ubuntu] Add swift to 22.04 (#6398) --- .../scripts/SoftwareReport/SoftwareReport.Generator.ps1 | 6 +++--- images/linux/scripts/tests/Common.Tests.ps1 | 2 +- images/linux/ubuntu2204.pkr.hcl | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index c66bcdebb580..e486305e4078 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -53,14 +53,14 @@ $runtimesList = @( (Get-ClangVersions), (Get-ClangFormatVersions), (Get-ClangTidyVersions), - (Get-KotlinVersion) + (Get-KotlinVersion), + (Get-SwiftVersion) ) if ((Test-IsUbuntu18) -or (Test-IsUbuntu20)) { $runtimesList += @( (Get-ErlangVersion), - (Get-ErlangRebar3Version), - (Get-SwiftVersion) + (Get-ErlangRebar3Version) ) } diff --git a/images/linux/scripts/tests/Common.Tests.ps1 b/images/linux/scripts/tests/Common.Tests.ps1 index b396f5b05edd..593fd1be3279 100644 --- a/images/linux/scripts/tests/Common.Tests.ps1 +++ b/images/linux/scripts/tests/Common.Tests.ps1 @@ -29,7 +29,7 @@ Describe "PHP" { } } -Describe "Swift" -Skip:(Test-IsUbuntu22) { +Describe "Swift" { It "swift" { "swift --version" | Should -ReturnZeroExitCode } diff --git a/images/linux/ubuntu2204.pkr.hcl b/images/linux/ubuntu2204.pkr.hcl index bf957f6c4368..cf95a117b03d 100644 --- a/images/linux/ubuntu2204.pkr.hcl +++ b/images/linux/ubuntu2204.pkr.hcl @@ -282,6 +282,7 @@ build { "${path.root}/scripts/installers/apache.sh", "${path.root}/scripts/installers/aws.sh", "${path.root}/scripts/installers/clang.sh", + "${path.root}/scripts/installers/swift.sh", "${path.root}/scripts/installers/cmake.sh", "${path.root}/scripts/installers/codeql-bundle.sh", "${path.root}/scripts/installers/containers.sh", From 3deda6cab6b145eb0e0e4689d22d1e472b8de2dd Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 13 Oct 2022 21:38:52 +0000 Subject: [PATCH 1519/3485] Updating readme file for macOS-11 version 20221010.1 (#6404) Co-authored-by: Image generation service account <no-reply@microsoft.com> --- images/macos/macos-11-Readme.md | 53 +++++++++++++++++---------------- 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/images/macos/macos-11-Readme.md b/images/macos/macos-11-Readme.md index b757c81cfbb4..c6c10b7a5944 100644 --- a/images/macos/macos-11-Readme.md +++ b/images/macos/macos-11-Readme.md @@ -1,12 +1,13 @@ | Announcements | |-| -| [[macOS] Default Xcode on macOS 12 Monterey will be set to Xcode 14.0.1 on October, 3](https://github.com/actions/runner-images/issues/6225) | +| [macOS-latest workflows will use macOS-12](https://github.com/actions/runner-images/issues/6384) | +| [[all OSs] The VCPKG_ROOT variable will be removed from runner images](https://github.com/actions/runner-images/issues/6376) | | [The macOS 10.15 Actions runner image will begin deprecation on 5/31/22 and will be fully unsupported by 12/1/22 for GitHub and ADO](https://github.com/actions/runner-images/issues/5583) | *** # macOS 11.7 info - System Version: macOS 11.7 (20G817) - Kernel Version: Darwin 20.6.0 -- Image Version: 20221002.2 +- Image Version: 20221010.1 ## Installed Software ### Language and Runtime @@ -27,7 +28,7 @@ - Node.js v16.17.1 - NVM 0.39.1 - NVM - Cached node versions: v12.22.12 v14.20.1 v16.17.1 -- Perl 5.34.0 +- Perl 5.36.0 - PHP 8.1.11 - Python 2.7.18 - Python 3.10.7 @@ -35,19 +36,19 @@ - Ruby 2.7.6p219 ### Package Management -- Bundler version 2.3.22 +- Bundler version 2.3.23 - Carthage 0.38.0 - CocoaPods 1.11.3 - Composer 2.4.2 -- Homebrew 3.6.3 +- Homebrew 3.6.5 - Miniconda 4.12.0 - NPM 8.15.0 - NuGet 6.2.1.2 - Pip 20.3.4 (python 2.7) - Pip 22.2.2 (python 3.10) - Pipx 1.1.0 -- RubyGems 3.3.22 -- Vcpkg 2022 (build from master \<5f1441730>) +- RubyGems 3.3.23 +- Vcpkg 2022 (build from master \<42cc830d8>) - Yarn 1.22.19 #### Environment variables @@ -61,25 +62,25 @@ - Apache Ant(TM) 1.10.12 - Apache Maven 3.8.6 - Gradle 7.5.1 -- Sbt 1.7.1 +- Sbt 1.7.2 ### Utilities - 7-Zip 17.04 - aria2 1.36.0 -- azcopy 10.16.0 +- azcopy 10.16.1 - bazel 5.3.1 - bazelisk 1.14.0 - bsdtar 3.3.2 - available by 'tar' alias - Curl 7.85.0 -- Git 2.37.3 +- Git 2.38.0 - Git LFS: 3.2.0 -- GitHub CLI: 2.16.1 +- GitHub CLI: 2.17.0 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.3 - gpg (GnuPG) 2.3.7 - helm v3.10.0+gce66412 - Hub CLI: 2.14.2 -- ImageMagick 7.1.0-49 +- ImageMagick 7.1.0-50 - jq 1.6 - mongo v5.0.11 - mongod v5.0.11 @@ -91,28 +92,28 @@ - Sox 14.4.2 - Subversion (SVN) 1.14.2 - Switchaudio-osx 1.1.0 -- yq (https://github.com/mikefarah/yq/) version 4.27.5 +- yq (https://github.com/mikefarah/yq/) version 4.28.1 - zstd 1.5.2 ### Tools - Aliyun CLI 3.0.127 - App Center CLI 2.11.0 -- AWS CLI 2.8.0 -- AWS SAM CLI 1.58.0 +- AWS CLI 2.8.2 +- AWS SAM CLI 1.59.0 - AWS Session Manager CLI 1.2.339.0 - Azure CLI (azure-devops) 0.25.0 - Azure CLI 2.40.0 -- Bicep CLI 0.10.61 +- Bicep CLI 0.11.1 - Cabal 3.6.2.0 - Cmake 3.24.2 - CodeQL Action Bundle 2.11.0 -- Colima 0.4.5 +- Colima 0.4.6 - Fastlane 2.210.1 - GHC 9.4.2 - GHCup 0.1.18.0 - Jazzy 0.14.3 - Stack 2.9.1 -- SwiftFormat 0.50.0 +- SwiftFormat 0.50.1 - Swig 4.0.2 - Xcode Command Line Tools 13.2.0.0.1.1638488800 @@ -123,11 +124,11 @@ ### Browsers - Safari 16.0 (16614.1.25.9.10) - SafariDriver 16.0 (16614.1.25.9.10) -- Google Chrome 106.0.5249.91 +- Google Chrome 106.0.5249.103 - ChromeDriver 106.0.5249.61 -- Microsoft Edge 105.0.1343.53 -- Microsoft Edge WebDriver 105.0.1343.53 -- Mozilla Firefox 105.0.1 +- Microsoft Edge 106.0.1370.37 +- Microsoft Edge WebDriver 106.0.1370.42 +- Mozilla Firefox 105.0.3 - geckodriver 0.31.0 - Selenium server 4.5.0 @@ -180,8 +181,8 @@ | Version | Architecture | Environment Variable | | ------- | ------------ | -------------------- | | 1.17.13 (Default) | x64 | GOROOT_1_17_X64 | -| 1.18.6 | x64 | GOROOT_1_18_X64 | -| 1.19.1 | x64 | GOROOT_1_19_X64 | +| 1.18.7 | x64 | GOROOT_1_18_X64 | +| 1.19.2 | x64 | GOROOT_1_19_X64 | ### Rust Tools - Cargo 1.64.0 @@ -191,7 +192,7 @@ #### Packages - Bindgen 0.60.1 -- Cargo-audit 0.17.0 +- Cargo-audit 0.17.2 - Cargo-outdated 0.11.1 - Cbindgen 0.24.3 - Clippy 0.1.64 @@ -335,7 +336,7 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" | Package Name | Version | | -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------ | | Android Command Line Tools | 7.0 | -| Android Emulator | 31.3.11 | +| Android Emulator | 31.3.12 | | Android SDK Build-tools | 33.0.0<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | | Android SDK Platforms | android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | | Android SDK Platform-Tools | 33.0.3 | From f3bb32f2842bf4ed3bb3be8011b5ac554aad3602 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 14 Oct 2022 08:53:50 +0000 Subject: [PATCH 1520/3485] Updating readme file for macOS-12 version 20221010.1 (#6405) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-12-Readme.md | 67 +++++++++++++++++---------------- 1 file changed, 34 insertions(+), 33 deletions(-) diff --git a/images/macos/macos-12-Readme.md b/images/macos/macos-12-Readme.md index 7b6093facb4c..f671890e10dc 100644 --- a/images/macos/macos-12-Readme.md +++ b/images/macos/macos-12-Readme.md @@ -1,12 +1,13 @@ | Announcements | |-| -| [[macOS] Default Xcode on macOS 12 Monterey will be set to Xcode 14.0.1 on October, 3](https://github.com/actions/runner-images/issues/6225) | +| [macOS-latest workflows will use macOS-12](https://github.com/actions/runner-images/issues/6384) | +| [[all OSs] The VCPKG_ROOT variable will be removed from runner images](https://github.com/actions/runner-images/issues/6376) | | [The macOS 10.15 Actions runner image will begin deprecation on 5/31/22 and will be fully unsupported by 12/1/22 for GitHub and ADO](https://github.com/actions/runner-images/issues/5583) | *** # macOS 12.6 info - System Version: macOS 12.6 (21G115) - Kernel Version: Darwin 21.6.0 -- Image Version: 20220929.2 +- Image Version: 20221010.1 ## Installed Software ### Language and Runtime @@ -17,33 +18,33 @@ - gcc-11 (Homebrew GCC 11.3.0) 11.3.0 - available by `gcc-11` alias - GNU Fortran (Homebrew GCC 11.3.0) 11.3.0 - available by `gfortran-11` alias - Go 1.17.13 -- julia 1.8.1 -- Kotlin 1.7.10-release-333 +- julia 1.8.2 +- Kotlin 1.7.20-release-201 - MSBuild 16.10.1.31401 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) - Node.js v16.17.1 - NVM 0.39.1 - NVM - Cached node versions: v12.22.12 v14.20.1 v16.17.1 -- Perl 5.34.0 +- Perl 5.36.0 - PHP 8.1.11 - Python 2.7.18 -- Python 3.10.6 +- Python 3.10.7 - R 4.2.1 - Ruby 3.0.4p208 ### Package Management -- Bundler version 2.3.22 +- Bundler version 2.3.23 - Carthage 0.38.0 - CocoaPods 1.11.3 - Composer 2.4.2 -- Homebrew 3.6.3 +- Homebrew 3.6.5 - Miniconda 4.12.0 - NPM 8.15.0 - NuGet 6.2.1.2 - Pip 20.3.4 (python 2.7) - Pip 22.2.2 (python 3.10) - Pipx 1.1.0 -- RubyGems 3.3.22 -- Vcpkg 2022 (build from master \<2f0a16b5a>) +- RubyGems 3.3.23 +- Vcpkg 2022 (build from master \<42cc830d8>) - Yarn 1.22.19 #### Environment variables @@ -57,24 +58,24 @@ - Apache Ant(TM) 1.10.12 - Apache Maven 3.8.6 - Gradle 7.5.1 -- Sbt 1.7.1 +- Sbt 1.7.2 ### Utilities - 7-Zip 17.04 - aria2 1.36.0 -- azcopy 10.16.0 +- azcopy 10.16.1 - bazel 5.3.1 - bazelisk 1.14.0 - bsdtar 3.5.1 - available by 'tar' alias - Curl 7.85.0 -- Git 2.37.3 +- Git 2.38.0 - Git LFS: 3.2.0 -- GitHub CLI: 2.16.1 +- GitHub CLI: 2.17.0 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.3 - gpg (GnuPG) 2.3.7 - Hub CLI: 2.14.2 -- ImageMagick 7.1.0-49 +- ImageMagick 7.1.0-50 - jq 1.6 - mongo v5.0.11 - mongod v5.0.11 @@ -85,29 +86,29 @@ - Sox 14.4.2 - Subversion (SVN) 1.14.2 - Switchaudio-osx 1.1.0 -- Vagrant 2.3.0 +- Vagrant 2.3.1 - VirtualBox 6.1.38r153438 -- yq (https://github.com/mikefarah/yq/) version 4.27.5 +- yq (https://github.com/mikefarah/yq/) version 4.28.1 - zstd 1.5.2 ### Tools - App Center CLI 2.11.0 -- AWS CLI 2.7.35 -- AWS SAM CLI 1.58.0 +- AWS CLI 2.8.2 +- AWS SAM CLI 1.59.0 - AWS Session Manager CLI 1.2.339.0 - Azure CLI (azure-devops) 0.25.0 - Azure CLI 2.40.0 -- Bicep CLI 0.10.61 +- Bicep CLI 0.11.1 - Cabal 3.6.2.0 - Cmake 3.24.2 - CodeQL Action Bundle 2.11.0 -- Colima 0.4.5 +- Colima 0.4.6 - Fastlane 2.210.1 - GHC 9.4.2 - GHCup 0.1.18.0 - Jazzy 0.14.3 - Stack 2.9.1 -- SwiftFormat 0.50.0 +- SwiftFormat 0.50.1 - Swig 4.0.2 - Xcode Command Line Tools 14.0.0.0.1.1661618636 @@ -118,11 +119,11 @@ ### Browsers - Safari 16.0 (17614.1.25.9.10) - SafariDriver 16.0 (17614.1.25.9.10) -- Google Chrome 106.0.5249.61 +- Google Chrome 106.0.5249.103 - ChromeDriver 106.0.5249.61 -- Microsoft Edge 105.0.1343.53 -- Microsoft Edge WebDriver 105.0.1343.53 -- Mozilla Firefox 105.0.1 +- Microsoft Edge 106.0.1370.37 +- Microsoft Edge WebDriver 106.0.1370.42 +- Mozilla Firefox 105.0.3 - geckodriver 0.31.0 - Selenium server 4.5.0 @@ -172,8 +173,8 @@ | Version | Architecture | Environment Variable | | ------- | ------------ | -------------------- | | 1.17.13 (Default) | x64 | GOROOT_1_17_X64 | -| 1.18.6 | x64 | GOROOT_1_18_X64 | -| 1.19.1 | x64 | GOROOT_1_19_X64 | +| 1.18.7 | x64 | GOROOT_1_18_X64 | +| 1.19.2 | x64 | GOROOT_1_19_X64 | ### Rust Tools - Cargo 1.64.0 @@ -183,7 +184,7 @@ #### Packages - Bindgen 0.60.1 -- Cargo-audit 0.17.0 +- Cargo-audit 0.17.2 - Cargo-outdated 0.11.1 - Cbindgen 0.24.3 - Clippy 0.1.64 @@ -312,9 +313,9 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" | tvOS 15.4 | 13.3.1<br>13.4<br>13.4.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | | tvOS 16.0 | 13.1<br>13.2.1<br>13.3.1<br>13.4<br>13.4.1<br>14.0<br>14.0.1<br>14.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | | tvOS 16.1 | 13.1<br>13.2.1<br>13.3.1<br>13.4<br>13.4.1<br>14.0<br>14.0.1<br>14.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | -| watchOS 8.0 | 13.1 | Apple Watch Series 5 - 44mm<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 45mm<br>Apple Watch Series 7 (41mm) | -| watchOS 8.3 | 13.2.1 | Apple Watch Series 5 - 44mm<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 (45mm) | -| watchOS 8.5 | 13.3.1<br>13.4<br>13.4.1 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 (45mm) | +| watchOS 8.0 | 13.1 | Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 45mm<br>Apple Watch Series 7 (41mm) | +| watchOS 8.3 | 13.2.1 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm) | +| watchOS 8.5 | 13.3.1<br>13.4<br>13.4.1 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | | watchOS 9.0 | 13.1<br>13.2.1<br>13.3.1<br>13.4<br>13.4.1<br>14.0<br>14.0.1<br>14.1 | Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | | watchOS 9.1 | 13.1<br>13.2.1<br>13.3.1<br>13.4<br>13.4.1<br>14.0<br>14.0.1<br>14.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | @@ -322,7 +323,7 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" | Package Name | Version | | -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------ | | Android Command Line Tools | 7.0 | -| Android Emulator | 31.3.11 | +| Android Emulator | 31.3.12 | | Android SDK Build-tools | 33.0.0<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | | Android SDK Platforms | android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | | Android SDK Platform-Tools | 33.0.3 | From ac65b549ac1094005080fe0c0104376308940d1e Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Fri, 14 Oct 2022 10:57:42 +0200 Subject: [PATCH 1521/3485] [Ubuntu] Delete old Alpine Docker images (#6379) --- images/linux/toolsets/toolset-2004.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index 0bf819094a5d..ee5fccacb01b 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -229,8 +229,6 @@ ], "docker": { "images": [ - "alpine:3.12", - "alpine:3.13", "alpine:3.14", "alpine:3.15", "alpine:3.16", From 6c93c2410761a9338b9ebf3ff1cc19c971901a97 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 14 Oct 2022 15:34:40 +0000 Subject: [PATCH 1522/3485] Updating readme file for win22 version 20221012.4 (#6403) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2022-Readme.md | 121 ++++++++++++++++--------------- 1 file changed, 63 insertions(+), 58 deletions(-) diff --git a/images/win/Windows2022-Readme.md b/images/win/Windows2022-Readme.md index 7baf941e39b6..380101c00c0e 100644 --- a/images/win/Windows2022-Readme.md +++ b/images/win/Windows2022-Readme.md @@ -1,6 +1,10 @@ +| Announcements | +|-| +| [[all OSs] The VCPKG_ROOT variable will be removed from runner images](https://github.com/actions/runner-images/issues/6376) | +*** # Microsoft Windows Server 2022 Datacenter -- OS Version: 10.0.20348 Build 1006 -- Image Version: 20221002.2 +- OS Version: 10.0.20348 Build 1129 +- Image Version: 20221012.4 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -12,7 +16,7 @@ - Julia 1.8.2 - Kotlin 1.7.20 - LLVM 14.0.6 -- Node 16.17.1 +- Node 16.18.0 - Perl 5.32.1 - PHP 8.1.11 - Python 3.9.13 @@ -21,14 +25,14 @@ ### Package Management - Chocolatey 1.1.0 - Composer 2.4.2 -- Helm 3.9.4 +- Helm 3.10.0 - Miniconda 4.12.0 (pre-installed on the image but not added to PATH) -- NPM 8.15.0 -- NuGet 6.3.0.131 +- NPM 8.19.2 +- NuGet 6.3.1.1 - pip 22.2.2 (python 3.9) - Pipx 1.1.0 - RubyGems 3.2.33 -- Vcpkg (build from master \<5f1441730>) +- Vcpkg (build from master \<680071397>) - Yarn 1.22.19 #### Environment variables @@ -41,26 +45,26 @@ - Ant 1.10.12 - Gradle 7.5 - Maven 3.8.6 -- sbt 1.7.1 +- sbt 1.7.2 ### Tools - 7zip 22.01 - aria2 1.36.0 -- azcopy 10.16.0 +- azcopy 10.16.1 - Bazel 5.3.1 - Bazelisk 1.13.2 - Bicep 0.10.61 - Cabal 3.8.1.0 - CMake 3.24.2 - CodeQL Action Bundle 2.11.0 +- Docker 20.10.18 - Docker Compose v1 1.29.2 - Docker Compose v2 2.11.2 -- Docker master-dockerproject-2022-03-26 - Docker-wincred 0.7.0 - ghc 9.4.2 - Git 2.37.3.windows.1 - Git LFS 3.2.0 -- ImageMagick 7.1.0-49 +- ImageMagick 7.1.0-50 - InnoSetup 6.2.1 - jq 1.6 - Kind 0.16.0 @@ -71,7 +75,7 @@ - NSIS v3.08 - OpenSSL 1.1.1 - Packer 1.8.2 -- Pulumi v3.40.2 +- Pulumi v3.42.0 - R 4.2.1 - Service Fabric SDK 9.0.1028.9590 - Stack 2.9.1 @@ -84,13 +88,13 @@ - zstd 1.5.2 ### CLI Tools -- Alibaba Cloud CLI 3.0.127 -- AWS CLI 2.8.0 -- AWS SAM CLI 1.58.0 +- Alibaba Cloud CLI 3.0.130 +- AWS CLI 2.8.2 +- AWS SAM CLI 1.59.0 - AWS Session Manager CLI 1.2.339.0 -- Azure CLI 2.40.0 +- Azure CLI 2.41.0 - Azure DevOps CLI extension 0.25.0 -- GitHub CLI 2.16.1 +- GitHub CLI 2.17.0 - Hub CLI 2.14.2 ### Rust Tools @@ -101,18 +105,18 @@ #### Packages - bindgen 0.60.1 -- cargo-audit 0.17.0 +- cargo-audit 0.17.2 - cargo-outdated 0.11.1 - cbindgen 0.24.3 - Clippy 0.1.64 - Rustfmt 1.5.1 ### Browsers and webdrivers -- Google Chrome 106.0.5249.91 +- Google Chrome 106.0.5249.119 - Chrome Driver 106.0.5249.61 -- Microsoft Edge 105.0.1343.53 -- Microsoft Edge Driver 105.0.1343.53 -- Mozilla Firefox 105.0.1 +- Microsoft Edge 106.0.1370.42 +- Microsoft Edge Driver 106.0.1370.42 +- Mozilla Firefox 105.0.3 - Gecko Driver 0.31.0 - IE Driver 3.150.1.1 - Selenium server 4.5.0 @@ -154,8 +158,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Version | Architecture | Environment Variable | | ------- | ------------ | -------------------- | | 1.17.13 (Default) | x64 | GOROOT_1_17_X64 | -| 1.18.6 | x64 | GOROOT_1_18_X64 | -| 1.19.1 | x64 | GOROOT_1_19_X64 | +| 1.18.7 | x64 | GOROOT_1_18_X64 | +| 1.19.2 | x64 | GOROOT_1_19_X64 | #### Node | Version | Architecture | @@ -208,7 +212,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Database tools - Azure CosmosDb Emulator 2.14.9.0 - DacFx 16.0.6296.0 -- MySQL 8.0.30.0 +- MySQL 8.0.31.0 - SQL OLEDB Driver 18.6.3.0 - SQLPS 1.0 @@ -221,12 +225,12 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Visual Studio Enterprise 2022 | Name | Version | Path | | ----------------------------- | -------------- | -------------------------------------------------------- | -| Visual Studio Enterprise 2022 | 17.3.32922.545 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | +| Visual Studio Enterprise 2022 | 17.3.32929.385 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | #### Workloads, components and extensions: | Package | Version | | ------------------------------------------------------------------------- | -------------- | -| android | 32.0.448.0 | +| android | 32.0.476.0 | | Component.Android.NDK.R21E | 17.3.32708.82 | | Component.Android.SDK.MAUI | 17.3.32708.82 | | Component.Android.SDK25.Private | 17.3.32708.82 | @@ -253,14 +257,14 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Component.WixToolset.VisualStudioExtension.Schemas4 | 1.0.0.18 | | Component.Xamarin | 17.3.32708.82 | | Component.Xamarin.RemotedSimulator | 17.3.32708.82 | -| ios | 15.4.446.446 | -| maccatalyst | 15.4.446.446 | -| maui.android | 6.0.536.0 | -| maui.blazor | 6.0.536.0 | -| maui.core | 6.0.536.0 | -| maui.ios | 6.0.536.0 | -| maui.maccatalyst | 6.0.536.0 | -| maui.windows | 6.0.536.0 | +| ios | 16.0.517.517 | +| maccatalyst | 15.4.465.465 | +| maui.android | 6.0.541.0 | +| maui.blazor | 6.0.541.0 | +| maui.core | 6.0.541.0 | +| maui.ios | 6.0.541.0 | +| maui.maccatalyst | 6.0.541.0 | +| maui.windows | 6.0.541.0 | | Microsoft.Component.Azure.DataLake.Tools | 17.3.32708.82 | | Microsoft.Component.ClickOnce | 17.3.32708.82 | | Microsoft.Component.CodeAnalysis.SDK | 17.3.32708.82 | @@ -284,15 +288,15 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.Net.ComponentGroup.4.8.DeveloperTools | 17.3.32708.82 | | Microsoft.Net.ComponentGroup.DevelopmentPrerequisites | 17.3.32708.82 | | Microsoft.Net.ComponentGroup.TargetingPacks.Common | 17.3.32708.82 | -| microsoft.net.runtime.android | 6.0.922.41905 | -| microsoft.net.runtime.android.aot | 6.0.922.41905 | -| microsoft.net.runtime.ios | 6.0.922.41905 | -| microsoft.net.runtime.maccatalyst | 6.0.922.41905 | -| microsoft.net.runtime.mono.tooling | 6.0.922.41905 | -| microsoft.net.sdk.emscripten | 6.0.6.41805 | +| microsoft.net.runtime.android | 6.0.1022.47605 | +| microsoft.net.runtime.android.aot | 6.0.1022.47605 | +| microsoft.net.runtime.ios | 6.0.1022.47605 | +| microsoft.net.runtime.maccatalyst | 6.0.1022.47605 | +| microsoft.net.runtime.mono.tooling | 6.0.1022.47605 | +| microsoft.net.sdk.emscripten | 6.0.6.46402 | | Microsoft.NetCore.Component.DevelopmentTools | 17.3.32708.82 | -| Microsoft.NetCore.Component.Runtime.6.0 | 17.3.32901.90 | -| Microsoft.NetCore.Component.SDK | 17.3.32901.90 | +| Microsoft.NetCore.Component.Runtime.6.0 | 17.3.32929.385 | +| Microsoft.NetCore.Component.SDK | 17.3.32929.385 | | Microsoft.NetCore.Component.Web | 17.3.32708.82 | | Microsoft.VisualStudio.Component.AppInsights.Tools | 17.3.32708.82 | | Microsoft.VisualStudio.Component.AspNet | 17.3.32708.82 | @@ -491,9 +495,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Workload.Python | 17.3.32708.82 | | Microsoft.VisualStudio.Workload.Universal | 17.3.32708.82 | | Microsoft.VisualStudio.Workload.VisualStudioExtension | 17.3.32708.82 | -| runtimes.ios | 6.0.922.41905 | -| runtimes.maccatalyst | 6.0.922.41905 | -| wasm.tools | 6.0.922.41905 | +| runtimes.ios | 6.0.1022.47605 | +| runtimes.maccatalyst | 6.0.1022.47605 | +| wasm.tools | 6.0.1022.47605 | | ProBITools.MicrosoftAnalysisServicesModelingProjects2022 | 3.0.4 | | ProBITools.MicrosoftReportProjectsforVisualStudio2022 | 3.0.1 | | VisualStudioClient.MicrosoftVisualStudio2022InstallerProjects | 2.0.0 | @@ -528,17 +532,17 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### .NET Core SDK `Location C:\Program Files\dotnet\sdk` -- 3.1.120 3.1.202 3.1.302 3.1.423 5.0.104 5.0.214 5.0.303 5.0.408 6.0.401 +- 3.1.120 3.1.202 3.1.302 3.1.424 5.0.104 5.0.214 5.0.303 5.0.408 6.0.402 ### .NET Core Runtime `Location: C:\Program Files\dotnet\shared\Microsoft.AspNetCore.App` -- 3.1.4 3.1.6 3.1.20 3.1.29 5.0.4 5.0.9 5.0.17 6.0.9 +- 3.1.4 3.1.6 3.1.20 3.1.30 5.0.4 5.0.9 5.0.17 6.0.10 `Location: C:\Program Files\dotnet\shared\Microsoft.NETCore.App` -- 3.1.4 3.1.6 3.1.20 3.1.29 5.0.4 5.0.9 5.0.17 6.0.9 +- 3.1.4 3.1.6 3.1.20 3.1.30 5.0.4 5.0.9 5.0.17 6.0.10 `Location: C:\Program Files\dotnet\shared\Microsoft.WindowsDesktop.App` -- 3.1.4 3.1.6 3.1.20 3.1.29 5.0.4 5.0.9 5.0.17 6.0.9 +- 3.1.4 3.1.6 3.1.20 3.1.30 5.0.4 5.0.9 5.0.17 6.0.10 ### .NET Framework `Type: Developer Pack` @@ -567,10 +571,10 @@ All other versions are saved but not installed. #### Powershell Modules | Module | Version | | ------------------ | ---------------- | -| AWSPowerShell | 4.1.179 | +| AWSPowerShell | 4.1.184 | | DockerMsftProvider | 1.0.0.8 | | MarkdownPS | 1.9 | -| Microsoft.Graph | 1.12.2 | +| Microsoft.Graph | 1.13.0 | | Pester | 3.4.0<br>5.3.3 | | PowerShellGet | 1.0.0.1<br>2.2.5 | | PSScriptAnalyzer | 1.21.0 | @@ -582,7 +586,7 @@ All other versions are saved but not installed. | Package Name | Version | | -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------ | | Android Command Line Tools | 7.0 | -| Android Emulator | 31.3.11 | +| Android Emulator | 31.3.12 | | Android SDK Build-tools | 33.0.0<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | | Android SDK Platforms | android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | | Android SDK Platform-Tools | 33.0.3 | @@ -606,9 +610,10 @@ All other versions are saved but not installed. ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2022 | sha256:545fd83fdb5ecbbc60fbcb86e16947e95f53739cae0715c191da58f12b5ae9c9 | 2022-09-13 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2022 | sha256:c763de073f4631d5e8511c4dd05fbf73cf6d91aef3313658ac3a87bc64626c3c | 2022-09-13 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:0fc848adcb5dae2b733bb39b2a0485c5a08f8c338309b48d85cfe0909492874f | 2022-09-13 | -| mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:ac76db222126ed259f8ac1ed42e7e4564509ea869ae535e3faae866c01cd7755 | 2022-09-08 | -| mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:2846453bcfaee661d563e29d6513191dccf7280bb826b2da9d6e7226fba2db94 | 2022-09-08 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2022 | sha256:86ef1feae54df685bc33ea234c23babb704d4027a39404a072d922883a8a8049 | 2022-10-11 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2022 | sha256:73956aba99a6ee0b867774c2b5faeec11b153329f43c8c729c2c27a2024c4b98 | 2022-10-11 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:42b5c55b4918f3c56ec4a5e6a1b0735b624941bd885a13c12e30dc7a81ba2fb6 | 2022-10-11 | +| mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:fefb912e2942912f1cd55bfe6bbb697a601a7787caf5c1875aaf105c86a28027 | 2022-10-07 | +| mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:6983a9d56e4d8d1fac3819e4bed8ff537400ea21150b9d65bfbdc0ef3c27c99c | 2022-10-07 | + From f790e06bc3ddf72791a1ee902cc49a28a0780445 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <v-aleche@microsoft.com> Date: Mon, 17 Oct 2022 10:04:32 +0200 Subject: [PATCH 1523/3485] Add cbindgen and bindgen pester test --- images/win/scripts/Tests/Rust.Tests.ps1 | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/images/win/scripts/Tests/Rust.Tests.ps1 b/images/win/scripts/Tests/Rust.Tests.ps1 index 56ca20f857fa..5aba1c041f99 100644 --- a/images/win/scripts/Tests/Rust.Tests.ps1 +++ b/images/win/scripts/Tests/Rust.Tests.ps1 @@ -6,11 +6,13 @@ Describe "Rust" { } $rustTools = @( - @{ToolName = "rustup"; binPath = "C:\Users\Default\.cargo\bin\rustup.exe"} - @{ToolName = "rustc"; binPath = "C:\Users\Default\.cargo\bin\rustc.exe"} - @{ToolName = "cargo"; binPath = "C:\Users\Default\.cargo\bin\cargo.exe"} - @{ToolName = "cargo audit"; binPath = "C:\Users\Default\.cargo\bin\cargo-audit.exe"} - @{ToolName = "cargo outdated"; binPath = "C:\Users\Default\.cargo\bin\cargo-outdated.exe"} + @{ToolName = "rustup"; binPath = "$env:CARGO_HOME\bin\rustup.exe"} + @{ToolName = "rustc"; binPath = "$env:CARGO_HOME\bin\rustc.exe"} + @{ToolName = "bindgen.exe"; binPath = "$env:CARGO_HOME\bin\bindgen.exe"} + @{ToolName = "cbindgen.exe"; binPath = "$env:CARGO_HOME\bin\cbindgen.exe"} + @{ToolName = "cargo"; binPath = "$env:CARGO_HOME\bin\cargo.exe"} + @{ToolName = "cargo audit"; binPath = "$env:CARGO_HOME\bin\cargo-audit.exe"} + @{ToolName = "cargo outdated"; binPath = "$env:CARGO_HOME\bin\cargo-outdated.exe"} ) $rustEnvNotExists = @( From 796a8bc2b37a619e257489a392a401f9c80d0efd Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <v-aleche@microsoft.com> Date: Mon, 17 Oct 2022 12:59:46 +0200 Subject: [PATCH 1524/3485] replace bindgen to bindgen-cli --- images/win/scripts/Installers/Install-Rust.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/win/scripts/Installers/Install-Rust.ps1 b/images/win/scripts/Installers/Install-Rust.ps1 index d9b43311a1d7..9bd0c2b3f876 100644 --- a/images/win/scripts/Installers/Install-Rust.ps1 +++ b/images/win/scripts/Installers/Install-Rust.ps1 @@ -24,7 +24,7 @@ rustup target add i686-pc-windows-msvc # Install common tools rustup component add rustfmt clippy -cargo install --locked bindgen cbindgen cargo-audit cargo-outdated +cargo install --locked bindgen-cli cbindgen cargo-audit cargo-outdated # Cleanup Cargo crates cache Remove-Item "${env:CARGO_HOME}\registry\*" -Recurse -Force From 3b005f03fedb0a5046962525ccf5fa70974943f5 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <v-aleche@microsoft.com> Date: Mon, 17 Oct 2022 13:07:27 +0200 Subject: [PATCH 1525/3485] Replace bindgen to bindgen-cli --- images/linux/scripts/installers/rust.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/linux/scripts/installers/rust.sh b/images/linux/scripts/installers/rust.sh index 515525ffda3f..5e0b4658848e 100644 --- a/images/linux/scripts/installers/rust.sh +++ b/images/linux/scripts/installers/rust.sh @@ -20,9 +20,9 @@ source $CARGO_HOME/env rustup component add rustfmt clippy if isUbuntu22; then - cargo install bindgen cbindgen cargo-audit cargo-outdated + cargo install bindgen-cli cbindgen cargo-audit cargo-outdated else - cargo install --locked bindgen cbindgen cargo-audit cargo-outdated + cargo install --locked bindgen-cli cbindgen cargo-audit cargo-outdated fi # Cleanup Cargo cache From ee878fc1612e48cd76d8fed9ed4d6f013deb2dee Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <v-aleche@microsoft.com> Date: Mon, 17 Oct 2022 13:52:25 +0200 Subject: [PATCH 1526/3485] Replace bindgen to bindgen-cli --- images/macos/provision/core/rust.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/macos/provision/core/rust.sh b/images/macos/provision/core/rust.sh index d60bcf0dc760..bf2a61607e3a 100644 --- a/images/macos/provision/core/rust.sh +++ b/images/macos/provision/core/rust.sh @@ -12,7 +12,7 @@ CARGO_HOME=$HOME/.cargo echo Install common tools... rustup component add rustfmt clippy -cargo install --locked bindgen cbindgen cargo-audit cargo-outdated +cargo install --locked bindgen-cli cbindgen cargo-audit cargo-outdated echo Cleanup Cargo registry cached data... rm -rf $CARGO_HOME/registry/* From caa3fa7f9fbe0da6a0aab8cdd633c5b7593e527e Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <v-aleche@microsoft.com> Date: Mon, 17 Oct 2022 16:25:50 +0200 Subject: [PATCH 1527/3485] revert env variable --- images/win/scripts/Tests/Rust.Tests.ps1 | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/images/win/scripts/Tests/Rust.Tests.ps1 b/images/win/scripts/Tests/Rust.Tests.ps1 index 5aba1c041f99..3551871b5d53 100644 --- a/images/win/scripts/Tests/Rust.Tests.ps1 +++ b/images/win/scripts/Tests/Rust.Tests.ps1 @@ -6,13 +6,13 @@ Describe "Rust" { } $rustTools = @( - @{ToolName = "rustup"; binPath = "$env:CARGO_HOME\bin\rustup.exe"} - @{ToolName = "rustc"; binPath = "$env:CARGO_HOME\bin\rustc.exe"} - @{ToolName = "bindgen.exe"; binPath = "$env:CARGO_HOME\bin\bindgen.exe"} - @{ToolName = "cbindgen.exe"; binPath = "$env:CARGO_HOME\bin\cbindgen.exe"} - @{ToolName = "cargo"; binPath = "$env:CARGO_HOME\bin\cargo.exe"} - @{ToolName = "cargo audit"; binPath = "$env:CARGO_HOME\bin\cargo-audit.exe"} - @{ToolName = "cargo outdated"; binPath = "$env:CARGO_HOME\bin\cargo-outdated.exe"} + @{ToolName = "rustup"; binPath = "C:\Users\Default\.cargo\bin\rustup.exe"} + @{ToolName = "rustc"; binPath = "C:\Users\Default\.cargo\bin\rustc.exe"} + @{ToolName = "bindgen.exe"; binPath = "C:\Users\Default\.cargo\bin\bindgen.exe"} + @{ToolName = "cbindgen.exe"; binPath = "C:\Users\Default\.cargo\bin\cbindgen.exe"} + @{ToolName = "cargo"; binPath = "C:\Users\Default\.cargo\bin\cargo.exe"} + @{ToolName = "cargo audit"; binPath = "C:\Users\Default\.cargo\bin\cargo-audit.exe"} + @{ToolName = "cargo outdated"; binPath = "C:\Users\Default\.cargo\bin\cargo-outdated.exe"} ) $rustEnvNotExists = @( From 1f39d255232f2180fc03a7f8aa11c7fd55b393c7 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 17 Oct 2022 18:16:12 +0000 Subject: [PATCH 1528/3485] Updating readme file for win19 version 20221012.3 (#6406) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2019-Readme.md | 93 +++++++++++++++++--------------- 1 file changed, 49 insertions(+), 44 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index 83ec1283f1ac..abb07b0e5578 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -1,6 +1,10 @@ +| Announcements | +|-| +| [[all OSs] The VCPKG_ROOT variable will be removed from runner images](https://github.com/actions/runner-images/issues/6376) | +*** # Microsoft Windows Server 2019 Datacenter -- OS Version: 10.0.17763 Build 3406 -- Image Version: 20221002.2 +- OS Version: 10.0.17763 Build 3532 +- Image Version: 20221012.3 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -12,7 +16,7 @@ - Julia 1.8.2 - Kotlin 1.7.20 - LLVM 14.0.6 -- Node 16.17.1 +- Node 16.18.0 - Perl 5.32.1 - PHP 8.1.11 - Python 3.7.9 @@ -21,14 +25,14 @@ ### Package Management - Chocolatey 1.1.0 - Composer 2.4.2 -- Helm 3.9.4 +- Helm 3.10.0 - Miniconda 4.12.0 (pre-installed on the image but not added to PATH) -- NPM 8.15.0 -- NuGet 6.3.0.131 +- NPM 8.19.2 +- NuGet 6.3.1.1 - pip 22.2.2 (python 3.7) - Pipx 1.1.0 - RubyGems 2.7.6.3 -- Vcpkg (build from master \<5f1441730>) +- Vcpkg (build from master \<680071397>) - Yarn 1.22.19 #### Environment variables @@ -42,27 +46,27 @@ - Ant 1.10.12 - Gradle 7.5 - Maven 3.8.6 -- sbt 1.7.1 +- sbt 1.7.2 ### Tools - 7zip 22.01 - aria2 1.36.0 -- azcopy 10.16.0 +- azcopy 10.16.1 - Bazel 5.3.1 - Bazelisk 1.13.2 - Bicep 0.10.61 - Cabal 3.8.1.0 - CMake 3.24.2 - CodeQL Action Bundle 2.11.0 +- Docker 20.10.18 - Docker Compose v1 1.29.2 - Docker Compose v2 2.11.2 -- Docker master-dockerproject-2022-03-26 - Docker-wincred 0.7.0 - ghc 9.4.2 - Git 2.37.3.windows.1 - Git LFS 3.2.0 -- Google Cloud SDK 404.0.0 -- ImageMagick 7.1.0-49 +- Google Cloud SDK 405.0.0 +- ImageMagick 7.1.0-50 - InnoSetup 6.2.1 - jq 1.6 - Kind 0.16.0 @@ -74,7 +78,7 @@ - OpenSSL 1.1.1 - Packer 1.8.2 - Parcel 2.7.0 -- Pulumi v3.40.2 +- Pulumi v3.42.0 - R 4.2.1 - Service Fabric SDK 9.0.1028.9590 - Stack 2.9.1 @@ -87,14 +91,14 @@ - zstd 1.5.2 ### CLI Tools -- Alibaba Cloud CLI 3.0.127 -- AWS CLI 2.8.0 -- AWS SAM CLI 1.58.0 +- Alibaba Cloud CLI 3.0.130 +- AWS CLI 2.8.2 +- AWS SAM CLI 1.59.0 - AWS Session Manager CLI 1.2.339.0 -- Azure CLI 2.40.0 +- Azure CLI 2.41.0 - Azure DevOps CLI extension 0.25.0 - Cloud Foundry CLI 6.53.0 -- GitHub CLI 2.16.1 +- GitHub CLI 2.17.0 - Hub CLI 2.14.2 ### Rust Tools @@ -105,18 +109,18 @@ #### Packages - bindgen 0.60.1 -- cargo-audit 0.17.0 +- cargo-audit 0.17.2 - cargo-outdated 0.11.1 - cbindgen 0.24.3 - Clippy 0.1.64 - Rustfmt 1.5.1 ### Browsers and webdrivers -- Google Chrome 106.0.5249.91 +- Google Chrome 106.0.5249.119 - Chrome Driver 106.0.5249.61 -- Microsoft Edge 105.0.1343.53 -- Microsoft Edge Driver 105.0.1343.53 -- Mozilla Firefox 105.0.1 +- Microsoft Edge 106.0.1370.42 +- Microsoft Edge Driver 106.0.1370.42 +- Mozilla Firefox 105.0.3 - Gecko Driver 0.31.0 - IE Driver 3.150.1.1 - Selenium server 4.5.0 @@ -162,8 +166,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Version | Architecture | Environment Variable | | ------- | ------------ | -------------------- | | 1.17.13 (Default) | x64 | GOROOT_1_17_X64 | -| 1.18.6 | x64 | GOROOT_1_18_X64 | -| 1.19.1 | x64 | GOROOT_1_19_X64 | +| 1.18.7 | x64 | GOROOT_1_18_X64 | +| 1.19.2 | x64 | GOROOT_1_19_X64 | #### Node | Version | Architecture | @@ -222,7 +226,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Database tools - Azure CosmosDb Emulator 2.14.9.0 - DacFx 16.0.6296.0 -- MySQL 5.7.39.0 +- MySQL 5.7.40.0 - SQL OLEDB Driver 18.6.3.0 - SQLPS 1.0 @@ -233,14 +237,14 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Nginx | 1.23.1 | C:\tools\nginx-1.23.1\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2019 -| Name | Version | Path | -| ----------------------------- | -------------- | -------------------------------------------------------------- | -| Visual Studio Enterprise 2019 | 16.11.32901.82 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | +| Name | Version | Path | +| ----------------------------- | --------------- | -------------------------------------------------------------- | +| Visual Studio Enterprise 2019 | 16.11.32929.386 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | #### Workloads, components and extensions: | Package | Version | | ------------------------------------------------------------------------- | --------------- | -| Component.Android.NDK.R16B | 16.11.32830.301 | +| Component.Android.NDK.R16B | 16.11.32926.322 | | Component.Android.SDK25.Private | 16.0.28625.61 | | Component.Android.SDK30 | 16.10.31205.252 | | Component.Ant | 1.9.3.8 | @@ -295,9 +299,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.Net.ComponentGroup.DevelopmentPrerequisites | 16.3.29207.166 | | Microsoft.Net.ComponentGroup.TargetingPacks.Common | 16.0.28516.191 | | Microsoft.NetCore.Component.DevelopmentTools | 16.10.31303.231 | -| Microsoft.NetCore.Component.Runtime.3.1 | 16.11.32901.82 | -| Microsoft.NetCore.Component.Runtime.6.0 | 16.11.32901.82 | -| Microsoft.NetCore.Component.SDK | 16.11.32901.82 | +| Microsoft.NetCore.Component.Runtime.3.1 | 16.11.32929.268 | +| Microsoft.NetCore.Component.Runtime.6.0 | 16.11.32929.268 | +| Microsoft.NetCore.Component.SDK | 16.11.32929.268 | | Microsoft.NetCore.Component.Web | 16.10.31303.231 | | Microsoft.VisualStudio.Component.AppInsights.Tools | 16.5.29515.121 | | Microsoft.VisualStudio.Component.AspNet45 | 16.10.31205.252 | @@ -506,17 +510,17 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### .NET Core SDK `Location C:\Program Files\dotnet\sdk` -- 3.1.120 3.1.202 3.1.302 3.1.423 5.0.104 5.0.214 5.0.303 5.0.408 5.0.412 +- 3.1.120 3.1.202 3.1.302 3.1.424 5.0.104 5.0.214 5.0.303 5.0.408 5.0.413 ### .NET Core Runtime `Location: C:\Program Files\dotnet\shared\Microsoft.AspNetCore.App` -- 3.1.4 3.1.6 3.1.20 3.1.29 5.0.4 5.0.9 5.0.17 6.0.9 +- 3.1.4 3.1.6 3.1.20 3.1.30 5.0.4 5.0.9 5.0.17 6.0.10 `Location: C:\Program Files\dotnet\shared\Microsoft.NETCore.App` -- 3.1.4 3.1.6 3.1.20 3.1.29 5.0.4 5.0.9 5.0.17 6.0.9 +- 3.1.4 3.1.6 3.1.20 3.1.30 5.0.4 5.0.9 5.0.17 6.0.10 `Location: C:\Program Files\dotnet\shared\Microsoft.WindowsDesktop.App` -- 3.1.4 3.1.6 3.1.20 3.1.29 5.0.4 5.0.9 5.0.17 6.0.9 +- 3.1.4 3.1.6 3.1.20 3.1.30 5.0.4 5.0.9 5.0.17 6.0.10 ### .NET Framework `Type: Developer Pack` @@ -545,10 +549,10 @@ All other versions are saved but not installed. #### Powershell Modules | Module | Version | | ------------------ | ---------------- | -| AWSPowerShell | 4.1.179 | +| AWSPowerShell | 4.1.184 | | DockerMsftProvider | 1.0.0.8 | | MarkdownPS | 1.9 | -| Microsoft.Graph | 1.12.2 | +| Microsoft.Graph | 1.13.0 | | Pester | 3.4.0<br>5.3.3 | | PowerShellGet | 1.0.0.1<br>2.2.5 | | PSScriptAnalyzer | 1.21.0 | @@ -585,9 +589,10 @@ All other versions are saved but not installed. ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:7501f0b0b539d4a4d2da522e9981fd72bda1fa420cd95e69e1da7f9f8e407219 | 2022-09-13 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:18d9698bb0b80472d8993fc1fbd08e102982934ba80b19eef4a869537b83251d | 2022-09-13 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:9d1fde4186c74ad261923c583ddb6102e940cbb3929ce1d1bc0d245e745d61a3 | 2022-09-13 | -| mcr.microsoft.com/windows/nanoserver:1809 | sha256:92455b285ba046b1aecfd9ab598023c31bbea59149fcb7c02e4427abcbf44d37 | 2022-09-09 | -| mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:7450aeee8739b486e1493c44014e9c211cea8391aae7ec25416584b8f4301938 | 2022-09-09 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:10facc49b131429645c11904b21194d19ff284a85d8b43db2d6935ef1b12d402 | 2022-10-11 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:8b2eca1a2e745d84a20a135f00afc55075c58041b5a14a2a039a3b40ab841356 | 2022-10-11 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:ab5334a93a6c7d669666ee1988f8054ef7ba068df536ec8e81eda01247b6038d | 2022-10-11 | +| mcr.microsoft.com/windows/nanoserver:1809 | sha256:95dc925380113306e1aee00aa406d82949061d8ad97f5e96b54ec61df40fb0bb | 2022-10-08 | +| mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:d365ab93a48e9b6fcf2d7db6474fbe78c5e725a2768b3ec1388600a078bd3177 | 2022-10-08 | + From 842c43d5579126f98d07956e74fca65578eab0f2 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Wed, 19 Oct 2022 20:27:55 +0200 Subject: [PATCH 1529/3485] [Windows] Install git from gh (#6427) * Install Git from GitHub * get installer file name --- images/win/scripts/Installers/Install-Git.ps1 | 25 ++++++++++++++++--- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/images/win/scripts/Installers/Install-Git.ps1 b/images/win/scripts/Installers/Install-Git.ps1 index 4bc561e0cac6..eac134129c33 100644 --- a/images/win/scripts/Installers/Install-Git.ps1 +++ b/images/win/scripts/Installers/Install-Git.ps1 @@ -4,15 +4,32 @@ ################################################################################ Import-Module "$env:ChocolateyInstall\helpers\chocolateyProfile.psm1" -# Install git -Choco-Install -PackageName git -ArgumentList '--installargs="/VERYSILENT /NORESTART /NOCANCEL /SP- /CLOSEAPPLICATIONS /RESTARTAPPLICATIONS /o:PathOption=CmdTools /o:BashTerminalOption=ConHost /o:EnableSymlinks=Enabled /COMPONENTS=gitlfs"' +# Install the latest version of Git for Windows +$gitReleases = Invoke-RestMethod "https://api.github.com/repos/git-for-windows/git/releases/latest" +[string]$downloadUrl = $gitReleases.assets.browser_download_url -match "Git-.+-64-bit.exe" + +$installerFile = Split-Path $downloadUrl -Leaf +Install-Binary -Url $downloadUrl ` + -Name $installerFile ` + -ArgumentList ( + "/VERYSILENT", ` + "/NORESTART", ` + "/NOCANCEL", ` + "/SP-", ` + "/CLOSEAPPLICATIONS", ` + "/RESTARTAPPLICATIONS", ` + "/o:PathOption=CmdTools", ` + "/o:BashTerminalOption=ConHost", ` + "/o:EnableSymlinks=Enabled", ` + "/COMPONENTS=gitlfs") Update-SessionEnvironment git config --system --add safe.directory "*" -# Install hub -Choco-Install -PackageName hub +# Install hub with --ignore-dependencies option to prevent the installation of the git package. +# See details in https://github.com/actions/runner-images/issues/2375 +Choco-Install -PackageName hub -ArgumentList "--ignore-dependencies" # Disable GCM machine-wide [Environment]::SetEnvironmentVariable("GCM_INTERACTIVE", "Never", [System.EnvironmentVariableTarget]::Machine) From d477a7178fafbf8607274012333690adb3de406b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 20 Oct 2022 13:36:33 +0000 Subject: [PATCH 1530/3485] Updating readme file for ubuntu22 version 20221018.2 (#6428) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2204-Readme.md | 137 ++++++++++++++++-------------- 1 file changed, 71 insertions(+), 66 deletions(-) diff --git a/images/linux/Ubuntu2204-Readme.md b/images/linux/Ubuntu2204-Readme.md index 3202746bec37..a266dec7f788 100644 --- a/images/linux/Ubuntu2204-Readme.md +++ b/images/linux/Ubuntu2204-Readme.md @@ -1,12 +1,14 @@ | Announcements | |-| +| [Ubuntu-latest workflows will use Ubuntu-22.04](https://github.com/actions/runner-images/issues/6399) | +| [[all OSs] The VCPKG_ROOT variable will be removed from runner images](https://github.com/actions/runner-images/issues/6376) | | [Third party PHP repository will be removed from the Ubuntu 22.04 image](https://github.com/actions/runner-images/issues/6331) | -| [[Ubuntu] homebrew will be removed from $PATH ](https://github.com/actions/runner-images/issues/6283) | +| [[Ubuntu] homebrew will be removed from PATH variable](https://github.com/actions/runner-images/issues/6283) | | [The Ubuntu 18.04 Actions runner image will begin deprecation on 8/8/22 and will be fully unsupported by 4/1/2023](https://github.com/actions/runner-images/issues/6002) | *** # Ubuntu 22.04.1 LTS -- Linux kernel version: 5.15.0-1020-azure -- Image Version: 20221002.2 +- Linux kernel version: 5.15.0-1022-azure +- Image Version: 20221018.2 ## Installed Software ### Language and Runtime @@ -21,24 +23,25 @@ - Kotlin 1.7.20-release-201 - Mono 6.12.0.182 (apt source repository: https://download.mono-project.com/repo/ubuntu stable-focal main) - MSBuild 16.10.1.31701 (from /usr/lib/mono/msbuild/15.0/bin/MSBuild.dll) -- Node 16.17.1 +- Node 16.18.0 - Perl 5.34.0 - Python 3.10.6 - Python3 3.10.6 - Ruby 3.0.2p107 +- Swift 5.7 ### Package Management - cpan 1.64 -- Helm 3.10.0 -- Homebrew 3.6.3 +- Helm 3.10.1 +- Homebrew 3.6.6 - Miniconda 4.12.0 -- Npm 8.15.0 -- NuGet 6.2.1.2 +- Npm 8.19.2 +- NuGet 6.3.1.1 - Pip 22.0.2 - Pip3 22.0.2 - Pipx 1.1.0 - RubyGems 3.3.5 -- Vcpkg (build from master \<5f1441730>) +- Vcpkg (build from master \<ce99c947b>) - Yarn 1.22.19 ##### Notes: @@ -57,69 +60,69 @@ to accomplish this. | VCPKG_ROOT | /usr/local/share/vcpkg | ### Project Management -- Lerna 5.5.4 +- Lerna 6.0.1 ### Tools -- Ansible 2.13.4 +- Ansible 2.13.5 - apt-fast 1.9.12 -- AzCopy 10.16.0 (available by `azcopy` and `azcopy10` aliases) +- AzCopy 10.16.1 (available by `azcopy` and `azcopy10` aliases) - Bazel 5.3.1 - Bazelisk 1.13.2 -- Bicep 0.10.61 +- Bicep 0.11.1 - Buildah 1.23.1 - CMake 3.24.2 -- CodeQL Action Bundle 2.11.0 +- CodeQL Action Bundle 2.11.1 - Docker Amazon ECR Credential Helper 0.6.0 - Docker Compose v1 1.29.2 - Docker Compose v2 2.11.2+azure-1 - Docker-Buildx 0.9.1 -- Docker-Moby Client 20.10.18+azure-1 -- Docker-Moby Server 20.10.18+azure-1 +- Docker-Moby Client 20.10.18+azure-2 +- Docker-Moby Server 20.10.18+azure-2 - Fastlane 2.210.1 -- Git 2.37.3 (apt source repository: ppa:git-core/ppa) +- Git 2.38.1 (apt source repository: ppa:git-core/ppa) - Git LFS 3.2.0 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.6.0 - Haveged 1.9.14 -- Heroku 7.63.4 +- Heroku 7.65.0 - jq 1.6 - Kind 0.16.0 -- Kubectl 1.25.2 +- Kubectl 1.25.3 - Kustomize 4.5.7 - Leiningen 2.9.10 - MediaInfo 21.09 - Mercurial 6.1.1 -- Minikube 1.27.0 +- Minikube 1.27.1 - n 9.0.0 - Newman 5.3.2 -- nvm 0.39.1 +- nvm 0.39.2 - OpenSSL 3.0.2-0ubuntu1.6 - Packer 1.8.3 - Parcel 2.7.0 - Podman 3.4.4 -- Pulumi 3.40.2 +- Pulumi 3.43.1 - R 4.2.1 - Skopeo 1.4.1 - Sphinx Open Source Search Server 2.2.11 - SVN 1.14.1 -- Terraform 1.3.1 +- Terraform 1.3.2 - yamllint 1.28.0 -- yq 4.27.5 +- yq 4.28.2 - zstd 1.5.2 (homebrew) ### CLI Tools -- Alibaba Cloud CLI 3.0.127 -- AWS CLI 2.8.0 -- AWS CLI Session manager plugin 1.2.339.0 -- AWS SAM CLI 1.58.0 -- Azure CLI (azure-cli) 2.40.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) +- Alibaba Cloud CLI 3.0.132 +- AWS CLI 2.8.3 +- AWS CLI Session manager plugin 1.2.398.0 +- AWS SAM CLI 1.60.0 +- Azure CLI (azure-cli) 2.41.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.25.0 -- GitHub CLI 2.16.1 -- Google Cloud SDK 404.0.0 (apt source repository: https://packages.cloud.google.com/apt) +- GitHub CLI 2.18.0 +- Google Cloud SDK 406.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 12.0.2 -- OpenShift CLI 4.11.6 -- ORAS CLI 0.15.0 -- Vercel CLI 28.4.5 +- Netlify CLI 12.0.11 +- OpenShift CLI 4.11.9 +- ORAS CLI 0.15.1 +- Vercel CLI 28.4.12 ### Java | Version | Vendor | Environment Variable | @@ -137,7 +140,7 @@ to accomplish this. | Tool | Version | | -------- | ------- | | PHP | 8.1.11 | -| Composer | 2.4.2 | +| Composer | 2.4.3 | | PHPUnit | 8.5.30 | ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. @@ -155,19 +158,19 @@ to accomplish this. - Rustup 1.25.1 #### Packages -- Bindgen 0.60.1 -- Cargo audit 0.17.0 +- Bindgen 0.61.0 +- Cargo audit 0.17.2 - Cargo clippy 0.1.64 - Cargo outdated 0.11.1 - Cbindgen 0.24.3 - Rustfmt 1.5.1 ### Browsers and Drivers -- Google Chrome 106.0.5249.91 +- Google Chrome 106.0.5249.119 - ChromeDriver 106.0.5249.61 - Chromium 106.0.5235.0 -- Microsoft Edge 105.0.1343.53 (apt source repository: https://packages.microsoft.com/repos/edge) -- Microsoft Edge WebDriver 105.0.1343.53 +- Microsoft Edge 106.0.1370.47 (apt source repository: https://packages.microsoft.com/repos/edge) +- Microsoft Edge WebDriver 106.0.1370.47 - Selenium server 4.5.0 #### Environment variables @@ -179,7 +182,7 @@ to accomplish this. | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | ### .NET Core SDK -- 6.0.401 +- 6.0.402 ### .NET tools - nbgv 3.5.113+a908c6d9d2 @@ -208,8 +211,8 @@ to accomplish this. ### Cached Tools #### Go - 1.17.13 -- 1.18.6 -- 1.19.1 +- 1.18.7 +- 1.19.2 #### Node.js - 14.20.1 @@ -221,10 +224,10 @@ to accomplish this. - 3.9.12 [PyPy 7.3.9] #### Python -- 3.7.14 +- 3.7.15 - 3.8.14 -- 3.9.14 -- 3.10.7 +- 3.9.15 +- 3.10.8 #### Ruby - 3.1.2 @@ -233,8 +236,8 @@ to accomplish this. | Name | Value | Architecture | | --------------- | ----------------------------------- | ------------ | | GOROOT_1_17_X64 | /opt/hostedtoolcache/go/1.17.13/x64 | x64 | -| GOROOT_1_18_X64 | /opt/hostedtoolcache/go/1.18.6/x64 | x64 | -| GOROOT_1_19_X64 | /opt/hostedtoolcache/go/1.19.1/x64 | x64 | +| GOROOT_1_18_X64 | /opt/hostedtoolcache/go/1.18.7/x64 | x64 | +| GOROOT_1_19_X64 | /opt/hostedtoolcache/go/1.19.2/x64 | x64 | ### PowerShell Tools - PowerShell 7.2.6 @@ -243,7 +246,7 @@ to accomplish this. | Module | Version | | ---------------- | ------- | | MarkdownPS | 1.9 | -| Microsoft.Graph | 1.12.2 | +| Microsoft.Graph | 1.13.0 | | Pester | 5.3.3 | | PSScriptAnalyzer | 1.21.0 | @@ -260,7 +263,7 @@ to accomplish this. | Package Name | Version | | -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------ | | Android Command Line Tools | 7.0 | -| Android Emulator | 31.3.11 | +| Android Emulator | 31.3.12 | | Android SDK Build-tools | 33.0.0<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | | Android SDK Platform-Tools | 33.0.3 | | Android SDK Platforms | android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | @@ -287,18 +290,19 @@ to accomplish this. | ----------------------- | ------------------------------------------------------------------------ | ---------- | | alpine:3.14 | sha256:1ab24b3b99320975cca71716a7475a65d263d0b6b604d9d14ce08f7a3f67595c | 2022-08-09 | | alpine:3.15 | sha256:69463fdff1f025c908939e86d4714b4d5518776954ca627cbeff4c74bcea5b22 | 2022-08-09 | -| buildpack-deps:bullseye | sha256:19683807e2587d777766573697f9488b0c88677ee06313e69197fbaa42e80319 | 2022-09-13 | -| buildpack-deps:buster | sha256:caa4ae706b59e2ca4b7786a44a08617447f81b516507a70a4ca43665b479c4e3 | 2022-09-13 | -| debian:10 | sha256:2f35b84014a5389e2a940113c51586bc067a05040ba181dee92c5a9fa9b15dcb | 2022-09-13 | -| debian:11 | sha256:3e82b1af33607aebaeb3641b75d6e80fd28d36e17993ef13708e9493e30e8ff9 | 2022-09-13 | -| moby/buildkit:latest | sha256:67c9251f9f2e103e1ee489b6cead518b6d82607ef485d3f1505fc4095a55ebeb | 2022-08-22 | -| node:14 | sha256:500c729bf9b75de8aee647d70b68dc16eb14991d74bbf033c5ffdb667bbef704 | 2022-09-26 | -| node:14-alpine | sha256:0a37794193aa27ba8af16a2da0998a3e0c551fcc4ebec2ce95b1615032daf820 | 2022-09-26 | -| node:16 | sha256:5968f50bda8ea8bdc65fd4208de287bbb25ca3ba81649494b1b6cf4b9203695e | 2022-09-26 | -| node:16-alpine | sha256:88d9d8da697877a4a771a40e5cbc10a12c2ad959e82f3b0f36ef35635e17f693 | 2022-09-26 | -| ubuntu:18.04 | sha256:6fec50623d6d37b7f3c14c5b6fc36c73fd04aa8173d59d54dba00da0e7ac50ee | 2022-09-06 | -| ubuntu:20.04 | sha256:35ab2bf57814e9ff49e365efd5a5935b6915eede5c7f8581e9e1b85e0eecbe16 | 2022-09-01 | -| ubuntu:22.04 | sha256:20fa2d7bb4de7723f542be5923b06c4d704370f0390e4ae9e1c833c8785644c1 | 2022-09-01 | +| alpine:3.16 | sha256:bc41182d7ef5ffc53a40b044e725193bc10142a1243f395ee852a8d9730fc2ad | 2022-08-09 | +| buildpack-deps:bullseye | sha256:b501b75e9014f6bd3b4cc08e098653ba0b2863b7242f49134f974ebabdf2eb37 | 2022-10-05 | +| buildpack-deps:buster | sha256:c6f69876293b14c190e89e612826844f4a6f2cd9500d5a26523979b16daa5220 | 2022-10-05 | +| debian:10 | sha256:604db908f7ce93379b1289c0c7ba73b252002087a3fa64fe904b430083ba5f69 | 2022-10-04 | +| debian:11 | sha256:e538a2f0566efc44db21503277c7312a142f4d0dedc5d2886932b92626104bff | 2022-10-04 | +| moby/buildkit:latest | sha256:46e7907bf9cdced1af7e45f1f07f69cb30560574d85d636a17ce6f97cc4844b4 | 2022-10-18 | +| node:14 | sha256:d0634e5cde35cb312571cd007ae2270295bf2000ec489402325953bcee196ae2 | 2022-10-05 | +| node:14-alpine | sha256:50808db1777e35ca156d06cfd31fa377febe82df6f26b8413a47c12dcbf5e6c5 | 2022-10-06 | +| node:16 | sha256:6d592fdb89fccdeb880d14f30bf139b8a755f33b376f025b70e50ac5547c8ccf | 2022-10-13 | +| node:16-alpine | sha256:2175727cef5cad4020cb77c8c101d56ed41d44fbe9b1157c54f820e3d345eab1 | 2022-10-13 | +| ubuntu:18.04 | sha256:40b84b75884ff39e4cac4bf62cb9678227b1fbf9dbe3f67ef2a6b073aa4bb529 | 2022-10-04 | +| ubuntu:20.04 | sha256:9c2004872a3a9fcec8cc757ad65c042de1dad4da27de4c70739a6e36402213e3 | 2022-10-04 | +| ubuntu:22.04 | sha256:35fb073f9e56eb84041b0745cb714eff0f7b225ea9e024f703cab56aaa5c7720 | 2022-10-04 | ### Installed apt packages | Name | Version | @@ -328,7 +332,7 @@ to accomplish this. | iproute2 | 5.15.0-1ubuntu2 | | iputils-ping | 3:20211215-1 | | jq | 1.6-2.1ubuntu3 | -| lib32z1 | 1:1.2.11.dfsg-2ubuntu9.1 | +| lib32z1 | 1:1.2.11.dfsg-2ubuntu9.2 | | libc++-dev | 1:14.0-55\~exp2 | | libc++abi-dev | 1:14.0-55\~exp2 | | libcurl4 | 7.81.0-1ubuntu1.4 | @@ -369,14 +373,15 @@ to accomplish this. | ssh | 1:8.9p1-3 | | sshpass | 1.09-1 | | subversion | 1.14.1-3ubuntu0.22.04.1 | -| sudo | 1.9.9-1ubuntu2 | +| sudo | 1.9.9-1ubuntu2.1 | | swig | 4.0.2-1ubuntu1 | +| tar | 1.34+dfsg-1build3 | | telnet | 0.17-44build1 | | texinfo | 6.8-4build1 | | time | 1.9-0.1build2 | | tk | 8.6.11+1build2 | | tzdata | 2022c-0ubuntu0.22.04.0 | -| unzip | 6.0-26ubuntu3 | +| unzip | 6.0-26ubuntu3.1 | | upx | 3.96-3 | | wget | 1.21.2-2ubuntu1 | | xorriso | 1.5.4-2 | From a2c9029e3ff83869a560b98596156397cb397a96 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 20 Oct 2022 13:43:06 +0000 Subject: [PATCH 1531/3485] Updating readme file for ubuntu18 version 20221018.2 (#6434) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu1804-Readme.md | 125 +++++++++++++++--------------- 1 file changed, 64 insertions(+), 61 deletions(-) diff --git a/images/linux/Ubuntu1804-Readme.md b/images/linux/Ubuntu1804-Readme.md index 74802d8eb808..c7e71e33222e 100644 --- a/images/linux/Ubuntu1804-Readme.md +++ b/images/linux/Ubuntu1804-Readme.md @@ -1,12 +1,14 @@ | Announcements | |-| +| [Ubuntu-latest workflows will use Ubuntu-22.04](https://github.com/actions/runner-images/issues/6399) | +| [[all OSs] The VCPKG_ROOT variable will be removed from runner images](https://github.com/actions/runner-images/issues/6376) | | [Third party PHP repository will be removed from the Ubuntu 22.04 image](https://github.com/actions/runner-images/issues/6331) | -| [[Ubuntu] homebrew will be removed from ](https://github.com/actions/runner-images/issues/6283) | +| [[Ubuntu] homebrew will be removed from PATH variable](https://github.com/actions/runner-images/issues/6283) | | [The Ubuntu 18.04 Actions runner image will begin deprecation on 8/8/22 and will be fully unsupported by 4/1/2023](https://github.com/actions/runner-images/issues/6002) | *** # Ubuntu 18.04.6 LTS -- Linux kernel version: 5.4.0-1091-azure -- Image Version: 20221003.1 +- Linux kernel version: 5.4.0-1094-azure +- Image Version: 20221018.2 ## Installed Software ### Language and Runtime @@ -16,14 +18,14 @@ - Clang-tidy 9.0.0 - Dash 0.5.8-2.10 - Erlang 25.0.4 (Eshell 13.0.4) -- Erlang rebar3 3.19.0 +- Erlang rebar3 3.20.0 - GNU C++ 7.5.0, 9.4.0, 10.3.0 - GNU Fortran 7.5.0, 9.4.0, 10.3.0 - Julia 1.8.2 - Kotlin 1.7.20-release-201 - Mono 6.12.0.182 (apt source repository: https://download.mono-project.com/repo/ubuntu stable-bionic main) - MSBuild 16.10.1.31701 (from /usr/lib/mono/msbuild/15.0/bin/MSBuild.dll) -- Node 16.17.1 +- Node 16.18.0 - Perl 5.26.1 - Python 2.7.17 - Python3 3.6.9 @@ -32,16 +34,16 @@ ### Package Management - cpan 1.64 -- Helm 3.10.0 -- Homebrew 3.6.4 +- Helm 3.10.1 +- Homebrew 3.6.6 - Miniconda 4.12.0 -- Npm 8.15.0 -- NuGet 6.2.1.2 +- Npm 8.19.2 +- NuGet 6.3.1.1 - Pip 9.0.1 - Pip3 9.0.1 - Pipx 1.0.0 - RubyGems 2.7.6 -- Vcpkg (build from master \<779ce74ef>) +- Vcpkg (build from master \<ce99c947b>) - Yarn 1.22.19 ##### Notes: @@ -68,65 +70,65 @@ to accomplish this. ### Tools - Ansible 2.11.12 - apt-fast 1.9.12 -- AzCopy 10.16.0 (available by `azcopy` and `azcopy10` aliases) +- AzCopy 10.16.1 (available by `azcopy` and `azcopy10` aliases) - Bazel 5.3.1 - Bazelisk 1.13.2 -- Bicep 0.10.61 +- Bicep 0.11.1 - Buildah 1.22.3 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - CMake 3.24.2 -- CodeQL Action Bundle 2.11.0 +- CodeQL Action Bundle 2.11.1 - Docker Amazon ECR Credential Helper 0.6.0 - Docker Compose v1 1.29.2 - Docker Compose v2 2.11.2+azure-1 - Docker-Buildx 0.9.1 -- Docker-Moby Client 20.10.18+azure-1 -- Docker-Moby Server 20.10.18+azure-1 -- Git 2.38.0 (apt source repository: ppa:git-core/ppa) +- Docker-Moby Client 20.10.18+azure-2 +- Docker-Moby Server 20.10.18+azure-2 +- Git 2.38.1 (apt source repository: ppa:git-core/ppa) - Git LFS 3.2.0 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.3.1 - Haveged 1.9.1 -- Heroku 7.63.4 +- Heroku 7.65.0 - HHVM (HipHop VM) 4.164.0 - jq 1.5 - Kind 0.16.0 -- Kubectl 1.25.2 +- Kubectl 1.25.3 - Kustomize 4.5.7 - Leiningen 2.9.10 - MediaInfo 17.12 - Mercurial 4.5.3 -- Minikube 1.27.0 +- Minikube 1.27.1 - n 9.0.0 - Newman 5.3.2 -- nvm 0.39.1 +- nvm 0.39.2 - OpenSSL 1.1.1-1ubuntu2.1~18.04.20 - Packer 1.8.3 - Parcel 2.7.0 - PhantomJS 2.1.1 - Podman 3.4.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- Pulumi 3.40.2 +- Pulumi 3.43.1 - R 4.2.1 - Skopeo 1.5.0 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 - SVN 1.9.7 -- Terraform 1.3.1 +- Terraform 1.3.2 - yamllint 1.28.0 -- yq 4.27.5 +- yq 4.28.2 - zstd 1.5.2 (homebrew) ### CLI Tools -- Alibaba Cloud CLI 3.0.127 -- AWS CLI 2.8.0 -- AWS CLI Session manager plugin 1.2.339.0 -- AWS SAM CLI 1.58.0 -- Azure CLI (azure-cli) 2.40.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) +- Alibaba Cloud CLI 3.0.132 +- AWS CLI 2.8.3 +- AWS CLI Session manager plugin 1.2.398.0 +- AWS SAM CLI 1.60.0 +- Azure CLI (azure-cli) 2.41.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.25.0 -- GitHub CLI 2.16.1 -- Google Cloud SDK 404.0.0 (apt source repository: https://packages.cloud.google.com/apt) +- GitHub CLI 2.18.0 +- Google Cloud SDK 406.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 12.0.4 -- OpenShift CLI 4.11.7 -- ORAS CLI 0.15.0 -- Vercel CLI 28.4.6 +- Netlify CLI 12.0.11 +- OpenShift CLI 4.11.9 +- ORAS CLI 0.15.1 +- Vercel CLI 28.4.12 ### Java | Version | Vendor | Environment Variable | @@ -140,7 +142,7 @@ to accomplish this. | Tool | Version | | -------- | ---------------------------------- | | PHP | 7.2.34 7.3.33 7.4.32 8.0.24 8.1.11 | -| Composer | 2.4.2 | +| Composer | 2.4.3 | | PHPUnit | 8.5.30 | ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. @@ -158,22 +160,22 @@ to accomplish this. - Rustup 1.25.1 #### Packages -- Bindgen 0.60.1 -- Cargo audit 0.17.0 +- Bindgen 0.61.0 +- Cargo audit 0.17.2 - Cargo clippy 0.1.64 - Cargo outdated 0.11.1 - Cbindgen 0.24.3 - Rustfmt 1.5.1 ### Browsers and Drivers -- Google Chrome 106.0.5249.91 +- Google Chrome 106.0.5249.119 - ChromeDriver 106.0.5249.61 - Chromium 106.0.5235.0 -- Microsoft Edge 106.0.1370.34 (apt source repository: https://packages.microsoft.com/repos/edge) -- Microsoft Edge WebDriver 106.0.1370.30 +- Microsoft Edge 106.0.1370.47 (apt source repository: https://packages.microsoft.com/repos/edge) +- Microsoft Edge WebDriver 106.0.1370.47 - Selenium server 4.5.0 - Mozilla Firefox 105.0 -- Geckodriver 0.31.0 +- Geckodriver 0.32.0 #### Environment variables | Name | Value | @@ -184,7 +186,7 @@ to accomplish this. | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | ### .NET Core SDK -- 3.1.120 3.1.202 3.1.302 3.1.423 5.0.104 5.0.214 5.0.303 5.0.408 6.0.401 +- 3.1.120 3.1.202 3.1.302 3.1.424 5.0.104 5.0.214 5.0.303 5.0.408 6.0.402 ### .NET tools - nbgv 3.5.113+a908c6d9d2 @@ -215,7 +217,7 @@ to accomplish this. #### Go - 1.16.15 - 1.17.13 -- 1.18.6 +- 1.18.7 #### Node.js - 12.22.12 @@ -230,10 +232,10 @@ to accomplish this. #### Python - 2.7.18 - 3.6.15 -- 3.7.14 +- 3.7.15 - 3.8.14 -- 3.9.14 -- 3.10.7 +- 3.9.15 +- 3.10.8 #### Ruby - 2.4.10 @@ -248,7 +250,7 @@ to accomplish this. | --------------- | ----------------------------------- | ------------ | | GOROOT_1_16_X64 | /opt/hostedtoolcache/go/1.16.15/x64 | x64 | | GOROOT_1_17_X64 | /opt/hostedtoolcache/go/1.17.13/x64 | x64 | -| GOROOT_1_18_X64 | /opt/hostedtoolcache/go/1.18.6/x64 | x64 | +| GOROOT_1_18_X64 | /opt/hostedtoolcache/go/1.18.7/x64 | x64 | ### PowerShell Tools - PowerShell 7.2.6 @@ -257,7 +259,7 @@ to accomplish this. | Module | Version | | --------------- | ------- | | MarkdownPS | 1.9 | -| Microsoft.Graph | 1.12.2 | +| Microsoft.Graph | 1.13.0 | | Pester | 5.3.3 | #### Az PowerShell Modules @@ -273,7 +275,7 @@ to accomplish this. | Package Name | Version | | -------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 7.0 | -| Android Emulator | 31.3.11 | +| Android Emulator | 31.3.12 | | Android SDK Build-tools | 33.0.0<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3<br>26.0.0 26.0.1 26.0.2 26.0.3<br>25.0.0 25.0.1 25.0.2 25.0.3<br>24.0.0 24.0.1 24.0.2 24.0.3<br>23.0.1 23.0.2 23.0.3 | | Android SDK Platform-Tools | 33.0.3 | | Android SDK Platforms | android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3)<br>android-26 (rev 2)<br>android-25 (rev 3)<br>android-24 (rev 2)<br>android-23 (rev 3) | @@ -302,22 +304,22 @@ to accomplish this. | alpine:3.12 | sha256:c75ac27b49326926b803b9ed43bf088bc220d22556de1bc5f72d742c91398f69 | 2022-04-05 | | alpine:3.13 | sha256:100448e45467d4f3838fc8d95faab2965e22711b6edf67bbd8ec9c07f612b553 | 2022-08-09 | | alpine:3.14 | sha256:1ab24b3b99320975cca71716a7475a65d263d0b6b604d9d14ce08f7a3f67595c | 2022-08-09 | -| buildpack-deps:bullseye | sha256:19683807e2587d777766573697f9488b0c88677ee06313e69197fbaa42e80319 | 2022-09-13 | -| buildpack-deps:buster | sha256:caa4ae706b59e2ca4b7786a44a08617447f81b516507a70a4ca43665b479c4e3 | 2022-09-13 | +| buildpack-deps:bullseye | sha256:b501b75e9014f6bd3b4cc08e098653ba0b2863b7242f49134f974ebabdf2eb37 | 2022-10-05 | +| buildpack-deps:buster | sha256:c6f69876293b14c190e89e612826844f4a6f2cd9500d5a26523979b16daa5220 | 2022-10-05 | | buildpack-deps:stretch | sha256:78e995165a5788c2f55aed6e548d8f6c1534830d4310c870408fccb2da8c5b2e | 2022-06-23 | -| debian:10 | sha256:2f35b84014a5389e2a940113c51586bc067a05040ba181dee92c5a9fa9b15dcb | 2022-09-13 | -| debian:11 | sha256:3e82b1af33607aebaeb3641b75d6e80fd28d36e17993ef13708e9493e30e8ff9 | 2022-09-13 | +| debian:10 | sha256:604db908f7ce93379b1289c0c7ba73b252002087a3fa64fe904b430083ba5f69 | 2022-10-04 | +| debian:11 | sha256:e538a2f0566efc44db21503277c7312a142f4d0dedc5d2886932b92626104bff | 2022-10-04 | | debian:9 | sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be | 2022-06-23 | -| moby/buildkit:latest | sha256:67c9251f9f2e103e1ee489b6cead518b6d82607ef485d3f1505fc4095a55ebeb | 2022-08-22 | +| moby/buildkit:latest | sha256:46e7907bf9cdced1af7e45f1f07f69cb30560574d85d636a17ce6f97cc4844b4 | 2022-10-18 | | node:12 | sha256:01627afeb110b3054ba4a1405541ca095c8bfca1cb6f2be9479c767a2711879e | 2022-04-20 | | node:12-alpine | sha256:d4b15b3d48f42059a15bd659be60afe21762aae9d6cbea6f124440895c27db68 | 2022-04-11 | -| node:14 | sha256:500c729bf9b75de8aee647d70b68dc16eb14991d74bbf033c5ffdb667bbef704 | 2022-09-26 | -| node:14-alpine | sha256:0a37794193aa27ba8af16a2da0998a3e0c551fcc4ebec2ce95b1615032daf820 | 2022-09-26 | -| node:16 | sha256:5968f50bda8ea8bdc65fd4208de287bbb25ca3ba81649494b1b6cf4b9203695e | 2022-09-26 | -| node:16-alpine | sha256:88d9d8da697877a4a771a40e5cbc10a12c2ad959e82f3b0f36ef35635e17f693 | 2022-09-26 | +| node:14 | sha256:d0634e5cde35cb312571cd007ae2270295bf2000ec489402325953bcee196ae2 | 2022-10-05 | +| node:14-alpine | sha256:50808db1777e35ca156d06cfd31fa377febe82df6f26b8413a47c12dcbf5e6c5 | 2022-10-06 | +| node:16 | sha256:6d592fdb89fccdeb880d14f30bf139b8a755f33b376f025b70e50ac5547c8ccf | 2022-10-13 | +| node:16-alpine | sha256:2175727cef5cad4020cb77c8c101d56ed41d44fbe9b1157c54f820e3d345eab1 | 2022-10-13 | | ubuntu:16.04 | sha256:91bd29a464fdabfcf44e29e1f2a5f213c6dfa750b6290e40dd6998ac79da3c41 | 2021-08-31 | -| ubuntu:18.04 | sha256:6fec50623d6d37b7f3c14c5b6fc36c73fd04aa8173d59d54dba00da0e7ac50ee | 2022-09-06 | -| ubuntu:20.04 | sha256:35ab2bf57814e9ff49e365efd5a5935b6915eede5c7f8581e9e1b85e0eecbe16 | 2022-09-01 | +| ubuntu:18.04 | sha256:40b84b75884ff39e4cac4bf62cb9678227b1fbf9dbe3f67ef2a6b073aa4bb529 | 2022-10-04 | +| ubuntu:20.04 | sha256:9c2004872a3a9fcec8cc757ad65c042de1dad4da27de4c70739a6e36402213e3 | 2022-10-04 | ### Installed apt packages | Name | Version | @@ -387,12 +389,13 @@ to accomplish this. | subversion | 1.9.7-4ubuntu1.1 | | sudo | 1.8.21p2-3ubuntu1.4 | | swig | 3.0.12-1 | +| tar | 1.29b-2ubuntu0.3 | | telnet | 0.17-41 | | texinfo | 6.5.0.dfsg.1-2 | | time | 1.7-25.1build1 | | tk | 8.6.0+9 | | tzdata | 2022c-0ubuntu0.18.04.0 | -| unzip | 6.0-21ubuntu1.1 | +| unzip | 6.0-21ubuntu1.2 | | upx | 3.94-4 | | wget | 1.19.4-1ubuntu2.2 | | xorriso | 1.4.8-3 | From 5250470d17c0f77956c35d27bfebbac933553e54 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 20 Oct 2022 13:55:01 +0000 Subject: [PATCH 1532/3485] Updating readme file for ubuntu20 version 20221018.2 (#6433) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2004-Readme.md | 143 +++++++++++++++--------------- 1 file changed, 73 insertions(+), 70 deletions(-) diff --git a/images/linux/Ubuntu2004-Readme.md b/images/linux/Ubuntu2004-Readme.md index 9092aa4fd746..a427518b7dfd 100644 --- a/images/linux/Ubuntu2004-Readme.md +++ b/images/linux/Ubuntu2004-Readme.md @@ -1,12 +1,14 @@ | Announcements | |-| +| [Ubuntu-latest workflows will use Ubuntu-22.04](https://github.com/actions/runner-images/issues/6399) | +| [[all OSs] The VCPKG_ROOT variable will be removed from runner images](https://github.com/actions/runner-images/issues/6376) | | [Third party PHP repository will be removed from the Ubuntu 22.04 image](https://github.com/actions/runner-images/issues/6331) | -| [[Ubuntu] homebrew will be removed from $PATH](https://github.com/actions/runner-images/issues/6283) | +| [[Ubuntu] homebrew will be removed from PATH variable](https://github.com/actions/runner-images/issues/6283) | | [The Ubuntu 18.04 Actions runner image will begin deprecation on 8/8/22 and will be fully unsupported by 4/1/2023](https://github.com/actions/runner-images/issues/6002) | *** # Ubuntu 20.04.5 LTS -- Linux kernel version: 5.15.0-1020-azure -- Image Version: 20221002.2 +- Linux kernel version: 5.15.0-1022-azure +- Image Version: 20221018.2 ## Installed Software ### Language and Runtime @@ -16,14 +18,14 @@ - Clang-tidy 10.0.0, 11.0.0, 12.0.0 - Dash 0.5.10.2-6 - Erlang 25.0.4 (Eshell 13.0.4) -- Erlang rebar3 3.19.0 +- Erlang rebar3 3.20.0 - GNU C++ 9.4.0, 10.3.0 - GNU Fortran 9.4.0, 10.3.0 - Julia 1.8.2 - Kotlin 1.7.20-release-201 - Mono 6.12.0.182 (apt source repository: https://download.mono-project.com/repo/ubuntu stable-focal main) - MSBuild 16.10.1.31701 (from /usr/lib/mono/msbuild/15.0/bin/MSBuild.dll) -- Node 16.17.1 +- Node 16.18.0 - Perl 5.30.0 - Python 3.8.10 - Python3 3.8.10 @@ -32,16 +34,16 @@ ### Package Management - cpan 1.64 -- Helm 3.10.0 -- Homebrew 3.6.3 +- Helm 3.10.1 +- Homebrew 3.6.6 - Miniconda 4.12.0 -- Npm 8.15.0 -- NuGet 6.2.1.2 +- Npm 8.19.2 +- NuGet 6.3.1.1 - Pip 20.0.2 - Pip3 20.0.2 - Pipx 1.1.0 - RubyGems 3.1.2 -- Vcpkg (build from master \<5f1441730>) +- Vcpkg (build from master \<ce99c947b>) - Yarn 1.22.19 ##### Notes: @@ -62,73 +64,73 @@ to accomplish this. ### Project Management - Ant 1.10.7 - Gradle 7.5.1 -- Lerna 5.5.4 +- Lerna 6.0.1 - Maven 3.8.6 -- Sbt 1.7.1 +- Sbt 1.7.2 ### Tools -- Ansible 2.13.4 +- Ansible 2.13.5 - apt-fast 1.9.12 -- AzCopy 10.16.0 (available by `azcopy` and `azcopy10` aliases) +- AzCopy 10.16.1 (available by `azcopy` and `azcopy10` aliases) - Bazel 5.3.1 - Bazelisk 1.13.2 -- Bicep 0.10.61 +- Bicep 0.11.1 - Buildah 1.22.3 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - CMake 3.24.2 -- CodeQL Action Bundle 2.11.0 +- CodeQL Action Bundle 2.11.1 - Docker Amazon ECR Credential Helper 0.6.0 - Docker Compose v1 1.29.2 - Docker Compose v2 2.11.2+azure-1 - Docker-Buildx 0.9.1 -- Docker-Moby Client 20.10.18+azure-1 -- Docker-Moby Server 20.10.18+azure-1 +- Docker-Moby Client 20.10.18+azure-2 +- Docker-Moby Server 20.10.18+azure-2 - Fastlane 2.210.1 -- Git 2.37.3 (apt source repository: ppa:git-core/ppa) +- Git 2.38.1 (apt source repository: ppa:git-core/ppa) - Git LFS 3.2.0 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.6.0 - Haveged 1.9.1 -- Heroku 7.63.4 -- HHVM (HipHop VM) 4.169.0 +- Heroku 7.65.0 +- HHVM (HipHop VM) 4.170.0 - jq 1.6 - Kind 0.16.0 -- Kubectl 1.25.2 +- Kubectl 1.25.3 - Kustomize 4.5.7 - Leiningen 2.9.10 - MediaInfo 19.09 - Mercurial 5.3.1 -- Minikube 1.27.0 +- Minikube 1.27.1 - n 9.0.0 - Newman 5.3.2 -- nvm 0.39.1 +- nvm 0.39.2 - OpenSSL 1.1.1f-1ubuntu2.16 - Packer 1.8.3 - Parcel 2.7.0 - PhantomJS 2.1.1 - Podman 3.4.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- Pulumi 3.40.2 +- Pulumi 3.43.1 - R 4.2.1 - Skopeo 1.5.0 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 -- Terraform 1.3.1 +- Terraform 1.3.2 - yamllint 1.28.0 -- yq 4.27.5 +- yq 4.28.2 - zstd 1.5.2 (homebrew) ### CLI Tools -- Alibaba Cloud CLI 3.0.127 -- AWS CLI 2.8.0 -- AWS CLI Session manager plugin 1.2.339.0 -- AWS SAM CLI 1.58.0 -- Azure CLI (azure-cli) 2.40.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) +- Alibaba Cloud CLI 3.0.132 +- AWS CLI 2.8.3 +- AWS CLI Session manager plugin 1.2.398.0 +- AWS SAM CLI 1.60.0 +- Azure CLI (azure-cli) 2.41.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.25.0 -- GitHub CLI 2.16.1 -- Google Cloud SDK 404.0.0 (apt source repository: https://packages.cloud.google.com/apt) +- GitHub CLI 2.18.0 +- Google Cloud SDK 406.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 12.0.2 -- OpenShift CLI 4.11.6 -- ORAS CLI 0.15.0 -- Vercel CLI 28.4.5 +- Netlify CLI 12.0.11 +- OpenShift CLI 4.11.9 +- ORAS CLI 0.15.1 +- Vercel CLI 28.4.12 ### Java | Version | Vendor | Environment Variable | @@ -146,7 +148,7 @@ to accomplish this. | Tool | Version | | -------- | -------------------- | | PHP | 7.4.32 8.0.24 8.1.11 | -| Composer | 2.4.2 | +| Composer | 2.4.3 | | PHPUnit | 8.5.30 | ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. @@ -164,22 +166,22 @@ to accomplish this. - Rustup 1.25.1 #### Packages -- Bindgen 0.60.1 -- Cargo audit 0.17.0 +- Bindgen 0.61.0 +- Cargo audit 0.17.2 - Cargo clippy 0.1.64 - Cargo outdated 0.11.1 - Cbindgen 0.24.3 - Rustfmt 1.5.1 ### Browsers and Drivers -- Google Chrome 106.0.5249.91 +- Google Chrome 106.0.5249.119 - ChromeDriver 106.0.5249.61 - Chromium 106.0.5235.0 -- Microsoft Edge 105.0.1343.53 (apt source repository: https://packages.microsoft.com/repos/edge) -- Microsoft Edge WebDriver 105.0.1343.53 +- Microsoft Edge 106.0.1370.47 (apt source repository: https://packages.microsoft.com/repos/edge) +- Microsoft Edge WebDriver 106.0.1370.47 - Selenium server 4.5.0 - Mozilla Firefox 105.0 -- Geckodriver 0.31.0 +- Geckodriver 0.32.0 #### Environment variables | Name | Value | @@ -190,7 +192,7 @@ to accomplish this. | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | ### .NET Core SDK -- 3.1.120 3.1.202 3.1.302 3.1.423 5.0.104 5.0.214 5.0.303 5.0.408 6.0.401 +- 3.1.120 3.1.202 3.1.302 3.1.424 5.0.104 5.0.214 5.0.303 5.0.408 6.0.402 ### .NET tools - nbgv 3.5.113+a908c6d9d2 @@ -220,8 +222,8 @@ to accomplish this. ### Cached Tools #### Go - 1.17.13 -- 1.18.6 -- 1.19.1 +- 1.18.7 +- 1.19.2 #### Node.js - 12.22.12 @@ -238,10 +240,10 @@ to accomplish this. #### Python - 2.7.18 - 3.6.15 -- 3.7.14 +- 3.7.15 - 3.8.14 -- 3.9.14 -- 3.10.7 +- 3.9.15 +- 3.10.8 #### Ruby - 2.5.9 @@ -254,8 +256,8 @@ to accomplish this. | Name | Value | Architecture | | --------------- | ----------------------------------- | ------------ | | GOROOT_1_17_X64 | /opt/hostedtoolcache/go/1.17.13/x64 | x64 | -| GOROOT_1_18_X64 | /opt/hostedtoolcache/go/1.18.6/x64 | x64 | -| GOROOT_1_19_X64 | /opt/hostedtoolcache/go/1.19.1/x64 | x64 | +| GOROOT_1_18_X64 | /opt/hostedtoolcache/go/1.18.7/x64 | x64 | +| GOROOT_1_19_X64 | /opt/hostedtoolcache/go/1.19.2/x64 | x64 | ### PowerShell Tools - PowerShell 7.2.6 @@ -264,7 +266,7 @@ to accomplish this. | Module | Version | | ---------------- | ------- | | MarkdownPS | 1.9 | -| Microsoft.Graph | 1.12.2 | +| Microsoft.Graph | 1.13.0 | | Pester | 5.3.3 | | PSScriptAnalyzer | 1.21.0 | @@ -282,7 +284,7 @@ to accomplish this. | Package Name | Version | | -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------ | | Android Command Line Tools | 7.0 | -| Android Emulator | 31.3.11 | +| Android Emulator | 31.3.12 | | Android SDK Build-tools | 33.0.0<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | | Android SDK Platform-Tools | 33.0.3 | | Android SDK Platforms | android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | @@ -307,25 +309,25 @@ to accomplish this. ### Cached Docker images | Repository:Tag | Digest | Created | | ----------------------- | ------------------------------------------------------------------------ | ---------- | -| alpine:3.12 | sha256:c75ac27b49326926b803b9ed43bf088bc220d22556de1bc5f72d742c91398f69 | 2022-04-05 | -| alpine:3.13 | sha256:100448e45467d4f3838fc8d95faab2965e22711b6edf67bbd8ec9c07f612b553 | 2022-08-09 | | alpine:3.14 | sha256:1ab24b3b99320975cca71716a7475a65d263d0b6b604d9d14ce08f7a3f67595c | 2022-08-09 | -| buildpack-deps:bullseye | sha256:19683807e2587d777766573697f9488b0c88677ee06313e69197fbaa42e80319 | 2022-09-13 | -| buildpack-deps:buster | sha256:caa4ae706b59e2ca4b7786a44a08617447f81b516507a70a4ca43665b479c4e3 | 2022-09-13 | +| alpine:3.15 | sha256:69463fdff1f025c908939e86d4714b4d5518776954ca627cbeff4c74bcea5b22 | 2022-08-09 | +| alpine:3.16 | sha256:bc41182d7ef5ffc53a40b044e725193bc10142a1243f395ee852a8d9730fc2ad | 2022-08-09 | +| buildpack-deps:bullseye | sha256:b501b75e9014f6bd3b4cc08e098653ba0b2863b7242f49134f974ebabdf2eb37 | 2022-10-05 | +| buildpack-deps:buster | sha256:c6f69876293b14c190e89e612826844f4a6f2cd9500d5a26523979b16daa5220 | 2022-10-05 | | buildpack-deps:stretch | sha256:78e995165a5788c2f55aed6e548d8f6c1534830d4310c870408fccb2da8c5b2e | 2022-06-23 | -| debian:10 | sha256:2f35b84014a5389e2a940113c51586bc067a05040ba181dee92c5a9fa9b15dcb | 2022-09-13 | -| debian:11 | sha256:3e82b1af33607aebaeb3641b75d6e80fd28d36e17993ef13708e9493e30e8ff9 | 2022-09-13 | +| debian:10 | sha256:604db908f7ce93379b1289c0c7ba73b252002087a3fa64fe904b430083ba5f69 | 2022-10-04 | +| debian:11 | sha256:e538a2f0566efc44db21503277c7312a142f4d0dedc5d2886932b92626104bff | 2022-10-04 | | debian:9 | sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be | 2022-06-23 | -| moby/buildkit:latest | sha256:67c9251f9f2e103e1ee489b6cead518b6d82607ef485d3f1505fc4095a55ebeb | 2022-08-22 | +| moby/buildkit:latest | sha256:46e7907bf9cdced1af7e45f1f07f69cb30560574d85d636a17ce6f97cc4844b4 | 2022-10-18 | | node:12 | sha256:01627afeb110b3054ba4a1405541ca095c8bfca1cb6f2be9479c767a2711879e | 2022-04-20 | | node:12-alpine | sha256:d4b15b3d48f42059a15bd659be60afe21762aae9d6cbea6f124440895c27db68 | 2022-04-11 | -| node:14 | sha256:500c729bf9b75de8aee647d70b68dc16eb14991d74bbf033c5ffdb667bbef704 | 2022-09-26 | -| node:14-alpine | sha256:0a37794193aa27ba8af16a2da0998a3e0c551fcc4ebec2ce95b1615032daf820 | 2022-09-26 | -| node:16 | sha256:5968f50bda8ea8bdc65fd4208de287bbb25ca3ba81649494b1b6cf4b9203695e | 2022-09-26 | -| node:16-alpine | sha256:88d9d8da697877a4a771a40e5cbc10a12c2ad959e82f3b0f36ef35635e17f693 | 2022-09-26 | +| node:14 | sha256:d0634e5cde35cb312571cd007ae2270295bf2000ec489402325953bcee196ae2 | 2022-10-05 | +| node:14-alpine | sha256:50808db1777e35ca156d06cfd31fa377febe82df6f26b8413a47c12dcbf5e6c5 | 2022-10-06 | +| node:16 | sha256:6d592fdb89fccdeb880d14f30bf139b8a755f33b376f025b70e50ac5547c8ccf | 2022-10-13 | +| node:16-alpine | sha256:2175727cef5cad4020cb77c8c101d56ed41d44fbe9b1157c54f820e3d345eab1 | 2022-10-13 | | ubuntu:16.04 | sha256:91bd29a464fdabfcf44e29e1f2a5f213c6dfa750b6290e40dd6998ac79da3c41 | 2021-08-31 | -| ubuntu:18.04 | sha256:6fec50623d6d37b7f3c14c5b6fc36c73fd04aa8173d59d54dba00da0e7ac50ee | 2022-09-06 | -| ubuntu:20.04 | sha256:35ab2bf57814e9ff49e365efd5a5935b6915eede5c7f8581e9e1b85e0eecbe16 | 2022-09-01 | +| ubuntu:18.04 | sha256:40b84b75884ff39e4cac4bf62cb9678227b1fbf9dbe3f67ef2a6b073aa4bb529 | 2022-10-04 | +| ubuntu:20.04 | sha256:9c2004872a3a9fcec8cc757ad65c042de1dad4da27de4c70739a6e36402213e3 | 2022-10-04 | ### Installed apt packages | Name | Version | @@ -355,7 +357,7 @@ to accomplish this. | iproute2 | 5.5.0-1ubuntu1 | | iputils-ping | 3:20190709-3 | | jq | 1.6-1ubuntu0.20.04.1 | -| lib32z1 | 1:1.2.11.dfsg-2ubuntu1.3 | +| lib32z1 | 1:1.2.11.dfsg-2ubuntu1.5 | | libc++-dev | 1:10.0-50\~exp1 | | libc++abi-dev | 1:10.0-50\~exp1 | | libcurl4 | 7.68.0-1ubuntu2.13 | @@ -397,12 +399,13 @@ to accomplish this. | subversion | 1.13.0-3ubuntu0.2 | | sudo | 1.8.31-1ubuntu1.2 | | swig | 4.0.1-5build1 | +| tar | 1.30+dfsg-7ubuntu0.20.04.2 | | telnet | 0.17-41.2build1 | | texinfo | 6.7.0.dfsg.2-5 | | time | 1.7-25.1build1 | | tk | 8.6.9+1 | | tzdata | 2022c-0ubuntu0.20.04.0 | -| unzip | 6.0-25ubuntu1 | +| unzip | 6.0-25ubuntu1.1 | | upx | 3.95-2build1 | | wget | 1.20.3-1ubuntu2 | | xorriso | 1.5.2-1 | From 145f9dff8f8a60a99a59ad3137383bd1fb7bea67 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Thu, 20 Oct 2022 17:07:04 +0200 Subject: [PATCH 1533/3485] [macOS] Software Updates 2022 Week 43 (#6437) --- images/macos/toolsets/toolset-10.15.json | 2 +- images/macos/toolsets/toolset-11.json | 2 +- images/macos/toolsets/toolset-12.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index da9f30401e84..197050b4c404 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -23,7 +23,7 @@ "versions": [ "2019" ] }, "mono-versions": [ - "6.12.0.182", "6.10.0.106", "6.8.0.123", "6.6.0.166", "6.4.0.208" + "6.12.0.188", "6.10.0.106", "6.8.0.123", "6.6.0.166", "6.4.0.208" ], "ios-versions": [ "14.14.2.5", "14.10.0.4", "14.8.0.3", "14.6.0.15", "14.4.1.3", "14.2.0.12", "14.0.0.0", "13.20.2.2", "13.18.2.1", "13.16.0.13", "13.14.1.39", "13.10.0.21", "13.8.3.0", "13.6.0.12", "13.4.0.2", "13.2.0.47" diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index 0b6e2f9fcd9b..022b2806612d 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -16,7 +16,7 @@ "versions": [ "2019", "2022" ] }, "mono-versions": [ - "6.12.0.182" + "6.12.0.188" ], "ios-versions": [ "15.8.0.3", "15.6.0.3", "15.4.0.0", "15.2.0.17", "15.0.0.6", "14.20.0.24", "14.16.0.5", "14.14.2.5", "14.10.0.4", "14.8.0.3", "14.6.0.15", "14.4.1.3", "14.2.0.12", "14.0.0.0", "13.20.2.2" diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index 85edcdcbc244..2d0440f3b0e2 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -18,7 +18,7 @@ "versions": [ "2019", "2022" ] }, "mono-versions": [ - "6.12.0.182" + "6.12.0.188" ], "ios-versions": [ "16.0.0.72", "15.12.0.2", "15.10.0.5", "15.8.0.3", "15.6.0.3", "15.4.0.0", "15.2.0.17", "15.0.0.6" From 7d055b7a28ce9f6449da8e70a310f03b38287b31 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 20 Oct 2022 18:40:10 +0000 Subject: [PATCH 1534/3485] Updating readme file for macOS-11 version 20221018.1 (#6440) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-11-Readme.md | 68 ++++++++++++++++----------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/images/macos/macos-11-Readme.md b/images/macos/macos-11-Readme.md index c6c10b7a5944..ffe139710c4a 100644 --- a/images/macos/macos-11-Readme.md +++ b/images/macos/macos-11-Readme.md @@ -7,11 +7,11 @@ # macOS 11.7 info - System Version: macOS 11.7 (20G817) - Kernel Version: Darwin 20.6.0 -- Image Version: 20221010.1 +- Image Version: 20221018.1 ## Installed Software ### Language and Runtime -- .NET SDK 3.1.101 3.1.201 3.1.302 3.1.423 5.0.102 5.0.202 5.0.302 5.0.408 6.0.401 +- .NET SDK 3.1.101 3.1.201 3.1.302 3.1.424 5.0.102 5.0.202 5.0.302 5.0.408 6.0.402 - Bash 3.2.57(1)-release - Clang/LLVM 13.0.0 is default - Clang/LLVM 14.0.6 is available on `'$(brew --prefix llvm@14)/bin/clang'` @@ -25,30 +25,30 @@ - julia 1.8.2 - Kotlin 1.7.20-release-201 - MSBuild 16.10.1.31401 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) -- Node.js v16.17.1 -- NVM 0.39.1 -- NVM - Cached node versions: v12.22.12 v14.20.1 v16.17.1 +- Node.js v16.18.0 +- NVM 0.39.2 +- NVM - Cached node versions: v12.22.12 v14.20.1 v16.18.0 - Perl 5.36.0 - PHP 8.1.11 - Python 2.7.18 -- Python 3.10.7 +- Python 3.10.8 - R 4.2.1 - Ruby 2.7.6p219 ### Package Management -- Bundler version 2.3.23 +- Bundler version 2.3.24 - Carthage 0.38.0 - CocoaPods 1.11.3 -- Composer 2.4.2 -- Homebrew 3.6.5 +- Composer 2.4.3 +- Homebrew 3.6.6 - Miniconda 4.12.0 -- NPM 8.15.0 +- NPM 8.19.2 - NuGet 6.2.1.2 - Pip 20.3.4 (python 2.7) - Pip 22.2.2 (python 3.10) - Pipx 1.1.0 -- RubyGems 3.3.23 -- Vcpkg 2022 (build from master \<42cc830d8>) +- RubyGems 3.3.24 +- Vcpkg 2022 (build from master \<f4b262b25>) - Yarn 1.22.19 #### Environment variables @@ -72,15 +72,15 @@ - bazelisk 1.14.0 - bsdtar 3.3.2 - available by 'tar' alias - Curl 7.85.0 -- Git 2.38.0 +- Git 2.38.1 - Git LFS: 3.2.0 -- GitHub CLI: 2.17.0 +- GitHub CLI: 2.18.0 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.3 -- gpg (GnuPG) 2.3.7 -- helm v3.10.0+gce66412 +- gpg (GnuPG) 2.3.8 +- helm v3.10.1+g9f88ccb - Hub CLI: 2.14.2 -- ImageMagick 7.1.0-50 +- ImageMagick 7.1.0-51 - jq 1.6 - mongo v5.0.11 - mongod v5.0.11 @@ -96,24 +96,24 @@ - zstd 1.5.2 ### Tools -- Aliyun CLI 3.0.127 +- Aliyun CLI 3.0.131 - App Center CLI 2.11.0 -- AWS CLI 2.8.2 -- AWS SAM CLI 1.59.0 -- AWS Session Manager CLI 1.2.339.0 +- AWS CLI 2.8.3 +- AWS SAM CLI 1.60.0 +- AWS Session Manager CLI 1.2.398.0 - Azure CLI (azure-devops) 0.25.0 -- Azure CLI 2.40.0 +- Azure CLI 2.41.0 - Bicep CLI 0.11.1 - Cabal 3.6.2.0 - Cmake 3.24.2 -- CodeQL Action Bundle 2.11.0 +- CodeQL Action Bundle 2.11.1 - Colima 0.4.6 - Fastlane 2.210.1 - GHC 9.4.2 - GHCup 0.1.18.0 - Jazzy 0.14.3 - Stack 2.9.1 -- SwiftFormat 0.50.1 +- SwiftFormat 0.50.2 - Swig 4.0.2 - Xcode Command Line Tools 13.2.0.0.1.1638488800 @@ -124,12 +124,12 @@ ### Browsers - Safari 16.0 (16614.1.25.9.10) - SafariDriver 16.0 (16614.1.25.9.10) -- Google Chrome 106.0.5249.103 +- Google Chrome 106.0.5249.119 - ChromeDriver 106.0.5249.61 -- Microsoft Edge 106.0.1370.37 -- Microsoft Edge WebDriver 106.0.1370.42 +- Microsoft Edge 106.0.1370.47 +- Microsoft Edge WebDriver 106.0.1370.47 - Mozilla Firefox 105.0.3 -- geckodriver 0.31.0 +- geckodriver 0.32.0 - Selenium server 4.5.0 #### Environment variables @@ -161,10 +161,10 @@ - 3.1.2 #### Python -- 3.7.14 +- 3.7.15 - 3.8.14 - 3.9.14 -- 3.10.7 +- 3.10.8 #### PyPy - 2.7.18 [PyPy 7.3.9] @@ -191,7 +191,7 @@ - Rustup 1.25.1 #### Packages -- Bindgen 0.60.1 +- Bindgen 0.61.0 - Cargo-audit 0.17.2 - Cargo-outdated 0.11.1 - Cbindgen 0.24.3 @@ -204,7 +204,7 @@ #### PowerShell Modules | Module | Version | | ---------------- | ------- | -| Az | 8.3.0 | +| Az | 9.0.1 | | MarkdownPS | 1.9 | | Pester | 5.3.3 | | PSScriptAnalyzer | 1.21.0 | @@ -220,7 +220,7 @@ | Version | Build | Path | | -------------- | --------- | ------------------------------------ | | 2019 | 8.10.25.2 | /Applications/Visual Studio 2019.app | -| 2022 (default) | 17.3.6.20 | /Applications/Visual Studio.app | +| 2022 (default) | 17.3.8.5 | /Applications/Visual Studio.app | ##### Notes: ``` @@ -361,7 +361,7 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" - libXext 1.3.4 - libXft 2.3.6 - Tcl/Tk 8.6.12_1 -- Zlib 1.2.12_1 +- Zlib 1.2.13 From 40eb20a970e9f162af42386188a6d8c2c870ccb1 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 21 Oct 2022 03:13:33 +0000 Subject: [PATCH 1535/3485] Updating readme file for win19 version 20221019.1 (#6438) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2019-Readme.md | 52 ++++++++++++++++---------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index abb07b0e5578..1949ba30612c 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -3,8 +3,8 @@ | [[all OSs] The VCPKG_ROOT variable will be removed from runner images](https://github.com/actions/runner-images/issues/6376) | *** # Microsoft Windows Server 2019 Datacenter -- OS Version: 10.0.17763 Build 3532 -- Image Version: 20221012.3 +- OS Version: 10.0.17763 Build 3534 +- Image Version: 20221019.1 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -24,15 +24,15 @@ ### Package Management - Chocolatey 1.1.0 -- Composer 2.4.2 +- Composer 2.4.3 - Helm 3.10.0 - Miniconda 4.12.0 (pre-installed on the image but not added to PATH) - NPM 8.19.2 - NuGet 6.3.1.1 -- pip 22.2.2 (python 3.7) +- pip 22.3 (python 3.7) - Pipx 1.1.0 - RubyGems 2.7.6.3 -- Vcpkg (build from master \<680071397>) +- Vcpkg (build from master \<94ce0dab5>) - Yarn 1.22.19 #### Environment variables @@ -52,25 +52,25 @@ - 7zip 22.01 - aria2 1.36.0 - azcopy 10.16.1 -- Bazel 5.3.1 +- Bazel 5.3.2 - Bazelisk 1.13.2 -- Bicep 0.10.61 +- Bicep 0.11.1 - Cabal 3.8.1.0 - CMake 3.24.2 -- CodeQL Action Bundle 2.11.0 -- Docker 20.10.18 +- CodeQL Action Bundle 2.11.1 +- Docker 20.10.20 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.11.2 +- Docker Compose v2 2.12.0 - Docker-wincred 0.7.0 - ghc 9.4.2 -- Git 2.37.3.windows.1 +- Git 2.38.1.windows.1 - Git LFS 3.2.0 -- Google Cloud SDK 405.0.0 +- Google Cloud SDK 406.0.0 - ImageMagick 7.1.0-50 - InnoSetup 6.2.1 - jq 1.6 - Kind 0.16.0 -- Kubectl 1.25.2 +- Kubectl 1.25.3 - Mercurial 5.0 - Mingw-w64 8.1.0 - Newman 5.3.2 @@ -78,7 +78,7 @@ - OpenSSL 1.1.1 - Packer 1.8.2 - Parcel 2.7.0 -- Pulumi v3.42.0 +- Pulumi v3.43.1 - R 4.2.1 - Service Fabric SDK 9.0.1028.9590 - Stack 2.9.1 @@ -91,14 +91,14 @@ - zstd 1.5.2 ### CLI Tools -- Alibaba Cloud CLI 3.0.130 -- AWS CLI 2.8.2 -- AWS SAM CLI 1.59.0 -- AWS Session Manager CLI 1.2.339.0 +- Alibaba Cloud CLI 3.0.132 +- AWS CLI 2.8.3 +- AWS SAM CLI 1.60.0 +- AWS Session Manager CLI 1.2.398.0 - Azure CLI 2.41.0 - Azure DevOps CLI extension 0.25.0 - Cloud Foundry CLI 6.53.0 -- GitHub CLI 2.17.0 +- GitHub CLI 2.18.0 - Hub CLI 2.14.2 ### Rust Tools @@ -108,7 +108,7 @@ - Rustup 1.25.1 #### Packages -- bindgen 0.60.1 +- bindgen 0.61.0 - cargo-audit 0.17.2 - cargo-outdated 0.11.1 - cbindgen 0.24.3 @@ -118,10 +118,10 @@ ### Browsers and webdrivers - Google Chrome 106.0.5249.119 - Chrome Driver 106.0.5249.61 -- Microsoft Edge 106.0.1370.42 -- Microsoft Edge Driver 106.0.1370.42 -- Mozilla Firefox 105.0.3 -- Gecko Driver 0.31.0 +- Microsoft Edge 106.0.1370.47 +- Microsoft Edge Driver 106.0.1370.47 +- Mozilla Firefox 106.0 +- Gecko Driver 0.32.0 - IE Driver 3.150.1.1 - Selenium server 4.5.0 @@ -184,7 +184,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | 3.7.9 (Default) | x64, x86 | | 3.8.10 | x64, x86 | | 3.9.13 | x64, x86 | -| 3.10.7 | x64, x86 | +| 3.10.8 | x64, x86 | #### Ruby | Version | Architecture | @@ -549,7 +549,7 @@ All other versions are saved but not installed. #### Powershell Modules | Module | Version | | ------------------ | ---------------- | -| AWSPowerShell | 4.1.184 | +| AWSPowerShell | 4.1.188 | | DockerMsftProvider | 1.0.0.8 | | MarkdownPS | 1.9 | | Microsoft.Graph | 1.13.0 | From 5b24a10e54c71e3462e2ab9c0b70ca337e69211f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 21 Oct 2022 03:15:55 +0000 Subject: [PATCH 1536/3485] Updating readme file for win22 version 20221019.1 (#6436) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2022-Readme.md | 48 ++++++++++++++++---------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/images/win/Windows2022-Readme.md b/images/win/Windows2022-Readme.md index 380101c00c0e..e8ebeed52471 100644 --- a/images/win/Windows2022-Readme.md +++ b/images/win/Windows2022-Readme.md @@ -4,7 +4,7 @@ *** # Microsoft Windows Server 2022 Datacenter - OS Version: 10.0.20348 Build 1129 -- Image Version: 20221012.4 +- Image Version: 20221019.1 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -24,15 +24,15 @@ ### Package Management - Chocolatey 1.1.0 -- Composer 2.4.2 +- Composer 2.4.3 - Helm 3.10.0 - Miniconda 4.12.0 (pre-installed on the image but not added to PATH) - NPM 8.19.2 - NuGet 6.3.1.1 -- pip 22.2.2 (python 3.9) +- pip 22.3 (python 3.9) - Pipx 1.1.0 - RubyGems 3.2.33 -- Vcpkg (build from master \<680071397>) +- Vcpkg (build from master \<79caba3c9>) - Yarn 1.22.19 #### Environment variables @@ -51,31 +51,31 @@ - 7zip 22.01 - aria2 1.36.0 - azcopy 10.16.1 -- Bazel 5.3.1 +- Bazel 5.3.2 - Bazelisk 1.13.2 -- Bicep 0.10.61 +- Bicep 0.11.1 - Cabal 3.8.1.0 - CMake 3.24.2 -- CodeQL Action Bundle 2.11.0 -- Docker 20.10.18 +- CodeQL Action Bundle 2.11.1 +- Docker 20.10.20 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.11.2 +- Docker Compose v2 2.12.0 - Docker-wincred 0.7.0 - ghc 9.4.2 -- Git 2.37.3.windows.1 +- Git 2.38.1.windows.1 - Git LFS 3.2.0 - ImageMagick 7.1.0-50 - InnoSetup 6.2.1 - jq 1.6 - Kind 0.16.0 -- Kubectl 1.25.2 +- Kubectl 1.25.3 - Mercurial 5.0 - Mingw-w64 11.2.0 - Newman 5.3.2 - NSIS v3.08 - OpenSSL 1.1.1 - Packer 1.8.2 -- Pulumi v3.42.0 +- Pulumi v3.43.1 - R 4.2.1 - Service Fabric SDK 9.0.1028.9590 - Stack 2.9.1 @@ -88,13 +88,13 @@ - zstd 1.5.2 ### CLI Tools -- Alibaba Cloud CLI 3.0.130 -- AWS CLI 2.8.2 -- AWS SAM CLI 1.59.0 -- AWS Session Manager CLI 1.2.339.0 +- Alibaba Cloud CLI 3.0.132 +- AWS CLI 2.8.3 +- AWS SAM CLI 1.60.0 +- AWS Session Manager CLI 1.2.398.0 - Azure CLI 2.41.0 - Azure DevOps CLI extension 0.25.0 -- GitHub CLI 2.17.0 +- GitHub CLI 2.18.0 - Hub CLI 2.14.2 ### Rust Tools @@ -104,7 +104,7 @@ - Rustup 1.25.1 #### Packages -- bindgen 0.60.1 +- bindgen 0.61.0 - cargo-audit 0.17.2 - cargo-outdated 0.11.1 - cbindgen 0.24.3 @@ -114,10 +114,10 @@ ### Browsers and webdrivers - Google Chrome 106.0.5249.119 - Chrome Driver 106.0.5249.61 -- Microsoft Edge 106.0.1370.42 -- Microsoft Edge Driver 106.0.1370.42 -- Mozilla Firefox 105.0.3 -- Gecko Driver 0.31.0 +- Microsoft Edge 106.0.1370.47 +- Microsoft Edge Driver 106.0.1370.47 +- Mozilla Firefox 106.0 +- Gecko Driver 0.32.0 - IE Driver 3.150.1.1 - Selenium server 4.5.0 @@ -174,7 +174,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | 3.7.9 | x64, x86 | | 3.8.10 | x64, x86 | | 3.9.13 (Default) | x64, x86 | -| 3.10.7 | x64, x86 | +| 3.10.8 | x64, x86 | #### Ruby | Version | Architecture | @@ -571,7 +571,7 @@ All other versions are saved but not installed. #### Powershell Modules | Module | Version | | ------------------ | ---------------- | -| AWSPowerShell | 4.1.184 | +| AWSPowerShell | 4.1.188 | | DockerMsftProvider | 1.0.0.8 | | MarkdownPS | 1.9 | | Microsoft.Graph | 1.13.0 | From 62ffca0dfd0d66c622436a00201921282087fda2 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Fri, 21 Oct 2022 13:50:47 +0200 Subject: [PATCH 1537/3485] [macOS] Create tcl/tk symlinks (#6443) --- images/macos/provision/core/commonutils.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/macos/provision/core/commonutils.sh b/images/macos/provision/core/commonutils.sh index 1d9dc8092217..84deb1a5427d 100644 --- a/images/macos/provision/core/commonutils.sh +++ b/images/macos/provision/core/commonutils.sh @@ -84,7 +84,7 @@ az extension add -n azure-devops # Workaround https://github.com/actions/runner-images/issues/4931 # by making Tcl/Tk paths the same on macOS 10.15 and macOS 11 -if is_BigSur; then +if is_BigSur || is_Monterey; then version=$(brew info tcl-tk --json | jq -r '.[].installed[].version') ln -s /usr/local/Cellar/tcl-tk/$version/lib/libtcl8.6.dylib /usr/local/lib/libtcl8.6.dylib ln -s /usr/local/Cellar/tcl-tk/$version/lib/libtk8.6.dylib /usr/local/lib/libtk8.6.dylib From 3cff405f9e9651e8b017599b7d15e02c5072d6c9 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 21 Oct 2022 12:44:09 +0000 Subject: [PATCH 1538/3485] Updating readme file for macOS-10.15 version 20221018.1 (#6444) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-10.15-Readme.md | 124 +++++++++++++++-------------- 1 file changed, 63 insertions(+), 61 deletions(-) diff --git a/images/macos/macos-10.15-Readme.md b/images/macos/macos-10.15-Readme.md index 928266159c21..7c32074dc3bd 100644 --- a/images/macos/macos-10.15-Readme.md +++ b/images/macos/macos-10.15-Readme.md @@ -1,16 +1,17 @@ | Announcements | |-| -| [[macOS] Default Xcode on macOS 12 Monterey will be set to Xcode 14.0 on September, 26](https://github.com/actions/runner-images/issues/6225) | +| [macOS-latest workflows will use macOS-12](https://github.com/actions/runner-images/issues/6384) | +| [[all OSs] The VCPKG_ROOT variable will be removed from runner images](https://github.com/actions/runner-images/issues/6376) | | [The macOS 10.15 Actions runner image will begin deprecation on 5/31/22 and will be fully unsupported by 12/1/22 for GitHub and ADO](https://github.com/actions/runner-images/issues/5583) | *** # macOS 10.15 info - System Version: macOS 10.15.7 (19H2026) - Kernel Version: Darwin 19.6.0 -- Image Version: 20220912.1 +- Image Version: 20221018.1 ## Installed Software ### Language and Runtime -- .NET SDK 3.1.101 3.1.201 3.1.302 3.1.422 5.0.102 5.0.202 5.0.302 5.0.408 +- .NET SDK 3.1.101 3.1.201 3.1.302 3.1.424 5.0.102 5.0.202 5.0.302 5.0.408 - Bash 3.2.57(1)-release - Clang/LLVM 12.0.0 is default - Clang/LLVM 14.0.6 is available on `'$(brew --prefix llvm@14)/bin/clang'` @@ -21,33 +22,33 @@ - GNU Fortran (Homebrew GCC 10.4.0) 10.4.0 - available by `gfortran-10` alias - GNU Fortran (Homebrew GCC 11.3.0) 11.3.0 - available by `gfortran-11` alias - Go 1.17.13 -- julia 1.8.1 -- Kotlin 1.7.10-release-333 +- julia 1.8.2 +- Kotlin 1.7.20-release-201 - MSBuild 16.10.1.31401 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) -- Node.js v16.17.0 -- NVM 0.39.1 -- NVM - Cached node versions: v12.22.12 v14.20.0 v16.17.0 -- Perl 5.34.0 -- PHP 8.1.10 +- Node.js v16.18.0 +- NVM 0.39.2 +- NVM - Cached node versions: v12.22.12 v14.20.1 v16.18.0 +- Perl 5.36.0 +- PHP 8.1.11 - Python 2.7.18 -- Python 3.10.6 +- Python 3.10.8 - R 4.2.1 - Ruby 2.7.6p219 ### Package Management -- Bundler version 2.3.22 +- Bundler version 2.3.24 - Carthage 0.38.0 - CocoaPods 1.11.3 -- Composer 2.4.1 -- Homebrew 3.6.1 +- Composer 2.4.3 +- Homebrew 3.6.6 - Miniconda 4.12.0 -- NPM 8.15.0 +- NPM 8.19.2 - NuGet 6.2.1.2 - Pip 20.3.4 (python 2.7) - Pip 22.2.2 (python 3.10) - Pipx 1.1.0 -- RubyGems 3.3.22 -- Vcpkg 2022 (build from master \<23905f6f8>) +- RubyGems 3.3.24 +- Vcpkg 2022 (build from master \<f4b262b25>) - Yarn 1.22.19 #### Environment variables @@ -61,26 +62,26 @@ - Apache Ant(TM) 1.10.12 - Apache Maven 3.8.6 - Gradle 7.5.1 -- Sbt 1.7.1 +- Sbt 1.7.2 ### Utilities - 7-Zip 17.04 - aria2 1.36.0 -- azcopy 10.16.0 -- bazel 5.3.0 +- azcopy 10.16.1 +- bazel 5.3.1 - bazelisk 1.14.0 - bsdtar 3.3.2 - available by 'tar' alias - Curl 7.85.0 -- Git 2.37.3 +- Git 2.38.1 - Git LFS: 3.2.0 -- GitHub CLI: 2.15.0 -- GNU parallel 20220822 +- GitHub CLI: 2.18.0 +- GNU parallel 20220922 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.3 -- gpg (GnuPG) 2.3.7 -- helm v3.9.4+gdbc6d8e +- gpg (GnuPG) 2.3.8 +- helm v3.10.1+g9f88ccb - Hub CLI: 2.14.2 -- ImageMagick 7.1.0-47 +- ImageMagick 7.1.0-51 - jq 1.6 - mongo v5.0.11 - mongod v5.0.11 @@ -92,28 +93,29 @@ - Sox 14.4.2 - Subversion (SVN) 1.14.2 - Switchaudio-osx 1.1.0 -- Vagrant 2.3.0 +- Vagrant 2.3.1 - VirtualBox 6.1.38r153438 -- yq (https://github.com/mikefarah/yq/) version 4.27.5 +- yq (https://github.com/mikefarah/yq/) version 4.28.1 - zstd 1.5.2 ### Tools -- Aliyun CLI 3.0.125 +- Aliyun CLI 3.0.131 - App Center CLI 2.11.0 -- AWS CLI 2.7.31 -- AWS SAM CLI 1.56.1 -- AWS Session Manager CLI 1.2.339.0 +- AWS CLI 2.8.3 +- AWS SAM CLI 1.60.0 +- AWS Session Manager CLI 1.2.398.0 - Azure CLI (azure-devops) 0.25.0 -- Azure CLI 2.40.0 -- Bicep CLI 0.10.13 +- Azure CLI 2.41.0 +- Bicep CLI 0.11.1 - Cabal 3.6.2.0 -- Cmake 3.24.1 -- Fastlane 2.209.1 +- Cmake 3.24.2 +- Colima +- Fastlane 2.210.1 - GHC 9.4.2 - GHCup 0.1.18.0 - Jazzy 0.14.3 -- Stack 2.7.5 -- SwiftFormat 0.49.18 +- Stack 2.9.1 +- SwiftFormat 0.50.2 - Swig 4.0.2 - Xcode Command Line Tools 12.4.0.0.1.1610135815 @@ -124,18 +126,18 @@ ### Browsers - Safari 15.6.1 (15613.3.9.1.16) - SafariDriver 15.6.1 (15613.3.9.1.16) -- Google Chrome 105.0.5195.102 -- ChromeDriver 105.0.5195.52 -- Microsoft Edge 105.0.1343.33 -- Microsoft Edge WebDriver 105.0.1343.34 -- Mozilla Firefox 104.0.2 -- geckodriver 0.31.0 -- Selenium server 4.4.0 +- Google Chrome 106.0.5249.119 +- ChromeDriver 106.0.5249.61 +- Microsoft Edge 106.0.1370.47 +- Microsoft Edge WebDriver 106.0.1370.47 +- Mozilla Firefox 105.0.3 +- geckodriver 0.32.0 +- Selenium server 4.5.0 #### Environment variables | Name | Value | | --------------- | ---------------------------------------------- | -| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/105.0.5195.52 | +| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/106.0.5249.61 | | EDGEWEBDRIVER | /usr/local/share/edge_driver | | GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | @@ -165,10 +167,10 @@ #### Python - 2.7.18 - 3.6.15 -- 3.7.14 +- 3.7.15 - 3.8.14 - 3.9.14 -- 3.10.7 +- 3.10.8 #### PyPy - 2.7.18 [PyPy 7.3.9] @@ -179,28 +181,28 @@ #### Node.js - 12.22.12 -- 14.20.0 -- 16.17.0 +- 14.20.1 +- 16.17.1 #### Go | Version | Architecture | Environment Variable | | ------- | ------------ | -------------------- | | 1.16.15 | x64 | GOROOT_1_16_X64 | | 1.17.13 (Default) | x64 | GOROOT_1_17_X64 | -| 1.18.6 | x64 | GOROOT_1_18_X64 | +| 1.18.7 | x64 | GOROOT_1_18_X64 | ### Rust Tools -- Cargo 1.63.0 -- Rust 1.63.0 -- Rustdoc 1.63.0 +- Cargo 1.64.0 +- Rust 1.64.0 +- Rustdoc 1.64.0 - Rustup 1.25.1 #### Packages -- Bindgen 0.60.1 -- Cargo-audit 0.17.0 +- Bindgen 0.61.0 +- Cargo-audit 0.17.2 - Cargo-outdated 0.11.1 - Cbindgen 0.24.3 -- Clippy 0.1.63 +- Clippy 0.1.64 - Rustfmt 1.5.1-stable ### PowerShell Tools @@ -209,10 +211,10 @@ #### PowerShell Modules | Module | Version | | ---------------- | ------- | -| Az | 8.3.0 | +| Az | 9.0.1 | | MarkdownPS | 1.9 | | Pester | 5.3.3 | -| PSScriptAnalyzer | 1.20.0 | +| PSScriptAnalyzer | 1.21.0 | ### Web Servers | Name | Version | ConfigFile | ServiceStatus | ListenPort | @@ -362,7 +364,7 @@ | Package Name | Version | | -------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 7.0 | -| Android Emulator | 31.3.10 | +| Android Emulator | 31.3.12 | | Android SDK Build-tools | 33.0.0<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3<br>26.0.0 26.0.1 26.0.2 26.0.3<br>25.0.0 25.0.1 25.0.2 25.0.3<br>24.0.0 24.0.1 24.0.2 24.0.3 | | Android SDK Platforms | android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3)<br>android-26 (rev 2)<br>android-25 (rev 3)<br>android-24 (rev 2) | | Android SDK Platform-Tools | 33.0.3 | @@ -389,7 +391,7 @@ - libXext 1.3.4 - libXft 2.3.6 - Tcl/Tk 8.6.12_1 -- Zlib 1.2.12 +- Zlib 1.2.13 From d81fc37201776acc505e8c5e8955115caf0968f3 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <mikhailkoliada@github.com> Date: Fri, 21 Oct 2022 10:02:09 +0200 Subject: [PATCH 1539/3485] [macOS] exclude Colima from Catalina's sw report --- .../macos/software-report/SoftwareReport.Generator.ps1 | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1 index 433b4ec31d76..e58a9199bcf7 100644 --- a/images/macos/software-report/SoftwareReport.Generator.ps1 +++ b/images/macos/software-report/SoftwareReport.Generator.ps1 @@ -182,10 +182,15 @@ $toolsList += @( (Get-GHCVersion), (Get-CabalVersion), (Get-StackVersion), - (Get-SwiftFormatVersion), - (Get-ColimaVersion) + (Get-SwiftFormatVersion) ) +if (-not $os.IsCatalina) { + $toolsList += @( + (Get-ColimaVersion) + ) +} + $markdown += New-MDList -Style Unordered -Lines ($toolsList | Sort-Object) # Linters From c2112cbe4015099e64f0e66c60109e95f1b9f27e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 22 Oct 2022 00:53:01 +0000 Subject: [PATCH 1540/3485] Updating readme file for macOS-12 version 20221018.2 (#6439) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-12-Readme.md | 104 ++++++++++++++++---------------- 1 file changed, 52 insertions(+), 52 deletions(-) diff --git a/images/macos/macos-12-Readme.md b/images/macos/macos-12-Readme.md index f671890e10dc..b3b8593e7e62 100644 --- a/images/macos/macos-12-Readme.md +++ b/images/macos/macos-12-Readme.md @@ -7,11 +7,11 @@ # macOS 12.6 info - System Version: macOS 12.6 (21G115) - Kernel Version: Darwin 21.6.0 -- Image Version: 20221010.1 +- Image Version: 20221018.2 ## Installed Software ### Language and Runtime -- .NET SDK 3.1.101 3.1.201 3.1.302 3.1.423 5.0.102 5.0.202 5.0.302 5.0.408 6.0.401 +- .NET SDK 3.1.101 3.1.201 3.1.302 3.1.424 5.0.102 5.0.202 5.0.302 5.0.408 6.0.402 - Bash 3.2.57(1)-release - Clang/LLVM 14.0.0 is default - Clang/LLVM 14.0.6 is available on `'$(brew --prefix llvm@14)/bin/clang'` @@ -21,30 +21,30 @@ - julia 1.8.2 - Kotlin 1.7.20-release-201 - MSBuild 16.10.1.31401 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) -- Node.js v16.17.1 -- NVM 0.39.1 -- NVM - Cached node versions: v12.22.12 v14.20.1 v16.17.1 +- Node.js v16.18.0 +- NVM 0.39.2 +- NVM - Cached node versions: v12.22.12 v14.20.1 v16.18.0 - Perl 5.36.0 - PHP 8.1.11 - Python 2.7.18 -- Python 3.10.7 +- Python 3.10.8 - R 4.2.1 - Ruby 3.0.4p208 ### Package Management -- Bundler version 2.3.23 +- Bundler version 2.3.24 - Carthage 0.38.0 - CocoaPods 1.11.3 -- Composer 2.4.2 -- Homebrew 3.6.5 +- Composer 2.4.3 +- Homebrew 3.6.6 - Miniconda 4.12.0 -- NPM 8.15.0 +- NPM 8.19.2 - NuGet 6.2.1.2 - Pip 20.3.4 (python 2.7) - Pip 22.2.2 (python 3.10) - Pipx 1.1.0 -- RubyGems 3.3.23 -- Vcpkg 2022 (build from master \<42cc830d8>) +- RubyGems 3.3.24 +- Vcpkg 2022 (build from master \<414cc9528>) - Yarn 1.22.19 #### Environment variables @@ -68,14 +68,14 @@ - bazelisk 1.14.0 - bsdtar 3.5.1 - available by 'tar' alias - Curl 7.85.0 -- Git 2.38.0 +- Git 2.38.1 - Git LFS: 3.2.0 -- GitHub CLI: 2.17.0 +- GitHub CLI: 2.18.0 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.3 -- gpg (GnuPG) 2.3.7 +- gpg (GnuPG) 2.3.8 - Hub CLI: 2.14.2 -- ImageMagick 7.1.0-50 +- ImageMagick 7.1.0-51 - jq 1.6 - mongo v5.0.11 - mongod v5.0.11 @@ -93,22 +93,22 @@ ### Tools - App Center CLI 2.11.0 -- AWS CLI 2.8.2 -- AWS SAM CLI 1.59.0 -- AWS Session Manager CLI 1.2.339.0 +- AWS CLI 2.8.3 +- AWS SAM CLI 1.60.0 +- AWS Session Manager CLI 1.2.398.0 - Azure CLI (azure-devops) 0.25.0 -- Azure CLI 2.40.0 +- Azure CLI 2.41.0 - Bicep CLI 0.11.1 - Cabal 3.6.2.0 - Cmake 3.24.2 -- CodeQL Action Bundle 2.11.0 +- CodeQL Action Bundle 2.11.1 - Colima 0.4.6 - Fastlane 2.210.1 - GHC 9.4.2 - GHCup 0.1.18.0 - Jazzy 0.14.3 - Stack 2.9.1 -- SwiftFormat 0.50.1 +- SwiftFormat 0.50.2 - Swig 4.0.2 - Xcode Command Line Tools 14.0.0.0.1.1661618636 @@ -119,12 +119,12 @@ ### Browsers - Safari 16.0 (17614.1.25.9.10) - SafariDriver 16.0 (17614.1.25.9.10) -- Google Chrome 106.0.5249.103 +- Google Chrome 106.0.5249.119 - ChromeDriver 106.0.5249.61 -- Microsoft Edge 106.0.1370.37 -- Microsoft Edge WebDriver 106.0.1370.42 -- Mozilla Firefox 105.0.3 -- geckodriver 0.31.0 +- Microsoft Edge 106.0.1370.47 +- Microsoft Edge WebDriver 106.0.1370.47 +- Mozilla Firefox 106.0 +- geckodriver 0.32.0 - Selenium server 4.5.0 #### Environment variables @@ -153,10 +153,10 @@ - 3.1.2 #### Python -- 3.7.14 +- 3.7.15 - 3.8.14 - 3.9.14 -- 3.10.7 +- 3.10.8 #### PyPy - 2.7.18 [PyPy 7.3.9] @@ -183,7 +183,7 @@ - Rustup 1.25.1 #### Packages -- Bindgen 0.60.1 +- Bindgen 0.61.0 - Cargo-audit 0.17.2 - Cargo-outdated 0.11.1 - Cbindgen 0.24.3 @@ -196,7 +196,7 @@ #### PowerShell Modules | Module | Version | | ---------------- | ------- | -| Az | 8.3.0 | +| Az | 9.0.1 | | MarkdownPS | 1.9 | | Pester | 5.3.3 | | PSScriptAnalyzer | 1.21.0 | @@ -212,7 +212,7 @@ | Version | Build | Path | | -------------- | --------- | ------------------------------------ | | 2019 | 8.10.25.2 | /Applications/Visual Studio 2019.app | -| 2022 (default) | 17.3.6.20 | /Applications/Visual Studio.app | +| 2022 (default) | 17.3.8.5 | /Applications/Visual Studio.app | ##### Notes: ``` @@ -242,7 +242,7 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" ### Xcode | Version | Build | Path | | ---------------- | -------- | ------------------------------ | -| 14.1 (beta) | 14B5033e | /Applications/Xcode_14.1.app | +| 14.1 | 14B47 | /Applications/Xcode_14.1.app | | 14.0.1 (default) | 14A400 | /Applications/Xcode_14.0.1.app | | 14.0 | 14A309 | /Applications/Xcode_14.0.app | | 13.4.1 | 13F100 | /Applications/Xcode_13.4.1.app | @@ -300,24 +300,24 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" | DriverKit 22.1 | driverkit22.1 | 14.1 | #### Installed Simulators -| OS | Xcode Version | Simulators | -| ----------- | -------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| iOS 15.0 | 13.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | -| iOS 15.2 | 13.2.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | -| iOS 15.4 | 13.3.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPhone SE (3rd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | -| iOS 15.5 | 13.4<br>13.4.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPhone SE (3rd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | -| iOS 16.0 | 14.0<br>14.0.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPhone SE (3rd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | -| iOS 16.1 | 14.1 | iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPhone SE (3rd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | -| tvOS 15.0 | 13.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | -| tvOS 15.2 | 13.2.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | -| tvOS 15.4 | 13.3.1<br>13.4<br>13.4.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | -| tvOS 16.0 | 13.1<br>13.2.1<br>13.3.1<br>13.4<br>13.4.1<br>14.0<br>14.0.1<br>14.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | -| tvOS 16.1 | 13.1<br>13.2.1<br>13.3.1<br>13.4<br>13.4.1<br>14.0<br>14.0.1<br>14.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | -| watchOS 8.0 | 13.1 | Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 45mm<br>Apple Watch Series 7 (41mm) | -| watchOS 8.3 | 13.2.1 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm) | -| watchOS 8.5 | 13.3.1<br>13.4<br>13.4.1 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | -| watchOS 9.0 | 13.1<br>13.2.1<br>13.3.1<br>13.4<br>13.4.1<br>14.0<br>14.0.1<br>14.1 | Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | -| watchOS 9.1 | 13.1<br>13.2.1<br>13.3.1<br>13.4<br>13.4.1<br>14.0<br>14.0.1<br>14.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | +| OS | Xcode Version | Simulators | +| ----------- | -------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| iOS 15.0 | 13.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | +| iOS 15.2 | 13.2.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | +| iOS 15.4 | 13.3.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPhone SE (3rd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | +| iOS 15.5 | 13.4<br>13.4.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPhone SE (3rd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | +| iOS 16.0 | 14.0<br>14.0.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPhone SE (3rd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | +| iOS 16.1 | 14.1 | iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro (9.7-inch) | +| tvOS 15.0 | 13.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | +| tvOS 15.2 | 13.2.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | +| tvOS 15.4 | 13.3.1<br>13.4<br>13.4.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | +| tvOS 16.0 | 13.1<br>13.2.1<br>13.3.1<br>13.4<br>13.4.1<br>14.0<br>14.0.1<br>14.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | +| tvOS 16.1 | 13.1<br>13.2.1<br>13.3.1<br>13.4<br>13.4.1<br>14.0<br>14.0.1<br>14.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p)<br>Apple TV 4K (at 1080p) (2nd generation) | +| watchOS 8.0 | 13.1 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 (45mm) | +| watchOS 8.3 | 13.2.1 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 (45mm) | +| watchOS 8.5 | 13.3.1<br>13.4<br>13.4.1 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | +| watchOS 9.0 | 13.1<br>13.2.1<br>13.3.1<br>13.4<br>13.4.1<br>14.0<br>14.0.1<br>14.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | +| watchOS 9.1 | 13.1<br>13.2.1<br>13.3.1<br>13.4<br>13.4.1<br>14.0<br>14.0.1<br>14.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | ### Android | Package Name | Version | @@ -348,7 +348,7 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" - libXext 1.3.4 - libXft 2.3.6 - Tcl/Tk 8.6.12_1 -- Zlib 1.2.12_1 +- Zlib 1.2.13 #### Environment variables | Name | Value | From 88d253f3834798bd678b8a44cccc513aa3fb713e Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Mon, 24 Oct 2022 11:10:20 +0200 Subject: [PATCH 1541/3485] Revert VCPKG_ROOT variable (#6449) --- .../SoftwareReport/SoftwareReport.Common.psm1 | 4 ---- images/linux/scripts/installers/vcpkg.sh | 17 ++++++++--------- images/macos/provision/core/vcpkg.sh | 17 ++++++++--------- .../software-report/SoftwareReport.Common.psm1 | 4 ---- images/win/scripts/Installers/Install-Vcpkg.ps1 | 1 - .../SoftwareReport/SoftwareReport.Common.psm1 | 4 ---- images/win/scripts/Tests/Tools.Tests.ps1 | 8 ++------ 7 files changed, 18 insertions(+), 37 deletions(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 index 773442105131..b1ffe1f750d8 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 @@ -429,10 +429,6 @@ function Build-PackageManagementEnvironmentTable { @{ "Name" = "VCPKG_INSTALLATION_ROOT" "Value" = $env:VCPKG_INSTALLATION_ROOT - }, - @{ - "Name" = "VCPKG_ROOT" - "Value" = $env:VCPKG_ROOT } ) | ForEach-Object { [PSCustomObject] @{ diff --git a/images/linux/scripts/installers/vcpkg.sh b/images/linux/scripts/installers/vcpkg.sh index 39823e42f850..731de8b1b432 100644 --- a/images/linux/scripts/installers/vcpkg.sh +++ b/images/linux/scripts/installers/vcpkg.sh @@ -4,17 +4,16 @@ ## Desc: Installs vcpkg ################################################################################ -# Set env variables for vcpkg -VCPKG_ROOT=/usr/local/share/vcpkg -echo "VCPKG_INSTALLATION_ROOT=${VCPKG_ROOT}" | tee -a /etc/environment -echo "VCPKG_ROOT=${VCPKG_ROOT}" | tee -a /etc/environment +# Set env variable for vcpkg +VCPKG_INSTALLATION_ROOT=/usr/local/share/vcpkg +echo "VCPKG_INSTALLATION_ROOT=${VCPKG_INSTALLATION_ROOT}" | tee -a /etc/environment # Install vcpkg -git clone https://github.com/Microsoft/vcpkg $VCPKG_ROOT +git clone https://github.com/Microsoft/vcpkg $VCPKG_INSTALLATION_ROOT -$VCPKG_ROOT/bootstrap-vcpkg.sh -$VCPKG_ROOT/vcpkg integrate install -chmod 0777 -R $VCPKG_ROOT -ln -sf $VCPKG_ROOT/vcpkg /usr/local/bin +$VCPKG_INSTALLATION_ROOT/bootstrap-vcpkg.sh +$VCPKG_INSTALLATION_ROOT/vcpkg integrate install +chmod 0777 -R $VCPKG_INSTALLATION_ROOT +ln -sf $VCPKG_INSTALLATION_ROOT/vcpkg /usr/local/bin invoke_tests "Tools" "Vcpkg" \ No newline at end of file diff --git a/images/macos/provision/core/vcpkg.sh b/images/macos/provision/core/vcpkg.sh index 70e3371fa721..a1ac7c254969 100644 --- a/images/macos/provision/core/vcpkg.sh +++ b/images/macos/provision/core/vcpkg.sh @@ -1,16 +1,15 @@ #!/bin/bash -e -o pipefail source ~/utils/utils.sh -# Set env variables for vcpkg -VCPKG_ROOT=/usr/local/share/vcpkg -echo "export VCPKG_INSTALLATION_ROOT=${VCPKG_ROOT}" | tee -a ~/.bashrc -echo "export VCPKG_ROOT=${VCPKG_ROOT}" | tee -a ~/.bashrc +# Set env variable for vcpkg +VCPKG_INSTALLATION_ROOT=/usr/local/share/vcpkg +echo "export VCPKG_INSTALLATION_ROOT=${VCPKG_INSTALLATION_ROOT}" | tee -a ~/.bashrc # Install vcpkg -git clone https://github.com/Microsoft/vcpkg $VCPKG_ROOT -$VCPKG_ROOT/bootstrap-vcpkg.sh -$VCPKG_ROOT/vcpkg integrate install -chmod -R 0777 $VCPKG_ROOT -ln -sf $VCPKG_ROOT/vcpkg /usr/local/bin +git clone https://github.com/Microsoft/vcpkg $VCPKG_INSTALLATION_ROOT +$VCPKG_INSTALLATION_ROOT/bootstrap-vcpkg.sh +$VCPKG_INSTALLATION_ROOT/vcpkg integrate install +chmod -R 0777 $VCPKG_INSTALLATION_ROOT +ln -sf $VCPKG_INSTALLATION_ROOT/vcpkg /usr/local/bin invoke_tests "Common" "vcpkg" diff --git a/images/macos/software-report/SoftwareReport.Common.psm1 b/images/macos/software-report/SoftwareReport.Common.psm1 index 01955e019ec0..b18206f6dd9b 100644 --- a/images/macos/software-report/SoftwareReport.Common.psm1 +++ b/images/macos/software-report/SoftwareReport.Common.psm1 @@ -562,10 +562,6 @@ function Build-PackageManagementEnvironmentTable { @{ "Name" = "VCPKG_INSTALLATION_ROOT" "Value" = $env:VCPKG_INSTALLATION_ROOT - }, - @{ - "Name" = "VCPKG_ROOT" - "Value" = $env:VCPKG_ROOT } ) | ForEach-Object { [PSCustomObject] @{ diff --git a/images/win/scripts/Installers/Install-Vcpkg.ps1 b/images/win/scripts/Installers/Install-Vcpkg.ps1 index a2e440dd105f..76e7d24f577c 100644 --- a/images/win/scripts/Installers/Install-Vcpkg.ps1 +++ b/images/win/scripts/Installers/Install-Vcpkg.ps1 @@ -17,6 +17,5 @@ Invoke-Expression "$InstallDir\$VcpkgExecPath integrate install" Add-MachinePathItem $InstallDir $env:Path = Get-MachinePath setx VCPKG_INSTALLATION_ROOT $InstallDir /M -setx VCPKG_ROOT $InstallDir /M Invoke-PesterTests -TestFile "Tools" -TestName "Vcpkg" diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 index 25aa98471d5e..1c36a9844e19 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 @@ -347,10 +347,6 @@ function Build-PackageManagementEnvironmentTable { @{ "Name" = "VCPKG_INSTALLATION_ROOT" "Value" = $env:VCPKG_INSTALLATION_ROOT - }, - @{ - "Name" = "VCPKG_ROOT" - "Value" = $env:VCPKG_ROOT } ) if (Test-IsWin19) { diff --git a/images/win/scripts/Tests/Tools.Tests.ps1 b/images/win/scripts/Tests/Tools.Tests.ps1 index a05f79249b68..0f4a368460cd 100644 --- a/images/win/scripts/Tests/Tools.Tests.ps1 +++ b/images/win/scripts/Tests/Tools.Tests.ps1 @@ -153,13 +153,9 @@ Describe "Vcpkg" { It "env variable VCPKG_INSTALLATION_ROOT is set" { $env:VCPKG_INSTALLATION_ROOT | Should -Not -BeNullOrEmpty } - - It "env variable VCPKG_ROOT is set" { - $env:VCPKG_ROOT | Should -Not -BeNullOrEmpty - } - It "VCPKG_ROOT directory" { - $env:VCPKG_ROOT | Should -Exist + It "VCPKG_INSTALLATION_ROOT directory" { + $env:VCPKG_INSTALLATION_ROOT | Should -Exist } } From 5e91f0a07d7318805386ec1f5dced81152abfa6a Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Mon, 24 Oct 2022 12:23:14 +0200 Subject: [PATCH 1542/3485] Revert "Revert VCPKG_ROOT variable (#6449)" This reverts commit 88d253f3834798bd678b8a44cccc513aa3fb713e. --- .../SoftwareReport/SoftwareReport.Common.psm1 | 4 ++++ images/linux/scripts/installers/vcpkg.sh | 17 +++++++++-------- images/macos/provision/core/vcpkg.sh | 17 +++++++++-------- .../software-report/SoftwareReport.Common.psm1 | 4 ++++ images/win/scripts/Installers/Install-Vcpkg.ps1 | 1 + .../SoftwareReport/SoftwareReport.Common.psm1 | 4 ++++ images/win/scripts/Tests/Tools.Tests.ps1 | 8 ++++++-- 7 files changed, 37 insertions(+), 18 deletions(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 index b1ffe1f750d8..773442105131 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 @@ -429,6 +429,10 @@ function Build-PackageManagementEnvironmentTable { @{ "Name" = "VCPKG_INSTALLATION_ROOT" "Value" = $env:VCPKG_INSTALLATION_ROOT + }, + @{ + "Name" = "VCPKG_ROOT" + "Value" = $env:VCPKG_ROOT } ) | ForEach-Object { [PSCustomObject] @{ diff --git a/images/linux/scripts/installers/vcpkg.sh b/images/linux/scripts/installers/vcpkg.sh index 731de8b1b432..39823e42f850 100644 --- a/images/linux/scripts/installers/vcpkg.sh +++ b/images/linux/scripts/installers/vcpkg.sh @@ -4,16 +4,17 @@ ## Desc: Installs vcpkg ################################################################################ -# Set env variable for vcpkg -VCPKG_INSTALLATION_ROOT=/usr/local/share/vcpkg -echo "VCPKG_INSTALLATION_ROOT=${VCPKG_INSTALLATION_ROOT}" | tee -a /etc/environment +# Set env variables for vcpkg +VCPKG_ROOT=/usr/local/share/vcpkg +echo "VCPKG_INSTALLATION_ROOT=${VCPKG_ROOT}" | tee -a /etc/environment +echo "VCPKG_ROOT=${VCPKG_ROOT}" | tee -a /etc/environment # Install vcpkg -git clone https://github.com/Microsoft/vcpkg $VCPKG_INSTALLATION_ROOT +git clone https://github.com/Microsoft/vcpkg $VCPKG_ROOT -$VCPKG_INSTALLATION_ROOT/bootstrap-vcpkg.sh -$VCPKG_INSTALLATION_ROOT/vcpkg integrate install -chmod 0777 -R $VCPKG_INSTALLATION_ROOT -ln -sf $VCPKG_INSTALLATION_ROOT/vcpkg /usr/local/bin +$VCPKG_ROOT/bootstrap-vcpkg.sh +$VCPKG_ROOT/vcpkg integrate install +chmod 0777 -R $VCPKG_ROOT +ln -sf $VCPKG_ROOT/vcpkg /usr/local/bin invoke_tests "Tools" "Vcpkg" \ No newline at end of file diff --git a/images/macos/provision/core/vcpkg.sh b/images/macos/provision/core/vcpkg.sh index a1ac7c254969..70e3371fa721 100644 --- a/images/macos/provision/core/vcpkg.sh +++ b/images/macos/provision/core/vcpkg.sh @@ -1,15 +1,16 @@ #!/bin/bash -e -o pipefail source ~/utils/utils.sh -# Set env variable for vcpkg -VCPKG_INSTALLATION_ROOT=/usr/local/share/vcpkg -echo "export VCPKG_INSTALLATION_ROOT=${VCPKG_INSTALLATION_ROOT}" | tee -a ~/.bashrc +# Set env variables for vcpkg +VCPKG_ROOT=/usr/local/share/vcpkg +echo "export VCPKG_INSTALLATION_ROOT=${VCPKG_ROOT}" | tee -a ~/.bashrc +echo "export VCPKG_ROOT=${VCPKG_ROOT}" | tee -a ~/.bashrc # Install vcpkg -git clone https://github.com/Microsoft/vcpkg $VCPKG_INSTALLATION_ROOT -$VCPKG_INSTALLATION_ROOT/bootstrap-vcpkg.sh -$VCPKG_INSTALLATION_ROOT/vcpkg integrate install -chmod -R 0777 $VCPKG_INSTALLATION_ROOT -ln -sf $VCPKG_INSTALLATION_ROOT/vcpkg /usr/local/bin +git clone https://github.com/Microsoft/vcpkg $VCPKG_ROOT +$VCPKG_ROOT/bootstrap-vcpkg.sh +$VCPKG_ROOT/vcpkg integrate install +chmod -R 0777 $VCPKG_ROOT +ln -sf $VCPKG_ROOT/vcpkg /usr/local/bin invoke_tests "Common" "vcpkg" diff --git a/images/macos/software-report/SoftwareReport.Common.psm1 b/images/macos/software-report/SoftwareReport.Common.psm1 index b18206f6dd9b..01955e019ec0 100644 --- a/images/macos/software-report/SoftwareReport.Common.psm1 +++ b/images/macos/software-report/SoftwareReport.Common.psm1 @@ -562,6 +562,10 @@ function Build-PackageManagementEnvironmentTable { @{ "Name" = "VCPKG_INSTALLATION_ROOT" "Value" = $env:VCPKG_INSTALLATION_ROOT + }, + @{ + "Name" = "VCPKG_ROOT" + "Value" = $env:VCPKG_ROOT } ) | ForEach-Object { [PSCustomObject] @{ diff --git a/images/win/scripts/Installers/Install-Vcpkg.ps1 b/images/win/scripts/Installers/Install-Vcpkg.ps1 index 76e7d24f577c..a2e440dd105f 100644 --- a/images/win/scripts/Installers/Install-Vcpkg.ps1 +++ b/images/win/scripts/Installers/Install-Vcpkg.ps1 @@ -17,5 +17,6 @@ Invoke-Expression "$InstallDir\$VcpkgExecPath integrate install" Add-MachinePathItem $InstallDir $env:Path = Get-MachinePath setx VCPKG_INSTALLATION_ROOT $InstallDir /M +setx VCPKG_ROOT $InstallDir /M Invoke-PesterTests -TestFile "Tools" -TestName "Vcpkg" diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 index 1c36a9844e19..25aa98471d5e 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 @@ -347,6 +347,10 @@ function Build-PackageManagementEnvironmentTable { @{ "Name" = "VCPKG_INSTALLATION_ROOT" "Value" = $env:VCPKG_INSTALLATION_ROOT + }, + @{ + "Name" = "VCPKG_ROOT" + "Value" = $env:VCPKG_ROOT } ) if (Test-IsWin19) { diff --git a/images/win/scripts/Tests/Tools.Tests.ps1 b/images/win/scripts/Tests/Tools.Tests.ps1 index 0f4a368460cd..a05f79249b68 100644 --- a/images/win/scripts/Tests/Tools.Tests.ps1 +++ b/images/win/scripts/Tests/Tools.Tests.ps1 @@ -153,9 +153,13 @@ Describe "Vcpkg" { It "env variable VCPKG_INSTALLATION_ROOT is set" { $env:VCPKG_INSTALLATION_ROOT | Should -Not -BeNullOrEmpty } + + It "env variable VCPKG_ROOT is set" { + $env:VCPKG_ROOT | Should -Not -BeNullOrEmpty + } - It "VCPKG_INSTALLATION_ROOT directory" { - $env:VCPKG_INSTALLATION_ROOT | Should -Exist + It "VCPKG_ROOT directory" { + $env:VCPKG_ROOT | Should -Exist } } From b284ec81a5f9eaffdc13b585e8d0ffed7b6d62ea Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <v-aleche@microsoft.com> Date: Wed, 19 Oct 2022 12:29:03 +0200 Subject: [PATCH 1543/3485] Tight 20348.1129.221007 version --- images/win/windows2022.json | 1 + 1 file changed, 1 insertion(+) diff --git a/images/win/windows2022.json b/images/win/windows2022.json index a47d6d36fb6f..122882a14697 100644 --- a/images/win/windows2022.json +++ b/images/win/windows2022.json @@ -59,6 +59,7 @@ "image_publisher": "MicrosoftWindowsServer", "image_offer": "WindowsServer", "image_sku": "2022-Datacenter", + "image_version": "20348.1129.221007", "communicator": "winrm", "winrm_use_ssl": "true", "winrm_insecure": "true", From a9611d8e7f6e00cc014ab6f2973aa16c34c437d0 Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Tue, 25 Oct 2022 09:30:50 +0200 Subject: [PATCH 1544/3485] Revert VCPKG_ROOT variable (#6458) --- .../SoftwareReport/SoftwareReport.Common.psm1 | 4 ---- images/linux/scripts/installers/vcpkg.sh | 17 ++++++++--------- images/macos/provision/core/vcpkg.sh | 17 ++++++++--------- .../software-report/SoftwareReport.Common.psm1 | 4 ---- images/win/scripts/Installers/Install-Vcpkg.ps1 | 1 - .../SoftwareReport/SoftwareReport.Common.psm1 | 4 ---- images/win/scripts/Tests/Tools.Tests.ps1 | 8 ++------ 7 files changed, 18 insertions(+), 37 deletions(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 index 773442105131..b1ffe1f750d8 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 @@ -429,10 +429,6 @@ function Build-PackageManagementEnvironmentTable { @{ "Name" = "VCPKG_INSTALLATION_ROOT" "Value" = $env:VCPKG_INSTALLATION_ROOT - }, - @{ - "Name" = "VCPKG_ROOT" - "Value" = $env:VCPKG_ROOT } ) | ForEach-Object { [PSCustomObject] @{ diff --git a/images/linux/scripts/installers/vcpkg.sh b/images/linux/scripts/installers/vcpkg.sh index 39823e42f850..731de8b1b432 100644 --- a/images/linux/scripts/installers/vcpkg.sh +++ b/images/linux/scripts/installers/vcpkg.sh @@ -4,17 +4,16 @@ ## Desc: Installs vcpkg ################################################################################ -# Set env variables for vcpkg -VCPKG_ROOT=/usr/local/share/vcpkg -echo "VCPKG_INSTALLATION_ROOT=${VCPKG_ROOT}" | tee -a /etc/environment -echo "VCPKG_ROOT=${VCPKG_ROOT}" | tee -a /etc/environment +# Set env variable for vcpkg +VCPKG_INSTALLATION_ROOT=/usr/local/share/vcpkg +echo "VCPKG_INSTALLATION_ROOT=${VCPKG_INSTALLATION_ROOT}" | tee -a /etc/environment # Install vcpkg -git clone https://github.com/Microsoft/vcpkg $VCPKG_ROOT +git clone https://github.com/Microsoft/vcpkg $VCPKG_INSTALLATION_ROOT -$VCPKG_ROOT/bootstrap-vcpkg.sh -$VCPKG_ROOT/vcpkg integrate install -chmod 0777 -R $VCPKG_ROOT -ln -sf $VCPKG_ROOT/vcpkg /usr/local/bin +$VCPKG_INSTALLATION_ROOT/bootstrap-vcpkg.sh +$VCPKG_INSTALLATION_ROOT/vcpkg integrate install +chmod 0777 -R $VCPKG_INSTALLATION_ROOT +ln -sf $VCPKG_INSTALLATION_ROOT/vcpkg /usr/local/bin invoke_tests "Tools" "Vcpkg" \ No newline at end of file diff --git a/images/macos/provision/core/vcpkg.sh b/images/macos/provision/core/vcpkg.sh index 70e3371fa721..a1ac7c254969 100644 --- a/images/macos/provision/core/vcpkg.sh +++ b/images/macos/provision/core/vcpkg.sh @@ -1,16 +1,15 @@ #!/bin/bash -e -o pipefail source ~/utils/utils.sh -# Set env variables for vcpkg -VCPKG_ROOT=/usr/local/share/vcpkg -echo "export VCPKG_INSTALLATION_ROOT=${VCPKG_ROOT}" | tee -a ~/.bashrc -echo "export VCPKG_ROOT=${VCPKG_ROOT}" | tee -a ~/.bashrc +# Set env variable for vcpkg +VCPKG_INSTALLATION_ROOT=/usr/local/share/vcpkg +echo "export VCPKG_INSTALLATION_ROOT=${VCPKG_INSTALLATION_ROOT}" | tee -a ~/.bashrc # Install vcpkg -git clone https://github.com/Microsoft/vcpkg $VCPKG_ROOT -$VCPKG_ROOT/bootstrap-vcpkg.sh -$VCPKG_ROOT/vcpkg integrate install -chmod -R 0777 $VCPKG_ROOT -ln -sf $VCPKG_ROOT/vcpkg /usr/local/bin +git clone https://github.com/Microsoft/vcpkg $VCPKG_INSTALLATION_ROOT +$VCPKG_INSTALLATION_ROOT/bootstrap-vcpkg.sh +$VCPKG_INSTALLATION_ROOT/vcpkg integrate install +chmod -R 0777 $VCPKG_INSTALLATION_ROOT +ln -sf $VCPKG_INSTALLATION_ROOT/vcpkg /usr/local/bin invoke_tests "Common" "vcpkg" diff --git a/images/macos/software-report/SoftwareReport.Common.psm1 b/images/macos/software-report/SoftwareReport.Common.psm1 index 01955e019ec0..b18206f6dd9b 100644 --- a/images/macos/software-report/SoftwareReport.Common.psm1 +++ b/images/macos/software-report/SoftwareReport.Common.psm1 @@ -562,10 +562,6 @@ function Build-PackageManagementEnvironmentTable { @{ "Name" = "VCPKG_INSTALLATION_ROOT" "Value" = $env:VCPKG_INSTALLATION_ROOT - }, - @{ - "Name" = "VCPKG_ROOT" - "Value" = $env:VCPKG_ROOT } ) | ForEach-Object { [PSCustomObject] @{ diff --git a/images/win/scripts/Installers/Install-Vcpkg.ps1 b/images/win/scripts/Installers/Install-Vcpkg.ps1 index a2e440dd105f..76e7d24f577c 100644 --- a/images/win/scripts/Installers/Install-Vcpkg.ps1 +++ b/images/win/scripts/Installers/Install-Vcpkg.ps1 @@ -17,6 +17,5 @@ Invoke-Expression "$InstallDir\$VcpkgExecPath integrate install" Add-MachinePathItem $InstallDir $env:Path = Get-MachinePath setx VCPKG_INSTALLATION_ROOT $InstallDir /M -setx VCPKG_ROOT $InstallDir /M Invoke-PesterTests -TestFile "Tools" -TestName "Vcpkg" diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 index 25aa98471d5e..1c36a9844e19 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 @@ -347,10 +347,6 @@ function Build-PackageManagementEnvironmentTable { @{ "Name" = "VCPKG_INSTALLATION_ROOT" "Value" = $env:VCPKG_INSTALLATION_ROOT - }, - @{ - "Name" = "VCPKG_ROOT" - "Value" = $env:VCPKG_ROOT } ) if (Test-IsWin19) { diff --git a/images/win/scripts/Tests/Tools.Tests.ps1 b/images/win/scripts/Tests/Tools.Tests.ps1 index a05f79249b68..1c899066a7f5 100644 --- a/images/win/scripts/Tests/Tools.Tests.ps1 +++ b/images/win/scripts/Tests/Tools.Tests.ps1 @@ -154,12 +154,8 @@ Describe "Vcpkg" { $env:VCPKG_INSTALLATION_ROOT | Should -Not -BeNullOrEmpty } - It "env variable VCPKG_ROOT is set" { - $env:VCPKG_ROOT | Should -Not -BeNullOrEmpty - } - - It "VCPKG_ROOT directory" { - $env:VCPKG_ROOT | Should -Exist + It "VCPKG_INSTALLATION_ROOT directory" { + $env:VCPKG_INSTALLATION_ROOT | Should -Exist } } From f99bf07949f0f697d7589514a7da1f9978a526d8 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <mikhailkoliada@github.com> Date: Tue, 25 Oct 2022 10:06:29 +0200 Subject: [PATCH 1545/3485] [macOS] fix readme for 10.15 --- images/macos/macos-10.15-Readme.md | 1 - 1 file changed, 1 deletion(-) diff --git a/images/macos/macos-10.15-Readme.md b/images/macos/macos-10.15-Readme.md index 7c32074dc3bd..65c5b435aa45 100644 --- a/images/macos/macos-10.15-Readme.md +++ b/images/macos/macos-10.15-Readme.md @@ -109,7 +109,6 @@ - Bicep CLI 0.11.1 - Cabal 3.6.2.0 - Cmake 3.24.2 -- Colima - Fastlane 2.210.1 - GHC 9.4.2 - GHCup 0.1.18.0 From d7298690934c765b04a36c3cb66796ef17fb06c2 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Tue, 25 Oct 2022 18:50:21 +0200 Subject: [PATCH 1546/3485] [Ubuntu] add python3.11 to toolcache (#6470) --- images/linux/toolsets/toolset-1804.json | 3 ++- images/linux/toolsets/toolset-2004.json | 3 ++- images/linux/toolsets/toolset-2204.json | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index ec42ff09c7b6..86ff1b091efb 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -12,7 +12,8 @@ "3.7.*", "3.8.*", "3.9.*", - "3.10.*" + "3.10.*", + "3.11.*" ] }, { diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index ee5fccacb01b..9e803ba4b0d5 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -12,7 +12,8 @@ "3.7.*", "3.8.*", "3.9.*", - "3.10.*" + "3.10.*", + "3.11.*" ] }, { diff --git a/images/linux/toolsets/toolset-2204.json b/images/linux/toolsets/toolset-2204.json index 51f7deea765c..7253168073b5 100644 --- a/images/linux/toolsets/toolset-2204.json +++ b/images/linux/toolsets/toolset-2204.json @@ -10,7 +10,8 @@ "3.7.*", "3.8.*", "3.9.*", - "3.10.*" + "3.10.*", + "3.11.*" ] }, { From 1250493b2fdfdaf09244c1c87798ec1e65743212 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <mikhailkoliada@github.com> Date: Tue, 25 Oct 2022 12:55:17 +0200 Subject: [PATCH 1547/3485] [Windows] add python3.11 to toolcache --- images/win/toolsets/toolset-2019.json | 6 ++++-- images/win/toolsets/toolset-2022.json | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index 56e6a73ef4d0..d9891b478ecf 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -25,7 +25,8 @@ "3.7.*", "3.8.*", "3.9.*", - "3.10.*" + "3.10.*", + "3.11.*" ], "default": "3.7.*" }, @@ -40,7 +41,8 @@ "3.7.*", "3.8.*", "3.9.*", - "3.10.*" + "3.10.*", + "3.11.*" ] }, { diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index eb0839bcb4ea..b174564bfbbf 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -20,7 +20,8 @@ "3.7.*", "3.8.*", "3.9.*", - "3.10.*" + "3.10.*", + "3.11.*" ], "default": "3.9.*" }, @@ -33,7 +34,8 @@ "3.7.*", "3.8.*", "3.9.*", - "3.10.*" + "3.10.*", + "3.11.*" ] }, { From ab0d910edc25c43ee6b2d71a25444f34f7c1574a Mon Sep 17 00:00:00 2001 From: Austin Vazquez <55906459+austinvazquez@users.noreply.github.com> Date: Wed, 26 Oct 2022 03:17:19 -0500 Subject: [PATCH 1548/3485] Update GitHub actions/checkout package to v3 (#6474) Signed-off-by: Austin Vazquez <macedonv@amazon.com> Signed-off-by: Austin Vazquez <macedonv@amazon.com> --- .github/workflows/create_github_release.yml | 2 +- .github/workflows/create_pull_request.yml | 2 +- .github/workflows/linter.yml | 2 +- .github/workflows/merge_pull_request.yml | 2 +- .github/workflows/update_github_release.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/create_github_release.yml b/.github/workflows/create_github_release.yml index f7ae5fccb054..e49c491a1124 100644 --- a/.github/workflows/create_github_release.yml +++ b/.github/workflows/create_github_release.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Create release for ${{ github.event.client_payload.ReleaseBranchName }} uses: actions/create-release@v1.1.1 diff --git a/.github/workflows/create_pull_request.yml b/.github/workflows/create_pull_request.yml index f7f3e77ccf84..2b1645b26c91 100644 --- a/.github/workflows/create_pull_request.yml +++ b/.github/workflows/create_pull_request.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: fetch-depth: 0 diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml index b2f41f9427d6..4a82f16e8317 100644 --- a/.github/workflows/linter.yml +++ b/.github/workflows/linter.yml @@ -17,7 +17,7 @@ jobs: steps: - name: Checkout Code - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: fetch-depth: 0 diff --git a/.github/workflows/merge_pull_request.yml b/.github/workflows/merge_pull_request.yml index a227aa78ecda..201c23d7cbe4 100644 --- a/.github/workflows/merge_pull_request.yml +++ b/.github/workflows/merge_pull_request.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: fetch-depth: 0 diff --git a/.github/workflows/update_github_release.yml b/.github/workflows/update_github_release.yml index 0ea6d3020a00..440b9aeb4952 100644 --- a/.github/workflows/update_github_release.yml +++ b/.github/workflows/update_github_release.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Update release for ${{ github.event.client_payload.ReleaseBranchName }} uses: actions/github-script@v2 From b7edddf553a8aa3d3ceff8d4f4b70023b4b5f118 Mon Sep 17 00:00:00 2001 From: Alexis Saettler <alexis.saettler@wolterskluwer.com> Date: Wed, 26 Oct 2022 15:53:15 +0200 Subject: [PATCH 1549/3485] [Windows] Check WSL is on path on Windows Server 2022 (#6475) --- images/win/scripts/Tests/WindowsFeatures.Tests.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/win/scripts/Tests/WindowsFeatures.Tests.ps1 b/images/win/scripts/Tests/WindowsFeatures.Tests.ps1 index 14b708f96800..a170e6cd720d 100644 --- a/images/win/scripts/Tests/WindowsFeatures.Tests.ps1 +++ b/images/win/scripts/Tests/WindowsFeatures.Tests.ps1 @@ -10,7 +10,7 @@ Describe "WindowsFeatures" { } } - it "Check WSL is on path" -Skip:(-not (Test-IsWin19)) { + it "Check WSL is on path" { (Get-Command -Name 'wsl') | Should -BeTrue } } From ee7ad8fcb76108a6739a5a237be219b99b8aec27 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Wed, 26 Oct 2022 17:51:52 +0200 Subject: [PATCH 1550/3485] [macOS] add python3.11 to toolcache (#6476) --- images/macos/toolsets/toolset-10.15.json | 3 ++- images/macos/toolsets/toolset-11.json | 3 ++- images/macos/toolsets/toolset-12.json | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index 197050b4c404..1a07506fcd76 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -255,7 +255,8 @@ "3.7.*", "3.8.*", "3.9.*", - "3.10.*" + "3.10.*", + "3.11.*" ] }, { diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index 022b2806612d..ee40b4a7c498 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -249,7 +249,8 @@ "3.7.*", "3.8.*", "3.9.*", - "3.10.*" + "3.10.*", + "3.11.*" ] }, { diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index 2d0440f3b0e2..cc192043f20d 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -207,7 +207,8 @@ "3.7.*", "3.8.*", "3.9.*", - "3.10.*" + "3.10.*", + "3.11.*" ] }, { From cc71c8b504a5efec7d25054a016dbe7f34553df4 Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Thu, 27 Oct 2022 09:21:24 +0200 Subject: [PATCH 1551/3485] [Ubuntu] Remove ppa:ondrej/php for Ubuntu 22.04 (#6478) --- images/linux/scripts/installers/php.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/images/linux/scripts/installers/php.sh b/images/linux/scripts/installers/php.sh index 9347d462e148..04d5f165ce00 100644 --- a/images/linux/scripts/installers/php.sh +++ b/images/linux/scripts/installers/php.sh @@ -9,9 +9,12 @@ source $HELPER_SCRIPTS/etc-environment.sh source $HELPER_SCRIPTS/os.sh source $HELPER_SCRIPTS/install.sh -# add repository -apt-add-repository ppa:ondrej/php -y -apt-get update +# add repository for old Ubuntu images +# details in thread: https://github.com/actions/runner-images/issues/6331 +if isUbuntu18 || isUbuntu20; then + apt-add-repository ppa:ondrej/php -y + apt-get update +fi # Install PHP php_versions=$(get_toolset_value '.php.versions[]') @@ -103,7 +106,7 @@ mv phpunit /usr/local/bin/phpunit # ubuntu 20.04 libzip-dev is libzip5 based and is not compatible libzip-dev of ppa:ondrej/php # see https://github.com/actions/runner-images/issues/1084 -if isUbuntu20 || isUbuntu22; then +if isUbuntu20; then rm /etc/apt/sources.list.d/ondrej-*.list apt-get update fi From 715747a0548ee00d549950b7790c14d5f7154d64 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Thu, 27 Oct 2022 09:26:49 +0200 Subject: [PATCH 1552/3485] Remove Test-IsWin19 WSL condition (#6477) --- .../SoftwareReport/SoftwareReport.Generator.ps1 | 11 ++++------- images/win/scripts/Tests/Shell.Tests.ps1 | 4 +--- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index 2decc97cf269..7d5138d3d74c 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -26,13 +26,10 @@ $markdown += New-MDList -Style Unordered -Lines @( "Image Version: $env:IMAGE_VERSION" ) -if ((Test-IsWin19) -or (Test-IsWin22)) -{ - $markdown += New-MDHeader "Enabled windows optional features" -Level 2 - $markdown += New-MDList -Style Unordered -Lines @( - "Windows Subsystem for Linux [WSLv1]" - ) -} +$markdown += New-MDHeader "Enabled windows optional features" -Level 2 +$markdown += New-MDList -Style Unordered -Lines @( + "Windows Subsystem for Linux [WSLv1]" +) $markdown += New-MDHeader "Installed Software" -Level 2 $markdown += New-MDHeader "Language and Runtime" -Level 3 diff --git a/images/win/scripts/Tests/Shell.Tests.ps1 b/images/win/scripts/Tests/Shell.Tests.ps1 index 8809597f2ba4..caddaf7fb747 100644 --- a/images/win/scripts/Tests/Shell.Tests.ps1 +++ b/images/win/scripts/Tests/Shell.Tests.ps1 @@ -2,10 +2,8 @@ Describe "Shell" { $shellTestCases = @( @{Name = "C:\shells\gitbash.exe"; Target = "$env:ProgramFiles\Git\bin\bash.exe"}, @{Name = "C:\shells\msys2bash.cmd"; Target = $null} + @{Name = "C:\shells\wslbash.exe"; Target = "$env:SystemRoot\System32\bash.exe"} ) - if (Test-IsWin19) { - $shellTestCases += @{Name = "C:\shells\wslbash.exe"; Target = "$env:SystemRoot\System32\bash.exe"} - } It "<Name> target to <Target>" -TestCases $shellTestCases { (Get-Item $Name).Target | Should -BeExactly $Target From 22693772a6c22b2401961e3a0eeab7cceb62509b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 27 Oct 2022 08:52:36 +0000 Subject: [PATCH 1553/3485] Updating readme file for ubuntu20 version 20221024.1 (#6468) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2004-Readme.md | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/images/linux/Ubuntu2004-Readme.md b/images/linux/Ubuntu2004-Readme.md index a427518b7dfd..bb636cc0d6f1 100644 --- a/images/linux/Ubuntu2004-Readme.md +++ b/images/linux/Ubuntu2004-Readme.md @@ -8,7 +8,7 @@ *** # Ubuntu 20.04.5 LTS - Linux kernel version: 5.15.0-1022-azure -- Image Version: 20221018.2 +- Image Version: 20221024.1 ## Installed Software ### Language and Runtime @@ -35,7 +35,7 @@ ### Package Management - cpan 1.64 - Helm 3.10.1 -- Homebrew 3.6.6 +- Homebrew 3.6.7 - Miniconda 4.12.0 - Npm 8.19.2 - NuGet 6.3.1.1 @@ -43,7 +43,7 @@ - Pip3 20.0.2 - Pipx 1.1.0 - RubyGems 3.1.2 -- Vcpkg (build from master \<ce99c947b>) +- Vcpkg (build from master \<6118e6b13>) - Yarn 1.22.19 ##### Notes: @@ -72,7 +72,7 @@ to accomplish this. - Ansible 2.13.5 - apt-fast 1.9.12 - AzCopy 10.16.1 (available by `azcopy` and `azcopy10` aliases) -- Bazel 5.3.1 +- Bazel 5.3.2 - Bazelisk 1.13.2 - Bicep 0.11.1 - Buildah 1.22.3 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) @@ -90,7 +90,7 @@ to accomplish this. - Git-ftp 1.6.0 - Haveged 1.9.1 - Heroku 7.65.0 -- HHVM (HipHop VM) 4.170.0 +- HHVM (HipHop VM) 4.171.0 - jq 1.6 - Kind 0.16.0 - Kubectl 1.25.3 @@ -112,19 +112,19 @@ to accomplish this. - Skopeo 1.5.0 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 -- Terraform 1.3.2 +- Terraform 1.3.3 - yamllint 1.28.0 - yq 4.28.2 - zstd 1.5.2 (homebrew) ### CLI Tools - Alibaba Cloud CLI 3.0.132 -- AWS CLI 2.8.3 +- AWS CLI 2.8.5 - AWS CLI Session manager plugin 1.2.398.0 - AWS SAM CLI 1.60.0 - Azure CLI (azure-cli) 2.41.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.25.0 -- GitHub CLI 2.18.0 +- GitHub CLI 2.18.1 - Google Cloud SDK 406.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 - Netlify CLI 12.0.11 @@ -177,8 +177,8 @@ to accomplish this. - Google Chrome 106.0.5249.119 - ChromeDriver 106.0.5249.61 - Chromium 106.0.5235.0 -- Microsoft Edge 106.0.1370.47 (apt source repository: https://packages.microsoft.com/repos/edge) -- Microsoft Edge WebDriver 106.0.1370.47 +- Microsoft Edge 106.0.1370.52 (apt source repository: https://packages.microsoft.com/repos/edge) +- Microsoft Edge WebDriver 106.0.1370.52 - Selenium server 4.5.0 - Mozilla Firefox 105.0 - Geckodriver 0.32.0 @@ -195,7 +195,7 @@ to accomplish this. - 3.1.120 3.1.202 3.1.302 3.1.424 5.0.104 5.0.214 5.0.303 5.0.408 6.0.402 ### .NET tools -- nbgv 3.5.113+a908c6d9d2 +- nbgv 3.5.119+5d25f54fec ### Databases - MongoDB 5.0.13 (apt source repository: https://repo.mongodb.org/apt/ubuntu) @@ -209,7 +209,7 @@ to accomplish this. PostgreSQL service is disabled by default. Use the following command as a part of your job to start the service: 'sudo systemctl start postgresql.service' ``` #### MySQL -- MySQL 8.0.30-0ubuntu0.20.04.2 +- MySQL 8.0.31-0ubuntu0.20.04.1 - MySQL Server (user:root password:root) ``` @@ -260,7 +260,7 @@ to accomplish this. | GOROOT_1_19_X64 | /opt/hostedtoolcache/go/1.19.2/x64 | x64 | ### PowerShell Tools -- PowerShell 7.2.6 +- PowerShell 7.2.7 #### PowerShell Modules | Module | Version | From 3f3fa5aa31ed554d59fbdae355a9615f11d7c925 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 27 Oct 2022 09:18:34 +0000 Subject: [PATCH 1554/3485] Updating readme file for macOS-11 version 20221023.1 (#6466) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-11-Readme.md | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/images/macos/macos-11-Readme.md b/images/macos/macos-11-Readme.md index ffe139710c4a..a614ccbb73ee 100644 --- a/images/macos/macos-11-Readme.md +++ b/images/macos/macos-11-Readme.md @@ -7,7 +7,7 @@ # macOS 11.7 info - System Version: macOS 11.7 (20G817) - Kernel Version: Darwin 20.6.0 -- Image Version: 20221018.1 +- Image Version: 20221023.1 ## Installed Software ### Language and Runtime @@ -24,7 +24,7 @@ - Go 1.17.13 - julia 1.8.2 - Kotlin 1.7.20-release-201 -- MSBuild 16.10.1.31401 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) +- MSBuild 16.10.1.51301 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) - Node.js v16.18.0 - NVM 0.39.2 - NVM - Cached node versions: v12.22.12 v14.20.1 v16.18.0 @@ -43,12 +43,12 @@ - Homebrew 3.6.6 - Miniconda 4.12.0 - NPM 8.19.2 -- NuGet 6.2.1.2 +- NuGet 6.3.1.1 - Pip 20.3.4 (python 2.7) - Pip 22.2.2 (python 3.10) - Pipx 1.1.0 - RubyGems 3.3.24 -- Vcpkg 2022 (build from master \<f4b262b25>) +- Vcpkg 2022 (build from master \<934a99dc1>) - Yarn 1.22.19 #### Environment variables @@ -68,13 +68,13 @@ - 7-Zip 17.04 - aria2 1.36.0 - azcopy 10.16.1 -- bazel 5.3.1 +- bazel 5.3.2 - bazelisk 1.14.0 - bsdtar 3.3.2 - available by 'tar' alias - Curl 7.85.0 - Git 2.38.1 - Git LFS: 3.2.0 -- GitHub CLI: 2.18.0 +- GitHub CLI: 2.18.1 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.3 - gpg (GnuPG) 2.3.8 @@ -92,13 +92,13 @@ - Sox 14.4.2 - Subversion (SVN) 1.14.2 - Switchaudio-osx 1.1.0 -- yq (https://github.com/mikefarah/yq/) version 4.28.1 +- yq (https://github.com/mikefarah/yq/) version 4.28.2 - zstd 1.5.2 ### Tools -- Aliyun CLI 3.0.131 +- Aliyun CLI 3.0.132 - App Center CLI 2.11.0 -- AWS CLI 2.8.3 +- AWS CLI 2.8.5 - AWS SAM CLI 1.60.0 - AWS Session Manager CLI 1.2.398.0 - Azure CLI (azure-devops) 0.25.0 @@ -113,7 +113,7 @@ - GHCup 0.1.18.0 - Jazzy 0.14.3 - Stack 2.9.1 -- SwiftFormat 0.50.2 +- SwiftFormat 0.50.3 - Swig 4.0.2 - Xcode Command Line Tools 13.2.0.0.1.1638488800 @@ -126,9 +126,9 @@ - SafariDriver 16.0 (16614.1.25.9.10) - Google Chrome 106.0.5249.119 - ChromeDriver 106.0.5249.61 -- Microsoft Edge 106.0.1370.47 -- Microsoft Edge WebDriver 106.0.1370.47 -- Mozilla Firefox 105.0.3 +- Microsoft Edge 106.0.1370.52 +- Microsoft Edge WebDriver 106.0.1370.52 +- Mozilla Firefox 106.0.1 - geckodriver 0.32.0 - Selenium server 4.5.0 @@ -199,7 +199,7 @@ - Rustfmt 1.5.1-stable ### PowerShell Tools -- PowerShell 7.2.6 +- PowerShell 7.2.7 #### PowerShell Modules | Module | Version | @@ -213,7 +213,7 @@ | Name | Version | ConfigFile | ServiceStatus | ListenPort | | ----- | -------- | ------------------------------- | ------------- | ---------- | | httpd | 2.4.54_1 | /usr/local/etc/httpd/httpd.conf | none | 80 | -| nginx | 1.23.1 | /usr/local/etc/nginx/nginx.conf | none | 80 | +| nginx | 1.23.2 | /usr/local/etc/nginx/nginx.conf | none | 80 | ### Xamarin #### Visual Studio for Mac From 891a05dfdbece20a9aa888a35d3216722523b62e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 27 Oct 2022 10:04:39 +0000 Subject: [PATCH 1555/3485] Updating readme file for ubuntu22 version 20221024.1 (#6467) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2204-Readme.md | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/images/linux/Ubuntu2204-Readme.md b/images/linux/Ubuntu2204-Readme.md index a266dec7f788..b5f95700ef02 100644 --- a/images/linux/Ubuntu2204-Readme.md +++ b/images/linux/Ubuntu2204-Readme.md @@ -8,7 +8,7 @@ *** # Ubuntu 22.04.1 LTS - Linux kernel version: 5.15.0-1022-azure -- Image Version: 20221018.2 +- Image Version: 20221024.1 ## Installed Software ### Language and Runtime @@ -33,7 +33,7 @@ ### Package Management - cpan 1.64 - Helm 3.10.1 -- Homebrew 3.6.6 +- Homebrew 3.6.7 - Miniconda 4.12.0 - Npm 8.19.2 - NuGet 6.3.1.1 @@ -41,7 +41,7 @@ - Pip3 22.0.2 - Pipx 1.1.0 - RubyGems 3.3.5 -- Vcpkg (build from master \<ce99c947b>) +- Vcpkg (build from master \<6118e6b13>) - Yarn 1.22.19 ##### Notes: @@ -66,7 +66,7 @@ to accomplish this. - Ansible 2.13.5 - apt-fast 1.9.12 - AzCopy 10.16.1 (available by `azcopy` and `azcopy10` aliases) -- Bazel 5.3.1 +- Bazel 5.3.2 - Bazelisk 1.13.2 - Bicep 0.11.1 - Buildah 1.23.1 @@ -104,19 +104,19 @@ to accomplish this. - Skopeo 1.4.1 - Sphinx Open Source Search Server 2.2.11 - SVN 1.14.1 -- Terraform 1.3.2 +- Terraform 1.3.3 - yamllint 1.28.0 - yq 4.28.2 - zstd 1.5.2 (homebrew) ### CLI Tools - Alibaba Cloud CLI 3.0.132 -- AWS CLI 2.8.3 +- AWS CLI 2.8.5 - AWS CLI Session manager plugin 1.2.398.0 - AWS SAM CLI 1.60.0 - Azure CLI (azure-cli) 2.41.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.25.0 -- GitHub CLI 2.18.0 +- GitHub CLI 2.18.1 - Google Cloud SDK 406.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 - Netlify CLI 12.0.11 @@ -169,8 +169,8 @@ to accomplish this. - Google Chrome 106.0.5249.119 - ChromeDriver 106.0.5249.61 - Chromium 106.0.5235.0 -- Microsoft Edge 106.0.1370.47 (apt source repository: https://packages.microsoft.com/repos/edge) -- Microsoft Edge WebDriver 106.0.1370.47 +- Microsoft Edge 106.0.1370.52 (apt source repository: https://packages.microsoft.com/repos/edge) +- Microsoft Edge WebDriver 106.0.1370.52 - Selenium server 4.5.0 #### Environment variables @@ -185,7 +185,7 @@ to accomplish this. - 6.0.402 ### .NET tools -- nbgv 3.5.113+a908c6d9d2 +- nbgv 3.5.119+5d25f54fec ### Databases - sqlite3 3.37.2 @@ -198,7 +198,7 @@ to accomplish this. PostgreSQL service is disabled by default. Use the following command as a part of your job to start the service: 'sudo systemctl start postgresql.service' ``` #### MySQL -- MySQL 8.0.30-0ubuntu0.22.04.1 +- MySQL 8.0.31-0ubuntu0.22.04.1 - MySQL Server (user:root password:root) ``` @@ -240,7 +240,7 @@ to accomplish this. | GOROOT_1_19_X64 | /opt/hostedtoolcache/go/1.19.2/x64 | x64 | ### PowerShell Tools -- PowerShell 7.2.6 +- PowerShell 7.2.7 #### PowerShell Modules | Module | Version | From 036d402f347decde0c12286fcd2560802c62bd47 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 27 Oct 2022 14:27:03 +0000 Subject: [PATCH 1556/3485] Updating readme file for win22 version 20221024.1 (#6464) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2022-Readme.md | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/images/win/Windows2022-Readme.md b/images/win/Windows2022-Readme.md index e8ebeed52471..a312b441c8fb 100644 --- a/images/win/Windows2022-Readme.md +++ b/images/win/Windows2022-Readme.md @@ -4,7 +4,7 @@ *** # Microsoft Windows Server 2022 Datacenter - OS Version: 10.0.20348 Build 1129 -- Image Version: 20221019.1 +- Image Version: 20221024.1 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -23,7 +23,7 @@ - Ruby 3.0.4p208 ### Package Management -- Chocolatey 1.1.0 +- Chocolatey 1.2.0 - Composer 2.4.3 - Helm 3.10.0 - Miniconda 4.12.0 (pre-installed on the image but not added to PATH) @@ -32,7 +32,7 @@ - pip 22.3 (python 3.9) - Pipx 1.1.0 - RubyGems 3.2.33 -- Vcpkg (build from master \<79caba3c9>) +- Vcpkg (build from master \<7ad236f60>) - Yarn 1.22.19 #### Environment variables @@ -59,12 +59,12 @@ - CodeQL Action Bundle 2.11.1 - Docker 20.10.20 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.12.0 +- Docker Compose v2 2.12.2 - Docker-wincred 0.7.0 - ghc 9.4.2 - Git 2.38.1.windows.1 - Git LFS 3.2.0 -- ImageMagick 7.1.0-50 +- ImageMagick 7.1.0-51 - InnoSetup 6.2.1 - jq 1.6 - Kind 0.16.0 @@ -89,12 +89,12 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.132 -- AWS CLI 2.8.3 +- AWS CLI 2.8.5 - AWS SAM CLI 1.60.0 - AWS Session Manager CLI 1.2.398.0 - Azure CLI 2.41.0 - Azure DevOps CLI extension 0.25.0 -- GitHub CLI 2.18.0 +- GitHub CLI 2.18.1 - Hub CLI 2.14.2 ### Rust Tools @@ -114,9 +114,9 @@ ### Browsers and webdrivers - Google Chrome 106.0.5249.119 - Chrome Driver 106.0.5249.61 -- Microsoft Edge 106.0.1370.47 -- Microsoft Edge Driver 106.0.1370.47 -- Mozilla Firefox 106.0 +- Microsoft Edge 106.0.1370.52 +- Microsoft Edge Driver 106.0.1370.52 +- Mozilla Firefox 106.0.1 - Gecko Driver 0.32.0 - IE Driver 3.150.1.1 - Selenium server 4.5.0 @@ -220,7 +220,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Name | Version | ConfigFile | ServiceName | ServiceStatus | ListenPort | | ------ | ------- | ------------------------------------- | ----------- | ------------- | ---------- | | Apache | 2.4.54 | C:\tools\Apache24\conf\httpd.conf | Apache | Stopped | 80 | -| Nginx | 1.23.1 | C:\tools\nginx-1.23.1\conf\nginx.conf | nginx | Stopped | 80 | +| Nginx | 1.23.2 | C:\tools\nginx-1.23.2\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2022 | Name | Version | Path | @@ -551,10 +551,10 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 4.8.1 ### .NET tools -- nbgv 3.5.113+a908c6d9d2 +- nbgv 3.5.119+5d25f54fec ### PowerShell Tools -- PowerShell 7.2.6 +- PowerShell 7.2.7 #### Azure Powershell Modules | Module | Version | Path | @@ -571,7 +571,7 @@ All other versions are saved but not installed. #### Powershell Modules | Module | Version | | ------------------ | ---------------- | -| AWSPowerShell | 4.1.188 | +| AWSPowerShell | 4.1.191 | | DockerMsftProvider | 1.0.0.8 | | MarkdownPS | 1.9 | | Microsoft.Graph | 1.13.0 | From f3d9d2381b99bb6fb6267167c6e51d9b0995fd1e Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Thu, 27 Oct 2022 18:15:23 +0200 Subject: [PATCH 1557/3485] [macOS] add Node 18 to toolcache (#6479) --- images/macos/toolsets/toolset-10.15.json | 6 ++++-- images/macos/toolsets/toolset-11.json | 6 ++++-- images/macos/toolsets/toolset-12.json | 3 ++- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index 1a07506fcd76..13cd3d0d1ffd 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -279,7 +279,8 @@ "versions": [ "12.*", "14.*", - "16.*" + "16.*", + "18.*" ] }, { @@ -338,7 +339,8 @@ "nvm_versions": [ "12", "14", - "16" + "16", + "18" ] }, "llvm": { diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index ee40b4a7c498..423845743f59 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -272,7 +272,8 @@ "versions": [ "12.*", "14.*", - "16.*" + "16.*", + "18.*" ] }, { @@ -333,7 +334,8 @@ "nvm_versions": [ "12", "14", - "16" + "16", + "18" ] }, "llvm": { diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index cc192043f20d..d1d180a18091 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -230,7 +230,8 @@ "versions": [ "12.*", "14.*", - "16.*" + "16.*", + "18.*" ] }, { From 3cad66317f753ae16d5d0da84a66e55f0d085cc9 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Thu, 27 Oct 2022 18:15:47 +0200 Subject: [PATCH 1558/3485] [Windows] add Node 18 to toolcache (#6481) --- images/win/toolsets/toolset-2019.json | 3 ++- images/win/toolsets/toolset-2022.json | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index d9891b478ecf..761603ceeba2 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -65,7 +65,8 @@ "versions": [ "12.*", "14.*", - "16.*" + "16.*", + "18.*" ] }, { diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index b174564bfbbf..e4ec9ba16ac9 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -57,7 +57,8 @@ "versions": [ "12.*", "14.*", - "16.*" + "16.*", + "18.*" ] }, { From 765adc16904d28b82d975ec6beca9bd5eeb733b8 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Thu, 27 Oct 2022 18:16:08 +0200 Subject: [PATCH 1559/3485] [Ubuntu] add Node 18 to toolcache (#6480) --- images/linux/toolsets/toolset-1804.json | 5 ++++- images/linux/toolsets/toolset-2004.json | 5 ++++- images/linux/toolsets/toolset-2204.json | 5 ++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index 86ff1b091efb..65a5705a6056 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -34,7 +34,8 @@ "versions": [ "12.*", "14.*", - "16.*" + "16.*", + "18.*" ] }, { @@ -243,9 +244,11 @@ "node:12", "node:14", "node:16", + "node:18", "node:12-alpine", "node:14-alpine", "node:16-alpine", + "node:18-alpine", "ubuntu:16.04", "ubuntu:18.04", "ubuntu:20.04" diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index 9e803ba4b0d5..ccd56b4a49b0 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -36,7 +36,8 @@ "versions": [ "12.*", "14.*", - "16.*" + "16.*", + "18.*" ] }, { @@ -243,9 +244,11 @@ "node:12", "node:14", "node:16", + "node:18", "node:12-alpine", "node:14-alpine", "node:16-alpine", + "node:18-alpine", "ubuntu:16.04", "ubuntu:18.04", "ubuntu:20.04" diff --git a/images/linux/toolsets/toolset-2204.json b/images/linux/toolsets/toolset-2204.json index 7253168073b5..58f21d58c0c9 100644 --- a/images/linux/toolsets/toolset-2204.json +++ b/images/linux/toolsets/toolset-2204.json @@ -31,7 +31,8 @@ "arch": "x64", "versions": [ "14.*", - "16.*" + "16.*", + "18.*" ] }, { @@ -220,8 +221,10 @@ "moby/buildkit:latest", "node:14", "node:16", + "node:18", "node:14-alpine", "node:16-alpine", + "node:18-alpine", "ubuntu:18.04", "ubuntu:20.04", "ubuntu:22.04" From 2b48347ec3e3afeb7d74a7f89662cc8844102f1e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 27 Oct 2022 19:07:13 +0000 Subject: [PATCH 1560/3485] Updating readme file for win19 version 20221024.1 (#6469) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2019-Readme.md | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index 1949ba30612c..e0312038aefc 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 3534 -- Image Version: 20221019.1 +- Image Version: 20221024.1 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -23,7 +23,7 @@ - Ruby 2.5.9p229 ### Package Management -- Chocolatey 1.1.0 +- Chocolatey 1.2.0 - Composer 2.4.3 - Helm 3.10.0 - Miniconda 4.12.0 (pre-installed on the image but not added to PATH) @@ -32,7 +32,7 @@ - pip 22.3 (python 3.7) - Pipx 1.1.0 - RubyGems 2.7.6.3 -- Vcpkg (build from master \<94ce0dab5>) +- Vcpkg (build from master \<7ad236f60>) - Yarn 1.22.19 #### Environment variables @@ -60,13 +60,13 @@ - CodeQL Action Bundle 2.11.1 - Docker 20.10.20 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.12.0 +- Docker Compose v2 2.12.2 - Docker-wincred 0.7.0 - ghc 9.4.2 - Git 2.38.1.windows.1 - Git LFS 3.2.0 - Google Cloud SDK 406.0.0 -- ImageMagick 7.1.0-50 +- ImageMagick 7.1.0-51 - InnoSetup 6.2.1 - jq 1.6 - Kind 0.16.0 @@ -92,13 +92,13 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.132 -- AWS CLI 2.8.3 +- AWS CLI 2.8.5 - AWS SAM CLI 1.60.0 - AWS Session Manager CLI 1.2.398.0 - Azure CLI 2.41.0 - Azure DevOps CLI extension 0.25.0 - Cloud Foundry CLI 6.53.0 -- GitHub CLI 2.18.0 +- GitHub CLI 2.18.1 - Hub CLI 2.14.2 ### Rust Tools @@ -118,9 +118,9 @@ ### Browsers and webdrivers - Google Chrome 106.0.5249.119 - Chrome Driver 106.0.5249.61 -- Microsoft Edge 106.0.1370.47 -- Microsoft Edge Driver 106.0.1370.47 -- Mozilla Firefox 106.0 +- Microsoft Edge 106.0.1370.52 +- Microsoft Edge Driver 106.0.1370.52 +- Mozilla Firefox 106.0.1 - Gecko Driver 0.32.0 - IE Driver 3.150.1.1 - Selenium server 4.5.0 @@ -234,7 +234,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Name | Version | ConfigFile | ServiceName | ServiceStatus | ListenPort | | ------ | ------- | ------------------------------------- | ----------- | ------------- | ---------- | | Apache | 2.4.54 | C:\tools\Apache24\conf\httpd.conf | Apache | Stopped | 80 | -| Nginx | 1.23.1 | C:\tools\nginx-1.23.1\conf\nginx.conf | nginx | Stopped | 80 | +| Nginx | 1.23.2 | C:\tools\nginx-1.23.2\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2019 | Name | Version | Path | @@ -529,10 +529,10 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 4.8 ### .NET tools -- nbgv 3.5.113+a908c6d9d2 +- nbgv 3.5.119+5d25f54fec ### PowerShell Tools -- PowerShell 7.2.6 +- PowerShell 7.2.7 #### Azure Powershell Modules | Module | Version | Path | @@ -549,7 +549,7 @@ All other versions are saved but not installed. #### Powershell Modules | Module | Version | | ------------------ | ---------------- | -| AWSPowerShell | 4.1.188 | +| AWSPowerShell | 4.1.191 | | DockerMsftProvider | 1.0.0.8 | | MarkdownPS | 1.9 | | Microsoft.Graph | 1.13.0 | From 5e6d4245dbec225b2153d43b2851e14dcaddeb0c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 2 Nov 2022 15:59:21 +0000 Subject: [PATCH 1561/3485] Updating readme file for macOS-12 version 20221027.1 (#6490) Co-authored-by: Image generation service account <no-reply@microsoft.com> --- images/macos/macos-12-Readme.md | 74 +++++++++++++++++---------------- 1 file changed, 38 insertions(+), 36 deletions(-) diff --git a/images/macos/macos-12-Readme.md b/images/macos/macos-12-Readme.md index b3b8593e7e62..c81d72711a5e 100644 --- a/images/macos/macos-12-Readme.md +++ b/images/macos/macos-12-Readme.md @@ -1,13 +1,14 @@ | Announcements | |-| +| [[all OSs] Nodejs 12.x will be removed from the images on November, 14](https://github.com/actions/runner-images/issues/6482) | | [macOS-latest workflows will use macOS-12](https://github.com/actions/runner-images/issues/6384) | | [[all OSs] The VCPKG_ROOT variable will be removed from runner images](https://github.com/actions/runner-images/issues/6376) | | [The macOS 10.15 Actions runner image will begin deprecation on 5/31/22 and will be fully unsupported by 12/1/22 for GitHub and ADO](https://github.com/actions/runner-images/issues/5583) | *** # macOS 12.6 info -- System Version: macOS 12.6 (21G115) +- System Version: macOS 12.6.1 (21G217) - Kernel Version: Darwin 21.6.0 -- Image Version: 20221018.2 +- Image Version: 20221027.1 ## Installed Software ### Language and Runtime @@ -20,14 +21,14 @@ - Go 1.17.13 - julia 1.8.2 - Kotlin 1.7.20-release-201 -- MSBuild 16.10.1.31401 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) +- MSBuild 16.10.1.51301 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) - Node.js v16.18.0 - NVM 0.39.2 - NVM - Cached node versions: v12.22.12 v14.20.1 v16.18.0 - Perl 5.36.0 - PHP 8.1.11 - Python 2.7.18 -- Python 3.10.8 +- Python 3.11.0 - R 4.2.1 - Ruby 3.0.4p208 @@ -36,15 +37,15 @@ - Carthage 0.38.0 - CocoaPods 1.11.3 - Composer 2.4.3 -- Homebrew 3.6.6 +- Homebrew 3.6.7 - Miniconda 4.12.0 - NPM 8.19.2 -- NuGet 6.2.1.2 +- NuGet 6.3.1.1 - Pip 20.3.4 (python 2.7) -- Pip 22.2.2 (python 3.10) +- Pip 22.3 (python 3.11) - Pipx 1.1.0 - RubyGems 3.3.24 -- Vcpkg 2022 (build from master \<414cc9528>) +- Vcpkg 2022 (build from master \<2de7f388c>) - Yarn 1.22.19 #### Environment variables @@ -52,7 +53,6 @@ | ----------------------- | ---------------------- | | CONDA | /usr/local/miniconda | | VCPKG_INSTALLATION_ROOT | /usr/local/share/vcpkg | -| VCPKG_ROOT | /usr/local/share/vcpkg | ### Project Management - Apache Ant(TM) 1.10.12 @@ -64,13 +64,13 @@ - 7-Zip 17.04 - aria2 1.36.0 - azcopy 10.16.1 -- bazel 5.3.1 +- bazel 5.3.2 - bazelisk 1.14.0 - bsdtar 3.5.1 - available by 'tar' alias - Curl 7.85.0 - Git 2.38.1 - Git LFS: 3.2.0 -- GitHub CLI: 2.18.0 +- GitHub CLI: 2.18.1 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.3 - gpg (GnuPG) 2.3.8 @@ -86,29 +86,29 @@ - Sox 14.4.2 - Subversion (SVN) 1.14.2 - Switchaudio-osx 1.1.0 -- Vagrant 2.3.1 +- Vagrant 2.3.2 - VirtualBox 6.1.38r153438 -- yq (https://github.com/mikefarah/yq/) version 4.28.1 +- yq (https://github.com/mikefarah/yq/) version 4.28.2 - zstd 1.5.2 ### Tools - App Center CLI 2.11.0 -- AWS CLI 2.8.3 -- AWS SAM CLI 1.60.0 +- AWS CLI 2.8.6 +- AWS SAM CLI 1.61.0 - AWS Session Manager CLI 1.2.398.0 - Azure CLI (azure-devops) 0.25.0 - Azure CLI 2.41.0 - Bicep CLI 0.11.1 - Cabal 3.6.2.0 - Cmake 3.24.2 -- CodeQL Action Bundle 2.11.1 +- CodeQL Action Bundle 2.11.2 - Colima 0.4.6 - Fastlane 2.210.1 - GHC 9.4.2 - GHCup 0.1.18.0 - Jazzy 0.14.3 - Stack 2.9.1 -- SwiftFormat 0.50.2 +- SwiftFormat 0.50.3 - Swig 4.0.2 - Xcode Command Line Tools 14.0.0.0.1.1661618636 @@ -117,20 +117,20 @@ - yamllint 1.28.0 ### Browsers -- Safari 16.0 (17614.1.25.9.10) -- SafariDriver 16.0 (17614.1.25.9.10) -- Google Chrome 106.0.5249.119 -- ChromeDriver 106.0.5249.61 -- Microsoft Edge 106.0.1370.47 -- Microsoft Edge WebDriver 106.0.1370.47 -- Mozilla Firefox 106.0 +- Safari 16.1 (17614.2.9.1.13) +- SafariDriver 16.1 (17614.2.9.1.13) +- Google Chrome 107.0.5304.87 +- ChromeDriver 107.0.5304.62 +- Microsoft Edge 107.0.1418.24 +- Microsoft Edge WebDriver 107.0.1418.23 +- Mozilla Firefox 106.0.2 - geckodriver 0.32.0 - Selenium server 4.5.0 #### Environment variables | Name | Value | | --------------- | ---------------------------------------------- | -| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/106.0.5249.61 | +| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/107.0.5304.62 | | EDGEWEBDRIVER | /usr/local/share/edge_driver | | GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | @@ -144,7 +144,7 @@ ### GraalVM | Version | Environment variables | | --------- | --------------------- | -| CE 22.2.0 | GRAALVM_11_ROOT | +| CE 22.3.0 | GRAALVM_11_ROOT | ### Cached Tools #### Ruby @@ -157,6 +157,7 @@ - 3.8.14 - 3.9.14 - 3.10.8 +- 3.11.0 #### PyPy - 2.7.18 [PyPy 7.3.9] @@ -167,7 +168,8 @@ #### Node.js - 12.22.12 - 14.20.1 -- 16.17.1 +- 16.18.0 +- 18.12.0 #### Go | Version | Architecture | Environment Variable | @@ -191,7 +193,7 @@ - Rustfmt 1.5.1-stable ### PowerShell Tools -- PowerShell 7.2.6 +- PowerShell 7.2.7 #### PowerShell Modules | Module | Version | @@ -205,7 +207,7 @@ | Name | Version | ConfigFile | ServiceStatus | ListenPort | | ----- | -------- | ------------------------------- | ------------- | ---------- | | httpd | 2.4.54_1 | /usr/local/etc/httpd/httpd.conf | none | 80 | -| nginx | 1.23.1 | /usr/local/etc/nginx/nginx.conf | none | 80 | +| nginx | 1.23.2 | /usr/local/etc/nginx/nginx.conf | none | 80 | ### Xamarin #### Visual Studio for Mac @@ -242,7 +244,7 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" ### Xcode | Version | Build | Path | | ---------------- | -------- | ------------------------------ | -| 14.1 | 14B47 | /Applications/Xcode_14.1.app | +| 14.1 | 14B47b | /Applications/Xcode_14.1.app | | 14.0.1 (default) | 14A400 | /Applications/Xcode_14.0.1.app | | 14.0 | 14A309 | /Applications/Xcode_14.0.app | | 13.4.1 | 13F100 | /Applications/Xcode_13.4.1.app | @@ -313,17 +315,17 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" | tvOS 15.4 | 13.3.1<br>13.4<br>13.4.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | | tvOS 16.0 | 13.1<br>13.2.1<br>13.3.1<br>13.4<br>13.4.1<br>14.0<br>14.0.1<br>14.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | | tvOS 16.1 | 13.1<br>13.2.1<br>13.3.1<br>13.4<br>13.4.1<br>14.0<br>14.0.1<br>14.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p)<br>Apple TV 4K (at 1080p) (2nd generation) | -| watchOS 8.0 | 13.1 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 (45mm) | -| watchOS 8.3 | 13.2.1 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 (45mm) | -| watchOS 8.5 | 13.3.1<br>13.4<br>13.4.1 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | -| watchOS 9.0 | 13.1<br>13.2.1<br>13.3.1<br>13.4<br>13.4.1<br>14.0<br>14.0.1<br>14.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | -| watchOS 9.1 | 13.1<br>13.2.1<br>13.3.1<br>13.4<br>13.4.1<br>14.0<br>14.0.1<br>14.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | +| watchOS 8.0 | 13.1 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 - 45mm<br>Apple Watch Series 7 (41mm) | +| watchOS 8.3 | 13.2.1 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 45mm<br>Apple Watch Series 7 (41mm) | +| watchOS 8.5 | 13.3.1<br>13.4<br>13.4.1 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 7 - 45mm<br>Apple Watch Series 7 (41mm) | +| watchOS 9.0 | 13.1<br>13.2.1<br>13.3.1<br>13.4<br>13.4.1<br>14.0<br>14.0.1<br>14.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | +| watchOS 9.1 | 13.1<br>13.2.1<br>13.3.1<br>13.4<br>13.4.1<br>14.0<br>14.0.1<br>14.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | ### Android | Package Name | Version | | -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------ | | Android Command Line Tools | 7.0 | -| Android Emulator | 31.3.12 | +| Android Emulator | 31.3.13 | | Android SDK Build-tools | 33.0.0<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | | Android SDK Platforms | android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | | Android SDK Platform-Tools | 33.0.3 | From 0c8b93e28a4076a77df756bbb3f69ac72bceca9f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 3 Nov 2022 09:08:26 +0000 Subject: [PATCH 1562/3485] Updating readme file for ubuntu20 version 20221027.1 (#6500) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2004-Readme.md | 77 ++++++++++++++++--------------- 1 file changed, 40 insertions(+), 37 deletions(-) diff --git a/images/linux/Ubuntu2004-Readme.md b/images/linux/Ubuntu2004-Readme.md index bb636cc0d6f1..2893f85bf66d 100644 --- a/images/linux/Ubuntu2004-Readme.md +++ b/images/linux/Ubuntu2004-Readme.md @@ -1,14 +1,14 @@ | Announcements | |-| +| [[all OSs] Nodejs 12.x will be removed from the images on November, 14](https://github.com/actions/runner-images/issues/6482) | | [Ubuntu-latest workflows will use Ubuntu-22.04](https://github.com/actions/runner-images/issues/6399) | | [[all OSs] The VCPKG_ROOT variable will be removed from runner images](https://github.com/actions/runner-images/issues/6376) | | [Third party PHP repository will be removed from the Ubuntu 22.04 image](https://github.com/actions/runner-images/issues/6331) | -| [[Ubuntu] homebrew will be removed from PATH variable](https://github.com/actions/runner-images/issues/6283) | | [The Ubuntu 18.04 Actions runner image will begin deprecation on 8/8/22 and will be fully unsupported by 4/1/2023](https://github.com/actions/runner-images/issues/6002) | *** # Ubuntu 20.04.5 LTS - Linux kernel version: 5.15.0-1022-azure -- Image Version: 20221024.1 +- Image Version: 20221027.1 ## Installed Software ### Language and Runtime @@ -43,7 +43,7 @@ - Pip3 20.0.2 - Pipx 1.1.0 - RubyGems 3.1.2 -- Vcpkg (build from master \<6118e6b13>) +- Vcpkg (build from master \<48cc0c71e>) - Yarn 1.22.19 ##### Notes: @@ -59,7 +59,6 @@ to accomplish this. | ----------------------- | ---------------------- | | CONDA | /usr/share/miniconda | | VCPKG_INSTALLATION_ROOT | /usr/local/share/vcpkg | -| VCPKG_ROOT | /usr/local/share/vcpkg | ### Project Management - Ant 1.10.7 @@ -77,13 +76,13 @@ to accomplish this. - Bicep 0.11.1 - Buildah 1.22.3 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - CMake 3.24.2 -- CodeQL Action Bundle 2.11.1 +- CodeQL Action Bundle 2.11.2 - Docker Amazon ECR Credential Helper 0.6.0 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.11.2+azure-1 +- Docker Compose v2 2.12.2+azure-1 - Docker-Buildx 0.9.1 -- Docker-Moby Client 20.10.18+azure-2 -- Docker-Moby Server 20.10.18+azure-2 +- Docker-Moby Client 20.10.20+azure-1 +- Docker-Moby Server 20.10.20+azure-1 - Fastlane 2.210.1 - Git 2.38.1 (apt source repository: ppa:git-core/ppa) - Git LFS 3.2.0 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) @@ -92,7 +91,7 @@ to accomplish this. - Heroku 7.65.0 - HHVM (HipHop VM) 4.171.0 - jq 1.6 -- Kind 0.16.0 +- Kind 0.17.0 - Kubectl 1.25.3 - Kustomize 4.5.7 - Leiningen 2.9.10 @@ -107,7 +106,7 @@ to accomplish this. - Parcel 2.7.0 - PhantomJS 2.1.1 - Podman 3.4.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- Pulumi 3.43.1 +- Pulumi 3.44.2 - R 4.2.1 - Skopeo 1.5.0 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 @@ -118,14 +117,14 @@ to accomplish this. - zstd 1.5.2 (homebrew) ### CLI Tools -- Alibaba Cloud CLI 3.0.132 -- AWS CLI 2.8.5 +- Alibaba Cloud CLI 3.0.134 +- AWS CLI 2.8.6 - AWS CLI Session manager plugin 1.2.398.0 - AWS SAM CLI 1.60.0 - Azure CLI (azure-cli) 2.41.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.25.0 - GitHub CLI 2.18.1 -- Google Cloud SDK 406.0.0 (apt source repository: https://packages.cloud.google.com/apt) +- Google Cloud SDK 407.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 - Netlify CLI 12.0.11 - OpenShift CLI 4.11.9 @@ -142,13 +141,13 @@ to accomplish this. ### GraalVM | Version | Environment variables | | --------- | --------------------- | -| CE 22.2.0 | GRAALVM_11_ROOT | +| CE 22.3.0 | GRAALVM_11_ROOT | ### PHP | Tool | Version | | -------- | -------------------- | | PHP | 7.4.32 8.0.24 8.1.11 | -| Composer | 2.4.3 | +| Composer | 2.4.4 | | PHPUnit | 8.5.30 | ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. @@ -174,11 +173,11 @@ to accomplish this. - Rustfmt 1.5.1 ### Browsers and Drivers -- Google Chrome 106.0.5249.119 -- ChromeDriver 106.0.5249.61 -- Chromium 106.0.5235.0 -- Microsoft Edge 106.0.1370.52 (apt source repository: https://packages.microsoft.com/repos/edge) -- Microsoft Edge WebDriver 106.0.1370.52 +- Google Chrome 107.0.5304.87 +- ChromeDriver 107.0.5304.62 +- Chromium 107.0.5288.0 +- Microsoft Edge 107.0.1418.24 (apt source repository: https://packages.microsoft.com/repos/edge) +- Microsoft Edge WebDriver 107.0.1418.24 - Selenium server 4.5.0 - Mozilla Firefox 105.0 - Geckodriver 0.32.0 @@ -228,7 +227,8 @@ to accomplish this. #### Node.js - 12.22.12 - 14.20.1 -- 16.17.1 +- 16.18.0 +- 18.12.0 #### PyPy - 2.7.18 [PyPy 7.3.9] @@ -244,6 +244,7 @@ to accomplish this. - 3.8.14 - 3.9.15 - 3.10.8 +- 3.11.0 #### Ruby - 2.5.9 @@ -266,7 +267,7 @@ to accomplish this. | Module | Version | | ---------------- | ------- | | MarkdownPS | 1.9 | -| Microsoft.Graph | 1.13.0 | +| Microsoft.Graph | 1.14.0 | | Pester | 5.3.3 | | PSScriptAnalyzer | 1.21.0 | @@ -312,22 +313,24 @@ to accomplish this. | alpine:3.14 | sha256:1ab24b3b99320975cca71716a7475a65d263d0b6b604d9d14ce08f7a3f67595c | 2022-08-09 | | alpine:3.15 | sha256:69463fdff1f025c908939e86d4714b4d5518776954ca627cbeff4c74bcea5b22 | 2022-08-09 | | alpine:3.16 | sha256:bc41182d7ef5ffc53a40b044e725193bc10142a1243f395ee852a8d9730fc2ad | 2022-08-09 | -| buildpack-deps:bullseye | sha256:b501b75e9014f6bd3b4cc08e098653ba0b2863b7242f49134f974ebabdf2eb37 | 2022-10-05 | -| buildpack-deps:buster | sha256:c6f69876293b14c190e89e612826844f4a6f2cd9500d5a26523979b16daa5220 | 2022-10-05 | +| buildpack-deps:bullseye | sha256:9f5bbd4a5eb6970c1dc03703f159b2db17a520ec8c5ed76298849e3615c5fe16 | 2022-10-25 | +| buildpack-deps:buster | sha256:b9b638654107a9b7b5b5a301e62d0268dc6469f1508379d999799079a34c00f2 | 2022-10-25 | | buildpack-deps:stretch | sha256:78e995165a5788c2f55aed6e548d8f6c1534830d4310c870408fccb2da8c5b2e | 2022-06-23 | -| debian:10 | sha256:604db908f7ce93379b1289c0c7ba73b252002087a3fa64fe904b430083ba5f69 | 2022-10-04 | -| debian:11 | sha256:e538a2f0566efc44db21503277c7312a142f4d0dedc5d2886932b92626104bff | 2022-10-04 | +| debian:10 | sha256:e83854c9fb469daa7273d73c43a3fe5ae2da77cb40d3d34282a9af09a9db49f9 | 2022-10-25 | +| debian:11 | sha256:bfe6615d017d1eebe19f349669de58cda36c668ef916e618be78071513c690e5 | 2022-10-25 | | debian:9 | sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be | 2022-06-23 | | moby/buildkit:latest | sha256:46e7907bf9cdced1af7e45f1f07f69cb30560574d85d636a17ce6f97cc4844b4 | 2022-10-18 | | node:12 | sha256:01627afeb110b3054ba4a1405541ca095c8bfca1cb6f2be9479c767a2711879e | 2022-04-20 | | node:12-alpine | sha256:d4b15b3d48f42059a15bd659be60afe21762aae9d6cbea6f124440895c27db68 | 2022-04-11 | -| node:14 | sha256:d0634e5cde35cb312571cd007ae2270295bf2000ec489402325953bcee196ae2 | 2022-10-05 | -| node:14-alpine | sha256:50808db1777e35ca156d06cfd31fa377febe82df6f26b8413a47c12dcbf5e6c5 | 2022-10-06 | -| node:16 | sha256:6d592fdb89fccdeb880d14f30bf139b8a755f33b376f025b70e50ac5547c8ccf | 2022-10-13 | -| node:16-alpine | sha256:2175727cef5cad4020cb77c8c101d56ed41d44fbe9b1157c54f820e3d345eab1 | 2022-10-13 | -| ubuntu:16.04 | sha256:91bd29a464fdabfcf44e29e1f2a5f213c6dfa750b6290e40dd6998ac79da3c41 | 2021-08-31 | -| ubuntu:18.04 | sha256:40b84b75884ff39e4cac4bf62cb9678227b1fbf9dbe3f67ef2a6b073aa4bb529 | 2022-10-04 | -| ubuntu:20.04 | sha256:9c2004872a3a9fcec8cc757ad65c042de1dad4da27de4c70739a6e36402213e3 | 2022-10-04 | +| node:14 | sha256:860647620537bf1afce7bd20f466f53b735945efea280a8a5d1a9e5e18088bc0 | 2022-10-25 | +| node:14-alpine | sha256:b953f75739f5ddce593f8b7cf8542bbe5eb6a2a637cdd855fb7444ad4e296e02 | 2022-10-06 | +| node:16 | sha256:3547c98a330a08fb9dbb8b04ac4430f6d21133cb79f21f6cf8283184f523ff83 | 2022-10-25 | +| node:16-alpine | sha256:f16544bc93cf1a36d213c8e2efecf682e9f4df28429a629a37aaf38ecfc25cf4 | 2022-10-13 | +| node:18 | sha256:cef9966b19672effeafcf1a67b8add742c3e46ca7dd5532efff60820526c2e95 | 2022-10-27 | +| node:18-alpine | sha256:1f09c210a17508d34277971b19541a47a26dc5a641dedc03bd28cff095052996 | 2022-10-27 | +| ubuntu:16.04 | sha256:1f1a2d56de1d604801a9671f301190704c25d604a416f59e03c04f5c6ffee0d6 | 2021-08-31 | +| ubuntu:18.04 | sha256:ca70a834041dd1bf16cc38dfcd24f0888ec4fa431e09f3344f354cf8d1724499 | 2022-10-25 | +| ubuntu:20.04 | sha256:450e066588f42ebe1551f3b1a535034b6aa46cd936fe7f2c6b0d72997ec61dbd | 2022-10-25 | ### Installed apt packages | Name | Version | @@ -342,8 +345,8 @@ to accomplish this. | build-essential | 12.8ubuntu1.1 | | bzip2 | 1.0.8-2 | | coreutils | 8.30-3ubuntu2 | -| curl | 7.68.0-1ubuntu2.13 | -| dbus | 1.12.16-2ubuntu2.2 | +| curl | 7.68.0-1ubuntu2.14 | +| dbus | 1.12.16-2ubuntu2.3 | | dnsutils | 1:9.16.1-0ubuntu2.11 | | dpkg | 1.19.7ubuntu3.2 | | fakeroot | 1.24-1 | @@ -360,7 +363,7 @@ to accomplish this. | lib32z1 | 1:1.2.11.dfsg-2ubuntu1.5 | | libc++-dev | 1:10.0-50\~exp1 | | libc++abi-dev | 1:10.0-50\~exp1 | -| libcurl4 | 7.68.0-1ubuntu2.13 | +| libcurl4 | 7.68.0-1ubuntu2.14 | | libgbm-dev | 21.2.6-0ubuntu0.1\~20.04.2 | | libgconf-2-4 | 3.2.6-6ubuntu1 | | libgsl-dev | 2.5+dfsg-6build1 | @@ -404,7 +407,7 @@ to accomplish this. | texinfo | 6.7.0.dfsg.2-5 | | time | 1.7-25.1build1 | | tk | 8.6.9+1 | -| tzdata | 2022c-0ubuntu0.20.04.0 | +| tzdata | 2022e-0ubuntu0.20.04.0 | | unzip | 6.0-25ubuntu1.1 | | upx | 3.95-2build1 | | wget | 1.20.3-1ubuntu2 | From c00aaa29a4a6828444d74392d8ab09891af1d772 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 3 Nov 2022 09:10:30 +0000 Subject: [PATCH 1563/3485] Updating readme file for ubuntu22 version 20221027.1 (#6501) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2204-Readme.md | 87 ++++++++++++++++--------------- 1 file changed, 45 insertions(+), 42 deletions(-) diff --git a/images/linux/Ubuntu2204-Readme.md b/images/linux/Ubuntu2204-Readme.md index b5f95700ef02..9d2d411ca149 100644 --- a/images/linux/Ubuntu2204-Readme.md +++ b/images/linux/Ubuntu2204-Readme.md @@ -1,14 +1,14 @@ | Announcements | |-| +| [[all OSs] Nodejs 12.x will be removed from the images on November, 14](https://github.com/actions/runner-images/issues/6482) | | [Ubuntu-latest workflows will use Ubuntu-22.04](https://github.com/actions/runner-images/issues/6399) | | [[all OSs] The VCPKG_ROOT variable will be removed from runner images](https://github.com/actions/runner-images/issues/6376) | | [Third party PHP repository will be removed from the Ubuntu 22.04 image](https://github.com/actions/runner-images/issues/6331) | -| [[Ubuntu] homebrew will be removed from PATH variable](https://github.com/actions/runner-images/issues/6283) | | [The Ubuntu 18.04 Actions runner image will begin deprecation on 8/8/22 and will be fully unsupported by 4/1/2023](https://github.com/actions/runner-images/issues/6002) | *** # Ubuntu 22.04.1 LTS - Linux kernel version: 5.15.0-1022-azure -- Image Version: 20221024.1 +- Image Version: 20221027.1 ## Installed Software ### Language and Runtime @@ -17,8 +17,8 @@ - Clang-format 12.0.1, 13.0.1, 14.0.0 - Clang-tidy 12.0.1, 13.0.1, 14.0.0 - Dash 0.5.11+git20210903+057cd650a4ed-3build1 -- GNU C++ 9.4.0, 10.3.0, 11.2.0 -- GNU Fortran 9.4.0, 10.3.0, 11.2.0 +- GNU C++ 9.5.0, 10.4.0, 11.3.0 +- GNU Fortran 9.5.0, 10.4.0, 11.3.0 - Julia 1.8.2 - Kotlin 1.7.20-release-201 - Mono 6.12.0.182 (apt source repository: https://download.mono-project.com/repo/ubuntu stable-focal main) @@ -41,7 +41,7 @@ - Pip3 22.0.2 - Pipx 1.1.0 - RubyGems 3.3.5 -- Vcpkg (build from master \<6118e6b13>) +- Vcpkg (build from master \<48cc0c71e>) - Yarn 1.22.19 ##### Notes: @@ -57,7 +57,6 @@ to accomplish this. | ----------------------- | ---------------------- | | CONDA | /usr/share/miniconda | | VCPKG_INSTALLATION_ROOT | /usr/local/share/vcpkg | -| VCPKG_ROOT | /usr/local/share/vcpkg | ### Project Management - Lerna 6.0.1 @@ -71,13 +70,13 @@ to accomplish this. - Bicep 0.11.1 - Buildah 1.23.1 - CMake 3.24.2 -- CodeQL Action Bundle 2.11.1 +- CodeQL Action Bundle 2.11.2 - Docker Amazon ECR Credential Helper 0.6.0 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.11.2+azure-1 +- Docker Compose v2 2.12.2+azure-1 - Docker-Buildx 0.9.1 -- Docker-Moby Client 20.10.18+azure-2 -- Docker-Moby Server 20.10.18+azure-2 +- Docker-Moby Client 20.10.20+azure-1 +- Docker-Moby Server 20.10.20+azure-1 - Fastlane 2.210.1 - Git 2.38.1 (apt source repository: ppa:git-core/ppa) - Git LFS 3.2.0 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) @@ -85,7 +84,7 @@ to accomplish this. - Haveged 1.9.14 - Heroku 7.65.0 - jq 1.6 -- Kind 0.16.0 +- Kind 0.17.0 - Kubectl 1.25.3 - Kustomize 4.5.7 - Leiningen 2.9.10 @@ -99,7 +98,7 @@ to accomplish this. - Packer 1.8.3 - Parcel 2.7.0 - Podman 3.4.4 -- Pulumi 3.43.1 +- Pulumi 3.44.2 - R 4.2.1 - Skopeo 1.4.1 - Sphinx Open Source Search Server 2.2.11 @@ -110,14 +109,14 @@ to accomplish this. - zstd 1.5.2 (homebrew) ### CLI Tools -- Alibaba Cloud CLI 3.0.132 -- AWS CLI 2.8.5 +- Alibaba Cloud CLI 3.0.134 +- AWS CLI 2.8.6 - AWS CLI Session manager plugin 1.2.398.0 - AWS SAM CLI 1.60.0 - Azure CLI (azure-cli) 2.41.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.25.0 - GitHub CLI 2.18.1 -- Google Cloud SDK 406.0.0 (apt source repository: https://packages.cloud.google.com/apt) +- Google Cloud SDK 407.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 - Netlify CLI 12.0.11 - OpenShift CLI 4.11.9 @@ -134,13 +133,13 @@ to accomplish this. ### GraalVM | Version | Environment variables | | --------- | --------------------- | -| CE 22.2.0 | GRAALVM_11_ROOT | +| CE 22.3.0 | GRAALVM_11_ROOT | ### PHP | Tool | Version | | -------- | ------- | -| PHP | 8.1.11 | -| Composer | 2.4.3 | +| PHP | 8.1.2 | +| Composer | 2.4.4 | | PHPUnit | 8.5.30 | ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. @@ -166,11 +165,11 @@ to accomplish this. - Rustfmt 1.5.1 ### Browsers and Drivers -- Google Chrome 106.0.5249.119 -- ChromeDriver 106.0.5249.61 -- Chromium 106.0.5235.0 -- Microsoft Edge 106.0.1370.52 (apt source repository: https://packages.microsoft.com/repos/edge) -- Microsoft Edge WebDriver 106.0.1370.52 +- Google Chrome 107.0.5304.87 +- ChromeDriver 107.0.5304.62 +- Chromium 107.0.5288.0 +- Microsoft Edge 107.0.1418.24 (apt source repository: https://packages.microsoft.com/repos/edge) +- Microsoft Edge WebDriver 107.0.1418.24 - Selenium server 4.5.0 #### Environment variables @@ -216,7 +215,8 @@ to accomplish this. #### Node.js - 14.20.1 -- 16.17.1 +- 16.18.0 +- 18.12.0 #### PyPy - 3.7.13 [PyPy 7.3.9] @@ -228,6 +228,7 @@ to accomplish this. - 3.8.14 - 3.9.15 - 3.10.8 +- 3.11.0 #### Ruby - 3.1.2 @@ -246,7 +247,7 @@ to accomplish this. | Module | Version | | ---------------- | ------- | | MarkdownPS | 1.9 | -| Microsoft.Graph | 1.13.0 | +| Microsoft.Graph | 1.14.0 | | Pester | 5.3.3 | | PSScriptAnalyzer | 1.21.0 | @@ -291,18 +292,20 @@ to accomplish this. | alpine:3.14 | sha256:1ab24b3b99320975cca71716a7475a65d263d0b6b604d9d14ce08f7a3f67595c | 2022-08-09 | | alpine:3.15 | sha256:69463fdff1f025c908939e86d4714b4d5518776954ca627cbeff4c74bcea5b22 | 2022-08-09 | | alpine:3.16 | sha256:bc41182d7ef5ffc53a40b044e725193bc10142a1243f395ee852a8d9730fc2ad | 2022-08-09 | -| buildpack-deps:bullseye | sha256:b501b75e9014f6bd3b4cc08e098653ba0b2863b7242f49134f974ebabdf2eb37 | 2022-10-05 | -| buildpack-deps:buster | sha256:c6f69876293b14c190e89e612826844f4a6f2cd9500d5a26523979b16daa5220 | 2022-10-05 | -| debian:10 | sha256:604db908f7ce93379b1289c0c7ba73b252002087a3fa64fe904b430083ba5f69 | 2022-10-04 | -| debian:11 | sha256:e538a2f0566efc44db21503277c7312a142f4d0dedc5d2886932b92626104bff | 2022-10-04 | +| buildpack-deps:bullseye | sha256:9f5bbd4a5eb6970c1dc03703f159b2db17a520ec8c5ed76298849e3615c5fe16 | 2022-10-25 | +| buildpack-deps:buster | sha256:b9b638654107a9b7b5b5a301e62d0268dc6469f1508379d999799079a34c00f2 | 2022-10-25 | +| debian:10 | sha256:e83854c9fb469daa7273d73c43a3fe5ae2da77cb40d3d34282a9af09a9db49f9 | 2022-10-25 | +| debian:11 | sha256:bfe6615d017d1eebe19f349669de58cda36c668ef916e618be78071513c690e5 | 2022-10-25 | | moby/buildkit:latest | sha256:46e7907bf9cdced1af7e45f1f07f69cb30560574d85d636a17ce6f97cc4844b4 | 2022-10-18 | -| node:14 | sha256:d0634e5cde35cb312571cd007ae2270295bf2000ec489402325953bcee196ae2 | 2022-10-05 | -| node:14-alpine | sha256:50808db1777e35ca156d06cfd31fa377febe82df6f26b8413a47c12dcbf5e6c5 | 2022-10-06 | -| node:16 | sha256:6d592fdb89fccdeb880d14f30bf139b8a755f33b376f025b70e50ac5547c8ccf | 2022-10-13 | -| node:16-alpine | sha256:2175727cef5cad4020cb77c8c101d56ed41d44fbe9b1157c54f820e3d345eab1 | 2022-10-13 | -| ubuntu:18.04 | sha256:40b84b75884ff39e4cac4bf62cb9678227b1fbf9dbe3f67ef2a6b073aa4bb529 | 2022-10-04 | -| ubuntu:20.04 | sha256:9c2004872a3a9fcec8cc757ad65c042de1dad4da27de4c70739a6e36402213e3 | 2022-10-04 | -| ubuntu:22.04 | sha256:35fb073f9e56eb84041b0745cb714eff0f7b225ea9e024f703cab56aaa5c7720 | 2022-10-04 | +| node:14 | sha256:860647620537bf1afce7bd20f466f53b735945efea280a8a5d1a9e5e18088bc0 | 2022-10-25 | +| node:14-alpine | sha256:b953f75739f5ddce593f8b7cf8542bbe5eb6a2a637cdd855fb7444ad4e296e02 | 2022-10-06 | +| node:16 | sha256:3547c98a330a08fb9dbb8b04ac4430f6d21133cb79f21f6cf8283184f523ff83 | 2022-10-25 | +| node:16-alpine | sha256:f16544bc93cf1a36d213c8e2efecf682e9f4df28429a629a37aaf38ecfc25cf4 | 2022-10-13 | +| node:18 | sha256:cef9966b19672effeafcf1a67b8add742c3e46ca7dd5532efff60820526c2e95 | 2022-10-27 | +| node:18-alpine | sha256:1f09c210a17508d34277971b19541a47a26dc5a641dedc03bd28cff095052996 | 2022-10-27 | +| ubuntu:18.04 | sha256:ca70a834041dd1bf16cc38dfcd24f0888ec4fa431e09f3344f354cf8d1724499 | 2022-10-25 | +| ubuntu:20.04 | sha256:450e066588f42ebe1551f3b1a535034b6aa46cd936fe7f2c6b0d72997ec61dbd | 2022-10-25 | +| ubuntu:22.04 | sha256:7cfe75438fc77c9d7235ae502bf229b15ca86647ac01c844b272b56326d56184 | 2022-10-25 | ### Installed apt packages | Name | Version | @@ -311,14 +314,14 @@ to accomplish this. | aria2 | 1.36.0-1 | | autoconf | 2.71-2 | | automake | 1:1.16.5-1.3 | -| binutils | 2.38-3ubuntu1 | +| binutils | 2.38-4ubuntu2 | | bison | 2:3.8.2+dfsg-1build1 | | brotli | 1.0.9-2build6 | | build-essential | 12.9ubuntu3 | | bzip2 | 1.0.8-5build1 | | coreutils | 8.32-4.1ubuntu1 | -| curl | 7.81.0-1ubuntu1.4 | -| dbus | 1.12.20-2ubuntu4 | +| curl | 7.81.0-1ubuntu1.6 | +| dbus | 1.12.20-2ubuntu4.1 | | dnsutils | 1:9.18.1-1ubuntu1.2 | | dpkg | 1.21.1ubuntu2.1 | | fakeroot | 1.28-1ubuntu1 | @@ -335,7 +338,7 @@ to accomplish this. | lib32z1 | 1:1.2.11.dfsg-2ubuntu9.2 | | libc++-dev | 1:14.0-55\~exp2 | | libc++abi-dev | 1:14.0-55\~exp2 | -| libcurl4 | 7.81.0-1ubuntu1.4 | +| libcurl4 | 7.81.0-1ubuntu1.6 | | libgbm-dev | 22.0.5-0ubuntu0.1 | | libgconf-2-4 | 3.2.6-7ubuntu2 | | libgsl-dev | 2.7.1+dfsg-3 | @@ -380,12 +383,12 @@ to accomplish this. | texinfo | 6.8-4build1 | | time | 1.9-0.1build2 | | tk | 8.6.11+1build2 | -| tzdata | 2022c-0ubuntu0.22.04.0 | +| tzdata | 2022e-0ubuntu0.22.04.0 | | unzip | 6.0-26ubuntu3.1 | | upx | 3.96-3 | | wget | 1.21.2-2ubuntu1 | | xorriso | 1.5.4-2 | -| xvfb | 2:21.1.3-2ubuntu2.1 | +| xvfb | 2:21.1.3-2ubuntu2.2 | | xz-utils | 5.2.5-2ubuntu1 | | zip | 3.0-12build2 | | zsync | 0.6.2-3ubuntu1 | From 1f84dd7159610d519a3bdc2beff2352b41a9355f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 3 Nov 2022 11:56:18 +0000 Subject: [PATCH 1564/3485] Updating readme file for macOS-11 version 20221028.1 (#6499) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-11-Readme.md | 56 +++++++++++++++++---------------- 1 file changed, 29 insertions(+), 27 deletions(-) diff --git a/images/macos/macos-11-Readme.md b/images/macos/macos-11-Readme.md index a614ccbb73ee..598697baede6 100644 --- a/images/macos/macos-11-Readme.md +++ b/images/macos/macos-11-Readme.md @@ -1,13 +1,14 @@ | Announcements | |-| +| [[all OSs] Nodejs 12.x will be removed from the images on November, 14](https://github.com/actions/runner-images/issues/6482) | | [macOS-latest workflows will use macOS-12](https://github.com/actions/runner-images/issues/6384) | | [[all OSs] The VCPKG_ROOT variable will be removed from runner images](https://github.com/actions/runner-images/issues/6376) | | [The macOS 10.15 Actions runner image will begin deprecation on 5/31/22 and will be fully unsupported by 12/1/22 for GitHub and ADO](https://github.com/actions/runner-images/issues/5583) | *** # macOS 11.7 info -- System Version: macOS 11.7 (20G817) +- System Version: macOS 11.7.1 (20G918) - Kernel Version: Darwin 20.6.0 -- Image Version: 20221023.1 +- Image Version: 20221028.1 ## Installed Software ### Language and Runtime @@ -27,11 +28,11 @@ - MSBuild 16.10.1.51301 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) - Node.js v16.18.0 - NVM 0.39.2 -- NVM - Cached node versions: v12.22.12 v14.20.1 v16.18.0 +- NVM - Cached node versions: v12.22.12 v14.20.1 v16.18.0 v18.12.0 - Perl 5.36.0 - PHP 8.1.11 - Python 2.7.18 -- Python 3.10.8 +- Python 3.11.0 - R 4.2.1 - Ruby 2.7.6p219 @@ -39,16 +40,16 @@ - Bundler version 2.3.24 - Carthage 0.38.0 - CocoaPods 1.11.3 -- Composer 2.4.3 -- Homebrew 3.6.6 +- Composer 2.4.4 +- Homebrew 3.6.7 - Miniconda 4.12.0 - NPM 8.19.2 - NuGet 6.3.1.1 - Pip 20.3.4 (python 2.7) -- Pip 22.2.2 (python 3.10) +- Pip 22.3 (python 3.11) - Pipx 1.1.0 - RubyGems 3.3.24 -- Vcpkg 2022 (build from master \<934a99dc1>) +- Vcpkg 2022 (build from master \<05fda317e>) - Yarn 1.22.19 #### Environment variables @@ -56,7 +57,6 @@ | ----------------------- | ---------------------- | | CONDA | /usr/local/miniconda | | VCPKG_INSTALLATION_ROOT | /usr/local/share/vcpkg | -| VCPKG_ROOT | /usr/local/share/vcpkg | ### Project Management - Apache Ant(TM) 1.10.12 @@ -71,7 +71,7 @@ - bazel 5.3.2 - bazelisk 1.14.0 - bsdtar 3.3.2 - available by 'tar' alias -- Curl 7.85.0 +- Curl 7.86.0 - Git 2.38.1 - Git LFS: 3.2.0 - GitHub CLI: 2.18.1 @@ -96,17 +96,17 @@ - zstd 1.5.2 ### Tools -- Aliyun CLI 3.0.132 +- Aliyun CLI 3.0.134 - App Center CLI 2.11.0 -- AWS CLI 2.8.5 -- AWS SAM CLI 1.60.0 +- AWS CLI 2.8.7 +- AWS SAM CLI 1.61.0 - AWS Session Manager CLI 1.2.398.0 - Azure CLI (azure-devops) 0.25.0 - Azure CLI 2.41.0 - Bicep CLI 0.11.1 - Cabal 3.6.2.0 - Cmake 3.24.2 -- CodeQL Action Bundle 2.11.1 +- CodeQL Action Bundle 2.11.2 - Colima 0.4.6 - Fastlane 2.210.1 - GHC 9.4.2 @@ -122,20 +122,20 @@ - yamllint 1.28.0 ### Browsers -- Safari 16.0 (16614.1.25.9.10) -- SafariDriver 16.0 (16614.1.25.9.10) -- Google Chrome 106.0.5249.119 -- ChromeDriver 106.0.5249.61 -- Microsoft Edge 106.0.1370.52 -- Microsoft Edge WebDriver 106.0.1370.52 -- Mozilla Firefox 106.0.1 +- Safari 16.1 (16614.2.9.1.13) +- SafariDriver 16.1 (16614.2.9.1.13) +- Google Chrome 107.0.5304.87 +- ChromeDriver 107.0.5304.62 +- Microsoft Edge 107.0.1418.24 +- Microsoft Edge WebDriver 107.0.1418.23 +- Mozilla Firefox 106.0.2 - geckodriver 0.32.0 - Selenium server 4.5.0 #### Environment variables | Name | Value | | --------------- | ---------------------------------------------- | -| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/106.0.5249.61 | +| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/107.0.5304.62 | | EDGEWEBDRIVER | /usr/local/share/edge_driver | | GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | @@ -143,13 +143,13 @@ | Version | Vendor | Environment Variable | | ------------------- | --------------- | -------------------- | | 8.0.345+1 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | -| 11.0.16+101 | Eclipse Temurin | JAVA_HOME_11_X64 | -| 17.0.4+101 | Eclipse Temurin | JAVA_HOME_17_X64 | +| 11.0.17+8 | Eclipse Temurin | JAVA_HOME_11_X64 | +| 17.0.5+8 | Eclipse Temurin | JAVA_HOME_17_X64 | ### GraalVM | Version | Environment variables | | --------- | --------------------- | -| CE 22.2.0 | GRAALVM_11_ROOT | +| CE 22.3.0 | GRAALVM_11_ROOT | ### Cached Tools #### Ruby @@ -165,6 +165,7 @@ - 3.8.14 - 3.9.14 - 3.10.8 +- 3.11.0 #### PyPy - 2.7.18 [PyPy 7.3.9] @@ -175,7 +176,8 @@ #### Node.js - 12.22.12 - 14.20.1 -- 16.17.1 +- 16.18.0 +- 18.12.0 #### Go | Version | Architecture | Environment Variable | @@ -336,7 +338,7 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" | Package Name | Version | | -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------ | | Android Command Line Tools | 7.0 | -| Android Emulator | 31.3.12 | +| Android Emulator | 31.3.13 | | Android SDK Build-tools | 33.0.0<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | | Android SDK Platforms | android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | | Android SDK Platform-Tools | 33.0.3 | From 8bdf5c36087ae1104905787ce0413d2eb355c1ab Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 3 Nov 2022 15:29:23 +0000 Subject: [PATCH 1565/3485] Updating readme file for win19 version 20221027.1 (#6492) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2019-Readme.md | 46 +++++++++++++++++--------------- 1 file changed, 24 insertions(+), 22 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index e0312038aefc..a9c650ff007b 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -1,10 +1,11 @@ | Announcements | |-| +| [[all OSs] Nodejs 12.x will be removed from the images on November, 14](https://github.com/actions/runner-images/issues/6482) | | [[all OSs] The VCPKG_ROOT variable will be removed from runner images](https://github.com/actions/runner-images/issues/6376) | *** # Microsoft Windows Server 2019 Datacenter - OS Version: 10.0.17763 Build 3534 -- Image Version: 20221024.1 +- Image Version: 20221027.1 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -18,13 +19,13 @@ - LLVM 14.0.6 - Node 16.18.0 - Perl 5.32.1 -- PHP 8.1.11 +- PHP 8.1.12 - Python 3.7.9 - Ruby 2.5.9p229 ### Package Management - Chocolatey 1.2.0 -- Composer 2.4.3 +- Composer 2.4.4 - Helm 3.10.0 - Miniconda 4.12.0 (pre-installed on the image but not added to PATH) - NPM 8.19.2 @@ -32,14 +33,13 @@ - pip 22.3 (python 3.7) - Pipx 1.1.0 - RubyGems 2.7.6.3 -- Vcpkg (build from master \<7ad236f60>) +- Vcpkg (build from master \<48cc0c71e>) - Yarn 1.22.19 #### Environment variables | Name | Value | | ----------------------- | ------------ | | VCPKG_INSTALLATION_ROOT | C:\vcpkg | -| VCPKG_ROOT | C:\vcpkg | | CONDA | C:\Miniconda | ### Project Management @@ -57,19 +57,19 @@ - Bicep 0.11.1 - Cabal 3.8.1.0 - CMake 3.24.2 -- CodeQL Action Bundle 2.11.1 -- Docker 20.10.20 +- CodeQL Action Bundle 2.11.2 +- Docker 20.10.21 - Docker Compose v1 1.29.2 - Docker Compose v2 2.12.2 - Docker-wincred 0.7.0 - ghc 9.4.2 - Git 2.38.1.windows.1 - Git LFS 3.2.0 -- Google Cloud SDK 406.0.0 +- Google Cloud SDK 407.0.0 - ImageMagick 7.1.0-51 - InnoSetup 6.2.1 - jq 1.6 -- Kind 0.16.0 +- Kind 0.17.0 - Kubectl 1.25.3 - Mercurial 5.0 - Mingw-w64 8.1.0 @@ -78,7 +78,7 @@ - OpenSSL 1.1.1 - Packer 1.8.2 - Parcel 2.7.0 -- Pulumi v3.43.1 +- Pulumi v3.44.2 - R 4.2.1 - Service Fabric SDK 9.0.1028.9590 - Stack 2.9.1 @@ -91,9 +91,9 @@ - zstd 1.5.2 ### CLI Tools -- Alibaba Cloud CLI 3.0.132 -- AWS CLI 2.8.5 -- AWS SAM CLI 1.60.0 +- Alibaba Cloud CLI 3.0.134 +- AWS CLI 2.8.6 +- AWS SAM CLI 1.61.0 - AWS Session Manager CLI 1.2.398.0 - Azure CLI 2.41.0 - Azure DevOps CLI extension 0.25.0 @@ -116,11 +116,11 @@ - Rustfmt 1.5.1 ### Browsers and webdrivers -- Google Chrome 106.0.5249.119 -- Chrome Driver 106.0.5249.61 +- Google Chrome 107.0.5304.88 +- Chrome Driver 107.0.5304.62 - Microsoft Edge 106.0.1370.52 - Microsoft Edge Driver 106.0.1370.52 -- Mozilla Firefox 106.0.1 +- Mozilla Firefox 106.0.2 - Gecko Driver 0.32.0 - IE Driver 3.150.1.1 - Selenium server 4.5.0 @@ -137,9 +137,9 @@ | Version | Vendor | Environment Variable | | ------------------- | --------------- | -------------------- | | 8.0.345+1 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | -| 11.0.16+101 | Eclipse Temurin | JAVA_HOME_11_X64 | +| 11.0.17+8 | Eclipse Temurin | JAVA_HOME_11_X64 | | 13.0.2+8.1 | Adopt OpenJDK | JAVA_HOME_13_X64 | -| 17.0.4+101 | Eclipse Temurin | JAVA_HOME_17_X64 | +| 17.0.5+8 | Eclipse Temurin | JAVA_HOME_17_X64 | ### Shells | Name | Target | @@ -174,7 +174,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | ------- | ------------ | | 12.22.12 | x64 | | 14.20.1 | x64 | -| 16.17.1 | x64 | +| 16.18.0 | x64 | +| 18.12.0 | x64 | #### Python | Version | Architecture | @@ -185,6 +186,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | 3.8.10 | x64, x86 | | 3.9.13 | x64, x86 | | 3.10.8 | x64, x86 | +| 3.11.0 | x64, x86 | #### Ruby | Version | Architecture | @@ -475,7 +477,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | VisualStudioClient.MicrosoftVisualStudio2017InstallerProjects | 1.0.2 | | Windows Driver Kit | 10.1.22000.1 | | Windows Driver Kit Visual Studio Extension | 10.0.21381.0 | -| Windows Software Development Kit | 10.1.22621.1 | +| Windows Software Development Kit | 10.1.22621.755 | | WixToolset.WixToolsetVisualStudio2019Extension | 1.0.0.18 | #### Microsoft Visual C++: @@ -549,10 +551,10 @@ All other versions are saved but not installed. #### Powershell Modules | Module | Version | | ------------------ | ---------------- | -| AWSPowerShell | 4.1.191 | +| AWSPowerShell | 4.1.194 | | DockerMsftProvider | 1.0.0.8 | | MarkdownPS | 1.9 | -| Microsoft.Graph | 1.13.0 | +| Microsoft.Graph | 1.14.0 | | Pester | 3.4.0<br>5.3.3 | | PowerShellGet | 1.0.0.1<br>2.2.5 | | PSScriptAnalyzer | 1.21.0 | From e4915514bd26120c851473af4dda0f896a53bab0 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 3 Nov 2022 15:44:56 +0000 Subject: [PATCH 1566/3485] Updating readme file for win22 version 20221027.1 (#6491) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2022-Readme.md | 42 +++++++++++++++++--------------- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/images/win/Windows2022-Readme.md b/images/win/Windows2022-Readme.md index a312b441c8fb..1f28a156531c 100644 --- a/images/win/Windows2022-Readme.md +++ b/images/win/Windows2022-Readme.md @@ -1,10 +1,11 @@ | Announcements | |-| +| [[all OSs] Nodejs 12.x will be removed from the images on November, 14](https://github.com/actions/runner-images/issues/6482) | | [[all OSs] The VCPKG_ROOT variable will be removed from runner images](https://github.com/actions/runner-images/issues/6376) | *** # Microsoft Windows Server 2022 Datacenter - OS Version: 10.0.20348 Build 1129 -- Image Version: 20221024.1 +- Image Version: 20221027.1 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -18,13 +19,13 @@ - LLVM 14.0.6 - Node 16.18.0 - Perl 5.32.1 -- PHP 8.1.11 +- PHP 8.1.12 - Python 3.9.13 - Ruby 3.0.4p208 ### Package Management - Chocolatey 1.2.0 -- Composer 2.4.3 +- Composer 2.4.4 - Helm 3.10.0 - Miniconda 4.12.0 (pre-installed on the image but not added to PATH) - NPM 8.19.2 @@ -32,14 +33,13 @@ - pip 22.3 (python 3.9) - Pipx 1.1.0 - RubyGems 3.2.33 -- Vcpkg (build from master \<7ad236f60>) +- Vcpkg (build from master \<48cc0c71e>) - Yarn 1.22.19 #### Environment variables | Name | Value | | ----------------------- | -------- | | VCPKG_INSTALLATION_ROOT | C:\vcpkg | -| VCPKG_ROOT | C:\vcpkg | ### Project Management - Ant 1.10.12 @@ -56,8 +56,8 @@ - Bicep 0.11.1 - Cabal 3.8.1.0 - CMake 3.24.2 -- CodeQL Action Bundle 2.11.1 -- Docker 20.10.20 +- CodeQL Action Bundle 2.11.2 +- Docker 20.10.21 - Docker Compose v1 1.29.2 - Docker Compose v2 2.12.2 - Docker-wincred 0.7.0 @@ -67,7 +67,7 @@ - ImageMagick 7.1.0-51 - InnoSetup 6.2.1 - jq 1.6 -- Kind 0.16.0 +- Kind 0.17.0 - Kubectl 1.25.3 - Mercurial 5.0 - Mingw-w64 11.2.0 @@ -75,7 +75,7 @@ - NSIS v3.08 - OpenSSL 1.1.1 - Packer 1.8.2 -- Pulumi v3.43.1 +- Pulumi v3.44.2 - R 4.2.1 - Service Fabric SDK 9.0.1028.9590 - Stack 2.9.1 @@ -88,9 +88,9 @@ - zstd 1.5.2 ### CLI Tools -- Alibaba Cloud CLI 3.0.132 -- AWS CLI 2.8.5 -- AWS SAM CLI 1.60.0 +- Alibaba Cloud CLI 3.0.134 +- AWS CLI 2.8.6 +- AWS SAM CLI 1.61.0 - AWS Session Manager CLI 1.2.398.0 - Azure CLI 2.41.0 - Azure DevOps CLI extension 0.25.0 @@ -112,11 +112,11 @@ - Rustfmt 1.5.1 ### Browsers and webdrivers -- Google Chrome 106.0.5249.119 -- Chrome Driver 106.0.5249.61 +- Google Chrome 107.0.5304.88 +- Chrome Driver 107.0.5304.62 - Microsoft Edge 106.0.1370.52 - Microsoft Edge Driver 106.0.1370.52 -- Mozilla Firefox 106.0.1 +- Mozilla Firefox 106.0.2 - Gecko Driver 0.32.0 - IE Driver 3.150.1.1 - Selenium server 4.5.0 @@ -133,8 +133,8 @@ | Version | Vendor | Environment Variable | | ------------------- | --------------- | -------------------- | | 8.0.345+1 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | -| 11.0.16+101 | Eclipse Temurin | JAVA_HOME_11_X64 | -| 17.0.4+101 | Eclipse Temurin | JAVA_HOME_17_X64 | +| 11.0.17+8 | Eclipse Temurin | JAVA_HOME_11_X64 | +| 17.0.5+8 | Eclipse Temurin | JAVA_HOME_17_X64 | ### Shells | Name | Target | @@ -166,7 +166,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | ------- | ------------ | | 12.22.12 | x64 | | 14.20.1 | x64 | -| 16.17.1 | x64 | +| 16.18.0 | x64 | +| 18.12.0 | x64 | #### Python | Version | Architecture | @@ -175,6 +176,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | 3.8.10 | x64, x86 | | 3.9.13 (Default) | x64, x86 | | 3.10.8 | x64, x86 | +| 3.11.0 | x64, x86 | #### Ruby | Version | Architecture | @@ -571,10 +573,10 @@ All other versions are saved but not installed. #### Powershell Modules | Module | Version | | ------------------ | ---------------- | -| AWSPowerShell | 4.1.191 | +| AWSPowerShell | 4.1.194 | | DockerMsftProvider | 1.0.0.8 | | MarkdownPS | 1.9 | -| Microsoft.Graph | 1.13.0 | +| Microsoft.Graph | 1.14.0 | | Pester | 3.4.0<br>5.3.3 | | PowerShellGet | 1.0.0.1<br>2.2.5 | | PSScriptAnalyzer | 1.21.0 | From 042094639142bab5548109945dc260e5ec002ad0 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Thu, 3 Nov 2022 18:50:25 +0300 Subject: [PATCH 1567/3485] [Ubuntu] Add gcc-12 to 22.04 (#6511) --- images/linux/toolsets/toolset-2204.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/images/linux/toolsets/toolset-2204.json b/images/linux/toolsets/toolset-2204.json index 58f21d58c0c9..be7382a81d87 100644 --- a/images/linux/toolsets/toolset-2204.json +++ b/images/linux/toolsets/toolset-2204.json @@ -262,7 +262,8 @@ "gcc": { "versions": [ "g++-9", - "g++-10" + "g++-10", + "g++-12" ] }, "gfortran": { From f6632ff53b24db9705c5b15bf90dbf05cc3fe295 Mon Sep 17 00:00:00 2001 From: Igor Boskovic <igorboskovic3@github.com> Date: Tue, 8 Nov 2022 12:30:58 +0100 Subject: [PATCH 1568/3485] Add Python to $PATH (#6518) --- images/macos/provision/configuration/environment/bashrc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/images/macos/provision/configuration/environment/bashrc b/images/macos/provision/configuration/environment/bashrc index 95cdffb10f82..2282126099dc 100644 --- a/images/macos/provision/configuration/environment/bashrc +++ b/images/macos/provision/configuration/environment/bashrc @@ -14,6 +14,7 @@ export AGENT_TOOLSDIRECTORY=$HOME/hostedtoolcache export RUNNER_TOOL_CACHE=$HOME/hostedtoolcache export PATH=/Library/Frameworks/Mono.framework/Versions/Current/Commands:$PATH +export PATH=/Library/Frameworks/Python.framework/Versions/Current/bin:$PATH export PATH=$ANDROID_HOME/tools:$ANDROID_HOME/platform-tools:$PATH export PATH=/usr/local/bin:/usr/local/sbin:~/bin:~/.yarn/bin:$PATH export PATH="/usr/local/opt/curl/bin:$PATH" @@ -28,4 +29,4 @@ export HOMEBREW_CLEANUP_PERIODIC_FULL_DAYS=3650 export HOMEBREW_CASK_OPTS="--no-quarantine" export BOOTSTRAP_HASKELL_NONINTERACTIVE=1 -export BOOTSTRAP_HASKELL_INSTALL_NO_STACK_HOOK=1 +export BOOTSTRAP_HASKELL_INSTALL_NO_STACK_HOOK=1 \ No newline at end of file From 0cb66802c63caae115466b1150e8e3dfceebae7c Mon Sep 17 00:00:00 2001 From: Alexis Saettler <alexis.saettler@wolterskluwer.com> Date: Wed, 9 Nov 2022 10:21:18 +0100 Subject: [PATCH 1569/3485] [Windows] Clean install_user Temp directory (#6529) --- images/win/scripts/Installers/Finalize-VM.ps1 | 1 + images/win/windows2019.json | 3 +++ images/win/windows2022.json | 3 +++ 3 files changed, 7 insertions(+) diff --git a/images/win/scripts/Installers/Finalize-VM.ps1 b/images/win/scripts/Installers/Finalize-VM.ps1 index be5200b9b3bf..21f5f88117b9 100644 --- a/images/win/scripts/Installers/Finalize-VM.ps1 +++ b/images/win/scripts/Installers/Finalize-VM.ps1 @@ -19,6 +19,7 @@ Write-Host "Clean up various directories" "$env:SystemRoot\logs", "$env:SystemRoot\winsxs\manifestcache", "$env:SystemRoot\Temp", + "$env:SystemDrive\Users\$env:INSTALL_USER\AppData\Local\Temp", "$env:TEMP" ) | ForEach-Object { if (Test-Path $_) { diff --git a/images/win/windows2019.json b/images/win/windows2019.json index f2a50f970c6f..c66c0a214dce 100644 --- a/images/win/windows2019.json +++ b/images/win/windows2019.json @@ -314,6 +314,9 @@ "scripts": [ "{{ template_dir }}/scripts/Installers/Run-NGen.ps1", "{{ template_dir }}/scripts/Installers/Finalize-VM.ps1" + ], + "environment_vars": [ + "INSTALL_USER={{user `install_user`}}" ] }, { diff --git a/images/win/windows2022.json b/images/win/windows2022.json index 122882a14697..ea4889dc20bf 100644 --- a/images/win/windows2022.json +++ b/images/win/windows2022.json @@ -318,6 +318,9 @@ "scripts": [ "{{ template_dir }}/scripts/Installers/Run-NGen.ps1", "{{ template_dir }}/scripts/Installers/Finalize-VM.ps1" + ], + "environment_vars": [ + "INSTALL_USER={{user `install_user`}}" ] }, { From 3a8564acb18ccc15ca5c4f7accf9de3b3b0bc96a Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Wed, 9 Nov 2022 23:16:45 +0300 Subject: [PATCH 1570/3485] [Ubuntu] Remove Node 12 from toolcache (#6535) --- images/linux/toolsets/toolset-1804.json | 3 --- images/linux/toolsets/toolset-2004.json | 3 --- 2 files changed, 6 deletions(-) diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index 65a5705a6056..e7be1221b49a 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -32,7 +32,6 @@ "platform" : "linux", "arch": "x64", "versions": [ - "12.*", "14.*", "16.*", "18.*" @@ -241,11 +240,9 @@ "debian:10", "debian:11", "moby/buildkit:latest", - "node:12", "node:14", "node:16", "node:18", - "node:12-alpine", "node:14-alpine", "node:16-alpine", "node:18-alpine", diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index ccd56b4a49b0..fbcf53335b26 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -34,7 +34,6 @@ "platform" : "linux", "arch": "x64", "versions": [ - "12.*", "14.*", "16.*", "18.*" @@ -241,11 +240,9 @@ "debian:10", "debian:11", "moby/buildkit:latest", - "node:12", "node:14", "node:16", "node:18", - "node:12-alpine", "node:14-alpine", "node:16-alpine", "node:18-alpine", From 8f8f6bb5e1aa0672fb747b44ab940cb9fe8265d0 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Thu, 10 Nov 2022 13:32:44 +0100 Subject: [PATCH 1571/3485] Remove Azure.Storage.AzCopy component (#6540) --- images/win/toolsets/toolset-2019.json | 1 - 1 file changed, 1 deletion(-) diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index 761603ceeba2..2775080ba8cf 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -301,7 +301,6 @@ "Microsoft.VisualStudio.Component.AspNet45", "Microsoft.VisualStudio.Component.Azure.Kubernetes.Tools", "Microsoft.VisualStudio.Component.Azure.ServiceFabric.Tools", - "Microsoft.VisualStudio.Component.Azure.Storage.AzCopy", "Microsoft.VisualStudio.Component.Debugger.JustInTime", "Microsoft.VisualStudio.Component.DslTools", "Microsoft.VisualStudio.Component.EntityFramework", From dbb755833ad71163f36a00ff137a882b56b0ff9e Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Thu, 10 Nov 2022 13:44:35 +0100 Subject: [PATCH 1572/3485] [Windows] Remove VS 2022 ARM components (#6542) --- images/win/toolsets/toolset-2022.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index e4ec9ba16ac9..74bdb42787a1 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -224,12 +224,8 @@ "Microsoft.VisualStudio.Component.VC.MFC.ARM.Spectre", "Microsoft.VisualStudio.Component.VC.ATL.ARM64", "Microsoft.VisualStudio.Component.VC.ATL.ARM64.Spectre", - "Microsoft.VisualStudio.Component.VC.ATL.ARM64EC", - "Microsoft.VisualStudio.Component.VC.ATL.ARM64EC.Spectre", "Microsoft.VisualStudio.Component.VC.MFC.ARM64", "Microsoft.VisualStudio.Component.VC.MFC.ARM64.Spectre", - "Microsoft.VisualStudio.Component.VC.MFC.ARM64EC", - "Microsoft.VisualStudio.Component.VC.MFC.ARM64EC.Spectre", "Microsoft.VisualStudio.Component.VC.Modules.x86.x64", "Microsoft.VisualStudio.Component.VC.Tools.ARM64", "Microsoft.VisualStudio.Component.VC.Tools.ARM64EC", From 1c9ba78db05ed61e11866b5c208f3b2f30b088b2 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Thu, 10 Nov 2022 18:21:41 +0100 Subject: [PATCH 1573/3485] Revert "Tight 20348.1129.221007 version" (#6545) This reverts commit b284ec81a5f9eaffdc13b585e8d0ffed7b6d62ea. --- images/win/windows2022.json | 1 - 1 file changed, 1 deletion(-) diff --git a/images/win/windows2022.json b/images/win/windows2022.json index ea4889dc20bf..1ee985842416 100644 --- a/images/win/windows2022.json +++ b/images/win/windows2022.json @@ -59,7 +59,6 @@ "image_publisher": "MicrosoftWindowsServer", "image_offer": "WindowsServer", "image_sku": "2022-Datacenter", - "image_version": "20348.1129.221007", "communicator": "winrm", "winrm_use_ssl": "true", "winrm_insecure": "true", From ed945f347e0e22671f63ab5e37baac4c2d147baf Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Thu, 10 Nov 2022 21:02:03 +0300 Subject: [PATCH 1574/3485] [Windows] Remove Node 12 from toolcache (#6536) --- images/win/toolsets/toolset-2019.json | 1 - images/win/toolsets/toolset-2022.json | 1 - 2 files changed, 2 deletions(-) diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index 2775080ba8cf..25a3bccb7fe1 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -63,7 +63,6 @@ "arch": "x64", "platform" : "win32", "versions": [ - "12.*", "14.*", "16.*", "18.*" diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index 74bdb42787a1..06aa96db0799 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -55,7 +55,6 @@ "arch": "x64", "platform" : "win32", "versions": [ - "12.*", "14.*", "16.*", "18.*" From cdd6e1d7246efd5bfce166f77c1fd45ed73f7e88 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Thu, 10 Nov 2022 20:13:10 +0100 Subject: [PATCH 1575/3485] Remove \ escape (#6546) --- images/macos/tests/System.Tests.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/macos/tests/System.Tests.ps1 b/images/macos/tests/System.Tests.ps1 index 50fa16f8d5f5..f5493b1d2493 100644 --- a/images/macos/tests/System.Tests.ps1 +++ b/images/macos/tests/System.Tests.ps1 @@ -49,7 +49,7 @@ Describe "Screen Resolution" { Describe "Open windows" { It "Opened windows not found" { - $cmd = "osascript -e 'tell application \""System Events\"" to get every window of (every process whose class of windows contains window)'" + $cmd = "osascript -e 'tell application ""System Events"" to get every window of (every process whose class of windows contains window)'" $openWindows = bash -c $cmd $openWindows.Split(",").Trim() | Where-Object { $_ -notmatch "NotificationCenter" } | Should -BeNullOrEmpty } From efef8c4895adeb91e44dbe4b57415b7856b28f63 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Fri, 11 Nov 2022 01:00:42 +0100 Subject: [PATCH 1576/3485] [macOS] Software Updates 2022 Week 46 (#6541) --- images/macos/toolsets/toolset-12.json | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index d1d180a18091..0ca6f9e3f5a6 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -27,10 +27,17 @@ "8.12.0.2", "8.10.0.5", "8.8.0.3", "8.6.0.3", "8.4.0.0", "8.2.0.17", "7.14.0.27" ], "android-versions": [ - "13.0.0.0", "12.3.3.3", "12.2.8.3", "12.1.0.2", "12.0.0.3", "11.3.0.4" + "13.1.0.1", "13.0.0.0", "12.3.3.3", "12.2.8.3", "12.1.0.2", "12.0.0.3", "11.3.0.4" ], - "bundle-default": "6_12_20", + "bundle-default": "6_12_21", "bundles": [ + { + "symlink": "6_12_21", + "mono":"6.12", + "ios": "16.0", + "mac": "8.12", + "android": "13.1" + }, { "symlink": "6_12_20", "mono":"6.12", From 1dbd1651ad7798858d31bc3e2a3f196e06b2a196 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Fri, 11 Nov 2022 01:06:18 +0100 Subject: [PATCH 1577/3485] Revert "Remove Azure.Storage.AzCopy component (#6540)" (#6548) This reverts commit 8f8f6bb5e1aa0672fb747b44ab940cb9fe8265d0. --- images/win/toolsets/toolset-2019.json | 1 + 1 file changed, 1 insertion(+) diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index 25a3bccb7fe1..62b08f27cb47 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -300,6 +300,7 @@ "Microsoft.VisualStudio.Component.AspNet45", "Microsoft.VisualStudio.Component.Azure.Kubernetes.Tools", "Microsoft.VisualStudio.Component.Azure.ServiceFabric.Tools", + "Microsoft.VisualStudio.Component.Azure.Storage.AzCopy", "Microsoft.VisualStudio.Component.Debugger.JustInTime", "Microsoft.VisualStudio.Component.DslTools", "Microsoft.VisualStudio.Component.EntityFramework", From b4ef4c2dc89f7084ab9549acb202b60839a97ebe Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Fri, 11 Nov 2022 14:10:38 +0100 Subject: [PATCH 1578/3485] [Ubuntu] Add .NET 7 (#6551) --- images/linux/toolsets/toolset-2004.json | 6 ++++-- images/linux/toolsets/toolset-2204.json | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index fbcf53335b26..ac6ec86fec4f 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -265,12 +265,14 @@ "aptPackages": [ "dotnet-sdk-3.1", "dotnet-sdk-5.0", - "dotnet-sdk-6.0" + "dotnet-sdk-6.0", + "dotnet-sdk-7.0" ], "versions": [ "3.1", "5.0", - "6.0" + "6.0", + "7.0" ], "tools": [ { "name": "nbgv", "test": "nbgv --version", "getversion" : "nbgv --version" } diff --git a/images/linux/toolsets/toolset-2204.json b/images/linux/toolsets/toolset-2204.json index be7382a81d87..56d10d2d3554 100644 --- a/images/linux/toolsets/toolset-2204.json +++ b/images/linux/toolsets/toolset-2204.json @@ -242,10 +242,12 @@ ], "dotnet": { "aptPackages": [ - "dotnet-sdk-6.0" + "dotnet-sdk-6.0", + "dotnet-sdk-7.0" ], "versions": [ - "6.0" + "6.0", + "7.0" ], "tools": [ { "name": "nbgv", "test": "nbgv --version", "getversion" : "nbgv --version" } From 89b1d058fb9b3480dbbb97143b4b81353d8cf198 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Fri, 11 Nov 2022 16:27:54 +0100 Subject: [PATCH 1579/3485] Fix Google CloudSDK version output (#6550) --- images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 index 30c5e495cea8..f48041bf3cba 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 @@ -258,7 +258,7 @@ function Get-StackVersion { } function Get-GoogleCloudSDKVersion { - (gcloud --version) -match "Google Cloud SDK" + (cmd /c "gcloud --version") -match "Google Cloud SDK" } function Get-ServiceFabricSDKVersion { From 6cb89562754719a285d2cf8e6b903b869a0a817a Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Fri, 11 Nov 2022 20:04:10 +0100 Subject: [PATCH 1580/3485] [macOS] Add .NET 7 (#6552) --- images/macos/toolsets/toolset-11.json | 3 ++- images/macos/toolsets/toolset-12.json | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index 423845743f59..4dd97f5e1719 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -311,7 +311,8 @@ "versions": [ "3.1", "5.0", - "6.0" + "6.0", + "7.0" ] }, "ruby": { diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index 0ca6f9e3f5a6..24cb7a6ff6cd 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -273,7 +273,8 @@ "versions": [ "3.1", "5.0", - "6.0" + "6.0", + "7.0" ] }, "ruby": { From bb5b6307df028c9272c797b1a1de231ae0d6af5e Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Fri, 11 Nov 2022 22:05:25 +0100 Subject: [PATCH 1581/3485] [macOS] remove node12 and sync nvm18 (#6553) --- images/macos/toolsets/toolset-10.15.json | 2 -- images/macos/toolsets/toolset-11.json | 2 -- images/macos/toolsets/toolset-12.json | 5 ++--- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index 13cd3d0d1ffd..9fc65dcc7b22 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -277,7 +277,6 @@ "platform" : "darwin", "arch": "x64", "versions": [ - "12.*", "14.*", "16.*", "18.*" @@ -337,7 +336,6 @@ "node": { "default": "16", "nvm_versions": [ - "12", "14", "16", "18" diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index 4dd97f5e1719..bdd6d8e294f5 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -270,7 +270,6 @@ "platform" : "darwin", "arch": "x64", "versions": [ - "12.*", "14.*", "16.*", "18.*" @@ -333,7 +332,6 @@ "node": { "default": "16", "nvm_versions": [ - "12", "14", "16", "18" diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index 24cb7a6ff6cd..b1f1e7cdf0c1 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -235,7 +235,6 @@ "platform" : "darwin", "arch": "x64", "versions": [ - "12.*", "14.*", "16.*", "18.*" @@ -294,9 +293,9 @@ "node": { "default": "16", "nvm_versions": [ - "12", "14", - "16" + "16", + "18" ] }, "llvm": { From 3fbd7f61b6b91fe66361d95a28dde9d389e13f60 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Mon, 14 Nov 2022 10:39:40 +0100 Subject: [PATCH 1582/3485] [Ubuntu] fix yq invocation on android repo xml (#6562) --- images/linux/scripts/installers/android.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/linux/scripts/installers/android.sh b/images/linux/scripts/installers/android.sh index aaf60c23f16e..59782ceb41ad 100644 --- a/images/linux/scripts/installers/android.sh +++ b/images/linux/scripts/installers/android.sh @@ -51,7 +51,7 @@ if [[ $cmdlineToolsVersion == "latest" ]]; then download_with_retries $repositoryXmlUrl "/tmp" "repository2-1.xml" cmdlineToolsVersion=$( yq -p=xml \ - '.sdk-repository.remotePackage[] | select(."+path" == "cmdline-tools;latest").archives.archive[].complete.url | select(contains("commandlinetools-linux"))' \ + '.sdk-repository.remotePackage[] | select(."+@path" == "cmdline-tools;latest").archives.archive[].complete.url | select(contains("commandlinetools-linux"))' \ /tmp/repository2-1.xml ) From a642059809e43f2a20b364e76a38e81933a47d59 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Mon, 14 Nov 2022 12:51:35 +0100 Subject: [PATCH 1583/3485] fix yq invocation on android repo xml (#6563) --- images/macos/provision/core/android-toolsets.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/macos/provision/core/android-toolsets.sh b/images/macos/provision/core/android-toolsets.sh index f81827e16cad..2126541a5474 100755 --- a/images/macos/provision/core/android-toolsets.sh +++ b/images/macos/provision/core/android-toolsets.sh @@ -41,7 +41,7 @@ if [[ $cmdlineToolsVersion == "latest" ]]; then download_with_retries $repositoryXmlUrl "/tmp" "repository2-1.xml" cmdlineToolsVersion=$( yq -p=xml \ - '.sdk-repository.remotePackage[] | select(."+path" == "cmdline-tools;latest").archives.archive[].complete.url | select(contains("commandlinetools-mac"))' \ + '.sdk-repository.remotePackage[] | select(."+@path" == "cmdline-tools;latest").archives.archive[].complete.url | select(contains("commandlinetools-mac"))' \ /tmp/repository2-1.xml ) From f93e26d6a55fd64c439423a2c5d7c86e73c98b89 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Mon, 14 Nov 2022 20:59:20 +0100 Subject: [PATCH 1584/3485] [Ubuntu] Workaround vcpkg installation (#6564) --- images/linux/scripts/installers/vcpkg.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/images/linux/scripts/installers/vcpkg.sh b/images/linux/scripts/installers/vcpkg.sh index 731de8b1b432..7f65030c73e3 100644 --- a/images/linux/scripts/installers/vcpkg.sh +++ b/images/linux/scripts/installers/vcpkg.sh @@ -12,8 +12,16 @@ echo "VCPKG_INSTALLATION_ROOT=${VCPKG_INSTALLATION_ROOT}" | tee -a /etc/environm git clone https://github.com/Microsoft/vcpkg $VCPKG_INSTALLATION_ROOT $VCPKG_INSTALLATION_ROOT/bootstrap-vcpkg.sh + +# workaround https://github.com/microsoft/vcpkg/issues/27786 + +mkdir -p /root/.vcpkg/ +touch /root/.vcpkg/vcpkg.path.txt + $VCPKG_INSTALLATION_ROOT/vcpkg integrate install chmod 0777 -R $VCPKG_INSTALLATION_ROOT ln -sf $VCPKG_INSTALLATION_ROOT/vcpkg /usr/local/bin +rm -rf /root/.vcpkg + invoke_tests "Tools" "Vcpkg" \ No newline at end of file From 279e529dabcc3cd8642fc45d62bbb279724784e3 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Wed, 16 Nov 2022 18:31:26 +0100 Subject: [PATCH 1585/3485] [macOS] vcpkg workaround (#6579) --- images/macos/provision/core/vcpkg.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/images/macos/provision/core/vcpkg.sh b/images/macos/provision/core/vcpkg.sh index a1ac7c254969..7ba161725f5d 100644 --- a/images/macos/provision/core/vcpkg.sh +++ b/images/macos/provision/core/vcpkg.sh @@ -5,6 +5,11 @@ source ~/utils/utils.sh VCPKG_INSTALLATION_ROOT=/usr/local/share/vcpkg echo "export VCPKG_INSTALLATION_ROOT=${VCPKG_INSTALLATION_ROOT}" | tee -a ~/.bashrc +# workaround https://github.com/microsoft/vcpkg/issues/27786 + +mkdir -p /Users/runner/.vcpkg +touch /Users/runner/.vcpkg/vcpkg.path.txt + # Install vcpkg git clone https://github.com/Microsoft/vcpkg $VCPKG_INSTALLATION_ROOT $VCPKG_INSTALLATION_ROOT/bootstrap-vcpkg.sh @@ -12,4 +17,6 @@ $VCPKG_INSTALLATION_ROOT/vcpkg integrate install chmod -R 0777 $VCPKG_INSTALLATION_ROOT ln -sf $VCPKG_INSTALLATION_ROOT/vcpkg /usr/local/bin +rm -rf /Users/runner/.vcpkg + invoke_tests "Common" "vcpkg" From b101b5646fa2a6048243f954d56e43d92270f390 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Wed, 16 Nov 2022 20:42:51 +0100 Subject: [PATCH 1586/3485] [windows] Do not install latest version of GHC (#6581) --- images/win/scripts/Installers/Install-Haskell.ps1 | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/images/win/scripts/Installers/Install-Haskell.ps1 b/images/win/scripts/Installers/Install-Haskell.ps1 index 63c7a7c95662..c27281f441d1 100644 --- a/images/win/scripts/Installers/Install-Haskell.ps1 +++ b/images/win/scripts/Installers/Install-Haskell.ps1 @@ -13,13 +13,20 @@ $VersionsList = $LatestMajorMinor | ForEach-Object { $_.Group | Select-Object -F # The latest version will be installed as a default ForEach ($version in $VersionsList) { + # 9.4.3 has failed choco builds, replace with 9.4.2 for the time being + # 9.2.5 has failed choco builds, replace with 9.2.4 for the time being + if ($version -eq "9.4.3"){ [version]$version = "9.4.2" } + if ($version -eq "9.2.5"){ [version]$version = "9.2.4" } Write-Host "Installing ghc $version..." Choco-Install -PackageName ghc -ArgumentList '--version', $version, '-m' } # Add default version of GHC to path, because choco formula updates path on user level $DefaultGhcVersion = $VersionsList | Select-Object -Last 1 -$DefaultGhcShortVersion = ([version]$DefaultGhcVersion).ToString(3) +# temporary hardcode ------------- +#$DefaultGhcShortVersion = ([version]$DefaultGhcVersion).ToString(3) +$DefaultGhcShortVersion = "9.4.2" +#-------------------------------- $DefaultGhcPath = Join-Path $env:ChocolateyInstall "lib\ghc.$DefaultGhcVersion\tools\ghc-$DefaultGhcShortVersion\bin" # Starting from version 9 haskell installation directory is $env:ChocolateyToolsLocation instead of $env:ChocolateyInstall\lib if ($DefaultGhcShortVersion -notmatch '^[0-8]\.\d+.*') From 5fe009246ff6e6551ebcb12b4903757a7cd7a69d Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Thu, 17 Nov 2022 13:52:53 +0100 Subject: [PATCH 1587/3485] [Windows] Add .Net 6.0 as LTS (#6578) --- images/win/toolsets/toolset-2019.json | 3 ++- images/win/toolsets/toolset-2022.json | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index 62b08f27cb47..37faf8c8e511 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -429,7 +429,8 @@ "dotnet": { "versions": [ "3.1", - "5.0" + "5.0", + "6.0" ], "tools": [ { "name": "nbgv", "test": "nbgv --version", "getversion": "nbgv --version" } diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index 06aa96db0799..56f0cd9dd0a2 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -340,7 +340,8 @@ "dotnet": { "versions": [ "3.1", - "5.0" + "5.0", + "6.0" ], "tools": [ { "name": "nbgv", "test": "nbgv --version", "getversion": "nbgv --version" } From 6ef9c61220d9712317731cbdaa53bb0b25e73f94 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Thu, 17 Nov 2022 16:51:56 +0100 Subject: [PATCH 1588/3485] [Ubuntu] Add one more missing file for vcpkg (#6589) --- images/linux/scripts/installers/vcpkg.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/images/linux/scripts/installers/vcpkg.sh b/images/linux/scripts/installers/vcpkg.sh index 7f65030c73e3..cfc4448db170 100644 --- a/images/linux/scripts/installers/vcpkg.sh +++ b/images/linux/scripts/installers/vcpkg.sh @@ -15,13 +15,13 @@ $VCPKG_INSTALLATION_ROOT/bootstrap-vcpkg.sh # workaround https://github.com/microsoft/vcpkg/issues/27786 -mkdir -p /root/.vcpkg/ -touch /root/.vcpkg/vcpkg.path.txt +mkdir -p /root/.vcpkg/ $HOME/.vcpkg +touch /root/.vcpkg/vcpkg.path.txt $HOME/.vcpkg/vcpkg.path.txt $VCPKG_INSTALLATION_ROOT/vcpkg integrate install chmod 0777 -R $VCPKG_INSTALLATION_ROOT ln -sf $VCPKG_INSTALLATION_ROOT/vcpkg /usr/local/bin -rm -rf /root/.vcpkg +rm -rf /root/.vcpkg $HOME/.vcpkg invoke_tests "Tools" "Vcpkg" \ No newline at end of file From 582d23c88456b26178fdaf1d39678dd7a30a8ed1 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Fri, 18 Nov 2022 20:16:09 +0100 Subject: [PATCH 1589/3485] [Windows] Pin PowerShell version 7.2.7 (#6591) --- .../Installers/Install-PowershellCore.ps1 | 30 ++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/images/win/scripts/Installers/Install-PowershellCore.ps1 b/images/win/scripts/Installers/Install-PowershellCore.ps1 index f968ebf9c790..c0f7208e6f50 100644 --- a/images/win/scripts/Installers/Install-PowershellCore.ps1 +++ b/images/win/scripts/Installers/Install-PowershellCore.ps1 @@ -3,7 +3,35 @@ ## Desc: Install PowerShell Core ################################################################################ -Invoke-Expression "& { $(Invoke-RestMethod https://aka.ms/install-powershell.ps1) } -UseMSI -Quiet" +$ErrorActionPreference = "Stop" + +$tempDir = Join-Path ([System.IO.Path]::GetTempPath()) ([System.IO.Path]::GetRandomFileName()) +$null = New-Item -ItemType Directory -Path $tempDir -Force -ErrorAction SilentlyContinue +try { + $originalValue = [Net.ServicePointManager]::SecurityProtocol + [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12 + + $metadata = Invoke-RestMethod https://raw.githubusercontent.com/PowerShell/PowerShell/master/tools/metadata.json + $release = $metadata.LTSReleaseTag[0] -replace '^v' + $packageName = "PowerShell-${release}-win-x64.msi" + + $downloadURL = "https://github.com/PowerShell/PowerShell/releases/download/v${release}/${packageName}" + Write-Verbose "About to download package from '$downloadURL'" -Verbose + + $packagePath = Join-Path -Path $tempDir -ChildPath $packageName + Invoke-WebRequest -Uri $downloadURL -OutFile $packagePath + + Write-Verbose "Performing quiet install" + $ArgumentList=@("/i", $packagePath, "/quiet") + $process = Start-Process msiexec -ArgumentList $ArgumentList -Wait -PassThru + if ($process.exitcode -ne 0) { + throw "Quiet install failed, please rerun install without -Quiet switch or ensure you have administrator rights" + } +} finally { + # Restore original value + [Net.ServicePointManager]::SecurityProtocol = $originalValue + Remove-Item -Path $tempDir -Recurse -Force -ErrorAction SilentlyContinue +} # about_update_notifications # While the update check happens during the first session in a given 24-hour period, for performance reasons, From 8c2a400be2bc5364398d5fcfce2c2817dc451b25 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Sun, 20 Nov 2022 14:05:15 +0100 Subject: [PATCH 1590/3485] [macOS] Pin PowerShell version 7.2.7 (#6596) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Alexey Ayupov <“alexey.ayupov@akvelon.com”> --- images/macos/provision/core/powershell.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/images/macos/provision/core/powershell.sh b/images/macos/provision/core/powershell.sh index e3fdc86bd116..611dbbdff46d 100644 --- a/images/macos/provision/core/powershell.sh +++ b/images/macos/provision/core/powershell.sh @@ -2,7 +2,9 @@ source ~/utils/utils.sh echo Installing PowerShell... -psDownloadUrl=$(get_github_package_download_url "PowerShell/PowerShell" "contains(\"osx-x64.pkg\")" "latest" "$API_PAT") +psmetadata=$(curl "https://raw.githubusercontent.com/PowerShell/PowerShell/master/tools/metadata.json" -s) +psver=$(echo $psmetadata | jq -r '.LTSReleaseTag[0]') +psDownloadUrl=$(get_github_package_download_url "PowerShell/PowerShell" "contains(\"osx-x64.pkg\")" "$psver" "$API_PAT") download_with_retries $psDownloadUrl "/tmp" "powershell.pkg" # Work around the issue on macOS Big Sur 11.5 or higher for possible error message ("can't be opened because Apple cannot check it for malicious software") when installing the package From daf0420aa49309fe9f01437d835c81e31a15c54d Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Mon, 21 Nov 2022 10:55:49 +0100 Subject: [PATCH 1591/3485] [macOS] Rework open windows test (#6602) --- images/macos/tests/System.Tests.ps1 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/images/macos/tests/System.Tests.ps1 b/images/macos/tests/System.Tests.ps1 index f5493b1d2493..8d08627bf8a3 100644 --- a/images/macos/tests/System.Tests.ps1 +++ b/images/macos/tests/System.Tests.ps1 @@ -49,7 +49,8 @@ Describe "Screen Resolution" { Describe "Open windows" { It "Opened windows not found" { - $cmd = "osascript -e 'tell application ""System Events"" to get every window of (every process whose class of windows contains window)'" + 'tell application id "com.apple.systemevents" to get every window of (every process whose class of windows contains window)' | Tee-Object /tmp/windows.osascript + $cmd = "osascript /tmp/windows.osascript" $openWindows = bash -c $cmd $openWindows.Split(",").Trim() | Where-Object { $_ -notmatch "NotificationCenter" } | Should -BeNullOrEmpty } From 2b33da2a3328d97fcd605ad938a007638e637efd Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Mon, 21 Nov 2022 17:54:08 +0100 Subject: [PATCH 1592/3485] [Ubuntu] fix mongodb installation (#6609) --- images/linux/scripts/installers/mongodb.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/images/linux/scripts/installers/mongodb.sh b/images/linux/scripts/installers/mongodb.sh index 6491d6deed24..783480038f67 100644 --- a/images/linux/scripts/installers/mongodb.sh +++ b/images/linux/scripts/installers/mongodb.sh @@ -11,16 +11,15 @@ source $HELPER_SCRIPTS/install.sh REPO_URL="https://repo.mongodb.org/apt/ubuntu" osLabel=$(getOSVersionLabel) toolsetVersion=$(get_toolset_value '.mongodb.version') -latestVersion=$(curl $REPO_URL/dists/$osLabel/mongodb-org/ | awk -F'>|<' '{print $3}' | grep "^$toolsetVersion" | tail -1) # Install Mongo DB -wget -qO - https://www.mongodb.org/static/pgp/server-$latestVersion.asc | sudo apt-key add - +wget -qO - https://www.mongodb.org/static/pgp/server-$toolsetVersion.asc | sudo apt-key add - -echo "deb [ arch=amd64,arm64 ] $REPO_URL $osLabel/mongodb-org/$latestVersion multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-org-$latestVersion.list +echo "deb [ arch=amd64,arm64 ] $REPO_URL $osLabel/mongodb-org/$toolsetVersion multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-org-$toolsetVersion.list sudo apt-get update sudo apt-get install -y mongodb-org -rm /etc/apt/sources.list.d/mongodb-org-$latestVersion.list +rm /etc/apt/sources.list.d/mongodb-org-$toolsetVersion.list echo "mongodb $REPO_URL" >> $HELPER_SCRIPTS/apt-sources.txt From 1c88fb4cda5fb47825675f004db5a9f548b4aa4f Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Mon, 21 Nov 2022 19:56:42 +0100 Subject: [PATCH 1593/3485] [Ubuntu] pin powershell-core version (#6611) --- images/linux/scripts/installers/powershellcore.sh | 6 +++++- images/linux/toolsets/toolset-1804.json | 3 +++ images/linux/toolsets/toolset-2004.json | 3 +++ images/linux/toolsets/toolset-2204.json | 3 +++ 4 files changed, 14 insertions(+), 1 deletion(-) diff --git a/images/linux/scripts/installers/powershellcore.sh b/images/linux/scripts/installers/powershellcore.sh index e228d9121a80..4b4f206c0fa0 100644 --- a/images/linux/scripts/installers/powershellcore.sh +++ b/images/linux/scripts/installers/powershellcore.sh @@ -4,5 +4,9 @@ ## Desc: Installs powershellcore ################################################################################ +source $HELPER_SCRIPTS/install.sh + +pwshversion=$(get_toolset_value .pwsh.version) + # Install Powershell -apt-get install -y powershell +apt-get install -y powershell=$pwshversion* diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index e7be1221b49a..d27be16d1988 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -362,5 +362,8 @@ }, "postgresql": { "version": "14" + }, + "pwsh": { + "version": "7.2" } } diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index ac6ec86fec4f..8c71c541d69f 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -370,5 +370,8 @@ }, "postgresql": { "version": "14" + }, + "pwsh": { + "version": "7.2" } } diff --git a/images/linux/toolsets/toolset-2204.json b/images/linux/toolsets/toolset-2204.json index 56d10d2d3554..76c9e6851297 100644 --- a/images/linux/toolsets/toolset-2204.json +++ b/images/linux/toolsets/toolset-2204.json @@ -344,5 +344,8 @@ }, "postgresql": { "version": "14" + }, + "pwsh": { + "version": "7.2" } } From 0ad45c90fa383a0acfe62c9013744c6f5be9445c Mon Sep 17 00:00:00 2001 From: SheGe <3687447+SheGe@users.noreply.github.com> Date: Tue, 22 Nov 2022 20:25:50 +0100 Subject: [PATCH 1594/3485] Enhance image genration template for Linux and Windows variants (#6519) --- .../azure-pipelines/image-generation.yml | 59 ++++++++++++++----- 1 file changed, 45 insertions(+), 14 deletions(-) diff --git a/images.CI/linux-and-win/azure-pipelines/image-generation.yml b/images.CI/linux-and-win/azure-pipelines/image-generation.yml index 2e31962fd8a2..77f44cce3c7c 100644 --- a/images.CI/linux-and-win/azure-pipelines/image-generation.yml +++ b/images.CI/linux-and-win/azure-pipelines/image-generation.yml @@ -4,16 +4,46 @@ # - https://github.community/t5/GitHub-Actions/GitHub-Actions-Manual-Trigger-Approvals/td-p/31504 # - https://github.community/t5/GitHub-Actions/Protecting-github-workflows/td-p/30290 +parameters: + - name: job_id + type: string + default: 'generate_image' + + - name: image_type + type: string + + - name: image_readme_name + type: string + + - name: agent_pool + type: object + default: + name: 'ci-agent-pool' + + - name: variable_group_name + type: string + default: 'Image Generation Variables' + + - name: create_release + type: boolean + default: true + + - name: repository_ref + type: string + default: 'self' + jobs: -- job: +- job: ${{ parameters.job_id }} displayName: Image Generation (${{ parameters.image_type }}) timeoutInMinutes: 600 cancelTimeoutInMinutes: 30 - pool: ci-agent-pool + pool: ${{ parameters.agent_pool }} variables: - - group: Image Generation Variables + - group: ${{ parameters.variable_group_name }} steps: + - checkout: ${{ parameters.repository_ref }} + - task: PowerShell@2 displayName: 'Download custom repository' condition: and(ne(variables['CUSTOM_REPOSITORY_URL'], ''), ne(variables['CUSTOM_REPOSITORY_BRANCH'], '')) @@ -76,17 +106,18 @@ jobs: -PrefixToPathTrim "$(TemplateDirectoryPath)" ` -PrintTopNLongest 25 - - task: PowerShell@2 - displayName: 'Create release for VM deployment' - inputs: - targetType: filePath - filePath: ./images.CI/linux-and-win/create-release.ps1 - arguments: -BuildId $(Build.BuildId) ` - -Organization $(RELEASE_TARGET_ORGANIZATION) ` - -DefinitionId $(RELEASE_TARGET_DEFINITION_ID) ` - -Project $(RELEASE_TARGET_PROJECT) ` - -ImageName ${{ parameters.image_type }} ` - -AccessToken $(RELEASE_TARGET_TOKEN) + - ${{ if eq(parameters.create_release, true) }}: + - task: PowerShell@2 + displayName: 'Create release for VM deployment' + inputs: + targetType: filePath + filePath: ./images.CI/linux-and-win/create-release.ps1 + arguments: -BuildId $(Build.BuildId) ` + -Organization $(RELEASE_TARGET_ORGANIZATION) ` + -DefinitionId $(RELEASE_TARGET_DEFINITION_ID) ` + -Project $(RELEASE_TARGET_PROJECT) ` + -ImageName ${{ parameters.image_type }} ` + -AccessToken $(RELEASE_TARGET_TOKEN) - task: PowerShell@2 displayName: 'Clean up resources' From 3a2d6530a3c8c0a7fedcfdce32d5936a3344a17a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 24 Nov 2022 08:23:05 +0000 Subject: [PATCH 1595/3485] Updating readme file for macOS-11 version 20221121.1 (#6618) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-11-Readme.md | 117 ++++++++++++++++---------------- 1 file changed, 58 insertions(+), 59 deletions(-) diff --git a/images/macos/macos-11-Readme.md b/images/macos/macos-11-Readme.md index 598697baede6..d14c8eebc989 100644 --- a/images/macos/macos-11-Readme.md +++ b/images/macos/macos-11-Readme.md @@ -8,11 +8,11 @@ # macOS 11.7 info - System Version: macOS 11.7.1 (20G918) - Kernel Version: Darwin 20.6.0 -- Image Version: 20221028.1 +- Image Version: 20221121.1 ## Installed Software ### Language and Runtime -- .NET SDK 3.1.101 3.1.201 3.1.302 3.1.424 5.0.102 5.0.202 5.0.302 5.0.408 6.0.402 +- .NET SDK 3.1.101 3.1.201 3.1.302 3.1.425 5.0.102 5.0.202 5.0.302 5.0.408 6.0.403 7.0.100 - Bash 3.2.57(1)-release - Clang/LLVM 13.0.0 is default - Clang/LLVM 14.0.6 is available on `'$(brew --prefix llvm@14)/bin/clang'` @@ -23,33 +23,33 @@ - GNU Fortran (Homebrew GCC 10.4.0) 10.4.0 - available by `gfortran-10` alias - GNU Fortran (Homebrew GCC 11.3.0) 11.3.0 - available by `gfortran-11` alias - Go 1.17.13 -- julia 1.8.2 -- Kotlin 1.7.20-release-201 +- julia 1.8.3 +- Kotlin 1.7.21-release-272 - MSBuild 16.10.1.51301 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) -- Node.js v16.18.0 +- Node.js v16.18.1 - NVM 0.39.2 -- NVM - Cached node versions: v12.22.12 v14.20.1 v16.18.0 v18.12.0 +- NVM - Cached node versions: v14.21.1 v16.18.1 v18.12.1 - Perl 5.36.0 -- PHP 8.1.11 +- PHP 8.1.12 - Python 2.7.18 - Python 3.11.0 -- R 4.2.1 +- R 4.2.2 - Ruby 2.7.6p219 ### Package Management -- Bundler version 2.3.24 +- Bundler version 2.3.26 - Carthage 0.38.0 - CocoaPods 1.11.3 - Composer 2.4.4 -- Homebrew 3.6.7 +- Homebrew 3.6.12 - Miniconda 4.12.0 - NPM 8.19.2 - NuGet 6.3.1.1 - Pip 20.3.4 (python 2.7) -- Pip 22.3 (python 3.11) +- Pip 22.3.1 (python 3.11) - Pipx 1.1.0 -- RubyGems 3.3.24 -- Vcpkg 2022 (build from master \<05fda317e>) +- RubyGems 3.3.26 +- Vcpkg 2022 (build from master \<e819a7d0a>) - Yarn 1.22.19 #### Environment variables @@ -62,59 +62,59 @@ - Apache Ant(TM) 1.10.12 - Apache Maven 3.8.6 - Gradle 7.5.1 -- Sbt 1.7.2 +- Sbt 1.8.0 ### Utilities - 7-Zip 17.04 - aria2 1.36.0 -- azcopy 10.16.1 +- azcopy 10.16.2 - bazel 5.3.2 -- bazelisk 1.14.0 +- bazelisk 1.15.0 - bsdtar 3.3.2 - available by 'tar' alias - Curl 7.86.0 - Git 2.38.1 - Git LFS: 3.2.0 -- GitHub CLI: 2.18.1 +- GitHub CLI: 2.20.2 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.3 - gpg (GnuPG) 2.3.8 -- helm v3.10.1+g9f88ccb +- helm v3.10.2+g50f003e - Hub CLI: 2.14.2 -- ImageMagick 7.1.0-51 +- ImageMagick 7.1.0-52 - jq 1.6 - mongo v5.0.11 - mongod v5.0.11 - Newman 5.3.2 -- OpenSSL 1.1.1q 5 Jul 2022 `(/usr/local/opt/openssl@1.1 -> ../Cellar/openssl@1.1/1.1.1q)` -- Packer 1.8.3 -- PostgreSQL 14.5 (Homebrew) -- psql (PostgreSQL) 14.5 (Homebrew) +- OpenSSL 1.1.1s 1 Nov 2022 `(/usr/local/opt/openssl@1.1 -> ../Cellar/openssl@1.1/1.1.1s)` +- Packer 1.8.4 +- PostgreSQL 14.6 (Homebrew) +- psql (PostgreSQL) 14.6 (Homebrew) - Sox 14.4.2 - Subversion (SVN) 1.14.2 - Switchaudio-osx 1.1.0 -- yq (https://github.com/mikefarah/yq/) version 4.28.2 +- yq (https://github.com/mikefarah/yq/) version v4.30.4 - zstd 1.5.2 ### Tools -- Aliyun CLI 3.0.134 +- Aliyun CLI 3.0.136 - App Center CLI 2.11.0 -- AWS CLI 2.8.7 -- AWS SAM CLI 1.61.0 +- AWS CLI 2.9.0 +- AWS SAM CLI 1.65.0 - AWS Session Manager CLI 1.2.398.0 - Azure CLI (azure-devops) 0.25.0 -- Azure CLI 2.41.0 -- Bicep CLI 0.11.1 +- Azure CLI 2.42.0 +- Bicep CLI 0.12.40 - Cabal 3.6.2.0 -- Cmake 3.24.2 -- CodeQL Action Bundle 2.11.2 +- Cmake 3.25.0 +- CodeQL Action Bundle 2.11.3 - Colima 0.4.6 -- Fastlane 2.210.1 -- GHC 9.4.2 +- Fastlane 2.211.0 +- GHC 9.4.3 - GHCup 0.1.18.0 - Jazzy 0.14.3 - Stack 2.9.1 - SwiftFormat 0.50.3 -- Swig 4.0.2 +- Swig 4.1.0 - Xcode Command Line Tools 13.2.0.0.1.1638488800 ### Linters @@ -124,11 +124,11 @@ ### Browsers - Safari 16.1 (16614.2.9.1.13) - SafariDriver 16.1 (16614.2.9.1.13) -- Google Chrome 107.0.5304.87 +- Google Chrome 107.0.5304.110 - ChromeDriver 107.0.5304.62 -- Microsoft Edge 107.0.1418.24 -- Microsoft Edge WebDriver 107.0.1418.23 -- Mozilla Firefox 106.0.2 +- Microsoft Edge 107.0.1418.52 +- Microsoft Edge WebDriver 107.0.1418.52 +- Mozilla Firefox 107.0 - geckodriver 0.32.0 - Selenium server 4.5.0 @@ -142,7 +142,7 @@ ### Java | Version | Vendor | Environment Variable | | ------------------- | --------------- | -------------------- | -| 8.0.345+1 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | +| 8.0.352+8 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | | 11.0.17+8 | Eclipse Temurin | JAVA_HOME_11_X64 | | 17.0.5+8 | Eclipse Temurin | JAVA_HOME_17_X64 | @@ -174,30 +174,29 @@ - 3.9.12 [PyPy 7.3.9] #### Node.js -- 12.22.12 -- 14.20.1 -- 16.18.0 -- 18.12.0 +- 14.21.1 +- 16.18.1 +- 18.12.1 #### Go | Version | Architecture | Environment Variable | | ------- | ------------ | -------------------- | | 1.17.13 (Default) | x64 | GOROOT_1_17_X64 | -| 1.18.7 | x64 | GOROOT_1_18_X64 | -| 1.19.2 | x64 | GOROOT_1_19_X64 | +| 1.18.8 | x64 | GOROOT_1_18_X64 | +| 1.19.3 | x64 | GOROOT_1_19_X64 | ### Rust Tools -- Cargo 1.64.0 -- Rust 1.64.0 -- Rustdoc 1.64.0 +- Cargo 1.65.0 +- Rust 1.65.0 +- Rustdoc 1.65.0 - Rustup 1.25.1 #### Packages -- Bindgen 0.61.0 -- Cargo-audit 0.17.2 +- Bindgen 0.62.0 +- Cargo-audit 0.17.4 - Cargo-outdated 0.11.1 - Cbindgen 0.24.3 -- Clippy 0.1.64 +- Clippy 0.1.65 - Rustfmt 1.5.1-stable ### PowerShell Tools @@ -206,7 +205,7 @@ #### PowerShell Modules | Module | Version | | ---------------- | ------- | -| Az | 9.0.1 | +| Az | 9.1.1 | | MarkdownPS | 1.9 | | Pester | 5.3.3 | | PSScriptAnalyzer | 1.21.0 | @@ -219,10 +218,10 @@ ### Xamarin #### Visual Studio for Mac -| Version | Build | Path | -| -------------- | --------- | ------------------------------------ | -| 2019 | 8.10.25.2 | /Applications/Visual Studio 2019.app | -| 2022 (default) | 17.3.8.5 | /Applications/Visual Studio.app | +| Version | Build | Path | +| -------------- | ----------- | ------------------------------------ | +| 2019 | 8.10.25.2 | /Applications/Visual Studio 2019.app | +| 2022 (default) | 17.4.0.2406 | /Applications/Visual Studio.app | ##### Notes: ``` @@ -337,7 +336,7 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" ### Android | Package Name | Version | | -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------ | -| Android Command Line Tools | 7.0 | +| Android Command Line Tools | 8.0 | | Android Emulator | 31.3.13 | | Android SDK Build-tools | 33.0.0<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | | Android SDK Platforms | android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | @@ -360,8 +359,8 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" | ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | ### Miscellaneous -- libXext 1.3.4 -- libXft 2.3.6 +- libXext 1.3.5 +- libXft 2.3.7 - Tcl/Tk 8.6.12_1 - Zlib 1.2.13 From 7d118628a44b22720df3c464500c43fc47cfda78 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 24 Nov 2022 11:23:00 +0000 Subject: [PATCH 1596/3485] Updating readme file for ubuntu20 version 20221119.2 (#6603) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2004-Readme.md | 181 +++++++++++++++--------------- 1 file changed, 89 insertions(+), 92 deletions(-) diff --git a/images/linux/Ubuntu2004-Readme.md b/images/linux/Ubuntu2004-Readme.md index 2893f85bf66d..da076b9f7d1f 100644 --- a/images/linux/Ubuntu2004-Readme.md +++ b/images/linux/Ubuntu2004-Readme.md @@ -4,11 +4,11 @@ | [Ubuntu-latest workflows will use Ubuntu-22.04](https://github.com/actions/runner-images/issues/6399) | | [[all OSs] The VCPKG_ROOT variable will be removed from runner images](https://github.com/actions/runner-images/issues/6376) | | [Third party PHP repository will be removed from the Ubuntu 22.04 image](https://github.com/actions/runner-images/issues/6331) | -| [The Ubuntu 18.04 Actions runner image will begin deprecation on 8/8/22 and will be fully unsupported by 4/1/2023](https://github.com/actions/runner-images/issues/6002) | +| [The Ubuntu 18.04 Actions runner image will begin deprecation on 2022/08/08 and will be fully unsupported by 2023/04/01](https://github.com/actions/runner-images/issues/6002) | *** # Ubuntu 20.04.5 LTS -- Linux kernel version: 5.15.0-1022-azure -- Image Version: 20221027.1 +- Linux kernel version: 5.15.0-1023-azure +- Image Version: 20221119.2 ## Installed Software ### Language and Runtime @@ -21,21 +21,21 @@ - Erlang rebar3 3.20.0 - GNU C++ 9.4.0, 10.3.0 - GNU Fortran 9.4.0, 10.3.0 -- Julia 1.8.2 -- Kotlin 1.7.20-release-201 +- Julia 1.8.3 +- Kotlin 1.7.21-release-272 - Mono 6.12.0.182 (apt source repository: https://download.mono-project.com/repo/ubuntu stable-focal main) - MSBuild 16.10.1.31701 (from /usr/lib/mono/msbuild/15.0/bin/MSBuild.dll) -- Node 16.18.0 +- Node 16.18.1 - Perl 5.30.0 - Python 3.8.10 - Python3 3.8.10 - Ruby 2.7.0p0 -- Swift 5.7 +- Swift 5.7.1 ### Package Management - cpan 1.64 -- Helm 3.10.1 -- Homebrew 3.6.7 +- Helm 3.10.2 +- Homebrew 3.6.11 - Miniconda 4.12.0 - Npm 8.19.2 - NuGet 6.3.1.1 @@ -43,7 +43,7 @@ - Pip3 20.0.2 - Pipx 1.1.0 - RubyGems 3.1.2 -- Vcpkg (build from master \<48cc0c71e>) +- Vcpkg (build from master \<4cb4a5c5d>) - Yarn 1.22.19 ##### Notes: @@ -63,80 +63,80 @@ to accomplish this. ### Project Management - Ant 1.10.7 - Gradle 7.5.1 -- Lerna 6.0.1 +- Lerna 6.0.3 - Maven 3.8.6 -- Sbt 1.7.2 +- Sbt 1.8.0 ### Tools -- Ansible 2.13.5 +- Ansible 2.13.6 - apt-fast 1.9.12 -- AzCopy 10.16.1 (available by `azcopy` and `azcopy10` aliases) +- AzCopy 10.16.2 (available by `azcopy` and `azcopy10` aliases) - Bazel 5.3.2 - Bazelisk 1.13.2 -- Bicep 0.11.1 +- Bicep 0.12.40 - Buildah 1.22.3 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- CMake 3.24.2 -- CodeQL Action Bundle 2.11.2 +- CMake 3.25.0 +- CodeQL Action Bundle 2.11.3 - Docker Amazon ECR Credential Helper 0.6.0 - Docker Compose v1 1.29.2 - Docker Compose v2 2.12.2+azure-1 - Docker-Buildx 0.9.1 -- Docker-Moby Client 20.10.20+azure-1 -- Docker-Moby Server 20.10.20+azure-1 -- Fastlane 2.210.1 +- Docker-Moby Client 20.10.21+azure-1 +- Docker-Moby Server 20.10.21+azure-1 +- Fastlane 2.211.0 - Git 2.38.1 (apt source repository: ppa:git-core/ppa) - Git LFS 3.2.0 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.6.0 - Haveged 1.9.1 -- Heroku 7.65.0 -- HHVM (HipHop VM) 4.171.0 +- Heroku 7.66.4 +- HHVM (HipHop VM) 4.172.0 - jq 1.6 - Kind 0.17.0 -- Kubectl 1.25.3 +- Kubectl 1.25.4 - Kustomize 4.5.7 - Leiningen 2.9.10 - MediaInfo 19.09 - Mercurial 5.3.1 -- Minikube 1.27.1 -- n 9.0.0 +- Minikube 1.28.0 +- n 9.0.1 - Newman 5.3.2 - nvm 0.39.2 - OpenSSL 1.1.1f-1ubuntu2.16 -- Packer 1.8.3 -- Parcel 2.7.0 +- Packer 1.8.4 +- Parcel 2.8.0 - PhantomJS 2.1.1 - Podman 3.4.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- Pulumi 3.44.2 -- R 4.2.1 +- Pulumi 3.47.1 +- R 4.2.2 - Skopeo 1.5.0 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 -- Terraform 1.3.3 +- Terraform 1.3.5 - yamllint 1.28.0 -- yq 4.28.2 +- yq v4.30.4 - zstd 1.5.2 (homebrew) ### CLI Tools -- Alibaba Cloud CLI 3.0.134 -- AWS CLI 2.8.6 +- Alibaba Cloud CLI 3.0.135 +- AWS CLI 2.9.0 - AWS CLI Session manager plugin 1.2.398.0 -- AWS SAM CLI 1.60.0 -- Azure CLI (azure-cli) 2.41.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) +- AWS SAM CLI 1.65.0 +- Azure CLI (azure-cli) 2.42.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.25.0 -- GitHub CLI 2.18.1 -- Google Cloud SDK 407.0.0 (apt source repository: https://packages.cloud.google.com/apt) +- GitHub CLI 2.20.2 +- Google Cloud SDK 410.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 12.0.11 -- OpenShift CLI 4.11.9 -- ORAS CLI 0.15.1 -- Vercel CLI 28.4.12 +- Netlify CLI 12.2.4 +- OpenShift CLI 4.11.13 +- ORAS CLI 0.16.0 +- Vercel CLI 28.5.5 ### Java | Version | Vendor | Environment Variable | | ------------------- | --------------- | -------------------- | -| 8.0.345+1 | Eclipse Temurin | JAVA_HOME_8_X64 | -| 11.0.16+1 (default) | Eclipse Temurin | JAVA_HOME_11_X64 | -| 17.0.4+1 | Eclipse Temurin | JAVA_HOME_17_X64 | +| 8.0.352+8 | Eclipse Temurin | JAVA_HOME_8_X64 | +| 11.0.17+8 (default) | Eclipse Temurin | JAVA_HOME_11_X64 | +| 17.0.5+8 | Eclipse Temurin | JAVA_HOME_17_X64 | ### GraalVM | Version | Environment variables | @@ -146,40 +146,40 @@ to accomplish this. ### PHP | Tool | Version | | -------- | -------------------- | -| PHP | 7.4.32 8.0.24 8.1.11 | +| PHP | 7.4.33 8.0.25 8.1.12 | | Composer | 2.4.4 | -| PHPUnit | 8.5.30 | +| PHPUnit | 8.5.31 | ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ``` ### Haskell - Cabal 3.6.2.0 -- GHC 9.4.2 +- GHC 9.4.3 - GHCup 0.1.18.0 - Stack 2.9.1 ### Rust Tools -- Cargo 1.64.0 -- Rust 1.64.0 -- Rustdoc 1.64.0 +- Cargo 1.65.0 +- Rust 1.65.0 +- Rustdoc 1.65.0 - Rustup 1.25.1 #### Packages -- Bindgen 0.61.0 -- Cargo audit 0.17.2 -- Cargo clippy 0.1.64 +- Bindgen 0.62.0 +- Cargo audit 0.17.4 +- Cargo clippy 0.1.65 - Cargo outdated 0.11.1 - Cbindgen 0.24.3 - Rustfmt 1.5.1 ### Browsers and Drivers -- Google Chrome 107.0.5304.87 +- Google Chrome 107.0.5304.110 - ChromeDriver 107.0.5304.62 - Chromium 107.0.5288.0 -- Microsoft Edge 107.0.1418.24 (apt source repository: https://packages.microsoft.com/repos/edge) -- Microsoft Edge WebDriver 107.0.1418.24 -- Selenium server 4.5.0 -- Mozilla Firefox 105.0 +- Microsoft Edge 107.0.1418.52 (apt source repository: https://packages.microsoft.com/repos/edge) +- Microsoft Edge WebDriver 107.0.1418.52 +- Selenium server 4.6.0 +- Mozilla Firefox 107.0 - Geckodriver 0.32.0 #### Environment variables @@ -191,17 +191,17 @@ to accomplish this. | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | ### .NET Core SDK -- 3.1.120 3.1.202 3.1.302 3.1.424 5.0.104 5.0.214 5.0.303 5.0.408 6.0.402 +- 3.1.120 3.1.202 3.1.302 3.1.425 5.0.104 5.0.214 5.0.303 5.0.408 6.0.403 7.0.100 ### .NET tools - nbgv 3.5.119+5d25f54fec ### Databases -- MongoDB 5.0.13 (apt source repository: https://repo.mongodb.org/apt/ubuntu) +- MongoDB 5.0.14 (apt source repository: https://repo.mongodb.org/apt/ubuntu) - sqlite3 3.31.1 #### PostgreSQL -- PostgreSQL 14.5 (apt source repository: https://apt.postgresql.org/pub/repos/apt/) +- PostgreSQL 14.6 (apt source repository: https://apt.postgresql.org/pub/repos/apt/) - PostgreSQL Server (user:postgres) ``` @@ -216,19 +216,18 @@ to accomplish this. ``` #### MS SQL Server Client Tools - sqlcmd 17.10.0001.1 -- SqlPackage 16.0.6296.0 +- SqlPackage 16.1.6374.0 ### Cached Tools #### Go - 1.17.13 -- 1.18.7 -- 1.19.2 +- 1.18.8 +- 1.19.3 #### Node.js -- 12.22.12 -- 14.20.1 -- 16.18.0 -- 18.12.0 +- 14.21.1 +- 16.18.1 +- 18.12.1 #### PyPy - 2.7.18 [PyPy 7.3.9] @@ -257,8 +256,8 @@ to accomplish this. | Name | Value | Architecture | | --------------- | ----------------------------------- | ------------ | | GOROOT_1_17_X64 | /opt/hostedtoolcache/go/1.17.13/x64 | x64 | -| GOROOT_1_18_X64 | /opt/hostedtoolcache/go/1.18.7/x64 | x64 | -| GOROOT_1_19_X64 | /opt/hostedtoolcache/go/1.19.2/x64 | x64 | +| GOROOT_1_18_X64 | /opt/hostedtoolcache/go/1.18.8/x64 | x64 | +| GOROOT_1_19_X64 | /opt/hostedtoolcache/go/1.19.3/x64 | x64 | ### PowerShell Tools - PowerShell 7.2.7 @@ -267,7 +266,7 @@ to accomplish this. | Module | Version | | ---------------- | ------- | | MarkdownPS | 1.9 | -| Microsoft.Graph | 1.14.0 | +| Microsoft.Graph | 1.17.0 | | Pester | 5.3.3 | | PSScriptAnalyzer | 1.21.0 | @@ -284,8 +283,8 @@ to accomplish this. ### Android | Package Name | Version | | -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------ | -| Android Command Line Tools | 7.0 | -| Android Emulator | 31.3.12 | +| Android Command Line Tools | 8.0 | +| Android Emulator | 31.3.13 | | Android SDK Build-tools | 33.0.0<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | | Android SDK Platform-Tools | 33.0.3 | | Android SDK Platforms | android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | @@ -310,24 +309,22 @@ to accomplish this. ### Cached Docker images | Repository:Tag | Digest | Created | | ----------------------- | ------------------------------------------------------------------------ | ---------- | -| alpine:3.14 | sha256:1ab24b3b99320975cca71716a7475a65d263d0b6b604d9d14ce08f7a3f67595c | 2022-08-09 | -| alpine:3.15 | sha256:69463fdff1f025c908939e86d4714b4d5518776954ca627cbeff4c74bcea5b22 | 2022-08-09 | -| alpine:3.16 | sha256:bc41182d7ef5ffc53a40b044e725193bc10142a1243f395ee852a8d9730fc2ad | 2022-08-09 | -| buildpack-deps:bullseye | sha256:9f5bbd4a5eb6970c1dc03703f159b2db17a520ec8c5ed76298849e3615c5fe16 | 2022-10-25 | -| buildpack-deps:buster | sha256:b9b638654107a9b7b5b5a301e62d0268dc6469f1508379d999799079a34c00f2 | 2022-10-25 | +| alpine:3.14 | sha256:4c869a63e1b7c0722fed1e402a6466610327c3b83bdddb94bd94fb71da7f638a | 2022-08-09 | +| alpine:3.15 | sha256:cf34c62ee8eb3fe8aa24c1fab45d7e9d12768d945c3f5a6fd6a63d901e898479 | 2022-08-09 | +| alpine:3.16 | sha256:b95359c2505145f16c6aa384f9cc74eeff78eb36d308ca4fd902eeeb0a0b161b | 2022-11-12 | +| buildpack-deps:bullseye | sha256:1a263e69ebf256b5f27165d2eb4e667dadad37f42003d53f5ce699b7e7f1b6dc | 2022-11-15 | +| buildpack-deps:buster | sha256:c0804e4d81620d4fdb4965cc462dbca7d901d68968780ff6c6aeed062309ad50 | 2022-11-15 | | buildpack-deps:stretch | sha256:78e995165a5788c2f55aed6e548d8f6c1534830d4310c870408fccb2da8c5b2e | 2022-06-23 | -| debian:10 | sha256:e83854c9fb469daa7273d73c43a3fe5ae2da77cb40d3d34282a9af09a9db49f9 | 2022-10-25 | -| debian:11 | sha256:bfe6615d017d1eebe19f349669de58cda36c668ef916e618be78071513c690e5 | 2022-10-25 | +| debian:10 | sha256:6c153b6c1b042fb70140a465e6d7c9c4a6112062afdc843c6a4d9c5bbfe5d0d5 | 2022-11-15 | +| debian:11 | sha256:3066ef83131c678999ce82e8473e8d017345a30f5573ad3e44f62e5c9c46442b | 2022-11-15 | | debian:9 | sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be | 2022-06-23 | -| moby/buildkit:latest | sha256:46e7907bf9cdced1af7e45f1f07f69cb30560574d85d636a17ce6f97cc4844b4 | 2022-10-18 | -| node:12 | sha256:01627afeb110b3054ba4a1405541ca095c8bfca1cb6f2be9479c767a2711879e | 2022-04-20 | -| node:12-alpine | sha256:d4b15b3d48f42059a15bd659be60afe21762aae9d6cbea6f124440895c27db68 | 2022-04-11 | -| node:14 | sha256:860647620537bf1afce7bd20f466f53b735945efea280a8a5d1a9e5e18088bc0 | 2022-10-25 | -| node:14-alpine | sha256:b953f75739f5ddce593f8b7cf8542bbe5eb6a2a637cdd855fb7444ad4e296e02 | 2022-10-06 | -| node:16 | sha256:3547c98a330a08fb9dbb8b04ac4430f6d21133cb79f21f6cf8283184f523ff83 | 2022-10-25 | -| node:16-alpine | sha256:f16544bc93cf1a36d213c8e2efecf682e9f4df28429a629a37aaf38ecfc25cf4 | 2022-10-13 | -| node:18 | sha256:cef9966b19672effeafcf1a67b8add742c3e46ca7dd5532efff60820526c2e95 | 2022-10-27 | -| node:18-alpine | sha256:1f09c210a17508d34277971b19541a47a26dc5a641dedc03bd28cff095052996 | 2022-10-27 | +| moby/buildkit:latest | sha256:77abd86c9422aaff294bfde1029f03a6ab18ece0105003637cfda1d7fc22299f | 2022-11-10 | +| node:14 | sha256:d82d512aec5de4fac53b92b2aa148948c2e72264d650de9e1570283d4f503dbe | 2022-11-15 | +| node:14-alpine | sha256:12b14bdfa8c89a1a060c53b5714157085700660b12ab7c50a907a4e19d95b6bf | 2022-11-12 | +| node:16 | sha256:68fc9f749931453d5c8545521b021dd97267e0692471ce15bdec0814ed1f8fc3 | 2022-11-15 | +| node:16-alpine | sha256:15dd66f723aab8b367abc7ac6ed25594ca4653f2ce49ad1505bfbe740ad5190e | 2022-11-12 | +| node:18 | sha256:c47a2c61e635eb4938fcd56a1139b552300624b53e3eca06b5554a577f1842cf | 2022-11-15 | +| node:18-alpine | sha256:9eff44230b2fdcca57a73b8f908c8029e72d24dd05cac5339c79d3dedf6b208b | 2022-11-12 | | ubuntu:16.04 | sha256:1f1a2d56de1d604801a9671f301190704c25d604a416f59e03c04f5c6ffee0d6 | 2021-08-31 | | ubuntu:18.04 | sha256:ca70a834041dd1bf16cc38dfcd24f0888ec4fa431e09f3344f354cf8d1724499 | 2022-10-25 | | ubuntu:20.04 | sha256:450e066588f42ebe1551f3b1a535034b6aa46cd936fe7f2c6b0d72997ec61dbd | 2022-10-25 | @@ -372,7 +369,7 @@ to accomplish this. | libmagickcore-dev | 8:6.9.10.23+dfsg-2.1ubuntu11.4 | | libmagickwand-dev | 8:6.9.10.23+dfsg-2.1ubuntu11.4 | | libsecret-1-dev | 0.20.4-0ubuntu1 | -| libsqlite3-dev | 3.31.1-4ubuntu0.4 | +| libsqlite3-dev | 3.31.1-4ubuntu0.5 | | libtool | 2.4.6-14 | | libunwind8 | 1.2.1-9build1 | | libxkbfile-dev | 1:1.1.0-1 | @@ -396,7 +393,7 @@ to accomplish this. | rsync | 3.1.3-8ubuntu0.4 | | shellcheck | 0.7.0-2build2 | | sphinxsearch | 2.2.11-2ubuntu2 | -| sqlite3 | 3.31.1-4ubuntu0.4 | +| sqlite3 | 3.31.1-4ubuntu0.5 | | ssh | 1:8.2p1-4ubuntu0.5 | | sshpass | 1.06-1 | | subversion | 1.13.0-3ubuntu0.2 | @@ -407,7 +404,7 @@ to accomplish this. | texinfo | 6.7.0.dfsg.2-5 | | time | 1.7-25.1build1 | | tk | 8.6.9+1 | -| tzdata | 2022e-0ubuntu0.20.04.0 | +| tzdata | 2022f-0ubuntu0.20.04.1 | | unzip | 6.0-25ubuntu1.1 | | upx | 3.95-2build1 | | wget | 1.20.3-1ubuntu2 | From d54fa255120bfd0f508c1feb53490190787b1316 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 24 Nov 2022 11:41:31 +0000 Subject: [PATCH 1597/3485] Updating readme file for ubuntu22 version 20221119.2 (#6604) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2204-Readme.md | 176 +++++++++++++++--------------- 1 file changed, 88 insertions(+), 88 deletions(-) diff --git a/images/linux/Ubuntu2204-Readme.md b/images/linux/Ubuntu2204-Readme.md index 9d2d411ca149..25d9a042f4ea 100644 --- a/images/linux/Ubuntu2204-Readme.md +++ b/images/linux/Ubuntu2204-Readme.md @@ -4,11 +4,11 @@ | [Ubuntu-latest workflows will use Ubuntu-22.04](https://github.com/actions/runner-images/issues/6399) | | [[all OSs] The VCPKG_ROOT variable will be removed from runner images](https://github.com/actions/runner-images/issues/6376) | | [Third party PHP repository will be removed from the Ubuntu 22.04 image](https://github.com/actions/runner-images/issues/6331) | -| [The Ubuntu 18.04 Actions runner image will begin deprecation on 8/8/22 and will be fully unsupported by 4/1/2023](https://github.com/actions/runner-images/issues/6002) | +| [The Ubuntu 18.04 Actions runner image will begin deprecation on 2022/08/08 and will be fully unsupported by 2023/04/01](https://github.com/actions/runner-images/issues/6002) | *** # Ubuntu 22.04.1 LTS -- Linux kernel version: 5.15.0-1022-azure -- Image Version: 20221027.1 +- Linux kernel version: 5.15.0-1023-azure +- Image Version: 20221119.2 ## Installed Software ### Language and Runtime @@ -17,23 +17,23 @@ - Clang-format 12.0.1, 13.0.1, 14.0.0 - Clang-tidy 12.0.1, 13.0.1, 14.0.0 - Dash 0.5.11+git20210903+057cd650a4ed-3build1 -- GNU C++ 9.5.0, 10.4.0, 11.3.0 +- GNU C++ 9.5.0, 10.4.0, 11.3.0, 12.1.0 - GNU Fortran 9.5.0, 10.4.0, 11.3.0 -- Julia 1.8.2 -- Kotlin 1.7.20-release-201 +- Julia 1.8.3 +- Kotlin 1.7.21-release-272 - Mono 6.12.0.182 (apt source repository: https://download.mono-project.com/repo/ubuntu stable-focal main) - MSBuild 16.10.1.31701 (from /usr/lib/mono/msbuild/15.0/bin/MSBuild.dll) -- Node 16.18.0 +- Node 16.18.1 - Perl 5.34.0 - Python 3.10.6 - Python3 3.10.6 - Ruby 3.0.2p107 -- Swift 5.7 +- Swift 5.7.1 ### Package Management - cpan 1.64 -- Helm 3.10.1 -- Homebrew 3.6.7 +- Helm 3.10.2 +- Homebrew 3.6.11 - Miniconda 4.12.0 - Npm 8.19.2 - NuGet 6.3.1.1 @@ -41,7 +41,7 @@ - Pip3 22.0.2 - Pipx 1.1.0 - RubyGems 3.3.5 -- Vcpkg (build from master \<48cc0c71e>) +- Vcpkg (build from master \<4cb4a5c5d>) - Yarn 1.22.19 ##### Notes: @@ -59,76 +59,76 @@ to accomplish this. | VCPKG_INSTALLATION_ROOT | /usr/local/share/vcpkg | ### Project Management -- Lerna 6.0.1 +- Lerna 6.0.3 ### Tools -- Ansible 2.13.5 +- Ansible 2.13.6 - apt-fast 1.9.12 -- AzCopy 10.16.1 (available by `azcopy` and `azcopy10` aliases) +- AzCopy 10.16.2 (available by `azcopy` and `azcopy10` aliases) - Bazel 5.3.2 - Bazelisk 1.13.2 -- Bicep 0.11.1 +- Bicep 0.12.40 - Buildah 1.23.1 -- CMake 3.24.2 -- CodeQL Action Bundle 2.11.2 +- CMake 3.25.0 +- CodeQL Action Bundle 2.11.3 - Docker Amazon ECR Credential Helper 0.6.0 - Docker Compose v1 1.29.2 - Docker Compose v2 2.12.2+azure-1 - Docker-Buildx 0.9.1 -- Docker-Moby Client 20.10.20+azure-1 -- Docker-Moby Server 20.10.20+azure-1 -- Fastlane 2.210.1 +- Docker-Moby Client 20.10.21+azure-1 +- Docker-Moby Server 20.10.21+azure-1 +- Fastlane 2.211.0 - Git 2.38.1 (apt source repository: ppa:git-core/ppa) - Git LFS 3.2.0 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.6.0 - Haveged 1.9.14 -- Heroku 7.65.0 +- Heroku 7.66.4 - jq 1.6 - Kind 0.17.0 -- Kubectl 1.25.3 +- Kubectl 1.25.4 - Kustomize 4.5.7 - Leiningen 2.9.10 - MediaInfo 21.09 - Mercurial 6.1.1 -- Minikube 1.27.1 -- n 9.0.0 +- Minikube 1.28.0 +- n 9.0.1 - Newman 5.3.2 - nvm 0.39.2 -- OpenSSL 3.0.2-0ubuntu1.6 -- Packer 1.8.3 -- Parcel 2.7.0 +- OpenSSL 3.0.2-0ubuntu1.7 +- Packer 1.8.4 +- Parcel 2.8.0 - Podman 3.4.4 -- Pulumi 3.44.2 -- R 4.2.1 +- Pulumi 3.47.1 +- R 4.2.2 - Skopeo 1.4.1 - Sphinx Open Source Search Server 2.2.11 - SVN 1.14.1 -- Terraform 1.3.3 +- Terraform 1.3.5 - yamllint 1.28.0 -- yq 4.28.2 +- yq v4.30.4 - zstd 1.5.2 (homebrew) ### CLI Tools -- Alibaba Cloud CLI 3.0.134 -- AWS CLI 2.8.6 +- Alibaba Cloud CLI 3.0.135 +- AWS CLI 2.9.0 - AWS CLI Session manager plugin 1.2.398.0 -- AWS SAM CLI 1.60.0 -- Azure CLI (azure-cli) 2.41.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) +- AWS SAM CLI 1.65.0 +- Azure CLI (azure-cli) 2.42.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.25.0 -- GitHub CLI 2.18.1 -- Google Cloud SDK 407.0.0 (apt source repository: https://packages.cloud.google.com/apt) +- GitHub CLI 2.20.2 +- Google Cloud SDK 410.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 12.0.11 -- OpenShift CLI 4.11.9 -- ORAS CLI 0.15.1 -- Vercel CLI 28.4.12 +- Netlify CLI 12.2.4 +- OpenShift CLI 4.11.13 +- ORAS CLI 0.16.0 +- Vercel CLI 28.5.5 ### Java | Version | Vendor | Environment Variable | | ------------------- | --------------- | -------------------- | -| 8.0.345+1 | Eclipse Temurin | JAVA_HOME_8_X64 | -| 11.0.16+1 (default) | Eclipse Temurin | JAVA_HOME_11_X64 | -| 17.0.4+1 | Eclipse Temurin | JAVA_HOME_17_X64 | +| 8.0.352+8 | Eclipse Temurin | JAVA_HOME_8_X64 | +| 11.0.17+8 (default) | Eclipse Temurin | JAVA_HOME_11_X64 | +| 17.0.5+8 | Eclipse Temurin | JAVA_HOME_17_X64 | ### GraalVM | Version | Environment variables | @@ -140,37 +140,37 @@ to accomplish this. | -------- | ------- | | PHP | 8.1.2 | | Composer | 2.4.4 | -| PHPUnit | 8.5.30 | +| PHPUnit | 8.5.31 | ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ``` ### Haskell - Cabal 3.6.2.0 -- GHC 9.4.2 +- GHC 9.4.3 - GHCup 0.1.18.0 - Stack 2.9.1 ### Rust Tools -- Cargo 1.64.0 -- Rust 1.64.0 -- Rustdoc 1.64.0 +- Cargo 1.65.0 +- Rust 1.65.0 +- Rustdoc 1.65.0 - Rustup 1.25.1 #### Packages -- Bindgen 0.61.0 -- Cargo audit 0.17.2 -- Cargo clippy 0.1.64 +- Bindgen 0.62.0 +- Cargo audit 0.17.4 +- Cargo clippy 0.1.65 - Cargo outdated 0.11.1 - Cbindgen 0.24.3 - Rustfmt 1.5.1 ### Browsers and Drivers -- Google Chrome 107.0.5304.87 +- Google Chrome 107.0.5304.110 - ChromeDriver 107.0.5304.62 - Chromium 107.0.5288.0 -- Microsoft Edge 107.0.1418.24 (apt source repository: https://packages.microsoft.com/repos/edge) -- Microsoft Edge WebDriver 107.0.1418.24 -- Selenium server 4.5.0 +- Microsoft Edge 107.0.1418.52 (apt source repository: https://packages.microsoft.com/repos/edge) +- Microsoft Edge WebDriver 107.0.1418.52 +- Selenium server 4.6.0 #### Environment variables | Name | Value | @@ -181,7 +181,7 @@ to accomplish this. | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | ### .NET Core SDK -- 6.0.402 +- 6.0.403 7.0.100 ### .NET tools - nbgv 3.5.119+5d25f54fec @@ -190,7 +190,7 @@ to accomplish this. - sqlite3 3.37.2 #### PostgreSQL -- PostgreSQL 14.5 (apt source repository: https://apt.postgresql.org/pub/repos/apt/) +- PostgreSQL 14.6 (apt source repository: https://apt.postgresql.org/pub/repos/apt/) - PostgreSQL Server (user:postgres) ``` @@ -205,18 +205,18 @@ to accomplish this. ``` #### MS SQL Server Client Tools - sqlcmd 17.10.0001.1 -- SqlPackage 16.0.6296.0 +- SqlPackage 16.1.6374.0 ### Cached Tools #### Go - 1.17.13 -- 1.18.7 -- 1.19.2 +- 1.18.8 +- 1.19.3 #### Node.js -- 14.20.1 -- 16.18.0 -- 18.12.0 +- 14.21.1 +- 16.18.1 +- 18.12.1 #### PyPy - 3.7.13 [PyPy 7.3.9] @@ -237,8 +237,8 @@ to accomplish this. | Name | Value | Architecture | | --------------- | ----------------------------------- | ------------ | | GOROOT_1_17_X64 | /opt/hostedtoolcache/go/1.17.13/x64 | x64 | -| GOROOT_1_18_X64 | /opt/hostedtoolcache/go/1.18.7/x64 | x64 | -| GOROOT_1_19_X64 | /opt/hostedtoolcache/go/1.19.2/x64 | x64 | +| GOROOT_1_18_X64 | /opt/hostedtoolcache/go/1.18.8/x64 | x64 | +| GOROOT_1_19_X64 | /opt/hostedtoolcache/go/1.19.3/x64 | x64 | ### PowerShell Tools - PowerShell 7.2.7 @@ -247,7 +247,7 @@ to accomplish this. | Module | Version | | ---------------- | ------- | | MarkdownPS | 1.9 | -| Microsoft.Graph | 1.14.0 | +| Microsoft.Graph | 1.17.0 | | Pester | 5.3.3 | | PSScriptAnalyzer | 1.21.0 | @@ -263,8 +263,8 @@ to accomplish this. ### Android | Package Name | Version | | -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------ | -| Android Command Line Tools | 7.0 | -| Android Emulator | 31.3.12 | +| Android Command Line Tools | 8.0 | +| Android Emulator | 31.3.13 | | Android SDK Build-tools | 33.0.0<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | | Android SDK Platform-Tools | 33.0.3 | | Android SDK Platforms | android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | @@ -289,23 +289,23 @@ to accomplish this. ### Cached Docker images | Repository:Tag | Digest | Created | | ----------------------- | ------------------------------------------------------------------------ | ---------- | -| alpine:3.14 | sha256:1ab24b3b99320975cca71716a7475a65d263d0b6b604d9d14ce08f7a3f67595c | 2022-08-09 | -| alpine:3.15 | sha256:69463fdff1f025c908939e86d4714b4d5518776954ca627cbeff4c74bcea5b22 | 2022-08-09 | -| alpine:3.16 | sha256:bc41182d7ef5ffc53a40b044e725193bc10142a1243f395ee852a8d9730fc2ad | 2022-08-09 | -| buildpack-deps:bullseye | sha256:9f5bbd4a5eb6970c1dc03703f159b2db17a520ec8c5ed76298849e3615c5fe16 | 2022-10-25 | -| buildpack-deps:buster | sha256:b9b638654107a9b7b5b5a301e62d0268dc6469f1508379d999799079a34c00f2 | 2022-10-25 | -| debian:10 | sha256:e83854c9fb469daa7273d73c43a3fe5ae2da77cb40d3d34282a9af09a9db49f9 | 2022-10-25 | -| debian:11 | sha256:bfe6615d017d1eebe19f349669de58cda36c668ef916e618be78071513c690e5 | 2022-10-25 | -| moby/buildkit:latest | sha256:46e7907bf9cdced1af7e45f1f07f69cb30560574d85d636a17ce6f97cc4844b4 | 2022-10-18 | -| node:14 | sha256:860647620537bf1afce7bd20f466f53b735945efea280a8a5d1a9e5e18088bc0 | 2022-10-25 | -| node:14-alpine | sha256:b953f75739f5ddce593f8b7cf8542bbe5eb6a2a637cdd855fb7444ad4e296e02 | 2022-10-06 | -| node:16 | sha256:3547c98a330a08fb9dbb8b04ac4430f6d21133cb79f21f6cf8283184f523ff83 | 2022-10-25 | -| node:16-alpine | sha256:f16544bc93cf1a36d213c8e2efecf682e9f4df28429a629a37aaf38ecfc25cf4 | 2022-10-13 | -| node:18 | sha256:cef9966b19672effeafcf1a67b8add742c3e46ca7dd5532efff60820526c2e95 | 2022-10-27 | -| node:18-alpine | sha256:1f09c210a17508d34277971b19541a47a26dc5a641dedc03bd28cff095052996 | 2022-10-27 | +| alpine:3.14 | sha256:4c869a63e1b7c0722fed1e402a6466610327c3b83bdddb94bd94fb71da7f638a | 2022-08-09 | +| alpine:3.15 | sha256:cf34c62ee8eb3fe8aa24c1fab45d7e9d12768d945c3f5a6fd6a63d901e898479 | 2022-08-09 | +| alpine:3.16 | sha256:b95359c2505145f16c6aa384f9cc74eeff78eb36d308ca4fd902eeeb0a0b161b | 2022-11-12 | +| buildpack-deps:bullseye | sha256:1a263e69ebf256b5f27165d2eb4e667dadad37f42003d53f5ce699b7e7f1b6dc | 2022-11-15 | +| buildpack-deps:buster | sha256:c0804e4d81620d4fdb4965cc462dbca7d901d68968780ff6c6aeed062309ad50 | 2022-11-15 | +| debian:10 | sha256:6c153b6c1b042fb70140a465e6d7c9c4a6112062afdc843c6a4d9c5bbfe5d0d5 | 2022-11-15 | +| debian:11 | sha256:3066ef83131c678999ce82e8473e8d017345a30f5573ad3e44f62e5c9c46442b | 2022-11-15 | +| moby/buildkit:latest | sha256:77abd86c9422aaff294bfde1029f03a6ab18ece0105003637cfda1d7fc22299f | 2022-11-10 | +| node:14 | sha256:d82d512aec5de4fac53b92b2aa148948c2e72264d650de9e1570283d4f503dbe | 2022-11-15 | +| node:14-alpine | sha256:12b14bdfa8c89a1a060c53b5714157085700660b12ab7c50a907a4e19d95b6bf | 2022-11-12 | +| node:16 | sha256:68fc9f749931453d5c8545521b021dd97267e0692471ce15bdec0814ed1f8fc3 | 2022-11-15 | +| node:16-alpine | sha256:15dd66f723aab8b367abc7ac6ed25594ca4653f2ce49ad1505bfbe740ad5190e | 2022-11-12 | +| node:18 | sha256:c47a2c61e635eb4938fcd56a1139b552300624b53e3eca06b5554a577f1842cf | 2022-11-15 | +| node:18-alpine | sha256:9eff44230b2fdcca57a73b8f908c8029e72d24dd05cac5339c79d3dedf6b208b | 2022-11-12 | | ubuntu:18.04 | sha256:ca70a834041dd1bf16cc38dfcd24f0888ec4fa431e09f3344f354cf8d1724499 | 2022-10-25 | | ubuntu:20.04 | sha256:450e066588f42ebe1551f3b1a535034b6aa46cd936fe7f2c6b0d72997ec61dbd | 2022-10-25 | -| ubuntu:22.04 | sha256:7cfe75438fc77c9d7235ae502bf229b15ca86647ac01c844b272b56326d56184 | 2022-10-25 | +| ubuntu:22.04 | sha256:4b1d0c4a2d2aaf63b37111f34eb9fa89fa1bf53dd6e4ca954d47caebca4005c2 | 2022-11-02 | ### Installed apt packages | Name | Version | @@ -347,8 +347,8 @@ to accomplish this. | libmagickcore-dev | 8:6.9.11.60+dfsg-1.3build2 | | libmagickwand-dev | 8:6.9.11.60+dfsg-1.3build2 | | libsecret-1-dev | 0.20.5-2 | -| libsqlite3-dev | 3.37.2-2 | -| libssl-dev | 3.0.2-0ubuntu1.6 | +| libsqlite3-dev | 3.37.2-2ubuntu0.1 | +| libssl-dev | 3.0.2-0ubuntu1.7 | | libtool | 2.4.6-15build2 | | libunwind8 | 1.3.2-2build2 | | libxkbfile-dev | 1:1.1.0-1build3 | @@ -372,7 +372,7 @@ to accomplish this. | rsync | 3.2.3-8ubuntu3 | | shellcheck | 0.8.0-2 | | sphinxsearch | 2.2.11-8 | -| sqlite3 | 3.37.2-2 | +| sqlite3 | 3.37.2-2ubuntu0.1 | | ssh | 1:8.9p1-3 | | sshpass | 1.09-1 | | subversion | 1.14.1-3ubuntu0.22.04.1 | @@ -383,7 +383,7 @@ to accomplish this. | texinfo | 6.8-4build1 | | time | 1.9-0.1build2 | | tk | 8.6.11+1build2 | -| tzdata | 2022e-0ubuntu0.22.04.0 | +| tzdata | 2022f-0ubuntu0.22.04.1 | | unzip | 6.0-26ubuntu3.1 | | upx | 3.96-3 | | wget | 1.21.2-2ubuntu1 | From c42d235336ece98c0599b53a0c25bd0e5a77a219 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 24 Nov 2022 16:35:23 +0000 Subject: [PATCH 1598/3485] Updating readme file for win19 version 20221119.1 (#6606) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2019-Readme.md | 142 +++++++++++++++---------------- 1 file changed, 70 insertions(+), 72 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index a9c650ff007b..ce5ae29649a4 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -4,8 +4,8 @@ | [[all OSs] The VCPKG_ROOT variable will be removed from runner images](https://github.com/actions/runner-images/issues/6376) | *** # Microsoft Windows Server 2019 Datacenter -- OS Version: 10.0.17763 Build 3534 -- Image Version: 20221027.1 +- OS Version: 10.0.17763 Build 3650 +- Image Version: 20221119.1 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -14,10 +14,10 @@ ### Language and Runtime - Bash 5.1.16(1)-release - Go 1.17.13 -- Julia 1.8.2 -- Kotlin 1.7.20 +- Julia 1.8.3 +- Kotlin 1.7.21 - LLVM 14.0.6 -- Node 16.18.0 +- Node 16.18.1 - Perl 5.32.1 - PHP 8.1.12 - Python 3.7.9 @@ -26,14 +26,14 @@ ### Package Management - Chocolatey 1.2.0 - Composer 2.4.4 -- Helm 3.10.0 +- Helm 3.10.1 - Miniconda 4.12.0 (pre-installed on the image but not added to PATH) - NPM 8.19.2 -- NuGet 6.3.1.1 -- pip 22.3 (python 3.7) +- NuGet 6.4.0.123 +- pip 22.3.1 (python 3.7) - Pipx 1.1.0 - RubyGems 2.7.6.3 -- Vcpkg (build from master \<48cc0c71e>) +- Vcpkg (build from master \<4cb4a5c5d>) - Yarn 1.22.19 #### Environment variables @@ -46,18 +46,18 @@ - Ant 1.10.12 - Gradle 7.5 - Maven 3.8.6 -- sbt 1.7.2 +- sbt 1.8.0 ### Tools - 7zip 22.01 - aria2 1.36.0 -- azcopy 10.16.1 +- azcopy 10.16.2 - Bazel 5.3.2 - Bazelisk 1.13.2 -- Bicep 0.11.1 +- Bicep 0.12.40 - Cabal 3.8.1.0 -- CMake 3.24.2 -- CodeQL Action Bundle 2.11.2 +- CMake 3.25.0 +- CodeQL Action Bundle 2.11.3 - Docker 20.10.21 - Docker Compose v1 1.29.2 - Docker Compose v2 2.12.2 @@ -65,65 +65,65 @@ - ghc 9.4.2 - Git 2.38.1.windows.1 - Git LFS 3.2.0 -- Google Cloud SDK 407.0.0 +- Google Cloud SDK 410.0.0 - ImageMagick 7.1.0-51 - InnoSetup 6.2.1 - jq 1.6 - Kind 0.17.0 -- Kubectl 1.25.3 +- Kubectl 1.25.4 - Mercurial 5.0 - Mingw-w64 8.1.0 - Newman 5.3.2 - NSIS v3.08 - OpenSSL 1.1.1 -- Packer 1.8.2 -- Parcel 2.7.0 -- Pulumi v3.44.2 -- R 4.2.1 +- Packer 1.8.4 +- Parcel 2.8.0 +- Pulumi v3.47.1 +- R 4.2.2 - Service Fabric SDK 9.0.1028.9590 - Stack 2.9.1 - Subversion (SVN) 1.14.2 - Swig 4.0.2 -- VSWhere 3.0.3 +- VSWhere 3.1.1 - WinAppDriver 1.2.2009.02003 - WiX Toolset v3.11.2.4516 - yamllint 1.28.0 - zstd 1.5.2 ### CLI Tools -- Alibaba Cloud CLI 3.0.134 -- AWS CLI 2.8.6 -- AWS SAM CLI 1.61.0 +- Alibaba Cloud CLI 3.0.135 +- AWS CLI 2.9.0 +- AWS SAM CLI 1.65.0 - AWS Session Manager CLI 1.2.398.0 -- Azure CLI 2.41.0 +- Azure CLI 2.42.0 - Azure DevOps CLI extension 0.25.0 - Cloud Foundry CLI 6.53.0 -- GitHub CLI 2.18.1 +- GitHub CLI 2.20.2 - Hub CLI 2.14.2 ### Rust Tools -- Cargo 1.64.0 -- Rust 1.64.0 -- Rustdoc 1.64.0 +- Cargo 1.65.0 +- Rust 1.65.0 +- Rustdoc 1.65.0 - Rustup 1.25.1 #### Packages -- bindgen 0.61.0 -- cargo-audit 0.17.2 +- bindgen 0.62.0 +- cargo-audit 0.17.4 - cargo-outdated 0.11.1 - cbindgen 0.24.3 -- Clippy 0.1.64 +- Clippy 0.1.65 - Rustfmt 1.5.1 ### Browsers and webdrivers -- Google Chrome 107.0.5304.88 +- Google Chrome 107.0.5304.107 - Chrome Driver 107.0.5304.62 -- Microsoft Edge 106.0.1370.52 -- Microsoft Edge Driver 106.0.1370.52 -- Mozilla Firefox 106.0.2 +- Microsoft Edge 107.0.1418.52 +- Microsoft Edge Driver 107.0.1418.52 +- Mozilla Firefox 107.0 - Gecko Driver 0.32.0 - IE Driver 3.150.1.1 -- Selenium server 4.5.0 +- Selenium server 4.6.0 #### Environment variables | Name | Value | @@ -136,7 +136,7 @@ ### Java | Version | Vendor | Environment Variable | | ------------------- | --------------- | -------------------- | -| 8.0.345+1 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | +| 8.0.352+8 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | | 11.0.17+8 | Eclipse Temurin | JAVA_HOME_11_X64 | | 13.0.2+8.1 | Adopt OpenJDK | JAVA_HOME_13_X64 | | 17.0.5+8 | Eclipse Temurin | JAVA_HOME_17_X64 | @@ -166,16 +166,15 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Version | Architecture | Environment Variable | | ------- | ------------ | -------------------- | | 1.17.13 (Default) | x64 | GOROOT_1_17_X64 | -| 1.18.7 | x64 | GOROOT_1_18_X64 | -| 1.19.2 | x64 | GOROOT_1_19_X64 | +| 1.18.8 | x64 | GOROOT_1_18_X64 | +| 1.19.3 | x64 | GOROOT_1_19_X64 | #### Node | Version | Architecture | | ------- | ------------ | -| 12.22.12 | x64 | -| 14.20.1 | x64 | -| 16.18.0 | x64 | -| 18.12.0 | x64 | +| 14.21.1 | x64 | +| 16.18.1 | x64 | +| 18.12.1 | x64 | #### Python | Version | Architecture | @@ -212,7 +211,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Property | Value | | -------------------- | ------------------------------------------------------------------------------------------------------------------------------------ | | ServiceName | postgresql-x64-14 | -| Version | 14.5 | +| Version | 14.6 | | ServiceStatus | Stopped | | ServiceStartType | Disabled | | EnvironmentVariables | PGBIN=C:\Program Files\PostgreSQL\14\bin <br> PGDATA=C:\Program Files\PostgreSQL\14\data <br> PGROOT=C:\Program Files\PostgreSQL\14 | @@ -227,7 +226,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Database tools - Azure CosmosDb Emulator 2.14.9.0 -- DacFx 16.0.6296.0 +- DacFx 16.1.6374.0 - MySQL 5.7.40.0 - SQL OLEDB Driver 18.6.3.0 - SQLPS 1.0 @@ -241,12 +240,12 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Visual Studio Enterprise 2019 | Name | Version | Path | | ----------------------------- | --------------- | -------------------------------------------------------------- | -| Visual Studio Enterprise 2019 | 16.11.32929.386 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | +| Visual Studio Enterprise 2019 | 16.11.33027.164 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | #### Workloads, components and extensions: | Package | Version | | ------------------------------------------------------------------------- | --------------- | -| Component.Android.NDK.R16B | 16.11.32926.322 | +| Component.Android.NDK.R16B | 16.11.33026.216 | | Component.Android.SDK25.Private | 16.0.28625.61 | | Component.Android.SDK30 | 16.10.31205.252 | | Component.Ant | 1.9.3.8 | @@ -267,9 +266,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Component.Unreal | 16.1.28810.153 | | Component.Unreal.Android | 16.1.28810.153 | | Component.VSInstallerProjects | 1.0.2 | -| Component.WixToolset.VisualStudioExtension.Dev16 | 1.0.0.18 | -| Component.WixToolset.VisualStudioExtension.Schemas3 | 1.0.0.18 | -| Component.WixToolset.VisualStudioExtension.Schemas4 | 1.0.0.18 | +| Component.WixToolset.VisualStudioExtension.Dev16 | 1.0.0.22 | +| Component.WixToolset.VisualStudioExtension.Schemas3 | 1.0.0.22 | | Component.Xamarin | 16.10.31205.252 | | Component.Xamarin.RemotedSimulator | 16.11.32629.160 | | Microsoft.Component.Azure.DataLake.Tools | 16.10.31205.252 | @@ -301,9 +299,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.Net.ComponentGroup.DevelopmentPrerequisites | 16.3.29207.166 | | Microsoft.Net.ComponentGroup.TargetingPacks.Common | 16.0.28516.191 | | Microsoft.NetCore.Component.DevelopmentTools | 16.10.31303.231 | -| Microsoft.NetCore.Component.Runtime.3.1 | 16.11.32929.268 | -| Microsoft.NetCore.Component.Runtime.6.0 | 16.11.32929.268 | -| Microsoft.NetCore.Component.SDK | 16.11.32929.268 | +| Microsoft.NetCore.Component.Runtime.3.1 | 16.11.33027.164 | +| Microsoft.NetCore.Component.Runtime.6.0 | 16.11.33027.164 | +| Microsoft.NetCore.Component.SDK | 16.11.33027.164 | | Microsoft.NetCore.Component.Web | 16.10.31303.231 | | Microsoft.VisualStudio.Component.AppInsights.Tools | 16.5.29515.121 | | Microsoft.VisualStudio.Component.AspNet45 | 16.10.31205.252 | @@ -473,12 +471,12 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | ms-biztalk.BizTalk | 3.13.2.0 | | ProBITools.MicrosoftAnalysisServicesModelingProjects | 2.9.18 | | ProBITools.MicrosoftReportProjectsforVisualStudio | 2.6.11 | -| SSIS.SqlServerIntegrationServicesProjects | 4.2 | +| SSIS.SqlServerIntegrationServicesProjects | 4.3 | | VisualStudioClient.MicrosoftVisualStudio2017InstallerProjects | 1.0.2 | | Windows Driver Kit | 10.1.22000.1 | | Windows Driver Kit Visual Studio Extension | 10.0.21381.0 | | Windows Software Development Kit | 10.1.22621.755 | -| WixToolset.WixToolsetVisualStudio2019Extension | 1.0.0.18 | +| WixToolset.WixToolsetVisualStudio2019Extension | 1.0.0.22 | #### Microsoft Visual C++: | Name | Architecture | Version | @@ -493,10 +491,10 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft Visual C++ 2013 Minimum Runtime | x86 | 12.0.21005 | | Microsoft Visual C++ 2019 Debug Runtime | x64 | 14.29.30139 | | Microsoft Visual C++ 2019 Debug Runtime | x86 | 14.29.30139 | -| Microsoft Visual C++ 2022 Additional Runtime | x64 | 14.32.31332 | -| Microsoft Visual C++ 2022 Minimum Runtime | x64 | 14.32.31332 | -| Microsoft Visual C++ 2022 Additional Runtime | x86 | 14.32.31332 | -| Microsoft Visual C++ 2022 Minimum Runtime | x86 | 14.32.31332 | +| Microsoft Visual C++ 2022 Additional Runtime | x64 | 14.34.31931 | +| Microsoft Visual C++ 2022 Minimum Runtime | x64 | 14.34.31931 | +| Microsoft Visual C++ 2022 Additional Runtime | x86 | 14.34.31931 | +| Microsoft Visual C++ 2022 Minimum Runtime | x86 | 14.34.31931 | #### Installed Windows SDKs `Location C:\Program Files (x86)\Windows Kits\10\Extension SDKs\WindowsDesktop` @@ -512,17 +510,17 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### .NET Core SDK `Location C:\Program Files\dotnet\sdk` -- 3.1.120 3.1.202 3.1.302 3.1.424 5.0.104 5.0.214 5.0.303 5.0.408 5.0.413 +- 3.1.120 3.1.202 3.1.302 3.1.425 5.0.104 5.0.214 5.0.303 5.0.408 5.0.414 6.0.111 6.0.203 6.0.306 6.0.403 ### .NET Core Runtime `Location: C:\Program Files\dotnet\shared\Microsoft.AspNetCore.App` -- 3.1.4 3.1.6 3.1.20 3.1.30 5.0.4 5.0.9 5.0.17 6.0.10 +- 3.1.4 3.1.6 3.1.20 3.1.31 5.0.4 5.0.9 5.0.17 6.0.5 6.0.11 `Location: C:\Program Files\dotnet\shared\Microsoft.NETCore.App` -- 3.1.4 3.1.6 3.1.20 3.1.30 5.0.4 5.0.9 5.0.17 6.0.10 +- 3.1.4 3.1.6 3.1.20 3.1.31 5.0.4 5.0.9 5.0.17 6.0.5 6.0.11 `Location: C:\Program Files\dotnet\shared\Microsoft.WindowsDesktop.App` -- 3.1.4 3.1.6 3.1.20 3.1.30 5.0.4 5.0.9 5.0.17 6.0.10 +- 3.1.4 3.1.6 3.1.20 3.1.31 5.0.4 5.0.9 5.0.17 6.0.5 6.0.11 ### .NET Framework `Type: Developer Pack` @@ -551,10 +549,10 @@ All other versions are saved but not installed. #### Powershell Modules | Module | Version | | ------------------ | ---------------- | -| AWSPowerShell | 4.1.194 | +| AWSPowerShell | 4.1.211 | | DockerMsftProvider | 1.0.0.8 | | MarkdownPS | 1.9 | -| Microsoft.Graph | 1.14.0 | +| Microsoft.Graph | 1.17.0 | | Pester | 3.4.0<br>5.3.3 | | PowerShellGet | 1.0.0.1<br>2.2.5 | | PSScriptAnalyzer | 1.21.0 | @@ -565,7 +563,7 @@ All other versions are saved but not installed. ### Android | Package Name | Version | | -------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 7.0 | +| Android Command Line Tools | 8.0 | | Android SDK Build-tools | 33.0.0<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3<br>26.0.0 26.0.1 26.0.2 26.0.3<br>25.0.0 25.0.1 25.0.2 25.0.3<br>24.0.0 24.0.1 24.0.2 24.0.3<br>23.0.1 23.0.2 23.0.3<br>22.0.1<br>21.1.2<br>20.0.0<br>19.1.0 | | Android SDK Platforms | android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3)<br>android-26 (rev 2)<br>android-25 (rev 3)<br>android-24 (rev 2)<br>android-23 (rev 3)<br>android-22 (rev 2)<br>android-21 (rev 2)<br>android-20 (rev 2)<br>android-19 (rev 4) | | Android SDK Platform-Tools | 33.0.3 | @@ -591,10 +589,10 @@ All other versions are saved but not installed. ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:10facc49b131429645c11904b21194d19ff284a85d8b43db2d6935ef1b12d402 | 2022-10-11 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:8b2eca1a2e745d84a20a135f00afc55075c58041b5a14a2a039a3b40ab841356 | 2022-10-11 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:ab5334a93a6c7d669666ee1988f8054ef7ba068df536ec8e81eda01247b6038d | 2022-10-11 | -| mcr.microsoft.com/windows/nanoserver:1809 | sha256:95dc925380113306e1aee00aa406d82949061d8ad97f5e96b54ec61df40fb0bb | 2022-10-08 | -| mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:d365ab93a48e9b6fcf2d7db6474fbe78c5e725a2768b3ec1388600a078bd3177 | 2022-10-08 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:bfcaaccdd710168f84093a9270824924c1f6da7f23399e1895b273e98d3363a7 | 2022-11-08 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:b2cbe723da778249a0f5557d07616f5cac6ee1ef4e79094da4e49911d70f195c | 2022-11-08 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:48a48dcd38e570a4f057f58258a92a1c01b210a767c6afd3e89d3eb6ae286384 | 2022-11-08 | +| mcr.microsoft.com/windows/nanoserver:1809 | sha256:5c9da3bfe1524eab610dfd41c79a0805c080f8307d810d62bba106b5df587698 | 2022-11-05 | +| mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:cbb8b0a709b4e0868cd2e30b1485358197b1021bb0dd4261e36b3af3ca48fd0b | 2022-11-05 | From 4c8dc87a28adade72c3c7f8b436bbe4121f0c3fd Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 24 Nov 2022 16:38:14 +0000 Subject: [PATCH 1599/3485] Updating readme file for win22 version 20221120.1 (#6605) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2022-Readme.md | 667 ++++++++++++++++--------------- 1 file changed, 335 insertions(+), 332 deletions(-) diff --git a/images/win/Windows2022-Readme.md b/images/win/Windows2022-Readme.md index 1f28a156531c..a4a65c2bdb54 100644 --- a/images/win/Windows2022-Readme.md +++ b/images/win/Windows2022-Readme.md @@ -4,8 +4,8 @@ | [[all OSs] The VCPKG_ROOT variable will be removed from runner images](https://github.com/actions/runner-images/issues/6376) | *** # Microsoft Windows Server 2022 Datacenter -- OS Version: 10.0.20348 Build 1129 -- Image Version: 20221027.1 +- OS Version: 10.0.20348 Build 1249 +- Image Version: 20221120.1 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -14,10 +14,10 @@ ### Language and Runtime - Bash 5.1.16(1)-release - Go 1.17.13 -- Julia 1.8.2 -- Kotlin 1.7.20 +- Julia 1.8.3 +- Kotlin 1.7.21 - LLVM 14.0.6 -- Node 16.18.0 +- Node 16.18.1 - Perl 5.32.1 - PHP 8.1.12 - Python 3.9.13 @@ -26,14 +26,14 @@ ### Package Management - Chocolatey 1.2.0 - Composer 2.4.4 -- Helm 3.10.0 +- Helm 3.10.1 - Miniconda 4.12.0 (pre-installed on the image but not added to PATH) - NPM 8.19.2 -- NuGet 6.3.1.1 -- pip 22.3 (python 3.9) +- NuGet 6.4.0.123 +- pip 22.3.1 (python 3.9) - Pipx 1.1.0 - RubyGems 3.2.33 -- Vcpkg (build from master \<48cc0c71e>) +- Vcpkg (build from master \<4cb4a5c5d>) - Yarn 1.22.19 #### Environment variables @@ -45,18 +45,18 @@ - Ant 1.10.12 - Gradle 7.5 - Maven 3.8.6 -- sbt 1.7.2 +- sbt 1.8.0 ### Tools - 7zip 22.01 - aria2 1.36.0 -- azcopy 10.16.1 +- azcopy 10.16.2 - Bazel 5.3.2 - Bazelisk 1.13.2 -- Bicep 0.11.1 +- Bicep 0.12.40 - Cabal 3.8.1.0 -- CMake 3.24.2 -- CodeQL Action Bundle 2.11.2 +- CMake 3.25.0 +- CodeQL Action Bundle 2.11.3 - Docker 20.10.21 - Docker Compose v1 1.29.2 - Docker Compose v2 2.12.2 @@ -68,58 +68,58 @@ - InnoSetup 6.2.1 - jq 1.6 - Kind 0.17.0 -- Kubectl 1.25.3 +- Kubectl 1.25.4 - Mercurial 5.0 - Mingw-w64 11.2.0 - Newman 5.3.2 - NSIS v3.08 - OpenSSL 1.1.1 -- Packer 1.8.2 -- Pulumi v3.44.2 -- R 4.2.1 +- Packer 1.8.4 +- Pulumi v3.47.1 +- R 4.2.2 - Service Fabric SDK 9.0.1028.9590 - Stack 2.9.1 - Subversion (SVN) 1.14.2 - Swig 4.0.2 -- VSWhere 3.0.3 +- VSWhere 3.1.1 - WinAppDriver 1.2.2009.02003 - WiX Toolset v3.11.2.4516 - yamllint 1.28.0 - zstd 1.5.2 ### CLI Tools -- Alibaba Cloud CLI 3.0.134 -- AWS CLI 2.8.6 -- AWS SAM CLI 1.61.0 +- Alibaba Cloud CLI 3.0.135 +- AWS CLI 2.9.0 +- AWS SAM CLI 1.65.0 - AWS Session Manager CLI 1.2.398.0 -- Azure CLI 2.41.0 +- Azure CLI 2.42.0 - Azure DevOps CLI extension 0.25.0 -- GitHub CLI 2.18.1 +- GitHub CLI 2.20.2 - Hub CLI 2.14.2 ### Rust Tools -- Cargo 1.64.0 -- Rust 1.64.0 -- Rustdoc 1.64.0 +- Cargo 1.65.0 +- Rust 1.65.0 +- Rustdoc 1.65.0 - Rustup 1.25.1 #### Packages -- bindgen 0.61.0 -- cargo-audit 0.17.2 +- bindgen 0.62.0 +- cargo-audit 0.17.4 - cargo-outdated 0.11.1 - cbindgen 0.24.3 -- Clippy 0.1.64 +- Clippy 0.1.65 - Rustfmt 1.5.1 ### Browsers and webdrivers -- Google Chrome 107.0.5304.88 +- Google Chrome 107.0.5304.107 - Chrome Driver 107.0.5304.62 -- Microsoft Edge 106.0.1370.52 -- Microsoft Edge Driver 106.0.1370.52 -- Mozilla Firefox 106.0.2 +- Microsoft Edge 107.0.1418.52 +- Microsoft Edge Driver 107.0.1418.52 +- Mozilla Firefox 107.0 - Gecko Driver 0.32.0 - IE Driver 3.150.1.1 -- Selenium server 4.5.0 +- Selenium server 4.6.0 #### Environment variables | Name | Value | @@ -132,7 +132,7 @@ ### Java | Version | Vendor | Environment Variable | | ------------------- | --------------- | -------------------- | -| 8.0.345+1 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | +| 8.0.352+8 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | | 11.0.17+8 | Eclipse Temurin | JAVA_HOME_11_X64 | | 17.0.5+8 | Eclipse Temurin | JAVA_HOME_17_X64 | @@ -158,16 +158,15 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Version | Architecture | Environment Variable | | ------- | ------------ | -------------------- | | 1.17.13 (Default) | x64 | GOROOT_1_17_X64 | -| 1.18.7 | x64 | GOROOT_1_18_X64 | -| 1.19.2 | x64 | GOROOT_1_19_X64 | +| 1.18.8 | x64 | GOROOT_1_18_X64 | +| 1.19.3 | x64 | GOROOT_1_19_X64 | #### Node | Version | Architecture | | ------- | ------------ | -| 12.22.12 | x64 | -| 14.20.1 | x64 | -| 16.18.0 | x64 | -| 18.12.0 | x64 | +| 14.21.1 | x64 | +| 16.18.1 | x64 | +| 18.12.1 | x64 | #### Python | Version | Architecture | @@ -198,7 +197,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Property | Value | | -------------------- | ------------------------------------------------------------------------------------------------------------------------------------ | | ServiceName | postgresql-x64-14 | -| Version | 14.5 | +| Version | 14.6 | | ServiceStatus | Stopped | | ServiceStartType | Disabled | | EnvironmentVariables | PGBIN=C:\Program Files\PostgreSQL\14\bin <br> PGDATA=C:\Program Files\PostgreSQL\14\data <br> PGROOT=C:\Program Files\PostgreSQL\14 | @@ -213,7 +212,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Database tools - Azure CosmosDb Emulator 2.14.9.0 -- DacFx 16.0.6296.0 +- DacFx 16.1.6374.0 - MySQL 8.0.31.0 - SQL OLEDB Driver 18.6.3.0 - SQLPS 1.0 @@ -227,286 +226,290 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Visual Studio Enterprise 2022 | Name | Version | Path | | ----------------------------- | -------------- | -------------------------------------------------------- | -| Visual Studio Enterprise 2022 | 17.3.32929.385 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | +| Visual Studio Enterprise 2022 | 17.4.33110.190 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | #### Workloads, components and extensions: | Package | Version | | ------------------------------------------------------------------------- | -------------- | -| android | 32.0.476.0 | -| Component.Android.NDK.R21E | 17.3.32708.82 | -| Component.Android.SDK.MAUI | 17.3.32708.82 | -| Component.Android.SDK25.Private | 17.3.32708.82 | -| Component.Ant | 1.9.3.8 | -| Component.Dotfuscator | 17.3.32708.82 | -| Component.Linux.CMake | 17.3.32708.82 | -| Component.MDD.Android | 17.3.32708.82 | -| Component.MDD.Linux | 17.3.32708.82 | -| Component.MDD.Linux.GCC.arm | 17.3.32708.82 | -| Component.Microsoft.VisualStudio.LiveShare.2022 | 1.0.5545 | -| Component.Microsoft.VisualStudio.RazorExtension | 17.3.32708.82 | -| Component.Microsoft.VisualStudio.Web.AzureFunctions | 17.3.32708.82 | -| Component.Microsoft.Web.LibraryManager | 17.3.32708.82 | -| Component.Microsoft.WebTools.BrowserLink.WebLivePreview | 17.3.58.47684 | +| android | 33.0.4.0 | +| Component.Android.Emulator.MDD | 17.4.33006.217 | +| Component.Android.NDK.R23C | 17.4.33006.217 | +| Component.Android.SDK.MAUI | 17.4.33006.217 | +| Component.CPython39.x64 | 3.9.7 | +| Component.Dotfuscator | 17.4.33006.217 | +| Component.HAXM.Private | 17.4.33006.217 | +| Component.Linux.CMake | 17.4.33006.217 | +| Component.MDD.Android | 17.4.33006.217 | +| Component.MDD.Linux | 17.4.33006.217 | +| Component.MDD.Linux.GCC.arm | 17.4.33006.217 | +| Component.Microsoft.VisualStudio.LiveShare.2022 | 1.0.5716 | +| Component.Microsoft.VisualStudio.RazorExtension | 17.4.33006.217 | +| Component.Microsoft.VisualStudio.Web.AzureFunctions | 17.4.33006.217 | +| Component.Microsoft.Web.LibraryManager | 17.4.33006.217 | +| Component.Microsoft.WebTools.BrowserLink.WebLivePreview | 17.4.51.37770 | | Component.Microsoft.Windows.DriverKit | 10.0.22621.0 | -| Component.OpenJDK | 17.3.32708.82 | -| Component.UnityEngine.x64 | 17.3.32708.82 | -| Component.Unreal | 17.3.32708.82 | -| Component.Unreal.Android | 17.3.32708.82 | -| Component.Unreal.Ide | 17.3.32708.82 | +| Component.OpenJDK | 17.4.33006.217 | +| Component.UnityEngine.x64 | 17.4.33006.217 | +| Component.Unreal | 17.4.33006.217 | +| Component.Unreal.Android | 17.4.33006.217 | +| Component.Unreal.Ide | 17.4.33006.217 | | Component.VSInstallerProjects2022 | 2.0.0 | -| Component.WixToolset.VisualStudioExtension.Dev17 | 1.0.0.18 | -| Component.WixToolset.VisualStudioExtension.Schemas3 | 1.0.0.18 | -| Component.WixToolset.VisualStudioExtension.Schemas4 | 1.0.0.18 | -| Component.Xamarin | 17.3.32708.82 | -| Component.Xamarin.RemotedSimulator | 17.3.32708.82 | -| ios | 16.0.517.517 | -| maccatalyst | 15.4.465.465 | -| maui.android | 6.0.541.0 | -| maui.blazor | 6.0.541.0 | -| maui.core | 6.0.541.0 | -| maui.ios | 6.0.541.0 | -| maui.maccatalyst | 6.0.541.0 | -| maui.windows | 6.0.541.0 | -| Microsoft.Component.Azure.DataLake.Tools | 17.3.32708.82 | -| Microsoft.Component.ClickOnce | 17.3.32708.82 | -| Microsoft.Component.CodeAnalysis.SDK | 17.3.32708.82 | -| Microsoft.Component.MSBuild | 17.3.32708.82 | -| Microsoft.Component.NetFX.Native | 17.3.32708.82 | -| Microsoft.Component.PythonTools | 17.3.32708.82 | -| Microsoft.Component.PythonTools.Web | 17.3.32708.82 | -| Microsoft.Component.VC.Runtime.UCRTSDK | 17.3.32708.82 | -| Microsoft.ComponentGroup.Blend | 17.3.32708.82 | -| Microsoft.ComponentGroup.ClickOnce.Publish | 17.3.32708.82 | -| Microsoft.Net.Component.4.5.2.TargetingPack | 17.3.32708.82 | -| Microsoft.Net.Component.4.6.2.TargetingPack | 17.3.32708.82 | -| Microsoft.Net.Component.4.6.TargetingPack | 17.3.32708.82 | -| Microsoft.Net.Component.4.7.1.TargetingPack | 17.3.32708.82 | -| Microsoft.Net.Component.4.7.2.TargetingPack | 17.3.32708.82 | -| Microsoft.Net.Component.4.7.TargetingPack | 17.3.32708.82 | -| Microsoft.Net.Component.4.8.1.SDK | 17.3.32720.241 | -| Microsoft.Net.Component.4.8.1.TargetingPack | 17.3.32720.241 | -| Microsoft.Net.Component.4.8.SDK | 17.3.32708.82 | -| Microsoft.Net.Component.4.8.TargetingPack | 17.3.32708.82 | -| Microsoft.Net.ComponentGroup.4.8.DeveloperTools | 17.3.32708.82 | -| Microsoft.Net.ComponentGroup.DevelopmentPrerequisites | 17.3.32708.82 | -| Microsoft.Net.ComponentGroup.TargetingPacks.Common | 17.3.32708.82 | -| microsoft.net.runtime.android | 6.0.1022.47605 | -| microsoft.net.runtime.android.aot | 6.0.1022.47605 | -| microsoft.net.runtime.ios | 6.0.1022.47605 | -| microsoft.net.runtime.maccatalyst | 6.0.1022.47605 | -| microsoft.net.runtime.mono.tooling | 6.0.1022.47605 | -| microsoft.net.sdk.emscripten | 6.0.6.46402 | -| Microsoft.NetCore.Component.DevelopmentTools | 17.3.32708.82 | -| Microsoft.NetCore.Component.Runtime.6.0 | 17.3.32929.385 | -| Microsoft.NetCore.Component.SDK | 17.3.32929.385 | -| Microsoft.NetCore.Component.Web | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.AppInsights.Tools | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.AspNet | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.AspNet45 | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.Azure.AuthoringTools | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.Azure.ClientLibs | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.Azure.Compute.Emulator | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.Azure.Powershell | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.Azure.ResourceManager.Tools | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.Azure.ServiceFabric.Tools | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.Azure.Waverton | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.Azure.Waverton.BuildTools | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.ClassDesigner | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.CodeMap | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.Common.Azure.Tools | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.CoreEditor | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.Debugger.JustInTime | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.Debugger.Snapshot | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.DiagnosticTools | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.DockerTools | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.DotNetModelBuilder | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.DslTools | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.Embedded | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.EntityFramework | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.FSharp | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.FSharp.Desktop | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.FSharp.WebTemplates | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.GraphDocument | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.Graphics | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.Graphics.Tools | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.IISExpress | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.IntelliCode | 17.3.32804.24 | -| Microsoft.VisualStudio.Component.IntelliTrace.FrontEnd | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.JavaScript.Diagnostics | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.JavaScript.TypeScript | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.LinqToSql | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.LiveUnitTesting | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.ManagedDesktop.Core | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.ManagedDesktop.Prerequisites | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.Merq | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.MonoDebugger | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.MSODBC.SQL | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.MSSQL.CMDLnUtils | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.Node.Tools | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.NuGet | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.NuGet.BuildTools | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.PortableLibrary | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.Roslyn.Compiler | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.Roslyn.LanguageServices | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.Sharepoint.Tools | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.SQL.CLR | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.SQL.DataSources | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.SQL.LocalDB.Runtime | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.SQL.SSDT | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.TeamOffice | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.TestTools.CodedUITest | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.TestTools.WebLoadTest | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.TextTemplating | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.TypeScript.TSServer | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.Unity | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.UWP.VC.ARM64 | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.UWP.VC.ARM64EC | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM.Spectre | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM64 | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM64.Spectre | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM.Spectre | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM64 | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM64.Spectre | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.Spectre | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.ARM | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.ARM.Spectre | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.ARM64 | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.ARM64.Spectre | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.Spectre | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64 | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64.Spectre | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.VC.14.33.17.3.ARM | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.VC.14.33.17.3.ARM.Spectre | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.VC.14.33.17.3.ARM64 | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.VC.14.33.17.3.ARM64.Spectre | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.VC.14.33.17.3.ATL | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.VC.14.33.17.3.ATL.ARM | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.VC.14.33.17.3.ATL.ARM.Spectre | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.VC.14.33.17.3.ATL.ARM64 | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.VC.14.33.17.3.ATL.ARM64.Spectre | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.VC.14.33.17.3.ATL.Spectre | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.VC.14.33.17.3.MFC | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.VC.14.33.17.3.MFC.ARM | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.VC.14.33.17.3.MFC.ARM.Spectre | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.VC.14.33.17.3.MFC.ARM64 | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.VC.14.33.17.3.MFC.ARM64.Spectre | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.VC.14.33.17.3.MFC.Spectre | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.VC.14.33.17.3.x86.x64 | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.VC.14.33.17.3.x86.x64.Spectre | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.VC.ASAN | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.VC.ATL | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.VC.ATL.ARM | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.VC.ATL.ARM.Spectre | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.VC.ATL.ARM64 | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.VC.ATL.ARM64.Spectre | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.VC.ATL.ARM64EC | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.VC.ATL.ARM64EC.Spectre | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.VC.ATL.Spectre | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.VC.ATLMFC | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.VC.ATLMFC.Spectre | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.VC.CLI.Support | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.VC.CMake.Project | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.VC.CoreIde | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.VC.DiagnosticTools | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.VC.Llvm.Clang | 17.3.32714.208 | -| Microsoft.VisualStudio.Component.VC.Llvm.ClangToolset | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.VC.MFC.ARM | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.VC.MFC.ARM.Spectre | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.VC.MFC.ARM64 | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.VC.MFC.ARM64.Spectre | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.VC.MFC.ARM64EC | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.VC.MFC.ARM64EC.Spectre | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.VC.Modules.x86.x64 | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.VC.Redist.14.Latest | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.VC.Redist.MSM | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.VC.Runtimes.ARM.Spectre | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.VC.Runtimes.ARM64.Spectre | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.VC.Runtimes.ARM64EC.Spectre | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.VC.Runtimes.x86.x64.Spectre | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.VC.TestAdapterForBoostTest | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.VC.TestAdapterForGoogleTest | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.VC.Tools.ARM | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.VC.Tools.ARM64 | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.VC.Tools.ARM64EC | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.VC.Tools.x86.x64 | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.VC.v141.ARM | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.VC.v141.ARM.Spectre | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.VC.v141.ARM64 | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.VC.v141.ARM64.Spectre | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.VC.v141.ATL | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.VC.v141.ATL.Spectre | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.VC.v141.MFC | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.VC.v141.MFC.Spectre | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.VC.v141.x86.x64 | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.VC.v141.x86.x64.Spectre | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.VSSDK | 17.3.32901.149 | -| Microsoft.VisualStudio.Component.Wcf.Tooling | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.Web | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.WebDeploy | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.Windows10SDK | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.Windows10SDK.19041 | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.Windows10SDK.20348 | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.Windows11SDK.22000 | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.Windows11SDK.22621 | 17.3.32720.241 | -| Microsoft.VisualStudio.Component.Workflow | 17.3.32708.82 | -| Microsoft.VisualStudio.Component.WslDebugging | 17.3.32708.82 | -| Microsoft.VisualStudio.ComponentGroup.ArchitectureTools.Native | 17.3.32708.82 | -| Microsoft.VisualStudio.ComponentGroup.Azure.CloudServices | 17.3.32708.82 | -| Microsoft.VisualStudio.ComponentGroup.Azure.Prerequisites | 17.3.32708.82 | -| Microsoft.VisualStudio.ComponentGroup.Azure.ResourceManager.Tools | 17.3.32708.82 | -| Microsoft.VisualStudio.ComponentGroup.AzureFunctions | 17.3.32708.82 | -| Microsoft.VisualStudio.ComponentGroup.Maui.All | 17.3.32708.82 | -| Microsoft.VisualStudio.ComponentGroup.Maui.Android | 17.3.32708.82 | -| Microsoft.VisualStudio.ComponentGroup.Maui.Blazor | 17.3.32708.82 | -| Microsoft.VisualStudio.ComponentGroup.Maui.iOS | 17.3.32708.82 | -| Microsoft.VisualStudio.ComponentGroup.Maui.MacCatalyst | 17.3.32708.82 | -| Microsoft.VisualStudio.ComponentGroup.Maui.Shared | 17.3.32708.82 | -| Microsoft.VisualStudio.ComponentGroup.Maui.Windows | 17.3.32708.82 | -| Microsoft.VisualStudio.ComponentGroup.MSIX.Packaging | 17.3.32708.82 | -| Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core | 17.3.32921.402 | -| Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Llvm.Clang | 17.3.32714.208 | -| Microsoft.VisualStudio.ComponentGroup.UWP.NetCoreAndStandard | 17.3.32708.82 | -| Microsoft.VisualStudio.ComponentGroup.UWP.Support | 17.3.32708.82 | -| Microsoft.VisualStudio.ComponentGroup.UWP.VC.v142 | 17.3.32708.82 | -| Microsoft.VisualStudio.ComponentGroup.UWP.Xamarin | 17.3.32708.82 | -| Microsoft.VisualStudio.ComponentGroup.VC.Tools.142.x86.x64 | 17.3.32708.82 | -| Microsoft.VisualStudio.ComponentGroup.VisualStudioExtension.Prerequisites | 17.3.32708.82 | -| Microsoft.VisualStudio.ComponentGroup.Web | 17.3.32708.82 | -| Microsoft.VisualStudio.ComponentGroup.Web.CloudTools | 17.3.32708.82 | -| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions | 17.3.32708.82 | -| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.CMake | 17.3.32708.82 | -| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.TemplateEngine | 17.3.32708.82 | -| Microsoft.VisualStudio.Workload.Azure | 17.3.32708.82 | -| Microsoft.VisualStudio.Workload.CoreEditor | 17.3.32708.82 | -| Microsoft.VisualStudio.Workload.Data | 17.3.32708.82 | -| Microsoft.VisualStudio.Workload.DataScience | 17.3.32708.82 | -| Microsoft.VisualStudio.Workload.ManagedDesktop | 17.3.32728.75 | -| Microsoft.VisualStudio.Workload.ManagedGame | 17.3.32708.82 | -| Microsoft.VisualStudio.Workload.NativeCrossPlat | 17.3.32708.82 | -| Microsoft.VisualStudio.Workload.NativeDesktop | 17.3.32708.82 | -| Microsoft.VisualStudio.Workload.NativeGame | 17.3.32708.82 | -| Microsoft.VisualStudio.Workload.NativeMobile | 17.3.32708.82 | -| Microsoft.VisualStudio.Workload.NetCrossPlat | 17.3.32708.82 | -| Microsoft.VisualStudio.Workload.NetWeb | 17.3.32728.75 | -| Microsoft.VisualStudio.Workload.Node | 17.3.32708.82 | -| Microsoft.VisualStudio.Workload.Office | 17.3.32708.82 | -| Microsoft.VisualStudio.Workload.Python | 17.3.32708.82 | -| Microsoft.VisualStudio.Workload.Universal | 17.3.32708.82 | -| Microsoft.VisualStudio.Workload.VisualStudioExtension | 17.3.32708.82 | -| runtimes.ios | 6.0.1022.47605 | -| runtimes.maccatalyst | 6.0.1022.47605 | -| wasm.tools | 6.0.1022.47605 | +| Component.WixToolset.VisualStudioExtension.Dev17 | 1.0.0.22 | +| Component.WixToolset.VisualStudioExtension.Schemas3 | 1.0.0.22 | +| Component.Xamarin | 17.4.33006.217 | +| Component.Xamarin.RemotedSimulator | 17.4.33006.217 | +| ios | 16.0.527.1478 | +| maccatalyst | 15.4.1186.2372 | +| maui.android | 7.0.49.0 | +| maui.blazor | 7.0.49.0 | +| maui.core | 7.0.49.0 | +| maui.ios | 7.0.49.0 | +| maui.maccatalyst | 7.0.49.0 | +| maui.windows | 7.0.49.0 | +| Microsoft.Component.Azure.DataLake.Tools | 17.4.33006.217 | +| Microsoft.Component.ClickOnce | 17.4.33006.217 | +| Microsoft.Component.CodeAnalysis.SDK | 17.4.33006.217 | +| Microsoft.Component.MSBuild | 17.4.33006.217 | +| Microsoft.Component.NetFX.Native | 17.4.33006.217 | +| Microsoft.Component.PythonTools | 17.4.33006.217 | +| Microsoft.Component.PythonTools.Web | 17.4.33006.217 | +| Microsoft.Component.VC.Runtime.UCRTSDK | 17.4.33006.217 | +| Microsoft.ComponentGroup.Blend | 17.4.33006.217 | +| Microsoft.ComponentGroup.ClickOnce.Publish | 17.4.33015.44 | +| Microsoft.Net.Component.4.5.2.TargetingPack | 17.4.33006.217 | +| Microsoft.Net.Component.4.6.2.TargetingPack | 17.4.33006.217 | +| Microsoft.Net.Component.4.6.TargetingPack | 17.4.33006.217 | +| Microsoft.Net.Component.4.7.1.TargetingPack | 17.4.33006.217 | +| Microsoft.Net.Component.4.7.2.TargetingPack | 17.4.33006.217 | +| Microsoft.Net.Component.4.7.TargetingPack | 17.4.33006.217 | +| Microsoft.Net.Component.4.8.1.SDK | 17.4.33006.217 | +| Microsoft.Net.Component.4.8.1.TargetingPack | 17.4.33006.217 | +| Microsoft.Net.Component.4.8.SDK | 17.4.33006.217 | +| Microsoft.Net.Component.4.8.TargetingPack | 17.4.33006.217 | +| Microsoft.Net.ComponentGroup.4.8.DeveloperTools | 17.4.33006.217 | +| Microsoft.Net.ComponentGroup.DevelopmentPrerequisites | 17.4.33006.217 | +| Microsoft.Net.ComponentGroup.TargetingPacks.Common | 17.4.33006.217 | +| microsoft.net.runtime.android | 7.0.22.51805 | +| microsoft.net.runtime.android.aot | 7.0.22.51805 | +| microsoft.net.runtime.android.aot.net6 | 7.0.22.51805 | +| microsoft.net.runtime.android.net6 | 7.0.22.51805 | +| microsoft.net.runtime.ios | 7.0.22.51805 | +| microsoft.net.runtime.ios.net6 | 7.0.22.51805 | +| microsoft.net.runtime.maccatalyst | 7.0.22.51805 | +| microsoft.net.runtime.maccatalyst.net6 | 7.0.22.51805 | +| microsoft.net.runtime.mono.tooling | 7.0.22.51805 | +| microsoft.net.runtime.mono.tooling.net6 | 7.0.22.51805 | +| microsoft.net.sdk.emscripten.net7 | 7.0.7.1101 | +| Microsoft.NetCore.Component.DevelopmentTools | 17.4.33006.217 | +| Microsoft.NetCore.Component.Runtime.6.0 | 17.4.33103.184 | +| Microsoft.NetCore.Component.Runtime.7.0 | 17.4.33103.184 | +| Microsoft.NetCore.Component.SDK | 17.4.33103.184 | +| Microsoft.NetCore.Component.Web | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.AppInsights.Tools | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.AspNet | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.AspNet45 | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.Azure.AuthoringTools | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.Azure.ClientLibs | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.Azure.Compute.Emulator | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.Azure.Powershell | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.Azure.ResourceManager.Tools | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.Azure.ServiceFabric.Tools | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.Azure.Waverton | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.Azure.Waverton.BuildTools | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.ClassDesigner | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.CodeMap | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.Common.Azure.Tools | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.CoreEditor | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.Debugger.JustInTime | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.Debugger.Snapshot | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.DiagnosticTools | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.DockerTools | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.DotNetModelBuilder | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.DslTools | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.Embedded | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.EntityFramework | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.FSharp | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.FSharp.Desktop | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.FSharp.WebTemplates | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.GraphDocument | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.Graphics | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.Graphics.Tools | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.IISExpress | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.IntelliCode | 17.4.33027.239 | +| Microsoft.VisualStudio.Component.IntelliTrace.FrontEnd | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.JavaScript.Diagnostics | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.JavaScript.TypeScript | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.LinqToSql | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.LiveUnitTesting | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.ManagedDesktop.Core | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.ManagedDesktop.Prerequisites | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.Merq | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.MonoDebugger | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.MSODBC.SQL | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.MSSQL.CMDLnUtils | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.Node.Tools | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.NuGet | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.NuGet.BuildTools | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.PortableLibrary | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.Roslyn.Compiler | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.Roslyn.LanguageServices | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.Sharepoint.Tools | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.SQL.CLR | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.SQL.DataSources | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.SQL.LocalDB.Runtime | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.SQL.SSDT | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.TeamOffice | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.TestTools.CodedUITest | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.TestTools.WebLoadTest | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.TextTemplating | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.TypeScript.TSServer | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.Unity | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.UWP.VC.ARM64 | 17.4.33110.190 | +| Microsoft.VisualStudio.Component.UWP.VC.ARM64EC | 17.4.33027.87 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM.Spectre | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM64 | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM64.Spectre | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM.Spectre | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM64 | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM64.Spectre | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.Spectre | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.ARM | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.ARM.Spectre | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.ARM64 | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.ARM64.Spectre | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.Spectre | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64 | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64.Spectre | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.VC.14.33.17.3.ARM | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.VC.14.33.17.3.ARM.Spectre | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.VC.14.33.17.3.ARM64 | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.VC.14.33.17.3.ARM64.Spectre | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.VC.14.33.17.3.ATL | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.VC.14.33.17.3.ATL.ARM | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.VC.14.33.17.3.ATL.ARM.Spectre | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.VC.14.33.17.3.ATL.ARM64 | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.VC.14.33.17.3.ATL.ARM64.Spectre | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.VC.14.33.17.3.ATL.Spectre | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.VC.14.33.17.3.MFC | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.VC.14.33.17.3.MFC.ARM | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.VC.14.33.17.3.MFC.ARM.Spectre | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.VC.14.33.17.3.MFC.ARM64 | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.VC.14.33.17.3.MFC.ARM64.Spectre | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.VC.14.33.17.3.MFC.Spectre | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.VC.14.33.17.3.x86.x64 | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.VC.14.33.17.3.x86.x64.Spectre | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.VC.ASAN | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.VC.ATL | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.VC.ATL.ARM | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.VC.ATL.ARM.Spectre | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.VC.ATL.ARM64 | 17.4.33110.190 | +| Microsoft.VisualStudio.Component.VC.ATL.ARM64.Spectre | 17.4.33110.190 | +| Microsoft.VisualStudio.Component.VC.ATL.Spectre | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.VC.ATLMFC | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.VC.ATLMFC.Spectre | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.VC.CLI.Support | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.VC.CMake.Project | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.VC.CoreIde | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.VC.DiagnosticTools | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.VC.Llvm.Clang | 17.4.33015.44 | +| Microsoft.VisualStudio.Component.VC.Llvm.ClangToolset | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.VC.MFC.ARM | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.VC.MFC.ARM.Spectre | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.VC.MFC.ARM64 | 17.4.33110.190 | +| Microsoft.VisualStudio.Component.VC.MFC.ARM64.Spectre | 17.4.33110.190 | +| Microsoft.VisualStudio.Component.VC.Modules.x86.x64 | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.VC.Redist.14.Latest | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.VC.Redist.MSM | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.VC.Runtimes.ARM.Spectre | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.VC.Runtimes.ARM64.Spectre | 17.4.33110.190 | +| Microsoft.VisualStudio.Component.VC.Runtimes.ARM64EC.Spectre | 17.4.33027.87 | +| Microsoft.VisualStudio.Component.VC.Runtimes.x86.x64.Spectre | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.VC.TestAdapterForBoostTest | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.VC.TestAdapterForGoogleTest | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.VC.Tools.ARM | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.VC.Tools.ARM64 | 17.4.33110.190 | +| Microsoft.VisualStudio.Component.VC.Tools.ARM64EC | 17.4.33027.87 | +| Microsoft.VisualStudio.Component.VC.Tools.x86.x64 | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.VC.v141.ARM | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.VC.v141.ARM.Spectre | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.VC.v141.ARM64 | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.VC.v141.ARM64.Spectre | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.VC.v141.ATL | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.VC.v141.ATL.Spectre | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.VC.v141.MFC | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.VC.v141.MFC.Spectre | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.VC.v141.x86.x64 | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.VC.v141.x86.x64.Spectre | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.VSSDK | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.Wcf.Tooling | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.Web | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.WebDeploy | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.Windows10SDK | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.Windows10SDK.19041 | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.Windows10SDK.20348 | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.Windows11SDK.22000 | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.Windows11SDK.22621 | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.Workflow | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.WslDebugging | 17.4.33006.217 | +| Microsoft.VisualStudio.ComponentGroup.ArchitectureTools.Native | 17.4.33006.217 | +| Microsoft.VisualStudio.ComponentGroup.Azure.CloudServices | 17.4.33006.217 | +| Microsoft.VisualStudio.ComponentGroup.Azure.Prerequisites | 17.4.33006.217 | +| Microsoft.VisualStudio.ComponentGroup.Azure.ResourceManager.Tools | 17.4.33006.217 | +| Microsoft.VisualStudio.ComponentGroup.AzureFunctions | 17.4.33006.217 | +| Microsoft.VisualStudio.ComponentGroup.Maui.All | 17.4.33006.217 | +| Microsoft.VisualStudio.ComponentGroup.Maui.Android | 17.4.33006.217 | +| Microsoft.VisualStudio.ComponentGroup.Maui.Blazor | 17.4.33006.217 | +| Microsoft.VisualStudio.ComponentGroup.Maui.iOS | 17.4.33006.217 | +| Microsoft.VisualStudio.ComponentGroup.Maui.MacCatalyst | 17.4.33006.217 | +| Microsoft.VisualStudio.ComponentGroup.Maui.Shared | 17.4.33006.217 | +| Microsoft.VisualStudio.ComponentGroup.Maui.Windows | 17.4.33006.217 | +| Microsoft.VisualStudio.ComponentGroup.MSIX.Packaging | 17.4.33006.217 | +| Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core | 17.4.33006.217 | +| Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Llvm.Clang | 17.4.33015.44 | +| Microsoft.VisualStudio.ComponentGroup.UWP.NetCoreAndStandard | 17.4.33006.217 | +| Microsoft.VisualStudio.ComponentGroup.UWP.Support | 17.4.33006.217 | +| Microsoft.VisualStudio.ComponentGroup.UWP.VC.v142 | 17.4.33006.217 | +| Microsoft.VisualStudio.ComponentGroup.UWP.Xamarin | 17.4.33006.217 | +| Microsoft.VisualStudio.ComponentGroup.VC.Tools.142.x86.x64 | 17.4.33006.217 | +| Microsoft.VisualStudio.ComponentGroup.VisualStudioExtension.Prerequisites | 17.4.33006.217 | +| Microsoft.VisualStudio.ComponentGroup.Web | 17.4.33006.217 | +| Microsoft.VisualStudio.ComponentGroup.Web.CloudTools | 17.4.33006.217 | +| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions | 17.4.33006.217 | +| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.CMake | 17.4.33006.217 | +| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.TemplateEngine | 17.4.33006.217 | +| Microsoft.VisualStudio.Workload.Azure | 17.4.33006.217 | +| Microsoft.VisualStudio.Workload.CoreEditor | 17.4.33006.217 | +| Microsoft.VisualStudio.Workload.Data | 17.4.33006.217 | +| Microsoft.VisualStudio.Workload.DataScience | 17.4.33006.217 | +| Microsoft.VisualStudio.Workload.ManagedDesktop | 17.4.33006.217 | +| Microsoft.VisualStudio.Workload.ManagedGame | 17.4.33006.217 | +| Microsoft.VisualStudio.Workload.NativeCrossPlat | 17.4.33006.217 | +| Microsoft.VisualStudio.Workload.NativeDesktop | 17.4.33006.217 | +| Microsoft.VisualStudio.Workload.NativeGame | 17.4.33006.217 | +| Microsoft.VisualStudio.Workload.NativeMobile | 17.4.33006.217 | +| Microsoft.VisualStudio.Workload.NetCrossPlat | 17.4.33006.217 | +| Microsoft.VisualStudio.Workload.NetWeb | 17.4.33006.217 | +| Microsoft.VisualStudio.Workload.Node | 17.4.33006.217 | +| Microsoft.VisualStudio.Workload.Office | 17.4.33006.217 | +| Microsoft.VisualStudio.Workload.Python | 17.4.33006.217 | +| Microsoft.VisualStudio.Workload.Universal | 17.4.33006.217 | +| Microsoft.VisualStudio.Workload.VisualStudioExtension | 17.4.33006.217 | +| runtimes.ios | 7.0.22.51805 | +| runtimes.ios.net6 | 7.0.22.51805 | +| runtimes.maccatalyst | 7.0.22.51805 | +| runtimes.maccatalyst.net6 | 7.0.22.51805 | +| wasm.tools | 7.0.22.51805 | | ProBITools.MicrosoftAnalysisServicesModelingProjects2022 | 3.0.4 | | ProBITools.MicrosoftReportProjectsforVisualStudio2022 | 3.0.1 | | VisualStudioClient.MicrosoftVisualStudio2022InstallerProjects | 2.0.0 | | Windows Driver Kit | 10.1.22621.382 | | Windows Driver Kit Visual Studio Extension | 10.0.22621.0 | -| Windows Software Development Kit | 10.1.22621.1 | -| WixToolset.WixToolsetVisualStudio2022Extension | 1.0.0.18 | +| Windows Software Development Kit | 10.1.22621.755 | +| WixToolset.WixToolsetVisualStudio2022Extension | 1.0.0.22 | #### Microsoft Visual C++: | Name | Architecture | Version | @@ -517,12 +520,12 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft Visual C++ 2012 Minimum Runtime | x64 | 11.0.61030 | | Microsoft Visual C++ 2013 Additional Runtime | x64 | 12.0.40660 | | Microsoft Visual C++ 2013 Minimum Runtime | x64 | 12.0.40660 | -| Microsoft Visual C++ 2022 Additional Runtime | x64 | 14.32.31332 | -| Microsoft Visual C++ 2022 Debug Runtime | x64 | 14.32.31332 | -| Microsoft Visual C++ 2022 Minimum Runtime | x64 | 14.32.31332 | -| Microsoft Visual C++ 2022 Additional Runtime | x86 | 14.32.31332 | -| Microsoft Visual C++ 2022 Debug Runtime | x86 | 14.32.31332 | -| Microsoft Visual C++ 2022 Minimum Runtime | x86 | 14.32.31332 | +| Microsoft Visual C++ 2022 Additional Runtime | x64 | 14.34.31931 | +| Microsoft Visual C++ 2022 Debug Runtime | x64 | 14.34.31931 | +| Microsoft Visual C++ 2022 Minimum Runtime | x64 | 14.34.31931 | +| Microsoft Visual C++ 2022 Additional Runtime | x86 | 14.34.31931 | +| Microsoft Visual C++ 2022 Debug Runtime | x86 | 14.34.31931 | +| Microsoft Visual C++ 2022 Minimum Runtime | x86 | 14.34.31931 | #### Installed Windows SDKs `Location C:\Program Files (x86)\Windows Kits\10\Extension SDKs\WindowsDesktop` @@ -534,17 +537,17 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### .NET Core SDK `Location C:\Program Files\dotnet\sdk` -- 3.1.120 3.1.202 3.1.302 3.1.424 5.0.104 5.0.214 5.0.303 5.0.408 6.0.402 +- 3.1.120 3.1.202 3.1.302 3.1.425 5.0.104 5.0.214 5.0.303 5.0.408 6.0.111 6.0.203 6.0.306 6.0.403 7.0.100 ### .NET Core Runtime `Location: C:\Program Files\dotnet\shared\Microsoft.AspNetCore.App` -- 3.1.4 3.1.6 3.1.20 3.1.30 5.0.4 5.0.9 5.0.17 6.0.10 +- 3.1.4 3.1.6 3.1.20 3.1.30 3.1.31 5.0.4 5.0.9 5.0.17 6.0.5 6.0.10 6.0.11 7.0.0 `Location: C:\Program Files\dotnet\shared\Microsoft.NETCore.App` -- 3.1.4 3.1.6 3.1.20 3.1.30 5.0.4 5.0.9 5.0.17 6.0.10 +- 3.1.4 3.1.6 3.1.20 3.1.30 3.1.31 5.0.4 5.0.9 5.0.17 6.0.5 6.0.10 6.0.11 7.0.0 `Location: C:\Program Files\dotnet\shared\Microsoft.WindowsDesktop.App` -- 3.1.4 3.1.6 3.1.20 3.1.30 5.0.4 5.0.9 5.0.17 6.0.10 +- 3.1.4 3.1.6 3.1.20 3.1.31 5.0.4 5.0.9 5.0.17 6.0.5 6.0.11 7.0.0 ### .NET Framework `Type: Developer Pack` @@ -573,10 +576,10 @@ All other versions are saved but not installed. #### Powershell Modules | Module | Version | | ------------------ | ---------------- | -| AWSPowerShell | 4.1.194 | +| AWSPowerShell | 4.1.211 | | DockerMsftProvider | 1.0.0.8 | | MarkdownPS | 1.9 | -| Microsoft.Graph | 1.14.0 | +| Microsoft.Graph | 1.17.0 | | Pester | 3.4.0<br>5.3.3 | | PowerShellGet | 1.0.0.1<br>2.2.5 | | PSScriptAnalyzer | 1.21.0 | @@ -587,8 +590,8 @@ All other versions are saved but not installed. ### Android | Package Name | Version | | -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------ | -| Android Command Line Tools | 7.0 | -| Android Emulator | 31.3.12 | +| Android Command Line Tools | 8.0 | +| Android Emulator | 31.2.9 | | Android SDK Build-tools | 33.0.0<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | | Android SDK Platforms | android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | | Android SDK Platform-Tools | 33.0.3 | @@ -612,10 +615,10 @@ All other versions are saved but not installed. ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2022 | sha256:86ef1feae54df685bc33ea234c23babb704d4027a39404a072d922883a8a8049 | 2022-10-11 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2022 | sha256:73956aba99a6ee0b867774c2b5faeec11b153329f43c8c729c2c27a2024c4b98 | 2022-10-11 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:42b5c55b4918f3c56ec4a5e6a1b0735b624941bd885a13c12e30dc7a81ba2fb6 | 2022-10-11 | -| mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:fefb912e2942912f1cd55bfe6bbb697a601a7787caf5c1875aaf105c86a28027 | 2022-10-07 | -| mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:6983a9d56e4d8d1fac3819e4bed8ff537400ea21150b9d65bfbdc0ef3c27c99c | 2022-10-07 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2022 | sha256:a8b498b98761063eb29277ec08b396a5140a7f2770f5e3b435f2fd2afdb89444 | 2022-11-08 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2022 | sha256:a43a941b5ef5e065fb4ed361047a3dcc5b8d890265475741a5f951a5c0cfd80a | 2022-11-08 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:f48e1176294a32514a2f6fa5140eb2ff7610049b205b6f7f15f47916d98c1f37 | 2022-11-08 | +| mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:f1125cf932664b039a55afb666bdca7dc28d453a88430fe47be763e0270638b6 | 2022-11-05 | +| mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:8d862016bcfad6040cb9ae0f21b024fe71b058ddb42a077c32a24bcb5fc04628 | 2022-11-05 | From 4352fab581b7edb39afa98a78019189e65c92d49 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 25 Nov 2022 08:55:55 +0000 Subject: [PATCH 1600/3485] Updating readme file for macOS-12 version 20221121.1 (#6619) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-12-Readme.md | 142 ++++++++++++++++---------------- 1 file changed, 71 insertions(+), 71 deletions(-) diff --git a/images/macos/macos-12-Readme.md b/images/macos/macos-12-Readme.md index c81d72711a5e..2259e2af4733 100644 --- a/images/macos/macos-12-Readme.md +++ b/images/macos/macos-12-Readme.md @@ -8,44 +8,44 @@ # macOS 12.6 info - System Version: macOS 12.6.1 (21G217) - Kernel Version: Darwin 21.6.0 -- Image Version: 20221027.1 +- Image Version: 20221121.1 ## Installed Software ### Language and Runtime -- .NET SDK 3.1.101 3.1.201 3.1.302 3.1.424 5.0.102 5.0.202 5.0.302 5.0.408 6.0.402 +- .NET SDK 3.1.101 3.1.201 3.1.302 3.1.425 5.0.102 5.0.202 5.0.302 5.0.408 6.0.403 7.0.100 - Bash 3.2.57(1)-release - Clang/LLVM 14.0.0 is default - Clang/LLVM 14.0.6 is available on `'$(brew --prefix llvm@14)/bin/clang'` - gcc-11 (Homebrew GCC 11.3.0) 11.3.0 - available by `gcc-11` alias - GNU Fortran (Homebrew GCC 11.3.0) 11.3.0 - available by `gfortran-11` alias - Go 1.17.13 -- julia 1.8.2 -- Kotlin 1.7.20-release-201 +- julia 1.8.3 +- Kotlin 1.7.21-release-272 - MSBuild 16.10.1.51301 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) -- Node.js v16.18.0 +- Node.js v16.18.1 - NVM 0.39.2 -- NVM - Cached node versions: v12.22.12 v14.20.1 v16.18.0 +- NVM - Cached node versions: v14.21.1 v16.18.1 v18.12.1 - Perl 5.36.0 -- PHP 8.1.11 +- PHP 8.1.12 - Python 2.7.18 - Python 3.11.0 -- R 4.2.1 +- R 4.2.2 - Ruby 3.0.4p208 ### Package Management -- Bundler version 2.3.24 +- Bundler version 2.3.26 - Carthage 0.38.0 - CocoaPods 1.11.3 -- Composer 2.4.3 -- Homebrew 3.6.7 +- Composer 2.4.4 +- Homebrew 3.6.12 - Miniconda 4.12.0 - NPM 8.19.2 - NuGet 6.3.1.1 - Pip 20.3.4 (python 2.7) -- Pip 22.3 (python 3.11) +- Pip 22.3.1 (python 3.11) - Pipx 1.1.0 -- RubyGems 3.3.24 -- Vcpkg 2022 (build from master \<2de7f388c>) +- RubyGems 3.3.26 +- Vcpkg 2022 (build from master \<e819a7d0a>) - Yarn 1.22.19 #### Environment variables @@ -58,72 +58,72 @@ - Apache Ant(TM) 1.10.12 - Apache Maven 3.8.6 - Gradle 7.5.1 -- Sbt 1.7.2 +- Sbt 1.8.0 ### Utilities - 7-Zip 17.04 - aria2 1.36.0 -- azcopy 10.16.1 +- azcopy 10.16.2 - bazel 5.3.2 -- bazelisk 1.14.0 +- bazelisk 1.15.0 - bsdtar 3.5.1 - available by 'tar' alias -- Curl 7.85.0 +- Curl 7.86.0 - Git 2.38.1 - Git LFS: 3.2.0 -- GitHub CLI: 2.18.1 +- GitHub CLI: 2.20.2 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.3 - gpg (GnuPG) 2.3.8 - Hub CLI: 2.14.2 -- ImageMagick 7.1.0-51 +- ImageMagick 7.1.0-52 - jq 1.6 - mongo v5.0.11 - mongod v5.0.11 -- OpenSSL 1.1.1q 5 Jul 2022 `(/usr/local/opt/openssl@1.1 -> ../Cellar/openssl@1.1/1.1.1q)` -- Packer 1.8.3 -- PostgreSQL 14.5 (Homebrew) -- psql (PostgreSQL) 14.5 (Homebrew) +- OpenSSL 1.1.1s 1 Nov 2022 `(/usr/local/opt/openssl@1.1 -> ../Cellar/openssl@1.1/1.1.1s)` +- Packer 1.8.4 +- PostgreSQL 14.6 (Homebrew) +- psql (PostgreSQL) 14.6 (Homebrew) - Sox 14.4.2 - Subversion (SVN) 1.14.2 - Switchaudio-osx 1.1.0 -- Vagrant 2.3.2 +- Vagrant 2.3.3 - VirtualBox 6.1.38r153438 -- yq (https://github.com/mikefarah/yq/) version 4.28.2 +- yq (https://github.com/mikefarah/yq/) version v4.30.4 - zstd 1.5.2 ### Tools - App Center CLI 2.11.0 -- AWS CLI 2.8.6 -- AWS SAM CLI 1.61.0 +- AWS CLI 2.9.0 +- AWS SAM CLI 1.65.0 - AWS Session Manager CLI 1.2.398.0 - Azure CLI (azure-devops) 0.25.0 -- Azure CLI 2.41.0 -- Bicep CLI 0.11.1 +- Azure CLI 2.42.0 +- Bicep CLI 0.12.40 - Cabal 3.6.2.0 -- Cmake 3.24.2 -- CodeQL Action Bundle 2.11.2 +- Cmake 3.25.0 +- CodeQL Action Bundle 2.11.3 - Colima 0.4.6 -- Fastlane 2.210.1 -- GHC 9.4.2 +- Fastlane 2.211.0 +- GHC 9.4.3 - GHCup 0.1.18.0 - Jazzy 0.14.3 - Stack 2.9.1 - SwiftFormat 0.50.3 -- Swig 4.0.2 -- Xcode Command Line Tools 14.0.0.0.1.1661618636 +- Swig 4.1.0 +- Xcode Command Line Tools 14.1.0.0.1.1666437224 ### Linters -- SwiftLint 0.49.1 +- SwiftLint 0.50.0 - yamllint 1.28.0 ### Browsers - Safari 16.1 (17614.2.9.1.13) - SafariDriver 16.1 (17614.2.9.1.13) -- Google Chrome 107.0.5304.87 +- Google Chrome 107.0.5304.110 - ChromeDriver 107.0.5304.62 -- Microsoft Edge 107.0.1418.24 -- Microsoft Edge WebDriver 107.0.1418.23 -- Mozilla Firefox 106.0.2 +- Microsoft Edge 107.0.1418.52 +- Microsoft Edge WebDriver 107.0.1418.52 +- Mozilla Firefox 107.0 - geckodriver 0.32.0 - Selenium server 4.5.0 @@ -137,9 +137,9 @@ ### Java | Version | Vendor | Environment Variable | | ------------------- | --------------- | -------------------- | -| 8.0.345+1 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | -| 11.0.16+101 | Eclipse Temurin | JAVA_HOME_11_X64 | -| 17.0.4+101 | Eclipse Temurin | JAVA_HOME_17_X64 | +| 8.0.352+8 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | +| 11.0.17+8 | Eclipse Temurin | JAVA_HOME_11_X64 | +| 17.0.5+8 | Eclipse Temurin | JAVA_HOME_17_X64 | ### GraalVM | Version | Environment variables | @@ -166,30 +166,29 @@ - 3.9.12 [PyPy 7.3.9] #### Node.js -- 12.22.12 -- 14.20.1 -- 16.18.0 -- 18.12.0 +- 14.21.1 +- 16.18.1 +- 18.12.1 #### Go | Version | Architecture | Environment Variable | | ------- | ------------ | -------------------- | | 1.17.13 (Default) | x64 | GOROOT_1_17_X64 | -| 1.18.7 | x64 | GOROOT_1_18_X64 | -| 1.19.2 | x64 | GOROOT_1_19_X64 | +| 1.18.8 | x64 | GOROOT_1_18_X64 | +| 1.19.3 | x64 | GOROOT_1_19_X64 | ### Rust Tools -- Cargo 1.64.0 -- Rust 1.64.0 -- Rustdoc 1.64.0 +- Cargo 1.65.0 +- Rust 1.65.0 +- Rustdoc 1.65.0 - Rustup 1.25.1 #### Packages -- Bindgen 0.61.0 -- Cargo-audit 0.17.2 +- Bindgen 0.62.0 +- Cargo-audit 0.17.4 - Cargo-outdated 0.11.1 - Cbindgen 0.24.3 -- Clippy 0.1.64 +- Clippy 0.1.65 - Rustfmt 1.5.1-stable ### PowerShell Tools @@ -198,7 +197,7 @@ #### PowerShell Modules | Module | Version | | ---------------- | ------- | -| Az | 9.0.1 | +| Az | 9.1.1 | | MarkdownPS | 1.9 | | Pester | 5.3.3 | | PSScriptAnalyzer | 1.21.0 | @@ -211,10 +210,10 @@ ### Xamarin #### Visual Studio for Mac -| Version | Build | Path | -| -------------- | --------- | ------------------------------------ | -| 2019 | 8.10.25.2 | /Applications/Visual Studio 2019.app | -| 2022 (default) | 17.3.8.5 | /Applications/Visual Studio.app | +| Version | Build | Path | +| -------------- | ----------- | ------------------------------------ | +| 2019 | 8.10.25.2 | /Applications/Visual Studio 2019.app | +| 2022 (default) | 17.4.0.2406 | /Applications/Visual Studio.app | ##### Notes: ``` @@ -226,7 +225,8 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" #### Xamarin bundles | symlink | Xamarin.Mono | Xamarin.iOS | Xamarin.Mac | Xamarin.Android | | ----------------- | ------------ | ----------- | ----------- | --------------- | -| 6_12_20 (default) | 6.12 | 16.0 | 8.12 | 13.0 | +| 6_12_21 (default) | 6.12 | 16.0 | 8.12 | 13.1 | +| 6_12_20 | 6.12 | 16.0 | 8.12 | 13.0 | | 6_12_19 | 6.12 | 15.12 | 8.12 | 13.0 | | 6_12_18 | 6.12 | 15.10 | 8.10 | 12.3 | | 6_12_17 | 6.12 | 15.10 | 8.10 | 12.2 | @@ -315,16 +315,16 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" | tvOS 15.4 | 13.3.1<br>13.4<br>13.4.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | | tvOS 16.0 | 13.1<br>13.2.1<br>13.3.1<br>13.4<br>13.4.1<br>14.0<br>14.0.1<br>14.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | | tvOS 16.1 | 13.1<br>13.2.1<br>13.3.1<br>13.4<br>13.4.1<br>14.0<br>14.0.1<br>14.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p)<br>Apple TV 4K (at 1080p) (2nd generation) | -| watchOS 8.0 | 13.1 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 - 45mm<br>Apple Watch Series 7 (41mm) | -| watchOS 8.3 | 13.2.1 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 45mm<br>Apple Watch Series 7 (41mm) | -| watchOS 8.5 | 13.3.1<br>13.4<br>13.4.1 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 7 - 45mm<br>Apple Watch Series 7 (41mm) | -| watchOS 9.0 | 13.1<br>13.2.1<br>13.3.1<br>13.4<br>13.4.1<br>14.0<br>14.0.1<br>14.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | -| watchOS 9.1 | 13.1<br>13.2.1<br>13.3.1<br>13.4<br>13.4.1<br>14.0<br>14.0.1<br>14.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | +| watchOS 8.0 | 13.1 | Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm) | +| watchOS 8.3 | 13.2.1 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 - 45mm<br>Apple Watch Series 7 (41mm) | +| watchOS 8.5 | 13.3.1<br>13.4<br>13.4.1 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 45mm<br>Apple Watch Series 7 (41mm) | +| watchOS 9.0 | 13.1<br>13.2.1<br>13.3.1<br>13.4<br>13.4.1<br>14.0<br>14.0.1<br>14.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | +| watchOS 9.1 | 13.1<br>13.2.1<br>13.3.1<br>13.4<br>13.4.1<br>14.0<br>14.0.1<br>14.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | ### Android | Package Name | Version | | -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------ | -| Android Command Line Tools | 7.0 | +| Android Command Line Tools | 8.0 | | Android Emulator | 31.3.13 | | Android SDK Build-tools | 33.0.0<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | | Android SDK Platforms | android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | @@ -347,15 +347,15 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" | ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | ### Miscellaneous -- libXext 1.3.4 -- libXft 2.3.6 +- libXext 1.3.5 +- libXft 2.3.7 - Tcl/Tk 8.6.12_1 - Zlib 1.2.13 #### Environment variables | Name | Value | | ----------------- | ----------------------------------------------------------------------------------------- | -| PARALLELS_DMG_URL | https://download.parallels.com/desktop/v18/18.0.2-53077/ParallelsDesktop-18.0.2-53077.dmg | +| PARALLELS_DMG_URL | https://download.parallels.com/desktop/v18/18.1.0-53311/ParallelsDesktop-18.1.0-53311.dmg | ##### Notes: ``` From 439d09333d25551badb24fa4e949bf3a162d5373 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Fri, 25 Nov 2022 20:33:49 +0100 Subject: [PATCH 1601/3485] [Windows] Update Visual Studio components (#6633) --- images/win/toolsets/toolset-2022.json | 36 +++++++++++++-------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index 56f0cd9dd0a2..75909337aceb 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -253,24 +253,24 @@ "Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.ARM.Spectre", "Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.ARM64", "Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.ARM64.Spectre", - "Microsoft.VisualStudio.Component.VC.14.33.17.3.ARM", - "Microsoft.VisualStudio.Component.VC.14.33.17.3.ARM.Spectre", - "Microsoft.VisualStudio.Component.VC.14.33.17.3.ARM64", - "Microsoft.VisualStudio.Component.VC.14.33.17.3.ARM64.Spectre", - "Microsoft.VisualStudio.Component.VC.14.33.17.3.x86.x64", - "Microsoft.VisualStudio.Component.VC.14.33.17.3.x86.x64.Spectre", - "Microsoft.VisualStudio.Component.VC.14.33.17.3.ATL", - "Microsoft.VisualStudio.Component.VC.14.33.17.3.ATL.Spectre", - "Microsoft.VisualStudio.Component.VC.14.33.17.3.ATL.ARM", - "Microsoft.VisualStudio.Component.VC.14.33.17.3.ATL.ARM.Spectre", - "Microsoft.VisualStudio.Component.VC.14.33.17.3.ATL.ARM64", - "Microsoft.VisualStudio.Component.VC.14.33.17.3.ATL.ARM64.Spectre", - "Microsoft.VisualStudio.Component.VC.14.33.17.3.MFC", - "Microsoft.VisualStudio.Component.VC.14.33.17.3.MFC.Spectre", - "Microsoft.VisualStudio.Component.VC.14.33.17.3.MFC.ARM", - "Microsoft.VisualStudio.Component.VC.14.33.17.3.MFC.ARM.Spectre", - "Microsoft.VisualStudio.Component.VC.14.33.17.3.MFC.ARM64", - "Microsoft.VisualStudio.Component.VC.14.33.17.3.MFC.ARM64.Spectre", + "Microsoft.VisualStudio.Component.VC.14.34.17.4.ARM", + "Microsoft.VisualStudio.Component.VC.14.34.17.4.ARM.Spectre", + "Microsoft.VisualStudio.Component.VC.14.34.17.4.ARM64", + "Microsoft.VisualStudio.Component.VC.14.34.17.4.ARM64.Spectre", + "Microsoft.VisualStudio.Component.VC.14.34.17.4.x86.x64", + "Microsoft.VisualStudio.Component.VC.14.34.17.4.x86.x64.Spectre", + "Microsoft.VisualStudio.Component.VC.14.34.17.4.ATL", + "Microsoft.VisualStudio.Component.VC.14.34.17.4.ATL.Spectre", + "Microsoft.VisualStudio.Component.VC.14.34.17.4.ATL.ARM", + "Microsoft.VisualStudio.Component.VC.14.34.17.4.ATL.ARM.Spectre", + "Microsoft.VisualStudio.Component.VC.14.34.17.4.ATL.ARM64", + "Microsoft.VisualStudio.Component.VC.14.34.17.4.ATL.ARM64.Spectre", + "Microsoft.VisualStudio.Component.VC.14.34.17.4.MFC", + "Microsoft.VisualStudio.Component.VC.14.34.17.4.MFC.Spectre", + "Microsoft.VisualStudio.Component.VC.14.34.17.4.MFC.ARM", + "Microsoft.VisualStudio.Component.VC.14.34.17.4.MFC.ARM.Spectre", + "Microsoft.VisualStudio.Component.VC.14.34.17.4.MFC.ARM64", + "Microsoft.VisualStudio.Component.VC.14.34.17.4.MFC.ARM64.Spectre", "Microsoft.VisualStudio.Component.VC.ATLMFC", "Microsoft.VisualStudio.Component.VC.ATLMFC.Spectre", "Microsoft.VisualStudio.Component.Windows10SDK.19041", From 5dd62e7a08dcaede9085450c86c4643f482f9803 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Sat, 26 Nov 2022 13:47:48 +0100 Subject: [PATCH 1602/3485] Add PPA repository for Firefox as default (#6528) --- .../SoftwareReport/SoftwareReport.Browsers.psm1 | 3 ++- .../SoftwareReport/SoftwareReport.Generator.ps1 | 11 +++-------- images/linux/scripts/installers/firefox.sh | 12 +++++++++++- images/linux/scripts/tests/Browsers.Tests.ps1 | 2 +- images/linux/ubuntu2204.pkr.hcl | 1 + 5 files changed, 18 insertions(+), 11 deletions(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Browsers.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Browsers.psm1 index 9ba439062d79..3269acbd976f 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Browsers.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Browsers.psm1 @@ -10,7 +10,8 @@ function Get-ChromeDriverVersion { function Get-FirefoxVersion { $firefoxVersion = firefox --version - return $firefoxVersion + $aptSourceRepo = Get-AptSourceRepository -PackageName "mozillateam" + return "$firefoxVersion (apt source repository: $aptSourceRepo)" } function Get-GeckodriverVersion { diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index e486305e4078..d6e98c652407 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -246,16 +246,11 @@ $browsersAndDriversList = @( (Get-ChromiumVersion), (Get-EdgeVersion), (Get-EdgeDriverVersion), - (Get-SeleniumVersion) + (Get-SeleniumVersion), + (Get-FirefoxVersion), + (Get-GeckodriverVersion) ) -if ((Test-IsUbuntu18) -or (Test-IsUbuntu20)) { - $browsersAndDriversList += @( - (Get-FirefoxVersion), - (Get-GeckodriverVersion) - ) -} - $markdown += New-MDList -Style Unordered -Lines $browsersAndDriversList $markdown += New-MDHeader "Environment variables" -Level 4 $markdown += Build-BrowserWebdriversEnvironmentTable | New-MDTable diff --git a/images/linux/scripts/installers/firefox.sh b/images/linux/scripts/installers/firefox.sh index 968bd84ac037..5008d962dd22 100644 --- a/images/linux/scripts/installers/firefox.sh +++ b/images/linux/scripts/installers/firefox.sh @@ -7,8 +7,18 @@ # Source the helpers for use with the script source $HELPER_SCRIPTS/install.sh +FIREFOX_REPO="ppa:mozillateam/ppa" + # Install Firefox -apt-get install -y firefox +add-apt-repository $FIREFOX_REPO -y +apt-get update +apt-get install --target-release 'o=LP-PPA-mozillateam' -y firefox + +# Remove source repo's +add-apt-repository --remove $FIREFOX_REPO + +# Document apt source repo's +echo "mozillateam $FIREFOX_REPO" >> $HELPER_SCRIPTS/apt-sources.txt # add to gloabl system preferences for firefox locale en_US, because other browsers have en_US local. # Default firefox local is en_GB diff --git a/images/linux/scripts/tests/Browsers.Tests.ps1 b/images/linux/scripts/tests/Browsers.Tests.ps1 index db1c30ef615a..3b920351bef6 100644 --- a/images/linux/scripts/tests/Browsers.Tests.ps1 +++ b/images/linux/scripts/tests/Browsers.Tests.ps1 @@ -1,4 +1,4 @@ -Describe "Firefox" -Skip:(Test-IsUbuntu22) { +Describe "Firefox" { It "Firefox" { "sudo -i firefox --version" | Should -ReturnZeroExitCode } diff --git a/images/linux/ubuntu2204.pkr.hcl b/images/linux/ubuntu2204.pkr.hcl index cf95a117b03d..0042e7363a83 100644 --- a/images/linux/ubuntu2204.pkr.hcl +++ b/images/linux/ubuntu2204.pkr.hcl @@ -287,6 +287,7 @@ build { "${path.root}/scripts/installers/codeql-bundle.sh", "${path.root}/scripts/installers/containers.sh", "${path.root}/scripts/installers/dotnetcore-sdk.sh", + "${path.root}/scripts/installers/firefox.sh", "${path.root}/scripts/installers/microsoft-edge.sh", "${path.root}/scripts/installers/gcc.sh", "${path.root}/scripts/installers/gfortran.sh", From c03be40bb5a1a4c5b85776423e6ec69c9cb88497 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Thu, 1 Dec 2022 10:19:05 +0100 Subject: [PATCH 1603/3485] [Ubuntu] Update Az module version to 9.0.1 (#6665) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Alexey Ayupov <“alexey.ayupov@akvelon.com”> --- images/linux/toolsets/toolset-1804.json | 5 +++-- images/linux/toolsets/toolset-2004.json | 5 +++-- images/linux/toolsets/toolset-2204.json | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index d27be16d1988..74069f16a2e3 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -123,13 +123,14 @@ "name": "az", "url" : "https://raw.githubusercontent.com/Azure/az-ps-module-versions/main/versions-manifest.json", "versions": [ - "7.5.0" + "9.0.1" ], "zip_versions": [ "3.1.0", "4.4.0", "5.9.0", - "6.6.0" + "6.6.0", + "7.5.0" ] } ], diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index 8c71c541d69f..3e92d8d16b75 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -121,13 +121,14 @@ "name": "az", "url" : "https://raw.githubusercontent.com/Azure/az-ps-module-versions/main/versions-manifest.json", "versions": [ - "7.5.0" + "9.0.1" ], "zip_versions": [ "3.1.0", "4.4.0", "5.9.0", - "6.6.0" + "6.6.0", + "7.5.0" ] } ], diff --git a/images/linux/toolsets/toolset-2204.json b/images/linux/toolsets/toolset-2204.json index 76c9e6851297..2128f62e8a93 100644 --- a/images/linux/toolsets/toolset-2204.json +++ b/images/linux/toolsets/toolset-2204.json @@ -109,7 +109,7 @@ "name": "az", "url" : "https://raw.githubusercontent.com/Azure/az-ps-module-versions/main/versions-manifest.json", "versions": [ - "7.5.0" + "9.0.1" ], "zip_versions": [ ] From f30492c37fa20bf258b2da7887ec730665c3f124 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Thu, 1 Dec 2022 10:20:50 +0100 Subject: [PATCH 1604/3485] [Windows] Update Az module version to 9.0.1 (#6664) --- images/win/toolsets/toolset-2019.json | 5 +++-- images/win/toolsets/toolset-2022.json | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index 37faf8c8e511..96a0be95b8a5 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -127,7 +127,7 @@ "name": "az", "url" : "https://raw.githubusercontent.com/Azure/az-ps-module-versions/main/versions-manifest.json", "versions": [ - "7.5.0" + "9.0.1" ], "zip_versions": [ "1.0.0", @@ -142,7 +142,8 @@ "4.7.0", "5.5.0", "5.9.0", - "6.6.0" + "6.6.0", + "7.5.0" ] } ], diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index 75909337aceb..f8746410c136 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -119,10 +119,10 @@ "name": "az", "url" : "https://raw.githubusercontent.com/Azure/az-ps-module-versions/main/versions-manifest.json", "versions": [ - "7.5.0" + "9.0.1" ], "zip_versions": [ - "6.6.0" + "7.5.0" ] } ], From e5acd7847f40b5e5b299736333ea707b40168443 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 1 Dec 2022 10:08:23 +0000 Subject: [PATCH 1605/3485] Updating readme file for macOS-12 version 20221127.5 (#6652) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-12-Readme.md | 66 ++++++++++++++++----------------- 1 file changed, 32 insertions(+), 34 deletions(-) diff --git a/images/macos/macos-12-Readme.md b/images/macos/macos-12-Readme.md index 2259e2af4733..50c0c60cff16 100644 --- a/images/macos/macos-12-Readme.md +++ b/images/macos/macos-12-Readme.md @@ -1,14 +1,12 @@ | Announcements | |-| -| [[all OSs] Nodejs 12.x will be removed from the images on November, 14](https://github.com/actions/runner-images/issues/6482) | | [macOS-latest workflows will use macOS-12](https://github.com/actions/runner-images/issues/6384) | -| [[all OSs] The VCPKG_ROOT variable will be removed from runner images](https://github.com/actions/runner-images/issues/6376) | | [The macOS 10.15 Actions runner image will begin deprecation on 5/31/22 and will be fully unsupported by 12/1/22 for GitHub and ADO](https://github.com/actions/runner-images/issues/5583) | *** # macOS 12.6 info - System Version: macOS 12.6.1 (21G217) - Kernel Version: Darwin 21.6.0 -- Image Version: 20221121.1 +- Image Version: 20221127.5 ## Installed Software ### Language and Runtime @@ -26,7 +24,7 @@ - NVM 0.39.2 - NVM - Cached node versions: v14.21.1 v16.18.1 v18.12.1 - Perl 5.36.0 -- PHP 8.1.12 +- PHP 8.1.13 - Python 2.7.18 - Python 3.11.0 - R 4.2.2 @@ -45,7 +43,7 @@ - Pip 22.3.1 (python 3.11) - Pipx 1.1.0 - RubyGems 3.3.26 -- Vcpkg 2022 (build from master \<e819a7d0a>) +- Vcpkg 2022 (build from master \<62d01b70d>) - Yarn 1.22.19 #### Environment variables @@ -57,7 +55,7 @@ ### Project Management - Apache Ant(TM) 1.10.12 - Apache Maven 3.8.6 -- Gradle 7.5.1 +- Gradle 7.6 - Sbt 1.8.0 ### Utilities @@ -92,8 +90,8 @@ - zstd 1.5.2 ### Tools -- App Center CLI 2.11.0 -- AWS CLI 2.9.0 +- App Center CLI 2.12.0 +- AWS CLI 2.9.1 - AWS SAM CLI 1.65.0 - AWS Session Manager CLI 1.2.398.0 - Azure CLI (azure-devops) 0.25.0 @@ -101,28 +99,28 @@ - Bicep CLI 0.12.40 - Cabal 3.6.2.0 - Cmake 3.25.0 -- CodeQL Action Bundle 2.11.3 +- CodeQL Action Bundle 2.11.4 - Colima 0.4.6 - Fastlane 2.211.0 - GHC 9.4.3 - GHCup 0.1.18.0 - Jazzy 0.14.3 - Stack 2.9.1 -- SwiftFormat 0.50.3 +- SwiftFormat 0.50.4 - Swig 4.1.0 - Xcode Command Line Tools 14.1.0.0.1.1666437224 ### Linters -- SwiftLint 0.50.0 +- SwiftLint 0.50.1 - yamllint 1.28.0 ### Browsers - Safari 16.1 (17614.2.9.1.13) - SafariDriver 16.1 (17614.2.9.1.13) -- Google Chrome 107.0.5304.110 +- Google Chrome 107.0.5304.121 - ChromeDriver 107.0.5304.62 -- Microsoft Edge 107.0.1418.52 -- Microsoft Edge WebDriver 107.0.1418.52 +- Microsoft Edge 107.0.1418.56 +- Microsoft Edge WebDriver 107.0.1418.56 - Mozilla Firefox 107.0 - geckodriver 0.32.0 - Selenium server 4.5.0 @@ -148,9 +146,9 @@ ### Cached Tools #### Ruby -- 2.7.6 -- 3.0.4 -- 3.1.2 +- 2.7.7 +- 3.0.5 +- 3.1.3 #### Python - 3.7.15 @@ -184,7 +182,7 @@ - Rustup 1.25.1 #### Packages -- Bindgen 0.62.0 +- Bindgen 0.63.0 - Cargo-audit 0.17.4 - Cargo-outdated 0.11.1 - Cbindgen 0.24.3 @@ -316,25 +314,25 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" | tvOS 16.0 | 13.1<br>13.2.1<br>13.3.1<br>13.4<br>13.4.1<br>14.0<br>14.0.1<br>14.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | | tvOS 16.1 | 13.1<br>13.2.1<br>13.3.1<br>13.4<br>13.4.1<br>14.0<br>14.0.1<br>14.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p)<br>Apple TV 4K (at 1080p) (2nd generation) | | watchOS 8.0 | 13.1 | Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm) | -| watchOS 8.3 | 13.2.1 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 - 45mm<br>Apple Watch Series 7 (41mm) | -| watchOS 8.5 | 13.3.1<br>13.4<br>13.4.1 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 45mm<br>Apple Watch Series 7 (41mm) | +| watchOS 8.3 | 13.2.1 | Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | +| watchOS 8.5 | 13.3.1<br>13.4<br>13.4.1 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 (45mm) | | watchOS 9.0 | 13.1<br>13.2.1<br>13.3.1<br>13.4<br>13.4.1<br>14.0<br>14.0.1<br>14.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | | watchOS 9.1 | 13.1<br>13.2.1<br>13.3.1<br>13.4<br>13.4.1<br>14.0<br>14.0.1<br>14.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | ### Android -| Package Name | Version | -| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------ | -| Android Command Line Tools | 8.0 | -| Android Emulator | 31.3.13 | -| Android SDK Build-tools | 33.0.0<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | -| Android SDK Platforms | android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | -| Android SDK Platform-Tools | 33.0.3 | -| Android Support Repository | 47.0.0 | -| CMake | 3.18.1<br>3.22.1 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 23.2.8568313<br>24.0.8215888<br>25.1.8937393 (default) | -| SDK Patch Applier v4 | 1 | +| Package Name | Version | +| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 8.0 | +| Android Emulator | 31.3.13 | +| Android SDK Build-tools | 33.0.0 33.0.1<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | +| Android SDK Platforms | android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | +| Android SDK Platform-Tools | 33.0.3 | +| Android Support Repository | 47.0.0 | +| CMake | 3.18.1<br>3.22.1 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 23.2.8568313<br>24.0.8215888<br>25.1.8937393 (default) | +| SDK Patch Applier v4 | 1 | #### Environment variables | Name | Value | @@ -349,7 +347,7 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" ### Miscellaneous - libXext 1.3.5 - libXft 2.3.7 -- Tcl/Tk 8.6.12_1 +- Tcl/Tk 8.6.13 - Zlib 1.2.13 #### Environment variables From b6441120c5a70f2a93ee3fbe4002420b7344192b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 1 Dec 2022 10:32:32 +0000 Subject: [PATCH 1606/3485] Updating readme file for win22 version 20221127.1 (#6643) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2022-Readme.md | 104 +++++++++++++++---------------- 1 file changed, 49 insertions(+), 55 deletions(-) diff --git a/images/win/Windows2022-Readme.md b/images/win/Windows2022-Readme.md index a4a65c2bdb54..c3f9e6a284a9 100644 --- a/images/win/Windows2022-Readme.md +++ b/images/win/Windows2022-Readme.md @@ -1,11 +1,6 @@ -| Announcements | -|-| -| [[all OSs] Nodejs 12.x will be removed from the images on November, 14](https://github.com/actions/runner-images/issues/6482) | -| [[all OSs] The VCPKG_ROOT variable will be removed from runner images](https://github.com/actions/runner-images/issues/6376) | -*** # Microsoft Windows Server 2022 Datacenter - OS Version: 10.0.20348 Build 1249 -- Image Version: 20221120.1 +- Image Version: 20221127.1 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -19,9 +14,9 @@ - LLVM 14.0.6 - Node 16.18.1 - Perl 5.32.1 -- PHP 8.1.12 +- PHP 8.1.13 - Python 3.9.13 -- Ruby 3.0.4p208 +- Ruby 3.0.5p211 ### Package Management - Chocolatey 1.2.0 @@ -33,7 +28,7 @@ - pip 22.3.1 (python 3.9) - Pipx 1.1.0 - RubyGems 3.2.33 -- Vcpkg (build from master \<4cb4a5c5d>) +- Vcpkg (build from master \<62d01b70d>) - Yarn 1.22.19 #### Environment variables @@ -56,10 +51,10 @@ - Bicep 0.12.40 - Cabal 3.8.1.0 - CMake 3.25.0 -- CodeQL Action Bundle 2.11.3 +- CodeQL Action Bundle 2.11.4 - Docker 20.10.21 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.12.2 +- Docker Compose v2 2.13.0 - Docker-wincred 0.7.0 - ghc 9.4.2 - Git 2.38.1.windows.1 @@ -75,7 +70,7 @@ - NSIS v3.08 - OpenSSL 1.1.1 - Packer 1.8.4 -- Pulumi v3.47.1 +- Pulumi v3.48.0 - R 4.2.2 - Service Fabric SDK 9.0.1028.9590 - Stack 2.9.1 @@ -88,8 +83,8 @@ - zstd 1.5.2 ### CLI Tools -- Alibaba Cloud CLI 3.0.135 -- AWS CLI 2.9.0 +- Alibaba Cloud CLI 3.0.139 +- AWS CLI 2.9.1 - AWS SAM CLI 1.65.0 - AWS Session Manager CLI 1.2.398.0 - Azure CLI 2.42.0 @@ -104,7 +99,7 @@ - Rustup 1.25.1 #### Packages -- bindgen 0.62.0 +- bindgen 0.63.0 - cargo-audit 0.17.4 - cargo-outdated 0.11.1 - cbindgen 0.24.3 @@ -112,10 +107,10 @@ - Rustfmt 1.5.1 ### Browsers and webdrivers -- Google Chrome 107.0.5304.107 +- Google Chrome 107.0.5304.122 - Chrome Driver 107.0.5304.62 -- Microsoft Edge 107.0.1418.52 -- Microsoft Edge Driver 107.0.1418.52 +- Microsoft Edge 107.0.1418.56 +- Microsoft Edge Driver 107.0.1418.56 - Mozilla Firefox 107.0 - Gecko Driver 0.32.0 - IE Driver 3.150.1.1 @@ -180,9 +175,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Ruby | Version | Architecture | | ------- | ------------ | -| 2.7.6 | x64 | -| 3.0.4 (Default) | x64 | -| 3.1.2 | x64 | +| 2.7.7 | x64 | +| 3.0.5 (Default) | x64 | +| 3.1.3 | x64 | #### PyPy | Python Version | PyPy Version | @@ -208,7 +203,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### MongoDB | Version | ServiceName | ServiceStatus | ServiceStartType | | -------- | ----------- | ------------- | ---------------- | -| 5.0.13.0 | MongoDB | Stopped | Disabled | +| 5.0.14.0 | MongoDB | Stopped | Disabled | ### Database tools - Azure CosmosDb Emulator 2.14.9.0 @@ -384,24 +379,24 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.Spectre | 17.4.33006.217 | | Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64 | 17.4.33006.217 | | Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64.Spectre | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.VC.14.33.17.3.ARM | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.VC.14.33.17.3.ARM.Spectre | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.VC.14.33.17.3.ARM64 | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.VC.14.33.17.3.ARM64.Spectre | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.VC.14.33.17.3.ATL | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.VC.14.33.17.3.ATL.ARM | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.VC.14.33.17.3.ATL.ARM.Spectre | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.VC.14.33.17.3.ATL.ARM64 | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.VC.14.33.17.3.ATL.ARM64.Spectre | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.VC.14.33.17.3.ATL.Spectre | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.VC.14.33.17.3.MFC | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.VC.14.33.17.3.MFC.ARM | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.VC.14.33.17.3.MFC.ARM.Spectre | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.VC.14.33.17.3.MFC.ARM64 | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.VC.14.33.17.3.MFC.ARM64.Spectre | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.VC.14.33.17.3.MFC.Spectre | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.VC.14.33.17.3.x86.x64 | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.VC.14.33.17.3.x86.x64.Spectre | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.VC.14.34.17.4.ARM | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.VC.14.34.17.4.ARM.Spectre | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.VC.14.34.17.4.ARM64 | 17.4.33110.190 | +| Microsoft.VisualStudio.Component.VC.14.34.17.4.ARM64.Spectre | 17.4.33110.190 | +| Microsoft.VisualStudio.Component.VC.14.34.17.4.ATL | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.VC.14.34.17.4.ATL.ARM | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.VC.14.34.17.4.ATL.ARM.Spectre | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.VC.14.34.17.4.ATL.ARM64 | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.VC.14.34.17.4.ATL.ARM64.Spectre | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.VC.14.34.17.4.ATL.Spectre | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.VC.14.34.17.4.MFC | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.VC.14.34.17.4.MFC.ARM | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.VC.14.34.17.4.MFC.ARM.Spectre | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.VC.14.34.17.4.MFC.ARM64 | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.VC.14.34.17.4.MFC.ARM64.Spectre | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.VC.14.34.17.4.MFC.Spectre | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.VC.14.34.17.4.x86.x64 | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.VC.14.34.17.4.x86.x64.Spectre | 17.4.33006.217 | | Microsoft.VisualStudio.Component.VC.ASAN | 17.4.33006.217 | | Microsoft.VisualStudio.Component.VC.ATL | 17.4.33006.217 | | Microsoft.VisualStudio.Component.VC.ATL.ARM | 17.4.33006.217 | @@ -576,7 +571,7 @@ All other versions are saved but not installed. #### Powershell Modules | Module | Version | | ------------------ | ---------------- | -| AWSPowerShell | 4.1.211 | +| AWSPowerShell | 4.1.214 | | DockerMsftProvider | 1.0.0.8 | | MarkdownPS | 1.9 | | Microsoft.Graph | 1.17.0 | @@ -588,19 +583,19 @@ All other versions are saved but not installed. | VSSetup | 2.2.16 | ### Android -| Package Name | Version | -| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------ | -| Android Command Line Tools | 8.0 | -| Android Emulator | 31.2.9 | -| Android SDK Build-tools | 33.0.0<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | -| Android SDK Platforms | android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | -| Android SDK Platform-Tools | 33.0.3 | -| Android Support Repository | 47.0.0 | -| CMake | 3.18.1<br>3.22.1 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 23.2.8568313<br>24.0.8215888<br>25.1.8937393 | -| SDK Patch Applier v4 | 1 | +| Package Name | Version | +| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 8.0 | +| Android Emulator | 31.2.9 | +| Android SDK Build-tools | 33.0.0 33.0.1<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | +| Android SDK Platforms | android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | +| Android SDK Platform-Tools | 33.0.3 | +| Android Support Repository | 47.0.0 | +| CMake | 3.18.1<br>3.22.1 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 23.2.8568313<br>24.0.8215888<br>25.1.8937393 | +| SDK Patch Applier v4 | 1 | #### Environment variables | Name | Value | @@ -621,4 +616,3 @@ All other versions are saved but not installed. | mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:f1125cf932664b039a55afb666bdca7dc28d453a88430fe47be763e0270638b6 | 2022-11-05 | | mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:8d862016bcfad6040cb9ae0f21b024fe71b058ddb42a077c32a24bcb5fc04628 | 2022-11-05 | - From f26b0e7671a13cc3b12c76a190a1ccdc01d234dc Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 1 Dec 2022 11:24:24 +0000 Subject: [PATCH 1607/3485] Updating readme file for macOS-11 version 20221127.7 (#6651) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-11-Readme.md | 62 ++++++++++++++++----------------- 1 file changed, 30 insertions(+), 32 deletions(-) diff --git a/images/macos/macos-11-Readme.md b/images/macos/macos-11-Readme.md index d14c8eebc989..330a35933af4 100644 --- a/images/macos/macos-11-Readme.md +++ b/images/macos/macos-11-Readme.md @@ -1,14 +1,12 @@ | Announcements | |-| -| [[all OSs] Nodejs 12.x will be removed from the images on November, 14](https://github.com/actions/runner-images/issues/6482) | | [macOS-latest workflows will use macOS-12](https://github.com/actions/runner-images/issues/6384) | -| [[all OSs] The VCPKG_ROOT variable will be removed from runner images](https://github.com/actions/runner-images/issues/6376) | | [The macOS 10.15 Actions runner image will begin deprecation on 5/31/22 and will be fully unsupported by 12/1/22 for GitHub and ADO](https://github.com/actions/runner-images/issues/5583) | *** # macOS 11.7 info - System Version: macOS 11.7.1 (20G918) - Kernel Version: Darwin 20.6.0 -- Image Version: 20221121.1 +- Image Version: 20221127.7 ## Installed Software ### Language and Runtime @@ -30,7 +28,7 @@ - NVM 0.39.2 - NVM - Cached node versions: v14.21.1 v16.18.1 v18.12.1 - Perl 5.36.0 -- PHP 8.1.12 +- PHP 8.1.13 - Python 2.7.18 - Python 3.11.0 - R 4.2.2 @@ -49,7 +47,7 @@ - Pip 22.3.1 (python 3.11) - Pipx 1.1.0 - RubyGems 3.3.26 -- Vcpkg 2022 (build from master \<e819a7d0a>) +- Vcpkg 2022 (build from master \<62d01b70d>) - Yarn 1.22.19 #### Environment variables @@ -61,7 +59,7 @@ ### Project Management - Apache Ant(TM) 1.10.12 - Apache Maven 3.8.6 -- Gradle 7.5.1 +- Gradle 7.6 - Sbt 1.8.0 ### Utilities @@ -96,9 +94,9 @@ - zstd 1.5.2 ### Tools -- Aliyun CLI 3.0.136 -- App Center CLI 2.11.0 -- AWS CLI 2.9.0 +- Aliyun CLI 3.0.137 +- App Center CLI 2.12.0 +- AWS CLI 2.9.1 - AWS SAM CLI 1.65.0 - AWS Session Manager CLI 1.2.398.0 - Azure CLI (azure-devops) 0.25.0 @@ -106,14 +104,14 @@ - Bicep CLI 0.12.40 - Cabal 3.6.2.0 - Cmake 3.25.0 -- CodeQL Action Bundle 2.11.3 +- CodeQL Action Bundle 2.11.4 - Colima 0.4.6 - Fastlane 2.211.0 - GHC 9.4.3 - GHCup 0.1.18.0 - Jazzy 0.14.3 - Stack 2.9.1 -- SwiftFormat 0.50.3 +- SwiftFormat 0.50.4 - Swig 4.1.0 - Xcode Command Line Tools 13.2.0.0.1.1638488800 @@ -124,10 +122,10 @@ ### Browsers - Safari 16.1 (16614.2.9.1.13) - SafariDriver 16.1 (16614.2.9.1.13) -- Google Chrome 107.0.5304.110 +- Google Chrome 107.0.5304.121 - ChromeDriver 107.0.5304.62 -- Microsoft Edge 107.0.1418.52 -- Microsoft Edge WebDriver 107.0.1418.52 +- Microsoft Edge 107.0.1418.56 +- Microsoft Edge WebDriver 107.0.1418.56 - Mozilla Firefox 107.0 - geckodriver 0.32.0 - Selenium server 4.5.0 @@ -156,9 +154,9 @@ - 2.4.10 - 2.5.9 - 2.6.10 -- 2.7.6 -- 3.0.4 -- 3.1.2 +- 2.7.7 +- 3.0.5 +- 3.1.3 #### Python - 3.7.15 @@ -192,7 +190,7 @@ - Rustup 1.25.1 #### Packages -- Bindgen 0.62.0 +- Bindgen 0.63.0 - Cargo-audit 0.17.4 - Cargo-outdated 0.11.1 - Cbindgen 0.24.3 @@ -334,19 +332,19 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" | watchOS 8.3 | 13.2.1 | Apple Watch Series 4 - 40mm<br>Apple Watch Series 4 - 44mm<br>Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | ### Android -| Package Name | Version | -| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------ | -| Android Command Line Tools | 8.0 | -| Android Emulator | 31.3.13 | -| Android SDK Build-tools | 33.0.0<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | -| Android SDK Platforms | android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | -| Android SDK Platform-Tools | 33.0.3 | -| Android Support Repository | 47.0.0 | -| CMake | 3.10.2<br>3.18.1<br>3.22.1 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 23.2.8568313<br>24.0.8215888<br>25.1.8937393 (default) | -| SDK Patch Applier v4 | 1 | +| Package Name | Version | +| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 8.0 | +| Android Emulator | 31.3.13 | +| Android SDK Build-tools | 33.0.0 33.0.1<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | +| Android SDK Platforms | android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | +| Android SDK Platform-Tools | 33.0.3 | +| Android Support Repository | 47.0.0 | +| CMake | 3.10.2<br>3.18.1<br>3.22.1 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 23.2.8568313<br>24.0.8215888<br>25.1.8937393 (default) | +| SDK Patch Applier v4 | 1 | #### Environment variables | Name | Value | @@ -361,7 +359,7 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" ### Miscellaneous - libXext 1.3.5 - libXft 2.3.7 -- Tcl/Tk 8.6.12_1 +- Tcl/Tk 8.6.13 - Zlib 1.2.13 From b4d939bd383f69fd5ee6c844705dd019ed9dcacc Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Thu, 1 Dec 2022 12:52:02 +0100 Subject: [PATCH 1608/3485] Add workflows to create SBOM and upload it to release asset (#6655) --- .github/workflows/create_sbom_report.yml | 88 ++++++++++++++++++++++++ 1 file changed, 88 insertions(+) create mode 100644 .github/workflows/create_sbom_report.yml diff --git a/.github/workflows/create_sbom_report.yml b/.github/workflows/create_sbom_report.yml new file mode 100644 index 000000000000..7bb644857f52 --- /dev/null +++ b/.github/workflows/create_sbom_report.yml @@ -0,0 +1,88 @@ +name: Create and upload a SBOM to release assets +# Inherited variables: +# github.event.client_payload.imageLabel - AzDO image label +# github.event.client_payload.GHreleaseID - Current release ID +# github.event.client_payload.imageVersion - AzDO image version "major.minor" +# github.event.client_payload.ReleaseBranchName - Necessary to identify workflow run +# +# Current SYFT tool issues: +# macOS (minor): very long cataloging process (more than 6 hours) (https://github.com/anchore/syft/issues/1328), +# macOS (major): prompt privilegies that blocking process indefinetely (https://github.com/anchore/syft/issues/1367) +on: + repository_dispatch: + types: [generate-sbom] +defaults: + run: + shell: pwsh +jobs: + #Converting image OS variable for the next steps + initialize: + runs-on: ubuntu-latest + outputs: + agent-spec: ${{ steps.converter.outputs.current-os }} + steps: + - name: Convert image label variable for ${{ github.event.client_payload.ReleaseBranchName }} + id: converter + run: | + $imageLabel = "${{ github.event.client_payload.imageLabel }}" + $currentOS = switch ($imageLabel) { + 'ubuntu22' { "ubuntu-22.04" } + 'ubuntu20' { "ubuntu-20.04" } + 'ubuntu18' { "ubuntu-18.04" } + 'win22' { "windows-2022" } + 'win19' { "windows-2019" } + 'macOS-12' { "macos-12" } + 'macOS-11' { "macos-11" } + default { + echo "currentOS variable is undefined. Please check imageLabel." + exit 1 + } + } + "current-os=$currentOS" | Out-File -FilePath $env:GITHUB_OUTPUT -Append + #Checking image version on available runner + version-check: + needs: initialize + runs-on: ${{ needs.initialize.output.agent-spec }} + steps: + - name: Available image version check + run: | + if ($env:ImageVersion -ne '${{ github.event.client_payload.imageVersion }}') { + echo "Error. Current runner $env:ImageVersion image version don't match ${{ github.event.client_payload.imageVersion }}." + exit 1 + } + #Install and run SYFT, compress SBOM, upload it to release assets + create-sbom: + needs: [initialize, version-check] + runs-on: ${{ needs.initialize.output.agent-spec }} + steps: + #Installation section + - name: Install SYFT tool on Windows + if: ${{ runner.os == 'Windows' }} + run: curl -sSfL https://raw.githubusercontent.com/anchore/syft/main/install.sh | sh -s -- -b D:/syft + - name: Install SYFT tool on Ubuntu or macOS + if: ${{ runner.os != 'Windows' }} + run: curl -sSfL https://raw.githubusercontent.com/anchore/syft/main/install.sh | sh -s -- -b /usr/local/bin + #Running section. + - name: Run SYFT on Windows + if: ${{ runner.os == 'Windows' }} + run: D:/syft/syft dir:C:/ -vv -o spdx-json=sbom.json + - name: Run SYFT on Ubuntu + if: ${{ runner.os == 'Linux' }} + run: syft dir:/ -vv -o spdx-json=sbom.json + - name: Run SYFT on macOS + if: ${{ runner.os == 'macOS' }} + run: syft dir:/ -vv -o spdx-json=sbom.json --exclude ./Users --exclude ./System/Volumes --exclude ./private + #Preparing artifact (raw SBOM.x.json is too big) + - name: Compress SBOM file + run: Compress-Archive sbom.json sbom.${{ github.event.client_payload.imageLabel }}.json.zip + #Upload release asset action + #Might be changed to softprops/action-gh-release after additional check + - name: Upload release asset + uses: actions/upload-release-asset@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + upload_url: "https://uploads.github.com/repos/actions/runner-images/releases/${{ github.event.client_payload.GHreleaseID }}/assets{?name,label}" + asset_path: ./sbom.${{ github.event.client_payload.imageLabel }}.json.zip + asset_name: sbom.${{ github.event.client_payload.imageLabel }}.json.zip + asset_content_type: application/zip \ No newline at end of file From 8959c489f2a78eef664a8d15e6d3d6ac2bd061c8 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 1 Dec 2022 14:48:27 +0000 Subject: [PATCH 1609/3485] Updating readme file for win19 version 20221127.1 (#6644) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2019-Readme.md | 42 ++++++++++++++------------------ 1 file changed, 18 insertions(+), 24 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index ce5ae29649a4..d33ff1eb8938 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -1,11 +1,6 @@ -| Announcements | -|-| -| [[all OSs] Nodejs 12.x will be removed from the images on November, 14](https://github.com/actions/runner-images/issues/6482) | -| [[all OSs] The VCPKG_ROOT variable will be removed from runner images](https://github.com/actions/runner-images/issues/6376) | -*** # Microsoft Windows Server 2019 Datacenter - OS Version: 10.0.17763 Build 3650 -- Image Version: 20221119.1 +- Image Version: 20221127.1 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -19,7 +14,7 @@ - LLVM 14.0.6 - Node 16.18.1 - Perl 5.32.1 -- PHP 8.1.12 +- PHP 8.1.13 - Python 3.7.9 - Ruby 2.5.9p229 @@ -33,7 +28,7 @@ - pip 22.3.1 (python 3.7) - Pipx 1.1.0 - RubyGems 2.7.6.3 -- Vcpkg (build from master \<4cb4a5c5d>) +- Vcpkg (build from master \<62d01b70d>) - Yarn 1.22.19 #### Environment variables @@ -57,10 +52,10 @@ - Bicep 0.12.40 - Cabal 3.8.1.0 - CMake 3.25.0 -- CodeQL Action Bundle 2.11.3 +- CodeQL Action Bundle 2.11.4 - Docker 20.10.21 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.12.2 +- Docker Compose v2 2.13.0 - Docker-wincred 0.7.0 - ghc 9.4.2 - Git 2.38.1.windows.1 @@ -78,7 +73,7 @@ - OpenSSL 1.1.1 - Packer 1.8.4 - Parcel 2.8.0 -- Pulumi v3.47.1 +- Pulumi v3.48.0 - R 4.2.2 - Service Fabric SDK 9.0.1028.9590 - Stack 2.9.1 @@ -91,8 +86,8 @@ - zstd 1.5.2 ### CLI Tools -- Alibaba Cloud CLI 3.0.135 -- AWS CLI 2.9.0 +- Alibaba Cloud CLI 3.0.139 +- AWS CLI 2.9.1 - AWS SAM CLI 1.65.0 - AWS Session Manager CLI 1.2.398.0 - Azure CLI 2.42.0 @@ -108,7 +103,7 @@ - Rustup 1.25.1 #### Packages -- bindgen 0.62.0 +- bindgen 0.63.0 - cargo-audit 0.17.4 - cargo-outdated 0.11.1 - cbindgen 0.24.3 @@ -116,10 +111,10 @@ - Rustfmt 1.5.1 ### Browsers and webdrivers -- Google Chrome 107.0.5304.107 +- Google Chrome 107.0.5304.122 - Chrome Driver 107.0.5304.62 -- Microsoft Edge 107.0.1418.52 -- Microsoft Edge Driver 107.0.1418.52 +- Microsoft Edge 107.0.1418.56 +- Microsoft Edge Driver 107.0.1418.56 - Mozilla Firefox 107.0 - Gecko Driver 0.32.0 - IE Driver 3.150.1.1 @@ -193,9 +188,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | 2.4.10 | x64 | | 2.5.9 (Default) | x64 | | 2.6.10 | x64 | -| 2.7.6 | x64 | -| 3.0.4 | x64 | -| 3.1.2 | x64 | +| 2.7.7 | x64 | +| 3.0.5 | x64 | +| 3.1.3 | x64 | #### PyPy | Python Version | PyPy Version | @@ -222,7 +217,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### MongoDB | Version | ServiceName | ServiceStatus | ServiceStartType | | -------- | ----------- | ------------- | ---------------- | -| 5.0.13.0 | MongoDB | Stopped | Disabled | +| 5.0.14.0 | MongoDB | Stopped | Disabled | ### Database tools - Azure CosmosDb Emulator 2.14.9.0 @@ -549,7 +544,7 @@ All other versions are saved but not installed. #### Powershell Modules | Module | Version | | ------------------ | ---------------- | -| AWSPowerShell | 4.1.211 | +| AWSPowerShell | 4.1.214 | | DockerMsftProvider | 1.0.0.8 | | MarkdownPS | 1.9 | | Microsoft.Graph | 1.17.0 | @@ -564,7 +559,7 @@ All other versions are saved but not installed. | Package Name | Version | | -------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 8.0 | -| Android SDK Build-tools | 33.0.0<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3<br>26.0.0 26.0.1 26.0.2 26.0.3<br>25.0.0 25.0.1 25.0.2 25.0.3<br>24.0.0 24.0.1 24.0.2 24.0.3<br>23.0.1 23.0.2 23.0.3<br>22.0.1<br>21.1.2<br>20.0.0<br>19.1.0 | +| Android SDK Build-tools | 33.0.0 33.0.1<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3<br>26.0.0 26.0.1 26.0.2 26.0.3<br>25.0.0 25.0.1 25.0.2 25.0.3<br>24.0.0 24.0.1 24.0.2 24.0.3<br>23.0.1 23.0.2 23.0.3<br>22.0.1<br>21.1.2<br>20.0.0<br>19.1.0 | | Android SDK Platforms | android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3)<br>android-26 (rev 2)<br>android-25 (rev 3)<br>android-24 (rev 2)<br>android-23 (rev 3)<br>android-22 (rev 2)<br>android-21 (rev 2)<br>android-20 (rev 2)<br>android-19 (rev 4) | | Android SDK Platform-Tools | 33.0.3 | | Android SDK Tools | 26.1.1 | @@ -595,4 +590,3 @@ All other versions are saved but not installed. | mcr.microsoft.com/windows/nanoserver:1809 | sha256:5c9da3bfe1524eab610dfd41c79a0805c080f8307d810d62bba106b5df587698 | 2022-11-05 | | mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:cbb8b0a709b4e0868cd2e30b1485358197b1021bb0dd4261e36b3af3ca48fd0b | 2022-11-05 | - From ec8d7d9c1e6ec74e574b3444e554027eafc08bc6 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Fri, 2 Dec 2022 14:31:06 +0100 Subject: [PATCH 1610/3485] Windows update IEDriverServer version to latest (#6671) --- .../win/scripts/Installers/Install-IEWebDriver.ps1 | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/images/win/scripts/Installers/Install-IEWebDriver.ps1 b/images/win/scripts/Installers/Install-IEWebDriver.ps1 index 79e9cf3ae5de..afc533697f80 100644 --- a/images/win/scripts/Installers/Install-IEWebDriver.ps1 +++ b/images/win/scripts/Installers/Install-IEWebDriver.ps1 @@ -3,15 +3,9 @@ ## Desc: Install Selenium Web Drivers ################################################################################ -try { - $latestReleaseUrl = "https://selenium-release.storage.googleapis.com/" - $latestReleaseInfo = Invoke-RestMethod -Uri $latestReleaseUrl - $latestIEVersion = $latestReleaseInfo.ListBucketResult.Contents | Where-Object Key -match "IEDriverServer_x64" | Sort-Object LastModified | Select-Object -ExpandProperty Key -Last 1 - $ieDriverUrl = -join ($latestReleaseUrl, $latestIEVersion) -} catch { - Write-Error "[!] Failed to get IEDriver version [$latestReleaseUrl]: $_" - exit 1 -} + +$json = Invoke-RestMethod -Uri "https://api.github.com/repos/SeleniumHQ/selenium/releases?per_page=100" +$ieDriverUrl = $json.Where{-not $_.prerelease}.assets.browser_download_url | Where-Object { $_ -like "*IEDriverServer_x64_*.zip" } | Select-Object -First 1 # Download IE selenium driver try { From ac8ae6b0eeeec50305bf54ffdf588d5bbe9fc145 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 2 Dec 2022 15:59:58 +0000 Subject: [PATCH 1611/3485] Updating readme file for ubuntu22 version 20221127.1 (#6646) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2204-Readme.md | 73 +++++++++++++++---------------- 1 file changed, 36 insertions(+), 37 deletions(-) diff --git a/images/linux/Ubuntu2204-Readme.md b/images/linux/Ubuntu2204-Readme.md index 25d9a042f4ea..f34a3a05121e 100644 --- a/images/linux/Ubuntu2204-Readme.md +++ b/images/linux/Ubuntu2204-Readme.md @@ -1,14 +1,11 @@ | Announcements | |-| -| [[all OSs] Nodejs 12.x will be removed from the images on November, 14](https://github.com/actions/runner-images/issues/6482) | | [Ubuntu-latest workflows will use Ubuntu-22.04](https://github.com/actions/runner-images/issues/6399) | -| [[all OSs] The VCPKG_ROOT variable will be removed from runner images](https://github.com/actions/runner-images/issues/6376) | -| [Third party PHP repository will be removed from the Ubuntu 22.04 image](https://github.com/actions/runner-images/issues/6331) | | [The Ubuntu 18.04 Actions runner image will begin deprecation on 2022/08/08 and will be fully unsupported by 2023/04/01](https://github.com/actions/runner-images/issues/6002) | *** # Ubuntu 22.04.1 LTS - Linux kernel version: 5.15.0-1023-azure -- Image Version: 20221119.2 +- Image Version: 20221127.1 ## Installed Software ### Language and Runtime @@ -33,7 +30,7 @@ ### Package Management - cpan 1.64 - Helm 3.10.2 -- Homebrew 3.6.11 +- Homebrew 3.6.12 - Miniconda 4.12.0 - Npm 8.19.2 - NuGet 6.3.1.1 @@ -41,7 +38,7 @@ - Pip3 22.0.2 - Pipx 1.1.0 - RubyGems 3.3.5 -- Vcpkg (build from master \<4cb4a5c5d>) +- Vcpkg (build from master \<62d01b70d>) - Yarn 1.22.19 ##### Notes: @@ -62,7 +59,7 @@ to accomplish this. - Lerna 6.0.3 ### Tools -- Ansible 2.13.6 +- Ansible 2.14.0 - apt-fast 1.9.12 - AzCopy 10.16.2 (available by `azcopy` and `azcopy10` aliases) - Bazel 5.3.2 @@ -70,7 +67,7 @@ to accomplish this. - Bicep 0.12.40 - Buildah 1.23.1 - CMake 3.25.0 -- CodeQL Action Bundle 2.11.3 +- CodeQL Action Bundle 2.11.4 - Docker Amazon ECR Credential Helper 0.6.0 - Docker Compose v1 1.29.2 - Docker Compose v2 2.12.2+azure-1 @@ -98,19 +95,19 @@ to accomplish this. - Packer 1.8.4 - Parcel 2.8.0 - Podman 3.4.4 -- Pulumi 3.47.1 +- Pulumi 3.48.0 - R 4.2.2 - Skopeo 1.4.1 - Sphinx Open Source Search Server 2.2.11 - SVN 1.14.1 - Terraform 1.3.5 - yamllint 1.28.0 -- yq v4.30.4 +- yq v4.30.5 - zstd 1.5.2 (homebrew) ### CLI Tools -- Alibaba Cloud CLI 3.0.135 -- AWS CLI 2.9.0 +- Alibaba Cloud CLI 3.0.139 +- AWS CLI 2.9.1 - AWS CLI Session manager plugin 1.2.398.0 - AWS SAM CLI 1.65.0 - Azure CLI (azure-cli) 2.42.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) @@ -118,10 +115,10 @@ to accomplish this. - GitHub CLI 2.20.2 - Google Cloud SDK 410.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 12.2.4 -- OpenShift CLI 4.11.13 +- Netlify CLI 12.2.7 +- OpenShift CLI 4.11.16 - ORAS CLI 0.16.0 -- Vercel CLI 28.5.5 +- Vercel CLI 28.5.6 ### Java | Version | Vendor | Environment Variable | @@ -157,7 +154,7 @@ to accomplish this. - Rustup 1.25.1 #### Packages -- Bindgen 0.62.0 +- Bindgen 0.63.0 - Cargo audit 0.17.4 - Cargo clippy 0.1.65 - Cargo outdated 0.11.1 @@ -165,19 +162,21 @@ to accomplish this. - Rustfmt 1.5.1 ### Browsers and Drivers -- Google Chrome 107.0.5304.110 +- Google Chrome 107.0.5304.121 - ChromeDriver 107.0.5304.62 - Chromium 107.0.5288.0 -- Microsoft Edge 107.0.1418.52 (apt source repository: https://packages.microsoft.com/repos/edge) -- Microsoft Edge WebDriver 107.0.1418.52 +- Microsoft Edge 107.0.1418.56 (apt source repository: https://packages.microsoft.com/repos/edge) +- Microsoft Edge WebDriver 107.0.1418.56 - Selenium server 4.6.0 +- Mozilla Firefox 107.0 (apt source repository: ppa:mozillateam/ppa) +- Geckodriver 0.32.0 #### Environment variables | Name | Value | | ----------------- | ----------------------------------- | | CHROMEWEBDRIVER | /usr/local/share/chrome_driver | | EDGEWEBDRIVER | /usr/local/share/edge_driver | -| GECKOWEBDRIVER | | +| GECKOWEBDRIVER | /usr/local/share/gecko_driver | | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | ### .NET Core SDK @@ -231,7 +230,7 @@ to accomplish this. - 3.11.0 #### Ruby -- 3.1.2 +- 3.1.3 #### Environment variables | Name | Value | Architecture | @@ -261,20 +260,20 @@ to accomplish this. | nginx | 1.18.0 | /etc/nginx/nginx.conf | inactive | 80 | ### Android -| Package Name | Version | -| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------ | -| Android Command Line Tools | 8.0 | -| Android Emulator | 31.3.13 | -| Android SDK Build-tools | 33.0.0<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | -| Android SDK Platform-Tools | 33.0.3 | -| Android SDK Platforms | android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | -| Android SDK Tools | 26.1.1 | -| Android Support Repository | 47.0.0 | -| CMake | 3.10.2<br>3.18.1<br>3.22.1 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 23.2.8568313<br>24.0.8215888<br>25.1.8937393 (default) | -| SDK Patch Applier v4 | 1 | +| Package Name | Version | +| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 8.0 | +| Android Emulator | 31.3.13 | +| Android SDK Build-tools | 33.0.0 33.0.1<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | +| Android SDK Platform-Tools | 33.0.3 | +| Android SDK Platforms | android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | +| Android SDK Tools | 26.1.1 | +| Android Support Repository | 47.0.0 | +| CMake | 3.10.2<br>3.18.1<br>3.22.1 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 23.2.8568313<br>24.0.8215888<br>25.1.8937393 (default) | +| SDK Patch Applier v4 | 1 | #### Environment variables | Name | Value | @@ -369,7 +368,7 @@ to accomplish this. | pollinate | 4.33-3ubuntu2 | | python-is-python3 | 3.9.2-2 | | rpm | 4.17.0+dfsg1-4build1 | -| rsync | 3.2.3-8ubuntu3 | +| rsync | 3.2.3-8ubuntu3.1 | | shellcheck | 0.8.0-2 | | sphinxsearch | 2.2.11-8 | | sqlite3 | 3.37.2-2ubuntu0.1 | @@ -388,7 +387,7 @@ to accomplish this. | upx | 3.96-3 | | wget | 1.21.2-2ubuntu1 | | xorriso | 1.5.4-2 | -| xvfb | 2:21.1.3-2ubuntu2.2 | +| xvfb | 2:21.1.3-2ubuntu2.3 | | xz-utils | 5.2.5-2ubuntu1 | | zip | 3.0-12build2 | | zsync | 0.6.2-3ubuntu1 | From 6557cd55232dbdcd63850655561e938252ab09c6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 2 Dec 2022 16:17:28 +0000 Subject: [PATCH 1612/3485] Updating readme file for ubuntu20 version 20221125.1 (#6645) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2004-Readme.md | 69 +++++++++++++++---------------- 1 file changed, 33 insertions(+), 36 deletions(-) diff --git a/images/linux/Ubuntu2004-Readme.md b/images/linux/Ubuntu2004-Readme.md index da076b9f7d1f..7cb18dc2a994 100644 --- a/images/linux/Ubuntu2004-Readme.md +++ b/images/linux/Ubuntu2004-Readme.md @@ -1,14 +1,11 @@ | Announcements | |-| -| [[all OSs] Nodejs 12.x will be removed from the images on November, 14](https://github.com/actions/runner-images/issues/6482) | | [Ubuntu-latest workflows will use Ubuntu-22.04](https://github.com/actions/runner-images/issues/6399) | -| [[all OSs] The VCPKG_ROOT variable will be removed from runner images](https://github.com/actions/runner-images/issues/6376) | -| [Third party PHP repository will be removed from the Ubuntu 22.04 image](https://github.com/actions/runner-images/issues/6331) | | [The Ubuntu 18.04 Actions runner image will begin deprecation on 2022/08/08 and will be fully unsupported by 2023/04/01](https://github.com/actions/runner-images/issues/6002) | *** # Ubuntu 20.04.5 LTS - Linux kernel version: 5.15.0-1023-azure -- Image Version: 20221119.2 +- Image Version: 20221125.1 ## Installed Software ### Language and Runtime @@ -35,7 +32,7 @@ ### Package Management - cpan 1.64 - Helm 3.10.2 -- Homebrew 3.6.11 +- Homebrew 3.6.12 - Miniconda 4.12.0 - Npm 8.19.2 - NuGet 6.3.1.1 @@ -43,7 +40,7 @@ - Pip3 20.0.2 - Pipx 1.1.0 - RubyGems 3.1.2 -- Vcpkg (build from master \<4cb4a5c5d>) +- Vcpkg (build from master \<62d01b70d>) - Yarn 1.22.19 ##### Notes: @@ -62,7 +59,7 @@ to accomplish this. ### Project Management - Ant 1.10.7 -- Gradle 7.5.1 +- Gradle 7.6 - Lerna 6.0.3 - Maven 3.8.6 - Sbt 1.8.0 @@ -76,7 +73,7 @@ to accomplish this. - Bicep 0.12.40 - Buildah 1.22.3 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - CMake 3.25.0 -- CodeQL Action Bundle 2.11.3 +- CodeQL Action Bundle 2.11.4 - Docker Amazon ECR Credential Helper 0.6.0 - Docker Compose v1 1.29.2 - Docker Compose v2 2.12.2+azure-1 @@ -106,7 +103,7 @@ to accomplish this. - Parcel 2.8.0 - PhantomJS 2.1.1 - Podman 3.4.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- Pulumi 3.47.1 +- Pulumi 3.48.0 - R 4.2.2 - Skopeo 1.5.0 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 @@ -117,8 +114,8 @@ to accomplish this. - zstd 1.5.2 (homebrew) ### CLI Tools -- Alibaba Cloud CLI 3.0.135 -- AWS CLI 2.9.0 +- Alibaba Cloud CLI 3.0.138 +- AWS CLI 2.9.1 - AWS CLI Session manager plugin 1.2.398.0 - AWS SAM CLI 1.65.0 - Azure CLI (azure-cli) 2.42.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) @@ -126,10 +123,10 @@ to accomplish this. - GitHub CLI 2.20.2 - Google Cloud SDK 410.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 12.2.4 -- OpenShift CLI 4.11.13 +- Netlify CLI 12.2.7 +- OpenShift CLI 4.11.16 - ORAS CLI 0.16.0 -- Vercel CLI 28.5.5 +- Vercel CLI 28.5.6 ### Java | Version | Vendor | Environment Variable | @@ -165,7 +162,7 @@ to accomplish this. - Rustup 1.25.1 #### Packages -- Bindgen 0.62.0 +- Bindgen 0.63.0 - Cargo audit 0.17.4 - Cargo clippy 0.1.65 - Cargo outdated 0.11.1 @@ -173,11 +170,11 @@ to accomplish this. - Rustfmt 1.5.1 ### Browsers and Drivers -- Google Chrome 107.0.5304.110 +- Google Chrome 107.0.5304.121 - ChromeDriver 107.0.5304.62 - Chromium 107.0.5288.0 -- Microsoft Edge 107.0.1418.52 (apt source repository: https://packages.microsoft.com/repos/edge) -- Microsoft Edge WebDriver 107.0.1418.52 +- Microsoft Edge 107.0.1418.56 (apt source repository: https://packages.microsoft.com/repos/edge) +- Microsoft Edge WebDriver 107.0.1418.56 - Selenium server 4.6.0 - Mozilla Firefox 107.0 - Geckodriver 0.32.0 @@ -248,9 +245,9 @@ to accomplish this. #### Ruby - 2.5.9 - 2.6.10 -- 2.7.6 -- 3.0.4 -- 3.1.2 +- 2.7.7 +- 3.0.5 +- 3.1.3 #### Environment variables | Name | Value | Architecture | @@ -281,20 +278,20 @@ to accomplish this. | nginx | 1.18.0 | /etc/nginx/nginx.conf | inactive | 80 | ### Android -| Package Name | Version | -| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------ | -| Android Command Line Tools | 8.0 | -| Android Emulator | 31.3.13 | -| Android SDK Build-tools | 33.0.0<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | -| Android SDK Platform-Tools | 33.0.3 | -| Android SDK Platforms | android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | -| Android SDK Tools | 26.1.1 | -| Android Support Repository | 47.0.0 | -| CMake | 3.10.2<br>3.18.1<br>3.22.1 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 23.2.8568313<br>24.0.8215888<br>25.1.8937393 (default) | -| SDK Patch Applier v4 | 1 | +| Package Name | Version | +| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 8.0 | +| Android Emulator | 31.3.13 | +| Android SDK Build-tools | 33.0.0 33.0.1<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | +| Android SDK Platform-Tools | 33.0.3 | +| Android SDK Platforms | android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | +| Android SDK Tools | 26.1.1 | +| Android Support Repository | 47.0.0 | +| CMake | 3.10.2<br>3.18.1<br>3.22.1 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 23.2.8568313<br>24.0.8215888<br>25.1.8937393 (default) | +| SDK Patch Applier v4 | 1 | #### Environment variables | Name | Value | @@ -409,7 +406,7 @@ to accomplish this. | upx | 3.95-2build1 | | wget | 1.20.3-1ubuntu2 | | xorriso | 1.5.2-1 | -| xvfb | 2:1.20.13-1ubuntu1\~20.04.3 | +| xvfb | 2:1.20.13-1ubuntu1\~20.04.4 | | xz-utils | 5.2.4-1ubuntu1.1 | | zip | 3.0-11build1 | | zsync | 0.6.2-3ubuntu1 | From 4aba37bd3b8df82c3b27e7c2448556e966a8b41e Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Fri, 2 Dec 2022 22:00:21 +0100 Subject: [PATCH 1613/3485] [README] Mention ongoing migrations (#6685) Co-authored-by: Sam Tran <samvantran@github.com> --- README.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/README.md b/README.md index c4e0c6a3cf50..58162ed45b07 100644 --- a/README.md +++ b/README.md @@ -5,6 +5,7 @@ - [About](#about) - [Available Images](#available-images) +- [Ongoing migrations](#ongoing-migrations) - [Image Definitions](#image-definitions) - [Image Releases](#image-releases) - [Software and Image Support](#software-and-image-support) @@ -44,6 +45,14 @@ To build a VM machine from this repo's source, see the [instructions](docs/creat [macOS-10.15]: https://github.com/actions/runner-images/blob/main/images/macos/macos-10.15-Readme.md [self-hosted runners]: https://help.github.com/en/actions/hosting-your-own-runners +## Ongoing migrations + +There are currently two migrations in progress: + +* `ubuntu-latest` is currently transitioning to `ubuntu-22.04`. During this time, you may experience some jobs running on either an ubuntu-20.04 or ubuntu-22.04 runner. You can specify `runs-on: ubuntu-20.04` in your workflow if you need the previous version. Details can be found in this [announcement](https://github.com/actions/runner-images/issues/6399). +* `macos-latest` is currently transitioning to `macos-12`. During this time, you may experience some jobs running on either a macos-11 or macos-12 runner. You can specify `runs-on: macos-11` in your workflow if you need the previous version. Details can be found in this [announcement](https://github.com/actions/runner-images/issues/6384). + + ## Image Definitions ### Beta From fb3b6fd69957772c1596848e2daaec69eabca1bb Mon Sep 17 00:00:00 2001 From: Jeroen Ooms <jeroenooms@gmail.com> Date: Sun, 4 Dec 2022 09:59:37 +0100 Subject: [PATCH 1614/3485] Rust: add support for mingw-w64 toolchains (#6661) --- images/win/scripts/Installers/Install-Rust.ps1 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/images/win/scripts/Installers/Install-Rust.ps1 b/images/win/scripts/Installers/Install-Rust.ps1 index 9bd0c2b3f876..11d46b3d953c 100644 --- a/images/win/scripts/Installers/Install-Rust.ps1 +++ b/images/win/scripts/Installers/Install-Rust.ps1 @@ -22,6 +22,9 @@ $env:Path += ";$env:CARGO_HOME\bin" # Add i686 target for building 32-bit binaries rustup target add i686-pc-windows-msvc +# Add target for building mingw-w64 binaries +rustup target add x86_64-pc-windows-gnu + # Install common tools rustup component add rustfmt clippy cargo install --locked bindgen-cli cbindgen cargo-audit cargo-outdated From 69cdead4fc306f9697b4c173b24485a1190ed98b Mon Sep 17 00:00:00 2001 From: bogdan-damian-bgd <108331162+bogdan-damian-bgd@users.noreply.github.com> Date: Tue, 6 Dec 2022 18:16:20 +0100 Subject: [PATCH 1615/3485] Implement new software report generator for macOS (#6690) * Create environmentVariables.yml * Update environmentVariables.yml * Delete environmentVariables.yml * Add new SoftwareReport generator * Output generation fixes after review * Add json output print in pipeline * Modify json output print in pipeline * Removed redundant space character --- .../azure-pipelines/image-generation.yml | 6 +- .../provision/configuration/finalize-vm.sh | 2 +- .../software-report/SoftwareReport.Base.ps1 | 370 +++++++++++++++ .../SoftwareReport.Browsers.psm1 | 52 ++- .../SoftwareReport.Common.psm1 | 261 ++++++----- .../SoftwareReport.Generator.ps1 | 442 ++++++++---------- .../SoftwareReport.Toolcache.psm1 | 37 +- .../SoftwareReport.WebServers.psm1 | 9 +- .../SoftwareReport.Xamarin.psm1 | 4 +- .../software-report/SoftwareReport.Xcode.psm1 | 21 +- 10 files changed, 767 insertions(+), 437 deletions(-) create mode 100644 images/macos/software-report/SoftwareReport.Base.ps1 diff --git a/images.CI/macos/azure-pipelines/image-generation.yml b/images.CI/macos/azure-pipelines/image-generation.yml index 654832797e71..6ad177dff379 100644 --- a/images.CI/macos/azure-pipelines/image-generation.yml +++ b/images.CI/macos/azure-pipelines/image-generation.yml @@ -107,7 +107,11 @@ jobs: - bash: | cat "$(Build.ArtifactStagingDirectory)/systeminfo.md" - displayName: Print software report + displayName: Print markdown software report + + - bash: | + cat "$(Build.ArtifactStagingDirectory)/systeminfo.json" + displayName: Print json software report - task: PublishBuildArtifacts@1 inputs: diff --git a/images/macos/provision/configuration/finalize-vm.sh b/images/macos/provision/configuration/finalize-vm.sh index c3d72b7a8765..af3b4b6fd247 100644 --- a/images/macos/provision/configuration/finalize-vm.sh +++ b/images/macos/provision/configuration/finalize-vm.sh @@ -20,7 +20,7 @@ if is_Monterey; then fi # Put documentation to $HOME root -cp $HOME/image-generation/output/software-report/systeminfo.txt $HOME/image-generation/output/software-report/systeminfo.md $HOME/ +cp $HOME/image-generation/output/software-report/systeminfo.* $HOME/ # Put build vm assets scripts to proper directory mkdir -p /usr/local/opt/$USER/scripts diff --git a/images/macos/software-report/SoftwareReport.Base.ps1 b/images/macos/software-report/SoftwareReport.Base.ps1 new file mode 100644 index 000000000000..35475ada93ae --- /dev/null +++ b/images/macos/software-report/SoftwareReport.Base.ps1 @@ -0,0 +1,370 @@ +class SoftwareReport { + [HeaderNode] $Root + + SoftwareReport([String] $Title) { + $this.Root = [HeaderNode]::new($Title) + } + + SoftwareReport([HeaderNode] $Root) { + $this.Root = $Root + } + + [String] ToJson() { + return $this.Root.ToJsonObject() | ConvertTo-Json -Depth 10 + } + + static [SoftwareReport] FromJson($jsonString) { + $jsonObj = $jsonString | ConvertFrom-Json + $rootNode = [SoftwareReport]::ParseNodeFromObject($jsonObj) + return [SoftwareReport]::new($rootNode) + } + + [String] ToMarkdown() { + return $this.Root.ToMarkdown(1).Trim() + } + + # This method is Nodes factory that simplifies parsing different types of notes + # Every node has own logic of parsing and this method just invokes "FromJsonObject" of correct node type + static [BaseNode] ParseNodeFromObject($jsonObj) { + if ($jsonObj.NodeType -eq [HeaderNode].Name) { + return [HeaderNode]::FromJsonObject($jsonObj) + } elseif ($jsonObj.NodeType -eq [ToolNode].Name) { + return [ToolNode]::FromJsonObject($jsonObj) + } elseif ($jsonObj.NodeType -eq [ToolVersionsNode].Name) { + return [ToolVersionsNode]::FromJsonObject($jsonObj) + } elseif ($jsonObj.NodeType -eq [TableNode].Name) { + return [TableNode]::FromJsonObject($jsonObj) + } elseif ($jsonObj.NodeType -eq [NoteNode].Name) { + return [NoteNode]::FromJsonObject($jsonObj) + } + + throw "Unknown node type in ParseNodeFromObject '$($jsonObj.NodeType)'" + } +} + +# class BaseNode doesn't really have any business logic or functionality +# We just create it to unite all types of Nodes and differ them from "object" type +class BaseNode {} + +# It is a node type to describe headers: "# Node.js" +# Header has Title and children nodes (HeaderNode is the single node type who has children) +class HeaderNode: BaseNode { + [String] $Title + [System.Collections.ArrayList] $Children + + HeaderNode([String] $Title) { + $this.Title = $Title + $this.Children = @() + } + + [void] AddNode([BaseNode] $node) { + if ($node.GetType() -eq [TableNode]) { + $existingTableNodesCount = $this.Children.Where({ $_.GetType() -eq [TableNode] }).Count + if ($existingTableNodesCount -gt 0) { + throw "Having multiple TableNode on the same header level is not supported" + } + } + + $this.Children.Add($node) + } + + [void] AddNodes([Array] $nodes) { + $nodes | ForEach-Object { $this.AddNode($_) } + } + + [HeaderNode] AddHeaderNode([String] $Title) { + $node = [HeaderNode]::new($Title) + $this.AddNode($node) + return $node + } + + [void] AddToolNode([String] $ToolName, [String] $Version) { + $this.AddNode([ToolNode]::new($ToolName, $Version)) + } + + [void] AddToolVersionsNode([String] $ToolName, [Array] $Version) { + $this.AddNode([ToolVersionsNode]::new($ToolName, $Version)) + } + + [void] AddTableNode([Array] $Table) { + $this.AddNode([TableNode]::FromObjectsArray($Table)) + } + + [void] AddNoteNode([String] $Content) { + $this.AddNode([NoteNode]::new($Content)) + } + + [String] ToMarkdown($level) { + $sb = [System.Text.StringBuilder]::new() + $sb.AppendLine() + $sb.AppendLine("$("#" * $level) $($this.Title)") + $this.Children | ForEach-Object { + $sb.AppendLine($_.ToMarkdown($level + 1)) + } + + return $sb.ToString().TrimEnd() + } + + [PSCustomObject] ToJsonObject() { + return [PSCustomObject]@{ + NodeType = $this.GetType().Name + Title = $this.Title + Children = $this.Children | ForEach-Object { $_.ToJsonObject() } + } + } + + static [HeaderNode] FromJsonObject($jsonObj) { + $node = [HeaderNode]::new($jsonObj.Title) + $jsonObj.Children | Where-Object { $_ } | ForEach-Object { $node.AddNode([SoftwareReport]::ParseNodeFromObject($_)) } + return $node + } + + [Boolean] IsSimilarTo([BaseNode] $OtherNode) { + if ($OtherNode.GetType() -ne [HeaderNode]) { + return $false + } + + return $this.Title -eq $OtherNode.Title + } + + [Boolean] IsIdenticalTo([BaseNode] $OtherNode) { + return $this.IsSimilarTo($OtherNode) + } +} + +# It is a node type to describe the single tool "Bash 5.1.16(1)-release" +class ToolNode: BaseNode { + [String] $ToolName + [String] $Version + + ToolNode([String] $ToolName, [String] $Version) { + $this.ToolName = $ToolName + $this.Version = $Version + } + + [String] ToMarkdown($level) { + return "- $($this.ToolName) $($this.Version)" + } + + [String] ToString() { + return "$($this.ToolName) $($this.Version)" + } + + [PSCustomObject] ToJsonObject() { + return [PSCustomObject]@{ + NodeType = $this.GetType().Name + ToolName = $this.ToolName + Version = $this.Version + } + } + + static [BaseNode] FromJsonObject($jsonObj) { + return [ToolNode]::new($jsonObj.ToolName, $jsonObj.Version) + } + + [Boolean] IsSimilarTo([BaseNode] $OtherNode) { + if ($OtherNode.GetType() -ne [ToolNode]) { + return $false + } + + # Don't compare by Version in SimilarTo method + # It is necessary to treat changing of tool version as "ChangedNodes" rather than "RemovedNodes" + "AddedNodes" + return $this.ToolName -eq $OtherNode.ToolName + } + + [Boolean] IsIdenticalTo([BaseNode] $OtherNode) { + return $this.IsSimilarTo($OtherNode) -and $this.Version -eq $OtherNode.Version + } +} + +# It is a node type to describe the single tool "Toolcache Node.js 14.17.6 16.2.0 18.2.3" +class ToolVersionsNode: BaseNode { + [String] $ToolName + [Array] $Versions + + ToolVersionsNode([String] $ToolName, [Array] $Versions) { + $this.ToolName = $ToolName + $this.Versions = $Versions + } + + [String] ToMarkdown($level) { + $sb = [System.Text.StringBuilder]::new() + $sb.AppendLine() + $sb.AppendLine("$("#" * $level) $($this.ToolName)") + $this.Versions | ForEach-Object { + $sb.AppendLine("- $_") + } + + return $sb.ToString().TrimEnd() + } + + [String] ToString() { + return "$($this.ToolName) $($this.Versions -join ', ')" + } + + [PSCustomObject] ToJsonObject() { + return [PSCustomObject]@{ + NodeType = $this.GetType().Name + ToolName = $this.ToolName + Versions = $this.Versions + } + } + + static [ToolVersionsNode] FromJsonObject($jsonObj) { + return [ToolVersionsNode]::new($jsonObj.ToolName, $jsonObj.Versions) + } + + [Boolean] IsSimilarTo([BaseNode] $OtherNode) { + if ($OtherNode.GetType() -ne [ToolVersionsNode]) { + return $false + } + + return $this.ToolName -eq $OtherNode.ToolName + } + + [Boolean] IsIdenticalTo([BaseNode] $OtherNode) { + if (-not $this.IsSimilarTo($OtherNode)) { + return $false + } + + return ($this.Versions -join " ") -eq ($OtherNode.Versions -join " ") + } +} + +# It is a node type to describe tables +class TableNode: BaseNode { + # It is easier to store the table as rendered lines because we will simplify finding differences in rows later + [String] $Headers + [System.Collections.ArrayList] $Rows + + TableNode($Headers, $Rows) { + $this.Headers = $Headers + $this.Rows = $Rows + } + + static [TableNode] FromObjectsArray([Array] $Table) { + # take column names from the first row in table because all rows that should have the same columns + [String] $tableHeaders = [TableNode]::ArrayToTableRow($Table[0].PSObject.Properties.Name) + [System.Collections.ArrayList] $tableRows = @() + + $Table | ForEach-Object { + $tableRows.Add([TableNode]::ArrayToTableRow($_.PSObject.Properties.Value)) + } + + return [TableNode]::new($tableHeaders, $tableRows) + } + + [String] ToMarkdown($level) { + $maxColumnWidths = $this.Headers.Split("|") | ForEach-Object { $_.Length } + $columnsCount = $maxColumnWidths.Count + + $this.Rows | ForEach-Object { + $columnWidths = $_.Split("|") | ForEach-Object { $_.Length } + for ($colIndex = 0; $colIndex -lt $columnsCount; $colIndex++) { + $maxColumnWidths[$colIndex] = [Math]::Max($maxColumnWidths[$colIndex], $columnWidths[$colIndex]) + } + } + + $delimeterLine = [String]::Join("|", @("-") * $columnsCount) + + $sb = [System.Text.StringBuilder]::new() + @($this.Headers) + @($delimeterLine) + $this.Rows | ForEach-Object { + $sb.Append("|") + $row = $_.Split("|") + for ($colIndex = 0; $colIndex -lt $columnsCount; $colIndex++) { + $padSymbol = $row[$colIndex] -eq "-" ? "-" : " " + $cellContent = $row[$colIndex].PadRight($maxColumnWidths[$colIndex], $padSymbol) + $sb.Append(" $($cellContent) |") + } + $sb.AppendLine() + } + + return $sb.ToString().TrimEnd() + } + + [PSCustomObject] ToJsonObject() { + return [PSCustomObject]@{ + NodeType = $this.GetType().Name + Headers = $this.Headers + Rows = $this.Rows + } + } + + static [TableNode] FromJsonObject($jsonObj) { + return [TableNode]::new($jsonObj.Headers, $jsonObj.Rows) + } + + [Boolean] IsSimilarTo([BaseNode] $OtherNode) { + if ($OtherNode.GetType() -ne [TableNode]) { + return $false + } + + # We don't support having multiple TableNode instances on the same header level so such check is fine + return $true + } + + [Boolean] IsIdenticalTo([BaseNode] $OtherNode) { + if (-not $this.IsSimilarTo($OtherNode)) { + return $false + } + + if ($this.Headers -ne $OtherNode.Headers) { + return $false + } + + if ($this.Rows.Count -ne $OtherNode.Rows.Count) { + return $false + } + + for ($rowIndex = 0; $rowIndex -lt $this.Rows.Count; $rowIndex++) { + if ($this.Rows[$rowIndex] -ne $OtherNode.Rows[$rowIndex]) { + return $false + } + } + + return $true + } + + hidden static [String] ArrayToTableRow([Array] $Values) { + return [String]::Join("|", $Values) + } +} + +class NoteNode: BaseNode { + [String] $Content + + NoteNode([String] $Content) { + $this.Content = $Content + } + + [String] ToMarkdown($level) { + return @( + '```', + $this.Content, + '```' + ) -join "`n" + } + + [PSCustomObject] ToJsonObject() { + return [PSCustomObject]@{ + NodeType = $this.GetType().Name + Content = $this.Content + } + } + + static [NoteNode] FromJsonObject($jsonObj) { + return [NoteNode]::new($jsonObj.Content) + } + + [Boolean] IsSimilarTo([BaseNode] $OtherNode) { + if ($OtherNode.GetType() -ne [NoteNode]) { + return $false + } + + return $this.Content -eq $OtherNode.Content + } + + [Boolean] IsIdenticalTo([BaseNode] $OtherNode) { + return $this.IsSimilarTo($OtherNode) + } +} \ No newline at end of file diff --git a/images/macos/software-report/SoftwareReport.Browsers.psm1 b/images/macos/software-report/SoftwareReport.Browsers.psm1 index 72589c4ccffd..2ee1fce63369 100644 --- a/images/macos/software-report/SoftwareReport.Browsers.psm1 +++ b/images/macos/software-report/SoftwareReport.Browsers.psm1 @@ -1,64 +1,70 @@ -function Get-BrowserSection { - return New-MDList -Style Unordered -Lines @( - (Get-SafariVersion), - (Get-SafariDriverVersion), - (Get-ChromeVersion), - (Get-ChromeDriverVersion), - (Get-EdgeVersion), - (Get-EdgeDriverVersion), - (Get-FirefoxVersion), - (Get-GeckodriverVersion), - (Get-SeleniumVersion) +function Build-BrowserSection { + return @( + [ToolNode]::new("Safari", $(Get-SafariVersion)) + [ToolNode]::new("SafariDriver", $(Get-SafariDriverVersion)) + [ToolNode]::new("Google Chrome", $(Get-ChromeVersion)) + [ToolNode]::new("ChromeDriver", $(Get-ChromeDriverVersion)) + [ToolNode]::new("Microsoft Edge", $(Get-EdgeVersion)) + [ToolNode]::new("Microsoft Edge WebDriver", $(Get-EdgeDriverVersion)) + [ToolNode]::new("Mozilla Firefox", $(Get-FirefoxVersion)) + [ToolNode]::new("geckodriver", $(Get-GeckodriverVersion)) + [ToolNode]::new("Selenium server", $(Get-SeleniumVersion)) ) } function Get-SafariVersion { $version = Run-Command "defaults read /Applications/Safari.app/Contents/Info CFBundleShortVersionString" $build = Run-Command "defaults read /Applications/Safari.app/Contents/Info CFBundleVersion" - "Safari $version ($build)" + return "$version ($build)" } function Get-SafariDriverVersion { $version = Run-Command "safaridriver --version" | Take-Part -Part 3,4 - "SafariDriver $version" + return $version } function Get-ChromeVersion { $chromePath = "/Applications/Google Chrome.app/Contents/MacOS/Google Chrome" - return Run-Command "'${chromePath}' --version" + $version = Run-Command "'${chromePath}' --version" + return ($version -replace ("^Google Chrome")).Trim() } function Get-ChromeDriverVersion { $rawOutput = Run-Command "chromedriver --version" $version = $rawOutput | Take-Part -Part 1 - return "ChromeDriver ${version}" + return $version } function Get-EdgeVersion { $edgePath = "/Applications/Microsoft Edge.app/Contents/MacOS/Microsoft Edge" - return Run-Command "'${edgePath}' --version" + $version = Run-Command "'${edgePath}' --version" + return ($version -replace ("^Microsoft Edge")).Trim() } function Get-EdgeDriverVersion { - return Run-Command "msedgedriver --version" | Take-Part -Part 0,1,2,3 + return Run-Command "msedgedriver --version" | Take-Part -Part 3 } function Get-FirefoxVersion { $firefoxPath = "/Applications/Firefox.app/Contents/MacOS/firefox" - return Run-Command "'${firefoxPath}' --version" + $version = Run-Command "'${firefoxPath}' --version" + return ($version -replace "^Mozilla Firefox").Trim() } function Get-GeckodriverVersion { - return Run-Command "geckodriver --version" | Select-Object -First 1 + $version = Run-Command "geckodriver --version" | Select-Object -First 1 + return ($version -replace "^geckodriver").Trim() } function Get-SeleniumVersion { $seleniumVersion = (Get-ChildItem -Path "/usr/local/Cellar/selenium-server*/*").Name - return "Selenium server $seleniumVersion" + return $seleniumVersion } function Build-BrowserWebdriversEnvironmentTable { - return @( + $node = [HeaderNode]::new("Environment variables") + + $table = @( @{ "Name" = "CHROMEWEBDRIVER" "Value" = $env:CHROMEWEBDRIVER @@ -77,4 +83,8 @@ function Build-BrowserWebdriversEnvironmentTable { "Value" = $_.Value } } + + $node.AddTableNode($table) + + return $node } diff --git a/images/macos/software-report/SoftwareReport.Common.psm1 b/images/macos/software-report/SoftwareReport.Common.psm1 index b18206f6dd9b..3a5c8a93273f 100644 --- a/images/macos/software-report/SoftwareReport.Common.psm1 +++ b/images/macos/software-report/SoftwareReport.Common.psm1 @@ -1,12 +1,12 @@ function Get-BashVersion { $version = bash -c 'echo ${BASH_VERSION}' - return "Bash $version" + return $version } function Get-DotnetVersionList { $sdkRawList = Run-Command "dotnet --list-sdks" $sdkVersionList = $sdkRawList | ForEach-Object { Take-Part $_ -Part 0 } - return ".NET SDK " + [string]::Join(" ", $sdkVersionList) + return [string]::Join(" ", $sdkVersionList) } function Get-GoVersion { @@ -15,101 +15,109 @@ function Get-GoVersion { $goOutput = $goOutput.Substring(2) } - return "Go $goOutput" + return $goOutput } function Get-RVersion { $rVersion = Run-Command "R --version | grep 'R version'" | Take-Part -Part 2 - return "R $rVersion" + return $rVersion } function Get-RustVersion { $rustVersion = Run-Command "rustc --version" | Take-Part -Part 1 - return "Rust $rustVersion" + return $rustVersion } function Get-RustfmtVersion { $version = Run-Command "rustfmt --version" | Take-Part -Part 1 - return "Rustfmt $version" + return $version } function Get-RustdocVersion { $version = Run-Command "rustdoc --version" | Take-Part -Part 1 - return "Rustdoc $version" + return $version } function Get-RustCargoVersion { $version = Run-Command "cargo --version" | Take-Part -Part 1 - return "Cargo $version" + return $version } function Get-RustClippyVersion { $version = Run-Command "cargo clippy --version" | Take-Part -Part 1 - return "Clippy $version" + return $version } function Get-Bindgen { $bindgenVersion = Run-Command "bindgen --version" | Take-Part -Part 1 - return "Bindgen $bindgenVersion" + return $bindgenVersion } function Get-Cbindgen { $cbindgenVersion = Run-Command "cbindgen --version" | Take-Part -Part 1 - return "Cbindgen $cbindgenVersion" + return $cbindgenVersion } function Get-Cargooutdated { $cargoOutdatedVersion = Run-Command "cargo outdated --version" | Take-Part -Part 1 - return "Cargo-outdated $cargoOutdatedVersion" + return $cargoOutdatedVersion } function Get-Cargoaudit { $cargoAuditVersion = Run-Command "cargo-audit --version" | Take-Part -Part 1 - return "Cargo-audit $cargoAuditVersion" + return $cargoAuditVersion } function Get-RustupVersion { $rustupVersion = Run-Command "rustup --version" | Select-Object -First 1 | Take-Part -Part 1 - return "Rustup ${rustupVersion}" + return $rustupVersion } function Get-VcpkgVersion { $vcpkgVersion = Run-Command "vcpkg version" | Select-Object -First 1 | Take-Part -Part 5 | Take-Part -Part 0 -Delimiter "-" $commitId = git -C "/usr/local/share/vcpkg" rev-parse --short HEAD - return "Vcpkg $vcpkgVersion (build from master \<$commitId>)" + return "$vcpkgVersion (build from master \<$commitId>)" } -function Get-GccVersion { +function Get-GccVersions { $versionList = Get-ToolsetValue -KeyPath gcc.versions $versionList | Foreach-Object { - $version = Run-Command "gcc-${_} --version" | Select-Object -First 1 - "$version - available by ``gcc-${_}`` alias" + $nameVersion = Run-Command "gcc-${_} --version" | Select-Object -First 1 + $version = ($nameVersion -replace "^gcc-${_}").Trim() -replace '\).*$', ')' + return [ToolNode]::new("GCC ${_}", "$version - available by ``gcc-${_}`` alias") } } -function Get-FortranVersion { +function Get-FortranVersions { $versionList = Get-ToolsetValue -KeyPath gcc.versions $versionList | Foreach-Object { - $version = Run-Command "gfortran-${_} --version" | Select-Object -First 1 - "$version - available by ``gfortran-${_}`` alias" + $nameVersion = Run-Command "gfortran-${_} --version" | Select-Object -First 1 + $version = ($nameVersion -replace "^GNU Fortran").Trim() -replace '\).*$', ')' + return [ToolNode]::new("GNU Fortran ${_}", "$version - available by ``gfortran-${_}`` alias") } } -function Get-ClangLLVMVersion { - $toolsetVersion = '$(brew --prefix llvm@{0})/bin/clang' -f (Get-ToolsetValue 'llvm.version') - $locationsList = @("$((Get-Command clang).Source)", $toolsetVersion) - $locationsList | Foreach-Object { - (Run-Command "${_} --version" | Out-String) -match "(?<version>\d+\.\d+\.\d+)" | Out-Null - $version = $Matches.version - "Clang/LLVM $version " + $(if(${_} -Match "brew") {"is available on ```'${_}`'``"} else {"is default"}) - } +function Get-ClangLLVMVersions { + $clangVersionRegex = [Regex]::new("(?<version>\d+\.\d+\.\d+)") + + $defaultClangOutput = Run-Command "clang --version" | Out-String + $defaultClangVersion = $clangVersionRegex.Match($defaultClangOutput).Groups['version'].Value + + $homebrewClangPath = '$(brew --prefix llvm@{0})/bin/clang' -f (Get-ToolsetValue 'llvm.version') + $homebrewClangOutput = Run-Command "$homebrewClangPath --version" | Out-String + $homebrewClangVersion = $clangVersionRegex.Match($homebrewClangOutput).Groups['version'].Value + + return @( + [ToolNode]::new("Clang/LLVM", $defaultClangVersion) + [ToolNode]::new("Clang/LLVM (Homebrew)", "$homebrewClangVersion - available on ```'$homebrewClangPath`'``") + ) } function Get-NVMVersion { $nvmPath = Join-Path $env:HOME ".nvm" "nvm.sh" $nvmInitCommand = ". ${nvmPath} > /dev/null 2>&1 || true" $nodejsVersion = Run-Command "${nvmInitCommand} && nvm --version" - return "NVM $nodejsVersion" + return $nodejsVersion } function Get-PipVersion { @@ -123,12 +131,12 @@ function Get-PipVersion { $versionPart1 = $commandOutput | Take-Part -Part 1 $versionPart2 = $commandOutput | Take-Part -Part 4 $versionPart3 = $commandOutput | Take-Part -Part 5 - return "Pip ${versionPart1} ${versionPart2} ${versionPart3}" + return "${versionPart1} ${versionPart2} ${versionPart3}" } function Get-PipxVersion { $pipxVersion = Run-Command "pipx --version" -SuppressStderr - return "Pipx $pipxVersion" + return $pipxVersion } function Get-NVMNodeVersionList { @@ -137,19 +145,27 @@ function Get-NVMNodeVersionList { $nodejsVersionsRaw = Run-Command "${nvmInitCommand} && nvm ls" $nodeVersions = $nodejsVersionsRaw | ForEach-Object { $_.TrimStart(" ").TrimEnd(" *") } | Where-Object { $_.StartsWith("v") } $result = [string]::Join(" ", $nodeVersions) - return "NVM - Cached node versions: $result" + return $result } function Build-OSInfoSection { + param ( + [string] $ImageName + ) + $fieldsToInclude = @("System Version:", "Kernel Version:") $rawSystemInfo = Invoke-Expression "system_profiler SPSoftwareDataType" $parsedSystemInfo = $rawSystemInfo | Where-Object { -not ($_ | Select-String -NotMatch $fieldsToInclude) } | ForEach-Object { $_.Trim() } - $output = "" $parsedSystemInfo[0] -match "System Version: macOS (?<version>\d+\.\d+)" | Out-Null $version = $Matches.Version - $output += New-MDHeader "macOS $version info" -Level 1 - $output += New-MDList -Style Unordered -Lines $parsedSystemInfo -NoNewLine - return $output + $systemVersion = $parsedSystemInfo[0].Replace($fieldsToInclude[0],"").Trim() + $kernelVersion = $parsedSystemInfo[1].Replace($fieldsToInclude[1],"").Trim() + + $osInfoNode = [HeaderNode]::new("macOS $version info") + $osInfoNode.AddToolNode("System Version:", $systemVersion) + $osInfoNode.AddToolNode("Kernel Version:", $kernelVersion) + $osInfoNode.AddToolNode("Image Version:", $ImageName.Split('_')[1]) + return $osInfoNode } function Get-MSBuildVersion { @@ -157,404 +173,407 @@ function Get-MSBuildVersion { $result = Select-String -Path (Get-Command msbuild).Source -Pattern "msbuild" $result -match "(?<path>\/\S*\.dll)" | Out-Null $msbuildPath = $Matches.path - return "MSBuild $msbuildVersion (from $msbuildPath)" + return "$msbuildVersion (from $msbuildPath)" } function Get-NodeVersion { $nodeVersion = Run-Command "node --version" - return "Node.js $nodeVersion" + return $nodeVersion } function Get-PerlVersion { $version = Run-Command "perl -e 'print substr(`$^V,1)'" - return "Perl $version" + return $version } function Get-PythonVersion { $pythonVersion = Run-Command "python --version" - return $pythonVersion + return ($pythonVersion -replace "^Python").Trim() } function Get-Python3Version { $python3Version = Run-Command "python3 --version" - return $python3Version + return ($python3Version -replace "^Python").Trim() } function Get-RubyVersion { $rubyVersion = Run-Command "ruby --version" | Take-Part -Part 1 - return "Ruby $rubyVersion" + return $rubyVersion } function Get-PHPVersion { $PHPVersion = Run-Command "php --version" | Select-Object -First 1 | Take-Part -Part 0,1 - return $PHPVersion + return ($PHPVersion -replace "^PHP").Trim() } function Get-JuliaVersion { $juliaVersion = Run-Command "julia --version" | Take-Part -Part 0,2 - return $juliaVersion + return ($juliaVersion -replace "^Julia").Trim() } function Get-BundlerVersion { $bundlerVersion = Run-Command "bundle --version" - return $bundlerVersion + return ($bundlerVersion -replace "^Bundler").Trim() } function Get-CarthageVersion { $carthageVersion = Run-Command "carthage version" -SuppressStderr - return "Carthage $carthageVersion" + return $carthageVersion } function Get-CocoaPodsVersion { $cocoaPodsVersion = Run-Command "pod --version" - return "CocoaPods $cocoaPodsVersion" + return $cocoaPodsVersion } function Get-HomebrewVersion { $homebrewVersion = Run-Command "brew --version" | Select-Object -First 1 - return $homebrewVersion + return ($homebrewVersion -replace "^Homebrew").Trim() } function Get-NPMVersion { $NPMVersion = Run-Command "npm --version" - return "NPM $NPMVersion" + return $NPMVersion } function Get-YarnVersion { $yarmVersion = Run-Command "yarn --version" - return "Yarn $yarmVersion" + return $yarmVersion } function Get-NuGetVersion { $nugetVersion = Run-Command "nuget help" | Select-Object -First 1 | Take-Part -Part 2 - return "NuGet $nugetVersion" + return $nugetVersion } function Get-CondaVersion { $condaVersion = Invoke-Expression "conda --version" - return "Mini$condaVersion" + return ($condaVersion -replace "^conda").Trim() } function Get-RubyGemsVersion { $rubyGemsVersion = Run-Command "gem --version" - return "RubyGems $rubyGemsVersion" + return $rubyGemsVersion } function Get-ComposerVersion { $composerVersion = Run-Command "composer --version" | Take-Part -Part 2 - return "Composer $composerVersion" + return $composerVersion } function Get-MavenVersion { $mavenVersion = Run-Command "mvn -version" | Select-Object -First 1 | Take-Part -Part 2 - return "Apache Maven $mavenVersion" + return $mavenVersion } #gradle output differs on the first launch – a welcome message, that we don't need is rendered. The solution is to take the last "Gradle" occurrence from the output function Get-GradleVersion { $gradleVersion = (Run-Command "gradle --version" | Select-String "Gradle")[-1] - return $gradleVersion + return ($gradleVersion.Line -replace "^Gradle").Trim() } function Get-ApacheAntVersion { $apacheAntVersion = Run-Command "ant -version" | Take-Part -Part 0,1,3 - return $apacheAntVersion + return ($apacheAntVersion -replace "^Apache Ant\(TM\)").Trim() } function Get-CurlVersion { $curlVersion = Run-Command "curl --version" | Select-Object -First 1 | Take-Part -Part 1 - return "Curl $curlVersion" + return $curlVersion } function Get-GitVersion { $gitVersion = Run-Command "git --version" | Take-Part -Part -1 - return "Git $gitVersion" + return $gitVersion } function Get-GitLFSVersion { $gitLFSVersion = Run-Command "git-lfs version" | Take-Part -Part 0 | Take-Part -Part 1 -Delimiter "/" - return "Git LFS: $gitLFSVersion" + return $gitLFSVersion } function Get-GitHubCLIVersion { $ghVersion = Run-Command "gh --version" | Select-String "gh version" | Select-Object -First 1 | Take-Part -Part 2 - return "GitHub CLI: $ghVersion" + return $ghVersion } function Get-HubVersion { $hubVersion = Run-Command "brew list --versions hub" | Take-Part -Part 1 - return "Hub CLI: $hubVersion" + return $hubVersion } function Get-WgetVersion { $wgetVersion = Run-Command "wget --version" | Select-String "GNU Wget" | Take-Part -Part 2 - return "GNU Wget $wgetVersion" + return $wgetVersion } function Get-SVNVersion { $svnVersion = Run-Command "svn --version --quiet" - return "Subversion (SVN) $svnVersion" + return $svnVersion } function Get-PackerVersion { # Packer 1.7.1 has a bug and outputs version to stderr instead of stdout https://github.com/hashicorp/packer/issues/10855 $result = Run-Command -Command "packer --version" $packerVersion = [regex]::matches($result, "(\d+.){2}\d+").Value - return "Packer $packerVersion" + return $packerVersion } function Get-OpenSSLVersion { $opensslVersion = Get-Item /usr/local/opt/openssl@1.1 | ForEach-Object {"{0} ``({1} -> {2})``" -f (Run-Command "openssl version"), $_.FullName, $_.Target} - return $opensslVersion + return ($opensslVersion -replace "^OpenSSL").Trim() } function Get-JqVersion { $jqVersion = Run-Command "jq --version" | Take-Part -Part 1 -Delimiter "-" - return "jq $jqVersion" + return $jqVersion } function Get-GPGVersion { $gpgVersion = Run-Command "gpg --version" | Select-String 'gpg (GnuPG)' -SimpleMatch - return $gpgVersion + return ($gpgVersion.Line -replace "^gpg \(GnuPG\)").Trim() } function Get-PostgresClientVersion { $postgresClientVersion = Run-Command "psql --version" - return $postgresClientVersion + return ($postgresClientVersion -replace "^psql \(PostgreSQL\)").Trim() } function Get-PostgresServerVersion { $postgresServerVersion = Run-Command "pg_config --version" - return $postgresServerVersion + return ($postgresServerVersion -replace "^PostgreSQL").Trim() } function Get-Aria2Version { $aria2Version = Run-Command "aria2c --version" | Select-Object -First 1 | Take-Part -Part 2 - return "aria2 $aria2Version" + return $aria2Version } function Get-AzcopyVersion { $azcopyVersion = Run-Command "azcopy --version" | Take-Part -Part 2 - return "azcopy $azcopyVersion" + return $azcopyVersion } function Get-ZstdVersion { $zstdVersion = Run-Command "zstd --version" | Take-Part -Part 1 -Delimiter "v" | Take-Part -Part 0 -Delimiter "," - return "zstd $zstdVersion" + return $zstdVersion } function Get-BazelVersion { $bazelVersion = Run-Command "bazel --version" | Take-Part -Part 0 -Delimiter "-" - return $bazelVersion + return ($bazelVersion -replace "^bazel").Trim() } function Get-BazeliskVersion { $bazeliskVersion = Run-Command "brew list bazelisk --versions" - return $bazeliskVersion + return ($bazeliskVersion -replace "^bazelisk").Trim() } function Get-HelmVersion { $helmVersion = Run-Command "helm version --short" - return "helm $helmVersion" + return $helmVersion } function Get-MongoVersion { $mongo = Run-Command "mongo --version" | Select-String "MongoDB shell version" | Take-Part -Part 3 - return "mongo $mongo" + return $mongo } function Get-MongodVersion { $mongod = Run-Command "mongod --version" | Select-String "db version " | Take-Part -Part 2 - return "mongod $mongod" + return $mongod } function Get-7zipVersion { $7zip = Run-Command "7z i" | Select-String "7-Zip" | Take-Part -Part 0,2 - return $7zip + return ($7zip -replace "^7-Zip").Trim() } function Get-GnuTarVersion { $gnuTar = Run-Command "gtar --version" | Select-String "tar" | Take-Part -Part 3 - return "GNU Tar $gnuTar - available by 'gtar' alias" + return "$gnuTar - available by 'gtar' alias" } function Get-BsdtarVersion { $bsdtar = Run-Command "tar --version" | Take-Part -Part 1 - return "bsdtar $bsdtar - available by 'tar' alias" + return "$bsdtar - available by 'tar' alias" } function Get-NewmanVersion { $newmanVersion = Run-Command "newman --version" - return "Newman $newmanVersion" + return $newmanVersion } function Get-VirtualBoxVersion { $virtualBox = Run-Command "vboxmanage -v" - return "VirtualBox $virtualBox" + return $virtualBox } function Get-VagrantVersion { $vagrant = Run-Command "vagrant -v" - return $vagrant + return ($vagrant -replace "^Vagrant").Trim() } function Get-ParallelVersion { $parallelVersion = Run-Command "parallel --version" | Select-String "GNU parallel" | Select-Object -First 1 - return $parallelVersion + return ($parallelVersion -replace "^GNU parallel").Trim() } function Get-FastlaneVersion { $fastlaneVersion = Run-Command "fastlane --version" | Select-String "^fastlane [0-9]" | Take-Part -Part 1 - return "Fastlane $fastlaneVersion" + return $fastlaneVersion } function Get-CmakeVersion { $cmakeVersion = Run-Command "cmake --version" | Select-Object -First 1 | Take-Part -Part 2 - return "Cmake $cmakeVersion" + return $cmakeVersion } function Get-AppCenterCLIVersion { $appcenterCLIVersion = Run-Command "appcenter --version" | Take-Part -Part 2 - return "App Center CLI $appcenterCLIVersion" + return $appcenterCLIVersion } function Get-AzureCLIVersion { $azureCLIVersion = (az version | ConvertFrom-Json).'azure-cli' - return "Azure CLI $azureCLIVersion" + return $azureCLIVersion } function Get-AzureDevopsVersion { $azdevopsVersion = (az version | ConvertFrom-Json).extensions.'azure-devops' - return "Azure CLI (azure-devops) $azdevopsVersion" + return $azdevopsVersion } function Get-AWSCLIVersion { $awsVersion = Run-Command "aws --version" | Take-Part -Part 0 | Take-Part -Delimiter "/" -Part 1 - return "AWS CLI $awsVersion" + return $awsVersion } function Get-AWSSAMCLIVersion { $awsSamVersion = Run-Command "sam --version" | Take-Part -Part 3 - return "AWS SAM CLI $awsSamVersion" + return $awsSamVersion } function Get-AWSSessionManagerCLIVersion { $awsSessionManagerVersion = Run-Command "session-manager-plugin --version" - return "AWS Session Manager CLI $awsSessionManagerVersion" + return $awsSessionManagerVersion } function Get-AliyunCLIVersion { $aliyunVersion = Run-Command "aliyun --version" | Select-String "Alibaba Cloud Command Line Interface Version " | Take-Part -Part 6 - return "Aliyun CLI $aliyunVersion" + return $aliyunVersion } function Get-GHCupVersion { $ghcUpVersion = (Run-Command "ghcup --version" | Take-Part -Part 5).Replace('v','') - return "GHCup $ghcUpVersion" + return $ghcUpVersion } function Get-GHCVersion { $ghcVersion = Run-Command "ghc --version" | Take-Part -Part 7 - return "GHC $ghcVersion" + return $ghcVersion } function Get-CabalVersion { $cabalVersion = Run-Command "cabal --version" | Take-Part -Part 3 - return "Cabal $cabalVersion" + return $cabalVersion } function Get-SwitchAudioOsxVersion { $switchAudioVersion = Get-BrewPackageVersion -CommandName "SwitchAudioSource" - return "Switchaudio-osx $switchAudioVersion" + return $switchAudioVersion } function Get-SoxVersion { $soxVersion = Get-BrewPackageVersion -CommandName "sox" - return "Sox $soxVersion" + return $soxVersion } function Get-StackVersion { $stackVersion = Run-Command "stack --version" | Take-Part -Part 1 | ForEach-Object {$_.replace(",","")} - return "Stack $stackVersion" + return $stackVersion } function Get-SwiftFormatVersion { $swiftFormatVersion = Run-Command "swiftformat --version" - return "SwiftFormat $swiftFormatVersion" + return $swiftFormatVersion } function Get-YamllintVersion { $yamllintVersion = Run-Command "yamllint --version" - return $yamllintVersion + return ($yamllintVersion -replace "^Yamllint").Trim() } function Get-SwiftLintVersion { $swiftlintVersion = Run-Command "swiftlint version" - return "SwiftLint $swiftlintVersion" + return $swiftlintVersion } function Get-PowershellVersion { $powershellVersion = Run-Command "powershell --version" - return $powershellVersion + return ($powershellVersion -replace "^PowerShell").Trim() } function Get-SwigVersion { $swigVersion = Run-Command "swig -version" | Select-Object -First 2 | Take-Part -Part 2 - return "Swig $swigVersion" + return $swigVersion } function Get-BicepVersion { $bicepVersion = Run-Command "bicep --version" | Take-Part -Part 3 - return "Bicep CLI $bicepVersion" + return $bicepVersion } function Get-KotlinVersion { $kotlinVersion = Run-Command "kotlin -version" | Take-Part -Part 2 - return "Kotlin $kotlinVersion" + return $kotlinVersion } function Get-SbtVersion { $sbtVersion = Run-Command "sbt -version" | Take-Part -Part 3 - return "Sbt $sbtVersion" + return $sbtVersion } function Get-JazzyVersion { $jazzyVersion = Run-Command "jazzy --version" | Take-Part -Part 2 - return "Jazzy $jazzyVersion" + return $jazzyVersion } function Get-ZlibVersion { $zlibVersion = brew info --json zlib | jq -r '.[].installed[].version' - return "Zlib $zlibVersion" + return $zlibVersion } function Get-LibXftVersion { $libXftVersion = brew info --json libxft | jq -r '.[].installed[].version' - return "libXft $libXftVersion" + return $libXftVersion } function Get-LibXextVersion { $libXextVersion = brew info --json libxext | jq -r '.[].installed[].version' - return "libXext $libXextVersion" + return $libXextVersion } function Get-TclTkVersion { $tcltkVersion = brew info --json tcl-tk | jq -r '.[].installed[].version' - return "Tcl/Tk $tcltkVersion" + return $tcltkVersion } function Get-YqVersion { $yqVersion = Run-Command "yq --version" - return "$yqVersion" + $yqVersion -match "\d{1,2}\.\d{1,2}\.\d{1,2}" | Out-Null + return ($Matches[0]) } function Get-ImageMagickVersion { $imagemagickVersion = Run-Command "magick --version" | Select-Object -First 1 | Take-Part -Part 1,2 - return "$imagemagickVersion" + return ($imagemagickVersion -replace "^ImageMagick").Trim() } function Build-PackageManagementEnvironmentTable { - return @( + $node = [HeaderNode]::new("Environment variables") + + $table = @( @{ "Name" = "CONDA" "Value" = $env:CONDA @@ -569,6 +588,10 @@ function Build-PackageManagementEnvironmentTable { "Value" = $_.Value } } + + $node.AddTableNode($table) + + return $node } function Build-MiscellaneousEnvironmentTable { @@ -605,10 +628,10 @@ function Get-CodeQLBundleVersion { $CodeQLVersionPath = Get-ChildItem $CodeQLVersionWildcard | Select-Object -First 1 -Expand FullName $CodeQLPath = Join-Path $CodeQLVersionPath -ChildPath "x64" | Join-Path -ChildPath "codeql" | Join-Path -ChildPath "codeql" $CodeQLVersion = & $CodeQLPath version --quiet - return "CodeQL Action Bundle $CodeQLVersion" + return $CodeQLVersion } function Get-ColimaVersion { $colimaVersion = Run-Command "colima version" | Select-String "colima version" | Take-Part -Part 2 - return "Colima $colimaVersion" + return $colimaVersion } diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1 index e58a9199bcf7..b64b4df02428 100644 --- a/images/macos/software-report/SoftwareReport.Generator.ps1 +++ b/images/macos/software-report/SoftwareReport.Generator.ps1 @@ -6,7 +6,7 @@ param ( $ErrorActionPreference = "Stop" -Import-Module MarkdownPS +. ("$PSScriptRoot/SoftwareReport.Base.ps1") Import-Module "$PSScriptRoot/SoftwareReport.Common.psm1" -DisableNameChecking Import-Module "$PSScriptRoot/SoftwareReport.Xcode.psm1" -DisableNameChecking Import-Module "$PSScriptRoot/SoftwareReport.Android.psm1" -DisableNameChecking @@ -22,311 +22,246 @@ Import-Module "$PSScriptRoot/../helpers/Xcode.Helpers.psm1" # Operating System info $os = Get-OSVersion -$markdown = "" - # OS info -$markdown += Build-OSInfoSection -$markdown += New-MDList -Style Unordered -Lines ("Image Version: {0}" -f $ImageName.Split('_')[1]) -# Software report -$markdown += New-MDHeader "Installed Software" -Level 2 -$markdown += New-MDHeader "Language and Runtime" -Level 3 -$languageAndRuntimeList = @( - (Get-BashVersion) - (Get-MSBuildVersion) - (Get-NodeVersion) - (Get-NVMVersion) - (Get-NVMNodeVersionList) - (Get-PerlVersion) - (Get-PythonVersion) - (Get-Python3Version) - (Get-RubyVersion) - (Get-DotnetVersionList) - (Get-GoVersion) - (Get-JuliaVersion) - (Get-KotlinVersion) - (Get-PHPVersion) - (Get-ClangLLVMVersion) - (Get-GccVersion) - (Get-FortranVersion) - (Get-RVersion) -) +$osInfo = Build-OSInfoSection $ImageName -# To sort GCC and Gfortran correctly, we need to use natural sort https://gist.github.com/markwragg/e2a9dc05f3464103d6998298fb575d4e#file-sort-natural-ps1 -$toNatural = { [regex]::Replace($_, '\d+', { $args[0].Value.PadLeft(20) }) } -$markdown += New-MDList -Style Unordered -Lines ($languageAndRuntimeList | Sort-Object $toNatural) +# Software report +$softwareReport = [SoftwareReport]::new($osInfo) +$installedSoftware = $softwareReport.Root.AddHeaderNode("Installed Software") + +# Language and Runtime +$languageAndRuntime = $installedSoftware.AddHeaderNode("Language and Runtime") +$languageAndRuntime.AddToolNode(".NET SDK", $(Get-DotnetVersionList)) +$languageAndRuntime.AddToolNode("Bash", $(Get-BashVersion)) +$languageAndRuntime.AddNodes($(Get-ClangLLVMVersions)) +$languageAndRuntime.AddNodes($(Get-GccVersions)) +$languageAndRuntime.AddNodes($(Get-FortranVersions)) +$languageAndRuntime.AddToolNode("Go", $(Get-GoVersion)) +$languageAndRuntime.AddToolNode("Julia", $(Get-JuliaVersion)) +$languageAndRuntime.AddToolNode("Kotlin", $(Get-KotlinVersion)) +$languageAndRuntime.AddToolNode("MSBuild", $(Get-MSBuildVersion)) +$languageAndRuntime.AddToolNode("Node.js", $(Get-NodeVersion)) +$languageAndRuntime.AddToolNode("NVM", $(Get-NVMVersion)) +$languageAndRuntime.AddToolNode("NVM - Cached node versions:", $(Get-NVMNodeVersionList)) +$languageAndRuntime.AddToolNode("Perl", $(Get-PerlVersion)) +$languageAndRuntime.AddToolNode("PHP", $(Get-PHPVersion)) +$languageAndRuntime.AddToolNode("Python", $(Get-PythonVersion)) +$languageAndRuntime.AddToolNode("Python3", $(Get-Python3Version)) +$languageAndRuntime.AddToolNode("R", $(Get-RVersion)) +$languageAndRuntime.AddToolNode("Ruby", $(Get-RubyVersion)) # Package Management -$markdown += New-MDHeader "Package Management" -Level 3 -$packageManagementList = @( - (Get-PipVersion -Version 2), - (Get-PipVersion -Version 3), - (Get-PipxVersion), - (Get-BundlerVersion), - (Get-CocoaPodsVersion), - (Get-CondaVersion), - (Get-HomebrewVersion), - (Get-NPMVersion), - (Get-YarnVersion), - (Get-NuGetVersion), - (Get-RubyGemsVersion), - (Get-ComposerVersion), - (Get-CarthageVersion), - (Get-VcpkgVersion) -) - -$markdown += New-MDList -Style Unordered -Lines ($packageManagementList | Sort-Object) -$markdown += New-MDHeader "Environment variables" -Level 4 -$markdown += Build-PackageManagementEnvironmentTable | New-MDTable -$markdown += New-MDNewLine +$packageManagement = $installedSoftware.AddHeaderNode("Package Management") +$packageManagement.AddToolNode("Bundler", $(Get-BundlerVersion)) +$packageManagement.AddToolNode("Carthage", $(Get-CarthageVersion)) +$packageManagement.AddToolNode("CocoaPods", $(Get-CocoaPodsVersion)) +$packageManagement.AddToolNode("Composer", $(Get-ComposerVersion)) +$packageManagement.AddToolNode("Homebrew", $(Get-HomebrewVersion)) +$packageManagement.AddToolNode("Miniconda", $(Get-CondaVersion)) +$packageManagement.AddToolNode("NPM", $(Get-NPMVersion)) +$packageManagement.AddToolNode("NuGet", $(Get-NuGetVersion)) +$packageManagement.AddToolNode("Pip", $(Get-PipVersion -Version 2)) +$packageManagement.AddToolNode("Pip3", $(Get-PipVersion -Version 3)) +$packageManagement.AddToolNode("Pipx", $(Get-PipxVersion)) +$packageManagement.AddToolNode("RubyGems", $(Get-RubyGemsVersion)) +$packageManagement.AddToolNode("Vcpkg", $(Get-VcpkgVersion)) +$packageManagement.AddToolNode("Yarn", $(Get-YarnVersion)) + +$packageManagement.AddNode($(Build-PackageManagementEnvironmentTable)) # Project Management -$markdown += New-MDHeader "Project Management" -Level 3 -$markdown += New-MDList -Style Unordered -Lines (@( - (Get-MavenVersion), - (Get-GradleVersion), - (Get-ApacheAntVersion), - (Get-SbtVersion) - ) | Sort-Object -) +$projectanagement = $installedSoftware.AddHeaderNode("Project Management") +$projectanagement.AddToolNode("Apache Ant", $(Get-ApacheAntVersion)) +$projectanagement.AddToolNode("Apache Maven", $(Get-MavenVersion)) +$projectanagement.AddToolNode("Gradle", $(Get-GradleVersion)) +$projectanagement.AddToolNode("Sbt", $(Get-SbtVersion)) # Utilities -$markdown += New-MDHeader "Utilities" -Level 3 -$utilitiesList = @( - (Get-CurlVersion), - (Get-GitVersion), - (Get-GitLFSVersion), - (Get-GitHubCLIVersion), - (Get-HubVersion), - (Get-WgetVersion), - (Get-SVNVersion), - (Get-PackerVersion), - (Get-OpenSSLVersion), - (Get-JqVersion), - (Get-PostgresClientVersion), - (Get-PostgresServerVersion), - (Get-Aria2Version), - (Get-AzcopyVersion), - (Get-ZstdVersion), - (Get-BazelVersion), - (Get-BazeliskVersion), - (Get-MongoVersion), - (Get-MongodVersion), - (Get-7zipVersion), - (Get-BsdtarVersion), - (Get-GnuTarVersion), - (Get-GPGVersion), - (Get-SwitchAudioOsxVersion), - (Get-SoxVersion), - (Get-YqVersion), - (Get-ImageMagickVersion) -) - -if ($os.IsLessThanMonterey) { - $utilitiesList += @( - (Get-HelmVersion) - ) +$utilities = $installedSoftware.AddHeaderNode("Utilities") +$utilities.AddToolNode("7-Zip", $(Get-7zipVersion)) +$utilities.AddToolNode("aria2", $(Get-Aria2Version)) +$utilities.AddToolNode("azcopy", $(Get-AzcopyVersion)) +$utilities.AddToolNode("bazel", $(Get-BazelVersion)) +$utilities.AddToolNode("bazelisk", $(Get-BazeliskVersion)) +$utilities.AddToolNode("bsdtar", $(Get-BsdtarVersion)) +$utilities.AddToolNode("Curl", $(Get-CurlVersion)) +$utilities.AddToolNode("Git", $(Get-GitVersion)) +$utilities.AddToolNode("Git LFS", $(Get-GitLFSVersion)) +$utilities.AddToolNode("GitHub CLI", $(Get-GitHubCLIVersion)) +if ($os.IsCatalina) { + $utilities.AddToolNode("GNU parallel", $(Get-ParallelVersion)) } - +$utilities.AddToolNode("GNU Tar", $(Get-GnuTarVersion)) +$utilities.AddToolNode("GNU Wget", $(Get-WgetVersion)) +$utilities.AddToolNode("gpg (GnuPG)", $(Get-GPGVersion)) if ($os.IsLessThanMonterey) { - $utilitiesList += @( - (Get-NewmanVersion) - ) + $utilities.AddToolNode("helm", $(Get-HelmVersion)) } - -if ($os.IsCatalina) { - $utilitiesList += @( - (Get-ParallelVersion) - ) +$utilities.AddToolNode("Hub CLI", $(Get-HubVersion)) +$utilities.AddToolNode("ImageMagick", $(Get-ImageMagickVersion)) +$utilities.AddToolNode("jq", $(Get-JqVersion)) +$utilities.AddToolNode("mongo", $(Get-MongoVersion)) +$utilities.AddToolNode("mongod", $(Get-MongodVersion)) +if ($os.IsLessThanMonterey) { + $utilities.AddToolNode("Newman", $(Get-NewmanVersion)) } - +$utilities.AddToolNode("OpenSSL", $(Get-OpenSSLVersion)) +$utilities.AddToolNode("Packer", $(Get-PackerVersion)) +$utilities.AddToolNode("PostgreSQL", $(Get-PostgresServerVersion)) +$utilities.AddToolNode("psql (PostgreSQL)", $(Get-PostgresClientVersion)) +$utilities.AddToolNode("Sox", $(Get-SoxVersion)) +$utilities.AddToolNode("Subversion (SVN)", $(Get-SVNVersion)) +$utilities.AddToolNode("Switchaudio-osx", $(Get-SwitchAudioOsxVersion)) if (-not $os.IsBigSur) { - $utilitiesList += @( - (Get-VagrantVersion), - (Get-VirtualBoxVersion) - ) + $utilities.AddToolNode("Vagrant", $(Get-VagrantVersion)) + $utilities.AddToolNode("VirtualBox", $(Get-VirtualBoxVersion)) } - -$markdown += New-MDList -Style Unordered -Lines ($utilitiesList | Sort-Object) +$utilities.AddToolNode("yq", $(Get-YqVersion)) +$utilities.AddToolNode("zstd", $(Get-ZstdVersion)) # Tools -$markdown += New-MDHeader "Tools" -Level 3 -$toolsList = @( - (Get-JazzyVersion), - (Get-FastlaneVersion), - (Get-CmakeVersion), - (Get-AppCenterCLIVersion), - (Get-AzureCLIVersion), - (Get-AzureDevopsVersion), - (Get-AWSCLIVersion), - (Get-AWSSAMCLIVersion), - (Get-AWSSessionManagerCLIVersion) -) - -if (-not $os.IsCatalina) { - $toolsList += @( - (Get-CodeQLBundleVersion) - ) -} - +$tools = $installedSoftware.AddHeaderNode("Tools") if ($os.IsLessThanMonterey) { - $toolsList += @( - (Get-AliyunCLIVersion) - ) + $tools.AddToolNode("Aliyun CLI", $(Get-AliyunCLIVersion)) } - -$toolsList += @( - (Get-XcodeCommandLineToolsVersion), - (Get-SwigVersion), - (Get-BicepVersion), - (Get-GHCupVersion), - (Get-GHCVersion), - (Get-CabalVersion), - (Get-StackVersion), - (Get-SwiftFormatVersion) -) - +$tools.AddToolNode("App Center CLI", $(Get-AppCenterCLIVersion)) +$tools.AddToolNode("AWS CLI", $(Get-AWSCLIVersion)) +$tools.AddToolNode("AWS SAM CLI", $(Get-AWSSAMCLIVersion)) +$tools.AddToolNode("AWS Session Manager CLI", $(Get-AWSSessionManagerCLIVersion)) +$tools.AddToolNode("Azure CLI (azure-devops)", $(Get-AzureDevopsVersion)) +$tools.AddToolNode("Azure CLI", $(Get-AzureCLIVersion)) +$tools.AddToolNode("Bicep CLI", $(Get-BicepVersion)) +$tools.AddToolNode("Cabal", $(Get-CabalVersion)) +$tools.AddToolNode("Cmake", $(Get-CmakeVersion)) if (-not $os.IsCatalina) { - $toolsList += @( - (Get-ColimaVersion) - ) + $tools.AddToolNode("CodeQL Action Bundle", $(Get-CodeQLBundleVersion)) } - -$markdown += New-MDList -Style Unordered -Lines ($toolsList | Sort-Object) +if (-not $os.IsCatalina) { + $tools.AddToolNode("Colima", $(Get-ColimaVersion)) +} +$tools.AddToolNode("Fastlane", $(Get-FastlaneVersion)) +$tools.AddToolNode("GHC", $(Get-GHCVersion)) +$tools.AddToolNode("GHCup", $(Get-GHCupVersion)) +$tools.AddToolNode("Jazzy", $(Get-JazzyVersion)) +$tools.AddToolNode("Stack", $(Get-StackVersion)) +$tools.AddToolNode("SwiftFormat", $(Get-SwiftFormatVersion)) +$tools.AddToolNode("Swig", $(Get-SwigVersion)) +$tools.AddToolNode("Xcode Command Line Tools", $(Get-XcodeCommandLineToolsVersion)) # Linters -$markdown += New-MDHeader "Linters" -Level 3 -$lintersList = @( - (Get-YamllintVersion), - (Get-SwiftLintVersion) -) +$linters = $installedSoftware.AddHeaderNode("Linters") +$linters.AddToolNode("Swift", $(Get-SwiftLintVersion)) +$linters.AddToolNode("Yamllint", $(Get-YamllintVersion)) -$markdown += New-MDList -Style Unordered -Lines ($lintersList | Sort-Object) +# Browsers +$browsers = $installedSoftware.AddHeaderNode("Browsers") +$browsers.AddNodes($(Build-BrowserSection)) +$browsers.AddNode($(Build-BrowserWebdriversEnvironmentTable)) -$markdown += New-MDHeader "Browsers" -Level 3 -$markdown += Get-BrowserSection -$markdown += New-MDHeader "Environment variables" -Level 4 -$markdown += Build-BrowserWebdriversEnvironmentTable | New-MDTable -$markdown += New-MDNewLine +# Java +$java = $installedSoftware.AddHeaderNode("Java") +$java.AddTableNode($(Get-JavaVersions)) -$markdown += New-MDHeader "Java" -Level 3 -$markdown += Get-JavaVersions | New-MDTable -$markdown += New-MDNewLine - -$markdown += New-MDHeader "GraalVM" -Level 3 -$markdown += Build-GraalVMTable | New-MDTable -$markdown += New-MDNewLine +# Graal +$graalvm = $installedSoftware.AddHeaderNode("GraalVM") +$graalvm.AddTableNode($(Build-GraalVMTable)) # Toolcache -$markdown += Build-ToolcacheSection -$markdown += New-MDNewLine - -$markdown += New-MDHeader "Rust Tools" -Level 3 -$markdown += New-MDList -Style Unordered -Lines (@( - (Get-RustVersion), - (Get-RustupVersion), - (Get-RustdocVersion), - (Get-RustCargoVersion) - ) | Sort-Object -) - -$markdown += New-MDHeader "Packages" -Level 4 -$markdown += New-MDList -Style Unordered -Lines (@( - (Get-Bindgen), - (Get-Cbindgen), - (Get-Cargooutdated), - (Get-Cargoaudit), - (Get-RustfmtVersion), - (Get-RustClippyVersion) - ) | Sort-Object -) - -$markdown += New-MDHeader "PowerShell Tools" -Level 3 -$markdown += New-MDList -Lines (Get-PowershellVersion) -Style Unordered - -$markdown += New-MDHeader "PowerShell Modules" -Level 4 -$markdown += Get-PowerShellModules | New-MDTable -$markdown += New-MDNewLine +$toolcache = $installedSoftware.AddHeaderNode("Cached Tools") +$toolcache.AddNodes($(Build-ToolcacheSection)) + +# Rust +$rust = $installedSoftware.AddHeaderNode("Rust Tools") +$rust.AddToolNode("Cargo", $(Get-RustCargoVersion)) +$rust.AddToolNode("Rust", $(Get-RustVersion)) +$rust.AddToolNode("Rustdoc", $(Get-RustdocVersion)) +$rust.AddToolNode("Rustup", $(Get-RustupVersion)) + +$rustPackages = $rust.AddHeaderNode("Packages") +$rustPackages.AddToolNode("Bindgen", $(Get-Bindgen)) +$rustPackages.AddToolNode("Cargo-audit", $(Get-Cargoaudit)) +$rustPackages.AddToolNode("Cargo-outdated", $(Get-Cargooutdated)) +$rustPackages.AddToolNode("Cbindgen", $(Get-Cbindgen)) +$rustPackages.AddToolNode("Clippy", $(Get-RustClippyVersion)) +$rustPackages.AddToolNode("Rustfmt", $(Get-RustfmtVersion)) + +# PowerShell +$powerShell = $installedSoftware.AddHeaderNode("PowerShell Tools") +$powerShell.AddToolNode("PowerShell", $(Get-PowershellVersion)) + +$powerShellModules = $powerShell.AddHeaderNode("PowerShell Modules") +$powerShellModules.AddTableNode($(Get-PowerShellModules)) # Web Servers -$markdown += Build-WebServersSection - +$webServers = $installedSoftware.AddHeaderNode("Web Servers") +$webServers.AddTableNode($(Build-WebServersSection)) # Xamarin section -$markdown += New-MDHeader "Xamarin" -Level 3 -$markdown += New-MDHeader "Visual Studio for Mac" -Level 4 -$markdown += Build-VSMacTable | New-MDTable -$markdown += New-MDNewLine +$xamarin = $installedSoftware.AddHeaderNode("Xamarin") +$vsForMac = $xamarin.AddHeaderNode("Visual Studio for Mac") +$vsForMac.AddTableNode($(Build-VSMacTable)) + if (-not $os.IsCatalina) { -$markdown += New-MDHeader "Notes:" -Level 5 -$reportVS = @' -``` + $note = + @' To use Visual Studio 2019 by default rename the app: mv "/Applications/Visual Studio.app" "/Applications/Visual Studio 2022.app" mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" -``` '@ -$markdown += New-MDParagraph -Lines $reportVS + $vsForMacNotes = $vsForMac.AddHeaderNode("Notes") + $vsForMacNotes.AddNoteNode($note) } -$markdown += New-MDHeader "Xamarin bundles" -Level 4 -$markdown += Build-XamarinTable | New-MDTable -$markdown += New-MDNewLine +$xamarinBundles = $xamarin.AddHeaderNode("Xamarin bundles") +$xamarinBundles.AddTableNode($(Build-XamarinTable)) -$markdown += New-MDHeader "Unit Test Framework" -Level 4 -$markdown += New-MDList -Lines @(Get-NUnitVersion) -Style Unordered +$unitTestFramework = $xamarin.AddHeaderNode("Unit Test Framework") +$unitTestFramework.AddToolNode("NUnit", $(Get-NUnitVersion)) +# Xcode section +$xcode = $installedSoftware.AddHeaderNode("Xcode") # First run doesn't provide full data about devices and runtimes Get-XcodeInfoList | Out-Null -# Xcode section + $xcodeInfo = Get-XcodeInfoList -$markdown += New-MDHeader "Xcode" -Level 3 -$markdown += Build-XcodeTable $xcodeInfo | New-MDTable -$markdown += New-MDNewLine +$xcode.AddTableNode($(Build-XcodeTable $xcodeInfo)) -$markdown += Build-XcodeSupportToolsSection +$xcodeTools = $xcode.AddHeaderNode("Xcode Support Tools") +$xcodeTools.AddNodes($(Build-XcodeSupportToolsSection)) -$markdown += New-MDHeader "Installed SDKs" -Level 4 -$markdown += Build-XcodeSDKTable $xcodeInfo | New-MDTable -$markdown += New-MDNewLine +$installedSdks = $xcode.AddHeaderNode("Installed SDKs") +$installedSdks.AddTableNode($(Build-XcodeSDKTable $xcodeInfo)) -$markdown += New-MDHeader "Installed Simulators" -Level 4 -$markdown += Build-XcodeSimulatorsTable $xcodeInfo | New-MDTable -$markdown += New-MDNewLine +$installedSimulators = $xcode.AddHeaderNode("Installed Simulators") +$installedSimulators.AddTableNode($(Build-XcodeSimulatorsTable $xcodeInfo)) # Android section -$markdown += New-MDHeader "Android" -Level 3 +$android = $installedSoftware.AddHeaderNode("Android") $androidTable = Build-AndroidTable if ($os.IsCatalina) { $androidTable += Get-IntelHaxmVersion } -$markdown += $androidTable | New-MDTable -$markdown += New-MDNewLine -$markdown += New-MDHeader "Environment variables" -Level 4 -$markdown += Build-AndroidEnvironmentTable | New-MDTable -$markdown += New-MDNewLine - -$markdown += New-MDHeader "Miscellaneous" -Level 3 -$markdown += New-MDList -Style Unordered -Lines (@( - (Get-ZlibVersion), - (Get-LibXextVersion), - (Get-LibXftVersion), - (Get-TclTkVersion) - ) | Sort-Object -) +$android.AddTableNode($androidTable) + +$androidEnv = $android.AddHeaderNode("Environment variables") +$androidEnv.AddTableNode($(Build-AndroidEnvironmentTable)) + +$miscellaneous = $installedSoftware.AddHeaderNode("Miscellaneous") +$miscellaneous.AddToolNode("libXext", $(Get-LibXextVersion)) +$miscellaneous.AddToolNode("libXft", $(Get-LibXftVersion)) +$miscellaneous.AddToolNode("Tcl/Tk", $(Get-TclTkVersion)) +$miscellaneous.AddToolNode("Zlib", $(Get-ZlibVersion)) if ($os.IsMonterey) { -$markdown += New-MDHeader "Environment variables" -Level 4 -$markdown += Build-MiscellaneousEnvironmentTable | New-MDTable -$markdown += New-MDNewLine + $miscellaneousEnv = $miscellaneous.AddHeaderNode("Environment variables") + $miscellaneousEnv.AddTableNode($(Build-MiscellaneousEnvironmentTable)) -$markdown += New-MDHeader "Notes:" -Level 5 -$misc = @' -``` + $notes = @' If you want to use Parallels Desktop you should download a package from URL stored in PARALLELS_DMG_URL environment variable. A system extension is allowed for this version. -``` '@ -$markdown += New-MDParagraph -Lines $misc + $miscellaneousEnvNotes = $miscellaneousEnv.AddHeaderNode("Notes") + $miscellaneousEnvNotes.AddNoteNode($notes) } # @@ -334,10 +269,9 @@ $markdown += New-MDParagraph -Lines $misc # $dateTime = (Get-Date).ToString("yyyy-MM-dd HH:mm:ss") $systemInfo = [string]::Join([System.Environment]::NewLine, @( - "Date: ${dateTime}", - "Image name: ${ImageName}" -)) - + "Date: ${dateTime}", + "Image name: ${ImageName}" + )) if (-not (Test-Path $OutputDirectory)) { New-Item -Path $OutputDirectory -ItemType Directory | Out-Null } @@ -346,4 +280,6 @@ if (-not (Test-Path $OutputDirectory)) { New-Item -Path $OutputDirectory -ItemTy # Write-Host $markdownExtended $systemInfo | Out-File -FilePath "${OutputDirectory}/systeminfo.txt" -Encoding UTF8NoBOM -$markdown | Out-File -FilePath "${OutputDirectory}/systeminfo.md" -Encoding UTF8NoBOM +$softwareReport.ToJson() | Out-File -FilePath "${OutputDirectory}/systeminfo.json" -Encoding UTF8NoBOM +$softwareReport.ToMarkdown() | Out-File -FilePath "${OutputDirectory}/systeminfo.md" -Encoding UTF8NoBOM + diff --git a/images/macos/software-report/SoftwareReport.Toolcache.psm1 b/images/macos/software-report/SoftwareReport.Toolcache.psm1 index 3b39b6fc793a..4ab0b6fc4f9a 100644 --- a/images/macos/software-report/SoftwareReport.Toolcache.psm1 +++ b/images/macos/software-report/SoftwareReport.Toolcache.psm1 @@ -35,37 +35,34 @@ function Get-ToolcacheGoTable { $Instance."Environment Variable" = "GOROOT_$($Version.major)_$($Version.minor)_X64" } - $Content = $ToolInstances | New-MDTable -Columns ([ordered]@{ - Version = "left"; - Architecture = "left"; - "Environment Variable" = "left" - }) + $Content = $ToolInstances | ForEach-Object { + return [PSCustomObject]@{ + Version = $_.Version + Architecture = $_.Architecture + "Environment Variable" = $_."Environment Variable" + } + } return $Content } function Build-ToolcacheSection { - $output = "" - $output += New-MDHeader "Cached Tools" -Level 3 - $output += New-MDHeader "Ruby" -Level 4 - $output += New-MDList -Lines (Get-ToolcacheRubyVersions) -Style Unordered - $output += New-MDHeader "Python" -Level 4 - $output += New-MDList -Lines (Get-ToolcachePythonVersions) -Style Unordered - $output += New-MDHeader "PyPy" -Level 4 - $output += New-MDList -Lines (Get-ToolcachePyPyVersions) -Style Unordered - $output += New-MDHeader "Node.js" -Level 4 - $output += New-MDList -Lines (Get-ToolcacheNodeVersions) -Style Unordered - $output += New-MDHeader "Go" -Level 4 - $output += Get-ToolcacheGoTable - - return $output + $goToolNode = [HeaderNode]::new("Go") + $goToolNode.AddTableNode($(Get-ToolcacheGoTable)) + return @( + [ToolVersionsNode]::new("Ruby", $(Get-ToolcacheRubyVersions)) + [ToolVersionsNode]::new("Python", $(Get-ToolcachePythonVersions)) + [ToolVersionsNode]::new("PyPy", $(Get-ToolcachePyPyVersions)) + [ToolVersionsNode]::new("Node.js", $(Get-ToolcacheNodeVersions)) + $goToolNode + ) } function Get-PowerShellModules { $modules = (Get-ToolsetValue powershellModules).name $psModules = Get-Module -Name $modules -ListAvailable | Sort-Object Name | Group-Object Name - $psModules | ForEach-Object { + return $psModules | ForEach-Object { $moduleName = $_.Name $moduleVersions = ($_.group.Version | Sort-Object -Unique) -join '<br>' diff --git a/images/macos/software-report/SoftwareReport.WebServers.psm1 b/images/macos/software-report/SoftwareReport.WebServers.psm1 index 041325538350..795882682444 100644 --- a/images/macos/software-report/SoftwareReport.WebServers.psm1 +++ b/images/macos/software-report/SoftwareReport.WebServers.psm1 @@ -29,13 +29,8 @@ function Get-NginxVersion { } function Build-WebServersSection { - $output = "" - $output += New-MDHeader "Web Servers" -Level 3 - $output += @( + return @( (Get-ApacheVersion), (Get-NginxVersion) - ) | Sort-Object Name | New-MDTable - - $output += New-MDNewLine - return $output + ) } diff --git a/images/macos/software-report/SoftwareReport.Xamarin.psm1 b/images/macos/software-report/SoftwareReport.Xamarin.psm1 index 09cac32095b9..1937ae73a808 100644 --- a/images/macos/software-report/SoftwareReport.Xamarin.psm1 +++ b/images/macos/software-report/SoftwareReport.Xamarin.psm1 @@ -4,7 +4,7 @@ function Build-VSMacTable { $vsMacVersions = Get-ToolsetValue "xamarin.vsmac.versions" $defaultVSMacVersion = Get-ToolsetValue "xamarin.vsmac.default" - $vsMacVersions | ForEach-Object { + return $vsMacVersions | ForEach-Object { $isDefault = $_ -eq $defaultVSMacVersion $vsPath = "/Applications/Visual Studio $_.app" if ($isDefault) { @@ -25,7 +25,7 @@ function Build-VSMacTable { function Get-NUnitVersion { $version = Run-Command "nunit3-console --version" | Select-Object -First 1 | Take-Part -Part 3 - return "NUnit ${version}" + return $version } function Build-XamarinTable { diff --git a/images/macos/software-report/SoftwareReport.Xcode.psm1 b/images/macos/software-report/SoftwareReport.Xcode.psm1 index e6038fbd2333..eff5153191cb 100644 --- a/images/macos/software-report/SoftwareReport.Xcode.psm1 +++ b/images/macos/software-report/SoftwareReport.Xcode.psm1 @@ -78,7 +78,7 @@ function Get-XcodePlatformOrder { function Get-XcodeCommandLineToolsVersion { $xcodeCommandLineToolsVersion = Run-Command "pkgutil --pkg-info com.apple.pkg.CLTools_Executables" | Select -Index 1 | Take-Part -Part 1 - return "Xcode Command Line Tools $xcodeCommandLineToolsVersion" + return $xcodeCommandLineToolsVersion } function Build-XcodeTable { @@ -226,13 +226,13 @@ function Build-XcodeSimulatorsTable { } function Build-XcodeSupportToolsSection { + $toolNodes = @() + $xcpretty = Run-Command "xcpretty --version" $xcversion = Run-Command "xcversion --version" | Select-String "^[0-9]" - $toolList = @( - "xcpretty $xcpretty", - "xcversion $xcversion" - ) + $toolNodes += [ToolNode]::new("xcpretty", $xcpretty) + $toolNodes += [ToolNode]::new("xcversion", $xcversion) $nomadOutput = Run-Command "gem list nomad-cli" $nomadCLI = [regex]::matches($nomadOutput, "(\d+.){2}\d+").Value @@ -240,14 +240,9 @@ function Build-XcodeSupportToolsSection { $nomadShenzhen = [regex]::matches($nomadShenzhenOutput, "(\d+.){2}\d+").Value if ($os.IsLessThanMonterey) { - $toolList += @( - "Nomad CLI $nomadCLI", - "Nomad shenzhen CLI $nomadShenzhen" - ) + $toolNodes += [ToolNode]::new("Nomad CLI", $nomadCLI) + $toolNodes += [ToolNode]::new("Nomad shenzhen CLI", $nomadShenzhen) } - $output = "" - $output += New-MDHeader "Xcode Support Tools" -Level 4 - $output += New-MDList -Style Unordered -Lines $toolList - return $output + return $toolNodes } From 6eaa5b44cf713a81815b6af4a84ee820aced144e Mon Sep 17 00:00:00 2001 From: Maxim Lobanov <maxim-lobanov@github.com> Date: Wed, 7 Dec 2022 14:20:14 +0100 Subject: [PATCH 1616/3485] Implement Software Report Base Module (#6707) * Implement first version * fix tables rendering * Fix scripts * update test files * implement calculate image diff script * Polish code and make e2e validation * remove test files * render add and removed firstly --- .../Calculate-ImagesDiff.ps1 | 48 +++ .../SoftwareReport.BaseNodes.psm1 | 47 +++ .../SoftwareReport.Comparer.psm1 | 303 ++++++++++++++++ .../SoftwareReport.Nodes.psm1 | 334 ++++++++++++++++++ .../software-report-base/SoftwareReport.psm1 | 28 ++ 5 files changed, 760 insertions(+) create mode 100644 helpers/software-report-base/Calculate-ImagesDiff.ps1 create mode 100644 helpers/software-report-base/SoftwareReport.BaseNodes.psm1 create mode 100644 helpers/software-report-base/SoftwareReport.Comparer.psm1 create mode 100644 helpers/software-report-base/SoftwareReport.Nodes.psm1 create mode 100644 helpers/software-report-base/SoftwareReport.psm1 diff --git a/helpers/software-report-base/Calculate-ImagesDiff.ps1 b/helpers/software-report-base/Calculate-ImagesDiff.ps1 new file mode 100644 index 000000000000..6d874a044594 --- /dev/null +++ b/helpers/software-report-base/Calculate-ImagesDiff.ps1 @@ -0,0 +1,48 @@ +using module ./SoftwareReport.psm1 +using module ./SoftwareReport.Comparer.psm1 + +<# +.SYNOPSIS + Calculates the difference between two software reports and saves it to a file. +.PARAMETER PreviousJsonReportPath + Path to the previous software report. +.PARAMETER CurrentJsonReportPath + Path to the current software report. +.PARAMETER OutputFile + Path to the file where the difference will be saved. +#> + +Param ( + [Parameter(Mandatory=$true)] + [string] $PreviousJsonReportPath, + [Parameter(Mandatory=$true)] + [string] $CurrentJsonReportPath, + [Parameter(Mandatory=$true)] + [string] $OutputFile +) + +$ErrorActionPreference = "Stop" +$global:ErrorView = "NormalView" + +function Read-SoftwareReport { + Param ( + [Parameter(Mandatory=$true)] + [string] $JsonReportPath + ) + + if (-not (Test-Path $JsonReportPath)) { + throw "File '$JsonReportPath' does not exist" + } + + $jsonReport = Get-Content -Path $JsonReportPath -Raw + $report = [SoftwareReport]::FromJson($jsonReport) + return $report +} + +$previousReport = Read-SoftwareReport -JsonReportPath $PreviousJsonReportPath +$currentReport = Read-SoftwareReport -JsonReportPath $CurrentJsonReportPath + +$comparer = [SoftwareReportComparer]::new($previousReport, $currentReport) +$comparer.CompareReports() +$diff = $comparer.GetMarkdownReport() +$diff | Out-File -Path $OutputFile -Encoding utf8NoBOM diff --git a/helpers/software-report-base/SoftwareReport.BaseNodes.psm1 b/helpers/software-report-base/SoftwareReport.BaseNodes.psm1 new file mode 100644 index 000000000000..545b7a38899a --- /dev/null +++ b/helpers/software-report-base/SoftwareReport.BaseNodes.psm1 @@ -0,0 +1,47 @@ +############################ +### Abstract base nodes #### +############################ + +# Abstract base class for all nodes +class BaseNode { + [Boolean] ShouldBeIncludedToDiff() { + return $False + } + + [Boolean] IsSimilarTo([BaseNode] $OtherNode) { + throw "Abtract method 'IsSimilarTo' is not implemented for '$($this.GetType().Name)'" + } + + [Boolean] IsIdenticalTo([BaseNode] $OtherNode) { + throw "Abtract method 'IsIdenticalTo' is not implemented for '$($this.GetType().Name)'" + } +} + +# Abstract base class for all nodes that describe a tool and should be rendered inside diff table +class BaseToolNode: BaseNode { + [String] $ToolName + + BaseToolNode([String] $ToolName) { + $this.ToolName = $ToolName + } + + [Boolean] ShouldBeIncludedToDiff() { + return $True + } + + [String] GetValue() { + throw "Abtract method 'GetValue' is not implemented for '$($this.GetType().Name)'" + } + + [Boolean] IsSimilarTo([BaseNode] $OtherNode) { + if ($this.GetType() -ne $OtherNode.GetType()) { + return $False + } + + return $this.ToolName -eq $OtherNode.ToolName + } + + [Boolean] IsIdenticalTo([BaseNode] $OtherNode) { + return $this.IsSimilarTo($OtherNode) -and ($this.GetValue() -eq $OtherNode.GetValue()) + } +} \ No newline at end of file diff --git a/helpers/software-report-base/SoftwareReport.Comparer.psm1 b/helpers/software-report-base/SoftwareReport.Comparer.psm1 new file mode 100644 index 000000000000..8adb7332e7fa --- /dev/null +++ b/helpers/software-report-base/SoftwareReport.Comparer.psm1 @@ -0,0 +1,303 @@ +using module ./SoftwareReport.psm1 +using module ./SoftwareReport.BaseNodes.psm1 +using module ./SoftwareReport.Nodes.psm1 + + +# SoftwareReportComparer is used to calculate differences between two SoftwareReport objects +class SoftwareReportComparer { + hidden [SoftwareReport] $PreviousReport + hidden [SoftwareReport] $CurrentReport + + hidden [Collections.Generic.List[ReportDifferenceItem]] $AddedItems + hidden [Collections.Generic.List[ReportDifferenceItem]] $ChangedItems + hidden [Collections.Generic.List[ReportDifferenceItem]] $DeletedItems + + SoftwareReportComparer([SoftwareReport] $PreviousReport, [SoftwareReport] $CurrentReport) { + $this.PreviousReport = $PreviousReport + $this.CurrentReport = $CurrentReport + } + + [void] CompareReports() { + $this.AddedItems = @() + $this.ChangedItems = @() + $this.DeletedItems = @() + + $this.CompareInternal($this.PreviousReport.Root, $this.CurrentReport.Root, @()) + } + + hidden [void] CompareInternal([HeaderNode] $previousReportPointer, [HeaderNode] $currentReportPointer, [Array] $Headers) { + $currentReportPointer.Children ?? @() | Where-Object { $_.ShouldBeIncludedToDiff() -and $this.FilterExcludedNodes($_) } | ForEach-Object { + $currentReportNode = $_ + $sameNodeInPreviousReport = $previousReportPointer ? $previousReportPointer.FindSimilarChildNode($currentReportNode) : $null + + if ($currentReportNode -is [HeaderNode]) { + $this.CompareInternal($sameNodeInPreviousReport, $currentReportNode, $Headers + $currentReportNode.Title) + } else { + if ($sameNodeInPreviousReport -and ($currentReportNode.IsIdenticalTo($sameNodeInPreviousReport))) { + # Nodes are identical, nothing changed, just ignore it + } elseif ($sameNodeInPreviousReport) { + # Nodes are equal but not identical, so something was changed + $this.ChangedItems.Add([ReportDifferenceItem]::new($sameNodeInPreviousReport, $currentReportNode, $Headers)) + } else { + # Node was not found in previous report, new node was added + $this.AddedItems.Add([ReportDifferenceItem]::new($null, $currentReportNode, $Headers)) + } + } + } + + # Detecting nodes that were removed + $previousReportPointer.Children ?? @() | Where-Object { $_.ShouldBeIncludedToDiff() -and $this.FilterExcludedNodes($_) } | ForEach-Object { + $previousReportNode = $_ + $sameNodeInCurrentReport = $currentReportPointer ? $currentReportPointer.FindSimilarChildNode($previousReportNode) : $null + + if (-not $sameNodeInCurrentReport) { + if ($previousReportNode -is [HeaderNode]) { + $this.CompareInternal($previousReportNode, $null, $Headers + $previousReportNode.Title) + } else { + $this.DeletedItems.Add([ReportDifferenceItem]::new($previousReportNode, $null, $Headers)) + } + } + } + } + + [String] GetMarkdownReport() { + $reporter = [SoftwareReportComparerReport]::new() + $report = $reporter.GenerateMarkdownReport($this.CurrentReport, $this.PreviousReport, $this.AddedItems, $this.ChangedItems, $this.DeletedItems) + return $report + } + + hidden [Boolean] FilterExcludedNodes([BaseNode] $Node) { + # We shouldn't show "Image Version" diff because it is already shown in report header + if (($Node -is [ToolNode]) -and ($Node.ToolName -eq "Image Version:")) { + return $False + } + + return $True + } +} + +# SoftwareReportComparerReport is used to render results of SoftwareReportComparer in markdown format +class SoftwareReportComparerReport { + [String] GenerateMarkdownReport([SoftwareReport] $CurrentReport, [SoftwareReport] $PreviousReport, [ReportDifferenceItem[]] $AddedItems, [ReportDifferenceItem[]] $ChangedItems, [ReportDifferenceItem[]] $DeletedItems) { + $sb = [System.Text.StringBuilder]::new() + + $rootNode = $CurrentReport.Root + $imageVersion = $this.GetImageVersion($CurrentReport) + $previousImageVersion = $this.GetImageVersion($PreviousReport) + + ############################# + ### Render report header #### + ############################# + + $sb.AppendLine("# :desktop_computer: $($rootNode.Title)") + + # ToolNodes on root level contains main image description so just copy-paste them to final report + $rootNode.Children | Where-Object { $_ -is [BaseToolNode] } | ForEach-Object { + $sb.AppendLine($_.ToMarkdown(0)) + } + $sb.AppendLine() + + $sb.AppendLine("## :mega: What's changed?") + + ########################### + ### Render added items #### + ########################### + + [ReportDifferenceItem[]] $addedItemsExcludeTables = $AddedItems | Where-Object { $_.IsBaseToolNode() } + if ($addedItemsExcludeTables.Count -gt 0) { + $tableItems = $addedItemsExcludeTables | ForEach-Object { + [PSCustomObject]@{ + "Category" = $this.RenderCategory($_.Headers, $True); + "Tool name" = $this.RenderToolName($_.CurrentReportNode.ToolName); + "Current ($imageVersion)" = $_.CurrentReportNode.GetValue(); + } + } + + $sb.AppendLine("### Added :heavy_plus_sign:") + $sb.AppendLine($this.RenderHtmlTable($tableItems, "Category")) + $sb.AppendLine() + } + + # Render added tables separately + $AddedItems | Where-Object { $_.IsTableNode() } | ForEach-Object { + $sb.AppendLine($this.RenderTableNodesDiff($_)) + } + + ############################# + ### Render deleted items #### + ############################# + + [ReportDifferenceItem[]] $deletedItemsExcludeTables = $DeletedItems | Where-Object { $_.IsBaseToolNode() } + if ($deletedItemsExcludeTables.Count -gt 0) { + $tableItems = $deletedItemsExcludeTables | ForEach-Object { + [PSCustomObject]@{ + "Category" = $this.RenderCategory($_.Headers, $True); + "Tool name" = $this.RenderToolName($_.PreviousReportNode.ToolName); + "Previous ($previousImageVersion)" = $_.PreviousReportNode.GetValue(); + } + } + + $sb.AppendLine("### Deleted :heavy_minus_sign:") + $sb.AppendLine($this.RenderHtmlTable($tableItems, "Category")) + $sb.AppendLine() + } + + ############################# + ### Render updated items #### + ############################# + + [ReportDifferenceItem[]] $changedItemsExcludeTables = $ChangedItems | Where-Object { $_.IsBaseToolNode() } + if ($changedItemsExcludeTables.Count -gt 0) { + $tableItems = $changedItemsExcludeTables | ForEach-Object { + [PSCustomObject]@{ + "Category" = $this.RenderCategory($_.Headers, $True); + "Tool name" = $this.RenderToolName($_.CurrentReportNode.ToolName); + "Previous ($previousImageVersion)" = $_.PreviousReportNode.GetValue(); + "Current ($imageVersion)" = $_.CurrentReportNode.GetValue(); + } + } + + $sb.AppendLine("### Updated") + $sb.AppendLine($this.RenderHtmlTable($tableItems, "Category")) + $sb.AppendLine() + } + + # Render updated tables separately + $ChangedItems | Where-Object { $_.IsTableNode() } | ForEach-Object { + $sb.AppendLine($this.RenderTableNodesDiff($_)) + } + + # Render deleted tables separately + $DeletedItems | Where-Object { $_.IsTableNode() } | ForEach-Object { + $sb.AppendLine($this.RenderTableNodesDiff($_)) + } + + return $sb.ToString() + } + + [String] RenderHtmlTable([PSCustomObject[]] $Table, $RowSpanColumnName) { + $headers = $Table[0].PSObject.Properties.Name + + $sb = [System.Text.StringBuilder]::new() + $sb.AppendLine("<table>") + $sb.AppendLine(" <thead>") + $headers | ForEach-Object { + $sb.AppendLine(" <th>$_</th>") + } + $sb.AppendLine(" </thead>") + $sb.AppendLine(" <tbody>") + + + $tableRowSpans = $this.CalculateHtmlTableRowSpan($Table, $RowSpanColumnName) + for ($rowIndex = 0; $rowIndex -lt $Table.Count; $rowIndex++) { + $row = $Table[$rowIndex] + + $sb.AppendLine(" <tr>") + $headers | ForEach-Object { + if ($_ -eq $RowSpanColumnName) { + if ($tableRowSpans[$rowIndex] -gt 0) { + $sb.AppendLine(" <td rowspan=$($tableRowSpans[$rowIndex])>$($row.$_)</td>") + } else { + # Skip rendering this cell at all + } + } else { + $sb.AppendLine(" <td>$($row.$_)</td>") + } + } + $sb.AppendLine(" </tr>") + } + $sb.AppendLine(" </tbody>") + $sb.AppendLine("</table>") + + return $sb.ToString() + } + + [int[]] CalculateHtmlTableRowSpan([PSCustomObject[]] $Table, $keyColumn) { + $result = @(0) * $Table.Count + + for ($rowIndex = $Table.Count - 1; $rowIndex -ge 0; $rowIndex--) { + if (($rowIndex -lt ($Table.Count - 1)) -and ($Table[$rowIndex].$keyColumn -eq $Table[$rowIndex + 1].$keyColumn)) { + # If the current row is the same as the next row + # Then rowspan of current row should be equal to rowspan of the next row + 1 + # And rowspan of the next row should be 0 because it is already included in the rowspan of the current row + $result[$rowIndex] = $result[$rowIndex + 1] + 1 + $result[$rowIndex + 1] = 0 + } else { + $result[$rowIndex] = 1 + } + } + + return $result + } + + [String] RenderTableNodesDiff([ReportDifferenceItem] $DiffItem) { + # Use the simplest approach for now: first, print all removed lines. Then print added lines + # It will work well for most cases like changing existing rows, adding new rows and removing rows + # But can produce not so pretty results for cases when some rows are changed and some rows are added at the same time + # Let's see how it works in practice and improve it later if needed + + [String] $tableHeaders = ($DiffItem.CurrentReportNode ?? $DiffItem.PreviousReportNode).Headers + [System.Collections.ArrayList] $tableRows = @() + $DiffItem.PreviousReportNode.Rows ?? @() | Where-Object { $_ -notin $DiffItem.CurrentReportNode.Rows } | ForEach-Object { + $tableRows.Add($this.StrikeTableRow($_)) + } + $DiffItem.CurrentReportNode.Rows ?? @() | Where-Object { $_ -notin $DiffItem.PreviousReportNode.Rows } | ForEach-Object { + $tableRows.Add($_) + } + + $sb = [System.Text.StringBuilder]::new() + $sb.AppendLine("#### $($this.RenderCategory($DiffItem.Headers, $False))") + $sb.AppendLine([TableNode]::new($tableHeaders, $tableRows).ToMarkdown(0)) + return $sb.ToString() + } + + [String] RenderCategory([Array] $Headers, [Boolean] $AddLineSeparator) { + # Always skip the first header because it is "Installed Software" + [Array] $takeHeaders = $Headers | Select-Object -Skip 1 + if ($takeHeaders.Count -eq 0) { + return "" + } + + $lineSeparator = $AddLineSeparator ? "<br>": "" + return [String]::Join(" >$lineSeparator ", $takeHeaders) + } + + [String] RenderToolName([String] $ToolName) { + return $ToolName.TrimEnd(":") + } + + [String] StrikeTableRow([String] $Row) { + # Convert "a|b|c" to "~~a~~|~~b~~|~~c~~ + $cells = $Row.Split("|") + $strikedCells = $cells | ForEach-Object { "~~$($_)~~"} + return [String]::Join("|", $strikedCells) + } + + [String] GetImageVersion([SoftwareReport] $Report) { + $imageVersionNode = $Report.Root.Children ?? @() | Where-Object { ($_ -is [ToolNode]) -and ($_.ToolName -eq "Image Version:") } | Select-Object -First 1 + return $imageVersionNode.Version ?? "Unknown version" + } +} + +# Temporary structure to store the single difference between two reports +class ReportDifferenceItem { + [BaseNode] $PreviousReportNode + [BaseNode] $CurrentReportNode + [Array] $Headers + + ReportDifferenceItem([BaseNode] $PreviousReportNode, [BaseNode] $CurrentReportNode, [Array] $Headers) { + $this.PreviousReportNode = $PreviousReportNode + $this.CurrentReportNode = $CurrentReportNode + $this.Headers = $Headers + } + + [Boolean] IsBaseToolNode() { + $node = $this.CurrentReportNode ?? $this.PreviousReportNode + return $node -is [BaseToolNode] + } + + [Boolean] IsTableNode() { + $node = $this.CurrentReportNode ?? $this.PreviousReportNode + return $node -is [TableNode] + } +} \ No newline at end of file diff --git a/helpers/software-report-base/SoftwareReport.Nodes.psm1 b/helpers/software-report-base/SoftwareReport.Nodes.psm1 new file mode 100644 index 000000000000..1385782a17db --- /dev/null +++ b/helpers/software-report-base/SoftwareReport.Nodes.psm1 @@ -0,0 +1,334 @@ +using module ./SoftwareReport.BaseNodes.psm1 + +######################################### +### Nodes to describe image software #### +######################################### + +# NodesFactory is used to simplify parsing different types of notes +# Every node has own logic of parsing and this method just invokes "FromJsonObject" of correct node type +class NodesFactory { + static [BaseNode] ParseNodeFromObject($jsonObj) { + if ($jsonObj.NodeType -eq [HeaderNode].Name) { + return [HeaderNode]::FromJsonObject($jsonObj) + } elseif ($jsonObj.NodeType -eq [ToolNode].Name) { + return [ToolNode]::FromJsonObject($jsonObj) + } elseif ($jsonObj.NodeType -eq [ToolVersionsNode].Name) { + return [ToolVersionsNode]::FromJsonObject($jsonObj) + } elseif ($jsonObj.NodeType -eq [TableNode].Name) { + return [TableNode]::FromJsonObject($jsonObj) + } elseif ($jsonObj.NodeType -eq [NoteNode].Name) { + return [NoteNode]::FromJsonObject($jsonObj) + } + + throw "Unknown node type in ParseNodeFromObject '$($jsonObj.NodeType)'" + } +} + +# Node type to describe headers: "## Installed software" +class HeaderNode: BaseNode { + [String] $Title + [System.Collections.ArrayList] $Children + + HeaderNode([String] $Title) { + $this.Title = $Title + $this.Children = @() + } + + [Boolean] ShouldBeIncludedToDiff() { + return $True + } + + [void] AddNode([BaseNode] $node) { + $similarNode = $this.FindSimilarChildNode($node) + if ($similarNode) { + throw "This HeaderNode already contains the similar child node. It is not allowed to add the same node twice.`nFound node: $($similarNode.ToJsonObject() | ConvertTo-Json)`nNew node: $($node.ToJsonObject() | ConvertTo-Json)" + } + + $this.Children.Add($node) + } + + [void] AddNodes([Array] $nodes) { + $nodes | ForEach-Object { + $this.AddNode($_) + } + } + + [HeaderNode] AddHeaderNode([String] $Title) { + $node = [HeaderNode]::new($Title) + $this.AddNode($node) + return $node + } + + [void] AddToolNode([String] $ToolName, [String] $Version) { + $this.AddNode([ToolNode]::new($ToolName, $Version)) + } + + [void] AddToolVersionsNode([String] $ToolName, [Array] $Version) { + $this.AddNode([ToolVersionsNode]::new($ToolName, $Version)) + } + + [void] AddTableNode([Array] $Table) { + $this.AddNode([TableNode]::FromObjectsArray($Table)) + } + + [void] AddNoteNode([String] $Content) { + $this.AddNode([NoteNode]::new($Content)) + } + + [String] ToMarkdown($level) { + $sb = [System.Text.StringBuilder]::new() + $sb.AppendLine() + $sb.AppendLine("$("#" * $level) $($this.Title)") + $this.Children | ForEach-Object { + $sb.AppendLine($_.ToMarkdown($level + 1)) + } + + return $sb.ToString().TrimEnd() + } + + [PSCustomObject] ToJsonObject() { + return [PSCustomObject]@{ + NodeType = $this.GetType().Name + Title = $this.Title + Children = $this.Children | ForEach-Object { $_.ToJsonObject() } + } + } + + static [HeaderNode] FromJsonObject($jsonObj) { + $node = [HeaderNode]::new($jsonObj.Title) + $jsonObj.Children | Where-Object { $_ } | ForEach-Object { $node.AddNode([NodesFactory]::ParseNodeFromObject($_)) } + return $node + } + + [Boolean] IsSimilarTo([BaseNode] $OtherNode) { + if ($OtherNode.GetType() -ne [HeaderNode]) { + return $false + } + + return $this.Title -eq $OtherNode.Title + } + + [Boolean] IsIdenticalTo([BaseNode] $OtherNode) { + return $this.IsSimilarTo($OtherNode) + } + + [BaseNode] FindSimilarChildNode([BaseNode] $Find) { + foreach ($childNode in $this.Children) { + if ($childNode.IsSimilarTo($Find)) { + return $childNode + } + } + + return $null + } +} + +# Node type to describe the tool with single version: "Bash 5.1.16" +class ToolNode: BaseToolNode { + [String] $Version + + ToolNode([String] $ToolName, [String] $Version): base($ToolName) { + $this.Version = $Version + } + + [String] ToMarkdown($level) { + return "- $($this.ToolName) $($this.Version)" + } + + [String] GetValue() { + return $this.Version + } + + [PSCustomObject] ToJsonObject() { + return [PSCustomObject]@{ + NodeType = $this.GetType().Name + ToolName = $this.ToolName + Version = $this.Version + } + } + + static [BaseNode] FromJsonObject($jsonObj) { + return [ToolNode]::new($jsonObj.ToolName, $jsonObj.Version) + } +} + +# Node type to describe the tool with multiple versions "Toolcache Node.js 14.17.6 16.2.0 18.2.3" +class ToolVersionsNode: BaseToolNode { + [Array] $Versions + + ToolVersionsNode([String] $ToolName, [Array] $Versions): base($ToolName) { + $this.Versions = $Versions + } + + [String] ToMarkdown($level) { + $sb = [System.Text.StringBuilder]::new() + $sb.AppendLine() + $sb.AppendLine("$("#" * $level) $($this.ToolName)") + $this.Versions | ForEach-Object { + $sb.AppendLine("- $_") + } + + return $sb.ToString().TrimEnd() + } + + [String] GetValue() { + return $this.Versions -join ', ' + } + + [PSCustomObject] ToJsonObject() { + return [PSCustomObject]@{ + NodeType = $this.GetType().Name + ToolName = $this.ToolName + Versions = $this.Versions + } + } + + static [ToolVersionsNode] FromJsonObject($jsonObj) { + return [ToolVersionsNode]::new($jsonObj.ToolName, $jsonObj.Versions) + } +} + +# Node type to describe tables +class TableNode: BaseNode { + # It is easier to store the table as rendered lines because it will simplify finding differences in rows later + [String] $Headers + [System.Collections.ArrayList] $Rows + + TableNode($Headers, $Rows) { + $this.Headers = $Headers + $this.Rows = $Rows + } + + [Boolean] ShouldBeIncludedToDiff() { + return $True + } + + static [TableNode] FromObjectsArray([Array] $Table) { + # take column names from the first row in table because we expect all rows to have the same columns + [String] $tableHeaders = [TableNode]::ArrayToTableRow($Table[0].PSObject.Properties.Name) + [System.Collections.ArrayList] $tableRows = @() + + $Table | ForEach-Object { + $tableRows.Add([TableNode]::ArrayToTableRow($_.PSObject.Properties.Value)) + } + + return [TableNode]::new($tableHeaders, $tableRows) + } + + [String] ToMarkdown($level) { + $maxColumnWidths = $this.Headers.Split("|") | ForEach-Object { $_.Length } + $columnsCount = $maxColumnWidths.Count + + $this.Rows | ForEach-Object { + $columnWidths = $_.Split("|") | ForEach-Object { $_.Length } + for ($colIndex = 0; $colIndex -lt $columnsCount; $colIndex++) { + $maxColumnWidths[$colIndex] = [Math]::Max($maxColumnWidths[$colIndex], $columnWidths[$colIndex]) + } + } + + $delimeterLine = [String]::Join("|", @("-") * $columnsCount) + + $sb = [System.Text.StringBuilder]::new() + @($this.Headers) + @($delimeterLine) + $this.Rows | ForEach-Object { + $sb.Append("|") + $row = $_.Split("|") + + for ($colIndex = 0; $colIndex -lt $columnsCount; $colIndex++) { + $padSymbol = $row[$colIndex] -eq "-" ? "-" : " " + $cellContent = $row[$colIndex].PadRight($maxColumnWidths[$colIndex], $padSymbol) + $sb.Append(" $($cellContent) |") + } + + $sb.AppendLine() + } + + return $sb.ToString().TrimEnd() + } + + [PSCustomObject] ToJsonObject() { + return [PSCustomObject]@{ + NodeType = $this.GetType().Name + Headers = $this.Headers + Rows = $this.Rows + } + } + + static [TableNode] FromJsonObject($jsonObj) { + return [TableNode]::new($jsonObj.Headers, $jsonObj.Rows) + } + + [Boolean] IsSimilarTo([BaseNode] $OtherNode) { + if ($OtherNode.GetType() -ne [TableNode]) { + return $false + } + + # We don't support having multiple TableNode instances on the same header level so such check is fine + return $true + } + + [Boolean] IsIdenticalTo([BaseNode] $OtherNode) { + if (-not $this.IsSimilarTo($OtherNode)) { + return $false + } + + if ($this.Headers -ne $OtherNode.Headers) { + return $false + } + + if ($this.Rows.Count -ne $OtherNode.Rows.Count) { + return $false + } + + for ($rowIndex = 0; $rowIndex -lt $this.Rows.Count; $rowIndex++) { + if ($this.Rows[$rowIndex] -ne $OtherNode.Rows[$rowIndex]) { + return $false + } + } + + return $true + } + + hidden static [String] ArrayToTableRow([Array] $Values) { + # TO-DO: Add validation for the case when $Values contains "|" + return [String]::Join("|", $Values) + } +} + +class NoteNode: BaseNode { + [String] $Content + + NoteNode([String] $Content) { + $this.Content = $Content + } + + [String] ToMarkdown($level) { + return @( + '```', + $this.Content, + '```' + ) -join "`n" + } + + [PSCustomObject] ToJsonObject() { + return [PSCustomObject]@{ + NodeType = $this.GetType().Name + Content = $this.Content + } + } + + static [NoteNode] FromJsonObject($jsonObj) { + return [NoteNode]::new($jsonObj.Content) + } + + [Boolean] IsSimilarTo([BaseNode] $OtherNode) { + if ($OtherNode.GetType() -ne [NoteNode]) { + return $false + } + + return $this.Content -eq $OtherNode.Content + } + + [Boolean] IsIdenticalTo([BaseNode] $OtherNode) { + return $this.IsSimilarTo($OtherNode) + } +} diff --git a/helpers/software-report-base/SoftwareReport.psm1 b/helpers/software-report-base/SoftwareReport.psm1 new file mode 100644 index 000000000000..81f3cfd9c4aa --- /dev/null +++ b/helpers/software-report-base/SoftwareReport.psm1 @@ -0,0 +1,28 @@ +using module ./SoftwareReport.BaseNodes.psm1 +using module ./SoftwareReport.Nodes.psm1 + +class SoftwareReport { + [HeaderNode] $Root + + SoftwareReport([String] $Title) { + $this.Root = [HeaderNode]::new($Title) + } + + SoftwareReport([HeaderNode] $Root) { + $this.Root = $Root + } + + [String] ToJson() { + return $this.Root.ToJsonObject() | ConvertTo-Json -Depth 10 + } + + static [SoftwareReport] FromJson($jsonString) { + $jsonObj = $jsonString | ConvertFrom-Json + $rootNode = [NodesFactory]::ParseNodeFromObject($jsonObj) + return [SoftwareReport]::new($rootNode) + } + + [String] ToMarkdown() { + return $this.Root.ToMarkdown(1).Trim() + } +} \ No newline at end of file From 71e3d4dc6d3e94bc77568bc651d184d6cf0cf00d Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Thu, 8 Dec 2022 10:29:26 +0100 Subject: [PATCH 1617/3485] [macOS] Add xcode-14.2 (#6718) --- images/macos/toolsets/toolset-12.json | 1 + 1 file changed, 1 insertion(+) diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index b1f1e7cdf0c1..63fa733f09ea 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -2,6 +2,7 @@ "xcode": { "default": "14.0.1", "versions": [ + {"link": "14.2", "version": "14.2.0"}, { "link": "14.1", "version": "14.1.0"}, { "link": "14.0.1", "version": "14.0.1" }, { "link": "14.0", "version": "14.0.0" }, From ec48677623cba3a4f203230ffe49f0d3cce292b7 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 8 Dec 2022 10:04:50 +0000 Subject: [PATCH 1618/3485] Updating readme file for macOS-12 version 20221204.1 (#6706) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-12-Readme.md | 44 ++++++++++++++++----------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/images/macos/macos-12-Readme.md b/images/macos/macos-12-Readme.md index 50c0c60cff16..f9cb627d9990 100644 --- a/images/macos/macos-12-Readme.md +++ b/images/macos/macos-12-Readme.md @@ -6,7 +6,7 @@ # macOS 12.6 info - System Version: macOS 12.6.1 (21G217) - Kernel Version: Darwin 21.6.0 -- Image Version: 20221127.5 +- Image Version: 20221204.1 ## Installed Software ### Language and Runtime @@ -35,7 +35,7 @@ - Carthage 0.38.0 - CocoaPods 1.11.3 - Composer 2.4.4 -- Homebrew 3.6.12 +- Homebrew 3.6.13 - Miniconda 4.12.0 - NPM 8.19.2 - NuGet 6.3.1.1 @@ -43,7 +43,7 @@ - Pip 22.3.1 (python 3.11) - Pipx 1.1.0 - RubyGems 3.3.26 -- Vcpkg 2022 (build from master \<62d01b70d>) +- Vcpkg 2022 (build from master \<163fe7bd3>) - Yarn 1.22.19 #### Environment variables @@ -67,7 +67,7 @@ - bsdtar 3.5.1 - available by 'tar' alias - Curl 7.86.0 - Git 2.38.1 -- Git LFS: 3.2.0 +- Git LFS: 3.3.0 - GitHub CLI: 2.20.2 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.3 @@ -86,19 +86,19 @@ - Switchaudio-osx 1.1.0 - Vagrant 2.3.3 - VirtualBox 6.1.38r153438 -- yq (https://github.com/mikefarah/yq/) version v4.30.4 +- yq (https://github.com/mikefarah/yq/) version v4.30.5 - zstd 1.5.2 ### Tools - App Center CLI 2.12.0 -- AWS CLI 2.9.1 -- AWS SAM CLI 1.65.0 +- AWS CLI 2.9.4 +- AWS SAM CLI 1.66.0 - AWS Session Manager CLI 1.2.398.0 - Azure CLI (azure-devops) 0.25.0 - Azure CLI 2.42.0 - Bicep CLI 0.12.40 - Cabal 3.6.2.0 -- Cmake 3.25.0 +- Cmake 3.25.1 - CodeQL Action Bundle 2.11.4 - Colima 0.4.6 - Fastlane 2.211.0 @@ -106,8 +106,8 @@ - GHCup 0.1.18.0 - Jazzy 0.14.3 - Stack 2.9.1 -- SwiftFormat 0.50.4 -- Swig 4.1.0 +- SwiftFormat 0.50.5 +- Swig 4.1.1 - Xcode Command Line Tools 14.1.0.0.1.1666437224 ### Linters @@ -117,18 +117,18 @@ ### Browsers - Safari 16.1 (17614.2.9.1.13) - SafariDriver 16.1 (17614.2.9.1.13) -- Google Chrome 107.0.5304.121 -- ChromeDriver 107.0.5304.62 -- Microsoft Edge 107.0.1418.56 -- Microsoft Edge WebDriver 107.0.1418.56 -- Mozilla Firefox 107.0 +- Google Chrome 108.0.5359.94 +- ChromeDriver 108.0.5359.71 +- Microsoft Edge 107.0.1418.68 +- Microsoft Edge WebDriver 107.0.1418.68 +- Mozilla Firefox 107.0.1 - geckodriver 0.32.0 - Selenium server 4.5.0 #### Environment variables | Name | Value | | --------------- | ---------------------------------------------- | -| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/107.0.5304.62 | +| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/108.0.5359.71 | | EDGEWEBDRIVER | /usr/local/share/edge_driver | | GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | @@ -152,7 +152,7 @@ #### Python - 3.7.15 -- 3.8.14 +- 3.8.15 - 3.9.14 - 3.10.8 - 3.11.0 @@ -313,11 +313,11 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" | tvOS 15.4 | 13.3.1<br>13.4<br>13.4.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | | tvOS 16.0 | 13.1<br>13.2.1<br>13.3.1<br>13.4<br>13.4.1<br>14.0<br>14.0.1<br>14.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | | tvOS 16.1 | 13.1<br>13.2.1<br>13.3.1<br>13.4<br>13.4.1<br>14.0<br>14.0.1<br>14.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p)<br>Apple TV 4K (at 1080p) (2nd generation) | -| watchOS 8.0 | 13.1 | Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm) | -| watchOS 8.3 | 13.2.1 | Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | -| watchOS 8.5 | 13.3.1<br>13.4<br>13.4.1 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 (45mm) | -| watchOS 9.0 | 13.1<br>13.2.1<br>13.3.1<br>13.4<br>13.4.1<br>14.0<br>14.0.1<br>14.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | -| watchOS 9.1 | 13.1<br>13.2.1<br>13.3.1<br>13.4<br>13.4.1<br>14.0<br>14.0.1<br>14.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | +| watchOS 8.0 | 13.1 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 - 45mm<br>Apple Watch Series 7 (41mm) | +| watchOS 8.3 | 13.2.1 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | +| watchOS 8.5 | 13.3.1<br>13.4<br>13.4.1 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | +| watchOS 9.0 | 13.1<br>13.2.1<br>13.3.1<br>13.4<br>13.4.1<br>14.0<br>14.0.1<br>14.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | +| watchOS 9.1 | 13.1<br>13.2.1<br>13.3.1<br>13.4<br>13.4.1<br>14.0<br>14.0.1<br>14.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | ### Android | Package Name | Version | From f28afb30692df3d57314c6fd2a42915eab4e8955 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 8 Dec 2022 11:01:27 +0000 Subject: [PATCH 1619/3485] Updating readme file for macOS-11 version 20221204.1 (#6705) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-11-Readme.md | 36 ++++++++++++++++----------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/images/macos/macos-11-Readme.md b/images/macos/macos-11-Readme.md index 330a35933af4..bfd31d2144cf 100644 --- a/images/macos/macos-11-Readme.md +++ b/images/macos/macos-11-Readme.md @@ -6,7 +6,7 @@ # macOS 11.7 info - System Version: macOS 11.7.1 (20G918) - Kernel Version: Darwin 20.6.0 -- Image Version: 20221127.7 +- Image Version: 20221204.1 ## Installed Software ### Language and Runtime @@ -39,7 +39,7 @@ - Carthage 0.38.0 - CocoaPods 1.11.3 - Composer 2.4.4 -- Homebrew 3.6.12 +- Homebrew 3.6.13 - Miniconda 4.12.0 - NPM 8.19.2 - NuGet 6.3.1.1 @@ -47,7 +47,7 @@ - Pip 22.3.1 (python 3.11) - Pipx 1.1.0 - RubyGems 3.3.26 -- Vcpkg 2022 (build from master \<62d01b70d>) +- Vcpkg 2022 (build from master \<163fe7bd3>) - Yarn 1.22.19 #### Environment variables @@ -71,7 +71,7 @@ - bsdtar 3.3.2 - available by 'tar' alias - Curl 7.86.0 - Git 2.38.1 -- Git LFS: 3.2.0 +- Git LFS: 3.3.0 - GitHub CLI: 2.20.2 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.3 @@ -90,20 +90,20 @@ - Sox 14.4.2 - Subversion (SVN) 1.14.2 - Switchaudio-osx 1.1.0 -- yq (https://github.com/mikefarah/yq/) version v4.30.4 +- yq (https://github.com/mikefarah/yq/) version v4.30.5 - zstd 1.5.2 ### Tools -- Aliyun CLI 3.0.137 +- Aliyun CLI 3.0.139 - App Center CLI 2.12.0 -- AWS CLI 2.9.1 -- AWS SAM CLI 1.65.0 +- AWS CLI 2.9.4 +- AWS SAM CLI 1.66.0 - AWS Session Manager CLI 1.2.398.0 - Azure CLI (azure-devops) 0.25.0 - Azure CLI 2.42.0 - Bicep CLI 0.12.40 - Cabal 3.6.2.0 -- Cmake 3.25.0 +- Cmake 3.25.1 - CodeQL Action Bundle 2.11.4 - Colima 0.4.6 - Fastlane 2.211.0 @@ -111,8 +111,8 @@ - GHCup 0.1.18.0 - Jazzy 0.14.3 - Stack 2.9.1 -- SwiftFormat 0.50.4 -- Swig 4.1.0 +- SwiftFormat 0.50.5 +- Swig 4.1.1 - Xcode Command Line Tools 13.2.0.0.1.1638488800 ### Linters @@ -122,18 +122,18 @@ ### Browsers - Safari 16.1 (16614.2.9.1.13) - SafariDriver 16.1 (16614.2.9.1.13) -- Google Chrome 107.0.5304.121 -- ChromeDriver 107.0.5304.62 -- Microsoft Edge 107.0.1418.56 -- Microsoft Edge WebDriver 107.0.1418.56 -- Mozilla Firefox 107.0 +- Google Chrome 108.0.5359.94 +- ChromeDriver 108.0.5359.71 +- Microsoft Edge 107.0.1418.68 +- Microsoft Edge WebDriver 107.0.1418.68 +- Mozilla Firefox 107.0.1 - geckodriver 0.32.0 - Selenium server 4.5.0 #### Environment variables | Name | Value | | --------------- | ---------------------------------------------- | -| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/107.0.5304.62 | +| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/108.0.5359.71 | | EDGEWEBDRIVER | /usr/local/share/edge_driver | | GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | @@ -160,7 +160,7 @@ #### Python - 3.7.15 -- 3.8.14 +- 3.8.15 - 3.9.14 - 3.10.8 - 3.11.0 From 479d7175f6482f0ca3fe2a12d13c68b1a1c72724 Mon Sep 17 00:00:00 2001 From: Maxim Lobanov <maxim-lobanov@github.com> Date: Thu, 8 Dec 2022 19:14:16 +0100 Subject: [PATCH 1620/3485] Minor improvements for macOS Documentation (#6721) * Minor improvements * fix typos * fix brew rendering --- .../SoftwareReport.Common.psm1 | 35 ++++++++++++------- .../SoftwareReport.Generator.ps1 | 1 + .../software-report/SoftwareReport.Xcode.psm1 | 10 ++++-- 3 files changed, 32 insertions(+), 14 deletions(-) diff --git a/images/macos/software-report/SoftwareReport.Common.psm1 b/images/macos/software-report/SoftwareReport.Common.psm1 index 3a5c8a93273f..3d03d0a04acd 100644 --- a/images/macos/software-report/SoftwareReport.Common.psm1 +++ b/images/macos/software-report/SoftwareReport.Common.psm1 @@ -1,3 +1,7 @@ +Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" + +$os = Get-OSVersion + function Get-BashVersion { $version = bash -c 'echo ${BASH_VERSION}' return $version @@ -76,7 +80,7 @@ function Get-RustupVersion { function Get-VcpkgVersion { $vcpkgVersion = Run-Command "vcpkg version" | Select-Object -First 1 | Take-Part -Part 5 | Take-Part -Part 0 -Delimiter "-" $commitId = git -C "/usr/local/share/vcpkg" rev-parse --short HEAD - return "$vcpkgVersion (build from master \<$commitId>)" + return "$vcpkgVersion (build from commit $commitId)" } function Get-GccVersions { @@ -109,7 +113,7 @@ function Get-ClangLLVMVersions { return @( [ToolNode]::new("Clang/LLVM", $defaultClangVersion) - [ToolNode]::new("Clang/LLVM (Homebrew)", "$homebrewClangVersion - available on ```'$homebrewClangPath`'``") + [ToolNode]::new("Clang/LLVM (Homebrew)", "$homebrewClangVersion - available on ``$homebrewClangPath``") ) } @@ -144,8 +148,8 @@ function Get-NVMNodeVersionList { $nvmInitCommand = ". ${nvmPath} > /dev/null 2>&1 || true" $nodejsVersionsRaw = Run-Command "${nvmInitCommand} && nvm ls" $nodeVersions = $nodejsVersionsRaw | ForEach-Object { $_.TrimStart(" ").TrimEnd(" *") } | Where-Object { $_.StartsWith("v") } - $result = [string]::Join(" ", $nodeVersions) - return $result + $formattedNodeVersions = $nodeVersions | ForEach-Object { $_.TrimStart("v") } + return [string]::Join(" ", $formattedNodeVersions) } function Build-OSInfoSection { @@ -156,29 +160,36 @@ function Build-OSInfoSection { $fieldsToInclude = @("System Version:", "Kernel Version:") $rawSystemInfo = Invoke-Expression "system_profiler SPSoftwareDataType" $parsedSystemInfo = $rawSystemInfo | Where-Object { -not ($_ | Select-String -NotMatch $fieldsToInclude) } | ForEach-Object { $_.Trim() } - $parsedSystemInfo[0] -match "System Version: macOS (?<version>\d+\.\d+)" | Out-Null + if ($os.IsCatalina) { + $parsedSystemInfo[0] -match "System Version: macOS (?<version>\d+\.\d+)" | Out-Null + } else { + $parsedSystemInfo[0] -match "System Version: macOS (?<version>\d+)" | Out-Null + } $version = $Matches.Version $systemVersion = $parsedSystemInfo[0].Replace($fieldsToInclude[0],"").Trim() $kernelVersion = $parsedSystemInfo[1].Replace($fieldsToInclude[1],"").Trim() - $osInfoNode = [HeaderNode]::new("macOS $version info") + $osInfoNode = [HeaderNode]::new("macOS $version") $osInfoNode.AddToolNode("System Version:", $systemVersion) $osInfoNode.AddToolNode("Kernel Version:", $kernelVersion) $osInfoNode.AddToolNode("Image Version:", $ImageName.Split('_')[1]) return $osInfoNode } +function Get-MonoVersion { + $monoVersion = mono --version | Out-String | Take-Part -Part 4 + return $monoVersion +} + function Get-MSBuildVersion { $msbuildVersion = msbuild -version | Select-Object -Last 1 - $result = Select-String -Path (Get-Command msbuild).Source -Pattern "msbuild" - $result -match "(?<path>\/\S*\.dll)" | Out-Null - $msbuildPath = $Matches.path - return "$msbuildVersion (from $msbuildPath)" + $monoVersion = Get-MonoVersion + return "$msbuildVersion (Mono $monoVersion)" } function Get-NodeVersion { $nodeVersion = Run-Command "node --version" - return $nodeVersion + return $nodeVersion.TrimStart("v") } function Get-PerlVersion { @@ -213,7 +224,7 @@ function Get-JuliaVersion { function Get-BundlerVersion { $bundlerVersion = Run-Command "bundle --version" - return ($bundlerVersion -replace "^Bundler").Trim() + return ($bundlerVersion -replace "^Bundler version").Trim() } function Get-CarthageVersion { diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1 index b64b4df02428..8dea33c3da6a 100644 --- a/images/macos/software-report/SoftwareReport.Generator.ps1 +++ b/images/macos/software-report/SoftwareReport.Generator.ps1 @@ -39,6 +39,7 @@ $languageAndRuntime.AddNodes($(Get-FortranVersions)) $languageAndRuntime.AddToolNode("Go", $(Get-GoVersion)) $languageAndRuntime.AddToolNode("Julia", $(Get-JuliaVersion)) $languageAndRuntime.AddToolNode("Kotlin", $(Get-KotlinVersion)) +$languageAndRuntime.AddToolNode("Mono", $(Get-MonoVersion)) $languageAndRuntime.AddToolNode("MSBuild", $(Get-MSBuildVersion)) $languageAndRuntime.AddToolNode("Node.js", $(Get-NodeVersion)) $languageAndRuntime.AddToolNode("NVM", $(Get-NVMVersion)) diff --git a/images/macos/software-report/SoftwareReport.Xcode.psm1 b/images/macos/software-report/SoftwareReport.Xcode.psm1 index eff5153191cb..eed571fff9ca 100644 --- a/images/macos/software-report/SoftwareReport.Xcode.psm1 +++ b/images/macos/software-report/SoftwareReport.Xcode.psm1 @@ -166,8 +166,14 @@ function Build-XcodeSDKTable { } function Format-XcodeSimulatorName { - param([Parameter(Mandatory)][string] $Device) - return $Device.Replace("ʀ", "R") + param( + [Parameter(Mandatory)][string] $Device + ) + + $formattedDeviceName = $Device.Replace("ʀ", "R") + # Convert "Apple Watch Series 5 (44mm)" -> "Apple Watch Series 5 - 44mm" to make all Xcode versions consistent + $formattedDeviceName = $formattedDeviceName -replace '\((\d+mm)\)', '- $1' + return $formattedDeviceName } function Build-XcodeSimulatorsTable { From fb484d95309e2fdb6b943ba345c0e0975de10e68 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Fri, 9 Dec 2022 16:16:03 +0100 Subject: [PATCH 1621/3485] [Ubuntu] hardcode chromium revision for 108.x (#6734) --- images/linux/scripts/installers/google-chrome.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/images/linux/scripts/installers/google-chrome.sh b/images/linux/scripts/installers/google-chrome.sh index 5a6ca806b070..cc33261f5709 100644 --- a/images/linux/scripts/installers/google-chrome.sh +++ b/images/linux/scripts/installers/google-chrome.sh @@ -14,6 +14,13 @@ function GetChromiumRevision { URL="https://omahaproxy.appspot.com/deps.json?version=${CHROME_VERSION}" REVISION=$(curl -s $URL | jq -r '.chromium_base_position') + # both 108.0.5359.98 and 108.0.5359.94 return old incorrect revision + # nothing to compare with, hardcode temporarily. + # see https://github.com/actions/runner-images/issues/6723 + if [ $REVISION -eq "1016" ]; then + REVISION="1054926" + fi + # Some Google Chrome versions are based on Chromium revisions for which a (usually very old) Chromium release with the same number exist. So far this has heppened with 4 digits long Chromium revisions (1060, 1086). # Use the previous Chromium release when this happens to avoid downloading and installing very old Chromium releases that would break image build because of incompatibilities. # First reported with: https://github.com/actions/runner-images/issues/5256 From 383e49921c1183efc35022d5931237ccab840042 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 9 Dec 2022 16:45:44 +0100 Subject: [PATCH 1622/3485] Updating readme file for win22 version 20221204.3 (#6695) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2022-Readme.md | 42 ++++++++++++++++---------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/images/win/Windows2022-Readme.md b/images/win/Windows2022-Readme.md index c3f9e6a284a9..eafc18cc4bfb 100644 --- a/images/win/Windows2022-Readme.md +++ b/images/win/Windows2022-Readme.md @@ -1,6 +1,6 @@ # Microsoft Windows Server 2022 Datacenter - OS Version: 10.0.20348 Build 1249 -- Image Version: 20221127.1 +- Image Version: 20221204.3 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -10,7 +10,7 @@ - Bash 5.1.16(1)-release - Go 1.17.13 - Julia 1.8.3 -- Kotlin 1.7.21 +- Kotlin 1.7.22 - LLVM 14.0.6 - Node 16.18.1 - Perl 5.32.1 @@ -28,7 +28,7 @@ - pip 22.3.1 (python 3.9) - Pipx 1.1.0 - RubyGems 3.2.33 -- Vcpkg (build from master \<62d01b70d>) +- Vcpkg (build from master \<163fe7bd3>) - Yarn 1.22.19 #### Environment variables @@ -50,11 +50,11 @@ - Bazelisk 1.13.2 - Bicep 0.12.40 - Cabal 3.8.1.0 -- CMake 3.25.0 +- CMake 3.25.1 - CodeQL Action Bundle 2.11.4 - Docker 20.10.21 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.13.0 +- Docker Compose v2 2.14.0 - Docker-wincred 0.7.0 - ghc 9.4.2 - Git 2.38.1.windows.1 @@ -83,9 +83,9 @@ - zstd 1.5.2 ### CLI Tools -- Alibaba Cloud CLI 3.0.139 -- AWS CLI 2.9.1 -- AWS SAM CLI 1.65.0 +- Alibaba Cloud CLI 3.0.140 +- AWS CLI 2.9.4 +- AWS SAM CLI 1.66.0 - AWS Session Manager CLI 1.2.398.0 - Azure CLI 2.42.0 - Azure DevOps CLI extension 0.25.0 @@ -107,14 +107,14 @@ - Rustfmt 1.5.1 ### Browsers and webdrivers -- Google Chrome 107.0.5304.122 -- Chrome Driver 107.0.5304.62 -- Microsoft Edge 107.0.1418.56 -- Microsoft Edge Driver 107.0.1418.56 -- Mozilla Firefox 107.0 +- Google Chrome 108.0.5359.95 +- Chrome Driver 108.0.5359.71 +- Microsoft Edge 107.0.1418.62 +- Microsoft Edge Driver 107.0.1418.62 +- Mozilla Firefox 107.0.1 - Gecko Driver 0.32.0 -- IE Driver 3.150.1.1 -- Selenium server 4.6.0 +- IE Driver 4.7.0.0 +- Selenium server 4.7.0 #### Environment variables | Name | Value | @@ -221,7 +221,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Visual Studio Enterprise 2022 | Name | Version | Path | | ----------------------------- | -------------- | -------------------------------------------------------- | -| Visual Studio Enterprise 2022 | 17.4.33110.190 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | +| Visual Studio Enterprise 2022 | 17.4.33122.133 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | #### Workloads, components and extensions: | Package | Version | @@ -229,7 +229,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | android | 33.0.4.0 | | Component.Android.Emulator.MDD | 17.4.33006.217 | | Component.Android.NDK.R23C | 17.4.33006.217 | -| Component.Android.SDK.MAUI | 17.4.33006.217 | +| Component.Android.SDK.MAUI | 17.4.33118.351 | | Component.CPython39.x64 | 3.9.7 | | Component.Dotfuscator | 17.4.33006.217 | | Component.HAXM.Private | 17.4.33006.217 | @@ -330,7 +330,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Component.Graphics | 17.4.33006.217 | | Microsoft.VisualStudio.Component.Graphics.Tools | 17.4.33006.217 | | Microsoft.VisualStudio.Component.IISExpress | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.IntelliCode | 17.4.33027.239 | +| Microsoft.VisualStudio.Component.IntelliCode | 17.4.33121.453 | | Microsoft.VisualStudio.Component.IntelliTrace.FrontEnd | 17.4.33006.217 | | Microsoft.VisualStudio.Component.JavaScript.Diagnostics | 17.4.33006.217 | | Microsoft.VisualStudio.Component.JavaScript.TypeScript | 17.4.33006.217 | @@ -559,7 +559,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Azure Powershell Modules | Module | Version | Path | | ------- | ------------------------------------------------------------------------------- | ------------------------------ | -| Az | 6.6.0.zip<br>7.5.0 | C:\Modules\az_\<version\> | +| Az | 7.5.0.zip<br>9.0.1 | C:\Modules\az_\<version\> | | Azure | 2.1.0 [Installed]<br>3.8.0.zip<br>4.2.1.zip<br>5.1.1.zip<br>5.3.0 | C:\Modules\azure_\<version\> | | AzureRM | 2.1.0 [Installed]<br>3.8.0.zip<br>4.2.1.zip<br>5.1.1.zip<br>6.7.0.zip<br>6.13.1 | C:\Modules\azurerm_\<version\> | ``` @@ -571,10 +571,10 @@ All other versions are saved but not installed. #### Powershell Modules | Module | Version | | ------------------ | ---------------- | -| AWSPowerShell | 4.1.214 | +| AWSPowerShell | 4.1.220 | | DockerMsftProvider | 1.0.0.8 | | MarkdownPS | 1.9 | -| Microsoft.Graph | 1.17.0 | +| Microsoft.Graph | 1.18.0 | | Pester | 3.4.0<br>5.3.3 | | PowerShellGet | 1.0.0.1<br>2.2.5 | | PSScriptAnalyzer | 1.21.0 | From 81ceb534f3ddb4f6999bd1809a3bb0c15d2a905a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 9 Dec 2022 16:46:18 +0100 Subject: [PATCH 1623/3485] Updating readme file for win19 version 20221204.2 (#6694) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2019-Readme.md | 44 ++++++++++++++++---------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index d33ff1eb8938..dc0d0f1121bd 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -1,6 +1,6 @@ # Microsoft Windows Server 2019 Datacenter - OS Version: 10.0.17763 Build 3650 -- Image Version: 20221127.1 +- Image Version: 20221204.2 ## Enabled windows optional features - Windows Subsystem for Linux [WSLv1] @@ -10,7 +10,7 @@ - Bash 5.1.16(1)-release - Go 1.17.13 - Julia 1.8.3 -- Kotlin 1.7.21 +- Kotlin 1.7.22 - LLVM 14.0.6 - Node 16.18.1 - Perl 5.32.1 @@ -28,7 +28,7 @@ - pip 22.3.1 (python 3.7) - Pipx 1.1.0 - RubyGems 2.7.6.3 -- Vcpkg (build from master \<62d01b70d>) +- Vcpkg (build from master \<163fe7bd3>) - Yarn 1.22.19 #### Environment variables @@ -51,11 +51,11 @@ - Bazelisk 1.13.2 - Bicep 0.12.40 - Cabal 3.8.1.0 -- CMake 3.25.0 +- CMake 3.25.1 - CodeQL Action Bundle 2.11.4 - Docker 20.10.21 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.13.0 +- Docker Compose v2 2.14.0 - Docker-wincred 0.7.0 - ghc 9.4.2 - Git 2.38.1.windows.1 @@ -86,9 +86,9 @@ - zstd 1.5.2 ### CLI Tools -- Alibaba Cloud CLI 3.0.139 -- AWS CLI 2.9.1 -- AWS SAM CLI 1.65.0 +- Alibaba Cloud CLI 3.0.140 +- AWS CLI 2.9.4 +- AWS SAM CLI 1.66.0 - AWS Session Manager CLI 1.2.398.0 - Azure CLI 2.42.0 - Azure DevOps CLI extension 0.25.0 @@ -111,14 +111,14 @@ - Rustfmt 1.5.1 ### Browsers and webdrivers -- Google Chrome 107.0.5304.122 -- Chrome Driver 107.0.5304.62 -- Microsoft Edge 107.0.1418.56 -- Microsoft Edge Driver 107.0.1418.56 -- Mozilla Firefox 107.0 +- Google Chrome 108.0.5359.95 +- Chrome Driver 108.0.5359.71 +- Microsoft Edge 107.0.1418.62 +- Microsoft Edge Driver 107.0.1418.62 +- Mozilla Firefox 107.0.1 - Gecko Driver 0.32.0 -- IE Driver 3.150.1.1 -- Selenium server 4.6.0 +- IE Driver 4.7.0.0 +- Selenium server 4.7.0 #### Environment variables | Name | Value | @@ -530,11 +530,11 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - PowerShell 7.2.7 #### Azure Powershell Modules -| Module | Version | Path | -| ------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ------------------------------ | -| Az | 1.0.0.zip<br>1.6.0.zip<br>2.3.2.zip<br>2.6.0.zip<br>3.1.0.zip<br>3.5.0.zip<br>3.8.0.zip<br>4.3.0.zip<br>4.4.0.zip<br>4.7.0.zip<br>5.5.0.zip<br>5.9.0.zip<br>6.6.0.zip<br>7.5.0 | C:\Modules\az_\<version\> | -| Azure | 2.1.0 [Installed]<br>3.8.0.zip<br>4.2.1.zip<br>5.1.1.zip<br>5.3.0 | C:\Modules\azure_\<version\> | -| AzureRM | 2.1.0 [Installed]<br>3.8.0.zip<br>4.2.1.zip<br>5.1.1.zip<br>6.7.0.zip<br>6.13.1 | C:\Modules\azurerm_\<version\> | +| Module | Version | Path | +| ------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------ | +| Az | 1.0.0.zip<br>1.6.0.zip<br>2.3.2.zip<br>2.6.0.zip<br>3.1.0.zip<br>3.5.0.zip<br>3.8.0.zip<br>4.3.0.zip<br>4.4.0.zip<br>4.7.0.zip<br>5.5.0.zip<br>5.9.0.zip<br>6.6.0.zip<br>7.5.0.zip<br>9.0.1 | C:\Modules\az_\<version\> | +| Azure | 2.1.0 [Installed]<br>3.8.0.zip<br>4.2.1.zip<br>5.1.1.zip<br>5.3.0 | C:\Modules\azure_\<version\> | +| AzureRM | 2.1.0 [Installed]<br>3.8.0.zip<br>4.2.1.zip<br>5.1.1.zip<br>6.7.0.zip<br>6.13.1 | C:\Modules\azurerm_\<version\> | ``` Azure PowerShell module 2.1.0 and AzureRM PowerShell module 2.1.0 are installed and are available via 'Get-Module -ListAvailable'. @@ -544,10 +544,10 @@ All other versions are saved but not installed. #### Powershell Modules | Module | Version | | ------------------ | ---------------- | -| AWSPowerShell | 4.1.214 | +| AWSPowerShell | 4.1.220 | | DockerMsftProvider | 1.0.0.8 | | MarkdownPS | 1.9 | -| Microsoft.Graph | 1.17.0 | +| Microsoft.Graph | 1.18.0 | | Pester | 3.4.0<br>5.3.3 | | PowerShellGet | 1.0.0.1<br>2.2.5 | | PSScriptAnalyzer | 1.21.0 | From 9585a65341d5536554bff4941f2bc60faf331a49 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 9 Dec 2022 16:47:28 +0100 Subject: [PATCH 1624/3485] Updating readme file for ubuntu22 version 20221204.2 (#6693) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2204-Readme.md | 52 +++++++++++++++---------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/images/linux/Ubuntu2204-Readme.md b/images/linux/Ubuntu2204-Readme.md index f34a3a05121e..2f81a8dec087 100644 --- a/images/linux/Ubuntu2204-Readme.md +++ b/images/linux/Ubuntu2204-Readme.md @@ -4,8 +4,8 @@ | [The Ubuntu 18.04 Actions runner image will begin deprecation on 2022/08/08 and will be fully unsupported by 2023/04/01](https://github.com/actions/runner-images/issues/6002) | *** # Ubuntu 22.04.1 LTS -- Linux kernel version: 5.15.0-1023-azure -- Image Version: 20221127.1 +- Linux kernel version: 5.15.0-1024-azure +- Image Version: 20221204.2 ## Installed Software ### Language and Runtime @@ -17,7 +17,7 @@ - GNU C++ 9.5.0, 10.4.0, 11.3.0, 12.1.0 - GNU Fortran 9.5.0, 10.4.0, 11.3.0 - Julia 1.8.3 -- Kotlin 1.7.21-release-272 +- Kotlin 1.7.22-release-288 - Mono 6.12.0.182 (apt source repository: https://download.mono-project.com/repo/ubuntu stable-focal main) - MSBuild 16.10.1.31701 (from /usr/lib/mono/msbuild/15.0/bin/MSBuild.dll) - Node 16.18.1 @@ -30,7 +30,7 @@ ### Package Management - cpan 1.64 - Helm 3.10.2 -- Homebrew 3.6.12 +- Homebrew 3.6.13 - Miniconda 4.12.0 - Npm 8.19.2 - NuGet 6.3.1.1 @@ -38,7 +38,7 @@ - Pip3 22.0.2 - Pipx 1.1.0 - RubyGems 3.3.5 -- Vcpkg (build from master \<62d01b70d>) +- Vcpkg (build from master \<163fe7bd3>) - Yarn 1.22.19 ##### Notes: @@ -56,7 +56,7 @@ to accomplish this. | VCPKG_INSTALLATION_ROOT | /usr/local/share/vcpkg | ### Project Management -- Lerna 6.0.3 +- Lerna 6.1.0 ### Tools - Ansible 2.14.0 @@ -66,7 +66,7 @@ to accomplish this. - Bazelisk 1.13.2 - Bicep 0.12.40 - Buildah 1.23.1 -- CMake 3.25.0 +- CMake 3.25.1 - CodeQL Action Bundle 2.11.4 - Docker Amazon ECR Credential Helper 0.6.0 - Docker Compose v1 1.29.2 @@ -76,10 +76,10 @@ to accomplish this. - Docker-Moby Server 20.10.21+azure-1 - Fastlane 2.211.0 - Git 2.38.1 (apt source repository: ppa:git-core/ppa) -- Git LFS 3.2.0 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) +- Git LFS 3.3.0 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.6.0 - Haveged 1.9.14 -- Heroku 7.66.4 +- Heroku 7.67.1 - jq 1.6 - Kind 0.17.0 - Kubectl 1.25.4 @@ -100,25 +100,25 @@ to accomplish this. - Skopeo 1.4.1 - Sphinx Open Source Search Server 2.2.11 - SVN 1.14.1 -- Terraform 1.3.5 +- Terraform 1.3.6 - yamllint 1.28.0 - yq v4.30.5 - zstd 1.5.2 (homebrew) ### CLI Tools -- Alibaba Cloud CLI 3.0.139 -- AWS CLI 2.9.1 +- Alibaba Cloud CLI 3.0.140 +- AWS CLI 2.9.4 - AWS CLI Session manager plugin 1.2.398.0 -- AWS SAM CLI 1.65.0 +- AWS SAM CLI 1.66.0 - Azure CLI (azure-cli) 2.42.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.25.0 - GitHub CLI 2.20.2 - Google Cloud SDK 410.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 12.2.7 -- OpenShift CLI 4.11.16 +- Netlify CLI 12.2.8 +- OpenShift CLI 4.11.17 - ORAS CLI 0.16.0 -- Vercel CLI 28.5.6 +- Vercel CLI 28.7.2 ### Java | Version | Vendor | Environment Variable | @@ -162,13 +162,13 @@ to accomplish this. - Rustfmt 1.5.1 ### Browsers and Drivers -- Google Chrome 107.0.5304.121 -- ChromeDriver 107.0.5304.62 -- Chromium 107.0.5288.0 -- Microsoft Edge 107.0.1418.56 (apt source repository: https://packages.microsoft.com/repos/edge) -- Microsoft Edge WebDriver 107.0.1418.56 -- Selenium server 4.6.0 -- Mozilla Firefox 107.0 (apt source repository: ppa:mozillateam/ppa) +- Google Chrome 108.0.5359.94 +- ChromeDriver 108.0.5359.71 +- Chromium 108.0.5341.0 +- Microsoft Edge 107.0.1418.62 (apt source repository: https://packages.microsoft.com/repos/edge) +- Microsoft Edge WebDriver 107.0.1418.62 +- Selenium server 4.7.0 +- Mozilla Firefox 107.0.1 (apt source repository: ppa:mozillateam/ppa) - Geckodriver 0.32.0 #### Environment variables @@ -224,7 +224,7 @@ to accomplish this. #### Python - 3.7.15 -- 3.8.14 +- 3.8.15 - 3.9.15 - 3.10.8 - 3.11.0 @@ -246,12 +246,12 @@ to accomplish this. | Module | Version | | ---------------- | ------- | | MarkdownPS | 1.9 | -| Microsoft.Graph | 1.17.0 | +| Microsoft.Graph | 1.18.0 | | Pester | 5.3.3 | | PSScriptAnalyzer | 1.21.0 | #### Az PowerShell Modules -- 7.5.0 +- 9.0.1 ### Web Servers | Name | Version | ConfigFile | ServiceStatus | ListenPort | From 49c7baaa44d191237004371089c959e6f4e0aeea Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 9 Dec 2022 16:47:50 +0100 Subject: [PATCH 1625/3485] Updating readme file for ubuntu20 version 20221204.2 (#6692) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2004-Readme.md | 56 +++++++++++++++---------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/images/linux/Ubuntu2004-Readme.md b/images/linux/Ubuntu2004-Readme.md index 7cb18dc2a994..6e9e0716bd21 100644 --- a/images/linux/Ubuntu2004-Readme.md +++ b/images/linux/Ubuntu2004-Readme.md @@ -5,7 +5,7 @@ *** # Ubuntu 20.04.5 LTS - Linux kernel version: 5.15.0-1023-azure -- Image Version: 20221125.1 +- Image Version: 20221204.2 ## Installed Software ### Language and Runtime @@ -19,7 +19,7 @@ - GNU C++ 9.4.0, 10.3.0 - GNU Fortran 9.4.0, 10.3.0 - Julia 1.8.3 -- Kotlin 1.7.21-release-272 +- Kotlin 1.7.22-release-288 - Mono 6.12.0.182 (apt source repository: https://download.mono-project.com/repo/ubuntu stable-focal main) - MSBuild 16.10.1.31701 (from /usr/lib/mono/msbuild/15.0/bin/MSBuild.dll) - Node 16.18.1 @@ -32,7 +32,7 @@ ### Package Management - cpan 1.64 - Helm 3.10.2 -- Homebrew 3.6.12 +- Homebrew 3.6.13 - Miniconda 4.12.0 - Npm 8.19.2 - NuGet 6.3.1.1 @@ -40,7 +40,7 @@ - Pip3 20.0.2 - Pipx 1.1.0 - RubyGems 3.1.2 -- Vcpkg (build from master \<62d01b70d>) +- Vcpkg (build from master \<163fe7bd3>) - Yarn 1.22.19 ##### Notes: @@ -60,7 +60,7 @@ to accomplish this. ### Project Management - Ant 1.10.7 - Gradle 7.6 -- Lerna 6.0.3 +- Lerna 6.1.0 - Maven 3.8.6 - Sbt 1.8.0 @@ -72,7 +72,7 @@ to accomplish this. - Bazelisk 1.13.2 - Bicep 0.12.40 - Buildah 1.22.3 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- CMake 3.25.0 +- CMake 3.25.1 - CodeQL Action Bundle 2.11.4 - Docker Amazon ECR Credential Helper 0.6.0 - Docker Compose v1 1.29.2 @@ -82,10 +82,10 @@ to accomplish this. - Docker-Moby Server 20.10.21+azure-1 - Fastlane 2.211.0 - Git 2.38.1 (apt source repository: ppa:git-core/ppa) -- Git LFS 3.2.0 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) +- Git LFS 3.3.0 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.6.0 - Haveged 1.9.1 -- Heroku 7.66.4 +- Heroku 7.67.1 - HHVM (HipHop VM) 4.172.0 - jq 1.6 - Kind 0.17.0 @@ -108,25 +108,25 @@ to accomplish this. - Skopeo 1.5.0 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 -- Terraform 1.3.5 +- Terraform 1.3.6 - yamllint 1.28.0 -- yq v4.30.4 +- yq v4.30.5 - zstd 1.5.2 (homebrew) ### CLI Tools -- Alibaba Cloud CLI 3.0.138 -- AWS CLI 2.9.1 +- Alibaba Cloud CLI 3.0.140 +- AWS CLI 2.9.4 - AWS CLI Session manager plugin 1.2.398.0 -- AWS SAM CLI 1.65.0 +- AWS SAM CLI 1.66.0 - Azure CLI (azure-cli) 2.42.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.25.0 - GitHub CLI 2.20.2 - Google Cloud SDK 410.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 12.2.7 -- OpenShift CLI 4.11.16 +- Netlify CLI 12.2.8 +- OpenShift CLI 4.11.17 - ORAS CLI 0.16.0 -- Vercel CLI 28.5.6 +- Vercel CLI 28.7.2 ### Java | Version | Vendor | Environment Variable | @@ -143,7 +143,7 @@ to accomplish this. ### PHP | Tool | Version | | -------- | -------------------- | -| PHP | 7.4.33 8.0.25 8.1.12 | +| PHP | 7.4.33 8.0.26 8.1.13 | | Composer | 2.4.4 | | PHPUnit | 8.5.31 | ``` @@ -170,13 +170,13 @@ to accomplish this. - Rustfmt 1.5.1 ### Browsers and Drivers -- Google Chrome 107.0.5304.121 -- ChromeDriver 107.0.5304.62 -- Chromium 107.0.5288.0 -- Microsoft Edge 107.0.1418.56 (apt source repository: https://packages.microsoft.com/repos/edge) -- Microsoft Edge WebDriver 107.0.1418.56 -- Selenium server 4.6.0 -- Mozilla Firefox 107.0 +- Google Chrome 108.0.5359.94 +- ChromeDriver 108.0.5359.71 +- Chromium 108.0.5341.0 +- Microsoft Edge 107.0.1418.62 (apt source repository: https://packages.microsoft.com/repos/edge) +- Microsoft Edge WebDriver 107.0.1418.62 +- Selenium server 4.7.0 +- Mozilla Firefox 107.0.1 (apt source repository: ppa:mozillateam/ppa) - Geckodriver 0.32.0 #### Environment variables @@ -205,7 +205,7 @@ to accomplish this. PostgreSQL service is disabled by default. Use the following command as a part of your job to start the service: 'sudo systemctl start postgresql.service' ``` #### MySQL -- MySQL 8.0.31-0ubuntu0.20.04.1 +- MySQL 8.0.31-0ubuntu0.20.04.2 - MySQL Server (user:root password:root) ``` @@ -237,7 +237,7 @@ to accomplish this. - 2.7.18 - 3.6.15 - 3.7.15 -- 3.8.14 +- 3.8.15 - 3.9.15 - 3.10.8 - 3.11.0 @@ -263,12 +263,12 @@ to accomplish this. | Module | Version | | ---------------- | ------- | | MarkdownPS | 1.9 | -| Microsoft.Graph | 1.17.0 | +| Microsoft.Graph | 1.18.0 | | Pester | 5.3.3 | | PSScriptAnalyzer | 1.21.0 | #### Az PowerShell Modules -- 7.5.0 3.1.0.zip 4.4.0.zip 5.9.0.zip 6.6.0.zip +- 9.0.1 3.1.0.zip 4.4.0.zip 5.9.0.zip 6.6.0.zip 7.5.0.zip ### Web Servers | Name | Version | ConfigFile | ServiceStatus | ListenPort | From 39c59ba0cde42e0b4ab2af50ddabc270794c96fd Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Sat, 10 Dec 2022 23:17:23 +0100 Subject: [PATCH 1626/3485] [Ubuntu] Add lz4 for 22.04 (#6722) --- images/linux/toolsets/toolset-2204.json | 1 + 1 file changed, 1 insertion(+) diff --git a/images/linux/toolsets/toolset-2204.json b/images/linux/toolsets/toolset-2204.json index 2128f62e8a93..d60e4fdc77ea 100644 --- a/images/linux/toolsets/toolset-2204.json +++ b/images/linux/toolsets/toolset-2204.json @@ -178,6 +178,7 @@ "ftp", "haveged", "jq", + "lz4", "m4", "mediainfo", "netcat", From e54741d1f968cfa3889d9fa21ee01f82b0319d74 Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Sat, 10 Dec 2022 23:18:38 +0100 Subject: [PATCH 1627/3485] [Ubuntu] Add GFortran 12 for Ubuntu 22.04 (#6736) --- images/linux/toolsets/toolset-2204.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/images/linux/toolsets/toolset-2204.json b/images/linux/toolsets/toolset-2204.json index d60e4fdc77ea..9a9740cfe2e0 100644 --- a/images/linux/toolsets/toolset-2204.json +++ b/images/linux/toolsets/toolset-2204.json @@ -272,7 +272,8 @@ "gfortran": { "versions": [ "gfortran-9", - "gfortran-10" + "gfortran-10", + "gfortran-12" ] }, "php": { From 686220b3aec31b7fadbe93491c0f9ec540124279 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Sun, 11 Dec 2022 14:56:40 +0100 Subject: [PATCH 1628/3485] [Ubuntu] Add libyaml-dev library (#6740) --- images/linux/toolsets/toolset-1804.json | 1 + images/linux/toolsets/toolset-2004.json | 1 + images/linux/toolsets/toolset-2204.json | 1 + 3 files changed, 3 insertions(+) diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index 74069f16a2e3..91bc00d9aef5 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -160,6 +160,7 @@ "libmagickwand-dev", "libsecret-1-dev", "libsqlite3-dev", + "libyaml-dev", "libtool", "libunwind8", "libxkbfile-dev", diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index 3e92d8d16b75..1fb6cdf86dcb 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -159,6 +159,7 @@ "libmagickwand-dev", "libsecret-1-dev", "libsqlite3-dev", + "libyaml-dev", "libtool", "libunwind8", "libxkbfile-dev", diff --git a/images/linux/toolsets/toolset-2204.json b/images/linux/toolsets/toolset-2204.json index 9a9740cfe2e0..b3359d52f0f9 100644 --- a/images/linux/toolsets/toolset-2204.json +++ b/images/linux/toolsets/toolset-2204.json @@ -142,6 +142,7 @@ "libmagickwand-dev", "libsecret-1-dev", "libsqlite3-dev", + "libyaml-dev", "libtool", "libunwind8", "libxkbfile-dev", From 9e9f7c0b44f3a58e7b2b25f1d7fc4e2db9ced012 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Sun, 11 Dec 2022 15:53:51 +0100 Subject: [PATCH 1629/3485] [macOS] Update PHP to 8.2 (#6739) --- images/macos/toolsets/toolset-10.15.json | 2 +- images/macos/toolsets/toolset-11.json | 2 +- images/macos/toolsets/toolset-12.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index 9fc65dcc7b22..3e1cfca2f310 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -345,7 +345,7 @@ "version": "14" }, "php": { - "version": "8.1" + "version": "8.2" }, "mongodb": { "version": "5.0" diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index bdd6d8e294f5..efb3501d5a87 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -341,7 +341,7 @@ "version": "14" }, "php": { - "version": "8.1" + "version": "8.2" }, "mongodb": { "version": "5.0" diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index 63fa733f09ea..ebe9f1ffc57e 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -303,7 +303,7 @@ "version": "14" }, "php": { - "version": "8.1" + "version": "8.2" }, "mongodb": { "version": "5.0" From 0810b548379aa0d2c5d4d507adb35b2c8411496d Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Mon, 12 Dec 2022 10:48:30 +0100 Subject: [PATCH 1630/3485] Update SBOM-workflow with new variable agentSpec (#6742) --- .github/workflows/create_sbom_report.yml | 48 ++++++------------------ 1 file changed, 11 insertions(+), 37 deletions(-) diff --git a/.github/workflows/create_sbom_report.yml b/.github/workflows/create_sbom_report.yml index 7bb644857f52..90836ec89ded 100644 --- a/.github/workflows/create_sbom_report.yml +++ b/.github/workflows/create_sbom_report.yml @@ -1,7 +1,7 @@ name: Create and upload a SBOM to release assets # Inherited variables: -# github.event.client_payload.imageLabel - AzDO image label -# github.event.client_payload.GHreleaseID - Current release ID +# github.event.client_payload.agentSpec - Current YAML Label +# github.event.client_payload.ReleaseID - Current release ID # github.event.client_payload.imageVersion - AzDO image version "major.minor" # github.event.client_payload.ReleaseBranchName - Necessary to identify workflow run # @@ -15,45 +15,19 @@ defaults: run: shell: pwsh jobs: - #Converting image OS variable for the next steps - initialize: - runs-on: ubuntu-latest - outputs: - agent-spec: ${{ steps.converter.outputs.current-os }} - steps: - - name: Convert image label variable for ${{ github.event.client_payload.ReleaseBranchName }} - id: converter - run: | - $imageLabel = "${{ github.event.client_payload.imageLabel }}" - $currentOS = switch ($imageLabel) { - 'ubuntu22' { "ubuntu-22.04" } - 'ubuntu20' { "ubuntu-20.04" } - 'ubuntu18' { "ubuntu-18.04" } - 'win22' { "windows-2022" } - 'win19' { "windows-2019" } - 'macOS-12' { "macos-12" } - 'macOS-11' { "macos-11" } - default { - echo "currentOS variable is undefined. Please check imageLabel." - exit 1 - } - } - "current-os=$currentOS" | Out-File -FilePath $env:GITHUB_OUTPUT -Append #Checking image version on available runner version-check: - needs: initialize - runs-on: ${{ needs.initialize.output.agent-spec }} + runs-on: ${{ github.event.client_payload.agentSpec }} steps: - name: Available image version check run: | if ($env:ImageVersion -ne '${{ github.event.client_payload.imageVersion }}') { - echo "Error. Current runner $env:ImageVersion image version don't match ${{ github.event.client_payload.imageVersion }}." - exit 1 + throw "Current runner $env:ImageVersion image version don't match ${{ github.event.client_payload.imageVersion }}." } #Install and run SYFT, compress SBOM, upload it to release assets create-sbom: - needs: [initialize, version-check] - runs-on: ${{ needs.initialize.output.agent-spec }} + needs: version-check + runs-on: ${{ github.event.client_payload.agentSpec }} steps: #Installation section - name: Install SYFT tool on Windows @@ -72,9 +46,9 @@ jobs: - name: Run SYFT on macOS if: ${{ runner.os == 'macOS' }} run: syft dir:/ -vv -o spdx-json=sbom.json --exclude ./Users --exclude ./System/Volumes --exclude ./private - #Preparing artifact (raw SBOM.x.json is too big) + #Preparing artifact (raw SBOM.json is too big) - name: Compress SBOM file - run: Compress-Archive sbom.json sbom.${{ github.event.client_payload.imageLabel }}.json.zip + run: Compress-Archive sbom.json sbom.json.zip #Upload release asset action #Might be changed to softprops/action-gh-release after additional check - name: Upload release asset @@ -82,7 +56,7 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: - upload_url: "https://uploads.github.com/repos/actions/runner-images/releases/${{ github.event.client_payload.GHreleaseID }}/assets{?name,label}" - asset_path: ./sbom.${{ github.event.client_payload.imageLabel }}.json.zip - asset_name: sbom.${{ github.event.client_payload.imageLabel }}.json.zip + upload_url: "https://uploads.github.com/repos/actions/runner-images/releases/${{ github.event.client_payload.ReleaseID }}/assets{?name,label}" + asset_path: ./sbom.json.zip + asset_name: sbom.${{ github.event.client_payload.agentSpec }}.json.zip asset_content_type: application/zip \ No newline at end of file From 02c31c92467a952e68c309ee18a931be15303c31 Mon Sep 17 00:00:00 2001 From: Shivam Mathur <shivam_jpr@hotmail.com> Date: Mon, 12 Dec 2022 15:46:35 +0530 Subject: [PATCH 1631/3485] [Ubuntu] add php 8.2 (#6745) --- images/linux/scripts/installers/php.sh | 2 +- images/linux/toolsets/toolset-1804.json | 3 ++- images/linux/toolsets/toolset-2004.json | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/images/linux/scripts/installers/php.sh b/images/linux/scripts/installers/php.sh index 04d5f165ce00..3eb20f7cd236 100644 --- a/images/linux/scripts/installers/php.sh +++ b/images/linux/scripts/installers/php.sh @@ -77,7 +77,7 @@ for version in $php_versions; do apt-get install -y --no-install-recommends php$version-recode fi - if [[ $version != "8.0" && $version != "8.1" ]]; then + if [[ $version != "8.0" && $version != "8.1" && $version != "8.2" ]]; then apt-get install -y --no-install-recommends php$version-xmlrpc php$version-json fi done diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index 91bc00d9aef5..9fae07e19338 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -302,7 +302,8 @@ "7.3", "7.4", "8.0", - "8.1" + "8.1", + "8.2" ] }, "selenium": { diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index 1fb6cdf86dcb..a76b10e1d4b6 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -304,7 +304,8 @@ "versions": [ "7.4", "8.0", - "8.1" + "8.1", + "8.2" ] }, "rubygems": [ From 43d8adc71754b2e0a2174ba74de95a42a150a17f Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Mon, 12 Dec 2022 12:40:55 +0100 Subject: [PATCH 1632/3485] Do not include macOS-10.15 into templates (#6748) --- .github/ISSUE_TEMPLATE/announcement.yml | 1 - .github/ISSUE_TEMPLATE/bug-report.yml | 1 - .github/ISSUE_TEMPLATE/tool-request.yml | 1 - .github/pull_request_template.md | 4 ++-- 4 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/announcement.yml b/.github/ISSUE_TEMPLATE/announcement.yml index 00ea1e712dd9..59b3bba81069 100644 --- a/.github/ISSUE_TEMPLATE/announcement.yml +++ b/.github/ISSUE_TEMPLATE/announcement.yml @@ -39,7 +39,6 @@ body: - label: Ubuntu 18.04 - label: Ubuntu 20.04 - label: Ubuntu 22.04 - - label: macOS 10.15 - label: macOS 11 - label: macOS 12 - label: Windows Server 2019 diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml index cdda5b2c71db..158421a7b097 100644 --- a/.github/ISSUE_TEMPLATE/bug-report.yml +++ b/.github/ISSUE_TEMPLATE/bug-report.yml @@ -22,7 +22,6 @@ body: - label: Ubuntu 18.04 - label: Ubuntu 20.04 - label: Ubuntu 22.04 - - label: macOS 10.15 - label: macOS 11 - label: macOS 12 - label: Windows Server 2019 diff --git a/.github/ISSUE_TEMPLATE/tool-request.yml b/.github/ISSUE_TEMPLATE/tool-request.yml index b0a4ff140841..cf8c29ab1339 100644 --- a/.github/ISSUE_TEMPLATE/tool-request.yml +++ b/.github/ISSUE_TEMPLATE/tool-request.yml @@ -60,7 +60,6 @@ body: - label: Ubuntu 18.04 - label: Ubuntu 20.04 - label: Ubuntu 22.04 - - label: macOS 10.15 - label: macOS 11 - label: macOS 12 - label: Windows Server 2019 diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index d815d34fdb2a..ea57d45f5490 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -1,6 +1,6 @@ # Description -New tool, Bug fixing, or Improvement? -Please include a summary of the change and which issue is fixed. Also include relevant motivation and context. +New tool, Bug fixing, or Improvement? +Please include a summary of the change and which issue is fixed. Also include relevant motivation and context. **For new tools, please provide total size and installation time.** <!-- Currently, we can't accept external contributions to macOS source. Please find more details in [CONTRIBUTING.md](CONTRIBUTING.md#macOS) guide --> From 107a83d63433afaa243f691a4659b1b2aeca35a6 Mon Sep 17 00:00:00 2001 From: Shivam Mathur <shivam_jpr@hotmail.com> Date: Mon, 12 Dec 2022 17:50:12 +0530 Subject: [PATCH 1633/3485] [Windows] upgrade php version to 8.2 (#6744) --- images/win/toolsets/toolset-2019.json | 2 +- images/win/toolsets/toolset-2022.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index 96a0be95b8a5..ca683ba2bd11 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -482,7 +482,7 @@ "version": "3.08" }, "php": { - "version": "8.1" + "version": "8.2" }, "llvm": { "version": "14" diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index f8746410c136..a458b430214d 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -394,7 +394,7 @@ "version": "14" }, "php": { - "version": "8.1" + "version": "8.2" }, "postgresql": { "version": "14" From 656d9522e0d2abf699503dd38f4f9ee15561e084 Mon Sep 17 00:00:00 2001 From: bogdan-damian-bgd <108331162+bogdan-damian-bgd@users.noreply.github.com> Date: Mon, 12 Dec 2022 14:56:04 +0100 Subject: [PATCH 1634/3485] Move SoftwareReport modules to global location (#6720) --- .../software-report/SoftwareReport.Base.ps1 | 370 ------------------ .../SoftwareReport.Generator.ps1 | 4 +- images/macos/templates/macOS-10.15.json | 5 + images/macos/templates/macOS-11.anka.pkr.hcl | 4 + images/macos/templates/macOS-11.json | 5 + images/macos/templates/macOS-12.anka.pkr.hcl | 4 + images/macos/templates/macOS-12.json | 5 + 7 files changed, 26 insertions(+), 371 deletions(-) delete mode 100644 images/macos/software-report/SoftwareReport.Base.ps1 diff --git a/images/macos/software-report/SoftwareReport.Base.ps1 b/images/macos/software-report/SoftwareReport.Base.ps1 deleted file mode 100644 index 35475ada93ae..000000000000 --- a/images/macos/software-report/SoftwareReport.Base.ps1 +++ /dev/null @@ -1,370 +0,0 @@ -class SoftwareReport { - [HeaderNode] $Root - - SoftwareReport([String] $Title) { - $this.Root = [HeaderNode]::new($Title) - } - - SoftwareReport([HeaderNode] $Root) { - $this.Root = $Root - } - - [String] ToJson() { - return $this.Root.ToJsonObject() | ConvertTo-Json -Depth 10 - } - - static [SoftwareReport] FromJson($jsonString) { - $jsonObj = $jsonString | ConvertFrom-Json - $rootNode = [SoftwareReport]::ParseNodeFromObject($jsonObj) - return [SoftwareReport]::new($rootNode) - } - - [String] ToMarkdown() { - return $this.Root.ToMarkdown(1).Trim() - } - - # This method is Nodes factory that simplifies parsing different types of notes - # Every node has own logic of parsing and this method just invokes "FromJsonObject" of correct node type - static [BaseNode] ParseNodeFromObject($jsonObj) { - if ($jsonObj.NodeType -eq [HeaderNode].Name) { - return [HeaderNode]::FromJsonObject($jsonObj) - } elseif ($jsonObj.NodeType -eq [ToolNode].Name) { - return [ToolNode]::FromJsonObject($jsonObj) - } elseif ($jsonObj.NodeType -eq [ToolVersionsNode].Name) { - return [ToolVersionsNode]::FromJsonObject($jsonObj) - } elseif ($jsonObj.NodeType -eq [TableNode].Name) { - return [TableNode]::FromJsonObject($jsonObj) - } elseif ($jsonObj.NodeType -eq [NoteNode].Name) { - return [NoteNode]::FromJsonObject($jsonObj) - } - - throw "Unknown node type in ParseNodeFromObject '$($jsonObj.NodeType)'" - } -} - -# class BaseNode doesn't really have any business logic or functionality -# We just create it to unite all types of Nodes and differ them from "object" type -class BaseNode {} - -# It is a node type to describe headers: "# Node.js" -# Header has Title and children nodes (HeaderNode is the single node type who has children) -class HeaderNode: BaseNode { - [String] $Title - [System.Collections.ArrayList] $Children - - HeaderNode([String] $Title) { - $this.Title = $Title - $this.Children = @() - } - - [void] AddNode([BaseNode] $node) { - if ($node.GetType() -eq [TableNode]) { - $existingTableNodesCount = $this.Children.Where({ $_.GetType() -eq [TableNode] }).Count - if ($existingTableNodesCount -gt 0) { - throw "Having multiple TableNode on the same header level is not supported" - } - } - - $this.Children.Add($node) - } - - [void] AddNodes([Array] $nodes) { - $nodes | ForEach-Object { $this.AddNode($_) } - } - - [HeaderNode] AddHeaderNode([String] $Title) { - $node = [HeaderNode]::new($Title) - $this.AddNode($node) - return $node - } - - [void] AddToolNode([String] $ToolName, [String] $Version) { - $this.AddNode([ToolNode]::new($ToolName, $Version)) - } - - [void] AddToolVersionsNode([String] $ToolName, [Array] $Version) { - $this.AddNode([ToolVersionsNode]::new($ToolName, $Version)) - } - - [void] AddTableNode([Array] $Table) { - $this.AddNode([TableNode]::FromObjectsArray($Table)) - } - - [void] AddNoteNode([String] $Content) { - $this.AddNode([NoteNode]::new($Content)) - } - - [String] ToMarkdown($level) { - $sb = [System.Text.StringBuilder]::new() - $sb.AppendLine() - $sb.AppendLine("$("#" * $level) $($this.Title)") - $this.Children | ForEach-Object { - $sb.AppendLine($_.ToMarkdown($level + 1)) - } - - return $sb.ToString().TrimEnd() - } - - [PSCustomObject] ToJsonObject() { - return [PSCustomObject]@{ - NodeType = $this.GetType().Name - Title = $this.Title - Children = $this.Children | ForEach-Object { $_.ToJsonObject() } - } - } - - static [HeaderNode] FromJsonObject($jsonObj) { - $node = [HeaderNode]::new($jsonObj.Title) - $jsonObj.Children | Where-Object { $_ } | ForEach-Object { $node.AddNode([SoftwareReport]::ParseNodeFromObject($_)) } - return $node - } - - [Boolean] IsSimilarTo([BaseNode] $OtherNode) { - if ($OtherNode.GetType() -ne [HeaderNode]) { - return $false - } - - return $this.Title -eq $OtherNode.Title - } - - [Boolean] IsIdenticalTo([BaseNode] $OtherNode) { - return $this.IsSimilarTo($OtherNode) - } -} - -# It is a node type to describe the single tool "Bash 5.1.16(1)-release" -class ToolNode: BaseNode { - [String] $ToolName - [String] $Version - - ToolNode([String] $ToolName, [String] $Version) { - $this.ToolName = $ToolName - $this.Version = $Version - } - - [String] ToMarkdown($level) { - return "- $($this.ToolName) $($this.Version)" - } - - [String] ToString() { - return "$($this.ToolName) $($this.Version)" - } - - [PSCustomObject] ToJsonObject() { - return [PSCustomObject]@{ - NodeType = $this.GetType().Name - ToolName = $this.ToolName - Version = $this.Version - } - } - - static [BaseNode] FromJsonObject($jsonObj) { - return [ToolNode]::new($jsonObj.ToolName, $jsonObj.Version) - } - - [Boolean] IsSimilarTo([BaseNode] $OtherNode) { - if ($OtherNode.GetType() -ne [ToolNode]) { - return $false - } - - # Don't compare by Version in SimilarTo method - # It is necessary to treat changing of tool version as "ChangedNodes" rather than "RemovedNodes" + "AddedNodes" - return $this.ToolName -eq $OtherNode.ToolName - } - - [Boolean] IsIdenticalTo([BaseNode] $OtherNode) { - return $this.IsSimilarTo($OtherNode) -and $this.Version -eq $OtherNode.Version - } -} - -# It is a node type to describe the single tool "Toolcache Node.js 14.17.6 16.2.0 18.2.3" -class ToolVersionsNode: BaseNode { - [String] $ToolName - [Array] $Versions - - ToolVersionsNode([String] $ToolName, [Array] $Versions) { - $this.ToolName = $ToolName - $this.Versions = $Versions - } - - [String] ToMarkdown($level) { - $sb = [System.Text.StringBuilder]::new() - $sb.AppendLine() - $sb.AppendLine("$("#" * $level) $($this.ToolName)") - $this.Versions | ForEach-Object { - $sb.AppendLine("- $_") - } - - return $sb.ToString().TrimEnd() - } - - [String] ToString() { - return "$($this.ToolName) $($this.Versions -join ', ')" - } - - [PSCustomObject] ToJsonObject() { - return [PSCustomObject]@{ - NodeType = $this.GetType().Name - ToolName = $this.ToolName - Versions = $this.Versions - } - } - - static [ToolVersionsNode] FromJsonObject($jsonObj) { - return [ToolVersionsNode]::new($jsonObj.ToolName, $jsonObj.Versions) - } - - [Boolean] IsSimilarTo([BaseNode] $OtherNode) { - if ($OtherNode.GetType() -ne [ToolVersionsNode]) { - return $false - } - - return $this.ToolName -eq $OtherNode.ToolName - } - - [Boolean] IsIdenticalTo([BaseNode] $OtherNode) { - if (-not $this.IsSimilarTo($OtherNode)) { - return $false - } - - return ($this.Versions -join " ") -eq ($OtherNode.Versions -join " ") - } -} - -# It is a node type to describe tables -class TableNode: BaseNode { - # It is easier to store the table as rendered lines because we will simplify finding differences in rows later - [String] $Headers - [System.Collections.ArrayList] $Rows - - TableNode($Headers, $Rows) { - $this.Headers = $Headers - $this.Rows = $Rows - } - - static [TableNode] FromObjectsArray([Array] $Table) { - # take column names from the first row in table because all rows that should have the same columns - [String] $tableHeaders = [TableNode]::ArrayToTableRow($Table[0].PSObject.Properties.Name) - [System.Collections.ArrayList] $tableRows = @() - - $Table | ForEach-Object { - $tableRows.Add([TableNode]::ArrayToTableRow($_.PSObject.Properties.Value)) - } - - return [TableNode]::new($tableHeaders, $tableRows) - } - - [String] ToMarkdown($level) { - $maxColumnWidths = $this.Headers.Split("|") | ForEach-Object { $_.Length } - $columnsCount = $maxColumnWidths.Count - - $this.Rows | ForEach-Object { - $columnWidths = $_.Split("|") | ForEach-Object { $_.Length } - for ($colIndex = 0; $colIndex -lt $columnsCount; $colIndex++) { - $maxColumnWidths[$colIndex] = [Math]::Max($maxColumnWidths[$colIndex], $columnWidths[$colIndex]) - } - } - - $delimeterLine = [String]::Join("|", @("-") * $columnsCount) - - $sb = [System.Text.StringBuilder]::new() - @($this.Headers) + @($delimeterLine) + $this.Rows | ForEach-Object { - $sb.Append("|") - $row = $_.Split("|") - for ($colIndex = 0; $colIndex -lt $columnsCount; $colIndex++) { - $padSymbol = $row[$colIndex] -eq "-" ? "-" : " " - $cellContent = $row[$colIndex].PadRight($maxColumnWidths[$colIndex], $padSymbol) - $sb.Append(" $($cellContent) |") - } - $sb.AppendLine() - } - - return $sb.ToString().TrimEnd() - } - - [PSCustomObject] ToJsonObject() { - return [PSCustomObject]@{ - NodeType = $this.GetType().Name - Headers = $this.Headers - Rows = $this.Rows - } - } - - static [TableNode] FromJsonObject($jsonObj) { - return [TableNode]::new($jsonObj.Headers, $jsonObj.Rows) - } - - [Boolean] IsSimilarTo([BaseNode] $OtherNode) { - if ($OtherNode.GetType() -ne [TableNode]) { - return $false - } - - # We don't support having multiple TableNode instances on the same header level so such check is fine - return $true - } - - [Boolean] IsIdenticalTo([BaseNode] $OtherNode) { - if (-not $this.IsSimilarTo($OtherNode)) { - return $false - } - - if ($this.Headers -ne $OtherNode.Headers) { - return $false - } - - if ($this.Rows.Count -ne $OtherNode.Rows.Count) { - return $false - } - - for ($rowIndex = 0; $rowIndex -lt $this.Rows.Count; $rowIndex++) { - if ($this.Rows[$rowIndex] -ne $OtherNode.Rows[$rowIndex]) { - return $false - } - } - - return $true - } - - hidden static [String] ArrayToTableRow([Array] $Values) { - return [String]::Join("|", $Values) - } -} - -class NoteNode: BaseNode { - [String] $Content - - NoteNode([String] $Content) { - $this.Content = $Content - } - - [String] ToMarkdown($level) { - return @( - '```', - $this.Content, - '```' - ) -join "`n" - } - - [PSCustomObject] ToJsonObject() { - return [PSCustomObject]@{ - NodeType = $this.GetType().Name - Content = $this.Content - } - } - - static [NoteNode] FromJsonObject($jsonObj) { - return [NoteNode]::new($jsonObj.Content) - } - - [Boolean] IsSimilarTo([BaseNode] $OtherNode) { - if ($OtherNode.GetType() -ne [NoteNode]) { - return $false - } - - return $this.Content -eq $OtherNode.Content - } - - [Boolean] IsIdenticalTo([BaseNode] $OtherNode) { - return $this.IsSimilarTo($OtherNode) - } -} \ No newline at end of file diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1 index 8dea33c3da6a..f6e796d5d597 100644 --- a/images/macos/software-report/SoftwareReport.Generator.ps1 +++ b/images/macos/software-report/SoftwareReport.Generator.ps1 @@ -1,3 +1,6 @@ +using module ./software-report-base/SoftwareReport.psm1 +using module ./software-report-base/SoftwareReport.Nodes.psm1 + param ( [Parameter(Mandatory)][string] $OutputDirectory, @@ -6,7 +9,6 @@ param ( $ErrorActionPreference = "Stop" -. ("$PSScriptRoot/SoftwareReport.Base.ps1") Import-Module "$PSScriptRoot/SoftwareReport.Common.psm1" -DisableNameChecking Import-Module "$PSScriptRoot/SoftwareReport.Xcode.psm1" -DisableNameChecking Import-Module "$PSScriptRoot/SoftwareReport.Android.psm1" -DisableNameChecking diff --git a/images/macos/templates/macOS-10.15.json b/images/macos/templates/macOS-10.15.json index b876d53e95e6..e912ade37777 100644 --- a/images/macos/templates/macOS-10.15.json +++ b/images/macos/templates/macOS-10.15.json @@ -58,6 +58,11 @@ "source": "./software-report", "destination": "~/image-generation/" }, + { + "type": "file", + "source": "../../helpers/software-report-base", + "destination": "~/image-generation/software-report/" + }, { "type": "file", "source": "./helpers", diff --git a/images/macos/templates/macOS-11.anka.pkr.hcl b/images/macos/templates/macOS-11.anka.pkr.hcl index 387969d7fd7a..672dd8ee02b0 100644 --- a/images/macos/templates/macOS-11.anka.pkr.hcl +++ b/images/macos/templates/macOS-11.anka.pkr.hcl @@ -77,6 +77,10 @@ build { "./helpers" ] } + provisioner "file" { + destination = "image-generation/software-report/" + source = "../../helpers/software-report-base" + } provisioner "file" { destination = "image-generation/add-certificate.swift" source = "./provision/configuration/add-certificate.swift" diff --git a/images/macos/templates/macOS-11.json b/images/macos/templates/macOS-11.json index b6ef7e8942ba..164db86262db 100644 --- a/images/macos/templates/macOS-11.json +++ b/images/macos/templates/macOS-11.json @@ -58,6 +58,11 @@ "source": "./software-report", "destination": "~/image-generation/" }, + { + "type": "file", + "source": "../../helpers/software-report-base", + "destination": "~/image-generation/software-report/" + }, { "type": "file", "source": "./helpers", diff --git a/images/macos/templates/macOS-12.anka.pkr.hcl b/images/macos/templates/macOS-12.anka.pkr.hcl index c612bcefa624..fa2fb287849f 100644 --- a/images/macos/templates/macOS-12.anka.pkr.hcl +++ b/images/macos/templates/macOS-12.anka.pkr.hcl @@ -77,6 +77,10 @@ build { "./helpers" ] } + provisioner "file" { + destination = "image-generation/software-report/" + source = "../../helpers/software-report-base" + } provisioner "file" { destination = "image-generation/add-certificate.swift" source = "./provision/configuration/add-certificate.swift" diff --git a/images/macos/templates/macOS-12.json b/images/macos/templates/macOS-12.json index 5cd163ba2c6d..2ee5c7193394 100644 --- a/images/macos/templates/macOS-12.json +++ b/images/macos/templates/macOS-12.json @@ -58,6 +58,11 @@ "source": "./software-report", "destination": "~/image-generation/" }, + { + "type": "file", + "source": "../../helpers/software-report-base", + "destination": "~/image-generation/software-report/" + }, { "type": "file", "source": "./helpers", From 6033af8dd1e00881233137f656180c63140a969d Mon Sep 17 00:00:00 2001 From: Maxim Lobanov <maxim-lobanov@github.com> Date: Tue, 13 Dec 2022 16:54:41 +0100 Subject: [PATCH 1635/3485] Improve table and tool versions comparison for new Software Report module (#6729) --- .../Calculate-ImagesDiff.ps1 | 9 ++- .../SoftwareReport.BaseNodes.psm1 | 6 +- .../SoftwareReport.Comparer.psm1 | 73 ++++++++++++++----- .../SoftwareReport.Nodes.psm1 | 40 ++++++++-- .../macos/helpers/SoftwareReport.Helpers.psm1 | 66 ----------------- .../SoftwareReport.Common.psm1 | 8 +- .../SoftwareReport.Generator.ps1 | 8 +- .../SoftwareReport.Toolcache.psm1 | 45 +++--------- 8 files changed, 120 insertions(+), 135 deletions(-) diff --git a/helpers/software-report-base/Calculate-ImagesDiff.ps1 b/helpers/software-report-base/Calculate-ImagesDiff.ps1 index 6d874a044594..91a05c86bf81 100644 --- a/helpers/software-report-base/Calculate-ImagesDiff.ps1 +++ b/helpers/software-report-base/Calculate-ImagesDiff.ps1 @@ -18,7 +18,9 @@ Param ( [Parameter(Mandatory=$true)] [string] $CurrentJsonReportPath, [Parameter(Mandatory=$true)] - [string] $OutputFile + [string] $OutputFile, + [Parameter(Mandatory=$false)] + [string] $ImageDocsUrl ) $ErrorActionPreference = "Stop" @@ -45,4 +47,9 @@ $currentReport = Read-SoftwareReport -JsonReportPath $CurrentJsonReportPath $comparer = [SoftwareReportComparer]::new($previousReport, $currentReport) $comparer.CompareReports() $diff = $comparer.GetMarkdownReport() + +if ($ImageDocsUrl) { + $diff += "`n`n`n For comprehensive list of software installed on this image please click [here]($ImageDocsUrl)." +} + $diff | Out-File -Path $OutputFile -Encoding utf8NoBOM diff --git a/helpers/software-report-base/SoftwareReport.BaseNodes.psm1 b/helpers/software-report-base/SoftwareReport.BaseNodes.psm1 index 545b7a38899a..db7916ae9fec 100644 --- a/helpers/software-report-base/SoftwareReport.BaseNodes.psm1 +++ b/helpers/software-report-base/SoftwareReport.BaseNodes.psm1 @@ -5,7 +5,7 @@ # Abstract base class for all nodes class BaseNode { [Boolean] ShouldBeIncludedToDiff() { - return $False + return $false } [Boolean] IsSimilarTo([BaseNode] $OtherNode) { @@ -26,7 +26,7 @@ class BaseToolNode: BaseNode { } [Boolean] ShouldBeIncludedToDiff() { - return $True + return $true } [String] GetValue() { @@ -35,7 +35,7 @@ class BaseToolNode: BaseNode { [Boolean] IsSimilarTo([BaseNode] $OtherNode) { if ($this.GetType() -ne $OtherNode.GetType()) { - return $False + return $false } return $this.ToolName -eq $OtherNode.ToolName diff --git a/helpers/software-report-base/SoftwareReport.Comparer.psm1 b/helpers/software-report-base/SoftwareReport.Comparer.psm1 index 8adb7332e7fa..45af1971f65a 100644 --- a/helpers/software-report-base/SoftwareReport.Comparer.psm1 +++ b/helpers/software-report-base/SoftwareReport.Comparer.psm1 @@ -37,7 +37,13 @@ class SoftwareReportComparer { # Nodes are identical, nothing changed, just ignore it } elseif ($sameNodeInPreviousReport) { # Nodes are equal but not identical, so something was changed - $this.ChangedItems.Add([ReportDifferenceItem]::new($sameNodeInPreviousReport, $currentReportNode, $Headers)) + if ($currentReportNode -is [TableNode]) { + $this.CompareSimilarTableNodes($sameNodeInPreviousReport, $currentReportNode, $Headers) + } elseif ($currentReportNode -is [ToolVersionsNode]) { + $this.CompareSimilarToolVersionsListNodes($sameNodeInPreviousReport, $currentReportNode, $Headers) + } else { + $this.ChangedItems.Add([ReportDifferenceItem]::new($sameNodeInPreviousReport, $currentReportNode, $Headers)) + } } else { # Node was not found in previous report, new node was added $this.AddedItems.Add([ReportDifferenceItem]::new($null, $currentReportNode, $Headers)) @@ -60,6 +66,43 @@ class SoftwareReportComparer { } } + hidden [void] CompareSimilarTableNodes([TableNode] $PreviousReportNode, [TableNode] $CurrentReportNode, [Array] $Headers) { + $addedRows = $CurrentReportNode.Rows | Where-Object { $_ -notin $PreviousReportNode.Rows } + $deletedRows = $PreviousReportNode.Rows | Where-Object { $_ -notin $CurrentReportNode.Rows } + + if (($addedRows.Count -gt 0) -and ($deletedRows.Count -eq 0)) { + $this.AddedItems.Add([ReportDifferenceItem]::new($PreviousReportNode, $CurrentReportNode, $Headers)) + } elseif (($deletedRows.Count -gt 0) -and ($addedRows.Count -eq 0)) { + $this.DeletedItems.Add([ReportDifferenceItem]::new($PreviousReportNode, $CurrentReportNode, $Headers)) + } else { + $this.ChangedItems.Add([ReportDifferenceItem]::new($PreviousReportNode, $CurrentReportNode, $Headers)) + } + } + + hidden [void] CompareSimilarToolVersionsListNodes([ToolVersionsNode] $PreviousReportNode, [ToolVersionsNode] $CurrentReportNode, [Array] $Headers) { + $previousReportMajorVersions = $PreviousReportNode.Versions | ForEach-Object { $PreviousReportNode.ExtractMajorVersion($_) } + $currentReportMajorVersion = $CurrentReportNode.Versions | ForEach-Object { $CurrentReportNode.ExtractMajorVersion($_) } + + $addedVersions = $CurrentReportNode.Versions | Where-Object { $CurrentReportNode.ExtractMajorVersion($_) -notin $previousReportMajorVersions } + $deletedVersions = $PreviousReportNode.Versions | Where-Object { $PreviousReportNode.ExtractMajorVersion($_) -notin $currentReportMajorVersion } + $changedPreviousVersions = $PreviousReportNode.Versions | Where-Object { ($PreviousReportNode.ExtractMajorVersion($_) -in $currentReportMajorVersion) -and ($_ -notin $CurrentReportNode.Versions) } + $changedCurrentVersions = $CurrentReportNode.Versions | Where-Object { ($CurrentReportNode.ExtractMajorVersion($_) -in $previousReportMajorVersions) -and ($_ -notin $PreviousReportNode.Versions) } + + if ($addedVersions.Count -gt 0) { + $this.AddedItems.Add([ReportDifferenceItem]::new($null, [ToolVersionsNode]::new($CurrentReportNode.ToolName, $addedVersions, $CurrentReportNode.MajorVersionRegex, $true), $Headers)) + } + + if ($deletedVersions.Count -gt 0) { + $this.DeletedItems.Add([ReportDifferenceItem]::new([ToolVersionsNode]::new($PreviousReportNode.ToolName, $deletedVersions, $PreviousReportNode.MajorVersionRegex, $true), $null, $Headers)) + } + + $previousChangedNode = ($changedPreviousVersions.Count -gt 0) ? [ToolVersionsNode]::new($PreviousReportNode.ToolName, $changedPreviousVersions, $PreviousReportNode.MajorVersionRegex, $true) : $null + $currentChangedNode = ($changedCurrentVersions.Count -gt 0) ? [ToolVersionsNode]::new($CurrentReportNode.ToolName, $changedCurrentVersions, $CurrentReportNode.MajorVersionRegex, $true) : $null + if ($previousChangedNode -and $currentChangedNode) { + $this.ChangedItems.Add([ReportDifferenceItem]::new($previousChangedNode, $currentChangedNode, $Headers)) + } + } + [String] GetMarkdownReport() { $reporter = [SoftwareReportComparerReport]::new() $report = $reporter.GenerateMarkdownReport($this.CurrentReport, $this.PreviousReport, $this.AddedItems, $this.ChangedItems, $this.DeletedItems) @@ -69,10 +112,10 @@ class SoftwareReportComparer { hidden [Boolean] FilterExcludedNodes([BaseNode] $Node) { # We shouldn't show "Image Version" diff because it is already shown in report header if (($Node -is [ToolNode]) -and ($Node.ToolName -eq "Image Version:")) { - return $False + return $false } - return $True + return $true } } @@ -89,7 +132,7 @@ class SoftwareReportComparerReport { ### Render report header #### ############################# - $sb.AppendLine("# :desktop_computer: $($rootNode.Title)") + $sb.AppendLine("# :desktop_computer: Actions Runner Image: $($rootNode.Title)") # ToolNodes on root level contains main image description so just copy-paste them to final report $rootNode.Children | Where-Object { $_ -is [BaseToolNode] } | ForEach-Object { @@ -107,7 +150,7 @@ class SoftwareReportComparerReport { if ($addedItemsExcludeTables.Count -gt 0) { $tableItems = $addedItemsExcludeTables | ForEach-Object { [PSCustomObject]@{ - "Category" = $this.RenderCategory($_.Headers, $True); + "Category" = $this.RenderCategory($_.Headers, $true); "Tool name" = $this.RenderToolName($_.CurrentReportNode.ToolName); "Current ($imageVersion)" = $_.CurrentReportNode.GetValue(); } @@ -115,7 +158,6 @@ class SoftwareReportComparerReport { $sb.AppendLine("### Added :heavy_plus_sign:") $sb.AppendLine($this.RenderHtmlTable($tableItems, "Category")) - $sb.AppendLine() } # Render added tables separately @@ -131,7 +173,7 @@ class SoftwareReportComparerReport { if ($deletedItemsExcludeTables.Count -gt 0) { $tableItems = $deletedItemsExcludeTables | ForEach-Object { [PSCustomObject]@{ - "Category" = $this.RenderCategory($_.Headers, $True); + "Category" = $this.RenderCategory($_.Headers, $true); "Tool name" = $this.RenderToolName($_.PreviousReportNode.ToolName); "Previous ($previousImageVersion)" = $_.PreviousReportNode.GetValue(); } @@ -139,7 +181,11 @@ class SoftwareReportComparerReport { $sb.AppendLine("### Deleted :heavy_minus_sign:") $sb.AppendLine($this.RenderHtmlTable($tableItems, "Category")) - $sb.AppendLine() + } + + # Render deleted tables separately + $DeletedItems | Where-Object { $_.IsTableNode() } | ForEach-Object { + $sb.AppendLine($this.RenderTableNodesDiff($_)) } ############################# @@ -150,7 +196,7 @@ class SoftwareReportComparerReport { if ($changedItemsExcludeTables.Count -gt 0) { $tableItems = $changedItemsExcludeTables | ForEach-Object { [PSCustomObject]@{ - "Category" = $this.RenderCategory($_.Headers, $True); + "Category" = $this.RenderCategory($_.Headers, $true); "Tool name" = $this.RenderToolName($_.CurrentReportNode.ToolName); "Previous ($previousImageVersion)" = $_.PreviousReportNode.GetValue(); "Current ($imageVersion)" = $_.CurrentReportNode.GetValue(); @@ -159,7 +205,6 @@ class SoftwareReportComparerReport { $sb.AppendLine("### Updated") $sb.AppendLine($this.RenderHtmlTable($tableItems, "Category")) - $sb.AppendLine() } # Render updated tables separately @@ -167,11 +212,6 @@ class SoftwareReportComparerReport { $sb.AppendLine($this.RenderTableNodesDiff($_)) } - # Render deleted tables separately - $DeletedItems | Where-Object { $_.IsTableNode() } | ForEach-Object { - $sb.AppendLine($this.RenderTableNodesDiff($_)) - } - return $sb.ToString() } @@ -187,7 +227,6 @@ class SoftwareReportComparerReport { $sb.AppendLine(" </thead>") $sb.AppendLine(" <tbody>") - $tableRowSpans = $this.CalculateHtmlTableRowSpan($Table, $RowSpanColumnName) for ($rowIndex = 0; $rowIndex -lt $Table.Count; $rowIndex++) { $row = $Table[$rowIndex] @@ -246,7 +285,7 @@ class SoftwareReportComparerReport { } $sb = [System.Text.StringBuilder]::new() - $sb.AppendLine("#### $($this.RenderCategory($DiffItem.Headers, $False))") + $sb.AppendLine("#### $($this.RenderCategory($DiffItem.Headers, $false))") $sb.AppendLine([TableNode]::new($tableHeaders, $tableRows).ToMarkdown(0)) return $sb.ToString() } diff --git a/helpers/software-report-base/SoftwareReport.Nodes.psm1 b/helpers/software-report-base/SoftwareReport.Nodes.psm1 index 1385782a17db..48ad1cf78a12 100644 --- a/helpers/software-report-base/SoftwareReport.Nodes.psm1 +++ b/helpers/software-report-base/SoftwareReport.Nodes.psm1 @@ -35,7 +35,7 @@ class HeaderNode: BaseNode { } [Boolean] ShouldBeIncludedToDiff() { - return $True + return $true } [void] AddNode([BaseNode] $node) { @@ -63,8 +63,8 @@ class HeaderNode: BaseNode { $this.AddNode([ToolNode]::new($ToolName, $Version)) } - [void] AddToolVersionsNode([String] $ToolName, [Array] $Version) { - $this.AddNode([ToolVersionsNode]::new($ToolName, $Version)) + [void] AddToolVersionsNode([String] $ToolName, [Array] $Version, [String] $MajorVersionRegex, [Boolean] $InlineList) { + $this.AddNode([ToolVersionsNode]::new($ToolName, $Version, $MajorVersionRegex, $InlineList)) } [void] AddTableNode([Array] $Table) { @@ -155,12 +155,21 @@ class ToolNode: BaseToolNode { # Node type to describe the tool with multiple versions "Toolcache Node.js 14.17.6 16.2.0 18.2.3" class ToolVersionsNode: BaseToolNode { [Array] $Versions + [Regex] $MajorVersionRegex + [String] $ListType - ToolVersionsNode([String] $ToolName, [Array] $Versions): base($ToolName) { + ToolVersionsNode([String] $ToolName, [Array] $Versions, [String] $MajorVersionRegex, [Boolean] $InlineList): base($ToolName) { $this.Versions = $Versions + $this.MajorVersionRegex = [Regex]::new($MajorVersionRegex) + $this.ListType = $InlineList ? "Inline" : "List" + $this.ValidateMajorVersionRegex() } [String] ToMarkdown($level) { + if ($this.ListType -eq "Inline") { + return "- $($this.ToolName): $($this.Versions -join ', ')" + } + $sb = [System.Text.StringBuilder]::new() $sb.AppendLine() $sb.AppendLine("$("#" * $level) $($this.ToolName)") @@ -175,16 +184,35 @@ class ToolVersionsNode: BaseToolNode { return $this.Versions -join ', ' } + [String] ExtractMajorVersion([String] $Version) { + $match = $this.MajorVersionRegex.Match($Version) + if ($match.Success -ne $true) { + throw "Version '$Version' doesn't match regex '$($this.PrimaryVersionRegex)'" + } + + return $match.Groups[0].Value + } + [PSCustomObject] ToJsonObject() { return [PSCustomObject]@{ NodeType = $this.GetType().Name ToolName = $this.ToolName Versions = $this.Versions + MajorVersionRegex = $this.MajorVersionRegex.ToString() + ListType = $this.ListType } } static [ToolVersionsNode] FromJsonObject($jsonObj) { - return [ToolVersionsNode]::new($jsonObj.ToolName, $jsonObj.Versions) + return [ToolVersionsNode]::new($jsonObj.ToolName, $jsonObj.Versions, $jsonObj.MajorVersionRegex, $jsonObj.ListType -eq "Inline") + } + + hidden [void] ValidateMajorVersionRegex() { + $this.Versions | Group-Object { $this.ExtractMajorVersion($_) } | ForEach-Object { + if ($_.Count -gt 1) { + throw "Multiple versions from list $($this.GetValue()) return the same result from regex '$($this.MajorVersionRegex)': $($_.Name)" + } + } } } @@ -200,7 +228,7 @@ class TableNode: BaseNode { } [Boolean] ShouldBeIncludedToDiff() { - return $True + return $true } static [TableNode] FromObjectsArray([Array] $Table) { diff --git a/images/macos/helpers/SoftwareReport.Helpers.psm1 b/images/macos/helpers/SoftwareReport.Helpers.psm1 index 0f8b9abcddf1..3dfc84963337 100644 --- a/images/macos/helpers/SoftwareReport.Helpers.psm1 +++ b/images/macos/helpers/SoftwareReport.Helpers.psm1 @@ -23,14 +23,6 @@ function Take-Part { return [string]::Join($Delimiter, $selectedParts) } -function New-MDNewLine { - param ( - [int] $Count = 1 - ) - $newLineSymbol = [System.Environment]::NewLine - return $newLineSymbol * $Count -} - function Get-LinkTarget { param ( [string] $inputPath @@ -60,61 +52,3 @@ function Get-BrewPackageVersion { return $packageVersion } - -function Get-CachedToolInstances { - <# - .SYNOPSIS - Returns hashtable of installed cached tools. - - .DESCRIPTION - Return hashtable that contains versions and architectures for the selected cached tool. - - .PARAMETER Name - Name of cached tool. - - .PARAMETER VersionCommand - Optional parameter. Command to return version of system default tool. - - .EXAMPLE - Get-CachedToolInstances -Name "Python" -VersionCommand "--version" - - #> - - param - ( - [String] $Name, - [String] $VersionCommand - ) - - $toolInstances = @() - $toolPath = Join-Path -Path $env:AGENT_TOOLSDIRECTORY -ChildPath $Name - - # Get all installed versions from TOOLSDIRECTORY folder - $versions = Get-ChildItem $toolPath | Sort-Object { [System.Version]$_.Name } - foreach ($version in $versions) { - $instanceInfo = @{} - - # Create instance hashtable - [string]$instanceInfo.Path = Join-Path -Path $toolPath -ChildPath $version.Name - [string]$instanceInfo.Version = $version.Name - - # Get all architectures for current version - [array]$instanceInfo.Architecture_Array = Get-ChildItem $version.FullName -Name -Directory | Where-Object { $_ -match "^x[0-9]{2}$" } - [string]$instanceInfo.Architecture = $instanceInfo.Architecture_Array -Join ", " - - # Add (default) postfix to version name, in case if current version is in environment path - if (-not ([string]::IsNullOrEmpty($VersionCommand))) { - $defaultVersion = $(& ($Name.ToLower()) $VersionCommand 2>&1) - $defaultToolVersion = $defaultVersion | Select-String -Pattern "\d+\.\d+\.\d+" -AllMatches ` - | ForEach-Object { $_.Matches.Value } - - if ([version]$version.Name -eq [version]$defaultToolVersion) { - $instanceInfo.Version += " (Default)" - } - } - - $toolInstances += $instanceInfo - } - - return $toolInstances -} \ No newline at end of file diff --git a/images/macos/software-report/SoftwareReport.Common.psm1 b/images/macos/software-report/SoftwareReport.Common.psm1 index 3d03d0a04acd..a5226b33093a 100644 --- a/images/macos/software-report/SoftwareReport.Common.psm1 +++ b/images/macos/software-report/SoftwareReport.Common.psm1 @@ -9,8 +9,7 @@ function Get-BashVersion { function Get-DotnetVersionList { $sdkRawList = Run-Command "dotnet --list-sdks" - $sdkVersionList = $sdkRawList | ForEach-Object { Take-Part $_ -Part 0 } - return [string]::Join(" ", $sdkVersionList) + return $sdkRawList | ForEach-Object { Take-Part $_ -Part 0 } } function Get-GoVersion { @@ -148,8 +147,7 @@ function Get-NVMNodeVersionList { $nvmInitCommand = ". ${nvmPath} > /dev/null 2>&1 || true" $nodejsVersionsRaw = Run-Command "${nvmInitCommand} && nvm ls" $nodeVersions = $nodejsVersionsRaw | ForEach-Object { $_.TrimStart(" ").TrimEnd(" *") } | Where-Object { $_.StartsWith("v") } - $formattedNodeVersions = $nodeVersions | ForEach-Object { $_.TrimStart("v") } - return [string]::Join(" ", $formattedNodeVersions) + return $nodeVersions | ForEach-Object { $_.TrimStart("v") } } function Build-OSInfoSection { @@ -331,7 +329,7 @@ function Get-PackerVersion { } function Get-OpenSSLVersion { - $opensslVersion = Get-Item /usr/local/opt/openssl@1.1 | ForEach-Object {"{0} ``({1} -> {2})``" -f (Run-Command "openssl version"), $_.FullName, $_.Target} + $opensslVersion = Run-Command "openssl version" return ($opensslVersion -replace "^OpenSSL").Trim() } diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1 index f6e796d5d597..c23e26faf029 100644 --- a/images/macos/software-report/SoftwareReport.Generator.ps1 +++ b/images/macos/software-report/SoftwareReport.Generator.ps1 @@ -33,7 +33,7 @@ $installedSoftware = $softwareReport.Root.AddHeaderNode("Installed Software") # Language and Runtime $languageAndRuntime = $installedSoftware.AddHeaderNode("Language and Runtime") -$languageAndRuntime.AddToolNode(".NET SDK", $(Get-DotnetVersionList)) +$languageAndRuntime.AddToolVersionsNode(".NET Core SDK", $(Get-DotnetVersionList), '^\d+\.\d+\.\d', $true) $languageAndRuntime.AddToolNode("Bash", $(Get-BashVersion)) $languageAndRuntime.AddNodes($(Get-ClangLLVMVersions)) $languageAndRuntime.AddNodes($(Get-GccVersions)) @@ -45,7 +45,7 @@ $languageAndRuntime.AddToolNode("Mono", $(Get-MonoVersion)) $languageAndRuntime.AddToolNode("MSBuild", $(Get-MSBuildVersion)) $languageAndRuntime.AddToolNode("Node.js", $(Get-NodeVersion)) $languageAndRuntime.AddToolNode("NVM", $(Get-NVMVersion)) -$languageAndRuntime.AddToolNode("NVM - Cached node versions:", $(Get-NVMNodeVersionList)) +$languageAndRuntime.AddToolVersionsNode("NVM - Cached node versions", $(Get-NVMNodeVersionList), '^\d+', $true) $languageAndRuntime.AddToolNode("Perl", $(Get-PerlVersion)) $languageAndRuntime.AddToolNode("PHP", $(Get-PHPVersion)) $languageAndRuntime.AddToolNode("Python", $(Get-PythonVersion)) @@ -153,7 +153,7 @@ $tools.AddToolNode("Xcode Command Line Tools", $(Get-XcodeCommandLineToolsVersio # Linters $linters = $installedSoftware.AddHeaderNode("Linters") -$linters.AddToolNode("Swift", $(Get-SwiftLintVersion)) +$linters.AddToolNode("SwiftLint", $(Get-SwiftLintVersion)) $linters.AddToolNode("Yamllint", $(Get-YamllintVersion)) # Browsers @@ -193,7 +193,7 @@ $powerShell = $installedSoftware.AddHeaderNode("PowerShell Tools") $powerShell.AddToolNode("PowerShell", $(Get-PowershellVersion)) $powerShellModules = $powerShell.AddHeaderNode("PowerShell Modules") -$powerShellModules.AddTableNode($(Get-PowerShellModules)) +$powerShellModules.AddNodes($(Get-PowerShellModules)) # Web Servers $webServers = $installedSoftware.AddHeaderNode("Web Servers") diff --git a/images/macos/software-report/SoftwareReport.Toolcache.psm1 b/images/macos/software-report/SoftwareReport.Toolcache.psm1 index 4ab0b6fc4f9a..d59f6b579b52 100644 --- a/images/macos/software-report/SoftwareReport.Toolcache.psm1 +++ b/images/macos/software-report/SoftwareReport.Toolcache.psm1 @@ -28,47 +28,26 @@ function Get-ToolcacheNodeVersions { return Get-ChildItem $toolcachePath -Name | Sort-Object { [Version]$_ } } -function Get-ToolcacheGoTable { - $ToolInstances = Get-CachedToolInstances -Name "Go" -VersionCommand "version" - foreach ($Instance in $ToolInstances) { - $Version = [System.Version]($Instance.Version -Split(" "))[0] - $Instance."Environment Variable" = "GOROOT_$($Version.major)_$($Version.minor)_X64" - } - - $Content = $ToolInstances | ForEach-Object { - return [PSCustomObject]@{ - Version = $_.Version - Architecture = $_.Architecture - "Environment Variable" = $_."Environment Variable" - } - } - - return $Content +function Get-ToolcacheGoVersions { + $toolcachePath = Join-Path $env:HOME "hostedtoolcache" "Go" + return Get-ChildItem $toolcachePath -Name | Sort-Object { [Version]$_ } } function Build-ToolcacheSection { - $goToolNode = [HeaderNode]::new("Go") - $goToolNode.AddTableNode($(Get-ToolcacheGoTable)) return @( - [ToolVersionsNode]::new("Ruby", $(Get-ToolcacheRubyVersions)) - [ToolVersionsNode]::new("Python", $(Get-ToolcachePythonVersions)) - [ToolVersionsNode]::new("PyPy", $(Get-ToolcachePyPyVersions)) - [ToolVersionsNode]::new("Node.js", $(Get-ToolcacheNodeVersions)) - $goToolNode + [ToolVersionsNode]::new("Ruby", $(Get-ToolcacheRubyVersions), '^\d+\.\d+', $false), + [ToolVersionsNode]::new("Python", $(Get-ToolcachePythonVersions), '^\d+\.\d+', $false), + [ToolVersionsNode]::new("PyPy", $(Get-ToolcachePyPyVersions), '^\d+\.\d+', $false), + [ToolVersionsNode]::new("Node.js", $(Get-ToolcacheNodeVersions), '^\d+', $false), + [ToolVersionsNode]::new("Go", $(Get-ToolcacheGoVersions), '^\d+\.\d+', $false) ) } function Get-PowerShellModules { $modules = (Get-ToolsetValue powershellModules).name - - $psModules = Get-Module -Name $modules -ListAvailable | Sort-Object Name | Group-Object Name - return $psModules | ForEach-Object { - $moduleName = $_.Name - $moduleVersions = ($_.group.Version | Sort-Object -Unique) -join '<br>' - - [PSCustomObject]@{ - Module = $moduleName - Version = $moduleVersions - } + $modules | ForEach-Object { + $moduleName = $_ + $moduleVersions = Get-Module -Name $moduleName -ListAvailable | Select-Object -ExpandProperty Version | Sort-Object -Unique + return [ToolVersionsNode]::new($moduleName, $moduleVersions, '^\d+', $true) } } \ No newline at end of file From e63632f872c9b5a1d88509947a3c92a2a250504b Mon Sep 17 00:00:00 2001 From: Maxim Lobanov <maxim-lobanov@github.com> Date: Tue, 13 Dec 2022 17:07:05 +0100 Subject: [PATCH 1636/3485] [Linux] Minor documentation improvements (#6749) --- .../SoftwareReport.Browsers.psm1 | 6 +- .../SoftwareReport.CachedTools.psm1 | 19 +---- .../SoftwareReport/SoftwareReport.Common.psm1 | 70 +++++++------------ .../SoftwareReport.Databases.psm1 | 21 +++--- .../SoftwareReport.Generator.ps1 | 43 ++++-------- .../SoftwareReport/SoftwareReport.Tools.psm1 | 28 ++------ .../linux/scripts/helpers/Common.Helpers.psm1 | 10 ++- .../SoftwareReport.Common.psm1 | 2 +- .../SoftwareReport.Generator.ps1 | 2 +- 9 files changed, 73 insertions(+), 128 deletions(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Browsers.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Browsers.psm1 index 3269acbd976f..0ea48932a0c0 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Browsers.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Browsers.psm1 @@ -10,8 +10,7 @@ function Get-ChromeDriverVersion { function Get-FirefoxVersion { $firefoxVersion = firefox --version - $aptSourceRepo = Get-AptSourceRepository -PackageName "mozillateam" - return "$firefoxVersion (apt source repository: $aptSourceRepo)" + return "$firefoxVersion" } function Get-GeckodriverVersion { @@ -26,8 +25,7 @@ function Get-ChromiumVersion { function Get-EdgeVersion { $edgeVersion = (microsoft-edge --version).trim() - $aptSourceRepo = Get-AptSourceRepository -PackageName "microsoft-edge" - return "$edgeVersion (apt source repository: $aptSourceRepo)" + return "$edgeVersion" } function Get-EdgeDriverVersion { diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.CachedTools.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.CachedTools.psm1 index 66b85a38a205..9b099ef3ec96 100755 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.CachedTools.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.CachedTools.psm1 @@ -28,19 +28,6 @@ function Get-ToolcacheGoVersions { return Get-ChildItem $toolcachePath -Name | Sort-Object { [Version]$_ } } -function Build-GoEnvironmentTable { - return Get-CachedToolInstances -Name "go" -VersionCommand "version" | ForEach-Object { - $Version = [System.Version]($_.Version -Split(" "))[0] - $Name = "GOROOT_$($Version.major)_$($Version.minor)_X64" - $Value = (Get-Item env:\$Name).Value - [PSCustomObject] @{ - "Name" = $Name - "Value" = (Get-Item env:\$Name).Value - "Architecture" = $_. Architecture - } - } -} - function Build-CachedToolsSection { $output = "" @@ -50,12 +37,12 @@ function Build-CachedToolsSection { $output += New-MDHeader "Node.js" -Level 4 $output += New-MDList -Lines (Get-ToolcacheNodeVersions) -Style Unordered - $output += New-MDHeader "PyPy" -Level 4 - $output += New-MDList -Lines (Get-ToolcachePyPyVersions) -Style Unordered - $output += New-MDHeader "Python" -Level 4 $output += New-MDList -Lines (Get-ToolcachePythonVersions) -Style Unordered + $output += New-MDHeader "PyPy" -Level 4 + $output += New-MDList -Lines (Get-ToolcachePyPyVersions) -Style Unordered + $output += New-MDHeader "Ruby" -Level 4 $output += New-MDList -Lines (Get-ToolcacheRubyVersions) -Style Unordered diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 index b1ffe1f750d8..48014ed6e6a1 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 @@ -76,16 +76,13 @@ function Get-ErlangRebar3Version { function Get-MonoVersion { $monoVersion = mono --version | Out-String | Take-OutputPart -Part 4 - $aptSourceRepo = Get-AptSourceRepository -PackageName "mono" - return "Mono $monoVersion (apt source repository: $aptSourceRepo)" + return "Mono $monoVersion" } function Get-MsbuildVersion { $msbuildVersion = msbuild -version | Select-Object -Last 1 - $result = Select-String -Path (Get-Command msbuild).Source -Pattern "msbuild" - $result -match "(?<path>\/\S*\.dll)" | Out-Null - $msbuildPath = $Matches.path - return "MSBuild $msbuildVersion (from $msbuildPath)" + $monoVersion = Get-MonoVersion + return "MSBuild $msbuildVersion ($monoVersion)" } function Get-NuGetVersion { @@ -210,11 +207,8 @@ function Get-Pip3Version { } function Get-VcpkgVersion { - $result = Get-CommandResult "vcpkg version" - $result.Output -match "version (?<version>\d+\.\d+\.\d+)" | Out-Null - $vcpkgVersion = $Matches.version $commitId = git -C "/usr/local/share/vcpkg" rev-parse --short HEAD - return "Vcpkg $vcpkgVersion (build from master \<$commitId>)" + return "Vcpkg (build from commit $commitId)" } function Get-AntVersion { @@ -261,31 +255,14 @@ function Get-PHPUnitVersion { return $Matches.version } -function Build-PHPTable { - $php = @{ - "Tool" = "PHP" - "Version" = "$(Get-PHPVersions -Join '<br>')" - } - $composer = @{ - "Tool" = "Composer" - "Version" = Get-ComposerVersion - } - $phpunit = @{ - "Tool" = "PHPUnit" - "Version" = Get-PHPUnitVersion - } - return @($php, $composer, $phpunit) | ForEach-Object { - [PSCustomObject] @{ - "Tool" = $_.Tool - "Version" = $_.Version - } - } -} - function Build-PHPSection { $output = "" - $output += New-MDHeader "PHP" -Level 3 - $output += Build-PHPTable | New-MDTable + $output += New-MDHeader "PHP Tools" -Level 3 + $output += New-MDList -Style Unordered -Lines @( + "PHP: $((Get-PHPVersions) -join ', ')", + "Composer $(Get-ComposerVersion)", + "PHPUnit $(Get-PHPUnitVersion)" + ) $output += New-MDCode -Lines @( "Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled." ) @@ -327,23 +304,30 @@ function Get-AzModuleVersions { } function Get-PowerShellModules { - $modules = (Get-ToolsetContent).powershellModules.name + [Array] $result = @() - $psModules = Get-Module -Name $modules -ListAvailable | Sort-Object Name | Group-Object Name - $psModules | ForEach-Object { - $moduleName = $_.Name - $moduleVersions = ($_.group.Version | Sort-Object -Unique) -join '<br>' + [Array] $azureInstalledModules = Get-ChildItem -Path "/usr/share/az_*" -Directory | ForEach-Object { $_.Name.Split("_")[1] } + if ($azureInstalledModules.Count -gt 0) { + $result += "Az: $($azureInstalledModules -join ', ')" + } - [PSCustomObject]@{ - Module = $moduleName - Version = $moduleVersions - } + [Array] $azureCachedModules = Get-ChildItem /usr/share/az_*.zip -File | ForEach-Object { $_.Name.Split("_")[1] } + if ($azureCachedModules.Count -gt 0) { + $result += "Az (Cached): $($azureCachedModules -join ', ')" } + + $result += (Get-ToolsetContent).powershellModules.name | ForEach-Object { + $moduleName = $_ + $moduleVersions = Get-Module -Name $moduleName -ListAvailable | Select-Object -ExpandProperty Version | Sort-Object -Unique + return "$($moduleName): $($moduleVersions -join ', ')" + } + + return $result } function Get-DotNetCoreSdkVersions { $unsortedDotNetCoreSdkVersion = dotnet --list-sdks list | ForEach-Object { $_ | Take-OutputPart -Part 0 } - $dotNetCoreSdkVersion = $unsortedDotNetCoreSdkVersion -join " " + $dotNetCoreSdkVersion = $unsortedDotNetCoreSdkVersion -join ", " return $dotNetCoreSdkVersion } diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Databases.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Databases.psm1 index 8ba9ea1510db..a9885cd74237 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Databases.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Databases.psm1 @@ -1,13 +1,11 @@ function Get-PostgreSqlVersion { $postgreSQLVersion = psql --version | Take-OutputPart -Part 2 - $aptSourceRepo = Get-AptSourceRepository -PackageName "postgresql" - return "PostgreSQL $postgreSQLVersion (apt source repository: $aptSourceRepo)" + return "PostgreSQL $postgreSQLVersion" } function Get-MongoDbVersion { $mongoDBVersion = mongod --version | Select-Object -First 1 | Take-OutputPart -Part 2 -Delimiter "v" - $aptSourceRepo = Get-AptSourceRepository -PackageName "mongodb" - return "MongoDB $mongoDBVersion (apt source repository: $aptSourceRepo)" + return "MongoDB $mongoDBVersion" } function Get-SqliteVersion { @@ -38,11 +36,12 @@ function Build-PostgreSqlSection { $output += New-MDHeader "PostgreSQL" -Level 4 $output += New-MDList -Style Unordered -Lines @( - (Get-PostgreSqlVersion ), - "PostgreSQL Server (user:postgres)" + (Get-PostgreSqlVersion) ) $output += New-MDCode -Lines @( - "PostgreSQL service is disabled by default. Use the following command as a part of your job to start the service: 'sudo systemctl start postgresql.service'" + "User: postgres", + "PostgreSQL service is disabled by default.", + "Use the following command as a part of your job to start the service: 'sudo systemctl start postgresql.service'" ) return $output @@ -53,11 +52,13 @@ function Build-MySQLSection { $output += New-MDHeader "MySQL" -Level 4 $output += New-MDList -Style Unordered -Lines @( - (Get-MySQLVersion ), - "MySQL Server (user:root password:root)" + (Get-MySQLVersion ) ) $output += New-MDCode -Lines @( - "MySQL service is disabled by default. Use the following command as a part of your job to start the service: 'sudo systemctl start mysql.service'" + "User: root", + "Password: root", + "MySQL service is disabled by default.", + "Use the following command as a part of your job to start the service: 'sudo systemctl start mysql.service'" ) return $output diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index d6e98c652407..c5a542e13767 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -24,13 +24,11 @@ Import-Module (Join-Path $PSScriptRoot "SoftwareReport.WebServers.psm1") -Disabl Restore-UserOwner $markdown = "" +$markdown += New-MDHeader "Ubuntu $(Get-OSVersionShort)" -Level 1 -$OSName = Get-OSName -$markdown += New-MDHeader "$OSName" -Level 1 - -$kernelVersion = Get-KernelVersion $markdown += New-MDList -Style Unordered -Lines @( - "$kernelVersion" + "OS Version: $(Get-OSVersionFull)" + "Kernel Version: $(Get-KernelVersion)" "Image Version: $env:IMAGE_VERSION" ) @@ -85,7 +83,11 @@ $packageManagementList = @( $markdown += New-MDList -Style Unordered -Lines ($packageManagementList | Sort-Object) -$markdown += New-MDHeader "Notes:" -Level 5 +$markdown += New-MDHeader "Environment variables" -Level 4 +$markdown += Build-PackageManagementEnvironmentTable | New-MDTable +$markdown += New-MDNewLine + +$markdown += New-MDHeader "Homebrew note" -Level 4 $reportHomebrew = @' ``` Location: /home/linuxbrew @@ -96,10 +98,6 @@ to accomplish this. '@ $markdown += New-MDParagraph -Lines $reportHomebrew -$markdown += New-MDHeader "Environment variables" -Level 4 -$markdown += Build-PackageManagementEnvironmentTable | New-MDTable -$markdown += New-MDNewLine - $markdown += New-MDHeader "Project Management" -Level 3 $projectManagementList = @() if ((Test-IsUbuntu18) -or (Test-IsUbuntu20)) { @@ -194,7 +192,7 @@ $markdown += New-MDList -Style Unordered -Lines (@( (Get-OCCliVersion), (Get-ORASCliVersion), (Get-VerselCliversion) - ) | Sort-Object + ) ) $markdown += New-MDHeader "Java" -Level 3 @@ -256,14 +254,12 @@ $markdown += New-MDHeader "Environment variables" -Level 4 $markdown += Build-BrowserWebdriversEnvironmentTable | New-MDTable $markdown += New-MDNewLine -$markdown += New-MDHeader ".NET Core SDK" -Level 3 -$markdown += New-MDList -Style Unordered -Lines @( - (Get-DotNetCoreSdkVersions) +$markdown += New-MDHeader ".NET Core Tools" -Level 3 +$netCoreTools = @( + ".NET Core SDK: $(Get-DotNetCoreSdkVersions)" ) - -$markdown += New-MDHeader ".NET tools" -Level 3 -$tools = Get-DotnetTools -$markdown += New-MDList -Lines $tools -Style Unordered +$netCoreTools += Get-DotnetTools +$markdown += New-MDList -Style Unordered -Lines $netCoreTools $markdown += New-MDHeader "Databases" -Level 3 $databaseLists = @( @@ -285,20 +281,11 @@ $markdown += Build-MSSQLToolsSection $markdown += New-MDHeader "Cached Tools" -Level 3 $markdown += Build-CachedToolsSection -$markdown += New-MDHeader "Environment variables" -Level 4 -$markdown += Build-GoEnvironmentTable | New-MDTable -$markdown += New-MDNewLine - $markdown += New-MDHeader "PowerShell Tools" -Level 3 $markdown += New-MDList -Lines (Get-PowershellVersion) -Style Unordered $markdown += New-MDHeader "PowerShell Modules" -Level 4 -$markdown += Get-PowerShellModules | New-MDTable -$markdown += New-MDNewLine -$markdown += New-MDHeader "Az PowerShell Modules" -Level 4 -$markdown += New-MDList -Style Unordered -Lines @( - (Get-AzModuleVersions) -) +$markdown += New-MDList -Lines $(Get-PowerShellModules) -Style Unordered $markdown += Build-WebServersSection diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 index 3092e7ec58a1..4c934bf71409 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 @@ -12,7 +12,7 @@ function Get-AptFastVersion { function Get-AzCopyVersion { $azcopyVersion = azcopy --version | Take-OutputPart -Part 2 - return "AzCopy $azcopyVersion (available by ``azcopy`` and ``azcopy10`` aliases)" + return "AzCopy $azcopyVersion - available by ``azcopy`` and ``azcopy10`` aliases" } function Get-BazelVersion { @@ -42,28 +42,16 @@ function Get-CodeQLBundleVersion { function Get-PodManVersion { $podmanVersion = podman --version | Take-OutputPart -Part 2 - if ((Test-IsUbuntu18) -or (Test-IsUbuntu20)) { - $aptSourceRepo = Get-AptSourceRepository -PackageName "containers" - return "Podman $podmanVersion (apt source repository: $aptSourceRepo)" - } return "Podman $podmanVersion" } function Get-BuildahVersion { $buildahVersion = buildah --version | Take-OutputPart -Part 2 - if ((Test-IsUbuntu18) -or (Test-IsUbuntu20)) { - $aptSourceRepo = Get-AptSourceRepository -PackageName "containers" - return "Buildah $buildahVersion (apt source repository: $aptSourceRepo)" - } return "Buildah $buildahVersion" } function Get-SkopeoVersion { $skopeoVersion = skopeo --version | Take-OutputPart -Part 2 - if ((Test-IsUbuntu18) -or (Test-IsUbuntu20)) { - $aptSourceRepo = Get-AptSourceRepository -PackageName "containers" - return "Skopeo $skopeoVersion (apt source repository: $aptSourceRepo)" - } return "Skopeo $skopeoVersion" } @@ -104,15 +92,13 @@ function Get-DockerAmazonECRCredHelperVersion { function Get-GitVersion { $gitVersion = git --version | Take-OutputPart -Part -1 - $aptSourceRepo = Get-AptSourceRepository -PackageName "git-core" - return "Git $gitVersion (apt source repository: $aptSourceRepo)" + return "Git $gitVersion" } function Get-GitLFSVersion { $result = Get-CommandResult "git-lfs --version" $gitlfsversion = $result.Output | Take-OutputPart -Part 0 | Take-OutputPart -Part 1 -Delimiter "/" - $aptSourceRepo = Get-AptSourceRepository -PackageName "git-lfs" - return "Git LFS $gitlfsversion (apt source repository: $aptSourceRepo)" + return "Git LFS $gitlfsversion" } function Get-GitFTPVersion { @@ -121,8 +107,7 @@ function Get-GitFTPVersion { } function Get-GoogleCloudSDKVersion { - $aptSourceRepo = Get-AptSourceRepository -PackageName "google-cloud-sdk" - return "$(gcloud --version | Select-Object -First 1) (apt source repository: $aptSourceRepo)" + return gcloud --version | Select-Object -First 1 } function Get-HavegedVersion { @@ -215,8 +200,7 @@ function Get-JqVersion { function Get-AzureCliVersion { $azcliVersion = (az version | ConvertFrom-Json).'azure-cli' - $aptSourceRepo = Get-AptSourceRepository -PackageName "azure-cli" - return "Azure CLI (azure-cli) $azcliVersion (installation method: $aptSourceRepo)" + return "Azure CLI $azcliVersion" } function Get-AzureDevopsVersion { @@ -299,7 +283,7 @@ function Get-YamllintVersion { function Get-ZstdVersion { $zstdVersion = zstd --version | Take-OutputPart -Part 1 -Delimiter "v" | Take-OutputPart -Part 0 -Delimiter "," - return "zstd $zstdVersion (homebrew)" + return "zstd $zstdVersion (Homebrew)" } function Get-YqVersion { diff --git a/images/linux/scripts/helpers/Common.Helpers.psm1 b/images/linux/scripts/helpers/Common.Helpers.psm1 index b55a910be3d8..455e0854d96e 100644 --- a/images/linux/scripts/helpers/Common.Helpers.psm1 +++ b/images/linux/scripts/helpers/Common.Helpers.psm1 @@ -29,13 +29,17 @@ function Get-CommandResult { } } -function Get-OSName { - lsb_release -ds +function Get-OSVersionShort { + $(Get-OSVersionFull) | Take-OutputPart -Delimiter '.' -Part 0,1 +} + +function Get-OSVersionFull { + lsb_release -ds | Take-OutputPart -Part 1, 2 } function Get-KernelVersion { $kernelVersion = uname -r - return "Linux kernel version: $kernelVersion" + return $kernelVersion } function Test-IsUbuntu18 { diff --git a/images/macos/software-report/SoftwareReport.Common.psm1 b/images/macos/software-report/SoftwareReport.Common.psm1 index a5226b33093a..3817de8b86ce 100644 --- a/images/macos/software-report/SoftwareReport.Common.psm1 +++ b/images/macos/software-report/SoftwareReport.Common.psm1 @@ -168,7 +168,7 @@ function Build-OSInfoSection { $kernelVersion = $parsedSystemInfo[1].Replace($fieldsToInclude[1],"").Trim() $osInfoNode = [HeaderNode]::new("macOS $version") - $osInfoNode.AddToolNode("System Version:", $systemVersion) + $osInfoNode.AddToolNode("OS Version:", $systemVersion) $osInfoNode.AddToolNode("Kernel Version:", $kernelVersion) $osInfoNode.AddToolNode("Image Version:", $ImageName.Split('_')[1]) return $osInfoNode diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1 index c23e26faf029..b2136670f16b 100644 --- a/images/macos/software-report/SoftwareReport.Generator.ps1 +++ b/images/macos/software-report/SoftwareReport.Generator.ps1 @@ -131,8 +131,8 @@ $tools.AddToolNode("App Center CLI", $(Get-AppCenterCLIVersion)) $tools.AddToolNode("AWS CLI", $(Get-AWSCLIVersion)) $tools.AddToolNode("AWS SAM CLI", $(Get-AWSSAMCLIVersion)) $tools.AddToolNode("AWS Session Manager CLI", $(Get-AWSSessionManagerCLIVersion)) -$tools.AddToolNode("Azure CLI (azure-devops)", $(Get-AzureDevopsVersion)) $tools.AddToolNode("Azure CLI", $(Get-AzureCLIVersion)) +$tools.AddToolNode("Azure CLI (azure-devops)", $(Get-AzureDevopsVersion)) $tools.AddToolNode("Bicep CLI", $(Get-BicepVersion)) $tools.AddToolNode("Cabal", $(Get-CabalVersion)) $tools.AddToolNode("Cmake", $(Get-CmakeVersion)) From 2f83bbaa50fc2eb7f8d6776c42d2c7a2ddc1cf92 Mon Sep 17 00:00:00 2001 From: Maxim Lobanov <maxim-lobanov@github.com> Date: Wed, 14 Dec 2022 10:24:47 +0100 Subject: [PATCH 1637/3485] rename nodes in software report (#6763) --- .../SoftwareReport.Comparer.psm1 | 16 +- .../SoftwareReport.Nodes.psm1 | 36 +-- .../SoftwareReport.Browsers.psm1 | 20 +- .../SoftwareReport.Common.psm1 | 16 +- .../SoftwareReport.Generator.ps1 | 296 +++++++++--------- .../SoftwareReport.Toolcache.psm1 | 12 +- .../software-report/SoftwareReport.Xcode.psm1 | 8 +- 7 files changed, 202 insertions(+), 202 deletions(-) diff --git a/helpers/software-report-base/SoftwareReport.Comparer.psm1 b/helpers/software-report-base/SoftwareReport.Comparer.psm1 index 45af1971f65a..bcce515c353a 100644 --- a/helpers/software-report-base/SoftwareReport.Comparer.psm1 +++ b/helpers/software-report-base/SoftwareReport.Comparer.psm1 @@ -39,7 +39,7 @@ class SoftwareReportComparer { # Nodes are equal but not identical, so something was changed if ($currentReportNode -is [TableNode]) { $this.CompareSimilarTableNodes($sameNodeInPreviousReport, $currentReportNode, $Headers) - } elseif ($currentReportNode -is [ToolVersionsNode]) { + } elseif ($currentReportNode -is [ToolVersionsListNode]) { $this.CompareSimilarToolVersionsListNodes($sameNodeInPreviousReport, $currentReportNode, $Headers) } else { $this.ChangedItems.Add([ReportDifferenceItem]::new($sameNodeInPreviousReport, $currentReportNode, $Headers)) @@ -79,7 +79,7 @@ class SoftwareReportComparer { } } - hidden [void] CompareSimilarToolVersionsListNodes([ToolVersionsNode] $PreviousReportNode, [ToolVersionsNode] $CurrentReportNode, [Array] $Headers) { + hidden [void] CompareSimilarToolVersionsListNodes([ToolVersionsListNode] $PreviousReportNode, [ToolVersionsListNode] $CurrentReportNode, [Array] $Headers) { $previousReportMajorVersions = $PreviousReportNode.Versions | ForEach-Object { $PreviousReportNode.ExtractMajorVersion($_) } $currentReportMajorVersion = $CurrentReportNode.Versions | ForEach-Object { $CurrentReportNode.ExtractMajorVersion($_) } @@ -89,15 +89,15 @@ class SoftwareReportComparer { $changedCurrentVersions = $CurrentReportNode.Versions | Where-Object { ($CurrentReportNode.ExtractMajorVersion($_) -in $previousReportMajorVersions) -and ($_ -notin $PreviousReportNode.Versions) } if ($addedVersions.Count -gt 0) { - $this.AddedItems.Add([ReportDifferenceItem]::new($null, [ToolVersionsNode]::new($CurrentReportNode.ToolName, $addedVersions, $CurrentReportNode.MajorVersionRegex, $true), $Headers)) + $this.AddedItems.Add([ReportDifferenceItem]::new($null, [ToolVersionsListNode]::new($CurrentReportNode.ToolName, $addedVersions, $CurrentReportNode.MajorVersionRegex, $true), $Headers)) } if ($deletedVersions.Count -gt 0) { - $this.DeletedItems.Add([ReportDifferenceItem]::new([ToolVersionsNode]::new($PreviousReportNode.ToolName, $deletedVersions, $PreviousReportNode.MajorVersionRegex, $true), $null, $Headers)) + $this.DeletedItems.Add([ReportDifferenceItem]::new([ToolVersionsListNode]::new($PreviousReportNode.ToolName, $deletedVersions, $PreviousReportNode.MajorVersionRegex, $true), $null, $Headers)) } - $previousChangedNode = ($changedPreviousVersions.Count -gt 0) ? [ToolVersionsNode]::new($PreviousReportNode.ToolName, $changedPreviousVersions, $PreviousReportNode.MajorVersionRegex, $true) : $null - $currentChangedNode = ($changedCurrentVersions.Count -gt 0) ? [ToolVersionsNode]::new($CurrentReportNode.ToolName, $changedCurrentVersions, $CurrentReportNode.MajorVersionRegex, $true) : $null + $previousChangedNode = ($changedPreviousVersions.Count -gt 0) ? [ToolVersionsListNode]::new($PreviousReportNode.ToolName, $changedPreviousVersions, $PreviousReportNode.MajorVersionRegex, $true) : $null + $currentChangedNode = ($changedCurrentVersions.Count -gt 0) ? [ToolVersionsListNode]::new($CurrentReportNode.ToolName, $changedCurrentVersions, $CurrentReportNode.MajorVersionRegex, $true) : $null if ($previousChangedNode -and $currentChangedNode) { $this.ChangedItems.Add([ReportDifferenceItem]::new($previousChangedNode, $currentChangedNode, $Headers)) } @@ -111,7 +111,7 @@ class SoftwareReportComparer { hidden [Boolean] FilterExcludedNodes([BaseNode] $Node) { # We shouldn't show "Image Version" diff because it is already shown in report header - if (($Node -is [ToolNode]) -and ($Node.ToolName -eq "Image Version:")) { + if (($Node -is [ToolVersionNode]) -and ($Node.ToolName -eq "Image Version:")) { return $false } @@ -313,7 +313,7 @@ class SoftwareReportComparerReport { } [String] GetImageVersion([SoftwareReport] $Report) { - $imageVersionNode = $Report.Root.Children ?? @() | Where-Object { ($_ -is [ToolNode]) -and ($_.ToolName -eq "Image Version:") } | Select-Object -First 1 + $imageVersionNode = $Report.Root.Children ?? @() | Where-Object { ($_ -is [ToolVersionNode]) -and ($_.ToolName -eq "Image Version:") } | Select-Object -First 1 return $imageVersionNode.Version ?? "Unknown version" } } diff --git a/helpers/software-report-base/SoftwareReport.Nodes.psm1 b/helpers/software-report-base/SoftwareReport.Nodes.psm1 index 48ad1cf78a12..5e820dc690a4 100644 --- a/helpers/software-report-base/SoftwareReport.Nodes.psm1 +++ b/helpers/software-report-base/SoftwareReport.Nodes.psm1 @@ -10,10 +10,10 @@ class NodesFactory { static [BaseNode] ParseNodeFromObject($jsonObj) { if ($jsonObj.NodeType -eq [HeaderNode].Name) { return [HeaderNode]::FromJsonObject($jsonObj) - } elseif ($jsonObj.NodeType -eq [ToolNode].Name) { - return [ToolNode]::FromJsonObject($jsonObj) - } elseif ($jsonObj.NodeType -eq [ToolVersionsNode].Name) { - return [ToolVersionsNode]::FromJsonObject($jsonObj) + } elseif ($jsonObj.NodeType -eq [ToolVersionNode].Name) { + return [ToolVersionNode]::FromJsonObject($jsonObj) + } elseif ($jsonObj.NodeType -eq [ToolVersionsListNode].Name) { + return [ToolVersionsListNode]::FromJsonObject($jsonObj) } elseif ($jsonObj.NodeType -eq [TableNode].Name) { return [TableNode]::FromJsonObject($jsonObj) } elseif ($jsonObj.NodeType -eq [NoteNode].Name) { @@ -53,25 +53,25 @@ class HeaderNode: BaseNode { } } - [HeaderNode] AddHeaderNode([String] $Title) { + [HeaderNode] AddHeader([String] $Title) { $node = [HeaderNode]::new($Title) $this.AddNode($node) return $node } - [void] AddToolNode([String] $ToolName, [String] $Version) { - $this.AddNode([ToolNode]::new($ToolName, $Version)) + [void] AddToolVersion([String] $ToolName, [String] $Version) { + $this.AddNode([ToolVersionNode]::new($ToolName, $Version)) } - [void] AddToolVersionsNode([String] $ToolName, [Array] $Version, [String] $MajorVersionRegex, [Boolean] $InlineList) { - $this.AddNode([ToolVersionsNode]::new($ToolName, $Version, $MajorVersionRegex, $InlineList)) + [void] AddToolVersionsList([String] $ToolName, [Array] $Version, [String] $MajorVersionRegex, [Boolean] $InlineList) { + $this.AddNode([ToolVersionsListNode]::new($ToolName, $Version, $MajorVersionRegex, $InlineList)) } - [void] AddTableNode([Array] $Table) { + [void] AddTable([Array] $Table) { $this.AddNode([TableNode]::FromObjectsArray($Table)) } - [void] AddNoteNode([String] $Content) { + [void] AddNote([String] $Content) { $this.AddNode([NoteNode]::new($Content)) } @@ -124,10 +124,10 @@ class HeaderNode: BaseNode { } # Node type to describe the tool with single version: "Bash 5.1.16" -class ToolNode: BaseToolNode { +class ToolVersionNode: BaseToolNode { [String] $Version - ToolNode([String] $ToolName, [String] $Version): base($ToolName) { + ToolVersionNode([String] $ToolName, [String] $Version): base($ToolName) { $this.Version = $Version } @@ -148,17 +148,17 @@ class ToolNode: BaseToolNode { } static [BaseNode] FromJsonObject($jsonObj) { - return [ToolNode]::new($jsonObj.ToolName, $jsonObj.Version) + return [ToolVersionNode]::new($jsonObj.ToolName, $jsonObj.Version) } } # Node type to describe the tool with multiple versions "Toolcache Node.js 14.17.6 16.2.0 18.2.3" -class ToolVersionsNode: BaseToolNode { +class ToolVersionsListNode: BaseToolNode { [Array] $Versions [Regex] $MajorVersionRegex [String] $ListType - ToolVersionsNode([String] $ToolName, [Array] $Versions, [String] $MajorVersionRegex, [Boolean] $InlineList): base($ToolName) { + ToolVersionsListNode([String] $ToolName, [Array] $Versions, [String] $MajorVersionRegex, [Boolean] $InlineList): base($ToolName) { $this.Versions = $Versions $this.MajorVersionRegex = [Regex]::new($MajorVersionRegex) $this.ListType = $InlineList ? "Inline" : "List" @@ -203,8 +203,8 @@ class ToolVersionsNode: BaseToolNode { } } - static [ToolVersionsNode] FromJsonObject($jsonObj) { - return [ToolVersionsNode]::new($jsonObj.ToolName, $jsonObj.Versions, $jsonObj.MajorVersionRegex, $jsonObj.ListType -eq "Inline") + static [ToolVersionsListNode] FromJsonObject($jsonObj) { + return [ToolVersionsListNode]::new($jsonObj.ToolName, $jsonObj.Versions, $jsonObj.MajorVersionRegex, $jsonObj.ListType -eq "Inline") } hidden [void] ValidateMajorVersionRegex() { diff --git a/images/macos/software-report/SoftwareReport.Browsers.psm1 b/images/macos/software-report/SoftwareReport.Browsers.psm1 index 2ee1fce63369..6dbf1fbf55c6 100644 --- a/images/macos/software-report/SoftwareReport.Browsers.psm1 +++ b/images/macos/software-report/SoftwareReport.Browsers.psm1 @@ -1,14 +1,14 @@ function Build-BrowserSection { return @( - [ToolNode]::new("Safari", $(Get-SafariVersion)) - [ToolNode]::new("SafariDriver", $(Get-SafariDriverVersion)) - [ToolNode]::new("Google Chrome", $(Get-ChromeVersion)) - [ToolNode]::new("ChromeDriver", $(Get-ChromeDriverVersion)) - [ToolNode]::new("Microsoft Edge", $(Get-EdgeVersion)) - [ToolNode]::new("Microsoft Edge WebDriver", $(Get-EdgeDriverVersion)) - [ToolNode]::new("Mozilla Firefox", $(Get-FirefoxVersion)) - [ToolNode]::new("geckodriver", $(Get-GeckodriverVersion)) - [ToolNode]::new("Selenium server", $(Get-SeleniumVersion)) + [ToolVersionNode]::new("Safari", $(Get-SafariVersion)) + [ToolVersionNode]::new("SafariDriver", $(Get-SafariDriverVersion)) + [ToolVersionNode]::new("Google Chrome", $(Get-ChromeVersion)) + [ToolVersionNode]::new("ChromeDriver", $(Get-ChromeDriverVersion)) + [ToolVersionNode]::new("Microsoft Edge", $(Get-EdgeVersion)) + [ToolVersionNode]::new("Microsoft Edge WebDriver", $(Get-EdgeDriverVersion)) + [ToolVersionNode]::new("Mozilla Firefox", $(Get-FirefoxVersion)) + [ToolVersionNode]::new("geckodriver", $(Get-GeckodriverVersion)) + [ToolVersionNode]::new("Selenium server", $(Get-SeleniumVersion)) ) } @@ -84,7 +84,7 @@ function Build-BrowserWebdriversEnvironmentTable { } } - $node.AddTableNode($table) + $node.AddTable($table) return $node } diff --git a/images/macos/software-report/SoftwareReport.Common.psm1 b/images/macos/software-report/SoftwareReport.Common.psm1 index 3817de8b86ce..698e99d85ad8 100644 --- a/images/macos/software-report/SoftwareReport.Common.psm1 +++ b/images/macos/software-report/SoftwareReport.Common.psm1 @@ -87,7 +87,7 @@ function Get-GccVersions { $versionList | Foreach-Object { $nameVersion = Run-Command "gcc-${_} --version" | Select-Object -First 1 $version = ($nameVersion -replace "^gcc-${_}").Trim() -replace '\).*$', ')' - return [ToolNode]::new("GCC ${_}", "$version - available by ``gcc-${_}`` alias") + return [ToolVersionNode]::new("GCC ${_}", "$version - available by ``gcc-${_}`` alias") } } @@ -96,7 +96,7 @@ function Get-FortranVersions { $versionList | Foreach-Object { $nameVersion = Run-Command "gfortran-${_} --version" | Select-Object -First 1 $version = ($nameVersion -replace "^GNU Fortran").Trim() -replace '\).*$', ')' - return [ToolNode]::new("GNU Fortran ${_}", "$version - available by ``gfortran-${_}`` alias") + return [ToolVersionNode]::new("GNU Fortran ${_}", "$version - available by ``gfortran-${_}`` alias") } } @@ -111,8 +111,8 @@ function Get-ClangLLVMVersions { $homebrewClangVersion = $clangVersionRegex.Match($homebrewClangOutput).Groups['version'].Value return @( - [ToolNode]::new("Clang/LLVM", $defaultClangVersion) - [ToolNode]::new("Clang/LLVM (Homebrew)", "$homebrewClangVersion - available on ``$homebrewClangPath``") + [ToolVersionNode]::new("Clang/LLVM", $defaultClangVersion) + [ToolVersionNode]::new("Clang/LLVM (Homebrew)", "$homebrewClangVersion - available on ``$homebrewClangPath``") ) } @@ -168,9 +168,9 @@ function Build-OSInfoSection { $kernelVersion = $parsedSystemInfo[1].Replace($fieldsToInclude[1],"").Trim() $osInfoNode = [HeaderNode]::new("macOS $version") - $osInfoNode.AddToolNode("OS Version:", $systemVersion) - $osInfoNode.AddToolNode("Kernel Version:", $kernelVersion) - $osInfoNode.AddToolNode("Image Version:", $ImageName.Split('_')[1]) + $osInfoNode.AddToolVersion("OS Version:", $systemVersion) + $osInfoNode.AddToolVersion("Kernel Version:", $kernelVersion) + $osInfoNode.AddToolVersion("Image Version:", $ImageName.Split('_')[1]) return $osInfoNode } @@ -598,7 +598,7 @@ function Build-PackageManagementEnvironmentTable { } } - $node.AddTableNode($table) + $node.AddTable($table) return $node } diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1 index b2136670f16b..9acb317f1605 100644 --- a/images/macos/software-report/SoftwareReport.Generator.ps1 +++ b/images/macos/software-report/SoftwareReport.Generator.ps1 @@ -29,180 +29,180 @@ $osInfo = Build-OSInfoSection $ImageName # Software report $softwareReport = [SoftwareReport]::new($osInfo) -$installedSoftware = $softwareReport.Root.AddHeaderNode("Installed Software") +$installedSoftware = $softwareReport.Root.AddHeader("Installed Software") # Language and Runtime -$languageAndRuntime = $installedSoftware.AddHeaderNode("Language and Runtime") -$languageAndRuntime.AddToolVersionsNode(".NET Core SDK", $(Get-DotnetVersionList), '^\d+\.\d+\.\d', $true) -$languageAndRuntime.AddToolNode("Bash", $(Get-BashVersion)) +$languageAndRuntime = $installedSoftware.AddHeader("Language and Runtime") +$languageAndRuntime.AddToolVersionsList(".NET Core SDK", $(Get-DotnetVersionList), '^\d+\.\d+\.\d', $true) +$languageAndRuntime.AddToolVersion("Bash", $(Get-BashVersion)) $languageAndRuntime.AddNodes($(Get-ClangLLVMVersions)) $languageAndRuntime.AddNodes($(Get-GccVersions)) $languageAndRuntime.AddNodes($(Get-FortranVersions)) -$languageAndRuntime.AddToolNode("Go", $(Get-GoVersion)) -$languageAndRuntime.AddToolNode("Julia", $(Get-JuliaVersion)) -$languageAndRuntime.AddToolNode("Kotlin", $(Get-KotlinVersion)) -$languageAndRuntime.AddToolNode("Mono", $(Get-MonoVersion)) -$languageAndRuntime.AddToolNode("MSBuild", $(Get-MSBuildVersion)) -$languageAndRuntime.AddToolNode("Node.js", $(Get-NodeVersion)) -$languageAndRuntime.AddToolNode("NVM", $(Get-NVMVersion)) -$languageAndRuntime.AddToolVersionsNode("NVM - Cached node versions", $(Get-NVMNodeVersionList), '^\d+', $true) -$languageAndRuntime.AddToolNode("Perl", $(Get-PerlVersion)) -$languageAndRuntime.AddToolNode("PHP", $(Get-PHPVersion)) -$languageAndRuntime.AddToolNode("Python", $(Get-PythonVersion)) -$languageAndRuntime.AddToolNode("Python3", $(Get-Python3Version)) -$languageAndRuntime.AddToolNode("R", $(Get-RVersion)) -$languageAndRuntime.AddToolNode("Ruby", $(Get-RubyVersion)) +$languageAndRuntime.AddToolVersion("Go", $(Get-GoVersion)) +$languageAndRuntime.AddToolVersion("Julia", $(Get-JuliaVersion)) +$languageAndRuntime.AddToolVersion("Kotlin", $(Get-KotlinVersion)) +$languageAndRuntime.AddToolVersion("Mono", $(Get-MonoVersion)) +$languageAndRuntime.AddToolVersion("MSBuild", $(Get-MSBuildVersion)) +$languageAndRuntime.AddToolVersion("Node.js", $(Get-NodeVersion)) +$languageAndRuntime.AddToolVersion("NVM", $(Get-NVMVersion)) +$languageAndRuntime.AddToolVersionsList("NVM - Cached node versions", $(Get-NVMNodeVersionList), '^\d+', $true) +$languageAndRuntime.AddToolVersion("Perl", $(Get-PerlVersion)) +$languageAndRuntime.AddToolVersion("PHP", $(Get-PHPVersion)) +$languageAndRuntime.AddToolVersion("Python", $(Get-PythonVersion)) +$languageAndRuntime.AddToolVersion("Python3", $(Get-Python3Version)) +$languageAndRuntime.AddToolVersion("R", $(Get-RVersion)) +$languageAndRuntime.AddToolVersion("Ruby", $(Get-RubyVersion)) # Package Management -$packageManagement = $installedSoftware.AddHeaderNode("Package Management") -$packageManagement.AddToolNode("Bundler", $(Get-BundlerVersion)) -$packageManagement.AddToolNode("Carthage", $(Get-CarthageVersion)) -$packageManagement.AddToolNode("CocoaPods", $(Get-CocoaPodsVersion)) -$packageManagement.AddToolNode("Composer", $(Get-ComposerVersion)) -$packageManagement.AddToolNode("Homebrew", $(Get-HomebrewVersion)) -$packageManagement.AddToolNode("Miniconda", $(Get-CondaVersion)) -$packageManagement.AddToolNode("NPM", $(Get-NPMVersion)) -$packageManagement.AddToolNode("NuGet", $(Get-NuGetVersion)) -$packageManagement.AddToolNode("Pip", $(Get-PipVersion -Version 2)) -$packageManagement.AddToolNode("Pip3", $(Get-PipVersion -Version 3)) -$packageManagement.AddToolNode("Pipx", $(Get-PipxVersion)) -$packageManagement.AddToolNode("RubyGems", $(Get-RubyGemsVersion)) -$packageManagement.AddToolNode("Vcpkg", $(Get-VcpkgVersion)) -$packageManagement.AddToolNode("Yarn", $(Get-YarnVersion)) +$packageManagement = $installedSoftware.AddHeader("Package Management") +$packageManagement.AddToolVersion("Bundler", $(Get-BundlerVersion)) +$packageManagement.AddToolVersion("Carthage", $(Get-CarthageVersion)) +$packageManagement.AddToolVersion("CocoaPods", $(Get-CocoaPodsVersion)) +$packageManagement.AddToolVersion("Composer", $(Get-ComposerVersion)) +$packageManagement.AddToolVersion("Homebrew", $(Get-HomebrewVersion)) +$packageManagement.AddToolVersion("Miniconda", $(Get-CondaVersion)) +$packageManagement.AddToolVersion("NPM", $(Get-NPMVersion)) +$packageManagement.AddToolVersion("NuGet", $(Get-NuGetVersion)) +$packageManagement.AddToolVersion("Pip", $(Get-PipVersion -Version 2)) +$packageManagement.AddToolVersion("Pip3", $(Get-PipVersion -Version 3)) +$packageManagement.AddToolVersion("Pipx", $(Get-PipxVersion)) +$packageManagement.AddToolVersion("RubyGems", $(Get-RubyGemsVersion)) +$packageManagement.AddToolVersion("Vcpkg", $(Get-VcpkgVersion)) +$packageManagement.AddToolVersion("Yarn", $(Get-YarnVersion)) $packageManagement.AddNode($(Build-PackageManagementEnvironmentTable)) # Project Management -$projectanagement = $installedSoftware.AddHeaderNode("Project Management") -$projectanagement.AddToolNode("Apache Ant", $(Get-ApacheAntVersion)) -$projectanagement.AddToolNode("Apache Maven", $(Get-MavenVersion)) -$projectanagement.AddToolNode("Gradle", $(Get-GradleVersion)) -$projectanagement.AddToolNode("Sbt", $(Get-SbtVersion)) +$projectanagement = $installedSoftware.AddHeader("Project Management") +$projectanagement.AddToolVersion("Apache Ant", $(Get-ApacheAntVersion)) +$projectanagement.AddToolVersion("Apache Maven", $(Get-MavenVersion)) +$projectanagement.AddToolVersion("Gradle", $(Get-GradleVersion)) +$projectanagement.AddToolVersion("Sbt", $(Get-SbtVersion)) # Utilities -$utilities = $installedSoftware.AddHeaderNode("Utilities") -$utilities.AddToolNode("7-Zip", $(Get-7zipVersion)) -$utilities.AddToolNode("aria2", $(Get-Aria2Version)) -$utilities.AddToolNode("azcopy", $(Get-AzcopyVersion)) -$utilities.AddToolNode("bazel", $(Get-BazelVersion)) -$utilities.AddToolNode("bazelisk", $(Get-BazeliskVersion)) -$utilities.AddToolNode("bsdtar", $(Get-BsdtarVersion)) -$utilities.AddToolNode("Curl", $(Get-CurlVersion)) -$utilities.AddToolNode("Git", $(Get-GitVersion)) -$utilities.AddToolNode("Git LFS", $(Get-GitLFSVersion)) -$utilities.AddToolNode("GitHub CLI", $(Get-GitHubCLIVersion)) +$utilities = $installedSoftware.AddHeader("Utilities") +$utilities.AddToolVersion("7-Zip", $(Get-7zipVersion)) +$utilities.AddToolVersion("aria2", $(Get-Aria2Version)) +$utilities.AddToolVersion("azcopy", $(Get-AzcopyVersion)) +$utilities.AddToolVersion("bazel", $(Get-BazelVersion)) +$utilities.AddToolVersion("bazelisk", $(Get-BazeliskVersion)) +$utilities.AddToolVersion("bsdtar", $(Get-BsdtarVersion)) +$utilities.AddToolVersion("Curl", $(Get-CurlVersion)) +$utilities.AddToolVersion("Git", $(Get-GitVersion)) +$utilities.AddToolVersion("Git LFS", $(Get-GitLFSVersion)) +$utilities.AddToolVersion("GitHub CLI", $(Get-GitHubCLIVersion)) if ($os.IsCatalina) { - $utilities.AddToolNode("GNU parallel", $(Get-ParallelVersion)) + $utilities.AddToolVersion("GNU parallel", $(Get-ParallelVersion)) } -$utilities.AddToolNode("GNU Tar", $(Get-GnuTarVersion)) -$utilities.AddToolNode("GNU Wget", $(Get-WgetVersion)) -$utilities.AddToolNode("gpg (GnuPG)", $(Get-GPGVersion)) +$utilities.AddToolVersion("GNU Tar", $(Get-GnuTarVersion)) +$utilities.AddToolVersion("GNU Wget", $(Get-WgetVersion)) +$utilities.AddToolVersion("gpg (GnuPG)", $(Get-GPGVersion)) if ($os.IsLessThanMonterey) { - $utilities.AddToolNode("helm", $(Get-HelmVersion)) + $utilities.AddToolVersion("helm", $(Get-HelmVersion)) } -$utilities.AddToolNode("Hub CLI", $(Get-HubVersion)) -$utilities.AddToolNode("ImageMagick", $(Get-ImageMagickVersion)) -$utilities.AddToolNode("jq", $(Get-JqVersion)) -$utilities.AddToolNode("mongo", $(Get-MongoVersion)) -$utilities.AddToolNode("mongod", $(Get-MongodVersion)) +$utilities.AddToolVersion("Hub CLI", $(Get-HubVersion)) +$utilities.AddToolVersion("ImageMagick", $(Get-ImageMagickVersion)) +$utilities.AddToolVersion("jq", $(Get-JqVersion)) +$utilities.AddToolVersion("mongo", $(Get-MongoVersion)) +$utilities.AddToolVersion("mongod", $(Get-MongodVersion)) if ($os.IsLessThanMonterey) { - $utilities.AddToolNode("Newman", $(Get-NewmanVersion)) + $utilities.AddToolVersion("Newman", $(Get-NewmanVersion)) } -$utilities.AddToolNode("OpenSSL", $(Get-OpenSSLVersion)) -$utilities.AddToolNode("Packer", $(Get-PackerVersion)) -$utilities.AddToolNode("PostgreSQL", $(Get-PostgresServerVersion)) -$utilities.AddToolNode("psql (PostgreSQL)", $(Get-PostgresClientVersion)) -$utilities.AddToolNode("Sox", $(Get-SoxVersion)) -$utilities.AddToolNode("Subversion (SVN)", $(Get-SVNVersion)) -$utilities.AddToolNode("Switchaudio-osx", $(Get-SwitchAudioOsxVersion)) +$utilities.AddToolVersion("OpenSSL", $(Get-OpenSSLVersion)) +$utilities.AddToolVersion("Packer", $(Get-PackerVersion)) +$utilities.AddToolVersion("PostgreSQL", $(Get-PostgresServerVersion)) +$utilities.AddToolVersion("psql (PostgreSQL)", $(Get-PostgresClientVersion)) +$utilities.AddToolVersion("Sox", $(Get-SoxVersion)) +$utilities.AddToolVersion("Subversion (SVN)", $(Get-SVNVersion)) +$utilities.AddToolVersion("Switchaudio-osx", $(Get-SwitchAudioOsxVersion)) if (-not $os.IsBigSur) { - $utilities.AddToolNode("Vagrant", $(Get-VagrantVersion)) - $utilities.AddToolNode("VirtualBox", $(Get-VirtualBoxVersion)) + $utilities.AddToolVersion("Vagrant", $(Get-VagrantVersion)) + $utilities.AddToolVersion("VirtualBox", $(Get-VirtualBoxVersion)) } -$utilities.AddToolNode("yq", $(Get-YqVersion)) -$utilities.AddToolNode("zstd", $(Get-ZstdVersion)) +$utilities.AddToolVersion("yq", $(Get-YqVersion)) +$utilities.AddToolVersion("zstd", $(Get-ZstdVersion)) # Tools -$tools = $installedSoftware.AddHeaderNode("Tools") +$tools = $installedSoftware.AddHeader("Tools") if ($os.IsLessThanMonterey) { - $tools.AddToolNode("Aliyun CLI", $(Get-AliyunCLIVersion)) + $tools.AddToolVersion("Aliyun CLI", $(Get-AliyunCLIVersion)) } -$tools.AddToolNode("App Center CLI", $(Get-AppCenterCLIVersion)) -$tools.AddToolNode("AWS CLI", $(Get-AWSCLIVersion)) -$tools.AddToolNode("AWS SAM CLI", $(Get-AWSSAMCLIVersion)) -$tools.AddToolNode("AWS Session Manager CLI", $(Get-AWSSessionManagerCLIVersion)) -$tools.AddToolNode("Azure CLI", $(Get-AzureCLIVersion)) -$tools.AddToolNode("Azure CLI (azure-devops)", $(Get-AzureDevopsVersion)) -$tools.AddToolNode("Bicep CLI", $(Get-BicepVersion)) -$tools.AddToolNode("Cabal", $(Get-CabalVersion)) -$tools.AddToolNode("Cmake", $(Get-CmakeVersion)) +$tools.AddToolVersion("App Center CLI", $(Get-AppCenterCLIVersion)) +$tools.AddToolVersion("AWS CLI", $(Get-AWSCLIVersion)) +$tools.AddToolVersion("AWS SAM CLI", $(Get-AWSSAMCLIVersion)) +$tools.AddToolVersion("AWS Session Manager CLI", $(Get-AWSSessionManagerCLIVersion)) +$tools.AddToolVersion("Azure CLI", $(Get-AzureCLIVersion)) +$tools.AddToolVersion("Azure CLI (azure-devops)", $(Get-AzureDevopsVersion)) +$tools.AddToolVersion("Bicep CLI", $(Get-BicepVersion)) +$tools.AddToolVersion("Cabal", $(Get-CabalVersion)) +$tools.AddToolVersion("Cmake", $(Get-CmakeVersion)) if (-not $os.IsCatalina) { - $tools.AddToolNode("CodeQL Action Bundle", $(Get-CodeQLBundleVersion)) + $tools.AddToolVersion("CodeQL Action Bundle", $(Get-CodeQLBundleVersion)) } if (-not $os.IsCatalina) { - $tools.AddToolNode("Colima", $(Get-ColimaVersion)) + $tools.AddToolVersion("Colima", $(Get-ColimaVersion)) } -$tools.AddToolNode("Fastlane", $(Get-FastlaneVersion)) -$tools.AddToolNode("GHC", $(Get-GHCVersion)) -$tools.AddToolNode("GHCup", $(Get-GHCupVersion)) -$tools.AddToolNode("Jazzy", $(Get-JazzyVersion)) -$tools.AddToolNode("Stack", $(Get-StackVersion)) -$tools.AddToolNode("SwiftFormat", $(Get-SwiftFormatVersion)) -$tools.AddToolNode("Swig", $(Get-SwigVersion)) -$tools.AddToolNode("Xcode Command Line Tools", $(Get-XcodeCommandLineToolsVersion)) +$tools.AddToolVersion("Fastlane", $(Get-FastlaneVersion)) +$tools.AddToolVersion("GHC", $(Get-GHCVersion)) +$tools.AddToolVersion("GHCup", $(Get-GHCupVersion)) +$tools.AddToolVersion("Jazzy", $(Get-JazzyVersion)) +$tools.AddToolVersion("Stack", $(Get-StackVersion)) +$tools.AddToolVersion("SwiftFormat", $(Get-SwiftFormatVersion)) +$tools.AddToolVersion("Swig", $(Get-SwigVersion)) +$tools.AddToolVersion("Xcode Command Line Tools", $(Get-XcodeCommandLineToolsVersion)) # Linters -$linters = $installedSoftware.AddHeaderNode("Linters") -$linters.AddToolNode("SwiftLint", $(Get-SwiftLintVersion)) -$linters.AddToolNode("Yamllint", $(Get-YamllintVersion)) +$linters = $installedSoftware.AddHeader("Linters") +$linters.AddToolVersion("SwiftLint", $(Get-SwiftLintVersion)) +$linters.AddToolVersion("Yamllint", $(Get-YamllintVersion)) # Browsers -$browsers = $installedSoftware.AddHeaderNode("Browsers") +$browsers = $installedSoftware.AddHeader("Browsers") $browsers.AddNodes($(Build-BrowserSection)) $browsers.AddNode($(Build-BrowserWebdriversEnvironmentTable)) # Java -$java = $installedSoftware.AddHeaderNode("Java") -$java.AddTableNode($(Get-JavaVersions)) +$java = $installedSoftware.AddHeader("Java") +$java.AddTable($(Get-JavaVersions)) # Graal -$graalvm = $installedSoftware.AddHeaderNode("GraalVM") -$graalvm.AddTableNode($(Build-GraalVMTable)) +$graalvm = $installedSoftware.AddHeader("GraalVM") +$graalvm.AddTable($(Build-GraalVMTable)) # Toolcache -$toolcache = $installedSoftware.AddHeaderNode("Cached Tools") +$toolcache = $installedSoftware.AddHeader("Cached Tools") $toolcache.AddNodes($(Build-ToolcacheSection)) # Rust -$rust = $installedSoftware.AddHeaderNode("Rust Tools") -$rust.AddToolNode("Cargo", $(Get-RustCargoVersion)) -$rust.AddToolNode("Rust", $(Get-RustVersion)) -$rust.AddToolNode("Rustdoc", $(Get-RustdocVersion)) -$rust.AddToolNode("Rustup", $(Get-RustupVersion)) - -$rustPackages = $rust.AddHeaderNode("Packages") -$rustPackages.AddToolNode("Bindgen", $(Get-Bindgen)) -$rustPackages.AddToolNode("Cargo-audit", $(Get-Cargoaudit)) -$rustPackages.AddToolNode("Cargo-outdated", $(Get-Cargooutdated)) -$rustPackages.AddToolNode("Cbindgen", $(Get-Cbindgen)) -$rustPackages.AddToolNode("Clippy", $(Get-RustClippyVersion)) -$rustPackages.AddToolNode("Rustfmt", $(Get-RustfmtVersion)) +$rust = $installedSoftware.AddHeader("Rust Tools") +$rust.AddToolVersion("Cargo", $(Get-RustCargoVersion)) +$rust.AddToolVersion("Rust", $(Get-RustVersion)) +$rust.AddToolVersion("Rustdoc", $(Get-RustdocVersion)) +$rust.AddToolVersion("Rustup", $(Get-RustupVersion)) + +$rustPackages = $rust.AddHeader("Packages") +$rustPackages.AddToolVersion("Bindgen", $(Get-Bindgen)) +$rustPackages.AddToolVersion("Cargo-audit", $(Get-Cargoaudit)) +$rustPackages.AddToolVersion("Cargo-outdated", $(Get-Cargooutdated)) +$rustPackages.AddToolVersion("Cbindgen", $(Get-Cbindgen)) +$rustPackages.AddToolVersion("Clippy", $(Get-RustClippyVersion)) +$rustPackages.AddToolVersion("Rustfmt", $(Get-RustfmtVersion)) # PowerShell -$powerShell = $installedSoftware.AddHeaderNode("PowerShell Tools") -$powerShell.AddToolNode("PowerShell", $(Get-PowershellVersion)) +$powerShell = $installedSoftware.AddHeader("PowerShell Tools") +$powerShell.AddToolVersion("PowerShell", $(Get-PowershellVersion)) -$powerShellModules = $powerShell.AddHeaderNode("PowerShell Modules") +$powerShellModules = $powerShell.AddHeader("PowerShell Modules") $powerShellModules.AddNodes($(Get-PowerShellModules)) # Web Servers -$webServers = $installedSoftware.AddHeaderNode("Web Servers") -$webServers.AddTableNode($(Build-WebServersSection)) +$webServers = $installedSoftware.AddHeader("Web Servers") +$webServers.AddTable($(Build-WebServersSection)) # Xamarin section -$xamarin = $installedSoftware.AddHeaderNode("Xamarin") -$vsForMac = $xamarin.AddHeaderNode("Visual Studio for Mac") -$vsForMac.AddTableNode($(Build-VSMacTable)) +$xamarin = $installedSoftware.AddHeader("Xamarin") +$vsForMac = $xamarin.AddHeader("Visual Studio for Mac") +$vsForMac.AddTable($(Build-VSMacTable)) if (-not $os.IsCatalina) { $note = @@ -211,60 +211,60 @@ To use Visual Studio 2019 by default rename the app: mv "/Applications/Visual Studio.app" "/Applications/Visual Studio 2022.app" mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" '@ - $vsForMacNotes = $vsForMac.AddHeaderNode("Notes") - $vsForMacNotes.AddNoteNode($note) + $vsForMacNotes = $vsForMac.AddHeader("Notes") + $vsForMacNotes.AddNote($note) } -$xamarinBundles = $xamarin.AddHeaderNode("Xamarin bundles") -$xamarinBundles.AddTableNode($(Build-XamarinTable)) +$xamarinBundles = $xamarin.AddHeader("Xamarin bundles") +$xamarinBundles.AddTable($(Build-XamarinTable)) -$unitTestFramework = $xamarin.AddHeaderNode("Unit Test Framework") -$unitTestFramework.AddToolNode("NUnit", $(Get-NUnitVersion)) +$unitTestFramework = $xamarin.AddHeader("Unit Test Framework") +$unitTestFramework.AddToolVersion("NUnit", $(Get-NUnitVersion)) # Xcode section -$xcode = $installedSoftware.AddHeaderNode("Xcode") +$xcode = $installedSoftware.AddHeader("Xcode") # First run doesn't provide full data about devices and runtimes Get-XcodeInfoList | Out-Null $xcodeInfo = Get-XcodeInfoList -$xcode.AddTableNode($(Build-XcodeTable $xcodeInfo)) +$xcode.AddTable($(Build-XcodeTable $xcodeInfo)) -$xcodeTools = $xcode.AddHeaderNode("Xcode Support Tools") +$xcodeTools = $xcode.AddHeader("Xcode Support Tools") $xcodeTools.AddNodes($(Build-XcodeSupportToolsSection)) -$installedSdks = $xcode.AddHeaderNode("Installed SDKs") -$installedSdks.AddTableNode($(Build-XcodeSDKTable $xcodeInfo)) +$installedSdks = $xcode.AddHeader("Installed SDKs") +$installedSdks.AddTable($(Build-XcodeSDKTable $xcodeInfo)) -$installedSimulators = $xcode.AddHeaderNode("Installed Simulators") -$installedSimulators.AddTableNode($(Build-XcodeSimulatorsTable $xcodeInfo)) +$installedSimulators = $xcode.AddHeader("Installed Simulators") +$installedSimulators.AddTable($(Build-XcodeSimulatorsTable $xcodeInfo)) # Android section -$android = $installedSoftware.AddHeaderNode("Android") +$android = $installedSoftware.AddHeader("Android") $androidTable = Build-AndroidTable if ($os.IsCatalina) { $androidTable += Get-IntelHaxmVersion } -$android.AddTableNode($androidTable) +$android.AddTable($androidTable) -$androidEnv = $android.AddHeaderNode("Environment variables") -$androidEnv.AddTableNode($(Build-AndroidEnvironmentTable)) +$androidEnv = $android.AddHeader("Environment variables") +$androidEnv.AddTable($(Build-AndroidEnvironmentTable)) -$miscellaneous = $installedSoftware.AddHeaderNode("Miscellaneous") -$miscellaneous.AddToolNode("libXext", $(Get-LibXextVersion)) -$miscellaneous.AddToolNode("libXft", $(Get-LibXftVersion)) -$miscellaneous.AddToolNode("Tcl/Tk", $(Get-TclTkVersion)) -$miscellaneous.AddToolNode("Zlib", $(Get-ZlibVersion)) +$miscellaneous = $installedSoftware.AddHeader("Miscellaneous") +$miscellaneous.AddToolVersion("libXext", $(Get-LibXextVersion)) +$miscellaneous.AddToolVersion("libXft", $(Get-LibXftVersion)) +$miscellaneous.AddToolVersion("Tcl/Tk", $(Get-TclTkVersion)) +$miscellaneous.AddToolVersion("Zlib", $(Get-ZlibVersion)) if ($os.IsMonterey) { - $miscellaneousEnv = $miscellaneous.AddHeaderNode("Environment variables") - $miscellaneousEnv.AddTableNode($(Build-MiscellaneousEnvironmentTable)) + $miscellaneousEnv = $miscellaneous.AddHeader("Environment variables") + $miscellaneousEnv.AddTable($(Build-MiscellaneousEnvironmentTable)) $notes = @' If you want to use Parallels Desktop you should download a package from URL stored in PARALLELS_DMG_URL environment variable. A system extension is allowed for this version. '@ - $miscellaneousEnvNotes = $miscellaneousEnv.AddHeaderNode("Notes") - $miscellaneousEnvNotes.AddNoteNode($notes) + $miscellaneousEnvNotes = $miscellaneousEnv.AddHeader("Notes") + $miscellaneousEnvNotes.AddNote($notes) } # diff --git a/images/macos/software-report/SoftwareReport.Toolcache.psm1 b/images/macos/software-report/SoftwareReport.Toolcache.psm1 index d59f6b579b52..cad7873f23c9 100644 --- a/images/macos/software-report/SoftwareReport.Toolcache.psm1 +++ b/images/macos/software-report/SoftwareReport.Toolcache.psm1 @@ -35,11 +35,11 @@ function Get-ToolcacheGoVersions { function Build-ToolcacheSection { return @( - [ToolVersionsNode]::new("Ruby", $(Get-ToolcacheRubyVersions), '^\d+\.\d+', $false), - [ToolVersionsNode]::new("Python", $(Get-ToolcachePythonVersions), '^\d+\.\d+', $false), - [ToolVersionsNode]::new("PyPy", $(Get-ToolcachePyPyVersions), '^\d+\.\d+', $false), - [ToolVersionsNode]::new("Node.js", $(Get-ToolcacheNodeVersions), '^\d+', $false), - [ToolVersionsNode]::new("Go", $(Get-ToolcacheGoVersions), '^\d+\.\d+', $false) + [ToolVersionsListNode]::new("Ruby", $(Get-ToolcacheRubyVersions), '^\d+\.\d+', $false), + [ToolVersionsListNode]::new("Python", $(Get-ToolcachePythonVersions), '^\d+\.\d+', $false), + [ToolVersionsListNode]::new("PyPy", $(Get-ToolcachePyPyVersions), '^\d+\.\d+', $false), + [ToolVersionsListNode]::new("Node.js", $(Get-ToolcacheNodeVersions), '^\d+', $false), + [ToolVersionsListNode]::new("Go", $(Get-ToolcacheGoVersions), '^\d+\.\d+', $false) ) } @@ -48,6 +48,6 @@ function Get-PowerShellModules { $modules | ForEach-Object { $moduleName = $_ $moduleVersions = Get-Module -Name $moduleName -ListAvailable | Select-Object -ExpandProperty Version | Sort-Object -Unique - return [ToolVersionsNode]::new($moduleName, $moduleVersions, '^\d+', $true) + return [ToolVersionsListNode]::new($moduleName, $moduleVersions, '^\d+', $true) } } \ No newline at end of file diff --git a/images/macos/software-report/SoftwareReport.Xcode.psm1 b/images/macos/software-report/SoftwareReport.Xcode.psm1 index eed571fff9ca..68e61caae733 100644 --- a/images/macos/software-report/SoftwareReport.Xcode.psm1 +++ b/images/macos/software-report/SoftwareReport.Xcode.psm1 @@ -237,8 +237,8 @@ function Build-XcodeSupportToolsSection { $xcpretty = Run-Command "xcpretty --version" $xcversion = Run-Command "xcversion --version" | Select-String "^[0-9]" - $toolNodes += [ToolNode]::new("xcpretty", $xcpretty) - $toolNodes += [ToolNode]::new("xcversion", $xcversion) + $toolNodes += [ToolVersionNode]::new("xcpretty", $xcpretty) + $toolNodes += [ToolVersionNode]::new("xcversion", $xcversion) $nomadOutput = Run-Command "gem list nomad-cli" $nomadCLI = [regex]::matches($nomadOutput, "(\d+.){2}\d+").Value @@ -246,8 +246,8 @@ function Build-XcodeSupportToolsSection { $nomadShenzhen = [regex]::matches($nomadShenzhenOutput, "(\d+.){2}\d+").Value if ($os.IsLessThanMonterey) { - $toolNodes += [ToolNode]::new("Nomad CLI", $nomadCLI) - $toolNodes += [ToolNode]::new("Nomad shenzhen CLI", $nomadShenzhen) + $toolNodes += [ToolVersionNode]::new("Nomad CLI", $nomadCLI) + $toolNodes += [ToolVersionNode]::new("Nomad shenzhen CLI", $nomadShenzhen) } return $toolNodes From 257743a26d3906f6a566e258eb95e257096356ce Mon Sep 17 00:00:00 2001 From: Maxim Lobanov <maxim-lobanov@github.com> Date: Wed, 14 Dec 2022 19:53:32 +0100 Subject: [PATCH 1638/3485] [Windows] Minor documentation improvements (#6751) --- .../SoftwareReport.CachedTools.psm1 | 99 ++++++--------- .../SoftwareReport/SoftwareReport.Common.psm1 | 117 ++++++++---------- .../SoftwareReport.Generator.ps1 | 54 +++----- .../SoftwareReport/SoftwareReport.Tools.psm1 | 5 +- images/win/scripts/Tests/Tools.Tests.ps1 | 4 +- 5 files changed, 106 insertions(+), 173 deletions(-) diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.CachedTools.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.CachedTools.psm1 index 90ba58015d81..47374c111c59 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.CachedTools.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.CachedTools.psm1 @@ -1,80 +1,51 @@ -function Get-GoMarkdown -{ - $Name = "Go" - $ToolInstances = Get-CachedToolInstances -Name $Name -VersionCommand "version" - foreach ($Instance in $ToolInstances) - { - $Version = [System.Version]($Instance.Version -Split(" "))[0] - $Instance."Environment Variable" = "GOROOT_$($Version.major)_$($Version.minor)_X64" - } - - $Content = $ToolInstances | New-MDTable -Columns ([ordered]@{ - Version = "left"; - Architecture = "left"; - "Environment Variable" = "left" - }) - - return Build-MarkdownElement -Head $Name -Content $Content +function Get-ToolcacheGoVersions { + $toolcachePath = Join-Path $env:AGENT_TOOLSDIRECTORY "Go" + return Get-ChildItem $toolcachePath -Name | Sort-Object { [Version]$_ } } -function Get-NodeMarkdown -{ - $Name = "Node" - $ToolInstances = Get-CachedToolInstances -Name $Name - $Content = $ToolInstances | New-MDTable -Columns ([ordered]@{Version = "left"; Architecture = "left"}) +function Get-ToolcacheNodeVersions { + $toolcachePath = Join-Path $env:AGENT_TOOLSDIRECTORY "Node" + return Get-ChildItem $toolcachePath -Name | Sort-Object { [Version]$_ } +} - return Build-MarkdownElement -Head $Name -Content $Content +function Get-ToolcachePythonVersions { + $toolcachePath = Join-Path $env:AGENT_TOOLSDIRECTORY "Python" + return Get-ChildItem $toolcachePath -Name | Sort-Object { [Version]$_ } } -function Get-PythonMarkdown -{ - $Name = "Python" - $ToolInstances = Get-CachedToolInstances -Name $Name -VersionCommand "--version" - $Content = $ToolInstances | New-MDTable -Columns ([ordered]@{Version = "left"; Architecture = "left"}) +function Get-ToolcacheRubyVersions { + $toolcachePath = Join-Path $env:AGENT_TOOLSDIRECTORY "Ruby" + return Get-ChildItem $toolcachePath -Name | Sort-Object { [Version]$_ } +} - return Build-MarkdownElement -Head $Name -Content $Content +function Get-ToolcachePyPyVersions { + $toolcachePath = Join-Path $env:AGENT_TOOLSDIRECTORY "PyPy" + Get-ChildItem -Path $toolcachePath -Name | Sort-Object { [Version] $_ } | ForEach-Object { + $pypyRootPath = Join-Path $toolcachePath $_ "x86" + [string]$pypyVersionOutput = & "$pypyRootPath\python.exe" -c "import sys;print(sys.version)" + $pypyVersionOutput -match "^([\d\.]+) \(.+\) \[PyPy ([\d\.]+\S*) .+]$" | Out-Null + return "{0} [PyPy {1}]" -f $Matches[1], $Matches[2] + } } -function Get-RubyMarkdown +function Build-CachedToolsSection { - $Name = "Ruby" - $ToolInstances = Get-CachedToolInstances -Name $Name -VersionCommand "--version" - $Content = $ToolInstances | New-MDTable -Columns ([ordered]@{Version = "left"; Architecture = "left"}) + $output = "" - return Build-MarkdownElement -Head $Name -Content $Content -} + $output += New-MDHeader "Go" -Level 4 + $output += New-MDList -Lines (Get-ToolcacheGoVersions) -Style Unordered -function Get-PyPyMarkdown -{ - $Name = "PyPy" - $ToolInstances = Get-CachedToolInstances -Name $Name - foreach ($Instance in $ToolInstances) - { - $Instance."PyPy Version" = @() - $Instance."Python Version" = $Instance.Version - foreach ($Arch in $Instance.Architecture_Array) - { - $pythonExePath = Join-Path $Instance.Path $Arch | Join-Path -ChildPath "python.exe" - $Instance."PyPy Version" += (& $pythonExePath -c "import sys;print(sys.version.split('\n')[1])").Trim("[]") - } - } + $output += New-MDHeader "Node.js" -Level 4 + $output += New-MDList -Lines (Get-ToolcacheNodeVersions) -Style Unordered - $Content = $ToolInstances | New-MDTable -Columns ([ordered]@{ - "Python Version" = "left"; - "PyPy Version" = "left" - }) + $output += New-MDHeader "Python" -Level 4 + $output += New-MDList -Lines (Get-ToolcachePythonVersions) -Style Unordered - return Build-MarkdownElement -Head $Name -Content $Content -} + $output += New-MDHeader "PyPy" -Level 4 + $output += New-MDList -Lines (Get-ToolcachePyPyVersions) -Style Unordered -function Build-CachedToolsMarkdown -{ - $markdown = "" - $markdown += Get-GoMarkdown - $markdown += Get-NodeMarkdown - $markdown += Get-PythonMarkdown - $markdown += Get-RubyMarkdown - $markdown += Get-PyPyMarkdown + $output += New-MDHeader "Ruby" -Level 4 + $output += New-MDList -Lines (Get-ToolcacheRubyVersions) -Style Unordered - return $markdown + return $output } diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 index 1c36a9844e19..37bb9df1b9fd 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 @@ -5,7 +5,7 @@ function Initialize-RustEnvironment { } function Get-OSName { - return (Get-CimInstance -ClassName Win32_OperatingSystem).Caption + return (Get-CimInstance -ClassName Win32_OperatingSystem).Caption | Take-Part -Part 1,2,3 } function Get-OSVersion { @@ -124,7 +124,7 @@ function Get-ChocoVersion { function Get-VcpkgVersion { $commitId = git -C "C:\vcpkg" rev-parse --short HEAD - return "Vcpkg (build from master \<$commitId>)" + return "Vcpkg (build from commit $commitId)" } function Get-NPMVersion { @@ -190,7 +190,7 @@ function Get-SbtVersion { function Get-DotnetSdks { $sdksRawList = dotnet --list-sdks - $sdkVersions = ($sdksRawList | Foreach-Object {$_.Split()[0]}) -join ' ' + $sdkVersions = ($sdksRawList | Foreach-Object {$_.Split()[0]}) -join ', ' $sdkPath = $sdksRawList[0].Split(' ', 2)[1] -replace '\[|]' [PSCustomObject]@{ Versions = $sdkVersions @@ -214,7 +214,7 @@ function Get-DotnetRuntimes { $runtimesRawList = dotnet --list-runtimes $runtimesRawList | Group-Object {$_.Split()[0]} | ForEach-Object { $runtimeName = $_.Name - $runtimeVersions = ($_.Group | Foreach-Object {$_.split()[1]}) -join ' ' + $runtimeVersions = ($_.Group | Foreach-Object {$_.split()[1]}) -join ', ' $runtimePath = $_.Group[0].Split(' ', 3)[2] -replace '\[|]' [PSCustomObject]@{ "Runtime" = $runtimeName @@ -224,68 +224,61 @@ function Get-DotnetRuntimes { } } -function Get-DotnetFrameworkTools { - $path = "${env:ProgramFiles(x86)}\Microsoft SDKs\Windows\*\*\NETFX*" - Get-ChildItem -Path $path -Directory | Group-Object { - $_.Fullname -Replace " \d+\.\d+(\.\d+)?", " <version>" - } | ForEach-Object { - [PSCustomObject]@{ - Versions = $_.Group.Name | ForEach-Object { $_.Split(" ")[1] } - Path = $_.Name - } - } +function Get-DotnetFrameworkVersions { + $path = "${env:ProgramFiles(x86)}\Microsoft SDKs\Windows\*\*\NETFX * Tools" + $versions = Get-ChildItem -Path $path -Directory | ForEach-Object { $_.Name | Take-Part -Part 1 } + $versions -join ', ' } function Get-PowerShellAzureModules { - # Module names - $names = @{ - 'az' = 'Az' - 'azurerm' = 'AzureRM' - 'azure' = 'Azure' + [Array] $result = @() + $defaultAzureModuleVersion = "2.1.0" + + [Array] $azInstalledModules = Get-ChildItem -Path "C:\Modules\az_*" -Directory | ForEach-Object { $_.Name.Split("_")[1] } + if ($azInstalledModules.Count -gt 0) { + $result += "Az: $($azInstalledModules -join ', ')" } - # Get default module version - $defaults = @{ - 'azurerm' = (Get-Module -Name AzureRM -ListAvailable).Version - 'azure' = (Get-Module -Name Azure -ListAvailable).Version + [Array] $azureInstalledModules = Get-ChildItem -Path "C:\Modules\azure_*" -Directory | ForEach-Object { $_.Name.Split("_")[1] } | ForEach-Object { if ($_ -eq $defaultAzureModuleVersion) { "$($_) (Default)" } else { $_ } } + if ($azureInstalledModules.Count -gt 0) { + $result += "Azure: $($azureInstalledModules -join ', ')" } - $modulesPath = "C:\Modules" - $modules = Get-ChildItem -Path $modulesPath | Sort-Object Name | Group-Object {$_.Name.Split('_')[0]} - $modules | ForEach-Object { - $group = $_.group | Sort-Object {[Version]$_.Name.Split('_')[1].Replace(".zip","")} - $moduleName = $names[$_.Name] - $moduleVersions = $group | ForEach-Object {$_.Name.Split('_')[1]} - $moduleVersions = $moduleVersions -join '<br>' - $modulePath = (($group.FullName).Split("_"))[0] + '_\<version\>' - - # set default version - $defaultVersion = $defaults[$_.Name] - if ($defaultVersion) { - $moduleVersions = $moduleVersions.Replace($defaultVersion, "$defaultVersion [Installed]") - } + [Array] $azurermInstalledModules = Get-ChildItem -Path "C:\Modules\azurerm_*" -Directory | ForEach-Object { $_.Name.Split("_")[1] } | ForEach-Object { if ($_ -eq $defaultAzureModuleVersion) { "$($_) (Default)" } else { $_ } } + if ($azurermInstalledModules.Count -gt 0) { + $result += "AzureRM: $($azurermInstalledModules -join ', ')" + } - [PSCustomObject]@{ - Module = $moduleName - Version = $moduleVersions - Path = $modulePath - } + [Array] $azCachedModules = Get-ChildItem -Path "C:\Modules\az_*.zip" -File | ForEach-Object { $_.Name.Split("_")[1] } + if ($azCachedModules.Count -gt 0) { + $result += "Az (Cached): $($azCachedModules -join ', ')" + } + + [Array] $azureCachedModules = Get-ChildItem -Path "C:\Modules\azure_*.zip" -File | ForEach-Object { $_.Name.Split("_")[1] } + if ($azureCachedModules.Count -gt 0) { + $result += "Azure (Cached): $($azureCachedModules -join ', ')" + } + + [Array] $azurermCachedModules = Get-ChildItem -Path "C:\Modules\azurerm_*.zip" -File | ForEach-Object { $_.Name.Split("_")[1] } + if ($azurermCachedModules.Count -gt 0) { + $result += "AzureRM: $($azurermCachedModules -join ', ')" } + + return $result } function Get-PowerShellModules { - $modules = (Get-ToolsetContent).powershellModules.name + [Array] $result = @() - $psModules = Get-Module -Name $modules -ListAvailable | Sort-Object Name | Group-Object Name - $psModules | ForEach-Object { - $moduleName = $_.Name - $moduleVersions = ($_.group.Version | Sort-Object -Unique) -join '<br>' + $result += Get-PowerShellAzureModules - [PSCustomObject]@{ - Module = $moduleName - Version = $moduleVersions - } + $result += (Get-ToolsetContent).powershellModules.name | Sort-Object | ForEach-Object { + $moduleName = $_ + $moduleVersions = Get-Module -Name $moduleName -ListAvailable | Select-Object -ExpandProperty Version | Sort-Object -Unique + return "$($moduleName): $($moduleVersions -join ', ')" } + + return $result } function Get-CachedDockerImages { @@ -343,24 +336,14 @@ function Get-PipxVersion { } function Build-PackageManagementEnvironmentTable { - $envVariables = @( - @{ + return @( + [PSCustomObject] @{ "Name" = "VCPKG_INSTALLATION_ROOT" "Value" = $env:VCPKG_INSTALLATION_ROOT - } - ) - if (Test-IsWin19) { - $envVariables += @( - @{ - "Name" = "CONDA" - "Value" = $env:CONDA - } - ) - } - return $envVariables | ForEach-Object { + }, [PSCustomObject] @{ - "Name" = $_.Name - "Value" = $_.Value + "Name" = "CONDA" + "Value" = $env:CONDA } - } + ) } diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index 7d5138d3d74c..806323d9e676 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -26,9 +26,9 @@ $markdown += New-MDList -Style Unordered -Lines @( "Image Version: $env:IMAGE_VERSION" ) -$markdown += New-MDHeader "Enabled windows optional features" -Level 2 +$markdown += New-MDHeader "Windows features" -Level 2 $markdown += New-MDList -Style Unordered -Lines @( - "Windows Subsystem for Linux [WSLv1]" + "Windows Subsystem for Linux (WSLv1): Enabled" ) $markdown += New-MDHeader "Installed Software" -Level 2 @@ -165,7 +165,7 @@ $markdown += New-MDList -Style Unordered -Lines (@( ) | Sort-Object ) -$markdown += New-MDHeader "Browsers and webdrivers" -Level 3 +$markdown += New-MDHeader "Browsers and Drivers" -Level 3 $markdown += New-MDList -Style Unordered -Lines @( (Get-BrowserVersion -Browser "chrome"), (Get-SeleniumWebDriverVersion -Driver "chrome"), @@ -208,7 +208,7 @@ if (Test-IsWin19) } $markdown += New-MDHeader "Cached Tools" -Level 3 -$markdown += (Build-CachedToolsMarkdown) +$markdown += (Build-CachedToolsSection) $markdown += New-MDHeader "Databases" -Level 3 $markdown += Build-DatabasesMarkdown @@ -241,46 +241,29 @@ $markdown += New-MDNewLine $markdown += New-MDHeader "Installed Windows SDKs" -Level 4 $sdk = Get-WindowsSDKs -$markdown += "``Location $($sdk.Path)``" $markdown += New-MDNewLine $markdown += New-MDList -Lines $sdk.Versions -Style Unordered -$markdown += New-MDHeader ".NET Core SDK" -Level 3 -$sdk = Get-DotnetSdks -$markdown += "``Location $($sdk.Path)``" -$markdown += New-MDNewLine -$markdown += New-MDList -Lines $sdk.Versions -Style Unordered - -$markdown += New-MDHeader ".NET Core Runtime" -Level 3 -Get-DotnetRuntimes | Foreach-Object { - $path = $_.Path - $versions = $_.Versions - $markdown += "``Location: $path``" - $markdown += New-MDNewLine - $markdown += New-MDList -Lines $versions -Style Unordered -} - -$markdown += New-MDHeader ".NET Framework" -Level 3 -$markdown += "``Type: Developer Pack``" -$markdown += New-MDNewLine -Get-DotnetFrameworkTools | Foreach-Object { - $path = $_.Path - $versions = $_.Versions - $markdown += "``Location: $path``" - $markdown += New-MDNewLine - $markdown += New-MDList -Lines $versions -Style Unordered +$markdown += New-MDHeader ".NET Core Tools" -Level 3 +$dotnetSdk = Get-DotnetSdks +$dotnetFrameworkVersions = Get-DotnetFrameworkVersions +$dotnetTools = @( + ".NET Core SDK: $($dotnetSdk.Versions)", + ".NET Framework: $($dotnetFrameworkVersions)" +) +$dotnetTools += Get-DotnetRuntimes | ForEach-Object { + "$($_.Runtime): $($_.Versions)" } +$dotnetTools += Get-DotnetTools +$markdown += New-MDList -Style Unordered -Lines $dotnetTools -$markdown += New-MDHeader ".NET tools" -Level 3 -$tools = Get-DotnetTools -$markdown += New-MDList -Lines $tools -Style Unordered # PowerShell Tools $markdown += New-MDHeader "PowerShell Tools" -Level 3 $markdown += New-MDList -Lines (Get-PowershellCoreVersion) -Style Unordered -$markdown += New-MDHeader "Azure Powershell Modules" -Level 4 -$markdown += Get-PowerShellAzureModules | New-MDTable +$markdown += New-MDHeader "Powershell Modules" -Level 4 +$markdown += New-MDList -Lines $(Get-PowerShellModules) -Style Unordered $reportAzPwsh = @' ``` Azure PowerShell module 2.1.0 and AzureRM PowerShell module 2.1.0 are installed @@ -290,9 +273,6 @@ All other versions are saved but not installed. '@ $markdown += New-MDParagraph -Lines $reportAzPwsh -$markdown += New-MDHeader "Powershell Modules" -Level 4 -$markdown += Get-PowerShellModules | New-MDTable -$markdown += New-MDNewLine # Android section $markdown += New-MDHeader "Android" -Level 3 diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 index f48041bf3cba..1267428de232 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 @@ -126,7 +126,7 @@ function Get-MercurialVersion { function Get-NSISVersion { $nsisVersion = &"c:\Program Files (x86)\NSIS\makensis.exe" "/Version" - return "NSIS $nsisVersion" + return "NSIS $($nsisVersion.TrimStart('v'))" } function Get-OpenSSLVersion { @@ -148,7 +148,8 @@ function Get-ParcelVersion { } function Get-PulumiVersion { - return "Pulumi $(pulumi version)" + $pulumiVersion = $(pulumi version) + return "Pulumi $($pulumiVersion.TrimStart('v'))" } function Get-SQLPSVersion { diff --git a/images/win/scripts/Tests/Tools.Tests.ps1 b/images/win/scripts/Tests/Tools.Tests.ps1 index 1c899066a7f5..f25ecfde19fc 100644 --- a/images/win/scripts/Tests/Tools.Tests.ps1 +++ b/images/win/scripts/Tests/Tools.Tests.ps1 @@ -1,5 +1,3 @@ -Import-Module (Join-Path $PSScriptRoot "..\SoftwareReport\SoftwareReport.Common.psm1") -DisableNameChecking - Describe "Azure Cosmos DB Emulator" { $cosmosDbEmulatorRegKey = Get-ChildItem "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\*" | Get-ItemProperty | Where-Object { $_.DisplayName -eq 'Azure Cosmos DB Emulator' } $installDir = $cosmosDbEmulatorRegKey.InstallLocation @@ -103,7 +101,7 @@ Describe "GoogleCloudSDK" -Skip:(Test-IsWin22) { Describe "NET48" { It "NET48" { - (Get-DotnetFrameworkTools).Versions | Should -Contain "4.8" + Get-ChildItem -Path "${env:ProgramFiles(x86)}\Microsoft SDKs\Windows\*\*\NETFX 4.8 Tools" -Directory | Should -HaveCount 1 } } From 3334c52558f27340b4702352a31693bbdb3f5330 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Wed, 14 Dec 2022 23:10:59 +0100 Subject: [PATCH 1639/3485] [Windows] download MySQL from SA (#6769) --- images/win/scripts/Installers/Install-MysqlCli.ps1 | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/images/win/scripts/Installers/Install-MysqlCli.ps1 b/images/win/scripts/Installers/Install-MysqlCli.ps1 index 693883a79f57..5b5c1f0d55fb 100644 --- a/images/win/scripts/Installers/Install-MysqlCli.ps1 +++ b/images/win/scripts/Installers/Install-MysqlCli.ps1 @@ -14,14 +14,14 @@ Install-Binary -Url $InstallerURI -Name $InstallerName -ArgumentList $ArgumentLi [version]$MysqlVersion = (Get-ToolsetContent).mysql.version $MysqlVersionMajorMinor = $MysqlVersion.ToString(2) -if ($MysqlVersion.Build -lt 0) { - $MysqlVersion = (Invoke-RestMethod -Uri "https://dev.mysql.com/downloads/mysql/${MysqlVersionMajorMinor}.html" | - Select-String -Pattern "${MysqlVersionMajorMinor}\.\d+").Matches.Value +# Temporary move to SA as Oracle's site is unavailable +if (Test-IsWin19) { + $MysqlVersionUrl = "https://githubpackercipoolmysql.blob.core.windows.net/mysql/mysql-5.7.40-winx64.zip" + $MysqlVersionFull = "5.7.40" +} elseif (Test-IsWin22) { + $MysqlVersionUrl = "https://githubpackercipoolmysql.blob.core.windows.net/mysql/mysql-8.0.31-winx64.zip" + $MysqlVersionFull = "8.0.31" } - -$MysqlVersionFull = $MysqlVersion.ToString() -$MysqlVersionUrl = "https://dev.mysql.com/get/Downloads/MySQL-${MysqlVersionMajorMinor}/mysql-${MysqlVersionFull}-winx64.zip" - $MysqlArchPath = Start-DownloadWithRetry -Url $MysqlVersionUrl -Name "mysql.zip" # Expand the zip From 55296dc01bcd46b4d7bd9e6a3828efe6286539d3 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 15 Dec 2022 09:20:03 +0000 Subject: [PATCH 1640/3485] Updating readme file for ubuntu22 version 20221212.1 (#6758) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2204-Readme.md | 102 +++++++++++++++--------------- 1 file changed, 52 insertions(+), 50 deletions(-) diff --git a/images/linux/Ubuntu2204-Readme.md b/images/linux/Ubuntu2204-Readme.md index 2f81a8dec087..c07143774de1 100644 --- a/images/linux/Ubuntu2204-Readme.md +++ b/images/linux/Ubuntu2204-Readme.md @@ -5,7 +5,7 @@ *** # Ubuntu 22.04.1 LTS - Linux kernel version: 5.15.0-1024-azure -- Image Version: 20221204.2 +- Image Version: 20221212.1 ## Installed Software ### Language and Runtime @@ -15,7 +15,7 @@ - Clang-tidy 12.0.1, 13.0.1, 14.0.0 - Dash 0.5.11+git20210903+057cd650a4ed-3build1 - GNU C++ 9.5.0, 10.4.0, 11.3.0, 12.1.0 -- GNU Fortran 9.5.0, 10.4.0, 11.3.0 +- GNU Fortran 9.5.0, 10.4.0, 11.3.0, 12.1.0 - Julia 1.8.3 - Kotlin 1.7.22-release-288 - Mono 6.12.0.182 (apt source repository: https://download.mono-project.com/repo/ubuntu stable-focal main) @@ -30,7 +30,7 @@ ### Package Management - cpan 1.64 - Helm 3.10.2 -- Homebrew 3.6.13 +- Homebrew 3.6.15 - Miniconda 4.12.0 - Npm 8.19.2 - NuGet 6.3.1.1 @@ -38,7 +38,7 @@ - Pip3 22.0.2 - Pipx 1.1.0 - RubyGems 3.3.5 -- Vcpkg (build from master \<163fe7bd3>) +- Vcpkg (build from master \<796213014>) - Yarn 1.22.19 ##### Notes: @@ -59,32 +59,32 @@ to accomplish this. - Lerna 6.1.0 ### Tools -- Ansible 2.14.0 +- Ansible 2.14.1 - apt-fast 1.9.12 - AzCopy 10.16.2 (available by `azcopy` and `azcopy10` aliases) - Bazel 5.3.2 - Bazelisk 1.13.2 -- Bicep 0.12.40 +- Bicep 0.13.1 - Buildah 1.23.1 - CMake 3.25.1 -- CodeQL Action Bundle 2.11.4 +- CodeQL Action Bundle 2.11.5 - Docker Amazon ECR Credential Helper 0.6.0 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.12.2+azure-1 +- Docker Compose v2 2.14.0+azure-1 - Docker-Buildx 0.9.1 -- Docker-Moby Client 20.10.21+azure-1 -- Docker-Moby Server 20.10.21+azure-1 +- Docker-Moby Client 20.10.21+azure-2 +- Docker-Moby Server 20.10.21+azure-2 - Fastlane 2.211.0 -- Git 2.38.1 (apt source repository: ppa:git-core/ppa) +- Git 2.38.2 (apt source repository: ppa:git-core/ppa) - Git LFS 3.3.0 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.6.0 - Haveged 1.9.14 - Heroku 7.67.1 - jq 1.6 - Kind 0.17.0 -- Kubectl 1.25.4 +- Kubectl 1.26.0 - Kustomize 4.5.7 -- Leiningen 2.9.10 +- Leiningen 2.10.0 - MediaInfo 21.09 - Mercurial 6.1.1 - Minikube 1.28.0 @@ -93,9 +93,9 @@ to accomplish this. - nvm 0.39.2 - OpenSSL 3.0.2-0ubuntu1.7 - Packer 1.8.4 -- Parcel 2.8.0 +- Parcel 2.8.1 - Podman 3.4.4 -- Pulumi 3.48.0 +- Pulumi 3.49.0 - R 4.2.2 - Skopeo 1.4.1 - Sphinx Open Source Search Server 2.2.11 @@ -107,18 +107,18 @@ to accomplish this. ### CLI Tools - Alibaba Cloud CLI 3.0.140 -- AWS CLI 2.9.4 +- AWS CLI 2.9.6 - AWS CLI Session manager plugin 1.2.398.0 - AWS SAM CLI 1.66.0 -- Azure CLI (azure-cli) 2.42.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) +- Azure CLI (azure-cli) 2.43.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.25.0 - GitHub CLI 2.20.2 -- Google Cloud SDK 410.0.0 (apt source repository: https://packages.cloud.google.com/apt) +- Google Cloud SDK 411.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 12.2.8 -- OpenShift CLI 4.11.17 +- Netlify CLI 12.2.10 +- OpenShift CLI 4.11.18 - ORAS CLI 0.16.0 -- Vercel CLI 28.7.2 +- Vercel CLI 28.8.0 ### Java | Version | Vendor | Environment Variable | @@ -162,13 +162,13 @@ to accomplish this. - Rustfmt 1.5.1 ### Browsers and Drivers -- Google Chrome 108.0.5359.94 +- Google Chrome 108.0.5359.98 - ChromeDriver 108.0.5359.71 - Chromium 108.0.5341.0 -- Microsoft Edge 107.0.1418.62 (apt source repository: https://packages.microsoft.com/repos/edge) -- Microsoft Edge WebDriver 107.0.1418.62 +- Microsoft Edge 108.0.1462.46 (apt source repository: https://packages.microsoft.com/repos/edge) +- Microsoft Edge WebDriver 108.0.1462.46 - Selenium server 4.7.0 -- Mozilla Firefox 107.0.1 (apt source repository: ppa:mozillateam/ppa) +- Mozilla Firefox 108.0 (apt source repository: ppa:mozillateam/ppa) - Geckodriver 0.32.0 #### Environment variables @@ -209,8 +209,8 @@ to accomplish this. ### Cached Tools #### Go - 1.17.13 -- 1.18.8 -- 1.19.3 +- 1.18.9 +- 1.19.4 #### Node.js - 14.21.1 @@ -219,15 +219,15 @@ to accomplish this. #### PyPy - 3.7.13 [PyPy 7.3.9] -- 3.8.13 [PyPy 7.3.9] -- 3.9.12 [PyPy 7.3.9] +- 3.8.15 [PyPy 7.3.10] +- 3.9.15 [PyPy 7.3.10] #### Python - 3.7.15 - 3.8.15 -- 3.9.15 -- 3.10.8 -- 3.11.0 +- 3.9.16 +- 3.10.9 +- 3.11.1 #### Ruby - 3.1.3 @@ -236,8 +236,8 @@ to accomplish this. | Name | Value | Architecture | | --------------- | ----------------------------------- | ------------ | | GOROOT_1_17_X64 | /opt/hostedtoolcache/go/1.17.13/x64 | x64 | -| GOROOT_1_18_X64 | /opt/hostedtoolcache/go/1.18.8/x64 | x64 | -| GOROOT_1_19_X64 | /opt/hostedtoolcache/go/1.19.3/x64 | x64 | +| GOROOT_1_18_X64 | /opt/hostedtoolcache/go/1.18.9/x64 | x64 | +| GOROOT_1_19_X64 | /opt/hostedtoolcache/go/1.19.4/x64 | x64 | ### PowerShell Tools - PowerShell 7.2.7 @@ -291,20 +291,20 @@ to accomplish this. | alpine:3.14 | sha256:4c869a63e1b7c0722fed1e402a6466610327c3b83bdddb94bd94fb71da7f638a | 2022-08-09 | | alpine:3.15 | sha256:cf34c62ee8eb3fe8aa24c1fab45d7e9d12768d945c3f5a6fd6a63d901e898479 | 2022-08-09 | | alpine:3.16 | sha256:b95359c2505145f16c6aa384f9cc74eeff78eb36d308ca4fd902eeeb0a0b161b | 2022-11-12 | -| buildpack-deps:bullseye | sha256:1a263e69ebf256b5f27165d2eb4e667dadad37f42003d53f5ce699b7e7f1b6dc | 2022-11-15 | -| buildpack-deps:buster | sha256:c0804e4d81620d4fdb4965cc462dbca7d901d68968780ff6c6aeed062309ad50 | 2022-11-15 | -| debian:10 | sha256:6c153b6c1b042fb70140a465e6d7c9c4a6112062afdc843c6a4d9c5bbfe5d0d5 | 2022-11-15 | -| debian:11 | sha256:3066ef83131c678999ce82e8473e8d017345a30f5573ad3e44f62e5c9c46442b | 2022-11-15 | +| buildpack-deps:bullseye | sha256:ea5e7737f282e76b594669926ee6222beee0c237b9ba19a2055aa8f4feb83ba2 | 2022-12-06 | +| buildpack-deps:buster | sha256:ecb6bd2c510b37b0bcbfaaa043192c293bfba2d9a0f4402abab6a342f186eebc | 2022-12-06 | +| debian:10 | sha256:e6fb8b88b411285ac71590459aa8d0a376acc86a3d17adfe45e806f522c54cc3 | 2022-12-06 | +| debian:11 | sha256:a288aa7ad0e4d443e86843972c25a02f99e9ad6ee589dd764895b2c3f5a8340b | 2022-12-06 | | moby/buildkit:latest | sha256:77abd86c9422aaff294bfde1029f03a6ab18ece0105003637cfda1d7fc22299f | 2022-11-10 | -| node:14 | sha256:d82d512aec5de4fac53b92b2aa148948c2e72264d650de9e1570283d4f503dbe | 2022-11-15 | -| node:14-alpine | sha256:12b14bdfa8c89a1a060c53b5714157085700660b12ab7c50a907a4e19d95b6bf | 2022-11-12 | -| node:16 | sha256:68fc9f749931453d5c8545521b021dd97267e0692471ce15bdec0814ed1f8fc3 | 2022-11-15 | -| node:16-alpine | sha256:15dd66f723aab8b367abc7ac6ed25594ca4653f2ce49ad1505bfbe740ad5190e | 2022-11-12 | -| node:18 | sha256:c47a2c61e635eb4938fcd56a1139b552300624b53e3eca06b5554a577f1842cf | 2022-11-15 | -| node:18-alpine | sha256:9eff44230b2fdcca57a73b8f908c8029e72d24dd05cac5339c79d3dedf6b208b | 2022-11-12 | -| ubuntu:18.04 | sha256:ca70a834041dd1bf16cc38dfcd24f0888ec4fa431e09f3344f354cf8d1724499 | 2022-10-25 | -| ubuntu:20.04 | sha256:450e066588f42ebe1551f3b1a535034b6aa46cd936fe7f2c6b0d72997ec61dbd | 2022-10-25 | -| ubuntu:22.04 | sha256:4b1d0c4a2d2aaf63b37111f34eb9fa89fa1bf53dd6e4ca954d47caebca4005c2 | 2022-11-02 | +| node:14 | sha256:f11e8dbf2ff6668927aafd90a804bf6597d8fe53dc16742a234045f7bf647a8c | 2022-12-06 | +| node:14-alpine | sha256:99360847bb6fddff4652433355ad1f3072ff734a3d9c103bb8b26cfa0e2b7046 | 2022-12-12 | +| node:16 | sha256:7f404d09ceb780c51f4fac7592c46b8f21211474aacce25389eb0df06aaa7472 | 2022-12-06 | +| node:16-alpine | sha256:3265e41b5007254a593a1c3ff8b9b5ea9b943d63a1360a7d8d7d29b33a46a01f | 2022-12-12 | +| node:18 | sha256:9ebe9845301ca70e879f22180dfff496b856bb5f2ec52397462a9f5f903ee654 | 2022-12-06 | +| node:18-alpine | sha256:62a6ce21599b3183272e71527c9ce9fae9435195052d358f481eb3d69d3dc6f3 | 2022-12-12 | +| ubuntu:18.04 | sha256:daf3e62183e8aa9a56878a685ed26f3af3dd8c08c8fd11ef1c167a1aa9bd66a3 | 2022-12-09 | +| ubuntu:20.04 | sha256:0e0402cd13f68137edb0266e1d2c682f217814420f2d43d300ed8f65479b14fb | 2022-12-09 | +| ubuntu:22.04 | sha256:27cb6e6ccef575a4698b66f5de06c7ecd61589132d5a91d098f7f3f9285415a9 | 2022-12-09 | ### Installed apt packages | Name | Version | @@ -313,7 +313,7 @@ to accomplish this. | aria2 | 1.36.0-1 | | autoconf | 2.71-2 | | automake | 1:1.16.5-1.3 | -| binutils | 2.38-4ubuntu2 | +| binutils | 2.38-4ubuntu2.1 | | bison | 2:3.8.2+dfsg-1build1 | | brotli | 1.0.9-2build6 | | build-essential | 12.9ubuntu3 | @@ -352,7 +352,9 @@ to accomplish this. | libunwind8 | 1.3.2-2build2 | | libxkbfile-dev | 1:1.1.0-1build3 | | libxss1 | 1:1.2.3-1build2 | +| libyaml-dev | 0.2.2-1build2 | | locales | 2.35-0ubuntu3.1 | +| lz4 | 1.9.3-2build2 | | m4 | 1.4.18-5ubuntu2 | | mediainfo | 22.03-1 | | mercurial | 6.1.1-1ubuntu1 | @@ -382,12 +384,12 @@ to accomplish this. | texinfo | 6.8-4build1 | | time | 1.9-0.1build2 | | tk | 8.6.11+1build2 | -| tzdata | 2022f-0ubuntu0.22.04.1 | +| tzdata | 2022g-0ubuntu0.22.04.1 | | unzip | 6.0-26ubuntu3.1 | | upx | 3.96-3 | | wget | 1.21.2-2ubuntu1 | | xorriso | 1.5.4-2 | -| xvfb | 2:21.1.3-2ubuntu2.3 | +| xvfb | 2:21.1.3-2ubuntu2.4 | | xz-utils | 5.2.5-2ubuntu1 | | zip | 3.0-12build2 | | zsync | 0.6.2-3ubuntu1 | From 6b249254da3f78ee8828c2c5d018127eaaaebf47 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 15 Dec 2022 09:37:39 +0000 Subject: [PATCH 1641/3485] Updating readme file for ubuntu20 version 20221212.2 (#6757) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2004-Readme.md | 107 +++++++++++++++--------------- 1 file changed, 54 insertions(+), 53 deletions(-) diff --git a/images/linux/Ubuntu2004-Readme.md b/images/linux/Ubuntu2004-Readme.md index 6e9e0716bd21..16f239bcab70 100644 --- a/images/linux/Ubuntu2004-Readme.md +++ b/images/linux/Ubuntu2004-Readme.md @@ -5,7 +5,7 @@ *** # Ubuntu 20.04.5 LTS - Linux kernel version: 5.15.0-1023-azure -- Image Version: 20221204.2 +- Image Version: 20221212.2 ## Installed Software ### Language and Runtime @@ -32,7 +32,7 @@ ### Package Management - cpan 1.64 - Helm 3.10.2 -- Homebrew 3.6.13 +- Homebrew 3.6.15 - Miniconda 4.12.0 - Npm 8.19.2 - NuGet 6.3.1.1 @@ -40,7 +40,7 @@ - Pip3 20.0.2 - Pipx 1.1.0 - RubyGems 3.1.2 -- Vcpkg (build from master \<163fe7bd3>) +- Vcpkg (build from master \<796213014>) - Yarn 1.22.19 ##### Notes: @@ -65,23 +65,23 @@ to accomplish this. - Sbt 1.8.0 ### Tools -- Ansible 2.13.6 +- Ansible 2.13.7 - apt-fast 1.9.12 - AzCopy 10.16.2 (available by `azcopy` and `azcopy10` aliases) - Bazel 5.3.2 - Bazelisk 1.13.2 -- Bicep 0.12.40 +- Bicep 0.13.1 - Buildah 1.22.3 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - CMake 3.25.1 -- CodeQL Action Bundle 2.11.4 +- CodeQL Action Bundle 2.11.5 - Docker Amazon ECR Credential Helper 0.6.0 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.12.2+azure-1 +- Docker Compose v2 2.14.0+azure-1 - Docker-Buildx 0.9.1 -- Docker-Moby Client 20.10.21+azure-1 -- Docker-Moby Server 20.10.21+azure-1 +- Docker-Moby Client 20.10.21+azure-2 +- Docker-Moby Server 20.10.21+azure-2 - Fastlane 2.211.0 -- Git 2.38.1 (apt source repository: ppa:git-core/ppa) +- Git 2.38.2 (apt source repository: ppa:git-core/ppa) - Git LFS 3.3.0 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) - Git-ftp 1.6.0 - Haveged 1.9.1 @@ -89,9 +89,9 @@ to accomplish this. - HHVM (HipHop VM) 4.172.0 - jq 1.6 - Kind 0.17.0 -- Kubectl 1.25.4 +- Kubectl 1.26.0 - Kustomize 4.5.7 -- Leiningen 2.9.10 +- Leiningen 2.10.0 - MediaInfo 19.09 - Mercurial 5.3.1 - Minikube 1.28.0 @@ -100,10 +100,10 @@ to accomplish this. - nvm 0.39.2 - OpenSSL 1.1.1f-1ubuntu2.16 - Packer 1.8.4 -- Parcel 2.8.0 +- Parcel 2.8.1 - PhantomJS 2.1.1 - Podman 3.4.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- Pulumi 3.48.0 +- Pulumi 3.49.0 - R 4.2.2 - Skopeo 1.5.0 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) - Sphinx Open Source Search Server 2.2.11 @@ -115,18 +115,18 @@ to accomplish this. ### CLI Tools - Alibaba Cloud CLI 3.0.140 -- AWS CLI 2.9.4 +- AWS CLI 2.9.6 - AWS CLI Session manager plugin 1.2.398.0 - AWS SAM CLI 1.66.0 -- Azure CLI (azure-cli) 2.42.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) +- Azure CLI (azure-cli) 2.43.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) - Azure CLI (azure-devops) 0.25.0 - GitHub CLI 2.20.2 -- Google Cloud SDK 410.0.0 (apt source repository: https://packages.cloud.google.com/apt) +- Google Cloud SDK 411.0.0 (apt source repository: https://packages.cloud.google.com/apt) - Hub CLI 2.14.2 -- Netlify CLI 12.2.8 -- OpenShift CLI 4.11.17 +- Netlify CLI 12.2.10 +- OpenShift CLI 4.11.18 - ORAS CLI 0.16.0 -- Vercel CLI 28.7.2 +- Vercel CLI 28.8.0 ### Java | Version | Vendor | Environment Variable | @@ -141,11 +141,11 @@ to accomplish this. | CE 22.3.0 | GRAALVM_11_ROOT | ### PHP -| Tool | Version | -| -------- | -------------------- | -| PHP | 7.4.33 8.0.26 8.1.13 | -| Composer | 2.4.4 | -| PHPUnit | 8.5.31 | +| Tool | Version | +| -------- | -------------------------- | +| PHP | 7.4.33 8.0.26 8.1.13 8.2.0 | +| Composer | 2.4.4 | +| PHPUnit | 8.5.31 | ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ``` @@ -170,13 +170,13 @@ to accomplish this. - Rustfmt 1.5.1 ### Browsers and Drivers -- Google Chrome 108.0.5359.94 +- Google Chrome 108.0.5359.98 - ChromeDriver 108.0.5359.71 - Chromium 108.0.5341.0 -- Microsoft Edge 107.0.1418.62 (apt source repository: https://packages.microsoft.com/repos/edge) -- Microsoft Edge WebDriver 107.0.1418.62 +- Microsoft Edge 108.0.1462.46 (apt source repository: https://packages.microsoft.com/repos/edge) +- Microsoft Edge WebDriver 108.0.1462.46 - Selenium server 4.7.0 -- Mozilla Firefox 107.0.1 (apt source repository: ppa:mozillateam/ppa) +- Mozilla Firefox 108.0 (apt source repository: ppa:mozillateam/ppa) - Geckodriver 0.32.0 #### Environment variables @@ -218,8 +218,8 @@ to accomplish this. ### Cached Tools #### Go - 1.17.13 -- 1.18.8 -- 1.19.3 +- 1.18.9 +- 1.19.4 #### Node.js - 14.21.1 @@ -227,20 +227,20 @@ to accomplish this. - 18.12.1 #### PyPy -- 2.7.18 [PyPy 7.3.9] +- 2.7.18 [PyPy 7.3.10] - 3.6.12 [PyPy 7.3.3] - 3.7.13 [PyPy 7.3.9] -- 3.8.13 [PyPy 7.3.9] -- 3.9.12 [PyPy 7.3.9] +- 3.8.15 [PyPy 7.3.10] +- 3.9.15 [PyPy 7.3.10] #### Python - 2.7.18 - 3.6.15 - 3.7.15 - 3.8.15 -- 3.9.15 -- 3.10.8 -- 3.11.0 +- 3.9.16 +- 3.10.9 +- 3.11.1 #### Ruby - 2.5.9 @@ -253,8 +253,8 @@ to accomplish this. | Name | Value | Architecture | | --------------- | ----------------------------------- | ------------ | | GOROOT_1_17_X64 | /opt/hostedtoolcache/go/1.17.13/x64 | x64 | -| GOROOT_1_18_X64 | /opt/hostedtoolcache/go/1.18.8/x64 | x64 | -| GOROOT_1_19_X64 | /opt/hostedtoolcache/go/1.19.3/x64 | x64 | +| GOROOT_1_18_X64 | /opt/hostedtoolcache/go/1.18.9/x64 | x64 | +| GOROOT_1_19_X64 | /opt/hostedtoolcache/go/1.19.4/x64 | x64 | ### PowerShell Tools - PowerShell 7.2.7 @@ -309,22 +309,22 @@ to accomplish this. | alpine:3.14 | sha256:4c869a63e1b7c0722fed1e402a6466610327c3b83bdddb94bd94fb71da7f638a | 2022-08-09 | | alpine:3.15 | sha256:cf34c62ee8eb3fe8aa24c1fab45d7e9d12768d945c3f5a6fd6a63d901e898479 | 2022-08-09 | | alpine:3.16 | sha256:b95359c2505145f16c6aa384f9cc74eeff78eb36d308ca4fd902eeeb0a0b161b | 2022-11-12 | -| buildpack-deps:bullseye | sha256:1a263e69ebf256b5f27165d2eb4e667dadad37f42003d53f5ce699b7e7f1b6dc | 2022-11-15 | -| buildpack-deps:buster | sha256:c0804e4d81620d4fdb4965cc462dbca7d901d68968780ff6c6aeed062309ad50 | 2022-11-15 | +| buildpack-deps:bullseye | sha256:ea5e7737f282e76b594669926ee6222beee0c237b9ba19a2055aa8f4feb83ba2 | 2022-12-06 | +| buildpack-deps:buster | sha256:ecb6bd2c510b37b0bcbfaaa043192c293bfba2d9a0f4402abab6a342f186eebc | 2022-12-06 | | buildpack-deps:stretch | sha256:78e995165a5788c2f55aed6e548d8f6c1534830d4310c870408fccb2da8c5b2e | 2022-06-23 | -| debian:10 | sha256:6c153b6c1b042fb70140a465e6d7c9c4a6112062afdc843c6a4d9c5bbfe5d0d5 | 2022-11-15 | -| debian:11 | sha256:3066ef83131c678999ce82e8473e8d017345a30f5573ad3e44f62e5c9c46442b | 2022-11-15 | +| debian:10 | sha256:e6fb8b88b411285ac71590459aa8d0a376acc86a3d17adfe45e806f522c54cc3 | 2022-12-06 | +| debian:11 | sha256:a288aa7ad0e4d443e86843972c25a02f99e9ad6ee589dd764895b2c3f5a8340b | 2022-12-06 | | debian:9 | sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be | 2022-06-23 | | moby/buildkit:latest | sha256:77abd86c9422aaff294bfde1029f03a6ab18ece0105003637cfda1d7fc22299f | 2022-11-10 | -| node:14 | sha256:d82d512aec5de4fac53b92b2aa148948c2e72264d650de9e1570283d4f503dbe | 2022-11-15 | -| node:14-alpine | sha256:12b14bdfa8c89a1a060c53b5714157085700660b12ab7c50a907a4e19d95b6bf | 2022-11-12 | -| node:16 | sha256:68fc9f749931453d5c8545521b021dd97267e0692471ce15bdec0814ed1f8fc3 | 2022-11-15 | -| node:16-alpine | sha256:15dd66f723aab8b367abc7ac6ed25594ca4653f2ce49ad1505bfbe740ad5190e | 2022-11-12 | -| node:18 | sha256:c47a2c61e635eb4938fcd56a1139b552300624b53e3eca06b5554a577f1842cf | 2022-11-15 | -| node:18-alpine | sha256:9eff44230b2fdcca57a73b8f908c8029e72d24dd05cac5339c79d3dedf6b208b | 2022-11-12 | +| node:14 | sha256:f11e8dbf2ff6668927aafd90a804bf6597d8fe53dc16742a234045f7bf647a8c | 2022-12-06 | +| node:14-alpine | sha256:99360847bb6fddff4652433355ad1f3072ff734a3d9c103bb8b26cfa0e2b7046 | 2022-12-12 | +| node:16 | sha256:7f404d09ceb780c51f4fac7592c46b8f21211474aacce25389eb0df06aaa7472 | 2022-12-06 | +| node:16-alpine | sha256:3265e41b5007254a593a1c3ff8b9b5ea9b943d63a1360a7d8d7d29b33a46a01f | 2022-12-12 | +| node:18 | sha256:9ebe9845301ca70e879f22180dfff496b856bb5f2ec52397462a9f5f903ee654 | 2022-12-06 | +| node:18-alpine | sha256:62a6ce21599b3183272e71527c9ce9fae9435195052d358f481eb3d69d3dc6f3 | 2022-12-12 | | ubuntu:16.04 | sha256:1f1a2d56de1d604801a9671f301190704c25d604a416f59e03c04f5c6ffee0d6 | 2021-08-31 | -| ubuntu:18.04 | sha256:ca70a834041dd1bf16cc38dfcd24f0888ec4fa431e09f3344f354cf8d1724499 | 2022-10-25 | -| ubuntu:20.04 | sha256:450e066588f42ebe1551f3b1a535034b6aa46cd936fe7f2c6b0d72997ec61dbd | 2022-10-25 | +| ubuntu:18.04 | sha256:daf3e62183e8aa9a56878a685ed26f3af3dd8c08c8fd11ef1c167a1aa9bd66a3 | 2022-12-09 | +| ubuntu:20.04 | sha256:0e0402cd13f68137edb0266e1d2c682f217814420f2d43d300ed8f65479b14fb | 2022-12-09 | ### Installed apt packages | Name | Version | @@ -333,7 +333,7 @@ to accomplish this. | aria2 | 1.35.0-1build1 | | autoconf | 2.69-11.1 | | automake | 1:1.16.1-4ubuntu6 | -| binutils | 2.34-6ubuntu1.3 | +| binutils | 2.34-6ubuntu1.4 | | bison | 2:3.5.1+dfsg-1 | | brotli | 1.0.7-6ubuntu0.1 | | build-essential | 12.8ubuntu1.1 | @@ -371,6 +371,7 @@ to accomplish this. | libunwind8 | 1.2.1-9build1 | | libxkbfile-dev | 1:1.1.0-1 | | libxss1 | 1:1.2.3-1 | +| libyaml-dev | 0.2.2-1 | | locales | 2.31-0ubuntu9.9 | | m4 | 1.4.18-4 | | mediainfo | 19.09-1build1 | @@ -401,7 +402,7 @@ to accomplish this. | texinfo | 6.7.0.dfsg.2-5 | | time | 1.7-25.1build1 | | tk | 8.6.9+1 | -| tzdata | 2022f-0ubuntu0.20.04.1 | +| tzdata | 2022g-0ubuntu0.20.04.1 | | unzip | 6.0-25ubuntu1.1 | | upx | 3.95-2build1 | | wget | 1.20.3-1ubuntu2 | From 9c544f47011f3fb7f13ab122927f15939d950b49 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Thu, 15 Dec 2022 17:20:01 +0100 Subject: [PATCH 1642/3485] ubuntu-latest is now ubuntu-22.04 (#6776) --- README.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 58162ed45b07..76de1fef05ae 100644 --- a/README.md +++ b/README.md @@ -21,8 +21,8 @@ To build a VM machine from this repo's source, see the [instructions](docs/creat | Image | YAML Label | Included Software | Rollout Progress of Latest Image Release | | --------------------|---------------------|--------------------|---------------------| -| Ubuntu 22.04 | `ubuntu-22.04` | [ubuntu-22.04] | [![status22](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu22&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu22&redirect=1) -| Ubuntu 20.04 | `ubuntu-latest` or `ubuntu-20.04` | [ubuntu-20.04] | [![status20](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu20&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu20&redirect=1) +| Ubuntu 22.04 | `ubuntu-latest` or `ubuntu-22.04` | [ubuntu-22.04] | [![status22](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu22&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu22&redirect=1) +| Ubuntu 20.04 | `ubuntu-20.04` | [ubuntu-20.04] | [![status20](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu20&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu20&redirect=1) | Ubuntu 18.04 <sup>deprecated</sup> | `ubuntu-18.04` | [ubuntu-18.04] | [![status18](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu18&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu18&redirect=1) | macOS 12 | `macos-12`| [macOS-12] | [![statusumac12](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-12&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-12&redirect=1) | macOS 11 | `macos-latest` or `macos-11`| [macOS-11] | [![statusmac11](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-11&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-11&redirect=1) @@ -49,7 +49,6 @@ To build a VM machine from this repo's source, see the [instructions](docs/creat There are currently two migrations in progress: -* `ubuntu-latest` is currently transitioning to `ubuntu-22.04`. During this time, you may experience some jobs running on either an ubuntu-20.04 or ubuntu-22.04 runner. You can specify `runs-on: ubuntu-20.04` in your workflow if you need the previous version. Details can be found in this [announcement](https://github.com/actions/runner-images/issues/6399). * `macos-latest` is currently transitioning to `macos-12`. During this time, you may experience some jobs running on either a macos-11 or macos-12 runner. You can specify `runs-on: macos-11` in your workflow if you need the previous version. Details can be found in this [announcement](https://github.com/actions/runner-images/issues/6384). From ad0880f33b9a3bef1c4ce7b9cdf6d93e072b704e Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Thu, 15 Dec 2022 19:02:05 +0100 Subject: [PATCH 1643/3485] Update SBOM-gen add artifact upload + bugfix (#6779) --- .github/workflows/create_sbom_report.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/create_sbom_report.yml b/.github/workflows/create_sbom_report.yml index 90836ec89ded..93bd865e800b 100644 --- a/.github/workflows/create_sbom_report.yml +++ b/.github/workflows/create_sbom_report.yml @@ -19,7 +19,7 @@ jobs: version-check: runs-on: ${{ github.event.client_payload.agentSpec }} steps: - - name: Available image version check + - name: Available image version check for ${{ github.event.client_payload.ReleaseBranchName }} run: | if ($env:ImageVersion -ne '${{ github.event.client_payload.imageVersion }}') { throw "Current runner $env:ImageVersion image version don't match ${{ github.event.client_payload.imageVersion }}." @@ -49,6 +49,12 @@ jobs: #Preparing artifact (raw SBOM.json is too big) - name: Compress SBOM file run: Compress-Archive sbom.json sbom.json.zip + #Upload artifact action + - uses: actions/upload-artifact@v3 + with: + name: sbom-${{ github.event.client_payload.ReleaseBranchName }} + path: sbom.json.zip + if-no-files-found: warn #Upload release asset action #Might be changed to softprops/action-gh-release after additional check - name: Upload release asset From 5a583f491861e535213c15645e7c590adab6d90c Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Fri, 16 Dec 2022 13:38:31 +0100 Subject: [PATCH 1644/3485] Testing of event payload (#6786) --- .github/workflows/create_sbom_report.yml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/.github/workflows/create_sbom_report.yml b/.github/workflows/create_sbom_report.yml index 93bd865e800b..1a192df95c25 100644 --- a/.github/workflows/create_sbom_report.yml +++ b/.github/workflows/create_sbom_report.yml @@ -1,7 +1,7 @@ name: Create and upload a SBOM to release assets # Inherited variables: # github.event.client_payload.agentSpec - Current YAML Label -# github.event.client_payload.ReleaseID - Current release ID +# github.event.client_payload.test_ReleaseID - Current release ID # github.event.client_payload.imageVersion - AzDO image version "major.minor" # github.event.client_payload.ReleaseBranchName - Necessary to identify workflow run # @@ -15,6 +15,16 @@ defaults: run: shell: pwsh jobs: + #Temporary job to check how it's going inside event.client_payload + test: + runs-on: ubuntu-latest + steps: + - name: Output of event.client_payload + run: | + Write-Host "imageVersion is ${{ github.event.client_payload.imageVersion }}" + Write-Host "test_ReleaseID is ${{ github.event.client_payload.test_ReleaseID }}" + Write-Host "agentSpec is ${{ github.event.client_payload.agentSpec }}" + Write-Host "ReleaseBranchName is ${{ github.event.client_payload.ReleaseBranchName }}" #Checking image version on available runner version-check: runs-on: ${{ github.event.client_payload.agentSpec }} From d171f5b873cffcf8d7c2d91019c0fd64ce7c2335 Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Fri, 16 Dec 2022 15:15:48 +0100 Subject: [PATCH 1645/3485] Revert "Testing of event payload (#6786)" (#6787) This reverts commit 5a583f491861e535213c15645e7c590adab6d90c. --- .github/workflows/create_sbom_report.yml | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/.github/workflows/create_sbom_report.yml b/.github/workflows/create_sbom_report.yml index 1a192df95c25..93bd865e800b 100644 --- a/.github/workflows/create_sbom_report.yml +++ b/.github/workflows/create_sbom_report.yml @@ -1,7 +1,7 @@ name: Create and upload a SBOM to release assets # Inherited variables: # github.event.client_payload.agentSpec - Current YAML Label -# github.event.client_payload.test_ReleaseID - Current release ID +# github.event.client_payload.ReleaseID - Current release ID # github.event.client_payload.imageVersion - AzDO image version "major.minor" # github.event.client_payload.ReleaseBranchName - Necessary to identify workflow run # @@ -15,16 +15,6 @@ defaults: run: shell: pwsh jobs: - #Temporary job to check how it's going inside event.client_payload - test: - runs-on: ubuntu-latest - steps: - - name: Output of event.client_payload - run: | - Write-Host "imageVersion is ${{ github.event.client_payload.imageVersion }}" - Write-Host "test_ReleaseID is ${{ github.event.client_payload.test_ReleaseID }}" - Write-Host "agentSpec is ${{ github.event.client_payload.agentSpec }}" - Write-Host "ReleaseBranchName is ${{ github.event.client_payload.ReleaseBranchName }}" #Checking image version on available runner version-check: runs-on: ${{ github.event.client_payload.agentSpec }} From 34c4d37ff01c2cb50899a65250530c2321c1226c Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Fri, 16 Dec 2022 17:05:17 +0100 Subject: [PATCH 1646/3485] Fix use of invalid characters in artifact name (#6788) --- .github/workflows/create_sbom_report.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/create_sbom_report.yml b/.github/workflows/create_sbom_report.yml index 93bd865e800b..38831a610b42 100644 --- a/.github/workflows/create_sbom_report.yml +++ b/.github/workflows/create_sbom_report.yml @@ -52,7 +52,7 @@ jobs: #Upload artifact action - uses: actions/upload-artifact@v3 with: - name: sbom-${{ github.event.client_payload.ReleaseBranchName }} + name: sbom-${{ github.event.client_payload.agentSpec }}-${{ github.event.client_payload.imageVersion }} path: sbom.json.zip if-no-files-found: warn #Upload release asset action From f9604d9ebb7a47254e81c1ef76a42af140c24539 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 19 Dec 2022 10:00:43 +0000 Subject: [PATCH 1647/3485] Updating readme file for win22 version 20221215.2 (#6784) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2022-Readme.md | 264 ++++++++++++++----------------- 1 file changed, 119 insertions(+), 145 deletions(-) diff --git a/images/win/Windows2022-Readme.md b/images/win/Windows2022-Readme.md index eafc18cc4bfb..9d75b7862182 100644 --- a/images/win/Windows2022-Readme.md +++ b/images/win/Windows2022-Readme.md @@ -1,40 +1,41 @@ -# Microsoft Windows Server 2022 Datacenter -- OS Version: 10.0.20348 Build 1249 -- Image Version: 20221204.3 +# Windows Server 2022 +- OS Version: 10.0.20348 Build 1366 +- Image Version: 20221215.2 -## Enabled windows optional features -- Windows Subsystem for Linux [WSLv1] +## Windows features +- Windows Subsystem for Linux (WSLv1): Enabled ## Installed Software ### Language and Runtime -- Bash 5.1.16(1)-release +- Bash 5.2.12(1)-release - Go 1.17.13 - Julia 1.8.3 - Kotlin 1.7.22 - LLVM 14.0.6 -- Node 16.18.1 +- Node 16.19.0 - Perl 5.32.1 -- PHP 8.1.13 +- PHP 8.2.0 - Python 3.9.13 - Ruby 3.0.5p211 ### Package Management -- Chocolatey 1.2.0 +- Chocolatey 1.2.1 - Composer 2.4.4 - Helm 3.10.1 - Miniconda 4.12.0 (pre-installed on the image but not added to PATH) -- NPM 8.19.2 +- NPM 8.19.3 - NuGet 6.4.0.123 - pip 22.3.1 (python 3.9) - Pipx 1.1.0 - RubyGems 3.2.33 -- Vcpkg (build from master \<163fe7bd3>) +- Vcpkg (build from commit 4b6bce313) - Yarn 1.22.19 #### Environment variables -| Name | Value | -| ----------------------- | -------- | -| VCPKG_INSTALLATION_ROOT | C:\vcpkg | +| Name | Value | +| ----------------------- | ------------ | +| VCPKG_INSTALLATION_ROOT | C:\vcpkg | +| CONDA | C:\Miniconda | ### Project Management - Ant 1.10.12 @@ -46,31 +47,31 @@ - 7zip 22.01 - aria2 1.36.0 - azcopy 10.16.2 -- Bazel 5.3.2 +- Bazel 5.4.0 - Bazelisk 1.13.2 -- Bicep 0.12.40 +- Bicep 0.13.1 - Cabal 3.8.1.0 - CMake 3.25.1 -- CodeQL Action Bundle 2.11.4 +- CodeQL Action Bundle 2.11.6 - Docker 20.10.21 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.14.0 +- Docker Compose v2 2.14.1 - Docker-wincred 0.7.0 - ghc 9.4.2 -- Git 2.38.1.windows.1 -- Git LFS 3.2.0 -- ImageMagick 7.1.0-51 +- Git 2.39.0.windows.1 +- Git LFS 3.3.0 +- ImageMagick 7.1.0-54 - InnoSetup 6.2.1 - jq 1.6 - Kind 0.17.0 -- Kubectl 1.25.4 +- Kubectl 1.26.0 - Mercurial 5.0 - Mingw-w64 11.2.0 - Newman 5.3.2 -- NSIS v3.08 +- NSIS 3.08 - OpenSSL 1.1.1 - Packer 1.8.4 -- Pulumi v3.48.0 +- Pulumi 3.49.0 - R 4.2.2 - Service Fabric SDK 9.0.1028.9590 - Stack 2.9.1 @@ -84,18 +85,18 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.140 -- AWS CLI 2.9.4 +- AWS CLI 2.9.7 - AWS SAM CLI 1.66.0 - AWS Session Manager CLI 1.2.398.0 -- Azure CLI 2.42.0 +- Azure CLI 2.43.0 - Azure DevOps CLI extension 0.25.0 - GitHub CLI 2.20.2 - Hub CLI 2.14.2 ### Rust Tools -- Cargo 1.65.0 -- Rust 1.65.0 -- Rustdoc 1.65.0 +- Cargo 1.66.0 +- Rust 1.66.0 +- Rustdoc 1.66.0 - Rustup 1.25.1 #### Packages @@ -103,15 +104,15 @@ - cargo-audit 0.17.4 - cargo-outdated 0.11.1 - cbindgen 0.24.3 -- Clippy 0.1.65 +- Clippy 0.1.66 - Rustfmt 1.5.1 -### Browsers and webdrivers -- Google Chrome 108.0.5359.95 +### Browsers and Drivers +- Google Chrome 108.0.5359.125 - Chrome Driver 108.0.5359.71 -- Microsoft Edge 107.0.1418.62 -- Microsoft Edge Driver 107.0.1418.62 -- Mozilla Firefox 107.0.1 +- Microsoft Edge 108.0.1462.46 +- Microsoft Edge Driver 108.0.1462.46 +- Mozilla Firefox 108.0 - Gecko Driver 0.32.0 - IE Driver 4.7.0.0 - Selenium server 4.7.0 @@ -150,42 +151,32 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Cached Tools #### Go -| Version | Architecture | Environment Variable | -| ------- | ------------ | -------------------- | -| 1.17.13 (Default) | x64 | GOROOT_1_17_X64 | -| 1.18.8 | x64 | GOROOT_1_18_X64 | -| 1.19.3 | x64 | GOROOT_1_19_X64 | - -#### Node -| Version | Architecture | -| ------- | ------------ | -| 14.21.1 | x64 | -| 16.18.1 | x64 | -| 18.12.1 | x64 | +- 1.17.13 +- 1.18.9 +- 1.19.4 -#### Python -| Version | Architecture | -| ------- | ------------ | -| 3.7.9 | x64, x86 | -| 3.8.10 | x64, x86 | -| 3.9.13 (Default) | x64, x86 | -| 3.10.8 | x64, x86 | -| 3.11.0 | x64, x86 | +#### Node.js +- 14.21.2 +- 16.19.0 +- 18.12.1 -#### Ruby -| Version | Architecture | -| ------- | ------------ | -| 2.7.7 | x64 | -| 3.0.5 (Default) | x64 | -| 3.1.3 | x64 | +#### Python +- 3.7.9 +- 3.8.10 +- 3.9.13 +- 3.10.9 +- 3.11.1 #### PyPy -| Python Version | PyPy Version | -| -------------- | ------------ | -| 2.7.18 | PyPy 7.3.9 with MSC v.1929 64 bit (AMD64) | -| 3.7.13 | PyPy 7.3.9 with MSC v.1929 64 bit (AMD64) | -| 3.8.12 | PyPy 7.3.9 with MSC v.1929 64 bit (AMD64) | -| 3.9.10 | PyPy 7.3.9 with MSC v.1929 64 bit (AMD64) | +- 2.7.18 [PyPy 7.3.10] +- 3.7.13 [PyPy 7.3.9] +- 3.8.15 [PyPy 7.3.10] +- 3.9.15 [PyPy 7.3.10] + +#### Ruby +- 2.7.7 +- 3.0.5 +- 3.1.3 ### Databases #### PostgreSQL @@ -216,12 +207,12 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Name | Version | ConfigFile | ServiceName | ServiceStatus | ListenPort | | ------ | ------- | ------------------------------------- | ----------- | ------------- | ---------- | | Apache | 2.4.54 | C:\tools\Apache24\conf\httpd.conf | Apache | Stopped | 80 | -| Nginx | 1.23.2 | C:\tools\nginx-1.23.2\conf\nginx.conf | nginx | Stopped | 80 | +| Nginx | 1.23.3 | C:\tools\nginx-1.23.3\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2022 | Name | Version | Path | | ----------------------------- | -------------- | -------------------------------------------------------- | -| Visual Studio Enterprise 2022 | 17.4.33122.133 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | +| Visual Studio Enterprise 2022 | 17.4.33205.214 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | #### Workloads, components and extensions: | Package | Version | @@ -253,14 +244,14 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Component.WixToolset.VisualStudioExtension.Schemas3 | 1.0.0.22 | | Component.Xamarin | 17.4.33006.217 | | Component.Xamarin.RemotedSimulator | 17.4.33006.217 | -| ios | 16.0.527.1478 | -| maccatalyst | 15.4.1186.2372 | -| maui.android | 7.0.49.0 | -| maui.blazor | 7.0.49.0 | -| maui.core | 7.0.49.0 | -| maui.ios | 7.0.49.0 | -| maui.maccatalyst | 7.0.49.0 | -| maui.windows | 7.0.49.0 | +| ios | 16.1.17.0 | +| maccatalyst | 16.1.17.0 | +| maui.android | 7.0.52.0 | +| maui.blazor | 7.0.52.0 | +| maui.core | 7.0.52.0 | +| maui.ios | 7.0.52.0 | +| maui.maccatalyst | 7.0.52.0 | +| maui.windows | 7.0.52.0 | | Microsoft.Component.Azure.DataLake.Tools | 17.4.33006.217 | | Microsoft.Component.ClickOnce | 17.4.33006.217 | | Microsoft.Component.CodeAnalysis.SDK | 17.4.33006.217 | @@ -284,21 +275,21 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.Net.ComponentGroup.4.8.DeveloperTools | 17.4.33006.217 | | Microsoft.Net.ComponentGroup.DevelopmentPrerequisites | 17.4.33006.217 | | Microsoft.Net.ComponentGroup.TargetingPacks.Common | 17.4.33006.217 | -| microsoft.net.runtime.android | 7.0.22.51805 | -| microsoft.net.runtime.android.aot | 7.0.22.51805 | -| microsoft.net.runtime.android.aot.net6 | 7.0.22.51805 | -| microsoft.net.runtime.android.net6 | 7.0.22.51805 | -| microsoft.net.runtime.ios | 7.0.22.51805 | -| microsoft.net.runtime.ios.net6 | 7.0.22.51805 | -| microsoft.net.runtime.maccatalyst | 7.0.22.51805 | -| microsoft.net.runtime.maccatalyst.net6 | 7.0.22.51805 | -| microsoft.net.runtime.mono.tooling | 7.0.22.51805 | -| microsoft.net.runtime.mono.tooling.net6 | 7.0.22.51805 | -| microsoft.net.sdk.emscripten.net7 | 7.0.7.1101 | +| microsoft.net.runtime.android | 7.0.122.56804 | +| microsoft.net.runtime.android.aot | 7.0.122.56804 | +| microsoft.net.runtime.android.aot.net6 | 7.0.122.56804 | +| microsoft.net.runtime.android.net6 | 7.0.122.56804 | +| microsoft.net.runtime.ios | 7.0.122.56804 | +| microsoft.net.runtime.ios.net6 | 7.0.122.56804 | +| microsoft.net.runtime.maccatalyst | 7.0.122.56804 | +| microsoft.net.runtime.maccatalyst.net6 | 7.0.122.56804 | +| microsoft.net.runtime.mono.tooling | 7.0.122.56804 | +| microsoft.net.runtime.mono.tooling.net6 | 7.0.122.56804 | +| microsoft.net.sdk.emscripten.net7 | 7.0.7.6501 | | Microsoft.NetCore.Component.DevelopmentTools | 17.4.33006.217 | -| Microsoft.NetCore.Component.Runtime.6.0 | 17.4.33103.184 | -| Microsoft.NetCore.Component.Runtime.7.0 | 17.4.33103.184 | -| Microsoft.NetCore.Component.SDK | 17.4.33103.184 | +| Microsoft.NetCore.Component.Runtime.6.0 | 17.4.33205.214 | +| Microsoft.NetCore.Component.Runtime.7.0 | 17.4.33205.214 | +| Microsoft.NetCore.Component.SDK | 17.4.33205.214 | | Microsoft.NetCore.Component.Web | 17.4.33006.217 | | Microsoft.VisualStudio.Component.AppInsights.Tools | 17.4.33006.217 | | Microsoft.VisualStudio.Component.AspNet | 17.4.33006.217 | @@ -493,11 +484,11 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Workload.Python | 17.4.33006.217 | | Microsoft.VisualStudio.Workload.Universal | 17.4.33006.217 | | Microsoft.VisualStudio.Workload.VisualStudioExtension | 17.4.33006.217 | -| runtimes.ios | 7.0.22.51805 | -| runtimes.ios.net6 | 7.0.22.51805 | -| runtimes.maccatalyst | 7.0.22.51805 | -| runtimes.maccatalyst.net6 | 7.0.22.51805 | -| wasm.tools | 7.0.22.51805 | +| runtimes.ios | 7.0.122.56804 | +| runtimes.ios.net6 | 7.0.122.56804 | +| runtimes.maccatalyst | 7.0.122.56804 | +| runtimes.maccatalyst.net6 | 7.0.122.56804 | +| wasm.tools | 7.0.122.56804 | | ProBITools.MicrosoftAnalysisServicesModelingProjects2022 | 3.0.4 | | ProBITools.MicrosoftReportProjectsforVisualStudio2022 | 3.0.1 | | VisualStudioClient.MicrosoftVisualStudio2022InstallerProjects | 2.0.0 | @@ -523,65 +514,48 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft Visual C++ 2022 Minimum Runtime | x86 | 14.34.31931 | #### Installed Windows SDKs -`Location C:\Program Files (x86)\Windows Kits\10\Extension SDKs\WindowsDesktop` + - 10.0.17763.0 - 10.0.19041.0 - 10.0.20348.0 - 10.0.22000.0 - 10.0.22621.0 -### .NET Core SDK -`Location C:\Program Files\dotnet\sdk` -- 3.1.120 3.1.202 3.1.302 3.1.425 5.0.104 5.0.214 5.0.303 5.0.408 6.0.111 6.0.203 6.0.306 6.0.403 7.0.100 - -### .NET Core Runtime -`Location: C:\Program Files\dotnet\shared\Microsoft.AspNetCore.App` -- 3.1.4 3.1.6 3.1.20 3.1.30 3.1.31 5.0.4 5.0.9 5.0.17 6.0.5 6.0.10 6.0.11 7.0.0 - -`Location: C:\Program Files\dotnet\shared\Microsoft.NETCore.App` -- 3.1.4 3.1.6 3.1.20 3.1.30 3.1.31 5.0.4 5.0.9 5.0.17 6.0.5 6.0.10 6.0.11 7.0.0 - -`Location: C:\Program Files\dotnet\shared\Microsoft.WindowsDesktop.App` -- 3.1.4 3.1.6 3.1.20 3.1.31 5.0.4 5.0.9 5.0.17 6.0.5 6.0.11 7.0.0 - -### .NET Framework -`Type: Developer Pack` -`Location: C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX <version> Tools` -- 4.8 -- 4.8.1 - -### .NET tools +### .NET Core Tools +- .NET Core SDK: 3.1.120, 3.1.202, 3.1.302, 3.1.426, 5.0.104, 5.0.214, 5.0.303, 5.0.408, 6.0.112, 6.0.203, 6.0.307, 6.0.404, 7.0.101 +- .NET Framework: 4.8, 4.8.1 +- Microsoft.AspNetCore.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 5.0.4, 5.0.9, 5.0.17, 6.0.5, 6.0.12, 7.0.1 +- Microsoft.NETCore.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 5.0.4, 5.0.9, 5.0.17, 6.0.5, 6.0.12, 7.0.1 +- Microsoft.WindowsDesktop.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 5.0.4, 5.0.9, 5.0.17, 6.0.5, 6.0.12, 7.0.1 - nbgv 3.5.119+5d25f54fec ### PowerShell Tools -- PowerShell 7.2.7 - -#### Azure Powershell Modules -| Module | Version | Path | -| ------- | ------------------------------------------------------------------------------- | ------------------------------ | -| Az | 7.5.0.zip<br>9.0.1 | C:\Modules\az_\<version\> | -| Azure | 2.1.0 [Installed]<br>3.8.0.zip<br>4.2.1.zip<br>5.1.1.zip<br>5.3.0 | C:\Modules\azure_\<version\> | -| AzureRM | 2.1.0 [Installed]<br>3.8.0.zip<br>4.2.1.zip<br>5.1.1.zip<br>6.7.0.zip<br>6.13.1 | C:\Modules\azurerm_\<version\> | +- PowerShell 7.2.8 + +#### Powershell Modules +- Az: 9.0.1 +- Azure: 2.1.0 (Default), 5.3.0 +- AzureRM: 2.1.0 (Default), 6.13.1 +- Az (Cached): 7.5.0.zip +- Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip +- AzureRM: 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip +- AWSPowershell: 4.1.230 +- DockerMsftProvider: 1.0.0.8 +- MarkdownPS: 1.9 +- Microsoft.Graph: 1.19.0 +- Pester: 3.4.0, 5.3.3 +- PowerShellGet: 1.0.0.1, 2.2.5 +- PSScriptAnalyzer: 1.21.0 +- PSWindowsUpdate: 2.2.0.3 +- SqlServer: 21.1.18256 +- VSSetup: 2.2.16 + ``` 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 | -| ------------------ | ---------------- | -| AWSPowerShell | 4.1.220 | -| DockerMsftProvider | 1.0.0.8 | -| MarkdownPS | 1.9 | -| Microsoft.Graph | 1.18.0 | -| Pester | 3.4.0<br>5.3.3 | -| PowerShellGet | 1.0.0.1<br>2.2.5 | -| PSScriptAnalyzer | 1.21.0 | -| PSWindowsUpdate | 2.2.0.3 | -| SqlServer | 21.1.18256 | -| VSSetup | 2.2.16 | - ### Android | Package Name | Version | | -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------- | @@ -610,9 +584,9 @@ All other versions are saved but not installed. ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2022 | sha256:a8b498b98761063eb29277ec08b396a5140a7f2770f5e3b435f2fd2afdb89444 | 2022-11-08 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2022 | sha256:a43a941b5ef5e065fb4ed361047a3dcc5b8d890265475741a5f951a5c0cfd80a | 2022-11-08 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:f48e1176294a32514a2f6fa5140eb2ff7610049b205b6f7f15f47916d98c1f37 | 2022-11-08 | -| mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:f1125cf932664b039a55afb666bdca7dc28d453a88430fe47be763e0270638b6 | 2022-11-05 | -| mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:8d862016bcfad6040cb9ae0f21b024fe71b058ddb42a077c32a24bcb5fc04628 | 2022-11-05 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2022 | sha256:7f7ba32d5a129b11c413975d9c0f5685c0e7ad7340b518c015dbe5b34306f702 | 2022-12-13 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2022 | sha256:731b6b7bd57ee3fd0c3f5d39fabaf4935442036946a6d64fb13bfe3eefc6d617 | 2022-12-13 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:0edc5775637a72e2db79bdd2f083908e3d92713a06b6c9ceeddc02f5e99728a3 | 2022-12-13 | +| mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:79fb1372fc5b3aeeca73603d5eadd0a8fb7d4f0b77bd29498696c03bb6de1fdf | 2022-12-09 | +| mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:74b9774d1b40a8fef7ec9b4f7ab22aa4a34115fca928867e23b35a125308fe0a | 2022-12-09 | From 504c3071979510647b1f780aa7d69ff359e7788a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 19 Dec 2022 10:14:20 +0000 Subject: [PATCH 1648/3485] Updating readme file for win19 version 20221214.4 (#6801) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2019-Readme.md | 215 ++++++++++++++----------------- 1 file changed, 94 insertions(+), 121 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index dc0d0f1121bd..be628956648c 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -1,34 +1,34 @@ -# Microsoft Windows Server 2019 Datacenter -- OS Version: 10.0.17763 Build 3650 -- Image Version: 20221204.2 +# Windows Server 2019 +- OS Version: 10.0.17763 Build 3770 +- Image Version: 20221214.4 -## Enabled windows optional features -- Windows Subsystem for Linux [WSLv1] +## Windows features +- Windows Subsystem for Linux (WSLv1): Enabled ## Installed Software ### Language and Runtime -- Bash 5.1.16(1)-release +- Bash 5.2.12(1)-release - Go 1.17.13 - Julia 1.8.3 - Kotlin 1.7.22 - LLVM 14.0.6 -- Node 16.18.1 +- Node 16.19.0 - Perl 5.32.1 -- PHP 8.1.13 +- PHP 8.2.0 - Python 3.7.9 - Ruby 2.5.9p229 ### Package Management -- Chocolatey 1.2.0 +- Chocolatey 1.2.1 - Composer 2.4.4 - Helm 3.10.1 - Miniconda 4.12.0 (pre-installed on the image but not added to PATH) -- NPM 8.19.2 +- NPM 8.19.3 - NuGet 6.4.0.123 - pip 22.3.1 (python 3.7) - Pipx 1.1.0 - RubyGems 2.7.6.3 -- Vcpkg (build from master \<163fe7bd3>) +- Vcpkg (build from commit 56765209e) - Yarn 1.22.19 #### Environment variables @@ -49,31 +49,31 @@ - azcopy 10.16.2 - Bazel 5.3.2 - Bazelisk 1.13.2 -- Bicep 0.12.40 +- Bicep 0.13.1 - Cabal 3.8.1.0 - CMake 3.25.1 -- CodeQL Action Bundle 2.11.4 +- CodeQL Action Bundle 2.11.6 - Docker 20.10.21 - Docker Compose v1 1.29.2 - Docker Compose v2 2.14.0 - Docker-wincred 0.7.0 - ghc 9.4.2 -- Git 2.38.1.windows.1 -- Git LFS 3.2.0 -- Google Cloud SDK 410.0.0 -- ImageMagick 7.1.0-51 +- Git 2.39.0.windows.1 +- Git LFS 3.3.0 +- Google Cloud SDK 412.0.0 +- ImageMagick 7.1.0-54 - InnoSetup 6.2.1 - jq 1.6 - Kind 0.17.0 -- Kubectl 1.25.4 +- Kubectl 1.26.0 - Mercurial 5.0 - Mingw-w64 8.1.0 - Newman 5.3.2 -- NSIS v3.08 +- NSIS 3.08 - OpenSSL 1.1.1 - Packer 1.8.4 -- Parcel 2.8.0 -- Pulumi v3.48.0 +- Parcel 2.8.2 +- Pulumi 3.49.0 - R 4.2.2 - Service Fabric SDK 9.0.1028.9590 - Stack 2.9.1 @@ -87,10 +87,10 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.140 -- AWS CLI 2.9.4 +- AWS CLI 2.9.6 - AWS SAM CLI 1.66.0 - AWS Session Manager CLI 1.2.398.0 -- Azure CLI 2.42.0 +- Azure CLI 2.43.0 - Azure DevOps CLI extension 0.25.0 - Cloud Foundry CLI 6.53.0 - GitHub CLI 2.20.2 @@ -110,12 +110,12 @@ - Clippy 0.1.65 - Rustfmt 1.5.1 -### Browsers and webdrivers -- Google Chrome 108.0.5359.95 +### Browsers and Drivers +- Google Chrome 108.0.5359.125 - Chrome Driver 108.0.5359.71 -- Microsoft Edge 107.0.1418.62 -- Microsoft Edge Driver 107.0.1418.62 -- Mozilla Firefox 107.0.1 +- Microsoft Edge 108.0.1462.46 +- Microsoft Edge Driver 108.0.1462.46 +- Mozilla Firefox 108.0 - Gecko Driver 0.32.0 - IE Driver 4.7.0.0 - Selenium server 4.7.0 @@ -158,48 +158,38 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Cached Tools #### Go -| Version | Architecture | Environment Variable | -| ------- | ------------ | -------------------- | -| 1.17.13 (Default) | x64 | GOROOT_1_17_X64 | -| 1.18.8 | x64 | GOROOT_1_18_X64 | -| 1.19.3 | x64 | GOROOT_1_19_X64 | - -#### Node -| Version | Architecture | -| ------- | ------------ | -| 14.21.1 | x64 | -| 16.18.1 | x64 | -| 18.12.1 | x64 | +- 1.17.13 +- 1.18.9 +- 1.19.4 -#### Python -| Version | Architecture | -| ------- | ------------ | -| 2.7.18 | x64, x86 | -| 3.6.8 | x64, x86 | -| 3.7.9 (Default) | x64, x86 | -| 3.8.10 | x64, x86 | -| 3.9.13 | x64, x86 | -| 3.10.8 | x64, x86 | -| 3.11.0 | x64, x86 | +#### Node.js +- 14.21.1 +- 16.18.1 +- 18.12.1 -#### Ruby -| Version | Architecture | -| ------- | ------------ | -| 2.4.10 | x64 | -| 2.5.9 (Default) | x64 | -| 2.6.10 | x64 | -| 2.7.7 | x64 | -| 3.0.5 | x64 | -| 3.1.3 | x64 | +#### Python +- 2.7.18 +- 3.6.8 +- 3.7.9 +- 3.8.10 +- 3.9.13 +- 3.10.9 +- 3.11.1 #### PyPy -| Python Version | PyPy Version | -| -------------- | ------------ | -| 2.7.18 | PyPy 7.3.9 with MSC v.1929 64 bit (AMD64) | -| 3.6.12 | PyPy 7.3.3 with MSC v.1927 32 bit | -| 3.7.13 | PyPy 7.3.9 with MSC v.1929 64 bit (AMD64) | -| 3.8.12 | PyPy 7.3.9 with MSC v.1929 64 bit (AMD64) | -| 3.9.10 | PyPy 7.3.9 with MSC v.1929 64 bit (AMD64) | +- 2.7.18 [PyPy 7.3.10] +- 3.6.12 [PyPy 7.3.3] +- 3.7.13 [PyPy 7.3.9] +- 3.8.15 [PyPy 7.3.10] +- 3.9.15 [PyPy 7.3.10] + +#### Ruby +- 2.4.10 +- 2.5.9 +- 2.6.10 +- 2.7.7 +- 3.0.5 +- 3.1.3 ### Databases #### PostgreSQL @@ -230,17 +220,17 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Name | Version | ConfigFile | ServiceName | ServiceStatus | ListenPort | | ------ | ------- | ------------------------------------- | ----------- | ------------- | ---------- | | Apache | 2.4.54 | C:\tools\Apache24\conf\httpd.conf | Apache | Stopped | 80 | -| Nginx | 1.23.2 | C:\tools\nginx-1.23.2\conf\nginx.conf | nginx | Stopped | 80 | +| Nginx | 1.23.3 | C:\tools\nginx-1.23.3\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2019 | Name | Version | Path | | ----------------------------- | --------------- | -------------------------------------------------------------- | -| Visual Studio Enterprise 2019 | 16.11.33027.164 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | +| Visual Studio Enterprise 2019 | 16.11.33130.400 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | #### Workloads, components and extensions: | Package | Version | | ------------------------------------------------------------------------- | --------------- | -| Component.Android.NDK.R16B | 16.11.33026.216 | +| Component.Android.NDK.R16B | 16.11.33130.273 | | Component.Android.SDK25.Private | 16.0.28625.61 | | Component.Android.SDK30 | 16.10.31205.252 | | Component.Ant | 1.9.3.8 | @@ -294,9 +284,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.Net.ComponentGroup.DevelopmentPrerequisites | 16.3.29207.166 | | Microsoft.Net.ComponentGroup.TargetingPacks.Common | 16.0.28516.191 | | Microsoft.NetCore.Component.DevelopmentTools | 16.10.31303.231 | -| Microsoft.NetCore.Component.Runtime.3.1 | 16.11.33027.164 | -| Microsoft.NetCore.Component.Runtime.6.0 | 16.11.33027.164 | -| Microsoft.NetCore.Component.SDK | 16.11.33027.164 | +| Microsoft.NetCore.Component.Runtime.3.1 | 16.11.33130.400 | +| Microsoft.NetCore.Component.Runtime.6.0 | 16.11.33130.400 | +| Microsoft.NetCore.Component.SDK | 16.11.33130.400 | | Microsoft.NetCore.Component.Web | 16.10.31303.231 | | Microsoft.VisualStudio.Component.AppInsights.Tools | 16.5.29515.121 | | Microsoft.VisualStudio.Component.AspNet45 | 16.10.31205.252 | @@ -492,7 +482,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft Visual C++ 2022 Minimum Runtime | x86 | 14.34.31931 | #### Installed Windows SDKs -`Location C:\Program Files (x86)\Windows Kits\10\Extension SDKs\WindowsDesktop` + - 10.0.14393.0 - 10.0.16299.0 - 10.0.17134.0 @@ -503,58 +493,41 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 10.0.22000.0 - 10.0.22621.0 -### .NET Core SDK -`Location C:\Program Files\dotnet\sdk` -- 3.1.120 3.1.202 3.1.302 3.1.425 5.0.104 5.0.214 5.0.303 5.0.408 5.0.414 6.0.111 6.0.203 6.0.306 6.0.403 - -### .NET Core Runtime -`Location: C:\Program Files\dotnet\shared\Microsoft.AspNetCore.App` -- 3.1.4 3.1.6 3.1.20 3.1.31 5.0.4 5.0.9 5.0.17 6.0.5 6.0.11 - -`Location: C:\Program Files\dotnet\shared\Microsoft.NETCore.App` -- 3.1.4 3.1.6 3.1.20 3.1.31 5.0.4 5.0.9 5.0.17 6.0.5 6.0.11 - -`Location: C:\Program Files\dotnet\shared\Microsoft.WindowsDesktop.App` -- 3.1.4 3.1.6 3.1.20 3.1.31 5.0.4 5.0.9 5.0.17 6.0.5 6.0.11 - -### .NET Framework -`Type: Developer Pack` -`Location: C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX <version> Tools` -- 4.7.2 -- 4.8 - -### .NET tools +### .NET Core Tools +- .NET Core SDK: 3.1.120, 3.1.202, 3.1.302, 3.1.426, 5.0.104, 5.0.214, 5.0.303, 5.0.408, 5.0.415, 6.0.112, 6.0.203, 6.0.307, 6.0.404 +- .NET Framework: 4.7.2, 4.8 +- Microsoft.AspNetCore.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 5.0.4, 5.0.9, 5.0.17, 6.0.5, 6.0.12 +- Microsoft.NETCore.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 5.0.4, 5.0.9, 5.0.17, 6.0.5, 6.0.12 +- Microsoft.WindowsDesktop.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 5.0.4, 5.0.9, 5.0.17, 6.0.5, 6.0.12 - nbgv 3.5.119+5d25f54fec ### PowerShell Tools -- PowerShell 7.2.7 - -#### Azure Powershell Modules -| Module | Version | Path | -| ------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------ | -| Az | 1.0.0.zip<br>1.6.0.zip<br>2.3.2.zip<br>2.6.0.zip<br>3.1.0.zip<br>3.5.0.zip<br>3.8.0.zip<br>4.3.0.zip<br>4.4.0.zip<br>4.7.0.zip<br>5.5.0.zip<br>5.9.0.zip<br>6.6.0.zip<br>7.5.0.zip<br>9.0.1 | C:\Modules\az_\<version\> | -| Azure | 2.1.0 [Installed]<br>3.8.0.zip<br>4.2.1.zip<br>5.1.1.zip<br>5.3.0 | C:\Modules\azure_\<version\> | -| AzureRM | 2.1.0 [Installed]<br>3.8.0.zip<br>4.2.1.zip<br>5.1.1.zip<br>6.7.0.zip<br>6.13.1 | C:\Modules\azurerm_\<version\> | +- PowerShell 7.2.8 + +#### Powershell Modules +- Az: 9.0.1 +- Azure: 2.1.0 (Default), 5.3.0 +- AzureRM: 2.1.0 (Default), 6.13.1 +- Az (Cached): 1.0.0.zip, 1.6.0.zip, 2.3.2.zip, 2.6.0.zip, 3.1.0.zip, 3.5.0.zip, 3.8.0.zip, 4.3.0.zip, 4.4.0.zip, 4.7.0.zip, 5.5.0.zip, 5.9.0.zip, 6.6.0.zip, 7.5.0.zip +- Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip +- AzureRM: 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip +- AWSPowershell: 4.1.229 +- DockerMsftProvider: 1.0.0.8 +- MarkdownPS: 1.9 +- Microsoft.Graph: 1.18.0 +- Pester: 3.4.0, 5.3.3 +- PowerShellGet: 1.0.0.1, 2.2.5 +- PSScriptAnalyzer: 1.21.0 +- PSWindowsUpdate: 2.2.0.3 +- SqlServer: 21.1.18256 +- VSSetup: 2.2.16 + ``` 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 | -| ------------------ | ---------------- | -| AWSPowerShell | 4.1.220 | -| DockerMsftProvider | 1.0.0.8 | -| MarkdownPS | 1.9 | -| Microsoft.Graph | 1.18.0 | -| Pester | 3.4.0<br>5.3.3 | -| PowerShellGet | 1.0.0.1<br>2.2.5 | -| PSScriptAnalyzer | 1.21.0 | -| PSWindowsUpdate | 2.2.0.3 | -| SqlServer | 21.1.18256 | -| VSSetup | 2.2.16 | - ### Android | Package Name | Version | | -------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | @@ -584,9 +557,9 @@ All other versions are saved but not installed. ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:bfcaaccdd710168f84093a9270824924c1f6da7f23399e1895b273e98d3363a7 | 2022-11-08 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:b2cbe723da778249a0f5557d07616f5cac6ee1ef4e79094da4e49911d70f195c | 2022-11-08 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:48a48dcd38e570a4f057f58258a92a1c01b210a767c6afd3e89d3eb6ae286384 | 2022-11-08 | -| mcr.microsoft.com/windows/nanoserver:1809 | sha256:5c9da3bfe1524eab610dfd41c79a0805c080f8307d810d62bba106b5df587698 | 2022-11-05 | -| mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:cbb8b0a709b4e0868cd2e30b1485358197b1021bb0dd4261e36b3af3ca48fd0b | 2022-11-05 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:67b8f70388bd3a455e64a709782babdea99fd97b5f2e343a79978e31dd087a56 | 2022-12-13 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:af2547c14679be4380beab9e7a763b4d8d4426213618c5c8b6854ab95a49fdd4 | 2022-12-13 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:e1fb1f060588e990706e44a0b187eb476d8e5102d00d0d708688d030aadaf8ef | 2022-12-13 | +| mcr.microsoft.com/windows/nanoserver:1809 | sha256:5b034bcdcdeafd57f1151924a80d741c7220c8276cce4c6c6d3cb1bb8d9ebf6b | 2022-12-11 | +| mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:058c8482946efa0b44b57e5ecebd7857b4df37a1365acdde32736628747ad9e1 | 2022-12-11 | From 7f283d3a61eb49ad8ae9784ecd6c264428b042d9 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 19 Dec 2022 15:47:47 +0000 Subject: [PATCH 1649/3485] Updating readme file for macOS-11 version 20221215.1 (#6792) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-11-Readme.md | 163 ++++++++++++++++---------------- 1 file changed, 81 insertions(+), 82 deletions(-) diff --git a/images/macos/macos-11-Readme.md b/images/macos/macos-11-Readme.md index bfd31d2144cf..6091436364d9 100644 --- a/images/macos/macos-11-Readme.md +++ b/images/macos/macos-11-Readme.md @@ -1,53 +1,56 @@ | Announcements | |-| +| [[macOS] Default Xcode on macOS 12 Monterey will be set to Xcode 14.1 on January, 9](https://github.com/actions/runner-images/issues/6746) | | [macOS-latest workflows will use macOS-12](https://github.com/actions/runner-images/issues/6384) | | [The macOS 10.15 Actions runner image will begin deprecation on 5/31/22 and will be fully unsupported by 12/1/22 for GitHub and ADO](https://github.com/actions/runner-images/issues/5583) | *** -# macOS 11.7 info -- System Version: macOS 11.7.1 (20G918) +# macOS 11 +- OS Version: macOS 11.7.2 (20G1020) - Kernel Version: Darwin 20.6.0 -- Image Version: 20221204.1 +- Image Version: 20221215.1 ## Installed Software + ### Language and Runtime -- .NET SDK 3.1.101 3.1.201 3.1.302 3.1.425 5.0.102 5.0.202 5.0.302 5.0.408 6.0.403 7.0.100 +- .NET Core SDK: 3.1.101, 3.1.201, 3.1.302, 3.1.426, 5.0.102, 5.0.202, 5.0.302, 5.0.408, 6.0.404, 7.0.101 - Bash 3.2.57(1)-release -- Clang/LLVM 13.0.0 is default -- Clang/LLVM 14.0.6 is available on `'$(brew --prefix llvm@14)/bin/clang'` -- gcc-9 (Homebrew GCC 9.5.0) 9.5.0 - available by `gcc-9` alias -- gcc-10 (Homebrew GCC 10.4.0) 10.4.0 - available by `gcc-10` alias -- gcc-11 (Homebrew GCC 11.3.0) 11.3.0 - available by `gcc-11` alias -- GNU Fortran (Homebrew GCC 9.5.0) 9.5.0 - available by `gfortran-9` alias -- GNU Fortran (Homebrew GCC 10.4.0) 10.4.0 - available by `gfortran-10` alias -- GNU Fortran (Homebrew GCC 11.3.0) 11.3.0 - available by `gfortran-11` alias +- Clang/LLVM 13.0.0 +- Clang/LLVM (Homebrew) 14.0.6 - available on `$(brew --prefix llvm@14)/bin/clang` +- GCC 9 (Homebrew GCC 9.5.0) - available by `gcc-9` alias +- GCC 10 (Homebrew GCC 10.4.0) - available by `gcc-10` alias +- GCC 11 (Homebrew GCC 11.3.0) - available by `gcc-11` alias +- GNU Fortran 9 (Homebrew GCC 9.5.0) - available by `gfortran-9` alias +- GNU Fortran 10 (Homebrew GCC 10.4.0) - available by `gfortran-10` alias +- GNU Fortran 11 (Homebrew GCC 11.3.0) - available by `gfortran-11` alias - Go 1.17.13 -- julia 1.8.3 +- Julia 1.8.3 - Kotlin 1.7.21-release-272 -- MSBuild 16.10.1.51301 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) -- Node.js v16.18.1 +- Mono 6.12.0.188 +- MSBuild 16.10.1.51301 (Mono 6.12.0.188) +- Node.js 16.19.0 - NVM 0.39.2 -- NVM - Cached node versions: v14.21.1 v16.18.1 v18.12.1 +- NVM - Cached node versions: 14.21.2, 16.19.0, 18.12.1 - Perl 5.36.0 -- PHP 8.1.13 +- PHP 8.2.0 - Python 2.7.18 -- Python 3.11.0 +- Python3 3.11.1 - R 4.2.2 -- Ruby 2.7.6p219 +- Ruby 2.7.7p221 ### Package Management -- Bundler version 2.3.26 +- Bundler 2.3.26 - Carthage 0.38.0 - CocoaPods 1.11.3 - Composer 2.4.4 -- Homebrew 3.6.13 +- Homebrew 3.6.15 - Miniconda 4.12.0 -- NPM 8.19.2 +- NPM 8.19.3 - NuGet 6.3.1.1 - Pip 20.3.4 (python 2.7) -- Pip 22.3.1 (python 3.11) +- Pip3 22.3.1 (python 3.11) - Pipx 1.1.0 - RubyGems 3.3.26 -- Vcpkg 2022 (build from master \<163fe7bd3>) +- Vcpkg 2022 (build from commit 4b6bce313) - Yarn 1.22.19 #### Environment variables @@ -57,7 +60,7 @@ | VCPKG_INSTALLATION_ROOT | /usr/local/share/vcpkg | ### Project Management -- Apache Ant(TM) 1.10.12 +- Apache Ant 1.10.12 - Apache Maven 3.8.6 - Gradle 7.6 - Sbt 1.8.0 @@ -66,67 +69,67 @@ - 7-Zip 17.04 - aria2 1.36.0 - azcopy 10.16.2 -- bazel 5.3.2 +- bazel 5.4.0 - bazelisk 1.15.0 - bsdtar 3.3.2 - available by 'tar' alias - Curl 7.86.0 -- Git 2.38.1 -- Git LFS: 3.3.0 -- GitHub CLI: 2.20.2 +- Git 2.39.0 +- Git LFS 3.3.0 +- GitHub CLI 2.20.2 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.3 - gpg (GnuPG) 2.3.8 -- helm v3.10.2+g50f003e -- Hub CLI: 2.14.2 -- ImageMagick 7.1.0-52 +- helm v3.10.3+g835b733 +- Hub CLI 2.14.2 +- ImageMagick 7.1.0-54 - jq 1.6 - mongo v5.0.11 - mongod v5.0.11 - Newman 5.3.2 -- OpenSSL 1.1.1s 1 Nov 2022 `(/usr/local/opt/openssl@1.1 -> ../Cellar/openssl@1.1/1.1.1s)` -- Packer 1.8.4 +- OpenSSL 1.1.1s 1 Nov 2022 +- Packer 1.8.5 - PostgreSQL 14.6 (Homebrew) - psql (PostgreSQL) 14.6 (Homebrew) - Sox 14.4.2 - Subversion (SVN) 1.14.2 - Switchaudio-osx 1.1.0 -- yq (https://github.com/mikefarah/yq/) version v4.30.5 +- yq 4.30.5 - zstd 1.5.2 ### Tools -- Aliyun CLI 3.0.139 +- Aliyun CLI 3.0.140 - App Center CLI 2.12.0 -- AWS CLI 2.9.4 +- AWS CLI 2.9.7 - AWS SAM CLI 1.66.0 - AWS Session Manager CLI 1.2.398.0 +- Azure CLI 2.43.0 - Azure CLI (azure-devops) 0.25.0 -- Azure CLI 2.42.0 -- Bicep CLI 0.12.40 +- Bicep CLI 0.13.1 - Cabal 3.6.2.0 - Cmake 3.25.1 -- CodeQL Action Bundle 2.11.4 -- Colima 0.4.6 +- CodeQL Action Bundle 2.11.6 +- Colima 0.5.0 - Fastlane 2.211.0 - GHC 9.4.3 - GHCup 0.1.18.0 - Jazzy 0.14.3 - Stack 2.9.1 -- SwiftFormat 0.50.5 +- SwiftFormat 0.50.6 - Swig 4.1.1 - Xcode Command Line Tools 13.2.0.0.1.1638488800 ### Linters - SwiftLint 0.48.0 -- yamllint 1.28.0 +- Yamllint 1.28.0 ### Browsers -- Safari 16.1 (16614.2.9.1.13) -- SafariDriver 16.1 (16614.2.9.1.13) -- Google Chrome 108.0.5359.94 +- Safari 16.2 (16614.3.7.1.7) +- SafariDriver 16.2 (16614.3.7.1.7) +- Google Chrome 108.0.5359.124 - ChromeDriver 108.0.5359.71 -- Microsoft Edge 107.0.1418.68 -- Microsoft Edge WebDriver 107.0.1418.68 -- Mozilla Firefox 107.0.1 +- Microsoft Edge 108.0.1462.46 +- Microsoft Edge WebDriver 108.0.1462.46 +- Mozilla Firefox 108.0 - geckodriver 0.32.0 - Selenium server 4.5.0 @@ -150,6 +153,7 @@ | CE 22.3.0 | GRAALVM_11_ROOT | ### Cached Tools + #### Ruby - 2.4.10 - 2.5.9 @@ -161,32 +165,30 @@ #### Python - 3.7.15 - 3.8.15 -- 3.9.14 -- 3.10.8 -- 3.11.0 +- 3.9.16 +- 3.10.9 +- 3.11.1 #### PyPy -- 2.7.18 [PyPy 7.3.9] +- 2.7.18 [PyPy 7.3.10] - 3.7.13 [PyPy 7.3.9] -- 3.8.13 [PyPy 7.3.9] -- 3.9.12 [PyPy 7.3.9] +- 3.8.15 [PyPy 7.3.10] +- 3.9.15 [PyPy 7.3.10] #### Node.js -- 14.21.1 -- 16.18.1 +- 14.21.2 +- 16.19.0 - 18.12.1 #### Go -| Version | Architecture | Environment Variable | -| ------- | ------------ | -------------------- | -| 1.17.13 (Default) | x64 | GOROOT_1_17_X64 | -| 1.18.8 | x64 | GOROOT_1_18_X64 | -| 1.19.3 | x64 | GOROOT_1_19_X64 | +- 1.17.13 +- 1.18.9 +- 1.19.4 ### Rust Tools -- Cargo 1.65.0 -- Rust 1.65.0 -- Rustdoc 1.65.0 +- Cargo 1.66.0 +- Rust 1.66.0 +- Rustdoc 1.66.0 - Rustup 1.25.1 #### Packages @@ -194,34 +196,33 @@ - Cargo-audit 0.17.4 - Cargo-outdated 0.11.1 - Cbindgen 0.24.3 -- Clippy 0.1.65 +- Clippy 0.1.66 - Rustfmt 1.5.1-stable ### PowerShell Tools -- PowerShell 7.2.7 +- PowerShell 7.2.8 #### PowerShell Modules -| Module | Version | -| ---------------- | ------- | -| Az | 9.1.1 | -| MarkdownPS | 1.9 | -| Pester | 5.3.3 | -| PSScriptAnalyzer | 1.21.0 | +- Az: 9.2.0 +- MarkdownPS: 1.9 +- Pester: 5.3.3 +- PSScriptAnalyzer: 1.21.0 ### Web Servers | Name | Version | ConfigFile | ServiceStatus | ListenPort | | ----- | -------- | ------------------------------- | ------------- | ---------- | | httpd | 2.4.54_1 | /usr/local/etc/httpd/httpd.conf | none | 80 | -| nginx | 1.23.2 | /usr/local/etc/nginx/nginx.conf | none | 80 | +| nginx | 1.23.3 | /usr/local/etc/nginx/nginx.conf | none | 80 | ### Xamarin + #### Visual Studio for Mac -| Version | Build | Path | -| -------------- | ----------- | ------------------------------------ | -| 2019 | 8.10.25.2 | /Applications/Visual Studio 2019.app | -| 2022 (default) | 17.4.0.2406 | /Applications/Visual Studio.app | +| Version | Build | Path | +| -------------- | --------- | ------------------------------------ | +| 2019 | 8.10.25.2 | /Applications/Visual Studio 2019.app | +| 2022 (default) | 17.4.2.17 | /Applications/Visual Studio.app | -##### Notes: +##### Notes ``` To use Visual Studio 2019 by default rename the app: mv "/Applications/Visual Studio.app" "/Applications/Visual Studio 2022.app" @@ -335,7 +336,7 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" | Package Name | Version | | -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 8.0 | -| Android Emulator | 31.3.13 | +| Android Emulator | 31.3.14 | | Android SDK Build-tools | 33.0.0 33.0.1<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | | Android SDK Platforms | android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | | Android SDK Platform-Tools | 33.0.3 | @@ -362,5 +363,3 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" - Tcl/Tk 8.6.13 - Zlib 1.2.13 - - From bc38aa417321ed3c906c40ae8091b7f89e1bf003 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 20 Dec 2022 16:36:14 +0000 Subject: [PATCH 1650/3485] Updating readme file for macOS-12 version 20221215.1 (#6799) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-12-Readme.md | 211 ++++++++++++++++---------------- 1 file changed, 108 insertions(+), 103 deletions(-) diff --git a/images/macos/macos-12-Readme.md b/images/macos/macos-12-Readme.md index f9cb627d9990..edd2e6159177 100644 --- a/images/macos/macos-12-Readme.md +++ b/images/macos/macos-12-Readme.md @@ -1,49 +1,52 @@ | Announcements | |-| +| [[macOS] Default Xcode on macOS 12 Monterey will be set to Xcode 14.1 on January, 9](https://github.com/actions/runner-images/issues/6746) | | [macOS-latest workflows will use macOS-12](https://github.com/actions/runner-images/issues/6384) | | [The macOS 10.15 Actions runner image will begin deprecation on 5/31/22 and will be fully unsupported by 12/1/22 for GitHub and ADO](https://github.com/actions/runner-images/issues/5583) | *** -# macOS 12.6 info -- System Version: macOS 12.6.1 (21G217) +# macOS 12 +- OS Version: macOS 12.6.2 (21G320) - Kernel Version: Darwin 21.6.0 -- Image Version: 20221204.1 +- Image Version: 20221215.1 ## Installed Software + ### Language and Runtime -- .NET SDK 3.1.101 3.1.201 3.1.302 3.1.425 5.0.102 5.0.202 5.0.302 5.0.408 6.0.403 7.0.100 +- .NET Core SDK: 3.1.101, 3.1.201, 3.1.302, 3.1.426, 5.0.102, 5.0.202, 5.0.302, 5.0.408, 6.0.404, 7.0.101 - Bash 3.2.57(1)-release -- Clang/LLVM 14.0.0 is default -- Clang/LLVM 14.0.6 is available on `'$(brew --prefix llvm@14)/bin/clang'` -- gcc-11 (Homebrew GCC 11.3.0) 11.3.0 - available by `gcc-11` alias -- GNU Fortran (Homebrew GCC 11.3.0) 11.3.0 - available by `gfortran-11` alias +- Clang/LLVM 14.0.0 +- Clang/LLVM (Homebrew) 14.0.6 - available on `$(brew --prefix llvm@14)/bin/clang` +- GCC 11 (Homebrew GCC 11.3.0) - available by `gcc-11` alias +- GNU Fortran 11 (Homebrew GCC 11.3.0) - available by `gfortran-11` alias - Go 1.17.13 -- julia 1.8.3 +- Julia 1.8.3 - Kotlin 1.7.21-release-272 -- MSBuild 16.10.1.51301 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) -- Node.js v16.18.1 +- Mono 6.12.0.188 +- MSBuild 16.10.1.51301 (Mono 6.12.0.188) +- Node.js 16.19.0 - NVM 0.39.2 -- NVM - Cached node versions: v14.21.1 v16.18.1 v18.12.1 +- NVM - Cached node versions: 14.21.2, 16.19.0, 18.12.1 - Perl 5.36.0 -- PHP 8.1.13 +- PHP 8.2.0 - Python 2.7.18 -- Python 3.11.0 +- Python3 3.11.1 - R 4.2.2 -- Ruby 3.0.4p208 +- Ruby 3.0.5p211 ### Package Management -- Bundler version 2.3.26 +- Bundler 2.3.26 - Carthage 0.38.0 - CocoaPods 1.11.3 - Composer 2.4.4 -- Homebrew 3.6.13 +- Homebrew 3.6.15 - Miniconda 4.12.0 -- NPM 8.19.2 +- NPM 8.19.3 - NuGet 6.3.1.1 - Pip 20.3.4 (python 2.7) -- Pip 22.3.1 (python 3.11) +- Pip3 22.3.1 (python 3.11) - Pipx 1.1.0 - RubyGems 3.3.26 -- Vcpkg 2022 (build from master \<163fe7bd3>) +- Vcpkg 2022 (build from commit 4b6bce313) - Yarn 1.22.19 #### Environment variables @@ -53,7 +56,7 @@ | VCPKG_INSTALLATION_ROOT | /usr/local/share/vcpkg | ### Project Management -- Apache Ant(TM) 1.10.12 +- Apache Ant 1.10.12 - Apache Maven 3.8.6 - Gradle 7.6 - Sbt 1.8.0 @@ -62,66 +65,66 @@ - 7-Zip 17.04 - aria2 1.36.0 - azcopy 10.16.2 -- bazel 5.3.2 +- bazel 5.4.0 - bazelisk 1.15.0 - bsdtar 3.5.1 - available by 'tar' alias - Curl 7.86.0 -- Git 2.38.1 -- Git LFS: 3.3.0 -- GitHub CLI: 2.20.2 +- Git 2.39.0 +- Git LFS 3.3.0 +- GitHub CLI 2.20.2 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.3 - gpg (GnuPG) 2.3.8 -- Hub CLI: 2.14.2 -- ImageMagick 7.1.0-52 +- Hub CLI 2.14.2 +- ImageMagick 7.1.0-54 - jq 1.6 - mongo v5.0.11 - mongod v5.0.11 -- OpenSSL 1.1.1s 1 Nov 2022 `(/usr/local/opt/openssl@1.1 -> ../Cellar/openssl@1.1/1.1.1s)` -- Packer 1.8.4 +- OpenSSL 1.1.1s 1 Nov 2022 +- Packer 1.8.5 - PostgreSQL 14.6 (Homebrew) - psql (PostgreSQL) 14.6 (Homebrew) - Sox 14.4.2 - Subversion (SVN) 1.14.2 - Switchaudio-osx 1.1.0 -- Vagrant 2.3.3 +- Vagrant 2.3.4 - VirtualBox 6.1.38r153438 -- yq (https://github.com/mikefarah/yq/) version v4.30.5 +- yq 4.30.5 - zstd 1.5.2 ### Tools - App Center CLI 2.12.0 -- AWS CLI 2.9.4 +- AWS CLI 2.9.7 - AWS SAM CLI 1.66.0 - AWS Session Manager CLI 1.2.398.0 +- Azure CLI 2.43.0 - Azure CLI (azure-devops) 0.25.0 -- Azure CLI 2.42.0 -- Bicep CLI 0.12.40 +- Bicep CLI 0.13.1 - Cabal 3.6.2.0 - Cmake 3.25.1 -- CodeQL Action Bundle 2.11.4 -- Colima 0.4.6 +- CodeQL Action Bundle 2.11.6 +- Colima 0.5.0 - Fastlane 2.211.0 - GHC 9.4.3 - GHCup 0.1.18.0 - Jazzy 0.14.3 - Stack 2.9.1 -- SwiftFormat 0.50.5 +- SwiftFormat 0.50.6 - Swig 4.1.1 -- Xcode Command Line Tools 14.1.0.0.1.1666437224 +- Xcode Command Line Tools 14.2.0.0.1.1668646533 ### Linters -- SwiftLint 0.50.1 -- yamllint 1.28.0 +- SwiftLint 0.50.3 +- Yamllint 1.28.0 ### Browsers -- Safari 16.1 (17614.2.9.1.13) -- SafariDriver 16.1 (17614.2.9.1.13) -- Google Chrome 108.0.5359.94 +- Safari 16.2 (17614.3.7.1.7) +- SafariDriver 16.2 (17614.3.7.1.7) +- Google Chrome 108.0.5359.124 - ChromeDriver 108.0.5359.71 -- Microsoft Edge 107.0.1418.68 -- Microsoft Edge WebDriver 107.0.1418.68 -- Mozilla Firefox 107.0.1 +- Microsoft Edge 108.0.1462.46 +- Microsoft Edge WebDriver 108.0.1462.46 +- Mozilla Firefox 108.0 - geckodriver 0.32.0 - Selenium server 4.5.0 @@ -145,6 +148,7 @@ | CE 22.3.0 | GRAALVM_11_ROOT | ### Cached Tools + #### Ruby - 2.7.7 - 3.0.5 @@ -153,32 +157,30 @@ #### Python - 3.7.15 - 3.8.15 -- 3.9.14 -- 3.10.8 -- 3.11.0 +- 3.9.16 +- 3.10.9 +- 3.11.1 #### PyPy -- 2.7.18 [PyPy 7.3.9] +- 2.7.18 [PyPy 7.3.10] - 3.7.13 [PyPy 7.3.9] -- 3.8.13 [PyPy 7.3.9] -- 3.9.12 [PyPy 7.3.9] +- 3.8.15 [PyPy 7.3.10] +- 3.9.15 [PyPy 7.3.10] #### Node.js -- 14.21.1 -- 16.18.1 +- 14.21.2 +- 16.19.0 - 18.12.1 #### Go -| Version | Architecture | Environment Variable | -| ------- | ------------ | -------------------- | -| 1.17.13 (Default) | x64 | GOROOT_1_17_X64 | -| 1.18.8 | x64 | GOROOT_1_18_X64 | -| 1.19.3 | x64 | GOROOT_1_19_X64 | +- 1.17.13 +- 1.18.9 +- 1.19.4 ### Rust Tools -- Cargo 1.65.0 -- Rust 1.65.0 -- Rustdoc 1.65.0 +- Cargo 1.66.0 +- Rust 1.66.0 +- Rustdoc 1.66.0 - Rustup 1.25.1 #### Packages @@ -186,34 +188,33 @@ - Cargo-audit 0.17.4 - Cargo-outdated 0.11.1 - Cbindgen 0.24.3 -- Clippy 0.1.65 +- Clippy 0.1.66 - Rustfmt 1.5.1-stable ### PowerShell Tools -- PowerShell 7.2.7 +- PowerShell 7.2.8 #### PowerShell Modules -| Module | Version | -| ---------------- | ------- | -| Az | 9.1.1 | -| MarkdownPS | 1.9 | -| Pester | 5.3.3 | -| PSScriptAnalyzer | 1.21.0 | +- Az: 9.2.0 +- MarkdownPS: 1.9 +- Pester: 5.3.3 +- PSScriptAnalyzer: 1.21.0 ### Web Servers | Name | Version | ConfigFile | ServiceStatus | ListenPort | | ----- | -------- | ------------------------------- | ------------- | ---------- | | httpd | 2.4.54_1 | /usr/local/etc/httpd/httpd.conf | none | 80 | -| nginx | 1.23.2 | /usr/local/etc/nginx/nginx.conf | none | 80 | +| nginx | 1.23.3 | /usr/local/etc/nginx/nginx.conf | none | 80 | ### Xamarin + #### Visual Studio for Mac -| Version | Build | Path | -| -------------- | ----------- | ------------------------------------ | -| 2019 | 8.10.25.2 | /Applications/Visual Studio 2019.app | -| 2022 (default) | 17.4.0.2406 | /Applications/Visual Studio.app | +| Version | Build | Path | +| -------------- | --------- | ------------------------------------ | +| 2019 | 8.10.25.2 | /Applications/Visual Studio 2019.app | +| 2022 (default) | 17.4.2.17 | /Applications/Visual Studio.app | -##### Notes: +##### Notes ``` To use Visual Studio 2019 by default rename the app: mv "/Applications/Visual Studio.app" "/Applications/Visual Studio 2022.app" @@ -242,6 +243,7 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" ### Xcode | Version | Build | Path | | ---------------- | -------- | ------------------------------ | +| 14.2 | 14C18 | /Applications/Xcode_14.2.app | | 14.1 | 14B47b | /Applications/Xcode_14.1.app | | 14.0.1 (default) | 14A400 | /Applications/Xcode_14.0.1.app | | 14.0 | 14A309 | /Applications/Xcode_14.0.app | @@ -262,68 +264,73 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" | macOS 12.1 | macosx12.1 | 13.2.1 | | macOS 12.3 | macosx12.3 | 13.3.1, 13.4, 13.4.1, 14.0, 14.0.1 | | macOS 13.0 | macosx13.0 | 14.1 | +| macOS 13.1 | macosx13.1 | 14.2 | | iOS 15.0 | iphoneos15.0 | 13.1 | | iOS 15.2 | iphoneos15.2 | 13.2.1 | | iOS 15.4 | iphoneos15.4 | 13.3.1 | | iOS 15.5 | iphoneos15.5 | 13.4, 13.4.1 | | iOS 16.0 | iphoneos16.0 | 14.0, 14.0.1 | | iOS 16.1 | iphoneos16.1 | 14.1 | +| iOS 16.2 | iphoneos16.2 | 14.2 | | Simulator - iOS 15.0 | iphonesimulator15.0 | 13.1 | | Simulator - iOS 15.2 | iphonesimulator15.2 | 13.2.1 | | Simulator - iOS 15.4 | iphonesimulator15.4 | 13.3.1 | | Simulator - iOS 15.5 | iphonesimulator15.5 | 13.4, 13.4.1 | | Simulator - iOS 16.0 | iphonesimulator16.0 | 14.0, 14.0.1 | | Simulator - iOS 16.1 | iphonesimulator16.1 | 14.1 | +| Simulator - iOS 16.2 | iphonesimulator16.2 | 14.2 | | tvOS 15.0 | appletvos15.0 | 13.1 | | tvOS 15.2 | appletvos15.2 | 13.2.1 | | tvOS 15.4 | appletvos15.4 | 13.3.1, 13.4, 13.4.1 | | tvOS 16.0 | appletvos16.0 | 14.0, 14.0.1 | -| tvOS 16.1 | appletvos16.1 | 14.1 | +| tvOS 16.1 | appletvos16.1 | 14.1, 14.2 | | Simulator - tvOS 15.0 | appletvsimulator15.0 | 13.1 | | Simulator - tvOS 15.2 | appletvsimulator15.2 | 13.2.1 | | Simulator - tvOS 15.4 | appletvsimulator15.4 | 13.3.1, 13.4, 13.4.1 | | Simulator - tvOS 16.0 | appletvsimulator16.0 | 14.0, 14.0.1 | -| Simulator - tvOS 16.1 | appletvsimulator16.1 | 14.1 | +| Simulator - tvOS 16.1 | appletvsimulator16.1 | 14.1, 14.2 | | watchOS 8.0 | watchos8.0 | 13.1 | | watchOS 8.3 | watchos8.3 | 13.2.1 | | watchOS 8.5 | watchos8.5 | 13.3.1, 13.4, 13.4.1 | | watchOS 9.0 | watchos9.0 | 14.0, 14.0.1 | -| watchOS 9.1 | watchos9.1 | 14.1 | +| watchOS 9.1 | watchos9.1 | 14.1, 14.2 | | Simulator - watchOS 8.0 | watchsimulator8.0 | 13.1 | | Simulator - watchOS 8.3 | watchsimulator8.3 | 13.2.1 | | Simulator - watchOS 8.5 | watchsimulator8.5 | 13.3.1, 13.4, 13.4.1 | | Simulator - watchOS 9.0 | watchsimulator9.0 | 14.0, 14.0.1 | -| Simulator - watchOS 9.1 | watchsimulator9.1 | 14.1 | +| Simulator - watchOS 9.1 | watchsimulator9.1 | 14.1, 14.2 | | DriverKit 21.0.1 | driverkit21.0.1 | 13.1 | | DriverKit 21.2 | driverkit21.2 | 13.2.1 | | DriverKit 21.4 | driverkit21.4 | 13.3.1, 13.4, 13.4.1, 14.0, 14.0.1 | | DriverKit 22.1 | driverkit22.1 | 14.1 | +| DriverKit 22.2 | driverkit22.2 | 14.2 | #### Installed Simulators -| OS | Xcode Version | Simulators | -| ----------- | -------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| iOS 15.0 | 13.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | -| iOS 15.2 | 13.2.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | -| iOS 15.4 | 13.3.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPhone SE (3rd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | -| iOS 15.5 | 13.4<br>13.4.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPhone SE (3rd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | -| iOS 16.0 | 14.0<br>14.0.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPhone SE (3rd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | -| iOS 16.1 | 14.1 | iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro (9.7-inch) | -| tvOS 15.0 | 13.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | -| tvOS 15.2 | 13.2.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | -| tvOS 15.4 | 13.3.1<br>13.4<br>13.4.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | -| tvOS 16.0 | 13.1<br>13.2.1<br>13.3.1<br>13.4<br>13.4.1<br>14.0<br>14.0.1<br>14.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | -| tvOS 16.1 | 13.1<br>13.2.1<br>13.3.1<br>13.4<br>13.4.1<br>14.0<br>14.0.1<br>14.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p)<br>Apple TV 4K (at 1080p) (2nd generation) | -| watchOS 8.0 | 13.1 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 - 45mm<br>Apple Watch Series 7 (41mm) | -| watchOS 8.3 | 13.2.1 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | -| watchOS 8.5 | 13.3.1<br>13.4<br>13.4.1 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | -| watchOS 9.0 | 13.1<br>13.2.1<br>13.3.1<br>13.4<br>13.4.1<br>14.0<br>14.0.1<br>14.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | -| watchOS 9.1 | 13.1<br>13.2.1<br>13.3.1<br>13.4<br>13.4.1<br>14.0<br>14.0.1<br>14.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | +| OS | Xcode Version | Simulators | +| ----------- | ---------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| iOS 15.0 | 13.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | +| iOS 15.2 | 13.2.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | +| iOS 15.4 | 13.3.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPhone SE (3rd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | +| iOS 15.5 | 13.4<br>13.4.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPhone SE (3rd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | +| iOS 16.0 | 14.0<br>14.0.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPhone SE (3rd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | +| iOS 16.1 | 14.1 | iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro (9.7-inch) | +| iOS 16.2 | 14.2 | iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro (9.7-inch) | +| tvOS 15.0 | 13.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | +| tvOS 15.2 | 13.2.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | +| tvOS 15.4 | 13.3.1<br>13.4<br>13.4.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | +| tvOS 16.0 | 13.1<br>13.2.1<br>13.3.1<br>13.4<br>13.4.1<br>14.0<br>14.0.1<br>14.1<br>14.2 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | +| tvOS 16.1 | 13.1<br>13.2.1<br>13.3.1<br>13.4<br>13.4.1<br>14.0<br>14.0.1<br>14.1<br>14.2 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p)<br>Apple TV 4K (at 1080p) (2nd generation) | +| watchOS 8.0 | 13.1 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | +| watchOS 8.3 | 13.2.1 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | +| watchOS 8.5 | 13.3.1<br>13.4<br>13.4.1 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | +| watchOS 9.0 | 13.1<br>13.2.1<br>13.3.1<br>13.4<br>13.4.1<br>14.0<br>14.0.1<br>14.1<br>14.2 | Apple Watch SE - 40mm (2nd generation)<br>Apple Watch SE - 44mm (2nd generation)<br>Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm<br>Apple Watch Series 8 - 41mm<br>Apple Watch Series 8 - 45mm<br>Apple Watch Ultra - 49mm | +| watchOS 9.1 | 13.1<br>13.2.1<br>13.3.1<br>13.4<br>13.4.1<br>14.0<br>14.0.1<br>14.1<br>14.2 | Apple Watch SE - 40mm (2nd generation)<br>Apple Watch SE - 44mm (2nd generation)<br>Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm<br>Apple Watch Series 8 - 41mm<br>Apple Watch Series 8 - 45mm<br>Apple Watch Ultra - 49mm | ### Android | Package Name | Version | | -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 8.0 | -| Android Emulator | 31.3.13 | +| Android Emulator | 31.3.14 | | Android SDK Build-tools | 33.0.0 33.0.1<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | | Android SDK Platforms | android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | | Android SDK Platform-Tools | 33.0.3 | @@ -353,13 +360,11 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" #### Environment variables | Name | Value | | ----------------- | ----------------------------------------------------------------------------------------- | -| PARALLELS_DMG_URL | https://download.parallels.com/desktop/v18/18.1.0-53311/ParallelsDesktop-18.1.0-53311.dmg | +| PARALLELS_DMG_URL | https://download.parallels.com/desktop/v18/18.1.1-53328/ParallelsDesktop-18.1.1-53328.dmg | -##### Notes: +##### Notes ``` If you want to use Parallels Desktop you should download a package from URL stored in PARALLELS_DMG_URL environment variable. A system extension is allowed for this version. ``` - - From 4aeccc7b5b5a63058b2d8a9a29072708e1f267bf Mon Sep 17 00:00:00 2001 From: Maxim Lobanov <maxim-lobanov@github.com> Date: Wed, 21 Dec 2022 10:58:27 +0100 Subject: [PATCH 1651/3485] Implement tests for software-report-module (#6815) * Minor improvements * fix typos * fix brew rendering * add temp test * Implement tests * Add arguments validation * ToMarkdown() * Use before-All and helpers * Get rid of arrays * Add validation, no new nodes after header * Fix naming * add workflow * Revisit comments + tiny improvements * Fix tables * Fix html table indent * remove comment * attemp to break test - testing CI * revert breaking test * fix nitpicks --- .github/workflows/powershell-tests.yml | 25 + ...iff.ps1 => Calculate-ImagesDifference.ps1} | 18 +- .../SoftwareReport.BaseNodes.psm1 | 9 + .../SoftwareReport.Comparer.psm1 | 342 ---------- .../SoftwareReport.DifferenceCalculator.psm1 | 136 ++++ .../SoftwareReport.DifferenceRender.psm1 | 225 +++++++ .../SoftwareReport.Nodes.psm1 | 187 +++--- .../software-report-base/SoftwareReport.psm1 | 12 +- .../SoftwareReport.Difference.E2E.Tests.ps1 | 525 +++++++++++++++ ...Report.DifferenceCalculator.Unit.Tests.ps1 | 603 ++++++++++++++++++ ...wareReport.DifferenceRender.Unit.Tests.ps1 | 291 +++++++++ .../tests/SoftwareReport.E2E.Tests.ps1 | 93 +++ .../tests/SoftwareReport.Nodes.Unit.Tests.ps1 | 511 +++++++++++++++ .../tests/TestHelpers.psm1 | 34 + .../SoftwareReport.Generator.ps1 | 4 +- .../SoftwareReport.Toolcache.psm1 | 12 +- 16 files changed, 2597 insertions(+), 430 deletions(-) create mode 100644 .github/workflows/powershell-tests.yml rename helpers/software-report-base/{Calculate-ImagesDiff.ps1 => Calculate-ImagesDifference.ps1} (62%) delete mode 100644 helpers/software-report-base/SoftwareReport.Comparer.psm1 create mode 100644 helpers/software-report-base/SoftwareReport.DifferenceCalculator.psm1 create mode 100644 helpers/software-report-base/SoftwareReport.DifferenceRender.psm1 create mode 100644 helpers/software-report-base/tests/SoftwareReport.Difference.E2E.Tests.ps1 create mode 100644 helpers/software-report-base/tests/SoftwareReport.DifferenceCalculator.Unit.Tests.ps1 create mode 100644 helpers/software-report-base/tests/SoftwareReport.DifferenceRender.Unit.Tests.ps1 create mode 100644 helpers/software-report-base/tests/SoftwareReport.E2E.Tests.ps1 create mode 100644 helpers/software-report-base/tests/SoftwareReport.Nodes.Unit.Tests.ps1 create mode 100644 helpers/software-report-base/tests/TestHelpers.psm1 diff --git a/.github/workflows/powershell-tests.yml b/.github/workflows/powershell-tests.yml new file mode 100644 index 000000000000..3cf950d48254 --- /dev/null +++ b/.github/workflows/powershell-tests.yml @@ -0,0 +1,25 @@ +# CI Validation + +name: PowerShell Tests + +on: + pull_request: + branches: [ main ] + paths: + - 'helpers/software-report-base/**' + +jobs: + powershell-tests: + name: PowerShell tests + runs-on: ubuntu-latest + + steps: + - name: Checkout Repository + uses: actions/checkout@v3 + + - name: Run Software Report module tests + shell: pwsh + run: | + $ErrorActionPreference = "Stop" + Invoke-Pester -Output Detailed "helpers/software-report-base/tests" + \ No newline at end of file diff --git a/helpers/software-report-base/Calculate-ImagesDiff.ps1 b/helpers/software-report-base/Calculate-ImagesDifference.ps1 similarity index 62% rename from helpers/software-report-base/Calculate-ImagesDiff.ps1 rename to helpers/software-report-base/Calculate-ImagesDifference.ps1 index 91a05c86bf81..1536217092d1 100644 --- a/helpers/software-report-base/Calculate-ImagesDiff.ps1 +++ b/helpers/software-report-base/Calculate-ImagesDifference.ps1 @@ -1,5 +1,5 @@ using module ./SoftwareReport.psm1 -using module ./SoftwareReport.Comparer.psm1 +using module ./SoftwareReport.DifferenceCalculator.psm1 <# .SYNOPSIS @@ -10,6 +10,10 @@ using module ./SoftwareReport.Comparer.psm1 Path to the current software report. .PARAMETER OutputFile Path to the file where the difference will be saved. +.PARAMETER ReleaseBranchName + Name of the release branch to build image docs URL. +.PARAMETER ReadmePath + Path to the README file in repository to build image docs URL. #> Param ( @@ -20,7 +24,9 @@ Param ( [Parameter(Mandatory=$true)] [string] $OutputFile, [Parameter(Mandatory=$false)] - [string] $ImageDocsUrl + [string] $ReleaseBranchName, + [Parameter(Mandatory=$false)] + [string] $ReadmePath ) $ErrorActionPreference = "Stop" @@ -44,12 +50,14 @@ function Read-SoftwareReport { $previousReport = Read-SoftwareReport -JsonReportPath $PreviousJsonReportPath $currentReport = Read-SoftwareReport -JsonReportPath $CurrentJsonReportPath -$comparer = [SoftwareReportComparer]::new($previousReport, $currentReport) +$comparer = [SoftwareReportDifferenceCalculator]::new($previousReport, $currentReport) $comparer.CompareReports() $diff = $comparer.GetMarkdownReport() -if ($ImageDocsUrl) { - $diff += "`n`n`n For comprehensive list of software installed on this image please click [here]($ImageDocsUrl)." +if ($ReleaseBranch -and $ReadmePath) { + # https://github.com/actions/runner-images/blob/releases/macOS-12/20221215/images/macos/macos-12-Readme.md + $ImageDocsUrl = "https://github.com/actions/runner-images/blob/${ReleaseBranchName}/${ReadmePath}" + $diff += "`n`n`nFor comprehensive list of software installed on this image please click [here]($ImageDocsUrl)." } $diff | Out-File -Path $OutputFile -Encoding utf8NoBOM diff --git a/helpers/software-report-base/SoftwareReport.BaseNodes.psm1 b/helpers/software-report-base/SoftwareReport.BaseNodes.psm1 index db7916ae9fec..8bfb01c988dc 100644 --- a/helpers/software-report-base/SoftwareReport.BaseNodes.psm1 +++ b/helpers/software-report-base/SoftwareReport.BaseNodes.psm1 @@ -8,6 +8,14 @@ class BaseNode { return $false } + [String] ToMarkdown() { + return $this.ToMarkdown(1) + } + + [String] ToMarkdown([Int32] $Level) { + throw "Abtract method 'ToMarkdown(level)' is not implemented for '$($this.GetType().Name)'" + } + [Boolean] IsSimilarTo([BaseNode] $OtherNode) { throw "Abtract method 'IsSimilarTo' is not implemented for '$($this.GetType().Name)'" } @@ -19,6 +27,7 @@ class BaseNode { # Abstract base class for all nodes that describe a tool and should be rendered inside diff table class BaseToolNode: BaseNode { + [ValidateNotNullOrEmpty()] [String] $ToolName BaseToolNode([String] $ToolName) { diff --git a/helpers/software-report-base/SoftwareReport.Comparer.psm1 b/helpers/software-report-base/SoftwareReport.Comparer.psm1 deleted file mode 100644 index bcce515c353a..000000000000 --- a/helpers/software-report-base/SoftwareReport.Comparer.psm1 +++ /dev/null @@ -1,342 +0,0 @@ -using module ./SoftwareReport.psm1 -using module ./SoftwareReport.BaseNodes.psm1 -using module ./SoftwareReport.Nodes.psm1 - - -# SoftwareReportComparer is used to calculate differences between two SoftwareReport objects -class SoftwareReportComparer { - hidden [SoftwareReport] $PreviousReport - hidden [SoftwareReport] $CurrentReport - - hidden [Collections.Generic.List[ReportDifferenceItem]] $AddedItems - hidden [Collections.Generic.List[ReportDifferenceItem]] $ChangedItems - hidden [Collections.Generic.List[ReportDifferenceItem]] $DeletedItems - - SoftwareReportComparer([SoftwareReport] $PreviousReport, [SoftwareReport] $CurrentReport) { - $this.PreviousReport = $PreviousReport - $this.CurrentReport = $CurrentReport - } - - [void] CompareReports() { - $this.AddedItems = @() - $this.ChangedItems = @() - $this.DeletedItems = @() - - $this.CompareInternal($this.PreviousReport.Root, $this.CurrentReport.Root, @()) - } - - hidden [void] CompareInternal([HeaderNode] $previousReportPointer, [HeaderNode] $currentReportPointer, [Array] $Headers) { - $currentReportPointer.Children ?? @() | Where-Object { $_.ShouldBeIncludedToDiff() -and $this.FilterExcludedNodes($_) } | ForEach-Object { - $currentReportNode = $_ - $sameNodeInPreviousReport = $previousReportPointer ? $previousReportPointer.FindSimilarChildNode($currentReportNode) : $null - - if ($currentReportNode -is [HeaderNode]) { - $this.CompareInternal($sameNodeInPreviousReport, $currentReportNode, $Headers + $currentReportNode.Title) - } else { - if ($sameNodeInPreviousReport -and ($currentReportNode.IsIdenticalTo($sameNodeInPreviousReport))) { - # Nodes are identical, nothing changed, just ignore it - } elseif ($sameNodeInPreviousReport) { - # Nodes are equal but not identical, so something was changed - if ($currentReportNode -is [TableNode]) { - $this.CompareSimilarTableNodes($sameNodeInPreviousReport, $currentReportNode, $Headers) - } elseif ($currentReportNode -is [ToolVersionsListNode]) { - $this.CompareSimilarToolVersionsListNodes($sameNodeInPreviousReport, $currentReportNode, $Headers) - } else { - $this.ChangedItems.Add([ReportDifferenceItem]::new($sameNodeInPreviousReport, $currentReportNode, $Headers)) - } - } else { - # Node was not found in previous report, new node was added - $this.AddedItems.Add([ReportDifferenceItem]::new($null, $currentReportNode, $Headers)) - } - } - } - - # Detecting nodes that were removed - $previousReportPointer.Children ?? @() | Where-Object { $_.ShouldBeIncludedToDiff() -and $this.FilterExcludedNodes($_) } | ForEach-Object { - $previousReportNode = $_ - $sameNodeInCurrentReport = $currentReportPointer ? $currentReportPointer.FindSimilarChildNode($previousReportNode) : $null - - if (-not $sameNodeInCurrentReport) { - if ($previousReportNode -is [HeaderNode]) { - $this.CompareInternal($previousReportNode, $null, $Headers + $previousReportNode.Title) - } else { - $this.DeletedItems.Add([ReportDifferenceItem]::new($previousReportNode, $null, $Headers)) - } - } - } - } - - hidden [void] CompareSimilarTableNodes([TableNode] $PreviousReportNode, [TableNode] $CurrentReportNode, [Array] $Headers) { - $addedRows = $CurrentReportNode.Rows | Where-Object { $_ -notin $PreviousReportNode.Rows } - $deletedRows = $PreviousReportNode.Rows | Where-Object { $_ -notin $CurrentReportNode.Rows } - - if (($addedRows.Count -gt 0) -and ($deletedRows.Count -eq 0)) { - $this.AddedItems.Add([ReportDifferenceItem]::new($PreviousReportNode, $CurrentReportNode, $Headers)) - } elseif (($deletedRows.Count -gt 0) -and ($addedRows.Count -eq 0)) { - $this.DeletedItems.Add([ReportDifferenceItem]::new($PreviousReportNode, $CurrentReportNode, $Headers)) - } else { - $this.ChangedItems.Add([ReportDifferenceItem]::new($PreviousReportNode, $CurrentReportNode, $Headers)) - } - } - - hidden [void] CompareSimilarToolVersionsListNodes([ToolVersionsListNode] $PreviousReportNode, [ToolVersionsListNode] $CurrentReportNode, [Array] $Headers) { - $previousReportMajorVersions = $PreviousReportNode.Versions | ForEach-Object { $PreviousReportNode.ExtractMajorVersion($_) } - $currentReportMajorVersion = $CurrentReportNode.Versions | ForEach-Object { $CurrentReportNode.ExtractMajorVersion($_) } - - $addedVersions = $CurrentReportNode.Versions | Where-Object { $CurrentReportNode.ExtractMajorVersion($_) -notin $previousReportMajorVersions } - $deletedVersions = $PreviousReportNode.Versions | Where-Object { $PreviousReportNode.ExtractMajorVersion($_) -notin $currentReportMajorVersion } - $changedPreviousVersions = $PreviousReportNode.Versions | Where-Object { ($PreviousReportNode.ExtractMajorVersion($_) -in $currentReportMajorVersion) -and ($_ -notin $CurrentReportNode.Versions) } - $changedCurrentVersions = $CurrentReportNode.Versions | Where-Object { ($CurrentReportNode.ExtractMajorVersion($_) -in $previousReportMajorVersions) -and ($_ -notin $PreviousReportNode.Versions) } - - if ($addedVersions.Count -gt 0) { - $this.AddedItems.Add([ReportDifferenceItem]::new($null, [ToolVersionsListNode]::new($CurrentReportNode.ToolName, $addedVersions, $CurrentReportNode.MajorVersionRegex, $true), $Headers)) - } - - if ($deletedVersions.Count -gt 0) { - $this.DeletedItems.Add([ReportDifferenceItem]::new([ToolVersionsListNode]::new($PreviousReportNode.ToolName, $deletedVersions, $PreviousReportNode.MajorVersionRegex, $true), $null, $Headers)) - } - - $previousChangedNode = ($changedPreviousVersions.Count -gt 0) ? [ToolVersionsListNode]::new($PreviousReportNode.ToolName, $changedPreviousVersions, $PreviousReportNode.MajorVersionRegex, $true) : $null - $currentChangedNode = ($changedCurrentVersions.Count -gt 0) ? [ToolVersionsListNode]::new($CurrentReportNode.ToolName, $changedCurrentVersions, $CurrentReportNode.MajorVersionRegex, $true) : $null - if ($previousChangedNode -and $currentChangedNode) { - $this.ChangedItems.Add([ReportDifferenceItem]::new($previousChangedNode, $currentChangedNode, $Headers)) - } - } - - [String] GetMarkdownReport() { - $reporter = [SoftwareReportComparerReport]::new() - $report = $reporter.GenerateMarkdownReport($this.CurrentReport, $this.PreviousReport, $this.AddedItems, $this.ChangedItems, $this.DeletedItems) - return $report - } - - hidden [Boolean] FilterExcludedNodes([BaseNode] $Node) { - # We shouldn't show "Image Version" diff because it is already shown in report header - if (($Node -is [ToolVersionNode]) -and ($Node.ToolName -eq "Image Version:")) { - return $false - } - - return $true - } -} - -# SoftwareReportComparerReport is used to render results of SoftwareReportComparer in markdown format -class SoftwareReportComparerReport { - [String] GenerateMarkdownReport([SoftwareReport] $CurrentReport, [SoftwareReport] $PreviousReport, [ReportDifferenceItem[]] $AddedItems, [ReportDifferenceItem[]] $ChangedItems, [ReportDifferenceItem[]] $DeletedItems) { - $sb = [System.Text.StringBuilder]::new() - - $rootNode = $CurrentReport.Root - $imageVersion = $this.GetImageVersion($CurrentReport) - $previousImageVersion = $this.GetImageVersion($PreviousReport) - - ############################# - ### Render report header #### - ############################# - - $sb.AppendLine("# :desktop_computer: Actions Runner Image: $($rootNode.Title)") - - # ToolNodes on root level contains main image description so just copy-paste them to final report - $rootNode.Children | Where-Object { $_ -is [BaseToolNode] } | ForEach-Object { - $sb.AppendLine($_.ToMarkdown(0)) - } - $sb.AppendLine() - - $sb.AppendLine("## :mega: What's changed?") - - ########################### - ### Render added items #### - ########################### - - [ReportDifferenceItem[]] $addedItemsExcludeTables = $AddedItems | Where-Object { $_.IsBaseToolNode() } - if ($addedItemsExcludeTables.Count -gt 0) { - $tableItems = $addedItemsExcludeTables | ForEach-Object { - [PSCustomObject]@{ - "Category" = $this.RenderCategory($_.Headers, $true); - "Tool name" = $this.RenderToolName($_.CurrentReportNode.ToolName); - "Current ($imageVersion)" = $_.CurrentReportNode.GetValue(); - } - } - - $sb.AppendLine("### Added :heavy_plus_sign:") - $sb.AppendLine($this.RenderHtmlTable($tableItems, "Category")) - } - - # Render added tables separately - $AddedItems | Where-Object { $_.IsTableNode() } | ForEach-Object { - $sb.AppendLine($this.RenderTableNodesDiff($_)) - } - - ############################# - ### Render deleted items #### - ############################# - - [ReportDifferenceItem[]] $deletedItemsExcludeTables = $DeletedItems | Where-Object { $_.IsBaseToolNode() } - if ($deletedItemsExcludeTables.Count -gt 0) { - $tableItems = $deletedItemsExcludeTables | ForEach-Object { - [PSCustomObject]@{ - "Category" = $this.RenderCategory($_.Headers, $true); - "Tool name" = $this.RenderToolName($_.PreviousReportNode.ToolName); - "Previous ($previousImageVersion)" = $_.PreviousReportNode.GetValue(); - } - } - - $sb.AppendLine("### Deleted :heavy_minus_sign:") - $sb.AppendLine($this.RenderHtmlTable($tableItems, "Category")) - } - - # Render deleted tables separately - $DeletedItems | Where-Object { $_.IsTableNode() } | ForEach-Object { - $sb.AppendLine($this.RenderTableNodesDiff($_)) - } - - ############################# - ### Render updated items #### - ############################# - - [ReportDifferenceItem[]] $changedItemsExcludeTables = $ChangedItems | Where-Object { $_.IsBaseToolNode() } - if ($changedItemsExcludeTables.Count -gt 0) { - $tableItems = $changedItemsExcludeTables | ForEach-Object { - [PSCustomObject]@{ - "Category" = $this.RenderCategory($_.Headers, $true); - "Tool name" = $this.RenderToolName($_.CurrentReportNode.ToolName); - "Previous ($previousImageVersion)" = $_.PreviousReportNode.GetValue(); - "Current ($imageVersion)" = $_.CurrentReportNode.GetValue(); - } - } - - $sb.AppendLine("### Updated") - $sb.AppendLine($this.RenderHtmlTable($tableItems, "Category")) - } - - # Render updated tables separately - $ChangedItems | Where-Object { $_.IsTableNode() } | ForEach-Object { - $sb.AppendLine($this.RenderTableNodesDiff($_)) - } - - return $sb.ToString() - } - - [String] RenderHtmlTable([PSCustomObject[]] $Table, $RowSpanColumnName) { - $headers = $Table[0].PSObject.Properties.Name - - $sb = [System.Text.StringBuilder]::new() - $sb.AppendLine("<table>") - $sb.AppendLine(" <thead>") - $headers | ForEach-Object { - $sb.AppendLine(" <th>$_</th>") - } - $sb.AppendLine(" </thead>") - $sb.AppendLine(" <tbody>") - - $tableRowSpans = $this.CalculateHtmlTableRowSpan($Table, $RowSpanColumnName) - for ($rowIndex = 0; $rowIndex -lt $Table.Count; $rowIndex++) { - $row = $Table[$rowIndex] - - $sb.AppendLine(" <tr>") - $headers | ForEach-Object { - if ($_ -eq $RowSpanColumnName) { - if ($tableRowSpans[$rowIndex] -gt 0) { - $sb.AppendLine(" <td rowspan=$($tableRowSpans[$rowIndex])>$($row.$_)</td>") - } else { - # Skip rendering this cell at all - } - } else { - $sb.AppendLine(" <td>$($row.$_)</td>") - } - } - $sb.AppendLine(" </tr>") - } - $sb.AppendLine(" </tbody>") - $sb.AppendLine("</table>") - - return $sb.ToString() - } - - [int[]] CalculateHtmlTableRowSpan([PSCustomObject[]] $Table, $keyColumn) { - $result = @(0) * $Table.Count - - for ($rowIndex = $Table.Count - 1; $rowIndex -ge 0; $rowIndex--) { - if (($rowIndex -lt ($Table.Count - 1)) -and ($Table[$rowIndex].$keyColumn -eq $Table[$rowIndex + 1].$keyColumn)) { - # If the current row is the same as the next row - # Then rowspan of current row should be equal to rowspan of the next row + 1 - # And rowspan of the next row should be 0 because it is already included in the rowspan of the current row - $result[$rowIndex] = $result[$rowIndex + 1] + 1 - $result[$rowIndex + 1] = 0 - } else { - $result[$rowIndex] = 1 - } - } - - return $result - } - - [String] RenderTableNodesDiff([ReportDifferenceItem] $DiffItem) { - # Use the simplest approach for now: first, print all removed lines. Then print added lines - # It will work well for most cases like changing existing rows, adding new rows and removing rows - # But can produce not so pretty results for cases when some rows are changed and some rows are added at the same time - # Let's see how it works in practice and improve it later if needed - - [String] $tableHeaders = ($DiffItem.CurrentReportNode ?? $DiffItem.PreviousReportNode).Headers - [System.Collections.ArrayList] $tableRows = @() - $DiffItem.PreviousReportNode.Rows ?? @() | Where-Object { $_ -notin $DiffItem.CurrentReportNode.Rows } | ForEach-Object { - $tableRows.Add($this.StrikeTableRow($_)) - } - $DiffItem.CurrentReportNode.Rows ?? @() | Where-Object { $_ -notin $DiffItem.PreviousReportNode.Rows } | ForEach-Object { - $tableRows.Add($_) - } - - $sb = [System.Text.StringBuilder]::new() - $sb.AppendLine("#### $($this.RenderCategory($DiffItem.Headers, $false))") - $sb.AppendLine([TableNode]::new($tableHeaders, $tableRows).ToMarkdown(0)) - return $sb.ToString() - } - - [String] RenderCategory([Array] $Headers, [Boolean] $AddLineSeparator) { - # Always skip the first header because it is "Installed Software" - [Array] $takeHeaders = $Headers | Select-Object -Skip 1 - if ($takeHeaders.Count -eq 0) { - return "" - } - - $lineSeparator = $AddLineSeparator ? "<br>": "" - return [String]::Join(" >$lineSeparator ", $takeHeaders) - } - - [String] RenderToolName([String] $ToolName) { - return $ToolName.TrimEnd(":") - } - - [String] StrikeTableRow([String] $Row) { - # Convert "a|b|c" to "~~a~~|~~b~~|~~c~~ - $cells = $Row.Split("|") - $strikedCells = $cells | ForEach-Object { "~~$($_)~~"} - return [String]::Join("|", $strikedCells) - } - - [String] GetImageVersion([SoftwareReport] $Report) { - $imageVersionNode = $Report.Root.Children ?? @() | Where-Object { ($_ -is [ToolVersionNode]) -and ($_.ToolName -eq "Image Version:") } | Select-Object -First 1 - return $imageVersionNode.Version ?? "Unknown version" - } -} - -# Temporary structure to store the single difference between two reports -class ReportDifferenceItem { - [BaseNode] $PreviousReportNode - [BaseNode] $CurrentReportNode - [Array] $Headers - - ReportDifferenceItem([BaseNode] $PreviousReportNode, [BaseNode] $CurrentReportNode, [Array] $Headers) { - $this.PreviousReportNode = $PreviousReportNode - $this.CurrentReportNode = $CurrentReportNode - $this.Headers = $Headers - } - - [Boolean] IsBaseToolNode() { - $node = $this.CurrentReportNode ?? $this.PreviousReportNode - return $node -is [BaseToolNode] - } - - [Boolean] IsTableNode() { - $node = $this.CurrentReportNode ?? $this.PreviousReportNode - return $node -is [TableNode] - } -} \ No newline at end of file diff --git a/helpers/software-report-base/SoftwareReport.DifferenceCalculator.psm1 b/helpers/software-report-base/SoftwareReport.DifferenceCalculator.psm1 new file mode 100644 index 000000000000..38a1df6f868d --- /dev/null +++ b/helpers/software-report-base/SoftwareReport.DifferenceCalculator.psm1 @@ -0,0 +1,136 @@ +using module ./SoftwareReport.psm1 +using module ./SoftwareReport.BaseNodes.psm1 +using module ./SoftwareReport.Nodes.psm1 +using module ./SoftwareReport.DifferenceRender.psm1 + +class SoftwareReportDifferenceCalculator { + [ValidateNotNullOrEmpty()] + hidden [SoftwareReport] $PreviousReport + [ValidateNotNullOrEmpty()] + hidden [SoftwareReport] $CurrentReport + + hidden [Collections.Generic.List[ReportDifferenceItem]] $AddedItems + hidden [Collections.Generic.List[ReportDifferenceItem]] $ChangedItems + hidden [Collections.Generic.List[ReportDifferenceItem]] $DeletedItems + + SoftwareReportDifferenceCalculator([SoftwareReport] $PreviousReport, [SoftwareReport] $CurrentReport) { + $this.PreviousReport = $PreviousReport + $this.CurrentReport = $CurrentReport + } + + [void] CompareReports() { + $this.AddedItems = @() + $this.ChangedItems = @() + $this.DeletedItems = @() + + $this.CompareInternal($this.PreviousReport.Root, $this.CurrentReport.Root, @()) + } + + [String] GetMarkdownReport() { + $reporter = [SoftwareReportDifferenceRender]::new() + $report = $reporter.GenerateMarkdownReport($this.CurrentReport, $this.PreviousReport, $this.AddedItems, $this.ChangedItems, $this.DeletedItems) + return $report + } + + hidden [void] CompareInternal([HeaderNode] $previousReportPointer, [HeaderNode] $currentReportPointer, [String[]] $Headers) { + $currentReportPointer.Children ?? @() | Where-Object { $_.ShouldBeIncludedToDiff() -and $this.FilterExcludedNodes($_) } | ForEach-Object { + $currentReportNode = $_ + $sameNodeInPreviousReport = $previousReportPointer ? $previousReportPointer.FindSimilarChildNode($currentReportNode) : $null + + if ($currentReportNode -is [HeaderNode]) { + # Compare HeaderNode recursively + $this.CompareInternal($sameNodeInPreviousReport, $currentReportNode, $Headers + $currentReportNode.Title) + } else { + if ($sameNodeInPreviousReport -and ($currentReportNode.IsIdenticalTo($sameNodeInPreviousReport))) { + # Nodes are identical, nothing changed, just ignore it + } elseif ($sameNodeInPreviousReport) { + # Nodes are equal but not identical, something was changed + if ($currentReportNode -is [TableNode]) { + $this.CompareSimilarTableNodes($sameNodeInPreviousReport, $currentReportNode, $Headers) + } elseif ($currentReportNode -is [ToolVersionsListNode]) { + $this.CompareSimilarToolVersionsListNodes($sameNodeInPreviousReport, $currentReportNode, $Headers) + } else { + $this.ChangedItems.Add([ReportDifferenceItem]::new($sameNodeInPreviousReport, $currentReportNode, $Headers)) + } + } else { + # Node was not found in previous report, new node was added + $this.AddedItems.Add([ReportDifferenceItem]::new($null, $currentReportNode, $Headers)) + } + } + } + + # Detecting nodes that were removed + $previousReportPointer.Children ?? @() | Where-Object { $_.ShouldBeIncludedToDiff() -and $this.FilterExcludedNodes($_) } | ForEach-Object { + $previousReportNode = $_ + $sameNodeInCurrentReport = $currentReportPointer ? $currentReportPointer.FindSimilarChildNode($previousReportNode) : $null + + if (-not $sameNodeInCurrentReport) { + if ($previousReportNode -is [HeaderNode]) { + # Compare removed HeaderNode recursively + $this.CompareInternal($previousReportNode, $null, $Headers + $previousReportNode.Title) + } else { + # Node was not found in current report, node was removed + $this.DeletedItems.Add([ReportDifferenceItem]::new($previousReportNode, $null, $Headers)) + } + } + } + } + + hidden [void] CompareSimilarTableNodes([TableNode] $PreviousReportNode, [TableNode] $CurrentReportNode, [String[]] $Headers) { + $addedRows = $CurrentReportNode.Rows | Where-Object { $_ -notin $PreviousReportNode.Rows } + $deletedRows = $PreviousReportNode.Rows | Where-Object { $_ -notin $CurrentReportNode.Rows } + + if (($addedRows.Count -eq 0) -and ($deletedRows.Count -eq 0)) { + # Unexpected state: TableNodes are identical + return + } + + if ($PreviousReportNode.Headers -ne $CurrentReportNode.Headers) { + # If headers are changed and rows are changed at the same time, we should track it as removing table and adding new one + $this.DeletedItems.Add([ReportDifferenceItem]::new($PreviousReportNode, $null, $Headers)) + $this.AddedItems.Add([ReportDifferenceItem]::new($null, $CurrentReportNode, $Headers)) + } elseif (($addedRows.Count -gt 0) -and ($deletedRows.Count -eq 0)) { + # If new rows were added and no rows were deleted, then it is AddedItem + $this.AddedItems.Add([ReportDifferenceItem]::new($PreviousReportNode, $CurrentReportNode, $Headers)) + } elseif (($deletedRows.Count -gt 0) -and ($addedRows.Count -eq 0)) { + # If no rows were added and some rows were deleted, then it is DeletedItem + $this.DeletedItems.Add([ReportDifferenceItem]::new($PreviousReportNode, $CurrentReportNode, $Headers)) + } else { + # If some rows were added and some rows were removed, then it is UpdatedItem + $this.ChangedItems.Add([ReportDifferenceItem]::new($PreviousReportNode, $CurrentReportNode, $Headers)) + } + } + + hidden [void] CompareSimilarToolVersionsListNodes([ToolVersionsListNode] $PreviousReportNode, [ToolVersionsListNode] $CurrentReportNode, [String[]] $Headers) { + $previousReportMajorVersions = $PreviousReportNode.Versions | ForEach-Object { $PreviousReportNode.ExtractMajorVersion($_) } + $currentReportMajorVersion = $CurrentReportNode.Versions | ForEach-Object { $CurrentReportNode.ExtractMajorVersion($_) } + + $addedVersions = $CurrentReportNode.Versions | Where-Object { $CurrentReportNode.ExtractMajorVersion($_) -notin $previousReportMajorVersions } + $deletedVersions = $PreviousReportNode.Versions | Where-Object { $PreviousReportNode.ExtractMajorVersion($_) -notin $currentReportMajorVersion } + $changedPreviousVersions = $PreviousReportNode.Versions | Where-Object { ($PreviousReportNode.ExtractMajorVersion($_) -in $currentReportMajorVersion) -and ($_ -notin $CurrentReportNode.Versions) } + $changedCurrentVersions = $CurrentReportNode.Versions | Where-Object { ($CurrentReportNode.ExtractMajorVersion($_) -in $previousReportMajorVersions) -and ($_ -notin $PreviousReportNode.Versions) } + + if ($addedVersions.Count -gt 0) { + $this.AddedItems.Add([ReportDifferenceItem]::new($null, [ToolVersionsListNode]::new($CurrentReportNode.ToolName, $addedVersions, $CurrentReportNode.MajorVersionRegex, "List"), $Headers)) + } + + if ($deletedVersions.Count -gt 0) { + $this.DeletedItems.Add([ReportDifferenceItem]::new([ToolVersionsListNode]::new($PreviousReportNode.ToolName, $deletedVersions, $PreviousReportNode.MajorVersionRegex, "List"), $null, $Headers)) + } + + $previousChangedNode = ($changedPreviousVersions.Count -gt 0) ? [ToolVersionsListNode]::new($PreviousReportNode.ToolName, $changedPreviousVersions, $PreviousReportNode.MajorVersionRegex, "List") : $null + $currentChangedNode = ($changedCurrentVersions.Count -gt 0) ? [ToolVersionsListNode]::new($CurrentReportNode.ToolName, $changedCurrentVersions, $CurrentReportNode.MajorVersionRegex, "List") : $null + if ($previousChangedNode -and $currentChangedNode) { + $this.ChangedItems.Add([ReportDifferenceItem]::new($previousChangedNode, $currentChangedNode, $Headers)) + } + } + + hidden [Boolean] FilterExcludedNodes([BaseNode] $Node) { + # We shouldn't show "Image Version" diff because it is already shown in report header + if (($Node -is [ToolVersionNode]) -and ($Node.ToolName -eq "Image Version:")) { + return $false + } + + return $true + } +} \ No newline at end of file diff --git a/helpers/software-report-base/SoftwareReport.DifferenceRender.psm1 b/helpers/software-report-base/SoftwareReport.DifferenceRender.psm1 new file mode 100644 index 000000000000..91d51e300bfa --- /dev/null +++ b/helpers/software-report-base/SoftwareReport.DifferenceRender.psm1 @@ -0,0 +1,225 @@ +using module ./SoftwareReport.psm1 +using module ./SoftwareReport.BaseNodes.psm1 +using module ./SoftwareReport.Nodes.psm1 + +class SoftwareReportDifferenceRender { + [String] GenerateMarkdownReport([SoftwareReport] $CurrentReport, [SoftwareReport] $PreviousReport, [ReportDifferenceItem[]] $AddedItems, [ReportDifferenceItem[]] $ChangedItems, [ReportDifferenceItem[]] $DeletedItems) { + $sb = [System.Text.StringBuilder]::new() + + $rootNode = $CurrentReport.Root + $imageVersion = $CurrentReport.GetImageVersion() + $previousImageVersion = $PreviousReport.GetImageVersion() + + ############################# + ### Render report header #### + ############################# + + $sb.AppendLine("# :desktop_computer: Actions Runner Image: $($rootNode.Title)") + + # ToolVersionNodes on root level contains main image description so just copy-paste them to final report + $rootNode.Children | Where-Object { $_ -is [ToolVersionNode] } | ForEach-Object { + $sb.AppendLine($_.ToMarkdown()) + } + $sb.AppendLine() + + $sb.AppendLine("## :mega: What's changed?").AppendLine() + + ########################### + ### Render added items #### + ########################### + + [ReportDifferenceItem[]] $addedItemsBaseTools = $AddedItems | Where-Object { $_.IsBaseToolNode() } + [ReportDifferenceItem[]] $addedItemsTables = $AddedItems | Where-Object { $_.IsTableNode() } + if ($addedItemsBaseTools.Count + $addedItemsTables.Count -gt 0) { + $sb.AppendLine("### Added :heavy_plus_sign:").AppendLine() + } + if ($addedItemsBaseTools.Count -gt 0) { + $tableItems = $addedItemsBaseTools | ForEach-Object { + [PSCustomObject]@{ + "Category" = $this.RenderCategory($_.Headers, $true); + "Tool name" = $this.RenderToolName($_.CurrentReportNode.ToolName); + "Current ($imageVersion)" = $_.CurrentReportNode.GetValue(); + } + } + $sb.AppendLine($this.RenderHtmlTable($tableItems, "Category")) + } + if ($addedItemsTables.Count -gt 0) { + $addedItemsTables | ForEach-Object { + $sb.AppendLine($this.RenderTableNodesDiff($_)) + } + } + + ############################# + ### Render deleted items #### + ############################# + + [ReportDifferenceItem[]] $deletedItemsBaseTools = $DeletedItems | Where-Object { $_.IsBaseToolNode() } + [ReportDifferenceItem[]] $deletedItemsTables = $DeletedItems | Where-Object { $_.IsTableNode() } + if ($deletedItemsBaseTools.Count + $deletedItemsTables.Count -gt 0) { + $sb.AppendLine("### Deleted :heavy_minus_sign:").AppendLine() + } + if ($deletedItemsBaseTools.Count -gt 0) { + $tableItems = $deletedItemsBaseTools | ForEach-Object { + [PSCustomObject]@{ + "Category" = $this.RenderCategory($_.Headers, $true); + "Tool name" = $this.RenderToolName($_.PreviousReportNode.ToolName); + "Previous ($previousImageVersion)" = $_.PreviousReportNode.GetValue(); + } + } + $sb.AppendLine($this.RenderHtmlTable($tableItems, "Category")) + } + if ($deletedItemsTables.Count -gt 0) { + $deletedItemsTables | ForEach-Object { + $sb.AppendLine($this.RenderTableNodesDiff($_)) + } + } + + ############################# + ### Render updated items #### + ############################# + + [ReportDifferenceItem[]] $changedItemsBaseTools = $ChangedItems | Where-Object { $_.IsBaseToolNode() } + [ReportDifferenceItem[]] $changedItemsTables = $ChangedItems | Where-Object { $_.IsTableNode() } + if ($changedItemsBaseTools.Count + $changedItemsTables.Count -gt 0) { + $sb.AppendLine("### Updated").AppendLine() + } + if ($changedItemsBaseTools.Count -gt 0) { + $tableItems = $changedItemsBaseTools | ForEach-Object { + [PSCustomObject]@{ + "Category" = $this.RenderCategory($_.Headers, $true); + "Tool name" = $this.RenderToolName($_.CurrentReportNode.ToolName); + "Previous ($previousImageVersion)" = $_.PreviousReportNode.GetValue(); + "Current ($imageVersion)" = $_.CurrentReportNode.GetValue(); + } + } + $sb.AppendLine($this.RenderHtmlTable($tableItems, "Category")) + } + if ($changedItemsTables.Count -gt 0) { + $changedItemsTables | ForEach-Object { + $sb.AppendLine($this.RenderTableNodesDiff($_)) + } + } + + return $sb.ToString() + } + + [String] RenderHtmlTable([PSCustomObject[]] $Table, [String] $RowSpanColumnName) { + $headers = $Table[0].PSObject.Properties.Name + + $sb = [System.Text.StringBuilder]::new() + $sb.AppendLine("<table>") + $sb.AppendLine(" <thead>") + $headers | ForEach-Object { + $sb.AppendLine(" <th>$_</th>") + } + $sb.AppendLine(" </thead>") + $sb.AppendLine(" <tbody>") + + $tableRowSpans = $this.CalculateHtmlTableRowSpan($Table, $RowSpanColumnName) + for ($rowIndex = 0; $rowIndex -lt $Table.Count; $rowIndex++) { + $row = $Table[$rowIndex] + + $sb.AppendLine(" <tr>") + $headers | ForEach-Object { + if ($_ -eq $RowSpanColumnName) { + if ($tableRowSpans[$rowIndex] -gt 0) { + $sb.AppendLine(" <td rowspan=`"$($tableRowSpans[$rowIndex])`">$($row.$_)</td>") + } else { + # Skip rendering this cell at all + } + } else { + $sb.AppendLine(" <td>$($row.$_)</td>") + } + } + $sb.AppendLine(" </tr>") + } + $sb.AppendLine(" </tbody>") + $sb.AppendLine("</table>") + + return $sb.ToString() + } + + [int[]] CalculateHtmlTableRowSpan([PSCustomObject[]] $Table, [String] $keyColumn) { + $result = @(0) * $Table.Count + + for ($rowIndex = $Table.Count - 1; $rowIndex -ge 0; $rowIndex--) { + if (($rowIndex -lt ($Table.Count - 1)) -and ($Table[$rowIndex].$keyColumn -eq $Table[$rowIndex + 1].$keyColumn)) { + # If the current row is the same as the next row + # Then rowspan of current row should be equal to rowspan of the next row + 1 + # And rowspan of the next row should be 0 because it is already included in the rowspan of the current row + $result[$rowIndex] = $result[$rowIndex + 1] + 1 + $result[$rowIndex + 1] = 0 + } else { + $result[$rowIndex] = 1 + } + } + + return $result + } + + [String] RenderTableNodesDiff([ReportDifferenceItem] $DiffItem) { + # Use the simplest approach for now: first, print all removed lines. Then print added lines + # It will work well for most cases like changing existing rows, adding new rows and removing rows + # But can produce not so pretty results for cases when some rows are changed and some rows are added at the same time + # Let's see how it works in practice and improve it later if needed + + [String] $tableHeaders = ($DiffItem.CurrentReportNode ?? $DiffItem.PreviousReportNode).Headers + [Collections.Generic.List[String]] $tableRows = @() + $DiffItem.PreviousReportNode.Rows ?? @() | Where-Object { $_ -notin $DiffItem.CurrentReportNode.Rows } | ForEach-Object { + $tableRows.Add($this.StrikeTableRow($_)) + } + $DiffItem.CurrentReportNode.Rows ?? @() | Where-Object { $_ -notin $DiffItem.PreviousReportNode.Rows } | ForEach-Object { + $tableRows.Add($_) + } + + $sb = [System.Text.StringBuilder]::new() + $sb.AppendLine("#### $($this.RenderCategory($DiffItem.Headers, $false))") + $sb.AppendLine([TableNode]::new($tableHeaders, $tableRows).ToMarkdown()) + return $sb.ToString() + } + + [String] RenderCategory([String[]] $Headers, [Boolean] $AddLineSeparator) { + # Always skip the first header because it is "Installed Software" + [String[]] $takeHeaders = $Headers | Select-Object -Skip 1 + if ($takeHeaders.Count -eq 0) { + return "" + } + + $lineSeparator = $AddLineSeparator ? "<br>": "" + return [String]::Join(" >$lineSeparator ", $takeHeaders) + } + + [String] RenderToolName([String] $ToolName) { + return $ToolName.TrimEnd(":") + } + + [String] StrikeTableRow([String] $Row) { + # Convert "a|b|c" to "~~a~~|~~b~~|~~c~~ + $cells = $Row.Split("|") + $strikedCells = $cells | ForEach-Object { "~~$($_)~~"} + return [String]::Join("|", $strikedCells) + } +} + +# Temporary structure to store the single difference between two reports +class ReportDifferenceItem { + [BaseNode] $PreviousReportNode + [BaseNode] $CurrentReportNode + [String[]] $Headers + + ReportDifferenceItem([BaseNode] $PreviousReportNode, [BaseNode] $CurrentReportNode, [String[]] $Headers) { + $this.PreviousReportNode = $PreviousReportNode + $this.CurrentReportNode = $CurrentReportNode + $this.Headers = $Headers + } + + [Boolean] IsBaseToolNode() { + $node = $this.CurrentReportNode ?? $this.PreviousReportNode + return $node -is [BaseToolNode] + } + + [Boolean] IsTableNode() { + $node = $this.CurrentReportNode ?? $this.PreviousReportNode + return $node -is [TableNode] + } +} \ No newline at end of file diff --git a/helpers/software-report-base/SoftwareReport.Nodes.psm1 b/helpers/software-report-base/SoftwareReport.Nodes.psm1 index 5e820dc690a4..7fcb43ad4406 100644 --- a/helpers/software-report-base/SoftwareReport.Nodes.psm1 +++ b/helpers/software-report-base/SoftwareReport.Nodes.psm1 @@ -7,27 +7,27 @@ using module ./SoftwareReport.BaseNodes.psm1 # NodesFactory is used to simplify parsing different types of notes # Every node has own logic of parsing and this method just invokes "FromJsonObject" of correct node type class NodesFactory { - static [BaseNode] ParseNodeFromObject($jsonObj) { - if ($jsonObj.NodeType -eq [HeaderNode].Name) { - return [HeaderNode]::FromJsonObject($jsonObj) - } elseif ($jsonObj.NodeType -eq [ToolVersionNode].Name) { - return [ToolVersionNode]::FromJsonObject($jsonObj) - } elseif ($jsonObj.NodeType -eq [ToolVersionsListNode].Name) { - return [ToolVersionsListNode]::FromJsonObject($jsonObj) - } elseif ($jsonObj.NodeType -eq [TableNode].Name) { - return [TableNode]::FromJsonObject($jsonObj) - } elseif ($jsonObj.NodeType -eq [NoteNode].Name) { - return [NoteNode]::FromJsonObject($jsonObj) + static [BaseNode] ParseNodeFromObject([object] $JsonObj) { + if ($JsonObj.NodeType -eq [HeaderNode].Name) { + return [HeaderNode]::FromJsonObject($JsonObj) + } elseif ($JsonObj.NodeType -eq [ToolVersionNode].Name) { + return [ToolVersionNode]::FromJsonObject($JsonObj) + } elseif ($JsonObj.NodeType -eq [ToolVersionsListNode].Name) { + return [ToolVersionsListNode]::FromJsonObject($JsonObj) + } elseif ($JsonObj.NodeType -eq [TableNode].Name) { + return [TableNode]::FromJsonObject($JsonObj) + } elseif ($JsonObj.NodeType -eq [NoteNode].Name) { + return [NoteNode]::FromJsonObject($JsonObj) } - throw "Unknown node type in ParseNodeFromObject '$($jsonObj.NodeType)'" + throw "Unknown node type in ParseNodeFromObject '$($JsonObj.NodeType)'" } } -# Node type to describe headers: "## Installed software" class HeaderNode: BaseNode { + [ValidateNotNullOrEmpty()] [String] $Title - [System.Collections.ArrayList] $Children + [Collections.Generic.List[BaseNode]] $Children HeaderNode([String] $Title) { $this.Title = $Title @@ -44,10 +44,15 @@ class HeaderNode: BaseNode { throw "This HeaderNode already contains the similar child node. It is not allowed to add the same node twice.`nFound node: $($similarNode.ToJsonObject() | ConvertTo-Json)`nNew node: $($node.ToJsonObject() | ConvertTo-Json)" } + [Array] $existingHeaderNodes = $this.Children | Where-Object { $_ -is [HeaderNode] } + if (($existingHeaderNodes.Count -gt 0) -and ($node -isnot [HeaderNode])) { + throw "It is not allowed to add the node of type '$($node.GetType().Name)' to the HeaderNode that already contains the HeaderNode children." + } + $this.Children.Add($node) } - [void] AddNodes([Array] $nodes) { + [void] AddNodes([BaseNode[]] $nodes) { $nodes | ForEach-Object { $this.AddNode($_) } @@ -63,11 +68,15 @@ class HeaderNode: BaseNode { $this.AddNode([ToolVersionNode]::new($ToolName, $Version)) } - [void] AddToolVersionsList([String] $ToolName, [Array] $Version, [String] $MajorVersionRegex, [Boolean] $InlineList) { - $this.AddNode([ToolVersionsListNode]::new($ToolName, $Version, $MajorVersionRegex, $InlineList)) + [void] AddToolVersionsList([String] $ToolName, [String[]] $Version, [String] $MajorVersionRegex) { + $this.AddNode([ToolVersionsListNode]::new($ToolName, $Version, $MajorVersionRegex, "List")) + } + + [void] AddToolVersionsListInline([String] $ToolName, [String[]] $Version, [String] $MajorVersionRegex) { + $this.AddNode([ToolVersionsListNode]::new($ToolName, $Version, $MajorVersionRegex, "Inline")) } - [void] AddTable([Array] $Table) { + [void] AddTable([PSCustomObject[]] $Table) { $this.AddNode([TableNode]::FromObjectsArray($Table)) } @@ -75,12 +84,12 @@ class HeaderNode: BaseNode { $this.AddNode([NoteNode]::new($Content)) } - [String] ToMarkdown($level) { + [String] ToMarkdown([Int32] $Level) { $sb = [System.Text.StringBuilder]::new() $sb.AppendLine() - $sb.AppendLine("$("#" * $level) $($this.Title)") + $sb.AppendLine("$("#" * $Level) $($this.Title)") $this.Children | ForEach-Object { - $sb.AppendLine($_.ToMarkdown($level + 1)) + $sb.AppendLine($_.ToMarkdown($Level + 1)) } return $sb.ToString().TrimEnd() @@ -94,9 +103,9 @@ class HeaderNode: BaseNode { } } - static [HeaderNode] FromJsonObject($jsonObj) { - $node = [HeaderNode]::new($jsonObj.Title) - $jsonObj.Children | Where-Object { $_ } | ForEach-Object { $node.AddNode([NodesFactory]::ParseNodeFromObject($_)) } + static [HeaderNode] FromJsonObject([Object] $JsonObj) { + $node = [HeaderNode]::new($JsonObj.Title) + $JsonObj.Children | Where-Object { $_ } | ForEach-Object { $node.AddNode([NodesFactory]::ParseNodeFromObject($_)) } return $node } @@ -123,15 +132,15 @@ class HeaderNode: BaseNode { } } -# Node type to describe the tool with single version: "Bash 5.1.16" class ToolVersionNode: BaseToolNode { + [ValidateNotNullOrEmpty()] [String] $Version ToolVersionNode([String] $ToolName, [String] $Version): base($ToolName) { $this.Version = $Version } - [String] ToMarkdown($level) { + [String] ToMarkdown([Int32] $Level) { return "- $($this.ToolName) $($this.Version)" } @@ -147,32 +156,35 @@ class ToolVersionNode: BaseToolNode { } } - static [BaseNode] FromJsonObject($jsonObj) { - return [ToolVersionNode]::new($jsonObj.ToolName, $jsonObj.Version) + static [BaseNode] FromJsonObject([Object] $JsonObj) { + return [ToolVersionNode]::new($JsonObj.ToolName, $JsonObj.Version) } } -# Node type to describe the tool with multiple versions "Toolcache Node.js 14.17.6 16.2.0 18.2.3" class ToolVersionsListNode: BaseToolNode { - [Array] $Versions + [ValidateNotNullOrEmpty()] + [String[]] $Versions + [Regex] $MajorVersionRegex + + [ValidateSet("List", "Inline")] [String] $ListType - ToolVersionsListNode([String] $ToolName, [Array] $Versions, [String] $MajorVersionRegex, [Boolean] $InlineList): base($ToolName) { + ToolVersionsListNode([String] $ToolName, [String[]] $Versions, [String] $MajorVersionRegex, [String] $ListType): base($ToolName) { $this.Versions = $Versions $this.MajorVersionRegex = [Regex]::new($MajorVersionRegex) - $this.ListType = $InlineList ? "Inline" : "List" + $this.ListType = $ListType $this.ValidateMajorVersionRegex() } - [String] ToMarkdown($level) { + [String] ToMarkdown([Int32] $Level) { if ($this.ListType -eq "Inline") { return "- $($this.ToolName): $($this.Versions -join ', ')" } $sb = [System.Text.StringBuilder]::new() $sb.AppendLine() - $sb.AppendLine("$("#" * $level) $($this.ToolName)") + $sb.AppendLine("$("#" * $Level) $($this.ToolName)") $this.Versions | ForEach-Object { $sb.AppendLine("- $_") } @@ -186,7 +198,7 @@ class ToolVersionsListNode: BaseToolNode { [String] ExtractMajorVersion([String] $Version) { $match = $this.MajorVersionRegex.Match($Version) - if ($match.Success -ne $true) { + if (($match.Success -ne $true) -or [String]::IsNullOrEmpty($match.Groups[0].Value)) { throw "Version '$Version' doesn't match regex '$($this.PrimaryVersionRegex)'" } @@ -203,57 +215,46 @@ class ToolVersionsListNode: BaseToolNode { } } - static [ToolVersionsListNode] FromJsonObject($jsonObj) { - return [ToolVersionsListNode]::new($jsonObj.ToolName, $jsonObj.Versions, $jsonObj.MajorVersionRegex, $jsonObj.ListType -eq "Inline") + static [ToolVersionsListNode] FromJsonObject([Object] $JsonObj) { + return [ToolVersionsListNode]::new($JsonObj.ToolName, $JsonObj.Versions, $JsonObj.MajorVersionRegex, $JsonObj.ListType) } hidden [void] ValidateMajorVersionRegex() { $this.Versions | Group-Object { $this.ExtractMajorVersion($_) } | ForEach-Object { if ($_.Count -gt 1) { - throw "Multiple versions from list $($this.GetValue()) return the same result from regex '$($this.MajorVersionRegex)': $($_.Name)" + throw "Multiple versions from list '$($this.GetValue())' return the same result from regex '$($this.MajorVersionRegex)': $($_.Name)" } } } } -# Node type to describe tables class TableNode: BaseNode { # It is easier to store the table as rendered lines because it will simplify finding differences in rows later + [ValidateNotNullOrEmpty()] [String] $Headers - [System.Collections.ArrayList] $Rows + [ValidateNotNullOrEmpty()] + [String[]] $Rows - TableNode($Headers, $Rows) { + TableNode([String] $Headers, [String[]] $Rows) { $this.Headers = $Headers $this.Rows = $Rows + + $columnsCount = $this.Headers.Split("|").Count + $this.Rows | ForEach-Object { + if ($_.Split("|").Count -ne $columnsCount) { + throw "Table has different number of columns in different rows" + } + } } [Boolean] ShouldBeIncludedToDiff() { return $true } - static [TableNode] FromObjectsArray([Array] $Table) { - # take column names from the first row in table because we expect all rows to have the same columns - [String] $tableHeaders = [TableNode]::ArrayToTableRow($Table[0].PSObject.Properties.Name) - [System.Collections.ArrayList] $tableRows = @() - - $Table | ForEach-Object { - $tableRows.Add([TableNode]::ArrayToTableRow($_.PSObject.Properties.Value)) - } - - return [TableNode]::new($tableHeaders, $tableRows) - } - - [String] ToMarkdown($level) { - $maxColumnWidths = $this.Headers.Split("|") | ForEach-Object { $_.Length } + [String] ToMarkdown([Int32] $Level) { + $maxColumnWidths = $this.CalculateColumnsWidth() $columnsCount = $maxColumnWidths.Count - $this.Rows | ForEach-Object { - $columnWidths = $_.Split("|") | ForEach-Object { $_.Length } - for ($colIndex = 0; $colIndex -lt $columnsCount; $colIndex++) { - $maxColumnWidths[$colIndex] = [Math]::Max($maxColumnWidths[$colIndex], $columnWidths[$colIndex]) - } - } - $delimeterLine = [String]::Join("|", @("-") * $columnsCount) $sb = [System.Text.StringBuilder]::new() @@ -273,6 +274,20 @@ class TableNode: BaseNode { return $sb.ToString().TrimEnd() } + hidden [Int32[]] CalculateColumnsWidth() { + $maxColumnWidths = $this.Headers.Split("|") | ForEach-Object { $_.Length } + $columnsCount = $maxColumnWidths.Count + + $this.Rows | ForEach-Object { + $columnWidths = $_.Split("|") | ForEach-Object { $_.Length } + for ($colIndex = 0; $colIndex -lt $columnsCount; $colIndex++) { + $maxColumnWidths[$colIndex] = [Math]::Max($maxColumnWidths[$colIndex], $columnWidths[$colIndex]) + } + } + + return $maxColumnWidths + } + [PSCustomObject] ToJsonObject() { return [PSCustomObject]@{ NodeType = $this.GetType().Name @@ -281,8 +296,8 @@ class TableNode: BaseNode { } } - static [TableNode] FromJsonObject($jsonObj) { - return [TableNode]::new($jsonObj.Headers, $jsonObj.Rows) + static [TableNode] FromJsonObject([Object] $JsonObj) { + return [TableNode]::new($JsonObj.Headers, $JsonObj.Rows) } [Boolean] IsSimilarTo([BaseNode] $OtherNode) { @@ -299,9 +314,8 @@ class TableNode: BaseNode { return $false } - if ($this.Headers -ne $OtherNode.Headers) { - return $false - } + # We don't compare $this.Headers intentionally + # It is fine to ignore the tables where headers are changed but rows are not changed if ($this.Rows.Count -ne $OtherNode.Rows.Count) { return $false @@ -316,20 +330,49 @@ class TableNode: BaseNode { return $true } - hidden static [String] ArrayToTableRow([Array] $Values) { - # TO-DO: Add validation for the case when $Values contains "|" + static [TableNode] FromObjectsArray([PSCustomObject[]] $Table) { + if ($Table.Count -eq 0) { + throw "Failed to create TableNode from empty objects array" + } + + [String] $tableHeaders = [TableNode]::ArrayToTableRow($Table[0].PSObject.Properties.Name) + [Collections.Generic.List[String]] $tableRows = @() + + $Table | ForEach-Object { + $rowHeaders = [TableNode]::ArrayToTableRow($_.PSObject.Properties.Name) + if (($rowHeaders -ne $tableHeaders)) { + throw "Failed to create TableNode from objects array because objects have different properties" + } + + $tableRows.Add([TableNode]::ArrayToTableRow($_.PSObject.Properties.Value)) + } + + return [TableNode]::new($tableHeaders, $tableRows) + } + + hidden static [String] ArrayToTableRow([String[]] $Values) { + if ($Values.Count -eq 0) { + throw "Failed to create TableNode because some objects are empty" + } + $Values | ForEach-Object { + if ($_.Contains("|")) { + throw "Failed to create TableNode because some cells '$_' contains forbidden symbol '|'" + } + } + return [String]::Join("|", $Values) } } class NoteNode: BaseNode { + [ValidateNotNullOrEmpty()] [String] $Content NoteNode([String] $Content) { $this.Content = $Content } - [String] ToMarkdown($level) { + [String] ToMarkdown([Int32] $Level) { return @( '```', $this.Content, @@ -344,8 +387,8 @@ class NoteNode: BaseNode { } } - static [NoteNode] FromJsonObject($jsonObj) { - return [NoteNode]::new($jsonObj.Content) + static [NoteNode] FromJsonObject([Object] $JsonObj) { + return [NoteNode]::new($JsonObj.Content) } [Boolean] IsSimilarTo([BaseNode] $OtherNode) { diff --git a/helpers/software-report-base/SoftwareReport.psm1 b/helpers/software-report-base/SoftwareReport.psm1 index 81f3cfd9c4aa..c78757f252df 100644 --- a/helpers/software-report-base/SoftwareReport.psm1 +++ b/helpers/software-report-base/SoftwareReport.psm1 @@ -2,6 +2,7 @@ using module ./SoftwareReport.BaseNodes.psm1 using module ./SoftwareReport.Nodes.psm1 class SoftwareReport { + [ValidateNotNullOrEmpty()] [HeaderNode] $Root SoftwareReport([String] $Title) { @@ -16,13 +17,18 @@ class SoftwareReport { return $this.Root.ToJsonObject() | ConvertTo-Json -Depth 10 } - static [SoftwareReport] FromJson($jsonString) { - $jsonObj = $jsonString | ConvertFrom-Json + static [SoftwareReport] FromJson([String] $JsonString) { + $jsonObj = $JsonString | ConvertFrom-Json $rootNode = [NodesFactory]::ParseNodeFromObject($jsonObj) return [SoftwareReport]::new($rootNode) } [String] ToMarkdown() { - return $this.Root.ToMarkdown(1).Trim() + return $this.Root.ToMarkdown().Trim() + } + + [String] GetImageVersion() { + $imageVersionNode = $this.Root.Children ?? @() | Where-Object { ($_ -is [ToolVersionNode]) -and ($_.ToolName -eq "Image Version:") } | Select-Object -First 1 + return $imageVersionNode.Version ?? "Unknown version" } } \ No newline at end of file diff --git a/helpers/software-report-base/tests/SoftwareReport.Difference.E2E.Tests.ps1 b/helpers/software-report-base/tests/SoftwareReport.Difference.E2E.Tests.ps1 new file mode 100644 index 000000000000..8025e473680b --- /dev/null +++ b/helpers/software-report-base/tests/SoftwareReport.Difference.E2E.Tests.ps1 @@ -0,0 +1,525 @@ +using module ../SoftwareReport.psm1 +using module ../SoftwareReport.DifferenceCalculator.psm1 + +Describe "Comparer.E2E" { + It "Some tools are updated" { + # Previous report + $prevSoftwareReport = [SoftwareReport]::new("macOS 11") + $prevSoftwareReport.Root.AddToolVersion("OS Version:", "macOS 11.7.1 (20G817)") + $prevSoftwareReport.Root.AddToolVersion("Image Version:", "20220918.1") + $prevInstalledSoftware = $prevSoftwareReport.Root.AddHeader("Installed Software") + $prevTools = $prevInstalledSoftware.AddHeader("Tools") + $prevTools.AddToolVersion("ToolWillBeUpdated1", "1.0.0") + $prevTools.AddToolVersion("ToolWillBeUpdated2", "3.0.1") + $prevTools.AddToolVersionsList("ToolWillBeUpdated3", @("14.0.0", "15.5.1"), "^\d+") + + # Next report + $nextSoftwareReport = [SoftwareReport]::new("macOS 11") + $nextSoftwareReport.Root.AddToolVersion("OS Version:", "macOS 11.7.1 (20G817)") + $nextSoftwareReport.Root.AddToolVersion("Image Version:", "20220922.1") + $nextInstalledSoftware = $nextSoftwareReport.Root.AddHeader("Installed Software") + $nextTools = $nextInstalledSoftware.AddHeader("Tools") + $nextTools.AddToolVersion("ToolWillBeUpdated1", "2.5.0") + $nextTools.AddToolVersion("ToolWillBeUpdated2", "3.0.2") + $nextTools.AddToolVersionsList("ToolWillBeUpdated3", @("14.2.0", "15.5.1"), "^\d+") + + # Compare reports + $comparer = [SoftwareReportDifferenceCalculator]::new($prevSoftwareReport, $nextSoftwareReport) + $comparer.CompareReports() + $comparer.GetMarkdownReport() | Should -BeExactly @' +# :desktop_computer: Actions Runner Image: macOS 11 +- OS Version: macOS 11.7.1 (20G817) +- Image Version: 20220922.1 + +## :mega: What's changed? + +### Updated + +<table> + <thead> + <th>Category</th> + <th>Tool name</th> + <th>Previous (20220918.1)</th> + <th>Current (20220922.1)</th> + </thead> + <tbody> + <tr> + <td rowspan="3">Tools</td> + <td>ToolWillBeUpdated1</td> + <td>1.0.0</td> + <td>2.5.0</td> + </tr> + <tr> + <td>ToolWillBeUpdated2</td> + <td>3.0.1</td> + <td>3.0.2</td> + </tr> + <tr> + <td>ToolWillBeUpdated3</td> + <td>14.0.0</td> + <td>14.2.0</td> + </tr> + </tbody> +</table> + + +'@ + } + + It "Some tools are updated, added and removed" { + # Previous report + $prevSoftwareReport = [SoftwareReport]::new("macOS 11") + $prevSoftwareReport.Root.AddToolVersion("OS Version:", "macOS 11.7.1 (20G817)") + $prevSoftwareReport.Root.AddToolVersion("Image Version:", "20220918.1") + $prevInstalledSoftware = $prevSoftwareReport.Root.AddHeader("Installed Software") + + $prevLanguagesAndRuntimes = $prevInstalledSoftware.AddHeader("Language and Runtime") + $prevLanguagesAndRuntimes.AddToolVersion("ToolWillBeRemoved", "5.1.16(1)-release") + $prevLanguagesAndRuntimes.AddToolVersionsListInline("ToolWithMultipleVersions3", @("1.2.100", "1.2.200", "1.3.500", "1.4.100", "1.4.200"), "^\d+\.\d+\.\d") + $prevLanguagesAndRuntimes.AddToolVersion("ToolWithoutChanges", "5.34.0") + $prevLanguagesAndRuntimes.AddToolVersion("ToolWillBeUpdated", "8.1.0") + + $prevCachedTools = $prevInstalledSoftware.AddHeader("Cached Tools") + $prevCachedTools.AddToolVersionsList("ToolWithMultipleVersions1", @("2.7.3", "2.8.1", "3.1.2"), "^\d+\.\d+") + $prevCachedTools.AddToolVersionsList("ToolWithMultipleVersions2", @("14.8.0", "15.1.0", "16.4.2"), "^\d+") + + $prevSQLSection = $prevInstalledSoftware.AddHeader("Databases") + $prevSQLSection.AddToolVersion("MineSQL", "6.1.0") + $prevSQLSection.AddNote("First Note") + + # Next report + $nextSoftwareReport = [SoftwareReport]::new("macOS 11") + $nextSoftwareReport.Root.AddToolVersion("OS Version:", "macOS 11.7.2 (20G922)") + $nextSoftwareReport.Root.AddToolVersion("Image Version:", "20220922.0") + $nextInstalledSoftware = $nextSoftwareReport.Root.AddHeader("Installed Software") + + $nextLanguagesAndRuntimes = $nextInstalledSoftware.AddHeader("Language and Runtime") + $nextLanguagesAndRuntimes.AddToolVersion("ToolWillBeAdded", "16.18.0") + $nextLanguagesAndRuntimes.AddToolVersionsListInline("ToolWithMultipleVersions3", @("1.2.200", "1.3.515", "1.4.100", "1.4.200", "1.5.800"), "^\d+\.\d+\.\d") + $nextLanguagesAndRuntimes.AddToolVersion("ToolWithoutChanges", "5.34.0") + $nextLanguagesAndRuntimes.AddToolVersion("ToolWillBeUpdated", "8.3.0") + + $nextCachedTools = $nextInstalledSoftware.AddHeader("Cached Tools") + $nextCachedTools.AddToolVersionsList("ToolWithMultipleVersions1", @("2.7.3", "2.8.1", "3.1.2"), "^\d+\.\d+") + $nextCachedTools.AddToolVersionsList("ToolWithMultipleVersions2", @("15.1.0", "16.4.2", "17.0.1"), "^\d+") + + $nextSQLSection = $nextInstalledSoftware.AddHeader("Databases") + $nextSQLSection.AddToolVersion("MineSQL", "6.1.1") + $nextSQLSection.AddNote("Second Note") + + # Compare reports + $comparer = [SoftwareReportDifferenceCalculator]::new($prevSoftwareReport, $nextSoftwareReport) + $comparer.CompareReports() + $comparer.GetMarkdownReport() | Should -BeExactly @' +# :desktop_computer: Actions Runner Image: macOS 11 +- OS Version: macOS 11.7.2 (20G922) +- Image Version: 20220922.0 + +## :mega: What's changed? + +### Added :heavy_plus_sign: + +<table> + <thead> + <th>Category</th> + <th>Tool name</th> + <th>Current (20220922.0)</th> + </thead> + <tbody> + <tr> + <td rowspan="2">Language and Runtime</td> + <td>ToolWillBeAdded</td> + <td>16.18.0</td> + </tr> + <tr> + <td>ToolWithMultipleVersions3</td> + <td>1.5.800</td> + </tr> + <tr> + <td rowspan="1">Cached Tools</td> + <td>ToolWithMultipleVersions2</td> + <td>17.0.1</td> + </tr> + </tbody> +</table> + +### Deleted :heavy_minus_sign: + +<table> + <thead> + <th>Category</th> + <th>Tool name</th> + <th>Previous (20220918.1)</th> + </thead> + <tbody> + <tr> + <td rowspan="2">Language and Runtime</td> + <td>ToolWithMultipleVersions3</td> + <td>1.2.100</td> + </tr> + <tr> + <td>ToolWillBeRemoved</td> + <td>5.1.16(1)-release</td> + </tr> + <tr> + <td rowspan="1">Cached Tools</td> + <td>ToolWithMultipleVersions2</td> + <td>14.8.0</td> + </tr> + </tbody> +</table> + +### Updated + +<table> + <thead> + <th>Category</th> + <th>Tool name</th> + <th>Previous (20220918.1)</th> + <th>Current (20220922.0)</th> + </thead> + <tbody> + <tr> + <td rowspan="1"></td> + <td>OS Version</td> + <td>macOS 11.7.1 (20G817)</td> + <td>macOS 11.7.2 (20G922)</td> + </tr> + <tr> + <td rowspan="2">Language and Runtime</td> + <td>ToolWithMultipleVersions3</td> + <td>1.3.500</td> + <td>1.3.515</td> + </tr> + <tr> + <td>ToolWillBeUpdated</td> + <td>8.1.0</td> + <td>8.3.0</td> + </tr> + <tr> + <td rowspan="1">Databases</td> + <td>MineSQL</td> + <td>6.1.0</td> + <td>6.1.1</td> + </tr> + </tbody> +</table> + + +'@ + } + + It "Header tree changes" { + # Previous report + $prevSoftwareReport = [SoftwareReport]::new("macOS 11") + $prevSoftwareReport.Root.AddToolVersion("Image Version:", "20220918.1") + $prevInstalledSoftware = $prevSoftwareReport.Root.AddHeader("Installed Software") + $prevInstalledSoftware.AddToolVersion("ToolWithoutChanges", "5.34.0") + $prevInstalledSoftware.AddHeader("HeaderWillBeRemoved").AddHeader("SubheaderWillBeRemoved").AddToolVersion("ToolWillBeRemoved", "1.0.0") + $prevInstalledSoftware.AddHeader("Header1").AddToolVersion("ToolWillBeMovedToAnotherHeader", "3.0.0") + + # Next report + $nextSoftwareReport = [SoftwareReport]::new("macOS 11") + $nextSoftwareReport.Root.AddToolVersion("Image Version:", "20220922.0") + $nextInstalledSoftware = $nextSoftwareReport.Root.AddHeader("Installed Software") + $nextInstalledSoftware.AddToolVersion("ToolWithoutChanges", "5.34.0") + $nextInstalledSoftware.AddHeader("HeaderWillBeAdded").AddHeader("SubheaderWillBeAdded").AddToolVersion("ToolWillBeAdded", "5.0.0") + $nextInstalledSoftware.AddHeader("Header2").AddToolVersion("ToolWillBeMovedToAnotherHeader", "3.0.0") + + # Compare reports + $comparer = [SoftwareReportDifferenceCalculator]::new($prevSoftwareReport, $nextSoftwareReport) + $comparer.CompareReports() + $comparer.GetMarkdownReport() | Should -BeExactly @' +# :desktop_computer: Actions Runner Image: macOS 11 +- Image Version: 20220922.0 + +## :mega: What's changed? + +### Added :heavy_plus_sign: + +<table> + <thead> + <th>Category</th> + <th>Tool name</th> + <th>Current (20220922.0)</th> + </thead> + <tbody> + <tr> + <td rowspan="1">HeaderWillBeAdded ><br> SubheaderWillBeAdded</td> + <td>ToolWillBeAdded</td> + <td>5.0.0</td> + </tr> + <tr> + <td rowspan="1">Header2</td> + <td>ToolWillBeMovedToAnotherHeader</td> + <td>3.0.0</td> + </tr> + </tbody> +</table> + +### Deleted :heavy_minus_sign: + +<table> + <thead> + <th>Category</th> + <th>Tool name</th> + <th>Previous (20220918.1)</th> + </thead> + <tbody> + <tr> + <td rowspan="1">HeaderWillBeRemoved ><br> SubheaderWillBeRemoved</td> + <td>ToolWillBeRemoved</td> + <td>1.0.0</td> + </tr> + <tr> + <td rowspan="1">Header1</td> + <td>ToolWillBeMovedToAnotherHeader</td> + <td>3.0.0</td> + </tr> + </tbody> +</table> + + +'@ + } + + It "Tables are added and removed" { + # Previous report + $prevSoftwareReport = [SoftwareReport]::new("macOS 11") + $prevSoftwareReport.Root.AddToolVersion("Image Version:", "20220918.1") + $prevInstalledSoftware = $prevSoftwareReport.Root.AddHeader("Installed Software") + $prevInstalledSoftware.AddHeader("HeaderWillExist").AddTable(@( + [PSCustomObject]@{TableInExistingHeaderWillBeRemoved = "Q"; Value = "25"}, + [PSCustomObject]@{TableInExistingHeaderWillBeRemoved = "O"; Value = "24"} + )) + + $prevTools = $prevInstalledSoftware.AddHeader("Tools") + $prevTools.AddHeader("HeaderWillBeRemoved").AddTable(@( + [PSCustomObject]@{TableWillBeRemovedWithHeader = "Z"; Value = "30"}, + [PSCustomObject]@{TableWillBeRemovedWithHeader = "W"; Value = "29"} + )) + + # Next report + $nextSoftwareReport = [SoftwareReport]::new("macOS 11") + $nextSoftwareReport.Root.AddToolVersion("Image Version:", "20220922.1") + $nextInstalledSoftware = $nextSoftwareReport.Root.AddHeader("Installed Software") + $nextInstalledSoftware.AddHeader("HeaderWillExist") + $nextTools = $nextInstalledSoftware.AddHeader("Tools") + $nextTools.AddToolVersion("ToolWillBeAdded", "3.0.1") + $nextTools.AddTable(@( + [PSCustomObject]@{NewTableInExistingHeader = "A"; Value = "1"}, + [PSCustomObject]@{NewTableInExistingHeader = "B"; Value = "2"} + )) + $nextTools.AddHeader("NewHeaderWithTable").AddTable(@( + [PSCustomObject]@{NewTableInNewHeader = "C"; Value = "3"}, + [PSCustomObject]@{NewTableInNewHeader = "D"; Value = "4"} + )) + + # Compare reports + $comparer = [SoftwareReportDifferenceCalculator]::new($prevSoftwareReport, $nextSoftwareReport) + $comparer.CompareReports() + $comparer.GetMarkdownReport() | Should -BeExactly @' +# :desktop_computer: Actions Runner Image: macOS 11 +- Image Version: 20220922.1 + +## :mega: What's changed? + +### Added :heavy_plus_sign: + +<table> + <thead> + <th>Category</th> + <th>Tool name</th> + <th>Current (20220922.1)</th> + </thead> + <tbody> + <tr> + <td rowspan="1">Tools</td> + <td>ToolWillBeAdded</td> + <td>3.0.1</td> + </tr> + </tbody> +</table> + +#### Tools +| NewTableInExistingHeader | Value | +| ------------------------ | ----- | +| A | 1 | +| B | 2 | + +#### Tools > NewHeaderWithTable +| NewTableInNewHeader | Value | +| ------------------- | ----- | +| C | 3 | +| D | 4 | + +### Deleted :heavy_minus_sign: + +#### HeaderWillExist +| TableInExistingHeaderWillBeRemoved | Value | +| ---------------------------------- | ------ | +| ~~Q~~ | ~~25~~ | +| ~~O~~ | ~~24~~ | + +#### Tools > HeaderWillBeRemoved +| TableWillBeRemovedWithHeader | Value | +| ---------------------------- | ------ | +| ~~Z~~ | ~~30~~ | +| ~~W~~ | ~~29~~ | + + +'@ + } + + It "Tables are changed" { + # Previous report + $prevSoftwareReport = [SoftwareReport]::new("macOS 11") + $prevSoftwareReport.Root.AddToolVersion("Image Version:", "20220918.1") + $prevInstalledSoftware = $prevSoftwareReport.Root.AddHeader("Installed Software") + $prevTools = $prevInstalledSoftware.AddHeader("Tools") + $prevTools.AddHeader("TableWithAddedRows").AddTable(@( + [PSCustomObject]@{TableWillBeRemovedWithHeader = "AA"; Value = "10"}, + [PSCustomObject]@{TableWillBeRemovedWithHeader = "AB"; Value = "11"} + )) + $prevTools.AddHeader("TableWithRemovedRows").AddTable(@( + [PSCustomObject]@{TableWillBeRemovedWithHeader = "BA"; Value = "32"}, + [PSCustomObject]@{TableWillBeRemovedWithHeader = "BB"; Value = "33"}, + [PSCustomObject]@{TableWillBeRemovedWithHeader = "BC"; Value = "34"} + )) + $prevTools.AddHeader("TableWithUpdatedRow").AddTable(@( + [PSCustomObject]@{TableWillBeRemovedWithHeader = "CA"; Value = "42"}, + [PSCustomObject]@{TableWillBeRemovedWithHeader = "CB"; Value = "43"}, + [PSCustomObject]@{TableWillBeRemovedWithHeader = "CC"; Value = "44"} + )) + $prevTools.AddHeader("TableWithUpdatedRows").AddTable(@( + [PSCustomObject]@{TableWillBeRemovedWithHeader = "DA"; Value = "50"}, + [PSCustomObject]@{TableWillBeRemovedWithHeader = "DB"; Value = "51"}, + [PSCustomObject]@{TableWillBeRemovedWithHeader = "DC"; Value = "52"}, + [PSCustomObject]@{TableWillBeRemovedWithHeader = "DD"; Value = "53"} + )) + $prevTools.AddHeader("TableWithComplexChanges").AddTable(@( + [PSCustomObject]@{TableWillBeRemovedWithHeader = "EA"; Value = "62"}, + [PSCustomObject]@{TableWillBeRemovedWithHeader = "EB"; Value = "63"}, + [PSCustomObject]@{TableWillBeRemovedWithHeader = "EC"; Value = "64"} + [PSCustomObject]@{TableWillBeRemovedWithHeader = "ED"; Value = "65"} + )) + + $prevTools.AddHeader("TableWithOnlyHeaderChanged").AddTable(@( + [PSCustomObject]@{TableWithOnlyHeaderChanged = "FA"; Value = "72"}, + [PSCustomObject]@{TableWithOnlyHeaderChanged = "FB"; Value = "73"} + )) + + $prevTools.AddHeader("TableWithHeaderAndRowsChanges").AddTable(@( + [PSCustomObject]@{TableWithHeaderAndRowsChanges = "GA"; Value = "82"}, + [PSCustomObject]@{TableWithHeaderAndRowsChanges = "GB"; Value = "83"}, + [PSCustomObject]@{TableWithHeaderAndRowsChanges = "GC"; Value = "84"} + )) + + # Next report + $nextSoftwareReport = [SoftwareReport]::new("macOS 11") + $nextSoftwareReport.Root.AddToolVersion("Image Version:", "20220922.1") + $nextInstalledSoftware = $nextSoftwareReport.Root.AddHeader("Installed Software") + $nextTools = $nextInstalledSoftware.AddHeader("Tools") + $nextTools.AddHeader("TableWithAddedRows").AddTable(@( + [PSCustomObject]@{TableWillBeRemovedWithHeader = "AA"; Value = "10"}, + [PSCustomObject]@{TableWillBeRemovedWithHeader = "AB"; Value = "11"}, + [PSCustomObject]@{TableWillBeRemovedWithHeader = "AC"; Value = "12"} + )) + $nextTools.AddHeader("TableWithRemovedRows").AddTable(@( + [PSCustomObject]@{TableWillBeRemovedWithHeader = "BB"; Value = "33"}, + [PSCustomObject]@{TableWillBeRemovedWithHeader = "BC"; Value = "34"} + )) + $nextTools.AddHeader("TableWithUpdatedRow").AddTable(@( + [PSCustomObject]@{TableWillBeRemovedWithHeader = "CA"; Value = "42"}, + [PSCustomObject]@{TableWillBeRemovedWithHeader = "CB"; Value = "500"}, + [PSCustomObject]@{TableWillBeRemovedWithHeader = "CC"; Value = "44"} + )) + $nextTools.AddHeader("TableWithUpdatedRows").AddTable(@( + [PSCustomObject]@{TableWillBeRemovedWithHeader = "DA"; Value = "50"}, + [PSCustomObject]@{TableWillBeRemovedWithHeader = "DB"; Value = "5100"}, + [PSCustomObject]@{TableWillBeRemovedWithHeader = "DC"; Value = "5200"}, + [PSCustomObject]@{TableWillBeRemovedWithHeader = "DD"; Value = "53"} + )) + $nextTools.AddHeader("TableWithComplexChanges").AddTable(@( + [PSCustomObject]@{TableWillBeRemovedWithHeader = "EB"; Value = "63"}, + [PSCustomObject]@{TableWillBeRemovedWithHeader = "EC"; Value = "640"}, + [PSCustomObject]@{TableWillBeRemovedWithHeader = "ED"; Value = "65"}, + [PSCustomObject]@{TableWillBeRemovedWithHeader = "EE"; Value = "66"} + )) + + $nextTools.AddHeader("TableWithOnlyHeaderChanged").AddTable(@( + [PSCustomObject]@{TableWithOnlyHeaderChanged2 = "FA"; Value = "72"}, + [PSCustomObject]@{TableWithOnlyHeaderChanged2 = "FB"; Value = "73"} + )) + + $nextTools.AddHeader("TableWithHeaderAndRowsChanges").AddTable(@( + [PSCustomObject]@{TableWithHeaderAndRowsChanges2 = "GA"; Value = "82"}, + [PSCustomObject]@{TableWithHeaderAndRowsChanges2 = "GE"; Value = "850"}, + [PSCustomObject]@{TableWithHeaderAndRowsChanges2 = "GC"; Value = "840"} + )) + + # Compare reports + $comparer = [SoftwareReportDifferenceCalculator]::new($prevSoftwareReport, $nextSoftwareReport) + $comparer.CompareReports() + $comparer.GetMarkdownReport() | Should -BeExactly @' +# :desktop_computer: Actions Runner Image: macOS 11 +- Image Version: 20220922.1 + +## :mega: What's changed? + +### Added :heavy_plus_sign: + +#### Tools > TableWithAddedRows +| TableWillBeRemovedWithHeader | Value | +| ---------------------------- | ----- | +| AC | 12 | + +#### Tools > TableWithHeaderAndRowsChanges +| TableWithHeaderAndRowsChanges2 | Value | +| ------------------------------ | ----- | +| GA | 82 | +| GE | 850 | +| GC | 840 | + +### Deleted :heavy_minus_sign: + +#### Tools > TableWithRemovedRows +| TableWillBeRemovedWithHeader | Value | +| ---------------------------- | ------ | +| ~~BA~~ | ~~32~~ | + +#### Tools > TableWithHeaderAndRowsChanges +| TableWithHeaderAndRowsChanges | Value | +| ----------------------------- | ------ | +| ~~GA~~ | ~~82~~ | +| ~~GB~~ | ~~83~~ | +| ~~GC~~ | ~~84~~ | + +### Updated + +#### Tools > TableWithUpdatedRow +| TableWillBeRemovedWithHeader | Value | +| ---------------------------- | ------ | +| ~~CB~~ | ~~43~~ | +| CB | 500 | + +#### Tools > TableWithUpdatedRows +| TableWillBeRemovedWithHeader | Value | +| ---------------------------- | ------ | +| ~~DB~~ | ~~51~~ | +| ~~DC~~ | ~~52~~ | +| DB | 5100 | +| DC | 5200 | + +#### Tools > TableWithComplexChanges +| TableWillBeRemovedWithHeader | Value | +| ---------------------------- | ------ | +| ~~EA~~ | ~~62~~ | +| ~~EC~~ | ~~64~~ | +| EC | 640 | +| EE | 66 | + + +'@ + } +} \ No newline at end of file diff --git a/helpers/software-report-base/tests/SoftwareReport.DifferenceCalculator.Unit.Tests.ps1 b/helpers/software-report-base/tests/SoftwareReport.DifferenceCalculator.Unit.Tests.ps1 new file mode 100644 index 000000000000..31e690e27bb3 --- /dev/null +++ b/helpers/software-report-base/tests/SoftwareReport.DifferenceCalculator.Unit.Tests.ps1 @@ -0,0 +1,603 @@ +using module ../SoftwareReport.Nodes.psm1 +using module ../SoftwareReport.DifferenceCalculator.psm1 + +BeforeDiscovery { + Import-Module $(Join-Path $PSScriptRoot "TestHelpers.psm1") -DisableNameChecking +} + +Describe "Comparer.UnitTests" { + Describe "Headers Tree" { + It "Add Node to existing header" { + $prevReport = [HeaderNode]::new("Version 1") + $prevReport.AddHeader("MyHeader") + + $nextReport = [HeaderNode]::new("Version 2") + $nextReport.AddHeader("MyHeader").AddToolVersion("MyTool1", "2.1.3") + + $comparer = [SoftwareReportDifferenceCalculator]::new($prevReport, $nextReport) + $comparer.CompareReports() + + $comparer.AddedItems | Should -HaveCount 1 + $comparer.ChangedItems | Should -HaveCount 0 + $comparer.DeletedItems | Should -HaveCount 0 + + $comparer.AddedItems[0].PreviousReportNode | Should -BeNullOrEmpty + $comparer.AddedItems[0].CurrentReportNode | Should -BeOfType ([ToolVersionNode]) + $comparer.AddedItems[0].CurrentReportNode.ToolName | Should -Be "MyTool1" + $comparer.AddedItems[0].CurrentReportNode.Version | Should -Be "2.1.3" + $comparer.AddedItems[0].Headers | Should -BeArray @("MyHeader") + } + + It "Add new header with Node" { + $prevReport = [HeaderNode]::new("Version 1") + + $nextReport = [HeaderNode]::new("Version 2") + $nextReport.AddHeader("MyHeader").AddHeader("MySubHeader").AddToolVersion("MyTool1", "2.1.3") + + $comparer = [SoftwareReportDifferenceCalculator]::new($prevReport, $nextReport) + $comparer.CompareReports() + + $comparer.AddedItems | Should -HaveCount 1 + $comparer.ChangedItems | Should -HaveCount 0 + $comparer.DeletedItems | Should -HaveCount 0 + + $comparer.AddedItems[0].PreviousReportNode | Should -BeNullOrEmpty + $comparer.AddedItems[0].CurrentReportNode | Should -BeOfType ([ToolVersionNode]) + $comparer.AddedItems[0].CurrentReportNode.ToolName | Should -Be "MyTool1" + $comparer.AddedItems[0].CurrentReportNode.Version | Should -Be "2.1.3" + $comparer.AddedItems[0].Headers | Should -BeArray @("MyHeader", "MySubHeader") + } + + It "Remove Node from existing header" { + $prevReport = [HeaderNode]::new("Version 1") + $prevReport.AddHeader("MyHeader").AddToolVersion("MyTool1", "2.1.3") + + $nextReport = [HeaderNode]::new("Version 2") + $nextReport.AddHeader("MyHeader") + + $comparer = [SoftwareReportDifferenceCalculator]::new($prevReport, $nextReport) + $comparer.CompareReports() + + $comparer.AddedItems | Should -HaveCount 0 + $comparer.ChangedItems | Should -HaveCount 0 + $comparer.DeletedItems | Should -HaveCount 1 + + $comparer.DeletedItems[0].PreviousReportNode | Should -BeOfType ([ToolVersionNode]) + $comparer.DeletedItems[0].PreviousReportNode.ToolName | Should -Be "MyTool1" + $comparer.DeletedItems[0].PreviousReportNode.Version | Should -Be "2.1.3" + $comparer.DeletedItems[0].CurrentReportNode | Should -BeNullOrEmpty + $comparer.DeletedItems[0].Headers | Should -BeArray @("MyHeader") + } + + It "Remove header with Node" { + $prevReport = [HeaderNode]::new("Version 1") + $prevReport.AddHeader("MyHeader").AddHeader("MySubheader").AddToolVersion("MyTool1", "2.1.3") + + $nextReport = [HeaderNode]::new("Version 2") + + $comparer = [SoftwareReportDifferenceCalculator]::new($prevReport, $nextReport) + $comparer.CompareReports() + + $comparer.AddedItems | Should -HaveCount 0 + $comparer.ChangedItems | Should -HaveCount 0 + $comparer.DeletedItems | Should -HaveCount 1 + + $comparer.DeletedItems[0].PreviousReportNode | Should -BeOfType ([ToolVersionNode]) + $comparer.DeletedItems[0].PreviousReportNode.ToolName | Should -Be "MyTool1" + $comparer.DeletedItems[0].PreviousReportNode.Version | Should -Be "2.1.3" + $comparer.DeletedItems[0].CurrentReportNode | Should -BeNullOrEmpty + $comparer.DeletedItems[0].Headers | Should -BeArray @("MyHeader", "MySubheader") + } + + It "Node with minor changes" { + $prevReport = [HeaderNode]::new("Version 1") + $prevReport.AddHeader("MyHeader").AddHeader("MySubheader").AddToolVersion("MyTool1", "2.1.3") + + $nextReport = [HeaderNode]::new("Version 2") + $nextReport.AddHeader("MyHeader").AddHeader("MySubheader").AddToolVersion("MyTool1", "2.1.4") + + $comparer = [SoftwareReportDifferenceCalculator]::new($prevReport, $nextReport) + $comparer.CompareReports() + + $comparer.AddedItems | Should -HaveCount 0 + $comparer.ChangedItems | Should -HaveCount 1 + $comparer.DeletedItems | Should -HaveCount 0 + + $comparer.ChangedItems[0].PreviousReportNode | Should -BeOfType ([ToolVersionNode]) + $comparer.ChangedItems[0].PreviousReportNode.ToolName | Should -Be "MyTool1" + $comparer.ChangedItems[0].PreviousReportNode.Version | Should -Be "2.1.3" + $comparer.ChangedItems[0].CurrentReportNode | Should -BeOfType ([ToolVersionNode]) + $comparer.ChangedItems[0].CurrentReportNode.ToolName | Should -Be "MyTool1" + $comparer.ChangedItems[0].CurrentReportNode.Version | Should -Be "2.1.4" + $comparer.ChangedItems[0].Headers | Should -BeArray @("MyHeader", "MySubHeader") + } + + It "Node without changes" { + $prevReport = [HeaderNode]::new("Version 1") + $prevReport.AddHeader("MyHeader").AddHeader("MySubheader").AddToolVersion("MyTool1", "2.1.3") + + $nextReport = [HeaderNode]::new("Version 2") + $nextReport.AddHeader("MyHeader").AddHeader("MySubheader").AddToolVersion("MyTool1", "2.1.3") + + $comparer = [SoftwareReportDifferenceCalculator]::new($prevReport, $nextReport) + $comparer.CompareReports() + + $comparer.AddedItems | Should -HaveCount 0 + $comparer.ChangedItems | Should -HaveCount 0 + $comparer.DeletedItems | Should -HaveCount 0 + } + + It "Node is moved to different header" { + $prevReport = [HeaderNode]::new("Version 1") + $prevReport.AddHeader("MyHeader").AddHeader("MySubheader").AddToolVersion("MyTool1", "2.1.3") + + $nextReport = [HeaderNode]::new("Version 2") + $nextReport.AddHeader("MyHeader").AddHeader("MySubheader2").AddToolVersion("MyTool1", "2.1.3") + + $comparer = [SoftwareReportDifferenceCalculator]::new($prevReport, $nextReport) + $comparer.CompareReports() + + $comparer.AddedItems | Should -HaveCount 1 + $comparer.ChangedItems | Should -HaveCount 0 + $comparer.DeletedItems | Should -HaveCount 1 + + $comparer.AddedItems[0].PreviousReportNode | Should -BeNullOrEmpty + $comparer.AddedItems[0].CurrentReportNode | Should -BeOfType ([ToolVersionNode]) + $comparer.AddedItems[0].CurrentReportNode.ToolName | Should -Be "MyTool1" + $comparer.AddedItems[0].CurrentReportNode.Version | Should -Be "2.1.3" + $comparer.AddedItems[0].Headers | Should -BeArray @("MyHeader", "MySubheader2") + + $comparer.DeletedItems[0].PreviousReportNode | Should -BeOfType ([ToolVersionNode]) + $comparer.DeletedItems[0].PreviousReportNode.ToolName | Should -Be "MyTool1" + $comparer.DeletedItems[0].PreviousReportNode.Version | Should -Be "2.1.3" + $comparer.DeletedItems[0].CurrentReportNode | Should -BeNullOrEmpty + $comparer.DeletedItems[0].Headers | Should -BeArray @("MyHeader", "MySubheader") + } + + It "Complex structure" { + $prevReport = [HeaderNode]::new("Version 1") + $prevSubHeader = $prevReport.AddHeader("MyHeader").AddHeader("MySubheader") + $prevSubHeader.AddToolVersion("MyTool1", "2.1.3") + $prevSubHeader.AddHeader("MySubSubheader").AddToolVersion("MyTool2", "2.9.1") + $prevReport.AddHeader("MyHeader2") + $prevReport.AddHeader("MyHeader3").AddHeader("MySubheader3").AddToolVersion("MyTool3", "14.2.1") + + $nextReport = [HeaderNode]::new("Version 2") + $nextSubHeader = $nextReport.AddHeader("MyHeader").AddHeader("MySubheader") + $nextSubHeader.AddToolVersion("MyTool1", "2.1.4") + $nextSubSubHeader = $nextSubHeader.AddHeader("MySubSubheader") + $nextSubSubHeader.AddToolVersion("MyTool2", "2.9.1") + $nextSubSubHeader.AddToolVersion("MyTool4", "2.7.6") + $nextReport.AddHeader("MyHeader2") + $nextReport.AddHeader("MyHeader3") + + $comparer = [SoftwareReportDifferenceCalculator]::new($prevReport, $nextReport) + $comparer.CompareReports() + + $comparer.AddedItems | Should -HaveCount 1 + $comparer.ChangedItems | Should -HaveCount 1 + $comparer.DeletedItems | Should -HaveCount 1 + + $comparer.AddedItems[0].PreviousReportNode | Should -BeNullOrEmpty + $comparer.AddedItems[0].CurrentReportNode | Should -BeOfType ([ToolVersionNode]) + $comparer.AddedItems[0].CurrentReportNode.ToolName | Should -Be "MyTool4" + $comparer.AddedItems[0].CurrentReportNode.Version | Should -Be "2.7.6" + $comparer.AddedItems[0].Headers | Should -BeArray @("MyHeader", "MySubheader", "MySubSubheader") + + $comparer.ChangedItems[0].PreviousReportNode | Should -BeOfType ([ToolVersionNode]) + $comparer.ChangedItems[0].PreviousReportNode.ToolName | Should -Be "MyTool1" + $comparer.ChangedItems[0].PreviousReportNode.Version | Should -Be "2.1.3" + $comparer.ChangedItems[0].CurrentReportNode | Should -BeOfType ([ToolVersionNode]) + $comparer.ChangedItems[0].CurrentReportNode.ToolName | Should -Be "MyTool1" + $comparer.ChangedItems[0].CurrentReportNode.Version | Should -Be "2.1.4" + $comparer.ChangedItems[0].Headers | Should -BeArray @("MyHeader", "MySubheader") + + $comparer.DeletedItems[0].PreviousReportNode | Should -BeOfType ([ToolVersionNode]) + $comparer.DeletedItems[0].PreviousReportNode.ToolName | Should -Be "MyTool3" + $comparer.DeletedItems[0].PreviousReportNode.Version | Should -Be "14.2.1" + $comparer.DeletedItems[0].CurrentReportNode | Should -BeNullOrEmpty + $comparer.DeletedItems[0].Headers | Should -BeArray @("MyHeader3", "MySubheader3") + } + } + + Describe "ToolVersionNode" { + It "ToolVersionNode is updated" { + $prevReport = [HeaderNode]::new("Version 1") + $prevReport.AddHeader("MyHeader").AddToolVersion("MyTool1", "2.1.3") + + $nextReport = [HeaderNode]::new("Version 2") + $nextReport.AddHeader("MyHeader").AddToolVersion("MyTool1", "2.1.4") + + $comparer = [SoftwareReportDifferenceCalculator]::new($prevReport, $nextReport) + $comparer.CompareReports() + + $comparer.AddedItems | Should -HaveCount 0 + $comparer.ChangedItems | Should -HaveCount 1 + $comparer.DeletedItems | Should -HaveCount 0 + + $comparer.ChangedItems[0].PreviousReportNode | Should -BeOfType ([ToolVersionNode]) + $comparer.ChangedItems[0].PreviousReportNode.ToolName | Should -Be "MyTool1" + $comparer.ChangedItems[0].PreviousReportNode.Version | Should -Be "2.1.3" + $comparer.ChangedItems[0].CurrentReportNode | Should -BeOfType ([ToolVersionNode]) + $comparer.ChangedItems[0].CurrentReportNode.ToolName | Should -Be "MyTool1" + $comparer.ChangedItems[0].CurrentReportNode.Version | Should -Be "2.1.4" + $comparer.ChangedItems[0].Headers | Should -BeArray @("MyHeader") + } + } + + Describe "ToolVersionsListNode" { + It "Single version is not changed" { + $prevReport = [HeaderNode]::new("Version 1") + $prevReport.AddHeader("MyHeader").AddToolVersionsList("MyTool1", @("2.1.3"), "^.+") + + $nextReport = [HeaderNode]::new("Version 2") + $nextReport.AddHeader("MyHeader").AddToolVersionsList("MyTool1", @("2.1.3"), "^.+") + + $comparer = [SoftwareReportDifferenceCalculator]::new($prevReport, $nextReport) + $comparer.CompareReports() + + $comparer.AddedItems | Should -HaveCount 0 + $comparer.ChangedItems | Should -HaveCount 0 + $comparer.DeletedItems | Should -HaveCount 0 + } + + It "Single version is changed" { + $prevReport = [HeaderNode]::new("Version 1") + $prevReport.AddHeader("MyHeader").AddToolVersionsList("MyTool1", @("2.1.3"), "^\d+") + + $nextReport = [HeaderNode]::new("Version 2") + $nextReport.AddHeader("MyHeader").AddToolVersionsList("MyTool1", @("2.1.4"), "^\d+") + + $comparer = [SoftwareReportDifferenceCalculator]::new($prevReport, $nextReport) + $comparer.CompareReports() + + $comparer.AddedItems | Should -HaveCount 0 + $comparer.ChangedItems | Should -HaveCount 1 + $comparer.DeletedItems | Should -HaveCount 0 + + $comparer.ChangedItems[0].PreviousReportNode | Should -BeOfType ([ToolVersionsListNode]) + $comparer.ChangedItems[0].PreviousReportNode.ToolName | Should -Be "MyTool1" + $comparer.ChangedItems[0].PreviousReportNode.Versions | Should -BeArray @("2.1.3") + $comparer.ChangedItems[0].CurrentReportNode | Should -BeOfType ([ToolVersionsListNode]) + $comparer.ChangedItems[0].CurrentReportNode.ToolName | Should -Be "MyTool1" + $comparer.ChangedItems[0].CurrentReportNode.Versions | Should -BeArray @("2.1.4") + } + + It "Major version is added" { + $prevReport = [HeaderNode]::new("Version 1") + $prevReport.AddHeader("MyHeader").AddToolVersionsList("MyTool1", @("2.1.3"), "^\d+") + + $nextReport = [HeaderNode]::new("Version 2") + $nextReport.AddHeader("MyHeader").AddToolVersionsList("MyTool1", @("2.1.3", "3.1.4"), "^\d+") + + $comparer = [SoftwareReportDifferenceCalculator]::new($prevReport, $nextReport) + $comparer.CompareReports() + + $comparer.AddedItems | Should -HaveCount 1 + $comparer.ChangedItems | Should -HaveCount 0 + $comparer.DeletedItems | Should -HaveCount 0 + + $comparer.AddedItems[0].PreviousReportNode | Should -BeNullOrEmpty + $comparer.AddedItems[0].CurrentReportNode | Should -BeOfType ([ToolVersionsListNode]) + $comparer.AddedItems[0].CurrentReportNode.ToolName | Should -Be "MyTool1" + $comparer.AddedItems[0].CurrentReportNode.Versions | Should -BeArray @("3.1.4") + } + + It "Major version is removed" { + $prevReport = [HeaderNode]::new("Version 1") + $prevReport.AddHeader("MyHeader").AddToolVersionsList("MyTool1", @("2.1.3", "3.1.4"), "^\d+") + + $nextReport = [HeaderNode]::new("Version 2") + $nextReport.AddHeader("MyHeader").AddToolVersionsList("MyTool1", @("3.1.4"), "^\d+") + + $comparer = [SoftwareReportDifferenceCalculator]::new($prevReport, $nextReport) + $comparer.CompareReports() + + $comparer.AddedItems | Should -HaveCount 0 + $comparer.ChangedItems | Should -HaveCount 0 + $comparer.DeletedItems | Should -HaveCount 1 + + $comparer.DeletedItems[0].PreviousReportNode | Should -BeOfType ([ToolVersionsListNode]) + $comparer.DeletedItems[0].PreviousReportNode.ToolName | Should -Be "MyTool1" + $comparer.DeletedItems[0].PreviousReportNode.Versions | Should -BeArray @("2.1.3") + $comparer.DeletedItems[0].CurrentReportNode | Should -BeNullOrEmpty + } + + It "Major version is changed" { + $prevReport = [HeaderNode]::new("Version 1") + $prevReport.AddHeader("MyHeader").AddToolVersionsList("MyTool1", @("3.1.4"), "^\d+") + + $nextReport = [HeaderNode]::new("Version 2") + $nextReport.AddHeader("MyHeader").AddToolVersionsList("MyTool1", @("3.2.0"), "^\d+") + + $comparer = [SoftwareReportDifferenceCalculator]::new($prevReport, $nextReport) + $comparer.CompareReports() + + $comparer.AddedItems | Should -HaveCount 0 + $comparer.ChangedItems | Should -HaveCount 1 + $comparer.DeletedItems | Should -HaveCount 0 + + $comparer.ChangedItems[0].PreviousReportNode | Should -BeOfType ([ToolVersionsListNode]) + $comparer.ChangedItems[0].PreviousReportNode.ToolName | Should -Be "MyTool1" + $comparer.ChangedItems[0].PreviousReportNode.Versions | Should -BeArray @("3.1.4") + $comparer.ChangedItems[0].CurrentReportNode | Should -BeOfType ([ToolVersionsListNode]) + $comparer.ChangedItems[0].CurrentReportNode.ToolName | Should -Be "MyTool1" + $comparer.ChangedItems[0].CurrentReportNode.Versions | Should -BeArray @("3.2.0") + } + + It "Major version is added, removed and updated at the same time" { + $prevReport = [HeaderNode]::new("Version 1") + $prevReport.AddHeader("MyHeader").AddToolVersionsList("MyTool1", @("1.0.0", "2.1.3", "3.1.4", "4.0.2"), "^\d+") + + $nextReport = [HeaderNode]::new("Version 2") + $nextReport.AddHeader("MyHeader").AddToolVersionsList("MyTool1", @("2.1.3", "3.2.0", "4.0.2", "5.1.0"), "^\d+") + + $comparer = [SoftwareReportDifferenceCalculator]::new($prevReport, $nextReport) + $comparer.CompareReports() + + $comparer.AddedItems | Should -HaveCount 1 + $comparer.ChangedItems | Should -HaveCount 1 + $comparer.DeletedItems | Should -HaveCount 1 + + $comparer.AddedItems[0].PreviousReportNode | Should -BeNullOrEmpty + $comparer.AddedItems[0].CurrentReportNode | Should -BeOfType ([ToolVersionsListNode]) + $comparer.AddedItems[0].CurrentReportNode.ToolName | Should -Be "MyTool1" + $comparer.AddedItems[0].CurrentReportNode.Versions | Should -BeArray @("5.1.0") + + $comparer.ChangedItems[0].PreviousReportNode | Should -BeOfType ([ToolVersionsListNode]) + $comparer.ChangedItems[0].PreviousReportNode.ToolName | Should -Be "MyTool1" + $comparer.ChangedItems[0].PreviousReportNode.Versions | Should -BeArray @("3.1.4") + $comparer.ChangedItems[0].CurrentReportNode | Should -BeOfType ([ToolVersionsListNode]) + $comparer.ChangedItems[0].CurrentReportNode.ToolName | Should -Be "MyTool1" + $comparer.ChangedItems[0].CurrentReportNode.Versions | Should -BeArray @("3.2.0") + + $comparer.DeletedItems[0].PreviousReportNode | Should -BeOfType ([ToolVersionsListNode]) + $comparer.DeletedItems[0].PreviousReportNode.ToolName | Should -Be "MyTool1" + $comparer.DeletedItems[0].PreviousReportNode.Versions | Should -BeArray @("1.0.0") + $comparer.DeletedItems[0].CurrentReportNode | Should -BeNullOrEmpty + } + + It "Minor version is added, removed and updated at the same time" { + $prevReport = [HeaderNode]::new("Version 1") + $prevReport.AddHeader("MyHeader").AddToolVersionsList("MyTool1", @("2.3.8", "2.4.9", "2.5.3", "2.6.0", "2.7.4", "2.8.0"), "^\d+\.\d+") + + $nextReport = [HeaderNode]::new("Version 2") + $nextReport.AddHeader("MyHeader").AddToolVersionsList("MyTool1", @("2.5.3", "2.6.2", "2.7.5", "2.8.0", "2.9.2", "2.10.3"), "^\d+\.\d+") + + $comparer = [SoftwareReportDifferenceCalculator]::new($prevReport, $nextReport) + $comparer.CompareReports() + + $comparer.AddedItems | Should -HaveCount 1 + $comparer.ChangedItems | Should -HaveCount 1 + $comparer.DeletedItems | Should -HaveCount 1 + + $comparer.AddedItems[0].PreviousReportNode | Should -BeNullOrEmpty + $comparer.AddedItems[0].CurrentReportNode | Should -BeOfType ([ToolVersionsListNode]) + $comparer.AddedItems[0].CurrentReportNode.ToolName | Should -Be "MyTool1" + $comparer.AddedItems[0].CurrentReportNode.Versions | Should -BeArray @("2.9.2", "2.10.3") + + $comparer.ChangedItems[0].PreviousReportNode | Should -BeOfType ([ToolVersionsListNode]) + $comparer.ChangedItems[0].PreviousReportNode.ToolName | Should -Be "MyTool1" + $comparer.ChangedItems[0].PreviousReportNode.Versions | Should -BeArray @("2.6.0", "2.7.4") + $comparer.ChangedItems[0].CurrentReportNode | Should -BeOfType ([ToolVersionsListNode]) + $comparer.ChangedItems[0].CurrentReportNode.ToolName | Should -Be "MyTool1" + $comparer.ChangedItems[0].CurrentReportNode.Versions | Should -BeArray @("2.6.2", "2.7.5") + + $comparer.DeletedItems[0].PreviousReportNode | Should -BeOfType ([ToolVersionsListNode]) + $comparer.DeletedItems[0].PreviousReportNode.ToolName | Should -Be "MyTool1" + $comparer.DeletedItems[0].PreviousReportNode.Versions | Should -BeArray @("2.3.8", "2.4.9") + $comparer.DeletedItems[0].CurrentReportNode | Should -BeNullOrEmpty + } + + It "Patch version is added, removed and updated at the same time" { + $prevReport = [HeaderNode]::new("Version 1") + $prevReport.AddHeader("MyHeader").AddToolVersionsList("MyTool1", @("2.3.8", "2.4.9", "2.5.3", "2.6.0", "2.7.4"), "^\d+\.\d+\.\d+") + + $nextReport = [HeaderNode]::new("Version 2") + $nextReport.AddHeader("MyHeader").AddToolVersionsList("MyTool1", @("2.4.9", "2.5.4", "2.6.0", "2.7.5", "2.8.2"), "^\d+\.\d+\.\d+") + + $comparer = [SoftwareReportDifferenceCalculator]::new($prevReport, $nextReport) + $comparer.CompareReports() + + $comparer.AddedItems | Should -HaveCount 1 + $comparer.ChangedItems | Should -HaveCount 0 + $comparer.DeletedItems | Should -HaveCount 1 + + $comparer.AddedItems[0].PreviousReportNode | Should -BeNullOrEmpty + $comparer.AddedItems[0].CurrentReportNode | Should -BeOfType ([ToolVersionsListNode]) + $comparer.AddedItems[0].CurrentReportNode.ToolName | Should -Be "MyTool1" + $comparer.AddedItems[0].CurrentReportNode.Versions | Should -BeArray @("2.5.4", "2.7.5", "2.8.2") + + $comparer.DeletedItems[0].PreviousReportNode | Should -BeOfType ([ToolVersionsListNode]) + $comparer.DeletedItems[0].PreviousReportNode.ToolName | Should -Be "MyTool1" + $comparer.DeletedItems[0].PreviousReportNode.Versions | Should -BeArray @("2.3.8", "2.5.3", "2.7.4") + $comparer.DeletedItems[0].CurrentReportNode | Should -BeNullOrEmpty + } + } + + Describe "TableNode" { + It "Rows are added" { + $prevReport = [HeaderNode]::new("Version 1") + $prevReport.AddHeader("MyHeader").AddNode([TableNode]::new("Name|Value", @("A1|A2", "B1|B2"))) + + $nextReport = [HeaderNode]::new("Version 2") + $nextReport.AddHeader("MyHeader").AddNode([TableNode]::new("Name|Value", @("A1|A2", "B1|B2", "C1|C2", "D1|D2"))) + + $comparer = [SoftwareReportDifferenceCalculator]::new($prevReport, $nextReport) + $comparer.CompareReports() + + $comparer.AddedItems | Should -HaveCount 1 + $comparer.ChangedItems | Should -HaveCount 0 + $comparer.DeletedItems | Should -HaveCount 0 + + $comparer.AddedItems[0].PreviousReportNode | Should -BeOfType ([TableNode]) + $comparer.AddedItems[0].PreviousReportNode.Headers | Should -Be "Name|Value" + $comparer.AddedItems[0].PreviousReportNode.Rows | Should -BeArray @("A1|A2", "B1|B2") + $comparer.AddedItems[0].CurrentReportNode | Should -BeOfType ([TableNode]) + $comparer.AddedItems[0].CurrentReportNode.Headers | Should -Be "Name|Value" + $comparer.AddedItems[0].CurrentReportNode.Rows | Should -BeArray @("A1|A2", "B1|B2", "C1|C2", "D1|D2") + } + + It "Rows are deleted" { + $prevReport = [HeaderNode]::new("Version 1") + $prevReport.AddHeader("MyHeader").AddNode([TableNode]::new("Name|Value", @("A1|A2", "B1|B2", "C1|C2", "D1|D2"))) + + $nextReport = [HeaderNode]::new("Version 2") + $nextReport.AddHeader("MyHeader").AddNode([TableNode]::new("Name|Value", @("C1|C2", "D1|D2"))) + + $comparer = [SoftwareReportDifferenceCalculator]::new($prevReport, $nextReport) + $comparer.CompareReports() + + $comparer.AddedItems | Should -HaveCount 0 + $comparer.ChangedItems | Should -HaveCount 0 + $comparer.DeletedItems | Should -HaveCount 1 + + $comparer.DeletedItems[0].PreviousReportNode | Should -BeOfType ([TableNode]) + $comparer.DeletedItems[0].PreviousReportNode.Headers | Should -Be "Name|Value" + $comparer.DeletedItems[0].PreviousReportNode.Rows | Should -BeArray @("A1|A2", "B1|B2", "C1|C2", "D1|D2") + $comparer.DeletedItems[0].CurrentReportNode | Should -BeOfType ([TableNode]) + $comparer.DeletedItems[0].CurrentReportNode.Headers | Should -Be "Name|Value" + $comparer.DeletedItems[0].CurrentReportNode.Rows | Should -BeArray @("C1|C2", "D1|D2") + } + + It "Rows are changed" { + $prevReport = [HeaderNode]::new("Version 1") + $prevReport.AddHeader("MyHeader").AddNode([TableNode]::new("Name|Value", @("A1|A2", "B1|B2"))) + + $nextReport = [HeaderNode]::new("Version 2") + $nextReport.AddHeader("MyHeader").AddNode([TableNode]::new("Name|Value", @("A1|A2", "B3|B4"))) + + $comparer = [SoftwareReportDifferenceCalculator]::new($prevReport, $nextReport) + $comparer.CompareReports() + + $comparer.AddedItems | Should -HaveCount 0 + $comparer.ChangedItems | Should -HaveCount 1 + $comparer.DeletedItems | Should -HaveCount 0 + + $comparer.ChangedItems[0].PreviousReportNode | Should -BeOfType ([TableNode]) + $comparer.ChangedItems[0].PreviousReportNode.Headers | Should -Be "Name|Value" + $comparer.ChangedItems[0].PreviousReportNode.Rows | Should -BeArray @("A1|A2", "B1|B2") + $comparer.ChangedItems[0].CurrentReportNode | Should -BeOfType ([TableNode]) + $comparer.ChangedItems[0].CurrentReportNode.Headers | Should -Be "Name|Value" + $comparer.ChangedItems[0].CurrentReportNode.Rows | Should -BeArray @("A1|A2", "B3|B4") + } + + It "Rows are changed and updated at the same time" { + $prevReport = [HeaderNode]::new("Version 1") + $prevReport.AddHeader("MyHeader").AddNode([TableNode]::new("Name|Value", @("A1|A2", "B1|B2"))) + + $nextReport = [HeaderNode]::new("Version 2") + $nextReport.AddHeader("MyHeader").AddNode([TableNode]::new("Name|Value", @("A1|A2", "B3|B4", "C1|C2"))) + + $comparer = [SoftwareReportDifferenceCalculator]::new($prevReport, $nextReport) + $comparer.CompareReports() + + $comparer.AddedItems | Should -HaveCount 0 + $comparer.ChangedItems | Should -HaveCount 1 + $comparer.DeletedItems | Should -HaveCount 0 + + $comparer.ChangedItems[0].PreviousReportNode | Should -BeOfType ([TableNode]) + $comparer.ChangedItems[0].PreviousReportNode.Headers | Should -Be "Name|Value" + $comparer.ChangedItems[0].PreviousReportNode.Rows | Should -BeArray @("A1|A2", "B1|B2") + $comparer.ChangedItems[0].CurrentReportNode | Should -BeOfType ([TableNode]) + $comparer.ChangedItems[0].CurrentReportNode.Headers | Should -Be "Name|Value" + $comparer.ChangedItems[0].CurrentReportNode.Rows | Should -BeArray @("A1|A2", "B3|B4", "C1|C2") + } + + It "Rows are changed and removed at the same time" { + $prevReport = [HeaderNode]::new("Version 1") + $prevReport.AddHeader("MyHeader").AddNode([TableNode]::new("Name|Value", @("A1|A2", "B1|B2", "C1|C2"))) + + $nextReport = [HeaderNode]::new("Version 2") + $nextReport.AddHeader("MyHeader").AddNode([TableNode]::new("Name|Value", @("A1|A2", "B3|B4"))) + + $comparer = [SoftwareReportDifferenceCalculator]::new($prevReport, $nextReport) + $comparer.CompareReports() + + $comparer.AddedItems | Should -HaveCount 0 + $comparer.ChangedItems | Should -HaveCount 1 + $comparer.DeletedItems | Should -HaveCount 0 + + $comparer.ChangedItems[0].PreviousReportNode | Should -BeOfType ([TableNode]) + $comparer.ChangedItems[0].PreviousReportNode.Headers | Should -Be "Name|Value" + $comparer.ChangedItems[0].PreviousReportNode.Rows | Should -BeArray @("A1|A2", "B1|B2", "C1|C2") + $comparer.ChangedItems[0].CurrentReportNode | Should -BeOfType ([TableNode]) + $comparer.ChangedItems[0].CurrentReportNode.Headers | Should -Be "Name|Value" + $comparer.ChangedItems[0].CurrentReportNode.Rows | Should -BeArray @("A1|A2", "B3|B4") + } + + It "Rows are not changed" { + $prevReport = [HeaderNode]::new("Version 1") + $prevReport.AddHeader("MyHeader").AddNode([TableNode]::new("Name|Value", @("A1|A2", "B1|B2"))) + + $nextReport = [HeaderNode]::new("Version 2") + $nextReport.AddHeader("MyHeader").AddNode([TableNode]::new("Name|Value", @("A1|A2", "B1|B2"))) + + $comparer = [SoftwareReportDifferenceCalculator]::new($prevReport, $nextReport) + $comparer.CompareReports() + + $comparer.AddedItems | Should -HaveCount 0 + $comparer.ChangedItems | Should -HaveCount 0 + $comparer.DeletedItems | Should -HaveCount 0 + } + + It "Rows are not changed but header is changed" { + $prevReport = [HeaderNode]::new("Version 1") + $prevReport.AddHeader("MyHeader").AddNode([TableNode]::new("Name|Value", @("A1|A2", "B1|B2"))) + + $nextReport = [HeaderNode]::new("Version 2") + $nextReport.AddHeader("MyHeader").AddNode([TableNode]::new("Name|Value2", @("A1|A2", "B1|B2"))) + + $comparer = [SoftwareReportDifferenceCalculator]::new($prevReport, $nextReport) + $comparer.CompareReports() + + $comparer.AddedItems | Should -HaveCount 0 + $comparer.ChangedItems | Should -HaveCount 0 + $comparer.DeletedItems | Should -HaveCount 0 + } + + It "Rows are changed and header is changed at the same time" { + $prevReport = [HeaderNode]::new("Version 1") + $prevReport.AddHeader("MyHeader").AddNode([TableNode]::new("Name|Value", @("A1|A2", "B1|B2"))) + + $nextReport = [HeaderNode]::new("Version 2") + $nextReport.AddHeader("MyHeader").AddNode([TableNode]::new("Name|Value2", @("A1|A2", "B1|B2", "C1|C2"))) + + $comparer = [SoftwareReportDifferenceCalculator]::new($prevReport, $nextReport) + $comparer.CompareReports() + + $comparer.AddedItems | Should -HaveCount 1 + $comparer.ChangedItems | Should -HaveCount 0 + $comparer.DeletedItems | Should -HaveCount 1 + + $comparer.AddedItems[0].PreviousReportNode | Should -BeNullOrEmpty + $comparer.AddedItems[0].CurrentReportNode | Should -BeOfType ([TableNode]) + $comparer.AddedItems[0].CurrentReportNode.Headers | Should -Be "Name|Value2" + $comparer.AddedItems[0].CurrentReportNode.Rows | Should -BeArray @("A1|A2", "B1|B2", "C1|C2") + + $comparer.DeletedItems[0].PreviousReportNode | Should -BeOfType ([TableNode]) + $comparer.DeletedItems[0].PreviousReportNode.Headers | Should -Be "Name|Value" + $comparer.DeletedItems[0].PreviousReportNode.Rows | Should -BeArray @("A1|A2", "B1|B2") + $comparer.DeletedItems[0].CurrentReportNode | Should -BeNullOrEmpty + } + } + + Describe "NoteNode" { + It "NoteNode is ignored from report" { + $prevReport = [HeaderNode]::new("Version 1") + $prevReport.AddNote("MyFirstNote") + $prevReport.AddHeader("MyFirstHeader").AddNote("MyFirstSubNote") + + $nextReport = [HeaderNode]::new("Version 2") + $nextReport.AddNote("MySecondNote") + $nextReport.AddHeader("MySecondHeader").AddNote("MySecondSubNote") + + $comparer = [SoftwareReportDifferenceCalculator]::new($prevReport, $nextReport) + $comparer.CompareReports() + + $comparer.AddedItems | Should -HaveCount 0 + $comparer.ChangedItems | Should -HaveCount 0 + $comparer.DeletedItems | Should -HaveCount 0 + } + } +} \ No newline at end of file diff --git a/helpers/software-report-base/tests/SoftwareReport.DifferenceRender.Unit.Tests.ps1 b/helpers/software-report-base/tests/SoftwareReport.DifferenceRender.Unit.Tests.ps1 new file mode 100644 index 000000000000..92723f2c19e5 --- /dev/null +++ b/helpers/software-report-base/tests/SoftwareReport.DifferenceRender.Unit.Tests.ps1 @@ -0,0 +1,291 @@ +using module ../SoftwareReport.Nodes.psm1 +using module ../SoftwareReport.DifferenceRender.psm1 + +BeforeDiscovery { + Import-Module $(Join-Path $PSScriptRoot "TestHelpers.psm1") -DisableNameChecking +} + +Describe "ComparerReport.UnitTests" { + BeforeAll { + $script:DifferenceRender = [SoftwareReportDifferenceRender]::new() + } + + Context "CalculateHtmlTableRowSpan" { + It "Without the equal cells" { + $table = @( + [PSCustomObject]@{ Key = "A"; Value = "1" } + [PSCustomObject]@{ Key = "B"; Value = "2" } + [PSCustomObject]@{ Key = "C"; Value = "3" } + ) + + $actual = $DifferenceRender.CalculateHtmlTableRowSpan($table, "Key") + $actual | Should -BeArray @(1, 1, 1) + } + + It "Only equal cells" { + $table = @( + [PSCustomObject]@{ Key = "A"; Value = "D" } + [PSCustomObject]@{ Key = "B"; Value = "D" } + [PSCustomObject]@{ Key = "C"; Value = "D" } + ) + + $actual = $DifferenceRender.CalculateHtmlTableRowSpan($table, "Value") + $actual | Should -BeArray @(3, 0, 0) + } + + It "Single row" { + $table = @( + [PSCustomObject]@{ Key = "A"; Value = "1" } + ) + + $actual = $DifferenceRender.CalculateHtmlTableRowSpan($table, "Key") + $actual | Should -BeArray @(1) + } + + It "Different cells" { + $table = @( + [PSCustomObject]@{ Key = "A"; Value = "1" } + [PSCustomObject]@{ Key = "B"; Value = "2" } + [PSCustomObject]@{ Key = "B"; Value = "3" } + [PSCustomObject]@{ Key = "C"; Value = "4" } + [PSCustomObject]@{ Key = "C"; Value = "5" } + [PSCustomObject]@{ Key = "C"; Value = "6" } + [PSCustomObject]@{ Key = "D"; Value = "7" } + [PSCustomObject]@{ Key = "E"; Value = "8" } + [PSCustomObject]@{ Key = "E"; Value = "9" } + [PSCustomObject]@{ Key = "F"; Value = "10" } + ) + + $actual = $DifferenceRender.CalculateHtmlTableRowSpan($table, "Key") + $actual | Should -BeArray @(1, 2, 0, 3, 0, 0, 1, 2, 0, 1) + } + } + + Context "RenderCategory" { + It "With line separator" { + $actual = $DifferenceRender.RenderCategory(@("Header 1", "Header 2", "Header 3"), $true) + $actual | Should -Be "Header 2 ><br> Header 3" + } + + It "Without line separator" { + $actual = $DifferenceRender.RenderCategory(@("Header 1", "Header 2", "Header 3"), $false) + $actual | Should -Be "Header 2 > Header 3" + } + + It "One header" { + $actual = $DifferenceRender.RenderCategory(@("Header 1"), $false) + $actual | Should -Be "" + } + + It "Empty headers" { + $actual = $DifferenceRender.RenderCategory(@(), $false) + $actual | Should -Be "" + } + } + + Context "RenderToolName" { + It "Clear tool name" { + $actual = $DifferenceRender.RenderToolName("My Tool 1") + $actual | Should -Be "My Tool 1" + } + + It "Name with colon symbol" { + $actual = $DifferenceRender.RenderToolName("My Tool 1:") + $actual | Should -Be "My Tool 1" + } + } + + Context "StrikeTableRow" { + It "Simple row" { + $actual = $DifferenceRender.StrikeTableRow("Test1|Test2|Test3") + $actual | Should -Be "~~Test1~~|~~Test2~~|~~Test3~~" + } + + It "Row with spaces" { + $actual = $DifferenceRender.StrikeTableRow("Test 1|Test 2|Test 3") + $actual | Should -Be "~~Test 1~~|~~Test 2~~|~~Test 3~~" + } + } + + Context "RenderHtmlTable" { + It "Simple table" { + $table = @( + [PSCustomObject]@{ "Category" = "A"; "Tool name" = "My Tool 1"; "Version" = "1.0" }, + [PSCustomObject]@{ "Category" = "B"; "Tool name" = "My Tool 2"; "Version" = "2.0" }, + [PSCustomObject]@{ "Category" = "C"; "Tool name" = "My Tool 3"; "Version" = "3.0" } + ) + + $renderedTable = $DifferenceRender.RenderHtmlTable($table, "Category") + $renderedTable | Should -Be @' +<table> + <thead> + <th>Category</th> + <th>Tool name</th> + <th>Version</th> + </thead> + <tbody> + <tr> + <td rowspan="1">A</td> + <td>My Tool 1</td> + <td>1.0</td> + </tr> + <tr> + <td rowspan="1">B</td> + <td>My Tool 2</td> + <td>2.0</td> + </tr> + <tr> + <td rowspan="1">C</td> + <td>My Tool 3</td> + <td>3.0</td> + </tr> + </tbody> +</table> + +'@ + + } + + It "Table with the same category" { + $table = @( + [PSCustomObject]@{ "Category" = "A"; "Tool name" = "My Tool 1"; "Version" = "1.0" }, + [PSCustomObject]@{ "Category" = "A"; "Tool name" = "My Tool 2"; "Version" = "2.0" }, + [PSCustomObject]@{ "Category" = "A"; "Tool name" = "My Tool 3"; "Version" = "3.0" }, + [PSCustomObject]@{ "Category" = "B"; "Tool name" = "My Tool 4"; "Version" = "4.0" } + ) + + $renderedTable = $DifferenceRender.RenderHtmlTable($table, "Category") + $renderedTable | Should -Be @' +<table> + <thead> + <th>Category</th> + <th>Tool name</th> + <th>Version</th> + </thead> + <tbody> + <tr> + <td rowspan="3">A</td> + <td>My Tool 1</td> + <td>1.0</td> + </tr> + <tr> + <td>My Tool 2</td> + <td>2.0</td> + </tr> + <tr> + <td>My Tool 3</td> + <td>3.0</td> + </tr> + <tr> + <td rowspan="1">B</td> + <td>My Tool 4</td> + <td>4.0</td> + </tr> + </tbody> +</table> + +'@ + + } + } + + Context "RenderTableNodesDiff" { + It "Add new table" { + $previousNode = $null + $currentNode = [TableNode]::new("Name|Value", @("A|1", "B|2")) + $reportItem = [ReportDifferenceItem]::new($previousNode, $currentNode, @("Header 1", "Header 2", "Header 3")) + + $actual = $DifferenceRender.RenderTableNodesDiff($reportItem) + $actual | Should -Be @' +#### Header 2 > Header 3 +| Name | Value | +| ---- | ----- | +| A | 1 | +| B | 2 | + +'@ + } + + It "Remove existing table" { + $previousNode = [TableNode]::new("Name|Value", @("A|1", "B|2")) + $currentNode = $null + $reportItem = [ReportDifferenceItem]::new($previousNode, $currentNode, @("Header 1", "Header 2", "Header 3")) + + $actual = $DifferenceRender.RenderTableNodesDiff($reportItem) + $actual | Should -Be @' +#### Header 2 > Header 3 +| Name | Value | +| ----- | ----- | +| ~~A~~ | ~~1~~ | +| ~~B~~ | ~~2~~ | + +'@ + } + + It "Add new rows to existing table" { + $previousNode = [TableNode]::new("Name|Value", @("A|1", "B|2")) + $currentNode = [TableNode]::new("Name|Value", @("A|1", "B|2", "C|3", "D|4")) + $reportItem = [ReportDifferenceItem]::new($previousNode, $currentNode, @("Header 1", "Header 2", "Header 3")) + + $actual = $DifferenceRender.RenderTableNodesDiff($reportItem) + $actual | Should -Be @' +#### Header 2 > Header 3 +| Name | Value | +| ---- | ----- | +| C | 3 | +| D | 4 | + +'@ + } + + It "Remove rows from existing table" { + $previousNode = [TableNode]::new("Name|Value", @("A|1", "B|2", "C|3", "D|4")) + $currentNode = [TableNode]::new("Name|Value", @("C|3", "D|4")) + $reportItem = [ReportDifferenceItem]::new($previousNode, $currentNode, @("Header 1", "Header 2", "Header 3")) + + $actual = $DifferenceRender.RenderTableNodesDiff($reportItem) + $actual | Should -Be @' +#### Header 2 > Header 3 +| Name | Value | +| ----- | ----- | +| ~~A~~ | ~~1~~ | +| ~~B~~ | ~~2~~ | + +'@ + } + + It "Row is changed in existing table" { + $previousNode = [TableNode]::new("Name|Value", @("A|1", "B|2")) + $currentNode = [TableNode]::new("Name|Value", @("A|1", "B|3")) + $reportItem = [ReportDifferenceItem]::new($previousNode, $currentNode, @("Header 1", "Header 2", "Header 3")) + + $actual = $DifferenceRender.RenderTableNodesDiff($reportItem) + $actual | Should -Be @' +#### Header 2 > Header 3 +| Name | Value | +| ----- | ----- | +| ~~B~~ | ~~2~~ | +| B | 3 | + +'@ + } + + It "Row is changed, added and removed at the same time in existing table" { + $previousNode = [TableNode]::new("Name|Value", @("A|1", "B|2", "C|3", "D|4")) + $currentNode = [TableNode]::new("Name|Value", @("B|2", "C|4", "D|4", "E|5")) + $reportItem = [ReportDifferenceItem]::new($previousNode, $currentNode, @("Header 1", "Header 2", "Header 3")) + + $actual = $DifferenceRender.RenderTableNodesDiff($reportItem) + $actual | Should -Be @' +#### Header 2 > Header 3 +| Name | Value | +| ----- | ----- | +| ~~A~~ | ~~1~~ | +| ~~C~~ | ~~3~~ | +| C | 4 | +| E | 5 | + +'@ + } + } +} \ No newline at end of file diff --git a/helpers/software-report-base/tests/SoftwareReport.E2E.Tests.ps1 b/helpers/software-report-base/tests/SoftwareReport.E2E.Tests.ps1 new file mode 100644 index 000000000000..ca8b4626c9d6 --- /dev/null +++ b/helpers/software-report-base/tests/SoftwareReport.E2E.Tests.ps1 @@ -0,0 +1,93 @@ +using module ../SoftwareReport.psm1 +using module ../SoftwareReport.Nodes.psm1 + +Describe "SoftwareReport.E2E" { + Context "Report example 1" { + BeforeEach { + $softwareReport = [SoftwareReport]::new("macOS 11") + $softwareReport.Root.AddToolVersion("OS Version:", "macOS 11.7 (20G817)") + $softwareReport.Root.AddToolVersion("Image Version:", "20220918.1") + $installedSoftware = $softwareReport.Root.AddHeader("Installed Software") + + $languagesAndRuntimes = $installedSoftware.AddHeader("Language and Runtime") + $languagesAndRuntimes.AddToolVersion("Bash", "5.1.16(1)-release") + $languagesAndRuntimes.AddToolVersionsListInline(".NET Core SDK", @("1.2.100", "1.2.200", "3.1.414"), "^\d+\.\d+\.\d") + $languagesAndRuntimes.AddNode([ToolVersionNode]::new("Perl", "5.34.0")) + + $cachedTools = $installedSoftware.AddHeader("Cached Tools") + $cachedTools.AddToolVersionsList("Ruby", @("2.7.3", "2.8.1", "3.1.2"), "^\d+\.\d+") + $cachedTools.AddToolVersionsList("Node.js", @("14.8.0", "15.1.0", "16.4.2"), "^\d+") + + $javaSection = $installedSoftware.AddHeader("Java") + $javaSection.AddTable(@( + [PSCustomObject] @{ Version = "8.0.125"; Vendor = "My Vendor"; "Environment Variable" = "JAVA_HOME_8_X64" }, + [PSCustomObject] @{ Version = "11.3.103"; Vendor = "My Vendor"; "Environment Variable" = "JAVA_HOME_11_X64" } + )) + + $sqlSection = $installedSoftware.AddHeader("MySQL") + $sqlSection.AddToolVersion("MySQL", "6.1.0") + $sqlSection.AddNote("MySQL service is disabled by default.`nUse the following command as a part of your job to start the service: 'sudo systemctl start mysql.service'") + + $expectedMarkdown = @' +# macOS 11 +- OS Version: macOS 11.7 (20G817) +- Image Version: 20220918.1 + +## Installed Software + +### Language and Runtime +- Bash 5.1.16(1)-release +- .NET Core SDK: 1.2.100, 1.2.200, 3.1.414 +- Perl 5.34.0 + +### Cached Tools + +#### Ruby +- 2.7.3 +- 2.8.1 +- 3.1.2 + +#### Node.js +- 14.8.0 +- 15.1.0 +- 16.4.2 + +### Java +| Version | Vendor | Environment Variable | +| -------- | --------- | -------------------- | +| 8.0.125 | My Vendor | JAVA_HOME_8_X64 | +| 11.3.103 | My Vendor | JAVA_HOME_11_X64 | + +### MySQL +- MySQL 6.1.0 +``` +MySQL service is disabled by default. +Use the following command as a part of your job to start the service: 'sudo systemctl start mysql.service' +``` +'@ + } + + It "ToMarkdown" { + $softwareReport.ToMarkdown() | Should -Be $expectedMarkdown + } + + It "Serialization + Deserialization" { + $json = $softwareReport.ToJson() + $deserializedReport = [SoftwareReport]::FromJson($json) + $deserializedReport.ToMarkdown() | Should -Be $expectedMarkdown + } + } + + Context "GetImageVersion" { + It "Image version exists" { + $softwareReport = [SoftwareReport]::new("MyReport") + $softwareReport.Root.AddToolVersion("Image Version:", "123.4") + $softwareReport.GetImageVersion() | Should -Be "123.4" + } + + It "Empty report" { + $softwareReport = [SoftwareReport]::new("MyReport") + $softwareReport.GetImageVersion() | Should -Be "Unknown version" + } + } +} \ No newline at end of file diff --git a/helpers/software-report-base/tests/SoftwareReport.Nodes.Unit.Tests.ps1 b/helpers/software-report-base/tests/SoftwareReport.Nodes.Unit.Tests.ps1 new file mode 100644 index 000000000000..58f57d39779c --- /dev/null +++ b/helpers/software-report-base/tests/SoftwareReport.Nodes.Unit.Tests.ps1 @@ -0,0 +1,511 @@ +using module ../SoftwareReport.Nodes.psm1 + +BeforeDiscovery { + Import-Module $(Join-Path $PSScriptRoot "TestHelpers.psm1") -DisableNameChecking +} + +Describe "Nodes.UnitTests" { + Context "ToolVersionNode" { + It "ToMarkdown" { + $node = [ToolVersionNode]::new("MyTool", "2.1.3") + $node.ToMarkdown() | Should -Be "- MyTool 2.1.3" + } + + It "GetValue" { + $node = [ToolVersionNode]::new("MyTool", "2.1.3") + $node.GetValue() | Should -Be "2.1.3" + } + + It "Serialization" { + $node = [ToolVersionNode]::new("MyTool", "2.1.3") + $json = $node.ToJsonObject() + $json.NodeType | Should -Be "ToolVersionNode" + $json.ToolName | Should -Be "MyTool" + $json.Version | Should -Be "2.1.3" + } + + It "Deserialization" { + { [ToolVersionNode]::FromJsonObject(@{ NodeType = "ToolVersionNode"; ToolName = ""; Version = "2.1.3" }) } | Should -Throw '*Exception setting "ToolName": "The argument is null or empty.*' + { [ToolVersionNode]::FromJsonObject(@{ NodeType = "ToolVersionNode"; ToolName = "MyTool"; Version = "" }) } | Should -Throw '*Exception setting "Version": "The argument is null or empty.*' + { [ToolVersionNode]::FromJsonObject(@{ NodeType = "ToolVersionNode"; ToolName = "MyTool"; Version = "2.1.3" }) } | Should -Not -Throw + } + + It "Serialization + Deserialization" { + $node = [ToolVersionNode]::new("MyTool", "2.1.3") + $json = $node.ToJsonObject() + $node2 = [ToolVersionNode]::FromJsonObject($json) + $json2 = $node2.ToJsonObject() + $($json | ConvertTo-Json) | Should -Be $($json2 | ConvertTo-Json) + } + + It "IsSimilarTo" { + [ToolVersionNode]::new("MyTool", "2.1.3").IsSimilarTo([ToolVersionNode]::new("MyTool", "2.1.3")) | Should -BeTrue + [ToolVersionNode]::new("MyTool", "2.1.3").IsSimilarTo([ToolVersionNode]::new("MyTool", "1.0.0")) | Should -BeTrue + [ToolVersionNode]::new("MyTool", "2.1.3").IsSimilarTo([ToolVersionNode]::new("MyTool2", "2.1.3")) | Should -BeFalse + } + + It "IsIdenticalTo" { + [ToolVersionNode]::new("MyTool", "2.1.3").IsIdenticalTo([ToolVersionNode]::new("MyTool", "2.1.3")) | Should -BeTrue + [ToolVersionNode]::new("MyTool", "2.1.3").IsIdenticalTo([ToolVersionNode]::new("MyTool", "1.0.0")) | Should -BeFalse + [ToolVersionNode]::new("MyTool", "2.1.3").IsIdenticalTo([ToolVersionNode]::new("MyTool2", "2.1.3")) | Should -BeFalse + } + } + + Context "ToolVersionsListNode" { + It "ToMarkdown - List" { + $node = [ToolVersionsListNode]::new("MyTool", @("2.7.7", "3.0.5", "3.1.3"), "^.+", "List") + $expected = @( + "", + "# MyTool" + "- 2.7.7" + "- 3.0.5" + "- 3.1.3" + ) -join "`n" + $node.ToMarkdown() | Should -Be $expected + } + + It "ToMarkdown - Inline" { + $node = [ToolVersionsListNode]::new("MyTool", @("2.7.7", "3.0.5", "3.1.3"), "^.+", "Inline") + $node.ToMarkdown() | Should -Be "- MyTool: 2.7.7, 3.0.5, 3.1.3" + } + + It "GetValue" { + $node = [ToolVersionsListNode]::new("MyTool", @("2.7.7", "3.0.5", "3.1.3"), "^.+", "List") + $node.GetValue() | Should -Be "2.7.7, 3.0.5, 3.1.3" + } + + It "Serialization - List" { + $node = [ToolVersionsListNode]::new("Ruby", @("2.7.7", "3.0.5", "3.1.3"), "^.+", "List") + $json = $node.ToJsonObject() + $json.NodeType | Should -Be "ToolVersionsListNode" + $json.ToolName | Should -Be "Ruby" + $json.Versions | Should -BeArray @("2.7.7", "3.0.5", "3.1.3") + $json.MajorVersionRegex | Should -Be "^.+" + $json.ListType | Should -Be "List" + } + + It "Serialization - Inline" { + $node = [ToolVersionsListNode]::new("Ruby", @("2.7.7", "3.0.5", "3.1.3"), "^.+", "Inline") + $json = $node.ToJsonObject() + $json.NodeType | Should -Be "ToolVersionsListNode" + $json.ToolName | Should -Be "Ruby" + $json.Versions | Should -BeArray @("2.7.7", "3.0.5", "3.1.3") + $json.MajorVersionRegex | Should -Be "^.+" + $json.ListType | Should -Be "Inline" + } + + It "Deserialization" { + { [ToolVersionsListNode]::FromJsonObject(@{ NodeType = "ToolVersionsListNode"; ToolName = ""; Versions = @("2.1.3", "3.1.4"); MajorVersionRegex = "^\d+"; ListType = "List" }) } | Should -Throw '*Exception setting "ToolName": "The argument is null or empty.*' + { [ToolVersionsListNode]::FromJsonObject(@{ NodeType = "ToolVersionsListNode"; ToolName = "MyTool"; MajorVersionRegex = "^\d+"; ListType = "List" }) } | Should -Throw '*Exception setting "Versions": "The argument is null or empty.*' + { [ToolVersionsListNode]::FromJsonObject(@{ NodeType = "ToolVersionsListNode"; ToolName = "MyTool"; Versions = @(); MajorVersionRegex = "^\d+"; ListType = "List" }) } | Should -Throw '*Exception setting "Versions": "The argument is null, empty,*' + { [ToolVersionsListNode]::FromJsonObject(@{ NodeType = "ToolVersionsListNode"; ToolName = "MyTool"; Versions = @("2.1.3", '2.2.4'); MajorVersionRegex = "^\d+"; ListType = "List" }) } | Should -Throw 'Multiple versions from list * return the same result from regex *' + { [ToolVersionsListNode]::FromJsonObject(@{ NodeType = "ToolVersionsListNode"; ToolName = "MyTool"; Versions = @("2.1.3", "3.1.4"); MajorVersionRegex = ""; ListType = "List" }) } | Should -Throw 'Version * doesn''t match regex *' + { [ToolVersionsListNode]::FromJsonObject(@{ NodeType = "ToolVersionsListNode"; ToolName = "MyTool"; Versions = @("2.1.3", "3.1.4"); MajorVersionRegex = "^\d+"; ListType = "Fake" }) } | Should -Throw '*Exception setting "ListType": "The argument * does not belong to the set*' + { [ToolVersionsListNode]::FromJsonObject(@{ NodeType = "ToolVersionsListNode"; ToolName = "MyTool"; Versions = @("2.1.3", "3.1.4"); MajorVersionRegex = "^\d+"; ListType = "List" }) } | Should -Not -Throw + { [ToolVersionsListNode]::FromJsonObject(@{ NodeType = "ToolVersionsListNode"; ToolName = "MyTool"; Versions = @("2.1.3", "3.1.4"); MajorVersionRegex = "^\d+"; ListType = "Inline" }) } | Should -Not -Throw + } + + It "Serialization + Deserialization" { + $node = [ToolVersionsListNode]::new("Ruby", @("2.7.7", "3.0.5", "3.1.3"), "^.+", "List") + $json = $node.ToJsonObject() + $node2 = [ToolVersionsListNode]::FromJsonObject($json) + $json2 = $node2.ToJsonObject() + $($json | ConvertTo-Json) | Should -Be $($json2 | ConvertTo-Json) + } + + It "IsSimilarTo" { + [ToolVersionsListNode]::new("MyTool", @("2.1.3", "3.1.5", "4.0.0"), "^.+", "List").IsSimilarTo( + [ToolVersionsListNode]::new("MyTool", @("2.1.3", "3.1.5", "4.0.0"), "^.+", "List") + ) | Should -BeTrue + [ToolVersionsListNode]::new("MyTool", @("2.1.3", "3.1.5", "4.0.0"), "^.+", "List").IsSimilarTo( + [ToolVersionsListNode]::new("MyTool", @("2.1.5", "5.0.0"), "^.+", "List") + ) | Should -BeTrue + [ToolVersionsListNode]::new("MyTool", @("2.1.3", "3.1.5", "4.0.0"), "^.+", "List").IsSimilarTo( + [ToolVersionsListNode]::new("MyTool2", @("2.1.3", "3.1.5", "4.0.0"), "^.+", "List") + ) | Should -BeFalse + } + + It "IsIdenticalTo" { + [ToolVersionsListNode]::new("MyTool", @("2.1.3", "3.1.5", "4.0.0"), "^.+", "List").IsIdenticalTo( + [ToolVersionsListNode]::new("MyTool", @("2.1.3", "3.1.5", "4.0.0"), "^.+", "List") + ) | Should -BeTrue + [ToolVersionsListNode]::new("MyTool", @("2.1.3", "3.1.5", "4.0.0"), "^.+", "List").IsIdenticalTo( + [ToolVersionsListNode]::new("MyTool", @("2.1.5", "5.0.0"), "^.+", "List") + ) | Should -BeFalse + [ToolVersionsListNode]::new("MyTool", @("2.1.3", "3.1.5", "4.0.0"), "^.+", "List").IsIdenticalTo( + [ToolVersionsListNode]::new("MyTool2", @("2.1.3", "3.1.5", "4.0.0"), "^.+", "List") + ) | Should -BeFalse + } + + It "ExtractMajorVersion" { + $node = [ToolVersionsListNode]::new("MyTool", @("2.1.3", "3.1.5", "4.0.0"), "^\d+\.\d+", "List") + $node.ExtractMajorVersion("2.1.3") | Should -Be "2.1" + $node.ExtractMajorVersion("3.1.5") | Should -Be "3.1" + $node.ExtractMajorVersion("4.0.0") | Should -Be "4.0" + } + + Context "ValidateMajorVersionRegex" { + It "Major version regex - unique versions" { + $node = [ToolVersionsListNode]::new("MyTool", @("2.1.3", "3.1.5", "4.0.0"), "^\d+", "List") + $node.Versions | Should -BeArray @("2.1.3", "3.1.5", "4.0.0") + } + + It "Major version regex - non-unique versions" { + { [ToolVersionsListNode]::new("MyTool", @("2.1.3", "3.1.5", "3.2.0", "4.0.0"), "^\d+", "List") } | Should -Throw "Multiple versions from list * return the same result from regex *" + } + + It "Minor version regex - unique versions" { + $node = [ToolVersionsListNode]::new("MyTool", @("2.1.3", "2.4.0", "3.1.2"), "^\d+\.\d+", "List") + $node.Versions | Should -BeArray @("2.1.3", "2.4.0", "3.1.2") + } + + It "Minor version regex - non-unique versions" { + { [ToolVersionsListNode]::new("MyTool", @("2.1.3", "2.1.4", "3.1.2"), "^\d+\.\d+", "List") } | Should -Throw "Multiple versions from list * return the same result from regex *" + } + + It "Patch version regex - unique versions" { + $node = [ToolVersionsListNode]::new("MyTool", @("2.1.3", "2.1.4", "2.1.5"), "^\d+\.\d+\.\d+", "List") + $node.Versions | Should -BeArray @("2.1.3", "2.1.4", "2.1.5") + } + + It "Patch version regex - non-unique versions" { + { [ToolVersionsListNode]::new("MyTool", @("2.1.3", "2.1.4", "2.1.4"), "^\d+\.\d+\.\d+", "List") } | Should -Throw "Multiple versions from list * return the same result from regex *" + } + + It ".NET Core version regex - unique versions" { + $node = [ToolVersionsListNode]::new("MyTool", @("2.1.100", "2.1.205", "2.1.303"), "^\d+\.\d+\.\d", "List") + $node.Versions | Should -BeArray @("2.1.100", "2.1.205", "2.1.303") + } + + It ".NET Core version regex - non-unique versions" { + { [ToolVersionsListNode]::new("MyTool", @("2.1.100", "2.1.205", "2.1.230", "3.1.0"), "^\d+\.\d+\.\d", "List") } | Should -Throw "Multiple versions from list * return the same result from regex *" + } + } + } + + Context "TableNode" { + Context "ToMarkdown" { + It "Simple table" { + $node = [TableNode]::new("Name|Value", @("A|B", "C|D")) + $node.ToMarkdown() | Should -Be @' +| Name | Value | +| ---- | ----- | +| A | B | +| C | D | +'@ + } + + It "Wide cells" { + $node = [TableNode]::new("Name|Value", @("Very long value here|B", "C|And very long value here too")) + $node.ToMarkdown() | Should -Be @' +| Name | Value | +| -------------------- | ---------------------------- | +| Very long value here | B | +| C | And very long value here too | +'@ + } + } + + It "CalculateColumnsWidth" { + [TableNode]::new("Name|Value", @("A|B", "C|D")).CalculateColumnsWidth() | Should -BeArray @(4, 5) + [TableNode]::new("Name|Value", @("Very long value here|B", "C|And very long value here too")).CalculateColumnsWidth() | Should -BeArray @(20, 28) + } + + It "Serialization" { + $node = [TableNode]::new("Name|Value", @("A|B", "C|D")) + $json = $node.ToJsonObject() + $json.NodeType | Should -Be "TableNode" + $json.Headers | Should -Be "Name|Value" + $json.Rows | Should -BeArray @("A|B", "C|D") + } + + It "Deserialization" { + { [TableNode]::FromJsonObject(@{ NodeType = "TableNode"; Headers = ""; Rows = @("A|1", "B|2") }) } | Should -Throw 'Exception setting "Headers": "The argument is null or empty. *' + { [TableNode]::FromJsonObject(@{ NodeType = "TableNode"; Headers = "Name|Value"; Rows = @() }) } | Should -Throw 'Exception setting "Rows": "The argument is null, empty, *' + { [TableNode]::FromJsonObject(@{ NodeType = "TableNode"; Headers = "Name|Value"; Rows = @("A|1", "B|2|T", "C|3") }) } | Should -Throw 'Table has different number of columns in different rows' + { [TableNode]::FromJsonObject(@{ NodeType = "TableNode"; Headers = "Name|Value"; Rows = @("A|1", "B|2") }) } | Should -Not -Throw + } + + It "Serialization + Deserialization" { + $node = [TableNode]::new("Name|Value", @("A|B", "C|D")) + $json = $node.ToJsonObject() + $node2 = [TableNode]::FromJsonObject($json) + $json2 = $node2.ToJsonObject() + $($json | ConvertTo-Json) | Should -Be $($json2 | ConvertTo-Json) + } + + It "IsSimilarTo" { + [TableNode]::new("Name|Value", @("A|B", "C|D")).IsSimilarTo([TableNode]::new("Name|Value", @("A|B", "C|D"))) | Should -BeTrue + [TableNode]::new("Name|Value", @("A|B", "C|D")).IsSimilarTo([TableNode]::new("Name|Value", @("A|B", "C|D", "F|W"))) | Should -BeTrue + [TableNode]::new("Name|Value", @("A|B", "C|D")).IsSimilarTo([TableNode]::new("Name|Value", @("A|B", "C|E"))) | Should -BeTrue + [TableNode]::new("Name|Value", @("A|B", "C|D")).IsSimilarTo([TableNode]::new("Name|Key", @("A|B", "C|D"))) | Should -BeTrue + } + + It "IsIdenticalTo" { + [TableNode]::new("Name|Value", @("A|B", "C|D")).IsIdenticalTo([TableNode]::new("Name|Value", @("A|B", "C|D"))) | Should -BeTrue + [TableNode]::new("Name|Value", @("A|B", "C|D")).IsIdenticalTo([TableNode]::new("Name|Key", @("A|B", "C|D"))) | Should -BeTrue + [TableNode]::new("Name|Value", @("A|B", "C|D")).IsIdenticalTo([TableNode]::new("Name|Value", @("A|B", "C|D", "F|W"))) | Should -BeFalse + [TableNode]::new("Name|Value", @("A|B", "C|D")).IsIdenticalTo([TableNode]::new("Name|Value", @("A|B", "C|E"))) | Should -BeFalse + } + + Context "FromObjectsArray" { + It "Correct table" { + $table = @( + [PSCustomObject]@{Name = "A"; Value = "B"} + [PSCustomObject]@{Name = "C"; Value = "D"} + ) + + $tableNode = [TableNode]::FromObjectsArray($table) + $tableNode.Headers | Should -Be "Name|Value" + $tableNode.Rows | Should -BeArray @("A|B", "C|D") + } + + It "Correct table with spaces" { + $table = @( + [PSCustomObject]@{Name = "A B"; "My Value" = "1 2"} + [PSCustomObject]@{Name = "C D"; "My Value" = "3 4"} + ) + + $tableNode = [TableNode]::FromObjectsArray($table) + $tableNode.Headers | Should -Be "Name|My Value" + $tableNode.Rows | Should -BeArray @("A B|1 2", "C D|3 4") + } + + It "Throw on empty table" { + { [TableNode]::FromObjectsArray(@()) } | Should -Throw "Failed to create TableNode from empty objects array" + } + + It "Throw on table with different columns" { + $table = @( + [PSCustomObject]@{Name = "A"; Value = "B"} + [PSCustomObject]@{Name = "C"; Value2 = "D"} + ) + + { [TableNode]::FromObjectsArray($table) } | Should -Throw "Failed to create TableNode from objects array because objects have different properties" + } + + It "Throw on empty row" { + $table = @( + [PSCustomObject]@{Name = "A"; Value = "B"}, + [PSCustomObject]@{}, + [PSCustomObject]@{Name = "C"; Value2 = "D"} + ) + + { [TableNode]::FromObjectsArray($table) } | Should -Throw "Failed to create TableNode because some objects are empty" + } + + It "Throw on incorrect symbols in table column names" { + $table = @( + [PSCustomObject]@{"Name|War" = "A"; Value = "B"} + [PSCustomObject]@{"Name|War" = "C"; Value = "D"} + ) + + { [TableNode]::FromObjectsArray($table) } | Should -Throw "Failed to create TableNode because some cells * contains forbidden symbol*" + } + + It "Throw on incorrect symbols in table rows" { + $table = @( + [PSCustomObject]@{Name = "A"; Value = "B|AA"} + [PSCustomObject]@{Name = "C"; Value = "D"} + ) + + { [TableNode]::FromObjectsArray($table) } | Should -Throw "Failed to create TableNode because some cells * contains forbidden symbol*" + } + } + } + + Context "NoteNode" { + It "ToMarkdown" { + $node = [NoteNode]::new("Hello world`nGood Bye world") + $node.ToMarkdown() | Should -Be @' +``` +hello world +Good Bye world +``` +'@ + } + + It "Serialization" { + $node = [NoteNode]::new("MyContent`nMyContent2") + $json = $node.ToJsonObject() + $json.NodeType | Should -Be "NoteNode" + $json.Content | Should -Be "MyContent`nMyContent2" + } + + It "Deserialization" { + { [NoteNode]::FromJsonObject(@{ NodeType = "NoteNode" }) } | Should -Throw '*Exception setting "Content": "The argument is null or empty.*' + { [NoteNode]::FromJsonObject(@{ NodeType = "NoteNode"; Content = "" }) } | Should -Throw '*Exception setting "Content": "The argument is null or empty.*' + { [NoteNode]::FromJsonObject(@{ NodeType = "NoteNode"; Content = "MyTool" }) } | Should -Not -Throw + } + + It "Serialization + Deserialization" { + $node = [NoteNode]::new("MyContent`nMyContent2") + $json = $node.ToJsonObject() + $node2 = [NoteNode]::FromJsonObject($json) + $json2 = $node2.ToJsonObject() + $($json | ConvertTo-Json) | Should -Be $($json2 | ConvertTo-Json) + } + + It "IsSimilarTo" { + [NoteNode]::new("MyContent").IsSimilarTo([NoteNode]::new("MyContent")) | Should -BeTrue + [NoteNode]::new("MyContent").IsSimilarTo([NoteNode]::new("MyContent2")) | Should -BeFalse + } + + It "IsIdenticalTo" { + [NoteNode]::new("MyContent").IsIdenticalTo([NoteNode]::new("MyContent")) | Should -BeTrue + [NoteNode]::new("MyContent").IsIdenticalTo([NoteNode]::new("MyContent2")) | Should -BeFalse + } + } + + Context "HeaderNode" { + It "ToMarkdown" { + $node = [HeaderNode]::new("MyHeader") + $node.AddToolVersion("MyTool", "2.1.3") + $node.ToMarkdown(1) | Should -Be @' + +# MyHeader +- MyTool 2.1.3 +'@ + } + + It "ToMarkdown (level 3)" { + $node = [HeaderNode]::new("MyHeader") + $node.AddToolVersion("MyTool", "2.1.3") + $node.ToMarkdown(3) | Should -Be @' + +### MyHeader +- MyTool 2.1.3 +'@ + } + + It "ToMarkdown (multiple levels)" { + $node = [HeaderNode]::new("MyHeader") + $node.AddHeader("MyHeader 2").AddHeader("MyHeader 3").AddHeader("MyHeader 4").AddToolVersion("MyTool", "2.1.3") + $node.ToMarkdown(1) | Should -Be @' + +# MyHeader + +## MyHeader 2 + +### MyHeader 3 + +#### MyHeader 4 +- MyTool 2.1.3 +'@ + } + + It "Serialization" { + $node = [HeaderNode]::new("MyHeader") + $node.AddToolVersion("MyTool", "2.1.3") + $json = $node.ToJsonObject() + $json.NodeType | Should -Be "HeaderNode" + $json.Title | Should -Be "MyHeader" + $json.Children | Should -HaveCount 1 + } + + It "Deserialization" { + { [HeaderNode]::FromJsonObject(@{ NodeType = "HeaderNode" }) } | Should -Throw '*Exception setting "Title": "The argument is null or empty.*' + { [HeaderNode]::FromJsonObject(@{ NodeType = "HeaderNode"; Title = "" }) } | Should -Throw '*Exception setting "Title": "The argument is null or empty.*' + { [HeaderNode]::FromJsonObject(@{ NodeType = "HeaderNode"; Title = "MyHeader" }) } | Should -Not -Throw + } + + It "Serialization + Deserialization" { + $node = [HeaderNode]::new("MyHeader") + $node.AddToolVersion("MyTool", "2.1.3") + $json = $node.ToJsonObject() + $node2 = [HeaderNode]::FromJsonObject($json) + $json2 = $node2.ToJsonObject() + $($json | ConvertTo-Json) | Should -Be $($json2 | ConvertTo-Json) + } + + It "IsSimilarTo" { + [HeaderNode]::new("MyHeader").IsSimilarTo([HeaderNode]::new("MyHeader")) | Should -BeTrue + [HeaderNode]::new("MyHeader").IsSimilarTo([HeaderNode]::new("MyHeader2")) | Should -BeFalse + } + + It "IsIdenticalTo" { + [HeaderNode]::new("MyHeader").IsIdenticalTo([HeaderNode]::new("MyHeader")) | Should -BeTrue + [HeaderNode]::new("MyHeader").IsIdenticalTo([HeaderNode]::new("MyHeader2")) | Should -BeFalse + } + + It "FindSimilarChildNode" { + $node = [HeaderNode]::new("MyHeader") + $node.AddToolVersion("MyTool", "2.1.3") + + $node.FindSimilarChildNode([ToolVersionNode]::new("MyTool", "1.0.0")) | Should -Not -BeNullOrEmpty + $node.FindSimilarChildNode([ToolVersionNode]::New("MyTool2", "1.0.0")) | Should -BeNullOrEmpty + } + + Context "Detect node duplicates" { + It "Similar HeaderNode on the same header" { + $node = [HeaderNode]::new("MyHeader") + $node.AddHeader("MySubHeader1") + $node.AddHeader("MySubHeader2") + { $node.AddHeader("MySubHeader1") } | Should -Throw "This HeaderNode already contains the similar child node. It is not allowed to add the same node twice.*" + } + + It "Similar ToolVersionNode on the same header" { + $node = [HeaderNode]::new("MyHeader") + $node.AddToolVersion("MyTool", "2.1.3") + $node.AddToolVersion("MyTool2", "2.1.3") + { $node.AddToolVersion("MyTool", "2.1.3") } | Should -Throw "This HeaderNode already contains the similar child node. It is not allowed to add the same node twice.*" + } + + It "Similar ToolVersionsListNode on the same header" { + $node = [HeaderNode]::new("MyHeader") + $node.AddToolVersionsList("MyTool", @("2.1.3", "3.0.0"), "^\d+") + $node.AddToolVersionsListInline("MyTool2", @("2.1.3", "3.0.0"), "^\d+") + { $node.AddToolVersionsList("MyTool", @("2.1.3", "3.0.0"), "^\d+") } | Should -Throw "This HeaderNode already contains the similar child node. It is not allowed to add the same node twice.*" + } + + It "Similar TableNode on the same header" { + $node = [HeaderNode]::new("MyHeader") + $node.AddTable(@( + [PSCustomObject]@{Name = "Value1"}, + [PSCustomObject]@{Name = "Value2"} + )) + { + $node.AddTable(@( + [PSCustomObject]@{Name = "Value1"}, + [PSCustomObject]@{Name = "Value2"} + )) + } | Should -Throw "This HeaderNode already contains the similar child node. It is not allowed to add the same node twice.*" + } + + It "Similar NoteNode on the same header" { + $node = [HeaderNode]::new("MyHeader") + $node.AddNote("MyContent") + $node.AddNote("MyContent2") + { $node.AddNote("MyContent") } | Should -Throw "This HeaderNode already contains the similar child node. It is not allowed to add the same node twice.*" + } + + It "AddNode detects duplicates" { + $node = [HeaderNode]::new("MyHeader") + $node.AddNode([ToolVersionNode]::new("MyTool", "2.1.3")) + { $node.AddNode([ToolVersionNode]::new("MyTool", "2.1.3")) } | Should -Throw "This HeaderNode already contains the similar child node. It is not allowed to add the same node twice.*" + } + + It "AddNodes detects duplicates" { + $node = [HeaderNode]::new("MyHeader") + $node.AddNodes(@( + [ToolVersionNode]::new("MyTool", "2.1.3"), + [ToolVersionNode]::new("MyTool2", "2.1.4") + )) + { + $node.AddNodes(@( + [ToolVersionNode]::new("MyTool3", "2.1.5"), + [ToolVersionNode]::new("MyTool", "2.1.3") + )) + } | Should -Throw "This HeaderNode already contains the similar child node. It is not allowed to add the same node twice.*" + } + + It "Doesn't allow adding non-header nodes after header node" { + $node = [HeaderNode]::new("MyHeader") + $node.AddToolVersion("MyTool", "2.1.3") + $node.AddHeader("MySubHeader") + { $node.AddToolVersion("MyTool2", "2.1.4") } | Should -Throw "It is not allowed to add the node of type * to the HeaderNode that already contains the HeaderNode children." + { $node.AddHeader("MySubHeader2") } | Should -Not -Throw + } + } + } +} \ No newline at end of file diff --git a/helpers/software-report-base/tests/TestHelpers.psm1 b/helpers/software-report-base/tests/TestHelpers.psm1 new file mode 100644 index 000000000000..8918a29420a9 --- /dev/null +++ b/helpers/software-report-base/tests/TestHelpers.psm1 @@ -0,0 +1,34 @@ +function ShouldBeArray([Array] $ActualValue, [Array]$ExpectedValue, [Switch] $Negate, [String] $Because) { + if ($Negate) { + throw "Negation is not supported for Should-BeArray" + } + + if ($ExpectedValue.Count -eq 0) { + throw "Expected array cannot be empty. Use Should-BeNullOrEmpty instead." + } + + $ExpectedValue | ForEach-Object { + if ($_.GetType() -notin @([String], [Int32])) { + throw "Only string or int arrays are supported in Should-BeArray" + } + } + + $actualValueJson = $ActualValue | ConvertTo-Json + $expectedValueJson = $ExpectedValue | ConvertTo-Json + + $succeeded = ($ActualValue.Count -eq $ExpectedValue.Count) -and ($actualValueJson -eq $expectedValueJson) + + if (-not $succeeded) { + $failureMessage = "Expected array '$actualValueJson' to be equal to '$expectedValueJson'" + } + + return [PSCustomObject]@{ + Succeeded = $succeeded + FailureMessage = $failureMessage + } +} + +Add-ShouldOperator -Name BeArray ` + -InternalName 'ShouldBeArray' ` + -Test ${function:ShouldBeArray} ` + -SupportsArrayInput \ No newline at end of file diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1 index 9acb317f1605..7065c84b5574 100644 --- a/images/macos/software-report/SoftwareReport.Generator.ps1 +++ b/images/macos/software-report/SoftwareReport.Generator.ps1 @@ -33,7 +33,7 @@ $installedSoftware = $softwareReport.Root.AddHeader("Installed Software") # Language and Runtime $languageAndRuntime = $installedSoftware.AddHeader("Language and Runtime") -$languageAndRuntime.AddToolVersionsList(".NET Core SDK", $(Get-DotnetVersionList), '^\d+\.\d+\.\d', $true) +$languageAndRuntime.AddToolVersionsListInline(".NET Core SDK", $(Get-DotnetVersionList), '^\d+\.\d+\.\d') $languageAndRuntime.AddToolVersion("Bash", $(Get-BashVersion)) $languageAndRuntime.AddNodes($(Get-ClangLLVMVersions)) $languageAndRuntime.AddNodes($(Get-GccVersions)) @@ -45,7 +45,7 @@ $languageAndRuntime.AddToolVersion("Mono", $(Get-MonoVersion)) $languageAndRuntime.AddToolVersion("MSBuild", $(Get-MSBuildVersion)) $languageAndRuntime.AddToolVersion("Node.js", $(Get-NodeVersion)) $languageAndRuntime.AddToolVersion("NVM", $(Get-NVMVersion)) -$languageAndRuntime.AddToolVersionsList("NVM - Cached node versions", $(Get-NVMNodeVersionList), '^\d+', $true) +$languageAndRuntime.AddToolVersionsListInline("NVM - Cached node versions", $(Get-NVMNodeVersionList), '^\d+') $languageAndRuntime.AddToolVersion("Perl", $(Get-PerlVersion)) $languageAndRuntime.AddToolVersion("PHP", $(Get-PHPVersion)) $languageAndRuntime.AddToolVersion("Python", $(Get-PythonVersion)) diff --git a/images/macos/software-report/SoftwareReport.Toolcache.psm1 b/images/macos/software-report/SoftwareReport.Toolcache.psm1 index cad7873f23c9..a7296b203e2f 100644 --- a/images/macos/software-report/SoftwareReport.Toolcache.psm1 +++ b/images/macos/software-report/SoftwareReport.Toolcache.psm1 @@ -35,11 +35,11 @@ function Get-ToolcacheGoVersions { function Build-ToolcacheSection { return @( - [ToolVersionsListNode]::new("Ruby", $(Get-ToolcacheRubyVersions), '^\d+\.\d+', $false), - [ToolVersionsListNode]::new("Python", $(Get-ToolcachePythonVersions), '^\d+\.\d+', $false), - [ToolVersionsListNode]::new("PyPy", $(Get-ToolcachePyPyVersions), '^\d+\.\d+', $false), - [ToolVersionsListNode]::new("Node.js", $(Get-ToolcacheNodeVersions), '^\d+', $false), - [ToolVersionsListNode]::new("Go", $(Get-ToolcacheGoVersions), '^\d+\.\d+', $false) + [ToolVersionsListNode]::new("Ruby", $(Get-ToolcacheRubyVersions), '^\d+\.\d+', "List"), + [ToolVersionsListNode]::new("Python", $(Get-ToolcachePythonVersions), '^\d+\.\d+', "List"), + [ToolVersionsListNode]::new("PyPy", $(Get-ToolcachePyPyVersions), '^\d+\.\d+', "List"), + [ToolVersionsListNode]::new("Node.js", $(Get-ToolcacheNodeVersions), '^\d+', "List"), + [ToolVersionsListNode]::new("Go", $(Get-ToolcacheGoVersions), '^\d+\.\d+', "List") ) } @@ -48,6 +48,6 @@ function Get-PowerShellModules { $modules | ForEach-Object { $moduleName = $_ $moduleVersions = Get-Module -Name $moduleName -ListAvailable | Select-Object -ExpandProperty Version | Sort-Object -Unique - return [ToolVersionsListNode]::new($moduleName, $moduleVersions, '^\d+', $true) + return [ToolVersionsListNode]::new($moduleName, $moduleVersions, '^\d+', "Inline") } } \ No newline at end of file From 66835ab7034f10a513ebe5044a90fca0c5781703 Mon Sep 17 00:00:00 2001 From: Maxim Lobanov <maxim-lobanov@github.com> Date: Wed, 21 Dec 2022 14:19:42 +0100 Subject: [PATCH 1652/3485] Add logic to publish artifact (#6821) --- .../azure-pipelines/image-generation.yml | 32 +++++++++++++++++-- .../azure-pipelines/image-generation.yml | 2 +- 2 files changed, 31 insertions(+), 3 deletions(-) diff --git a/images.CI/linux-and-win/azure-pipelines/image-generation.yml b/images.CI/linux-and-win/azure-pipelines/image-generation.yml index 77f44cce3c7c..94ad9e21bb30 100644 --- a/images.CI/linux-and-win/azure-pipelines/image-generation.yml +++ b/images.CI/linux-and-win/azure-pipelines/image-generation.yml @@ -89,13 +89,41 @@ jobs: env: PACKER_LOG: 1 PACKER_LOG_PATH: $(Build.ArtifactStagingDirectory)/packer-log.txt + + - task: PowerShell@2 + displayName: 'Copy image artifacts to the separate directory' + inputs: + targetType: 'inline' + script: | + $readmePath = Join-Path "$(TemplateDirectoryPath)" "${{ parameters.image_readme_name }}" + $softwareReportPath = Join-Path "$(TemplateDirectoryPath)" "software-report.json" + + Copy-Item -Path $readmePath -Destination "$(Build.ArtifactStagingDirectory)/" + if (Test-Path $softwareReportPath) { + Copy-Item -Path $softwareReportPath -Destination "$(Build.ArtifactStagingDirectory)/" + } + + - task: PowerShell@2 + displayName: 'Print markdown software report' + inputs: + targetType: 'inline' + script: | + Get-Content -Path "$(Build.ArtifactStagingDirectory)/${{ parameters.image_readme_name }}" - task: PowerShell@2 - displayName: 'Output Readme file content' + displayName: 'Print json software report' inputs: targetType: 'inline' script: | - Get-Content -Path (Join-Path "$(TemplateDirectoryPath)" "${{ parameters.image_readme_name }}") + $softwareReportPath = "$(Build.ArtifactStagingDirectory)/software-report.json" + if (Test-Path $softwareReportPath) { + Get-Content -Path $softwareReportPath + } + + - task: PublishBuildArtifacts@1 + inputs: + ArtifactName: 'Built_VM_Artifacts' + displayName: Publish Artifacts - task: PowerShell@2 displayName: 'Print provisioners duration' diff --git a/images.CI/macos/azure-pipelines/image-generation.yml b/images.CI/macos/azure-pipelines/image-generation.yml index 6ad177dff379..ca5065e960f5 100644 --- a/images.CI/macos/azure-pipelines/image-generation.yml +++ b/images.CI/macos/azure-pipelines/image-generation.yml @@ -111,7 +111,7 @@ jobs: - bash: | cat "$(Build.ArtifactStagingDirectory)/systeminfo.json" - displayName: Print json software report + displayName: Print json software report - task: PublishBuildArtifacts@1 inputs: From 5d628bf7036ad888163db14d9e74d621de4d4d5a Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Wed, 21 Dec 2022 18:49:42 +0100 Subject: [PATCH 1653/3485] [macOS] set Xcode 14.1 as default (#6822) --- images/macos/toolsets/toolset-12.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index ebe9f1ffc57e..6d2b01bea636 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -1,11 +1,10 @@ { "xcode": { - "default": "14.0.1", + "default": "14.1", "versions": [ {"link": "14.2", "version": "14.2.0"}, { "link": "14.1", "version": "14.1.0"}, - { "link": "14.0.1", "version": "14.0.1" }, - { "link": "14.0", "version": "14.0.0" }, + { "link": "14.0.1", "version": "14.0.1", "symlinks": ["14.0"] }, { "link": "13.4.1", "version": "13.4.1" }, { "link": "13.4", "version": "13.4.0" }, { "link": "13.3.1", "version": "13.3.1", "symlinks": ["13.3"] }, From c00379c85c443582bd581d1c3d365aa8bc41dd16 Mon Sep 17 00:00:00 2001 From: Maxim Lobanov <maxim-lobanov@github.com> Date: Wed, 21 Dec 2022 19:38:54 +0100 Subject: [PATCH 1654/3485] [Ubuntu] Update documentation generation to use shared software report module (#6823) * Create ubuntu-report.yml * Update ubuntu-report.yml * Update ubuntu-report.yml * Update Common.Helpers.psm1 * Update ubuntu-report.yml * Update ubuntu-report.yml * Update SoftwareReport.Generator.ps1 * Update ubuntu-report.yml * Update ubuntu-report.yml * env vars * Implement language and runtime * Add package management section * fix typo * fix typo * add projectManagement and tools * fix some tools * add CLI tools, Java, PHP Tools, Haskell Tools, Rust Tools, Browsers, .NET Core * fix typo * more changes * fix typo * fix typo * fix typo * change templates * fix toolset * Update Ubuntu2004 and 2204 templates * fix cargo * fix tiny nitpicks * Fix AddToolVersionsList * Remove unused methods * Fix contructor --- .../SoftwareReport.Browsers.psm1 | 35 +- .../SoftwareReport.CachedTools.psm1 | 23 +- .../SoftwareReport/SoftwareReport.Common.psm1 | 158 +++--- .../SoftwareReport.Databases.psm1 | 53 +-- .../SoftwareReport.Generator.ps1 | 450 ++++++++---------- .../SoftwareReport/SoftwareReport.Java.psm1 | 2 +- .../SoftwareReport/SoftwareReport.Rust.psm1 | 21 +- .../SoftwareReport/SoftwareReport.Tools.psm1 | 118 +++-- .../SoftwareReport.WebServers.psm1 | 16 +- .../helpers/SoftwareReport.Helpers.psm1 | 117 ----- images/linux/ubuntu1804.json | 13 +- images/linux/ubuntu2004.json | 13 +- images/linux/ubuntu2204.pkr.hcl | 13 +- 13 files changed, 394 insertions(+), 638 deletions(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Browsers.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Browsers.psm1 index 0ea48932a0c0..e3fa61e342b4 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Browsers.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Browsers.psm1 @@ -1,66 +1,61 @@ function Get-ChromeVersion { $googleChromeVersion = google-chrome --version | Take-OutputPart -Part 2 - return "Google Chrome $googleChromeVersion" + return $googleChromeVersion } function Get-ChromeDriverVersion { $chromeDriverVersion = chromedriver --version | Take-OutputPart -Part 1 - return "ChromeDriver $chromeDriverVersion" + return $chromeDriverVersion } function Get-FirefoxVersion { - $firefoxVersion = firefox --version - return "$firefoxVersion" + $firefoxVersion = $(firefox --version) | Take-OutputPart -Part 2 + return $firefoxVersion } function Get-GeckodriverVersion { $geckodriverVersion = geckodriver --version | Select-Object -First 1 | Take-OutputPart -Part 1 - return "Geckodriver $geckodriverVersion" + return $geckodriverVersion } function Get-ChromiumVersion { - $chromiumVersion = chromium-browser --version | Take-OutputPart -Part 0,1 + $chromiumVersion = chromium-browser --version | Take-OutputPart -Part 1 return $chromiumVersion } function Get-EdgeVersion { - $edgeVersion = (microsoft-edge --version).trim() - return "$edgeVersion" + $edgeVersion = (microsoft-edge --version).Trim() | Take-OutputPart -Part 2 + return $edgeVersion } function Get-EdgeDriverVersion { - $edgeDriverVersion = msedgedriver --version | Take-OutputPart -Part 0,1,2,3 + $edgeDriverVersion = msedgedriver --version | Take-OutputPart -Part 3 return $edgeDriverVersion } function Get-SeleniumVersion { $seleniumBinaryName = Get-ToolsetValue "selenium.binary_name" $fullSeleniumVersion = (Get-ChildItem "/usr/share/java/${seleniumBinaryName}-*").Name -replace "${seleniumBinaryName}-" - return "Selenium server $fullSeleniumVersion" + return $fullSeleniumVersion } function Build-BrowserWebdriversEnvironmentTable { return @( - @{ + [PSCustomObject] @{ "Name" = "CHROMEWEBDRIVER" "Value" = $env:CHROMEWEBDRIVER }, - @{ + [PSCustomObject] @{ "Name" = "EDGEWEBDRIVER" "Value" = $env:EDGEWEBDRIVER }, - @{ + [PSCustomObject] @{ "Name" = "GECKOWEBDRIVER" "Value" = $env:GECKOWEBDRIVER }, - @{ + [PSCustomObject] @{ "Name" = "SELENIUM_JAR_PATH" "Value" = $env:SELENIUM_JAR_PATH } - ) | ForEach-Object { - [PSCustomObject] @{ - "Name" = $_.Name - "Value" = $_.Value - } - } + ) } diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.CachedTools.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.CachedTools.psm1 index 9b099ef3ec96..1d5505f12883 100755 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.CachedTools.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.CachedTools.psm1 @@ -26,25 +26,4 @@ function Get-ToolcacheNodeVersions { function Get-ToolcacheGoVersions { $toolcachePath = Join-Path $env:AGENT_TOOLSDIRECTORY "go" return Get-ChildItem $toolcachePath -Name | Sort-Object { [Version]$_ } -} - -function Build-CachedToolsSection { - $output = "" - - $output += New-MDHeader "Go" -Level 4 - $output += New-MDList -Lines (Get-ToolcacheGoVersions) -Style Unordered - - $output += New-MDHeader "Node.js" -Level 4 - $output += New-MDList -Lines (Get-ToolcacheNodeVersions) -Style Unordered - - $output += New-MDHeader "Python" -Level 4 - $output += New-MDList -Lines (Get-ToolcachePythonVersions) -Style Unordered - - $output += New-MDHeader "PyPy" -Level 4 - $output += New-MDList -Lines (Get-ToolcachePyPyVersions) -Style Unordered - - $output += New-MDHeader "Ruby" -Level 4 - $output += New-MDList -Lines (Get-ToolcacheRubyVersions) -Style Unordered - - return $output -} +} \ No newline at end of file diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 index 48014ed6e6a1..5bd7fd89b766 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 @@ -1,11 +1,11 @@ function Get-BashVersion { $version = bash -c 'echo ${BASH_VERSION}' - return "Bash $version" + return $version } function Get-DashVersion { $version = dpkg-query -W -f '${Version}' dash - return "Dash $version" + return $version } function Get-CPPVersions { @@ -13,7 +13,7 @@ function Get-CPPVersions { $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 ", ") + return $cppVersions } function Get-FortranVersions { @@ -22,7 +22,7 @@ function Get-FortranVersions { $_ -match "now (?<version>\d+\.\d+\.\d+)-" | Out-Null $Matches.version } | Sort-Object {[Version]$_} - return "GNU Fortran " + ($fortranVersions -Join ", ") + return $fortranVersions } function Get-ClangToolVersions { @@ -42,199 +42,179 @@ function Get-ClangToolVersions { } } | Sort-Object {[Version]$_} - return $toolVersions -Join ", " + return $toolVersions } -function Get-ClangVersions { - $clangVersions = Get-ClangToolVersions -ToolName "clang" - return "Clang $clangVersions" -} - -function Get-ClangFormatVersions { - $clangFormatVersions = Get-ClangToolVersions -ToolName "clang-format" - return "Clang-format $clangFormatVersions" -} function Get-ClangTidyVersions { - $clangFormatVersions = Get-ClangToolVersions -ToolName "clang-tidy" -VersionLineMatcher "LLVM version" -VersionPattern "\d+\.\d+\.\d+)" - return "Clang-tidy $clangFormatVersions" + return Get-ClangToolVersions -ToolName "clang-tidy" -VersionLineMatcher "LLVM version" -VersionPattern "\d+\.\d+\.\d+)" } function Get-ErlangVersion { $erlangVersion = (erl -eval '{ok, Version} = file:read_file(filename:join([code:root_dir(), "releases", erlang:system_info(otp_release), ''OTP_VERSION''])), io:fwrite(Version), halt().' -noshell) $shellVersion = (erl -eval 'erlang:display(erlang:system_info(version)), halt().' -noshell).Trim('"') - return "Erlang $erlangVersion (Eshell $shellVersion)" + return "$erlangVersion (Eshell $shellVersion)" } function Get-ErlangRebar3Version { $result = Get-CommandResult "rebar3 --version" $result.Output -match "rebar (?<version>(\d+.){2}\d+)" | Out-Null - $rebarVersion = $Matches.version - return "Erlang rebar3 $rebarVersion" + return $Matches.version } function Get-MonoVersion { $monoVersion = mono --version | Out-String | Take-OutputPart -Part 4 - return "Mono $monoVersion" + return $monoVersion } function Get-MsbuildVersion { $msbuildVersion = msbuild -version | Select-Object -Last 1 $monoVersion = Get-MonoVersion - return "MSBuild $msbuildVersion ($monoVersion)" + return "$msbuildVersion (Mono $monoVersion)" } function Get-NuGetVersion { $nugetVersion = nuget help | Select-Object -First 1 | Take-OutputPart -Part 2 - return "NuGet $nugetVersion" + return $nugetVersion } function Get-NodeVersion { $nodeVersion = $(node --version).Substring(1) - return "Node $nodeVersion" + return $nodeVersion } function Get-OpensslVersion { - return "OpenSSL $(dpkg-query -W -f '${Version}' openssl)" + return $(dpkg-query -W -f '${Version}' openssl) } function Get-PerlVersion { $version = $(perl -e 'print substr($^V,1)') - return "Perl $version" + return $version } function Get-PythonVersion { $result = Get-CommandResult "python --version" $version = $result.Output | Take-OutputPart -Part 1 - return "Python $version" + return $version } function Get-Python3Version { $result = Get-CommandResult "python3 --version" $version = $result.Output | Take-OutputPart -Part 1 - return "Python3 $version" + return $version } function Get-PowershellVersion { - return $(pwsh --version) + return $(pwsh --version) | Take-OutputPart -Part 1 } function Get-RubyVersion { $rubyVersion = ruby --version | Out-String | Take-OutputPart -Part 1 - return "Ruby $rubyVersion" + return $rubyVersion } function Get-SwiftVersion { $swiftVersion = swift --version | Out-String | Take-OutputPart -Part 2 - return "Swift $swiftVersion" + return $swiftVersion } function Get-KotlinVersion { $kotlinVersion = kotlin -version | Out-String | Take-OutputPart -Part 2 - return "Kotlin $kotlinVersion" + return $kotlinVersion } function Get-JuliaVersion { $juliaVersion = julia --version | Take-OutputPart -Part 2 - return "Julia $juliaVersion" + return $juliaVersion } function Get-LernaVersion { $version = lerna -v - return "Lerna $version" + return $version } function Get-HomebrewVersion { $result = Get-CommandResult "/home/linuxbrew/.linuxbrew/bin/brew -v" $result.Output -match "Homebrew (?<version>\d+\.\d+\.\d+)" | Out-Null - $version = $Matches.version - return "Homebrew $version" + return $Matches.version } function Get-CpanVersion { $result = Get-CommandResult "cpan --version" -ExpectExitCode @(25, 255) $result.Output -match "version (?<version>\d+\.\d+) " | Out-Null - $cpanVersion = $Matches.version - return "cpan $cpanVersion" + return $Matches.version } function Get-GemVersion { $result = Get-CommandResult "gem --version" $result.Output -match "(?<version>\d+\.\d+\.\d+)" | Out-Null - $gemVersion = $Matches.version - return "RubyGems $gemVersion" + return $Matches.version } function Get-MinicondaVersion { - $condaVersion = conda --version - return "Mini$condaVersion" + $condaVersion = conda --version | Take-OutputPart -Part 1 + return $condaVersion } function Get-HelmVersion { $(helm version) -match 'Version:"v(?<version>\d+\.\d+\.\d+)"' | Out-Null - $helmVersion = $Matches.version - return "Helm $helmVersion" + return $Matches.version } function Get-NpmVersion { $npmVersion = npm --version - return "Npm $npmVersion" + return $npmVersion } function Get-YarnVersion { $yarnVersion = yarn --version - return "Yarn $yarnVersion" + return $yarnVersion } function Get-ParcelVersion { $parcelVersion = parcel --version - return "Parcel $parcelVersion" + return $parcelVersion } function Get-PipVersion { $result = Get-CommandResult "pip --version" $result.Output -match "pip (?<version>\d+\.\d+\.\d+)" | Out-Null - $pipVersion = $Matches.version - return "Pip $pipVersion" + return $Matches.version } function Get-Pip3Version { $result = Get-CommandResult "pip3 --version" $result.Output -match "pip (?<version>\d+\.\d+\.\d+)" | Out-Null - $pipVersion = $Matches.version - return "Pip3 $pipVersion" + return $Matches.version } function Get-VcpkgVersion { $commitId = git -C "/usr/local/share/vcpkg" rev-parse --short HEAD - return "Vcpkg (build from commit $commitId)" + return "(build from commit $commitId)" } function Get-AntVersion { $result = ant -version | Out-String $result -match "version (?<version>\d+\.\d+\.\d+)" | Out-Null - $antVersion = $Matches.version - return "Ant $antVersion" + return $Matches.version } function Get-GradleVersion { $gradleVersion = (gradle -v) -match "^Gradle \d" | Take-OutputPart -Part 1 - return "Gradle $gradleVersion" + return $gradleVersion } function Get-MavenVersion { $result = mvn -version | Out-String $result -match "Apache Maven (?<version>\d+\.\d+\.\d+)" | Out-Null - $mavenVersion = $Matches.version - return "Maven $mavenVersion" + return $Matches.version } function Get-SbtVersion { $result = Get-CommandResult "sbt -version" $result.Output -match "sbt script version: (?<version>\d+\.\d+\.\d+)" | Out-Null - $sbtVersion = $Matches.version - return "Sbt $sbtVersion" + return $Matches.version } function Get-PHPVersions { @@ -255,43 +235,24 @@ function Get-PHPUnitVersion { return $Matches.version } -function Build-PHPSection { - $output = "" - $output += New-MDHeader "PHP Tools" -Level 3 - $output += New-MDList -Style Unordered -Lines @( - "PHP: $((Get-PHPVersions) -join ', ')", - "Composer $(Get-ComposerVersion)", - "PHPUnit $(Get-PHPUnitVersion)" - ) - $output += New-MDCode -Lines @( - "Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled." - ) - - return $output -} - function Get-GHCVersion { $(ghc --version) -match "version (?<version>\d+\.\d+\.\d+)" | Out-Null - $ghcVersion = $Matches.version - return "GHC $ghcVersion" + return $Matches.version } function Get-GHCupVersion { $(ghcup --version) -match "version v(?<version>\d+(\.\d+){2,})" | Out-Null - $ghcVersion = $Matches.version - return "GHCup $ghcVersion" + return $Matches.version } function Get-CabalVersion { $(cabal --version | Out-String) -match "cabal-install version (?<version>\d+\.\d+\.\d+\.\d+)" | Out-Null - $cabalVersion = $Matches.version - return "Cabal $cabalVersion" + return $Matches.version } function Get-StackVersion { $(stack --version | Out-String) -match "Version (?<version>\d+\.\d+\.\d+)" | Out-Null - $stackVersion = $Matches.version - return "Stack $stackVersion" + return $Matches.version } function Get-AzModuleVersions { @@ -308,41 +269,36 @@ function Get-PowerShellModules { [Array] $azureInstalledModules = Get-ChildItem -Path "/usr/share/az_*" -Directory | ForEach-Object { $_.Name.Split("_")[1] } if ($azureInstalledModules.Count -gt 0) { - $result += "Az: $($azureInstalledModules -join ', ')" + $result += [ToolVersionsListNode]::new("Az", $azureInstalledModules, "^\d+\.\d+", "Inline") } [Array] $azureCachedModules = Get-ChildItem /usr/share/az_*.zip -File | ForEach-Object { $_.Name.Split("_")[1] } if ($azureCachedModules.Count -gt 0) { - $result += "Az (Cached): $($azureCachedModules -join ', ')" + $result += [ToolVersionsListNode]::new("Az (Cached)", $azureCachedModules, "^\d+\.\d+", "Inline") } - $result += (Get-ToolsetContent).powershellModules.name | ForEach-Object { + (Get-ToolsetContent).powershellModules.name | ForEach-Object { $moduleName = $_ $moduleVersions = Get-Module -Name $moduleName -ListAvailable | Select-Object -ExpandProperty Version | Sort-Object -Unique - return "$($moduleName): $($moduleVersions -join ', ')" + $result += [ToolVersionsListNode]::new($moduleName, $moduleVersions, "^\d+", "Inline") } return $result } function Get-DotNetCoreSdkVersions { - $unsortedDotNetCoreSdkVersion = dotnet --list-sdks list | ForEach-Object { $_ | Take-OutputPart -Part 0 } - $dotNetCoreSdkVersion = $unsortedDotNetCoreSdkVersion -join ", " + $dotNetCoreSdkVersion = dotnet --list-sdks list | ForEach-Object { $_ | Take-OutputPart -Part 0 } return $dotNetCoreSdkVersion } function Get-DotnetTools { $env:PATH = "/etc/skel/.dotnet/tools:$($env:PATH)" - $dotnetTools = (Get-ToolsetContent).dotnet.tools - $toolsList = @() - - ForEach ($dotnetTool in $dotnetTools) { - $toolsList += $dotnetTool.name + " " + (Invoke-Expression $dotnetTool.getversion) + return $dotnetTools | ForEach-Object { + $version = Invoke-Expression $_.getversion + return [ToolVersionNode]::new($_.name, $version) } - - return $toolsList } function Get-CachedDockerImages { @@ -385,8 +341,7 @@ function Get-AptPackages { function Get-PipxVersion { $result = (Get-CommandResult "pipx --version").Output $result -match "(?<version>\d+\.\d+\.\d+\.?\d*)" | Out-Null - $pipxVersion = $Matches.Version - return "Pipx $pipxVersion" + return $Matches.Version } function Get-GraalVMVersion { @@ -406,18 +361,13 @@ function Build-GraalVMTable { function Build-PackageManagementEnvironmentTable { return @( - @{ + [PSCustomObject] @{ "Name" = "CONDA" "Value" = $env:CONDA }, - @{ + [PSCustomObject] @{ "Name" = "VCPKG_INSTALLATION_ROOT" "Value" = $env:VCPKG_INSTALLATION_ROOT } - ) | ForEach-Object { - [PSCustomObject] @{ - "Name" = $_.Name - "Value" = $_.Value - } - } + ) } diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Databases.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Databases.psm1 index a9885cd74237..701a8cda09f9 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Databases.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Databases.psm1 @@ -1,16 +1,16 @@ function Get-PostgreSqlVersion { $postgreSQLVersion = psql --version | Take-OutputPart -Part 2 - return "PostgreSQL $postgreSQLVersion" + return $postgreSQLVersion } function Get-MongoDbVersion { $mongoDBVersion = mongod --version | Select-Object -First 1 | Take-OutputPart -Part 2 -Delimiter "v" - return "MongoDB $mongoDBVersion" + return $mongoDBVersion } function Get-SqliteVersion { $sqliteVersion = sqlite3 --version | Take-OutputPart -Part 0 - return "sqlite3 $sqliteVersion" + return $sqliteVersion } function Get-MySQLVersion { @@ -18,60 +18,47 @@ function Get-MySQLVersion { if (Test-IsUbuntu18) { $mySQLVersion = $mySQLVersion | Take-OutputPart -Part 0 -Delimiter "-" } - return "MySQL $mySQLVersion" + return $mySQLVersion } function Get-SQLCmdVersion { $sqlcmdVersion = sqlcmd -? | Select-String -Pattern "Version" | Take-OutputPart -Part 1 - return "sqlcmd $sqlcmdVersion" + return $sqlcmdVersion } function Get-SqlPackageVersion { $sqlPackageVersion = sqlpackage /version - return "SqlPackage $sqlPackageVersion" + return $sqlPackageVersion } function Build-PostgreSqlSection { - $output = "" - - $output += New-MDHeader "PostgreSQL" -Level 4 - $output += New-MDList -Style Unordered -Lines @( - (Get-PostgreSqlVersion) - ) - $output += New-MDCode -Lines @( + $node = [HeaderNode]::new("PostgreSQL") + $node.AddToolVersion("PostgreSQL", $(Get-PostgreSqlVersion)) + $node.AddNote(@( "User: postgres", "PostgreSQL service is disabled by default.", "Use the following command as a part of your job to start the service: 'sudo systemctl start postgresql.service'" - ) + ) -join "`n") - return $output + return $node } function Build-MySQLSection { - $output = "" - - $output += New-MDHeader "MySQL" -Level 4 - $output += New-MDList -Style Unordered -Lines @( - (Get-MySQLVersion ) - ) - $output += New-MDCode -Lines @( + $node = [HeaderNode]::new("MySQL") + $node.AddToolVersion("MySQL", $(Get-MySQLVersion)) + $node.AddNote(@( "User: root", "Password: root", "MySQL service is disabled by default.", "Use the following command as a part of your job to start the service: 'sudo systemctl start mysql.service'" - ) + ) -join "`n") - return $output + return $node } function Build-MSSQLToolsSection { - $output = "" - - $output += New-MDHeader "MS SQL Server Client Tools" -Level 4 - $output += New-MDList -Style Unordered -Lines @( - (Get-SQLCmdVersion), - (Get-SqlPackageVersion) - ) - - return $output + $node = [HeaderNode]::new("MS SQL") + $node.AddToolVersion("sqlcmd", $(Get-SQLCmdVersion)) + $node.AddToolVersion("SqlPackage", $(Get-SqlPackageVersion)) + return $node } diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index c5a542e13767..e6a66cf069c2 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -1,3 +1,6 @@ +using module ./software-report-base/SoftwareReport.psm1 +using module ./software-report-base/SoftwareReport.Nodes.psm1 + param ( [Parameter(Mandatory)][string] $OutputDirectory @@ -7,7 +10,6 @@ $global:ErrorActionPreference = "Stop" $global:ErrorView = "NormalView" Set-StrictMode -Version Latest -Import-Module MarkdownPS Import-Module (Join-Path $PSScriptRoot "SoftwareReport.Android.psm1") -DisableNameChecking Import-Module (Join-Path $PSScriptRoot "SoftwareReport.Browsers.psm1") -DisableNameChecking Import-Module (Join-Path $PSScriptRoot "SoftwareReport.CachedTools.psm1") -DisableNameChecking @@ -23,285 +25,221 @@ Import-Module (Join-Path $PSScriptRoot "SoftwareReport.WebServers.psm1") -Disabl # Restore file owner in user profile Restore-UserOwner -$markdown = "" -$markdown += New-MDHeader "Ubuntu $(Get-OSVersionShort)" -Level 1 - -$markdown += New-MDList -Style Unordered -Lines @( - "OS Version: $(Get-OSVersionFull)" - "Kernel Version: $(Get-KernelVersion)" - "Image Version: $env:IMAGE_VERSION" -) - -$markdown += New-MDHeader "Installed Software" -Level 2 -$markdown += New-MDHeader "Language and Runtime" -Level 3 - -$runtimesList = @( - (Get-BashVersion), - (Get-DashVersion), - (Get-CPPVersions), - (Get-FortranVersions), - (Get-MsbuildVersion), - (Get-MonoVersion), - (Get-NodeVersion), - (Get-PerlVersion), - (Get-PythonVersion), - (Get-Python3Version), - (Get-RubyVersion), - (Get-JuliaVersion), - (Get-ClangVersions), - (Get-ClangFormatVersions), - (Get-ClangTidyVersions), - (Get-KotlinVersion), - (Get-SwiftVersion) -) - +# Software report +$softwareReport = [SoftwareReport]::new("Ubuntu $(Get-OSVersionShort)") +$softwareReport.Root.AddToolVersion("OS Version:", $(Get-OSVersionFull)) +$softwareReport.Root.AddToolVersion("Kernel Version:", $(Get-KernelVersion)) +$softwareReport.Root.AddToolVersion("Image Version:", $env:IMAGE_VERSION) + +$installedSoftware = $softwareReport.Root.AddHeader("Installed Software") + +# Language and Runtime +$languageAndRuntime = $installedSoftware.AddHeader("Language and Runtime") +$languageAndRuntime.AddToolVersion("Bash", $(Get-BashVersion)) +$languageAndRuntime.AddToolVersionsListInline("Clang", $(Get-ClangToolVersions -ToolName "clang"), "^\d+") +$languageAndRuntime.AddToolVersionsListInline("Clang-format", $(Get-ClangToolVersions -ToolName "clang-format"), "^\d+") +$languageAndRuntime.AddToolVersionsListInline("Clang-tidy", $(Get-ClangTidyVersions), "^\d+") +$languageAndRuntime.AddToolVersion("Dash", $(Get-DashVersion)) if ((Test-IsUbuntu18) -or (Test-IsUbuntu20)) { - $runtimesList += @( - (Get-ErlangVersion), - (Get-ErlangRebar3Version) - ) + $languageAndRuntime.AddToolVersion("Erlang", $(Get-ErlangVersion)) + $languageAndRuntime.AddToolVersion("Erlang rebar3", $(Get-ErlangRebar3Version)) } - -$markdown += New-MDList -Style Unordered -Lines ($runtimesList | Sort-Object) - -$markdown += New-MDHeader "Package Management" -Level 3 - -$packageManagementList = @( - (Get-HomebrewVersion), - (Get-CpanVersion), - (Get-GemVersion), - (Get-MinicondaVersion), - (Get-NuGetVersion), - (Get-HelmVersion), - (Get-NpmVersion), - (Get-YarnVersion), - (Get-PipxVersion), - (Get-PipVersion), - (Get-Pip3Version), - (Get-VcpkgVersion) -) - -$markdown += New-MDList -Style Unordered -Lines ($packageManagementList | Sort-Object) - -$markdown += New-MDHeader "Environment variables" -Level 4 -$markdown += Build-PackageManagementEnvironmentTable | New-MDTable -$markdown += New-MDNewLine - -$markdown += New-MDHeader "Homebrew note" -Level 4 -$reportHomebrew = @' -``` +$languageAndRuntime.AddToolVersionsListInline("GNU C++", $(Get-CPPVersions), "^\d+") +$languageAndRuntime.AddToolVersionsListInline("GNU Fortran", $(Get-FortranVersions), "^\d+") +$languageAndRuntime.AddToolVersion("Julia", $(Get-JuliaVersion)) +$languageAndRuntime.AddToolVersion("Kotlin", $(Get-KotlinVersion)) +$languageAndRuntime.AddToolVersion("Mono", $(Get-MonoVersion)) +$languageAndRuntime.AddToolVersion("MSBuild", $(Get-MsbuildVersion)) +$languageAndRuntime.AddToolVersion("Node.js", $(Get-NodeVersion)) +$languageAndRuntime.AddToolVersion("Perl", $(Get-PerlVersion)) +$languageAndRuntime.AddToolVersion("Python", $(Get-PythonVersion)) +$languageAndRuntime.AddToolVersion("Python3", $(Get-Python3Version)) +$languageAndRuntime.AddToolVersion("Ruby", $(Get-RubyVersion)) +$languageAndRuntime.AddToolVersion("Swift", $(Get-SwiftVersion)) + +# Package Management +$packageManagement = $installedSoftware.AddHeader("Package Management") +$packageManagement.AddToolVersion("cpan", $(Get-CpanVersion)) +$packageManagement.AddToolVersion("Helm", $(Get-HelmVersion)) +$packageManagement.AddToolVersion("Homebrew", $(Get-HomebrewVersion)) +$packageManagement.AddToolVersion("Miniconda", $(Get-MinicondaVersion)) +$packageManagement.AddToolVersion("Npm", $(Get-NpmVersion)) +$packageManagement.AddToolVersion("NuGet", $(Get-NuGetVersion)) +$packageManagement.AddToolVersion("Pip", $(Get-PipVersion)) +$packageManagement.AddToolVersion("Pip3", $(Get-Pip3Version)) +$packageManagement.AddToolVersion("Pipx", $(Get-PipxVersion)) +$packageManagement.AddToolVersion("RubyGems", $(Get-GemVersion)) +$packageManagement.AddToolVersion("Vcpkg", $(Get-VcpkgVersion)) +$packageManagement.AddToolVersion("Yarn", $(Get-YarnVersion)) +$packageManagement.AddHeader("Environment variables").AddTable($(Build-PackageManagementEnvironmentTable)) +$packageManagement.AddHeader("Homebrew note").AddNote(@' Location: /home/linuxbrew Note: Homebrew is pre-installed on image but not added to PATH. run the eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)" command to accomplish this. -``` -'@ -$markdown += New-MDParagraph -Lines $reportHomebrew +'@) -$markdown += New-MDHeader "Project Management" -Level 3 -$projectManagementList = @() +# Project Management +$projectManagement = $installedSoftware.AddHeader("Project Management") if ((Test-IsUbuntu18) -or (Test-IsUbuntu20)) { - $projectManagementList += @( - (Get-AntVersion), - (Get-GradleVersion), - (Get-MavenVersion), - (Get-SbtVersion) - ) + $projectManagement.AddToolVersion("Ant", $(Get-AntVersion)) + $projectManagement.AddToolVersion("Gradle", $(Get-GradleVersion)) } - if ((Test-IsUbuntu20) -or (Test-IsUbuntu22)) { - $projectManagementList += @( - (Get-LernaVersion) - ) + $projectManagement.AddToolVersion("Lerna", $(Get-LernaVersion)) } -$markdown += New-MDList -Style Unordered -Lines ($projectManagementList | Sort-Object) - -$markdown += New-MDHeader "Tools" -Level 3 -$toolsList = @( - (Get-AnsibleVersion), - (Get-AptFastVersion), - (Get-AzCopyVersion), - (Get-BazelVersion), - (Get-BazeliskVersion), - (Get-BicepVersion), - (Get-CodeQLBundleVersion), - (Get-CMakeVersion), - (Get-DockerMobyClientVersion), - (Get-DockerMobyServerVersion), - (Get-DockerComposeV1Version), - (Get-DockerComposeV2Version), - (Get-DockerBuildxVersion), - (Get-DockerAmazonECRCredHelperVersion), - (Get-BuildahVersion), - (Get-PodManVersion), - (Get-SkopeoVersion), - (Get-GitVersion), - (Get-GitLFSVersion), - (Get-GitFTPVersion), - (Get-HavegedVersion), - (Get-HerokuVersion), - (Get-LeiningenVersion), - (Get-SVNVersion), - (Get-JqVersion), - (Get-YqVersion), - (Get-KindVersion), - (Get-KubectlVersion), - (Get-KustomizeVersion), - (Get-MediainfoVersion), - (Get-HGVersion), - (Get-MinikubeVersion), - (Get-NewmanVersion), - (Get-NVersion), - (Get-NvmVersion), - (Get-OpensslVersion), - (Get-PackerVersion), - (Get-ParcelVersion), - (Get-PulumiVersion), - (Get-RVersion), - (Get-SphinxVersion), - (Get-TerraformVersion), - (Get-YamllintVersion), - (Get-ZstdVersion) -) - if ((Test-IsUbuntu18) -or (Test-IsUbuntu20)) { - $toolsList += @( - (Get-PhantomJSVersion), - (Get-HHVMVersion) - ) + $projectManagement.AddToolVersion("Maven", $(Get-MavenVersion)) + $projectManagement.AddToolVersion("Sbt", $(Get-SbtVersion)) } +# Tools +$tools = $installedSoftware.AddHeader("Tools") +$tools.AddToolVersion("Ansible", $(Get-AnsibleVersion)) +$tools.AddToolVersion("apt-fast", $(Get-AptFastVersion)) +$tools.AddToolVersion("AzCopy", $(Get-AzCopyVersion)) +$tools.AddToolVersion("Bazel", $(Get-BazelVersion)) +$tools.AddToolVersion("Bazelisk", $(Get-BazeliskVersion)) +$tools.AddToolVersion("Bicep", $(Get-BicepVersion)) +$tools.AddToolVersion("Buildah", $(Get-BuildahVersion)) +$tools.AddToolVersion("CMake", $(Get-CMakeVersion)) +$tools.AddToolVersion("CodeQL Action Bundle", $(Get-CodeQLBundleVersion)) +$tools.AddToolVersion("Docker Amazon ECR Credential Helper", $(Get-DockerAmazonECRCredHelperVersion)) +$tools.AddToolVersion("Docker Compose v1", $(Get-DockerComposeV1Version)) +$tools.AddToolVersion("Docker Compose v2", $(Get-DockerComposeV2Version)) +$tools.AddToolVersion("Docker-Buildx", $(Get-DockerBuildxVersion)) +$tools.AddToolVersion("Docker-Moby Client", $(Get-DockerMobyClientVersion)) +$tools.AddToolVersion("Docker-Moby Server", $(Get-DockerMobyServerVersion)) if ((Test-IsUbuntu20) -or (Test-IsUbuntu22)) { - $toolsList += (Get-FastlaneVersion) + $tools.AddToolVersion("Fastlane", $(Get-FastlaneVersion)) } - -$markdown += New-MDList -Style Unordered -Lines ($toolsList | Sort-Object) - -$markdown += New-MDHeader "CLI Tools" -Level 3 -$markdown += New-MDList -Style Unordered -Lines (@( - (Get-AlibabaCloudCliVersion), - (Get-AWSCliVersion), - (Get-AWSCliSessionManagerPluginVersion), - (Get-AWSSAMVersion), - (Get-AzureCliVersion), - (Get-AzureDevopsVersion), - (Get-GitHubCliVersion), - (Get-GoogleCloudSDKVersion), - (Get-HubCliVersion), - (Get-NetlifyCliVersion), - (Get-OCCliVersion), - (Get-ORASCliVersion), - (Get-VerselCliversion) - ) -) - -$markdown += New-MDHeader "Java" -Level 3 -$markdown += Get-JavaVersions | New-MDTable -$markdown += New-MDNewLine - +$tools.AddToolVersion("Git", $(Get-GitVersion)) +$tools.AddToolVersion("Git LFS", $(Get-GitLFSVersion)) +$tools.AddToolVersion("Git-ftp", $(Get-GitFTPVersion)) +$tools.AddToolVersion("Haveged", $(Get-HavegedVersion)) +$tools.AddToolVersion("Heroku", $(Get-HerokuVersion)) +if ((Test-IsUbuntu18) -or (Test-IsUbuntu20)) { + $tools.AddToolVersion("HHVM (HipHop VM)", $(Get-HHVMVersion)) +} +$tools.AddToolVersion("jq", $(Get-JqVersion)) +$tools.AddToolVersion("Kind", $(Get-KindVersion)) +$tools.AddToolVersion("Kubectl", $(Get-KubectlVersion)) +$tools.AddToolVersion("Kustomize", $(Get-KustomizeVersion)) +$tools.AddToolVersion("Leiningen", $(Get-LeiningenVersion)) +$tools.AddToolVersion("MediaInfo", $(Get-MediainfoVersion)) +$tools.AddToolVersion("Mercurial", $(Get-HGVersion)) +$tools.AddToolVersion("Minikube", $(Get-MinikubeVersion)) +$tools.AddToolVersion("n", $(Get-NVersion)) +$tools.AddToolVersion("Newman", $(Get-NewmanVersion)) +$tools.AddToolVersion("nvm", $(Get-NvmVersion)) +$tools.AddToolVersion("OpenSSL", $(Get-OpensslVersion)) +$tools.AddToolVersion("Packer", $(Get-PackerVersion)) +$tools.AddToolVersion("Parcel", $(Get-ParcelVersion)) +if ((Test-IsUbuntu18) -or (Test-IsUbuntu20)) { + $tools.AddToolVersion("PhantomJS", $(Get-PhantomJSVersion)) +} +$tools.AddToolVersion("Podman", $(Get-PodManVersion)) +$tools.AddToolVersion("Pulumi", $(Get-PulumiVersion)) +$tools.AddToolVersion("R", $(Get-RVersion)) +$tools.AddToolVersion("Skopeo", $(Get-SkopeoVersion)) +$tools.AddToolVersion("Sphinx Open Source Search Server", $(Get-SphinxVersion)) +$tools.AddToolVersion("SVN", $(Get-SVNVersion)) +$tools.AddToolVersion("Terraform", $(Get-TerraformVersion)) +$tools.AddToolVersion("yamllint", $(Get-YamllintVersion)) +$tools.AddToolVersion("yq", $(Get-YqVersion)) +$tools.AddToolVersion("zstd", $(Get-ZstdVersion)) + +# CLI Tools +$cliTools = $installedSoftware.AddHeader("CLI Tools") +$cliTools.AddToolVersion("Alibaba Cloud CLI", $(Get-AlibabaCloudCliVersion)) +$cliTools.AddToolVersion("AWS CLI", $(Get-AWSCliVersion)) +$cliTools.AddToolVersion("AWS CLI Session Manager Plugin", $(Get-AWSCliSessionManagerPluginVersion)) +$cliTools.AddToolVersion("AWS SAM CLI", $(Get-AWSSAMVersion)) +$cliTools.AddToolVersion("Azure CLI", $(Get-AzureCliVersion)) +$cliTools.AddToolVersion("Azure CLI (azure-devops)", $(Get-AzureDevopsVersion)) +$cliTools.AddToolVersion("GitHub CLI", $(Get-GitHubCliVersion)) +$cliTools.AddToolVersion("Google Cloud SDK", $(Get-GoogleCloudSDKVersion)) +$cliTools.AddToolVersion("Hub CLI", $(Get-HubCliVersion)) +$cliTools.AddToolVersion("Netlify CLI", $(Get-NetlifyCliVersion)) +$cliTools.AddToolVersion("OpenShift CLI", $(Get-OCCliVersion)) +$cliTools.AddToolVersion("ORAS CLI", $(Get-ORASCliVersion)) +$cliTools.AddToolVersion("Vercel CLI", $(Get-VerselCliversion)) + + +$installedSoftware.AddHeader("Java").AddTable($(Get-JavaVersionsTable)) if ((Test-IsUbuntu20) -or (Test-IsUbuntu22)) { - $markdown += New-MDHeader "GraalVM" -Level 3 - $markdown += Build-GraalVMTable | New-MDTable - $markdown += New-MDNewLine + $installedSoftware.AddHeader("GraalVM").AddTable($(Build-GraalVMTable)) } -$markdown += Build-PHPSection - -$markdown += New-MDHeader "Haskell" -Level 3 -$markdown += New-MDList -Style Unordered -Lines (@( - (Get-GHCVersion), - (Get-GHCupVersion), - (Get-CabalVersion), - (Get-StackVersion) - ) | Sort-Object -) - -$markdown += New-MDHeader "Rust Tools" -Level 3 -$markdown += New-MDList -Style Unordered -Lines (@( - (Get-RustVersion), - (Get-RustupVersion), - (Get-RustdocVersion), - (Get-CargoVersion) - ) | Sort-Object -) - -$markdown += New-MDHeader "Packages" -Level 4 -$markdown += New-MDList -Style Unordered -Lines (@( - (Get-BindgenVersion), - (Get-CargoAuditVersion), - (Get-CargoOutdatedVersion), - (Get-CargoClippyVersion), - (Get-CbindgenVersion), - (Get-RustfmtVersion) - ) | Sort-Object -) - -$markdown += New-MDHeader "Browsers and Drivers" -Level 3 - -$browsersAndDriversList = @( - (Get-ChromeVersion), - (Get-ChromeDriverVersion), - (Get-ChromiumVersion), - (Get-EdgeVersion), - (Get-EdgeDriverVersion), - (Get-SeleniumVersion), - (Get-FirefoxVersion), - (Get-GeckodriverVersion) -) - -$markdown += New-MDList -Style Unordered -Lines $browsersAndDriversList -$markdown += New-MDHeader "Environment variables" -Level 4 -$markdown += Build-BrowserWebdriversEnvironmentTable | New-MDTable -$markdown += New-MDNewLine - -$markdown += New-MDHeader ".NET Core Tools" -Level 3 -$netCoreTools = @( - ".NET Core SDK: $(Get-DotNetCoreSdkVersions)" -) -$netCoreTools += Get-DotnetTools -$markdown += New-MDList -Style Unordered -Lines $netCoreTools - -$markdown += New-MDHeader "Databases" -Level 3 -$databaseLists = @( - (Get-SqliteVersion) -) - +$phpTools = $installedSoftware.AddHeader("PHP Tools") +$phpTools.AddToolVersionsListInline("PHP", $(Get-PHPVersions), "^\d+\.\d+") +$phpTools.AddToolVersion("Composer", $(Get-ComposerVersion)) +$phpTools.AddToolVersion("PHPUnit", $(Get-PHPUnitVersion)) +$phpTools.AddNote("Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled.") + +$haskellTools = $installedSoftware.AddHeader("Haskell Tools") +$haskellTools.AddToolVersion("Cabal", $(Get-CabalVersion)) +$haskellTools.AddToolVersion("GHC", $(Get-GHCVersion)) +$haskellTools.AddToolVersion("GHCup", $(Get-GHCupVersion)) +$haskellTools.AddToolVersion("Stack", $(Get-StackVersion)) + +Initialize-RustEnvironment +$rustTools = $installedSoftware.AddHeader("Rust Tools") +$rustTools.AddToolVersion("Cargo", $(Get-CargoVersion)) +$rustTools.AddToolVersion("Rust", $(Get-RustVersion)) +$rustTools.AddToolVersion("Rustdoc", $(Get-RustdocVersion)) +$rustTools.AddToolVersion("Rustup", $(Get-RustupVersion)) +$rustToolsPackages = $rustTools.AddHeader("Packages") +$rustToolsPackages.AddToolVersion("Bindgen", $(Get-BindgenVersion)) +$rustToolsPackages.AddToolVersion("Cargo audit", $(Get-CargoAuditVersion)) +$rustToolsPackages.AddToolVersion("Cargo clippy", $(Get-CargoClippyVersion)) +$rustToolsPackages.AddToolVersion("Cargo outdated", $(Get-CargoOutdatedVersion)) +$rustToolsPackages.AddToolVersion("Cbindgen", $(Get-CbindgenVersion)) +$rustToolsPackages.AddToolVersion("Rustfmt", $(Get-RustfmtVersion)) + +$browsersTools = $installedSoftware.AddHeader("Browsers and Drivers") +$browsersTools.AddToolVersion("Google Chrome", $(Get-ChromeVersion)) +$browsersTools.AddToolVersion("ChromeDriver", $(Get-ChromeDriverVersion)) +$browsersTools.AddToolVersion("Chromium", $(Get-ChromiumVersion)) +$browsersTools.AddToolVersion("Microsoft Edge", $(Get-EdgeVersion)) +$browsersTools.AddToolVersion("Microsoft Edge WebDriver", $(Get-EdgeDriverVersion)) +$browsersTools.AddToolVersion("Selenium server", $(Get-SeleniumVersion)) +$browsersTools.AddToolVersion("Mozilla Firefox", $(Get-FirefoxVersion)) +$browsersTools.AddToolVersion("Geckodriver", $(Get-GeckodriverVersion)) +$browsersTools.AddHeader("Environment variables").AddTable($(Build-BrowserWebdriversEnvironmentTable)) + +$netCoreTools = $installedSoftware.AddHeader(".NET Core Tools") +$netCoreTools.AddToolVersionsListInline(".NET Core SDK", $(Get-DotNetCoreSdkVersions), "^\d+\.\d+\.\d") +$netCoreTools.AddNodes($(Get-DotnetTools)) + +$databasesTools = $installedSoftware.AddHeader("Databases") if ((Test-IsUbuntu18) -or (Test-IsUbuntu20)) { - $databaseLists += @( - (Get-MongoDbVersion) - ) + $databasesTools.AddToolVersion("MongoDB", $(Get-MongoDbVersion)) } +$databasesTools.AddToolVersion("sqlite3", $(Get-SqliteVersion)) +$databasesTools.AddNode($(Build-PostgreSqlSection)) +$databasesTools.AddNode($(Build-MySQLSection)) +$databasesTools.AddNode($(Build-MSSQLToolsSection)) -$markdown += New-MDList -Style Unordered -Lines ( $databaseLists | Sort-Object ) - -$markdown += Build-PostgreSqlSection -$markdown += Build-MySQLSection -$markdown += Build-MSSQLToolsSection - -$markdown += New-MDHeader "Cached Tools" -Level 3 -$markdown += Build-CachedToolsSection - -$markdown += New-MDHeader "PowerShell Tools" -Level 3 -$markdown += New-MDList -Lines (Get-PowershellVersion) -Style Unordered - -$markdown += New-MDHeader "PowerShell Modules" -Level 4 -$markdown += New-MDList -Lines $(Get-PowerShellModules) -Style Unordered +$cachedTools = $installedSoftware.AddHeader("Cached Tools") +$cachedTools.AddToolVersionsList("Go", $(Get-ToolcacheGoVersions), "^\d+\.\d+") +$cachedTools.AddToolVersionsList("Node.js", $(Get-ToolcacheNodeVersions), "^\d+") +$cachedTools.AddToolVersionsList("Python", $(Get-ToolcachePythonVersions), "^\d+\.\d+") +$cachedTools.AddToolVersionsList("PyPy", $(Get-ToolcachePyPyVersions), "^\d+\.\d+") +$cachedTools.AddToolVersionsList("Ruby", $(Get-ToolcacheRubyVersions), "^\d+\.\d+") -$markdown += Build-WebServersSection +$powerShellTools = $installedSoftware.AddHeader("PowerShell Tools") +$powerShellTools.AddToolVersion("PowerShell", $(Get-PowershellVersion)) +$powerShellTools.AddHeader("PowerShell Modules").AddNodes($(Get-PowerShellModules)) -$markdown += New-MDHeader "Android" -Level 3 -$markdown += Build-AndroidTable | New-MDTable -$markdown += New-MDNewLine -$markdown += New-MDHeader "Environment variables" -Level 4 -$markdown += Build-AndroidEnvironmentTable | New-MDTable -$markdown += New-MDNewLine +$installedSoftware.AddHeader("Web Servers").AddTable($(Build-WebServersTable)) -$markdown += New-MDHeader "Cached Docker images" -Level 3 -$markdown += Get-CachedDockerImagesTableData | New-MDTable -$markdown += New-MDNewLine +$androidTools = $installedSoftware.AddHeader("Android") +$androidTools.AddTable($(Build-AndroidTable)) +$androidTools.AddHeader("Environment variables").AddTable($(Build-AndroidEnvironmentTable)) -$markdown += New-MDHeader "Installed apt packages" -Level 3 -$markdown += Get-AptPackages | New-MDTable +$installedSoftware.AddHeader("Cached Docker images").AddTable($(Get-CachedDockerImagesTableData)) +$installedSoftware.AddHeader("Installed apt packages").AddTable($(Get-AptPackages)) -Test-BlankElement -$markdown | Out-File -FilePath "${OutputDirectory}/Ubuntu-Readme.md" +$softwareReport.ToJson() | Out-File -FilePath "${OutputDirectory}/software-report.json" -Encoding UTF8NoBOM +$softwareReport.ToMarkdown() | Out-File -FilePath "${OutputDirectory}/software-report.md" -Encoding UTF8NoBOM diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Java.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Java.psm1 index 7d7067719aa4..a27fc61463fc 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Java.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Java.psm1 @@ -1,4 +1,4 @@ -function Get-JavaVersions { +function Get-JavaVersionsTable { $javaToolcacheVersions = Get-ChildItem $env:AGENT_TOOLSDIRECTORY/Java*/* -Directory | Sort-Object { [int]$_.Name.Split(".")[0] } $existingVersions = $javaToolcacheVersions | ForEach-Object { diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Rust.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Rust.psm1 index d4b4b1db0472..a8058ddc5af1 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Rust.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Rust.psm1 @@ -5,52 +5,51 @@ function Initialize-RustEnvironment { } function Get-RustVersion { - Initialize-RustEnvironment $rustVersion = $(rustc --version) | Take-OutputPart -Part 1 - return "Rust $rustVersion" + return $rustVersion } function Get-BindgenVersion { $bindgenVersion = $(bindgen --version) | Take-OutputPart -Part 1 - return "Bindgen $bindgenVersion" + return $bindgenVersion } function Get-CargoVersion { $cargoVersion = $(cargo --version) | Take-OutputPart -Part 1 - return "Cargo $cargoVersion" + return $cargoVersion } function Get-CargoAuditVersion { $cargoAuditVersion = $(cargo-audit --version) | Take-OutputPart -Part 1 - return "Cargo audit $cargoAuditVersion" + return $cargoAuditVersion } function Get-CargoOutdatedVersion { $cargoOutdatedVersion = cargo outdated --version | Take-OutputPart -Part 1 - return "Cargo outdated $cargoOutdatedVersion" + return $cargoOutdatedVersion } function Get-CargoClippyVersion { $cargoClippyVersion = $(cargo-clippy --version) | Take-OutputPart -Part 1 - return "Cargo clippy $cargoClippyVersion" + return $cargoClippyVersion } function Get-CbindgenVersion { $cbindgenVersion = $(cbindgen --version) | Take-OutputPart -Part 1 - return "Cbindgen $cbindgenVersion" + return $cbindgenVersion } function Get-RustupVersion { $rustupVersion = $(rustup --version) | Take-OutputPart -Part 1 - return "Rustup $rustupVersion" + return $rustupVersion } function Get-RustdocVersion { $rustdocVersion = $(rustdoc --version) | Take-OutputPart -Part 1 - return "Rustdoc $rustdocVersion" + return $rustdocVersion } function Get-RustfmtVersion { $rustfmtVersion = $(rustfmt --version) | Take-OutputPart -Part 1 | Take-OutputPart -Part 0 -Delimiter "-" - return "Rustfmt $rustfmtVersion" + return $rustfmtVersion } diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 index 4c934bf71409..eaa1b2db4f3b 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 @@ -1,35 +1,33 @@ function Get-AnsibleVersion { $ansibleVersion = (ansible --version)[0] -replace "[^\d.]" - return "Ansible $ansibleVersion" + return $ansibleVersion } function Get-AptFastVersion { $versionFileContent = Get-Content (which apt-fast) -Raw $match = [Regex]::Match($versionFileContent, '# apt-fast v(.+)\n') - $aptFastVersion = $match.Groups[1].Value - return "apt-fast $aptFastVersion" + return $match.Groups[1].Value } function Get-AzCopyVersion { $azcopyVersion = azcopy --version | Take-OutputPart -Part 2 - return "AzCopy $azcopyVersion - available by ``azcopy`` and ``azcopy10`` aliases" + return "$azcopyVersion - available by ``azcopy`` and ``azcopy10`` aliases" } function Get-BazelVersion { $bazelVersion = bazel --version | Select-String "bazel" | Take-OutputPart -Part 1 - return "Bazel $bazelVersion" + return $bazelVersion } function Get-BazeliskVersion { $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" + return $bazeliskVersion } function Get-BicepVersion { (bicep --version | Out-String) -match "bicep cli version (?<version>\d+\.\d+\.\d+)" | Out-Null - $bicepVersion = $Matches.Version - return "Bicep $bicepVersion" + return $Matches.Version } function Get-CodeQLBundleVersion { @@ -37,256 +35,256 @@ function Get-CodeQLBundleVersion { $CodeQLVersionPath = Get-ChildItem $CodeQLVersionsWildcard | Select-Object -First 1 -Expand FullName $CodeQLPath = Join-Path $CodeQLVersionPath -ChildPath "x64" | Join-Path -ChildPath "codeql" | Join-Path -ChildPath "codeql" $CodeQLVersion = & $CodeQLPath version --quiet - return "CodeQL Action Bundle $CodeQLVersion" + return $CodeQLVersion } function Get-PodManVersion { $podmanVersion = podman --version | Take-OutputPart -Part 2 - return "Podman $podmanVersion" + return $podmanVersion } function Get-BuildahVersion { $buildahVersion = buildah --version | Take-OutputPart -Part 2 - return "Buildah $buildahVersion" + return $buildahVersion } function Get-SkopeoVersion { $skopeoVersion = skopeo --version | Take-OutputPart -Part 2 - return "Skopeo $skopeoVersion" + return $skopeoVersion } function Get-CMakeVersion { $cmakeVersion = cmake --version | Select-Object -First 1 | Take-OutputPart -Part 2 - return "CMake $cmakeVersion" + return $cmakeVersion } function Get-DockerComposeV1Version { $composeVersion = docker-compose -v | Take-OutputPart -Part 2 | Take-OutputPart -Part 0 -Delimiter "," - return "Docker Compose v1 $composeVersion" + return $composeVersion } function Get-DockerComposeV2Version { $composeVersion = docker compose version | Take-OutputPart -Part 3 - return "Docker Compose v2 $composeVersion" + return $composeVersion } function Get-DockerMobyClientVersion { $dockerClientVersion = sudo docker version --format '{{.Client.Version}}' - return "Docker-Moby Client $dockerClientVersion" + return $dockerClientVersion } function Get-DockerMobyServerVersion { $dockerServerVersion = sudo docker version --format '{{.Server.Version}}' - return "Docker-Moby Server $dockerServerVersion" + return $dockerServerVersion } function Get-DockerBuildxVersion { $buildxVersion = docker buildx version | Take-OutputPart -Part 1 | Take-OutputPart -Part 0 -Delimiter "+" - return "Docker-Buildx $buildxVersion" + return $buildxVersion } function Get-DockerAmazonECRCredHelperVersion { $ecrVersion = docker-credential-ecr-login -v | Select-String "Version:" | Take-OutputPart -Part 1 - return "Docker Amazon ECR Credential Helper $ecrVersion" + return $ecrVersion } function Get-GitVersion { $gitVersion = git --version | Take-OutputPart -Part -1 - return "Git $gitVersion" + return $gitVersion } function Get-GitLFSVersion { $result = Get-CommandResult "git-lfs --version" $gitlfsversion = $result.Output | Take-OutputPart -Part 0 | Take-OutputPart -Part 1 -Delimiter "/" - return "Git LFS $gitlfsversion" + return $gitlfsversion } function Get-GitFTPVersion { $gitftpVersion = git-ftp --version | Take-OutputPart -Part 2 - return "Git-ftp $gitftpVersion" + return $gitftpVersion } function Get-GoogleCloudSDKVersion { - return gcloud --version | Select-Object -First 1 + return (gcloud --version | Select-Object -First 1) | Take-OutputPart -Part 3 } function Get-HavegedVersion { $havegedVersion = dpkg-query --showformat='${Version}' --show haveged | Take-OutputPart -Part 0 -Delimiter "-" - return "Haveged $havegedVersion" + return $havegedVersion } function Get-HerokuVersion { $herokuVersion = heroku version | Take-OutputPart -Part 0 | Take-OutputPart -Part 1 -Delimiter "/" - return "Heroku $herokuVersion" + return $herokuVersion } function Get-HHVMVersion { $hhvmVersion = hhvm --version | Select-Object -First 1 | Take-OutputPart -Part 2 - return "HHVM (HipHop VM) $hhvmVersion" + return $hhvmVersion } function Get-SVNVersion { $svnVersion = svn --version | Select-Object -First 1 | Take-OutputPart -Part 2 - return "SVN $svnVersion" + return $svnVersion } function Get-KustomizeVersion { $kustomizeVersion = kustomize version --short | Take-OutputPart -Part 0 | Take-OutputPart -Part 1 -Delimiter "v" - return "Kustomize $kustomizeVersion" + return $kustomizeVersion } function Get-KindVersion { $kindVersion = kind version | Take-OutputPart -Part 1 | Take-OutputPart -Part 0 -Delimiter "v" - return "Kind $kindVersion" + return $kindVersion } function Get-KubectlVersion { $kubectlVersion = (kubectl version --client --output=json | ConvertFrom-Json).clientVersion.gitVersion.Replace('v','') - return "Kubectl $kubectlVersion" + return $kubectlVersion } function Get-MinikubeVersion { $minikubeVersion = minikube version --short | Take-OutputPart -Part 0 -Delimiter "v" - return "Minikube $minikubeVersion" + return $minikubeVersion } function Get-HGVersion { $hgVersion = hg --version | Select-Object -First 1 | Take-OutputPart -Part -1 | Take-OutputPart -Part 0 -Delimiter ")" - return "Mercurial $hgVersion" + return $hgVersion } function Get-LeiningenVersion { - return "$(lein -v | Take-OutputPart -Part 0,1)" + return "$(lein -v | Take-OutputPart -Part 1)" } function Get-MediainfoVersion { $mediainfoVersion = (mediainfo --version | Select-Object -Index 1 | Take-OutputPart -Part 2).Replace('v', '') - return "MediaInfo $mediainfoVersion" + return $mediainfoVersion } function Get-NewmanVersion { - return "Newman $(newman --version)" + return $(newman --version) } function Get-NVersion { $nVersion = (n --version).Replace('v', '') - return "n $nVersion" + return $nVersion } function Get-NvmVersion { $nvmVersion = bash -c "source /etc/skel/.nvm/nvm.sh && nvm --version" - return "nvm $nvmVersion" + return $nvmVersion } function Get-PackerVersion { # Packer 1.7.1 has a bug and outputs version to stderr instead of stdout https://github.com/hashicorp/packer/issues/10855 $result = (Get-CommandResult "packer --version").Output $packerVersion = [regex]::matches($result, "(\d+.){2}\d+").Value - return "Packer $packerVersion" + return $packerVersion } function Get-PhantomJSVersion { - return "PhantomJS $(phantomjs --version)" + return $(phantomjs --version) } function Get-TerraformVersion { - return (terraform version | Select-String "^Terraform").Line.Replace('v','') + return (terraform version | Select-String "^Terraform").Line.Replace('v','') | Take-OutputPart -Part 1 } function Get-JqVersion { $jqVersion = jq --version | Take-OutputPart -Part 1 -Delimiter "-" - return "jq $jqVersion" + return $jqVersion } function Get-AzureCliVersion { $azcliVersion = (az version | ConvertFrom-Json).'azure-cli' - return "Azure CLI $azcliVersion" + return $azcliVersion } function Get-AzureDevopsVersion { $azdevopsVersion = (az version | ConvertFrom-Json).extensions.'azure-devops' - return "Azure CLI (azure-devops) $azdevopsVersion" + return $azdevopsVersion } function Get-AlibabaCloudCliVersion { - return "Alibaba Cloud CLI $(aliyun version)" + return $(aliyun version) } function Get-AWSCliVersion { $result = Get-CommandResult "aws --version" $awsVersion = $result.Output | Take-OutputPart -Part 0 | Take-OutputPart -Part 1 -Delimiter "/" - return "AWS CLI $awsVersion" + return $awsVersion } function Get-AWSCliSessionManagerPluginVersion { $result = (Get-CommandResult "session-manager-plugin --version").Output - return "AWS CLI Session manager plugin $result" + return $result } function Get-AWSSAMVersion { - return "AWS SAM CLI $(sam --version | Take-OutputPart -Part -1)" + return $(sam --version | Take-OutputPart -Part -1) } function Get-FastlaneVersion { $fastlaneVersion = fastlane --version | Select-String "^fastlane [0-9]" | Take-OutputPart -Part 1 - return "Fastlane $fastlaneVersion" + return $fastlaneVersion } function Get-HubCliVersion { $hubVersion = hub --version | Select-String "hub version" | Take-OutputPart -Part 2 - return "Hub CLI $hubVersion" + return $hubVersion } function Get-GitHubCliVersion { $ghVersion = gh --version | Select-String "gh version" | Take-OutputPart -Part 2 - return "GitHub CLI $ghVersion" + return $ghVersion } function Get-NetlifyCliVersion { $netlifyVersion = netlify --version | Take-OutputPart -Part 0 | Take-OutputPart -Part 1 -Delimiter "/" - return "Netlify CLI $netlifyVersion" + return $netlifyVersion } function Get-OCCliVersion { $ocVersion = oc version -o=json | jq -r '.releaseClientVersion' - return "OpenShift CLI $ocVersion" + return $ocVersion } function Get-ORASCliVersion { $orasVersion = oras version | Select-String "^Version:" | Take-OutputPart -Part 1 - return "ORAS CLI $orasVersion" + return $orasVersion } function Get-VerselCliversion { $result = Get-CommandResult "vercel --version" -Multiline - return $result.Output | Select-Object -First 1 + return $result.Output | Select-Object -Skip 1 -First 1 } function Get-PulumiVersion { $pulumiVersion = pulumi version | Take-OutputPart -Part 0 -Delimiter "v" - return "Pulumi $pulumiVersion" + return $pulumiVersion } function Get-RVersion { $rVersion = (Get-CommandResult "R --version | grep 'R version'").Output | Take-OutputPart -Part 2 - return "R $rVersion" + return $rVersion } function Get-SphinxVersion { $sphinxVersion = searchd -h | Select-Object -First 1 | Take-OutputPart -Part 1 | Take-OutputPart -Part 0 -Delimiter "-" - return "Sphinx Open Source Search Server $sphinxVersion" + return $sphinxVersion } function Get-YamllintVersion { - return "$(yamllint --version)" + return $(yamllint --version) | Take-OutputPart -Part 1 } function Get-ZstdVersion { $zstdVersion = zstd --version | Take-OutputPart -Part 1 -Delimiter "v" | Take-OutputPart -Part 0 -Delimiter "," - return "zstd $zstdVersion (Homebrew)" + return "$zstdVersion (Homebrew)" } function Get-YqVersion { $yqVersion = ($(yq -V) -Split " ")[-1] - return "yq $yqVersion" + return $yqVersion } \ No newline at end of file diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.WebServers.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.WebServers.psm1 index dce9f020e15c..cf4c89f30dfc 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.WebServers.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.WebServers.psm1 @@ -43,19 +43,13 @@ function Get-Xsp4Version { } } -function Build-WebServersSection { - $servers = @( - (Get-ApacheVersion), - (Get-NginxVersion) - ) +function Build-WebServersTable { + $servers = @() + $servers += (Get-ApacheVersion) if (Test-IsUbuntu20) { $servers += (Get-Xsp4Version) } + $servers += (Get-NginxVersion) - $output = "" - $output += New-MDHeader "Web Servers" -Level 3 - $output += $servers | Sort-Object Name | New-MDTable - $output += New-MDNewLine - - return $output + return $servers } diff --git a/images/linux/scripts/helpers/SoftwareReport.Helpers.psm1 b/images/linux/scripts/helpers/SoftwareReport.Helpers.psm1 index a9c4c3a3a016..1243cc74c96a 100644 --- a/images/linux/scripts/helpers/SoftwareReport.Helpers.psm1 +++ b/images/linux/scripts/helpers/SoftwareReport.Helpers.psm1 @@ -10,14 +10,6 @@ function Take-OutputPart { return [string]::Join($Delimiter, $selectedParts) } -function New-MDNewLine { - param ( - [int] $Count = 1 - ) - $newLineSymbol = [System.Environment]::NewLine - return $newLineSymbol * $Count -} - function Restore-UserOwner { sudo chown -R ${env:USER}: $env:HOME } @@ -41,118 +33,9 @@ function Get-PathWithLink { return "${inputPath}${link}" } -function Get-CachedToolInstances -{ - <# - .SYNOPSIS - Returns hastable of installed cached tools. - - .DESCRIPTION - Return hastable that contains versions and architectures for selected cached tool. - - .PARAMETER Name - Name of cached tool. - - .PARAMETER VersionCommand - Optional parameter. Command to return version of system default tool. - - .EXAMPLE - Get-CachedToolInstances -Name "Python" -VersionCommand "--version" - - #> - - param - ( - [String] $Name, - [String] $VersionCommand - ) - - $toolInstances = @() - $toolPath = Join-Path -Path $env:AGENT_TOOLSDIRECTORY -ChildPath $Name - - # Get all installed versions from TOOLSDIRECTORY folder - $versions = Get-ChildItem $toolPath | Sort-Object { [System.Version]$_.Name } - foreach ($version in $versions) - { - $instanceInfo = @{} - - # Create instance hashtable - [string]$instanceInfo.Path = Join-Path -Path $toolPath -ChildPath $version.Name - [string]$instanceInfo.Version = $version.Name - - # Get all architectures for current version - [array]$instanceInfo.Architecture_Array = Get-ChildItem $version.FullName -Name -Directory | Where-Object { $_ -match "^x[0-9]{2}$" } - [string]$instanceInfo.Architecture = $instanceInfo.Architecture_Array -Join ", " - - # Add (default) postfix to version name, in case if current version is in environment path - if (-not ([string]::IsNullOrEmpty($VersionCommand))) - { - $defaultVersion = $(& ($Name.ToLower()) $VersionCommand 2>&1) - $defaultToolVersion = $defaultVersion | Select-String -Pattern "\d+\.\d+\.\d+" -AllMatches ` - | ForEach-Object { $_.Matches.Value } - - if ([version]$version.Name -eq [version]$defaultToolVersion) - { - $instanceInfo.Version += " (Default)" - } - } - - $toolInstances += $instanceInfo - } - - return $toolInstances -} - function Get-AptSourceRepository { param([String] $PackageName) $sourceUrl = Get-Content "$PSScriptRoot/../helpers/apt-sources.txt" | Select-String -Pattern $PackageName | Take-OutputPart -Part (1..3) return $sourceUrl } - -function Test-BlankElement { - param( - [string] $Markdown - ) - - $splitByLines = $Markdown.Split("`n") - # Validate entry without version - $blankVersions = $splitByLines -match "^-" -notmatch "Image Version|MySQL Server|Vcpkg|\d\." | Out-String - - # Validate tables with blank rows - $blankRows = "" - for($i = 0; $i -lt $splitByLines.Length; $i++) { - $addRows= $false - $table = @() - if ($splitByLines[$i].StartsWith("#") -and $splitByLines[$i+1].StartsWith("|")) { - $table += $splitByLines[$i,($i+1),($i+2)] - $i += 3 - $current = $splitByLines[$i] - while ($current.StartsWith("|")) { - $isBlankRow = $current.Substring(1, $current.LastIndexOf("|") - 2).Split("|").Trim() -contains "" - if ($isBlankRow) { - $table += $current - $addRows = $true - } - $current = $splitByLines[++$i] - } - if ($addRows) { - $blankRows += $table | Out-String - } - } - } - - # Display report - $isReport = $false - if ($blankVersions) { - Write-Host "Software list with blank version:`n${blankVersions}" - $isReport = $true - } - if ($blankRows) { - Write-Host "Tables with blank rows:`n${blankRows}" - $isReport = $true - } - if ($isReport) { - exit 1 - } -} diff --git a/images/linux/ubuntu1804.json b/images/linux/ubuntu1804.json index b36c1eb2cd57..ad95283f6414 100644 --- a/images/linux/ubuntu1804.json +++ b/images/linux/ubuntu1804.json @@ -120,6 +120,11 @@ "source": "{{ template_dir }}/scripts/SoftwareReport", "destination": "{{user `image_folder`}}" }, + { + "type": "file", + "source": "{{ template_dir }}/../../helpers/software-report-base", + "destination": "{{user `image_folder`}}/SoftwareReport/" + }, { "type": "file", "source": "{{template_dir}}/toolsets/toolset-1804.json", @@ -331,10 +336,16 @@ }, { "type": "file", - "source": "{{user `image_folder`}}/Ubuntu-Readme.md", + "source": "{{user `image_folder`}}/software-report.md", "destination": "{{template_dir}}/Ubuntu1804-Readme.md", "direction": "download" }, + { + "type": "file", + "source": "{{user `image_folder`}}/software-report.json", + "destination": "{{template_dir}}/software-report.json", + "direction": "download" + }, { "type": "shell", "scripts":[ diff --git a/images/linux/ubuntu2004.json b/images/linux/ubuntu2004.json index e7029996736e..32264320396d 100644 --- a/images/linux/ubuntu2004.json +++ b/images/linux/ubuntu2004.json @@ -120,6 +120,11 @@ "source": "{{ template_dir }}/scripts/SoftwareReport", "destination": "{{user `image_folder`}}" }, + { + "type": "file", + "source": "{{ template_dir }}/../../helpers/software-report-base", + "destination": "{{user `image_folder`}}/SoftwareReport/" + }, { "type": "file", "source": "{{template_dir}}/toolsets/toolset-2004.json", @@ -336,10 +341,16 @@ }, { "type": "file", - "source": "{{user `image_folder`}}/Ubuntu-Readme.md", + "source": "{{user `image_folder`}}/software-report.md", "destination": "{{template_dir}}/Ubuntu2004-Readme.md", "direction": "download" }, + { + "type": "file", + "source": "{{user `image_folder`}}/software-report.json", + "destination": "{{template_dir}}/software-report.json", + "direction": "download" + }, { "type": "shell", "scripts":[ diff --git a/images/linux/ubuntu2204.pkr.hcl b/images/linux/ubuntu2204.pkr.hcl index 0042e7363a83..de2dd44d6004 100644 --- a/images/linux/ubuntu2204.pkr.hcl +++ b/images/linux/ubuntu2204.pkr.hcl @@ -234,6 +234,11 @@ build { source = "${path.root}/scripts/SoftwareReport" } + provisioner "file" { + destination = "${var.image_folder}/SoftwareReport/" + source = "${path.root}/../../helpers/software-report-base" + } + provisioner "file" { destination = "${var.installer_script_folder}/toolset.json" source = "${path.root}/toolsets/toolset-2204.json" @@ -382,7 +387,13 @@ build { provisioner "file" { destination = "${path.root}/Ubuntu2204-Readme.md" direction = "download" - source = "${var.image_folder}/Ubuntu-Readme.md" + source = "${var.image_folder}/software-report.md" + } + + provisioner "file" { + destination = "${path.root}/software-report.json" + direction = "download" + source = "${var.image_folder}/software-report.json" } provisioner "shell" { From 71e1acd1b0db237fb7fee7347357d1becc4c9a51 Mon Sep 17 00:00:00 2001 From: Maxim Lobanov <maxim-lobanov@github.com> Date: Thu, 22 Dec 2022 12:22:26 +0100 Subject: [PATCH 1655/3485] Minor fixes for Calculate-ImagesDifference.ps1 (#6826) --- helpers/software-report-base/Calculate-ImagesDifference.ps1 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/helpers/software-report-base/Calculate-ImagesDifference.ps1 b/helpers/software-report-base/Calculate-ImagesDifference.ps1 index 1536217092d1..f7a0216effd7 100644 --- a/helpers/software-report-base/Calculate-ImagesDifference.ps1 +++ b/helpers/software-report-base/Calculate-ImagesDifference.ps1 @@ -54,10 +54,13 @@ $comparer = [SoftwareReportDifferenceCalculator]::new($previousReport, $currentR $comparer.CompareReports() $diff = $comparer.GetMarkdownReport() -if ($ReleaseBranch -and $ReadmePath) { +if ($ReleaseBranchName -and $ReadmePath) { # https://github.com/actions/runner-images/blob/releases/macOS-12/20221215/images/macos/macos-12-Readme.md $ImageDocsUrl = "https://github.com/actions/runner-images/blob/${ReleaseBranchName}/${ReadmePath}" $diff += "`n`n`nFor comprehensive list of software installed on this image please click [here]($ImageDocsUrl)." } +$parentDirectory = Split-Path $OutputFile -Parent +if (-not (Test-Path $parentDirectory)) { New-Item -Path $parentDirectory -ItemType Directory | Out-Null } + $diff | Out-File -Path $OutputFile -Encoding utf8NoBOM From 86751fa022c0c5a96fcfad050cf880a5103db011 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 22 Dec 2022 18:33:45 +0000 Subject: [PATCH 1656/3485] Updating readme file for ubuntu18 version 20221220.1 (#6818) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu1804-Readme.md | 338 ++++++++++++++---------------- 1 file changed, 163 insertions(+), 175 deletions(-) diff --git a/images/linux/Ubuntu1804-Readme.md b/images/linux/Ubuntu1804-Readme.md index c7e71e33222e..398a14c2c51c 100644 --- a/images/linux/Ubuntu1804-Readme.md +++ b/images/linux/Ubuntu1804-Readme.md @@ -1,14 +1,11 @@ | Announcements | |-| -| [Ubuntu-latest workflows will use Ubuntu-22.04](https://github.com/actions/runner-images/issues/6399) | -| [[all OSs] The VCPKG_ROOT variable will be removed from runner images](https://github.com/actions/runner-images/issues/6376) | -| [Third party PHP repository will be removed from the Ubuntu 22.04 image](https://github.com/actions/runner-images/issues/6331) | -| [[Ubuntu] homebrew will be removed from PATH variable](https://github.com/actions/runner-images/issues/6283) | -| [The Ubuntu 18.04 Actions runner image will begin deprecation on 8/8/22 and will be fully unsupported by 4/1/2023](https://github.com/actions/runner-images/issues/6002) | +| [The Ubuntu 18.04 Actions runner image will begin deprecation on 2022/08/08 and will be fully unsupported by 2023/04/01](https://github.com/actions/runner-images/issues/6002) | *** -# Ubuntu 18.04.6 LTS -- Linux kernel version: 5.4.0-1094-azure -- Image Version: 20221018.2 +# Ubuntu 18.04 +- OS Version: 18.04.6 LTS +- Kernel Version: 5.4.0-1098-azure +- Image Version: 20221220.1 ## Installed Software ### Language and Runtime @@ -21,32 +18,38 @@ - Erlang rebar3 3.20.0 - GNU C++ 7.5.0, 9.4.0, 10.3.0 - GNU Fortran 7.5.0, 9.4.0, 10.3.0 -- Julia 1.8.2 -- Kotlin 1.7.20-release-201 -- Mono 6.12.0.182 (apt source repository: https://download.mono-project.com/repo/ubuntu stable-bionic main) -- MSBuild 16.10.1.31701 (from /usr/lib/mono/msbuild/15.0/bin/MSBuild.dll) -- Node 16.18.0 +- Julia 1.8.3 +- Kotlin 1.7.22-release-288 +- Mono 6.12.0.182 +- MSBuild 16.10.1.31701 (Mono 6.12.0.182) +- Node 16.19.0 - Perl 5.26.1 - Python 2.7.17 - Python3 3.6.9 - Ruby 2.5.1p57 -- Swift 5.7 +- Swift 5.7.2 ### Package Management - cpan 1.64 -- Helm 3.10.1 -- Homebrew 3.6.6 +- Helm 3.10.3 +- Homebrew 3.6.15 - Miniconda 4.12.0 -- Npm 8.19.2 +- Npm 8.19.3 - NuGet 6.3.1.1 - Pip 9.0.1 - Pip3 9.0.1 - Pipx 1.0.0 - RubyGems 2.7.6 -- Vcpkg (build from master \<ce99c947b>) +- Vcpkg (build from commit cc288af76) - Yarn 1.22.19 -##### Notes: +#### Environment variables +| Name | Value | +| ----------------------- | ---------------------- | +| CONDA | /usr/share/miniconda | +| VCPKG_INSTALLATION_ROOT | /usr/local/share/vcpkg | + +#### Homebrew note ``` Location: /home/linuxbrew Note: Homebrew is pre-installed on image but not added to PATH. @@ -54,127 +57,119 @@ run the eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)" command to accomplish this. ``` -#### Environment variables -| Name | Value | -| ----------------------- | ---------------------- | -| CONDA | /usr/share/miniconda | -| VCPKG_INSTALLATION_ROOT | /usr/local/share/vcpkg | -| VCPKG_ROOT | /usr/local/share/vcpkg | - ### Project Management - Ant 1.10.5 -- Gradle 7.5.1 +- Gradle 7.6 - Maven 3.8.6 -- Sbt 1.7.2 +- Sbt 1.8.0 ### Tools - Ansible 2.11.12 - apt-fast 1.9.12 -- AzCopy 10.16.1 (available by `azcopy` and `azcopy10` aliases) -- Bazel 5.3.1 +- AzCopy 10.16.2 - available by `azcopy` and `azcopy10` aliases +- Bazel 6.0.0 - Bazelisk 1.13.2 -- Bicep 0.11.1 -- Buildah 1.22.3 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- CMake 3.24.2 -- CodeQL Action Bundle 2.11.1 +- Bicep 0.13.1 +- Buildah 1.22.3 +- CMake 3.25.1 +- CodeQL Action Bundle 2.11.6 - Docker Amazon ECR Credential Helper 0.6.0 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.11.2+azure-1 +- Docker Compose v2 2.14.1+azure-1 - Docker-Buildx 0.9.1 -- Docker-Moby Client 20.10.18+azure-2 -- Docker-Moby Server 20.10.18+azure-2 -- Git 2.38.1 (apt source repository: ppa:git-core/ppa) -- Git LFS 3.2.0 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) +- Docker-Moby Client 20.10.22+azure-1 +- Docker-Moby Server 20.10.22+azure-1 +- Git 2.39.0 +- Git LFS 3.2.0 - Git-ftp 1.3.1 - Haveged 1.9.1 -- Heroku 7.65.0 +- Heroku 7.67.1 - HHVM (HipHop VM) 4.164.0 - jq 1.5 -- Kind 0.16.0 -- Kubectl 1.25.3 +- Kind 0.17.0 +- Kubectl 1.26.0 - Kustomize 4.5.7 -- Leiningen 2.9.10 +- Leiningen 2.10.0 - MediaInfo 17.12 - Mercurial 4.5.3 -- Minikube 1.27.1 -- n 9.0.0 +- Minikube 1.28.0 +- n 9.0.1 - Newman 5.3.2 - nvm 0.39.2 - OpenSSL 1.1.1-1ubuntu2.1~18.04.20 -- Packer 1.8.3 -- Parcel 2.7.0 +- Packer 1.8.5 +- Parcel 2.8.2 - PhantomJS 2.1.1 -- Podman 3.4.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- Pulumi 3.43.1 -- R 4.2.1 -- Skopeo 1.5.0 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) +- Podman 3.4.2 +- Pulumi 3.50.0 +- R 4.2.2 +- Skopeo 1.5.0 - Sphinx Open Source Search Server 2.2.11 - SVN 1.9.7 -- Terraform 1.3.2 +- Terraform 1.3.6 - yamllint 1.28.0 -- yq 4.28.2 -- zstd 1.5.2 (homebrew) +- yq v4.30.6 +- zstd 1.5.2 (Homebrew) ### CLI Tools -- Alibaba Cloud CLI 3.0.132 -- AWS CLI 2.8.3 +- Alibaba Cloud CLI 3.0.140 +- AWS CLI 2.9.8 - AWS CLI Session manager plugin 1.2.398.0 -- AWS SAM CLI 1.60.0 -- Azure CLI (azure-cli) 2.41.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) +- AWS SAM CLI 1.67.0 +- Azure CLI 2.43.0 - Azure CLI (azure-devops) 0.25.0 -- GitHub CLI 2.18.0 -- Google Cloud SDK 406.0.0 (apt source repository: https://packages.cloud.google.com/apt) +- GitHub CLI 2.20.2 +- Google Cloud SDK 412.0.0 - Hub CLI 2.14.2 -- Netlify CLI 12.0.11 -- OpenShift CLI 4.11.9 -- ORAS CLI 0.15.1 -- Vercel CLI 28.4.12 +- Netlify CLI 12.4.0 +- OpenShift CLI 4.11.20 +- ORAS CLI 0.16.0 +- Vercel CLI 28.9.0 ### Java | Version | Vendor | Environment Variable | | ------------------- | --------------- | -------------------- | -| 8.0.345+1 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | -| 11.0.16+1 | Eclipse Temurin | JAVA_HOME_11_X64 | +| 8.0.352+8 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | +| 11.0.17+8 | Eclipse Temurin | JAVA_HOME_11_X64 | | 12.0.2+10 | Adopt OpenJDK | JAVA_HOME_12_X64 | -| 17.0.4+1 | Eclipse Temurin | JAVA_HOME_17_X64 | - -### PHP -| Tool | Version | -| -------- | ---------------------------------- | -| PHP | 7.2.34 7.3.33 7.4.32 8.0.24 8.1.11 | -| Composer | 2.4.3 | -| PHPUnit | 8.5.30 | +| 17.0.5+8 | Eclipse Temurin | JAVA_HOME_17_X64 | + +### PHP Tools +- PHP: 7.2.34, 7.3.33, 7.4.33, 8.0.26, 8.1.13, 8.2.0 +- Composer 2.5.0 +- PHPUnit 8.5.31 + ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ``` ### Haskell - Cabal 3.6.2.0 -- GHC 9.4.2 +- GHC 9.4.3 - GHCup 0.1.18.0 -- Stack 2.9.1 +- Stack 2.9.3 ### Rust Tools -- Cargo 1.64.0 -- Rust 1.64.0 -- Rustdoc 1.64.0 +- Cargo 1.66.0 +- Rust 1.66.0 +- Rustdoc 1.66.0 - Rustup 1.25.1 #### Packages -- Bindgen 0.61.0 -- Cargo audit 0.17.2 -- Cargo clippy 0.1.64 +- Bindgen 0.63.0 +- Cargo audit 0.17.4 +- Cargo clippy 0.1.66 - Cargo outdated 0.11.1 - Cbindgen 0.24.3 - Rustfmt 1.5.1 ### Browsers and Drivers -- Google Chrome 106.0.5249.119 -- ChromeDriver 106.0.5249.61 -- Chromium 106.0.5235.0 -- Microsoft Edge 106.0.1370.47 (apt source repository: https://packages.microsoft.com/repos/edge) -- Microsoft Edge WebDriver 106.0.1370.47 -- Selenium server 4.5.0 -- Mozilla Firefox 105.0 +- Google Chrome 108.0.5359.124 +- ChromeDriver 108.0.5359.71 +- Chromium 108.0.5341.0 +- Microsoft Edge 108.0.1462.54 +- Microsoft Edge WebDriver 108.0.1462.54 +- Selenium server 4.7.0 +- Mozilla Firefox 108.0.1 - Geckodriver 0.32.0 #### Environment variables @@ -185,85 +180,77 @@ to accomplish this. | GECKOWEBDRIVER | /usr/local/share/gecko_driver | | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | -### .NET Core SDK -- 3.1.120 3.1.202 3.1.302 3.1.424 5.0.104 5.0.214 5.0.303 5.0.408 6.0.402 - -### .NET tools -- nbgv 3.5.113+a908c6d9d2 +### .NET Core Tools +- .NET Core SDK: 3.1.120, 3.1.202, 3.1.302, 3.1.426, 5.0.104, 5.0.214, 5.0.303, 5.0.408, 6.0.404 +- nbgv 3.5.119+5d25f54fec ### Databases -- MongoDB 5.0.13 (apt source repository: https://repo.mongodb.org/apt/ubuntu) +- MongoDB 5.0.14 - sqlite3 3.22.0 #### PostgreSQL -- PostgreSQL 14.5 (apt source repository: https://apt.postgresql.org/pub/repos/apt/) -- PostgreSQL Server (user:postgres) +- PostgreSQL 14.6 ``` - PostgreSQL service is disabled by default. Use the following command as a part of your job to start the service: 'sudo systemctl start postgresql.service' + User: postgres + PostgreSQL service is disabled by default. + Use the following command as a part of your job to start the service: 'sudo systemctl start postgresql.service' ``` #### MySQL -- MySQL 5.7.39 -- MySQL Server (user:root password:root) +- MySQL 5.7.40 ``` - MySQL service is disabled by default. Use the following command as a part of your job to start the service: 'sudo systemctl start mysql.service' + User: root + Password: root + MySQL service is disabled by default. + Use the following command as a part of your job to start the service: 'sudo systemctl start mysql.service' ``` #### MS SQL Server Client Tools - sqlcmd 17.10.0001.1 -- SqlPackage 16.0.6296.0 +- SqlPackage 16.1.6374.0 ### Cached Tools #### Go - 1.16.15 - 1.17.13 -- 1.18.7 +- 1.18.9 #### Node.js -- 12.22.12 -- 14.20.1 -- 16.17.1 - -#### PyPy -- 2.7.18 [PyPy 7.3.9] -- 3.6.12 [PyPy 7.3.3] -- 3.9.12 [PyPy 7.3.9] +- 14.21.2 +- 16.19.0 +- 18.12.1 #### Python - 2.7.18 - 3.6.15 - 3.7.15 -- 3.8.14 -- 3.9.15 -- 3.10.8 +- 3.8.15 +- 3.9.16 +- 3.10.9 +- 3.11.1 + +#### PyPy +- 2.7.18 [PyPy 7.3.10] +- 3.6.12 [PyPy 7.3.3] +- 3.9.15 [PyPy 7.3.10] #### Ruby - 2.4.10 - 2.5.9 - 2.6.10 -- 2.7.6 -- 3.0.4 -- 3.1.2 - -#### Environment variables -| Name | Value | Architecture | -| --------------- | ----------------------------------- | ------------ | -| GOROOT_1_16_X64 | /opt/hostedtoolcache/go/1.16.15/x64 | x64 | -| GOROOT_1_17_X64 | /opt/hostedtoolcache/go/1.17.13/x64 | x64 | -| GOROOT_1_18_X64 | /opt/hostedtoolcache/go/1.18.7/x64 | x64 | +- 2.7.7 +- 3.0.5 +- 3.1.3 ### PowerShell Tools -- PowerShell 7.2.6 +- PowerShell 7.2.8 #### PowerShell Modules -| Module | Version | -| --------------- | ------- | -| MarkdownPS | 1.9 | -| Microsoft.Graph | 1.13.0 | -| Pester | 5.3.3 | - -#### Az PowerShell Modules -- 7.5.0 3.1.0.zip 4.4.0.zip 5.9.0.zip 6.6.0.zip +- Az: 9.0.1 +- Az (Cached): 3.1.0.zip, 4.4.0.zip, 5.9.0.zip, 6.6.0.zip, 7.5.0.zip +- MarkdownPS: 1.9 +- Microsoft.Graph: 1.19.0 +- Pester: 5.3.3 ### Web Servers | Name | Version | ConfigFile | ServiceStatus | ListenPort | @@ -272,21 +259,21 @@ to accomplish this. | nginx | 1.14.0 | /etc/nginx/nginx.conf | inactive | 80 | ### Android -| Package Name | Version | -| -------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 7.0 | -| Android Emulator | 31.3.12 | -| Android SDK Build-tools | 33.0.0<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3<br>26.0.0 26.0.1 26.0.2 26.0.3<br>25.0.0 25.0.1 25.0.2 25.0.3<br>24.0.0 24.0.1 24.0.2 24.0.3<br>23.0.1 23.0.2 23.0.3 | -| Android SDK Platform-Tools | 33.0.3 | -| Android SDK Platforms | android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3)<br>android-26 (rev 2)<br>android-25 (rev 3)<br>android-24 (rev 2)<br>android-23 (rev 3) | -| Android SDK Tools | 26.1.1 | -| Android Support Repository | 47.0.0 | -| CMake | 3.10.2<br>3.18.1<br>3.22.1 | -| Google APIs | addon-google_apis-google-21<br>addon-google_apis-google-22<br>addon-google_apis-google-23<br>addon-google_apis-google-24 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 23.2.8568313<br>24.0.8215888<br>25.1.8937393 (default) | -| SDK Patch Applier v4 | 1 | +| Package Name | Version | +| -------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 8.0 | +| Android Emulator | 31.3.14 | +| Android SDK Build-tools | 33.0.0 33.0.1<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3<br>26.0.0 26.0.1 26.0.2 26.0.3<br>25.0.0 25.0.1 25.0.2 25.0.3<br>24.0.0 24.0.1 24.0.2 24.0.3<br>23.0.1 23.0.2 23.0.3 | +| Android SDK Platform-Tools | 33.0.3 | +| Android SDK Platforms | android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3)<br>android-26 (rev 2)<br>android-25 (rev 3)<br>android-24 (rev 2)<br>android-23 (rev 3) | +| Android SDK Tools | 26.1.1 | +| Android Support Repository | 47.0.0 | +| CMake | 3.10.2<br>3.18.1<br>3.22.1 | +| Google APIs | addon-google_apis-google-21<br>addon-google_apis-google-22<br>addon-google_apis-google-23<br>addon-google_apis-google-24 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 23.2.8568313<br>24.0.8215888<br>25.1.8937393 (default) | +| SDK Patch Applier v4 | 1 | #### Environment variables | Name | Value | @@ -302,24 +289,24 @@ to accomplish this. | Repository:Tag | Digest | Created | | ----------------------- | ------------------------------------------------------------------------ | ---------- | | alpine:3.12 | sha256:c75ac27b49326926b803b9ed43bf088bc220d22556de1bc5f72d742c91398f69 | 2022-04-05 | -| alpine:3.13 | sha256:100448e45467d4f3838fc8d95faab2965e22711b6edf67bbd8ec9c07f612b553 | 2022-08-09 | -| alpine:3.14 | sha256:1ab24b3b99320975cca71716a7475a65d263d0b6b604d9d14ce08f7a3f67595c | 2022-08-09 | -| buildpack-deps:bullseye | sha256:b501b75e9014f6bd3b4cc08e098653ba0b2863b7242f49134f974ebabdf2eb37 | 2022-10-05 | -| buildpack-deps:buster | sha256:c6f69876293b14c190e89e612826844f4a6f2cd9500d5a26523979b16daa5220 | 2022-10-05 | +| alpine:3.13 | sha256:469b6e04ee185740477efa44ed5bdd64a07bbdd6c7e5f5d169e540889597b911 | 2022-08-09 | +| alpine:3.14 | sha256:4c869a63e1b7c0722fed1e402a6466610327c3b83bdddb94bd94fb71da7f638a | 2022-08-09 | +| buildpack-deps:bullseye | sha256:ea5e7737f282e76b594669926ee6222beee0c237b9ba19a2055aa8f4feb83ba2 | 2022-12-06 | +| buildpack-deps:buster | sha256:ecb6bd2c510b37b0bcbfaaa043192c293bfba2d9a0f4402abab6a342f186eebc | 2022-12-06 | | buildpack-deps:stretch | sha256:78e995165a5788c2f55aed6e548d8f6c1534830d4310c870408fccb2da8c5b2e | 2022-06-23 | -| debian:10 | sha256:604db908f7ce93379b1289c0c7ba73b252002087a3fa64fe904b430083ba5f69 | 2022-10-04 | -| debian:11 | sha256:e538a2f0566efc44db21503277c7312a142f4d0dedc5d2886932b92626104bff | 2022-10-04 | +| debian:10 | sha256:e6fb8b88b411285ac71590459aa8d0a376acc86a3d17adfe45e806f522c54cc3 | 2022-12-06 | +| debian:11 | sha256:a288aa7ad0e4d443e86843972c25a02f99e9ad6ee589dd764895b2c3f5a8340b | 2022-12-06 | | debian:9 | sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be | 2022-06-23 | -| moby/buildkit:latest | sha256:46e7907bf9cdced1af7e45f1f07f69cb30560574d85d636a17ce6f97cc4844b4 | 2022-10-18 | -| node:12 | sha256:01627afeb110b3054ba4a1405541ca095c8bfca1cb6f2be9479c767a2711879e | 2022-04-20 | -| node:12-alpine | sha256:d4b15b3d48f42059a15bd659be60afe21762aae9d6cbea6f124440895c27db68 | 2022-04-11 | -| node:14 | sha256:d0634e5cde35cb312571cd007ae2270295bf2000ec489402325953bcee196ae2 | 2022-10-05 | -| node:14-alpine | sha256:50808db1777e35ca156d06cfd31fa377febe82df6f26b8413a47c12dcbf5e6c5 | 2022-10-06 | -| node:16 | sha256:6d592fdb89fccdeb880d14f30bf139b8a755f33b376f025b70e50ac5547c8ccf | 2022-10-13 | -| node:16-alpine | sha256:2175727cef5cad4020cb77c8c101d56ed41d44fbe9b1157c54f820e3d345eab1 | 2022-10-13 | -| ubuntu:16.04 | sha256:91bd29a464fdabfcf44e29e1f2a5f213c6dfa750b6290e40dd6998ac79da3c41 | 2021-08-31 | -| ubuntu:18.04 | sha256:40b84b75884ff39e4cac4bf62cb9678227b1fbf9dbe3f67ef2a6b073aa4bb529 | 2022-10-04 | -| ubuntu:20.04 | sha256:9c2004872a3a9fcec8cc757ad65c042de1dad4da27de4c70739a6e36402213e3 | 2022-10-04 | +| moby/buildkit:latest | sha256:77abd86c9422aaff294bfde1029f03a6ab18ece0105003637cfda1d7fc22299f | 2022-11-10 | +| node:14 | sha256:ee3fd7a2cca7436bf73db2722b388839669b065827829d21213cab4994cc8e11 | 2022-12-13 | +| node:14-alpine | sha256:80e825b1f5ab859498a2f0f98f8197131a562906e5f8c95977057502e68ca05a | 2022-12-13 | +| node:16 | sha256:1bbd8b82f5a78b6461d3285b62293db99ad60cf4eca35c715636d7143abb057c | 2022-12-13 | +| node:16-alpine | sha256:58e4dfcf063f67d71e608c3cace5a0bcf39e9dbab3047b41e20c15c7132d1d46 | 2022-12-13 | +| node:18 | sha256:9ebe9845301ca70e879f22180dfff496b856bb5f2ec52397462a9f5f903ee654 | 2022-12-06 | +| node:18-alpine | sha256:a136ed7b0df71082cdb171f36d640ea3b392a5c70401c642326acee767b8c540 | 2022-12-12 | +| ubuntu:16.04 | sha256:1f1a2d56de1d604801a9671f301190704c25d604a416f59e03c04f5c6ffee0d6 | 2021-08-31 | +| ubuntu:18.04 | sha256:daf3e62183e8aa9a56878a685ed26f3af3dd8c08c8fd11ef1c167a1aa9bd66a3 | 2022-12-09 | +| ubuntu:20.04 | sha256:0e0402cd13f68137edb0266e1d2c682f217814420f2d43d300ed8f65479b14fb | 2022-12-09 | ### Installed apt packages | Name | Version | @@ -327,14 +314,14 @@ to accomplish this. | aria2 | 1.33.1-1 | | autoconf | 2.69-11 | | automake | 1:1.15.1-3ubuntu2 | -| binutils | 2.30-21ubuntu1\~18.04.7 | +| binutils | 2.30-21ubuntu1\~18.04.8 | | bison | 2:3.0.4.dfsg-1build1 | | brotli | 1.0.3-1ubuntu1.3 | | build-essential | 12.4ubuntu1 | | bzip2 | 1.0.6-8.1ubuntu0.2 | | coreutils | 8.28-1ubuntu1 | -| curl | 7.58.0-2ubuntu3.20 | -| dbus | 1.12.2-1ubuntu1.3 | +| curl | 7.58.0-2ubuntu3.21 | +| dbus | 1.12.2-1ubuntu1.4 | | dnsutils | 1:9.11.3+dfsg-1ubuntu1.18 | | dpkg | 1.19.0.5ubuntu2.4 | | fakeroot | 1.22-2ubuntu1 | @@ -343,27 +330,28 @@ to accomplish this. | ftp | 0.17-34 | | gnupg2 | 2.2.4-1ubuntu1.6 | | haveged | 1.9.1-6 | -| imagemagick | 8:6.9.7.4+dfsg-16ubuntu6.13 | +| imagemagick | 8:6.9.7.4+dfsg-16ubuntu6.14 | | iproute2 | 4.15.0-2ubuntu1.3 | | iputils-ping | 3:20161105-1ubuntu3 | | jq | 1.5+dfsg-2 | | lib32z1 | 1:1.2.11.dfsg-0ubuntu2.2 | | libc++-dev | 6.0-2 | | libc++abi-dev | 6.0-2 | -| libcurl3 | 7.58.0-2ubuntu3.20 | +| libcurl3 | 7.58.0-2ubuntu3.21 | | libgbm-dev | 20.0.8-0ubuntu1\~18.04.1 | | libgconf-2-4 | 3.2.6-4ubuntu1 | | libgsl-dev | 2.4+dfsg-6 | | libgtk-3-0 | 3.22.30-1ubuntu4 | | libmagic-dev | 1:5.32-2ubuntu0.4 | -| libmagickcore-dev | 8:6.9.7.4+dfsg-16ubuntu6.13 | -| libmagickwand-dev | 8:6.9.7.4+dfsg-16ubuntu6.13 | +| libmagickcore-dev | 8:6.9.7.4+dfsg-16ubuntu6.14 | +| libmagickwand-dev | 8:6.9.7.4+dfsg-16ubuntu6.14 | | libsecret-1-dev | 0.18.6-1 | -| libsqlite3-dev | 3.22.0-1ubuntu0.6 | +| libsqlite3-dev | 3.22.0-1ubuntu0.7 | | libtool | 2.4.6-2 | | libunwind8 | 1.2.1-8 | | libxkbfile-dev | 1:1.0.9-2 | | libxss1 | 1:1.2.2-1 | +| libyaml-dev | 0.1.7-2ubuntu3 | | locales | 2.27-3ubuntu1.6 | | m4 | 1.4.18-1 | | mediainfo | 17.12-1 | @@ -383,7 +371,7 @@ to accomplish this. | rsync | 3.1.2-2.1ubuntu1.5 | | shellcheck | 0.4.6-1 | | sphinxsearch | 2.2.11-2 | -| sqlite3 | 3.22.0-1ubuntu0.6 | +| sqlite3 | 3.22.0-1ubuntu0.7 | | ssh | 1:7.6p1-4ubuntu0.7 | | sshpass | 1.06-1 | | subversion | 1.9.7-4ubuntu1.1 | @@ -394,12 +382,12 @@ to accomplish this. | texinfo | 6.5.0.dfsg.1-2 | | time | 1.7-25.1build1 | | tk | 8.6.0+9 | -| tzdata | 2022c-0ubuntu0.18.04.0 | +| tzdata | 2022g-0ubuntu0.18.04 | | unzip | 6.0-21ubuntu1.2 | | upx | 3.94-4 | | wget | 1.19.4-1ubuntu2.2 | | xorriso | 1.4.8-3 | -| xvfb | 2:1.19.6-1ubuntu4.11 | +| xvfb | 2:1.19.6-1ubuntu4.13 | | xz-utils | 5.2.2-1.3ubuntu0.1 | | zip | 3.0-11build1 | | zsync | 0.6.2-3ubuntu1 | From b94d2687f8d5a531b377d7594dffe7733f2cc2a0 Mon Sep 17 00:00:00 2001 From: Maxim Lobanov <maxim-lobanov@github.com> Date: Fri, 23 Dec 2022 09:38:33 +0100 Subject: [PATCH 1657/3485] Polish macOS and Linux docs (#6827) --- .../linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 | 2 +- images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 | 4 ++-- images/macos/software-report/SoftwareReport.Common.psm1 | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index e6a66cf069c2..cb0f26b5e5cd 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -208,7 +208,7 @@ $browsersTools.AddToolVersion("Mozilla Firefox", $(Get-FirefoxVersion)) $browsersTools.AddToolVersion("Geckodriver", $(Get-GeckodriverVersion)) $browsersTools.AddHeader("Environment variables").AddTable($(Build-BrowserWebdriversEnvironmentTable)) -$netCoreTools = $installedSoftware.AddHeader(".NET Core Tools") +$netCoreTools = $installedSoftware.AddHeader(".NET Tools") $netCoreTools.AddToolVersionsListInline(".NET Core SDK", $(Get-DotNetCoreSdkVersions), "^\d+\.\d+\.\d") $netCoreTools.AddNodes($(Get-DotnetTools)) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 index eaa1b2db4f3b..5bfefbfe8dbb 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 @@ -285,6 +285,6 @@ function Get-ZstdVersion { } function Get-YqVersion { - $yqVersion = ($(yq -V) -Split " ")[-1] - return $yqVersion + $yqVersion = $(yq -V) | Take-OutputPart -Part 3 + return $yqVersion.TrimStart("v").Trim() } \ No newline at end of file diff --git a/images/macos/software-report/SoftwareReport.Common.psm1 b/images/macos/software-report/SoftwareReport.Common.psm1 index 698e99d85ad8..84035f13d32f 100644 --- a/images/macos/software-report/SoftwareReport.Common.psm1 +++ b/images/macos/software-report/SoftwareReport.Common.psm1 @@ -385,12 +385,12 @@ function Get-HelmVersion { function Get-MongoVersion { $mongo = Run-Command "mongo --version" | Select-String "MongoDB shell version" | Take-Part -Part 3 - return $mongo + return $mongo.TrimStart("v").Trim() } function Get-MongodVersion { $mongod = Run-Command "mongod --version" | Select-String "db version " | Take-Part -Part 2 - return $mongod + return $mongod.TrimStart("v").Trim() } function Get-7zipVersion { From 3bd81ca3bebd2639750982c8a4c5b640c807f291 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Fri, 23 Dec 2022 09:47:28 +0100 Subject: [PATCH 1658/3485] [Windows] Update PostgreSQL way to install (#6824) --- .../scripts/Installers/Install-PostgreSQL.ps1 | 35 +++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) diff --git a/images/win/scripts/Installers/Install-PostgreSQL.ps1 b/images/win/scripts/Installers/Install-PostgreSQL.ps1 index 9e6a435e4906..1563549106b0 100644 --- a/images/win/scripts/Installers/Install-PostgreSQL.ps1 +++ b/images/win/scripts/Installers/Install-PostgreSQL.ps1 @@ -8,10 +8,41 @@ Set-SystemVariable -SystemVariable PGPASSWORD -Value $pgPwd # Define latest available version to install based on version specified in the toolset $toolsetVersion = (Get-ToolsetContent).postgresql.version -$latestChocoPackage = Get-LatestChocoPackageVersion -TargetVersion $toolsetVersion -PackageName "postgresql" +$getPostgreReleases = Invoke-WebRequest -Uri "https://git.postgresql.org/gitweb/?p=postgresql.git;a=tags" -UseBasicParsing +# Getting all links matched to the pattern (e.g.a=log;h=refs/tags/REL_14) +$TargetReleases = $getPostgreReleases.Links.href | Where-Object {$_ -match "a=log;h=refs/tags/REL_$toolsetVersion"} +[Int32]$OutNumber = $null +$MinorVersions = @() +foreach ($release in $TargetReleases) { + $version = $release.split('/')[-1] + # Checking if the latest symbol of the release version is actually a number. If yes, add to $MinorVersions array + if ([Int32]::TryParse($($version.Split('_')[-1]),[ref]$OutNumber)){ + $MinorVersions += $OutNumber + } +} +# Sorting and getting the last one +$TargetMinorVersions = ($MinorVersions | Sort-Object)[-1] # Install latest PostgreSQL -Choco-Install -PackageName postgresql -ArgumentList "--params", "'/Password:$pgPwd /NoPath'", "--params-global", "--version=$latestChocoPackage" +# In order to get rid of error messages (we know we will have them), force ErrorAction to SilentlyContinue +$ErrorActionOldValue = $ErrorActionPreference +$ErrorActionPreference = 'SilentlyContinue' +# Starting from number 9 and going down, check if the installer is available. If yes, break the loop. +foreach ($increment in 9..0) { + $url = "https://get.enterprisedb.com/postgresql/postgresql-$toolsetVersion.$TargetMinorVersions-$increment-windows-x64.exe" + $checkaccess = [System.Net.WebRequest]::Create($url) + $response = $null + $response = $checkaccess.GetResponse() + if ($response) { + $InstallerUrl = $response.ResponseUri.OriginalString + break + } +} +# Return the previous value of ErrorAction and invoke Install-Binary function +$ErrorActionPreference = $ErrorActionOldValue +$InstallerName = $InstallerUrl.Split('/')[-1] +$ArgumentList = ("--install_runtimes 0","--superpassword root","--enable_acledit 1","--unattendedmodeui none","--mode unattended") +Install-Binary -Url $InstallerUrl -Name $InstallerName -ArgumentList $ArgumentList # Get Path to pg_ctl.exe $pgPath = (Get-CimInstance Win32_Service -Filter "Name LIKE 'postgresql-%'").PathName From 631fd3b08dea8e06a92c776657232300e3902780 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Fri, 23 Dec 2022 13:24:10 +0100 Subject: [PATCH 1659/3485] [Ubuntu] Update Az module version to 9.1.1 (#6832) --- images/linux/toolsets/toolset-1804.json | 2 +- images/linux/toolsets/toolset-2004.json | 2 +- images/linux/toolsets/toolset-2204.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index 9fae07e19338..0faf38b9a04e 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -123,7 +123,7 @@ "name": "az", "url" : "https://raw.githubusercontent.com/Azure/az-ps-module-versions/main/versions-manifest.json", "versions": [ - "9.0.1" + "9.1.1" ], "zip_versions": [ "3.1.0", diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index a76b10e1d4b6..0d57858f5e89 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -121,7 +121,7 @@ "name": "az", "url" : "https://raw.githubusercontent.com/Azure/az-ps-module-versions/main/versions-manifest.json", "versions": [ - "9.0.1" + "9.1.1" ], "zip_versions": [ "3.1.0", diff --git a/images/linux/toolsets/toolset-2204.json b/images/linux/toolsets/toolset-2204.json index b3359d52f0f9..1e4fd4b30c30 100644 --- a/images/linux/toolsets/toolset-2204.json +++ b/images/linux/toolsets/toolset-2204.json @@ -109,7 +109,7 @@ "name": "az", "url" : "https://raw.githubusercontent.com/Azure/az-ps-module-versions/main/versions-manifest.json", "versions": [ - "9.0.1" + "9.1.1" ], "zip_versions": [ ] From 1a44d9343cde9243983a877ce5ec8714f995c3e9 Mon Sep 17 00:00:00 2001 From: Maxim Lobanov <maxim-lobanov@github.com> Date: Fri, 23 Dec 2022 21:02:07 +0100 Subject: [PATCH 1660/3485] Small improvements for software generator module (#6833) --- .../SoftwareReport.Nodes.psm1 | 30 +++++++++++++++-- .../SoftwareReport.Difference.E2E.Tests.ps1 | 33 +++++++++++++++++++ .../tests/SoftwareReport.Nodes.Unit.Tests.ps1 | 26 +++++++-------- 3 files changed, 73 insertions(+), 16 deletions(-) diff --git a/helpers/software-report-base/SoftwareReport.Nodes.psm1 b/helpers/software-report-base/SoftwareReport.Nodes.psm1 index 7fcb43ad4406..b126afdf60a6 100644 --- a/helpers/software-report-base/SoftwareReport.Nodes.psm1 +++ b/helpers/software-report-base/SoftwareReport.Nodes.psm1 @@ -44,9 +44,21 @@ class HeaderNode: BaseNode { throw "This HeaderNode already contains the similar child node. It is not allowed to add the same node twice.`nFound node: $($similarNode.ToJsonObject() | ConvertTo-Json)`nNew node: $($node.ToJsonObject() | ConvertTo-Json)" } - [Array] $existingHeaderNodes = $this.Children | Where-Object { $_ -is [HeaderNode] } - if (($existingHeaderNodes.Count -gt 0) -and ($node -isnot [HeaderNode])) { - throw "It is not allowed to add the node of type '$($node.GetType().Name)' to the HeaderNode that already contains the HeaderNode children." + if (-not $this.IsNodeHasMarkdownHeader($node)) { + # If the node doesn't print own header to markdown, we should check that there is no other nodes that print header to markdown before it. + # It is done to avoid unexpected situation like this: + # + # HeaderNode A -> # A + # HeaderNode B -> ## B + # ToolVersionNode C -> - C + # ToolVersionNode D -> - D + # + # In this example, we add 'HeaderNode B" to 'HeaderNode A' and add 'ToolVersionNode C' to 'HeaderNode B'. + # Then we add 'ToolVersionNode D' to 'HeaderNode A'. + # But the result markdown will look like 'ToolVersionNode D' belongs to 'HeaderNode B' instead of 'HeaderNode A'. + $this.Children | Where-Object { $this.IsNodeHasMarkdownHeader($_) } | ForEach-Object { + throw "It is not allowed to add the non-header node after the header node. Consider adding the separate HeaderNode for this node" + } } $this.Children.Add($node) @@ -130,6 +142,18 @@ class HeaderNode: BaseNode { return $null } + + hidden [Boolean] IsNodeHasMarkdownHeader([BaseNode] $node) { + if ($node -is [HeaderNode]) { + return $true + } + + if (($node -is [ToolVersionsListNode]) -and ($node.ListType -eq "List")) { + return $true + } + + return $false + } } class ToolVersionNode: BaseToolNode { diff --git a/helpers/software-report-base/tests/SoftwareReport.Difference.E2E.Tests.ps1 b/helpers/software-report-base/tests/SoftwareReport.Difference.E2E.Tests.ps1 index 8025e473680b..1e76e24781bc 100644 --- a/helpers/software-report-base/tests/SoftwareReport.Difference.E2E.Tests.ps1 +++ b/helpers/software-report-base/tests/SoftwareReport.Difference.E2E.Tests.ps1 @@ -520,6 +520,39 @@ Describe "Comparer.E2E" { | EE | 66 | +'@ + } + + It "Reports are identical" { + # Previous report + $prevSoftwareReport = [SoftwareReport]::new("macOS 11") + $prevSoftwareReport.Root.AddToolVersion("OS Version:", "macOS 11.7.1 (20G817)") + $prevSoftwareReport.Root.AddToolVersion("Image Version:", "20220918.1") + $prevInstalledSoftware = $prevSoftwareReport.Root.AddHeader("Installed Software") + $prevTools = $prevInstalledSoftware.AddHeader("Tools") + $prevTools.AddToolVersion("ToolA", "1.0.0") + $prevTools.AddToolVersion("ToolB", "3.0.1") + + # Next report + $nextSoftwareReport = [SoftwareReport]::new("macOS 11") + $nextSoftwareReport.Root.AddToolVersion("OS Version:", "macOS 11.7.1 (20G817)") + $nextSoftwareReport.Root.AddToolVersion("Image Version:", "20220922.1") + $nextInstalledSoftware = $nextSoftwareReport.Root.AddHeader("Installed Software") + $nextTools = $nextInstalledSoftware.AddHeader("Tools") + $nextTools.AddToolVersion("ToolA", "1.0.0") + $nextTools.AddToolVersion("ToolB", "3.0.1") + + # Compare reports + $comparer = [SoftwareReportDifferenceCalculator]::new($prevSoftwareReport, $nextSoftwareReport) + $comparer.CompareReports() + $comparer.GetMarkdownReport() | Should -BeExactly @' +# :desktop_computer: Actions Runner Image: macOS 11 +- OS Version: macOS 11.7.1 (20G817) +- Image Version: 20220922.1 + +## :mega: What's changed? + + '@ } } \ No newline at end of file diff --git a/helpers/software-report-base/tests/SoftwareReport.Nodes.Unit.Tests.ps1 b/helpers/software-report-base/tests/SoftwareReport.Nodes.Unit.Tests.ps1 index 58f57d39779c..94bcf3a74fef 100644 --- a/helpers/software-report-base/tests/SoftwareReport.Nodes.Unit.Tests.ps1 +++ b/helpers/software-report-base/tests/SoftwareReport.Nodes.Unit.Tests.ps1 @@ -184,26 +184,24 @@ Describe "Nodes.UnitTests" { } Context "TableNode" { - Context "ToMarkdown" { - It "Simple table" { - $node = [TableNode]::new("Name|Value", @("A|B", "C|D")) - $node.ToMarkdown() | Should -Be @' + It "ToMarkdown (Simple table)" { + $node = [TableNode]::new("Name|Value", @("A|B", "C|D")) + $node.ToMarkdown() | Should -Be @' | Name | Value | | ---- | ----- | | A | B | | C | D | '@ - } + } - It "Wide cells" { - $node = [TableNode]::new("Name|Value", @("Very long value here|B", "C|And very long value here too")) - $node.ToMarkdown() | Should -Be @' + It "ToMarkdown (Wide cells)" { + $node = [TableNode]::new("Name|Value", @("Very long value here|B", "C|And very long value here too")) + $node.ToMarkdown() | Should -Be @' | Name | Value | | -------------------- | ---------------------------- | | Very long value here | B | | C | And very long value here too | '@ - } } It "CalculateColumnsWidth" { @@ -453,7 +451,7 @@ Good Bye world It "Similar ToolVersionsListNode on the same header" { $node = [HeaderNode]::new("MyHeader") - $node.AddToolVersionsList("MyTool", @("2.1.3", "3.0.0"), "^\d+") + $node.AddToolVersionsListInline("MyTool", @("2.1.3", "3.0.0"), "^\d+") $node.AddToolVersionsListInline("MyTool2", @("2.1.3", "3.0.0"), "^\d+") { $node.AddToolVersionsList("MyTool", @("2.1.3", "3.0.0"), "^\d+") } | Should -Throw "This HeaderNode already contains the similar child node. It is not allowed to add the same node twice.*" } @@ -501,10 +499,12 @@ Good Bye world It "Doesn't allow adding non-header nodes after header node" { $node = [HeaderNode]::new("MyHeader") - $node.AddToolVersion("MyTool", "2.1.3") - $node.AddHeader("MySubHeader") - { $node.AddToolVersion("MyTool2", "2.1.4") } | Should -Throw "It is not allowed to add the node of type * to the HeaderNode that already contains the HeaderNode children." + { $node.AddToolVersion("MyTool", "2.1.3") } | Should -Not -Throw + { $node.AddHeader("MySubHeader") } | Should -Not -Throw + { $node.AddToolVersion("MyTool2", "2.1.4") } | Should -Throw "It is not allowed to add the non-header node after the header node. Consider adding the separate HeaderNode for this node" { $node.AddHeader("MySubHeader2") } | Should -Not -Throw + { $node.AddToolVersionsListInline("MyTool3", @("2.1.4", "2.1.5"), "^.+") } | Should -Throw "It is not allowed to add the non-header node after the header node. Consider adding the separate HeaderNode for this node" + { $node.AddToolVersionsList("MyTool4", @("2.1.4", "2.1.5"), "^.+") } | Should -Not -Throw } } } From e589831baa719e50b2e6d941355348c9f0feb802 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Mon, 26 Dec 2022 10:34:52 +0100 Subject: [PATCH 1661/3485] [Ubuntu] Update Az module version to 9.2.0 (#6836) --- images/linux/toolsets/toolset-1804.json | 2 +- images/linux/toolsets/toolset-2004.json | 2 +- images/linux/toolsets/toolset-2204.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index 0faf38b9a04e..e08dfe00116d 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -123,7 +123,7 @@ "name": "az", "url" : "https://raw.githubusercontent.com/Azure/az-ps-module-versions/main/versions-manifest.json", "versions": [ - "9.1.1" + "9.2.0" ], "zip_versions": [ "3.1.0", diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index 0d57858f5e89..3cd42986f76b 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -121,7 +121,7 @@ "name": "az", "url" : "https://raw.githubusercontent.com/Azure/az-ps-module-versions/main/versions-manifest.json", "versions": [ - "9.1.1" + "9.2.0" ], "zip_versions": [ "3.1.0", diff --git a/images/linux/toolsets/toolset-2204.json b/images/linux/toolsets/toolset-2204.json index 1e4fd4b30c30..66aa074c4a9f 100644 --- a/images/linux/toolsets/toolset-2204.json +++ b/images/linux/toolsets/toolset-2204.json @@ -109,7 +109,7 @@ "name": "az", "url" : "https://raw.githubusercontent.com/Azure/az-ps-module-versions/main/versions-manifest.json", "versions": [ - "9.1.1" + "9.2.0" ], "zip_versions": [ ] From 884a7ac5c1a7b962d7de6163f5b479d16b7654a8 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Mon, 26 Dec 2022 10:35:19 +0100 Subject: [PATCH 1662/3485] [Windows] Update Az module version to 9.1.1 (#6831) --- images/win/toolsets/toolset-2019.json | 2 +- images/win/toolsets/toolset-2022.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index ca683ba2bd11..437a30e5bf75 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -127,7 +127,7 @@ "name": "az", "url" : "https://raw.githubusercontent.com/Azure/az-ps-module-versions/main/versions-manifest.json", "versions": [ - "9.0.1" + "9.2.0" ], "zip_versions": [ "1.0.0", diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index a458b430214d..f1f08c503c2b 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -119,7 +119,7 @@ "name": "az", "url" : "https://raw.githubusercontent.com/Azure/az-ps-module-versions/main/versions-manifest.json", "versions": [ - "9.0.1" + "9.2.0" ], "zip_versions": [ "7.5.0" From 9753e7301e19e29b89b0622b811bbb9b3891d02e Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Mon, 26 Dec 2022 15:16:53 +0100 Subject: [PATCH 1663/3485] [Windows] Update OpenSSL version to 3.x (#6837) --- images/win/toolsets/toolset-2019.json | 5 +---- images/win/toolsets/toolset-2022.json | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index 437a30e5bf75..d0d2f9191042 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -448,10 +448,7 @@ { "name": "innosetup" }, { "name": "jq" }, { "name": "NuGet.CommandLine" }, - { - "name": "openssl.light", - "args": [ "--version=1.1.1.20181020" ] - }, + { "name": "openssl.light" }, { "name": "packer" }, { "name": "strawberryperl" }, { "name": "pulumi" }, diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index f1f08c503c2b..4b30dc0f51d0 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -357,10 +357,7 @@ { "name": "innosetup" }, { "name": "jq" }, { "name": "NuGet.CommandLine" }, - { - "name": "openssl.light", - "args": [ "--version=1.1.1.20181020" ] - }, + { "name": "openssl.light" }, { "name": "packer" }, { "name": "strawberryperl" }, { "name": "pulumi" }, From d1f0dc6376e671869bffb894d562a44f2138cfe5 Mon Sep 17 00:00:00 2001 From: bogdan-damian-bgd <108331162+bogdan-damian-bgd@users.noreply.github.com> Date: Tue, 27 Dec 2022 16:33:43 +0100 Subject: [PATCH 1664/3485] MacOS software report fix var name typo (#6842) --- .../macos/software-report/SoftwareReport.Generator.ps1 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1 index 7065c84b5574..afc7b94b4f42 100644 --- a/images/macos/software-report/SoftwareReport.Generator.ps1 +++ b/images/macos/software-report/SoftwareReport.Generator.ps1 @@ -73,11 +73,11 @@ $packageManagement.AddToolVersion("Yarn", $(Get-YarnVersion)) $packageManagement.AddNode($(Build-PackageManagementEnvironmentTable)) # Project Management -$projectanagement = $installedSoftware.AddHeader("Project Management") -$projectanagement.AddToolVersion("Apache Ant", $(Get-ApacheAntVersion)) -$projectanagement.AddToolVersion("Apache Maven", $(Get-MavenVersion)) -$projectanagement.AddToolVersion("Gradle", $(Get-GradleVersion)) -$projectanagement.AddToolVersion("Sbt", $(Get-SbtVersion)) +$projectManagement = $installedSoftware.AddHeader("Project Management") +$projectManagement.AddToolVersion("Apache Ant", $(Get-ApacheAntVersion)) +$projectManagement.AddToolVersion("Apache Maven", $(Get-MavenVersion)) +$projectManagement.AddToolVersion("Gradle", $(Get-GradleVersion)) +$projectManagement.AddToolVersion("Sbt", $(Get-SbtVersion)) # Utilities $utilities = $installedSoftware.AddHeader("Utilities") From c92563577c066cae33ea5b41eb882f9bf70291e6 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Thu, 29 Dec 2022 12:10:43 +0100 Subject: [PATCH 1665/3485] [Ubuntu] Remove pester test for kotlinc-js (#6849) --- images/linux/scripts/tests/Tools.Tests.ps1 | 4 ---- 1 file changed, 4 deletions(-) diff --git a/images/linux/scripts/tests/Tools.Tests.ps1 b/images/linux/scripts/tests/Tools.Tests.ps1 index 5e39bc871737..b90adf48cb31 100644 --- a/images/linux/scripts/tests/Tools.Tests.ps1 +++ b/images/linux/scripts/tests/Tools.Tests.ps1 @@ -416,10 +416,6 @@ Describe "Kotlin" { "kotlinc -version"| Should -ReturnZeroExitCode } - It "kotlinc-js" { - "kotlinc-js -version"| Should -ReturnZeroExitCode - } - It "kotlinc-jvm" { "kotlinc-jvm -version"| Should -ReturnZeroExitCode } From e9b59a540ed5e360dbdbc018830daa828f9ec067 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Thu, 29 Dec 2022 15:28:19 +0100 Subject: [PATCH 1666/3485] Revert "[Ubuntu] hardcode chromium revision for 108.x (#6734)" (#6851) This reverts commit fb484d95309e2fdb6b943ba345c0e0975de10e68. --- images/linux/scripts/installers/google-chrome.sh | 7 ------- 1 file changed, 7 deletions(-) diff --git a/images/linux/scripts/installers/google-chrome.sh b/images/linux/scripts/installers/google-chrome.sh index cc33261f5709..5a6ca806b070 100644 --- a/images/linux/scripts/installers/google-chrome.sh +++ b/images/linux/scripts/installers/google-chrome.sh @@ -14,13 +14,6 @@ function GetChromiumRevision { URL="https://omahaproxy.appspot.com/deps.json?version=${CHROME_VERSION}" REVISION=$(curl -s $URL | jq -r '.chromium_base_position') - # both 108.0.5359.98 and 108.0.5359.94 return old incorrect revision - # nothing to compare with, hardcode temporarily. - # see https://github.com/actions/runner-images/issues/6723 - if [ $REVISION -eq "1016" ]; then - REVISION="1054926" - fi - # Some Google Chrome versions are based on Chromium revisions for which a (usually very old) Chromium release with the same number exist. So far this has heppened with 4 digits long Chromium revisions (1060, 1086). # Use the previous Chromium release when this happens to avoid downloading and installing very old Chromium releases that would break image build because of incompatibilities. # First reported with: https://github.com/actions/runner-images/issues/5256 From 39ba239618deab1ff24573433f38f9cb445de38b Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Thu, 29 Dec 2022 20:39:24 +0100 Subject: [PATCH 1667/3485] [Windows] Remove pester test for kotlinc-js (#6850) --- images/win/scripts/Installers/Install-Haskell.ps1 | 9 +-------- images/win/scripts/Tests/Tools.Tests.ps1 | 2 +- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/images/win/scripts/Installers/Install-Haskell.ps1 b/images/win/scripts/Installers/Install-Haskell.ps1 index c27281f441d1..63c7a7c95662 100644 --- a/images/win/scripts/Installers/Install-Haskell.ps1 +++ b/images/win/scripts/Installers/Install-Haskell.ps1 @@ -13,20 +13,13 @@ $VersionsList = $LatestMajorMinor | ForEach-Object { $_.Group | Select-Object -F # The latest version will be installed as a default ForEach ($version in $VersionsList) { - # 9.4.3 has failed choco builds, replace with 9.4.2 for the time being - # 9.2.5 has failed choco builds, replace with 9.2.4 for the time being - if ($version -eq "9.4.3"){ [version]$version = "9.4.2" } - if ($version -eq "9.2.5"){ [version]$version = "9.2.4" } Write-Host "Installing ghc $version..." Choco-Install -PackageName ghc -ArgumentList '--version', $version, '-m' } # Add default version of GHC to path, because choco formula updates path on user level $DefaultGhcVersion = $VersionsList | Select-Object -Last 1 -# temporary hardcode ------------- -#$DefaultGhcShortVersion = ([version]$DefaultGhcVersion).ToString(3) -$DefaultGhcShortVersion = "9.4.2" -#-------------------------------- +$DefaultGhcShortVersion = ([version]$DefaultGhcVersion).ToString(3) $DefaultGhcPath = Join-Path $env:ChocolateyInstall "lib\ghc.$DefaultGhcVersion\tools\ghc-$DefaultGhcShortVersion\bin" # Starting from version 9 haskell installation directory is $env:ChocolateyToolsLocation instead of $env:ChocolateyInstall\lib if ($DefaultGhcShortVersion -notmatch '^[0-8]\.\d+.*') diff --git a/images/win/scripts/Tests/Tools.Tests.ps1 b/images/win/scripts/Tests/Tools.Tests.ps1 index f25ecfde19fc..247e48bd810a 100644 --- a/images/win/scripts/Tests/Tools.Tests.ps1 +++ b/images/win/scripts/Tests/Tools.Tests.ps1 @@ -183,7 +183,7 @@ Describe "Pipx" { } Describe "Kotlin" { - $kotlinPackages = @("kapt", "kotlin", "kotlinc", "kotlin-dce-js", "kotlinc-js", "kotlinc-jvm") + $kotlinPackages = @("kapt", "kotlin", "kotlinc", "kotlin-dce-js", "kotlinc-jvm") It "<toolName> is available" -TestCases ($kotlinPackages | ForEach-Object { @{ toolName = $_ } }) { "$toolName -version" | Should -ReturnZeroExitCode From f7f519dcc4cd6c83d99d2c9966fd922c290aae59 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Thu, 29 Dec 2022 23:33:04 +0100 Subject: [PATCH 1668/3485] [Ubuntu] update zstd version (#6681) --- .../SoftwareReport/SoftwareReport.Tools.psm1 | 2 +- images/linux/scripts/installers/homebrew.sh | 17 ------------- images/linux/scripts/installers/zstd.sh | 22 +++++++++++++++++ images/linux/scripts/tests/Tools.Tests.ps1 | 24 ++++++++----------- images/linux/toolsets/toolset-1804.json | 8 ------- images/linux/toolsets/toolset-2004.json | 8 ------- images/linux/toolsets/toolset-2204.json | 4 ---- images/linux/ubuntu1804.json | 3 ++- images/linux/ubuntu2004.json | 3 ++- images/linux/ubuntu2204.pkr.hcl | 3 ++- 10 files changed, 39 insertions(+), 55 deletions(-) create mode 100644 images/linux/scripts/installers/zstd.sh diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 index 5bfefbfe8dbb..c18f2e814ad2 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 @@ -281,7 +281,7 @@ function Get-YamllintVersion { function Get-ZstdVersion { $zstdVersion = zstd --version | Take-OutputPart -Part 1 -Delimiter "v" | Take-OutputPart -Part 0 -Delimiter "," - return "$zstdVersion (Homebrew)" + return "$zstdVersion" } function Get-YqVersion { diff --git a/images/linux/scripts/installers/homebrew.sh b/images/linux/scripts/installers/homebrew.sh index 1b4cbd21cb2d..d13372141004 100644 --- a/images/linux/scripts/installers/homebrew.sh +++ b/images/linux/scripts/installers/homebrew.sh @@ -22,23 +22,6 @@ setEtcEnvironmentVariable HOMEBREW_CLEANUP_PERIODIC_FULL_DAYS 3650 echo "Validate the installation reloading /etc/environment" reloadEtcEnvironment -# Install additional brew packages - -# brew GCC installation needed because the default Ubuntu components -# are too old for current brew software -# See: -# https://github.com/Homebrew/homebrew-core/issues/110877 - -brew_packages=$(get_toolset_value .brew[].name) -for package in $brew_packages; do - echo "Install $package" - brew install $package - # create symlinks for zstd in /usr/local/bin - if [[ $package == "zstd" ]]; then - find $(brew --prefix)/bin -name *zstd* -exec sudo sh -c 'ln -s {} /usr/local/bin/$(basename {})' ';' - fi -done - gfortran=$(brew --prefix)/bin/gfortran # Remove gfortran symlink, not to conflict with system gfortran if [[ -e $gfortran ]]; then diff --git a/images/linux/scripts/installers/zstd.sh b/images/linux/scripts/installers/zstd.sh new file mode 100644 index 000000000000..8c738f4c09b3 --- /dev/null +++ b/images/linux/scripts/installers/zstd.sh @@ -0,0 +1,22 @@ +#!/bin/bash -e +################################################################################ +## File: zstd.sh +## Desc: Installs zstd +################################################################################ + +# Source the helpers for use with the script +source $HELPER_SCRIPTS/install.sh + +apt-get install -y liblz4-dev +release_tag=$(curl https://api.github.com/repos/facebook/zstd/releases/latest | jq -r '.tag_name') +zstd_tar_name=zstd-${release_tag//v}.tar.gz +URL=https://github.com/facebook/zstd/releases/download/${release_tag}/${zstd_tar_name} +download_with_retries "${URL}" "/tmp" "${zstd_tar_name}" +tar xzf /tmp/$zstd_tar_name -C /tmp +make -C /tmp/zstd-${release_tag//v}/contrib/pzstd all +make -C /tmp/zstd-${release_tag//v} zstd-release +for copyprocess in zstd zstdless zstdgrep; do cp /tmp/zstd-${release_tag//v}/programs/$copyprocess /usr/local/bin/; done +cp /tmp/zstd-${release_tag//v}/contrib/pzstd/pzstd /usr/local/bin/ +for symlink in zstdcat zstdmt unzstd; do ln -sf /usr/local/bin/zstd /usr/local/bin/$symlink; done + +invoke_tests "Tools" "Zstd" diff --git a/images/linux/scripts/tests/Tools.Tests.ps1 b/images/linux/scripts/tests/Tools.Tests.ps1 index b90adf48cb31..b5102b5e0e86 100644 --- a/images/linux/scripts/tests/Tools.Tests.ps1 +++ b/images/linux/scripts/tests/Tools.Tests.ps1 @@ -220,6 +220,16 @@ Describe "Terraform" { } } +Describe "Zstd" { + It "zstd" { + "zstd --version" | Should -ReturnZeroExitCode + } + + It "pzstd" { + "pzstd --version" | Should -ReturnZeroExitCode + } +} + Describe "Vcpkg" { It "vcpkg" { "vcpkg version" | Should -ReturnZeroExitCode @@ -257,23 +267,9 @@ Describe "HHVM" -Skip:(Test-IsUbuntu22) { } Describe "Homebrew" { - $brewToolset = (Get-ToolsetContent).brew - $testCases = $brewToolset | ForEach-Object { @{brewName = $_.name; brewCommand = $_.command} } - It "homebrew" { "/home/linuxbrew/.linuxbrew/bin/brew --version" | Should -ReturnZeroExitCode } - - It "zstd has /usr/local/bin symlink" { - "/usr/local/bin/zstd" | Should -Exist - } - - It "homebrew package <brewName>" -TestCases $testCases { - $brewPrefix = /home/linuxbrew/.linuxbrew/bin/brew --prefix $brewName - $brewPackage = Join-Path $brewPrefix "bin" $brewCommand - - "$brewPackage --version" | Should -ReturnZeroExitCode - } } Describe "Julia" { diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index e08dfe00116d..d79ae110c4ee 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -221,14 +221,6 @@ ] }, "brew": [ - { - "name": "gcc@12", - "command": "gcc-12" - }, - { - "name": "zstd", - "command": "zstd" - } ], "docker": { "images": [ diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index 3cd42986f76b..2b0fc79e9a5a 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -221,14 +221,6 @@ ] }, "brew": [ - { - "name": "gcc@12", - "command": "gcc-12" - }, - { - "name": "zstd", - "command": "zstd" - } ], "docker": { "images": [ diff --git a/images/linux/toolsets/toolset-2204.json b/images/linux/toolsets/toolset-2204.json index 66aa074c4a9f..5ccee8a19157 100644 --- a/images/linux/toolsets/toolset-2204.json +++ b/images/linux/toolsets/toolset-2204.json @@ -206,10 +206,6 @@ ] }, "brew": [ - { - "name": "zstd", - "command": "zstd" - } ], "docker": { "images": [ diff --git a/images/linux/ubuntu1804.json b/images/linux/ubuntu1804.json index ad95283f6414..a1001f08c5c5 100644 --- a/images/linux/ubuntu1804.json +++ b/images/linux/ubuntu1804.json @@ -252,7 +252,8 @@ "{{template_dir}}/scripts/installers/android.sh", "{{template_dir}}/scripts/installers/pypy.sh", "{{template_dir}}/scripts/installers/python.sh", - "{{template_dir}}/scripts/installers/aws.sh" + "{{template_dir}}/scripts/installers/aws.sh", + "{{template_dir}}/scripts/installers/zstd.sh" ], "environment_vars": [ "HELPER_SCRIPTS={{user `helper_script_folder`}}", diff --git a/images/linux/ubuntu2004.json b/images/linux/ubuntu2004.json index 32264320396d..05677d2ab692 100644 --- a/images/linux/ubuntu2004.json +++ b/images/linux/ubuntu2004.json @@ -253,7 +253,8 @@ "{{template_dir}}/scripts/installers/android.sh", "{{template_dir}}/scripts/installers/pypy.sh", "{{template_dir}}/scripts/installers/python.sh", - "{{template_dir}}/scripts/installers/graalvm.sh" + "{{template_dir}}/scripts/installers/graalvm.sh", + "{{template_dir}}/scripts/installers/zstd.sh" ], "environment_vars": [ "HELPER_SCRIPTS={{user `helper_script_folder`}}", diff --git a/images/linux/ubuntu2204.pkr.hcl b/images/linux/ubuntu2204.pkr.hcl index de2dd44d6004..d59d6903d052 100644 --- a/images/linux/ubuntu2204.pkr.hcl +++ b/images/linux/ubuntu2204.pkr.hcl @@ -334,7 +334,8 @@ build { "${path.root}/scripts/installers/android.sh", "${path.root}/scripts/installers/pypy.sh", "${path.root}/scripts/installers/python.sh", - "${path.root}/scripts/installers/graalvm.sh" + "${path.root}/scripts/installers/graalvm.sh", + "${path.root}/scripts/installers/zstd.sh" ] } From 447c8387a2b05166da574ea96ec4755e9ea7a845 Mon Sep 17 00:00:00 2001 From: bogdan-damian-bgd <108331162+bogdan-damian-bgd@users.noreply.github.com> Date: Fri, 30 Dec 2022 10:24:22 +0100 Subject: [PATCH 1669/3485] [Windows] Update documentation generation to use shared software report module (#6834) --- .../SoftwareReport.Browsers.psm1 | 19 +- .../SoftwareReport.CachedTools.psm1 | 25 +- .../SoftwareReport/SoftwareReport.Common.psm1 | 106 ++-- .../SoftwareReport.Databases.psm1 | 24 +- .../SoftwareReport.Generator.ps1 | 455 ++++++++---------- .../SoftwareReport.Helpers.psm1 | 145 ------ .../SoftwareReport/SoftwareReport.Tools.psm1 | 107 ++-- .../SoftwareReport.WebServers.psm1 | 17 +- images/win/windows2019.json | 16 +- images/win/windows2022.json | 16 +- 10 files changed, 372 insertions(+), 558 deletions(-) diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Browsers.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Browsers.psm1 index 11840825b0b3..19dd7cee3e88 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Browsers.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Browsers.psm1 @@ -32,6 +32,19 @@ $webDrivers = @{ } } +function Build-BrowserSection { + return @( + $(Get-BrowserVersion -Browser "chrome"), + $(Get-SeleniumWebDriverVersion -Driver "chrome"), + $(Get-BrowserVersion -Browser "edge"), + $(Get-SeleniumWebDriverVersion -Driver "edge"), + $(Get-BrowserVersion -Browser "firefox"), + $(Get-SeleniumWebDriverVersion -Driver "firefox"), + $(Get-SeleniumWebDriverVersion -Driver "iexplorer"), + $(Get-SeleniumVersion) + ) +} + function Get-BrowserVersion { param( [string] $Browser @@ -40,7 +53,7 @@ function Get-BrowserVersion { $browserFile = $browsers.$Browser.File $registryKey = "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\$browserFile" $browserVersion = (Get-Item (Get-ItemProperty $registryKey)."(Default)").VersionInfo.FileVersion - return "$browserName $browserVersion" + return [ToolVersionNode]::new($browserName, $browserVersion) } function Get-SeleniumWebDriverVersion { @@ -51,13 +64,13 @@ function Get-SeleniumWebDriverVersion { $driverPath = $webDrivers.$Driver.Path $versionFileName = "versioninfo.txt"; $webDriverVersion = Get-Content -Path "$driverPath\$versionFileName" - return "$driverName $webDriverVersion" + return [ToolVersionNode]::new($driverName, $webDriverVersion) } function Get-SeleniumVersion { $seleniumBinaryName = (Get-ToolsetContent).selenium.binary_name $fullSeleniumVersion = (Get-ChildItem "C:\selenium\${seleniumBinaryName}-*").Name -replace "${seleniumBinaryName}-" - return "Selenium server $fullSeleniumVersion" + return [ToolVersionNode]::new("Selenium server", $fullSeleniumVersion) } function Build-BrowserWebdriversEnvironmentTable { diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.CachedTools.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.CachedTools.psm1 index 47374c111c59..d7683773017b 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.CachedTools.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.CachedTools.psm1 @@ -30,22 +30,11 @@ function Get-ToolcachePyPyVersions { function Build-CachedToolsSection { - $output = "" - - $output += New-MDHeader "Go" -Level 4 - $output += New-MDList -Lines (Get-ToolcacheGoVersions) -Style Unordered - - $output += New-MDHeader "Node.js" -Level 4 - $output += New-MDList -Lines (Get-ToolcacheNodeVersions) -Style Unordered - - $output += New-MDHeader "Python" -Level 4 - $output += New-MDList -Lines (Get-ToolcachePythonVersions) -Style Unordered - - $output += New-MDHeader "PyPy" -Level 4 - $output += New-MDList -Lines (Get-ToolcachePyPyVersions) -Style Unordered - - $output += New-MDHeader "Ruby" -Level 4 - $output += New-MDList -Lines (Get-ToolcacheRubyVersions) -Style Unordered - - return $output + return @( + [ToolVersionsListNode]::new("Go", $(Get-ToolcacheGoVersions), '^\d+\.\d+', 'List'), + [ToolVersionsListNode]::new("Node.js", $(Get-ToolcacheNodeVersions), '^\d+', 'List'), + [ToolVersionsListNode]::new("Python", $(Get-ToolcachePythonVersions), '^\d+\.\d+', 'List'), + [ToolVersionsListNode]::new("PyPy", $(Get-ToolcachePyPyVersions), '^\d+\.\d+', 'List'), + [ToolVersionsListNode]::new("Ruby", $(Get-ToolcacheRubyVersions), '^\d+\.\d+', 'List') + ) } diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 index 37bb9df1b9fd..2ccce45b66b5 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 @@ -11,16 +11,22 @@ function Get-OSName { function Get-OSVersion { $OSVersion = (Get-CimInstance -ClassName Win32_OperatingSystem).Version $OSBuild = (Get-ItemProperty -Path 'Registry::HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion' UBR).UBR - return "OS Version: $OSVersion Build $OSBuild" + return "$OSVersion Build $OSBuild" +} + +function Build-OSInfoSection { + $osInfoNode = [HeaderNode]::new($(Get-OSName)) + $osInfoNode.AddToolVersion("OS Version:", $(Get-OSVersion)) + $osInfoNode.AddToolVersion("Image Version:", $env:IMAGE_VERSION) + return $osInfoNode } function Get-BashVersion { $version = bash --% -c 'echo ${BASH_VERSION}' - return "Bash $version" + return $version } function Get-RustVersion { - Initialize-RustEnvironment $rustVersion = [regex]::matches($(rustc --version), "\d+\.\d+\.\d+").Value return $rustVersion } @@ -52,145 +58,144 @@ function Get-RustClippyVersion { } function Get-BindgenVersion { - return bindgen --version + return ((bindgen --version) -replace "^bindgen").Trim() } function Get-CbindgenVersion { - return cbindgen --version + return ((cbindgen --version) -replace "^cbindgen").Trim() } function Get-CargoAuditVersion { - return cargo-audit --version + return ((cargo-audit --version) -replace "^cargo-audit").Trim() } function Get-CargoOutdatedVersion { - return cargo outdated --version + return ((cargo outdated --version) -replace "^cargo-outdated").Trim() } function Get-PythonVersion { - return & python --version + return ((python --version) -replace "^Python").Trim() } function Get-PowershellCoreVersion { - return & pwsh --version + return ((pwsh --version) -replace "^PowerShell").Trim() } function Get-RubyVersion { $rubyVersion = $(ruby --version).split(" ")[1] - return "Ruby $rubyVersion" + return $rubyVersion } function Get-GoVersion { $(go version) -match "go(?<version>\d+\.\d+\.\d+)" | Out-Null $goVersion = $Matches.Version - return "Go $goVersion" + return $goVersion } function Get-KotlinVersion { $kotlinVersion = $((cmd /c "kotlinc -version 2>&1") | Out-String).split(" ")[2] - return "Kotlin $kotlinVersion" + return $kotlinVersion } function Get-PHPVersion { ($(php --version) | Out-String) -match "PHP (?<version>\d+\.\d+\.\d+)" | Out-Null $phpVersion = $Matches.Version - return "PHP $phpVersion" + return $phpVersion } function Get-JuliaVersion { $juliaVersion = [regex]::matches($(julia --version), "\d+\.\d+\.\d+").Value - return "Julia $juliaVersion" + return $juliaVersion } function Get-LLVMVersion { $llvmVersion = [regex]::matches($(clang --version), "\d+\.\d+\.\d+").Value - return "LLVM $llvmVersion" + return $llvmVersion } function Get-PerlVersion { ($(perl --version) | Out-String) -match "\(v(?<version>\d+\.\d+\.\d+)\)" | Out-Null $perlVersion = $Matches.Version - return "Perl $perlVersion" + return $perlVersion } function Get-NodeVersion { $nodeVersion = $(node --version).split("v")[1] - return "Node $nodeVersion" + return $nodeVersion } function Get-ChocoVersion { - return "Chocolatey $(choco --version)" + return $(choco --version) } function Get-VcpkgVersion { $commitId = git -C "C:\vcpkg" rev-parse --short HEAD - return "Vcpkg (build from commit $commitId)" + return "(build from commit $commitId)" } function Get-NPMVersion { - return "NPM $(npm -version)" + return $(npm -version) } function Get-YarnVersion { - return "Yarn $(yarn -version)" + return $(yarn -version) } function Get-RubyGemsVersion { - return "RubyGems $(gem --version)" + return $(gem --version) } function Get-HelmVersion { ($(helm version --short) | Out-String) -match "v(?<version>\d+\.\d+\.\d+)" | Out-Null $helmVersion = $Matches.Version - return "Helm $helmVersion" + return $helmVersion } function Get-PipVersion { ($(pip --version) | Out-String) -match "(?<version>pip [\d\.]+) .+ (?<python>\(python [\d\.]+\))" | Out-Null $pipVersion = $Matches.Version $pythonVersion = $Matches.Python - return "$pipVersion $pythonVersion" + return ("$pipVersion $pythonVersion" -replace "^pip").Trim() } function Get-CondaVersion { - $condaVersion = & "$env:CONDA\Scripts\conda.exe" --version - return "Mini$condaVersion (pre-installed on the image but not added to PATH)" + $condaVersion = ((& "$env:CONDA\Scripts\conda.exe" --version) -replace "^conda").Trim() + return "$condaVersion (pre-installed on the image but not added to PATH)" } function Get-ComposerVersion { - composer --version | Take-Part -Part 0,2 + composer --version | Take-Part -Part 2 } function Get-NugetVersion { - (nuget help) -match "NuGet Version" -replace "Version: " + return (((nuget help) -match "NuGet Version") -replace "NuGet Version:").Trim() } function Get-AntVersion { ($(ant -version) | Out-String) -match "version (?<version>\d+\.\d+\.\d+)" | Out-Null $antVersion = $Matches.Version - return "Ant $antVersion" + return $antVersion } function Get-MavenVersion { ($(mvn -version) | Out-String) -match "Apache Maven (?<version>\d+\.\d+\.\d+)" | Out-Null $mavenVersion = $Matches.Version - return "Maven $mavenVersion" + return $mavenVersion } function Get-GradleVersion { ($(gradle -version) | Out-String) -match "Gradle (?<version>\d+\.\d+)" | Out-Null $gradleVersion = $Matches.Version - return "Gradle $gradleVersion" + return $gradleVersion } function Get-SbtVersion { - $sbtVersion = (sbt -version) -match "sbt script version:" -replace "script version: " - return "$sbtVersion" + return ((sbt -version) -match "sbt script version:" -replace "sbt script version:").Trim() } function Get-DotnetSdks { $sdksRawList = dotnet --list-sdks - $sdkVersions = ($sdksRawList | Foreach-Object {$_.Split()[0]}) -join ', ' + $sdkVersions = $sdksRawList | Foreach-Object {$_.Split()[0]} $sdkPath = $sdksRawList[0].Split(' ', 2)[1] -replace '\[|]' [PSCustomObject]@{ Versions = $sdkVersions @@ -205,7 +210,8 @@ function Get-DotnetTools { $toolsList = @() foreach ($dotnetTool in $dotnetTools) { - $toolsList += $dotnetTool.name + " " + (Invoke-Expression $dotnetTool.getversion) + $version = Invoke-Expression $dotnetTool.getversion + $toolsList += [ToolVersionNode]::new($dotnetTool.name, $version) } return $toolsList } @@ -214,7 +220,7 @@ function Get-DotnetRuntimes { $runtimesRawList = dotnet --list-runtimes $runtimesRawList | Group-Object {$_.Split()[0]} | ForEach-Object { $runtimeName = $_.Name - $runtimeVersions = ($_.Group | Foreach-Object {$_.split()[1]}) -join ', ' + $runtimeVersions = $_.Group | Foreach-Object {$_.split()[1]} $runtimePath = $_.Group[0].Split(' ', 3)[2] -replace '\[|]' [PSCustomObject]@{ "Runtime" = $runtimeName @@ -226,8 +232,7 @@ function Get-DotnetRuntimes { function Get-DotnetFrameworkVersions { $path = "${env:ProgramFiles(x86)}\Microsoft SDKs\Windows\*\*\NETFX * Tools" - $versions = Get-ChildItem -Path $path -Directory | ForEach-Object { $_.Name | Take-Part -Part 1 } - $versions -join ', ' + return Get-ChildItem -Path $path -Directory | ForEach-Object { $_.Name | Take-Part -Part 1 } } function Get-PowerShellAzureModules { @@ -236,32 +241,32 @@ function Get-PowerShellAzureModules { [Array] $azInstalledModules = Get-ChildItem -Path "C:\Modules\az_*" -Directory | ForEach-Object { $_.Name.Split("_")[1] } if ($azInstalledModules.Count -gt 0) { - $result += "Az: $($azInstalledModules -join ', ')" + $result += [ToolVersionsListNode]::new("Az", $($azInstalledModules), '^\d+\.\d+', "Inline") } [Array] $azureInstalledModules = Get-ChildItem -Path "C:\Modules\azure_*" -Directory | ForEach-Object { $_.Name.Split("_")[1] } | ForEach-Object { if ($_ -eq $defaultAzureModuleVersion) { "$($_) (Default)" } else { $_ } } if ($azureInstalledModules.Count -gt 0) { - $result += "Azure: $($azureInstalledModules -join ', ')" + $result += [ToolVersionsListNode]::new("Azure", $($azureInstalledModules), '^\d+\.\d+', "Inline") } [Array] $azurermInstalledModules = Get-ChildItem -Path "C:\Modules\azurerm_*" -Directory | ForEach-Object { $_.Name.Split("_")[1] } | ForEach-Object { if ($_ -eq $defaultAzureModuleVersion) { "$($_) (Default)" } else { $_ } } if ($azurermInstalledModules.Count -gt 0) { - $result += "AzureRM: $($azurermInstalledModules -join ', ')" + $result += [ToolVersionsListNode]::new("AzureRM", $($azurermInstalledModules), '^\d+\.\d+', "Inline") } [Array] $azCachedModules = Get-ChildItem -Path "C:\Modules\az_*.zip" -File | ForEach-Object { $_.Name.Split("_")[1] } if ($azCachedModules.Count -gt 0) { - $result += "Az (Cached): $($azCachedModules -join ', ')" + $result += [ToolVersionsListNode]::new("Az (Cached)", $($azCachedModules), '^\d+\.\d+', "Inline") } [Array] $azureCachedModules = Get-ChildItem -Path "C:\Modules\azure_*.zip" -File | ForEach-Object { $_.Name.Split("_")[1] } if ($azureCachedModules.Count -gt 0) { - $result += "Azure (Cached): $($azureCachedModules -join ', ')" + $result += [ToolVersionsListNode]::new("Azure (Cached)", $($azureCachedModules), '^\d+\.\d+', "Inline") } [Array] $azurermCachedModules = Get-ChildItem -Path "C:\Modules\azurerm_*.zip" -File | ForEach-Object { $_.Name.Split("_")[1] } if ($azurermCachedModules.Count -gt 0) { - $result += "AzureRM: $($azurermCachedModules -join ', ')" + $result += [ToolVersionsListNode]::new("AzureRM (Cached)", $($azurermCachedModules), '^\d+\.\d+', "Inline") } return $result @@ -275,7 +280,7 @@ function Get-PowerShellModules { $result += (Get-ToolsetContent).powershellModules.name | Sort-Object | ForEach-Object { $moduleName = $_ $moduleVersions = Get-Module -Name $moduleName -ListAvailable | Select-Object -ExpandProperty Version | Sort-Object -Unique - return "$($moduleName): $($moduleVersions -join ', ')" + return [ToolVersionsListNode]::new($moduleName, $moduleVersions, '^\d+', "Inline") } return $result @@ -302,14 +307,13 @@ function Get-CachedDockerImagesTableData { } function Get-ShellTarget { - $shells = Get-ChildItem C:\shells -File | Select-Object Name, @{n="Target";e={ + return Get-ChildItem C:\shells -File | Select-Object Name, @{n="Target";e={ if ($_.Name -eq "msys2bash.cmd") { "C:\msys64\usr\bin\bash.exe" } else { @($_.Target)[0] } }} | Sort-Object Name - $shells | New-MDTable -Columns ([ordered]@{Name = "left"; Target = "left";}) } function Get-PacmanVersion { @@ -318,21 +322,21 @@ function Get-PacmanVersion { $rawVersion = & $pacmanPath --version $rawVersion.Split([System.Environment]::NewLine)[1] -match "\d+\.\d+(\.\d+)?" | Out-Null $pacmanVersion = $matches[0] - return "Pacman $pacmanVersion" + return $pacmanVersion } function Get-YAMLLintVersion { - yamllint --version + return ((yamllint --version) -replace "^yamllint").Trim() } function Get-BizTalkVersion { $bizTalkReg = Get-ItemProperty "HKLM:\SOFTWARE\WOW6432Node\Microsoft\BizTalk Server\3.0" - return "$($bizTalkReg.ProductName) $($bizTalkReg.ProductVersion)" + return [ToolVersionNode]::new($bizTalkReg.ProductName, $bizTalkReg.ProductVersion) } function Get-PipxVersion { $pipxVersion = pipx --version - return "Pipx $pipxVersion" + return $pipxVersion } function Build-PackageManagementEnvironmentTable { diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Databases.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Databases.psm1 index 86c58bc178a4..9d5e612bc602 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Databases.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Databases.psm1 @@ -1,13 +1,12 @@ -function Get-PostgreSQLMarkdown +function Get-PostgreSQLTable { - $name = "PostgreSQL" $pgService = Get-CimInstance Win32_Service -Filter "Name LIKE 'postgresql-%'" $pgPath = $pgService.PathName $pgRoot = $pgPath.split('"')[1].replace("\bin\pg_ctl.exe", "") $env:Path += ";${env:PGBIN}" $pgVersion = (postgres --version).split()[2].Trim() - $content = @( + return @( [PSCustomObject]@{ Property = "ServiceName"; Value = $pgService.Name }, [PSCustomObject]@{ Property = "Version"; Value = $pgVersion }, [PSCustomObject]@{ Property = "ServiceStatus"; Value = $pgService.State }, @@ -16,29 +15,18 @@ function Get-PostgreSQLMarkdown [PSCustomObject]@{ Property = "Path"; Value = $pgRoot }, [PSCustomObject]@{ Property = "UserName"; Value = $env:PGUSER }, [PSCustomObject]@{ Property = "Password"; Value = $env:PGPASSWORD } - ) | New-MDTable - - Build-MarkdownElement -Head $name -Content $content + ) } -function Get-MongoDBMarkdown +function Get-MongoDBTable { $name = "MongoDB" $mongoService = Get-Service -Name $name $mongoVersion = (Get-Command -Name 'mongo').Version.ToString() - $content = [PSCustomObject]@{ + return [PSCustomObject]@{ Version = $mongoVersion ServiceName = $name ServiceStatus = $mongoService.Status ServiceStartType = $mongoService.StartType - } | New-MDTable - Build-MarkdownElement -Head $name -Content $content + } } - -function Build-DatabasesMarkdown -{ - $markdown = "" - $markdown += Get-PostgreSQLMarkdown - $markdown += Get-MongoDBMarkdown - $markdown -} \ No newline at end of file diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index 806323d9e676..a89db9cf3596 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -1,9 +1,11 @@ +using module ./software-report-base/SoftwareReport.psm1 +using module ./software-report-base/SoftwareReport.Nodes.psm1 + $global:ErrorActionPreference = "Stop" $global:ProgressPreference = "SilentlyContinue" $ErrorView = "NormalView" Set-StrictMode -Version Latest -Import-Module MarkdownPS Import-Module (Join-Path $PSScriptRoot "SoftwareReport.Android.psm1") -DisableNameChecking Import-Module (Join-Path $PSScriptRoot "SoftwareReport.Browsers.psm1") -DisableNameChecking Import-Module (Join-Path $PSScriptRoot "SoftwareReport.CachedTools.psm1") -DisableNameChecking @@ -15,279 +17,222 @@ Import-Module (Join-Path $PSScriptRoot "SoftwareReport.Java.psm1") -DisableNameC Import-Module (Join-Path $PSScriptRoot "SoftwareReport.WebServers.psm1") -DisableNameChecking Import-Module (Join-Path $PSScriptRoot "SoftwareReport.VisualStudio.psm1") -DisableNameChecking -$markdown = "" - -$OSName = Get-OSName -$markdown += New-MDHeader "$OSName" -Level 1 - -$OSVersion = Get-OSVersion -$markdown += New-MDList -Style Unordered -Lines @( - "$OSVersion" - "Image Version: $env:IMAGE_VERSION" -) - -$markdown += New-MDHeader "Windows features" -Level 2 -$markdown += New-MDList -Style Unordered -Lines @( - "Windows Subsystem for Linux (WSLv1): Enabled" -) - -$markdown += New-MDHeader "Installed Software" -Level 2 -$markdown += New-MDHeader "Language and Runtime" -Level 3 -$languageTools = @( - (Get-BashVersion), - (Get-GoVersion), - (Get-JuliaVersion), - (Get-LLVMVersion), - (Get-NodeVersion), - (Get-PerlVersion) - (Get-PHPVersion), - (Get-PythonVersion), - (Get-RubyVersion), - (Get-KotlinVersion) -) -$markdown += New-MDList -Style Unordered -Lines ($languageTools | Sort-Object) - -$packageManagementList = @( - (Get-ChocoVersion), - (Get-CondaVersion), - (Get-ComposerVersion), - (Get-HelmVersion), - (Get-NPMVersion), - (Get-NugetVersion), - (Get-PipxVersion), - (Get-PipVersion), - (Get-RubyGemsVersion), - (Get-VcpkgVersion), - (Get-YarnVersion) -) - -$markdown += New-MDHeader "Package Management" -Level 3 -$markdown += New-MDList -Style Unordered -Lines ($packageManagementList | Sort-Object) - -$markdown += New-MDHeader "Environment variables" -Level 4 -$markdown += Build-PackageManagementEnvironmentTable | New-MDTable -$markdown += New-MDNewLine - -$markdown += New-MDHeader "Project Management" -Level 3 -$projectManagementTools = @( - (Get-AntVersion), - (Get-GradleVersion), - (Get-MavenVersion), - (Get-SbtVersion) -) - -$markdown += New-MDList -Style Unordered -Lines ($projectManagementTools | Sort-Object) - -$markdown += New-MDHeader "Tools" -Level 3 -$toolsList = @( - (Get-7zipVersion), - (Get-Aria2Version), - (Get-AzCopyVersion), - (Get-BazelVersion), - (Get-BazeliskVersion), - (Get-BicepVersion), - (Get-CabalVersion), - (Get-CMakeVersion), - (Get-CodeQLBundleVersion), - (Get-DockerVersion), - (Get-DockerComposeVersion), - (Get-DockerComposeVersionV2), - (Get-DockerWincredVersion), - (Get-GHCVersion), - (Get-GitVersion), - (Get-GitLFSVersion), - (Get-InnoSetupVersion), - (Get-JQVersion), - (Get-KindVersion), - (Get-KubectlVersion), - (Get-MercurialVersion), - (Get-MinGWVersion), - (Get-NewmanVersion), - (Get-NSISVersion), - (Get-OpenSSLVersion), - (Get-PackerVersion), - (Get-PulumiVersion), - (Get-RVersion), - (Get-ServiceFabricSDKVersion), - (Get-StackVersion), - (Get-SVNVersion), - (Get-VSWhereVersion), - (Get-SwigVersion), - (Get-WinAppDriver), - (Get-WixVersion), - (Get-ZstdVersion), - (Get-YAMLLintVersion), - (Get-ImageMagickVersion) -) +# Software report +$softwareReport = [SoftwareReport]::new($(Build-OSInfoSection)) +$optionalFeatures = $softwareReport.Root.AddHeader("Windows features") +$optionalFeatures.AddToolVersion("Windows Subsystem for Linux (WSLv1):", "Enabled") +$installedSoftware = $softwareReport.Root.AddHeader("Installed Software") + +# Language and Runtime +$languageAndRuntime = $installedSoftware.AddHeader("Language and Runtime") +$languageAndRuntime.AddToolVersion("Bash", $(Get-BashVersion)) +$languageAndRuntime.AddToolVersion("Go", $(Get-GoVersion)) +$languageAndRuntime.AddToolVersion("Julia", $(Get-JuliaVersion)) +$languageAndRuntime.AddToolVersion("Kotlin", $(Get-KotlinVersion)) +$languageAndRuntime.AddToolVersion("LLVM", $(Get-LLVMVersion)) +$languageAndRuntime.AddToolVersion("Node", $(Get-NodeVersion)) +$languageAndRuntime.AddToolVersion("Perl", $(Get-PerlVersion)) +$languageAndRuntime.AddToolVersion("PHP", $(Get-PHPVersion)) +$languageAndRuntime.AddToolVersion("Python", $(Get-PythonVersion)) +$languageAndRuntime.AddToolVersion("Ruby", $(Get-RubyVersion)) + +# Package Management +$packageManagement = $installedSoftware.AddHeader("Package Management") +$packageManagement.AddToolVersion("Chocolatey", $(Get-ChocoVersion)) +$packageManagement.AddToolVersion("Composer", $(Get-ComposerVersion)) +$packageManagement.AddToolVersion("Helm", $(Get-HelmVersion)) +$packageManagement.AddToolVersion("Miniconda", $(Get-CondaVersion)) +$packageManagement.AddToolVersion("NPM", $(Get-NPMVersion)) +$packageManagement.AddToolVersion("NuGet", $(Get-NugetVersion)) +$packageManagement.AddToolVersion("pip", $(Get-PipVersion)) +$packageManagement.AddToolVersion("Pipx", $(Get-PipxVersion)) +$packageManagement.AddToolVersion("RubyGems", $(Get-RubyGemsVersion)) +$packageManagement.AddToolVersion("Vcpkg", $(Get-VcpkgVersion)) +$packageManagement.AddToolVersion("Yarn", $(Get-YarnVersion)) + +$packageManagement.AddHeader("Environment variables").AddTable($(Build-PackageManagementEnvironmentTable)) + +# Project Management +$projectManagement = $installedSoftware.AddHeader("Project Management") +$projectManagement.AddToolVersion("Ant", $(Get-AntVersion)) +$projectManagement.AddToolVersion("Gradle", $(Get-GradleVersion)) +$projectManagement.AddToolVersion("Maven", $(Get-MavenVersion)) +$projectManagement.AddToolVersion("sbt", $(Get-SbtVersion)) + +# Tools +$tools = $installedSoftware.AddHeader("Tools") +$tools.AddToolVersion("7zip", $(Get-7zipVersion)) +$tools.AddToolVersion("aria2", $(Get-Aria2Version)) +$tools.AddToolVersion("azcopy", $(Get-AzCopyVersion)) +$tools.AddToolVersion("Bazel", $(Get-BazelVersion)) +$tools.AddToolVersion("Bazelisk", $(Get-BazeliskVersion)) +$tools.AddToolVersion("Bicep", $(Get-BicepVersion)) +$tools.AddToolVersion("Cabal", $(Get-CabalVersion)) +$tools.AddToolVersion("CMake", $(Get-CMakeVersion)) +$tools.AddToolVersion("CodeQL Action Bundle", $(Get-CodeQLBundleVersion)) +$tools.AddToolVersion("Docker", $(Get-DockerVersion)) +$tools.AddToolVersion("Docker Compose v1", $(Get-DockerComposeVersion)) +$tools.AddToolVersion("Docker Compose v2", $(Get-DockerComposeVersionV2)) +$tools.AddToolVersion("Docker-wincred", $(Get-DockerWincredVersion)) +$tools.AddToolVersion("ghc", $(Get-GHCVersion)) +$tools.AddToolVersion("Git", $(Get-GitVersion)) +$tools.AddToolVersion("Git LFS", $(Get-GitLFSVersion)) +if (Test-IsWin19) { + $tools.AddToolVersion("Google Cloud SDK", $(Get-GoogleCloudSDKVersion)) +} +$tools.AddToolVersion("ImageMagick", $(Get-ImageMagickVersion)) +$tools.AddToolVersion("InnoSetup", $(Get-InnoSetupVersion)) +$tools.AddToolVersion("jq", $(Get-JQVersion)) +$tools.AddToolVersion("Kind", $(Get-KindVersion)) +$tools.AddToolVersion("Kubectl", $(Get-KubectlVersion)) +$tools.AddToolVersion("Mercurial", $(Get-MercurialVersion)) +$tools.AddToolVersion("Mingw-w64", $(Get-MinGWVersion)) +$tools.AddToolVersion("Newman", $(Get-NewmanVersion)) +$tools.AddToolVersion("NSIS", $(Get-NSISVersion)) +$tools.AddToolVersion("OpenSSL", $(Get-OpenSSLVersion)) +$tools.AddToolVersion("Packer", $(Get-PackerVersion)) if (Test-IsWin19) { - $toolsList += @( - (Get-GoogleCloudSDKVersion), - (Get-ParcelVersion) - ) + $tools.AddToolVersion("Parcel", $(Get-ParcelVersion)) } -$markdown += New-MDList -Style Unordered -Lines ($toolsList | Sort-Object) - -$markdown += New-MDHeader "CLI Tools" -Level 3 -$cliTools = @( - (Get-AlibabaCLIVersion), - (Get-AWSCLIVersion), - (Get-AWSSAMVersion), - (Get-AWSSessionManagerVersion), - (Get-AzureCLIVersion), - (Get-AzureDevopsExtVersion), - (Get-GHVersion), - (Get-HubVersion) -) +$tools.AddToolVersion("Pulumi", $(Get-PulumiVersion)) +$tools.AddToolVersion("R", $(Get-RVersion)) +$tools.AddToolVersion("Service Fabric SDK", $(Get-ServiceFabricSDKVersion)) +$tools.AddToolVersion("Stack", $(Get-StackVersion)) +$tools.AddToolVersion("Subversion (SVN)", $(Get-SVNVersion)) +$tools.AddToolVersion("Swig", $(Get-SwigVersion)) +$tools.AddToolVersion("VSWhere", $(Get-VSWhereVersion)) +$tools.AddToolVersion("WinAppDriver", $(Get-WinAppDriver)) +$tools.AddToolVersion("WiX Toolset", $(Get-WixVersion)) +$tools.AddToolVersion("yamllint", $(Get-YAMLLintVersion)) +$tools.AddToolVersion("zstd", $(Get-ZstdVersion)) + +# CLI Tools +$cliTools = $installedSoftware.AddHeader("CLI Tools") +$cliTools.AddToolVersion("Alibaba Cloud CLI", $(Get-AlibabaCLIVersion)) +$cliTools.AddToolVersion("AWS CLI", $(Get-AWSCLIVersion)) +$cliTools.AddToolVersion("AWS SAM CLI", $(Get-AWSSAMVersion)) +$cliTools.AddToolVersion("AWS Session Manager CLI", $(Get-AWSSessionManagerVersion)) +$cliTools.AddToolVersion("Azure CLI", $(Get-AzureCLIVersion)) +$cliTools.AddToolVersion("Azure DevOps CLI extension", $(Get-AzureDevopsExtVersion)) if (Test-IsWin19) { - $cliTools += @( - (Get-CloudFoundryVersion) - ) + $cliTools.AddToolVersion("Cloud Foundry CLI", $(Get-CloudFoundryVersion)) } -$markdown += New-MDList -Style Unordered -Lines ($cliTools | Sort-Object) - -$markdown += New-MDHeader "Rust Tools" -Level 3 -$markdown += New-MDList -Style Unordered -Lines (@( - "Rust $(Get-RustVersion)", - "Rustup $(Get-RustupVersion)", - "Cargo $(Get-RustCargoVersion)", - "Rustdoc $(Get-RustdocVersion)" - ) | Sort-Object -) - -$markdown += New-MDHeader "Packages" -Level 4 -$markdown += New-MDList -Style Unordered -Lines (@( - (Get-BindgenVersion), - (Get-CargoAuditVersion), - (Get-CargoOutdatedVersion), - (Get-CbindgenVersion), - "Rustfmt $(Get-RustfmtVersion)", - "Clippy $(Get-RustClippyVersion)" - ) | Sort-Object -) - -$markdown += New-MDHeader "Browsers and Drivers" -Level 3 -$markdown += New-MDList -Style Unordered -Lines @( - (Get-BrowserVersion -Browser "chrome"), - (Get-SeleniumWebDriverVersion -Driver "chrome"), - (Get-BrowserVersion -Browser "edge"), - (Get-SeleniumWebDriverVersion -Driver "edge"), - (Get-BrowserVersion -Browser "firefox"), - (Get-SeleniumWebDriverVersion -Driver "firefox"), - (Get-SeleniumWebDriverVersion -Driver "iexplorer"), - (Get-SeleniumVersion) -) - -$markdown += New-MDHeader "Environment variables" -Level 4 -$markdown += Build-BrowserWebdriversEnvironmentTable | New-MDTable -$markdown += New-MDNewLine - -$markdown += New-MDHeader "Java" -Level 3 -$markdown += Get-JavaVersions | New-MDTable -$markdown += New-MDNewLine - -$markdown += New-MDHeader "Shells" -Level 3 -$markdown += Get-ShellTarget -$markdown += New-MDNewLine - -$markdown += New-MDHeader "MSYS2" -Level 3 -$markdown += "$(Get-PacmanVersion)" | New-MDList -Style Unordered -$markdown += New-MDHeader "Notes:" -Level 5 -$reportMsys64 = @' -``` +$cliTools.AddToolVersion("GitHub CLI", $(Get-GHVersion)) +$cliTools.AddToolVersion("Hub CLI", $(Get-HubVersion)) + +# Rust Tools +Initialize-RustEnvironment +$rustTools = $installedSoftware.AddHeader("Rust Tools") +$rustTools.AddToolVersion("Cargo", $(Get-RustCargoVersion)) +$rustTools.AddToolVersion("Rust", $(Get-RustVersion)) +$rustTools.AddToolVersion("Rustdoc", $(Get-RustdocVersion)) +$rustTools.AddToolVersion("Rustup", $(Get-RustupVersion)) + +$rustToolsPackages = $rustTools.AddHeader("Packages") +$rustToolsPackages.AddToolVersion("bindgen", $(Get-BindgenVersion)) +$rustToolsPackages.AddToolVersion("cargo-audit", $(Get-CargoAuditVersion)) +$rustToolsPackages.AddToolVersion("cargo-outdated", $(Get-CargoOutdatedVersion)) +$rustToolsPackages.AddToolVersion("cbindgen", $(Get-CbindgenVersion)) +$rustToolsPackages.AddToolVersion("Clippy", $(Get-RustClippyVersion)) +$rustToolsPackages.AddToolVersion("Rustfmt", $(Get-RustfmtVersion)) + +# Browsers and Drivers +$browsersAndWebdrivers = $installedSoftware.AddHeader("Browsers and Drivers") +$browsersAndWebdrivers.AddNodes($(Build-BrowserSection)) +$browsersAndWebdrivers.AddHeader("Environment variables").AddTable($(Build-BrowserWebdriversEnvironmentTable)) + +# Java +$installedSoftware.AddHeader("Java").AddTable($(Get-JavaVersions)) + +# Shells +$installedSoftware.AddHeader("Shells").AddTable($(Get-ShellTarget)) + +# MSYS2 +$msys2 = $installedSoftware.AddHeader("MSYS2") +$msys2.AddToolVersion("Pacman", $(Get-PacmanVersion)) + +$notes = @' Location: C:\msys64 Note: MSYS2 is pre-installed on image but not added to PATH. -``` '@ -$markdown += New-MDParagraph -Lines $reportMsys64 +$msys2.AddHeader("Notes").AddNote($notes) +# BizTalk Server if (Test-IsWin19) { - $markdown += New-MDHeader "BizTalk Server" -Level 3 - $markdown += "$(Get-BizTalkVersion)" | New-MDList -Style Unordered + $installedSoftware.AddHeader("BizTalk Server").AddNode($(Get-BizTalkVersion)) } -$markdown += New-MDHeader "Cached Tools" -Level 3 -$markdown += (Build-CachedToolsSection) - -$markdown += New-MDHeader "Databases" -Level 3 -$markdown += Build-DatabasesMarkdown - -$markdown += New-MDHeader "Database tools" -Level 3 -$databaseTools = @( - (Get-AzCosmosDBEmulatorVersion), - (Get-DacFxVersion), - (Get-MySQLVersion), - (Get-SQLPSVersion), - (Get-SQLOLEDBDriverVersion) -) - -$markdown += New-MDList -Style Unordered -Lines ($databaseTools | Sort-Object) - -$markdown += Build-WebServersSection - -$vs = Get-VisualStudioVersion -$markdown += New-MDHeader "$($vs.Name)" -Level 3 -$markdown += $vs | New-MDTable -$markdown += New-MDNewLine - -$markdown += New-MDHeader "Workloads, components and extensions:" -Level 4 -$markdown += ((Get-VisualStudioComponents) + (Get-VisualStudioExtensions)) | New-MDTable -$markdown += New-MDNewLine - -$markdown += New-MDHeader "Microsoft Visual C++:" -Level 4 -$markdown += Get-VisualCPPComponents | New-MDTable -$markdown += New-MDNewLine - -$markdown += New-MDHeader "Installed Windows SDKs" -Level 4 -$sdk = Get-WindowsSDKs -$markdown += New-MDNewLine -$markdown += New-MDList -Lines $sdk.Versions -Style Unordered - -$markdown += New-MDHeader ".NET Core Tools" -Level 3 -$dotnetSdk = Get-DotnetSdks -$dotnetFrameworkVersions = Get-DotnetFrameworkVersions -$dotnetTools = @( - ".NET Core SDK: $($dotnetSdk.Versions)", - ".NET Framework: $($dotnetFrameworkVersions)" -) -$dotnetTools += Get-DotnetRuntimes | ForEach-Object { - "$($_.Runtime): $($_.Versions)" -} -$dotnetTools += Get-DotnetTools -$markdown += New-MDList -Style Unordered -Lines $dotnetTools +# Cached Tools +$installedSoftware.AddHeader("Cached Tools").AddNodes($(Build-CachedToolsSection)) + +# Databases +$databases = $installedSoftware.AddHeader("Databases") +$databases.AddHeader("PostgreSQL").AddTable($(Get-PostgreSQLTable)) +$databases.AddHeader("MongoDB").AddTable($(Get-MongoDBTable)) + +# Database tools +$databaseTools = $installedSoftware.AddHeader("Database tools") +$databaseTools.AddToolVersion("Azure CosmosDb Emulator", $(Get-AzCosmosDBEmulatorVersion)) +$databaseTools.AddToolVersion("DacFx", $(Get-DacFxVersion)) +$databaseTools.AddToolVersion("MySQL", $(Get-MySQLVersion)) +$databaseTools.AddToolVersion("SQL OLEDB Driver", $(Get-SQLOLEDBDriverVersion)) +$databaseTools.AddToolVersion("SQLPS", $(Get-SQLPSVersion)) + +# Web Servers +$installedSoftware.AddHeader("Web Servers").AddTable($(Build-WebServersSection)) + +# Visual Studio +$vsTable = Get-VisualStudioVersion +$visualStudio = $installedSoftware.AddHeader($vsTable.Name) +$visualStudio.AddTable($vsTable) + +$workloads = $visualStudio.AddHeader("Workloads, components and extensions") +$workloads.AddTable((Get-VisualStudioComponents) + (Get-VisualStudioExtensions)) + +$msVisualCpp = $visualStudio.AddHeader("Microsoft Visual C++") +$msVisualCpp.AddTable($(Get-VisualCPPComponents)) +$visualStudio.AddToolVersionsList("Installed Windows SDKs", $(Get-WindowsSDKs).Versions, '^.+') + +# .NET Core Tools +$netCoreTools = $installedSoftware.AddHeader(".NET Core Tools") +if (Test-IsWin19) { + # Visual Studio 2019 brings own version of .NET Core which is different from latest official version + $netCoreTools.AddToolVersionsListInline(".NET Core SDK", $(Get-DotnetSdks).Versions, '^\d+\.\d+\.\d{2}') +} else { + $netCoreTools.AddToolVersionsListInline(".NET Core SDK", $(Get-DotnetSdks).Versions, '^\d+\.\d+\.\d') +} +$netCoreTools.AddToolVersionsListInline(".NET Framework", $(Get-DotnetFrameworkVersions), '^.+') +Get-DotnetRuntimes | ForEach-Object { + $netCoreTools.AddToolVersionsListInline($_.Runtime, $_.Versions, '^.+') +} +$netCoreTools.AddNodes($(Get-DotnetTools)) # PowerShell Tools -$markdown += New-MDHeader "PowerShell Tools" -Level 3 -$markdown += New-MDList -Lines (Get-PowershellCoreVersion) -Style Unordered +$psTools = $installedSoftware.AddHeader("PowerShell Tools") +$psTools.AddToolVersion("PowerShell", $(Get-PowershellCoreVersion)) + +$psModules = $psTools.AddHeader("Powershell Modules") +$psModules.AddNodes($(Get-PowerShellModules)) -$markdown += New-MDHeader "Powershell Modules" -Level 4 -$markdown += New-MDList -Lines $(Get-PowerShellModules) -Style Unordered -$reportAzPwsh = @' -``` +$azPsNotes = @' 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. -``` '@ -$markdown += New-MDParagraph -Lines $reportAzPwsh - - -# Android section -$markdown += New-MDHeader "Android" -Level 3 -$markdown += Build-AndroidTable | New-MDTable -$markdown += New-MDNewLine -$markdown += New-MDHeader "Environment variables" -Level 4 -$markdown += Build-AndroidEnvironmentTable | New-MDTable -$markdown += New-MDNewLine - -# Docker images section -$cachedImages = Get-CachedDockerImagesTableData -if ($cachedImages) { - $markdown += New-MDHeader "Cached Docker images" -Level 3 - $markdown += $cachedImages | New-MDTable -} +$psModules.AddNote($azPsNotes) + +# Android +$android = $installedSoftware.AddHeader("Android") +$android.AddTable($(Build-AndroidTable)) + +$android.AddHeader("Environment variables").AddTable($(Build-AndroidEnvironmentTable)) + +# Cached Docker images +$installedSoftware.AddHeader("Cached Docker images").AddTable($(Get-CachedDockerImagesTableData)) -Test-BlankElement -Markdown $markdown -$markdown | Out-File -FilePath "C:\InstalledSoftware.md" +# Generate reports +$softwareReport.ToJson() | Out-File -FilePath "C:\software-report.json" -Encoding UTF8NoBOM +$softwareReport.ToMarkdown() | Out-File -FilePath "C:\software-report.md" -Encoding UTF8NoBOM diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Helpers.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Helpers.psm1 index 0e366bd14fcb..7166911e8ce8 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Helpers.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Helpers.psm1 @@ -1,101 +1,3 @@ -function Build-MarkdownElement -{ - <# - .SYNOPSIS - Build markdown element for cached tool. - - .DESCRIPTION - Build markdown element that contains name of tool, set of versions and additional notes. - - .PARAMETER Head - Header of cached tool markdown element - - .PARAMETER Content - Array of lines that contains required information about installed tool instances. - #> - - param - ( - [String] $Head, - [Object[]] $Content - ) - - $markdown = New-MDHeader $Head -Level 4 - $markdown += New-MDParagraph -Lines $Content -NoNewLine - - return $markdown -} - -function Get-CachedToolInstances -{ - <# - .SYNOPSIS - Returns hastable of installed cached tools. - - .DESCRIPTION - Return hastable that contains versions and architectures for selected cached tool. - - .PARAMETER Name - Name of cached tool. - - .PARAMETER VersionCommand - Optional parameter. Command to return version of system default tool. - - .EXAMPLE - Get-CachedToolInstances -Name "Python" -VersionCommand "--version" - - #> - - param - ( - [String] $Name, - [String] $VersionCommand - ) - - $toolInstances = @() - $toolPath = Join-Path -Path $env:AGENT_TOOLSDIRECTORY -ChildPath $Name - - # Get all installed versions from TOOLSDIRECTORY folder - $versions = Get-ChildItem $toolPath | Sort-Object { [System.Version]$_.Name } - foreach ($version in $versions) - { - $instanceInfo = @{} - - # Create instance hashtable - [string]$instanceInfo.Path = Join-Path -Path $toolPath -ChildPath $version.Name - [string]$instanceInfo.Version = $version.Name - - # Get all architectures for current version - [array]$instanceInfo.Architecture_Array = Get-ChildItem $version.FullName -Name -Directory | Where-Object { $_ -match "^x[0-9]{2}$" } - [string]$instanceInfo.Architecture = $instanceInfo.Architecture_Array -Join ", " - - # Add (default) postfix to version name, in case if current version is in environment path - if (-not ([string]::IsNullOrEmpty($VersionCommand))) - { - $defaultVersion = $(& ($Name.ToLower()) $VersionCommand 2>&1) - $defaultToolVersion = $defaultVersion | Select-String -Pattern "\d+\.\d+\.\d+" -AllMatches ` - | ForEach-Object { $_.Matches.Value } - - if ([version]$version.Name -eq [version]$defaultToolVersion) - { - $instanceInfo.Version += " (Default)" - } - } - - $toolInstances += $instanceInfo - } - - return $toolInstances -} - -function New-MDNewLine { - param ( - [int] $Count = 1 - ) - $newLineSymbol = [System.Environment]::NewLine - return $newLineSymbol * $Count -} - function Get-LinkTarget { param ( [string] $inputPath @@ -115,53 +17,6 @@ function Get-PathWithLink { return "${inputPath}${link}" } -function Test-BlankElement { - param( - [string] $Markdown - ) - - $splitByLines = $Markdown.Split("`n") - # Validate entry without version - $blankVersions = $splitByLines -match "^-" -notmatch "(OS|Image) Version|WSL|Vcpkg|Docker|\d\." | Out-String - - # Validate tables with blank rows - $blankRows = "" - for($i = 0; $i -lt $splitByLines.Length; $i++) { - $addRows= $false - $table = @() - if ($splitByLines[$i].StartsWith("#") -and $splitByLines[$i+1].StartsWith("|")) { - $table += $splitByLines[$i,($i+1),($i+2)] - $i += 3 - $current = $splitByLines[$i] - while ($current.StartsWith("|")) { - $isBlankRow = $current.Substring(1, $current.LastIndexOf("|") - 2).Split("|").Trim() -contains "" - if ($isBlankRow) { - $table += $current - $addRows = $true - } - $current = $splitByLines[++$i] - } - if ($addRows) { - $blankRows += $table | Out-String - } - } - } - - # Display report - $isReport = $false - if ($blankVersions) { - Write-Host "Software list with blank version:`n${blankVersions}" - $isReport = $true - } - if ($blankRows) { - Write-Host "Tables with blank rows:`n${blankRows}" - $isReport = $true - } - if ($isReport) { - exit 1 - } -} - function Take-Part { param ( [Parameter(ValueFromPipeline)] diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 index 1267428de232..df5c5f6ccf5d 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 @@ -1,7 +1,7 @@ function Get-Aria2Version { (aria2c -v | Out-String) -match "(?<version>(\d+\.){1,}\d+)" | Out-Null $aria2Version = $Matches.Version - return "aria2 $aria2Version" + return $aria2Version } function Get-AzCosmosDBEmulatorVersion { @@ -9,37 +9,37 @@ function Get-AzCosmosDBEmulatorVersion { $installDir = $regKey.InstallLocation $exeFilePath = Join-Path $installDir 'CosmosDB.Emulator.exe' $version = (Get-Item $exeFilePath).VersionInfo.FileVersion - return "Azure CosmosDb Emulator $version" + return $version } function Get-BazelVersion { ((cmd /c "bazel --version 2>&1") | Out-String) -match "bazel (?<version>\d+\.\d+\.\d+)" | Out-Null $bazelVersion = $Matches.Version - return "Bazel $bazelVersion" + return $bazelVersion } function Get-BazeliskVersion { ((cmd /c "bazelisk version 2>&1") | Out-String) -match "Bazelisk version: v(?<version>\d+\.\d+\.\d+)" | Out-Null $bazeliskVersion = $Matches.Version - return "Bazelisk $bazeliskVersion" + return $bazeliskVersion } function Get-BicepVersion { (bicep --version | Out-String) -match "bicep cli version (?<version>\d+\.\d+\.\d+)" | Out-Null $bicepVersion = $Matches.Version - return "Bicep $bicepVersion" + return $bicepVersion } function Get-RVersion { ($(cmd /c "Rscript --version 2>&1") | Out-String) -match "Rscript .* version (?<version>\d+\.\d+\.\d+)" | Out-Null $rVersion = $Matches.Version - return "R $rVersion" + return $rVersion } function Get-CMakeVersion { ($(cmake -version) | Out-String) -match "cmake version (?<version>\d+\.\d+\.\d+)" | Out-Null $cmakeVersion = $Matches.Version - return "CMake $cmakeVersion" + return $cmakeVersion } function Get-CodeQLBundleVersion { @@ -47,99 +47,100 @@ function Get-CodeQLBundleVersion { $CodeQLVersionPath = Get-ChildItem $CodeQLVersionsWildcard | Select-Object -First 1 -Expand FullName $CodeQLPath = Join-Path $CodeQLVersionPath -ChildPath "x64" | Join-Path -ChildPath "codeql" | Join-Path -ChildPath "codeql.exe" $CodeQLVersion = & $CodeQLPath version --quiet - return "CodeQL Action Bundle $CodeQLVersion" + return $CodeQLVersion } function Get-DockerVersion { $dockerVersion = $(docker version --format "{{.Server.Version}}") - return "Docker $dockerVersion" + return $dockerVersion } function Get-DockerComposeVersion { $dockerComposeVersion = docker-compose version --short - return "Docker Compose v1 $dockerComposeVersion" + return $dockerComposeVersion } function Get-DockerComposeVersionV2 { $dockerComposeVersion = docker compose version --short - return "Docker Compose v2 $dockerComposeVersion" + return $dockerComposeVersion } function Get-DockerWincredVersion { $dockerCredVersion = docker-credential-wincred version | Take-Part -Part 2 | Take-Part -Part 0 -Delimiter "v" - return "Docker-wincred $dockerCredVersion" + return $dockerCredVersion } function Get-GitVersion { $gitVersion = git --version | Take-Part -Part -1 - return "Git $gitVersion" + return $gitVersion } function Get-GitLFSVersion { $(git-lfs version) -match "git-lfs\/(?<version>\d+\.\d+\.\d+)" | Out-Null $gitLfsVersion = $Matches.Version - return "Git LFS $gitLfsVersion" + return $gitLfsVersion } function Get-InnoSetupVersion { - return $(choco list --local-only innosetup) | Select-String -Pattern "InnoSetup" + $innoSetupVersion = $(choco list --local-only innosetup) | Select-String -Pattern "InnoSetup" + return ($innoSetupVersion -replace "^InnoSetup").Trim() } function Get-JQVersion { $jqVersion = ($(jq --version) -Split "jq-")[1] - return "jq $jqVersion" + return $jqVersion } function Get-KubectlVersion { $kubectlVersion = (kubectl version --client --output=json | ConvertFrom-Json).clientVersion.gitVersion.Replace('v','') - return "Kubectl $kubectlVersion" + return $kubectlVersion } function Get-KindVersion { $(kind version) -match "kind v(?<version>\d+\.\d+\.\d+)" | Out-Null $kindVersion = $Matches.Version - return "Kind $kindVersion" + return $kindVersion } function Get-MinGWVersion { (gcc --version | Select-String -Pattern "MinGW-W64") -match "(?<version>\d+\.\d+\.\d+)" | Out-Null $mingwVersion = $Matches.Version - return "Mingw-w64 $mingwVersion" + return $mingwVersion } function Get-MySQLVersion { $mysqlCommand = Get-Command -Name "mysql" $mysqlVersion = $mysqlCommand.Version.ToString() - return "MySQL $mysqlVersion" + return $mysqlVersion } function Get-SQLOLEDBDriverVersion { $SQLOLEDBDriverVersion = (Get-ItemProperty -Path 'Registry::HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MSOLEDBSQL' InstalledVersion).InstalledVersion - return "SQL OLEDB Driver $SQLOLEDBDriverVersion" + return $SQLOLEDBDriverVersion } function Get-MercurialVersion { ($(hg --version) | Out-String) -match "version (?<version>\d+\.\d+\.?\d*)" | Out-Null $mercurialVersion = $Matches.Version - return "Mercurial $mercurialVersion" + return $mercurialVersion } function Get-NSISVersion { $nsisVersion = &"c:\Program Files (x86)\NSIS\makensis.exe" "/Version" - return "NSIS $($nsisVersion.TrimStart('v'))" + return $nsisVersion.TrimStart("v") } function Get-OpenSSLVersion { $(openssl version) -match "OpenSSL (?<version>\d+\.\d+\.\d+\w?) " | Out-Null $opensslVersion = $Matches.Version - return "OpenSSL $opensslVersion" + return $opensslVersion } function Get-PackerVersion { # Packer 1.7.1 has a bug and outputs version to stderr instead of stdout https://github.com/hashicorp/packer/issues/10855 ($(cmd /c "packer --version 2>&1") | Out-String) -match "(?<version>(\d+.){2}\d+)" | Out-Null $packerVersion = $Matches.Version - return "Packer $packerVersion" + return $packerVersion } function Get-ParcelVersion { @@ -148,133 +149,133 @@ function Get-ParcelVersion { } function Get-PulumiVersion { - $pulumiVersion = $(pulumi version) - return "Pulumi $($pulumiVersion.TrimStart('v'))" + return (pulumi version).TrimStart("v") } function Get-SQLPSVersion { $module = Get-Module -Name SQLPS -ListAvailable $version = $module.Version - return "SQLPS $version" + return $version } function Get-SVNVersion { $svnVersion = $(svn --version --quiet) - return "Subversion (SVN) $svnVersion" + return $svnVersion } function Get-VSWhereVersion { ($(Get-Command -Name vswhere).FileVersionInfo.ProductVersion) -match "(?<version>\d+\.\d+\.\d+)" | Out-Null $vswhereVersion = $Matches.Version - return "VSWhere $vswhereVersion" + return $vswhereVersion } function Get-WinAppDriver { $winAppDriverVersion = [System.Diagnostics.FileVersionInfo]::GetVersionInfo("C:\Program Files (x86)\Windows Application Driver\WinAppDriver.exe").FileVersion - return "WinAppDriver $winAppDriverVersion" + return $winAppDriverVersion } function Get-WixVersion { $regKey = "HKLM:\Software\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall\*" $installedApplications = Get-ItemProperty -Path $regKey - return ($installedApplications | Where-Object { $_.BundleCachePath -imatch ".*\\WiX\d*\.exe$" } | Select-Object -First 1).DisplayName + $wixToolsetVersion = ($installedApplications | Where-Object { $_.BundleCachePath -imatch ".*\\WiX\d*\.exe$" } | Select-Object -First 1).DisplayName + return ($wixToolsetVersion -replace "^WiX Toolset v").Trim() } function Get-ZstdVersion { $(zstd --version) -match "v(?<version>\d+\.\d+\.\d+)" | Out-Null $zstdVersion = $Matches.Version - return "zstd $zstdVersion" + return $zstdVersion } function Get-AzureCLIVersion { $azureCLIVersion = $(az version) | ConvertFrom-Json | Foreach{ $_."azure-cli" } - return "Azure CLI $azureCLIVersion" + return $azureCLIVersion } function Get-AzCopyVersion { - return ($(azcopy --version) -replace "version ") + return ($(azcopy --version) -replace "^azcopy version").Trim() } function Get-AzureDevopsExtVersion { $azureDevExtVersion = (az version | ConvertFrom-Json | ForEach-Object { $_."extensions" })."azure-devops" - return "Azure DevOps CLI extension $azureDevExtVersion" + return $azureDevExtVersion } function Get-AWSCLIVersion { $(aws --version) -match "aws-cli\/(?<version>\d+\.\d+\.\d+)" | Out-Null $awscliVersion = $Matches.Version - return "AWS CLI $awscliVersion" + return $awscliVersion } function Get-AWSSAMVersion { $(sam --version) -match "version (?<version>\d+\.\d+\.\d+)" | Out-Null $awssamVersion = $Matches.Version - return "AWS SAM CLI $awssamVersion" + return $awssamVersion } function Get-AWSSessionManagerVersion { $awsSessionManagerVersion = $(session-manager-plugin --version) - return "AWS Session Manager CLI $awsSessionManagerVersion" + return $awsSessionManagerVersion } function Get-AlibabaCLIVersion { $alicliVersion = $(aliyun version) - return "Alibaba Cloud CLI $alicliVersion" + return $alicliVersion } function Get-CloudFoundryVersion { $(cf version) -match "(?<version>\d+\.\d+\.\d+)" | Out-Null $cfVersion = $Matches.Version - return "Cloud Foundry CLI $cfVersion" + return $cfVersion } function Get-HubVersion { ($(hub version) | Select-String -Pattern "hub version") -match "hub version (?<version>\d+\.\d+\.\d+)" | Out-Null $hubVersion = $Matches.Version - return "Hub CLI $hubVersion" + return $hubVersion } function Get-7zipVersion { (7z | Out-String) -match "7-Zip (?<version>\d+\.\d+\.?\d*)" | Out-Null $version = $Matches.Version - return "7zip $version" + return $version } function Get-GHCVersion { ((ghc --version) | Out-String) -match "version (?<version>\d+\.\d+\.\d+)" | Out-Null $ghcVersion = $Matches.Version - return "ghc $ghcVersion" + return $ghcVersion } function Get-CabalVersion { ((cabal --version) | Out-String) -match "version (?<version>\d+\.\d+\.\d+\.\d+)" | Out-Null $cabalVersion = $Matches.Version - return "Cabal $cabalVersion" + return $cabalVersion } function Get-StackVersion { ((stack --version --quiet) | Out-String) -match "Version (?<version>\d+\.\d+\.\d+)," | Out-Null $stackVersion = $Matches.Version - return "Stack $stackVersion" + return $stackVersion } function Get-GoogleCloudSDKVersion { - (cmd /c "gcloud --version") -match "Google Cloud SDK" + return (((cmd /c "gcloud --version") -match "Google Cloud SDK") -replace "Google Cloud SDK").Trim() } function Get-ServiceFabricSDKVersion { $serviceFabricSDKVersion = Get-ItemPropertyValue 'HKLM:\SOFTWARE\Microsoft\Service Fabric\' -Name FabricVersion - return "Service Fabric SDK $serviceFabricSDKVersion" + return $serviceFabricSDKVersion } function Get-NewmanVersion { - return "Newman $(newman --version)" + return $(newman --version) } function Get-GHVersion { ($(gh --version) | Select-String -Pattern "gh version") -match "gh version (?<version>\d+\.\d+\.\d+)" | Out-Null $ghVersion = $Matches.Version - return "GitHub CLI $ghVersion" + return $ghVersion } function Get-VisualCPPComponents { @@ -300,17 +301,17 @@ function Get-VisualCPPComponents { function Get-DacFxVersion { $dacfxversion = & "$env:ProgramFiles\Microsoft SQL Server\160\DAC\bin\sqlpackage.exe" /version - return "DacFx $dacfxversion" + return $dacfxversion } function Get-SwigVersion { (swig -version | Out-String) -match "version (?<version>\d+\.\d+\.\d+)" | Out-Null $swigVersion = $Matches.Version - return "Swig $swigVersion" + return $swigVersion } function Get-ImageMagickVersion { (magick -version | Select-String -Pattern "Version") -match "(?<version>\d+\.\d+\.\d+-\d+)" | Out-Null $magickVersion = $Matches.Version - return "ImageMagick $magickVersion" + return $magickVersion } diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.WebServers.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.WebServers.psm1 index 17f1f989002a..1f77829ab3e5 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.WebServers.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.WebServers.psm1 @@ -18,7 +18,7 @@ function Get-NginxVersion { return $Matches.Version } -function Get-ApacheMarkdown +function Get-ApacheSection { $name = "Apache" $apachePort = "80" @@ -35,7 +35,7 @@ function Get-ApacheMarkdown } } -function Get-NginxMarkdown +function Get-NginxSection { $name = "Nginx" $nginxPort = "80" @@ -53,13 +53,8 @@ function Get-NginxMarkdown } function Build-WebServersSection { - $output = "" - $output += New-MDHeader "Web Servers" -Level 3 - $output += @( - (Get-ApacheMarkdown), - (Get-NginxMarkdown) - ) | Sort-Object Name | New-MDTable - - $output += New-MDNewLine - return $output + return @( + (Get-ApacheSection), + (Get-NginxSection) + ) } \ No newline at end of file diff --git a/images/win/windows2019.json b/images/win/windows2019.json index c66c0a214dce..55eaeedb9326 100644 --- a/images/win/windows2019.json +++ b/images/win/windows2019.json @@ -82,6 +82,11 @@ "source": "{{ template_dir }}/scripts/SoftwareReport", "destination": "{{user `image_folder`}}" }, + { + "type": "file", + "source": "{{ template_dir }}/../../helpers/software-report-base", + "destination": "{{user `image_folder`}}/SoftwareReport/" + }, { "type": "file", "source": "{{ template_dir }}/post-generation", @@ -299,15 +304,22 @@ { "type": "powershell", "inline": [ - "if (-not (Test-Path C:\\InstalledSoftware.md)) { throw 'C:\\InstalledSoftware.md not found' }" + "if (-not (Test-Path C:\\software-report.md)) { throw 'C:\\software-report.md not found' }", + "if (-not (Test-Path C:\\software-report.json)) { throw 'C:\\software-report.json not found' }" ] }, { "type": "file", - "source": "C:\\InstalledSoftware.md", + "source": "C:\\software-report.md", "destination": "{{ template_dir }}/Windows2019-Readme.md", "direction": "download" }, + { + "type": "file", + "source": "C:\\software-report.json", + "destination": "{{ template_dir }}/software-report.json", + "direction": "download" + }, { "type": "powershell", "skip_clean": true, diff --git a/images/win/windows2022.json b/images/win/windows2022.json index 1ee985842416..c4dc8f646a4e 100644 --- a/images/win/windows2022.json +++ b/images/win/windows2022.json @@ -82,6 +82,11 @@ "source": "{{ template_dir }}/scripts/SoftwareReport", "destination": "{{user `image_folder`}}" }, + { + "type": "file", + "source": "{{ template_dir }}/../../helpers/software-report-base", + "destination": "{{user `image_folder`}}/SoftwareReport/" + }, { "type": "file", "source": "{{ template_dir }}/post-generation", @@ -302,15 +307,22 @@ { "type": "powershell", "inline": [ - "if (-not (Test-Path C:\\InstalledSoftware.md)) { throw 'C:\\InstalledSoftware.md not found' }" + "if (-not (Test-Path C:\\software-report.md)) { throw 'C:\\software-report.md not found' }", + "if (-not (Test-Path C:\\software-report.json)) { throw 'C:\\software-report.json not found' }" ] }, { "type": "file", - "source": "C:\\InstalledSoftware.md", + "source": "C:\\software-report.md", "destination": "{{ template_dir }}/Windows2022-Readme.md", "direction": "download" }, + { + "type": "file", + "source": "C:\\software-report.json", + "destination": "{{ template_dir }}/software-report.json", + "direction": "download" + }, { "type": "powershell", "skip_clean": true, From add9a1e9ade3df1cb8d54c0327da7b64337380ef Mon Sep 17 00:00:00 2001 From: scp-mb <52526733+scp-mb@users.noreply.github.com> Date: Fri, 30 Dec 2022 09:31:37 +0000 Subject: [PATCH 1670/3485] Update documentation with minimum packer version (#6820) --- docs/create-image-and-azure-resources.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/create-image-and-azure-resources.md b/docs/create-image-and-azure-resources.md index f198df2f6e5d..82a8426b1f5d 100644 --- a/docs/create-image-and-azure-resources.md +++ b/docs/create-image-and-azure-resources.md @@ -9,7 +9,7 @@ After successful image generation, a snapshot of the temporary VM will be conver ## Prerequisites and Image-generation ### Build Agent requirements - `OS` - Windows/Linux -- `packer` - Can be downloaded from https://www.packer.io/downloads +- `packer 1.8.2 or higher` - Can be downloaded from https://www.packer.io/downloads - `PowerShell 5.0 or higher` or `PSCore` for linux distributes. - `Azure CLI ` - https://docs.microsoft.com/en-us/cli/azure/install-azure-cli - `Azure Az Powershell module` - https://docs.microsoft.com/en-us/powershell/azure/install-az-ps From b659709f2fea73094370dd61808003d3066c576c Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Fri, 30 Dec 2022 14:40:57 +0100 Subject: [PATCH 1671/3485] [macOS] Remove kotlinc-js pester test (#6854) --- images/macos/tests/BasicTools.Tests.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/macos/tests/BasicTools.Tests.ps1 b/images/macos/tests/BasicTools.Tests.ps1 index 18b2003ad554..0373d1ddf873 100644 --- a/images/macos/tests/BasicTools.Tests.ps1 +++ b/images/macos/tests/BasicTools.Tests.ps1 @@ -163,7 +163,7 @@ Describe "Homebrew" { } Describe "Kotlin" { - $kotlinPackages = @("kapt", "kotlin", "kotlinc", "kotlinc-js", "kotlinc-jvm", "kotlin-dce-js") + $kotlinPackages = @("kapt", "kotlin", "kotlinc", "kotlinc-jvm", "kotlin-dce-js") It "<toolName> is available" -TestCases ($kotlinPackages | ForEach-Object { @{ toolName = $_ } }) { "$toolName -version" | Should -ReturnZeroExitCode From b38865e056e5d6579fc8e973055387ae2b25f3a3 Mon Sep 17 00:00:00 2001 From: Julian Ospald <hasufell@posteo.de> Date: Mon, 2 Jan 2023 17:58:35 +0800 Subject: [PATCH 1672/3485] Make sure GHCUP_INSTALL_BASE_PREFIX is set (#6770) We use it during installation and add it to PATH, but then don't instruct ghcup to actually use this directory at runtime. This leads to: 1. ghcup is in /usr/local/.ghcup/bin/ 2. `ghcup install cabal latest` will actually install into ~/.ghcup/bin/ 3. since ~/.ghcup/bin/ is not in PATH, but /usr/local/.ghcup/bin/ is, the new binary is not visible to the user This issues does not exist on darwin, because there we use ~/.ghcup/bin/. https://downloads.haskell.org/ghcup/tmp/aarch64-linux-ghcup-0.1.18.1 --- images/linux/scripts/installers/haskell.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/images/linux/scripts/installers/haskell.sh b/images/linux/scripts/installers/haskell.sh index 8d11b5df0338..36d4938437af 100644 --- a/images/linux/scripts/installers/haskell.sh +++ b/images/linux/scripts/installers/haskell.sh @@ -14,6 +14,7 @@ export GHCUP_INSTALL_BASE_PREFIX=/usr/local export BOOTSTRAP_HASKELL_GHC_VERSION=0 ghcup_bin=$GHCUP_INSTALL_BASE_PREFIX/.ghcup/bin setEtcEnvironmentVariable "BOOTSTRAP_HASKELL_NONINTERACTIVE" $BOOTSTRAP_HASKELL_NONINTERACTIVE +setEtcEnvironmentVariable "GHCUP_INSTALL_BASE_PREFIX" $GHCUP_INSTALL_BASE_PREFIX # Install GHCup curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | sh > /dev/null 2>&1 || true From 3502d10db36b98983be3315421130b0c34c233f9 Mon Sep 17 00:00:00 2001 From: Christian Decker <chrisdecker1201@users.noreply.github.com> Date: Mon, 2 Jan 2023 14:40:29 +0100 Subject: [PATCH 1673/3485] [Ubuntu] update maven from 3.8.6 to 3.8.7 (#6861) --- images/linux/toolsets/toolset-1804.json | 2 +- images/linux/toolsets/toolset-2004.json | 2 +- images/linux/toolsets/toolset-2204.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index d79ae110c4ee..b170f3526f57 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -84,7 +84,7 @@ "versions": [ "8", "11", "12" ] } ], - "maven": "3.8.6" + "maven": "3.8.7" }, "android": { "cmdline-tools": "latest", diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index 2b0fc79e9a5a..719027fb78ad 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -85,7 +85,7 @@ "versions": [ "8", "11" ] } ], - "maven": "3.8.6" + "maven": "3.8.7" }, "android": { "cmdline-tools": "latest", diff --git a/images/linux/toolsets/toolset-2204.json b/images/linux/toolsets/toolset-2204.json index 5ccee8a19157..2e363d5622fb 100644 --- a/images/linux/toolsets/toolset-2204.json +++ b/images/linux/toolsets/toolset-2204.json @@ -73,7 +73,7 @@ "versions": [ "8", "11", "17" ] } ], - "maven": "3.8.6" + "maven": "3.8.7" }, "android": { "cmdline-tools": "latest", From 6f2a153a44802e87e8d3010591f07745fb4b7b83 Mon Sep 17 00:00:00 2001 From: baldcorp <53867174+baldcorp@users.noreply.github.com> Date: Wed, 4 Jan 2023 18:56:45 +0100 Subject: [PATCH 1674/3485] [macOS] Update llvm to version 15 (#6871) Co-authored-by: Alexey Ayupov <alexey.ayupov@akvelon.com> --- images/macos/toolsets/toolset-10.15.json | 2 +- images/macos/toolsets/toolset-11.json | 2 +- images/macos/toolsets/toolset-12.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index 3e1cfca2f310..5e71d56626db 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -342,7 +342,7 @@ ] }, "llvm": { - "version": "14" + "version": "15" }, "php": { "version": "8.2" diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index efb3501d5a87..4be9a6f4d9ea 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -338,7 +338,7 @@ ] }, "llvm": { - "version": "14" + "version": "15" }, "php": { "version": "8.2" diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index 6d2b01bea636..cf60edf5974a 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -299,7 +299,7 @@ ] }, "llvm": { - "version": "14" + "version": "15" }, "php": { "version": "8.2" From 9ee93111224473826a8168cc6b2951f11fdba197 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Wed, 4 Jan 2023 20:57:14 +0300 Subject: [PATCH 1675/3485] [Windows] Update LLVM version to 15 (#6838) --- images/win/toolsets/toolset-2019.json | 2 +- images/win/toolsets/toolset-2022.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index d0d2f9191042..1a3fe1ec108f 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -482,7 +482,7 @@ "version": "8.2" }, "llvm": { - "version": "14" + "version": "15" }, "postgresql": { "version": "14" diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index 4b30dc0f51d0..7e4489266c4d 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -388,7 +388,7 @@ "version": "3.08" }, "llvm": { - "version": "14" + "version": "15" }, "php": { "version": "8.2" From 68f38ef5a48c784520a1f44819282a7ff938f86f Mon Sep 17 00:00:00 2001 From: baldcorp <53867174+baldcorp@users.noreply.github.com> Date: Fri, 6 Jan 2023 21:26:37 +0100 Subject: [PATCH 1676/3485] [Windows] Change the way of installing Service Fabric (#6882) Co-authored-by: Alexey Ayupov <alexey.ayupov@akvelon.com> --- .../Installers/Install-ServiceFabricSDK.ps1 | 20 ++++++++++++++----- images/win/toolsets/toolset-2019.json | 8 ++++++++ images/win/toolsets/toolset-2022.json | 8 ++++++++ 3 files changed, 31 insertions(+), 5 deletions(-) diff --git a/images/win/scripts/Installers/Install-ServiceFabricSDK.ps1 b/images/win/scripts/Installers/Install-ServiceFabricSDK.ps1 index a367870948f6..12c544ffde8e 100644 --- a/images/win/scripts/Installers/Install-ServiceFabricSDK.ps1 +++ b/images/win/scripts/Installers/Install-ServiceFabricSDK.ps1 @@ -4,12 +4,22 @@ ## must be install after Visual Studio ################################################################################ -#Creating 'Installer' cache folder if it doesn't exist -$temp_install_dir = 'C:\Windows\Installer' -New-Item -Path $temp_install_dir -ItemType Directory -Force +# Creating 'Installer' cache folder if it doesn't exist +New-Item -Path 'C:\Windows\Installer' -ItemType Directory -Force -Set-ExecutionPolicy RemoteSigned -Scope CurrentUser -Force +# Get Service Fabric components versions +$serviceFabricRuntimeVersion = (Get-ToolsetContent).serviceFabric.runtime.version +$serviceFabricSDKVersion = (Get-ToolsetContent).serviceFabric.sdk.version -WebpiCmd.exe /Install /Products:MicrosoftAzure-ServiceFabric-CoreSDK /AcceptEula /XML:https://webpifeed.blob.core.windows.net/webpifeed/5.1/WebProductList.xml +# Install Service Fabric Runtime for Windows +$InstallerName = "MicrosoftServiceFabric.${serviceFabricRuntimeVersion}.exe" +$InstallerUrl = "https://download.microsoft.com/download/b/8/a/b8a2fb98-0ec1-41e5-be98-9d8b5abf7856/${InstallerName}" +$ArgumentList = ("/accepteula ","/quiet","/force") +Install-Binary -Url $InstallerUrl -Name $InstallerName -ArgumentList $ArgumentList + +# Install Service Fabric SDK +$InstallerName = "MicrosoftServiceFabricSDK.${serviceFabricSDKVersion}.msi" +$InstallerUrl = "https://download.microsoft.com/download/b/8/a/b8a2fb98-0ec1-41e5-be98-9d8b5abf7856/${InstallerName}" +Install-Binary -Url $InstallerUrl -Name $InstallerName Invoke-PesterTests -TestFile "Tools" -TestName "ServiceFabricSDK" diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index 1a3fe1ec108f..d95b03610f5c 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -427,6 +427,14 @@ { "name": "node-sass" } ] }, + "serviceFabric": { + "runtime": { + "version": "9.1.1436.9590" + }, + "sdk": { + "version": "6.1.1436" + } + }, "dotnet": { "versions": [ "3.1", diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index 7e4489266c4d..b0892b3f3f25 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -337,6 +337,14 @@ { "name": "grunt-cli", "test": "grunt --version" } ] }, + "serviceFabric": { + "runtime": { + "version": "9.1.1436.9590" + }, + "sdk": { + "version": "6.1.1436" + } + }, "dotnet": { "versions": [ "3.1", From e6fcf60b8e6c0f80a065327eaefe836881c28b68 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Mon, 9 Jan 2023 20:10:45 +0100 Subject: [PATCH 1677/3485] Revert "[Windows] Update OpenSSL version to 3.x (#6837)" (#6891) This reverts commit 9753e7301e19e29b89b0622b811bbb9b3891d02e. --- images/win/toolsets/toolset-2019.json | 5 ++++- images/win/toolsets/toolset-2022.json | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index d95b03610f5c..c47c8a35dddf 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -456,7 +456,10 @@ { "name": "innosetup" }, { "name": "jq" }, { "name": "NuGet.CommandLine" }, - { "name": "openssl.light" }, + { + "name": "openssl.light", + "args": [ "--version=1.1.1.20181020" ] + }, { "name": "packer" }, { "name": "strawberryperl" }, { "name": "pulumi" }, diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index b0892b3f3f25..13a333a4cbe4 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -365,7 +365,10 @@ { "name": "innosetup" }, { "name": "jq" }, { "name": "NuGet.CommandLine" }, - { "name": "openssl.light" }, + { + "name": "openssl.light", + "args": [ "--version=1.1.1.20181020" ] + }, { "name": "packer" }, { "name": "strawberryperl" }, { "name": "pulumi" }, From bcc68b091b69a88ef8b5907b9449e53e3ba2a29c Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Wed, 11 Jan 2023 23:05:54 +0100 Subject: [PATCH 1678/3485] README: macos-latest is now macos-12 (#6901) --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 76de1fef05ae..b882fcdc9305 100644 --- a/README.md +++ b/README.md @@ -24,8 +24,8 @@ To build a VM machine from this repo's source, see the [instructions](docs/creat | Ubuntu 22.04 | `ubuntu-latest` or `ubuntu-22.04` | [ubuntu-22.04] | [![status22](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu22&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu22&redirect=1) | Ubuntu 20.04 | `ubuntu-20.04` | [ubuntu-20.04] | [![status20](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu20&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu20&redirect=1) | Ubuntu 18.04 <sup>deprecated</sup> | `ubuntu-18.04` | [ubuntu-18.04] | [![status18](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu18&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu18&redirect=1) -| macOS 12 | `macos-12`| [macOS-12] | [![statusumac12](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-12&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-12&redirect=1) -| macOS 11 | `macos-latest` or `macos-11`| [macOS-11] | [![statusmac11](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-11&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-11&redirect=1) +| macOS 12 | `macos-latest` or `macos-12`| [macOS-12] | [![statusumac12](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-12&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-12&redirect=1) +| macOS 11 | `macos-11`| [macOS-11] | [![statusmac11](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-11&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-11&redirect=1) | macOS 10.15 <sup>deprecated</sup> | `macos-10.15` | [macOS-10.15] | [![statusmac10](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-10.15&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-10.15&redirect=1) | Windows Server 2022 | `windows-latest` or `windows-2022` | [windows-2022] | [![statuswin22](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=windows-2022&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=windows-2022&redirect=1) | | Windows Server 2019 | `windows-2019` | [windows-2019] | [![statuswin19](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=windows-2019&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=windows-2019&redirect=1) From 55011709b06e184074cfcce025d6f25947cce6d9 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 12 Jan 2023 13:14:56 +0000 Subject: [PATCH 1679/3485] Updating readme file for ubuntu20 version 20230109.1 (#6895) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2004-Readme.md | 284 +++++++++++++++--------------- 1 file changed, 138 insertions(+), 146 deletions(-) diff --git a/images/linux/Ubuntu2004-Readme.md b/images/linux/Ubuntu2004-Readme.md index 16f239bcab70..c1648b92c448 100644 --- a/images/linux/Ubuntu2004-Readme.md +++ b/images/linux/Ubuntu2004-Readme.md @@ -1,49 +1,57 @@ | Announcements | |-| -| [Ubuntu-latest workflows will use Ubuntu-22.04](https://github.com/actions/runner-images/issues/6399) | +| [[All OSs] .NET 5.x will be removed from the images on January, 29](https://github.com/actions/runner-images/issues/6840) | | [The Ubuntu 18.04 Actions runner image will begin deprecation on 2022/08/08 and will be fully unsupported by 2023/04/01](https://github.com/actions/runner-images/issues/6002) | *** -# Ubuntu 20.04.5 LTS -- Linux kernel version: 5.15.0-1023-azure -- Image Version: 20221212.2 +# Ubuntu 20.04 +- OS Version: 20.04.5 LTS +- Kernel Version: 5.15.0-1030-azure +- Image Version: 20230109.1 ## Installed Software + ### Language and Runtime - Bash 5.0.17(1)-release -- Clang 10.0.0, 11.0.0, 12.0.0 -- Clang-format 10.0.0, 11.0.0, 12.0.0 -- Clang-tidy 10.0.0, 11.0.0, 12.0.0 +- Clang: 10.0.0, 11.0.0, 12.0.0 +- Clang-format: 10.0.0, 11.0.0, 12.0.0 +- Clang-tidy: 10.0.0, 11.0.0, 12.0.0 - Dash 0.5.10.2-6 - Erlang 25.0.4 (Eshell 13.0.4) - Erlang rebar3 3.20.0 -- GNU C++ 9.4.0, 10.3.0 -- GNU Fortran 9.4.0, 10.3.0 -- Julia 1.8.3 -- Kotlin 1.7.22-release-288 -- Mono 6.12.0.182 (apt source repository: https://download.mono-project.com/repo/ubuntu stable-focal main) -- MSBuild 16.10.1.31701 (from /usr/lib/mono/msbuild/15.0/bin/MSBuild.dll) -- Node 16.18.1 +- GNU C++: 9.4.0, 10.3.0 +- GNU Fortran: 9.4.0, 10.3.0 +- Julia 1.8.5 +- Kotlin 1.8.0-release-345 +- Mono 6.12.0.182 +- MSBuild 16.10.1.31701 (Mono 6.12.0.182) +- Node.js 16.19.0 - Perl 5.30.0 - Python 3.8.10 - Python3 3.8.10 - Ruby 2.7.0p0 -- Swift 5.7.1 +- Swift 5.7.2 ### Package Management - cpan 1.64 -- Helm 3.10.2 -- Homebrew 3.6.15 -- Miniconda 4.12.0 -- Npm 8.19.2 +- Helm 3.10.3 +- Homebrew 3.6.18 +- Miniconda 22.11.1 +- Npm 8.19.3 - NuGet 6.3.1.1 - Pip 20.0.2 - Pip3 20.0.2 - Pipx 1.1.0 - RubyGems 3.1.2 -- Vcpkg (build from master \<796213014>) +- Vcpkg (build from commit 5bb5f3923) - Yarn 1.22.19 -##### Notes: +#### Environment variables +| Name | Value | +| ----------------------- | ---------------------- | +| CONDA | /usr/share/miniconda | +| VCPKG_INSTALLATION_ROOT | /usr/local/share/vcpkg | + +#### Homebrew note ``` Location: /home/linuxbrew Note: Homebrew is pre-installed on image but not added to PATH. @@ -51,38 +59,32 @@ run the eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)" command to accomplish this. ``` -#### Environment variables -| Name | Value | -| ----------------------- | ---------------------- | -| CONDA | /usr/share/miniconda | -| VCPKG_INSTALLATION_ROOT | /usr/local/share/vcpkg | - ### Project Management - Ant 1.10.7 - Gradle 7.6 -- Lerna 6.1.0 -- Maven 3.8.6 -- Sbt 1.8.0 +- Lerna 6.4.0 +- Maven 3.8.7 +- Sbt 1.8.2 ### Tools - Ansible 2.13.7 - apt-fast 1.9.12 -- AzCopy 10.16.2 (available by `azcopy` and `azcopy10` aliases) -- Bazel 5.3.2 +- AzCopy 10.16.2 - available by `azcopy` and `azcopy10` aliases +- Bazel 6.0.0 - Bazelisk 1.13.2 - Bicep 0.13.1 -- Buildah 1.22.3 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) +- Buildah 1.22.3 - CMake 3.25.1 -- CodeQL Action Bundle 2.11.5 +- CodeQL Action Bundle 2.11.6 - Docker Amazon ECR Credential Helper 0.6.0 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.14.0+azure-1 +- Docker Compose v2 2.15.1+azure-1 - Docker-Buildx 0.9.1 -- Docker-Moby Client 20.10.21+azure-2 -- Docker-Moby Server 20.10.21+azure-2 +- Docker-Moby Client 20.10.22+azure-1 +- Docker-Moby Server 20.10.22+azure-1 - Fastlane 2.211.0 -- Git 2.38.2 (apt source repository: ppa:git-core/ppa) -- Git LFS 3.3.0 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) +- Git 2.39.0 +- Git LFS 3.3.0 - Git-ftp 1.6.0 - Haveged 1.9.1 - Heroku 7.67.1 @@ -97,36 +99,36 @@ to accomplish this. - Minikube 1.28.0 - n 9.0.1 - Newman 5.3.2 -- nvm 0.39.2 +- nvm 0.39.3 - OpenSSL 1.1.1f-1ubuntu2.16 -- Packer 1.8.4 -- Parcel 2.8.1 +- Packer 1.8.5 +- Parcel 2.8.2 - PhantomJS 2.1.1 -- Podman 3.4.2 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) -- Pulumi 3.49.0 +- Podman 3.4.2 +- Pulumi 3.51.0 - R 4.2.2 -- Skopeo 1.5.0 (apt source repository: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) +- Skopeo 1.5.0 - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 -- Terraform 1.3.6 +- Terraform 1.3.7 - yamllint 1.28.0 -- yq v4.30.5 -- zstd 1.5.2 (homebrew) +- yq 4.30.6 +- zstd 1.5.2 ### CLI Tools -- Alibaba Cloud CLI 3.0.140 -- AWS CLI 2.9.6 -- AWS CLI Session manager plugin 1.2.398.0 -- AWS SAM CLI 1.66.0 -- Azure CLI (azure-cli) 2.43.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) +- Alibaba Cloud CLI 3.0.144 +- AWS CLI 2.9.13 +- AWS CLI Session Manager Plugin 1.2.398.0 +- AWS SAM CLI 1.68.0 +- Azure CLI 2.44.0 - Azure CLI (azure-devops) 0.25.0 -- GitHub CLI 2.20.2 -- Google Cloud SDK 411.0.0 (apt source repository: https://packages.cloud.google.com/apt) +- GitHub CLI 2.21.2 +- Google Cloud SDK 412.0.0 - Hub CLI 2.14.2 -- Netlify CLI 12.2.10 -- OpenShift CLI 4.11.18 +- Netlify CLI 12.6.0 +- OpenShift CLI 4.11.22 - ORAS CLI 0.16.0 -- Vercel CLI 28.8.0 +- Vercel CLI 28.11.0 ### Java | Version | Vendor | Environment Variable | @@ -140,43 +142,42 @@ to accomplish this. | --------- | --------------------- | | CE 22.3.0 | GRAALVM_11_ROOT | -### PHP -| Tool | Version | -| -------- | -------------------------- | -| PHP | 7.4.33 8.0.26 8.1.13 8.2.0 | -| Composer | 2.4.4 | -| PHPUnit | 8.5.31 | +### PHP Tools +- PHP: 7.4.33, 8.0.27, 8.1.14, 8.2.1 +- Composer 2.5.1 +- PHPUnit 8.5.31 ``` - Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. +Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ``` -### Haskell + +### Haskell Tools - Cabal 3.6.2.0 -- GHC 9.4.3 +- GHC 9.4.4 - GHCup 0.1.18.0 -- Stack 2.9.1 +- Stack 2.9.3 ### Rust Tools -- Cargo 1.65.0 -- Rust 1.65.0 -- Rustdoc 1.65.0 +- Cargo 1.66.0 +- Rust 1.66.0 +- Rustdoc 1.66.0 - Rustup 1.25.1 #### Packages - Bindgen 0.63.0 - Cargo audit 0.17.4 -- Cargo clippy 0.1.65 +- Cargo clippy 0.1.66 - Cargo outdated 0.11.1 - Cbindgen 0.24.3 - Rustfmt 1.5.1 ### Browsers and Drivers -- Google Chrome 108.0.5359.98 +- Google Chrome 108.0.5359.124 - ChromeDriver 108.0.5359.71 - Chromium 108.0.5341.0 -- Microsoft Edge 108.0.1462.46 (apt source repository: https://packages.microsoft.com/repos/edge) -- Microsoft Edge WebDriver 108.0.1462.46 +- Microsoft Edge 108.0.1462.76 +- Microsoft Edge WebDriver 108.0.1462.76 - Selenium server 4.7.0 -- Mozilla Firefox 108.0 (apt source repository: ppa:mozillateam/ppa) +- Mozilla Firefox 108.0.2 - Geckodriver 0.32.0 #### Environment variables @@ -187,51 +188,46 @@ to accomplish this. | GECKOWEBDRIVER | /usr/local/share/gecko_driver | | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | -### .NET Core SDK -- 3.1.120 3.1.202 3.1.302 3.1.425 5.0.104 5.0.214 5.0.303 5.0.408 6.0.403 7.0.100 - -### .NET tools +### .NET Tools +- .NET Core SDK: 3.1.120, 3.1.202, 3.1.302, 3.1.426, 5.0.104, 5.0.214, 5.0.303, 5.0.408, 6.0.404, 7.0.101 - nbgv 3.5.119+5d25f54fec ### Databases -- MongoDB 5.0.14 (apt source repository: https://repo.mongodb.org/apt/ubuntu) +- MongoDB 5.0.14 - sqlite3 3.31.1 #### PostgreSQL -- PostgreSQL 14.6 (apt source repository: https://apt.postgresql.org/pub/repos/apt/) -- PostgreSQL Server (user:postgres) - +- PostgreSQL 14.6 ``` - PostgreSQL service is disabled by default. Use the following command as a part of your job to start the service: 'sudo systemctl start postgresql.service' +User: postgres +PostgreSQL service is disabled by default. +Use the following command as a part of your job to start the service: 'sudo systemctl start postgresql.service' ``` + #### MySQL - MySQL 8.0.31-0ubuntu0.20.04.2 -- MySQL Server (user:root password:root) - ``` - MySQL service is disabled by default. Use the following command as a part of your job to start the service: 'sudo systemctl start mysql.service' +User: root +Password: root +MySQL service is disabled by default. +Use the following command as a part of your job to start the service: 'sudo systemctl start mysql.service' ``` -#### MS SQL Server Client Tools + +#### MS SQL - sqlcmd 17.10.0001.1 - SqlPackage 16.1.6374.0 ### Cached Tools + #### Go - 1.17.13 - 1.18.9 - 1.19.4 #### Node.js -- 14.21.1 -- 16.18.1 -- 18.12.1 - -#### PyPy -- 2.7.18 [PyPy 7.3.10] -- 3.6.12 [PyPy 7.3.3] -- 3.7.13 [PyPy 7.3.9] -- 3.8.15 [PyPy 7.3.10] -- 3.9.15 [PyPy 7.3.10] +- 14.21.2 +- 16.19.0 +- 18.13.0 #### Python - 2.7.18 @@ -242,6 +238,13 @@ to accomplish this. - 3.10.9 - 3.11.1 +#### PyPy +- 2.7.18 [PyPy 7.3.11] +- 3.6.12 [PyPy 7.3.3] +- 3.7.13 [PyPy 7.3.9] +- 3.8.16 [PyPy 7.3.11] +- 3.9.16 [PyPy 7.3.11] + #### Ruby - 2.5.9 - 2.6.10 @@ -249,26 +252,16 @@ to accomplish this. - 3.0.5 - 3.1.3 -#### Environment variables -| Name | Value | Architecture | -| --------------- | ----------------------------------- | ------------ | -| GOROOT_1_17_X64 | /opt/hostedtoolcache/go/1.17.13/x64 | x64 | -| GOROOT_1_18_X64 | /opt/hostedtoolcache/go/1.18.9/x64 | x64 | -| GOROOT_1_19_X64 | /opt/hostedtoolcache/go/1.19.4/x64 | x64 | - ### PowerShell Tools -- PowerShell 7.2.7 +- PowerShell 7.2.8 #### PowerShell Modules -| Module | Version | -| ---------------- | ------- | -| MarkdownPS | 1.9 | -| Microsoft.Graph | 1.18.0 | -| Pester | 5.3.3 | -| PSScriptAnalyzer | 1.21.0 | - -#### Az PowerShell Modules -- 9.0.1 3.1.0.zip 4.4.0.zip 5.9.0.zip 6.6.0.zip 7.5.0.zip +- Az: 9.2.0 +- Az (Cached): 3.1.0.zip, 4.4.0.zip, 5.9.0.zip, 6.6.0.zip, 7.5.0.zip +- MarkdownPS: 1.9 +- Microsoft.Graph: 1.19.0 +- Pester: 5.3.3 +- PSScriptAnalyzer: 1.21.0 ### Web Servers | Name | Version | ConfigFile | ServiceStatus | ListenPort | @@ -278,20 +271,20 @@ to accomplish this. | nginx | 1.18.0 | /etc/nginx/nginx.conf | inactive | 80 | ### Android -| Package Name | Version | -| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 8.0 | -| Android Emulator | 31.3.13 | -| Android SDK Build-tools | 33.0.0 33.0.1<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | -| Android SDK Platform-Tools | 33.0.3 | -| Android SDK Platforms | android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | -| Android SDK Tools | 26.1.1 | -| Android Support Repository | 47.0.0 | -| CMake | 3.10.2<br>3.18.1<br>3.22.1 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 23.2.8568313<br>24.0.8215888<br>25.1.8937393 (default) | -| SDK Patch Applier v4 | 1 | +| Package Name | Version | +| -------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 8.0 | +| Android Emulator | 31.3.14 | +| Android SDK Build-tools | 33.0.0 33.0.1<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | +| Android SDK Platform-Tools | 33.0.3 | +| Android SDK Platforms | android-33-ext4 (rev 1)<br>android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | +| Android SDK Tools | 26.1.1 | +| Android Support Repository | 47.0.0 | +| CMake | 3.10.2<br>3.18.1<br>3.22.1 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 23.2.8568313<br>24.0.8215888<br>25.1.8937393 (default) | +| SDK Patch Applier v4 | 1 | #### Environment variables | Name | Value | @@ -309,21 +302,21 @@ to accomplish this. | alpine:3.14 | sha256:4c869a63e1b7c0722fed1e402a6466610327c3b83bdddb94bd94fb71da7f638a | 2022-08-09 | | alpine:3.15 | sha256:cf34c62ee8eb3fe8aa24c1fab45d7e9d12768d945c3f5a6fd6a63d901e898479 | 2022-08-09 | | alpine:3.16 | sha256:b95359c2505145f16c6aa384f9cc74eeff78eb36d308ca4fd902eeeb0a0b161b | 2022-11-12 | -| buildpack-deps:bullseye | sha256:ea5e7737f282e76b594669926ee6222beee0c237b9ba19a2055aa8f4feb83ba2 | 2022-12-06 | -| buildpack-deps:buster | sha256:ecb6bd2c510b37b0bcbfaaa043192c293bfba2d9a0f4402abab6a342f186eebc | 2022-12-06 | +| buildpack-deps:bullseye | sha256:0207e7da5bf153f41b59f13a373e62ba24687f71caf90d383c07912e0e31aad3 | 2022-12-21 | +| buildpack-deps:buster | sha256:cbf9915fc2c12f95de45033fd6c1131cdbfbc35ce12bf6a6b1dc76a55d9f011a | 2022-12-21 | | buildpack-deps:stretch | sha256:78e995165a5788c2f55aed6e548d8f6c1534830d4310c870408fccb2da8c5b2e | 2022-06-23 | -| debian:10 | sha256:e6fb8b88b411285ac71590459aa8d0a376acc86a3d17adfe45e806f522c54cc3 | 2022-12-06 | -| debian:11 | sha256:a288aa7ad0e4d443e86843972c25a02f99e9ad6ee589dd764895b2c3f5a8340b | 2022-12-06 | +| debian:10 | sha256:a3b7e971fef3e488479afd0a8387b35bed4c55891a1597d64a8fc6494d61d798 | 2022-12-21 | +| debian:11 | sha256:c66c0e5dc607baefefda1d9e64a3b3a317e4189c540c8eac0c1a06186fe353a1 | 2022-12-21 | | debian:9 | sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be | 2022-06-23 | -| moby/buildkit:latest | sha256:77abd86c9422aaff294bfde1029f03a6ab18ece0105003637cfda1d7fc22299f | 2022-11-10 | -| node:14 | sha256:f11e8dbf2ff6668927aafd90a804bf6597d8fe53dc16742a234045f7bf647a8c | 2022-12-06 | -| node:14-alpine | sha256:99360847bb6fddff4652433355ad1f3072ff734a3d9c103bb8b26cfa0e2b7046 | 2022-12-12 | -| node:16 | sha256:7f404d09ceb780c51f4fac7592c46b8f21211474aacce25389eb0df06aaa7472 | 2022-12-06 | -| node:16-alpine | sha256:3265e41b5007254a593a1c3ff8b9b5ea9b943d63a1360a7d8d7d29b33a46a01f | 2022-12-12 | -| node:18 | sha256:9ebe9845301ca70e879f22180dfff496b856bb5f2ec52397462a9f5f903ee654 | 2022-12-06 | -| node:18-alpine | sha256:62a6ce21599b3183272e71527c9ce9fae9435195052d358f481eb3d69d3dc6f3 | 2022-12-12 | +| moby/buildkit:latest | sha256:5fee32ab69191d952ef2f19d8cb27e2d930813114a56da8de0c33a6fab06ab1e | 2023-01-09 | +| node:14 | sha256:b6ab85c15f1c372bca3bde8585fbf5739b679aa9119f46e7d2bd41c1dcc05959 | 2022-12-21 | +| node:14-alpine | sha256:2c6a909495ef3761328c10945cbe84c06d079f7ca49dc24271e73be8cab85ad7 | 2023-01-09 | +| node:16 | sha256:64e8bcdfdad6718050801a2639f7e6645fdaf85ec37a98cdb61f6a5331217618 | 2022-12-21 | +| node:16-alpine | sha256:1298fd170c45954fec3d4d063437750f89802d72743816663664cfe9aa152b4b | 2023-01-09 | +| node:18 | sha256:a403ff0ffe7a6a8fe90fdc70289ba398ab3a281bb3fa64b4efed45f45ac17bcd | 2023-01-06 | +| node:18-alpine | sha256:fda98168118e5a8f4269efca4101ee51dd5c75c0fe56d8eb6fad80455c2f5827 | 2023-01-09 | | ubuntu:16.04 | sha256:1f1a2d56de1d604801a9671f301190704c25d604a416f59e03c04f5c6ffee0d6 | 2021-08-31 | -| ubuntu:18.04 | sha256:daf3e62183e8aa9a56878a685ed26f3af3dd8c08c8fd11ef1c167a1aa9bd66a3 | 2022-12-09 | +| ubuntu:18.04 | sha256:c1d0baf2425ecef88a2f0c3543ec43690dc16cc80d3c4e593bb95e4f45390e45 | 2023-01-02 | | ubuntu:20.04 | sha256:0e0402cd13f68137edb0266e1d2c682f217814420f2d43d300ed8f65479b14fb | 2022-12-09 | ### Installed apt packages @@ -339,7 +332,7 @@ to accomplish this. | build-essential | 12.8ubuntu1.1 | | bzip2 | 1.0.8-2 | | coreutils | 8.30-3ubuntu2 | -| curl | 7.68.0-1ubuntu2.14 | +| curl | 7.68.0-1ubuntu2.15 | | dbus | 1.12.16-2ubuntu2.3 | | dnsutils | 1:9.16.1-0ubuntu2.11 | | dpkg | 1.19.7ubuntu3.2 | @@ -357,7 +350,7 @@ to accomplish this. | lib32z1 | 1:1.2.11.dfsg-2ubuntu1.5 | | libc++-dev | 1:10.0-50\~exp1 | | libc++abi-dev | 1:10.0-50\~exp1 | -| libcurl4 | 7.68.0-1ubuntu2.14 | +| libcurl4 | 7.68.0-1ubuntu2.15 | | libgbm-dev | 21.2.6-0ubuntu0.1\~20.04.2 | | libgconf-2-4 | 3.2.6-6ubuntu1 | | libgsl-dev | 2.5+dfsg-6build1 | @@ -407,9 +400,8 @@ to accomplish this. | upx | 3.95-2build1 | | wget | 1.20.3-1ubuntu2 | | xorriso | 1.5.2-1 | -| xvfb | 2:1.20.13-1ubuntu1\~20.04.4 | +| xvfb | 2:1.20.13-1ubuntu1\~20.04.5 | | xz-utils | 5.2.4-1ubuntu1.1 | | zip | 3.0-11build1 | | zsync | 0.6.2-3ubuntu1 | - From c82cd6704bacd9429d4e037d6554e74375842f51 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 12 Jan 2023 14:06:52 +0000 Subject: [PATCH 1680/3485] Updating readme file for ubuntu22 version 20230109.1 (#6893) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2204-Readme.md | 265 +++++++++++++++--------------- 1 file changed, 128 insertions(+), 137 deletions(-) diff --git a/images/linux/Ubuntu2204-Readme.md b/images/linux/Ubuntu2204-Readme.md index c07143774de1..4c0416a23689 100644 --- a/images/linux/Ubuntu2204-Readme.md +++ b/images/linux/Ubuntu2204-Readme.md @@ -1,47 +1,55 @@ | Announcements | |-| -| [Ubuntu-latest workflows will use Ubuntu-22.04](https://github.com/actions/runner-images/issues/6399) | +| [[All OSs] .NET 5.x will be removed from the images on January, 29](https://github.com/actions/runner-images/issues/6840) | | [The Ubuntu 18.04 Actions runner image will begin deprecation on 2022/08/08 and will be fully unsupported by 2023/04/01](https://github.com/actions/runner-images/issues/6002) | *** -# Ubuntu 22.04.1 LTS -- Linux kernel version: 5.15.0-1024-azure -- Image Version: 20221212.1 +# Ubuntu 22.04 +- OS Version: 22.04.1 LTS +- Kernel Version: 5.15.0-1030-azure +- Image Version: 20230109.1 ## Installed Software + ### Language and Runtime - Bash 5.1.16(1)-release -- Clang 12.0.1, 13.0.1, 14.0.0 -- Clang-format 12.0.1, 13.0.1, 14.0.0 -- Clang-tidy 12.0.1, 13.0.1, 14.0.0 +- Clang: 12.0.1, 13.0.1, 14.0.0 +- Clang-format: 12.0.1, 13.0.1, 14.0.0 +- Clang-tidy: 12.0.1, 13.0.1, 14.0.0 - Dash 0.5.11+git20210903+057cd650a4ed-3build1 -- GNU C++ 9.5.0, 10.4.0, 11.3.0, 12.1.0 -- GNU Fortran 9.5.0, 10.4.0, 11.3.0, 12.1.0 -- Julia 1.8.3 -- Kotlin 1.7.22-release-288 -- Mono 6.12.0.182 (apt source repository: https://download.mono-project.com/repo/ubuntu stable-focal main) -- MSBuild 16.10.1.31701 (from /usr/lib/mono/msbuild/15.0/bin/MSBuild.dll) -- Node 16.18.1 +- GNU C++: 9.5.0, 10.4.0, 11.3.0, 12.1.0 +- GNU Fortran: 9.5.0, 10.4.0, 11.3.0, 12.1.0 +- Julia 1.8.4 +- Kotlin 1.8.0-release-345 +- Mono 6.12.0.182 +- MSBuild 16.10.1.31701 (Mono 6.12.0.182) +- Node.js 16.19.0 - Perl 5.34.0 - Python 3.10.6 - Python3 3.10.6 - Ruby 3.0.2p107 -- Swift 5.7.1 +- Swift 5.7.2 ### Package Management - cpan 1.64 -- Helm 3.10.2 -- Homebrew 3.6.15 -- Miniconda 4.12.0 -- Npm 8.19.2 +- Helm 3.10.3 +- Homebrew 3.6.18 +- Miniconda 22.11.1 +- Npm 8.19.3 - NuGet 6.3.1.1 - Pip 22.0.2 - Pip3 22.0.2 - Pipx 1.1.0 - RubyGems 3.3.5 -- Vcpkg (build from master \<796213014>) +- Vcpkg (build from commit 85c4f11f8) - Yarn 1.22.19 -##### Notes: +#### Environment variables +| Name | Value | +| ----------------------- | ---------------------- | +| CONDA | /usr/share/miniconda | +| VCPKG_INSTALLATION_ROOT | /usr/local/share/vcpkg | + +#### Homebrew note ``` Location: /home/linuxbrew Note: Homebrew is pre-installed on image but not added to PATH. @@ -49,34 +57,28 @@ run the eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)" command to accomplish this. ``` -#### Environment variables -| Name | Value | -| ----------------------- | ---------------------- | -| CONDA | /usr/share/miniconda | -| VCPKG_INSTALLATION_ROOT | /usr/local/share/vcpkg | - ### Project Management -- Lerna 6.1.0 +- Lerna 6.4.0 ### Tools - Ansible 2.14.1 - apt-fast 1.9.12 -- AzCopy 10.16.2 (available by `azcopy` and `azcopy10` aliases) -- Bazel 5.3.2 +- AzCopy 10.16.2 - available by `azcopy` and `azcopy10` aliases +- Bazel 6.0.0 - Bazelisk 1.13.2 - Bicep 0.13.1 - Buildah 1.23.1 - CMake 3.25.1 -- CodeQL Action Bundle 2.11.5 +- CodeQL Action Bundle 2.11.6 - Docker Amazon ECR Credential Helper 0.6.0 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.14.0+azure-1 +- Docker Compose v2 2.15.1+azure-1 - Docker-Buildx 0.9.1 -- Docker-Moby Client 20.10.21+azure-2 -- Docker-Moby Server 20.10.21+azure-2 +- Docker-Moby Client 20.10.22+azure-1 +- Docker-Moby Server 20.10.22+azure-1 - Fastlane 2.211.0 -- Git 2.38.2 (apt source repository: ppa:git-core/ppa) -- Git LFS 3.3.0 (apt source repository: https://packagecloud.io/install/repositories/github/git-lfs) +- Git 2.39.0 +- Git LFS 3.3.0 - Git-ftp 1.6.0 - Haveged 1.9.14 - Heroku 7.67.1 @@ -90,35 +92,35 @@ to accomplish this. - Minikube 1.28.0 - n 9.0.1 - Newman 5.3.2 -- nvm 0.39.2 +- nvm 0.39.3 - OpenSSL 3.0.2-0ubuntu1.7 -- Packer 1.8.4 -- Parcel 2.8.1 +- Packer 1.8.5 +- Parcel 2.8.2 - Podman 3.4.4 -- Pulumi 3.49.0 +- Pulumi 3.51.0 - R 4.2.2 - Skopeo 1.4.1 - Sphinx Open Source Search Server 2.2.11 - SVN 1.14.1 -- Terraform 1.3.6 +- Terraform 1.3.7 - yamllint 1.28.0 -- yq v4.30.5 -- zstd 1.5.2 (homebrew) +- yq 4.30.6 +- zstd 1.5.2 ### CLI Tools -- Alibaba Cloud CLI 3.0.140 -- AWS CLI 2.9.6 -- AWS CLI Session manager plugin 1.2.398.0 -- AWS SAM CLI 1.66.0 -- Azure CLI (azure-cli) 2.43.0 (installation method: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt) +- Alibaba Cloud CLI 3.0.144 +- AWS CLI 2.9.13 +- AWS CLI Session Manager Plugin 1.2.398.0 +- AWS SAM CLI 1.68.0 +- Azure CLI 2.43.0 - Azure CLI (azure-devops) 0.25.0 -- GitHub CLI 2.20.2 -- Google Cloud SDK 411.0.0 (apt source repository: https://packages.cloud.google.com/apt) +- GitHub CLI 2.21.2 +- Google Cloud SDK 412.0.0 - Hub CLI 2.14.2 -- Netlify CLI 12.2.10 -- OpenShift CLI 4.11.18 +- Netlify CLI 12.6.0 +- OpenShift CLI 4.11.22 - ORAS CLI 0.16.0 -- Vercel CLI 28.8.0 +- Vercel CLI 28.10.3 ### Java | Version | Vendor | Environment Variable | @@ -132,43 +134,42 @@ to accomplish this. | --------- | --------------------- | | CE 22.3.0 | GRAALVM_11_ROOT | -### PHP -| Tool | Version | -| -------- | ------- | -| PHP | 8.1.2 | -| Composer | 2.4.4 | -| PHPUnit | 8.5.31 | +### PHP Tools +- PHP: 8.1.2 +- Composer 2.5.1 +- PHPUnit 8.5.31 ``` - Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. +Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ``` -### Haskell + +### Haskell Tools - Cabal 3.6.2.0 -- GHC 9.4.3 +- GHC 9.4.4 - GHCup 0.1.18.0 -- Stack 2.9.1 +- Stack 2.9.3 ### Rust Tools -- Cargo 1.65.0 -- Rust 1.65.0 -- Rustdoc 1.65.0 +- Cargo 1.66.0 +- Rust 1.66.0 +- Rustdoc 1.66.0 - Rustup 1.25.1 #### Packages - Bindgen 0.63.0 - Cargo audit 0.17.4 -- Cargo clippy 0.1.65 +- Cargo clippy 0.1.66 - Cargo outdated 0.11.1 - Cbindgen 0.24.3 - Rustfmt 1.5.1 ### Browsers and Drivers -- Google Chrome 108.0.5359.98 +- Google Chrome 108.0.5359.124 - ChromeDriver 108.0.5359.71 - Chromium 108.0.5341.0 -- Microsoft Edge 108.0.1462.46 (apt source repository: https://packages.microsoft.com/repos/edge) -- Microsoft Edge WebDriver 108.0.1462.46 +- Microsoft Edge 108.0.1462.76 +- Microsoft Edge WebDriver 108.0.1462.76 - Selenium server 4.7.0 -- Mozilla Firefox 108.0 (apt source repository: ppa:mozillateam/ppa) +- Mozilla Firefox 108.0.2 - Geckodriver 0.32.0 #### Environment variables @@ -179,48 +180,45 @@ to accomplish this. | GECKOWEBDRIVER | /usr/local/share/gecko_driver | | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | -### .NET Core SDK -- 6.0.403 7.0.100 - -### .NET tools +### .NET Tools +- .NET Core SDK: 6.0.404, 7.0.101 - nbgv 3.5.119+5d25f54fec ### Databases - sqlite3 3.37.2 #### PostgreSQL -- PostgreSQL 14.6 (apt source repository: https://apt.postgresql.org/pub/repos/apt/) -- PostgreSQL Server (user:postgres) - +- PostgreSQL 14.6 ``` - PostgreSQL service is disabled by default. Use the following command as a part of your job to start the service: 'sudo systemctl start postgresql.service' +User: postgres +PostgreSQL service is disabled by default. +Use the following command as a part of your job to start the service: 'sudo systemctl start postgresql.service' ``` + #### MySQL - MySQL 8.0.31-0ubuntu0.22.04.1 -- MySQL Server (user:root password:root) - ``` - MySQL service is disabled by default. Use the following command as a part of your job to start the service: 'sudo systemctl start mysql.service' +User: root +Password: root +MySQL service is disabled by default. +Use the following command as a part of your job to start the service: 'sudo systemctl start mysql.service' ``` -#### MS SQL Server Client Tools + +#### MS SQL - sqlcmd 17.10.0001.1 - SqlPackage 16.1.6374.0 ### Cached Tools + #### Go - 1.17.13 - 1.18.9 - 1.19.4 #### Node.js -- 14.21.1 -- 16.18.1 -- 18.12.1 - -#### PyPy -- 3.7.13 [PyPy 7.3.9] -- 3.8.15 [PyPy 7.3.10] -- 3.9.15 [PyPy 7.3.10] +- 14.21.2 +- 16.19.0 +- 18.13.0 #### Python - 3.7.15 @@ -229,29 +227,23 @@ to accomplish this. - 3.10.9 - 3.11.1 +#### PyPy +- 3.7.13 [PyPy 7.3.9] +- 3.8.16 [PyPy 7.3.11] +- 3.9.16 [PyPy 7.3.11] + #### Ruby - 3.1.3 -#### Environment variables -| Name | Value | Architecture | -| --------------- | ----------------------------------- | ------------ | -| GOROOT_1_17_X64 | /opt/hostedtoolcache/go/1.17.13/x64 | x64 | -| GOROOT_1_18_X64 | /opt/hostedtoolcache/go/1.18.9/x64 | x64 | -| GOROOT_1_19_X64 | /opt/hostedtoolcache/go/1.19.4/x64 | x64 | - ### PowerShell Tools -- PowerShell 7.2.7 +- PowerShell 7.2.8 #### PowerShell Modules -| Module | Version | -| ---------------- | ------- | -| MarkdownPS | 1.9 | -| Microsoft.Graph | 1.18.0 | -| Pester | 5.3.3 | -| PSScriptAnalyzer | 1.21.0 | - -#### Az PowerShell Modules -- 9.0.1 +- Az: 9.2.0 +- MarkdownPS: 1.9 +- Microsoft.Graph: 1.19.0 +- Pester: 5.3.3 +- PSScriptAnalyzer: 1.21.0 ### Web Servers | Name | Version | ConfigFile | ServiceStatus | ListenPort | @@ -260,20 +252,20 @@ to accomplish this. | nginx | 1.18.0 | /etc/nginx/nginx.conf | inactive | 80 | ### Android -| Package Name | Version | -| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 8.0 | -| Android Emulator | 31.3.13 | -| Android SDK Build-tools | 33.0.0 33.0.1<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | -| Android SDK Platform-Tools | 33.0.3 | -| Android SDK Platforms | android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | -| Android SDK Tools | 26.1.1 | -| Android Support Repository | 47.0.0 | -| CMake | 3.10.2<br>3.18.1<br>3.22.1 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 23.2.8568313<br>24.0.8215888<br>25.1.8937393 (default) | -| SDK Patch Applier v4 | 1 | +| Package Name | Version | +| -------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 8.0 | +| Android Emulator | 31.3.14 | +| Android SDK Build-tools | 33.0.0 33.0.1<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | +| Android SDK Platform-Tools | 33.0.3 | +| Android SDK Platforms | android-33-ext4 (rev 1)<br>android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | +| Android SDK Tools | 26.1.1 | +| Android Support Repository | 47.0.0 | +| CMake | 3.10.2<br>3.18.1<br>3.22.1 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 23.2.8568313<br>24.0.8215888<br>25.1.8937393 (default) | +| SDK Patch Applier v4 | 1 | #### Environment variables | Name | Value | @@ -291,18 +283,18 @@ to accomplish this. | alpine:3.14 | sha256:4c869a63e1b7c0722fed1e402a6466610327c3b83bdddb94bd94fb71da7f638a | 2022-08-09 | | alpine:3.15 | sha256:cf34c62ee8eb3fe8aa24c1fab45d7e9d12768d945c3f5a6fd6a63d901e898479 | 2022-08-09 | | alpine:3.16 | sha256:b95359c2505145f16c6aa384f9cc74eeff78eb36d308ca4fd902eeeb0a0b161b | 2022-11-12 | -| buildpack-deps:bullseye | sha256:ea5e7737f282e76b594669926ee6222beee0c237b9ba19a2055aa8f4feb83ba2 | 2022-12-06 | -| buildpack-deps:buster | sha256:ecb6bd2c510b37b0bcbfaaa043192c293bfba2d9a0f4402abab6a342f186eebc | 2022-12-06 | -| debian:10 | sha256:e6fb8b88b411285ac71590459aa8d0a376acc86a3d17adfe45e806f522c54cc3 | 2022-12-06 | -| debian:11 | sha256:a288aa7ad0e4d443e86843972c25a02f99e9ad6ee589dd764895b2c3f5a8340b | 2022-12-06 | +| buildpack-deps:bullseye | sha256:0207e7da5bf153f41b59f13a373e62ba24687f71caf90d383c07912e0e31aad3 | 2022-12-21 | +| buildpack-deps:buster | sha256:cbf9915fc2c12f95de45033fd6c1131cdbfbc35ce12bf6a6b1dc76a55d9f011a | 2022-12-21 | +| debian:10 | sha256:a3b7e971fef3e488479afd0a8387b35bed4c55891a1597d64a8fc6494d61d798 | 2022-12-21 | +| debian:11 | sha256:c66c0e5dc607baefefda1d9e64a3b3a317e4189c540c8eac0c1a06186fe353a1 | 2022-12-21 | | moby/buildkit:latest | sha256:77abd86c9422aaff294bfde1029f03a6ab18ece0105003637cfda1d7fc22299f | 2022-11-10 | -| node:14 | sha256:f11e8dbf2ff6668927aafd90a804bf6597d8fe53dc16742a234045f7bf647a8c | 2022-12-06 | -| node:14-alpine | sha256:99360847bb6fddff4652433355ad1f3072ff734a3d9c103bb8b26cfa0e2b7046 | 2022-12-12 | -| node:16 | sha256:7f404d09ceb780c51f4fac7592c46b8f21211474aacce25389eb0df06aaa7472 | 2022-12-06 | -| node:16-alpine | sha256:3265e41b5007254a593a1c3ff8b9b5ea9b943d63a1360a7d8d7d29b33a46a01f | 2022-12-12 | -| node:18 | sha256:9ebe9845301ca70e879f22180dfff496b856bb5f2ec52397462a9f5f903ee654 | 2022-12-06 | -| node:18-alpine | sha256:62a6ce21599b3183272e71527c9ce9fae9435195052d358f481eb3d69d3dc6f3 | 2022-12-12 | -| ubuntu:18.04 | sha256:daf3e62183e8aa9a56878a685ed26f3af3dd8c08c8fd11ef1c167a1aa9bd66a3 | 2022-12-09 | +| node:14 | sha256:b6ab85c15f1c372bca3bde8585fbf5739b679aa9119f46e7d2bd41c1dcc05959 | 2022-12-21 | +| node:14-alpine | sha256:4b06eb151378d0634eaeca8de025a216de79e268590b9f20584d3fa708d8a547 | 2023-01-09 | +| node:16 | sha256:64e8bcdfdad6718050801a2639f7e6645fdaf85ec37a98cdb61f6a5331217618 | 2022-12-21 | +| node:16-alpine | sha256:4f4ffee59a017b8881026d23336f37cc13221ec3dea219ebf7b8e55d876b9380 | 2023-01-09 | +| node:18 | sha256:a403ff0ffe7a6a8fe90fdc70289ba398ab3a281bb3fa64b4efed45f45ac17bcd | 2023-01-06 | +| node:18-alpine | sha256:c7bd8f1cdb3c6d7333cbbe63a86ad149759cbea52c18466c00848058ecfeee4d | 2023-01-09 | +| ubuntu:18.04 | sha256:c1d0baf2425ecef88a2f0c3543ec43690dc16cc80d3c4e593bb95e4f45390e45 | 2023-01-02 | | ubuntu:20.04 | sha256:0e0402cd13f68137edb0266e1d2c682f217814420f2d43d300ed8f65479b14fb | 2022-12-09 | | ubuntu:22.04 | sha256:27cb6e6ccef575a4698b66f5de06c7ecd61589132d5a91d098f7f3f9285415a9 | 2022-12-09 | @@ -319,7 +311,7 @@ to accomplish this. | build-essential | 12.9ubuntu3 | | bzip2 | 1.0.8-5build1 | | coreutils | 8.32-4.1ubuntu1 | -| curl | 7.81.0-1ubuntu1.6 | +| curl | 7.81.0-1ubuntu1.7 | | dbus | 1.12.20-2ubuntu4.1 | | dnsutils | 1:9.18.1-1ubuntu1.2 | | dpkg | 1.21.1ubuntu2.1 | @@ -337,7 +329,7 @@ to accomplish this. | lib32z1 | 1:1.2.11.dfsg-2ubuntu9.2 | | libc++-dev | 1:14.0-55\~exp2 | | libc++abi-dev | 1:14.0-55\~exp2 | -| libcurl4 | 7.81.0-1ubuntu1.6 | +| libcurl4 | 7.81.0-1ubuntu1.7 | | libgbm-dev | 22.0.5-0ubuntu0.1 | | libgconf-2-4 | 3.2.6-7ubuntu2 | | libgsl-dev | 2.7.1+dfsg-3 | @@ -389,9 +381,8 @@ to accomplish this. | upx | 3.96-3 | | wget | 1.21.2-2ubuntu1 | | xorriso | 1.5.4-2 | -| xvfb | 2:21.1.3-2ubuntu2.4 | +| xvfb | 2:21.1.3-2ubuntu2.5 | | xz-utils | 5.2.5-2ubuntu1 | | zip | 3.0-12build2 | | zsync | 0.6.2-3ubuntu1 | - From 010d9b89d008bb9d1453f61e162d4170ae35ebbb Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Thu, 12 Jan 2023 18:38:54 +0100 Subject: [PATCH 1681/3485] README: no active migrations (#6906) --- README.md | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/README.md b/README.md index b882fcdc9305..dbe6cc0f80c2 100644 --- a/README.md +++ b/README.md @@ -47,10 +47,7 @@ To build a VM machine from this repo's source, see the [instructions](docs/creat ## Ongoing migrations -There are currently two migrations in progress: - -* `macos-latest` is currently transitioning to `macos-12`. During this time, you may experience some jobs running on either a macos-11 or macos-12 runner. You can specify `runs-on: macos-11` in your workflow if you need the previous version. Details can be found in this [announcement](https://github.com/actions/runner-images/issues/6384). - +There are no migrations in progress. ## Image Definitions From a22d921c177b4ff25548bd51282a72a0ffce9bed Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 12 Jan 2023 18:43:37 +0000 Subject: [PATCH 1682/3485] Updating readme file for win22 version 20230109.1 (#6892) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2022-Readme.md | 114 ++++++++++++++++--------------- 1 file changed, 59 insertions(+), 55 deletions(-) diff --git a/images/win/Windows2022-Readme.md b/images/win/Windows2022-Readme.md index 9d75b7862182..a1f823bfeeac 100644 --- a/images/win/Windows2022-Readme.md +++ b/images/win/Windows2022-Readme.md @@ -1,34 +1,40 @@ +| Announcements | +|-| +| [[All OSs] .NET 5.x will be removed from the images on January, 29](https://github.com/actions/runner-images/issues/6840) | +| [[Windows] OpenSSL version will be upgraded to 3.x on January, 9](https://github.com/actions/runner-images/issues/6830) | +*** # Windows Server 2022 - OS Version: 10.0.20348 Build 1366 -- Image Version: 20221215.2 +- Image Version: 20230109.1 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled ## Installed Software + ### Language and Runtime - Bash 5.2.12(1)-release - Go 1.17.13 -- Julia 1.8.3 -- Kotlin 1.7.22 -- LLVM 14.0.6 +- Julia 1.8.4 +- Kotlin 1.8.0 +- LLVM 15.0.5 - Node 16.19.0 - Perl 5.32.1 -- PHP 8.2.0 +- PHP 8.2.1 - Python 3.9.13 - Ruby 3.0.5p211 ### Package Management - Chocolatey 1.2.1 -- Composer 2.4.4 -- Helm 3.10.1 -- Miniconda 4.12.0 (pre-installed on the image but not added to PATH) +- Composer 2.5.1 +- Helm 3.10.3 +- Miniconda 22.11.1 (pre-installed on the image but not added to PATH) - NPM 8.19.3 - NuGet 6.4.0.123 - pip 22.3.1 (python 3.9) - Pipx 1.1.0 - RubyGems 3.2.33 -- Vcpkg (build from commit 4b6bce313) +- Vcpkg (build from commit 5bb5f3923) - Yarn 1.22.19 #### Environment variables @@ -40,27 +46,27 @@ ### Project Management - Ant 1.10.12 - Gradle 7.5 -- Maven 3.8.6 -- sbt 1.8.0 +- Maven 3.8.7 +- sbt 1.8.2 ### Tools - 7zip 22.01 - aria2 1.36.0 - azcopy 10.16.2 -- Bazel 5.4.0 +- Bazel 6.0.0 - Bazelisk 1.13.2 - Bicep 0.13.1 - Cabal 3.8.1.0 - CMake 3.25.1 - CodeQL Action Bundle 2.11.6 -- Docker 20.10.21 +- Docker 20.10.22 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.14.1 +- Docker Compose v2 2.15.1 - Docker-wincred 0.7.0 -- ghc 9.4.2 -- Git 2.39.0.windows.1 +- ghc 9.4.4 +- Git 2.39.0.windows.2 - Git LFS 3.3.0 -- ImageMagick 7.1.0-54 +- ImageMagick 7.1.0-56 - InnoSetup 6.2.1 - jq 1.6 - Kind 0.17.0 @@ -71,26 +77,26 @@ - NSIS 3.08 - OpenSSL 1.1.1 - Packer 1.8.4 -- Pulumi 3.49.0 +- Pulumi 3.51.0 - R 4.2.2 -- Service Fabric SDK 9.0.1028.9590 -- Stack 2.9.1 +- Service Fabric SDK 9.1.1436.9590 +- Stack 2.9.3 - Subversion (SVN) 1.14.2 - Swig 4.0.2 - VSWhere 3.1.1 - WinAppDriver 1.2.2009.02003 -- WiX Toolset v3.11.2.4516 +- WiX Toolset 3.11.2.4516 - yamllint 1.28.0 - zstd 1.5.2 ### CLI Tools -- Alibaba Cloud CLI 3.0.140 -- AWS CLI 2.9.7 -- AWS SAM CLI 1.66.0 +- Alibaba Cloud CLI 3.0.144 +- AWS CLI 2.9.13 +- AWS SAM CLI 1.68.0 - AWS Session Manager CLI 1.2.398.0 - Azure CLI 2.43.0 - Azure DevOps CLI extension 0.25.0 -- GitHub CLI 2.20.2 +- GitHub CLI 2.21.2 - Hub CLI 2.14.2 ### Rust Tools @@ -110,9 +116,9 @@ ### Browsers and Drivers - Google Chrome 108.0.5359.125 - Chrome Driver 108.0.5359.71 -- Microsoft Edge 108.0.1462.46 -- Microsoft Edge Driver 108.0.1462.46 -- Mozilla Firefox 108.0 +- Microsoft Edge 108.0.1462.76 +- Microsoft Edge Driver 108.0.1462.76 +- Mozilla Firefox 108.0.2 - Gecko Driver 0.32.0 - IE Driver 4.7.0.0 - Selenium server 4.7.0 @@ -142,7 +148,7 @@ ### MSYS2 - Pacman 6.0.1 -##### Notes: +#### Notes ``` Location: C:\msys64 @@ -150,6 +156,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ``` ### Cached Tools + #### Go - 1.17.13 - 1.18.9 @@ -158,7 +165,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Node.js - 14.21.2 - 16.19.0 -- 18.12.1 +- 18.13.0 #### Python - 3.7.9 @@ -168,10 +175,10 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 3.11.1 #### PyPy -- 2.7.18 [PyPy 7.3.10] +- 2.7.18 [PyPy 7.3.11] - 3.7.13 [PyPy 7.3.9] -- 3.8.15 [PyPy 7.3.10] -- 3.9.15 [PyPy 7.3.10] +- 3.8.16 [PyPy 7.3.11] +- 3.9.16 [PyPy 7.3.11] #### Ruby - 2.7.7 @@ -179,6 +186,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 3.1.3 ### Databases + #### PostgreSQL | Property | Value | | -------------------- | ------------------------------------------------------------------------------------------------------------------------------------ | @@ -214,7 +222,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | ----------------------------- | -------------- | -------------------------------------------------------- | | Visual Studio Enterprise 2022 | 17.4.33205.214 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | -#### Workloads, components and extensions: +#### Workloads, components and extensions | Package | Version | | ------------------------------------------------------------------------- | -------------- | | android | 33.0.4.0 | @@ -497,13 +505,11 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Windows Software Development Kit | 10.1.22621.755 | | WixToolset.WixToolsetVisualStudio2022Extension | 1.0.0.22 | -#### Microsoft Visual C++: +#### Microsoft Visual C++ | Name | Architecture | Version | | -------------------------------------------- | ------------ | ----------- | | Microsoft Visual C++ 2010 Redistributable | x64 | 10.0.40219 | | Microsoft Visual C++ 2010 Redistributable | x86 | 10.0.40219 | -| Microsoft Visual C++ 2012 Additional Runtime | x64 | 11.0.61030 | -| Microsoft Visual C++ 2012 Minimum Runtime | x64 | 11.0.61030 | | Microsoft Visual C++ 2013 Additional Runtime | x64 | 12.0.40660 | | Microsoft Visual C++ 2013 Minimum Runtime | x64 | 12.0.40660 | | Microsoft Visual C++ 2022 Additional Runtime | x64 | 14.34.31931 | @@ -514,7 +520,6 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft Visual C++ 2022 Minimum Runtime | x86 | 14.34.31931 | #### Installed Windows SDKs - - 10.0.17763.0 - 10.0.19041.0 - 10.0.20348.0 @@ -533,13 +538,13 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - PowerShell 7.2.8 #### Powershell Modules -- Az: 9.0.1 +- Az: 9.2.0 - Azure: 2.1.0 (Default), 5.3.0 - AzureRM: 2.1.0 (Default), 6.13.1 - Az (Cached): 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip -- AzureRM: 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.230 +- AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip +- AWSPowershell: 4.1.245 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 - Microsoft.Graph: 1.19.0 @@ -549,7 +554,6 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - PSWindowsUpdate: 2.2.0.3 - SqlServer: 21.1.18256 - VSSetup: 2.2.16 - ``` Azure PowerShell module 2.1.0 and AzureRM PowerShell module 2.1.0 are installed and are available via 'Get-Module -ListAvailable'. @@ -557,19 +561,19 @@ All other versions are saved but not installed. ``` ### Android -| Package Name | Version | -| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 8.0 | -| Android Emulator | 31.2.9 | -| Android SDK Build-tools | 33.0.0 33.0.1<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | -| Android SDK Platforms | android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | -| Android SDK Platform-Tools | 33.0.3 | -| Android Support Repository | 47.0.0 | -| CMake | 3.18.1<br>3.22.1 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 23.2.8568313<br>24.0.8215888<br>25.1.8937393 | -| SDK Patch Applier v4 | 1 | +| Package Name | Version | +| -------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 8.0 | +| Android Emulator | 31.2.9 | +| Android SDK Build-tools | 33.0.0 33.0.1<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | +| Android SDK Platforms | android-33-ext4 (rev 1)<br>android-33 (rev 1)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | +| Android SDK Platform-Tools | 33.0.3 | +| Android Support Repository | 47.0.0 | +| CMake | 3.18.1<br>3.22.1 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 23.2.8568313<br>24.0.8215888<br>25.1.8937393 | +| SDK Patch Applier v4 | 1 | #### Environment variables | Name | Value | From 7750a08f65bf1e9a768d66df4e3c15c07efdb645 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Thu, 12 Jan 2023 22:26:45 +0300 Subject: [PATCH 1683/3485] Disable Pester test colors (#6908) --- images/linux/scripts/helpers/Tests.Helpers.psm1 | 4 ++-- images/macos/helpers/Tests.Helpers.psm1 | 2 +- images/win/scripts/ImageHelpers/TestsHelpers.ps1 | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/images/linux/scripts/helpers/Tests.Helpers.psm1 b/images/linux/scripts/helpers/Tests.Helpers.psm1 index 5689d9e54a3b..161165c5376f 100644 --- a/images/linux/scripts/helpers/Tests.Helpers.psm1 +++ b/images/linux/scripts/helpers/Tests.Helpers.psm1 @@ -20,10 +20,10 @@ function Invoke-PesterTests { if (!(Get-Module "Pester")) { Import-Module Pester } - + $configuration = [PesterConfiguration] @{ Run = @{ Path = $testPath; PassThru = $true } - Output = @{ Verbosity = "Detailed" } + Output = @{ Verbosity = "Detailed"; RenderMode = "Plaintext" } } if ($TestName) { $configuration.Filter.FullName = $TestName diff --git a/images/macos/helpers/Tests.Helpers.psm1 b/images/macos/helpers/Tests.Helpers.psm1 index 4eaeec3ceb66..528a0857e685 100644 --- a/images/macos/helpers/Tests.Helpers.psm1 +++ b/images/macos/helpers/Tests.Helpers.psm1 @@ -132,7 +132,7 @@ function Invoke-PesterTests { $configuration = [PesterConfiguration] @{ Run = @{ Path = $testPath; PassThru = $true } - Output = @{ Verbosity = "Detailed" } + Output = @{ Verbosity = "Detailed"; RenderMode = "Plaintext" } } if ($TestName) { $configuration.Filter.FullName = $TestName diff --git a/images/win/scripts/ImageHelpers/TestsHelpers.ps1 b/images/win/scripts/ImageHelpers/TestsHelpers.ps1 index fcc9a61931c0..9e6efc43e3fd 100644 --- a/images/win/scripts/ImageHelpers/TestsHelpers.ps1 +++ b/images/win/scripts/ImageHelpers/TestsHelpers.ps1 @@ -48,7 +48,7 @@ function Invoke-PesterTests { $configuration = [PesterConfiguration] @{ Run = @{ Path = $testPath; PassThru = $true } - Output = @{ Verbosity = "Detailed" } + Output = @{ Verbosity = "Detailed"; RenderMode = "Plaintext"} } if ($TestName) { $configuration.Filter.FullName = $TestName From a86ee04ce629241cab690d8e18ad87ba3b183b5e Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Thu, 12 Jan 2023 23:25:12 +0300 Subject: [PATCH 1684/3485] [Windows] Update Az module pester test (#6902) --- .../scripts/ImageHelpers/ImageHelpers.psm1 | 1 + .../scripts/ImageHelpers/InstallHelpers.ps1 | 1 + .../win/scripts/ImageHelpers/TestsHelpers.ps1 | 27 ++++++++++- .../Installers/Install-AzureModules.ps1 | 8 ++-- .../Tests/PowerShellAzModules.Tests.ps1 | 40 +++++++++++++++++ .../scripts/Tests/PowerShellModules.Tests.ps1 | 45 ------------------- 6 files changed, 72 insertions(+), 50 deletions(-) create mode 100644 images/win/scripts/Tests/PowerShellAzModules.Tests.ps1 diff --git a/images/win/scripts/ImageHelpers/ImageHelpers.psm1 b/images/win/scripts/ImageHelpers/ImageHelpers.psm1 index 2a2b5131f660..a83ab7831ebb 100644 --- a/images/win/scripts/ImageHelpers/ImageHelpers.psm1 +++ b/images/win/scripts/ImageHelpers/ImageHelpers.psm1 @@ -54,4 +54,5 @@ Export-ModuleMember -Function @( 'Get-VisualStudioComponents' 'Get-WindowsUpdatesHistory' 'New-ItemPath' + 'Get-ModuleVersionAsJob' ) diff --git a/images/win/scripts/ImageHelpers/InstallHelpers.ps1 b/images/win/scripts/ImageHelpers/InstallHelpers.ps1 index 0e5401c21d5f..c617dcec7e16 100644 --- a/images/win/scripts/ImageHelpers/InstallHelpers.ps1 +++ b/images/win/scripts/ImageHelpers/InstallHelpers.ps1 @@ -615,3 +615,4 @@ function Get-GitHubPackageDownloadUrl { return $downloadUrl } + diff --git a/images/win/scripts/ImageHelpers/TestsHelpers.ps1 b/images/win/scripts/ImageHelpers/TestsHelpers.ps1 index 9e6efc43e3fd..585543840b51 100644 --- a/images/win/scripts/ImageHelpers/TestsHelpers.ps1 +++ b/images/win/scripts/ImageHelpers/TestsHelpers.ps1 @@ -172,4 +172,29 @@ If (Get-Command -Name Add-ShouldOperator -ErrorAction SilentlyContinue) { Add-ShouldOperator -Name ReturnZeroExitCode -InternalName ShouldReturnZeroExitCode -Test ${function:ShouldReturnZeroExitCode} Add-ShouldOperator -Name ReturnZeroExitCodeWithParam -InternalName ShouldReturnZeroExitCodeWithParam -Test ${function:ShouldReturnZeroExitCodeWithParam} Add-ShouldOperator -Name MatchCommandOutput -InternalName ShouldMatchCommandOutput -Test ${function:ShouldMatchCommandOutput} -} \ No newline at end of file +} + +Function Get-ModuleVersionAsJob { + Param ( + [Parameter(Mandatory)] + [String] $modulePath, + [Parameter(Mandatory)] + [String] $moduleName + ) + # Script block to run commands in separate PowerShell environment + $testJob = Start-Job -ScriptBlock { + param ( + $modulePath, + $moduleName + ) + # Disable warning messages to prevent additional warnings about Az and Azurerm modules in the same session + $WarningPreference = "SilentlyContinue" + $env:PsModulePath = "$modulePath;$env:PsModulePath" + Import-Module -Name $moduleName + (Get-Module -Name $moduleName).Version.ToString() + + } -ArgumentList $modulePath, $moduleName + + $testJob | Wait-Job | Receive-Job | Out-File -FilePath "${env:TEMP}\module-version.txt" + Remove-Job $testJob +} diff --git a/images/win/scripts/Installers/Install-AzureModules.ps1 b/images/win/scripts/Installers/Install-AzureModules.ps1 index 1c98a8c3def9..d5a96ffb48f6 100644 --- a/images/win/scripts/Installers/Install-AzureModules.ps1 +++ b/images/win/scripts/Installers/Install-AzureModules.ps1 @@ -44,7 +44,7 @@ foreach ($module in $modules) foreach ($version in $module.zip_versions) { # Install modules from GH Release - if($null -ne $assets) + if($null -ne $assets) { $asset = $assets | Where-Object version -eq $version ` | Select-Object -ExpandProperty files ` @@ -58,8 +58,8 @@ foreach ($module in $modules) exit 1 } } - # Install modules from vsts blob - else + # Install modules from vsts blob + else { $modulePath = Join-Path -Path $installPSModulePath -ChildPath "${moduleName}_${version}" $filename = "${moduleName}_${version}.zip" @@ -90,4 +90,4 @@ foreach ($module in $modules) $psModuleMachinePath += $env:PSModulePath [Environment]::SetEnvironmentVariable("PSModulePath", $psModuleMachinePath, "Machine") -Invoke-PesterTests -TestFile "PowerShellModules" -TestName "AzureModules" \ No newline at end of file +Invoke-PesterTests -TestFile "PowerShellAzModules" -TestName "AzureModules" \ No newline at end of file diff --git a/images/win/scripts/Tests/PowerShellAzModules.Tests.ps1 b/images/win/scripts/Tests/PowerShellAzModules.Tests.ps1 new file mode 100644 index 000000000000..0fea778f3991 --- /dev/null +++ b/images/win/scripts/Tests/PowerShellAzModules.Tests.ps1 @@ -0,0 +1,40 @@ +Describe "AzureModules" { + + $modules = (Get-ToolsetContent).azureModules + $modulesRootPath = "C:\\Modules" + + foreach ($module in $modules) { + $moduleName = $module.name + + Context "$moduleName" { + + foreach ($version in $module.versions) { + $modulePath = Join-Path -Path $modulesRootPath -ChildPath "${moduleName}_${version}" + $moduleInfo = @{ moduleName = $moduleName; modulePath = $modulePath; expectedVersion = $version } + It "<expectedVersion> exists in modules directory" -TestCases $moduleInfo { + $ScriptBlock = { + param ($modulePath, $moduleName) + Import-Module ImageHelpers + Get-ModuleVersionAsJob -modulePath $modulePath -moduleName $moduleName + } + if ($moduleName -eq "Az"){ + Start-Process -FilePath pwsh.exe -ArgumentList "-Command (Invoke-Command -ScriptBlock {$ScriptBlock} -ArgumentList $modulePath, $moduleName)" -Wait -PassThru + } else { + Start-Process -FilePath powershell.exe -ArgumentList "-Command (Invoke-Command -ScriptBlock {$ScriptBlock} -ArgumentList $modulePath, $moduleName)" -Wait -PassThru + } + $moduleVersion = Get-Content -Path "$env:TEMP\module-version.txt" + Remove-Item -Path "${env:TEMP}\module-version.txt" -Force + $moduleVersion | Should -Match $expectedVersion + } + } + + if ($module.default) { + $moduleInfo = @{ moduleName = $moduleName; moduleDefault = $module.default } + It "<moduleDefault> set as default" -TestCases $moduleInfo { + $moduleVersions = Get-Module -ListAvailable -Name $moduleName | ForEach-Object { $_.Version.ToString() } + $moduleVersions | Should -Contain $moduleDefault + } + } + } + } +} diff --git a/images/win/scripts/Tests/PowerShellModules.Tests.ps1 b/images/win/scripts/Tests/PowerShellModules.Tests.ps1 index 48254d48ba28..9276609d0320 100644 --- a/images/win/scripts/Tests/PowerShellModules.Tests.ps1 +++ b/images/win/scripts/Tests/PowerShellModules.Tests.ps1 @@ -21,48 +21,3 @@ Describe "PowerShellModules" { } } } - -Describe "AzureModules" { - $modules = (Get-ToolsetContent).azureModules - $modulesRootPath = "C:\\Modules" - - foreach ($module in $modules) { - $moduleName = $module.name - - Context "$moduleName" { - - foreach ($version in $module.versions) { - $modulePath = Join-Path -Path $modulesRootPath -ChildPath "${moduleName}_${version}" - $moduleInfo = @{ moduleName = $moduleName; modulePath = $modulePath; expectedVersion = $version } - It "<expectedVersion> exists in modules directory" -TestCases $moduleInfo { - $testJob = Start-Job -ScriptBlock { - param ( - $modulePath, - $moduleName - ) - - # Disable warning messages to prevent additional warnings about Az and Azurerm modules in the same session - $WarningPreference = "SilentlyContinue" - - $env:PsModulePath = "$modulePath;$env:PsModulePath" - Import-Module -Name $moduleName - (Get-Module -Name $moduleName).Version.ToString() - - } -ArgumentList $modulePath, $moduleName - - $moduleVersion = $testJob | Wait-Job | Receive-Job - Remove-Job $testJob - $moduleVersion | Should -Match $expectedVersion - } - } - - if ($module.default) { - $moduleInfo = @{ moduleName = $moduleName; moduleDefault = $module.default } - It "<moduleDefault> set as default" -TestCases $moduleInfo { - $moduleVersions = Get-Module -ListAvailable -Name $moduleName | ForEach-Object { $_.Version.ToString() } - $moduleVersions | Should -Contain $moduleDefault - } - } - } - } -} \ No newline at end of file From b26e3736c1142842ad8f4877d11658d6216dd550 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Fri, 13 Jan 2023 09:57:26 +0100 Subject: [PATCH 1685/3485] [macOS] Switch defailt Xcode to 14.2 (#6907) --- images/macos/toolsets/toolset-12.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index cf60edf5974a..22df06338bea 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -1,6 +1,6 @@ { "xcode": { - "default": "14.1", + "default": "14.2", "versions": [ {"link": "14.2", "version": "14.2.0"}, { "link": "14.1", "version": "14.1.0"}, From 7d596c72168f189a1db0a6f4881063ccc087310c Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Sun, 15 Jan 2023 20:11:33 +0100 Subject: [PATCH 1686/3485] [Ubuntu] fix ghcup version in software report (#6919) --- images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 index 5bd7fd89b766..46e9a450038b 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 @@ -241,7 +241,7 @@ function Get-GHCVersion { } function Get-GHCupVersion { - $(ghcup --version) -match "version v(?<version>\d+(\.\d+){2,})" | Out-Null + $(ghcup --version) -match "version (?<version>\d+(\.\d+){2,})" | Out-Null return $Matches.version } From ea70a6473314052a9b1c503bb4c1f2cb5efa5230 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Wed, 18 Jan 2023 19:51:36 +0300 Subject: [PATCH 1687/3485] [Windows] Add retry to Install-VsixExtension (#6934) --- .../scripts/ImageHelpers/InstallHelpers.ps1 | 69 +++++++++++-------- 1 file changed, 39 insertions(+), 30 deletions(-) diff --git a/images/win/scripts/ImageHelpers/InstallHelpers.ps1 b/images/win/scripts/ImageHelpers/InstallHelpers.ps1 index c617dcec7e16..09bb51a68f84 100644 --- a/images/win/scripts/ImageHelpers/InstallHelpers.ps1 +++ b/images/win/scripts/ImageHelpers/InstallHelpers.ps1 @@ -274,7 +274,7 @@ function Install-VsixExtension [string] $FilePath, [Parameter(Mandatory = $true)] [string] $VSversion, - [int] $retries = 20, + [int] $Retries = 20, [switch] $InstallOnly ) @@ -285,45 +285,54 @@ function Install-VsixExtension $argumentList = ('/quiet', "`"$FilePath`"") - Write-Host "Starting Install $Name..." - $vsEdition = (Get-ToolsetContent).visualStudio.edition - try + do { - $installPath = ${env:ProgramFiles(x86)} + Write-Host "Starting Install $Name..." + $vsEdition = (Get-ToolsetContent).visualStudio.edition + try + { + $installPath = ${env:ProgramFiles(x86)} - if (Test-IsWin22) + if (Test-IsWin22) + { + $installPath = ${env:ProgramFiles} + } + + #There are 2 types of packages at the moment - exe and vsix + if ($Name -match "vsix") + { + $process = Start-Process -FilePath "${installPath}\Microsoft Visual Studio\${VSversion}\${vsEdition}\Common7\IDE\VSIXInstaller.exe" -ArgumentList $argumentList -Wait -PassThru + } + else + { + $process = Start-Process -FilePath ${env:Temp}\$Name /Q -Wait -PassThru + } + } + catch { - $installPath = ${env:ProgramFiles} + Write-Host "There is an error during $Name installation" + $_ + exit 1 } - #There are 2 types of packages at the moment - exe and vsix - if ($Name -match "vsix") + $exitCode = $process.ExitCode + + if ($exitCode -eq 0 -or $exitCode -eq 1001) # 1001 means the extension is already installed { - $process = Start-Process -FilePath "${installPath}\Microsoft Visual Studio\${VSversion}\${vsEdition}\Common7\IDE\VSIXInstaller.exe" -ArgumentList $argumentList -Wait -PassThru + Write-Host "$Name installed successfully" } else { - $process = Start-Process -FilePath ${env:Temp}\$Name /Q -Wait -PassThru + Write-Host "Unsuccessful exit code returned by the installation process: $exitCode." + $Retries-- + if ($Retries -eq 0) { + Write-Host "The $Name couldn't be installed after 20 attempts." + }else { + Write-Host "Waiting 10 seconds before retrying. Retries left: $Retries" + Start-Sleep -Seconds 10 + } } - } - catch - { - Write-Host "There is an error during $Name installation" - $_ - exit 1 - } - - $exitCode = $process.ExitCode - - if ($exitCode -eq 0 -or $exitCode -eq 1001) # 1001 means the extension is already installed - { - Write-Host "$Name installed successfully" - } - else - { - Write-Host "Unsuccessful exit code returned by the installation process: $exitCode." - exit 1 - } + } until ($exitCode -eq 0 -or $exitCode -eq 1001 -or $Retries -eq 0 ) #Cleanup downloaded installation files if (-not $InstallOnly) From 370727c2fbb407ce046e5d5397992703702d22b8 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 19 Jan 2023 03:52:43 +0000 Subject: [PATCH 1688/3485] Windows Server 2019 (20230117) Image Update (#6932) * Updating readme file for win19 version 20230117.1 * Update Windows2019-Readme.md Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2019-Readme.md | 208 +++++++++++++++---------------- 1 file changed, 104 insertions(+), 104 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index be628956648c..99e95671c640 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -1,34 +1,39 @@ +| Announcements | +|-| +| [[All OSs] .NET 5.x will be removed from the images on January, 29](https://github.com/actions/runner-images/issues/6840) | +*** # Windows Server 2019 -- OS Version: 10.0.17763 Build 3770 -- Image Version: 20221214.4 +- OS Version: 10.0.17763 Build 3887 +- Image Version: 20230117.1 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled ## Installed Software + ### Language and Runtime - Bash 5.2.12(1)-release - Go 1.17.13 -- Julia 1.8.3 -- Kotlin 1.7.22 -- LLVM 14.0.6 +- Julia 1.8.5 +- Kotlin 1.8.0 +- LLVM 15.0.5 - Node 16.19.0 - Perl 5.32.1 -- PHP 8.2.0 +- PHP 8.2.1 - Python 3.7.9 - Ruby 2.5.9p229 ### Package Management - Chocolatey 1.2.1 -- Composer 2.4.4 -- Helm 3.10.1 -- Miniconda 4.12.0 (pre-installed on the image but not added to PATH) +- Composer 2.5.1 +- Helm 3.10.3 +- Miniconda 22.11.1 (pre-installed on the image but not added to PATH) - NPM 8.19.3 - NuGet 6.4.0.123 - pip 22.3.1 (python 3.7) - Pipx 1.1.0 - RubyGems 2.7.6.3 -- Vcpkg (build from commit 56765209e) +- Vcpkg (build from commit ae826fcea) - Yarn 1.22.19 #### Environment variables @@ -38,30 +43,30 @@ | CONDA | C:\Miniconda | ### Project Management -- Ant 1.10.12 -- Gradle 7.5 -- Maven 3.8.6 -- sbt 1.8.0 +- Ant 1.10.13 +- Gradle 7.6 +- Maven 3.8.7 +- sbt 1.8.2 ### Tools - 7zip 22.01 - aria2 1.36.0 - azcopy 10.16.2 -- Bazel 5.3.2 +- Bazel 6.0.0 - Bazelisk 1.13.2 - Bicep 0.13.1 - Cabal 3.8.1.0 - CMake 3.25.1 -- CodeQL Action Bundle 2.11.6 -- Docker 20.10.21 +- CodeQL Action Bundle 2.12.0 +- Docker 20.10.22 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.14.0 +- Docker Compose v2 2.15.1 - Docker-wincred 0.7.0 -- ghc 9.4.2 -- Git 2.39.0.windows.1 +- ghc 9.4.4 +- Git 2.39.1.windows.1 - Git LFS 3.3.0 -- Google Cloud SDK 412.0.0 -- ImageMagick 7.1.0-54 +- Google Cloud SDK 413.0.0 +- ImageMagick 7.1.0-57 - InnoSetup 6.2.1 - jq 1.6 - Kind 0.17.0 @@ -73,33 +78,33 @@ - OpenSSL 1.1.1 - Packer 1.8.4 - Parcel 2.8.2 -- Pulumi 3.49.0 +- Pulumi 3.51.1 - R 4.2.2 -- Service Fabric SDK 9.0.1028.9590 -- Stack 2.9.1 +- Service Fabric SDK 9.1.1436.9590 +- Stack 2.9.3 - Subversion (SVN) 1.14.2 - Swig 4.0.2 - VSWhere 3.1.1 - WinAppDriver 1.2.2009.02003 -- WiX Toolset v3.11.2.4516 -- yamllint 1.28.0 +- WiX Toolset 3.11.2.4516 +- yamllint 1.29.0 - zstd 1.5.2 ### CLI Tools -- Alibaba Cloud CLI 3.0.140 -- AWS CLI 2.9.6 -- AWS SAM CLI 1.66.0 +- Alibaba Cloud CLI 3.0.144 +- AWS CLI 2.9.15 +- AWS SAM CLI 1.70.0 - AWS Session Manager CLI 1.2.398.0 -- Azure CLI 2.43.0 +- Azure CLI 2.44.1 - Azure DevOps CLI extension 0.25.0 - Cloud Foundry CLI 6.53.0 -- GitHub CLI 2.20.2 +- GitHub CLI 2.21.2 - Hub CLI 2.14.2 ### Rust Tools -- Cargo 1.65.0 -- Rust 1.65.0 -- Rustdoc 1.65.0 +- Cargo 1.66.1 +- Rust 1.66.1 +- Rustdoc 1.66.1 - Rustup 1.25.1 #### Packages @@ -107,15 +112,15 @@ - cargo-audit 0.17.4 - cargo-outdated 0.11.1 - cbindgen 0.24.3 -- Clippy 0.1.65 +- Clippy 0.1.66 - Rustfmt 1.5.1 ### Browsers and Drivers -- Google Chrome 108.0.5359.125 -- Chrome Driver 108.0.5359.71 -- Microsoft Edge 108.0.1462.46 -- Microsoft Edge Driver 108.0.1462.46 -- Mozilla Firefox 108.0 +- Google Chrome 109.0.5414.75 +- Chrome Driver 109.0.5414.74 +- Microsoft Edge 109.0.1518.55 +- Microsoft Edge Driver 109.0.1518.55 +- Mozilla Firefox 109.0 - Gecko Driver 0.32.0 - IE Driver 4.7.0.0 - Selenium server 4.7.0 @@ -146,7 +151,7 @@ ### MSYS2 - Pacman 6.0.1 -##### Notes: +#### Notes ``` Location: C:\msys64 @@ -157,15 +162,16 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - BizTalk Server Project Build Component 3.13.832.0 ### Cached Tools + #### Go - 1.17.13 -- 1.18.9 -- 1.19.4 +- 1.18.10 +- 1.19.5 #### Node.js -- 14.21.1 -- 16.18.1 -- 18.12.1 +- 14.21.2 +- 16.19.0 +- 18.13.0 #### Python - 2.7.18 @@ -177,11 +183,11 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 3.11.1 #### PyPy -- 2.7.18 [PyPy 7.3.10] +- 2.7.18 [PyPy 7.3.11] - 3.6.12 [PyPy 7.3.3] - 3.7.13 [PyPy 7.3.9] -- 3.8.15 [PyPy 7.3.10] -- 3.9.15 [PyPy 7.3.10] +- 3.8.16 [PyPy 7.3.11] +- 3.9.16 [PyPy 7.3.11] #### Ruby - 2.4.10 @@ -192,6 +198,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 3.1.3 ### Databases + #### PostgreSQL | Property | Value | | -------------------- | ------------------------------------------------------------------------------------------------------------------------------------ | @@ -225,12 +232,12 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Visual Studio Enterprise 2019 | Name | Version | Path | | ----------------------------- | --------------- | -------------------------------------------------------------- | -| Visual Studio Enterprise 2019 | 16.11.33130.400 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | +| Visual Studio Enterprise 2019 | 16.11.33214.272 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | -#### Workloads, components and extensions: +#### Workloads, components and extensions | Package | Version | | ------------------------------------------------------------------------- | --------------- | -| Component.Android.NDK.R16B | 16.11.33130.273 | +| Component.Android.NDK.R16B | 16.11.33213.291 | | Component.Android.SDK25.Private | 16.0.28625.61 | | Component.Android.SDK30 | 16.10.31205.252 | | Component.Ant | 1.9.3.8 | @@ -257,7 +264,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Component.Xamarin.RemotedSimulator | 16.11.32629.160 | | Microsoft.Component.Azure.DataLake.Tools | 16.10.31205.252 | | Microsoft.Component.ClickOnce | 16.11.31603.221 | -| Microsoft.Component.MSBuild | 16.5.29515.121 | +| Microsoft.Component.MSBuild | 16.11.33214.272 | | Microsoft.Component.NetFX.Native | 16.5.29515.121 | | Microsoft.Component.PythonTools | 16.11.31314.313 | | Microsoft.Component.PythonTools.Miniconda | 16.11.31314.313 | @@ -283,11 +290,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.Net.ComponentGroup.4.7.DeveloperTools | 16.3.29207.166 | | Microsoft.Net.ComponentGroup.DevelopmentPrerequisites | 16.3.29207.166 | | Microsoft.Net.ComponentGroup.TargetingPacks.Common | 16.0.28516.191 | -| Microsoft.NetCore.Component.DevelopmentTools | 16.10.31303.231 | -| Microsoft.NetCore.Component.Runtime.3.1 | 16.11.33130.400 | -| Microsoft.NetCore.Component.Runtime.6.0 | 16.11.33130.400 | -| Microsoft.NetCore.Component.SDK | 16.11.33130.400 | -| Microsoft.NetCore.Component.Web | 16.10.31303.231 | +| Microsoft.NetCore.Component.DevelopmentTools | 16.11.33214.272 | +| Microsoft.NetCore.Component.Web | 16.11.33214.272 | | Microsoft.VisualStudio.Component.AppInsights.Tools | 16.5.29515.121 | | Microsoft.VisualStudio.Component.AspNet45 | 16.10.31205.252 | | Microsoft.VisualStudio.Component.Azure.AuthoringTools | 16.11.31827.77 | @@ -310,7 +314,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Component.Debugger.Snapshot | 16.5.29813.82 | | Microsoft.VisualStudio.Component.Debugger.TimeTravel | 16.10.31205.252 | | Microsoft.VisualStudio.Component.DiagnosticTools | 16.10.31205.252 | -| Microsoft.VisualStudio.Component.DockerTools | 16.4.29409.204 | +| Microsoft.VisualStudio.Component.DockerTools | 16.11.33214.272 | | Microsoft.VisualStudio.Component.DotNetModelBuilder | 16.10.31205.252 | | Microsoft.VisualStudio.Component.DslTools | 16.0.28315.86 | | Microsoft.VisualStudio.Component.EntityFramework | 16.0.28315.86 | @@ -328,7 +332,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Component.LinqToSql | 16.0.28625.61 | | Microsoft.VisualStudio.Component.LiveUnitTesting | 16.10.31205.252 | | Microsoft.VisualStudio.Component.ManagedDesktop.Core | 16.4.29318.151 | -| Microsoft.VisualStudio.Component.ManagedDesktop.Prerequisites | 16.10.31205.180 | +| Microsoft.VisualStudio.Component.ManagedDesktop.Prerequisites | 16.11.33214.272 | | Microsoft.VisualStudio.Component.Merq | 16.2.29012.281 | | Microsoft.VisualStudio.Component.MonoDebugger | 16.0.28517.75 | | Microsoft.VisualStudio.Component.MSODBC.SQL | 16.0.28625.61 | @@ -423,8 +427,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.ComponentGroup.MSIX.Packaging | 16.10.31205.180 | | Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core | 16.2.29012.281 | | Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Llvm.Clang | 16.11.31603.221 | -| Microsoft.VisualStudio.ComponentGroup.UWP.NetCoreAndStandard | 16.3.29102.218 | -| Microsoft.VisualStudio.ComponentGroup.UWP.Support | 16.10.31205.180 | +| Microsoft.VisualStudio.ComponentGroup.UWP.NetCoreAndStandard | 16.11.33214.272 | +| Microsoft.VisualStudio.ComponentGroup.UWP.Support | 16.11.33214.272 | | Microsoft.VisualStudio.ComponentGroup.UWP.VC | 16.10.31205.180 | | Microsoft.VisualStudio.ComponentGroup.UWP.VC.v141 | 16.1.28810.153 | | Microsoft.VisualStudio.ComponentGroup.UWP.Xamarin | 16.10.31205.180 | @@ -435,41 +439,39 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions | 16.11.32413.511 | | Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.CMake | 16.11.32413.511 | | Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.TemplateEngine | 16.11.32413.511 | -| Microsoft.VisualStudio.Workload.Azure | 16.11.31503.43 | +| Microsoft.VisualStudio.Workload.Azure | 16.11.33214.272 | | Microsoft.VisualStudio.Workload.CoreEditor | 16.10.31205.180 | | Microsoft.VisualStudio.Workload.Data | 16.0.28720.110 | | Microsoft.VisualStudio.Workload.DataScience | 16.10.31205.180 | -| Microsoft.VisualStudio.Workload.ManagedDesktop | 16.10.31303.231 | +| Microsoft.VisualStudio.Workload.ManagedDesktop | 16.11.33214.272 | | Microsoft.VisualStudio.Workload.ManagedGame | 16.10.31205.180 | | Microsoft.VisualStudio.Workload.NativeCrossPlat | 16.10.31205.180 | | Microsoft.VisualStudio.Workload.NativeDesktop | 16.11.31727.170 | | Microsoft.VisualStudio.Workload.NativeGame | 16.11.31727.170 | | Microsoft.VisualStudio.Workload.NativeMobile | 16.10.31205.180 | -| Microsoft.VisualStudio.Workload.NetCoreTools | 16.10.31303.231 | -| Microsoft.VisualStudio.Workload.NetCrossPlat | 16.10.31205.180 | -| Microsoft.VisualStudio.Workload.NetWeb | 16.10.31303.231 | +| Microsoft.VisualStudio.Workload.NetCoreTools | 16.11.33214.272 | +| Microsoft.VisualStudio.Workload.NetCrossPlat | 16.11.33214.272 | +| Microsoft.VisualStudio.Workload.NetWeb | 16.11.33214.272 | | Microsoft.VisualStudio.Workload.Node | 16.10.31205.180 | -| Microsoft.VisualStudio.Workload.Office | 16.10.31205.180 | +| Microsoft.VisualStudio.Workload.Office | 16.11.33214.272 | | Microsoft.VisualStudio.Workload.Python | 16.11.32001.129 | -| Microsoft.VisualStudio.Workload.Universal | 16.11.31727.170 | +| Microsoft.VisualStudio.Workload.Universal | 16.11.33214.272 | | Microsoft.VisualStudio.Workload.VisualStudioExtension | 16.10.31205.180 | | ms-biztalk.BizTalk | 3.13.2.0 | | ProBITools.MicrosoftAnalysisServicesModelingProjects | 2.9.18 | | ProBITools.MicrosoftReportProjectsforVisualStudio | 2.6.11 | -| SSIS.SqlServerIntegrationServicesProjects | 4.3 | +| SSIS.SqlServerIntegrationServicesProjects | 4.4 | | VisualStudioClient.MicrosoftVisualStudio2017InstallerProjects | 1.0.2 | | Windows Driver Kit | 10.1.22000.1 | | Windows Driver Kit Visual Studio Extension | 10.0.21381.0 | | Windows Software Development Kit | 10.1.22621.755 | | WixToolset.WixToolsetVisualStudio2019Extension | 1.0.0.22 | -#### Microsoft Visual C++: +#### Microsoft Visual C++ | Name | Architecture | Version | | -------------------------------------------- | ------------ | ----------- | | Microsoft Visual C++ 2010 Redistributable | x64 | 10.0.40219 | | Microsoft Visual C++ 2010 Redistributable | x86 | 10.0.40219 | -| Microsoft Visual C++ 2012 Additional Runtime | x64 | 11.0.61030 | -| Microsoft Visual C++ 2012 Minimum Runtime | x64 | 11.0.61030 | | Microsoft Visual C++ 2013 Additional Runtime | x64 | 12.0.40660 | | Microsoft Visual C++ 2013 Minimum Runtime | x64 | 12.0.40660 | | Microsoft Visual C++ 2013 Additional Runtime | x86 | 12.0.21005 | @@ -482,7 +484,6 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft Visual C++ 2022 Minimum Runtime | x86 | 14.34.31931 | #### Installed Windows SDKs - - 10.0.14393.0 - 10.0.16299.0 - 10.0.17134.0 @@ -494,34 +495,33 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 10.0.22621.0 ### .NET Core Tools -- .NET Core SDK: 3.1.120, 3.1.202, 3.1.302, 3.1.426, 5.0.104, 5.0.214, 5.0.303, 5.0.408, 5.0.415, 6.0.112, 6.0.203, 6.0.307, 6.0.404 +- .NET Core SDK: 3.1.120, 3.1.202, 3.1.302, 3.1.426, 5.0.104, 5.0.214, 5.0.303, 5.0.408, 6.0.113, 6.0.203, 6.0.308, 6.0.405 - .NET Framework: 4.7.2, 4.8 -- Microsoft.AspNetCore.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 5.0.4, 5.0.9, 5.0.17, 6.0.5, 6.0.12 -- Microsoft.NETCore.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 5.0.4, 5.0.9, 5.0.17, 6.0.5, 6.0.12 -- Microsoft.WindowsDesktop.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 5.0.4, 5.0.9, 5.0.17, 6.0.5, 6.0.12 +- Microsoft.AspNetCore.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 5.0.4, 5.0.9, 5.0.17, 6.0.5, 6.0.13 +- Microsoft.NETCore.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 5.0.4, 5.0.9, 5.0.17, 6.0.5, 6.0.13 +- Microsoft.WindowsDesktop.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 5.0.4, 5.0.9, 5.0.17, 6.0.5, 6.0.13 - nbgv 3.5.119+5d25f54fec ### PowerShell Tools - PowerShell 7.2.8 #### Powershell Modules -- Az: 9.0.1 +- Az: 9.2.0 - Azure: 2.1.0 (Default), 5.3.0 - AzureRM: 2.1.0 (Default), 6.13.1 - Az (Cached): 1.0.0.zip, 1.6.0.zip, 2.3.2.zip, 2.6.0.zip, 3.1.0.zip, 3.5.0.zip, 3.8.0.zip, 4.3.0.zip, 4.4.0.zip, 4.7.0.zip, 5.5.0.zip, 5.9.0.zip, 6.6.0.zip, 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip -- AzureRM: 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.229 +- AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip +- AWSPowershell: 4.1.250 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 -- Microsoft.Graph: 1.18.0 -- Pester: 3.4.0, 5.3.3 +- Microsoft.Graph: 1.20.0 +- Pester: 3.4.0, 5.4.0 - PowerShellGet: 1.0.0.1, 2.2.5 - PSScriptAnalyzer: 1.21.0 - PSWindowsUpdate: 2.2.0.3 - SqlServer: 21.1.18256 - VSSetup: 2.2.16 - ``` Azure PowerShell module 2.1.0 and AzureRM PowerShell module 2.1.0 are installed and are available via 'Get-Module -ListAvailable'. @@ -529,20 +529,20 @@ All other versions are saved but not installed. ``` ### Android -| Package Name | Version | -| -------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 8.0 | -| Android SDK Build-tools | 33.0.0 33.0.1<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3<br>26.0.0 26.0.1 26.0.2 26.0.3<br>25.0.0 25.0.1 25.0.2 25.0.3<br>24.0.0 24.0.1 24.0.2 24.0.3<br>23.0.1 23.0.2 23.0.3<br>22.0.1<br>21.1.2<br>20.0.0<br>19.1.0 | -| Android SDK Platforms | android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3)<br>android-26 (rev 2)<br>android-25 (rev 3)<br>android-24 (rev 2)<br>android-23 (rev 3)<br>android-22 (rev 2)<br>android-21 (rev 2)<br>android-20 (rev 2)<br>android-19 (rev 4) | -| Android SDK Platform-Tools | 33.0.3 | -| Android SDK Tools | 26.1.1 | -| Android Support Repository | 47.0.0 | -| CMake | 3.10.2<br>3.18.1<br>3.22.1 | -| Google APIs | addon-google_apis-google-21<br>addon-google_apis-google-22<br>addon-google_apis-google-23<br>addon-google_apis-google-24 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 23.2.8568313<br>24.0.8215888<br>25.1.8937393 | -| SDK Patch Applier v4 | 1 | +| Package Name | Version | +| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 8.0 | +| Android SDK Build-tools | 33.0.0 33.0.1<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3<br>26.0.0 26.0.1 26.0.2 26.0.3<br>25.0.0 25.0.1 25.0.2 25.0.3<br>24.0.0 24.0.1 24.0.2 24.0.3<br>23.0.1 23.0.2 23.0.3<br>22.0.1<br>21.1.2<br>20.0.0<br>19.1.0 | +| Android SDK Platforms | android-33-ext4 (rev 1)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3)<br>android-26 (rev 2)<br>android-25 (rev 3)<br>android-24 (rev 2)<br>android-23 (rev 3)<br>android-22 (rev 2)<br>android-21 (rev 2)<br>android-20 (rev 2)<br>android-19 (rev 4) | +| Android SDK Platform-Tools | 33.0.3 | +| Android SDK Tools | 26.1.1 | +| Android Support Repository | 47.0.0 | +| CMake | 3.10.2<br>3.18.1<br>3.22.1 | +| Google APIs | addon-google_apis-google-21<br>addon-google_apis-google-22<br>addon-google_apis-google-23<br>addon-google_apis-google-24 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 23.2.8568313<br>24.0.8215888<br>25.1.8937393 | +| SDK Patch Applier v4 | 1 | #### Environment variables | Name | Value | @@ -557,9 +557,9 @@ All other versions are saved but not installed. ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:67b8f70388bd3a455e64a709782babdea99fd97b5f2e343a79978e31dd087a56 | 2022-12-13 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:af2547c14679be4380beab9e7a763b4d8d4426213618c5c8b6854ab95a49fdd4 | 2022-12-13 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:e1fb1f060588e990706e44a0b187eb476d8e5102d00d0d708688d030aadaf8ef | 2022-12-13 | -| mcr.microsoft.com/windows/nanoserver:1809 | sha256:5b034bcdcdeafd57f1151924a80d741c7220c8276cce4c6c6d3cb1bb8d9ebf6b | 2022-12-11 | -| mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:058c8482946efa0b44b57e5ecebd7857b4df37a1365acdde32736628747ad9e1 | 2022-12-11 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:4023e36afe8362191abad7aba8bb8044095fe23826dea4cb7183de912b0ddbdc | 2023-01-10 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:01992d00b171c830916b9600a380ef5c291c8670db86235255335c1f65bde911 | 2023-01-10 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:5049a4803de68e7c5aa2840186ea3de1462db56a60329479d259dc48700d19a0 | 2023-01-10 | +| mcr.microsoft.com/windows/nanoserver:1809 | sha256:18161f2add9622768033bacf4f069d6d618a734aa9587c6d213fc15d99bcb057 | 2023-01-07 | +| mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:192adcdbbcebf7000d95a0ca34422709127e20b0334e6968381a198c816c9f9f | 2023-01-07 | From 23a732a107efcd2a92097c929faa797515dd60ed Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 19 Jan 2023 12:08:00 +0000 Subject: [PATCH 1689/3485] Updating readme file for win22 version 20230118.1 (#6938) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2022-Readme.md | 115 +++++++++++++++---------------- 1 file changed, 57 insertions(+), 58 deletions(-) diff --git a/images/win/Windows2022-Readme.md b/images/win/Windows2022-Readme.md index a1f823bfeeac..dba823da0772 100644 --- a/images/win/Windows2022-Readme.md +++ b/images/win/Windows2022-Readme.md @@ -1,11 +1,10 @@ | Announcements | |-| | [[All OSs] .NET 5.x will be removed from the images on January, 29](https://github.com/actions/runner-images/issues/6840) | -| [[Windows] OpenSSL version will be upgraded to 3.x on January, 9](https://github.com/actions/runner-images/issues/6830) | *** # Windows Server 2022 -- OS Version: 10.0.20348 Build 1366 -- Image Version: 20230109.1 +- OS Version: 10.0.20348 Build 1487 +- Image Version: 20230118.1 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -15,7 +14,7 @@ ### Language and Runtime - Bash 5.2.12(1)-release - Go 1.17.13 -- Julia 1.8.4 +- Julia 1.8.5 - Kotlin 1.8.0 - LLVM 15.0.5 - Node 16.19.0 @@ -34,7 +33,7 @@ - pip 22.3.1 (python 3.9) - Pipx 1.1.0 - RubyGems 3.2.33 -- Vcpkg (build from commit 5bb5f3923) +- Vcpkg (build from commit 5908d702d) - Yarn 1.22.19 #### Environment variables @@ -44,8 +43,8 @@ | CONDA | C:\Miniconda | ### Project Management -- Ant 1.10.12 -- Gradle 7.5 +- Ant 1.10.13 +- Gradle 7.6 - Maven 3.8.7 - sbt 1.8.2 @@ -58,15 +57,15 @@ - Bicep 0.13.1 - Cabal 3.8.1.0 - CMake 3.25.1 -- CodeQL Action Bundle 2.11.6 +- CodeQL Action Bundle 2.12.0 - Docker 20.10.22 - Docker Compose v1 1.29.2 - Docker Compose v2 2.15.1 - Docker-wincred 0.7.0 - ghc 9.4.4 -- Git 2.39.0.windows.2 +- Git 2.39.1.windows.1 - Git LFS 3.3.0 -- ImageMagick 7.1.0-56 +- ImageMagick 7.1.0-57 - InnoSetup 6.2.1 - jq 1.6 - Kind 0.17.0 @@ -77,7 +76,7 @@ - NSIS 3.08 - OpenSSL 1.1.1 - Packer 1.8.4 -- Pulumi 3.51.0 +- Pulumi 3.51.1 - R 4.2.2 - Service Fabric SDK 9.1.1436.9590 - Stack 2.9.3 @@ -86,23 +85,23 @@ - VSWhere 3.1.1 - WinAppDriver 1.2.2009.02003 - WiX Toolset 3.11.2.4516 -- yamllint 1.28.0 +- yamllint 1.29.0 - zstd 1.5.2 ### CLI Tools - Alibaba Cloud CLI 3.0.144 -- AWS CLI 2.9.13 -- AWS SAM CLI 1.68.0 +- AWS CLI 2.9.15 +- AWS SAM CLI 1.70.0 - AWS Session Manager CLI 1.2.398.0 -- Azure CLI 2.43.0 +- Azure CLI 2.44.1 - Azure DevOps CLI extension 0.25.0 - GitHub CLI 2.21.2 - Hub CLI 2.14.2 ### Rust Tools -- Cargo 1.66.0 -- Rust 1.66.0 -- Rustdoc 1.66.0 +- Cargo 1.66.1 +- Rust 1.66.1 +- Rustdoc 1.66.1 - Rustup 1.25.1 #### Packages @@ -114,11 +113,11 @@ - Rustfmt 1.5.1 ### Browsers and Drivers -- Google Chrome 108.0.5359.125 -- Chrome Driver 108.0.5359.71 -- Microsoft Edge 108.0.1462.76 -- Microsoft Edge Driver 108.0.1462.76 -- Mozilla Firefox 108.0.2 +- Google Chrome 109.0.5414.75 +- Chrome Driver 109.0.5414.74 +- Microsoft Edge 109.0.1518.55 +- Microsoft Edge Driver 109.0.1518.55 +- Mozilla Firefox 109.0 - Gecko Driver 0.32.0 - IE Driver 4.7.0.0 - Selenium server 4.7.0 @@ -159,8 +158,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Go - 1.17.13 -- 1.18.9 -- 1.19.4 +- 1.18.10 +- 1.19.5 #### Node.js - 14.21.2 @@ -220,7 +219,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Visual Studio Enterprise 2022 | Name | Version | Path | | ----------------------------- | -------------- | -------------------------------------------------------- | -| Visual Studio Enterprise 2022 | 17.4.33205.214 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | +| Visual Studio Enterprise 2022 | 17.4.33213.308 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | #### Workloads, components and extensions | Package | Version | @@ -283,21 +282,21 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.Net.ComponentGroup.4.8.DeveloperTools | 17.4.33006.217 | | Microsoft.Net.ComponentGroup.DevelopmentPrerequisites | 17.4.33006.217 | | Microsoft.Net.ComponentGroup.TargetingPacks.Common | 17.4.33006.217 | -| microsoft.net.runtime.android | 7.0.122.56804 | -| microsoft.net.runtime.android.aot | 7.0.122.56804 | -| microsoft.net.runtime.android.aot.net6 | 7.0.122.56804 | -| microsoft.net.runtime.android.net6 | 7.0.122.56804 | -| microsoft.net.runtime.ios | 7.0.122.56804 | -| microsoft.net.runtime.ios.net6 | 7.0.122.56804 | -| microsoft.net.runtime.maccatalyst | 7.0.122.56804 | -| microsoft.net.runtime.maccatalyst.net6 | 7.0.122.56804 | -| microsoft.net.runtime.mono.tooling | 7.0.122.56804 | -| microsoft.net.runtime.mono.tooling.net6 | 7.0.122.56804 | -| microsoft.net.sdk.emscripten.net7 | 7.0.7.6501 | +| microsoft.net.runtime.android | 7.0.222.60605 | +| microsoft.net.runtime.android.aot | 7.0.222.60605 | +| microsoft.net.runtime.android.aot.net6 | 7.0.222.60605 | +| microsoft.net.runtime.android.net6 | 7.0.222.60605 | +| microsoft.net.runtime.ios | 7.0.222.60605 | +| microsoft.net.runtime.ios.net6 | 7.0.222.60605 | +| microsoft.net.runtime.maccatalyst | 7.0.222.60605 | +| microsoft.net.runtime.maccatalyst.net6 | 7.0.222.60605 | +| microsoft.net.runtime.mono.tooling | 7.0.222.60605 | +| microsoft.net.runtime.mono.tooling.net6 | 7.0.222.60605 | +| microsoft.net.sdk.emscripten.net7 | 7.0.7.7902 | | Microsoft.NetCore.Component.DevelopmentTools | 17.4.33006.217 | -| Microsoft.NetCore.Component.Runtime.6.0 | 17.4.33205.214 | -| Microsoft.NetCore.Component.Runtime.7.0 | 17.4.33205.214 | -| Microsoft.NetCore.Component.SDK | 17.4.33205.214 | +| Microsoft.NetCore.Component.Runtime.6.0 | 17.4.33213.308 | +| Microsoft.NetCore.Component.Runtime.7.0 | 17.4.33213.308 | +| Microsoft.NetCore.Component.SDK | 17.4.33213.308 | | Microsoft.NetCore.Component.Web | 17.4.33006.217 | | Microsoft.VisualStudio.Component.AppInsights.Tools | 17.4.33006.217 | | Microsoft.VisualStudio.Component.AspNet | 17.4.33006.217 | @@ -329,7 +328,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Component.Graphics | 17.4.33006.217 | | Microsoft.VisualStudio.Component.Graphics.Tools | 17.4.33006.217 | | Microsoft.VisualStudio.Component.IISExpress | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.IntelliCode | 17.4.33121.453 | +| Microsoft.VisualStudio.Component.IntelliCode | 17.4.33213.308 | | Microsoft.VisualStudio.Component.IntelliTrace.FrontEnd | 17.4.33006.217 | | Microsoft.VisualStudio.Component.JavaScript.Diagnostics | 17.4.33006.217 | | Microsoft.VisualStudio.Component.JavaScript.TypeScript | 17.4.33006.217 | @@ -492,11 +491,11 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Workload.Python | 17.4.33006.217 | | Microsoft.VisualStudio.Workload.Universal | 17.4.33006.217 | | Microsoft.VisualStudio.Workload.VisualStudioExtension | 17.4.33006.217 | -| runtimes.ios | 7.0.122.56804 | -| runtimes.ios.net6 | 7.0.122.56804 | -| runtimes.maccatalyst | 7.0.122.56804 | -| runtimes.maccatalyst.net6 | 7.0.122.56804 | -| wasm.tools | 7.0.122.56804 | +| runtimes.ios | 7.0.222.60605 | +| runtimes.ios.net6 | 7.0.222.60605 | +| runtimes.maccatalyst | 7.0.222.60605 | +| runtimes.maccatalyst.net6 | 7.0.222.60605 | +| wasm.tools | 7.0.222.60605 | | ProBITools.MicrosoftAnalysisServicesModelingProjects2022 | 3.0.4 | | ProBITools.MicrosoftReportProjectsforVisualStudio2022 | 3.0.1 | | VisualStudioClient.MicrosoftVisualStudio2022InstallerProjects | 2.0.0 | @@ -527,11 +526,11 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 10.0.22621.0 ### .NET Core Tools -- .NET Core SDK: 3.1.120, 3.1.202, 3.1.302, 3.1.426, 5.0.104, 5.0.214, 5.0.303, 5.0.408, 6.0.112, 6.0.203, 6.0.307, 6.0.404, 7.0.101 +- .NET Core SDK: 3.1.120, 3.1.202, 3.1.302, 3.1.426, 5.0.104, 5.0.214, 5.0.303, 5.0.408, 6.0.113, 6.0.203, 6.0.308, 6.0.405, 7.0.102 - .NET Framework: 4.8, 4.8.1 -- Microsoft.AspNetCore.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 5.0.4, 5.0.9, 5.0.17, 6.0.5, 6.0.12, 7.0.1 -- Microsoft.NETCore.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 5.0.4, 5.0.9, 5.0.17, 6.0.5, 6.0.12, 7.0.1 -- Microsoft.WindowsDesktop.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 5.0.4, 5.0.9, 5.0.17, 6.0.5, 6.0.12, 7.0.1 +- Microsoft.AspNetCore.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 5.0.4, 5.0.9, 5.0.17, 6.0.5, 6.0.13, 7.0.2 +- Microsoft.NETCore.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 5.0.4, 5.0.9, 5.0.17, 6.0.5, 6.0.13, 7.0.2 +- Microsoft.WindowsDesktop.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 5.0.4, 5.0.9, 5.0.17, 6.0.5, 6.0.13, 7.0.2 - nbgv 3.5.119+5d25f54fec ### PowerShell Tools @@ -544,11 +543,11 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Az (Cached): 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.245 +- AWSPowershell: 4.1.251 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 -- Microsoft.Graph: 1.19.0 -- Pester: 3.4.0, 5.3.3 +- Microsoft.Graph: 1.20.0 +- Pester: 3.4.0, 5.4.0 - PowerShellGet: 1.0.0.1, 2.2.5 - PSScriptAnalyzer: 1.21.0 - PSWindowsUpdate: 2.2.0.3 @@ -588,9 +587,9 @@ All other versions are saved but not installed. ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2022 | sha256:7f7ba32d5a129b11c413975d9c0f5685c0e7ad7340b518c015dbe5b34306f702 | 2022-12-13 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2022 | sha256:731b6b7bd57ee3fd0c3f5d39fabaf4935442036946a6d64fb13bfe3eefc6d617 | 2022-12-13 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:0edc5775637a72e2db79bdd2f083908e3d92713a06b6c9ceeddc02f5e99728a3 | 2022-12-13 | -| mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:79fb1372fc5b3aeeca73603d5eadd0a8fb7d4f0b77bd29498696c03bb6de1fdf | 2022-12-09 | -| mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:74b9774d1b40a8fef7ec9b4f7ab22aa4a34115fca928867e23b35a125308fe0a | 2022-12-09 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2022 | sha256:3fed696d6f08740a9e1d46f30f1162765b2e1109476761ce93e8fbeef5f54caf | 2023-01-10 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2022 | sha256:623206b7da179ddb4d4e5e3695889d03f72b368bdde4e05d70f8fde75371bdac | 2023-01-10 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:d8e9237fba3770319c899b8a87e54fb3427a3fa8617d2de78cec6e3465d71cfc | 2023-01-10 | +| mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:b4248836dea118c48481b821d9fbb40daf7e207b48f5e6edc9da6837050b0f65 | 2023-01-06 | +| mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:dfd3ce22e4b6e987ff2bfb3efe5e4912512fce35660be2ae5faa91e6f4da9748 | 2023-01-06 | From 2c5e6f8a4ed3fe7840e82a8639999911bf5044be Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 19 Jan 2023 15:32:31 +0000 Subject: [PATCH 1690/3485] Updating readme file for ubuntu18 version 20230118.2 (#6943) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu1804-Readme.md | 182 +++++++++++++++--------------- 1 file changed, 92 insertions(+), 90 deletions(-) diff --git a/images/linux/Ubuntu1804-Readme.md b/images/linux/Ubuntu1804-Readme.md index 398a14c2c51c..ac40a76ac2ee 100644 --- a/images/linux/Ubuntu1804-Readme.md +++ b/images/linux/Ubuntu1804-Readme.md @@ -1,28 +1,30 @@ | Announcements | |-| +| [[All OSs] .NET 5.x will be removed from the images on January, 29](https://github.com/actions/runner-images/issues/6840) | | [The Ubuntu 18.04 Actions runner image will begin deprecation on 2022/08/08 and will be fully unsupported by 2023/04/01](https://github.com/actions/runner-images/issues/6002) | *** # Ubuntu 18.04 - OS Version: 18.04.6 LTS -- Kernel Version: 5.4.0-1098-azure -- Image Version: 20221220.1 +- Kernel Version: 5.4.0-1100-azure +- Image Version: 20230118.2 ## Installed Software + ### Language and Runtime - Bash 4.4.20(1)-release -- Clang 9.0.0 -- Clang-format 9.0.0 -- Clang-tidy 9.0.0 +- Clang: 9.0.0 +- Clang-format: 9.0.0 +- Clang-tidy: 9.0.0 - Dash 0.5.8-2.10 - Erlang 25.0.4 (Eshell 13.0.4) - Erlang rebar3 3.20.0 -- GNU C++ 7.5.0, 9.4.0, 10.3.0 -- GNU Fortran 7.5.0, 9.4.0, 10.3.0 -- Julia 1.8.3 -- Kotlin 1.7.22-release-288 +- GNU C++: 7.5.0, 9.4.0, 10.3.0 +- GNU Fortran: 7.5.0, 9.4.0, 10.3.0 +- Julia 1.8.5 +- Kotlin 1.8.0-release-345 - Mono 6.12.0.182 - MSBuild 16.10.1.31701 (Mono 6.12.0.182) -- Node 16.19.0 +- Node.js 16.19.0 - Perl 5.26.1 - Python 2.7.17 - Python3 3.6.9 @@ -31,16 +33,16 @@ ### Package Management - cpan 1.64 -- Helm 3.10.3 -- Homebrew 3.6.15 -- Miniconda 4.12.0 +- Helm 3.11.0 +- Homebrew 3.6.19 +- Miniconda 22.11.1 - Npm 8.19.3 - NuGet 6.3.1.1 - Pip 9.0.1 - Pip3 9.0.1 - Pipx 1.0.0 - RubyGems 2.7.6 -- Vcpkg (build from commit cc288af76) +- Vcpkg (build from commit f1c943159) - Yarn 1.22.19 #### Environment variables @@ -60,8 +62,8 @@ to accomplish this. ### Project Management - Ant 1.10.5 - Gradle 7.6 -- Maven 3.8.6 -- Sbt 1.8.0 +- Maven 3.8.7 +- Sbt 1.8.2 ### Tools - Ansible 2.11.12 @@ -72,14 +74,14 @@ to accomplish this. - Bicep 0.13.1 - Buildah 1.22.3 - CMake 3.25.1 -- CodeQL Action Bundle 2.11.6 +- CodeQL Action Bundle 2.12.0 - Docker Amazon ECR Credential Helper 0.6.0 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.14.1+azure-1 -- Docker-Buildx 0.9.1 +- Docker Compose v2 2.15.1+azure-1 +- Docker-Buildx 0.10.0 - Docker-Moby Client 20.10.22+azure-1 - Docker-Moby Server 20.10.22+azure-1 -- Git 2.39.0 +- Git 2.39.1 - Git LFS 3.2.0 - Git-ftp 1.3.1 - Haveged 1.9.1 @@ -87,7 +89,7 @@ to accomplish this. - HHVM (HipHop VM) 4.164.0 - jq 1.5 - Kind 0.17.0 -- Kubectl 1.26.0 +- Kubectl 1.26.1 - Kustomize 4.5.7 - Leiningen 2.10.0 - MediaInfo 17.12 @@ -95,36 +97,36 @@ to accomplish this. - Minikube 1.28.0 - n 9.0.1 - Newman 5.3.2 -- nvm 0.39.2 +- nvm 0.39.3 - OpenSSL 1.1.1-1ubuntu2.1~18.04.20 - Packer 1.8.5 -- Parcel 2.8.2 +- Parcel 2.8.3 - PhantomJS 2.1.1 - Podman 3.4.2 -- Pulumi 3.50.0 +- Pulumi 3.51.1 - R 4.2.2 - Skopeo 1.5.0 - Sphinx Open Source Search Server 2.2.11 - SVN 1.9.7 -- Terraform 1.3.6 +- Terraform 1.3.7 - yamllint 1.28.0 -- yq v4.30.6 -- zstd 1.5.2 (Homebrew) +- yq 4.30.8 +- zstd 1.5.2 ### CLI Tools -- Alibaba Cloud CLI 3.0.140 -- AWS CLI 2.9.8 -- AWS CLI Session manager plugin 1.2.398.0 -- AWS SAM CLI 1.67.0 -- Azure CLI 2.43.0 +- Alibaba Cloud CLI 3.0.144 +- AWS CLI 2.9.15 +- AWS CLI Session Manager Plugin 1.2.398.0 +- AWS SAM CLI 1.70.0 +- Azure CLI 2.44.1 - Azure CLI (azure-devops) 0.25.0 -- GitHub CLI 2.20.2 -- Google Cloud SDK 412.0.0 +- GitHub CLI 2.21.2 +- Google Cloud SDK 414.0.0 - Hub CLI 2.14.2 -- Netlify CLI 12.4.0 -- OpenShift CLI 4.11.20 +- Netlify CLI 12.7.2 +- OpenShift CLI 4.12.0 - ORAS CLI 0.16.0 -- Vercel CLI 28.9.0 +- Vercel CLI 28.12.7 ### Java | Version | Vendor | Environment Variable | @@ -135,23 +137,23 @@ to accomplish this. | 17.0.5+8 | Eclipse Temurin | JAVA_HOME_17_X64 | ### PHP Tools -- PHP: 7.2.34, 7.3.33, 7.4.33, 8.0.26, 8.1.13, 8.2.0 -- Composer 2.5.0 +- PHP: 7.2.34, 7.3.33, 7.4.33, 8.0.27, 8.1.14, 8.2.1 +- Composer 2.5.1 - PHPUnit 8.5.31 - ``` - Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. +Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ``` -### Haskell + +### Haskell Tools - Cabal 3.6.2.0 -- GHC 9.4.3 -- GHCup 0.1.18.0 +- GHC 9.4.4 +- GHCup 0.1.19.0 - Stack 2.9.3 ### Rust Tools -- Cargo 1.66.0 -- Rust 1.66.0 -- Rustdoc 1.66.0 +- Cargo 1.66.1 +- Rust 1.66.1 +- Rustdoc 1.66.1 - Rustup 1.25.1 #### Packages @@ -163,13 +165,13 @@ to accomplish this. - Rustfmt 1.5.1 ### Browsers and Drivers -- Google Chrome 108.0.5359.124 -- ChromeDriver 108.0.5359.71 -- Chromium 108.0.5341.0 -- Microsoft Edge 108.0.1462.54 -- Microsoft Edge WebDriver 108.0.1462.54 +- Google Chrome 109.0.5414.74 +- ChromeDriver 109.0.5414.74 +- Chromium 109.0.5414.0 +- Microsoft Edge 109.0.1518.52 +- Microsoft Edge WebDriver 109.0.1518.52 - Selenium server 4.7.0 -- Mozilla Firefox 108.0.1 +- Mozilla Firefox 109.0 - Geckodriver 0.32.0 #### Environment variables @@ -180,8 +182,8 @@ to accomplish this. | GECKOWEBDRIVER | /usr/local/share/gecko_driver | | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | -### .NET Core Tools -- .NET Core SDK: 3.1.120, 3.1.202, 3.1.302, 3.1.426, 5.0.104, 5.0.214, 5.0.303, 5.0.408, 6.0.404 +### .NET Tools +- .NET Core SDK: 3.1.120, 3.1.202, 3.1.302, 3.1.426, 5.0.104, 5.0.214, 5.0.303, 5.0.408, 6.0.405 - nbgv 3.5.119+5d25f54fec ### Databases @@ -190,49 +192,50 @@ to accomplish this. #### PostgreSQL - PostgreSQL 14.6 - ``` - User: postgres - PostgreSQL service is disabled by default. - Use the following command as a part of your job to start the service: 'sudo systemctl start postgresql.service' +User: postgres +PostgreSQL service is disabled by default. +Use the following command as a part of your job to start the service: 'sudo systemctl start postgresql.service' ``` + #### MySQL - MySQL 5.7.40 - ``` - User: root - Password: root - MySQL service is disabled by default. - Use the following command as a part of your job to start the service: 'sudo systemctl start mysql.service' +User: root +Password: root +MySQL service is disabled by default. +Use the following command as a part of your job to start the service: 'sudo systemctl start mysql.service' ``` -#### MS SQL Server Client Tools + +#### MS SQL - sqlcmd 17.10.0001.1 - SqlPackage 16.1.6374.0 ### Cached Tools + #### Go - 1.16.15 - 1.17.13 -- 1.18.9 +- 1.18.10 #### Node.js - 14.21.2 - 16.19.0 -- 18.12.1 +- 18.13.0 #### Python - 2.7.18 - 3.6.15 - 3.7.15 -- 3.8.15 +- 3.8.16 - 3.9.16 - 3.10.9 - 3.11.1 #### PyPy -- 2.7.18 [PyPy 7.3.10] +- 2.7.18 [PyPy 7.3.11] - 3.6.12 [PyPy 7.3.3] -- 3.9.15 [PyPy 7.3.10] +- 3.9.16 [PyPy 7.3.11] #### Ruby - 2.4.10 @@ -246,11 +249,11 @@ to accomplish this. - PowerShell 7.2.8 #### PowerShell Modules -- Az: 9.0.1 +- Az: 9.2.0 - Az (Cached): 3.1.0.zip, 4.4.0.zip, 5.9.0.zip, 6.6.0.zip, 7.5.0.zip - MarkdownPS: 1.9 -- Microsoft.Graph: 1.19.0 -- Pester: 5.3.3 +- Microsoft.Graph: 1.20.0 +- Pester: 5.4.0 ### Web Servers | Name | Version | ConfigFile | ServiceStatus | ListenPort | @@ -265,7 +268,7 @@ to accomplish this. | Android Emulator | 31.3.14 | | Android SDK Build-tools | 33.0.0 33.0.1<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3<br>26.0.0 26.0.1 26.0.2 26.0.3<br>25.0.0 25.0.1 25.0.2 25.0.3<br>24.0.0 24.0.1 24.0.2 24.0.3<br>23.0.1 23.0.2 23.0.3 | | Android SDK Platform-Tools | 33.0.3 | -| Android SDK Platforms | android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3)<br>android-26 (rev 2)<br>android-25 (rev 3)<br>android-24 (rev 2)<br>android-23 (rev 3) | +| Android SDK Platforms | android-33-ext4 (rev 1)<br>android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3)<br>android-26 (rev 2)<br>android-25 (rev 3)<br>android-24 (rev 2)<br>android-23 (rev 3) | | Android SDK Tools | 26.1.1 | | Android Support Repository | 47.0.0 | | CMake | 3.10.2<br>3.18.1<br>3.22.1 | @@ -291,21 +294,21 @@ to accomplish this. | alpine:3.12 | sha256:c75ac27b49326926b803b9ed43bf088bc220d22556de1bc5f72d742c91398f69 | 2022-04-05 | | alpine:3.13 | sha256:469b6e04ee185740477efa44ed5bdd64a07bbdd6c7e5f5d169e540889597b911 | 2022-08-09 | | alpine:3.14 | sha256:4c869a63e1b7c0722fed1e402a6466610327c3b83bdddb94bd94fb71da7f638a | 2022-08-09 | -| buildpack-deps:bullseye | sha256:ea5e7737f282e76b594669926ee6222beee0c237b9ba19a2055aa8f4feb83ba2 | 2022-12-06 | -| buildpack-deps:buster | sha256:ecb6bd2c510b37b0bcbfaaa043192c293bfba2d9a0f4402abab6a342f186eebc | 2022-12-06 | +| buildpack-deps:bullseye | sha256:c1a2475ac14e13582cf8a44fc071439132928ada47c57e80af372fdcd1690751 | 2023-01-11 | +| buildpack-deps:buster | sha256:c343da4a0b85a4d25ce30529e836a10d46cd4f682fb5326400e4ba274a2f9866 | 2023-01-11 | | buildpack-deps:stretch | sha256:78e995165a5788c2f55aed6e548d8f6c1534830d4310c870408fccb2da8c5b2e | 2022-06-23 | -| debian:10 | sha256:e6fb8b88b411285ac71590459aa8d0a376acc86a3d17adfe45e806f522c54cc3 | 2022-12-06 | -| debian:11 | sha256:a288aa7ad0e4d443e86843972c25a02f99e9ad6ee589dd764895b2c3f5a8340b | 2022-12-06 | +| debian:10 | sha256:bb8c62f9f540a5f5f49f7ed5caae0e2889f999cd14553f2aaccaf1fa4fcb998d | 2023-01-11 | +| debian:11 | sha256:534da5794e770279c889daa891f46f5a530b0c5de8bfbc5e40394a0164d9fa87 | 2023-01-11 | | debian:9 | sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be | 2022-06-23 | -| moby/buildkit:latest | sha256:77abd86c9422aaff294bfde1029f03a6ab18ece0105003637cfda1d7fc22299f | 2022-11-10 | -| node:14 | sha256:ee3fd7a2cca7436bf73db2722b388839669b065827829d21213cab4994cc8e11 | 2022-12-13 | -| node:14-alpine | sha256:80e825b1f5ab859498a2f0f98f8197131a562906e5f8c95977057502e68ca05a | 2022-12-13 | -| node:16 | sha256:1bbd8b82f5a78b6461d3285b62293db99ad60cf4eca35c715636d7143abb057c | 2022-12-13 | -| node:16-alpine | sha256:58e4dfcf063f67d71e608c3cace5a0bcf39e9dbab3047b41e20c15c7132d1d46 | 2022-12-13 | -| node:18 | sha256:9ebe9845301ca70e879f22180dfff496b856bb5f2ec52397462a9f5f903ee654 | 2022-12-06 | -| node:18-alpine | sha256:a136ed7b0df71082cdb171f36d640ea3b392a5c70401c642326acee767b8c540 | 2022-12-12 | +| moby/buildkit:latest | sha256:86ffcc648dbd2215941cbaabbd0564bd8bc67e2aefd32d4feb26e4fb8080f8c6 | 2023-01-17 | +| node:14 | sha256:0c888dc647d36f5a895edb6b1b1c96ae81064455e0cdeee0792e14927604ca99 | 2023-01-11 | +| node:14-alpine | sha256:2c6a909495ef3761328c10945cbe84c06d079f7ca49dc24271e73be8cab85ad7 | 2023-01-09 | +| node:16 | sha256:27fab5920246070cf13449cf44c25bc4f5adef18ca7482b2bda90b7cf9e64481 | 2023-01-11 | +| node:16-alpine | sha256:1298fd170c45954fec3d4d063437750f89802d72743816663664cfe9aa152b4b | 2023-01-09 | +| node:18 | sha256:d871edd5b68105ebcbfcde3fe8c79d24cbdbb30430d9bd6251c57c56c7bd7646 | 2023-01-11 | +| node:18-alpine | sha256:fda98168118e5a8f4269efca4101ee51dd5c75c0fe56d8eb6fad80455c2f5827 | 2023-01-09 | | ubuntu:16.04 | sha256:1f1a2d56de1d604801a9671f301190704c25d604a416f59e03c04f5c6ffee0d6 | 2021-08-31 | -| ubuntu:18.04 | sha256:daf3e62183e8aa9a56878a685ed26f3af3dd8c08c8fd11ef1c167a1aa9bd66a3 | 2022-12-09 | +| ubuntu:18.04 | sha256:c1d0baf2425ecef88a2f0c3543ec43690dc16cc80d3c4e593bb95e4f45390e45 | 2023-01-02 | | ubuntu:20.04 | sha256:0e0402cd13f68137edb0266e1d2c682f217814420f2d43d300ed8f65479b14fb | 2022-12-09 | ### Installed apt packages @@ -320,7 +323,7 @@ to accomplish this. | build-essential | 12.4ubuntu1 | | bzip2 | 1.0.6-8.1ubuntu0.2 | | coreutils | 8.28-1ubuntu1 | -| curl | 7.58.0-2ubuntu3.21 | +| curl | 7.58.0-2ubuntu3.22 | | dbus | 1.12.2-1ubuntu1.4 | | dnsutils | 1:9.11.3+dfsg-1ubuntu1.18 | | dpkg | 1.19.0.5ubuntu2.4 | @@ -337,7 +340,7 @@ to accomplish this. | lib32z1 | 1:1.2.11.dfsg-0ubuntu2.2 | | libc++-dev | 6.0-2 | | libc++abi-dev | 6.0-2 | -| libcurl3 | 7.58.0-2ubuntu3.21 | +| libcurl3 | 7.58.0-2ubuntu3.22 | | libgbm-dev | 20.0.8-0ubuntu1\~18.04.1 | | libgconf-2-4 | 3.2.6-4ubuntu1 | | libgsl-dev | 2.4+dfsg-6 | @@ -375,7 +378,7 @@ to accomplish this. | ssh | 1:7.6p1-4ubuntu0.7 | | sshpass | 1.06-1 | | subversion | 1.9.7-4ubuntu1.1 | -| sudo | 1.8.21p2-3ubuntu1.4 | +| sudo | 1.8.21p2-3ubuntu1.5 | | swig | 3.0.12-1 | | tar | 1.29b-2ubuntu0.3 | | telnet | 0.17-41 | @@ -392,4 +395,3 @@ to accomplish this. | zip | 3.0-11build1 | | zsync | 0.6.2-3ubuntu1 | - From 794867863fdd7e3cda18c93a820a5bec90a39dda Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 19 Jan 2023 15:49:50 +0000 Subject: [PATCH 1691/3485] Updating readme file for ubuntu20 version 20230118.1 (#6942) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2004-Readme.md | 86 +++++++++++++++---------------- 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/images/linux/Ubuntu2004-Readme.md b/images/linux/Ubuntu2004-Readme.md index c1648b92c448..c031c1ab51e2 100644 --- a/images/linux/Ubuntu2004-Readme.md +++ b/images/linux/Ubuntu2004-Readme.md @@ -5,8 +5,8 @@ *** # Ubuntu 20.04 - OS Version: 20.04.5 LTS -- Kernel Version: 5.15.0-1030-azure -- Image Version: 20230109.1 +- Kernel Version: 5.15.0-1031-azure +- Image Version: 20230118.1 ## Installed Software @@ -34,7 +34,7 @@ ### Package Management - cpan 1.64 - Helm 3.10.3 -- Homebrew 3.6.18 +- Homebrew 3.6.19 - Miniconda 22.11.1 - Npm 8.19.3 - NuGet 6.3.1.1 @@ -42,7 +42,7 @@ - Pip3 20.0.2 - Pipx 1.1.0 - RubyGems 3.1.2 -- Vcpkg (build from commit 5bb5f3923) +- Vcpkg (build from commit 5908d702d) - Yarn 1.22.19 #### Environment variables @@ -62,7 +62,7 @@ to accomplish this. ### Project Management - Ant 1.10.7 - Gradle 7.6 -- Lerna 6.4.0 +- Lerna 6.4.1 - Maven 3.8.7 - Sbt 1.8.2 @@ -75,15 +75,15 @@ to accomplish this. - Bicep 0.13.1 - Buildah 1.22.3 - CMake 3.25.1 -- CodeQL Action Bundle 2.11.6 +- CodeQL Action Bundle 2.12.0 - Docker Amazon ECR Credential Helper 0.6.0 - Docker Compose v1 1.29.2 - Docker Compose v2 2.15.1+azure-1 -- Docker-Buildx 0.9.1 +- Docker-Buildx 0.10.0 - Docker-Moby Client 20.10.22+azure-1 - Docker-Moby Server 20.10.22+azure-1 - Fastlane 2.211.0 -- Git 2.39.0 +- Git 2.39.1 - Git LFS 3.3.0 - Git-ftp 1.6.0 - Haveged 1.9.1 @@ -102,33 +102,33 @@ to accomplish this. - nvm 0.39.3 - OpenSSL 1.1.1f-1ubuntu2.16 - Packer 1.8.5 -- Parcel 2.8.2 +- Parcel 2.8.3 - PhantomJS 2.1.1 - Podman 3.4.2 -- Pulumi 3.51.0 +- Pulumi 3.51.1 - R 4.2.2 - Skopeo 1.5.0 - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 - Terraform 1.3.7 -- yamllint 1.28.0 -- yq 4.30.6 +- yamllint 1.29.0 +- yq 4.30.8 - zstd 1.5.2 ### CLI Tools - Alibaba Cloud CLI 3.0.144 -- AWS CLI 2.9.13 +- AWS CLI 2.9.15 - AWS CLI Session Manager Plugin 1.2.398.0 -- AWS SAM CLI 1.68.0 -- Azure CLI 2.44.0 +- AWS SAM CLI 1.70.0 +- Azure CLI 2.44.1 - Azure CLI (azure-devops) 0.25.0 - GitHub CLI 2.21.2 -- Google Cloud SDK 412.0.0 +- Google Cloud SDK 414.0.0 - Hub CLI 2.14.2 -- Netlify CLI 12.6.0 -- OpenShift CLI 4.11.22 +- Netlify CLI 12.7.2 +- OpenShift CLI 4.12.0 - ORAS CLI 0.16.0 -- Vercel CLI 28.11.0 +- Vercel CLI 28.12.7 ### Java | Version | Vendor | Environment Variable | @@ -153,13 +153,13 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ### Haskell Tools - Cabal 3.6.2.0 - GHC 9.4.4 -- GHCup 0.1.18.0 +- GHCup 0.1.19.0 - Stack 2.9.3 ### Rust Tools -- Cargo 1.66.0 -- Rust 1.66.0 -- Rustdoc 1.66.0 +- Cargo 1.66.1 +- Rust 1.66.1 +- Rustdoc 1.66.1 - Rustup 1.25.1 #### Packages @@ -171,13 +171,13 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.5.1 ### Browsers and Drivers -- Google Chrome 108.0.5359.124 -- ChromeDriver 108.0.5359.71 -- Chromium 108.0.5341.0 -- Microsoft Edge 108.0.1462.76 -- Microsoft Edge WebDriver 108.0.1462.76 +- Google Chrome 109.0.5414.74 +- ChromeDriver 109.0.5414.74 +- Chromium 109.0.5414.0 +- Microsoft Edge 109.0.1518.52 +- Microsoft Edge WebDriver 109.0.1518.52 - Selenium server 4.7.0 -- Mozilla Firefox 108.0.2 +- Mozilla Firefox 109.0 - Geckodriver 0.32.0 #### Environment variables @@ -189,7 +189,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | ### .NET Tools -- .NET Core SDK: 3.1.120, 3.1.202, 3.1.302, 3.1.426, 5.0.104, 5.0.214, 5.0.303, 5.0.408, 6.0.404, 7.0.101 +- .NET Core SDK: 3.1.120, 3.1.202, 3.1.302, 3.1.426, 5.0.104, 5.0.214, 5.0.303, 5.0.408, 6.0.405, 7.0.102 - nbgv 3.5.119+5d25f54fec ### Databases @@ -221,8 +221,8 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Go - 1.17.13 -- 1.18.9 -- 1.19.4 +- 1.18.10 +- 1.19.5 #### Node.js - 14.21.2 @@ -233,7 +233,7 @@ Use the following command as a part of your job to start the service: 'sudo syst - 2.7.18 - 3.6.15 - 3.7.15 -- 3.8.15 +- 3.8.16 - 3.9.16 - 3.10.9 - 3.11.1 @@ -259,8 +259,8 @@ Use the following command as a part of your job to start the service: 'sudo syst - Az: 9.2.0 - Az (Cached): 3.1.0.zip, 4.4.0.zip, 5.9.0.zip, 6.6.0.zip, 7.5.0.zip - MarkdownPS: 1.9 -- Microsoft.Graph: 1.19.0 -- Pester: 5.3.3 +- Microsoft.Graph: 1.20.0 +- Pester: 5.4.0 - PSScriptAnalyzer: 1.21.0 ### Web Servers @@ -302,18 +302,18 @@ Use the following command as a part of your job to start the service: 'sudo syst | alpine:3.14 | sha256:4c869a63e1b7c0722fed1e402a6466610327c3b83bdddb94bd94fb71da7f638a | 2022-08-09 | | alpine:3.15 | sha256:cf34c62ee8eb3fe8aa24c1fab45d7e9d12768d945c3f5a6fd6a63d901e898479 | 2022-08-09 | | alpine:3.16 | sha256:b95359c2505145f16c6aa384f9cc74eeff78eb36d308ca4fd902eeeb0a0b161b | 2022-11-12 | -| buildpack-deps:bullseye | sha256:0207e7da5bf153f41b59f13a373e62ba24687f71caf90d383c07912e0e31aad3 | 2022-12-21 | -| buildpack-deps:buster | sha256:cbf9915fc2c12f95de45033fd6c1131cdbfbc35ce12bf6a6b1dc76a55d9f011a | 2022-12-21 | +| buildpack-deps:bullseye | sha256:c1a2475ac14e13582cf8a44fc071439132928ada47c57e80af372fdcd1690751 | 2023-01-11 | +| buildpack-deps:buster | sha256:c343da4a0b85a4d25ce30529e836a10d46cd4f682fb5326400e4ba274a2f9866 | 2023-01-11 | | buildpack-deps:stretch | sha256:78e995165a5788c2f55aed6e548d8f6c1534830d4310c870408fccb2da8c5b2e | 2022-06-23 | -| debian:10 | sha256:a3b7e971fef3e488479afd0a8387b35bed4c55891a1597d64a8fc6494d61d798 | 2022-12-21 | -| debian:11 | sha256:c66c0e5dc607baefefda1d9e64a3b3a317e4189c540c8eac0c1a06186fe353a1 | 2022-12-21 | +| debian:10 | sha256:bb8c62f9f540a5f5f49f7ed5caae0e2889f999cd14553f2aaccaf1fa4fcb998d | 2023-01-11 | +| debian:11 | sha256:534da5794e770279c889daa891f46f5a530b0c5de8bfbc5e40394a0164d9fa87 | 2023-01-11 | | debian:9 | sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be | 2022-06-23 | -| moby/buildkit:latest | sha256:5fee32ab69191d952ef2f19d8cb27e2d930813114a56da8de0c33a6fab06ab1e | 2023-01-09 | -| node:14 | sha256:b6ab85c15f1c372bca3bde8585fbf5739b679aa9119f46e7d2bd41c1dcc05959 | 2022-12-21 | +| moby/buildkit:latest | sha256:86ffcc648dbd2215941cbaabbd0564bd8bc67e2aefd32d4feb26e4fb8080f8c6 | 2023-01-17 | +| node:14 | sha256:0c888dc647d36f5a895edb6b1b1c96ae81064455e0cdeee0792e14927604ca99 | 2023-01-11 | | node:14-alpine | sha256:2c6a909495ef3761328c10945cbe84c06d079f7ca49dc24271e73be8cab85ad7 | 2023-01-09 | -| node:16 | sha256:64e8bcdfdad6718050801a2639f7e6645fdaf85ec37a98cdb61f6a5331217618 | 2022-12-21 | +| node:16 | sha256:27fab5920246070cf13449cf44c25bc4f5adef18ca7482b2bda90b7cf9e64481 | 2023-01-11 | | node:16-alpine | sha256:1298fd170c45954fec3d4d063437750f89802d72743816663664cfe9aa152b4b | 2023-01-09 | -| node:18 | sha256:a403ff0ffe7a6a8fe90fdc70289ba398ab3a281bb3fa64b4efed45f45ac17bcd | 2023-01-06 | +| node:18 | sha256:d871edd5b68105ebcbfcde3fe8c79d24cbdbb30430d9bd6251c57c56c7bd7646 | 2023-01-11 | | node:18-alpine | sha256:fda98168118e5a8f4269efca4101ee51dd5c75c0fe56d8eb6fad80455c2f5827 | 2023-01-09 | | ubuntu:16.04 | sha256:1f1a2d56de1d604801a9671f301190704c25d604a416f59e03c04f5c6ffee0d6 | 2021-08-31 | | ubuntu:18.04 | sha256:c1d0baf2425ecef88a2f0c3543ec43690dc16cc80d3c4e593bb95e4f45390e45 | 2023-01-02 | From 59c0d35a32b6853ae457041b4d16985cada43416 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 19 Jan 2023 16:39:34 +0000 Subject: [PATCH 1692/3485] Updating readme file for ubuntu22 version 20230118.2 (#6941) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2204-Readme.md | 106 +++++++++++++++--------------- 1 file changed, 53 insertions(+), 53 deletions(-) diff --git a/images/linux/Ubuntu2204-Readme.md b/images/linux/Ubuntu2204-Readme.md index 4c0416a23689..d66e2a69f15b 100644 --- a/images/linux/Ubuntu2204-Readme.md +++ b/images/linux/Ubuntu2204-Readme.md @@ -5,8 +5,8 @@ *** # Ubuntu 22.04 - OS Version: 22.04.1 LTS -- Kernel Version: 5.15.0-1030-azure -- Image Version: 20230109.1 +- Kernel Version: 5.15.0-1031-azure +- Image Version: 20230118.2 ## Installed Software @@ -18,7 +18,7 @@ - Dash 0.5.11+git20210903+057cd650a4ed-3build1 - GNU C++: 9.5.0, 10.4.0, 11.3.0, 12.1.0 - GNU Fortran: 9.5.0, 10.4.0, 11.3.0, 12.1.0 -- Julia 1.8.4 +- Julia 1.8.5 - Kotlin 1.8.0-release-345 - Mono 6.12.0.182 - MSBuild 16.10.1.31701 (Mono 6.12.0.182) @@ -31,8 +31,8 @@ ### Package Management - cpan 1.64 -- Helm 3.10.3 -- Homebrew 3.6.18 +- Helm 3.11.0 +- Homebrew 3.6.19 - Miniconda 22.11.1 - Npm 8.19.3 - NuGet 6.3.1.1 @@ -40,7 +40,7 @@ - Pip3 22.0.2 - Pipx 1.1.0 - RubyGems 3.3.5 -- Vcpkg (build from commit 85c4f11f8) +- Vcpkg (build from commit 89e381729) - Yarn 1.22.19 #### Environment variables @@ -58,7 +58,7 @@ to accomplish this. ``` ### Project Management -- Lerna 6.4.0 +- Lerna 6.4.1 ### Tools - Ansible 2.14.1 @@ -69,22 +69,22 @@ to accomplish this. - Bicep 0.13.1 - Buildah 1.23.1 - CMake 3.25.1 -- CodeQL Action Bundle 2.11.6 +- CodeQL Action Bundle 2.12.0 - Docker Amazon ECR Credential Helper 0.6.0 - Docker Compose v1 1.29.2 - Docker Compose v2 2.15.1+azure-1 -- Docker-Buildx 0.9.1 +- Docker-Buildx 0.10.0 - Docker-Moby Client 20.10.22+azure-1 - Docker-Moby Server 20.10.22+azure-1 - Fastlane 2.211.0 -- Git 2.39.0 +- Git 2.39.1 - Git LFS 3.3.0 - Git-ftp 1.6.0 - Haveged 1.9.14 - Heroku 7.67.1 - jq 1.6 - Kind 0.17.0 -- Kubectl 1.26.0 +- Kubectl 1.26.1 - Kustomize 4.5.7 - Leiningen 2.10.0 - MediaInfo 21.09 @@ -95,32 +95,32 @@ to accomplish this. - nvm 0.39.3 - OpenSSL 3.0.2-0ubuntu1.7 - Packer 1.8.5 -- Parcel 2.8.2 +- Parcel 2.8.3 - Podman 3.4.4 -- Pulumi 3.51.0 +- Pulumi 3.51.1 - R 4.2.2 - Skopeo 1.4.1 - Sphinx Open Source Search Server 2.2.11 - SVN 1.14.1 - Terraform 1.3.7 -- yamllint 1.28.0 -- yq 4.30.6 +- yamllint 1.29.0 +- yq 4.30.8 - zstd 1.5.2 ### CLI Tools - Alibaba Cloud CLI 3.0.144 -- AWS CLI 2.9.13 +- AWS CLI 2.9.15 - AWS CLI Session Manager Plugin 1.2.398.0 -- AWS SAM CLI 1.68.0 -- Azure CLI 2.43.0 +- AWS SAM CLI 1.70.0 +- Azure CLI 2.44.1 - Azure CLI (azure-devops) 0.25.0 - GitHub CLI 2.21.2 -- Google Cloud SDK 412.0.0 +- Google Cloud SDK 414.0.0 - Hub CLI 2.14.2 -- Netlify CLI 12.6.0 -- OpenShift CLI 4.11.22 +- Netlify CLI 12.7.2 +- OpenShift CLI 4.12.0 - ORAS CLI 0.16.0 -- Vercel CLI 28.10.3 +- Vercel CLI 28.12.7 ### Java | Version | Vendor | Environment Variable | @@ -145,13 +145,13 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ### Haskell Tools - Cabal 3.6.2.0 - GHC 9.4.4 -- GHCup 0.1.18.0 +- GHCup 0.1.19.0 - Stack 2.9.3 ### Rust Tools -- Cargo 1.66.0 -- Rust 1.66.0 -- Rustdoc 1.66.0 +- Cargo 1.66.1 +- Rust 1.66.1 +- Rustdoc 1.66.1 - Rustup 1.25.1 #### Packages @@ -163,13 +163,13 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.5.1 ### Browsers and Drivers -- Google Chrome 108.0.5359.124 -- ChromeDriver 108.0.5359.71 -- Chromium 108.0.5341.0 -- Microsoft Edge 108.0.1462.76 -- Microsoft Edge WebDriver 108.0.1462.76 +- Google Chrome 109.0.5414.74 +- ChromeDriver 109.0.5414.74 +- Chromium 109.0.5414.0 +- Microsoft Edge 109.0.1518.52 +- Microsoft Edge WebDriver 109.0.1518.52 - Selenium server 4.7.0 -- Mozilla Firefox 108.0.2 +- Mozilla Firefox 109.0 - Geckodriver 0.32.0 #### Environment variables @@ -181,7 +181,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | ### .NET Tools -- .NET Core SDK: 6.0.404, 7.0.101 +- .NET Core SDK: 6.0.405, 7.0.102 - nbgv 3.5.119+5d25f54fec ### Databases @@ -212,8 +212,8 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Go - 1.17.13 -- 1.18.9 -- 1.19.4 +- 1.18.10 +- 1.19.5 #### Node.js - 14.21.2 @@ -222,7 +222,7 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Python - 3.7.15 -- 3.8.15 +- 3.8.16 - 3.9.16 - 3.10.9 - 3.11.1 @@ -241,8 +241,8 @@ Use the following command as a part of your job to start the service: 'sudo syst #### PowerShell Modules - Az: 9.2.0 - MarkdownPS: 1.9 -- Microsoft.Graph: 1.19.0 -- Pester: 5.3.3 +- Microsoft.Graph: 1.20.0 +- Pester: 5.4.0 - PSScriptAnalyzer: 1.21.0 ### Web Servers @@ -283,17 +283,17 @@ Use the following command as a part of your job to start the service: 'sudo syst | alpine:3.14 | sha256:4c869a63e1b7c0722fed1e402a6466610327c3b83bdddb94bd94fb71da7f638a | 2022-08-09 | | alpine:3.15 | sha256:cf34c62ee8eb3fe8aa24c1fab45d7e9d12768d945c3f5a6fd6a63d901e898479 | 2022-08-09 | | alpine:3.16 | sha256:b95359c2505145f16c6aa384f9cc74eeff78eb36d308ca4fd902eeeb0a0b161b | 2022-11-12 | -| buildpack-deps:bullseye | sha256:0207e7da5bf153f41b59f13a373e62ba24687f71caf90d383c07912e0e31aad3 | 2022-12-21 | -| buildpack-deps:buster | sha256:cbf9915fc2c12f95de45033fd6c1131cdbfbc35ce12bf6a6b1dc76a55d9f011a | 2022-12-21 | -| debian:10 | sha256:a3b7e971fef3e488479afd0a8387b35bed4c55891a1597d64a8fc6494d61d798 | 2022-12-21 | -| debian:11 | sha256:c66c0e5dc607baefefda1d9e64a3b3a317e4189c540c8eac0c1a06186fe353a1 | 2022-12-21 | -| moby/buildkit:latest | sha256:77abd86c9422aaff294bfde1029f03a6ab18ece0105003637cfda1d7fc22299f | 2022-11-10 | -| node:14 | sha256:b6ab85c15f1c372bca3bde8585fbf5739b679aa9119f46e7d2bd41c1dcc05959 | 2022-12-21 | -| node:14-alpine | sha256:4b06eb151378d0634eaeca8de025a216de79e268590b9f20584d3fa708d8a547 | 2023-01-09 | -| node:16 | sha256:64e8bcdfdad6718050801a2639f7e6645fdaf85ec37a98cdb61f6a5331217618 | 2022-12-21 | -| node:16-alpine | sha256:4f4ffee59a017b8881026d23336f37cc13221ec3dea219ebf7b8e55d876b9380 | 2023-01-09 | -| node:18 | sha256:a403ff0ffe7a6a8fe90fdc70289ba398ab3a281bb3fa64b4efed45f45ac17bcd | 2023-01-06 | -| node:18-alpine | sha256:c7bd8f1cdb3c6d7333cbbe63a86ad149759cbea52c18466c00848058ecfeee4d | 2023-01-09 | +| buildpack-deps:bullseye | sha256:c1a2475ac14e13582cf8a44fc071439132928ada47c57e80af372fdcd1690751 | 2023-01-11 | +| buildpack-deps:buster | sha256:c343da4a0b85a4d25ce30529e836a10d46cd4f682fb5326400e4ba274a2f9866 | 2023-01-11 | +| debian:10 | sha256:bb8c62f9f540a5f5f49f7ed5caae0e2889f999cd14553f2aaccaf1fa4fcb998d | 2023-01-11 | +| debian:11 | sha256:534da5794e770279c889daa891f46f5a530b0c5de8bfbc5e40394a0164d9fa87 | 2023-01-11 | +| moby/buildkit:latest | sha256:86ffcc648dbd2215941cbaabbd0564bd8bc67e2aefd32d4feb26e4fb8080f8c6 | 2023-01-17 | +| node:14 | sha256:0c888dc647d36f5a895edb6b1b1c96ae81064455e0cdeee0792e14927604ca99 | 2023-01-11 | +| node:14-alpine | sha256:2c6a909495ef3761328c10945cbe84c06d079f7ca49dc24271e73be8cab85ad7 | 2023-01-09 | +| node:16 | sha256:27fab5920246070cf13449cf44c25bc4f5adef18ca7482b2bda90b7cf9e64481 | 2023-01-11 | +| node:16-alpine | sha256:1298fd170c45954fec3d4d063437750f89802d72743816663664cfe9aa152b4b | 2023-01-09 | +| node:18 | sha256:d871edd5b68105ebcbfcde3fe8c79d24cbdbb30430d9bd6251c57c56c7bd7646 | 2023-01-11 | +| node:18-alpine | sha256:fda98168118e5a8f4269efca4101ee51dd5c75c0fe56d8eb6fad80455c2f5827 | 2023-01-09 | | ubuntu:18.04 | sha256:c1d0baf2425ecef88a2f0c3543ec43690dc16cc80d3c4e593bb95e4f45390e45 | 2023-01-02 | | ubuntu:20.04 | sha256:0e0402cd13f68137edb0266e1d2c682f217814420f2d43d300ed8f65479b14fb | 2022-12-09 | | ubuntu:22.04 | sha256:27cb6e6ccef575a4698b66f5de06c7ecd61589132d5a91d098f7f3f9285415a9 | 2022-12-09 | @@ -330,7 +330,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | libc++-dev | 1:14.0-55\~exp2 | | libc++abi-dev | 1:14.0-55\~exp2 | | libcurl4 | 7.81.0-1ubuntu1.7 | -| libgbm-dev | 22.0.5-0ubuntu0.1 | +| libgbm-dev | 22.0.5-0ubuntu0.3 | | libgconf-2-4 | 3.2.6-7ubuntu2 | | libgsl-dev | 2.7.1+dfsg-3 | | libgtk-3-0 | 3.24.33-1ubuntu2 | @@ -352,7 +352,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | mercurial | 6.1.1-1ubuntu1 | | net-tools | 1.60+git20181103.0eebece-1ubuntu5 | | netcat | 1.218-4ubuntu1 | -| openssh-client | 1:8.9p1-3 | +| openssh-client | 1:8.9p1-3ubuntu0.1 | | p7zip-full | 16.02+dfsg-8 | | p7zip-rar | 16.02-3build1 | | parallel | 20210822+ds-2 | @@ -366,10 +366,10 @@ Use the following command as a part of your job to start the service: 'sudo syst | shellcheck | 0.8.0-2 | | sphinxsearch | 2.2.11-8 | | sqlite3 | 3.37.2-2ubuntu0.1 | -| ssh | 1:8.9p1-3 | +| ssh | 1:8.9p1-3ubuntu0.1 | | sshpass | 1.09-1 | | subversion | 1.14.1-3ubuntu0.22.04.1 | -| sudo | 1.9.9-1ubuntu2.1 | +| sudo | 1.9.9-1ubuntu2.2 | | swig | 4.0.2-1ubuntu1 | | tar | 1.34+dfsg-1build3 | | telnet | 0.17-44build1 | From a218bee02d5964d50d4a18ffcdcd40fad1458d55 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Fri, 20 Jan 2023 20:08:01 +0300 Subject: [PATCH 1693/3485] [Windows] fix software report generator for Parcel (#6933) --- images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 index df5c5f6ccf5d..ef583cad9a26 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 @@ -145,7 +145,7 @@ function Get-PackerVersion { function Get-ParcelVersion { $parcelVersion = parcel --version - return "Parcel $parcelVersion" + return "$parcelVersion" } function Get-PulumiVersion { From 35d339e137dd12656a46c9f58ce2b4d030dd467d Mon Sep 17 00:00:00 2001 From: Fedor Varavenko <122788967+FVaravenko@users.noreply.github.com> Date: Fri, 20 Jan 2023 18:14:34 +0100 Subject: [PATCH 1694/3485] [Linux] Upgrade Az powershell to 9.3.0 (#6953) --- images/linux/toolsets/toolset-1804.json | 2 +- images/linux/toolsets/toolset-2004.json | 2 +- images/linux/toolsets/toolset-2204.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index b170f3526f57..1f6bf682874d 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -123,7 +123,7 @@ "name": "az", "url" : "https://raw.githubusercontent.com/Azure/az-ps-module-versions/main/versions-manifest.json", "versions": [ - "9.2.0" + "9.3.0" ], "zip_versions": [ "3.1.0", diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index 719027fb78ad..04e6f872764e 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -121,7 +121,7 @@ "name": "az", "url" : "https://raw.githubusercontent.com/Azure/az-ps-module-versions/main/versions-manifest.json", "versions": [ - "9.2.0" + "9.3.0" ], "zip_versions": [ "3.1.0", diff --git a/images/linux/toolsets/toolset-2204.json b/images/linux/toolsets/toolset-2204.json index 2e363d5622fb..0b008a367850 100644 --- a/images/linux/toolsets/toolset-2204.json +++ b/images/linux/toolsets/toolset-2204.json @@ -109,7 +109,7 @@ "name": "az", "url" : "https://raw.githubusercontent.com/Azure/az-ps-module-versions/main/versions-manifest.json", "versions": [ - "9.2.0" + "9.3.0" ], "zip_versions": [ ] From 049b5490ba0e10e4cb1ab828fc9e2bb99e3d1599 Mon Sep 17 00:00:00 2001 From: Fedor Varavenko <122788967+FVaravenko@users.noreply.github.com> Date: Fri, 20 Jan 2023 18:15:11 +0100 Subject: [PATCH 1695/3485] [Windows] Upgrade Az powershell to 9.3.0 (#6952) --- images/win/toolsets/toolset-2019.json | 2 +- images/win/toolsets/toolset-2022.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index c47c8a35dddf..b4b921997680 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -127,7 +127,7 @@ "name": "az", "url" : "https://raw.githubusercontent.com/Azure/az-ps-module-versions/main/versions-manifest.json", "versions": [ - "9.2.0" + "9.3.0" ], "zip_versions": [ "1.0.0", diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index 13a333a4cbe4..c93c68ef96e9 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -119,7 +119,7 @@ "name": "az", "url" : "https://raw.githubusercontent.com/Azure/az-ps-module-versions/main/versions-manifest.json", "versions": [ - "9.2.0" + "9.3.0" ], "zip_versions": [ "7.5.0" From 83ed0e8820551a06f474af197491b694ae633bbc Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 21 Jan 2023 16:17:56 +0000 Subject: [PATCH 1696/3485] Updating readme file for macOS-11 version 20230117.2 (#6939) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-11-Readme.md | 140 ++++++++++++++++---------------- 1 file changed, 70 insertions(+), 70 deletions(-) diff --git a/images/macos/macos-11-Readme.md b/images/macos/macos-11-Readme.md index 6091436364d9..e83d4f40c1ba 100644 --- a/images/macos/macos-11-Readme.md +++ b/images/macos/macos-11-Readme.md @@ -1,21 +1,21 @@ | Announcements | |-| -| [[macOS] Default Xcode on macOS 12 Monterey will be set to Xcode 14.1 on January, 9](https://github.com/actions/runner-images/issues/6746) | -| [macOS-latest workflows will use macOS-12](https://github.com/actions/runner-images/issues/6384) | +| [[All OSs] .NET 5.x will be removed from the images on January, 29](https://github.com/actions/runner-images/issues/6840) | +| [[macOS] Default Xcode on macOS 12 Monterey will be set to Xcode 14.2 on January, 16](https://github.com/actions/runner-images/issues/6746) | | [The macOS 10.15 Actions runner image will begin deprecation on 5/31/22 and will be fully unsupported by 12/1/22 for GitHub and ADO](https://github.com/actions/runner-images/issues/5583) | *** # macOS 11 - OS Version: macOS 11.7.2 (20G1020) - Kernel Version: Darwin 20.6.0 -- Image Version: 20221215.1 +- Image Version: 20230117.2 ## Installed Software ### Language and Runtime -- .NET Core SDK: 3.1.101, 3.1.201, 3.1.302, 3.1.426, 5.0.102, 5.0.202, 5.0.302, 5.0.408, 6.0.404, 7.0.101 +- .NET Core SDK: 3.1.101, 3.1.201, 3.1.302, 3.1.426, 5.0.102, 5.0.202, 5.0.302, 5.0.408, 6.0.405, 7.0.102 - Bash 3.2.57(1)-release - Clang/LLVM 13.0.0 -- Clang/LLVM (Homebrew) 14.0.6 - available on `$(brew --prefix llvm@14)/bin/clang` +- Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` - GCC 9 (Homebrew GCC 9.5.0) - available by `gcc-9` alias - GCC 10 (Homebrew GCC 10.4.0) - available by `gcc-10` alias - GCC 11 (Homebrew GCC 11.3.0) - available by `gcc-11` alias @@ -23,34 +23,34 @@ - GNU Fortran 10 (Homebrew GCC 10.4.0) - available by `gfortran-10` alias - GNU Fortran 11 (Homebrew GCC 11.3.0) - available by `gfortran-11` alias - Go 1.17.13 -- Julia 1.8.3 -- Kotlin 1.7.21-release-272 +- Julia 1.8.5 +- Kotlin 1.8.0-release-345 - Mono 6.12.0.188 - MSBuild 16.10.1.51301 (Mono 6.12.0.188) - Node.js 16.19.0 -- NVM 0.39.2 -- NVM - Cached node versions: 14.21.2, 16.19.0, 18.12.1 +- NVM 0.39.3 +- NVM - Cached node versions: 14.21.2, 16.19.0, 18.13.0 - Perl 5.36.0 -- PHP 8.2.0 +- PHP 8.2.1 - Python 2.7.18 - Python3 3.11.1 - R 4.2.2 - Ruby 2.7.7p221 ### Package Management -- Bundler 2.3.26 +- Bundler 2.4.4 - Carthage 0.38.0 - CocoaPods 1.11.3 -- Composer 2.4.4 -- Homebrew 3.6.15 -- Miniconda 4.12.0 +- Composer 2.5.1 +- Homebrew 3.6.19 +- Miniconda 22.11.1 - NPM 8.19.3 - NuGet 6.3.1.1 - Pip 20.3.4 (python 2.7) - Pip3 22.3.1 (python 3.11) - Pipx 1.1.0 -- RubyGems 3.3.26 -- Vcpkg 2022 (build from commit 4b6bce313) +- RubyGems 3.4.4 +- Vcpkg 2022 (build from commit 5908d702d) - Yarn 1.22.19 #### Environment variables @@ -60,31 +60,31 @@ | VCPKG_INSTALLATION_ROOT | /usr/local/share/vcpkg | ### Project Management -- Apache Ant 1.10.12 -- Apache Maven 3.8.6 +- Apache Ant 1.10.13 +- Apache Maven 3.8.7 - Gradle 7.6 -- Sbt 1.8.0 +- Sbt 1.8.2 ### Utilities - 7-Zip 17.04 - aria2 1.36.0 - azcopy 10.16.2 -- bazel 5.4.0 +- bazel 6.0.0 - bazelisk 1.15.0 - bsdtar 3.3.2 - available by 'tar' alias -- Curl 7.86.0 -- Git 2.39.0 +- Curl 7.87.0 +- Git 2.39.1 - Git LFS 3.3.0 -- GitHub CLI 2.20.2 +- GitHub CLI 2.21.2 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.3 -- gpg (GnuPG) 2.3.8 +- gpg (GnuPG) 2.4.0 - helm v3.10.3+g835b733 - Hub CLI 2.14.2 -- ImageMagick 7.1.0-54 +- ImageMagick 7.1.0-57 - jq 1.6 -- mongo v5.0.11 -- mongod v5.0.11 +- mongo 5.0.14 +- mongod 5.0.14 - Newman 5.3.2 - OpenSSL 1.1.1s 1 Nov 2022 - Packer 1.8.5 @@ -93,50 +93,50 @@ - Sox 14.4.2 - Subversion (SVN) 1.14.2 - Switchaudio-osx 1.1.0 -- yq 4.30.5 +- yq 4.30.8 - zstd 1.5.2 ### Tools -- Aliyun CLI 3.0.140 -- App Center CLI 2.12.0 -- AWS CLI 2.9.7 -- AWS SAM CLI 1.66.0 +- Aliyun CLI 3.0.141 +- App Center CLI 2.13.0 +- AWS CLI 2.9.15 +- AWS SAM CLI 1.70.0 - AWS Session Manager CLI 1.2.398.0 -- Azure CLI 2.43.0 +- Azure CLI 2.44.1 - Azure CLI (azure-devops) 0.25.0 - Bicep CLI 0.13.1 - Cabal 3.6.2.0 - Cmake 3.25.1 -- CodeQL Action Bundle 2.11.6 -- Colima 0.5.0 +- CodeQL Action Bundle 2.12.0 +- Colima 0.5.2 - Fastlane 2.211.0 -- GHC 9.4.3 -- GHCup 0.1.18.0 +- GHC 9.4.4 +- GHCup 0.1.19.0 - Jazzy 0.14.3 - Stack 2.9.1 -- SwiftFormat 0.50.6 +- SwiftFormat 0.50.7 - Swig 4.1.1 - Xcode Command Line Tools 13.2.0.0.1.1638488800 ### Linters - SwiftLint 0.48.0 -- Yamllint 1.28.0 +- Yamllint 1.29.0 ### Browsers - Safari 16.2 (16614.3.7.1.7) - SafariDriver 16.2 (16614.3.7.1.7) -- Google Chrome 108.0.5359.124 -- ChromeDriver 108.0.5359.71 -- Microsoft Edge 108.0.1462.46 -- Microsoft Edge WebDriver 108.0.1462.46 -- Mozilla Firefox 108.0 +- Google Chrome 109.0.5414.87 +- ChromeDriver 109.0.5414.74 +- Microsoft Edge 109.0.1518.52 +- Microsoft Edge WebDriver 109.0.1518.52 +- Mozilla Firefox 108.0.2 - geckodriver 0.32.0 - Selenium server 4.5.0 #### Environment variables | Name | Value | | --------------- | ---------------------------------------------- | -| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/108.0.5359.71 | +| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/109.0.5414.74 | | EDGEWEBDRIVER | /usr/local/share/edge_driver | | GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | @@ -164,31 +164,31 @@ #### Python - 3.7.15 -- 3.8.15 +- 3.8.16 - 3.9.16 - 3.10.9 - 3.11.1 #### PyPy -- 2.7.18 [PyPy 7.3.10] +- 2.7.18 [PyPy 7.3.11] - 3.7.13 [PyPy 7.3.9] -- 3.8.15 [PyPy 7.3.10] -- 3.9.15 [PyPy 7.3.10] +- 3.8.16 [PyPy 7.3.11] +- 3.9.16 [PyPy 7.3.11] #### Node.js - 14.21.2 - 16.19.0 -- 18.12.1 +- 18.13.0 #### Go - 1.17.13 -- 1.18.9 -- 1.19.4 +- 1.18.10 +- 1.19.5 ### Rust Tools -- Cargo 1.66.0 -- Rust 1.66.0 -- Rustdoc 1.66.0 +- Cargo 1.66.1 +- Rust 1.66.1 +- Rustdoc 1.66.1 - Rustup 1.25.1 #### Packages @@ -203,9 +203,9 @@ - PowerShell 7.2.8 #### PowerShell Modules -- Az: 9.2.0 +- Az: 9.3.0 - MarkdownPS: 1.9 -- Pester: 5.3.3 +- Pester: 5.4.0 - PSScriptAnalyzer: 1.21.0 ### Web Servers @@ -333,19 +333,19 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" | watchOS 8.3 | 13.2.1 | Apple Watch Series 4 - 40mm<br>Apple Watch Series 4 - 44mm<br>Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | ### Android -| Package Name | Version | -| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 8.0 | -| Android Emulator | 31.3.14 | -| Android SDK Build-tools | 33.0.0 33.0.1<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | -| Android SDK Platforms | android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | -| Android SDK Platform-Tools | 33.0.3 | -| Android Support Repository | 47.0.0 | -| CMake | 3.10.2<br>3.18.1<br>3.22.1 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 23.2.8568313<br>24.0.8215888<br>25.1.8937393 (default) | -| SDK Patch Applier v4 | 1 | +| Package Name | Version | +| -------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 8.0 | +| Android Emulator | 31.3.14 | +| Android SDK Build-tools | 33.0.0 33.0.1<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | +| Android SDK Platforms | android-33-ext4 (rev 1)<br>android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | +| Android SDK Platform-Tools | 33.0.3 | +| Android Support Repository | 47.0.0 | +| CMake | 3.10.2<br>3.18.1<br>3.22.1 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 23.2.8568313<br>24.0.8215888<br>25.1.8937393 (default) | +| SDK Patch Applier v4 | 1 | #### Environment variables | Name | Value | From c6393f1f231a4bce8aaeb2665d1312b14271169b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 21 Jan 2023 16:27:39 +0000 Subject: [PATCH 1697/3485] Updating readme file for macOS-12 version 20230117.3 (#6940) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-12-Readme.md | 297 ++++++++++++++++---------------- 1 file changed, 148 insertions(+), 149 deletions(-) diff --git a/images/macos/macos-12-Readme.md b/images/macos/macos-12-Readme.md index edd2e6159177..85e3e0b80315 100644 --- a/images/macos/macos-12-Readme.md +++ b/images/macos/macos-12-Readme.md @@ -1,52 +1,52 @@ | Announcements | |-| -| [[macOS] Default Xcode on macOS 12 Monterey will be set to Xcode 14.1 on January, 9](https://github.com/actions/runner-images/issues/6746) | -| [macOS-latest workflows will use macOS-12](https://github.com/actions/runner-images/issues/6384) | +| [[All OSs] .NET 5.x will be removed from the images on January, 29](https://github.com/actions/runner-images/issues/6840) | +| [[macOS] Default Xcode on macOS 12 Monterey will be set to Xcode 14.2 on January, 16](https://github.com/actions/runner-images/issues/6746) | | [The macOS 10.15 Actions runner image will begin deprecation on 5/31/22 and will be fully unsupported by 12/1/22 for GitHub and ADO](https://github.com/actions/runner-images/issues/5583) | *** # macOS 12 - OS Version: macOS 12.6.2 (21G320) - Kernel Version: Darwin 21.6.0 -- Image Version: 20221215.1 +- Image Version: 20230117.3 ## Installed Software ### Language and Runtime -- .NET Core SDK: 3.1.101, 3.1.201, 3.1.302, 3.1.426, 5.0.102, 5.0.202, 5.0.302, 5.0.408, 6.0.404, 7.0.101 +- .NET Core SDK: 3.1.101, 3.1.201, 3.1.302, 3.1.426, 5.0.102, 5.0.202, 5.0.302, 5.0.408, 6.0.405, 7.0.102 - Bash 3.2.57(1)-release - Clang/LLVM 14.0.0 -- Clang/LLVM (Homebrew) 14.0.6 - available on `$(brew --prefix llvm@14)/bin/clang` +- Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` - GCC 11 (Homebrew GCC 11.3.0) - available by `gcc-11` alias - GNU Fortran 11 (Homebrew GCC 11.3.0) - available by `gfortran-11` alias - Go 1.17.13 -- Julia 1.8.3 -- Kotlin 1.7.21-release-272 +- Julia 1.8.5 +- Kotlin 1.8.0-release-345 - Mono 6.12.0.188 - MSBuild 16.10.1.51301 (Mono 6.12.0.188) - Node.js 16.19.0 -- NVM 0.39.2 -- NVM - Cached node versions: 14.21.2, 16.19.0, 18.12.1 +- NVM 0.39.3 +- NVM - Cached node versions: 14.21.2, 16.19.0, 18.13.0 - Perl 5.36.0 -- PHP 8.2.0 +- PHP 8.2.1 - Python 2.7.18 - Python3 3.11.1 - R 4.2.2 - Ruby 3.0.5p211 ### Package Management -- Bundler 2.3.26 +- Bundler 2.4.4 - Carthage 0.38.0 - CocoaPods 1.11.3 -- Composer 2.4.4 -- Homebrew 3.6.15 -- Miniconda 4.12.0 +- Composer 2.5.1 +- Homebrew 3.6.19 +- Miniconda 22.11.1 - NPM 8.19.3 - NuGet 6.3.1.1 - Pip 20.3.4 (python 2.7) - Pip3 22.3.1 (python 3.11) - Pipx 1.1.0 -- RubyGems 3.3.26 -- Vcpkg 2022 (build from commit 4b6bce313) +- RubyGems 3.4.4 +- Vcpkg 2022 (build from commit 5908d702d) - Yarn 1.22.19 #### Environment variables @@ -56,30 +56,30 @@ | VCPKG_INSTALLATION_ROOT | /usr/local/share/vcpkg | ### Project Management -- Apache Ant 1.10.12 -- Apache Maven 3.8.6 +- Apache Ant 1.10.13 +- Apache Maven 3.8.7 - Gradle 7.6 -- Sbt 1.8.0 +- Sbt 1.8.2 ### Utilities - 7-Zip 17.04 - aria2 1.36.0 - azcopy 10.16.2 -- bazel 5.4.0 +- bazel 6.0.0 - bazelisk 1.15.0 - bsdtar 3.5.1 - available by 'tar' alias -- Curl 7.86.0 -- Git 2.39.0 +- Curl 7.87.0 +- Git 2.39.1 - Git LFS 3.3.0 -- GitHub CLI 2.20.2 +- GitHub CLI 2.21.2 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.3 -- gpg (GnuPG) 2.3.8 +- gpg (GnuPG) 2.4.0 - Hub CLI 2.14.2 -- ImageMagick 7.1.0-54 +- ImageMagick 7.1.0-57 - jq 1.6 -- mongo v5.0.11 -- mongod v5.0.11 +- mongo 5.0.14 +- mongod 5.0.14 - OpenSSL 1.1.1s 1 Nov 2022 - Packer 1.8.5 - PostgreSQL 14.6 (Homebrew) @@ -89,49 +89,49 @@ - Switchaudio-osx 1.1.0 - Vagrant 2.3.4 - VirtualBox 6.1.38r153438 -- yq 4.30.5 +- yq 4.30.8 - zstd 1.5.2 ### Tools -- App Center CLI 2.12.0 -- AWS CLI 2.9.7 -- AWS SAM CLI 1.66.0 +- App Center CLI 2.13.0 +- AWS CLI 2.9.15 +- AWS SAM CLI 1.70.0 - AWS Session Manager CLI 1.2.398.0 -- Azure CLI 2.43.0 +- Azure CLI 2.44.1 - Azure CLI (azure-devops) 0.25.0 - Bicep CLI 0.13.1 - Cabal 3.6.2.0 - Cmake 3.25.1 -- CodeQL Action Bundle 2.11.6 -- Colima 0.5.0 +- CodeQL Action Bundle 2.12.0 +- Colima 0.5.2 - Fastlane 2.211.0 -- GHC 9.4.3 -- GHCup 0.1.18.0 +- GHC 9.4.4 +- GHCup 0.1.19.0 - Jazzy 0.14.3 - Stack 2.9.1 -- SwiftFormat 0.50.6 +- SwiftFormat 0.50.7 - Swig 4.1.1 - Xcode Command Line Tools 14.2.0.0.1.1668646533 ### Linters - SwiftLint 0.50.3 -- Yamllint 1.28.0 +- Yamllint 1.29.0 ### Browsers - Safari 16.2 (17614.3.7.1.7) - SafariDriver 16.2 (17614.3.7.1.7) -- Google Chrome 108.0.5359.124 -- ChromeDriver 108.0.5359.71 -- Microsoft Edge 108.0.1462.46 -- Microsoft Edge WebDriver 108.0.1462.46 -- Mozilla Firefox 108.0 +- Google Chrome 109.0.5414.87 +- ChromeDriver 109.0.5414.74 +- Microsoft Edge 109.0.1518.52 +- Microsoft Edge WebDriver 109.0.1518.52 +- Mozilla Firefox 108.0.2 - geckodriver 0.32.0 - Selenium server 4.5.0 #### Environment variables | Name | Value | | --------------- | ---------------------------------------------- | -| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/108.0.5359.71 | +| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/109.0.5414.74 | | EDGEWEBDRIVER | /usr/local/share/edge_driver | | GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | @@ -156,31 +156,31 @@ #### Python - 3.7.15 -- 3.8.15 +- 3.8.16 - 3.9.16 - 3.10.9 - 3.11.1 #### PyPy -- 2.7.18 [PyPy 7.3.10] +- 2.7.18 [PyPy 7.3.11] - 3.7.13 [PyPy 7.3.9] -- 3.8.15 [PyPy 7.3.10] -- 3.9.15 [PyPy 7.3.10] +- 3.8.16 [PyPy 7.3.11] +- 3.9.16 [PyPy 7.3.11] #### Node.js - 14.21.2 - 16.19.0 -- 18.12.1 +- 18.13.0 #### Go - 1.17.13 -- 1.18.9 -- 1.19.4 +- 1.18.10 +- 1.19.5 ### Rust Tools -- Cargo 1.66.0 -- Rust 1.66.0 -- Rustdoc 1.66.0 +- Cargo 1.66.1 +- Rust 1.66.1 +- Rustdoc 1.66.1 - Rustup 1.25.1 #### Packages @@ -195,16 +195,16 @@ - PowerShell 7.2.8 #### PowerShell Modules -- Az: 9.2.0 +- Az: 9.3.0 - MarkdownPS: 1.9 -- Pester: 5.3.3 +- Pester: 5.4.0 - PSScriptAnalyzer: 1.21.0 ### Web Servers -| Name | Version | ConfigFile | ServiceStatus | ListenPort | -| ----- | -------- | ------------------------------- | ------------- | ---------- | -| httpd | 2.4.54_1 | /usr/local/etc/httpd/httpd.conf | none | 80 | -| nginx | 1.23.3 | /usr/local/etc/nginx/nginx.conf | none | 80 | +| Name | Version | ConfigFile | ServiceStatus | ListenPort | +| ----- | ------- | ------------------------------- | ------------- | ---------- | +| httpd | 2.4.55 | /usr/local/etc/httpd/httpd.conf | none | 80 | +| nginx | 1.23.3 | /usr/local/etc/nginx/nginx.conf | none | 80 | ### Xamarin @@ -241,105 +241,104 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" - NUnit 3.6.1 ### Xcode -| Version | Build | Path | -| ---------------- | -------- | ------------------------------ | -| 14.2 | 14C18 | /Applications/Xcode_14.2.app | -| 14.1 | 14B47b | /Applications/Xcode_14.1.app | -| 14.0.1 (default) | 14A400 | /Applications/Xcode_14.0.1.app | -| 14.0 | 14A309 | /Applications/Xcode_14.0.app | -| 13.4.1 | 13F100 | /Applications/Xcode_13.4.1.app | -| 13.4 | 13F17a | /Applications/Xcode_13.4.app | -| 13.3.1 | 13E500a | /Applications/Xcode_13.3.1.app | -| 13.2.1 | 13C100 | /Applications/Xcode_13.2.1.app | -| 13.1 | 13A1030d | /Applications/Xcode_13.1.app | +| Version | Build | Path | +| -------------- | -------- | ------------------------------ | +| 14.2 (default) | 14C18 | /Applications/Xcode_14.2.app | +| 14.1 | 14B47b | /Applications/Xcode_14.1.app | +| 14.0.1 | 14A400 | /Applications/Xcode_14.0.1.app | +| 13.4.1 | 13F100 | /Applications/Xcode_13.4.1.app | +| 13.4 | 13F17a | /Applications/Xcode_13.4.app | +| 13.3.1 | 13E500a | /Applications/Xcode_13.3.1.app | +| 13.2.1 | 13C100 | /Applications/Xcode_13.2.1.app | +| 13.1 | 13A1030d | /Applications/Xcode_13.1.app | #### Xcode Support Tools - xcpretty 0.3.0 - xcversion 2.8.1 #### Installed SDKs -| SDK | SDK Name | Xcode Version | -| ----------------------- | -------------------- | ---------------------------------- | -| macOS 12.0 | macosx12.0 | 13.1 | -| macOS 12.1 | macosx12.1 | 13.2.1 | -| macOS 12.3 | macosx12.3 | 13.3.1, 13.4, 13.4.1, 14.0, 14.0.1 | -| macOS 13.0 | macosx13.0 | 14.1 | -| macOS 13.1 | macosx13.1 | 14.2 | -| iOS 15.0 | iphoneos15.0 | 13.1 | -| iOS 15.2 | iphoneos15.2 | 13.2.1 | -| iOS 15.4 | iphoneos15.4 | 13.3.1 | -| iOS 15.5 | iphoneos15.5 | 13.4, 13.4.1 | -| iOS 16.0 | iphoneos16.0 | 14.0, 14.0.1 | -| iOS 16.1 | iphoneos16.1 | 14.1 | -| iOS 16.2 | iphoneos16.2 | 14.2 | -| Simulator - iOS 15.0 | iphonesimulator15.0 | 13.1 | -| Simulator - iOS 15.2 | iphonesimulator15.2 | 13.2.1 | -| Simulator - iOS 15.4 | iphonesimulator15.4 | 13.3.1 | -| Simulator - iOS 15.5 | iphonesimulator15.5 | 13.4, 13.4.1 | -| Simulator - iOS 16.0 | iphonesimulator16.0 | 14.0, 14.0.1 | -| Simulator - iOS 16.1 | iphonesimulator16.1 | 14.1 | -| Simulator - iOS 16.2 | iphonesimulator16.2 | 14.2 | -| tvOS 15.0 | appletvos15.0 | 13.1 | -| tvOS 15.2 | appletvos15.2 | 13.2.1 | -| tvOS 15.4 | appletvos15.4 | 13.3.1, 13.4, 13.4.1 | -| tvOS 16.0 | appletvos16.0 | 14.0, 14.0.1 | -| tvOS 16.1 | appletvos16.1 | 14.1, 14.2 | -| Simulator - tvOS 15.0 | appletvsimulator15.0 | 13.1 | -| Simulator - tvOS 15.2 | appletvsimulator15.2 | 13.2.1 | -| Simulator - tvOS 15.4 | appletvsimulator15.4 | 13.3.1, 13.4, 13.4.1 | -| Simulator - tvOS 16.0 | appletvsimulator16.0 | 14.0, 14.0.1 | -| Simulator - tvOS 16.1 | appletvsimulator16.1 | 14.1, 14.2 | -| watchOS 8.0 | watchos8.0 | 13.1 | -| watchOS 8.3 | watchos8.3 | 13.2.1 | -| watchOS 8.5 | watchos8.5 | 13.3.1, 13.4, 13.4.1 | -| watchOS 9.0 | watchos9.0 | 14.0, 14.0.1 | -| watchOS 9.1 | watchos9.1 | 14.1, 14.2 | -| Simulator - watchOS 8.0 | watchsimulator8.0 | 13.1 | -| Simulator - watchOS 8.3 | watchsimulator8.3 | 13.2.1 | -| Simulator - watchOS 8.5 | watchsimulator8.5 | 13.3.1, 13.4, 13.4.1 | -| Simulator - watchOS 9.0 | watchsimulator9.0 | 14.0, 14.0.1 | -| Simulator - watchOS 9.1 | watchsimulator9.1 | 14.1, 14.2 | -| DriverKit 21.0.1 | driverkit21.0.1 | 13.1 | -| DriverKit 21.2 | driverkit21.2 | 13.2.1 | -| DriverKit 21.4 | driverkit21.4 | 13.3.1, 13.4, 13.4.1, 14.0, 14.0.1 | -| DriverKit 22.1 | driverkit22.1 | 14.1 | -| DriverKit 22.2 | driverkit22.2 | 14.2 | +| SDK | SDK Name | Xcode Version | +| ----------------------- | -------------------- | ---------------------------- | +| macOS 12.0 | macosx12.0 | 13.1 | +| macOS 12.1 | macosx12.1 | 13.2.1 | +| macOS 12.3 | macosx12.3 | 13.3.1, 13.4, 13.4.1, 14.0.1 | +| macOS 13.0 | macosx13.0 | 14.1 | +| macOS 13.1 | macosx13.1 | 14.2 | +| iOS 15.0 | iphoneos15.0 | 13.1 | +| iOS 15.2 | iphoneos15.2 | 13.2.1 | +| iOS 15.4 | iphoneos15.4 | 13.3.1 | +| iOS 15.5 | iphoneos15.5 | 13.4, 13.4.1 | +| iOS 16.0 | iphoneos16.0 | 14.0.1 | +| iOS 16.1 | iphoneos16.1 | 14.1 | +| iOS 16.2 | iphoneos16.2 | 14.2 | +| Simulator - iOS 15.0 | iphonesimulator15.0 | 13.1 | +| Simulator - iOS 15.2 | iphonesimulator15.2 | 13.2.1 | +| Simulator - iOS 15.4 | iphonesimulator15.4 | 13.3.1 | +| Simulator - iOS 15.5 | iphonesimulator15.5 | 13.4, 13.4.1 | +| Simulator - iOS 16.0 | iphonesimulator16.0 | 14.0.1 | +| Simulator - iOS 16.1 | iphonesimulator16.1 | 14.1 | +| Simulator - iOS 16.2 | iphonesimulator16.2 | 14.2 | +| tvOS 15.0 | appletvos15.0 | 13.1 | +| tvOS 15.2 | appletvos15.2 | 13.2.1 | +| tvOS 15.4 | appletvos15.4 | 13.3.1, 13.4, 13.4.1 | +| tvOS 16.0 | appletvos16.0 | 14.0.1 | +| tvOS 16.1 | appletvos16.1 | 14.1, 14.2 | +| Simulator - tvOS 15.0 | appletvsimulator15.0 | 13.1 | +| Simulator - tvOS 15.2 | appletvsimulator15.2 | 13.2.1 | +| Simulator - tvOS 15.4 | appletvsimulator15.4 | 13.3.1, 13.4, 13.4.1 | +| Simulator - tvOS 16.0 | appletvsimulator16.0 | 14.0.1 | +| Simulator - tvOS 16.1 | appletvsimulator16.1 | 14.1, 14.2 | +| watchOS 8.0 | watchos8.0 | 13.1 | +| watchOS 8.3 | watchos8.3 | 13.2.1 | +| watchOS 8.5 | watchos8.5 | 13.3.1, 13.4, 13.4.1 | +| watchOS 9.0 | watchos9.0 | 14.0.1 | +| watchOS 9.1 | watchos9.1 | 14.1, 14.2 | +| Simulator - watchOS 8.0 | watchsimulator8.0 | 13.1 | +| Simulator - watchOS 8.3 | watchsimulator8.3 | 13.2.1 | +| Simulator - watchOS 8.5 | watchsimulator8.5 | 13.3.1, 13.4, 13.4.1 | +| Simulator - watchOS 9.0 | watchsimulator9.0 | 14.0.1 | +| Simulator - watchOS 9.1 | watchsimulator9.1 | 14.1, 14.2 | +| DriverKit 21.0.1 | driverkit21.0.1 | 13.1 | +| DriverKit 21.2 | driverkit21.2 | 13.2.1 | +| DriverKit 21.4 | driverkit21.4 | 13.3.1, 13.4, 13.4.1, 14.0.1 | +| DriverKit 22.1 | driverkit22.1 | 14.1 | +| DriverKit 22.2 | driverkit22.2 | 14.2 | #### Installed Simulators -| OS | Xcode Version | Simulators | -| ----------- | ---------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| iOS 15.0 | 13.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | -| iOS 15.2 | 13.2.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | -| iOS 15.4 | 13.3.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPhone SE (3rd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | -| iOS 15.5 | 13.4<br>13.4.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPhone SE (3rd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | -| iOS 16.0 | 14.0<br>14.0.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPhone SE (3rd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | -| iOS 16.1 | 14.1 | iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro (9.7-inch) | -| iOS 16.2 | 14.2 | iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro (9.7-inch) | -| tvOS 15.0 | 13.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | -| tvOS 15.2 | 13.2.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | -| tvOS 15.4 | 13.3.1<br>13.4<br>13.4.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | -| tvOS 16.0 | 13.1<br>13.2.1<br>13.3.1<br>13.4<br>13.4.1<br>14.0<br>14.0.1<br>14.1<br>14.2 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | -| tvOS 16.1 | 13.1<br>13.2.1<br>13.3.1<br>13.4<br>13.4.1<br>14.0<br>14.0.1<br>14.1<br>14.2 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p)<br>Apple TV 4K (at 1080p) (2nd generation) | -| watchOS 8.0 | 13.1 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | -| watchOS 8.3 | 13.2.1 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | -| watchOS 8.5 | 13.3.1<br>13.4<br>13.4.1 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | -| watchOS 9.0 | 13.1<br>13.2.1<br>13.3.1<br>13.4<br>13.4.1<br>14.0<br>14.0.1<br>14.1<br>14.2 | Apple Watch SE - 40mm (2nd generation)<br>Apple Watch SE - 44mm (2nd generation)<br>Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm<br>Apple Watch Series 8 - 41mm<br>Apple Watch Series 8 - 45mm<br>Apple Watch Ultra - 49mm | -| watchOS 9.1 | 13.1<br>13.2.1<br>13.3.1<br>13.4<br>13.4.1<br>14.0<br>14.0.1<br>14.1<br>14.2 | Apple Watch SE - 40mm (2nd generation)<br>Apple Watch SE - 44mm (2nd generation)<br>Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm<br>Apple Watch Series 8 - 41mm<br>Apple Watch Series 8 - 45mm<br>Apple Watch Ultra - 49mm | +| OS | Xcode Version | Simulators | +| ----------- | -------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | +| iOS 15.0 | 13.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | +| iOS 15.2 | 13.2.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | +| iOS 15.4 | 13.3.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPhone SE (3rd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | +| iOS 15.5 | 13.4<br>13.4.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPhone SE (3rd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | +| iOS 16.0 | 14.0.1 | iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPhone SE (3rd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | +| iOS 16.1 | 14.1 | iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro (9.7-inch) | +| iOS 16.2 | 14.2 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro (9.7-inch) | +| tvOS 15.0 | 13.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (2nd generation) (at 1080p) | +| tvOS 15.2 | 13.2.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | +| tvOS 15.4 | 13.3.1<br>13.4<br>13.4.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | +| tvOS 16.0 | 13.1<br>13.2.1<br>13.3.1<br>13.4<br>13.4.1<br>14.0.1<br>14.1<br>14.2 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | +| tvOS 16.1 | 13.1<br>13.2.1<br>13.3.1<br>13.4<br>13.4.1<br>14.0.1<br>14.1<br>14.2 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p)<br>Apple TV 4K (at 1080p) (2nd generation) | +| watchOS 8.0 | 13.1 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | +| watchOS 8.3 | 13.2.1 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | +| watchOS 8.5 | 13.3.1<br>13.4<br>13.4.1 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | +| watchOS 9.0 | 13.1<br>13.2.1<br>13.3.1<br>13.4<br>13.4.1<br>14.0.1<br>14.1<br>14.2 | Apple Watch SE - 40mm (2nd generation)<br>Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm<br>Apple Watch Series 8 - 41mm<br>Apple Watch Series 8 - 45mm<br>Apple Watch Ultra - 49mm | +| watchOS 9.1 | 13.1<br>13.2.1<br>13.3.1<br>13.4<br>13.4.1<br>14.0.1<br>14.1<br>14.2 | Apple Watch SE - 40mm (2nd generation)<br>Apple Watch SE - 44mm (2nd generation)<br>Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm<br>Apple Watch Series 8 - 41mm<br>Apple Watch Series 8 - 45mm<br>Apple Watch Ultra - 49mm | ### Android -| Package Name | Version | -| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 8.0 | -| Android Emulator | 31.3.14 | -| Android SDK Build-tools | 33.0.0 33.0.1<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | -| Android SDK Platforms | android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | -| Android SDK Platform-Tools | 33.0.3 | -| Android Support Repository | 47.0.0 | -| CMake | 3.18.1<br>3.22.1 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 23.2.8568313<br>24.0.8215888<br>25.1.8937393 (default) | -| SDK Patch Applier v4 | 1 | +| Package Name | Version | +| -------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 8.0 | +| Android Emulator | 31.3.14 | +| Android SDK Build-tools | 33.0.0 33.0.1<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | +| Android SDK Platforms | android-33-ext4 (rev 1)<br>android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | +| Android SDK Platform-Tools | 33.0.3 | +| Android Support Repository | 47.0.0 | +| CMake | 3.18.1<br>3.22.1 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 23.2.8568313<br>24.0.8215888<br>25.1.8937393 (default) | +| SDK Patch Applier v4 | 1 | #### Environment variables | Name | Value | From 44a6abe0b7a4c11cfe2d153a394b76f33cf97fba Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Mon, 23 Jan 2023 15:38:35 +0100 Subject: [PATCH 1698/3485] [Windows] Hardcode command line tools (#6963) --- .../scripts/Installers/Install-AndroidSDK.ps1 | 19 +++---------------- images/win/toolsets/toolset-2019.json | 1 - images/win/toolsets/toolset-2022.json | 1 - 3 files changed, 3 insertions(+), 18 deletions(-) diff --git a/images/win/scripts/Installers/Install-AndroidSDK.ps1 b/images/win/scripts/Installers/Install-AndroidSDK.ps1 index baa20a3c830c..1ac43665dbab 100644 --- a/images/win/scripts/Installers/Install-AndroidSDK.ps1 +++ b/images/win/scripts/Installers/Install-AndroidSDK.ps1 @@ -5,22 +5,9 @@ # get packages to install from the toolset $androidToolset = (Get-ToolsetContent).android - -# install latest command-line tools -$cmdlineToolsVersion = $androidToolset."cmdline-tools" -if ($cmdlineToolsVersion -eq "latest") { - $googlePkgs = Invoke-RestMethod "https://dl.google.com/android/repository/repository2-1.xml" - $cmdlineToolsVersion = $googlePkgs.SelectSingleNode( - "//remotePackage[@path='cmdline-tools;latest']/archives/archive/complete/url[starts-with(text(), 'commandlinetools-win-')]" - ).'#text' - - if (-not $cmdlineToolsVersion) { - Write-Host "Failed to parse latest command-line tools version" - exit 1 - } -} - -$cmdlineToolsUrl = "https://dl.google.com/android/repository/${cmdlineToolsVersion}" +# Newer version(s) require Java 11 by default +# See https://github.com/actions/runner-images/issues/6960 +$cmdlineToolsUrl = "https://dl.google.com/android/repository/commandlinetools-win-9123335_latest.zip" $cmdlineToolsArchPath = Start-DownloadWithRetry -Url $cmdlineToolsUrl -Name "cmdline-tools.zip" $sdkInstallRoot = "C:\Program Files (x86)\Android\android-sdk" $sdkRoot = "C:\Android\android-sdk" diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index b4b921997680..248fcf99e87f 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -162,7 +162,6 @@ ] }, "android": { - "cmdline-tools": "latest", "platform_min_version": "19", "build_tools_min_version": "19.1.0", "extra_list": [ diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index c93c68ef96e9..170449c1bd79 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -141,7 +141,6 @@ ] }, "android": { - "cmdline-tools": "latest", "platform_min_version": "27", "build_tools_min_version": "27.0.0", "extra_list": [ From 15829d25a94216fe83ba7b9fce769ac4841a2463 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Mon, 23 Jan 2023 18:54:13 +0300 Subject: [PATCH 1699/3485] [macOS] Hardcode command line tools (#6965) --- .../macos/provision/core/android-toolsets.sh | 20 +++---------------- images/macos/toolsets/toolset-10.15.json | 1 - images/macos/toolsets/toolset-11.json | 1 - images/macos/toolsets/toolset-12.json | 1 - 4 files changed, 3 insertions(+), 20 deletions(-) diff --git a/images/macos/provision/core/android-toolsets.sh b/images/macos/provision/core/android-toolsets.sh index 2126541a5474..9e23e0c619e6 100755 --- a/images/macos/provision/core/android-toolsets.sh +++ b/images/macos/provision/core/android-toolsets.sh @@ -35,23 +35,9 @@ ANDROID_NDK_MAJOR_VERSIONS=($(get_toolset_value '.android.ndk."versions"[]')) ANDROID_NDK_MAJOR_DEFAULT=$(get_toolset_value '.android.ndk.default') ANDROID_NDK_MAJOR_LATEST=$(get_toolset_value '.android.ndk."versions"[-1]') # Get the latest command line tools from https://developer.android.com/studio#cmdline-tools -cmdlineToolsVersion=$(get_toolset_value '.android."cmdline-tools"') -if [[ $cmdlineToolsVersion == "latest" ]]; then - repositoryXmlUrl="https://dl.google.com/android/repository/repository2-1.xml" - download_with_retries $repositoryXmlUrl "/tmp" "repository2-1.xml" - cmdlineToolsVersion=$( - yq -p=xml \ - '.sdk-repository.remotePackage[] | select(."+@path" == "cmdline-tools;latest").archives.archive[].complete.url | select(contains("commandlinetools-mac"))' \ - /tmp/repository2-1.xml - ) - - if [[ -z $cmdlineToolsVersion ]]; then - echo "Failed to parse latest command-line tools version" - exit 1 - fi -fi - -ANDROID_OSX_SDK_URL="https://dl.google.com/android/repository/${cmdlineToolsVersion}" +# Newer version(s) require Java 11 by default +# See https://github.com/actions/runner-images/issues/6960 +ANDROID_OSX_SDK_URL="https://dl.google.com/android/repository/commandlinetools-mac-9123335_latest.zip" ANDROID_HOME=$HOME/Library/Android/sdk ANDROID_OSX_SDK_FILE=tools-macosx.zip diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index 5e71d56626db..84ba4277e8a5 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -165,7 +165,6 @@ ] }, "android": { - "cmdline-tools": "latest", "platform_min_version": "24", "build_tools_min_version": "24.0.0", "extra-list": [ diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index 4be9a6f4d9ea..acbaafea9e65 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -165,7 +165,6 @@ ] }, "android": { - "cmdline-tools": "latest", "platform_min_version": "27", "build_tools_min_version": "27.0.0", "extra-list": [ diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index 22df06338bea..b063a3f01dc5 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -132,7 +132,6 @@ ] }, "android": { - "cmdline-tools": "latest", "platform_min_version": "27", "build_tools_min_version": "27.0.0", "extra-list": [ From b8d201e18a3c20df5f16e84739fc9c1ecbfb5a97 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 25 Jan 2023 11:20:25 +0000 Subject: [PATCH 1700/3485] Updating readme file for ubuntu20 version 20230122.1 (#6966) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2004-Readme.md | 36 +++++++++++++++---------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/images/linux/Ubuntu2004-Readme.md b/images/linux/Ubuntu2004-Readme.md index c031c1ab51e2..882926db2940 100644 --- a/images/linux/Ubuntu2004-Readme.md +++ b/images/linux/Ubuntu2004-Readme.md @@ -6,7 +6,7 @@ # Ubuntu 20.04 - OS Version: 20.04.5 LTS - Kernel Version: 5.15.0-1031-azure -- Image Version: 20230118.1 +- Image Version: 20230122.1 ## Installed Software @@ -29,12 +29,12 @@ - Python 3.8.10 - Python3 3.8.10 - Ruby 2.7.0p0 -- Swift 5.7.2 +- Swift 5.7.3 ### Package Management - cpan 1.64 -- Helm 3.10.3 -- Homebrew 3.6.19 +- Helm 3.11.0 +- Homebrew 3.6.20 - Miniconda 22.11.1 - Npm 8.19.3 - NuGet 6.3.1.1 @@ -42,7 +42,7 @@ - Pip3 20.0.2 - Pipx 1.1.0 - RubyGems 3.1.2 -- Vcpkg (build from commit 5908d702d) +- Vcpkg (build from commit e69dd972b) - Yarn 1.22.19 #### Environment variables @@ -74,7 +74,7 @@ to accomplish this. - Bazelisk 1.13.2 - Bicep 0.13.1 - Buildah 1.22.3 -- CMake 3.25.1 +- CMake 3.25.2 - CodeQL Action Bundle 2.12.0 - Docker Amazon ECR Credential Helper 0.6.0 - Docker Compose v1 1.29.2 @@ -88,10 +88,10 @@ to accomplish this. - Git-ftp 1.6.0 - Haveged 1.9.1 - Heroku 7.67.1 -- HHVM (HipHop VM) 4.172.0 +- HHVM (HipHop VM) 4.172.1 - jq 1.6 - Kind 0.17.0 -- Kubectl 1.26.0 +- Kubectl 1.26.1 - Kustomize 4.5.7 - Leiningen 2.10.0 - MediaInfo 19.09 @@ -105,7 +105,7 @@ to accomplish this. - Parcel 2.8.3 - PhantomJS 2.1.1 - Podman 3.4.2 -- Pulumi 3.51.1 +- Pulumi 3.52.1 - R 4.2.2 - Skopeo 1.5.0 - Sphinx Open Source Search Server 2.2.11 @@ -117,7 +117,7 @@ to accomplish this. ### CLI Tools - Alibaba Cloud CLI 3.0.144 -- AWS CLI 2.9.15 +- AWS CLI 2.9.17 - AWS CLI Session Manager Plugin 1.2.398.0 - AWS SAM CLI 1.70.0 - Azure CLI 2.44.1 @@ -125,10 +125,10 @@ to accomplish this. - GitHub CLI 2.21.2 - Google Cloud SDK 414.0.0 - Hub CLI 2.14.2 -- Netlify CLI 12.7.2 +- Netlify CLI 12.9.1 - OpenShift CLI 4.12.0 - ORAS CLI 0.16.0 -- Vercel CLI 28.12.7 +- Vercel CLI 28.13.0 ### Java | Version | Vendor | Environment Variable | @@ -166,7 +166,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Bindgen 0.63.0 - Cargo audit 0.17.4 - Cargo clippy 0.1.66 -- Cargo outdated 0.11.1 +- Cargo outdated 0.11.2 - Cbindgen 0.24.3 - Rustfmt 1.5.1 @@ -174,8 +174,8 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Google Chrome 109.0.5414.74 - ChromeDriver 109.0.5414.74 - Chromium 109.0.5414.0 -- Microsoft Edge 109.0.1518.52 -- Microsoft Edge WebDriver 109.0.1518.52 +- Microsoft Edge 109.0.1518.61 +- Microsoft Edge WebDriver 109.0.1518.61 - Selenium server 4.7.0 - Mozilla Firefox 109.0 - Geckodriver 0.32.0 @@ -256,7 +256,7 @@ Use the following command as a part of your job to start the service: 'sudo syst - PowerShell 7.2.8 #### PowerShell Modules -- Az: 9.2.0 +- Az: 9.3.0 - Az (Cached): 3.1.0.zip, 4.4.0.zip, 5.9.0.zip, 6.6.0.zip, 7.5.0.zip - MarkdownPS: 1.9 - Microsoft.Graph: 1.20.0 @@ -273,7 +273,7 @@ Use the following command as a part of your job to start the service: 'sudo syst ### Android | Package Name | Version | | -------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 8.0 | +| Android Command Line Tools | 9.0 | | Android Emulator | 31.3.14 | | Android SDK Build-tools | 33.0.0 33.0.1<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | | Android SDK Platform-Tools | 33.0.3 | @@ -388,7 +388,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | ssh | 1:8.2p1-4ubuntu0.5 | | sshpass | 1.06-1 | | subversion | 1.13.0-3ubuntu0.2 | -| sudo | 1.8.31-1ubuntu1.2 | +| sudo | 1.8.31-1ubuntu1.4 | | swig | 4.0.1-5build1 | | tar | 1.30+dfsg-7ubuntu0.20.04.2 | | telnet | 0.17-41.2build1 | From b3bbfccef4812ff3f2c69d9decd6bdc31aa04172 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 25 Jan 2023 15:16:40 +0000 Subject: [PATCH 1701/3485] Updating readme file for ubuntu22 version 20230122.1 (#6967) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2204-Readme.md | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/images/linux/Ubuntu2204-Readme.md b/images/linux/Ubuntu2204-Readme.md index d66e2a69f15b..3aa9162d0a65 100644 --- a/images/linux/Ubuntu2204-Readme.md +++ b/images/linux/Ubuntu2204-Readme.md @@ -6,7 +6,7 @@ # Ubuntu 22.04 - OS Version: 22.04.1 LTS - Kernel Version: 5.15.0-1031-azure -- Image Version: 20230118.2 +- Image Version: 20230122.1 ## Installed Software @@ -27,12 +27,12 @@ - Python 3.10.6 - Python3 3.10.6 - Ruby 3.0.2p107 -- Swift 5.7.2 +- Swift 5.7.3 ### Package Management - cpan 1.64 - Helm 3.11.0 -- Homebrew 3.6.19 +- Homebrew 3.6.20 - Miniconda 22.11.1 - Npm 8.19.3 - NuGet 6.3.1.1 @@ -40,7 +40,7 @@ - Pip3 22.0.2 - Pipx 1.1.0 - RubyGems 3.3.5 -- Vcpkg (build from commit 89e381729) +- Vcpkg (build from commit e69dd972b) - Yarn 1.22.19 #### Environment variables @@ -68,7 +68,7 @@ to accomplish this. - Bazelisk 1.13.2 - Bicep 0.13.1 - Buildah 1.23.1 -- CMake 3.25.1 +- CMake 3.25.2 - CodeQL Action Bundle 2.12.0 - Docker Amazon ECR Credential Helper 0.6.0 - Docker Compose v1 1.29.2 @@ -97,7 +97,7 @@ to accomplish this. - Packer 1.8.5 - Parcel 2.8.3 - Podman 3.4.4 -- Pulumi 3.51.1 +- Pulumi 3.52.1 - R 4.2.2 - Skopeo 1.4.1 - Sphinx Open Source Search Server 2.2.11 @@ -109,7 +109,7 @@ to accomplish this. ### CLI Tools - Alibaba Cloud CLI 3.0.144 -- AWS CLI 2.9.15 +- AWS CLI 2.9.17 - AWS CLI Session Manager Plugin 1.2.398.0 - AWS SAM CLI 1.70.0 - Azure CLI 2.44.1 @@ -117,10 +117,10 @@ to accomplish this. - GitHub CLI 2.21.2 - Google Cloud SDK 414.0.0 - Hub CLI 2.14.2 -- Netlify CLI 12.7.2 +- Netlify CLI 12.9.1 - OpenShift CLI 4.12.0 - ORAS CLI 0.16.0 -- Vercel CLI 28.12.7 +- Vercel CLI 28.13.0 ### Java | Version | Vendor | Environment Variable | @@ -158,7 +158,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Bindgen 0.63.0 - Cargo audit 0.17.4 - Cargo clippy 0.1.66 -- Cargo outdated 0.11.1 +- Cargo outdated 0.11.2 - Cbindgen 0.24.3 - Rustfmt 1.5.1 @@ -166,8 +166,8 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Google Chrome 109.0.5414.74 - ChromeDriver 109.0.5414.74 - Chromium 109.0.5414.0 -- Microsoft Edge 109.0.1518.52 -- Microsoft Edge WebDriver 109.0.1518.52 +- Microsoft Edge 109.0.1518.61 +- Microsoft Edge WebDriver 109.0.1518.61 - Selenium server 4.7.0 - Mozilla Firefox 109.0 - Geckodriver 0.32.0 @@ -239,7 +239,7 @@ Use the following command as a part of your job to start the service: 'sudo syst - PowerShell 7.2.8 #### PowerShell Modules -- Az: 9.2.0 +- Az: 9.3.0 - MarkdownPS: 1.9 - Microsoft.Graph: 1.20.0 - Pester: 5.4.0 @@ -254,7 +254,7 @@ Use the following command as a part of your job to start the service: 'sudo syst ### Android | Package Name | Version | | -------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 8.0 | +| Android Command Line Tools | 9.0 | | Android Emulator | 31.3.14 | | Android SDK Build-tools | 33.0.0 33.0.1<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | | Android SDK Platform-Tools | 33.0.3 | From 11a5cf4a06f8381b594df4b1e40d546aac042ef9 Mon Sep 17 00:00:00 2001 From: sergei-pyshnoi <121864472+sergei-pyshnoi@users.noreply.github.com> Date: Wed, 25 Jan 2023 17:12:09 +0100 Subject: [PATCH 1702/3485] [macOS] Add gcc 12 (#6977) --- images/macos/toolsets/toolset-11.json | 3 ++- images/macos/toolsets/toolset-12.json | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index acbaafea9e65..1a63e249c860 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -235,7 +235,8 @@ "versions": [ "9", "10", - "11" + "11", + "12" ] }, "toolcache": [ diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index b063a3f01dc5..62b9b409927c 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -200,7 +200,8 @@ }, "gcc": { "versions": [ - "11" + "11", + "12" ] }, "toolcache": [ From 4c586edefacceaf2b360cc4f54716fdda30a8235 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 26 Jan 2023 14:25:33 +0000 Subject: [PATCH 1703/3485] Updating readme file for win22 version 20230123.1 (#6973) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2022-Readme.md | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/images/win/Windows2022-Readme.md b/images/win/Windows2022-Readme.md index dba823da0772..9554a726fede 100644 --- a/images/win/Windows2022-Readme.md +++ b/images/win/Windows2022-Readme.md @@ -4,7 +4,7 @@ *** # Windows Server 2022 - OS Version: 10.0.20348 Build 1487 -- Image Version: 20230118.1 +- Image Version: 20230123.1 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -33,7 +33,7 @@ - pip 22.3.1 (python 3.9) - Pipx 1.1.0 - RubyGems 3.2.33 -- Vcpkg (build from commit 5908d702d) +- Vcpkg (build from commit e69dd972b) - Yarn 1.22.19 #### Environment variables @@ -56,9 +56,9 @@ - Bazelisk 1.13.2 - Bicep 0.13.1 - Cabal 3.8.1.0 -- CMake 3.25.1 +- CMake 3.25.2 - CodeQL Action Bundle 2.12.0 -- Docker 20.10.22 +- Docker 20.10.23 - Docker Compose v1 1.29.2 - Docker Compose v2 2.15.1 - Docker-wincred 0.7.0 @@ -69,14 +69,14 @@ - InnoSetup 6.2.1 - jq 1.6 - Kind 0.17.0 -- Kubectl 1.26.0 +- Kubectl 1.26.1 - Mercurial 5.0 - Mingw-w64 11.2.0 - Newman 5.3.2 - NSIS 3.08 - OpenSSL 1.1.1 - Packer 1.8.4 -- Pulumi 3.51.1 +- Pulumi 3.52.1 - R 4.2.2 - Service Fabric SDK 9.1.1436.9590 - Stack 2.9.3 @@ -90,7 +90,7 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.144 -- AWS CLI 2.9.15 +- AWS CLI 2.9.17 - AWS SAM CLI 1.70.0 - AWS Session Manager CLI 1.2.398.0 - Azure CLI 2.44.1 @@ -107,7 +107,7 @@ #### Packages - bindgen 0.63.0 - cargo-audit 0.17.4 -- cargo-outdated 0.11.1 +- cargo-outdated 0.11.2 - cbindgen 0.24.3 - Clippy 0.1.66 - Rustfmt 1.5.1 @@ -115,12 +115,12 @@ ### Browsers and Drivers - Google Chrome 109.0.5414.75 - Chrome Driver 109.0.5414.74 -- Microsoft Edge 109.0.1518.55 -- Microsoft Edge Driver 109.0.1518.55 +- Microsoft Edge 109.0.1518.61 +- Microsoft Edge Driver 109.0.1518.61 - Mozilla Firefox 109.0 - Gecko Driver 0.32.0 -- IE Driver 4.7.0.0 -- Selenium server 4.7.0 +- IE Driver 4.8.0.0 +- Selenium server 4.8.0 #### Environment variables | Name | Value | @@ -134,8 +134,8 @@ | Version | Vendor | Environment Variable | | ------------------- | --------------- | -------------------- | | 8.0.352+8 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | -| 11.0.17+8 | Eclipse Temurin | JAVA_HOME_11_X64 | -| 17.0.5+8 | Eclipse Temurin | JAVA_HOME_17_X64 | +| 11.0.18+10 | Eclipse Temurin | JAVA_HOME_11_X64 | +| 17.0.6+10 | Eclipse Temurin | JAVA_HOME_17_X64 | ### Shells | Name | Target | @@ -537,13 +537,13 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - PowerShell 7.2.8 #### Powershell Modules -- Az: 9.2.0 +- Az: 9.3.0 - Azure: 2.1.0 (Default), 5.3.0 - AzureRM: 2.1.0 (Default), 6.13.1 - Az (Cached): 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.251 +- AWSPowershell: 4.1.254 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 - Microsoft.Graph: 1.20.0 From fda51675fc9411da09299bf03201a161bff94b1d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 26 Jan 2023 14:40:33 +0000 Subject: [PATCH 1704/3485] Updating readme file for win22 version 20230123.1 (#6973) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> From 0c48a4e68d5df4ebd4b2b12c9c5a0ea04df6d978 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 26 Jan 2023 15:08:39 +0000 Subject: [PATCH 1705/3485] Updating readme file for win19 version 20230123.2 (#6974) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2019-Readme.md | 42 ++++++++++++++++---------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index 99e95671c640..22b15f68a562 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -4,7 +4,7 @@ *** # Windows Server 2019 - OS Version: 10.0.17763 Build 3887 -- Image Version: 20230117.1 +- Image Version: 20230123.2 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -33,7 +33,7 @@ - pip 22.3.1 (python 3.7) - Pipx 1.1.0 - RubyGems 2.7.6.3 -- Vcpkg (build from commit ae826fcea) +- Vcpkg (build from commit e69dd972b) - Yarn 1.22.19 #### Environment variables @@ -51,34 +51,34 @@ ### Tools - 7zip 22.01 - aria2 1.36.0 -- azcopy 10.16.2 +- azcopy 10.16.2 INFO: azcopy.exe: A newer version 10.17.0 is available to download - Bazel 6.0.0 - Bazelisk 1.13.2 - Bicep 0.13.1 - Cabal 3.8.1.0 -- CMake 3.25.1 +- CMake 3.25.2 - CodeQL Action Bundle 2.12.0 -- Docker 20.10.22 +- Docker 20.10.23 - Docker Compose v1 1.29.2 - Docker Compose v2 2.15.1 - Docker-wincred 0.7.0 - ghc 9.4.4 - Git 2.39.1.windows.1 - Git LFS 3.3.0 -- Google Cloud SDK 413.0.0 +- Google Cloud SDK 414.0.0 - ImageMagick 7.1.0-57 - InnoSetup 6.2.1 - jq 1.6 - Kind 0.17.0 -- Kubectl 1.26.0 +- Kubectl 1.26.1 - Mercurial 5.0 - Mingw-w64 8.1.0 - Newman 5.3.2 - NSIS 3.08 - OpenSSL 1.1.1 - Packer 1.8.4 -- Parcel 2.8.2 -- Pulumi 3.51.1 +- Parcel 2.8.3 +- Pulumi 3.52.1 - R 4.2.2 - Service Fabric SDK 9.1.1436.9590 - Stack 2.9.3 @@ -92,8 +92,8 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.144 -- AWS CLI 2.9.15 -- AWS SAM CLI 1.70.0 +- AWS CLI 2.9.17 +- AWS SAM CLI 1.70.1 - AWS Session Manager CLI 1.2.398.0 - Azure CLI 2.44.1 - Azure DevOps CLI extension 0.25.0 @@ -110,7 +110,7 @@ #### Packages - bindgen 0.63.0 - cargo-audit 0.17.4 -- cargo-outdated 0.11.1 +- cargo-outdated 0.11.2 - cbindgen 0.24.3 - Clippy 0.1.66 - Rustfmt 1.5.1 @@ -118,12 +118,12 @@ ### Browsers and Drivers - Google Chrome 109.0.5414.75 - Chrome Driver 109.0.5414.74 -- Microsoft Edge 109.0.1518.55 -- Microsoft Edge Driver 109.0.1518.55 +- Microsoft Edge 109.0.1518.61 +- Microsoft Edge Driver 109.0.1518.61 - Mozilla Firefox 109.0 - Gecko Driver 0.32.0 -- IE Driver 4.7.0.0 -- Selenium server 4.7.0 +- IE Driver 4.8.0.0 +- Selenium server 4.8.0 #### Environment variables | Name | Value | @@ -136,10 +136,10 @@ ### Java | Version | Vendor | Environment Variable | | ------------------- | --------------- | -------------------- | -| 8.0.352+8 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | -| 11.0.17+8 | Eclipse Temurin | JAVA_HOME_11_X64 | +| 8.0.362+9 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | +| 11.0.18+10 | Eclipse Temurin | JAVA_HOME_11_X64 | | 13.0.2+8.1 | Adopt OpenJDK | JAVA_HOME_13_X64 | -| 17.0.5+8 | Eclipse Temurin | JAVA_HOME_17_X64 | +| 17.0.6+10 | Eclipse Temurin | JAVA_HOME_17_X64 | ### Shells | Name | Target | @@ -506,13 +506,13 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - PowerShell 7.2.8 #### Powershell Modules -- Az: 9.2.0 +- Az: 9.3.0 - Azure: 2.1.0 (Default), 5.3.0 - AzureRM: 2.1.0 (Default), 6.13.1 - Az (Cached): 1.0.0.zip, 1.6.0.zip, 2.3.2.zip, 2.6.0.zip, 3.1.0.zip, 3.5.0.zip, 3.8.0.zip, 4.3.0.zip, 4.4.0.zip, 4.7.0.zip, 5.5.0.zip, 5.9.0.zip, 6.6.0.zip, 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.250 +- AWSPowershell: 4.1.254 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 - Microsoft.Graph: 1.20.0 From 8649f7f9e9d6f8160e2911570470e51e05cc6caf Mon Sep 17 00:00:00 2001 From: Sergey Dolin <dsame@github.com> Date: Thu, 26 Jan 2023 16:25:01 +0100 Subject: [PATCH 1706/3485] install Hyper-V feature (#6987) --- images/win/toolsets/toolset-2022.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index 170449c1bd79..754658033eaa 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -174,7 +174,8 @@ { "name": "VirtualMachinePlatform", "optionalFeature": true }, { "name": "NET-Framework-45-Features", "includeAllSubFeatures": true }, { "name": "Client-ProjFS", "optionalFeature": true }, - { "name": "NET-Framework-Features", "includeAllSubFeatures": true } + { "name": "NET-Framework-Features", "includeAllSubFeatures": true }, + { "name": "Hyper-V", "includeAllSubFeatures": true } ], "visualStudio": { "version" : "2022", From 583c737c15dba009fbc1a0e117e8cebe74d97486 Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Fri, 27 Jan 2023 14:49:03 +0100 Subject: [PATCH 1707/3485] [macOS] Software Updates 2023 Week 5 (#6997) --- images/macos/toolsets/toolset-12.json | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index 62b9b409927c..8c3d83b3c31b 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -21,16 +21,23 @@ "6.12.0.188" ], "ios-versions": [ - "16.0.0.72", "15.12.0.2", "15.10.0.5", "15.8.0.3", "15.6.0.3", "15.4.0.0", "15.2.0.17", "15.0.0.6" + "16.1.1.27", "16.0.0.72", "15.12.0.2", "15.10.0.5", "15.8.0.3", "15.6.0.3", "15.4.0.0", "15.2.0.17", "15.0.0.6" ], "mac-versions": [ - "8.12.0.2", "8.10.0.5", "8.8.0.3", "8.6.0.3", "8.4.0.0", "8.2.0.17", "7.14.0.27" + "9.0.0.27", "8.12.0.2", "8.10.0.5", "8.8.0.3", "8.6.0.3", "8.4.0.0", "8.2.0.17", "7.14.0.27" ], "android-versions": [ "13.1.0.1", "13.0.0.0", "12.3.3.3", "12.2.8.3", "12.1.0.2", "12.0.0.3", "11.3.0.4" ], "bundle-default": "6_12_21", "bundles": [ + { + "symlink": "6_12_22", + "mono":"6.12", + "ios": "16.1", + "mac": "9.0", + "android": "13.1" + }, { "symlink": "6_12_21", "mono":"6.12", From 2205d11bf5f858704d47f3f275c026f353697e0d Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Sat, 28 Jan 2023 17:21:17 +0100 Subject: [PATCH 1708/3485] [Windows] set TLS12 for toolset (#7001) --- images/win/scripts/Installers/Install-Toolset.ps1 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/images/win/scripts/Installers/Install-Toolset.ps1 b/images/win/scripts/Installers/Install-Toolset.ps1 index 5a8b3689f0b7..7d4beddf49cf 100644 --- a/images/win/scripts/Installers/Install-Toolset.ps1 +++ b/images/win/scripts/Installers/Install-Toolset.ps1 @@ -4,6 +4,8 @@ ## Desc: Install toolset ################################################################################ +[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 -bor [Net.SecurityProtocolType]::Tls13 + Function Install-Asset { param( [Parameter(Mandatory=$true)] @@ -32,7 +34,7 @@ Function Install-Asset { # Get toolcache content from toolset $ToolsToInstall = @("Python", "Node", "Boost", "Go") -$tools = Get-ToolsetContent | Select-Object -ExpandProperty toolcache | Where {$ToolsToInstall -contains $_.Name} +$tools = Get-ToolsetContent | Select-Object -ExpandProperty toolcache | Where-Object {$ToolsToInstall -contains $_.Name} foreach ($tool in $tools) { # Get versions manifest for current tool From 1e75a20a49556ec94abfcd8ff5f2bff26de5ed43 Mon Sep 17 00:00:00 2001 From: Angela P Wen <angelapwen@github.com> Date: Sun, 29 Jan 2023 05:46:43 -0800 Subject: [PATCH 1709/3485] [Linux,macOS,Windows] Download two latest CodeQL bundles (#6884) Previously, our runner image only included the most recent release of CodeQL. In order to improve stability of rollout of new CodeQL versions, we are now downloading the most recent two releases. The change updates the Linux and Windows script variable names to match that of the Mac script, because they are mostly functionally identical. It also adds the same log messages to all scripts and ensures Mac and Windows test parity. It tests that there are two bundles in each of the OS's as well. This will approximately double the total size and installation time of the existing CodeQL tool. --- .../SoftwareReport.Generator.ps1 | 2 +- .../SoftwareReport/SoftwareReport.Tools.psm1 | 15 +++-- .../linux/scripts/installers/codeql-bundle.sh | 44 ++++++++++---- images/linux/scripts/tests/Toolset.Tests.ps1 | 13 +++++ images/macos/provision/core/codeql-bundle.sh | 47 ++++++++++----- .../SoftwareReport.Common.psm1 | 17 ++++-- .../SoftwareReport.Generator.ps1 | 2 +- images/macos/tests/Common.Tests.ps1 | 42 +++++++++++--- .../Installers/Install-CodeQLBundle.ps1 | 57 +++++++++++++------ .../SoftwareReport.Generator.ps1 | 2 +- .../SoftwareReport/SoftwareReport.Tools.psm1 | 17 ++++-- images/win/scripts/Tests/Tools.Tests.ps1 | 40 +++++++++++-- 12 files changed, 219 insertions(+), 79 deletions(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index cb0f26b5e5cd..ac7c8daa6356 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -103,7 +103,7 @@ $tools.AddToolVersion("Bazelisk", $(Get-BazeliskVersion)) $tools.AddToolVersion("Bicep", $(Get-BicepVersion)) $tools.AddToolVersion("Buildah", $(Get-BuildahVersion)) $tools.AddToolVersion("CMake", $(Get-CMakeVersion)) -$tools.AddToolVersion("CodeQL Action Bundle", $(Get-CodeQLBundleVersion)) +$tools.AddToolVersion("CodeQL Action Bundles", $(Get-CodeQLBundleVersions)) $tools.AddToolVersion("Docker Amazon ECR Credential Helper", $(Get-DockerAmazonECRCredHelperVersion)) $tools.AddToolVersion("Docker Compose v1", $(Get-DockerComposeV1Version)) $tools.AddToolVersion("Docker Compose v2", $(Get-DockerComposeV2Version)) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 index c18f2e814ad2..5dc675471a19 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 @@ -30,12 +30,17 @@ function Get-BicepVersion { return $Matches.Version } -function Get-CodeQLBundleVersion { +function Get-CodeQLBundleVersions { $CodeQLVersionsWildcard = Join-Path $Env:AGENT_TOOLSDIRECTORY -ChildPath "CodeQL" | Join-Path -ChildPath "*" - $CodeQLVersionPath = Get-ChildItem $CodeQLVersionsWildcard | Select-Object -First 1 -Expand FullName - $CodeQLPath = Join-Path $CodeQLVersionPath -ChildPath "x64" | Join-Path -ChildPath "codeql" | Join-Path -ChildPath "codeql" - $CodeQLVersion = & $CodeQLPath version --quiet - return $CodeQLVersion + $CodeQLVersionPaths = Get-ChildItem $CodeQLVersionsWildcard + $CodeQlVersions=@() + foreach ($CodeQLVersionPath in $CodeQLVersionPaths) { + $FullCodeQLVersionPath = $CodeQLVersionPath | Select-Object -Expand FullName + $CodeQLPath = Join-Path $FullCodeQLVersionPath -ChildPath "x64" | Join-Path -ChildPath "codeql" | Join-Path -ChildPath "codeql" + $CodeQLVersion = & $CodeQLPath version --quiet + $CodeQLVersions += $CodeQLVersion + } + return $CodeQLVersions } function Get-PodManVersion { diff --git a/images/linux/scripts/installers/codeql-bundle.sh b/images/linux/scripts/installers/codeql-bundle.sh index f2167b8c4a88..322f474b5098 100644 --- a/images/linux/scripts/installers/codeql-bundle.sh +++ b/images/linux/scripts/installers/codeql-bundle.sh @@ -7,19 +7,39 @@ source $HELPER_SCRIPTS/install.sh # Retrieve the name of the CodeQL bundle preferred by the Action (in the format codeql-bundle-YYYYMMDD). -codeql_bundle_name="$(curl -sSL https://raw.githubusercontent.com/github/codeql-action/v2/src/defaults.json | jq -r .bundleVersion)" -# Convert the bundle name to a version number (0.0.0-YYYYMMDD). -codeql_bundle_version="0.0.0-${codeql_bundle_name##*-}" +base_url="$(curl -sSL https://raw.githubusercontent.com/github/codeql-action/v2/src/defaults.json)" +codeql_tag_name="$(echo "$base_url" | jq -r '.bundleVersion')" +codeql_cli_version="$(echo "$base_url" | jq -r '.cliVersion')" +prior_codeql_tag_name="$(echo "$base_url" | jq -r '.priorBundleVersion')" +prior_codeql_cli_version="$(echo "$base_url" | jq -r '.priorCliVersion')" -extraction_directory="$AGENT_TOOLSDIRECTORY/CodeQL/$codeql_bundle_version/x64" -mkdir -p "$extraction_directory" +# Convert the tag names to bundles with a version number (x.y.z-YYYYMMDD). +codeql_bundle_version="${codeql_cli_version}-${codeql_tag_name##*-}" +prior_codeql_bundle_version="${prior_codeql_cli_version}-${prior_codeql_tag_name##*-}" -echo "Downloading CodeQL bundle $codeql_bundle_version..." -download_with_retries "https://github.com/github/codeql-action/releases/download/$codeql_bundle_name/codeql-bundle.tar.gz" "/tmp" "codeql-bundle.tar.gz" -tar -xzf "/tmp/codeql-bundle.tar.gz" -C "$extraction_directory" +# Download and name both CodeQL bundles. +codeql_bundle_versions=("${codeql_bundle_version}" "${prior_codeql_bundle_version}") +codeql_tag_names=("${codeql_tag_name}" "${prior_codeql_tag_name}") -# Touch a special file that indicates to the CodeQL Action that this bundle was baked-in to the hosted runner images. -touch "$extraction_directory/pinned-version" +for index in "${!codeql_bundle_versions[@]}"; do + bundle_version="${codeql_bundle_versions[$index]}" + bundle_tag_name="${codeql_tag_names[$index]}" + + echo "Downloading CodeQL bundle $bundle_version..." + download_with_retries "https://github.com/github/codeql-action/releases/download/$bundle_tag_name/codeql-bundle.tar.gz" "/tmp" "codeql-bundle.tar.gz" + codeql_archive="/tmp/codeql-bundle.tar.gz" -# Touch a file to indicate to the toolcache that setting up CodeQL is complete. -touch "$extraction_directory.complete" + codeql_toolcache_path="$AGENT_TOOLSDIRECTORY/CodeQL/$bundle_version/x64" + mkdir -p "$codeql_toolcache_path" + + echo "Unpacking the downloaded CodeQL bundle archive..." + tar -xzf "$codeql_archive" -C "$codeql_toolcache_path" + + # We only pin the latest version in the toolcache, to support overriding the CodeQL version specified in defaults.json on GitHub Enterprise. + if [[ "$bundle_version" == "$codeql_bundle_version" ]]; then + touch "$codeql_toolcache_path/pinned-version" + fi + + # Touch a file to indicate to the toolcache that setting up CodeQL is complete. + touch "$codeql_toolcache_path.complete" +done diff --git a/images/linux/scripts/tests/Toolset.Tests.ps1 b/images/linux/scripts/tests/Toolset.Tests.ps1 index ef331c0b6913..981d6093dd75 100644 --- a/images/linux/scripts/tests/Toolset.Tests.ps1 +++ b/images/linux/scripts/tests/Toolset.Tests.ps1 @@ -60,6 +60,19 @@ Describe "Toolset" { } } } + + # Validate that there are two versions of CodeQL included. + if ($toolName -eq "CodeQL") { + $foundPriorVersion = Get-Item $expectedVersionPath ` + | Sort-Object -Property {[SemVer]$_.name} -Descending ` + | Select-Object -Last 1 + $foundPriorVersionPath = Join-Path $foundPriorVersion $tool.arch + + $priorExecutablePath = Join-Path $foundPriorVersionPath "codeql/codeql" + It "Validate prior version of codeql/codeql" -TestCases @{PriorExecutablePath = $priorExecutablePath} { + $PriorExecutablePath | Should -Exist + } + } } } } diff --git a/images/macos/provision/core/codeql-bundle.sh b/images/macos/provision/core/codeql-bundle.sh index 1677363cf7e8..53210a3d9232 100644 --- a/images/macos/provision/core/codeql-bundle.sh +++ b/images/macos/provision/core/codeql-bundle.sh @@ -2,24 +2,41 @@ source ~/utils/utils.sh # Retrieve the name of the CodeQL bundle preferred by the Action (in the format codeql-bundle-YYYYMMDD). -codeql_bundle_name="$(curl -sSL https://raw.githubusercontent.com/github/codeql-action/v2/src/defaults.json | jq -r .bundleVersion)" -# Convert the bundle name to a version number (0.0.0-YYYYMMDD). -codeql_bundle_version="0.0.0-${codeql_bundle_name##*-}" +base_url="$(curl -sSL https://raw.githubusercontent.com/github/codeql-action/v2/src/defaults.json)" +codeql_tag_name="$(echo "$base_url" | jq -r '.bundleVersion')" +codeql_cli_version="$(echo "$base_url" | jq -r '.cliVersion')" +prior_codeql_tag_name="$(echo "$base_url" | jq -r '.priorBundleVersion')" +prior_codeql_cli_version="$(echo "$base_url" | jq -r '.priorCliVersion')" -echo "Downloading CodeQL bundle $codeql_bundle_version..." -download_with_retries "https://github.com/github/codeql-action/releases/download/$codeql_bundle_name/codeql-bundle.tar.gz" "/tmp" "codeql-bundle.tar.gz" -codeqlArchive="/tmp/codeql-bundle.tar.gz" +# Convert the tag names to bundles with a version number (x.y.z-YYYYMMDD). +codeql_bundle_version="${codeql_cli_version}-${codeql_tag_name##*-}" +prior_codeql_bundle_version="${prior_codeql_cli_version}-${prior_codeql_tag_name##*-}" -codeqlToolcachePath="$AGENT_TOOLSDIRECTORY/codeql/$codeql_bundle_version/x64" -mkdir -p $codeqlToolcachePath +# Download and name both CodeQL bundles. +codeql_bundle_versions=("${codeql_bundle_version}" "${prior_codeql_bundle_version}") +codeql_tag_names=("${codeql_tag_name}" "${prior_codeql_tag_name}") -echo "Unpacking the downloaded CodeQL bundle archive..." -tar -xzf $codeqlArchive -C $codeqlToolcachePath +for index in "${!codeql_bundle_versions[@]}"; do + bundle_version="${codeql_bundle_versions[$index]}" + bundle_tag_name="${codeql_tag_names[$index]}" + + echo "Downloading CodeQL bundle $bundle_version..." + download_with_retries "https://github.com/github/codeql-action/releases/download/$bundle_tag_name/codeql-bundle.tar.gz" "/tmp" "codeql-bundle.tar.gz" + codeql_archive="/tmp/codeql-bundle.tar.gz" -# Touch a special file that indicates to the CodeQL Action that this bundle was baked-in to the hosted runner images. -touch "$codeqlToolcachePath/pinned-version" + codeql_toolcache_path="$AGENT_TOOLSDIRECTORY/CodeQL/$bundle_version/x64" + mkdir -p "$codeql_toolcache_path" -# Touch a file to indicate to the toolcache that setting up CodeQL is complete. -touch "$codeqlToolcachePath.complete" + echo "Unpacking the downloaded CodeQL bundle archive..." + tar -xzf "$codeql_archive" -C "$codeql_toolcache_path" -invoke_tests "Common" "CodeQL" + # We only pin the latest version in the toolcache, to support overriding the CodeQL version specified in defaults.json on GitHub Enterprise. + if [[ "$bundle_version" == "$codeql_bundle_version" ]]; then + touch "$codeql_toolcache_path/pinned-version" + fi + + # Touch a file to indicate to the toolcache that setting up CodeQL is complete. + touch "$codeql_toolcache_path.complete" +done + +invoke_tests "Common" "CodeQLBundles" diff --git a/images/macos/software-report/SoftwareReport.Common.psm1 b/images/macos/software-report/SoftwareReport.Common.psm1 index 84035f13d32f..71568b5eef06 100644 --- a/images/macos/software-report/SoftwareReport.Common.psm1 +++ b/images/macos/software-report/SoftwareReport.Common.psm1 @@ -632,12 +632,17 @@ function Build-GraalVMTable { } } -function Get-CodeQLBundleVersion { - $CodeQLVersionWildcard = Join-Path $Env:AGENT_TOOLSDIRECTORY -ChildPath "CodeQL" | Join-Path -ChildPath "*" - $CodeQLVersionPath = Get-ChildItem $CodeQLVersionWildcard | Select-Object -First 1 -Expand FullName - $CodeQLPath = Join-Path $CodeQLVersionPath -ChildPath "x64" | Join-Path -ChildPath "codeql" | Join-Path -ChildPath "codeql" - $CodeQLVersion = & $CodeQLPath version --quiet - return $CodeQLVersion +function Get-CodeQLBundleVersions { + $CodeQLVersionsWildcard = Join-Path $Env:AGENT_TOOLSDIRECTORY -ChildPath "CodeQL" | Join-Path -ChildPath "*" + $CodeQLVersionPaths = Get-ChildItem $CodeQLVersionsWildcard + $CodeQlVersions=@() + foreach ($CodeQLVersionPath in $CodeQLVersionPaths) { + $FullCodeQLVersionPath = $CodeQLVersionPath | Select-Object -Expand FullName + $CodeQLPath = Join-Path $FullCodeQLVersionPath -ChildPath "x64" | Join-Path -ChildPath "codeql" | Join-Path -ChildPath "codeql" + $CodeQLVersion = & $CodeQLPath version --quiet + $CodeQLVersions += $CodeQLVersion + } + return $CodeQLVersions } function Get-ColimaVersion { diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1 index afc7b94b4f42..23e456a4a359 100644 --- a/images/macos/software-report/SoftwareReport.Generator.ps1 +++ b/images/macos/software-report/SoftwareReport.Generator.ps1 @@ -137,7 +137,7 @@ $tools.AddToolVersion("Bicep CLI", $(Get-BicepVersion)) $tools.AddToolVersion("Cabal", $(Get-CabalVersion)) $tools.AddToolVersion("Cmake", $(Get-CmakeVersion)) if (-not $os.IsCatalina) { - $tools.AddToolVersion("CodeQL Action Bundle", $(Get-CodeQLBundleVersion)) + $tools.AddToolVersion("CodeQL Action Bundles", $(Get-CodeQLBundleVersions)) } if (-not $os.IsCatalina) { $tools.AddToolVersion("Colima", $(Get-ColimaVersion)) diff --git a/images/macos/tests/Common.Tests.ps1 b/images/macos/tests/Common.Tests.ps1 index ad1a19876f22..eb17db53aceb 100644 --- a/images/macos/tests/Common.Tests.ps1 +++ b/images/macos/tests/Common.Tests.ps1 @@ -139,15 +139,39 @@ Describe "VirtualBox" -Skip:($os.IsBigSur) { } } -Describe "CodeQL" -Skip:($os.IsCatalina) { - It "codeql" { - $CodeQLVersionWildcard = Join-Path $Env:AGENT_TOOLSDIRECTORY -ChildPath "CodeQL" | Join-Path -ChildPath "*" - $CodeQLVersionPath = Get-ChildItem $CodeQLVersionWildcard | Select-Object -First 1 -Expand FullName - $CodeQLPath = Join-Path $CodeQLVersionPath -ChildPath "x64" | Join-Path -ChildPath "codeql" | Join-Path -ChildPath "codeql" - "$CodeQLPath version --quiet" | Should -ReturnZeroExitCode - - $CodeQLPacksPath = Join-Path $CodeQLVersionPath -ChildPath "x64" | Join-Path -ChildPath "codeql" | Join-Path -ChildPath "qlpacks" - $CodeQLPacksPath | Should -Exist +Describe "CodeQLBundles" -Skip:($os.IsCatalina) { + It "Latest CodeQL Bundle" { + $CodeQLVersionWildcards = Join-Path $Env:AGENT_TOOLSDIRECTORY -ChildPath "CodeQL" | Join-Path -ChildPath "*" + $LatestCodeQLVersionPath = Get-ChildItem $CodeQLVersionWildcards | Sort-Object -Property { [SemVer]$_.name } -Descending | Select-Object -First 1 -Expand FullName + $LatestCodeQLPath = Join-Path $LatestCodeQLVersionPath -ChildPath "x64" | Join-Path -ChildPath "codeql" | Join-Path -ChildPath "codeql" + "$LatestCodeQLPath version --quiet" | Should -ReturnZeroExitCode + + $LatestCodeQLPacksPath = Join-Path $LatestCodeQLVersionPath -ChildPath "x64" | Join-Path -ChildPath "codeql" | Join-Path -ChildPath "qlpacks" + $LatestCodeQLPacksPath | Should -Exist + } + + It "Prior CodeQL Bundle" { + $CodeQLVersionWildcards = Join-Path $Env:AGENT_TOOLSDIRECTORY -ChildPath "CodeQL" | Join-Path -ChildPath "*" + $PriorCodeQLVersionPath = Get-ChildItem $CodeQLVersionWildcards | Sort-Object -Property { [SemVer]$_.name } -Descending | Select-Object -Last 1 -Expand FullName + $PriorCodeQLPath = Join-Path $PriorCodeQLVersionPath -ChildPath "x64" | Join-Path -ChildPath "codeql" | Join-Path -ChildPath "codeql" + "$PriorCodeQLPath version --quiet" | Should -ReturnZeroExitCode + + $PriorCodeQLPacksPath = Join-Path $PriorCodeQLVersionPath -ChildPath "x64" | Join-Path -ChildPath "codeql" | Join-Path -ChildPath "qlpacks" + $PriorCodeQLPacksPath | Should -Exist + } + + It "Latest and Prior CodeQL Bundles are unique" { + $CodeQLVersionWildcards = Join-Path $Env:AGENT_TOOLSDIRECTORY -ChildPath "CodeQL" | Join-Path -ChildPath "*" + + $LatestCodeQLVersionPath = Get-ChildItem $CodeQLVersionWildcards | Sort-Object -Property { [SemVer]$_.name } -Descending | Select-Object -First 1 -Expand FullName + $LatestCodeQLPath = Join-Path $LatestCodeQLVersionPath -ChildPath "x64" | Join-Path -ChildPath "codeql" | Join-Path -ChildPath "codeql" + $LatestCodeQLVersion = & $LatestCodeQLPath version --quiet + + $PriorCodeQLVersionPath = Get-ChildItem $CodeQLVersionWildcards | Sort-Object -Property { [SemVer]$_.name } -Descending | Select-Object -Last 1 -Expand FullName + $PriorCodeQLPath = Join-Path $PriorCodeQLVersionPath -ChildPath "x64" | Join-Path -ChildPath "codeql" | Join-Path -ChildPath "codeql" + $PriorCodeQLVersion = & $PriorCodeQLPath version --quiet + + $LatestCodeQLVersion | Should -Not -Match $PriorCodeQLVersion } } diff --git a/images/win/scripts/Installers/Install-CodeQLBundle.ps1 b/images/win/scripts/Installers/Install-CodeQLBundle.ps1 index b53f7d015f1b..6c0aeecf8a7b 100644 --- a/images/win/scripts/Installers/Install-CodeQLBundle.ps1 +++ b/images/win/scripts/Installers/Install-CodeQLBundle.ps1 @@ -4,25 +4,48 @@ ################################################################################ # Retrieve the name of the CodeQL bundle preferred by the Action (in the format codeql-bundle-YYYYMMDD). -$CodeQLBundleName = (Invoke-RestMethod "https://raw.githubusercontent.com/github/codeql-action/v2/src/defaults.json").bundleVersion -# Convert the bundle name to a version number (0.0.0-YYYYMMDD). -$CodeQLBundleVersion = "0.0.0-" + $CodeQLBundleName.split("-")[-1] +$Defaults = (Invoke-RestMethod "https://raw.githubusercontent.com/github/codeql-action/v2/src/defaults.json") +$CodeQLTagName = $Defaults.bundleVersion +$CodeQLCliVersion = $Defaults.cliVersion +$PriorCodeQLTagName = $Defaults.priorBundleVersion +$PriorCodeQLCliVersion = $Defaults.priorCliVersion -$ExtractionDirectory = Join-Path $Env:AGENT_TOOLSDIRECTORY -ChildPath "CodeQL" | Join-Path -ChildPath $CodeQLBundleVersion | Join-Path -ChildPath "x64" -New-Item -Path $ExtractionDirectory -ItemType Directory -Force | Out-Null +# Convert the tag names to bundles with a version number (x.y.z-YYYYMMDD). +$CodeQLBundleVersion = $CodeQLCliVersion + "-" + $CodeQLTagName.split("-")[-1] +$PriorCodeQLBundleVersion = $PriorCodeQLCliVersion + "-" + $PriorCodeQLTagName.split("-")[-1] -Write-Host "Downloading CodeQL bundle $CodeQLBundleVersion..." -$CodeQLBundlePath = Start-DownloadWithRetry -Url "https://github.com/github/codeql-action/releases/download/$CodeQLBundleName/codeql-bundle.tar.gz" -Name "codeql-bundle.tar.gz" -$DownloadDirectoryPath = (Get-Item $CodeQLBundlePath).Directory.FullName -Extract-7Zip -Path $CodeQLBundlePath -DestinationPath $DownloadDirectoryPath -$UnGzipedCodeQLBundlePath = Join-Path $DownloadDirectoryPath "codeql-bundle.tar" -Extract-7Zip -Path $UnGzipedCodeQLBundlePath -DestinationPath $ExtractionDirectory +$Bundles = @( + [PSCustomObject]@{ + TagName=$CodeQLTagName; + BundleVersion=$CodeQLBundleVersion; + }, + [PSCustomObject]@{ + TagName=$PriorCodeQLTagName; + BundleVersion=$PriorCodeQLBundleVersion; + } +) -# Touch a special file that indicates to the CodeQL Action that this bundle was baked-in to the hosted runner images. -New-Item -ItemType file (Join-Path $ExtractionDirectory -ChildPath "pinned-version") +foreach ($Bundle in $Bundles) { + Write-Host "Downloading CodeQL bundle $($Bundle.BundleVersion)..." + $CodeQLBundlePath = Start-DownloadWithRetry -Url "https://github.com/github/codeql-action/releases/download/$($Bundle.TagName)/codeql-bundle.tar.gz" -Name "codeql-bundle.tar.gz" + $DownloadDirectoryPath = (Get-Item $CodeQLBundlePath).Directory.FullName -# Touch a file to indicate to the toolcache that setting up CodeQL is complete. -New-Item -ItemType file "$ExtractionDirectory.complete" + $CodeQLToolcachePath = Join-Path $Env:AGENT_TOOLSDIRECTORY -ChildPath "CodeQL" | Join-Path -ChildPath $Bundle.BundleVersion | Join-Path -ChildPath "x64" + New-Item -Path $CodeQLToolcachePath -ItemType Directory -Force | Out-Null -# Test that the tool has been extracted successfully. -Invoke-PesterTests -TestFile "Tools" -TestName "CodeQLBundle" + Write-Host "Unpacking the downloaded CodeQL bundle archive..." + Extract-7Zip -Path $CodeQLBundlePath -DestinationPath $DownloadDirectoryPath + $UnGzipedCodeQLBundlePath = Join-Path $DownloadDirectoryPath "codeql-bundle.tar" + Extract-7Zip -Path $UnGzipedCodeQLBundlePath -DestinationPath $CodeQLToolcachePath + + # We only pin the latest version in the toolcache, to support overriding the CodeQL version specified in defaults.json on GitHub Enterprise. + if ($Bundle.BundleVersion -eq $CodeQLBundleVersion) { + New-Item -ItemType file (Join-Path $CodeQLToolcachePath -ChildPath "pinned-version") + } + + # Touch a file to indicate to the toolcache that setting up CodeQL is complete. + New-Item -ItemType file "$CodeQLToolcachePath.complete" +} + +# Test that the tools have been extracted successfully. +Invoke-PesterTests -TestFile "Tools" -TestName "CodeQLBundles" diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index a89db9cf3596..a110f4361afc 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -69,7 +69,7 @@ $tools.AddToolVersion("Bazelisk", $(Get-BazeliskVersion)) $tools.AddToolVersion("Bicep", $(Get-BicepVersion)) $tools.AddToolVersion("Cabal", $(Get-CabalVersion)) $tools.AddToolVersion("CMake", $(Get-CMakeVersion)) -$tools.AddToolVersion("CodeQL Action Bundle", $(Get-CodeQLBundleVersion)) +$tools.AddToolVersion("CodeQL Action Bundle", $(Get-CodeQLBundleVersions)) $tools.AddToolVersion("Docker", $(Get-DockerVersion)) $tools.AddToolVersion("Docker Compose v1", $(Get-DockerComposeVersion)) $tools.AddToolVersion("Docker Compose v2", $(Get-DockerComposeVersionV2)) diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 index ef583cad9a26..b8837403ee50 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 @@ -42,12 +42,17 @@ function Get-CMakeVersion { return $cmakeVersion } -function Get-CodeQLBundleVersion { - $CodeQLVersionsWildcard = Join-Path $Env:AGENT_TOOLSDIRECTORY -ChildPath "codeql" | Join-Path -ChildPath "*" - $CodeQLVersionPath = Get-ChildItem $CodeQLVersionsWildcard | Select-Object -First 1 -Expand FullName - $CodeQLPath = Join-Path $CodeQLVersionPath -ChildPath "x64" | Join-Path -ChildPath "codeql" | Join-Path -ChildPath "codeql.exe" - $CodeQLVersion = & $CodeQLPath version --quiet - return $CodeQLVersion +function Get-CodeQLBundleVersions { + $CodeQLVersionsWildcard = Join-Path $Env:AGENT_TOOLSDIRECTORY -ChildPath "CodeQL" | Join-Path -ChildPath "*" + $CodeQLVersionPaths = Get-ChildItem $CodeQLVersionsWildcard + $CodeQlVersions=@() + foreach ($CodeQLVersionPath in $CodeQLVersionPaths) { + $FullCodeQLVersionPath = $CodeQLVersionPath | Select-Object -Expand FullName + $CodeQLPath = Join-Path $FullCodeQLVersionPath -ChildPath "x64" | Join-Path -ChildPath "codeql" | Join-Path -ChildPath "codeql.exe" + $CodeQLVersion = & $CodeQLPath version --quiet + $CodeQLVersions += $CodeQLVersion + } + return $CodeQLVersions } function Get-DockerVersion { diff --git a/images/win/scripts/Tests/Tools.Tests.ps1 b/images/win/scripts/Tests/Tools.Tests.ps1 index 247e48bd810a..873a41613385 100644 --- a/images/win/scripts/Tests/Tools.Tests.ps1 +++ b/images/win/scripts/Tests/Tools.Tests.ps1 @@ -21,13 +21,41 @@ Describe "Bazel" { } } -Describe "CodeQLBundle" { - It "CodeQLBundle" { - $CodeQLVersionsWildcard = Join-Path $Env:AGENT_TOOLSDIRECTORY -ChildPath "codeql" | Join-Path -ChildPath "*" - $CodeQLVersionPath = Get-ChildItem $CodeQLVersionsWildcard | Select-Object -First 1 -Expand FullName - $CodeQLPath = Join-Path $CodeQLVersionPath -ChildPath "x64" | Join-Path -ChildPath "codeql" | Join-Path -ChildPath "codeql.exe" - "$CodeQLPath version" | Should -ReturnZeroExitCode +Describe "CodeQLBundles" { + It "Latest CodeQL Bundle" { + $CodeQLVersionsWildcard = Join-Path $Env:AGENT_TOOLSDIRECTORY -ChildPath "CodeQL" | Join-Path -ChildPath "*" + $LatestCodeQLVersionPath = Get-ChildItem $CodeQLVersionsWildcard | Sort-Object -Descending | Select-Object -First 1 -Expand FullName + $LatestCodeQLPath = Join-Path $LatestCodeQLVersionPath -ChildPath "x64" | Join-Path -ChildPath "codeql" | Join-Path -ChildPath "codeql.exe" + "$LatestCodeQLPath version --quiet" | Should -ReturnZeroExitCode + + $LatestCodeQLPacksPath = Join-Path $LatestCodeQLVersionPath -ChildPath "x64" | Join-Path -ChildPath "codeql" | Join-Path -ChildPath "qlpacks" + $LatestCodeQLPacksPath | Should -Exist + } + + It "Prior CodeQL Bundle" { + $CodeQLVersionsWildcard = Join-Path $Env:AGENT_TOOLSDIRECTORY -ChildPath "CodeQL" | Join-Path -ChildPath "*" + $PriorCodeQLVersionPath = Get-ChildItem $CodeQLVersionsWildcard | Sort-Object -Descending | Select-Object -Last 1 -Expand FullName + $PriorCodeQLPath = Join-Path $PriorCodeQLVersionPath -ChildPath "x64" | Join-Path -ChildPath "codeql" | Join-Path -ChildPath "codeql.exe" + "$PriorCodeQLPath version --quiet" | Should -ReturnZeroExitCode + + $PriorCodeQLPacksPath = Join-Path $PriorCodeQLVersionPath -ChildPath "x64" | Join-Path -ChildPath "codeql" | Join-Path -ChildPath "qlpacks" + $PriorCodeQLPacksPath | Should -Exist + } + + It "Latest and Prior CodeQL Bundles are unique" { + $CodeQLVersionsWildcard = Join-Path $Env:AGENT_TOOLSDIRECTORY -ChildPath "CodeQL" | Join-Path -ChildPath "*" + + $LatestCodeQLVersionPath = Get-ChildItem $CodeQLVersionsWildcard | Sort-Object -Descending | Select-Object -First 1 -Expand FullName + $LatestCodeQLPath = Join-Path $LatestCodeQLVersionPath -ChildPath "x64" | Join-Path -ChildPath "codeql" | Join-Path -ChildPath "codeql.exe" + $LatestCodeQLVersion = & $LatestCodeQLPath version --quiet + + $PriorCodeQLVersionPath = Get-ChildItem $CodeQLVersionsWildcard | Sort-Object -Descending | Select-Object -Last 1 -Expand FullName + $PriorCodeQLPath = Join-Path $PriorCodeQLVersionPath -ChildPath "x64" | Join-Path -ChildPath "codeql" | Join-Path -ChildPath "codeql.exe" + $PriorCodeQLVersion = & $PriorCodeQLPath version --quiet + + $LatestCodeQLVersion | Should -Not -Match $PriorCodeQLVersion } + } Describe "R" { From fab3a48efe24f28368bdbb9350c3ee7a5faf97b8 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Sun, 29 Jan 2023 19:54:27 +0100 Subject: [PATCH 1710/3485] [Ubuntu] Hardcode android cmd-tools on 18.04 (#7005) --- images/linux/scripts/installers/android.sh | 41 +++++++++++++--------- images/linux/toolsets/toolset-1804.json | 1 - 2 files changed, 24 insertions(+), 18 deletions(-) diff --git a/images/linux/scripts/installers/android.sh b/images/linux/scripts/installers/android.sh index 59782ceb41ad..7e3a4ee71363 100644 --- a/images/linux/scripts/installers/android.sh +++ b/images/linux/scripts/installers/android.sh @@ -43,26 +43,33 @@ echo "ANDROID_HOME=${ANDROID_SDK_ROOT}" | tee -a /etc/environment # Create android sdk directory mkdir -p ${ANDROID_SDK_ROOT} -# Download the latest command line tools so that we can accept all of the licenses. -# See https://developer.android.com/studio/#command-tools -cmdlineToolsVersion=$(get_toolset_value '.android."cmdline-tools"') -if [[ $cmdlineToolsVersion == "latest" ]]; then - repositoryXmlUrl="https://dl.google.com/android/repository/repository2-1.xml" - download_with_retries $repositoryXmlUrl "/tmp" "repository2-1.xml" - cmdlineToolsVersion=$( - yq -p=xml \ - '.sdk-repository.remotePackage[] | select(."+@path" == "cmdline-tools;latest").archives.archive[].complete.url | select(contains("commandlinetools-linux"))' \ - /tmp/repository2-1.xml - ) - - if [[ -z $cmdlineToolsVersion ]]; then - echo "Failed to parse latest command-line tools version" - exit 1 - fi +cmdlineTools="android-cmdline-tools.zip" + +if isUbuntu18; then + # Newer command-line-tools require Java 11 which is not default on ubuntu-18.04 + download_with_retries "https://dl.google.com/android/repository/commandlinetools-linux-9123335_latest.zip" "." $cmdlineTools +else + # Download the latest command line tools so that we can accept all of the licenses. + # See https://developer.android.com/studio/#command-tools + cmdlineToolsVersion=$(get_toolset_value '.android."cmdline-tools"') + if [[ $cmdlineToolsVersion == "latest" ]]; then + repositoryXmlUrl="https://dl.google.com/android/repository/repository2-1.xml" + download_with_retries $repositoryXmlUrl "/tmp" "repository2-1.xml" + cmdlineToolsVersion=$( + yq -p=xml \ + '.sdk-repository.remotePackage[] | select(."+@path" == "cmdline-tools;latest").archives.archive[].complete.url | select(contains("commandlinetools-linux"))' \ + /tmp/repository2-1.xml + ) + + if [[ -z $cmdlineToolsVersion ]]; then + echo "Failed to parse latest command-line tools version" + exit 1 + fi fi -cmdlineTools="android-cmdline-tools.zip" download_with_retries "https://dl.google.com/android/repository/${cmdlineToolsVersion}" "." $cmdlineTools +fi + unzip -qq $cmdlineTools -d ${ANDROID_SDK_ROOT}/cmdline-tools # Command line tools need to be placed in ${ANDROID_SDK_ROOT}/sdk/cmdline-tools/latest to determine SDK root mv ${ANDROID_SDK_ROOT}/cmdline-tools/cmdline-tools ${ANDROID_SDK_ROOT}/cmdline-tools/latest diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index 1f6bf682874d..8b0d113cc567 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -87,7 +87,6 @@ "maven": "3.8.7" }, "android": { - "cmdline-tools": "latest", "platform_min_version": "23", "build_tools_min_version": "23.0.1", "extra_list": [ From 5a94a87d676435f6dc049db865e220bc91ec8a0b Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Sun, 29 Jan 2023 23:53:49 +0100 Subject: [PATCH 1711/3485] LiCENSE: we are in 2023! (#7006) --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index fac6e630f9dd..545898acf7b8 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2022 GitHub +Copyright (c) 2023 GitHub Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal From f0cd188d73624503a493326d6b961d200f510323 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 30 Jan 2023 20:54:51 +0000 Subject: [PATCH 1712/3485] Updating readme file for macOS-11 version 20230125.1 (#7009) Co-authored-by: Image generation service account <no-reply@microsoft.com> --- images/macos/macos-11-Readme.md | 64 ++++++++++++++++----------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/images/macos/macos-11-Readme.md b/images/macos/macos-11-Readme.md index e83d4f40c1ba..4559d4594ba0 100644 --- a/images/macos/macos-11-Readme.md +++ b/images/macos/macos-11-Readme.md @@ -1,13 +1,13 @@ | Announcements | |-| -| [[All OSs] .NET 5.x will be removed from the images on January, 29](https://github.com/actions/runner-images/issues/6840) | -| [[macOS] Default Xcode on macOS 12 Monterey will be set to Xcode 14.2 on January, 16](https://github.com/actions/runner-images/issues/6746) | +| [[all OSs] Default Nodejs version will be set to 18 on February, 13](https://github.com/actions/runner-images/issues/7002) | +| [[All OSs] .NET 5.x will be removed from the images on February, 6](https://github.com/actions/runner-images/issues/6840) | | [The macOS 10.15 Actions runner image will begin deprecation on 5/31/22 and will be fully unsupported by 12/1/22 for GitHub and ADO](https://github.com/actions/runner-images/issues/5583) | *** # macOS 11 -- OS Version: macOS 11.7.2 (20G1020) +- OS Version: macOS 11.7.3 (20G1116) - Kernel Version: Darwin 20.6.0 -- Image Version: 20230117.2 +- Image Version: 20230125.1 ## Installed Software @@ -38,19 +38,19 @@ - Ruby 2.7.7p221 ### Package Management -- Bundler 2.4.4 +- Bundler 2.4.5 - Carthage 0.38.0 - CocoaPods 1.11.3 - Composer 2.5.1 -- Homebrew 3.6.19 +- Homebrew 3.6.20 - Miniconda 22.11.1 - NPM 8.19.3 - NuGet 6.3.1.1 - Pip 20.3.4 (python 2.7) - Pip3 22.3.1 (python 3.11) - Pipx 1.1.0 -- RubyGems 3.4.4 -- Vcpkg 2022 (build from commit 5908d702d) +- RubyGems 3.4.5 +- Vcpkg 2023 (build from commit d558a1b4a) - Yarn 1.22.19 #### Environment variables @@ -68,7 +68,7 @@ ### Utilities - 7-Zip 17.04 - aria2 1.36.0 -- azcopy 10.16.2 +- azcopy 10.17.0 - bazel 6.0.0 - bazelisk 1.15.0 - bsdtar 3.3.2 - available by 'tar' alias @@ -79,9 +79,9 @@ - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.3 - gpg (GnuPG) 2.4.0 -- helm v3.10.3+g835b733 +- helm v3.11.0+g472c573 - Hub CLI 2.14.2 -- ImageMagick 7.1.0-57 +- ImageMagick 7.1.0-58 - jq 1.6 - mongo 5.0.14 - mongod 5.0.14 @@ -99,14 +99,14 @@ ### Tools - Aliyun CLI 3.0.141 - App Center CLI 2.13.0 -- AWS CLI 2.9.15 -- AWS SAM CLI 1.70.0 +- AWS CLI 2.9.17 +- AWS SAM CLI 1.71.0 - AWS Session Manager CLI 1.2.398.0 - Azure CLI 2.44.1 - Azure CLI (azure-devops) 0.25.0 - Bicep CLI 0.13.1 - Cabal 3.6.2.0 -- Cmake 3.25.1 +- Cmake 3.25.2 - CodeQL Action Bundle 2.12.0 - Colima 0.5.2 - Fastlane 2.211.0 @@ -123,15 +123,15 @@ - Yamllint 1.29.0 ### Browsers -- Safari 16.2 (16614.3.7.1.7) -- SafariDriver 16.2 (16614.3.7.1.7) -- Google Chrome 109.0.5414.87 +- Safari 16.3 (16614.4.6.11.4) +- SafariDriver 16.3 (16614.4.6.11.4) +- Google Chrome 109.0.5414.119 - ChromeDriver 109.0.5414.74 -- Microsoft Edge 109.0.1518.52 -- Microsoft Edge WebDriver 109.0.1518.52 -- Mozilla Firefox 108.0.2 +- Microsoft Edge 109.0.1518.61 +- Microsoft Edge WebDriver 109.0.1518.61 +- Mozilla Firefox 109.0 - geckodriver 0.32.0 -- Selenium server 4.5.0 +- Selenium server 4.7.2 #### Environment variables | Name | Value | @@ -143,14 +143,14 @@ ### Java | Version | Vendor | Environment Variable | | ------------------- | --------------- | -------------------- | -| 8.0.352+8 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | -| 11.0.17+8 | Eclipse Temurin | JAVA_HOME_11_X64 | -| 17.0.5+8 | Eclipse Temurin | JAVA_HOME_17_X64 | +| 8.0.362+9 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | +| 11.0.18+10 | Eclipse Temurin | JAVA_HOME_11_X64 | +| 17.0.6+10 | Eclipse Temurin | JAVA_HOME_17_X64 | ### GraalVM | Version | Environment variables | | --------- | --------------------- | -| CE 22.3.0 | GRAALVM_11_ROOT | +| CE 22.3.1 | GRAALVM_11_ROOT | ### Cached Tools @@ -194,13 +194,13 @@ #### Packages - Bindgen 0.63.0 - Cargo-audit 0.17.4 -- Cargo-outdated 0.11.1 +- Cargo-outdated 0.11.2 - Cbindgen 0.24.3 - Clippy 0.1.66 - Rustfmt 1.5.1-stable ### PowerShell Tools -- PowerShell 7.2.8 +- PowerShell 7.2.9 #### PowerShell Modules - Az: 9.3.0 @@ -209,10 +209,10 @@ - PSScriptAnalyzer: 1.21.0 ### Web Servers -| Name | Version | ConfigFile | ServiceStatus | ListenPort | -| ----- | -------- | ------------------------------- | ------------- | ---------- | -| httpd | 2.4.54_1 | /usr/local/etc/httpd/httpd.conf | none | 80 | -| nginx | 1.23.3 | /usr/local/etc/nginx/nginx.conf | none | 80 | +| Name | Version | ConfigFile | ServiceStatus | ListenPort | +| ----- | ------- | ------------------------------- | ------------- | ---------- | +| httpd | 2.4.55 | /usr/local/etc/httpd/httpd.conf | none | 80 | +| nginx | 1.23.3 | /usr/local/etc/nginx/nginx.conf | none | 80 | ### Xamarin @@ -220,7 +220,7 @@ | Version | Build | Path | | -------------- | --------- | ------------------------------------ | | 2019 | 8.10.25.2 | /Applications/Visual Studio 2019.app | -| 2022 (default) | 17.4.2.17 | /Applications/Visual Studio.app | +| 2022 (default) | 17.4.3.21 | /Applications/Visual Studio.app | ##### Notes ``` From 68485f8bbf446a3aedd1ff07fff4a7cac907250f Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Tue, 31 Jan 2023 21:41:13 +0100 Subject: [PATCH 1713/3485] [Windows] CodeQL Action Bundle report small fix (#7020) --- images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index a110f4361afc..2f26df19db1c 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -69,7 +69,7 @@ $tools.AddToolVersion("Bazelisk", $(Get-BazeliskVersion)) $tools.AddToolVersion("Bicep", $(Get-BicepVersion)) $tools.AddToolVersion("Cabal", $(Get-CabalVersion)) $tools.AddToolVersion("CMake", $(Get-CMakeVersion)) -$tools.AddToolVersion("CodeQL Action Bundle", $(Get-CodeQLBundleVersions)) +$tools.AddToolVersion("CodeQL Action Bundles", $(Get-CodeQLBundleVersions)) $tools.AddToolVersion("Docker", $(Get-DockerVersion)) $tools.AddToolVersion("Docker Compose v1", $(Get-DockerComposeVersion)) $tools.AddToolVersion("Docker Compose v2", $(Get-DockerComposeVersionV2)) From 7821217b60dd1f0f8f9899c27392bc70336187d9 Mon Sep 17 00:00:00 2001 From: Dusko Dobranic <101048884+ddobranic@users.noreply.github.com> Date: Tue, 31 Jan 2023 22:03:06 +0100 Subject: [PATCH 1714/3485] [Windows] Install ghc and cabal using ghcup (#6754) --- .../SoftwareReport.CachedTools.psm1 | 2 +- .../scripts/Installers/Install-Haskell.ps1 | 53 +++++++++---------- images/win/scripts/Tests/Haskell.Tests.ps1 | 15 +++--- 3 files changed, 32 insertions(+), 38 deletions(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.CachedTools.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.CachedTools.psm1 index 1d5505f12883..a6c7433d0e6c 100755 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.CachedTools.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.CachedTools.psm1 @@ -26,4 +26,4 @@ function Get-ToolcacheNodeVersions { function Get-ToolcacheGoVersions { $toolcachePath = Join-Path $env:AGENT_TOOLSDIRECTORY "go" return Get-ChildItem $toolcachePath -Name | Sort-Object { [Version]$_ } -} \ No newline at end of file +} diff --git a/images/win/scripts/Installers/Install-Haskell.ps1 b/images/win/scripts/Installers/Install-Haskell.ps1 index 63c7a7c95662..e322370687b5 100644 --- a/images/win/scripts/Installers/Install-Haskell.ps1 +++ b/images/win/scripts/Installers/Install-Haskell.ps1 @@ -2,35 +2,7 @@ ## File: Install-Haskell.ps1 ## Desc: Install Haskell for Windows ################################################################################ - -# Get 3 latest versions of GHC, use OData query for that since choco search has issues https://github.com/chocolatey/choco/issues/2271 -$ODataQuery = '$filter=(Title eq ''ghc'') and (IsPrerelease eq false)&$orderby=Version desc' -$Url = "https://community.chocolatey.org/api/v2/Packages()?$ODataQuery" -$ChocoVersionsOutput = [Version[]](Invoke-RestMethod -Uri $Url).properties.Version -$LatestMajorMinor = $ChocoVersionsOutput | Group-Object { $_.ToString(2) } | Sort-Object { [Version]$_.Name } | Select-Object -last 3 -$VersionsList = $LatestMajorMinor | ForEach-Object { $_.Group | Select-Object -First 1 } | Sort-Object - -# The latest version will be installed as a default -ForEach ($version in $VersionsList) -{ - Write-Host "Installing ghc $version..." - Choco-Install -PackageName ghc -ArgumentList '--version', $version, '-m' -} - -# Add default version of GHC to path, because choco formula updates path on user level -$DefaultGhcVersion = $VersionsList | Select-Object -Last 1 -$DefaultGhcShortVersion = ([version]$DefaultGhcVersion).ToString(3) -$DefaultGhcPath = Join-Path $env:ChocolateyInstall "lib\ghc.$DefaultGhcVersion\tools\ghc-$DefaultGhcShortVersion\bin" -# Starting from version 9 haskell installation directory is $env:ChocolateyToolsLocation instead of $env:ChocolateyInstall\lib -if ($DefaultGhcShortVersion -notmatch '^[0-8]\.\d+.*') -{ - $DefaultGhcPath = Join-Path $env:ChocolateyToolsLocation "ghc-$DefaultGhcShortVersion\bin" -} - -Add-MachinePathItem -PathItem $DefaultGhcPath - -Write-Host 'Installing cabal...' -Choco-Install -PackageName cabal +Import-Module "$env:ChocolateyInstall\helpers\chocolateyProfile.psm1" # install minimal ghcup, utilizing pre-installed msys2 at C:\msys64 Write-Host 'Installing ghcup...' @@ -45,4 +17,27 @@ Set-SystemVariable "CABAL_DIR" $cabalDir Add-MachinePathItem "$ghcupPrefix\ghcup\bin" Add-MachinePathItem "$cabalDir\bin" +Update-SessionEnvironment + +# Get 3 latest versions of GHC +$Versions = ghcup list -t ghc -r | Where-Object {$_ -notlike "prerelease"} +$VersionsOutput = [Version[]]($Versions | ForEach-Object{ $_.Split(' ')[1]; }) +$LatestMajorMinor = $VersionsOutput | Group-Object { $_.ToString(2) } | Sort-Object { [Version]$_.Name } | Select-Object -last 3 +$VersionsList = $LatestMajorMinor | ForEach-Object { $_.Group | Select-Object -Last 1 } | Sort-Object + +# The latest version will be installed as a default +ForEach ($version in $VersionsList) +{ + Write-Host "Installing ghc $version..." + ghcup install ghc $version + ghcup set ghc $version +} + +# Add default version of GHC to path +$DefaultGhcVersion = $VersionsList | Select-Object -Last 1 +ghcup set ghc $DefaultGhcVersion + +Write-Host 'Installing cabal...' +ghcup install cabal latest + Invoke-PesterTests -TestFile 'Haskell' diff --git a/images/win/scripts/Tests/Haskell.Tests.ps1 b/images/win/scripts/Tests/Haskell.Tests.ps1 index 5893af28ec77..fd6b6b2c7c98 100644 --- a/images/win/scripts/Tests/Haskell.Tests.ps1 +++ b/images/win/scripts/Tests/Haskell.Tests.ps1 @@ -1,6 +1,6 @@ Describe "Haskell" { - $chocoPackagesPath = Join-Path $env:ChocolateyInstall "lib" - [array]$ghcVersionList = Get-ChildItem -Path $chocoPackagesPath -Filter "ghc.*" | ForEach-Object { $_.Name.TrimStart("ghc.") } + $ghcPackagesPath = "c:\ghcup\ghc" + [array]$ghcVersionList = Get-ChildItem -Path $ghcPackagesPath -Filter "*" | ForEach-Object { $_.Name.Trim() } $ghcCount = $ghcVersionList.Count $defaultGhcVersion = $ghcVersionList | Sort-Object {[Version]$_} | Select-Object -Last 1 $ghcDefaultCases = @{ @@ -11,12 +11,7 @@ Describe "Haskell" { $ghcTestCases = $ghcVersionList | ForEach-Object { $ghcVersion = $_ $ghcShortVersion = ([version]$ghcVersion).ToString(3) - $binGhcPath = Join-Path $chocoPackagesPath "ghc.$ghcVersion\tools\ghc-$ghcShortVersion\bin\ghc.exe" - # The most recent GHC versions installation directory is $env:ChocolateyToolsLocation instead of $env:ChocolateyInstall\lib - if (-not (Test-Path $binGhcPath)) - { - $binGhcPath = Join-Path $env:ChocolateyToolsLocation "ghc-$ghcShortVersion\bin\ghc.exe" - } + $binGhcPath = Join-Path $ghcPackagesPath "$ghcShortVersion\bin\ghc.exe" @{ ghcVersion = $ghcVersion ghcShortVersion = $ghcShortVersion @@ -60,4 +55,8 @@ Describe "Haskell" { It "ghcup is installed" { "ghcup --version" | Should -ReturnZeroExitCode } + + It "ghcup can access msys2" { + "ghcup run --mingw-path -- pacman --version" | Should -ReturnZeroExitCode + } } From 17295fdcdeefbcac13560031c8ee222d84085bd3 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Wed, 1 Feb 2023 16:05:23 +0100 Subject: [PATCH 1715/3485] [Windows] add retries in toolset installation (#7025) --- images/win/scripts/Installers/Install-Toolset.ps1 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/images/win/scripts/Installers/Install-Toolset.ps1 b/images/win/scripts/Installers/Install-Toolset.ps1 index 7d4beddf49cf..0b373dc98fc7 100644 --- a/images/win/scripts/Installers/Install-Toolset.ps1 +++ b/images/win/scripts/Installers/Install-Toolset.ps1 @@ -32,13 +32,13 @@ Function Install-Asset { } # Get toolcache content from toolset -$ToolsToInstall = @("Python", "Node", "Boost", "Go") +$ToolsToInstall = @("Python", "Node", "Go") -$tools = Get-ToolsetContent | Select-Object -ExpandProperty toolcache | Where-Object {$ToolsToInstall -contains $_.Name} +$tools = Get-ToolsetContent | Select-Object -ExpandProperty toolcache | Where-Object { $ToolsToInstall -contains $_.Name } foreach ($tool in $tools) { # Get versions manifest for current tool - $assets = Invoke-RestMethod $tool.url + $assets = Invoke-SBWithRetry -Command { Invoke-RestMethod $tool.url } # Get github release asset for each version foreach ($toolVersion in $tool.versions) { From 5be88bfe57f59ce29373a8f032b7205480158a28 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 2 Feb 2023 09:59:42 +0000 Subject: [PATCH 1716/3485] Updating readme file for ubuntu20 version 20230129.2 (#7011) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2004-Readme.md | 71 ++++++++++++++++--------------- 1 file changed, 36 insertions(+), 35 deletions(-) diff --git a/images/linux/Ubuntu2004-Readme.md b/images/linux/Ubuntu2004-Readme.md index 882926db2940..161b044e7cf7 100644 --- a/images/linux/Ubuntu2004-Readme.md +++ b/images/linux/Ubuntu2004-Readme.md @@ -1,12 +1,13 @@ | Announcements | |-| -| [[All OSs] .NET 5.x will be removed from the images on January, 29](https://github.com/actions/runner-images/issues/6840) | +| [[all OSs] Default Nodejs version will be set to 18 on February, 13](https://github.com/actions/runner-images/issues/7002) | +| [[All OSs] .NET 5.x will be removed from the images on February, 6](https://github.com/actions/runner-images/issues/6840) | | [The Ubuntu 18.04 Actions runner image will begin deprecation on 2022/08/08 and will be fully unsupported by 2023/04/01](https://github.com/actions/runner-images/issues/6002) | *** # Ubuntu 20.04 - OS Version: 20.04.5 LTS - Kernel Version: 5.15.0-1031-azure -- Image Version: 20230122.1 +- Image Version: 20230129.2 ## Installed Software @@ -42,7 +43,7 @@ - Pip3 20.0.2 - Pipx 1.1.0 - RubyGems 3.1.2 -- Vcpkg (build from commit e69dd972b) +- Vcpkg (build from commit 91dd61bd4) - Yarn 1.22.19 #### Environment variables @@ -69,13 +70,13 @@ to accomplish this. ### Tools - Ansible 2.13.7 - apt-fast 1.9.12 -- AzCopy 10.16.2 - available by `azcopy` and `azcopy10` aliases +- AzCopy 10.17.0 - available by `azcopy` and `azcopy10` aliases - Bazel 6.0.0 - Bazelisk 1.13.2 - Bicep 0.13.1 - Buildah 1.22.3 - CMake 3.25.2 -- CodeQL Action Bundle 2.12.0 +- CodeQL Action Bundles 2.12.0 2.12.1 - Docker Amazon ECR Credential Helper 0.6.0 - Docker Compose v1 1.29.2 - Docker Compose v2 2.15.1+azure-1 @@ -87,7 +88,7 @@ to accomplish this. - Git LFS 3.3.0 - Git-ftp 1.6.0 - Haveged 1.9.1 -- Heroku 7.67.1 +- Heroku 7.67.2 - HHVM (HipHop VM) 4.172.1 - jq 1.6 - Kind 0.17.0 @@ -96,7 +97,7 @@ to accomplish this. - Leiningen 2.10.0 - MediaInfo 19.09 - Mercurial 5.3.1 -- Minikube 1.28.0 +- Minikube 1.29.0 - n 9.0.1 - Newman 5.3.2 - nvm 0.39.3 @@ -105,7 +106,7 @@ to accomplish this. - Parcel 2.8.3 - PhantomJS 2.1.1 - Podman 3.4.2 -- Pulumi 3.52.1 +- Pulumi 3.53.1 - R 4.2.2 - Skopeo 1.5.0 - Sphinx Open Source Search Server 2.2.11 @@ -117,35 +118,35 @@ to accomplish this. ### CLI Tools - Alibaba Cloud CLI 3.0.144 -- AWS CLI 2.9.17 +- AWS CLI 2.9.19 - AWS CLI Session Manager Plugin 1.2.398.0 -- AWS SAM CLI 1.70.0 +- AWS SAM CLI 1.71.0 - Azure CLI 2.44.1 -- Azure CLI (azure-devops) 0.25.0 -- GitHub CLI 2.21.2 -- Google Cloud SDK 414.0.0 +- Azure CLI (azure-devops) 0.26.0 +- GitHub CLI 2.22.1 +- Google Cloud SDK 415.0.0 - Hub CLI 2.14.2 -- Netlify CLI 12.9.1 +- Netlify CLI 12.10.0 - OpenShift CLI 4.12.0 - ORAS CLI 0.16.0 -- Vercel CLI 28.13.0 +- Vercel CLI 28.14.0 ### Java -| Version | Vendor | Environment Variable | -| ------------------- | --------------- | -------------------- | -| 8.0.352+8 | Eclipse Temurin | JAVA_HOME_8_X64 | -| 11.0.17+8 (default) | Eclipse Temurin | JAVA_HOME_11_X64 | -| 17.0.5+8 | Eclipse Temurin | JAVA_HOME_17_X64 | +| Version | Vendor | Environment Variable | +| -------------------- | --------------- | -------------------- | +| 8.0.362+9 | Eclipse Temurin | JAVA_HOME_8_X64 | +| 11.0.18+10 (default) | Eclipse Temurin | JAVA_HOME_11_X64 | +| 17.0.6+10 | Eclipse Temurin | JAVA_HOME_17_X64 | ### GraalVM | Version | Environment variables | | --------- | --------------------- | -| CE 22.3.0 | GRAALVM_11_ROOT | +| CE 22.3.1 | GRAALVM_11_ROOT | ### PHP Tools - PHP: 7.4.33, 8.0.27, 8.1.14, 8.2.1 - Composer 2.5.1 -- PHPUnit 8.5.31 +- PHPUnit 8.5.32 ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ``` @@ -157,27 +158,27 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Stack 2.9.3 ### Rust Tools -- Cargo 1.66.1 -- Rust 1.66.1 -- Rustdoc 1.66.1 +- Cargo 1.67.0 +- Rust 1.67.0 +- Rustdoc 1.67.0 - Rustup 1.25.1 #### Packages - Bindgen 0.63.0 - Cargo audit 0.17.4 -- Cargo clippy 0.1.66 +- Cargo clippy 0.1.67 - Cargo outdated 0.11.2 - Cbindgen 0.24.3 - Rustfmt 1.5.1 ### Browsers and Drivers -- Google Chrome 109.0.5414.74 +- Google Chrome 109.0.5414.119 - ChromeDriver 109.0.5414.74 - Chromium 109.0.5414.0 -- Microsoft Edge 109.0.1518.61 -- Microsoft Edge WebDriver 109.0.1518.61 -- Selenium server 4.7.0 -- Mozilla Firefox 109.0 +- Microsoft Edge 109.0.1518.70 +- Microsoft Edge WebDriver 109.0.1518.70 +- Selenium server 4.8.0 +- Mozilla Firefox 109.0.1 - Geckodriver 0.32.0 #### Environment variables @@ -205,7 +206,7 @@ Use the following command as a part of your job to start the service: 'sudo syst ``` #### MySQL -- MySQL 8.0.31-0ubuntu0.20.04.2 +- MySQL 8.0.32-0ubuntu0.20.04.2 ``` User: root Password: root @@ -253,7 +254,7 @@ Use the following command as a part of your job to start the service: 'sudo syst - 3.1.3 ### PowerShell Tools -- PowerShell 7.2.8 +- PowerShell 7.2.9 #### PowerShell Modules - Az: 9.3.0 @@ -308,7 +309,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | debian:10 | sha256:bb8c62f9f540a5f5f49f7ed5caae0e2889f999cd14553f2aaccaf1fa4fcb998d | 2023-01-11 | | debian:11 | sha256:534da5794e770279c889daa891f46f5a530b0c5de8bfbc5e40394a0164d9fa87 | 2023-01-11 | | debian:9 | sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be | 2022-06-23 | -| moby/buildkit:latest | sha256:86ffcc648dbd2215941cbaabbd0564bd8bc67e2aefd32d4feb26e4fb8080f8c6 | 2023-01-17 | +| moby/buildkit:latest | sha256:f092403997f04742b549811ca2402d88207afbf33656eb1cf34aa7fe8a8511ac | 2023-01-26 | | node:14 | sha256:0c888dc647d36f5a895edb6b1b1c96ae81064455e0cdeee0792e14927604ca99 | 2023-01-11 | | node:14-alpine | sha256:2c6a909495ef3761328c10945cbe84c06d079f7ca49dc24271e73be8cab85ad7 | 2023-01-09 | | node:16 | sha256:27fab5920246070cf13449cf44c25bc4f5adef18ca7482b2bda90b7cf9e64481 | 2023-01-11 | @@ -334,7 +335,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | coreutils | 8.30-3ubuntu2 | | curl | 7.68.0-1ubuntu2.15 | | dbus | 1.12.16-2ubuntu2.3 | -| dnsutils | 1:9.16.1-0ubuntu2.11 | +| dnsutils | 1:9.16.1-0ubuntu2.12 | | dpkg | 1.19.7ubuntu3.2 | | fakeroot | 1.24-1 | | file | 1:5.38-4 | From 05466aa85aa5ea8e6b45210e562e056dabc76b7a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 2 Feb 2023 10:02:48 +0000 Subject: [PATCH 1717/3485] Updating readme file for ubuntu22 version 20230129.2 (#7014) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2204-Readme.md | 71 ++++++++++++++++--------------- 1 file changed, 36 insertions(+), 35 deletions(-) diff --git a/images/linux/Ubuntu2204-Readme.md b/images/linux/Ubuntu2204-Readme.md index 3aa9162d0a65..3d8a18f71f81 100644 --- a/images/linux/Ubuntu2204-Readme.md +++ b/images/linux/Ubuntu2204-Readme.md @@ -1,12 +1,13 @@ | Announcements | |-| -| [[All OSs] .NET 5.x will be removed from the images on January, 29](https://github.com/actions/runner-images/issues/6840) | +| [[all OSs] Default Nodejs version will be set to 18 on February, 13](https://github.com/actions/runner-images/issues/7002) | +| [[All OSs] .NET 5.x will be removed from the images on February, 6](https://github.com/actions/runner-images/issues/6840) | | [The Ubuntu 18.04 Actions runner image will begin deprecation on 2022/08/08 and will be fully unsupported by 2023/04/01](https://github.com/actions/runner-images/issues/6002) | *** # Ubuntu 22.04 - OS Version: 22.04.1 LTS - Kernel Version: 5.15.0-1031-azure -- Image Version: 20230122.1 +- Image Version: 20230129.2 ## Installed Software @@ -40,7 +41,7 @@ - Pip3 22.0.2 - Pipx 1.1.0 - RubyGems 3.3.5 -- Vcpkg (build from commit e69dd972b) +- Vcpkg (build from commit 91dd61bd4) - Yarn 1.22.19 #### Environment variables @@ -63,13 +64,13 @@ to accomplish this. ### Tools - Ansible 2.14.1 - apt-fast 1.9.12 -- AzCopy 10.16.2 - available by `azcopy` and `azcopy10` aliases +- AzCopy 10.17.0 - available by `azcopy` and `azcopy10` aliases - Bazel 6.0.0 - Bazelisk 1.13.2 - Bicep 0.13.1 - Buildah 1.23.1 - CMake 3.25.2 -- CodeQL Action Bundle 2.12.0 +- CodeQL Action Bundles 2.12.0 2.12.1 - Docker Amazon ECR Credential Helper 0.6.0 - Docker Compose v1 1.29.2 - Docker Compose v2 2.15.1+azure-1 @@ -81,7 +82,7 @@ to accomplish this. - Git LFS 3.3.0 - Git-ftp 1.6.0 - Haveged 1.9.14 -- Heroku 7.67.1 +- Heroku 7.67.2 - jq 1.6 - Kind 0.17.0 - Kubectl 1.26.1 @@ -89,7 +90,7 @@ to accomplish this. - Leiningen 2.10.0 - MediaInfo 21.09 - Mercurial 6.1.1 -- Minikube 1.28.0 +- Minikube 1.29.0 - n 9.0.1 - Newman 5.3.2 - nvm 0.39.3 @@ -97,7 +98,7 @@ to accomplish this. - Packer 1.8.5 - Parcel 2.8.3 - Podman 3.4.4 -- Pulumi 3.52.1 +- Pulumi 3.53.1 - R 4.2.2 - Skopeo 1.4.1 - Sphinx Open Source Search Server 2.2.11 @@ -109,35 +110,35 @@ to accomplish this. ### CLI Tools - Alibaba Cloud CLI 3.0.144 -- AWS CLI 2.9.17 +- AWS CLI 2.9.19 - AWS CLI Session Manager Plugin 1.2.398.0 -- AWS SAM CLI 1.70.0 +- AWS SAM CLI 1.71.0 - Azure CLI 2.44.1 -- Azure CLI (azure-devops) 0.25.0 -- GitHub CLI 2.21.2 -- Google Cloud SDK 414.0.0 +- Azure CLI (azure-devops) 0.26.0 +- GitHub CLI 2.22.1 +- Google Cloud SDK 415.0.0 - Hub CLI 2.14.2 -- Netlify CLI 12.9.1 +- Netlify CLI 12.10.0 - OpenShift CLI 4.12.0 - ORAS CLI 0.16.0 -- Vercel CLI 28.13.0 +- Vercel CLI 28.14.0 ### Java -| Version | Vendor | Environment Variable | -| ------------------- | --------------- | -------------------- | -| 8.0.352+8 | Eclipse Temurin | JAVA_HOME_8_X64 | -| 11.0.17+8 (default) | Eclipse Temurin | JAVA_HOME_11_X64 | -| 17.0.5+8 | Eclipse Temurin | JAVA_HOME_17_X64 | +| Version | Vendor | Environment Variable | +| -------------------- | --------------- | -------------------- | +| 8.0.362+9 | Eclipse Temurin | JAVA_HOME_8_X64 | +| 11.0.18+10 (default) | Eclipse Temurin | JAVA_HOME_11_X64 | +| 17.0.6+10 | Eclipse Temurin | JAVA_HOME_17_X64 | ### GraalVM | Version | Environment variables | | --------- | --------------------- | -| CE 22.3.0 | GRAALVM_11_ROOT | +| CE 22.3.1 | GRAALVM_11_ROOT | ### PHP Tools - PHP: 8.1.2 - Composer 2.5.1 -- PHPUnit 8.5.31 +- PHPUnit 8.5.32 ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ``` @@ -149,27 +150,27 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Stack 2.9.3 ### Rust Tools -- Cargo 1.66.1 -- Rust 1.66.1 -- Rustdoc 1.66.1 +- Cargo 1.67.0 +- Rust 1.67.0 +- Rustdoc 1.67.0 - Rustup 1.25.1 #### Packages - Bindgen 0.63.0 - Cargo audit 0.17.4 -- Cargo clippy 0.1.66 +- Cargo clippy 0.1.67 - Cargo outdated 0.11.2 - Cbindgen 0.24.3 - Rustfmt 1.5.1 ### Browsers and Drivers -- Google Chrome 109.0.5414.74 +- Google Chrome 109.0.5414.119 - ChromeDriver 109.0.5414.74 - Chromium 109.0.5414.0 -- Microsoft Edge 109.0.1518.61 -- Microsoft Edge WebDriver 109.0.1518.61 -- Selenium server 4.7.0 -- Mozilla Firefox 109.0 +- Microsoft Edge 109.0.1518.70 +- Microsoft Edge WebDriver 109.0.1518.70 +- Selenium server 4.8.0 +- Mozilla Firefox 109.0.1 - Geckodriver 0.32.0 #### Environment variables @@ -196,7 +197,7 @@ Use the following command as a part of your job to start the service: 'sudo syst ``` #### MySQL -- MySQL 8.0.31-0ubuntu0.22.04.1 +- MySQL 8.0.32-0ubuntu0.22.04.2 ``` User: root Password: root @@ -236,7 +237,7 @@ Use the following command as a part of your job to start the service: 'sudo syst - 3.1.3 ### PowerShell Tools -- PowerShell 7.2.8 +- PowerShell 7.2.9 #### PowerShell Modules - Az: 9.3.0 @@ -287,7 +288,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | buildpack-deps:buster | sha256:c343da4a0b85a4d25ce30529e836a10d46cd4f682fb5326400e4ba274a2f9866 | 2023-01-11 | | debian:10 | sha256:bb8c62f9f540a5f5f49f7ed5caae0e2889f999cd14553f2aaccaf1fa4fcb998d | 2023-01-11 | | debian:11 | sha256:534da5794e770279c889daa891f46f5a530b0c5de8bfbc5e40394a0164d9fa87 | 2023-01-11 | -| moby/buildkit:latest | sha256:86ffcc648dbd2215941cbaabbd0564bd8bc67e2aefd32d4feb26e4fb8080f8c6 | 2023-01-17 | +| moby/buildkit:latest | sha256:f092403997f04742b549811ca2402d88207afbf33656eb1cf34aa7fe8a8511ac | 2023-01-26 | | node:14 | sha256:0c888dc647d36f5a895edb6b1b1c96ae81064455e0cdeee0792e14927604ca99 | 2023-01-11 | | node:14-alpine | sha256:2c6a909495ef3761328c10945cbe84c06d079f7ca49dc24271e73be8cab85ad7 | 2023-01-09 | | node:16 | sha256:27fab5920246070cf13449cf44c25bc4f5adef18ca7482b2bda90b7cf9e64481 | 2023-01-11 | @@ -313,7 +314,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | coreutils | 8.32-4.1ubuntu1 | | curl | 7.81.0-1ubuntu1.7 | | dbus | 1.12.20-2ubuntu4.1 | -| dnsutils | 1:9.18.1-1ubuntu1.2 | +| dnsutils | 1:9.18.1-1ubuntu1.3 | | dpkg | 1.21.1ubuntu2.1 | | fakeroot | 1.28-1ubuntu1 | | file | 1:5.41-3 | From 8ac0b91f786c09c8798dee17a3a02c4523a8f478 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 2 Feb 2023 12:31:22 +0000 Subject: [PATCH 1718/3485] Updating readme file for win22 version 20230129.1 (#7013) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2022-Readme.md | 49 ++++++++++++++++---------------- 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/images/win/Windows2022-Readme.md b/images/win/Windows2022-Readme.md index 9554a726fede..32d2a92a5516 100644 --- a/images/win/Windows2022-Readme.md +++ b/images/win/Windows2022-Readme.md @@ -1,10 +1,11 @@ | Announcements | |-| -| [[All OSs] .NET 5.x will be removed from the images on January, 29](https://github.com/actions/runner-images/issues/6840) | +| [[all OSs] Default Nodejs version will be set to 18 on February, 13](https://github.com/actions/runner-images/issues/7002) | +| [[All OSs] .NET 5.x will be removed from the images on February, 6](https://github.com/actions/runner-images/issues/6840) | *** # Windows Server 2022 - OS Version: 10.0.20348 Build 1487 -- Image Version: 20230123.1 +- Image Version: 20230129.1 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -26,14 +27,14 @@ ### Package Management - Chocolatey 1.2.1 - Composer 2.5.1 -- Helm 3.10.3 +- Helm 3.11.0 - Miniconda 22.11.1 (pre-installed on the image but not added to PATH) - NPM 8.19.3 - NuGet 6.4.0.123 - pip 22.3.1 (python 3.9) - Pipx 1.1.0 - RubyGems 3.2.33 -- Vcpkg (build from commit e69dd972b) +- Vcpkg (build from commit 91dd61bd4) - Yarn 1.22.19 #### Environment variables @@ -51,13 +52,13 @@ ### Tools - 7zip 22.01 - aria2 1.36.0 -- azcopy 10.16.2 +- azcopy 10.17.0 - Bazel 6.0.0 - Bazelisk 1.13.2 - Bicep 0.13.1 - Cabal 3.8.1.0 - CMake 3.25.2 -- CodeQL Action Bundle 2.12.0 +- CodeQL Action Bundle 2.12.0 2.12.1 - Docker 20.10.23 - Docker Compose v1 1.29.2 - Docker Compose v2 2.15.1 @@ -65,7 +66,7 @@ - ghc 9.4.4 - Git 2.39.1.windows.1 - Git LFS 3.3.0 -- ImageMagick 7.1.0-57 +- ImageMagick 7.1.0-59 - InnoSetup 6.2.1 - jq 1.6 - Kind 0.17.0 @@ -75,8 +76,8 @@ - Newman 5.3.2 - NSIS 3.08 - OpenSSL 1.1.1 -- Packer 1.8.4 -- Pulumi 3.52.1 +- Packer 1.8.5 +- Pulumi 3.53.1 - R 4.2.2 - Service Fabric SDK 9.1.1436.9590 - Stack 2.9.3 @@ -90,18 +91,18 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.144 -- AWS CLI 2.9.17 -- AWS SAM CLI 1.70.0 +- AWS CLI 2.9.18 +- AWS SAM CLI 1.71.0 - AWS Session Manager CLI 1.2.398.0 - Azure CLI 2.44.1 -- Azure DevOps CLI extension 0.25.0 -- GitHub CLI 2.21.2 +- Azure DevOps CLI extension 0.26.0 +- GitHub CLI 2.22.1 - Hub CLI 2.14.2 ### Rust Tools -- Cargo 1.66.1 -- Rust 1.66.1 -- Rustdoc 1.66.1 +- Cargo 1.67.0 +- Rust 1.67.0 +- Rustdoc 1.67.0 - Rustup 1.25.1 #### Packages @@ -109,14 +110,14 @@ - cargo-audit 0.17.4 - cargo-outdated 0.11.2 - cbindgen 0.24.3 -- Clippy 0.1.66 +- Clippy 0.1.67 - Rustfmt 1.5.1 ### Browsers and Drivers -- Google Chrome 109.0.5414.75 +- Google Chrome 109.0.5414.120 - Chrome Driver 109.0.5414.74 -- Microsoft Edge 109.0.1518.61 -- Microsoft Edge Driver 109.0.1518.61 +- Microsoft Edge 109.0.1518.70 +- Microsoft Edge Driver 109.0.1518.70 - Mozilla Firefox 109.0 - Gecko Driver 0.32.0 - IE Driver 4.8.0.0 @@ -133,7 +134,7 @@ ### Java | Version | Vendor | Environment Variable | | ------------------- | --------------- | -------------------- | -| 8.0.352+8 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | +| 8.0.362+9 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | | 11.0.18+10 | Eclipse Temurin | JAVA_HOME_11_X64 | | 17.0.6+10 | Eclipse Temurin | JAVA_HOME_17_X64 | @@ -204,7 +205,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | 5.0.14.0 | MongoDB | Stopped | Disabled | ### Database tools -- Azure CosmosDb Emulator 2.14.9.0 +- Azure CosmosDb Emulator 2.14.11.0 - DacFx 16.1.6374.0 - MySQL 8.0.31.0 - SQL OLEDB Driver 18.6.3.0 @@ -534,7 +535,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - nbgv 3.5.119+5d25f54fec ### PowerShell Tools -- PowerShell 7.2.8 +- PowerShell 7.2.9 #### Powershell Modules - Az: 9.3.0 @@ -543,7 +544,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Az (Cached): 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.254 +- AWSPowershell: 4.1.259 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 - Microsoft.Graph: 1.20.0 From e0e8ca9f67689d62c1b69a9bf665f575661ee3b6 Mon Sep 17 00:00:00 2001 From: Fedor Varavenko <4066226+VFedorV@users.noreply.github.com> Date: Thu, 2 Feb 2023 14:31:44 +0100 Subject: [PATCH 1719/3485] [Windows] .NET 5.x has been removed (#7026) --- images/win/toolsets/toolset-2019.json | 1 - images/win/toolsets/toolset-2022.json | 1 - 2 files changed, 2 deletions(-) diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index 248fcf99e87f..58797cf7f1d5 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -437,7 +437,6 @@ "dotnet": { "versions": [ "3.1", - "5.0", "6.0" ], "tools": [ diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index 754658033eaa..d623766b4f20 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -348,7 +348,6 @@ "dotnet": { "versions": [ "3.1", - "5.0", "6.0" ], "tools": [ From aaf13dc3c2053cf5dd1316e410848d48061c5472 Mon Sep 17 00:00:00 2001 From: Fedor Varavenko <4066226+VFedorV@users.noreply.github.com> Date: Thu, 2 Feb 2023 14:34:28 +0100 Subject: [PATCH 1720/3485] [MacOS] .NET 5.x has been removed (#7030) --- images/macos/toolsets/toolset-10.15.json | 3 +-- images/macos/toolsets/toolset-11.json | 1 - images/macos/toolsets/toolset-12.json | 1 - 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index 84ba4277e8a5..528ea440285d 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -313,8 +313,7 @@ ], "dotnet": { "versions": [ - "3.1", - "5.0" + "3.1" ] }, "ruby": { diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index 1a63e249c860..b00bb5b2ef49 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -309,7 +309,6 @@ "dotnet": { "versions": [ "3.1", - "5.0", "6.0", "7.0" ] diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index 8c3d83b3c31b..dd5bdb9da9c4 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -278,7 +278,6 @@ "dotnet": { "versions": [ "3.1", - "5.0", "6.0", "7.0" ] From 30bde953145f9284e9babc4482d67804bc8df8fc Mon Sep 17 00:00:00 2001 From: Fedor Varavenko <4066226+VFedorV@users.noreply.github.com> Date: Thu, 2 Feb 2023 14:36:36 +0100 Subject: [PATCH 1721/3485] [Ubuntu] .NET 5.x has been removed (#7029) --- images/linux/toolsets/toolset-1804.json | 2 -- images/linux/toolsets/toolset-2004.json | 2 -- 2 files changed, 4 deletions(-) diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index 8b0d113cc567..6b69a1477168 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -257,12 +257,10 @@ "dotnet": { "aptPackages": [ "dotnet-sdk-3.1", - "dotnet-sdk-5.0", "dotnet-sdk-6.0" ], "versions": [ "3.1", - "5.0", "6.0" ], "tools": [ diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index 04e6f872764e..e46d4a0a5373 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -258,13 +258,11 @@ "dotnet": { "aptPackages": [ "dotnet-sdk-3.1", - "dotnet-sdk-5.0", "dotnet-sdk-6.0", "dotnet-sdk-7.0" ], "versions": [ "3.1", - "5.0", "6.0", "7.0" ], From 33195758f0cef6ecc065eff1caf8ae11434fadd7 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 2 Feb 2023 15:37:20 +0000 Subject: [PATCH 1722/3485] Updating readme file for win19 version 20230129.2 (#7010) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2019-Readme.md | 49 ++++++++++++++++---------------- 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index 22b15f68a562..b90bd1dbc199 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -1,10 +1,11 @@ | Announcements | |-| -| [[All OSs] .NET 5.x will be removed from the images on January, 29](https://github.com/actions/runner-images/issues/6840) | +| [[all OSs] Default Nodejs version will be set to 18 on February, 13](https://github.com/actions/runner-images/issues/7002) | +| [[All OSs] .NET 5.x will be removed from the images on February, 6](https://github.com/actions/runner-images/issues/6840) | *** # Windows Server 2019 - OS Version: 10.0.17763 Build 3887 -- Image Version: 20230123.2 +- Image Version: 20230129.2 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -26,14 +27,14 @@ ### Package Management - Chocolatey 1.2.1 - Composer 2.5.1 -- Helm 3.10.3 +- Helm 3.11.0 - Miniconda 22.11.1 (pre-installed on the image but not added to PATH) - NPM 8.19.3 - NuGet 6.4.0.123 - pip 22.3.1 (python 3.7) - Pipx 1.1.0 - RubyGems 2.7.6.3 -- Vcpkg (build from commit e69dd972b) +- Vcpkg (build from commit 91dd61bd4) - Yarn 1.22.19 #### Environment variables @@ -51,13 +52,13 @@ ### Tools - 7zip 22.01 - aria2 1.36.0 -- azcopy 10.16.2 INFO: azcopy.exe: A newer version 10.17.0 is available to download +- azcopy 10.17.0 - Bazel 6.0.0 - Bazelisk 1.13.2 - Bicep 0.13.1 - Cabal 3.8.1.0 - CMake 3.25.2 -- CodeQL Action Bundle 2.12.0 +- CodeQL Action Bundle 2.12.0 2.12.1 - Docker 20.10.23 - Docker Compose v1 1.29.2 - Docker Compose v2 2.15.1 @@ -65,8 +66,8 @@ - ghc 9.4.4 - Git 2.39.1.windows.1 - Git LFS 3.3.0 -- Google Cloud SDK 414.0.0 -- ImageMagick 7.1.0-57 +- Google Cloud SDK 415.0.0 +- ImageMagick 7.1.0-59 - InnoSetup 6.2.1 - jq 1.6 - Kind 0.17.0 @@ -76,9 +77,9 @@ - Newman 5.3.2 - NSIS 3.08 - OpenSSL 1.1.1 -- Packer 1.8.4 +- Packer 1.8.5 - Parcel 2.8.3 -- Pulumi 3.52.1 +- Pulumi 3.53.1 - R 4.2.2 - Service Fabric SDK 9.1.1436.9590 - Stack 2.9.3 @@ -92,19 +93,19 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.144 -- AWS CLI 2.9.17 -- AWS SAM CLI 1.70.1 +- AWS CLI 2.9.18 +- AWS SAM CLI 1.71.0 - AWS Session Manager CLI 1.2.398.0 - Azure CLI 2.44.1 -- Azure DevOps CLI extension 0.25.0 +- Azure DevOps CLI extension 0.26.0 - Cloud Foundry CLI 6.53.0 -- GitHub CLI 2.21.2 +- GitHub CLI 2.22.1 - Hub CLI 2.14.2 ### Rust Tools -- Cargo 1.66.1 -- Rust 1.66.1 -- Rustdoc 1.66.1 +- Cargo 1.67.0 +- Rust 1.67.0 +- Rustdoc 1.67.0 - Rustup 1.25.1 #### Packages @@ -112,14 +113,14 @@ - cargo-audit 0.17.4 - cargo-outdated 0.11.2 - cbindgen 0.24.3 -- Clippy 0.1.66 +- Clippy 0.1.67 - Rustfmt 1.5.1 ### Browsers and Drivers -- Google Chrome 109.0.5414.75 +- Google Chrome 109.0.5414.120 - Chrome Driver 109.0.5414.74 -- Microsoft Edge 109.0.1518.61 -- Microsoft Edge Driver 109.0.1518.61 +- Microsoft Edge 109.0.1518.70 +- Microsoft Edge Driver 109.0.1518.70 - Mozilla Firefox 109.0 - Gecko Driver 0.32.0 - IE Driver 4.8.0.0 @@ -217,7 +218,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | 5.0.14.0 | MongoDB | Stopped | Disabled | ### Database tools -- Azure CosmosDb Emulator 2.14.9.0 +- Azure CosmosDb Emulator 2.14.11.0 - DacFx 16.1.6374.0 - MySQL 5.7.40.0 - SQL OLEDB Driver 18.6.3.0 @@ -503,7 +504,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - nbgv 3.5.119+5d25f54fec ### PowerShell Tools -- PowerShell 7.2.8 +- PowerShell 7.2.9 #### Powershell Modules - Az: 9.3.0 @@ -512,7 +513,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Az (Cached): 1.0.0.zip, 1.6.0.zip, 2.3.2.zip, 2.6.0.zip, 3.1.0.zip, 3.5.0.zip, 3.8.0.zip, 4.3.0.zip, 4.4.0.zip, 4.7.0.zip, 5.5.0.zip, 5.9.0.zip, 6.6.0.zip, 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.254 +- AWSPowershell: 4.1.259 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 - Microsoft.Graph: 1.20.0 From 751fe08d9840d2273fb1986980c5f18f3a920e64 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Thu, 2 Feb 2023 17:45:38 +0100 Subject: [PATCH 1723/3485] README: add package managers table (#6959) --- README.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/README.md b/README.md index dbe6cc0f80c2..a9d73b742007 100644 --- a/README.md +++ b/README.md @@ -110,6 +110,21 @@ latest 2 versions of an OS. | Android NDK | 1 latest non-LTS, 2 latest LTS versions | | Xcode | - all OS compatible versions side-by-side <br/> - for beta, GM versions - latest beta only <br/> - old patch versions are deprecated in 3 months | +### Package managers usage + +We use third-party package managers to install software during the image generation process. The table below lists the package managers and the software installed. +> **Note**: third-party repositories are re-evaluated every year to identify if they are still useful and secure. + + +| Operating system | Package manager | Third-party repos and packages | +| :--- | :---: | ---: | +| Ubuntu | [APT](https://wiki.debian.org/Apt) | [Eclipse-Timurin (Adoptium)](https://packages.adoptium.net/artifactory/deb) </br> [Erlang](https://packages.erlang-solutions.com/ubuntu) </br>[Firefox](https://launchpad.net/~mozillateam/+archive/ubuntu/ppa) </br> [gcc, gfortran](https://launchpad.net/~ubuntu-toolchain-r/+archive/ubuntu/test) </br> [git](https://launchpad.net/~git-core/+archive/ubuntu/ppa) </br> [HHvm](https://dl.hhvm.com/ubuntu) </br> [PHP](https://launchpad.net/~ondrej/+archive/ubuntu/php) (Ubuntu 18 & 20 only) </br> [Mono](https://download.mono-project.com/repo/ubuntu) </br> [PostgreSQL](https://apt.postgresql.org/pub/repos/apt) </br> [R](https://cloud.r-project.org/bin/linux/ubuntu) | +| | [pipx](https://pypa.github.io/pipx) | ansible-core </br>yamllint | +| Windows | [Chocolatey](https://chocolatey.org) | No third-party repos installed | +| macOS | [Homebrew](https://homebrew.sh) | [aws-cli v2](https://github.com/aws/homebrew-tap) </br> [azure/bicep](https://github.com/Azure/homebrew-bicep) </br> [graalvm-ce-java11](https://github.com/graalvm/homebrew-tap) </br> [mongodb/brew](https://github.com/mongodb/homebrew-brew) | +| | [pipx](https://pypa.github.io/pipx/) | yamllint | + + ### Image Deprecation Policy - Images begin the deprecation process of the oldest image label once a new GA OS version has been released. From 7a8e77b24ac47cc27f619cc97c26af6f541c162a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 4 Feb 2023 12:14:28 +0100 Subject: [PATCH 1724/3485] Updating readme file for macOS-12 version 20230125.4 (#7018) Co-authored-by: Image generation service account <no-reply@microsoft.com> --- images/macos/macos-12-Readme.md | 62 +++++++++++++++++---------------- 1 file changed, 32 insertions(+), 30 deletions(-) diff --git a/images/macos/macos-12-Readme.md b/images/macos/macos-12-Readme.md index 85e3e0b80315..636d3bf97436 100644 --- a/images/macos/macos-12-Readme.md +++ b/images/macos/macos-12-Readme.md @@ -1,13 +1,13 @@ | Announcements | |-| -| [[All OSs] .NET 5.x will be removed from the images on January, 29](https://github.com/actions/runner-images/issues/6840) | -| [[macOS] Default Xcode on macOS 12 Monterey will be set to Xcode 14.2 on January, 16](https://github.com/actions/runner-images/issues/6746) | +| [[all OSs] Default Nodejs version will be set to 18 on February, 13](https://github.com/actions/runner-images/issues/7002) | +| [[All OSs] .NET 5.x will be removed from the images on February, 6](https://github.com/actions/runner-images/issues/6840) | | [The macOS 10.15 Actions runner image will begin deprecation on 5/31/22 and will be fully unsupported by 12/1/22 for GitHub and ADO](https://github.com/actions/runner-images/issues/5583) | *** # macOS 12 -- OS Version: macOS 12.6.2 (21G320) +- OS Version: macOS 12.6.3 (21G419) - Kernel Version: Darwin 21.6.0 -- Image Version: 20230117.3 +- Image Version: 20230125.4 ## Installed Software @@ -17,7 +17,9 @@ - Clang/LLVM 14.0.0 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` - GCC 11 (Homebrew GCC 11.3.0) - available by `gcc-11` alias +- GCC 12 (Homebrew GCC 12.2.0) - available by `gcc-12` alias - GNU Fortran 11 (Homebrew GCC 11.3.0) - available by `gfortran-11` alias +- GNU Fortran 12 (Homebrew GCC 12.2.0) - available by `gfortran-12` alias - Go 1.17.13 - Julia 1.8.5 - Kotlin 1.8.0-release-345 @@ -34,19 +36,19 @@ - Ruby 3.0.5p211 ### Package Management -- Bundler 2.4.4 +- Bundler 2.4.5 - Carthage 0.38.0 - CocoaPods 1.11.3 - Composer 2.5.1 -- Homebrew 3.6.19 +- Homebrew 3.6.20 - Miniconda 22.11.1 - NPM 8.19.3 - NuGet 6.3.1.1 - Pip 20.3.4 (python 2.7) - Pip3 22.3.1 (python 3.11) - Pipx 1.1.0 -- RubyGems 3.4.4 -- Vcpkg 2022 (build from commit 5908d702d) +- RubyGems 3.4.5 +- Vcpkg 2023 (build from commit 4efb7ed62) - Yarn 1.22.19 #### Environment variables @@ -64,19 +66,19 @@ ### Utilities - 7-Zip 17.04 - aria2 1.36.0 -- azcopy 10.16.2 +- azcopy 10.17.0 - bazel 6.0.0 - bazelisk 1.15.0 - bsdtar 3.5.1 - available by 'tar' alias - Curl 7.87.0 - Git 2.39.1 - Git LFS 3.3.0 -- GitHub CLI 2.21.2 +- GitHub CLI 2.22.0 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.3 - gpg (GnuPG) 2.4.0 - Hub CLI 2.14.2 -- ImageMagick 7.1.0-57 +- ImageMagick 7.1.0-58 - jq 1.6 - mongo 5.0.14 - mongod 5.0.14 @@ -94,14 +96,14 @@ ### Tools - App Center CLI 2.13.0 -- AWS CLI 2.9.15 -- AWS SAM CLI 1.70.0 +- AWS CLI 2.9.18 +- AWS SAM CLI 1.71.0 - AWS Session Manager CLI 1.2.398.0 - Azure CLI 2.44.1 - Azure CLI (azure-devops) 0.25.0 - Bicep CLI 0.13.1 - Cabal 3.6.2.0 -- Cmake 3.25.1 +- Cmake 3.25.2 - CodeQL Action Bundle 2.12.0 - Colima 0.5.2 - Fastlane 2.211.0 @@ -118,15 +120,15 @@ - Yamllint 1.29.0 ### Browsers -- Safari 16.2 (17614.3.7.1.7) -- SafariDriver 16.2 (17614.3.7.1.7) -- Google Chrome 109.0.5414.87 +- Safari 16.3 (17614.4.6.11.4) +- SafariDriver 16.3 (17614.4.6.11.4) +- Google Chrome 109.0.5414.119 - ChromeDriver 109.0.5414.74 -- Microsoft Edge 109.0.1518.52 -- Microsoft Edge WebDriver 109.0.1518.52 -- Mozilla Firefox 108.0.2 +- Microsoft Edge 109.0.1518.61 +- Microsoft Edge WebDriver 109.0.1518.61 +- Mozilla Firefox 109.0 - geckodriver 0.32.0 -- Selenium server 4.5.0 +- Selenium server 4.7.2 #### Environment variables | Name | Value | @@ -138,14 +140,14 @@ ### Java | Version | Vendor | Environment Variable | | ------------------- | --------------- | -------------------- | -| 8.0.352+8 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | -| 11.0.17+8 | Eclipse Temurin | JAVA_HOME_11_X64 | -| 17.0.5+8 | Eclipse Temurin | JAVA_HOME_17_X64 | +| 8.0.362+9 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | +| 11.0.18+10 | Eclipse Temurin | JAVA_HOME_11_X64 | +| 17.0.6+10 | Eclipse Temurin | JAVA_HOME_17_X64 | ### GraalVM | Version | Environment variables | | --------- | --------------------- | -| CE 22.3.0 | GRAALVM_11_ROOT | +| CE 22.3.1 | GRAALVM_11_ROOT | ### Cached Tools @@ -186,13 +188,13 @@ #### Packages - Bindgen 0.63.0 - Cargo-audit 0.17.4 -- Cargo-outdated 0.11.1 +- Cargo-outdated 0.11.2 - Cbindgen 0.24.3 - Clippy 0.1.66 - Rustfmt 1.5.1-stable ### PowerShell Tools -- PowerShell 7.2.8 +- PowerShell 7.2.9 #### PowerShell Modules - Az: 9.3.0 @@ -212,7 +214,7 @@ | Version | Build | Path | | -------------- | --------- | ------------------------------------ | | 2019 | 8.10.25.2 | /Applications/Visual Studio 2019.app | -| 2022 (default) | 17.4.2.17 | /Applications/Visual Studio.app | +| 2022 (default) | 17.4.3.21 | /Applications/Visual Studio.app | ##### Notes ``` @@ -314,7 +316,7 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" | iOS 16.0 | 14.0.1 | iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPhone SE (3rd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | | iOS 16.1 | 14.1 | iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro (9.7-inch) | | iOS 16.2 | 14.2 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro (9.7-inch) | -| tvOS 15.0 | 13.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (2nd generation) (at 1080p) | +| tvOS 15.0 | 13.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | | tvOS 15.2 | 13.2.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | | tvOS 15.4 | 13.3.1<br>13.4<br>13.4.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | | tvOS 16.0 | 13.1<br>13.2.1<br>13.3.1<br>13.4<br>13.4.1<br>14.0.1<br>14.1<br>14.2 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | @@ -322,7 +324,7 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" | watchOS 8.0 | 13.1 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | | watchOS 8.3 | 13.2.1 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | | watchOS 8.5 | 13.3.1<br>13.4<br>13.4.1 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | -| watchOS 9.0 | 13.1<br>13.2.1<br>13.3.1<br>13.4<br>13.4.1<br>14.0.1<br>14.1<br>14.2 | Apple Watch SE - 40mm (2nd generation)<br>Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm<br>Apple Watch Series 8 - 41mm<br>Apple Watch Series 8 - 45mm<br>Apple Watch Ultra - 49mm | +| watchOS 9.0 | 13.1<br>13.2.1<br>13.3.1<br>13.4<br>13.4.1<br>14.0.1<br>14.1<br>14.2 | Apple Watch SE - 40mm (2nd generation)<br>Apple Watch SE - 44mm (2nd generation)<br>Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm<br>Apple Watch Series 8 - 41mm<br>Apple Watch Series 8 - 45mm<br>Apple Watch Ultra - 49mm | | watchOS 9.1 | 13.1<br>13.2.1<br>13.3.1<br>13.4<br>13.4.1<br>14.0.1<br>14.1<br>14.2 | Apple Watch SE - 40mm (2nd generation)<br>Apple Watch SE - 44mm (2nd generation)<br>Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm<br>Apple Watch Series 8 - 41mm<br>Apple Watch Series 8 - 45mm<br>Apple Watch Ultra - 49mm | ### Android From 2109acacd5478605be2590b6e5528dc6f4977a00 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Sun, 5 Feb 2023 16:08:22 +0300 Subject: [PATCH 1725/3485] Update the code for anka v3 compatibility (#7044) --- images.CI/macos/anka/Anka.Helpers.psm1 | 2 +- images/macos/templates/macOS-12.anka.pkr.hcl | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/images.CI/macos/anka/Anka.Helpers.psm1 b/images.CI/macos/anka/Anka.Helpers.psm1 index 7e57f36bd2ff..fff0c7045cae 100644 --- a/images.CI/macos/anka/Anka.Helpers.psm1 +++ b/images.CI/macos/anka/Anka.Helpers.psm1 @@ -16,7 +16,7 @@ function Push-AnkaTemplateToRegistry { # if registry uuid doesn't match than delete an image in registry $images = anka --machine-readable registry --registry-path $RegistryUrl list | ConvertFrom-Json | ForEach-Object body $images | Where-Object name -eq $TemplateName | ForEach-Object { - $id = $_.id + $id = $_.uuid Show-StringWithFormat "Deleting '$TemplateName[$id]' VM and '$TagName' tag" $uri = '{0}/registry/vm?id={1}' -f $RegistryUrl, $id Invoke-WebRequest -Uri $uri -Method Delete | Out-Null diff --git a/images/macos/templates/macOS-12.anka.pkr.hcl b/images/macos/templates/macOS-12.anka.pkr.hcl index fa2fb287849f..b92bd0642b9e 100644 --- a/images/macos/templates/macOS-12.anka.pkr.hcl +++ b/images/macos/templates/macOS-12.anka.pkr.hcl @@ -1,3 +1,12 @@ +packer { + required_plugins { + veertu-anka = { + version = "= v3.1.0" + source = "github.com/veertuinc/veertu-anka" + } + } +} + variable "source_vm_name" { type = string } From 8361bb299ba9290b70b6ed8bf337456714c6516d Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Sun, 5 Feb 2023 16:42:31 +0300 Subject: [PATCH 1726/3485] Update the code for anka v3 compatibility (#7045) --- images/macos/templates/macOS-11.anka.pkr.hcl | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/images/macos/templates/macOS-11.anka.pkr.hcl b/images/macos/templates/macOS-11.anka.pkr.hcl index 672dd8ee02b0..dcb0fd0bcfdc 100644 --- a/images/macos/templates/macOS-11.anka.pkr.hcl +++ b/images/macos/templates/macOS-11.anka.pkr.hcl @@ -1,3 +1,12 @@ +packer { + required_plugins { + veertu-anka = { + version = "= v3.1.0" + source = "github.com/veertuinc/veertu-anka" + } + } +} + variable "source_vm_name" { type = string } From 82829374095d36448efa805d5e14d71e2bda59f1 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Wed, 8 Feb 2023 18:27:46 +0300 Subject: [PATCH 1727/3485] [Windows] Reengineer the way of getting the installer for PostgreSQL (#7065) --- images/win/scripts/Installers/Install-PostgreSQL.ps1 | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/images/win/scripts/Installers/Install-PostgreSQL.ps1 b/images/win/scripts/Installers/Install-PostgreSQL.ps1 index 1563549106b0..38be7e00b9e7 100644 --- a/images/win/scripts/Installers/Install-PostgreSQL.ps1 +++ b/images/win/scripts/Installers/Install-PostgreSQL.ps1 @@ -28,16 +28,22 @@ $TargetMinorVersions = ($MinorVersions | Sort-Object)[-1] $ErrorActionOldValue = $ErrorActionPreference $ErrorActionPreference = 'SilentlyContinue' # Starting from number 9 and going down, check if the installer is available. If yes, break the loop. -foreach ($increment in 9..0) { +# If an installer with $TargetMinorVersions is not to be found, the $TargetMinorVersions will be decreased by 1 +$increment = 9 +do { $url = "https://get.enterprisedb.com/postgresql/postgresql-$toolsetVersion.$TargetMinorVersions-$increment-windows-x64.exe" $checkaccess = [System.Net.WebRequest]::Create($url) $response = $null $response = $checkaccess.GetResponse() if ($response) { $InstallerUrl = $response.ResponseUri.OriginalString - break + } elseif (!$response -and ($increment -eq 0)) { + $increment = 9 + $TargetMinorVersions-- + } else { + $increment-- } -} +} while (!$response) # Return the previous value of ErrorAction and invoke Install-Binary function $ErrorActionPreference = $ErrorActionOldValue $InstallerName = $InstallerUrl.Split('/')[-1] From 6341547de6465c455eda65f033cf93eee41bda85 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Wed, 8 Feb 2023 20:30:16 +0300 Subject: [PATCH 1728/3485] [macOS] prepare helpers for macOS 13 (#7071) --- images/macos/helpers/Common.Helpers.psm1 | 1 + images/macos/provision/utils/utils.sh | 12 +++++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/images/macos/helpers/Common.Helpers.psm1 b/images/macos/helpers/Common.Helpers.psm1 index 0dbe2383169c..3fa9d56fc3e1 100644 --- a/images/macos/helpers/Common.Helpers.psm1 +++ b/images/macos/helpers/Common.Helpers.psm1 @@ -34,6 +34,7 @@ function Get-OSVersion { IsCatalina = $osVersionMajorMinor -eq "10.15" IsBigSur = $osVersion.Version.Major -eq "11" IsMonterey = $osVersion.Version.Major -eq "12" + IsVentura = $osVersion.Version.Major -eq "13" IsLessThanMonterey = $osVersion.Version.Major -lt "12" IsHigherThanCatalina = $osVersion.Version.Major -ge "11" } diff --git a/images/macos/provision/utils/utils.sh b/images/macos/provision/utils/utils.sh index 737102e07814..b499b22fdf36 100755 --- a/images/macos/provision/utils/utils.sh +++ b/images/macos/provision/utils/utils.sh @@ -39,6 +39,14 @@ download_with_retries() { return 1 } +is_Ventura() { + if [ "$OSTYPE" = "darwin22" ]; then + true + else + false + fi +} + is_Monterey() { if [ "$OSTYPE" = "darwin21" ]; then true @@ -114,6 +122,8 @@ get_brew_os_keyword() { echo "big_sur" elif is_Monterey; then echo "monterey" + elif is_Ventura; then + echo "ventura" else echo "null" fi @@ -147,7 +157,7 @@ should_build_from_source() { # Use the '--build-from-source' option to build from source in this case brew_smart_install() { local tool_name=$1 - + local os_name=$(get_brew_os_keyword) if [[ "$os_name" == "null" ]]; then echo "$OSTYPE is unknown operating system" From f4f78af7ddbd8c7fe209784ae9eade22a6d2a9ff Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 9 Feb 2023 09:33:36 +0000 Subject: [PATCH 1729/3485] Updating readme file for macOS-11 version 20230205.1 (#7063) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-11-Readme.md | 80 +++++++++++++++++---------------- 1 file changed, 41 insertions(+), 39 deletions(-) diff --git a/images/macos/macos-11-Readme.md b/images/macos/macos-11-Readme.md index 4559d4594ba0..7971689b0042 100644 --- a/images/macos/macos-11-Readme.md +++ b/images/macos/macos-11-Readme.md @@ -7,50 +7,52 @@ # macOS 11 - OS Version: macOS 11.7.3 (20G1116) - Kernel Version: Darwin 20.6.0 -- Image Version: 20230125.1 +- Image Version: 20230205.1 ## Installed Software ### Language and Runtime -- .NET Core SDK: 3.1.101, 3.1.201, 3.1.302, 3.1.426, 5.0.102, 5.0.202, 5.0.302, 5.0.408, 6.0.405, 7.0.102 +- .NET Core SDK: 3.1.101, 3.1.201, 3.1.302, 3.1.426, 6.0.405, 7.0.102 - Bash 3.2.57(1)-release - Clang/LLVM 13.0.0 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` - GCC 9 (Homebrew GCC 9.5.0) - available by `gcc-9` alias - GCC 10 (Homebrew GCC 10.4.0) - available by `gcc-10` alias - GCC 11 (Homebrew GCC 11.3.0) - available by `gcc-11` alias +- GCC 12 (Homebrew GCC 12.2.0) - available by `gcc-12` alias - GNU Fortran 9 (Homebrew GCC 9.5.0) - available by `gfortran-9` alias - GNU Fortran 10 (Homebrew GCC 10.4.0) - available by `gfortran-10` alias - GNU Fortran 11 (Homebrew GCC 11.3.0) - available by `gfortran-11` alias +- GNU Fortran 12 (Homebrew GCC 12.2.0) - available by `gfortran-12` alias - Go 1.17.13 - Julia 1.8.5 -- Kotlin 1.8.0-release-345 +- Kotlin 1.8.10-release-430 - Mono 6.12.0.188 - MSBuild 16.10.1.51301 (Mono 6.12.0.188) - Node.js 16.19.0 - NVM 0.39.3 -- NVM - Cached node versions: 14.21.2, 16.19.0, 18.13.0 +- NVM - Cached node versions: 14.21.2, 16.19.0, 18.14.0 - Perl 5.36.0 -- PHP 8.2.1 +- PHP 8.2.2 - Python 2.7.18 - Python3 3.11.1 - R 4.2.2 - Ruby 2.7.7p221 ### Package Management -- Bundler 2.4.5 -- Carthage 0.38.0 +- Bundler 2.4.6 +- Carthage 0.39.0 - CocoaPods 1.11.3 -- Composer 2.5.1 +- Composer 2.5.2 - Homebrew 3.6.20 - Miniconda 22.11.1 - NPM 8.19.3 - NuGet 6.3.1.1 - Pip 20.3.4 (python 2.7) -- Pip3 22.3.1 (python 3.11) +- Pip3 23.0 (python 3.11) - Pipx 1.1.0 -- RubyGems 3.4.5 -- Vcpkg 2023 (build from commit d558a1b4a) +- RubyGems 3.4.6 +- Vcpkg 2023 (build from commit 0ba60bfef) - Yarn 1.22.19 #### Environment variables @@ -70,18 +72,18 @@ - aria2 1.36.0 - azcopy 10.17.0 - bazel 6.0.0 -- bazelisk 1.15.0 +- bazelisk 1.16.0 - bsdtar 3.3.2 - available by 'tar' alias - Curl 7.87.0 - Git 2.39.1 - Git LFS 3.3.0 -- GitHub CLI 2.21.2 +- GitHub CLI 2.22.1 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.3 - gpg (GnuPG) 2.4.0 - helm v3.11.0+g472c573 - Hub CLI 2.14.2 -- ImageMagick 7.1.0-58 +- ImageMagick 7.1.0-60 - jq 1.6 - mongo 5.0.14 - mongod 5.0.14 @@ -98,23 +100,23 @@ ### Tools - Aliyun CLI 3.0.141 -- App Center CLI 2.13.0 -- AWS CLI 2.9.17 -- AWS SAM CLI 1.71.0 +- App Center CLI 2.13.1 +- AWS CLI 2.9.21 +- AWS SAM CLI 1.72.0 - AWS Session Manager CLI 1.2.398.0 - Azure CLI 2.44.1 -- Azure CLI (azure-devops) 0.25.0 -- Bicep CLI 0.13.1 +- Azure CLI (azure-devops) 0.26.0 +- Bicep CLI 0.14.6 - Cabal 3.6.2.0 - Cmake 3.25.2 -- CodeQL Action Bundle 2.12.0 +- CodeQL Action Bundles 2.12.0 2.12.1 - Colima 0.5.2 - Fastlane 2.211.0 - GHC 9.4.4 - GHCup 0.1.19.0 - Jazzy 0.14.3 - Stack 2.9.1 -- SwiftFormat 0.50.7 +- SwiftFormat 0.50.8 - Swig 4.1.1 - Xcode Command Line Tools 13.2.0.0.1.1638488800 @@ -127,11 +129,11 @@ - SafariDriver 16.3 (16614.4.6.11.4) - Google Chrome 109.0.5414.119 - ChromeDriver 109.0.5414.74 -- Microsoft Edge 109.0.1518.61 -- Microsoft Edge WebDriver 109.0.1518.61 -- Mozilla Firefox 109.0 -- geckodriver 0.32.0 -- Selenium server 4.7.2 +- Microsoft Edge 109.0.1518.78 +- Microsoft Edge WebDriver 109.0.1518.78 +- Mozilla Firefox 109.0.1 +- geckodriver 0.32.1 +- Selenium server 4.8.0 #### Environment variables | Name | Value | @@ -178,7 +180,7 @@ #### Node.js - 14.21.2 - 16.19.0 -- 18.13.0 +- 18.14.0 #### Go - 1.17.13 @@ -186,17 +188,17 @@ - 1.19.5 ### Rust Tools -- Cargo 1.66.1 -- Rust 1.66.1 -- Rustdoc 1.66.1 -- Rustup 1.25.1 +- Cargo 1.67.0 +- Rust 1.67.0 +- Rustdoc 1.67.0 +- Rustup 1.25.2 #### Packages - Bindgen 0.63.0 - Cargo-audit 0.17.4 - Cargo-outdated 0.11.2 - Cbindgen 0.24.3 -- Clippy 0.1.66 +- Clippy 0.1.67 - Rustfmt 1.5.1-stable ### PowerShell Tools @@ -220,7 +222,7 @@ | Version | Build | Path | | -------------- | --------- | ------------------------------------ | | 2019 | 8.10.25.2 | /Applications/Visual Studio 2019.app | -| 2022 (default) | 17.4.3.21 | /Applications/Visual Studio.app | +| 2022 (default) | 17.4.4.12 | /Applications/Visual Studio.app | ##### Notes ``` @@ -336,7 +338,7 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" | Package Name | Version | | -------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 8.0 | -| Android Emulator | 31.3.14 | +| Android Emulator | 31.3.15 | | Android SDK Build-tools | 33.0.0 33.0.1<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | | Android SDK Platforms | android-33-ext4 (rev 1)<br>android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | | Android SDK Platform-Tools | 33.0.3 | @@ -344,17 +346,17 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" | CMake | 3.10.2<br>3.18.1<br>3.22.1 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 23.2.8568313<br>24.0.8215888<br>25.1.8937393 (default) | +| NDK | 23.2.8568313<br>24.0.8215888<br>25.2.9519653 (default) | | SDK Patch Applier v4 | 1 | #### Environment variables | Name | Value | | ----------------------- | -------------------------------------------------- | | ANDROID_HOME | /Users/runner/Library/Android/sdk | -| ANDROID_NDK | /Users/runner/Library/Android/sdk/ndk/25.1.8937393 | -| ANDROID_NDK_HOME | /Users/runner/Library/Android/sdk/ndk/25.1.8937393 | -| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/25.1.8937393 | -| ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk/25.1.8937393 | +| ANDROID_NDK | /Users/runner/Library/Android/sdk/ndk/25.2.9519653 | +| ANDROID_NDK_HOME | /Users/runner/Library/Android/sdk/ndk/25.2.9519653 | +| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/25.2.9519653 | +| ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk/25.2.9519653 | | ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | ### Miscellaneous From 072cca75ce151e04ee69f0ab0cabac049dde4b61 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 9 Feb 2023 12:08:09 +0000 Subject: [PATCH 1730/3485] Updating readme file for ubuntu22 version 20230206.1 (#7053) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2204-Readme.md | 78 +++++++++++++++---------------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/images/linux/Ubuntu2204-Readme.md b/images/linux/Ubuntu2204-Readme.md index 3d8a18f71f81..f52bdce29ba5 100644 --- a/images/linux/Ubuntu2204-Readme.md +++ b/images/linux/Ubuntu2204-Readme.md @@ -7,7 +7,7 @@ # Ubuntu 22.04 - OS Version: 22.04.1 LTS - Kernel Version: 5.15.0-1031-azure -- Image Version: 20230129.2 +- Image Version: 20230206.1 ## Installed Software @@ -20,7 +20,7 @@ - GNU C++: 9.5.0, 10.4.0, 11.3.0, 12.1.0 - GNU Fortran: 9.5.0, 10.4.0, 11.3.0, 12.1.0 - Julia 1.8.5 -- Kotlin 1.8.0-release-345 +- Kotlin 1.8.10-release-430 - Mono 6.12.0.182 - MSBuild 16.10.1.31701 (Mono 6.12.0.182) - Node.js 16.19.0 @@ -41,7 +41,7 @@ - Pip3 22.0.2 - Pipx 1.1.0 - RubyGems 3.3.5 -- Vcpkg (build from commit 91dd61bd4) +- Vcpkg (build from commit 185a7aa23) - Yarn 1.22.19 #### Environment variables @@ -62,19 +62,19 @@ to accomplish this. - Lerna 6.4.1 ### Tools -- Ansible 2.14.1 +- Ansible 2.14.2 - apt-fast 1.9.12 - AzCopy 10.17.0 - available by `azcopy` and `azcopy10` aliases - Bazel 6.0.0 - Bazelisk 1.13.2 -- Bicep 0.13.1 +- Bicep 0.14.6 - Buildah 1.23.1 - CMake 3.25.2 - CodeQL Action Bundles 2.12.0 2.12.1 - Docker Amazon ECR Credential Helper 0.6.0 - Docker Compose v1 1.29.2 - Docker Compose v2 2.15.1+azure-1 -- Docker-Buildx 0.10.0 +- Docker-Buildx 0.10.2 - Docker-Moby Client 20.10.22+azure-1 - Docker-Moby Server 20.10.22+azure-1 - Fastlane 2.211.0 @@ -86,7 +86,7 @@ to accomplish this. - jq 1.6 - Kind 0.17.0 - Kubectl 1.26.1 -- Kustomize 4.5.7 +- Kustomize 5.0.0 - Leiningen 2.10.0 - MediaInfo 21.09 - Mercurial 6.1.1 @@ -109,19 +109,19 @@ to accomplish this. - zstd 1.5.2 ### CLI Tools -- Alibaba Cloud CLI 3.0.144 -- AWS CLI 2.9.19 +- Alibaba Cloud CLI 3.0.145 +- AWS CLI 2.9.21 - AWS CLI Session Manager Plugin 1.2.398.0 -- AWS SAM CLI 1.71.0 +- AWS SAM CLI 1.72.0 - Azure CLI 2.44.1 - Azure CLI (azure-devops) 0.26.0 - GitHub CLI 2.22.1 -- Google Cloud SDK 415.0.0 +- Google Cloud SDK 416.0.0 - Hub CLI 2.14.2 - Netlify CLI 12.10.0 -- OpenShift CLI 4.12.0 +- OpenShift CLI 4.12.1 - ORAS CLI 0.16.0 -- Vercel CLI 28.14.0 +- Vercel CLI 28.15.1 ### Java | Version | Vendor | Environment Variable | @@ -137,7 +137,7 @@ to accomplish this. ### PHP Tools - PHP: 8.1.2 -- Composer 2.5.1 +- Composer 2.5.2 - PHPUnit 8.5.32 ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. @@ -153,7 +153,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Cargo 1.67.0 - Rust 1.67.0 - Rustdoc 1.67.0 -- Rustup 1.25.1 +- Rustup 1.25.2 #### Packages - Bindgen 0.63.0 @@ -167,11 +167,11 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Google Chrome 109.0.5414.119 - ChromeDriver 109.0.5414.74 - Chromium 109.0.5414.0 -- Microsoft Edge 109.0.1518.70 -- Microsoft Edge WebDriver 109.0.1518.70 +- Microsoft Edge 109.0.1518.78 +- Microsoft Edge WebDriver 109.0.1518.78 - Selenium server 4.8.0 - Mozilla Firefox 109.0.1 -- Geckodriver 0.32.0 +- Geckodriver 0.32.1 #### Environment variables | Name | Value | @@ -219,7 +219,7 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Node.js - 14.21.2 - 16.19.0 -- 18.13.0 +- 18.14.0 #### Python - 3.7.15 @@ -242,7 +242,7 @@ Use the following command as a part of your job to start the service: 'sudo syst #### PowerShell Modules - Az: 9.3.0 - MarkdownPS: 1.9 -- Microsoft.Graph: 1.20.0 +- Microsoft.Graph: 1.21.0 - Pester: 5.4.0 - PSScriptAnalyzer: 1.21.0 @@ -256,7 +256,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | Package Name | Version | | -------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 9.0 | -| Android Emulator | 31.3.14 | +| Android Emulator | 31.3.15 | | Android SDK Build-tools | 33.0.0 33.0.1<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | | Android SDK Platform-Tools | 33.0.3 | | Android SDK Platforms | android-33-ext4 (rev 1)<br>android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | @@ -265,17 +265,17 @@ Use the following command as a part of your job to start the service: 'sudo syst | CMake | 3.10.2<br>3.18.1<br>3.22.1 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 23.2.8568313<br>24.0.8215888<br>25.1.8937393 (default) | +| NDK | 23.2.8568313<br>24.0.8215888<br>25.2.9519653 (default) | | SDK Patch Applier v4 | 1 | #### Environment variables | Name | Value | | ----------------------- | ------------------------------------------- | | ANDROID_HOME | /usr/local/lib/android/sdk | -| ANDROID_NDK | /usr/local/lib/android/sdk/ndk/25.1.8937393 | -| ANDROID_NDK_HOME | /usr/local/lib/android/sdk/ndk/25.1.8937393 | -| ANDROID_NDK_LATEST_HOME | /usr/local/lib/android/sdk/ndk/25.1.8937393 | -| ANDROID_NDK_ROOT | /usr/local/lib/android/sdk/ndk/25.1.8937393 | +| ANDROID_NDK | /usr/local/lib/android/sdk/ndk/25.2.9519653 | +| ANDROID_NDK_HOME | /usr/local/lib/android/sdk/ndk/25.2.9519653 | +| ANDROID_NDK_LATEST_HOME | /usr/local/lib/android/sdk/ndk/25.2.9519653 | +| ANDROID_NDK_ROOT | /usr/local/lib/android/sdk/ndk/25.2.9519653 | | ANDROID_SDK_ROOT | /usr/local/lib/android/sdk | ### Cached Docker images @@ -284,20 +284,20 @@ Use the following command as a part of your job to start the service: 'sudo syst | alpine:3.14 | sha256:4c869a63e1b7c0722fed1e402a6466610327c3b83bdddb94bd94fb71da7f638a | 2022-08-09 | | alpine:3.15 | sha256:cf34c62ee8eb3fe8aa24c1fab45d7e9d12768d945c3f5a6fd6a63d901e898479 | 2022-08-09 | | alpine:3.16 | sha256:b95359c2505145f16c6aa384f9cc74eeff78eb36d308ca4fd902eeeb0a0b161b | 2022-11-12 | -| buildpack-deps:bullseye | sha256:c1a2475ac14e13582cf8a44fc071439132928ada47c57e80af372fdcd1690751 | 2023-01-11 | -| buildpack-deps:buster | sha256:c343da4a0b85a4d25ce30529e836a10d46cd4f682fb5326400e4ba274a2f9866 | 2023-01-11 | -| debian:10 | sha256:bb8c62f9f540a5f5f49f7ed5caae0e2889f999cd14553f2aaccaf1fa4fcb998d | 2023-01-11 | -| debian:11 | sha256:534da5794e770279c889daa891f46f5a530b0c5de8bfbc5e40394a0164d9fa87 | 2023-01-11 | +| buildpack-deps:bullseye | sha256:e4cd4f65bb933873e8ea1178d59981fbeb714ed97e962ff7f58324da1f8f06c9 | 2023-02-04 | +| buildpack-deps:buster | sha256:a67b72dfcd396cf840cc13dca1edcd8272c33fbfa0793f4f6e6fe658b54e98d5 | 2023-02-04 | +| debian:10 | sha256:c67afad7f1e94fe12868cd75bd5cf0c5bc9d0424f1516329aa76ec554b18ca57 | 2023-02-04 | +| debian:11 | sha256:92277f7108c432febe41beffd367dbb6dac60b9fbfe517c77208e6457eafe22b | 2023-02-04 | | moby/buildkit:latest | sha256:f092403997f04742b549811ca2402d88207afbf33656eb1cf34aa7fe8a8511ac | 2023-01-26 | -| node:14 | sha256:0c888dc647d36f5a895edb6b1b1c96ae81064455e0cdeee0792e14927604ca99 | 2023-01-11 | +| node:14 | sha256:eb709cd9ccbc70f194353d7f4227c52406a9dc6714d798666252d14e344422b2 | 2023-02-04 | | node:14-alpine | sha256:2c6a909495ef3761328c10945cbe84c06d079f7ca49dc24271e73be8cab85ad7 | 2023-01-09 | -| node:16 | sha256:27fab5920246070cf13449cf44c25bc4f5adef18ca7482b2bda90b7cf9e64481 | 2023-01-11 | +| node:16 | sha256:367b3b89399e6bd52746180c7b348c313015fc637d06a1f0e0ccb983fd52bfd1 | 2023-02-04 | | node:16-alpine | sha256:1298fd170c45954fec3d4d063437750f89802d72743816663664cfe9aa152b4b | 2023-01-09 | -| node:18 | sha256:d871edd5b68105ebcbfcde3fe8c79d24cbdbb30430d9bd6251c57c56c7bd7646 | 2023-01-11 | -| node:18-alpine | sha256:fda98168118e5a8f4269efca4101ee51dd5c75c0fe56d8eb6fad80455c2f5827 | 2023-01-09 | -| ubuntu:18.04 | sha256:c1d0baf2425ecef88a2f0c3543ec43690dc16cc80d3c4e593bb95e4f45390e45 | 2023-01-02 | -| ubuntu:20.04 | sha256:0e0402cd13f68137edb0266e1d2c682f217814420f2d43d300ed8f65479b14fb | 2022-12-09 | -| ubuntu:22.04 | sha256:27cb6e6ccef575a4698b66f5de06c7ecd61589132d5a91d098f7f3f9285415a9 | 2022-12-09 | +| node:18 | sha256:0d8bf0e743a752d8d01e9ff8aba21ac15a0ad1a3d2a2b8df90764d427618c791 | 2023-02-04 | +| node:18-alpine | sha256:bc329c7332cffc30c2d4801e38df03cbfa8dcbae2a7a52a449db104794f168a3 | 2023-02-03 | +| ubuntu:18.04 | sha256:a3765b4d74747b5e9bdd03205b3fbc4fa19a02781c185f97f24c8f4f84ed7bbf | 2023-01-26 | +| ubuntu:20.04 | sha256:4a45212e9518f35983a976eead0de5eecc555a2f047134e9dd2cfc589076a00d | 2023-02-01 | +| ubuntu:22.04 | sha256:9a0bdde4188b896a372804be2384015e90e3f84906b750c1a53539b585fbbe7f | 2023-01-26 | ### Installed apt packages | Name | Version | @@ -331,7 +331,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | libc++-dev | 1:14.0-55\~exp2 | | libc++abi-dev | 1:14.0-55\~exp2 | | libcurl4 | 7.81.0-1ubuntu1.7 | -| libgbm-dev | 22.0.5-0ubuntu0.3 | +| libgbm-dev | 22.2.5-0ubuntu0.1\~22.04.1 | | libgconf-2-4 | 3.2.6-7ubuntu2 | | libgsl-dev | 2.7.1+dfsg-3 | | libgtk-3-0 | 3.24.33-1ubuntu2 | @@ -382,7 +382,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | upx | 3.96-3 | | wget | 1.21.2-2ubuntu1 | | xorriso | 1.5.4-2 | -| xvfb | 2:21.1.3-2ubuntu2.5 | +| xvfb | 2:21.1.3-2ubuntu2.6 | | xz-utils | 5.2.5-2ubuntu1 | | zip | 3.0-12build2 | | zsync | 0.6.2-3ubuntu1 | From 4a42f07ad2b808b15da8222136632b434cefe328 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 9 Feb 2023 13:39:22 +0000 Subject: [PATCH 1731/3485] Updating readme file for ubuntu20 version 20230206.1 (#7054) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2004-Readme.md | 74 +++++++++++++++---------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/images/linux/Ubuntu2004-Readme.md b/images/linux/Ubuntu2004-Readme.md index 161b044e7cf7..d08137aadd48 100644 --- a/images/linux/Ubuntu2004-Readme.md +++ b/images/linux/Ubuntu2004-Readme.md @@ -7,7 +7,7 @@ # Ubuntu 20.04 - OS Version: 20.04.5 LTS - Kernel Version: 5.15.0-1031-azure -- Image Version: 20230129.2 +- Image Version: 20230206.1 ## Installed Software @@ -22,7 +22,7 @@ - GNU C++: 9.4.0, 10.3.0 - GNU Fortran: 9.4.0, 10.3.0 - Julia 1.8.5 -- Kotlin 1.8.0-release-345 +- Kotlin 1.8.10-release-430 - Mono 6.12.0.182 - MSBuild 16.10.1.31701 (Mono 6.12.0.182) - Node.js 16.19.0 @@ -43,7 +43,7 @@ - Pip3 20.0.2 - Pipx 1.1.0 - RubyGems 3.1.2 -- Vcpkg (build from commit 91dd61bd4) +- Vcpkg (build from commit 185a7aa23) - Yarn 1.22.19 #### Environment variables @@ -73,14 +73,14 @@ to accomplish this. - AzCopy 10.17.0 - available by `azcopy` and `azcopy10` aliases - Bazel 6.0.0 - Bazelisk 1.13.2 -- Bicep 0.13.1 +- Bicep 0.14.6 - Buildah 1.22.3 - CMake 3.25.2 - CodeQL Action Bundles 2.12.0 2.12.1 - Docker Amazon ECR Credential Helper 0.6.0 - Docker Compose v1 1.29.2 - Docker Compose v2 2.15.1+azure-1 -- Docker-Buildx 0.10.0 +- Docker-Buildx 0.10.2 - Docker-Moby Client 20.10.22+azure-1 - Docker-Moby Server 20.10.22+azure-1 - Fastlane 2.211.0 @@ -93,7 +93,7 @@ to accomplish this. - jq 1.6 - Kind 0.17.0 - Kubectl 1.26.1 -- Kustomize 4.5.7 +- Kustomize 5.0.0 - Leiningen 2.10.0 - MediaInfo 19.09 - Mercurial 5.3.1 @@ -117,19 +117,19 @@ to accomplish this. - zstd 1.5.2 ### CLI Tools -- Alibaba Cloud CLI 3.0.144 -- AWS CLI 2.9.19 +- Alibaba Cloud CLI 3.0.145 +- AWS CLI 2.9.21 - AWS CLI Session Manager Plugin 1.2.398.0 -- AWS SAM CLI 1.71.0 +- AWS SAM CLI 1.72.0 - Azure CLI 2.44.1 - Azure CLI (azure-devops) 0.26.0 - GitHub CLI 2.22.1 -- Google Cloud SDK 415.0.0 +- Google Cloud SDK 416.0.0 - Hub CLI 2.14.2 - Netlify CLI 12.10.0 -- OpenShift CLI 4.12.0 +- OpenShift CLI 4.12.1 - ORAS CLI 0.16.0 -- Vercel CLI 28.14.0 +- Vercel CLI 28.15.1 ### Java | Version | Vendor | Environment Variable | @@ -144,8 +144,8 @@ to accomplish this. | CE 22.3.1 | GRAALVM_11_ROOT | ### PHP Tools -- PHP: 7.4.33, 8.0.27, 8.1.14, 8.2.1 -- Composer 2.5.1 +- PHP: 7.4.33, 8.0.27, 8.1.14, 8.2.2 +- Composer 2.5.2 - PHPUnit 8.5.32 ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. @@ -161,7 +161,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Cargo 1.67.0 - Rust 1.67.0 - Rustdoc 1.67.0 -- Rustup 1.25.1 +- Rustup 1.25.2 #### Packages - Bindgen 0.63.0 @@ -175,11 +175,11 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Google Chrome 109.0.5414.119 - ChromeDriver 109.0.5414.74 - Chromium 109.0.5414.0 -- Microsoft Edge 109.0.1518.70 -- Microsoft Edge WebDriver 109.0.1518.70 +- Microsoft Edge 109.0.1518.78 +- Microsoft Edge WebDriver 109.0.1518.78 - Selenium server 4.8.0 - Mozilla Firefox 109.0.1 -- Geckodriver 0.32.0 +- Geckodriver 0.32.1 #### Environment variables | Name | Value | @@ -190,7 +190,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | ### .NET Tools -- .NET Core SDK: 3.1.120, 3.1.202, 3.1.302, 3.1.426, 5.0.104, 5.0.214, 5.0.303, 5.0.408, 6.0.405, 7.0.102 +- .NET Core SDK: 3.1.120, 3.1.202, 3.1.302, 3.1.426, 6.0.405, 7.0.102 - nbgv 3.5.119+5d25f54fec ### Databases @@ -228,7 +228,7 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Node.js - 14.21.2 - 16.19.0 -- 18.13.0 +- 18.14.0 #### Python - 2.7.18 @@ -260,7 +260,7 @@ Use the following command as a part of your job to start the service: 'sudo syst - Az: 9.3.0 - Az (Cached): 3.1.0.zip, 4.4.0.zip, 5.9.0.zip, 6.6.0.zip, 7.5.0.zip - MarkdownPS: 1.9 -- Microsoft.Graph: 1.20.0 +- Microsoft.Graph: 1.21.0 - Pester: 5.4.0 - PSScriptAnalyzer: 1.21.0 @@ -275,7 +275,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | Package Name | Version | | -------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 9.0 | -| Android Emulator | 31.3.14 | +| Android Emulator | 31.3.15 | | Android SDK Build-tools | 33.0.0 33.0.1<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | | Android SDK Platform-Tools | 33.0.3 | | Android SDK Platforms | android-33-ext4 (rev 1)<br>android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | @@ -284,17 +284,17 @@ Use the following command as a part of your job to start the service: 'sudo syst | CMake | 3.10.2<br>3.18.1<br>3.22.1 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 23.2.8568313<br>24.0.8215888<br>25.1.8937393 (default) | +| NDK | 23.2.8568313<br>24.0.8215888<br>25.2.9519653 (default) | | SDK Patch Applier v4 | 1 | #### Environment variables | Name | Value | | ----------------------- | ------------------------------------------- | | ANDROID_HOME | /usr/local/lib/android/sdk | -| ANDROID_NDK | /usr/local/lib/android/sdk/ndk/25.1.8937393 | -| ANDROID_NDK_HOME | /usr/local/lib/android/sdk/ndk/25.1.8937393 | -| ANDROID_NDK_LATEST_HOME | /usr/local/lib/android/sdk/ndk/25.1.8937393 | -| ANDROID_NDK_ROOT | /usr/local/lib/android/sdk/ndk/25.1.8937393 | +| ANDROID_NDK | /usr/local/lib/android/sdk/ndk/25.2.9519653 | +| ANDROID_NDK_HOME | /usr/local/lib/android/sdk/ndk/25.2.9519653 | +| ANDROID_NDK_LATEST_HOME | /usr/local/lib/android/sdk/ndk/25.2.9519653 | +| ANDROID_NDK_ROOT | /usr/local/lib/android/sdk/ndk/25.2.9519653 | | ANDROID_SDK_ROOT | /usr/local/lib/android/sdk | ### Cached Docker images @@ -303,22 +303,22 @@ Use the following command as a part of your job to start the service: 'sudo syst | alpine:3.14 | sha256:4c869a63e1b7c0722fed1e402a6466610327c3b83bdddb94bd94fb71da7f638a | 2022-08-09 | | alpine:3.15 | sha256:cf34c62ee8eb3fe8aa24c1fab45d7e9d12768d945c3f5a6fd6a63d901e898479 | 2022-08-09 | | alpine:3.16 | sha256:b95359c2505145f16c6aa384f9cc74eeff78eb36d308ca4fd902eeeb0a0b161b | 2022-11-12 | -| buildpack-deps:bullseye | sha256:c1a2475ac14e13582cf8a44fc071439132928ada47c57e80af372fdcd1690751 | 2023-01-11 | -| buildpack-deps:buster | sha256:c343da4a0b85a4d25ce30529e836a10d46cd4f682fb5326400e4ba274a2f9866 | 2023-01-11 | +| buildpack-deps:bullseye | sha256:e4cd4f65bb933873e8ea1178d59981fbeb714ed97e962ff7f58324da1f8f06c9 | 2023-02-04 | +| buildpack-deps:buster | sha256:a67b72dfcd396cf840cc13dca1edcd8272c33fbfa0793f4f6e6fe658b54e98d5 | 2023-02-04 | | buildpack-deps:stretch | sha256:78e995165a5788c2f55aed6e548d8f6c1534830d4310c870408fccb2da8c5b2e | 2022-06-23 | -| debian:10 | sha256:bb8c62f9f540a5f5f49f7ed5caae0e2889f999cd14553f2aaccaf1fa4fcb998d | 2023-01-11 | -| debian:11 | sha256:534da5794e770279c889daa891f46f5a530b0c5de8bfbc5e40394a0164d9fa87 | 2023-01-11 | +| debian:10 | sha256:c67afad7f1e94fe12868cd75bd5cf0c5bc9d0424f1516329aa76ec554b18ca57 | 2023-02-04 | +| debian:11 | sha256:92277f7108c432febe41beffd367dbb6dac60b9fbfe517c77208e6457eafe22b | 2023-02-04 | | debian:9 | sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be | 2022-06-23 | | moby/buildkit:latest | sha256:f092403997f04742b549811ca2402d88207afbf33656eb1cf34aa7fe8a8511ac | 2023-01-26 | -| node:14 | sha256:0c888dc647d36f5a895edb6b1b1c96ae81064455e0cdeee0792e14927604ca99 | 2023-01-11 | +| node:14 | sha256:eb709cd9ccbc70f194353d7f4227c52406a9dc6714d798666252d14e344422b2 | 2023-02-04 | | node:14-alpine | sha256:2c6a909495ef3761328c10945cbe84c06d079f7ca49dc24271e73be8cab85ad7 | 2023-01-09 | -| node:16 | sha256:27fab5920246070cf13449cf44c25bc4f5adef18ca7482b2bda90b7cf9e64481 | 2023-01-11 | +| node:16 | sha256:367b3b89399e6bd52746180c7b348c313015fc637d06a1f0e0ccb983fd52bfd1 | 2023-02-04 | | node:16-alpine | sha256:1298fd170c45954fec3d4d063437750f89802d72743816663664cfe9aa152b4b | 2023-01-09 | -| node:18 | sha256:d871edd5b68105ebcbfcde3fe8c79d24cbdbb30430d9bd6251c57c56c7bd7646 | 2023-01-11 | -| node:18-alpine | sha256:fda98168118e5a8f4269efca4101ee51dd5c75c0fe56d8eb6fad80455c2f5827 | 2023-01-09 | +| node:18 | sha256:0d8bf0e743a752d8d01e9ff8aba21ac15a0ad1a3d2a2b8df90764d427618c791 | 2023-02-04 | +| node:18-alpine | sha256:bc329c7332cffc30c2d4801e38df03cbfa8dcbae2a7a52a449db104794f168a3 | 2023-02-03 | | ubuntu:16.04 | sha256:1f1a2d56de1d604801a9671f301190704c25d604a416f59e03c04f5c6ffee0d6 | 2021-08-31 | -| ubuntu:18.04 | sha256:c1d0baf2425ecef88a2f0c3543ec43690dc16cc80d3c4e593bb95e4f45390e45 | 2023-01-02 | -| ubuntu:20.04 | sha256:0e0402cd13f68137edb0266e1d2c682f217814420f2d43d300ed8f65479b14fb | 2022-12-09 | +| ubuntu:18.04 | sha256:a3765b4d74747b5e9bdd03205b3fbc4fa19a02781c185f97f24c8f4f84ed7bbf | 2023-01-26 | +| ubuntu:20.04 | sha256:4a45212e9518f35983a976eead0de5eecc555a2f047134e9dd2cfc589076a00d | 2023-02-01 | ### Installed apt packages | Name | Version | From 1d6be38cc872e520bac89375996fe557c0fcf3b5 Mon Sep 17 00:00:00 2001 From: Dusko Dobranic <101048884+ddobranic@users.noreply.github.com> Date: Thu, 9 Feb 2023 14:42:08 +0100 Subject: [PATCH 1732/3485] [Ubuntu] Fix libssl version (#7073) --- images/linux/scripts/installers/sqlpackage.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/linux/scripts/installers/sqlpackage.sh b/images/linux/scripts/installers/sqlpackage.sh index d1f3572521af..bbebb58b1efd 100644 --- a/images/linux/scripts/installers/sqlpackage.sh +++ b/images/linux/scripts/installers/sqlpackage.sh @@ -10,8 +10,8 @@ source $HELPER_SCRIPTS/os.sh # Install libssl1.1 dependency if isUbuntu22; then - download_with_retries "http://security.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.1f-1ubuntu2.16_amd64.deb" "/tmp" - dpkg -i /tmp/libssl1.1_1.1.1f-1ubuntu2.16_amd64.deb + download_with_retries "http://security.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.1f-1ubuntu2.17_amd64.deb" "/tmp" + dpkg -i /tmp/libssl1.1_1.1.1f-1ubuntu2.17_amd64.deb fi # Install SqlPackage From 9b3288dc18231b966ec71a32cdf1cf59d41ff412 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 9 Feb 2023 16:42:28 +0000 Subject: [PATCH 1733/3485] Updating readme file for win22 version 20230206.1 (#7056) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2022-Readme.md | 62 ++++++++++++++++---------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/images/win/Windows2022-Readme.md b/images/win/Windows2022-Readme.md index 32d2a92a5516..6ed1707ea16f 100644 --- a/images/win/Windows2022-Readme.md +++ b/images/win/Windows2022-Readme.md @@ -5,7 +5,7 @@ *** # Windows Server 2022 - OS Version: 10.0.20348 Build 1487 -- Image Version: 20230129.1 +- Image Version: 20230206.1 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -16,25 +16,25 @@ - Bash 5.2.12(1)-release - Go 1.17.13 - Julia 1.8.5 -- Kotlin 1.8.0 +- Kotlin 1.8.10 - LLVM 15.0.5 - Node 16.19.0 - Perl 5.32.1 -- PHP 8.2.1 +- PHP 8.2.2 - Python 3.9.13 - Ruby 3.0.5p211 ### Package Management - Chocolatey 1.2.1 -- Composer 2.5.1 +- Composer 2.5.2 - Helm 3.11.0 - Miniconda 22.11.1 (pre-installed on the image but not added to PATH) - NPM 8.19.3 - NuGet 6.4.0.123 -- pip 22.3.1 (python 3.9) +- pip 23.0 (python 3.9) - Pipx 1.1.0 - RubyGems 3.2.33 -- Vcpkg (build from commit 91dd61bd4) +- Vcpkg (build from commit 185a7aa23) - Yarn 1.22.19 #### Environment variables @@ -46,7 +46,7 @@ ### Project Management - Ant 1.10.13 - Gradle 7.6 -- Maven 3.8.7 +- Maven 3.9.0 - sbt 1.8.2 ### Tools @@ -55,18 +55,18 @@ - azcopy 10.17.0 - Bazel 6.0.0 - Bazelisk 1.13.2 -- Bicep 0.13.1 +- Bicep 0.14.6 - Cabal 3.8.1.0 - CMake 3.25.2 -- CodeQL Action Bundle 2.12.0 2.12.1 -- Docker 20.10.23 +- CodeQL Action Bundles 2.12.0 2.12.1 +- Docker 23.0.0 - Docker Compose v1 1.29.2 - Docker Compose v2 2.15.1 - Docker-wincred 0.7.0 - ghc 9.4.4 - Git 2.39.1.windows.1 - Git LFS 3.3.0 -- ImageMagick 7.1.0-59 +- ImageMagick 7.1.0-60 - InnoSetup 6.2.1 - jq 1.6 - Kind 0.17.0 @@ -90,9 +90,9 @@ - zstd 1.5.2 ### CLI Tools -- Alibaba Cloud CLI 3.0.144 -- AWS CLI 2.9.18 -- AWS SAM CLI 1.71.0 +- Alibaba Cloud CLI 3.0.145 +- AWS CLI 2.9.21 +- AWS SAM CLI 1.72.0 - AWS Session Manager CLI 1.2.398.0 - Azure CLI 2.44.1 - Azure DevOps CLI extension 0.26.0 @@ -103,7 +103,7 @@ - Cargo 1.67.0 - Rust 1.67.0 - Rustdoc 1.67.0 -- Rustup 1.25.1 +- Rustup 1.25.2 #### Packages - bindgen 0.63.0 @@ -116,10 +116,10 @@ ### Browsers and Drivers - Google Chrome 109.0.5414.120 - Chrome Driver 109.0.5414.74 -- Microsoft Edge 109.0.1518.70 -- Microsoft Edge Driver 109.0.1518.70 -- Mozilla Firefox 109.0 -- Gecko Driver 0.32.0 +- Microsoft Edge 109.0.1518.78 +- Microsoft Edge Driver 109.0.1518.78 +- Mozilla Firefox 109.0.1 +- Gecko Driver 0.32.1 - IE Driver 4.8.0.0 - Selenium server 4.8.0 @@ -165,7 +165,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Node.js - 14.21.2 - 16.19.0 -- 18.13.0 +- 18.14.0 #### Python - 3.7.9 @@ -527,11 +527,11 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 10.0.22621.0 ### .NET Core Tools -- .NET Core SDK: 3.1.120, 3.1.202, 3.1.302, 3.1.426, 5.0.104, 5.0.214, 5.0.303, 5.0.408, 6.0.113, 6.0.203, 6.0.308, 6.0.405, 7.0.102 +- .NET Core SDK: 3.1.120, 3.1.202, 3.1.302, 3.1.426, 6.0.113, 6.0.203, 6.0.308, 6.0.405, 7.0.102 - .NET Framework: 4.8, 4.8.1 -- Microsoft.AspNetCore.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 5.0.4, 5.0.9, 5.0.17, 6.0.5, 6.0.13, 7.0.2 -- Microsoft.NETCore.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 5.0.4, 5.0.9, 5.0.17, 6.0.5, 6.0.13, 7.0.2 -- Microsoft.WindowsDesktop.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 5.0.4, 5.0.9, 5.0.17, 6.0.5, 6.0.13, 7.0.2 +- Microsoft.AspNetCore.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 6.0.5, 6.0.13, 7.0.2 +- Microsoft.NETCore.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 6.0.5, 6.0.13, 7.0.2 +- Microsoft.WindowsDesktop.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 6.0.5, 6.0.13, 7.0.2 - nbgv 3.5.119+5d25f54fec ### PowerShell Tools @@ -544,10 +544,10 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Az (Cached): 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.259 +- AWSPowershell: 4.1.264 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 -- Microsoft.Graph: 1.20.0 +- Microsoft.Graph: 1.21.0 - Pester: 3.4.0, 5.4.0 - PowerShellGet: 1.0.0.1, 2.2.5 - PSScriptAnalyzer: 1.21.0 @@ -572,17 +572,17 @@ All other versions are saved but not installed. | CMake | 3.18.1<br>3.22.1 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 23.2.8568313<br>24.0.8215888<br>25.1.8937393 | +| NDK | 23.2.8568313<br>24.0.8215888<br>25.2.9519653 | | SDK Patch Applier v4 | 1 | #### Environment variables | Name | Value | | ----------------------- | --------------------------------------- | | ANDROID_HOME | C:\Android\android-sdk | -| ANDROID_NDK | C:\Android\android-sdk\ndk\25.1.8937393 | -| ANDROID_NDK_HOME | C:\Android\android-sdk\ndk\25.1.8937393 | -| ANDROID_NDK_LATEST_HOME | C:\Android\android-sdk\ndk\25.1.8937393 | -| ANDROID_NDK_ROOT | C:\Android\android-sdk\ndk\25.1.8937393 | +| ANDROID_NDK | C:\Android\android-sdk\ndk\25.2.9519653 | +| ANDROID_NDK_HOME | C:\Android\android-sdk\ndk\25.2.9519653 | +| ANDROID_NDK_LATEST_HOME | C:\Android\android-sdk\ndk\25.2.9519653 | +| ANDROID_NDK_ROOT | C:\Android\android-sdk\ndk\25.2.9519653 | | ANDROID_SDK_ROOT | C:\Android\android-sdk | ### Cached Docker images From 3f07514a44d4b4e1a594f5e4ca62d1f3d8b682ed Mon Sep 17 00:00:00 2001 From: Julian Ospald <hasufell@posteo.de> Date: Thu, 9 Feb 2023 20:46:40 +0000 Subject: [PATCH 1734/3485] Don't clean up haddock and profiling libs on Linux (#6972) This was initially meant to save space in docker containers, but breaks several use cases and runner images shouldn't have space constraints. Also fixes: https://github.com/haskell/actions/issues/176 --- images/linux/scripts/installers/haskell.sh | 7 ------- 1 file changed, 7 deletions(-) diff --git a/images/linux/scripts/installers/haskell.sh b/images/linux/scripts/installers/haskell.sh index 36d4938437af..4d0acaf90799 100644 --- a/images/linux/scripts/installers/haskell.sh +++ b/images/linux/scripts/installers/haskell.sh @@ -30,13 +30,6 @@ for majorMinorVersion in $minorMajorVersions; do echo "install ghc version $fullVersion..." ghcup install ghc $fullVersion ghcup set ghc $fullVersion - - # remove docs and profiling libs - ghc_dir="$(ghcup whereis basedir)/ghc/$fullVersion" - [ -e "${ghc_dir}" ] || exit 1 - find "${ghc_dir}" \( -name "*_p.a" -o -name "*.p_hi" \) -type f -delete - rm -r "${ghc_dir}"/share/* - unset ghc_bin_dir ghc_dir done echo "install cabal..." From c92736d124bc8a10c6633a516c62f3391823db94 Mon Sep 17 00:00:00 2001 From: Julian Ospald <hasufell@posteo.de> Date: Thu, 9 Feb 2023 20:47:25 +0000 Subject: [PATCH 1735/3485] Don't clean up haddock and profiling libs on MacOS (#7069) This was initially meant to save space in docker containers, but breaks several use cases and runner images shouldn't have space constraints. --- images/macos/provision/core/haskell.sh | 7 ------- 1 file changed, 7 deletions(-) diff --git a/images/macos/provision/core/haskell.sh b/images/macos/provision/core/haskell.sh index feac3c3eddaa..342c5f6ec69e 100644 --- a/images/macos/provision/core/haskell.sh +++ b/images/macos/provision/core/haskell.sh @@ -14,13 +14,6 @@ for majorMinorVersion in $minorMajorVersions; do echo "install ghc version $fullVersion..." ghcup install $fullVersion ghcup set $fullVersion - - # remove docs and profiling libs - ghc_dir="$(ghcup whereis basedir)/ghc/$fullVersion" - [ -e "${ghc_dir}" ] || exit 1 - find "${ghc_dir}" \( -name "*_p.a" -o -name "*.p_hi" \) -type f -delete - rm -r "${ghc_dir}"/share/* - unset ghc_bin_dir ghc_dir done echo "install cabal..." From 5f3fb1b548f9af43e6bd8cc28b0777f768a945bc Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 9 Feb 2023 22:17:30 +0000 Subject: [PATCH 1736/3485] Updating readme file for win19 version 20230205.1 (#7057) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2019-Readme.md | 62 ++++++++++++++++---------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index b90bd1dbc199..10534feae641 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -5,7 +5,7 @@ *** # Windows Server 2019 - OS Version: 10.0.17763 Build 3887 -- Image Version: 20230129.2 +- Image Version: 20230205.1 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -16,25 +16,25 @@ - Bash 5.2.12(1)-release - Go 1.17.13 - Julia 1.8.5 -- Kotlin 1.8.0 +- Kotlin 1.8.10 - LLVM 15.0.5 - Node 16.19.0 - Perl 5.32.1 -- PHP 8.2.1 +- PHP 8.2.2 - Python 3.7.9 - Ruby 2.5.9p229 ### Package Management - Chocolatey 1.2.1 -- Composer 2.5.1 +- Composer 2.5.2 - Helm 3.11.0 - Miniconda 22.11.1 (pre-installed on the image but not added to PATH) - NPM 8.19.3 - NuGet 6.4.0.123 -- pip 22.3.1 (python 3.7) +- pip 23.0 (python 3.7) - Pipx 1.1.0 - RubyGems 2.7.6.3 -- Vcpkg (build from commit 91dd61bd4) +- Vcpkg (build from commit 0ba60bfef) - Yarn 1.22.19 #### Environment variables @@ -55,19 +55,19 @@ - azcopy 10.17.0 - Bazel 6.0.0 - Bazelisk 1.13.2 -- Bicep 0.13.1 +- Bicep 0.14.6 - Cabal 3.8.1.0 - CMake 3.25.2 -- CodeQL Action Bundle 2.12.0 2.12.1 -- Docker 20.10.23 +- CodeQL Action Bundles 2.12.0 2.12.1 +- Docker 23.0.0 - Docker Compose v1 1.29.2 - Docker Compose v2 2.15.1 - Docker-wincred 0.7.0 - ghc 9.4.4 - Git 2.39.1.windows.1 - Git LFS 3.3.0 -- Google Cloud SDK 415.0.0 -- ImageMagick 7.1.0-59 +- Google Cloud SDK 416.0.0 +- ImageMagick 7.1.0-60 - InnoSetup 6.2.1 - jq 1.6 - Kind 0.17.0 @@ -92,9 +92,9 @@ - zstd 1.5.2 ### CLI Tools -- Alibaba Cloud CLI 3.0.144 -- AWS CLI 2.9.18 -- AWS SAM CLI 1.71.0 +- Alibaba Cloud CLI 3.0.145 +- AWS CLI 2.9.20 +- AWS SAM CLI 1.72.0 - AWS Session Manager CLI 1.2.398.0 - Azure CLI 2.44.1 - Azure DevOps CLI extension 0.26.0 @@ -106,7 +106,7 @@ - Cargo 1.67.0 - Rust 1.67.0 - Rustdoc 1.67.0 -- Rustup 1.25.1 +- Rustup 1.25.2 #### Packages - bindgen 0.63.0 @@ -119,10 +119,10 @@ ### Browsers and Drivers - Google Chrome 109.0.5414.120 - Chrome Driver 109.0.5414.74 -- Microsoft Edge 109.0.1518.70 -- Microsoft Edge Driver 109.0.1518.70 -- Mozilla Firefox 109.0 -- Gecko Driver 0.32.0 +- Microsoft Edge 109.0.1518.78 +- Microsoft Edge Driver 109.0.1518.78 +- Mozilla Firefox 109.0.1 +- Gecko Driver 0.32.1 - IE Driver 4.8.0.0 - Selenium server 4.8.0 @@ -172,7 +172,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Node.js - 14.21.2 - 16.19.0 -- 18.13.0 +- 18.14.0 #### Python - 2.7.18 @@ -496,11 +496,11 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 10.0.22621.0 ### .NET Core Tools -- .NET Core SDK: 3.1.120, 3.1.202, 3.1.302, 3.1.426, 5.0.104, 5.0.214, 5.0.303, 5.0.408, 6.0.113, 6.0.203, 6.0.308, 6.0.405 +- .NET Core SDK: 3.1.120, 3.1.202, 3.1.302, 3.1.426, 6.0.113, 6.0.203, 6.0.308, 6.0.405 - .NET Framework: 4.7.2, 4.8 -- Microsoft.AspNetCore.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 5.0.4, 5.0.9, 5.0.17, 6.0.5, 6.0.13 -- Microsoft.NETCore.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 5.0.4, 5.0.9, 5.0.17, 6.0.5, 6.0.13 -- Microsoft.WindowsDesktop.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 5.0.4, 5.0.9, 5.0.17, 6.0.5, 6.0.13 +- Microsoft.AspNetCore.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 6.0.5, 6.0.13 +- Microsoft.NETCore.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 6.0.5, 6.0.13 +- Microsoft.WindowsDesktop.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 6.0.5, 6.0.13 - nbgv 3.5.119+5d25f54fec ### PowerShell Tools @@ -513,10 +513,10 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Az (Cached): 1.0.0.zip, 1.6.0.zip, 2.3.2.zip, 2.6.0.zip, 3.1.0.zip, 3.5.0.zip, 3.8.0.zip, 4.3.0.zip, 4.4.0.zip, 4.7.0.zip, 5.5.0.zip, 5.9.0.zip, 6.6.0.zip, 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.259 +- AWSPowershell: 4.1.264 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 -- Microsoft.Graph: 1.20.0 +- Microsoft.Graph: 1.21.0 - Pester: 3.4.0, 5.4.0 - PowerShellGet: 1.0.0.1, 2.2.5 - PSScriptAnalyzer: 1.21.0 @@ -542,17 +542,17 @@ All other versions are saved but not installed. | Google APIs | addon-google_apis-google-21<br>addon-google_apis-google-22<br>addon-google_apis-google-23<br>addon-google_apis-google-24 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 23.2.8568313<br>24.0.8215888<br>25.1.8937393 | +| NDK | 23.2.8568313<br>24.0.8215888<br>25.2.9519653 | | SDK Patch Applier v4 | 1 | #### Environment variables | Name | Value | | ----------------------- | --------------------------------------- | | ANDROID_HOME | C:\Android\android-sdk | -| ANDROID_NDK | C:\Android\android-sdk\ndk\25.1.8937393 | -| ANDROID_NDK_HOME | C:\Android\android-sdk\ndk\25.1.8937393 | -| ANDROID_NDK_LATEST_HOME | C:\Android\android-sdk\ndk\25.1.8937393 | -| ANDROID_NDK_ROOT | C:\Android\android-sdk\ndk\25.1.8937393 | +| ANDROID_NDK | C:\Android\android-sdk\ndk\25.2.9519653 | +| ANDROID_NDK_HOME | C:\Android\android-sdk\ndk\25.2.9519653 | +| ANDROID_NDK_LATEST_HOME | C:\Android\android-sdk\ndk\25.2.9519653 | +| ANDROID_NDK_ROOT | C:\Android\android-sdk\ndk\25.2.9519653 | | ANDROID_SDK_ROOT | C:\Android\android-sdk | ### Cached Docker images From feb6252fae2b21c63a3c71faf07c984a32128eb1 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Sat, 11 Feb 2023 13:25:07 +0300 Subject: [PATCH 1737/3485] [macOS] Update templates to fix issue with node 19 (#7081) --- images/macos/provision/core/node.sh | 2 +- images/macos/templates/macOS-11.anka.pkr.hcl | 2 +- images/macos/templates/macOS-11.json | 2 +- images/macos/templates/macOS-12.anka.pkr.hcl | 2 +- images/macos/templates/macOS-12.json | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/images/macos/provision/core/node.sh b/images/macos/provision/core/node.sh index f98113fc0042..ae6145861a31 100644 --- a/images/macos/provision/core/node.sh +++ b/images/macos/provision/core/node.sh @@ -5,7 +5,7 @@ defaultVersion=$(get_toolset_value '.node.default') echo "Installing Node.js $defaultVersion" brew_smart_install "node@$defaultVersion" -brew link node@$defaultVersion --force +brew link node@$defaultVersion --force --overwrite echo Installing yarn... curl -o- -L https://yarnpkg.com/install.sh | bash diff --git a/images/macos/templates/macOS-11.anka.pkr.hcl b/images/macos/templates/macOS-11.anka.pkr.hcl index dcb0fd0bcfdc..444df522fc78 100644 --- a/images/macos/templates/macOS-11.anka.pkr.hcl +++ b/images/macos/templates/macOS-11.anka.pkr.hcl @@ -172,6 +172,7 @@ build { "./provision/core/ruby.sh", "./provision/core/rubygem.sh", "./provision/core/git.sh", + "./provision/core/mongodb.sh", "./provision/core/node.sh", "./provision/core/commonutils.sh", ] @@ -214,7 +215,6 @@ build { "./provision/core/apache.sh", "./provision/core/nginx.sh", "./provision/core/postgresql.sh", - "./provision/core/mongodb.sh", "./provision/core/audiodevice.sh", "./provision/core/vcpkg.sh", "./provision/core/miniconda.sh", diff --git a/images/macos/templates/macOS-11.json b/images/macos/templates/macOS-11.json index 164db86262db..510391438ffb 100644 --- a/images/macos/templates/macOS-11.json +++ b/images/macos/templates/macOS-11.json @@ -157,6 +157,7 @@ "./provision/core/ruby.sh", "./provision/core/rubygem.sh", "./provision/core/git.sh", + "./provision/core/mongodb.sh", "./provision/core/node.sh" ], "environment_vars": [ @@ -201,7 +202,6 @@ "./provision/core/apache.sh", "./provision/core/nginx.sh", "./provision/core/postgresql.sh", - "./provision/core/mongodb.sh", "./provision/core/audiodevice.sh", "./provision/core/vcpkg.sh", "./provision/core/miniconda.sh", diff --git a/images/macos/templates/macOS-12.anka.pkr.hcl b/images/macos/templates/macOS-12.anka.pkr.hcl index b92bd0642b9e..06bfe81a4709 100644 --- a/images/macos/templates/macOS-12.anka.pkr.hcl +++ b/images/macos/templates/macOS-12.anka.pkr.hcl @@ -173,6 +173,7 @@ build { "./provision/core/ruby.sh", "./provision/core/rubygem.sh", "./provision/core/git.sh", + "./provision/core/mongodb.sh", "./provision/core/node.sh", "./provision/core/commonutils.sh" ] @@ -215,7 +216,6 @@ build { "./provision/core/apache.sh", "./provision/core/nginx.sh", "./provision/core/postgresql.sh", - "./provision/core/mongodb.sh", "./provision/core/audiodevice.sh", "./provision/core/vcpkg.sh", "./provision/core/miniconda.sh", diff --git a/images/macos/templates/macOS-12.json b/images/macos/templates/macOS-12.json index 2ee5c7193394..0ca2661aab5f 100644 --- a/images/macos/templates/macOS-12.json +++ b/images/macos/templates/macOS-12.json @@ -157,6 +157,7 @@ "./provision/core/ruby.sh", "./provision/core/rubygem.sh", "./provision/core/git.sh", + "./provision/core/mongodb.sh", "./provision/core/node.sh", "./provision/core/commonutils.sh" ], @@ -202,7 +203,6 @@ "./provision/core/apache.sh", "./provision/core/nginx.sh", "./provision/core/postgresql.sh", - "./provision/core/mongodb.sh", "./provision/core/audiodevice.sh", "./provision/core/vcpkg.sh", "./provision/core/miniconda.sh", From 632145f3a53b1c2ee55e51d204dd70530bb95e35 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Sun, 12 Feb 2023 13:57:16 +0100 Subject: [PATCH 1738/3485] [Ubuntu] set node 18 as default (#7094) --- images/linux/toolsets/toolset-2004.json | 2 +- images/linux/toolsets/toolset-2204.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index e46d4a0a5373..f8c43d03d799 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -306,7 +306,7 @@ "binary_name": "selenium-server" }, "node": { - "default": "16" + "default": "18" }, "node_modules": [ { diff --git a/images/linux/toolsets/toolset-2204.json b/images/linux/toolsets/toolset-2204.json index 0b008a367850..141dadde0678 100644 --- a/images/linux/toolsets/toolset-2204.json +++ b/images/linux/toolsets/toolset-2204.json @@ -286,7 +286,7 @@ "binary_name": "selenium-server" }, "node": { - "default": "16" + "default": "18" }, "node_modules": [ { From bc6c8131b57bc748143a152c5cccf1376c3bdaf1 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Sun, 12 Feb 2023 19:42:41 +0100 Subject: [PATCH 1739/3485] [Windows] set node 18 as default (#7092) --- images/win/toolsets/toolset-2019.json | 2 +- images/win/toolsets/toolset-2022.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index 58797cf7f1d5..62baee084bfd 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -476,7 +476,7 @@ ] }, "node": { - "default": "16" + "default": "18" }, "mysql": { "version": "5.7" diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index d623766b4f20..bf05a09a7d4b 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -386,7 +386,7 @@ ] }, "node": { - "default": "16" + "default": "18" }, "mysql": { "version": "8.0" From 539b772d6bab8eb916c4379d66c74f04e0f73e61 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Mon, 13 Feb 2023 01:17:39 +0100 Subject: [PATCH 1740/3485] [macOS] set node 18 as default (#7093) --- images/macos/toolsets/toolset-11.json | 2 +- images/macos/toolsets/toolset-12.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index b00bb5b2ef49..37bb5b36fe70 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -329,7 +329,7 @@ "default": "1.17" }, "node": { - "default": "16", + "default": "18", "nvm_versions": [ "14", "16", diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index dd5bdb9da9c4..6dffb791ef1a 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -297,7 +297,7 @@ "default": "1.17" }, "node": { - "default": "16", + "default": "18", "nvm_versions": [ "14", "16", From 8767a6eb4e9011d9b1716c4f02aaba2e70e12af1 Mon Sep 17 00:00:00 2001 From: sergei-pyshnoi <121864472+sergei-pyshnoi@users.noreply.github.com> Date: Mon, 13 Feb 2023 16:40:48 +0100 Subject: [PATCH 1741/3485] Remove all macOS-10.15 related code (#7078) --- images.CI/macos/azure-pipelines/macos1015.yml | 23 -- images/macos/helpers/Common.Helpers.psm1 | 3 - .../configuration/configure-machine.sh | 12 +- .../provision/configuration/finalize-vm.sh | 8 - .../provision/configuration/preimagedata.sh | 7 +- .../macos/provision/core/android-toolsets.sh | 4 - images/macos/provision/core/audiodevice.sh | 18 +- images/macos/provision/core/graalvm.sh | 6 - images/macos/provision/core/openjdk.sh | 8 - images/macos/provision/core/powershell.sh | 5 +- images/macos/provision/core/swiftlint.sh | 2 +- images/macos/provision/core/xamarin.sh | 5 - images/macos/provision/utils/utils.sh | 20 +- .../SoftwareReport.Common.psm1 | 6 +- .../SoftwareReport.Generator.ps1 | 30 +- .../software-report/SoftwareReport.Xcode.psm1 | 2 +- images/macos/templates/macOS-10.15.json | 254 ------------- images/macos/tests/Android.Tests.ps1 | 4 - images/macos/tests/Common.Tests.ps1 | 4 +- images/macos/tests/System.Tests.ps1 | 6 +- images/macos/toolsets/toolset-10.15.json | 354 ------------------ 21 files changed, 29 insertions(+), 752 deletions(-) delete mode 100644 images.CI/macos/azure-pipelines/macos1015.yml delete mode 100644 images/macos/templates/macOS-10.15.json delete mode 100644 images/macos/toolsets/toolset-10.15.json diff --git a/images.CI/macos/azure-pipelines/macos1015.yml b/images.CI/macos/azure-pipelines/macos1015.yml deleted file mode 100644 index f42980cc41b0..000000000000 --- a/images.CI/macos/azure-pipelines/macos1015.yml +++ /dev/null @@ -1,23 +0,0 @@ -name: macOS-10.15_$(date:yyyyMMdd)$(rev:.r)_unstable -schedules: -- cron: "0 0 * * *" - displayName: Daily - branches: - include: - - main - always: true - -trigger: none -pr: - autoCancel: true - branches: - include: - - main - -jobs: -- template: image-generation.yml - parameters: - image_label: 'macOS Catalina' - base_image_name: 'clean-macOS-10.15-380Gb-runner' - template_path: 'templates/macOS-10.15.json' - target_datastore: 'ds-image' diff --git a/images/macos/helpers/Common.Helpers.psm1 b/images/macos/helpers/Common.Helpers.psm1 index 3fa9d56fc3e1..8d1dd4241ff5 100644 --- a/images/macos/helpers/Common.Helpers.psm1 +++ b/images/macos/helpers/Common.Helpers.psm1 @@ -31,12 +31,9 @@ function Get-OSVersion { return [PSCustomObject]@{ Version = $osVersion.Version Platform = $osVersion.Platform - IsCatalina = $osVersionMajorMinor -eq "10.15" IsBigSur = $osVersion.Version.Major -eq "11" IsMonterey = $osVersion.Version.Major -eq "12" IsVentura = $osVersion.Version.Major -eq "13" - IsLessThanMonterey = $osVersion.Version.Major -lt "12" - IsHigherThanCatalina = $osVersion.Version.Major -ge "11" } } diff --git a/images/macos/provision/configuration/configure-machine.sh b/images/macos/provision/configuration/configure-machine.sh index 3eadcc523667..99b158265c36 100644 --- a/images/macos/provision/configuration/configure-machine.sh +++ b/images/macos/provision/configuration/configure-machine.sh @@ -36,9 +36,9 @@ defaults write com.apple.VoiceOver4/default SCREnableAppleScript -bool YES # Confirm that the correct intermediate certificate is installed by verifying the expiration date is set to 2030. # sudo security delete-certificate -Z FF6797793A3CD798DC5B2ABEF56F73EDC9F83A64 /Library/Keychains/System.keychain # Big Sur requires user interaction to add a cert https://developer.apple.com/forums/thread/671582, we need to use a workaround with SecItemAdd swift method -if ! is_Catalina; then - swiftc "${HOME}/image-generation/add-certificate.swift" -fi + +swiftc "${HOME}/image-generation/add-certificate.swift" + certs=( AppleWWDRCAG3.cer @@ -49,11 +49,7 @@ for cert in ${certs[@]}; do cert_path="${HOME}/${cert}" curl "https://www.apple.com/certificateauthority/${cert}" --output ${cert_path} --silent - if is_Catalina; then - sudo security add-trusted-cert -d -r unspecified -k /Library/Keychains/System.keychain ${cert_path} - else - sudo ./add-certificate ${cert_path} - fi + sudo ./add-certificate ${cert_path} rm ${cert_path} done diff --git a/images/macos/provision/configuration/finalize-vm.sh b/images/macos/provision/configuration/finalize-vm.sh index af3b4b6fd247..548e8b3bcefc 100644 --- a/images/macos/provision/configuration/finalize-vm.sh +++ b/images/macos/provision/configuration/finalize-vm.sh @@ -5,14 +5,6 @@ source ~/utils/utils.sh # Close all finder windows because they can interfere with UI tests close_finder_window -if is_Catalina; then - # Ignore available updates to prevent system pop-ups - updateName=$(softwareupdate -l | grep "Title: " | awk -F[:,] '{print $2}' | awk '{$1=$1};1') || true - if [ ! -z "$updateName" ]; then - sudo softwareupdate --ignore "$updateName" - fi -fi - # Remove Parallels Desktop # https://github.com/actions/runner-images/issues/6105 if is_Monterey; then diff --git a/images/macos/provision/configuration/preimagedata.sh b/images/macos/provision/configuration/preimagedata.sh index 6ce160f99fd3..58891f233b77 100644 --- a/images/macos/provision/configuration/preimagedata.sh +++ b/images/macos/provision/configuration/preimagedata.sh @@ -8,11 +8,8 @@ os_name=$(sw_vers -productName) os_version=$(sw_vers -productVersion) os_build=$(sw_vers -buildVersion) label_version=$(echo $os_version | cut -d. -f1,2) -if is_Catalina; then - label_version=$(echo $os_version | cut -d. -f1,2) -else - label_version=$(echo $os_version | cut -d. -f1) -fi +label_version=$(echo $os_version | cut -d. -f1) + image_label="macos-${label_version}" release_label="macOS-${label_version}" software_url="https://github.com/actions/runner-images/blob/${release_label}/${image_version}/images/macos/${image_label}-Readme.md" diff --git a/images/macos/provision/core/android-toolsets.sh b/images/macos/provision/core/android-toolsets.sh index 9e23e0c619e6..36373be616d4 100755 --- a/images/macos/provision/core/android-toolsets.sh +++ b/images/macos/provision/core/android-toolsets.sh @@ -97,10 +97,6 @@ done # The Android Emulator uses the built-in Hypervisor.Framework by default, and falls back to using Intel HAXM if Hypervisor.Framework fails to initialize # https://developer.android.com/studio/run/emulator-acceleration#vm-mac # The installation doesn't work properly on macOS Big Sur, /dev/HAX is not created -if is_Catalina; then - chmod +x $ANDROID_HOME/extras/intel/Hardware_Accelerated_Execution_Manager/silent_install.sh - sudo $ANDROID_HOME/extras/intel/Hardware_Accelerated_Execution_Manager/silent_install.sh -fi for addon_name in "${ANDROID_ADDON_LIST[@]}" do diff --git a/images/macos/provision/core/audiodevice.sh b/images/macos/provision/core/audiodevice.sh index a94de8100fe2..d021dbb96397 100644 --- a/images/macos/provision/core/audiodevice.sh +++ b/images/macos/provision/core/audiodevice.sh @@ -9,20 +9,12 @@ brew_smart_install "sox" # Big Sur doesn't support soundflower installation without user interaction https://github.com/mattingalls/Soundflower/releases/tag/2.0b2 # Install blackhole-2ch for Big Sur instead -if is_Catalina; then - echo "install soundflower" - brew install --cask soundflower - echo "set Soundflower (2ch) as input/output device" - SwitchAudioSource -s "Soundflower (2ch)" -t input - SwitchAudioSource -s "Soundflower (2ch)" -t output -else - echo "install blackhole-2ch" - brew_smart_install "blackhole-2ch" +echo "install blackhole-2ch" +brew_smart_install "blackhole-2ch" - echo "set BlackHole 2ch as input/output device" - SwitchAudioSource -s "BlackHole 2ch" -t input - SwitchAudioSource -s "BlackHole 2ch" -t output -fi +echo "set BlackHole 2ch as input/output device" +SwitchAudioSource -s "BlackHole 2ch" -t input +SwitchAudioSource -s "BlackHole 2ch" -t output invoke_tests "System" "Audio Device" diff --git a/images/macos/provision/core/graalvm.sh b/images/macos/provision/core/graalvm.sh index 62c8b2aba8e6..05eb24356813 100644 --- a/images/macos/provision/core/graalvm.sh +++ b/images/macos/provision/core/graalvm.sh @@ -8,12 +8,6 @@ exportPath=$(echo /Library/Java/JavaVirtualMachines/graalvm-ce-java*/Contents/Ho echo "Setting up GRAALVM_11_ROOT variable to ${exportPath}" echo "export GRAALVM_11_ROOT=${exportPath}" >> "${HOME}/.bashrc" -# GraalVM not being signed and notarized yet on macOS Catalina -if is_Catalina; then - quarantinePath=$(echo /Library/Java/JavaVirtualMachines/graalvm-ce-java*) - sudo xattr -rd com.apple.quarantine $quarantinePath -fi - # Install Native Image $exportPath/gu install native-image diff --git a/images/macos/provision/core/openjdk.sh b/images/macos/provision/core/openjdk.sh index 90a91695e7f9..8311154364fb 100755 --- a/images/macos/provision/core/openjdk.sh +++ b/images/macos/provision/core/openjdk.sh @@ -77,14 +77,6 @@ for jdkVendor in ${jdkVendors[@]}; do done done -# Big Sur or newer does not have these versions of Adopt. -# Also hardcode these versions as they only exist for Adopt -if is_Catalina; then - for adoptVersionToInstall in 12 13 14; do - createEnvironmentVariable ${adoptVersionToInstall} "Adopt" - done -fi - echo Installing Maven... brew_smart_install "maven" diff --git a/images/macos/provision/core/powershell.sh b/images/macos/provision/core/powershell.sh index 611dbbdff46d..85c836cd9aa8 100644 --- a/images/macos/provision/core/powershell.sh +++ b/images/macos/provision/core/powershell.sh @@ -8,9 +8,8 @@ psDownloadUrl=$(get_github_package_download_url "PowerShell/PowerShell" "contain download_with_retries $psDownloadUrl "/tmp" "powershell.pkg" # Work around the issue on macOS Big Sur 11.5 or higher for possible error message ("can't be opened because Apple cannot check it for malicious software") when installing the package -if ! is_Catalina; then - sudo xattr -rd com.apple.quarantine /tmp/powershell.pkg -fi +sudo xattr -rd com.apple.quarantine /tmp/powershell.pkg + sudo installer -pkg /tmp/powershell.pkg -target / diff --git a/images/macos/provision/core/swiftlint.sh b/images/macos/provision/core/swiftlint.sh index 47259f3c647c..5be1b0377a04 100644 --- a/images/macos/provision/core/swiftlint.sh +++ b/images/macos/provision/core/swiftlint.sh @@ -3,7 +3,7 @@ source ~/utils/utils.sh echo "Install SwiftLint" # SwiftLint now requires Swift 5.6 or higher to build, and macOS 12 or higher to run https://github.com/realm/SwiftLint/releases/tag/0.49.0 -if is_Less_Monterey; then +if is_BigSur; then version="0.48.0" else version="latest" diff --git a/images/macos/provision/core/xamarin.sh b/images/macos/provision/core/xamarin.sh index a8e2692d9f31..febdf5fdb701 100755 --- a/images/macos/provision/core/xamarin.sh +++ b/images/macos/provision/core/xamarin.sh @@ -64,11 +64,6 @@ createBundleLink $CURRENT_SDK_SYMLINK "Current" # Fix nuget in some mono versions because of known bugs # -if is_Catalina; then - # Fix Mono issue with default nuget: https://github.com/mono/mono/issues/17637 - installNuget "6.4.0" "5.3.1" -fi - # Creating UWP Shim to hack UWP build failure createUWPShim diff --git a/images/macos/provision/utils/utils.sh b/images/macos/provision/utils/utils.sh index b499b22fdf36..8214c3036d30 100755 --- a/images/macos/provision/utils/utils.sh +++ b/images/macos/provision/utils/utils.sh @@ -63,22 +63,6 @@ is_BigSur() { fi } -is_Catalina() { - if [ "$OSTYPE" = "darwin19" ]; then - true - else - false - fi -} - -is_Less_Monterey() { - if is_Catalina || is_BigSur; then - true - else - false - fi -} - is_Veertu() { if [ -d "/Library/Application Support/Veertu" ]; then true @@ -116,9 +100,7 @@ brew_cask_install_ignoring_sha256() { } get_brew_os_keyword() { - if is_Catalina; then - echo "catalina" - elif is_BigSur; then + if is_BigSur; then echo "big_sur" elif is_Monterey; then echo "monterey" diff --git a/images/macos/software-report/SoftwareReport.Common.psm1 b/images/macos/software-report/SoftwareReport.Common.psm1 index 71568b5eef06..c8ce4bf8f1be 100644 --- a/images/macos/software-report/SoftwareReport.Common.psm1 +++ b/images/macos/software-report/SoftwareReport.Common.psm1 @@ -158,11 +158,7 @@ function Build-OSInfoSection { $fieldsToInclude = @("System Version:", "Kernel Version:") $rawSystemInfo = Invoke-Expression "system_profiler SPSoftwareDataType" $parsedSystemInfo = $rawSystemInfo | Where-Object { -not ($_ | Select-String -NotMatch $fieldsToInclude) } | ForEach-Object { $_.Trim() } - if ($os.IsCatalina) { - $parsedSystemInfo[0] -match "System Version: macOS (?<version>\d+\.\d+)" | Out-Null - } else { - $parsedSystemInfo[0] -match "System Version: macOS (?<version>\d+)" | Out-Null - } + $parsedSystemInfo[0] -match "System Version: macOS (?<version>\d+)" | Out-Null $version = $Matches.Version $systemVersion = $parsedSystemInfo[0].Replace($fieldsToInclude[0],"").Trim() $kernelVersion = $parsedSystemInfo[1].Replace($fieldsToInclude[1],"").Trim() diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1 index 23e456a4a359..2db63d181332 100644 --- a/images/macos/software-report/SoftwareReport.Generator.ps1 +++ b/images/macos/software-report/SoftwareReport.Generator.ps1 @@ -91,13 +91,10 @@ $utilities.AddToolVersion("Curl", $(Get-CurlVersion)) $utilities.AddToolVersion("Git", $(Get-GitVersion)) $utilities.AddToolVersion("Git LFS", $(Get-GitLFSVersion)) $utilities.AddToolVersion("GitHub CLI", $(Get-GitHubCLIVersion)) -if ($os.IsCatalina) { - $utilities.AddToolVersion("GNU parallel", $(Get-ParallelVersion)) -} $utilities.AddToolVersion("GNU Tar", $(Get-GnuTarVersion)) $utilities.AddToolVersion("GNU Wget", $(Get-WgetVersion)) $utilities.AddToolVersion("gpg (GnuPG)", $(Get-GPGVersion)) -if ($os.IsLessThanMonterey) { +if ($os.IsBigSur) { $utilities.AddToolVersion("helm", $(Get-HelmVersion)) } $utilities.AddToolVersion("Hub CLI", $(Get-HubVersion)) @@ -105,7 +102,7 @@ $utilities.AddToolVersion("ImageMagick", $(Get-ImageMagickVersion)) $utilities.AddToolVersion("jq", $(Get-JqVersion)) $utilities.AddToolVersion("mongo", $(Get-MongoVersion)) $utilities.AddToolVersion("mongod", $(Get-MongodVersion)) -if ($os.IsLessThanMonterey) { +if ($os.IsBigSur) { $utilities.AddToolVersion("Newman", $(Get-NewmanVersion)) } $utilities.AddToolVersion("OpenSSL", $(Get-OpenSSLVersion)) @@ -124,7 +121,7 @@ $utilities.AddToolVersion("zstd", $(Get-ZstdVersion)) # Tools $tools = $installedSoftware.AddHeader("Tools") -if ($os.IsLessThanMonterey) { +if ($os.IsBigSur) { $tools.AddToolVersion("Aliyun CLI", $(Get-AliyunCLIVersion)) } $tools.AddToolVersion("App Center CLI", $(Get-AppCenterCLIVersion)) @@ -136,12 +133,8 @@ $tools.AddToolVersion("Azure CLI (azure-devops)", $(Get-AzureDevopsVersion)) $tools.AddToolVersion("Bicep CLI", $(Get-BicepVersion)) $tools.AddToolVersion("Cabal", $(Get-CabalVersion)) $tools.AddToolVersion("Cmake", $(Get-CmakeVersion)) -if (-not $os.IsCatalina) { - $tools.AddToolVersion("CodeQL Action Bundles", $(Get-CodeQLBundleVersions)) -} -if (-not $os.IsCatalina) { - $tools.AddToolVersion("Colima", $(Get-ColimaVersion)) -} +$tools.AddToolVersion("CodeQL Action Bundles", $(Get-CodeQLBundleVersions)) +$tools.AddToolVersion("Colima", $(Get-ColimaVersion)) $tools.AddToolVersion("Fastlane", $(Get-FastlaneVersion)) $tools.AddToolVersion("GHC", $(Get-GHCVersion)) $tools.AddToolVersion("GHCup", $(Get-GHCupVersion)) @@ -203,17 +196,15 @@ $webServers.AddTable($(Build-WebServersSection)) $xamarin = $installedSoftware.AddHeader("Xamarin") $vsForMac = $xamarin.AddHeader("Visual Studio for Mac") $vsForMac.AddTable($(Build-VSMacTable)) - -if (-not $os.IsCatalina) { - $note = +$note = @' To use Visual Studio 2019 by default rename the app: mv "/Applications/Visual Studio.app" "/Applications/Visual Studio 2022.app" mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" '@ - $vsForMacNotes = $vsForMac.AddHeader("Notes") - $vsForMacNotes.AddNote($note) -} +$vsForMacNotes = $vsForMac.AddHeader("Notes") +$vsForMacNotes.AddNote($note) + $xamarinBundles = $xamarin.AddHeader("Xamarin bundles") $xamarinBundles.AddTable($(Build-XamarinTable)) @@ -241,9 +232,6 @@ $installedSimulators.AddTable($(Build-XcodeSimulatorsTable $xcodeInfo)) # Android section $android = $installedSoftware.AddHeader("Android") $androidTable = Build-AndroidTable -if ($os.IsCatalina) { - $androidTable += Get-IntelHaxmVersion -} $android.AddTable($androidTable) $androidEnv = $android.AddHeader("Environment variables") diff --git a/images/macos/software-report/SoftwareReport.Xcode.psm1 b/images/macos/software-report/SoftwareReport.Xcode.psm1 index 68e61caae733..f1ae3e74c578 100644 --- a/images/macos/software-report/SoftwareReport.Xcode.psm1 +++ b/images/macos/software-report/SoftwareReport.Xcode.psm1 @@ -245,7 +245,7 @@ function Build-XcodeSupportToolsSection { $nomadShenzhenOutput = Run-Command "ipa -version" $nomadShenzhen = [regex]::matches($nomadShenzhenOutput, "(\d+.){2}\d+").Value - if ($os.IsLessThanMonterey) { + if ($os.IsBigSur) { $toolNodes += [ToolVersionNode]::new("Nomad CLI", $nomadCLI) $toolNodes += [ToolVersionNode]::new("Nomad shenzhen CLI", $nomadShenzhen) } diff --git a/images/macos/templates/macOS-10.15.json b/images/macos/templates/macOS-10.15.json deleted file mode 100644 index e912ade37777..000000000000 --- a/images/macos/templates/macOS-10.15.json +++ /dev/null @@ -1,254 +0,0 @@ -{ - "variables": { - "vcenter_server": null, - "vcenter_username": null, - "vcenter_password": null, - "vcenter_datacenter": null, - "cluster_or_esxi_host": null, - "esxi_datastore": null, - "build_id": null, - "baseimage_name": null, - "output_folder": null, - "vm_username": null, - "vm_password": null, - "github_api_pat": null, - "xcode_install_user": null, - "xcode_install_password": null, - "image_os": "macos1015" - }, - "builders": [ - { - "type": "vsphere-clone", - "vcenter_server": "{{user `vcenter_server`}}", - "username": "{{user `vcenter_username`}}", - "password": "{{user `vcenter_password`}}", - "insecure_connection": true, - "datacenter": "{{ user `vcenter_datacenter` }}", - "template": "{{ user `baseimage_name` }}", - "folder": "{{user `output_folder` }}", - "host": "{{user `cluster_or_esxi_host`}}", - "datastore": "{{user `esxi_datastore`}}", - "vm_name": "{{user `build_id`}}", - "ssh_username": "{{user `vm_username`}}", - "ssh_password": "{{user `vm_password`}}", - "CPUs": "5", - "cpu_cores": "5", - "RAM": "24576", - "NestedHV": "true", - "shutdown_timeout": "15m" - } - ], - "provisioners": [ - { - "type": "shell", - "inline": "mkdir ~/image-generation" - }, - { - "type": "file", - "source": "./provision/assets", - "destination": "~/image-generation/" - }, - { - "type": "file", - "source": "./tests", - "destination": "~/image-generation/" - }, - { - "type": "file", - "source": "./software-report", - "destination": "~/image-generation/" - }, - { - "type": "file", - "source": "../../helpers/software-report-base", - "destination": "~/image-generation/software-report/" - }, - { - "type": "file", - "source": "./helpers", - "destination": "~/image-generation/" - }, - { - "type": "file", - "source": "./provision/configuration/environment/bashrc", - "destination": "~/.bashrc" - }, - { - "type": "file", - "source": "./provision/configuration/environment/bashprofile", - "destination": "~/.bash_profile" - }, - { - "type": "file", - "source": "./provision/utils", - "destination": "~/" - }, - { - "type": "file", - "source": "./provision/bootstrap-provisioner", - "destination": "~/bootstrap" - }, - { - "type": "file", - "source": "./toolsets/toolset-10.15.json", - "destination": "~/image-generation/toolset.json" - }, - { - "type": "shell", - "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}", - "pause_before": "30s", - "scripts": [ - "./provision/core/xcode-clt.sh", - "./provision/core/homebrew.sh" - ] - }, - { - "type": "shell", - "execute_command": "chmod +x {{ .Path }}; sudo {{ .Vars }} {{ .Path }}", - "scripts": [ - "./provision/configuration/add-network-interface-detection.sh", - "./provision/configuration/autologin.sh", - "./provision/configuration/disable-auto-updates.sh", - "./provision/configuration/screensaver-off.sh", - "./provision/configuration/ntpconf.sh", - "./provision/configuration/max-files.sh", - "./provision/configuration/shell-change.sh" - ], - "environment_vars": [ - "PASSWORD={{user `vm_password`}}", - "USERNAME={{user `vm_username`}}" - ] - }, - { - "type": "shell", - "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}", - "scripts": [ - "./provision/configuration/preimagedata.sh", - "./provision/configuration/configure-ssh.sh", - "./provision/configuration/configure-machine.sh" - ], - "environment_vars": [ - "IMAGE_VERSION={{user `build_id`}}", - "IMAGE_OS={{user `image_os`}}" - ] - }, - { - "type": "shell", - "execute_command": "chmod +x {{ .Path }}; sudo {{ .Vars }} {{ .Path }}", - "script": "./provision/core/reboot.sh", - "expect_disconnect": true - }, - { - "type": "shell", - "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}", - "pause_before": "30s", - "scripts": [ - "./provision/core/open_windows_check.sh", - "./provision/core/powershell.sh", - "./provision/core/dotnet.sh", - "./provision/core/python.sh", - "./provision/core/azcopy.sh", - "./provision/core/openssl.sh", - "./provision/core/ruby.sh", - "./provision/core/rubygem.sh", - "./provision/core/git.sh", - "./provision/core/node.sh" - ], - "environment_vars": [ - "API_PAT={{user `github_api_pat`}}" - ] - }, - { - "type": "shell", - "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} pwsh -f {{ .Path }}", - "script": "./provision/core/xcode.ps1", - "environment_vars": [ - "XCODE_INSTALL_USER={{user `xcode_install_user`}}", - "XCODE_INSTALL_PASSWORD={{user `xcode_install_password`}}" - ] - }, - { - "type": "shell", - "execute_command": "chmod +x {{ .Path }}; sudo {{ .Vars }} {{ .Path }}", - "script": "./provision/core/reboot.sh", - "expect_disconnect": true - }, - { - "type": "shell", - "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}", - "scripts": [ - "./provision/core/commonutils.sh", - "./provision/core/llvm.sh", - "./provision/core/golang.sh", - "./provision/core/swiftlint.sh", - "./provision/core/openjdk.sh", - "./provision/core/php.sh", - "./provision/core/aws.sh", - "./provision/core/rust.sh", - "./provision/core/gcc.sh", - "./provision/core/haskell.sh", - "./provision/core/stack.sh", - "./provision/core/cocoapods.sh", - "./provision/core/android-toolsets.sh", - "./provision/core/xamarin.sh", - "./provision/core/vsmac.sh", - "./provision/core/nvm.sh", - "./provision/core/apache.sh", - "./provision/core/nginx.sh", - "./provision/core/postgresql.sh", - "./provision/core/mongodb.sh", - "./provision/core/audiodevice.sh", - "./provision/core/vcpkg.sh", - "./provision/core/miniconda.sh", - "./provision/core/safari.sh", - "./provision/core/chrome.sh", - "./provision/core/edge.sh", - "./provision/core/firefox.sh", - "./provision/core/xcode-postbuild.sh", - "./provision/core/pypy.sh", - "./provision/core/pipx-packages.sh", - "./provision/core/bicep.sh", - "./provision/core/graalvm.sh" - ], - "environment_vars": [ - "API_PAT={{user `github_api_pat`}}" - ] - }, - { - "type": "shell", - "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} pwsh -f {{ .Path }}", - "scripts": [ - "./provision/core/toolset.ps1", - "./provision/core/configure-toolset.ps1" - ] - }, - { - "type": "shell", - "execute_command": "ruby {{ .Path }}", - "scripts": [ - "./provision/core/delete-duplicate-sims.rb" - ] - }, - { - "type": "shell", - "inline": [ - "pwsh -File \"$HOME/image-generation/software-report/SoftwareReport.Generator.ps1\" -OutputDirectory \"$HOME/image-generation/output/software-report\" -ImageName {{user `build_id`}}", - "pwsh -File \"$HOME/image-generation/tests/RunAll-Tests.ps1\"" - ] - }, - { - "type": "file", - "direction": "download", - "source": "~/image-generation/output/*", - "destination": "../image-output/" - }, - { - "type": "shell", - "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}", - "scripts": [ - "./provision/configuration/configure-hostname.sh", - "./provision/configuration/finalize-vm.sh" - ] - } - ] -} diff --git a/images/macos/tests/Android.Tests.ps1 b/images/macos/tests/Android.Tests.ps1 index df1484e4c6f2..a1d18ef410df 100644 --- a/images/macos/tests/Android.Tests.ps1 +++ b/images/macos/tests/Android.Tests.ps1 @@ -75,8 +75,4 @@ Describe "Android" { Validate-AndroidPackage $PackageName } } - - It "HAXM is installed" -Skip:($os.IsHigherThanCatalina) { - "kextstat | grep 'com.intel.kext.intelhaxm'" | Should -ReturnZeroExitCode - } } \ No newline at end of file diff --git a/images/macos/tests/Common.Tests.ps1 b/images/macos/tests/Common.Tests.ps1 index eb17db53aceb..f2c02c5db9a2 100644 --- a/images/macos/tests/Common.Tests.ps1 +++ b/images/macos/tests/Common.Tests.ps1 @@ -139,7 +139,7 @@ Describe "VirtualBox" -Skip:($os.IsBigSur) { } } -Describe "CodeQLBundles" -Skip:($os.IsCatalina) { +Describe "CodeQLBundles" { It "Latest CodeQL Bundle" { $CodeQLVersionWildcards = Join-Path $Env:AGENT_TOOLSDIRECTORY -ChildPath "CodeQL" | Join-Path -ChildPath "*" $LatestCodeQLVersionPath = Get-ChildItem $CodeQLVersionWildcards | Sort-Object -Property { [SemVer]$_.name } -Descending | Select-Object -First 1 -Expand FullName @@ -175,7 +175,7 @@ Describe "CodeQLBundles" -Skip:($os.IsCatalina) { } } -Describe "Colima" -Skip:($os.IsCatalina) { +Describe "Colima" { It "Colima" { "colima version" | Should -ReturnZeroExitCode } diff --git a/images/macos/tests/System.Tests.ps1 b/images/macos/tests/System.Tests.ps1 index 8d08627bf8a3..8dd6bdf514a0 100644 --- a/images/macos/tests/System.Tests.ps1 +++ b/images/macos/tests/System.Tests.ps1 @@ -32,11 +32,7 @@ Describe "Audio device" { "SwitchAudioSource -c" | Should -ReturnZeroExitCode } - It "Audio channel Soundflower (2ch)" -Skip:($os.IsHigherThanCatalina) { - SwitchAudioSource -c | Should -BeLikeExactly "Soundflower (2ch)" - } - - It "Audio channel BlackHole 2ch" -Skip:($os.IsCatalina) { + It "Audio channel BlackHole 2ch" { SwitchAudioSource -c | Should -BeLikeExactly "BlackHole 2ch" } } diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json deleted file mode 100644 index 528ea440285d..000000000000 --- a/images/macos/toolsets/toolset-10.15.json +++ /dev/null @@ -1,354 +0,0 @@ -{ - "xcode": { - "default": "12.4", - "versions": [ - { "link": "12.4", "version": "12.4.0"}, - { "link": "12.3", "version": "12.3.0"}, - { "link": "12.2", "version": "12.2.0" }, - { "link": "12.1.1", "version": "12.1.1" }, - { "link": "12.1", "version": "12.1.0" }, - { "link": "12", "version": "12.0.1", "symlinks": ["12_beta"] }, - { "link": "11.7", "version": "11.7.0", "symlinks": ["11.7_beta"] }, - { "link": "11.6", "version": "11.6.0", "symlinks": ["11.6_beta"] }, - { "link": "11.5", "version": "11.5.0", "symlinks": ["11.5_beta"] }, - { "link": "11.4.1", "version": "11.4.1", "symlinks": ["11.4", "11.4.1_beta"] }, - { "link": "11.3.1", "version": "11.3.1", "symlinks": ["11.3", "11.3.1_beta"] }, - { "link": "11.2.1", "version": "11.2.1", "symlinks": ["11.2", "11.2.1_beta"] }, - { "link": "10.3", "version": "10.3", "symlinks": ["10.3_beta"] } - ] - }, - "xamarin": { - "vsmac": { - "default": "2019", - "versions": [ "2019" ] - }, - "mono-versions": [ - "6.12.0.188", "6.10.0.106", "6.8.0.123", "6.6.0.166", "6.4.0.208" - ], - "ios-versions": [ - "14.14.2.5", "14.10.0.4", "14.8.0.3", "14.6.0.15", "14.4.1.3", "14.2.0.12", "14.0.0.0", "13.20.2.2", "13.18.2.1", "13.16.0.13", "13.14.1.39", "13.10.0.21", "13.8.3.0", "13.6.0.12", "13.4.0.2", "13.2.0.47" - ], - "mac-versions": [ - "7.8.2.5", "7.4.0.10", "7.2.0.3", "7.0.0.15", "6.22.1.26", "6.20.2.2", "6.18.3.2", "6.16.0.13", "6.14.1.39", "6.10.0.21", "6.8.3.0", "6.6.0.12", "6.4.0.2", "6.2.0.47" - ], - "android-versions": [ - "11.2.2.1", "11.1.0.26", "11.0.2.0", "10.3.1.4", "10.2.0.100", "10.1.3.7", "10.0.6.2" - ], - "bundle-default": "6_12_7", - "bundles": [ - { - "symlink": "6_12_7", - "mono":"6.12", - "ios": "14.14", - "mac": "7.8", - "android": "11.2" - }, - { - "symlink": "6_12_6", - "mono":"6.12", - "ios": "14.10", - "mac": "7.4", - "android": "11.1" - }, - { - "symlink": "6_12_5", - "mono":"6.12", - "ios": "14.8", - "mac": "7.2", - "android": "11.1" - }, - { - "symlink": "6_12_4", - "mono":"6.12", - "ios": "14.6", - "mac": "7.0", - "android": "11.1" - }, - { - "symlink": "6_12_3", - "mono":"6.12", - "ios": "14.4", - "mac": "6.22", - "android": "11.1" - }, - { - "symlink": "6_12_2", - "mono":"6.12", - "ios": "14.2", - "mac": "6.20", - "android": "11.0" - }, - { - "symlink": "6_12_1", - "mono":"6.12", - "ios": "14.0", - "mac": "6.20", - "android": "11.0" - }, - { - "symlink": "6_12_0", - "mono":"6.12", - "ios": "13.20", - "mac": "6.20", - "android": "11.0" - }, - { - "symlink": "6_10_0", - "mono":"6.10", - "ios": "13.18", - "mac": "6.18", - "android": "10.3" - }, - { - "symlink": "6_8_1", - "mono":"6.8", - "ios": "13.16", - "mac": "6.16", - "android": "10.2" - }, - { - "symlink": "6_8_0", - "mono": "6.8", - "ios": "13.14", - "mac": "6.14", - "android": "10.2" - }, - { - "symlink": "6_6_1", - "mono": "6.6", - "ios": "13.10", - "mac": "6.10", - "android": "10.1" - }, - { - "symlink": "6_6_0", - "mono": "6.6", - "ios": "13.8", - "mac": "6.8", - "android": "10.1" - }, - { - "symlink": "6_4_2", - "mono": "6.4", - "ios": "13.6", - "mac": "6.6", - "android": "10.0" - }, - { - "symlink": "6_4_1", - "mono": "6.4", - "ios": "13.4", - "mac": "6.4", - "android": "10.0" - }, - { - "symlink": "6_4_0", - "mono": "6.4", - "ios": "13.2", - "mac": "6.2", - "android": "10.0" - } - ] - }, - "java": { - "default": "8", - "default_vendor": "Temurin-Hotspot", - "vendors": [ - { - "name": "Temurin-Hotspot", - "versions": [ "8", "11", "17" ] - }, - { - "name": "Adopt", - "versions": [ "8", "11", "12", "13", "14" ] - } - ] - }, - "android": { - "platform_min_version": "24", - "build_tools_min_version": "24.0.0", - "extra-list": [ - "android;m2repository", "google;m2repository", "google;google_play_services", "intel;Hardware_Accelerated_Execution_Manager", "m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta1", "m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta2", "m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta3", "m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta4", "m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta5", "m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0", "m2repository;com;android;support;constraint;constraint-layout-solver;1.0.1", "m2repository;com;android;support;constraint;constraint-layout-solver;1.0.2", "m2repository;com;android;support;constraint;constraint-layout;1.0.0-beta1", "m2repository;com;android;support;constraint;constraint-layout;1.0.0-beta2", "m2repository;com;android;support;constraint;constraint-layout;1.0.0-beta3", "m2repository;com;android;support;constraint;constraint-layout;1.0.0-beta4", "m2repository;com;android;support;constraint;constraint-layout;1.0.0-beta5", "m2repository;com;android;support;constraint;constraint-layout;1.0.0", "m2repository;com;android;support;constraint;constraint-layout;1.0.1", "m2repository;com;android;support;constraint;constraint-layout;1.0.2" - ], - "addon-list": [ - "addon-google_apis-google-24", "addon-google_apis-google-23", "addon-google_apis-google-22", "addon-google_apis-google-21" - ], - "additional-tools": [ - "cmake;3.10.2.4988404", - "cmake;3.18.1" - ], - "ndk": { - "default": "25", - "versions": [ - "23", "24", "25" - ] - } - }, - "powershellModules": [ - {"name": "Az"}, - {"name": "MarkdownPS"}, - {"name": "Pester"}, - {"name": "PSScriptAnalyzer"} - ], - "npm": { - "global_packages": [ - { "name": "appcenter-cli", "test": "appcenter --version" }, - { "name": "newman", "test": "newman --version" }, - { "name": "node-gyp" } - ] - }, - "brew": { - "common_packages": [ - "aliyun-cli", - "ant", - "aria2", - "azure-cli", - "bazelisk", - "carthage", - "cmake", - "gh", - "gnupg", - "gnu-tar", - "helm", - "kotlin", - "libpq", - "p7zip", - "packer", - "parallel", - "perl", - "sbt", - "subversion", - "swiftformat", - "swig", - "zstd", - "zlib", - "libxext", - "libxft", - "tcl-tk", - "yq", - "imagemagick" - ], - "cask_packages": [ - "julia", - "r", - "vagrant", - "virtualbox" - ] - }, - "gcc": { - "versions": [ - "9", - "10", - "11" - ] - }, - "toolcache": [ - { - "name": "Python", - "url" : "https://raw.githubusercontent.com/actions/python-versions/main/versions-manifest.json", - "arch": "x64", - "platform" : "darwin", - "versions": [ - "2.7.*", - "3.6.*", - "3.7.*", - "3.8.*", - "3.9.*", - "3.10.*", - "3.11.*" - ] - }, - { - "name": "PyPy", - "arch": "x64", - "platform" : "darwin", - "versions": [ - "2.7", - "3.6", - "3.7", - "3.8", - "3.9" - ] - }, - { - "name": "Node", - "url" : "https://raw.githubusercontent.com/actions/node-versions/main/versions-manifest.json", - "platform" : "darwin", - "arch": "x64", - "versions": [ - "14.*", - "16.*", - "18.*" - ] - }, - { - "name": "Go", - "url" : "https://raw.githubusercontent.com/actions/go-versions/main/versions-manifest.json", - "arch": "x64", - "platform" : "darwin", - "variable_template" : "GOROOT_{0}_{1}_X64", - "versions": [ - "1.16.*", - "1.17.*", - "1.18.*" - ] - }, - { - "name": "Ruby", - "arch": "x64", - "versions": [ - "2.4.*", - "2.5.*", - "2.6.*", - "2.7.*", - "3.0.*" - ] - } - ], - "pipx": [ - { - "package": "yamllint", - "cmd": "yamllint --version" - } - ], - "dotnet": { - "versions": [ - "3.1" - ] - }, - "ruby": { - "default": "2.7", - "rubygems": [ - "xcode-install", - "cocoapods", - "nomad-cli", - "xcpretty", - "bundler", - "fastlane", - "jazzy" - ] - }, - "go": { - "default": "1.17" - }, - "node": { - "default": "16", - "nvm_versions": [ - "14", - "16", - "18" - ] - }, - "llvm": { - "version": "15" - }, - "php": { - "version": "8.2" - }, - "mongodb": { - "version": "5.0" - }, - "postgresql": { - "version": "14" - } -} From c60c6b67ab2ad0fe76347ebbcd512b87917ef51a Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Tue, 14 Feb 2023 16:47:55 +0100 Subject: [PATCH 1742/3485] [macOS] Update Python3 installer script (#7104) --- images/macos/provision/core/python.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/macos/provision/core/python.sh b/images/macos/provision/core/python.sh index 09de9c356c31..390a6ee7b0eb 100755 --- a/images/macos/provision/core/python.sh +++ b/images/macos/provision/core/python.sh @@ -20,7 +20,7 @@ fi # Explicitly overwrite symlinks created by Python2 such as /usr/local/bin/2to3 since they conflict with symlinks from Python3 # https://github.com/actions/runner-images/issues/2322 echo "Brew Installing Python 3" -brew_smart_install "python@3.10" || brew link --overwrite python@3.10 +brew_smart_install "python@3.11" || brew link --overwrite python@3.11 echo "Installing pipx" export PIPX_BIN_DIR=/usr/local/opt/pipx_bin From bbac29011e04dff6563dd7f8b44a79fa658ed281 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Wed, 15 Feb 2023 16:24:13 +0300 Subject: [PATCH 1743/3485] [Ubuntu] hardcode chromium revision for 110.x (#7113) --- images/linux/scripts/installers/google-chrome.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/images/linux/scripts/installers/google-chrome.sh b/images/linux/scripts/installers/google-chrome.sh index 5a6ca806b070..d541ab005377 100644 --- a/images/linux/scripts/installers/google-chrome.sh +++ b/images/linux/scripts/installers/google-chrome.sh @@ -14,6 +14,12 @@ function GetChromiumRevision { URL="https://omahaproxy.appspot.com/deps.json?version=${CHROME_VERSION}" REVISION=$(curl -s $URL | jq -r '.chromium_base_position') + # both 110.0.5481.100 and 110.0.5481.96 return old incorrect revision + # nothing to compare with, hardcode temporarily. + if [ $REVISION -eq "839" ]; then + REVISION="1084008" + fi + # Some Google Chrome versions are based on Chromium revisions for which a (usually very old) Chromium release with the same number exist. So far this has heppened with 4 digits long Chromium revisions (1060, 1086). # Use the previous Chromium release when this happens to avoid downloading and installing very old Chromium releases that would break image build because of incompatibilities. # First reported with: https://github.com/actions/runner-images/issues/5256 From c89bab7e421dbab8edddb75d8f5b3ad93a898aa5 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Wed, 15 Feb 2023 20:10:43 +0100 Subject: [PATCH 1744/3485] [Ubuntu] workaround libodbc installation (#7117) --- images/linux/scripts/installers/mssql-cmd-tools.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/images/linux/scripts/installers/mssql-cmd-tools.sh b/images/linux/scripts/installers/mssql-cmd-tools.sh index 092023e9ce52..d880b52e4b81 100644 --- a/images/linux/scripts/installers/mssql-cmd-tools.sh +++ b/images/linux/scripts/installers/mssql-cmd-tools.sh @@ -7,7 +7,9 @@ export ACCEPT_EULA=Y apt-get update -apt-get install -y mssql-tools unixodbc-dev +# both libodbc1 nd libodbc2 install libodbc.so.2.0.0, temporary workaround +# https://github.com/microsoft/linux-package-repositories/issues/39 +apt-get install -o Dpkg::Options::="--force-overwrite" -y mssql-tools unixodbc-dev apt-get -f install ln -s /opt/mssql-tools/bin/* /usr/local/bin/ From 4560115ec825521193194482c7ecafea7cda14ab Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 15 Feb 2023 20:39:43 +0000 Subject: [PATCH 1745/3485] Updating readme file for win19 version 20230214.1 (#7112) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2019-Readme.md | 109 +++++++++++++++---------------- 1 file changed, 54 insertions(+), 55 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index 10534feae641..0e7a1e2f28b5 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -1,11 +1,10 @@ | Announcements | |-| | [[all OSs] Default Nodejs version will be set to 18 on February, 13](https://github.com/actions/runner-images/issues/7002) | -| [[All OSs] .NET 5.x will be removed from the images on February, 6](https://github.com/actions/runner-images/issues/6840) | *** # Windows Server 2019 -- OS Version: 10.0.17763 Build 3887 -- Image Version: 20230205.1 +- OS Version: 10.0.17763 Build 4010 +- Image Version: 20230214.1 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -17,24 +16,24 @@ - Go 1.17.13 - Julia 1.8.5 - Kotlin 1.8.10 -- LLVM 15.0.5 -- Node 16.19.0 +- LLVM 15.0.7 +- Node 18.14.0 - Perl 5.32.1 -- PHP 8.2.2 +- PHP 8.2.3 - Python 3.7.9 - Ruby 2.5.9p229 ### Package Management - Chocolatey 1.2.1 -- Composer 2.5.2 -- Helm 3.11.0 -- Miniconda 22.11.1 (pre-installed on the image but not added to PATH) -- NPM 8.19.3 +- Composer 2.5.3 +- Helm 3.11.1 +- Miniconda 23.1.0 (pre-installed on the image but not added to PATH) +- NPM 9.3.1 - NuGet 6.4.0.123 - pip 23.0 (python 3.7) - Pipx 1.1.0 - RubyGems 2.7.6.3 -- Vcpkg (build from commit 0ba60bfef) +- Vcpkg (build from commit 93895b28e) - Yarn 1.22.19 #### Environment variables @@ -46,7 +45,7 @@ ### Project Management - Ant 1.10.13 - Gradle 7.6 -- Maven 3.8.7 +- Maven 3.9.0 - sbt 1.8.2 ### Tools @@ -55,19 +54,19 @@ - azcopy 10.17.0 - Bazel 6.0.0 - Bazelisk 1.13.2 -- Bicep 0.14.6 +- Bicep 0.14.46 - Cabal 3.8.1.0 - CMake 3.25.2 -- CodeQL Action Bundles 2.12.0 2.12.1 -- Docker 23.0.0 +- CodeQL Action Bundles 2.12.1 2.12.2 +- Docker 23.0.1 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.15.1 +- Docker Compose v2 2.16.0 - Docker-wincred 0.7.0 - ghc 9.4.4 -- Git 2.39.1.windows.1 +- Git 2.39.2.windows.1 - Git LFS 3.3.0 -- Google Cloud SDK 416.0.0 -- ImageMagick 7.1.0-60 +- Google Cloud SDK 418.0.0 +- ImageMagick 7.1.0-61 - InnoSetup 6.2.1 - jq 1.6 - Kind 0.17.0 @@ -79,7 +78,7 @@ - OpenSSL 1.1.1 - Packer 1.8.5 - Parcel 2.8.3 -- Pulumi 3.53.1 +- Pulumi 3.55.0 - R 4.2.2 - Service Fabric SDK 9.1.1436.9590 - Stack 2.9.3 @@ -89,27 +88,27 @@ - WinAppDriver 1.2.2009.02003 - WiX Toolset 3.11.2.4516 - yamllint 1.29.0 -- zstd 1.5.2 +- zstd 1.5.4 ### CLI Tools -- Alibaba Cloud CLI 3.0.145 -- AWS CLI 2.9.20 -- AWS SAM CLI 1.72.0 +- Alibaba Cloud CLI 3.0.149 +- AWS CLI 2.9.23 +- AWS SAM CLI 1.73.0 - AWS Session Manager CLI 1.2.398.0 -- Azure CLI 2.44.1 +- Azure CLI 2.45.0 - Azure DevOps CLI extension 0.26.0 - Cloud Foundry CLI 6.53.0 -- GitHub CLI 2.22.1 +- GitHub CLI 2.23.0 - Hub CLI 2.14.2 ### Rust Tools -- Cargo 1.67.0 -- Rust 1.67.0 -- Rustdoc 1.67.0 +- Cargo 1.67.1 +- Rust 1.67.1 +- Rustdoc 1.67.1 - Rustup 1.25.2 #### Packages -- bindgen 0.63.0 +- bindgen 0.64.0 - cargo-audit 0.17.4 - cargo-outdated 0.11.2 - cbindgen 0.24.3 @@ -117,12 +116,12 @@ - Rustfmt 1.5.1 ### Browsers and Drivers -- Google Chrome 109.0.5414.120 -- Chrome Driver 109.0.5414.74 -- Microsoft Edge 109.0.1518.78 -- Microsoft Edge Driver 109.0.1518.78 -- Mozilla Firefox 109.0.1 -- Gecko Driver 0.32.1 +- Google Chrome 110.0.5481.100 +- Chrome Driver 110.0.5481.77 +- Microsoft Edge 110.0.1587.41 +- Microsoft Edge Driver 110.0.1587.41 +- Mozilla Firefox 110.0 +- Gecko Driver 0.32.2 - IE Driver 4.8.0.0 - Selenium server 4.8.0 @@ -180,8 +179,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 3.7.9 - 3.8.10 - 3.9.13 -- 3.10.9 -- 3.11.1 +- 3.10.10 +- 3.11.2 #### PyPy - 2.7.18 [PyPy 7.3.11] @@ -204,7 +203,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Property | Value | | -------------------- | ------------------------------------------------------------------------------------------------------------------------------------ | | ServiceName | postgresql-x64-14 | -| Version | 14.6 | +| Version | 14.7 | | ServiceStatus | Stopped | | ServiceStartType | Disabled | | EnvironmentVariables | PGBIN=C:\Program Files\PostgreSQL\14\bin <br> PGDATA=C:\Program Files\PostgreSQL\14\data <br> PGROOT=C:\Program Files\PostgreSQL\14 | @@ -219,7 +218,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Database tools - Azure CosmosDb Emulator 2.14.11.0 -- DacFx 16.1.6374.0 +- DacFx 16.1.8089.0 - MySQL 5.7.40.0 - SQL OLEDB Driver 18.6.3.0 - SQLPS 1.0 @@ -231,14 +230,14 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Nginx | 1.23.3 | C:\tools\nginx-1.23.3\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2019 -| Name | Version | Path | -| ----------------------------- | --------------- | -------------------------------------------------------------- | -| Visual Studio Enterprise 2019 | 16.11.33214.272 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | +| Name | Version | Path | +| ----------------------------- | -------------- | -------------------------------------------------------------- | +| Visual Studio Enterprise 2019 | 16.11.33328.57 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | #### Workloads, components and extensions | Package | Version | | ------------------------------------------------------------------------- | --------------- | -| Component.Android.NDK.R16B | 16.11.33213.291 | +| Component.Android.NDK.R16B | 16.11.33328.57 | | Component.Android.SDK25.Private | 16.0.28625.61 | | Component.Android.SDK30 | 16.10.31205.252 | | Component.Ant | 1.9.3.8 | @@ -247,7 +246,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Component.MDD.Android | 16.0.28517.75 | | Component.MDD.Linux | 16.5.29515.121 | | Component.MDD.Linux.GCC.arm | 16.5.29515.121 | -| Component.Microsoft.VisualStudio.LiveShare | 1.0.4440 | +| Component.Microsoft.VisualStudio.LiveShare | 1.0.4441 | | Component.Microsoft.VisualStudio.RazorExtension | 16.10.31205.252 | | Component.Microsoft.VisualStudio.Tools.Applications | 16.0.31110.1 | | Component.Microsoft.VisualStudio.Web.AzureFunctions | 16.10.31205.252 | @@ -455,7 +454,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Workload.NetWeb | 16.11.33214.272 | | Microsoft.VisualStudio.Workload.Node | 16.10.31205.180 | | Microsoft.VisualStudio.Workload.Office | 16.11.33214.272 | -| Microsoft.VisualStudio.Workload.Python | 16.11.32001.129 | +| Microsoft.VisualStudio.Workload.Python | 16.11.33328.57 | | Microsoft.VisualStudio.Workload.Universal | 16.11.33214.272 | | Microsoft.VisualStudio.Workload.VisualStudioExtension | 16.10.31205.180 | | ms-biztalk.BizTalk | 3.13.2.0 | @@ -496,11 +495,11 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 10.0.22621.0 ### .NET Core Tools -- .NET Core SDK: 3.1.120, 3.1.202, 3.1.302, 3.1.426, 6.0.113, 6.0.203, 6.0.308, 6.0.405 +- .NET Core SDK: 3.1.120, 3.1.202, 3.1.302, 3.1.426, 6.0.114, 6.0.203, 6.0.309, 6.0.406 - .NET Framework: 4.7.2, 4.8 -- Microsoft.AspNetCore.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 6.0.5, 6.0.13 -- Microsoft.NETCore.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 6.0.5, 6.0.13 -- Microsoft.WindowsDesktop.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 6.0.5, 6.0.13 +- Microsoft.AspNetCore.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 6.0.5, 6.0.14 +- Microsoft.NETCore.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 6.0.5, 6.0.14 +- Microsoft.WindowsDesktop.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 6.0.5, 6.0.14 - nbgv 3.5.119+5d25f54fec ### PowerShell Tools @@ -513,7 +512,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Az (Cached): 1.0.0.zip, 1.6.0.zip, 2.3.2.zip, 2.6.0.zip, 3.1.0.zip, 3.5.0.zip, 3.8.0.zip, 4.3.0.zip, 4.4.0.zip, 4.7.0.zip, 5.5.0.zip, 5.9.0.zip, 6.6.0.zip, 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.264 +- AWSPowershell: 4.1.270 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 - Microsoft.Graph: 1.21.0 @@ -533,9 +532,9 @@ All other versions are saved but not installed. | Package Name | Version | | -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 8.0 | -| Android SDK Build-tools | 33.0.0 33.0.1<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3<br>26.0.0 26.0.1 26.0.2 26.0.3<br>25.0.0 25.0.1 25.0.2 25.0.3<br>24.0.0 24.0.1 24.0.2 24.0.3<br>23.0.1 23.0.2 23.0.3<br>22.0.1<br>21.1.2<br>20.0.0<br>19.1.0 | +| Android SDK Build-tools | 33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3<br>26.0.0 26.0.1 26.0.2 26.0.3<br>25.0.0 25.0.1 25.0.2 25.0.3<br>24.0.0 24.0.1 24.0.2 24.0.3<br>23.0.1 23.0.2 23.0.3<br>22.0.1<br>21.1.2<br>20.0.0<br>19.1.0 | | Android SDK Platforms | android-33-ext4 (rev 1)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3)<br>android-26 (rev 2)<br>android-25 (rev 3)<br>android-24 (rev 2)<br>android-23 (rev 3)<br>android-22 (rev 2)<br>android-21 (rev 2)<br>android-20 (rev 2)<br>android-19 (rev 4) | -| Android SDK Platform-Tools | 33.0.3 | +| Android SDK Platform-Tools | 34.0.0 | | Android SDK Tools | 26.1.1 | | Android Support Repository | 47.0.0 | | CMake | 3.10.2<br>3.18.1<br>3.22.1 | @@ -561,6 +560,6 @@ All other versions are saved but not installed. | mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:4023e36afe8362191abad7aba8bb8044095fe23826dea4cb7183de912b0ddbdc | 2023-01-10 | | mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:01992d00b171c830916b9600a380ef5c291c8670db86235255335c1f65bde911 | 2023-01-10 | | mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:5049a4803de68e7c5aa2840186ea3de1462db56a60329479d259dc48700d19a0 | 2023-01-10 | -| mcr.microsoft.com/windows/nanoserver:1809 | sha256:18161f2add9622768033bacf4f069d6d618a734aa9587c6d213fc15d99bcb057 | 2023-01-07 | -| mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:192adcdbbcebf7000d95a0ca34422709127e20b0334e6968381a198c816c9f9f | 2023-01-07 | +| mcr.microsoft.com/windows/nanoserver:1809 | sha256:fc2d54de31f170c0bef160137b4dc0a80c2105a218b248dc71c754e1fcabd14f | 2023-02-07 | +| mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:46b40e526196d42b78d6bc777529203fd51467b095ddcb7acc87fc475c3c5e55 | 2023-02-07 | From 6b424ca736d5a5d9929beba8514b2c3dbaf0bbb6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 15 Feb 2023 23:54:08 +0000 Subject: [PATCH 1746/3485] Updating readme file for win22 version 20230214.1 (#7111) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2022-Readme.md | 177 +++++++++++++++---------------- 1 file changed, 88 insertions(+), 89 deletions(-) diff --git a/images/win/Windows2022-Readme.md b/images/win/Windows2022-Readme.md index 6ed1707ea16f..4858297088fa 100644 --- a/images/win/Windows2022-Readme.md +++ b/images/win/Windows2022-Readme.md @@ -1,11 +1,10 @@ | Announcements | |-| | [[all OSs] Default Nodejs version will be set to 18 on February, 13](https://github.com/actions/runner-images/issues/7002) | -| [[All OSs] .NET 5.x will be removed from the images on February, 6](https://github.com/actions/runner-images/issues/6840) | *** # Windows Server 2022 -- OS Version: 10.0.20348 Build 1487 -- Image Version: 20230206.1 +- OS Version: 10.0.20348 Build 1547 +- Image Version: 20230214.1 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -17,24 +16,24 @@ - Go 1.17.13 - Julia 1.8.5 - Kotlin 1.8.10 -- LLVM 15.0.5 -- Node 16.19.0 +- LLVM 15.0.7 +- Node 18.14.0 - Perl 5.32.1 -- PHP 8.2.2 +- PHP 8.2.3 - Python 3.9.13 - Ruby 3.0.5p211 ### Package Management - Chocolatey 1.2.1 -- Composer 2.5.2 -- Helm 3.11.0 -- Miniconda 22.11.1 (pre-installed on the image but not added to PATH) -- NPM 8.19.3 +- Composer 2.5.3 +- Helm 3.11.1 +- Miniconda 23.1.0 (pre-installed on the image but not added to PATH) +- NPM 9.3.1 - NuGet 6.4.0.123 - pip 23.0 (python 3.9) - Pipx 1.1.0 - RubyGems 3.2.33 -- Vcpkg (build from commit 185a7aa23) +- Vcpkg (build from commit 93895b28e) - Yarn 1.22.19 #### Environment variables @@ -55,18 +54,18 @@ - azcopy 10.17.0 - Bazel 6.0.0 - Bazelisk 1.13.2 -- Bicep 0.14.6 +- Bicep 0.14.46 - Cabal 3.8.1.0 - CMake 3.25.2 -- CodeQL Action Bundles 2.12.0 2.12.1 -- Docker 23.0.0 +- CodeQL Action Bundles 2.12.1 2.12.2 +- Docker 23.0.1 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.15.1 +- Docker Compose v2 2.16.0 - Docker-wincred 0.7.0 - ghc 9.4.4 -- Git 2.39.1.windows.1 +- Git 2.39.2.windows.1 - Git LFS 3.3.0 -- ImageMagick 7.1.0-60 +- ImageMagick 7.1.0-61 - InnoSetup 6.2.1 - jq 1.6 - Kind 0.17.0 @@ -77,7 +76,7 @@ - NSIS 3.08 - OpenSSL 1.1.1 - Packer 1.8.5 -- Pulumi 3.53.1 +- Pulumi 3.55.0 - R 4.2.2 - Service Fabric SDK 9.1.1436.9590 - Stack 2.9.3 @@ -87,26 +86,26 @@ - WinAppDriver 1.2.2009.02003 - WiX Toolset 3.11.2.4516 - yamllint 1.29.0 -- zstd 1.5.2 +- zstd 1.5.4 ### CLI Tools -- Alibaba Cloud CLI 3.0.145 -- AWS CLI 2.9.21 -- AWS SAM CLI 1.72.0 +- Alibaba Cloud CLI 3.0.149 +- AWS CLI 2.9.23 +- AWS SAM CLI 1.73.0 - AWS Session Manager CLI 1.2.398.0 -- Azure CLI 2.44.1 +- Azure CLI 2.45.0 - Azure DevOps CLI extension 0.26.0 -- GitHub CLI 2.22.1 +- GitHub CLI 2.23.0 - Hub CLI 2.14.2 ### Rust Tools -- Cargo 1.67.0 -- Rust 1.67.0 -- Rustdoc 1.67.0 +- Cargo 1.67.1 +- Rust 1.67.1 +- Rustdoc 1.67.1 - Rustup 1.25.2 #### Packages -- bindgen 0.63.0 +- bindgen 0.64.0 - cargo-audit 0.17.4 - cargo-outdated 0.11.2 - cbindgen 0.24.3 @@ -114,12 +113,12 @@ - Rustfmt 1.5.1 ### Browsers and Drivers -- Google Chrome 109.0.5414.120 -- Chrome Driver 109.0.5414.74 -- Microsoft Edge 109.0.1518.78 -- Microsoft Edge Driver 109.0.1518.78 -- Mozilla Firefox 109.0.1 -- Gecko Driver 0.32.1 +- Google Chrome 110.0.5481.100 +- Chrome Driver 110.0.5481.77 +- Microsoft Edge 110.0.1587.41 +- Microsoft Edge Driver 110.0.1587.41 +- Mozilla Firefox 110.0 +- Gecko Driver 0.32.2 - IE Driver 4.8.0.0 - Selenium server 4.8.0 @@ -171,8 +170,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 3.7.9 - 3.8.10 - 3.9.13 -- 3.10.9 -- 3.11.1 +- 3.10.10 +- 3.11.2 #### PyPy - 2.7.18 [PyPy 7.3.11] @@ -191,7 +190,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Property | Value | | -------------------- | ------------------------------------------------------------------------------------------------------------------------------------ | | ServiceName | postgresql-x64-14 | -| Version | 14.6 | +| Version | 14.7 | | ServiceStatus | Stopped | | ServiceStartType | Disabled | | EnvironmentVariables | PGBIN=C:\Program Files\PostgreSQL\14\bin <br> PGDATA=C:\Program Files\PostgreSQL\14\data <br> PGROOT=C:\Program Files\PostgreSQL\14 | @@ -206,7 +205,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Database tools - Azure CosmosDb Emulator 2.14.11.0 -- DacFx 16.1.6374.0 +- DacFx 16.1.8089.0 - MySQL 8.0.31.0 - SQL OLEDB Driver 18.6.3.0 - SQLPS 1.0 @@ -220,7 +219,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Visual Studio Enterprise 2022 | Name | Version | Path | | ----------------------------- | -------------- | -------------------------------------------------------- | -| Visual Studio Enterprise 2022 | 17.4.33213.308 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | +| Visual Studio Enterprise 2022 | 17.4.33403.182 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | #### Workloads, components and extensions | Package | Version | @@ -229,14 +228,14 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Component.Android.Emulator.MDD | 17.4.33006.217 | | Component.Android.NDK.R23C | 17.4.33006.217 | | Component.Android.SDK.MAUI | 17.4.33118.351 | -| Component.CPython39.x64 | 3.9.7 | +| Component.CPython39.x64 | 3.9.13 | | Component.Dotfuscator | 17.4.33006.217 | | Component.HAXM.Private | 17.4.33006.217 | | Component.Linux.CMake | 17.4.33006.217 | | Component.MDD.Android | 17.4.33006.217 | | Component.MDD.Linux | 17.4.33006.217 | | Component.MDD.Linux.GCC.arm | 17.4.33006.217 | -| Component.Microsoft.VisualStudio.LiveShare.2022 | 1.0.5716 | +| Component.Microsoft.VisualStudio.LiveShare.2022 | 1.0.5717 | | Component.Microsoft.VisualStudio.RazorExtension | 17.4.33006.217 | | Component.Microsoft.VisualStudio.Web.AzureFunctions | 17.4.33006.217 | | Component.Microsoft.Web.LibraryManager | 17.4.33006.217 | @@ -252,14 +251,14 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Component.WixToolset.VisualStudioExtension.Schemas3 | 1.0.0.22 | | Component.Xamarin | 17.4.33006.217 | | Component.Xamarin.RemotedSimulator | 17.4.33006.217 | -| ios | 16.1.17.0 | -| maccatalyst | 16.1.17.0 | -| maui.android | 7.0.52.0 | -| maui.blazor | 7.0.52.0 | -| maui.core | 7.0.52.0 | -| maui.ios | 7.0.52.0 | -| maui.maccatalyst | 7.0.52.0 | -| maui.windows | 7.0.52.0 | +| ios | 16.2.36.0 | +| maccatalyst | 16.2.36.0 | +| maui.android | 7.0.59.0 | +| maui.blazor | 7.0.59.0 | +| maui.core | 7.0.59.0 | +| maui.ios | 7.0.59.0 | +| maui.maccatalyst | 7.0.59.0 | +| maui.windows | 7.0.59.0 | | Microsoft.Component.Azure.DataLake.Tools | 17.4.33006.217 | | Microsoft.Component.ClickOnce | 17.4.33006.217 | | Microsoft.Component.CodeAnalysis.SDK | 17.4.33006.217 | @@ -283,21 +282,21 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.Net.ComponentGroup.4.8.DeveloperTools | 17.4.33006.217 | | Microsoft.Net.ComponentGroup.DevelopmentPrerequisites | 17.4.33006.217 | | Microsoft.Net.ComponentGroup.TargetingPacks.Common | 17.4.33006.217 | -| microsoft.net.runtime.android | 7.0.222.60605 | -| microsoft.net.runtime.android.aot | 7.0.222.60605 | -| microsoft.net.runtime.android.aot.net6 | 7.0.222.60605 | -| microsoft.net.runtime.android.net6 | 7.0.222.60605 | -| microsoft.net.runtime.ios | 7.0.222.60605 | -| microsoft.net.runtime.ios.net6 | 7.0.222.60605 | -| microsoft.net.runtime.maccatalyst | 7.0.222.60605 | -| microsoft.net.runtime.maccatalyst.net6 | 7.0.222.60605 | -| microsoft.net.runtime.mono.tooling | 7.0.222.60605 | -| microsoft.net.runtime.mono.tooling.net6 | 7.0.222.60605 | -| microsoft.net.sdk.emscripten.net7 | 7.0.7.7902 | +| microsoft.net.runtime.android | 7.0.323.6910 | +| microsoft.net.runtime.android.aot | 7.0.323.6910 | +| microsoft.net.runtime.android.aot.net6 | 7.0.323.6910 | +| microsoft.net.runtime.android.net6 | 7.0.323.6910 | +| microsoft.net.runtime.ios | 7.0.323.6910 | +| microsoft.net.runtime.ios.net6 | 7.0.323.6910 | +| microsoft.net.runtime.maccatalyst | 7.0.323.6910 | +| microsoft.net.runtime.maccatalyst.net6 | 7.0.323.6910 | +| microsoft.net.runtime.mono.tooling | 7.0.323.6910 | +| microsoft.net.runtime.mono.tooling.net6 | 7.0.323.6910 | +| microsoft.net.sdk.emscripten.net7 | 7.0.8.6204 | | Microsoft.NetCore.Component.DevelopmentTools | 17.4.33006.217 | -| Microsoft.NetCore.Component.Runtime.6.0 | 17.4.33213.308 | -| Microsoft.NetCore.Component.Runtime.7.0 | 17.4.33213.308 | -| Microsoft.NetCore.Component.SDK | 17.4.33213.308 | +| Microsoft.NetCore.Component.Runtime.6.0 | 17.4.33402.68 | +| Microsoft.NetCore.Component.Runtime.7.0 | 17.4.33402.68 | +| Microsoft.NetCore.Component.SDK | 17.4.33402.68 | | Microsoft.NetCore.Component.Web | 17.4.33006.217 | | Microsoft.VisualStudio.Component.AppInsights.Tools | 17.4.33006.217 | | Microsoft.VisualStudio.Component.AspNet | 17.4.33006.217 | @@ -329,13 +328,13 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Component.Graphics | 17.4.33006.217 | | Microsoft.VisualStudio.Component.Graphics.Tools | 17.4.33006.217 | | Microsoft.VisualStudio.Component.IISExpress | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.IntelliCode | 17.4.33213.308 | +| Microsoft.VisualStudio.Component.IntelliCode | 17.4.33402.68 | | Microsoft.VisualStudio.Component.IntelliTrace.FrontEnd | 17.4.33006.217 | | Microsoft.VisualStudio.Component.JavaScript.Diagnostics | 17.4.33006.217 | | Microsoft.VisualStudio.Component.JavaScript.TypeScript | 17.4.33006.217 | | Microsoft.VisualStudio.Component.LinqToSql | 17.4.33006.217 | | Microsoft.VisualStudio.Component.LiveUnitTesting | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.ManagedDesktop.Core | 17.4.33006.217 | +| Microsoft.VisualStudio.Component.ManagedDesktop.Core | 17.4.33402.68 | | Microsoft.VisualStudio.Component.ManagedDesktop.Prerequisites | 17.4.33006.217 | | Microsoft.VisualStudio.Component.Merq | 17.4.33006.217 | | Microsoft.VisualStudio.Component.MonoDebugger | 17.4.33006.217 | @@ -465,12 +464,12 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core | 17.4.33006.217 | | Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Llvm.Clang | 17.4.33015.44 | | Microsoft.VisualStudio.ComponentGroup.UWP.NetCoreAndStandard | 17.4.33006.217 | -| Microsoft.VisualStudio.ComponentGroup.UWP.Support | 17.4.33006.217 | +| Microsoft.VisualStudio.ComponentGroup.UWP.Support | 17.4.33402.68 | | Microsoft.VisualStudio.ComponentGroup.UWP.VC.v142 | 17.4.33006.217 | | Microsoft.VisualStudio.ComponentGroup.UWP.Xamarin | 17.4.33006.217 | | Microsoft.VisualStudio.ComponentGroup.VC.Tools.142.x86.x64 | 17.4.33006.217 | -| Microsoft.VisualStudio.ComponentGroup.VisualStudioExtension.Prerequisites | 17.4.33006.217 | -| Microsoft.VisualStudio.ComponentGroup.Web | 17.4.33006.217 | +| Microsoft.VisualStudio.ComponentGroup.VisualStudioExtension.Prerequisites | 17.4.33402.68 | +| Microsoft.VisualStudio.ComponentGroup.Web | 17.4.33402.68 | | Microsoft.VisualStudio.ComponentGroup.Web.CloudTools | 17.4.33006.217 | | Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions | 17.4.33006.217 | | Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.CMake | 17.4.33006.217 | @@ -485,18 +484,18 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Workload.NativeDesktop | 17.4.33006.217 | | Microsoft.VisualStudio.Workload.NativeGame | 17.4.33006.217 | | Microsoft.VisualStudio.Workload.NativeMobile | 17.4.33006.217 | -| Microsoft.VisualStudio.Workload.NetCrossPlat | 17.4.33006.217 | +| Microsoft.VisualStudio.Workload.NetCrossPlat | 17.4.33402.68 | | Microsoft.VisualStudio.Workload.NetWeb | 17.4.33006.217 | | Microsoft.VisualStudio.Workload.Node | 17.4.33006.217 | | Microsoft.VisualStudio.Workload.Office | 17.4.33006.217 | | Microsoft.VisualStudio.Workload.Python | 17.4.33006.217 | | Microsoft.VisualStudio.Workload.Universal | 17.4.33006.217 | | Microsoft.VisualStudio.Workload.VisualStudioExtension | 17.4.33006.217 | -| runtimes.ios | 7.0.222.60605 | -| runtimes.ios.net6 | 7.0.222.60605 | -| runtimes.maccatalyst | 7.0.222.60605 | -| runtimes.maccatalyst.net6 | 7.0.222.60605 | -| wasm.tools | 7.0.222.60605 | +| runtimes.ios | 7.0.323.6910 | +| runtimes.ios.net6 | 7.0.323.6910 | +| runtimes.maccatalyst | 7.0.323.6910 | +| runtimes.maccatalyst.net6 | 7.0.323.6910 | +| wasm.tools | 7.0.323.6910 | | ProBITools.MicrosoftAnalysisServicesModelingProjects2022 | 3.0.4 | | ProBITools.MicrosoftReportProjectsforVisualStudio2022 | 3.0.1 | | VisualStudioClient.MicrosoftVisualStudio2022InstallerProjects | 2.0.0 | @@ -512,12 +511,12 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft Visual C++ 2010 Redistributable | x86 | 10.0.40219 | | Microsoft Visual C++ 2013 Additional Runtime | x64 | 12.0.40660 | | Microsoft Visual C++ 2013 Minimum Runtime | x64 | 12.0.40660 | -| Microsoft Visual C++ 2022 Additional Runtime | x64 | 14.34.31931 | -| Microsoft Visual C++ 2022 Debug Runtime | x64 | 14.34.31931 | -| Microsoft Visual C++ 2022 Minimum Runtime | x64 | 14.34.31931 | -| Microsoft Visual C++ 2022 Additional Runtime | x86 | 14.34.31931 | -| Microsoft Visual C++ 2022 Debug Runtime | x86 | 14.34.31931 | -| Microsoft Visual C++ 2022 Minimum Runtime | x86 | 14.34.31931 | +| Microsoft Visual C++ 2022 Additional Runtime | x64 | 14.34.31938 | +| Microsoft Visual C++ 2022 Debug Runtime | x64 | 14.34.31938 | +| Microsoft Visual C++ 2022 Minimum Runtime | x64 | 14.34.31938 | +| Microsoft Visual C++ 2022 Additional Runtime | x86 | 14.34.31938 | +| Microsoft Visual C++ 2022 Debug Runtime | x86 | 14.34.31938 | +| Microsoft Visual C++ 2022 Minimum Runtime | x86 | 14.34.31938 | #### Installed Windows SDKs - 10.0.17763.0 @@ -527,11 +526,11 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 10.0.22621.0 ### .NET Core Tools -- .NET Core SDK: 3.1.120, 3.1.202, 3.1.302, 3.1.426, 6.0.113, 6.0.203, 6.0.308, 6.0.405, 7.0.102 +- .NET Core SDK: 3.1.120, 3.1.202, 3.1.302, 3.1.426, 6.0.114, 6.0.203, 6.0.309, 6.0.406, 7.0.103 - .NET Framework: 4.8, 4.8.1 -- Microsoft.AspNetCore.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 6.0.5, 6.0.13, 7.0.2 -- Microsoft.NETCore.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 6.0.5, 6.0.13, 7.0.2 -- Microsoft.WindowsDesktop.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 6.0.5, 6.0.13, 7.0.2 +- Microsoft.AspNetCore.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 6.0.5, 6.0.13, 6.0.14, 7.0.3 +- Microsoft.NETCore.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 6.0.5, 6.0.13, 6.0.14, 7.0.3 +- Microsoft.WindowsDesktop.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 6.0.5, 6.0.14, 7.0.3 - nbgv 3.5.119+5d25f54fec ### PowerShell Tools @@ -544,7 +543,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Az (Cached): 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.264 +- AWSPowershell: 4.1.270 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 - Microsoft.Graph: 1.21.0 @@ -565,9 +564,9 @@ All other versions are saved but not installed. | -------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 8.0 | | Android Emulator | 31.2.9 | -| Android SDK Build-tools | 33.0.0 33.0.1<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | +| Android SDK Build-tools | 33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | | Android SDK Platforms | android-33-ext4 (rev 1)<br>android-33 (rev 1)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | -| Android SDK Platform-Tools | 33.0.3 | +| Android SDK Platform-Tools | 34.0.0 | | Android Support Repository | 47.0.0 | | CMake | 3.18.1<br>3.22.1 | | Google Play services | 49 | @@ -591,6 +590,6 @@ All other versions are saved but not installed. | mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2022 | sha256:3fed696d6f08740a9e1d46f30f1162765b2e1109476761ce93e8fbeef5f54caf | 2023-01-10 | | mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2022 | sha256:623206b7da179ddb4d4e5e3695889d03f72b368bdde4e05d70f8fde75371bdac | 2023-01-10 | | mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:d8e9237fba3770319c899b8a87e54fb3427a3fa8617d2de78cec6e3465d71cfc | 2023-01-10 | -| mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:b4248836dea118c48481b821d9fbb40daf7e207b48f5e6edc9da6837050b0f65 | 2023-01-06 | -| mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:dfd3ce22e4b6e987ff2bfb3efe5e4912512fce35660be2ae5faa91e6f4da9748 | 2023-01-06 | +| mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:786a24be2bd1945bee9701f95a71d8573ace8641c112dc27206f826bef0229c1 | 2023-02-07 | +| mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:5662262ca25622f4f8ad593481dd58dea47713bce5e6c9fdef9089a92e7c75b1 | 2023-02-07 | From 362b112a77d6e0ca63938da8030a8dce0b87658e Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Thu, 16 Feb 2023 11:19:38 +0100 Subject: [PATCH 1747/3485] [Windows] Update Rustup download link (#7106) --- images/win/scripts/Installers/Install-Rust.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/win/scripts/Installers/Install-Rust.ps1 b/images/win/scripts/Installers/Install-Rust.ps1 index 11d46b3d953c..1942b6b98c1e 100644 --- a/images/win/scripts/Installers/Install-Rust.ps1 +++ b/images/win/scripts/Installers/Install-Rust.ps1 @@ -9,7 +9,7 @@ $env:CARGO_HOME = "C:\Users\Default\.cargo" # Download the latest rustup-init.exe for Windows x64 # See https://rustup.rs/# -$rustupPath = Start-DownloadWithRetry -Url "https://win.rustup.rs/x86_64" -Name "rustup-init.exe" +$rustupPath = Start-DownloadWithRetry -Url "https://static.rust-lang.org/rustup/dist/x86_64-pc-windows-msvc/rustup-init.exe" -Name "rustup-init.exe" # Install Rust by running rustup-init.exe (disabling the confirmation prompt with -y) & $rustupPath -y --default-toolchain=stable --profile=minimal From bf50e0da6fd3107aabdf950a2fae72a98aaf939b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 16 Feb 2023 17:18:25 +0000 Subject: [PATCH 1748/3485] Updating readme file for macOS-11 version 20230214.1 (#7123) Co-authored-by: Image generation service account <no-reply@microsoft.com> --- images/macos/macos-11-Readme.md | 92 ++++++++++++++++----------------- 1 file changed, 45 insertions(+), 47 deletions(-) diff --git a/images/macos/macos-11-Readme.md b/images/macos/macos-11-Readme.md index 7971689b0042..23100d019ebf 100644 --- a/images/macos/macos-11-Readme.md +++ b/images/macos/macos-11-Readme.md @@ -1,18 +1,16 @@ | Announcements | |-| | [[all OSs] Default Nodejs version will be set to 18 on February, 13](https://github.com/actions/runner-images/issues/7002) | -| [[All OSs] .NET 5.x will be removed from the images on February, 6](https://github.com/actions/runner-images/issues/6840) | -| [The macOS 10.15 Actions runner image will begin deprecation on 5/31/22 and will be fully unsupported by 12/1/22 for GitHub and ADO](https://github.com/actions/runner-images/issues/5583) | *** # macOS 11 - OS Version: macOS 11.7.3 (20G1116) - Kernel Version: Darwin 20.6.0 -- Image Version: 20230205.1 +- Image Version: 20230214.1 ## Installed Software ### Language and Runtime -- .NET Core SDK: 3.1.101, 3.1.201, 3.1.302, 3.1.426, 6.0.405, 7.0.102 +- .NET Core SDK: 3.1.101, 3.1.201, 3.1.302, 3.1.426, 6.0.406, 7.0.102, 7.0.200 - Bash 3.2.57(1)-release - Clang/LLVM 13.0.0 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` @@ -29,13 +27,13 @@ - Kotlin 1.8.10-release-430 - Mono 6.12.0.188 - MSBuild 16.10.1.51301 (Mono 6.12.0.188) -- Node.js 16.19.0 +- Node.js 18.14.0 - NVM 0.39.3 - NVM - Cached node versions: 14.21.2, 16.19.0, 18.14.0 - Perl 5.36.0 - PHP 8.2.2 - Python 2.7.18 -- Python3 3.11.1 +- Python3 3.11.2 - R 4.2.2 - Ruby 2.7.7p221 @@ -43,16 +41,16 @@ - Bundler 2.4.6 - Carthage 0.39.0 - CocoaPods 1.11.3 -- Composer 2.5.2 -- Homebrew 3.6.20 -- Miniconda 22.11.1 -- NPM 8.19.3 +- Composer 2.5.3 +- Homebrew 3.6.21 +- Miniconda 23.1.0 +- NPM 9.3.1 - NuGet 6.3.1.1 - Pip 20.3.4 (python 2.7) - Pip3 23.0 (python 3.11) - Pipx 1.1.0 - RubyGems 3.4.6 -- Vcpkg 2023 (build from commit 0ba60bfef) +- Vcpkg 2023 (build from commit 93895b28e) - Yarn 1.22.19 #### Environment variables @@ -63,8 +61,8 @@ ### Project Management - Apache Ant 1.10.13 -- Apache Maven 3.8.7 -- Gradle 7.6 +- Apache Maven 3.9.0 +- Gradle 8.0 - Sbt 1.8.2 ### Utilities @@ -75,41 +73,41 @@ - bazelisk 1.16.0 - bsdtar 3.3.2 - available by 'tar' alias - Curl 7.87.0 -- Git 2.39.1 +- Git 2.39.2 - Git LFS 3.3.0 -- GitHub CLI 2.22.1 +- GitHub CLI 2.23.0 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.3 - gpg (GnuPG) 2.4.0 -- helm v3.11.0+g472c573 +- helm v3.11.1+g293b50c - Hub CLI 2.14.2 -- ImageMagick 7.1.0-60 +- ImageMagick 7.1.0-62 - jq 1.6 - mongo 5.0.14 - mongod 5.0.14 - Newman 5.3.2 -- OpenSSL 1.1.1s 1 Nov 2022 +- OpenSSL 1.1.1t 7 Feb 2023 - Packer 1.8.5 -- PostgreSQL 14.6 (Homebrew) -- psql (PostgreSQL) 14.6 (Homebrew) +- PostgreSQL 14.7 (Homebrew) +- psql (PostgreSQL) 14.7 (Homebrew) - Sox 14.4.2 - Subversion (SVN) 1.14.2 - Switchaudio-osx 1.1.0 - yq 4.30.8 -- zstd 1.5.2 +- zstd 1.5.4 ### Tools -- Aliyun CLI 3.0.141 -- App Center CLI 2.13.1 -- AWS CLI 2.9.21 -- AWS SAM CLI 1.72.0 +- Aliyun CLI 3.0.149 +- App Center CLI 2.13.2 +- AWS CLI 2.9.23 +- AWS SAM CLI 1.73.0 - AWS Session Manager CLI 1.2.398.0 -- Azure CLI 2.44.1 +- Azure CLI 2.45.0 - Azure CLI (azure-devops) 0.26.0 -- Bicep CLI 0.14.6 +- Bicep CLI 0.14.46 - Cabal 3.6.2.0 - Cmake 3.25.2 -- CodeQL Action Bundles 2.12.0 2.12.1 +- CodeQL Action Bundles 2.12.1 2.12.2 - Colima 0.5.2 - Fastlane 2.211.0 - GHC 9.4.4 @@ -125,20 +123,20 @@ - Yamllint 1.29.0 ### Browsers -- Safari 16.3 (16614.4.6.11.4) -- SafariDriver 16.3 (16614.4.6.11.4) -- Google Chrome 109.0.5414.119 -- ChromeDriver 109.0.5414.74 -- Microsoft Edge 109.0.1518.78 -- Microsoft Edge WebDriver 109.0.1518.78 +- Safari 16.3 (16614.4.6.11.6) +- SafariDriver 16.3 (16614.4.6.11.6) +- Google Chrome 110.0.5481.100 +- ChromeDriver 110.0.5481.77 +- Microsoft Edge 110.0.1587.41 +- Microsoft Edge WebDriver 110.0.1587.41 - Mozilla Firefox 109.0.1 -- geckodriver 0.32.1 +- geckodriver 0.32.2 - Selenium server 4.8.0 #### Environment variables | Name | Value | | --------------- | ---------------------------------------------- | -| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/109.0.5414.74 | +| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/110.0.5481.77 | | EDGEWEBDRIVER | /usr/local/share/edge_driver | | GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | @@ -168,8 +166,8 @@ - 3.7.15 - 3.8.16 - 3.9.16 -- 3.10.9 -- 3.11.1 +- 3.10.10 +- 3.11.2 #### PyPy - 2.7.18 [PyPy 7.3.11] @@ -188,13 +186,13 @@ - 1.19.5 ### Rust Tools -- Cargo 1.67.0 -- Rust 1.67.0 -- Rustdoc 1.67.0 +- Cargo 1.67.1 +- Rust 1.67.1 +- Rustdoc 1.67.1 - Rustup 1.25.2 #### Packages -- Bindgen 0.63.0 +- Bindgen 0.64.0 - Cargo-audit 0.17.4 - Cargo-outdated 0.11.2 - Cbindgen 0.24.3 @@ -205,7 +203,7 @@ - PowerShell 7.2.9 #### PowerShell Modules -- Az: 9.3.0 +- Az: 9.4.0 - MarkdownPS: 1.9 - Pester: 5.4.0 - PSScriptAnalyzer: 1.21.0 @@ -222,7 +220,7 @@ | Version | Build | Path | | -------------- | --------- | ------------------------------------ | | 2019 | 8.10.25.2 | /Applications/Visual Studio 2019.app | -| 2022 (default) | 17.4.4.12 | /Applications/Visual Studio.app | +| 2022 (default) | 17.4.5.8 | /Applications/Visual Studio.app | ##### Notes ``` @@ -338,10 +336,10 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" | Package Name | Version | | -------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 8.0 | -| Android Emulator | 31.3.15 | -| Android SDK Build-tools | 33.0.0 33.0.1<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | +| Android Emulator | 32.1.11 | +| Android SDK Build-tools | 33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | | Android SDK Platforms | android-33-ext4 (rev 1)<br>android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | -| Android SDK Platform-Tools | 33.0.3 | +| Android SDK Platform-Tools | 34.0.0 | | Android Support Repository | 47.0.0 | | CMake | 3.10.2<br>3.18.1<br>3.22.1 | | Google Play services | 49 | From c1a9cb6de68532aa7adb4824e3635d405d6441ac Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Fri, 17 Feb 2023 16:37:46 +0100 Subject: [PATCH 1749/3485] [Ubuntu] fix PHP software report (#7131) --- images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 index 46e9a450038b..3f5badf543e7 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 @@ -220,7 +220,7 @@ function Get-SbtVersion { function Get-PHPVersions { $result = Get-CommandResult "apt list --installed" -Multiline return $result.Output | Where-Object { $_ -match "^php\d+\.\d+/"} | ForEach-Object { - $_ -match "now (\d+:)?(?<version>\d+\.\d+\.\d+)-" | Out-Null + $_ -match "now (\d+:)?(?<version>\d+\.\d+\.\d+)" | Out-Null $Matches.version } } From ef4d5b3cd6179f871eddfe1cdb1dc189299c7a76 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 17 Feb 2023 20:15:53 +0000 Subject: [PATCH 1750/3485] Updating readme file for macOS-12 version 20230214.2 (#7121) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-12-Readme.md | 135 ++++++++++++++++---------------- 1 file changed, 67 insertions(+), 68 deletions(-) diff --git a/images/macos/macos-12-Readme.md b/images/macos/macos-12-Readme.md index 636d3bf97436..bef43bc482e3 100644 --- a/images/macos/macos-12-Readme.md +++ b/images/macos/macos-12-Readme.md @@ -1,18 +1,16 @@ | Announcements | |-| | [[all OSs] Default Nodejs version will be set to 18 on February, 13](https://github.com/actions/runner-images/issues/7002) | -| [[All OSs] .NET 5.x will be removed from the images on February, 6](https://github.com/actions/runner-images/issues/6840) | -| [The macOS 10.15 Actions runner image will begin deprecation on 5/31/22 and will be fully unsupported by 12/1/22 for GitHub and ADO](https://github.com/actions/runner-images/issues/5583) | *** # macOS 12 - OS Version: macOS 12.6.3 (21G419) - Kernel Version: Darwin 21.6.0 -- Image Version: 20230125.4 +- Image Version: 20230214.2 ## Installed Software ### Language and Runtime -- .NET Core SDK: 3.1.101, 3.1.201, 3.1.302, 3.1.426, 5.0.102, 5.0.202, 5.0.302, 5.0.408, 6.0.405, 7.0.102 +- .NET Core SDK: 3.1.101, 3.1.201, 3.1.302, 3.1.426, 6.0.406, 7.0.102, 7.0.200 - Bash 3.2.57(1)-release - Clang/LLVM 14.0.0 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` @@ -22,33 +20,33 @@ - GNU Fortran 12 (Homebrew GCC 12.2.0) - available by `gfortran-12` alias - Go 1.17.13 - Julia 1.8.5 -- Kotlin 1.8.0-release-345 +- Kotlin 1.8.10-release-430 - Mono 6.12.0.188 - MSBuild 16.10.1.51301 (Mono 6.12.0.188) -- Node.js 16.19.0 +- Node.js 18.14.0 - NVM 0.39.3 -- NVM - Cached node versions: 14.21.2, 16.19.0, 18.13.0 +- NVM - Cached node versions: 14.21.2, 16.19.0, 18.14.0 - Perl 5.36.0 -- PHP 8.2.1 +- PHP 8.2.2 - Python 2.7.18 -- Python3 3.11.1 +- Python3 3.11.2 - R 4.2.2 - Ruby 3.0.5p211 ### Package Management -- Bundler 2.4.5 -- Carthage 0.38.0 +- Bundler 2.4.6 +- Carthage 0.39.0 - CocoaPods 1.11.3 -- Composer 2.5.1 -- Homebrew 3.6.20 -- Miniconda 22.11.1 -- NPM 8.19.3 +- Composer 2.5.3 +- Homebrew 3.6.21 +- Miniconda 23.1.0 +- NPM 9.3.1 - NuGet 6.3.1.1 - Pip 20.3.4 (python 2.7) -- Pip3 22.3.1 (python 3.11) +- Pip3 23.0 (python 3.11) - Pipx 1.1.0 -- RubyGems 3.4.5 -- Vcpkg 2023 (build from commit 4efb7ed62) +- RubyGems 3.4.6 +- Vcpkg 2023 (build from commit 93895b28e) - Yarn 1.22.19 #### Environment variables @@ -59,8 +57,8 @@ ### Project Management - Apache Ant 1.10.13 -- Apache Maven 3.8.7 -- Gradle 7.6 +- Apache Maven 3.9.0 +- Gradle 8.0 - Sbt 1.8.2 ### Utilities @@ -68,50 +66,50 @@ - aria2 1.36.0 - azcopy 10.17.0 - bazel 6.0.0 -- bazelisk 1.15.0 +- bazelisk 1.16.0 - bsdtar 3.5.1 - available by 'tar' alias - Curl 7.87.0 -- Git 2.39.1 +- Git 2.39.2 - Git LFS 3.3.0 -- GitHub CLI 2.22.0 +- GitHub CLI 2.23.0 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.3 - gpg (GnuPG) 2.4.0 - Hub CLI 2.14.2 -- ImageMagick 7.1.0-58 +- ImageMagick 7.1.0-62 - jq 1.6 - mongo 5.0.14 - mongod 5.0.14 -- OpenSSL 1.1.1s 1 Nov 2022 +- OpenSSL 1.1.1t 7 Feb 2023 - Packer 1.8.5 -- PostgreSQL 14.6 (Homebrew) -- psql (PostgreSQL) 14.6 (Homebrew) +- PostgreSQL 14.7 (Homebrew) +- psql (PostgreSQL) 14.7 (Homebrew) - Sox 14.4.2 - Subversion (SVN) 1.14.2 - Switchaudio-osx 1.1.0 - Vagrant 2.3.4 - VirtualBox 6.1.38r153438 - yq 4.30.8 -- zstd 1.5.2 +- zstd 1.5.4 ### Tools -- App Center CLI 2.13.0 -- AWS CLI 2.9.18 -- AWS SAM CLI 1.71.0 +- App Center CLI 2.13.2 +- AWS CLI 2.9.23 +- AWS SAM CLI 1.73.0 - AWS Session Manager CLI 1.2.398.0 -- Azure CLI 2.44.1 -- Azure CLI (azure-devops) 0.25.0 -- Bicep CLI 0.13.1 +- Azure CLI 2.45.0 +- Azure CLI (azure-devops) 0.26.0 +- Bicep CLI 0.14.46 - Cabal 3.6.2.0 - Cmake 3.25.2 -- CodeQL Action Bundle 2.12.0 +- CodeQL Action Bundles 2.12.1 2.12.2 - Colima 0.5.2 - Fastlane 2.211.0 - GHC 9.4.4 - GHCup 0.1.19.0 - Jazzy 0.14.3 - Stack 2.9.1 -- SwiftFormat 0.50.7 +- SwiftFormat 0.50.8 - Swig 4.1.1 - Xcode Command Line Tools 14.2.0.0.1.1668646533 @@ -120,20 +118,20 @@ - Yamllint 1.29.0 ### Browsers -- Safari 16.3 (17614.4.6.11.4) -- SafariDriver 16.3 (17614.4.6.11.4) -- Google Chrome 109.0.5414.119 -- ChromeDriver 109.0.5414.74 -- Microsoft Edge 109.0.1518.61 -- Microsoft Edge WebDriver 109.0.1518.61 -- Mozilla Firefox 109.0 -- geckodriver 0.32.0 -- Selenium server 4.7.2 +- Safari 16.3 (17614.4.6.11.6) +- SafariDriver 16.3 (17614.4.6.11.6) +- Google Chrome 110.0.5481.100 +- ChromeDriver 110.0.5481.77 +- Microsoft Edge 110.0.1587.41 +- Microsoft Edge WebDriver 110.0.1587.41 +- Mozilla Firefox 109.0.1 +- geckodriver 0.32.2 +- Selenium server 4.8.0 #### Environment variables | Name | Value | | --------------- | ---------------------------------------------- | -| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/109.0.5414.74 | +| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/110.0.5481.77 | | EDGEWEBDRIVER | /usr/local/share/edge_driver | | GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | @@ -160,8 +158,8 @@ - 3.7.15 - 3.8.16 - 3.9.16 -- 3.10.9 -- 3.11.1 +- 3.10.10 +- 3.11.2 #### PyPy - 2.7.18 [PyPy 7.3.11] @@ -172,7 +170,7 @@ #### Node.js - 14.21.2 - 16.19.0 -- 18.13.0 +- 18.14.0 #### Go - 1.17.13 @@ -180,24 +178,24 @@ - 1.19.5 ### Rust Tools -- Cargo 1.66.1 -- Rust 1.66.1 -- Rustdoc 1.66.1 -- Rustup 1.25.1 +- Cargo 1.67.1 +- Rust 1.67.1 +- Rustdoc 1.67.1 +- Rustup 1.25.2 #### Packages -- Bindgen 0.63.0 +- Bindgen 0.64.0 - Cargo-audit 0.17.4 - Cargo-outdated 0.11.2 - Cbindgen 0.24.3 -- Clippy 0.1.66 +- Clippy 0.1.67 - Rustfmt 1.5.1-stable ### PowerShell Tools - PowerShell 7.2.9 #### PowerShell Modules -- Az: 9.3.0 +- Az: 9.4.0 - MarkdownPS: 1.9 - Pester: 5.4.0 - PSScriptAnalyzer: 1.21.0 @@ -214,7 +212,7 @@ | Version | Build | Path | | -------------- | --------- | ------------------------------------ | | 2019 | 8.10.25.2 | /Applications/Visual Studio 2019.app | -| 2022 (default) | 17.4.3.21 | /Applications/Visual Studio.app | +| 2022 (default) | 17.4.5.8 | /Applications/Visual Studio.app | ##### Notes ``` @@ -226,6 +224,7 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" #### Xamarin bundles | symlink | Xamarin.Mono | Xamarin.iOS | Xamarin.Mac | Xamarin.Android | | ----------------- | ------------ | ----------- | ----------- | --------------- | +| 6_12_22 | 6.12 | 16.1 | 9.0 | 13.1 | | 6_12_21 (default) | 6.12 | 16.0 | 8.12 | 13.1 | | 6_12_20 | 6.12 | 16.0 | 8.12 | 13.0 | | 6_12_19 | 6.12 | 15.12 | 8.12 | 13.0 | @@ -317,39 +316,39 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" | iOS 16.1 | 14.1 | iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro (9.7-inch) | | iOS 16.2 | 14.2 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro (9.7-inch) | | tvOS 15.0 | 13.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | -| tvOS 15.2 | 13.2.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | -| tvOS 15.4 | 13.3.1<br>13.4<br>13.4.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | +| tvOS 15.2 | 13.2.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (2nd generation) (at 1080p) | +| tvOS 15.4 | 13.3.1<br>13.4<br>13.4.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (2nd generation) (at 1080p) | | tvOS 16.0 | 13.1<br>13.2.1<br>13.3.1<br>13.4<br>13.4.1<br>14.0.1<br>14.1<br>14.2 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | | tvOS 16.1 | 13.1<br>13.2.1<br>13.3.1<br>13.4<br>13.4.1<br>14.0.1<br>14.1<br>14.2 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p)<br>Apple TV 4K (at 1080p) (2nd generation) | | watchOS 8.0 | 13.1 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | | watchOS 8.3 | 13.2.1 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | | watchOS 8.5 | 13.3.1<br>13.4<br>13.4.1 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | -| watchOS 9.0 | 13.1<br>13.2.1<br>13.3.1<br>13.4<br>13.4.1<br>14.0.1<br>14.1<br>14.2 | Apple Watch SE - 40mm (2nd generation)<br>Apple Watch SE - 44mm (2nd generation)<br>Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm<br>Apple Watch Series 8 - 41mm<br>Apple Watch Series 8 - 45mm<br>Apple Watch Ultra - 49mm | +| watchOS 9.0 | 13.1<br>13.2.1<br>13.3.1<br>13.4<br>13.4.1<br>14.0.1<br>14.1<br>14.2 | Apple Watch SE - 40mm (2nd generation)<br>Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm<br>Apple Watch Series 8 - 41mm<br>Apple Watch Series 8 - 45mm<br>Apple Watch Ultra - 49mm | | watchOS 9.1 | 13.1<br>13.2.1<br>13.3.1<br>13.4<br>13.4.1<br>14.0.1<br>14.1<br>14.2 | Apple Watch SE - 40mm (2nd generation)<br>Apple Watch SE - 44mm (2nd generation)<br>Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm<br>Apple Watch Series 8 - 41mm<br>Apple Watch Series 8 - 45mm<br>Apple Watch Ultra - 49mm | ### Android | Package Name | Version | | -------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 8.0 | -| Android Emulator | 31.3.14 | -| Android SDK Build-tools | 33.0.0 33.0.1<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | +| Android Emulator | 32.1.11 | +| Android SDK Build-tools | 33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | | Android SDK Platforms | android-33-ext4 (rev 1)<br>android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | -| Android SDK Platform-Tools | 33.0.3 | +| Android SDK Platform-Tools | 34.0.0 | | Android Support Repository | 47.0.0 | | CMake | 3.18.1<br>3.22.1 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 23.2.8568313<br>24.0.8215888<br>25.1.8937393 (default) | +| NDK | 23.2.8568313<br>24.0.8215888<br>25.2.9519653 (default) | | SDK Patch Applier v4 | 1 | #### Environment variables | Name | Value | | ----------------------- | -------------------------------------------------- | | ANDROID_HOME | /Users/runner/Library/Android/sdk | -| ANDROID_NDK | /Users/runner/Library/Android/sdk/ndk/25.1.8937393 | -| ANDROID_NDK_HOME | /Users/runner/Library/Android/sdk/ndk/25.1.8937393 | -| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/25.1.8937393 | -| ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk/25.1.8937393 | +| ANDROID_NDK | /Users/runner/Library/Android/sdk/ndk/25.2.9519653 | +| ANDROID_NDK_HOME | /Users/runner/Library/Android/sdk/ndk/25.2.9519653 | +| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/25.2.9519653 | +| ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk/25.2.9519653 | | ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | ### Miscellaneous From ce2e896fcb377ad12c28dab237bc69630732b8fd Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 17 Feb 2023 20:44:57 +0000 Subject: [PATCH 1751/3485] Updating readme file for ubuntu22 version 20230217.1 (#7132) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2204-Readme.md | 137 +++++++++++++++--------------- 1 file changed, 68 insertions(+), 69 deletions(-) diff --git a/images/linux/Ubuntu2204-Readme.md b/images/linux/Ubuntu2204-Readme.md index f52bdce29ba5..a9c92a95a0f5 100644 --- a/images/linux/Ubuntu2204-Readme.md +++ b/images/linux/Ubuntu2204-Readme.md @@ -1,13 +1,12 @@ | Announcements | |-| | [[all OSs] Default Nodejs version will be set to 18 on February, 13](https://github.com/actions/runner-images/issues/7002) | -| [[All OSs] .NET 5.x will be removed from the images on February, 6](https://github.com/actions/runner-images/issues/6840) | | [The Ubuntu 18.04 Actions runner image will begin deprecation on 2022/08/08 and will be fully unsupported by 2023/04/01](https://github.com/actions/runner-images/issues/6002) | *** # Ubuntu 22.04 - OS Version: 22.04.1 LTS -- Kernel Version: 5.15.0-1031-azure -- Image Version: 20230206.1 +- Kernel Version: 5.15.0-1033-azure +- Image Version: 20230217.1 ## Installed Software @@ -23,7 +22,7 @@ - Kotlin 1.8.10-release-430 - Mono 6.12.0.182 - MSBuild 16.10.1.31701 (Mono 6.12.0.182) -- Node.js 16.19.0 +- Node.js 18.14.1 - Perl 5.34.0 - Python 3.10.6 - Python3 3.10.6 @@ -32,16 +31,16 @@ ### Package Management - cpan 1.64 -- Helm 3.11.0 -- Homebrew 3.6.20 -- Miniconda 22.11.1 -- Npm 8.19.3 +- Helm 3.11.1 +- Homebrew 4.0.1 +- Miniconda 23.1.0 +- Npm 9.3.1 - NuGet 6.3.1.1 - Pip 22.0.2 - Pip3 22.0.2 - Pipx 1.1.0 - RubyGems 3.3.5 -- Vcpkg (build from commit 185a7aa23) +- Vcpkg (build from commit 31a159c1c) - Yarn 1.22.19 #### Environment variables @@ -59,7 +58,7 @@ to accomplish this. ``` ### Project Management -- Lerna 6.4.1 +- Lerna 6.5.1 ### Tools - Ansible 2.14.2 @@ -67,22 +66,22 @@ to accomplish this. - AzCopy 10.17.0 - available by `azcopy` and `azcopy10` aliases - Bazel 6.0.0 - Bazelisk 1.13.2 -- Bicep 0.14.6 +- Bicep 0.14.46 - Buildah 1.23.1 - CMake 3.25.2 -- CodeQL Action Bundles 2.12.0 2.12.1 +- CodeQL Action Bundles 2.12.1 2.12.2 - Docker Amazon ECR Credential Helper 0.6.0 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.15.1+azure-1 -- Docker-Buildx 0.10.2 -- Docker-Moby Client 20.10.22+azure-1 +- Docker Compose v2 2.16.0+azure-2 +- Docker-Buildx 0.10.3 +- Docker-Moby Client 20.10.23+azure-2 - Docker-Moby Server 20.10.22+azure-1 - Fastlane 2.211.0 -- Git 2.39.1 +- Git 2.39.2 - Git LFS 3.3.0 - Git-ftp 1.6.0 - Haveged 1.9.14 -- Heroku 7.67.2 +- Heroku 7.68.1 - jq 1.6 - Kind 0.17.0 - Kubectl 1.26.1 @@ -94,34 +93,34 @@ to accomplish this. - n 9.0.1 - Newman 5.3.2 - nvm 0.39.3 -- OpenSSL 3.0.2-0ubuntu1.7 -- Packer 1.8.5 +- OpenSSL 3.0.2-0ubuntu1.8 +- Packer 1.8.6 - Parcel 2.8.3 - Podman 3.4.4 -- Pulumi 3.53.1 +- Pulumi 3.55.0 - R 4.2.2 - Skopeo 1.4.1 - Sphinx Open Source Search Server 2.2.11 - SVN 1.14.1 -- Terraform 1.3.7 +- Terraform 1.3.9 - yamllint 1.29.0 - yq 4.30.8 -- zstd 1.5.2 +- zstd 1.5.4 ### CLI Tools -- Alibaba Cloud CLI 3.0.145 -- AWS CLI 2.9.21 +- Alibaba Cloud CLI 3.0.149 +- AWS CLI 2.10.0 - AWS CLI Session Manager Plugin 1.2.398.0 -- AWS SAM CLI 1.72.0 -- Azure CLI 2.44.1 +- AWS SAM CLI 1.73.0 +- Azure CLI 2.45.0 - Azure CLI (azure-devops) 0.26.0 -- GitHub CLI 2.22.1 -- Google Cloud SDK 416.0.0 +- GitHub CLI 2.23.0 +- Google Cloud SDK 418.0.0 - Hub CLI 2.14.2 -- Netlify CLI 12.10.0 -- OpenShift CLI 4.12.1 +- Netlify CLI 12.12.1 +- OpenShift CLI 4.12.3 - ORAS CLI 0.16.0 -- Vercel CLI 28.15.1 +- Vercel CLI 28.16.2 ### Java | Version | Vendor | Environment Variable | @@ -137,7 +136,7 @@ to accomplish this. ### PHP Tools - PHP: 8.1.2 -- Composer 2.5.2 +- Composer 2.5.4 - PHPUnit 8.5.32 ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. @@ -150,13 +149,13 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Stack 2.9.3 ### Rust Tools -- Cargo 1.67.0 -- Rust 1.67.0 -- Rustdoc 1.67.0 +- Cargo 1.67.1 +- Rust 1.67.1 +- Rustdoc 1.67.1 - Rustup 1.25.2 #### Packages -- Bindgen 0.63.0 +- Bindgen 0.64.0 - Cargo audit 0.17.4 - Cargo clippy 0.1.67 - Cargo outdated 0.11.2 @@ -164,14 +163,14 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.5.1 ### Browsers and Drivers -- Google Chrome 109.0.5414.119 -- ChromeDriver 109.0.5414.74 -- Chromium 109.0.5414.0 -- Microsoft Edge 109.0.1518.78 -- Microsoft Edge WebDriver 109.0.1518.78 +- Google Chrome 110.0.5481.100 +- ChromeDriver 110.0.5481.77 +- Chromium 110.0.5481.0 +- Microsoft Edge 110.0.1587.49 +- Microsoft Edge WebDriver 110.0.1587.49 - Selenium server 4.8.0 -- Mozilla Firefox 109.0.1 -- Geckodriver 0.32.1 +- Mozilla Firefox 110.0 +- Geckodriver 0.32.2 #### Environment variables | Name | Value | @@ -182,14 +181,14 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | ### .NET Tools -- .NET Core SDK: 6.0.405, 7.0.102 +- .NET Core SDK: 6.0.406, 7.0.103, 7.0.200 - nbgv 3.5.119+5d25f54fec ### Databases - sqlite3 3.37.2 #### PostgreSQL -- PostgreSQL 14.6 +- PostgreSQL 14.7 ``` User: postgres PostgreSQL service is disabled by default. @@ -207,7 +206,7 @@ Use the following command as a part of your job to start the service: 'sudo syst #### MS SQL - sqlcmd 17.10.0001.1 -- SqlPackage 16.1.6374.0 +- SqlPackage 16.1.8089.0 ### Cached Tools @@ -225,8 +224,8 @@ Use the following command as a part of your job to start the service: 'sudo syst - 3.7.15 - 3.8.16 - 3.9.16 -- 3.10.9 -- 3.11.1 +- 3.10.10 +- 3.11.2 #### PyPy - 3.7.13 [PyPy 7.3.9] @@ -242,7 +241,7 @@ Use the following command as a part of your job to start the service: 'sudo syst #### PowerShell Modules - Az: 9.3.0 - MarkdownPS: 1.9 -- Microsoft.Graph: 1.21.0 +- Microsoft.Graph: 1.22.0 - Pester: 5.4.0 - PSScriptAnalyzer: 1.21.0 @@ -256,9 +255,9 @@ Use the following command as a part of your job to start the service: 'sudo syst | Package Name | Version | | -------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 9.0 | -| Android Emulator | 31.3.15 | -| Android SDK Build-tools | 33.0.0 33.0.1<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | -| Android SDK Platform-Tools | 33.0.3 | +| Android Emulator | 32.1.11 | +| Android SDK Build-tools | 33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | +| Android SDK Platform-Tools | 34.0.0 | | Android SDK Platforms | android-33-ext4 (rev 1)<br>android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | | Android SDK Tools | 26.1.1 | | Android Support Repository | 47.0.0 | @@ -281,20 +280,20 @@ Use the following command as a part of your job to start the service: 'sudo syst ### Cached Docker images | Repository:Tag | Digest | Created | | ----------------------- | ------------------------------------------------------------------------ | ---------- | -| alpine:3.14 | sha256:4c869a63e1b7c0722fed1e402a6466610327c3b83bdddb94bd94fb71da7f638a | 2022-08-09 | -| alpine:3.15 | sha256:cf34c62ee8eb3fe8aa24c1fab45d7e9d12768d945c3f5a6fd6a63d901e898479 | 2022-08-09 | -| alpine:3.16 | sha256:b95359c2505145f16c6aa384f9cc74eeff78eb36d308ca4fd902eeeb0a0b161b | 2022-11-12 | -| buildpack-deps:bullseye | sha256:e4cd4f65bb933873e8ea1178d59981fbeb714ed97e962ff7f58324da1f8f06c9 | 2023-02-04 | -| buildpack-deps:buster | sha256:a67b72dfcd396cf840cc13dca1edcd8272c33fbfa0793f4f6e6fe658b54e98d5 | 2023-02-04 | -| debian:10 | sha256:c67afad7f1e94fe12868cd75bd5cf0c5bc9d0424f1516329aa76ec554b18ca57 | 2023-02-04 | -| debian:11 | sha256:92277f7108c432febe41beffd367dbb6dac60b9fbfe517c77208e6457eafe22b | 2023-02-04 | -| moby/buildkit:latest | sha256:f092403997f04742b549811ca2402d88207afbf33656eb1cf34aa7fe8a8511ac | 2023-01-26 | -| node:14 | sha256:eb709cd9ccbc70f194353d7f4227c52406a9dc6714d798666252d14e344422b2 | 2023-02-04 | -| node:14-alpine | sha256:2c6a909495ef3761328c10945cbe84c06d079f7ca49dc24271e73be8cab85ad7 | 2023-01-09 | -| node:16 | sha256:367b3b89399e6bd52746180c7b348c313015fc637d06a1f0e0ccb983fd52bfd1 | 2023-02-04 | -| node:16-alpine | sha256:1298fd170c45954fec3d4d063437750f89802d72743816663664cfe9aa152b4b | 2023-01-09 | -| node:18 | sha256:0d8bf0e743a752d8d01e9ff8aba21ac15a0ad1a3d2a2b8df90764d427618c791 | 2023-02-04 | -| node:18-alpine | sha256:bc329c7332cffc30c2d4801e38df03cbfa8dcbae2a7a52a449db104794f168a3 | 2023-02-03 | +| alpine:3.14 | sha256:560e7a4fa5c891d1830f5591c80b8e472fa6cd386b7254cdf65ccc3249292a34 | 2023-02-11 | +| alpine:3.15 | sha256:689659b1f08e9fdfb85190144098c378beb5a53b328f7ced7883a74a1157c709 | 2023-02-11 | +| alpine:3.16 | sha256:1bd67c81e4ad4b8f4a5c1c914d7985336f130e5cefb3e323654fd09d6bcdbbe2 | 2023-02-11 | +| buildpack-deps:bullseye | sha256:40b14eb195795a586ac132c9b506253bc3e4ee7f48a63b685e5bf37e80b774cf | 2023-02-09 | +| buildpack-deps:buster | sha256:a3e4aaa53bf83302adfb9d8b9ba3996948e4605baac297921d3a173c14603748 | 2023-02-09 | +| debian:10 | sha256:233c3bbc892229c82da7231980d50adceba4db56a08c0b7053a4852782703459 | 2023-02-09 | +| debian:11 | sha256:43ef0c6c3585d5b406caa7a0f232ff5a19c1402aeb415f68bcd1cf9d10180af8 | 2023-02-09 | +| moby/buildkit:latest | sha256:751921dc37d2f842de38c9387f891fe6ae7d80f03d050ea98f780d7e0874ba00 | 2023-02-13 | +| node:14 | sha256:0443d511c77586fbeff8e32ea55565acbcf666fafa14e995eddbbbba5ff352b0 | 2023-02-11 | +| node:14-alpine | sha256:e389e6411b9951c74289fd51834f59b2b45655ba7aecd3df96e62d1741f4f902 | 2023-02-11 | +| node:16 | sha256:ce3d204ff857d48fbf2cdd16649b5a0b57cc1fd1a3cb2ff0d8727532f5211cf1 | 2023-02-11 | +| node:16-alpine | sha256:1621ddffc775ccf10dc8710660e70d5bfb8e4ee349b926f133698e6512144b73 | 2023-02-11 | +| node:18 | sha256:5ab5e06df2c58dabb18b963636c2fab16b10b7150d13434a12024f599aa645bc | 2023-02-11 | +| node:18-alpine | sha256:45748c3443410b052e2123dcffbd67838727394f9aacfd23e0b47afd95434ff5 | 2023-02-11 | | ubuntu:18.04 | sha256:a3765b4d74747b5e9bdd03205b3fbc4fa19a02781c185f97f24c8f4f84ed7bbf | 2023-01-26 | | ubuntu:20.04 | sha256:4a45212e9518f35983a976eead0de5eecc555a2f047134e9dd2cfc589076a00d | 2023-02-01 | | ubuntu:22.04 | sha256:9a0bdde4188b896a372804be2384015e90e3f84906b750c1a53539b585fbbe7f | 2023-01-26 | @@ -319,7 +318,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | fakeroot | 1.28-1ubuntu1 | | file | 1:5.41-3 | | flex | 2.6.4-8build2 | -| fonts-noto-color-emoji | 2.034-1 | +| fonts-noto-color-emoji | 2.038-0ubuntu1 | | ftp | 20210827-4build1 | | gnupg2 | 2.2.27-3ubuntu2.1 | | haveged | 1.9.14-1ubuntu1 | @@ -340,7 +339,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | libmagickwand-dev | 8:6.9.11.60+dfsg-1.3build2 | | libsecret-1-dev | 0.20.5-2 | | libsqlite3-dev | 3.37.2-2ubuntu0.1 | -| libssl-dev | 3.0.2-0ubuntu1.7 | +| libssl-dev | 3.0.2-0ubuntu1.8 | | libtool | 2.4.6-15build2 | | libunwind8 | 1.3.2-2build2 | | libxkbfile-dev | 1:1.1.0-1build3 | @@ -382,7 +381,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | upx | 3.96-3 | | wget | 1.21.2-2ubuntu1 | | xorriso | 1.5.4-2 | -| xvfb | 2:21.1.3-2ubuntu2.6 | +| xvfb | 2:21.1.3-2ubuntu2.7 | | xz-utils | 5.2.5-2ubuntu1 | | zip | 3.0-12build2 | | zsync | 0.6.2-3ubuntu1 | From 8a001e66b1bf61abe1626d116ccaecfc39e68e29 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Sat, 18 Feb 2023 10:41:24 +0100 Subject: [PATCH 1752/3485] [macOS] Do not use brew API for installation (#7135) --- images/macos/provision/configuration/environment/bashrc | 1 + 1 file changed, 1 insertion(+) diff --git a/images/macos/provision/configuration/environment/bashrc b/images/macos/provision/configuration/environment/bashrc index 2282126099dc..548820c2b2ec 100644 --- a/images/macos/provision/configuration/environment/bashrc +++ b/images/macos/provision/configuration/environment/bashrc @@ -25,6 +25,7 @@ export DOTNET_ROOT=$HOME/.dotnet export DOTNET_MULTILEVEL_LOOKUP=0 export HOMEBREW_NO_AUTO_UPDATE=1 +export HOMEBREW_NO_INSTALL_FROM_API=1 export HOMEBREW_CLEANUP_PERIODIC_FULL_DAYS=3650 export HOMEBREW_CASK_OPTS="--no-quarantine" From 1f4130e15ec1ac0e0861ccbb9beed3d519809dab Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Sat, 18 Feb 2023 12:39:27 +0100 Subject: [PATCH 1753/3485] Revert "[Ubuntu] workaround libodbc installation (#7117)" (#7137) This reverts commit c89bab7e421dbab8edddb75d8f5b3ad93a898aa5. --- images/linux/scripts/installers/mssql-cmd-tools.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/images/linux/scripts/installers/mssql-cmd-tools.sh b/images/linux/scripts/installers/mssql-cmd-tools.sh index d880b52e4b81..092023e9ce52 100644 --- a/images/linux/scripts/installers/mssql-cmd-tools.sh +++ b/images/linux/scripts/installers/mssql-cmd-tools.sh @@ -7,9 +7,7 @@ export ACCEPT_EULA=Y apt-get update -# both libodbc1 nd libodbc2 install libodbc.so.2.0.0, temporary workaround -# https://github.com/microsoft/linux-package-repositories/issues/39 -apt-get install -o Dpkg::Options::="--force-overwrite" -y mssql-tools unixodbc-dev +apt-get install -y mssql-tools unixodbc-dev apt-get -f install ln -s /opt/mssql-tools/bin/* /usr/local/bin/ From 97e33e1df0707080357f1090675d00f30cac82e2 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 18 Feb 2023 17:07:17 +0000 Subject: [PATCH 1754/3485] Updating readme file for ubuntu18 version 20230217.2 (#7141) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu1804-Readme.md | 216 +++++++++++++++--------------- 1 file changed, 108 insertions(+), 108 deletions(-) diff --git a/images/linux/Ubuntu1804-Readme.md b/images/linux/Ubuntu1804-Readme.md index ac40a76ac2ee..d3050e988e44 100644 --- a/images/linux/Ubuntu1804-Readme.md +++ b/images/linux/Ubuntu1804-Readme.md @@ -1,12 +1,12 @@ | Announcements | |-| -| [[All OSs] .NET 5.x will be removed from the images on January, 29](https://github.com/actions/runner-images/issues/6840) | +| [[all OSs] Default Nodejs version will be set to 18 on February, 13](https://github.com/actions/runner-images/issues/7002) | | [The Ubuntu 18.04 Actions runner image will begin deprecation on 2022/08/08 and will be fully unsupported by 2023/04/01](https://github.com/actions/runner-images/issues/6002) | *** # Ubuntu 18.04 - OS Version: 18.04.6 LTS -- Kernel Version: 5.4.0-1100-azure -- Image Version: 20230118.2 +- Kernel Version: 5.4.0-1103-azure +- Image Version: 20230217.2 ## Installed Software @@ -21,28 +21,28 @@ - GNU C++: 7.5.0, 9.4.0, 10.3.0 - GNU Fortran: 7.5.0, 9.4.0, 10.3.0 - Julia 1.8.5 -- Kotlin 1.8.0-release-345 +- Kotlin 1.8.10-release-430 - Mono 6.12.0.182 - MSBuild 16.10.1.31701 (Mono 6.12.0.182) -- Node.js 16.19.0 +- Node.js 16.19.1 - Perl 5.26.1 - Python 2.7.17 - Python3 3.6.9 - Ruby 2.5.1p57 -- Swift 5.7.2 +- Swift 5.7.3 ### Package Management - cpan 1.64 -- Helm 3.11.0 -- Homebrew 3.6.19 -- Miniconda 22.11.1 +- Helm 3.11.1 +- Homebrew 4.0.1 +- Miniconda 23.1.0 - Npm 8.19.3 - NuGet 6.3.1.1 - Pip 9.0.1 - Pip3 9.0.1 - Pipx 1.0.0 - RubyGems 2.7.6 -- Vcpkg (build from commit f1c943159) +- Vcpkg (build from commit 31a159c1c) - Yarn 1.22.19 #### Environment variables @@ -61,85 +61,85 @@ to accomplish this. ### Project Management - Ant 1.10.5 -- Gradle 7.6 +- Gradle 8.0.1 - Maven 3.8.7 - Sbt 1.8.2 ### Tools - Ansible 2.11.12 - apt-fast 1.9.12 -- AzCopy 10.16.2 - available by `azcopy` and `azcopy10` aliases +- AzCopy 10.17.0 - available by `azcopy` and `azcopy10` aliases - Bazel 6.0.0 - Bazelisk 1.13.2 -- Bicep 0.13.1 +- Bicep 0.14.46 - Buildah 1.22.3 -- CMake 3.25.1 -- CodeQL Action Bundle 2.12.0 +- CMake 3.25.2 +- CodeQL Action Bundles 2.12.1 2.12.2 - Docker Amazon ECR Credential Helper 0.6.0 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.15.1+azure-1 -- Docker-Buildx 0.10.0 -- Docker-Moby Client 20.10.22+azure-1 +- Docker Compose v2 2.16.0+azure-2 +- Docker-Buildx 0.10.3 +- Docker-Moby Client 20.10.23+azure-2 - Docker-Moby Server 20.10.22+azure-1 -- Git 2.39.1 +- Git 2.39.2 - Git LFS 3.2.0 - Git-ftp 1.3.1 - Haveged 1.9.1 -- Heroku 7.67.1 +- Heroku 7.68.1 - HHVM (HipHop VM) 4.164.0 - jq 1.5 - Kind 0.17.0 - Kubectl 1.26.1 -- Kustomize 4.5.7 +- Kustomize 5.0.0 - Leiningen 2.10.0 - MediaInfo 17.12 - Mercurial 4.5.3 -- Minikube 1.28.0 +- Minikube 1.29.0 - n 9.0.1 - Newman 5.3.2 - nvm 0.39.3 -- OpenSSL 1.1.1-1ubuntu2.1~18.04.20 -- Packer 1.8.5 +- OpenSSL 1.1.1-1ubuntu2.1~18.04.21 +- Packer 1.8.6 - Parcel 2.8.3 - PhantomJS 2.1.1 - Podman 3.4.2 -- Pulumi 3.51.1 +- Pulumi 3.55.0 - R 4.2.2 - Skopeo 1.5.0 - Sphinx Open Source Search Server 2.2.11 - SVN 1.9.7 -- Terraform 1.3.7 +- Terraform 1.3.9 - yamllint 1.28.0 - yq 4.30.8 -- zstd 1.5.2 +- zstd 1.5.4 ### CLI Tools -- Alibaba Cloud CLI 3.0.144 -- AWS CLI 2.9.15 +- Alibaba Cloud CLI 3.0.149 +- AWS CLI 2.10.1 - AWS CLI Session Manager Plugin 1.2.398.0 -- AWS SAM CLI 1.70.0 -- Azure CLI 2.44.1 -- Azure CLI (azure-devops) 0.25.0 -- GitHub CLI 2.21.2 -- Google Cloud SDK 414.0.0 +- AWS SAM CLI 1.73.0 +- Azure CLI 2.45.0 +- Azure CLI (azure-devops) 0.26.0 +- GitHub CLI 2.23.0 +- Google Cloud SDK 418.0.0 - Hub CLI 2.14.2 -- Netlify CLI 12.7.2 -- OpenShift CLI 4.12.0 +- Netlify CLI 12.13.1 +- OpenShift CLI 4.12.3 - ORAS CLI 0.16.0 -- Vercel CLI 28.12.7 +- Vercel CLI 28.16.2 ### Java | Version | Vendor | Environment Variable | | ------------------- | --------------- | -------------------- | -| 8.0.352+8 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | -| 11.0.17+8 | Eclipse Temurin | JAVA_HOME_11_X64 | +| 8.0.362+9 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | +| 11.0.18+10 | Eclipse Temurin | JAVA_HOME_11_X64 | | 12.0.2+10 | Adopt OpenJDK | JAVA_HOME_12_X64 | -| 17.0.5+8 | Eclipse Temurin | JAVA_HOME_17_X64 | +| 17.0.6+10 | Eclipse Temurin | JAVA_HOME_17_X64 | ### PHP Tools -- PHP: 7.2.34, 7.3.33, 7.4.33, 8.0.27, 8.1.14, 8.2.1 -- Composer 2.5.1 -- PHPUnit 8.5.31 +- PHP: 7.2.34, 7.3.33, 7.4.33, 8.0.28, 8.1.16, 8.2.3 +- Composer 2.5.4 +- PHPUnit 8.5.32 ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ``` @@ -151,28 +151,28 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Stack 2.9.3 ### Rust Tools -- Cargo 1.66.1 -- Rust 1.66.1 -- Rustdoc 1.66.1 -- Rustup 1.25.1 +- Cargo 1.67.1 +- Rust 1.67.1 +- Rustdoc 1.67.1 +- Rustup 1.25.2 #### Packages -- Bindgen 0.63.0 +- Bindgen 0.64.0 - Cargo audit 0.17.4 -- Cargo clippy 0.1.66 -- Cargo outdated 0.11.1 +- Cargo clippy 0.1.67 +- Cargo outdated 0.11.2 - Cbindgen 0.24.3 - Rustfmt 1.5.1 ### Browsers and Drivers -- Google Chrome 109.0.5414.74 -- ChromeDriver 109.0.5414.74 -- Chromium 109.0.5414.0 -- Microsoft Edge 109.0.1518.52 -- Microsoft Edge WebDriver 109.0.1518.52 -- Selenium server 4.7.0 -- Mozilla Firefox 109.0 -- Geckodriver 0.32.0 +- Google Chrome 110.0.5481.100 +- ChromeDriver 110.0.5481.77 +- Chromium 110.0.5481.0 +- Microsoft Edge 110.0.1587.50 +- Microsoft Edge WebDriver 110.0.1587.50 +- Selenium server 4.8.0 +- Mozilla Firefox 110.0 +- Geckodriver 0.32.2 #### Environment variables | Name | Value | @@ -183,7 +183,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | ### .NET Tools -- .NET Core SDK: 3.1.120, 3.1.202, 3.1.302, 3.1.426, 5.0.104, 5.0.214, 5.0.303, 5.0.408, 6.0.405 +- .NET Core SDK: 3.1.120, 3.1.202, 3.1.302, 3.1.426, 6.0.406 - nbgv 3.5.119+5d25f54fec ### Databases @@ -191,7 +191,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - sqlite3 3.22.0 #### PostgreSQL -- PostgreSQL 14.6 +- PostgreSQL 14.7 ``` User: postgres PostgreSQL service is disabled by default. @@ -199,7 +199,7 @@ Use the following command as a part of your job to start the service: 'sudo syst ``` #### MySQL -- MySQL 5.7.40 +- MySQL 5.7.41 ``` User: root Password: root @@ -209,7 +209,7 @@ Use the following command as a part of your job to start the service: 'sudo syst #### MS SQL - sqlcmd 17.10.0001.1 -- SqlPackage 16.1.6374.0 +- SqlPackage 16.1.8089.0 ### Cached Tools @@ -219,9 +219,9 @@ Use the following command as a part of your job to start the service: 'sudo syst - 1.18.10 #### Node.js -- 14.21.2 -- 16.19.0 -- 18.13.0 +- 14.21.3 +- 16.19.1 +- 18.14.1 #### Python - 2.7.18 @@ -229,8 +229,8 @@ Use the following command as a part of your job to start the service: 'sudo syst - 3.7.15 - 3.8.16 - 3.9.16 -- 3.10.9 -- 3.11.1 +- 3.10.10 +- 3.11.2 #### PyPy - 2.7.18 [PyPy 7.3.11] @@ -246,13 +246,13 @@ Use the following command as a part of your job to start the service: 'sudo syst - 3.1.3 ### PowerShell Tools -- PowerShell 7.2.8 +- PowerShell 7.2.9 #### PowerShell Modules -- Az: 9.2.0 +- Az: 9.3.0 - Az (Cached): 3.1.0.zip, 4.4.0.zip, 5.9.0.zip, 6.6.0.zip, 7.5.0.zip - MarkdownPS: 1.9 -- Microsoft.Graph: 1.20.0 +- Microsoft.Graph: 1.22.0 - Pester: 5.4.0 ### Web Servers @@ -262,30 +262,30 @@ Use the following command as a part of your job to start the service: 'sudo syst | nginx | 1.14.0 | /etc/nginx/nginx.conf | inactive | 80 | ### Android -| Package Name | Version | -| -------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 8.0 | -| Android Emulator | 31.3.14 | -| Android SDK Build-tools | 33.0.0 33.0.1<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3<br>26.0.0 26.0.1 26.0.2 26.0.3<br>25.0.0 25.0.1 25.0.2 25.0.3<br>24.0.0 24.0.1 24.0.2 24.0.3<br>23.0.1 23.0.2 23.0.3 | -| Android SDK Platform-Tools | 33.0.3 | -| Android SDK Platforms | android-33-ext4 (rev 1)<br>android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3)<br>android-26 (rev 2)<br>android-25 (rev 3)<br>android-24 (rev 2)<br>android-23 (rev 3) | -| Android SDK Tools | 26.1.1 | -| Android Support Repository | 47.0.0 | -| CMake | 3.10.2<br>3.18.1<br>3.22.1 | -| Google APIs | addon-google_apis-google-21<br>addon-google_apis-google-22<br>addon-google_apis-google-23<br>addon-google_apis-google-24 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 23.2.8568313<br>24.0.8215888<br>25.1.8937393 (default) | -| SDK Patch Applier v4 | 1 | +| Package Name | Version | +| -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 8.0 | +| Android Emulator | 32.1.11 | +| Android SDK Build-tools | 33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3<br>26.0.0 26.0.1 26.0.2 26.0.3<br>25.0.0 25.0.1 25.0.2 25.0.3<br>24.0.0 24.0.1 24.0.2 24.0.3<br>23.0.1 23.0.2 23.0.3 | +| Android SDK Platform-Tools | 34.0.0 | +| Android SDK Platforms | android-33-ext4 (rev 1)<br>android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3)<br>android-26 (rev 2)<br>android-25 (rev 3)<br>android-24 (rev 2)<br>android-23 (rev 3) | +| Android SDK Tools | 26.1.1 | +| Android Support Repository | 47.0.0 | +| CMake | 3.10.2<br>3.18.1<br>3.22.1 | +| Google APIs | addon-google_apis-google-21<br>addon-google_apis-google-22<br>addon-google_apis-google-23<br>addon-google_apis-google-24 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 23.2.8568313<br>24.0.8215888<br>25.2.9519653 (default) | +| SDK Patch Applier v4 | 1 | #### Environment variables | Name | Value | | ----------------------- | ------------------------------------------- | | ANDROID_HOME | /usr/local/lib/android/sdk | -| ANDROID_NDK | /usr/local/lib/android/sdk/ndk/25.1.8937393 | -| ANDROID_NDK_HOME | /usr/local/lib/android/sdk/ndk/25.1.8937393 | -| ANDROID_NDK_LATEST_HOME | /usr/local/lib/android/sdk/ndk/25.1.8937393 | -| ANDROID_NDK_ROOT | /usr/local/lib/android/sdk/ndk/25.1.8937393 | +| ANDROID_NDK | /usr/local/lib/android/sdk/ndk/25.2.9519653 | +| ANDROID_NDK_HOME | /usr/local/lib/android/sdk/ndk/25.2.9519653 | +| ANDROID_NDK_LATEST_HOME | /usr/local/lib/android/sdk/ndk/25.2.9519653 | +| ANDROID_NDK_ROOT | /usr/local/lib/android/sdk/ndk/25.2.9519653 | | ANDROID_SDK_ROOT | /usr/local/lib/android/sdk | ### Cached Docker images @@ -293,23 +293,23 @@ Use the following command as a part of your job to start the service: 'sudo syst | ----------------------- | ------------------------------------------------------------------------ | ---------- | | alpine:3.12 | sha256:c75ac27b49326926b803b9ed43bf088bc220d22556de1bc5f72d742c91398f69 | 2022-04-05 | | alpine:3.13 | sha256:469b6e04ee185740477efa44ed5bdd64a07bbdd6c7e5f5d169e540889597b911 | 2022-08-09 | -| alpine:3.14 | sha256:4c869a63e1b7c0722fed1e402a6466610327c3b83bdddb94bd94fb71da7f638a | 2022-08-09 | -| buildpack-deps:bullseye | sha256:c1a2475ac14e13582cf8a44fc071439132928ada47c57e80af372fdcd1690751 | 2023-01-11 | -| buildpack-deps:buster | sha256:c343da4a0b85a4d25ce30529e836a10d46cd4f682fb5326400e4ba274a2f9866 | 2023-01-11 | +| alpine:3.14 | sha256:560e7a4fa5c891d1830f5591c80b8e472fa6cd386b7254cdf65ccc3249292a34 | 2023-02-11 | +| buildpack-deps:bullseye | sha256:40b14eb195795a586ac132c9b506253bc3e4ee7f48a63b685e5bf37e80b774cf | 2023-02-09 | +| buildpack-deps:buster | sha256:a3e4aaa53bf83302adfb9d8b9ba3996948e4605baac297921d3a173c14603748 | 2023-02-09 | | buildpack-deps:stretch | sha256:78e995165a5788c2f55aed6e548d8f6c1534830d4310c870408fccb2da8c5b2e | 2022-06-23 | -| debian:10 | sha256:bb8c62f9f540a5f5f49f7ed5caae0e2889f999cd14553f2aaccaf1fa4fcb998d | 2023-01-11 | -| debian:11 | sha256:534da5794e770279c889daa891f46f5a530b0c5de8bfbc5e40394a0164d9fa87 | 2023-01-11 | +| debian:10 | sha256:233c3bbc892229c82da7231980d50adceba4db56a08c0b7053a4852782703459 | 2023-02-09 | +| debian:11 | sha256:43ef0c6c3585d5b406caa7a0f232ff5a19c1402aeb415f68bcd1cf9d10180af8 | 2023-02-09 | | debian:9 | sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be | 2022-06-23 | -| moby/buildkit:latest | sha256:86ffcc648dbd2215941cbaabbd0564bd8bc67e2aefd32d4feb26e4fb8080f8c6 | 2023-01-17 | -| node:14 | sha256:0c888dc647d36f5a895edb6b1b1c96ae81064455e0cdeee0792e14927604ca99 | 2023-01-11 | -| node:14-alpine | sha256:2c6a909495ef3761328c10945cbe84c06d079f7ca49dc24271e73be8cab85ad7 | 2023-01-09 | -| node:16 | sha256:27fab5920246070cf13449cf44c25bc4f5adef18ca7482b2bda90b7cf9e64481 | 2023-01-11 | -| node:16-alpine | sha256:1298fd170c45954fec3d4d063437750f89802d72743816663664cfe9aa152b4b | 2023-01-09 | -| node:18 | sha256:d871edd5b68105ebcbfcde3fe8c79d24cbdbb30430d9bd6251c57c56c7bd7646 | 2023-01-11 | -| node:18-alpine | sha256:fda98168118e5a8f4269efca4101ee51dd5c75c0fe56d8eb6fad80455c2f5827 | 2023-01-09 | +| moby/buildkit:latest | sha256:751921dc37d2f842de38c9387f891fe6ae7d80f03d050ea98f780d7e0874ba00 | 2023-02-13 | +| node:14 | sha256:a58436325059a278c35079034ce5c98dace7204a2a5748929ccc79087f959daa | 2023-02-17 | +| node:14-alpine | sha256:1a1a30ee1faa7d512917e277cc8c81744e79096de3561ecda7ea17cc2ceab372 | 2023-02-17 | +| node:16 | sha256:102e907ac88ac60cbad62b09ce003fa11618687621c45da2a2514703be1d1b1a | 2023-02-17 | +| node:16-alpine | sha256:77f92924c9734d4acdeb5ec42de85867b10c0031f2e861d26cdae6abd56cf858 | 2023-02-17 | +| node:18 | sha256:888e7f9ead4aa3257e9c91528b9f63a427d8a926876ef5ae27ecba2651ae211d | 2023-02-17 | +| node:18-alpine | sha256:178bf3eb09c4245fda8c81c1063c0d55c45d7a7f4ddc5296814107b1dc610450 | 2023-02-17 | | ubuntu:16.04 | sha256:1f1a2d56de1d604801a9671f301190704c25d604a416f59e03c04f5c6ffee0d6 | 2021-08-31 | -| ubuntu:18.04 | sha256:c1d0baf2425ecef88a2f0c3543ec43690dc16cc80d3c4e593bb95e4f45390e45 | 2023-01-02 | -| ubuntu:20.04 | sha256:0e0402cd13f68137edb0266e1d2c682f217814420f2d43d300ed8f65479b14fb | 2022-12-09 | +| ubuntu:18.04 | sha256:a3765b4d74747b5e9bdd03205b3fbc4fa19a02781c185f97f24c8f4f84ed7bbf | 2023-01-26 | +| ubuntu:20.04 | sha256:4a45212e9518f35983a976eead0de5eecc555a2f047134e9dd2cfc589076a00d | 2023-02-01 | ### Installed apt packages | Name | Version | @@ -333,7 +333,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | ftp | 0.17-34 | | gnupg2 | 2.2.4-1ubuntu1.6 | | haveged | 1.9.1-6 | -| imagemagick | 8:6.9.7.4+dfsg-16ubuntu6.14 | +| imagemagick | 8:6.9.7.4+dfsg-16ubuntu6.15 | | iproute2 | 4.15.0-2ubuntu1.3 | | iputils-ping | 3:20161105-1ubuntu3 | | jq | 1.5+dfsg-2 | @@ -346,8 +346,8 @@ Use the following command as a part of your job to start the service: 'sudo syst | libgsl-dev | 2.4+dfsg-6 | | libgtk-3-0 | 3.22.30-1ubuntu4 | | libmagic-dev | 1:5.32-2ubuntu0.4 | -| libmagickcore-dev | 8:6.9.7.4+dfsg-16ubuntu6.14 | -| libmagickwand-dev | 8:6.9.7.4+dfsg-16ubuntu6.14 | +| libmagickcore-dev | 8:6.9.7.4+dfsg-16ubuntu6.15 | +| libmagickwand-dev | 8:6.9.7.4+dfsg-16ubuntu6.15 | | libsecret-1-dev | 0.18.6-1 | | libsqlite3-dev | 3.22.0-1ubuntu0.7 | | libtool | 2.4.6-2 | @@ -369,7 +369,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | patchelf | 0.9-1 | | pkg-config | 0.29.1-0ubuntu2 | | pollinate | 4.33-0ubuntu1\~18.04.2 | -| python-setuptools | 39.0.1-2 | +| python-setuptools | 39.0.1-2ubuntu0.1 | | rpm | 4.14.1+dfsg1-2 | | rsync | 3.1.2-2.1ubuntu1.5 | | shellcheck | 0.4.6-1 | @@ -390,7 +390,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | upx | 3.94-4 | | wget | 1.19.4-1ubuntu2.2 | | xorriso | 1.4.8-3 | -| xvfb | 2:1.19.6-1ubuntu4.13 | +| xvfb | 2:1.19.6-1ubuntu4.14 | | xz-utils | 5.2.2-1.3ubuntu0.1 | | zip | 3.0-11build1 | | zsync | 0.6.2-3ubuntu1 | From e0c027edf4ead862569b64c59dd8c30dabe3a4ed Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 18 Feb 2023 17:35:35 +0000 Subject: [PATCH 1755/3485] Updating readme file for ubuntu20 version 20230217.1 (#7139) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2004-Readme.md | 145 +++++++++++++++--------------- 1 file changed, 72 insertions(+), 73 deletions(-) diff --git a/images/linux/Ubuntu2004-Readme.md b/images/linux/Ubuntu2004-Readme.md index d08137aadd48..87054e04310e 100644 --- a/images/linux/Ubuntu2004-Readme.md +++ b/images/linux/Ubuntu2004-Readme.md @@ -1,13 +1,12 @@ | Announcements | |-| | [[all OSs] Default Nodejs version will be set to 18 on February, 13](https://github.com/actions/runner-images/issues/7002) | -| [[All OSs] .NET 5.x will be removed from the images on February, 6](https://github.com/actions/runner-images/issues/6840) | | [The Ubuntu 18.04 Actions runner image will begin deprecation on 2022/08/08 and will be fully unsupported by 2023/04/01](https://github.com/actions/runner-images/issues/6002) | *** # Ubuntu 20.04 - OS Version: 20.04.5 LTS -- Kernel Version: 5.15.0-1031-azure -- Image Version: 20230206.1 +- Kernel Version: 5.15.0-1033-azure +- Image Version: 20230217.1 ## Installed Software @@ -25,7 +24,7 @@ - Kotlin 1.8.10-release-430 - Mono 6.12.0.182 - MSBuild 16.10.1.31701 (Mono 6.12.0.182) -- Node.js 16.19.0 +- Node.js 18.14.1 - Perl 5.30.0 - Python 3.8.10 - Python3 3.8.10 @@ -34,16 +33,16 @@ ### Package Management - cpan 1.64 -- Helm 3.11.0 -- Homebrew 3.6.20 -- Miniconda 22.11.1 -- Npm 8.19.3 +- Helm 3.11.1 +- Homebrew 4.0.1 +- Miniconda 23.1.0 +- Npm 9.3.1 - NuGet 6.3.1.1 - Pip 20.0.2 - Pip3 20.0.2 - Pipx 1.1.0 - RubyGems 3.1.2 -- Vcpkg (build from commit 185a7aa23) +- Vcpkg (build from commit 31a159c1c) - Yarn 1.22.19 #### Environment variables @@ -62,8 +61,8 @@ to accomplish this. ### Project Management - Ant 1.10.7 -- Gradle 7.6 -- Lerna 6.4.1 +- Gradle 8.0 +- Lerna 6.5.1 - Maven 3.8.7 - Sbt 1.8.2 @@ -73,22 +72,22 @@ to accomplish this. - AzCopy 10.17.0 - available by `azcopy` and `azcopy10` aliases - Bazel 6.0.0 - Bazelisk 1.13.2 -- Bicep 0.14.6 +- Bicep 0.14.46 - Buildah 1.22.3 - CMake 3.25.2 -- CodeQL Action Bundles 2.12.0 2.12.1 +- CodeQL Action Bundles 2.12.1 2.12.2 - Docker Amazon ECR Credential Helper 0.6.0 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.15.1+azure-1 -- Docker-Buildx 0.10.2 -- Docker-Moby Client 20.10.22+azure-1 +- Docker Compose v2 2.16.0+azure-2 +- Docker-Buildx 0.10.3 +- Docker-Moby Client 20.10.23+azure-2 - Docker-Moby Server 20.10.22+azure-1 - Fastlane 2.211.0 -- Git 2.39.1 +- Git 2.39.2 - Git LFS 3.3.0 - Git-ftp 1.6.0 - Haveged 1.9.1 -- Heroku 7.67.2 +- Heroku 7.68.1 - HHVM (HipHop VM) 4.172.1 - jq 1.6 - Kind 0.17.0 @@ -101,35 +100,35 @@ to accomplish this. - n 9.0.1 - Newman 5.3.2 - nvm 0.39.3 -- OpenSSL 1.1.1f-1ubuntu2.16 -- Packer 1.8.5 +- OpenSSL 1.1.1f-1ubuntu2.17 +- Packer 1.8.6 - Parcel 2.8.3 - PhantomJS 2.1.1 - Podman 3.4.2 -- Pulumi 3.53.1 +- Pulumi 3.55.0 - R 4.2.2 - Skopeo 1.5.0 - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 -- Terraform 1.3.7 +- Terraform 1.3.9 - yamllint 1.29.0 - yq 4.30.8 -- zstd 1.5.2 +- zstd 1.5.4 ### CLI Tools -- Alibaba Cloud CLI 3.0.145 -- AWS CLI 2.9.21 +- Alibaba Cloud CLI 3.0.149 +- AWS CLI 2.10.0 - AWS CLI Session Manager Plugin 1.2.398.0 -- AWS SAM CLI 1.72.0 -- Azure CLI 2.44.1 +- AWS SAM CLI 1.73.0 +- Azure CLI 2.45.0 - Azure CLI (azure-devops) 0.26.0 -- GitHub CLI 2.22.1 -- Google Cloud SDK 416.0.0 +- GitHub CLI 2.23.0 +- Google Cloud SDK 418.0.0 - Hub CLI 2.14.2 -- Netlify CLI 12.10.0 -- OpenShift CLI 4.12.1 +- Netlify CLI 12.13.1 +- OpenShift CLI 4.12.3 - ORAS CLI 0.16.0 -- Vercel CLI 28.15.1 +- Vercel CLI 28.16.2 ### Java | Version | Vendor | Environment Variable | @@ -144,8 +143,8 @@ to accomplish this. | CE 22.3.1 | GRAALVM_11_ROOT | ### PHP Tools -- PHP: 7.4.33, 8.0.27, 8.1.14, 8.2.2 -- Composer 2.5.2 +- PHP: 7.4.33, 8.0.28, 8.1.16, 8.2.3 +- Composer 2.5.4 - PHPUnit 8.5.32 ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. @@ -158,13 +157,13 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Stack 2.9.3 ### Rust Tools -- Cargo 1.67.0 -- Rust 1.67.0 -- Rustdoc 1.67.0 +- Cargo 1.67.1 +- Rust 1.67.1 +- Rustdoc 1.67.1 - Rustup 1.25.2 #### Packages -- Bindgen 0.63.0 +- Bindgen 0.64.0 - Cargo audit 0.17.4 - Cargo clippy 0.1.67 - Cargo outdated 0.11.2 @@ -172,14 +171,14 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.5.1 ### Browsers and Drivers -- Google Chrome 109.0.5414.119 -- ChromeDriver 109.0.5414.74 -- Chromium 109.0.5414.0 -- Microsoft Edge 109.0.1518.78 -- Microsoft Edge WebDriver 109.0.1518.78 +- Google Chrome 110.0.5481.100 +- ChromeDriver 110.0.5481.77 +- Chromium 110.0.5481.0 +- Microsoft Edge 110.0.1587.49 +- Microsoft Edge WebDriver 110.0.1587.49 - Selenium server 4.8.0 -- Mozilla Firefox 109.0.1 -- Geckodriver 0.32.1 +- Mozilla Firefox 110.0 +- Geckodriver 0.32.2 #### Environment variables | Name | Value | @@ -190,7 +189,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | ### .NET Tools -- .NET Core SDK: 3.1.120, 3.1.202, 3.1.302, 3.1.426, 6.0.405, 7.0.102 +- .NET Core SDK: 3.1.120, 3.1.202, 3.1.302, 3.1.426, 6.0.406, 7.0.103, 7.0.200 - nbgv 3.5.119+5d25f54fec ### Databases @@ -198,7 +197,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - sqlite3 3.31.1 #### PostgreSQL -- PostgreSQL 14.6 +- PostgreSQL 14.7 ``` User: postgres PostgreSQL service is disabled by default. @@ -216,19 +215,19 @@ Use the following command as a part of your job to start the service: 'sudo syst #### MS SQL - sqlcmd 17.10.0001.1 -- SqlPackage 16.1.6374.0 +- SqlPackage 16.1.8089.0 ### Cached Tools #### Go - 1.17.13 - 1.18.10 -- 1.19.5 +- 1.19.6 #### Node.js -- 14.21.2 -- 16.19.0 -- 18.14.0 +- 14.21.3 +- 16.19.1 +- 18.14.1 #### Python - 2.7.18 @@ -236,8 +235,8 @@ Use the following command as a part of your job to start the service: 'sudo syst - 3.7.15 - 3.8.16 - 3.9.16 -- 3.10.9 -- 3.11.1 +- 3.10.10 +- 3.11.2 #### PyPy - 2.7.18 [PyPy 7.3.11] @@ -260,7 +259,7 @@ Use the following command as a part of your job to start the service: 'sudo syst - Az: 9.3.0 - Az (Cached): 3.1.0.zip, 4.4.0.zip, 5.9.0.zip, 6.6.0.zip, 7.5.0.zip - MarkdownPS: 1.9 -- Microsoft.Graph: 1.21.0 +- Microsoft.Graph: 1.22.0 - Pester: 5.4.0 - PSScriptAnalyzer: 1.21.0 @@ -275,9 +274,9 @@ Use the following command as a part of your job to start the service: 'sudo syst | Package Name | Version | | -------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 9.0 | -| Android Emulator | 31.3.15 | -| Android SDK Build-tools | 33.0.0 33.0.1<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | -| Android SDK Platform-Tools | 33.0.3 | +| Android Emulator | 32.1.11 | +| Android SDK Build-tools | 33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | +| Android SDK Platform-Tools | 34.0.0 | | Android SDK Platforms | android-33-ext4 (rev 1)<br>android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | | Android SDK Tools | 26.1.1 | | Android Support Repository | 47.0.0 | @@ -300,22 +299,22 @@ Use the following command as a part of your job to start the service: 'sudo syst ### Cached Docker images | Repository:Tag | Digest | Created | | ----------------------- | ------------------------------------------------------------------------ | ---------- | -| alpine:3.14 | sha256:4c869a63e1b7c0722fed1e402a6466610327c3b83bdddb94bd94fb71da7f638a | 2022-08-09 | -| alpine:3.15 | sha256:cf34c62ee8eb3fe8aa24c1fab45d7e9d12768d945c3f5a6fd6a63d901e898479 | 2022-08-09 | -| alpine:3.16 | sha256:b95359c2505145f16c6aa384f9cc74eeff78eb36d308ca4fd902eeeb0a0b161b | 2022-11-12 | -| buildpack-deps:bullseye | sha256:e4cd4f65bb933873e8ea1178d59981fbeb714ed97e962ff7f58324da1f8f06c9 | 2023-02-04 | -| buildpack-deps:buster | sha256:a67b72dfcd396cf840cc13dca1edcd8272c33fbfa0793f4f6e6fe658b54e98d5 | 2023-02-04 | +| alpine:3.14 | sha256:560e7a4fa5c891d1830f5591c80b8e472fa6cd386b7254cdf65ccc3249292a34 | 2023-02-11 | +| alpine:3.15 | sha256:689659b1f08e9fdfb85190144098c378beb5a53b328f7ced7883a74a1157c709 | 2023-02-11 | +| alpine:3.16 | sha256:1bd67c81e4ad4b8f4a5c1c914d7985336f130e5cefb3e323654fd09d6bcdbbe2 | 2023-02-11 | +| buildpack-deps:bullseye | sha256:40b14eb195795a586ac132c9b506253bc3e4ee7f48a63b685e5bf37e80b774cf | 2023-02-09 | +| buildpack-deps:buster | sha256:a3e4aaa53bf83302adfb9d8b9ba3996948e4605baac297921d3a173c14603748 | 2023-02-09 | | buildpack-deps:stretch | sha256:78e995165a5788c2f55aed6e548d8f6c1534830d4310c870408fccb2da8c5b2e | 2022-06-23 | -| debian:10 | sha256:c67afad7f1e94fe12868cd75bd5cf0c5bc9d0424f1516329aa76ec554b18ca57 | 2023-02-04 | -| debian:11 | sha256:92277f7108c432febe41beffd367dbb6dac60b9fbfe517c77208e6457eafe22b | 2023-02-04 | +| debian:10 | sha256:233c3bbc892229c82da7231980d50adceba4db56a08c0b7053a4852782703459 | 2023-02-09 | +| debian:11 | sha256:43ef0c6c3585d5b406caa7a0f232ff5a19c1402aeb415f68bcd1cf9d10180af8 | 2023-02-09 | | debian:9 | sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be | 2022-06-23 | -| moby/buildkit:latest | sha256:f092403997f04742b549811ca2402d88207afbf33656eb1cf34aa7fe8a8511ac | 2023-01-26 | -| node:14 | sha256:eb709cd9ccbc70f194353d7f4227c52406a9dc6714d798666252d14e344422b2 | 2023-02-04 | -| node:14-alpine | sha256:2c6a909495ef3761328c10945cbe84c06d079f7ca49dc24271e73be8cab85ad7 | 2023-01-09 | -| node:16 | sha256:367b3b89399e6bd52746180c7b348c313015fc637d06a1f0e0ccb983fd52bfd1 | 2023-02-04 | -| node:16-alpine | sha256:1298fd170c45954fec3d4d063437750f89802d72743816663664cfe9aa152b4b | 2023-01-09 | -| node:18 | sha256:0d8bf0e743a752d8d01e9ff8aba21ac15a0ad1a3d2a2b8df90764d427618c791 | 2023-02-04 | -| node:18-alpine | sha256:bc329c7332cffc30c2d4801e38df03cbfa8dcbae2a7a52a449db104794f168a3 | 2023-02-03 | +| moby/buildkit:latest | sha256:751921dc37d2f842de38c9387f891fe6ae7d80f03d050ea98f780d7e0874ba00 | 2023-02-13 | +| node:14 | sha256:0443d511c77586fbeff8e32ea55565acbcf666fafa14e995eddbbbba5ff352b0 | 2023-02-11 | +| node:14-alpine | sha256:e389e6411b9951c74289fd51834f59b2b45655ba7aecd3df96e62d1741f4f902 | 2023-02-11 | +| node:16 | sha256:ce3d204ff857d48fbf2cdd16649b5a0b57cc1fd1a3cb2ff0d8727532f5211cf1 | 2023-02-11 | +| node:16-alpine | sha256:1621ddffc775ccf10dc8710660e70d5bfb8e4ee349b926f133698e6512144b73 | 2023-02-11 | +| node:18 | sha256:5ab5e06df2c58dabb18b963636c2fab16b10b7150d13434a12024f599aa645bc | 2023-02-11 | +| node:18-alpine | sha256:45748c3443410b052e2123dcffbd67838727394f9aacfd23e0b47afd95434ff5 | 2023-02-11 | | ubuntu:16.04 | sha256:1f1a2d56de1d604801a9671f301190704c25d604a416f59e03c04f5c6ffee0d6 | 2021-08-31 | | ubuntu:18.04 | sha256:a3765b4d74747b5e9bdd03205b3fbc4fa19a02781c185f97f24c8f4f84ed7bbf | 2023-01-26 | | ubuntu:20.04 | sha256:4a45212e9518f35983a976eead0de5eecc555a2f047134e9dd2cfc589076a00d | 2023-02-01 | @@ -401,7 +400,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | upx | 3.95-2build1 | | wget | 1.20.3-1ubuntu2 | | xorriso | 1.5.2-1 | -| xvfb | 2:1.20.13-1ubuntu1\~20.04.5 | +| xvfb | 2:1.20.13-1ubuntu1\~20.04.6 | | xz-utils | 5.2.4-1ubuntu1.1 | | zip | 3.0-11build1 | | zsync | 0.6.2-3ubuntu1 | From 3483751d9d1f377ef0ecf0c0d2ee98d1f596041d Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Sat, 18 Feb 2023 19:32:07 +0100 Subject: [PATCH 1756/3485] [macOS] Software Updates 2023 Week 8 (#7124) --- images/macos/toolsets/toolset-12.json | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index 6dffb791ef1a..531dcd04d6d5 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -21,16 +21,23 @@ "6.12.0.188" ], "ios-versions": [ - "16.1.1.27", "16.0.0.72", "15.12.0.2", "15.10.0.5", "15.8.0.3", "15.6.0.3", "15.4.0.0", "15.2.0.17", "15.0.0.6" + "16.2.0.2", "16.1.1.27", "16.0.0.72", "15.12.0.2", "15.10.0.5", "15.8.0.3", "15.6.0.3", "15.4.0.0", "15.2.0.17", "15.0.0.6" ], "mac-versions": [ - "9.0.0.27", "8.12.0.2", "8.10.0.5", "8.8.0.3", "8.6.0.3", "8.4.0.0", "8.2.0.17", "7.14.0.27" + "9.1.0.2", "9.0.0.27", "8.12.0.2", "8.10.0.5", "8.8.0.3", "8.6.0.3", "8.4.0.0", "8.2.0.17", "7.14.0.27" ], "android-versions": [ "13.1.0.1", "13.0.0.0", "12.3.3.3", "12.2.8.3", "12.1.0.2", "12.0.0.3", "11.3.0.4" ], "bundle-default": "6_12_21", "bundles": [ + { + "symlink": "6_12_23", + "mono":"6.12", + "ios": "16.2", + "mac": "9.1", + "android": "13.1" + }, { "symlink": "6_12_22", "mono":"6.12", From 09baf89e70d403d052bc9089b6fddc4ba31e053c Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Sun, 19 Feb 2023 11:25:31 +0100 Subject: [PATCH 1757/3485] [macOS] Add pkg-config via brew for vcpkg (#7125) --- images/macos/toolsets/toolset-11.json | 1 + images/macos/toolsets/toolset-12.json | 1 + 2 files changed, 2 insertions(+) diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index 37bb5b36fe70..f131d8153bf4 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -214,6 +214,7 @@ "p7zip", "packer", "perl", + "pkg-config", "sbt", "subversion", "swiftformat", diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index 531dcd04d6d5..67dee6ae81f0 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -191,6 +191,7 @@ "p7zip", "packer", "perl", + "pkg-config", "sbt", "subversion", "swiftformat", From aa01b789be20e99d71deca47ebafd67d45b53685 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Mon, 20 Feb 2023 18:54:26 +0300 Subject: [PATCH 1758/3485] [macOS] Add packer template for macOS 13 (#7116) --- images/macos/templates/macOS-13.anka.pkr.hcl | 246 +++++++++++++++++++ images/macos/toolsets/toolset-13.json | 142 +++++++++++ 2 files changed, 388 insertions(+) create mode 100644 images/macos/templates/macOS-13.anka.pkr.hcl create mode 100644 images/macos/toolsets/toolset-13.json diff --git a/images/macos/templates/macOS-13.anka.pkr.hcl b/images/macos/templates/macOS-13.anka.pkr.hcl new file mode 100644 index 000000000000..e32a93c1cdff --- /dev/null +++ b/images/macos/templates/macOS-13.anka.pkr.hcl @@ -0,0 +1,246 @@ +packer { + required_plugins { + veertu-anka = { + version = "= v3.1.0" + source = "github.com/veertuinc/veertu-anka" + } + } +} + +variable "source_vm_name" { + type = string +} + +variable "source_vm_tag" { + type = string +} + +variable "build_id" { + type = string +} + +variable "vm_username" { + type = string + sensitive = true +} + +variable "vm_password" { + type = string + sensitive = true +} + +variable "github_api_pat" { + type = string + default = "" +} + +variable "xcode_install_user" { + type = string + sensitive = true +} + +variable "xcode_install_password" { + type = string + sensitive = true +} + +variable "vcpu_count" { + type = string + default = "6" +} + +variable "ram_size" { + type = string + default = "24G" +} + +variable "image_os" { + type = string + default = "macos13" +} + +source "veertu-anka-vm-clone" "template" { + vm_name = "${var.build_id}" + source_vm_name = "${var.source_vm_name}" + source_vm_tag = "${var.source_vm_tag}" + vcpu_count = "${var.vcpu_count}" + ram_size = "${var.ram_size}" + stop_vm = "true" +} + +build { + sources = [ + "source.veertu-anka-vm-clone.template" + ] + provisioner "shell" { + inline = [ + "mkdir ~/image-generation" + ] + } + provisioner "file" { + destination = "image-generation/" + sources = [ + "./provision/assets", + "./tests", + "./software-report", + "./helpers" + ] + } + provisioner "file" { + destination = "image-generation/software-report/" + source = "../../helpers/software-report-base" + } + provisioner "file" { + destination = "image-generation/add-certificate.swift" + source = "./provision/configuration/add-certificate.swift" + } + provisioner "file" { + destination = ".bashrc" + source = "./provision/configuration/environment/bashrc" + } + provisioner "file" { + destination = ".bash_profile" + source = "./provision/configuration/environment/bashprofile" + } + provisioner "file" { + destination = "./" + source = "./provision/utils" + } + provisioner "shell" { + inline = [ + "mkdir ~/bootstrap" + ] + } + provisioner "file" { + destination = "bootstrap" + source = "./provision/bootstrap-provisioner/" + } + provisioner "file" { + destination = "image-generation/toolset.json" + source = "./toolsets/toolset-13.json" + } + provisioner "shell" { + scripts = [ + "./provision/core/xcode-clt.sh", + "./provision/core/homebrew.sh" + ] + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" + } + provisioner "shell" { + scripts = [ + "./provision/configuration/configure-tccdb-macos.sh", + "./provision/configuration/disable-auto-updates.sh", + "./provision/configuration/ntpconf.sh", + "./provision/configuration/shell-change.sh" + ] + environment_vars = [ + "PASSWORD=${var.vm_password}", + "USERNAME=${var.vm_username}" + ] + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}" + } + provisioner "shell" { + scripts = [ + "./provision/configuration/preimagedata.sh", + "./provision/configuration/configure-ssh.sh", + "./provision/configuration/configure-machine.sh" + ] + environment_vars = [ + "IMAGE_VERSION=${var.build_id}", + "IMAGE_OS=${var.image_os}", + "PASSWORD=${var.vm_password}" + ] + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" + } + provisioner "shell" { + script = "./provision/core/reboot.sh" + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}" + expect_disconnect = true + } + provisioner "shell" { + pause_before = "30s" + scripts = [ + "./provision/core/open_windows_check.sh", + "./provision/core/powershell.sh", + "./provision/core/dotnet.sh", + "./provision/core/azcopy.sh", + "./provision/core/ruby.sh", + "./provision/core/rubygem.sh", + "./provision/core/git.sh", + "./provision/core/mongodb.sh", + "./provision/core/node.sh", + "./provision/core/commonutils.sh" + ] + environment_vars = [ + "API_PAT=${var.github_api_pat}", + "USER_PASSWORD=${var.vm_password}" + ] + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" + } + provisioner "shell" { + script = "./provision/core/xcode.ps1" + environment_vars = [ + "XCODE_INSTALL_USER=${var.xcode_install_user}", + "XCODE_INSTALL_PASSWORD=${var.xcode_install_password}" + ] + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} pwsh -f {{ .Path }}" + } + provisioner "shell" { + script = "./provision/core/reboot.sh" + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}" + expect_disconnect = true + } + provisioner "shell" { + scripts = [ + "./provision/core/llvm.sh", + "./provision/core/swiftlint.sh", + "./provision/core/openjdk.sh", + "./provision/core/php.sh", + "./provision/core/aws.sh", + "./provision/core/rust.sh", + "./provision/core/gcc.sh", + "./provision/core/haskell.sh", + "./provision/core/stack.sh", + "./provision/core/cocoapods.sh", + "./provision/core/android-toolsets.sh", + "./provision/core/vsmac.sh", + "./provision/core/apache.sh", + "./provision/core/nginx.sh", + "./provision/core/postgresql.sh", + "./provision/core/vcpkg.sh", + "./provision/core/miniconda.sh", + "./provision/core/safari.sh", + "./provision/core/chrome.sh", + "./provision/core/edge.sh", + "./provision/core/firefox.sh", + "./provision/core/bicep.sh", + "./provision/core/codeql-bundle.sh" + ] + environment_vars = [ + "API_PAT=${var.github_api_pat}" + ] + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" + } + provisioner "shell" { + script = "./provision/core/delete-duplicate-sims.rb" + execute_command = "source $HOME/.bash_profile; ruby {{ .Path }}" + } + provisioner "shell" { + inline = [ + "pwsh -File \"$HOME/image-generation/software-report/SoftwareReport.Generator.ps1\" -OutputDirectory \"$HOME/image-generation/output/software-report\" -ImageName ${var.build_id}" + ] + execute_command = "source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" + } + provisioner "file" { + destination = "../image-output/" + direction = "download" + source = "./image-generation/output/" + } + provisioner "shell" { + scripts = [ + "./provision/configuration/configure-hostname.sh", + "./provision/configuration/finalize-vm.sh" + ] + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" + } +} diff --git a/images/macos/toolsets/toolset-13.json b/images/macos/toolsets/toolset-13.json new file mode 100644 index 000000000000..8db8aa75ccac --- /dev/null +++ b/images/macos/toolsets/toolset-13.json @@ -0,0 +1,142 @@ +{ + "xcode": { + "default": "14.2", + "versions": [ + {"link": "14.3", "version": "14.3.0"}, + {"link": "14.2", "version": "14.2.0"}, + { "link": "14.1", "version": "14.1.0"}, + { "link": "14.0.1", "version": "14.0.1", "symlinks": ["14.0"] } + ] + }, + "xamarin": { + "vsmac": { + "default": "2022", + "versions": [ "2022" ] + } + }, + "java": { + "default": "8", + "default_vendor": "Temurin-Hotspot", + "vendors": [ + { + "name": "Temurin-Hotspot", + "versions": [ "8", "11", "17" ] + } + ] + }, + "android": { + "platform_min_version": "27", + "build_tools_min_version": "27.0.0", + "extra-list": [ + "android;m2repository", "google;m2repository", "google;google_play_services", "intel;Hardware_Accelerated_Execution_Manager" + ], + "addon-list": [], + "additional-tools": [ + "cmake;3.18.1", + "cmake;3.22.1" + ], + "ndk": { + "default": "25", + "versions": [ + "23", "24", "25" + ] + } + }, + "powershellModules": [ + { "name": "Az" }, + { "name": "MarkdownPS" }, + { "name": "Pester" }, + { "name": "PSScriptAnalyzer" } + ], + "brew": { + "common_packages": [ + "ant", + "aria2", + "azure-cli", + "bazelisk", + "carthage", + "cmake", + "colima", + "gh", + "gnupg", + "gnu-tar", + "kotlin", + "libpq", + "p7zip", + "packer", + "perl", + "sbt", + "subversion", + "swiftformat", + "swig", + "zstd", + "gmp", + "zlib", + "libxext", + "libxft", + "tcl-tk", + "r", + "yq", + "imagemagick" + ], + "cask_packages": [ + "julia", + "vagrant", + "virtualbox", + "parallels" + ] + }, + "gcc": { + "versions": [ + "11", + "12" + ] + }, + "pipx": [ + { + "package": "yamllint", + "cmd": "yamllint --version" + } + ], + "dotnet": { + "versions": [ + "3.1", + "6.0", + "7.0" + ] + }, + "ruby": { + "default": "3.0", + "rubygems": [ + "xcode-install", + "cocoapods", + "xcpretty", + "bundler", + "fastlane", + "jazzy" + ] + }, + "go": { + "default": "1.17" + }, + "node": { + "default": "16", + "nvm_versions": [ + "14", + "16", + "18" + ] + }, + "llvm": { + "version": "15" + }, + "php": { + "version": "8.2" + }, + "mongodb": { + "version": "5.0" + }, + "postgresql": { + "version": "14" + } +} From 7fa12b880649ddd0a00fed00b79a5bd4aed462ab Mon Sep 17 00:00:00 2001 From: Dusko Dobranic <101048884+ddobranic@users.noreply.github.com> Date: Tue, 21 Feb 2023 21:30:23 +0100 Subject: [PATCH 1759/3485] Remove libssl dependency (#7166) --- images/linux/scripts/installers/sqlpackage.sh | 6 ------ 1 file changed, 6 deletions(-) diff --git a/images/linux/scripts/installers/sqlpackage.sh b/images/linux/scripts/installers/sqlpackage.sh index bbebb58b1efd..b25c5a11d7d4 100644 --- a/images/linux/scripts/installers/sqlpackage.sh +++ b/images/linux/scripts/installers/sqlpackage.sh @@ -8,12 +8,6 @@ source $HELPER_SCRIPTS/install.sh source $HELPER_SCRIPTS/os.sh -# Install libssl1.1 dependency -if isUbuntu22; then - download_with_retries "http://security.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.1f-1ubuntu2.17_amd64.deb" "/tmp" - dpkg -i /tmp/libssl1.1_1.1.1f-1ubuntu2.17_amd64.deb -fi - # Install SqlPackage download_with_retries "https://aka.ms/sqlpackage-linux" "." "sqlpackage.zip" From 3bd50b83d46ea104e58a73fad2335edb5b462862 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Wed, 22 Feb 2023 19:20:54 +0300 Subject: [PATCH 1760/3485] [macOS] update macOS 13 template (#7175) --- images/macos/templates/macOS-13.anka.pkr.hcl | 4 -- images/macos/toolsets/toolset-13.json | 51 ++++---------------- 2 files changed, 9 insertions(+), 46 deletions(-) diff --git a/images/macos/templates/macOS-13.anka.pkr.hcl b/images/macos/templates/macOS-13.anka.pkr.hcl index e32a93c1cdff..5b0b71119945 100644 --- a/images/macos/templates/macOS-13.anka.pkr.hcl +++ b/images/macos/templates/macOS-13.anka.pkr.hcl @@ -167,7 +167,6 @@ build { "./provision/core/ruby.sh", "./provision/core/rubygem.sh", "./provision/core/git.sh", - "./provision/core/mongodb.sh", "./provision/core/node.sh", "./provision/core/commonutils.sh" ] @@ -205,10 +204,7 @@ build { "./provision/core/android-toolsets.sh", "./provision/core/vsmac.sh", "./provision/core/apache.sh", - "./provision/core/nginx.sh", - "./provision/core/postgresql.sh", "./provision/core/vcpkg.sh", - "./provision/core/miniconda.sh", "./provision/core/safari.sh", "./provision/core/chrome.sh", "./provision/core/edge.sh", diff --git a/images/macos/toolsets/toolset-13.json b/images/macos/toolsets/toolset-13.json index 8db8aa75ccac..7354fc5948cc 100644 --- a/images/macos/toolsets/toolset-13.json +++ b/images/macos/toolsets/toolset-13.json @@ -2,10 +2,9 @@ "xcode": { "default": "14.2", "versions": [ - {"link": "14.3", "version": "14.3.0"}, - {"link": "14.2", "version": "14.2.0"}, - { "link": "14.1", "version": "14.1.0"}, - { "link": "14.0.1", "version": "14.0.1", "symlinks": ["14.0"] } + { "link": "14.3", "version": "14.3.0" }, + { "link": "14.2", "version": "14.2.0" }, + { "link": "14.1", "version": "14.1.0" } ] }, "xamarin": { @@ -15,7 +14,7 @@ } }, "java": { - "default": "8", + "default": "17", "default_vendor": "Temurin-Hotspot", "vendors": [ { @@ -44,7 +43,6 @@ }, "powershellModules": [ { "name": "Az" }, - { "name": "MarkdownPS" }, { "name": "Pester" }, { "name": "PSScriptAnalyzer" } ], @@ -56,7 +54,6 @@ "bazelisk", "carthage", "cmake", - "colima", "gh", "gnupg", "gnu-tar", @@ -65,25 +62,15 @@ "p7zip", "packer", "perl", - "sbt", - "subversion", "swiftformat", - "swig", "zstd", "gmp", - "zlib", - "libxext", - "libxft", - "tcl-tk", "r", - "yq", - "imagemagick" + "yq" ], "cask_packages": [ "julia", - "vagrant", - "virtualbox", - "parallels" + "vagrant" ] }, "gcc": { @@ -92,16 +79,8 @@ "12" ] }, - "pipx": [ - { - "package": "yamllint", - "cmd": "yamllint --version" - } - ], "dotnet": { "versions": [ - "3.1", - "6.0", "7.0" ] }, @@ -112,31 +91,19 @@ "cocoapods", "xcpretty", "bundler", - "fastlane", - "jazzy" + "fastlane" ] }, "go": { - "default": "1.17" + "default": "1.18" }, "node": { - "default": "16", - "nvm_versions": [ - "14", - "16", - "18" - ] + "default": "18" }, "llvm": { "version": "15" }, "php": { "version": "8.2" - }, - "mongodb": { - "version": "5.0" - }, - "postgresql": { - "version": "14" } } From 7e014ba67ba4fccf5280394ff77663a65eb0ca84 Mon Sep 17 00:00:00 2001 From: Dusko Dobranic <101048884+ddobranic@users.noreply.github.com> Date: Wed, 22 Feb 2023 17:38:02 +0100 Subject: [PATCH 1761/3485] [Ubuntu] Update Maven to 3.9.0 (#7060) --- images/linux/toolsets/toolset-1804.json | 2 +- images/linux/toolsets/toolset-2004.json | 2 +- images/linux/toolsets/toolset-2204.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index 6b69a1477168..da1e495e5e0e 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -84,7 +84,7 @@ "versions": [ "8", "11", "12" ] } ], - "maven": "3.8.7" + "maven": "3.9.0" }, "android": { "platform_min_version": "23", diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index f8c43d03d799..923f4d89b5d3 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -85,7 +85,7 @@ "versions": [ "8", "11" ] } ], - "maven": "3.8.7" + "maven": "3.9.0" }, "android": { "cmdline-tools": "latest", diff --git a/images/linux/toolsets/toolset-2204.json b/images/linux/toolsets/toolset-2204.json index 141dadde0678..dd1d649d30ed 100644 --- a/images/linux/toolsets/toolset-2204.json +++ b/images/linux/toolsets/toolset-2204.json @@ -73,7 +73,7 @@ "versions": [ "8", "11", "17" ] } ], - "maven": "3.8.7" + "maven": "3.9.0" }, "android": { "cmdline-tools": "latest", From b5dbb9c705e9e7a909ca64c8284c3e3fffb4cae1 Mon Sep 17 00:00:00 2001 From: Fedor Varavenko <4066226+VFedorV@users.noreply.github.com> Date: Wed, 22 Feb 2023 23:36:07 +0100 Subject: [PATCH 1762/3485] [macOS] point Xcode 13.4 to 13.4.1 (#7177) Announcement(issue-7127): Xcode 13.4 will be pointing to Xcode 13.4.1 and Xcode 13.4 removed. --- images/macos/toolsets/toolset-12.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index 67dee6ae81f0..698aa127322c 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -5,8 +5,7 @@ {"link": "14.2", "version": "14.2.0"}, { "link": "14.1", "version": "14.1.0"}, { "link": "14.0.1", "version": "14.0.1", "symlinks": ["14.0"] }, - { "link": "13.4.1", "version": "13.4.1" }, - { "link": "13.4", "version": "13.4.0" }, + { "link": "13.4.1", "version": "13.4.1", "symlinks": ["13.4"] }, { "link": "13.3.1", "version": "13.3.1", "symlinks": ["13.3"] }, { "link": "13.2.1", "version": "13.2.1", "symlinks": ["13.2"] }, { "link": "13.1", "version": "13.1.0" } From 7a9abb3f6fc237bf49dd8bf5d43f3616c7724cea Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 23 Feb 2023 09:15:28 +0000 Subject: [PATCH 1763/3485] Updating readme file for macOS-11 version 20230219.1 (#7163) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-11-Readme.md | 53 +++++++++++++++++---------------- 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/images/macos/macos-11-Readme.md b/images/macos/macos-11-Readme.md index 23100d019ebf..1abe798f3a1e 100644 --- a/images/macos/macos-11-Readme.md +++ b/images/macos/macos-11-Readme.md @@ -1,11 +1,12 @@ | Announcements | |-| -| [[all OSs] Default Nodejs version will be set to 18 on February, 13](https://github.com/actions/runner-images/issues/7002) | +| [GCC-9 will be removed from macOS 11 on March, 6](https://github.com/actions/runner-images/issues/7136) | +| [Xcode 13.4 will be pointing to 13.4.1 on February, 28](https://github.com/actions/runner-images/issues/7127) | *** # macOS 11 -- OS Version: macOS 11.7.3 (20G1116) +- OS Version: macOS 11.7.4 (20G1120) - Kernel Version: Darwin 20.6.0 -- Image Version: 20230214.1 +- Image Version: 20230219.1 ## Installed Software @@ -27,30 +28,30 @@ - Kotlin 1.8.10-release-430 - Mono 6.12.0.188 - MSBuild 16.10.1.51301 (Mono 6.12.0.188) -- Node.js 18.14.0 +- Node.js 18.14.1 - NVM 0.39.3 -- NVM - Cached node versions: 14.21.2, 16.19.0, 18.14.0 +- NVM - Cached node versions: 14.21.3, 16.19.1, 18.14.1 - Perl 5.36.0 -- PHP 8.2.2 +- PHP 8.2.3 - Python 2.7.18 - Python3 3.11.2 - R 4.2.2 - Ruby 2.7.7p221 ### Package Management -- Bundler 2.4.6 +- Bundler 2.4.7 - Carthage 0.39.0 - CocoaPods 1.11.3 -- Composer 2.5.3 -- Homebrew 3.6.21 +- Composer 2.5.4 +- Homebrew 4.0.1 - Miniconda 23.1.0 - NPM 9.3.1 - NuGet 6.3.1.1 - Pip 20.3.4 (python 2.7) -- Pip3 23.0 (python 3.11) +- Pip3 23.0.1 (python 3.11) - Pipx 1.1.0 -- RubyGems 3.4.6 -- Vcpkg 2023 (build from commit 93895b28e) +- RubyGems 3.4.7 +- Vcpkg 2023 (build from commit a32522820) - Yarn 1.22.19 #### Environment variables @@ -72,7 +73,7 @@ - bazel 6.0.0 - bazelisk 1.16.0 - bsdtar 3.3.2 - available by 'tar' alias -- Curl 7.87.0 +- Curl 7.88.0 - Git 2.39.2 - Git LFS 3.3.0 - GitHub CLI 2.23.0 @@ -87,7 +88,7 @@ - mongod 5.0.14 - Newman 5.3.2 - OpenSSL 1.1.1t 7 Feb 2023 -- Packer 1.8.5 +- Packer 1.8.6 - PostgreSQL 14.7 (Homebrew) - psql (PostgreSQL) 14.7 (Homebrew) - Sox 14.4.2 @@ -99,7 +100,7 @@ ### Tools - Aliyun CLI 3.0.149 - App Center CLI 2.13.2 -- AWS CLI 2.9.23 +- AWS CLI 2.10.1 - AWS SAM CLI 1.73.0 - AWS Session Manager CLI 1.2.398.0 - Azure CLI 2.45.0 @@ -111,10 +112,10 @@ - Colima 0.5.2 - Fastlane 2.211.0 - GHC 9.4.4 -- GHCup 0.1.19.0 +- GHCup 0.1.19.1 - Jazzy 0.14.3 - Stack 2.9.1 -- SwiftFormat 0.50.8 +- SwiftFormat 0.50.9 - Swig 4.1.1 - Xcode Command Line Tools 13.2.0.0.1.1638488800 @@ -123,13 +124,13 @@ - Yamllint 1.29.0 ### Browsers -- Safari 16.3 (16614.4.6.11.6) -- SafariDriver 16.3 (16614.4.6.11.6) +- Safari 16.3.1 (16614.4.6.11.7) +- SafariDriver 16.3.1 (16614.4.6.11.7) - Google Chrome 110.0.5481.100 - ChromeDriver 110.0.5481.77 -- Microsoft Edge 110.0.1587.41 -- Microsoft Edge WebDriver 110.0.1587.41 -- Mozilla Firefox 109.0.1 +- Microsoft Edge 110.0.1587.50 +- Microsoft Edge WebDriver 110.0.1587.50 +- Mozilla Firefox 110.0 - geckodriver 0.32.2 - Selenium server 4.8.0 @@ -176,14 +177,14 @@ - 3.9.16 [PyPy 7.3.11] #### Node.js -- 14.21.2 -- 16.19.0 -- 18.14.0 +- 14.21.3 +- 16.19.1 +- 18.14.1 #### Go - 1.17.13 - 1.18.10 -- 1.19.5 +- 1.19.6 ### Rust Tools - Cargo 1.67.1 From b6be4d9a4dc4e99cc68cef070dc269f2b5790701 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 23 Feb 2023 10:20:01 +0000 Subject: [PATCH 1764/3485] Updating readme file for ubuntu22 version 20230219.1 (#7149) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2204-Readme.md | 39 +++++++++++++++---------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/images/linux/Ubuntu2204-Readme.md b/images/linux/Ubuntu2204-Readme.md index a9c92a95a0f5..7de53e1c6497 100644 --- a/images/linux/Ubuntu2204-Readme.md +++ b/images/linux/Ubuntu2204-Readme.md @@ -1,12 +1,11 @@ | Announcements | |-| -| [[all OSs] Default Nodejs version will be set to 18 on February, 13](https://github.com/actions/runner-images/issues/7002) | | [The Ubuntu 18.04 Actions runner image will begin deprecation on 2022/08/08 and will be fully unsupported by 2023/04/01](https://github.com/actions/runner-images/issues/6002) | *** # Ubuntu 22.04 -- OS Version: 22.04.1 LTS +- OS Version: 22.04.2 LTS - Kernel Version: 5.15.0-1033-azure -- Image Version: 20230217.1 +- Image Version: 20230219.1 ## Installed Software @@ -40,7 +39,7 @@ - Pip3 22.0.2 - Pipx 1.1.0 - RubyGems 3.3.5 -- Vcpkg (build from commit 31a159c1c) +- Vcpkg (build from commit a32522820) - Yarn 1.22.19 #### Environment variables @@ -76,7 +75,7 @@ to accomplish this. - Docker-Buildx 0.10.3 - Docker-Moby Client 20.10.23+azure-2 - Docker-Moby Server 20.10.22+azure-1 -- Fastlane 2.211.0 +- Fastlane 2.212.0 - Git 2.39.2 - Git LFS 3.3.0 - Git-ftp 1.6.0 @@ -109,7 +108,7 @@ to accomplish this. ### CLI Tools - Alibaba Cloud CLI 3.0.149 -- AWS CLI 2.10.0 +- AWS CLI 2.10.1 - AWS CLI Session Manager Plugin 1.2.398.0 - AWS SAM CLI 1.73.0 - Azure CLI 2.45.0 @@ -117,7 +116,7 @@ to accomplish this. - GitHub CLI 2.23.0 - Google Cloud SDK 418.0.0 - Hub CLI 2.14.2 -- Netlify CLI 12.12.1 +- Netlify CLI 12.13.1 - OpenShift CLI 4.12.3 - ORAS CLI 0.16.0 - Vercel CLI 28.16.2 @@ -145,7 +144,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ### Haskell Tools - Cabal 3.6.2.0 - GHC 9.4.4 -- GHCup 0.1.19.0 +- GHCup 0.1.19.1 - Stack 2.9.3 ### Rust Tools @@ -166,8 +165,8 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Google Chrome 110.0.5481.100 - ChromeDriver 110.0.5481.77 - Chromium 110.0.5481.0 -- Microsoft Edge 110.0.1587.49 -- Microsoft Edge WebDriver 110.0.1587.49 +- Microsoft Edge 110.0.1587.50 +- Microsoft Edge WebDriver 110.0.1587.50 - Selenium server 4.8.0 - Mozilla Firefox 110.0 - Geckodriver 0.32.2 @@ -213,12 +212,12 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Go - 1.17.13 - 1.18.10 -- 1.19.5 +- 1.19.6 #### Node.js -- 14.21.2 -- 16.19.0 -- 18.14.0 +- 14.21.3 +- 16.19.1 +- 18.14.1 #### Python - 3.7.15 @@ -288,12 +287,12 @@ Use the following command as a part of your job to start the service: 'sudo syst | debian:10 | sha256:233c3bbc892229c82da7231980d50adceba4db56a08c0b7053a4852782703459 | 2023-02-09 | | debian:11 | sha256:43ef0c6c3585d5b406caa7a0f232ff5a19c1402aeb415f68bcd1cf9d10180af8 | 2023-02-09 | | moby/buildkit:latest | sha256:751921dc37d2f842de38c9387f891fe6ae7d80f03d050ea98f780d7e0874ba00 | 2023-02-13 | -| node:14 | sha256:0443d511c77586fbeff8e32ea55565acbcf666fafa14e995eddbbbba5ff352b0 | 2023-02-11 | -| node:14-alpine | sha256:e389e6411b9951c74289fd51834f59b2b45655ba7aecd3df96e62d1741f4f902 | 2023-02-11 | -| node:16 | sha256:ce3d204ff857d48fbf2cdd16649b5a0b57cc1fd1a3cb2ff0d8727532f5211cf1 | 2023-02-11 | -| node:16-alpine | sha256:1621ddffc775ccf10dc8710660e70d5bfb8e4ee349b926f133698e6512144b73 | 2023-02-11 | -| node:18 | sha256:5ab5e06df2c58dabb18b963636c2fab16b10b7150d13434a12024f599aa645bc | 2023-02-11 | -| node:18-alpine | sha256:45748c3443410b052e2123dcffbd67838727394f9aacfd23e0b47afd95434ff5 | 2023-02-11 | +| node:14 | sha256:1b5300317e95ed8bb2a1c25003f57e52400ce7af1e2e1efd9f52407293f88317 | 2023-02-17 | +| node:14-alpine | sha256:86c59eb57b10df3d55e460b28799f60121f950ad018ff0989ea01ab61a1d9ab2 | 2023-02-17 | +| node:16 | sha256:a4baed9809deba446900d6e2bc6b92c3fe6ccff9ca2873f8d54e263595b02533 | 2023-02-17 | +| node:16-alpine | sha256:0fcf4fb718a763fa53ac8d60073a7cd7dc1520076e08ea0180591174122e52f3 | 2023-02-17 | +| node:18 | sha256:671b86a524e12beac53f6679d791dc8b73bff3a46edf4878343e82503cb33938 | 2023-02-17 | +| node:18-alpine | sha256:045b1a1c90bdfd8fcaad0769922aa16c401e31867d8bf5833365b0874884bbae | 2023-02-17 | | ubuntu:18.04 | sha256:a3765b4d74747b5e9bdd03205b3fbc4fa19a02781c185f97f24c8f4f84ed7bbf | 2023-01-26 | | ubuntu:20.04 | sha256:4a45212e9518f35983a976eead0de5eecc555a2f047134e9dd2cfc589076a00d | 2023-02-01 | | ubuntu:22.04 | sha256:9a0bdde4188b896a372804be2384015e90e3f84906b750c1a53539b585fbbe7f | 2023-01-26 | From 312fbc4f8d136ff0635e34bf4e796414149e7abe Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 23 Feb 2023 15:29:19 +0000 Subject: [PATCH 1765/3485] Updating readme file for ubuntu20 version 20230219.1 (#7148) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2004-Readme.md | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/images/linux/Ubuntu2004-Readme.md b/images/linux/Ubuntu2004-Readme.md index 87054e04310e..8afeeeccc561 100644 --- a/images/linux/Ubuntu2004-Readme.md +++ b/images/linux/Ubuntu2004-Readme.md @@ -1,12 +1,11 @@ | Announcements | |-| -| [[all OSs] Default Nodejs version will be set to 18 on February, 13](https://github.com/actions/runner-images/issues/7002) | | [The Ubuntu 18.04 Actions runner image will begin deprecation on 2022/08/08 and will be fully unsupported by 2023/04/01](https://github.com/actions/runner-images/issues/6002) | *** # Ubuntu 20.04 - OS Version: 20.04.5 LTS - Kernel Version: 5.15.0-1033-azure -- Image Version: 20230217.1 +- Image Version: 20230219.1 ## Installed Software @@ -42,7 +41,7 @@ - Pip3 20.0.2 - Pipx 1.1.0 - RubyGems 3.1.2 -- Vcpkg (build from commit 31a159c1c) +- Vcpkg (build from commit a32522820) - Yarn 1.22.19 #### Environment variables @@ -61,7 +60,7 @@ to accomplish this. ### Project Management - Ant 1.10.7 -- Gradle 8.0 +- Gradle 8.0.1 - Lerna 6.5.1 - Maven 3.8.7 - Sbt 1.8.2 @@ -82,7 +81,7 @@ to accomplish this. - Docker-Buildx 0.10.3 - Docker-Moby Client 20.10.23+azure-2 - Docker-Moby Server 20.10.22+azure-1 -- Fastlane 2.211.0 +- Fastlane 2.212.0 - Git 2.39.2 - Git LFS 3.3.0 - Git-ftp 1.6.0 @@ -117,7 +116,7 @@ to accomplish this. ### CLI Tools - Alibaba Cloud CLI 3.0.149 -- AWS CLI 2.10.0 +- AWS CLI 2.10.1 - AWS CLI Session Manager Plugin 1.2.398.0 - AWS SAM CLI 1.73.0 - Azure CLI 2.45.0 @@ -153,7 +152,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ### Haskell Tools - Cabal 3.6.2.0 - GHC 9.4.4 -- GHCup 0.1.19.0 +- GHCup 0.1.19.1 - Stack 2.9.3 ### Rust Tools @@ -174,8 +173,8 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Google Chrome 110.0.5481.100 - ChromeDriver 110.0.5481.77 - Chromium 110.0.5481.0 -- Microsoft Edge 110.0.1587.49 -- Microsoft Edge WebDriver 110.0.1587.49 +- Microsoft Edge 110.0.1587.50 +- Microsoft Edge WebDriver 110.0.1587.50 - Selenium server 4.8.0 - Mozilla Firefox 110.0 - Geckodriver 0.32.2 @@ -309,12 +308,12 @@ Use the following command as a part of your job to start the service: 'sudo syst | debian:11 | sha256:43ef0c6c3585d5b406caa7a0f232ff5a19c1402aeb415f68bcd1cf9d10180af8 | 2023-02-09 | | debian:9 | sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be | 2022-06-23 | | moby/buildkit:latest | sha256:751921dc37d2f842de38c9387f891fe6ae7d80f03d050ea98f780d7e0874ba00 | 2023-02-13 | -| node:14 | sha256:0443d511c77586fbeff8e32ea55565acbcf666fafa14e995eddbbbba5ff352b0 | 2023-02-11 | -| node:14-alpine | sha256:e389e6411b9951c74289fd51834f59b2b45655ba7aecd3df96e62d1741f4f902 | 2023-02-11 | -| node:16 | sha256:ce3d204ff857d48fbf2cdd16649b5a0b57cc1fd1a3cb2ff0d8727532f5211cf1 | 2023-02-11 | -| node:16-alpine | sha256:1621ddffc775ccf10dc8710660e70d5bfb8e4ee349b926f133698e6512144b73 | 2023-02-11 | -| node:18 | sha256:5ab5e06df2c58dabb18b963636c2fab16b10b7150d13434a12024f599aa645bc | 2023-02-11 | -| node:18-alpine | sha256:45748c3443410b052e2123dcffbd67838727394f9aacfd23e0b47afd95434ff5 | 2023-02-11 | +| node:14 | sha256:1b5300317e95ed8bb2a1c25003f57e52400ce7af1e2e1efd9f52407293f88317 | 2023-02-17 | +| node:14-alpine | sha256:86c59eb57b10df3d55e460b28799f60121f950ad018ff0989ea01ab61a1d9ab2 | 2023-02-17 | +| node:16 | sha256:a4baed9809deba446900d6e2bc6b92c3fe6ccff9ca2873f8d54e263595b02533 | 2023-02-17 | +| node:16-alpine | sha256:0fcf4fb718a763fa53ac8d60073a7cd7dc1520076e08ea0180591174122e52f3 | 2023-02-17 | +| node:18 | sha256:671b86a524e12beac53f6679d791dc8b73bff3a46edf4878343e82503cb33938 | 2023-02-17 | +| node:18-alpine | sha256:045b1a1c90bdfd8fcaad0769922aa16c401e31867d8bf5833365b0874884bbae | 2023-02-17 | | ubuntu:16.04 | sha256:1f1a2d56de1d604801a9671f301190704c25d604a416f59e03c04f5c6ffee0d6 | 2021-08-31 | | ubuntu:18.04 | sha256:a3765b4d74747b5e9bdd03205b3fbc4fa19a02781c185f97f24c8f4f84ed7bbf | 2023-01-26 | | ubuntu:20.04 | sha256:4a45212e9518f35983a976eead0de5eecc555a2f047134e9dd2cfc589076a00d | 2023-02-01 | From e0dd25a5e038341dd454be8fabf48f0c330cf3ea Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 23 Feb 2023 15:29:44 +0000 Subject: [PATCH 1766/3485] Updating readme file for win22 version 20230219.1 (#7153) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2022-Readme.md | 49 ++++++++++++++------------------ 1 file changed, 22 insertions(+), 27 deletions(-) diff --git a/images/win/Windows2022-Readme.md b/images/win/Windows2022-Readme.md index 4858297088fa..60f39c0a123e 100644 --- a/images/win/Windows2022-Readme.md +++ b/images/win/Windows2022-Readme.md @@ -1,10 +1,6 @@ -| Announcements | -|-| -| [[all OSs] Default Nodejs version will be set to 18 on February, 13](https://github.com/actions/runner-images/issues/7002) | -*** # Windows Server 2022 - OS Version: 10.0.20348 Build 1547 -- Image Version: 20230214.1 +- Image Version: 20230219.1 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -17,23 +13,23 @@ - Julia 1.8.5 - Kotlin 1.8.10 - LLVM 15.0.7 -- Node 18.14.0 +- Node 18.14.1 - Perl 5.32.1 - PHP 8.2.3 - Python 3.9.13 - Ruby 3.0.5p211 ### Package Management -- Chocolatey 1.2.1 -- Composer 2.5.3 +- Chocolatey 1.3.0 +- Composer 2.5.4 - Helm 3.11.1 - Miniconda 23.1.0 (pre-installed on the image but not added to PATH) - NPM 9.3.1 - NuGet 6.4.0.123 -- pip 23.0 (python 3.9) +- pip 23.0.1 (python 3.9) - Pipx 1.1.0 - RubyGems 3.2.33 -- Vcpkg (build from commit 93895b28e) +- Vcpkg (build from commit a32522820) - Yarn 1.22.19 #### Environment variables @@ -66,7 +62,7 @@ - Git 2.39.2.windows.1 - Git LFS 3.3.0 - ImageMagick 7.1.0-61 -- InnoSetup 6.2.1 +- InnoSetup 6.2.2 - jq 1.6 - Kind 0.17.0 - Kubectl 1.26.1 @@ -90,7 +86,7 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.149 -- AWS CLI 2.9.23 +- AWS CLI 2.10.1 - AWS SAM CLI 1.73.0 - AWS Session Manager CLI 1.2.398.0 - Azure CLI 2.45.0 @@ -113,10 +109,10 @@ - Rustfmt 1.5.1 ### Browsers and Drivers -- Google Chrome 110.0.5481.100 +- Google Chrome 110.0.5481.104 - Chrome Driver 110.0.5481.77 -- Microsoft Edge 110.0.1587.41 -- Microsoft Edge Driver 110.0.1587.41 +- Microsoft Edge 110.0.1587.50 +- Microsoft Edge Driver 110.0.1587.50 - Mozilla Firefox 110.0 - Gecko Driver 0.32.2 - IE Driver 4.8.0.0 @@ -159,12 +155,12 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Go - 1.17.13 - 1.18.10 -- 1.19.5 +- 1.19.6 #### Node.js -- 14.21.2 -- 16.19.0 -- 18.14.0 +- 14.21.3 +- 16.19.1 +- 18.14.1 #### Python - 3.7.9 @@ -528,8 +524,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### .NET Core Tools - .NET Core SDK: 3.1.120, 3.1.202, 3.1.302, 3.1.426, 6.0.114, 6.0.203, 6.0.309, 6.0.406, 7.0.103 - .NET Framework: 4.8, 4.8.1 -- Microsoft.AspNetCore.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 6.0.5, 6.0.13, 6.0.14, 7.0.3 -- Microsoft.NETCore.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 6.0.5, 6.0.13, 6.0.14, 7.0.3 +- Microsoft.AspNetCore.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 6.0.5, 6.0.14, 7.0.3 +- Microsoft.NETCore.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 6.0.5, 6.0.14, 7.0.3 - Microsoft.WindowsDesktop.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 6.0.5, 6.0.14, 7.0.3 - nbgv 3.5.119+5d25f54fec @@ -543,10 +539,10 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Az (Cached): 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.270 +- AWSPowershell: 4.1.274 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 -- Microsoft.Graph: 1.21.0 +- Microsoft.Graph: 1.22.0 - Pester: 3.4.0, 5.4.0 - PowerShellGet: 1.0.0.1, 2.2.5 - PSScriptAnalyzer: 1.21.0 @@ -587,9 +583,8 @@ All other versions are saved but not installed. ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2022 | sha256:3fed696d6f08740a9e1d46f30f1162765b2e1109476761ce93e8fbeef5f54caf | 2023-01-10 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2022 | sha256:623206b7da179ddb4d4e5e3695889d03f72b368bdde4e05d70f8fde75371bdac | 2023-01-10 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:d8e9237fba3770319c899b8a87e54fb3427a3fa8617d2de78cec6e3465d71cfc | 2023-01-10 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2022 | sha256:5f068dbfbe1aa441ea4295fbe9fe36e1ee0915cb65f8a3d76126a318a4a48200 | 2023-02-14 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2022 | sha256:b4dca605425b7411b347b91e0dc30cfabbfb80e79c66e4a350f2057f7fe391b8 | 2023-02-14 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:aa13c40eb160f60649c6ea873289a48277c3cc54cf538a27bb1ae08b040f8ad4 | 2023-02-14 | | mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:786a24be2bd1945bee9701f95a71d8573ace8641c112dc27206f826bef0229c1 | 2023-02-07 | | mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:5662262ca25622f4f8ad593481dd58dea47713bce5e6c9fdef9089a92e7c75b1 | 2023-02-07 | - From a65bd14fa1b54df5300ef3364ec36c39c5bbe46a Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Thu, 23 Feb 2023 17:00:00 +0100 Subject: [PATCH 1767/3485] [ macOS ] Add pkg-config to report (#7176) --- images/macos/software-report/SoftwareReport.Common.psm1 | 5 +++++ images/macos/software-report/SoftwareReport.Generator.ps1 | 1 + 2 files changed, 6 insertions(+) diff --git a/images/macos/software-report/SoftwareReport.Common.psm1 b/images/macos/software-report/SoftwareReport.Common.psm1 index c8ce4bf8f1be..0cc3d1d80df4 100644 --- a/images/macos/software-report/SoftwareReport.Common.psm1 +++ b/images/macos/software-report/SoftwareReport.Common.psm1 @@ -645,3 +645,8 @@ function Get-ColimaVersion { $colimaVersion = Run-Command "colima version" | Select-String "colima version" | Take-Part -Part 2 return $colimaVersion } + +function Get-PKGConfigVersion { + $pkgconfigVersion = Run-Command "pkg-config --version" + return $pkgconfigVersion +} diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1 index 2db63d181332..f3ff4d50ea23 100644 --- a/images/macos/software-report/SoftwareReport.Generator.ps1 +++ b/images/macos/software-report/SoftwareReport.Generator.ps1 @@ -107,6 +107,7 @@ if ($os.IsBigSur) { } $utilities.AddToolVersion("OpenSSL", $(Get-OpenSSLVersion)) $utilities.AddToolVersion("Packer", $(Get-PackerVersion)) +$utilities.AddToolVersion("pkg-config", $(Get-PKGConfigVersion)) $utilities.AddToolVersion("PostgreSQL", $(Get-PostgresServerVersion)) $utilities.AddToolVersion("psql (PostgreSQL)", $(Get-PostgresClientVersion)) $utilities.AddToolVersion("Sox", $(Get-SoxVersion)) From d9fa202bbb0c4e498d5b38646612445a28a56fec Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Thu, 23 Feb 2023 17:33:06 +0100 Subject: [PATCH 1768/3485] [macOS] Update utils.sh - brew all bottles, fix echo (#7160) --- images/macos/provision/utils/utils.sh | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/images/macos/provision/utils/utils.sh b/images/macos/provision/utils/utils.sh index 8214c3036d30..51de77298981 100755 --- a/images/macos/provision/utils/utils.sh +++ b/images/macos/provision/utils/utils.sh @@ -114,24 +114,36 @@ get_brew_os_keyword() { should_build_from_source() { local tool_name=$1 local os_name=$2 - local tool_info=$(brew info --json=v1 $tool_name) - local bottle_disabled=$(echo "$tool_info" | jq ".[0].bottle_disabled") + # If one of the parsers aborts with an error, + # we will get an empty variable notification in the logs + set -u + # Geting tool info from brew to find available install methods except build from source + local tool_info=$(brew info --json=v1 $tool_name) + # No need to build from source if a bottle is disabled - # Use the simple 'brew install' command to download a package + local bottle_disabled=$(echo -E $tool_info | jq ".[0].bottle_disabled") if [[ $bottle_disabled == "true" ]]; then echo "false" return fi - local tool_bottle=$(echo "$tool_info" | jq ".[0].bottle.stable.files.$os_name") - if [[ "$tool_bottle" == "null" ]]; then - echo "true" + # No need to build from source if a universal bottle is available + local all_bottle=$(echo -E $tool_info | jq ".[0].bottle.stable.files.all") + if [[ "$all_bottle" != "null" ]]; then + echo "false" return - else + fi + + # No need to build from source if a bottle for current OS is available + local os_bottle=$(echo -E $tool_info | jq ".[0].bottle.stable.files.$os_name") + if [[ "$os_bottle" != "null" ]]; then echo "false" return fi + + # Available method wasn't found - should build from source + echo "true" } # brew provides package bottles for different macOS versions From ac0d8e922b1520a5084e4a82a6fdf5d6260eb5ec Mon Sep 17 00:00:00 2001 From: sergei-pyshnoi <121864472+sergei-pyshnoi@users.noreply.github.com> Date: Thu, 23 Feb 2023 19:44:51 +0100 Subject: [PATCH 1769/3485] [Ubuntu] add go 1.20 to toolsets (#7185) --- images/linux/toolsets/toolset-2004.json | 3 ++- images/linux/toolsets/toolset-2204.json | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index 923f4d89b5d3..4267969e7738 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -47,7 +47,8 @@ "versions": [ "1.17.*", "1.18.*", - "1.19.*" + "1.19.*", + "1.20.*" ], "default": "1.17.*" }, diff --git a/images/linux/toolsets/toolset-2204.json b/images/linux/toolsets/toolset-2204.json index dd1d649d30ed..a6ebcef08393 100644 --- a/images/linux/toolsets/toolset-2204.json +++ b/images/linux/toolsets/toolset-2204.json @@ -43,7 +43,8 @@ "versions": [ "1.17.*", "1.18.*", - "1.19.*" + "1.19.*", + "1.20.*" ], "default": "1.18.*" }, From 8c0f7bb0320e7c1c03f279260b6e428fb89467e9 Mon Sep 17 00:00:00 2001 From: sergei-pyshnoi <121864472+sergei-pyshnoi@users.noreply.github.com> Date: Thu, 23 Feb 2023 19:45:43 +0100 Subject: [PATCH 1770/3485] [macOS] add go 1.20 to toolsets (#7184) --- images/macos/toolsets/toolset-11.json | 3 ++- images/macos/toolsets/toolset-12.json | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index f131d8153bf4..797c55116f31 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -285,7 +285,8 @@ "versions": [ "1.17.*", "1.18.*", - "1.19.*" + "1.19.*", + "1.20.*" ] }, { diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index 698aa127322c..fb9a4779ac61 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -263,7 +263,8 @@ "versions": [ "1.17.*", "1.18.*", - "1.19.*" + "1.19.*", + "1.20.*" ] }, { From dc6b07abe38d7e4f5087cf026efa2bc7acaa1e84 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 23 Feb 2023 19:55:36 +0000 Subject: [PATCH 1771/3485] Updating readme file for macOS-12 version 20230219.1 (#7161) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-12-Readme.md | 58 +++++++++++++++++---------------- 1 file changed, 30 insertions(+), 28 deletions(-) diff --git a/images/macos/macos-12-Readme.md b/images/macos/macos-12-Readme.md index bef43bc482e3..1f71d70ec329 100644 --- a/images/macos/macos-12-Readme.md +++ b/images/macos/macos-12-Readme.md @@ -1,11 +1,12 @@ | Announcements | |-| -| [[all OSs] Default Nodejs version will be set to 18 on February, 13](https://github.com/actions/runner-images/issues/7002) | +| [GCC-9 will be removed from macOS 11 on March, 6](https://github.com/actions/runner-images/issues/7136) | +| [Xcode 13.4 will be pointing to 13.4.1 on February, 28](https://github.com/actions/runner-images/issues/7127) | *** # macOS 12 - OS Version: macOS 12.6.3 (21G419) - Kernel Version: Darwin 21.6.0 -- Image Version: 20230214.2 +- Image Version: 20230219.1 ## Installed Software @@ -23,30 +24,30 @@ - Kotlin 1.8.10-release-430 - Mono 6.12.0.188 - MSBuild 16.10.1.51301 (Mono 6.12.0.188) -- Node.js 18.14.0 +- Node.js 18.14.1 - NVM 0.39.3 -- NVM - Cached node versions: 14.21.2, 16.19.0, 18.14.0 +- NVM - Cached node versions: 14.21.3, 16.19.1, 18.14.1 - Perl 5.36.0 -- PHP 8.2.2 +- PHP 8.2.3 - Python 2.7.18 - Python3 3.11.2 - R 4.2.2 - Ruby 3.0.5p211 ### Package Management -- Bundler 2.4.6 +- Bundler 2.4.7 - Carthage 0.39.0 - CocoaPods 1.11.3 -- Composer 2.5.3 -- Homebrew 3.6.21 +- Composer 2.5.4 +- Homebrew 4.0.1 - Miniconda 23.1.0 - NPM 9.3.1 - NuGet 6.3.1.1 - Pip 20.3.4 (python 2.7) -- Pip3 23.0 (python 3.11) +- Pip3 23.0.1 (python 3.11) - Pipx 1.1.0 -- RubyGems 3.4.6 -- Vcpkg 2023 (build from commit 93895b28e) +- RubyGems 3.4.7 +- Vcpkg 2023 (build from commit a32522820) - Yarn 1.22.19 #### Environment variables @@ -68,7 +69,7 @@ - bazel 6.0.0 - bazelisk 1.16.0 - bsdtar 3.5.1 - available by 'tar' alias -- Curl 7.87.0 +- Curl 7.88.0 - Git 2.39.2 - Git LFS 3.3.0 - GitHub CLI 2.23.0 @@ -81,7 +82,7 @@ - mongo 5.0.14 - mongod 5.0.14 - OpenSSL 1.1.1t 7 Feb 2023 -- Packer 1.8.5 +- Packer 1.8.6 - PostgreSQL 14.7 (Homebrew) - psql (PostgreSQL) 14.7 (Homebrew) - Sox 14.4.2 @@ -94,7 +95,7 @@ ### Tools - App Center CLI 2.13.2 -- AWS CLI 2.9.23 +- AWS CLI 2.10.1 - AWS SAM CLI 1.73.0 - AWS Session Manager CLI 1.2.398.0 - Azure CLI 2.45.0 @@ -109,7 +110,7 @@ - GHCup 0.1.19.0 - Jazzy 0.14.3 - Stack 2.9.1 -- SwiftFormat 0.50.8 +- SwiftFormat 0.50.9 - Swig 4.1.1 - Xcode Command Line Tools 14.2.0.0.1.1668646533 @@ -122,9 +123,9 @@ - SafariDriver 16.3 (17614.4.6.11.6) - Google Chrome 110.0.5481.100 - ChromeDriver 110.0.5481.77 -- Microsoft Edge 110.0.1587.41 -- Microsoft Edge WebDriver 110.0.1587.41 -- Mozilla Firefox 109.0.1 +- Microsoft Edge 110.0.1587.50 +- Microsoft Edge WebDriver 110.0.1587.50 +- Mozilla Firefox 110.0 - geckodriver 0.32.2 - Selenium server 4.8.0 @@ -168,14 +169,14 @@ - 3.9.16 [PyPy 7.3.11] #### Node.js -- 14.21.2 -- 16.19.0 -- 18.14.0 +- 14.21.3 +- 16.19.1 +- 18.14.1 #### Go - 1.17.13 - 1.18.10 -- 1.19.5 +- 1.19.6 ### Rust Tools - Cargo 1.67.1 @@ -224,6 +225,7 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" #### Xamarin bundles | symlink | Xamarin.Mono | Xamarin.iOS | Xamarin.Mac | Xamarin.Android | | ----------------- | ------------ | ----------- | ----------- | --------------- | +| 6_12_23 | 6.12 | 16.2 | 9.1 | 13.1 | | 6_12_22 | 6.12 | 16.1 | 9.0 | 13.1 | | 6_12_21 (default) | 6.12 | 16.0 | 8.12 | 13.1 | | 6_12_20 | 6.12 | 16.0 | 8.12 | 13.0 | @@ -315,16 +317,16 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" | iOS 16.0 | 14.0.1 | iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPhone SE (3rd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | | iOS 16.1 | 14.1 | iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro (9.7-inch) | | iOS 16.2 | 14.2 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro (9.7-inch) | -| tvOS 15.0 | 13.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | -| tvOS 15.2 | 13.2.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (2nd generation) (at 1080p) | -| tvOS 15.4 | 13.3.1<br>13.4<br>13.4.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (2nd generation) (at 1080p) | +| tvOS 15.0 | 13.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (2nd generation) (at 1080p) | +| tvOS 15.2 | 13.2.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | +| tvOS 15.4 | 13.3.1<br>13.4<br>13.4.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | | tvOS 16.0 | 13.1<br>13.2.1<br>13.3.1<br>13.4<br>13.4.1<br>14.0.1<br>14.1<br>14.2 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | | tvOS 16.1 | 13.1<br>13.2.1<br>13.3.1<br>13.4<br>13.4.1<br>14.0.1<br>14.1<br>14.2 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p)<br>Apple TV 4K (at 1080p) (2nd generation) | | watchOS 8.0 | 13.1 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | | watchOS 8.3 | 13.2.1 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | | watchOS 8.5 | 13.3.1<br>13.4<br>13.4.1 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | -| watchOS 9.0 | 13.1<br>13.2.1<br>13.3.1<br>13.4<br>13.4.1<br>14.0.1<br>14.1<br>14.2 | Apple Watch SE - 40mm (2nd generation)<br>Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm<br>Apple Watch Series 8 - 41mm<br>Apple Watch Series 8 - 45mm<br>Apple Watch Ultra - 49mm | -| watchOS 9.1 | 13.1<br>13.2.1<br>13.3.1<br>13.4<br>13.4.1<br>14.0.1<br>14.1<br>14.2 | Apple Watch SE - 40mm (2nd generation)<br>Apple Watch SE - 44mm (2nd generation)<br>Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm<br>Apple Watch Series 8 - 41mm<br>Apple Watch Series 8 - 45mm<br>Apple Watch Ultra - 49mm | +| watchOS 9.0 | 13.1<br>13.2.1<br>13.3.1<br>13.4<br>13.4.1<br>14.0.1<br>14.1<br>14.2 | Apple Watch SE - 40mm (2nd generation)<br>Apple Watch SE - 44mm (2nd generation)<br>Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm<br>Apple Watch Series 8 - 41mm<br>Apple Watch Series 8 - 45mm<br>Apple Watch Ultra - 49mm | +| watchOS 9.1 | 13.1<br>13.2.1<br>13.3.1<br>13.4<br>13.4.1<br>14.0.1<br>14.1<br>14.2 | Apple Watch SE - 40mm (2nd generation)<br>Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm<br>Apple Watch Series 8 - 41mm<br>Apple Watch Series 8 - 45mm<br>Apple Watch Ultra - 49mm | ### Android | Package Name | Version | @@ -360,7 +362,7 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" #### Environment variables | Name | Value | | ----------------- | ----------------------------------------------------------------------------------------- | -| PARALLELS_DMG_URL | https://download.parallels.com/desktop/v18/18.1.1-53328/ParallelsDesktop-18.1.1-53328.dmg | +| PARALLELS_DMG_URL | https://download.parallels.com/desktop/v18/18.2.0-53488/ParallelsDesktop-18.2.0-53488.dmg | ##### Notes ``` From d554c13cc8061f4b69174e1b226619747e5c735e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 23 Feb 2023 22:49:14 +0000 Subject: [PATCH 1772/3485] Updating readme file for win19 version 20230219.1 (#7157) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2019-Readme.md | 53 +++++++++++++++----------------- 1 file changed, 24 insertions(+), 29 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index 0e7a1e2f28b5..207d93864daf 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -1,10 +1,6 @@ -| Announcements | -|-| -| [[all OSs] Default Nodejs version will be set to 18 on February, 13](https://github.com/actions/runner-images/issues/7002) | -*** # Windows Server 2019 - OS Version: 10.0.17763 Build 4010 -- Image Version: 20230214.1 +- Image Version: 20230219.1 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -17,23 +13,23 @@ - Julia 1.8.5 - Kotlin 1.8.10 - LLVM 15.0.7 -- Node 18.14.0 +- Node 18.14.1 - Perl 5.32.1 - PHP 8.2.3 - Python 3.7.9 - Ruby 2.5.9p229 ### Package Management -- Chocolatey 1.2.1 -- Composer 2.5.3 +- Chocolatey 1.3.0 +- Composer 2.5.4 - Helm 3.11.1 - Miniconda 23.1.0 (pre-installed on the image but not added to PATH) - NPM 9.3.1 - NuGet 6.4.0.123 -- pip 23.0 (python 3.7) +- pip 23.0.1 (python 3.7) - Pipx 1.1.0 - RubyGems 2.7.6.3 -- Vcpkg (build from commit 93895b28e) +- Vcpkg (build from commit a32522820) - Yarn 1.22.19 #### Environment variables @@ -67,7 +63,7 @@ - Git LFS 3.3.0 - Google Cloud SDK 418.0.0 - ImageMagick 7.1.0-61 -- InnoSetup 6.2.1 +- InnoSetup 6.2.2 - jq 1.6 - Kind 0.17.0 - Kubectl 1.26.1 @@ -92,7 +88,7 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.149 -- AWS CLI 2.9.23 +- AWS CLI 2.10.1 - AWS SAM CLI 1.73.0 - AWS Session Manager CLI 1.2.398.0 - Azure CLI 2.45.0 @@ -116,10 +112,10 @@ - Rustfmt 1.5.1 ### Browsers and Drivers -- Google Chrome 110.0.5481.100 +- Google Chrome 110.0.5481.104 - Chrome Driver 110.0.5481.77 -- Microsoft Edge 110.0.1587.41 -- Microsoft Edge Driver 110.0.1587.41 +- Microsoft Edge 110.0.1587.50 +- Microsoft Edge Driver 110.0.1587.50 - Mozilla Firefox 110.0 - Gecko Driver 0.32.2 - IE Driver 4.8.0.0 @@ -166,12 +162,12 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Go - 1.17.13 - 1.18.10 -- 1.19.5 +- 1.19.6 #### Node.js -- 14.21.2 -- 16.19.0 -- 18.14.0 +- 14.21.3 +- 16.19.1 +- 18.14.1 #### Python - 2.7.18 @@ -478,10 +474,10 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft Visual C++ 2013 Minimum Runtime | x86 | 12.0.21005 | | Microsoft Visual C++ 2019 Debug Runtime | x64 | 14.29.30139 | | Microsoft Visual C++ 2019 Debug Runtime | x86 | 14.29.30139 | -| Microsoft Visual C++ 2022 Additional Runtime | x64 | 14.34.31931 | -| Microsoft Visual C++ 2022 Minimum Runtime | x64 | 14.34.31931 | -| Microsoft Visual C++ 2022 Additional Runtime | x86 | 14.34.31931 | -| Microsoft Visual C++ 2022 Minimum Runtime | x86 | 14.34.31931 | +| Microsoft Visual C++ 2022 Additional Runtime | x64 | 14.34.31938 | +| Microsoft Visual C++ 2022 Minimum Runtime | x64 | 14.34.31938 | +| Microsoft Visual C++ 2022 Additional Runtime | x86 | 14.34.31938 | +| Microsoft Visual C++ 2022 Minimum Runtime | x86 | 14.34.31938 | #### Installed Windows SDKs - 10.0.14393.0 @@ -512,10 +508,10 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Az (Cached): 1.0.0.zip, 1.6.0.zip, 2.3.2.zip, 2.6.0.zip, 3.1.0.zip, 3.5.0.zip, 3.8.0.zip, 4.3.0.zip, 4.4.0.zip, 4.7.0.zip, 5.5.0.zip, 5.9.0.zip, 6.6.0.zip, 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.270 +- AWSPowershell: 4.1.274 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 -- Microsoft.Graph: 1.21.0 +- Microsoft.Graph: 1.22.0 - Pester: 3.4.0, 5.4.0 - PowerShellGet: 1.0.0.1, 2.2.5 - PSScriptAnalyzer: 1.21.0 @@ -557,9 +553,8 @@ All other versions are saved but not installed. ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:4023e36afe8362191abad7aba8bb8044095fe23826dea4cb7183de912b0ddbdc | 2023-01-10 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:01992d00b171c830916b9600a380ef5c291c8670db86235255335c1f65bde911 | 2023-01-10 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:5049a4803de68e7c5aa2840186ea3de1462db56a60329479d259dc48700d19a0 | 2023-01-10 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:c3ffbe8f1ac99a6e8bd51e0259c0e33b3203098209ed56f71ef038e7781b4fd2 | 2023-02-14 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:7d8886649cc239ad1daf134dd8a566dd1b680291eb7f89ffe4ba2968c7f0007e | 2023-02-14 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:1c93b0efbaf3d4b2b23ffb8d772aa8586322af7449273f12c47c0931c79325ce | 2023-02-14 | | mcr.microsoft.com/windows/nanoserver:1809 | sha256:fc2d54de31f170c0bef160137b4dc0a80c2105a218b248dc71c754e1fcabd14f | 2023-02-07 | | mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:46b40e526196d42b78d6bc777529203fd51467b095ddcb7acc87fc475c3c5e55 | 2023-02-07 | - From 6c0a78e1c76d32e211688f116c76ee19382dc929 Mon Sep 17 00:00:00 2001 From: sergei-pyshnoi <121864472+sergei-pyshnoi@users.noreply.github.com> Date: Fri, 24 Feb 2023 08:34:36 +0100 Subject: [PATCH 1773/3485] add go 1.20 to toolsets (#7186) --- images/win/toolsets/toolset-2019.json | 3 ++- images/win/toolsets/toolset-2022.json | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index 62baee084bfd..a98bb2f360e4 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -76,7 +76,8 @@ "versions": [ "1.17.*", "1.18.*", - "1.19.*" + "1.19.*", + "1.20.*" ], "default": "1.17.*" } diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index bf05a09a7d4b..3ad212bdcef5 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -68,7 +68,8 @@ "versions": [ "1.17.*", "1.18.*", - "1.19.*" + "1.19.*", + "1.20.*" ], "default": "1.17.*" } From bcb2886e5b0fb66c491f66640461128755c06885 Mon Sep 17 00:00:00 2001 From: sergei-pyshnoi <121864472+sergei-pyshnoi@users.noreply.github.com> Date: Fri, 24 Feb 2023 08:39:50 +0100 Subject: [PATCH 1774/3485] [macOS] Software Updates 2023 Week 9 (#7183) --- images/macos/toolsets/toolset-12.json | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index fb9a4779ac61..d5d025c424d3 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -20,16 +20,23 @@ "6.12.0.188" ], "ios-versions": [ - "16.2.0.2", "16.1.1.27", "16.0.0.72", "15.12.0.2", "15.10.0.5", "15.8.0.3", "15.6.0.3", "15.4.0.0", "15.2.0.17", "15.0.0.6" + "16.2.0.5", "16.1.1.27", "16.0.0.72", "15.12.0.2", "15.10.0.5", "15.8.0.3", "15.6.0.3", "15.4.0.0", "15.2.0.17", "15.0.0.6" ], "mac-versions": [ - "9.1.0.2", "9.0.0.27", "8.12.0.2", "8.10.0.5", "8.8.0.3", "8.6.0.3", "8.4.0.0", "8.2.0.17", "7.14.0.27" + "9.1.0.5", "9.0.0.27", "8.12.0.2", "8.10.0.5", "8.8.0.3", "8.6.0.3", "8.4.0.0", "8.2.0.17", "7.14.0.27" ], "android-versions": [ - "13.1.0.1", "13.0.0.0", "12.3.3.3", "12.2.8.3", "12.1.0.2", "12.0.0.3", "11.3.0.4" + "13.2.0.0", "13.1.0.1", "13.0.0.0", "12.3.3.3", "12.2.8.3", "12.1.0.2", "12.0.0.3", "11.3.0.4" ], "bundle-default": "6_12_21", "bundles": [ + { + "symlink": "6_12_24", + "mono":"6.12", + "ios": "16.2", + "mac": "9.1", + "android": "13.2" + }, { "symlink": "6_12_23", "mono":"6.12", From e4e631725ae06a73c82ef757d45155385842e792 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Tue, 28 Feb 2023 00:07:45 +0100 Subject: [PATCH 1775/3485] Revert "Remove libssl dependency (#7166)" (#7203) This reverts commit 7fa12b880649ddd0a00fed00b79a5bd4aed462ab. --- images/linux/scripts/installers/sqlpackage.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/images/linux/scripts/installers/sqlpackage.sh b/images/linux/scripts/installers/sqlpackage.sh index b25c5a11d7d4..bbebb58b1efd 100644 --- a/images/linux/scripts/installers/sqlpackage.sh +++ b/images/linux/scripts/installers/sqlpackage.sh @@ -8,6 +8,12 @@ source $HELPER_SCRIPTS/install.sh source $HELPER_SCRIPTS/os.sh +# Install libssl1.1 dependency +if isUbuntu22; then + download_with_retries "http://security.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.1f-1ubuntu2.17_amd64.deb" "/tmp" + dpkg -i /tmp/libssl1.1_1.1.1f-1ubuntu2.17_amd64.deb +fi + # Install SqlPackage download_with_retries "https://aka.ms/sqlpackage-linux" "." "sqlpackage.zip" From 9089d1ec9584820e8de38284a48123c684b6bbe2 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Tue, 28 Feb 2023 14:49:01 +0100 Subject: [PATCH 1776/3485] [macOS] do not install tcl/tk symlinks on BigSur (#7202) --- images/macos/provision/core/commonutils.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/macos/provision/core/commonutils.sh b/images/macos/provision/core/commonutils.sh index 84deb1a5427d..97ea9b3d8a0a 100644 --- a/images/macos/provision/core/commonutils.sh +++ b/images/macos/provision/core/commonutils.sh @@ -84,7 +84,7 @@ az extension add -n azure-devops # Workaround https://github.com/actions/runner-images/issues/4931 # by making Tcl/Tk paths the same on macOS 10.15 and macOS 11 -if is_BigSur || is_Monterey; then +if is_Monterey; then version=$(brew info tcl-tk --json | jq -r '.[].installed[].version') ln -s /usr/local/Cellar/tcl-tk/$version/lib/libtcl8.6.dylib /usr/local/lib/libtcl8.6.dylib ln -s /usr/local/Cellar/tcl-tk/$version/lib/libtk8.6.dylib /usr/local/lib/libtk8.6.dylib From c6c271672676f9d02828e6262d4126d6860700b3 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Tue, 28 Feb 2023 22:24:25 +0300 Subject: [PATCH 1777/3485] [macOS] prepare repository for macOS 13 (#7156) --- .../provision/configuration/finalize-vm.sh | 5 +- images/macos/provision/core/commonutils.sh | 30 ++--- images/macos/provision/core/ruby.sh | 56 ++++---- .../SoftwareReport.Generator.ps1 | 124 +++++++++++------- images/macos/tests/Android.Tests.ps1 | 29 ++-- images/macos/tests/BasicTools.Tests.ps1 | 12 +- images/macos/tests/Git.Tests.ps1 | 5 +- images/macos/tests/Java.Tests.ps1 | 4 +- images/macos/tests/RubyGem.Tests.ps1 | 4 +- 9 files changed, 158 insertions(+), 111 deletions(-) diff --git a/images/macos/provision/configuration/finalize-vm.sh b/images/macos/provision/configuration/finalize-vm.sh index 548e8b3bcefc..1fa346d0affc 100644 --- a/images/macos/provision/configuration/finalize-vm.sh +++ b/images/macos/provision/configuration/finalize-vm.sh @@ -28,8 +28,9 @@ rm -rf ~/.fastlane npm cache clean --force # Clean yarn cache -yarn cache clean - +if ! is_Ventura; then + yarn cache clean +fi # Clean up temporary directories sudo rm -rf ~/utils ~/image-generation /tmp/* diff --git a/images/macos/provision/core/commonutils.sh b/images/macos/provision/core/commonutils.sh index 97ea9b3d8a0a..5ee348e41438 100644 --- a/images/macos/provision/core/commonutils.sh +++ b/images/macos/provision/core/commonutils.sh @@ -14,12 +14,14 @@ cask_packages=$(get_toolset_value '.brew.cask_packages[]') for package in $cask_packages; do echo "Installing $package..." if [[ $package == "virtualbox" ]]; then - # VirtualBox 7 crashes - # macOS host: Dropped all kernel extensions. VirtualBox relies fully on the hypervisor and vmnet frameworks provided by Apple now. - vbcask_url="https://raw.githubusercontent.com/Homebrew/homebrew-cask/aa3c55951fc9d687acce43e5c0338f42c1ddff7b/Casks/virtualbox.rb" - download_with_retries $vbcask_url - brew install ./virtualbox.rb - rm ./virtualbox.rb + if ! is_Ventura; then + # VirtualBox 7 crashes + # macOS host: Dropped all kernel extensions. VirtualBox relies fully on the hypervisor and vmnet frameworks provided by Apple now. + vbcask_url="https://raw.githubusercontent.com/Homebrew/homebrew-cask/aa3c55951fc9d687acce43e5c0338f42c1ddff7b/Casks/virtualbox.rb" + download_with_retries $vbcask_url + brew install ./virtualbox.rb + rm ./virtualbox.rb + fi else brew install --cask $package fi @@ -34,22 +36,18 @@ fi # System Preferences -> Security & Privacy -> General -> Unlock -> Allow -> Not now if is_Monterey; then if is_Veertu; then - retry=10 + retry=5 while [ $retry -gt 0 ]; do { osascript -e 'tell application "System Events" to get application processes where visible is true' - } && break - - retry=$((retry-1)) - if [ $retry -eq 0 ]; then - echo "No retry attempts left" - exit 1 - fi + } + osascript $HOME/utils/confirm-identified-developers.scpt $USER_PASSWORD + echo "retries left "$retry sleep 10 done + else + osascript $HOME/utils/confirm-identified-developers.scpt $USER_PASSWORD fi - - osascript $HOME/utils/confirm-identified-developers.scpt $USER_PASSWORD fi # Validate "Parallels International GmbH" kext diff --git a/images/macos/provision/core/ruby.sh b/images/macos/provision/core/ruby.sh index 0b60142ff445..9741eab326e4 100755 --- a/images/macos/provision/core/ruby.sh +++ b/images/macos/provision/core/ruby.sh @@ -9,37 +9,39 @@ GEM_PATH=`gem env|awk '/EXECUTABLE DIRECTORY/ {print $4}'` echo "GEM_PATH=$GEM_PATH" >> "$HOME/.bashrc" echo 'export PATH="$GEM_PATH:/usr/local/opt/ruby@'${DEFAULT_RUBY_VERSION}'/bin:$PATH"' >> "$HOME/.bashrc" -echo "Install Ruby from toolset..." -[ -n "$API_PAT" ] && authString=(-H "Authorization: token ${API_PAT}") -PACKAGE_TAR_NAMES=$(curl "${authString[@]}" -s "https://api.github.com/repos/ruby/ruby-builder/releases/latest" | jq -r '.assets[].name') -TOOLSET_VERSIONS=$(get_toolset_value '.toolcache[] | select(.name | contains("Ruby")) | .versions[]') -RUBY_PATH="$AGENT_TOOLSDIRECTORY/Ruby" - -echo "Check if Ruby hostedtoolcache folder exists..." -if [ ! -d $RUBY_PATH ]; then - mkdir -p $RUBY_PATH -fi +if ! is_Ventura; then + echo "Install Ruby from toolset..." + [ -n "$API_PAT" ] && authString=(-H "Authorization: token ${API_PAT}") + PACKAGE_TAR_NAMES=$(curl "${authString[@]}" -s "https://api.github.com/repos/ruby/ruby-builder/releases/latest" | jq -r '.assets[].name') + TOOLSET_VERSIONS=$(get_toolset_value '.toolcache[] | select(.name | contains("Ruby")) | .versions[]') + RUBY_PATH="$AGENT_TOOLSDIRECTORY/Ruby" + + echo "Check if Ruby hostedtoolcache folder exists..." + if [ ! -d $RUBY_PATH ]; then + mkdir -p $RUBY_PATH + fi -for TOOLSET_VERSION in ${TOOLSET_VERSIONS[@]}; do - PACKAGE_TAR_NAME=$(echo "$PACKAGE_TAR_NAMES" | grep "^ruby-${TOOLSET_VERSION}-macos-latest.tar.gz$" | egrep -v "rc|preview" | sort -V | tail -1) - RUBY_VERSION=$(echo "$PACKAGE_TAR_NAME" | cut -d'-' -f 2) - RUBY_VERSION_PATH="$RUBY_PATH/$RUBY_VERSION" + for TOOLSET_VERSION in ${TOOLSET_VERSIONS[@]}; do + PACKAGE_TAR_NAME=$(echo "$PACKAGE_TAR_NAMES" | grep "^ruby-${TOOLSET_VERSION}-macos-latest.tar.gz$" | egrep -v "rc|preview" | sort -V | tail -1) + RUBY_VERSION=$(echo "$PACKAGE_TAR_NAME" | cut -d'-' -f 2) + RUBY_VERSION_PATH="$RUBY_PATH/$RUBY_VERSION" - echo "Create Ruby $RUBY_VERSION directory..." - mkdir -p $RUBY_VERSION_PATH + echo "Create Ruby $RUBY_VERSION directory..." + mkdir -p $RUBY_VERSION_PATH - echo "Downloading tar archive $PACKAGE_TAR_NAME" - DOWNLOAD_URL="https://github.com/ruby/ruby-builder/releases/download/toolcache/${PACKAGE_TAR_NAME}" - download_with_retries $DOWNLOAD_URL "/tmp" $PACKAGE_TAR_NAME + echo "Downloading tar archive $PACKAGE_TAR_NAME" + DOWNLOAD_URL="https://github.com/ruby/ruby-builder/releases/download/toolcache/${PACKAGE_TAR_NAME}" + download_with_retries $DOWNLOAD_URL "/tmp" $PACKAGE_TAR_NAME - echo "Expand '$PACKAGE_TAR_NAME' to the '$RUBY_VERSION_PATH' folder" - tar xf "/tmp/$PACKAGE_TAR_NAME" -C $RUBY_VERSION_PATH + echo "Expand '$PACKAGE_TAR_NAME' to the '$RUBY_VERSION_PATH' folder" + tar xf "/tmp/$PACKAGE_TAR_NAME" -C $RUBY_VERSION_PATH - COMPLETE_FILE_PATH="$RUBY_VERSION_PATH/x64.complete" - if [ ! -f $COMPLETE_FILE_PATH ]; then - echo "Create complete file" - touch $COMPLETE_FILE_PATH - fi -done + COMPLETE_FILE_PATH="$RUBY_VERSION_PATH/x64.complete" + if [ ! -f $COMPLETE_FILE_PATH ]; then + echo "Create complete file" + touch $COMPLETE_FILE_PATH + fi + done +fi invoke_tests "Ruby" diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1 index f3ff4d50ea23..46bcff91ba36 100644 --- a/images/macos/software-report/SoftwareReport.Generator.ps1 +++ b/images/macos/software-report/SoftwareReport.Generator.ps1 @@ -41,15 +41,19 @@ $languageAndRuntime.AddNodes($(Get-FortranVersions)) $languageAndRuntime.AddToolVersion("Go", $(Get-GoVersion)) $languageAndRuntime.AddToolVersion("Julia", $(Get-JuliaVersion)) $languageAndRuntime.AddToolVersion("Kotlin", $(Get-KotlinVersion)) -$languageAndRuntime.AddToolVersion("Mono", $(Get-MonoVersion)) -$languageAndRuntime.AddToolVersion("MSBuild", $(Get-MSBuildVersion)) -$languageAndRuntime.AddToolVersion("Node.js", $(Get-NodeVersion)) -$languageAndRuntime.AddToolVersion("NVM", $(Get-NVMVersion)) -$languageAndRuntime.AddToolVersionsListInline("NVM - Cached node versions", $(Get-NVMNodeVersionList), '^\d+') +if (-not $os.IsVentura) { + $languageAndRuntime.AddToolVersion("Mono", $(Get-MonoVersion)) + $languageAndRuntime.AddToolVersion("MSBuild", $(Get-MSBuildVersion)) + $languageAndRuntime.AddToolVersion("Node.js", $(Get-NodeVersion)) + $languageAndRuntime.AddToolVersion("NVM", $(Get-NVMVersion)) + $languageAndRuntime.AddToolVersionsListInline("NVM - Cached node versions", $(Get-NVMNodeVersionList), '^\d+') +} $languageAndRuntime.AddToolVersion("Perl", $(Get-PerlVersion)) $languageAndRuntime.AddToolVersion("PHP", $(Get-PHPVersion)) -$languageAndRuntime.AddToolVersion("Python", $(Get-PythonVersion)) -$languageAndRuntime.AddToolVersion("Python3", $(Get-Python3Version)) +if (-not $os.IsVentura) { + $languageAndRuntime.AddToolVersion("Python", $(Get-PythonVersion)) + $languageAndRuntime.AddToolVersion("Python3", $(Get-Python3Version)) +} $languageAndRuntime.AddToolVersion("R", $(Get-RVersion)) $languageAndRuntime.AddToolVersion("Ruby", $(Get-RubyVersion)) @@ -60,12 +64,16 @@ $packageManagement.AddToolVersion("Carthage", $(Get-CarthageVersion)) $packageManagement.AddToolVersion("CocoaPods", $(Get-CocoaPodsVersion)) $packageManagement.AddToolVersion("Composer", $(Get-ComposerVersion)) $packageManagement.AddToolVersion("Homebrew", $(Get-HomebrewVersion)) -$packageManagement.AddToolVersion("Miniconda", $(Get-CondaVersion)) +if (-not $os.IsVentura) { + $packageManagement.AddToolVersion("Miniconda", $(Get-CondaVersion)) +} $packageManagement.AddToolVersion("NPM", $(Get-NPMVersion)) $packageManagement.AddToolVersion("NuGet", $(Get-NuGetVersion)) -$packageManagement.AddToolVersion("Pip", $(Get-PipVersion -Version 2)) -$packageManagement.AddToolVersion("Pip3", $(Get-PipVersion -Version 3)) -$packageManagement.AddToolVersion("Pipx", $(Get-PipxVersion)) +if (-not $os.IsVentura) { + $packageManagement.AddToolVersion("Pip", $(Get-PipVersion -Version 2)) + $packageManagement.AddToolVersion("Pip3", $(Get-PipVersion -Version 3)) + $packageManagement.AddToolVersion("Pipx", $(Get-PipxVersion)) +} $packageManagement.AddToolVersion("RubyGems", $(Get-RubyGemsVersion)) $packageManagement.AddToolVersion("Vcpkg", $(Get-VcpkgVersion)) $packageManagement.AddToolVersion("Yarn", $(Get-YarnVersion)) @@ -75,9 +83,11 @@ $packageManagement.AddNode($(Build-PackageManagementEnvironmentTable)) # Project Management $projectManagement = $installedSoftware.AddHeader("Project Management") $projectManagement.AddToolVersion("Apache Ant", $(Get-ApacheAntVersion)) -$projectManagement.AddToolVersion("Apache Maven", $(Get-MavenVersion)) -$projectManagement.AddToolVersion("Gradle", $(Get-GradleVersion)) -$projectManagement.AddToolVersion("Sbt", $(Get-SbtVersion)) +if (-not $os.IsVentura) { + $projectManagement.AddToolVersion("Apache Maven", $(Get-MavenVersion)) + $projectManagement.AddToolVersion("Gradle", $(Get-GradleVersion)) + $projectManagement.AddToolVersion("Sbt", $(Get-SbtVersion)) +} # Utilities $utilities = $installedSoftware.AddHeader("Utilities") @@ -97,25 +107,32 @@ $utilities.AddToolVersion("gpg (GnuPG)", $(Get-GPGVersion)) if ($os.IsBigSur) { $utilities.AddToolVersion("helm", $(Get-HelmVersion)) } -$utilities.AddToolVersion("Hub CLI", $(Get-HubVersion)) -$utilities.AddToolVersion("ImageMagick", $(Get-ImageMagickVersion)) +if (-not $os.IsVentura) { + $utilities.AddToolVersion("Hub CLI", $(Get-HubVersion)) + $utilities.AddToolVersion("ImageMagick", $(Get-ImageMagickVersion)) +} $utilities.AddToolVersion("jq", $(Get-JqVersion)) -$utilities.AddToolVersion("mongo", $(Get-MongoVersion)) -$utilities.AddToolVersion("mongod", $(Get-MongodVersion)) +if (-not $os.IsVentura) { + $utilities.AddToolVersion("mongo", $(Get-MongoVersion)) + $utilities.AddToolVersion("mongod", $(Get-MongodVersion)) +} if ($os.IsBigSur) { $utilities.AddToolVersion("Newman", $(Get-NewmanVersion)) } $utilities.AddToolVersion("OpenSSL", $(Get-OpenSSLVersion)) $utilities.AddToolVersion("Packer", $(Get-PackerVersion)) -$utilities.AddToolVersion("pkg-config", $(Get-PKGConfigVersion)) -$utilities.AddToolVersion("PostgreSQL", $(Get-PostgresServerVersion)) -$utilities.AddToolVersion("psql (PostgreSQL)", $(Get-PostgresClientVersion)) -$utilities.AddToolVersion("Sox", $(Get-SoxVersion)) -$utilities.AddToolVersion("Subversion (SVN)", $(Get-SVNVersion)) -$utilities.AddToolVersion("Switchaudio-osx", $(Get-SwitchAudioOsxVersion)) +if (-not $os.IsVentura) { + $utilities.AddToolVersion("PostgreSQL", $(Get-PostgresServerVersion)) + $utilities.AddToolVersion("psql (PostgreSQL)", $(Get-PostgresClientVersion)) + $utilities.AddToolVersion("Sox", $(Get-SoxVersion)) + $utilities.AddToolVersion("Subversion (SVN)", $(Get-SVNVersion)) + $utilities.AddToolVersion("Switchaudio-osx", $(Get-SwitchAudioOsxVersion)) +} if (-not $os.IsBigSur) { $utilities.AddToolVersion("Vagrant", $(Get-VagrantVersion)) - $utilities.AddToolVersion("VirtualBox", $(Get-VirtualBoxVersion)) + if (-not $os.IsVentura) { + $utilities.AddToolVersion("VirtualBox", $(Get-VirtualBoxVersion)) + } } $utilities.AddToolVersion("yq", $(Get-YqVersion)) $utilities.AddToolVersion("zstd", $(Get-ZstdVersion)) @@ -125,7 +142,9 @@ $tools = $installedSoftware.AddHeader("Tools") if ($os.IsBigSur) { $tools.AddToolVersion("Aliyun CLI", $(Get-AliyunCLIVersion)) } -$tools.AddToolVersion("App Center CLI", $(Get-AppCenterCLIVersion)) +if (-not $os.IsVentura) { + $tools.AddToolVersion("App Center CLI", $(Get-AppCenterCLIVersion)) +} $tools.AddToolVersion("AWS CLI", $(Get-AWSCLIVersion)) $tools.AddToolVersion("AWS SAM CLI", $(Get-AWSSAMCLIVersion)) $tools.AddToolVersion("AWS Session Manager CLI", $(Get-AWSSessionManagerCLIVersion)) @@ -135,20 +154,28 @@ $tools.AddToolVersion("Bicep CLI", $(Get-BicepVersion)) $tools.AddToolVersion("Cabal", $(Get-CabalVersion)) $tools.AddToolVersion("Cmake", $(Get-CmakeVersion)) $tools.AddToolVersion("CodeQL Action Bundles", $(Get-CodeQLBundleVersions)) -$tools.AddToolVersion("Colima", $(Get-ColimaVersion)) +if ($os.IsMonterey) { + $tools.AddToolVersion("Colima", $(Get-ColimaVersion)) +} $tools.AddToolVersion("Fastlane", $(Get-FastlaneVersion)) $tools.AddToolVersion("GHC", $(Get-GHCVersion)) $tools.AddToolVersion("GHCup", $(Get-GHCupVersion)) -$tools.AddToolVersion("Jazzy", $(Get-JazzyVersion)) +if (-not $os.IsVentura) { + $tools.AddToolVersion("Jazzy", $(Get-JazzyVersion)) +} $tools.AddToolVersion("Stack", $(Get-StackVersion)) $tools.AddToolVersion("SwiftFormat", $(Get-SwiftFormatVersion)) -$tools.AddToolVersion("Swig", $(Get-SwigVersion)) +if (-not $os.IsVentura) { + $tools.AddToolVersion("Swig", $(Get-SwigVersion)) +} $tools.AddToolVersion("Xcode Command Line Tools", $(Get-XcodeCommandLineToolsVersion)) # Linters $linters = $installedSoftware.AddHeader("Linters") $linters.AddToolVersion("SwiftLint", $(Get-SwiftLintVersion)) -$linters.AddToolVersion("Yamllint", $(Get-YamllintVersion)) +if (-not $os.IsVentura) { + $linters.AddToolVersion("Yamllint", $(Get-YamllintVersion)) +} # Browsers $browsers = $installedSoftware.AddHeader("Browsers") @@ -159,13 +186,15 @@ $browsers.AddNode($(Build-BrowserWebdriversEnvironmentTable)) $java = $installedSoftware.AddHeader("Java") $java.AddTable($(Get-JavaVersions)) -# Graal -$graalvm = $installedSoftware.AddHeader("GraalVM") -$graalvm.AddTable($(Build-GraalVMTable)) +if (-not $os.IsVentura) { + # Graal + $graalvm = $installedSoftware.AddHeader("GraalVM") + $graalvm.AddTable($(Build-GraalVMTable)) -# Toolcache -$toolcache = $installedSoftware.AddHeader("Cached Tools") -$toolcache.AddNodes($(Build-ToolcacheSection)) + # Toolcache + $toolcache = $installedSoftware.AddHeader("Cached Tools") + $toolcache.AddNodes($(Build-ToolcacheSection)) +} # Rust $rust = $installedSoftware.AddHeader("Rust Tools") @@ -190,14 +219,17 @@ $powerShellModules = $powerShell.AddHeader("PowerShell Modules") $powerShellModules.AddNodes($(Get-PowerShellModules)) # Web Servers -$webServers = $installedSoftware.AddHeader("Web Servers") -$webServers.AddTable($(Build-WebServersSection)) +if (-not $os.IsVentura) { + $webServers = $installedSoftware.AddHeader("Web Servers") + $webServers.AddTable($(Build-WebServersSection)) +} # Xamarin section +if (-not $os.IsVentura) { $xamarin = $installedSoftware.AddHeader("Xamarin") $vsForMac = $xamarin.AddHeader("Visual Studio for Mac") $vsForMac.AddTable($(Build-VSMacTable)) -$note = +$note = @' To use Visual Studio 2019 by default rename the app: mv "/Applications/Visual Studio.app" "/Applications/Visual Studio 2022.app" @@ -206,12 +238,12 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" $vsForMacNotes = $vsForMac.AddHeader("Notes") $vsForMacNotes.AddNote($note) - $xamarinBundles = $xamarin.AddHeader("Xamarin bundles") $xamarinBundles.AddTable($(Build-XamarinTable)) $unitTestFramework = $xamarin.AddHeader("Unit Test Framework") $unitTestFramework.AddToolVersion("NUnit", $(Get-NUnitVersion)) +} # Xcode section $xcode = $installedSoftware.AddHeader("Xcode") @@ -238,11 +270,13 @@ $android.AddTable($androidTable) $androidEnv = $android.AddHeader("Environment variables") $androidEnv.AddTable($(Build-AndroidEnvironmentTable)) -$miscellaneous = $installedSoftware.AddHeader("Miscellaneous") -$miscellaneous.AddToolVersion("libXext", $(Get-LibXextVersion)) -$miscellaneous.AddToolVersion("libXft", $(Get-LibXftVersion)) -$miscellaneous.AddToolVersion("Tcl/Tk", $(Get-TclTkVersion)) -$miscellaneous.AddToolVersion("Zlib", $(Get-ZlibVersion)) +if (-not $os.IsVentura) { + $miscellaneous = $installedSoftware.AddHeader("Miscellaneous") + $miscellaneous.AddToolVersion("libXext", $(Get-LibXextVersion)) + $miscellaneous.AddToolVersion("libXft", $(Get-LibXftVersion)) + $miscellaneous.AddToolVersion("Tcl/Tk", $(Get-TclTkVersion)) + $miscellaneous.AddToolVersion("Zlib", $(Get-ZlibVersion)) +} if ($os.IsMonterey) { $miscellaneousEnv = $miscellaneous.AddHeader("Environment variables") diff --git a/images/macos/tests/Android.Tests.ps1 b/images/macos/tests/Android.Tests.ps1 index a1d18ef410df..7ab9e4a43ec9 100644 --- a/images/macos/tests/Android.Tests.ps1 +++ b/images/macos/tests/Android.Tests.ps1 @@ -51,16 +51,25 @@ Describe "Android" { } Context "SDKManagers" { - $testCases = @( - @{ - PackageName = "SDK tools" - Sdkmanager = "$env:ANDROID_HOME/tools/bin/sdkmanager" - }, - @{ - PackageName = "Command-line tools" - Sdkmanager = "$env:ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager" - } - ) + if (-not $os.IsVentura) { + $testCases = @( + @{ + PackageName = "SDK tools" + Sdkmanager = "$env:ANDROID_HOME/tools/bin/sdkmanager" + }, + @{ + PackageName = "Command-line tools" + Sdkmanager = "$env:ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager" + } + ) + }else { + $testCases = @( + @{ + PackageName = "Command-line tools" + Sdkmanager = "$env:ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager" + } + ) + } It "Sdkmanager from <PackageName> is available" -TestCases $testCases { "$Sdkmanager --version" | Should -ReturnZeroExitCode diff --git a/images/macos/tests/BasicTools.Tests.ps1 b/images/macos/tests/BasicTools.Tests.ps1 index 0373d1ddf873..ec5afec93538 100644 --- a/images/macos/tests/BasicTools.Tests.ps1 +++ b/images/macos/tests/BasicTools.Tests.ps1 @@ -24,7 +24,7 @@ Describe "cmake" { } } -Describe "Subversion" { +Describe "Subversion" -Skip:($os.IsVentura) { It "Subversion" { "svn --version" | Should -ReturnZeroExitCode } @@ -60,7 +60,7 @@ Describe "Perl" { } } -Describe "Helm" -Skip:($os.IsMonterey) { +Describe "Helm" -Skip:($os.IsMonterey -or $os.IsVentura) { It "Helm" { "helm version --short" | Should -ReturnZeroExitCode } @@ -108,7 +108,7 @@ Describe "bazel" { } } -Describe "Aliyun CLI" -Skip:($os.IsMonterey) { +Describe "Aliyun CLI" -Skip:($os.IsMonterey -or $os.IsVentura) { It "Aliyun CLI" { "aliyun --version" | Should -ReturnZeroExitCode } @@ -144,7 +144,7 @@ Describe "vagrant" -Skip:($os.IsBigSur) { } } -Describe "virtualbox" -Skip:($os.IsBigSur) { +Describe "virtualbox" -Skip:($os.IsBigSur -or $os.IsVentura) { It "virtualbox" { "vboxmanage -v" | Should -ReturnZeroExitCode } @@ -170,7 +170,7 @@ Describe "Kotlin" { } } -Describe "sbt" { +Describe "sbt" -Skip:($os.IsVentura) { It "sbt" { "sbt -version" | Should -ReturnZeroExitCode } @@ -182,7 +182,7 @@ Describe "yq" { } } -Describe "imagemagick" { +Describe "imagemagick" -Skip:($os.IsVentura) { It "imagemagick" { "magick -version" | Should -ReturnZeroExitCode } diff --git a/images/macos/tests/Git.Tests.ps1 b/images/macos/tests/Git.Tests.ps1 index 4638c21faaa6..c0600daecb20 100644 --- a/images/macos/tests/Git.Tests.ps1 +++ b/images/macos/tests/Git.Tests.ps1 @@ -1,12 +1,13 @@ +$os = Get-OSVersion Describe "Git" { It "git is installed" { "git --version" | Should -ReturnZeroExitCode } - It "git lfs is installed" { "git lfs version" | Should -ReturnZeroExitCode } - +} +Describe "hub CLI" -Skip:($os.IsVentura) { It "hub CLI is installed" { "hub --version" | Should -ReturnZeroExitCode } diff --git a/images/macos/tests/Java.Tests.ps1 b/images/macos/tests/Java.Tests.ps1 index fd67ea6566e0..b1456eb6be28 100644 --- a/images/macos/tests/Java.Tests.ps1 +++ b/images/macos/tests/Java.Tests.ps1 @@ -1,6 +1,8 @@ Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1" -DisableNameChecking +$os = Get-OSVersion + function Get-NativeVersionFormat { param($Version) if ($Version -in "8") { @@ -56,7 +58,7 @@ Describe "Java" { } Context "Java Adopt" { - Describe "Java Adopt" { + Describe "Java Adopt" -Skip:($os.IsVentura) { It "Java Adopt <Version>" -TestCases $adoptCases { $adoptPath = Join-Path (Get-ChildItem ${env:AGENT_TOOLSDIRECTORY}\Java_Adopt_jdk\${Version}*) "x64\Contents\Home\bin\java" diff --git a/images/macos/tests/RubyGem.Tests.ps1 b/images/macos/tests/RubyGem.Tests.ps1 index 5e15d2f703cf..5e906096d789 100644 --- a/images/macos/tests/RubyGem.Tests.ps1 +++ b/images/macos/tests/RubyGem.Tests.ps1 @@ -19,7 +19,7 @@ Describe "Bundler" { } } -Describe "Nomad shenzhen CLI" -Skip:($os.IsMonterey) { +Describe "Nomad shenzhen CLI" -Skip:($os.IsMonterey -or $os.IsVentura) { It "Nomad shenzhen CLI" { "ipa --version" | Should -ReturnZeroExitCode } @@ -37,7 +37,7 @@ Describe "xcpretty" { } } -Describe "jazzy" { +Describe "jazzy" -Skip:($os.IsVentura) { It "jazzy" { "jazzy --version" | Should -ReturnZeroExitCode } From 6980b000318999db2b8a28e370bb2bf978a9752c Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Tue, 28 Feb 2023 23:11:41 +0300 Subject: [PATCH 1778/3485] Add GitHub actions for image generation (#7182) --- .github/workflows/macos-generation.yml | 212 ++++++++++++++++++++ .github/workflows/macos11.yml | 30 +++ .github/workflows/macos12.yml | 30 +++ .github/workflows/ubuntu-win-generation.yml | 128 ++++++++++++ .github/workflows/ubuntu2004.yml | 27 +++ .github/workflows/ubuntu2204.yml | 27 +++ .github/workflows/windows2019.yml | 27 +++ .github/workflows/windows2022.yml | 27 +++ 8 files changed, 508 insertions(+) create mode 100644 .github/workflows/macos-generation.yml create mode 100644 .github/workflows/macos11.yml create mode 100644 .github/workflows/macos12.yml create mode 100644 .github/workflows/ubuntu-win-generation.yml create mode 100644 .github/workflows/ubuntu2004.yml create mode 100644 .github/workflows/ubuntu2204.yml create mode 100644 .github/workflows/windows2019.yml create mode 100644 .github/workflows/windows2022.yml diff --git a/.github/workflows/macos-generation.yml b/.github/workflows/macos-generation.yml new file mode 100644 index 000000000000..e91f4470c363 --- /dev/null +++ b/.github/workflows/macos-generation.yml @@ -0,0 +1,212 @@ +name: macOS image generation +on: + workflow_call: + inputs: + image_label: + type: string + description: macOS codename + required: true + base_image_name: + type: string + description: Base clean image + required: true + template_path: + type: string + description: Packer template path + required: true + target_datastore: + type: string + description: Image datastore + required: true + custom_repo: + type: string + description: Custom repo to checkout + required: false + custom_repo_commit_hash: + type: string + description: Custom repo commit hash + required: false + +env: + KEYVAULT: imagegeneration + ESXI_CLUSTER: mcv2-build-unstable + VCENTER_DATACENTER: imagegen + OUTPUT_FOLDER: mms-output + BUILD_DATASTORE: ds-image + +defaults: + run: + shell: pwsh + +jobs: + build: + runs-on: macos-vmware + timeout-minutes: 1200 + steps: + - uses: azure/login@v1 + with: + creds: ${{ secrets.AZURE_CREDENTIALS }} + + - name: Set image variables + run: | + $currentDate = Get-Date -Format "yyyyMMdd" + $templatePath = "${{ inputs.template_path }}" + $osName = $(($templatePath.Split("/")[-1]).Split(".")[0]) + $virtualMachineName = "${osName}_${currentDate}_unstable.${{ github.run_id }}.${{ github.run_attempt }}" + $GitHubFeed = az keyvault secret show -n "github-feed-token" --vault-name "${{ env.KEYVAULT }}" --query value -o tsv + $VIUserName = az keyvault secret show -n "vcenter-username-v2" --vault-name "${{ env.KEYVAULT }}" --query value -o tsv + $VIPassword = az keyvault secret show -n "vcenter-password-v2" --vault-name "${{ env.KEYVAULT }}" --query value -o tsv + $XcodeUser = az keyvault secret show -n "xcode-installation-user" --vault-name "${{ env.KEYVAULT }}" --query value -o tsv + $XcodePassword = az keyvault secret show -n "xcode-installation-password" --vault-name "${{ env.KEYVAULT }}" --query value -o tsv + echo "::add-mask::$GitHubFeed" + echo "::add-mask::$VIUserName" + echo "::add-mask::$VIPassword" + echo "::add-mask::$XcodeUser" + echo "::add-mask::$XcodePassword" + "GH_FEED=$GitHubFeed" | Out-File -Append -FilePath $env:GITHUB_ENV + "VI_USER_NAME=$VIUserName" | Out-File -Append -FilePath $env:GITHUB_ENV + "VI_PASSWORD=$VIPassword" | Out-File -Append -FilePath $env:GITHUB_ENV + "XCODE_USER=$XcodeUser" | Out-File -Append -FilePath $env:GITHUB_ENV + "XCODE_PASSWORD=$XcodePassword" | Out-File -Append -FilePath $env:GITHUB_ENV + "VM_NAME=$virtualMachineName" | Out-File -Append -FilePath $env:GITHUB_ENV + + - name: Determine checkout type + run: | + if ("${{ inputs.custom_repo }}" -and "${{ inputs.custom_repo_commit_hash }}") { + $checkoutType = "custom_repo" + } elseif (("${{ github.event_name }}" -eq "pull_request_target") -and ("${{ github.event.action }}" -eq "labeled" )) { + $checkoutType = "pull_request" + } else { + $checkoutType = "main" + } + "CHECKOUT_TYPE=$checkoutType" | Out-File -Append $env:GITHUB_ENV + + - name: Checkout repository + if: ${{ env.CHECKOUT_TYPE == 'main' }} + uses: actions/checkout@v3 + with: + repository: actions/runner-images + + - name: Checkout PR + if: ${{ env.CHECKOUT_TYPE == 'pull_request' }} + uses: actions/checkout@v3 + with: + ref: ${{ github.event.pull_request.head.sha }} + + - name: Checkout custom repository + if: ${{ env.CHECKOUT_TYPE == 'custom_repo' }} + uses: actions/checkout@v3 + with: + repository: '${{ inputs.custom_repo }}' + ref: '${{ inputs.custom_repo_commit_hash }}' + + - name: Validate contributor permissions + if: ${{ github.event_name == 'pull_request_target' }} + run: | + + [string]$contributorAllowList = "${{ vars.CONTRIBUTOR_ALLOWLIST }}" + ./images.CI/macos/validate-contributor.ps1 ` + -RepositoryName ${{ github.repository }} ` + -AccessToken ${{ env.GH_FEED }} ` + -SourceBranch "refs/pull/${{ github.event.pull_request.number }}/merge" ` + -ContributorAllowList $contributorAllowList + + - name: Select datastore + run: | + ./images.CI/macos/select-datastore.ps1 ` + -VMName "${{ env.VM_NAME }}" ` + -VIServer ${{ secrets.VISERVER_V2 }} ` + -VIUserName ${{ env.VI_USER_NAME }} ` + -VIPassword ${{ env.VI_PASSWORD }} ` + -Cluster ${{ env.ESXI_CLUSTER }} + + - name: Build VM + run: | + $SensitiveData = @( + 'IP address:', + 'Using ssh communicator to connect:' + ) + packer build -on-error=abort ` + -var="vcenter_server=${{ secrets.VISERVER_V2 }}" ` + -var="vcenter_username=${{ env.VI_USER_NAME }}" ` + -var="vcenter_password=${{ env.VI_PASSWORD }}" ` + -var="vcenter_datacenter=${{ env.VCENTER_DATACENTER }}" ` + -var="cluster_or_esxi_host=${{ env.ESXI_CLUSTER }}" ` + -var="esxi_datastore=${{ env.BUILD_DATASTORE }}" ` + -var="output_folder=${{ env.OUTPUT_FOLDER }}" ` + -var="vm_username=${{ secrets.VM_USERNAME }}" ` + -var="vm_password=${{ secrets.VM_PASSWORD }}" ` + -var="github_api_pat=${{ secrets.GH_FEED_TOKEN }}" ` + -var="build_id=${{ env.VM_NAME }}" ` + -var="baseimage_name=${{ inputs.base_image_name }}" ` + -var="xcode_install_user=${{ env.XCODE_USER }}" ` + -var="xcode_install_password=${{ env.XCODE_PASSWORD }}" ` + -color=false ` + ${{ inputs.template_path }} ` + | Where-Object { + #Filter sensitive data from Packer logs + $currentString = $_ + $sensitiveString = $SensitiveData | Where-Object { $currentString -match $_ } + $sensitiveString -eq $null + } + working-directory: images/macos + env: + PACKER_LOG: 1 + PACKER_LOG_PATH: ${{ runner.temp }}/packer-log.txt + + - name: Prepare artifact + shell: bash + run: | + echo "Preparing artifact directory" + mkdir -p ${{ runner.temp }}/artifacts + + echo "Copy image output files" + cp -R "images/image-output/software-report/." "${{ runner.temp }}/artifacts" + + echo "Put VM name to 'VM_Done_Name' file" + echo "${{ env.VM_NAME }}" > "${{ runner.temp }}/artifacts/VM_Done_Name" + + - name: Print markdown software report + run: | + Get-Content "${{ runner.temp }}/artifacts/systeminfo.md" + + - name: Print json software report + run: | + Get-Content "${{ runner.temp }}/artifacts/systeminfo.json" + + - name: Publish Artifacts + uses: actions/upload-artifact@v3 + with: + name: Built_VM_Artifacts + path: ${{ runner.temp }}/artifacts/ + + - name: Print provisioners duration + run: | + ./images.CI/measure-provisioners-duration.ps1 ` + -PackerLogPath "${{ runner.temp }}/packer-log.txt" ` + -PrintTopNLongest 25 + + - name: Move vm to cold storage and clear datastore tag + run: | + $cpuCount = 3 + $coresPerSocketCount = 3 + $memory = 14336 + + ./images.CI/macos/move-vm.ps1 ` + -VMName "${{ env.VM_NAME }}" ` + -TargetDataStore "${{ inputs.target_datastore }}" ` + -VIServer "${{ secrets.VISERVER_V2 }}" ` + -VIUserName "${{ env.VI_USER_NAME }}" ` + -VIPassword "${{ env.VI_PASSWORD }}" ` + -CpuCount "$cpuCount" ` + -CoresPerSocketCount "$coresPerSocketCount" ` + -Memory "$memory" + + - name: Destroy VM (if build canceled only) + if: ${{ cancelled() }} + run: | + ./images.CI/macos/destroy-vm.ps1 ` + -VMName "${{ env.VM_NAME }}" ` + -VIServer "${{ secrets.VISERVER_V2 }}" ` + -VIUserName "${{ env.VI_USER_NAME }}" ` + -VIPassword "${{ env.VI_PASSWORD }}" \ No newline at end of file diff --git a/.github/workflows/macos11.yml b/.github/workflows/macos11.yml new file mode 100644 index 000000000000..daf1f3e70b45 --- /dev/null +++ b/.github/workflows/macos11.yml @@ -0,0 +1,30 @@ +run-name: macOS-11_unstable.${{ github.run_id }}.${{ github.run_attempt }} +on: + workflow_dispatch: + inputs: + CUSTOM_REPOSITORY: + description: 'Custom repository (owner/repo)' + required: false + CUSTOM_REPOSITORY_COMMIT_HASH: + description: 'Commit hash' + required: false + pull_request_target: + types: labeled + paths: + - 'images/macos/**' + schedule: + - cron: '0 0 * * *' + +jobs: + macOS_11: + if: ${{ (github.event.label.name == 'macos-all') || (github.event.label.name == 'macos-11') || (inputs.CUSTOM_REPOSITORY != '' && inputs.CUSTOM_REPOSITORY_COMMIT_HASH != '') || (github.event_name == 'schedule') }} + name: macOS-11_unstable.${{ github.run_id }}.${{ github.run_attempt }} + uses: ./.github/workflows/macos-generation.yml + with: + image_label: 'macOS Big Sur' + base_image_name: 'clean-macOS-11-380Gb-runner' + template_path: 'templates/macOS-11.json' + target_datastore: 'ds-image' + custom_repo: ${{ github.event.inputs.CUSTOM_REPOSITORY }} + custom_repo_hash: ${{ github.event.inputs.CUSTOM_REPOSITORY_COMMIT_HASH }} + secrets: inherit diff --git a/.github/workflows/macos12.yml b/.github/workflows/macos12.yml new file mode 100644 index 000000000000..0ece0eb87d1c --- /dev/null +++ b/.github/workflows/macos12.yml @@ -0,0 +1,30 @@ +run-name: macOS-12_unstable.${{ github.run_id }}.${{ github.run_attempt }} +on: + workflow_dispatch: + inputs: + CUSTOM_REPOSITORY: + description: 'Custom repository (owner/repo)' + required: false + CUSTOM_REPOSITORY_COMMIT_HASH: + description: 'Commit hash' + required: false + pull_request_target: + types: labeled + paths: + - 'images/macos/**' + schedule: + - cron: '0 0 * * *' + +jobs: + macOS_12: + if: ${{ (github.event.label.name == 'macos-all') || (github.event.label.name == 'macos-12') || (inputs.CUSTOM_REPOSITORY != '' && inputs.CUSTOM_REPOSITORY_COMMIT_HASH != '') || (github.event_name == 'schedule') }} + name: macOS-12_unstable.${{ github.run_id }}.${{ github.run_attempt }} + uses: ./.github/workflows/macos-generation.yml + with: + image_label: 'macOS Monterey' + base_image_name: 'clean-macOS-12-380Gb-runner' + template_path: 'templates/macOS-12.json' + target_datastore: 'ds-image' + custom_repo: ${{ github.event.inputs.CUSTOM_REPOSITORY }} + custom_repo_commit_hash: ${{ github.event.inputs.CUSTOM_REPOSITORY_COMMIT_HASH }} + secrets: inherit diff --git a/.github/workflows/ubuntu-win-generation.yml b/.github/workflows/ubuntu-win-generation.yml new file mode 100644 index 000000000000..9acf6643856b --- /dev/null +++ b/.github/workflows/ubuntu-win-generation.yml @@ -0,0 +1,128 @@ +name: MMS image generation +on: + workflow_call: + inputs: + image_name: + type: string + description: An OS image to build + required: true + image_readme_name: + type: string + description: README file path + required: true + custom_repo: + type: string + description: Custom repo to checkout + required: false + custom_repo_commit_hash: + type: string + description: Custom repo commit hash + required: false +defaults: + run: + shell: pwsh + +jobs: + build: + runs-on: azure-builds + timeout-minutes: 1200 + steps: + - name: Determine checkout type + run: | + if ("${{ inputs.custom_repo }}" -and "${{ inputs.custom_repo_commit_hash }}") { + $checkoutType = "custom_repo" + } elseif (("${{ github.event_name }}" -eq "pull_request_target") -and ("${{ github.event.action }}" -eq "labeled" )) { + $checkoutType = "pull_request" + } else { + $checkoutType = "main" + } + "CHECKOUT_TYPE=$checkoutType" | Out-File -Append $env:GITHUB_ENV + + - name: Checkout repository + if: ${{ env.CHECKOUT_TYPE == 'main' }} + uses: actions/checkout@v3 + with: + repository: actions/runner-images + + - name: Checkout PR + if: ${{ env.CHECKOUT_TYPE == 'pull_request' }} + uses: actions/checkout@v3 + with: + ref: ${{ github.event.pull_request.head.sha }} + + - name: Checkout custom repository + if: ${{ env.CHECKOUT_TYPE == 'custom_repo' }} + uses: actions/checkout@v3 + with: + repository: '${{ inputs.custom_repo }}' + ref: '${{ inputs.custom_repo_commit_hash }}' + + - name: Set image varibles + run: | + $ImageType = "${{ inputs.image_name }}" + + if ($ImageType.StartsWith("ubuntu")) { $TemplateDirectoryName = "linux" } else { $TemplateDirectoryName = "win" } + + $TemplateDirectoryPath = Join-Path "images" $TemplateDirectoryName | Resolve-Path + $TemplatePath = Join-Path $TemplateDirectoryPath "$ImageType.pkr.hcl" + + if ( -not (Test-Path $TemplatePath) ) { + $TemplatePath = Join-Path $TemplateDirectoryPath "$ImageType.json" + } + + "TemplatePath=$TemplatePath" | Out-File -Append -FilePath $env:GITHUB_ENV + "TemplateDirectoryPath=$TemplateDirectoryPath" | Out-File -Append -FilePath $env:GITHUB_ENV + "ImageType=$ImageType" | Out-File -Append -FilePath $env:GITHUB_ENV + + - name: Build image + run: | + ./images.CI/linux-and-win/build-image.ps1 ` + -TemplatePath ${{ env.TemplatePath }} ` + -ClientId ${{ secrets.CLIENT_ID }} ` + -ClientSecret ${{ secrets.CLIENT_SECRET }} ` + -Location ${{ secrets.AZURE_LOCATION }} ` + -ResourcesNamePrefix ${{ github.run_number }} ` + -ResourceGroup ${{ secrets.AZURE_RESOURCE_GROUP }} ` + -StorageAccount ${{ secrets.AZURE_STORAGE_ACCOUNT }} ` + -SubscriptionId ${{ secrets.AZURE_SUBSCRIPTION }} ` + -TenantId ${{ secrets.AZURE_TENANT }} ` + -VirtualNetworkName ${{ secrets.BUILD_AGENT_VNET_NAME }} ` + -VirtualNetworkSubnet ${{ secrets.BUILD_AGENT_SUBNET_NAME }} ` + -VirtualNetworkRG ${{ secrets.BUILD_AGENT_VNET_RESOURCE_GROUP }} ` + env: + PACKER_LOG: 1 + PACKER_LOG_PATH: ${{ runner.temp }}/packer-log.txt + RUN_VALIDATION_FLAG: true + + - name: Output Readme file content + run: | + Get-Content -Path (Join-Path "$env:TemplateDirectoryPath" "${{ inputs.image_readme_name }}") + + - name: Print provisioners duration + run: | + ./images.CI/measure-provisioners-duration.ps1 ` + -PackerLogPath "${{ runner.temp }}/packer-log.txt" ` + -PrefixToPathTrim ${{ env.TemplateDirectoryPath }} ` + -PrintTopNLongest 25 + + - name: Create release for VM deployment + run: | + ./images.CI/linux-and-win/create-release.ps1 ` + -BuildId ${{ github.run_number }} ` + -Organization ${{ secrets.RELEASE_TARGET_ORGANIZATION }} ` + -DefinitionId ${{ secrets.RELEASE_TARGET_DEFINITION_ID }} ` + -Project ${{ secrets.RELEASE_TARGET_PROJECT }} ` + -ImageName ${{ env.ImageType }} ` + -AccessToken ${{ secrets.RELEASE_TARGET_TOKEN }} + + - name: Clean up resources + if: ${{ always() }} + run: | + ./images.CI/linux-and-win/cleanup.ps1 ` + -ResourcesNamePrefix ${{ github.run_number }} ` + -Image ${{ env.ImageType }} ` + -StorageAccount ${{ secrets.AZURE_STORAGE_ACCOUNT }} ` + -SubscriptionId ${{ secrets.AZURE_SUBSCRIPTION }} ` + -ClientId ${{ secrets.CLIENT_ID }} ` + -ClientSecret ${{ secrets.CLIENT_SECRET }} ` + -TenantId ${{ secrets.AZURE_TENANT }} diff --git a/.github/workflows/ubuntu2004.yml b/.github/workflows/ubuntu2004.yml new file mode 100644 index 000000000000..8476ab7d3149 --- /dev/null +++ b/.github/workflows/ubuntu2004.yml @@ -0,0 +1,27 @@ +run-name: Ubuntu20.04 - ${{ (github.event.pull_request.title || 'scheduled/manual run') }} +on: + workflow_dispatch: + inputs: + CUSTOM_REPOSITORY: + description: 'Custom repository (owner/repo)' + required: false + CUSTOM_REPOSITORY_COMMIT_HASH: + description: 'Commit hash' + required: false + pull_request_target: + types: labeled + paths: + - 'images/linux/**' + schedule: + - cron: '0 0 * * *' + +jobs: + Ubuntu_2004: + if: ${{ (github.event.label.name == 'ubuntu-all') || (github.event.label.name == 'ubuntu-2004') || (inputs.CUSTOM_REPOSITORY != '' && inputs.CUSTOM_REPOSITORY_COMMIT_HASH != '') || (github.event_name == 'schedule') }} + uses: ./.github/workflows/ubuntu-win-generation.yml + with: + image_name: 'ubuntu2004' + image_readme_name: 'Ubuntu2004-Readme.md' + custom_repo: ${{ github.event.inputs.CUSTOM_REPOSITORY }} + custom_repo_commit_hash: ${{ github.event.inputs.CUSTOM_REPOSITORY_COMMIT_HASH }} + secrets: inherit diff --git a/.github/workflows/ubuntu2204.yml b/.github/workflows/ubuntu2204.yml new file mode 100644 index 000000000000..446427ada326 --- /dev/null +++ b/.github/workflows/ubuntu2204.yml @@ -0,0 +1,27 @@ +run-name: Ubuntu22.04 - ${{ (github.event.pull_request.title || 'scheduled/manual run') }} +on: + workflow_dispatch: + inputs: + CUSTOM_REPOSITORY: + description: 'Custom repository (owner/repo)' + required: false + CUSTOM_REPOSITORY_COMMIT_HASH: + description: 'Commit hash' + required: false + pull_request_target: + types: labeled + paths: + - 'images/linux/**' + schedule: + - cron: '0 0 * * *' + +jobs: + Ubuntu_2204: + if: ${{ (github.event.label.name == 'ubuntu-all') || (github.event.label.name == 'ubuntu-2204') || (inputs.CUSTOM_REPOSITORY != '' && inputs.CUSTOM_REPOSITORY_COMMIT_HASH != '') || (github.event_name == 'schedule') }} + uses: ./.github/workflows/ubuntu-win-generation.yml + with: + image_name: 'ubuntu2204' + image_readme_name: 'Ubuntu2204-Readme.md' + custom_repo: ${{ github.event.inputs.CUSTOM_REPOSITORY }} + custom_repo_commit_hash: ${{ github.event.inputs.CUSTOM_REPOSITORY_COMMIT_HASH }} + secrets: inherit diff --git a/.github/workflows/windows2019.yml b/.github/workflows/windows2019.yml new file mode 100644 index 000000000000..2de6404c64d9 --- /dev/null +++ b/.github/workflows/windows2019.yml @@ -0,0 +1,27 @@ +run-name: Windows 2019 - ${{ (github.event.pull_request.title || 'scheduled/manual run') }} +on: + workflow_dispatch: + inputs: + CUSTOM_REPOSITORY: + description: 'Custom repository (owner/repo)' + required: false + CUSTOM_REPOSITORY_COMMIT_HASH: + description: 'Commit hash' + required: false + pull_request_target: + types: labeled + paths: + - 'images/win/**' + schedule: + - cron: '0 0 * * *' + +jobs: + Windows_2019: + if: ${{ (github.event.label.name == 'windows-all') || (github.event.label.name == 'windows-2019') || (inputs.CUSTOM_REPOSITORY != '' && inputs.CUSTOM_REPOSITORY_COMMIT_HASH != '') || (github.event_name == 'schedule') }} + uses: ./.github/workflows/ubuntu-win-generation.yml + with: + image_name: 'windows2019' + image_readme_name: 'Windows2019-Readme.md' + custom_repo: ${{ github.event.inputs.CUSTOM_REPOSITORY }} + custom_repo_commit_hash: ${{ github.event.inputs.CUSTOM_REPOSITORY_COMMIT_HASH }} + secrets: inherit diff --git a/.github/workflows/windows2022.yml b/.github/workflows/windows2022.yml new file mode 100644 index 000000000000..ef5e5d3d5def --- /dev/null +++ b/.github/workflows/windows2022.yml @@ -0,0 +1,27 @@ +run-name: Windows 2022 - ${{ (github.event.pull_request.title || 'scheduled/manual run') }} +on: + workflow_dispatch: + inputs: + CUSTOM_REPOSITORY: + description: 'Custom repository (owner/repo)' + required: false + CUSTOM_REPOSITORY_COMMIT_HASH: + description: 'Commit hash' + required: false + pull_request_target: + types: labeled + paths: + - 'images/win/**' + schedule: + - cron: '0 0 * * *' + +jobs: + Windows_2022: + if: ${{ (github.event.label.name == 'windows-all') || (github.event.label.name == 'windows-2022') || (inputs.CUSTOM_REPOSITORY != '' && inputs.CUSTOM_REPOSITORY_COMMIT_HASH != '') || (github.event_name == 'schedule') }} + uses: ./.github/workflows/ubuntu-win-generation.yml + with: + image_name: 'windows2022' + image_readme_name: 'Windows2022-Readme.md' + custom_repo: ${{ github.event.inputs.CUSTOM_REPOSITORY }} + custom_repo_commit_hash: ${{ github.event.inputs.CUSTOM_REPOSITORY_COMMIT_HASH }} + secrets: inherit From fec79514931f327960814ddfe7162251cb445352 Mon Sep 17 00:00:00 2001 From: Maxim Lobanov <maxim-lobanov@github.com> Date: Wed, 1 Mar 2023 10:43:47 +0100 Subject: [PATCH 1779/3485] Fix Xcode simulator naming at the end of image generation (#7181) --- images/macos/helpers/Xcode.Helpers.psm1 | 154 ++++++++++++++++++ images/macos/helpers/Xcode.Installer.psm1 | 16 ++ .../provision/core/fix-xcode-simulators.ps1 | 51 ++++++ images/macos/provision/core/xcode.ps1 | 14 +- .../software-report/SoftwareReport.Xcode.psm1 | 2 - images/macos/templates/macOS-12.json | 5 + images/macos/tests/Xcode.Tests.ps1 | 17 ++ images/macos/toolsets/toolset-12.json | 4 +- 8 files changed, 249 insertions(+), 14 deletions(-) create mode 100644 images/macos/provision/core/fix-xcode-simulators.ps1 diff --git a/images/macos/helpers/Xcode.Helpers.psm1 b/images/macos/helpers/Xcode.Helpers.psm1 index 46e5330c1b96..e6411ce0ca59 100644 --- a/images/macos/helpers/Xcode.Helpers.psm1 +++ b/images/macos/helpers/Xcode.Helpers.psm1 @@ -151,4 +151,158 @@ function Invoke-XCVersion { if ($result.ExitCode -ne 0) { throw "Command [$Command] has finished with non-zero exit code." } +} + +function Get-BrokenXcodeSimulatorsList { + return @( + # tvOS Simulators + @{ + SimulatorName = "Apple TV 4K (at 1080p) (2nd generation)" + DeviceId = "com.apple.CoreSimulator.SimDeviceType.Apple-TV-4K-2nd-generation-1080p"; + RuntimeId = "com.apple.CoreSimulator.SimRuntime.tvOS-15-0"; + XcodeVersion = "13.1" + }, + @{ + SimulatorName = "Apple TV 4K (at 1080p) (2nd generation)" + DeviceId = "com.apple.CoreSimulator.SimDeviceType.Apple-TV-4K-2nd-generation-1080p"; + RuntimeId = "com.apple.CoreSimulator.SimRuntime.tvOS-15-2"; + XcodeVersion = "13.2.1" + }, + @{ + SimulatorName = "Apple TV 4K (at 1080p) (2nd generation)" + DeviceId = "com.apple.CoreSimulator.SimDeviceType.Apple-TV-4K-2nd-generation-1080p"; + RuntimeId = "com.apple.CoreSimulator.SimRuntime.tvOS-15-4"; + XcodeVersion = "13.4.1" + }, + @{ + SimulatorName = "Apple TV 4K (at 1080p) (2nd generation)" + DeviceId = "com.apple.CoreSimulator.SimDeviceType.Apple-TV-4K-2nd-generation-1080p"; + RuntimeId = "com.apple.CoreSimulator.SimRuntime.tvOS-16-0"; + XcodeVersion = "14.2" + }, + # watchOS-8-0 Simulators + @{ + SimulatorName = "Apple Watch Series 5 - 40mm" + DeviceId = "com.apple.CoreSimulator.SimDeviceType.Apple-Watch-Series-5-40mm"; + RuntimeId = "com.apple.CoreSimulator.SimRuntime.watchOS-8-0"; + XcodeVersion = "13.1" + }, + @{ + SimulatorName = "Apple Watch Series 5 - 44mm" + DeviceId = "com.apple.CoreSimulator.SimDeviceType.Apple-Watch-Series-5-44mm"; + RuntimeId = "com.apple.CoreSimulator.SimRuntime.watchOS-8-0"; + XcodeVersion = "13.1" + }, + @{ + SimulatorName = "Apple Watch Series 6 - 40mm" + DeviceId = "com.apple.CoreSimulator.SimDeviceType.Apple-Watch-Series-6-40mm"; + RuntimeId = "com.apple.CoreSimulator.SimRuntime.watchOS-8-0"; + XcodeVersion = "13.1" + }, + @{ + SimulatorName = "Apple Watch Series 6 - 44mm" + DeviceId = "com.apple.CoreSimulator.SimDeviceType.Apple-Watch-Series-6-44mm"; + RuntimeId = "com.apple.CoreSimulator.SimRuntime.watchOS-8-0"; + XcodeVersion = "13.1" + }, + @{ + SimulatorName = "Apple Watch Series 7 - 41mm" + DeviceId = "com.apple.CoreSimulator.SimDeviceType.Apple-Watch-Series-7-41mm"; + RuntimeId = "com.apple.CoreSimulator.SimRuntime.watchOS-8-0"; + XcodeVersion = "13.1" + }, + @{ + SimulatorName = "Apple Watch Series 7 - 45mm" + DeviceId = "com.apple.CoreSimulator.SimDeviceType.Apple-Watch-Series-7-45mm"; + RuntimeId = "com.apple.CoreSimulator.SimRuntime.watchOS-8-0"; + XcodeVersion = "13.1" + }, + # watchOS-8-3 Simulators + @{ + SimulatorName = "Apple Watch Series 5 - 40mm" + DeviceId = "com.apple.CoreSimulator.SimDeviceType.Apple-Watch-Series-5-40mm"; + RuntimeId = "com.apple.CoreSimulator.SimRuntime.watchOS-8-3"; + XcodeVersion = "13.2.1" + }, + @{ + SimulatorName = "Apple Watch Series 5 - 44mm" + DeviceId = "com.apple.CoreSimulator.SimDeviceType.Apple-Watch-Series-5-44mm"; + RuntimeId = "com.apple.CoreSimulator.SimRuntime.watchOS-8-3"; + XcodeVersion = "13.2.1" + }, + @{ + SimulatorName = "Apple Watch Series 6 - 40mm" + DeviceId = "com.apple.CoreSimulator.SimDeviceType.Apple-Watch-Series-6-40mm"; + RuntimeId = "com.apple.CoreSimulator.SimRuntime.watchOS-8-3"; + XcodeVersion = "13.2.1" + }, + @{ + SimulatorName = "Apple Watch Series 6 - 44mm" + DeviceId = "com.apple.CoreSimulator.SimDeviceType.Apple-Watch-Series-6-44mm"; + RuntimeId = "com.apple.CoreSimulator.SimRuntime.watchOS-8-3"; + XcodeVersion = "13.2.1" + }, + @{ + SimulatorName = "Apple Watch Series 7 - 41mm" + DeviceId = "com.apple.CoreSimulator.SimDeviceType.Apple-Watch-Series-7-41mm"; + RuntimeId = "com.apple.CoreSimulator.SimRuntime.watchOS-8-3"; + XcodeVersion = "13.2.1" + }, + @{ + SimulatorName = "Apple Watch Series 7 - 45mm" + DeviceId = "com.apple.CoreSimulator.SimDeviceType.Apple-Watch-Series-7-45mm"; + RuntimeId = "com.apple.CoreSimulator.SimRuntime.watchOS-8-3"; + XcodeVersion = "13.2.1" + }, + # watchOS-8-5 Simulators + @{ + SimulatorName = "Apple Watch Series 5 - 40mm" + DeviceId = "com.apple.CoreSimulator.SimDeviceType.Apple-Watch-Series-5-40mm"; + RuntimeId = "com.apple.CoreSimulator.SimRuntime.watchOS-8-5"; + XcodeVersion = "13.4.1" + }, + @{ + SimulatorName = "Apple Watch Series 5 - 44mm" + DeviceId = "com.apple.CoreSimulator.SimDeviceType.Apple-Watch-Series-5-44mm"; + RuntimeId = "com.apple.CoreSimulator.SimRuntime.watchOS-8-5"; + XcodeVersion = "13.4.1" + }, + @{ + SimulatorName = "Apple Watch Series 6 - 40mm" + DeviceId = "com.apple.CoreSimulator.SimDeviceType.Apple-Watch-Series-6-40mm"; + RuntimeId = "com.apple.CoreSimulator.SimRuntime.watchOS-8-5"; + XcodeVersion = "13.4.1" + }, + @{ + SimulatorName = "Apple Watch Series 6 - 44mm" + DeviceId = "com.apple.CoreSimulator.SimDeviceType.Apple-Watch-Series-6-44mm"; + RuntimeId = "com.apple.CoreSimulator.SimRuntime.watchOS-8-5"; + XcodeVersion = "13.4.1" + }, + @{ + SimulatorName = "Apple Watch Series 7 - 41mm" + DeviceId = "com.apple.CoreSimulator.SimDeviceType.Apple-Watch-Series-7-41mm"; + RuntimeId = "com.apple.CoreSimulator.SimRuntime.watchOS-8-5"; + XcodeVersion = "13.4.1" + }, + @{ + SimulatorName = "Apple Watch Series 7 - 45mm" + DeviceId = "com.apple.CoreSimulator.SimDeviceType.Apple-Watch-Series-7-45mm"; + RuntimeId = "com.apple.CoreSimulator.SimRuntime.watchOS-8-5"; + XcodeVersion = "13.4.1" + }, + # watchOS-9-0 Simulators + @{ + SimulatorName = "Apple Watch SE (40mm) (2nd generation)" + DeviceId = "com.apple.CoreSimulator.SimDeviceType.Apple-Watch-SE-40mm-2nd-generation"; + RuntimeId = "com.apple.CoreSimulator.SimRuntime.watchOS-9-0"; + XcodeVersion = "14.2" + }, + @{ + SimulatorName = "Apple Watch SE (44mm) (2nd generation)" + DeviceId = "com.apple.CoreSimulator.SimDeviceType.Apple-Watch-SE-44mm-2nd-generation"; + RuntimeId = "com.apple.CoreSimulator.SimRuntime.watchOS-9-0"; + XcodeVersion = "14.2" + } + ) } \ No newline at end of file diff --git a/images/macos/helpers/Xcode.Installer.psm1 b/images/macos/helpers/Xcode.Installer.psm1 index a08ee3b56439..5f1812e75a86 100644 --- a/images/macos/helpers/Xcode.Installer.psm1 +++ b/images/macos/helpers/Xcode.Installer.psm1 @@ -160,6 +160,22 @@ function Invoke-XcodeRunFirstLaunch { Invoke-ValidateCommand "sudo $xcodeRootPath -runFirstLaunch" } +function Install-AdditionalSimulatorRuntimes { + param( + [Parameter(Mandatory)] + [string]$Version + ) + + if (-not $Version.StartsWith("14.")) { + # Additional simulator runtimes are included by default for Xcode < 14 + return + } + + Write-Host "Installing Simulator Runtimes for Xcode $($_.link) ..." + $xcodebuildPath = Get-XcodeToolPath -Version $Version -ToolName "xcodebuild" + Invoke-ValidateCommand "$xcodebuildPath -downloadAllPlatforms" +} + function Build-XcodeSymlinks { param( [Parameter(Mandatory)] diff --git a/images/macos/provision/core/fix-xcode-simulators.ps1 b/images/macos/provision/core/fix-xcode-simulators.ps1 new file mode 100644 index 000000000000..98b1061e0328 --- /dev/null +++ b/images/macos/provision/core/fix-xcode-simulators.ps1 @@ -0,0 +1,51 @@ +$ErrorActionPreference = "Stop" + +Import-Module "$env:HOME/image-generation/helpers/Xcode.Helpers.psm1" -DisableNameChecking +Import-Module "$env:HOME/image-generation/software-report/SoftwareReport.Xcode.psm1" -DisableNameChecking + +function Ensure-SimulatorInstalled { + param( + [Parameter(Mandatory)] + [string]$RuntimeId, + [Parameter(Mandatory)] + [string]$DeviceId, + [Parameter(Mandatory)] + [string]$SimulatorName, + [Parameter(Mandatory)] + [string]$XcodeVersion + ) + + $simctlPath = Get-XcodeToolPath -Version $XcodeVersion -ToolName "simctl" + if (-not (Test-Path $simctlPath)) { + Write-Host "Skip validating simulator '$SimulatorName [$RuntimeId]' because Xcode $XcodeVersion is not installed" + return + } + + $simulatorFullNameDebug = "$SimulatorName [$RuntimeId]" + Write-Host "Checking Xcode simulator '$simulatorFullNameDebug' (Xcode $XcodeVersion)..." + + # Get all available devices + [string]$rawDevicesInfo = Invoke-Expression "$simctlPath list devices --json" + $jsonDevicesInfo = ($rawDevicesInfo | ConvertFrom-Json).devices + + # Checking if simulator already exists + $existingSimulator = $jsonDevicesInfo.$RuntimeId | Where-Object { $_.deviceTypeIdentifier -eq $DeviceId } | Select-Object -First 1 + + if ($null -eq $existingSimulator) { + Write-Host "Simulator '$simulatorFullNameDebug' is missed. Creating it..." + Invoke-Expression "$simctlPath create '$SimulatorName' '$DeviceId' '$RuntimeId'" + } elseif ($existingSimulator.name -ne $SimulatorName) { + Write-Host "Simulator '$simulatorFullNameDebug' is named incorrectly. Renaming it from '$($existingSimulator.name)' to '$SimulatorName'..." + Invoke-Expression "$simctlPath rename '$($existingSimulator.udid)' '$SimulatorName'" + } else { + Write-Host "Simulator '$simulatorFullNameDebug' is installed correctly." + } +} + +# First run doesn't provide full data about devices +Get-XcodeInfoList | Out-Null + +Write-Host "Validating and fixing Xcode simulators..." +Get-BrokenXcodeSimulatorsList | ForEach-Object { + Ensure-SimulatorInstalled -RuntimeId $_.RuntimeId -DeviceId $_.DeviceId -SimulatorName $_.SimulatorName -XcodeVersion $_.XcodeVersion +} \ No newline at end of file diff --git a/images/macos/provision/core/xcode.ps1 b/images/macos/provision/core/xcode.ps1 index 2b0a709dc7b4..d3175f387323 100644 --- a/images/macos/provision/core/xcode.ps1 +++ b/images/macos/provision/core/xcode.ps1 @@ -33,8 +33,12 @@ $xcodeVersions | ForEach-Object -ThrottleLimit $threadCount -Parallel { Write-Host "Configuring Xcode versions..." $xcodeVersions | ForEach-Object { + Write-Host "Configuring Xcode $($_.link) ..." + Invoke-XcodeRunFirstLaunch -Version $_.link + Install-AdditionalSimulatorRuntimes -Version $_.link } + Invoke-XcodeRunFirstLaunch -Version $defaultXcode Write-Host "Configuring Xcode symlinks..." @@ -47,16 +51,6 @@ $xcodeVersions | ForEach-Object { } } -$xcodeVersions | ForEach-Object { - if ($_.link.StartsWith("14.")) { - Write-Host "Installing Simulator Runtimes..." - - # tvOS and watchOS simulators are not included by default - $xcodebuildPath = Get-XcodeToolPath -Version $_.link -ToolName "xcodebuild" - Invoke-ValidateCommand "$xcodebuildPath -downloadAllPlatforms" - } -} - Write-Host "Rebuilding Launch Services database ..." $xcodeVersions | ForEach-Object { Rebuild-XcodeLaunchServicesDb -Version $_.link diff --git a/images/macos/software-report/SoftwareReport.Xcode.psm1 b/images/macos/software-report/SoftwareReport.Xcode.psm1 index f1ae3e74c578..f3032df5157d 100644 --- a/images/macos/software-report/SoftwareReport.Xcode.psm1 +++ b/images/macos/software-report/SoftwareReport.Xcode.psm1 @@ -171,8 +171,6 @@ function Format-XcodeSimulatorName { ) $formattedDeviceName = $Device.Replace("ʀ", "R") - # Convert "Apple Watch Series 5 (44mm)" -> "Apple Watch Series 5 - 44mm" to make all Xcode versions consistent - $formattedDeviceName = $formattedDeviceName -replace '\((\d+mm)\)', '- $1' return $formattedDeviceName } diff --git a/images/macos/templates/macOS-12.json b/images/macos/templates/macOS-12.json index 0ca2661aab5f..52954340a8f1 100644 --- a/images/macos/templates/macOS-12.json +++ b/images/macos/templates/macOS-12.json @@ -235,6 +235,11 @@ "./provision/core/delete-duplicate-sims.rb" ] }, + { + "type": "shell", + "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} pwsh -f {{ .Path }}", + "script": "./provision/core/fix-xcode-simulators.ps1" + }, { "type": "shell", "inline": [ diff --git a/images/macos/tests/Xcode.Tests.ps1 b/images/macos/tests/Xcode.Tests.ps1 index 411eb041e885..8c5973e082c9 100644 --- a/images/macos/tests/Xcode.Tests.ps1 +++ b/images/macos/tests/Xcode.Tests.ps1 @@ -111,4 +111,21 @@ Describe "Xcode simulators" { $defaultXcode = Get-ToolsetValue "xcode.default" Switch-Xcode -Version $defaultXcode } +} + +Describe "Xcode Simulators Naming" -Skip:(-not $os.IsMonterey) { + $testCases = Get-BrokenXcodeSimulatorsList + It "Simulator '<SimulatorName> [<RuntimeId>]'" -TestCases $testCases { + $simctlPath = Get-XcodeToolPath -Version $XcodeVersion -ToolName "simctl" + [string]$rawDevicesInfo = Invoke-Expression "$simctlPath list devices --json" + $jsonDevicesInfo = ($rawDevicesInfo | ConvertFrom-Json).devices + + $foundSimulators = $jsonDevicesInfo.$RuntimeId | Where-Object { $_.deviceTypeIdentifier -eq $DeviceId } + $foundSimulators | Should -HaveCount 1 + $foundSimulators[0].name | Should -Be $SimulatorName + + $foundSimulators = $jsonDevicesInfo.$RuntimeId | Where-Object { $_.name -eq $SimulatorName } + $foundSimulators | Should -HaveCount 1 + $foundSimulators[0].deviceTypeIdentifier | Should -Be $DeviceId + } } \ No newline at end of file diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index d5d025c424d3..72c1ed9a1ad4 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -2,8 +2,8 @@ "xcode": { "default": "14.2", "versions": [ - {"link": "14.2", "version": "14.2.0"}, - { "link": "14.1", "version": "14.1.0"}, + { "link": "14.2", "version": "14.2.0" }, + { "link": "14.1", "version": "14.1.0" }, { "link": "14.0.1", "version": "14.0.1", "symlinks": ["14.0"] }, { "link": "13.4.1", "version": "13.4.1", "symlinks": ["13.4"] }, { "link": "13.3.1", "version": "13.3.1", "symlinks": ["13.3"] }, From 02e4e5a6a0f5b7e97ca3add0d6baba8be2042837 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Wed, 1 Mar 2023 17:11:12 +0100 Subject: [PATCH 1780/3485] [Ubuntu] Do not install erlang on 18.04 (#7212) * [Ubuntu] Do not install erlang on 18.04 * fixup --- .../linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 | 2 +- images/linux/scripts/tests/Tools.Tests.ps1 | 2 +- images/linux/ubuntu1804.json | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index ac7c8daa6356..7d44e685c63c 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -40,7 +40,7 @@ $languageAndRuntime.AddToolVersionsListInline("Clang", $(Get-ClangToolVersions - $languageAndRuntime.AddToolVersionsListInline("Clang-format", $(Get-ClangToolVersions -ToolName "clang-format"), "^\d+") $languageAndRuntime.AddToolVersionsListInline("Clang-tidy", $(Get-ClangTidyVersions), "^\d+") $languageAndRuntime.AddToolVersion("Dash", $(Get-DashVersion)) -if ((Test-IsUbuntu18) -or (Test-IsUbuntu20)) { +if (Test-IsUbuntu20) { $languageAndRuntime.AddToolVersion("Erlang", $(Get-ErlangVersion)) $languageAndRuntime.AddToolVersion("Erlang rebar3", $(Get-ErlangRebar3Version)) } diff --git a/images/linux/scripts/tests/Tools.Tests.ps1 b/images/linux/scripts/tests/Tools.Tests.ps1 index b5102b5e0e86..c5eaf479525b 100644 --- a/images/linux/scripts/tests/Tools.Tests.ps1 +++ b/images/linux/scripts/tests/Tools.Tests.ps1 @@ -132,7 +132,7 @@ Describe "Cmake" { } } -Describe "erlang" -Skip:(Test-IsUbuntu22) { +Describe "erlang" -Skip:((Test-IsUbuntu22) -or (Test-IsUbuntu18)) { $testCases = @("erl -version", "erlc -v", "rebar3 -v") | ForEach-Object { @{ErlangCommand = $_} } It "erlang <ErlangCommand>" -TestCases $testCases { diff --git a/images/linux/ubuntu1804.json b/images/linux/ubuntu1804.json index a1001f08c5c5..74c4c47dc221 100644 --- a/images/linux/ubuntu1804.json +++ b/images/linux/ubuntu1804.json @@ -206,7 +206,6 @@ "{{template_dir}}/scripts/installers/codeql-bundle.sh", "{{template_dir}}/scripts/installers/containers.sh", "{{template_dir}}/scripts/installers/dotnetcore-sdk.sh", - "{{template_dir}}/scripts/installers/erlang.sh", "{{template_dir}}/scripts/installers/firefox.sh", "{{template_dir}}/scripts/installers/microsoft-edge.sh", "{{template_dir}}/scripts/installers/gcc.sh", From 7c6375761de9479910f4425c229d57f7c2f3eeec Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 2 Mar 2023 10:10:51 +0000 Subject: [PATCH 1781/3485] Updating readme file for ubuntu22 version 20230227.2 (#7206) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2204-Readme.md | 63 ++++++++++++++++--------------- 1 file changed, 32 insertions(+), 31 deletions(-) diff --git a/images/linux/Ubuntu2204-Readme.md b/images/linux/Ubuntu2204-Readme.md index 7de53e1c6497..b480710d5866 100644 --- a/images/linux/Ubuntu2204-Readme.md +++ b/images/linux/Ubuntu2204-Readme.md @@ -5,7 +5,7 @@ # Ubuntu 22.04 - OS Version: 22.04.2 LTS - Kernel Version: 5.15.0-1033-azure -- Image Version: 20230219.1 +- Image Version: 20230227.2 ## Installed Software @@ -21,7 +21,7 @@ - Kotlin 1.8.10-release-430 - Mono 6.12.0.182 - MSBuild 16.10.1.31701 (Mono 6.12.0.182) -- Node.js 18.14.1 +- Node.js 18.14.2 - Perl 5.34.0 - Python 3.10.6 - Python3 3.10.6 @@ -31,15 +31,15 @@ ### Package Management - cpan 1.64 - Helm 3.11.1 -- Homebrew 4.0.1 +- Homebrew 4.0.4 - Miniconda 23.1.0 -- Npm 9.3.1 +- Npm 9.5.0 - NuGet 6.3.1.1 - Pip 22.0.2 - Pip3 22.0.2 - Pipx 1.1.0 - RubyGems 3.3.5 -- Vcpkg (build from commit a32522820) +- Vcpkg (build from commit 5626cee5c) - Yarn 1.22.19 #### Environment variables @@ -60,27 +60,27 @@ to accomplish this. - Lerna 6.5.1 ### Tools -- Ansible 2.14.2 +- Ansible 2.14.3 - apt-fast 1.9.12 - AzCopy 10.17.0 - available by `azcopy` and `azcopy10` aliases - Bazel 6.0.0 - Bazelisk 1.13.2 -- Bicep 0.14.46 +- Bicep 0.14.85 - Buildah 1.23.1 - CMake 3.25.2 -- CodeQL Action Bundles 2.12.1 2.12.2 +- CodeQL Action Bundles 2.12.2 2.12.3 - Docker Amazon ECR Credential Helper 0.6.0 - Docker Compose v1 1.29.2 - Docker Compose v2 2.16.0+azure-2 - Docker-Buildx 0.10.3 - Docker-Moby Client 20.10.23+azure-2 - Docker-Moby Server 20.10.22+azure-1 -- Fastlane 2.212.0 +- Fastlane 2.212.1 - Git 2.39.2 - Git LFS 3.3.0 - Git-ftp 1.6.0 - Haveged 1.9.14 -- Heroku 7.68.1 +- Heroku 7.68.2 - jq 1.6 - Kind 0.17.0 - Kubectl 1.26.1 @@ -103,23 +103,23 @@ to accomplish this. - SVN 1.14.1 - Terraform 1.3.9 - yamllint 1.29.0 -- yq 4.30.8 +- yq 4.31.1 - zstd 1.5.4 ### CLI Tools -- Alibaba Cloud CLI 3.0.149 -- AWS CLI 2.10.1 +- Alibaba Cloud CLI 3.0.150 +- AWS CLI 2.10.3 - AWS CLI Session Manager Plugin 1.2.398.0 -- AWS SAM CLI 1.73.0 +- AWS SAM CLI 1.74.0 - Azure CLI 2.45.0 - Azure CLI (azure-devops) 0.26.0 - GitHub CLI 2.23.0 -- Google Cloud SDK 418.0.0 +- Google Cloud SDK 419.0.0 - Hub CLI 2.14.2 -- Netlify CLI 12.13.1 -- OpenShift CLI 4.12.3 +- Netlify CLI 13.0.0 +- OpenShift CLI 4.12.4 - ORAS CLI 0.16.0 -- Vercel CLI 28.16.2 +- Vercel CLI 28.16.7 ### Java | Version | Vendor | Environment Variable | @@ -136,7 +136,7 @@ to accomplish this. ### PHP Tools - PHP: 8.1.2 - Composer 2.5.4 -- PHPUnit 8.5.32 +- PHPUnit 8.5.33 ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ``` @@ -144,7 +144,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ### Haskell Tools - Cabal 3.6.2.0 - GHC 9.4.4 -- GHCup 0.1.19.1 +- GHCup 0.1.19.2 - Stack 2.9.3 ### Rust Tools @@ -162,11 +162,11 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.5.1 ### Browsers and Drivers -- Google Chrome 110.0.5481.100 +- Google Chrome 110.0.5481.177 - ChromeDriver 110.0.5481.77 - Chromium 110.0.5481.0 -- Microsoft Edge 110.0.1587.50 -- Microsoft Edge WebDriver 110.0.1587.50 +- Microsoft Edge 110.0.1587.57 +- Microsoft Edge WebDriver 110.0.1587.57 - Selenium server 4.8.0 - Mozilla Firefox 110.0 - Geckodriver 0.32.2 @@ -180,7 +180,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | ### .NET Tools -- .NET Core SDK: 6.0.406, 7.0.103, 7.0.200 +- .NET Core SDK: 6.0.406, 7.0.103, 7.0.201 - nbgv 3.5.119+5d25f54fec ### Databases @@ -213,11 +213,12 @@ Use the following command as a part of your job to start the service: 'sudo syst - 1.17.13 - 1.18.10 - 1.19.6 +- 1.20.1 #### Node.js - 14.21.3 - 16.19.1 -- 18.14.1 +- 18.14.2 #### Python - 3.7.15 @@ -235,7 +236,7 @@ Use the following command as a part of your job to start the service: 'sudo syst - 3.1.3 ### PowerShell Tools -- PowerShell 7.2.9 +- PowerShell 7.2.10 #### PowerShell Modules - Az: 9.3.0 @@ -290,9 +291,9 @@ Use the following command as a part of your job to start the service: 'sudo syst | node:14 | sha256:1b5300317e95ed8bb2a1c25003f57e52400ce7af1e2e1efd9f52407293f88317 | 2023-02-17 | | node:14-alpine | sha256:86c59eb57b10df3d55e460b28799f60121f950ad018ff0989ea01ab61a1d9ab2 | 2023-02-17 | | node:16 | sha256:a4baed9809deba446900d6e2bc6b92c3fe6ccff9ca2873f8d54e263595b02533 | 2023-02-17 | -| node:16-alpine | sha256:0fcf4fb718a763fa53ac8d60073a7cd7dc1520076e08ea0180591174122e52f3 | 2023-02-17 | -| node:18 | sha256:671b86a524e12beac53f6679d791dc8b73bff3a46edf4878343e82503cb33938 | 2023-02-17 | -| node:18-alpine | sha256:045b1a1c90bdfd8fcaad0769922aa16c401e31867d8bf5833365b0874884bbae | 2023-02-17 | +| node:16-alpine | sha256:029a85552a270cd6dfae0ec222465f1deacfaf7cee030981b7ff6acd6a0eaf33 | 2023-02-21 | +| node:18 | sha256:586cdef48f920dea2f47a954b8717601933aa1daa0a08264abf9144789abf8ae | 2023-02-22 | +| node:18-alpine | sha256:0d2712ac2b2c1149391173de670406f6e3dbdb1b2ba44e8530647e623e0e1b17 | 2023-02-22 | | ubuntu:18.04 | sha256:a3765b4d74747b5e9bdd03205b3fbc4fa19a02781c185f97f24c8f4f84ed7bbf | 2023-01-26 | | ubuntu:20.04 | sha256:4a45212e9518f35983a976eead0de5eecc555a2f047134e9dd2cfc589076a00d | 2023-02-01 | | ubuntu:22.04 | sha256:9a0bdde4188b896a372804be2384015e90e3f84906b750c1a53539b585fbbe7f | 2023-01-26 | @@ -310,7 +311,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | build-essential | 12.9ubuntu3 | | bzip2 | 1.0.8-5build1 | | coreutils | 8.32-4.1ubuntu1 | -| curl | 7.81.0-1ubuntu1.7 | +| curl | 7.81.0-1ubuntu1.8 | | dbus | 1.12.20-2ubuntu4.1 | | dnsutils | 1:9.18.1-1ubuntu1.3 | | dpkg | 1.21.1ubuntu2.1 | @@ -328,7 +329,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | lib32z1 | 1:1.2.11.dfsg-2ubuntu9.2 | | libc++-dev | 1:14.0-55\~exp2 | | libc++abi-dev | 1:14.0-55\~exp2 | -| libcurl4 | 7.81.0-1ubuntu1.7 | +| libcurl4 | 7.81.0-1ubuntu1.8 | | libgbm-dev | 22.2.5-0ubuntu0.1\~22.04.1 | | libgconf-2-4 | 3.2.6-7ubuntu2 | | libgsl-dev | 2.7.1+dfsg-3 | From ea986d3260bd1b180314e188445c58ced808b922 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Thu, 2 Mar 2023 11:21:19 +0100 Subject: [PATCH 1782/3485] [Anka] Decrement retries for auth attempts (#7217) --- images/macos/provision/core/commonutils.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/images/macos/provision/core/commonutils.sh b/images/macos/provision/core/commonutils.sh index 5ee348e41438..fe1e09a6c35f 100644 --- a/images/macos/provision/core/commonutils.sh +++ b/images/macos/provision/core/commonutils.sh @@ -42,6 +42,8 @@ if is_Monterey; then osascript -e 'tell application "System Events" to get application processes where visible is true' } osascript $HOME/utils/confirm-identified-developers.scpt $USER_PASSWORD + + retry=$((retry-1)) echo "retries left "$retry sleep 10 done From d2e23d3886e338bf205b4029651cb01fe54b6cdf Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 2 Mar 2023 12:54:30 +0000 Subject: [PATCH 1783/3485] Updating readme file for ubuntu20 version 20230224.2 (#7197) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2004-Readme.md | 55 ++++++++++++++++--------------- 1 file changed, 28 insertions(+), 27 deletions(-) diff --git a/images/linux/Ubuntu2004-Readme.md b/images/linux/Ubuntu2004-Readme.md index 8afeeeccc561..17e80ecd42eb 100644 --- a/images/linux/Ubuntu2004-Readme.md +++ b/images/linux/Ubuntu2004-Readme.md @@ -5,7 +5,7 @@ # Ubuntu 20.04 - OS Version: 20.04.5 LTS - Kernel Version: 5.15.0-1033-azure -- Image Version: 20230219.1 +- Image Version: 20230224.2 ## Installed Software @@ -15,7 +15,7 @@ - Clang-format: 10.0.0, 11.0.0, 12.0.0 - Clang-tidy: 10.0.0, 11.0.0, 12.0.0 - Dash 0.5.10.2-6 -- Erlang 25.0.4 (Eshell 13.0.4) +- Erlang 25.2.3 (Eshell 13.1.5) - Erlang rebar3 3.20.0 - GNU C++: 9.4.0, 10.3.0 - GNU Fortran: 9.4.0, 10.3.0 @@ -23,7 +23,7 @@ - Kotlin 1.8.10-release-430 - Mono 6.12.0.182 - MSBuild 16.10.1.31701 (Mono 6.12.0.182) -- Node.js 18.14.1 +- Node.js 18.14.2 - Perl 5.30.0 - Python 3.8.10 - Python3 3.8.10 @@ -33,15 +33,15 @@ ### Package Management - cpan 1.64 - Helm 3.11.1 -- Homebrew 4.0.1 +- Homebrew 4.0.3 - Miniconda 23.1.0 -- Npm 9.3.1 +- Npm 9.5.0 - NuGet 6.3.1.1 - Pip 20.0.2 - Pip3 20.0.2 - Pipx 1.1.0 - RubyGems 3.1.2 -- Vcpkg (build from commit a32522820) +- Vcpkg (build from commit a7b6122f6) - Yarn 1.22.19 #### Environment variables @@ -62,7 +62,7 @@ to accomplish this. - Ant 1.10.7 - Gradle 8.0.1 - Lerna 6.5.1 -- Maven 3.8.7 +- Maven 3.9.0 - Sbt 1.8.2 ### Tools @@ -71,22 +71,22 @@ to accomplish this. - AzCopy 10.17.0 - available by `azcopy` and `azcopy10` aliases - Bazel 6.0.0 - Bazelisk 1.13.2 -- Bicep 0.14.46 +- Bicep 0.14.85 - Buildah 1.22.3 - CMake 3.25.2 -- CodeQL Action Bundles 2.12.1 2.12.2 +- CodeQL Action Bundles 2.12.2 2.12.3 - Docker Amazon ECR Credential Helper 0.6.0 - Docker Compose v1 1.29.2 - Docker Compose v2 2.16.0+azure-2 - Docker-Buildx 0.10.3 - Docker-Moby Client 20.10.23+azure-2 - Docker-Moby Server 20.10.22+azure-1 -- Fastlane 2.212.0 +- Fastlane 2.212.1 - Git 2.39.2 - Git LFS 3.3.0 - Git-ftp 1.6.0 - Haveged 1.9.1 -- Heroku 7.68.1 +- Heroku 7.68.2 - HHVM (HipHop VM) 4.172.1 - jq 1.6 - Kind 0.17.0 @@ -111,23 +111,23 @@ to accomplish this. - SVN 1.13.0 - Terraform 1.3.9 - yamllint 1.29.0 -- yq 4.30.8 +- yq 4.31.1 - zstd 1.5.4 ### CLI Tools -- Alibaba Cloud CLI 3.0.149 -- AWS CLI 2.10.1 +- Alibaba Cloud CLI 3.0.150 +- AWS CLI 2.10.3 - AWS CLI Session Manager Plugin 1.2.398.0 -- AWS SAM CLI 1.73.0 +- AWS SAM CLI 1.74.0 - Azure CLI 2.45.0 - Azure CLI (azure-devops) 0.26.0 - GitHub CLI 2.23.0 -- Google Cloud SDK 418.0.0 +- Google Cloud SDK 419.0.0 - Hub CLI 2.14.2 -- Netlify CLI 12.13.1 -- OpenShift CLI 4.12.3 +- Netlify CLI 13.0.0 +- OpenShift CLI 4.12.4 - ORAS CLI 0.16.0 -- Vercel CLI 28.16.2 +- Vercel CLI 28.16.7 ### Java | Version | Vendor | Environment Variable | @@ -152,7 +152,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ### Haskell Tools - Cabal 3.6.2.0 - GHC 9.4.4 -- GHCup 0.1.19.1 +- GHCup 0.1.19.2 - Stack 2.9.3 ### Rust Tools @@ -170,7 +170,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.5.1 ### Browsers and Drivers -- Google Chrome 110.0.5481.100 +- Google Chrome 110.0.5481.177 - ChromeDriver 110.0.5481.77 - Chromium 110.0.5481.0 - Microsoft Edge 110.0.1587.50 @@ -192,7 +192,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - nbgv 3.5.119+5d25f54fec ### Databases -- MongoDB 5.0.14 +- MongoDB 5.0.15 - sqlite3 3.31.1 #### PostgreSQL @@ -222,11 +222,12 @@ Use the following command as a part of your job to start the service: 'sudo syst - 1.17.13 - 1.18.10 - 1.19.6 +- 1.20.1 #### Node.js - 14.21.3 - 16.19.1 -- 18.14.1 +- 18.14.2 #### Python - 2.7.18 @@ -252,7 +253,7 @@ Use the following command as a part of your job to start the service: 'sudo syst - 3.1.3 ### PowerShell Tools -- PowerShell 7.2.9 +- PowerShell 7.2.10 #### PowerShell Modules - Az: 9.3.0 @@ -311,9 +312,9 @@ Use the following command as a part of your job to start the service: 'sudo syst | node:14 | sha256:1b5300317e95ed8bb2a1c25003f57e52400ce7af1e2e1efd9f52407293f88317 | 2023-02-17 | | node:14-alpine | sha256:86c59eb57b10df3d55e460b28799f60121f950ad018ff0989ea01ab61a1d9ab2 | 2023-02-17 | | node:16 | sha256:a4baed9809deba446900d6e2bc6b92c3fe6ccff9ca2873f8d54e263595b02533 | 2023-02-17 | -| node:16-alpine | sha256:0fcf4fb718a763fa53ac8d60073a7cd7dc1520076e08ea0180591174122e52f3 | 2023-02-17 | -| node:18 | sha256:671b86a524e12beac53f6679d791dc8b73bff3a46edf4878343e82503cb33938 | 2023-02-17 | -| node:18-alpine | sha256:045b1a1c90bdfd8fcaad0769922aa16c401e31867d8bf5833365b0874884bbae | 2023-02-17 | +| node:16-alpine | sha256:029a85552a270cd6dfae0ec222465f1deacfaf7cee030981b7ff6acd6a0eaf33 | 2023-02-21 | +| node:18 | sha256:586cdef48f920dea2f47a954b8717601933aa1daa0a08264abf9144789abf8ae | 2023-02-22 | +| node:18-alpine | sha256:0d2712ac2b2c1149391173de670406f6e3dbdb1b2ba44e8530647e623e0e1b17 | 2023-02-22 | | ubuntu:16.04 | sha256:1f1a2d56de1d604801a9671f301190704c25d604a416f59e03c04f5c6ffee0d6 | 2021-08-31 | | ubuntu:18.04 | sha256:a3765b4d74747b5e9bdd03205b3fbc4fa19a02781c185f97f24c8f4f84ed7bbf | 2023-01-26 | | ubuntu:20.04 | sha256:4a45212e9518f35983a976eead0de5eecc555a2f047134e9dd2cfc589076a00d | 2023-02-01 | From a97f8c9bdfef5b8b3e763ea06f67c354060c6cc0 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 2 Mar 2023 14:33:55 +0000 Subject: [PATCH 1784/3485] Updating readme file for win19 version 20230226.1 (#7196) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2019-Readme.md | 39 ++++++++++++++++---------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index 207d93864daf..7f205b9a18ac 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -1,6 +1,6 @@ # Windows Server 2019 - OS Version: 10.0.17763 Build 4010 -- Image Version: 20230219.1 +- Image Version: 20230226.1 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -13,7 +13,7 @@ - Julia 1.8.5 - Kotlin 1.8.10 - LLVM 15.0.7 -- Node 18.14.1 +- Node 18.14.2 - Perl 5.32.1 - PHP 8.2.3 - Python 3.7.9 @@ -24,12 +24,12 @@ - Composer 2.5.4 - Helm 3.11.1 - Miniconda 23.1.0 (pre-installed on the image but not added to PATH) -- NPM 9.3.1 +- NPM 9.5.0 - NuGet 6.4.0.123 - pip 23.0.1 (python 3.7) - Pipx 1.1.0 - RubyGems 2.7.6.3 -- Vcpkg (build from commit a32522820) +- Vcpkg (build from commit 223d33be7) - Yarn 1.22.19 #### Environment variables @@ -50,10 +50,10 @@ - azcopy 10.17.0 - Bazel 6.0.0 - Bazelisk 1.13.2 -- Bicep 0.14.46 +- Bicep 0.14.85 - Cabal 3.8.1.0 - CMake 3.25.2 -- CodeQL Action Bundles 2.12.1 2.12.2 +- CodeQL Action Bundles 2.12.2 2.12.3 - Docker 23.0.1 - Docker Compose v1 1.29.2 - Docker Compose v2 2.16.0 @@ -61,7 +61,7 @@ - ghc 9.4.4 - Git 2.39.2.windows.1 - Git LFS 3.3.0 -- Google Cloud SDK 418.0.0 +- Google Cloud SDK 419.0.0 - ImageMagick 7.1.0-61 - InnoSetup 6.2.2 - jq 1.6 @@ -87,9 +87,9 @@ - zstd 1.5.4 ### CLI Tools -- Alibaba Cloud CLI 3.0.149 -- AWS CLI 2.10.1 -- AWS SAM CLI 1.73.0 +- Alibaba Cloud CLI 3.0.150 +- AWS CLI 2.10.3 +- AWS SAM CLI 1.74.0 - AWS Session Manager CLI 1.2.398.0 - Azure CLI 2.45.0 - Azure DevOps CLI extension 0.26.0 @@ -112,10 +112,10 @@ - Rustfmt 1.5.1 ### Browsers and Drivers -- Google Chrome 110.0.5481.104 +- Google Chrome 110.0.5481.178 - Chrome Driver 110.0.5481.77 -- Microsoft Edge 110.0.1587.50 -- Microsoft Edge Driver 110.0.1587.50 +- Microsoft Edge 110.0.1587.57 +- Microsoft Edge Driver 110.0.1587.57 - Mozilla Firefox 110.0 - Gecko Driver 0.32.2 - IE Driver 4.8.0.0 @@ -163,11 +163,12 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 1.17.13 - 1.18.10 - 1.19.6 +- 1.20.1 #### Node.js - 14.21.3 - 16.19.1 -- 18.14.1 +- 18.14.2 #### Python - 2.7.18 @@ -210,7 +211,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### MongoDB | Version | ServiceName | ServiceStatus | ServiceStartType | | -------- | ----------- | ------------- | ---------------- | -| 5.0.14.0 | MongoDB | Stopped | Disabled | +| 5.0.15.0 | MongoDB | Stopped | Disabled | ### Database tools - Azure CosmosDb Emulator 2.14.11.0 @@ -222,7 +223,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Web Servers | Name | Version | ConfigFile | ServiceName | ServiceStatus | ListenPort | | ------ | ------- | ------------------------------------- | ----------- | ------------- | ---------- | -| Apache | 2.4.54 | C:\tools\Apache24\conf\httpd.conf | Apache | Stopped | 80 | +| Apache | 2.4.55 | C:\tools\Apache24\conf\httpd.conf | Apache | Stopped | 80 | | Nginx | 1.23.3 | C:\tools\nginx-1.23.3\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2019 @@ -499,7 +500,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - nbgv 3.5.119+5d25f54fec ### PowerShell Tools -- PowerShell 7.2.9 +- PowerShell 7.2.10 #### Powershell Modules - Az: 9.3.0 @@ -508,7 +509,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Az (Cached): 1.0.0.zip, 1.6.0.zip, 2.3.2.zip, 2.6.0.zip, 3.1.0.zip, 3.5.0.zip, 3.8.0.zip, 4.3.0.zip, 4.4.0.zip, 4.7.0.zip, 5.5.0.zip, 5.9.0.zip, 6.6.0.zip, 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.274 +- AWSPowershell: 4.1.279 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 - Microsoft.Graph: 1.22.0 @@ -555,6 +556,6 @@ All other versions are saved but not installed. | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | | mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:c3ffbe8f1ac99a6e8bd51e0259c0e33b3203098209ed56f71ef038e7781b4fd2 | 2023-02-14 | | mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:7d8886649cc239ad1daf134dd8a566dd1b680291eb7f89ffe4ba2968c7f0007e | 2023-02-14 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:1c93b0efbaf3d4b2b23ffb8d772aa8586322af7449273f12c47c0931c79325ce | 2023-02-14 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:eae7efdcfce460bec521b0719973ce77836793e4a954d4ee97756c468299671f | 2023-02-21 | | mcr.microsoft.com/windows/nanoserver:1809 | sha256:fc2d54de31f170c0bef160137b4dc0a80c2105a218b248dc71c754e1fcabd14f | 2023-02-07 | | mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:46b40e526196d42b78d6bc777529203fd51467b095ddcb7acc87fc475c3c5e55 | 2023-02-07 | From 477577696fad93521d44f139c6d92919316aeca3 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 2 Mar 2023 14:36:59 +0000 Subject: [PATCH 1785/3485] Updating readme file for win22 version 20230226.1 (#7195) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2022-Readme.md | 533 ++++++++++++++++--------------- 1 file changed, 268 insertions(+), 265 deletions(-) diff --git a/images/win/Windows2022-Readme.md b/images/win/Windows2022-Readme.md index 60f39c0a123e..01ec948e2859 100644 --- a/images/win/Windows2022-Readme.md +++ b/images/win/Windows2022-Readme.md @@ -1,6 +1,6 @@ # Windows Server 2022 - OS Version: 10.0.20348 Build 1547 -- Image Version: 20230219.1 +- Image Version: 20230226.1 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -13,7 +13,7 @@ - Julia 1.8.5 - Kotlin 1.8.10 - LLVM 15.0.7 -- Node 18.14.1 +- Node 18.14.2 - Perl 5.32.1 - PHP 8.2.3 - Python 3.9.13 @@ -24,12 +24,12 @@ - Composer 2.5.4 - Helm 3.11.1 - Miniconda 23.1.0 (pre-installed on the image but not added to PATH) -- NPM 9.3.1 +- NPM 9.5.0 - NuGet 6.4.0.123 - pip 23.0.1 (python 3.9) - Pipx 1.1.0 - RubyGems 3.2.33 -- Vcpkg (build from commit a32522820) +- Vcpkg (build from commit 223d33be7) - Yarn 1.22.19 #### Environment variables @@ -50,10 +50,10 @@ - azcopy 10.17.0 - Bazel 6.0.0 - Bazelisk 1.13.2 -- Bicep 0.14.46 +- Bicep 0.14.85 - Cabal 3.8.1.0 - CMake 3.25.2 -- CodeQL Action Bundles 2.12.1 2.12.2 +- CodeQL Action Bundles 2.12.2 2.12.3 - Docker 23.0.1 - Docker Compose v1 1.29.2 - Docker Compose v2 2.16.0 @@ -85,9 +85,9 @@ - zstd 1.5.4 ### CLI Tools -- Alibaba Cloud CLI 3.0.149 -- AWS CLI 2.10.1 -- AWS SAM CLI 1.73.0 +- Alibaba Cloud CLI 3.0.150 +- AWS CLI 2.10.3 +- AWS SAM CLI 1.74.0 - AWS Session Manager CLI 1.2.398.0 - Azure CLI 2.45.0 - Azure DevOps CLI extension 0.26.0 @@ -109,10 +109,10 @@ - Rustfmt 1.5.1 ### Browsers and Drivers -- Google Chrome 110.0.5481.104 +- Google Chrome 110.0.5481.178 - Chrome Driver 110.0.5481.77 -- Microsoft Edge 110.0.1587.50 -- Microsoft Edge Driver 110.0.1587.50 +- Microsoft Edge 110.0.1587.57 +- Microsoft Edge Driver 110.0.1587.57 - Mozilla Firefox 110.0 - Gecko Driver 0.32.2 - IE Driver 4.8.0.0 @@ -156,11 +156,12 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 1.17.13 - 1.18.10 - 1.19.6 +- 1.20.1 #### Node.js - 14.21.3 - 16.19.1 -- 18.14.1 +- 18.14.2 #### Python - 3.7.9 @@ -197,7 +198,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### MongoDB | Version | ServiceName | ServiceStatus | ServiceStartType | | -------- | ----------- | ------------- | ---------------- | -| 5.0.14.0 | MongoDB | Stopped | Disabled | +| 5.0.15.0 | MongoDB | Stopped | Disabled | ### Database tools - Azure CosmosDb Emulator 2.14.11.0 @@ -209,75 +210,76 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Web Servers | Name | Version | ConfigFile | ServiceName | ServiceStatus | ListenPort | | ------ | ------- | ------------------------------------- | ----------- | ------------- | ---------- | -| Apache | 2.4.54 | C:\tools\Apache24\conf\httpd.conf | Apache | Stopped | 80 | +| Apache | 2.4.55 | C:\tools\Apache24\conf\httpd.conf | Apache | Stopped | 80 | | Nginx | 1.23.3 | C:\tools\nginx-1.23.3\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2022 | Name | Version | Path | | ----------------------------- | -------------- | -------------------------------------------------------- | -| Visual Studio Enterprise 2022 | 17.4.33403.182 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | +| Visual Studio Enterprise 2022 | 17.5.33414.496 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | #### Workloads, components and extensions | Package | Version | | ------------------------------------------------------------------------- | -------------- | -| android | 33.0.4.0 | -| Component.Android.Emulator.MDD | 17.4.33006.217 | -| Component.Android.NDK.R23C | 17.4.33006.217 | -| Component.Android.SDK.MAUI | 17.4.33118.351 | +| android | 33.0.26.0 | +| Component.Android.Emulator.MDD | 17.5.33306.270 | +| Component.Android.NDK.R23C | 17.5.33306.270 | +| Component.Android.SDK.MAUI | 17.5.33306.270 | | Component.CPython39.x64 | 3.9.13 | -| Component.Dotfuscator | 17.4.33006.217 | -| Component.HAXM.Private | 17.4.33006.217 | -| Component.Linux.CMake | 17.4.33006.217 | -| Component.MDD.Android | 17.4.33006.217 | -| Component.MDD.Linux | 17.4.33006.217 | -| Component.MDD.Linux.GCC.arm | 17.4.33006.217 | -| Component.Microsoft.VisualStudio.LiveShare.2022 | 1.0.5717 | -| Component.Microsoft.VisualStudio.RazorExtension | 17.4.33006.217 | -| Component.Microsoft.VisualStudio.Web.AzureFunctions | 17.4.33006.217 | -| Component.Microsoft.Web.LibraryManager | 17.4.33006.217 | -| Component.Microsoft.WebTools.BrowserLink.WebLivePreview | 17.4.51.37770 | +| Component.Dotfuscator | 17.5.33306.270 | +| Component.HAXM.Private | 17.5.33306.270 | +| Component.Linux.CMake | 17.5.33306.270 | +| Component.Linux.RemoteFileExplorer | 17.5.33306.270 | +| Component.MDD.Android | 17.5.33306.270 | +| Component.MDD.Linux | 17.5.33306.270 | +| Component.MDD.Linux.GCC.arm | 17.5.33306.270 | +| Component.Microsoft.VisualStudio.LiveShare.2022 | 1.0.5784 | +| Component.Microsoft.VisualStudio.RazorExtension | 17.5.33306.270 | +| Component.Microsoft.VisualStudio.Web.AzureFunctions | 17.5.33306.270 | +| Component.Microsoft.Web.LibraryManager | 17.5.33306.270 | +| Component.Microsoft.WebTools.BrowserLink.WebLivePreview | 17.5.142.32734 | | Component.Microsoft.Windows.DriverKit | 10.0.22621.0 | -| Component.OpenJDK | 17.4.33006.217 | -| Component.UnityEngine.x64 | 17.4.33006.217 | -| Component.Unreal | 17.4.33006.217 | -| Component.Unreal.Android | 17.4.33006.217 | -| Component.Unreal.Ide | 17.4.33006.217 | +| Component.OpenJDK | 17.5.33306.270 | +| Component.UnityEngine.x64 | 17.5.33306.270 | +| Component.Unreal | 17.5.33306.270 | +| Component.Unreal.Android | 17.5.33306.270 | +| Component.Unreal.Ide | 17.5.33306.270 | | Component.VSInstallerProjects2022 | 2.0.0 | | Component.WixToolset.VisualStudioExtension.Dev17 | 1.0.0.22 | | Component.WixToolset.VisualStudioExtension.Schemas3 | 1.0.0.22 | -| Component.Xamarin | 17.4.33006.217 | -| Component.Xamarin.RemotedSimulator | 17.4.33006.217 | -| ios | 16.2.36.0 | -| maccatalyst | 16.2.36.0 | +| Component.Xamarin | 17.5.33306.270 | +| Component.Xamarin.RemotedSimulator | 17.5.33306.270 | +| ios | 16.2.53.0 | +| maccatalyst | 16.2.53.0 | | maui.android | 7.0.59.0 | | maui.blazor | 7.0.59.0 | | maui.core | 7.0.59.0 | | maui.ios | 7.0.59.0 | | maui.maccatalyst | 7.0.59.0 | | maui.windows | 7.0.59.0 | -| Microsoft.Component.Azure.DataLake.Tools | 17.4.33006.217 | -| Microsoft.Component.ClickOnce | 17.4.33006.217 | -| Microsoft.Component.CodeAnalysis.SDK | 17.4.33006.217 | -| Microsoft.Component.MSBuild | 17.4.33006.217 | -| Microsoft.Component.NetFX.Native | 17.4.33006.217 | -| Microsoft.Component.PythonTools | 17.4.33006.217 | -| Microsoft.Component.PythonTools.Web | 17.4.33006.217 | -| Microsoft.Component.VC.Runtime.UCRTSDK | 17.4.33006.217 | -| Microsoft.ComponentGroup.Blend | 17.4.33006.217 | -| Microsoft.ComponentGroup.ClickOnce.Publish | 17.4.33015.44 | -| Microsoft.Net.Component.4.5.2.TargetingPack | 17.4.33006.217 | -| Microsoft.Net.Component.4.6.2.TargetingPack | 17.4.33006.217 | -| Microsoft.Net.Component.4.6.TargetingPack | 17.4.33006.217 | -| Microsoft.Net.Component.4.7.1.TargetingPack | 17.4.33006.217 | -| Microsoft.Net.Component.4.7.2.TargetingPack | 17.4.33006.217 | -| Microsoft.Net.Component.4.7.TargetingPack | 17.4.33006.217 | -| Microsoft.Net.Component.4.8.1.SDK | 17.4.33006.217 | -| Microsoft.Net.Component.4.8.1.TargetingPack | 17.4.33006.217 | -| Microsoft.Net.Component.4.8.SDK | 17.4.33006.217 | -| Microsoft.Net.Component.4.8.TargetingPack | 17.4.33006.217 | -| Microsoft.Net.ComponentGroup.4.8.DeveloperTools | 17.4.33006.217 | -| Microsoft.Net.ComponentGroup.DevelopmentPrerequisites | 17.4.33006.217 | -| Microsoft.Net.ComponentGroup.TargetingPacks.Common | 17.4.33006.217 | +| Microsoft.Component.Azure.DataLake.Tools | 17.5.33306.270 | +| Microsoft.Component.ClickOnce | 17.5.33306.270 | +| Microsoft.Component.CodeAnalysis.SDK | 17.5.33306.270 | +| Microsoft.Component.MSBuild | 17.5.33306.270 | +| Microsoft.Component.NetFX.Native | 17.5.33306.270 | +| Microsoft.Component.PythonTools | 17.5.33306.270 | +| Microsoft.Component.PythonTools.Web | 17.5.33306.270 | +| Microsoft.Component.VC.Runtime.UCRTSDK | 17.5.33306.270 | +| Microsoft.ComponentGroup.Blend | 17.5.33306.270 | +| Microsoft.ComponentGroup.ClickOnce.Publish | 17.5.33306.270 | +| Microsoft.Net.Component.4.5.2.TargetingPack | 17.5.33306.270 | +| Microsoft.Net.Component.4.6.2.TargetingPack | 17.5.33306.270 | +| Microsoft.Net.Component.4.6.TargetingPack | 17.5.33306.270 | +| Microsoft.Net.Component.4.7.1.TargetingPack | 17.5.33306.270 | +| Microsoft.Net.Component.4.7.2.TargetingPack | 17.5.33306.270 | +| Microsoft.Net.Component.4.7.TargetingPack | 17.5.33306.270 | +| Microsoft.Net.Component.4.8.1.SDK | 17.5.33306.270 | +| Microsoft.Net.Component.4.8.1.TargetingPack | 17.5.33306.270 | +| Microsoft.Net.Component.4.8.SDK | 17.5.33306.270 | +| Microsoft.Net.Component.4.8.TargetingPack | 17.5.33306.270 | +| Microsoft.Net.ComponentGroup.4.8.DeveloperTools | 17.5.33306.270 | +| Microsoft.Net.ComponentGroup.DevelopmentPrerequisites | 17.5.33306.270 | +| Microsoft.Net.ComponentGroup.TargetingPacks.Common | 17.5.33306.270 | | microsoft.net.runtime.android | 7.0.323.6910 | | microsoft.net.runtime.android.aot | 7.0.323.6910 | | microsoft.net.runtime.android.aot.net6 | 7.0.323.6910 | @@ -289,204 +291,205 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | microsoft.net.runtime.mono.tooling | 7.0.323.6910 | | microsoft.net.runtime.mono.tooling.net6 | 7.0.323.6910 | | microsoft.net.sdk.emscripten.net7 | 7.0.8.6204 | -| Microsoft.NetCore.Component.DevelopmentTools | 17.4.33006.217 | -| Microsoft.NetCore.Component.Runtime.6.0 | 17.4.33402.68 | -| Microsoft.NetCore.Component.Runtime.7.0 | 17.4.33402.68 | -| Microsoft.NetCore.Component.SDK | 17.4.33402.68 | -| Microsoft.NetCore.Component.Web | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.AppInsights.Tools | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.AspNet | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.AspNet45 | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.Azure.AuthoringTools | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.Azure.ClientLibs | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.Azure.Compute.Emulator | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.Azure.Powershell | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.Azure.ResourceManager.Tools | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.Azure.ServiceFabric.Tools | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.Azure.Waverton | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.Azure.Waverton.BuildTools | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.ClassDesigner | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.CodeMap | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.Common.Azure.Tools | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.CoreEditor | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.Debugger.JustInTime | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.Debugger.Snapshot | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.DiagnosticTools | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.DockerTools | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.DotNetModelBuilder | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.DslTools | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.Embedded | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.EntityFramework | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.FSharp | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.FSharp.Desktop | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.FSharp.WebTemplates | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.GraphDocument | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.Graphics | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.Graphics.Tools | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.IISExpress | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.IntelliCode | 17.4.33402.68 | -| Microsoft.VisualStudio.Component.IntelliTrace.FrontEnd | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.JavaScript.Diagnostics | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.JavaScript.TypeScript | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.LinqToSql | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.LiveUnitTesting | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.ManagedDesktop.Core | 17.4.33402.68 | -| Microsoft.VisualStudio.Component.ManagedDesktop.Prerequisites | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.Merq | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.MonoDebugger | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.MSODBC.SQL | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.MSSQL.CMDLnUtils | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.Node.Tools | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.NuGet | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.NuGet.BuildTools | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.PortableLibrary | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.Roslyn.Compiler | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.Roslyn.LanguageServices | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.Sharepoint.Tools | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.SQL.CLR | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.SQL.DataSources | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.SQL.LocalDB.Runtime | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.SQL.SSDT | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.TeamOffice | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.TestTools.CodedUITest | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.TestTools.WebLoadTest | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.TextTemplating | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.TypeScript.TSServer | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.Unity | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.UWP.VC.ARM64 | 17.4.33110.190 | -| Microsoft.VisualStudio.Component.UWP.VC.ARM64EC | 17.4.33027.87 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM.Spectre | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM64 | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM64.Spectre | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM.Spectre | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM64 | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM64.Spectre | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.Spectre | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.ARM | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.ARM.Spectre | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.ARM64 | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.ARM64.Spectre | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.Spectre | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64 | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64.Spectre | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.VC.14.34.17.4.ARM | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.VC.14.34.17.4.ARM.Spectre | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.VC.14.34.17.4.ARM64 | 17.4.33110.190 | -| Microsoft.VisualStudio.Component.VC.14.34.17.4.ARM64.Spectre | 17.4.33110.190 | -| Microsoft.VisualStudio.Component.VC.14.34.17.4.ATL | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.VC.14.34.17.4.ATL.ARM | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.VC.14.34.17.4.ATL.ARM.Spectre | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.VC.14.34.17.4.ATL.ARM64 | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.VC.14.34.17.4.ATL.ARM64.Spectre | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.VC.14.34.17.4.ATL.Spectre | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.VC.14.34.17.4.MFC | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.VC.14.34.17.4.MFC.ARM | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.VC.14.34.17.4.MFC.ARM.Spectre | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.VC.14.34.17.4.MFC.ARM64 | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.VC.14.34.17.4.MFC.ARM64.Spectre | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.VC.14.34.17.4.MFC.Spectre | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.VC.14.34.17.4.x86.x64 | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.VC.14.34.17.4.x86.x64.Spectre | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.VC.ASAN | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.VC.ATL | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.VC.ATL.ARM | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.VC.ATL.ARM.Spectre | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.VC.ATL.ARM64 | 17.4.33110.190 | -| Microsoft.VisualStudio.Component.VC.ATL.ARM64.Spectre | 17.4.33110.190 | -| Microsoft.VisualStudio.Component.VC.ATL.Spectre | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.VC.ATLMFC | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.VC.ATLMFC.Spectre | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.VC.CLI.Support | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.VC.CMake.Project | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.VC.CoreIde | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.VC.DiagnosticTools | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.VC.Llvm.Clang | 17.4.33015.44 | -| Microsoft.VisualStudio.Component.VC.Llvm.ClangToolset | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.VC.MFC.ARM | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.VC.MFC.ARM.Spectre | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.VC.MFC.ARM64 | 17.4.33110.190 | -| Microsoft.VisualStudio.Component.VC.MFC.ARM64.Spectre | 17.4.33110.190 | -| Microsoft.VisualStudio.Component.VC.Modules.x86.x64 | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.VC.Redist.14.Latest | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.VC.Redist.MSM | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.VC.Runtimes.ARM.Spectre | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.VC.Runtimes.ARM64.Spectre | 17.4.33110.190 | -| Microsoft.VisualStudio.Component.VC.Runtimes.ARM64EC.Spectre | 17.4.33027.87 | -| Microsoft.VisualStudio.Component.VC.Runtimes.x86.x64.Spectre | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.VC.TestAdapterForBoostTest | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.VC.TestAdapterForGoogleTest | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.VC.Tools.ARM | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.VC.Tools.ARM64 | 17.4.33110.190 | -| Microsoft.VisualStudio.Component.VC.Tools.ARM64EC | 17.4.33027.87 | -| Microsoft.VisualStudio.Component.VC.Tools.x86.x64 | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.VC.v141.ARM | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.VC.v141.ARM.Spectre | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.VC.v141.ARM64 | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.VC.v141.ARM64.Spectre | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.VC.v141.ATL | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.VC.v141.ATL.Spectre | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.VC.v141.MFC | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.VC.v141.MFC.Spectre | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.VC.v141.x86.x64 | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.VC.v141.x86.x64.Spectre | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.VSSDK | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.Wcf.Tooling | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.Web | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.WebDeploy | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.Windows10SDK | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.Windows10SDK.19041 | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.Windows10SDK.20348 | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.Windows11SDK.22000 | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.Windows11SDK.22621 | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.Workflow | 17.4.33006.217 | -| Microsoft.VisualStudio.Component.WslDebugging | 17.4.33006.217 | -| Microsoft.VisualStudio.ComponentGroup.ArchitectureTools.Native | 17.4.33006.217 | -| Microsoft.VisualStudio.ComponentGroup.Azure.CloudServices | 17.4.33006.217 | -| Microsoft.VisualStudio.ComponentGroup.Azure.Prerequisites | 17.4.33006.217 | -| Microsoft.VisualStudio.ComponentGroup.Azure.ResourceManager.Tools | 17.4.33006.217 | -| Microsoft.VisualStudio.ComponentGroup.AzureFunctions | 17.4.33006.217 | -| Microsoft.VisualStudio.ComponentGroup.Maui.All | 17.4.33006.217 | -| Microsoft.VisualStudio.ComponentGroup.Maui.Android | 17.4.33006.217 | -| Microsoft.VisualStudio.ComponentGroup.Maui.Blazor | 17.4.33006.217 | -| Microsoft.VisualStudio.ComponentGroup.Maui.iOS | 17.4.33006.217 | -| Microsoft.VisualStudio.ComponentGroup.Maui.MacCatalyst | 17.4.33006.217 | -| Microsoft.VisualStudio.ComponentGroup.Maui.Shared | 17.4.33006.217 | -| Microsoft.VisualStudio.ComponentGroup.Maui.Windows | 17.4.33006.217 | -| Microsoft.VisualStudio.ComponentGroup.MSIX.Packaging | 17.4.33006.217 | -| Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core | 17.4.33006.217 | -| Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Llvm.Clang | 17.4.33015.44 | -| Microsoft.VisualStudio.ComponentGroup.UWP.NetCoreAndStandard | 17.4.33006.217 | -| Microsoft.VisualStudio.ComponentGroup.UWP.Support | 17.4.33402.68 | -| Microsoft.VisualStudio.ComponentGroup.UWP.VC.v142 | 17.4.33006.217 | -| Microsoft.VisualStudio.ComponentGroup.UWP.Xamarin | 17.4.33006.217 | -| Microsoft.VisualStudio.ComponentGroup.VC.Tools.142.x86.x64 | 17.4.33006.217 | -| Microsoft.VisualStudio.ComponentGroup.VisualStudioExtension.Prerequisites | 17.4.33402.68 | -| Microsoft.VisualStudio.ComponentGroup.Web | 17.4.33402.68 | -| Microsoft.VisualStudio.ComponentGroup.Web.CloudTools | 17.4.33006.217 | -| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions | 17.4.33006.217 | -| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.CMake | 17.4.33006.217 | -| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.TemplateEngine | 17.4.33006.217 | -| Microsoft.VisualStudio.Workload.Azure | 17.4.33006.217 | -| Microsoft.VisualStudio.Workload.CoreEditor | 17.4.33006.217 | -| Microsoft.VisualStudio.Workload.Data | 17.4.33006.217 | -| Microsoft.VisualStudio.Workload.DataScience | 17.4.33006.217 | -| Microsoft.VisualStudio.Workload.ManagedDesktop | 17.4.33006.217 | -| Microsoft.VisualStudio.Workload.ManagedGame | 17.4.33006.217 | -| Microsoft.VisualStudio.Workload.NativeCrossPlat | 17.4.33006.217 | -| Microsoft.VisualStudio.Workload.NativeDesktop | 17.4.33006.217 | -| Microsoft.VisualStudio.Workload.NativeGame | 17.4.33006.217 | -| Microsoft.VisualStudio.Workload.NativeMobile | 17.4.33006.217 | -| Microsoft.VisualStudio.Workload.NetCrossPlat | 17.4.33402.68 | -| Microsoft.VisualStudio.Workload.NetWeb | 17.4.33006.217 | -| Microsoft.VisualStudio.Workload.Node | 17.4.33006.217 | -| Microsoft.VisualStudio.Workload.Office | 17.4.33006.217 | -| Microsoft.VisualStudio.Workload.Python | 17.4.33006.217 | -| Microsoft.VisualStudio.Workload.Universal | 17.4.33006.217 | -| Microsoft.VisualStudio.Workload.VisualStudioExtension | 17.4.33006.217 | +| Microsoft.NetCore.Component.DevelopmentTools | 17.5.33306.270 | +| Microsoft.NetCore.Component.Runtime.6.0 | 17.5.33413.361 | +| Microsoft.NetCore.Component.Runtime.7.0 | 17.5.33413.361 | +| Microsoft.NetCore.Component.SDK | 17.5.33413.361 | +| Microsoft.NetCore.Component.Web | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.AppInsights.Tools | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.AspNet | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.AspNet45 | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.Azure.AuthoringTools | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.Azure.ClientLibs | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.Azure.Compute.Emulator | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.Azure.Powershell | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.Azure.ResourceManager.Tools | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.Azure.ServiceFabric.Tools | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.Azure.Waverton | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.Azure.Waverton.BuildTools | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.ClassDesigner | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.CodeMap | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.Common.Azure.Tools | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.CoreEditor | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.Debugger.JustInTime | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.Debugger.Snapshot | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.DiagnosticTools | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.DockerTools | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.DotNetModelBuilder | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.DslTools | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.Embedded | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.EntityFramework | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.FSharp | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.FSharp.Desktop | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.FSharp.WebTemplates | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.GraphDocument | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.Graphics | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.Graphics.Tools | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.IISExpress | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.IntelliCode | 17.5.33331.443 | +| Microsoft.VisualStudio.Component.IntelliTrace.FrontEnd | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.JavaScript.Diagnostics | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.JavaScript.TypeScript | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.LinqToSql | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.LiveUnitTesting | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.ManagedDesktop.Core | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.ManagedDesktop.Prerequisites | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.Merq | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.MonoDebugger | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.MSODBC.SQL | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.MSSQL.CMDLnUtils | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.Node.Tools | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.NuGet | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.NuGet.BuildTools | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.PortableLibrary | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.Roslyn.Compiler | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.Roslyn.LanguageServices | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.SecurityIssueAnalysis | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.Sharepoint.Tools | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.SQL.CLR | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.SQL.DataSources | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.SQL.LocalDB.Runtime | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.SQL.SSDT | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.TeamOffice | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.TestTools.CodedUITest | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.TestTools.WebLoadTest | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.TextTemplating | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.TypeScript.TSServer | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.Unity | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.UWP.VC.ARM64 | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.UWP.VC.ARM64EC | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM.Spectre | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM64 | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM64.Spectre | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM.Spectre | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM64 | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM64.Spectre | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.Spectre | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.ARM | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.ARM.Spectre | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.ARM64 | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.ARM64.Spectre | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.Spectre | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64 | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64.Spectre | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.VC.14.34.17.4.ARM | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.VC.14.34.17.4.ARM.Spectre | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.VC.14.34.17.4.ARM64 | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.VC.14.34.17.4.ARM64.Spectre | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.VC.14.34.17.4.ATL | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.VC.14.34.17.4.ATL.ARM | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.VC.14.34.17.4.ATL.ARM.Spectre | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.VC.14.34.17.4.ATL.ARM64 | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.VC.14.34.17.4.ATL.ARM64.Spectre | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.VC.14.34.17.4.ATL.Spectre | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.VC.14.34.17.4.MFC | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.VC.14.34.17.4.MFC.ARM | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.VC.14.34.17.4.MFC.ARM.Spectre | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.VC.14.34.17.4.MFC.ARM64 | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.VC.14.34.17.4.MFC.ARM64.Spectre | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.VC.14.34.17.4.MFC.Spectre | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.VC.14.34.17.4.x86.x64 | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.VC.14.34.17.4.x86.x64.Spectre | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.VC.ASAN | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.VC.ATL | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.VC.ATL.ARM | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.VC.ATL.ARM.Spectre | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.VC.ATL.ARM64 | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.VC.ATL.ARM64.Spectre | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.VC.ATL.Spectre | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.VC.ATLMFC | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.VC.ATLMFC.Spectre | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.VC.CLI.Support | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.VC.CMake.Project | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.VC.CoreIde | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.VC.DiagnosticTools | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.VC.Llvm.Clang | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.VC.Llvm.ClangToolset | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.VC.MFC.ARM | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.VC.MFC.ARM.Spectre | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.VC.MFC.ARM64 | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.VC.MFC.ARM64.Spectre | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.VC.Modules.x86.x64 | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.VC.Redist.14.Latest | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.VC.Redist.MSM | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.VC.Runtimes.ARM.Spectre | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.VC.Runtimes.ARM64.Spectre | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.VC.Runtimes.ARM64EC.Spectre | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.VC.Runtimes.x86.x64.Spectre | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.VC.TestAdapterForBoostTest | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.VC.TestAdapterForGoogleTest | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.VC.Tools.ARM | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.VC.Tools.ARM64 | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.VC.Tools.ARM64EC | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.VC.Tools.x86.x64 | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.VC.v141.ARM | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.VC.v141.ARM.Spectre | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.VC.v141.ARM64 | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.VC.v141.ARM64.Spectre | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.VC.v141.ATL | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.VC.v141.ATL.Spectre | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.VC.v141.MFC | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.VC.v141.MFC.Spectre | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.VC.v141.x86.x64 | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.VC.v141.x86.x64.Spectre | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.VSSDK | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.Wcf.Tooling | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.Web | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.WebDeploy | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.Windows10SDK | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.Windows10SDK.19041 | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.Windows10SDK.20348 | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.Windows11SDK.22000 | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.Windows11SDK.22621 | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.Workflow | 17.5.33306.270 | +| Microsoft.VisualStudio.Component.WslDebugging | 17.5.33306.270 | +| Microsoft.VisualStudio.ComponentGroup.ArchitectureTools.Native | 17.5.33306.270 | +| Microsoft.VisualStudio.ComponentGroup.Azure.CloudServices | 17.5.33306.270 | +| Microsoft.VisualStudio.ComponentGroup.Azure.Prerequisites | 17.5.33306.270 | +| Microsoft.VisualStudio.ComponentGroup.Azure.ResourceManager.Tools | 17.5.33306.270 | +| Microsoft.VisualStudio.ComponentGroup.AzureFunctions | 17.5.33306.270 | +| Microsoft.VisualStudio.ComponentGroup.Maui.All | 17.5.33306.270 | +| Microsoft.VisualStudio.ComponentGroup.Maui.Android | 17.5.33306.270 | +| Microsoft.VisualStudio.ComponentGroup.Maui.Blazor | 17.5.33306.270 | +| Microsoft.VisualStudio.ComponentGroup.Maui.iOS | 17.5.33306.270 | +| Microsoft.VisualStudio.ComponentGroup.Maui.MacCatalyst | 17.5.33306.270 | +| Microsoft.VisualStudio.ComponentGroup.Maui.Shared | 17.5.33306.270 | +| Microsoft.VisualStudio.ComponentGroup.Maui.Windows | 17.5.33306.270 | +| Microsoft.VisualStudio.ComponentGroup.MSIX.Packaging | 17.5.33306.270 | +| Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core | 17.5.33306.270 | +| Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Llvm.Clang | 17.5.33306.270 | +| Microsoft.VisualStudio.ComponentGroup.UWP.NetCoreAndStandard | 17.5.33306.270 | +| Microsoft.VisualStudio.ComponentGroup.UWP.Support | 17.5.33306.270 | +| Microsoft.VisualStudio.ComponentGroup.UWP.VC.v142 | 17.5.33306.270 | +| Microsoft.VisualStudio.ComponentGroup.UWP.Xamarin | 17.5.33306.270 | +| Microsoft.VisualStudio.ComponentGroup.VC.Tools.142.x86.x64 | 17.5.33306.270 | +| Microsoft.VisualStudio.ComponentGroup.VisualStudioExtension.Prerequisites | 17.5.33306.270 | +| Microsoft.VisualStudio.ComponentGroup.Web | 17.5.33306.270 | +| Microsoft.VisualStudio.ComponentGroup.Web.CloudTools | 17.5.33306.270 | +| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions | 17.5.33306.270 | +| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.CMake | 17.5.33306.270 | +| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.TemplateEngine | 17.5.33306.270 | +| Microsoft.VisualStudio.Workload.Azure | 17.5.33306.270 | +| Microsoft.VisualStudio.Workload.CoreEditor | 17.5.33306.270 | +| Microsoft.VisualStudio.Workload.Data | 17.5.33306.270 | +| Microsoft.VisualStudio.Workload.DataScience | 17.5.33306.270 | +| Microsoft.VisualStudio.Workload.ManagedDesktop | 17.5.33306.270 | +| Microsoft.VisualStudio.Workload.ManagedGame | 17.5.33306.270 | +| Microsoft.VisualStudio.Workload.NativeCrossPlat | 17.5.33306.270 | +| Microsoft.VisualStudio.Workload.NativeDesktop | 17.5.33306.270 | +| Microsoft.VisualStudio.Workload.NativeGame | 17.5.33306.270 | +| Microsoft.VisualStudio.Workload.NativeMobile | 17.5.33306.270 | +| Microsoft.VisualStudio.Workload.NetCrossPlat | 17.5.33306.270 | +| Microsoft.VisualStudio.Workload.NetWeb | 17.5.33306.270 | +| Microsoft.VisualStudio.Workload.Node | 17.5.33306.270 | +| Microsoft.VisualStudio.Workload.Office | 17.5.33306.270 | +| Microsoft.VisualStudio.Workload.Python | 17.5.33306.270 | +| Microsoft.VisualStudio.Workload.Universal | 17.5.33306.270 | +| Microsoft.VisualStudio.Workload.VisualStudioExtension | 17.5.33306.270 | | runtimes.ios | 7.0.323.6910 | | runtimes.ios.net6 | 7.0.323.6910 | | runtimes.maccatalyst | 7.0.323.6910 | @@ -522,7 +525,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 10.0.22621.0 ### .NET Core Tools -- .NET Core SDK: 3.1.120, 3.1.202, 3.1.302, 3.1.426, 6.0.114, 6.0.203, 6.0.309, 6.0.406, 7.0.103 +- .NET Core SDK: 3.1.120, 3.1.202, 3.1.302, 3.1.426, 6.0.114, 6.0.203, 6.0.309, 6.0.406, 7.0.200 - .NET Framework: 4.8, 4.8.1 - Microsoft.AspNetCore.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 6.0.5, 6.0.14, 7.0.3 - Microsoft.NETCore.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 6.0.5, 6.0.14, 7.0.3 @@ -530,7 +533,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - nbgv 3.5.119+5d25f54fec ### PowerShell Tools -- PowerShell 7.2.9 +- PowerShell 7.2.10 #### Powershell Modules - Az: 9.3.0 @@ -539,7 +542,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Az (Cached): 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.274 +- AWSPowershell: 4.1.279 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 - Microsoft.Graph: 1.22.0 @@ -585,6 +588,6 @@ All other versions are saved but not installed. | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | | mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2022 | sha256:5f068dbfbe1aa441ea4295fbe9fe36e1ee0915cb65f8a3d76126a318a4a48200 | 2023-02-14 | | mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2022 | sha256:b4dca605425b7411b347b91e0dc30cfabbfb80e79c66e4a350f2057f7fe391b8 | 2023-02-14 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:aa13c40eb160f60649c6ea873289a48277c3cc54cf538a27bb1ae08b040f8ad4 | 2023-02-14 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:13f41497e137a3495b0cefb7ce10f2cc65eca01925fff2ca595febe3bc1b6092 | 2023-02-21 | | mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:786a24be2bd1945bee9701f95a71d8573ace8641c112dc27206f826bef0229c1 | 2023-02-07 | | mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:5662262ca25622f4f8ad593481dd58dea47713bce5e6c9fdef9089a92e7c75b1 | 2023-02-07 | From 583096e0593835d55b985fd19b6a5b408b4d7598 Mon Sep 17 00:00:00 2001 From: Dusko Dobranic <101048884+ddobranic@users.noreply.github.com> Date: Thu, 2 Mar 2023 22:28:36 +0100 Subject: [PATCH 1786/3485] Use variable instead of hard coded value (#7213) --- images/linux/scripts/helpers/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/linux/scripts/helpers/install.sh b/images/linux/scripts/helpers/install.sh index 00678e495701..4c5c4d9c7ab2 100644 --- a/images/linux/scripts/helpers/install.sh +++ b/images/linux/scripts/helpers/install.sh @@ -33,7 +33,7 @@ download_with_retries() { return 0 else echo "Error — Either HTTP response code for '$URL' is wrong - '$http_code' or exit code is not 0 - '$exit_code'. Waiting $interval seconds before the next attempt, $retries attempts left" - sleep 30 + sleep $interval fi # Enable exit on error back set -e From 7ac0d4826c8c0dabfb81ee163ff523db895d424c Mon Sep 17 00:00:00 2001 From: Sergey Dolin <dsame@github.com> Date: Thu, 2 Mar 2023 22:28:58 +0100 Subject: [PATCH 1787/3485] Enable HypervisorPlatform (#7220) --- images/win/toolsets/toolset-2022.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index 3ad212bdcef5..f804daacb7a2 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -176,7 +176,8 @@ { "name": "NET-Framework-45-Features", "includeAllSubFeatures": true }, { "name": "Client-ProjFS", "optionalFeature": true }, { "name": "NET-Framework-Features", "includeAllSubFeatures": true }, - { "name": "Hyper-V", "includeAllSubFeatures": true } + { "name": "Hyper-V", "includeAllSubFeatures": true }, + { "name": "HypervisorPlatform", "optionalFeature": true } ], "visualStudio": { "version" : "2022", From 29ed1a27b981facac11282066b81e15cd4474b9a Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Fri, 3 Mar 2023 14:52:26 +0100 Subject: [PATCH 1788/3485] [Anka] add script to fix broken simulators name (#7231) --- images/macos/templates/macOS-12.anka.pkr.hcl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/images/macos/templates/macOS-12.anka.pkr.hcl b/images/macos/templates/macOS-12.anka.pkr.hcl index 06bfe81a4709..3fd4a8eac15b 100644 --- a/images/macos/templates/macOS-12.anka.pkr.hcl +++ b/images/macos/templates/macOS-12.anka.pkr.hcl @@ -245,6 +245,10 @@ build { script = "./provision/core/delete-duplicate-sims.rb" execute_command = "source $HOME/.bash_profile; ruby {{ .Path }}" } + provisioner "shell" { + script = "./provision/core/fix-xcode-simulators.ps1" + execute_command = "chmod +x {{ .Path }}; {{ .Vars }} pwsh -f {{ .Path }}" + } provisioner "shell" { inline = [ "pwsh -File \"$HOME/image-generation/software-report/SoftwareReport.Generator.ps1\" -OutputDirectory \"$HOME/image-generation/output/software-report\" -ImageName ${var.build_id}", From 07428a1deffce9aa8ed8de48ff8abe0ae39b081e Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Fri, 3 Mar 2023 16:17:13 +0100 Subject: [PATCH 1789/3485] [ubuntu] fix cmdline-tools parser (#7229) --- images/linux/scripts/installers/android.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/linux/scripts/installers/android.sh b/images/linux/scripts/installers/android.sh index 7e3a4ee71363..3b6ada7e171b 100644 --- a/images/linux/scripts/installers/android.sh +++ b/images/linux/scripts/installers/android.sh @@ -57,7 +57,7 @@ else download_with_retries $repositoryXmlUrl "/tmp" "repository2-1.xml" cmdlineToolsVersion=$( yq -p=xml \ - '.sdk-repository.remotePackage[] | select(."+@path" == "cmdline-tools;latest").archives.archive[].complete.url | select(contains("commandlinetools-linux"))' \ + '.sdk-repository.remotePackage[] | select(."+@path" == "cmdline-tools;latest" and .channelRef."+@ref" == "channel-0").archives.archive[].complete.url | select(contains("commandlinetools-linux"))' \ /tmp/repository2-1.xml ) From 085afb954909fa2bcf19867172ca2ce33948a98a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 3 Mar 2023 16:10:11 +0000 Subject: [PATCH 1790/3485] Updating readme file for macOS-11 version 20230223.3 (#7223) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-11-Readme.md | 40 ++++++++++++++++----------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/images/macos/macos-11-Readme.md b/images/macos/macos-11-Readme.md index 1abe798f3a1e..398fce888791 100644 --- a/images/macos/macos-11-Readme.md +++ b/images/macos/macos-11-Readme.md @@ -1,12 +1,12 @@ | Announcements | |-| | [GCC-9 will be removed from macOS 11 on March, 6](https://github.com/actions/runner-images/issues/7136) | -| [Xcode 13.4 will be pointing to 13.4.1 on February, 28](https://github.com/actions/runner-images/issues/7127) | +| [Xcode 13.4 will be pointing to 13.4.1 on February, 27](https://github.com/actions/runner-images/issues/7127) | *** # macOS 11 - OS Version: macOS 11.7.4 (20G1120) - Kernel Version: Darwin 20.6.0 -- Image Version: 20230219.1 +- Image Version: 20230223.3 ## Installed Software @@ -28,9 +28,9 @@ - Kotlin 1.8.10-release-430 - Mono 6.12.0.188 - MSBuild 16.10.1.51301 (Mono 6.12.0.188) -- Node.js 18.14.1 +- Node.js 18.14.2 - NVM 0.39.3 -- NVM - Cached node versions: 14.21.3, 16.19.1, 18.14.1 +- NVM - Cached node versions: 14.21.3, 16.19.1, 18.14.2 - Perl 5.36.0 - PHP 8.2.3 - Python 2.7.18 @@ -43,15 +43,15 @@ - Carthage 0.39.0 - CocoaPods 1.11.3 - Composer 2.5.4 -- Homebrew 4.0.1 +- Homebrew 4.0.3 - Miniconda 23.1.0 -- NPM 9.3.1 +- NPM 9.5.0 - NuGet 6.3.1.1 - Pip 20.3.4 (python 2.7) - Pip3 23.0.1 (python 3.11) - Pipx 1.1.0 - RubyGems 3.4.7 -- Vcpkg 2023 (build from commit a32522820) +- Vcpkg 2023 (build from commit 82e03905f) - Yarn 1.22.19 #### Environment variables @@ -63,7 +63,7 @@ ### Project Management - Apache Ant 1.10.13 - Apache Maven 3.9.0 -- Gradle 8.0 +- Gradle 8.0.1 - Sbt 1.8.2 ### Utilities @@ -73,7 +73,7 @@ - bazel 6.0.0 - bazelisk 1.16.0 - bsdtar 3.3.2 - available by 'tar' alias -- Curl 7.88.0 +- Curl 7.88.1 - Git 2.39.2 - Git LFS 3.3.0 - GitHub CLI 2.23.0 @@ -94,23 +94,23 @@ - Sox 14.4.2 - Subversion (SVN) 1.14.2 - Switchaudio-osx 1.1.0 -- yq 4.30.8 +- yq 4.31.1 - zstd 1.5.4 ### Tools -- Aliyun CLI 3.0.149 +- Aliyun CLI 3.0.150 - App Center CLI 2.13.2 -- AWS CLI 2.10.1 +- AWS CLI 2.10.2 - AWS SAM CLI 1.73.0 - AWS Session Manager CLI 1.2.398.0 - Azure CLI 2.45.0 - Azure CLI (azure-devops) 0.26.0 -- Bicep CLI 0.14.46 +- Bicep CLI 0.14.85 - Cabal 3.6.2.0 - Cmake 3.25.2 - CodeQL Action Bundles 2.12.1 2.12.2 - Colima 0.5.2 -- Fastlane 2.211.0 +- Fastlane 2.212.0 - GHC 9.4.4 - GHCup 0.1.19.1 - Jazzy 0.14.3 @@ -126,7 +126,7 @@ ### Browsers - Safari 16.3.1 (16614.4.6.11.7) - SafariDriver 16.3.1 (16614.4.6.11.7) -- Google Chrome 110.0.5481.100 +- Google Chrome 110.0.5481.177 - ChromeDriver 110.0.5481.77 - Microsoft Edge 110.0.1587.50 - Microsoft Edge WebDriver 110.0.1587.50 @@ -179,7 +179,7 @@ #### Node.js - 14.21.3 - 16.19.1 -- 18.14.1 +- 18.14.2 #### Go - 1.17.13 @@ -218,10 +218,10 @@ ### Xamarin #### Visual Studio for Mac -| Version | Build | Path | -| -------------- | --------- | ------------------------------------ | -| 2019 | 8.10.25.2 | /Applications/Visual Studio 2019.app | -| 2022 (default) | 17.4.5.8 | /Applications/Visual Studio.app | +| Version | Build | Path | +| -------------- | ----------- | ------------------------------------ | +| 2019 | 8.10.25.2 | /Applications/Visual Studio 2019.app | +| 2022 (default) | 17.5.0.1802 | /Applications/Visual Studio.app | ##### Notes ``` From 143a8da8d65d1e3d5977fd92e248ecde4d39d421 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gerg=C5=91=20Rubint?= <gergo@grubint.com> Date: Fri, 3 Mar 2023 23:49:20 +0100 Subject: [PATCH 1791/3485] Revert "[Ubuntu] Update Maven to 3.9.0 (#7060)" (#7232) This reverts commit 7e014ba67ba4fccf5280394ff77663a65eb0ca84. --- images/linux/toolsets/toolset-1804.json | 2 +- images/linux/toolsets/toolset-2004.json | 2 +- images/linux/toolsets/toolset-2204.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index da1e495e5e0e..6b69a1477168 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -84,7 +84,7 @@ "versions": [ "8", "11", "12" ] } ], - "maven": "3.9.0" + "maven": "3.8.7" }, "android": { "platform_min_version": "23", diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index 4267969e7738..41d97f3dae0c 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -86,7 +86,7 @@ "versions": [ "8", "11" ] } ], - "maven": "3.9.0" + "maven": "3.8.7" }, "android": { "cmdline-tools": "latest", diff --git a/images/linux/toolsets/toolset-2204.json b/images/linux/toolsets/toolset-2204.json index a6ebcef08393..22bab12c67e9 100644 --- a/images/linux/toolsets/toolset-2204.json +++ b/images/linux/toolsets/toolset-2204.json @@ -74,7 +74,7 @@ "versions": [ "8", "11", "17" ] } ], - "maven": "3.9.0" + "maven": "3.8.7" }, "android": { "cmdline-tools": "latest", From fe23ebfec16ac709df0c112489c0ef39b10185a9 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Sat, 4 Mar 2023 18:12:02 +0100 Subject: [PATCH 1792/3485] [Ubuntu] rework erlang installation (workaround hashes) (#7234) --- .../SoftwareReport.Generator.ps1 | 2 +- images/linux/scripts/installers/erlang.sh | 20 ++++++++++++++++++- images/linux/scripts/tests/Tools.Tests.ps1 | 2 +- images/linux/ubuntu1804.json | 1 + 4 files changed, 22 insertions(+), 3 deletions(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index 7d44e685c63c..ac7c8daa6356 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -40,7 +40,7 @@ $languageAndRuntime.AddToolVersionsListInline("Clang", $(Get-ClangToolVersions - $languageAndRuntime.AddToolVersionsListInline("Clang-format", $(Get-ClangToolVersions -ToolName "clang-format"), "^\d+") $languageAndRuntime.AddToolVersionsListInline("Clang-tidy", $(Get-ClangTidyVersions), "^\d+") $languageAndRuntime.AddToolVersion("Dash", $(Get-DashVersion)) -if (Test-IsUbuntu20) { +if ((Test-IsUbuntu18) -or (Test-IsUbuntu20)) { $languageAndRuntime.AddToolVersion("Erlang", $(Get-ErlangVersion)) $languageAndRuntime.AddToolVersion("Erlang rebar3", $(Get-ErlangRebar3Version)) } diff --git a/images/linux/scripts/installers/erlang.sh b/images/linux/scripts/installers/erlang.sh index 6aaa4a86b746..debf64e9bb99 100644 --- a/images/linux/scripts/installers/erlang.sh +++ b/images/linux/scripts/installers/erlang.sh @@ -6,6 +6,7 @@ # Source the helpers for use with the script source $HELPER_SCRIPTS/install.sh +source $HELPER_SCRIPTS/os.sh source_list=/etc/apt/sources.list.d/eslerlang.list source_key=/usr/share/keyrings/eslerlang.gpg @@ -14,7 +15,24 @@ source_key=/usr/share/keyrings/eslerlang.gpg wget -q -O - https://packages.erlang-solutions.com/ubuntu/erlang_solutions.asc | gpg --dearmor > $source_key echo "deb [signed-by=$source_key] https://packages.erlang-solutions.com/ubuntu $(lsb_release -cs) contrib" > $source_list apt-get update -apt-get install -y --no-install-recommends esl-erlang + + +apt-get install --no-install-recommends esl-erlang || true + +# Downoloading and installing a deb file manually, ignore deptree errors +if isUbuntu18; then + esl_url="https://packages.erlang-solutions.com/ubuntu/pool/esl-erlang_25.2.3-1~ubuntu~bionic_amd64.deb" + download_with_retries $esl_url "/tmp" + dpkg -i /tmp/esl-erlang_25.2.3-1~ubuntu~bionic_amd64.deb || true +else + esl_url="https://packages.erlang-solutions.com/ubuntu/pool/esl-erlang_25.2.3-2~ubuntu~focal_amd64.deb" + download_with_retries $esl_url "/tmp" + dpkg -i /tmp/esl-erlang_25.2.3-2~ubuntu~focal_amd64.deb || true +fi + +# Restore a proper deptree which brings esl-erlang back in the loop +# but eleminate unwanted X.org dependencies +apt --no-install-recommends --fix-broken install # Install rebar3 rebar3_url="https://github.com/erlang/rebar3/releases/latest/download/rebar3" diff --git a/images/linux/scripts/tests/Tools.Tests.ps1 b/images/linux/scripts/tests/Tools.Tests.ps1 index c5eaf479525b..b5102b5e0e86 100644 --- a/images/linux/scripts/tests/Tools.Tests.ps1 +++ b/images/linux/scripts/tests/Tools.Tests.ps1 @@ -132,7 +132,7 @@ Describe "Cmake" { } } -Describe "erlang" -Skip:((Test-IsUbuntu22) -or (Test-IsUbuntu18)) { +Describe "erlang" -Skip:(Test-IsUbuntu22) { $testCases = @("erl -version", "erlc -v", "rebar3 -v") | ForEach-Object { @{ErlangCommand = $_} } It "erlang <ErlangCommand>" -TestCases $testCases { diff --git a/images/linux/ubuntu1804.json b/images/linux/ubuntu1804.json index 74c4c47dc221..a1001f08c5c5 100644 --- a/images/linux/ubuntu1804.json +++ b/images/linux/ubuntu1804.json @@ -206,6 +206,7 @@ "{{template_dir}}/scripts/installers/codeql-bundle.sh", "{{template_dir}}/scripts/installers/containers.sh", "{{template_dir}}/scripts/installers/dotnetcore-sdk.sh", + "{{template_dir}}/scripts/installers/erlang.sh", "{{template_dir}}/scripts/installers/firefox.sh", "{{template_dir}}/scripts/installers/microsoft-edge.sh", "{{template_dir}}/scripts/installers/gcc.sh", From ed49bcd54387141935c27c3350aafdb5ccfcf747 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Sun, 5 Mar 2023 11:41:43 +0100 Subject: [PATCH 1793/3485] [Windows] pin maven version (#7236) --- images/win/scripts/Installers/Install-JavaTools.ps1 | 8 ++++++-- images/win/toolsets/toolset-2019.json | 3 +++ images/win/toolsets/toolset-2022.json | 3 +++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/images/win/scripts/Installers/Install-JavaTools.ps1 b/images/win/scripts/Installers/Install-JavaTools.ps1 index 50d16c523caf..e884da49876b 100644 --- a/images/win/scripts/Installers/Install-JavaTools.ps1 +++ b/images/win/scripts/Installers/Install-JavaTools.ps1 @@ -106,7 +106,7 @@ $defaultVersion = $toolsetJava.default foreach ($jdkVendor in $jdkVendors) { $jdkVendorName = $jdkVendor.name $jdkVersionsToInstall = $jdkVendor.versions - + $isDefaultVendor = $jdkVendorName -eq $defaultVendor foreach ($jdkVersionToInstall in $jdkVersionsToInstall) { @@ -133,7 +133,11 @@ if (-not (Test-IsWin22)) { # Install Java tools # Force chocolatey to ignore dependencies on Ant and Maven or else they will download the Oracle JDK Choco-Install -PackageName ant -ArgumentList "-i" -Choco-Install -PackageName maven -ArgumentList "-i" +# Maven 3.9.x has multiple compatibilities problems +$toolsetMavenVersion = (Get-ToolsetContent).maven.version +$versionToInstall = Get-LatestChocoPackageVersion -TargetVersion $toolsetMavenVersion -PackageName "maven" + +Choco-Install -PackageName maven -ArgumentList "--version=$versionToInstall" Choco-Install -PackageName gradle # Add maven env variables to Machine diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index a98bb2f360e4..bf9e44a4e955 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -479,6 +479,9 @@ "node": { "default": "18" }, + "maven": { + "version": "3.8" + }, "mysql": { "version": "5.7" }, diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index f804daacb7a2..bfafc88e2360 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -390,6 +390,9 @@ "node": { "default": "18" }, + "maven": { + "version": "3.8" + }, "mysql": { "version": "8.0" }, From 827ad779893bd51e9f5e96f654141adb8e3244aa Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 7 Mar 2023 10:18:19 +0000 Subject: [PATCH 1794/3485] Updating readme file for macOS-12 version 20230224.1 (#7222) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-12-Readme.md | 178 ++++++++++++++++---------------- 1 file changed, 90 insertions(+), 88 deletions(-) diff --git a/images/macos/macos-12-Readme.md b/images/macos/macos-12-Readme.md index 1f71d70ec329..ec17b1780c27 100644 --- a/images/macos/macos-12-Readme.md +++ b/images/macos/macos-12-Readme.md @@ -1,12 +1,12 @@ | Announcements | |-| | [GCC-9 will be removed from macOS 11 on March, 6](https://github.com/actions/runner-images/issues/7136) | -| [Xcode 13.4 will be pointing to 13.4.1 on February, 28](https://github.com/actions/runner-images/issues/7127) | +| [Xcode 13.4 will be pointing to 13.4.1 on February, 27](https://github.com/actions/runner-images/issues/7127) | *** # macOS 12 - OS Version: macOS 12.6.3 (21G419) - Kernel Version: Darwin 21.6.0 -- Image Version: 20230219.1 +- Image Version: 20230224.1 ## Installed Software @@ -24,9 +24,9 @@ - Kotlin 1.8.10-release-430 - Mono 6.12.0.188 - MSBuild 16.10.1.51301 (Mono 6.12.0.188) -- Node.js 18.14.1 +- Node.js 18.14.2 - NVM 0.39.3 -- NVM - Cached node versions: 14.21.3, 16.19.1, 18.14.1 +- NVM - Cached node versions: 14.21.3, 16.19.1, 18.14.2 - Perl 5.36.0 - PHP 8.2.3 - Python 2.7.18 @@ -39,15 +39,15 @@ - Carthage 0.39.0 - CocoaPods 1.11.3 - Composer 2.5.4 -- Homebrew 4.0.1 +- Homebrew 4.0.3 - Miniconda 23.1.0 -- NPM 9.3.1 +- NPM 9.5.0 - NuGet 6.3.1.1 - Pip 20.3.4 (python 2.7) - Pip3 23.0.1 (python 3.11) - Pipx 1.1.0 - RubyGems 3.4.7 -- Vcpkg 2023 (build from commit a32522820) +- Vcpkg 2023 (build from commit 54cc53c43) - Yarn 1.22.19 #### Environment variables @@ -59,7 +59,7 @@ ### Project Management - Apache Ant 1.10.13 - Apache Maven 3.9.0 -- Gradle 8.0 +- Gradle 8.0.1 - Sbt 1.8.2 ### Utilities @@ -69,7 +69,7 @@ - bazel 6.0.0 - bazelisk 1.16.0 - bsdtar 3.5.1 - available by 'tar' alias -- Curl 7.88.0 +- Curl 7.88.1 - Git 2.39.2 - Git LFS 3.3.0 - GitHub CLI 2.23.0 @@ -83,6 +83,7 @@ - mongod 5.0.14 - OpenSSL 1.1.1t 7 Feb 2023 - Packer 1.8.6 +- pkg-config 0.29.2 - PostgreSQL 14.7 (Homebrew) - psql (PostgreSQL) 14.7 (Homebrew) - Sox 14.4.2 @@ -90,24 +91,24 @@ - Switchaudio-osx 1.1.0 - Vagrant 2.3.4 - VirtualBox 6.1.38r153438 -- yq 4.30.8 +- yq 4.31.1 - zstd 1.5.4 ### Tools - App Center CLI 2.13.2 -- AWS CLI 2.10.1 -- AWS SAM CLI 1.73.0 +- AWS CLI 2.10.2 +- AWS SAM CLI 1.74.0 - AWS Session Manager CLI 1.2.398.0 - Azure CLI 2.45.0 - Azure CLI (azure-devops) 0.26.0 -- Bicep CLI 0.14.46 +- Bicep CLI 0.14.85 - Cabal 3.6.2.0 - Cmake 3.25.2 - CodeQL Action Bundles 2.12.1 2.12.2 - Colima 0.5.2 -- Fastlane 2.211.0 +- Fastlane 2.212.0 - GHC 9.4.4 -- GHCup 0.1.19.0 +- GHCup 0.1.19.2 - Jazzy 0.14.3 - Stack 2.9.1 - SwiftFormat 0.50.9 @@ -121,7 +122,7 @@ ### Browsers - Safari 16.3 (17614.4.6.11.6) - SafariDriver 16.3 (17614.4.6.11.6) -- Google Chrome 110.0.5481.100 +- Google Chrome 110.0.5481.177 - ChromeDriver 110.0.5481.77 - Microsoft Edge 110.0.1587.50 - Microsoft Edge WebDriver 110.0.1587.50 @@ -171,12 +172,13 @@ #### Node.js - 14.21.3 - 16.19.1 -- 18.14.1 +- 18.14.2 #### Go - 1.17.13 - 1.18.10 - 1.19.6 +- 1.20.1 ### Rust Tools - Cargo 1.67.1 @@ -210,10 +212,10 @@ ### Xamarin #### Visual Studio for Mac -| Version | Build | Path | -| -------------- | --------- | ------------------------------------ | -| 2019 | 8.10.25.2 | /Applications/Visual Studio 2019.app | -| 2022 (default) | 17.4.5.8 | /Applications/Visual Studio.app | +| Version | Build | Path | +| -------------- | ----------- | ------------------------------------ | +| 2019 | 8.10.25.2 | /Applications/Visual Studio 2019.app | +| 2022 (default) | 17.5.0.1802 | /Applications/Visual Studio.app | ##### Notes ``` @@ -225,6 +227,7 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" #### Xamarin bundles | symlink | Xamarin.Mono | Xamarin.iOS | Xamarin.Mac | Xamarin.Android | | ----------------- | ------------ | ----------- | ----------- | --------------- | +| 6_12_24 | 6.12 | 16.2 | 9.1 | 13.2 | | 6_12_23 | 6.12 | 16.2 | 9.1 | 13.1 | | 6_12_22 | 6.12 | 16.1 | 9.0 | 13.1 | | 6_12_21 (default) | 6.12 | 16.0 | 8.12 | 13.1 | @@ -250,7 +253,6 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" | 14.1 | 14B47b | /Applications/Xcode_14.1.app | | 14.0.1 | 14A400 | /Applications/Xcode_14.0.1.app | | 13.4.1 | 13F100 | /Applications/Xcode_13.4.1.app | -| 13.4 | 13F17a | /Applications/Xcode_13.4.app | | 13.3.1 | 13E500a | /Applications/Xcode_13.3.1.app | | 13.2.1 | 13C100 | /Applications/Xcode_13.2.1.app | | 13.1 | 13A1030d | /Applications/Xcode_13.1.app | @@ -260,73 +262,73 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" - xcversion 2.8.1 #### Installed SDKs -| SDK | SDK Name | Xcode Version | -| ----------------------- | -------------------- | ---------------------------- | -| macOS 12.0 | macosx12.0 | 13.1 | -| macOS 12.1 | macosx12.1 | 13.2.1 | -| macOS 12.3 | macosx12.3 | 13.3.1, 13.4, 13.4.1, 14.0.1 | -| macOS 13.0 | macosx13.0 | 14.1 | -| macOS 13.1 | macosx13.1 | 14.2 | -| iOS 15.0 | iphoneos15.0 | 13.1 | -| iOS 15.2 | iphoneos15.2 | 13.2.1 | -| iOS 15.4 | iphoneos15.4 | 13.3.1 | -| iOS 15.5 | iphoneos15.5 | 13.4, 13.4.1 | -| iOS 16.0 | iphoneos16.0 | 14.0.1 | -| iOS 16.1 | iphoneos16.1 | 14.1 | -| iOS 16.2 | iphoneos16.2 | 14.2 | -| Simulator - iOS 15.0 | iphonesimulator15.0 | 13.1 | -| Simulator - iOS 15.2 | iphonesimulator15.2 | 13.2.1 | -| Simulator - iOS 15.4 | iphonesimulator15.4 | 13.3.1 | -| Simulator - iOS 15.5 | iphonesimulator15.5 | 13.4, 13.4.1 | -| Simulator - iOS 16.0 | iphonesimulator16.0 | 14.0.1 | -| Simulator - iOS 16.1 | iphonesimulator16.1 | 14.1 | -| Simulator - iOS 16.2 | iphonesimulator16.2 | 14.2 | -| tvOS 15.0 | appletvos15.0 | 13.1 | -| tvOS 15.2 | appletvos15.2 | 13.2.1 | -| tvOS 15.4 | appletvos15.4 | 13.3.1, 13.4, 13.4.1 | -| tvOS 16.0 | appletvos16.0 | 14.0.1 | -| tvOS 16.1 | appletvos16.1 | 14.1, 14.2 | -| Simulator - tvOS 15.0 | appletvsimulator15.0 | 13.1 | -| Simulator - tvOS 15.2 | appletvsimulator15.2 | 13.2.1 | -| Simulator - tvOS 15.4 | appletvsimulator15.4 | 13.3.1, 13.4, 13.4.1 | -| Simulator - tvOS 16.0 | appletvsimulator16.0 | 14.0.1 | -| Simulator - tvOS 16.1 | appletvsimulator16.1 | 14.1, 14.2 | -| watchOS 8.0 | watchos8.0 | 13.1 | -| watchOS 8.3 | watchos8.3 | 13.2.1 | -| watchOS 8.5 | watchos8.5 | 13.3.1, 13.4, 13.4.1 | -| watchOS 9.0 | watchos9.0 | 14.0.1 | -| watchOS 9.1 | watchos9.1 | 14.1, 14.2 | -| Simulator - watchOS 8.0 | watchsimulator8.0 | 13.1 | -| Simulator - watchOS 8.3 | watchsimulator8.3 | 13.2.1 | -| Simulator - watchOS 8.5 | watchsimulator8.5 | 13.3.1, 13.4, 13.4.1 | -| Simulator - watchOS 9.0 | watchsimulator9.0 | 14.0.1 | -| Simulator - watchOS 9.1 | watchsimulator9.1 | 14.1, 14.2 | -| DriverKit 21.0.1 | driverkit21.0.1 | 13.1 | -| DriverKit 21.2 | driverkit21.2 | 13.2.1 | -| DriverKit 21.4 | driverkit21.4 | 13.3.1, 13.4, 13.4.1, 14.0.1 | -| DriverKit 22.1 | driverkit22.1 | 14.1 | -| DriverKit 22.2 | driverkit22.2 | 14.2 | +| SDK | SDK Name | Xcode Version | +| ----------------------- | -------------------- | ---------------------- | +| macOS 12.0 | macosx12.0 | 13.1 | +| macOS 12.1 | macosx12.1 | 13.2.1 | +| macOS 12.3 | macosx12.3 | 13.3.1, 13.4.1, 14.0.1 | +| macOS 13.0 | macosx13.0 | 14.1 | +| macOS 13.1 | macosx13.1 | 14.2 | +| iOS 15.0 | iphoneos15.0 | 13.1 | +| iOS 15.2 | iphoneos15.2 | 13.2.1 | +| iOS 15.4 | iphoneos15.4 | 13.3.1 | +| iOS 15.5 | iphoneos15.5 | 13.4.1 | +| iOS 16.0 | iphoneos16.0 | 14.0.1 | +| iOS 16.1 | iphoneos16.1 | 14.1 | +| iOS 16.2 | iphoneos16.2 | 14.2 | +| Simulator - iOS 15.0 | iphonesimulator15.0 | 13.1 | +| Simulator - iOS 15.2 | iphonesimulator15.2 | 13.2.1 | +| Simulator - iOS 15.4 | iphonesimulator15.4 | 13.3.1 | +| Simulator - iOS 15.5 | iphonesimulator15.5 | 13.4.1 | +| Simulator - iOS 16.0 | iphonesimulator16.0 | 14.0.1 | +| Simulator - iOS 16.1 | iphonesimulator16.1 | 14.1 | +| Simulator - iOS 16.2 | iphonesimulator16.2 | 14.2 | +| tvOS 15.0 | appletvos15.0 | 13.1 | +| tvOS 15.2 | appletvos15.2 | 13.2.1 | +| tvOS 15.4 | appletvos15.4 | 13.3.1, 13.4.1 | +| tvOS 16.0 | appletvos16.0 | 14.0.1 | +| tvOS 16.1 | appletvos16.1 | 14.1, 14.2 | +| Simulator - tvOS 15.0 | appletvsimulator15.0 | 13.1 | +| Simulator - tvOS 15.2 | appletvsimulator15.2 | 13.2.1 | +| Simulator - tvOS 15.4 | appletvsimulator15.4 | 13.3.1, 13.4.1 | +| Simulator - tvOS 16.0 | appletvsimulator16.0 | 14.0.1 | +| Simulator - tvOS 16.1 | appletvsimulator16.1 | 14.1, 14.2 | +| watchOS 8.0 | watchos8.0 | 13.1 | +| watchOS 8.3 | watchos8.3 | 13.2.1 | +| watchOS 8.5 | watchos8.5 | 13.3.1, 13.4.1 | +| watchOS 9.0 | watchos9.0 | 14.0.1 | +| watchOS 9.1 | watchos9.1 | 14.1, 14.2 | +| Simulator - watchOS 8.0 | watchsimulator8.0 | 13.1 | +| Simulator - watchOS 8.3 | watchsimulator8.3 | 13.2.1 | +| Simulator - watchOS 8.5 | watchsimulator8.5 | 13.3.1, 13.4.1 | +| Simulator - watchOS 9.0 | watchsimulator9.0 | 14.0.1 | +| Simulator - watchOS 9.1 | watchsimulator9.1 | 14.1, 14.2 | +| DriverKit 21.0.1 | driverkit21.0.1 | 13.1 | +| DriverKit 21.2 | driverkit21.2 | 13.2.1 | +| DriverKit 21.4 | driverkit21.4 | 13.3.1, 13.4.1, 14.0.1 | +| DriverKit 22.1 | driverkit22.1 | 14.1 | +| DriverKit 22.2 | driverkit22.2 | 14.2 | #### Installed Simulators -| OS | Xcode Version | Simulators | -| ----------- | -------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | -| iOS 15.0 | 13.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | -| iOS 15.2 | 13.2.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | -| iOS 15.4 | 13.3.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPhone SE (3rd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | -| iOS 15.5 | 13.4<br>13.4.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPhone SE (3rd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | -| iOS 16.0 | 14.0.1 | iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPhone SE (3rd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | -| iOS 16.1 | 14.1 | iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro (9.7-inch) | -| iOS 16.2 | 14.2 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro (9.7-inch) | -| tvOS 15.0 | 13.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (2nd generation) (at 1080p) | -| tvOS 15.2 | 13.2.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | -| tvOS 15.4 | 13.3.1<br>13.4<br>13.4.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | -| tvOS 16.0 | 13.1<br>13.2.1<br>13.3.1<br>13.4<br>13.4.1<br>14.0.1<br>14.1<br>14.2 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | -| tvOS 16.1 | 13.1<br>13.2.1<br>13.3.1<br>13.4<br>13.4.1<br>14.0.1<br>14.1<br>14.2 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p)<br>Apple TV 4K (at 1080p) (2nd generation) | -| watchOS 8.0 | 13.1 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | -| watchOS 8.3 | 13.2.1 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | -| watchOS 8.5 | 13.3.1<br>13.4<br>13.4.1 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | -| watchOS 9.0 | 13.1<br>13.2.1<br>13.3.1<br>13.4<br>13.4.1<br>14.0.1<br>14.1<br>14.2 | Apple Watch SE - 40mm (2nd generation)<br>Apple Watch SE - 44mm (2nd generation)<br>Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm<br>Apple Watch Series 8 - 41mm<br>Apple Watch Series 8 - 45mm<br>Apple Watch Ultra - 49mm | -| watchOS 9.1 | 13.1<br>13.2.1<br>13.3.1<br>13.4<br>13.4.1<br>14.0.1<br>14.1<br>14.2 | Apple Watch SE - 40mm (2nd generation)<br>Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm<br>Apple Watch Series 8 - 41mm<br>Apple Watch Series 8 - 45mm<br>Apple Watch Ultra - 49mm | +| OS | Xcode Version | Simulators | +| ----------- | ------------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | +| iOS 15.0 | 13.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | +| iOS 15.2 | 13.2.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | +| iOS 15.4 | 13.3.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPhone SE (3rd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | +| iOS 15.5 | 13.4.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPhone SE (3rd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | +| iOS 16.0 | 14.0.1 | iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPhone SE (3rd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | +| iOS 16.1 | 14.1 | iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro (9.7-inch) | +| iOS 16.2 | 14.2 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro (9.7-inch) | +| tvOS 15.0 | 13.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | +| tvOS 15.2 | 13.2.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | +| tvOS 15.4 | 13.3.1<br>13.4.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | +| tvOS 16.0 | 13.1<br>13.2.1<br>13.3.1<br>13.4.1<br>14.0.1<br>14.1<br>14.2 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | +| tvOS 16.1 | 13.1<br>13.2.1<br>13.3.1<br>13.4.1<br>14.0.1<br>14.1<br>14.2 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p)<br>Apple TV 4K (at 1080p) (2nd generation) | +| watchOS 8.0 | 13.1 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | +| watchOS 8.3 | 13.2.1 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | +| watchOS 8.5 | 13.3.1<br>13.4.1 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | +| watchOS 9.0 | 13.1<br>13.2.1<br>13.3.1<br>13.4.1<br>14.0.1<br>14.1<br>14.2 | Apple Watch SE - 40mm (2nd generation)<br>Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm<br>Apple Watch Series 8 - 41mm<br>Apple Watch Series 8 - 45mm<br>Apple Watch Ultra - 49mm | +| watchOS 9.1 | 13.1<br>13.2.1<br>13.3.1<br>13.4.1<br>14.0.1<br>14.1<br>14.2 | Apple Watch SE - 40mm (2nd generation)<br>Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm<br>Apple Watch Series 8 - 41mm<br>Apple Watch Series 8 - 45mm<br>Apple Watch Ultra - 49mm | ### Android | Package Name | Version | @@ -356,7 +358,7 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" ### Miscellaneous - libXext 1.3.5 - libXft 2.3.7 -- Tcl/Tk 8.6.13 +- Tcl/Tk 8.6.13_1 - Zlib 1.2.13 #### Environment variables From c22eb26949bfb73894a6020e0e77886dbe3af52a Mon Sep 17 00:00:00 2001 From: sergei-pyshnoi <121864472+sergei-pyshnoi@users.noreply.github.com> Date: Tue, 7 Mar 2023 18:14:29 +0100 Subject: [PATCH 1795/3485] [windows] fix version for docker-compose v1 (#7247) --- images/win/scripts/Installers/Install-Docker.ps1 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/images/win/scripts/Installers/Install-Docker.ps1 b/images/win/scripts/Installers/Install-Docker.ps1 index ce28bdb6b1ea..ce10c8914397 100644 --- a/images/win/scripts/Installers/Install-Docker.ps1 +++ b/images/win/scripts/Installers/Install-Docker.ps1 @@ -35,7 +35,8 @@ $instScriptPath = Start-DownloadWithRetry -Url $instScriptUrl -Name "install-doc New-Item -ItemType SymbolicLink -Path "C:\Windows\SysWOW64\docker.exe" -Target "C:\Windows\System32\docker.exe" Write-Host "Install-Package Docker-Compose v1" -Choco-Install -PackageName docker-compose +$versionToInstall = Get-LatestChocoPackageVersion -TargetVersion "1.29" -PackageName "docker-compose" +Choco-Install -PackageName docker-compose -ArgumentList "--version=$versionToInstall" Write-Host "Install-Package Docker-Compose v2" $dockerComposev2Url = "https://github.com/docker/compose/releases/latest/download/docker-compose-windows-x86_64.exe" From b253509c8b82cad8ff8fc10d3818f47f0a91f6df Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Wed, 8 Mar 2023 10:53:16 +0100 Subject: [PATCH 1796/3485] Revert "[Ubuntu] hardcode chromium revision for 110.x (#7113)" (#7248) This reverts commit bbac29011e04dff6563dd7f8b44a79fa658ed281. --- images/linux/scripts/installers/google-chrome.sh | 6 ------ 1 file changed, 6 deletions(-) diff --git a/images/linux/scripts/installers/google-chrome.sh b/images/linux/scripts/installers/google-chrome.sh index d541ab005377..5a6ca806b070 100644 --- a/images/linux/scripts/installers/google-chrome.sh +++ b/images/linux/scripts/installers/google-chrome.sh @@ -14,12 +14,6 @@ function GetChromiumRevision { URL="https://omahaproxy.appspot.com/deps.json?version=${CHROME_VERSION}" REVISION=$(curl -s $URL | jq -r '.chromium_base_position') - # both 110.0.5481.100 and 110.0.5481.96 return old incorrect revision - # nothing to compare with, hardcode temporarily. - if [ $REVISION -eq "839" ]; then - REVISION="1084008" - fi - # Some Google Chrome versions are based on Chromium revisions for which a (usually very old) Chromium release with the same number exist. So far this has heppened with 4 digits long Chromium revisions (1060, 1086). # Use the previous Chromium release when this happens to avoid downloading and installing very old Chromium releases that would break image build because of incompatibilities. # First reported with: https://github.com/actions/runner-images/issues/5256 From 229225cab5cc326fcf1ed4be41d115fe2fc1eb50 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 9 Mar 2023 09:15:42 +0000 Subject: [PATCH 1797/3485] Updating readme file for ubuntu22 version 20230305.1 (#7241) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2204-Readme.md | 232 +++++++++++++++--------------- 1 file changed, 116 insertions(+), 116 deletions(-) diff --git a/images/linux/Ubuntu2204-Readme.md b/images/linux/Ubuntu2204-Readme.md index b480710d5866..3df09593c204 100644 --- a/images/linux/Ubuntu2204-Readme.md +++ b/images/linux/Ubuntu2204-Readme.md @@ -4,8 +4,8 @@ *** # Ubuntu 22.04 - OS Version: 22.04.2 LTS -- Kernel Version: 5.15.0-1033-azure -- Image Version: 20230227.2 +- Kernel Version: 5.15.0-1034-azure +- Image Version: 20230305.1 ## Installed Software @@ -39,7 +39,7 @@ - Pip3 22.0.2 - Pipx 1.1.0 - RubyGems 3.3.5 -- Vcpkg (build from commit 5626cee5c) +- Vcpkg (build from commit 8daf70c56) - Yarn 1.22.19 #### Environment variables @@ -74,7 +74,7 @@ to accomplish this. - Docker Compose v2 2.16.0+azure-2 - Docker-Buildx 0.10.3 - Docker-Moby Client 20.10.23+azure-2 -- Docker-Moby Server 20.10.22+azure-1 +- Docker-Moby Server 20.10.23+azure-2 - Fastlane 2.212.1 - Git 2.39.2 - Git LFS 3.3.0 @@ -83,7 +83,7 @@ to accomplish this. - Heroku 7.68.2 - jq 1.6 - Kind 0.17.0 -- Kubectl 1.26.1 +- Kubectl 1.26.2 - Kustomize 5.0.0 - Leiningen 2.10.0 - MediaInfo 21.09 @@ -103,23 +103,23 @@ to accomplish this. - SVN 1.14.1 - Terraform 1.3.9 - yamllint 1.29.0 -- yq 4.31.1 +- yq 4.31.2 - zstd 1.5.4 ### CLI Tools -- Alibaba Cloud CLI 3.0.150 -- AWS CLI 2.10.3 +- Alibaba Cloud CLI 3.0.152 +- AWS CLI 2.11.0 - AWS CLI Session Manager Plugin 1.2.398.0 -- AWS SAM CLI 1.74.0 +- AWS SAM CLI 1.76.0 - Azure CLI 2.45.0 - Azure CLI (azure-devops) 0.26.0 - GitHub CLI 2.23.0 -- Google Cloud SDK 419.0.0 +- Google Cloud SDK 420.0.0 - Hub CLI 2.14.2 -- Netlify CLI 13.0.0 -- OpenShift CLI 4.12.4 +- Netlify CLI 13.0.1 +- OpenShift CLI 4.12.5 - ORAS CLI 0.16.0 -- Vercel CLI 28.16.7 +- Vercel CLI 28.16.12 ### Java | Version | Vendor | Environment Variable | @@ -165,10 +165,10 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Google Chrome 110.0.5481.177 - ChromeDriver 110.0.5481.77 - Chromium 110.0.5481.0 -- Microsoft Edge 110.0.1587.57 -- Microsoft Edge WebDriver 110.0.1587.57 +- Microsoft Edge 110.0.1587.63 +- Microsoft Edge WebDriver 110.0.1587.63 - Selenium server 4.8.0 -- Mozilla Firefox 110.0 +- Mozilla Firefox 110.0.1 - Geckodriver 0.32.2 #### Environment variables @@ -241,7 +241,7 @@ Use the following command as a part of your job to start the service: 'sudo syst #### PowerShell Modules - Az: 9.3.0 - MarkdownPS: 1.9 -- Microsoft.Graph: 1.22.0 +- Microsoft.Graph: 1.23.0 - Pester: 5.4.0 - PSScriptAnalyzer: 1.21.0 @@ -283,106 +283,106 @@ Use the following command as a part of your job to start the service: 'sudo syst | alpine:3.14 | sha256:560e7a4fa5c891d1830f5591c80b8e472fa6cd386b7254cdf65ccc3249292a34 | 2023-02-11 | | alpine:3.15 | sha256:689659b1f08e9fdfb85190144098c378beb5a53b328f7ced7883a74a1157c709 | 2023-02-11 | | alpine:3.16 | sha256:1bd67c81e4ad4b8f4a5c1c914d7985336f130e5cefb3e323654fd09d6bcdbbe2 | 2023-02-11 | -| buildpack-deps:bullseye | sha256:40b14eb195795a586ac132c9b506253bc3e4ee7f48a63b685e5bf37e80b774cf | 2023-02-09 | -| buildpack-deps:buster | sha256:a3e4aaa53bf83302adfb9d8b9ba3996948e4605baac297921d3a173c14603748 | 2023-02-09 | -| debian:10 | sha256:233c3bbc892229c82da7231980d50adceba4db56a08c0b7053a4852782703459 | 2023-02-09 | -| debian:11 | sha256:43ef0c6c3585d5b406caa7a0f232ff5a19c1402aeb415f68bcd1cf9d10180af8 | 2023-02-09 | +| buildpack-deps:bullseye | sha256:6f2703639d3d17f70288d4ba212d55e159b682a990c20fc2a6562b098f01a1e7 | 2023-03-01 | +| buildpack-deps:buster | sha256:63be0fe0bfb9d06b8747dcd87683787ef6d82c6f05b8a2ae213c38d56dc2bf53 | 2023-03-01 | +| debian:10 | sha256:2d356e1e22c0902f88ef65cb7159ecd5a96feb62345747edfd4324b0d83a2923 | 2023-03-01 | +| debian:11 | sha256:f81bf5a8b57d6aa1824e4edb9aea6bd5ef6240bcc7d86f303f197a2eb77c430f | 2023-03-01 | | moby/buildkit:latest | sha256:751921dc37d2f842de38c9387f891fe6ae7d80f03d050ea98f780d7e0874ba00 | 2023-02-13 | -| node:14 | sha256:1b5300317e95ed8bb2a1c25003f57e52400ce7af1e2e1efd9f52407293f88317 | 2023-02-17 | -| node:14-alpine | sha256:86c59eb57b10df3d55e460b28799f60121f950ad018ff0989ea01ab61a1d9ab2 | 2023-02-17 | -| node:16 | sha256:a4baed9809deba446900d6e2bc6b92c3fe6ccff9ca2873f8d54e263595b02533 | 2023-02-17 | -| node:16-alpine | sha256:029a85552a270cd6dfae0ec222465f1deacfaf7cee030981b7ff6acd6a0eaf33 | 2023-02-21 | -| node:18 | sha256:586cdef48f920dea2f47a954b8717601933aa1daa0a08264abf9144789abf8ae | 2023-02-22 | -| node:18-alpine | sha256:0d2712ac2b2c1149391173de670406f6e3dbdb1b2ba44e8530647e623e0e1b17 | 2023-02-22 | -| ubuntu:18.04 | sha256:a3765b4d74747b5e9bdd03205b3fbc4fa19a02781c185f97f24c8f4f84ed7bbf | 2023-01-26 | -| ubuntu:20.04 | sha256:4a45212e9518f35983a976eead0de5eecc555a2f047134e9dd2cfc589076a00d | 2023-02-01 | -| ubuntu:22.04 | sha256:9a0bdde4188b896a372804be2384015e90e3f84906b750c1a53539b585fbbe7f | 2023-01-26 | +| node:14 | sha256:481a78885f7a83f86fcb3ac48dab9bede651851d1b250650c17645a988902728 | 2023-03-01 | +| node:14-alpine | sha256:49d052af1616dbf5f2bd8b71fca9a4b7c688955e72bbe3e0126c4b28d7675577 | 2023-02-17 | +| node:16 | sha256:8ef06c513538040a988ac7731afa8ad8b1135cfe5d8b6ad78489d80c6f6c0137 | 2023-03-01 | +| node:16-alpine | sha256:95a849eafc573ad0d972fd67c569369e7aa94d55a21ede3b972e3137e5f8e43a | 2023-02-21 | +| node:18 | sha256:8b2c008211854f4ee9ca328910d1c6bff8f30fc9fdf834b48f7ea40992a2079a | 2023-03-01 | +| node:18-alpine | sha256:f8a51c36b0be7434bbf867d4a08decf0100e656203d893b9b0f8b1fe9e40daea | 2023-02-22 | +| ubuntu:18.04 | sha256:1e32b9c52e8f22769df41e8f61066c77b2b35b0a423c4161c0e48eca2fd24f75 | 2023-03-01 | +| ubuntu:20.04 | sha256:9fa30fcef427e5e88c76bc41ad37b7cc573e1d79cecb23035e413c4be6e476ab | 2023-03-01 | +| ubuntu:22.04 | sha256:2adf22367284330af9f832ffefb717c78239f6251d9d0f58de50b86229ed1427 | 2023-03-01 | ### Installed apt packages -| Name | Version | -| ---------------------- | --------------------------------- | -| acl | 2.3.1-1 | -| aria2 | 1.36.0-1 | -| autoconf | 2.71-2 | -| automake | 1:1.16.5-1.3 | -| binutils | 2.38-4ubuntu2.1 | -| bison | 2:3.8.2+dfsg-1build1 | -| brotli | 1.0.9-2build6 | -| build-essential | 12.9ubuntu3 | -| bzip2 | 1.0.8-5build1 | -| coreutils | 8.32-4.1ubuntu1 | -| curl | 7.81.0-1ubuntu1.8 | -| dbus | 1.12.20-2ubuntu4.1 | -| dnsutils | 1:9.18.1-1ubuntu1.3 | -| dpkg | 1.21.1ubuntu2.1 | -| fakeroot | 1.28-1ubuntu1 | -| file | 1:5.41-3 | -| flex | 2.6.4-8build2 | -| fonts-noto-color-emoji | 2.038-0ubuntu1 | -| ftp | 20210827-4build1 | -| gnupg2 | 2.2.27-3ubuntu2.1 | -| haveged | 1.9.14-1ubuntu1 | -| imagemagick | 8:6.9.11.60+dfsg-1.3build2 | -| iproute2 | 5.15.0-1ubuntu2 | -| iputils-ping | 3:20211215-1 | -| jq | 1.6-2.1ubuntu3 | -| lib32z1 | 1:1.2.11.dfsg-2ubuntu9.2 | -| libc++-dev | 1:14.0-55\~exp2 | -| libc++abi-dev | 1:14.0-55\~exp2 | -| libcurl4 | 7.81.0-1ubuntu1.8 | -| libgbm-dev | 22.2.5-0ubuntu0.1\~22.04.1 | -| libgconf-2-4 | 3.2.6-7ubuntu2 | -| libgsl-dev | 2.7.1+dfsg-3 | -| libgtk-3-0 | 3.24.33-1ubuntu2 | -| libmagic-dev | 1:5.41-3 | -| libmagickcore-dev | 8:6.9.11.60+dfsg-1.3build2 | -| libmagickwand-dev | 8:6.9.11.60+dfsg-1.3build2 | -| libsecret-1-dev | 0.20.5-2 | -| libsqlite3-dev | 3.37.2-2ubuntu0.1 | -| libssl-dev | 3.0.2-0ubuntu1.8 | -| libtool | 2.4.6-15build2 | -| libunwind8 | 1.3.2-2build2 | -| libxkbfile-dev | 1:1.1.0-1build3 | -| libxss1 | 1:1.2.3-1build2 | -| libyaml-dev | 0.2.2-1build2 | -| locales | 2.35-0ubuntu3.1 | -| lz4 | 1.9.3-2build2 | -| m4 | 1.4.18-5ubuntu2 | -| mediainfo | 22.03-1 | -| mercurial | 6.1.1-1ubuntu1 | -| net-tools | 1.60+git20181103.0eebece-1ubuntu5 | -| netcat | 1.218-4ubuntu1 | -| openssh-client | 1:8.9p1-3ubuntu0.1 | -| p7zip-full | 16.02+dfsg-8 | -| p7zip-rar | 16.02-3build1 | -| parallel | 20210822+ds-2 | -| pass | 1.7.4-5 | -| patchelf | 0.14.3-1 | -| pkg-config | 0.29.2-1ubuntu3 | -| pollinate | 4.33-3ubuntu2 | -| python-is-python3 | 3.9.2-2 | -| rpm | 4.17.0+dfsg1-4build1 | -| rsync | 3.2.3-8ubuntu3.1 | -| shellcheck | 0.8.0-2 | -| sphinxsearch | 2.2.11-8 | -| sqlite3 | 3.37.2-2ubuntu0.1 | -| ssh | 1:8.9p1-3ubuntu0.1 | -| sshpass | 1.09-1 | -| subversion | 1.14.1-3ubuntu0.22.04.1 | -| sudo | 1.9.9-1ubuntu2.2 | -| swig | 4.0.2-1ubuntu1 | -| tar | 1.34+dfsg-1build3 | -| telnet | 0.17-44build1 | -| texinfo | 6.8-4build1 | -| time | 1.9-0.1build2 | -| tk | 8.6.11+1build2 | -| tzdata | 2022g-0ubuntu0.22.04.1 | -| unzip | 6.0-26ubuntu3.1 | -| upx | 3.96-3 | -| wget | 1.21.2-2ubuntu1 | -| xorriso | 1.5.4-2 | -| xvfb | 2:21.1.3-2ubuntu2.7 | -| xz-utils | 5.2.5-2ubuntu1 | -| zip | 3.0-12build2 | -| zsync | 0.6.2-3ubuntu1 | +| Name | Version | +| ---------------------- | ----------------------------------- | +| acl | 2.3.1-1 | +| aria2 | 1.36.0-1 | +| autoconf | 2.71-2 | +| automake | 1:1.16.5-1.3 | +| binutils | 2.38-4ubuntu2.1 | +| bison | 2:3.8.2+dfsg-1build1 | +| brotli | 1.0.9-2build6 | +| build-essential | 12.9ubuntu3 | +| bzip2 | 1.0.8-5build1 | +| coreutils | 8.32-4.1ubuntu1 | +| curl | 7.81.0-1ubuntu1.8 | +| dbus | 1.12.20-2ubuntu4.1 | +| dnsutils | 1:9.18.1-1ubuntu1.3 | +| dpkg | 1.21.1ubuntu2.1 | +| fakeroot | 1.28-1ubuntu1 | +| file | 1:5.41-3 | +| flex | 2.6.4-8build2 | +| fonts-noto-color-emoji | 2.038-0ubuntu1 | +| ftp | 20210827-4build1 | +| gnupg2 | 2.2.27-3ubuntu2.1 | +| haveged | 1.9.14-1ubuntu1 | +| imagemagick | 8:6.9.11.60+dfsg-1.3ubuntu0.22.04.1 | +| iproute2 | 5.15.0-1ubuntu2 | +| iputils-ping | 3:20211215-1 | +| jq | 1.6-2.1ubuntu3 | +| lib32z1 | 1:1.2.11.dfsg-2ubuntu9.2 | +| libc++-dev | 1:14.0-55\~exp2 | +| libc++abi-dev | 1:14.0-55\~exp2 | +| libcurl4 | 7.81.0-1ubuntu1.8 | +| libgbm-dev | 22.2.5-0ubuntu0.1\~22.04.1 | +| libgconf-2-4 | 3.2.6-7ubuntu2 | +| libgsl-dev | 2.7.1+dfsg-3 | +| libgtk-3-0 | 3.24.33-1ubuntu2 | +| libmagic-dev | 1:5.41-3 | +| libmagickcore-dev | 8:6.9.11.60+dfsg-1.3ubuntu0.22.04.1 | +| libmagickwand-dev | 8:6.9.11.60+dfsg-1.3ubuntu0.22.04.1 | +| libsecret-1-dev | 0.20.5-2 | +| libsqlite3-dev | 3.37.2-2ubuntu0.1 | +| libssl-dev | 3.0.2-0ubuntu1.8 | +| libtool | 2.4.6-15build2 | +| libunwind8 | 1.3.2-2build2 | +| libxkbfile-dev | 1:1.1.0-1build3 | +| libxss1 | 1:1.2.3-1build2 | +| libyaml-dev | 0.2.2-1build2 | +| locales | 2.35-0ubuntu3.1 | +| lz4 | 1.9.3-2build2 | +| m4 | 1.4.18-5ubuntu2 | +| mediainfo | 22.03-1 | +| mercurial | 6.1.1-1ubuntu1 | +| net-tools | 1.60+git20181103.0eebece-1ubuntu5 | +| netcat | 1.218-4ubuntu1 | +| openssh-client | 1:8.9p1-3ubuntu0.1 | +| p7zip-full | 16.02+dfsg-8 | +| p7zip-rar | 16.02-3build1 | +| parallel | 20210822+ds-2 | +| pass | 1.7.4-5 | +| patchelf | 0.14.3-1 | +| pkg-config | 0.29.2-1ubuntu3 | +| pollinate | 4.33-3ubuntu2 | +| python-is-python3 | 3.9.2-2 | +| rpm | 4.17.0+dfsg1-4build1 | +| rsync | 3.2.3-8ubuntu3.1 | +| shellcheck | 0.8.0-2 | +| sphinxsearch | 2.2.11-8 | +| sqlite3 | 3.37.2-2ubuntu0.1 | +| ssh | 1:8.9p1-3ubuntu0.1 | +| sshpass | 1.09-1 | +| subversion | 1.14.1-3ubuntu0.22.04.1 | +| sudo | 1.9.9-1ubuntu2.3 | +| swig | 4.0.2-1ubuntu1 | +| tar | 1.34+dfsg-1ubuntu0.1.22.04.1 | +| telnet | 0.17-44build1 | +| texinfo | 6.8-4build1 | +| time | 1.9-0.1build2 | +| tk | 8.6.11+1build2 | +| tzdata | 2022g-0ubuntu0.22.04.1 | +| unzip | 6.0-26ubuntu3.1 | +| upx | 3.96-3 | +| wget | 1.21.2-2ubuntu1 | +| xorriso | 1.5.4-2 | +| xvfb | 2:21.1.3-2ubuntu2.7 | +| xz-utils | 5.2.5-2ubuntu1 | +| zip | 3.0-12build2 | +| zsync | 0.6.2-3ubuntu1 | From 3d67023c9cf16bae7d6fb55c0b53f667a3989ae4 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 9 Mar 2023 09:17:40 +0000 Subject: [PATCH 1798/3485] Updating readme file for ubuntu20 version 20230305.1 (#7240) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2004-Readme.md | 82 +++++++++++++++---------------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/images/linux/Ubuntu2004-Readme.md b/images/linux/Ubuntu2004-Readme.md index 17e80ecd42eb..bfc3838c53b0 100644 --- a/images/linux/Ubuntu2004-Readme.md +++ b/images/linux/Ubuntu2004-Readme.md @@ -4,8 +4,8 @@ *** # Ubuntu 20.04 - OS Version: 20.04.5 LTS -- Kernel Version: 5.15.0-1033-azure -- Image Version: 20230224.2 +- Kernel Version: 5.15.0-1034-azure +- Image Version: 20230305.1 ## Installed Software @@ -33,7 +33,7 @@ ### Package Management - cpan 1.64 - Helm 3.11.1 -- Homebrew 4.0.3 +- Homebrew 4.0.4 - Miniconda 23.1.0 - Npm 9.5.0 - NuGet 6.3.1.1 @@ -41,7 +41,7 @@ - Pip3 20.0.2 - Pipx 1.1.0 - RubyGems 3.1.2 -- Vcpkg (build from commit a7b6122f6) +- Vcpkg (build from commit 8daf70c56) - Yarn 1.22.19 #### Environment variables @@ -60,13 +60,13 @@ to accomplish this. ### Project Management - Ant 1.10.7 -- Gradle 8.0.1 +- Gradle 8.0.2 - Lerna 6.5.1 -- Maven 3.9.0 +- Maven 3.8.7 - Sbt 1.8.2 ### Tools -- Ansible 2.13.7 +- Ansible 2.13.8 - apt-fast 1.9.12 - AzCopy 10.17.0 - available by `azcopy` and `azcopy10` aliases - Bazel 6.0.0 @@ -80,7 +80,7 @@ to accomplish this. - Docker Compose v2 2.16.0+azure-2 - Docker-Buildx 0.10.3 - Docker-Moby Client 20.10.23+azure-2 -- Docker-Moby Server 20.10.22+azure-1 +- Docker-Moby Server 20.10.23+azure-2 - Fastlane 2.212.1 - Git 2.39.2 - Git LFS 3.3.0 @@ -90,7 +90,7 @@ to accomplish this. - HHVM (HipHop VM) 4.172.1 - jq 1.6 - Kind 0.17.0 -- Kubectl 1.26.1 +- Kubectl 1.26.2 - Kustomize 5.0.0 - Leiningen 2.10.0 - MediaInfo 19.09 @@ -111,23 +111,23 @@ to accomplish this. - SVN 1.13.0 - Terraform 1.3.9 - yamllint 1.29.0 -- yq 4.31.1 +- yq 4.31.2 - zstd 1.5.4 ### CLI Tools -- Alibaba Cloud CLI 3.0.150 -- AWS CLI 2.10.3 +- Alibaba Cloud CLI 3.0.152 +- AWS CLI 2.11.0 - AWS CLI Session Manager Plugin 1.2.398.0 -- AWS SAM CLI 1.74.0 +- AWS SAM CLI 1.76.0 - Azure CLI 2.45.0 - Azure CLI (azure-devops) 0.26.0 - GitHub CLI 2.23.0 -- Google Cloud SDK 419.0.0 +- Google Cloud SDK 420.0.0 - Hub CLI 2.14.2 -- Netlify CLI 13.0.0 -- OpenShift CLI 4.12.4 +- Netlify CLI 13.0.1 +- OpenShift CLI 4.12.5 - ORAS CLI 0.16.0 -- Vercel CLI 28.16.7 +- Vercel CLI 28.16.12 ### Java | Version | Vendor | Environment Variable | @@ -144,7 +144,7 @@ to accomplish this. ### PHP Tools - PHP: 7.4.33, 8.0.28, 8.1.16, 8.2.3 - Composer 2.5.4 -- PHPUnit 8.5.32 +- PHPUnit 8.5.33 ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ``` @@ -173,10 +173,10 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Google Chrome 110.0.5481.177 - ChromeDriver 110.0.5481.77 - Chromium 110.0.5481.0 -- Microsoft Edge 110.0.1587.50 -- Microsoft Edge WebDriver 110.0.1587.50 +- Microsoft Edge 110.0.1587.63 +- Microsoft Edge WebDriver 110.0.1587.63 - Selenium server 4.8.0 -- Mozilla Firefox 110.0 +- Mozilla Firefox 110.0.1 - Geckodriver 0.32.2 #### Environment variables @@ -188,7 +188,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | ### .NET Tools -- .NET Core SDK: 3.1.120, 3.1.202, 3.1.302, 3.1.426, 6.0.406, 7.0.103, 7.0.200 +- .NET Core SDK: 3.1.120, 3.1.202, 3.1.302, 3.1.426, 6.0.406, 7.0.103, 7.0.201 - nbgv 3.5.119+5d25f54fec ### Databases @@ -259,7 +259,7 @@ Use the following command as a part of your job to start the service: 'sudo syst - Az: 9.3.0 - Az (Cached): 3.1.0.zip, 4.4.0.zip, 5.9.0.zip, 6.6.0.zip, 7.5.0.zip - MarkdownPS: 1.9 -- Microsoft.Graph: 1.22.0 +- Microsoft.Graph: 1.23.0 - Pester: 5.4.0 - PSScriptAnalyzer: 1.21.0 @@ -302,22 +302,22 @@ Use the following command as a part of your job to start the service: 'sudo syst | alpine:3.14 | sha256:560e7a4fa5c891d1830f5591c80b8e472fa6cd386b7254cdf65ccc3249292a34 | 2023-02-11 | | alpine:3.15 | sha256:689659b1f08e9fdfb85190144098c378beb5a53b328f7ced7883a74a1157c709 | 2023-02-11 | | alpine:3.16 | sha256:1bd67c81e4ad4b8f4a5c1c914d7985336f130e5cefb3e323654fd09d6bcdbbe2 | 2023-02-11 | -| buildpack-deps:bullseye | sha256:40b14eb195795a586ac132c9b506253bc3e4ee7f48a63b685e5bf37e80b774cf | 2023-02-09 | -| buildpack-deps:buster | sha256:a3e4aaa53bf83302adfb9d8b9ba3996948e4605baac297921d3a173c14603748 | 2023-02-09 | +| buildpack-deps:bullseye | sha256:6f2703639d3d17f70288d4ba212d55e159b682a990c20fc2a6562b098f01a1e7 | 2023-03-01 | +| buildpack-deps:buster | sha256:63be0fe0bfb9d06b8747dcd87683787ef6d82c6f05b8a2ae213c38d56dc2bf53 | 2023-03-01 | | buildpack-deps:stretch | sha256:78e995165a5788c2f55aed6e548d8f6c1534830d4310c870408fccb2da8c5b2e | 2022-06-23 | -| debian:10 | sha256:233c3bbc892229c82da7231980d50adceba4db56a08c0b7053a4852782703459 | 2023-02-09 | -| debian:11 | sha256:43ef0c6c3585d5b406caa7a0f232ff5a19c1402aeb415f68bcd1cf9d10180af8 | 2023-02-09 | +| debian:10 | sha256:2d356e1e22c0902f88ef65cb7159ecd5a96feb62345747edfd4324b0d83a2923 | 2023-03-01 | +| debian:11 | sha256:f81bf5a8b57d6aa1824e4edb9aea6bd5ef6240bcc7d86f303f197a2eb77c430f | 2023-03-01 | | debian:9 | sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be | 2022-06-23 | | moby/buildkit:latest | sha256:751921dc37d2f842de38c9387f891fe6ae7d80f03d050ea98f780d7e0874ba00 | 2023-02-13 | -| node:14 | sha256:1b5300317e95ed8bb2a1c25003f57e52400ce7af1e2e1efd9f52407293f88317 | 2023-02-17 | -| node:14-alpine | sha256:86c59eb57b10df3d55e460b28799f60121f950ad018ff0989ea01ab61a1d9ab2 | 2023-02-17 | -| node:16 | sha256:a4baed9809deba446900d6e2bc6b92c3fe6ccff9ca2873f8d54e263595b02533 | 2023-02-17 | -| node:16-alpine | sha256:029a85552a270cd6dfae0ec222465f1deacfaf7cee030981b7ff6acd6a0eaf33 | 2023-02-21 | -| node:18 | sha256:586cdef48f920dea2f47a954b8717601933aa1daa0a08264abf9144789abf8ae | 2023-02-22 | -| node:18-alpine | sha256:0d2712ac2b2c1149391173de670406f6e3dbdb1b2ba44e8530647e623e0e1b17 | 2023-02-22 | +| node:14 | sha256:481a78885f7a83f86fcb3ac48dab9bede651851d1b250650c17645a988902728 | 2023-03-01 | +| node:14-alpine | sha256:49d052af1616dbf5f2bd8b71fca9a4b7c688955e72bbe3e0126c4b28d7675577 | 2023-02-17 | +| node:16 | sha256:8ef06c513538040a988ac7731afa8ad8b1135cfe5d8b6ad78489d80c6f6c0137 | 2023-03-01 | +| node:16-alpine | sha256:95a849eafc573ad0d972fd67c569369e7aa94d55a21ede3b972e3137e5f8e43a | 2023-02-21 | +| node:18 | sha256:8b2c008211854f4ee9ca328910d1c6bff8f30fc9fdf834b48f7ea40992a2079a | 2023-03-01 | +| node:18-alpine | sha256:f8a51c36b0be7434bbf867d4a08decf0100e656203d893b9b0f8b1fe9e40daea | 2023-02-22 | | ubuntu:16.04 | sha256:1f1a2d56de1d604801a9671f301190704c25d604a416f59e03c04f5c6ffee0d6 | 2021-08-31 | -| ubuntu:18.04 | sha256:a3765b4d74747b5e9bdd03205b3fbc4fa19a02781c185f97f24c8f4f84ed7bbf | 2023-01-26 | -| ubuntu:20.04 | sha256:4a45212e9518f35983a976eead0de5eecc555a2f047134e9dd2cfc589076a00d | 2023-02-01 | +| ubuntu:18.04 | sha256:1e32b9c52e8f22769df41e8f61066c77b2b35b0a423c4161c0e48eca2fd24f75 | 2023-03-01 | +| ubuntu:20.04 | sha256:9fa30fcef427e5e88c76bc41ad37b7cc573e1d79cecb23035e413c4be6e476ab | 2023-03-01 | ### Installed apt packages | Name | Version | @@ -332,7 +332,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | build-essential | 12.8ubuntu1.1 | | bzip2 | 1.0.8-2 | | coreutils | 8.30-3ubuntu2 | -| curl | 7.68.0-1ubuntu2.15 | +| curl | 7.68.0-1ubuntu2.16 | | dbus | 1.12.16-2ubuntu2.3 | | dnsutils | 1:9.16.1-0ubuntu2.12 | | dpkg | 1.19.7ubuntu3.2 | @@ -343,21 +343,21 @@ Use the following command as a part of your job to start the service: 'sudo syst | ftp | 0.17-34.1 | | gnupg2 | 2.2.19-3ubuntu2.2 | | haveged | 1.9.1-6ubuntu1 | -| imagemagick | 8:6.9.10.23+dfsg-2.1ubuntu11.4 | +| imagemagick | 8:6.9.10.23+dfsg-2.1ubuntu11.5 | | iproute2 | 5.5.0-1ubuntu1 | | iputils-ping | 3:20190709-3 | | jq | 1.6-1ubuntu0.20.04.1 | | lib32z1 | 1:1.2.11.dfsg-2ubuntu1.5 | | libc++-dev | 1:10.0-50\~exp1 | | libc++abi-dev | 1:10.0-50\~exp1 | -| libcurl4 | 7.68.0-1ubuntu2.15 | +| libcurl4 | 7.68.0-1ubuntu2.16 | | libgbm-dev | 21.2.6-0ubuntu0.1\~20.04.2 | | libgconf-2-4 | 3.2.6-6ubuntu1 | | libgsl-dev | 2.5+dfsg-6build1 | | libgtk-3-0 | 3.24.20-0ubuntu1.1 | | libmagic-dev | 1:5.38-4 | -| libmagickcore-dev | 8:6.9.10.23+dfsg-2.1ubuntu11.4 | -| libmagickwand-dev | 8:6.9.10.23+dfsg-2.1ubuntu11.4 | +| libmagickcore-dev | 8:6.9.10.23+dfsg-2.1ubuntu11.5 | +| libmagickwand-dev | 8:6.9.10.23+dfsg-2.1ubuntu11.5 | | libsecret-1-dev | 0.20.4-0ubuntu1 | | libsqlite3-dev | 3.31.1-4ubuntu0.5 | | libtool | 2.4.6-14 | @@ -390,7 +390,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | subversion | 1.13.0-3ubuntu0.2 | | sudo | 1.8.31-1ubuntu1.4 | | swig | 4.0.1-5build1 | -| tar | 1.30+dfsg-7ubuntu0.20.04.2 | +| tar | 1.30+dfsg-7ubuntu0.20.04.3 | | telnet | 0.17-41.2build1 | | texinfo | 6.7.0.dfsg.2-5 | | time | 1.7-25.1build1 | From 6704e26553d7166671026dc979390395961bbb2f Mon Sep 17 00:00:00 2001 From: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com> Date: Fri, 10 Mar 2023 11:54:48 +0100 Subject: [PATCH 1799/3485] [macos] remove gcc9 from MacOS-11 (#7257) Co-authored-by: Ilia Shipitsin <ilia-shipitsin@github.com> --- images/macos/toolsets/toolset-11.json | 1 - 1 file changed, 1 deletion(-) diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index 797c55116f31..f8463e01cea3 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -234,7 +234,6 @@ }, "gcc": { "versions": [ - "9", "10", "11", "12" From 2e2fb133890aeb7f2999b36a37ad221d50f15ece Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Fri, 10 Mar 2023 14:03:57 +0100 Subject: [PATCH 1800/3485] [Ubuntu] print maven version on Ubuntu 22.04 (#7265) --- .../linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index ac7c8daa6356..5c48fa0c85f5 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -88,8 +88,8 @@ if ((Test-IsUbuntu18) -or (Test-IsUbuntu20)) { if ((Test-IsUbuntu20) -or (Test-IsUbuntu22)) { $projectManagement.AddToolVersion("Lerna", $(Get-LernaVersion)) } +$projectManagement.AddToolVersion("Maven", $(Get-MavenVersion)) if ((Test-IsUbuntu18) -or (Test-IsUbuntu20)) { - $projectManagement.AddToolVersion("Maven", $(Get-MavenVersion)) $projectManagement.AddToolVersion("Sbt", $(Get-SbtVersion)) } From b4bcfd8fa56e7daa889b9a8e3cd2658b2f3bcc85 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 11 Mar 2023 15:42:19 +0100 Subject: [PATCH 1801/3485] Updating readme file for win19 version 20230307.2 (#7255) Co-authored-by: Image generation service account <no-reply@microsoft.com> --- images/win/Windows2019-Readme.md | 36 ++++++++++++++++---------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index 7f205b9a18ac..73029b6e5302 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -1,6 +1,6 @@ # Windows Server 2019 - OS Version: 10.0.17763 Build 4010 -- Image Version: 20230226.1 +- Image Version: 20230307.2 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -25,11 +25,11 @@ - Helm 3.11.1 - Miniconda 23.1.0 (pre-installed on the image but not added to PATH) - NPM 9.5.0 -- NuGet 6.4.0.123 +- NuGet 6.5.0.154 - pip 23.0.1 (python 3.7) - Pipx 1.1.0 - RubyGems 2.7.6.3 -- Vcpkg (build from commit 223d33be7) +- Vcpkg (build from commit e69c9817d) - Yarn 1.22.19 #### Environment variables @@ -41,14 +41,14 @@ ### Project Management - Ant 1.10.13 - Gradle 7.6 -- Maven 3.9.0 +- Maven 3.8.7 - sbt 1.8.2 ### Tools - 7zip 22.01 - aria2 1.36.0 - azcopy 10.17.0 -- Bazel 6.0.0 +- Bazel 6.1.0 - Bazelisk 1.13.2 - Bicep 0.14.85 - Cabal 3.8.1.0 @@ -61,12 +61,12 @@ - ghc 9.4.4 - Git 2.39.2.windows.1 - Git LFS 3.3.0 -- Google Cloud SDK 419.0.0 +- Google Cloud SDK 421.0.0 - ImageMagick 7.1.0-61 - InnoSetup 6.2.2 - jq 1.6 - Kind 0.17.0 -- Kubectl 1.26.1 +- Kubectl 1.26.2 - Mercurial 5.0 - Mingw-w64 8.1.0 - Newman 5.3.2 @@ -74,7 +74,7 @@ - OpenSSL 1.1.1 - Packer 1.8.5 - Parcel 2.8.3 -- Pulumi 3.55.0 +- Pulumi 3.56.0 - R 4.2.2 - Service Fabric SDK 9.1.1436.9590 - Stack 2.9.3 @@ -87,11 +87,11 @@ - zstd 1.5.4 ### CLI Tools -- Alibaba Cloud CLI 3.0.150 -- AWS CLI 2.10.3 -- AWS SAM CLI 1.74.0 +- Alibaba Cloud CLI 3.0.152 +- AWS CLI 2.11.0 +- AWS SAM CLI 1.76.0 - AWS Session Manager CLI 1.2.398.0 -- Azure CLI 2.45.0 +- Azure CLI 2.46.0 - Azure DevOps CLI extension 0.26.0 - Cloud Foundry CLI 6.53.0 - GitHub CLI 2.23.0 @@ -114,9 +114,9 @@ ### Browsers and Drivers - Google Chrome 110.0.5481.178 - Chrome Driver 110.0.5481.77 -- Microsoft Edge 110.0.1587.57 -- Microsoft Edge Driver 110.0.1587.57 -- Mozilla Firefox 110.0 +- Microsoft Edge 110.0.1587.63 +- Microsoft Edge Driver 110.0.1587.63 +- Mozilla Firefox 110.0.1 - Gecko Driver 0.32.2 - IE Driver 4.8.0.0 - Selenium server 4.8.0 @@ -145,7 +145,7 @@ | wslbash.exe | C:\Windows\System32\bash.exe | ### MSYS2 -- Pacman 6.0.1 +- Pacman 6.0.2 #### Notes ``` @@ -509,10 +509,10 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Az (Cached): 1.0.0.zip, 1.6.0.zip, 2.3.2.zip, 2.6.0.zip, 3.1.0.zip, 3.5.0.zip, 3.8.0.zip, 4.3.0.zip, 4.4.0.zip, 4.7.0.zip, 5.5.0.zip, 5.9.0.zip, 6.6.0.zip, 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.279 +- AWSPowershell: 4.1.285 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 -- Microsoft.Graph: 1.22.0 +- Microsoft.Graph: 1.23.0 - Pester: 3.4.0, 5.4.0 - PowerShellGet: 1.0.0.1, 2.2.5 - PSScriptAnalyzer: 1.21.0 From 1822632ce60ea5238445194474ed5e535322ecf2 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 11 Mar 2023 15:42:45 +0100 Subject: [PATCH 1802/3485] Updating readme file for win22 version 20230307.2 (#7254) Co-authored-by: Image generation service account <no-reply@microsoft.com> --- images/win/Windows2022-Readme.md | 44 ++++++++++++++++---------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/images/win/Windows2022-Readme.md b/images/win/Windows2022-Readme.md index 01ec948e2859..3e01042348ee 100644 --- a/images/win/Windows2022-Readme.md +++ b/images/win/Windows2022-Readme.md @@ -1,6 +1,6 @@ # Windows Server 2022 - OS Version: 10.0.20348 Build 1547 -- Image Version: 20230226.1 +- Image Version: 20230307.2 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -25,11 +25,11 @@ - Helm 3.11.1 - Miniconda 23.1.0 (pre-installed on the image but not added to PATH) - NPM 9.5.0 -- NuGet 6.4.0.123 +- NuGet 6.5.0.154 - pip 23.0.1 (python 3.9) - Pipx 1.1.0 - RubyGems 3.2.33 -- Vcpkg (build from commit 223d33be7) +- Vcpkg (build from commit e69c9817d) - Yarn 1.22.19 #### Environment variables @@ -41,14 +41,14 @@ ### Project Management - Ant 1.10.13 - Gradle 7.6 -- Maven 3.9.0 +- Maven 3.8.7 - sbt 1.8.2 ### Tools - 7zip 22.01 - aria2 1.36.0 - azcopy 10.17.0 -- Bazel 6.0.0 +- Bazel 6.1.0 - Bazelisk 1.13.2 - Bicep 0.14.85 - Cabal 3.8.1.0 @@ -65,14 +65,14 @@ - InnoSetup 6.2.2 - jq 1.6 - Kind 0.17.0 -- Kubectl 1.26.1 +- Kubectl 1.26.2 - Mercurial 5.0 - Mingw-w64 11.2.0 - Newman 5.3.2 - NSIS 3.08 - OpenSSL 1.1.1 - Packer 1.8.5 -- Pulumi 3.55.0 +- Pulumi 3.56.0 - R 4.2.2 - Service Fabric SDK 9.1.1436.9590 - Stack 2.9.3 @@ -85,11 +85,11 @@ - zstd 1.5.4 ### CLI Tools -- Alibaba Cloud CLI 3.0.150 -- AWS CLI 2.10.3 -- AWS SAM CLI 1.74.0 +- Alibaba Cloud CLI 3.0.152 +- AWS CLI 2.11.0 +- AWS SAM CLI 1.76.0 - AWS Session Manager CLI 1.2.398.0 -- Azure CLI 2.45.0 +- Azure CLI 2.46.0 - Azure DevOps CLI extension 0.26.0 - GitHub CLI 2.23.0 - Hub CLI 2.14.2 @@ -111,9 +111,9 @@ ### Browsers and Drivers - Google Chrome 110.0.5481.178 - Chrome Driver 110.0.5481.77 -- Microsoft Edge 110.0.1587.57 -- Microsoft Edge Driver 110.0.1587.57 -- Mozilla Firefox 110.0 +- Microsoft Edge 110.0.1587.63 +- Microsoft Edge Driver 110.0.1587.63 +- Mozilla Firefox 110.0.1 - Gecko Driver 0.32.2 - IE Driver 4.8.0.0 - Selenium server 4.8.0 @@ -141,7 +141,7 @@ | wslbash.exe | C:\Windows\System32\bash.exe | ### MSYS2 -- Pacman 6.0.1 +- Pacman 6.0.2 #### Notes ``` @@ -216,7 +216,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Visual Studio Enterprise 2022 | Name | Version | Path | | ----------------------------- | -------------- | -------------------------------------------------------- | -| Visual Studio Enterprise 2022 | 17.5.33414.496 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | +| Visual Studio Enterprise 2022 | 17.5.33424.131 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | #### Workloads, components and extensions | Package | Version | @@ -292,9 +292,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | microsoft.net.runtime.mono.tooling.net6 | 7.0.323.6910 | | microsoft.net.sdk.emscripten.net7 | 7.0.8.6204 | | Microsoft.NetCore.Component.DevelopmentTools | 17.5.33306.270 | -| Microsoft.NetCore.Component.Runtime.6.0 | 17.5.33413.361 | -| Microsoft.NetCore.Component.Runtime.7.0 | 17.5.33413.361 | -| Microsoft.NetCore.Component.SDK | 17.5.33413.361 | +| Microsoft.NetCore.Component.Runtime.6.0 | 17.5.33424.131 | +| Microsoft.NetCore.Component.Runtime.7.0 | 17.5.33424.131 | +| Microsoft.NetCore.Component.SDK | 17.5.33424.131 | | Microsoft.NetCore.Component.Web | 17.5.33306.270 | | Microsoft.VisualStudio.Component.AppInsights.Tools | 17.5.33306.270 | | Microsoft.VisualStudio.Component.AspNet | 17.5.33306.270 | @@ -525,7 +525,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 10.0.22621.0 ### .NET Core Tools -- .NET Core SDK: 3.1.120, 3.1.202, 3.1.302, 3.1.426, 6.0.114, 6.0.203, 6.0.309, 6.0.406, 7.0.200 +- .NET Core SDK: 3.1.120, 3.1.202, 3.1.302, 3.1.426, 6.0.114, 6.0.203, 6.0.309, 6.0.406, 7.0.201 - .NET Framework: 4.8, 4.8.1 - Microsoft.AspNetCore.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 6.0.5, 6.0.14, 7.0.3 - Microsoft.NETCore.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 6.0.5, 6.0.14, 7.0.3 @@ -542,10 +542,10 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Az (Cached): 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.279 +- AWSPowershell: 4.1.285 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 -- Microsoft.Graph: 1.22.0 +- Microsoft.Graph: 1.23.0 - Pester: 3.4.0, 5.4.0 - PowerShellGet: 1.0.0.1, 2.2.5 - PSScriptAnalyzer: 1.21.0 From f386f9db4b7282ba2f56b245fc3110551d3be0f8 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Mon, 13 Mar 2023 15:38:50 +0100 Subject: [PATCH 1803/3485] Do not expose packer-log in pipelines (#7273) --- images.CI/linux-and-win/azure-pipelines/image-generation.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images.CI/linux-and-win/azure-pipelines/image-generation.yml b/images.CI/linux-and-win/azure-pipelines/image-generation.yml index 94ad9e21bb30..c7f546c4429a 100644 --- a/images.CI/linux-and-win/azure-pipelines/image-generation.yml +++ b/images.CI/linux-and-win/azure-pipelines/image-generation.yml @@ -88,7 +88,7 @@ jobs: env: PACKER_LOG: 1 - PACKER_LOG_PATH: $(Build.ArtifactStagingDirectory)/packer-log.txt + PACKER_LOG_PATH: "$(Agent.TempDirectory)/packer-log.txt" - task: PowerShell@2 displayName: 'Copy image artifacts to the separate directory' @@ -130,7 +130,7 @@ jobs: inputs: targetType: 'filePath' filePath: ./images.CI/measure-provisioners-duration.ps1 - arguments: -PackerLogPath "$(Build.ArtifactStagingDirectory)/packer-log.txt" ` + arguments: -PackerLogPath "$(Agent.TempDirectory)/packer-log.txt" ` -PrefixToPathTrim "$(TemplateDirectoryPath)" ` -PrintTopNLongest 25 From 77039ebf7edb29fc43862359b3ddf2b2b6e01c09 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 14 Mar 2023 08:15:46 +0000 Subject: [PATCH 1804/3485] Updating readme file for macOS-11 version 20230303.1 (#7250) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-11-Readme.md | 45 ++++++++++++++++----------------- 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/images/macos/macos-11-Readme.md b/images/macos/macos-11-Readme.md index 398fce888791..7ec9d058fe1e 100644 --- a/images/macos/macos-11-Readme.md +++ b/images/macos/macos-11-Readme.md @@ -1,17 +1,16 @@ | Announcements | |-| -| [GCC-9 will be removed from macOS 11 on March, 6](https://github.com/actions/runner-images/issues/7136) | -| [Xcode 13.4 will be pointing to 13.4.1 on February, 27](https://github.com/actions/runner-images/issues/7127) | +| [GCC-9 will be removed from macOS 11 on March, 13](https://github.com/actions/runner-images/issues/7136) | *** # macOS 11 - OS Version: macOS 11.7.4 (20G1120) - Kernel Version: Darwin 20.6.0 -- Image Version: 20230223.3 +- Image Version: 20230303.1 ## Installed Software ### Language and Runtime -- .NET Core SDK: 3.1.101, 3.1.201, 3.1.302, 3.1.426, 6.0.406, 7.0.102, 7.0.200 +- .NET Core SDK: 3.1.101, 3.1.201, 3.1.302, 3.1.426, 6.0.406, 7.0.102, 7.0.201 - Bash 3.2.57(1)-release - Clang/LLVM 13.0.0 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` @@ -41,9 +40,9 @@ ### Package Management - Bundler 2.4.7 - Carthage 0.39.0 -- CocoaPods 1.11.3 +- CocoaPods 1.12.0 - Composer 2.5.4 -- Homebrew 4.0.3 +- Homebrew 4.0.4 - Miniconda 23.1.0 - NPM 9.5.0 - NuGet 6.3.1.1 @@ -51,7 +50,7 @@ - Pip3 23.0.1 (python 3.11) - Pipx 1.1.0 - RubyGems 3.4.7 -- Vcpkg 2023 (build from commit 82e03905f) +- Vcpkg 2023 (build from commit 8daf70c56) - Yarn 1.22.19 #### Environment variables @@ -63,7 +62,7 @@ ### Project Management - Apache Ant 1.10.13 - Apache Maven 3.9.0 -- Gradle 8.0.1 +- Gradle 8.0.2 - Sbt 1.8.2 ### Utilities @@ -94,28 +93,27 @@ - Sox 14.4.2 - Subversion (SVN) 1.14.2 - Switchaudio-osx 1.1.0 -- yq 4.31.1 +- yq 4.31.2 - zstd 1.5.4 ### Tools -- Aliyun CLI 3.0.150 +- Aliyun CLI 3.0.152 - App Center CLI 2.13.2 -- AWS CLI 2.10.2 -- AWS SAM CLI 1.73.0 +- AWS CLI 2.11.0 +- AWS SAM CLI 1.75.0 - AWS Session Manager CLI 1.2.398.0 - Azure CLI 2.45.0 - Azure CLI (azure-devops) 0.26.0 - Bicep CLI 0.14.85 - Cabal 3.6.2.0 - Cmake 3.25.2 -- CodeQL Action Bundles 2.12.1 2.12.2 -- Colima 0.5.2 -- Fastlane 2.212.0 +- CodeQL Action Bundles 2.12.2 2.12.3 +- Fastlane 2.212.1 - GHC 9.4.4 -- GHCup 0.1.19.1 +- GHCup 0.1.19.2 - Jazzy 0.14.3 -- Stack 2.9.1 -- SwiftFormat 0.50.9 +- Stack 2.9.3 +- SwiftFormat 0.51.1 - Swig 4.1.1 - Xcode Command Line Tools 13.2.0.0.1.1638488800 @@ -128,9 +126,9 @@ - SafariDriver 16.3.1 (16614.4.6.11.7) - Google Chrome 110.0.5481.177 - ChromeDriver 110.0.5481.77 -- Microsoft Edge 110.0.1587.50 -- Microsoft Edge WebDriver 110.0.1587.50 -- Mozilla Firefox 110.0 +- Microsoft Edge 110.0.1587.63 +- Microsoft Edge WebDriver 110.0.1587.63 +- Mozilla Firefox 110.0.1 - geckodriver 0.32.2 - Selenium server 4.8.0 @@ -185,6 +183,7 @@ - 1.17.13 - 1.18.10 - 1.19.6 +- 1.20.1 ### Rust Tools - Cargo 1.67.1 @@ -201,7 +200,7 @@ - Rustfmt 1.5.1-stable ### PowerShell Tools -- PowerShell 7.2.9 +- PowerShell 7.2.10 #### PowerShell Modules - Az: 9.4.0 @@ -361,6 +360,6 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" ### Miscellaneous - libXext 1.3.5 - libXft 2.3.7 -- Tcl/Tk 8.6.13 +- Tcl/Tk 8.6.13_1 - Zlib 1.2.13 From 014e1b0e76973a782f011d20933afbfc900902c6 Mon Sep 17 00:00:00 2001 From: sergei-pyshnoi <121864472+sergei-pyshnoi@users.noreply.github.com> Date: Tue, 14 Mar 2023 10:59:11 +0100 Subject: [PATCH 1805/3485] [Ubuntu] add alpine 3.17 docker image (#7274) --- images/linux/toolsets/toolset-2004.json | 1 + images/linux/toolsets/toolset-2204.json | 1 + 2 files changed, 2 insertions(+) diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index 41d97f3dae0c..f5a31b8ffd72 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -228,6 +228,7 @@ "alpine:3.14", "alpine:3.15", "alpine:3.16", + "alpine:3.17", "buildpack-deps:stretch", "buildpack-deps:buster", "buildpack-deps:bullseye", diff --git a/images/linux/toolsets/toolset-2204.json b/images/linux/toolsets/toolset-2204.json index 22bab12c67e9..77935c10bcf8 100644 --- a/images/linux/toolsets/toolset-2204.json +++ b/images/linux/toolsets/toolset-2204.json @@ -213,6 +213,7 @@ "alpine:3.14", "alpine:3.15", "alpine:3.16", + "alpine:3.17", "buildpack-deps:buster", "buildpack-deps:bullseye", "debian:10", From bc22983319daa620b2ad01a74b68f6f462d86241 Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Tue, 14 Mar 2023 17:14:42 +0100 Subject: [PATCH 1806/3485] Update condition for Android packages filter (#7280) --- images/win/scripts/ImageHelpers/InstallHelpers.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/win/scripts/ImageHelpers/InstallHelpers.ps1 b/images/win/scripts/ImageHelpers/InstallHelpers.ps1 index 09bb51a68f84..2d895e77b0d2 100644 --- a/images/win/scripts/ImageHelpers/InstallHelpers.ps1 +++ b/images/win/scripts/ImageHelpers/InstallHelpers.ps1 @@ -517,7 +517,7 @@ function Get-AndroidPackagesByVersion { $Type = $MinimumVersion.GetType() $packagesByName = Get-AndroidPackagesByName -AndroidPackages $AndroidPackages -PrefixPackageName $PrefixPackageName $packagesByVersion = $packagesByName | Where-Object { ($_.Split($Delimiter)[$Index] -as $Type) -ge $MinimumVersion } - return $packagesByVersion | Sort-Object { $_.Split($Delimiter)[$Index] -as $Type} -Unique + return $packagesByVersion | Sort-Object -Unique } function Get-WindowsUpdatesHistory { From 0d3ef08d6f5057563e0164a4dff27aaaf78d8456 Mon Sep 17 00:00:00 2001 From: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com> Date: Wed, 15 Mar 2023 15:04:45 +0100 Subject: [PATCH 1807/3485] [ubuntu] aws session manager plugin 1.2.458.0 fix (#7291) Co-authored-by: Ilia Shipitsin <ilia-shipitsin@github.com> --- images/linux/scripts/tests/CLI.Tools.Tests.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/linux/scripts/tests/CLI.Tools.Tests.ps1 b/images/linux/scripts/tests/CLI.Tools.Tests.ps1 index ba21be6344a4..5be4d67eae34 100644 --- a/images/linux/scripts/tests/CLI.Tools.Tests.ps1 +++ b/images/linux/scripts/tests/CLI.Tools.Tests.ps1 @@ -23,7 +23,7 @@ Describe "AWS" { } It "Session Manager Plugin for the AWS CLI" { - session-manager-plugin | Out-String | Should -Match "plugin was installed successfully" + session-manager-plugin 2>&1 | Out-String | Should -Match "plugin was installed successfully" } It "AWS SAM CLI" { From 1261bad465162f908c6138bf12a0ca112ad96b9f Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Wed, 15 Mar 2023 20:38:34 +0100 Subject: [PATCH 1808/3485] [Ubuntu] Update Maven to 3.8.8, new download link (#7287) --- images/linux/scripts/installers/java-tools.sh | 2 +- images/linux/toolsets/toolset-1804.json | 2 +- images/linux/toolsets/toolset-2004.json | 2 +- images/linux/toolsets/toolset-2204.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/images/linux/scripts/installers/java-tools.sh b/images/linux/scripts/installers/java-tools.sh index 527d27e55544..44dbb4689c0c 100644 --- a/images/linux/scripts/installers/java-tools.sh +++ b/images/linux/scripts/installers/java-tools.sh @@ -138,7 +138,7 @@ echo "ANT_HOME=/usr/share/ant" | tee -a /etc/environment # Install Maven mavenVersion=$(get_toolset_value '.java.maven') -mavenDownloadUrl="https://www-eu.apache.org/dist/maven/maven-3/${mavenVersion}/binaries/apache-maven-${mavenVersion}-bin.zip" +mavenDownloadUrl="https://dlcdn.apache.org/maven/maven-3/${mavenVersion}/binaries/apache-maven-${mavenVersion}-bin.zip" download_with_retries ${mavenDownloadUrl} "/tmp" "maven.zip" unzip -qq -d /usr/share /tmp/maven.zip ln -s /usr/share/apache-maven-${mavenVersion}/bin/mvn /usr/bin/mvn diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index 6b69a1477168..e3b90ffd1807 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -84,7 +84,7 @@ "versions": [ "8", "11", "12" ] } ], - "maven": "3.8.7" + "maven": "3.8.8" }, "android": { "platform_min_version": "23", diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index f5a31b8ffd72..2e510124b5c9 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -86,7 +86,7 @@ "versions": [ "8", "11" ] } ], - "maven": "3.8.7" + "maven": "3.8.8" }, "android": { "cmdline-tools": "latest", diff --git a/images/linux/toolsets/toolset-2204.json b/images/linux/toolsets/toolset-2204.json index 77935c10bcf8..991872889848 100644 --- a/images/linux/toolsets/toolset-2204.json +++ b/images/linux/toolsets/toolset-2204.json @@ -74,7 +74,7 @@ "versions": [ "8", "11", "17" ] } ], - "maven": "3.8.7" + "maven": "3.8.8" }, "android": { "cmdline-tools": "latest", From 87dc45249846474be8907ed1c843e6784ea1dca7 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 16 Mar 2023 09:47:08 +0000 Subject: [PATCH 1809/3485] Updating readme file for ubuntu20 version 20230313.1 (#7278) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2004-Readme.md | 121 +++++++++++++++--------------- 1 file changed, 61 insertions(+), 60 deletions(-) diff --git a/images/linux/Ubuntu2004-Readme.md b/images/linux/Ubuntu2004-Readme.md index bfc3838c53b0..46ce1713bc32 100644 --- a/images/linux/Ubuntu2004-Readme.md +++ b/images/linux/Ubuntu2004-Readme.md @@ -1,11 +1,12 @@ | Announcements | |-| +| [[All OSes] Go 1.17.x will be removed and 1.20.x set as default on April, 3](https://github.com/actions/runner-images/issues/7276) | | [The Ubuntu 18.04 Actions runner image will begin deprecation on 2022/08/08 and will be fully unsupported by 2023/04/01](https://github.com/actions/runner-images/issues/6002) | *** # Ubuntu 20.04 - OS Version: 20.04.5 LTS - Kernel Version: 5.15.0-1034-azure -- Image Version: 20230305.1 +- Image Version: 20230313.1 ## Installed Software @@ -23,7 +24,7 @@ - Kotlin 1.8.10-release-430 - Mono 6.12.0.182 - MSBuild 16.10.1.31701 (Mono 6.12.0.182) -- Node.js 18.14.2 +- Node.js 18.15.0 - Perl 5.30.0 - Python 3.8.10 - Python3 3.8.10 @@ -32,16 +33,16 @@ ### Package Management - cpan 1.64 -- Helm 3.11.1 -- Homebrew 4.0.4 +- Helm 3.11.2 +- Homebrew 4.0.6 - Miniconda 23.1.0 - Npm 9.5.0 - NuGet 6.3.1.1 - Pip 20.0.2 - Pip3 20.0.2 -- Pipx 1.1.0 +- Pipx 1.2.0 - RubyGems 3.1.2 -- Vcpkg (build from commit 8daf70c56) +- Vcpkg (build from commit cfdeb75bb) - Yarn 1.22.19 #### Environment variables @@ -69,16 +70,16 @@ to accomplish this. - Ansible 2.13.8 - apt-fast 1.9.12 - AzCopy 10.17.0 - available by `azcopy` and `azcopy10` aliases -- Bazel 6.0.0 +- Bazel 6.1.0 - Bazelisk 1.13.2 -- Bicep 0.14.85 +- Bicep 0.15.31 - Buildah 1.22.3 -- CMake 3.25.2 -- CodeQL Action Bundles 2.12.2 2.12.3 +- CMake 3.25.3 +- CodeQL Action Bundles 2.12.3 2.12.4 - Docker Amazon ECR Credential Helper 0.6.0 - Docker Compose v1 1.29.2 - Docker Compose v2 2.16.0+azure-2 -- Docker-Buildx 0.10.3 +- Docker-Buildx 0.10.4 - Docker-Moby Client 20.10.23+azure-2 - Docker-Moby Server 20.10.23+azure-2 - Fastlane 2.212.1 @@ -86,7 +87,7 @@ to accomplish this. - Git LFS 3.3.0 - Git-ftp 1.6.0 - Haveged 1.9.1 -- Heroku 7.68.2 +- Heroku 7.69.1 - HHVM (HipHop VM) 4.172.1 - jq 1.6 - Kind 0.17.0 @@ -104,30 +105,30 @@ to accomplish this. - Parcel 2.8.3 - PhantomJS 2.1.1 - Podman 3.4.2 -- Pulumi 3.55.0 +- Pulumi 3.57.1 - R 4.2.2 - Skopeo 1.5.0 - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 -- Terraform 1.3.9 +- Terraform 1.4.0 - yamllint 1.29.0 - yq 4.31.2 - zstd 1.5.4 ### CLI Tools -- Alibaba Cloud CLI 3.0.152 -- AWS CLI 2.11.0 +- Alibaba Cloud CLI 3.0.156 +- AWS CLI 2.11.2 - AWS CLI Session Manager Plugin 1.2.398.0 - AWS SAM CLI 1.76.0 -- Azure CLI 2.45.0 +- Azure CLI 2.46.0 - Azure CLI (azure-devops) 0.26.0 -- GitHub CLI 2.23.0 -- Google Cloud SDK 420.0.0 +- GitHub CLI 2.24.3 +- Google Cloud SDK 421.0.0 - Hub CLI 2.14.2 -- Netlify CLI 13.0.1 -- OpenShift CLI 4.12.5 +- Netlify CLI 13.1.3 +- OpenShift CLI 4.12.7 - ORAS CLI 0.16.0 -- Vercel CLI 28.16.12 +- Vercel CLI 28.16.15 ### Java | Version | Vendor | Environment Variable | @@ -151,32 +152,32 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ### Haskell Tools - Cabal 3.6.2.0 -- GHC 9.4.4 +- GHC 9.6.1 - GHCup 0.1.19.2 - Stack 2.9.3 ### Rust Tools -- Cargo 1.67.1 -- Rust 1.67.1 -- Rustdoc 1.67.1 +- Cargo 1.68.0 +- Rust 1.68.0 +- Rustdoc 1.68.0 - Rustup 1.25.2 #### Packages - Bindgen 0.64.0 - Cargo audit 0.17.4 -- Cargo clippy 0.1.67 +- Cargo clippy 0.1.68 - Cargo outdated 0.11.2 - Cbindgen 0.24.3 - Rustfmt 1.5.1 ### Browsers and Drivers -- Google Chrome 110.0.5481.177 -- ChromeDriver 110.0.5481.77 -- Chromium 110.0.5481.0 -- Microsoft Edge 110.0.1587.63 -- Microsoft Edge WebDriver 110.0.1587.63 +- Google Chrome 111.0.5563.64 +- ChromeDriver 111.0.5563.64 +- Chromium 111.0.5547.0 +- Microsoft Edge 111.0.1661.41 +- Microsoft Edge WebDriver 111.0.1661.41 - Selenium server 4.8.0 -- Mozilla Firefox 110.0.1 +- Mozilla Firefox 111.0 - Geckodriver 0.32.2 #### Environment variables @@ -221,18 +222,18 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Go - 1.17.13 - 1.18.10 -- 1.19.6 -- 1.20.1 +- 1.19.7 +- 1.20.2 #### Node.js - 14.21.3 - 16.19.1 -- 18.14.2 +- 18.15.0 #### Python - 2.7.18 - 3.6.15 -- 3.7.15 +- 3.7.16 - 3.8.16 - 3.9.16 - 3.10.10 @@ -271,20 +272,20 @@ Use the following command as a part of your job to start the service: 'sudo syst | nginx | 1.18.0 | /etc/nginx/nginx.conf | inactive | 80 | ### Android -| Package Name | Version | -| -------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 9.0 | -| Android Emulator | 32.1.11 | -| Android SDK Build-tools | 33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | -| Android SDK Platform-Tools | 34.0.0 | -| Android SDK Platforms | android-33-ext4 (rev 1)<br>android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | -| Android SDK Tools | 26.1.1 | -| Android Support Repository | 47.0.0 | -| CMake | 3.10.2<br>3.18.1<br>3.22.1 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 23.2.8568313<br>24.0.8215888<br>25.2.9519653 (default) | -| SDK Patch Applier v4 | 1 | +| Package Name | Version | +| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | +| Android Command Line Tools | 9.0 | +| Android Emulator | 32.1.11 | +| Android SDK Build-tools | 33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | +| Android SDK Platform-Tools | 34.0.1 | +| Android SDK Platforms | android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | +| Android SDK Tools | 26.1.1 | +| Android Support Repository | 47.0.0 | +| CMake | 3.10.2<br>3.18.1<br>3.22.1 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 23.2.8568313<br>24.0.8215888<br>25.2.9519653 (default) | +| SDK Patch Applier v4 | 1 | #### Environment variables | Name | Value | @@ -299,22 +300,22 @@ Use the following command as a part of your job to start the service: 'sudo syst ### Cached Docker images | Repository:Tag | Digest | Created | | ----------------------- | ------------------------------------------------------------------------ | ---------- | -| alpine:3.14 | sha256:560e7a4fa5c891d1830f5591c80b8e472fa6cd386b7254cdf65ccc3249292a34 | 2023-02-11 | -| alpine:3.15 | sha256:689659b1f08e9fdfb85190144098c378beb5a53b328f7ced7883a74a1157c709 | 2023-02-11 | -| alpine:3.16 | sha256:1bd67c81e4ad4b8f4a5c1c914d7985336f130e5cefb3e323654fd09d6bcdbbe2 | 2023-02-11 | +| alpine:3.14 | sha256:fa26727c28837d1471c2f1524d297a0255c153b5d023d7badd1412be7e6e12a2 | 2023-02-11 | +| alpine:3.15 | sha256:59b00c6f1614a599aa83d946d2a276c9257d2d29461c86c6a114d9932f2ddcd4 | 2023-02-11 | +| alpine:3.16 | sha256:2cf17aa35fbcb6ece81692a64bfbadaf096590241ed9f95dd5f94f0e9f674784 | 2023-02-11 | | buildpack-deps:bullseye | sha256:6f2703639d3d17f70288d4ba212d55e159b682a990c20fc2a6562b098f01a1e7 | 2023-03-01 | | buildpack-deps:buster | sha256:63be0fe0bfb9d06b8747dcd87683787ef6d82c6f05b8a2ae213c38d56dc2bf53 | 2023-03-01 | | buildpack-deps:stretch | sha256:78e995165a5788c2f55aed6e548d8f6c1534830d4310c870408fccb2da8c5b2e | 2022-06-23 | | debian:10 | sha256:2d356e1e22c0902f88ef65cb7159ecd5a96feb62345747edfd4324b0d83a2923 | 2023-03-01 | | debian:11 | sha256:f81bf5a8b57d6aa1824e4edb9aea6bd5ef6240bcc7d86f303f197a2eb77c430f | 2023-03-01 | | debian:9 | sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be | 2022-06-23 | -| moby/buildkit:latest | sha256:751921dc37d2f842de38c9387f891fe6ae7d80f03d050ea98f780d7e0874ba00 | 2023-02-13 | +| moby/buildkit:latest | sha256:990e55e71c16281ed72f00b0308980865dae03d598b2cb8316da023d80336543 | 2023-03-06 | | node:14 | sha256:481a78885f7a83f86fcb3ac48dab9bede651851d1b250650c17645a988902728 | 2023-03-01 | -| node:14-alpine | sha256:49d052af1616dbf5f2bd8b71fca9a4b7c688955e72bbe3e0126c4b28d7675577 | 2023-02-17 | +| node:14-alpine | sha256:1d02d4073d7dfd58950a222a862f8b819afd774560b7b3e992b27ff4cd088285 | 2023-02-17 | | node:16 | sha256:8ef06c513538040a988ac7731afa8ad8b1135cfe5d8b6ad78489d80c6f6c0137 | 2023-03-01 | -| node:16-alpine | sha256:95a849eafc573ad0d972fd67c569369e7aa94d55a21ede3b972e3137e5f8e43a | 2023-02-21 | -| node:18 | sha256:8b2c008211854f4ee9ca328910d1c6bff8f30fc9fdf834b48f7ea40992a2079a | 2023-03-01 | -| node:18-alpine | sha256:f8a51c36b0be7434bbf867d4a08decf0100e656203d893b9b0f8b1fe9e40daea | 2023-02-22 | +| node:16-alpine | sha256:fcb03294d3c0695cf9762dec94c0366f08e7a8c6a3c1e062d38c80ac30684d8a | 2023-02-21 | +| node:18 | sha256:8d9a875ee427897ef245302e31e2319385b092f1c3368b497e89790f240368f5 | 2023-03-08 | +| node:18-alpine | sha256:ffc770cdc09c9e83cccd99d663bb6ed56cfaa1bab94baf1b12b626aebeca9c10 | 2023-03-08 | | ubuntu:16.04 | sha256:1f1a2d56de1d604801a9671f301190704c25d604a416f59e03c04f5c6ffee0d6 | 2021-08-31 | | ubuntu:18.04 | sha256:1e32b9c52e8f22769df41e8f61066c77b2b35b0a423c4161c0e48eca2fd24f75 | 2023-03-01 | | ubuntu:20.04 | sha256:9fa30fcef427e5e88c76bc41ad37b7cc573e1d79cecb23035e413c4be6e476ab | 2023-03-01 | @@ -381,7 +382,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | pollinate | 4.33-3ubuntu1.20.04.1 | | python-is-python3 | 3.8.2-4 | | rpm | 4.14.2.1+dfsg1-1build2 | -| rsync | 3.1.3-8ubuntu0.4 | +| rsync | 3.1.3-8ubuntu0.5 | | shellcheck | 0.7.0-2build2 | | sphinxsearch | 2.2.11-2ubuntu2 | | sqlite3 | 3.31.1-4ubuntu0.5 | From 2c549825eaed806e2c85bbfcd5e50d99ebaa61c1 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 16 Mar 2023 09:48:21 +0000 Subject: [PATCH 1810/3485] Updating readme file for ubuntu22 version 20230313.1 (#7279) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2204-Readme.md | 122 +++++++++++++++--------------- 1 file changed, 62 insertions(+), 60 deletions(-) diff --git a/images/linux/Ubuntu2204-Readme.md b/images/linux/Ubuntu2204-Readme.md index 3df09593c204..e54135fe0374 100644 --- a/images/linux/Ubuntu2204-Readme.md +++ b/images/linux/Ubuntu2204-Readme.md @@ -1,11 +1,12 @@ | Announcements | |-| +| [[All OSes] Go 1.17.x will be removed and 1.20.x set as default on April, 3](https://github.com/actions/runner-images/issues/7276) | | [The Ubuntu 18.04 Actions runner image will begin deprecation on 2022/08/08 and will be fully unsupported by 2023/04/01](https://github.com/actions/runner-images/issues/6002) | *** # Ubuntu 22.04 - OS Version: 22.04.2 LTS - Kernel Version: 5.15.0-1034-azure -- Image Version: 20230305.1 +- Image Version: 20230313.1 ## Installed Software @@ -21,7 +22,7 @@ - Kotlin 1.8.10-release-430 - Mono 6.12.0.182 - MSBuild 16.10.1.31701 (Mono 6.12.0.182) -- Node.js 18.14.2 +- Node.js 18.15.0 - Perl 5.34.0 - Python 3.10.6 - Python3 3.10.6 @@ -30,16 +31,16 @@ ### Package Management - cpan 1.64 -- Helm 3.11.1 -- Homebrew 4.0.4 +- Helm 3.11.2 +- Homebrew 4.0.6 - Miniconda 23.1.0 - Npm 9.5.0 - NuGet 6.3.1.1 - Pip 22.0.2 - Pip3 22.0.2 -- Pipx 1.1.0 +- Pipx 1.2.0 - RubyGems 3.3.5 -- Vcpkg (build from commit 8daf70c56) +- Vcpkg (build from commit cfdeb75bb) - Yarn 1.22.19 #### Environment variables @@ -58,21 +59,22 @@ to accomplish this. ### Project Management - Lerna 6.5.1 +- Maven 3.8.7 ### Tools - Ansible 2.14.3 - apt-fast 1.9.12 - AzCopy 10.17.0 - available by `azcopy` and `azcopy10` aliases -- Bazel 6.0.0 +- Bazel 6.1.0 - Bazelisk 1.13.2 -- Bicep 0.14.85 +- Bicep 0.15.31 - Buildah 1.23.1 -- CMake 3.25.2 -- CodeQL Action Bundles 2.12.2 2.12.3 +- CMake 3.25.3 +- CodeQL Action Bundles 2.12.3 2.12.4 - Docker Amazon ECR Credential Helper 0.6.0 - Docker Compose v1 1.29.2 - Docker Compose v2 2.16.0+azure-2 -- Docker-Buildx 0.10.3 +- Docker-Buildx 0.10.4 - Docker-Moby Client 20.10.23+azure-2 - Docker-Moby Server 20.10.23+azure-2 - Fastlane 2.212.1 @@ -80,7 +82,7 @@ to accomplish this. - Git LFS 3.3.0 - Git-ftp 1.6.0 - Haveged 1.9.14 -- Heroku 7.68.2 +- Heroku 7.69.1 - jq 1.6 - Kind 0.17.0 - Kubectl 1.26.2 @@ -96,30 +98,30 @@ to accomplish this. - Packer 1.8.6 - Parcel 2.8.3 - Podman 3.4.4 -- Pulumi 3.55.0 +- Pulumi 3.57.1 - R 4.2.2 - Skopeo 1.4.1 - Sphinx Open Source Search Server 2.2.11 - SVN 1.14.1 -- Terraform 1.3.9 +- Terraform 1.4.0 - yamllint 1.29.0 - yq 4.31.2 - zstd 1.5.4 ### CLI Tools -- Alibaba Cloud CLI 3.0.152 -- AWS CLI 2.11.0 +- Alibaba Cloud CLI 3.0.156 +- AWS CLI 2.11.2 - AWS CLI Session Manager Plugin 1.2.398.0 - AWS SAM CLI 1.76.0 -- Azure CLI 2.45.0 +- Azure CLI 2.46.0 - Azure CLI (azure-devops) 0.26.0 -- GitHub CLI 2.23.0 -- Google Cloud SDK 420.0.0 +- GitHub CLI 2.24.3 +- Google Cloud SDK 421.0.0 - Hub CLI 2.14.2 -- Netlify CLI 13.0.1 -- OpenShift CLI 4.12.5 +- Netlify CLI 13.1.3 +- OpenShift CLI 4.12.7 - ORAS CLI 0.16.0 -- Vercel CLI 28.16.12 +- Vercel CLI 28.16.15 ### Java | Version | Vendor | Environment Variable | @@ -143,32 +145,32 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ### Haskell Tools - Cabal 3.6.2.0 -- GHC 9.4.4 +- GHC 9.6.1 - GHCup 0.1.19.2 - Stack 2.9.3 ### Rust Tools -- Cargo 1.67.1 -- Rust 1.67.1 -- Rustdoc 1.67.1 +- Cargo 1.68.0 +- Rust 1.68.0 +- Rustdoc 1.68.0 - Rustup 1.25.2 #### Packages - Bindgen 0.64.0 - Cargo audit 0.17.4 -- Cargo clippy 0.1.67 +- Cargo clippy 0.1.68 - Cargo outdated 0.11.2 - Cbindgen 0.24.3 - Rustfmt 1.5.1 ### Browsers and Drivers -- Google Chrome 110.0.5481.177 -- ChromeDriver 110.0.5481.77 -- Chromium 110.0.5481.0 -- Microsoft Edge 110.0.1587.63 -- Microsoft Edge WebDriver 110.0.1587.63 +- Google Chrome 111.0.5563.64 +- ChromeDriver 111.0.5563.64 +- Chromium 111.0.5547.0 +- Microsoft Edge 111.0.1661.41 +- Microsoft Edge WebDriver 111.0.1661.41 - Selenium server 4.8.0 -- Mozilla Firefox 110.0.1 +- Mozilla Firefox 111.0 - Geckodriver 0.32.2 #### Environment variables @@ -212,16 +214,16 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Go - 1.17.13 - 1.18.10 -- 1.19.6 -- 1.20.1 +- 1.19.7 +- 1.20.2 #### Node.js - 14.21.3 - 16.19.1 -- 18.14.2 +- 18.15.0 #### Python -- 3.7.15 +- 3.7.16 - 3.8.16 - 3.9.16 - 3.10.10 @@ -252,20 +254,20 @@ Use the following command as a part of your job to start the service: 'sudo syst | nginx | 1.18.0 | /etc/nginx/nginx.conf | inactive | 80 | ### Android -| Package Name | Version | -| -------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 9.0 | -| Android Emulator | 32.1.11 | -| Android SDK Build-tools | 33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | -| Android SDK Platform-Tools | 34.0.0 | -| Android SDK Platforms | android-33-ext4 (rev 1)<br>android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | -| Android SDK Tools | 26.1.1 | -| Android Support Repository | 47.0.0 | -| CMake | 3.10.2<br>3.18.1<br>3.22.1 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 23.2.8568313<br>24.0.8215888<br>25.2.9519653 (default) | -| SDK Patch Applier v4 | 1 | +| Package Name | Version | +| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | +| Android Command Line Tools | 9.0 | +| Android Emulator | 32.1.11 | +| Android SDK Build-tools | 33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | +| Android SDK Platform-Tools | 34.0.1 | +| Android SDK Platforms | android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | +| Android SDK Tools | 26.1.1 | +| Android Support Repository | 47.0.0 | +| CMake | 3.10.2<br>3.18.1<br>3.22.1 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 23.2.8568313<br>24.0.8215888<br>25.2.9519653 (default) | +| SDK Patch Applier v4 | 1 | #### Environment variables | Name | Value | @@ -280,20 +282,20 @@ Use the following command as a part of your job to start the service: 'sudo syst ### Cached Docker images | Repository:Tag | Digest | Created | | ----------------------- | ------------------------------------------------------------------------ | ---------- | -| alpine:3.14 | sha256:560e7a4fa5c891d1830f5591c80b8e472fa6cd386b7254cdf65ccc3249292a34 | 2023-02-11 | -| alpine:3.15 | sha256:689659b1f08e9fdfb85190144098c378beb5a53b328f7ced7883a74a1157c709 | 2023-02-11 | -| alpine:3.16 | sha256:1bd67c81e4ad4b8f4a5c1c914d7985336f130e5cefb3e323654fd09d6bcdbbe2 | 2023-02-11 | +| alpine:3.14 | sha256:fa26727c28837d1471c2f1524d297a0255c153b5d023d7badd1412be7e6e12a2 | 2023-02-11 | +| alpine:3.15 | sha256:59b00c6f1614a599aa83d946d2a276c9257d2d29461c86c6a114d9932f2ddcd4 | 2023-02-11 | +| alpine:3.16 | sha256:2cf17aa35fbcb6ece81692a64bfbadaf096590241ed9f95dd5f94f0e9f674784 | 2023-02-11 | | buildpack-deps:bullseye | sha256:6f2703639d3d17f70288d4ba212d55e159b682a990c20fc2a6562b098f01a1e7 | 2023-03-01 | | buildpack-deps:buster | sha256:63be0fe0bfb9d06b8747dcd87683787ef6d82c6f05b8a2ae213c38d56dc2bf53 | 2023-03-01 | | debian:10 | sha256:2d356e1e22c0902f88ef65cb7159ecd5a96feb62345747edfd4324b0d83a2923 | 2023-03-01 | | debian:11 | sha256:f81bf5a8b57d6aa1824e4edb9aea6bd5ef6240bcc7d86f303f197a2eb77c430f | 2023-03-01 | -| moby/buildkit:latest | sha256:751921dc37d2f842de38c9387f891fe6ae7d80f03d050ea98f780d7e0874ba00 | 2023-02-13 | +| moby/buildkit:latest | sha256:990e55e71c16281ed72f00b0308980865dae03d598b2cb8316da023d80336543 | 2023-03-06 | | node:14 | sha256:481a78885f7a83f86fcb3ac48dab9bede651851d1b250650c17645a988902728 | 2023-03-01 | -| node:14-alpine | sha256:49d052af1616dbf5f2bd8b71fca9a4b7c688955e72bbe3e0126c4b28d7675577 | 2023-02-17 | +| node:14-alpine | sha256:1d02d4073d7dfd58950a222a862f8b819afd774560b7b3e992b27ff4cd088285 | 2023-02-17 | | node:16 | sha256:8ef06c513538040a988ac7731afa8ad8b1135cfe5d8b6ad78489d80c6f6c0137 | 2023-03-01 | -| node:16-alpine | sha256:95a849eafc573ad0d972fd67c569369e7aa94d55a21ede3b972e3137e5f8e43a | 2023-02-21 | -| node:18 | sha256:8b2c008211854f4ee9ca328910d1c6bff8f30fc9fdf834b48f7ea40992a2079a | 2023-03-01 | -| node:18-alpine | sha256:f8a51c36b0be7434bbf867d4a08decf0100e656203d893b9b0f8b1fe9e40daea | 2023-02-22 | +| node:16-alpine | sha256:fcb03294d3c0695cf9762dec94c0366f08e7a8c6a3c1e062d38c80ac30684d8a | 2023-02-21 | +| node:18 | sha256:8d9a875ee427897ef245302e31e2319385b092f1c3368b497e89790f240368f5 | 2023-03-08 | +| node:18-alpine | sha256:ffc770cdc09c9e83cccd99d663bb6ed56cfaa1bab94baf1b12b626aebeca9c10 | 2023-03-08 | | ubuntu:18.04 | sha256:1e32b9c52e8f22769df41e8f61066c77b2b35b0a423c4161c0e48eca2fd24f75 | 2023-03-01 | | ubuntu:20.04 | sha256:9fa30fcef427e5e88c76bc41ad37b7cc573e1d79cecb23035e413c4be6e476ab | 2023-03-01 | | ubuntu:22.04 | sha256:2adf22367284330af9f832ffefb717c78239f6251d9d0f58de50b86229ed1427 | 2023-03-01 | @@ -362,7 +364,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | pollinate | 4.33-3ubuntu2 | | python-is-python3 | 3.9.2-2 | | rpm | 4.17.0+dfsg1-4build1 | -| rsync | 3.2.3-8ubuntu3.1 | +| rsync | 3.2.7-0ubuntu0.22.04.2 | | shellcheck | 0.8.0-2 | | sphinxsearch | 2.2.11-8 | | sqlite3 | 3.37.2-2ubuntu0.1 | From 7a704400abeee040f347129a974d5318bffab215 Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Fri, 17 Mar 2023 09:43:53 +0100 Subject: [PATCH 1811/3485] [macOS] Update macOS TCC DB config (#7297) --- images/macos/provision/configuration/configure-tccdb-macos.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/images/macos/provision/configuration/configure-tccdb-macos.sh b/images/macos/provision/configuration/configure-tccdb-macos.sh index fe2151e7b184..a4e7ff997c03 100644 --- a/images/macos/provision/configuration/configure-tccdb-macos.sh +++ b/images/macos/provision/configuration/configure-tccdb-macos.sh @@ -12,6 +12,7 @@ systemValuesArray=( "'kTCCServiceAccessibility','com.apple.dt.Xcode-Helper',0,2,0,1,NULL,NULL,NULL,'UNUSED',NULL,NULL,1551941368" "'kTCCServiceSystemPolicyAllFiles','/bin/bash',1,2,0,1,NULL,NULL,NULL,'UNUSED',NULL,0,1583997993" "'kTCCServiceSystemPolicyAllFiles','/usr/libexec/sshd-keygen-wrapper',1,0,4,1,X'fade0c000000003c0000000100000006000000020000001d636f6d2e6170706c652e737368642d6b657967656e2d7772617070657200000000000003',NULL,0,'UNUSED',NULL,0,1639660695" + "'kTCCServiceSystemPolicyAllFiles',''com.apple.Terminal',0,2,4,1,X'fade0c000000003000000001000000060000000200000012636f6d2e6170706c652e5465726d696e616c000000000003',NULL,0,'UNUSED',NULL,0,1678990068" "'kTCCServiceAccessibility','/usr/libexec/sshd-keygen-wrapper',1,2,4,1,X'fade0c000000003c0000000100000006000000020000001d636f6d2e6170706c652e737368642d6b657967656e2d7772617070657200000000000003',NULL,0,'UNUSED',NULL,0,1644564233" "'kTCCServiceAccessibility','com.apple.Terminal',0,2,0,1,X'fade0c000000003000000001000000060000000200000012636f6d2e6170706c652e5465726d696e616c000000000003',NULL,NULL,'UNUSED',NULL,0,1591180502" "'kTCCServiceAccessibility','/bin/bash',1,2,0,1,NULL,NULL,NULL,'UNUSED',NULL,0,1583997993" @@ -21,6 +22,8 @@ systemValuesArray=( # Allow Full Disk Access for "Microsoft Defender for macOS" to bypass installation on-flight "'kTCCServiceSystemPolicyAllFiles','com.microsoft.wdav',0,2,4,1,NULL,NULL,NULL,'UNUSED',NULL,0,1643970979" "'kTCCServiceSystemPolicyAllFiles','com.microsoft.wdav.epsext',0,2,4,1,NULL,NULL,NULL,'UNUSED',NULL,0,1643970979" + "'kTCCServiceSystemPolicyNetworkVolumes','/bin/bash',1,2,0,1,NULL,NULL,NULL,'UNUSED',NULL,0,1583997993" + "'kTCCServiceSystemPolicyNetworkVolumes',''com.apple.Terminal',0,2,4,1,X'fade0c000000003000000001000000060000000200000012636f6d2e6170706c652e5465726d696e616c000000000003',NULL,0,'UNUSED',NULL,0,1678990068" ) for values in "${systemValuesArray[@]}"; do configure_system_tccdb "$values" @@ -46,6 +49,7 @@ userValuesArray=( "'kTCCServiceAppleEvents','/Library/Application Support/Veertu/Anka/addons/ankarund',1,2,3,1,X'fade0c00000000ac0000000100000006000000020000001e636f6d2e7665657274752e616e6b612e6164646f6e732e616e6b6172756e0000000000060000000f000000060000000e000000010000000a2a864886f76364060206000000000000000000060000000e000000000000000a2a864886f7636406010d0000000000000000000b000000000000000a7375626a6563742e4f550000000000010000000a545439464157503656340000',NULL,0,'com.apple.systemevents',X'fade0c000000003400000001000000060000000200000016636f6d2e6170706c652e73797374656d6576656e7473000000000003',NULL,164456761" "'kTCCServiceAppleEvents','/Library/Application Support/Veertu/Anka/addons/ankarund',1,2,3,1,X'fade0c00000000ac0000000100000006000000020000001e636f6d2e7665657274752e616e6b612e6164646f6e732e616e6b6172756e0000000000060000000f000000060000000e000000010000000a2a864886f76364060206000000000000000000060000000e000000000000000a2a864886f7636406010d0000000000000000000b000000000000000a7375626a6563742e4f550000000000010000000a545439464157503656340000',NULL,0,'com.apple.Terminal',X'fade0c000000003000000001000000060000000200000012636f6d2e6170706c652e5465726d696e616c000000000003',NULL,1655808179" "'kTCCServiceAppleEvents','/usr/libexec/sshd-keygen-wrapper',1,2,3,1,X'fade0c000000003c0000000100000006000000020000001d636f6d2e6170706c652e737368642d6b657967656e2d7772617070657200000000000003',NULL,0,'com.apple.Terminal',X'fade0c000000003000000001000000060000000200000012636f6d2e6170706c652e5465726d696e616c000000000003',NULL,1650386089" + "'kTCCServicePostEvent','/bin/bash',1,2,0,1,NULL,NULL,NULL,'UNUSED',NULL,0,1583997993" ) for values in "${userValuesArray[@]}"; do configure_user_tccdb "$values" From 83f4ba6069d47fc38f50ed8d209d562cc31a83b3 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 17 Mar 2023 10:22:05 +0100 Subject: [PATCH 1812/3485] Updating readme file for win22 version 20230314.1 (#7286) Co-authored-by: Image generation service account <no-reply@microsoft.com> --- images/win/Windows2022-Readme.md | 93 ++++++++++++++++---------------- 1 file changed, 48 insertions(+), 45 deletions(-) diff --git a/images/win/Windows2022-Readme.md b/images/win/Windows2022-Readme.md index 3e01042348ee..932f16bb995f 100644 --- a/images/win/Windows2022-Readme.md +++ b/images/win/Windows2022-Readme.md @@ -1,6 +1,10 @@ +| Announcements | +|-| +| [[All OSes] Go 1.17.x will be removed and 1.20.x set as default on April, 3](https://github.com/actions/runner-images/issues/7276) | +*** # Windows Server 2022 - OS Version: 10.0.20348 Build 1547 -- Image Version: 20230307.2 +- Image Version: 20230314.1 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -8,12 +12,12 @@ ## Installed Software ### Language and Runtime -- Bash 5.2.12(1)-release +- Bash 5.2.15(1)-release - Go 1.17.13 - Julia 1.8.5 - Kotlin 1.8.10 - LLVM 15.0.7 -- Node 18.14.2 +- Node 18.15.0 - Perl 5.32.1 - PHP 8.2.3 - Python 3.9.13 @@ -22,14 +26,14 @@ ### Package Management - Chocolatey 1.3.0 - Composer 2.5.4 -- Helm 3.11.1 +- Helm 3.11.2 - Miniconda 23.1.0 (pre-installed on the image but not added to PATH) - NPM 9.5.0 - NuGet 6.5.0.154 - pip 23.0.1 (python 3.9) -- Pipx 1.1.0 +- Pipx 1.2.0 - RubyGems 3.2.33 -- Vcpkg (build from commit e69c9817d) +- Vcpkg (build from commit cfdeb75bb) - Yarn 1.22.19 #### Environment variables @@ -50,18 +54,18 @@ - azcopy 10.17.0 - Bazel 6.1.0 - Bazelisk 1.13.2 -- Bicep 0.14.85 -- Cabal 3.8.1.0 -- CMake 3.25.2 -- CodeQL Action Bundles 2.12.2 2.12.3 +- Bicep 0.15.31 +- Cabal 3.10.1.0 +- CMake 3.25.3 +- CodeQL Action Bundles 2.12.3 2.12.4 - Docker 23.0.1 - Docker Compose v1 1.29.2 - Docker Compose v2 2.16.0 - Docker-wincred 0.7.0 -- ghc 9.4.4 -- Git 2.39.2.windows.1 +- ghc 9.6.1 +- Git 2.40.0.windows.1 - Git LFS 3.3.0 -- ImageMagick 7.1.0-61 +- ImageMagick 7.1.1-3 - InnoSetup 6.2.2 - jq 1.6 - Kind 0.17.0 @@ -72,7 +76,7 @@ - NSIS 3.08 - OpenSSL 1.1.1 - Packer 1.8.5 -- Pulumi 3.56.0 +- Pulumi 3.57.1 - R 4.2.2 - Service Fabric SDK 9.1.1436.9590 - Stack 2.9.3 @@ -85,19 +89,19 @@ - zstd 1.5.4 ### CLI Tools -- Alibaba Cloud CLI 3.0.152 -- AWS CLI 2.11.0 +- Alibaba Cloud CLI 3.0.156 +- AWS CLI 2.11.2 - AWS SAM CLI 1.76.0 - AWS Session Manager CLI 1.2.398.0 - Azure CLI 2.46.0 - Azure DevOps CLI extension 0.26.0 -- GitHub CLI 2.23.0 +- GitHub CLI 2.24.3 - Hub CLI 2.14.2 ### Rust Tools -- Cargo 1.67.1 -- Rust 1.67.1 -- Rustdoc 1.67.1 +- Cargo 1.68.0 +- Rust 1.68.0 +- Rustdoc 1.68.0 - Rustup 1.25.2 #### Packages @@ -105,15 +109,15 @@ - cargo-audit 0.17.4 - cargo-outdated 0.11.2 - cbindgen 0.24.3 -- Clippy 0.1.67 +- Clippy 0.1.68 - Rustfmt 1.5.1 ### Browsers and Drivers -- Google Chrome 110.0.5481.178 -- Chrome Driver 110.0.5481.77 -- Microsoft Edge 110.0.1587.63 -- Microsoft Edge Driver 110.0.1587.63 -- Mozilla Firefox 110.0.1 +- Google Chrome 111.0.5563.65 +- Chrome Driver 111.0.5563.64 +- Microsoft Edge 111.0.1661.41 +- Microsoft Edge Driver 111.0.1661.41 +- Mozilla Firefox 111.0 - Gecko Driver 0.32.2 - IE Driver 4.8.0.0 - Selenium server 4.8.0 @@ -155,13 +159,13 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Go - 1.17.13 - 1.18.10 -- 1.19.6 -- 1.20.1 +- 1.19.7 +- 1.20.2 #### Node.js - 14.21.3 - 16.19.1 -- 18.14.2 +- 18.15.0 #### Python - 3.7.9 @@ -506,8 +510,6 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Microsoft Visual C++ | Name | Architecture | Version | | -------------------------------------------- | ------------ | ----------- | -| Microsoft Visual C++ 2010 Redistributable | x64 | 10.0.40219 | -| Microsoft Visual C++ 2010 Redistributable | x86 | 10.0.40219 | | Microsoft Visual C++ 2013 Additional Runtime | x64 | 12.0.40660 | | Microsoft Visual C++ 2013 Minimum Runtime | x64 | 12.0.40660 | | Microsoft Visual C++ 2022 Additional Runtime | x64 | 14.34.31938 | @@ -542,7 +544,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Az (Cached): 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.285 +- AWSPowershell: 4.1.290 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 - Microsoft.Graph: 1.23.0 @@ -559,19 +561,19 @@ All other versions are saved but not installed. ``` ### Android -| Package Name | Version | -| -------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 8.0 | -| Android Emulator | 31.2.9 | -| Android SDK Build-tools | 33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | -| Android SDK Platforms | android-33-ext4 (rev 1)<br>android-33 (rev 1)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | -| Android SDK Platform-Tools | 34.0.0 | -| Android Support Repository | 47.0.0 | -| CMake | 3.18.1<br>3.22.1 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 23.2.8568313<br>24.0.8215888<br>25.2.9519653 | -| SDK Patch Applier v4 | 1 | +| Package Name | Version | +| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | +| Android Command Line Tools | 8.0 | +| Android Emulator | 31.2.9 | +| Android SDK Build-tools | 33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | +| Android SDK Platforms | android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | +| Android SDK Platform-Tools | 34.0.1 | +| Android Support Repository | 47.0.0 | +| CMake | 3.18.1<br>3.22.1 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 23.2.8568313<br>24.0.8215888<br>25.2.9519653 | +| SDK Patch Applier v4 | 1 | #### Environment variables | Name | Value | @@ -591,3 +593,4 @@ All other versions are saved but not installed. | mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:13f41497e137a3495b0cefb7ce10f2cc65eca01925fff2ca595febe3bc1b6092 | 2023-02-21 | | mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:786a24be2bd1945bee9701f95a71d8573ace8641c112dc27206f826bef0229c1 | 2023-02-07 | | mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:5662262ca25622f4f8ad593481dd58dea47713bce5e6c9fdef9089a92e7c75b1 | 2023-02-07 | + From efd070e7b2cab786a6603503997304e32e14b1ef Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 17 Mar 2023 10:22:22 +0100 Subject: [PATCH 1813/3485] Updating readme file for win19 version 20230314.1 (#7285) Co-authored-by: Image generation service account <no-reply@microsoft.com> --- images/win/Windows2019-Readme.md | 95 +++++++++++++++++--------------- 1 file changed, 50 insertions(+), 45 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index 73029b6e5302..06be76819268 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -1,6 +1,10 @@ +| Announcements | +|-| +| [[All OSes] Go 1.17.x will be removed and 1.20.x set as default on April, 3](https://github.com/actions/runner-images/issues/7276) | +*** # Windows Server 2019 - OS Version: 10.0.17763 Build 4010 -- Image Version: 20230307.2 +- Image Version: 20230314.1 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -8,12 +12,12 @@ ## Installed Software ### Language and Runtime -- Bash 5.2.12(1)-release +- Bash 5.2.15(1)-release - Go 1.17.13 - Julia 1.8.5 - Kotlin 1.8.10 - LLVM 15.0.7 -- Node 18.14.2 +- Node 18.15.0 - Perl 5.32.1 - PHP 8.2.3 - Python 3.7.9 @@ -22,14 +26,14 @@ ### Package Management - Chocolatey 1.3.0 - Composer 2.5.4 -- Helm 3.11.1 +- Helm 3.11.2 - Miniconda 23.1.0 (pre-installed on the image but not added to PATH) - NPM 9.5.0 - NuGet 6.5.0.154 - pip 23.0.1 (python 3.7) -- Pipx 1.1.0 +- Pipx 1.2.0 - RubyGems 2.7.6.3 -- Vcpkg (build from commit e69c9817d) +- Vcpkg (build from commit cfdeb75bb) - Yarn 1.22.19 #### Environment variables @@ -50,19 +54,19 @@ - azcopy 10.17.0 - Bazel 6.1.0 - Bazelisk 1.13.2 -- Bicep 0.14.85 -- Cabal 3.8.1.0 -- CMake 3.25.2 -- CodeQL Action Bundles 2.12.2 2.12.3 +- Bicep 0.15.31 +- Cabal 3.10.1.0 +- CMake 3.25.3 +- CodeQL Action Bundles 2.12.3 2.12.4 - Docker 23.0.1 - Docker Compose v1 1.29.2 - Docker Compose v2 2.16.0 - Docker-wincred 0.7.0 -- ghc 9.4.4 -- Git 2.39.2.windows.1 +- ghc 9.6.1 +- Git 2.40.0.windows.1 - Git LFS 3.3.0 -- Google Cloud SDK 421.0.0 -- ImageMagick 7.1.0-61 +- Google Cloud SDK 422.0.0 +- ImageMagick 7.1.1-3 - InnoSetup 6.2.2 - jq 1.6 - Kind 0.17.0 @@ -74,7 +78,7 @@ - OpenSSL 1.1.1 - Packer 1.8.5 - Parcel 2.8.3 -- Pulumi 3.56.0 +- Pulumi 3.57.1 - R 4.2.2 - Service Fabric SDK 9.1.1436.9590 - Stack 2.9.3 @@ -87,20 +91,20 @@ - zstd 1.5.4 ### CLI Tools -- Alibaba Cloud CLI 3.0.152 -- AWS CLI 2.11.0 +- Alibaba Cloud CLI 3.0.156 +- AWS CLI 2.11.2 - AWS SAM CLI 1.76.0 - AWS Session Manager CLI 1.2.398.0 - Azure CLI 2.46.0 - Azure DevOps CLI extension 0.26.0 - Cloud Foundry CLI 6.53.0 -- GitHub CLI 2.23.0 +- GitHub CLI 2.24.3 - Hub CLI 2.14.2 ### Rust Tools -- Cargo 1.67.1 -- Rust 1.67.1 -- Rustdoc 1.67.1 +- Cargo 1.68.0 +- Rust 1.68.0 +- Rustdoc 1.68.0 - Rustup 1.25.2 #### Packages @@ -108,15 +112,15 @@ - cargo-audit 0.17.4 - cargo-outdated 0.11.2 - cbindgen 0.24.3 -- Clippy 0.1.67 +- Clippy 0.1.68 - Rustfmt 1.5.1 ### Browsers and Drivers -- Google Chrome 110.0.5481.178 -- Chrome Driver 110.0.5481.77 -- Microsoft Edge 110.0.1587.63 -- Microsoft Edge Driver 110.0.1587.63 -- Mozilla Firefox 110.0.1 +- Google Chrome 111.0.5563.65 +- Chrome Driver 111.0.5563.64 +- Microsoft Edge 111.0.1661.41 +- Microsoft Edge Driver 111.0.1661.41 +- Mozilla Firefox 111.0 - Gecko Driver 0.32.2 - IE Driver 4.8.0.0 - Selenium server 4.8.0 @@ -162,13 +166,13 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Go - 1.17.13 - 1.18.10 -- 1.19.6 -- 1.20.1 +- 1.19.7 +- 1.20.2 #### Node.js - 14.21.3 - 16.19.1 -- 18.14.2 +- 18.15.0 #### Python - 2.7.18 @@ -509,7 +513,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Az (Cached): 1.0.0.zip, 1.6.0.zip, 2.3.2.zip, 2.6.0.zip, 3.1.0.zip, 3.5.0.zip, 3.8.0.zip, 4.3.0.zip, 4.4.0.zip, 4.7.0.zip, 5.5.0.zip, 5.9.0.zip, 6.6.0.zip, 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.285 +- AWSPowershell: 4.1.290 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 - Microsoft.Graph: 1.23.0 @@ -526,20 +530,20 @@ All other versions are saved but not installed. ``` ### Android -| Package Name | Version | -| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 8.0 | -| Android SDK Build-tools | 33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3<br>26.0.0 26.0.1 26.0.2 26.0.3<br>25.0.0 25.0.1 25.0.2 25.0.3<br>24.0.0 24.0.1 24.0.2 24.0.3<br>23.0.1 23.0.2 23.0.3<br>22.0.1<br>21.1.2<br>20.0.0<br>19.1.0 | -| Android SDK Platforms | android-33-ext4 (rev 1)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3)<br>android-26 (rev 2)<br>android-25 (rev 3)<br>android-24 (rev 2)<br>android-23 (rev 3)<br>android-22 (rev 2)<br>android-21 (rev 2)<br>android-20 (rev 2)<br>android-19 (rev 4) | -| Android SDK Platform-Tools | 34.0.0 | -| Android SDK Tools | 26.1.1 | -| Android Support Repository | 47.0.0 | -| CMake | 3.10.2<br>3.18.1<br>3.22.1 | -| Google APIs | addon-google_apis-google-21<br>addon-google_apis-google-22<br>addon-google_apis-google-23<br>addon-google_apis-google-24 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 23.2.8568313<br>24.0.8215888<br>25.2.9519653 | -| SDK Patch Applier v4 | 1 | +| Package Name | Version | +| -------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 8.0 | +| Android SDK Build-tools | 33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3<br>26.0.0 26.0.1 26.0.2 26.0.3<br>25.0.0 25.0.1 25.0.2 25.0.3<br>24.0.0 24.0.1 24.0.2 24.0.3<br>23.0.1 23.0.2 23.0.3<br>22.0.1<br>21.1.2<br>20.0.0<br>19.1.0 | +| Android SDK Platforms | android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3)<br>android-26 (rev 2)<br>android-25 (rev 3)<br>android-24 (rev 2)<br>android-23 (rev 3)<br>android-22 (rev 2)<br>android-21 (rev 2)<br>android-20 (rev 2)<br>android-19 (rev 4) | +| Android SDK Platform-Tools | 34.0.1 | +| Android SDK Tools | 26.1.1 | +| Android Support Repository | 47.0.0 | +| CMake | 3.10.2<br>3.18.1<br>3.22.1 | +| Google APIs | addon-google_apis-google-21<br>addon-google_apis-google-22<br>addon-google_apis-google-23<br>addon-google_apis-google-24 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 23.2.8568313<br>24.0.8215888<br>25.2.9519653 | +| SDK Patch Applier v4 | 1 | #### Environment variables | Name | Value | @@ -559,3 +563,4 @@ All other versions are saved but not installed. | mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:eae7efdcfce460bec521b0719973ce77836793e4a954d4ee97756c468299671f | 2023-02-21 | | mcr.microsoft.com/windows/nanoserver:1809 | sha256:fc2d54de31f170c0bef160137b4dc0a80c2105a218b248dc71c754e1fcabd14f | 2023-02-07 | | mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:46b40e526196d42b78d6bc777529203fd51467b095ddcb7acc87fc475c3c5e55 | 2023-02-07 | + From ffd1b627e227d88a87d82f59754003e2d9b59c29 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 17 Mar 2023 09:34:45 +0000 Subject: [PATCH 1814/3485] Updating readme file for macOS-12 version 20230304.1 (#7249) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-12-Readme.md | 42 ++++++++++++++++----------------- 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/images/macos/macos-12-Readme.md b/images/macos/macos-12-Readme.md index ec17b1780c27..e0a3eebecc39 100644 --- a/images/macos/macos-12-Readme.md +++ b/images/macos/macos-12-Readme.md @@ -1,17 +1,16 @@ | Announcements | |-| -| [GCC-9 will be removed from macOS 11 on March, 6](https://github.com/actions/runner-images/issues/7136) | -| [Xcode 13.4 will be pointing to 13.4.1 on February, 27](https://github.com/actions/runner-images/issues/7127) | +| [GCC-9 will be removed from macOS 11 on March, 13](https://github.com/actions/runner-images/issues/7136) | *** # macOS 12 - OS Version: macOS 12.6.3 (21G419) - Kernel Version: Darwin 21.6.0 -- Image Version: 20230224.1 +- Image Version: 20230304.1 ## Installed Software ### Language and Runtime -- .NET Core SDK: 3.1.101, 3.1.201, 3.1.302, 3.1.426, 6.0.406, 7.0.102, 7.0.200 +- .NET Core SDK: 3.1.101, 3.1.201, 3.1.302, 3.1.426, 6.0.406, 7.0.102, 7.0.201 - Bash 3.2.57(1)-release - Clang/LLVM 14.0.0 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` @@ -37,9 +36,9 @@ ### Package Management - Bundler 2.4.7 - Carthage 0.39.0 -- CocoaPods 1.11.3 +- CocoaPods 1.12.0 - Composer 2.5.4 -- Homebrew 4.0.3 +- Homebrew 4.0.4 - Miniconda 23.1.0 - NPM 9.5.0 - NuGet 6.3.1.1 @@ -47,7 +46,7 @@ - Pip3 23.0.1 (python 3.11) - Pipx 1.1.0 - RubyGems 3.4.7 -- Vcpkg 2023 (build from commit 54cc53c43) +- Vcpkg 2023 (build from commit 8daf70c56) - Yarn 1.22.19 #### Environment variables @@ -59,7 +58,7 @@ ### Project Management - Apache Ant 1.10.13 - Apache Maven 3.9.0 -- Gradle 8.0.1 +- Gradle 8.0.2 - Sbt 1.8.2 ### Utilities @@ -83,7 +82,6 @@ - mongod 5.0.14 - OpenSSL 1.1.1t 7 Feb 2023 - Packer 1.8.6 -- pkg-config 0.29.2 - PostgreSQL 14.7 (Homebrew) - psql (PostgreSQL) 14.7 (Homebrew) - Sox 14.4.2 @@ -91,27 +89,27 @@ - Switchaudio-osx 1.1.0 - Vagrant 2.3.4 - VirtualBox 6.1.38r153438 -- yq 4.31.1 +- yq 4.31.2 - zstd 1.5.4 ### Tools - App Center CLI 2.13.2 -- AWS CLI 2.10.2 -- AWS SAM CLI 1.74.0 +- AWS CLI 2.11.0 +- AWS SAM CLI 1.76.0 - AWS Session Manager CLI 1.2.398.0 - Azure CLI 2.45.0 - Azure CLI (azure-devops) 0.26.0 - Bicep CLI 0.14.85 - Cabal 3.6.2.0 - Cmake 3.25.2 -- CodeQL Action Bundles 2.12.1 2.12.2 +- CodeQL Action Bundles 2.12.2 2.12.3 - Colima 0.5.2 -- Fastlane 2.212.0 +- Fastlane 2.212.1 - GHC 9.4.4 - GHCup 0.1.19.2 - Jazzy 0.14.3 -- Stack 2.9.1 -- SwiftFormat 0.50.9 +- Stack 2.9.3 +- SwiftFormat 0.51.1 - Swig 4.1.1 - Xcode Command Line Tools 14.2.0.0.1.1668646533 @@ -124,9 +122,9 @@ - SafariDriver 16.3 (17614.4.6.11.6) - Google Chrome 110.0.5481.177 - ChromeDriver 110.0.5481.77 -- Microsoft Edge 110.0.1587.50 -- Microsoft Edge WebDriver 110.0.1587.50 -- Mozilla Firefox 110.0 +- Microsoft Edge 110.0.1587.63 +- Microsoft Edge WebDriver 110.0.1587.63 +- Mozilla Firefox 110.0.1 - geckodriver 0.32.2 - Selenium server 4.8.0 @@ -195,7 +193,7 @@ - Rustfmt 1.5.1-stable ### PowerShell Tools -- PowerShell 7.2.9 +- PowerShell 7.2.10 #### PowerShell Modules - Az: 9.4.0 @@ -327,8 +325,8 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" | watchOS 8.0 | 13.1 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | | watchOS 8.3 | 13.2.1 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | | watchOS 8.5 | 13.3.1<br>13.4.1 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | -| watchOS 9.0 | 13.1<br>13.2.1<br>13.3.1<br>13.4.1<br>14.0.1<br>14.1<br>14.2 | Apple Watch SE - 40mm (2nd generation)<br>Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm<br>Apple Watch Series 8 - 41mm<br>Apple Watch Series 8 - 45mm<br>Apple Watch Ultra - 49mm | -| watchOS 9.1 | 13.1<br>13.2.1<br>13.3.1<br>13.4.1<br>14.0.1<br>14.1<br>14.2 | Apple Watch SE - 40mm (2nd generation)<br>Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm<br>Apple Watch Series 8 - 41mm<br>Apple Watch Series 8 - 45mm<br>Apple Watch Ultra - 49mm | +| watchOS 9.0 | 13.1<br>13.2.1<br>13.3.1<br>13.4.1<br>14.0.1<br>14.1<br>14.2 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | +| watchOS 9.1 | 13.1<br>13.2.1<br>13.3.1<br>13.4.1<br>14.0.1<br>14.1<br>14.2 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | ### Android | Package Name | Version | From 754cbccf56a74b2c06b14a6b02a16aed1b4ad14b Mon Sep 17 00:00:00 2001 From: Dusko Dobranic <101048884+ddobranic@users.noreply.github.com> Date: Fri, 17 Mar 2023 15:53:44 +0100 Subject: [PATCH 1815/3485] [Windows] AWS CLI session manager plugin test fix (#7294) --- images/win/scripts/Tests/CLI.Tools.Tests.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/win/scripts/Tests/CLI.Tools.Tests.ps1 b/images/win/scripts/Tests/CLI.Tools.Tests.ps1 index c508c4d729a3..cbf5d38c6fb8 100644 --- a/images/win/scripts/Tests/CLI.Tools.Tests.ps1 +++ b/images/win/scripts/Tests/CLI.Tools.Tests.ps1 @@ -24,7 +24,7 @@ Describe "AWS" { } It "Session Manager Plugin for the AWS CLI" { - session-manager-plugin | Out-String | Should -Match "plugin was installed successfully" + @(session-manager-plugin) -Match '\S' | Out-String | Should -Match "plugin was installed successfully" } It "AWS SAM CLI" { From f0e54bbe9fa9154d859b9532dc2d80643bbb5890 Mon Sep 17 00:00:00 2001 From: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com> Date: Fri, 17 Mar 2023 16:51:49 +0100 Subject: [PATCH 1816/3485] [macos] VMWare host selection: do not count "vmkdump" folder as possible vm name when choosing available datastore (#7301) --- images.CI/macos/select-datastore.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images.CI/macos/select-datastore.ps1 b/images.CI/macos/select-datastore.ps1 index cc7af8efa3fe..feec67bc9b4d 100644 --- a/images.CI/macos/select-datastore.ps1 +++ b/images.CI/macos/select-datastore.ps1 @@ -67,7 +67,7 @@ function Select-DataStore { $availableDatastores = $availableClusterDatastores ` | Where-Object { $_.FreeSpaceGB -ge $thresholdInGb } ` | Where-Object { - $vmOnDatastore = @((Get-ChildItem -Path $_.DatastoreBrowserPath).Name -notmatch "^\.").Count + $vmOnDatastore = @((Get-ChildItem -Path $_.DatastoreBrowserPath).Name -notmatch '(^\.|vmkdump)').Count $vmOnDatastore -lt $vmCount } ` | Group-Object -Property { $vmOnDatastore } From 4cd37cce64bec041fc28f2d48e93ac64d807e537 Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Tue, 21 Mar 2023 11:13:46 +0100 Subject: [PATCH 1817/3485] [Ubuntu] Install latest but not recomended Cabal (#7316) --- images/linux/scripts/installers/haskell.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/linux/scripts/installers/haskell.sh b/images/linux/scripts/installers/haskell.sh index 4d0acaf90799..fe775e138762 100644 --- a/images/linux/scripts/installers/haskell.sh +++ b/images/linux/scripts/installers/haskell.sh @@ -33,7 +33,7 @@ for majorMinorVersion in $minorMajorVersions; do done echo "install cabal..." -ghcup install cabal +ghcup install cabal latest chmod -R 777 $GHCUP_INSTALL_BASE_PREFIX/.ghcup ln -s $GHCUP_INSTALL_BASE_PREFIX/.ghcup /etc/skel/.ghcup From e37e2733755d0ff29e1f9172a8e93b72f41db6cf Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Tue, 21 Mar 2023 17:59:57 +0100 Subject: [PATCH 1818/3485] [macOS] Fix typo in TCC DB config (#7314) --- images/macos/provision/configuration/configure-tccdb-macos.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/macos/provision/configuration/configure-tccdb-macos.sh b/images/macos/provision/configuration/configure-tccdb-macos.sh index a4e7ff997c03..f9c8980128cc 100644 --- a/images/macos/provision/configuration/configure-tccdb-macos.sh +++ b/images/macos/provision/configuration/configure-tccdb-macos.sh @@ -12,7 +12,7 @@ systemValuesArray=( "'kTCCServiceAccessibility','com.apple.dt.Xcode-Helper',0,2,0,1,NULL,NULL,NULL,'UNUSED',NULL,NULL,1551941368" "'kTCCServiceSystemPolicyAllFiles','/bin/bash',1,2,0,1,NULL,NULL,NULL,'UNUSED',NULL,0,1583997993" "'kTCCServiceSystemPolicyAllFiles','/usr/libexec/sshd-keygen-wrapper',1,0,4,1,X'fade0c000000003c0000000100000006000000020000001d636f6d2e6170706c652e737368642d6b657967656e2d7772617070657200000000000003',NULL,0,'UNUSED',NULL,0,1639660695" - "'kTCCServiceSystemPolicyAllFiles',''com.apple.Terminal',0,2,4,1,X'fade0c000000003000000001000000060000000200000012636f6d2e6170706c652e5465726d696e616c000000000003',NULL,0,'UNUSED',NULL,0,1678990068" + "'kTCCServiceSystemPolicyAllFiles','com.apple.Terminal',0,2,4,1,X'fade0c000000003000000001000000060000000200000012636f6d2e6170706c652e5465726d696e616c000000000003',NULL,0,'UNUSED',NULL,0,1678990068" "'kTCCServiceAccessibility','/usr/libexec/sshd-keygen-wrapper',1,2,4,1,X'fade0c000000003c0000000100000006000000020000001d636f6d2e6170706c652e737368642d6b657967656e2d7772617070657200000000000003',NULL,0,'UNUSED',NULL,0,1644564233" "'kTCCServiceAccessibility','com.apple.Terminal',0,2,0,1,X'fade0c000000003000000001000000060000000200000012636f6d2e6170706c652e5465726d696e616c000000000003',NULL,NULL,'UNUSED',NULL,0,1591180502" "'kTCCServiceAccessibility','/bin/bash',1,2,0,1,NULL,NULL,NULL,'UNUSED',NULL,0,1583997993" @@ -23,7 +23,7 @@ systemValuesArray=( "'kTCCServiceSystemPolicyAllFiles','com.microsoft.wdav',0,2,4,1,NULL,NULL,NULL,'UNUSED',NULL,0,1643970979" "'kTCCServiceSystemPolicyAllFiles','com.microsoft.wdav.epsext',0,2,4,1,NULL,NULL,NULL,'UNUSED',NULL,0,1643970979" "'kTCCServiceSystemPolicyNetworkVolumes','/bin/bash',1,2,0,1,NULL,NULL,NULL,'UNUSED',NULL,0,1583997993" - "'kTCCServiceSystemPolicyNetworkVolumes',''com.apple.Terminal',0,2,4,1,X'fade0c000000003000000001000000060000000200000012636f6d2e6170706c652e5465726d696e616c000000000003',NULL,0,'UNUSED',NULL,0,1678990068" + "'kTCCServiceSystemPolicyNetworkVolumes','com.apple.Terminal',0,2,4,1,X'fade0c000000003000000001000000060000000200000012636f6d2e6170706c652e5465726d696e616c000000000003',NULL,0,'UNUSED',NULL,0,1678990068" ) for values in "${systemValuesArray[@]}"; do configure_system_tccdb "$values" From 39fc5b4fff470976f7f98b95257eff14987f500c Mon Sep 17 00:00:00 2001 From: Dusko Dobranic <101048884+ddobranic@users.noreply.github.com> Date: Wed, 22 Mar 2023 08:45:17 +0100 Subject: [PATCH 1819/3485] [macOS] Use variable instead of hard coded value (#7214) --- images/macos/helpers/Common.Helpers.psm1 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/images/macos/helpers/Common.Helpers.psm1 b/images/macos/helpers/Common.Helpers.psm1 index 8d1dd4241ff5..d877e5acdd66 100644 --- a/images/macos/helpers/Common.Helpers.psm1 +++ b/images/macos/helpers/Common.Helpers.psm1 @@ -101,7 +101,8 @@ function Start-DownloadWithRetry { [string] $Url, [string] $Name, [string] $DownloadPath = "${env:Temp}", - [int] $Retries = 20 + [int] $Retries = 20, + [int] $Interval = 30 ) if ([String]::IsNullOrEmpty($Name)) { @@ -130,8 +131,8 @@ function Start-DownloadWithRetry { exit 1 } - Write-Host "Waiting 30 seconds before retrying. Retries left: $Retries" - Start-Sleep -Seconds 30 + Write-Host "Waiting $Interval seconds before retrying. Retries left: $Retries" + Start-Sleep -Seconds $Interval } } From 964b509df08515ec8723683431dd966dacffbfbd Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Wed, 22 Mar 2023 08:49:54 +0100 Subject: [PATCH 1820/3485] Update SBOM workflow to use syft with bash shell for macOS (#7322) --- .github/workflows/create_sbom_report.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/create_sbom_report.yml b/.github/workflows/create_sbom_report.yml index 38831a610b42..fb3a43806d42 100644 --- a/.github/workflows/create_sbom_report.yml +++ b/.github/workflows/create_sbom_report.yml @@ -46,6 +46,7 @@ jobs: - name: Run SYFT on macOS if: ${{ runner.os == 'macOS' }} run: syft dir:/ -vv -o spdx-json=sbom.json --exclude ./Users --exclude ./System/Volumes --exclude ./private + shell: bash #Preparing artifact (raw SBOM.json is too big) - name: Compress SBOM file run: Compress-Archive sbom.json sbom.json.zip From efde1c17f1401a62f68e6040f51c4a02489fd245 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 23 Mar 2023 18:39:17 +0000 Subject: [PATCH 1821/3485] Updating readme file for ubuntu22 version 20230317.1 (#7311) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2204-Readme.md | 45 ++++++++++++++++--------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/images/linux/Ubuntu2204-Readme.md b/images/linux/Ubuntu2204-Readme.md index e54135fe0374..efe127a2b06b 100644 --- a/images/linux/Ubuntu2204-Readme.md +++ b/images/linux/Ubuntu2204-Readme.md @@ -6,7 +6,7 @@ # Ubuntu 22.04 - OS Version: 22.04.2 LTS - Kernel Version: 5.15.0-1034-azure -- Image Version: 20230313.1 +- Image Version: 20230317.1 ## Installed Software @@ -40,7 +40,7 @@ - Pip3 22.0.2 - Pipx 1.2.0 - RubyGems 3.3.5 -- Vcpkg (build from commit cfdeb75bb) +- Vcpkg (build from commit ffe7360e0) - Yarn 1.22.19 #### Environment variables @@ -59,17 +59,17 @@ to accomplish this. ### Project Management - Lerna 6.5.1 -- Maven 3.8.7 +- Maven 3.8.8 ### Tools - Ansible 2.14.3 - apt-fast 1.9.12 - AzCopy 10.17.0 - available by `azcopy` and `azcopy10` aliases -- Bazel 6.1.0 +- Bazel 6.1.1 - Bazelisk 1.13.2 - Bicep 0.15.31 - Buildah 1.23.1 -- CMake 3.25.3 +- CMake 3.26.0 - CodeQL Action Bundles 2.12.3 2.12.4 - Docker Amazon ECR Credential Helper 0.6.0 - Docker Compose v1 1.29.2 @@ -78,15 +78,15 @@ to accomplish this. - Docker-Moby Client 20.10.23+azure-2 - Docker-Moby Server 20.10.23+azure-2 - Fastlane 2.212.1 -- Git 2.39.2 +- Git 2.40.0 - Git LFS 3.3.0 - Git-ftp 1.6.0 - Haveged 1.9.14 - Heroku 7.69.1 - jq 1.6 - Kind 0.17.0 -- Kubectl 1.26.2 -- Kustomize 5.0.0 +- Kubectl 1.26.3 +- Kustomize 5.0.1 - Leiningen 2.10.0 - MediaInfo 21.09 - Mercurial 6.1.1 @@ -98,30 +98,30 @@ to accomplish this. - Packer 1.8.6 - Parcel 2.8.3 - Podman 3.4.4 -- Pulumi 3.57.1 +- Pulumi 3.58.0 - R 4.2.2 - Skopeo 1.4.1 - Sphinx Open Source Search Server 2.2.11 - SVN 1.14.1 -- Terraform 1.4.0 +- Terraform 1.4.2 - yamllint 1.29.0 - yq 4.31.2 - zstd 1.5.4 ### CLI Tools -- Alibaba Cloud CLI 3.0.156 -- AWS CLI 2.11.2 -- AWS CLI Session Manager Plugin 1.2.398.0 +- Alibaba Cloud CLI 3.0.157 +- AWS CLI 2.11.4 +- AWS CLI Session Manager Plugin 1.2.463.0 - AWS SAM CLI 1.76.0 - Azure CLI 2.46.0 - Azure CLI (azure-devops) 0.26.0 - GitHub CLI 2.24.3 -- Google Cloud SDK 421.0.0 +- Google Cloud SDK 422.0.0 - Hub CLI 2.14.2 -- Netlify CLI 13.1.3 +- Netlify CLI 13.1.6 - OpenShift CLI 4.12.7 - ORAS CLI 0.16.0 -- Vercel CLI 28.16.15 +- Vercel CLI 28.17.0 ### Java | Version | Vendor | Environment Variable | @@ -167,8 +167,8 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Google Chrome 111.0.5563.64 - ChromeDriver 111.0.5563.64 - Chromium 111.0.5547.0 -- Microsoft Edge 111.0.1661.41 -- Microsoft Edge WebDriver 111.0.1661.41 +- Microsoft Edge 111.0.1661.44 +- Microsoft Edge WebDriver 111.0.1661.44 - Selenium server 4.8.0 - Mozilla Firefox 111.0 - Geckodriver 0.32.2 @@ -182,7 +182,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | ### .NET Tools -- .NET Core SDK: 6.0.406, 7.0.103, 7.0.201 +- .NET Core SDK: 6.0.407, 7.0.104, 7.0.202 - nbgv 3.5.119+5d25f54fec ### Databases @@ -285,6 +285,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | alpine:3.14 | sha256:fa26727c28837d1471c2f1524d297a0255c153b5d023d7badd1412be7e6e12a2 | 2023-02-11 | | alpine:3.15 | sha256:59b00c6f1614a599aa83d946d2a276c9257d2d29461c86c6a114d9932f2ddcd4 | 2023-02-11 | | alpine:3.16 | sha256:2cf17aa35fbcb6ece81692a64bfbadaf096590241ed9f95dd5f94f0e9f674784 | 2023-02-11 | +| alpine:3.17 | sha256:ff6bdca1701f3a8a67e328815ff2346b0e4067d32ec36b7992c1fdc001dc8517 | 2023-02-11 | | buildpack-deps:bullseye | sha256:6f2703639d3d17f70288d4ba212d55e159b682a990c20fc2a6562b098f01a1e7 | 2023-03-01 | | buildpack-deps:buster | sha256:63be0fe0bfb9d06b8747dcd87683787ef6d82c6f05b8a2ae213c38d56dc2bf53 | 2023-03-01 | | debian:10 | sha256:2d356e1e22c0902f88ef65cb7159ecd5a96feb62345747edfd4324b0d83a2923 | 2023-03-01 | @@ -296,9 +297,9 @@ Use the following command as a part of your job to start the service: 'sudo syst | node:16-alpine | sha256:fcb03294d3c0695cf9762dec94c0366f08e7a8c6a3c1e062d38c80ac30684d8a | 2023-02-21 | | node:18 | sha256:8d9a875ee427897ef245302e31e2319385b092f1c3368b497e89790f240368f5 | 2023-03-08 | | node:18-alpine | sha256:ffc770cdc09c9e83cccd99d663bb6ed56cfaa1bab94baf1b12b626aebeca9c10 | 2023-03-08 | -| ubuntu:18.04 | sha256:1e32b9c52e8f22769df41e8f61066c77b2b35b0a423c4161c0e48eca2fd24f75 | 2023-03-01 | -| ubuntu:20.04 | sha256:9fa30fcef427e5e88c76bc41ad37b7cc573e1d79cecb23035e413c4be6e476ab | 2023-03-01 | -| ubuntu:22.04 | sha256:2adf22367284330af9f832ffefb717c78239f6251d9d0f58de50b86229ed1427 | 2023-03-01 | +| ubuntu:18.04 | sha256:8aa9c2798215f99544d1ce7439ea9c3a6dfd82de607da1cec3a8a2fae005931b | 2023-03-08 | +| ubuntu:20.04 | sha256:24a0df437301598d1a4b62ddf59fa0ed2969150d70d748c84225e6501e9c36b9 | 2023-03-08 | +| ubuntu:22.04 | sha256:67211c14fa74f070d27cc59d69a7fa9aeff8e28ea118ef3babc295a0428a6d21 | 2023-03-08 | ### Installed apt packages | Name | Version | From 073720049bc4c959beb468a5754262396479bd58 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 23 Mar 2023 21:50:57 +0000 Subject: [PATCH 1822/3485] Updating readme file for ubuntu20 version 20230317.1 (#7310) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2004-Readme.md | 47 ++++++++++++++++--------------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/images/linux/Ubuntu2004-Readme.md b/images/linux/Ubuntu2004-Readme.md index 46ce1713bc32..40f36e4c0d35 100644 --- a/images/linux/Ubuntu2004-Readme.md +++ b/images/linux/Ubuntu2004-Readme.md @@ -4,9 +4,9 @@ | [The Ubuntu 18.04 Actions runner image will begin deprecation on 2022/08/08 and will be fully unsupported by 2023/04/01](https://github.com/actions/runner-images/issues/6002) | *** # Ubuntu 20.04 -- OS Version: 20.04.5 LTS +- OS Version: 20.04.6 LTS - Kernel Version: 5.15.0-1034-azure -- Image Version: 20230313.1 +- Image Version: 20230317.1 ## Installed Software @@ -42,7 +42,7 @@ - Pip3 20.0.2 - Pipx 1.2.0 - RubyGems 3.1.2 -- Vcpkg (build from commit cfdeb75bb) +- Vcpkg (build from commit ffe7360e0) - Yarn 1.22.19 #### Environment variables @@ -63,18 +63,18 @@ to accomplish this. - Ant 1.10.7 - Gradle 8.0.2 - Lerna 6.5.1 -- Maven 3.8.7 +- Maven 3.8.8 - Sbt 1.8.2 ### Tools - Ansible 2.13.8 - apt-fast 1.9.12 - AzCopy 10.17.0 - available by `azcopy` and `azcopy10` aliases -- Bazel 6.1.0 +- Bazel 6.1.1 - Bazelisk 1.13.2 - Bicep 0.15.31 - Buildah 1.22.3 -- CMake 3.25.3 +- CMake 3.26.0 - CodeQL Action Bundles 2.12.3 2.12.4 - Docker Amazon ECR Credential Helper 0.6.0 - Docker Compose v1 1.29.2 @@ -83,7 +83,7 @@ to accomplish this. - Docker-Moby Client 20.10.23+azure-2 - Docker-Moby Server 20.10.23+azure-2 - Fastlane 2.212.1 -- Git 2.39.2 +- Git 2.40.0 - Git LFS 3.3.0 - Git-ftp 1.6.0 - Haveged 1.9.1 @@ -91,8 +91,8 @@ to accomplish this. - HHVM (HipHop VM) 4.172.1 - jq 1.6 - Kind 0.17.0 -- Kubectl 1.26.2 -- Kustomize 5.0.0 +- Kubectl 1.26.3 +- Kustomize 5.0.1 - Leiningen 2.10.0 - MediaInfo 19.09 - Mercurial 5.3.1 @@ -105,30 +105,30 @@ to accomplish this. - Parcel 2.8.3 - PhantomJS 2.1.1 - Podman 3.4.2 -- Pulumi 3.57.1 +- Pulumi 3.58.0 - R 4.2.2 - Skopeo 1.5.0 - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 -- Terraform 1.4.0 +- Terraform 1.4.2 - yamllint 1.29.0 - yq 4.31.2 - zstd 1.5.4 ### CLI Tools -- Alibaba Cloud CLI 3.0.156 -- AWS CLI 2.11.2 -- AWS CLI Session Manager Plugin 1.2.398.0 +- Alibaba Cloud CLI 3.0.157 +- AWS CLI 2.11.4 +- AWS CLI Session Manager Plugin 1.2.463.0 - AWS SAM CLI 1.76.0 - Azure CLI 2.46.0 - Azure CLI (azure-devops) 0.26.0 - GitHub CLI 2.24.3 -- Google Cloud SDK 421.0.0 +- Google Cloud SDK 422.0.0 - Hub CLI 2.14.2 -- Netlify CLI 13.1.3 +- Netlify CLI 13.1.6 - OpenShift CLI 4.12.7 - ORAS CLI 0.16.0 -- Vercel CLI 28.16.15 +- Vercel CLI 28.17.0 ### Java | Version | Vendor | Environment Variable | @@ -143,7 +143,7 @@ to accomplish this. | CE 22.3.1 | GRAALVM_11_ROOT | ### PHP Tools -- PHP: 7.4.33, 8.0.28, 8.1.16, 8.2.3 +- PHP: 7.4.33, 8.0.28, 8.1.17, 8.2.4 - Composer 2.5.4 - PHPUnit 8.5.33 ``` @@ -174,8 +174,8 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Google Chrome 111.0.5563.64 - ChromeDriver 111.0.5563.64 - Chromium 111.0.5547.0 -- Microsoft Edge 111.0.1661.41 -- Microsoft Edge WebDriver 111.0.1661.41 +- Microsoft Edge 111.0.1661.44 +- Microsoft Edge WebDriver 111.0.1661.44 - Selenium server 4.8.0 - Mozilla Firefox 111.0 - Geckodriver 0.32.2 @@ -189,7 +189,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | ### .NET Tools -- .NET Core SDK: 3.1.120, 3.1.202, 3.1.302, 3.1.426, 6.0.406, 7.0.103, 7.0.201 +- .NET Core SDK: 3.1.120, 3.1.202, 3.1.302, 3.1.426, 6.0.407, 7.0.104, 7.0.202 - nbgv 3.5.119+5d25f54fec ### Databases @@ -303,6 +303,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | alpine:3.14 | sha256:fa26727c28837d1471c2f1524d297a0255c153b5d023d7badd1412be7e6e12a2 | 2023-02-11 | | alpine:3.15 | sha256:59b00c6f1614a599aa83d946d2a276c9257d2d29461c86c6a114d9932f2ddcd4 | 2023-02-11 | | alpine:3.16 | sha256:2cf17aa35fbcb6ece81692a64bfbadaf096590241ed9f95dd5f94f0e9f674784 | 2023-02-11 | +| alpine:3.17 | sha256:ff6bdca1701f3a8a67e328815ff2346b0e4067d32ec36b7992c1fdc001dc8517 | 2023-02-11 | | buildpack-deps:bullseye | sha256:6f2703639d3d17f70288d4ba212d55e159b682a990c20fc2a6562b098f01a1e7 | 2023-03-01 | | buildpack-deps:buster | sha256:63be0fe0bfb9d06b8747dcd87683787ef6d82c6f05b8a2ae213c38d56dc2bf53 | 2023-03-01 | | buildpack-deps:stretch | sha256:78e995165a5788c2f55aed6e548d8f6c1534830d4310c870408fccb2da8c5b2e | 2022-06-23 | @@ -317,8 +318,8 @@ Use the following command as a part of your job to start the service: 'sudo syst | node:18 | sha256:8d9a875ee427897ef245302e31e2319385b092f1c3368b497e89790f240368f5 | 2023-03-08 | | node:18-alpine | sha256:ffc770cdc09c9e83cccd99d663bb6ed56cfaa1bab94baf1b12b626aebeca9c10 | 2023-03-08 | | ubuntu:16.04 | sha256:1f1a2d56de1d604801a9671f301190704c25d604a416f59e03c04f5c6ffee0d6 | 2021-08-31 | -| ubuntu:18.04 | sha256:1e32b9c52e8f22769df41e8f61066c77b2b35b0a423c4161c0e48eca2fd24f75 | 2023-03-01 | -| ubuntu:20.04 | sha256:9fa30fcef427e5e88c76bc41ad37b7cc573e1d79cecb23035e413c4be6e476ab | 2023-03-01 | +| ubuntu:18.04 | sha256:8aa9c2798215f99544d1ce7439ea9c3a6dfd82de607da1cec3a8a2fae005931b | 2023-03-08 | +| ubuntu:20.04 | sha256:24a0df437301598d1a4b62ddf59fa0ed2969150d70d748c84225e6501e9c36b9 | 2023-03-08 | ### Installed apt packages | Name | Version | From 0f6480a303676a2b8fe9b53b160112c1293fe699 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 24 Mar 2023 09:20:48 +0000 Subject: [PATCH 1823/3485] Updating readme file for macOS-12 version 20230318.1 (#7309) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-12-Readme.md | 117 ++++++++++++++++---------------- 1 file changed, 59 insertions(+), 58 deletions(-) diff --git a/images/macos/macos-12-Readme.md b/images/macos/macos-12-Readme.md index e0a3eebecc39..baaf1e78764f 100644 --- a/images/macos/macos-12-Readme.md +++ b/images/macos/macos-12-Readme.md @@ -1,16 +1,17 @@ | Announcements | |-| -| [GCC-9 will be removed from macOS 11 on March, 13](https://github.com/actions/runner-images/issues/7136) | +| [[All OSes] Go 1.17.x will be removed and 1.20.x set as default on April, 3](https://github.com/actions/runner-images/issues/7276) | +| [GCC-9 will be removed from macOS 11 on March, 20](https://github.com/actions/runner-images/issues/7136) | *** # macOS 12 - OS Version: macOS 12.6.3 (21G419) - Kernel Version: Darwin 21.6.0 -- Image Version: 20230304.1 +- Image Version: 20230318.1 ## Installed Software ### Language and Runtime -- .NET Core SDK: 3.1.101, 3.1.201, 3.1.302, 3.1.426, 6.0.406, 7.0.102, 7.0.201 +- .NET Core SDK: 3.1.101, 3.1.201, 3.1.302, 3.1.426, 6.0.407, 7.0.102, 7.0.202 - Bash 3.2.57(1)-release - Clang/LLVM 14.0.0 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` @@ -23,30 +24,30 @@ - Kotlin 1.8.10-release-430 - Mono 6.12.0.188 - MSBuild 16.10.1.51301 (Mono 6.12.0.188) -- Node.js 18.14.2 +- Node.js 18.15.0 - NVM 0.39.3 -- NVM - Cached node versions: 14.21.3, 16.19.1, 18.14.2 +- NVM - Cached node versions: 14.21.3, 16.19.1, 18.15.0 - Perl 5.36.0 -- PHP 8.2.3 +- PHP 8.2.4 - Python 2.7.18 - Python3 3.11.2 -- R 4.2.2 +- R 4.2.3 - Ruby 3.0.5p211 ### Package Management -- Bundler 2.4.7 +- Bundler 2.4.8 - Carthage 0.39.0 - CocoaPods 1.12.0 - Composer 2.5.4 -- Homebrew 4.0.4 +- Homebrew 4.0.6 - Miniconda 23.1.0 - NPM 9.5.0 - NuGet 6.3.1.1 - Pip 20.3.4 (python 2.7) - Pip3 23.0.1 (python 3.11) -- Pipx 1.1.0 -- RubyGems 3.4.7 -- Vcpkg 2023 (build from commit 8daf70c56) +- Pipx 1.2.0 +- RubyGems 3.4.8 +- Vcpkg 2023 (build from commit ffe7360e0) - Yarn 1.22.19 #### Environment variables @@ -62,24 +63,24 @@ - Sbt 1.8.2 ### Utilities -- 7-Zip 17.04 +- 7-Zip 17.05 - aria2 1.36.0 - azcopy 10.17.0 -- bazel 6.0.0 +- bazel 6.1.1 - bazelisk 1.16.0 - bsdtar 3.5.1 - available by 'tar' alias - Curl 7.88.1 -- Git 2.39.2 +- Git 2.40.0 - Git LFS 3.3.0 -- GitHub CLI 2.23.0 +- GitHub CLI 2.24.3 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.3 - gpg (GnuPG) 2.4.0 - Hub CLI 2.14.2 -- ImageMagick 7.1.0-62 +- ImageMagick 7.1.1-3 - jq 1.6 -- mongo 5.0.14 -- mongod 5.0.14 +- mongo 5.0.15 +- mongod 5.0.15 - OpenSSL 1.1.1t 7 Feb 2023 - Packer 1.8.6 - PostgreSQL 14.7 (Homebrew) @@ -89,27 +90,27 @@ - Switchaudio-osx 1.1.0 - Vagrant 2.3.4 - VirtualBox 6.1.38r153438 -- yq 4.31.2 +- yq 4.32.1 - zstd 1.5.4 ### Tools -- App Center CLI 2.13.2 -- AWS CLI 2.11.0 +- App Center CLI 2.13.3 +- AWS CLI 2.11.4 - AWS SAM CLI 1.76.0 - AWS Session Manager CLI 1.2.398.0 -- Azure CLI 2.45.0 +- Azure CLI 2.46.0 - Azure CLI (azure-devops) 0.26.0 -- Bicep CLI 0.14.85 +- Bicep CLI 0.15.31 - Cabal 3.6.2.0 -- Cmake 3.25.2 -- CodeQL Action Bundles 2.12.2 2.12.3 -- Colima 0.5.2 +- Cmake 3.26.0 +- CodeQL Action Bundles 2.12.3 2.12.4 +- Colima 0.5.4 - Fastlane 2.212.1 -- GHC 9.4.4 +- GHC 9.6.1 - GHCup 0.1.19.2 - Jazzy 0.14.3 - Stack 2.9.3 -- SwiftFormat 0.51.1 +- SwiftFormat 0.51.2 - Swig 4.1.1 - Xcode Command Line Tools 14.2.0.0.1.1668646533 @@ -120,18 +121,18 @@ ### Browsers - Safari 16.3 (17614.4.6.11.6) - SafariDriver 16.3 (17614.4.6.11.6) -- Google Chrome 110.0.5481.177 -- ChromeDriver 110.0.5481.77 -- Microsoft Edge 110.0.1587.63 -- Microsoft Edge WebDriver 110.0.1587.63 -- Mozilla Firefox 110.0.1 +- Google Chrome 111.0.5563.64 +- ChromeDriver 111.0.5563.64 +- Microsoft Edge 111.0.1661.44 +- Microsoft Edge WebDriver 111.0.1661.44 +- Mozilla Firefox 111.0 - geckodriver 0.32.2 - Selenium server 4.8.0 #### Environment variables | Name | Value | | --------------- | ---------------------------------------------- | -| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/110.0.5481.77 | +| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/111.0.5563.64 | | EDGEWEBDRIVER | /usr/local/share/edge_driver | | GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | @@ -155,7 +156,7 @@ - 3.1.3 #### Python -- 3.7.15 +- 3.7.16 - 3.8.16 - 3.9.16 - 3.10.10 @@ -170,18 +171,18 @@ #### Node.js - 14.21.3 - 16.19.1 -- 18.14.2 +- 18.15.0 #### Go - 1.17.13 - 1.18.10 -- 1.19.6 -- 1.20.1 +- 1.19.7 +- 1.20.2 ### Rust Tools -- Cargo 1.67.1 -- Rust 1.67.1 -- Rustdoc 1.67.1 +- Cargo 1.68.0 +- Rust 1.68.0 +- Rustdoc 1.68.0 - Rustup 1.25.2 #### Packages @@ -189,14 +190,14 @@ - Cargo-audit 0.17.4 - Cargo-outdated 0.11.2 - Cbindgen 0.24.3 -- Clippy 0.1.67 +- Clippy 0.1.68 - Rustfmt 1.5.1-stable ### PowerShell Tools - PowerShell 7.2.10 #### PowerShell Modules -- Az: 9.4.0 +- Az: 9.5.0 - MarkdownPS: 1.9 - Pester: 5.4.0 - PSScriptAnalyzer: 1.21.0 @@ -204,7 +205,7 @@ ### Web Servers | Name | Version | ConfigFile | ServiceStatus | ListenPort | | ----- | ------- | ------------------------------- | ------------- | ---------- | -| httpd | 2.4.55 | /usr/local/etc/httpd/httpd.conf | none | 80 | +| httpd | 2.4.56 | /usr/local/etc/httpd/httpd.conf | none | 80 | | nginx | 1.23.3 | /usr/local/etc/nginx/nginx.conf | none | 80 | ### Xamarin @@ -329,19 +330,19 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" | watchOS 9.1 | 13.1<br>13.2.1<br>13.3.1<br>13.4.1<br>14.0.1<br>14.1<br>14.2 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | ### Android -| Package Name | Version | -| -------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 8.0 | -| Android Emulator | 32.1.11 | -| Android SDK Build-tools | 33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | -| Android SDK Platforms | android-33-ext4 (rev 1)<br>android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | -| Android SDK Platform-Tools | 34.0.0 | -| Android Support Repository | 47.0.0 | -| CMake | 3.18.1<br>3.22.1 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 23.2.8568313<br>24.0.8215888<br>25.2.9519653 (default) | -| SDK Patch Applier v4 | 1 | +| Package Name | Version | +| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | +| Android Command Line Tools | 8.0 | +| Android Emulator | 32.1.11 | +| Android SDK Build-tools | 33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | +| Android SDK Platforms | android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | +| Android SDK Platform-Tools | 34.0.1 | +| Android Support Repository | 47.0.0 | +| CMake | 3.18.1<br>3.22.1 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 23.2.8568313<br>24.0.8215888<br>25.2.9519653 (default) | +| SDK Patch Applier v4 | 1 | #### Environment variables | Name | Value | From 3c5dc9d3a7d0a9b562464587ff9e243ca3094801 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 27 Mar 2023 09:41:26 +0000 Subject: [PATCH 1824/3485] Updating readme file for macOS-11 version 20230318.1 (#7308) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-11-Readme.md | 125 ++++++++++++++++---------------- 1 file changed, 62 insertions(+), 63 deletions(-) diff --git a/images/macos/macos-11-Readme.md b/images/macos/macos-11-Readme.md index 7ec9d058fe1e..796ba9fa08f1 100644 --- a/images/macos/macos-11-Readme.md +++ b/images/macos/macos-11-Readme.md @@ -1,24 +1,23 @@ | Announcements | |-| -| [GCC-9 will be removed from macOS 11 on March, 13](https://github.com/actions/runner-images/issues/7136) | +| [[All OSes] Go 1.17.x will be removed and 1.20.x set as default on April, 3](https://github.com/actions/runner-images/issues/7276) | +| [GCC-9 will be removed from macOS 11 on March, 20](https://github.com/actions/runner-images/issues/7136) | *** # macOS 11 - OS Version: macOS 11.7.4 (20G1120) - Kernel Version: Darwin 20.6.0 -- Image Version: 20230303.1 +- Image Version: 20230318.1 ## Installed Software ### Language and Runtime -- .NET Core SDK: 3.1.101, 3.1.201, 3.1.302, 3.1.426, 6.0.406, 7.0.102, 7.0.201 +- .NET Core SDK: 3.1.101, 3.1.201, 3.1.302, 3.1.426, 6.0.407, 7.0.102, 7.0.202 - Bash 3.2.57(1)-release - Clang/LLVM 13.0.0 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` -- GCC 9 (Homebrew GCC 9.5.0) - available by `gcc-9` alias - GCC 10 (Homebrew GCC 10.4.0) - available by `gcc-10` alias - GCC 11 (Homebrew GCC 11.3.0) - available by `gcc-11` alias - GCC 12 (Homebrew GCC 12.2.0) - available by `gcc-12` alias -- GNU Fortran 9 (Homebrew GCC 9.5.0) - available by `gfortran-9` alias - GNU Fortran 10 (Homebrew GCC 10.4.0) - available by `gfortran-10` alias - GNU Fortran 11 (Homebrew GCC 11.3.0) - available by `gfortran-11` alias - GNU Fortran 12 (Homebrew GCC 12.2.0) - available by `gfortran-12` alias @@ -27,30 +26,30 @@ - Kotlin 1.8.10-release-430 - Mono 6.12.0.188 - MSBuild 16.10.1.51301 (Mono 6.12.0.188) -- Node.js 18.14.2 +- Node.js 18.15.0 - NVM 0.39.3 -- NVM - Cached node versions: 14.21.3, 16.19.1, 18.14.2 +- NVM - Cached node versions: 14.21.3, 16.19.1, 18.15.0 - Perl 5.36.0 -- PHP 8.2.3 +- PHP 8.2.4 - Python 2.7.18 - Python3 3.11.2 -- R 4.2.2 +- R 4.2.3 - Ruby 2.7.7p221 ### Package Management -- Bundler 2.4.7 +- Bundler 2.4.8 - Carthage 0.39.0 - CocoaPods 1.12.0 - Composer 2.5.4 -- Homebrew 4.0.4 +- Homebrew 4.0.6 - Miniconda 23.1.0 - NPM 9.5.0 - NuGet 6.3.1.1 - Pip 20.3.4 (python 2.7) - Pip3 23.0.1 (python 3.11) -- Pipx 1.1.0 -- RubyGems 3.4.7 -- Vcpkg 2023 (build from commit 8daf70c56) +- Pipx 1.2.0 +- RubyGems 3.4.8 +- Vcpkg 2023 (build from commit ffe7360e0) - Yarn 1.22.19 #### Environment variables @@ -61,30 +60,30 @@ ### Project Management - Apache Ant 1.10.13 -- Apache Maven 3.9.0 +- Apache Maven 3.9.1 - Gradle 8.0.2 - Sbt 1.8.2 ### Utilities -- 7-Zip 17.04 +- 7-Zip 17.05 - aria2 1.36.0 - azcopy 10.17.0 -- bazel 6.0.0 +- bazel 6.1.1 - bazelisk 1.16.0 - bsdtar 3.3.2 - available by 'tar' alias - Curl 7.88.1 -- Git 2.39.2 +- Git 2.40.0 - Git LFS 3.3.0 -- GitHub CLI 2.23.0 +- GitHub CLI 2.24.3 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.3 - gpg (GnuPG) 2.4.0 -- helm v3.11.1+g293b50c +- helm v3.11.2+g912ebc1 - Hub CLI 2.14.2 -- ImageMagick 7.1.0-62 +- ImageMagick 7.1.1-4 - jq 1.6 -- mongo 5.0.14 -- mongod 5.0.14 +- mongo 5.0.15 +- mongod 5.0.15 - Newman 5.3.2 - OpenSSL 1.1.1t 7 Feb 2023 - Packer 1.8.6 @@ -93,27 +92,27 @@ - Sox 14.4.2 - Subversion (SVN) 1.14.2 - Switchaudio-osx 1.1.0 -- yq 4.31.2 +- yq 4.32.1 - zstd 1.5.4 ### Tools - Aliyun CLI 3.0.152 -- App Center CLI 2.13.2 -- AWS CLI 2.11.0 -- AWS SAM CLI 1.75.0 -- AWS Session Manager CLI 1.2.398.0 -- Azure CLI 2.45.0 +- App Center CLI 2.13.3 +- AWS CLI 2.11.4 +- AWS SAM CLI 1.76.0 +- AWS Session Manager CLI 1.2.463.0 +- Azure CLI 2.46.0 - Azure CLI (azure-devops) 0.26.0 -- Bicep CLI 0.14.85 +- Bicep CLI 0.15.31 - Cabal 3.6.2.0 -- Cmake 3.25.2 -- CodeQL Action Bundles 2.12.2 2.12.3 +- Cmake 3.26.0 +- CodeQL Action Bundles 2.12.3 2.12.4 - Fastlane 2.212.1 -- GHC 9.4.4 +- GHC 9.6.1 - GHCup 0.1.19.2 - Jazzy 0.14.3 - Stack 2.9.3 -- SwiftFormat 0.51.1 +- SwiftFormat 0.51.2 - Swig 4.1.1 - Xcode Command Line Tools 13.2.0.0.1.1638488800 @@ -124,18 +123,18 @@ ### Browsers - Safari 16.3.1 (16614.4.6.11.7) - SafariDriver 16.3.1 (16614.4.6.11.7) -- Google Chrome 110.0.5481.177 -- ChromeDriver 110.0.5481.77 -- Microsoft Edge 110.0.1587.63 -- Microsoft Edge WebDriver 110.0.1587.63 -- Mozilla Firefox 110.0.1 +- Google Chrome 111.0.5563.64 +- ChromeDriver 111.0.5563.64 +- Microsoft Edge 111.0.1661.44 +- Microsoft Edge WebDriver 111.0.1661.44 +- Mozilla Firefox 111.0 - geckodriver 0.32.2 - Selenium server 4.8.0 #### Environment variables | Name | Value | | --------------- | ---------------------------------------------- | -| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/110.0.5481.77 | +| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/111.0.5563.64 | | EDGEWEBDRIVER | /usr/local/share/edge_driver | | GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | @@ -162,7 +161,7 @@ - 3.1.3 #### Python -- 3.7.15 +- 3.7.16 - 3.8.16 - 3.9.16 - 3.10.10 @@ -177,18 +176,18 @@ #### Node.js - 14.21.3 - 16.19.1 -- 18.14.2 +- 18.15.0 #### Go - 1.17.13 - 1.18.10 -- 1.19.6 -- 1.20.1 +- 1.19.7 +- 1.20.2 ### Rust Tools -- Cargo 1.67.1 -- Rust 1.67.1 -- Rustdoc 1.67.1 +- Cargo 1.68.0 +- Rust 1.68.0 +- Rustdoc 1.68.0 - Rustup 1.25.2 #### Packages @@ -196,14 +195,14 @@ - Cargo-audit 0.17.4 - Cargo-outdated 0.11.2 - Cbindgen 0.24.3 -- Clippy 0.1.67 +- Clippy 0.1.68 - Rustfmt 1.5.1-stable ### PowerShell Tools - PowerShell 7.2.10 #### PowerShell Modules -- Az: 9.4.0 +- Az: 9.5.0 - MarkdownPS: 1.9 - Pester: 5.4.0 - PSScriptAnalyzer: 1.21.0 @@ -211,7 +210,7 @@ ### Web Servers | Name | Version | ConfigFile | ServiceStatus | ListenPort | | ----- | ------- | ------------------------------- | ------------- | ---------- | -| httpd | 2.4.55 | /usr/local/etc/httpd/httpd.conf | none | 80 | +| httpd | 2.4.56 | /usr/local/etc/httpd/httpd.conf | none | 80 | | nginx | 1.23.3 | /usr/local/etc/nginx/nginx.conf | none | 80 | ### Xamarin @@ -333,19 +332,19 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" | watchOS 8.3 | 13.2.1 | Apple Watch Series 4 - 40mm<br>Apple Watch Series 4 - 44mm<br>Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | ### Android -| Package Name | Version | -| -------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 8.0 | -| Android Emulator | 32.1.11 | -| Android SDK Build-tools | 33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | -| Android SDK Platforms | android-33-ext4 (rev 1)<br>android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | -| Android SDK Platform-Tools | 34.0.0 | -| Android Support Repository | 47.0.0 | -| CMake | 3.10.2<br>3.18.1<br>3.22.1 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 23.2.8568313<br>24.0.8215888<br>25.2.9519653 (default) | -| SDK Patch Applier v4 | 1 | +| Package Name | Version | +| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | +| Android Command Line Tools | 8.0 | +| Android Emulator | 32.1.11 | +| Android SDK Build-tools | 33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | +| Android SDK Platforms | android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | +| Android SDK Platform-Tools | 34.0.1 | +| Android Support Repository | 47.0.0 | +| CMake | 3.10.2<br>3.18.1<br>3.22.1 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 23.2.8568313<br>24.0.8215888<br>25.2.9519653 (default) | +| SDK Patch Applier v4 | 1 | #### Environment variables | Name | Value | From e8faa6254edfc156b822b7aa66da52934b530e73 Mon Sep 17 00:00:00 2001 From: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com> Date: Mon, 27 Mar 2023 16:24:12 +0200 Subject: [PATCH 1825/3485] [macos] temporarily shift MacOS 11 image generation schedule (#7335) --- .github/workflows/macos11.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/macos11.yml b/.github/workflows/macos11.yml index daf1f3e70b45..b35480251c97 100644 --- a/.github/workflows/macos11.yml +++ b/.github/workflows/macos11.yml @@ -13,7 +13,7 @@ on: paths: - 'images/macos/**' schedule: - - cron: '0 0 * * *' + - cron: '45 0 * * *' jobs: macOS_11: From 7c4a229fbcb0f4a6e7c30d44c52f48a9f75d6298 Mon Sep 17 00:00:00 2001 From: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com> Date: Tue, 28 Mar 2023 09:27:26 +0200 Subject: [PATCH 1826/3485] [macos] remove go 1.17 (#7347) --- images/macos/toolsets/toolset-11.json | 3 +-- images/macos/toolsets/toolset-12.json | 3 +-- images/macos/toolsets/toolset-13.json | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index f8463e01cea3..f6f829064fb3 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -282,7 +282,6 @@ "platform" : "darwin", "variable_template" : "GOROOT_{0}_{1}_X64", "versions": [ - "1.17.*", "1.18.*", "1.19.*", "1.20.*" @@ -327,7 +326,7 @@ ] }, "go": { - "default": "1.17" + "default": "1.20" }, "node": { "default": "18", diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index 72c1ed9a1ad4..33db39a32f4a 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -268,7 +268,6 @@ "platform" : "darwin", "variable_template" : "GOROOT_{0}_{1}_X64", "versions": [ - "1.17.*", "1.18.*", "1.19.*", "1.20.*" @@ -309,7 +308,7 @@ ] }, "go": { - "default": "1.17" + "default": "1.20" }, "node": { "default": "18", diff --git a/images/macos/toolsets/toolset-13.json b/images/macos/toolsets/toolset-13.json index 7354fc5948cc..706603660f6f 100644 --- a/images/macos/toolsets/toolset-13.json +++ b/images/macos/toolsets/toolset-13.json @@ -95,7 +95,7 @@ ] }, "go": { - "default": "1.18" + "default": "1.20" }, "node": { "default": "18" From 078d815ad5c4a62da985542304a07d61f2b7da00 Mon Sep 17 00:00:00 2001 From: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com> Date: Tue, 28 Mar 2023 09:29:33 +0200 Subject: [PATCH 1827/3485] [windows] remove go 1.17 (#7348) --- images/win/toolsets/toolset-2019.json | 3 +-- images/win/toolsets/toolset-2022.json | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index bf9e44a4e955..4946a0e07b61 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -74,12 +74,11 @@ "arch": "x64", "platform" : "win32", "versions": [ - "1.17.*", "1.18.*", "1.19.*", "1.20.*" ], - "default": "1.17.*" + "default": "1.20.*" } ], "powershellModules": [ diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index bfafc88e2360..ed1b230e3b2a 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -66,12 +66,11 @@ "arch": "x64", "platform" : "win32", "versions": [ - "1.17.*", "1.18.*", "1.19.*", "1.20.*" ], - "default": "1.17.*" + "default": "1.20.*" } ], "powershellModules": [ From d9b4647e1147615a88b7a57810d081a4bbfee583 Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Tue, 28 Mar 2023 10:42:14 +0200 Subject: [PATCH 1828/3485] [Windows] Add script for OpenSSL installation (#7337) --- .../scripts/Installers/Install-OpenSSL.ps1 | 40 +++++++++++++++++++ .../win/scripts/Tests/ChocoPackages.Tests.ps1 | 6 --- images/win/scripts/Tests/Tools.Tests.ps1 | 6 +++ images/win/toolsets/toolset-2019.json | 7 ++-- images/win/toolsets/toolset-2022.json | 7 ++-- images/win/windows2019.json | 3 +- images/win/windows2022.json | 3 +- 7 files changed, 56 insertions(+), 16 deletions(-) create mode 100644 images/win/scripts/Installers/Install-OpenSSL.ps1 diff --git a/images/win/scripts/Installers/Install-OpenSSL.ps1 b/images/win/scripts/Installers/Install-OpenSSL.ps1 new file mode 100644 index 000000000000..ee5f87fc6c72 --- /dev/null +++ b/images/win/scripts/Installers/Install-OpenSSL.ps1 @@ -0,0 +1,40 @@ +################################################################################ +## File: Install-OpenSSL.ps1 +## Desc: Install win64-openssl. +################################################################################ + +$arch = "INTEL" +$bits = "64" +$light = $false +$installer = "exe" +$version = (Get-ToolsetContent).openssl.version +$installDir = "$Env:ProgramFiles\OpenSSL" + +# Fetch available installers list +$jsonUrl = 'https://raw.githubusercontent.com/slproweb/opensslhashes/master/win32_openssl_hashes.json' +$installersAvailable = @() +(Invoke-RestMethod $jsonUrl).files.PSObject.Properties | +Where-Object MemberType -Eq NoteProperty | +ForEach-Object { $installersAvailable += $_.Value } + +# Select appropriate installers +$installersMatching = $installersAvailable | Where-Object { + ($_.basever -Eq $version -Or $_.basever -Like "$version.*") -And $_.arch -Eq $arch -And $_.bits -Eq $bits -And $_.light -Eq $light -And $_.installer -Eq $installer +} + +# Get installer of the latest version +$latestInstaller = $installersMatching | +Sort-Object { [version]$_.basever }, subver | +Select-Object -Last 1 + +# Invoke installation +$installerUrl = $latestInstaller.url +$installerName = "openssl-$($latestInstaller.basever)$($latestInstaller.subver)-setup.$($latestInstaller.installer)" +$installerArgs = '/silent', '/sp-', '/suppressmsgboxes', "/DIR=`"$installDir`"" +Install-Binary -Url "$installerUrl" -Name "$installerName" -ArgumentList $installerArgs + +# Update PATH +Add-MachinePathItem "$installDir\bin" +$env:Path = Get-MachinePath + +Invoke-PesterTests -TestFile "Tools" -TestName "OpenSSL" diff --git a/images/win/scripts/Tests/ChocoPackages.Tests.ps1 b/images/win/scripts/Tests/ChocoPackages.Tests.ps1 index b6a1682847cb..d0edb67bce40 100644 --- a/images/win/scripts/Tests/ChocoPackages.Tests.ps1 +++ b/images/win/scripts/Tests/ChocoPackages.Tests.ps1 @@ -46,12 +46,6 @@ Describe "Nuget" { } } -Describe "OpenSSL" { - It "OpenSSL" { - "openssl version" | Should -ReturnZeroExitCode - } -} - Describe "Packer" { It "Packer" { "packer --version" | Should -ReturnZeroExitCode diff --git a/images/win/scripts/Tests/Tools.Tests.ps1 b/images/win/scripts/Tests/Tools.Tests.ps1 index 873a41613385..26ec41976430 100644 --- a/images/win/scripts/Tests/Tools.Tests.ps1 +++ b/images/win/scripts/Tests/Tools.Tests.ps1 @@ -223,3 +223,9 @@ Describe "SQL OLEDB Driver" { "HKLM:\SOFTWARE\Microsoft\MSOLEDBSQL" | Should -Exist } } + +Describe "OpenSSL" { + It "OpenSSL" { + "openssl version" | Should -ReturnZeroExitCode + } +} diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index 4946a0e07b61..c4b65e076328 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -454,10 +454,6 @@ { "name": "innosetup" }, { "name": "jq" }, { "name": "NuGet.CommandLine" }, - { - "name": "openssl.light", - "args": [ "--version=1.1.1.20181020" ] - }, { "name": "packer" }, { "name": "strawberryperl" }, { "name": "pulumi" }, @@ -502,5 +498,8 @@ "kotlin": { "version": "latest", "binary_name": "kotlin-compiler" + }, + "openssl": { + "version": "1.1.1" } } diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index ed1b230e3b2a..3c1d624fcd7a 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -365,10 +365,6 @@ { "name": "innosetup" }, { "name": "jq" }, { "name": "NuGet.CommandLine" }, - { - "name": "openssl.light", - "args": [ "--version=1.1.1.20181020" ] - }, { "name": "packer" }, { "name": "strawberryperl" }, { "name": "pulumi" }, @@ -413,5 +409,8 @@ "kotlin": { "version": "latest", "binary_name": "kotlin-compiler" + }, + "openssl": { + "version": "1.1.1" } } diff --git a/images/win/windows2019.json b/images/win/windows2019.json index 55eaeedb9326..03e1a364801d 100644 --- a/images/win/windows2019.json +++ b/images/win/windows2019.json @@ -185,7 +185,8 @@ "{{ template_dir }}/scripts/Installers/Install-AzureDevOpsCli.ps1", "{{ template_dir }}/scripts/Installers/Install-CommonUtils.ps1", "{{ template_dir }}/scripts/Installers/Install-JavaTools.ps1", - "{{ template_dir }}/scripts/Installers/Install-Kotlin.ps1" + "{{ template_dir }}/scripts/Installers/Install-Kotlin.ps1", + "{{ template_dir }}/scripts/Installers/Install-OpenSSL.ps1" ] }, { diff --git a/images/win/windows2022.json b/images/win/windows2022.json index c4dc8f646a4e..2f5a05610e14 100644 --- a/images/win/windows2022.json +++ b/images/win/windows2022.json @@ -191,7 +191,8 @@ "{{ template_dir }}/scripts/Installers/Install-AzureDevOpsCli.ps1", "{{ template_dir }}/scripts/Installers/Install-CommonUtils.ps1", "{{ template_dir }}/scripts/Installers/Install-JavaTools.ps1", - "{{ template_dir }}/scripts/Installers/Install-Kotlin.ps1" + "{{ template_dir }}/scripts/Installers/Install-Kotlin.ps1", + "{{ template_dir }}/scripts/Installers/Install-OpenSSL.ps1" ] }, { From 6b75f9c486de732333f328f9ceb136655c16f84b Mon Sep 17 00:00:00 2001 From: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com> Date: Tue, 28 Mar 2023 13:07:42 +0200 Subject: [PATCH 1829/3485] [macos] temporarily shift MacOS 11 image generation schedule (#7352) --- images.CI/macos/azure-pipelines/macos11.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images.CI/macos/azure-pipelines/macos11.yml b/images.CI/macos/azure-pipelines/macos11.yml index bf78b9666079..bbf019fdece3 100644 --- a/images.CI/macos/azure-pipelines/macos11.yml +++ b/images.CI/macos/azure-pipelines/macos11.yml @@ -1,6 +1,6 @@ name: macOS-11_$(date:yyyyMMdd)$(rev:.r)_unstable schedules: -- cron: "0 0 * * *" +- cron: '45 0 * * *' displayName: Daily branches: include: From c93b9a212559c21c6a12088724d77bf65530cfde Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Tue, 28 Mar 2023 14:33:01 +0200 Subject: [PATCH 1830/3485] [macOS] Update Android test case (#7289) --- images/macos/tests/Android.Tests.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/macos/tests/Android.Tests.ps1 b/images/macos/tests/Android.Tests.ps1 index 7ab9e4a43ec9..36e5ea968a06 100644 --- a/images/macos/tests/Android.Tests.ps1 +++ b/images/macos/tests/Android.Tests.ps1 @@ -11,8 +11,8 @@ Describe "Android" { [array]$ndkVersions = Get-ToolsetValue "android.ndk.versions" $ndkFullVersions = $ndkVersions | ForEach-Object { Get-ChildItem "$env:ANDROID_HOME/ndk/${_}.*" -Name | Select-Object -Last 1} | ForEach-Object { "ndk/${_}" } # Platforms starting with a letter are the preview versions, which is not installed on the image - $platformVersionsList = ($androidSdkManagerPackages | Where-Object { "$_".StartsWith("platforms;") }) -replace 'platforms;android-', '' | Where-Object { $_ -match "^\d+$" } | Sort-Object -Unique - $platformsInstalled = $platformVersionsList | Where-Object { [int]$_ -ge $platformMinVersion } | ForEach-Object { "platforms/android-${_}" } + $platformVersionsList = ($androidSdkManagerPackages | Where-Object { "$_".StartsWith("platforms;") }) -replace 'platforms;android-', '' | Where-Object { $_ -match "^\d" } | Sort-Object -Unique + $platformsInstalled = $platformVersionsList | Where-Object { [int]($_.Split("-")[0]) -ge $platformMinVersion } | ForEach-Object { "platforms/android-${_}" } $buildToolsList = ($androidSdkManagerPackages | Where-Object { "$_".StartsWith("build-tools;") }) -replace 'build-tools;', '' $buildTools = $buildToolsList | Where-Object { $_ -match "\d+(\.\d+){2,}$"} | Where-Object { [version]$_ -ge $buildToolsMinVersion } | Sort-Object -Unique | From 7c61da51cf1c386d63fb7d5561309bfaa1b3be00 Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Wed, 29 Mar 2023 11:18:06 +0200 Subject: [PATCH 1831/3485] [Ubuntu] Temp patch for PhantomJS/libssl conflict (#7358) --- images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 | 1 + images/linux/scripts/tests/Tools.Tests.ps1 | 1 + 2 files changed, 2 insertions(+) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 index 5dc675471a19..3f7ff567cd9f 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 @@ -189,6 +189,7 @@ function Get-PackerVersion { } function Get-PhantomJSVersion { + $env:OPENSSL_CONF="/etc/ssl"; phantomjs --version return $(phantomjs --version) } diff --git a/images/linux/scripts/tests/Tools.Tests.ps1 b/images/linux/scripts/tests/Tools.Tests.ps1 index b5102b5e0e86..c1594eaf7c67 100644 --- a/images/linux/scripts/tests/Tools.Tests.ps1 +++ b/images/linux/scripts/tests/Tools.Tests.ps1 @@ -326,6 +326,7 @@ Describe "Pulumi" { Describe "Phantomjs" -Skip:(Test-IsUbuntu22) { It "phantomjs" { + $env:OPENSSL_CONF="/etc/ssl"; phantomjs --version "phantomjs --version" | Should -ReturnZeroExitCode } } From 88c18714c94e7b41156e9fbbe5b9a922ee7a4432 Mon Sep 17 00:00:00 2001 From: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com> Date: Wed, 29 Mar 2023 17:09:46 +0200 Subject: [PATCH 1832/3485] [ubuntu] remove go 1.17 (#7349) --- images/linux/toolsets/toolset-2004.json | 3 +-- images/linux/toolsets/toolset-2204.json | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index 2e510124b5c9..582d627f810e 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -45,12 +45,11 @@ "arch": "x64", "platform" : "linux", "versions": [ - "1.17.*", "1.18.*", "1.19.*", "1.20.*" ], - "default": "1.17.*" + "default": "1.20.*" }, { "name": "Ruby", diff --git a/images/linux/toolsets/toolset-2204.json b/images/linux/toolsets/toolset-2204.json index 991872889848..a7f668110e3f 100644 --- a/images/linux/toolsets/toolset-2204.json +++ b/images/linux/toolsets/toolset-2204.json @@ -41,12 +41,11 @@ "arch": "x64", "platform" : "linux", "versions": [ - "1.17.*", "1.18.*", "1.19.*", "1.20.*" ], - "default": "1.18.*" + "default": "1.20.*" }, { "name": "Ruby", From e62f0787f844f43f6831e41c6237b1a08d5d89b2 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 30 Mar 2023 08:51:20 +0000 Subject: [PATCH 1833/3485] Updating readme file for ubuntu20 version 20230326.2 (#7341) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2004-Readme.md | 93 ++++++++++++++++--------------- 1 file changed, 47 insertions(+), 46 deletions(-) diff --git a/images/linux/Ubuntu2004-Readme.md b/images/linux/Ubuntu2004-Readme.md index 40f36e4c0d35..2bfb09ed8107 100644 --- a/images/linux/Ubuntu2004-Readme.md +++ b/images/linux/Ubuntu2004-Readme.md @@ -1,12 +1,13 @@ | Announcements | |-| +| [GraalVM JDK11 will be removed from agents on April 10, 2023](https://github.com/actions/runner-images/issues/7338) | | [[All OSes] Go 1.17.x will be removed and 1.20.x set as default on April, 3](https://github.com/actions/runner-images/issues/7276) | | [The Ubuntu 18.04 Actions runner image will begin deprecation on 2022/08/08 and will be fully unsupported by 2023/04/01](https://github.com/actions/runner-images/issues/6002) | *** # Ubuntu 20.04 - OS Version: 20.04.6 LTS - Kernel Version: 5.15.0-1034-azure -- Image Version: 20230317.1 +- Image Version: 20230326.2 ## Installed Software @@ -34,7 +35,7 @@ ### Package Management - cpan 1.64 - Helm 3.11.2 -- Homebrew 4.0.6 +- Homebrew 4.0.9 - Miniconda 23.1.0 - Npm 9.5.0 - NuGet 6.3.1.1 @@ -42,7 +43,7 @@ - Pip3 20.0.2 - Pipx 1.2.0 - RubyGems 3.1.2 -- Vcpkg (build from commit ffe7360e0) +- Vcpkg (build from commit b81bc3a83) - Yarn 1.22.19 #### Environment variables @@ -62,7 +63,7 @@ to accomplish this. ### Project Management - Ant 1.10.7 - Gradle 8.0.2 -- Lerna 6.5.1 +- Lerna 6.6.1 - Maven 3.8.8 - Sbt 1.8.2 @@ -74,8 +75,8 @@ to accomplish this. - Bazelisk 1.13.2 - Bicep 0.15.31 - Buildah 1.22.3 -- CMake 3.26.0 -- CodeQL Action Bundles 2.12.3 2.12.4 +- CMake 3.26.1 +- CodeQL Action Bundles 2.12.4 2.12.5 - Docker Amazon ECR Credential Helper 0.6.0 - Docker Compose v1 1.29.2 - Docker Compose v2 2.16.0+azure-2 @@ -105,30 +106,30 @@ to accomplish this. - Parcel 2.8.3 - PhantomJS 2.1.1 - Podman 3.4.2 -- Pulumi 3.58.0 -- R 4.2.2 +- Pulumi 3.59.1 +- R 4.2.3 - Skopeo 1.5.0 - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 - Terraform 1.4.2 -- yamllint 1.29.0 -- yq 4.31.2 +- yamllint 1.30.0 +- yq 4.33.1 - zstd 1.5.4 ### CLI Tools -- Alibaba Cloud CLI 3.0.157 -- AWS CLI 2.11.4 +- Alibaba Cloud CLI 3.0.158 +- AWS CLI 2.11.6 - AWS CLI Session Manager Plugin 1.2.463.0 -- AWS SAM CLI 1.76.0 +- AWS SAM CLI 1.78.0 - Azure CLI 2.46.0 - Azure CLI (azure-devops) 0.26.0 -- GitHub CLI 2.24.3 -- Google Cloud SDK 422.0.0 +- GitHub CLI 2.25.1 +- Google Cloud SDK 423.0.0 - Hub CLI 2.14.2 -- Netlify CLI 13.1.6 -- OpenShift CLI 4.12.7 -- ORAS CLI 0.16.0 -- Vercel CLI 28.17.0 +- Netlify CLI 13.2.1 +- OpenShift CLI 4.12.8 +- ORAS CLI 1.0.0 +- Vercel CLI 28.18.1 ### Java | Version | Vendor | Environment Variable | @@ -144,40 +145,40 @@ to accomplish this. ### PHP Tools - PHP: 7.4.33, 8.0.28, 8.1.17, 8.2.4 -- Composer 2.5.4 +- Composer 2.5.5 - PHPUnit 8.5.33 ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ``` ### Haskell Tools -- Cabal 3.6.2.0 +- Cabal 3.10.1.0 - GHC 9.6.1 - GHCup 0.1.19.2 - Stack 2.9.3 ### Rust Tools -- Cargo 1.68.0 -- Rust 1.68.0 -- Rustdoc 1.68.0 +- Cargo 1.68.1 +- Rust 1.68.1 +- Rustdoc 1.68.1 - Rustup 1.25.2 #### Packages - Bindgen 0.64.0 -- Cargo audit 0.17.4 +- Cargo audit 0.17.5 - Cargo clippy 0.1.68 - Cargo outdated 0.11.2 - Cbindgen 0.24.3 - Rustfmt 1.5.1 ### Browsers and Drivers -- Google Chrome 111.0.5563.64 +- Google Chrome 111.0.5563.110 - ChromeDriver 111.0.5563.64 - Chromium 111.0.5547.0 -- Microsoft Edge 111.0.1661.44 -- Microsoft Edge WebDriver 111.0.1661.44 +- Microsoft Edge 111.0.1661.54 +- Microsoft Edge WebDriver 111.0.1661.54 - Selenium server 4.8.0 -- Mozilla Firefox 111.0 +- Mozilla Firefox 111.0.1 - Geckodriver 0.32.2 #### Environment variables @@ -260,7 +261,7 @@ Use the following command as a part of your job to start the service: 'sudo syst - Az: 9.3.0 - Az (Cached): 3.1.0.zip, 4.4.0.zip, 5.9.0.zip, 6.6.0.zip, 7.5.0.zip - MarkdownPS: 1.9 -- Microsoft.Graph: 1.23.0 +- Microsoft.Graph: 1.24.0 - Pester: 5.4.0 - PSScriptAnalyzer: 1.21.0 @@ -275,7 +276,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | Package Name | Version | | -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | | Android Command Line Tools | 9.0 | -| Android Emulator | 32.1.11 | +| Android Emulator | 32.1.12 | | Android SDK Build-tools | 33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | | Android SDK Platform-Tools | 34.0.1 | | Android SDK Platforms | android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | @@ -304,18 +305,18 @@ Use the following command as a part of your job to start the service: 'sudo syst | alpine:3.15 | sha256:59b00c6f1614a599aa83d946d2a276c9257d2d29461c86c6a114d9932f2ddcd4 | 2023-02-11 | | alpine:3.16 | sha256:2cf17aa35fbcb6ece81692a64bfbadaf096590241ed9f95dd5f94f0e9f674784 | 2023-02-11 | | alpine:3.17 | sha256:ff6bdca1701f3a8a67e328815ff2346b0e4067d32ec36b7992c1fdc001dc8517 | 2023-02-11 | -| buildpack-deps:bullseye | sha256:6f2703639d3d17f70288d4ba212d55e159b682a990c20fc2a6562b098f01a1e7 | 2023-03-01 | -| buildpack-deps:buster | sha256:63be0fe0bfb9d06b8747dcd87683787ef6d82c6f05b8a2ae213c38d56dc2bf53 | 2023-03-01 | +| buildpack-deps:bullseye | sha256:d2e6d0b6233d9da4534d22e96ea4338fbf36a7657b6d60aae20260140ce43148 | 2023-03-23 | +| buildpack-deps:buster | sha256:56e11e205661d628368fbcd0edee38d666d507351e5c74f2795128cd71c6f52b | 2023-03-23 | | buildpack-deps:stretch | sha256:78e995165a5788c2f55aed6e548d8f6c1534830d4310c870408fccb2da8c5b2e | 2022-06-23 | -| debian:10 | sha256:2d356e1e22c0902f88ef65cb7159ecd5a96feb62345747edfd4324b0d83a2923 | 2023-03-01 | -| debian:11 | sha256:f81bf5a8b57d6aa1824e4edb9aea6bd5ef6240bcc7d86f303f197a2eb77c430f | 2023-03-01 | +| debian:10 | sha256:235f2a778fbc0d668c66afa9fd5f1efabab94c1d6588779ea4e221e1496f89da | 2023-03-23 | +| debian:11 | sha256:7b991788987ad860810df60927e1adbaf8e156520177bd4db82409f81dd3b721 | 2023-03-23 | | debian:9 | sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be | 2022-06-23 | -| moby/buildkit:latest | sha256:990e55e71c16281ed72f00b0308980865dae03d598b2cb8316da023d80336543 | 2023-03-06 | -| node:14 | sha256:481a78885f7a83f86fcb3ac48dab9bede651851d1b250650c17645a988902728 | 2023-03-01 | +| moby/buildkit:latest | sha256:ca34989052fc2467dcd283d2000c2ad8c7cd6213c5ff0fcabef1a9cfb0651b3a | 2023-03-23 | +| node:14 | sha256:a97048059988c65f974b37dfe25a44327069a0f4f81133624871de0063b98075 | 2023-03-23 | | node:14-alpine | sha256:1d02d4073d7dfd58950a222a862f8b819afd774560b7b3e992b27ff4cd088285 | 2023-02-17 | -| node:16 | sha256:8ef06c513538040a988ac7731afa8ad8b1135cfe5d8b6ad78489d80c6f6c0137 | 2023-03-01 | +| node:16 | sha256:e97b6d302062583e09be70f430b703637f6ef26c2cbb0d7bfed61e0be9d7a974 | 2023-03-23 | | node:16-alpine | sha256:fcb03294d3c0695cf9762dec94c0366f08e7a8c6a3c1e062d38c80ac30684d8a | 2023-02-21 | -| node:18 | sha256:8d9a875ee427897ef245302e31e2319385b092f1c3368b497e89790f240368f5 | 2023-03-08 | +| node:18 | sha256:c21209748c829660e0b49cbd14d2f9d81ea82ffb02a8a7932ebacf70d01573a3 | 2023-03-23 | | node:18-alpine | sha256:ffc770cdc09c9e83cccd99d663bb6ed56cfaa1bab94baf1b12b626aebeca9c10 | 2023-03-08 | | ubuntu:16.04 | sha256:1f1a2d56de1d604801a9671f301190704c25d604a416f59e03c04f5c6ffee0d6 | 2021-08-31 | | ubuntu:18.04 | sha256:8aa9c2798215f99544d1ce7439ea9c3a6dfd82de607da1cec3a8a2fae005931b | 2023-03-08 | @@ -334,9 +335,9 @@ Use the following command as a part of your job to start the service: 'sudo syst | build-essential | 12.8ubuntu1.1 | | bzip2 | 1.0.8-2 | | coreutils | 8.30-3ubuntu2 | -| curl | 7.68.0-1ubuntu2.16 | +| curl | 7.68.0-1ubuntu2.18 | | dbus | 1.12.16-2ubuntu2.3 | -| dnsutils | 1:9.16.1-0ubuntu2.12 | +| dnsutils | 1:9.16.1-0ubuntu2.14 | | dpkg | 1.19.7ubuntu3.2 | | fakeroot | 1.24-1 | | file | 1:5.38-4 | @@ -345,25 +346,25 @@ Use the following command as a part of your job to start the service: 'sudo syst | ftp | 0.17-34.1 | | gnupg2 | 2.2.19-3ubuntu2.2 | | haveged | 1.9.1-6ubuntu1 | -| imagemagick | 8:6.9.10.23+dfsg-2.1ubuntu11.5 | +| imagemagick | 8:6.9.10.23+dfsg-2.1ubuntu11.6 | | iproute2 | 5.5.0-1ubuntu1 | | iputils-ping | 3:20190709-3 | | jq | 1.6-1ubuntu0.20.04.1 | | lib32z1 | 1:1.2.11.dfsg-2ubuntu1.5 | | libc++-dev | 1:10.0-50\~exp1 | | libc++abi-dev | 1:10.0-50\~exp1 | -| libcurl4 | 7.68.0-1ubuntu2.16 | +| libcurl4 | 7.68.0-1ubuntu2.18 | | libgbm-dev | 21.2.6-0ubuntu0.1\~20.04.2 | | libgconf-2-4 | 3.2.6-6ubuntu1 | | libgsl-dev | 2.5+dfsg-6build1 | | libgtk-3-0 | 3.24.20-0ubuntu1.1 | | libmagic-dev | 1:5.38-4 | -| libmagickcore-dev | 8:6.9.10.23+dfsg-2.1ubuntu11.5 | -| libmagickwand-dev | 8:6.9.10.23+dfsg-2.1ubuntu11.5 | +| libmagickcore-dev | 8:6.9.10.23+dfsg-2.1ubuntu11.6 | +| libmagickwand-dev | 8:6.9.10.23+dfsg-2.1ubuntu11.6 | | libsecret-1-dev | 0.20.4-0ubuntu1 | | libsqlite3-dev | 3.31.1-4ubuntu0.5 | | libtool | 2.4.6-14 | -| libunwind8 | 1.2.1-9build1 | +| libunwind8 | 1.2.1-9ubuntu0.1 | | libxkbfile-dev | 1:1.1.0-1 | | libxss1 | 1:1.2.3-1 | | libyaml-dev | 0.2.2-1 | From c5ea85a212ef4f1d5e4d5cf642f4968fbb323666 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 30 Mar 2023 09:07:48 +0000 Subject: [PATCH 1834/3485] Updating readme file for ubuntu22 version 20230326.2 (#7342) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2204-Readme.md | 91 ++++++++++++++++--------------- 1 file changed, 46 insertions(+), 45 deletions(-) diff --git a/images/linux/Ubuntu2204-Readme.md b/images/linux/Ubuntu2204-Readme.md index efe127a2b06b..1c6738c1ff40 100644 --- a/images/linux/Ubuntu2204-Readme.md +++ b/images/linux/Ubuntu2204-Readme.md @@ -1,12 +1,13 @@ | Announcements | |-| +| [GraalVM JDK11 will be removed from agents on April 10, 2023](https://github.com/actions/runner-images/issues/7338) | | [[All OSes] Go 1.17.x will be removed and 1.20.x set as default on April, 3](https://github.com/actions/runner-images/issues/7276) | | [The Ubuntu 18.04 Actions runner image will begin deprecation on 2022/08/08 and will be fully unsupported by 2023/04/01](https://github.com/actions/runner-images/issues/6002) | *** # Ubuntu 22.04 - OS Version: 22.04.2 LTS - Kernel Version: 5.15.0-1034-azure -- Image Version: 20230317.1 +- Image Version: 20230326.2 ## Installed Software @@ -32,7 +33,7 @@ ### Package Management - cpan 1.64 - Helm 3.11.2 -- Homebrew 4.0.6 +- Homebrew 4.0.9 - Miniconda 23.1.0 - Npm 9.5.0 - NuGet 6.3.1.1 @@ -40,7 +41,7 @@ - Pip3 22.0.2 - Pipx 1.2.0 - RubyGems 3.3.5 -- Vcpkg (build from commit ffe7360e0) +- Vcpkg (build from commit b81bc3a83) - Yarn 1.22.19 #### Environment variables @@ -58,7 +59,7 @@ to accomplish this. ``` ### Project Management -- Lerna 6.5.1 +- Lerna 6.6.1 - Maven 3.8.8 ### Tools @@ -69,8 +70,8 @@ to accomplish this. - Bazelisk 1.13.2 - Bicep 0.15.31 - Buildah 1.23.1 -- CMake 3.26.0 -- CodeQL Action Bundles 2.12.3 2.12.4 +- CMake 3.26.1 +- CodeQL Action Bundles 2.12.4 2.12.5 - Docker Amazon ECR Credential Helper 0.6.0 - Docker Compose v1 1.29.2 - Docker Compose v2 2.16.0+azure-2 @@ -98,30 +99,30 @@ to accomplish this. - Packer 1.8.6 - Parcel 2.8.3 - Podman 3.4.4 -- Pulumi 3.58.0 -- R 4.2.2 +- Pulumi 3.59.1 +- R 4.2.3 - Skopeo 1.4.1 - Sphinx Open Source Search Server 2.2.11 - SVN 1.14.1 - Terraform 1.4.2 -- yamllint 1.29.0 -- yq 4.31.2 +- yamllint 1.30.0 +- yq 4.33.1 - zstd 1.5.4 ### CLI Tools -- Alibaba Cloud CLI 3.0.157 -- AWS CLI 2.11.4 +- Alibaba Cloud CLI 3.0.158 +- AWS CLI 2.11.6 - AWS CLI Session Manager Plugin 1.2.463.0 -- AWS SAM CLI 1.76.0 +- AWS SAM CLI 1.78.0 - Azure CLI 2.46.0 - Azure CLI (azure-devops) 0.26.0 -- GitHub CLI 2.24.3 -- Google Cloud SDK 422.0.0 +- GitHub CLI 2.25.1 +- Google Cloud SDK 423.0.0 - Hub CLI 2.14.2 -- Netlify CLI 13.1.6 -- OpenShift CLI 4.12.7 -- ORAS CLI 0.16.0 -- Vercel CLI 28.17.0 +- Netlify CLI 13.2.1 +- OpenShift CLI 4.12.8 +- ORAS CLI 1.0.0 +- Vercel CLI 28.18.1 ### Java | Version | Vendor | Environment Variable | @@ -137,40 +138,40 @@ to accomplish this. ### PHP Tools - PHP: 8.1.2 -- Composer 2.5.4 +- Composer 2.5.5 - PHPUnit 8.5.33 ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ``` ### Haskell Tools -- Cabal 3.6.2.0 +- Cabal 3.10.1.0 - GHC 9.6.1 - GHCup 0.1.19.2 - Stack 2.9.3 ### Rust Tools -- Cargo 1.68.0 -- Rust 1.68.0 -- Rustdoc 1.68.0 +- Cargo 1.68.1 +- Rust 1.68.1 +- Rustdoc 1.68.1 - Rustup 1.25.2 #### Packages - Bindgen 0.64.0 -- Cargo audit 0.17.4 +- Cargo audit 0.17.5 - Cargo clippy 0.1.68 - Cargo outdated 0.11.2 - Cbindgen 0.24.3 - Rustfmt 1.5.1 ### Browsers and Drivers -- Google Chrome 111.0.5563.64 +- Google Chrome 111.0.5563.110 - ChromeDriver 111.0.5563.64 - Chromium 111.0.5547.0 -- Microsoft Edge 111.0.1661.44 -- Microsoft Edge WebDriver 111.0.1661.44 +- Microsoft Edge 111.0.1661.54 +- Microsoft Edge WebDriver 111.0.1661.54 - Selenium server 4.8.0 -- Mozilla Firefox 111.0 +- Mozilla Firefox 111.0.1 - Geckodriver 0.32.2 #### Environment variables @@ -243,7 +244,7 @@ Use the following command as a part of your job to start the service: 'sudo syst #### PowerShell Modules - Az: 9.3.0 - MarkdownPS: 1.9 -- Microsoft.Graph: 1.23.0 +- Microsoft.Graph: 1.24.0 - Pester: 5.4.0 - PSScriptAnalyzer: 1.21.0 @@ -257,7 +258,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | Package Name | Version | | -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | | Android Command Line Tools | 9.0 | -| Android Emulator | 32.1.11 | +| Android Emulator | 32.1.12 | | Android SDK Build-tools | 33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | | Android SDK Platform-Tools | 34.0.1 | | Android SDK Platforms | android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | @@ -286,16 +287,16 @@ Use the following command as a part of your job to start the service: 'sudo syst | alpine:3.15 | sha256:59b00c6f1614a599aa83d946d2a276c9257d2d29461c86c6a114d9932f2ddcd4 | 2023-02-11 | | alpine:3.16 | sha256:2cf17aa35fbcb6ece81692a64bfbadaf096590241ed9f95dd5f94f0e9f674784 | 2023-02-11 | | alpine:3.17 | sha256:ff6bdca1701f3a8a67e328815ff2346b0e4067d32ec36b7992c1fdc001dc8517 | 2023-02-11 | -| buildpack-deps:bullseye | sha256:6f2703639d3d17f70288d4ba212d55e159b682a990c20fc2a6562b098f01a1e7 | 2023-03-01 | -| buildpack-deps:buster | sha256:63be0fe0bfb9d06b8747dcd87683787ef6d82c6f05b8a2ae213c38d56dc2bf53 | 2023-03-01 | -| debian:10 | sha256:2d356e1e22c0902f88ef65cb7159ecd5a96feb62345747edfd4324b0d83a2923 | 2023-03-01 | -| debian:11 | sha256:f81bf5a8b57d6aa1824e4edb9aea6bd5ef6240bcc7d86f303f197a2eb77c430f | 2023-03-01 | -| moby/buildkit:latest | sha256:990e55e71c16281ed72f00b0308980865dae03d598b2cb8316da023d80336543 | 2023-03-06 | -| node:14 | sha256:481a78885f7a83f86fcb3ac48dab9bede651851d1b250650c17645a988902728 | 2023-03-01 | +| buildpack-deps:bullseye | sha256:d2e6d0b6233d9da4534d22e96ea4338fbf36a7657b6d60aae20260140ce43148 | 2023-03-23 | +| buildpack-deps:buster | sha256:56e11e205661d628368fbcd0edee38d666d507351e5c74f2795128cd71c6f52b | 2023-03-23 | +| debian:10 | sha256:235f2a778fbc0d668c66afa9fd5f1efabab94c1d6588779ea4e221e1496f89da | 2023-03-23 | +| debian:11 | sha256:7b991788987ad860810df60927e1adbaf8e156520177bd4db82409f81dd3b721 | 2023-03-23 | +| moby/buildkit:latest | sha256:ca34989052fc2467dcd283d2000c2ad8c7cd6213c5ff0fcabef1a9cfb0651b3a | 2023-03-23 | +| node:14 | sha256:a97048059988c65f974b37dfe25a44327069a0f4f81133624871de0063b98075 | 2023-03-23 | | node:14-alpine | sha256:1d02d4073d7dfd58950a222a862f8b819afd774560b7b3e992b27ff4cd088285 | 2023-02-17 | -| node:16 | sha256:8ef06c513538040a988ac7731afa8ad8b1135cfe5d8b6ad78489d80c6f6c0137 | 2023-03-01 | +| node:16 | sha256:e97b6d302062583e09be70f430b703637f6ef26c2cbb0d7bfed61e0be9d7a974 | 2023-03-23 | | node:16-alpine | sha256:fcb03294d3c0695cf9762dec94c0366f08e7a8c6a3c1e062d38c80ac30684d8a | 2023-02-21 | -| node:18 | sha256:8d9a875ee427897ef245302e31e2319385b092f1c3368b497e89790f240368f5 | 2023-03-08 | +| node:18 | sha256:c21209748c829660e0b49cbd14d2f9d81ea82ffb02a8a7932ebacf70d01573a3 | 2023-03-23 | | node:18-alpine | sha256:ffc770cdc09c9e83cccd99d663bb6ed56cfaa1bab94baf1b12b626aebeca9c10 | 2023-03-08 | | ubuntu:18.04 | sha256:8aa9c2798215f99544d1ce7439ea9c3a6dfd82de607da1cec3a8a2fae005931b | 2023-03-08 | | ubuntu:20.04 | sha256:24a0df437301598d1a4b62ddf59fa0ed2969150d70d748c84225e6501e9c36b9 | 2023-03-08 | @@ -314,7 +315,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | build-essential | 12.9ubuntu3 | | bzip2 | 1.0.8-5build1 | | coreutils | 8.32-4.1ubuntu1 | -| curl | 7.81.0-1ubuntu1.8 | +| curl | 7.81.0-1ubuntu1.10 | | dbus | 1.12.20-2ubuntu4.1 | | dnsutils | 1:9.18.1-1ubuntu1.3 | | dpkg | 1.21.1ubuntu2.1 | @@ -325,21 +326,21 @@ Use the following command as a part of your job to start the service: 'sudo syst | ftp | 20210827-4build1 | | gnupg2 | 2.2.27-3ubuntu2.1 | | haveged | 1.9.14-1ubuntu1 | -| imagemagick | 8:6.9.11.60+dfsg-1.3ubuntu0.22.04.1 | +| imagemagick | 8:6.9.11.60+dfsg-1.3ubuntu0.22.04.2 | | iproute2 | 5.15.0-1ubuntu2 | | iputils-ping | 3:20211215-1 | | jq | 1.6-2.1ubuntu3 | | lib32z1 | 1:1.2.11.dfsg-2ubuntu9.2 | | libc++-dev | 1:14.0-55\~exp2 | | libc++abi-dev | 1:14.0-55\~exp2 | -| libcurl4 | 7.81.0-1ubuntu1.8 | +| libcurl4 | 7.81.0-1ubuntu1.10 | | libgbm-dev | 22.2.5-0ubuntu0.1\~22.04.1 | | libgconf-2-4 | 3.2.6-7ubuntu2 | | libgsl-dev | 2.7.1+dfsg-3 | | libgtk-3-0 | 3.24.33-1ubuntu2 | | libmagic-dev | 1:5.41-3 | -| libmagickcore-dev | 8:6.9.11.60+dfsg-1.3ubuntu0.22.04.1 | -| libmagickwand-dev | 8:6.9.11.60+dfsg-1.3ubuntu0.22.04.1 | +| libmagickcore-dev | 8:6.9.11.60+dfsg-1.3ubuntu0.22.04.2 | +| libmagickwand-dev | 8:6.9.11.60+dfsg-1.3ubuntu0.22.04.2 | | libsecret-1-dev | 0.20.5-2 | | libsqlite3-dev | 3.37.2-2ubuntu0.1 | | libssl-dev | 3.0.2-0ubuntu1.8 | @@ -384,7 +385,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | upx | 3.96-3 | | wget | 1.21.2-2ubuntu1 | | xorriso | 1.5.4-2 | -| xvfb | 2:21.1.3-2ubuntu2.7 | +| xvfb | 2:21.1.3-2ubuntu2.8 | | xz-utils | 5.2.5-2ubuntu1 | | zip | 3.0-12build2 | | zsync | 0.6.2-3ubuntu1 | From 32782cc69ffc7c1a6ba65d99cf585c7fc97141ee Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Thu, 30 Mar 2023 11:23:55 +0200 Subject: [PATCH 1835/3485] [Ubuntu] Update Android test case (#7290) --- images/linux/scripts/tests/Android.Tests.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/linux/scripts/tests/Android.Tests.ps1 b/images/linux/scripts/tests/Android.Tests.ps1 index a38465b8caf7..4c0b29964330 100644 --- a/images/linux/scripts/tests/Android.Tests.ps1 +++ b/images/linux/scripts/tests/Android.Tests.ps1 @@ -5,8 +5,8 @@ Describe "Android" { [array]$ndkVersions = Get-ToolsetValue "android.ndk.versions" $ndkFullVersions = $ndkVersions | ForEach-Object { (Get-ChildItem "/usr/local/lib/android/sdk/ndk/${_}.*" | Select-Object -Last 1).Name } | ForEach-Object { "ndk/${_}" } # Platforms starting with a letter are the preview versions, which is not installed on the image - $platformVersionsList = ($androidSdkManagerPackages | Where-Object { "$_".StartsWith("platforms;") }) -replace 'platforms;android-', '' | Where-Object { $_ -match "^\d+$" } | Sort-Object -Unique - $platformsInstalled = $platformVersionsList | Where-Object { [int]$_ -ge $platformMinVersion } | ForEach-Object { "platforms/android-${_}" } + $platformVersionsList = ($androidSdkManagerPackages | Where-Object { "$_".StartsWith("platforms;") }) -replace 'platforms;android-', '' | Where-Object { $_ -match "^\d" } | Sort-Object -Unique + $platformsInstalled = $platformVersionsList | Where-Object { [int]($_.Split("-")[0]) -ge $platformMinVersion } | ForEach-Object { "platforms/android-${_}" } $buildToolsList = ($androidSdkManagerPackages | Where-Object { "$_".StartsWith("build-tools;") }) -replace 'build-tools;', '' $buildTools = $buildToolsList | Where-Object { $_ -match "\d+(\.\d+){2,}$"} | Where-Object { [version]$_ -ge $buildToolsMinVersion } | Sort-Object -Unique | From 4cede79c69f29432d015075937060f75b894db58 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 30 Mar 2023 10:59:45 +0000 Subject: [PATCH 1836/3485] Updating readme file for win22 version 20230326.1 (#7343) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2022-Readme.md | 124 +++++++++++++++---------------- 1 file changed, 62 insertions(+), 62 deletions(-) diff --git a/images/win/Windows2022-Readme.md b/images/win/Windows2022-Readme.md index 932f16bb995f..49bef7dd4f74 100644 --- a/images/win/Windows2022-Readme.md +++ b/images/win/Windows2022-Readme.md @@ -3,8 +3,8 @@ | [[All OSes] Go 1.17.x will be removed and 1.20.x set as default on April, 3](https://github.com/actions/runner-images/issues/7276) | *** # Windows Server 2022 -- OS Version: 10.0.20348 Build 1547 -- Image Version: 20230314.1 +- OS Version: 10.0.20348 Build 1607 +- Image Version: 20230326.1 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -19,13 +19,13 @@ - LLVM 15.0.7 - Node 18.15.0 - Perl 5.32.1 -- PHP 8.2.3 +- PHP 8.2.4 - Python 3.9.13 - Ruby 3.0.5p211 ### Package Management -- Chocolatey 1.3.0 -- Composer 2.5.4 +- Chocolatey 1.3.1 +- Composer 2.5.5 - Helm 3.11.2 - Miniconda 23.1.0 (pre-installed on the image but not added to PATH) - NPM 9.5.0 @@ -33,7 +33,7 @@ - pip 23.0.1 (python 3.9) - Pipx 1.2.0 - RubyGems 3.2.33 -- Vcpkg (build from commit cfdeb75bb) +- Vcpkg (build from commit b81bc3a83) - Yarn 1.22.19 #### Environment variables @@ -52,72 +52,72 @@ - 7zip 22.01 - aria2 1.36.0 - azcopy 10.17.0 -- Bazel 6.1.0 +- Bazel 6.1.1 - Bazelisk 1.13.2 - Bicep 0.15.31 - Cabal 3.10.1.0 -- CMake 3.25.3 -- CodeQL Action Bundles 2.12.3 2.12.4 +- CMake 3.26.1 +- CodeQL Action Bundles 2.12.4 2.12.5 - Docker 23.0.1 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.16.0 +- Docker Compose v2 2.17.2 - Docker-wincred 0.7.0 - ghc 9.6.1 - Git 2.40.0.windows.1 - Git LFS 3.3.0 -- ImageMagick 7.1.1-3 +- ImageMagick 7.1.1-4 - InnoSetup 6.2.2 - jq 1.6 - Kind 0.17.0 -- Kubectl 1.26.2 +- Kubectl 1.26.3 - Mercurial 5.0 - Mingw-w64 11.2.0 - Newman 5.3.2 - NSIS 3.08 - OpenSSL 1.1.1 - Packer 1.8.5 -- Pulumi 3.57.1 -- R 4.2.2 +- Pulumi 3.59.1 +- R 4.2.3 - Service Fabric SDK 9.1.1436.9590 - Stack 2.9.3 - Subversion (SVN) 1.14.2 -- Swig 4.0.2 +- Swig 4.1.1 - VSWhere 3.1.1 - WinAppDriver 1.2.2009.02003 - WiX Toolset 3.11.2.4516 -- yamllint 1.29.0 +- yamllint 1.30.0 - zstd 1.5.4 ### CLI Tools -- Alibaba Cloud CLI 3.0.156 -- AWS CLI 2.11.2 -- AWS SAM CLI 1.76.0 -- AWS Session Manager CLI 1.2.398.0 +- Alibaba Cloud CLI 3.0.158 +- AWS CLI 2.11.6 +- AWS SAM CLI 1.78.0 +- AWS Session Manager CLI 1.2.463.0 - Azure CLI 2.46.0 - Azure DevOps CLI extension 0.26.0 -- GitHub CLI 2.24.3 +- GitHub CLI 2.25.1 - Hub CLI 2.14.2 ### Rust Tools -- Cargo 1.68.0 -- Rust 1.68.0 -- Rustdoc 1.68.0 +- Cargo 1.68.1 +- Rust 1.68.1 +- Rustdoc 1.68.1 - Rustup 1.25.2 #### Packages - bindgen 0.64.0 -- cargo-audit 0.17.4 +- cargo-audit 0.17.5 - cargo-outdated 0.11.2 - cbindgen 0.24.3 - Clippy 0.1.68 - Rustfmt 1.5.1 ### Browsers and Drivers -- Google Chrome 111.0.5563.65 +- Google Chrome 111.0.5563.111 - Chrome Driver 111.0.5563.64 -- Microsoft Edge 111.0.1661.41 -- Microsoft Edge Driver 111.0.1661.41 -- Mozilla Firefox 111.0 +- Microsoft Edge 111.0.1661.54 +- Microsoft Edge Driver 111.0.1661.54 +- Mozilla Firefox 111.0.1 - Gecko Driver 0.32.2 - IE Driver 4.8.0.0 - Selenium server 4.8.0 @@ -205,7 +205,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | 5.0.15.0 | MongoDB | Stopped | Disabled | ### Database tools -- Azure CosmosDb Emulator 2.14.11.0 +- Azure CosmosDb Emulator 2.14.12.0 - DacFx 16.1.8089.0 - MySQL 8.0.31.0 - SQL OLEDB Driver 18.6.3.0 @@ -220,7 +220,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Visual Studio Enterprise 2022 | Name | Version | Path | | ----------------------------- | -------------- | -------------------------------------------------------- | -| Visual Studio Enterprise 2022 | 17.5.33424.131 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | +| Visual Studio Enterprise 2022 | 17.5.33516.290 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | #### Workloads, components and extensions | Package | Version | @@ -241,7 +241,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Component.Microsoft.VisualStudio.RazorExtension | 17.5.33306.270 | | Component.Microsoft.VisualStudio.Web.AzureFunctions | 17.5.33306.270 | | Component.Microsoft.Web.LibraryManager | 17.5.33306.270 | -| Component.Microsoft.WebTools.BrowserLink.WebLivePreview | 17.5.142.32734 | +| Component.Microsoft.WebTools.BrowserLink.WebLivePreview | 17.5.143.63911 | | Component.Microsoft.Windows.DriverKit | 10.0.22621.0 | | Component.OpenJDK | 17.5.33306.270 | | Component.UnityEngine.x64 | 17.5.33306.270 | @@ -284,21 +284,21 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.Net.ComponentGroup.4.8.DeveloperTools | 17.5.33306.270 | | Microsoft.Net.ComponentGroup.DevelopmentPrerequisites | 17.5.33306.270 | | Microsoft.Net.ComponentGroup.TargetingPacks.Common | 17.5.33306.270 | -| microsoft.net.runtime.android | 7.0.323.6910 | -| microsoft.net.runtime.android.aot | 7.0.323.6910 | -| microsoft.net.runtime.android.aot.net6 | 7.0.323.6910 | -| microsoft.net.runtime.android.net6 | 7.0.323.6910 | -| microsoft.net.runtime.ios | 7.0.323.6910 | -| microsoft.net.runtime.ios.net6 | 7.0.323.6910 | -| microsoft.net.runtime.maccatalyst | 7.0.323.6910 | -| microsoft.net.runtime.maccatalyst.net6 | 7.0.323.6910 | -| microsoft.net.runtime.mono.tooling | 7.0.323.6910 | -| microsoft.net.runtime.mono.tooling.net6 | 7.0.323.6910 | -| microsoft.net.sdk.emscripten.net7 | 7.0.8.6204 | +| microsoft.net.runtime.android | 7.0.423.11508 | +| microsoft.net.runtime.android.aot | 7.0.423.11508 | +| microsoft.net.runtime.android.aot.net6 | 7.0.423.11508 | +| microsoft.net.runtime.android.net6 | 7.0.423.11508 | +| microsoft.net.runtime.ios | 7.0.423.11508 | +| microsoft.net.runtime.ios.net6 | 7.0.423.11508 | +| microsoft.net.runtime.maccatalyst | 7.0.423.11508 | +| microsoft.net.runtime.maccatalyst.net6 | 7.0.423.11508 | +| microsoft.net.runtime.mono.tooling | 7.0.423.11508 | +| microsoft.net.runtime.mono.tooling.net6 | 7.0.423.11508 | +| microsoft.net.sdk.emscripten.net7 | 7.0.8.10705 | | Microsoft.NetCore.Component.DevelopmentTools | 17.5.33306.270 | -| Microsoft.NetCore.Component.Runtime.6.0 | 17.5.33424.131 | -| Microsoft.NetCore.Component.Runtime.7.0 | 17.5.33424.131 | -| Microsoft.NetCore.Component.SDK | 17.5.33424.131 | +| Microsoft.NetCore.Component.Runtime.6.0 | 17.5.33502.375 | +| Microsoft.NetCore.Component.Runtime.7.0 | 17.5.33502.375 | +| Microsoft.NetCore.Component.SDK | 17.5.33502.375 | | Microsoft.NetCore.Component.Web | 17.5.33306.270 | | Microsoft.VisualStudio.Component.AppInsights.Tools | 17.5.33306.270 | | Microsoft.VisualStudio.Component.AspNet | 17.5.33306.270 | @@ -494,11 +494,11 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Workload.Python | 17.5.33306.270 | | Microsoft.VisualStudio.Workload.Universal | 17.5.33306.270 | | Microsoft.VisualStudio.Workload.VisualStudioExtension | 17.5.33306.270 | -| runtimes.ios | 7.0.323.6910 | -| runtimes.ios.net6 | 7.0.323.6910 | -| runtimes.maccatalyst | 7.0.323.6910 | -| runtimes.maccatalyst.net6 | 7.0.323.6910 | -| wasm.tools | 7.0.323.6910 | +| runtimes.ios | 7.0.423.11508 | +| runtimes.ios.net6 | 7.0.423.11508 | +| runtimes.maccatalyst | 7.0.423.11508 | +| runtimes.maccatalyst.net6 | 7.0.423.11508 | +| wasm.tools | 7.0.423.11508 | | ProBITools.MicrosoftAnalysisServicesModelingProjects2022 | 3.0.4 | | ProBITools.MicrosoftReportProjectsforVisualStudio2022 | 3.0.1 | | VisualStudioClient.MicrosoftVisualStudio2022InstallerProjects | 2.0.0 | @@ -527,11 +527,11 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 10.0.22621.0 ### .NET Core Tools -- .NET Core SDK: 3.1.120, 3.1.202, 3.1.302, 3.1.426, 6.0.114, 6.0.203, 6.0.309, 6.0.406, 7.0.201 +- .NET Core SDK: 3.1.120, 3.1.202, 3.1.302, 3.1.426, 6.0.115, 6.0.203, 6.0.310, 6.0.407, 7.0.202 - .NET Framework: 4.8, 4.8.1 -- Microsoft.AspNetCore.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 6.0.5, 6.0.14, 7.0.3 -- Microsoft.NETCore.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 6.0.5, 6.0.14, 7.0.3 -- Microsoft.WindowsDesktop.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 6.0.5, 6.0.14, 7.0.3 +- Microsoft.AspNetCore.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 6.0.5, 6.0.14, 6.0.15, 7.0.4 +- Microsoft.NETCore.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 6.0.5, 6.0.14, 6.0.15, 7.0.4 +- Microsoft.WindowsDesktop.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 6.0.5, 6.0.15, 7.0.4 - nbgv 3.5.119+5d25f54fec ### PowerShell Tools @@ -544,10 +544,10 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Az (Cached): 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.290 +- AWSPowershell: 4.1.299 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 -- Microsoft.Graph: 1.23.0 +- Microsoft.Graph: 1.24.0 - Pester: 3.4.0, 5.4.0 - PowerShellGet: 1.0.0.1, 2.2.5 - PSScriptAnalyzer: 1.21.0 @@ -588,9 +588,9 @@ All other versions are saved but not installed. ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2022 | sha256:5f068dbfbe1aa441ea4295fbe9fe36e1ee0915cb65f8a3d76126a318a4a48200 | 2023-02-14 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2022 | sha256:b4dca605425b7411b347b91e0dc30cfabbfb80e79c66e4a350f2057f7fe391b8 | 2023-02-14 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:13f41497e137a3495b0cefb7ce10f2cc65eca01925fff2ca595febe3bc1b6092 | 2023-02-21 | -| mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:786a24be2bd1945bee9701f95a71d8573ace8641c112dc27206f826bef0229c1 | 2023-02-07 | -| mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:5662262ca25622f4f8ad593481dd58dea47713bce5e6c9fdef9089a92e7c75b1 | 2023-02-07 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2022 | sha256:289f9607d3a0e01e3b15fd594438a7d4a1e970ee3cd1c77dcdbb27a33627280b | 2023-03-14 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2022 | sha256:7c9bcece84ea272f1d654805fe43ce9086b13fff82407bc8288679ed5fa82b94 | 2023-03-14 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:fde0791b732b4d57359c5b134695bcab4f4f3c05e232a0e1762abed3568bd624 | 2023-03-14 | +| mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:3bb312dcc36fa551766a13cf2fb8e2be90726774589c96bea9198a26307bf2a2 | 2023-03-10 | +| mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:3949614905ddf2c4451b18894563c36f0c0aa93ab0e17ea6f8ca3791313e4e4f | 2023-03-10 | From 709d0b30fea76d852346e72babf388969e2d7523 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 30 Mar 2023 19:47:01 +0000 Subject: [PATCH 1837/3485] Updating readme file for win19 version 20230326.1 (#7344) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2019-Readme.md | 92 ++++++++++++++++---------------- 1 file changed, 46 insertions(+), 46 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index 06be76819268..7876e73e07f2 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -3,8 +3,8 @@ | [[All OSes] Go 1.17.x will be removed and 1.20.x set as default on April, 3](https://github.com/actions/runner-images/issues/7276) | *** # Windows Server 2019 -- OS Version: 10.0.17763 Build 4010 -- Image Version: 20230314.1 +- OS Version: 10.0.17763 Build 4131 +- Image Version: 20230326.1 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -19,13 +19,13 @@ - LLVM 15.0.7 - Node 18.15.0 - Perl 5.32.1 -- PHP 8.2.3 +- PHP 8.2.4 - Python 3.7.9 - Ruby 2.5.9p229 ### Package Management -- Chocolatey 1.3.0 -- Composer 2.5.4 +- Chocolatey 1.3.1 +- Composer 2.5.5 - Helm 3.11.2 - Miniconda 23.1.0 (pre-installed on the image but not added to PATH) - NPM 9.5.0 @@ -33,7 +33,7 @@ - pip 23.0.1 (python 3.7) - Pipx 1.2.0 - RubyGems 2.7.6.3 -- Vcpkg (build from commit cfdeb75bb) +- Vcpkg (build from commit b81bc3a83) - Yarn 1.22.19 #### Environment variables @@ -52,25 +52,25 @@ - 7zip 22.01 - aria2 1.36.0 - azcopy 10.17.0 -- Bazel 6.1.0 +- Bazel 6.1.1 - Bazelisk 1.13.2 - Bicep 0.15.31 - Cabal 3.10.1.0 -- CMake 3.25.3 -- CodeQL Action Bundles 2.12.3 2.12.4 +- CMake 3.26.1 +- CodeQL Action Bundles 2.12.4 2.12.5 - Docker 23.0.1 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.16.0 +- Docker Compose v2 2.17.2 - Docker-wincred 0.7.0 - ghc 9.6.1 - Git 2.40.0.windows.1 - Git LFS 3.3.0 -- Google Cloud SDK 422.0.0 -- ImageMagick 7.1.1-3 +- Google Cloud SDK 423.0.0 +- ImageMagick 7.1.1-4 - InnoSetup 6.2.2 - jq 1.6 - Kind 0.17.0 -- Kubectl 1.26.2 +- Kubectl 1.26.3 - Mercurial 5.0 - Mingw-w64 8.1.0 - Newman 5.3.2 @@ -78,49 +78,49 @@ - OpenSSL 1.1.1 - Packer 1.8.5 - Parcel 2.8.3 -- Pulumi 3.57.1 -- R 4.2.2 +- Pulumi 3.59.1 +- R 4.2.3 - Service Fabric SDK 9.1.1436.9590 - Stack 2.9.3 - Subversion (SVN) 1.14.2 -- Swig 4.0.2 +- Swig 4.1.1 - VSWhere 3.1.1 - WinAppDriver 1.2.2009.02003 - WiX Toolset 3.11.2.4516 -- yamllint 1.29.0 +- yamllint 1.30.0 - zstd 1.5.4 ### CLI Tools -- Alibaba Cloud CLI 3.0.156 -- AWS CLI 2.11.2 -- AWS SAM CLI 1.76.0 -- AWS Session Manager CLI 1.2.398.0 +- Alibaba Cloud CLI 3.0.158 +- AWS CLI 2.11.6 +- AWS SAM CLI 1.78.0 +- AWS Session Manager CLI 1.2.463.0 - Azure CLI 2.46.0 - Azure DevOps CLI extension 0.26.0 - Cloud Foundry CLI 6.53.0 -- GitHub CLI 2.24.3 +- GitHub CLI 2.25.1 - Hub CLI 2.14.2 ### Rust Tools -- Cargo 1.68.0 -- Rust 1.68.0 -- Rustdoc 1.68.0 +- Cargo 1.68.1 +- Rust 1.68.1 +- Rustdoc 1.68.1 - Rustup 1.25.2 #### Packages - bindgen 0.64.0 -- cargo-audit 0.17.4 +- cargo-audit 0.17.5 - cargo-outdated 0.11.2 - cbindgen 0.24.3 - Clippy 0.1.68 - Rustfmt 1.5.1 ### Browsers and Drivers -- Google Chrome 111.0.5563.65 +- Google Chrome 111.0.5563.111 - Chrome Driver 111.0.5563.64 -- Microsoft Edge 111.0.1661.41 -- Microsoft Edge Driver 111.0.1661.41 -- Mozilla Firefox 111.0 +- Microsoft Edge 111.0.1661.54 +- Microsoft Edge Driver 111.0.1661.54 +- Mozilla Firefox 111.0.1 - Gecko Driver 0.32.2 - IE Driver 4.8.0.0 - Selenium server 4.8.0 @@ -218,7 +218,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | 5.0.15.0 | MongoDB | Stopped | Disabled | ### Database tools -- Azure CosmosDb Emulator 2.14.11.0 +- Azure CosmosDb Emulator 2.14.12.0 - DacFx 16.1.8089.0 - MySQL 5.7.40.0 - SQL OLEDB Driver 18.6.3.0 @@ -231,14 +231,14 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Nginx | 1.23.3 | C:\tools\nginx-1.23.3\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2019 -| Name | Version | Path | -| ----------------------------- | -------------- | -------------------------------------------------------------- | -| Visual Studio Enterprise 2019 | 16.11.33328.57 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | +| Name | Version | Path | +| ----------------------------- | --------------- | -------------------------------------------------------------- | +| Visual Studio Enterprise 2019 | 16.11.33423.256 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | #### Workloads, components and extensions | Package | Version | | ------------------------------------------------------------------------- | --------------- | -| Component.Android.NDK.R16B | 16.11.33328.57 | +| Component.Android.NDK.R16B | 16.11.33423.256 | | Component.Android.SDK25.Private | 16.0.28625.61 | | Component.Android.SDK30 | 16.10.31205.252 | | Component.Ant | 1.9.3.8 | @@ -496,11 +496,11 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 10.0.22621.0 ### .NET Core Tools -- .NET Core SDK: 3.1.120, 3.1.202, 3.1.302, 3.1.426, 6.0.114, 6.0.203, 6.0.309, 6.0.406 +- .NET Core SDK: 3.1.120, 3.1.202, 3.1.302, 3.1.426, 6.0.115, 6.0.203, 6.0.310, 6.0.407 - .NET Framework: 4.7.2, 4.8 -- Microsoft.AspNetCore.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 6.0.5, 6.0.14 -- Microsoft.NETCore.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 6.0.5, 6.0.14 -- Microsoft.WindowsDesktop.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 6.0.5, 6.0.14 +- Microsoft.AspNetCore.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 6.0.5, 6.0.15 +- Microsoft.NETCore.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 6.0.5, 6.0.15 +- Microsoft.WindowsDesktop.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 6.0.5, 6.0.15 - nbgv 3.5.119+5d25f54fec ### PowerShell Tools @@ -513,10 +513,10 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Az (Cached): 1.0.0.zip, 1.6.0.zip, 2.3.2.zip, 2.6.0.zip, 3.1.0.zip, 3.5.0.zip, 3.8.0.zip, 4.3.0.zip, 4.4.0.zip, 4.7.0.zip, 5.5.0.zip, 5.9.0.zip, 6.6.0.zip, 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.290 +- AWSPowershell: 4.1.299 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 -- Microsoft.Graph: 1.23.0 +- Microsoft.Graph: 1.24.0 - Pester: 3.4.0, 5.4.0 - PowerShellGet: 1.0.0.1, 2.2.5 - PSScriptAnalyzer: 1.21.0 @@ -558,9 +558,9 @@ All other versions are saved but not installed. ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:c3ffbe8f1ac99a6e8bd51e0259c0e33b3203098209ed56f71ef038e7781b4fd2 | 2023-02-14 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:7d8886649cc239ad1daf134dd8a566dd1b680291eb7f89ffe4ba2968c7f0007e | 2023-02-14 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:eae7efdcfce460bec521b0719973ce77836793e4a954d4ee97756c468299671f | 2023-02-21 | -| mcr.microsoft.com/windows/nanoserver:1809 | sha256:fc2d54de31f170c0bef160137b4dc0a80c2105a218b248dc71c754e1fcabd14f | 2023-02-07 | -| mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:46b40e526196d42b78d6bc777529203fd51467b095ddcb7acc87fc475c3c5e55 | 2023-02-07 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:49f95b4f74aed03a37ba895496eebad67dbab56a14a4276fbdea79e51f98b345 | 2023-03-15 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:21e89167d6e546d8c478af5a7c98a490ee5fbec8e54b5f6ad316a36bd53e9769 | 2023-03-14 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:a548db63b396cc33957408fed71d536664dd04e13b990d05839def032967ce2a | 2023-03-15 | +| mcr.microsoft.com/windows/nanoserver:1809 | sha256:adac2bb090398b9e2a9717571ee581816029424af706248b1cf3daae6178fc1f | 2023-03-11 | +| mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:17bf5541b81ad3cfb8eb5170c2ce4f06df0d3741bb573fe27c7b5729d9c010f4 | 2023-03-11 | From 425daf97b4452130f0065e4fc58b5c8b34ab1941 Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Fri, 31 Mar 2023 16:30:04 +0200 Subject: [PATCH 1838/3485] Validate OpenSSL version in Windows (#7372) --- images/win/scripts/Tests/Tools.Tests.ps1 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/images/win/scripts/Tests/Tools.Tests.ps1 b/images/win/scripts/Tests/Tools.Tests.ps1 index 26ec41976430..ad94ce146250 100644 --- a/images/win/scripts/Tests/Tools.Tests.ps1 +++ b/images/win/scripts/Tests/Tools.Tests.ps1 @@ -226,6 +226,7 @@ Describe "SQL OLEDB Driver" { Describe "OpenSSL" { It "OpenSSL" { - "openssl version" | Should -ReturnZeroExitCode + $OpenSSLVersion = (Get-ToolsetContent).openssl.version + openssl version | Should -BeLike "* ${OpenSSLVersion}*" } } From e72606ffb643bcabdd712fb09ef10c3181959f27 Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Tue, 4 Apr 2023 12:36:53 +0200 Subject: [PATCH 1839/3485] Cleanup ubuntu1804 image references (#7388) --- .github/ISSUE_TEMPLATE/announcement.yml | 1 - .github/ISSUE_TEMPLATE/bug-report.yml | 1 - .github/ISSUE_TEMPLATE/tool-request.yml | 1 - CONTRIBUTING.md | 2 +- README.md | 4 +- docs/create-image-and-azure-resources.md | 10 +- helpers/GenerateResourcesAndImage.ps1 | 12 +- .../azure-pipelines/ubuntu1804.yml | 20 - images/linux/Ubuntu1804-Readme.md | 397 ------------------ images/linux/config/ubuntu1804.conf | 2 - .../SoftwareReport.Databases.psm1 | 3 - .../SoftwareReport.Generator.ps1 | 12 +- .../linux/scripts/helpers/Common.Helpers.psm1 | 4 - images/linux/scripts/helpers/os.sh | 5 - images/linux/scripts/installers/android.sh | 37 +- images/linux/scripts/installers/containers.sh | 4 +- images/linux/scripts/installers/erlang.sh | 12 +- images/linux/scripts/installers/java-tools.sh | 12 +- images/linux/scripts/installers/php.sh | 2 +- images/linux/scripts/installers/python.sh | 4 - images/linux/scripts/tests/Tools.Tests.ps1 | 2 +- images/linux/toolsets/toolset-1804.json | 361 ---------------- images/linux/ubuntu1804.json | 393 ----------------- 23 files changed, 41 insertions(+), 1260 deletions(-) delete mode 100644 images.CI/linux-and-win/azure-pipelines/ubuntu1804.yml delete mode 100644 images/linux/Ubuntu1804-Readme.md delete mode 100644 images/linux/config/ubuntu1804.conf delete mode 100644 images/linux/toolsets/toolset-1804.json delete mode 100644 images/linux/ubuntu1804.json diff --git a/.github/ISSUE_TEMPLATE/announcement.yml b/.github/ISSUE_TEMPLATE/announcement.yml index 59b3bba81069..5a43bde1aa16 100644 --- a/.github/ISSUE_TEMPLATE/announcement.yml +++ b/.github/ISSUE_TEMPLATE/announcement.yml @@ -36,7 +36,6 @@ body: attributes: label: Runner images affected options: - - label: Ubuntu 18.04 - label: Ubuntu 20.04 - label: Ubuntu 22.04 - label: macOS 11 diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml index 158421a7b097..9d2337eda44f 100644 --- a/.github/ISSUE_TEMPLATE/bug-report.yml +++ b/.github/ISSUE_TEMPLATE/bug-report.yml @@ -19,7 +19,6 @@ body: attributes: label: Runner images affected options: - - label: Ubuntu 18.04 - label: Ubuntu 20.04 - label: Ubuntu 22.04 - label: macOS 11 diff --git a/.github/ISSUE_TEMPLATE/tool-request.yml b/.github/ISSUE_TEMPLATE/tool-request.yml index cf8c29ab1339..687118da4ea3 100644 --- a/.github/ISSUE_TEMPLATE/tool-request.yml +++ b/.github/ISSUE_TEMPLATE/tool-request.yml @@ -57,7 +57,6 @@ body: attributes: label: Runner images where you need the tool options: - - label: Ubuntu 18.04 - label: Ubuntu 20.04 - label: Ubuntu 22.04 - label: macOS 11 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ccc992075754..21222c5c7687 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -49,7 +49,7 @@ Add `Invoke-PesterTests -TestFile <testFileName> [-TestName <describeName>]` at Use existing scripts such as [github-cli.sh](images/linux/scripts/installers/github-cli.sh) as a starting point. - Use [helpers](images/linux/scripts/helpers/install.sh) to simplify installation process. - Validation part should `exit 1` if any issue with installation. -- Add changes to the software report generator `images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1`. The software report generator is used to generate an image's README file, e.g. [Ubuntu1804-Readme.md](images/linux/Ubuntu1804-README.md) and it uses [MarkdownPS](https://github.com/Sarafian/MarkdownPS). +- Add changes to the software report generator `images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1`. The software report generator is used to generate an image's README file, e.g. [Ubuntu2004-Readme.md](images/linux/Ubuntu2004-README.md) and it uses [MarkdownPS](https://github.com/Sarafian/MarkdownPS). ### macOS macOS source lives in this repository and available for everyone. However, macOS image-generation CI doesn't support external contributions yet so we are not able to accept pull-requests for now. diff --git a/README.md b/README.md index a9d73b742007..4d4edeb95511 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,6 @@ To build a VM machine from this repo's source, see the [instructions](docs/creat | --------------------|---------------------|--------------------|---------------------| | Ubuntu 22.04 | `ubuntu-latest` or `ubuntu-22.04` | [ubuntu-22.04] | [![status22](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu22&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu22&redirect=1) | Ubuntu 20.04 | `ubuntu-20.04` | [ubuntu-20.04] | [![status20](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu20&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu20&redirect=1) -| Ubuntu 18.04 <sup>deprecated</sup> | `ubuntu-18.04` | [ubuntu-18.04] | [![status18](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu18&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu18&redirect=1) | macOS 12 | `macos-latest` or `macos-12`| [macOS-12] | [![statusumac12](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-12&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-12&redirect=1) | macOS 11 | `macos-11`| [macOS-11] | [![statusmac11](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-11&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-11&redirect=1) | macOS 10.15 <sup>deprecated</sup> | `macos-10.15` | [macOS-10.15] | [![statusmac10](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-10.15&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-10.15&redirect=1) @@ -37,7 +36,6 @@ To build a VM machine from this repo's source, see the [instructions](docs/creat [ubuntu-22.04]: https://github.com/actions/runner-images/blob/main/images/linux/Ubuntu2204-Readme.md [ubuntu-20.04]: https://github.com/actions/runner-images/blob/main/images/linux/Ubuntu2004-Readme.md -[ubuntu-18.04]: https://github.com/actions/runner-images/blob/main/images/linux/Ubuntu1804-Readme.md [windows-2022]: https://github.com/actions/runner-images/blob/main/images/win/Windows2022-Readme.md [windows-2019]: https://github.com/actions/runner-images/blob/main/images/win/Windows2019-Readme.md [macOS-11]: https://github.com/actions/runner-images/blob/main/images/macos/macos-11-Readme.md @@ -118,7 +116,7 @@ We use third-party package managers to install software during the image generat | Operating system | Package manager | Third-party repos and packages | | :--- | :---: | ---: | -| Ubuntu | [APT](https://wiki.debian.org/Apt) | [Eclipse-Timurin (Adoptium)](https://packages.adoptium.net/artifactory/deb) </br> [Erlang](https://packages.erlang-solutions.com/ubuntu) </br>[Firefox](https://launchpad.net/~mozillateam/+archive/ubuntu/ppa) </br> [gcc, gfortran](https://launchpad.net/~ubuntu-toolchain-r/+archive/ubuntu/test) </br> [git](https://launchpad.net/~git-core/+archive/ubuntu/ppa) </br> [HHvm](https://dl.hhvm.com/ubuntu) </br> [PHP](https://launchpad.net/~ondrej/+archive/ubuntu/php) (Ubuntu 18 & 20 only) </br> [Mono](https://download.mono-project.com/repo/ubuntu) </br> [PostgreSQL](https://apt.postgresql.org/pub/repos/apt) </br> [R](https://cloud.r-project.org/bin/linux/ubuntu) | +| Ubuntu | [APT](https://wiki.debian.org/Apt) | [Eclipse-Timurin (Adoptium)](https://packages.adoptium.net/artifactory/deb) </br> [Erlang](https://packages.erlang-solutions.com/ubuntu) </br>[Firefox](https://launchpad.net/~mozillateam/+archive/ubuntu/ppa) </br> [gcc, gfortran](https://launchpad.net/~ubuntu-toolchain-r/+archive/ubuntu/test) </br> [git](https://launchpad.net/~git-core/+archive/ubuntu/ppa) </br> [HHvm](https://dl.hhvm.com/ubuntu) </br> [PHP](https://launchpad.net/~ondrej/+archive/ubuntu/php) (Ubuntu 20 only) </br> [Mono](https://download.mono-project.com/repo/ubuntu) </br> [PostgreSQL](https://apt.postgresql.org/pub/repos/apt) </br> [R](https://cloud.r-project.org/bin/linux/ubuntu) | | | [pipx](https://pypa.github.io/pipx) | ansible-core </br>yamllint | | Windows | [Chocolatey](https://chocolatey.org) | No third-party repos installed | | macOS | [Homebrew](https://homebrew.sh) | [aws-cli v2](https://github.com/aws/homebrew-tap) </br> [azure/bicep](https://github.com/Azure/homebrew-bicep) </br> [graalvm-ce-java11](https://github.com/graalvm/homebrew-tap) </br> [mongodb/brew](https://github.com/mongodb/homebrew-brew) | diff --git a/docs/create-image-and-azure-resources.md b/docs/create-image-and-azure-resources.md index 82a8426b1f5d..f2004ca630b8 100644 --- a/docs/create-image-and-azure-resources.md +++ b/docs/create-image-and-azure-resources.md @@ -1,5 +1,5 @@ # GitHub Actions Runner Images -The runner-images project uses [Packer](https://www.packer.io/) to generate disk images for the following platforms: Windows 2019/2022, Ubuntu 18.04/20.04/22.04. +The runner-images project uses [Packer](https://www.packer.io/) to generate disk images for the following platforms: Windows 2019/2022, Ubuntu 20.04/22.04. Each image is configured through a JSON template that Packer understands and which specifies where to build the image (Azure in this case), and what scripts to run to install software and prepare the disk. The Packer process initializes a connection to Azure subscription via Azure CLI, and automatically creates the temporary Azure resources required to build the source VM(temporary resource group, network interfaces, and VM from the "clean" image specified in the template). If the VM deployment succeeds, the build agent connects to the VM and starts to execute installation steps from the JSON template. @@ -60,13 +60,13 @@ Set-Location C:\runner-images Import-Module .\helpers\GenerateResourcesAndImage.ps1 -GenerateResourcesAndImage -SubscriptionId {YourSubscriptionId} -ResourceGroupName "myTestResourceGroup" -ImageGenerationRepositoryRoot "$pwd" -ImageType Ubuntu1804 -AzureLocation "East US" +GenerateResourcesAndImage -SubscriptionId {YourSubscriptionId} -ResourceGroupName "myTestResourceGroup" -ImageGenerationRepositoryRoot "$pwd" -ImageType Ubuntu2004 -AzureLocation "East US" ``` Where: - `SubscriptionId` - The Azure subscription Id where resources will be created. - `ResourceGroupName` - The Azure resource group name where the Azure resources will be created. - `ImageGenerationRepositoryRoot` - The root path of the image generation repository source. -- `ImageType` - The type of the image being generated. Valid options are: "Windows2019", "Windows2022", "Ubuntu1804", "Ubuntu2004", "Ubuntu2204". +- `ImageType` - The type of the image being generated. Valid options are: "Windows2019", "Windows2022", "Ubuntu2004", "Ubuntu2204". - `AzureLocation` - The location of the resources being created in Azure. For example "East US". The function automatically creates all required Azure resources and kicks off packer image generation for the selected image type. @@ -74,13 +74,13 @@ The function automatically creates all required Azure resources and kicks off pa For optional authentication via service principal make sure to provide the following params — `AzureClientId`, `AzureClientSecret`, `AzureTenantId`, so the whole command will be: ``` -GenerateResourcesAndImage -SubscriptionId {YourSubscriptionId} -ResourceGroupName "myTestResourceGroup" -ImageGenerationRepositoryRoot "$pwd" -ImageType Ubuntu1804 -AzureLocation "East US" -AzureClientId {AADApplicationID} -AzureClientSecret {AADApplicationSecret} -AzureTenantId {AADTenantID} +GenerateResourcesAndImage -SubscriptionId {YourSubscriptionId} -ResourceGroupName "myTestResourceGroup" -ImageGenerationRepositoryRoot "$pwd" -ImageType Ubuntu2004 -AzureLocation "East US" -AzureClientId {AADApplicationID} -AzureClientSecret {AADApplicationSecret} -AzureTenantId {AADTenantID} ``` As extra options, you can add more params for permit to add Azure Tags on resources and enable https for Storage Account. It could be helpful on some tenants with hardenning policy. Params are — `EnableHttpsTrafficOnly` (Boolean) and `tags` (HashTable), so the whole command will be: ``` -GenerateResourcesAndImage -SubscriptionId {YourSubscriptionId} -ResourceGroupName "myTestResourceGroup" -ImageGenerationRepositoryRoot "$pwd" -ImageType Ubuntu1804 -AzureLocation "East US" -EnableHttpsTrafficOnly $true -tags @{dept="devops";env="prod"} +GenerateResourcesAndImage -SubscriptionId {YourSubscriptionId} -ResourceGroupName "myTestResourceGroup" -ImageGenerationRepositoryRoot "$pwd" -ImageType Ubuntu2004 -AzureLocation "East US" -EnableHttpsTrafficOnly $true -tags @{dept="devops";env="prod"} ``` *Please, check synopsis of `GenerateResourcesAndImage` for details about non-mandatory parameters.* diff --git a/helpers/GenerateResourcesAndImage.ps1 b/helpers/GenerateResourcesAndImage.ps1 index 822ff9d63235..ea656b52bc23 100644 --- a/helpers/GenerateResourcesAndImage.ps1 +++ b/helpers/GenerateResourcesAndImage.ps1 @@ -3,9 +3,8 @@ $ErrorActionPreference = 'Stop' enum ImageType { Windows2019 = 1 Windows2022 = 2 - Ubuntu1804 = 3 - Ubuntu2004 = 4 - Ubuntu2204 = 5 + Ubuntu2004 = 3 + Ubuntu2204 = 4 } Function Get-PackerTemplatePath { @@ -23,9 +22,6 @@ Function Get-PackerTemplatePath { ([ImageType]::Windows2022) { $relativeTemplatePath = Join-Path "win" "windows2022.json" } - ([ImageType]::Ubuntu1804) { - $relativeTemplatePath = Join-Path "linux" "ubuntu1804.json" - } ([ImageType]::Ubuntu2004) { $relativeTemplatePath = Join-Path "linux" "ubuntu2004.json" } @@ -67,7 +63,7 @@ Function GenerateResourcesAndImage { .PARAMETER ImageGenerationRepositoryRoot The root path of the image generation repository source. .PARAMETER ImageType - The type of the image being generated. Valid options are: {"Windows2019", "Windows2022", "Ubuntu1804", "Ubuntu2004", "Ubuntu2204"}. + The type of the image being generated. Valid options are: {"Windows2019", "Windows2022", "Ubuntu2004", "Ubuntu2204"}. .PARAMETER AzureLocation The location of the resources being created in Azure. For example "East US". .PARAMETER Force @@ -87,7 +83,7 @@ Function GenerateResourcesAndImage { .PARAMETER OnError Specify how packer handles an error during image creation. .EXAMPLE - GenerateResourcesAndImage -SubscriptionId {YourSubscriptionId} -ResourceGroupName "shsamytest1" -ImageGenerationRepositoryRoot "C:\runner-images" -ImageType Ubuntu1804 -AzureLocation "East US" + GenerateResourcesAndImage -SubscriptionId {YourSubscriptionId} -ResourceGroupName "shsamytest1" -ImageGenerationRepositoryRoot "C:\runner-images" -ImageType Ubuntu2004 -AzureLocation "East US" #> param ( [Parameter(Mandatory = $True)] diff --git a/images.CI/linux-and-win/azure-pipelines/ubuntu1804.yml b/images.CI/linux-and-win/azure-pipelines/ubuntu1804.yml deleted file mode 100644 index 44823c63fe7e..000000000000 --- a/images.CI/linux-and-win/azure-pipelines/ubuntu1804.yml +++ /dev/null @@ -1,20 +0,0 @@ -schedules: -- cron: "0 0 * * *" - displayName: Daily - branches: - include: - - main - always: true - -trigger: none -pr: - autoCancel: true - branches: - include: - - main - -jobs: -- template: image-generation.yml - parameters: - image_type: ubuntu1804 - image_readme_name: Ubuntu1804-Readme.md \ No newline at end of file diff --git a/images/linux/Ubuntu1804-Readme.md b/images/linux/Ubuntu1804-Readme.md deleted file mode 100644 index d3050e988e44..000000000000 --- a/images/linux/Ubuntu1804-Readme.md +++ /dev/null @@ -1,397 +0,0 @@ -| Announcements | -|-| -| [[all OSs] Default Nodejs version will be set to 18 on February, 13](https://github.com/actions/runner-images/issues/7002) | -| [The Ubuntu 18.04 Actions runner image will begin deprecation on 2022/08/08 and will be fully unsupported by 2023/04/01](https://github.com/actions/runner-images/issues/6002) | -*** -# Ubuntu 18.04 -- OS Version: 18.04.6 LTS -- Kernel Version: 5.4.0-1103-azure -- Image Version: 20230217.2 - -## Installed Software - -### Language and Runtime -- Bash 4.4.20(1)-release -- Clang: 9.0.0 -- Clang-format: 9.0.0 -- Clang-tidy: 9.0.0 -- Dash 0.5.8-2.10 -- Erlang 25.0.4 (Eshell 13.0.4) -- Erlang rebar3 3.20.0 -- GNU C++: 7.5.0, 9.4.0, 10.3.0 -- GNU Fortran: 7.5.0, 9.4.0, 10.3.0 -- Julia 1.8.5 -- Kotlin 1.8.10-release-430 -- Mono 6.12.0.182 -- MSBuild 16.10.1.31701 (Mono 6.12.0.182) -- Node.js 16.19.1 -- Perl 5.26.1 -- Python 2.7.17 -- Python3 3.6.9 -- Ruby 2.5.1p57 -- Swift 5.7.3 - -### Package Management -- cpan 1.64 -- Helm 3.11.1 -- Homebrew 4.0.1 -- Miniconda 23.1.0 -- Npm 8.19.3 -- NuGet 6.3.1.1 -- Pip 9.0.1 -- Pip3 9.0.1 -- Pipx 1.0.0 -- RubyGems 2.7.6 -- Vcpkg (build from commit 31a159c1c) -- Yarn 1.22.19 - -#### Environment variables -| Name | Value | -| ----------------------- | ---------------------- | -| CONDA | /usr/share/miniconda | -| VCPKG_INSTALLATION_ROOT | /usr/local/share/vcpkg | - -#### Homebrew note -``` -Location: /home/linuxbrew -Note: Homebrew is pre-installed on image but not added to PATH. -run the eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)" command -to accomplish this. -``` - -### Project Management -- Ant 1.10.5 -- Gradle 8.0.1 -- Maven 3.8.7 -- Sbt 1.8.2 - -### Tools -- Ansible 2.11.12 -- apt-fast 1.9.12 -- AzCopy 10.17.0 - available by `azcopy` and `azcopy10` aliases -- Bazel 6.0.0 -- Bazelisk 1.13.2 -- Bicep 0.14.46 -- Buildah 1.22.3 -- CMake 3.25.2 -- CodeQL Action Bundles 2.12.1 2.12.2 -- Docker Amazon ECR Credential Helper 0.6.0 -- Docker Compose v1 1.29.2 -- Docker Compose v2 2.16.0+azure-2 -- Docker-Buildx 0.10.3 -- Docker-Moby Client 20.10.23+azure-2 -- Docker-Moby Server 20.10.22+azure-1 -- Git 2.39.2 -- Git LFS 3.2.0 -- Git-ftp 1.3.1 -- Haveged 1.9.1 -- Heroku 7.68.1 -- HHVM (HipHop VM) 4.164.0 -- jq 1.5 -- Kind 0.17.0 -- Kubectl 1.26.1 -- Kustomize 5.0.0 -- Leiningen 2.10.0 -- MediaInfo 17.12 -- Mercurial 4.5.3 -- Minikube 1.29.0 -- n 9.0.1 -- Newman 5.3.2 -- nvm 0.39.3 -- OpenSSL 1.1.1-1ubuntu2.1~18.04.21 -- Packer 1.8.6 -- Parcel 2.8.3 -- PhantomJS 2.1.1 -- Podman 3.4.2 -- Pulumi 3.55.0 -- R 4.2.2 -- Skopeo 1.5.0 -- Sphinx Open Source Search Server 2.2.11 -- SVN 1.9.7 -- Terraform 1.3.9 -- yamllint 1.28.0 -- yq 4.30.8 -- zstd 1.5.4 - -### CLI Tools -- Alibaba Cloud CLI 3.0.149 -- AWS CLI 2.10.1 -- AWS CLI Session Manager Plugin 1.2.398.0 -- AWS SAM CLI 1.73.0 -- Azure CLI 2.45.0 -- Azure CLI (azure-devops) 0.26.0 -- GitHub CLI 2.23.0 -- Google Cloud SDK 418.0.0 -- Hub CLI 2.14.2 -- Netlify CLI 12.13.1 -- OpenShift CLI 4.12.3 -- ORAS CLI 0.16.0 -- Vercel CLI 28.16.2 - -### Java -| Version | Vendor | Environment Variable | -| ------------------- | --------------- | -------------------- | -| 8.0.362+9 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | -| 11.0.18+10 | Eclipse Temurin | JAVA_HOME_11_X64 | -| 12.0.2+10 | Adopt OpenJDK | JAVA_HOME_12_X64 | -| 17.0.6+10 | Eclipse Temurin | JAVA_HOME_17_X64 | - -### PHP Tools -- PHP: 7.2.34, 7.3.33, 7.4.33, 8.0.28, 8.1.16, 8.2.3 -- Composer 2.5.4 -- PHPUnit 8.5.32 -``` -Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. -``` - -### Haskell Tools -- Cabal 3.6.2.0 -- GHC 9.4.4 -- GHCup 0.1.19.0 -- Stack 2.9.3 - -### Rust Tools -- Cargo 1.67.1 -- Rust 1.67.1 -- Rustdoc 1.67.1 -- Rustup 1.25.2 - -#### Packages -- Bindgen 0.64.0 -- Cargo audit 0.17.4 -- Cargo clippy 0.1.67 -- Cargo outdated 0.11.2 -- Cbindgen 0.24.3 -- Rustfmt 1.5.1 - -### Browsers and Drivers -- Google Chrome 110.0.5481.100 -- ChromeDriver 110.0.5481.77 -- Chromium 110.0.5481.0 -- Microsoft Edge 110.0.1587.50 -- Microsoft Edge WebDriver 110.0.1587.50 -- Selenium server 4.8.0 -- Mozilla Firefox 110.0 -- Geckodriver 0.32.2 - -#### Environment variables -| Name | Value | -| ----------------- | ----------------------------------- | -| CHROMEWEBDRIVER | /usr/local/share/chrome_driver | -| EDGEWEBDRIVER | /usr/local/share/edge_driver | -| GECKOWEBDRIVER | /usr/local/share/gecko_driver | -| SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | - -### .NET Tools -- .NET Core SDK: 3.1.120, 3.1.202, 3.1.302, 3.1.426, 6.0.406 -- nbgv 3.5.119+5d25f54fec - -### Databases -- MongoDB 5.0.14 -- sqlite3 3.22.0 - -#### PostgreSQL -- PostgreSQL 14.7 -``` -User: postgres -PostgreSQL service is disabled by default. -Use the following command as a part of your job to start the service: 'sudo systemctl start postgresql.service' -``` - -#### MySQL -- MySQL 5.7.41 -``` -User: root -Password: root -MySQL service is disabled by default. -Use the following command as a part of your job to start the service: 'sudo systemctl start mysql.service' -``` - -#### MS SQL -- sqlcmd 17.10.0001.1 -- SqlPackage 16.1.8089.0 - -### Cached Tools - -#### Go -- 1.16.15 -- 1.17.13 -- 1.18.10 - -#### Node.js -- 14.21.3 -- 16.19.1 -- 18.14.1 - -#### Python -- 2.7.18 -- 3.6.15 -- 3.7.15 -- 3.8.16 -- 3.9.16 -- 3.10.10 -- 3.11.2 - -#### PyPy -- 2.7.18 [PyPy 7.3.11] -- 3.6.12 [PyPy 7.3.3] -- 3.9.16 [PyPy 7.3.11] - -#### Ruby -- 2.4.10 -- 2.5.9 -- 2.6.10 -- 2.7.7 -- 3.0.5 -- 3.1.3 - -### PowerShell Tools -- PowerShell 7.2.9 - -#### PowerShell Modules -- Az: 9.3.0 -- Az (Cached): 3.1.0.zip, 4.4.0.zip, 5.9.0.zip, 6.6.0.zip, 7.5.0.zip -- MarkdownPS: 1.9 -- Microsoft.Graph: 1.22.0 -- Pester: 5.4.0 - -### Web Servers -| Name | Version | ConfigFile | ServiceStatus | ListenPort | -| ------- | ------- | ------------------------- | ------------- | ---------- | -| apache2 | 2.4.29 | /etc/apache2/apache2.conf | inactive | 80 | -| nginx | 1.14.0 | /etc/nginx/nginx.conf | inactive | 80 | - -### Android -| Package Name | Version | -| -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 8.0 | -| Android Emulator | 32.1.11 | -| Android SDK Build-tools | 33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3<br>26.0.0 26.0.1 26.0.2 26.0.3<br>25.0.0 25.0.1 25.0.2 25.0.3<br>24.0.0 24.0.1 24.0.2 24.0.3<br>23.0.1 23.0.2 23.0.3 | -| Android SDK Platform-Tools | 34.0.0 | -| Android SDK Platforms | android-33-ext4 (rev 1)<br>android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3)<br>android-26 (rev 2)<br>android-25 (rev 3)<br>android-24 (rev 2)<br>android-23 (rev 3) | -| Android SDK Tools | 26.1.1 | -| Android Support Repository | 47.0.0 | -| CMake | 3.10.2<br>3.18.1<br>3.22.1 | -| Google APIs | addon-google_apis-google-21<br>addon-google_apis-google-22<br>addon-google_apis-google-23<br>addon-google_apis-google-24 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 23.2.8568313<br>24.0.8215888<br>25.2.9519653 (default) | -| SDK Patch Applier v4 | 1 | - -#### Environment variables -| Name | Value | -| ----------------------- | ------------------------------------------- | -| ANDROID_HOME | /usr/local/lib/android/sdk | -| ANDROID_NDK | /usr/local/lib/android/sdk/ndk/25.2.9519653 | -| ANDROID_NDK_HOME | /usr/local/lib/android/sdk/ndk/25.2.9519653 | -| ANDROID_NDK_LATEST_HOME | /usr/local/lib/android/sdk/ndk/25.2.9519653 | -| ANDROID_NDK_ROOT | /usr/local/lib/android/sdk/ndk/25.2.9519653 | -| ANDROID_SDK_ROOT | /usr/local/lib/android/sdk | - -### Cached Docker images -| Repository:Tag | Digest | Created | -| ----------------------- | ------------------------------------------------------------------------ | ---------- | -| alpine:3.12 | sha256:c75ac27b49326926b803b9ed43bf088bc220d22556de1bc5f72d742c91398f69 | 2022-04-05 | -| alpine:3.13 | sha256:469b6e04ee185740477efa44ed5bdd64a07bbdd6c7e5f5d169e540889597b911 | 2022-08-09 | -| alpine:3.14 | sha256:560e7a4fa5c891d1830f5591c80b8e472fa6cd386b7254cdf65ccc3249292a34 | 2023-02-11 | -| buildpack-deps:bullseye | sha256:40b14eb195795a586ac132c9b506253bc3e4ee7f48a63b685e5bf37e80b774cf | 2023-02-09 | -| buildpack-deps:buster | sha256:a3e4aaa53bf83302adfb9d8b9ba3996948e4605baac297921d3a173c14603748 | 2023-02-09 | -| buildpack-deps:stretch | sha256:78e995165a5788c2f55aed6e548d8f6c1534830d4310c870408fccb2da8c5b2e | 2022-06-23 | -| debian:10 | sha256:233c3bbc892229c82da7231980d50adceba4db56a08c0b7053a4852782703459 | 2023-02-09 | -| debian:11 | sha256:43ef0c6c3585d5b406caa7a0f232ff5a19c1402aeb415f68bcd1cf9d10180af8 | 2023-02-09 | -| debian:9 | sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be | 2022-06-23 | -| moby/buildkit:latest | sha256:751921dc37d2f842de38c9387f891fe6ae7d80f03d050ea98f780d7e0874ba00 | 2023-02-13 | -| node:14 | sha256:a58436325059a278c35079034ce5c98dace7204a2a5748929ccc79087f959daa | 2023-02-17 | -| node:14-alpine | sha256:1a1a30ee1faa7d512917e277cc8c81744e79096de3561ecda7ea17cc2ceab372 | 2023-02-17 | -| node:16 | sha256:102e907ac88ac60cbad62b09ce003fa11618687621c45da2a2514703be1d1b1a | 2023-02-17 | -| node:16-alpine | sha256:77f92924c9734d4acdeb5ec42de85867b10c0031f2e861d26cdae6abd56cf858 | 2023-02-17 | -| node:18 | sha256:888e7f9ead4aa3257e9c91528b9f63a427d8a926876ef5ae27ecba2651ae211d | 2023-02-17 | -| node:18-alpine | sha256:178bf3eb09c4245fda8c81c1063c0d55c45d7a7f4ddc5296814107b1dc610450 | 2023-02-17 | -| ubuntu:16.04 | sha256:1f1a2d56de1d604801a9671f301190704c25d604a416f59e03c04f5c6ffee0d6 | 2021-08-31 | -| ubuntu:18.04 | sha256:a3765b4d74747b5e9bdd03205b3fbc4fa19a02781c185f97f24c8f4f84ed7bbf | 2023-01-26 | -| ubuntu:20.04 | sha256:4a45212e9518f35983a976eead0de5eecc555a2f047134e9dd2cfc589076a00d | 2023-02-01 | - -### Installed apt packages -| Name | Version | -| ----------------- | --------------------------------- | -| aria2 | 1.33.1-1 | -| autoconf | 2.69-11 | -| automake | 1:1.15.1-3ubuntu2 | -| binutils | 2.30-21ubuntu1\~18.04.8 | -| bison | 2:3.0.4.dfsg-1build1 | -| brotli | 1.0.3-1ubuntu1.3 | -| build-essential | 12.4ubuntu1 | -| bzip2 | 1.0.6-8.1ubuntu0.2 | -| coreutils | 8.28-1ubuntu1 | -| curl | 7.58.0-2ubuntu3.22 | -| dbus | 1.12.2-1ubuntu1.4 | -| dnsutils | 1:9.11.3+dfsg-1ubuntu1.18 | -| dpkg | 1.19.0.5ubuntu2.4 | -| fakeroot | 1.22-2ubuntu1 | -| file | 1:5.32-2ubuntu0.4 | -| flex | 2.6.4-6 | -| ftp | 0.17-34 | -| gnupg2 | 2.2.4-1ubuntu1.6 | -| haveged | 1.9.1-6 | -| imagemagick | 8:6.9.7.4+dfsg-16ubuntu6.15 | -| iproute2 | 4.15.0-2ubuntu1.3 | -| iputils-ping | 3:20161105-1ubuntu3 | -| jq | 1.5+dfsg-2 | -| lib32z1 | 1:1.2.11.dfsg-0ubuntu2.2 | -| libc++-dev | 6.0-2 | -| libc++abi-dev | 6.0-2 | -| libcurl3 | 7.58.0-2ubuntu3.22 | -| libgbm-dev | 20.0.8-0ubuntu1\~18.04.1 | -| libgconf-2-4 | 3.2.6-4ubuntu1 | -| libgsl-dev | 2.4+dfsg-6 | -| libgtk-3-0 | 3.22.30-1ubuntu4 | -| libmagic-dev | 1:5.32-2ubuntu0.4 | -| libmagickcore-dev | 8:6.9.7.4+dfsg-16ubuntu6.15 | -| libmagickwand-dev | 8:6.9.7.4+dfsg-16ubuntu6.15 | -| libsecret-1-dev | 0.18.6-1 | -| libsqlite3-dev | 3.22.0-1ubuntu0.7 | -| libtool | 2.4.6-2 | -| libunwind8 | 1.2.1-8 | -| libxkbfile-dev | 1:1.0.9-2 | -| libxss1 | 1:1.2.2-1 | -| libyaml-dev | 0.1.7-2ubuntu3 | -| locales | 2.27-3ubuntu1.6 | -| m4 | 1.4.18-1 | -| mediainfo | 17.12-1 | -| mercurial | 4.5.3-1ubuntu2.2 | -| net-tools | 1.60+git20161116.90da8a0-1ubuntu1 | -| netcat | 1.10-41.1 | -| openssh-client | 1:7.6p1-4ubuntu0.7 | -| p7zip-full | 16.02+dfsg-6 | -| p7zip-rar | 16.02-2 | -| parallel | 20161222-1 | -| pass | 1.7.1-3 | -| patchelf | 0.9-1 | -| pkg-config | 0.29.1-0ubuntu2 | -| pollinate | 4.33-0ubuntu1\~18.04.2 | -| python-setuptools | 39.0.1-2ubuntu0.1 | -| rpm | 4.14.1+dfsg1-2 | -| rsync | 3.1.2-2.1ubuntu1.5 | -| shellcheck | 0.4.6-1 | -| sphinxsearch | 2.2.11-2 | -| sqlite3 | 3.22.0-1ubuntu0.7 | -| ssh | 1:7.6p1-4ubuntu0.7 | -| sshpass | 1.06-1 | -| subversion | 1.9.7-4ubuntu1.1 | -| sudo | 1.8.21p2-3ubuntu1.5 | -| swig | 3.0.12-1 | -| tar | 1.29b-2ubuntu0.3 | -| telnet | 0.17-41 | -| texinfo | 6.5.0.dfsg.1-2 | -| time | 1.7-25.1build1 | -| tk | 8.6.0+9 | -| tzdata | 2022g-0ubuntu0.18.04 | -| unzip | 6.0-21ubuntu1.2 | -| upx | 3.94-4 | -| wget | 1.19.4-1ubuntu2.2 | -| xorriso | 1.4.8-3 | -| xvfb | 2:1.19.6-1ubuntu4.14 | -| xz-utils | 5.2.2-1.3ubuntu0.1 | -| zip | 3.0-11build1 | -| zsync | 0.6.2-3ubuntu1 | - diff --git a/images/linux/config/ubuntu1804.conf b/images/linux/config/ubuntu1804.conf deleted file mode 100644 index bca2da8a0e68..000000000000 --- a/images/linux/config/ubuntu1804.conf +++ /dev/null @@ -1,2 +0,0 @@ -# Name of pool supported by this image -POOL_NAME="Ubuntu 1804" diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Databases.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Databases.psm1 index 701a8cda09f9..78b20cddc6dc 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Databases.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Databases.psm1 @@ -15,9 +15,6 @@ function Get-SqliteVersion { function Get-MySQLVersion { $mySQLVersion = mysqld --version | Take-OutputPart -Part 2 - if (Test-IsUbuntu18) { - $mySQLVersion = $mySQLVersion | Take-OutputPart -Part 0 -Delimiter "-" - } return $mySQLVersion } diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index 5c48fa0c85f5..d8cd6b119728 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -40,7 +40,7 @@ $languageAndRuntime.AddToolVersionsListInline("Clang", $(Get-ClangToolVersions - $languageAndRuntime.AddToolVersionsListInline("Clang-format", $(Get-ClangToolVersions -ToolName "clang-format"), "^\d+") $languageAndRuntime.AddToolVersionsListInline("Clang-tidy", $(Get-ClangTidyVersions), "^\d+") $languageAndRuntime.AddToolVersion("Dash", $(Get-DashVersion)) -if ((Test-IsUbuntu18) -or (Test-IsUbuntu20)) { +if (Test-IsUbuntu20) { $languageAndRuntime.AddToolVersion("Erlang", $(Get-ErlangVersion)) $languageAndRuntime.AddToolVersion("Erlang rebar3", $(Get-ErlangRebar3Version)) } @@ -81,7 +81,7 @@ to accomplish this. # Project Management $projectManagement = $installedSoftware.AddHeader("Project Management") -if ((Test-IsUbuntu18) -or (Test-IsUbuntu20)) { +if (Test-IsUbuntu20) { $projectManagement.AddToolVersion("Ant", $(Get-AntVersion)) $projectManagement.AddToolVersion("Gradle", $(Get-GradleVersion)) } @@ -89,7 +89,7 @@ if ((Test-IsUbuntu20) -or (Test-IsUbuntu22)) { $projectManagement.AddToolVersion("Lerna", $(Get-LernaVersion)) } $projectManagement.AddToolVersion("Maven", $(Get-MavenVersion)) -if ((Test-IsUbuntu18) -or (Test-IsUbuntu20)) { +if (Test-IsUbuntu20) { $projectManagement.AddToolVersion("Sbt", $(Get-SbtVersion)) } @@ -118,7 +118,7 @@ $tools.AddToolVersion("Git LFS", $(Get-GitLFSVersion)) $tools.AddToolVersion("Git-ftp", $(Get-GitFTPVersion)) $tools.AddToolVersion("Haveged", $(Get-HavegedVersion)) $tools.AddToolVersion("Heroku", $(Get-HerokuVersion)) -if ((Test-IsUbuntu18) -or (Test-IsUbuntu20)) { +if (Test-IsUbuntu20) { $tools.AddToolVersion("HHVM (HipHop VM)", $(Get-HHVMVersion)) } $tools.AddToolVersion("jq", $(Get-JqVersion)) @@ -135,7 +135,7 @@ $tools.AddToolVersion("nvm", $(Get-NvmVersion)) $tools.AddToolVersion("OpenSSL", $(Get-OpensslVersion)) $tools.AddToolVersion("Packer", $(Get-PackerVersion)) $tools.AddToolVersion("Parcel", $(Get-ParcelVersion)) -if ((Test-IsUbuntu18) -or (Test-IsUbuntu20)) { +if (Test-IsUbuntu20) { $tools.AddToolVersion("PhantomJS", $(Get-PhantomJSVersion)) } $tools.AddToolVersion("Podman", $(Get-PodManVersion)) @@ -213,7 +213,7 @@ $netCoreTools.AddToolVersionsListInline(".NET Core SDK", $(Get-DotNetCoreSdkVers $netCoreTools.AddNodes($(Get-DotnetTools)) $databasesTools = $installedSoftware.AddHeader("Databases") -if ((Test-IsUbuntu18) -or (Test-IsUbuntu20)) { +if (Test-IsUbuntu20) { $databasesTools.AddToolVersion("MongoDB", $(Get-MongoDbVersion)) } $databasesTools.AddToolVersion("sqlite3", $(Get-SqliteVersion)) diff --git a/images/linux/scripts/helpers/Common.Helpers.psm1 b/images/linux/scripts/helpers/Common.Helpers.psm1 index 455e0854d96e..6db094683481 100644 --- a/images/linux/scripts/helpers/Common.Helpers.psm1 +++ b/images/linux/scripts/helpers/Common.Helpers.psm1 @@ -42,10 +42,6 @@ function Get-KernelVersion { return $kernelVersion } -function Test-IsUbuntu18 { - return (lsb_release -rs) -eq "18.04" -} - function Test-IsUbuntu20 { return (lsb_release -rs) -eq "20.04" } diff --git a/images/linux/scripts/helpers/os.sh b/images/linux/scripts/helpers/os.sh index f3a71bbd9b79..26827fae9062 100644 --- a/images/linux/scripts/helpers/os.sh +++ b/images/linux/scripts/helpers/os.sh @@ -4,11 +4,6 @@ ## Desc: Helper functions for installing tools ################################################################################ -function isUbuntu18 -{ - lsb_release -d | grep -q 'Ubuntu 18' -} - function isUbuntu20 { lsb_release -d | grep -q 'Ubuntu 20' diff --git a/images/linux/scripts/installers/android.sh b/images/linux/scripts/installers/android.sh index 3b6ada7e171b..a8358f96b861 100644 --- a/images/linux/scripts/installers/android.sh +++ b/images/linux/scripts/installers/android.sh @@ -45,30 +45,25 @@ mkdir -p ${ANDROID_SDK_ROOT} cmdlineTools="android-cmdline-tools.zip" -if isUbuntu18; then - # Newer command-line-tools require Java 11 which is not default on ubuntu-18.04 - download_with_retries "https://dl.google.com/android/repository/commandlinetools-linux-9123335_latest.zip" "." $cmdlineTools -else - # Download the latest command line tools so that we can accept all of the licenses. - # See https://developer.android.com/studio/#command-tools - cmdlineToolsVersion=$(get_toolset_value '.android."cmdline-tools"') - if [[ $cmdlineToolsVersion == "latest" ]]; then - repositoryXmlUrl="https://dl.google.com/android/repository/repository2-1.xml" - download_with_retries $repositoryXmlUrl "/tmp" "repository2-1.xml" - cmdlineToolsVersion=$( - yq -p=xml \ - '.sdk-repository.remotePackage[] | select(."+@path" == "cmdline-tools;latest" and .channelRef."+@ref" == "channel-0").archives.archive[].complete.url | select(contains("commandlinetools-linux"))' \ - /tmp/repository2-1.xml - ) - - if [[ -z $cmdlineToolsVersion ]]; then - echo "Failed to parse latest command-line tools version" - exit 1 - fi +# Download the latest command line tools so that we can accept all of the licenses. +# See https://developer.android.com/studio/#command-tools +cmdlineToolsVersion=$(get_toolset_value '.android."cmdline-tools"') +if [[ $cmdlineToolsVersion == "latest" ]]; then + repositoryXmlUrl="https://dl.google.com/android/repository/repository2-1.xml" + download_with_retries $repositoryXmlUrl "/tmp" "repository2-1.xml" + cmdlineToolsVersion=$( + yq -p=xml \ + '.sdk-repository.remotePackage[] | select(."+@path" == "cmdline-tools;latest" and .channelRef."+@ref" == "channel-0").archives.archive[].complete.url | select(contains("commandlinetools-linux"))' \ + /tmp/repository2-1.xml + ) + + if [[ -z $cmdlineToolsVersion ]]; then + echo "Failed to parse latest command-line tools version" + exit 1 + fi fi download_with_retries "https://dl.google.com/android/repository/${cmdlineToolsVersion}" "." $cmdlineTools -fi unzip -qq $cmdlineTools -d ${ANDROID_SDK_ROOT}/cmdline-tools # Command line tools need to be placed in ${ANDROID_SDK_ROOT}/sdk/cmdline-tools/latest to determine SDK root diff --git a/images/linux/scripts/installers/containers.sh b/images/linux/scripts/installers/containers.sh index 00595b319a9b..e2cbec09a55e 100644 --- a/images/linux/scripts/installers/containers.sh +++ b/images/linux/scripts/installers/containers.sh @@ -9,7 +9,7 @@ source $HELPER_SCRIPTS/os.sh install_packages=(podman buildah skopeo) # Packages is available in the official Ubuntu upstream starting from Ubuntu 21 -if isUbuntu18 || isUbuntu20; then +if isUbuntu20; then REPO_URL="https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable" source /etc/os-release sh -c "echo 'deb ${REPO_URL}/x${NAME}_${VERSION_ID}/ /' > /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list" @@ -23,7 +23,7 @@ apt-get -y install ${install_packages[@]} mkdir -p /etc/containers echo -e "[registries.search]\nregistries = ['docker.io', 'quay.io']" | tee /etc/containers/registries.conf -if isUbuntu18 || isUbuntu20; then +if isUbuntu20; then # Remove source repo rm /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list # Document source repo diff --git a/images/linux/scripts/installers/erlang.sh b/images/linux/scripts/installers/erlang.sh index debf64e9bb99..8e3137afaf17 100644 --- a/images/linux/scripts/installers/erlang.sh +++ b/images/linux/scripts/installers/erlang.sh @@ -20,15 +20,9 @@ apt-get update apt-get install --no-install-recommends esl-erlang || true # Downoloading and installing a deb file manually, ignore deptree errors -if isUbuntu18; then - esl_url="https://packages.erlang-solutions.com/ubuntu/pool/esl-erlang_25.2.3-1~ubuntu~bionic_amd64.deb" - download_with_retries $esl_url "/tmp" - dpkg -i /tmp/esl-erlang_25.2.3-1~ubuntu~bionic_amd64.deb || true -else - esl_url="https://packages.erlang-solutions.com/ubuntu/pool/esl-erlang_25.2.3-2~ubuntu~focal_amd64.deb" - download_with_retries $esl_url "/tmp" - dpkg -i /tmp/esl-erlang_25.2.3-2~ubuntu~focal_amd64.deb || true -fi +esl_url="https://packages.erlang-solutions.com/ubuntu/pool/esl-erlang_25.2.3-2~ubuntu~focal_amd64.deb" +download_with_retries $esl_url "/tmp" +dpkg -i /tmp/esl-erlang_25.2.3-2~ubuntu~focal_amd64.deb || true # Restore a proper deptree which brings esl-erlang back in the loop # but eleminate unwanted X.org dependencies diff --git a/images/linux/scripts/installers/java-tools.sh b/images/linux/scripts/installers/java-tools.sh index 44dbb4689c0c..989a6e74b251 100644 --- a/images/linux/scripts/installers/java-tools.sh +++ b/images/linux/scripts/installers/java-tools.sh @@ -41,7 +41,7 @@ enableRepositories() { osLabel=$(getOSVersionLabel) - if isUbuntu18 || isUbuntu20; then + if isUbuntu20; then # Add Adopt PPA wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | gpg --dearmor > /usr/share/keyrings/adopt.gpg echo "deb [signed-by=/usr/share/keyrings/adopt.gpg] https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ $osLabel main" > /etc/apt/sources.list.d/adopt.list @@ -52,11 +52,6 @@ osLabel=$(getOSVersionLabel) wget -qO - https://packages.adoptium.net/artifactory/api/gpg/key/public | gpg --dearmor > /usr/share/keyrings/adoptium.gpg echo "deb [signed-by=/usr/share/keyrings/adoptium.gpg] https://packages.adoptium.net/artifactory/deb/ $osLabel main" > /etc/apt/sources.list.d/adoptium.list - if isUbuntu18 ; then - # Install GPG Key for Azul Open JDK. See https://www.azul.com/downloads/azure-only/zulu/ - wget -qO - https://www.azul.com/wp-content/uploads/2021/05/0xB1998361219BD9C9.txt | gpg --dearmor > /usr/share/keyrings/zulu.gpg - echo "deb [signed-by=/usr/share/keyrings/zulu.gpg] https://repos.azul.com/azure-only/zulu/apt stable main" > /etc/apt/sources.list.d/zulu.list - fi } installOpenJDK() { @@ -127,11 +122,6 @@ for jdkVendor in ${jdkVendors[@]}; do done done -# Adopt 12 is only available for Ubuntu 18.04 -if isUbuntu18; then - createJavaEnvironmentalVariable "12" "Adopt" -fi - # Install Ant apt-get install -y --no-install-recommends ant ant-optional echo "ANT_HOME=/usr/share/ant" | tee -a /etc/environment diff --git a/images/linux/scripts/installers/php.sh b/images/linux/scripts/installers/php.sh index 3eb20f7cd236..68e15410969e 100644 --- a/images/linux/scripts/installers/php.sh +++ b/images/linux/scripts/installers/php.sh @@ -11,7 +11,7 @@ source $HELPER_SCRIPTS/install.sh # add repository for old Ubuntu images # details in thread: https://github.com/actions/runner-images/issues/6331 -if isUbuntu18 || isUbuntu20; then +if isUbuntu20; then apt-add-repository ppa:ondrej/php -y apt-get update fi diff --git a/images/linux/scripts/installers/python.sh b/images/linux/scripts/installers/python.sh index e14bf46888d5..bd2daed575af 100644 --- a/images/linux/scripts/installers/python.sh +++ b/images/linux/scripts/installers/python.sh @@ -10,10 +10,6 @@ source $HELPER_SCRIPTS/etc-environment.sh source $HELPER_SCRIPTS/os.sh # Install Python, Python 3, pip, pip3 -if isUbuntu18; then - apt-get install -y --no-install-recommends python python-dev python-pip -fi - apt-get install -y --no-install-recommends python3 python3-dev python3-pip python3-venv # Install pipx diff --git a/images/linux/scripts/tests/Tools.Tests.ps1 b/images/linux/scripts/tests/Tools.Tests.ps1 index c1594eaf7c67..c02d058faa2e 100644 --- a/images/linux/scripts/tests/Tools.Tests.ps1 +++ b/images/linux/scripts/tests/Tools.Tests.ps1 @@ -331,7 +331,7 @@ Describe "Phantomjs" -Skip:(Test-IsUbuntu22) { } } -Describe "GraalVM" -Skip:(Test-IsUbuntu18) { +Describe "GraalVM" { It "graalvm" { '$GRAALVM_11_ROOT/bin/java -version' | Should -ReturnZeroExitCode } diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json deleted file mode 100644 index e3b90ffd1807..000000000000 --- a/images/linux/toolsets/toolset-1804.json +++ /dev/null @@ -1,361 +0,0 @@ -{ - "toolcache": [ - { - "name": "Python", - "url" : "https://raw.githubusercontent.com/actions/python-versions/main/versions-manifest.json", - "platform" : "linux", - "platform_version": "18.04", - "arch": "x64", - "versions": [ - "2.7.*", - "3.6.*", - "3.7.*", - "3.8.*", - "3.9.*", - "3.10.*", - "3.11.*" - ] - }, - { - "name": "PyPy", - "arch": "x64", - "platform" : "linux", - "versions": [ - "2.7", - "3.6", - "3.9" - ] - }, - { - "name": "node", - "url" : "https://raw.githubusercontent.com/actions/node-versions/main/versions-manifest.json", - "platform" : "linux", - "arch": "x64", - "versions": [ - "14.*", - "16.*", - "18.*" - ] - }, - { - "name": "go", - "url" : "https://raw.githubusercontent.com/actions/go-versions/main/versions-manifest.json", - "arch": "x64", - "platform" : "linux", - "versions": [ - "1.16.*", - "1.17.*", - "1.18.*" - ], - "default": "1.17.*" - }, - { - "name": "Ruby", - "platform_version": "18.04", - "arch": "x64", - "versions": [ - "2.4.*", - "2.5.*", - "2.6.*", - "2.7.*", - "3.0.*", - "3.1.*" - ] - }, - { - "name": "CodeQL", - "platform" : "linux", - "arch": "x64", - "versions": [ - "*" - ] - } - ], - "java": { - "default": "8", - "default_vendor": "Temurin-Hotspot", - "vendors": [ - { - "name": "Temurin-Hotspot", - "versions": [ "8", "11", "17" ] - }, - { - "name": "Adopt", - "versions": [ "8", "11", "12" ] - } - ], - "maven": "3.8.8" - }, - "android": { - "platform_min_version": "23", - "build_tools_min_version": "23.0.1", - "extra_list": [ - "android;m2repository", - "google;m2repository", - "google;google_play_services" - ], - "addon_list": [ - "addon-google_apis-google-24", - "addon-google_apis-google-23", - "addon-google_apis-google-22", - "addon-google_apis-google-21" - ], - "additional_tools": [ - "cmake;3.10.2.4988404", - "cmake;3.18.1", - "cmake;3.22.1" - ], - "ndk": { - "default": "25", - "versions": [ - "23", "24", "25" - ] - } - }, - "powershellModules": [ - {"name": "MarkdownPS"}, - {"name": "Microsoft.Graph"}, - {"name": "Pester"} - ], - "azureModules": [ - { - "name": "az", - "url" : "https://raw.githubusercontent.com/Azure/az-ps-module-versions/main/versions-manifest.json", - "versions": [ - "9.3.0" - ], - "zip_versions": [ - "3.1.0", - "4.4.0", - "5.9.0", - "6.6.0", - "7.5.0" - ] - } - ], - "apt": { - "common_packages": [ - "autoconf", - "automake", - "build-essential", - "dbus", - "dnsutils", - "dpkg", - "fakeroot", - "gnupg2", - "imagemagick", - "iproute2", - "iputils-ping", - "lib32z1", - "libc++abi-dev", - "libc++-dev", - "libcurl3", - "libgbm-dev", - "libgconf-2-4", - "libgsl-dev", - "libgtk-3-0", - "libmagic-dev", - "libmagickcore-dev", - "libmagickwand-dev", - "libsecret-1-dev", - "libsqlite3-dev", - "libyaml-dev", - "libtool", - "libunwind8", - "libxkbfile-dev", - "libxss1", - "locales", - "mercurial", - "openssh-client", - "p7zip-rar", - "pkg-config", - "python-setuptools", - "rpm", - "tar", - "texinfo", - "tk", - "tzdata", - "upx", - "xorriso", - "xvfb", - "xz-utils", - "zsync" - ], - "cmd_packages": [ - "aria2", - "binutils", - "bison", - "brotli", - "bzip2", - "coreutils", - "curl", - "file", - "flex", - "ftp", - "haveged", - "jq", - "m4", - "mediainfo", - "netcat", - "net-tools", - "parallel", - "pass", - "p7zip-full", - "patchelf", - "pollinate", - "rsync", - "shellcheck", - "sqlite3", - "sphinxsearch", - "ssh", - "sshpass", - "subversion", - "sudo", - "swig", - "telnet", - "time", - "unzip", - "wget", - "zip" - ] - }, - "brew": [ - ], - "docker": { - "images": [ - "alpine:3.12", - "alpine:3.13", - "alpine:3.14", - "buildpack-deps:stretch", - "buildpack-deps:buster", - "buildpack-deps:bullseye", - "debian:9", - "debian:10", - "debian:11", - "moby/buildkit:latest", - "node:14", - "node:16", - "node:18", - "node:14-alpine", - "node:16-alpine", - "node:18-alpine", - "ubuntu:16.04", - "ubuntu:18.04", - "ubuntu:20.04" - ] - }, - "pipx": [ - { - "package": "yamllint", - "cmd": "yamllint" - }, - { - "package": "ansible-core", - "cmd": "ansible" - } - ], - "dotnet": { - "aptPackages": [ - "dotnet-sdk-3.1", - "dotnet-sdk-6.0" - ], - "versions": [ - "3.1", - "6.0" - ], - "tools": [ - { "name": "nbgv", "test": "nbgv --version", "getversion" : "nbgv --version" } - ] - }, - "clang": { - "versions": [ - "9" - ], - "default_version": "9" - }, - "gcc": { - "versions": [ - "g++-9", - "g++-10" - ] - }, - "gfortran": { - "versions": [ - "gfortran-9", - "gfortran-10" - ] - }, - "php": { - "versions": [ - "7.2", - "7.3", - "7.4", - "8.0", - "8.1", - "8.2" - ] - }, - "selenium": { - "version": "4", - "binary_name": "selenium-server" - }, - "rubygems": [], - "node": { - "default": "16" - }, - "node_modules": [ - { - "name": "grunt", - "command": "grunt" - }, - { - "name": "gulp", - "command": "gulp" - }, - { - "name": "n", - "command": "n" - }, - { - "name": "parcel", - "command": "parcel" - }, - { - "name": "typescript", - "command": "tsc" - }, - { - "name": "newman", - "command": "newman" - }, - { - "name": "vercel", - "command": "vercel" - }, - { - "name": "webpack", - "command": "webpack" - }, - { - "name": "webpack-cli", - "command": "webpack-cli" - }, - { - "name": "netlify-cli", - "command": "netlify" - }, - { - "name": "yarn", - "command": "yarn" - } - ], - "mongodb": { - "version": "5.0" - }, - "postgresql": { - "version": "14" - }, - "pwsh": { - "version": "7.2" - } -} diff --git a/images/linux/ubuntu1804.json b/images/linux/ubuntu1804.json deleted file mode 100644 index a1001f08c5c5..000000000000 --- a/images/linux/ubuntu1804.json +++ /dev/null @@ -1,393 +0,0 @@ -{ - "variables": { - "client_id": "{{env `ARM_CLIENT_ID`}}", - "client_secret": "{{env `ARM_CLIENT_SECRET`}}", - "client_cert_path": "{{env `ARM_CLIENT_CERT_PATH`}}", - "subscription_id": "{{env `ARM_SUBSCRIPTION_ID`}}", - "tenant_id": "{{env `ARM_TENANT_ID`}}", - "resource_group": "{{env `ARM_RESOURCE_GROUP`}}", - "storage_account": "{{env `ARM_STORAGE_ACCOUNT`}}", - "build_resource_group_name": "{{env `BUILD_RESOURCE_GROUP_NAME`}}", - "temp_resource_group_name": "{{env `TEMP_RESOURCE_GROUP_NAME`}}", - "location": "{{env `ARM_RESOURCE_LOCATION`}}", - "virtual_network_name": "{{env `VNET_NAME`}}", - "virtual_network_resource_group_name": "{{env `VNET_RESOURCE_GROUP`}}", - "virtual_network_subnet_name": "{{env `VNET_SUBNET`}}", - "private_virtual_network_with_public_ip": "{{env `PRIVATE_VIRTUAL_NETWORK_WITH_PUBLIC_IP`}}", - "allowed_inbound_ip_addresses": "{{env `AGENT_IP`}}", - "image_folder": "/imagegeneration", - "imagedata_file": "/imagegeneration/imagedata.json", - "installer_script_folder": "/imagegeneration/installers", - "helper_script_folder": "/imagegeneration/helpers", - "vm_size": "Standard_D4s_v4", - "capture_name_prefix": "packer", - "image_version": "dev", - "image_os": "ubuntu18", - "run_validation_diskspace": "false", - "dockerhub_login": "{{env `DOCKERHUB_LOGIN`}}", - "dockerhub_password": "{{env `DOCKERHUB_PASSWORD`}}" - }, - "sensitive-variables": [ - "client_secret" - ], - "builders": [ - { - "type": "azure-arm", - "client_id": "{{user `client_id`}}", - "client_secret": "{{user `client_secret`}}", - "client_cert_path": "{{user `client_cert_path`}}", - "subscription_id": "{{user `subscription_id`}}", - "tenant_id": "{{user `tenant_id`}}", - "location": "{{user `location`}}", - "vm_size": "{{user `vm_size`}}", - "resource_group_name": "{{user `resource_group`}}", - "storage_account": "{{user `storage_account`}}", - "build_resource_group_name": "{{user `build_resource_group_name`}}", - "temp_resource_group_name": "{{user `temp_resource_group_name`}}", - "capture_container_name": "images", - "capture_name_prefix": "{{user `capture_name_prefix`}}", - "virtual_network_name": "{{user `virtual_network_name`}}", - "virtual_network_resource_group_name": "{{user `virtual_network_resource_group_name`}}", - "virtual_network_subnet_name": "{{user `virtual_network_subnet_name`}}", - "private_virtual_network_with_public_ip": "{{user `private_virtual_network_with_public_ip`}}", - "allowed_inbound_ip_addresses": "{{user `allowed_inbound_ip_addresses`}}", - "os_type": "Linux", - "image_publisher": "Canonical", - "image_offer": "UbuntuServer", - "image_sku": "18.04-LTS", - "os_disk_size_gb": "86" - } - ], - "provisioners": [ - { - "type": "shell", - "inline": [ - "mkdir {{user `image_folder`}}", - "chmod 777 {{user `image_folder`}}" - ], - "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" - }, - { - "type": "shell", - "script": "{{template_dir}}/scripts/base/apt-mock.sh", - "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" - }, - { - "type": "shell", - "scripts": [ - "{{template_dir}}/scripts/base/repos.sh" - ], - "environment_vars": [ - "DEBIAN_FRONTEND=noninteractive" - ], - "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" - }, - { - "type": "shell", - "script": "{{template_dir}}/scripts/base/apt.sh", - "environment_vars": [ - "DEBIAN_FRONTEND=noninteractive" - ], - "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" - }, - { - "type": "shell", - "script": "{{template_dir}}/scripts/base/limits.sh", - "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" - }, - { - "type": "file", - "source": "{{template_dir}}/scripts/helpers", - "destination": "{{user `helper_script_folder`}}" - }, - { - "type": "file", - "source": "{{template_dir}}/scripts/installers", - "destination": "{{user `installer_script_folder`}}" - }, - { - "type": "file", - "source": "{{ template_dir }}/post-generation", - "destination": "{{user `image_folder`}}" - }, - { - "type": "file", - "source": "{{template_dir}}/scripts/tests", - "destination": "{{user `image_folder`}}" - }, - { - "type": "file", - "source": "{{ template_dir }}/scripts/SoftwareReport", - "destination": "{{user `image_folder`}}" - }, - { - "type": "file", - "source": "{{ template_dir }}/../../helpers/software-report-base", - "destination": "{{user `image_folder`}}/SoftwareReport/" - }, - { - "type": "file", - "source": "{{template_dir}}/toolsets/toolset-1804.json", - "destination": "{{user `installer_script_folder`}}/toolset.json" - }, - { - "type": "shell", - "scripts": [ - "{{template_dir}}/scripts/installers/preimagedata.sh" - ], - "environment_vars": [ - "IMAGE_VERSION={{user `image_version`}}", - "IMAGEDATA_FILE={{user `imagedata_file`}}" - ], - "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" - }, - { - "type": "shell", - "scripts": [ - "{{template_dir}}/scripts/installers/configure-environment.sh" - ], - "environment_vars": [ - "IMAGE_VERSION={{user `image_version`}}", - "IMAGE_OS={{user `image_os`}}", - "HELPER_SCRIPTS={{user `helper_script_folder`}}" - ], - "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" - }, - { - "type": "shell", - "scripts": [ - "{{template_dir}}/scripts/installers/complete-snap-setup.sh", - "{{template_dir}}/scripts/installers/powershellcore.sh" - ], - "environment_vars": [ - "HELPER_SCRIPTS={{user `helper_script_folder`}}" - ], - "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" - }, - { - "type": "shell", - "scripts": [ - "{{template_dir}}/scripts/installers/Install-PowerShellModules.ps1", - "{{template_dir}}/scripts/installers/Install-AzureModules.ps1" - ], - "environment_vars": [ - "HELPER_SCRIPTS={{user `helper_script_folder`}}", - "INSTALLER_SCRIPT_FOLDER={{user `installer_script_folder`}}" - ], - "execute_command": "sudo sh -c '{{ .Vars }} pwsh -f {{ .Path }}'" - }, - { - "type": "shell", - "scripts": [ - "{{template_dir}}/scripts/installers/docker-compose.sh", - "{{template_dir}}/scripts/installers/docker-moby.sh" - ], - "environment_vars": [ - "HELPER_SCRIPTS={{user `helper_script_folder`}}", - "INSTALLER_SCRIPT_FOLDER={{user `installer_script_folder`}}", - "DOCKERHUB_LOGIN={{user `dockerhub_login`}}", - "DOCKERHUB_PASSWORD={{user `dockerhub_password`}}" - ], - "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" - }, - { - "type": "shell", - "scripts": [ - "{{template_dir}}/scripts/installers/azcopy.sh", - "{{template_dir}}/scripts/installers/azure-cli.sh", - "{{template_dir}}/scripts/installers/azure-devops-cli.sh", - "{{template_dir}}/scripts/installers/basic.sh", - "{{template_dir}}/scripts/installers/bicep.sh", - "{{template_dir}}/scripts/installers/aliyun-cli.sh", - "{{template_dir}}/scripts/installers/apache.sh", - "{{template_dir}}/scripts/installers/clang.sh", - "{{template_dir}}/scripts/installers/swift.sh", - "{{template_dir}}/scripts/installers/cmake.sh", - "{{template_dir}}/scripts/installers/codeql-bundle.sh", - "{{template_dir}}/scripts/installers/containers.sh", - "{{template_dir}}/scripts/installers/dotnetcore-sdk.sh", - "{{template_dir}}/scripts/installers/erlang.sh", - "{{template_dir}}/scripts/installers/firefox.sh", - "{{template_dir}}/scripts/installers/microsoft-edge.sh", - "{{template_dir}}/scripts/installers/gcc.sh", - "{{template_dir}}/scripts/installers/gfortran.sh", - "{{template_dir}}/scripts/installers/git.sh", - "{{template_dir}}/scripts/installers/github-cli.sh", - "{{template_dir}}/scripts/installers/google-chrome.sh", - "{{template_dir}}/scripts/installers/google-cloud-sdk.sh", - "{{template_dir}}/scripts/installers/haskell.sh", - "{{template_dir}}/scripts/installers/heroku.sh", - "{{template_dir}}/scripts/installers/hhvm.sh", - "{{template_dir}}/scripts/installers/java-tools.sh", - "{{template_dir}}/scripts/installers/kubernetes-tools.sh", - "{{template_dir}}/scripts/installers/oc.sh", - "{{template_dir}}/scripts/installers/leiningen.sh", - "{{template_dir}}/scripts/installers/miniconda.sh", - "{{template_dir}}/scripts/installers/mono.sh", - "{{template_dir}}/scripts/installers/kotlin.sh", - "{{template_dir}}/scripts/installers/mysql.sh", - "{{template_dir}}/scripts/installers/mssql-cmd-tools.sh", - "{{template_dir}}/scripts/installers/sqlpackage.sh", - "{{template_dir}}/scripts/installers/nginx.sh", - "{{template_dir}}/scripts/installers/nvm.sh", - "{{template_dir}}/scripts/installers/nodejs.sh", - "{{template_dir}}/scripts/installers/bazel.sh", - "{{template_dir}}/scripts/installers/oras-cli.sh", - "{{template_dir}}/scripts/installers/phantomjs.sh", - "{{template_dir}}/scripts/installers/php.sh", - "{{template_dir}}/scripts/installers/postgresql.sh", - "{{template_dir}}/scripts/installers/pulumi.sh", - "{{template_dir}}/scripts/installers/ruby.sh", - "{{template_dir}}/scripts/installers/r.sh", - "{{template_dir}}/scripts/installers/rust.sh", - "{{template_dir}}/scripts/installers/julia.sh", - "{{template_dir}}/scripts/installers/sbt.sh", - "{{template_dir}}/scripts/installers/selenium.sh", - "{{template_dir}}/scripts/installers/terraform.sh", - "{{template_dir}}/scripts/installers/packer.sh", - "{{template_dir}}/scripts/installers/vcpkg.sh", - "{{template_dir}}/scripts/installers/dpkg-config.sh", - "{{template_dir}}/scripts/installers/mongodb.sh", - "{{template_dir}}/scripts/installers/yq.sh", - "{{template_dir}}/scripts/installers/android.sh", - "{{template_dir}}/scripts/installers/pypy.sh", - "{{template_dir}}/scripts/installers/python.sh", - "{{template_dir}}/scripts/installers/aws.sh", - "{{template_dir}}/scripts/installers/zstd.sh" - ], - "environment_vars": [ - "HELPER_SCRIPTS={{user `helper_script_folder`}}", - "INSTALLER_SCRIPT_FOLDER={{user `installer_script_folder`}}", - "DEBIAN_FRONTEND=noninteractive" - ], - "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" - }, - { - "type": "shell", - "scripts": [ - "{{template_dir}}/scripts/installers/Install-Toolset.ps1", - "{{template_dir}}/scripts/installers/Configure-Toolset.ps1" - ], - "environment_vars": [ - "HELPER_SCRIPTS={{user `helper_script_folder`}}", - "INSTALLER_SCRIPT_FOLDER={{user `installer_script_folder`}}" - ], - "execute_command": "sudo sh -c '{{ .Vars }} pwsh -f {{ .Path }}'" - }, - { - "type": "shell", - "scripts": [ - "{{template_dir}}/scripts/installers/pipx-packages.sh" - ], - "environment_vars": [ - "HELPER_SCRIPTS={{user `helper_script_folder`}}", - "INSTALLER_SCRIPT_FOLDER={{user `installer_script_folder`}}" - ], - "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" - }, - { - "type": "shell", - "scripts": [ - "{{template_dir}}/scripts/installers/homebrew.sh" - ], - "environment_vars": [ - "HELPER_SCRIPTS={{user `helper_script_folder`}}", - "DEBIAN_FRONTEND=noninteractive", - "INSTALLER_SCRIPT_FOLDER={{user `installer_script_folder`}}" - ], - "execute_command": "/bin/sh -c '{{ .Vars }} {{ .Path }}'" - }, - { - "type": "shell", - "script": "{{template_dir}}/scripts/base/snap.sh", - "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" - }, - { - "type": "shell", - "expect_disconnect": true, - "scripts": [ - "{{template_dir}}/scripts/base/reboot.sh" - ], - "execute_command": "/bin/sh -c '{{ .Vars }} {{ .Path }}'" - }, - { - "type": "shell", - "pause_before": "60s", - "start_retry_timeout": "10m", - "scripts": [ - "{{template_dir}}/scripts/installers/cleanup.sh" - ], - "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" - }, - { - "type": "shell", - "script": "{{template_dir}}/scripts/base/apt-mock-remove.sh", - "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" - }, - { - "type": "shell", - "inline": [ - "pwsh -File {{user `image_folder`}}/SoftwareReport/SoftwareReport.Generator.ps1 -OutputDirectory {{user `image_folder`}}", - "pwsh -File {{user `image_folder`}}/tests/RunAll-Tests.ps1 -OutputDirectory {{user `image_folder`}}" - ], - "environment_vars": [ - "IMAGE_VERSION={{user `image_version`}}", - "INSTALLER_SCRIPT_FOLDER={{user `installer_script_folder`}}" - ] - }, - { - "type": "file", - "source": "{{user `image_folder`}}/software-report.md", - "destination": "{{template_dir}}/Ubuntu1804-Readme.md", - "direction": "download" - }, - { - "type": "file", - "source": "{{user `image_folder`}}/software-report.json", - "destination": "{{template_dir}}/software-report.json", - "direction": "download" - }, - { - "type": "shell", - "scripts":[ - "{{template_dir}}/scripts/installers/post-deployment.sh" - ], - "environment_vars":[ - "HELPER_SCRIPT_FOLDER={{user `helper_script_folder`}}", - "INSTALLER_SCRIPT_FOLDER={{user `installer_script_folder`}}", - "IMAGE_FOLDER={{user `image_folder`}}" - ], - "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" - }, - { - "type": "shell", - "scripts": [ - "{{template_dir}}/scripts/installers/validate-disk-space.sh" - ], - "environment_vars": [ - "RUN_VALIDATION={{user `run_validation_diskspace`}}" - ] - }, - { - "type": "file", - "source": "{{template_dir}}/config/ubuntu1804.conf", - "destination": "/tmp/" - }, - { - "type": "shell", - "inline": [ - "mkdir -p /etc/vsts", - "cp /tmp/ubuntu1804.conf /etc/vsts/machine_instance.conf" - ], - "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" - }, - { - "type": "shell", - "inline": [ - "sleep 30", - "/usr/sbin/waagent -force -deprovision+user && export HISTSIZE=0 && sync" - ], - "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" - } - ] -} From 9e3bbcb5e1cce9c73e72db1a95f46ad7baa0360a Mon Sep 17 00:00:00 2001 From: sergei-pyshnoi <121864472+sergei-pyshnoi@users.noreply.github.com> Date: Tue, 4 Apr 2023 17:52:40 +0200 Subject: [PATCH 1840/3485] [Ubuntu] Add systemd version to software report (#7387) --- .../linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 | 6 ++++++ .../scripts/SoftwareReport/SoftwareReport.Generator.ps1 | 1 + 2 files changed, 7 insertions(+) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 index 3f5badf543e7..873f35ce8104 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 @@ -371,3 +371,9 @@ function Build-PackageManagementEnvironmentTable { } ) } + +function Get-SystemdVersion { + $matches = [regex]::Matches((systemctl --version | head -n 1), "\((.*?)\)") + $result = foreach ($match in $matches) {$match.Groups[1].Value} + return $result +} \ No newline at end of file diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index d8cd6b119728..5edc9068301e 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -30,6 +30,7 @@ $softwareReport = [SoftwareReport]::new("Ubuntu $(Get-OSVersionShort)") $softwareReport.Root.AddToolVersion("OS Version:", $(Get-OSVersionFull)) $softwareReport.Root.AddToolVersion("Kernel Version:", $(Get-KernelVersion)) $softwareReport.Root.AddToolVersion("Image Version:", $env:IMAGE_VERSION) +$softwareReport.Root.AddToolVersion("Systemd version:", $(Get-SystemdVersion)) $installedSoftware = $softwareReport.Root.AddHeader("Installed Software") From 869adbbd1cecedccc2f9fa28f66aa7a2d03dc5d8 Mon Sep 17 00:00:00 2001 From: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com> Date: Wed, 5 Apr 2023 14:02:45 +0200 Subject: [PATCH 1841/3485] hide builds using dedicated runners from forks (#7377) --- .github/workflows/macos-generation.yml | 5 +++++ .github/workflows/ubuntu-win-generation.yml | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/.github/workflows/macos-generation.yml b/.github/workflows/macos-generation.yml index e91f4470c363..156df706480a 100644 --- a/.github/workflows/macos-generation.yml +++ b/.github/workflows/macos-generation.yml @@ -40,7 +40,12 @@ defaults: jobs: build: + # + # "macos-vmware" is dedicated runner not available in forks. + # to reduce undesired run attempts in forks, stick jobs to "actions" organization only + # runs-on: macos-vmware + if: ${{ github.repository_owner == 'actions' }} timeout-minutes: 1200 steps: - uses: azure/login@v1 diff --git a/.github/workflows/ubuntu-win-generation.yml b/.github/workflows/ubuntu-win-generation.yml index 9acf6643856b..48dea710e0b7 100644 --- a/.github/workflows/ubuntu-win-generation.yml +++ b/.github/workflows/ubuntu-win-generation.yml @@ -24,7 +24,12 @@ defaults: jobs: build: + # + # "azure-builds" is dedicated runner not available in forks. + # to reduce undesired run attempts in forks, stick jobs to "actions" organization only + # runs-on: azure-builds + if: ${{ github.repository_owner == 'actions' }} timeout-minutes: 1200 steps: - name: Determine checkout type From d19fa4a8f1ef2f153f9fb857e4419cc79f653efe Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Wed, 5 Apr 2023 15:56:35 +0200 Subject: [PATCH 1842/3485] [Windows] Add more releases per page (#7391) --- images/win/scripts/Installers/Install-Ruby.ps1 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/images/win/scripts/Installers/Install-Ruby.ps1 b/images/win/scripts/Installers/Install-Ruby.ps1 index b1d269e7d306..41f52c5841f0 100644 --- a/images/win/scripts/Installers/Install-Ruby.ps1 +++ b/images/win/scripts/Installers/Install-Ruby.ps1 @@ -7,10 +7,11 @@ function Get-RubyVersions { param ( [System.String] $Arch = "x64", - [System.String] $Extension = "7z" + [System.String] $Extension = "7z", + [System.String] $ReleasesAmount = "50" ) - $uri = "https://api.github.com/repos/oneclick/rubyinstaller2/releases" + $uri = "https://api.github.com/repos/oneclick/rubyinstaller2/releases?per_page=$ReleasesAmount" try { $versionLists = @{} From 15a6f4b1b3481223dc62506c089d35ed0123f07b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 6 Apr 2023 09:37:48 +0000 Subject: [PATCH 1843/3485] Updating readme file for ubuntu20 version 20230402.1 (#7392) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2004-Readme.md | 86 +++++++++++++++---------------- 1 file changed, 42 insertions(+), 44 deletions(-) diff --git a/images/linux/Ubuntu2004-Readme.md b/images/linux/Ubuntu2004-Readme.md index 2bfb09ed8107..933971c89ddf 100644 --- a/images/linux/Ubuntu2004-Readme.md +++ b/images/linux/Ubuntu2004-Readme.md @@ -2,12 +2,11 @@ |-| | [GraalVM JDK11 will be removed from agents on April 10, 2023](https://github.com/actions/runner-images/issues/7338) | | [[All OSes] Go 1.17.x will be removed and 1.20.x set as default on April, 3](https://github.com/actions/runner-images/issues/7276) | -| [The Ubuntu 18.04 Actions runner image will begin deprecation on 2022/08/08 and will be fully unsupported by 2023/04/01](https://github.com/actions/runner-images/issues/6002) | *** # Ubuntu 20.04 - OS Version: 20.04.6 LTS -- Kernel Version: 5.15.0-1034-azure -- Image Version: 20230326.2 +- Kernel Version: 5.15.0-1035-azure +- Image Version: 20230402.1 ## Installed Software @@ -30,12 +29,12 @@ - Python 3.8.10 - Python3 3.8.10 - Ruby 2.7.0p0 -- Swift 5.7.3 +- Swift 5.8 ### Package Management - cpan 1.64 - Helm 3.11.2 -- Homebrew 4.0.9 +- Homebrew 4.0.10 - Miniconda 23.1.0 - Npm 9.5.0 - NuGet 6.3.1.1 @@ -43,7 +42,7 @@ - Pip3 20.0.2 - Pipx 1.2.0 - RubyGems 3.1.2 -- Vcpkg (build from commit b81bc3a83) +- Vcpkg (build from commit 69efe9cc2) - Yarn 1.22.19 #### Environment variables @@ -70,16 +69,16 @@ to accomplish this. ### Tools - Ansible 2.13.8 - apt-fast 1.9.12 -- AzCopy 10.17.0 - available by `azcopy` and `azcopy10` aliases +- AzCopy 10.18.0 - available by `azcopy` and `azcopy10` aliases - Bazel 6.1.1 - Bazelisk 1.13.2 - Bicep 0.15.31 - Buildah 1.22.3 -- CMake 3.26.1 +- CMake 3.26.2 - CodeQL Action Bundles 2.12.4 2.12.5 - Docker Amazon ECR Credential Helper 0.6.0 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.16.0+azure-2 +- Docker Compose v2 2.17.2+azure-1 - Docker-Buildx 0.10.4 - Docker-Moby Client 20.10.23+azure-2 - Docker-Moby Server 20.10.23+azure-2 @@ -91,7 +90,7 @@ to accomplish this. - Heroku 7.69.1 - HHVM (HipHop VM) 4.172.1 - jq 1.6 -- Kind 0.17.0 +- Kind 0.18.0 - Kubectl 1.26.3 - Kustomize 5.0.1 - Leiningen 2.10.0 @@ -104,32 +103,32 @@ to accomplish this. - OpenSSL 1.1.1f-1ubuntu2.17 - Packer 1.8.6 - Parcel 2.8.3 -- PhantomJS 2.1.1 +- PhantomJS 2.1.1 2.1.1 - Podman 3.4.2 -- Pulumi 3.59.1 +- Pulumi 3.60.1 - R 4.2.3 - Skopeo 1.5.0 - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 -- Terraform 1.4.2 +- Terraform 1.4.4 - yamllint 1.30.0 -- yq 4.33.1 +- yq 4.33.2 - zstd 1.5.4 ### CLI Tools -- Alibaba Cloud CLI 3.0.158 -- AWS CLI 2.11.6 +- Alibaba Cloud CLI 3.0.161 +- AWS CLI 2.11.8 - AWS CLI Session Manager Plugin 1.2.463.0 - AWS SAM CLI 1.78.0 - Azure CLI 2.46.0 - Azure CLI (azure-devops) 0.26.0 - GitHub CLI 2.25.1 -- Google Cloud SDK 423.0.0 +- Google Cloud SDK 424.0.0 - Hub CLI 2.14.2 -- Netlify CLI 13.2.1 -- OpenShift CLI 4.12.8 +- Netlify CLI 13.2.2 +- OpenShift CLI 4.12.9 - ORAS CLI 1.0.0 -- Vercel CLI 28.18.1 +- Vercel CLI 28.18.3 ### Java | Version | Vendor | Environment Variable | @@ -158,9 +157,9 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Stack 2.9.3 ### Rust Tools -- Cargo 1.68.1 -- Rust 1.68.1 -- Rustdoc 1.68.1 +- Cargo 1.68.2 +- Rust 1.68.2 +- Rustdoc 1.68.2 - Rustup 1.25.2 #### Packages @@ -172,11 +171,11 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.5.1 ### Browsers and Drivers -- Google Chrome 111.0.5563.110 +- Google Chrome 111.0.5563.146 - ChromeDriver 111.0.5563.64 - Chromium 111.0.5547.0 -- Microsoft Edge 111.0.1661.54 -- Microsoft Edge WebDriver 111.0.1661.54 +- Microsoft Edge 111.0.1661.62 +- Microsoft Edge WebDriver 111.0.1661.62 - Selenium server 4.8.0 - Mozilla Firefox 111.0.1 - Geckodriver 0.32.2 @@ -221,14 +220,13 @@ Use the following command as a part of your job to start the service: 'sudo syst ### Cached Tools #### Go -- 1.17.13 - 1.18.10 - 1.19.7 - 1.20.2 #### Node.js - 14.21.3 -- 16.19.1 +- 16.20.0 - 18.15.0 #### Python @@ -250,9 +248,9 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Ruby - 2.5.9 - 2.6.10 -- 2.7.7 -- 3.0.5 -- 3.1.3 +- 2.7.8 +- 3.0.6 +- 3.1.4 ### PowerShell Tools - PowerShell 7.2.10 @@ -261,7 +259,7 @@ Use the following command as a part of your job to start the service: 'sudo syst - Az: 9.3.0 - Az (Cached): 3.1.0.zip, 4.4.0.zip, 5.9.0.zip, 6.6.0.zip, 7.5.0.zip - MarkdownPS: 1.9 -- Microsoft.Graph: 1.24.0 +- Microsoft.Graph: 1.25.0 - Pester: 5.4.0 - PSScriptAnalyzer: 1.21.0 @@ -301,10 +299,10 @@ Use the following command as a part of your job to start the service: 'sudo syst ### Cached Docker images | Repository:Tag | Digest | Created | | ----------------------- | ------------------------------------------------------------------------ | ---------- | -| alpine:3.14 | sha256:fa26727c28837d1471c2f1524d297a0255c153b5d023d7badd1412be7e6e12a2 | 2023-02-11 | -| alpine:3.15 | sha256:59b00c6f1614a599aa83d946d2a276c9257d2d29461c86c6a114d9932f2ddcd4 | 2023-02-11 | -| alpine:3.16 | sha256:2cf17aa35fbcb6ece81692a64bfbadaf096590241ed9f95dd5f94f0e9f674784 | 2023-02-11 | -| alpine:3.17 | sha256:ff6bdca1701f3a8a67e328815ff2346b0e4067d32ec36b7992c1fdc001dc8517 | 2023-02-11 | +| alpine:3.14 | sha256:0f2d5c38dd7a4f4f733e688e3a6733cb5ab1ac6e3cb4603a5dd564e5bfb80eed | 2023-03-29 | +| alpine:3.15 | sha256:ecbdce53b2c2f43ab1b19418bcbd3f120a23547d9497030c8d978114512b883e | 2023-03-29 | +| alpine:3.16 | sha256:c2b622f6e510a0d25bccaffa9e67b75a6860cb09b74bb58cfc36a9ef4331109f | 2023-03-29 | +| alpine:3.17 | sha256:124c7d2707904eea7431fffe91522a01e5a861a624ee31d03372cc1d138a3126 | 2023-03-29 | | buildpack-deps:bullseye | sha256:d2e6d0b6233d9da4534d22e96ea4338fbf36a7657b6d60aae20260140ce43148 | 2023-03-23 | | buildpack-deps:buster | sha256:56e11e205661d628368fbcd0edee38d666d507351e5c74f2795128cd71c6f52b | 2023-03-23 | | buildpack-deps:stretch | sha256:78e995165a5788c2f55aed6e548d8f6c1534830d4310c870408fccb2da8c5b2e | 2022-06-23 | @@ -313,11 +311,11 @@ Use the following command as a part of your job to start the service: 'sudo syst | debian:9 | sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be | 2022-06-23 | | moby/buildkit:latest | sha256:ca34989052fc2467dcd283d2000c2ad8c7cd6213c5ff0fcabef1a9cfb0651b3a | 2023-03-23 | | node:14 | sha256:a97048059988c65f974b37dfe25a44327069a0f4f81133624871de0063b98075 | 2023-03-23 | -| node:14-alpine | sha256:1d02d4073d7dfd58950a222a862f8b819afd774560b7b3e992b27ff4cd088285 | 2023-02-17 | -| node:16 | sha256:e97b6d302062583e09be70f430b703637f6ef26c2cbb0d7bfed61e0be9d7a974 | 2023-03-23 | -| node:16-alpine | sha256:fcb03294d3c0695cf9762dec94c0366f08e7a8c6a3c1e062d38c80ac30684d8a | 2023-02-21 | +| node:14-alpine | sha256:434215b487a329c9e867202ff89e704d3a75e554822e07f3e0c0f9e606121b33 | 2023-03-29 | +| node:16 | sha256:051b68ed341fee26f4c08b15815ac4bff6a5351c68e7b33c66912677cc4be7ac | 2023-03-29 | +| node:16-alpine | sha256:b4a72f83f52bbe3970bb74a15e44ec4cf6e873ad4787473dfc8a26f5b4e29dd2 | 2023-03-29 | | node:18 | sha256:c21209748c829660e0b49cbd14d2f9d81ea82ffb02a8a7932ebacf70d01573a3 | 2023-03-23 | -| node:18-alpine | sha256:ffc770cdc09c9e83cccd99d663bb6ed56cfaa1bab94baf1b12b626aebeca9c10 | 2023-03-08 | +| node:18-alpine | sha256:47d97b93629d9461d64197773966cc49081cf4463b1b07de5a38b6bd5acfbe9d | 2023-03-29 | | ubuntu:16.04 | sha256:1f1a2d56de1d604801a9671f301190704c25d604a416f59e03c04f5c6ffee0d6 | 2021-08-31 | | ubuntu:18.04 | sha256:8aa9c2798215f99544d1ce7439ea9c3a6dfd82de607da1cec3a8a2fae005931b | 2023-03-08 | | ubuntu:20.04 | sha256:24a0df437301598d1a4b62ddf59fa0ed2969150d70d748c84225e6501e9c36b9 | 2023-03-08 | @@ -346,7 +344,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | ftp | 0.17-34.1 | | gnupg2 | 2.2.19-3ubuntu2.2 | | haveged | 1.9.1-6ubuntu1 | -| imagemagick | 8:6.9.10.23+dfsg-2.1ubuntu11.6 | +| imagemagick | 8:6.9.10.23+dfsg-2.1ubuntu11.7 | | iproute2 | 5.5.0-1ubuntu1 | | iputils-ping | 3:20190709-3 | | jq | 1.6-1ubuntu0.20.04.1 | @@ -359,8 +357,8 @@ Use the following command as a part of your job to start the service: 'sudo syst | libgsl-dev | 2.5+dfsg-6build1 | | libgtk-3-0 | 3.24.20-0ubuntu1.1 | | libmagic-dev | 1:5.38-4 | -| libmagickcore-dev | 8:6.9.10.23+dfsg-2.1ubuntu11.6 | -| libmagickwand-dev | 8:6.9.10.23+dfsg-2.1ubuntu11.6 | +| libmagickcore-dev | 8:6.9.10.23+dfsg-2.1ubuntu11.7 | +| libmagickwand-dev | 8:6.9.10.23+dfsg-2.1ubuntu11.7 | | libsecret-1-dev | 0.20.4-0ubuntu1 | | libsqlite3-dev | 3.31.1-4ubuntu0.5 | | libtool | 2.4.6-14 | @@ -403,7 +401,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | upx | 3.95-2build1 | | wget | 1.20.3-1ubuntu2 | | xorriso | 1.5.2-1 | -| xvfb | 2:1.20.13-1ubuntu1\~20.04.6 | +| xvfb | 2:1.20.13-1ubuntu1\~20.04.8 | | xz-utils | 5.2.4-1ubuntu1.1 | | zip | 3.0-11build1 | | zsync | 0.6.2-3ubuntu1 | From 83dcaf932f5a3769444b638598ecd331c95422fc Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 6 Apr 2023 09:44:54 +0000 Subject: [PATCH 1844/3485] Updating readme file for ubuntu22 version 20230402.1 (#7386) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2204-Readme.md | 85 +++++++++++++++---------------- 1 file changed, 42 insertions(+), 43 deletions(-) diff --git a/images/linux/Ubuntu2204-Readme.md b/images/linux/Ubuntu2204-Readme.md index 1c6738c1ff40..02262ef4368b 100644 --- a/images/linux/Ubuntu2204-Readme.md +++ b/images/linux/Ubuntu2204-Readme.md @@ -2,12 +2,12 @@ |-| | [GraalVM JDK11 will be removed from agents on April 10, 2023](https://github.com/actions/runner-images/issues/7338) | | [[All OSes] Go 1.17.x will be removed and 1.20.x set as default on April, 3](https://github.com/actions/runner-images/issues/7276) | -| [The Ubuntu 18.04 Actions runner image will begin deprecation on 2022/08/08 and will be fully unsupported by 2023/04/01](https://github.com/actions/runner-images/issues/6002) | +| [The Ubuntu 18.04 Actions runner image will begin deprecation on 2022/08/08 and will be fully unsupported by 2023/04/03](https://github.com/actions/runner-images/issues/6002) | *** # Ubuntu 22.04 - OS Version: 22.04.2 LTS -- Kernel Version: 5.15.0-1034-azure -- Image Version: 20230326.2 +- Kernel Version: 5.15.0-1035-azure +- Image Version: 20230402.1 ## Installed Software @@ -28,12 +28,12 @@ - Python 3.10.6 - Python3 3.10.6 - Ruby 3.0.2p107 -- Swift 5.7.3 +- Swift 5.8 ### Package Management - cpan 1.64 - Helm 3.11.2 -- Homebrew 4.0.9 +- Homebrew 4.0.10 - Miniconda 23.1.0 - Npm 9.5.0 - NuGet 6.3.1.1 @@ -41,7 +41,7 @@ - Pip3 22.0.2 - Pipx 1.2.0 - RubyGems 3.3.5 -- Vcpkg (build from commit b81bc3a83) +- Vcpkg (build from commit 69efe9cc2) - Yarn 1.22.19 #### Environment variables @@ -63,18 +63,18 @@ to accomplish this. - Maven 3.8.8 ### Tools -- Ansible 2.14.3 +- Ansible 2.14.4 - apt-fast 1.9.12 -- AzCopy 10.17.0 - available by `azcopy` and `azcopy10` aliases +- AzCopy 10.18.0 - available by `azcopy` and `azcopy10` aliases - Bazel 6.1.1 - Bazelisk 1.13.2 - Bicep 0.15.31 - Buildah 1.23.1 -- CMake 3.26.1 +- CMake 3.26.2 - CodeQL Action Bundles 2.12.4 2.12.5 - Docker Amazon ECR Credential Helper 0.6.0 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.16.0+azure-2 +- Docker Compose v2 2.17.2+azure-1 - Docker-Buildx 0.10.4 - Docker-Moby Client 20.10.23+azure-2 - Docker-Moby Server 20.10.23+azure-2 @@ -85,7 +85,7 @@ to accomplish this. - Haveged 1.9.14 - Heroku 7.69.1 - jq 1.6 -- Kind 0.17.0 +- Kind 0.18.0 - Kubectl 1.26.3 - Kustomize 5.0.1 - Leiningen 2.10.0 @@ -99,30 +99,30 @@ to accomplish this. - Packer 1.8.6 - Parcel 2.8.3 - Podman 3.4.4 -- Pulumi 3.59.1 +- Pulumi 3.60.1 - R 4.2.3 - Skopeo 1.4.1 - Sphinx Open Source Search Server 2.2.11 - SVN 1.14.1 -- Terraform 1.4.2 +- Terraform 1.4.4 - yamllint 1.30.0 -- yq 4.33.1 +- yq 4.33.2 - zstd 1.5.4 ### CLI Tools -- Alibaba Cloud CLI 3.0.158 -- AWS CLI 2.11.6 +- Alibaba Cloud CLI 3.0.161 +- AWS CLI 2.11.8 - AWS CLI Session Manager Plugin 1.2.463.0 - AWS SAM CLI 1.78.0 - Azure CLI 2.46.0 - Azure CLI (azure-devops) 0.26.0 - GitHub CLI 2.25.1 -- Google Cloud SDK 423.0.0 +- Google Cloud SDK 424.0.0 - Hub CLI 2.14.2 -- Netlify CLI 13.2.1 -- OpenShift CLI 4.12.8 +- Netlify CLI 13.2.2 +- OpenShift CLI 4.12.9 - ORAS CLI 1.0.0 -- Vercel CLI 28.18.1 +- Vercel CLI 28.18.3 ### Java | Version | Vendor | Environment Variable | @@ -151,9 +151,9 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Stack 2.9.3 ### Rust Tools -- Cargo 1.68.1 -- Rust 1.68.1 -- Rustdoc 1.68.1 +- Cargo 1.68.2 +- Rust 1.68.2 +- Rustdoc 1.68.2 - Rustup 1.25.2 #### Packages @@ -165,11 +165,11 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.5.1 ### Browsers and Drivers -- Google Chrome 111.0.5563.110 +- Google Chrome 111.0.5563.146 - ChromeDriver 111.0.5563.64 - Chromium 111.0.5547.0 -- Microsoft Edge 111.0.1661.54 -- Microsoft Edge WebDriver 111.0.1661.54 +- Microsoft Edge 111.0.1661.62 +- Microsoft Edge WebDriver 111.0.1661.62 - Selenium server 4.8.0 - Mozilla Firefox 111.0.1 - Geckodriver 0.32.2 @@ -213,14 +213,13 @@ Use the following command as a part of your job to start the service: 'sudo syst ### Cached Tools #### Go -- 1.17.13 - 1.18.10 - 1.19.7 - 1.20.2 #### Node.js - 14.21.3 -- 16.19.1 +- 16.20.0 - 18.15.0 #### Python @@ -236,7 +235,7 @@ Use the following command as a part of your job to start the service: 'sudo syst - 3.9.16 [PyPy 7.3.11] #### Ruby -- 3.1.3 +- 3.1.4 ### PowerShell Tools - PowerShell 7.2.10 @@ -244,7 +243,7 @@ Use the following command as a part of your job to start the service: 'sudo syst #### PowerShell Modules - Az: 9.3.0 - MarkdownPS: 1.9 -- Microsoft.Graph: 1.24.0 +- Microsoft.Graph: 1.25.0 - Pester: 5.4.0 - PSScriptAnalyzer: 1.21.0 @@ -283,21 +282,21 @@ Use the following command as a part of your job to start the service: 'sudo syst ### Cached Docker images | Repository:Tag | Digest | Created | | ----------------------- | ------------------------------------------------------------------------ | ---------- | -| alpine:3.14 | sha256:fa26727c28837d1471c2f1524d297a0255c153b5d023d7badd1412be7e6e12a2 | 2023-02-11 | -| alpine:3.15 | sha256:59b00c6f1614a599aa83d946d2a276c9257d2d29461c86c6a114d9932f2ddcd4 | 2023-02-11 | -| alpine:3.16 | sha256:2cf17aa35fbcb6ece81692a64bfbadaf096590241ed9f95dd5f94f0e9f674784 | 2023-02-11 | -| alpine:3.17 | sha256:ff6bdca1701f3a8a67e328815ff2346b0e4067d32ec36b7992c1fdc001dc8517 | 2023-02-11 | +| alpine:3.14 | sha256:0f2d5c38dd7a4f4f733e688e3a6733cb5ab1ac6e3cb4603a5dd564e5bfb80eed | 2023-03-29 | +| alpine:3.15 | sha256:ecbdce53b2c2f43ab1b19418bcbd3f120a23547d9497030c8d978114512b883e | 2023-03-29 | +| alpine:3.16 | sha256:c2b622f6e510a0d25bccaffa9e67b75a6860cb09b74bb58cfc36a9ef4331109f | 2023-03-29 | +| alpine:3.17 | sha256:124c7d2707904eea7431fffe91522a01e5a861a624ee31d03372cc1d138a3126 | 2023-03-29 | | buildpack-deps:bullseye | sha256:d2e6d0b6233d9da4534d22e96ea4338fbf36a7657b6d60aae20260140ce43148 | 2023-03-23 | | buildpack-deps:buster | sha256:56e11e205661d628368fbcd0edee38d666d507351e5c74f2795128cd71c6f52b | 2023-03-23 | | debian:10 | sha256:235f2a778fbc0d668c66afa9fd5f1efabab94c1d6588779ea4e221e1496f89da | 2023-03-23 | | debian:11 | sha256:7b991788987ad860810df60927e1adbaf8e156520177bd4db82409f81dd3b721 | 2023-03-23 | | moby/buildkit:latest | sha256:ca34989052fc2467dcd283d2000c2ad8c7cd6213c5ff0fcabef1a9cfb0651b3a | 2023-03-23 | | node:14 | sha256:a97048059988c65f974b37dfe25a44327069a0f4f81133624871de0063b98075 | 2023-03-23 | -| node:14-alpine | sha256:1d02d4073d7dfd58950a222a862f8b819afd774560b7b3e992b27ff4cd088285 | 2023-02-17 | -| node:16 | sha256:e97b6d302062583e09be70f430b703637f6ef26c2cbb0d7bfed61e0be9d7a974 | 2023-03-23 | -| node:16-alpine | sha256:fcb03294d3c0695cf9762dec94c0366f08e7a8c6a3c1e062d38c80ac30684d8a | 2023-02-21 | +| node:14-alpine | sha256:434215b487a329c9e867202ff89e704d3a75e554822e07f3e0c0f9e606121b33 | 2023-03-29 | +| node:16 | sha256:051b68ed341fee26f4c08b15815ac4bff6a5351c68e7b33c66912677cc4be7ac | 2023-03-29 | +| node:16-alpine | sha256:b4a72f83f52bbe3970bb74a15e44ec4cf6e873ad4787473dfc8a26f5b4e29dd2 | 2023-03-29 | | node:18 | sha256:c21209748c829660e0b49cbd14d2f9d81ea82ffb02a8a7932ebacf70d01573a3 | 2023-03-23 | -| node:18-alpine | sha256:ffc770cdc09c9e83cccd99d663bb6ed56cfaa1bab94baf1b12b626aebeca9c10 | 2023-03-08 | +| node:18-alpine | sha256:47d97b93629d9461d64197773966cc49081cf4463b1b07de5a38b6bd5acfbe9d | 2023-03-29 | | ubuntu:18.04 | sha256:8aa9c2798215f99544d1ce7439ea9c3a6dfd82de607da1cec3a8a2fae005931b | 2023-03-08 | | ubuntu:20.04 | sha256:24a0df437301598d1a4b62ddf59fa0ed2969150d70d748c84225e6501e9c36b9 | 2023-03-08 | | ubuntu:22.04 | sha256:67211c14fa74f070d27cc59d69a7fa9aeff8e28ea118ef3babc295a0428a6d21 | 2023-03-08 | @@ -317,7 +316,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | coreutils | 8.32-4.1ubuntu1 | | curl | 7.81.0-1ubuntu1.10 | | dbus | 1.12.20-2ubuntu4.1 | -| dnsutils | 1:9.18.1-1ubuntu1.3 | +| dnsutils | 1:9.18.12-0ubuntu0.22.04.1 | | dpkg | 1.21.1ubuntu2.1 | | fakeroot | 1.28-1ubuntu1 | | file | 1:5.41-3 | @@ -326,7 +325,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | ftp | 20210827-4build1 | | gnupg2 | 2.2.27-3ubuntu2.1 | | haveged | 1.9.14-1ubuntu1 | -| imagemagick | 8:6.9.11.60+dfsg-1.3ubuntu0.22.04.2 | +| imagemagick | 8:6.9.11.60+dfsg-1.3ubuntu0.22.04.3 | | iproute2 | 5.15.0-1ubuntu2 | | iputils-ping | 3:20211215-1 | | jq | 1.6-2.1ubuntu3 | @@ -339,8 +338,8 @@ Use the following command as a part of your job to start the service: 'sudo syst | libgsl-dev | 2.7.1+dfsg-3 | | libgtk-3-0 | 3.24.33-1ubuntu2 | | libmagic-dev | 1:5.41-3 | -| libmagickcore-dev | 8:6.9.11.60+dfsg-1.3ubuntu0.22.04.2 | -| libmagickwand-dev | 8:6.9.11.60+dfsg-1.3ubuntu0.22.04.2 | +| libmagickcore-dev | 8:6.9.11.60+dfsg-1.3ubuntu0.22.04.3 | +| libmagickwand-dev | 8:6.9.11.60+dfsg-1.3ubuntu0.22.04.3 | | libsecret-1-dev | 0.20.5-2 | | libsqlite3-dev | 3.37.2-2ubuntu0.1 | | libssl-dev | 3.0.2-0ubuntu1.8 | @@ -385,7 +384,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | upx | 3.96-3 | | wget | 1.21.2-2ubuntu1 | | xorriso | 1.5.4-2 | -| xvfb | 2:21.1.3-2ubuntu2.8 | +| xvfb | 2:21.1.3-2ubuntu2.9 | | xz-utils | 5.2.5-2ubuntu1 | | zip | 3.0-12build2 | | zsync | 0.6.2-3ubuntu1 | From e8b403e0b955a8895980ef046a57b19d18fe01e7 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 6 Apr 2023 10:29:35 +0000 Subject: [PATCH 1845/3485] Updating readme file for win22 version 20230402.1 (#7384) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2022-Readme.md | 53 ++++++++++++++++---------------- 1 file changed, 26 insertions(+), 27 deletions(-) diff --git a/images/win/Windows2022-Readme.md b/images/win/Windows2022-Readme.md index 49bef7dd4f74..071a6f54084b 100644 --- a/images/win/Windows2022-Readme.md +++ b/images/win/Windows2022-Readme.md @@ -4,7 +4,7 @@ *** # Windows Server 2022 - OS Version: 10.0.20348 Build 1607 -- Image Version: 20230326.1 +- Image Version: 20230402.1 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -13,7 +13,7 @@ ### Language and Runtime - Bash 5.2.15(1)-release -- Go 1.17.13 +- Go 1.20.2 - Julia 1.8.5 - Kotlin 1.8.10 - LLVM 15.0.7 @@ -21,7 +21,7 @@ - Perl 5.32.1 - PHP 8.2.4 - Python 3.9.13 -- Ruby 3.0.5p211 +- Ruby 3.0.6p216 ### Package Management - Chocolatey 1.3.1 @@ -33,7 +33,7 @@ - pip 23.0.1 (python 3.9) - Pipx 1.2.0 - RubyGems 3.2.33 -- Vcpkg (build from commit b81bc3a83) +- Vcpkg (build from commit 69efe9cc2) - Yarn 1.22.19 #### Environment variables @@ -51,32 +51,32 @@ ### Tools - 7zip 22.01 - aria2 1.36.0 -- azcopy 10.17.0 +- azcopy 10.18.0 - Bazel 6.1.1 - Bazelisk 1.13.2 - Bicep 0.15.31 - Cabal 3.10.1.0 -- CMake 3.26.1 +- CMake 3.26.2 - CodeQL Action Bundles 2.12.4 2.12.5 -- Docker 23.0.1 +- Docker 23.0.2 - Docker Compose v1 1.29.2 - Docker Compose v2 2.17.2 - Docker-wincred 0.7.0 - ghc 9.6.1 - Git 2.40.0.windows.1 - Git LFS 3.3.0 -- ImageMagick 7.1.1-4 +- ImageMagick 7.1.1-5 - InnoSetup 6.2.2 - jq 1.6 -- Kind 0.17.0 +- Kind 0.18.0 - Kubectl 1.26.3 - Mercurial 5.0 - Mingw-w64 11.2.0 - Newman 5.3.2 - NSIS 3.08 -- OpenSSL 1.1.1 +- OpenSSL 1.1.1t - Packer 1.8.5 -- Pulumi 3.59.1 +- Pulumi 3.60.1 - R 4.2.3 - Service Fabric SDK 9.1.1436.9590 - Stack 2.9.3 @@ -89,8 +89,8 @@ - zstd 1.5.4 ### CLI Tools -- Alibaba Cloud CLI 3.0.158 -- AWS CLI 2.11.6 +- Alibaba Cloud CLI 3.0.161 +- AWS CLI 2.11.8 - AWS SAM CLI 1.78.0 - AWS Session Manager CLI 1.2.463.0 - Azure CLI 2.46.0 @@ -99,9 +99,9 @@ - Hub CLI 2.14.2 ### Rust Tools -- Cargo 1.68.1 -- Rust 1.68.1 -- Rustdoc 1.68.1 +- Cargo 1.68.2 +- Rust 1.68.2 +- Rustdoc 1.68.2 - Rustup 1.25.2 #### Packages @@ -113,10 +113,10 @@ - Rustfmt 1.5.1 ### Browsers and Drivers -- Google Chrome 111.0.5563.111 +- Google Chrome 111.0.5563.147 - Chrome Driver 111.0.5563.64 -- Microsoft Edge 111.0.1661.54 -- Microsoft Edge Driver 111.0.1661.54 +- Microsoft Edge 111.0.1661.62 +- Microsoft Edge Driver 111.0.1661.62 - Mozilla Firefox 111.0.1 - Gecko Driver 0.32.2 - IE Driver 4.8.0.0 @@ -157,14 +157,13 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Cached Tools #### Go -- 1.17.13 - 1.18.10 - 1.19.7 - 1.20.2 #### Node.js - 14.21.3 -- 16.19.1 +- 16.20.0 - 18.15.0 #### Python @@ -181,9 +180,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 3.9.16 [PyPy 7.3.11] #### Ruby -- 2.7.7 -- 3.0.5 -- 3.1.3 +- 2.7.8 +- 3.0.6 +- 3.1.4 ### Databases @@ -215,7 +214,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Name | Version | ConfigFile | ServiceName | ServiceStatus | ListenPort | | ------ | ------- | ------------------------------------- | ----------- | ------------- | ---------- | | Apache | 2.4.55 | C:\tools\Apache24\conf\httpd.conf | Apache | Stopped | 80 | -| Nginx | 1.23.3 | C:\tools\nginx-1.23.3\conf\nginx.conf | nginx | Stopped | 80 | +| Nginx | 1.23.4 | C:\tools\nginx-1.23.4\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2022 | Name | Version | Path | @@ -544,10 +543,10 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Az (Cached): 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.299 +- AWSPowershell: 4.1.304 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 -- Microsoft.Graph: 1.24.0 +- Microsoft.Graph: 1.25.0 - Pester: 3.4.0, 5.4.0 - PowerShellGet: 1.0.0.1, 2.2.5 - PSScriptAnalyzer: 1.21.0 From 69d754cb77e1b0e7b267ce9e6aaa4fbe4d6277a1 Mon Sep 17 00:00:00 2001 From: Sergey Dolin <dsame@github.com> Date: Thu, 6 Apr 2023 12:38:49 +0200 Subject: [PATCH 1846/3485] [Windows] Run bcdedit /set hypervisorschedulertyupe root (#7394) --- images/win/scripts/Installers/Install-WindowsFeatures.ps1 | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/images/win/scripts/Installers/Install-WindowsFeatures.ps1 b/images/win/scripts/Installers/Install-WindowsFeatures.ps1 index 8435eb258ffa..b4680242e71d 100644 --- a/images/win/scripts/Installers/Install-WindowsFeatures.ps1 +++ b/images/win/scripts/Installers/Install-WindowsFeatures.ps1 @@ -23,4 +23,8 @@ foreach ($feature in $windowsFeatures) { } else { throw "Failed to activate Windows Feature '$($feature.name)'" } -} \ No newline at end of file +} + +# it improves Android emulator launch on Windows Server +# https://learn.microsoft.com/en-us/windows-server/virtualization/hyper-v/manage/manage-hyper-v-scheduler-types +bcdedit /set hypervisorschedulertype root From 46f5d5470a1a64e8bdc1a5e8e4ba56f30d242019 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Thu, 6 Apr 2023 14:40:05 +0200 Subject: [PATCH 1847/3485] Update CI actions according to demands (#7395) --- .github/workflows/macos-generation.yml | 2 ++ .github/workflows/macos11.yml | 2 +- .github/workflows/macos12.yml | 2 +- .github/workflows/ubuntu2004.yml | 2 +- .github/workflows/ubuntu2204.yml | 2 +- .github/workflows/windows2019.yml | 2 +- .github/workflows/windows2022.yml | 2 +- images.CI/macos/move-vm.ps1 | 4 +++- 8 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.github/workflows/macos-generation.yml b/.github/workflows/macos-generation.yml index 156df706480a..1bbb94223a85 100644 --- a/.github/workflows/macos-generation.yml +++ b/.github/workflows/macos-generation.yml @@ -192,6 +192,7 @@ jobs: -PrintTopNLongest 25 - name: Move vm to cold storage and clear datastore tag + if: ${{ always() }} run: | $cpuCount = 3 $coresPerSocketCount = 3 @@ -203,6 +204,7 @@ jobs: -VIServer "${{ secrets.VISERVER_V2 }}" ` -VIUserName "${{ env.VI_USER_NAME }}" ` -VIPassword "${{ env.VI_PASSWORD }}" ` + -JobStatus "${{ job.status }}" ` -CpuCount "$cpuCount" ` -CoresPerSocketCount "$coresPerSocketCount" ` -Memory "$memory" diff --git a/.github/workflows/macos11.yml b/.github/workflows/macos11.yml index b35480251c97..5cbcf266df5f 100644 --- a/.github/workflows/macos11.yml +++ b/.github/workflows/macos11.yml @@ -17,7 +17,7 @@ on: jobs: macOS_11: - if: ${{ (github.event.label.name == 'macos-all') || (github.event.label.name == 'macos-11') || (inputs.CUSTOM_REPOSITORY != '' && inputs.CUSTOM_REPOSITORY_COMMIT_HASH != '') || (github.event_name == 'schedule') }} + if: ${{ (github.event.label.name == 'macos-all') || (github.event.label.name == 'macos-11') || (github.event_name == 'workflow_dispatch') || (github.event_name == 'schedule') }} name: macOS-11_unstable.${{ github.run_id }}.${{ github.run_attempt }} uses: ./.github/workflows/macos-generation.yml with: diff --git a/.github/workflows/macos12.yml b/.github/workflows/macos12.yml index 0ece0eb87d1c..6720975e886a 100644 --- a/.github/workflows/macos12.yml +++ b/.github/workflows/macos12.yml @@ -17,7 +17,7 @@ on: jobs: macOS_12: - if: ${{ (github.event.label.name == 'macos-all') || (github.event.label.name == 'macos-12') || (inputs.CUSTOM_REPOSITORY != '' && inputs.CUSTOM_REPOSITORY_COMMIT_HASH != '') || (github.event_name == 'schedule') }} + if: ${{ (github.event.label.name == 'macos-all') || (github.event.label.name == 'macos-12') || (github.event_name == 'workflow_dispatch') || (github.event_name == 'schedule') }} name: macOS-12_unstable.${{ github.run_id }}.${{ github.run_attempt }} uses: ./.github/workflows/macos-generation.yml with: diff --git a/.github/workflows/ubuntu2004.yml b/.github/workflows/ubuntu2004.yml index 8476ab7d3149..512a7837302a 100644 --- a/.github/workflows/ubuntu2004.yml +++ b/.github/workflows/ubuntu2004.yml @@ -17,7 +17,7 @@ on: jobs: Ubuntu_2004: - if: ${{ (github.event.label.name == 'ubuntu-all') || (github.event.label.name == 'ubuntu-2004') || (inputs.CUSTOM_REPOSITORY != '' && inputs.CUSTOM_REPOSITORY_COMMIT_HASH != '') || (github.event_name == 'schedule') }} + if: ${{ (github.event.label.name == 'ubuntu-all') || (github.event.label.name == 'ubuntu-2004') || (github.event_name == 'workflow_dispatch') || (github.event_name == 'schedule') }} uses: ./.github/workflows/ubuntu-win-generation.yml with: image_name: 'ubuntu2004' diff --git a/.github/workflows/ubuntu2204.yml b/.github/workflows/ubuntu2204.yml index 446427ada326..da8a718a93aa 100644 --- a/.github/workflows/ubuntu2204.yml +++ b/.github/workflows/ubuntu2204.yml @@ -17,7 +17,7 @@ on: jobs: Ubuntu_2204: - if: ${{ (github.event.label.name == 'ubuntu-all') || (github.event.label.name == 'ubuntu-2204') || (inputs.CUSTOM_REPOSITORY != '' && inputs.CUSTOM_REPOSITORY_COMMIT_HASH != '') || (github.event_name == 'schedule') }} + if: ${{ (github.event.label.name == 'ubuntu-all') || (github.event.label.name == 'ubuntu-2204') || (github.event_name == 'workflow_dispatch') || (github.event_name == 'schedule') }} uses: ./.github/workflows/ubuntu-win-generation.yml with: image_name: 'ubuntu2204' diff --git a/.github/workflows/windows2019.yml b/.github/workflows/windows2019.yml index 2de6404c64d9..d1bec3ed2e5c 100644 --- a/.github/workflows/windows2019.yml +++ b/.github/workflows/windows2019.yml @@ -17,7 +17,7 @@ on: jobs: Windows_2019: - if: ${{ (github.event.label.name == 'windows-all') || (github.event.label.name == 'windows-2019') || (inputs.CUSTOM_REPOSITORY != '' && inputs.CUSTOM_REPOSITORY_COMMIT_HASH != '') || (github.event_name == 'schedule') }} + if: ${{ (github.event.label.name == 'windows-all') || (github.event.label.name == 'windows-2019') || (github.event_name == 'workflow_dispatch') || (github.event_name == 'schedule') }} uses: ./.github/workflows/ubuntu-win-generation.yml with: image_name: 'windows2019' diff --git a/.github/workflows/windows2022.yml b/.github/workflows/windows2022.yml index ef5e5d3d5def..1ad40f08fc43 100644 --- a/.github/workflows/windows2022.yml +++ b/.github/workflows/windows2022.yml @@ -17,7 +17,7 @@ on: jobs: Windows_2022: - if: ${{ (github.event.label.name == 'windows-all') || (github.event.label.name == 'windows-2022') || (inputs.CUSTOM_REPOSITORY != '' && inputs.CUSTOM_REPOSITORY_COMMIT_HASH != '') || (github.event_name == 'schedule') }} + if: ${{ (github.event.label.name == 'windows-all') || (github.event.label.name == 'windows-2022') || (github.event_name == 'workflow_dispatch') || (github.event_name == 'schedule') }} uses: ./.github/workflows/ubuntu-win-generation.yml with: image_name: 'windows2022' diff --git a/images.CI/macos/move-vm.ps1 b/images.CI/macos/move-vm.ps1 index 4128c36b7559..4b5cb9e246ad 100644 --- a/images.CI/macos/move-vm.ps1 +++ b/images.CI/macos/move-vm.ps1 @@ -41,6 +41,8 @@ param( [ValidateNotNullOrEmpty()] [string]$VIPassword, + [string]$JobStatus, + [int32]$CpuCount, [int32]$CoresPerSocketCount, @@ -62,7 +64,7 @@ try { } $vm = Get-VM $VMName -if ($env:AGENT_JOBSTATUS -eq 'Failed') { +if (($env:AGENT_JOBSTATUS -and $env:AGENT_JOBSTATUS -eq 'Failed') -or ($JobStatus -and $JobStatus -eq 'failure')) { try { if($vm.PowerState -ne "PoweredOff") { Stop-VM -VM $vm -Confirm:$false -ErrorAction Stop | Out-Null From bc834aa0838b2d9260e6e809d0d3dce1bc7187e2 Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Thu, 6 Apr 2023 15:41:26 +0200 Subject: [PATCH 1848/3485] [ubuntu] remove GraalVM (#7399) --- .../SoftwareReport/SoftwareReport.Common.psm1 | 15 ----------- .../SoftwareReport.Generator.ps1 | 3 --- images/linux/scripts/installers/graalvm.sh | 25 ------------------- images/linux/scripts/tests/Tools.Tests.ps1 | 10 -------- images/linux/ubuntu2004.json | 1 - images/linux/ubuntu2204.pkr.hcl | 1 - 6 files changed, 55 deletions(-) delete mode 100644 images/linux/scripts/installers/graalvm.sh diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 index 873f35ce8104..c23d1d6d5610 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 @@ -344,21 +344,6 @@ function Get-PipxVersion { return $Matches.Version } -function Get-GraalVMVersion { - $version = & "$env:GRAALVM_11_ROOT\bin\java" --version | Select-String -Pattern "GraalVM" | Take-OutputPart -Part 5,6 - return $version -} - -function Build-GraalVMTable { - $version = Get-GraalVMVersion - $envVariables = "GRAALVM_11_ROOT" - - return [PSCustomObject] @{ - "Version" = $version - "Environment variables" = $envVariables - } -} - function Build-PackageManagementEnvironmentTable { return @( [PSCustomObject] @{ diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index 5edc9068301e..daa32686e3fc 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -168,9 +168,6 @@ $cliTools.AddToolVersion("Vercel CLI", $(Get-VerselCliversion)) $installedSoftware.AddHeader("Java").AddTable($(Get-JavaVersionsTable)) -if ((Test-IsUbuntu20) -or (Test-IsUbuntu22)) { - $installedSoftware.AddHeader("GraalVM").AddTable($(Build-GraalVMTable)) -} $phpTools = $installedSoftware.AddHeader("PHP Tools") $phpTools.AddToolVersionsListInline("PHP", $(Get-PHPVersions), "^\d+\.\d+") diff --git a/images/linux/scripts/installers/graalvm.sh b/images/linux/scripts/installers/graalvm.sh deleted file mode 100644 index 0d50db2efb62..000000000000 --- a/images/linux/scripts/installers/graalvm.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash -e -################################################################################ -## File: graalvm.sh -## Desc: Installs GraalVM -################################################################################ - -source $HELPER_SCRIPTS/install.sh -source $HELPER_SCRIPTS/etc-environment.sh - -# Install GraalVM -GRAALVM_ROOT=/usr/local/graalvm -export GRAALVM_11_ROOT=$GRAALVM_ROOT/graalvm-ce-java11* - -downloadUrl=$(get_github_package_download_url "graalvm/graalvm-ce-builds" "contains(\"graalvm-ce-java11-linux-amd64\") and endswith(\"tar.gz\")") -download_with_retries "$downloadUrl" "/tmp" "graalvm-archive.tar.gz" -mkdir $GRAALVM_ROOT -tar -xzf "/tmp/graalvm-archive.tar.gz" -C $GRAALVM_ROOT - -# Set environment variable for GraalVM root -setEtcEnvironmentVariable "GRAALVM_11_ROOT" $GRAALVM_11_ROOT - -# Install Native Image -$GRAALVM_11_ROOT/bin/gu install native-image - -invoke_tests "Tools" "GraalVM" diff --git a/images/linux/scripts/tests/Tools.Tests.ps1 b/images/linux/scripts/tests/Tools.Tests.ps1 index c02d058faa2e..24bd2ea9fe84 100644 --- a/images/linux/scripts/tests/Tools.Tests.ps1 +++ b/images/linux/scripts/tests/Tools.Tests.ps1 @@ -331,16 +331,6 @@ Describe "Phantomjs" -Skip:(Test-IsUbuntu22) { } } -Describe "GraalVM" { - It "graalvm" { - '$GRAALVM_11_ROOT/bin/java -version' | Should -ReturnZeroExitCode - } - - It "native-image" { - '$GRAALVM_11_ROOT/bin/native-image --version' | Should -ReturnZeroExitCode - } -} - Describe "Containers" { $testCases = @("podman", "buildah", "skopeo") | ForEach-Object { @{ContainerCommand = $_} } diff --git a/images/linux/ubuntu2004.json b/images/linux/ubuntu2004.json index 05677d2ab692..97f539b3303d 100644 --- a/images/linux/ubuntu2004.json +++ b/images/linux/ubuntu2004.json @@ -253,7 +253,6 @@ "{{template_dir}}/scripts/installers/android.sh", "{{template_dir}}/scripts/installers/pypy.sh", "{{template_dir}}/scripts/installers/python.sh", - "{{template_dir}}/scripts/installers/graalvm.sh", "{{template_dir}}/scripts/installers/zstd.sh" ], "environment_vars": [ diff --git a/images/linux/ubuntu2204.pkr.hcl b/images/linux/ubuntu2204.pkr.hcl index d59d6903d052..9b6e0851ad97 100644 --- a/images/linux/ubuntu2204.pkr.hcl +++ b/images/linux/ubuntu2204.pkr.hcl @@ -334,7 +334,6 @@ build { "${path.root}/scripts/installers/android.sh", "${path.root}/scripts/installers/pypy.sh", "${path.root}/scripts/installers/python.sh", - "${path.root}/scripts/installers/graalvm.sh", "${path.root}/scripts/installers/zstd.sh" ] } From 07662e65bab775c1bf9e974047a33ab2929d1f1a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 6 Apr 2023 14:26:47 +0000 Subject: [PATCH 1849/3485] Updating readme file for win19 version 20230331.1 (#7385) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2019-Readme.md | 41 ++++++++++++++++---------------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index 7876e73e07f2..8a2c1e265694 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -4,7 +4,7 @@ *** # Windows Server 2019 - OS Version: 10.0.17763 Build 4131 -- Image Version: 20230326.1 +- Image Version: 20230331.1 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -13,7 +13,7 @@ ### Language and Runtime - Bash 5.2.15(1)-release -- Go 1.17.13 +- Go 1.20.2 - Julia 1.8.5 - Kotlin 1.8.10 - LLVM 15.0.7 @@ -33,7 +33,7 @@ - pip 23.0.1 (python 3.7) - Pipx 1.2.0 - RubyGems 2.7.6.3 -- Vcpkg (build from commit b81bc3a83) +- Vcpkg (build from commit c9f906558) - Yarn 1.22.19 #### Environment variables @@ -56,29 +56,29 @@ - Bazelisk 1.13.2 - Bicep 0.15.31 - Cabal 3.10.1.0 -- CMake 3.26.1 +- CMake 3.26.2 - CodeQL Action Bundles 2.12.4 2.12.5 -- Docker 23.0.1 +- Docker 23.0.2 - Docker Compose v1 1.29.2 - Docker Compose v2 2.17.2 - Docker-wincred 0.7.0 - ghc 9.6.1 - Git 2.40.0.windows.1 - Git LFS 3.3.0 -- Google Cloud SDK 423.0.0 -- ImageMagick 7.1.1-4 +- Google Cloud SDK 424.0.0 +- ImageMagick 7.1.1-5 - InnoSetup 6.2.2 - jq 1.6 -- Kind 0.17.0 +- Kind 0.18.0 - Kubectl 1.26.3 - Mercurial 5.0 - Mingw-w64 8.1.0 - Newman 5.3.2 - NSIS 3.08 -- OpenSSL 1.1.1 +- OpenSSL 1.1.1t - Packer 1.8.5 - Parcel 2.8.3 -- Pulumi 3.59.1 +- Pulumi 3.60.1 - R 4.2.3 - Service Fabric SDK 9.1.1436.9590 - Stack 2.9.3 @@ -91,7 +91,7 @@ - zstd 1.5.4 ### CLI Tools -- Alibaba Cloud CLI 3.0.158 +- Alibaba Cloud CLI 3.0.161 - AWS CLI 2.11.6 - AWS SAM CLI 1.78.0 - AWS Session Manager CLI 1.2.463.0 @@ -102,9 +102,9 @@ - Hub CLI 2.14.2 ### Rust Tools -- Cargo 1.68.1 -- Rust 1.68.1 -- Rustdoc 1.68.1 +- Cargo 1.68.2 +- Rust 1.68.2 +- Rustdoc 1.68.2 - Rustup 1.25.2 #### Packages @@ -116,9 +116,9 @@ - Rustfmt 1.5.1 ### Browsers and Drivers -- Google Chrome 111.0.5563.111 +- Google Chrome 111.0.5563.147 - Chrome Driver 111.0.5563.64 -- Microsoft Edge 111.0.1661.54 +- Microsoft Edge 111.0.1661.62 - Microsoft Edge Driver 111.0.1661.54 - Mozilla Firefox 111.0.1 - Gecko Driver 0.32.2 @@ -164,14 +164,13 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Cached Tools #### Go -- 1.17.13 - 1.18.10 - 1.19.7 - 1.20.2 #### Node.js - 14.21.3 -- 16.19.1 +- 16.20.0 - 18.15.0 #### Python @@ -228,7 +227,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Name | Version | ConfigFile | ServiceName | ServiceStatus | ListenPort | | ------ | ------- | ------------------------------------- | ----------- | ------------- | ---------- | | Apache | 2.4.55 | C:\tools\Apache24\conf\httpd.conf | Apache | Stopped | 80 | -| Nginx | 1.23.3 | C:\tools\nginx-1.23.3\conf\nginx.conf | nginx | Stopped | 80 | +| Nginx | 1.23.4 | C:\tools\nginx-1.23.4\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2019 | Name | Version | Path | @@ -513,10 +512,10 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Az (Cached): 1.0.0.zip, 1.6.0.zip, 2.3.2.zip, 2.6.0.zip, 3.1.0.zip, 3.5.0.zip, 3.8.0.zip, 4.3.0.zip, 4.4.0.zip, 4.7.0.zip, 5.5.0.zip, 5.9.0.zip, 6.6.0.zip, 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.299 +- AWSPowershell: 4.1.303 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 -- Microsoft.Graph: 1.24.0 +- Microsoft.Graph: 1.25.0 - Pester: 3.4.0, 5.4.0 - PowerShellGet: 1.0.0.1, 2.2.5 - PSScriptAnalyzer: 1.21.0 From a2308e8518f940b3b2dda9753b961b99462be36e Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Thu, 6 Apr 2023 18:29:02 +0200 Subject: [PATCH 1850/3485] [macos] remove GraalVM (#7398) --- README.md | 2 +- images/macos/provision/core/graalvm.sh | 14 -------------- .../software-report/SoftwareReport.Common.psm1 | 15 --------------- .../software-report/SoftwareReport.Generator.ps1 | 4 ---- images/macos/templates/macOS-11.anka.pkr.hcl | 1 - images/macos/templates/macOS-11.json | 1 - images/macos/templates/macOS-12.anka.pkr.hcl | 1 - images/macos/templates/macOS-12.json | 1 - images/macos/tests/Common.Tests.ps1 | 10 ---------- 9 files changed, 1 insertion(+), 48 deletions(-) delete mode 100644 images/macos/provision/core/graalvm.sh diff --git a/README.md b/README.md index 4d4edeb95511..34995b955eab 100644 --- a/README.md +++ b/README.md @@ -119,7 +119,7 @@ We use third-party package managers to install software during the image generat | Ubuntu | [APT](https://wiki.debian.org/Apt) | [Eclipse-Timurin (Adoptium)](https://packages.adoptium.net/artifactory/deb) </br> [Erlang](https://packages.erlang-solutions.com/ubuntu) </br>[Firefox](https://launchpad.net/~mozillateam/+archive/ubuntu/ppa) </br> [gcc, gfortran](https://launchpad.net/~ubuntu-toolchain-r/+archive/ubuntu/test) </br> [git](https://launchpad.net/~git-core/+archive/ubuntu/ppa) </br> [HHvm](https://dl.hhvm.com/ubuntu) </br> [PHP](https://launchpad.net/~ondrej/+archive/ubuntu/php) (Ubuntu 20 only) </br> [Mono](https://download.mono-project.com/repo/ubuntu) </br> [PostgreSQL](https://apt.postgresql.org/pub/repos/apt) </br> [R](https://cloud.r-project.org/bin/linux/ubuntu) | | | [pipx](https://pypa.github.io/pipx) | ansible-core </br>yamllint | | Windows | [Chocolatey](https://chocolatey.org) | No third-party repos installed | -| macOS | [Homebrew](https://homebrew.sh) | [aws-cli v2](https://github.com/aws/homebrew-tap) </br> [azure/bicep](https://github.com/Azure/homebrew-bicep) </br> [graalvm-ce-java11](https://github.com/graalvm/homebrew-tap) </br> [mongodb/brew](https://github.com/mongodb/homebrew-brew) | +| macOS | [Homebrew](https://homebrew.sh) | [aws-cli v2](https://github.com/aws/homebrew-tap) </br> [azure/bicep](https://github.com/Azure/homebrew-bicep) </br> [mongodb/brew](https://github.com/mongodb/homebrew-brew) | | | [pipx](https://pypa.github.io/pipx/) | yamllint | diff --git a/images/macos/provision/core/graalvm.sh b/images/macos/provision/core/graalvm.sh deleted file mode 100644 index 05eb24356813..000000000000 --- a/images/macos/provision/core/graalvm.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash -e -o pipefail -source ~/utils/utils.sh - -echo Installing GraalVM... -brew install --cask graalvm/tap/graalvm-ce-java11 - -exportPath=$(echo /Library/Java/JavaVirtualMachines/graalvm-ce-java*/Contents/Home/bin) -echo "Setting up GRAALVM_11_ROOT variable to ${exportPath}" -echo "export GRAALVM_11_ROOT=${exportPath}" >> "${HOME}/.bashrc" - -# Install Native Image -$exportPath/gu install native-image - -invoke_tests "Common" "GraalVM" \ No newline at end of file diff --git a/images/macos/software-report/SoftwareReport.Common.psm1 b/images/macos/software-report/SoftwareReport.Common.psm1 index 0cc3d1d80df4..38b34d5f27d0 100644 --- a/images/macos/software-report/SoftwareReport.Common.psm1 +++ b/images/macos/software-report/SoftwareReport.Common.psm1 @@ -613,21 +613,6 @@ function Build-MiscellaneousEnvironmentTable { } } -function Get-GraalVMVersion { - $version = & "$env:GRAALVM_11_ROOT\java" --version | Select-String -Pattern "GraalVM" | Take-Part -Part 5,6 - return $version -} - -function Build-GraalVMTable { - $version = Get-GraalVMVersion - $envVariables = "GRAALVM_11_ROOT" - - return [PSCustomObject] @{ - "Version" = $version - "Environment variables" = $envVariables - } -} - function Get-CodeQLBundleVersions { $CodeQLVersionsWildcard = Join-Path $Env:AGENT_TOOLSDIRECTORY -ChildPath "CodeQL" | Join-Path -ChildPath "*" $CodeQLVersionPaths = Get-ChildItem $CodeQLVersionsWildcard diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1 index 46bcff91ba36..a69e53949bb0 100644 --- a/images/macos/software-report/SoftwareReport.Generator.ps1 +++ b/images/macos/software-report/SoftwareReport.Generator.ps1 @@ -187,10 +187,6 @@ $java = $installedSoftware.AddHeader("Java") $java.AddTable($(Get-JavaVersions)) if (-not $os.IsVentura) { - # Graal - $graalvm = $installedSoftware.AddHeader("GraalVM") - $graalvm.AddTable($(Build-GraalVMTable)) - # Toolcache $toolcache = $installedSoftware.AddHeader("Cached Tools") $toolcache.AddNodes($(Build-ToolcacheSection)) diff --git a/images/macos/templates/macOS-11.anka.pkr.hcl b/images/macos/templates/macOS-11.anka.pkr.hcl index 444df522fc78..aaabfd59c8a9 100644 --- a/images/macos/templates/macOS-11.anka.pkr.hcl +++ b/images/macos/templates/macOS-11.anka.pkr.hcl @@ -225,7 +225,6 @@ build { "./provision/core/pypy.sh", "./provision/core/pipx-packages.sh", "./provision/core/bicep.sh", - "./provision/core/graalvm.sh", "./provision/core/codeql-bundle.sh" ] environment_vars = [ diff --git a/images/macos/templates/macOS-11.json b/images/macos/templates/macOS-11.json index 510391438ffb..81da486712f9 100644 --- a/images/macos/templates/macOS-11.json +++ b/images/macos/templates/macOS-11.json @@ -212,7 +212,6 @@ "./provision/core/pypy.sh", "./provision/core/pipx-packages.sh", "./provision/core/bicep.sh", - "./provision/core/graalvm.sh", "./provision/core/codeql-bundle.sh" ], "environment_vars": [ diff --git a/images/macos/templates/macOS-12.anka.pkr.hcl b/images/macos/templates/macOS-12.anka.pkr.hcl index 3fd4a8eac15b..80aef5caaa5a 100644 --- a/images/macos/templates/macOS-12.anka.pkr.hcl +++ b/images/macos/templates/macOS-12.anka.pkr.hcl @@ -226,7 +226,6 @@ build { "./provision/core/pypy.sh", "./provision/core/pipx-packages.sh", "./provision/core/bicep.sh", - "./provision/core/graalvm.sh", "./provision/core/codeql-bundle.sh" ] environment_vars = [ diff --git a/images/macos/templates/macOS-12.json b/images/macos/templates/macOS-12.json index 52954340a8f1..094944c554b6 100644 --- a/images/macos/templates/macOS-12.json +++ b/images/macos/templates/macOS-12.json @@ -213,7 +213,6 @@ "./provision/core/pypy.sh", "./provision/core/pipx-packages.sh", "./provision/core/bicep.sh", - "./provision/core/graalvm.sh", "./provision/core/codeql-bundle.sh" ], "environment_vars": [ diff --git a/images/macos/tests/Common.Tests.ps1 b/images/macos/tests/Common.Tests.ps1 index f2c02c5db9a2..d3a4dbb0dc23 100644 --- a/images/macos/tests/Common.Tests.ps1 +++ b/images/macos/tests/Common.Tests.ps1 @@ -123,16 +123,6 @@ Describe "Go" { } } -Describe "GraalVM" { - It "graalvm" { - '$GRAALVM_11_ROOT/java -version' | Should -ReturnZeroExitCode - } - - It "native-image" { - '$GRAALVM_11_ROOT/native-image --version' | Should -ReturnZeroExitCode - } -} - Describe "VirtualBox" -Skip:($os.IsBigSur) { It "Check kext kernel modules" { kextstat | Out-String | Should -Match "org.virtualbox.kext" From d0487f5869ccd8c585411ba80c268d2df25101fe Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 6 Apr 2023 20:28:31 +0200 Subject: [PATCH 1851/3485] Updating readme file for macOS-11 version 20230328.2 (#7383) Co-authored-by: Image generation service account <no-reply@microsoft.com> --- images/macos/macos-11-Readme.md | 75 ++++++++++++++++----------------- 1 file changed, 37 insertions(+), 38 deletions(-) diff --git a/images/macos/macos-11-Readme.md b/images/macos/macos-11-Readme.md index 796ba9fa08f1..c9bcee996be9 100644 --- a/images/macos/macos-11-Readme.md +++ b/images/macos/macos-11-Readme.md @@ -1,12 +1,12 @@ | Announcements | |-| +| [GraalVM JDK11 will be removed from agents on April 10, 2023](https://github.com/actions/runner-images/issues/7338) | | [[All OSes] Go 1.17.x will be removed and 1.20.x set as default on April, 3](https://github.com/actions/runner-images/issues/7276) | -| [GCC-9 will be removed from macOS 11 on March, 20](https://github.com/actions/runner-images/issues/7136) | *** # macOS 11 -- OS Version: macOS 11.7.4 (20G1120) +- OS Version: macOS 11.7.5 (20G1225) - Kernel Version: Darwin 20.6.0 -- Image Version: 20230318.1 +- Image Version: 20230328.2 ## Installed Software @@ -21,7 +21,7 @@ - GNU Fortran 10 (Homebrew GCC 10.4.0) - available by `gfortran-10` alias - GNU Fortran 11 (Homebrew GCC 11.3.0) - available by `gfortran-11` alias - GNU Fortran 12 (Homebrew GCC 12.2.0) - available by `gfortran-12` alias -- Go 1.17.13 +- Go 1.20.2 - Julia 1.8.5 - Kotlin 1.8.10-release-430 - Mono 6.12.0.188 @@ -37,19 +37,19 @@ - Ruby 2.7.7p221 ### Package Management -- Bundler 2.4.8 +- Bundler 2.4.10 - Carthage 0.39.0 - CocoaPods 1.12.0 -- Composer 2.5.4 -- Homebrew 4.0.6 +- Composer 2.5.5 +- Homebrew 4.0.10 - Miniconda 23.1.0 - NPM 9.5.0 - NuGet 6.3.1.1 - Pip 20.3.4 (python 2.7) - Pip3 23.0.1 (python 3.11) - Pipx 1.2.0 -- RubyGems 3.4.8 -- Vcpkg 2023 (build from commit ffe7360e0) +- RubyGems 3.4.10 +- Vcpkg 2023 (build from commit 1271068e1) - Yarn 1.22.19 #### Environment variables @@ -71,16 +71,16 @@ - bazel 6.1.1 - bazelisk 1.16.0 - bsdtar 3.3.2 - available by 'tar' alias -- Curl 7.88.1 +- Curl 8.0.1 - Git 2.40.0 - Git LFS 3.3.0 -- GitHub CLI 2.24.3 +- GitHub CLI 2.25.1 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.3 - gpg (GnuPG) 2.4.0 - helm v3.11.2+g912ebc1 - Hub CLI 2.14.2 -- ImageMagick 7.1.1-4 +- ImageMagick 7.1.1-5 - jq 1.6 - mongo 5.0.15 - mongod 5.0.15 @@ -91,43 +91,43 @@ - psql (PostgreSQL) 14.7 (Homebrew) - Sox 14.4.2 - Subversion (SVN) 1.14.2 -- Switchaudio-osx 1.1.0 -- yq 4.32.1 +- Switchaudio-osx 1.2.0 +- yq 4.33.1 - zstd 1.5.4 ### Tools - Aliyun CLI 3.0.152 - App Center CLI 2.13.3 -- AWS CLI 2.11.4 -- AWS SAM CLI 1.76.0 +- AWS CLI 2.11.6 +- AWS SAM CLI 1.78.0 - AWS Session Manager CLI 1.2.463.0 - Azure CLI 2.46.0 - Azure CLI (azure-devops) 0.26.0 - Bicep CLI 0.15.31 - Cabal 3.6.2.0 -- Cmake 3.26.0 -- CodeQL Action Bundles 2.12.3 2.12.4 +- Cmake 3.26.1 +- CodeQL Action Bundles 2.12.4 2.12.5 - Fastlane 2.212.1 - GHC 9.6.1 - GHCup 0.1.19.2 - Jazzy 0.14.3 - Stack 2.9.3 -- SwiftFormat 0.51.2 +- SwiftFormat 0.51.3 - Swig 4.1.1 - Xcode Command Line Tools 13.2.0.0.1.1638488800 ### Linters - SwiftLint 0.48.0 -- Yamllint 1.29.0 +- Yamllint 1.30.0 ### Browsers -- Safari 16.3.1 (16614.4.6.11.7) -- SafariDriver 16.3.1 (16614.4.6.11.7) -- Google Chrome 111.0.5563.64 +- Safari 16.4 (16615.1.26.101.9) +- SafariDriver 16.4 (16615.1.26.101.9) +- Google Chrome 111.0.5563.146 - ChromeDriver 111.0.5563.64 -- Microsoft Edge 111.0.1661.44 -- Microsoft Edge WebDriver 111.0.1661.44 -- Mozilla Firefox 111.0 +- Microsoft Edge 111.0.1661.54 +- Microsoft Edge WebDriver 111.0.1661.54 +- Mozilla Firefox 111.0.1 - geckodriver 0.32.2 - Selenium server 4.8.0 @@ -179,20 +179,19 @@ - 18.15.0 #### Go -- 1.17.13 - 1.18.10 - 1.19.7 - 1.20.2 ### Rust Tools -- Cargo 1.68.0 -- Rust 1.68.0 -- Rustdoc 1.68.0 +- Cargo 1.68.2 +- Rust 1.68.2 +- Rustdoc 1.68.2 - Rustup 1.25.2 #### Packages - Bindgen 0.64.0 -- Cargo-audit 0.17.4 +- Cargo-audit 0.17.5 - Cargo-outdated 0.11.2 - Cbindgen 0.24.3 - Clippy 0.1.68 @@ -211,15 +210,15 @@ | Name | Version | ConfigFile | ServiceStatus | ListenPort | | ----- | ------- | ------------------------------- | ------------- | ---------- | | httpd | 2.4.56 | /usr/local/etc/httpd/httpd.conf | none | 80 | -| nginx | 1.23.3 | /usr/local/etc/nginx/nginx.conf | none | 80 | +| nginx | 1.23.4 | /usr/local/etc/nginx/nginx.conf | none | 80 | ### Xamarin #### Visual Studio for Mac -| Version | Build | Path | -| -------------- | ----------- | ------------------------------------ | -| 2019 | 8.10.25.2 | /Applications/Visual Studio 2019.app | -| 2022 (default) | 17.5.0.1802 | /Applications/Visual Studio.app | +| Version | Build | Path | +| -------------- | --------- | ------------------------------------ | +| 2019 | 8.10.25.2 | /Applications/Visual Studio 2019.app | +| 2022 (default) | 17.5.3.15 | /Applications/Visual Studio.app | ##### Notes ``` @@ -335,7 +334,7 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" | Package Name | Version | | -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | | Android Command Line Tools | 8.0 | -| Android Emulator | 32.1.11 | +| Android Emulator | 32.1.12 | | Android SDK Build-tools | 33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | | Android SDK Platforms | android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | | Android SDK Platform-Tools | 34.0.1 | @@ -359,6 +358,6 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" ### Miscellaneous - libXext 1.3.5 - libXft 2.3.7 -- Tcl/Tk 8.6.13_1 +- Tcl/Tk 8.6.13_2 - Zlib 1.2.13 From 833ffa3aab68f80abf0b0e987e212f43da58f925 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 6 Apr 2023 20:28:49 +0200 Subject: [PATCH 1852/3485] Updating readme file for macOS-12 version 20230328.1 (#7382) Co-authored-by: Image generation service account <no-reply@microsoft.com> --- images/macos/macos-12-Readme.md | 79 ++++++++++++++++----------------- 1 file changed, 39 insertions(+), 40 deletions(-) diff --git a/images/macos/macos-12-Readme.md b/images/macos/macos-12-Readme.md index baaf1e78764f..b74987897ed5 100644 --- a/images/macos/macos-12-Readme.md +++ b/images/macos/macos-12-Readme.md @@ -1,12 +1,12 @@ | Announcements | |-| +| [GraalVM JDK11 will be removed from agents on April 10, 2023](https://github.com/actions/runner-images/issues/7338) | | [[All OSes] Go 1.17.x will be removed and 1.20.x set as default on April, 3](https://github.com/actions/runner-images/issues/7276) | -| [GCC-9 will be removed from macOS 11 on March, 20](https://github.com/actions/runner-images/issues/7136) | *** # macOS 12 -- OS Version: macOS 12.6.3 (21G419) +- OS Version: macOS 12.6.4 (21G526) - Kernel Version: Darwin 21.6.0 -- Image Version: 20230318.1 +- Image Version: 20230328.1 ## Installed Software @@ -19,7 +19,7 @@ - GCC 12 (Homebrew GCC 12.2.0) - available by `gcc-12` alias - GNU Fortran 11 (Homebrew GCC 11.3.0) - available by `gfortran-11` alias - GNU Fortran 12 (Homebrew GCC 12.2.0) - available by `gfortran-12` alias -- Go 1.17.13 +- Go 1.20.2 - Julia 1.8.5 - Kotlin 1.8.10-release-430 - Mono 6.12.0.188 @@ -35,19 +35,19 @@ - Ruby 3.0.5p211 ### Package Management -- Bundler 2.4.8 +- Bundler 2.4.10 - Carthage 0.39.0 - CocoaPods 1.12.0 -- Composer 2.5.4 -- Homebrew 4.0.6 +- Composer 2.5.5 +- Homebrew 4.0.10 - Miniconda 23.1.0 - NPM 9.5.0 - NuGet 6.3.1.1 - Pip 20.3.4 (python 2.7) - Pip3 23.0.1 (python 3.11) - Pipx 1.2.0 -- RubyGems 3.4.8 -- Vcpkg 2023 (build from commit ffe7360e0) +- RubyGems 3.4.10 +- Vcpkg 2023 (build from commit d13e3a060) - Yarn 1.22.19 #### Environment variables @@ -58,7 +58,7 @@ ### Project Management - Apache Ant 1.10.13 -- Apache Maven 3.9.0 +- Apache Maven 3.9.1 - Gradle 8.0.2 - Sbt 1.8.2 @@ -69,15 +69,15 @@ - bazel 6.1.1 - bazelisk 1.16.0 - bsdtar 3.5.1 - available by 'tar' alias -- Curl 7.88.1 +- Curl 8.0.1 - Git 2.40.0 - Git LFS 3.3.0 -- GitHub CLI 2.24.3 +- GitHub CLI 2.25.1 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.3 - gpg (GnuPG) 2.4.0 - Hub CLI 2.14.2 -- ImageMagick 7.1.1-3 +- ImageMagick 7.1.1-5 - jq 1.6 - mongo 5.0.15 - mongod 5.0.15 @@ -87,45 +87,45 @@ - psql (PostgreSQL) 14.7 (Homebrew) - Sox 14.4.2 - Subversion (SVN) 1.14.2 -- Switchaudio-osx 1.1.0 +- Switchaudio-osx 1.2.0 - Vagrant 2.3.4 - VirtualBox 6.1.38r153438 -- yq 4.32.1 +- yq 4.33.1 - zstd 1.5.4 ### Tools - App Center CLI 2.13.3 -- AWS CLI 2.11.4 -- AWS SAM CLI 1.76.0 -- AWS Session Manager CLI 1.2.398.0 +- AWS CLI 2.11.6 +- AWS SAM CLI 1.78.0 +- AWS Session Manager CLI 1.2.463.0 - Azure CLI 2.46.0 - Azure CLI (azure-devops) 0.26.0 - Bicep CLI 0.15.31 - Cabal 3.6.2.0 -- Cmake 3.26.0 -- CodeQL Action Bundles 2.12.3 2.12.4 +- Cmake 3.26.1 +- CodeQL Action Bundles 2.12.4 2.12.5 - Colima 0.5.4 - Fastlane 2.212.1 - GHC 9.6.1 - GHCup 0.1.19.2 - Jazzy 0.14.3 - Stack 2.9.3 -- SwiftFormat 0.51.2 +- SwiftFormat 0.51.3 - Swig 4.1.1 - Xcode Command Line Tools 14.2.0.0.1.1668646533 ### Linters -- SwiftLint 0.50.3 -- Yamllint 1.29.0 +- SwiftLint 0.51.0 +- Yamllint 1.30.0 ### Browsers -- Safari 16.3 (17614.4.6.11.6) -- SafariDriver 16.3 (17614.4.6.11.6) -- Google Chrome 111.0.5563.64 +- Safari 16.4 (17615.1.26.101.9) +- SafariDriver 16.4 (17615.1.26.101.9) +- Google Chrome 111.0.5563.146 - ChromeDriver 111.0.5563.64 -- Microsoft Edge 111.0.1661.44 -- Microsoft Edge WebDriver 111.0.1661.44 -- Mozilla Firefox 111.0 +- Microsoft Edge 111.0.1661.54 +- Microsoft Edge WebDriver 111.0.1661.54 +- Mozilla Firefox 111.0.1 - geckodriver 0.32.2 - Selenium server 4.8.0 @@ -174,20 +174,19 @@ - 18.15.0 #### Go -- 1.17.13 - 1.18.10 - 1.19.7 - 1.20.2 ### Rust Tools -- Cargo 1.68.0 -- Rust 1.68.0 -- Rustdoc 1.68.0 +- Cargo 1.68.2 +- Rust 1.68.2 +- Rustdoc 1.68.2 - Rustup 1.25.2 #### Packages - Bindgen 0.64.0 -- Cargo-audit 0.17.4 +- Cargo-audit 0.17.5 - Cargo-outdated 0.11.2 - Cbindgen 0.24.3 - Clippy 0.1.68 @@ -211,10 +210,10 @@ ### Xamarin #### Visual Studio for Mac -| Version | Build | Path | -| -------------- | ----------- | ------------------------------------ | -| 2019 | 8.10.25.2 | /Applications/Visual Studio 2019.app | -| 2022 (default) | 17.5.0.1802 | /Applications/Visual Studio.app | +| Version | Build | Path | +| -------------- | --------- | ------------------------------------ | +| 2019 | 8.10.25.2 | /Applications/Visual Studio 2019.app | +| 2022 (default) | 17.5.3.15 | /Applications/Visual Studio.app | ##### Notes ``` @@ -333,7 +332,7 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" | Package Name | Version | | -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | | Android Command Line Tools | 8.0 | -| Android Emulator | 32.1.11 | +| Android Emulator | 32.1.12 | | Android SDK Build-tools | 33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | | Android SDK Platforms | android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | | Android SDK Platform-Tools | 34.0.1 | @@ -357,7 +356,7 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" ### Miscellaneous - libXext 1.3.5 - libXft 2.3.7 -- Tcl/Tk 8.6.13_1 +- Tcl/Tk 8.6.13_2 - Zlib 1.2.13 #### Environment variables From 5777d37af1d4bb32f7dee1feb4669c278f39bb6c Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Mon, 10 Apr 2023 14:14:48 +0200 Subject: [PATCH 1853/3485] Fix ip address whiltelist value for hcl2 templates (#7409) --- helpers/GenerateResourcesAndImage.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helpers/GenerateResourcesAndImage.ps1 b/helpers/GenerateResourcesAndImage.ps1 index ea656b52bc23..5b3c83842344 100644 --- a/helpers/GenerateResourcesAndImage.ps1 +++ b/helpers/GenerateResourcesAndImage.ps1 @@ -264,7 +264,7 @@ Function GenerateResourcesAndImage { if ($builderScriptPath.Contains("pkr.hcl")) { if ($AgentIp) { - $AgentIp = '[ \"{0}\" ]' -f $AgentIp + $AgentIp = '[ "{0}" ]' -f $AgentIp } else { $AgentIp = "[]" } From f01bed49d57788b2de3be7db7c3d3bde9a46cdba Mon Sep 17 00:00:00 2001 From: sergei-pyshnoi <121864472+sergei-pyshnoi@users.noreply.github.com> Date: Wed, 12 Apr 2023 04:05:35 +0200 Subject: [PATCH 1854/3485] [windows] fix version mongodb (#7425) --- images/win/toolsets/toolset-2019.json | 2 +- images/win/toolsets/toolset-2022.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index c4b65e076328..9718fd121f23 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -481,7 +481,7 @@ "version": "5.7" }, "mongodb": { - "version": "5.0" + "version": "5.0.15" }, "nsis": { "version": "3.08" diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index 3c1d624fcd7a..3d76ba6b04b1 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -392,7 +392,7 @@ "version": "8.0" }, "mongodb": { - "version": "5.0" + "version": "5.0.15" }, "nsis": { "version": "3.08" From 3220eb4c1bc4469b5123fc080c8f43721b8fb14d Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Wed, 12 Apr 2023 14:32:59 +0200 Subject: [PATCH 1855/3485] Fix failure when tags are set for Ubuntu 22 generation (#7417) --- helpers/GenerateResourcesAndImage.ps1 | 18 ++++++++++++------ images/linux/ubuntu2204.pkr.hcl | 4 ++-- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/helpers/GenerateResourcesAndImage.ps1 b/helpers/GenerateResourcesAndImage.ps1 index 5b3c83842344..f6fe10adf5a0 100644 --- a/helpers/GenerateResourcesAndImage.ps1 +++ b/helpers/GenerateResourcesAndImage.ps1 @@ -268,14 +268,19 @@ Function GenerateResourcesAndImage { } else { $AgentIp = "[]" } + if (-not $Tags) { + $Tags = @{} + } } - if ($Tags) { - $builderScriptPath_temp = $builderScriptPath.Replace(".json", "-temp.json") - $packer_script = Get-Content -Path $builderScriptPath | ConvertFrom-Json - $packer_script.builders | Add-Member -Name "azure_tags" -Value $Tags -MemberType NoteProperty - $packer_script | ConvertTo-Json -Depth 3 | Out-File $builderScriptPath_temp - $builderScriptPath = $builderScriptPath_temp + if ($builderScriptPath.Contains(".json")) { + if ($Tags) { + $builderScriptPath_temp = $builderScriptPath.Replace(".json", "-temp.json") + $packer_script = Get-Content -Path $builderScriptPath | ConvertFrom-Json + $packer_script.builders | Add-Member -Name "azure_tags" -Value $Tags -MemberType NoteProperty + $packer_script | ConvertTo-Json -Depth 3 | Out-File $builderScriptPath_temp + $builderScriptPath = $builderScriptPath_temp + } } & $packerBinary build -on-error="$($OnError)" ` @@ -288,6 +293,7 @@ Function GenerateResourcesAndImage { -var "storage_account=$($storageAccountName)" ` -var "install_password=$($InstallPassword)" ` -var "allowed_inbound_ip_addresses=$($AgentIp)" ` + -var "azure_tags=$($Tags | ConvertTo-Json -Compress)" ` $builderScriptPath } catch { diff --git a/images/linux/ubuntu2204.pkr.hcl b/images/linux/ubuntu2204.pkr.hcl index 9b6e0851ad97..7a718eb60646 100644 --- a/images/linux/ubuntu2204.pkr.hcl +++ b/images/linux/ubuntu2204.pkr.hcl @@ -4,7 +4,7 @@ variable "allowed_inbound_ip_addresses" { default = [] } -variable "azure_tag" { +variable "azure_tags" { type = map(string) default = {} } @@ -171,7 +171,7 @@ source "azure-arm" "build_vhd" { vm_size = "${var.vm_size}" dynamic "azure_tag" { - for_each = var.azure_tag + for_each = var.azure_tags content { name = azure_tag.key value = azure_tag.value From 9f90e76a0cd49e3b835e746cf0d15b2c1e582bbe Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Wed, 12 Apr 2023 14:55:21 +0200 Subject: [PATCH 1856/3485] [Ubuntu] get back to normal erlang installation (#7428) --- images/linux/scripts/installers/erlang.sh | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/images/linux/scripts/installers/erlang.sh b/images/linux/scripts/installers/erlang.sh index 8e3137afaf17..229760f1f422 100644 --- a/images/linux/scripts/installers/erlang.sh +++ b/images/linux/scripts/installers/erlang.sh @@ -6,7 +6,6 @@ # Source the helpers for use with the script source $HELPER_SCRIPTS/install.sh -source $HELPER_SCRIPTS/os.sh source_list=/etc/apt/sources.list.d/eslerlang.list source_key=/usr/share/keyrings/eslerlang.gpg @@ -16,17 +15,7 @@ wget -q -O - https://packages.erlang-solutions.com/ubuntu/erlang_solutions.asc | echo "deb [signed-by=$source_key] https://packages.erlang-solutions.com/ubuntu $(lsb_release -cs) contrib" > $source_list apt-get update - -apt-get install --no-install-recommends esl-erlang || true - -# Downoloading and installing a deb file manually, ignore deptree errors -esl_url="https://packages.erlang-solutions.com/ubuntu/pool/esl-erlang_25.2.3-2~ubuntu~focal_amd64.deb" -download_with_retries $esl_url "/tmp" -dpkg -i /tmp/esl-erlang_25.2.3-2~ubuntu~focal_amd64.deb || true - -# Restore a proper deptree which brings esl-erlang back in the loop -# but eleminate unwanted X.org dependencies -apt --no-install-recommends --fix-broken install +apt-get install --no-install-recommends esl-erlang # Install rebar3 rebar3_url="https://github.com/erlang/rebar3/releases/latest/download/rebar3" From 0f4a3567b189f2f0f60582cf99bd5c62c9b8f4e1 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 13 Apr 2023 10:10:40 +0000 Subject: [PATCH 1857/3485] Updating readme file for win22 version 20230407.1 (#7416) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2022-Readme.md | 52 ++++++++++++++++---------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/images/win/Windows2022-Readme.md b/images/win/Windows2022-Readme.md index 071a6f54084b..748fff56bb8d 100644 --- a/images/win/Windows2022-Readme.md +++ b/images/win/Windows2022-Readme.md @@ -1,10 +1,10 @@ | Announcements | |-| -| [[All OSes] Go 1.17.x will be removed and 1.20.x set as default on April, 3](https://github.com/actions/runner-images/issues/7276) | +| [python2.7 will be removed from the images on May 15, 2023](https://github.com/actions/runner-images/issues/7401) | *** # Windows Server 2022 - OS Version: 10.0.20348 Build 1607 -- Image Version: 20230402.1 +- Image Version: 20230407.1 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -13,9 +13,9 @@ ### Language and Runtime - Bash 5.2.15(1)-release -- Go 1.20.2 +- Go 1.20.3 - Julia 1.8.5 -- Kotlin 1.8.10 +- Kotlin 1.8.20 - LLVM 15.0.7 - Node 18.15.0 - Perl 5.32.1 @@ -33,7 +33,7 @@ - pip 23.0.1 (python 3.9) - Pipx 1.2.0 - RubyGems 3.2.33 -- Vcpkg (build from commit 69efe9cc2) +- Vcpkg (build from commit cd5a39fc6) - Yarn 1.22.19 #### Environment variables @@ -54,18 +54,18 @@ - azcopy 10.18.0 - Bazel 6.1.1 - Bazelisk 1.13.2 -- Bicep 0.15.31 +- Bicep 0.16.1 - Cabal 3.10.1.0 -- CMake 3.26.2 -- CodeQL Action Bundles 2.12.4 2.12.5 -- Docker 23.0.2 +- CMake 3.26.3 +- CodeQL Action Bundles 2.12.5 2.12.6 +- Docker 23.0.3 - Docker Compose v1 1.29.2 - Docker Compose v2 2.17.2 - Docker-wincred 0.7.0 - ghc 9.6.1 - Git 2.40.0.windows.1 - Git LFS 3.3.0 -- ImageMagick 7.1.1-5 +- ImageMagick 7.1.1-6 - InnoSetup 6.2.2 - jq 1.6 - Kind 0.18.0 @@ -76,7 +76,7 @@ - NSIS 3.08 - OpenSSL 1.1.1t - Packer 1.8.5 -- Pulumi 3.60.1 +- Pulumi 3.62.0 - R 4.2.3 - Service Fabric SDK 9.1.1436.9590 - Stack 2.9.3 @@ -86,16 +86,16 @@ - WinAppDriver 1.2.2009.02003 - WiX Toolset 3.11.2.4516 - yamllint 1.30.0 -- zstd 1.5.4 +- zstd 1.5.5 ### CLI Tools - Alibaba Cloud CLI 3.0.161 -- AWS CLI 2.11.8 -- AWS SAM CLI 1.78.0 +- AWS CLI 2.11.10 +- AWS SAM CLI 1.79.0 - AWS Session Manager CLI 1.2.463.0 -- Azure CLI 2.46.0 +- Azure CLI 2.47.0 - Azure DevOps CLI extension 0.26.0 -- GitHub CLI 2.25.1 +- GitHub CLI 2.27.0 - Hub CLI 2.14.2 ### Rust Tools @@ -113,12 +113,12 @@ - Rustfmt 1.5.1 ### Browsers and Drivers -- Google Chrome 111.0.5563.147 -- Chrome Driver 111.0.5563.64 +- Google Chrome 112.0.5615.50 +- Chrome Driver 112.0.5615.49 - Microsoft Edge 111.0.1661.62 - Microsoft Edge Driver 111.0.1661.62 - Mozilla Firefox 111.0.1 -- Gecko Driver 0.32.2 +- Gecko Driver 0.33.0 - IE Driver 4.8.0.0 - Selenium server 4.8.0 @@ -158,8 +158,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Go - 1.18.10 -- 1.19.7 -- 1.20.2 +- 1.19.8 +- 1.20.3 #### Node.js - 14.21.3 @@ -170,8 +170,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 3.7.9 - 3.8.10 - 3.9.13 -- 3.10.10 -- 3.11.2 +- 3.10.11 +- 3.11.3 #### PyPy - 2.7.18 [PyPy 7.3.11] @@ -543,15 +543,15 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Az (Cached): 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.304 +- AWSPowershell: 4.1.308 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 - Microsoft.Graph: 1.25.0 -- Pester: 3.4.0, 5.4.0 +- Pester: 3.4.0, 5.4.1 - PowerShellGet: 1.0.0.1, 2.2.5 - PSScriptAnalyzer: 1.21.0 - PSWindowsUpdate: 2.2.0.3 -- SqlServer: 21.1.18256 +- SqlServer: 22.0.59 - VSSetup: 2.2.16 ``` Azure PowerShell module 2.1.0 and AzureRM PowerShell module 2.1.0 are installed From 2fe41b81c5571f2d6cefd554591e2fed05ac912f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 13 Apr 2023 12:19:19 +0000 Subject: [PATCH 1858/3485] Updating readme file for ubuntu20 version 20230409.1 (#7418) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2004-Readme.md | 74 +++++++++++++++---------------- 1 file changed, 35 insertions(+), 39 deletions(-) diff --git a/images/linux/Ubuntu2004-Readme.md b/images/linux/Ubuntu2004-Readme.md index 933971c89ddf..29e39500d266 100644 --- a/images/linux/Ubuntu2004-Readme.md +++ b/images/linux/Ubuntu2004-Readme.md @@ -1,12 +1,13 @@ | Announcements | |-| +| [python2.7 will be removed from the images on May 15, 2023](https://github.com/actions/runner-images/issues/7401) | | [GraalVM JDK11 will be removed from agents on April 10, 2023](https://github.com/actions/runner-images/issues/7338) | -| [[All OSes] Go 1.17.x will be removed and 1.20.x set as default on April, 3](https://github.com/actions/runner-images/issues/7276) | *** # Ubuntu 20.04 - OS Version: 20.04.6 LTS - Kernel Version: 5.15.0-1035-azure -- Image Version: 20230402.1 +- Image Version: 20230409.1 +- Systemd version: 245.4-4ubuntu3.20 ## Installed Software @@ -21,7 +22,7 @@ - GNU C++: 9.4.0, 10.3.0 - GNU Fortran: 9.4.0, 10.3.0 - Julia 1.8.5 -- Kotlin 1.8.10-release-430 +- Kotlin 1.8.20-release-327 - Mono 6.12.0.182 - MSBuild 16.10.1.31701 (Mono 6.12.0.182) - Node.js 18.15.0 @@ -34,7 +35,7 @@ ### Package Management - cpan 1.64 - Helm 3.11.2 -- Homebrew 4.0.10 +- Homebrew 4.0.11 - Miniconda 23.1.0 - Npm 9.5.0 - NuGet 6.3.1.1 @@ -42,7 +43,7 @@ - Pip3 20.0.2 - Pipx 1.2.0 - RubyGems 3.1.2 -- Vcpkg (build from commit 69efe9cc2) +- Vcpkg (build from commit 217194cea) - Yarn 1.22.19 #### Environment variables @@ -72,16 +73,16 @@ to accomplish this. - AzCopy 10.18.0 - available by `azcopy` and `azcopy10` aliases - Bazel 6.1.1 - Bazelisk 1.13.2 -- Bicep 0.15.31 +- Bicep 0.16.1 - Buildah 1.22.3 -- CMake 3.26.2 -- CodeQL Action Bundles 2.12.4 2.12.5 +- CMake 3.26.3 +- CodeQL Action Bundles 2.12.5 2.12.6 - Docker Amazon ECR Credential Helper 0.6.0 - Docker Compose v1 1.29.2 - Docker Compose v2 2.17.2+azure-1 - Docker-Buildx 0.10.4 - Docker-Moby Client 20.10.23+azure-2 -- Docker-Moby Server 20.10.23+azure-2 +- Docker-Moby Server 20.10.23+azure-3 - Fastlane 2.212.1 - Git 2.40.0 - Git LFS 3.3.0 @@ -96,7 +97,7 @@ to accomplish this. - Leiningen 2.10.0 - MediaInfo 19.09 - Mercurial 5.3.1 -- Minikube 1.29.0 +- Minikube 1.30.1 - n 9.0.1 - Newman 5.3.2 - nvm 0.39.3 @@ -105,7 +106,7 @@ to accomplish this. - Parcel 2.8.3 - PhantomJS 2.1.1 2.1.1 - Podman 3.4.2 -- Pulumi 3.60.1 +- Pulumi 3.62.0 - R 4.2.3 - Skopeo 1.5.0 - Sphinx Open Source Search Server 2.2.11 @@ -113,22 +114,22 @@ to accomplish this. - Terraform 1.4.4 - yamllint 1.30.0 - yq 4.33.2 -- zstd 1.5.4 +- zstd 1.5.5 ### CLI Tools - Alibaba Cloud CLI 3.0.161 -- AWS CLI 2.11.8 +- AWS CLI 2.11.11 - AWS CLI Session Manager Plugin 1.2.463.0 -- AWS SAM CLI 1.78.0 -- Azure CLI 2.46.0 +- AWS SAM CLI 1.79.0 +- Azure CLI 2.47.0 - Azure CLI (azure-devops) 0.26.0 -- GitHub CLI 2.25.1 -- Google Cloud SDK 424.0.0 +- GitHub CLI 2.27.0 +- Google Cloud SDK 425.0.0 - Hub CLI 2.14.2 - Netlify CLI 13.2.2 -- OpenShift CLI 4.12.9 +- OpenShift CLI 4.12.10 - ORAS CLI 1.0.0 -- Vercel CLI 28.18.3 +- Vercel CLI 28.18.4 ### Java | Version | Vendor | Environment Variable | @@ -137,11 +138,6 @@ to accomplish this. | 11.0.18+10 (default) | Eclipse Temurin | JAVA_HOME_11_X64 | | 17.0.6+10 | Eclipse Temurin | JAVA_HOME_17_X64 | -### GraalVM -| Version | Environment variables | -| --------- | --------------------- | -| CE 22.3.1 | GRAALVM_11_ROOT | - ### PHP Tools - PHP: 7.4.33, 8.0.28, 8.1.17, 8.2.4 - Composer 2.5.5 @@ -171,14 +167,14 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.5.1 ### Browsers and Drivers -- Google Chrome 111.0.5563.146 -- ChromeDriver 111.0.5563.64 -- Chromium 111.0.5547.0 -- Microsoft Edge 111.0.1661.62 -- Microsoft Edge WebDriver 111.0.1661.62 +- Google Chrome 112.0.5615.49 +- ChromeDriver 112.0.5615.49 +- Chromium 112.0.5593.0 +- Microsoft Edge 112.0.1722.34 +- Microsoft Edge WebDriver 112.0.1722.34 - Selenium server 4.8.0 -- Mozilla Firefox 111.0.1 -- Geckodriver 0.32.2 +- Mozilla Firefox 112.0 +- Geckodriver 0.33.0 #### Environment variables | Name | Value | @@ -221,8 +217,8 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Go - 1.18.10 -- 1.19.7 -- 1.20.2 +- 1.19.8 +- 1.20.3 #### Node.js - 14.21.3 @@ -235,8 +231,8 @@ Use the following command as a part of your job to start the service: 'sudo syst - 3.7.16 - 3.8.16 - 3.9.16 -- 3.10.10 -- 3.11.2 +- 3.10.11 +- 3.11.3 #### PyPy - 2.7.18 [PyPy 7.3.11] @@ -260,7 +256,7 @@ Use the following command as a part of your job to start the service: 'sudo syst - Az (Cached): 3.1.0.zip, 4.4.0.zip, 5.9.0.zip, 6.6.0.zip, 7.5.0.zip - MarkdownPS: 1.9 - Microsoft.Graph: 1.25.0 -- Pester: 5.4.0 +- Pester: 5.4.1 - PSScriptAnalyzer: 1.21.0 ### Web Servers @@ -304,15 +300,15 @@ Use the following command as a part of your job to start the service: 'sudo syst | alpine:3.16 | sha256:c2b622f6e510a0d25bccaffa9e67b75a6860cb09b74bb58cfc36a9ef4331109f | 2023-03-29 | | alpine:3.17 | sha256:124c7d2707904eea7431fffe91522a01e5a861a624ee31d03372cc1d138a3126 | 2023-03-29 | | buildpack-deps:bullseye | sha256:d2e6d0b6233d9da4534d22e96ea4338fbf36a7657b6d60aae20260140ce43148 | 2023-03-23 | -| buildpack-deps:buster | sha256:56e11e205661d628368fbcd0edee38d666d507351e5c74f2795128cd71c6f52b | 2023-03-23 | +| buildpack-deps:buster | sha256:99144e49732c842c74ab0fd2fbd24301ee490ec841fbb9c4fa3a99354e29fbec | 2023-03-23 | | buildpack-deps:stretch | sha256:78e995165a5788c2f55aed6e548d8f6c1534830d4310c870408fccb2da8c5b2e | 2022-06-23 | | debian:10 | sha256:235f2a778fbc0d668c66afa9fd5f1efabab94c1d6588779ea4e221e1496f89da | 2023-03-23 | | debian:11 | sha256:7b991788987ad860810df60927e1adbaf8e156520177bd4db82409f81dd3b721 | 2023-03-23 | | debian:9 | sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be | 2022-06-23 | | moby/buildkit:latest | sha256:ca34989052fc2467dcd283d2000c2ad8c7cd6213c5ff0fcabef1a9cfb0651b3a | 2023-03-23 | -| node:14 | sha256:a97048059988c65f974b37dfe25a44327069a0f4f81133624871de0063b98075 | 2023-03-23 | +| node:14 | sha256:cc66d3cff89973711adc900892ed37f74da3c46182992b5ac5c41c3df1ddb712 | 2023-03-23 | | node:14-alpine | sha256:434215b487a329c9e867202ff89e704d3a75e554822e07f3e0c0f9e606121b33 | 2023-03-29 | -| node:16 | sha256:051b68ed341fee26f4c08b15815ac4bff6a5351c68e7b33c66912677cc4be7ac | 2023-03-29 | +| node:16 | sha256:d70de5be007866473408af5cc39f6039d990d8d4f72ae13438b0b4f83b904b31 | 2023-03-29 | | node:16-alpine | sha256:b4a72f83f52bbe3970bb74a15e44ec4cf6e873ad4787473dfc8a26f5b4e29dd2 | 2023-03-29 | | node:18 | sha256:c21209748c829660e0b49cbd14d2f9d81ea82ffb02a8a7932ebacf70d01573a3 | 2023-03-23 | | node:18-alpine | sha256:47d97b93629d9461d64197773966cc49081cf4463b1b07de5a38b6bd5acfbe9d | 2023-03-29 | From fc3f23976bcd1e9175251427851844cfed4185e2 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 13 Apr 2023 12:27:52 +0000 Subject: [PATCH 1859/3485] Updating readme file for ubuntu22 version 20230409.1 (#7419) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2204-Readme.md | 75 +++++++++++++++---------------- 1 file changed, 35 insertions(+), 40 deletions(-) diff --git a/images/linux/Ubuntu2204-Readme.md b/images/linux/Ubuntu2204-Readme.md index 02262ef4368b..c56c12d7c5cd 100644 --- a/images/linux/Ubuntu2204-Readme.md +++ b/images/linux/Ubuntu2204-Readme.md @@ -1,13 +1,13 @@ | Announcements | |-| +| [python2.7 will be removed from the images on May 15, 2023](https://github.com/actions/runner-images/issues/7401) | | [GraalVM JDK11 will be removed from agents on April 10, 2023](https://github.com/actions/runner-images/issues/7338) | -| [[All OSes] Go 1.17.x will be removed and 1.20.x set as default on April, 3](https://github.com/actions/runner-images/issues/7276) | -| [The Ubuntu 18.04 Actions runner image will begin deprecation on 2022/08/08 and will be fully unsupported by 2023/04/03](https://github.com/actions/runner-images/issues/6002) | *** # Ubuntu 22.04 - OS Version: 22.04.2 LTS - Kernel Version: 5.15.0-1035-azure -- Image Version: 20230402.1 +- Image Version: 20230409.1 +- Systemd version: 249.11-0ubuntu3.7 ## Installed Software @@ -20,7 +20,7 @@ - GNU C++: 9.5.0, 10.4.0, 11.3.0, 12.1.0 - GNU Fortran: 9.5.0, 10.4.0, 11.3.0, 12.1.0 - Julia 1.8.5 -- Kotlin 1.8.10-release-430 +- Kotlin 1.8.20-release-327 - Mono 6.12.0.182 - MSBuild 16.10.1.31701 (Mono 6.12.0.182) - Node.js 18.15.0 @@ -33,7 +33,7 @@ ### Package Management - cpan 1.64 - Helm 3.11.2 -- Homebrew 4.0.10 +- Homebrew 4.0.11 - Miniconda 23.1.0 - Npm 9.5.0 - NuGet 6.3.1.1 @@ -41,7 +41,7 @@ - Pip3 22.0.2 - Pipx 1.2.0 - RubyGems 3.3.5 -- Vcpkg (build from commit 69efe9cc2) +- Vcpkg (build from commit 217194cea) - Yarn 1.22.19 #### Environment variables @@ -68,16 +68,16 @@ to accomplish this. - AzCopy 10.18.0 - available by `azcopy` and `azcopy10` aliases - Bazel 6.1.1 - Bazelisk 1.13.2 -- Bicep 0.15.31 +- Bicep 0.16.1 - Buildah 1.23.1 -- CMake 3.26.2 -- CodeQL Action Bundles 2.12.4 2.12.5 +- CMake 3.26.3 +- CodeQL Action Bundles 2.12.5 2.12.6 - Docker Amazon ECR Credential Helper 0.6.0 - Docker Compose v1 1.29.2 - Docker Compose v2 2.17.2+azure-1 - Docker-Buildx 0.10.4 - Docker-Moby Client 20.10.23+azure-2 -- Docker-Moby Server 20.10.23+azure-2 +- Docker-Moby Server 20.10.23+azure-3 - Fastlane 2.212.1 - Git 2.40.0 - Git LFS 3.3.0 @@ -91,7 +91,7 @@ to accomplish this. - Leiningen 2.10.0 - MediaInfo 21.09 - Mercurial 6.1.1 -- Minikube 1.29.0 +- Minikube 1.30.1 - n 9.0.1 - Newman 5.3.2 - nvm 0.39.3 @@ -99,7 +99,7 @@ to accomplish this. - Packer 1.8.6 - Parcel 2.8.3 - Podman 3.4.4 -- Pulumi 3.60.1 +- Pulumi 3.62.0 - R 4.2.3 - Skopeo 1.4.1 - Sphinx Open Source Search Server 2.2.11 @@ -107,22 +107,22 @@ to accomplish this. - Terraform 1.4.4 - yamllint 1.30.0 - yq 4.33.2 -- zstd 1.5.4 +- zstd 1.5.5 ### CLI Tools - Alibaba Cloud CLI 3.0.161 -- AWS CLI 2.11.8 +- AWS CLI 2.11.11 - AWS CLI Session Manager Plugin 1.2.463.0 -- AWS SAM CLI 1.78.0 -- Azure CLI 2.46.0 +- AWS SAM CLI 1.79.0 +- Azure CLI 2.47.0 - Azure CLI (azure-devops) 0.26.0 -- GitHub CLI 2.25.1 -- Google Cloud SDK 424.0.0 +- GitHub CLI 2.27.0 +- Google Cloud SDK 425.0.0 - Hub CLI 2.14.2 - Netlify CLI 13.2.2 -- OpenShift CLI 4.12.9 +- OpenShift CLI 4.12.10 - ORAS CLI 1.0.0 -- Vercel CLI 28.18.3 +- Vercel CLI 28.18.4 ### Java | Version | Vendor | Environment Variable | @@ -131,11 +131,6 @@ to accomplish this. | 11.0.18+10 (default) | Eclipse Temurin | JAVA_HOME_11_X64 | | 17.0.6+10 | Eclipse Temurin | JAVA_HOME_17_X64 | -### GraalVM -| Version | Environment variables | -| --------- | --------------------- | -| CE 22.3.1 | GRAALVM_11_ROOT | - ### PHP Tools - PHP: 8.1.2 - Composer 2.5.5 @@ -165,14 +160,14 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.5.1 ### Browsers and Drivers -- Google Chrome 111.0.5563.146 -- ChromeDriver 111.0.5563.64 -- Chromium 111.0.5547.0 -- Microsoft Edge 111.0.1661.62 -- Microsoft Edge WebDriver 111.0.1661.62 +- Google Chrome 112.0.5615.49 +- ChromeDriver 112.0.5615.49 +- Chromium 112.0.5593.0 +- Microsoft Edge 112.0.1722.34 +- Microsoft Edge WebDriver 112.0.1722.34 - Selenium server 4.8.0 -- Mozilla Firefox 111.0.1 -- Geckodriver 0.32.2 +- Mozilla Firefox 112.0 +- Geckodriver 0.33.0 #### Environment variables | Name | Value | @@ -214,8 +209,8 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Go - 1.18.10 -- 1.19.7 -- 1.20.2 +- 1.19.8 +- 1.20.3 #### Node.js - 14.21.3 @@ -226,8 +221,8 @@ Use the following command as a part of your job to start the service: 'sudo syst - 3.7.16 - 3.8.16 - 3.9.16 -- 3.10.10 -- 3.11.2 +- 3.10.11 +- 3.11.3 #### PyPy - 3.7.13 [PyPy 7.3.9] @@ -244,7 +239,7 @@ Use the following command as a part of your job to start the service: 'sudo syst - Az: 9.3.0 - MarkdownPS: 1.9 - Microsoft.Graph: 1.25.0 -- Pester: 5.4.0 +- Pester: 5.4.1 - PSScriptAnalyzer: 1.21.0 ### Web Servers @@ -287,13 +282,13 @@ Use the following command as a part of your job to start the service: 'sudo syst | alpine:3.16 | sha256:c2b622f6e510a0d25bccaffa9e67b75a6860cb09b74bb58cfc36a9ef4331109f | 2023-03-29 | | alpine:3.17 | sha256:124c7d2707904eea7431fffe91522a01e5a861a624ee31d03372cc1d138a3126 | 2023-03-29 | | buildpack-deps:bullseye | sha256:d2e6d0b6233d9da4534d22e96ea4338fbf36a7657b6d60aae20260140ce43148 | 2023-03-23 | -| buildpack-deps:buster | sha256:56e11e205661d628368fbcd0edee38d666d507351e5c74f2795128cd71c6f52b | 2023-03-23 | +| buildpack-deps:buster | sha256:99144e49732c842c74ab0fd2fbd24301ee490ec841fbb9c4fa3a99354e29fbec | 2023-03-23 | | debian:10 | sha256:235f2a778fbc0d668c66afa9fd5f1efabab94c1d6588779ea4e221e1496f89da | 2023-03-23 | | debian:11 | sha256:7b991788987ad860810df60927e1adbaf8e156520177bd4db82409f81dd3b721 | 2023-03-23 | | moby/buildkit:latest | sha256:ca34989052fc2467dcd283d2000c2ad8c7cd6213c5ff0fcabef1a9cfb0651b3a | 2023-03-23 | -| node:14 | sha256:a97048059988c65f974b37dfe25a44327069a0f4f81133624871de0063b98075 | 2023-03-23 | +| node:14 | sha256:cc66d3cff89973711adc900892ed37f74da3c46182992b5ac5c41c3df1ddb712 | 2023-03-23 | | node:14-alpine | sha256:434215b487a329c9e867202ff89e704d3a75e554822e07f3e0c0f9e606121b33 | 2023-03-29 | -| node:16 | sha256:051b68ed341fee26f4c08b15815ac4bff6a5351c68e7b33c66912677cc4be7ac | 2023-03-29 | +| node:16 | sha256:d70de5be007866473408af5cc39f6039d990d8d4f72ae13438b0b4f83b904b31 | 2023-03-29 | | node:16-alpine | sha256:b4a72f83f52bbe3970bb74a15e44ec4cf6e873ad4787473dfc8a26f5b4e29dd2 | 2023-03-29 | | node:18 | sha256:c21209748c829660e0b49cbd14d2f9d81ea82ffb02a8a7932ebacf70d01573a3 | 2023-03-23 | | node:18-alpine | sha256:47d97b93629d9461d64197773966cc49081cf4463b1b07de5a38b6bd5acfbe9d | 2023-03-29 | From aa082ca119e2445e17ed3663a71c9b58b73afbda Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 13 Apr 2023 22:30:19 +0000 Subject: [PATCH 1860/3485] Updating readme file for macOS-12 version 20230411.1 (#7432) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-12-Readme.md | 102 +++++++++++++++----------------- 1 file changed, 48 insertions(+), 54 deletions(-) diff --git a/images/macos/macos-12-Readme.md b/images/macos/macos-12-Readme.md index b74987897ed5..b70532fb63bd 100644 --- a/images/macos/macos-12-Readme.md +++ b/images/macos/macos-12-Readme.md @@ -1,12 +1,11 @@ | Announcements | |-| | [GraalVM JDK11 will be removed from agents on April 10, 2023](https://github.com/actions/runner-images/issues/7338) | -| [[All OSes] Go 1.17.x will be removed and 1.20.x set as default on April, 3](https://github.com/actions/runner-images/issues/7276) | *** # macOS 12 -- OS Version: macOS 12.6.4 (21G526) +- OS Version: macOS 12.6.5 (21G531) - Kernel Version: Darwin 21.6.0 -- Image Version: 20230328.1 +- Image Version: 20230411.1 ## Installed Software @@ -19,35 +18,35 @@ - GCC 12 (Homebrew GCC 12.2.0) - available by `gcc-12` alias - GNU Fortran 11 (Homebrew GCC 11.3.0) - available by `gfortran-11` alias - GNU Fortran 12 (Homebrew GCC 12.2.0) - available by `gfortran-12` alias -- Go 1.20.2 +- Go 1.20.3 - Julia 1.8.5 -- Kotlin 1.8.10-release-430 +- Kotlin 1.8.20-release-327 - Mono 6.12.0.188 - MSBuild 16.10.1.51301 (Mono 6.12.0.188) - Node.js 18.15.0 - NVM 0.39.3 -- NVM - Cached node versions: 14.21.3, 16.19.1, 18.15.0 +- NVM - Cached node versions: 14.21.3, 16.20.0, 18.15.0 - Perl 5.36.0 - PHP 8.2.4 - Python 2.7.18 -- Python3 3.11.2 +- Python3 3.11.3 - R 4.2.3 -- Ruby 3.0.5p211 +- Ruby 3.0.6p216 ### Package Management -- Bundler 2.4.10 +- Bundler 2.4.11 - Carthage 0.39.0 - CocoaPods 1.12.0 - Composer 2.5.5 -- Homebrew 4.0.10 +- Homebrew 4.0.12 - Miniconda 23.1.0 - NPM 9.5.0 - NuGet 6.3.1.1 - Pip 20.3.4 (python 2.7) - Pip3 23.0.1 (python 3.11) - Pipx 1.2.0 -- RubyGems 3.4.10 -- Vcpkg 2023 (build from commit d13e3a060) +- RubyGems 3.4.11 +- Vcpkg 2023 (build from commit dafff8267) - Yarn 1.22.19 #### Environment variables @@ -65,19 +64,19 @@ ### Utilities - 7-Zip 17.05 - aria2 1.36.0 -- azcopy 10.17.0 +- azcopy 10.18.0 - bazel 6.1.1 - bazelisk 1.16.0 - bsdtar 3.5.1 - available by 'tar' alias - Curl 8.0.1 - Git 2.40.0 - Git LFS 3.3.0 -- GitHub CLI 2.25.1 +- GitHub CLI 2.27.0 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.3 - gpg (GnuPG) 2.4.0 - Hub CLI 2.14.2 -- ImageMagick 7.1.1-5 +- ImageMagick 7.1.1-6 - jq 1.6 - mongo 5.0.15 - mongod 5.0.15 @@ -87,30 +86,30 @@ - psql (PostgreSQL) 14.7 (Homebrew) - Sox 14.4.2 - Subversion (SVN) 1.14.2 -- Switchaudio-osx 1.2.0 +- Switchaudio-osx 1.2.1 - Vagrant 2.3.4 - VirtualBox 6.1.38r153438 -- yq 4.33.1 -- zstd 1.5.4 +- yq 4.33.3 +- zstd 1.5.5 ### Tools -- App Center CLI 2.13.3 -- AWS CLI 2.11.6 -- AWS SAM CLI 1.78.0 +- App Center CLI 2.13.4 +- AWS CLI 2.11.11 +- AWS SAM CLI 1.79.0 - AWS Session Manager CLI 1.2.463.0 -- Azure CLI 2.46.0 +- Azure CLI 2.47.0 - Azure CLI (azure-devops) 0.26.0 -- Bicep CLI 0.15.31 +- Bicep CLI 0.16.1 - Cabal 3.6.2.0 -- Cmake 3.26.1 -- CodeQL Action Bundles 2.12.4 2.12.5 +- Cmake 3.26.3 +- CodeQL Action Bundles 2.12.5 2.12.6 - Colima 0.5.4 - Fastlane 2.212.1 - GHC 9.6.1 - GHCup 0.1.19.2 - Jazzy 0.14.3 - Stack 2.9.3 -- SwiftFormat 0.51.3 +- SwiftFormat 0.51.5 - Swig 4.1.1 - Xcode Command Line Tools 14.2.0.0.1.1668646533 @@ -119,20 +118,20 @@ - Yamllint 1.30.0 ### Browsers -- Safari 16.4 (17615.1.26.101.9) -- SafariDriver 16.4 (17615.1.26.101.9) -- Google Chrome 111.0.5563.146 -- ChromeDriver 111.0.5563.64 -- Microsoft Edge 111.0.1661.54 -- Microsoft Edge WebDriver 111.0.1661.54 -- Mozilla Firefox 111.0.1 -- geckodriver 0.32.2 +- Safari 16.4.1 (17615.1.26.101.10) +- SafariDriver 16.4.1 (17615.1.26.101.10) +- Google Chrome 112.0.5615.49 +- ChromeDriver 112.0.5615.49 +- Microsoft Edge 112.0.1722.39 +- Microsoft Edge WebDriver 112.0.1722.39 +- Mozilla Firefox 112.0 +- geckodriver 0.33.0 - Selenium server 4.8.0 #### Environment variables | Name | Value | | --------------- | ---------------------------------------------- | -| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/111.0.5563.64 | +| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/112.0.5615.49 | | EDGEWEBDRIVER | /usr/local/share/edge_driver | | GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | @@ -143,24 +142,19 @@ | 11.0.18+10 | Eclipse Temurin | JAVA_HOME_11_X64 | | 17.0.6+10 | Eclipse Temurin | JAVA_HOME_17_X64 | -### GraalVM -| Version | Environment variables | -| --------- | --------------------- | -| CE 22.3.1 | GRAALVM_11_ROOT | - ### Cached Tools #### Ruby -- 2.7.7 -- 3.0.5 -- 3.1.3 +- 2.7.8 +- 3.0.6 +- 3.1.4 #### Python - 3.7.16 - 3.8.16 - 3.9.16 -- 3.10.10 -- 3.11.2 +- 3.10.11 +- 3.11.3 #### PyPy - 2.7.18 [PyPy 7.3.11] @@ -170,13 +164,13 @@ #### Node.js - 14.21.3 -- 16.19.1 +- 16.20.0 - 18.15.0 #### Go - 1.18.10 -- 1.19.7 -- 1.20.2 +- 1.19.8 +- 1.20.3 ### Rust Tools - Cargo 1.68.2 @@ -185,7 +179,7 @@ - Rustup 1.25.2 #### Packages -- Bindgen 0.64.0 +- Bindgen 0.65.1 - Cargo-audit 0.17.5 - Cargo-outdated 0.11.2 - Cbindgen 0.24.3 @@ -196,16 +190,16 @@ - PowerShell 7.2.10 #### PowerShell Modules -- Az: 9.5.0 +- Az: 9.6.0 - MarkdownPS: 1.9 -- Pester: 5.4.0 +- Pester: 5.4.1 - PSScriptAnalyzer: 1.21.0 ### Web Servers | Name | Version | ConfigFile | ServiceStatus | ListenPort | | ----- | ------- | ------------------------------- | ------------- | ---------- | -| httpd | 2.4.56 | /usr/local/etc/httpd/httpd.conf | none | 80 | -| nginx | 1.23.3 | /usr/local/etc/nginx/nginx.conf | none | 80 | +| httpd | 2.4.57 | /usr/local/etc/httpd/httpd.conf | none | 80 | +| nginx | 1.23.4 | /usr/local/etc/nginx/nginx.conf | none | 80 | ### Xamarin @@ -213,7 +207,7 @@ | Version | Build | Path | | -------------- | --------- | ------------------------------------ | | 2019 | 8.10.25.2 | /Applications/Visual Studio 2019.app | -| 2022 (default) | 17.5.3.15 | /Applications/Visual Studio.app | +| 2022 (default) | 17.5.4.8 | /Applications/Visual Studio.app | ##### Notes ``` From ef281ab8c6c2aae59fee173f0c51e5ed83bd69da Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 14 Apr 2023 03:47:59 +0000 Subject: [PATCH 1861/3485] Updating readme file for win19 version 20230407.1 (#7420) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2019-Readme.md | 66 ++++++++++++++++---------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index 8a2c1e265694..da719169fcee 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -1,10 +1,10 @@ | Announcements | |-| -| [[All OSes] Go 1.17.x will be removed and 1.20.x set as default on April, 3](https://github.com/actions/runner-images/issues/7276) | +| [python2.7 will be removed from the images on May 15, 2023](https://github.com/actions/runner-images/issues/7401) | *** # Windows Server 2019 - OS Version: 10.0.17763 Build 4131 -- Image Version: 20230331.1 +- Image Version: 20230407.1 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -13,9 +13,9 @@ ### Language and Runtime - Bash 5.2.15(1)-release -- Go 1.20.2 +- Go 1.20.3 - Julia 1.8.5 -- Kotlin 1.8.10 +- Kotlin 1.8.20 - LLVM 15.0.7 - Node 18.15.0 - Perl 5.32.1 @@ -33,7 +33,7 @@ - pip 23.0.1 (python 3.7) - Pipx 1.2.0 - RubyGems 2.7.6.3 -- Vcpkg (build from commit c9f906558) +- Vcpkg (build from commit cd5a39fc6) - Yarn 1.22.19 #### Environment variables @@ -51,22 +51,22 @@ ### Tools - 7zip 22.01 - aria2 1.36.0 -- azcopy 10.17.0 +- azcopy 10.18.0 - Bazel 6.1.1 - Bazelisk 1.13.2 -- Bicep 0.15.31 +- Bicep 0.16.1 - Cabal 3.10.1.0 -- CMake 3.26.2 -- CodeQL Action Bundles 2.12.4 2.12.5 -- Docker 23.0.2 +- CMake 3.26.3 +- CodeQL Action Bundles 2.12.5 2.12.6 +- Docker 23.0.3 - Docker Compose v1 1.29.2 - Docker Compose v2 2.17.2 - Docker-wincred 0.7.0 - ghc 9.6.1 - Git 2.40.0.windows.1 - Git LFS 3.3.0 -- Google Cloud SDK 424.0.0 -- ImageMagick 7.1.1-5 +- Google Cloud SDK 425.0.0 +- ImageMagick 7.1.1-6 - InnoSetup 6.2.2 - jq 1.6 - Kind 0.18.0 @@ -78,7 +78,7 @@ - OpenSSL 1.1.1t - Packer 1.8.5 - Parcel 2.8.3 -- Pulumi 3.60.1 +- Pulumi 3.62.0 - R 4.2.3 - Service Fabric SDK 9.1.1436.9590 - Stack 2.9.3 @@ -88,17 +88,17 @@ - WinAppDriver 1.2.2009.02003 - WiX Toolset 3.11.2.4516 - yamllint 1.30.0 -- zstd 1.5.4 +- zstd 1.5.5 ### CLI Tools - Alibaba Cloud CLI 3.0.161 -- AWS CLI 2.11.6 -- AWS SAM CLI 1.78.0 +- AWS CLI 2.11.10 +- AWS SAM CLI 1.79.0 - AWS Session Manager CLI 1.2.463.0 -- Azure CLI 2.46.0 +- Azure CLI 2.47.0 - Azure DevOps CLI extension 0.26.0 - Cloud Foundry CLI 6.53.0 -- GitHub CLI 2.25.1 +- GitHub CLI 2.27.0 - Hub CLI 2.14.2 ### Rust Tools @@ -116,12 +116,12 @@ - Rustfmt 1.5.1 ### Browsers and Drivers -- Google Chrome 111.0.5563.147 -- Chrome Driver 111.0.5563.64 -- Microsoft Edge 111.0.1661.62 -- Microsoft Edge Driver 111.0.1661.54 +- Google Chrome 112.0.5615.50 +- Chrome Driver 112.0.5615.49 +- Microsoft Edge 112.0.1722.34 +- Microsoft Edge Driver 112.0.1722.34 - Mozilla Firefox 111.0.1 -- Gecko Driver 0.32.2 +- Gecko Driver 0.33.0 - IE Driver 4.8.0.0 - Selenium server 4.8.0 @@ -165,8 +165,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Go - 1.18.10 -- 1.19.7 -- 1.20.2 +- 1.19.8 +- 1.20.3 #### Node.js - 14.21.3 @@ -179,8 +179,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 3.7.9 - 3.8.10 - 3.9.13 -- 3.10.10 -- 3.11.2 +- 3.10.11 +- 3.11.3 #### PyPy - 2.7.18 [PyPy 7.3.11] @@ -193,9 +193,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 2.4.10 - 2.5.9 - 2.6.10 -- 2.7.7 -- 3.0.5 -- 3.1.3 +- 2.7.8 +- 3.0.6 +- 3.1.4 ### Databases @@ -512,15 +512,15 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Az (Cached): 1.0.0.zip, 1.6.0.zip, 2.3.2.zip, 2.6.0.zip, 3.1.0.zip, 3.5.0.zip, 3.8.0.zip, 4.3.0.zip, 4.4.0.zip, 4.7.0.zip, 5.5.0.zip, 5.9.0.zip, 6.6.0.zip, 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.303 +- AWSPowershell: 4.1.308 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 - Microsoft.Graph: 1.25.0 -- Pester: 3.4.0, 5.4.0 +- Pester: 3.4.0, 5.4.1 - PowerShellGet: 1.0.0.1, 2.2.5 - PSScriptAnalyzer: 1.21.0 - PSWindowsUpdate: 2.2.0.3 -- SqlServer: 21.1.18256 +- SqlServer: 22.0.59 - VSSetup: 2.2.16 ``` Azure PowerShell module 2.1.0 and AzureRM PowerShell module 2.1.0 are installed From 8d09f734cd25537b6a96c7b6b47a5aeefdac9324 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 14 Apr 2023 09:26:22 +0000 Subject: [PATCH 1862/3485] Updating readme file for macOS-11 version 20230411.1 (#7429) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-11-Readme.md | 102 +++++++++++++++----------------- 1 file changed, 48 insertions(+), 54 deletions(-) diff --git a/images/macos/macos-11-Readme.md b/images/macos/macos-11-Readme.md index c9bcee996be9..8f5116a3fd3d 100644 --- a/images/macos/macos-11-Readme.md +++ b/images/macos/macos-11-Readme.md @@ -1,12 +1,11 @@ | Announcements | |-| | [GraalVM JDK11 will be removed from agents on April 10, 2023](https://github.com/actions/runner-images/issues/7338) | -| [[All OSes] Go 1.17.x will be removed and 1.20.x set as default on April, 3](https://github.com/actions/runner-images/issues/7276) | *** # macOS 11 -- OS Version: macOS 11.7.5 (20G1225) +- OS Version: macOS 11.7.6 (20G1231) - Kernel Version: Darwin 20.6.0 -- Image Version: 20230328.2 +- Image Version: 20230411.1 ## Installed Software @@ -21,35 +20,35 @@ - GNU Fortran 10 (Homebrew GCC 10.4.0) - available by `gfortran-10` alias - GNU Fortran 11 (Homebrew GCC 11.3.0) - available by `gfortran-11` alias - GNU Fortran 12 (Homebrew GCC 12.2.0) - available by `gfortran-12` alias -- Go 1.20.2 +- Go 1.20.3 - Julia 1.8.5 -- Kotlin 1.8.10-release-430 +- Kotlin 1.8.20-release-327 - Mono 6.12.0.188 - MSBuild 16.10.1.51301 (Mono 6.12.0.188) - Node.js 18.15.0 - NVM 0.39.3 -- NVM - Cached node versions: 14.21.3, 16.19.1, 18.15.0 +- NVM - Cached node versions: 14.21.3, 16.20.0, 18.15.0 - Perl 5.36.0 - PHP 8.2.4 - Python 2.7.18 -- Python3 3.11.2 +- Python3 3.11.3 - R 4.2.3 -- Ruby 2.7.7p221 +- Ruby 2.7.8p225 ### Package Management -- Bundler 2.4.10 +- Bundler 2.4.11 - Carthage 0.39.0 - CocoaPods 1.12.0 - Composer 2.5.5 -- Homebrew 4.0.10 +- Homebrew 4.0.12 - Miniconda 23.1.0 - NPM 9.5.0 - NuGet 6.3.1.1 - Pip 20.3.4 (python 2.7) - Pip3 23.0.1 (python 3.11) - Pipx 1.2.0 -- RubyGems 3.4.10 -- Vcpkg 2023 (build from commit 1271068e1) +- RubyGems 3.4.11 +- Vcpkg 2023 (build from commit dafff8267) - Yarn 1.22.19 #### Environment variables @@ -67,20 +66,20 @@ ### Utilities - 7-Zip 17.05 - aria2 1.36.0 -- azcopy 10.17.0 +- azcopy 10.18.0 - bazel 6.1.1 - bazelisk 1.16.0 - bsdtar 3.3.2 - available by 'tar' alias - Curl 8.0.1 - Git 2.40.0 - Git LFS 3.3.0 -- GitHub CLI 2.25.1 +- GitHub CLI 2.27.0 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.3 - gpg (GnuPG) 2.4.0 - helm v3.11.2+g912ebc1 - Hub CLI 2.14.2 -- ImageMagick 7.1.1-5 +- ImageMagick 7.1.1-6 - jq 1.6 - mongo 5.0.15 - mongod 5.0.15 @@ -91,28 +90,28 @@ - psql (PostgreSQL) 14.7 (Homebrew) - Sox 14.4.2 - Subversion (SVN) 1.14.2 -- Switchaudio-osx 1.2.0 -- yq 4.33.1 -- zstd 1.5.4 +- Switchaudio-osx 1.2.1 +- yq 4.33.3 +- zstd 1.5.5 ### Tools -- Aliyun CLI 3.0.152 -- App Center CLI 2.13.3 -- AWS CLI 2.11.6 -- AWS SAM CLI 1.78.0 +- Aliyun CLI 3.0.160 +- App Center CLI 2.13.4 +- AWS CLI 2.11.11 +- AWS SAM CLI 1.79.0 - AWS Session Manager CLI 1.2.463.0 -- Azure CLI 2.46.0 +- Azure CLI 2.47.0 - Azure CLI (azure-devops) 0.26.0 -- Bicep CLI 0.15.31 +- Bicep CLI 0.16.1 - Cabal 3.6.2.0 -- Cmake 3.26.1 -- CodeQL Action Bundles 2.12.4 2.12.5 +- Cmake 3.26.3 +- CodeQL Action Bundles 2.12.5 2.12.6 - Fastlane 2.212.1 - GHC 9.6.1 - GHCup 0.1.19.2 - Jazzy 0.14.3 - Stack 2.9.3 -- SwiftFormat 0.51.3 +- SwiftFormat 0.51.5 - Swig 4.1.1 - Xcode Command Line Tools 13.2.0.0.1.1638488800 @@ -121,20 +120,20 @@ - Yamllint 1.30.0 ### Browsers -- Safari 16.4 (16615.1.26.101.9) -- SafariDriver 16.4 (16615.1.26.101.9) -- Google Chrome 111.0.5563.146 -- ChromeDriver 111.0.5563.64 -- Microsoft Edge 111.0.1661.54 -- Microsoft Edge WebDriver 111.0.1661.54 -- Mozilla Firefox 111.0.1 -- geckodriver 0.32.2 +- Safari 16.4.1 (16615.1.26.101.10) +- SafariDriver 16.4.1 (16615.1.26.101.10) +- Google Chrome 112.0.5615.49 +- ChromeDriver 112.0.5615.49 +- Microsoft Edge 112.0.1722.39 +- Microsoft Edge WebDriver 112.0.1722.39 +- Mozilla Firefox 112.0 +- geckodriver 0.33.0 - Selenium server 4.8.0 #### Environment variables | Name | Value | | --------------- | ---------------------------------------------- | -| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/111.0.5563.64 | +| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/112.0.5615.49 | | EDGEWEBDRIVER | /usr/local/share/edge_driver | | GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | @@ -145,27 +144,22 @@ | 11.0.18+10 | Eclipse Temurin | JAVA_HOME_11_X64 | | 17.0.6+10 | Eclipse Temurin | JAVA_HOME_17_X64 | -### GraalVM -| Version | Environment variables | -| --------- | --------------------- | -| CE 22.3.1 | GRAALVM_11_ROOT | - ### Cached Tools #### Ruby - 2.4.10 - 2.5.9 - 2.6.10 -- 2.7.7 -- 3.0.5 -- 3.1.3 +- 2.7.8 +- 3.0.6 +- 3.1.4 #### Python - 3.7.16 - 3.8.16 - 3.9.16 -- 3.10.10 -- 3.11.2 +- 3.10.11 +- 3.11.3 #### PyPy - 2.7.18 [PyPy 7.3.11] @@ -175,13 +169,13 @@ #### Node.js - 14.21.3 -- 16.19.1 +- 16.20.0 - 18.15.0 #### Go - 1.18.10 -- 1.19.7 -- 1.20.2 +- 1.19.8 +- 1.20.3 ### Rust Tools - Cargo 1.68.2 @@ -190,7 +184,7 @@ - Rustup 1.25.2 #### Packages -- Bindgen 0.64.0 +- Bindgen 0.65.1 - Cargo-audit 0.17.5 - Cargo-outdated 0.11.2 - Cbindgen 0.24.3 @@ -201,15 +195,15 @@ - PowerShell 7.2.10 #### PowerShell Modules -- Az: 9.5.0 +- Az: 9.6.0 - MarkdownPS: 1.9 -- Pester: 5.4.0 +- Pester: 5.4.1 - PSScriptAnalyzer: 1.21.0 ### Web Servers | Name | Version | ConfigFile | ServiceStatus | ListenPort | | ----- | ------- | ------------------------------- | ------------- | ---------- | -| httpd | 2.4.56 | /usr/local/etc/httpd/httpd.conf | none | 80 | +| httpd | 2.4.57 | /usr/local/etc/httpd/httpd.conf | none | 80 | | nginx | 1.23.4 | /usr/local/etc/nginx/nginx.conf | none | 80 | ### Xamarin @@ -218,7 +212,7 @@ | Version | Build | Path | | -------------- | --------- | ------------------------------------ | | 2019 | 8.10.25.2 | /Applications/Visual Studio 2019.app | -| 2022 (default) | 17.5.3.15 | /Applications/Visual Studio.app | +| 2022 (default) | 17.5.4.8 | /Applications/Visual Studio.app | ##### Notes ``` From c44e921e0bfe2d80bdeaa323923ffbb323e7e028 Mon Sep 17 00:00:00 2001 From: Allan <allandao05@gmail.com> Date: Fri, 14 Apr 2023 11:27:42 +0200 Subject: [PATCH 1863/3485] Fix typo (#7438) --- images/win/scripts/Installers/Install-Selenium.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/win/scripts/Installers/Install-Selenium.ps1 b/images/win/scripts/Installers/Install-Selenium.ps1 index 25525b50798b..0214e16c1b53 100644 --- a/images/win/scripts/Installers/Install-Selenium.ps1 +++ b/images/win/scripts/Installers/Install-Selenium.ps1 @@ -16,7 +16,7 @@ $seleniumDownloadUrl = $json.Where{-not $_.prerelease}.assets.browser_download_u Start-DownloadWithRetry -Url $seleniumDownloadUrl -Name $seleniumFileName -DownloadPath $seleniumDirectory -# Create an epmty file to retrive selenium version +# Create an empty file to retrive Selenium version $seleniumFullVersion = $seleniumDownloadUrl.Split("-")[1].Split("/")[0] New-Item -Path $seleniumDirectory -Name "$seleniumBinaryName-$seleniumFullVersion" From e23a588bad7087545dbd7dd1754f9012c185cb53 Mon Sep 17 00:00:00 2001 From: Dan Friedman <dan@thefriedmans.org> Date: Sun, 16 Apr 2023 07:25:30 -0500 Subject: [PATCH 1864/3485] Add .NET environment variables to windows image (#7400) --- images/win/scripts/Installers/Install-DotnetSDK.ps1 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/images/win/scripts/Installers/Install-DotnetSDK.ps1 b/images/win/scripts/Installers/Install-DotnetSDK.ps1 index 2fde13dec557..6b0f650a8731 100644 --- a/images/win/scripts/Installers/Install-DotnetSDK.ps1 +++ b/images/win/scripts/Installers/Install-DotnetSDK.ps1 @@ -9,6 +9,8 @@ New-Item -Path C:\Temp -Force -ItemType Directory # Set environment variables Set-SystemVariable -SystemVariable DOTNET_MULTILEVEL_LOOKUP -Value "0" +Set-SystemVariable -SystemVariable DOTNET_NOLOGO -Value "1" +Set-SystemVariable -SystemVariable DOTNET_SKIP_FIRST_TIME_EXPERIENCE -Value "1" [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor "Tls12" @@ -141,4 +143,4 @@ InstallAllValidSdks RunPostInstallationSteps InstallTools -Invoke-PesterTests -TestFile "DotnetSDK" \ No newline at end of file +Invoke-PesterTests -TestFile "DotnetSDK" From 0f2310415608223eb4141ecdbd1101d307f26b06 Mon Sep 17 00:00:00 2001 From: Per Lundberg <perlun@gmail.com> Date: Sun, 16 Apr 2023 15:26:31 +0300 Subject: [PATCH 1865/3485] README: fix typo (#7445) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 34995b955eab..05bdb94ec24d 100644 --- a/README.md +++ b/README.md @@ -116,7 +116,7 @@ We use third-party package managers to install software during the image generat | Operating system | Package manager | Third-party repos and packages | | :--- | :---: | ---: | -| Ubuntu | [APT](https://wiki.debian.org/Apt) | [Eclipse-Timurin (Adoptium)](https://packages.adoptium.net/artifactory/deb) </br> [Erlang](https://packages.erlang-solutions.com/ubuntu) </br>[Firefox](https://launchpad.net/~mozillateam/+archive/ubuntu/ppa) </br> [gcc, gfortran](https://launchpad.net/~ubuntu-toolchain-r/+archive/ubuntu/test) </br> [git](https://launchpad.net/~git-core/+archive/ubuntu/ppa) </br> [HHvm](https://dl.hhvm.com/ubuntu) </br> [PHP](https://launchpad.net/~ondrej/+archive/ubuntu/php) (Ubuntu 20 only) </br> [Mono](https://download.mono-project.com/repo/ubuntu) </br> [PostgreSQL](https://apt.postgresql.org/pub/repos/apt) </br> [R](https://cloud.r-project.org/bin/linux/ubuntu) | +| Ubuntu | [APT](https://wiki.debian.org/Apt) | [Eclipse-Temurin (Adoptium)](https://packages.adoptium.net/artifactory/deb) </br> [Erlang](https://packages.erlang-solutions.com/ubuntu) </br>[Firefox](https://launchpad.net/~mozillateam/+archive/ubuntu/ppa) </br> [gcc, gfortran](https://launchpad.net/~ubuntu-toolchain-r/+archive/ubuntu/test) </br> [git](https://launchpad.net/~git-core/+archive/ubuntu/ppa) </br> [HHvm](https://dl.hhvm.com/ubuntu) </br> [PHP](https://launchpad.net/~ondrej/+archive/ubuntu/php) (Ubuntu 20 only) </br> [Mono](https://download.mono-project.com/repo/ubuntu) </br> [PostgreSQL](https://apt.postgresql.org/pub/repos/apt) </br> [R](https://cloud.r-project.org/bin/linux/ubuntu) | | | [pipx](https://pypa.github.io/pipx) | ansible-core </br>yamllint | | Windows | [Chocolatey](https://chocolatey.org) | No third-party repos installed | | macOS | [Homebrew](https://homebrew.sh) | [aws-cli v2](https://github.com/aws/homebrew-tap) </br> [azure/bicep](https://github.com/Azure/homebrew-bicep) </br> [mongodb/brew](https://github.com/mongodb/homebrew-brew) | From 5657dec7af3b55531d12f753cbd04370357941de Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Mon, 17 Apr 2023 13:31:56 +0200 Subject: [PATCH 1866/3485] [Windows|Ubuntu] Remove obsolete workarounds (#7431) --- .../linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 | 5 +---- images/linux/scripts/base/apt.sh | 6 +----- images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 | 5 +---- 3 files changed, 3 insertions(+), 13 deletions(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 index 3f7ff567cd9f..05253245945f 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 @@ -182,10 +182,7 @@ function Get-NvmVersion { } function Get-PackerVersion { - # Packer 1.7.1 has a bug and outputs version to stderr instead of stdout https://github.com/hashicorp/packer/issues/10855 - $result = (Get-CommandResult "packer --version").Output - $packerVersion = [regex]::matches($result, "(\d+.){2}\d+").Value - return $packerVersion + return "Packer $(packer --version)" } function Get-PhantomJSVersion { diff --git a/images/linux/scripts/base/apt.sh b/images/linux/scripts/base/apt.sh index 2ddac1af1acf..f50866b554d5 100644 --- a/images/linux/scripts/base/apt.sh +++ b/images/linux/scripts/base/apt.sh @@ -31,11 +31,7 @@ EOF # Uninstall unattended-upgrades apt-get purge unattended-upgrades -# Need to limit arch for default apt repos due to -# https://github.com/actions/runner-images/issues/1961 -sed -i'' -E 's/^deb http:\/\/(azure.archive|security).ubuntu.com/deb [arch=amd64,i386] http:\/\/\1.ubuntu.com/' /etc/apt/sources.list - -echo 'APT sources limited to the actual architectures' +echo 'APT sources' cat /etc/apt/sources.list apt-get update diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 index b8837403ee50..71437bbe4ba9 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 @@ -142,10 +142,7 @@ function Get-OpenSSLVersion { } function Get-PackerVersion { - # Packer 1.7.1 has a bug and outputs version to stderr instead of stdout https://github.com/hashicorp/packer/issues/10855 - ($(cmd /c "packer --version 2>&1") | Out-String) -match "(?<version>(\d+.){2}\d+)" | Out-Null - $packerVersion = $Matches.Version - return $packerVersion + return "Packer $(packer --version)" } function Get-ParcelVersion { From 871fce1661db5689e53f1ca3a35daf04aaa46428 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Mon, 17 Apr 2023 16:42:19 +0200 Subject: [PATCH 1867/3485] Support ARM64 architecture (#7451) --- .../macos/anka/CreateCleanAnkaTemplate.ps1 | 13 ++- images.CI/macos/anka/Service.Helpers.psm1 | 103 +++++++++++++++++- 2 files changed, 107 insertions(+), 9 deletions(-) diff --git a/images.CI/macos/anka/CreateCleanAnkaTemplate.ps1 b/images.CI/macos/anka/CreateCleanAnkaTemplate.ps1 index a140c39486d1..634734b69fd5 100644 --- a/images.CI/macos/anka/CreateCleanAnkaTemplate.ps1 +++ b/images.CI/macos/anka/CreateCleanAnkaTemplate.ps1 @@ -81,8 +81,9 @@ function Invoke-SoftwareUpdate { Write-Host "`t[*] Fetching Software Updates ready to install on '$TemplateName' VM:" Show-StringWithFormat $newUpdates + $listOfNewUpdates = $($($newUpdates.Split("*")).Split("Title") | Where-Object {$_ -match "Label:"}).Replace("Label: ", '') Write-Host "`t[*] Installing Software Updates on '$TemplateName' VM:" - Install-SoftwareUpdate -HostName $ipAddress | Show-StringWithFormat + Install-SoftwareUpdate -HostName $ipAddress -listOfUpdates $listOfNewUpdates | Show-StringWithFormat # Check if Action: restart if ($newUpdates.Contains("Action: restart")) { @@ -145,10 +146,16 @@ $env:SSHUSER = $TemplateUsername $env:SSHPASS = $TemplatePassword Write-Host "`n[#1] Download macOS application installer:" -$macOSInstaller = Get-MacOSInstaller -MacOSVersion $MacOSVersion -DownloadLatestVersion $DownloadLatestVersion -BetaSearch $BetaSearch $shortMacOSVersion = Get-ShortMacOSVersion -MacOSVersion $MacOSVersion if ([string]::IsNullOrEmpty($TemplateName)) { - $TemplateName = "clean_macos_${shortMacOSVersion}_${DiskSizeGb}gb" + $osArch = $(arch) + if ($osArch -eq "arm64"){ + $macOSInstaller = Get-MacOSIPSWInstaller -MacOSVersion $MacOSVersion -DownloadLatestVersion $DownloadLatestVersion -BetaSearch $BetaSearch + $TemplateName = "clean_macos_${shortMacOSVersion}_${osArch}_${DiskSizeGb}gb" + } else { + $macOSInstaller = Get-MacOSInstaller -MacOSVersion $MacOSVersion -DownloadLatestVersion $DownloadLatestVersion -BetaSearch $BetaSearch + $TemplateName = "clean_macos_${shortMacOSVersion}_${DiskSizeGb}gb" + } } Write-Host "`n[#2] Create a VM template:" diff --git a/images.CI/macos/anka/Service.Helpers.psm1 b/images.CI/macos/anka/Service.Helpers.psm1 index 5d659d8dac4a..96a663a189d8 100644 --- a/images.CI/macos/anka/Service.Helpers.psm1 +++ b/images.CI/macos/anka/Service.Helpers.psm1 @@ -37,6 +37,84 @@ function Get-AvailableVersions { $allVersions } +function Get-AvailableIPSWVersions { + param ( + [bool] $IsBeta = $false, + [bool] $IsLatest = $true, + [string] $MacOSCodeNameOrVersion + ) + + if ($IsBeta) { + $command = { mist list installer "$MacOSCodeNameOrVersion" --include-betas --latest --export "/Applications/export.json"} + } elseif ($IsLatest) { + $command = { mist list installer "$MacOSCodeNameOrVersion" --latest --export "/Applications/export.json" } + } else { + $command = { mist list installer "$MacOSCodeNameOrVersion" --export "/Applications/export.json" } + } + + $condition = { $LASTEXITCODE -eq 0 } + Invoke-WithRetry -Command $command -BreakCondition $condition | Out-Null + $softwareList = get-content -Path "/Applications/export.json" + $turgetVersion = ($softwareList | ConvertFrom-Json).version + if ($null -eq $turgetVersion) { + Write-Host "Requested macOS '$MacOSCodeNameOrVersion' version not found in the list of available installers." + $command = { mist list installer "$($MacOSCodeNameOrVersion.split('.')[0])" } + Invoke-WithRetry -Command $command -BreakCondition $condition + exit 1 + } + return $turgetVersion +} + +function Get-MacOSIPSWInstaller { + param ( + [Parameter(Mandatory)] + [version] $MacOSVersion, + + [bool] $DownloadLatestVersion = $false, + [bool] $BetaSearch = $false + ) + + if ($MacOSVersion -eq [version] "12.0") { + $MacOSName = "macOS Monterey" + } elseif ($MacOSVersion -eq [version] "13.0") { + $MacOSName = "macOS Ventura" + } else { + $MacOSName = $MacOSVersion.ToString() + } + + + Write-Host "`t[*] Finding available full installers" + if ($DownloadLatestVersion -eq $true) { + $targetVersion = Get-AvailableIPSWVersions -IsLatest $true -MacOSCodeNameOrVersion $MacOSName + Write-host "`t[*] The 'DownloadLatestVersion' flag is set to true. Latest macOS version is '$MacOSName' - '$targetVersion' now" + } elseif ($BetaSearch -eq $true) { + $targetVersion = Get-AvailableIPSWVersions -IsBeta $true -MacOSCodeNameOrVersion $MacOSName + Write-host "`t[*] The 'BetaSearch' flag is set to true. Latestbeta macOS version is '$MacOSName' - '$targetVersion' now" + } else { + $targetVersion = Get-AvailableIPSWVersions -MacOSCodeNameOrVersion $MacOSName + Write-host "`t[*] The exact version was specified - '$MacOSName' " + } + + $installerPathPattern = "/Applications/Install ${macOSName}*.ipsw" + if (Test-Path $installerPathPattern) { + $previousInstallerPath = Get-Item -Path $installerPathPattern + Write-Host "`t[*] Removing '$previousInstallerPath' installation app before downloading the new one" + sudo rm -rf "$previousInstallerPath" + } + + # Download macOS installer + $installerDir = "/Applications/" + $installerName = "Install ${macOSName}.ipsw" + Write-Host "`t[*] Requested macOS '$targetVersion' version installer found, fetching it from mist database" + Invoke-WithRetry { mist download firmware "$targetVersion" --output-directory $installerDir --firmware-name "$installerName" } {$LASTEXITCODE -eq 0} | Out-Null + if (Test-Path "$installerDir$installerName") { + $result = "$installerDir$installerName" + } else { + Write-host "`t[*] Requested macOS '$targetVersion' version installer failed to download" + exit 1 + } + return $result +} function Get-MacOSInstaller { param ( [Parameter(Mandatory)] @@ -71,7 +149,7 @@ function Get-MacOSInstaller { Show-StringWithFormat $availableVersions exit 1 } - Show-StringWithFormat $filteredVersions + Show-StringWithFormat $filteredVersions $osVersions = $filteredVersions.OSVersion | Sort-Object {[version]$_} $MacOSVersion = $osVersions | Select-Object -Last 1 Write-Host "`t[*] The 'DownloadLatestVersion' flag is set. Latest macOS version is '$MacOSVersion' now" @@ -150,11 +228,24 @@ function Install-SoftwareUpdate { param( [Parameter(Mandatory)] [ValidateNotNullOrEmpty()] - [string] $HostName + [string] $HostName, + [array] $listOfUpdates ) - - $command = "sudo /usr/sbin/softwareupdate --all --install --restart --verbose" - Invoke-SSHPassCommand -HostName $HostName -Command $command + $osVersion = [Environment]::OSVersion + $osVersionMajorMinor = $osVersion.Version.ToString(2) + # If an update is happening on macOS 12 we will use the prepared list of updates, otherwise, we will install all updates. + if ($osVersion.Version.Major -eq "12") { + foreach ($update in $listOfUpdates){ + # Filtering updates that contain "Ventura" word + if ($update -notmatch "Ventura") { + $command = "sudo /usr/sbin/softwareupdate --restart --verbose --install $update" + Invoke-SSHPassCommand -HostName $HostName -Command $command + } + } + } else { + $command = "sudo /usr/sbin/softwareupdate --all --install --restart --verbose" + Invoke-SSHPassCommand -HostName $HostName -Command $command + } } function Invoke-SSHPassCommand { @@ -232,7 +323,7 @@ function Show-StringWithFormat { [Parameter(ValuefromPipeline)] [object] $string ) - + process { ($string | Out-String).Trim().split("`n") | ForEach-Object { Write-Host "`t $_" } } From ff9186f1dc5187a5046cbd33127810040e40e72d Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Mon, 17 Apr 2023 16:42:51 +0200 Subject: [PATCH 1868/3485] Remove vscode settings (#7448) --- .gitignore | 3 +++ .vscode/settings.json | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 .vscode/settings.json diff --git a/.gitignore b/.gitignore index e56257596ab5..c056d3befe45 100644 --- a/.gitignore +++ b/.gitignore @@ -267,6 +267,9 @@ paket-files/ .idea/ *.sln.iml +# VSCode settings +.vscode/settings.json + # CodeRush .cr/ diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index fce091bdc182..000000000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "files.trimTrailingWhitespace": false -} From bea98d07491839b4ab1963e6a0341e8cab07ae16 Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Tue, 18 Apr 2023 17:26:22 +0200 Subject: [PATCH 1869/3485] Enable exit on error immediately after download attempt (#7444) --- images/linux/scripts/helpers/install.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/images/linux/scripts/helpers/install.sh b/images/linux/scripts/helpers/install.sh index 4c5c4d9c7ab2..898d8d21ab0a 100644 --- a/images/linux/scripts/helpers/install.sh +++ b/images/linux/scripts/helpers/install.sh @@ -28,6 +28,7 @@ download_with_retries() { set +e http_code=$(eval $COMMAND) exit_code=$? + set -e if [ $http_code -eq 200 ] && [ $exit_code -eq 0 ]; then echo "Download completed" return 0 @@ -35,8 +36,6 @@ download_with_retries() { echo "Error — Either HTTP response code for '$URL' is wrong - '$http_code' or exit code is not 0 - '$exit_code'. Waiting $interval seconds before the next attempt, $retries attempts left" sleep $interval fi - # Enable exit on error back - set -e done echo "Could not download $URL" From 265af5285306ab517a6a7c15ed13c6935129e886 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Wed, 19 Apr 2023 10:49:36 +0200 Subject: [PATCH 1870/3485] Remove variable mask, add repo secrets (#7462) --- .github/workflows/macos-generation.yml | 42 +++++++------------------- .github/workflows/macos11.yml | 2 +- 2 files changed, 12 insertions(+), 32 deletions(-) diff --git a/.github/workflows/macos-generation.yml b/.github/workflows/macos-generation.yml index 1bbb94223a85..51f776f26944 100644 --- a/.github/workflows/macos-generation.yml +++ b/.github/workflows/macos-generation.yml @@ -48,31 +48,12 @@ jobs: if: ${{ github.repository_owner == 'actions' }} timeout-minutes: 1200 steps: - - uses: azure/login@v1 - with: - creds: ${{ secrets.AZURE_CREDENTIALS }} - - name: Set image variables run: | $currentDate = Get-Date -Format "yyyyMMdd" $templatePath = "${{ inputs.template_path }}" $osName = $(($templatePath.Split("/")[-1]).Split(".")[0]) $virtualMachineName = "${osName}_${currentDate}_unstable.${{ github.run_id }}.${{ github.run_attempt }}" - $GitHubFeed = az keyvault secret show -n "github-feed-token" --vault-name "${{ env.KEYVAULT }}" --query value -o tsv - $VIUserName = az keyvault secret show -n "vcenter-username-v2" --vault-name "${{ env.KEYVAULT }}" --query value -o tsv - $VIPassword = az keyvault secret show -n "vcenter-password-v2" --vault-name "${{ env.KEYVAULT }}" --query value -o tsv - $XcodeUser = az keyvault secret show -n "xcode-installation-user" --vault-name "${{ env.KEYVAULT }}" --query value -o tsv - $XcodePassword = az keyvault secret show -n "xcode-installation-password" --vault-name "${{ env.KEYVAULT }}" --query value -o tsv - echo "::add-mask::$GitHubFeed" - echo "::add-mask::$VIUserName" - echo "::add-mask::$VIPassword" - echo "::add-mask::$XcodeUser" - echo "::add-mask::$XcodePassword" - "GH_FEED=$GitHubFeed" | Out-File -Append -FilePath $env:GITHUB_ENV - "VI_USER_NAME=$VIUserName" | Out-File -Append -FilePath $env:GITHUB_ENV - "VI_PASSWORD=$VIPassword" | Out-File -Append -FilePath $env:GITHUB_ENV - "XCODE_USER=$XcodeUser" | Out-File -Append -FilePath $env:GITHUB_ENV - "XCODE_PASSWORD=$XcodePassword" | Out-File -Append -FilePath $env:GITHUB_ENV "VM_NAME=$virtualMachineName" | Out-File -Append -FilePath $env:GITHUB_ENV - name: Determine checkout type @@ -108,11 +89,10 @@ jobs: - name: Validate contributor permissions if: ${{ github.event_name == 'pull_request_target' }} run: | - [string]$contributorAllowList = "${{ vars.CONTRIBUTOR_ALLOWLIST }}" ./images.CI/macos/validate-contributor.ps1 ` -RepositoryName ${{ github.repository }} ` - -AccessToken ${{ env.GH_FEED }} ` + -AccessToken ${{ secrets.GH_FEED }} ` -SourceBranch "refs/pull/${{ github.event.pull_request.number }}/merge" ` -ContributorAllowList $contributorAllowList @@ -121,8 +101,8 @@ jobs: ./images.CI/macos/select-datastore.ps1 ` -VMName "${{ env.VM_NAME }}" ` -VIServer ${{ secrets.VISERVER_V2 }} ` - -VIUserName ${{ env.VI_USER_NAME }} ` - -VIPassword ${{ env.VI_PASSWORD }} ` + -VIUserName ${{ secrets.VI_USER_NAME }} ` + -VIPassword ${{ secrets.VI_PASSWORD }} ` -Cluster ${{ env.ESXI_CLUSTER }} - name: Build VM @@ -133,8 +113,8 @@ jobs: ) packer build -on-error=abort ` -var="vcenter_server=${{ secrets.VISERVER_V2 }}" ` - -var="vcenter_username=${{ env.VI_USER_NAME }}" ` - -var="vcenter_password=${{ env.VI_PASSWORD }}" ` + -var="vcenter_username=${{ secrets.VI_USER_NAME }}" ` + -var="vcenter_password=${{ secrets.VI_PASSWORD }}" ` -var="vcenter_datacenter=${{ env.VCENTER_DATACENTER }}" ` -var="cluster_or_esxi_host=${{ env.ESXI_CLUSTER }}" ` -var="esxi_datastore=${{ env.BUILD_DATASTORE }}" ` @@ -144,8 +124,8 @@ jobs: -var="github_api_pat=${{ secrets.GH_FEED_TOKEN }}" ` -var="build_id=${{ env.VM_NAME }}" ` -var="baseimage_name=${{ inputs.base_image_name }}" ` - -var="xcode_install_user=${{ env.XCODE_USER }}" ` - -var="xcode_install_password=${{ env.XCODE_PASSWORD }}" ` + -var="xcode_install_user=${{ secrets.XCODE_USER }}" ` + -var="xcode_install_password=${{ secrets.XCODE_PASSWORD }}" ` -color=false ` ${{ inputs.template_path }} ` | Where-Object { @@ -202,8 +182,8 @@ jobs: -VMName "${{ env.VM_NAME }}" ` -TargetDataStore "${{ inputs.target_datastore }}" ` -VIServer "${{ secrets.VISERVER_V2 }}" ` - -VIUserName "${{ env.VI_USER_NAME }}" ` - -VIPassword "${{ env.VI_PASSWORD }}" ` + -VIUserName "${{ secrets.VI_USER_NAME }}" ` + -VIPassword "${{ secrets.VI_PASSWORD }}" ` -JobStatus "${{ job.status }}" ` -CpuCount "$cpuCount" ` -CoresPerSocketCount "$coresPerSocketCount" ` @@ -215,5 +195,5 @@ jobs: ./images.CI/macos/destroy-vm.ps1 ` -VMName "${{ env.VM_NAME }}" ` -VIServer "${{ secrets.VISERVER_V2 }}" ` - -VIUserName "${{ env.VI_USER_NAME }}" ` - -VIPassword "${{ env.VI_PASSWORD }}" \ No newline at end of file + -VIUserName "${{ secrets.VI_USER_NAME }}" ` + -VIPassword "${{ secrets.VI_PASSWORD }}" \ No newline at end of file diff --git a/.github/workflows/macos11.yml b/.github/workflows/macos11.yml index 5cbcf266df5f..c9f25a2b9e7a 100644 --- a/.github/workflows/macos11.yml +++ b/.github/workflows/macos11.yml @@ -26,5 +26,5 @@ jobs: template_path: 'templates/macOS-11.json' target_datastore: 'ds-image' custom_repo: ${{ github.event.inputs.CUSTOM_REPOSITORY }} - custom_repo_hash: ${{ github.event.inputs.CUSTOM_REPOSITORY_COMMIT_HASH }} + custom_repo_commit_hash: ${{ github.event.inputs.CUSTOM_REPOSITORY_COMMIT_HASH }} secrets: inherit From 7e61c2e40dc5adff35b1d37be307d1424d075c74 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 20 Apr 2023 09:12:12 +0000 Subject: [PATCH 1871/3485] Updating readme file for ubuntu20 version 20230417.1 (#7455) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2004-Readme.md | 87 +++++++++++++++---------------- 1 file changed, 43 insertions(+), 44 deletions(-) diff --git a/images/linux/Ubuntu2004-Readme.md b/images/linux/Ubuntu2004-Readme.md index 29e39500d266..5b25497ff1df 100644 --- a/images/linux/Ubuntu2004-Readme.md +++ b/images/linux/Ubuntu2004-Readme.md @@ -1,13 +1,12 @@ | Announcements | |-| | [python2.7 will be removed from the images on May 15, 2023](https://github.com/actions/runner-images/issues/7401) | -| [GraalVM JDK11 will be removed from agents on April 10, 2023](https://github.com/actions/runner-images/issues/7338) | *** # Ubuntu 20.04 - OS Version: 20.04.6 LTS - Kernel Version: 5.15.0-1035-azure -- Image Version: 20230409.1 -- Systemd version: 245.4-4ubuntu3.20 +- Image Version: 20230417.1 +- Systemd version: 245.4-4ubuntu3.21 ## Installed Software @@ -17,7 +16,7 @@ - Clang-format: 10.0.0, 11.0.0, 12.0.0 - Clang-tidy: 10.0.0, 11.0.0, 12.0.0 - Dash 0.5.10.2-6 -- Erlang 25.2.3 (Eshell 13.1.5) +- Erlang 25.3 (Eshell 13.2) - Erlang rebar3 3.20.0 - GNU C++: 9.4.0, 10.3.0 - GNU Fortran: 9.4.0, 10.3.0 @@ -25,7 +24,7 @@ - Kotlin 1.8.20-release-327 - Mono 6.12.0.182 - MSBuild 16.10.1.31701 (Mono 6.12.0.182) -- Node.js 18.15.0 +- Node.js 18.16.0 - Perl 5.30.0 - Python 3.8.10 - Python3 3.8.10 @@ -34,16 +33,16 @@ ### Package Management - cpan 1.64 -- Helm 3.11.2 -- Homebrew 4.0.11 +- Helm 3.11.3 +- Homebrew 4.0.14 - Miniconda 23.1.0 -- Npm 9.5.0 +- Npm 9.5.1 - NuGet 6.3.1.1 - Pip 20.0.2 - Pip3 20.0.2 - Pipx 1.2.0 - RubyGems 3.1.2 -- Vcpkg (build from commit 217194cea) +- Vcpkg (build from commit 305fa7375) - Yarn 1.22.19 #### Environment variables @@ -62,7 +61,7 @@ to accomplish this. ### Project Management - Ant 1.10.7 -- Gradle 8.0.2 +- Gradle 8.1 - Lerna 6.6.1 - Maven 3.8.8 - Sbt 1.8.2 @@ -73,7 +72,7 @@ to accomplish this. - AzCopy 10.18.0 - available by `azcopy` and `azcopy10` aliases - Bazel 6.1.1 - Bazelisk 1.13.2 -- Bicep 0.16.1 +- Bicep 0.16.2 - Buildah 1.22.3 - CMake 3.26.3 - CodeQL Action Bundles 2.12.5 2.12.6 @@ -83,7 +82,7 @@ to accomplish this. - Docker-Buildx 0.10.4 - Docker-Moby Client 20.10.23+azure-2 - Docker-Moby Server 20.10.23+azure-3 -- Fastlane 2.212.1 +- Fastlane 2.212.2 - Git 2.40.0 - Git LFS 3.3.0 - Git-ftp 1.6.0 @@ -92,44 +91,44 @@ to accomplish this. - HHVM (HipHop VM) 4.172.1 - jq 1.6 - Kind 0.18.0 -- Kubectl 1.26.3 +- Kubectl 1.27.1 - Kustomize 5.0.1 - Leiningen 2.10.0 - MediaInfo 19.09 - Mercurial 5.3.1 - Minikube 1.30.1 -- n 9.0.1 +- n 9.1.0 - Newman 5.3.2 - nvm 0.39.3 - OpenSSL 1.1.1f-1ubuntu2.17 -- Packer 1.8.6 +- Packer Packer 1.8.6 - Parcel 2.8.3 - PhantomJS 2.1.1 2.1.1 - Podman 3.4.2 -- Pulumi 3.62.0 +- Pulumi 3.63.0 - R 4.2.3 - Skopeo 1.5.0 - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 -- Terraform 1.4.4 +- Terraform 1.4.5 - yamllint 1.30.0 -- yq 4.33.2 +- yq 4.33.3 - zstd 1.5.5 ### CLI Tools - Alibaba Cloud CLI 3.0.161 -- AWS CLI 2.11.11 +- AWS CLI 2.11.13 - AWS CLI Session Manager Plugin 1.2.463.0 -- AWS SAM CLI 1.79.0 +- AWS SAM CLI 1.80.0 - Azure CLI 2.47.0 - Azure CLI (azure-devops) 0.26.0 - GitHub CLI 2.27.0 -- Google Cloud SDK 425.0.0 +- Google Cloud SDK 426.0.0 - Hub CLI 2.14.2 -- Netlify CLI 13.2.2 -- OpenShift CLI 4.12.10 +- Netlify CLI 14.0.0 +- OpenShift CLI 4.12.12 - ORAS CLI 1.0.0 -- Vercel CLI 28.18.4 +- Vercel CLI 28.18.5 ### Java | Version | Vendor | Environment Variable | @@ -139,7 +138,7 @@ to accomplish this. | 17.0.6+10 | Eclipse Temurin | JAVA_HOME_17_X64 | ### PHP Tools -- PHP: 7.4.33, 8.0.28, 8.1.17, 8.2.4 +- PHP: 7.4.33, 8.0.28, 8.1.18, 8.2.5 - Composer 2.5.5 - PHPUnit 8.5.33 ``` @@ -159,7 +158,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustup 1.25.2 #### Packages -- Bindgen 0.64.0 +- Bindgen 0.65.1 - Cargo audit 0.17.5 - Cargo clippy 0.1.68 - Cargo outdated 0.11.2 @@ -167,13 +166,13 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.5.1 ### Browsers and Drivers -- Google Chrome 112.0.5615.49 +- Google Chrome 112.0.5615.121 - ChromeDriver 112.0.5615.49 - Chromium 112.0.5593.0 -- Microsoft Edge 112.0.1722.34 -- Microsoft Edge WebDriver 112.0.1722.34 +- Microsoft Edge 112.0.1722.48 +- Microsoft Edge WebDriver 112.0.1722.48 - Selenium server 4.8.0 -- Mozilla Firefox 112.0 +- Mozilla Firefox 112.0.1 - Geckodriver 0.33.0 #### Environment variables @@ -185,11 +184,11 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | ### .NET Tools -- .NET Core SDK: 3.1.120, 3.1.202, 3.1.302, 3.1.426, 6.0.407, 7.0.104, 7.0.202 +- .NET Core SDK: 3.1.120, 3.1.202, 3.1.302, 3.1.426, 6.0.408, 7.0.105, 7.0.203 - nbgv 3.5.119+5d25f54fec ### Databases -- MongoDB 5.0.15 +- MongoDB 5.0.16 - sqlite3 3.31.1 #### PostgreSQL @@ -223,7 +222,7 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Node.js - 14.21.3 - 16.20.0 -- 18.15.0 +- 18.16.0 #### Python - 2.7.18 @@ -249,7 +248,7 @@ Use the following command as a part of your job to start the service: 'sudo syst - 3.1.4 ### PowerShell Tools -- PowerShell 7.2.10 +- PowerShell 7.2.11 #### PowerShell Modules - Az: 9.3.0 @@ -299,19 +298,19 @@ Use the following command as a part of your job to start the service: 'sudo syst | alpine:3.15 | sha256:ecbdce53b2c2f43ab1b19418bcbd3f120a23547d9497030c8d978114512b883e | 2023-03-29 | | alpine:3.16 | sha256:c2b622f6e510a0d25bccaffa9e67b75a6860cb09b74bb58cfc36a9ef4331109f | 2023-03-29 | | alpine:3.17 | sha256:124c7d2707904eea7431fffe91522a01e5a861a624ee31d03372cc1d138a3126 | 2023-03-29 | -| buildpack-deps:bullseye | sha256:d2e6d0b6233d9da4534d22e96ea4338fbf36a7657b6d60aae20260140ce43148 | 2023-03-23 | -| buildpack-deps:buster | sha256:99144e49732c842c74ab0fd2fbd24301ee490ec841fbb9c4fa3a99354e29fbec | 2023-03-23 | +| buildpack-deps:bullseye | sha256:695fd9e1f58574422eece085006690b3110abb0d304260024d40775b95c6056e | 2023-04-12 | +| buildpack-deps:buster | sha256:5c2114d327b0e2a38de4e3dcf5fa304e4da23264a1e77643632d0a25325d7e2d | 2023-04-12 | | buildpack-deps:stretch | sha256:78e995165a5788c2f55aed6e548d8f6c1534830d4310c870408fccb2da8c5b2e | 2022-06-23 | -| debian:10 | sha256:235f2a778fbc0d668c66afa9fd5f1efabab94c1d6588779ea4e221e1496f89da | 2023-03-23 | -| debian:11 | sha256:7b991788987ad860810df60927e1adbaf8e156520177bd4db82409f81dd3b721 | 2023-03-23 | +| debian:10 | sha256:173f0b19d2ac5ee17194dbe9a888a4a617dbf905ee666c9e780afad55eaf1d8c | 2023-04-12 | +| debian:11 | sha256:0a78ed641b76252739e28ebbbe8cdbd80dc367fba4502565ca839e5803cfd86e | 2023-04-12 | | debian:9 | sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be | 2022-06-23 | | moby/buildkit:latest | sha256:ca34989052fc2467dcd283d2000c2ad8c7cd6213c5ff0fcabef1a9cfb0651b3a | 2023-03-23 | -| node:14 | sha256:cc66d3cff89973711adc900892ed37f74da3c46182992b5ac5c41c3df1ddb712 | 2023-03-23 | +| node:14 | sha256:a158d3b9b4e3fa813fa6c8c590b8f0a860e015ad4e59bbce5744d2f6fd8461aa | 2023-04-12 | | node:14-alpine | sha256:434215b487a329c9e867202ff89e704d3a75e554822e07f3e0c0f9e606121b33 | 2023-03-29 | -| node:16 | sha256:d70de5be007866473408af5cc39f6039d990d8d4f72ae13438b0b4f83b904b31 | 2023-03-29 | +| node:16 | sha256:241f152c0dc9d3efcbd6a4426f52dc50fa78f3a63cff55b2419dc2bf48efe705 | 2023-04-12 | | node:16-alpine | sha256:b4a72f83f52bbe3970bb74a15e44ec4cf6e873ad4787473dfc8a26f5b4e29dd2 | 2023-03-29 | -| node:18 | sha256:c21209748c829660e0b49cbd14d2f9d81ea82ffb02a8a7932ebacf70d01573a3 | 2023-03-23 | -| node:18-alpine | sha256:47d97b93629d9461d64197773966cc49081cf4463b1b07de5a38b6bd5acfbe9d | 2023-03-29 | +| node:18 | sha256:671ee8d49ce2a691fc3082203c5deb9522e0c80042aa0ff40c07f4a25e63668a | 2023-04-13 | +| node:18-alpine | sha256:ca5d399560a9d239cbfa28eec00417f1505e5e108f3ec6938d230767eaa81f61 | 2023-04-13 | | ubuntu:16.04 | sha256:1f1a2d56de1d604801a9671f301190704c25d604a416f59e03c04f5c6ffee0d6 | 2021-08-31 | | ubuntu:18.04 | sha256:8aa9c2798215f99544d1ce7439ea9c3a6dfd82de607da1cec3a8a2fae005931b | 2023-03-08 | | ubuntu:20.04 | sha256:24a0df437301598d1a4b62ddf59fa0ed2969150d70d748c84225e6501e9c36b9 | 2023-03-08 | @@ -385,14 +384,14 @@ Use the following command as a part of your job to start the service: 'sudo syst | ssh | 1:8.2p1-4ubuntu0.5 | | sshpass | 1.06-1 | | subversion | 1.13.0-3ubuntu0.2 | -| sudo | 1.8.31-1ubuntu1.4 | +| sudo | 1.8.31-1ubuntu1.5 | | swig | 4.0.1-5build1 | | tar | 1.30+dfsg-7ubuntu0.20.04.3 | | telnet | 0.17-41.2build1 | | texinfo | 6.7.0.dfsg.2-5 | | time | 1.7-25.1build1 | | tk | 8.6.9+1 | -| tzdata | 2022g-0ubuntu0.20.04.1 | +| tzdata | 2023c-0ubuntu0.20.04.0 | | unzip | 6.0-25ubuntu1.1 | | upx | 3.95-2build1 | | wget | 1.20.3-1ubuntu2 | From af6dd20503a81e3397993a43c30955c40ea7a248 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 20 Apr 2023 10:20:30 +0000 Subject: [PATCH 1872/3485] Updating readme file for ubuntu22 version 20230417.1 (#7457) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2204-Readme.md | 81 +++++++++++++++---------------- 1 file changed, 40 insertions(+), 41 deletions(-) diff --git a/images/linux/Ubuntu2204-Readme.md b/images/linux/Ubuntu2204-Readme.md index c56c12d7c5cd..e3099cf643f8 100644 --- a/images/linux/Ubuntu2204-Readme.md +++ b/images/linux/Ubuntu2204-Readme.md @@ -1,13 +1,12 @@ | Announcements | |-| | [python2.7 will be removed from the images on May 15, 2023](https://github.com/actions/runner-images/issues/7401) | -| [GraalVM JDK11 will be removed from agents on April 10, 2023](https://github.com/actions/runner-images/issues/7338) | *** # Ubuntu 22.04 - OS Version: 22.04.2 LTS - Kernel Version: 5.15.0-1035-azure -- Image Version: 20230409.1 -- Systemd version: 249.11-0ubuntu3.7 +- Image Version: 20230417.1 +- Systemd version: 249.11-0ubuntu3.9 ## Installed Software @@ -23,7 +22,7 @@ - Kotlin 1.8.20-release-327 - Mono 6.12.0.182 - MSBuild 16.10.1.31701 (Mono 6.12.0.182) -- Node.js 18.15.0 +- Node.js 18.16.0 - Perl 5.34.0 - Python 3.10.6 - Python3 3.10.6 @@ -32,16 +31,16 @@ ### Package Management - cpan 1.64 -- Helm 3.11.2 -- Homebrew 4.0.11 +- Helm 3.11.3 +- Homebrew 4.0.14 - Miniconda 23.1.0 -- Npm 9.5.0 +- Npm 9.5.1 - NuGet 6.3.1.1 - Pip 22.0.2 - Pip3 22.0.2 - Pipx 1.2.0 - RubyGems 3.3.5 -- Vcpkg (build from commit 217194cea) +- Vcpkg (build from commit 305fa7375) - Yarn 1.22.19 #### Environment variables @@ -68,7 +67,7 @@ to accomplish this. - AzCopy 10.18.0 - available by `azcopy` and `azcopy10` aliases - Bazel 6.1.1 - Bazelisk 1.13.2 -- Bicep 0.16.1 +- Bicep 0.16.2 - Buildah 1.23.1 - CMake 3.26.3 - CodeQL Action Bundles 2.12.5 2.12.6 @@ -78,7 +77,7 @@ to accomplish this. - Docker-Buildx 0.10.4 - Docker-Moby Client 20.10.23+azure-2 - Docker-Moby Server 20.10.23+azure-3 -- Fastlane 2.212.1 +- Fastlane 2.212.2 - Git 2.40.0 - Git LFS 3.3.0 - Git-ftp 1.6.0 @@ -86,43 +85,43 @@ to accomplish this. - Heroku 7.69.1 - jq 1.6 - Kind 0.18.0 -- Kubectl 1.26.3 +- Kubectl 1.27.1 - Kustomize 5.0.1 - Leiningen 2.10.0 - MediaInfo 21.09 - Mercurial 6.1.1 - Minikube 1.30.1 -- n 9.0.1 +- n 9.1.0 - Newman 5.3.2 - nvm 0.39.3 - OpenSSL 3.0.2-0ubuntu1.8 -- Packer 1.8.6 +- Packer Packer 1.8.6 - Parcel 2.8.3 - Podman 3.4.4 -- Pulumi 3.62.0 +- Pulumi 3.63.0 - R 4.2.3 - Skopeo 1.4.1 - Sphinx Open Source Search Server 2.2.11 - SVN 1.14.1 -- Terraform 1.4.4 +- Terraform 1.4.5 - yamllint 1.30.0 -- yq 4.33.2 +- yq 4.33.3 - zstd 1.5.5 ### CLI Tools - Alibaba Cloud CLI 3.0.161 -- AWS CLI 2.11.11 +- AWS CLI 2.11.13 - AWS CLI Session Manager Plugin 1.2.463.0 -- AWS SAM CLI 1.79.0 +- AWS SAM CLI 1.80.0 - Azure CLI 2.47.0 - Azure CLI (azure-devops) 0.26.0 - GitHub CLI 2.27.0 -- Google Cloud SDK 425.0.0 +- Google Cloud SDK 426.0.0 - Hub CLI 2.14.2 -- Netlify CLI 13.2.2 -- OpenShift CLI 4.12.10 +- Netlify CLI 14.0.0 +- OpenShift CLI 4.12.12 - ORAS CLI 1.0.0 -- Vercel CLI 28.18.4 +- Vercel CLI 28.18.5 ### Java | Version | Vendor | Environment Variable | @@ -152,7 +151,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustup 1.25.2 #### Packages -- Bindgen 0.64.0 +- Bindgen 0.65.1 - Cargo audit 0.17.5 - Cargo clippy 0.1.68 - Cargo outdated 0.11.2 @@ -160,13 +159,13 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.5.1 ### Browsers and Drivers -- Google Chrome 112.0.5615.49 +- Google Chrome 112.0.5615.121 - ChromeDriver 112.0.5615.49 - Chromium 112.0.5593.0 -- Microsoft Edge 112.0.1722.34 -- Microsoft Edge WebDriver 112.0.1722.34 +- Microsoft Edge 112.0.1722.48 +- Microsoft Edge WebDriver 112.0.1722.48 - Selenium server 4.8.0 -- Mozilla Firefox 112.0 +- Mozilla Firefox 112.0.1 - Geckodriver 0.33.0 #### Environment variables @@ -178,7 +177,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | ### .NET Tools -- .NET Core SDK: 6.0.407, 7.0.104, 7.0.202 +- .NET Core SDK: 6.0.408, 7.0.105, 7.0.203 - nbgv 3.5.119+5d25f54fec ### Databases @@ -215,7 +214,7 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Node.js - 14.21.3 - 16.20.0 -- 18.15.0 +- 18.16.0 #### Python - 3.7.16 @@ -233,7 +232,7 @@ Use the following command as a part of your job to start the service: 'sudo syst - 3.1.4 ### PowerShell Tools -- PowerShell 7.2.10 +- PowerShell 7.2.11 #### PowerShell Modules - Az: 9.3.0 @@ -281,17 +280,17 @@ Use the following command as a part of your job to start the service: 'sudo syst | alpine:3.15 | sha256:ecbdce53b2c2f43ab1b19418bcbd3f120a23547d9497030c8d978114512b883e | 2023-03-29 | | alpine:3.16 | sha256:c2b622f6e510a0d25bccaffa9e67b75a6860cb09b74bb58cfc36a9ef4331109f | 2023-03-29 | | alpine:3.17 | sha256:124c7d2707904eea7431fffe91522a01e5a861a624ee31d03372cc1d138a3126 | 2023-03-29 | -| buildpack-deps:bullseye | sha256:d2e6d0b6233d9da4534d22e96ea4338fbf36a7657b6d60aae20260140ce43148 | 2023-03-23 | -| buildpack-deps:buster | sha256:99144e49732c842c74ab0fd2fbd24301ee490ec841fbb9c4fa3a99354e29fbec | 2023-03-23 | -| debian:10 | sha256:235f2a778fbc0d668c66afa9fd5f1efabab94c1d6588779ea4e221e1496f89da | 2023-03-23 | -| debian:11 | sha256:7b991788987ad860810df60927e1adbaf8e156520177bd4db82409f81dd3b721 | 2023-03-23 | +| buildpack-deps:bullseye | sha256:695fd9e1f58574422eece085006690b3110abb0d304260024d40775b95c6056e | 2023-04-12 | +| buildpack-deps:buster | sha256:5c2114d327b0e2a38de4e3dcf5fa304e4da23264a1e77643632d0a25325d7e2d | 2023-04-12 | +| debian:10 | sha256:173f0b19d2ac5ee17194dbe9a888a4a617dbf905ee666c9e780afad55eaf1d8c | 2023-04-12 | +| debian:11 | sha256:0a78ed641b76252739e28ebbbe8cdbd80dc367fba4502565ca839e5803cfd86e | 2023-04-12 | | moby/buildkit:latest | sha256:ca34989052fc2467dcd283d2000c2ad8c7cd6213c5ff0fcabef1a9cfb0651b3a | 2023-03-23 | -| node:14 | sha256:cc66d3cff89973711adc900892ed37f74da3c46182992b5ac5c41c3df1ddb712 | 2023-03-23 | +| node:14 | sha256:a158d3b9b4e3fa813fa6c8c590b8f0a860e015ad4e59bbce5744d2f6fd8461aa | 2023-04-12 | | node:14-alpine | sha256:434215b487a329c9e867202ff89e704d3a75e554822e07f3e0c0f9e606121b33 | 2023-03-29 | -| node:16 | sha256:d70de5be007866473408af5cc39f6039d990d8d4f72ae13438b0b4f83b904b31 | 2023-03-29 | +| node:16 | sha256:241f152c0dc9d3efcbd6a4426f52dc50fa78f3a63cff55b2419dc2bf48efe705 | 2023-04-12 | | node:16-alpine | sha256:b4a72f83f52bbe3970bb74a15e44ec4cf6e873ad4787473dfc8a26f5b4e29dd2 | 2023-03-29 | -| node:18 | sha256:c21209748c829660e0b49cbd14d2f9d81ea82ffb02a8a7932ebacf70d01573a3 | 2023-03-23 | -| node:18-alpine | sha256:47d97b93629d9461d64197773966cc49081cf4463b1b07de5a38b6bd5acfbe9d | 2023-03-29 | +| node:18 | sha256:671ee8d49ce2a691fc3082203c5deb9522e0c80042aa0ff40c07f4a25e63668a | 2023-04-13 | +| node:18-alpine | sha256:ca5d399560a9d239cbfa28eec00417f1505e5e108f3ec6938d230767eaa81f61 | 2023-04-13 | | ubuntu:18.04 | sha256:8aa9c2798215f99544d1ce7439ea9c3a6dfd82de607da1cec3a8a2fae005931b | 2023-03-08 | | ubuntu:20.04 | sha256:24a0df437301598d1a4b62ddf59fa0ed2969150d70d748c84225e6501e9c36b9 | 2023-03-08 | | ubuntu:22.04 | sha256:67211c14fa74f070d27cc59d69a7fa9aeff8e28ea118ef3babc295a0428a6d21 | 2023-03-08 | @@ -367,19 +366,19 @@ Use the following command as a part of your job to start the service: 'sudo syst | ssh | 1:8.9p1-3ubuntu0.1 | | sshpass | 1.09-1 | | subversion | 1.14.1-3ubuntu0.22.04.1 | -| sudo | 1.9.9-1ubuntu2.3 | +| sudo | 1.9.9-1ubuntu2.4 | | swig | 4.0.2-1ubuntu1 | | tar | 1.34+dfsg-1ubuntu0.1.22.04.1 | | telnet | 0.17-44build1 | | texinfo | 6.8-4build1 | | time | 1.9-0.1build2 | | tk | 8.6.11+1build2 | -| tzdata | 2022g-0ubuntu0.22.04.1 | +| tzdata | 2023c-0ubuntu0.22.04.0 | | unzip | 6.0-26ubuntu3.1 | | upx | 3.96-3 | | wget | 1.21.2-2ubuntu1 | | xorriso | 1.5.4-2 | -| xvfb | 2:21.1.3-2ubuntu2.9 | +| xvfb | 2:21.1.4-2ubuntu1.7\~22.04.1 | | xz-utils | 5.2.5-2ubuntu1 | | zip | 3.0-12build2 | | zsync | 0.6.2-3ubuntu1 | From e404b252b197d85d8305ef8781ec726e63e217bc Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 21 Apr 2023 08:06:57 +0000 Subject: [PATCH 1873/3485] Updating readme file for macOS-12 version 20230416.1 (#7458) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-12-Readme.md | 46 +++++++++++++++------------------ 1 file changed, 21 insertions(+), 25 deletions(-) diff --git a/images/macos/macos-12-Readme.md b/images/macos/macos-12-Readme.md index b70532fb63bd..2efca4274f92 100644 --- a/images/macos/macos-12-Readme.md +++ b/images/macos/macos-12-Readme.md @@ -1,16 +1,12 @@ -| Announcements | -|-| -| [GraalVM JDK11 will be removed from agents on April 10, 2023](https://github.com/actions/runner-images/issues/7338) | -*** # macOS 12 - OS Version: macOS 12.6.5 (21G531) - Kernel Version: Darwin 21.6.0 -- Image Version: 20230411.1 +- Image Version: 20230416.1 ## Installed Software ### Language and Runtime -- .NET Core SDK: 3.1.101, 3.1.201, 3.1.302, 3.1.426, 6.0.407, 7.0.102, 7.0.202 +- .NET Core SDK: 3.1.101, 3.1.201, 3.1.302, 3.1.426, 6.0.408, 7.0.102, 7.0.203 - Bash 3.2.57(1)-release - Clang/LLVM 14.0.0 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` @@ -23,30 +19,30 @@ - Kotlin 1.8.20-release-327 - Mono 6.12.0.188 - MSBuild 16.10.1.51301 (Mono 6.12.0.188) -- Node.js 18.15.0 +- Node.js 18.16.0 - NVM 0.39.3 -- NVM - Cached node versions: 14.21.3, 16.20.0, 18.15.0 +- NVM - Cached node versions: 14.21.3, 16.20.0, 18.16.0 - Perl 5.36.0 -- PHP 8.2.4 +- PHP 8.2.5 - Python 2.7.18 - Python3 3.11.3 - R 4.2.3 - Ruby 3.0.6p216 ### Package Management -- Bundler 2.4.11 +- Bundler 2.4.12 - Carthage 0.39.0 - CocoaPods 1.12.0 - Composer 2.5.5 -- Homebrew 4.0.12 +- Homebrew 4.0.13 - Miniconda 23.1.0 -- NPM 9.5.0 +- NPM 9.5.1 - NuGet 6.3.1.1 - Pip 20.3.4 (python 2.7) -- Pip3 23.0.1 (python 3.11) +- Pip3 23.1 (python 3.11) - Pipx 1.2.0 -- RubyGems 3.4.11 -- Vcpkg 2023 (build from commit dafff8267) +- RubyGems 3.4.12 +- Vcpkg 2023 (build from commit 501db0f17) - Yarn 1.22.19 #### Environment variables @@ -58,7 +54,7 @@ ### Project Management - Apache Ant 1.10.13 - Apache Maven 3.9.1 -- Gradle 8.0.2 +- Gradle 8.1 - Sbt 1.8.2 ### Utilities @@ -94,22 +90,22 @@ ### Tools - App Center CLI 2.13.4 -- AWS CLI 2.11.11 +- AWS CLI 2.11.13 - AWS SAM CLI 1.79.0 - AWS Session Manager CLI 1.2.463.0 - Azure CLI 2.47.0 - Azure CLI (azure-devops) 0.26.0 -- Bicep CLI 0.16.1 +- Bicep CLI 0.16.2 - Cabal 3.6.2.0 - Cmake 3.26.3 - CodeQL Action Bundles 2.12.5 2.12.6 - Colima 0.5.4 -- Fastlane 2.212.1 +- Fastlane 2.212.2 - GHC 9.6.1 - GHCup 0.1.19.2 - Jazzy 0.14.3 - Stack 2.9.3 -- SwiftFormat 0.51.5 +- SwiftFormat 0.51.6 - Swig 4.1.1 - Xcode Command Line Tools 14.2.0.0.1.1668646533 @@ -120,10 +116,10 @@ ### Browsers - Safari 16.4.1 (17615.1.26.101.10) - SafariDriver 16.4.1 (17615.1.26.101.10) -- Google Chrome 112.0.5615.49 +- Google Chrome 112.0.5615.121 - ChromeDriver 112.0.5615.49 -- Microsoft Edge 112.0.1722.39 -- Microsoft Edge WebDriver 112.0.1722.39 +- Microsoft Edge 112.0.1722.48 +- Microsoft Edge WebDriver 112.0.1722.48 - Mozilla Firefox 112.0 - geckodriver 0.33.0 - Selenium server 4.8.0 @@ -165,7 +161,7 @@ #### Node.js - 14.21.3 - 16.20.0 -- 18.15.0 +- 18.16.0 #### Go - 1.18.10 @@ -187,7 +183,7 @@ - Rustfmt 1.5.1-stable ### PowerShell Tools -- PowerShell 7.2.10 +- PowerShell 7.2.11 #### PowerShell Modules - Az: 9.6.0 From 1330d64b2286d0f8ee3ace5c6c54d5899444cae5 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 21 Apr 2023 17:04:06 +0000 Subject: [PATCH 1874/3485] Updating readme file for macOS-11 version 20230416.1 (#7459) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-11-Readme.md | 50 +++++++++++++++------------------ 1 file changed, 23 insertions(+), 27 deletions(-) diff --git a/images/macos/macos-11-Readme.md b/images/macos/macos-11-Readme.md index 8f5116a3fd3d..5b7eb4a669d5 100644 --- a/images/macos/macos-11-Readme.md +++ b/images/macos/macos-11-Readme.md @@ -1,16 +1,12 @@ -| Announcements | -|-| -| [GraalVM JDK11 will be removed from agents on April 10, 2023](https://github.com/actions/runner-images/issues/7338) | -*** # macOS 11 - OS Version: macOS 11.7.6 (20G1231) - Kernel Version: Darwin 20.6.0 -- Image Version: 20230411.1 +- Image Version: 20230416.1 ## Installed Software ### Language and Runtime -- .NET Core SDK: 3.1.101, 3.1.201, 3.1.302, 3.1.426, 6.0.407, 7.0.102, 7.0.202 +- .NET Core SDK: 3.1.101, 3.1.201, 3.1.302, 3.1.426, 6.0.408, 7.0.102, 7.0.203 - Bash 3.2.57(1)-release - Clang/LLVM 13.0.0 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` @@ -25,30 +21,30 @@ - Kotlin 1.8.20-release-327 - Mono 6.12.0.188 - MSBuild 16.10.1.51301 (Mono 6.12.0.188) -- Node.js 18.15.0 +- Node.js 18.16.0 - NVM 0.39.3 -- NVM - Cached node versions: 14.21.3, 16.20.0, 18.15.0 +- NVM - Cached node versions: 14.21.3, 16.20.0, 18.16.0 - Perl 5.36.0 -- PHP 8.2.4 +- PHP 8.2.5 - Python 2.7.18 - Python3 3.11.3 - R 4.2.3 - Ruby 2.7.8p225 ### Package Management -- Bundler 2.4.11 +- Bundler 2.4.12 - Carthage 0.39.0 - CocoaPods 1.12.0 - Composer 2.5.5 -- Homebrew 4.0.12 +- Homebrew 4.0.13 - Miniconda 23.1.0 -- NPM 9.5.0 +- NPM 9.5.1 - NuGet 6.3.1.1 - Pip 20.3.4 (python 2.7) -- Pip3 23.0.1 (python 3.11) +- Pip3 23.1 (python 3.11) - Pipx 1.2.0 -- RubyGems 3.4.11 -- Vcpkg 2023 (build from commit dafff8267) +- RubyGems 3.4.12 +- Vcpkg 2023 (build from commit 501db0f17) - Yarn 1.22.19 #### Environment variables @@ -60,7 +56,7 @@ ### Project Management - Apache Ant 1.10.13 - Apache Maven 3.9.1 -- Gradle 8.0.2 +- Gradle 8.1 - Sbt 1.8.2 ### Utilities @@ -77,7 +73,7 @@ - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.3 - gpg (GnuPG) 2.4.0 -- helm v3.11.2+g912ebc1 +- helm v3.11.3+g66a969e - Hub CLI 2.14.2 - ImageMagick 7.1.1-6 - jq 1.6 @@ -95,23 +91,23 @@ - zstd 1.5.5 ### Tools -- Aliyun CLI 3.0.160 +- Aliyun CLI 3.0.161 - App Center CLI 2.13.4 -- AWS CLI 2.11.11 +- AWS CLI 2.11.13 - AWS SAM CLI 1.79.0 - AWS Session Manager CLI 1.2.463.0 - Azure CLI 2.47.0 - Azure CLI (azure-devops) 0.26.0 -- Bicep CLI 0.16.1 +- Bicep CLI 0.16.2 - Cabal 3.6.2.0 - Cmake 3.26.3 - CodeQL Action Bundles 2.12.5 2.12.6 -- Fastlane 2.212.1 +- Fastlane 2.212.2 - GHC 9.6.1 - GHCup 0.1.19.2 - Jazzy 0.14.3 - Stack 2.9.3 -- SwiftFormat 0.51.5 +- SwiftFormat 0.51.6 - Swig 4.1.1 - Xcode Command Line Tools 13.2.0.0.1.1638488800 @@ -122,10 +118,10 @@ ### Browsers - Safari 16.4.1 (16615.1.26.101.10) - SafariDriver 16.4.1 (16615.1.26.101.10) -- Google Chrome 112.0.5615.49 +- Google Chrome 112.0.5615.121 - ChromeDriver 112.0.5615.49 -- Microsoft Edge 112.0.1722.39 -- Microsoft Edge WebDriver 112.0.1722.39 +- Microsoft Edge 112.0.1722.48 +- Microsoft Edge WebDriver 112.0.1722.48 - Mozilla Firefox 112.0 - geckodriver 0.33.0 - Selenium server 4.8.0 @@ -170,7 +166,7 @@ #### Node.js - 14.21.3 - 16.20.0 -- 18.15.0 +- 18.16.0 #### Go - 1.18.10 @@ -192,7 +188,7 @@ - Rustfmt 1.5.1-stable ### PowerShell Tools -- PowerShell 7.2.10 +- PowerShell 7.2.11 #### PowerShell Modules - Az: 9.6.0 From d8d4d924ad21a8ba4931b2988f74bbb376cad021 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 21 Apr 2023 20:10:51 +0000 Subject: [PATCH 1875/3485] Windows Server 2019 (20230417) Image Update (#7456) * Updating readme file for win19 version 20230417.2 * Update Windows2019-Readme.md --------- Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2019-Readme.md | 68 ++++++++++++++++---------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index da719169fcee..c7ee3081e527 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -3,8 +3,8 @@ | [python2.7 will be removed from the images on May 15, 2023](https://github.com/actions/runner-images/issues/7401) | *** # Windows Server 2019 -- OS Version: 10.0.17763 Build 4131 -- Image Version: 20230407.1 +- OS Version: 10.0.17763 Build 4252 +- Image Version: 20230417.2 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -17,9 +17,9 @@ - Julia 1.8.5 - Kotlin 1.8.20 - LLVM 15.0.7 -- Node 18.15.0 +- Node 18.16.0 - Perl 5.32.1 -- PHP 8.2.4 +- PHP 8.2.5 - Python 3.7.9 - Ruby 2.5.9p229 @@ -28,12 +28,12 @@ - Composer 2.5.5 - Helm 3.11.2 - Miniconda 23.1.0 (pre-installed on the image but not added to PATH) -- NPM 9.5.0 +- NPM 9.5.1 - NuGet 6.5.0.154 -- pip 23.0.1 (python 3.7) +- pip 23.1 (python 3.7) - Pipx 1.2.0 - RubyGems 2.7.6.3 -- Vcpkg (build from commit cd5a39fc6) +- Vcpkg (build from commit 2180302c3) - Yarn 1.22.19 #### Environment variables @@ -44,7 +44,7 @@ ### Project Management - Ant 1.10.13 -- Gradle 7.6 +- Gradle 8.1 - Maven 3.8.7 - sbt 1.8.2 @@ -54,23 +54,23 @@ - azcopy 10.18.0 - Bazel 6.1.1 - Bazelisk 1.13.2 -- Bicep 0.16.1 +- Bicep 0.16.2 - Cabal 3.10.1.0 - CMake 3.26.3 - CodeQL Action Bundles 2.12.5 2.12.6 -- Docker 23.0.3 +- Docker 23.0.4 - Docker Compose v1 1.29.2 - Docker Compose v2 2.17.2 - Docker-wincred 0.7.0 - ghc 9.6.1 - Git 2.40.0.windows.1 - Git LFS 3.3.0 -- Google Cloud SDK 425.0.0 +- Google Cloud SDK 426.0.0 - ImageMagick 7.1.1-6 - InnoSetup 6.2.2 - jq 1.6 - Kind 0.18.0 -- Kubectl 1.26.3 +- Kubectl 1.27.1 - Mercurial 5.0 - Mingw-w64 8.1.0 - Newman 5.3.2 @@ -78,7 +78,7 @@ - OpenSSL 1.1.1t - Packer 1.8.5 - Parcel 2.8.3 -- Pulumi 3.62.0 +- Pulumi 3.63.0 - R 4.2.3 - Service Fabric SDK 9.1.1436.9590 - Stack 2.9.3 @@ -92,8 +92,8 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.161 -- AWS CLI 2.11.10 -- AWS SAM CLI 1.79.0 +- AWS CLI 2.11.11 +- AWS SAM CLI 1.80.0 - AWS Session Manager CLI 1.2.463.0 - Azure CLI 2.47.0 - Azure DevOps CLI extension 0.26.0 @@ -108,7 +108,7 @@ - Rustup 1.25.2 #### Packages -- bindgen 0.64.0 +- bindgen 0.65.1 - cargo-audit 0.17.5 - cargo-outdated 0.11.2 - cbindgen 0.24.3 @@ -116,11 +116,11 @@ - Rustfmt 1.5.1 ### Browsers and Drivers -- Google Chrome 112.0.5615.50 +- Google Chrome 112.0.5615.121 - Chrome Driver 112.0.5615.49 -- Microsoft Edge 112.0.1722.34 -- Microsoft Edge Driver 112.0.1722.34 -- Mozilla Firefox 111.0.1 +- Microsoft Edge 112.0.1722.48 +- Microsoft Edge Driver 112.0.1722.48 +- Mozilla Firefox 112.0.1 - Gecko Driver 0.33.0 - IE Driver 4.8.0.0 - Selenium server 4.8.0 @@ -171,7 +171,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Node.js - 14.21.3 - 16.20.0 -- 18.15.0 +- 18.16.0 #### Python - 2.7.18 @@ -232,12 +232,12 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Visual Studio Enterprise 2019 | Name | Version | Path | | ----------------------------- | --------------- | -------------------------------------------------------------- | -| Visual Studio Enterprise 2019 | 16.11.33423.256 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | +| Visual Studio Enterprise 2019 | 16.11.33529.622 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | #### Workloads, components and extensions | Package | Version | | ------------------------------------------------------------------------- | --------------- | -| Component.Android.NDK.R16B | 16.11.33423.256 | +| Component.Android.NDK.R16B | 16.11.33529.419 | | Component.Android.SDK25.Private | 16.0.28625.61 | | Component.Android.SDK30 | 16.10.31205.252 | | Component.Ant | 1.9.3.8 | @@ -495,15 +495,15 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 10.0.22621.0 ### .NET Core Tools -- .NET Core SDK: 3.1.120, 3.1.202, 3.1.302, 3.1.426, 6.0.115, 6.0.203, 6.0.310, 6.0.407 +- .NET Core SDK: 3.1.120, 3.1.202, 3.1.302, 3.1.426, 6.0.116, 6.0.203, 6.0.311, 6.0.408 - .NET Framework: 4.7.2, 4.8 -- Microsoft.AspNetCore.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 6.0.5, 6.0.15 -- Microsoft.NETCore.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 6.0.5, 6.0.15 -- Microsoft.WindowsDesktop.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 6.0.5, 6.0.15 +- Microsoft.AspNetCore.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 6.0.5, 6.0.16 +- Microsoft.NETCore.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 6.0.5, 6.0.16 +- Microsoft.WindowsDesktop.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 6.0.5, 6.0.16 - nbgv 3.5.119+5d25f54fec ### PowerShell Tools -- PowerShell 7.2.10 +- PowerShell 7.2.11 #### Powershell Modules - Az: 9.3.0 @@ -512,7 +512,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Az (Cached): 1.0.0.zip, 1.6.0.zip, 2.3.2.zip, 2.6.0.zip, 3.1.0.zip, 3.5.0.zip, 3.8.0.zip, 4.3.0.zip, 4.4.0.zip, 4.7.0.zip, 5.5.0.zip, 5.9.0.zip, 6.6.0.zip, 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.308 +- AWSPowershell: 4.1.314 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 - Microsoft.Graph: 1.25.0 @@ -557,9 +557,9 @@ All other versions are saved but not installed. ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:49f95b4f74aed03a37ba895496eebad67dbab56a14a4276fbdea79e51f98b345 | 2023-03-15 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:21e89167d6e546d8c478af5a7c98a490ee5fbec8e54b5f6ad316a36bd53e9769 | 2023-03-14 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:a548db63b396cc33957408fed71d536664dd04e13b990d05839def032967ce2a | 2023-03-15 | -| mcr.microsoft.com/windows/nanoserver:1809 | sha256:adac2bb090398b9e2a9717571ee581816029424af706248b1cf3daae6178fc1f | 2023-03-11 | -| mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:17bf5541b81ad3cfb8eb5170c2ce4f06df0d3741bb573fe27c7b5729d9c010f4 | 2023-03-11 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:d9ba6a514a6cadf503d94de9207721cc65bd11836de200c794df7e3ab37f512e | 2023-04-11 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:0626ed35c8a7a502b6403822bdeb17d413efaab100ccb9de9b50d9f3cba6dfb5 | 2023-04-11 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:6c68d8666f50716e127ac7376699ae770e6a908d8857f491cb100a143754a805 | 2023-04-11 | +| mcr.microsoft.com/windows/nanoserver:1809 | sha256:eea54849888c8070ea35f8df39b3a5e126bc9a5bd30afdcad6f430408b2c786d | 2023-04-05 | +| mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:b65dbde86b756beb973029c88e545457aa469a7e082c2d99bf984ba17d0a898c | 2023-04-05 | From cc369a2b40e144281096e6fc373c46da5a94b783 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 21 Apr 2023 20:51:12 +0000 Subject: [PATCH 1876/3485] Windows Server 2022 (20230417) Image Update (#7454) * Updating readme file for win22 version 20230417.1 * Update Windows2022-Readme.md --------- Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2022-Readme.md | 120 +++++++++++++++---------------- 1 file changed, 60 insertions(+), 60 deletions(-) diff --git a/images/win/Windows2022-Readme.md b/images/win/Windows2022-Readme.md index 748fff56bb8d..06a7ee8024f2 100644 --- a/images/win/Windows2022-Readme.md +++ b/images/win/Windows2022-Readme.md @@ -3,8 +3,8 @@ | [python2.7 will be removed from the images on May 15, 2023](https://github.com/actions/runner-images/issues/7401) | *** # Windows Server 2022 -- OS Version: 10.0.20348 Build 1607 -- Image Version: 20230407.1 +- OS Version: 10.0.20348 Build 1668 +- Image Version: 20230417.1 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -17,9 +17,9 @@ - Julia 1.8.5 - Kotlin 1.8.20 - LLVM 15.0.7 -- Node 18.15.0 +- Node 18.16.0 - Perl 5.32.1 -- PHP 8.2.4 +- PHP 8.2.5 - Python 3.9.13 - Ruby 3.0.6p216 @@ -28,12 +28,12 @@ - Composer 2.5.5 - Helm 3.11.2 - Miniconda 23.1.0 (pre-installed on the image but not added to PATH) -- NPM 9.5.0 +- NPM 9.5.1 - NuGet 6.5.0.154 -- pip 23.0.1 (python 3.9) +- pip 23.1 (python 3.9) - Pipx 1.2.0 - RubyGems 3.2.33 -- Vcpkg (build from commit cd5a39fc6) +- Vcpkg (build from commit 2180302c3) - Yarn 1.22.19 #### Environment variables @@ -44,7 +44,7 @@ ### Project Management - Ant 1.10.13 -- Gradle 7.6 +- Gradle 8.1 - Maven 3.8.7 - sbt 1.8.2 @@ -54,11 +54,11 @@ - azcopy 10.18.0 - Bazel 6.1.1 - Bazelisk 1.13.2 -- Bicep 0.16.1 +- Bicep 0.16.2 - Cabal 3.10.1.0 - CMake 3.26.3 - CodeQL Action Bundles 2.12.5 2.12.6 -- Docker 23.0.3 +- Docker 23.0.4 - Docker Compose v1 1.29.2 - Docker Compose v2 2.17.2 - Docker-wincred 0.7.0 @@ -69,14 +69,14 @@ - InnoSetup 6.2.2 - jq 1.6 - Kind 0.18.0 -- Kubectl 1.26.3 +- Kubectl 1.27.1 - Mercurial 5.0 - Mingw-w64 11.2.0 - Newman 5.3.2 - NSIS 3.08 - OpenSSL 1.1.1t - Packer 1.8.5 -- Pulumi 3.62.0 +- Pulumi 3.63.0 - R 4.2.3 - Service Fabric SDK 9.1.1436.9590 - Stack 2.9.3 @@ -90,8 +90,8 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.161 -- AWS CLI 2.11.10 -- AWS SAM CLI 1.79.0 +- AWS CLI 2.11.11 +- AWS SAM CLI 1.80.0 - AWS Session Manager CLI 1.2.463.0 - Azure CLI 2.47.0 - Azure DevOps CLI extension 0.26.0 @@ -105,7 +105,7 @@ - Rustup 1.25.2 #### Packages -- bindgen 0.64.0 +- bindgen 0.65.1 - cargo-audit 0.17.5 - cargo-outdated 0.11.2 - cbindgen 0.24.3 @@ -113,11 +113,11 @@ - Rustfmt 1.5.1 ### Browsers and Drivers -- Google Chrome 112.0.5615.50 +- Google Chrome 112.0.5615.121 - Chrome Driver 112.0.5615.49 -- Microsoft Edge 111.0.1661.62 -- Microsoft Edge Driver 111.0.1661.62 -- Mozilla Firefox 111.0.1 +- Microsoft Edge 112.0.1722.48 +- Microsoft Edge Driver 112.0.1722.48 +- Mozilla Firefox 112.0.1 - Gecko Driver 0.33.0 - IE Driver 4.8.0.0 - Selenium server 4.8.0 @@ -164,7 +164,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Node.js - 14.21.3 - 16.20.0 -- 18.15.0 +- 18.16.0 #### Python - 3.7.9 @@ -219,12 +219,12 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Visual Studio Enterprise 2022 | Name | Version | Path | | ----------------------------- | -------------- | -------------------------------------------------------- | -| Visual Studio Enterprise 2022 | 17.5.33516.290 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | +| Visual Studio Enterprise 2022 | 17.5.33530.505 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | #### Workloads, components and extensions | Package | Version | | ------------------------------------------------------------------------- | -------------- | -| android | 33.0.26.0 | +| android | 33.0.46.0 | | Component.Android.Emulator.MDD | 17.5.33306.270 | | Component.Android.NDK.R23C | 17.5.33306.270 | | Component.Android.SDK.MAUI | 17.5.33306.270 | @@ -252,14 +252,14 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Component.WixToolset.VisualStudioExtension.Schemas3 | 1.0.0.22 | | Component.Xamarin | 17.5.33306.270 | | Component.Xamarin.RemotedSimulator | 17.5.33306.270 | -| ios | 16.2.53.0 | -| maccatalyst | 16.2.53.0 | -| maui.android | 7.0.59.0 | -| maui.blazor | 7.0.59.0 | -| maui.core | 7.0.59.0 | -| maui.ios | 7.0.59.0 | -| maui.maccatalyst | 7.0.59.0 | -| maui.windows | 7.0.59.0 | +| ios | 16.2.127.0 | +| maccatalyst | 16.2.127.0 | +| maui.android | 7.0.81.0 | +| maui.blazor | 7.0.81.0 | +| maui.core | 7.0.81.0 | +| maui.ios | 7.0.81.0 | +| maui.maccatalyst | 7.0.81.0 | +| maui.windows | 7.0.81.0 | | Microsoft.Component.Azure.DataLake.Tools | 17.5.33306.270 | | Microsoft.Component.ClickOnce | 17.5.33306.270 | | Microsoft.Component.CodeAnalysis.SDK | 17.5.33306.270 | @@ -283,21 +283,21 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.Net.ComponentGroup.4.8.DeveloperTools | 17.5.33306.270 | | Microsoft.Net.ComponentGroup.DevelopmentPrerequisites | 17.5.33306.270 | | Microsoft.Net.ComponentGroup.TargetingPacks.Common | 17.5.33306.270 | -| microsoft.net.runtime.android | 7.0.423.11508 | -| microsoft.net.runtime.android.aot | 7.0.423.11508 | -| microsoft.net.runtime.android.aot.net6 | 7.0.423.11508 | -| microsoft.net.runtime.android.net6 | 7.0.423.11508 | -| microsoft.net.runtime.ios | 7.0.423.11508 | -| microsoft.net.runtime.ios.net6 | 7.0.423.11508 | -| microsoft.net.runtime.maccatalyst | 7.0.423.11508 | -| microsoft.net.runtime.maccatalyst.net6 | 7.0.423.11508 | -| microsoft.net.runtime.mono.tooling | 7.0.423.11508 | -| microsoft.net.runtime.mono.tooling.net6 | 7.0.423.11508 | -| microsoft.net.sdk.emscripten.net7 | 7.0.8.10705 | +| microsoft.net.runtime.android | 7.0.523.17405 | +| microsoft.net.runtime.android.aot | 7.0.523.17405 | +| microsoft.net.runtime.android.aot.net6 | 7.0.523.17405 | +| microsoft.net.runtime.android.net6 | 7.0.523.17405 | +| microsoft.net.runtime.ios | 7.0.523.17405 | +| microsoft.net.runtime.ios.net6 | 7.0.523.17405 | +| microsoft.net.runtime.maccatalyst | 7.0.523.17405 | +| microsoft.net.runtime.maccatalyst.net6 | 7.0.523.17405 | +| microsoft.net.runtime.mono.tooling | 7.0.523.17405 | +| microsoft.net.runtime.mono.tooling.net6 | 7.0.523.17405 | +| microsoft.net.sdk.emscripten.net7 | 7.0.8.17301 | | Microsoft.NetCore.Component.DevelopmentTools | 17.5.33306.270 | -| Microsoft.NetCore.Component.Runtime.6.0 | 17.5.33502.375 | -| Microsoft.NetCore.Component.Runtime.7.0 | 17.5.33502.375 | -| Microsoft.NetCore.Component.SDK | 17.5.33502.375 | +| Microsoft.NetCore.Component.Runtime.6.0 | 17.5.33530.320 | +| Microsoft.NetCore.Component.Runtime.7.0 | 17.5.33530.320 | +| Microsoft.NetCore.Component.SDK | 17.5.33530.320 | | Microsoft.NetCore.Component.Web | 17.5.33306.270 | | Microsoft.VisualStudio.Component.AppInsights.Tools | 17.5.33306.270 | | Microsoft.VisualStudio.Component.AspNet | 17.5.33306.270 | @@ -493,11 +493,11 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Workload.Python | 17.5.33306.270 | | Microsoft.VisualStudio.Workload.Universal | 17.5.33306.270 | | Microsoft.VisualStudio.Workload.VisualStudioExtension | 17.5.33306.270 | -| runtimes.ios | 7.0.423.11508 | -| runtimes.ios.net6 | 7.0.423.11508 | -| runtimes.maccatalyst | 7.0.423.11508 | -| runtimes.maccatalyst.net6 | 7.0.423.11508 | -| wasm.tools | 7.0.423.11508 | +| runtimes.ios | 7.0.523.17405 | +| runtimes.ios.net6 | 7.0.523.17405 | +| runtimes.maccatalyst | 7.0.523.17405 | +| runtimes.maccatalyst.net6 | 7.0.523.17405 | +| wasm.tools | 7.0.523.17405 | | ProBITools.MicrosoftAnalysisServicesModelingProjects2022 | 3.0.4 | | ProBITools.MicrosoftReportProjectsforVisualStudio2022 | 3.0.1 | | VisualStudioClient.MicrosoftVisualStudio2022InstallerProjects | 2.0.0 | @@ -526,15 +526,15 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 10.0.22621.0 ### .NET Core Tools -- .NET Core SDK: 3.1.120, 3.1.202, 3.1.302, 3.1.426, 6.0.115, 6.0.203, 6.0.310, 6.0.407, 7.0.202 +- .NET Core SDK: 3.1.120, 3.1.202, 3.1.302, 3.1.426, 6.0.116, 6.0.203, 6.0.311, 6.0.408, 7.0.203 - .NET Framework: 4.8, 4.8.1 -- Microsoft.AspNetCore.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 6.0.5, 6.0.14, 6.0.15, 7.0.4 -- Microsoft.NETCore.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 6.0.5, 6.0.14, 6.0.15, 7.0.4 -- Microsoft.WindowsDesktop.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 6.0.5, 6.0.15, 7.0.4 +- Microsoft.AspNetCore.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 6.0.5, 6.0.16, 7.0.5 +- Microsoft.NETCore.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 6.0.5, 6.0.16, 7.0.5 +- Microsoft.WindowsDesktop.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 6.0.5, 6.0.16, 7.0.5 - nbgv 3.5.119+5d25f54fec ### PowerShell Tools -- PowerShell 7.2.10 +- PowerShell 7.2.11 #### Powershell Modules - Az: 9.3.0 @@ -543,7 +543,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Az (Cached): 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.308 +- AWSPowershell: 4.1.314 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 - Microsoft.Graph: 1.25.0 @@ -587,9 +587,9 @@ All other versions are saved but not installed. ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2022 | sha256:289f9607d3a0e01e3b15fd594438a7d4a1e970ee3cd1c77dcdbb27a33627280b | 2023-03-14 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2022 | sha256:7c9bcece84ea272f1d654805fe43ce9086b13fff82407bc8288679ed5fa82b94 | 2023-03-14 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:fde0791b732b4d57359c5b134695bcab4f4f3c05e232a0e1762abed3568bd624 | 2023-03-14 | -| mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:3bb312dcc36fa551766a13cf2fb8e2be90726774589c96bea9198a26307bf2a2 | 2023-03-10 | -| mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:3949614905ddf2c4451b18894563c36f0c0aa93ab0e17ea6f8ca3791313e4e4f | 2023-03-10 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2022 | sha256:895d54e36db3f37fa4b2b408461b86f4fb83183a6bf2f59dbbbec5799ffb3d97 | 2023-04-11 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2022 | sha256:467ef0cb2dad67d142a1f35118c91d8546c568cdbf31c43c8b88bdf2394b09ea | 2023-04-11 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:7c1a30361c6e0573c4c066204a71a864cd9ab7da97a37f29742a376bac8b4ac9 | 2023-04-11 | +| mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:108081bc6b06fe1c5edea2373c1ea07240276a205ea91f52ebcb0303a0341611 | 2023-04-05 | +| mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:c9431e0418d696363cb228e248a9af752252b2cf272bc55705c1df7fec61ddec | 2023-04-05 | From 159de7fd68eee0ad00dbad11b48400fbbfad168e Mon Sep 17 00:00:00 2001 From: Steve-Glass <84886334+Steve-Glass@users.noreply.github.com> Date: Mon, 24 Apr 2023 17:14:01 -0400 Subject: [PATCH 1877/3485] Create macos-13-Readme.md --- images/macos/macos-13-Readme.md | 206 ++++++++++++++++++++++++++++++++ 1 file changed, 206 insertions(+) create mode 100644 images/macos/macos-13-Readme.md diff --git a/images/macos/macos-13-Readme.md b/images/macos/macos-13-Readme.md new file mode 100644 index 000000000000..c5bcb45896fc --- /dev/null +++ b/images/macos/macos-13-Readme.md @@ -0,0 +1,206 @@ + +# macOS 13 +- OS Version: macOS 13.3.1 (22E261) +- Kernel Version: Darwin 22.4.0 +- Image Version: 20230419.1 +## Installed Software + + ### Language and Runtime +- .NET Core SDK: 7.0.102, 7.0.203 +- Bash 3.2.57(1)-release +- Clang/LLVM 14.0.0 +- Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` +- GCC 11 (Homebrew GCC 11.3.0) - available by `gcc-11` alias +- GCC 12 (Homebrew GCC 12.2.0) - available by `gcc-12` alias +- GNU Fortran 11 (Homebrew GCC 11.3.0) - available by `gfortran-11` alias +- GNU Fortran 12 (Homebrew GCC 12.2.0) - available by `gfortran-12` alias +- Go command +- Julia 1.8.5 +- Kotlin 1.8.20-release-327 +- Perl 5.36.0 +- PHP 8.2.5 +- R 4.2.3 +- Ruby 3.0.6p216 + +### Package Management +- Bundler 2.4.12 +- Carthage 0.39.0 +- CocoaPods 1.12.1 +- Composer 2.5.5 +- Homebrew 4.0.14 +- NPM 9.5.1 +- NuGet command +- RubyGems 3.4.12 +- Vcpkg 2023 (build from commit 48483c4fc) +- Yarn 1.22.19 + +#### Environment variables +| Name | Value | +| ----------------------- | ---------------------- | +| CONDA | | +| VCPKG_INSTALLATION_ROOT | /usr/local/share/vcpkg | + +### Project Management + - Apache Ant 1.10.13 + +### Utilities +- 7-Zip 17.05 +- aria2 1.36.0 +- azcopy 10.18.0 +- bazel 6.1.2 +- bazelisk 1.16.0 +- bsdtar 3.5.3 - available by 'tar' alias +- Curl 8.0.1 +- Git 2.40.0 +- Git LFS 3.3.0 +- GitHub CLI 2.27.0 +- GNU Tar 1.34 - available by 'gtar' alias +- GNU Wget 1.21.3 +- gpg (GnuPG) 2.4.0 +- jq 1.6 +- OpenSSL LibreSSL 3.3.6 +- Packer 1.8.6 +- Vagrant 2.3.4 +- yq 4.33.3 +- zstd 1.5.5 + +### Tools +- AWS CLI 2.11.13 +- AWS SAM CLI 1.80.0 +- AWS Session Manager CLI 1.2.463.0 +- Azure CLI 2.47.0 +- Azure CLI (azure-devops) 0.26.0 +- Bicep CLI 0.16.2 +- Cabal 3.6.2.0 +- Cmake 3.26.3 +- CodeQL Action Bundles 2.12.5 2.12.6 +- Fastlane 2.212.2 +- GHC 9.6.1 +- GHCup 0.1.19.2 +- Stack 2.9.3 +- SwiftFormat 0.51.7 +- Xcode Command Line Tools 14.3.0.0.1.1679647830 + +### Linters +- SwiftLint 0.51.0 + +### Browsers +- Safari 16.4 (18615.1.26.11.23) +- SafariDriver 16.4 (18615.1.26.11.23) +- Google Chrome 112.0.5615.137 +- ChromeDriver 112.0.5615.49 +- Microsoft Edge 112.0.1722.48 +- Microsoft Edge WebDriver 112.0.1722.48 +- Mozilla Firefox 112.0.1 +- geckodriver 0.33.0 +- Selenium server 4.8.0 + +#### Environment variables +| Name | Value | +| --------------- | ---------------------------------------------- | +| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/112.0.5615.49 | +| EDGEWEBDRIVER | /usr/local/share/edge_driver | +| GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | + +### Java +| Version | Vendor | Environment Variable | +| ------------------- | --------------- | -------------------- | +| 8.0.362+9 | Eclipse Temurin | JAVA_HOME_8_X64 | +| 11.0.18+10 | Eclipse Temurin | JAVA_HOME_11_X64 | +| 17.0.6+10 (default) | Eclipse Temurin | JAVA_HOME_17_X64 | + + ### Rust Tools +- Cargo 1.68.2 +- Rust 1.68.2 +- Rustdoc 1.68.2 +- Rustup 1.25.2 + +2023-04-19T23:30:37.7926170Z #### Packages +- Bindgen 0.65.1 +- Cargo-audit 0.17.5 +- Cargo-outdated 0.11.2 +- Cbindgen 0.24.3 +- Clippy 0.1.68 +- Rustfmt 1.5.1-stable + +### PowerShell Tools +- PowerShell 7.2.11 + +#### PowerShell Modules +- Az: 9.6.0 +- Pester: 5.4.1 +- PSScriptAnalyzer: 1.21.0 + +2023-04-19T23:30:37.7929160Z ### Xcode +| Version | Build | Path | +| -------------- | ------- | ---------------------------- | +| 14.3 | 14E222b | /Applications/Xcode_14.3.app | +| 14.2 (default) | 14C18 | /Applications/Xcode_14.2.app | +| 14.1 | 14B47b | /Applications/Xcode_14.1.app | + +#### Xcode Support Tools + - xcpretty 0.3.0 +- xcversion 2.8.1 +- +#### Installed SDKs +| SDK | SDK Name | Xcode Version | +| ------------------------------------------------------- | --------------------------------------------- | ------------- | +| macOS 13.0 | macosx13.0 | 14.1 | +| macOS 13.1 | macosx13.1 | 14.2 | +| macOS 13.3 | macosx13.3 | 14.3 | +| iOS 16.1 | iphoneos16.1 | 14.1 | +| iOS 16.2 | iphoneos16.2 | 14.2 | +| iOS 16.4 | iphoneos16.4 | 14.3 | +| Simulator - iOS 16.1 | iphonesimulator16.1 | 14.1 | +| Simulator - iOS 16.2 | iphonesimulator16.2 | 14.2 | +| Simulator - iOS 16.4 | iphonesimulator16.4 | 14.3 | +| tvOS 16.1 | appletvos16.1 | 14.1, 14.2 | +| tvOS 16.4 | appletvos16.4 | 14.3 | +| Simulator - tvOS 16.1 | appletvsimulator16.1 | 14.1, 14.2 | +| Simulator - tvOS 16.4 | appletvsimulator16.4 | 14.3 | +| watchOS 9.1 | watchos9.1 | 14.1, 14.2 | +| watchOS 9.4 | watchos9.4 | 14.3 | +| Simulator - watchOS 9.1 | watchsimulator9.1 | 14.1, 14.2 | +| Simulator - watchOS 9.4 | watchsimulator9.4 | 14.3 | +| Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3 | +| Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3 | +| Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3 | +| DriverKit 22.1 | driverkit22.1 | 14.1 | +| DriverKit 22.2 | driverkit22.2 | 14.2 | +| DriverKit 22.4 | driverkit22.4 | 14.3 | + +#### Installed Simulators +| OS | Xcode Version | Simulators | +| ----------- | -------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| iOS 16.1 | 14.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 16.2 | 14.2 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 16.4 | 14.3 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| tvOS 16.1 | 14.1<br>14.2<br>14.3 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 16.4 | 14.1<br>14.2<br>14.3 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| watchOS 9.1 | 14.1<br>14.2<br>14.3 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | +| watchOS 9.4 | 14.1<br>14.2<br>14.3 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | + +### Android +| Package Name | Version | +| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | +| Android Command Line Tools | 8.0 | +| Android Emulator | 32.1.12 | +| Android SDK Build-tools | 33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | +| Android SDK Platforms | android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | +| Android SDK Platform-Tools | 34.0.1 | +| Android Support Repository | 47.0.0 | +| CMake | 3.18.1<br>3.22.1 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 23.2.8568313<br>24.0.8215888<br>25.2.9519653 (default) | +| SDK Patch Applier v4 | 1 | + +#### Environment variables +| Name | Value | +| ----------------------- | -------------------------------------------------- | +| ANDROID_HOME | /Users/runner/Library/Android/sdk | +| ANDROID_NDK | /Users/runner/Library/Android/sdk/ndk/25.2.9519653 | +| ANDROID_NDK_HOME | /Users/runner/Library/Android/sdk/ndk/25.2.9519653 | +| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/25.2.9519653 | +| ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk/25.2.9519653 | +| ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | From 763969f96509ae42da33f6e4db1e2cfb169f2ef9 Mon Sep 17 00:00:00 2001 From: Jonghyun Kim <4126751+filmhomage@users.noreply.github.com> Date: Tue, 25 Apr 2023 18:58:05 +0900 Subject: [PATCH 1878/3485] Update macos-13-Readme.md (#7485) --- images/macos/macos-13-Readme.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/macos/macos-13-Readme.md b/images/macos/macos-13-Readme.md index c5bcb45896fc..c856694b0554 100644 --- a/images/macos/macos-13-Readme.md +++ b/images/macos/macos-13-Readme.md @@ -115,7 +115,7 @@ - Rustdoc 1.68.2 - Rustup 1.25.2 -2023-04-19T23:30:37.7926170Z #### Packages +#### Packages - Bindgen 0.65.1 - Cargo-audit 0.17.5 - Cargo-outdated 0.11.2 @@ -131,7 +131,7 @@ - Pester: 5.4.1 - PSScriptAnalyzer: 1.21.0 -2023-04-19T23:30:37.7929160Z ### Xcode +### Xcode | Version | Build | Path | | -------------- | ------- | ---------------------------- | | 14.3 | 14E222b | /Applications/Xcode_14.3.app | From b9ca7b686b94750fd78bb8aa104cbb6dabedeb65 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Wed, 26 Apr 2023 17:22:01 +0200 Subject: [PATCH 1879/3485] fix software report output for packer (#7495) --- images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 | 3 ++- images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 index 05253245945f..120ed23277c9 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 @@ -182,7 +182,8 @@ function Get-NvmVersion { } function Get-PackerVersion { - return "Packer $(packer --version)" + $packerVersion = packer --version + return $packerVersion } function Get-PhantomJSVersion { diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 index 71437bbe4ba9..ebe898c3fca8 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 @@ -142,7 +142,8 @@ function Get-OpenSSLVersion { } function Get-PackerVersion { - return "Packer $(packer --version)" + $packerVersion = packer --version + return $packerVersion } function Get-ParcelVersion { From a454664a1d7e1723eebff49913840a57c13a3fc3 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 26 Apr 2023 17:33:11 +0000 Subject: [PATCH 1880/3485] Updating readme file for ubuntu22 version 20230426.1 (#7497) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2204-Readme.md | 86 +++++++++++++++---------------- 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/images/linux/Ubuntu2204-Readme.md b/images/linux/Ubuntu2204-Readme.md index e3099cf643f8..c32987fd7077 100644 --- a/images/linux/Ubuntu2204-Readme.md +++ b/images/linux/Ubuntu2204-Readme.md @@ -4,8 +4,8 @@ *** # Ubuntu 22.04 - OS Version: 22.04.2 LTS -- Kernel Version: 5.15.0-1035-azure -- Image Version: 20230417.1 +- Kernel Version: 5.15.0-1036-azure +- Image Version: 20230426.1 - Systemd version: 249.11-0ubuntu3.9 ## Installed Software @@ -19,7 +19,7 @@ - GNU C++: 9.5.0, 10.4.0, 11.3.0, 12.1.0 - GNU Fortran: 9.5.0, 10.4.0, 11.3.0, 12.1.0 - Julia 1.8.5 -- Kotlin 1.8.20-release-327 +- Kotlin 1.8.21-release-380 - Mono 6.12.0.182 - MSBuild 16.10.1.31701 (Mono 6.12.0.182) - Node.js 18.16.0 @@ -32,15 +32,15 @@ ### Package Management - cpan 1.64 - Helm 3.11.3 -- Homebrew 4.0.14 -- Miniconda 23.1.0 +- Homebrew 4.0.15 +- Miniconda 23.3.1 - Npm 9.5.1 - NuGet 6.3.1.1 - Pip 22.0.2 - Pip3 22.0.2 - Pipx 1.2.0 - RubyGems 3.3.5 -- Vcpkg (build from commit 305fa7375) +- Vcpkg (build from commit 70992f649) - Yarn 1.22.19 #### Environment variables @@ -62,23 +62,23 @@ to accomplish this. - Maven 3.8.8 ### Tools -- Ansible 2.14.4 +- Ansible 2.14.5 - apt-fast 1.9.12 -- AzCopy 10.18.0 - available by `azcopy` and `azcopy10` aliases -- Bazel 6.1.1 +- AzCopy 10.18.1 - available by `azcopy` and `azcopy10` aliases +- Bazel 6.1.2 - Bazelisk 1.13.2 - Bicep 0.16.2 - Buildah 1.23.1 - CMake 3.26.3 -- CodeQL Action Bundles 2.12.5 2.12.6 +- CodeQL Action Bundles 2.12.6 2.13.0 - Docker Amazon ECR Credential Helper 0.6.0 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.17.2+azure-1 +- Docker Compose v2 2.17.3+azure-1 - Docker-Buildx 0.10.4 -- Docker-Moby Client 20.10.23+azure-2 -- Docker-Moby Server 20.10.23+azure-3 +- Docker-Moby Client 20.10.24+azure-1 +- Docker-Moby Server 20.10.24+azure-1 - Fastlane 2.212.2 -- Git 2.40.0 +- Git 2.40.1 - Git LFS 3.3.0 - Git-ftp 1.6.0 - Haveged 1.9.14 @@ -94,34 +94,34 @@ to accomplish this. - n 9.1.0 - Newman 5.3.2 - nvm 0.39.3 -- OpenSSL 3.0.2-0ubuntu1.8 +- OpenSSL 3.0.2-0ubuntu1.9 - Packer Packer 1.8.6 - Parcel 2.8.3 - Podman 3.4.4 -- Pulumi 3.63.0 -- R 4.2.3 +- Pulumi 3.64.0 +- R 4.3.0 - Skopeo 1.4.1 - Sphinx Open Source Search Server 2.2.11 - SVN 1.14.1 - Terraform 1.4.5 -- yamllint 1.30.0 +- yamllint 1.31.0 - yq 4.33.3 - zstd 1.5.5 ### CLI Tools -- Alibaba Cloud CLI 3.0.161 -- AWS CLI 2.11.13 +- Alibaba Cloud CLI 3.0.162 +- AWS CLI 2.11.15 - AWS CLI Session Manager Plugin 1.2.463.0 -- AWS SAM CLI 1.80.0 -- Azure CLI 2.47.0 +- AWS SAM CLI 1.81.0 +- Azure CLI 2.48.1 - Azure CLI (azure-devops) 0.26.0 -- GitHub CLI 2.27.0 -- Google Cloud SDK 426.0.0 +- GitHub CLI 2.28.0 +- Google Cloud SDK 428.0.0 - Hub CLI 2.14.2 -- Netlify CLI 14.0.0 -- OpenShift CLI 4.12.12 +- Netlify CLI 14.3.0 +- OpenShift CLI 4.12.14 - ORAS CLI 1.0.0 -- Vercel CLI 28.18.5 +- Vercel CLI 28.20.0 ### Java | Version | Vendor | Environment Variable | @@ -145,27 +145,27 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Stack 2.9.3 ### Rust Tools -- Cargo 1.68.2 -- Rust 1.68.2 -- Rustdoc 1.68.2 -- Rustup 1.25.2 +- Cargo 1.69.0 +- Rust 1.69.0 +- Rustdoc 1.69.0 +- Rustup 1.26.0 #### Packages - Bindgen 0.65.1 - Cargo audit 0.17.5 -- Cargo clippy 0.1.68 +- Cargo clippy 0.1.69 - Cargo outdated 0.11.2 - Cbindgen 0.24.3 -- Rustfmt 1.5.1 +- Rustfmt 1.5.2 ### Browsers and Drivers -- Google Chrome 112.0.5615.121 +- Google Chrome 112.0.5615.165 - ChromeDriver 112.0.5615.49 - Chromium 112.0.5593.0 -- Microsoft Edge 112.0.1722.48 -- Microsoft Edge WebDriver 112.0.1722.48 -- Selenium server 4.8.0 -- Mozilla Firefox 112.0.1 +- Microsoft Edge 112.0.1722.58 +- Microsoft Edge WebDriver 112.0.1722.58 +- Selenium server 4.9.0 +- Mozilla Firefox 112.0.2 - Geckodriver 0.33.0 #### Environment variables @@ -237,7 +237,7 @@ Use the following command as a part of your job to start the service: 'sudo syst #### PowerShell Modules - Az: 9.3.0 - MarkdownPS: 1.9 -- Microsoft.Graph: 1.25.0 +- Microsoft.Graph: 1.26.0 - Pester: 5.4.1 - PSScriptAnalyzer: 1.21.0 @@ -284,7 +284,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | buildpack-deps:buster | sha256:5c2114d327b0e2a38de4e3dcf5fa304e4da23264a1e77643632d0a25325d7e2d | 2023-04-12 | | debian:10 | sha256:173f0b19d2ac5ee17194dbe9a888a4a617dbf905ee666c9e780afad55eaf1d8c | 2023-04-12 | | debian:11 | sha256:0a78ed641b76252739e28ebbbe8cdbd80dc367fba4502565ca839e5803cfd86e | 2023-04-12 | -| moby/buildkit:latest | sha256:ca34989052fc2467dcd283d2000c2ad8c7cd6213c5ff0fcabef1a9cfb0651b3a | 2023-03-23 | +| moby/buildkit:latest | sha256:d6fa89830c26919acba23c5cafa09df0c3ec1fbde20bb2a15ff349e0795241f4 | 2023-04-20 | | node:14 | sha256:a158d3b9b4e3fa813fa6c8c590b8f0a860e015ad4e59bbce5744d2f6fd8461aa | 2023-04-12 | | node:14-alpine | sha256:434215b487a329c9e867202ff89e704d3a75e554822e07f3e0c0f9e606121b33 | 2023-03-29 | | node:16 | sha256:241f152c0dc9d3efcbd6a4426f52dc50fa78f3a63cff55b2419dc2bf48efe705 | 2023-04-12 | @@ -292,7 +292,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | node:18 | sha256:671ee8d49ce2a691fc3082203c5deb9522e0c80042aa0ff40c07f4a25e63668a | 2023-04-13 | | node:18-alpine | sha256:ca5d399560a9d239cbfa28eec00417f1505e5e108f3ec6938d230767eaa81f61 | 2023-04-13 | | ubuntu:18.04 | sha256:8aa9c2798215f99544d1ce7439ea9c3a6dfd82de607da1cec3a8a2fae005931b | 2023-03-08 | -| ubuntu:20.04 | sha256:24a0df437301598d1a4b62ddf59fa0ed2969150d70d748c84225e6501e9c36b9 | 2023-03-08 | +| ubuntu:20.04 | sha256:db8bf6f4fb351aa7a26e27ba2686cf35a6a409f65603e59d4c203e58387dc6b3 | 2023-04-13 | | ubuntu:22.04 | sha256:67211c14fa74f070d27cc59d69a7fa9aeff8e28ea118ef3babc295a0428a6d21 | 2023-03-08 | ### Installed apt packages @@ -336,7 +336,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | libmagickwand-dev | 8:6.9.11.60+dfsg-1.3ubuntu0.22.04.3 | | libsecret-1-dev | 0.20.5-2 | | libsqlite3-dev | 3.37.2-2ubuntu0.1 | -| libssl-dev | 3.0.2-0ubuntu1.8 | +| libssl-dev | 3.0.2-0ubuntu1.9 | | libtool | 2.4.6-15build2 | | libunwind8 | 1.3.2-2build2 | | libxkbfile-dev | 1:1.1.0-1build3 | @@ -373,7 +373,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | texinfo | 6.8-4build1 | | time | 1.9-0.1build2 | | tk | 8.6.11+1build2 | -| tzdata | 2023c-0ubuntu0.22.04.0 | +| tzdata | 2023c-0ubuntu0.22.04.1 | | unzip | 6.0-26ubuntu3.1 | | upx | 3.96-3 | | wget | 1.21.2-2ubuntu1 | From 3d09ba536c96f1daa37cf14515fb66fe97552f38 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 26 Apr 2023 18:18:07 +0000 Subject: [PATCH 1881/3485] Updating readme file for ubuntu20 version 20230426.1 (#7496) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2004-Readme.md | 88 +++++++++++++++---------------- 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/images/linux/Ubuntu2004-Readme.md b/images/linux/Ubuntu2004-Readme.md index 5b25497ff1df..c378c61cd935 100644 --- a/images/linux/Ubuntu2004-Readme.md +++ b/images/linux/Ubuntu2004-Readme.md @@ -4,8 +4,8 @@ *** # Ubuntu 20.04 - OS Version: 20.04.6 LTS -- Kernel Version: 5.15.0-1035-azure -- Image Version: 20230417.1 +- Kernel Version: 5.15.0-1036-azure +- Image Version: 20230426.1 - Systemd version: 245.4-4ubuntu3.21 ## Installed Software @@ -21,7 +21,7 @@ - GNU C++: 9.4.0, 10.3.0 - GNU Fortran: 9.4.0, 10.3.0 - Julia 1.8.5 -- Kotlin 1.8.20-release-327 +- Kotlin 1.8.21-release-380 - Mono 6.12.0.182 - MSBuild 16.10.1.31701 (Mono 6.12.0.182) - Node.js 18.16.0 @@ -34,15 +34,15 @@ ### Package Management - cpan 1.64 - Helm 3.11.3 -- Homebrew 4.0.14 -- Miniconda 23.1.0 +- Homebrew 4.0.15 +- Miniconda 23.3.1 - Npm 9.5.1 - NuGet 6.3.1.1 - Pip 20.0.2 - Pip3 20.0.2 - Pipx 1.2.0 - RubyGems 3.1.2 -- Vcpkg (build from commit 305fa7375) +- Vcpkg (build from commit 70992f649) - Yarn 1.22.19 #### Environment variables @@ -61,29 +61,29 @@ to accomplish this. ### Project Management - Ant 1.10.7 -- Gradle 8.1 +- Gradle 8.1.1 - Lerna 6.6.1 - Maven 3.8.8 - Sbt 1.8.2 ### Tools -- Ansible 2.13.8 +- Ansible 2.13.9 - apt-fast 1.9.12 -- AzCopy 10.18.0 - available by `azcopy` and `azcopy10` aliases -- Bazel 6.1.1 +- AzCopy 10.18.1 - available by `azcopy` and `azcopy10` aliases +- Bazel 6.1.2 - Bazelisk 1.13.2 - Bicep 0.16.2 - Buildah 1.22.3 - CMake 3.26.3 -- CodeQL Action Bundles 2.12.5 2.12.6 +- CodeQL Action Bundles 2.12.6 2.13.0 - Docker Amazon ECR Credential Helper 0.6.0 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.17.2+azure-1 +- Docker Compose v2 2.17.3+azure-1 - Docker-Buildx 0.10.4 -- Docker-Moby Client 20.10.23+azure-2 -- Docker-Moby Server 20.10.23+azure-3 +- Docker-Moby Client 20.10.24+azure-1 +- Docker-Moby Server 20.10.24+azure-1 - Fastlane 2.212.2 -- Git 2.40.0 +- Git 2.40.1 - Git LFS 3.3.0 - Git-ftp 1.6.0 - Haveged 1.9.1 @@ -100,35 +100,35 @@ to accomplish this. - n 9.1.0 - Newman 5.3.2 - nvm 0.39.3 -- OpenSSL 1.1.1f-1ubuntu2.17 +- OpenSSL 1.1.1f-1ubuntu2.18 - Packer Packer 1.8.6 - Parcel 2.8.3 - PhantomJS 2.1.1 2.1.1 - Podman 3.4.2 -- Pulumi 3.63.0 -- R 4.2.3 +- Pulumi 3.64.0 +- R 4.3.0 - Skopeo 1.5.0 - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 - Terraform 1.4.5 -- yamllint 1.30.0 +- yamllint 1.31.0 - yq 4.33.3 - zstd 1.5.5 ### CLI Tools -- Alibaba Cloud CLI 3.0.161 -- AWS CLI 2.11.13 +- Alibaba Cloud CLI 3.0.162 +- AWS CLI 2.11.15 - AWS CLI Session Manager Plugin 1.2.463.0 -- AWS SAM CLI 1.80.0 -- Azure CLI 2.47.0 +- AWS SAM CLI 1.81.0 +- Azure CLI 2.48.1 - Azure CLI (azure-devops) 0.26.0 -- GitHub CLI 2.27.0 -- Google Cloud SDK 426.0.0 +- GitHub CLI 2.28.0 +- Google Cloud SDK 428.0.0 - Hub CLI 2.14.2 -- Netlify CLI 14.0.0 -- OpenShift CLI 4.12.12 +- Netlify CLI 14.3.0 +- OpenShift CLI 4.12.14 - ORAS CLI 1.0.0 -- Vercel CLI 28.18.5 +- Vercel CLI 28.20.0 ### Java | Version | Vendor | Environment Variable | @@ -152,27 +152,27 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Stack 2.9.3 ### Rust Tools -- Cargo 1.68.2 -- Rust 1.68.2 -- Rustdoc 1.68.2 -- Rustup 1.25.2 +- Cargo 1.69.0 +- Rust 1.69.0 +- Rustdoc 1.69.0 +- Rustup 1.26.0 #### Packages - Bindgen 0.65.1 - Cargo audit 0.17.5 -- Cargo clippy 0.1.68 +- Cargo clippy 0.1.69 - Cargo outdated 0.11.2 - Cbindgen 0.24.3 -- Rustfmt 1.5.1 +- Rustfmt 1.5.2 ### Browsers and Drivers -- Google Chrome 112.0.5615.121 +- Google Chrome 112.0.5615.165 - ChromeDriver 112.0.5615.49 - Chromium 112.0.5593.0 -- Microsoft Edge 112.0.1722.48 -- Microsoft Edge WebDriver 112.0.1722.48 -- Selenium server 4.8.0 -- Mozilla Firefox 112.0.1 +- Microsoft Edge 112.0.1722.58 +- Microsoft Edge WebDriver 112.0.1722.58 +- Selenium server 4.9.0 +- Mozilla Firefox 112.0.2 - Geckodriver 0.33.0 #### Environment variables @@ -188,7 +188,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - nbgv 3.5.119+5d25f54fec ### Databases -- MongoDB 5.0.16 +- MongoDB 5.0.17 - sqlite3 3.31.1 #### PostgreSQL @@ -254,7 +254,7 @@ Use the following command as a part of your job to start the service: 'sudo syst - Az: 9.3.0 - Az (Cached): 3.1.0.zip, 4.4.0.zip, 5.9.0.zip, 6.6.0.zip, 7.5.0.zip - MarkdownPS: 1.9 -- Microsoft.Graph: 1.25.0 +- Microsoft.Graph: 1.26.0 - Pester: 5.4.1 - PSScriptAnalyzer: 1.21.0 @@ -304,7 +304,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | debian:10 | sha256:173f0b19d2ac5ee17194dbe9a888a4a617dbf905ee666c9e780afad55eaf1d8c | 2023-04-12 | | debian:11 | sha256:0a78ed641b76252739e28ebbbe8cdbd80dc367fba4502565ca839e5803cfd86e | 2023-04-12 | | debian:9 | sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be | 2022-06-23 | -| moby/buildkit:latest | sha256:ca34989052fc2467dcd283d2000c2ad8c7cd6213c5ff0fcabef1a9cfb0651b3a | 2023-03-23 | +| moby/buildkit:latest | sha256:d6fa89830c26919acba23c5cafa09df0c3ec1fbde20bb2a15ff349e0795241f4 | 2023-04-20 | | node:14 | sha256:a158d3b9b4e3fa813fa6c8c590b8f0a860e015ad4e59bbce5744d2f6fd8461aa | 2023-04-12 | | node:14-alpine | sha256:434215b487a329c9e867202ff89e704d3a75e554822e07f3e0c0f9e606121b33 | 2023-03-29 | | node:16 | sha256:241f152c0dc9d3efcbd6a4426f52dc50fa78f3a63cff55b2419dc2bf48efe705 | 2023-04-12 | @@ -313,7 +313,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | node:18-alpine | sha256:ca5d399560a9d239cbfa28eec00417f1505e5e108f3ec6938d230767eaa81f61 | 2023-04-13 | | ubuntu:16.04 | sha256:1f1a2d56de1d604801a9671f301190704c25d604a416f59e03c04f5c6ffee0d6 | 2021-08-31 | | ubuntu:18.04 | sha256:8aa9c2798215f99544d1ce7439ea9c3a6dfd82de607da1cec3a8a2fae005931b | 2023-03-08 | -| ubuntu:20.04 | sha256:24a0df437301598d1a4b62ddf59fa0ed2969150d70d748c84225e6501e9c36b9 | 2023-03-08 | +| ubuntu:20.04 | sha256:db8bf6f4fb351aa7a26e27ba2686cf35a6a409f65603e59d4c203e58387dc6b3 | 2023-04-13 | ### Installed apt packages | Name | Version | @@ -391,7 +391,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | texinfo | 6.7.0.dfsg.2-5 | | time | 1.7-25.1build1 | | tk | 8.6.9+1 | -| tzdata | 2023c-0ubuntu0.20.04.0 | +| tzdata | 2023c-0ubuntu0.20.04.1 | | unzip | 6.0-25ubuntu1.1 | | upx | 3.95-2build1 | | wget | 1.20.3-1ubuntu2 | From 276bcfd0bb7036d658233e1029150b854d906d5d Mon Sep 17 00:00:00 2001 From: Delphine Roux <finaroux@users.noreply.github.com> Date: Thu, 27 Apr 2023 00:20:13 -0700 Subject: [PATCH 1882/3485] Add ca cert to the command line to use TLS in DVT racks (#7489) --- images.CI/macos/anka/Anka.Helpers.psm1 | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/images.CI/macos/anka/Anka.Helpers.psm1 b/images.CI/macos/anka/Anka.Helpers.psm1 index fff0c7045cae..8f73d15fb62b 100644 --- a/images.CI/macos/anka/Anka.Helpers.psm1 +++ b/images.CI/macos/anka/Anka.Helpers.psm1 @@ -14,15 +14,16 @@ function Push-AnkaTemplateToRegistry { ) # if registry uuid doesn't match than delete an image in registry - $images = anka --machine-readable registry --registry-path $RegistryUrl list | ConvertFrom-Json | ForEach-Object body + $AnkaCaCrtPath="$HOME/.config/anka/certs/anka-ca-crt.pem" + $images = anka --machine-readable registry --cacert $AnkaCaCrtPath --registry-path $RegistryUrl list | ConvertFrom-Json | ForEach-Object body $images | Where-Object name -eq $TemplateName | ForEach-Object { $id = $_.uuid Show-StringWithFormat "Deleting '$TemplateName[$id]' VM and '$TagName' tag" - $uri = '{0}/registry/vm?id={1}' -f $RegistryUrl, $id - Invoke-WebRequest -Uri $uri -Method Delete | Out-Null + $curlCommand='curl -s -X DELETE -k "{0}/registry/vm?id={1}"' -f $RegistryUrl, $id + Invoke-AnkaCommand -Command $curlCommand } - $command = "anka registry --registry-path $RegistryUrl push --force --tag $TagName $TemplateName" + $command = "anka registry --cacert $AnkaCaCrtPath --registry-path $RegistryUrl push --force --tag $TagName $TemplateName" Invoke-AnkaCommand -Command $command } From 0636feb5aae58d42ab6a50b230f3d25c6dcb4a5d Mon Sep 17 00:00:00 2001 From: Delphine Roux <finaroux@users.noreply.github.com> Date: Thu, 27 Apr 2023 00:21:48 -0700 Subject: [PATCH 1883/3485] updates for MacOS M1/arm64 runners (#7453) --- .../bootstrap-provisioner/installNewProvisioner.sh | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/images/macos/provision/bootstrap-provisioner/installNewProvisioner.sh b/images/macos/provision/bootstrap-provisioner/installNewProvisioner.sh index e588c670c6bc..81cdbdffc22f 100644 --- a/images/macos/provision/bootstrap-provisioner/installNewProvisioner.sh +++ b/images/macos/provision/bootstrap-provisioner/installNewProvisioner.sh @@ -5,12 +5,17 @@ ProvisionerScriptUri="$3" ScriptName="$4" ScriptParam="$5" Username="$6" +arch=$(arch) -export PATH=/usr/bin:/usr/sbin:/usr/local/bin:/bin:/sbin +if [[ $arch == "arm64" ]]; then + export PATH=/usr/bin:/usr/sbin:/usr/local/bin:/bin:/sbin:/opt/homebrew/bin +else + export PATH=/usr/bin:/usr/sbin:/usr/local/bin:/bin:/sbin +fi PROVISIONER_ROOT=/usr/local/opt/${Username} -mkdir -p ${PROVISIONER_ROOT} -chown ${Username} ${PROVISIONER_ROOT} +sudo mkdir -p ${PROVISIONER_ROOT} +sudo chown ${Username} ${PROVISIONER_ROOT} tee -a ${PROVISIONER_ROOT}/runprovisioner.sh > /dev/null <<\EOF #!/bin/bash From e651c58384785ea80350cb5fd00b2547a2acebc1 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 27 Apr 2023 12:46:01 +0000 Subject: [PATCH 1884/3485] Windows Server 2022 (20230425) Image Update (#7493) * Updating readme file for win22 version 20230425.1 * Update Windows2022-Readme.md --------- Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2022-Readme.md | 72 ++++++++++++++++---------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/images/win/Windows2022-Readme.md b/images/win/Windows2022-Readme.md index 06a7ee8024f2..a62122df626b 100644 --- a/images/win/Windows2022-Readme.md +++ b/images/win/Windows2022-Readme.md @@ -4,7 +4,7 @@ *** # Windows Server 2022 - OS Version: 10.0.20348 Build 1668 -- Image Version: 20230417.1 +- Image Version: 20230425.1 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -15,7 +15,7 @@ - Bash 5.2.15(1)-release - Go 1.20.3 - Julia 1.8.5 -- Kotlin 1.8.20 +- Kotlin 1.8.21 - LLVM 15.0.7 - Node 18.16.0 - Perl 5.32.1 @@ -27,13 +27,13 @@ - Chocolatey 1.3.1 - Composer 2.5.5 - Helm 3.11.2 -- Miniconda 23.1.0 (pre-installed on the image but not added to PATH) +- Miniconda 23.3.1 (pre-installed on the image but not added to PATH) - NPM 9.5.1 - NuGet 6.5.0.154 -- pip 23.1 (python 3.9) +- pip 23.1.1 (python 3.9) - Pipx 1.2.0 - RubyGems 3.2.33 -- Vcpkg (build from commit 2180302c3) +- Vcpkg (build from commit b66959587) - Yarn 1.22.19 #### Environment variables @@ -51,21 +51,21 @@ ### Tools - 7zip 22.01 - aria2 1.36.0 -- azcopy 10.18.0 -- Bazel 6.1.1 +- azcopy 10.18.1 +- Bazel 6.1.2 - Bazelisk 1.13.2 - Bicep 0.16.2 - Cabal 3.10.1.0 - CMake 3.26.3 -- CodeQL Action Bundles 2.12.5 2.12.6 +- CodeQL Action Bundles 2.12.6 2.13.0 - Docker 23.0.4 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.17.2 +- Docker Compose v2 2.17.3 - Docker-wincred 0.7.0 - ghc 9.6.1 -- Git 2.40.0.windows.1 +- Git 2.40.1.windows.1 - Git LFS 3.3.0 -- ImageMagick 7.1.1-6 +- ImageMagick 7.1.1-8 - InnoSetup 6.2.2 - jq 1.6 - Kind 0.18.0 @@ -76,51 +76,51 @@ - NSIS 3.08 - OpenSSL 1.1.1t - Packer 1.8.5 -- Pulumi 3.63.0 -- R 4.2.3 +- Pulumi 3.64.0 +- R 4.3.0 - Service Fabric SDK 9.1.1436.9590 - Stack 2.9.3 - Subversion (SVN) 1.14.2 - Swig 4.1.1 -- VSWhere 3.1.1 +- VSWhere 3.1.4 - WinAppDriver 1.2.2009.02003 - WiX Toolset 3.11.2.4516 -- yamllint 1.30.0 +- yamllint 1.31.0 - zstd 1.5.5 ### CLI Tools -- Alibaba Cloud CLI 3.0.161 -- AWS CLI 2.11.11 -- AWS SAM CLI 1.80.0 +- Alibaba Cloud CLI 3.0.162 +- AWS CLI 2.11.13 +- AWS SAM CLI 1.81.0 - AWS Session Manager CLI 1.2.463.0 -- Azure CLI 2.47.0 +- Azure CLI 2.48.1 - Azure DevOps CLI extension 0.26.0 -- GitHub CLI 2.27.0 +- GitHub CLI 2.28.0 - Hub CLI 2.14.2 ### Rust Tools -- Cargo 1.68.2 -- Rust 1.68.2 -- Rustdoc 1.68.2 -- Rustup 1.25.2 +- Cargo 1.69.0 +- Rust 1.69.0 +- Rustdoc 1.69.0 +- Rustup 1.26.0 #### Packages - bindgen 0.65.1 - cargo-audit 0.17.5 - cargo-outdated 0.11.2 - cbindgen 0.24.3 -- Clippy 0.1.68 -- Rustfmt 1.5.1 +- Clippy 0.1.69 +- Rustfmt 1.5.2 ### Browsers and Drivers -- Google Chrome 112.0.5615.121 +- Google Chrome 112.0.5615.138 - Chrome Driver 112.0.5615.49 -- Microsoft Edge 112.0.1722.48 -- Microsoft Edge Driver 112.0.1722.48 -- Mozilla Firefox 112.0.1 +- Microsoft Edge 112.0.1722.58 +- Microsoft Edge Driver 112.0.1722.58 +- Mozilla Firefox 112.0.2 - Gecko Driver 0.33.0 - IE Driver 4.8.0.0 -- Selenium server 4.8.0 +- Selenium server 4.9.0 #### Environment variables | Name | Value | @@ -133,9 +133,9 @@ ### Java | Version | Vendor | Environment Variable | | ------------------- | --------------- | -------------------- | -| 8.0.362+9 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | -| 11.0.18+10 | Eclipse Temurin | JAVA_HOME_11_X64 | -| 17.0.6+10 | Eclipse Temurin | JAVA_HOME_17_X64 | +| 8.0.372+7 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | +| 11.0.19+7 | Eclipse Temurin | JAVA_HOME_11_X64 | +| 17.0.7+7 | Eclipse Temurin | JAVA_HOME_17_X64 | ### Shells | Name | Target | @@ -543,10 +543,10 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Az (Cached): 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.314 +- AWSPowershell: 4.1.319 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 -- Microsoft.Graph: 1.25.0 +- Microsoft.Graph: 1.26.0 - Pester: 3.4.0, 5.4.1 - PowerShellGet: 1.0.0.1, 2.2.5 - PSScriptAnalyzer: 1.21.0 From 6a893d200c2728607f6132c8218a657a6496eb3f Mon Sep 17 00:00:00 2001 From: Steve-Glass <84886334+Steve-Glass@users.noreply.github.com> Date: Thu, 27 Apr 2023 09:37:05 -0400 Subject: [PATCH 1885/3485] Update REAME with OS 13 and remove 10.15 (#7481) --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 05bdb94ec24d..fe4c382e368b 100644 --- a/README.md +++ b/README.md @@ -23,9 +23,9 @@ To build a VM machine from this repo's source, see the [instructions](docs/creat | --------------------|---------------------|--------------------|---------------------| | Ubuntu 22.04 | `ubuntu-latest` or `ubuntu-22.04` | [ubuntu-22.04] | [![status22](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu22&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu22&redirect=1) | Ubuntu 20.04 | `ubuntu-20.04` | [ubuntu-20.04] | [![status20](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu20&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu20&redirect=1) -| macOS 12 | `macos-latest` or `macos-12`| [macOS-12] | [![statusumac12](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-12&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-12&redirect=1) +| macOS 13 [beta] | `macos-13` or `macos-13-xl`| [macOS-13](https://github.com/actions/runner-images/blob/main/images/macos/macos-13-Readme.md) | TBD +| macOS 12 | `macos-latest`, `macos-latest-xl`, `macos-12`, or `macos-12-xl`| [macOS-12] | [![statusumac12](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-12&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-12&redirect=1) | macOS 11 | `macos-11`| [macOS-11] | [![statusmac11](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-11&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-11&redirect=1) -| macOS 10.15 <sup>deprecated</sup> | `macos-10.15` | [macOS-10.15] | [![statusmac10](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-10.15&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-10.15&redirect=1) | Windows Server 2022 | `windows-latest` or `windows-2022` | [windows-2022] | [![statuswin22](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=windows-2022&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=windows-2022&redirect=1) | | Windows Server 2019 | `windows-2019` | [windows-2019] | [![statuswin19](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=windows-2019&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=windows-2019&redirect=1) From 0a7aae6aafe5e59765f8d7731edfa32f72188e64 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 27 Apr 2023 14:25:53 +0000 Subject: [PATCH 1886/3485] Windows Server 2019 (20230425) Image Update (#7494) * Updating readme file for win19 version 20230425.1 * Update Windows2019-Readme.md --------- Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2019-Readme.md | 74 ++++++++++++++++---------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index c7ee3081e527..35eb29e9f439 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -4,7 +4,7 @@ *** # Windows Server 2019 - OS Version: 10.0.17763 Build 4252 -- Image Version: 20230417.2 +- Image Version: 20230425.1 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -15,7 +15,7 @@ - Bash 5.2.15(1)-release - Go 1.20.3 - Julia 1.8.5 -- Kotlin 1.8.20 +- Kotlin 1.8.21 - LLVM 15.0.7 - Node 18.16.0 - Perl 5.32.1 @@ -27,13 +27,13 @@ - Chocolatey 1.3.1 - Composer 2.5.5 - Helm 3.11.2 -- Miniconda 23.1.0 (pre-installed on the image but not added to PATH) +- Miniconda 23.3.1 (pre-installed on the image but not added to PATH) - NPM 9.5.1 - NuGet 6.5.0.154 -- pip 23.1 (python 3.7) +- pip 23.1.1 (python 3.7) - Pipx 1.2.0 - RubyGems 2.7.6.3 -- Vcpkg (build from commit 2180302c3) +- Vcpkg (build from commit b66959587) - Yarn 1.22.19 #### Environment variables @@ -51,22 +51,22 @@ ### Tools - 7zip 22.01 - aria2 1.36.0 -- azcopy 10.18.0 -- Bazel 6.1.1 +- azcopy 10.18.1 +- Bazel 6.1.2 - Bazelisk 1.13.2 - Bicep 0.16.2 - Cabal 3.10.1.0 - CMake 3.26.3 -- CodeQL Action Bundles 2.12.5 2.12.6 +- CodeQL Action Bundles 2.12.6 2.13.0 - Docker 23.0.4 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.17.2 +- Docker Compose v2 2.17.3 - Docker-wincred 0.7.0 - ghc 9.6.1 -- Git 2.40.0.windows.1 +- Git 2.40.1.windows.1 - Git LFS 3.3.0 -- Google Cloud SDK 426.0.0 -- ImageMagick 7.1.1-6 +- Google Cloud SDK 428.0.0 +- ImageMagick 7.1.1-8 - InnoSetup 6.2.2 - jq 1.6 - Kind 0.18.0 @@ -78,52 +78,52 @@ - OpenSSL 1.1.1t - Packer 1.8.5 - Parcel 2.8.3 -- Pulumi 3.63.0 -- R 4.2.3 +- Pulumi 3.64.0 +- R 4.3.0 - Service Fabric SDK 9.1.1436.9590 - Stack 2.9.3 - Subversion (SVN) 1.14.2 - Swig 4.1.1 -- VSWhere 3.1.1 +- VSWhere 3.1.4 - WinAppDriver 1.2.2009.02003 - WiX Toolset 3.11.2.4516 -- yamllint 1.30.0 +- yamllint 1.31.0 - zstd 1.5.5 ### CLI Tools -- Alibaba Cloud CLI 3.0.161 -- AWS CLI 2.11.11 -- AWS SAM CLI 1.80.0 +- Alibaba Cloud CLI 3.0.162 +- AWS CLI 2.11.13 +- AWS SAM CLI 1.81.0 - AWS Session Manager CLI 1.2.463.0 -- Azure CLI 2.47.0 +- Azure CLI 2.48.1 - Azure DevOps CLI extension 0.26.0 - Cloud Foundry CLI 6.53.0 -- GitHub CLI 2.27.0 +- GitHub CLI 2.28.0 - Hub CLI 2.14.2 ### Rust Tools -- Cargo 1.68.2 -- Rust 1.68.2 -- Rustdoc 1.68.2 -- Rustup 1.25.2 +- Cargo 1.69.0 +- Rust 1.69.0 +- Rustdoc 1.69.0 +- Rustup 1.26.0 #### Packages - bindgen 0.65.1 - cargo-audit 0.17.5 - cargo-outdated 0.11.2 - cbindgen 0.24.3 -- Clippy 0.1.68 -- Rustfmt 1.5.1 +- Clippy 0.1.69 +- Rustfmt 1.5.2 ### Browsers and Drivers -- Google Chrome 112.0.5615.121 +- Google Chrome 112.0.5615.138 - Chrome Driver 112.0.5615.49 -- Microsoft Edge 112.0.1722.48 -- Microsoft Edge Driver 112.0.1722.48 -- Mozilla Firefox 112.0.1 +- Microsoft Edge 112.0.1722.58 +- Microsoft Edge Driver 112.0.1722.58 +- Mozilla Firefox 112.0.2 - Gecko Driver 0.33.0 - IE Driver 4.8.0.0 -- Selenium server 4.8.0 +- Selenium server 4.9.0 #### Environment variables | Name | Value | @@ -136,10 +136,10 @@ ### Java | Version | Vendor | Environment Variable | | ------------------- | --------------- | -------------------- | -| 8.0.362+9 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | -| 11.0.18+10 | Eclipse Temurin | JAVA_HOME_11_X64 | +| 8.0.372+7 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | +| 11.0.19+7 | Eclipse Temurin | JAVA_HOME_11_X64 | | 13.0.2+8.1 | Adopt OpenJDK | JAVA_HOME_13_X64 | -| 17.0.6+10 | Eclipse Temurin | JAVA_HOME_17_X64 | +| 17.0.7+7 | Eclipse Temurin | JAVA_HOME_17_X64 | ### Shells | Name | Target | @@ -512,10 +512,10 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Az (Cached): 1.0.0.zip, 1.6.0.zip, 2.3.2.zip, 2.6.0.zip, 3.1.0.zip, 3.5.0.zip, 3.8.0.zip, 4.3.0.zip, 4.4.0.zip, 4.7.0.zip, 5.5.0.zip, 5.9.0.zip, 6.6.0.zip, 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.314 +- AWSPowershell: 4.1.319 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 -- Microsoft.Graph: 1.25.0 +- Microsoft.Graph: 1.26.0 - Pester: 3.4.0, 5.4.1 - PowerShellGet: 1.0.0.1, 2.2.5 - PSScriptAnalyzer: 1.21.0 From 7be76e40f4c040a3256ef472fe50104d55623d49 Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Thu, 27 Apr 2023 17:43:18 +0200 Subject: [PATCH 1887/3485] [Ubuntu] Update libssl1.1 link for SQL installer (#7500) --- images/linux/scripts/installers/sqlpackage.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/linux/scripts/installers/sqlpackage.sh b/images/linux/scripts/installers/sqlpackage.sh index bbebb58b1efd..388967cb8822 100644 --- a/images/linux/scripts/installers/sqlpackage.sh +++ b/images/linux/scripts/installers/sqlpackage.sh @@ -10,8 +10,8 @@ source $HELPER_SCRIPTS/os.sh # Install libssl1.1 dependency if isUbuntu22; then - download_with_retries "http://security.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.1f-1ubuntu2.17_amd64.deb" "/tmp" - dpkg -i /tmp/libssl1.1_1.1.1f-1ubuntu2.17_amd64.deb + download_with_retries "http://security.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.1f-1ubuntu2.18_amd64.deb" "/tmp" + dpkg -i /tmp/libssl1.1_1.1.1f-1ubuntu2.18_amd64.deb fi # Install SqlPackage From a32a87c346b12485bf8e1ba3d285de855e0b0e4c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 28 Apr 2023 06:57:57 +0000 Subject: [PATCH 1888/3485] Updating readme file for macOS-11 version 20230425.1 (#7499) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-11-Readme.md | 76 ++++++++++++++++----------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/images/macos/macos-11-Readme.md b/images/macos/macos-11-Readme.md index 5b7eb4a669d5..caa5db0be082 100644 --- a/images/macos/macos-11-Readme.md +++ b/images/macos/macos-11-Readme.md @@ -1,7 +1,7 @@ # macOS 11 - OS Version: macOS 11.7.6 (20G1231) - Kernel Version: Darwin 20.6.0 -- Image Version: 20230416.1 +- Image Version: 20230425.1 ## Installed Software @@ -18,7 +18,7 @@ - GNU Fortran 12 (Homebrew GCC 12.2.0) - available by `gfortran-12` alias - Go 1.20.3 - Julia 1.8.5 -- Kotlin 1.8.20-release-327 +- Kotlin 1.8.21-release-380 - Mono 6.12.0.188 - MSBuild 16.10.1.51301 (Mono 6.12.0.188) - Node.js 18.16.0 @@ -28,23 +28,23 @@ - PHP 8.2.5 - Python 2.7.18 - Python3 3.11.3 -- R 4.2.3 +- R 4.3.0 - Ruby 2.7.8p225 ### Package Management - Bundler 2.4.12 - Carthage 0.39.0 -- CocoaPods 1.12.0 +- CocoaPods 1.12.1 - Composer 2.5.5 -- Homebrew 4.0.13 -- Miniconda 23.1.0 +- Homebrew 4.0.15 +- Miniconda 23.3.1 - NPM 9.5.1 - NuGet 6.3.1.1 - Pip 20.3.4 (python 2.7) -- Pip3 23.1 (python 3.11) +- Pip3 23.1.1 (python 3.11) - Pipx 1.2.0 - RubyGems 3.4.12 -- Vcpkg 2023 (build from commit 501db0f17) +- Vcpkg 2023 (build from commit b66959587) - Yarn 1.22.19 #### Environment variables @@ -56,26 +56,26 @@ ### Project Management - Apache Ant 1.10.13 - Apache Maven 3.9.1 -- Gradle 8.1 +- Gradle 8.1.1 - Sbt 1.8.2 ### Utilities - 7-Zip 17.05 - aria2 1.36.0 -- azcopy 10.18.0 -- bazel 6.1.1 +- azcopy 10.18.1 +- bazel 6.1.2 - bazelisk 1.16.0 - bsdtar 3.3.2 - available by 'tar' alias - Curl 8.0.1 -- Git 2.40.0 +- Git 2.40.1 - Git LFS 3.3.0 -- GitHub CLI 2.27.0 +- GitHub CLI 2.28.0 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.3 - gpg (GnuPG) 2.4.0 - helm v3.11.3+g66a969e - Hub CLI 2.14.2 -- ImageMagick 7.1.1-6 +- ImageMagick 7.1.1-8 - jq 1.6 - mongo 5.0.15 - mongod 5.0.15 @@ -86,45 +86,45 @@ - psql (PostgreSQL) 14.7 (Homebrew) - Sox 14.4.2 - Subversion (SVN) 1.14.2 -- Switchaudio-osx 1.2.1 +- Switchaudio-osx 1.2.2 - yq 4.33.3 - zstd 1.5.5 ### Tools - Aliyun CLI 3.0.161 -- App Center CLI 2.13.4 -- AWS CLI 2.11.13 -- AWS SAM CLI 1.79.0 +- App Center CLI 2.13.6 +- AWS CLI 2.11.15 +- AWS SAM CLI 1.81.0 - AWS Session Manager CLI 1.2.463.0 -- Azure CLI 2.47.0 +- Azure CLI 2.48.1 - Azure CLI (azure-devops) 0.26.0 - Bicep CLI 0.16.2 - Cabal 3.6.2.0 - Cmake 3.26.3 -- CodeQL Action Bundles 2.12.5 2.12.6 +- CodeQL Action Bundles 2.12.6 2.13.0 - Fastlane 2.212.2 - GHC 9.6.1 - GHCup 0.1.19.2 - Jazzy 0.14.3 - Stack 2.9.3 -- SwiftFormat 0.51.6 +- SwiftFormat 0.51.7 - Swig 4.1.1 - Xcode Command Line Tools 13.2.0.0.1.1638488800 ### Linters - SwiftLint 0.48.0 -- Yamllint 1.30.0 +- Yamllint 1.31.0 ### Browsers - Safari 16.4.1 (16615.1.26.101.10) - SafariDriver 16.4.1 (16615.1.26.101.10) -- Google Chrome 112.0.5615.121 +- Google Chrome 112.0.5615.137 - ChromeDriver 112.0.5615.49 -- Microsoft Edge 112.0.1722.48 -- Microsoft Edge WebDriver 112.0.1722.48 -- Mozilla Firefox 112.0 +- Microsoft Edge 112.0.1722.58 +- Microsoft Edge WebDriver 112.0.1722.58 +- Mozilla Firefox 112.0.2 - geckodriver 0.33.0 -- Selenium server 4.8.0 +- Selenium server 4.9.0 #### Environment variables | Name | Value | @@ -136,9 +136,9 @@ ### Java | Version | Vendor | Environment Variable | | ------------------- | --------------- | -------------------- | -| 8.0.362+9 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | -| 11.0.18+10 | Eclipse Temurin | JAVA_HOME_11_X64 | -| 17.0.6+10 | Eclipse Temurin | JAVA_HOME_17_X64 | +| 8.0.372+7 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | +| 11.0.19+7 | Eclipse Temurin | JAVA_HOME_11_X64 | +| 17.0.7+7 | Eclipse Temurin | JAVA_HOME_17_X64 | ### Cached Tools @@ -174,24 +174,24 @@ - 1.20.3 ### Rust Tools -- Cargo 1.68.2 -- Rust 1.68.2 -- Rustdoc 1.68.2 -- Rustup 1.25.2 +- Cargo 1.69.0 +- Rust 1.69.0 +- Rustdoc 1.69.0 +- Rustup 1.26.0 #### Packages - Bindgen 0.65.1 - Cargo-audit 0.17.5 - Cargo-outdated 0.11.2 - Cbindgen 0.24.3 -- Clippy 0.1.68 -- Rustfmt 1.5.1-stable +- Clippy 0.1.69 +- Rustfmt 1.5.2-stable ### PowerShell Tools - PowerShell 7.2.11 #### PowerShell Modules -- Az: 9.6.0 +- Az: 9.7.0 - MarkdownPS: 1.9 - Pester: 5.4.1 - PSScriptAnalyzer: 1.21.0 @@ -347,7 +347,7 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" ### Miscellaneous - libXext 1.3.5 -- libXft 2.3.7 +- libXft 2.3.8 - Tcl/Tk 8.6.13_2 - Zlib 1.2.13 From 9f5b4b2fd324f9d799d8502e0d36fe6d2fe0f413 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Fri, 28 Apr 2023 10:07:08 +0200 Subject: [PATCH 1889/3485] [macOS] Fix software report for macos 13 (#7510) --- images/macos/software-report/SoftwareReport.Common.psm1 | 2 +- .../macos/software-report/SoftwareReport.Generator.ps1 | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/images/macos/software-report/SoftwareReport.Common.psm1 b/images/macos/software-report/SoftwareReport.Common.psm1 index 38b34d5f27d0..c060f453e608 100644 --- a/images/macos/software-report/SoftwareReport.Common.psm1 +++ b/images/macos/software-report/SoftwareReport.Common.psm1 @@ -634,4 +634,4 @@ function Get-ColimaVersion { function Get-PKGConfigVersion { $pkgconfigVersion = Run-Command "pkg-config --version" return $pkgconfigVersion -} +} \ No newline at end of file diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1 index a69e53949bb0..908fd5b39f6e 100644 --- a/images/macos/software-report/SoftwareReport.Generator.ps1 +++ b/images/macos/software-report/SoftwareReport.Generator.ps1 @@ -38,10 +38,10 @@ $languageAndRuntime.AddToolVersion("Bash", $(Get-BashVersion)) $languageAndRuntime.AddNodes($(Get-ClangLLVMVersions)) $languageAndRuntime.AddNodes($(Get-GccVersions)) $languageAndRuntime.AddNodes($(Get-FortranVersions)) -$languageAndRuntime.AddToolVersion("Go", $(Get-GoVersion)) $languageAndRuntime.AddToolVersion("Julia", $(Get-JuliaVersion)) $languageAndRuntime.AddToolVersion("Kotlin", $(Get-KotlinVersion)) if (-not $os.IsVentura) { + $languageAndRuntime.AddToolVersion("Go", $(Get-GoVersion)) $languageAndRuntime.AddToolVersion("Mono", $(Get-MonoVersion)) $languageAndRuntime.AddToolVersion("MSBuild", $(Get-MSBuildVersion)) $languageAndRuntime.AddToolVersion("Node.js", $(Get-NodeVersion)) @@ -68,8 +68,8 @@ if (-not $os.IsVentura) { $packageManagement.AddToolVersion("Miniconda", $(Get-CondaVersion)) } $packageManagement.AddToolVersion("NPM", $(Get-NPMVersion)) -$packageManagement.AddToolVersion("NuGet", $(Get-NuGetVersion)) if (-not $os.IsVentura) { + $packageManagement.AddToolVersion("NuGet", $(Get-NuGetVersion)) $packageManagement.AddToolVersion("Pip", $(Get-PipVersion -Version 2)) $packageManagement.AddToolVersion("Pip3", $(Get-PipVersion -Version 3)) $packageManagement.AddToolVersion("Pipx", $(Get-PipxVersion)) @@ -78,8 +78,9 @@ $packageManagement.AddToolVersion("RubyGems", $(Get-RubyGemsVersion)) $packageManagement.AddToolVersion("Vcpkg", $(Get-VcpkgVersion)) $packageManagement.AddToolVersion("Yarn", $(Get-YarnVersion)) -$packageManagement.AddNode($(Build-PackageManagementEnvironmentTable)) - +if (-not $os.IsVentura) { + $packageManagement.AddNode($(Build-PackageManagementEnvironmentTable)) +} # Project Management $projectManagement = $installedSoftware.AddHeader("Project Management") $projectManagement.AddToolVersion("Apache Ant", $(Get-ApacheAntVersion)) From a67e67d42ecac54c57d53484129e7f24d58e81db Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Fri, 28 Apr 2023 10:35:14 +0200 Subject: [PATCH 1890/3485] Add exclusion for macOS-12 for Action: restart (#7511) --- .../macos/anka/CreateCleanAnkaTemplate.ps1 | 37 +++++++++++-------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/images.CI/macos/anka/CreateCleanAnkaTemplate.ps1 b/images.CI/macos/anka/CreateCleanAnkaTemplate.ps1 index 634734b69fd5..6c3a90508f53 100644 --- a/images.CI/macos/anka/CreateCleanAnkaTemplate.ps1 +++ b/images.CI/macos/anka/CreateCleanAnkaTemplate.ps1 @@ -86,22 +86,27 @@ function Invoke-SoftwareUpdate { Install-SoftwareUpdate -HostName $ipAddress -listOfUpdates $listOfNewUpdates | Show-StringWithFormat # Check if Action: restart - if ($newUpdates.Contains("Action: restart")) { - Write-Host "`t[*] Sleep 60 seconds before the software updates have been installed" - Start-Sleep -Seconds 60 - - Write-Host "`t[*] Waiting for loginwindow process" - Wait-LoginWindow -HostName $ipAddress | Show-StringWithFormat - - # Re-enable AutoLogon after installing a new security software update - Invoke-EnableAutoLogon - - # Check software updates have been installed - $updates = Get-SoftwareUpdate -HostName $ipAddress - if ($updates.Contains("Action: restart")) { - Write-Host "`t[x] Software updates failed to install: $updates" - Show-StringWithFormat $updates - exit 1 + # Make an array of updates + $listOfNewUpdates = $newUpdates.split('*').Trim('') + foreach ($newupdate in $listOfNewUpdates) { + # Will be True if the value is not Venture, not empty, and contains "Action: restart" words + if ($newupdate.Contains("Action: restart") -and !$newupdate.Contains("macOS Ventura") -and (-not [String]::IsNullOrEmpty($newupdate))) { + Write-Host "`t[*] Sleep 60 seconds before the software updates have been installed" + Start-Sleep -Seconds 60 + + Write-Host "`t[*] Waiting for loginwindow process" + Wait-LoginWindow -HostName $ipAddress | Show-StringWithFormat + + # Re-enable AutoLogon after installing a new security software update + Invoke-EnableAutoLogon + + # Check software updates have been installed + $updates = Get-SoftwareUpdate -HostName $ipAddress + if ($updates.Contains("Action: restart")) { + Write-Host "`t[x] Software updates failed to install: " + Show-StringWithFormat $updates + exit 1 + } } } From 816adb335a8f322b844463a50fbbeead1b82501c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 28 Apr 2023 14:03:43 +0000 Subject: [PATCH 1891/3485] Updating readme file for macOS-12 version 20230425.1 (#7501) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-12-Readme.md | 76 ++++++++++++++++----------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/images/macos/macos-12-Readme.md b/images/macos/macos-12-Readme.md index 2efca4274f92..10708c3de5f0 100644 --- a/images/macos/macos-12-Readme.md +++ b/images/macos/macos-12-Readme.md @@ -1,7 +1,7 @@ # macOS 12 - OS Version: macOS 12.6.5 (21G531) - Kernel Version: Darwin 21.6.0 -- Image Version: 20230416.1 +- Image Version: 20230425.1 ## Installed Software @@ -16,7 +16,7 @@ - GNU Fortran 12 (Homebrew GCC 12.2.0) - available by `gfortran-12` alias - Go 1.20.3 - Julia 1.8.5 -- Kotlin 1.8.20-release-327 +- Kotlin 1.8.21-release-380 - Mono 6.12.0.188 - MSBuild 16.10.1.51301 (Mono 6.12.0.188) - Node.js 18.16.0 @@ -26,23 +26,23 @@ - PHP 8.2.5 - Python 2.7.18 - Python3 3.11.3 -- R 4.2.3 +- R 4.3.0 - Ruby 3.0.6p216 ### Package Management - Bundler 2.4.12 - Carthage 0.39.0 -- CocoaPods 1.12.0 +- CocoaPods 1.12.1 - Composer 2.5.5 -- Homebrew 4.0.13 -- Miniconda 23.1.0 +- Homebrew 4.0.15 +- Miniconda 23.3.1 - NPM 9.5.1 - NuGet 6.3.1.1 - Pip 20.3.4 (python 2.7) -- Pip3 23.1 (python 3.11) +- Pip3 23.1.1 (python 3.11) - Pipx 1.2.0 - RubyGems 3.4.12 -- Vcpkg 2023 (build from commit 501db0f17) +- Vcpkg 2023 (build from commit b66959587) - Yarn 1.22.19 #### Environment variables @@ -54,25 +54,25 @@ ### Project Management - Apache Ant 1.10.13 - Apache Maven 3.9.1 -- Gradle 8.1 +- Gradle 8.1.1 - Sbt 1.8.2 ### Utilities - 7-Zip 17.05 - aria2 1.36.0 -- azcopy 10.18.0 -- bazel 6.1.1 +- azcopy 10.18.1 +- bazel 6.1.2 - bazelisk 1.16.0 - bsdtar 3.5.1 - available by 'tar' alias - Curl 8.0.1 -- Git 2.40.0 +- Git 2.40.1 - Git LFS 3.3.0 -- GitHub CLI 2.27.0 +- GitHub CLI 2.28.0 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.3 - gpg (GnuPG) 2.4.0 - Hub CLI 2.14.2 -- ImageMagick 7.1.1-6 +- ImageMagick 7.1.1-8 - jq 1.6 - mongo 5.0.15 - mongod 5.0.15 @@ -82,47 +82,47 @@ - psql (PostgreSQL) 14.7 (Homebrew) - Sox 14.4.2 - Subversion (SVN) 1.14.2 -- Switchaudio-osx 1.2.1 +- Switchaudio-osx 1.2.2 - Vagrant 2.3.4 - VirtualBox 6.1.38r153438 - yq 4.33.3 - zstd 1.5.5 ### Tools -- App Center CLI 2.13.4 -- AWS CLI 2.11.13 -- AWS SAM CLI 1.79.0 +- App Center CLI 2.13.6 +- AWS CLI 2.11.15 +- AWS SAM CLI 1.81.0 - AWS Session Manager CLI 1.2.463.0 -- Azure CLI 2.47.0 +- Azure CLI 2.48.1 - Azure CLI (azure-devops) 0.26.0 - Bicep CLI 0.16.2 - Cabal 3.6.2.0 - Cmake 3.26.3 -- CodeQL Action Bundles 2.12.5 2.12.6 +- CodeQL Action Bundles 2.12.6 2.13.0 - Colima 0.5.4 - Fastlane 2.212.2 - GHC 9.6.1 - GHCup 0.1.19.2 - Jazzy 0.14.3 - Stack 2.9.3 -- SwiftFormat 0.51.6 +- SwiftFormat 0.51.7 - Swig 4.1.1 - Xcode Command Line Tools 14.2.0.0.1.1668646533 ### Linters - SwiftLint 0.51.0 -- Yamllint 1.30.0 +- Yamllint 1.31.0 ### Browsers - Safari 16.4.1 (17615.1.26.101.10) - SafariDriver 16.4.1 (17615.1.26.101.10) -- Google Chrome 112.0.5615.121 +- Google Chrome 112.0.5615.137 - ChromeDriver 112.0.5615.49 -- Microsoft Edge 112.0.1722.48 -- Microsoft Edge WebDriver 112.0.1722.48 -- Mozilla Firefox 112.0 +- Microsoft Edge 112.0.1722.58 +- Microsoft Edge WebDriver 112.0.1722.58 +- Mozilla Firefox 112.0.2 - geckodriver 0.33.0 -- Selenium server 4.8.0 +- Selenium server 4.9.0 #### Environment variables | Name | Value | @@ -134,9 +134,9 @@ ### Java | Version | Vendor | Environment Variable | | ------------------- | --------------- | -------------------- | -| 8.0.362+9 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | -| 11.0.18+10 | Eclipse Temurin | JAVA_HOME_11_X64 | -| 17.0.6+10 | Eclipse Temurin | JAVA_HOME_17_X64 | +| 8.0.372+7 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | +| 11.0.19+7 | Eclipse Temurin | JAVA_HOME_11_X64 | +| 17.0.7+7 | Eclipse Temurin | JAVA_HOME_17_X64 | ### Cached Tools @@ -169,24 +169,24 @@ - 1.20.3 ### Rust Tools -- Cargo 1.68.2 -- Rust 1.68.2 -- Rustdoc 1.68.2 -- Rustup 1.25.2 +- Cargo 1.69.0 +- Rust 1.69.0 +- Rustdoc 1.69.0 +- Rustup 1.26.0 #### Packages - Bindgen 0.65.1 - Cargo-audit 0.17.5 - Cargo-outdated 0.11.2 - Cbindgen 0.24.3 -- Clippy 0.1.68 -- Rustfmt 1.5.1-stable +- Clippy 0.1.69 +- Rustfmt 1.5.2-stable ### PowerShell Tools - PowerShell 7.2.11 #### PowerShell Modules -- Az: 9.6.0 +- Az: 9.7.0 - MarkdownPS: 1.9 - Pester: 5.4.1 - PSScriptAnalyzer: 1.21.0 @@ -345,7 +345,7 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" ### Miscellaneous - libXext 1.3.5 -- libXft 2.3.7 +- libXft 2.3.8 - Tcl/Tk 8.6.13_2 - Zlib 1.2.13 From 0b558a470e1e916e0d3e1e020a216ffdde1810e7 Mon Sep 17 00:00:00 2001 From: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com> Date: Sat, 29 Apr 2023 09:21:12 +0200 Subject: [PATCH 1892/3485] [macos] add macOS-13 to issue template (#7515) --- .github/ISSUE_TEMPLATE/bug-report.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml index 9d2337eda44f..c860387987f0 100644 --- a/.github/ISSUE_TEMPLATE/bug-report.yml +++ b/.github/ISSUE_TEMPLATE/bug-report.yml @@ -23,6 +23,7 @@ body: - label: Ubuntu 22.04 - label: macOS 11 - label: macOS 12 + - label: macOS 13 - label: Windows Server 2019 - label: Windows Server 2022 - type: textarea From f4bbf91a0801f0f6d4ca07879837ab142bb3c944 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Tue, 2 May 2023 16:28:19 +0200 Subject: [PATCH 1893/3485] [macOS] Delete macOS 10.15 readme file (#7520) --- images/macos/macos-10.15-Readme.md | 396 ----------------------------- 1 file changed, 396 deletions(-) delete mode 100644 images/macos/macos-10.15-Readme.md diff --git a/images/macos/macos-10.15-Readme.md b/images/macos/macos-10.15-Readme.md deleted file mode 100644 index 65c5b435aa45..000000000000 --- a/images/macos/macos-10.15-Readme.md +++ /dev/null @@ -1,396 +0,0 @@ -| Announcements | -|-| -| [macOS-latest workflows will use macOS-12](https://github.com/actions/runner-images/issues/6384) | -| [[all OSs] The VCPKG_ROOT variable will be removed from runner images](https://github.com/actions/runner-images/issues/6376) | -| [The macOS 10.15 Actions runner image will begin deprecation on 5/31/22 and will be fully unsupported by 12/1/22 for GitHub and ADO](https://github.com/actions/runner-images/issues/5583) | -*** -# macOS 10.15 info -- System Version: macOS 10.15.7 (19H2026) -- Kernel Version: Darwin 19.6.0 -- Image Version: 20221018.1 - -## Installed Software -### Language and Runtime -- .NET SDK 3.1.101 3.1.201 3.1.302 3.1.424 5.0.102 5.0.202 5.0.302 5.0.408 -- Bash 3.2.57(1)-release -- Clang/LLVM 12.0.0 is default -- Clang/LLVM 14.0.6 is available on `'$(brew --prefix llvm@14)/bin/clang'` -- gcc-9 (Homebrew GCC 9.5.0) 9.5.0 - available by `gcc-9` alias -- gcc-10 (Homebrew GCC 10.4.0) 10.4.0 - available by `gcc-10` alias -- gcc-11 (Homebrew GCC 11.3.0) 11.3.0 - available by `gcc-11` alias -- GNU Fortran (Homebrew GCC 9.5.0) 9.5.0 - available by `gfortran-9` alias -- GNU Fortran (Homebrew GCC 10.4.0) 10.4.0 - available by `gfortran-10` alias -- GNU Fortran (Homebrew GCC 11.3.0) 11.3.0 - available by `gfortran-11` alias -- Go 1.17.13 -- julia 1.8.2 -- Kotlin 1.7.20-release-201 -- MSBuild 16.10.1.31401 (from /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/15.0/bin/MSBuild.dll) -- Node.js v16.18.0 -- NVM 0.39.2 -- NVM - Cached node versions: v12.22.12 v14.20.1 v16.18.0 -- Perl 5.36.0 -- PHP 8.1.11 -- Python 2.7.18 -- Python 3.10.8 -- R 4.2.1 -- Ruby 2.7.6p219 - -### Package Management -- Bundler version 2.3.24 -- Carthage 0.38.0 -- CocoaPods 1.11.3 -- Composer 2.4.3 -- Homebrew 3.6.6 -- Miniconda 4.12.0 -- NPM 8.19.2 -- NuGet 6.2.1.2 -- Pip 20.3.4 (python 2.7) -- Pip 22.2.2 (python 3.10) -- Pipx 1.1.0 -- RubyGems 3.3.24 -- Vcpkg 2022 (build from master \<f4b262b25>) -- Yarn 1.22.19 - -#### Environment variables -| Name | Value | -| ----------------------- | ---------------------- | -| CONDA | /usr/local/miniconda | -| VCPKG_INSTALLATION_ROOT | /usr/local/share/vcpkg | -| VCPKG_ROOT | /usr/local/share/vcpkg | - -### Project Management -- Apache Ant(TM) 1.10.12 -- Apache Maven 3.8.6 -- Gradle 7.5.1 -- Sbt 1.7.2 - -### Utilities -- 7-Zip 17.04 -- aria2 1.36.0 -- azcopy 10.16.1 -- bazel 5.3.1 -- bazelisk 1.14.0 -- bsdtar 3.3.2 - available by 'tar' alias -- Curl 7.85.0 -- Git 2.38.1 -- Git LFS: 3.2.0 -- GitHub CLI: 2.18.0 -- GNU parallel 20220922 -- GNU Tar 1.34 - available by 'gtar' alias -- GNU Wget 1.21.3 -- gpg (GnuPG) 2.3.8 -- helm v3.10.1+g9f88ccb -- Hub CLI: 2.14.2 -- ImageMagick 7.1.0-51 -- jq 1.6 -- mongo v5.0.11 -- mongod v5.0.11 -- Newman 5.3.2 -- OpenSSL 1.1.1q 5 Jul 2022 `(/usr/local/opt/openssl@1.1 -> ../Cellar/openssl@1.1/1.1.1q)` -- Packer 1.8.3 -- PostgreSQL 14.5 (Homebrew) -- psql (PostgreSQL) 14.5 (Homebrew) -- Sox 14.4.2 -- Subversion (SVN) 1.14.2 -- Switchaudio-osx 1.1.0 -- Vagrant 2.3.1 -- VirtualBox 6.1.38r153438 -- yq (https://github.com/mikefarah/yq/) version 4.28.1 -- zstd 1.5.2 - -### Tools -- Aliyun CLI 3.0.131 -- App Center CLI 2.11.0 -- AWS CLI 2.8.3 -- AWS SAM CLI 1.60.0 -- AWS Session Manager CLI 1.2.398.0 -- Azure CLI (azure-devops) 0.25.0 -- Azure CLI 2.41.0 -- Bicep CLI 0.11.1 -- Cabal 3.6.2.0 -- Cmake 3.24.2 -- Fastlane 2.210.1 -- GHC 9.4.2 -- GHCup 0.1.18.0 -- Jazzy 0.14.3 -- Stack 2.9.1 -- SwiftFormat 0.50.2 -- Swig 4.0.2 -- Xcode Command Line Tools 12.4.0.0.1.1610135815 - -### Linters -- SwiftLint 0.48.0 -- yamllint 1.28.0 - -### Browsers -- Safari 15.6.1 (15613.3.9.1.16) -- SafariDriver 15.6.1 (15613.3.9.1.16) -- Google Chrome 106.0.5249.119 -- ChromeDriver 106.0.5249.61 -- Microsoft Edge 106.0.1370.47 -- Microsoft Edge WebDriver 106.0.1370.47 -- Mozilla Firefox 105.0.3 -- geckodriver 0.32.0 -- Selenium server 4.5.0 - -#### Environment variables -| Name | Value | -| --------------- | ---------------------------------------------- | -| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/106.0.5249.61 | -| EDGEWEBDRIVER | /usr/local/share/edge_driver | -| GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | - -### Java -| Version | Vendor | Environment Variable | -| ------------------- | --------------- | -------------------- | -| 8.0.345+1 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | -| 11.0.16+101 | Eclipse Temurin | JAVA_HOME_11_X64 | -| 12.0.2+10.3 | Adopt OpenJDK | JAVA_HOME_12_X64 | -| 13.0.2+8.1 | Adopt OpenJDK | JAVA_HOME_13_X64 | -| 14.0.2+12 | Adopt OpenJDK | JAVA_HOME_14_X64 | -| 17.0.4+101 | Eclipse Temurin | JAVA_HOME_17_X64 | - -### GraalVM -| Version | Environment variables | -| --------- | --------------------- | -| CE 22.2.0 | GRAALVM_11_ROOT | - -### Cached Tools -#### Ruby -- 2.4.10 -- 2.5.9 -- 2.6.10 -- 2.7.6 -- 3.0.4 - -#### Python -- 2.7.18 -- 3.6.15 -- 3.7.15 -- 3.8.14 -- 3.9.14 -- 3.10.8 - -#### PyPy -- 2.7.18 [PyPy 7.3.9] -- 3.6.12 [PyPy 7.3.3] -- 3.7.13 [PyPy 7.3.9] -- 3.8.13 [PyPy 7.3.9] -- 3.9.12 [PyPy 7.3.9] - -#### Node.js -- 12.22.12 -- 14.20.1 -- 16.17.1 - -#### Go -| Version | Architecture | Environment Variable | -| ------- | ------------ | -------------------- | -| 1.16.15 | x64 | GOROOT_1_16_X64 | -| 1.17.13 (Default) | x64 | GOROOT_1_17_X64 | -| 1.18.7 | x64 | GOROOT_1_18_X64 | - -### Rust Tools -- Cargo 1.64.0 -- Rust 1.64.0 -- Rustdoc 1.64.0 -- Rustup 1.25.1 - -#### Packages -- Bindgen 0.61.0 -- Cargo-audit 0.17.2 -- Cargo-outdated 0.11.1 -- Cbindgen 0.24.3 -- Clippy 0.1.64 -- Rustfmt 1.5.1-stable - -### PowerShell Tools -- PowerShell 7.2.6 - -#### PowerShell Modules -| Module | Version | -| ---------------- | ------- | -| Az | 9.0.1 | -| MarkdownPS | 1.9 | -| Pester | 5.3.3 | -| PSScriptAnalyzer | 1.21.0 | - -### Web Servers -| Name | Version | ConfigFile | ServiceStatus | ListenPort | -| ----- | -------- | ------------------------------- | ------------- | ---------- | -| httpd | 2.4.54_1 | /usr/local/etc/httpd/httpd.conf | none | 80 | -| nginx | 1.23.1 | /usr/local/etc/nginx/nginx.conf | none | 80 | - -### Xamarin -#### Visual Studio for Mac -| Version | Build | Path | -| -------------- | --------- | ------------------------------- | -| 2019 (default) | 8.10.25.2 | /Applications/Visual Studio.app | - -#### Xamarin bundles -| symlink | Xamarin.Mono | Xamarin.iOS | Xamarin.Mac | Xamarin.Android | -| ---------------- | ------------ | ----------- | ----------- | --------------- | -| 6_12_7 (default) | 6.12 | 14.14 | 7.8 | 11.2 | -| 6_12_6 | 6.12 | 14.10 | 7.4 | 11.1 | -| 6_12_5 | 6.12 | 14.8 | 7.2 | 11.1 | -| 6_12_4 | 6.12 | 14.6 | 7.0 | 11.1 | -| 6_12_3 | 6.12 | 14.4 | 6.22 | 11.1 | -| 6_12_2 | 6.12 | 14.2 | 6.20 | 11.0 | -| 6_12_1 | 6.12 | 14.0 | 6.20 | 11.0 | -| 6_12_0 | 6.12 | 13.20 | 6.20 | 11.0 | -| 6_10_0 | 6.10 | 13.18 | 6.18 | 10.3 | -| 6_8_1 | 6.8 | 13.16 | 6.16 | 10.2 | -| 6_8_0 | 6.8 | 13.14 | 6.14 | 10.2 | -| 6_6_1 | 6.6 | 13.10 | 6.10 | 10.1 | -| 6_6_0 | 6.6 | 13.8 | 6.8 | 10.1 | -| 6_4_2 | 6.4 | 13.6 | 6.6 | 10.0 | -| 6_4_1 | 6.4 | 13.4 | 6.4 | 10.0 | -| 6_4_0 | 6.4 | 13.2 | 6.2 | 10.0 | - -#### Unit Test Framework -- NUnit 3.6.1 - -### Xcode -| Version | Build | Path | -| -------------- | -------- | ------------------------------ | -| 12.4 (default) | 12D4e | /Applications/Xcode_12.4.app | -| 12.3 | 12C33 | /Applications/Xcode_12.3.app | -| 12.2 | 12B45b | /Applications/Xcode_12.2.app | -| 12.1.1 | 12A7605b | /Applications/Xcode_12.1.1.app | -| 12.1 | 12A7403 | /Applications/Xcode_12.1.app | -| 12.0.1 | 12A7300 | /Applications/Xcode_12.app | -| 11.7 | 11E801a | /Applications/Xcode_11.7.app | -| 11.6 | 11E708 | /Applications/Xcode_11.6.app | -| 11.5 | 11E608c | /Applications/Xcode_11.5.app | -| 11.4.1 | 11E503a | /Applications/Xcode_11.4.1.app | -| 11.3.1 | 11C505 | /Applications/Xcode_11.3.1.app | -| 11.2.1 | 11B500 | /Applications/Xcode_11.2.1.app | -| 10.3 | 10G8 | /Applications/Xcode_10.3.app | - -#### Xcode Support Tools -- xcpretty 0.3.0 -- xcversion 2.8.1 -- Nomad CLI 0.0.2 -- Nomad shenzhen CLI 0.14.3 - -#### Installed SDKs -| SDK | SDK Name | Xcode Version | -| ----------------------- | -------------------- | -------------------------------------------------------------- | -| macOS 10.14 | macosx10.14 | 10.3 | -| macOS 10.15 | macosx10.15 | 11.2.1, 11.3.1, 11.4.1, 11.5, 11.6, 11.7, 12.0.1, 12.1, 12.1.1 | -| macOS 11.0 | macosx11.0 | 12.2 | -| macOS 11.1 | macosx11.1 | 12.3, 12.4 | -| iOS 12.4 | iphoneos12.4 | 10.3 | -| iOS 13.2 | iphoneos13.2 | 11.2.1, 11.3.1 | -| iOS 13.4 | iphoneos13.4 | 11.4.1 | -| iOS 13.5 | iphoneos13.5 | 11.5 | -| iOS 13.6 | iphoneos13.6 | 11.6 | -| iOS 13.7 | iphoneos13.7 | 11.7 | -| iOS 14.0 | iphoneos14.0 | 12.0.1 | -| iOS 14.1 | iphoneos14.1 | 12.1 | -| iOS 14.2 | iphoneos14.2 | 12.1.1, 12.2 | -| iOS 14.3 | iphoneos14.3 | 12.3 | -| iOS 14.4 | iphoneos14.4 | 12.4 | -| Simulator - iOS 12.4 | iphonesimulator12.4 | 10.3 | -| Simulator - iOS 13.2 | iphonesimulator13.2 | 11.2.1, 11.3.1 | -| Simulator - iOS 13.4 | iphonesimulator13.4 | 11.4.1 | -| Simulator - iOS 13.5 | iphonesimulator13.5 | 11.5 | -| Simulator - iOS 13.6 | iphonesimulator13.6 | 11.6 | -| Simulator - iOS 13.7 | iphonesimulator13.7 | 11.7 | -| Simulator - iOS 14.0 | iphonesimulator14.0 | 12.0.1 | -| Simulator - iOS 14.1 | iphonesimulator14.1 | 12.1 | -| Simulator - iOS 14.2 | iphonesimulator14.2 | 12.1.1, 12.2 | -| Simulator - iOS 14.3 | iphonesimulator14.3 | 12.3 | -| Simulator - iOS 14.4 | iphonesimulator14.4 | 12.4 | -| tvOS 12.4 | appletvos12.4 | 10.3 | -| tvOS 13.2 | appletvos13.2 | 11.2.1, 11.3.1 | -| tvOS 13.4 | appletvos13.4 | 11.4.1, 11.5, 11.6, 11.7 | -| tvOS 14.0 | appletvos14.0 | 12.0.1, 12.1 | -| tvOS 14.2 | appletvos14.2 | 12.1.1, 12.2 | -| tvOS 14.3 | appletvos14.3 | 12.3, 12.4 | -| Simulator - tvOS 12.4 | appletvsimulator12.4 | 10.3 | -| Simulator - tvOS 13.2 | appletvsimulator13.2 | 11.2.1, 11.3.1 | -| Simulator - tvOS 13.4 | appletvsimulator13.4 | 11.4.1, 11.5, 11.6, 11.7 | -| Simulator - tvOS 14.0 | appletvsimulator14.0 | 12.0.1, 12.1 | -| Simulator - tvOS 14.2 | appletvsimulator14.2 | 12.1.1, 12.2 | -| Simulator - tvOS 14.3 | appletvsimulator14.3 | 12.3, 12.4 | -| watchOS 5.3 | watchos5.3 | 10.3 | -| watchOS 6.1 | watchos6.1 | 11.2.1, 11.3.1 | -| watchOS 6.2 | watchos6.2 | 11.4.1, 11.5, 11.6, 11.7 | -| watchOS 7.0 | watchos7.0 | 12.0.1, 12.1 | -| watchOS 7.1 | watchos7.1 | 12.1.1, 12.2 | -| watchOS 7.2 | watchos7.2 | 12.3, 12.4 | -| Simulator - watchOS 5.3 | watchsimulator5.3 | 10.3 | -| Simulator - watchOS 6.1 | watchsimulator6.1 | 11.2.1, 11.3.1 | -| Simulator - watchOS 6.2 | watchsimulator6.2 | 11.4.1, 11.5, 11.6, 11.7 | -| Simulator - watchOS 7.0 | watchsimulator7.0 | 12.0.1, 12.1 | -| Simulator - watchOS 7.1 | watchsimulator7.1 | 12.1.1, 12.2 | -| Simulator - watchOS 7.2 | watchsimulator7.2 | 12.3, 12.4 | -| DriverKit 19.0 | driverkit.macosx19.0 | 11.2.1, 11.3.1, 11.4.1, 11.5, 11.6, 11.7, 12.0.1, 12.1, 12.1.1 | -| DriverKit 20.0 | driverkit.macosx20.0 | 12.2 | -| DriverKit 20.2 | driverkit.macosx20.2 | 12.3, 12.4 | - -#### Installed Simulators -| OS | Xcode Version | Simulators | -| ----------- | ------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| iOS 12.4 | 10.3 | iPhone 5s<br>iPhone 6<br>iPhone 6 Plus<br>iPhone 6s<br>iPhone 6s Plus<br>iPhone 7<br>iPhone 7 Plus<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE<br>iPhone X<br>iPhone XR<br>iPhone Xs<br>iPhone Xs Max<br>iPad (5th generation)<br>iPad (6th generation)<br>iPad Air<br>iPad Air (3rd generation)<br>iPad Air 2<br>iPad Pro (10.5-inch)<br>iPad Pro (11-inch)<br>iPad Pro (12.9-inch)<br>iPad Pro (12.9-inch) (2nd generation)<br>iPad Pro (12.9-inch) (3rd generation)<br>iPad Pro (9.7-inch) | -| iOS 13.2 | 11.2.1 | iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPad (7th generation)<br>iPad Air (3rd generation)<br>iPad Pro (11-inch)<br>iPad Pro (12.9-inch) (3rd generation)<br>iPad Pro (9.7-inch) | -| iOS 13.3 | 11.3.1 | iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPad (7th generation)<br>iPad Air (3rd generation)<br>iPad Pro (11-inch)<br>iPad Pro (12.9-inch) (3rd generation)<br>iPad Pro (9.7-inch) | -| iOS 13.4 | 11.4.1 | iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (7th generation)<br>iPad Air (3rd generation)<br>iPad Pro (11-inch) (2nd generation)<br>iPad Pro (12.9-inch) (4th generation)<br>iPad Pro (9.7-inch) | -| iOS 13.5 | 11.5 | iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (7th generation)<br>iPad Air (3rd generation)<br>iPad Pro (11-inch) (2nd generation)<br>iPad Pro (12.9-inch) (4th generation)<br>iPad Pro (9.7-inch) | -| iOS 13.6 | 11.6 | iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (7th generation)<br>iPad Air (3rd generation)<br>iPad Pro (11-inch) (2nd generation)<br>iPad Pro (12.9-inch) (4th generation)<br>iPad Pro (9.7-inch) | -| iOS 13.7 | 11.7 | iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (7th generation)<br>iPad Air (3rd generation)<br>iPad Pro (11-inch) (2nd generation)<br>iPad Pro (12.9-inch) (4th generation)<br>iPad Pro (9.7-inch) | -| iOS 14.0 | 12.0.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (7th generation)<br>iPad (8th generation)<br>iPad Air (3rd generation)<br>iPad Air (4th generation)<br>iPad Pro (11-inch) (2nd generation)<br>iPad Pro (12.9-inch) (4th generation)<br>iPad Pro (9.7-inch) | -| iOS 14.1 | 12.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (7th generation)<br>iPad (8th generation)<br>iPad Air (3rd generation)<br>iPad Air (4th generation)<br>iPad Pro (11-inch) (2nd generation)<br>iPad Pro (12.9-inch) (4th generation)<br>iPad Pro (9.7-inch) | -| iOS 14.2 | 12.1.1<br>12.2 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (7th generation)<br>iPad (8th generation)<br>iPad Air (3rd generation)<br>iPad Air (4th generation)<br>iPad Pro (11-inch) (2nd generation)<br>iPad Pro (12.9-inch) (4th generation)<br>iPad Pro (9.7-inch) | -| iOS 14.3 | 12.3 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (7th generation)<br>iPad (8th generation)<br>iPad Air (3rd generation)<br>iPad Air (4th generation)<br>iPad Pro (11-inch) (2nd generation)<br>iPad Pro (12.9-inch) (4th generation)<br>iPad Pro (9.7-inch) | -| iOS 14.4 | 12.4 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (7th generation)<br>iPad (8th generation)<br>iPad Air (3rd generation)<br>iPad Air (4th generation)<br>iPad Pro (11-inch) (2nd generation)<br>iPad Pro (12.9-inch) (4th generation)<br>iPad Pro (9.7-inch) | -| tvOS 12.4 | 10.3 | Apple TV<br>Apple TV 4K<br>Apple TV 4K (at 1080p) | -| tvOS 13.2 | 11.2.1 | Apple TV<br>Apple TV 4K<br>Apple TV 4K (at 1080p) | -| tvOS 13.3 | 11.3.1 | Apple TV<br>Apple TV 4K<br>Apple TV 4K (at 1080p) | -| tvOS 13.4 | 11.4.1<br>11.5<br>11.6<br>11.7 | Apple TV<br>Apple TV 4K<br>Apple TV 4K (at 1080p) | -| tvOS 14.0 | 12.0.1<br>12.1 | Apple TV<br>Apple TV 4K<br>Apple TV 4K (at 1080p) | -| tvOS 14.2 | 12.1.1<br>12.2 | Apple TV<br>Apple TV 4K<br>Apple TV 4K (at 1080p) | -| tvOS 14.3 | 12.3<br>12.4 | Apple TV<br>Apple TV 4K<br>Apple TV 4K (at 1080p) | -| watchOS 5.3 | 10.3 | Apple Watch Series 2 - 38mm<br>Apple Watch Series 2 - 42mm<br>Apple Watch Series 3 - 38mm<br>Apple Watch Series 3 - 42mm<br>Apple Watch Series 4 - 40mm<br>Apple Watch Series 4 - 44mm | -| watchOS 6.1 | 11.2.1<br>11.3.1 | Apple Watch Series 4 - 40mm<br>Apple Watch Series 4 - 44mm<br>Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm | -| watchOS 6.2 | 11.4.1<br>11.5<br>11.6<br>11.7 | Apple Watch Series 4 - 40mm<br>Apple Watch Series 4 - 44mm<br>Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm | -| watchOS 7.0 | 12.0.1<br>12.1 | Apple Watch Series 4 - 40mm<br>Apple Watch Series 4 - 44mm<br>Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm | -| watchOS 7.1 | 12.1.1<br>12.2 | Apple Watch Series 4 - 40mm<br>Apple Watch Series 4 - 44mm<br>Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm | -| watchOS 7.2 | 12.3<br>12.4 | Apple Watch Series 4 - 40mm<br>Apple Watch Series 4 - 44mm<br>Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm | - -### Android -| Package Name | Version | -| -------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 7.0 | -| Android Emulator | 31.3.12 | -| Android SDK Build-tools | 33.0.0<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3<br>26.0.0 26.0.1 26.0.2 26.0.3<br>25.0.0 25.0.1 25.0.2 25.0.3<br>24.0.0 24.0.1 24.0.2 24.0.3 | -| Android SDK Platforms | android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3)<br>android-26 (rev 2)<br>android-25 (rev 3)<br>android-24 (rev 2) | -| Android SDK Platform-Tools | 33.0.3 | -| Android Support Repository | 47.0.0 | -| CMake | 3.10.2<br>3.18.1 | -| Google APIs | addon-google_apis-google-21<br>addon-google_apis-google-22<br>addon-google_apis-google-23<br>addon-google_apis-google-24 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 23.2.8568313<br>24.0.8215888<br>25.1.8937393 (default) | -| SDK Patch Applier v4 | 1 | -| Intel HAXM | 7.6.5 | - -#### Environment variables -| Name | Value | -| ----------------------- | -------------------------------------------------- | -| ANDROID_HOME | /Users/runner/Library/Android/sdk | -| ANDROID_NDK | /Users/runner/Library/Android/sdk/ndk/25.1.8937393 | -| ANDROID_NDK_HOME | /Users/runner/Library/Android/sdk/ndk/25.1.8937393 | -| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/25.1.8937393 | -| ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk/25.1.8937393 | -| ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | - -### Miscellaneous -- libXext 1.3.4 -- libXft 2.3.6 -- Tcl/Tk 8.6.12_1 -- Zlib 1.2.13 - - - From 8cf8e32bb49861c267dff7401dbac160cf0de613 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 4 May 2023 15:01:35 +0000 Subject: [PATCH 1894/3485] Updating readme file for win22 version 20230502.2 (#7528) Co-authored-by: Image generation service account <no-reply@microsoft.com> --- images/win/Windows2022-Readme.md | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/images/win/Windows2022-Readme.md b/images/win/Windows2022-Readme.md index a62122df626b..c4eacd1f50f5 100644 --- a/images/win/Windows2022-Readme.md +++ b/images/win/Windows2022-Readme.md @@ -4,7 +4,7 @@ *** # Windows Server 2022 - OS Version: 10.0.20348 Build 1668 -- Image Version: 20230425.1 +- Image Version: 20230502.2 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -26,14 +26,14 @@ ### Package Management - Chocolatey 1.3.1 - Composer 2.5.5 -- Helm 3.11.2 +- Helm 3.11.3 - Miniconda 23.3.1 (pre-installed on the image but not added to PATH) - NPM 9.5.1 - NuGet 6.5.0.154 -- pip 23.1.1 (python 3.9) +- pip 23.1.2 (python 3.9) - Pipx 1.2.0 - RubyGems 3.2.33 -- Vcpkg (build from commit b66959587) +- Vcpkg (build from commit 6d69bbacd) - Yarn 1.22.19 #### Environment variables @@ -58,7 +58,7 @@ - Cabal 3.10.1.0 - CMake 3.26.3 - CodeQL Action Bundles 2.12.6 2.13.0 -- Docker 23.0.4 +- Docker 23.0.5 - Docker Compose v1 1.29.2 - Docker Compose v2 2.17.3 - Docker-wincred 0.7.0 @@ -76,7 +76,7 @@ - NSIS 3.08 - OpenSSL 1.1.1t - Packer 1.8.5 -- Pulumi 3.64.0 +- Pulumi 3.65.1 - R 4.3.0 - Service Fabric SDK 9.1.1436.9590 - Stack 2.9.3 @@ -90,8 +90,8 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.162 -- AWS CLI 2.11.13 -- AWS SAM CLI 1.81.0 +- AWS CLI 2.11.16 +- AWS SAM CLI 1.82.0 - AWS Session Manager CLI 1.2.463.0 - Azure CLI 2.48.1 - Azure DevOps CLI extension 0.26.0 @@ -113,10 +113,10 @@ - Rustfmt 1.5.2 ### Browsers and Drivers -- Google Chrome 112.0.5615.138 -- Chrome Driver 112.0.5615.49 -- Microsoft Edge 112.0.1722.58 -- Microsoft Edge Driver 112.0.1722.58 +- Google Chrome 113.0.5672.64 +- Chrome Driver 113.0.5672.24 +- Microsoft Edge 112.0.1722.64 +- Microsoft Edge Driver 112.0.1722.68 - Mozilla Firefox 112.0.2 - Gecko Driver 0.33.0 - IE Driver 4.8.0.0 @@ -219,7 +219,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Visual Studio Enterprise 2022 | Name | Version | Path | | ----------------------------- | -------------- | -------------------------------------------------------- | -| Visual Studio Enterprise 2022 | 17.5.33530.505 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | +| Visual Studio Enterprise 2022 | 17.5.33627.172 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | #### Workloads, components and extensions | Package | Version | @@ -531,7 +531,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Microsoft.AspNetCore.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 6.0.5, 6.0.16, 7.0.5 - Microsoft.NETCore.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 6.0.5, 6.0.16, 7.0.5 - Microsoft.WindowsDesktop.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 6.0.5, 6.0.16, 7.0.5 -- nbgv 3.5.119+5d25f54fec +- nbgv 3.6.128+518ee610d6 ### PowerShell Tools - PowerShell 7.2.11 @@ -543,10 +543,10 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Az (Cached): 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.319 +- AWSPowershell: 4.1.324 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 -- Microsoft.Graph: 1.26.0 +- Microsoft.Graph: 1.27.0 - Pester: 3.4.0, 5.4.1 - PowerShellGet: 1.0.0.1, 2.2.5 - PSScriptAnalyzer: 1.21.0 From fddf50db2a0b037213032de1e4115b36c93bf112 Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Fri, 5 May 2023 08:38:29 +0200 Subject: [PATCH 1895/3485] Add Ruby and Python to toolcache (#7529) --- images/macos/provision/core/ruby.sh | 56 +++++++++---------- .../SoftwareReport.Generator.ps1 | 8 +-- images/macos/templates/macOS-13.anka.pkr.hcl | 8 +++ images/macos/toolsets/toolset-13.json | 54 ++++++++++++++++++ 4 files changed, 92 insertions(+), 34 deletions(-) diff --git a/images/macos/provision/core/ruby.sh b/images/macos/provision/core/ruby.sh index 9741eab326e4..0b60142ff445 100755 --- a/images/macos/provision/core/ruby.sh +++ b/images/macos/provision/core/ruby.sh @@ -9,39 +9,37 @@ GEM_PATH=`gem env|awk '/EXECUTABLE DIRECTORY/ {print $4}'` echo "GEM_PATH=$GEM_PATH" >> "$HOME/.bashrc" echo 'export PATH="$GEM_PATH:/usr/local/opt/ruby@'${DEFAULT_RUBY_VERSION}'/bin:$PATH"' >> "$HOME/.bashrc" -if ! is_Ventura; then - echo "Install Ruby from toolset..." - [ -n "$API_PAT" ] && authString=(-H "Authorization: token ${API_PAT}") - PACKAGE_TAR_NAMES=$(curl "${authString[@]}" -s "https://api.github.com/repos/ruby/ruby-builder/releases/latest" | jq -r '.assets[].name') - TOOLSET_VERSIONS=$(get_toolset_value '.toolcache[] | select(.name | contains("Ruby")) | .versions[]') - RUBY_PATH="$AGENT_TOOLSDIRECTORY/Ruby" - - echo "Check if Ruby hostedtoolcache folder exists..." - if [ ! -d $RUBY_PATH ]; then - mkdir -p $RUBY_PATH - fi +echo "Install Ruby from toolset..." +[ -n "$API_PAT" ] && authString=(-H "Authorization: token ${API_PAT}") +PACKAGE_TAR_NAMES=$(curl "${authString[@]}" -s "https://api.github.com/repos/ruby/ruby-builder/releases/latest" | jq -r '.assets[].name') +TOOLSET_VERSIONS=$(get_toolset_value '.toolcache[] | select(.name | contains("Ruby")) | .versions[]') +RUBY_PATH="$AGENT_TOOLSDIRECTORY/Ruby" + +echo "Check if Ruby hostedtoolcache folder exists..." +if [ ! -d $RUBY_PATH ]; then + mkdir -p $RUBY_PATH +fi - for TOOLSET_VERSION in ${TOOLSET_VERSIONS[@]}; do - PACKAGE_TAR_NAME=$(echo "$PACKAGE_TAR_NAMES" | grep "^ruby-${TOOLSET_VERSION}-macos-latest.tar.gz$" | egrep -v "rc|preview" | sort -V | tail -1) - RUBY_VERSION=$(echo "$PACKAGE_TAR_NAME" | cut -d'-' -f 2) - RUBY_VERSION_PATH="$RUBY_PATH/$RUBY_VERSION" +for TOOLSET_VERSION in ${TOOLSET_VERSIONS[@]}; do + PACKAGE_TAR_NAME=$(echo "$PACKAGE_TAR_NAMES" | grep "^ruby-${TOOLSET_VERSION}-macos-latest.tar.gz$" | egrep -v "rc|preview" | sort -V | tail -1) + RUBY_VERSION=$(echo "$PACKAGE_TAR_NAME" | cut -d'-' -f 2) + RUBY_VERSION_PATH="$RUBY_PATH/$RUBY_VERSION" - echo "Create Ruby $RUBY_VERSION directory..." - mkdir -p $RUBY_VERSION_PATH + echo "Create Ruby $RUBY_VERSION directory..." + mkdir -p $RUBY_VERSION_PATH - echo "Downloading tar archive $PACKAGE_TAR_NAME" - DOWNLOAD_URL="https://github.com/ruby/ruby-builder/releases/download/toolcache/${PACKAGE_TAR_NAME}" - download_with_retries $DOWNLOAD_URL "/tmp" $PACKAGE_TAR_NAME + echo "Downloading tar archive $PACKAGE_TAR_NAME" + DOWNLOAD_URL="https://github.com/ruby/ruby-builder/releases/download/toolcache/${PACKAGE_TAR_NAME}" + download_with_retries $DOWNLOAD_URL "/tmp" $PACKAGE_TAR_NAME - echo "Expand '$PACKAGE_TAR_NAME' to the '$RUBY_VERSION_PATH' folder" - tar xf "/tmp/$PACKAGE_TAR_NAME" -C $RUBY_VERSION_PATH + echo "Expand '$PACKAGE_TAR_NAME' to the '$RUBY_VERSION_PATH' folder" + tar xf "/tmp/$PACKAGE_TAR_NAME" -C $RUBY_VERSION_PATH - COMPLETE_FILE_PATH="$RUBY_VERSION_PATH/x64.complete" - if [ ! -f $COMPLETE_FILE_PATH ]; then - echo "Create complete file" - touch $COMPLETE_FILE_PATH - fi - done -fi + COMPLETE_FILE_PATH="$RUBY_VERSION_PATH/x64.complete" + if [ ! -f $COMPLETE_FILE_PATH ]; then + echo "Create complete file" + touch $COMPLETE_FILE_PATH + fi +done invoke_tests "Ruby" diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1 index 908fd5b39f6e..2e05d3d8a285 100644 --- a/images/macos/software-report/SoftwareReport.Generator.ps1 +++ b/images/macos/software-report/SoftwareReport.Generator.ps1 @@ -187,11 +187,9 @@ $browsers.AddNode($(Build-BrowserWebdriversEnvironmentTable)) $java = $installedSoftware.AddHeader("Java") $java.AddTable($(Get-JavaVersions)) -if (-not $os.IsVentura) { - # Toolcache - $toolcache = $installedSoftware.AddHeader("Cached Tools") - $toolcache.AddNodes($(Build-ToolcacheSection)) -} +# Toolcache +$toolcache = $installedSoftware.AddHeader("Cached Tools") +$toolcache.AddNodes($(Build-ToolcacheSection)) # Rust $rust = $installedSoftware.AddHeader("Rust Tools") diff --git a/images/macos/templates/macOS-13.anka.pkr.hcl b/images/macos/templates/macOS-13.anka.pkr.hcl index 5b0b71119945..d02c4893ed92 100644 --- a/images/macos/templates/macOS-13.anka.pkr.hcl +++ b/images/macos/templates/macOS-13.anka.pkr.hcl @@ -209,6 +209,7 @@ build { "./provision/core/chrome.sh", "./provision/core/edge.sh", "./provision/core/firefox.sh", + "./provision/core/pypy.sh", "./provision/core/bicep.sh", "./provision/core/codeql-bundle.sh" ] @@ -217,6 +218,13 @@ build { ] execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" } + provisioner "shell" { + scripts = [ + "./provision/core/toolset.ps1", + "./provision/core/configure-toolset.ps1" + ] + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} pwsh -f {{ .Path }}" + } provisioner "shell" { script = "./provision/core/delete-duplicate-sims.rb" execute_command = "source $HOME/.bash_profile; ruby {{ .Path }}" diff --git a/images/macos/toolsets/toolset-13.json b/images/macos/toolsets/toolset-13.json index 706603660f6f..32206718dd15 100644 --- a/images/macos/toolsets/toolset-13.json +++ b/images/macos/toolsets/toolset-13.json @@ -94,6 +94,60 @@ "fastlane" ] }, + "toolcache": [ + { + "name": "Python", + "url" : "https://raw.githubusercontent.com/actions/python-versions/main/versions-manifest.json", + "arch": "x64", + "platform" : "darwin", + "versions": [ + "3.8.*", + "3.9.*", + "3.10.*", + "3.11.*" + ] + }, + { + "name": "PyPy", + "arch": "x64", + "platform" : "darwin", + "versions": [ + "2.7", + "3.7", + "3.8", + "3.9" + ] + }, + { + "name": "Node", + "url" : "https://raw.githubusercontent.com/actions/node-versions/main/versions-manifest.json", + "platform" : "darwin", + "arch": "x64", + "versions": [ + "16.*", + "18.*" + ] + }, + { + "name": "Go", + "url" : "https://raw.githubusercontent.com/actions/go-versions/main/versions-manifest.json", + "arch": "x64", + "platform" : "darwin", + "variable_template" : "GOROOT_{0}_{1}_X64", + "versions": [ + "1.19.*", + "1.20.*" + ] + }, + { + "name": "Ruby", + "arch": "x64", + "versions": [ + "3.0.*", + "3.1.*" + ] + } + ], "go": { "default": "1.20" }, From eec1e84e72bc5b12cdebaa9cb6d76a2ea081927a Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Fri, 5 May 2023 12:13:47 +0200 Subject: [PATCH 1896/3485] [macOS] add RunAll-Tests.ps1 to the macOS-13 (#7524) --- images/macos/templates/macOS-13.anka.pkr.hcl | 3 ++- images/macos/tests/Common.Tests.ps1 | 10 +++++----- images/macos/tests/Databases.Tests.ps1 | 9 +++++++-- images/macos/tests/Node.Tests.ps1 | 2 +- images/macos/tests/OpenSSL.Tests.ps1 | 5 ++++- images/macos/tests/PipxPackages.Tests.ps1 | 7 ++++++- images/macos/tests/Python.Tests.ps1 | 2 +- images/macos/tests/System.Tests.ps1 | 4 +++- images/macos/tests/Toolcache.Tests.ps1 | 2 -- images/macos/tests/WebServers.Tests.ps1 | 4 +++- images/macos/tests/Xamarin.Tests.ps1 | 13 +++++++------ 11 files changed, 39 insertions(+), 22 deletions(-) diff --git a/images/macos/templates/macOS-13.anka.pkr.hcl b/images/macos/templates/macOS-13.anka.pkr.hcl index d02c4893ed92..28bd20a89635 100644 --- a/images/macos/templates/macOS-13.anka.pkr.hcl +++ b/images/macos/templates/macOS-13.anka.pkr.hcl @@ -231,7 +231,8 @@ build { } provisioner "shell" { inline = [ - "pwsh -File \"$HOME/image-generation/software-report/SoftwareReport.Generator.ps1\" -OutputDirectory \"$HOME/image-generation/output/software-report\" -ImageName ${var.build_id}" + "pwsh -File \"$HOME/image-generation/software-report/SoftwareReport.Generator.ps1\" -OutputDirectory \"$HOME/image-generation/output/software-report\" -ImageName ${var.build_id}", + "pwsh -File \"$HOME/image-generation/tests/RunAll-Tests.ps1\"" ] execute_command = "source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" } diff --git a/images/macos/tests/Common.Tests.ps1 b/images/macos/tests/Common.Tests.ps1 index d3a4dbb0dc23..243ad26f1fc2 100644 --- a/images/macos/tests/Common.Tests.ps1 +++ b/images/macos/tests/Common.Tests.ps1 @@ -58,7 +58,7 @@ Describe "AzCopy" { } } -Describe "Miniconda" { +Describe "Miniconda" -Skip:($os.IsVentura) { It "Conda" { Get-EnvironmentVariable "CONDA" | Should -Not -BeNullOrEmpty $condaBinPath = Join-Path $env:CONDA "bin" "conda" @@ -105,7 +105,7 @@ Describe "VSMac" { } } -Describe "Swig" { +Describe "Swig" -Skip:($os.IsVentura) { It "Swig" { "swig -version" | Should -ReturnZeroExitCode } @@ -117,13 +117,13 @@ Describe "Bicep" { } } -Describe "Go" { +Describe "Go" -Skip:($os.IsVentura) { It "Go" { "go version" | Should -ReturnZeroExitCode } } -Describe "VirtualBox" -Skip:($os.IsBigSur) { +Describe "VirtualBox" -Skip:($os.IsBigSur -or $os.IsVentura) { It "Check kext kernel modules" { kextstat | Out-String | Should -Match "org.virtualbox.kext" } @@ -165,7 +165,7 @@ Describe "CodeQLBundles" { } } -Describe "Colima" { +Describe "Colima" -Skip:($os.IsVentura) { It "Colima" { "colima version" | Should -ReturnZeroExitCode } diff --git a/images/macos/tests/Databases.Tests.ps1 b/images/macos/tests/Databases.Tests.ps1 index 084b2d910ed0..4483c7c3b67d 100644 --- a/images/macos/tests/Databases.Tests.ps1 +++ b/images/macos/tests/Databases.Tests.ps1 @@ -1,4 +1,9 @@ -Describe "MongoDB" { + +Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" + +$os = Get-OSVersion + +Describe "MongoDB" -Skip:($os.IsVentura) { It "<ToolName>" -TestCases @( @{ ToolName = "mongo" } @{ ToolName = "mongod" } @@ -8,7 +13,7 @@ Describe "MongoDB" { } } -Describe "PostgreSQL" { +Describe "PostgreSQL" -Skip:($os.IsVentura) { It "PostgreSQL version should correspond to the version in the toolset" { $toolsetVersion = Get-ToolsetValue 'postgresql.version' # Client version diff --git a/images/macos/tests/Node.Tests.ps1 b/images/macos/tests/Node.Tests.ps1 index cb2c442003dc..b6d37eafd118 100644 --- a/images/macos/tests/Node.Tests.ps1 +++ b/images/macos/tests/Node.Tests.ps1 @@ -21,7 +21,7 @@ Describe "Node.js" { } } -Describe "nvm" { +Describe "nvm" -Skip:($os.IsVentura) { BeforeAll { $nvmPath = Join-Path $env:HOME ".nvm" "nvm.sh" $nvmInitCommand = ". $nvmPath > /dev/null 2>&1 || true" diff --git a/images/macos/tests/OpenSSL.Tests.ps1 b/images/macos/tests/OpenSSL.Tests.ps1 index 5abf9efede32..4e8a35dbd820 100644 --- a/images/macos/tests/OpenSSL.Tests.ps1 +++ b/images/macos/tests/OpenSSL.Tests.ps1 @@ -1,4 +1,7 @@ -Describe "OpenSSL" { +Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" +$os = Get-OSVersion + +Describe "OpenSSL" -Skip:($os.IsVentura) { Context "OpenSSL Version" { It "OpenSSL is available" { "openssl version" | Should -ReturnZeroExitCode diff --git a/images/macos/tests/PipxPackages.Tests.ps1 b/images/macos/tests/PipxPackages.Tests.ps1 index ed9819388da8..168e0b548abe 100644 --- a/images/macos/tests/PipxPackages.Tests.ps1 +++ b/images/macos/tests/PipxPackages.Tests.ps1 @@ -1,4 +1,9 @@ -Describe "PipxPackages" { + +Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" + +$os = Get-OSVersion + +Describe "PipxPackages" -Skip:($os.IsVentura) { $pipxToolset = Get-ToolsetValue "pipx" $testCases = $pipxToolset | ForEach-Object { @{package = $_.package; cmd = $_.cmd} } It "<package>" -TestCases $testCases { diff --git a/images/macos/tests/Python.Tests.ps1 b/images/macos/tests/Python.Tests.ps1 index 40be7343859c..5464fc9ef039 100644 --- a/images/macos/tests/Python.Tests.ps1 +++ b/images/macos/tests/Python.Tests.ps1 @@ -3,7 +3,7 @@ Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1" -DisableNameChecking $os = Get-OSVersion -Describe "Python" { +Describe "Python" -Skip:($os.IsVentura) { It "Python 2 is available" { "python --version" | Should -ReturnZeroExitCode } diff --git a/images/macos/tests/System.Tests.ps1 b/images/macos/tests/System.Tests.ps1 index 8dd6bdf514a0..7322062aef3e 100644 --- a/images/macos/tests/System.Tests.ps1 +++ b/images/macos/tests/System.Tests.ps1 @@ -1,3 +1,5 @@ +Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" + $os = Get-OSVersion Describe "Disk free space" { @@ -23,7 +25,7 @@ Describe "Certificate" { } } -Describe "Audio device" { +Describe "Audio device" -Skip:($os.IsVentura) { It "Sox is installed" { "sox --version" | Should -ReturnZeroExitCode } diff --git a/images/macos/tests/Toolcache.Tests.ps1 b/images/macos/tests/Toolcache.Tests.ps1 index aaeb8db9ab7d..e397ea12218a 100644 --- a/images/macos/tests/Toolcache.Tests.ps1 +++ b/images/macos/tests/Toolcache.Tests.ps1 @@ -1,8 +1,6 @@ Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1" -DisableNameChecking -$os = Get-OSVersion - Describe "Toolcache" { $toolcacheDirectory = Join-Path $env:HOME "hostedtoolcache" [array]$packages += Get-ToolsetValue -KeyPath "toolcache" | ForEach-Object { diff --git a/images/macos/tests/WebServers.Tests.ps1 b/images/macos/tests/WebServers.Tests.ps1 index 0763320ab8e2..27eb177898f8 100644 --- a/images/macos/tests/WebServers.Tests.ps1 +++ b/images/macos/tests/WebServers.Tests.ps1 @@ -1,3 +1,5 @@ +Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" + $os = Get-OSVersion Describe "Apache" { @@ -10,7 +12,7 @@ Describe "Apache" { } } -Describe "Nginx" { +Describe "Nginx" -Skip:($os.IsVentura) { It "Nginx CLI" { "nginx -v" | Should -ReturnZeroExitCode } diff --git a/images/macos/tests/Xamarin.Tests.ps1 b/images/macos/tests/Xamarin.Tests.ps1 index 9f523318226b..2c989b5c7c09 100644 --- a/images/macos/tests/Xamarin.Tests.ps1 +++ b/images/macos/tests/Xamarin.Tests.ps1 @@ -1,6 +1,7 @@ Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1" -DisableNameChecking +$os = Get-OSVersion $MONO_VERSIONS = Get-ToolsetValue "xamarin.mono-versions" $XAMARIN_IOS_VERSIONS = Get-ToolsetValue "xamarin.ios-versions" $XAMARIN_MAC_VERSIONS = Get-ToolsetValue "xamarin.mac-versions" @@ -17,7 +18,7 @@ BeforeAll { } } -Describe "Mono" { +Describe "Mono" -Skip:($os.IsVentura) { $MONO_VERSIONS | ForEach-Object { Context "$_" { $MONO_VERSIONS_PATH = "/Library/Frameworks/Mono.framework/Versions" @@ -81,7 +82,7 @@ Describe "Mono" { } } -Describe "Xamarin.iOS" { +Describe "Xamarin.iOS" -Skip:($os.IsVentura) { $XAMARIN_IOS_VERSIONS | ForEach-Object { Context "$_" { $XAMARIN_IOS_VERSIONS_PATH = "/Library/Frameworks/Xamarin.iOS.framework/Versions" @@ -114,7 +115,7 @@ Describe "Xamarin.iOS" { } } -Describe "Xamarin.Mac" { +Describe "Xamarin.Mac" -Skip:($os.IsVentura) { $XAMARIN_MAC_VERSIONS | ForEach-Object { Context "$_" { $XAMARIN_MAC_VERSIONS_PATH = "/Library/Frameworks/Xamarin.Mac.framework/Versions" @@ -147,7 +148,7 @@ Describe "Xamarin.Mac" { } } -Describe "Xamarin.Android" { +Describe "Xamarin.Android" -Skip:($os.IsVentura) { $XAMARIN_ANDROID_VERSIONS | ForEach-Object { Context "$_" { $XAMARIN_ANDROID_VERSIONS_PATH = "/Library/Frameworks/Xamarin.Android.framework/Versions" @@ -187,7 +188,7 @@ Describe "Xamarin.Android" { } } -Describe "Xamarin Bundles" { +Describe "Xamarin Bundles" -Skip:($os.IsVentura) { BeforeAll { $MONO_VERSIONS_PATH = "/Library/Frameworks/Mono.framework/Versions" $XAMARIN_IOS_VERSIONS_PATH = "/Library/Frameworks/Xamarin.iOS.framework/Versions" @@ -292,7 +293,7 @@ Describe "Xamarin Bundles" { } } -Describe "Nuget" { +Describe "Nuget" -Skip:($os.IsVentura) { It "Nuget config contains nuget.org feed" { Get-Content $env:HOME/.config/NuGet/NuGet.Config | Out-String | Should -Match "nuget.org" } From 0021a7fb65ccad67c0dea16d808d734434ff7f05 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 8 May 2023 12:19:11 +0200 Subject: [PATCH 1897/3485] Updating readme file for macOS-11 version 20230429.1 (#7532) Co-authored-by: Image generation service account <no-reply@microsoft.com> --- images/macos/macos-11-Readme.md | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/images/macos/macos-11-Readme.md b/images/macos/macos-11-Readme.md index caa5db0be082..72ca9fdbe58f 100644 --- a/images/macos/macos-11-Readme.md +++ b/images/macos/macos-11-Readme.md @@ -1,7 +1,7 @@ # macOS 11 - OS Version: macOS 11.7.6 (20G1231) - Kernel Version: Darwin 20.6.0 -- Image Version: 20230425.1 +- Image Version: 20230429.1 ## Installed Software @@ -16,9 +16,9 @@ - GNU Fortran 10 (Homebrew GCC 10.4.0) - available by `gfortran-10` alias - GNU Fortran 11 (Homebrew GCC 11.3.0) - available by `gfortran-11` alias - GNU Fortran 12 (Homebrew GCC 12.2.0) - available by `gfortran-12` alias -- Go 1.20.3 - Julia 1.8.5 - Kotlin 1.8.21-release-380 +- Go 1.20.3 - Mono 6.12.0.188 - MSBuild 16.10.1.51301 (Mono 6.12.0.188) - Node.js 18.16.0 @@ -41,10 +41,10 @@ - NPM 9.5.1 - NuGet 6.3.1.1 - Pip 20.3.4 (python 2.7) -- Pip3 23.1.1 (python 3.11) +- Pip3 23.1.2 (python 3.11) - Pipx 1.2.0 - RubyGems 3.4.12 -- Vcpkg 2023 (build from commit b66959587) +- Vcpkg 2023 (build from commit cb1301e99) - Yarn 1.22.19 #### Environment variables @@ -72,7 +72,7 @@ - GitHub CLI 2.28.0 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.3 -- gpg (GnuPG) 2.4.0 +- gpg (GnuPG) 2.4.1 - helm v3.11.3+g66a969e - Hub CLI 2.14.2 - ImageMagick 7.1.1-8 @@ -92,9 +92,9 @@ ### Tools - Aliyun CLI 3.0.161 -- App Center CLI 2.13.6 -- AWS CLI 2.11.15 -- AWS SAM CLI 1.81.0 +- App Center CLI 2.13.7 +- AWS CLI 2.11.16 +- AWS SAM CLI 1.82.0 - AWS Session Manager CLI 1.2.463.0 - Azure CLI 2.48.1 - Azure CLI (azure-devops) 0.26.0 @@ -120,8 +120,8 @@ - SafariDriver 16.4.1 (16615.1.26.101.10) - Google Chrome 112.0.5615.137 - ChromeDriver 112.0.5615.49 -- Microsoft Edge 112.0.1722.58 -- Microsoft Edge WebDriver 112.0.1722.58 +- Microsoft Edge 112.0.1722.64 +- Microsoft Edge WebDriver 112.0.1722.64 - Mozilla Firefox 112.0.2 - geckodriver 0.33.0 - Selenium server 4.9.0 @@ -191,7 +191,7 @@ - PowerShell 7.2.11 #### PowerShell Modules -- Az: 9.7.0 +- Az: 9.7.1 - MarkdownPS: 1.9 - Pester: 5.4.1 - PSScriptAnalyzer: 1.21.0 From e93f8920c109385a6f2fc1d48aabe87fa6fe0efb Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 8 May 2023 21:34:37 +0000 Subject: [PATCH 1898/3485] Updating readme file for win19 version 20230502.2 (#7537) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2019-Readme.md | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index 35eb29e9f439..a09ae1df1bd9 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -4,7 +4,7 @@ *** # Windows Server 2019 - OS Version: 10.0.17763 Build 4252 -- Image Version: 20230425.1 +- Image Version: 20230502.2 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -26,14 +26,14 @@ ### Package Management - Chocolatey 1.3.1 - Composer 2.5.5 -- Helm 3.11.2 +- Helm 3.11.3 - Miniconda 23.3.1 (pre-installed on the image but not added to PATH) - NPM 9.5.1 - NuGet 6.5.0.154 -- pip 23.1.1 (python 3.7) +- pip 23.1.2 (python 3.7) - Pipx 1.2.0 - RubyGems 2.7.6.3 -- Vcpkg (build from commit b66959587) +- Vcpkg (build from commit 6d69bbacd) - Yarn 1.22.19 #### Environment variables @@ -58,14 +58,14 @@ - Cabal 3.10.1.0 - CMake 3.26.3 - CodeQL Action Bundles 2.12.6 2.13.0 -- Docker 23.0.4 +- Docker 23.0.5 - Docker Compose v1 1.29.2 - Docker Compose v2 2.17.3 - Docker-wincred 0.7.0 - ghc 9.6.1 - Git 2.40.1.windows.1 - Git LFS 3.3.0 -- Google Cloud SDK 428.0.0 +- Google Cloud SDK 429.0.0 - ImageMagick 7.1.1-8 - InnoSetup 6.2.2 - jq 1.6 @@ -78,7 +78,7 @@ - OpenSSL 1.1.1t - Packer 1.8.5 - Parcel 2.8.3 -- Pulumi 3.64.0 +- Pulumi 3.65.1 - R 4.3.0 - Service Fabric SDK 9.1.1436.9590 - Stack 2.9.3 @@ -92,8 +92,8 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.162 -- AWS CLI 2.11.13 -- AWS SAM CLI 1.81.0 +- AWS CLI 2.11.16 +- AWS SAM CLI 1.82.0 - AWS Session Manager CLI 1.2.463.0 - Azure CLI 2.48.1 - Azure DevOps CLI extension 0.26.0 @@ -116,10 +116,10 @@ - Rustfmt 1.5.2 ### Browsers and Drivers -- Google Chrome 112.0.5615.138 -- Chrome Driver 112.0.5615.49 -- Microsoft Edge 112.0.1722.58 -- Microsoft Edge Driver 112.0.1722.58 +- Google Chrome 113.0.5672.64 +- Chrome Driver 113.0.5672.24 +- Microsoft Edge 112.0.1722.68 +- Microsoft Edge Driver 112.0.1722.64 - Mozilla Firefox 112.0.2 - Gecko Driver 0.33.0 - IE Driver 4.8.0.0 @@ -500,7 +500,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Microsoft.AspNetCore.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 6.0.5, 6.0.16 - Microsoft.NETCore.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 6.0.5, 6.0.16 - Microsoft.WindowsDesktop.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 6.0.5, 6.0.16 -- nbgv 3.5.119+5d25f54fec +- nbgv 3.6.128+518ee610d6 ### PowerShell Tools - PowerShell 7.2.11 @@ -512,10 +512,10 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Az (Cached): 1.0.0.zip, 1.6.0.zip, 2.3.2.zip, 2.6.0.zip, 3.1.0.zip, 3.5.0.zip, 3.8.0.zip, 4.3.0.zip, 4.4.0.zip, 4.7.0.zip, 5.5.0.zip, 5.9.0.zip, 6.6.0.zip, 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.319 +- AWSPowershell: 4.1.324 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 -- Microsoft.Graph: 1.26.0 +- Microsoft.Graph: 1.27.0 - Pester: 3.4.0, 5.4.1 - PowerShellGet: 1.0.0.1, 2.2.5 - PSScriptAnalyzer: 1.21.0 From 8f4a9974b1c9f505ec4ce91f7139d1788382dbcd Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 9 May 2023 09:06:11 +0000 Subject: [PATCH 1899/3485] Updating readme file for macOS-12 version 20230430.1 (#7530) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-12-Readme.md | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/images/macos/macos-12-Readme.md b/images/macos/macos-12-Readme.md index 10708c3de5f0..dea64b331e58 100644 --- a/images/macos/macos-12-Readme.md +++ b/images/macos/macos-12-Readme.md @@ -1,7 +1,7 @@ # macOS 12 - OS Version: macOS 12.6.5 (21G531) - Kernel Version: Darwin 21.6.0 -- Image Version: 20230425.1 +- Image Version: 20230430.1 ## Installed Software @@ -14,9 +14,9 @@ - GCC 12 (Homebrew GCC 12.2.0) - available by `gcc-12` alias - GNU Fortran 11 (Homebrew GCC 11.3.0) - available by `gfortran-11` alias - GNU Fortran 12 (Homebrew GCC 12.2.0) - available by `gfortran-12` alias -- Go 1.20.3 - Julia 1.8.5 - Kotlin 1.8.21-release-380 +- Go 1.20.3 - Mono 6.12.0.188 - MSBuild 16.10.1.51301 (Mono 6.12.0.188) - Node.js 18.16.0 @@ -39,10 +39,10 @@ - NPM 9.5.1 - NuGet 6.3.1.1 - Pip 20.3.4 (python 2.7) -- Pip3 23.1.1 (python 3.11) +- Pip3 23.1.2 (python 3.11) - Pipx 1.2.0 - RubyGems 3.4.12 -- Vcpkg 2023 (build from commit b66959587) +- Vcpkg 2023 (build from commit cb1301e99) - Yarn 1.22.19 #### Environment variables @@ -70,7 +70,7 @@ - GitHub CLI 2.28.0 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.3 -- gpg (GnuPG) 2.4.0 +- gpg (GnuPG) 2.4.1 - Hub CLI 2.14.2 - ImageMagick 7.1.1-8 - jq 1.6 @@ -89,9 +89,9 @@ - zstd 1.5.5 ### Tools -- App Center CLI 2.13.6 -- AWS CLI 2.11.15 -- AWS SAM CLI 1.81.0 +- App Center CLI 2.13.7 +- AWS CLI 2.11.16 +- AWS SAM CLI 1.82.0 - AWS Session Manager CLI 1.2.463.0 - Azure CLI 2.48.1 - Azure CLI (azure-devops) 0.26.0 @@ -118,8 +118,8 @@ - SafariDriver 16.4.1 (17615.1.26.101.10) - Google Chrome 112.0.5615.137 - ChromeDriver 112.0.5615.49 -- Microsoft Edge 112.0.1722.58 -- Microsoft Edge WebDriver 112.0.1722.58 +- Microsoft Edge 112.0.1722.64 +- Microsoft Edge WebDriver 112.0.1722.64 - Mozilla Firefox 112.0.2 - geckodriver 0.33.0 - Selenium server 4.9.0 @@ -186,7 +186,7 @@ - PowerShell 7.2.11 #### PowerShell Modules -- Az: 9.7.0 +- Az: 9.7.1 - MarkdownPS: 1.9 - Pester: 5.4.1 - PSScriptAnalyzer: 1.21.0 From e2166f086dece04c93b4041b83ba1f245c352aaf Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Tue, 9 May 2023 17:15:03 +0200 Subject: [PATCH 1900/3485] Fix issue where json encoding is wrong in PS5 (#7538) --- helpers/GenerateResourcesAndImage.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helpers/GenerateResourcesAndImage.ps1 b/helpers/GenerateResourcesAndImage.ps1 index f6fe10adf5a0..f4f767eb2def 100644 --- a/helpers/GenerateResourcesAndImage.ps1 +++ b/helpers/GenerateResourcesAndImage.ps1 @@ -278,7 +278,7 @@ Function GenerateResourcesAndImage { $builderScriptPath_temp = $builderScriptPath.Replace(".json", "-temp.json") $packer_script = Get-Content -Path $builderScriptPath | ConvertFrom-Json $packer_script.builders | Add-Member -Name "azure_tags" -Value $Tags -MemberType NoteProperty - $packer_script | ConvertTo-Json -Depth 3 | Out-File $builderScriptPath_temp + $packer_script | ConvertTo-Json -Depth 3 | Out-File -Encoding Ascii $builderScriptPath_temp $builderScriptPath = $builderScriptPath_temp } } From 8bac0d5de1a30f2468f4afb950281cdce188595e Mon Sep 17 00:00:00 2001 From: sergei-pyshnoi <121864472+sergei-pyshnoi@users.noreply.github.com> Date: Tue, 9 May 2023 19:41:47 +0200 Subject: [PATCH 1901/3485] [macOS] fix edge installation (#7553) --- images/macos/provision/core/edge.sh | 45 +++++++++++++++-------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/images/macos/provision/core/edge.sh b/images/macos/provision/core/edge.sh index 6eaecbc8ac99..388c6dbf54b0 100644 --- a/images/macos/provision/core/edge.sh +++ b/images/macos/provision/core/edge.sh @@ -35,27 +35,28 @@ ln -s "$EDGEDRIVER_BIN" $APPLICATION echo "export EDGEWEBDRIVER=${EDGEDRIVER_DIR}" >> "${HOME}/.bashrc" popd > /dev/null -#Delete Microsoft autoupdate service to prevent autoupdates popup -AUTOUPDATE_START="$HOME/Library/Preferences/com.microsoft.autoupdate2.plist" -while [ ! -f "$AUTOUPDATE_START" ] -do - echo "Wait for MS update automatic installation" - sleep 30 -done - -echo "kill autoupdate process" -pgrep [M]icrosoft | sudo xargs kill -9 || true -echo "remove autupdate service" -sudo launchctl remove com.microsoft.autoupdate.helper - -echo "delete autoupdate files" -sudo rm -rf "$HOME/Library/Application Support/Microsoft AU Daemon/" -sudo rm -rf "$HOME/Library/Application Support/Microsoft AutoUpdate/" -sudo rm -rf "$HOME/Library/Preferences/com.microsoft.autoupdate2.plist" -sudo rm -rf "$HOME/Library/Preferences/com.microsoft.autoupdate.fba.plist" -sudo rm -rf "$HOME/Library/Caches/com.microsoft.autoupdate2" -sudo rm -rf "/Library/Application Support/Microsoft/MAU2.0/" -sudo rm -rf "/Library/LaunchAgents/com.microsoft.update.agent.plist" -sudo rm -rf "/Library/PrivelegedHelperTools/com.microsoft.autoupdate.helper" +# Configure Edge Updater to prevent auto update +# https://learn.microsoft.com/en-us/deployedge/edge-learnmore-edgeupdater-for-macos + +mkdir "Library/Managed Preferences" + +cat <<EOF > "Library/Managed Preferences/com.microsoft.EdgeUpdater.plist" +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>updatePolicies</key> + <dict> + <key>global</key> + <dict> + <key>UpdateDefault</key> + <integer>3</integer> + </dict> + </dict> +</dict> +</plist> +EOF + +chown root:wheel "/Library/Managed Preferences/com.microsoft.EdgeUpdater.plist" invoke_tests "Browsers" "Edge" From 0d51bb3f7348648a01cd7b5f95ebe12070a598cf Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Wed, 10 May 2023 18:29:23 +0200 Subject: [PATCH 1902/3485] README: distinguish announcements section (#7568) --- README.md | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index fe4c382e368b..657d02e126b2 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ - [About](#about) - [Available Images](#available-images) -- [Ongoing migrations](#ongoing-migrations) +- [Announcements](#announcements) - [Image Definitions](#image-definitions) - [Image Releases](#image-releases) - [Software and Image Support](#software-and-image-support) @@ -43,9 +43,9 @@ To build a VM machine from this repo's source, see the [instructions](docs/creat [macOS-10.15]: https://github.com/actions/runner-images/blob/main/images/macos/macos-10.15-Readme.md [self-hosted runners]: https://help.github.com/en/actions/hosting-your-own-runners -## Ongoing migrations +## Announcements -There are no migrations in progress. +See notable upcoming changes by viewing issues with the [Announcement](https://github.com/actions/runner-images/labels/Announcement) label. ## Image Definitions @@ -79,7 +79,6 @@ latest 2 versions of an OS. - You can also track upcoming changes using the [awaiting-deployment](https://github.com/actions/runner-images/labels/awaiting-deployment) label. 4. For high impact changes, we will post these in advance to the GitHub Changelog on our [blog](https://github.blog/changelog/) and on [twitter](https://twitter.com/GHchangelog). - Ex: breaking changes, GA or deprecation of images -5. You can also view notable upcoming changes by viewing the [Announcement](https://github.com/actions/runner-images/labels/Announcement) label. *Cadence* From ffa4d6a8294102655674b0cbcfe715a996232a93 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 11 May 2023 06:28:26 +0000 Subject: [PATCH 1903/3485] Updating readme file for ubuntu20 version 20230507.1 (#7550) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2004-Readme.md | 86 +++++++++++++++---------------- 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/images/linux/Ubuntu2004-Readme.md b/images/linux/Ubuntu2004-Readme.md index c378c61cd935..b034bae34c24 100644 --- a/images/linux/Ubuntu2004-Readme.md +++ b/images/linux/Ubuntu2004-Readme.md @@ -4,8 +4,8 @@ *** # Ubuntu 20.04 - OS Version: 20.04.6 LTS -- Kernel Version: 5.15.0-1036-azure -- Image Version: 20230426.1 +- Kernel Version: 5.15.0-1037-azure +- Image Version: 20230507.1 - Systemd version: 245.4-4ubuntu3.21 ## Installed Software @@ -34,7 +34,7 @@ ### Package Management - cpan 1.64 - Helm 3.11.3 -- Homebrew 4.0.15 +- Homebrew 4.0.16 - Miniconda 23.3.1 - Npm 9.5.1 - NuGet 6.3.1.1 @@ -42,7 +42,7 @@ - Pip3 20.0.2 - Pipx 1.2.0 - RubyGems 3.1.2 -- Vcpkg (build from commit 70992f649) +- Vcpkg (build from commit 6a3dd0874) - Yarn 1.22.19 #### Environment variables @@ -62,7 +62,7 @@ to accomplish this. ### Project Management - Ant 1.10.7 - Gradle 8.1.1 -- Lerna 6.6.1 +- Lerna 6.6.2 - Maven 3.8.8 - Sbt 1.8.2 @@ -72,11 +72,11 @@ to accomplish this. - AzCopy 10.18.1 - available by `azcopy` and `azcopy10` aliases - Bazel 6.1.2 - Bazelisk 1.13.2 -- Bicep 0.16.2 +- Bicep 0.17.1 - Buildah 1.22.3 - CMake 3.26.3 -- CodeQL Action Bundles 2.12.6 2.13.0 -- Docker Amazon ECR Credential Helper 0.6.0 +- CodeQL Action Bundles 2.13.0 2.13.1 +- Docker Amazon ECR Credential Helper 0.7.0 - Docker Compose v1 1.29.2 - Docker Compose v2 2.17.3+azure-1 - Docker-Buildx 0.10.4 @@ -87,12 +87,12 @@ to accomplish this. - Git LFS 3.3.0 - Git-ftp 1.6.0 - Haveged 1.9.1 -- Heroku 7.69.1 +- Heroku 8.1.3 - HHVM (HipHop VM) 4.172.1 - jq 1.6 - Kind 0.18.0 - Kubectl 1.27.1 -- Kustomize 5.0.1 +- Kustomize 5.0.2 - Leiningen 2.10.0 - MediaInfo 19.09 - Mercurial 5.3.1 @@ -101,41 +101,41 @@ to accomplish this. - Newman 5.3.2 - nvm 0.39.3 - OpenSSL 1.1.1f-1ubuntu2.18 -- Packer Packer 1.8.6 +- Packer 1.8.7 - Parcel 2.8.3 - PhantomJS 2.1.1 2.1.1 - Podman 3.4.2 -- Pulumi 3.64.0 +- Pulumi 3.66.0 - R 4.3.0 - Skopeo 1.5.0 - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 -- Terraform 1.4.5 +- Terraform 1.4.6 - yamllint 1.31.0 - yq 4.33.3 - zstd 1.5.5 ### CLI Tools -- Alibaba Cloud CLI 3.0.162 -- AWS CLI 2.11.15 +- Alibaba Cloud CLI 3.0.163 +- AWS CLI 2.11.18 - AWS CLI Session Manager Plugin 1.2.463.0 -- AWS SAM CLI 1.81.0 +- AWS SAM CLI 1.82.0 - Azure CLI 2.48.1 - Azure CLI (azure-devops) 0.26.0 - GitHub CLI 2.28.0 -- Google Cloud SDK 428.0.0 +- Google Cloud SDK 429.0.0 - Hub CLI 2.14.2 -- Netlify CLI 14.3.0 -- OpenShift CLI 4.12.14 +- Netlify CLI 15.0.0 +- OpenShift CLI 4.12.15 - ORAS CLI 1.0.0 -- Vercel CLI 28.20.0 +- Vercel CLI 29.1.1 ### Java -| Version | Vendor | Environment Variable | -| -------------------- | --------------- | -------------------- | -| 8.0.362+9 | Eclipse Temurin | JAVA_HOME_8_X64 | -| 11.0.18+10 (default) | Eclipse Temurin | JAVA_HOME_11_X64 | -| 17.0.6+10 | Eclipse Temurin | JAVA_HOME_17_X64 | +| Version | Vendor | Environment Variable | +| ------------------- | --------------- | -------------------- | +| 8.0.362+9 | Eclipse Temurin | JAVA_HOME_8_X64 | +| 11.0.19+7 (default) | Eclipse Temurin | JAVA_HOME_11_X64 | +| 17.0.7+7 | Eclipse Temurin | JAVA_HOME_17_X64 | ### PHP Tools - PHP: 7.4.33, 8.0.28, 8.1.18, 8.2.5 @@ -166,13 +166,13 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.5.2 ### Browsers and Drivers -- Google Chrome 112.0.5615.165 -- ChromeDriver 112.0.5615.49 -- Chromium 112.0.5593.0 -- Microsoft Edge 112.0.1722.58 -- Microsoft Edge WebDriver 112.0.1722.58 +- Google Chrome 113.0.5672.63 +- ChromeDriver 113.0.5672.63 +- Chromium 113.0.5672.0 +- Microsoft Edge 113.0.1774.35 +- Microsoft Edge WebDriver 113.0.1774.35 - Selenium server 4.9.0 -- Mozilla Firefox 112.0.2 +- Mozilla Firefox 113.0 - Geckodriver 0.33.0 #### Environment variables @@ -185,7 +185,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ### .NET Tools - .NET Core SDK: 3.1.120, 3.1.202, 3.1.302, 3.1.426, 6.0.408, 7.0.105, 7.0.203 -- nbgv 3.5.119+5d25f54fec +- nbgv 3.6.128+518ee610d6 ### Databases - MongoDB 5.0.17 @@ -216,8 +216,8 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Go - 1.18.10 -- 1.19.8 -- 1.20.3 +- 1.19.9 +- 1.20.4 #### Node.js - 14.21.3 @@ -254,7 +254,7 @@ Use the following command as a part of your job to start the service: 'sudo syst - Az: 9.3.0 - Az (Cached): 3.1.0.zip, 4.4.0.zip, 5.9.0.zip, 6.6.0.zip, 7.5.0.zip - MarkdownPS: 1.9 -- Microsoft.Graph: 1.26.0 +- Microsoft.Graph: 1.27.0 - Pester: 5.4.1 - PSScriptAnalyzer: 1.21.0 @@ -298,19 +298,19 @@ Use the following command as a part of your job to start the service: 'sudo syst | alpine:3.15 | sha256:ecbdce53b2c2f43ab1b19418bcbd3f120a23547d9497030c8d978114512b883e | 2023-03-29 | | alpine:3.16 | sha256:c2b622f6e510a0d25bccaffa9e67b75a6860cb09b74bb58cfc36a9ef4331109f | 2023-03-29 | | alpine:3.17 | sha256:124c7d2707904eea7431fffe91522a01e5a861a624ee31d03372cc1d138a3126 | 2023-03-29 | -| buildpack-deps:bullseye | sha256:695fd9e1f58574422eece085006690b3110abb0d304260024d40775b95c6056e | 2023-04-12 | -| buildpack-deps:buster | sha256:5c2114d327b0e2a38de4e3dcf5fa304e4da23264a1e77643632d0a25325d7e2d | 2023-04-12 | +| buildpack-deps:bullseye | sha256:373587e78550f0918d16b793d1ead24c3f489a14c3af85da1096e2a683908e0c | 2023-05-03 | +| buildpack-deps:buster | sha256:bfefe2afb02a82c76d955f2c158b3b5aa96e7afcf262727e8f37ccdea60a39c5 | 2023-05-03 | | buildpack-deps:stretch | sha256:78e995165a5788c2f55aed6e548d8f6c1534830d4310c870408fccb2da8c5b2e | 2022-06-23 | -| debian:10 | sha256:173f0b19d2ac5ee17194dbe9a888a4a617dbf905ee666c9e780afad55eaf1d8c | 2023-04-12 | -| debian:11 | sha256:0a78ed641b76252739e28ebbbe8cdbd80dc367fba4502565ca839e5803cfd86e | 2023-04-12 | +| debian:10 | sha256:cca6bcced970f7634197ff1821aabb452024eb437958ab98bfc146ece96969c6 | 2023-05-02 | +| debian:11 | sha256:63d62ae233b588d6b426b7b072d79d1306bfd02a72bff1fc045b8511cc89ee09 | 2023-05-02 | | debian:9 | sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be | 2022-06-23 | | moby/buildkit:latest | sha256:d6fa89830c26919acba23c5cafa09df0c3ec1fbde20bb2a15ff349e0795241f4 | 2023-04-20 | | node:14 | sha256:a158d3b9b4e3fa813fa6c8c590b8f0a860e015ad4e59bbce5744d2f6fd8461aa | 2023-04-12 | | node:14-alpine | sha256:434215b487a329c9e867202ff89e704d3a75e554822e07f3e0c0f9e606121b33 | 2023-03-29 | -| node:16 | sha256:241f152c0dc9d3efcbd6a4426f52dc50fa78f3a63cff55b2419dc2bf48efe705 | 2023-04-12 | -| node:16-alpine | sha256:b4a72f83f52bbe3970bb74a15e44ec4cf6e873ad4787473dfc8a26f5b4e29dd2 | 2023-03-29 | -| node:18 | sha256:671ee8d49ce2a691fc3082203c5deb9522e0c80042aa0ff40c07f4a25e63668a | 2023-04-13 | -| node:18-alpine | sha256:ca5d399560a9d239cbfa28eec00417f1505e5e108f3ec6938d230767eaa81f61 | 2023-04-13 | +| node:16 | sha256:550f484fc5f314b575f5e397c9e2c71d7f218e59729fcda9ffa7ea1fc825dce7 | 2023-05-04 | +| node:16-alpine | sha256:f1657204d3463bce763cefa5b25e48c28af6fe0cdb0f68b354f0f8225ef61be7 | 2023-03-29 | +| node:18 | sha256:3f567a26b6b6d601fb2b168d4f987b50697617ead15bfc0e0152e600ac48d0fe | 2023-05-04 | +| node:18-alpine | sha256:1ccc70acda680aa4ba47f53e7c40b2d4d6892de74817128e0662d32647dd7f4d | 2023-04-13 | | ubuntu:16.04 | sha256:1f1a2d56de1d604801a9671f301190704c25d604a416f59e03c04f5c6ffee0d6 | 2021-08-31 | | ubuntu:18.04 | sha256:8aa9c2798215f99544d1ce7439ea9c3a6dfd82de607da1cec3a8a2fae005931b | 2023-03-08 | | ubuntu:20.04 | sha256:db8bf6f4fb351aa7a26e27ba2686cf35a6a409f65603e59d4c203e58387dc6b3 | 2023-04-13 | From 4fe7f6bc86111e8ae1721eeecaa8df3e9a3c2dbd Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 11 May 2023 06:29:58 +0000 Subject: [PATCH 1904/3485] Updating readme file for ubuntu22 version 20230507.1 (#7551) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2204-Readme.md | 88 +++++++++++++++---------------- 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/images/linux/Ubuntu2204-Readme.md b/images/linux/Ubuntu2204-Readme.md index c32987fd7077..57b953229ba0 100644 --- a/images/linux/Ubuntu2204-Readme.md +++ b/images/linux/Ubuntu2204-Readme.md @@ -4,8 +4,8 @@ *** # Ubuntu 22.04 - OS Version: 22.04.2 LTS -- Kernel Version: 5.15.0-1036-azure -- Image Version: 20230426.1 +- Kernel Version: 5.15.0-1037-azure +- Image Version: 20230507.1 - Systemd version: 249.11-0ubuntu3.9 ## Installed Software @@ -32,7 +32,7 @@ ### Package Management - cpan 1.64 - Helm 3.11.3 -- Homebrew 4.0.15 +- Homebrew 4.0.16 - Miniconda 23.3.1 - Npm 9.5.1 - NuGet 6.3.1.1 @@ -40,7 +40,7 @@ - Pip3 22.0.2 - Pipx 1.2.0 - RubyGems 3.3.5 -- Vcpkg (build from commit 70992f649) +- Vcpkg (build from commit 6a3dd0874) - Yarn 1.22.19 #### Environment variables @@ -58,7 +58,7 @@ to accomplish this. ``` ### Project Management -- Lerna 6.6.1 +- Lerna 6.6.2 - Maven 3.8.8 ### Tools @@ -67,11 +67,11 @@ to accomplish this. - AzCopy 10.18.1 - available by `azcopy` and `azcopy10` aliases - Bazel 6.1.2 - Bazelisk 1.13.2 -- Bicep 0.16.2 +- Bicep 0.17.1 - Buildah 1.23.1 - CMake 3.26.3 -- CodeQL Action Bundles 2.12.6 2.13.0 -- Docker Amazon ECR Credential Helper 0.6.0 +- CodeQL Action Bundles 2.13.0 2.13.1 +- Docker Amazon ECR Credential Helper 0.7.0 - Docker Compose v1 1.29.2 - Docker Compose v2 2.17.3+azure-1 - Docker-Buildx 0.10.4 @@ -82,11 +82,11 @@ to accomplish this. - Git LFS 3.3.0 - Git-ftp 1.6.0 - Haveged 1.9.14 -- Heroku 7.69.1 +- Heroku 8.1.3 - jq 1.6 - Kind 0.18.0 - Kubectl 1.27.1 -- Kustomize 5.0.1 +- Kustomize 5.0.2 - Leiningen 2.10.0 - MediaInfo 21.09 - Mercurial 6.1.1 @@ -95,40 +95,40 @@ to accomplish this. - Newman 5.3.2 - nvm 0.39.3 - OpenSSL 3.0.2-0ubuntu1.9 -- Packer Packer 1.8.6 +- Packer 1.8.7 - Parcel 2.8.3 - Podman 3.4.4 -- Pulumi 3.64.0 +- Pulumi 3.66.0 - R 4.3.0 - Skopeo 1.4.1 - Sphinx Open Source Search Server 2.2.11 - SVN 1.14.1 -- Terraform 1.4.5 +- Terraform 1.4.6 - yamllint 1.31.0 - yq 4.33.3 - zstd 1.5.5 ### CLI Tools -- Alibaba Cloud CLI 3.0.162 -- AWS CLI 2.11.15 +- Alibaba Cloud CLI 3.0.163 +- AWS CLI 2.11.18 - AWS CLI Session Manager Plugin 1.2.463.0 -- AWS SAM CLI 1.81.0 +- AWS SAM CLI 1.82.0 - Azure CLI 2.48.1 - Azure CLI (azure-devops) 0.26.0 - GitHub CLI 2.28.0 -- Google Cloud SDK 428.0.0 +- Google Cloud SDK 429.0.0 - Hub CLI 2.14.2 -- Netlify CLI 14.3.0 -- OpenShift CLI 4.12.14 +- Netlify CLI 15.0.0 +- OpenShift CLI 4.12.15 - ORAS CLI 1.0.0 -- Vercel CLI 28.20.0 +- Vercel CLI 29.1.1 ### Java -| Version | Vendor | Environment Variable | -| -------------------- | --------------- | -------------------- | -| 8.0.362+9 | Eclipse Temurin | JAVA_HOME_8_X64 | -| 11.0.18+10 (default) | Eclipse Temurin | JAVA_HOME_11_X64 | -| 17.0.6+10 | Eclipse Temurin | JAVA_HOME_17_X64 | +| Version | Vendor | Environment Variable | +| ------------------- | --------------- | -------------------- | +| 8.0.362+9 | Eclipse Temurin | JAVA_HOME_8_X64 | +| 11.0.19+7 (default) | Eclipse Temurin | JAVA_HOME_11_X64 | +| 17.0.7+7 | Eclipse Temurin | JAVA_HOME_17_X64 | ### PHP Tools - PHP: 8.1.2 @@ -159,13 +159,13 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.5.2 ### Browsers and Drivers -- Google Chrome 112.0.5615.165 -- ChromeDriver 112.0.5615.49 -- Chromium 112.0.5593.0 -- Microsoft Edge 112.0.1722.58 -- Microsoft Edge WebDriver 112.0.1722.58 +- Google Chrome 113.0.5672.63 +- ChromeDriver 113.0.5672.63 +- Chromium 113.0.5672.0 +- Microsoft Edge 113.0.1774.35 +- Microsoft Edge WebDriver 113.0.1774.35 - Selenium server 4.9.0 -- Mozilla Firefox 112.0.2 +- Mozilla Firefox 113.0 - Geckodriver 0.33.0 #### Environment variables @@ -178,7 +178,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ### .NET Tools - .NET Core SDK: 6.0.408, 7.0.105, 7.0.203 -- nbgv 3.5.119+5d25f54fec +- nbgv 3.6.128+518ee610d6 ### Databases - sqlite3 3.37.2 @@ -208,8 +208,8 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Go - 1.18.10 -- 1.19.8 -- 1.20.3 +- 1.19.9 +- 1.20.4 #### Node.js - 14.21.3 @@ -237,7 +237,7 @@ Use the following command as a part of your job to start the service: 'sudo syst #### PowerShell Modules - Az: 9.3.0 - MarkdownPS: 1.9 -- Microsoft.Graph: 1.26.0 +- Microsoft.Graph: 1.27.0 - Pester: 5.4.1 - PSScriptAnalyzer: 1.21.0 @@ -280,20 +280,20 @@ Use the following command as a part of your job to start the service: 'sudo syst | alpine:3.15 | sha256:ecbdce53b2c2f43ab1b19418bcbd3f120a23547d9497030c8d978114512b883e | 2023-03-29 | | alpine:3.16 | sha256:c2b622f6e510a0d25bccaffa9e67b75a6860cb09b74bb58cfc36a9ef4331109f | 2023-03-29 | | alpine:3.17 | sha256:124c7d2707904eea7431fffe91522a01e5a861a624ee31d03372cc1d138a3126 | 2023-03-29 | -| buildpack-deps:bullseye | sha256:695fd9e1f58574422eece085006690b3110abb0d304260024d40775b95c6056e | 2023-04-12 | -| buildpack-deps:buster | sha256:5c2114d327b0e2a38de4e3dcf5fa304e4da23264a1e77643632d0a25325d7e2d | 2023-04-12 | -| debian:10 | sha256:173f0b19d2ac5ee17194dbe9a888a4a617dbf905ee666c9e780afad55eaf1d8c | 2023-04-12 | -| debian:11 | sha256:0a78ed641b76252739e28ebbbe8cdbd80dc367fba4502565ca839e5803cfd86e | 2023-04-12 | +| buildpack-deps:bullseye | sha256:373587e78550f0918d16b793d1ead24c3f489a14c3af85da1096e2a683908e0c | 2023-05-03 | +| buildpack-deps:buster | sha256:bfefe2afb02a82c76d955f2c158b3b5aa96e7afcf262727e8f37ccdea60a39c5 | 2023-05-03 | +| debian:10 | sha256:cca6bcced970f7634197ff1821aabb452024eb437958ab98bfc146ece96969c6 | 2023-05-02 | +| debian:11 | sha256:63d62ae233b588d6b426b7b072d79d1306bfd02a72bff1fc045b8511cc89ee09 | 2023-05-02 | | moby/buildkit:latest | sha256:d6fa89830c26919acba23c5cafa09df0c3ec1fbde20bb2a15ff349e0795241f4 | 2023-04-20 | | node:14 | sha256:a158d3b9b4e3fa813fa6c8c590b8f0a860e015ad4e59bbce5744d2f6fd8461aa | 2023-04-12 | | node:14-alpine | sha256:434215b487a329c9e867202ff89e704d3a75e554822e07f3e0c0f9e606121b33 | 2023-03-29 | -| node:16 | sha256:241f152c0dc9d3efcbd6a4426f52dc50fa78f3a63cff55b2419dc2bf48efe705 | 2023-04-12 | -| node:16-alpine | sha256:b4a72f83f52bbe3970bb74a15e44ec4cf6e873ad4787473dfc8a26f5b4e29dd2 | 2023-03-29 | -| node:18 | sha256:671ee8d49ce2a691fc3082203c5deb9522e0c80042aa0ff40c07f4a25e63668a | 2023-04-13 | -| node:18-alpine | sha256:ca5d399560a9d239cbfa28eec00417f1505e5e108f3ec6938d230767eaa81f61 | 2023-04-13 | +| node:16 | sha256:550f484fc5f314b575f5e397c9e2c71d7f218e59729fcda9ffa7ea1fc825dce7 | 2023-05-04 | +| node:16-alpine | sha256:f1657204d3463bce763cefa5b25e48c28af6fe0cdb0f68b354f0f8225ef61be7 | 2023-03-29 | +| node:18 | sha256:3f567a26b6b6d601fb2b168d4f987b50697617ead15bfc0e0152e600ac48d0fe | 2023-05-04 | +| node:18-alpine | sha256:1ccc70acda680aa4ba47f53e7c40b2d4d6892de74817128e0662d32647dd7f4d | 2023-04-13 | | ubuntu:18.04 | sha256:8aa9c2798215f99544d1ce7439ea9c3a6dfd82de607da1cec3a8a2fae005931b | 2023-03-08 | | ubuntu:20.04 | sha256:db8bf6f4fb351aa7a26e27ba2686cf35a6a409f65603e59d4c203e58387dc6b3 | 2023-04-13 | -| ubuntu:22.04 | sha256:67211c14fa74f070d27cc59d69a7fa9aeff8e28ea118ef3babc295a0428a6d21 | 2023-03-08 | +| ubuntu:22.04 | sha256:dfd64a3b4296d8c9b62aa3309984f8620b98d87e47492599ee20739e8eb54fbf | 2023-04-25 | ### Installed apt packages | Name | Version | From 3ae81a08355707e7ce882a86d4dddc98a2c535fb Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Thu, 11 May 2023 10:21:01 +0200 Subject: [PATCH 1905/3485] [Ubuntu] Test firefox without sudo (#7571) --- images/linux/scripts/tests/Browsers.Tests.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/linux/scripts/tests/Browsers.Tests.ps1 b/images/linux/scripts/tests/Browsers.Tests.ps1 index 3b920351bef6..1ea5230f39f2 100644 --- a/images/linux/scripts/tests/Browsers.Tests.ps1 +++ b/images/linux/scripts/tests/Browsers.Tests.ps1 @@ -1,6 +1,6 @@ Describe "Firefox" { It "Firefox" { - "sudo -i firefox --version" | Should -ReturnZeroExitCode + "firefox --version" | Should -ReturnZeroExitCode } It "Geckodriver" { From 4b678ffee824f1167b819646bf7eec86e4603869 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 11 May 2023 10:31:03 +0000 Subject: [PATCH 1906/3485] Updating readme file for macOS-11 version 20230504.1 (#7552) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-11-Readme.md | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/images/macos/macos-11-Readme.md b/images/macos/macos-11-Readme.md index 72ca9fdbe58f..06208e2485f1 100644 --- a/images/macos/macos-11-Readme.md +++ b/images/macos/macos-11-Readme.md @@ -1,7 +1,7 @@ # macOS 11 - OS Version: macOS 11.7.6 (20G1231) - Kernel Version: Darwin 20.6.0 -- Image Version: 20230429.1 +- Image Version: 20230504.1 ## Installed Software @@ -18,7 +18,7 @@ - GNU Fortran 12 (Homebrew GCC 12.2.0) - available by `gfortran-12` alias - Julia 1.8.5 - Kotlin 1.8.21-release-380 -- Go 1.20.3 +- Go 1.20.4 - Mono 6.12.0.188 - MSBuild 16.10.1.51301 (Mono 6.12.0.188) - Node.js 18.16.0 @@ -36,7 +36,7 @@ - Carthage 0.39.0 - CocoaPods 1.12.1 - Composer 2.5.5 -- Homebrew 4.0.15 +- Homebrew 4.0.16 - Miniconda 23.3.1 - NPM 9.5.1 - NuGet 6.3.1.1 @@ -44,7 +44,7 @@ - Pip3 23.1.2 (python 3.11) - Pipx 1.2.0 - RubyGems 3.4.12 -- Vcpkg 2023 (build from commit cb1301e99) +- Vcpkg 2023 (build from commit 60e2c07d2) - Yarn 1.22.19 #### Environment variables @@ -93,21 +93,21 @@ ### Tools - Aliyun CLI 3.0.161 - App Center CLI 2.13.7 -- AWS CLI 2.11.16 +- AWS CLI 2.11.17 - AWS SAM CLI 1.82.0 - AWS Session Manager CLI 1.2.463.0 - Azure CLI 2.48.1 - Azure CLI (azure-devops) 0.26.0 -- Bicep CLI 0.16.2 +- Bicep CLI 0.17.1 - Cabal 3.6.2.0 - Cmake 3.26.3 -- CodeQL Action Bundles 2.12.6 2.13.0 +- CodeQL Action Bundles 2.13.0 2.13.1 - Fastlane 2.212.2 - GHC 9.6.1 - GHCup 0.1.19.2 - Jazzy 0.14.3 - Stack 2.9.3 -- SwiftFormat 0.51.7 +- SwiftFormat 0.51.8 - Swig 4.1.1 - Xcode Command Line Tools 13.2.0.0.1.1638488800 @@ -118,10 +118,10 @@ ### Browsers - Safari 16.4.1 (16615.1.26.101.10) - SafariDriver 16.4.1 (16615.1.26.101.10) -- Google Chrome 112.0.5615.137 -- ChromeDriver 112.0.5615.49 -- Microsoft Edge 112.0.1722.64 -- Microsoft Edge WebDriver 112.0.1722.64 +- Google Chrome 113.0.5672.63 +- ChromeDriver 113.0.5672.63 +- Microsoft Edge 112.0.1722.68 +- Microsoft Edge WebDriver 112.0.1722.68 - Mozilla Firefox 112.0.2 - geckodriver 0.33.0 - Selenium server 4.9.0 @@ -129,7 +129,7 @@ #### Environment variables | Name | Value | | --------------- | ---------------------------------------------- | -| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/112.0.5615.49 | +| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/113.0.5672.63 | | EDGEWEBDRIVER | /usr/local/share/edge_driver | | GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | @@ -170,8 +170,8 @@ #### Go - 1.18.10 -- 1.19.8 -- 1.20.3 +- 1.19.9 +- 1.20.4 ### Rust Tools - Cargo 1.69.0 From d4b9dcfb15e44a5cbd8f9ad9c0e458218d4d6b20 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 11 May 2023 14:03:39 +0000 Subject: [PATCH 1907/3485] Updating readme file for win19 version 20230508.1 (#7562) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2019-Readme.md | 34 ++++++++++++++++---------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index a09ae1df1bd9..0867910caa1a 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -4,7 +4,7 @@ *** # Windows Server 2019 - OS Version: 10.0.17763 Build 4252 -- Image Version: 20230502.2 +- Image Version: 20230508.1 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -13,7 +13,7 @@ ### Language and Runtime - Bash 5.2.15(1)-release -- Go 1.20.3 +- Go 1.20.4 - Julia 1.8.5 - Kotlin 1.8.21 - LLVM 15.0.7 @@ -33,7 +33,7 @@ - pip 23.1.2 (python 3.7) - Pipx 1.2.0 - RubyGems 2.7.6.3 -- Vcpkg (build from commit 6d69bbacd) +- Vcpkg (build from commit ea222747b) - Yarn 1.22.19 #### Environment variables @@ -54,11 +54,11 @@ - azcopy 10.18.1 - Bazel 6.1.2 - Bazelisk 1.13.2 -- Bicep 0.16.2 +- Bicep 0.17.1 - Cabal 3.10.1.0 - CMake 3.26.3 -- CodeQL Action Bundles 2.12.6 2.13.0 -- Docker 23.0.5 +- CodeQL Action Bundles 2.13.0 2.13.1 +- Docker 23.0.6 - Docker Compose v1 1.29.2 - Docker Compose v2 2.17.3 - Docker-wincred 0.7.0 @@ -76,9 +76,9 @@ - Newman 5.3.2 - NSIS 3.08 - OpenSSL 1.1.1t -- Packer 1.8.5 +- Packer 1.8.7 - Parcel 2.8.3 -- Pulumi 3.65.1 +- Pulumi 3.66.0 - R 4.3.0 - Service Fabric SDK 9.1.1436.9590 - Stack 2.9.3 @@ -91,8 +91,8 @@ - zstd 1.5.5 ### CLI Tools -- Alibaba Cloud CLI 3.0.162 -- AWS CLI 2.11.16 +- Alibaba Cloud CLI 3.0.163 +- AWS CLI 2.11.17 - AWS SAM CLI 1.82.0 - AWS Session Manager CLI 1.2.463.0 - Azure CLI 2.48.1 @@ -116,10 +116,10 @@ - Rustfmt 1.5.2 ### Browsers and Drivers -- Google Chrome 113.0.5672.64 -- Chrome Driver 113.0.5672.24 -- Microsoft Edge 112.0.1722.68 -- Microsoft Edge Driver 112.0.1722.64 +- Google Chrome 113.0.5672.93 +- Chrome Driver 113.0.5672.63 +- Microsoft Edge 113.0.1774.35 +- Microsoft Edge Driver 113.0.1774.35 - Mozilla Firefox 112.0.2 - Gecko Driver 0.33.0 - IE Driver 4.8.0.0 @@ -165,8 +165,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Go - 1.18.10 -- 1.19.8 -- 1.20.3 +- 1.19.9 +- 1.20.4 #### Node.js - 14.21.3 @@ -512,7 +512,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Az (Cached): 1.0.0.zip, 1.6.0.zip, 2.3.2.zip, 2.6.0.zip, 3.1.0.zip, 3.5.0.zip, 3.8.0.zip, 4.3.0.zip, 4.4.0.zip, 4.7.0.zip, 5.5.0.zip, 5.9.0.zip, 6.6.0.zip, 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.324 +- AWSPowershell: 4.1.328 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 - Microsoft.Graph: 1.27.0 From 8a3922ad306bb6699969ce713a6c2f2d2b9014e0 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 11 May 2023 14:05:00 +0000 Subject: [PATCH 1908/3485] Updating readme file for win22 version 20230508.3 (#7557) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2022-Readme.md | 34 ++++++++++++++++---------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/images/win/Windows2022-Readme.md b/images/win/Windows2022-Readme.md index c4eacd1f50f5..4e5db12de87d 100644 --- a/images/win/Windows2022-Readme.md +++ b/images/win/Windows2022-Readme.md @@ -4,7 +4,7 @@ *** # Windows Server 2022 - OS Version: 10.0.20348 Build 1668 -- Image Version: 20230502.2 +- Image Version: 20230508.3 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -13,7 +13,7 @@ ### Language and Runtime - Bash 5.2.15(1)-release -- Go 1.20.3 +- Go 1.20.4 - Julia 1.8.5 - Kotlin 1.8.21 - LLVM 15.0.7 @@ -33,7 +33,7 @@ - pip 23.1.2 (python 3.9) - Pipx 1.2.0 - RubyGems 3.2.33 -- Vcpkg (build from commit 6d69bbacd) +- Vcpkg (build from commit ea222747b) - Yarn 1.22.19 #### Environment variables @@ -54,11 +54,11 @@ - azcopy 10.18.1 - Bazel 6.1.2 - Bazelisk 1.13.2 -- Bicep 0.16.2 +- Bicep 0.17.1 - Cabal 3.10.1.0 - CMake 3.26.3 -- CodeQL Action Bundles 2.12.6 2.13.0 -- Docker 23.0.5 +- CodeQL Action Bundles 2.13.0 2.13.1 +- Docker 23.0.6 - Docker Compose v1 1.29.2 - Docker Compose v2 2.17.3 - Docker-wincred 0.7.0 @@ -75,8 +75,8 @@ - Newman 5.3.2 - NSIS 3.08 - OpenSSL 1.1.1t -- Packer 1.8.5 -- Pulumi 3.65.1 +- Packer 1.8.7 +- Pulumi 3.66.0 - R 4.3.0 - Service Fabric SDK 9.1.1436.9590 - Stack 2.9.3 @@ -89,8 +89,8 @@ - zstd 1.5.5 ### CLI Tools -- Alibaba Cloud CLI 3.0.162 -- AWS CLI 2.11.16 +- Alibaba Cloud CLI 3.0.163 +- AWS CLI 2.11.17 - AWS SAM CLI 1.82.0 - AWS Session Manager CLI 1.2.463.0 - Azure CLI 2.48.1 @@ -113,10 +113,10 @@ - Rustfmt 1.5.2 ### Browsers and Drivers -- Google Chrome 113.0.5672.64 -- Chrome Driver 113.0.5672.24 -- Microsoft Edge 112.0.1722.64 -- Microsoft Edge Driver 112.0.1722.68 +- Google Chrome 113.0.5672.93 +- Chrome Driver 113.0.5672.63 +- Microsoft Edge 113.0.1774.35 +- Microsoft Edge Driver 113.0.1774.35 - Mozilla Firefox 112.0.2 - Gecko Driver 0.33.0 - IE Driver 4.8.0.0 @@ -158,8 +158,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Go - 1.18.10 -- 1.19.8 -- 1.20.3 +- 1.19.9 +- 1.20.4 #### Node.js - 14.21.3 @@ -543,7 +543,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Az (Cached): 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.324 +- AWSPowershell: 4.1.328 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 - Microsoft.Graph: 1.27.0 From db1ea288ef96a5d6a2a24386af2ee2baee7c6af9 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Thu, 11 May 2023 17:52:01 +0200 Subject: [PATCH 1909/3485] [WinLin] Remove schedules from Azure pipelines (#7576) --- images.CI/linux-and-win/azure-pipelines/ubuntu2004.yml | 8 -------- images.CI/linux-and-win/azure-pipelines/ubuntu2204.yml | 8 -------- images.CI/linux-and-win/azure-pipelines/windows2019.yml | 8 -------- images.CI/linux-and-win/azure-pipelines/windows2022.yml | 8 -------- 4 files changed, 32 deletions(-) diff --git a/images.CI/linux-and-win/azure-pipelines/ubuntu2004.yml b/images.CI/linux-and-win/azure-pipelines/ubuntu2004.yml index 4bf78c183957..51a1d0bbff0a 100644 --- a/images.CI/linux-and-win/azure-pipelines/ubuntu2004.yml +++ b/images.CI/linux-and-win/azure-pipelines/ubuntu2004.yml @@ -1,11 +1,3 @@ -schedules: -- cron: "0 0 * * *" - displayName: Daily - branches: - include: - - main - always: true - trigger: none pr: autoCancel: true diff --git a/images.CI/linux-and-win/azure-pipelines/ubuntu2204.yml b/images.CI/linux-and-win/azure-pipelines/ubuntu2204.yml index 8fc4c7b69f79..a0458ac67692 100644 --- a/images.CI/linux-and-win/azure-pipelines/ubuntu2204.yml +++ b/images.CI/linux-and-win/azure-pipelines/ubuntu2204.yml @@ -1,11 +1,3 @@ -schedules: -- cron: "0 0 * * *" - displayName: Daily - branches: - include: - - main - always: true - trigger: none pr: autoCancel: true diff --git a/images.CI/linux-and-win/azure-pipelines/windows2019.yml b/images.CI/linux-and-win/azure-pipelines/windows2019.yml index ccad8f882cdd..7f2b8a801286 100644 --- a/images.CI/linux-and-win/azure-pipelines/windows2019.yml +++ b/images.CI/linux-and-win/azure-pipelines/windows2019.yml @@ -1,11 +1,3 @@ -schedules: -- cron: "0 0 * * *" - displayName: Daily - branches: - include: - - main - always: true - trigger: none pr: autoCancel: true diff --git a/images.CI/linux-and-win/azure-pipelines/windows2022.yml b/images.CI/linux-and-win/azure-pipelines/windows2022.yml index 30dcfa3665b5..a0c9efcfb3a6 100644 --- a/images.CI/linux-and-win/azure-pipelines/windows2022.yml +++ b/images.CI/linux-and-win/azure-pipelines/windows2022.yml @@ -1,11 +1,3 @@ -schedules: -- cron: "0 0 * * *" - displayName: Daily - branches: - include: - - main - always: true - trigger: none pr: autoCancel: true From 648fecab61165d0f53c872d5cf0486c6d30074a9 Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Thu, 11 May 2023 18:59:40 +0200 Subject: [PATCH 1910/3485] Update vctools v143 to 14.35 (#7558) --- images/win/toolsets/toolset-2022.json | 36 +++++++++++++-------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index 3d76ba6b04b1..46bdd84daddf 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -254,24 +254,24 @@ "Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.ARM.Spectre", "Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.ARM64", "Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.ARM64.Spectre", - "Microsoft.VisualStudio.Component.VC.14.34.17.4.ARM", - "Microsoft.VisualStudio.Component.VC.14.34.17.4.ARM.Spectre", - "Microsoft.VisualStudio.Component.VC.14.34.17.4.ARM64", - "Microsoft.VisualStudio.Component.VC.14.34.17.4.ARM64.Spectre", - "Microsoft.VisualStudio.Component.VC.14.34.17.4.x86.x64", - "Microsoft.VisualStudio.Component.VC.14.34.17.4.x86.x64.Spectre", - "Microsoft.VisualStudio.Component.VC.14.34.17.4.ATL", - "Microsoft.VisualStudio.Component.VC.14.34.17.4.ATL.Spectre", - "Microsoft.VisualStudio.Component.VC.14.34.17.4.ATL.ARM", - "Microsoft.VisualStudio.Component.VC.14.34.17.4.ATL.ARM.Spectre", - "Microsoft.VisualStudio.Component.VC.14.34.17.4.ATL.ARM64", - "Microsoft.VisualStudio.Component.VC.14.34.17.4.ATL.ARM64.Spectre", - "Microsoft.VisualStudio.Component.VC.14.34.17.4.MFC", - "Microsoft.VisualStudio.Component.VC.14.34.17.4.MFC.Spectre", - "Microsoft.VisualStudio.Component.VC.14.34.17.4.MFC.ARM", - "Microsoft.VisualStudio.Component.VC.14.34.17.4.MFC.ARM.Spectre", - "Microsoft.VisualStudio.Component.VC.14.34.17.4.MFC.ARM64", - "Microsoft.VisualStudio.Component.VC.14.34.17.4.MFC.ARM64.Spectre", + "Microsoft.VisualStudio.Component.VC.14.35.17.5.ARM", + "Microsoft.VisualStudio.Component.VC.14.35.17.5.ARM.Spectre", + "Microsoft.VisualStudio.Component.VC.14.35.17.5.ARM64", + "Microsoft.VisualStudio.Component.VC.14.35.17.5.ARM64.Spectre", + "Microsoft.VisualStudio.Component.VC.14.35.17.5.x86.x64", + "Microsoft.VisualStudio.Component.VC.14.35.17.5.x86.x64.Spectre", + "Microsoft.VisualStudio.Component.VC.14.35.17.5.ATL", + "Microsoft.VisualStudio.Component.VC.14.35.17.5.ATL.Spectre", + "Microsoft.VisualStudio.Component.VC.14.35.17.5.ATL.ARM", + "Microsoft.VisualStudio.Component.VC.14.35.17.5.ATL.ARM.Spectre", + "Microsoft.VisualStudio.Component.VC.14.35.17.5.ATL.ARM64", + "Microsoft.VisualStudio.Component.VC.14.35.17.5.ATL.ARM64.Spectre", + "Microsoft.VisualStudio.Component.VC.14.35.17.5.MFC", + "Microsoft.VisualStudio.Component.VC.14.35.17.5.MFC.Spectre", + "Microsoft.VisualStudio.Component.VC.14.35.17.5.MFC.ARM", + "Microsoft.VisualStudio.Component.VC.14.35.17.5.MFC.ARM.Spectre", + "Microsoft.VisualStudio.Component.VC.14.35.17.5.MFC.ARM64", + "Microsoft.VisualStudio.Component.VC.14.35.17.5.MFC.ARM64.Spectre", "Microsoft.VisualStudio.Component.VC.ATLMFC", "Microsoft.VisualStudio.Component.VC.ATLMFC.Spectre", "Microsoft.VisualStudio.Component.Windows10SDK.19041", From 8ff6083fafef695002d884b7558e77c06fea4cde Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 11 May 2023 17:46:45 +0000 Subject: [PATCH 1911/3485] Updating readme file for macOS-12 version 20230505.1 (#7563) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-12-Readme.md | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/images/macos/macos-12-Readme.md b/images/macos/macos-12-Readme.md index dea64b331e58..f7fba3056c44 100644 --- a/images/macos/macos-12-Readme.md +++ b/images/macos/macos-12-Readme.md @@ -1,7 +1,7 @@ # macOS 12 - OS Version: macOS 12.6.5 (21G531) - Kernel Version: Darwin 21.6.0 -- Image Version: 20230430.1 +- Image Version: 20230505.1 ## Installed Software @@ -16,7 +16,7 @@ - GNU Fortran 12 (Homebrew GCC 12.2.0) - available by `gfortran-12` alias - Julia 1.8.5 - Kotlin 1.8.21-release-380 -- Go 1.20.3 +- Go 1.20.4 - Mono 6.12.0.188 - MSBuild 16.10.1.51301 (Mono 6.12.0.188) - Node.js 18.16.0 @@ -34,7 +34,7 @@ - Carthage 0.39.0 - CocoaPods 1.12.1 - Composer 2.5.5 -- Homebrew 4.0.15 +- Homebrew 4.0.16 - Miniconda 23.3.1 - NPM 9.5.1 - NuGet 6.3.1.1 @@ -42,7 +42,7 @@ - Pip3 23.1.2 (python 3.11) - Pipx 1.2.0 - RubyGems 3.4.12 -- Vcpkg 2023 (build from commit cb1301e99) +- Vcpkg 2023 (build from commit 6a3dd0874) - Yarn 1.22.19 #### Environment variables @@ -90,22 +90,22 @@ ### Tools - App Center CLI 2.13.7 -- AWS CLI 2.11.16 +- AWS CLI 2.11.18 - AWS SAM CLI 1.82.0 - AWS Session Manager CLI 1.2.463.0 - Azure CLI 2.48.1 - Azure CLI (azure-devops) 0.26.0 -- Bicep CLI 0.16.2 +- Bicep CLI 0.17.1 - Cabal 3.6.2.0 - Cmake 3.26.3 -- CodeQL Action Bundles 2.12.6 2.13.0 +- CodeQL Action Bundles 2.13.0 2.13.1 - Colima 0.5.4 - Fastlane 2.212.2 - GHC 9.6.1 - GHCup 0.1.19.2 - Jazzy 0.14.3 - Stack 2.9.3 -- SwiftFormat 0.51.7 +- SwiftFormat 0.51.9 - Swig 4.1.1 - Xcode Command Line Tools 14.2.0.0.1.1668646533 @@ -116,10 +116,10 @@ ### Browsers - Safari 16.4.1 (17615.1.26.101.10) - SafariDriver 16.4.1 (17615.1.26.101.10) -- Google Chrome 112.0.5615.137 -- ChromeDriver 112.0.5615.49 -- Microsoft Edge 112.0.1722.64 -- Microsoft Edge WebDriver 112.0.1722.64 +- Google Chrome 113.0.5672.63 +- ChromeDriver 113.0.5672.63 +- Microsoft Edge 112.0.1722.68 +- Microsoft Edge WebDriver 112.0.1722.68 - Mozilla Firefox 112.0.2 - geckodriver 0.33.0 - Selenium server 4.9.0 @@ -127,7 +127,7 @@ #### Environment variables | Name | Value | | --------------- | ---------------------------------------------- | -| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/112.0.5615.49 | +| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/113.0.5672.63 | | EDGEWEBDRIVER | /usr/local/share/edge_driver | | GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | @@ -165,8 +165,8 @@ #### Go - 1.18.10 -- 1.19.8 -- 1.20.3 +- 1.19.9 +- 1.20.4 ### Rust Tools - Cargo 1.69.0 From e62bcae84b772d1d5346bb884faa80d64aa4cd91 Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Thu, 11 May 2023 19:58:03 +0200 Subject: [PATCH 1912/3485] Add template for minimal image and update tutorial (#7461) --- docs/create-image-and-azure-resources.md | 263 ++++++++++----- helpers/GenerateResourcesAndImage.ps1 | 9 +- .../installers/{basic.sh => apt-common.sh} | 2 +- images/linux/scripts/installers/apt-vital.sh | 9 + .../linux/scripts/installers/docker-moby.sh | 37 ++- .../scripts/installers/post-deployment.sh | 10 +- images/linux/scripts/tests/Apt.Tests.ps1 | 2 +- images/linux/scripts/tests/Tools.Tests.ps1 | 10 +- images/linux/toolsets/toolset-2004.json | 20 +- images/linux/toolsets/toolset-2204.json | 20 +- images/linux/ubuntu2004.json | 14 +- images/linux/ubuntu2204.pkr.hcl | 8 +- images/linux/ubuntuminimal.pkr.hcl | 304 ++++++++++++++++++ 13 files changed, 577 insertions(+), 131 deletions(-) rename images/linux/scripts/installers/{basic.sh => apt-common.sh} (95%) create mode 100644 images/linux/scripts/installers/apt-vital.sh create mode 100644 images/linux/ubuntuminimal.pkr.hcl diff --git a/docs/create-image-and-azure-resources.md b/docs/create-image-and-azure-resources.md index f2004ca630b8..0e94f64dfe1e 100644 --- a/docs/create-image-and-azure-resources.md +++ b/docs/create-image-and-azure-resources.md @@ -1,104 +1,173 @@ # GitHub Actions Runner Images -The runner-images project uses [Packer](https://www.packer.io/) to generate disk images for the following platforms: Windows 2019/2022, Ubuntu 20.04/22.04. -Each image is configured through a JSON template that Packer understands and which specifies where to build the image (Azure in this case), and what scripts to run to install software and prepare the disk. -The Packer process initializes a connection to Azure subscription via Azure CLI, and automatically creates the temporary Azure resources required to build the source VM(temporary resource group, network interfaces, and VM from the "clean" image specified in the template). -If the VM deployment succeeds, the build agent connects to the VM and starts to execute installation steps from the JSON template. -If any step in the JSON template fails, image generation will be aborted and the temporary VM will be terminated. Packer will also attempt to cleanup all the temporary resources it created (unless otherwise told). -After successful image generation, a snapshot of the temporary VM will be converted to VHD image and then uploaded to the specified Azure Storage Account. - -## Prerequisites and Image-generation -### Build Agent requirements -- `OS` - Windows/Linux -- `packer 1.8.2 or higher` - Can be downloaded from https://www.packer.io/downloads -- `PowerShell 5.0 or higher` or `PSCore` for linux distributes. -- `Azure CLI ` - https://docs.microsoft.com/en-us/cli/azure/install-azure-cli -- `Azure Az Powershell module` - https://docs.microsoft.com/en-us/powershell/azure/install-az-ps -- `Git for Windows` - https://gitforwindows.org/ - -> To connect to a temporary VM packer uses WinRM or SSH connections on public IP interfaces. -If you use a build agent located in an Azure subscription, please make sure that HTTPS/SSH ports are allowed for incoming/outgoing connections. -In case of firewall restrictions, prohibiting connections from public addresses, private virtual network resources can be deployed and passed as arguments to the packer. This approach allows virtual machines to use private connections inside VLAN. - -### Service principal -Packer uses Service Principal to authorize in Azure infrastructure. To setup image-generation CI or use packer manually — SP with full read-write permissions for selected Azure subscription needed. -Detailed instruction can be found in [Azure documentation](https://docs.microsoft.com/en-us/azure/active-directory/develop/howto-create-service-principal-portal) - -### Prepare environment and image deployment -#### How to prepare Windows build agent -Local machine or [Azure VM](https://docs.microsoft.com/en-us/azure/virtual-machines/windows/quick-create-cli) can be used as a build agent. - -Download & install `packer` from https://www.packer.io/downloads, or install it via [Chocolatey](https://chocolatey.org/): -``` -choco install packer -``` -Download & install `git` from https://github.com/git-for-windows/git/releases, or install it via [Chocolatey](https://chocolatey.org/): -``` -choco install git -params '"/GitAndUnixToolsOnPath"' -``` +The runner-images project uses [Packer](https://www.packer.io/) to generate disk images for Windows 2019/2022 and Ubuntu 20.04/22.04. -Install the Azure Az PowerShell module - https://docs.microsoft.com/en-us/powershell/azure/install-az-ps. -``` -Install-Module -Name Az -Repository PSGallery -Force -``` +Each image is configured by a JSON or HCL2 Packer template that specifies where to build the image (Azure in this case) +and what steps to run to install software and prepare the disk. -Install Azure CLI - https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-windows?view=azure-cli-latest&tabs=azure-cli. -``` -Invoke-WebRequest -Uri https://aka.ms/installazurecliwindows -OutFile .\AzureCLI.msi; Start-Process msiexec.exe -Wait -ArgumentList '/I AzureCLI.msi /quiet'; rm .\AzureCLI.msi -``` +The Packer process initializes a connection to Azure subscription using Azure CLI and creates temporary resources +required for the build process: resource group, network interfaces and virtual machine from the "clean" image specified in the template. -Download Runner Images repository. -``` -Set-Location c:\ +If the VM deployment succeeds, Packer connects it using ssh or WinRM and begins executing installation steps from the template one-by-one. +If any step fails, image generation is aborted and the temporary VM is terminated. +Packer also attempts to cleanup all the temporary resources it created (unless otherwise configured). + +After successful completion of all installation steps Packer converts snapshot of the temporary VM to VHD image +and uploads it to the specified Azure Storage Account. + +## Build agent preparation + +Build agent is a machine where Packer process will be started. +You can use any physical or virtual machine running OS Windows or Linux. +Of course you may also use [Azure VM](https://docs.microsoft.com/en-us/azure/virtual-machines/windows/quick-create-cli). +In any case you will need these software installed: + +- Packer 1.8.2 or higher. + + Download and install it manually from [here](https://www.packer.io/downloads) or use [Chocolatey](https://chocolatey.org/): + + ```powershell + choco install packer + ``` + +- Git. + + For Linux - install the latest version from your distro's package repo. + + For Windows - download and install it from [here](https://gitforwindows.org/) of use [Chocolatey](https://chocolatey.org/): + + ```powershell + choco install git -params '"/GitAndUnixToolsOnPath"' + ``` + +- Powershell 5.0 or higher. + + In Windows you already have it. + + For Linux follow instructions [here](https://learn.microsoft.com/en-us/windows-server/administration/linux-package-repository-for-microsoft-software) + to add Microsoft's Linux Software Repository and then install package `powershell`. +- Azure CLI. + + Follow instructions [here](https://docs.microsoft.com/en-us/cli/azure/install-azure-cli). + Or if you use Windows you may run this command in Powershell instead: + + ```powershell + Invoke-WebRequest -Uri https://aka.ms/installazurecliwindows -OutFile .\AzureCLI.msi + Start-Process msiexec.exe -Wait -ArgumentList '/I AzureCLI.msi /quiet'; rm .\AzureCLI.msi + ``` + +- [Az Powershell module](https://docs.microsoft.com/en-us/powershell/azure/install-az-ps). + + Run this command in Powershell: + + ```powershell + Install-Module -Name Az -Repository PSGallery -Force + ``` + +## Automated image generation + +This repo bundles script that automates image generation process. +You only need a build agent configured as described above and active Azure subsctiption. +We suggest to start with UbuntuMinimal image because it includes only a minimal set of required software and builds in less then half an hour. + +All steps here are supposed to run in Powershell. + +First, clone runner-images repository and change directory: + +```powershell git clone https://github.com/actions/runner-images.git +Set-Location runner-images ``` -Import [GenerateResourcesAndImage](../helpers/GenerateResourcesAndImage.ps1) script from `/helpers` folder, and run `GenerateResourcesAndImage` function via Powershell. +Then import [GenerateResourcesAndImage](../helpers/GenerateResourcesAndImage.ps1) script from `helpers` subdirectory: +```powershell +Import-Module .\helpers\GenerateResourcesAndImage.ps1 ``` -Set-Location C:\runner-images -Import-Module .\helpers\GenerateResourcesAndImage.ps1 +Finally, run `GenerateResourcesAndImage` function setting mandatory arguments: image type and where to create resources: -GenerateResourcesAndImage -SubscriptionId {YourSubscriptionId} -ResourceGroupName "myTestResourceGroup" -ImageGenerationRepositoryRoot "$pwd" -ImageType Ubuntu2004 -AzureLocation "East US" -``` -Where: -- `SubscriptionId` - The Azure subscription Id where resources will be created. -- `ResourceGroupName` - The Azure resource group name where the Azure resources will be created. -- `ImageGenerationRepositoryRoot` - The root path of the image generation repository source. -- `ImageType` - The type of the image being generated. Valid options are: "Windows2019", "Windows2022", "Ubuntu2004", "Ubuntu2204". -- `AzureLocation` - The location of the resources being created in Azure. For example "East US". +- `SubscriptionId` - your Azure Subscription ID +- `ResourceGroupName` - name of the resource group that will be created within your subscription (e.g. "imagegen-test") +- `AzureLocation` - location where resources will be created (e.g. "East US") +- `ImageType` - what image to build (we suggest choosing "UbuntuMinimal" here, other valid options are "Windows2019", "Windows2022", "Ubuntu2004", "Ubuntu2204") -The function automatically creates all required Azure resources and kicks off packer image generation for the selected image type. +This function automatically creates all required Azure resources and kicks off packer image generation for the selected image type. -For optional authentication via service principal make sure to provide the following params — `AzureClientId`, `AzureClientSecret`, `AzureTenantId`, so the whole command will be: +When image is ready you may proceed to [deployment](#generated-machine-deployment) -``` -GenerateResourcesAndImage -SubscriptionId {YourSubscriptionId} -ResourceGroupName "myTestResourceGroup" -ImageGenerationRepositoryRoot "$pwd" -ImageType Ubuntu2004 -AzureLocation "East US" -AzureClientId {AADApplicationID} -AzureClientSecret {AADApplicationSecret} -AzureTenantId {AADTenantID} -``` +## Image generation customization -As extra options, you can add more params for permit to add Azure Tags on resources and enable https for Storage Account. It could be helpful on some tenants with hardenning policy. Params are — `EnableHttpsTrafficOnly` (Boolean) and `tags` (HashTable), so the whole command will be: +Function `GenerateResourcesAndImage` accepts a bunch of arguments that may help you generating image in your specific environment. -``` -GenerateResourcesAndImage -SubscriptionId {YourSubscriptionId} -ResourceGroupName "myTestResourceGroup" -ImageGenerationRepositoryRoot "$pwd" -ImageType Ubuntu2004 -AzureLocation "East US" -EnableHttpsTrafficOnly $true -tags @{dept="devops";env="prod"} -``` +For example, you may want that all the resources involved in image generation process are tagged. +In this case pass a HashTable of tags as a value for `Tags` parameter. -*Please, check synopsis of `GenerateResourcesAndImage` for details about non-mandatory parameters.* +If you don't want function to authenticate interactively, you should create Service Principal and invoke the function with parameters `AzureClientId`, `AzureClientSecret` and `AzureTenantId`. +You can find more details [in corresponding section below](#azure-subscription-authentication). -#### Generated VM Deployment -After the successful image generation, Virtual Machine can be created from the generated VHD using [CreateAzureVMFromPackerTemplate](../helpers/CreateAzureVMFromPackerTemplate.ps1) script. +Use `get-help GenerateResourcesAndImage -Detailed` for the complete list of parameters available. + +### Network security + +To connect to a temporary virtual machine Packer uses WinRM or SSH. + +If your build agent is located outside of the Azure subscription where temporary VM is created, the public network interface and public IP address is used. +Make sure that firewalls are configured properly and WinRM (tcp port 5986) and ssh (tcp port 22) connections are allowed both outgoing for build agent and incoming for temporary VM. +Also if you don't want temporary VM to be accessible from everywhere, set `RestrictToAgentIpAddress` parameter value to `$true` +to setup firewall rules allowing access only from your build agent public IP address. + +If your build agent and temporary VM are in the same subscription you can configure Packer to connect using private virtual network. +To achieve that set proper values for environment variables `VNET_RESOURCE_GROUP`, `VNET_NAME` and `VNET_SUBNET`. + +### Azure subscription authentication + +Packer uses Service Principal to authenticate in Azure infrastructure. +For more information about Service Principals refer to +[Azure documentation](https://docs.microsoft.com/en-us/azure/active-directory/develop/howto-create-service-principal-portal). + +Function `GenerateResourcesAndImage` is able to create Service Principle to be used by Packer. +It uses Connect-AzAccount cmdlet that invokes interactive authentication process by default. +If you don't want to use interactive authentication you should create Service Principal with full read-write permissions for selected Azure subscription on your own +and provide proper values for parameters `AzureClientId`, `AzureClientSecret` and `AzureTenantId`. + +Here is an example of how to create Service Principle using Az Powershell module: + +```powershell +$credentials = [Microsoft.Azure.PowerShell.Cmdlets.Resources.MSGraph.Models.ApiV10.MicrosoftGraphPasswordCredential]@{ + StartDateTime = Get-Date + EndDateTime = (Get-Date).AddDays(7) +} + +$sp = New-AzADServicePrincipal -DisplayName "imagegen-app" +$appCred = New-AzADAppCredential -ApplicationId $sp.AppId -PasswordCredentials $credentials +Start-Sleep -Seconds 30 +New-AzRoleAssignment -RoleDefinitionName "Contributor" -PrincipalId $sp.Id +Start-Sleep -Seconds 30 + +@{ + ClientId = $sp.AppId + ClientSecret = $appCred.SecretText + TenantId = (Get-AzSubscription -SubscriptionId $SubscriptionId).TenantId +} ``` -Set-Location C:\runner-images +## Generated machine deployment + +After the successful image generation, Virtual Machine can be created from the generated VHD using [CreateAzureVMFromPackerTemplate](../helpers/CreateAzureVMFromPackerTemplate.ps1) script. + +```powershell Import-Module .\helpers\CreateAzureVMFromPackerTemplate.ps1 CreateAzureVMFromPackerTemplate -SubscriptionId {YourSubscriptionId} -ResourceGroupName {ResourceGroupName} -TemplateFile "C:\BuildVmImages\temporaryTemplate.json" -VirtualMachineName "testvm1" -AdminUsername "shady1" -AdminPassword "SomeSecurePassword1" -AzureLocation "eastus" ``` + Where: + - `SubscriptionId` - The Azure subscription Id where resources will be created. - `ResourceGroupName` - The Azure resource group name where the Azure virtual machine will be created. -- `TemplateFilePath` - The path to the json ARM-template generated by packer during image generation locally.* +- `TemplateFilePath` - The path to the json ARM-template generated by packer during image generation locally.* - `VirtualMachineName` - The name of the virtual machine to be generated. - `AdminUserName` - The administrator username for the virtual machine to be created. - `AdminPassword` - The administrator password for the virtual machine to be created. @@ -108,20 +177,27 @@ Where: The function creates an Azure VM from a template and generates network resources in Azure to make the VM accessible. -## Additional -### User variables -The Packer template includes `variables` section containing user variables used in image generation. Each variable is defined as a key/value strings. User variables can be passed to packer via predefined environment variables, or as direct arguments, in case if packer started manually. +## Manual image generation + +If you want more control over image generation process you may run Packer directly. This section describes variables defined in Packer template. Some of them may be set using environment variabes. + +### Required variables + +| Template var | Env var | Description +| ------------ | ------- | ----------- +| `subscription_id` | `ARM_SUBSCRIPTION_ID` | Subscription under which the build will be performed. +| `client_id` | `ARM_CLIENT_ID` | The Active Directory service principal associated with your builder. +| `client_secret` | `ARM_CLIENT_SECRET` | The password or secret for your service principal; may be omitted if `client_cert_path` is set. +| `client_cert_path` | `ARM_CLIENT_CERT_PATH` | The location of a PEM file containing a certificate and private key for service principal; may be omitted if `client_secret` is set. +| `location` | `ARM_RESOURCE_LOCATION` | Azure datacenter in which your VM will build. +| `resource_group` | `ARM_RESOURCE_GROUP` | Resource group under which the final artifact will be stored. +| `storage_account` | `ARM_STORAGE_ACCOUNT` | Storage account under which the final artifact will be stored. + +### Optional variables - `build_resource_group_name` - Specify an existing resource group to run the build in it. By default, a temporary resource group will be created and destroyed as part of the build. If you do not have permission to do so, use build_resource_group_name to specify an existing resource group to run the build in it. -- `client_id` - The application ID of the AAD Service Principal. Requires `client_secret`. - `object_id` - The object ID for the AAD SP. Will be derived from the oAuth token if empty. -- `client_secret` - The password or secret for your service principal. -- `client_cert_path` - The location of a PEM file containing a certificate and private key for service principal. -- `subscription_id` - The subscription to use. - `tenant_id` - The Active Directory tenant identifier with which your `client_id` and `subscription_id` are associated. If not specified, `tenant_id` will be looked up using `subscription_id`. -- `resource_group` - Resource group under which the final artifact will be stored. -- `storage_account` - Storage account under which the final artifact will be stored. -- `location` - Azure datacenter in which your VM will be built. - `temp_resource_group_name` - Name assigned to the temporary resource group created during the build. If this value is not set, a random value will be assigned. This resource group is deleted at the end of the build. - `private_virtual_network_with_public_ip` - This value allows you to set a `virtual_network_name` and obtain a public IP. If this value is not set and `virtual_network_name` is defined Packer is only allowed to be executed from a host on the same subnet / virtual network. - `virtual_network_name` - Use a pre-existing virtual network for the VM. This option enables private communication with the VM, no public IP address is used or provisioned (unless you set `private_virtual_network_with_public_ip`). @@ -130,6 +206,7 @@ The Packer template includes `variables` section containing user variables used - `capture_name_prefix` - VHD prefix. The final artifacts will be named PREFIX-osDisk.UUID and PREFIX-vmTemplate.UUID. ### Builder variables + The `builders` section contains variables for the `azure-arm` builder used in the project. Most of the builder variables are inherited from the `user variables` section, however, the variables can be overwritten to adjust image-generation performance. - `vm_size` - Size of the VM used for building. This can be changed when you deploy a VM from your VHD. @@ -139,9 +216,11 @@ The `builders` section contains variables for the `azure-arm` builder used in th **Detailed Azure builders documentation can be found in [packer documentation](https://www.packer.io/docs/builders/azure).** ### Toolset + Configuration for some installed software is located in `toolset.json` files. These files define the list of Ruby, Python, Go versions, the list of PowerShell modules and VS components that will be installed to image. They can be changed if these tools are not required to reduce image generation time or image size. Generated tool versions and details can be found in related projects: + - [Python](https://github.com/actions/python-versions/) - [Go](https://github.com/actions/go-versions) - [Node](https://github.com/actions/node-versions) @@ -151,24 +230,30 @@ Generated tool versions and details can be found in related projects: > :warning: These scripts are intended to run on a VM deployed in Azure The user, created during the image generation, does not exist in the result VHD hence some configuration files related to the user's home directory need to be changed as well as the file permissions for some directories. Scripts for that are located in the `post-generation` folder in the repository: -- Windows: https://github.com/actions/runner-images/tree/main/images/win/post-generation -- Linux: https://github.com/actions/runner-images/tree/main/images/linux/post-generation + +- Windows: <https://github.com/actions/runner-images/tree/main/images/win/post-generation> +- Linux: <https://github.com/actions/runner-images/tree/main/images/linux/post-generation> **Note:** The default user for Linux should have `sudo privileges`. The scripts are copied to the VHD during the image generation process to the following paths: + - Windows: `C:\post-generation` -- Linux: `/opt/post-generation` +- Linux: `/opt/post-generation` #### Running scripts -##### Ubuntu +- Ubuntu - sudo su -c "find /opt/post-generation -mindepth 1 -maxdepth 1 -type f -name '*.sh' -exec bash {} \;" + ```bash + sudo su -c "find /opt/post-generation -mindepth 1 -maxdepth 1 -type f -name '*.sh' -exec bash {} \;" + ``` -##### Windows +- Windows - Get-ChildItem C:\post-generation -Filter *.ps1 | ForEach-Object { & $_.FullName } + ```powershell + Get-ChildItem C:\post-generation -Filter *.ps1 | ForEach-Object { & $_.FullName } + ``` #### Script details diff --git a/helpers/GenerateResourcesAndImage.ps1 b/helpers/GenerateResourcesAndImage.ps1 index f4f767eb2def..df6ca77eb57f 100644 --- a/helpers/GenerateResourcesAndImage.ps1 +++ b/helpers/GenerateResourcesAndImage.ps1 @@ -5,6 +5,7 @@ enum ImageType { Windows2022 = 2 Ubuntu2004 = 3 Ubuntu2204 = 4 + UbuntuMinimal = 5 } Function Get-PackerTemplatePath { @@ -28,6 +29,9 @@ Function Get-PackerTemplatePath { ([ImageType]::Ubuntu2204) { $relativeTemplatePath = Join-Path "linux" "ubuntu2204.pkr.hcl" } + ([ImageType]::UbuntuMinimal) { + $relativeTemplatePath = Join-Path "linux" "ubuntuminimal.pkr.hcl" + } default { throw "Unknown type of image" } } @@ -63,7 +67,7 @@ Function GenerateResourcesAndImage { .PARAMETER ImageGenerationRepositoryRoot The root path of the image generation repository source. .PARAMETER ImageType - The type of the image being generated. Valid options are: {"Windows2019", "Windows2022", "Ubuntu2004", "Ubuntu2204"}. + The type of the image being generated. Valid options are: {"Windows2019", "Windows2022", "Ubuntu2004", "Ubuntu2204", "UbuntuMinimal"}. .PARAMETER AzureLocation The location of the resources being created in Azure. For example "East US". .PARAMETER Force @@ -77,9 +81,10 @@ Function GenerateResourcesAndImage { .PARAMETER RestrictToAgentIpAddress If set, access to the VM used by packer to generate the image is restricted to the public IP address this script is run from. This parameter cannot be used in combination with the virtual_network_name packer parameter. - .PARAMETER AllowBlobPublicAccess The Azure storage account will be created with this option. + .PARAMETER EnableHttpsTrafficOnly + The Azure storage account will be created with this option. .PARAMETER OnError Specify how packer handles an error during image creation. .EXAMPLE diff --git a/images/linux/scripts/installers/basic.sh b/images/linux/scripts/installers/apt-common.sh similarity index 95% rename from images/linux/scripts/installers/basic.sh rename to images/linux/scripts/installers/apt-common.sh index 270cc75c837a..6fa1063b1145 100644 --- a/images/linux/scripts/installers/basic.sh +++ b/images/linux/scripts/installers/apt-common.sh @@ -1,6 +1,6 @@ #!/bin/bash -e ################################################################################ -## File: basic.sh +## File: apt-common.sh ## Desc: Installs basic command line utilities and dev packages ################################################################################ source $HELPER_SCRIPTS/install.sh diff --git a/images/linux/scripts/installers/apt-vital.sh b/images/linux/scripts/installers/apt-vital.sh new file mode 100644 index 000000000000..f2aca618e00d --- /dev/null +++ b/images/linux/scripts/installers/apt-vital.sh @@ -0,0 +1,9 @@ +#!/bin/bash -e +################################################################################ +## File: apt-vital.sh +## Desc: Installs vital command line utilities +################################################################################ +source $HELPER_SCRIPTS/install.sh + +vital_packages=$(get_toolset_value .apt.vital_packages[]) +apt-get install -y --no-install-recommends $vital_packages diff --git a/images/linux/scripts/installers/docker-moby.sh b/images/linux/scripts/installers/docker-moby.sh index ea16f65a0aa1..c562ea99964b 100644 --- a/images/linux/scripts/installers/docker-moby.sh +++ b/images/linux/scripts/installers/docker-moby.sh @@ -29,23 +29,27 @@ systemctl is-enabled --quiet docker.service || systemctl enable docker.service sleep 10 docker info -# If credentials are provided, attempt to log into Docker Hub -# with a paid account to avoid Docker Hub's rate limit. -if [ "${DOCKERHUB_LOGIN}" ] && [ "${DOCKERHUB_PASSWORD}" ]; then - docker login --username "${DOCKERHUB_LOGIN}" --password "${DOCKERHUB_PASSWORD}" +if [ "${DOCKERHUB_PULL_IMAGES:-yes}" -eq "yes" ]; then + # If credentials are provided, attempt to log into Docker Hub + # with a paid account to avoid Docker Hub's rate limit. + if [ "${DOCKERHUB_LOGIN}" ] && [ "${DOCKERHUB_PASSWORD}" ]; then + docker login --username "${DOCKERHUB_LOGIN}" --password "${DOCKERHUB_PASSWORD}" + fi + + # Pull images + images=$(get_toolset_value '.docker.images[]') + for image in $images; do + docker pull "$image" + done + + # Always attempt to logout so we do not leave our credentials on the built + # image. Logout _should_ return a zero exit code even if no credentials were + # stored from earlier. + docker logout +else + echo "Skipping docker images pulling" fi -# Pull images -images=$(get_toolset_value '.docker.images[]') -for image in $images; do - docker pull "$image" -done - -# Always attempt to logout so we do not leave our credentials on the built -# image. Logout _should_ return a zero exit code even if no credentials were -# stored from earlier. -docker logout - # Install amazon-ecr-credential-helper aws_latest_release_url="https://api.github.com/repos/awslabs/amazon-ecr-credential-helper/releases/latest" aws_helper_url=$(curl "${authString[@]}" -sL $aws_latest_release_url | jq -r '.body' | awk -F'[()]' '/linux-amd64/ {print $2}') @@ -53,3 +57,6 @@ download_with_retries "$aws_helper_url" "/usr/bin" docker-credential-ecr-login chmod +x /usr/bin/docker-credential-ecr-login invoke_tests "Tools" "Docker" +if [ "${DOCKERHUB_PULL_IMAGES:-yes}" -eq "yes" ]; then + invoke_tests "Tools" "Docker images" +fi diff --git a/images/linux/scripts/installers/post-deployment.sh b/images/linux/scripts/installers/post-deployment.sh index a7418c406425..3af0bdcfb73e 100644 --- a/images/linux/scripts/installers/post-deployment.sh +++ b/images/linux/scripts/installers/post-deployment.sh @@ -24,5 +24,11 @@ echo "PATH=$ENVPATH" | sudo tee -a /etc/environment echo "Updated /etc/environment: $(cat /etc/environment)" # Clean yarn and npm cache -yarn cache clean -npm cache clean --force +if yarn --version > /dev/null +then + yarn cache clean +fi +if npm --version +then + npm cache clean --force +fi diff --git a/images/linux/scripts/tests/Apt.Tests.ps1 b/images/linux/scripts/tests/Apt.Tests.ps1 index 7c3383ba4b20..57b223bcc7f3 100644 --- a/images/linux/scripts/tests/Apt.Tests.ps1 +++ b/images/linux/scripts/tests/Apt.Tests.ps1 @@ -1,6 +1,6 @@ Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" -$cmd = (Get-ToolsetContent).apt.cmd_packages +$cmd = (Get-ToolsetContent).apt.cmd_packages + (Get-ToolsetContent).apt.vital_packages Describe "Apt" { diff --git a/images/linux/scripts/tests/Tools.Tests.ps1 b/images/linux/scripts/tests/Tools.Tests.ps1 index 24bd2ea9fe84..4ba13faa5f5f 100644 --- a/images/linux/scripts/tests/Tools.Tests.ps1 +++ b/images/linux/scripts/tests/Tools.Tests.ps1 @@ -79,13 +79,13 @@ Describe "Docker" { It "docker-credential-ecr-login" { "docker-credential-ecr-login -v" | Should -ReturnZeroExitCode } +} - Context "docker images" { - $testCases = (Get-ToolsetContent).docker.images | ForEach-Object { @{ ImageName = $_ } } +Describe "Docker images" { + $testCases = (Get-ToolsetContent).docker.images | ForEach-Object { @{ ImageName = $_ } } - It "<ImageName>" -TestCases $testCases { - sudo docker images "$ImageName" --format "{{.Repository}}" | Should -Not -BeNullOrEmpty - } + It "<ImageName>" -TestCases $testCases { + sudo docker images "$ImageName" --format "{{.Repository}}" | Should -Not -BeNullOrEmpty } } diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index 582d627f810e..63a438a162cc 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -133,13 +133,24 @@ } ], "apt": { + "vital_packages": [ + "bzip2", + "curl", + "g++", + "gcc", + "make", + "jq", + "tar", + "unzip", + "wget" + ], "common_packages": [ "autoconf", "automake", - "build-essential", "dbus", "dnsutils", "dpkg", + "dpkg-dev", "fakeroot", "fonts-noto-color-emoji", "gnupg2", @@ -149,6 +160,7 @@ "lib32z1", "libc++abi-dev", "libc++-dev", + "libc6-dev", "libcurl4", "libgbm-dev", "libgconf-2-4", @@ -171,7 +183,6 @@ "pkg-config", "python-is-python3", "rpm", - "tar", "texinfo", "tk", "tzdata", @@ -187,14 +198,11 @@ "binutils", "bison", "brotli", - "bzip2", "coreutils", - "curl", "file", "flex", "ftp", "haveged", - "jq", "m4", "mediainfo", "netcat", @@ -215,8 +223,6 @@ "swig", "telnet", "time", - "unzip", - "wget", "zip" ] }, diff --git a/images/linux/toolsets/toolset-2204.json b/images/linux/toolsets/toolset-2204.json index a7f668110e3f..8d2e10dec589 100644 --- a/images/linux/toolsets/toolset-2204.json +++ b/images/linux/toolsets/toolset-2204.json @@ -116,13 +116,24 @@ } ], "apt": { + "vital_packages": [ + "bzip2", + "curl", + "g++", + "gcc", + "make", + "jq", + "tar", + "unzip", + "wget" + ], "common_packages": [ "autoconf", "automake", - "build-essential", "dbus", "dnsutils", "dpkg", + "dpkg-dev", "fakeroot", "fonts-noto-color-emoji", "gnupg2", @@ -132,6 +143,7 @@ "lib32z1", "libc++abi-dev", "libc++-dev", + "libc6-dev", "libcurl4", "libgbm-dev", "libgconf-2-4", @@ -155,7 +167,6 @@ "pkg-config", "python-is-python3", "rpm", - "tar", "texinfo", "tk", "tzdata", @@ -171,14 +182,11 @@ "binutils", "bison", "brotli", - "bzip2", "coreutils", - "curl", "file", "flex", "ftp", "haveged", - "jq", "lz4", "m4", "mediainfo", @@ -200,8 +208,6 @@ "swig", "telnet", "time", - "unzip", - "wget", "zip" ] }, diff --git a/images/linux/ubuntu2004.json b/images/linux/ubuntu2004.json index 97f539b3303d..b1439dbce226 100644 --- a/images/linux/ubuntu2004.json +++ b/images/linux/ubuntu2004.json @@ -153,6 +153,18 @@ ], "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" }, + { + "type": "shell", + "scripts": [ + "{{template_dir}}/scripts/installers/apt-vital.sh" + ], + "environment_vars": [ + "HELPER_SCRIPTS={{user `helper_script_folder`}}", + "INSTALLER_SCRIPT_FOLDER={{user `installer_script_folder`}}", + "DEBIAN_FRONTEND=noninteractive" + ], + "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" + }, { "type": "shell", "scripts": [ @@ -193,10 +205,10 @@ { "type": "shell", "scripts": [ + "{{template_dir}}/scripts/installers/apt-common.sh", "{{template_dir}}/scripts/installers/azcopy.sh", "{{template_dir}}/scripts/installers/azure-cli.sh", "{{template_dir}}/scripts/installers/azure-devops-cli.sh", - "{{template_dir}}/scripts/installers/basic.sh", "{{template_dir}}/scripts/installers/bicep.sh", "{{template_dir}}/scripts/installers/aliyun-cli.sh", "{{template_dir}}/scripts/installers/apache.sh", diff --git a/images/linux/ubuntu2204.pkr.hcl b/images/linux/ubuntu2204.pkr.hcl index 7a718eb60646..99668dc6059b 100644 --- a/images/linux/ubuntu2204.pkr.hcl +++ b/images/linux/ubuntu2204.pkr.hcl @@ -256,6 +256,12 @@ build { scripts = ["${path.root}/scripts/installers/configure-environment.sh"] } + provisioner "shell" { + environment_vars = ["DEBIAN_FRONTEND=noninteractive", "HELPER_SCRIPTS=${local.helper_script_folder}", "INSTALLER_SCRIPT_FOLDER=${local.installer_script_folder}"] + execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" + scripts = ["${path.root}/scripts/installers/apt-vital.sh"] + } + provisioner "shell" { environment_vars = ["HELPER_SCRIPTS=${var.helper_script_folder}"] execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" @@ -278,10 +284,10 @@ build { environment_vars = ["HELPER_SCRIPTS=${var.helper_script_folder}", "INSTALLER_SCRIPT_FOLDER=${var.installer_script_folder}", "DEBIAN_FRONTEND=noninteractive"] execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" scripts = [ + "${path.root}/scripts/installers/apt-common.sh", "${path.root}/scripts/installers/azcopy.sh", "${path.root}/scripts/installers/azure-cli.sh", "${path.root}/scripts/installers/azure-devops-cli.sh", - "${path.root}/scripts/installers/basic.sh", "${path.root}/scripts/installers/bicep.sh", "${path.root}/scripts/installers/aliyun-cli.sh", "${path.root}/scripts/installers/apache.sh", diff --git a/images/linux/ubuntuminimal.pkr.hcl b/images/linux/ubuntuminimal.pkr.hcl new file mode 100644 index 000000000000..f81e1a2ea888 --- /dev/null +++ b/images/linux/ubuntuminimal.pkr.hcl @@ -0,0 +1,304 @@ +locals { + image_os = "ubuntu22" + + toolset_file_name = "toolset-2204.json" + + image_folder = "/imagegeneration" + helper_script_folder = "/imagegeneration/helpers" + installer_script_folder = "/imagegeneration/installers" + imagedata_file = "/imagegeneration/imagedata.json" +} + +variable "allowed_inbound_ip_addresses" { + type = list(string) + default = [] +} + +variable "azure_tags" { + type = map(string) + default = {} +} + +variable "build_resource_group_name" { + type = string + default = "${env("BUILD_RESOURCE_GROUP_NAME")}" +} + +variable "capture_name_prefix" { + type = string + default = "packer" +} + +variable "client_id" { + type = string + default = "${env("ARM_CLIENT_ID")}" +} + +variable "client_secret" { + type = string + default = "${env("ARM_CLIENT_SECRET")}" + sensitive = true +} + +variable "client_cert_path" { + type = string + default = "${env("ARM_CLIENT_CERT_PATH")}" +} + +variable "commit_url" { + type = string + default = "" +} + +variable "image_version" { + type = string + default = "dev" +} + +variable "install_password" { + type = string + default = "" +} + +variable "location" { + type = string + default = "${env("ARM_RESOURCE_LOCATION")}" +} + +variable "private_virtual_network_with_public_ip" { + type = bool + default = false +} + +variable "resource_group" { + type = string + default = "${env("ARM_RESOURCE_GROUP")}" +} + +variable "run_validation_diskspace" { + type = bool + default = false +} + +variable "storage_account" { + type = string + default = "${env("ARM_STORAGE_ACCOUNT")}" +} + +variable "subscription_id" { + type = string + default = "${env("ARM_SUBSCRIPTION_ID")}" +} + +variable "temp_resource_group_name" { + type = string + default = "${env("TEMP_RESOURCE_GROUP_NAME")}" +} + +variable "tenant_id" { + type = string + default = "${env("ARM_TENANT_ID")}" +} + +variable "virtual_network_name" { + type = string + default = "${env("VNET_NAME")}" +} + +variable "virtual_network_resource_group_name" { + type = string + default = "${env("VNET_RESOURCE_GROUP")}" +} + +variable "virtual_network_subnet_name" { + type = string + default = "${env("VNET_SUBNET")}" +} + +variable "vm_size" { + type = string + default = "Standard_D4s_v4" +} + +source "azure-arm" "build_vhd" { + location = "${var.location}" + + // Auth + tenant_id = "${var.tenant_id}" + subscription_id = "${var.subscription_id}" + client_id = "${var.client_id}" + client_secret = "${var.client_secret}" + client_cert_path = "${var.client_cert_path}" + + // Base image + image_offer = "0001-com-ubuntu-server-jammy" + image_publisher = "canonical" + image_sku = "22_04-lts" + + // Target location + storage_account = "${var.storage_account}" + resource_group_name = "${var.resource_group}" + capture_container_name = "images" + capture_name_prefix = "${var.capture_name_prefix}" + + // Resource group for VM + build_resource_group_name = "${var.build_resource_group_name}" + temp_resource_group_name = "${var.temp_resource_group_name}" + + // Networking for VM + private_virtual_network_with_public_ip = "${var.private_virtual_network_with_public_ip}" + virtual_network_resource_group_name = "${var.virtual_network_resource_group_name}" + virtual_network_name = "${var.virtual_network_name}" + virtual_network_subnet_name = "${var.virtual_network_subnet_name}" + allowed_inbound_ip_addresses = "${var.allowed_inbound_ip_addresses}" + + // VM Configuration + vm_size = "${var.vm_size}" + os_disk_size_gb = "86" + os_type = "Linux" + + dynamic "azure_tag" { + for_each = var.azure_tags + content { + name = azure_tag.key + value = azure_tag.value + } + } +} + +build { + sources = ["source.azure-arm.build_vhd"] + + // Create folder to store temporary data + provisioner "shell" { + execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" + inline = ["mkdir ${local.image_folder}", + "chmod 777 ${local.image_folder}"] + } + + // Add apt wrapper to implement retries + provisioner "shell" { + execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" + script = "${path.root}/scripts/base/apt-mock.sh" + } + + // Install MS package repos + provisioner "shell" { + environment_vars = ["DEBIAN_FRONTEND=noninteractive"] + execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" + scripts = ["${path.root}/scripts/base/repos.sh"] + } + + // Configure apt + provisioner "shell" { + environment_vars = ["DEBIAN_FRONTEND=noninteractive"] + execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" + script = "${path.root}/scripts/base/apt.sh" + } + + // Configure limits + provisioner "shell" { + execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" + script = "${path.root}/scripts/base/limits.sh" + } + + provisioner "file" { + destination = "${local.helper_script_folder}" + source = "${path.root}/scripts/helpers" + } + + provisioner "file" { + destination = "${local.installer_script_folder}" + source = "${path.root}/scripts/installers" + } + + provisioner "file" { + destination = "${local.image_folder}" + sources = [ + "${path.root}/post-generation", + "${path.root}/scripts/tests" + ] + } + + provisioner "file" { + destination = "${local.installer_script_folder}/toolset.json" + source = "${path.root}/toolsets/${local.toolset_file_name}" + } + + // Generate image data file + provisioner "shell" { + environment_vars = ["IMAGE_VERSION=${var.image_version}", "IMAGEDATA_FILE=${local.imagedata_file}"] + execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" + scripts = ["${path.root}/scripts/installers/preimagedata.sh"] + } + + // Create /etc/environment, configure waagent etc. + provisioner "shell" { + environment_vars = ["IMAGE_VERSION=${var.image_version}", "IMAGE_OS=${local.image_os}", "HELPER_SCRIPTS=${local.helper_script_folder}"] + execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" + scripts = ["${path.root}/scripts/installers/configure-environment.sh"] + } + + provisioner "shell" { + environment_vars = ["DEBIAN_FRONTEND=noninteractive", "HELPER_SCRIPTS=${local.helper_script_folder}", "INSTALLER_SCRIPT_FOLDER=${local.installer_script_folder}"] + execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" + scripts = ["${path.root}/scripts/installers/apt-vital.sh"] + } + + provisioner "shell" { + environment_vars = ["DEBIAN_FRONTEND=noninteractive", "HELPER_SCRIPTS=${local.helper_script_folder}"] + execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" + scripts = ["${path.root}/scripts/installers/powershellcore.sh"] + } + + provisioner "shell" { + environment_vars = ["HELPER_SCRIPTS=${local.helper_script_folder}", "INSTALLER_SCRIPT_FOLDER=${local.installer_script_folder}"] + execute_command = "sudo sh -c '{{ .Vars }} pwsh -f {{ .Path }}'" + scripts = ["${path.root}/scripts/installers/Install-PowerShellModules.ps1"] + } + + provisioner "shell" { + environment_vars = ["DEBIAN_FRONTEND=noninteractive", "HELPER_SCRIPTS=${local.helper_script_folder}", "INSTALLER_SCRIPT_FOLDER=${local.installer_script_folder}"] + execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" + scripts = [ + "${path.root}/scripts/installers/git.sh", + "${path.root}/scripts/installers/github-cli.sh", + "${path.root}/scripts/installers/zstd.sh" + ] + } + + provisioner "shell" { + execute_command = "/bin/sh -c '{{ .Vars }} {{ .Path }}'" + expect_disconnect = true + scripts = ["${path.root}/scripts/base/reboot.sh"] + } + + provisioner "shell" { + execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" + pause_before = "1m0s" + scripts = ["${path.root}/scripts/installers/cleanup.sh"] + start_retry_timeout = "10m" + } + + provisioner "shell" { + execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" + script = "${path.root}/scripts/base/apt-mock-remove.sh" + } + + provisioner "shell" { + environment_vars = ["HELPER_SCRIPT_FOLDER=${local.helper_script_folder}", "INSTALLER_SCRIPT_FOLDER=${local.installer_script_folder}", "IMAGE_FOLDER=${local.image_folder}"] + execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" + scripts = ["${path.root}/scripts/installers/post-deployment.sh"] + } + + provisioner "shell" { + environment_vars = ["RUN_VALIDATION=${var.run_validation_diskspace}"] + scripts = ["${path.root}/scripts/installers/validate-disk-space.sh"] + } + + provisioner "shell" { + execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" + inline = ["sleep 30", "/usr/sbin/waagent -force -deprovision+user && export HISTSIZE=0 && sync"] + } + +} From 91f9205adbc95e507a166e681c19facd509fe5cf Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 11 May 2023 20:38:07 +0000 Subject: [PATCH 1913/3485] Updating readme file for macos-13 version 20230509.4 (#7569) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-13-Readme.md | 130 ++++++++++++++++++-------------- 1 file changed, 74 insertions(+), 56 deletions(-) diff --git a/images/macos/macos-13-Readme.md b/images/macos/macos-13-Readme.md index c856694b0554..89715a55abf3 100644 --- a/images/macos/macos-13-Readme.md +++ b/images/macos/macos-13-Readme.md @@ -1,11 +1,11 @@ - # macOS 13 -- OS Version: macOS 13.3.1 (22E261) +- OS Version: macOS 13.3.1 (a) (22E772610a) - Kernel Version: Darwin 22.4.0 -- Image Version: 20230419.1 +- Image Version: 20230509.4 + ## Installed Software - ### Language and Runtime +### Language and Runtime - .NET Core SDK: 7.0.102, 7.0.203 - Bash 3.2.57(1)-release - Clang/LLVM 14.0.0 @@ -14,12 +14,11 @@ - GCC 12 (Homebrew GCC 12.2.0) - available by `gcc-12` alias - GNU Fortran 11 (Homebrew GCC 11.3.0) - available by `gfortran-11` alias - GNU Fortran 12 (Homebrew GCC 12.2.0) - available by `gfortran-12` alias -- Go command - Julia 1.8.5 -- Kotlin 1.8.20-release-327 -- Perl 5.36.0 +- Kotlin 1.8.21-release-380 +- Perl 5.36.1 - PHP 8.2.5 -- R 4.2.3 +- R 4.3.0 - Ruby 3.0.6p216 ### Package Management @@ -27,36 +26,29 @@ - Carthage 0.39.0 - CocoaPods 1.12.1 - Composer 2.5.5 -- Homebrew 4.0.14 +- Homebrew 4.0.17 - NPM 9.5.1 -- NuGet command - RubyGems 3.4.12 -- Vcpkg 2023 (build from commit 48483c4fc) +- Vcpkg 2023 (build from commit ff311f676) - Yarn 1.22.19 -#### Environment variables -| Name | Value | -| ----------------------- | ---------------------- | -| CONDA | | -| VCPKG_INSTALLATION_ROOT | /usr/local/share/vcpkg | - ### Project Management - - Apache Ant 1.10.13 +- Apache Ant 1.10.13 ### Utilities - 7-Zip 17.05 - aria2 1.36.0 -- azcopy 10.18.0 -- bazel 6.1.2 +- azcopy 10.18.1 +- bazel 6.2.0 - bazelisk 1.16.0 - bsdtar 3.5.3 - available by 'tar' alias - Curl 8.0.1 -- Git 2.40.0 +- Git 2.40.1 - Git LFS 3.3.0 -- GitHub CLI 2.27.0 +- GitHub CLI 2.28.0 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.3 -- gpg (GnuPG) 2.4.0 +- gpg (GnuPG) 2.4.1 - jq 1.6 - OpenSSL LibreSSL 3.3.6 - Packer 1.8.6 @@ -65,69 +57,95 @@ - zstd 1.5.5 ### Tools -- AWS CLI 2.11.13 -- AWS SAM CLI 1.80.0 +- AWS CLI 2.11.18 +- AWS SAM CLI 1.82.0 - AWS Session Manager CLI 1.2.463.0 -- Azure CLI 2.47.0 +- Azure CLI 2.48.1 - Azure CLI (azure-devops) 0.26.0 -- Bicep CLI 0.16.2 +- Bicep CLI 0.17.1 - Cabal 3.6.2.0 - Cmake 3.26.3 -- CodeQL Action Bundles 2.12.5 2.12.6 +- CodeQL Action Bundles 2.13.0 2.13.1 - Fastlane 2.212.2 - GHC 9.6.1 - GHCup 0.1.19.2 - Stack 2.9.3 -- SwiftFormat 0.51.7 +- SwiftFormat 0.51.9 - Xcode Command Line Tools 14.3.0.0.1.1679647830 ### Linters - SwiftLint 0.51.0 ### Browsers -- Safari 16.4 (18615.1.26.11.23) -- SafariDriver 16.4 (18615.1.26.11.23) -- Google Chrome 112.0.5615.137 -- ChromeDriver 112.0.5615.49 -- Microsoft Edge 112.0.1722.48 -- Microsoft Edge WebDriver 112.0.1722.48 -- Mozilla Firefox 112.0.1 +- Safari 16.4 (18615.1.26.110.1) +- SafariDriver 16.4 (18615.1.26.110.1) +- Google Chrome 113.0.5672.92 +- ChromeDriver 113.0.5672.63 +- Microsoft Edge 113.0.1774.35 +- Microsoft Edge WebDriver 113.0.1774.35 +- Mozilla Firefox 113.0 - geckodriver 0.33.0 -- Selenium server 4.8.0 +- Selenium server 4.9.0 #### Environment variables | Name | Value | | --------------- | ---------------------------------------------- | -| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/112.0.5615.49 | +| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/113.0.5672.63 | | EDGEWEBDRIVER | /usr/local/share/edge_driver | | GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | ### Java -| Version | Vendor | Environment Variable | -| ------------------- | --------------- | -------------------- | -| 8.0.362+9 | Eclipse Temurin | JAVA_HOME_8_X64 | -| 11.0.18+10 | Eclipse Temurin | JAVA_HOME_11_X64 | -| 17.0.6+10 (default) | Eclipse Temurin | JAVA_HOME_17_X64 | - - ### Rust Tools -- Cargo 1.68.2 -- Rust 1.68.2 -- Rustdoc 1.68.2 -- Rustup 1.25.2 +| Version | Vendor | Environment Variable | +| ------------------ | --------------- | -------------------- | +| 8.0.372+7 | Eclipse Temurin | JAVA_HOME_8_X64 | +| 11.0.19+7 | Eclipse Temurin | JAVA_HOME_11_X64 | +| 17.0.7+7 (default) | Eclipse Temurin | JAVA_HOME_17_X64 | + +### Cached Tools + +#### Ruby +- 3.0.6 +- 3.1.4 + +#### Python +- 3.8.16 +- 3.9.16 +- 3.10.11 +- 3.11.3 + +#### PyPy +- 2.7.18 [PyPy 7.3.11] +- 3.7.13 [PyPy 7.3.9] +- 3.8.16 [PyPy 7.3.11] +- 3.9.16 [PyPy 7.3.11] + +#### Node.js +- 16.20.0 +- 18.16.0 + +#### Go +- 1.19.9 +- 1.20.4 + +### Rust Tools +- Cargo 1.69.0 +- Rust 1.69.0 +- Rustdoc 1.69.0 +- Rustup 1.26.0 #### Packages - Bindgen 0.65.1 - Cargo-audit 0.17.5 - Cargo-outdated 0.11.2 - Cbindgen 0.24.3 -- Clippy 0.1.68 -- Rustfmt 1.5.1-stable +- Clippy 0.1.69 +- Rustfmt 1.5.2-stable ### PowerShell Tools - PowerShell 7.2.11 - + #### PowerShell Modules -- Az: 9.6.0 +- Az: 9.7.1 - Pester: 5.4.1 - PSScriptAnalyzer: 1.21.0 @@ -139,9 +157,9 @@ | 14.1 | 14B47b | /Applications/Xcode_14.1.app | #### Xcode Support Tools - - xcpretty 0.3.0 +- xcpretty 0.3.0 - xcversion 2.8.1 -- + #### Installed SDKs | SDK | SDK Name | Xcode Version | | ------------------------------------------------------- | --------------------------------------------- | ------------- | @@ -163,8 +181,8 @@ | Simulator - watchOS 9.1 | watchsimulator9.1 | 14.1, 14.2 | | Simulator - watchOS 9.4 | watchsimulator9.4 | 14.3 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3 | -| Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3 | | Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3 | +| Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3 | | DriverKit 22.1 | driverkit22.1 | 14.1 | | DriverKit 22.2 | driverkit22.2 | 14.2 | | DriverKit 22.4 | driverkit22.4 | 14.3 | From 0997df9069f235eed66a2030c15ba3ea7d229f0f Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Fri, 12 May 2023 09:35:09 +0200 Subject: [PATCH 1914/3485] Keep imagegeneration scripts in macOS and Ubuntu (#7572) --- images/linux/scripts/installers/post-deployment.sh | 3 --- images/macos/provision/configuration/finalize-vm.sh | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/images/linux/scripts/installers/post-deployment.sh b/images/linux/scripts/installers/post-deployment.sh index 3af0bdcfb73e..255c24419377 100644 --- a/images/linux/scripts/installers/post-deployment.sh +++ b/images/linux/scripts/installers/post-deployment.sh @@ -11,9 +11,6 @@ chmod -R 777 /opt echo "chmod -R 777 /usr/share" chmod -R 777 /usr/share -# remove installer and helper folders -rm -rf $HELPER_SCRIPT_FOLDER -rm -rf $INSTALLER_SCRIPT_FOLDER chmod 755 $IMAGE_FOLDER # Remove quotes around PATH diff --git a/images/macos/provision/configuration/finalize-vm.sh b/images/macos/provision/configuration/finalize-vm.sh index 1fa346d0affc..55c3f4924f7c 100644 --- a/images/macos/provision/configuration/finalize-vm.sh +++ b/images/macos/provision/configuration/finalize-vm.sh @@ -32,7 +32,7 @@ if ! is_Ventura; then yarn cache clean fi # Clean up temporary directories -sudo rm -rf ~/utils ~/image-generation /tmp/* +sudo rm -rf ~/utils /tmp/* # Erase all indexes and wait until the rebuilding process ends, # for now there is no way to get status of indexing process, it takes around 3 minutes to accomplish From b6c7afbb2649520466df83c8246f1c928c15aeb3 Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Fri, 12 May 2023 11:50:17 +0200 Subject: [PATCH 1915/3485] Fix variable references in Ubuntu 22 template (#7580) --- images/linux/ubuntu2204.pkr.hcl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/linux/ubuntu2204.pkr.hcl b/images/linux/ubuntu2204.pkr.hcl index 99668dc6059b..d9da88175b8e 100644 --- a/images/linux/ubuntu2204.pkr.hcl +++ b/images/linux/ubuntu2204.pkr.hcl @@ -257,7 +257,7 @@ build { } provisioner "shell" { - environment_vars = ["DEBIAN_FRONTEND=noninteractive", "HELPER_SCRIPTS=${local.helper_script_folder}", "INSTALLER_SCRIPT_FOLDER=${local.installer_script_folder}"] + environment_vars = ["DEBIAN_FRONTEND=noninteractive", "HELPER_SCRIPTS=${var.helper_script_folder}", "INSTALLER_SCRIPT_FOLDER=${var.installer_script_folder}"] execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" scripts = ["${path.root}/scripts/installers/apt-vital.sh"] } From 8b099099d9fb7325372a9660b0e219127057cc40 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Fri, 12 May 2023 13:30:13 +0200 Subject: [PATCH 1916/3485] [macos] prepare repository for ARM64 arch (#7396) --- images/macos/helpers/Common.Helpers.psm1 | 8 +- .../provision/configuration/shell-change.sh | 11 +- images/macos/provision/core/azcopy.sh | 22 +- images/macos/provision/core/dotnet.sh | 6 +- images/macos/provision/core/homebrew.sh | 10 + images/macos/provision/core/powershell.sh | 25 +- images/macos/provision/core/rosetta.sh | 4 + images/macos/provision/core/ruby.sh | 74 +++--- images/macos/provision/core/xcode.ps1 | 7 +- images/macos/provision/utils/utils.sh | 18 ++ .../SoftwareReport.Generator.ps1 | 108 ++++---- .../templates/macOS-13.arm64.anka.pkr.hcl | 231 ++++++++++++++++++ images/macos/tests/Android.Tests.ps1 | 8 +- images/macos/tests/BasicTools.Tests.ps1 | 13 +- images/macos/tests/Browsers.Tests.ps1 | 11 +- images/macos/tests/Common.Tests.ps1 | 16 +- images/macos/tests/Databases.Tests.ps1 | 5 +- images/macos/tests/Git.Tests.ps1 | 3 +- images/macos/tests/Haskell.Tests.ps1 | 3 +- images/macos/tests/Java.Tests.ps1 | 4 +- images/macos/tests/Linters.Tests.ps1 | 2 +- images/macos/tests/Node.Tests.ps1 | 2 +- images/macos/tests/OpenSSL.Tests.ps1 | 2 +- images/macos/tests/PHP.Tests.ps1 | 5 +- images/macos/tests/PipxPackages.Tests.ps1 | 2 +- images/macos/tests/Python.Tests.ps1 | 2 +- images/macos/tests/Ruby.arm64.Tests.ps1 | 26 ++ .../{Ruby.Tests.ps1 => Ruby.x64.Tests.ps1} | 50 ++-- images/macos/tests/RubyGem.Tests.ps1 | 5 +- images/macos/tests/Rust.Tests.ps1 | 6 +- images/macos/tests/System.Tests.ps1 | 6 +- images/macos/tests/Toolcache.Tests.ps1 | 12 +- images/macos/tests/WebServers.Tests.ps1 | 4 +- images/macos/tests/Xamarin.Tests.ps1 | 12 +- images/macos/toolsets/toolset-13.json | 34 ++- 35 files changed, 570 insertions(+), 187 deletions(-) create mode 100644 images/macos/provision/core/rosetta.sh create mode 100644 images/macos/templates/macOS-13.arm64.anka.pkr.hcl create mode 100644 images/macos/tests/Ruby.arm64.Tests.ps1 rename images/macos/tests/{Ruby.Tests.ps1 => Ruby.x64.Tests.ps1} (92%) diff --git a/images/macos/helpers/Common.Helpers.psm1 b/images/macos/helpers/Common.Helpers.psm1 index d877e5acdd66..86bc324705aa 100644 --- a/images/macos/helpers/Common.Helpers.psm1 +++ b/images/macos/helpers/Common.Helpers.psm1 @@ -28,12 +28,14 @@ function Get-EnvironmentVariable($variable) { function Get-OSVersion { $osVersion = [Environment]::OSVersion $osVersionMajorMinor = $osVersion.Version.ToString(2) + $processorArchitecture = arch return [PSCustomObject]@{ Version = $osVersion.Version Platform = $osVersion.Platform IsBigSur = $osVersion.Version.Major -eq "11" IsMonterey = $osVersion.Version.Major -eq "12" - IsVentura = $osVersion.Version.Major -eq "13" + IsVentura = $($osVersion.Version.Major -eq "13" -and $processorArchitecture -ne "arm64") + IsVenturaArm64 = $($osVersion.Version.Major -eq "13" -and $processorArchitecture -eq "arm64") } } @@ -150,3 +152,7 @@ function Add-EnvironmentVariable { $envVar = "export {0}={1}" -f $Name, $Value Add-Content -Path $FilePath -Value $envVar } + +function isVeertu { + return (Test-Path -Path "/Library/Application Support/Veertu") +} diff --git a/images/macos/provision/configuration/shell-change.sh b/images/macos/provision/configuration/shell-change.sh index 5fb12a03e837..8632a68ee7f0 100644 --- a/images/macos/provision/configuration/shell-change.sh +++ b/images/macos/provision/configuration/shell-change.sh @@ -1,5 +1,14 @@ #!/bin/bash -e -o pipefail +source ~/utils/utils.sh +arch=$(get_arch) + echo "Changing shell to bash" sudo chsh -s /bin/bash $USERNAME -sudo chsh -s /bin/bash root \ No newline at end of file +sudo chsh -s /bin/bash root + +# Check MacOS architecture and add HOMEBREW PATH to bashrc +if [[ $arch == "arm64" ]]; then + echo "Adding Homebrew environment to bash" + /opt/homebrew/bin/brew shellenv >> ~/.bashrc +fi \ No newline at end of file diff --git a/images/macos/provision/core/azcopy.sh b/images/macos/provision/core/azcopy.sh index 81f201615f7a..cc188c73f1dc 100755 --- a/images/macos/provision/core/azcopy.sh +++ b/images/macos/provision/core/azcopy.sh @@ -1,15 +1,21 @@ #!/bin/bash -e -o pipefail source ~/utils/utils.sh +arch=$(get_arch) -AZCOPY_DOWNLOAD_URL="https://aka.ms/downloadazcopy-v10-mac" +# Check MacOS architecture and if ARM install using brew +if [ $arch == "arm64" ]; then + brew install azcopy +else + AZCOPY_DOWNLOAD_URL="https://aka.ms/downloadazcopy-v10-mac" -download_with_retries $AZCOPY_DOWNLOAD_URL "/tmp" "azcopy.zip" -unzip /tmp/azcopy.zip -d azcopy -AZCOPY_EXTRACTED=$(echo azcopy/azcopy*) -cp "$AZCOPY_EXTRACTED/azcopy" "/usr/local/bin/azcopy" -chmod +x "/usr/local/bin/azcopy" + download_with_retries $AZCOPY_DOWNLOAD_URL "/tmp" "azcopy.zip" + unzip /tmp/azcopy.zip -d azcopy + AZCOPY_EXTRACTED=$(echo azcopy/azcopy*) + cp "$AZCOPY_EXTRACTED/azcopy" "/usr/local/bin/azcopy" + chmod +x "/usr/local/bin/azcopy" -echo "Done, cleaning up" -rm -rf azcopy* + echo "Done, cleaning up" + rm -rf azcopy* +fi invoke_tests "Common" "AzCopy" diff --git a/images/macos/provision/core/dotnet.sh b/images/macos/provision/core/dotnet.sh index 1bd612e9b9e7..a7f8a44e7803 100755 --- a/images/macos/provision/core/dotnet.sh +++ b/images/macos/provision/core/dotnet.sh @@ -10,6 +10,8 @@ source ~/utils/utils.sh export DOTNET_CLI_TELEMETRY_OPTOUT=1 +arch=$(get_arch) + # Download installer from dot.net and keep it locally DOTNET_INSTALL_SCRIPT="https://dot.net/v1/dotnet-install.sh" curl -L -o "dotnet-install.sh" "$DOTNET_INSTALL_SCRIPT" @@ -18,7 +20,7 @@ chmod +x ./dotnet-install.sh ARGS_LIST=() echo "Parsing dotnet SDK (except rc and preview versions) from .json..." -DOTNET_VERSIONS=($(get_toolset_value '.dotnet.versions | .[]')) +DOTNET_VERSIONS=($(get_toolset_value ".dotnet.arch[\"$arch\"].versions | .[]")) for DOTNET_VERSION in "${DOTNET_VERSIONS[@]}"; do RELEASE_URL="https://raw.githubusercontent.com/dotnet/core/master/release-notes/${DOTNET_VERSION}/releases.json" @@ -37,7 +39,7 @@ for DOTNET_VERSION in "${DOTNET_VERSIONS[@]}"; do done for ARGS in "${ARGS_LIST[@]}"; do - ./dotnet-install.sh --version $ARGS -NoPath + ./dotnet-install.sh --version $ARGS -NoPath --arch $arch done rm ./dotnet-install.sh diff --git a/images/macos/provision/core/homebrew.sh b/images/macos/provision/core/homebrew.sh index c5380226a522..9dd91d00aab3 100755 --- a/images/macos/provision/core/homebrew.sh +++ b/images/macos/provision/core/homebrew.sh @@ -2,10 +2,20 @@ source ~/utils/utils.sh +arch=$(get_arch) + echo "Installing Homebrew..." HOMEBREW_INSTALL_URL="https://raw.githubusercontent.com/Homebrew/install/master/install.sh" /bin/bash -c "$(curl -fsSL ${HOMEBREW_INSTALL_URL})" +if [[ $arch == "arm64" ]]; then + /opt/homebrew/bin/brew update + /opt/homebrew/bin/brew upgrade + /opt/homebrew/bin/brew upgrade --cask + /opt/homebrew/bin/brew cleanup + eval "$(/opt/homebrew/bin/brew shellenv)" +fi + echo "Disabling Homebrew analytics..." brew analytics off diff --git a/images/macos/provision/core/powershell.sh b/images/macos/provision/core/powershell.sh index 85c836cd9aa8..6d3ce1b6f737 100644 --- a/images/macos/provision/core/powershell.sh +++ b/images/macos/provision/core/powershell.sh @@ -2,9 +2,11 @@ source ~/utils/utils.sh echo Installing PowerShell... +arch=$(get_arch) + psmetadata=$(curl "https://raw.githubusercontent.com/PowerShell/PowerShell/master/tools/metadata.json" -s) psver=$(echo $psmetadata | jq -r '.LTSReleaseTag[0]') -psDownloadUrl=$(get_github_package_download_url "PowerShell/PowerShell" "contains(\"osx-x64.pkg\")" "$psver" "$API_PAT") +psDownloadUrl=$(get_github_package_download_url "PowerShell/PowerShell" "contains(\"osx-$arch.pkg\")" "$psver" "$API_PAT") download_with_retries $psDownloadUrl "/tmp" "powershell.pkg" # Work around the issue on macOS Big Sur 11.5 or higher for possible error message ("can't be opened because Apple cannot check it for malicious software") when installing the package @@ -19,15 +21,30 @@ for module in ${psModules[@]}; do echo "Installing $module module" moduleVersions="$(get_toolset_value ".powershellModules[] | select(.name==\"$module\") | .versions[]?")" if [[ -z "$moduleVersions" ]];then - pwsh -command "& {Install-Module $module -Force -Scope AllUsers}" + # Check MacOS architecture and sudo on Arm64 + if [[ $arch == "arm64" ]]; then + sudo pwsh -command "& {Install-Module $module -Force -Scope AllUsers}" + else + pwsh -command "& {Install-Module $module -Force -Scope AllUsers}" + fi else for version in ${moduleVersions[@]}; do - echo " - $version" - pwsh -command "& {Install-Module $module -RequiredVersion $version -Force -Scope AllUsers}" + # Check MacOS architecture and sudo on Arm64 + if [[ $arch == "arm64" ]]; then + echo " - $version" + sudo pwsh -command "& {Install-Module $module -RequiredVersion $version -Force -Scope AllUsers}" + else + echo " - $version" + pwsh -command "& {Install-Module $module -RequiredVersion $version -Force -Scope AllUsers}" + fi done fi done +if [[ $arch == "arm64" ]]; then + sudo chown -R $USER ~/.local +fi + # A dummy call to initialize .IdentityService directory pwsh -command "& {Import-Module Az}" diff --git a/images/macos/provision/core/rosetta.sh b/images/macos/provision/core/rosetta.sh new file mode 100644 index 000000000000..ee0617fde352 --- /dev/null +++ b/images/macos/provision/core/rosetta.sh @@ -0,0 +1,4 @@ +#!/bin/bash -e -o pipefail + +echo 'Installing Rosetta' +/usr/sbin/softwareupdate --install-rosetta --agree-to-license diff --git a/images/macos/provision/core/ruby.sh b/images/macos/provision/core/ruby.sh index 0b60142ff445..62fb937dbeea 100755 --- a/images/macos/provision/core/ruby.sh +++ b/images/macos/provision/core/ruby.sh @@ -1,45 +1,55 @@ #!/bin/bash -e -o pipefail source ~/utils/utils.sh +arch=$(get_arch) DEFAULT_RUBY_VERSION=$(get_toolset_value '.ruby.default') echo Installing Ruby... brew_smart_install "ruby@${DEFAULT_RUBY_VERSION}" -export PATH=/usr/local/opt/ruby@${DEFAULT_RUBY_VERSION}/bin:$PATH +if [[ $arch == "arm64" ]]; then + export PATH=/opt/homebrew/opt/ruby@${DEFAULT_RUBY_VERSION}/bin:$PATH +else + export PATH=/usr/local/opt/ruby@${DEFAULT_RUBY_VERSION}/bin:$PATH +fi + GEM_PATH=`gem env|awk '/EXECUTABLE DIRECTORY/ {print $4}'` echo "GEM_PATH=$GEM_PATH" >> "$HOME/.bashrc" -echo 'export PATH="$GEM_PATH:/usr/local/opt/ruby@'${DEFAULT_RUBY_VERSION}'/bin:$PATH"' >> "$HOME/.bashrc" - -echo "Install Ruby from toolset..." -[ -n "$API_PAT" ] && authString=(-H "Authorization: token ${API_PAT}") -PACKAGE_TAR_NAMES=$(curl "${authString[@]}" -s "https://api.github.com/repos/ruby/ruby-builder/releases/latest" | jq -r '.assets[].name') -TOOLSET_VERSIONS=$(get_toolset_value '.toolcache[] | select(.name | contains("Ruby")) | .versions[]') -RUBY_PATH="$AGENT_TOOLSDIRECTORY/Ruby" - -echo "Check if Ruby hostedtoolcache folder exists..." -if [ ! -d $RUBY_PATH ]; then - mkdir -p $RUBY_PATH +if [[ $arch == "arm64" ]]; then + echo 'export PATH="$GEM_PATH:/opt/homebrew/opt/ruby@'${DEFAULT_RUBY_VERSION}'/bin:$PATH"' >> "$HOME/.bashrc" +else + echo 'export PATH="$GEM_PATH:/usr/local/opt/ruby@'${DEFAULT_RUBY_VERSION}'/bin:$PATH"' >> "$HOME/.bashrc" fi -for TOOLSET_VERSION in ${TOOLSET_VERSIONS[@]}; do - PACKAGE_TAR_NAME=$(echo "$PACKAGE_TAR_NAMES" | grep "^ruby-${TOOLSET_VERSION}-macos-latest.tar.gz$" | egrep -v "rc|preview" | sort -V | tail -1) - RUBY_VERSION=$(echo "$PACKAGE_TAR_NAME" | cut -d'-' -f 2) - RUBY_VERSION_PATH="$RUBY_PATH/$RUBY_VERSION" +if ! is_VenturaArm64; then + echo "Install Ruby from toolset..." + [ -n "$API_PAT" ] && authString=(-H "Authorization: token ${API_PAT}") + PACKAGE_TAR_NAMES=$(curl "${authString[@]}" -s "https://api.github.com/repos/ruby/ruby-builder/releases/latest" | jq -r '.assets[].name') + TOOLSET_VERSIONS=$(get_toolset_value '.toolcache[] | select(.name | contains("Ruby")) | .versions[]') + RUBY_PATH="$AGENT_TOOLSDIRECTORY/Ruby" - echo "Create Ruby $RUBY_VERSION directory..." - mkdir -p $RUBY_VERSION_PATH - - echo "Downloading tar archive $PACKAGE_TAR_NAME" - DOWNLOAD_URL="https://github.com/ruby/ruby-builder/releases/download/toolcache/${PACKAGE_TAR_NAME}" - download_with_retries $DOWNLOAD_URL "/tmp" $PACKAGE_TAR_NAME - - echo "Expand '$PACKAGE_TAR_NAME' to the '$RUBY_VERSION_PATH' folder" - tar xf "/tmp/$PACKAGE_TAR_NAME" -C $RUBY_VERSION_PATH - - COMPLETE_FILE_PATH="$RUBY_VERSION_PATH/x64.complete" - if [ ! -f $COMPLETE_FILE_PATH ]; then - echo "Create complete file" - touch $COMPLETE_FILE_PATH + echo "Check if Ruby hostedtoolcache folder exists..." + if [ ! -d $RUBY_PATH ]; then + mkdir -p $RUBY_PATH fi -done -invoke_tests "Ruby" + for TOOLSET_VERSION in ${TOOLSET_VERSIONS[@]}; do + PACKAGE_TAR_NAME=$(echo "$PACKAGE_TAR_NAMES" | grep "^ruby-${TOOLSET_VERSION}-macos-latest.tar.gz$" | egrep -v "rc|preview" | sort -V | tail -1) + RUBY_VERSION=$(echo "$PACKAGE_TAR_NAME" | cut -d'-' -f 2) + RUBY_VERSION_PATH="$RUBY_PATH/$RUBY_VERSION" + + echo "Create Ruby $RUBY_VERSION directory..." + mkdir -p $RUBY_VERSION_PATH + + echo "Downloading tar archive $PACKAGE_TAR_NAME" + DOWNLOAD_URL="https://github.com/ruby/ruby-builder/releases/download/toolcache/${PACKAGE_TAR_NAME}" + download_with_retries $DOWNLOAD_URL "/tmp" $PACKAGE_TAR_NAME + + echo "Expand '$PACKAGE_TAR_NAME' to the '$RUBY_VERSION_PATH' folder" + tar xf "/tmp/$PACKAGE_TAR_NAME" -C $RUBY_VERSION_PATH + COMPLETE_FILE_PATH="$RUBY_VERSION_PATH/x64.complete" + if [ ! -f $COMPLETE_FILE_PATH ]; then + echo "Create complete file" + touch $COMPLETE_FILE_PATH + fi + done +fi +invoke_tests "Ruby.$arch" diff --git a/images/macos/provision/core/xcode.ps1 b/images/macos/provision/core/xcode.ps1 index d3175f387323..3c9b10363bc3 100644 --- a/images/macos/provision/core/xcode.ps1 +++ b/images/macos/provision/core/xcode.ps1 @@ -14,8 +14,10 @@ if ([string]::IsNullOrEmpty($env:XCODE_INSTALL_USER) -or [string]::IsNullOrEmpty # https://github.com/fastlane/fastlane/pull/18116 $env:SPACESHIP_SKIP_2FA_UPGRADE = 1 -$os = Get-OSVersion -[Array]$xcodeVersions = Get-ToolsetValue "xcode.versions" +$ARCH = arch +if ($ARCH -ne "arm64") { $ARCH = "x64" } +[Array]$xcodeVersions = Get-ToolsetValue "xcode.$ARCH.versions" +write-host $xcodeVersions $defaultXcode = Get-ToolsetValue "xcode.default" [Array]::Reverse($xcodeVersions) $threadCount = "5" @@ -62,4 +64,3 @@ New-Item -Path "/Applications/Xcode.app" -ItemType SymbolicLink -Value (Get-Xcod Write-Host "Setting environment variables 'XCODE_<VERSION>_DEVELOPER_DIR'" Set-XcodeDeveloperDirEnvironmentVariables -XcodeList $xcodeVersions.link - diff --git a/images/macos/provision/utils/utils.sh b/images/macos/provision/utils/utils.sh index 51de77298981..778d8737613c 100755 --- a/images/macos/provision/utils/utils.sh +++ b/images/macos/provision/utils/utils.sh @@ -39,6 +39,15 @@ download_with_retries() { return 1 } +is_VenturaArm64() { + arch=$(get_arch) + if [ "$OSTYPE" = "darwin22" ] && [ $arch = "arm64" ]; then + true + else + false + fi +} + is_Ventura() { if [ "$OSTYPE" = "darwin22" ]; then true @@ -213,3 +222,12 @@ get_github_package_download_url() { close_finder_window() { osascript -e 'tell application "Finder" to close windows' } + +get_arch() { + arch=$(arch) + if [[ $arch == "arm64" ]]; then + echo "arm64" + else + echo "x64" + fi +} diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1 index 2e05d3d8a285..80172b341658 100644 --- a/images/macos/software-report/SoftwareReport.Generator.ps1 +++ b/images/macos/software-report/SoftwareReport.Generator.ps1 @@ -40,7 +40,7 @@ $languageAndRuntime.AddNodes($(Get-GccVersions)) $languageAndRuntime.AddNodes($(Get-FortranVersions)) $languageAndRuntime.AddToolVersion("Julia", $(Get-JuliaVersion)) $languageAndRuntime.AddToolVersion("Kotlin", $(Get-KotlinVersion)) -if (-not $os.IsVentura) { +if ((-not $os.IsVentura) -and (-not $os.IsVenturaArm64)) { $languageAndRuntime.AddToolVersion("Go", $(Get-GoVersion)) $languageAndRuntime.AddToolVersion("Mono", $(Get-MonoVersion)) $languageAndRuntime.AddToolVersion("MSBuild", $(Get-MSBuildVersion)) @@ -49,8 +49,10 @@ if (-not $os.IsVentura) { $languageAndRuntime.AddToolVersionsListInline("NVM - Cached node versions", $(Get-NVMNodeVersionList), '^\d+') } $languageAndRuntime.AddToolVersion("Perl", $(Get-PerlVersion)) -$languageAndRuntime.AddToolVersion("PHP", $(Get-PHPVersion)) -if (-not $os.IsVentura) { +if (-not $os.IsVenturaArm64) { + $languageAndRuntime.AddToolVersion("PHP", $(Get-PHPVersion)) +} +if ((-not $os.IsVentura) -and (-not $os.IsVenturaArm64)) { $languageAndRuntime.AddToolVersion("Python", $(Get-PythonVersion)) $languageAndRuntime.AddToolVersion("Python3", $(Get-Python3Version)) } @@ -64,27 +66,29 @@ $packageManagement.AddToolVersion("Carthage", $(Get-CarthageVersion)) $packageManagement.AddToolVersion("CocoaPods", $(Get-CocoaPodsVersion)) $packageManagement.AddToolVersion("Composer", $(Get-ComposerVersion)) $packageManagement.AddToolVersion("Homebrew", $(Get-HomebrewVersion)) -if (-not $os.IsVentura) { +if ((-not $os.IsVentura) -and (-not $os.IsVenturaArm64)) { $packageManagement.AddToolVersion("Miniconda", $(Get-CondaVersion)) } $packageManagement.AddToolVersion("NPM", $(Get-NPMVersion)) -if (-not $os.IsVentura) { +if ((-not $os.IsVentura) -and (-not $os.IsVenturaArm64)) { $packageManagement.AddToolVersion("NuGet", $(Get-NuGetVersion)) $packageManagement.AddToolVersion("Pip", $(Get-PipVersion -Version 2)) $packageManagement.AddToolVersion("Pip3", $(Get-PipVersion -Version 3)) $packageManagement.AddToolVersion("Pipx", $(Get-PipxVersion)) } $packageManagement.AddToolVersion("RubyGems", $(Get-RubyGemsVersion)) -$packageManagement.AddToolVersion("Vcpkg", $(Get-VcpkgVersion)) +if (-not $os.IsVenturaArm64) { + $packageManagement.AddToolVersion("Vcpkg", $(Get-VcpkgVersion)) +} $packageManagement.AddToolVersion("Yarn", $(Get-YarnVersion)) -if (-not $os.IsVentura) { +if ((-not $os.IsVentura) -and (-not $os.IsVenturaArm64)) { $packageManagement.AddNode($(Build-PackageManagementEnvironmentTable)) } # Project Management $projectManagement = $installedSoftware.AddHeader("Project Management") $projectManagement.AddToolVersion("Apache Ant", $(Get-ApacheAntVersion)) -if (-not $os.IsVentura) { +if ((-not $os.IsVentura) -and (-not $os.IsVenturaArm64)) { $projectManagement.AddToolVersion("Apache Maven", $(Get-MavenVersion)) $projectManagement.AddToolVersion("Gradle", $(Get-GradleVersion)) $projectManagement.AddToolVersion("Sbt", $(Get-SbtVersion)) @@ -108,12 +112,12 @@ $utilities.AddToolVersion("gpg (GnuPG)", $(Get-GPGVersion)) if ($os.IsBigSur) { $utilities.AddToolVersion("helm", $(Get-HelmVersion)) } -if (-not $os.IsVentura) { +if ((-not $os.IsVentura) -and (-not $os.IsVenturaArm64)) { $utilities.AddToolVersion("Hub CLI", $(Get-HubVersion)) $utilities.AddToolVersion("ImageMagick", $(Get-ImageMagickVersion)) } $utilities.AddToolVersion("jq", $(Get-JqVersion)) -if (-not $os.IsVentura) { +if ((-not $os.IsVentura) -and (-not $os.IsVenturaArm64)) { $utilities.AddToolVersion("mongo", $(Get-MongoVersion)) $utilities.AddToolVersion("mongod", $(Get-MongodVersion)) } @@ -122,7 +126,7 @@ if ($os.IsBigSur) { } $utilities.AddToolVersion("OpenSSL", $(Get-OpenSSLVersion)) $utilities.AddToolVersion("Packer", $(Get-PackerVersion)) -if (-not $os.IsVentura) { +if ((-not $os.IsVentura) -and (-not $os.IsVenturaArm64)) { $utilities.AddToolVersion("PostgreSQL", $(Get-PostgresServerVersion)) $utilities.AddToolVersion("psql (PostgreSQL)", $(Get-PostgresClientVersion)) $utilities.AddToolVersion("Sox", $(Get-SoxVersion)) @@ -131,7 +135,7 @@ if (-not $os.IsVentura) { } if (-not $os.IsBigSur) { $utilities.AddToolVersion("Vagrant", $(Get-VagrantVersion)) - if (-not $os.IsVentura) { + if ((-not $os.IsVentura) -and (-not $os.IsVenturaArm64)) { $utilities.AddToolVersion("VirtualBox", $(Get-VirtualBoxVersion)) } } @@ -143,53 +147,66 @@ $tools = $installedSoftware.AddHeader("Tools") if ($os.IsBigSur) { $tools.AddToolVersion("Aliyun CLI", $(Get-AliyunCLIVersion)) } -if (-not $os.IsVentura) { +if ((-not $os.IsVentura) -and (-not $os.IsVenturaArm64)) { $tools.AddToolVersion("App Center CLI", $(Get-AppCenterCLIVersion)) } -$tools.AddToolVersion("AWS CLI", $(Get-AWSCLIVersion)) -$tools.AddToolVersion("AWS SAM CLI", $(Get-AWSSAMCLIVersion)) -$tools.AddToolVersion("AWS Session Manager CLI", $(Get-AWSSessionManagerCLIVersion)) +if (-not $os.IsVenturaArm64) { + $tools.AddToolVersion("AWS CLI", $(Get-AWSCLIVersion)) + $tools.AddToolVersion("AWS SAM CLI", $(Get-AWSSAMCLIVersion)) + $tools.AddToolVersion("AWS Session Manager CLI", $(Get-AWSSessionManagerCLIVersion)) +} $tools.AddToolVersion("Azure CLI", $(Get-AzureCLIVersion)) $tools.AddToolVersion("Azure CLI (azure-devops)", $(Get-AzureDevopsVersion)) $tools.AddToolVersion("Bicep CLI", $(Get-BicepVersion)) -$tools.AddToolVersion("Cabal", $(Get-CabalVersion)) +if (-not $os.IsVenturaArm64) { + $tools.AddToolVersion("Cabal", $(Get-CabalVersion)) +} $tools.AddToolVersion("Cmake", $(Get-CmakeVersion)) $tools.AddToolVersion("CodeQL Action Bundles", $(Get-CodeQLBundleVersions)) if ($os.IsMonterey) { $tools.AddToolVersion("Colima", $(Get-ColimaVersion)) } $tools.AddToolVersion("Fastlane", $(Get-FastlaneVersion)) -$tools.AddToolVersion("GHC", $(Get-GHCVersion)) -$tools.AddToolVersion("GHCup", $(Get-GHCupVersion)) -if (-not $os.IsVentura) { +if (-not $os.IsVenturaArm64) { + $tools.AddToolVersion("GHC", $(Get-GHCVersion)) + $tools.AddToolVersion("GHCup", $(Get-GHCupVersion)) +} +if ((-not $os.IsVentura) -and (-not $os.IsVenturaArm64)) { $tools.AddToolVersion("Jazzy", $(Get-JazzyVersion)) } -$tools.AddToolVersion("Stack", $(Get-StackVersion)) +if (-not $os.IsVenturaArm64) { + $tools.AddToolVersion("Stack", $(Get-StackVersion)) +} $tools.AddToolVersion("SwiftFormat", $(Get-SwiftFormatVersion)) -if (-not $os.IsVentura) { +if ((-not $os.IsVentura) -and (-not $os.IsVenturaArm64)) { $tools.AddToolVersion("Swig", $(Get-SwigVersion)) } $tools.AddToolVersion("Xcode Command Line Tools", $(Get-XcodeCommandLineToolsVersion)) # Linters $linters = $installedSoftware.AddHeader("Linters") -$linters.AddToolVersion("SwiftLint", $(Get-SwiftLintVersion)) -if (-not $os.IsVentura) { +if (-not $os.IsVenturaArm64) { + $linters.AddToolVersion("SwiftLint", $(Get-SwiftLintVersion)) +} +if ((-not $os.IsVentura) -and (-not $os.IsVenturaArm64)) { $linters.AddToolVersion("Yamllint", $(Get-YamllintVersion)) } -# Browsers -$browsers = $installedSoftware.AddHeader("Browsers") -$browsers.AddNodes($(Build-BrowserSection)) -$browsers.AddNode($(Build-BrowserWebdriversEnvironmentTable)) +if (-not $os.IsVenturaArm64) { + # Browsers + $browsers = $installedSoftware.AddHeader("Browsers") + $browsers.AddNodes($(Build-BrowserSection)) + $browsers.AddNode($(Build-BrowserWebdriversEnvironmentTable)) -# Java -$java = $installedSoftware.AddHeader("Java") -$java.AddTable($(Get-JavaVersions)) - -# Toolcache -$toolcache = $installedSoftware.AddHeader("Cached Tools") -$toolcache.AddNodes($(Build-ToolcacheSection)) + # Java + $java = $installedSoftware.AddHeader("Java") + $java.AddTable($(Get-JavaVersions)) +} +if (-not $os.IsVenturaArm64) { + # Toolcache + $toolcache = $installedSoftware.AddHeader("Cached Tools") + $toolcache.AddNodes($(Build-ToolcacheSection)) +} # Rust $rust = $installedSoftware.AddHeader("Rust Tools") @@ -214,13 +231,13 @@ $powerShellModules = $powerShell.AddHeader("PowerShell Modules") $powerShellModules.AddNodes($(Get-PowerShellModules)) # Web Servers -if (-not $os.IsVentura) { +if ((-not $os.IsVentura) -and (-not $os.IsVenturaArm64)) { $webServers = $installedSoftware.AddHeader("Web Servers") $webServers.AddTable($(Build-WebServersSection)) } # Xamarin section -if (-not $os.IsVentura) { +if ((-not $os.IsVentura) -and (-not $os.IsVenturaArm64)) { $xamarin = $installedSoftware.AddHeader("Xamarin") $vsForMac = $xamarin.AddHeader("Visual Studio for Mac") $vsForMac.AddTable($(Build-VSMacTable)) @@ -256,16 +273,16 @@ $installedSdks.AddTable($(Build-XcodeSDKTable $xcodeInfo)) $installedSimulators = $xcode.AddHeader("Installed Simulators") $installedSimulators.AddTable($(Build-XcodeSimulatorsTable $xcodeInfo)) - +if (-not $os.IsVenturaArm64) { # Android section -$android = $installedSoftware.AddHeader("Android") -$androidTable = Build-AndroidTable -$android.AddTable($androidTable) + $android = $installedSoftware.AddHeader("Android") + $androidTable = Build-AndroidTable + $android.AddTable($androidTable) -$androidEnv = $android.AddHeader("Environment variables") -$androidEnv.AddTable($(Build-AndroidEnvironmentTable)) - -if (-not $os.IsVentura) { + $androidEnv = $android.AddHeader("Environment variables") + $androidEnv.AddTable($(Build-AndroidEnvironmentTable)) +} +if ((-not $os.IsVentura) -and (-not $os.IsVenturaArm64)) { $miscellaneous = $installedSoftware.AddHeader("Miscellaneous") $miscellaneous.AddToolVersion("libXext", $(Get-LibXextVersion)) $miscellaneous.AddToolVersion("libXft", $(Get-LibXftVersion)) @@ -303,4 +320,3 @@ Write-Host $markdownExtended $systemInfo | Out-File -FilePath "${OutputDirectory}/systeminfo.txt" -Encoding UTF8NoBOM $softwareReport.ToJson() | Out-File -FilePath "${OutputDirectory}/systeminfo.json" -Encoding UTF8NoBOM $softwareReport.ToMarkdown() | Out-File -FilePath "${OutputDirectory}/systeminfo.md" -Encoding UTF8NoBOM - diff --git a/images/macos/templates/macOS-13.arm64.anka.pkr.hcl b/images/macos/templates/macOS-13.arm64.anka.pkr.hcl new file mode 100644 index 000000000000..489f61ec843e --- /dev/null +++ b/images/macos/templates/macOS-13.arm64.anka.pkr.hcl @@ -0,0 +1,231 @@ +packer { + required_plugins { + veertu-anka = { + version = "= v3.1.0" + source = "github.com/veertuinc/veertu-anka" + } + } +} + +variable "source_vm_name" { + type = string +} + +variable "source_vm_tag" { + type = string +} + +variable "build_id" { + type = string +} + +variable "vm_username" { + type = string + sensitive = true +} + +variable "vm_password" { + type = string + sensitive = true +} + +variable "github_api_pat" { + type = string + default = "" +} + +variable "xcode_install_user" { + type = string + sensitive = true +} + +variable "xcode_install_password" { + type = string + sensitive = true +} + +variable "vcpu_count" { + type = string + default = "6" +} + +variable "ram_size" { + type = string + default = "8G" +} + +variable "image_os" { + type = string + default = "macos13" +} + +source "veertu-anka-vm-clone" "template" { + vm_name = "${var.build_id}" + source_vm_name = "${var.source_vm_name}" + source_vm_tag = "${var.source_vm_tag}" + vcpu_count = "${var.vcpu_count}" + ram_size = "${var.ram_size}" + stop_vm = "true" + log_level = "debug" +} + +build { + sources = [ + "source.veertu-anka-vm-clone.template" + ] + provisioner "shell" { + inline = [ + "mkdir ~/image-generation" + ] + } + provisioner "file" { + destination = "image-generation/" + sources = [ + "./provision/assets", + "./tests", + "./software-report", + "./helpers" + ] + } + provisioner "file" { + destination = "image-generation/software-report/" + source = "../../helpers/software-report-base" + } + provisioner "file" { + destination = "image-generation/add-certificate.swift" + source = "./provision/configuration/add-certificate.swift" + } + provisioner "file" { + destination = ".bashrc" + source = "./provision/configuration/environment/bashrc" + } + provisioner "file" { + destination = ".bash_profile" + source = "./provision/configuration/environment/bashprofile" + } + provisioner "file" { + destination = "./" + source = "./provision/utils" + } + provisioner "shell" { + inline = [ + "mkdir ~/bootstrap" + ] + } + provisioner "file" { + destination = "bootstrap" + source = "./provision/bootstrap-provisioner/" + } + provisioner "file" { + destination = "image-generation/toolset.json" + source = "./toolsets/toolset-13.json" + } + provisioner "shell" { + scripts = [ + "./provision/core/xcode-clt.sh", + "./provision/core/homebrew.sh", + "./provision/core/rosetta.sh" + ] + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" + } + provisioner "shell" { + scripts = [ + "./provision/configuration/configure-tccdb-macos.sh", + "./provision/configuration/disable-auto-updates.sh", + "./provision/configuration/ntpconf.sh", + "./provision/configuration/shell-change.sh" + ] + environment_vars = [ + "PASSWORD=${var.vm_password}", + "USERNAME=${var.vm_username}" + ] + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}" + } + provisioner "shell" { + scripts = [ + "./provision/configuration/preimagedata.sh", + "./provision/configuration/configure-ssh.sh", + "./provision/configuration/configure-machine.sh" + ] + environment_vars = [ + "IMAGE_VERSION=${var.build_id}", + "IMAGE_OS=${var.image_os}", + "PASSWORD=${var.vm_password}" + ] + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" + } + provisioner "shell" { + script = "./provision/core/reboot.sh" + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}" + expect_disconnect = true + } + provisioner "shell" { + pause_before = "30s" + scripts = [ + "./provision/core/powershell.sh", + "./provision/core/dotnet.sh", + "./provision/core/azcopy.sh", + "./provision/core/ruby.sh", + "./provision/core/rubygem.sh", + "./provision/core/git.sh", + "./provision/core/node.sh", + "./provision/core/commonutils.sh" + ] + environment_vars = [ + "API_PAT=${var.github_api_pat}", + "USER_PASSWORD=${var.vm_password}" + ] + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" + } + provisioner "shell" { + script = "./provision/core/xcode.ps1" + environment_vars = [ + "XCODE_INSTALL_USER=${var.xcode_install_user}", + "XCODE_INSTALL_PASSWORD=${var.xcode_install_password}" + ] + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} pwsh -f {{ .Path }}" + } + provisioner "shell" { + script = "./provision/core/reboot.sh" + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}" + expect_disconnect = true + } + provisioner "shell" { + scripts = [ + "./provision/core/llvm.sh", + "./provision/core/rust.sh", + "./provision/core/gcc.sh", + "./provision/core/cocoapods.sh", + "./provision/core/vsmac.sh", + "./provision/core/safari.sh", + "./provision/core/bicep.sh", + "./provision/core/codeql-bundle.sh" + ] + environment_vars = [ + "API_PAT=${var.github_api_pat}" + ] + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" + } + provisioner "shell" { + script = "./provision/core/delete-duplicate-sims.rb" + execute_command = "source $HOME/.bash_profile; ruby {{ .Path }}" + } + provisioner "shell" { + inline = [ + "pwsh -File \"$HOME/image-generation/software-report/SoftwareReport.Generator.ps1\" -OutputDirectory \"$HOME/image-generation/output/software-report\" -ImageName ${var.build_id}", + "pwsh -File \"$HOME/image-generation/tests/RunAll-Tests.ps1\"" + ] + execute_command = "source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" + } + provisioner "file" { + destination = "../image-output/" + direction = "download" + source = "./image-generation/output/" + } + provisioner "shell" { + scripts = [ + "./provision/configuration/configure-hostname.sh" + ] + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" + } +} diff --git a/images/macos/tests/Android.Tests.ps1 b/images/macos/tests/Android.Tests.ps1 index 36e5ea968a06..f19e2087fa34 100644 --- a/images/macos/tests/Android.Tests.ps1 +++ b/images/macos/tests/Android.Tests.ps1 @@ -4,7 +4,7 @@ Import-Module "$PSScriptRoot/../software-report/SoftwareReport.Android.psm1" -Di $os = Get-OSVersion -Describe "Android" { +Describe "Android" -Skip:($os.IsVenturaArm64) { $androidSdkManagerPackages = Get-AndroidPackages [int]$platformMinVersion = Get-ToolsetValue "android.platform_min_version" [version]$buildToolsMinVersion = Get-ToolsetValue "android.build_tools_min_version" @@ -50,8 +50,8 @@ Describe "Android" { } } - Context "SDKManagers" { - if (-not $os.IsVentura) { + Context "SDKManagers" -Skip:($os.IsVenturaArm64) { + if (-not $os.IsVentura -and -not $os.IsVenturaArm64) { $testCases = @( @{ PackageName = "SDK tools" @@ -76,7 +76,7 @@ Describe "Android" { } } - Context "Packages" { + Context "Packages" -Skip:($os.IsVenturaArm64) { $testCases = $androidPackages | ForEach-Object { @{ PackageName = $_ } } It "<PackageName>" -TestCases $testCases { diff --git a/images/macos/tests/BasicTools.Tests.ps1 b/images/macos/tests/BasicTools.Tests.ps1 index ec5afec93538..5ca408c40ce0 100644 --- a/images/macos/tests/BasicTools.Tests.ps1 +++ b/images/macos/tests/BasicTools.Tests.ps1 @@ -1,3 +1,4 @@ +Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" $os = Get-OSVersion Describe "Azure CLI" { @@ -24,7 +25,7 @@ Describe "cmake" { } } -Describe "Subversion" -Skip:($os.IsVentura) { +Describe "Subversion" -Skip:($os.IsVentura -or $os.IsVenturaArm64) { It "Subversion" { "svn --version" | Should -ReturnZeroExitCode } @@ -60,7 +61,7 @@ Describe "Perl" { } } -Describe "Helm" -Skip:($os.IsMonterey -or $os.IsVentura) { +Describe "Helm" -Skip:($os.IsMonterey -or $os.IsVentura -or $os.IsVenturaArm64) { It "Helm" { "helm version --short" | Should -ReturnZeroExitCode } @@ -108,7 +109,7 @@ Describe "bazel" { } } -Describe "Aliyun CLI" -Skip:($os.IsMonterey -or $os.IsVentura) { +Describe "Aliyun CLI" -Skip:($os.IsMonterey -or $os.IsVentura -or $os.IsVenturaArm64) { It "Aliyun CLI" { "aliyun --version" | Should -ReturnZeroExitCode } @@ -144,7 +145,7 @@ Describe "vagrant" -Skip:($os.IsBigSur) { } } -Describe "virtualbox" -Skip:($os.IsBigSur -or $os.IsVentura) { +Describe "virtualbox" -Skip:($os.IsBigSur -or $os.IsVentura -or $os.IsVenturaArm64) { It "virtualbox" { "vboxmanage -v" | Should -ReturnZeroExitCode } @@ -170,7 +171,7 @@ Describe "Kotlin" { } } -Describe "sbt" -Skip:($os.IsVentura) { +Describe "sbt" -Skip:($os.IsVentura -or $os.IsVenturaArm64) { It "sbt" { "sbt -version" | Should -ReturnZeroExitCode } @@ -182,7 +183,7 @@ Describe "yq" { } } -Describe "imagemagick" -Skip:($os.IsVentura) { +Describe "imagemagick" -Skip:($os.IsVentura -or $os.IsVenturaArm64) { It "imagemagick" { "magick -version" | Should -ReturnZeroExitCode } diff --git a/images/macos/tests/Browsers.Tests.ps1 b/images/macos/tests/Browsers.Tests.ps1 index cf8ce3a201cd..1b7499b34aad 100644 --- a/images/macos/tests/Browsers.Tests.ps1 +++ b/images/macos/tests/Browsers.Tests.ps1 @@ -1,4 +1,7 @@ -Describe "Chrome" { +Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" +$os = Get-OSVersion + +Describe "Chrome" -Skip:($os.IsVenturaArm64) { BeforeAll { $chromeLocation = "/Applications/Google Chrome.app/Contents/MacOS/Google Chrome" } @@ -19,13 +22,13 @@ Describe "Chrome" { } } -Describe "Selenium server" { +Describe "Selenium server" -Skip:($os.IsVenturaArm64) { It "Selenium server" { (Get-ChildItem -Path "/usr/local/Cellar/selenium-server*/*").Name | Should -BeLike "4.*" } } -Describe "Edge" { +Describe "Edge" -Skip:($os.IsVenturaArm64) { It "Microsoft Edge" { $edgeLocation = "/Applications/Microsoft Edge.app/Contents/MacOS/Microsoft Edge" $edgeLocation | Should -Exist @@ -37,7 +40,7 @@ Describe "Edge" { } } -Describe "Firefox" { +Describe "Firefox" -Skip:($os.IsVenturaArm64) { It "Firefox" { $firefoxLocation = "/Applications/Firefox.app/Contents/MacOS/firefox" $firefoxLocation | Should -Exist diff --git a/images/macos/tests/Common.Tests.ps1 b/images/macos/tests/Common.Tests.ps1 index 243ad26f1fc2..a58a05613176 100644 --- a/images/macos/tests/Common.Tests.ps1 +++ b/images/macos/tests/Common.Tests.ps1 @@ -33,13 +33,13 @@ Describe "GCC" { } } -Describe "vcpkg" { +Describe "vcpkg" -Skip:($os.IsVenturaArm64) { It "vcpkg" { "vcpkg version" | Should -ReturnZeroExitCode } } -Describe "AWS" { +Describe "AWS" -Skip:($os.IsVenturaArm64) { It "AWS CLI" { "aws --version" | Should -ReturnZeroExitCode } @@ -58,7 +58,7 @@ Describe "AzCopy" { } } -Describe "Miniconda" -Skip:($os.IsVentura) { +Describe "Miniconda" -Skip:($os.IsVentura -or $os.IsVenturaArm64) { It "Conda" { Get-EnvironmentVariable "CONDA" | Should -Not -BeNullOrEmpty $condaBinPath = Join-Path $env:CONDA "bin" "conda" @@ -66,7 +66,7 @@ Describe "Miniconda" -Skip:($os.IsVentura) { } } -Describe "Stack" { +Describe "Stack" -Skip:($os.IsVenturaArm64) { It "Stack" { "stack --version" | Should -ReturnZeroExitCode } @@ -105,7 +105,7 @@ Describe "VSMac" { } } -Describe "Swig" -Skip:($os.IsVentura) { +Describe "Swig" -Skip:($os.IsVentura -or $os.IsVenturaArm64) { It "Swig" { "swig -version" | Should -ReturnZeroExitCode } @@ -117,13 +117,13 @@ Describe "Bicep" { } } -Describe "Go" -Skip:($os.IsVentura) { +Describe "Go" -Skip:($os.IsVentura -or $os.IsVenturaArm64) { It "Go" { "go version" | Should -ReturnZeroExitCode } } -Describe "VirtualBox" -Skip:($os.IsBigSur -or $os.IsVentura) { +Describe "VirtualBox" -Skip:($os.IsBigSur -or $os.IsVentura -or $os.IsVenturaArm64) { It "Check kext kernel modules" { kextstat | Out-String | Should -Match "org.virtualbox.kext" } @@ -165,7 +165,7 @@ Describe "CodeQLBundles" { } } -Describe "Colima" -Skip:($os.IsVentura) { +Describe "Colima" -Skip:($os.IsVentura -or $os.IsVenturaArm64) { It "Colima" { "colima version" | Should -ReturnZeroExitCode } diff --git a/images/macos/tests/Databases.Tests.ps1 b/images/macos/tests/Databases.Tests.ps1 index 4483c7c3b67d..36eebcd5bb13 100644 --- a/images/macos/tests/Databases.Tests.ps1 +++ b/images/macos/tests/Databases.Tests.ps1 @@ -1,9 +1,8 @@ - Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" $os = Get-OSVersion -Describe "MongoDB" -Skip:($os.IsVentura) { +Describe "MongoDB" -Skip:($os.IsVentura -or $os.IsVenturaArm64) { It "<ToolName>" -TestCases @( @{ ToolName = "mongo" } @{ ToolName = "mongod" } @@ -13,7 +12,7 @@ Describe "MongoDB" -Skip:($os.IsVentura) { } } -Describe "PostgreSQL" -Skip:($os.IsVentura) { +Describe "PostgreSQL" -Skip:($os.IsVentura -or $os.IsVenturaArm64) { It "PostgreSQL version should correspond to the version in the toolset" { $toolsetVersion = Get-ToolsetValue 'postgresql.version' # Client version diff --git a/images/macos/tests/Git.Tests.ps1 b/images/macos/tests/Git.Tests.ps1 index c0600daecb20..0122c9fa3185 100644 --- a/images/macos/tests/Git.Tests.ps1 +++ b/images/macos/tests/Git.Tests.ps1 @@ -1,3 +1,4 @@ +Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" $os = Get-OSVersion Describe "Git" { It "git is installed" { @@ -7,7 +8,7 @@ Describe "Git" { "git lfs version" | Should -ReturnZeroExitCode } } -Describe "hub CLI" -Skip:($os.IsVentura) { +Describe "hub CLI" -Skip:($os.IsVentura -or $os.IsVenturaArm64) { It "hub CLI is installed" { "hub --version" | Should -ReturnZeroExitCode } diff --git a/images/macos/tests/Haskell.Tests.ps1 b/images/macos/tests/Haskell.Tests.ps1 index a0c11ce1ab65..f1a342d7297d 100644 --- a/images/macos/tests/Haskell.Tests.ps1 +++ b/images/macos/tests/Haskell.Tests.ps1 @@ -1,6 +1,7 @@ +Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" $os = Get-OSVersion -Describe "Haskell" { +Describe "Haskell" -Skip:($os.IsVenturaArm64) { Context "GHCup" { It "GHCup" { "ghcup --version" | Should -ReturnZeroExitCode diff --git a/images/macos/tests/Java.Tests.ps1 b/images/macos/tests/Java.Tests.ps1 index b1456eb6be28..10a5ea7ac367 100644 --- a/images/macos/tests/Java.Tests.ps1 +++ b/images/macos/tests/Java.Tests.ps1 @@ -11,7 +11,7 @@ function Get-NativeVersionFormat { return $Version } -Describe "Java" { +Describe "Java" -Skip:($os.IsVenturaArm64) { BeforeAll { function Validate-JavaVersion { param($JavaCommand, $ExpectedVersion) @@ -58,7 +58,7 @@ Describe "Java" { } Context "Java Adopt" { - Describe "Java Adopt" -Skip:($os.IsVentura) { + Describe "Java Adopt" -Skip:($os.IsVentura -or $os.IsVenturaArm64) { It "Java Adopt <Version>" -TestCases $adoptCases { $adoptPath = Join-Path (Get-ChildItem ${env:AGENT_TOOLSDIRECTORY}\Java_Adopt_jdk\${Version}*) "x64\Contents\Home\bin\java" diff --git a/images/macos/tests/Linters.Tests.ps1 b/images/macos/tests/Linters.Tests.ps1 index 99fa34969b69..79bf639b41a0 100644 --- a/images/macos/tests/Linters.Tests.ps1 +++ b/images/macos/tests/Linters.Tests.ps1 @@ -2,7 +2,7 @@ Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1" -DisableNameChecking $os = Get-OSVersion -Describe "SwiftLint" { +Describe "SwiftLint" -Skip:($os.IsVenturaArm64) { It "SwiftLint" { "swiftlint version" | Should -ReturnZeroExitCode } diff --git a/images/macos/tests/Node.Tests.ps1 b/images/macos/tests/Node.Tests.ps1 index b6d37eafd118..9f13fe431680 100644 --- a/images/macos/tests/Node.Tests.ps1 +++ b/images/macos/tests/Node.Tests.ps1 @@ -21,7 +21,7 @@ Describe "Node.js" { } } -Describe "nvm" -Skip:($os.IsVentura) { +Describe "nvm" -Skip:($os.IsVentura -or $os.IsVenturaArm64) { BeforeAll { $nvmPath = Join-Path $env:HOME ".nvm" "nvm.sh" $nvmInitCommand = ". $nvmPath > /dev/null 2>&1 || true" diff --git a/images/macos/tests/OpenSSL.Tests.ps1 b/images/macos/tests/OpenSSL.Tests.ps1 index 4e8a35dbd820..8da41bba7369 100644 --- a/images/macos/tests/OpenSSL.Tests.ps1 +++ b/images/macos/tests/OpenSSL.Tests.ps1 @@ -1,7 +1,7 @@ Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" $os = Get-OSVersion -Describe "OpenSSL" -Skip:($os.IsVentura) { +Describe "OpenSSL" -Skip:($os.IsVentura -or $os.IsVenturaArm64) { Context "OpenSSL Version" { It "OpenSSL is available" { "openssl version" | Should -ReturnZeroExitCode diff --git a/images/macos/tests/PHP.Tests.ps1 b/images/macos/tests/PHP.Tests.ps1 index d5b2573246b6..2ac1b55d949a 100644 --- a/images/macos/tests/PHP.Tests.ps1 +++ b/images/macos/tests/PHP.Tests.ps1 @@ -1,7 +1,8 @@ +Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" $os = Get-OSVersion Describe "PHP" { - Context "PHP" { + Context "PHP" -Skip:($os.IsVenturaArm64) { It "PHP Path" { Get-WhichTool "php" | Should -Not -BeLike "/usr/bin/php*" } @@ -12,7 +13,7 @@ Describe "PHP" { } } - Context "Composer" { + Context "Composer" -Skip:($os.IsVenturaArm64) { It "Composer" { "composer --version" | Should -ReturnZeroExitCode } diff --git a/images/macos/tests/PipxPackages.Tests.ps1 b/images/macos/tests/PipxPackages.Tests.ps1 index 168e0b548abe..f95d35639e1f 100644 --- a/images/macos/tests/PipxPackages.Tests.ps1 +++ b/images/macos/tests/PipxPackages.Tests.ps1 @@ -3,7 +3,7 @@ Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" $os = Get-OSVersion -Describe "PipxPackages" -Skip:($os.IsVentura) { +Describe "PipxPackages" -Skip:($os.IsVentura -or $os.IsVenturaArm64) { $pipxToolset = Get-ToolsetValue "pipx" $testCases = $pipxToolset | ForEach-Object { @{package = $_.package; cmd = $_.cmd} } It "<package>" -TestCases $testCases { diff --git a/images/macos/tests/Python.Tests.ps1 b/images/macos/tests/Python.Tests.ps1 index 5464fc9ef039..15f4e1605462 100644 --- a/images/macos/tests/Python.Tests.ps1 +++ b/images/macos/tests/Python.Tests.ps1 @@ -3,7 +3,7 @@ Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1" -DisableNameChecking $os = Get-OSVersion -Describe "Python" -Skip:($os.IsVentura) { +Describe "Python" -Skip:($os.IsVentura -or $os.IsVenturaArm64) { It "Python 2 is available" { "python --version" | Should -ReturnZeroExitCode } diff --git a/images/macos/tests/Ruby.arm64.Tests.ps1 b/images/macos/tests/Ruby.arm64.Tests.ps1 new file mode 100644 index 000000000000..41fee5f5ab15 --- /dev/null +++ b/images/macos/tests/Ruby.arm64.Tests.ps1 @@ -0,0 +1,26 @@ +Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" +Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1" -DisableNameChecking + +$os = Get-OSVersion + +Describe "Ruby" -Skip:($os.IsVentura) { + It "Ruby is available" { + "ruby --version" | Should -ReturnZeroExitCode + } + + It "Ruby is installed via HomeBrew" { + Get-WhichTool "ruby" | Should -Not -BeLike "/usr/bin/ruby*" + } + + It "Ruby tools are consistent" { + $expectedPrefix = "/opt/homebrew" + Get-WhichTool "ruby" | Should -Match "$($expectedPrefix)*" + Get-WhichTool "gem" | Should -Match "$($expectedPrefix)*" + Get-WhichTool "bundler" | Should -Match "$($expectedPrefix)*" + } + + It "Ruby gems permissions are valid" { + "gem install bundle" | Should -ReturnZeroExitCode + "gem uninstall bundle" | Should -ReturnZeroExitCode + } +} diff --git a/images/macos/tests/Ruby.Tests.ps1 b/images/macos/tests/Ruby.x64.Tests.ps1 similarity index 92% rename from images/macos/tests/Ruby.Tests.ps1 rename to images/macos/tests/Ruby.x64.Tests.ps1 index 222c182f2091..ff438c7cd70c 100644 --- a/images/macos/tests/Ruby.Tests.ps1 +++ b/images/macos/tests/Ruby.x64.Tests.ps1 @@ -1,24 +1,26 @@ -Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" -Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1" -DisableNameChecking - -Describe "Ruby" { - It "Ruby is available" { - "ruby --version" | Should -ReturnZeroExitCode - } - - It "Ruby is installed via HomeBrew" { - Get-WhichTool "ruby" | Should -Not -BeLike "/usr/bin/ruby*" - } - - It "Ruby tools are consistent" { - $expectedPrefix = "/usr/local" - Get-WhichTool "ruby" | Should -Match "$($expectedPrefix)*" - Get-WhichTool "gem" | Should -Match "$($expectedPrefix)*" - Get-WhichTool "bundler" | Should -Match "$($expectedPrefix)*" - } - - It "Ruby gems permissions are valid" { - "gem install bundle" | Should -ReturnZeroExitCode - "gem uninstall bundle" | Should -ReturnZeroExitCode - } -} \ No newline at end of file +Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" +Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1" -DisableNameChecking + +$os = Get-OSVersion + +Describe "Ruby" -Skip:($os.IsVenturaArm64) { + It "Ruby is available" { + "ruby --version" | Should -ReturnZeroExitCode + } + + It "Ruby is installed via HomeBrew" { + Get-WhichTool "ruby" | Should -Not -BeLike "/usr/bin/ruby*" + } + + It "Ruby tools are consistent" { + $expectedPrefix = "/usr/local" + Get-WhichTool "ruby" | Should -Match "$($expectedPrefix)*" + Get-WhichTool "gem" | Should -Match "$($expectedPrefix)*" + Get-WhichTool "bundler" | Should -Match "$($expectedPrefix)*" + } + + It "Ruby gems permissions are valid" { + "gem install bundle" | Should -ReturnZeroExitCode + "gem uninstall bundle" | Should -ReturnZeroExitCode + } +} diff --git a/images/macos/tests/RubyGem.Tests.ps1 b/images/macos/tests/RubyGem.Tests.ps1 index 5e906096d789..4546c9519565 100644 --- a/images/macos/tests/RubyGem.Tests.ps1 +++ b/images/macos/tests/RubyGem.Tests.ps1 @@ -1,3 +1,4 @@ +Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" $os = Get-OSVersion Describe "RubyGems" { @@ -19,7 +20,7 @@ Describe "Bundler" { } } -Describe "Nomad shenzhen CLI" -Skip:($os.IsMonterey -or $os.IsVentura) { +Describe "Nomad shenzhen CLI" -Skip:($os.IsMonterey -or $os.IsVentura -or $os.IsVenturaArm64) { It "Nomad shenzhen CLI" { "ipa --version" | Should -ReturnZeroExitCode } @@ -37,7 +38,7 @@ Describe "xcpretty" { } } -Describe "jazzy" -Skip:($os.IsVentura) { +Describe "jazzy" -Skip:($os.IsVentura -or $os.IsVenturaArm64) { It "jazzy" { "jazzy --version" | Should -ReturnZeroExitCode } diff --git a/images/macos/tests/Rust.Tests.ps1 b/images/macos/tests/Rust.Tests.ps1 index 585271830458..894ef4431207 100644 --- a/images/macos/tests/Rust.Tests.ps1 +++ b/images/macos/tests/Rust.Tests.ps1 @@ -1,5 +1,3 @@ -$os = Get-OSVersion - Describe "Rust" { Context "Rust" { It "Rustup is installed" { @@ -10,7 +8,7 @@ Describe "Rust" { "rustc --version" | Should -ReturnZeroExitCode } } - + Context "Cargo" { It "Cargo is installed" { "cargo --version" | Should -ReturnZeroExitCode @@ -34,4 +32,4 @@ Describe "Rust" { "cargo outdated --version" | Should -ReturnZeroExitCode } } -} \ No newline at end of file +} diff --git a/images/macos/tests/System.Tests.ps1 b/images/macos/tests/System.Tests.ps1 index 7322062aef3e..c71a2c8f1d45 100644 --- a/images/macos/tests/System.Tests.ps1 +++ b/images/macos/tests/System.Tests.ps1 @@ -25,7 +25,7 @@ Describe "Certificate" { } } -Describe "Audio device" -Skip:($os.IsVentura) { +Describe "Audio device" -Skip:($os.IsVentura -or $os.IsVenturaArm64) { It "Sox is installed" { "sox --version" | Should -ReturnZeroExitCode } @@ -39,13 +39,13 @@ Describe "Audio device" -Skip:($os.IsVentura) { } } -Describe "Screen Resolution" { +Describe "Screen Resolution" -Skip:(isVeertu) { It "Screen Resolution" { system_profiler SPDisplaysDataType | Select-String "Resolution" | Should -Match "1176 x 885|1920 x 1080" } } -Describe "Open windows" { +Describe "Open windows" -Skip:(isVeertu) { It "Opened windows not found" { 'tell application id "com.apple.systemevents" to get every window of (every process whose class of windows contains window)' | Tee-Object /tmp/windows.osascript $cmd = "osascript /tmp/windows.osascript" diff --git a/images/macos/tests/Toolcache.Tests.ps1 b/images/macos/tests/Toolcache.Tests.ps1 index e397ea12218a..ee2b0fe8fc97 100644 --- a/images/macos/tests/Toolcache.Tests.ps1 +++ b/images/macos/tests/Toolcache.Tests.ps1 @@ -1,6 +1,8 @@ Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1" -DisableNameChecking +$os = Get-OSVersion + Describe "Toolcache" { $toolcacheDirectory = Join-Path $env:HOME "hostedtoolcache" [array]$packages += Get-ToolsetValue -KeyPath "toolcache" | ForEach-Object { @@ -11,7 +13,7 @@ Describe "Toolcache" { } } - Context "Python" { + Context "Python" -Skip:($os.IsVenturaArm64) { $pythonDirectory = Join-Path $toolcacheDirectory "Python" $pythonPackage = $packages | Where-Object { $_.ToolName -eq "python" } | Select-Object -First 1 $testCase = @{ PythonDirectory = $pythonDirectory } @@ -54,7 +56,7 @@ Describe "Toolcache" { } } - Context "Ruby" { + Context "Ruby" -Skip:($os.IsVenturaArm64) { $rubyDirectory = Join-Path $toolcacheDirectory "Ruby" $rubyPackage = $packages | Where-Object { $_.ToolName -eq "Ruby" } | Select-Object -First 1 $testCase = @{ RubyDirectory = $rubyDirectory } @@ -96,7 +98,7 @@ Describe "Toolcache" { } } } - Context "PyPy" { + Context "PyPy" -Skip:($os.IsVenturaArm64) { $pypyDirectory = Join-Path $toolcacheDirectory "PyPy" $pypyPackage = $packages | Where-Object { $_.ToolName -eq "pypy" } | Select-Object -First 1 $testCase = @{ PypyDirectory = $pypyDirectory } @@ -140,7 +142,7 @@ Describe "Toolcache" { } } - Context "Node" { + Context "Node" -Skip:($os.IsVenturaArm64) { $nodeDirectory = Join-Path $toolcacheDirectory "node" $nodePackage = $packages | Where-Object { $_.ToolName -eq "node" } | Select-Object -First 1 $testCase = @{ NodeDirectory = $nodeDirectory } @@ -190,7 +192,7 @@ Describe "Toolcache" { } } - Context "Go" { + Context "Go" -Skip:($os.IsVenturaArm64) { $goDirectory = Join-Path $toolcacheDirectory "go" $goPackage = $packages | Where-Object { $_.ToolName -eq "go" } | Select-Object -First 1 $testCase = @{ GoDirectory = $goDirectory } diff --git a/images/macos/tests/WebServers.Tests.ps1 b/images/macos/tests/WebServers.Tests.ps1 index 27eb177898f8..ef0a128b598b 100644 --- a/images/macos/tests/WebServers.Tests.ps1 +++ b/images/macos/tests/WebServers.Tests.ps1 @@ -2,7 +2,7 @@ Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" $os = Get-OSVersion -Describe "Apache" { +Describe "Apache" -Skip:($os.IsVenturaArm64) { It "Apache CLI" { "httpd -v" | Should -ReturnZeroExitCode } @@ -12,7 +12,7 @@ Describe "Apache" { } } -Describe "Nginx" -Skip:($os.IsVentura) { +Describe "Nginx" -Skip:($os.IsVentura -or $os.IsVenturaArm64) { It "Nginx CLI" { "nginx -v" | Should -ReturnZeroExitCode } diff --git a/images/macos/tests/Xamarin.Tests.ps1 b/images/macos/tests/Xamarin.Tests.ps1 index 2c989b5c7c09..ad9e098fa111 100644 --- a/images/macos/tests/Xamarin.Tests.ps1 +++ b/images/macos/tests/Xamarin.Tests.ps1 @@ -18,7 +18,7 @@ BeforeAll { } } -Describe "Mono" -Skip:($os.IsVentura) { +Describe "Mono" -Skip:($os.IsVentura -or $os.IsVenturaArm64) { $MONO_VERSIONS | ForEach-Object { Context "$_" { $MONO_VERSIONS_PATH = "/Library/Frameworks/Mono.framework/Versions" @@ -82,7 +82,7 @@ Describe "Mono" -Skip:($os.IsVentura) { } } -Describe "Xamarin.iOS" -Skip:($os.IsVentura) { +Describe "Xamarin.iOS" -Skip:($os.IsVentura -or $os.IsVenturaArm64) { $XAMARIN_IOS_VERSIONS | ForEach-Object { Context "$_" { $XAMARIN_IOS_VERSIONS_PATH = "/Library/Frameworks/Xamarin.iOS.framework/Versions" @@ -115,7 +115,7 @@ Describe "Xamarin.iOS" -Skip:($os.IsVentura) { } } -Describe "Xamarin.Mac" -Skip:($os.IsVentura) { +Describe "Xamarin.Mac" -Skip:($os.IsVentura-or $os.IsVenturaArm64) { $XAMARIN_MAC_VERSIONS | ForEach-Object { Context "$_" { $XAMARIN_MAC_VERSIONS_PATH = "/Library/Frameworks/Xamarin.Mac.framework/Versions" @@ -148,7 +148,7 @@ Describe "Xamarin.Mac" -Skip:($os.IsVentura) { } } -Describe "Xamarin.Android" -Skip:($os.IsVentura) { +Describe "Xamarin.Android" -Skip:($os.IsVentura -or $os.IsVenturaArm64) { $XAMARIN_ANDROID_VERSIONS | ForEach-Object { Context "$_" { $XAMARIN_ANDROID_VERSIONS_PATH = "/Library/Frameworks/Xamarin.Android.framework/Versions" @@ -188,7 +188,7 @@ Describe "Xamarin.Android" -Skip:($os.IsVentura) { } } -Describe "Xamarin Bundles" -Skip:($os.IsVentura) { +Describe "Xamarin Bundles" -Skip:($os.IsVentura -or $os.IsVenturaArm64) { BeforeAll { $MONO_VERSIONS_PATH = "/Library/Frameworks/Mono.framework/Versions" $XAMARIN_IOS_VERSIONS_PATH = "/Library/Frameworks/Xamarin.iOS.framework/Versions" @@ -293,7 +293,7 @@ Describe "Xamarin Bundles" -Skip:($os.IsVentura) { } } -Describe "Nuget" -Skip:($os.IsVentura) { +Describe "Nuget" -Skip:($os.IsVentura -or $os.IsVenturaArm64) { It "Nuget config contains nuget.org feed" { Get-Content $env:HOME/.config/NuGet/NuGet.Config | Out-String | Should -Match "nuget.org" } diff --git a/images/macos/toolsets/toolset-13.json b/images/macos/toolsets/toolset-13.json index 32206718dd15..5a5a90a591bd 100644 --- a/images/macos/toolsets/toolset-13.json +++ b/images/macos/toolsets/toolset-13.json @@ -1,11 +1,20 @@ { "xcode": { "default": "14.2", - "versions": [ - { "link": "14.3", "version": "14.3.0" }, - { "link": "14.2", "version": "14.2.0" }, - { "link": "14.1", "version": "14.1.0" } - ] + "x64": { + "versions": [ + { "link": "14.3", "version": "14.3.0" }, + { "link": "14.2", "version": "14.2.0" }, + { "link": "14.1", "version": "14.1.0" } + ] + }, + "arm64":{ + "versions": [ + { "link": "14.3", "version": "14.3.0" }, + { "link": "14.2", "version": "14.2.0" }, + { "link": "14.1", "version": "14.1.0" } + ] + } }, "xamarin": { "vsmac": { @@ -80,9 +89,18 @@ ] }, "dotnet": { - "versions": [ - "7.0" - ] + "arch":{ + "x64": { + "versions": [ + "7.0" + ] + }, + "arm64": { + "versions": [ + "7.0" + ] + } + } }, "ruby": { "default": "3.0", From 7503cd841aac98ea6d7a635efe36dcc71838166d Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Fri, 12 May 2023 14:01:36 +0200 Subject: [PATCH 1917/3485] [ubuntu] Remove Python 2.7 from toolcache (#7582) --- images/linux/toolsets/toolset-2004.json | 1 - 1 file changed, 1 deletion(-) diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index 63a438a162cc..83d72f68d514 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -7,7 +7,6 @@ "platform_version": "20.04", "arch": "x64", "versions": [ - "2.7.*", "3.6.*", "3.7.*", "3.8.*", From fe2a4862ad79a83c233f356d07e179478932ea7c Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Fri, 12 May 2023 17:26:27 +0200 Subject: [PATCH 1918/3485] [Windows] Remove Python 2.7 from toolcache (#7583) --- images/win/toolsets/toolset-2019.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index 9718fd121f23..fddb93f92d4c 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -20,7 +20,6 @@ "arch": "x64", "platform" : "win32", "versions": [ - "2.7.*", "3.6.*", "3.7.*", "3.8.*", @@ -36,7 +35,6 @@ "arch": "x86", "platform" : "win32", "versions": [ - "2.7.*", "3.6.*", "3.7.*", "3.8.*", From efe07e28c1a43164e7e705aa2550792f215685c3 Mon Sep 17 00:00:00 2001 From: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com> Date: Mon, 15 May 2023 12:24:20 +0200 Subject: [PATCH 1919/3485] [macos] systeminfo.txt: remove debug leftover (#7592) --- .../macos/software-report/SoftwareReport.Generator.ps1 | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1 index 80172b341658..5aed6ee70e19 100644 --- a/images/macos/software-report/SoftwareReport.Generator.ps1 +++ b/images/macos/software-report/SoftwareReport.Generator.ps1 @@ -302,21 +302,11 @@ PARALLELS_DMG_URL environment variable. A system extension is allowed for this v $miscellaneousEnvNotes.AddNote($notes) } -# -# Generate systeminfo.txt with information about image (for debug purpose) -# -$dateTime = (Get-Date).ToString("yyyy-MM-dd HH:mm:ss") -$systemInfo = [string]::Join([System.Environment]::NewLine, @( - "Date: ${dateTime}", - "Image name: ${ImageName}" - )) - if (-not (Test-Path $OutputDirectory)) { New-Item -Path $OutputDirectory -ItemType Directory | Out-Null } # # Write final reports # Write-Host $markdownExtended -$systemInfo | Out-File -FilePath "${OutputDirectory}/systeminfo.txt" -Encoding UTF8NoBOM $softwareReport.ToJson() | Out-File -FilePath "${OutputDirectory}/systeminfo.json" -Encoding UTF8NoBOM $softwareReport.ToMarkdown() | Out-File -FilePath "${OutputDirectory}/systeminfo.md" -Encoding UTF8NoBOM From 69acda60ece64beb0c97fec19a5fe6641c3393bf Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Mon, 15 May 2023 15:20:01 +0200 Subject: [PATCH 1920/3485] Update labels for CI pipelines (GH actions) (#7598) --- .github/workflows/macos11.yml | 2 +- .github/workflows/macos12.yml | 2 +- .github/workflows/ubuntu2004.yml | 2 +- .github/workflows/ubuntu2204.yml | 2 +- .github/workflows/windows2019.yml | 2 +- .github/workflows/windows2022.yml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/macos11.yml b/.github/workflows/macos11.yml index c9f25a2b9e7a..755266c2ed2b 100644 --- a/.github/workflows/macos11.yml +++ b/.github/workflows/macos11.yml @@ -17,7 +17,7 @@ on: jobs: macOS_11: - if: ${{ (github.event.label.name == 'macos-all') || (github.event.label.name == 'macos-11') || (github.event_name == 'workflow_dispatch') || (github.event_name == 'schedule') }} + if: ${{ (github.event.label.name == 'CI:\ macos-all') || (github.event.label.name == 'CI:\ macos-11') || (github.event_name == 'workflow_dispatch') || (github.event_name == 'schedule') }} name: macOS-11_unstable.${{ github.run_id }}.${{ github.run_attempt }} uses: ./.github/workflows/macos-generation.yml with: diff --git a/.github/workflows/macos12.yml b/.github/workflows/macos12.yml index 6720975e886a..6515c14c098a 100644 --- a/.github/workflows/macos12.yml +++ b/.github/workflows/macos12.yml @@ -17,7 +17,7 @@ on: jobs: macOS_12: - if: ${{ (github.event.label.name == 'macos-all') || (github.event.label.name == 'macos-12') || (github.event_name == 'workflow_dispatch') || (github.event_name == 'schedule') }} + if: ${{ (github.event.label.name == 'CI:\ macos-all') || (github.event.label.name == 'CI:\ macos-12') || (github.event_name == 'workflow_dispatch') || (github.event_name == 'schedule') }} name: macOS-12_unstable.${{ github.run_id }}.${{ github.run_attempt }} uses: ./.github/workflows/macos-generation.yml with: diff --git a/.github/workflows/ubuntu2004.yml b/.github/workflows/ubuntu2004.yml index 512a7837302a..8b06a951f523 100644 --- a/.github/workflows/ubuntu2004.yml +++ b/.github/workflows/ubuntu2004.yml @@ -17,7 +17,7 @@ on: jobs: Ubuntu_2004: - if: ${{ (github.event.label.name == 'ubuntu-all') || (github.event.label.name == 'ubuntu-2004') || (github.event_name == 'workflow_dispatch') || (github.event_name == 'schedule') }} + if: ${{ (github.event.label.name == 'CI:\ ubuntu-all') || (github.event.label.name == 'CI:\ ubuntu-2004') || (github.event_name == 'workflow_dispatch') || (github.event_name == 'schedule') }} uses: ./.github/workflows/ubuntu-win-generation.yml with: image_name: 'ubuntu2004' diff --git a/.github/workflows/ubuntu2204.yml b/.github/workflows/ubuntu2204.yml index da8a718a93aa..702e3fde0e61 100644 --- a/.github/workflows/ubuntu2204.yml +++ b/.github/workflows/ubuntu2204.yml @@ -17,7 +17,7 @@ on: jobs: Ubuntu_2204: - if: ${{ (github.event.label.name == 'ubuntu-all') || (github.event.label.name == 'ubuntu-2204') || (github.event_name == 'workflow_dispatch') || (github.event_name == 'schedule') }} + if: ${{ (github.event.label.name == 'CI:\ ubuntu-all') || (github.event.label.name == 'CI:\ ubuntu-2204') || (github.event_name == 'workflow_dispatch') || (github.event_name == 'schedule') }} uses: ./.github/workflows/ubuntu-win-generation.yml with: image_name: 'ubuntu2204' diff --git a/.github/workflows/windows2019.yml b/.github/workflows/windows2019.yml index d1bec3ed2e5c..7172dad25d84 100644 --- a/.github/workflows/windows2019.yml +++ b/.github/workflows/windows2019.yml @@ -17,7 +17,7 @@ on: jobs: Windows_2019: - if: ${{ (github.event.label.name == 'windows-all') || (github.event.label.name == 'windows-2019') || (github.event_name == 'workflow_dispatch') || (github.event_name == 'schedule') }} + if: ${{ (github.event.label.name == 'CI:\ windows-all') || (github.event.label.name == 'CI:\ windows-2019') || (github.event_name == 'workflow_dispatch') || (github.event_name == 'schedule') }} uses: ./.github/workflows/ubuntu-win-generation.yml with: image_name: 'windows2019' diff --git a/.github/workflows/windows2022.yml b/.github/workflows/windows2022.yml index 1ad40f08fc43..423f8ad8e25f 100644 --- a/.github/workflows/windows2022.yml +++ b/.github/workflows/windows2022.yml @@ -17,7 +17,7 @@ on: jobs: Windows_2022: - if: ${{ (github.event.label.name == 'windows-all') || (github.event.label.name == 'windows-2022') || (github.event_name == 'workflow_dispatch') || (github.event_name == 'schedule') }} + if: ${{ (github.event.label.name == 'CI:\ windows-all') || (github.event.label.name == 'CI:\ windows-2022') || (github.event_name == 'workflow_dispatch') || (github.event_name == 'schedule') }} uses: ./.github/workflows/ubuntu-win-generation.yml with: image_name: 'windows2022' From cc2b556e6568ba325c8548f8d9b0a582d923dc3c Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Mon, 15 May 2023 19:33:52 +0200 Subject: [PATCH 1921/3485] [ubuntu] fix the condition in docker-moby.sh (#7595) --- images/linux/scripts/installers/docker-moby.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/linux/scripts/installers/docker-moby.sh b/images/linux/scripts/installers/docker-moby.sh index c562ea99964b..3db9ae3de7fe 100644 --- a/images/linux/scripts/installers/docker-moby.sh +++ b/images/linux/scripts/installers/docker-moby.sh @@ -29,7 +29,7 @@ systemctl is-enabled --quiet docker.service || systemctl enable docker.service sleep 10 docker info -if [ "${DOCKERHUB_PULL_IMAGES:-yes}" -eq "yes" ]; then +if [ "${DOCKERHUB_PULL_IMAGES:-yes}" == "yes" ]; then # If credentials are provided, attempt to log into Docker Hub # with a paid account to avoid Docker Hub's rate limit. if [ "${DOCKERHUB_LOGIN}" ] && [ "${DOCKERHUB_PASSWORD}" ]; then From 111d6ae5cfff5aae60c748bbe832fe3d06e4bedb Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Tue, 16 May 2023 16:39:03 +0200 Subject: [PATCH 1922/3485] [macos] add architecture references (#7593) --- images/macos/tests/Ruby.arm64.Tests.ps1 | 2 +- images/macos/tests/Xcode.Tests.ps1 | 4 ++- images/macos/toolsets/toolset-11.json | 32 +++++++++++++---------- images/macos/toolsets/toolset-12.json | 34 +++++++++++++++---------- 4 files changed, 43 insertions(+), 29 deletions(-) diff --git a/images/macos/tests/Ruby.arm64.Tests.ps1 b/images/macos/tests/Ruby.arm64.Tests.ps1 index 41fee5f5ab15..2e380ac1bfca 100644 --- a/images/macos/tests/Ruby.arm64.Tests.ps1 +++ b/images/macos/tests/Ruby.arm64.Tests.ps1 @@ -3,7 +3,7 @@ Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1" -DisableNameChecking $os = Get-OSVersion -Describe "Ruby" -Skip:($os.IsVentura) { +Describe "Ruby" -Skip:($os.IsVentura -or $os.IsBigSur -or $os.IsMonterey) { It "Ruby is available" { "ruby --version" | Should -ReturnZeroExitCode } diff --git a/images/macos/tests/Xcode.Tests.ps1 b/images/macos/tests/Xcode.Tests.ps1 index 8c5973e082c9..9abec6586618 100644 --- a/images/macos/tests/Xcode.Tests.ps1 +++ b/images/macos/tests/Xcode.Tests.ps1 @@ -2,7 +2,9 @@ Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" Import-Module "$PSScriptRoot/../helpers/Xcode.Helpers.psm1" Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1" -DisableNameChecking -$xcodeVersions = Get-ToolsetValue "xcode.versions" +$ARCH = arch +if ($ARCH -ne "arm64") { $ARCH = "x64" } +$xcodeVersions = Get-ToolsetValue "xcode.$ARCH.versions" $defaultXcode = Get-ToolsetValue "xcode.default" $latestXcodeVersion = $xcodeVersions | Select-Object -First 1 $os = Get-OSVersion diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index f6f829064fb3..d01248ff7410 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -1,14 +1,16 @@ { "xcode": { "default": "13.2.1", - "versions": [ - { "link": "13.2.1", "version": "13.2.1", "symlinks": ["13.2"] }, - { "link": "13.1", "version": "13.1.0" }, - { "link": "13.0", "version": "13.0.0" }, - { "link": "12.5.1", "version": "12.5.1", "symlinks": ["12.5"] }, - { "link": "12.4", "version": "12.4.0" }, - { "link": "11.7", "version": "11.7.0", "symlinks": ["11.7_beta"] } - ] + "x64": { + "versions": [ + { "link": "13.2.1", "version": "13.2.1", "symlinks": ["13.2"] }, + { "link": "13.1", "version": "13.1.0" }, + { "link": "13.0", "version": "13.0.0" }, + { "link": "12.5.1", "version": "12.5.1", "symlinks": ["12.5"] }, + { "link": "12.4", "version": "12.4.0" }, + { "link": "11.7", "version": "11.7.0", "symlinks": ["11.7_beta"] } + ] + } }, "xamarin": { "vsmac": { @@ -307,11 +309,15 @@ } ], "dotnet": { - "versions": [ - "3.1", - "6.0", - "7.0" - ] + "arch":{ + "x64": { + "versions": [ + "3.1", + "6.0", + "7.0" + ] + } + } }, "ruby": { "default": "2.7", diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index 33db39a32f4a..9abbcfd8c65b 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -1,15 +1,17 @@ { "xcode": { "default": "14.2", - "versions": [ - { "link": "14.2", "version": "14.2.0" }, - { "link": "14.1", "version": "14.1.0" }, - { "link": "14.0.1", "version": "14.0.1", "symlinks": ["14.0"] }, - { "link": "13.4.1", "version": "13.4.1", "symlinks": ["13.4"] }, - { "link": "13.3.1", "version": "13.3.1", "symlinks": ["13.3"] }, - { "link": "13.2.1", "version": "13.2.1", "symlinks": ["13.2"] }, - { "link": "13.1", "version": "13.1.0" } - ] + "x64": { + "versions": [ + { "link": "14.2", "version": "14.2.0" }, + { "link": "14.1", "version": "14.1.0" }, + { "link": "14.0.1", "version": "14.0.1", "symlinks": ["14.0"] }, + { "link": "13.4.1", "version": "13.4.1", "symlinks": ["13.4"] }, + { "link": "13.3.1", "version": "13.3.1", "symlinks": ["13.3"] }, + { "link": "13.2.1", "version": "13.2.1", "symlinks": ["13.2"] }, + { "link": "13.1", "version": "13.1.0" } + ] + } }, "xamarin": { "vsmac": { @@ -290,11 +292,15 @@ } ], "dotnet": { - "versions": [ - "3.1", - "6.0", - "7.0" - ] + "arch":{ + "x64": { + "versions": [ + "3.1", + "6.0", + "7.0" + ] + } + } }, "ruby": { "default": "3.0", From eb53372646a644041ce667ba9075fd800613aee6 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Wed, 17 May 2023 11:39:37 +0200 Subject: [PATCH 1923/3485] [macOS] update scripts to fix image generation (#7608) --- .../macos/anka/CreateCleanAnkaTemplate.ps1 | 19 ++++++++--- images.CI/macos/anka/Service.Helpers.psm1 | 33 ++++++++++++++++--- .../auto-software-update-arm64.exp | 7 ++++ 3 files changed, 50 insertions(+), 9 deletions(-) create mode 100644 images/macos/provision/configuration/auto-software-update-arm64.exp diff --git a/images.CI/macos/anka/CreateCleanAnkaTemplate.ps1 b/images.CI/macos/anka/CreateCleanAnkaTemplate.ps1 index 6c3a90508f53..c7b6c056bba9 100644 --- a/images.CI/macos/anka/CreateCleanAnkaTemplate.ps1 +++ b/images.CI/macos/anka/CreateCleanAnkaTemplate.ps1 @@ -58,6 +58,12 @@ function Invoke-EnableAutoLogon { } function Invoke-SoftwareUpdate { + param ( + [Parameter(Mandatory)] + [ValidateNotNullOrEmpty()] + [string] $Password + ) + if (-not $InstallSoftwareUpdate) { Write-Host "`t[*] Skip installing software updates" return @@ -83,7 +89,7 @@ function Invoke-SoftwareUpdate { Show-StringWithFormat $newUpdates $listOfNewUpdates = $($($newUpdates.Split("*")).Split("Title") | Where-Object {$_ -match "Label:"}).Replace("Label: ", '') Write-Host "`t[*] Installing Software Updates on '$TemplateName' VM:" - Install-SoftwareUpdate -HostName $ipAddress -listOfUpdates $listOfNewUpdates | Show-StringWithFormat + Install-SoftwareUpdate -HostName $ipAddress -listOfUpdates $listOfNewUpdates -Password $Password | Show-StringWithFormat # Check if Action: restart # Make an array of updates @@ -116,6 +122,11 @@ function Invoke-SoftwareUpdate { } function Invoke-UpdateSettings { + param ( + [Parameter(Mandatory)] + [ValidateNotNullOrEmpty()] + [string] $Password + ) $isConfRequired = $InstallSoftwareUpdate -or $EnableAutoLogon if (-not $isConfRequired) { Write-Host "`t[*] Skip additional configuration" @@ -132,7 +143,7 @@ function Invoke-UpdateSettings { Invoke-EnableAutoLogon # Install software updates - Invoke-SoftwareUpdate + Invoke-SoftwareUpdate -Password $Password Write-Host "`t[*] Stopping '$TemplateName' VM" Stop-AnkaVM -VMName $TemplateName @@ -154,7 +165,7 @@ Write-Host "`n[#1] Download macOS application installer:" $shortMacOSVersion = Get-ShortMacOSVersion -MacOSVersion $MacOSVersion if ([string]::IsNullOrEmpty($TemplateName)) { $osArch = $(arch) - if ($osArch -eq "arm64"){ + if ($osArch -eq "arm64") { $macOSInstaller = Get-MacOSIPSWInstaller -MacOSVersion $MacOSVersion -DownloadLatestVersion $DownloadLatestVersion -BetaSearch $BetaSearch $TemplateName = "clean_macos_${shortMacOSVersion}_${osArch}_${DiskSizeGb}gb" } else { @@ -178,7 +189,7 @@ New-AnkaVMTemplate -InstallerPath $macOSInstaller ` -DiskSizeGb $DiskSizeGb | Show-StringWithFormat Write-Host "`n[#3] Configure AutoLogon and/or install software updates:" -Invoke-UpdateSettings +Invoke-UpdateSettings -Password $TemplatePassword Write-Host "`n[#4] Finalization '$TemplateName' configuration and push to the registry:" Write-Host "`t[*] The '$TemplateName' VM status is stopped" diff --git a/images.CI/macos/anka/Service.Helpers.psm1 b/images.CI/macos/anka/Service.Helpers.psm1 index 96a663a189d8..f2ed7dd8663b 100644 --- a/images.CI/macos/anka/Service.Helpers.psm1 +++ b/images.CI/macos/anka/Service.Helpers.psm1 @@ -20,6 +20,24 @@ function Enable-AutoLogon { Invoke-SSHPassCommand -HostName $HostName -Command $command } +function Invoke-SoftwareUpdateArm64 { + param ( + [Parameter(Mandatory)] + [ValidateNotNullOrEmpty()] + [string] $HostName, + + [Parameter(Mandatory)] + [ValidateNotNullOrEmpty()] + [string] $Password + ) + + $url = "https://raw.githubusercontent.com/actions/runner-images/main/images/macos/provision/configuration/auto-software-update-arm64.exp" + $script = Invoke-RestMethod -Uri $url + $base64 = [Convert]::ToBase64String($script.ToCharArray()) + $command = "echo $base64 | base64 --decode > ./auto-software-update-arm64.exp;chmod +x ./auto-software-update-arm64.exp; ./auto-software-update-arm64.exp ${Password};rm ./auto-software-update-arm64.exp" + Invoke-SSHPassCommand -HostName $HostName -Command $command +} + function Get-AvailableVersions { param ( [bool] $IsBeta = $false @@ -229,22 +247,27 @@ function Install-SoftwareUpdate { [Parameter(Mandatory)] [ValidateNotNullOrEmpty()] [string] $HostName, - [array] $listOfUpdates + [array] $listOfUpdates, + [string] $Password ) $osVersion = [Environment]::OSVersion - $osVersionMajorMinor = $osVersion.Version.ToString(2) # If an update is happening on macOS 12 we will use the prepared list of updates, otherwise, we will install all updates. if ($osVersion.Version.Major -eq "12") { foreach ($update in $listOfUpdates){ # Filtering updates that contain "Ventura" word if ($update -notmatch "Ventura") { - $command = "sudo /usr/sbin/softwareupdate --restart --verbose --install $update" + $command = "sudo /usr/sbin/softwareupdate --restart --verbose --install '$($update.trim())'" Invoke-SSHPassCommand -HostName $HostName -Command $command } } } else { - $command = "sudo /usr/sbin/softwareupdate --all --install --restart --verbose" - Invoke-SSHPassCommand -HostName $HostName -Command $command + $osArch = $(arch) + if ($osArch -eq "arm64") { + Invoke-SoftwareUpdateArm64 -HostName $HostName -Password $Password + } else { + $command = "sudo /usr/sbin/softwareupdate --all --install --restart --verbose" + Invoke-SSHPassCommand -HostName $HostName -Command $command + } } } diff --git a/images/macos/provision/configuration/auto-software-update-arm64.exp b/images/macos/provision/configuration/auto-software-update-arm64.exp new file mode 100644 index 000000000000..9ef9da4765a8 --- /dev/null +++ b/images/macos/provision/configuration/auto-software-update-arm64.exp @@ -0,0 +1,7 @@ +#! /usr/bin/expect -f + +set timeout -1 +spawn sudo /usr/sbin/softwareupdate --all --install --restart --verbose +expect "Password*" +send "[lindex $argv 0]\r" +expect eof From 4ca86478ee6f82ab1db6afba3eb3062001865fa9 Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Wed, 17 May 2023 16:42:02 +0200 Subject: [PATCH 1924/3485] Separate VM resizing and moving into two different scripts (#7584) --- .github/workflows/macos-generation.yml | 20 ++++--- images.CI/macos/move-vm.ps1 | 10 +--- images.CI/macos/set-vm-size.ps1 | 73 ++++++++++++++++++++++++++ 3 files changed, 88 insertions(+), 15 deletions(-) create mode 100644 images.CI/macos/set-vm-size.ps1 diff --git a/.github/workflows/macos-generation.yml b/.github/workflows/macos-generation.yml index 51f776f26944..95f8f50838ed 100644 --- a/.github/workflows/macos-generation.yml +++ b/.github/workflows/macos-generation.yml @@ -174,20 +174,28 @@ jobs: - name: Move vm to cold storage and clear datastore tag if: ${{ always() }} run: | - $cpuCount = 3 - $coresPerSocketCount = 3 - $memory = 14336 - ./images.CI/macos/move-vm.ps1 ` -VMName "${{ env.VM_NAME }}" ` -TargetDataStore "${{ inputs.target_datastore }}" ` -VIServer "${{ secrets.VISERVER_V2 }}" ` -VIUserName "${{ secrets.VI_USER_NAME }}" ` -VIPassword "${{ secrets.VI_PASSWORD }}" ` - -JobStatus "${{ job.status }}" ` + -JobStatus "${{ job.status }}" + + - name: Set VM size + run: | + $cpuCount = 3 + $coresPerSocketCount = 3 + $memory = 14336 + + ./images.CI/macos/set-vm-size.ps1 ` + -VMName "${{ env.VM_NAME }}" ` -CpuCount "$cpuCount" ` -CoresPerSocketCount "$coresPerSocketCount" ` - -Memory "$memory" + -Memory "$memory" ` + -VIServer "${{ secrets.VISERVER_V2 }}" ` + -VIUserName "${{ secrets.VI_USER_NAME }}" ` + -VIPassword "${{ secrets.VI_PASSWORD }}" - name: Destroy VM (if build canceled only) if: ${{ cancelled() }} diff --git a/images.CI/macos/move-vm.ps1 b/images.CI/macos/move-vm.ps1 index 4b5cb9e246ad..d3589299adc2 100644 --- a/images.CI/macos/move-vm.ps1 +++ b/images.CI/macos/move-vm.ps1 @@ -66,7 +66,7 @@ try { $vm = Get-VM $VMName if (($env:AGENT_JOBSTATUS -and $env:AGENT_JOBSTATUS -eq 'Failed') -or ($JobStatus -and $JobStatus -eq 'failure')) { try { - if($vm.PowerState -ne "PoweredOff") { + if ($vm.PowerState -ne "PoweredOff") { Stop-VM -VM $vm -Confirm:$false -ErrorAction Stop | Out-Null } Set-VM -VM $vm -Name "${VMName}_failed" -Confirm:$false -ErrorAction Stop | Out-Null @@ -84,11 +84,3 @@ try { Write-Host "##vso[task.LogIssue type=error;]Failed to move VM '$VMName' to target datastore '$TargetDataStore'" exit 1 } - -try { - Write-Host "Change CPU count to $CpuCount, cores count to $CoresPerSocketCount, amount of RAM to $Memory" - $vm | Set-VM -NumCPU $CpuCount -CoresPerSocket $CoresPerSocketCount -MemoryMB $Memory -Confirm:$false -ErrorAction Stop | Out-Null -} catch { - Write-Host "##vso[task.LogIssue type=error;]Failed to change specs for VM '$VMName'" - exit 1 -} diff --git a/images.CI/macos/set-vm-size.ps1 b/images.CI/macos/set-vm-size.ps1 new file mode 100644 index 000000000000..68e63363ccda --- /dev/null +++ b/images.CI/macos/set-vm-size.ps1 @@ -0,0 +1,73 @@ +<# +.SYNOPSIS + +This script sets resources for VM + +.PARAMETER VMName +VM name to resize (Example "macOS-10.15_20201012.4") + +.PARAMETER VIServer +vCenter address (Example "10.0.1.16") + +.PARAMETER VIUserName +vCenter username (Example "Administrator") + +.PARAMETER VIPassword +vCenter password (Example "12345678") + +.PARAMETER CpuCount +Target number of CPUs (Example "3") + +.PARAMETER CoresPerSocketCount +Target number of cores per socket (Example "3") + +.PARAMETER Memory +Target amount of memory in MB (Example "14336") + +#> + +[CmdletBinding()] +param( + [Parameter(Mandatory)] + [ValidateNotNullOrEmpty()] + [string]$VMName, + + [Parameter(Mandatory)] + [ValidateNotNullOrEmpty()] + [string]$VIServer, + + [Parameter(Mandatory)] + [ValidateNotNullOrEmpty()] + [string]$VIUserName, + + [Parameter(Mandatory)] + [ValidateNotNullOrEmpty()] + [string]$VIPassword, + + [Parameter(Mandatory)] + [ValidateNotNullOrEmpty()] + [int32]$CpuCount, + + [Parameter(Mandatory)] + [ValidateNotNullOrEmpty()] + [int32]$CoresPerSocketCount, + + [Parameter(Mandatory)] + [ValidateNotNullOrEmpty()] + [int64]$Memory +) + +# Import helpers module +Import-Module $PSScriptRoot\helpers.psm1 -DisableNameChecking + +# Connection to a vCenter Server system +Connect-VCServer -VIServer $VIServer -VIUserName $VIUserName -VIPassword $VIPassword + +$vm = Get-VM $VMName +try { + Write-Host "Change CPU count to $CpuCount, cores count to $CoresPerSocketCount, amount of RAM to $Memory" + $vm | Set-VM -NumCPU $CpuCount -CoresPerSocket $CoresPerSocketCount -MemoryMB $Memory -Confirm:$false -ErrorAction Stop | Out-Null +} catch { + Write-Host "##vso[task.LogIssue type=error;]Failed to change specs for VM '$VMName'" + exit 1 +} From f2b1fa1399a16caeb27ebc4cf4d5e15b51da8de0 Mon Sep 17 00:00:00 2001 From: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com> Date: Thu, 18 May 2023 09:21:55 +0200 Subject: [PATCH 1925/3485] [macos] enable python3 (and pipx) on macOS13 (#7599) --- images/macos/provision/core/python.sh | 18 +++++---- .../SoftwareReport.Generator.ps1 | 8 ++++ images/macos/templates/macOS-13.anka.pkr.hcl | 1 + images/macos/tests/Python.Tests.ps1 | 37 ++++++++++--------- 4 files changed, 39 insertions(+), 25 deletions(-) diff --git a/images/macos/provision/core/python.sh b/images/macos/provision/core/python.sh index 390a6ee7b0eb..38250d7580ce 100755 --- a/images/macos/provision/core/python.sh +++ b/images/macos/provision/core/python.sh @@ -3,14 +3,16 @@ source ~/utils/utils.sh echo "Installing Python Tooling" -echo "Install latest Python 2" -Python2Url="https://www.python.org/ftp/python/2.7.18/python-2.7.18-macosx10.9.pkg" -download_with_retries $Python2Url "/tmp" "python2.pkg" -sudo installer -pkg /tmp/python2.pkg -target / -pip install --upgrade pip - -echo "Install Python2 certificates" -bash -c "/Applications/Python\ 2.7/Install\ Certificates.command" +if ! is_Veertu; then + echo "Install latest Python 2" + Python2Url="https://www.python.org/ftp/python/2.7.18/python-2.7.18-macosx10.9.pkg" + download_with_retries $Python2Url "/tmp" "python2.pkg" + sudo installer -pkg /tmp/python2.pkg -target / + pip install --upgrade pip + + echo "Install Python2 certificates" + bash -c "/Applications/Python\ 2.7/Install\ Certificates.command" +fi # Close Finder window if is_Veertu; then diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1 index 5aed6ee70e19..08249e864829 100644 --- a/images/macos/software-report/SoftwareReport.Generator.ps1 +++ b/images/macos/software-report/SoftwareReport.Generator.ps1 @@ -52,8 +52,12 @@ $languageAndRuntime.AddToolVersion("Perl", $(Get-PerlVersion)) if (-not $os.IsVenturaArm64) { $languageAndRuntime.AddToolVersion("PHP", $(Get-PHPVersion)) } + if ((-not $os.IsVentura) -and (-not $os.IsVenturaArm64)) { $languageAndRuntime.AddToolVersion("Python", $(Get-PythonVersion)) +} + +if (-not $os.IsVenturaArm64) { $languageAndRuntime.AddToolVersion("Python3", $(Get-Python3Version)) } $languageAndRuntime.AddToolVersion("R", $(Get-RVersion)) @@ -73,9 +77,13 @@ $packageManagement.AddToolVersion("NPM", $(Get-NPMVersion)) if ((-not $os.IsVentura) -and (-not $os.IsVenturaArm64)) { $packageManagement.AddToolVersion("NuGet", $(Get-NuGetVersion)) $packageManagement.AddToolVersion("Pip", $(Get-PipVersion -Version 2)) +} + +if (-not $os.IsVenturaArm64) { $packageManagement.AddToolVersion("Pip3", $(Get-PipVersion -Version 3)) $packageManagement.AddToolVersion("Pipx", $(Get-PipxVersion)) } + $packageManagement.AddToolVersion("RubyGems", $(Get-RubyGemsVersion)) if (-not $os.IsVenturaArm64) { $packageManagement.AddToolVersion("Vcpkg", $(Get-VcpkgVersion)) diff --git a/images/macos/templates/macOS-13.anka.pkr.hcl b/images/macos/templates/macOS-13.anka.pkr.hcl index 28bd20a89635..3e11d06c845a 100644 --- a/images/macos/templates/macOS-13.anka.pkr.hcl +++ b/images/macos/templates/macOS-13.anka.pkr.hcl @@ -163,6 +163,7 @@ build { "./provision/core/open_windows_check.sh", "./provision/core/powershell.sh", "./provision/core/dotnet.sh", + "./provision/core/python.sh", "./provision/core/azcopy.sh", "./provision/core/ruby.sh", "./provision/core/rubygem.sh", diff --git a/images/macos/tests/Python.Tests.ps1 b/images/macos/tests/Python.Tests.ps1 index 15f4e1605462..6433dc7db801 100644 --- a/images/macos/tests/Python.Tests.ps1 +++ b/images/macos/tests/Python.Tests.ps1 @@ -3,19 +3,7 @@ Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1" -DisableNameChecking $os = Get-OSVersion -Describe "Python" -Skip:($os.IsVentura -or $os.IsVenturaArm64) { - It "Python 2 is available" { - "python --version" | Should -ReturnZeroExitCode - } - - It "Python 2 is real 2.x" { - (Get-CommandResult "python --version").Output | Should -BeLike "Python 2.*" - } - - It "Python 2 is installed under /usr/local/bin" { - Get-WhichTool "python" | Should -BeLike "/usr/local/bin*" - } - +Describe "Python3" -Skip:($os.IsVenturaArm64) { It "Python 3 is available" { "python3 --version" | Should -ReturnZeroExitCode } @@ -24,10 +12,6 @@ Describe "Python" -Skip:($os.IsVentura -or $os.IsVenturaArm64) { Get-WhichTool "python3" | Should -BeLike "/usr/local/bin*" } - It "Pip 2 is available" { - "pip --version" | Should -ReturnZeroExitCode - } - It "Pip 3 is available" { "pip3 --version" | Should -ReturnZeroExitCode } @@ -42,6 +26,25 @@ Describe "Python" -Skip:($os.IsVentura -or $os.IsVenturaArm64) { $pip3Path | Should -BeExactly $python3Path } +} + +Describe "Python2" -Skip:($os.IsVenturaArm64 -or $os.IsVentura) { + It "Python 2 is available" { + "python --version" | Should -ReturnZeroExitCode + } + + It "Python 2 is real 2.x" { + (Get-CommandResult "python --version").Output | Should -BeLike "Python 2.*" + } + + It "Python 2 is installed under /usr/local/bin" { + Get-WhichTool "python" | Should -BeLike "/usr/local/bin*" + } + + It "Pip 2 is available" { + "pip --version" | Should -ReturnZeroExitCode + } + It "2to3 symlink does not point to Python 2" { $2to3path = (Get-ChildItem (Get-Command 2to3).Path).Target $2to3path | Should -Not -BeLike '/Frameworks/Python.framework/Versions/2.*' From 7e295782c310c31cdb116e80c87a88b78c6da652 Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Thu, 18 May 2023 07:26:10 +0000 Subject: [PATCH 1926/3485] Add double quote escaping and update documentation (#7613) --- docs/create-image-and-azure-resources.md | 7 ++++++- helpers/GenerateResourcesAndImage.ps1 | 8 ++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/docs/create-image-and-azure-resources.md b/docs/create-image-and-azure-resources.md index 0e94f64dfe1e..6f340b6a62db 100644 --- a/docs/create-image-and-azure-resources.md +++ b/docs/create-image-and-azure-resources.md @@ -57,7 +57,7 @@ In any case you will need these software installed: ``` - [Az Powershell module](https://docs.microsoft.com/en-us/powershell/azure/install-az-ps). - + Run this command in Powershell: ```powershell @@ -92,6 +92,11 @@ Finally, run `GenerateResourcesAndImage` function setting mandatory arguments: i - `AzureLocation` - location where resources will be created (e.g. "East US") - `ImageType` - what image to build (we suggest choosing "UbuntuMinimal" here, other valid options are "Windows2019", "Windows2022", "Ubuntu2004", "Ubuntu2204") +> :warning: When running `GenerateResourcesAndImage` in PowerShell 7.3, following command should be executed first: +> ```powershell +> $PSNativeCommandArgumentPassing = 'Legacy' +> ``` + This function automatically creates all required Azure resources and kicks off packer image generation for the selected image type. When image is ready you may proceed to [deployment](#generated-machine-deployment) diff --git a/helpers/GenerateResourcesAndImage.ps1 b/helpers/GenerateResourcesAndImage.ps1 index df6ca77eb57f..6bd81896b28f 100644 --- a/helpers/GenerateResourcesAndImage.ps1 +++ b/helpers/GenerateResourcesAndImage.ps1 @@ -190,8 +190,8 @@ Function GenerateResourcesAndImage { # Resource group names may contain special characters, that are not allowed in the storage account name $storageAccountName = $storageAccountName.Replace("-", "").Replace("_", "").Replace("(", "").Replace(")", "").ToLower() $storageAccountName += "001" - - + + # Storage Account Name can only be 24 characters long if ($storageAccountName.Length -gt 24){ $storageAccountName = $storageAccountName.Substring(0, 24) @@ -266,10 +266,10 @@ Function GenerateResourcesAndImage { $AgentIp = (Invoke-RestMethod http://ipinfo.io/json).ip Write-Host "Restricting access to packer generated VM to agent IP Address: $AgentIp" } - + if ($builderScriptPath.Contains("pkr.hcl")) { if ($AgentIp) { - $AgentIp = '[ "{0}" ]' -f $AgentIp + $AgentIp = '[ \"{0}\" ]' -f $AgentIp } else { $AgentIp = "[]" } From dbd131cc8844737d7e7a9adb1ea312485e50a27a Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Thu, 18 May 2023 12:17:34 +0200 Subject: [PATCH 1927/3485] Update actions labels (#7614) --- .github/workflows/macos11.yml | 2 +- .github/workflows/macos12.yml | 2 +- .github/workflows/ubuntu2004.yml | 2 +- .github/workflows/ubuntu2204.yml | 2 +- .github/workflows/windows2019.yml | 2 +- .github/workflows/windows2022.yml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/macos11.yml b/.github/workflows/macos11.yml index 755266c2ed2b..e421e096dd96 100644 --- a/.github/workflows/macos11.yml +++ b/.github/workflows/macos11.yml @@ -17,7 +17,7 @@ on: jobs: macOS_11: - if: ${{ (github.event.label.name == 'CI:\ macos-all') || (github.event.label.name == 'CI:\ macos-11') || (github.event_name == 'workflow_dispatch') || (github.event_name == 'schedule') }} + if: ${{ (github.event.label.name == 'CI macos-all') || (github.event.label.name == 'CI macos-11') || (github.event_name == 'workflow_dispatch') || (github.event_name == 'schedule') }} name: macOS-11_unstable.${{ github.run_id }}.${{ github.run_attempt }} uses: ./.github/workflows/macos-generation.yml with: diff --git a/.github/workflows/macos12.yml b/.github/workflows/macos12.yml index 6515c14c098a..9fc11a203c42 100644 --- a/.github/workflows/macos12.yml +++ b/.github/workflows/macos12.yml @@ -17,7 +17,7 @@ on: jobs: macOS_12: - if: ${{ (github.event.label.name == 'CI:\ macos-all') || (github.event.label.name == 'CI:\ macos-12') || (github.event_name == 'workflow_dispatch') || (github.event_name == 'schedule') }} + if: ${{ (github.event.label.name == 'CI macos-all') || (github.event.label.name == 'CI macos-12') || (github.event_name == 'workflow_dispatch') || (github.event_name == 'schedule') }} name: macOS-12_unstable.${{ github.run_id }}.${{ github.run_attempt }} uses: ./.github/workflows/macos-generation.yml with: diff --git a/.github/workflows/ubuntu2004.yml b/.github/workflows/ubuntu2004.yml index 8b06a951f523..17b462675b77 100644 --- a/.github/workflows/ubuntu2004.yml +++ b/.github/workflows/ubuntu2004.yml @@ -17,7 +17,7 @@ on: jobs: Ubuntu_2004: - if: ${{ (github.event.label.name == 'CI:\ ubuntu-all') || (github.event.label.name == 'CI:\ ubuntu-2004') || (github.event_name == 'workflow_dispatch') || (github.event_name == 'schedule') }} + if: ${{ (github.event.label.name == 'CI ubuntu-all') || (github.event.label.name == 'CI ubuntu-2004') || (github.event_name == 'workflow_dispatch') || (github.event_name == 'schedule') }} uses: ./.github/workflows/ubuntu-win-generation.yml with: image_name: 'ubuntu2004' diff --git a/.github/workflows/ubuntu2204.yml b/.github/workflows/ubuntu2204.yml index 702e3fde0e61..bf3ff00f3880 100644 --- a/.github/workflows/ubuntu2204.yml +++ b/.github/workflows/ubuntu2204.yml @@ -17,7 +17,7 @@ on: jobs: Ubuntu_2204: - if: ${{ (github.event.label.name == 'CI:\ ubuntu-all') || (github.event.label.name == 'CI:\ ubuntu-2204') || (github.event_name == 'workflow_dispatch') || (github.event_name == 'schedule') }} + if: ${{ (github.event.label.name == 'CI ubuntu-all') || (github.event.label.name == 'CI ubuntu-2204') || (github.event_name == 'workflow_dispatch') || (github.event_name == 'schedule') }} uses: ./.github/workflows/ubuntu-win-generation.yml with: image_name: 'ubuntu2204' diff --git a/.github/workflows/windows2019.yml b/.github/workflows/windows2019.yml index 7172dad25d84..27d2a082418a 100644 --- a/.github/workflows/windows2019.yml +++ b/.github/workflows/windows2019.yml @@ -17,7 +17,7 @@ on: jobs: Windows_2019: - if: ${{ (github.event.label.name == 'CI:\ windows-all') || (github.event.label.name == 'CI:\ windows-2019') || (github.event_name == 'workflow_dispatch') || (github.event_name == 'schedule') }} + if: ${{ (github.event.label.name == 'CI windows-all') || (github.event.label.name == 'CI windows-2019') || (github.event_name == 'workflow_dispatch') || (github.event_name == 'schedule') }} uses: ./.github/workflows/ubuntu-win-generation.yml with: image_name: 'windows2019' diff --git a/.github/workflows/windows2022.yml b/.github/workflows/windows2022.yml index 423f8ad8e25f..ac7e93fb8786 100644 --- a/.github/workflows/windows2022.yml +++ b/.github/workflows/windows2022.yml @@ -17,7 +17,7 @@ on: jobs: Windows_2022: - if: ${{ (github.event.label.name == 'CI:\ windows-all') || (github.event.label.name == 'CI:\ windows-2022') || (github.event_name == 'workflow_dispatch') || (github.event_name == 'schedule') }} + if: ${{ (github.event.label.name == 'CI windows-all') || (github.event.label.name == 'CI windows-2022') || (github.event_name == 'workflow_dispatch') || (github.event_name == 'schedule') }} uses: ./.github/workflows/ubuntu-win-generation.yml with: image_name: 'windows2022' From 775c64f21c62e17eb414ad61ceebed600c4dc6b4 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Thu, 18 May 2023 12:53:10 +0200 Subject: [PATCH 1928/3485] [macOS] fix preimage data for Ventura (#7594) --- images/macos/provision/configuration/preimagedata.sh | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/images/macos/provision/configuration/preimagedata.sh b/images/macos/provision/configuration/preimagedata.sh index 58891f233b77..de95e4b9f597 100644 --- a/images/macos/provision/configuration/preimagedata.sh +++ b/images/macos/provision/configuration/preimagedata.sh @@ -7,13 +7,18 @@ image_version=$(echo $IMAGE_VERSION | cut -d _ -f 2) os_name=$(sw_vers -productName) os_version=$(sw_vers -productVersion) os_build=$(sw_vers -buildVersion) -label_version=$(echo $os_version | cut -d. -f1,2) label_version=$(echo $os_version | cut -d. -f1) image_label="macos-${label_version}" release_label="macOS-${label_version}" -software_url="https://github.com/actions/runner-images/blob/${release_label}/${image_version}/images/macos/${image_label}-Readme.md" -releaseUrl="https://github.com/actions/runner-images/releases/tag/${release_label}%2F${image_version}" + +if is_Ventura; then + software_url="https://github.com/actions/runner-images/blob/${image_label}/${image_version}/images/macos/${image_label}-Readme.md" + releaseUrl="https://github.com/actions/runner-images/releases/tag/${image_label}%2F${image_version}" +else + software_url="https://github.com/actions/runner-images/blob/${release_label}/${image_version}/images/macos/${image_label}-Readme.md" + releaseUrl="https://github.com/actions/runner-images/releases/tag/${release_label}%2F${image_version}" +fi cat <<EOF > $imagedata_file [ From 92893feef262d0e2bfa571b2f87b798d88a95422 Mon Sep 17 00:00:00 2001 From: Tamerlan Bimzhanov <bimzhanovt.net@gmail.com> Date: Thu, 18 May 2023 17:31:39 +0600 Subject: [PATCH 1929/3485] Fix incorrect Homebrew link in README.md (#7544) --- README.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/README.md b/README.md index 657d02e126b2..9a1cb8a4605b 100644 --- a/README.md +++ b/README.md @@ -112,16 +112,14 @@ latest 2 versions of an OS. We use third-party package managers to install software during the image generation process. The table below lists the package managers and the software installed. > **Note**: third-party repositories are re-evaluated every year to identify if they are still useful and secure. - | Operating system | Package manager | Third-party repos and packages | | :--- | :---: | ---: | | Ubuntu | [APT](https://wiki.debian.org/Apt) | [Eclipse-Temurin (Adoptium)](https://packages.adoptium.net/artifactory/deb) </br> [Erlang](https://packages.erlang-solutions.com/ubuntu) </br>[Firefox](https://launchpad.net/~mozillateam/+archive/ubuntu/ppa) </br> [gcc, gfortran](https://launchpad.net/~ubuntu-toolchain-r/+archive/ubuntu/test) </br> [git](https://launchpad.net/~git-core/+archive/ubuntu/ppa) </br> [HHvm](https://dl.hhvm.com/ubuntu) </br> [PHP](https://launchpad.net/~ondrej/+archive/ubuntu/php) (Ubuntu 20 only) </br> [Mono](https://download.mono-project.com/repo/ubuntu) </br> [PostgreSQL](https://apt.postgresql.org/pub/repos/apt) </br> [R](https://cloud.r-project.org/bin/linux/ubuntu) | | | [pipx](https://pypa.github.io/pipx) | ansible-core </br>yamllint | | Windows | [Chocolatey](https://chocolatey.org) | No third-party repos installed | -| macOS | [Homebrew](https://homebrew.sh) | [aws-cli v2](https://github.com/aws/homebrew-tap) </br> [azure/bicep](https://github.com/Azure/homebrew-bicep) </br> [mongodb/brew](https://github.com/mongodb/homebrew-brew) | +| macOS | [Homebrew](https://brew.sh) | [aws-cli v2](https://github.com/aws/homebrew-tap) </br> [azure/bicep](https://github.com/Azure/homebrew-bicep) </br> [mongodb/brew](https://github.com/mongodb/homebrew-brew) | | | [pipx](https://pypa.github.io/pipx/) | yamllint | - ### Image Deprecation Policy - Images begin the deprecation process of the oldest image label once a new GA OS version has been released. From 9d9b3a110dfc98100cdd09cb2c957b9a768e2979 Mon Sep 17 00:00:00 2001 From: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com> Date: Thu, 18 May 2023 17:08:04 +0200 Subject: [PATCH 1930/3485] [macos] add reties for dotnet download (#7601) --- images/macos/provision/core/dotnet.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/images/macos/provision/core/dotnet.sh b/images/macos/provision/core/dotnet.sh index a7f8a44e7803..6e71ae364b19 100755 --- a/images/macos/provision/core/dotnet.sh +++ b/images/macos/provision/core/dotnet.sh @@ -24,14 +24,15 @@ DOTNET_VERSIONS=($(get_toolset_value ".dotnet.arch[\"$arch\"].versions | .[]")) for DOTNET_VERSION in "${DOTNET_VERSIONS[@]}"; do RELEASE_URL="https://raw.githubusercontent.com/dotnet/core/master/release-notes/${DOTNET_VERSION}/releases.json" + download_with_retries "$RELEASE_URL" "/tmp" "dotnet_${DOTNET_VERSION}.json" if [[ $DOTNET_VERSION == "6.0" ]]; then ARGS_LIST+=( - $(curl -s "$RELEASE_URL" | jq -r 'first(.releases[].sdks[]?.version | select(contains("preview") or contains("rc") | not))') + $(cat /tmp/dotnet_${DOTNET_VERSION}.json | jq -r 'first(.releases[].sdks[]?.version | select(contains("preview") or contains("rc") | not))') ) else ARGS_LIST+=( - $(curl -s "$RELEASE_URL" | \ + $(cat /tmp/dotnet_${DOTNET_VERSION}.json | \ jq -r '.releases[].sdk."version"' | grep -v -E '\-(preview|rc)\d*' | \ sort -r | rev | uniq -s 2 | rev) ) From e1366c9a6fc00e840ee060d5e35e68bd44f9d1ce Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Mon, 22 May 2023 21:52:24 +0200 Subject: [PATCH 1931/3485] [macOS] Fix Python2 installer condition (#7624) --- images/macos/provision/core/python.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/macos/provision/core/python.sh b/images/macos/provision/core/python.sh index 38250d7580ce..287070b1b227 100755 --- a/images/macos/provision/core/python.sh +++ b/images/macos/provision/core/python.sh @@ -3,7 +3,7 @@ source ~/utils/utils.sh echo "Installing Python Tooling" -if ! is_Veertu; then +if is_Monterey || is_BigSur; then echo "Install latest Python 2" Python2Url="https://www.python.org/ftp/python/2.7.18/python-2.7.18-macosx10.9.pkg" download_with_retries $Python2Url "/tmp" "python2.pkg" From 730c1e6bc445e1a615620d7f14355b60d8e7cc10 Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Tue, 23 May 2023 17:13:16 +0200 Subject: [PATCH 1932/3485] Fix url for the Ubuntu 20 libcontainers repo key (#7629) --- images/linux/scripts/installers/containers.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/linux/scripts/installers/containers.sh b/images/linux/scripts/installers/containers.sh index e2cbec09a55e..418494a87a82 100644 --- a/images/linux/scripts/installers/containers.sh +++ b/images/linux/scripts/installers/containers.sh @@ -13,7 +13,7 @@ if isUbuntu20; then REPO_URL="https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable" source /etc/os-release sh -c "echo 'deb ${REPO_URL}/x${NAME}_${VERSION_ID}/ /' > /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list" - wget -qnv https://download.opensuse.org/repositories/devel:kubic:libcontainers:stable/x${NAME}_${VERSION_ID}/Release.key -O Release.key + wget -nv https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/x${NAME}_${VERSION_ID}/Release.key -O Release.key apt-key add Release.key fi From abfa6d46446763a4f50192691cfe0659c6a7dcb6 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Wed, 24 May 2023 10:07:06 +0200 Subject: [PATCH 1933/3485] [Ubuntu] dearmor gpg key for google-cloud-sdk (#7627) --- images/linux/scripts/installers/google-cloud-sdk.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/linux/scripts/installers/google-cloud-sdk.sh b/images/linux/scripts/installers/google-cloud-sdk.sh index 239349be4324..81b91925fa1b 100644 --- a/images/linux/scripts/installers/google-cloud-sdk.sh +++ b/images/linux/scripts/installers/google-cloud-sdk.sh @@ -8,7 +8,7 @@ REPO_URL="https://packages.cloud.google.com/apt" # Install the Google Cloud SDK echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] $REPO_URL cloud-sdk main" > /etc/apt/sources.list.d/google-cloud-sdk.list -wget -q https://packages.cloud.google.com/apt/doc/apt-key.gpg -O /usr/share/keyrings/cloud.google.gpg +wget -qO- https://packages.cloud.google.com/apt/doc/apt-key.gpg | gpg --dearmor > /usr/share/keyrings/cloud.google.gpg apt-get update -y apt-get install -y google-cloud-sdk From 5ec1b1811593048b5a7a20c8144d3ded527b8f85 Mon Sep 17 00:00:00 2001 From: Jongwoo Han <jongwooo.han@gmail.com> Date: Wed, 24 May 2023 17:14:46 +0900 Subject: [PATCH 1934/3485] Correct typo from 'Delimeter' to 'Delimiter' (#7625) --- helpers/software-report-base/SoftwareReport.Nodes.psm1 | 4 ++-- images/win/scripts/ImageHelpers/TestsHelpers.ps1 | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/helpers/software-report-base/SoftwareReport.Nodes.psm1 b/helpers/software-report-base/SoftwareReport.Nodes.psm1 index b126afdf60a6..5d0b1d356215 100644 --- a/helpers/software-report-base/SoftwareReport.Nodes.psm1 +++ b/helpers/software-report-base/SoftwareReport.Nodes.psm1 @@ -279,10 +279,10 @@ class TableNode: BaseNode { $maxColumnWidths = $this.CalculateColumnsWidth() $columnsCount = $maxColumnWidths.Count - $delimeterLine = [String]::Join("|", @("-") * $columnsCount) + $delimiterLine = [String]::Join("|", @("-") * $columnsCount) $sb = [System.Text.StringBuilder]::new() - @($this.Headers) + @($delimeterLine) + $this.Rows | ForEach-Object { + @($this.Headers) + @($delimiterLine) + $this.Rows | ForEach-Object { $sb.Append("|") $row = $_.Split("|") diff --git a/images/win/scripts/ImageHelpers/TestsHelpers.ps1 b/images/win/scripts/ImageHelpers/TestsHelpers.ps1 index 585543840b51..c6667de365ea 100644 --- a/images/win/scripts/ImageHelpers/TestsHelpers.ps1 +++ b/images/win/scripts/ImageHelpers/TestsHelpers.ps1 @@ -113,8 +113,8 @@ function ShouldReturnZeroExitCodeWithParam { while ($delimiterCharacter.Length -le 2) { - $callParameterWithDelimeter = $delimiterCharacter + $CallParameter - $commandToCheck = "$ActualValue $callParameterWithDelimeter" + $callParameterWithDelimiter = $delimiterCharacter + $CallParameter + $commandToCheck = "$ActualValue $callParameterWithDelimiter" [bool]$succeeded = (ShouldReturnZeroExitCode -ActualValue $commandToCheck).Succeeded if ($succeeded) From 7042fdacbc264c5d0f803e38101db3a43712e7c5 Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Wed, 24 May 2023 15:28:29 +0200 Subject: [PATCH 1935/3485] [macOS] Add XCode 14.3.1 for macOS 13 (#7631) --- .github/ISSUE_TEMPLATE/announcement.yml | 1 + .github/ISSUE_TEMPLATE/tool-request.yml | 1 + images/macos/toolsets/toolset-13.json | 2 ++ 3 files changed, 4 insertions(+) diff --git a/.github/ISSUE_TEMPLATE/announcement.yml b/.github/ISSUE_TEMPLATE/announcement.yml index 5a43bde1aa16..4eefc43a051c 100644 --- a/.github/ISSUE_TEMPLATE/announcement.yml +++ b/.github/ISSUE_TEMPLATE/announcement.yml @@ -40,6 +40,7 @@ body: - label: Ubuntu 22.04 - label: macOS 11 - label: macOS 12 + - label: macOS 13 - label: Windows Server 2019 - label: Windows Server 2022 - type: textarea diff --git a/.github/ISSUE_TEMPLATE/tool-request.yml b/.github/ISSUE_TEMPLATE/tool-request.yml index 687118da4ea3..308837bd7e0e 100644 --- a/.github/ISSUE_TEMPLATE/tool-request.yml +++ b/.github/ISSUE_TEMPLATE/tool-request.yml @@ -61,6 +61,7 @@ body: - label: Ubuntu 22.04 - label: macOS 11 - label: macOS 12 + - label: macOS 13 - label: Windows Server 2019 - label: Windows Server 2022 - type: textarea diff --git a/images/macos/toolsets/toolset-13.json b/images/macos/toolsets/toolset-13.json index 5a5a90a591bd..4c3844d1f2c8 100644 --- a/images/macos/toolsets/toolset-13.json +++ b/images/macos/toolsets/toolset-13.json @@ -3,6 +3,7 @@ "default": "14.2", "x64": { "versions": [ + { "link": "14.3.1", "version": "14.3.1" }, { "link": "14.3", "version": "14.3.0" }, { "link": "14.2", "version": "14.2.0" }, { "link": "14.1", "version": "14.1.0" } @@ -10,6 +11,7 @@ }, "arm64":{ "versions": [ + { "link": "14.3.1", "version": "14.3.1" }, { "link": "14.3", "version": "14.3.0" }, { "link": "14.2", "version": "14.2.0" }, { "link": "14.1", "version": "14.1.0" } From 74433f1ca842f1ac25b936a3ffc08810ff09c551 Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Wed, 24 May 2023 15:34:44 +0200 Subject: [PATCH 1936/3485] [macOS] Update condition for automation mode (#7626) --- images/macos/provision/configuration/configure-machine.sh | 2 +- images/macos/tests/System.Tests.ps1 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/images/macos/provision/configuration/configure-machine.sh b/images/macos/provision/configuration/configure-machine.sh index 99b158265c36..2e80198d035c 100644 --- a/images/macos/provision/configuration/configure-machine.sh +++ b/images/macos/provision/configuration/configure-machine.sh @@ -57,7 +57,7 @@ done rm -f ./add-certificate # enable-automationmode-without-authentication -if is_Monterey; then +if ! is_BigSur; then retry=10 while [ $retry -gt 0 ]; do { diff --git a/images/macos/tests/System.Tests.ps1 b/images/macos/tests/System.Tests.ps1 index c71a2c8f1d45..4d56aafcdef2 100644 --- a/images/macos/tests/System.Tests.ps1 +++ b/images/macos/tests/System.Tests.ps1 @@ -55,7 +55,7 @@ Describe "Open windows" -Skip:(isVeertu) { } Describe "AutomationModeTool" { - It "Does not require user authentication" -Skip:(-not $os.IsMonterey) { + It "Does not require user authentication" -Skip:($os.IsBigSur) { automationmodetool | Out-String | Should -Match "DOES NOT REQUIRE" } } From 156ad8a318284c617f76cef1077cd0d64aeb758e Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Wed, 24 May 2023 21:09:38 +0200 Subject: [PATCH 1937/3485] README: explain -latest migration process (#7634) --- README.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/README.md b/README.md index 9a1cb8a4605b..178a42858234 100644 --- a/README.md +++ b/README.md @@ -68,6 +68,14 @@ version for the underlying OS and This image type falls under the customer [SLA](https://github.com/customer-terms/github-online-services-sla) for actions. GA images are eventually deprecated according to our guidelines as we only support the latest 2 versions of an OS. +#### Latest Migration Process + +GitHub Actions and Azure DevOps use the `-latest` YAML label (ex: `ubuntu-latest`, `windows-latest`, and `macos-latest`). These labels point towards the newest stable OS version available. + + +The `-latest` migration process is gradual and happens over 1-2 months in order to allow customers to adapt their workflows to the newest OS version. During this process, any workflow using the `-latest` label, may see changes in the OS version in their workflows or pipelines. To avoid unwanted migration, users can specify a specific OS version in the yaml file (ex: macos-12, windows-2022, ubuntu-22.04). + + ## Image Releases *How to best follow along with changes* From b892aebfe8a9c861adb8472a8e049915aad84411 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Thu, 25 May 2023 19:06:11 +0200 Subject: [PATCH 1938/3485] Update azure function name (#7636) --- README.md | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 178a42858234..9452c1252120 100644 --- a/README.md +++ b/README.md @@ -21,13 +21,13 @@ To build a VM machine from this repo's source, see the [instructions](docs/creat | Image | YAML Label | Included Software | Rollout Progress of Latest Image Release | | --------------------|---------------------|--------------------|---------------------| -| Ubuntu 22.04 | `ubuntu-latest` or `ubuntu-22.04` | [ubuntu-22.04] | [![status22](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu22&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu22&redirect=1) -| Ubuntu 20.04 | `ubuntu-20.04` | [ubuntu-20.04] | [![status20](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu20&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=ubuntu20&redirect=1) -| macOS 13 [beta] | `macos-13` or `macos-13-xl`| [macOS-13](https://github.com/actions/runner-images/blob/main/images/macos/macos-13-Readme.md) | TBD -| macOS 12 | `macos-latest`, `macos-latest-xl`, `macos-12`, or `macos-12-xl`| [macOS-12] | [![statusumac12](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-12&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-12&redirect=1) -| macOS 11 | `macos-11`| [macOS-11] | [![statusmac11](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-11&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-11&redirect=1) -| Windows Server 2022 | `windows-latest` or `windows-2022` | [windows-2022] | [![statuswin22](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=windows-2022&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=windows-2022&redirect=1) | -| Windows Server 2019 | `windows-2019` | [windows-2019] | [![statuswin19](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=windows-2019&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=windows-2019&redirect=1) +| Ubuntu 22.04 | `ubuntu-latest` or `ubuntu-22.04` | [ubuntu-22.04] | [![status22](https://runnerimagesdeploymentstatus.azurewebsites.net/api/status?imageName=ubuntu22&badge=1)](https://runnerimagesdeploymentstatus.azurewebsites.net/api/status?imageName=ubuntu22&redirect=1) +| Ubuntu 20.04 | `ubuntu-20.04` | [ubuntu-20.04] | [![status20](https://runnerimagesdeploymentstatus.azurewebsites.net/api/status?imageName=ubuntu20&badge=1)](https://runnerimagesdeploymentstatus.azurewebsites.net/api/status?imageName=ubuntu20&redirect=1) +| macOS 13 [beta] | `macos-13` or `macos-13-xl`| [macOS-13] | [![statusumac13](https://runnerimagesdeploymentstatus.azurewebsites.net/api/status?imageName=macos-13&badge=1)](https://runnerimagesdeploymentstatus.azurewebsites.net/api/status?imageName=macos-13&redirect=1) +| macOS 12 | `macos-latest`, `macos-latest-xl`, `macos-12`, or `macos-12-xl`| [macOS-12] | [![statusumac12](https://runnerimagesdeploymentstatus.azurewebsites.net/api/status?imageName=macos-12&badge=1)](https://runnerimagesdeploymentstatus.azurewebsites.net/api/status?imageName=macos-12&redirect=1) +| macOS 11 | `macos-11`| [macOS-11] | [![statusmac11](https://runnerimagesdeploymentstatus.azurewebsites.net/api/status?imageName=macos-11&badge=1)](https://runnerimagesdeploymentstatus.azurewebsites.net/api/status?imageName=macos-11&redirect=1) +| Windows Server 2022 | `windows-latest` or `windows-2022` | [windows-2022] | [![statuswin22](https://runnerimagesdeploymentstatus.azurewebsites.net/api/status?imageName=windows-2022&badge=1)](https://runnerimagesdeploymentstatus.azurewebsites.net/api/status?imageName=windows-2022&redirect=1) | +| Windows Server 2019 | `windows-2019` | [windows-2019] | [![statuswin19](https://runnerimagesdeploymentstatus.azurewebsites.net/api/status?imageName=windows-2019&badge=1)](https://runnerimagesdeploymentstatus.azurewebsites.net/api/status?imageName=windows-2019&redirect=1) ### Label scheme @@ -40,6 +40,7 @@ To build a VM machine from this repo's source, see the [instructions](docs/creat [windows-2019]: https://github.com/actions/runner-images/blob/main/images/win/Windows2019-Readme.md [macOS-11]: https://github.com/actions/runner-images/blob/main/images/macos/macos-11-Readme.md [macOS-12]: https://github.com/actions/runner-images/blob/main/images/macos/macos-12-Readme.md +[macOS-13]: https://github.com/actions/runner-images/blob/main/images/macos/macos-13-Readme.md [macOS-10.15]: https://github.com/actions/runner-images/blob/main/images/macos/macos-10.15-Readme.md [self-hosted runners]: https://help.github.com/en/actions/hosting-your-own-runners From 035dc70f77d4353de9fbacd66be4f0797d4d9f62 Mon Sep 17 00:00:00 2001 From: sergei-pyshnoi <121864472+sergei-pyshnoi@users.noreply.github.com> Date: Mon, 29 May 2023 13:32:19 +0200 Subject: [PATCH 1939/3485] [Ubuntu] Add archive.ubuntu.com to sources.list (#7616) --- images/linux/scripts/base/apt-ubuntu-archive.sh | 12 ++++++++++++ images/linux/ubuntu2004.json | 8 ++++++++ images/linux/ubuntu2204.pkr.hcl | 6 ++++++ 3 files changed, 26 insertions(+) create mode 100644 images/linux/scripts/base/apt-ubuntu-archive.sh diff --git a/images/linux/scripts/base/apt-ubuntu-archive.sh b/images/linux/scripts/base/apt-ubuntu-archive.sh new file mode 100644 index 000000000000..0f1b0fa88615 --- /dev/null +++ b/images/linux/scripts/base/apt-ubuntu-archive.sh @@ -0,0 +1,12 @@ +#!/bin/bash -e +################################################################################ +## File: apt-ubuntu-archive.sh +## Desc: Script for adding additional apt repo to /etc/apt/sources.list +################################################################################ + +echo "deb http://archive.ubuntu.com/ubuntu/ $(lsb_release -cs) main restricted" | tee -a /etc/apt/sources.list +echo "deb http://archive.ubuntu.com/ubuntu/ $(lsb_release -cs)-updates main restricted" | tee -a /etc/apt/sources.list + +echo "deb http://security.ubuntu.com/ubuntu/ $(lsb_release -cs)-security main restricted" | tee -a /etc/apt/sources.list +echo "deb http://security.ubuntu.com/ubuntu/ $(lsb_release -cs)-security universe" | tee -a /etc/apt/sources.list +echo "deb http://security.ubuntu.com/ubuntu/ $(lsb_release -cs)-security multiverse" | tee -a /etc/apt/sources.list diff --git a/images/linux/ubuntu2004.json b/images/linux/ubuntu2004.json index b1439dbce226..e89da3bb72cb 100644 --- a/images/linux/ubuntu2004.json +++ b/images/linux/ubuntu2004.json @@ -90,6 +90,14 @@ ], "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" }, + { + "type": "shell", + "script": "{{template_dir}}/scripts/base/apt-ubuntu-archive.sh", + "environment_vars": [ + "DEBIAN_FRONTEND=noninteractive" + ], + "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" + }, { "type": "shell", "script": "{{template_dir}}/scripts/base/limits.sh", diff --git a/images/linux/ubuntu2204.pkr.hcl b/images/linux/ubuntu2204.pkr.hcl index d9da88175b8e..7225623141be 100644 --- a/images/linux/ubuntu2204.pkr.hcl +++ b/images/linux/ubuntu2204.pkr.hcl @@ -198,6 +198,12 @@ build { scripts = ["${path.root}/scripts/base/repos.sh"] } + provisioner "shell" { + environment_vars = ["DEBIAN_FRONTEND=noninteractive"] + execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" + scripts = ["${path.root}/scripts/base/apt-ubuntu-archive.sh"] + } + provisioner "shell" { environment_vars = ["DEBIAN_FRONTEND=noninteractive"] execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" From d5f4ac392411f98ebe20d5ef832740fe4c8228c1 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Thu, 1 Jun 2023 11:50:44 +0200 Subject: [PATCH 1940/3485] [Ubuntu] Update libssl package version (#7655) --- images/linux/scripts/installers/sqlpackage.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/linux/scripts/installers/sqlpackage.sh b/images/linux/scripts/installers/sqlpackage.sh index 388967cb8822..f09571c78777 100644 --- a/images/linux/scripts/installers/sqlpackage.sh +++ b/images/linux/scripts/installers/sqlpackage.sh @@ -10,8 +10,8 @@ source $HELPER_SCRIPTS/os.sh # Install libssl1.1 dependency if isUbuntu22; then - download_with_retries "http://security.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.1f-1ubuntu2.18_amd64.deb" "/tmp" - dpkg -i /tmp/libssl1.1_1.1.1f-1ubuntu2.18_amd64.deb + download_with_retries "http://security.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.1f-1ubuntu2.19_amd64.deb" "/tmp" + dpkg -i /tmp/libssl1.1_1.1.1f-1ubuntu2.19_amd64.deb fi # Install SqlPackage From 9eaafb739e424d68fa4f0b7551baeb972867ef92 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Thu, 1 Jun 2023 17:55:44 +0200 Subject: [PATCH 1941/3485] [Windows] fix choco installation (#7657) --- .../Installers/Install-NET48-devpack.ps1 | 13 ++++++++++++ .../win/scripts/Installers/Install-NET48.ps1 | 6 ++---- images/win/windows2019.json | 20 +++++++++++++++++-- 3 files changed, 33 insertions(+), 6 deletions(-) create mode 100644 images/win/scripts/Installers/Install-NET48-devpack.ps1 diff --git a/images/win/scripts/Installers/Install-NET48-devpack.ps1 b/images/win/scripts/Installers/Install-NET48-devpack.ps1 new file mode 100644 index 000000000000..33d4f355e4cf --- /dev/null +++ b/images/win/scripts/Installers/Install-NET48-devpack.ps1 @@ -0,0 +1,13 @@ +################################################################################ +## File: Install-NET48-devpack.ps1 +## Desc: Install .NET 4.8 devpack +################################################################################ + +# .NET 4.8 Dev pack +$InstallerName = "ndp48-devpack-enu.exe" +$InstallerUrl = "https://download.visualstudio.microsoft.com/download/pr/014120d7-d689-4305-befd-3cb711108212/0307177e14752e359fde5423ab583e43/${InstallerName}" +$ArgumentList = ("Setup", "/passive", "/norestart") + +Install-Binary -Url $InstallerUrl -Name $InstallerName -ArgumentList $ArgumentList + +Invoke-PesterTests -TestFile "Tools" -TestName "NET48" \ No newline at end of file diff --git a/images/win/scripts/Installers/Install-NET48.ps1 b/images/win/scripts/Installers/Install-NET48.ps1 index ef26a3c06082..4e4c507c0941 100644 --- a/images/win/scripts/Installers/Install-NET48.ps1 +++ b/images/win/scripts/Installers/Install-NET48.ps1 @@ -4,10 +4,8 @@ ################################################################################ # .NET 4.8 Dev pack -$InstallerName = "ndp48-devpack-enu.exe" -$InstallerUrl = "https://download.visualstudio.microsoft.com/download/pr/014120d7-d689-4305-befd-3cb711108212/0307177e14752e359fde5423ab583e43/${InstallerName}" +$InstallerName = "ndp48-x86-x64-allos-enu.exe" +$InstallerUrl = "https://download.visualstudio.microsoft.com/download/pr/2d6bb6b2-226a-4baa-bdec-798822606ff1/8494001c276a4b96804cde7829c04d7f/${InstallerName}" $ArgumentList = ("Setup", "/passive", "/norestart") Install-Binary -Url $InstallerUrl -Name $InstallerName -ArgumentList $ArgumentList - -Invoke-PesterTests -TestFile "Tools" -TestName "NET48" \ No newline at end of file diff --git a/images/win/windows2019.json b/images/win/windows2019.json index 03e1a364801d..03f13124d18b 100644 --- a/images/win/windows2019.json +++ b/images/win/windows2019.json @@ -125,6 +125,22 @@ "elevated_user": "{{user `install_user`}}", "elevated_password": "{{user `install_password`}}" }, + { + "type": "powershell", + "valid_exit_codes": [ + 0, + 3010 + ], + "scripts": [ + "{{ template_dir }}/scripts/Installers/Install-NET48.ps1" + ], + "elevated_user": "{{user `install_user`}}", + "elevated_password": "{{user `install_password`}}" + }, + { + "type": "windows-restart", + "restart_timeout": "10m" + }, { "type": "powershell", "environment_vars": [ @@ -170,7 +186,7 @@ "scripts": [ "{{ template_dir }}/scripts/Installers/Install-VS.ps1", "{{ template_dir }}/scripts/Installers/Install-KubernetesTools.ps1", - "{{ template_dir }}/scripts/Installers/Install-NET48.ps1" + "{{ template_dir }}/scripts/Installers/Install-NET48-devpack.ps1" ], "elevated_user": "{{user `install_user`}}", "elevated_password": "{{user `install_password`}}" @@ -345,4 +361,4 @@ ] } ] -} +} \ No newline at end of file From 1b5e9f95d067f13320fa284f75ec6fad633c8203 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Thu, 1 Jun 2023 21:14:51 +0200 Subject: [PATCH 1942/3485] [Windows] fix software report for innosetup (#7658) --- images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 index ebe898c3fca8..543c7553649c 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 @@ -87,7 +87,7 @@ function Get-GitLFSVersion { } function Get-InnoSetupVersion { - $innoSetupVersion = $(choco list --local-only innosetup) | Select-String -Pattern "InnoSetup" + $innoSetupVersion = $(choco list innosetup) | Select-String -Pattern "InnoSetup" return ($innoSetupVersion -replace "^InnoSetup").Trim() } From f4f53c7e6cefd2997e27e41d2daa5efd393cffb0 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 2 Jun 2023 08:54:31 +0000 Subject: [PATCH 1943/3485] Updating readme file for ubuntu20 version 20230517.1 (#7644) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2004-Readme.md | 82 ++++++++++++++----------------- 1 file changed, 38 insertions(+), 44 deletions(-) diff --git a/images/linux/Ubuntu2004-Readme.md b/images/linux/Ubuntu2004-Readme.md index b034bae34c24..12b2332bdb43 100644 --- a/images/linux/Ubuntu2004-Readme.md +++ b/images/linux/Ubuntu2004-Readme.md @@ -1,11 +1,11 @@ | Announcements | |-| -| [python2.7 will be removed from the images on May 15, 2023](https://github.com/actions/runner-images/issues/7401) | +| [python2.7 will be removed from the images on May 22, 2023](https://github.com/actions/runner-images/issues/7401) | *** # Ubuntu 20.04 - OS Version: 20.04.6 LTS -- Kernel Version: 5.15.0-1037-azure -- Image Version: 20230507.1 +- Kernel Version: 5.15.0-1038-azure +- Image Version: 20230517.1 - Systemd version: 245.4-4ubuntu3.21 ## Installed Software @@ -20,7 +20,7 @@ - Erlang rebar3 3.20.0 - GNU C++: 9.4.0, 10.3.0 - GNU Fortran: 9.4.0, 10.3.0 -- Julia 1.8.5 +- Julia 1.9.0 - Kotlin 1.8.21-release-380 - Mono 6.12.0.182 - MSBuild 16.10.1.31701 (Mono 6.12.0.182) @@ -33,8 +33,8 @@ ### Package Management - cpan 1.64 -- Helm 3.11.3 -- Homebrew 4.0.16 +- Helm 3.12.0 +- Homebrew 4.0.18 - Miniconda 23.3.1 - Npm 9.5.1 - NuGet 6.3.1.1 @@ -42,7 +42,7 @@ - Pip3 20.0.2 - Pipx 1.2.0 - RubyGems 3.1.2 -- Vcpkg (build from commit 6a3dd0874) +- Vcpkg (build from commit 7b30311f0) - Yarn 1.22.19 #### Environment variables @@ -64,13 +64,13 @@ to accomplish this. - Gradle 8.1.1 - Lerna 6.6.2 - Maven 3.8.8 -- Sbt 1.8.2 +- Sbt 1.8.3 ### Tools - Ansible 2.13.9 - apt-fast 1.9.12 - AzCopy 10.18.1 - available by `azcopy` and `azcopy10` aliases -- Bazel 6.1.2 +- Bazel 6.2.0 - Bazelisk 1.13.2 - Bicep 0.17.1 - Buildah 1.22.3 @@ -90,9 +90,9 @@ to accomplish this. - Heroku 8.1.3 - HHVM (HipHop VM) 4.172.1 - jq 1.6 -- Kind 0.18.0 -- Kubectl 1.27.1 -- Kustomize 5.0.2 +- Kind 0.19.0 +- Kubectl 1.27.2 +- Kustomize 5.0.3 - Leiningen 2.10.0 - MediaInfo 19.09 - Mercurial 5.3.1 @@ -105,7 +105,7 @@ to accomplish this. - Parcel 2.8.3 - PhantomJS 2.1.1 2.1.1 - Podman 3.4.2 -- Pulumi 3.66.0 +- Pulumi 3.67.1 - R 4.3.0 - Skopeo 1.5.0 - Sphinx Open Source Search Server 2.2.11 @@ -116,29 +116,29 @@ to accomplish this. - zstd 1.5.5 ### CLI Tools -- Alibaba Cloud CLI 3.0.163 -- AWS CLI 2.11.18 +- Alibaba Cloud CLI 3.0.164 +- AWS CLI 2.11.20 - AWS CLI Session Manager Plugin 1.2.463.0 -- AWS SAM CLI 1.82.0 +- AWS SAM CLI 1.84.0 - Azure CLI 2.48.1 - Azure CLI (azure-devops) 0.26.0 -- GitHub CLI 2.28.0 -- Google Cloud SDK 429.0.0 +- GitHub CLI 2.29.0 +- Google Cloud SDK 431.0.0 - Hub CLI 2.14.2 -- Netlify CLI 15.0.0 -- OpenShift CLI 4.12.15 +- Netlify CLI 15.1.1 +- OpenShift CLI 4.12.16 - ORAS CLI 1.0.0 -- Vercel CLI 29.1.1 +- Vercel CLI 29.3.3 ### Java | Version | Vendor | Environment Variable | | ------------------- | --------------- | -------------------- | -| 8.0.362+9 | Eclipse Temurin | JAVA_HOME_8_X64 | +| 8.0.372+7 | Eclipse Temurin | JAVA_HOME_8_X64 | | 11.0.19+7 (default) | Eclipse Temurin | JAVA_HOME_11_X64 | | 17.0.7+7 | Eclipse Temurin | JAVA_HOME_17_X64 | ### PHP Tools -- PHP: 7.4.33, 8.0.28, 8.1.18, 8.2.5 +- PHP: 7.4.33, 8.0.28, 8.1.18, 8.2.6 - Composer 2.5.5 - PHPUnit 8.5.33 ``` @@ -159,20 +159,20 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. #### Packages - Bindgen 0.65.1 -- Cargo audit 0.17.5 +- Cargo audit 0.17.6 - Cargo clippy 0.1.69 - Cargo outdated 0.11.2 - Cbindgen 0.24.3 - Rustfmt 1.5.2 ### Browsers and Drivers -- Google Chrome 113.0.5672.63 +- Google Chrome 113.0.5672.126 - ChromeDriver 113.0.5672.63 - Chromium 113.0.5672.0 -- Microsoft Edge 113.0.1774.35 -- Microsoft Edge WebDriver 113.0.1774.35 +- Microsoft Edge 113.0.1774.42 +- Microsoft Edge WebDriver 113.0.1774.42 - Selenium server 4.9.0 -- Mozilla Firefox 113.0 +- Mozilla Firefox 113.0.1 - Geckodriver 0.33.0 #### Environment variables @@ -184,15 +184,15 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | ### .NET Tools -- .NET Core SDK: 3.1.120, 3.1.202, 3.1.302, 3.1.426, 6.0.408, 7.0.105, 7.0.203 -- nbgv 3.6.128+518ee610d6 +- .NET Core SDK: 3.1.120, 3.1.202, 3.1.302, 3.1.426, 6.0.408, 7.0.105, 7.0.203, 7.0.302 +- nbgv 3.6.132+bc56096f69 ### Databases - MongoDB 5.0.17 - sqlite3 3.31.1 #### PostgreSQL -- PostgreSQL 14.7 +- PostgreSQL 14.8 ``` User: postgres PostgreSQL service is disabled by default. @@ -200,7 +200,7 @@ Use the following command as a part of your job to start the service: 'sudo syst ``` #### MySQL -- MySQL 8.0.32-0ubuntu0.20.04.2 +- MySQL 8.0.33-0ubuntu0.20.04.2 ``` User: root Password: root @@ -210,7 +210,7 @@ Use the following command as a part of your job to start the service: 'sudo syst #### MS SQL - sqlcmd 17.10.0001.1 -- SqlPackage 16.1.8089.0 +- SqlPackage 162.0.52.1 ### Cached Tools @@ -225,7 +225,6 @@ Use the following command as a part of your job to start the service: 'sudo syst - 18.16.0 #### Python -- 2.7.18 - 3.6.15 - 3.7.16 - 3.8.16 @@ -312,7 +311,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | node:18 | sha256:3f567a26b6b6d601fb2b168d4f987b50697617ead15bfc0e0152e600ac48d0fe | 2023-05-04 | | node:18-alpine | sha256:1ccc70acda680aa4ba47f53e7c40b2d4d6892de74817128e0662d32647dd7f4d | 2023-04-13 | | ubuntu:16.04 | sha256:1f1a2d56de1d604801a9671f301190704c25d604a416f59e03c04f5c6ffee0d6 | 2021-08-31 | -| ubuntu:18.04 | sha256:8aa9c2798215f99544d1ce7439ea9c3a6dfd82de607da1cec3a8a2fae005931b | 2023-03-08 | +| ubuntu:18.04 | sha256:14f1045816502e16fcbfc0b2a76747e9f5e40bc3899f8cfe20745abaafeaeab3 | 2023-05-12 | | ubuntu:20.04 | sha256:db8bf6f4fb351aa7a26e27ba2686cf35a6a409f65603e59d4c203e58387dc6b3 | 2023-04-13 | ### Installed apt packages @@ -325,13 +324,11 @@ Use the following command as a part of your job to start the service: 'sudo syst | binutils | 2.34-6ubuntu1.4 | | bison | 2:3.5.1+dfsg-1 | | brotli | 1.0.7-6ubuntu0.1 | -| build-essential | 12.8ubuntu1.1 | -| bzip2 | 1.0.8-2 | | coreutils | 8.30-3ubuntu2 | -| curl | 7.68.0-1ubuntu2.18 | | dbus | 1.12.16-2ubuntu2.3 | | dnsutils | 1:9.16.1-0ubuntu2.14 | | dpkg | 1.19.7ubuntu3.2 | +| dpkg-dev | 1.19.7ubuntu3.2 | | fakeroot | 1.24-1 | | file | 1:5.38-4 | | flex | 2.6.4-6.2 | @@ -342,10 +339,10 @@ Use the following command as a part of your job to start the service: 'sudo syst | imagemagick | 8:6.9.10.23+dfsg-2.1ubuntu11.7 | | iproute2 | 5.5.0-1ubuntu1 | | iputils-ping | 3:20190709-3 | -| jq | 1.6-1ubuntu0.20.04.1 | | lib32z1 | 1:1.2.11.dfsg-2ubuntu1.5 | | libc++-dev | 1:10.0-50\~exp1 | | libc++abi-dev | 1:10.0-50\~exp1 | +| libc6-dev | 2.31-0ubuntu9.9 | | libcurl4 | 7.68.0-1ubuntu2.18 | | libgbm-dev | 21.2.6-0ubuntu0.1\~20.04.2 | | libgconf-2-4 | 3.2.6-6ubuntu1 | @@ -367,7 +364,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | mercurial | 5.3.1-1ubuntu1 | | net-tools | 1.60+git20180626.aebd88e-1ubuntu1 | | netcat | 1.206-1ubuntu1 | -| openssh-client | 1:8.2p1-4ubuntu0.5 | +| openssh-client | 1:8.2p1-4ubuntu0.7 | | p7zip-full | 16.02+dfsg-7build1 | | p7zip-rar | 16.02-3build1 | | parallel | 20161222-1.1 | @@ -381,20 +378,17 @@ Use the following command as a part of your job to start the service: 'sudo syst | shellcheck | 0.7.0-2build2 | | sphinxsearch | 2.2.11-2ubuntu2 | | sqlite3 | 3.31.1-4ubuntu0.5 | -| ssh | 1:8.2p1-4ubuntu0.5 | +| ssh | 1:8.2p1-4ubuntu0.7 | | sshpass | 1.06-1 | | subversion | 1.13.0-3ubuntu0.2 | | sudo | 1.8.31-1ubuntu1.5 | | swig | 4.0.1-5build1 | -| tar | 1.30+dfsg-7ubuntu0.20.04.3 | | telnet | 0.17-41.2build1 | | texinfo | 6.7.0.dfsg.2-5 | | time | 1.7-25.1build1 | | tk | 8.6.9+1 | | tzdata | 2023c-0ubuntu0.20.04.1 | -| unzip | 6.0-25ubuntu1.1 | | upx | 3.95-2build1 | -| wget | 1.20.3-1ubuntu2 | | xorriso | 1.5.2-1 | | xvfb | 2:1.20.13-1ubuntu1\~20.04.8 | | xz-utils | 5.2.4-1ubuntu1.1 | From ccd0f31babb411bad5b9de0f56654d5062959993 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 2 Jun 2023 08:55:20 +0000 Subject: [PATCH 1944/3485] Updating readme file for ubuntu22 version 20230517.1 (#7645) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2204-Readme.md | 73 ++++++++++++++----------------- 1 file changed, 34 insertions(+), 39 deletions(-) diff --git a/images/linux/Ubuntu2204-Readme.md b/images/linux/Ubuntu2204-Readme.md index 57b953229ba0..8048efbcc67f 100644 --- a/images/linux/Ubuntu2204-Readme.md +++ b/images/linux/Ubuntu2204-Readme.md @@ -1,11 +1,11 @@ | Announcements | |-| -| [python2.7 will be removed from the images on May 15, 2023](https://github.com/actions/runner-images/issues/7401) | +| [python2.7 will be removed from the images on May 22, 2023](https://github.com/actions/runner-images/issues/7401) | *** # Ubuntu 22.04 - OS Version: 22.04.2 LTS -- Kernel Version: 5.15.0-1037-azure -- Image Version: 20230507.1 +- Kernel Version: 5.15.0-1038-azure +- Image Version: 20230517.1 - Systemd version: 249.11-0ubuntu3.9 ## Installed Software @@ -18,7 +18,7 @@ - Dash 0.5.11+git20210903+057cd650a4ed-3build1 - GNU C++: 9.5.0, 10.4.0, 11.3.0, 12.1.0 - GNU Fortran: 9.5.0, 10.4.0, 11.3.0, 12.1.0 -- Julia 1.8.5 +- Julia 1.9.0 - Kotlin 1.8.21-release-380 - Mono 6.12.0.182 - MSBuild 16.10.1.31701 (Mono 6.12.0.182) @@ -31,8 +31,8 @@ ### Package Management - cpan 1.64 -- Helm 3.11.3 -- Homebrew 4.0.16 +- Helm 3.12.0 +- Homebrew 4.0.18 - Miniconda 23.3.1 - Npm 9.5.1 - NuGet 6.3.1.1 @@ -40,7 +40,7 @@ - Pip3 22.0.2 - Pipx 1.2.0 - RubyGems 3.3.5 -- Vcpkg (build from commit 6a3dd0874) +- Vcpkg (build from commit 7b30311f0) - Yarn 1.22.19 #### Environment variables @@ -65,7 +65,7 @@ to accomplish this. - Ansible 2.14.5 - apt-fast 1.9.12 - AzCopy 10.18.1 - available by `azcopy` and `azcopy10` aliases -- Bazel 6.1.2 +- Bazel 6.2.0 - Bazelisk 1.13.2 - Bicep 0.17.1 - Buildah 1.23.1 @@ -84,9 +84,9 @@ to accomplish this. - Haveged 1.9.14 - Heroku 8.1.3 - jq 1.6 -- Kind 0.18.0 -- Kubectl 1.27.1 -- Kustomize 5.0.2 +- Kind 0.19.0 +- Kubectl 1.27.2 +- Kustomize 5.0.3 - Leiningen 2.10.0 - MediaInfo 21.09 - Mercurial 6.1.1 @@ -98,7 +98,7 @@ to accomplish this. - Packer 1.8.7 - Parcel 2.8.3 - Podman 3.4.4 -- Pulumi 3.66.0 +- Pulumi 3.67.1 - R 4.3.0 - Skopeo 1.4.1 - Sphinx Open Source Search Server 2.2.11 @@ -109,24 +109,24 @@ to accomplish this. - zstd 1.5.5 ### CLI Tools -- Alibaba Cloud CLI 3.0.163 -- AWS CLI 2.11.18 +- Alibaba Cloud CLI 3.0.164 +- AWS CLI 2.11.20 - AWS CLI Session Manager Plugin 1.2.463.0 -- AWS SAM CLI 1.82.0 +- AWS SAM CLI 1.84.0 - Azure CLI 2.48.1 - Azure CLI (azure-devops) 0.26.0 -- GitHub CLI 2.28.0 -- Google Cloud SDK 429.0.0 +- GitHub CLI 2.29.0 +- Google Cloud SDK 431.0.0 - Hub CLI 2.14.2 -- Netlify CLI 15.0.0 -- OpenShift CLI 4.12.15 +- Netlify CLI 15.1.1 +- OpenShift CLI 4.12.16 - ORAS CLI 1.0.0 -- Vercel CLI 29.1.1 +- Vercel CLI 29.3.3 ### Java | Version | Vendor | Environment Variable | | ------------------- | --------------- | -------------------- | -| 8.0.362+9 | Eclipse Temurin | JAVA_HOME_8_X64 | +| 8.0.372+7 | Eclipse Temurin | JAVA_HOME_8_X64 | | 11.0.19+7 (default) | Eclipse Temurin | JAVA_HOME_11_X64 | | 17.0.7+7 | Eclipse Temurin | JAVA_HOME_17_X64 | @@ -152,20 +152,20 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. #### Packages - Bindgen 0.65.1 -- Cargo audit 0.17.5 +- Cargo audit 0.17.6 - Cargo clippy 0.1.69 - Cargo outdated 0.11.2 - Cbindgen 0.24.3 - Rustfmt 1.5.2 ### Browsers and Drivers -- Google Chrome 113.0.5672.63 +- Google Chrome 113.0.5672.126 - ChromeDriver 113.0.5672.63 - Chromium 113.0.5672.0 -- Microsoft Edge 113.0.1774.35 -- Microsoft Edge WebDriver 113.0.1774.35 +- Microsoft Edge 113.0.1774.42 +- Microsoft Edge WebDriver 113.0.1774.42 - Selenium server 4.9.0 -- Mozilla Firefox 113.0 +- Mozilla Firefox 113.0.1 - Geckodriver 0.33.0 #### Environment variables @@ -177,14 +177,14 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | ### .NET Tools -- .NET Core SDK: 6.0.408, 7.0.105, 7.0.203 -- nbgv 3.6.128+518ee610d6 +- .NET Core SDK: 6.0.408, 7.0.105, 7.0.203, 7.0.302 +- nbgv 3.6.132+bc56096f69 ### Databases - sqlite3 3.37.2 #### PostgreSQL -- PostgreSQL 14.7 +- PostgreSQL 14.8 ``` User: postgres PostgreSQL service is disabled by default. @@ -192,7 +192,7 @@ Use the following command as a part of your job to start the service: 'sudo syst ``` #### MySQL -- MySQL 8.0.32-0ubuntu0.22.04.2 +- MySQL 8.0.33-0ubuntu0.22.04.2 ``` User: root Password: root @@ -202,7 +202,7 @@ Use the following command as a part of your job to start the service: 'sudo syst #### MS SQL - sqlcmd 17.10.0001.1 -- SqlPackage 16.1.8089.0 +- SqlPackage 162.0.52.1 ### Cached Tools @@ -291,7 +291,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | node:16-alpine | sha256:f1657204d3463bce763cefa5b25e48c28af6fe0cdb0f68b354f0f8225ef61be7 | 2023-03-29 | | node:18 | sha256:3f567a26b6b6d601fb2b168d4f987b50697617ead15bfc0e0152e600ac48d0fe | 2023-05-04 | | node:18-alpine | sha256:1ccc70acda680aa4ba47f53e7c40b2d4d6892de74817128e0662d32647dd7f4d | 2023-04-13 | -| ubuntu:18.04 | sha256:8aa9c2798215f99544d1ce7439ea9c3a6dfd82de607da1cec3a8a2fae005931b | 2023-03-08 | +| ubuntu:18.04 | sha256:14f1045816502e16fcbfc0b2a76747e9f5e40bc3899f8cfe20745abaafeaeab3 | 2023-05-12 | | ubuntu:20.04 | sha256:db8bf6f4fb351aa7a26e27ba2686cf35a6a409f65603e59d4c203e58387dc6b3 | 2023-04-13 | | ubuntu:22.04 | sha256:dfd64a3b4296d8c9b62aa3309984f8620b98d87e47492599ee20739e8eb54fbf | 2023-04-25 | @@ -305,13 +305,11 @@ Use the following command as a part of your job to start the service: 'sudo syst | binutils | 2.38-4ubuntu2.1 | | bison | 2:3.8.2+dfsg-1build1 | | brotli | 1.0.9-2build6 | -| build-essential | 12.9ubuntu3 | -| bzip2 | 1.0.8-5build1 | | coreutils | 8.32-4.1ubuntu1 | -| curl | 7.81.0-1ubuntu1.10 | | dbus | 1.12.20-2ubuntu4.1 | | dnsutils | 1:9.18.12-0ubuntu0.22.04.1 | | dpkg | 1.21.1ubuntu2.1 | +| dpkg-dev | 1.21.1ubuntu2.1 | | fakeroot | 1.28-1ubuntu1 | | file | 1:5.41-3 | | flex | 2.6.4-8build2 | @@ -322,10 +320,10 @@ Use the following command as a part of your job to start the service: 'sudo syst | imagemagick | 8:6.9.11.60+dfsg-1.3ubuntu0.22.04.3 | | iproute2 | 5.15.0-1ubuntu2 | | iputils-ping | 3:20211215-1 | -| jq | 1.6-2.1ubuntu3 | | lib32z1 | 1:1.2.11.dfsg-2ubuntu9.2 | | libc++-dev | 1:14.0-55\~exp2 | | libc++abi-dev | 1:14.0-55\~exp2 | +| libc6-dev | 2.35-0ubuntu3.1 | | libcurl4 | 7.81.0-1ubuntu1.10 | | libgbm-dev | 22.2.5-0ubuntu0.1\~22.04.1 | | libgconf-2-4 | 3.2.6-7ubuntu2 | @@ -368,15 +366,12 @@ Use the following command as a part of your job to start the service: 'sudo syst | subversion | 1.14.1-3ubuntu0.22.04.1 | | sudo | 1.9.9-1ubuntu2.4 | | swig | 4.0.2-1ubuntu1 | -| tar | 1.34+dfsg-1ubuntu0.1.22.04.1 | | telnet | 0.17-44build1 | | texinfo | 6.8-4build1 | | time | 1.9-0.1build2 | | tk | 8.6.11+1build2 | | tzdata | 2023c-0ubuntu0.22.04.1 | -| unzip | 6.0-26ubuntu3.1 | | upx | 3.96-3 | -| wget | 1.21.2-2ubuntu1 | | xorriso | 1.5.4-2 | | xvfb | 2:21.1.4-2ubuntu1.7\~22.04.1 | | xz-utils | 5.2.5-2ubuntu1 | From 12d87859541431f0db36119050f103f3e5ff40d4 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 2 Jun 2023 19:42:10 +0200 Subject: [PATCH 1945/3485] Updating readme file for win22 version 20230517.1 (#7647) Co-authored-by: Image generation service account <no-reply@microsoft.com> --- images/win/Windows2022-Readme.md | 586 ++++++++++++++++--------------- 1 file changed, 294 insertions(+), 292 deletions(-) diff --git a/images/win/Windows2022-Readme.md b/images/win/Windows2022-Readme.md index 4e5db12de87d..4b497688b6ed 100644 --- a/images/win/Windows2022-Readme.md +++ b/images/win/Windows2022-Readme.md @@ -1,10 +1,10 @@ | Announcements | |-| -| [python2.7 will be removed from the images on May 15, 2023](https://github.com/actions/runner-images/issues/7401) | +| [python2.7 will be removed from the images on May 22, 2023](https://github.com/actions/runner-images/issues/7401) | *** # Windows Server 2022 -- OS Version: 10.0.20348 Build 1668 -- Image Version: 20230508.3 +- OS Version: 10.0.20348 Build 1726 +- Image Version: 20230517.1 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -14,17 +14,17 @@ ### Language and Runtime - Bash 5.2.15(1)-release - Go 1.20.4 -- Julia 1.8.5 +- Julia 1.9.0 - Kotlin 1.8.21 - LLVM 15.0.7 - Node 18.16.0 - Perl 5.32.1 -- PHP 8.2.5 +- PHP 8.2.6 - Python 3.9.13 - Ruby 3.0.6p216 ### Package Management -- Chocolatey 1.3.1 +- Chocolatey 1.4.0 - Composer 2.5.5 - Helm 3.11.3 - Miniconda 23.3.1 (pre-installed on the image but not added to PATH) @@ -33,7 +33,7 @@ - pip 23.1.2 (python 3.9) - Pipx 1.2.0 - RubyGems 3.2.33 -- Vcpkg (build from commit ea222747b) +- Vcpkg (build from commit 7b30311f0) - Yarn 1.22.19 #### Environment variables @@ -46,29 +46,29 @@ - Ant 1.10.13 - Gradle 8.1 - Maven 3.8.7 -- sbt 1.8.2 +- sbt 1.8.3 ### Tools - 7zip 22.01 - aria2 1.36.0 - azcopy 10.18.1 -- Bazel 6.1.2 +- Bazel 6.2.0 - Bazelisk 1.13.2 - Bicep 0.17.1 - Cabal 3.10.1.0 - CMake 3.26.3 - CodeQL Action Bundles 2.13.0 2.13.1 -- Docker 23.0.6 +- Docker 24.0.0 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.17.3 +- Docker Compose v2 2.18.1 - Docker-wincred 0.7.0 - ghc 9.6.1 - Git 2.40.1.windows.1 - Git LFS 3.3.0 -- ImageMagick 7.1.1-8 +- ImageMagick 7.1.1-9 - InnoSetup 6.2.2 - jq 1.6 -- Kind 0.18.0 +- Kind 0.19.0 - Kubectl 1.27.1 - Mercurial 5.0 - Mingw-w64 11.2.0 @@ -76,7 +76,7 @@ - NSIS 3.08 - OpenSSL 1.1.1t - Packer 1.8.7 -- Pulumi 3.66.0 +- Pulumi 3.67.1 - R 4.3.0 - Service Fabric SDK 9.1.1436.9590 - Stack 2.9.3 @@ -89,13 +89,13 @@ - zstd 1.5.5 ### CLI Tools -- Alibaba Cloud CLI 3.0.163 -- AWS CLI 2.11.17 -- AWS SAM CLI 1.82.0 +- Alibaba Cloud CLI 3.0.164 +- AWS CLI 2.11.20 +- AWS SAM CLI 1.84.0 - AWS Session Manager CLI 1.2.463.0 - Azure CLI 2.48.1 - Azure DevOps CLI extension 0.26.0 -- GitHub CLI 2.28.0 +- GitHub CLI 2.29.0 - Hub CLI 2.14.2 ### Rust Tools @@ -106,18 +106,18 @@ #### Packages - bindgen 0.65.1 -- cargo-audit 0.17.5 +- cargo-audit 0.17.6 - cargo-outdated 0.11.2 - cbindgen 0.24.3 - Clippy 0.1.69 - Rustfmt 1.5.2 ### Browsers and Drivers -- Google Chrome 113.0.5672.93 +- Google Chrome 113.0.5672.127 - Chrome Driver 113.0.5672.63 -- Microsoft Edge 113.0.1774.35 -- Microsoft Edge Driver 113.0.1774.35 -- Mozilla Firefox 112.0.2 +- Microsoft Edge 113.0.1774.42 +- Microsoft Edge Driver 113.0.1774.42 +- Mozilla Firefox 113.0.1 - Gecko Driver 0.33.0 - IE Driver 4.8.0.0 - Selenium server 4.9.0 @@ -190,7 +190,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Property | Value | | -------------------- | ------------------------------------------------------------------------------------------------------------------------------------ | | ServiceName | postgresql-x64-14 | -| Version | 14.7 | +| Version | 14.8 | | ServiceStatus | Stopped | | ServiceStartType | Disabled | | EnvironmentVariables | PGBIN=C:\Program Files\PostgreSQL\14\bin <br> PGDATA=C:\Program Files\PostgreSQL\14\data <br> PGROOT=C:\Program Files\PostgreSQL\14 | @@ -205,7 +205,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Database tools - Azure CosmosDb Emulator 2.14.12.0 -- DacFx 16.1.8089.0 +- DacFx 162.0.52.1 - MySQL 8.0.31.0 - SQL OLEDB Driver 18.6.3.0 - SQLPS 1.0 @@ -219,70 +219,70 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Visual Studio Enterprise 2022 | Name | Version | Path | | ----------------------------- | -------------- | -------------------------------------------------------- | -| Visual Studio Enterprise 2022 | 17.5.33627.172 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | +| Visual Studio Enterprise 2022 | 17.6.33712.159 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | #### Workloads, components and extensions | Package | Version | | ------------------------------------------------------------------------- | -------------- | | android | 33.0.46.0 | -| Component.Android.Emulator.MDD | 17.5.33306.270 | -| Component.Android.NDK.R23C | 17.5.33306.270 | -| Component.Android.SDK.MAUI | 17.5.33306.270 | +| Component.Android.Emulator.MDD | 17.6.33605.316 | +| Component.Android.NDK.R23C | 17.6.33605.316 | +| Component.Android.SDK.MAUI | 17.6.33605.316 | | Component.CPython39.x64 | 3.9.13 | -| Component.Dotfuscator | 17.5.33306.270 | -| Component.HAXM.Private | 17.5.33306.270 | -| Component.Linux.CMake | 17.5.33306.270 | -| Component.Linux.RemoteFileExplorer | 17.5.33306.270 | -| Component.MDD.Android | 17.5.33306.270 | -| Component.MDD.Linux | 17.5.33306.270 | -| Component.MDD.Linux.GCC.arm | 17.5.33306.270 | -| Component.Microsoft.VisualStudio.LiveShare.2022 | 1.0.5784 | -| Component.Microsoft.VisualStudio.RazorExtension | 17.5.33306.270 | -| Component.Microsoft.VisualStudio.Web.AzureFunctions | 17.5.33306.270 | -| Component.Microsoft.Web.LibraryManager | 17.5.33306.270 | -| Component.Microsoft.WebTools.BrowserLink.WebLivePreview | 17.5.143.63911 | +| Component.Dotfuscator | 17.6.33605.316 | +| Component.HAXM.Private | 17.6.33605.316 | +| Component.Linux.CMake | 17.6.33605.316 | +| Component.Linux.RemoteFileExplorer | 17.6.33605.316 | +| Component.MDD.Android | 17.6.33605.316 | +| Component.MDD.Linux | 17.6.33605.316 | +| Component.MDD.Linux.GCC.arm | 17.6.33605.316 | +| Component.Microsoft.VisualStudio.LiveShare.2022 | 1.0.5843 | +| Component.Microsoft.VisualStudio.RazorExtension | 17.6.33605.316 | +| Component.Microsoft.VisualStudio.Web.AzureFunctions | 17.6.33605.316 | +| Component.Microsoft.Web.LibraryManager | 17.6.33605.316 | +| Component.Microsoft.WebTools.BrowserLink.WebLivePreview | 17.6.81.44349 | | Component.Microsoft.Windows.DriverKit | 10.0.22621.0 | -| Component.OpenJDK | 17.5.33306.270 | -| Component.UnityEngine.x64 | 17.5.33306.270 | -| Component.Unreal | 17.5.33306.270 | -| Component.Unreal.Android | 17.5.33306.270 | -| Component.Unreal.Ide | 17.5.33306.270 | +| Component.OpenJDK | 17.6.33605.316 | +| Component.UnityEngine.x64 | 17.6.33605.316 | +| Component.Unreal | 17.6.33605.316 | +| Component.Unreal.Android | 17.6.33605.316 | +| Component.Unreal.Ide | 17.6.33605.316 | | Component.VSInstallerProjects2022 | 2.0.0 | | Component.WixToolset.VisualStudioExtension.Dev17 | 1.0.0.22 | | Component.WixToolset.VisualStudioExtension.Schemas3 | 1.0.0.22 | -| Component.Xamarin | 17.5.33306.270 | -| Component.Xamarin.RemotedSimulator | 17.5.33306.270 | -| ios | 16.2.127.0 | -| maccatalyst | 16.2.127.0 | -| maui.android | 7.0.81.0 | -| maui.blazor | 7.0.81.0 | -| maui.core | 7.0.81.0 | -| maui.ios | 7.0.81.0 | -| maui.maccatalyst | 7.0.81.0 | -| maui.windows | 7.0.81.0 | -| Microsoft.Component.Azure.DataLake.Tools | 17.5.33306.270 | -| Microsoft.Component.ClickOnce | 17.5.33306.270 | -| Microsoft.Component.CodeAnalysis.SDK | 17.5.33306.270 | -| Microsoft.Component.MSBuild | 17.5.33306.270 | -| Microsoft.Component.NetFX.Native | 17.5.33306.270 | -| Microsoft.Component.PythonTools | 17.5.33306.270 | -| Microsoft.Component.PythonTools.Web | 17.5.33306.270 | -| Microsoft.Component.VC.Runtime.UCRTSDK | 17.5.33306.270 | -| Microsoft.ComponentGroup.Blend | 17.5.33306.270 | -| Microsoft.ComponentGroup.ClickOnce.Publish | 17.5.33306.270 | -| Microsoft.Net.Component.4.5.2.TargetingPack | 17.5.33306.270 | -| Microsoft.Net.Component.4.6.2.TargetingPack | 17.5.33306.270 | -| Microsoft.Net.Component.4.6.TargetingPack | 17.5.33306.270 | -| Microsoft.Net.Component.4.7.1.TargetingPack | 17.5.33306.270 | -| Microsoft.Net.Component.4.7.2.TargetingPack | 17.5.33306.270 | -| Microsoft.Net.Component.4.7.TargetingPack | 17.5.33306.270 | -| Microsoft.Net.Component.4.8.1.SDK | 17.5.33306.270 | -| Microsoft.Net.Component.4.8.1.TargetingPack | 17.5.33306.270 | -| Microsoft.Net.Component.4.8.SDK | 17.5.33306.270 | -| Microsoft.Net.Component.4.8.TargetingPack | 17.5.33306.270 | -| Microsoft.Net.ComponentGroup.4.8.DeveloperTools | 17.5.33306.270 | -| Microsoft.Net.ComponentGroup.DevelopmentPrerequisites | 17.5.33306.270 | -| Microsoft.Net.ComponentGroup.TargetingPacks.Common | 17.5.33306.270 | +| Component.Xamarin | 17.6.33605.316 | +| Component.Xamarin.RemotedSimulator | 17.6.33605.316 | +| ios | 16.4.7054.0 | +| maccatalyst | 16.4.7054.0 | +| maui.android | 7.0.86.0 | +| maui.blazor | 7.0.86.0 | +| maui.core | 7.0.86.0 | +| maui.ios | 7.0.86.0 | +| maui.maccatalyst | 7.0.86.0 | +| maui.windows | 7.0.86.0 | +| Microsoft.Component.Azure.DataLake.Tools | 17.6.33605.316 | +| Microsoft.Component.ClickOnce | 17.6.33605.316 | +| Microsoft.Component.CodeAnalysis.SDK | 17.6.33605.316 | +| Microsoft.Component.MSBuild | 17.6.33605.316 | +| Microsoft.Component.NetFX.Native | 17.6.33605.316 | +| Microsoft.Component.PythonTools | 17.6.33605.316 | +| Microsoft.Component.PythonTools.Web | 17.6.33605.316 | +| Microsoft.Component.VC.Runtime.UCRTSDK | 17.6.33605.316 | +| Microsoft.ComponentGroup.Blend | 17.6.33605.316 | +| Microsoft.ComponentGroup.ClickOnce.Publish | 17.6.33605.316 | +| Microsoft.Net.Component.4.5.2.TargetingPack | 17.6.33605.316 | +| Microsoft.Net.Component.4.6.2.TargetingPack | 17.6.33605.316 | +| Microsoft.Net.Component.4.6.TargetingPack | 17.6.33605.316 | +| Microsoft.Net.Component.4.7.1.TargetingPack | 17.6.33605.316 | +| Microsoft.Net.Component.4.7.2.TargetingPack | 17.6.33605.316 | +| Microsoft.Net.Component.4.7.TargetingPack | 17.6.33605.316 | +| Microsoft.Net.Component.4.8.1.SDK | 17.6.33605.316 | +| Microsoft.Net.Component.4.8.1.TargetingPack | 17.6.33605.316 | +| Microsoft.Net.Component.4.8.SDK | 17.6.33605.316 | +| Microsoft.Net.Component.4.8.TargetingPack | 17.6.33605.316 | +| Microsoft.Net.ComponentGroup.4.8.DeveloperTools | 17.6.33605.316 | +| Microsoft.Net.ComponentGroup.DevelopmentPrerequisites | 17.6.33605.316 | +| Microsoft.Net.ComponentGroup.TargetingPacks.Common | 17.6.33605.316 | | microsoft.net.runtime.android | 7.0.523.17405 | | microsoft.net.runtime.android.aot | 7.0.523.17405 | | microsoft.net.runtime.android.aot.net6 | 7.0.523.17405 | @@ -294,205 +294,207 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | microsoft.net.runtime.mono.tooling | 7.0.523.17405 | | microsoft.net.runtime.mono.tooling.net6 | 7.0.523.17405 | | microsoft.net.sdk.emscripten.net7 | 7.0.8.17301 | -| Microsoft.NetCore.Component.DevelopmentTools | 17.5.33306.270 | -| Microsoft.NetCore.Component.Runtime.6.0 | 17.5.33530.320 | -| Microsoft.NetCore.Component.Runtime.7.0 | 17.5.33530.320 | -| Microsoft.NetCore.Component.SDK | 17.5.33530.320 | -| Microsoft.NetCore.Component.Web | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.AppInsights.Tools | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.AspNet | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.AspNet45 | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.Azure.AuthoringTools | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.Azure.ClientLibs | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.Azure.Compute.Emulator | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.Azure.Powershell | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.Azure.ResourceManager.Tools | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.Azure.ServiceFabric.Tools | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.Azure.Waverton | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.Azure.Waverton.BuildTools | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.ClassDesigner | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.CodeMap | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.Common.Azure.Tools | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.CoreEditor | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.Debugger.JustInTime | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.Debugger.Snapshot | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.DiagnosticTools | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.DockerTools | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.DotNetModelBuilder | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.DslTools | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.Embedded | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.EntityFramework | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.FSharp | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.FSharp.Desktop | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.FSharp.WebTemplates | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.GraphDocument | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.Graphics | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.Graphics.Tools | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.IISExpress | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.IntelliCode | 17.5.33331.443 | -| Microsoft.VisualStudio.Component.IntelliTrace.FrontEnd | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.JavaScript.Diagnostics | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.JavaScript.TypeScript | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.LinqToSql | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.LiveUnitTesting | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.ManagedDesktop.Core | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.ManagedDesktop.Prerequisites | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.Merq | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.MonoDebugger | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.MSODBC.SQL | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.MSSQL.CMDLnUtils | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.Node.Tools | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.NuGet | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.NuGet.BuildTools | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.PortableLibrary | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.Roslyn.Compiler | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.Roslyn.LanguageServices | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.SecurityIssueAnalysis | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.Sharepoint.Tools | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.SQL.CLR | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.SQL.DataSources | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.SQL.LocalDB.Runtime | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.SQL.SSDT | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.TeamOffice | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.TestTools.CodedUITest | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.TestTools.WebLoadTest | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.TextTemplating | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.TypeScript.TSServer | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.Unity | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.UWP.VC.ARM64 | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.UWP.VC.ARM64EC | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM.Spectre | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM64 | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM64.Spectre | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM.Spectre | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM64 | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM64.Spectre | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.Spectre | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.ARM | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.ARM.Spectre | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.ARM64 | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.ARM64.Spectre | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.Spectre | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64 | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64.Spectre | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.VC.14.34.17.4.ARM | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.VC.14.34.17.4.ARM.Spectre | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.VC.14.34.17.4.ARM64 | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.VC.14.34.17.4.ARM64.Spectre | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.VC.14.34.17.4.ATL | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.VC.14.34.17.4.ATL.ARM | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.VC.14.34.17.4.ATL.ARM.Spectre | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.VC.14.34.17.4.ATL.ARM64 | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.VC.14.34.17.4.ATL.ARM64.Spectre | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.VC.14.34.17.4.ATL.Spectre | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.VC.14.34.17.4.MFC | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.VC.14.34.17.4.MFC.ARM | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.VC.14.34.17.4.MFC.ARM.Spectre | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.VC.14.34.17.4.MFC.ARM64 | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.VC.14.34.17.4.MFC.ARM64.Spectre | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.VC.14.34.17.4.MFC.Spectre | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.VC.14.34.17.4.x86.x64 | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.VC.14.34.17.4.x86.x64.Spectre | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.VC.ASAN | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.VC.ATL | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.VC.ATL.ARM | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.VC.ATL.ARM.Spectre | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.VC.ATL.ARM64 | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.VC.ATL.ARM64.Spectre | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.VC.ATL.Spectre | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.VC.ATLMFC | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.VC.ATLMFC.Spectre | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.VC.CLI.Support | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.VC.CMake.Project | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.VC.CoreIde | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.VC.DiagnosticTools | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.VC.Llvm.Clang | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.VC.Llvm.ClangToolset | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.VC.MFC.ARM | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.VC.MFC.ARM.Spectre | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.VC.MFC.ARM64 | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.VC.MFC.ARM64.Spectre | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.VC.Modules.x86.x64 | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.VC.Redist.14.Latest | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.VC.Redist.MSM | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.VC.Runtimes.ARM.Spectre | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.VC.Runtimes.ARM64.Spectre | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.VC.Runtimes.ARM64EC.Spectre | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.VC.Runtimes.x86.x64.Spectre | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.VC.TestAdapterForBoostTest | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.VC.TestAdapterForGoogleTest | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.VC.Tools.ARM | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.VC.Tools.ARM64 | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.VC.Tools.ARM64EC | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.VC.Tools.x86.x64 | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.VC.v141.ARM | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.VC.v141.ARM.Spectre | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.VC.v141.ARM64 | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.VC.v141.ARM64.Spectre | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.VC.v141.ATL | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.VC.v141.ATL.Spectre | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.VC.v141.MFC | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.VC.v141.MFC.Spectre | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.VC.v141.x86.x64 | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.VC.v141.x86.x64.Spectre | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.VSSDK | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.Wcf.Tooling | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.Web | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.WebDeploy | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.Windows10SDK | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.Windows10SDK.19041 | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.Windows10SDK.20348 | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.Windows11SDK.22000 | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.Windows11SDK.22621 | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.Workflow | 17.5.33306.270 | -| Microsoft.VisualStudio.Component.WslDebugging | 17.5.33306.270 | -| Microsoft.VisualStudio.ComponentGroup.ArchitectureTools.Native | 17.5.33306.270 | -| Microsoft.VisualStudio.ComponentGroup.Azure.CloudServices | 17.5.33306.270 | -| Microsoft.VisualStudio.ComponentGroup.Azure.Prerequisites | 17.5.33306.270 | -| Microsoft.VisualStudio.ComponentGroup.Azure.ResourceManager.Tools | 17.5.33306.270 | -| Microsoft.VisualStudio.ComponentGroup.AzureFunctions | 17.5.33306.270 | -| Microsoft.VisualStudio.ComponentGroup.Maui.All | 17.5.33306.270 | -| Microsoft.VisualStudio.ComponentGroup.Maui.Android | 17.5.33306.270 | -| Microsoft.VisualStudio.ComponentGroup.Maui.Blazor | 17.5.33306.270 | -| Microsoft.VisualStudio.ComponentGroup.Maui.iOS | 17.5.33306.270 | -| Microsoft.VisualStudio.ComponentGroup.Maui.MacCatalyst | 17.5.33306.270 | -| Microsoft.VisualStudio.ComponentGroup.Maui.Shared | 17.5.33306.270 | -| Microsoft.VisualStudio.ComponentGroup.Maui.Windows | 17.5.33306.270 | -| Microsoft.VisualStudio.ComponentGroup.MSIX.Packaging | 17.5.33306.270 | -| Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core | 17.5.33306.270 | -| Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Llvm.Clang | 17.5.33306.270 | -| Microsoft.VisualStudio.ComponentGroup.UWP.NetCoreAndStandard | 17.5.33306.270 | -| Microsoft.VisualStudio.ComponentGroup.UWP.Support | 17.5.33306.270 | -| Microsoft.VisualStudio.ComponentGroup.UWP.VC.v142 | 17.5.33306.270 | -| Microsoft.VisualStudio.ComponentGroup.UWP.Xamarin | 17.5.33306.270 | -| Microsoft.VisualStudio.ComponentGroup.VC.Tools.142.x86.x64 | 17.5.33306.270 | -| Microsoft.VisualStudio.ComponentGroup.VisualStudioExtension.Prerequisites | 17.5.33306.270 | -| Microsoft.VisualStudio.ComponentGroup.Web | 17.5.33306.270 | -| Microsoft.VisualStudio.ComponentGroup.Web.CloudTools | 17.5.33306.270 | -| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions | 17.5.33306.270 | -| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.CMake | 17.5.33306.270 | -| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.TemplateEngine | 17.5.33306.270 | -| Microsoft.VisualStudio.Workload.Azure | 17.5.33306.270 | -| Microsoft.VisualStudio.Workload.CoreEditor | 17.5.33306.270 | -| Microsoft.VisualStudio.Workload.Data | 17.5.33306.270 | -| Microsoft.VisualStudio.Workload.DataScience | 17.5.33306.270 | -| Microsoft.VisualStudio.Workload.ManagedDesktop | 17.5.33306.270 | -| Microsoft.VisualStudio.Workload.ManagedGame | 17.5.33306.270 | -| Microsoft.VisualStudio.Workload.NativeCrossPlat | 17.5.33306.270 | -| Microsoft.VisualStudio.Workload.NativeDesktop | 17.5.33306.270 | -| Microsoft.VisualStudio.Workload.NativeGame | 17.5.33306.270 | -| Microsoft.VisualStudio.Workload.NativeMobile | 17.5.33306.270 | -| Microsoft.VisualStudio.Workload.NetCrossPlat | 17.5.33306.270 | -| Microsoft.VisualStudio.Workload.NetWeb | 17.5.33306.270 | -| Microsoft.VisualStudio.Workload.Node | 17.5.33306.270 | -| Microsoft.VisualStudio.Workload.Office | 17.5.33306.270 | -| Microsoft.VisualStudio.Workload.Python | 17.5.33306.270 | -| Microsoft.VisualStudio.Workload.Universal | 17.5.33306.270 | -| Microsoft.VisualStudio.Workload.VisualStudioExtension | 17.5.33306.270 | +| Microsoft.NetCore.Component.DevelopmentTools | 17.6.33605.316 | +| Microsoft.NetCore.Component.Runtime.6.0 | 17.6.33711.286 | +| Microsoft.NetCore.Component.Runtime.7.0 | 17.6.33711.286 | +| Microsoft.NetCore.Component.SDK | 17.6.33711.286 | +| Microsoft.NetCore.Component.Web | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.AppInsights.Tools | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.AspNet | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.AspNet45 | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.Azure.AuthoringTools | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.Azure.ClientLibs | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.Azure.Compute.Emulator | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.Azure.Powershell | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.Azure.ResourceManager.Tools | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.Azure.ServiceFabric.Tools | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.Azure.Waverton | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.Azure.Waverton.BuildTools | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.ClassDesigner | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.CodeMap | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.Common.Azure.Tools | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.CoreEditor | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.Debugger.JustInTime | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.Debugger.Snapshot | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.DiagnosticTools | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.DockerTools | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.DotNetModelBuilder | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.DslTools | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.Embedded | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.EntityFramework | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.FSharp | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.FSharp.Desktop | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.FSharp.WebTemplates | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.GraphDocument | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.Graphics | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.Graphics.Tools | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.HLSL | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.IISExpress | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.IntelliCode | 17.6.33625.640 | +| Microsoft.VisualStudio.Component.IntelliTrace.FrontEnd | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.JavaScript.Diagnostics | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.JavaScript.TypeScript | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.LinqToSql | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.LiveUnitTesting | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.ManagedDesktop.Core | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.ManagedDesktop.Prerequisites | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.Merq | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.MonoDebugger | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.MSODBC.SQL | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.MSSQL.CMDLnUtils | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.Node.Tools | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.NuGet | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.NuGet.BuildTools | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.PortableLibrary | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.Roslyn.Compiler | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.Roslyn.LanguageServices | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.SecurityIssueAnalysis | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.Sharepoint.Tools | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.SQL.CLR | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.SQL.DataSources | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.SQL.LocalDB.Runtime | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.SQL.SSDT | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.TeamOffice | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.TestTools.CodedUITest | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.TestTools.WebLoadTest | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.TextTemplating | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.TypeScript.TSServer | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.Unity | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.UWP.VC.ARM64 | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.UWP.VC.ARM64EC | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM.Spectre | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM64 | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM64.Spectre | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM.Spectre | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM64 | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM64.Spectre | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.Spectre | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.ARM | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.ARM.Spectre | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.ARM64 | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.ARM64.Spectre | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.Spectre | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64 | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64.Spectre | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.35.17.5.ARM | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.35.17.5.ARM.Spectre | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.35.17.5.ARM64 | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.35.17.5.ARM64.Spectre | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.35.17.5.ATL | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.35.17.5.ATL.ARM | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.35.17.5.ATL.ARM.Spectre | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.35.17.5.ATL.ARM64 | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.35.17.5.ATL.ARM64.Spectre | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.35.17.5.ATL.Spectre | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.35.17.5.MFC | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.35.17.5.MFC.ARM | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.35.17.5.MFC.ARM.Spectre | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.35.17.5.MFC.ARM64 | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.35.17.5.MFC.ARM64.Spectre | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.35.17.5.MFC.Spectre | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.35.17.5.x86.x64 | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.35.17.5.x86.x64.Spectre | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.ASAN | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.ATL | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.ATL.ARM | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.ATL.ARM.Spectre | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.ATL.ARM64 | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.ATL.ARM64.Spectre | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.ATL.Spectre | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.ATLMFC | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.ATLMFC.Spectre | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.CLI.Support | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.CMake.Project | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.CoreIde | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.DiagnosticTools | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.Llvm.Clang | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.Llvm.ClangToolset | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.MFC.ARM | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.MFC.ARM.Spectre | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.MFC.ARM64 | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.MFC.ARM64.Spectre | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.Modules.x86.x64 | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.Redist.14.Latest | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.Redist.MSM | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.Runtimes.ARM.Spectre | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.Runtimes.ARM64.Spectre | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.Runtimes.ARM64EC.Spectre | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.Runtimes.x86.x64.Spectre | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.TestAdapterForBoostTest | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.TestAdapterForGoogleTest | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.Tools.ARM | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.Tools.ARM64 | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.Tools.ARM64EC | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.Tools.x86.x64 | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.v141.ARM | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.v141.ARM.Spectre | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.v141.ARM64 | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.v141.ARM64.Spectre | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.v141.ATL | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.v141.ATL.Spectre | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.v141.MFC | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.v141.MFC.Spectre | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.v141.x86.x64 | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.v141.x86.x64.Spectre | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.Vcpkg | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VSSDK | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.Wcf.Tooling | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.Web | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.WebDeploy | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.Windows10SDK | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.Windows10SDK.19041 | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.Windows10SDK.20348 | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.Windows11SDK.22000 | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.Windows11SDK.22621 | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.Workflow | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.WslDebugging | 17.6.33605.316 | +| Microsoft.VisualStudio.ComponentGroup.ArchitectureTools.Native | 17.6.33605.316 | +| Microsoft.VisualStudio.ComponentGroup.Azure.CloudServices | 17.6.33605.316 | +| Microsoft.VisualStudio.ComponentGroup.Azure.Prerequisites | 17.6.33605.316 | +| Microsoft.VisualStudio.ComponentGroup.Azure.ResourceManager.Tools | 17.6.33605.316 | +| Microsoft.VisualStudio.ComponentGroup.AzureFunctions | 17.6.33605.316 | +| Microsoft.VisualStudio.ComponentGroup.Maui.All | 17.6.33605.316 | +| Microsoft.VisualStudio.ComponentGroup.Maui.Android | 17.6.33605.316 | +| Microsoft.VisualStudio.ComponentGroup.Maui.Blazor | 17.6.33605.316 | +| Microsoft.VisualStudio.ComponentGroup.Maui.iOS | 17.6.33605.316 | +| Microsoft.VisualStudio.ComponentGroup.Maui.MacCatalyst | 17.6.33605.316 | +| Microsoft.VisualStudio.ComponentGroup.Maui.Shared | 17.6.33605.316 | +| Microsoft.VisualStudio.ComponentGroup.Maui.Windows | 17.6.33605.316 | +| Microsoft.VisualStudio.ComponentGroup.MSIX.Packaging | 17.6.33605.316 | +| Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core | 17.6.33605.316 | +| Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Llvm.Clang | 17.6.33605.316 | +| Microsoft.VisualStudio.ComponentGroup.UWP.NetCoreAndStandard | 17.6.33605.316 | +| Microsoft.VisualStudio.ComponentGroup.UWP.Support | 17.6.33605.316 | +| Microsoft.VisualStudio.ComponentGroup.UWP.VC.v142 | 17.6.33605.316 | +| Microsoft.VisualStudio.ComponentGroup.UWP.Xamarin | 17.6.33605.316 | +| Microsoft.VisualStudio.ComponentGroup.VC.Tools.142.x86.x64 | 17.6.33605.316 | +| Microsoft.VisualStudio.ComponentGroup.VisualStudioExtension.Prerequisites | 17.6.33605.316 | +| Microsoft.VisualStudio.ComponentGroup.Web | 17.6.33605.316 | +| Microsoft.VisualStudio.ComponentGroup.Web.CloudTools | 17.6.33605.316 | +| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions | 17.6.33605.316 | +| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.CMake | 17.6.33605.316 | +| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.TemplateEngine | 17.6.33605.316 | +| Microsoft.VisualStudio.Workload.Azure | 17.6.33605.316 | +| Microsoft.VisualStudio.Workload.CoreEditor | 17.6.33605.316 | +| Microsoft.VisualStudio.Workload.Data | 17.6.33605.316 | +| Microsoft.VisualStudio.Workload.DataScience | 17.6.33605.316 | +| Microsoft.VisualStudio.Workload.ManagedDesktop | 17.6.33605.316 | +| Microsoft.VisualStudio.Workload.ManagedGame | 17.6.33605.316 | +| Microsoft.VisualStudio.Workload.NativeCrossPlat | 17.6.33605.316 | +| Microsoft.VisualStudio.Workload.NativeDesktop | 17.6.33605.316 | +| Microsoft.VisualStudio.Workload.NativeGame | 17.6.33605.316 | +| Microsoft.VisualStudio.Workload.NativeMobile | 17.6.33605.316 | +| Microsoft.VisualStudio.Workload.NetCrossPlat | 17.6.33605.316 | +| Microsoft.VisualStudio.Workload.NetWeb | 17.6.33605.316 | +| Microsoft.VisualStudio.Workload.Node | 17.6.33605.316 | +| Microsoft.VisualStudio.Workload.Office | 17.6.33605.316 | +| Microsoft.VisualStudio.Workload.Python | 17.6.33605.316 | +| Microsoft.VisualStudio.Workload.Universal | 17.6.33605.316 | +| Microsoft.VisualStudio.Workload.VisualStudioExtension | 17.6.33605.316 | | runtimes.ios | 7.0.523.17405 | | runtimes.ios.net6 | 7.0.523.17405 | | runtimes.maccatalyst | 7.0.523.17405 | @@ -511,12 +513,12 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | -------------------------------------------- | ------------ | ----------- | | Microsoft Visual C++ 2013 Additional Runtime | x64 | 12.0.40660 | | Microsoft Visual C++ 2013 Minimum Runtime | x64 | 12.0.40660 | -| Microsoft Visual C++ 2022 Additional Runtime | x64 | 14.34.31938 | -| Microsoft Visual C++ 2022 Debug Runtime | x64 | 14.34.31938 | -| Microsoft Visual C++ 2022 Minimum Runtime | x64 | 14.34.31938 | -| Microsoft Visual C++ 2022 Additional Runtime | x86 | 14.34.31938 | -| Microsoft Visual C++ 2022 Debug Runtime | x86 | 14.34.31938 | -| Microsoft Visual C++ 2022 Minimum Runtime | x86 | 14.34.31938 | +| Microsoft Visual C++ 2022 Additional Runtime | x64 | 14.36.32532 | +| Microsoft Visual C++ 2022 Debug Runtime | x64 | 14.36.32532 | +| Microsoft Visual C++ 2022 Minimum Runtime | x64 | 14.36.32532 | +| Microsoft Visual C++ 2022 Additional Runtime | x86 | 14.36.32532 | +| Microsoft Visual C++ 2022 Debug Runtime | x86 | 14.36.32532 | +| Microsoft Visual C++ 2022 Minimum Runtime | x86 | 14.36.32532 | #### Installed Windows SDKs - 10.0.17763.0 @@ -526,12 +528,12 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 10.0.22621.0 ### .NET Core Tools -- .NET Core SDK: 3.1.120, 3.1.202, 3.1.302, 3.1.426, 6.0.116, 6.0.203, 6.0.311, 6.0.408, 7.0.203 +- .NET Core SDK: 3.1.120, 3.1.202, 3.1.302, 3.1.426, 6.0.116, 6.0.203, 6.0.311, 6.0.408, 7.0.302 - .NET Framework: 4.8, 4.8.1 - Microsoft.AspNetCore.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 6.0.5, 6.0.16, 7.0.5 - Microsoft.NETCore.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 6.0.5, 6.0.16, 7.0.5 - Microsoft.WindowsDesktop.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 6.0.5, 6.0.16, 7.0.5 -- nbgv 3.6.128+518ee610d6 +- nbgv 3.6.132+bc56096f69 ### PowerShell Tools - PowerShell 7.2.11 @@ -543,7 +545,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Az (Cached): 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.328 +- AWSPowershell: 4.1.334 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 - Microsoft.Graph: 1.27.0 @@ -587,9 +589,9 @@ All other versions are saved but not installed. ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2022 | sha256:895d54e36db3f37fa4b2b408461b86f4fb83183a6bf2f59dbbbec5799ffb3d97 | 2023-04-11 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2022 | sha256:467ef0cb2dad67d142a1f35118c91d8546c568cdbf31c43c8b88bdf2394b09ea | 2023-04-11 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:7c1a30361c6e0573c4c066204a71a864cd9ab7da97a37f29742a376bac8b4ac9 | 2023-04-11 | -| mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:108081bc6b06fe1c5edea2373c1ea07240276a205ea91f52ebcb0303a0341611 | 2023-04-05 | -| mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:c9431e0418d696363cb228e248a9af752252b2cf272bc55705c1df7fec61ddec | 2023-04-05 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2022 | sha256:45633555c20a487ddaf15ff3834acbaae814239e297d52f022bb710221b44f5b | 2023-05-09 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2022 | sha256:40777910f78729f9dd29f0ee129fa59a09aaf916ea2aa4b49e9f84e44cdfb206 | 2023-05-09 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:2d8fc8aa28fd949bc0b1728f6739e35982ba62ec5a89f47512384f786cd25cc9 | 2023-05-16 | +| mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:dffd1e0990e23f9dd85358cd178b25be3c8253a24e5fb8ebe0bd1740a9d28f94 | 2023-05-05 | +| mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:2710869ec9a4fb04aa8410502b0bad2ae5a4d63ac89a44566965278dbdc4272d | 2023-05-05 | From be83ef6796f69c338919a6cd83ac4cf69393fdd2 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 2 Jun 2023 19:42:34 +0200 Subject: [PATCH 1946/3485] Updating readme file for win19 version 20230517.1 (#7646) Co-authored-by: Image generation service account <no-reply@microsoft.com> --- images/win/Windows2019-Readme.md | 75 ++++++++++++++++---------------- 1 file changed, 37 insertions(+), 38 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index 0867910caa1a..f5dd95fa3ef6 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -1,10 +1,10 @@ | Announcements | |-| -| [python2.7 will be removed from the images on May 15, 2023](https://github.com/actions/runner-images/issues/7401) | +| [python2.7 will be removed from the images on May 22, 2023](https://github.com/actions/runner-images/issues/7401) | *** # Windows Server 2019 -- OS Version: 10.0.17763 Build 4252 -- Image Version: 20230508.1 +- OS Version: 10.0.17763 Build 4377 +- Image Version: 20230517.1 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -14,17 +14,17 @@ ### Language and Runtime - Bash 5.2.15(1)-release - Go 1.20.4 -- Julia 1.8.5 +- Julia 1.9.0 - Kotlin 1.8.21 - LLVM 15.0.7 - Node 18.16.0 - Perl 5.32.1 -- PHP 8.2.5 +- PHP 8.2.6 - Python 3.7.9 - Ruby 2.5.9p229 ### Package Management -- Chocolatey 1.3.1 +- Chocolatey 1.4.0 - Composer 2.5.5 - Helm 3.11.3 - Miniconda 23.3.1 (pre-installed on the image but not added to PATH) @@ -33,7 +33,7 @@ - pip 23.1.2 (python 3.7) - Pipx 1.2.0 - RubyGems 2.7.6.3 -- Vcpkg (build from commit ea222747b) +- Vcpkg (build from commit 7b30311f0) - Yarn 1.22.19 #### Environment variables @@ -46,30 +46,30 @@ - Ant 1.10.13 - Gradle 8.1 - Maven 3.8.7 -- sbt 1.8.2 +- sbt 1.8.3 ### Tools - 7zip 22.01 - aria2 1.36.0 - azcopy 10.18.1 -- Bazel 6.1.2 +- Bazel 6.2.0 - Bazelisk 1.13.2 - Bicep 0.17.1 - Cabal 3.10.1.0 - CMake 3.26.3 - CodeQL Action Bundles 2.13.0 2.13.1 -- Docker 23.0.6 +- Docker 24.0.0 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.17.3 +- Docker Compose v2 2.18.1 - Docker-wincred 0.7.0 - ghc 9.6.1 - Git 2.40.1.windows.1 - Git LFS 3.3.0 -- Google Cloud SDK 429.0.0 -- ImageMagick 7.1.1-8 +- Google Cloud SDK 431.0.0 +- ImageMagick 7.1.1-9 - InnoSetup 6.2.2 - jq 1.6 -- Kind 0.18.0 +- Kind 0.19.0 - Kubectl 1.27.1 - Mercurial 5.0 - Mingw-w64 8.1.0 @@ -78,7 +78,7 @@ - OpenSSL 1.1.1t - Packer 1.8.7 - Parcel 2.8.3 -- Pulumi 3.66.0 +- Pulumi 3.67.1 - R 4.3.0 - Service Fabric SDK 9.1.1436.9590 - Stack 2.9.3 @@ -91,14 +91,14 @@ - zstd 1.5.5 ### CLI Tools -- Alibaba Cloud CLI 3.0.163 -- AWS CLI 2.11.17 -- AWS SAM CLI 1.82.0 +- Alibaba Cloud CLI 3.0.164 +- AWS CLI 2.11.20 +- AWS SAM CLI 1.84.0 - AWS Session Manager CLI 1.2.463.0 - Azure CLI 2.48.1 - Azure DevOps CLI extension 0.26.0 - Cloud Foundry CLI 6.53.0 -- GitHub CLI 2.28.0 +- GitHub CLI 2.29.0 - Hub CLI 2.14.2 ### Rust Tools @@ -109,18 +109,18 @@ #### Packages - bindgen 0.65.1 -- cargo-audit 0.17.5 +- cargo-audit 0.17.6 - cargo-outdated 0.11.2 - cbindgen 0.24.3 - Clippy 0.1.69 - Rustfmt 1.5.2 ### Browsers and Drivers -- Google Chrome 113.0.5672.93 +- Google Chrome 113.0.5672.127 - Chrome Driver 113.0.5672.63 -- Microsoft Edge 113.0.1774.35 -- Microsoft Edge Driver 113.0.1774.35 -- Mozilla Firefox 112.0.2 +- Microsoft Edge 113.0.1774.42 +- Microsoft Edge Driver 113.0.1774.42 +- Mozilla Firefox 113.0.1 - Gecko Driver 0.33.0 - IE Driver 4.8.0.0 - Selenium server 4.9.0 @@ -174,7 +174,6 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 18.16.0 #### Python -- 2.7.18 - 3.6.8 - 3.7.9 - 3.8.10 @@ -203,7 +202,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Property | Value | | -------------------- | ------------------------------------------------------------------------------------------------------------------------------------ | | ServiceName | postgresql-x64-14 | -| Version | 14.7 | +| Version | 14.8 | | ServiceStatus | Stopped | | ServiceStartType | Disabled | | EnvironmentVariables | PGBIN=C:\Program Files\PostgreSQL\14\bin <br> PGDATA=C:\Program Files\PostgreSQL\14\data <br> PGROOT=C:\Program Files\PostgreSQL\14 | @@ -218,7 +217,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Database tools - Azure CosmosDb Emulator 2.14.12.0 -- DacFx 16.1.8089.0 +- DacFx 162.0.52.1 - MySQL 5.7.40.0 - SQL OLEDB Driver 18.6.3.0 - SQLPS 1.0 @@ -478,10 +477,10 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft Visual C++ 2013 Minimum Runtime | x86 | 12.0.21005 | | Microsoft Visual C++ 2019 Debug Runtime | x64 | 14.29.30139 | | Microsoft Visual C++ 2019 Debug Runtime | x86 | 14.29.30139 | -| Microsoft Visual C++ 2022 Additional Runtime | x64 | 14.34.31938 | -| Microsoft Visual C++ 2022 Minimum Runtime | x64 | 14.34.31938 | -| Microsoft Visual C++ 2022 Additional Runtime | x86 | 14.34.31938 | -| Microsoft Visual C++ 2022 Minimum Runtime | x86 | 14.34.31938 | +| Microsoft Visual C++ 2022 Additional Runtime | x64 | 14.36.32532 | +| Microsoft Visual C++ 2022 Minimum Runtime | x64 | 14.36.32532 | +| Microsoft Visual C++ 2022 Additional Runtime | x86 | 14.36.32532 | +| Microsoft Visual C++ 2022 Minimum Runtime | x86 | 14.36.32532 | #### Installed Windows SDKs - 10.0.14393.0 @@ -500,7 +499,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Microsoft.AspNetCore.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 6.0.5, 6.0.16 - Microsoft.NETCore.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 6.0.5, 6.0.16 - Microsoft.WindowsDesktop.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 6.0.5, 6.0.16 -- nbgv 3.6.128+518ee610d6 +- nbgv 3.6.132+bc56096f69 ### PowerShell Tools - PowerShell 7.2.11 @@ -512,7 +511,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Az (Cached): 1.0.0.zip, 1.6.0.zip, 2.3.2.zip, 2.6.0.zip, 3.1.0.zip, 3.5.0.zip, 3.8.0.zip, 4.3.0.zip, 4.4.0.zip, 4.7.0.zip, 5.5.0.zip, 5.9.0.zip, 6.6.0.zip, 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.328 +- AWSPowershell: 4.1.334 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 - Microsoft.Graph: 1.27.0 @@ -557,9 +556,9 @@ All other versions are saved but not installed. ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:d9ba6a514a6cadf503d94de9207721cc65bd11836de200c794df7e3ab37f512e | 2023-04-11 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:0626ed35c8a7a502b6403822bdeb17d413efaab100ccb9de9b50d9f3cba6dfb5 | 2023-04-11 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:6c68d8666f50716e127ac7376699ae770e6a908d8857f491cb100a143754a805 | 2023-04-11 | -| mcr.microsoft.com/windows/nanoserver:1809 | sha256:eea54849888c8070ea35f8df39b3a5e126bc9a5bd30afdcad6f430408b2c786d | 2023-04-05 | -| mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:b65dbde86b756beb973029c88e545457aa469a7e082c2d99bf984ba17d0a898c | 2023-04-05 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:e9d17b5d038480f88e2d2f8da53861e16700b04e102ce4501a93bbae67d4c913 | 2023-05-09 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:e62875919158e904fff9d25d72636b0f74c734e2e9c3ded10a401c35c242c4a9 | 2023-05-09 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:9db623acbde3fa385a4d246bd77c628bef8ece107d53307f378d45838a817dc5 | 2023-05-16 | +| mcr.microsoft.com/windows/nanoserver:1809 | sha256:fb78bd84ac937f6b1453e19015ccce41636bbeca5fe5bc6dc5c7d55adb4a2bc5 | 2023-05-05 | +| mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:12c61b7da616ca0065030ada32e78ba5bea0a1721affd994f40736b9b48620ae | 2023-05-05 | From afd68edefb3b9837ff0338086d586c2cdcd5c2f6 Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Sat, 3 Jun 2023 18:15:48 +0200 Subject: [PATCH 1947/3485] [macos] add cookie based installation for Xcode (#7666) --- .github/workflows/macos-generation.yml | 9 +++++++++ .../macos/azure-pipelines/image-generation.yml | 7 +++++++ images/macos/templates/macOS-11.anka.pkr.hcl | 14 ++++++++++++++ images/macos/templates/macOS-11.json | 10 ++++++++++ images/macos/templates/macOS-12.anka.pkr.hcl | 14 ++++++++++++++ images/macos/templates/macOS-12.json | 10 ++++++++++ images/macos/templates/macOS-13.anka.pkr.hcl | 14 ++++++++++++++ images/macos/templates/macOS-13.arm64.anka.pkr.hcl | 14 ++++++++++++++ 8 files changed, 92 insertions(+) diff --git a/.github/workflows/macos-generation.yml b/.github/workflows/macos-generation.yml index 95f8f50838ed..74ccb58b7c31 100644 --- a/.github/workflows/macos-generation.yml +++ b/.github/workflows/macos-generation.yml @@ -105,6 +105,13 @@ jobs: -VIPassword ${{ secrets.VI_PASSWORD }} ` -Cluster ${{ env.ESXI_CLUSTER }} + - name: Create xcversion session cookie file + shell: bash + run: | + mkdir -p ${{ runner.temp }}/xcversion-cookie + cookie='${{ secrets.XCVERSION_AUTH_COOKIE }}' + echo "$cookie" > ${{ runner.temp }}/xcversion-cookie/cookie + - name: Build VM run: | $SensitiveData = @( @@ -126,6 +133,7 @@ jobs: -var="baseimage_name=${{ inputs.base_image_name }}" ` -var="xcode_install_user=${{ secrets.XCODE_USER }}" ` -var="xcode_install_password=${{ secrets.XCODE_PASSWORD }}" ` + -var="xcversion_auth_cookie=${{ env.XCVERSION_COOKIE_PATH }}" ` -color=false ` ${{ inputs.template_path }} ` | Where-Object { @@ -138,6 +146,7 @@ jobs: env: PACKER_LOG: 1 PACKER_LOG_PATH: ${{ runner.temp }}/packer-log.txt + XCVERSION_COOKIE_PATH: ${{ runner.temp }}/xcversion-cookie/cookie - name: Prepare artifact shell: bash diff --git a/images.CI/macos/azure-pipelines/image-generation.yml b/images.CI/macos/azure-pipelines/image-generation.yml index ca5065e960f5..3b87e10a6397 100644 --- a/images.CI/macos/azure-pipelines/image-generation.yml +++ b/images.CI/macos/azure-pipelines/image-generation.yml @@ -58,6 +58,12 @@ jobs: -VIPassword '$(vcenter-password-v2)' ` -Cluster "$(esxi-cluster-v2)" + - task: DownloadSecureFile@1 + name: xcVersionCookie + displayName: 'Download xcversion session cookie' + inputs: + secureFile: 'cookie' + - pwsh: | $SensitiveData = @( 'IP address:', @@ -79,6 +85,7 @@ jobs: -var="baseimage_name=${{ parameters.base_image_name }}" ` -var="xcode_install_user=$(xcode-installation-user)" ` -var="xcode_install_password=$(xcode-installation-password)" ` + -var="xcversion_auth_cookie=$(xcVersionCookie.secureFilePath)" ` -color=false ` ${{ parameters.template_path }} ` | Where-Object { diff --git a/images/macos/templates/macOS-11.anka.pkr.hcl b/images/macos/templates/macOS-11.anka.pkr.hcl index aaabfd59c8a9..e2e1ee2ede25 100644 --- a/images/macos/templates/macOS-11.anka.pkr.hcl +++ b/images/macos/templates/macOS-11.anka.pkr.hcl @@ -44,6 +44,11 @@ variable "xcode_install_password" { sensitive = true } +variable "xcversion_auth_cookie" { + type = string + default = "" +} + variable "vcpu_count" { type = string default = "6" @@ -182,6 +187,15 @@ build { ] execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" } + provisioner "shell" { + inline = [ + "mkdir -p ~/.fastlane/spaceship/${var.xcode_install_user}" + ] + } + provisioner "file" { + destination = "~/.fastlane/spaceship/${var.xcode_install_user}/cookie" + source = "${var.xcversion_auth_cookie}" + } provisioner "shell" { script = "./provision/core/xcode.ps1" environment_vars = [ diff --git a/images/macos/templates/macOS-11.json b/images/macos/templates/macOS-11.json index 81da486712f9..74a424f6ce72 100644 --- a/images/macos/templates/macOS-11.json +++ b/images/macos/templates/macOS-11.json @@ -14,6 +14,7 @@ "github_api_pat": null, "xcode_install_user": null, "xcode_install_password": null, + "xcversion_auth_cookie": null, "image_os": "macos11" }, "builders": [ @@ -164,6 +165,15 @@ "API_PAT={{user `github_api_pat`}}" ] }, + { + "type": "shell", + "inline": "mkdir -p ~/.fastlane/spaceship/{{user `xcode_install_user`}}" + }, + { + "type": "file", + "source": "{{user `xcversion_auth_cookie`}}", + "destination": "~/.fastlane/spaceship/{{user `xcode_install_user`}}/cookie" + }, { "type": "shell", "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} pwsh -f {{ .Path }}", diff --git a/images/macos/templates/macOS-12.anka.pkr.hcl b/images/macos/templates/macOS-12.anka.pkr.hcl index 80aef5caaa5a..f5f48aa61d54 100644 --- a/images/macos/templates/macOS-12.anka.pkr.hcl +++ b/images/macos/templates/macOS-12.anka.pkr.hcl @@ -44,6 +44,11 @@ variable "xcode_install_password" { sensitive = true } +variable "xcversion_auth_cookie" { + type = string + default = "" +} + variable "vcpu_count" { type = string default = "6" @@ -183,6 +188,15 @@ build { ] execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" } + provisioner "shell" { + inline = [ + "mkdir -p ~/.fastlane/spaceship/${var.xcode_install_user}" + ] + } + provisioner "file" { + destination = "~/.fastlane/spaceship/${var.xcode_install_user}/cookie" + source = "${var.xcversion_auth_cookie}" + } provisioner "shell" { script = "./provision/core/xcode.ps1" environment_vars = [ diff --git a/images/macos/templates/macOS-12.json b/images/macos/templates/macOS-12.json index 094944c554b6..281c3170058e 100644 --- a/images/macos/templates/macOS-12.json +++ b/images/macos/templates/macOS-12.json @@ -14,6 +14,7 @@ "github_api_pat": null, "xcode_install_user": null, "xcode_install_password": null, + "xcversion_auth_cookie": null, "image_os": "macos12" }, "builders": [ @@ -166,6 +167,15 @@ "USER_PASSWORD={{user `vm_password`}}" ] }, + { + "type": "shell", + "inline": "mkdir -p ~/.fastlane/spaceship/{{user `xcode_install_user`}}" + }, + { + "type": "file", + "source": "{{user `xcversion_auth_cookie`}}", + "destination": "~/.fastlane/spaceship/{{user `xcode_install_user`}}/cookie" + }, { "type": "shell", "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} pwsh -f {{ .Path }}", diff --git a/images/macos/templates/macOS-13.anka.pkr.hcl b/images/macos/templates/macOS-13.anka.pkr.hcl index 3e11d06c845a..fc844f7cf409 100644 --- a/images/macos/templates/macOS-13.anka.pkr.hcl +++ b/images/macos/templates/macOS-13.anka.pkr.hcl @@ -44,6 +44,11 @@ variable "xcode_install_password" { sensitive = true } +variable "xcversion_auth_cookie" { + type = string + default = "" +} + variable "vcpu_count" { type = string default = "6" @@ -177,6 +182,15 @@ build { ] execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" } + provisioner "shell" { + inline = [ + "mkdir -p ~/.fastlane/spaceship/${var.xcode_install_user}" + ] + } + provisioner "file" { + destination = "~/.fastlane/spaceship/${var.xcode_install_user}/cookie" + source = "${var.xcversion_auth_cookie}" + } provisioner "shell" { script = "./provision/core/xcode.ps1" environment_vars = [ diff --git a/images/macos/templates/macOS-13.arm64.anka.pkr.hcl b/images/macos/templates/macOS-13.arm64.anka.pkr.hcl index 489f61ec843e..6df2c2147a74 100644 --- a/images/macos/templates/macOS-13.arm64.anka.pkr.hcl +++ b/images/macos/templates/macOS-13.arm64.anka.pkr.hcl @@ -44,6 +44,11 @@ variable "xcode_install_password" { sensitive = true } +variable "xcversion_auth_cookie" { + type = string + default = "" +} + variable "vcpu_count" { type = string default = "6" @@ -177,6 +182,15 @@ build { ] execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" } + provisioner "shell" { + inline = [ + "mkdir -p ~/.fastlane/spaceship/${var.xcode_install_user}" + ] + } + provisioner "file" { + destination = "~/.fastlane/spaceship/${var.xcode_install_user}/cookie" + source = "${var.xcversion_auth_cookie}" + } provisioner "shell" { script = "./provision/core/xcode.ps1" environment_vars = [ From 1670043207791d2f014249c93b736b2fb57364a3 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 5 Jun 2023 14:23:06 +0000 Subject: [PATCH 1948/3485] Updating readme file for macOS-11 version 20230516.1 (#7642) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-11-Readme.md | 58 ++++++++++++++++----------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/images/macos/macos-11-Readme.md b/images/macos/macos-11-Readme.md index 06208e2485f1..16bf3faaf617 100644 --- a/images/macos/macos-11-Readme.md +++ b/images/macos/macos-11-Readme.md @@ -1,22 +1,22 @@ # macOS 11 - OS Version: macOS 11.7.6 (20G1231) - Kernel Version: Darwin 20.6.0 -- Image Version: 20230504.1 +- Image Version: 20230516.1 ## Installed Software ### Language and Runtime -- .NET Core SDK: 3.1.101, 3.1.201, 3.1.302, 3.1.426, 6.0.408, 7.0.102, 7.0.203 +- .NET Core SDK: 3.1.101, 3.1.201, 3.1.302, 3.1.426, 6.0.408, 7.0.102, 7.0.202, 7.0.302 - Bash 3.2.57(1)-release - Clang/LLVM 13.0.0 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` - GCC 10 (Homebrew GCC 10.4.0) - available by `gcc-10` alias - GCC 11 (Homebrew GCC 11.3.0) - available by `gcc-11` alias -- GCC 12 (Homebrew GCC 12.2.0) - available by `gcc-12` alias +- GCC 12 (Homebrew GCC 12.3.0) - available by `gcc-12` alias - GNU Fortran 10 (Homebrew GCC 10.4.0) - available by `gfortran-10` alias - GNU Fortran 11 (Homebrew GCC 11.3.0) - available by `gfortran-11` alias -- GNU Fortran 12 (Homebrew GCC 12.2.0) - available by `gfortran-12` alias -- Julia 1.8.5 +- GNU Fortran 12 (Homebrew GCC 12.3.0) - available by `gfortran-12` alias +- Julia 1.9.0 - Kotlin 1.8.21-release-380 - Go 1.20.4 - Mono 6.12.0.188 @@ -24,27 +24,27 @@ - Node.js 18.16.0 - NVM 0.39.3 - NVM - Cached node versions: 14.21.3, 16.20.0, 18.16.0 -- Perl 5.36.0 -- PHP 8.2.5 +- Perl 5.36.1 +- PHP 8.2.6 - Python 2.7.18 - Python3 3.11.3 - R 4.3.0 - Ruby 2.7.8p225 ### Package Management -- Bundler 2.4.12 +- Bundler 2.4.13 - Carthage 0.39.0 - CocoaPods 1.12.1 - Composer 2.5.5 -- Homebrew 4.0.16 +- Homebrew 4.0.18 - Miniconda 23.3.1 - NPM 9.5.1 - NuGet 6.3.1.1 - Pip 20.3.4 (python 2.7) - Pip3 23.1.2 (python 3.11) - Pipx 1.2.0 -- RubyGems 3.4.12 -- Vcpkg 2023 (build from commit 60e2c07d2) +- RubyGems 3.4.13 +- Vcpkg 2023 (build from commit a61863793) - Yarn 1.22.19 #### Environment variables @@ -55,35 +55,35 @@ ### Project Management - Apache Ant 1.10.13 -- Apache Maven 3.9.1 +- Apache Maven 3.9.2 - Gradle 8.1.1 -- Sbt 1.8.2 +- Sbt 1.8.3 ### Utilities - 7-Zip 17.05 - aria2 1.36.0 - azcopy 10.18.1 -- bazel 6.1.2 -- bazelisk 1.16.0 +- bazel 6.2.0 +- bazelisk 1.17.0 - bsdtar 3.3.2 - available by 'tar' alias - Curl 8.0.1 - Git 2.40.1 - Git LFS 3.3.0 -- GitHub CLI 2.28.0 +- GitHub CLI 2.29.0 - GNU Tar 1.34 - available by 'gtar' alias -- GNU Wget 1.21.3 +- GNU Wget 1.21.4 - gpg (GnuPG) 2.4.1 -- helm v3.11.3+g66a969e +- helm v3.12.0+gc9f554d - Hub CLI 2.14.2 -- ImageMagick 7.1.1-8 +- ImageMagick 7.1.1-9 - jq 1.6 - mongo 5.0.15 - mongod 5.0.15 - Newman 5.3.2 - OpenSSL 1.1.1t 7 Feb 2023 - Packer 1.8.6 -- PostgreSQL 14.7 (Homebrew) -- psql (PostgreSQL) 14.7 (Homebrew) +- PostgreSQL 14.8 (Homebrew) +- psql (PostgreSQL) 14.8 (Homebrew) - Sox 14.4.2 - Subversion (SVN) 1.14.2 - Switchaudio-osx 1.2.2 @@ -93,8 +93,8 @@ ### Tools - Aliyun CLI 3.0.161 - App Center CLI 2.13.7 -- AWS CLI 2.11.17 -- AWS SAM CLI 1.82.0 +- AWS CLI 2.11.20 +- AWS SAM CLI 1.84.0 - AWS Session Manager CLI 1.2.463.0 - Azure CLI 2.48.1 - Azure CLI (azure-devops) 0.26.0 @@ -107,7 +107,7 @@ - GHCup 0.1.19.2 - Jazzy 0.14.3 - Stack 2.9.3 -- SwiftFormat 0.51.8 +- SwiftFormat 0.51.9 - Swig 4.1.1 - Xcode Command Line Tools 13.2.0.0.1.1638488800 @@ -118,11 +118,11 @@ ### Browsers - Safari 16.4.1 (16615.1.26.101.10) - SafariDriver 16.4.1 (16615.1.26.101.10) -- Google Chrome 113.0.5672.63 +- Google Chrome 113.0.5672.126 - ChromeDriver 113.0.5672.63 -- Microsoft Edge 112.0.1722.68 -- Microsoft Edge WebDriver 112.0.1722.68 -- Mozilla Firefox 112.0.2 +- Microsoft Edge 113.0.1774.42 +- Microsoft Edge WebDriver 113.0.1774.42 +- Mozilla Firefox 113.0.1 - geckodriver 0.33.0 - Selenium server 4.9.0 @@ -181,7 +181,7 @@ #### Packages - Bindgen 0.65.1 -- Cargo-audit 0.17.5 +- Cargo-audit 0.17.6 - Cargo-outdated 0.11.2 - Cbindgen 0.24.3 - Clippy 0.1.69 From dfdd2daf84e33e18c114a9986bab5418c381664a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 6 Jun 2023 08:01:36 +0000 Subject: [PATCH 1949/3485] Updating readme file for macOS-12 version 20230516.1 (#7641) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-12-Readme.md | 56 ++++++++++++++++----------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/images/macos/macos-12-Readme.md b/images/macos/macos-12-Readme.md index f7fba3056c44..8b8ba9f2ecd6 100644 --- a/images/macos/macos-12-Readme.md +++ b/images/macos/macos-12-Readme.md @@ -1,20 +1,20 @@ # macOS 12 - OS Version: macOS 12.6.5 (21G531) - Kernel Version: Darwin 21.6.0 -- Image Version: 20230505.1 +- Image Version: 20230516.1 ## Installed Software ### Language and Runtime -- .NET Core SDK: 3.1.101, 3.1.201, 3.1.302, 3.1.426, 6.0.408, 7.0.102, 7.0.203 +- .NET Core SDK: 3.1.101, 3.1.201, 3.1.302, 3.1.426, 6.0.408, 7.0.102, 7.0.202, 7.0.302 - Bash 3.2.57(1)-release - Clang/LLVM 14.0.0 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` - GCC 11 (Homebrew GCC 11.3.0) - available by `gcc-11` alias -- GCC 12 (Homebrew GCC 12.2.0) - available by `gcc-12` alias +- GCC 12 (Homebrew GCC 12.3.0) - available by `gcc-12` alias - GNU Fortran 11 (Homebrew GCC 11.3.0) - available by `gfortran-11` alias -- GNU Fortran 12 (Homebrew GCC 12.2.0) - available by `gfortran-12` alias -- Julia 1.8.5 +- GNU Fortran 12 (Homebrew GCC 12.3.0) - available by `gfortran-12` alias +- Julia 1.9.0 - Kotlin 1.8.21-release-380 - Go 1.20.4 - Mono 6.12.0.188 @@ -22,27 +22,27 @@ - Node.js 18.16.0 - NVM 0.39.3 - NVM - Cached node versions: 14.21.3, 16.20.0, 18.16.0 -- Perl 5.36.0 -- PHP 8.2.5 +- Perl 5.36.1 +- PHP 8.2.6 - Python 2.7.18 - Python3 3.11.3 - R 4.3.0 - Ruby 3.0.6p216 ### Package Management -- Bundler 2.4.12 +- Bundler 2.4.13 - Carthage 0.39.0 - CocoaPods 1.12.1 - Composer 2.5.5 -- Homebrew 4.0.16 +- Homebrew 4.0.18 - Miniconda 23.3.1 - NPM 9.5.1 - NuGet 6.3.1.1 - Pip 20.3.4 (python 2.7) - Pip3 23.1.2 (python 3.11) - Pipx 1.2.0 -- RubyGems 3.4.12 -- Vcpkg 2023 (build from commit 6a3dd0874) +- RubyGems 3.4.13 +- Vcpkg 2023 (build from commit a61863793) - Yarn 1.22.19 #### Environment variables @@ -53,33 +53,33 @@ ### Project Management - Apache Ant 1.10.13 -- Apache Maven 3.9.1 +- Apache Maven 3.9.2 - Gradle 8.1.1 -- Sbt 1.8.2 +- Sbt 1.8.3 ### Utilities - 7-Zip 17.05 - aria2 1.36.0 - azcopy 10.18.1 -- bazel 6.1.2 -- bazelisk 1.16.0 +- bazel 6.2.0 +- bazelisk 1.17.0 - bsdtar 3.5.1 - available by 'tar' alias - Curl 8.0.1 - Git 2.40.1 - Git LFS 3.3.0 -- GitHub CLI 2.28.0 +- GitHub CLI 2.29.0 - GNU Tar 1.34 - available by 'gtar' alias -- GNU Wget 1.21.3 +- GNU Wget 1.21.4 - gpg (GnuPG) 2.4.1 - Hub CLI 2.14.2 -- ImageMagick 7.1.1-8 +- ImageMagick 7.1.1-9 - jq 1.6 - mongo 5.0.15 - mongod 5.0.15 - OpenSSL 1.1.1t 7 Feb 2023 - Packer 1.8.6 -- PostgreSQL 14.7 (Homebrew) -- psql (PostgreSQL) 14.7 (Homebrew) +- PostgreSQL 14.8 (Homebrew) +- psql (PostgreSQL) 14.8 (Homebrew) - Sox 14.4.2 - Subversion (SVN) 1.14.2 - Switchaudio-osx 1.2.2 @@ -90,8 +90,8 @@ ### Tools - App Center CLI 2.13.7 -- AWS CLI 2.11.18 -- AWS SAM CLI 1.82.0 +- AWS CLI 2.11.20 +- AWS SAM CLI 1.84.0 - AWS Session Manager CLI 1.2.463.0 - Azure CLI 2.48.1 - Azure CLI (azure-devops) 0.26.0 @@ -110,17 +110,17 @@ - Xcode Command Line Tools 14.2.0.0.1.1668646533 ### Linters -- SwiftLint 0.51.0 +- SwiftLint 0.52.2 - Yamllint 1.31.0 ### Browsers - Safari 16.4.1 (17615.1.26.101.10) - SafariDriver 16.4.1 (17615.1.26.101.10) -- Google Chrome 113.0.5672.63 +- Google Chrome 113.0.5672.126 - ChromeDriver 113.0.5672.63 -- Microsoft Edge 112.0.1722.68 -- Microsoft Edge WebDriver 112.0.1722.68 -- Mozilla Firefox 112.0.2 +- Microsoft Edge 113.0.1774.42 +- Microsoft Edge WebDriver 113.0.1774.42 +- Mozilla Firefox 113.0.1 - geckodriver 0.33.0 - Selenium server 4.9.0 @@ -176,7 +176,7 @@ #### Packages - Bindgen 0.65.1 -- Cargo-audit 0.17.5 +- Cargo-audit 0.17.6 - Cargo-outdated 0.11.2 - Cbindgen 0.24.3 - Clippy 0.1.69 From e0371b1f6ff0803f8f938779af7fe6e705e2b4eb Mon Sep 17 00:00:00 2001 From: Sam Fox <samfoxcode@github.com> Date: Wed, 7 Jun 2023 02:42:05 -0700 Subject: [PATCH 1950/3485] set $IsLatest to false when specifying exact version (#7677) --- images.CI/macos/anka/Service.Helpers.psm1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images.CI/macos/anka/Service.Helpers.psm1 b/images.CI/macos/anka/Service.Helpers.psm1 index f2ed7dd8663b..4d08547e1c9e 100644 --- a/images.CI/macos/anka/Service.Helpers.psm1 +++ b/images.CI/macos/anka/Service.Helpers.psm1 @@ -109,7 +109,7 @@ function Get-MacOSIPSWInstaller { $targetVersion = Get-AvailableIPSWVersions -IsBeta $true -MacOSCodeNameOrVersion $MacOSName Write-host "`t[*] The 'BetaSearch' flag is set to true. Latestbeta macOS version is '$MacOSName' - '$targetVersion' now" } else { - $targetVersion = Get-AvailableIPSWVersions -MacOSCodeNameOrVersion $MacOSName + $targetVersion = Get-AvailableIPSWVersions -MacOSCodeNameOrVersion $MacOSName -IsLatest $false Write-host "`t[*] The exact version was specified - '$MacOSName' " } From 05818be3f94557f5f9260ca2425b22fa1fa79ff3 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 7 Jun 2023 17:15:03 +0000 Subject: [PATCH 1951/3485] Updating readme file for macos-13 version 20230524.1 (#7652) Co-authored-by: Image generation service account <no-reply@microsoft.com> --- images/macos/macos-13-Readme.md | 120 +++++++++++++++++--------------- 1 file changed, 62 insertions(+), 58 deletions(-) diff --git a/images/macos/macos-13-Readme.md b/images/macos/macos-13-Readme.md index 89715a55abf3..0a6ae14a0733 100644 --- a/images/macos/macos-13-Readme.md +++ b/images/macos/macos-13-Readme.md @@ -1,35 +1,38 @@ # macOS 13 -- OS Version: macOS 13.3.1 (a) (22E772610a) -- Kernel Version: Darwin 22.4.0 -- Image Version: 20230509.4 +- OS Version: macOS 13.4 (22F66) +- Kernel Version: Darwin 22.5.0 +- Image Version: 20230524.1 ## Installed Software ### Language and Runtime -- .NET Core SDK: 7.0.102, 7.0.203 +- .NET Core SDK: 7.0.102, 7.0.202, 7.0.302 - Bash 3.2.57(1)-release - Clang/LLVM 14.0.0 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` - GCC 11 (Homebrew GCC 11.3.0) - available by `gcc-11` alias -- GCC 12 (Homebrew GCC 12.2.0) - available by `gcc-12` alias +- GCC 12 (Homebrew GCC 12.3.0) - available by `gcc-12` alias - GNU Fortran 11 (Homebrew GCC 11.3.0) - available by `gfortran-11` alias -- GNU Fortran 12 (Homebrew GCC 12.2.0) - available by `gfortran-12` alias -- Julia 1.8.5 +- GNU Fortran 12 (Homebrew GCC 12.3.0) - available by `gfortran-12` alias +- Julia 1.9.0 - Kotlin 1.8.21-release-380 - Perl 5.36.1 -- PHP 8.2.5 +- PHP 8.2.6 +- Python3 3.11.3 - R 4.3.0 - Ruby 3.0.6p216 ### Package Management -- Bundler 2.4.12 +- Bundler 2.4.13 - Carthage 0.39.0 - CocoaPods 1.12.1 - Composer 2.5.5 -- Homebrew 4.0.17 +- Homebrew 4.0.19 - NPM 9.5.1 -- RubyGems 3.4.12 -- Vcpkg 2023 (build from commit ff311f676) +- Pip3 23.1.2 (python 3.11) +- Pipx 1.2.0 +- RubyGems 3.4.13 +- Vcpkg 2023 (build from commit 2718aa52a) - Yarn 1.22.19 ### Project Management @@ -40,50 +43,50 @@ - aria2 1.36.0 - azcopy 10.18.1 - bazel 6.2.0 -- bazelisk 1.16.0 +- bazelisk 1.17.0 - bsdtar 3.5.3 - available by 'tar' alias -- Curl 8.0.1 +- Curl 8.1.1 - Git 2.40.1 - Git LFS 3.3.0 -- GitHub CLI 2.28.0 +- GitHub CLI 2.29.0 - GNU Tar 1.34 - available by 'gtar' alias -- GNU Wget 1.21.3 +- GNU Wget 1.21.4 - gpg (GnuPG) 2.4.1 - jq 1.6 - OpenSSL LibreSSL 3.3.6 - Packer 1.8.6 -- Vagrant 2.3.4 -- yq 4.33.3 +- Vagrant 2.3.6 +- yq 4.34.1 - zstd 1.5.5 ### Tools -- AWS CLI 2.11.18 -- AWS SAM CLI 1.82.0 +- AWS CLI 2.11.21 +- AWS SAM CLI 1.84.0 - AWS Session Manager CLI 1.2.463.0 -- Azure CLI 2.48.1 +- Azure CLI 2.49.0 - Azure CLI (azure-devops) 0.26.0 - Bicep CLI 0.17.1 - Cabal 3.6.2.0 -- Cmake 3.26.3 +- Cmake 3.26.4 - CodeQL Action Bundles 2.13.0 2.13.1 - Fastlane 2.212.2 - GHC 9.6.1 - GHCup 0.1.19.2 - Stack 2.9.3 -- SwiftFormat 0.51.9 +- SwiftFormat 0.51.10 - Xcode Command Line Tools 14.3.0.0.1.1679647830 ### Linters -- SwiftLint 0.51.0 +- SwiftLint 0.52.2 ### Browsers -- Safari 16.4 (18615.1.26.110.1) -- SafariDriver 16.4 (18615.1.26.110.1) -- Google Chrome 113.0.5672.92 +- Safari 16.5 (18615.2.9.11.4) +- SafariDriver 16.5 (18615.2.9.11.4) +- Google Chrome 113.0.5672.126 - ChromeDriver 113.0.5672.63 -- Microsoft Edge 113.0.1774.35 -- Microsoft Edge WebDriver 113.0.1774.35 -- Mozilla Firefox 113.0 +- Microsoft Edge 113.0.1774.42 +- Microsoft Edge WebDriver 113.0.1774.50 +- Mozilla Firefox 113.0.2 - geckodriver 0.33.0 - Selenium server 4.9.0 @@ -135,7 +138,7 @@ #### Packages - Bindgen 0.65.1 -- Cargo-audit 0.17.5 +- Cargo-audit 0.17.6 - Cargo-outdated 0.11.2 - Cbindgen 0.24.3 - Clippy 0.1.69 @@ -145,16 +148,17 @@ - PowerShell 7.2.11 #### PowerShell Modules -- Az: 9.7.1 +- Az: 10.0.0 - Pester: 5.4.1 - PSScriptAnalyzer: 1.21.0 ### Xcode -| Version | Build | Path | -| -------------- | ------- | ---------------------------- | -| 14.3 | 14E222b | /Applications/Xcode_14.3.app | -| 14.2 (default) | 14C18 | /Applications/Xcode_14.2.app | -| 14.1 | 14B47b | /Applications/Xcode_14.1.app | +| Version | Build | Path | +| -------------- | ------- | ------------------------------ | +| 14.3.1 | 14E300b | /Applications/Xcode_14.3.1.app | +| 14.3 | 14E222b | /Applications/Xcode_14.3.app | +| 14.2 (default) | 14C18 | /Applications/Xcode_14.2.app | +| 14.1 | 14B47b | /Applications/Xcode_14.1.app | #### Xcode Support Tools - xcpretty 0.3.0 @@ -165,44 +169,44 @@ | ------------------------------------------------------- | --------------------------------------------- | ------------- | | macOS 13.0 | macosx13.0 | 14.1 | | macOS 13.1 | macosx13.1 | 14.2 | -| macOS 13.3 | macosx13.3 | 14.3 | +| macOS 13.3 | macosx13.3 | 14.3, 14.3.1 | | iOS 16.1 | iphoneos16.1 | 14.1 | | iOS 16.2 | iphoneos16.2 | 14.2 | -| iOS 16.4 | iphoneos16.4 | 14.3 | +| iOS 16.4 | iphoneos16.4 | 14.3, 14.3.1 | | Simulator - iOS 16.1 | iphonesimulator16.1 | 14.1 | | Simulator - iOS 16.2 | iphonesimulator16.2 | 14.2 | -| Simulator - iOS 16.4 | iphonesimulator16.4 | 14.3 | +| Simulator - iOS 16.4 | iphonesimulator16.4 | 14.3, 14.3.1 | | tvOS 16.1 | appletvos16.1 | 14.1, 14.2 | -| tvOS 16.4 | appletvos16.4 | 14.3 | +| tvOS 16.4 | appletvos16.4 | 14.3, 14.3.1 | | Simulator - tvOS 16.1 | appletvsimulator16.1 | 14.1, 14.2 | -| Simulator - tvOS 16.4 | appletvsimulator16.4 | 14.3 | +| Simulator - tvOS 16.4 | appletvsimulator16.4 | 14.3, 14.3.1 | | watchOS 9.1 | watchos9.1 | 14.1, 14.2 | -| watchOS 9.4 | watchos9.4 | 14.3 | +| watchOS 9.4 | watchos9.4 | 14.3, 14.3.1 | | Simulator - watchOS 9.1 | watchsimulator9.1 | 14.1, 14.2 | -| Simulator - watchOS 9.4 | watchsimulator9.4 | 14.3 | -| Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3 | -| Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3 | -| Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3 | +| Simulator - watchOS 9.4 | watchsimulator9.4 | 14.3, 14.3.1 | +| Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3, 14.3.1 | +| Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3, 14.3.1 | +| Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3, 14.3.1 | | DriverKit 22.1 | driverkit22.1 | 14.1 | | DriverKit 22.2 | driverkit22.2 | 14.2 | -| DriverKit 22.4 | driverkit22.4 | 14.3 | +| DriverKit 22.4 | driverkit22.4 | 14.3, 14.3.1 | #### Installed Simulators -| OS | Xcode Version | Simulators | -| ----------- | -------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| iOS 16.1 | 14.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 16.2 | 14.2 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 16.4 | 14.3 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| tvOS 16.1 | 14.1<br>14.2<br>14.3 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 16.4 | 14.1<br>14.2<br>14.3 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| watchOS 9.1 | 14.1<br>14.2<br>14.3 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | -| watchOS 9.4 | 14.1<br>14.2<br>14.3 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | +| OS | Xcode Version | Simulators | +| ----------- | ------------------------------ | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| iOS 16.1 | 14.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 16.2 | 14.2 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 16.4 | 14.3<br>14.3.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| tvOS 16.1 | 14.1<br>14.2<br>14.3<br>14.3.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 16.4 | 14.1<br>14.2<br>14.3<br>14.3.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| watchOS 9.1 | 14.1<br>14.2<br>14.3<br>14.3.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | +| watchOS 9.4 | 14.1<br>14.2<br>14.3<br>14.3.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | ### Android | Package Name | Version | | -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | | Android Command Line Tools | 8.0 | -| Android Emulator | 32.1.12 | +| Android Emulator | 32.1.13 | | Android SDK Build-tools | 33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | | Android SDK Platforms | android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | | Android SDK Platform-Tools | 34.0.1 | From 84a71166b84f0e96cbef12422535cce0ecc005cb Mon Sep 17 00:00:00 2001 From: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com> Date: Thu, 8 Jun 2023 12:48:45 +0200 Subject: [PATCH 1952/3485] [windows] warmup VisualStudio for vdproj (#7649) it takes up to several minutes to run devenv for the first time on vdproj. --- .../win/post-generation/VSConfiguration.ps1 | 8 +- images/win/post-generation/warmup.vdproj | 665 ++++++++++++++++++ 2 files changed, 672 insertions(+), 1 deletion(-) create mode 100644 images/win/post-generation/warmup.vdproj diff --git a/images/win/post-generation/VSConfiguration.ps1 b/images/win/post-generation/VSConfiguration.ps1 index 109c69d9fd2e..c21c8b2e55dc 100644 --- a/images/win/post-generation/VSConfiguration.ps1 +++ b/images/win/post-generation/VSConfiguration.ps1 @@ -5,4 +5,10 @@ $devEnvPath = "$vsInstallRoot\Common7\IDE\devenv.exe" # The Out-Null cmdlet is required to ensure PowerShell waits until the '/ResetSettings' command fully completes. & "$devEnvPath" /RootSuffix Exp /ResetSettings General.vssettings /Command File.Exit | Out-Null -cmd.exe /c "`"$devEnvPath`" /updateconfiguration" \ No newline at end of file +cmd.exe /c "`"$devEnvPath`" /updateconfiguration" + +# +# https://github.com/actions/runner-images/issues/5301 +# +$warmup_vdproj = $(Join-Path $PSScriptRoot 'warmup.vdproj') +& "$devEnvPath" $warmup_vdproj /build Release | Out-Null diff --git a/images/win/post-generation/warmup.vdproj b/images/win/post-generation/warmup.vdproj new file mode 100644 index 000000000000..9b4805fd6020 --- /dev/null +++ b/images/win/post-generation/warmup.vdproj @@ -0,0 +1,665 @@ +"DeployProject" +{ +"VSVersion" = "3:800" +"ProjectType" = "8:{978C614F-708E-4E1A-B201-565925725DBA}" +"IsWebType" = "8:FALSE" +"ProjectName" = "8:Setup1" +"LanguageId" = "3:1033" +"CodePage" = "3:1252" +"UILanguageId" = "3:1033" +"SccProjectName" = "8:" +"SccLocalPath" = "8:" +"SccAuxPath" = "8:" +"SccProvider" = "8:" + "Hierarchy" + { + } + "Configurations" + { + "Debug" + { + "DisplayName" = "8:Debug" + "IsDebugOnly" = "11:TRUE" + "IsReleaseOnly" = "11:FALSE" + "OutputFilename" = "8:Debug\\Setup1.msi" + "PackageFilesAs" = "3:2" + "PackageFileSize" = "3:-2147483648" + "CabType" = "3:1" + "Compression" = "3:2" + "SignOutput" = "11:FALSE" + "CertificateFile" = "8:" + "PrivateKeyFile" = "8:" + "TimeStampServer" = "8:" + "InstallerBootstrapper" = "3:2" + "BootstrapperCfg:{63ACBE69-63AA-4F98-B2B6-99F9E24495F2}" + { + "Enabled" = "11:FALSE" + "PromptEnabled" = "11:TRUE" + "PrerequisitesLocation" = "2:1" + "Url" = "8:" + "ComponentsUrl" = "8:" + "Items" + { + "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:.NETFramework,Version=v4.7.2" + { + "Name" = "8:Microsoft .NET Framework 4.7.2 (x86 and x64)" + "ProductCode" = "8:.NETFramework,Version=v4.7.2" + } + } + } + } + "Release" + { + "DisplayName" = "8:Release" + "IsDebugOnly" = "11:FALSE" + "IsReleaseOnly" = "11:TRUE" + "OutputFilename" = "8:Release\\Setup1.msi" + "PackageFilesAs" = "3:2" + "PackageFileSize" = "3:-2147483648" + "CabType" = "3:1" + "Compression" = "3:2" + "SignOutput" = "11:FALSE" + "CertificateFile" = "8:" + "PrivateKeyFile" = "8:" + "TimeStampServer" = "8:" + "InstallerBootstrapper" = "3:2" + } + } + "Deployable" + { + "CustomAction" + { + } + "DefaultFeature" + { + "Name" = "8:DefaultFeature" + "Title" = "8:" + "Description" = "8:" + } + "ExternalPersistence" + { + "LaunchCondition" + { + } + } + "File" + { + } + "FileType" + { + } + "Folder" + { + "{1525181F-901A-416C-8A58-119130FE478E}:_2CFC2A48A3B644ED96FB521F59C388D4" + { + "Name" = "8:#1916" + "AlwaysCreate" = "11:FALSE" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Property" = "8:DesktopFolder" + "Folders" + { + } + } + "{3C67513D-01DD-4637-8A68-80971EB9504F}:_3389E1C43BBB433484C8A1DBE5968F24" + { + "DefaultLocation" = "8:[ProgramFilesFolder][Manufacturer]\\[ProductName]" + "Name" = "8:#1925" + "AlwaysCreate" = "11:FALSE" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Property" = "8:TARGETDIR" + "Folders" + { + } + } + "{1525181F-901A-416C-8A58-119130FE478E}:_FA2F90B46134404A830C21AAA6741088" + { + "Name" = "8:#1919" + "AlwaysCreate" = "11:FALSE" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Property" = "8:ProgramMenuFolder" + "Folders" + { + } + } + } + "LaunchCondition" + { + } + "Locator" + { + } + "MsiBootstrapper" + { + "LangId" = "3:1033" + "RequiresElevation" = "11:FALSE" + } + "Product" + { + "Name" = "8:Microsoft Visual Studio" + "ProductName" = "8:Setup1" + "ProductCode" = "8:{22F710BC-F7AA-4E2C-86A3-63647F82EF0D}" + "PackageCode" = "8:{3ADCCB4E-232A-40DF-A810-672AA9AD4B72}" + "UpgradeCode" = "8:{19174734-DD62-4C8E-9716-6DCFC3F06116}" + "AspNetVersion" = "8:4.0.30319.0" + "RestartWWWService" = "11:FALSE" + "RemovePreviousVersions" = "11:FALSE" + "DetectNewerInstalledVersion" = "11:TRUE" + "InstallAllUsers" = "11:FALSE" + "ProductVersion" = "8:1.0.0" + "Manufacturer" = "8:Default Company Name" + "ARPHELPTELEPHONE" = "8:" + "ARPHELPLINK" = "8:" + "Title" = "8:Setup1" + "Subject" = "8:" + "ARPCONTACT" = "8:Default Company Name" + "Keywords" = "8:" + "ARPCOMMENTS" = "8:" + "ARPURLINFOABOUT" = "8:" + "ARPPRODUCTICON" = "8:" + "ARPIconIndex" = "3:0" + "SearchPath" = "8:" + "UseSystemSearchPath" = "11:TRUE" + "TargetPlatform" = "3:0" + "PreBuildEvent" = "8:" + "PostBuildEvent" = "8:" + "RunPostBuildEvent" = "3:0" + } + "Registry" + { + "HKLM" + { + "Keys" + { + "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_AE076FF564A049948DF2258C70AE5799" + { + "Name" = "8:Software" + "Condition" = "8:" + "AlwaysCreate" = "11:FALSE" + "DeleteAtUninstall" = "11:FALSE" + "Transitive" = "11:FALSE" + "Keys" + { + "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_47FD8B4AFAAC41A48FAC411F8ABDEB59" + { + "Name" = "8:[Manufacturer]" + "Condition" = "8:" + "AlwaysCreate" = "11:FALSE" + "DeleteAtUninstall" = "11:FALSE" + "Transitive" = "11:FALSE" + "Keys" + { + } + "Values" + { + } + } + } + "Values" + { + } + } + } + } + "HKCU" + { + "Keys" + { + "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_98C374DEA4C841988657D6A8CC3F6CC3" + { + "Name" = "8:Software" + "Condition" = "8:" + "AlwaysCreate" = "11:FALSE" + "DeleteAtUninstall" = "11:FALSE" + "Transitive" = "11:FALSE" + "Keys" + { + "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_A31118797AC14549912315624636D7C5" + { + "Name" = "8:[Manufacturer]" + "Condition" = "8:" + "AlwaysCreate" = "11:FALSE" + "DeleteAtUninstall" = "11:FALSE" + "Transitive" = "11:FALSE" + "Keys" + { + } + "Values" + { + } + } + } + "Values" + { + } + } + } + } + "HKCR" + { + "Keys" + { + } + } + "HKU" + { + "Keys" + { + } + } + "HKPU" + { + "Keys" + { + } + } + } + "Sequences" + { + } + "Shortcut" + { + } + "UserInterface" + { + "{2479F3F5-0309-486D-8047-8187E2CE5BA0}:_0F20B65AC09E4AA78D95E5A7A7B152ED" + { + "UseDynamicProperties" = "11:FALSE" + "IsDependency" = "11:FALSE" + "SourcePath" = "8:<VsdDialogDir>\\VsdUserInterface.wim" + } + "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_1450B51044A346A59AD67962D438B359" + { + "Name" = "8:#1901" + "Sequence" = "3:1" + "Attributes" = "3:2" + "Dialogs" + { + "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_056EB6D1A4954D7D8D59FCF53B8AF02E" + { + "Sequence" = "3:100" + "DisplayName" = "8:Progress" + "UseDynamicProperties" = "11:TRUE" + "IsDependency" = "11:FALSE" + "SourcePath" = "8:<VsdDialogDir>\\VsdProgressDlg.wid" + "Properties" + { + "BannerBitmap" + { + "Name" = "8:BannerBitmap" + "DisplayName" = "8:#1001" + "Description" = "8:#1101" + "Type" = "3:8" + "ContextData" = "8:Bitmap" + "Attributes" = "3:4" + "Setting" = "3:1" + "UsePlugInResources" = "11:TRUE" + } + "ShowProgress" + { + "Name" = "8:ShowProgress" + "DisplayName" = "8:#1009" + "Description" = "8:#1109" + "Type" = "3:5" + "ContextData" = "8:1;True=1;False=0" + "Attributes" = "3:0" + "Setting" = "3:0" + "Value" = "3:1" + "DefaultValue" = "3:1" + "UsePlugInResources" = "11:TRUE" + } + } + } + } + } + "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_3F72D8AE479B4820864530F5C9607524" + { + "Name" = "8:#1900" + "Sequence" = "3:1" + "Attributes" = "3:1" + "Dialogs" + { + "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_7DE3964E30704BA99E5B564A29CC3A74" + { + "Sequence" = "3:300" + "DisplayName" = "8:Confirm Installation" + "UseDynamicProperties" = "11:TRUE" + "IsDependency" = "11:FALSE" + "SourcePath" = "8:<VsdDialogDir>\\VsdConfirmDlg.wid" + "Properties" + { + "BannerBitmap" + { + "Name" = "8:BannerBitmap" + "DisplayName" = "8:#1001" + "Description" = "8:#1101" + "Type" = "3:8" + "ContextData" = "8:Bitmap" + "Attributes" = "3:4" + "Setting" = "3:1" + "UsePlugInResources" = "11:TRUE" + } + } + } + "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_B3DAD8BF301A400680846A2BB7451D0D" + { + "Sequence" = "3:200" + "DisplayName" = "8:Installation Folder" + "UseDynamicProperties" = "11:TRUE" + "IsDependency" = "11:FALSE" + "SourcePath" = "8:<VsdDialogDir>\\VsdFolderDlg.wid" + "Properties" + { + "BannerBitmap" + { + "Name" = "8:BannerBitmap" + "DisplayName" = "8:#1001" + "Description" = "8:#1101" + "Type" = "3:8" + "ContextData" = "8:Bitmap" + "Attributes" = "3:4" + "Setting" = "3:1" + "UsePlugInResources" = "11:TRUE" + } + "InstallAllUsersVisible" + { + "Name" = "8:InstallAllUsersVisible" + "DisplayName" = "8:#1059" + "Description" = "8:#1159" + "Type" = "3:5" + "ContextData" = "8:1;True=1;False=0" + "Attributes" = "3:0" + "Setting" = "3:0" + "Value" = "3:1" + "DefaultValue" = "3:1" + "UsePlugInResources" = "11:TRUE" + } + } + } + "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_D2FF63E39B7649E6BB76320118D41624" + { + "Sequence" = "3:100" + "DisplayName" = "8:Welcome" + "UseDynamicProperties" = "11:TRUE" + "IsDependency" = "11:FALSE" + "SourcePath" = "8:<VsdDialogDir>\\VsdWelcomeDlg.wid" + "Properties" + { + "BannerBitmap" + { + "Name" = "8:BannerBitmap" + "DisplayName" = "8:#1001" + "Description" = "8:#1101" + "Type" = "3:8" + "ContextData" = "8:Bitmap" + "Attributes" = "3:4" + "Setting" = "3:1" + "UsePlugInResources" = "11:TRUE" + } + "CopyrightWarning" + { + "Name" = "8:CopyrightWarning" + "DisplayName" = "8:#1002" + "Description" = "8:#1102" + "Type" = "3:3" + "ContextData" = "8:" + "Attributes" = "3:0" + "Setting" = "3:1" + "Value" = "8:#1202" + "DefaultValue" = "8:#1202" + "UsePlugInResources" = "11:TRUE" + } + "Welcome" + { + "Name" = "8:Welcome" + "DisplayName" = "8:#1003" + "Description" = "8:#1103" + "Type" = "3:3" + "ContextData" = "8:" + "Attributes" = "3:0" + "Setting" = "3:1" + "Value" = "8:#1203" + "DefaultValue" = "8:#1203" + "UsePlugInResources" = "11:TRUE" + } + } + } + } + } + "{2479F3F5-0309-486D-8047-8187E2CE5BA0}:_6069164ECEB944A3AF499EF7E4AF562E" + { + "UseDynamicProperties" = "11:FALSE" + "IsDependency" = "11:FALSE" + "SourcePath" = "8:<VsdDialogDir>\\VsdBasicDialogs.wim" + } + "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_6E590DA0E3F44E7EB06E9B583A05C84F" + { + "Name" = "8:#1900" + "Sequence" = "3:2" + "Attributes" = "3:1" + "Dialogs" + { + "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_38649E4FCD994315918CF9F68EEDFBD4" + { + "Sequence" = "3:200" + "DisplayName" = "8:Installation Folder" + "UseDynamicProperties" = "11:TRUE" + "IsDependency" = "11:FALSE" + "SourcePath" = "8:<VsdDialogDir>\\VsdAdminFolderDlg.wid" + "Properties" + { + "BannerBitmap" + { + "Name" = "8:BannerBitmap" + "DisplayName" = "8:#1001" + "Description" = "8:#1101" + "Type" = "3:8" + "ContextData" = "8:Bitmap" + "Attributes" = "3:4" + "Setting" = "3:1" + "UsePlugInResources" = "11:TRUE" + } + } + } + "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_883E4215F7404FD2B27299E3D09CA1EE" + { + "Sequence" = "3:300" + "DisplayName" = "8:Confirm Installation" + "UseDynamicProperties" = "11:TRUE" + "IsDependency" = "11:FALSE" + "SourcePath" = "8:<VsdDialogDir>\\VsdAdminConfirmDlg.wid" + "Properties" + { + "BannerBitmap" + { + "Name" = "8:BannerBitmap" + "DisplayName" = "8:#1001" + "Description" = "8:#1101" + "Type" = "3:8" + "ContextData" = "8:Bitmap" + "Attributes" = "3:4" + "Setting" = "3:1" + "UsePlugInResources" = "11:TRUE" + } + } + } + "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_99855627211D468E907FCF6B662C325C" + { + "Sequence" = "3:100" + "DisplayName" = "8:Welcome" + "UseDynamicProperties" = "11:TRUE" + "IsDependency" = "11:FALSE" + "SourcePath" = "8:<VsdDialogDir>\\VsdAdminWelcomeDlg.wid" + "Properties" + { + "BannerBitmap" + { + "Name" = "8:BannerBitmap" + "DisplayName" = "8:#1001" + "Description" = "8:#1101" + "Type" = "3:8" + "ContextData" = "8:Bitmap" + "Attributes" = "3:4" + "Setting" = "3:1" + "UsePlugInResources" = "11:TRUE" + } + "CopyrightWarning" + { + "Name" = "8:CopyrightWarning" + "DisplayName" = "8:#1002" + "Description" = "8:#1102" + "Type" = "3:3" + "ContextData" = "8:" + "Attributes" = "3:0" + "Setting" = "3:1" + "Value" = "8:#1202" + "DefaultValue" = "8:#1202" + "UsePlugInResources" = "11:TRUE" + } + "Welcome" + { + "Name" = "8:Welcome" + "DisplayName" = "8:#1003" + "Description" = "8:#1103" + "Type" = "3:3" + "ContextData" = "8:" + "Attributes" = "3:0" + "Setting" = "3:1" + "Value" = "8:#1203" + "DefaultValue" = "8:#1203" + "UsePlugInResources" = "11:TRUE" + } + } + } + } + } + "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_90155C3C794546069868B80B82B57EE9" + { + "Name" = "8:#1902" + "Sequence" = "3:1" + "Attributes" = "3:3" + "Dialogs" + { + "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_4490713900D94D3B9375F45EE3575B13" + { + "Sequence" = "3:100" + "DisplayName" = "8:Finished" + "UseDynamicProperties" = "11:TRUE" + "IsDependency" = "11:FALSE" + "SourcePath" = "8:<VsdDialogDir>\\VsdFinishedDlg.wid" + "Properties" + { + "BannerBitmap" + { + "Name" = "8:BannerBitmap" + "DisplayName" = "8:#1001" + "Description" = "8:#1101" + "Type" = "3:8" + "ContextData" = "8:Bitmap" + "Attributes" = "3:4" + "Setting" = "3:1" + "UsePlugInResources" = "11:TRUE" + } + "UpdateText" + { + "Name" = "8:UpdateText" + "DisplayName" = "8:#1058" + "Description" = "8:#1158" + "Type" = "3:15" + "ContextData" = "8:" + "Attributes" = "3:0" + "Setting" = "3:1" + "Value" = "8:#1258" + "DefaultValue" = "8:#1258" + "UsePlugInResources" = "11:TRUE" + } + } + } + } + } + "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_A7B6301BE8B0403C959609D5053EDF6E" + { + "Name" = "8:#1902" + "Sequence" = "3:2" + "Attributes" = "3:3" + "Dialogs" + { + "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_D47DBC39DB33492AA6C089D6D13580FB" + { + "Sequence" = "3:100" + "DisplayName" = "8:Finished" + "UseDynamicProperties" = "11:TRUE" + "IsDependency" = "11:FALSE" + "SourcePath" = "8:<VsdDialogDir>\\VsdAdminFinishedDlg.wid" + "Properties" + { + "BannerBitmap" + { + "Name" = "8:BannerBitmap" + "DisplayName" = "8:#1001" + "Description" = "8:#1101" + "Type" = "3:8" + "ContextData" = "8:Bitmap" + "Attributes" = "3:4" + "Setting" = "3:1" + "UsePlugInResources" = "11:TRUE" + } + } + } + } + } + "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_BA6A3FEC255C49059A6576E2F533202F" + { + "Name" = "8:#1901" + "Sequence" = "3:2" + "Attributes" = "3:2" + "Dialogs" + { + "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_A46B26FE90274EBB937E90E163295D0B" + { + "Sequence" = "3:100" + "DisplayName" = "8:Progress" + "UseDynamicProperties" = "11:TRUE" + "IsDependency" = "11:FALSE" + "SourcePath" = "8:<VsdDialogDir>\\VsdAdminProgressDlg.wid" + "Properties" + { + "BannerBitmap" + { + "Name" = "8:BannerBitmap" + "DisplayName" = "8:#1001" + "Description" = "8:#1101" + "Type" = "3:8" + "ContextData" = "8:Bitmap" + "Attributes" = "3:4" + "Setting" = "3:1" + "UsePlugInResources" = "11:TRUE" + } + "ShowProgress" + { + "Name" = "8:ShowProgress" + "DisplayName" = "8:#1009" + "Description" = "8:#1109" + "Type" = "3:5" + "ContextData" = "8:1;True=1;False=0" + "Attributes" = "3:0" + "Setting" = "3:0" + "Value" = "3:1" + "DefaultValue" = "3:1" + "UsePlugInResources" = "11:TRUE" + } + } + } + } + } + } + "MergeModule" + { + } + "ProjectOutput" + { + } + } +} From eaa8e36a6756d54ff65ec2644b6f40b407a43fda Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 8 Jun 2023 11:09:44 +0000 Subject: [PATCH 1953/3485] Updating readme file for ubuntu20 version 20230604.1 (#7673) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2004-Readme.md | 128 +++++++++++++++--------------- 1 file changed, 65 insertions(+), 63 deletions(-) diff --git a/images/linux/Ubuntu2004-Readme.md b/images/linux/Ubuntu2004-Readme.md index 12b2332bdb43..db9ce022c2d6 100644 --- a/images/linux/Ubuntu2004-Readme.md +++ b/images/linux/Ubuntu2004-Readme.md @@ -1,11 +1,13 @@ | Announcements | |-| -| [python2.7 will be removed from the images on May 22, 2023](https://github.com/actions/runner-images/issues/7401) | +| [[All OSs] .NET 3.1 will be removed from the images on July, 3](https://github.com/actions/runner-images/issues/7667) | +| [Actions runner image scheduled maintenance (June 2 2023 through June 12 20223)](https://github.com/actions/runner-images/issues/7660) | +| [python2.7 will be removed from the images on June 12, 2023](https://github.com/actions/runner-images/issues/7401) | *** # Ubuntu 20.04 - OS Version: 20.04.6 LTS -- Kernel Version: 5.15.0-1038-azure -- Image Version: 20230517.1 +- Kernel Version: 5.15.0-1039-azure +- Image Version: 20230604.1 - Systemd version: 245.4-4ubuntu3.21 ## Installed Software @@ -17,7 +19,7 @@ - Clang-tidy: 10.0.0, 11.0.0, 12.0.0 - Dash 0.5.10.2-6 - Erlang 25.3 (Eshell 13.2) -- Erlang rebar3 3.20.0 +- Erlang rebar3 3.22.0 - GNU C++: 9.4.0, 10.3.0 - GNU Fortran: 9.4.0, 10.3.0 - Julia 1.9.0 @@ -29,12 +31,12 @@ - Python 3.8.10 - Python3 3.8.10 - Ruby 2.7.0p0 -- Swift 5.8 +- Swift 5.8.1 ### Package Management - cpan 1.64 - Helm 3.12.0 -- Homebrew 4.0.18 +- Homebrew 4.0.20 - Miniconda 23.3.1 - Npm 9.5.1 - NuGet 6.3.1.1 @@ -42,7 +44,7 @@ - Pip3 20.0.2 - Pipx 1.2.0 - RubyGems 3.1.2 -- Vcpkg (build from commit 7b30311f0) +- Vcpkg (build from commit 662dbb50e) - Yarn 1.22.19 #### Environment variables @@ -64,30 +66,30 @@ to accomplish this. - Gradle 8.1.1 - Lerna 6.6.2 - Maven 3.8.8 -- Sbt 1.8.3 +- Sbt 1.9.0 ### Tools -- Ansible 2.13.9 +- Ansible 2.13.10 - apt-fast 1.9.12 -- AzCopy 10.18.1 - available by `azcopy` and `azcopy10` aliases -- Bazel 6.2.0 +- AzCopy 10.19.0 - available by `azcopy` and `azcopy10` aliases +- Bazel 6.2.1 - Bazelisk 1.13.2 - Bicep 0.17.1 - Buildah 1.22.3 -- CMake 3.26.3 -- CodeQL Action Bundles 2.13.0 2.13.1 -- Docker Amazon ECR Credential Helper 0.7.0 +- CMake 3.26.4 +- CodeQL Action Bundles 2.13.1 2.13.3 +- Docker Amazon ECR Credential Helper 0.7.1 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.17.3+azure-1 +- Docker Compose v2 2.18.0+azure-1 - Docker-Buildx 0.10.4 -- Docker-Moby Client 20.10.24+azure-1 -- Docker-Moby Server 20.10.24+azure-1 -- Fastlane 2.212.2 +- Docker-Moby Client 20.10.25+azure-1 +- Docker-Moby Server 20.10.25+azure-1 +- Fastlane 2.213.0 - Git 2.40.1 - Git LFS 3.3.0 - Git-ftp 1.6.0 - Haveged 1.9.1 -- Heroku 8.1.3 +- Heroku 8.1.7 - HHVM (HipHop VM) 4.172.1 - jq 1.6 - Kind 0.19.0 @@ -100,35 +102,35 @@ to accomplish this. - n 9.1.0 - Newman 5.3.2 - nvm 0.39.3 -- OpenSSL 1.1.1f-1ubuntu2.18 -- Packer 1.8.7 -- Parcel 2.8.3 +- OpenSSL 1.1.1f-1ubuntu2.19 +- Packer 1.9.1 +- Parcel 2.9.1 - PhantomJS 2.1.1 2.1.1 - Podman 3.4.2 -- Pulumi 3.67.1 +- Pulumi 3.69.0 - R 4.3.0 - Skopeo 1.5.0 - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 - Terraform 1.4.6 -- yamllint 1.31.0 -- yq 4.33.3 +- yamllint 1.32.0 +- yq 4.34.1 - zstd 1.5.5 ### CLI Tools -- Alibaba Cloud CLI 3.0.164 -- AWS CLI 2.11.20 +- Alibaba Cloud CLI 3.0.165 +- AWS CLI 2.11.25 - AWS CLI Session Manager Plugin 1.2.463.0 -- AWS SAM CLI 1.84.0 -- Azure CLI 2.48.1 +- AWS SAM CLI 1.85.0 +- Azure CLI 2.49.0 - Azure CLI (azure-devops) 0.26.0 -- GitHub CLI 2.29.0 -- Google Cloud SDK 431.0.0 +- GitHub CLI 2.30.0 +- Google Cloud SDK 433.0.1 - Hub CLI 2.14.2 -- Netlify CLI 15.1.1 -- OpenShift CLI 4.12.16 +- Netlify CLI 15.3.1 +- OpenShift CLI 4.13.1 - ORAS CLI 1.0.0 -- Vercel CLI 29.3.3 +- Vercel CLI 30.1.2 ### Java | Version | Vendor | Environment Variable | @@ -139,7 +141,7 @@ to accomplish this. ### PHP Tools - PHP: 7.4.33, 8.0.28, 8.1.18, 8.2.6 -- Composer 2.5.5 +- Composer 2.5.7 - PHPUnit 8.5.33 ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. @@ -147,32 +149,32 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ### Haskell Tools - Cabal 3.10.1.0 -- GHC 9.6.1 +- GHC 9.6.2 - GHCup 0.1.19.2 -- Stack 2.9.3 +- Stack 2.11.1 ### Rust Tools -- Cargo 1.69.0 -- Rust 1.69.0 -- Rustdoc 1.69.0 +- Cargo 1.70.0 +- Rust 1.70.0 +- Rustdoc 1.70.0 - Rustup 1.26.0 #### Packages - Bindgen 0.65.1 - Cargo audit 0.17.6 -- Cargo clippy 0.1.69 +- Cargo clippy 0.1.70 - Cargo outdated 0.11.2 -- Cbindgen 0.24.3 +- Cbindgen 0.24.5 - Rustfmt 1.5.2 ### Browsers and Drivers -- Google Chrome 113.0.5672.126 -- ChromeDriver 113.0.5672.63 -- Chromium 113.0.5672.0 -- Microsoft Edge 113.0.1774.42 -- Microsoft Edge WebDriver 113.0.1774.42 +- Google Chrome 114.0.5735.90 +- ChromeDriver 114.0.5735.90 +- Chromium 114.0.5733.0 +- Microsoft Edge 114.0.1823.37 +- Microsoft Edge WebDriver 114.0.1823.37 - Selenium server 4.9.0 -- Mozilla Firefox 113.0.1 +- Mozilla Firefox 114.0 - Geckodriver 0.33.0 #### Environment variables @@ -185,10 +187,10 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ### .NET Tools - .NET Core SDK: 3.1.120, 3.1.202, 3.1.302, 3.1.426, 6.0.408, 7.0.105, 7.0.203, 7.0.302 -- nbgv 3.6.132+bc56096f69 +- nbgv 3.6.133+2d32d93cb1 ### Databases -- MongoDB 5.0.17 +- MongoDB 5.0.18 - sqlite3 3.31.1 #### PostgreSQL @@ -268,9 +270,9 @@ Use the following command as a part of your job to start the service: 'sudo syst | Package Name | Version | | -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | | Android Command Line Tools | 9.0 | -| Android Emulator | 32.1.12 | +| Android Emulator | 32.1.13 | | Android SDK Build-tools | 33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | -| Android SDK Platform-Tools | 34.0.1 | +| Android SDK Platform-Tools | 34.0.3 | | Android SDK Platforms | android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | | Android SDK Tools | 26.1.1 | | Android Support Repository | 47.0.0 | @@ -297,21 +299,21 @@ Use the following command as a part of your job to start the service: 'sudo syst | alpine:3.15 | sha256:ecbdce53b2c2f43ab1b19418bcbd3f120a23547d9497030c8d978114512b883e | 2023-03-29 | | alpine:3.16 | sha256:c2b622f6e510a0d25bccaffa9e67b75a6860cb09b74bb58cfc36a9ef4331109f | 2023-03-29 | | alpine:3.17 | sha256:124c7d2707904eea7431fffe91522a01e5a861a624ee31d03372cc1d138a3126 | 2023-03-29 | -| buildpack-deps:bullseye | sha256:373587e78550f0918d16b793d1ead24c3f489a14c3af85da1096e2a683908e0c | 2023-05-03 | -| buildpack-deps:buster | sha256:bfefe2afb02a82c76d955f2c158b3b5aa96e7afcf262727e8f37ccdea60a39c5 | 2023-05-03 | +| buildpack-deps:bullseye | sha256:1b8ef32e6ebc10abab974c91d1c4659b3cda831bf2938ae857cdd2d36f58b1d8 | 2023-05-23 | +| buildpack-deps:buster | sha256:c15924ddbee8cbaac4ab82d735499f8e3fb14be38943544e3c8333c089c05485 | 2023-05-23 | | buildpack-deps:stretch | sha256:78e995165a5788c2f55aed6e548d8f6c1534830d4310c870408fccb2da8c5b2e | 2022-06-23 | -| debian:10 | sha256:cca6bcced970f7634197ff1821aabb452024eb437958ab98bfc146ece96969c6 | 2023-05-02 | -| debian:11 | sha256:63d62ae233b588d6b426b7b072d79d1306bfd02a72bff1fc045b8511cc89ee09 | 2023-05-02 | +| debian:10 | sha256:322859539526a04978dee1a2575b515295f6706f17d280f877a634299a7c1414 | 2023-05-23 | +| debian:11 | sha256:432f545c6ba13b79e2681f4cc4858788b0ab099fc1cca799cc0fae4687c69070 | 2023-05-23 | | debian:9 | sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be | 2022-06-23 | | moby/buildkit:latest | sha256:d6fa89830c26919acba23c5cafa09df0c3ec1fbde20bb2a15ff349e0795241f4 | 2023-04-20 | | node:14 | sha256:a158d3b9b4e3fa813fa6c8c590b8f0a860e015ad4e59bbce5744d2f6fd8461aa | 2023-04-12 | | node:14-alpine | sha256:434215b487a329c9e867202ff89e704d3a75e554822e07f3e0c0f9e606121b33 | 2023-03-29 | -| node:16 | sha256:550f484fc5f314b575f5e397c9e2c71d7f218e59729fcda9ffa7ea1fc825dce7 | 2023-05-04 | -| node:16-alpine | sha256:f1657204d3463bce763cefa5b25e48c28af6fe0cdb0f68b354f0f8225ef61be7 | 2023-03-29 | -| node:18 | sha256:3f567a26b6b6d601fb2b168d4f987b50697617ead15bfc0e0152e600ac48d0fe | 2023-05-04 | -| node:18-alpine | sha256:1ccc70acda680aa4ba47f53e7c40b2d4d6892de74817128e0662d32647dd7f4d | 2023-04-13 | +| node:16 | sha256:2ed6bba040f90005db9785927689c0d9a9442ca2cf9a59dc52297d684285c094 | 2023-05-23 | +| node:16-alpine | sha256:bca38851a77922e849907c57588bdf3dfcf95725186d7c26cdfd64da730989d3 | 2023-06-04 | +| node:18 | sha256:8cdf7234449f35e579f7491137807ddb3a089f028862f7ab69af437cc9f47ff1 | 2023-05-23 | +| node:18-alpine | sha256:f41850f74ff16a33daff988e2ea06ef8f5daeb6fb84913c7df09552a98caba09 | 2023-06-04 | | ubuntu:16.04 | sha256:1f1a2d56de1d604801a9671f301190704c25d604a416f59e03c04f5c6ffee0d6 | 2021-08-31 | -| ubuntu:18.04 | sha256:14f1045816502e16fcbfc0b2a76747e9f5e40bc3899f8cfe20745abaafeaeab3 | 2023-05-12 | +| ubuntu:18.04 | sha256:152dc042452c496007f07ca9127571cb9c29697f42acbfad72324b2bb2e43c98 | 2023-05-30 | | ubuntu:20.04 | sha256:db8bf6f4fb351aa7a26e27ba2686cf35a6a409f65603e59d4c203e58387dc6b3 | 2023-04-13 | ### Installed apt packages @@ -321,7 +323,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | aria2 | 1.35.0-1build1 | | autoconf | 2.69-11.1 | | automake | 1:1.16.1-4ubuntu6 | -| binutils | 2.34-6ubuntu1.4 | +| binutils | 2.34-6ubuntu1.5 | | bison | 2:3.5.1+dfsg-1 | | brotli | 1.0.7-6ubuntu0.1 | | coreutils | 8.30-3ubuntu2 | @@ -387,7 +389,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | texinfo | 6.7.0.dfsg.2-5 | | time | 1.7-25.1build1 | | tk | 8.6.9+1 | -| tzdata | 2023c-0ubuntu0.20.04.1 | +| tzdata | 2023c-0ubuntu0.20.04.2 | | upx | 3.95-2build1 | | xorriso | 1.5.2-1 | | xvfb | 2:1.20.13-1ubuntu1\~20.04.8 | From 8504aa35f2838b77e1818fb096ff8ea4e0f6b520 Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Thu, 8 Jun 2023 17:26:50 +0200 Subject: [PATCH 1954/3485] [macos] Adjust hcl2 packer templates with decoding (#7685) --- images/macos/templates/macOS-11.anka.pkr.hcl | 7 ++----- images/macos/templates/macOS-12.anka.pkr.hcl | 7 ++----- images/macos/templates/macOS-13.anka.pkr.hcl | 7 ++----- images/macos/templates/macOS-13.arm64.anka.pkr.hcl | 7 ++----- 4 files changed, 8 insertions(+), 20 deletions(-) diff --git a/images/macos/templates/macOS-11.anka.pkr.hcl b/images/macos/templates/macOS-11.anka.pkr.hcl index e2e1ee2ede25..6c86c5f20446 100644 --- a/images/macos/templates/macOS-11.anka.pkr.hcl +++ b/images/macos/templates/macOS-11.anka.pkr.hcl @@ -189,13 +189,10 @@ build { } provisioner "shell" { inline = [ - "mkdir -p ~/.fastlane/spaceship/${var.xcode_install_user}" + "mkdir -p ~/.fastlane/spaceship/${var.xcode_install_user}", + "echo ${var.xcversion_auth_cookie} | base64 --decode > ~/.fastlane/spaceship/${var.xcode_install_user}/cookie" ] } - provisioner "file" { - destination = "~/.fastlane/spaceship/${var.xcode_install_user}/cookie" - source = "${var.xcversion_auth_cookie}" - } provisioner "shell" { script = "./provision/core/xcode.ps1" environment_vars = [ diff --git a/images/macos/templates/macOS-12.anka.pkr.hcl b/images/macos/templates/macOS-12.anka.pkr.hcl index f5f48aa61d54..1b4adfe747bf 100644 --- a/images/macos/templates/macOS-12.anka.pkr.hcl +++ b/images/macos/templates/macOS-12.anka.pkr.hcl @@ -190,13 +190,10 @@ build { } provisioner "shell" { inline = [ - "mkdir -p ~/.fastlane/spaceship/${var.xcode_install_user}" + "mkdir -p ~/.fastlane/spaceship/${var.xcode_install_user}", + "echo ${var.xcversion_auth_cookie} | base64 --decode > ~/.fastlane/spaceship/${var.xcode_install_user}/cookie" ] } - provisioner "file" { - destination = "~/.fastlane/spaceship/${var.xcode_install_user}/cookie" - source = "${var.xcversion_auth_cookie}" - } provisioner "shell" { script = "./provision/core/xcode.ps1" environment_vars = [ diff --git a/images/macos/templates/macOS-13.anka.pkr.hcl b/images/macos/templates/macOS-13.anka.pkr.hcl index fc844f7cf409..27e0a679d783 100644 --- a/images/macos/templates/macOS-13.anka.pkr.hcl +++ b/images/macos/templates/macOS-13.anka.pkr.hcl @@ -184,13 +184,10 @@ build { } provisioner "shell" { inline = [ - "mkdir -p ~/.fastlane/spaceship/${var.xcode_install_user}" + "mkdir -p ~/.fastlane/spaceship/${var.xcode_install_user}", + "echo ${var.xcversion_auth_cookie} | base64 --decode > ~/.fastlane/spaceship/${var.xcode_install_user}/cookie" ] } - provisioner "file" { - destination = "~/.fastlane/spaceship/${var.xcode_install_user}/cookie" - source = "${var.xcversion_auth_cookie}" - } provisioner "shell" { script = "./provision/core/xcode.ps1" environment_vars = [ diff --git a/images/macos/templates/macOS-13.arm64.anka.pkr.hcl b/images/macos/templates/macOS-13.arm64.anka.pkr.hcl index 6df2c2147a74..558cd5601030 100644 --- a/images/macos/templates/macOS-13.arm64.anka.pkr.hcl +++ b/images/macos/templates/macOS-13.arm64.anka.pkr.hcl @@ -184,13 +184,10 @@ build { } provisioner "shell" { inline = [ - "mkdir -p ~/.fastlane/spaceship/${var.xcode_install_user}" + "mkdir -p ~/.fastlane/spaceship/${var.xcode_install_user}", + "echo ${var.xcversion_auth_cookie} | base64 --decode > ~/.fastlane/spaceship/${var.xcode_install_user}/cookie" ] } - provisioner "file" { - destination = "~/.fastlane/spaceship/${var.xcode_install_user}/cookie" - source = "${var.xcversion_auth_cookie}" - } provisioner "shell" { script = "./provision/core/xcode.ps1" environment_vars = [ From b34097f2db133d8b69b02b202927045f39353edf Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 8 Jun 2023 16:54:10 +0000 Subject: [PATCH 1955/3485] Updating readme file for ubuntu22 version 20230604.1 (#7674) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2204-Readme.md | 130 +++++++++++++++--------------- 1 file changed, 66 insertions(+), 64 deletions(-) diff --git a/images/linux/Ubuntu2204-Readme.md b/images/linux/Ubuntu2204-Readme.md index 8048efbcc67f..f49074ff52ad 100644 --- a/images/linux/Ubuntu2204-Readme.md +++ b/images/linux/Ubuntu2204-Readme.md @@ -1,11 +1,13 @@ | Announcements | |-| -| [python2.7 will be removed from the images on May 22, 2023](https://github.com/actions/runner-images/issues/7401) | +| [[All OSs] .NET 3.1 will be removed from the images on July, 3](https://github.com/actions/runner-images/issues/7667) | +| [Actions runner image scheduled maintenance (June 2 2023 through June 12 20223)](https://github.com/actions/runner-images/issues/7660) | +| [python2.7 will be removed from the images on June 12, 2023](https://github.com/actions/runner-images/issues/7401) | *** # Ubuntu 22.04 - OS Version: 22.04.2 LTS -- Kernel Version: 5.15.0-1038-azure -- Image Version: 20230517.1 +- Kernel Version: 5.15.0-1039-azure +- Image Version: 20230604.1 - Systemd version: 249.11-0ubuntu3.9 ## Installed Software @@ -27,12 +29,12 @@ - Python 3.10.6 - Python3 3.10.6 - Ruby 3.0.2p107 -- Swift 5.8 +- Swift 5.8.1 ### Package Management - cpan 1.64 - Helm 3.12.0 -- Homebrew 4.0.18 +- Homebrew 4.0.20 - Miniconda 23.3.1 - Npm 9.5.1 - NuGet 6.3.1.1 @@ -40,7 +42,7 @@ - Pip3 22.0.2 - Pipx 1.2.0 - RubyGems 3.3.5 -- Vcpkg (build from commit 7b30311f0) +- Vcpkg (build from commit 662dbb50e) - Yarn 1.22.19 #### Environment variables @@ -62,27 +64,27 @@ to accomplish this. - Maven 3.8.8 ### Tools -- Ansible 2.14.5 +- Ansible 2.15.0 - apt-fast 1.9.12 -- AzCopy 10.18.1 - available by `azcopy` and `azcopy10` aliases -- Bazel 6.2.0 +- AzCopy 10.19.0 - available by `azcopy` and `azcopy10` aliases +- Bazel 6.2.1 - Bazelisk 1.13.2 - Bicep 0.17.1 - Buildah 1.23.1 -- CMake 3.26.3 -- CodeQL Action Bundles 2.13.0 2.13.1 -- Docker Amazon ECR Credential Helper 0.7.0 +- CMake 3.26.4 +- CodeQL Action Bundles 2.13.1 2.13.3 +- Docker Amazon ECR Credential Helper 0.7.1 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.17.3+azure-1 +- Docker Compose v2 2.18.0+azure-1 - Docker-Buildx 0.10.4 -- Docker-Moby Client 20.10.24+azure-1 -- Docker-Moby Server 20.10.24+azure-1 -- Fastlane 2.212.2 +- Docker-Moby Client 20.10.25+azure-1 +- Docker-Moby Server 20.10.25+azure-1 +- Fastlane 2.213.0 - Git 2.40.1 - Git LFS 3.3.0 - Git-ftp 1.6.0 - Haveged 1.9.14 -- Heroku 8.1.3 +- Heroku 8.1.7 - jq 1.6 - Kind 0.19.0 - Kubectl 1.27.2 @@ -94,34 +96,34 @@ to accomplish this. - n 9.1.0 - Newman 5.3.2 - nvm 0.39.3 -- OpenSSL 3.0.2-0ubuntu1.9 -- Packer 1.8.7 -- Parcel 2.8.3 +- OpenSSL 3.0.2-0ubuntu1.10 +- Packer 1.9.1 +- Parcel 2.9.1 - Podman 3.4.4 -- Pulumi 3.67.1 +- Pulumi 3.69.0 - R 4.3.0 - Skopeo 1.4.1 - Sphinx Open Source Search Server 2.2.11 - SVN 1.14.1 - Terraform 1.4.6 -- yamllint 1.31.0 -- yq 4.33.3 +- yamllint 1.32.0 +- yq 4.34.1 - zstd 1.5.5 ### CLI Tools -- Alibaba Cloud CLI 3.0.164 -- AWS CLI 2.11.20 +- Alibaba Cloud CLI 3.0.165 +- AWS CLI 2.11.25 - AWS CLI Session Manager Plugin 1.2.463.0 -- AWS SAM CLI 1.84.0 -- Azure CLI 2.48.1 +- AWS SAM CLI 1.85.0 +- Azure CLI 2.49.0 - Azure CLI (azure-devops) 0.26.0 -- GitHub CLI 2.29.0 -- Google Cloud SDK 431.0.0 +- GitHub CLI 2.30.0 +- Google Cloud SDK 433.0.1 - Hub CLI 2.14.2 -- Netlify CLI 15.1.1 -- OpenShift CLI 4.12.16 +- Netlify CLI 15.3.1 +- OpenShift CLI 4.13.1 - ORAS CLI 1.0.0 -- Vercel CLI 29.3.3 +- Vercel CLI 30.1.2 ### Java | Version | Vendor | Environment Variable | @@ -132,7 +134,7 @@ to accomplish this. ### PHP Tools - PHP: 8.1.2 -- Composer 2.5.5 +- Composer 2.5.7 - PHPUnit 8.5.33 ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. @@ -140,32 +142,32 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ### Haskell Tools - Cabal 3.10.1.0 -- GHC 9.6.1 +- GHC 9.6.2 - GHCup 0.1.19.2 -- Stack 2.9.3 +- Stack 2.11.1 ### Rust Tools -- Cargo 1.69.0 -- Rust 1.69.0 -- Rustdoc 1.69.0 +- Cargo 1.70.0 +- Rust 1.70.0 +- Rustdoc 1.70.0 - Rustup 1.26.0 #### Packages - Bindgen 0.65.1 - Cargo audit 0.17.6 -- Cargo clippy 0.1.69 +- Cargo clippy 0.1.70 - Cargo outdated 0.11.2 -- Cbindgen 0.24.3 +- Cbindgen 0.24.5 - Rustfmt 1.5.2 ### Browsers and Drivers -- Google Chrome 113.0.5672.126 -- ChromeDriver 113.0.5672.63 -- Chromium 113.0.5672.0 -- Microsoft Edge 113.0.1774.42 -- Microsoft Edge WebDriver 113.0.1774.42 +- Google Chrome 114.0.5735.90 +- ChromeDriver 114.0.5735.90 +- Chromium 114.0.5733.0 +- Microsoft Edge 114.0.1823.37 +- Microsoft Edge WebDriver 114.0.1823.37 - Selenium server 4.9.0 -- Mozilla Firefox 113.0.1 +- Mozilla Firefox 114.0 - Geckodriver 0.33.0 #### Environment variables @@ -178,7 +180,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ### .NET Tools - .NET Core SDK: 6.0.408, 7.0.105, 7.0.203, 7.0.302 -- nbgv 3.6.132+bc56096f69 +- nbgv 3.6.133+2d32d93cb1 ### Databases - sqlite3 3.37.2 @@ -251,9 +253,9 @@ Use the following command as a part of your job to start the service: 'sudo syst | Package Name | Version | | -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | | Android Command Line Tools | 9.0 | -| Android Emulator | 32.1.12 | +| Android Emulator | 32.1.13 | | Android SDK Build-tools | 33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | -| Android SDK Platform-Tools | 34.0.1 | +| Android SDK Platform-Tools | 34.0.3 | | Android SDK Platforms | android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | | Android SDK Tools | 26.1.1 | | Android Support Repository | 47.0.0 | @@ -280,20 +282,20 @@ Use the following command as a part of your job to start the service: 'sudo syst | alpine:3.15 | sha256:ecbdce53b2c2f43ab1b19418bcbd3f120a23547d9497030c8d978114512b883e | 2023-03-29 | | alpine:3.16 | sha256:c2b622f6e510a0d25bccaffa9e67b75a6860cb09b74bb58cfc36a9ef4331109f | 2023-03-29 | | alpine:3.17 | sha256:124c7d2707904eea7431fffe91522a01e5a861a624ee31d03372cc1d138a3126 | 2023-03-29 | -| buildpack-deps:bullseye | sha256:373587e78550f0918d16b793d1ead24c3f489a14c3af85da1096e2a683908e0c | 2023-05-03 | -| buildpack-deps:buster | sha256:bfefe2afb02a82c76d955f2c158b3b5aa96e7afcf262727e8f37ccdea60a39c5 | 2023-05-03 | -| debian:10 | sha256:cca6bcced970f7634197ff1821aabb452024eb437958ab98bfc146ece96969c6 | 2023-05-02 | -| debian:11 | sha256:63d62ae233b588d6b426b7b072d79d1306bfd02a72bff1fc045b8511cc89ee09 | 2023-05-02 | +| buildpack-deps:bullseye | sha256:1b8ef32e6ebc10abab974c91d1c4659b3cda831bf2938ae857cdd2d36f58b1d8 | 2023-05-23 | +| buildpack-deps:buster | sha256:c15924ddbee8cbaac4ab82d735499f8e3fb14be38943544e3c8333c089c05485 | 2023-05-23 | +| debian:10 | sha256:322859539526a04978dee1a2575b515295f6706f17d280f877a634299a7c1414 | 2023-05-23 | +| debian:11 | sha256:432f545c6ba13b79e2681f4cc4858788b0ab099fc1cca799cc0fae4687c69070 | 2023-05-23 | | moby/buildkit:latest | sha256:d6fa89830c26919acba23c5cafa09df0c3ec1fbde20bb2a15ff349e0795241f4 | 2023-04-20 | | node:14 | sha256:a158d3b9b4e3fa813fa6c8c590b8f0a860e015ad4e59bbce5744d2f6fd8461aa | 2023-04-12 | | node:14-alpine | sha256:434215b487a329c9e867202ff89e704d3a75e554822e07f3e0c0f9e606121b33 | 2023-03-29 | -| node:16 | sha256:550f484fc5f314b575f5e397c9e2c71d7f218e59729fcda9ffa7ea1fc825dce7 | 2023-05-04 | -| node:16-alpine | sha256:f1657204d3463bce763cefa5b25e48c28af6fe0cdb0f68b354f0f8225ef61be7 | 2023-03-29 | -| node:18 | sha256:3f567a26b6b6d601fb2b168d4f987b50697617ead15bfc0e0152e600ac48d0fe | 2023-05-04 | -| node:18-alpine | sha256:1ccc70acda680aa4ba47f53e7c40b2d4d6892de74817128e0662d32647dd7f4d | 2023-04-13 | -| ubuntu:18.04 | sha256:14f1045816502e16fcbfc0b2a76747e9f5e40bc3899f8cfe20745abaafeaeab3 | 2023-05-12 | +| node:16 | sha256:2ed6bba040f90005db9785927689c0d9a9442ca2cf9a59dc52297d684285c094 | 2023-05-23 | +| node:16-alpine | sha256:bca38851a77922e849907c57588bdf3dfcf95725186d7c26cdfd64da730989d3 | 2023-06-04 | +| node:18 | sha256:8cdf7234449f35e579f7491137807ddb3a089f028862f7ab69af437cc9f47ff1 | 2023-05-23 | +| node:18-alpine | sha256:f41850f74ff16a33daff988e2ea06ef8f5daeb6fb84913c7df09552a98caba09 | 2023-06-04 | +| ubuntu:18.04 | sha256:152dc042452c496007f07ca9127571cb9c29697f42acbfad72324b2bb2e43c98 | 2023-05-30 | | ubuntu:20.04 | sha256:db8bf6f4fb351aa7a26e27ba2686cf35a6a409f65603e59d4c203e58387dc6b3 | 2023-04-13 | -| ubuntu:22.04 | sha256:dfd64a3b4296d8c9b62aa3309984f8620b98d87e47492599ee20739e8eb54fbf | 2023-04-25 | +| ubuntu:22.04 | sha256:ac58ff7fe25edc58bdf0067ca99df00014dbd032e2246d30a722fa348fd799a5 | 2023-05-22 | ### Installed apt packages | Name | Version | @@ -302,14 +304,14 @@ Use the following command as a part of your job to start the service: 'sudo syst | aria2 | 1.36.0-1 | | autoconf | 2.71-2 | | automake | 1:1.16.5-1.3 | -| binutils | 2.38-4ubuntu2.1 | +| binutils | 2.38-4ubuntu2.2 | | bison | 2:3.8.2+dfsg-1build1 | | brotli | 1.0.9-2build6 | | coreutils | 8.32-4.1ubuntu1 | | dbus | 1.12.20-2ubuntu4.1 | | dnsutils | 1:9.18.12-0ubuntu0.22.04.1 | -| dpkg | 1.21.1ubuntu2.1 | -| dpkg-dev | 1.21.1ubuntu2.1 | +| dpkg | 1.21.1ubuntu2.2 | +| dpkg-dev | 1.21.1ubuntu2.2 | | fakeroot | 1.28-1ubuntu1 | | file | 1:5.41-3 | | flex | 2.6.4-8build2 | @@ -334,7 +336,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | libmagickwand-dev | 8:6.9.11.60+dfsg-1.3ubuntu0.22.04.3 | | libsecret-1-dev | 0.20.5-2 | | libsqlite3-dev | 3.37.2-2ubuntu0.1 | -| libssl-dev | 3.0.2-0ubuntu1.9 | +| libssl-dev | 3.0.2-0ubuntu1.10 | | libtool | 2.4.6-15build2 | | libunwind8 | 1.3.2-2build2 | | libxkbfile-dev | 1:1.1.0-1build3 | @@ -370,7 +372,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | texinfo | 6.8-4build1 | | time | 1.9-0.1build2 | | tk | 8.6.11+1build2 | -| tzdata | 2023c-0ubuntu0.22.04.1 | +| tzdata | 2023c-0ubuntu0.22.04.2 | | upx | 3.96-3 | | xorriso | 1.5.4-2 | | xvfb | 2:21.1.4-2ubuntu1.7\~22.04.1 | From e8fdf030d55bc81e69613617dc3c53c2a784bda3 Mon Sep 17 00:00:00 2001 From: Grant Hutchins <github@nertzy.com> Date: Thu, 8 Jun 2023 16:54:30 -0500 Subject: [PATCH 1956/3485] Fix typo (#7689) --- images/linux/Ubuntu2004-Readme.md | 2 +- images/linux/Ubuntu2204-Readme.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/images/linux/Ubuntu2004-Readme.md b/images/linux/Ubuntu2004-Readme.md index db9ce022c2d6..9afe4330e492 100644 --- a/images/linux/Ubuntu2004-Readme.md +++ b/images/linux/Ubuntu2004-Readme.md @@ -1,7 +1,7 @@ | Announcements | |-| | [[All OSs] .NET 3.1 will be removed from the images on July, 3](https://github.com/actions/runner-images/issues/7667) | -| [Actions runner image scheduled maintenance (June 2 2023 through June 12 20223)](https://github.com/actions/runner-images/issues/7660) | +| [Actions runner image scheduled maintenance (June 2 2023 through June 12 2023)](https://github.com/actions/runner-images/issues/7660) | | [python2.7 will be removed from the images on June 12, 2023](https://github.com/actions/runner-images/issues/7401) | *** # Ubuntu 20.04 diff --git a/images/linux/Ubuntu2204-Readme.md b/images/linux/Ubuntu2204-Readme.md index f49074ff52ad..98da729f75fa 100644 --- a/images/linux/Ubuntu2204-Readme.md +++ b/images/linux/Ubuntu2204-Readme.md @@ -1,7 +1,7 @@ | Announcements | |-| | [[All OSs] .NET 3.1 will be removed from the images on July, 3](https://github.com/actions/runner-images/issues/7667) | -| [Actions runner image scheduled maintenance (June 2 2023 through June 12 20223)](https://github.com/actions/runner-images/issues/7660) | +| [Actions runner image scheduled maintenance (June 2 2023 through June 12 2023)](https://github.com/actions/runner-images/issues/7660) | | [python2.7 will be removed from the images on June 12, 2023](https://github.com/actions/runner-images/issues/7401) | *** # Ubuntu 22.04 From 40fd970a62b12761af18e82e682bc32dc6865de9 Mon Sep 17 00:00:00 2001 From: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com> Date: Fri, 9 Jun 2023 17:17:49 +0200 Subject: [PATCH 1957/3485] [macos] add XCode 15 to MacOS 13 images (#7693) --- images/macos/toolsets/toolset-13.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/images/macos/toolsets/toolset-13.json b/images/macos/toolsets/toolset-13.json index 4c3844d1f2c8..2dac37de9566 100644 --- a/images/macos/toolsets/toolset-13.json +++ b/images/macos/toolsets/toolset-13.json @@ -3,6 +3,7 @@ "default": "14.2", "x64": { "versions": [ + { "link": "15.0", "version": "15.0.0" }, { "link": "14.3.1", "version": "14.3.1" }, { "link": "14.3", "version": "14.3.0" }, { "link": "14.2", "version": "14.2.0" }, @@ -11,6 +12,7 @@ }, "arm64":{ "versions": [ + { "link": "15.0", "version": "15.0.0" }, { "link": "14.3.1", "version": "14.3.1" }, { "link": "14.3", "version": "14.3.0" }, { "link": "14.2", "version": "14.2.0" }, From a00d9c23dc2c642ba0ffc8eec7d346534535e8a4 Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Fri, 9 Jun 2023 20:11:34 +0200 Subject: [PATCH 1958/3485] Update Visual Studio VC Component versions (#7694) --- images/win/toolsets/toolset-2022.json | 36 +++++++++++++-------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index 46bdd84daddf..463371a09c63 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -254,24 +254,24 @@ "Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.ARM.Spectre", "Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.ARM64", "Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.ARM64.Spectre", - "Microsoft.VisualStudio.Component.VC.14.35.17.5.ARM", - "Microsoft.VisualStudio.Component.VC.14.35.17.5.ARM.Spectre", - "Microsoft.VisualStudio.Component.VC.14.35.17.5.ARM64", - "Microsoft.VisualStudio.Component.VC.14.35.17.5.ARM64.Spectre", - "Microsoft.VisualStudio.Component.VC.14.35.17.5.x86.x64", - "Microsoft.VisualStudio.Component.VC.14.35.17.5.x86.x64.Spectre", - "Microsoft.VisualStudio.Component.VC.14.35.17.5.ATL", - "Microsoft.VisualStudio.Component.VC.14.35.17.5.ATL.Spectre", - "Microsoft.VisualStudio.Component.VC.14.35.17.5.ATL.ARM", - "Microsoft.VisualStudio.Component.VC.14.35.17.5.ATL.ARM.Spectre", - "Microsoft.VisualStudio.Component.VC.14.35.17.5.ATL.ARM64", - "Microsoft.VisualStudio.Component.VC.14.35.17.5.ATL.ARM64.Spectre", - "Microsoft.VisualStudio.Component.VC.14.35.17.5.MFC", - "Microsoft.VisualStudio.Component.VC.14.35.17.5.MFC.Spectre", - "Microsoft.VisualStudio.Component.VC.14.35.17.5.MFC.ARM", - "Microsoft.VisualStudio.Component.VC.14.35.17.5.MFC.ARM.Spectre", - "Microsoft.VisualStudio.Component.VC.14.35.17.5.MFC.ARM64", - "Microsoft.VisualStudio.Component.VC.14.35.17.5.MFC.ARM64.Spectre", + "Microsoft.VisualStudio.Component.VC.14.36.17.6.ARM.Spectre", + "Microsoft.VisualStudio.Component.VC.14.36.17.6.ARM", + "Microsoft.VisualStudio.Component.VC.14.36.17.6.ARM64.Spectre", + "Microsoft.VisualStudio.Component.VC.14.36.17.6.ARM64", + "Microsoft.VisualStudio.Component.VC.14.36.17.6.ATL.ARM.Spectre", + "Microsoft.VisualStudio.Component.VC.14.36.17.6.ATL.ARM", + "Microsoft.VisualStudio.Component.VC.14.36.17.6.ATL.ARM64.Spectre", + "Microsoft.VisualStudio.Component.VC.14.36.17.6.ATL.ARM64", + "Microsoft.VisualStudio.Component.VC.14.36.17.6.ATL.Spectre", + "Microsoft.VisualStudio.Component.VC.14.36.17.6.ATL", + "Microsoft.VisualStudio.Component.VC.14.36.17.6.MFC.ARM.Spectre", + "Microsoft.VisualStudio.Component.VC.14.36.17.6.MFC.ARM", + "Microsoft.VisualStudio.Component.VC.14.36.17.6.MFC.ARM64.Spectre", + "Microsoft.VisualStudio.Component.VC.14.36.17.6.MFC.ARM64", + "Microsoft.VisualStudio.Component.VC.14.36.17.6.MFC.Spectre", + "Microsoft.VisualStudio.Component.VC.14.36.17.6.MFC", + "Microsoft.VisualStudio.Component.VC.14.36.17.6.x86.x64.Spectre", + "Microsoft.VisualStudio.Component.VC.14.36.17.6.x86.x64", "Microsoft.VisualStudio.Component.VC.ATLMFC", "Microsoft.VisualStudio.Component.VC.ATLMFC.Spectre", "Microsoft.VisualStudio.Component.Windows10SDK.19041", From 277de3148a25b7bb5fe169646951ecb3625e8846 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 12 Jun 2023 12:35:48 +0000 Subject: [PATCH 1959/3485] Updating readme file for win19 version 20230606.1 (#7680) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2019-Readme.md | 86 ++++++++++++++++---------------- 1 file changed, 44 insertions(+), 42 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index f5dd95fa3ef6..7812845756f3 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -1,10 +1,12 @@ | Announcements | |-| -| [python2.7 will be removed from the images on May 22, 2023](https://github.com/actions/runner-images/issues/7401) | +| [[All OSs] .NET 3.1 will be removed from the images on July, 3](https://github.com/actions/runner-images/issues/7667) | +| [Actions runner image scheduled maintenance (June 2 2023 through June 12 20223)](https://github.com/actions/runner-images/issues/7660) | +| [python2.7 will be removed from the images on June 12, 2023](https://github.com/actions/runner-images/issues/7401) | *** # Windows Server 2019 - OS Version: 10.0.17763 Build 4377 -- Image Version: 20230517.1 +- Image Version: 20230606.1 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -24,16 +26,16 @@ - Ruby 2.5.9p229 ### Package Management -- Chocolatey 1.4.0 -- Composer 2.5.5 +- Chocolatey 2.0.0 +- Composer 2.5.7 - Helm 3.11.3 - Miniconda 23.3.1 (pre-installed on the image but not added to PATH) - NPM 9.5.1 -- NuGet 6.5.0.154 +- NuGet 6.6.0.61 - pip 23.1.2 (python 3.7) - Pipx 1.2.0 - RubyGems 2.7.6.3 -- Vcpkg (build from commit 7b30311f0) +- Vcpkg (build from commit 750591668) - Yarn 1.22.19 #### Environment variables @@ -46,81 +48,81 @@ - Ant 1.10.13 - Gradle 8.1 - Maven 3.8.7 -- sbt 1.8.3 +- sbt 1.9.0 ### Tools - 7zip 22.01 - aria2 1.36.0 -- azcopy 10.18.1 -- Bazel 6.2.0 +- azcopy 10.19.0 +- Bazel 6.2.1 - Bazelisk 1.13.2 - Bicep 0.17.1 - Cabal 3.10.1.0 -- CMake 3.26.3 -- CodeQL Action Bundles 2.13.0 2.13.1 -- Docker 24.0.0 +- CMake 3.26.4 +- CodeQL Action Bundles 2.13.1 2.13.3 +- Docker 24.0.2 - Docker Compose v1 1.29.2 - Docker Compose v2 2.18.1 - Docker-wincred 0.7.0 -- ghc 9.6.1 -- Git 2.40.1.windows.1 +- ghc 9.6.2 +- Git 2.41.0.windows.1 - Git LFS 3.3.0 -- Google Cloud SDK 431.0.0 -- ImageMagick 7.1.1-9 +- Google Cloud SDK 434.0.0 +- ImageMagick 7.1.1-11 - InnoSetup 6.2.2 - jq 1.6 - Kind 0.19.0 -- Kubectl 1.27.1 +- Kubectl 1.27.2 - Mercurial 5.0 - Mingw-w64 8.1.0 - Newman 5.3.2 - NSIS 3.08 -- OpenSSL 1.1.1t +- OpenSSL 1.1.1u - Packer 1.8.7 -- Parcel 2.8.3 -- Pulumi 3.67.1 +- Parcel 2.9.1 +- Pulumi 3.69.0 - R 4.3.0 - Service Fabric SDK 9.1.1436.9590 -- Stack 2.9.3 +- Stack 2.11.1 - Subversion (SVN) 1.14.2 - Swig 4.1.1 - VSWhere 3.1.4 - WinAppDriver 1.2.2009.02003 - WiX Toolset 3.11.2.4516 -- yamllint 1.31.0 +- yamllint 1.32.0 - zstd 1.5.5 ### CLI Tools -- Alibaba Cloud CLI 3.0.164 -- AWS CLI 2.11.20 -- AWS SAM CLI 1.84.0 +- Alibaba Cloud CLI 3.0.165 +- AWS CLI 2.11.25 +- AWS SAM CLI 1.86.0 - AWS Session Manager CLI 1.2.463.0 -- Azure CLI 2.48.1 +- Azure CLI 2.49.0 - Azure DevOps CLI extension 0.26.0 - Cloud Foundry CLI 6.53.0 -- GitHub CLI 2.29.0 +- GitHub CLI 2.30.0 - Hub CLI 2.14.2 ### Rust Tools -- Cargo 1.69.0 -- Rust 1.69.0 -- Rustdoc 1.69.0 +- Cargo 1.70.0 +- Rust 1.70.0 +- Rustdoc 1.70.0 - Rustup 1.26.0 #### Packages - bindgen 0.65.1 - cargo-audit 0.17.6 - cargo-outdated 0.11.2 -- cbindgen 0.24.3 -- Clippy 0.1.69 +- cbindgen 0.24.5 +- Clippy 0.1.70 - Rustfmt 1.5.2 ### Browsers and Drivers -- Google Chrome 113.0.5672.127 -- Chrome Driver 113.0.5672.63 -- Microsoft Edge 113.0.1774.42 -- Microsoft Edge Driver 113.0.1774.42 -- Mozilla Firefox 113.0.1 +- Google Chrome 114.0.5735.110 +- Chrome Driver 114.0.5735.90 +- Microsoft Edge 114.0.1823.37 +- Microsoft Edge Driver 114.0.1823.37 +- Mozilla Firefox 114.0 - Gecko Driver 0.33.0 - IE Driver 4.8.0.0 - Selenium server 4.9.0 @@ -226,7 +228,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Name | Version | ConfigFile | ServiceName | ServiceStatus | ListenPort | | ------ | ------- | ------------------------------------- | ----------- | ------------- | ---------- | | Apache | 2.4.55 | C:\tools\Apache24\conf\httpd.conf | Apache | Stopped | 80 | -| Nginx | 1.23.4 | C:\tools\nginx-1.23.4\conf\nginx.conf | nginx | Stopped | 80 | +| Nginx | 1.25.0 | C:\tools\nginx-1.25.0\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2019 | Name | Version | Path | @@ -499,7 +501,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Microsoft.AspNetCore.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 6.0.5, 6.0.16 - Microsoft.NETCore.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 6.0.5, 6.0.16 - Microsoft.WindowsDesktop.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 6.0.5, 6.0.16 -- nbgv 3.6.132+bc56096f69 +- nbgv 3.6.133+2d32d93cb1 ### PowerShell Tools - PowerShell 7.2.11 @@ -511,7 +513,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Az (Cached): 1.0.0.zip, 1.6.0.zip, 2.3.2.zip, 2.6.0.zip, 3.1.0.zip, 3.5.0.zip, 3.8.0.zip, 4.3.0.zip, 4.4.0.zip, 4.7.0.zip, 5.5.0.zip, 5.9.0.zip, 6.6.0.zip, 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.334 +- AWSPowershell: 4.1.346 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 - Microsoft.Graph: 1.27.0 @@ -519,7 +521,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - PowerShellGet: 1.0.0.1, 2.2.5 - PSScriptAnalyzer: 1.21.0 - PSWindowsUpdate: 2.2.0.3 -- SqlServer: 22.0.59 +- SqlServer: 22.1.1 - VSSetup: 2.2.16 ``` Azure PowerShell module 2.1.0 and AzureRM PowerShell module 2.1.0 are installed @@ -533,7 +535,7 @@ All other versions are saved but not installed. | Android Command Line Tools | 8.0 | | Android SDK Build-tools | 33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3<br>26.0.0 26.0.1 26.0.2 26.0.3<br>25.0.0 25.0.1 25.0.2 25.0.3<br>24.0.0 24.0.1 24.0.2 24.0.3<br>23.0.1 23.0.2 23.0.3<br>22.0.1<br>21.1.2<br>20.0.0<br>19.1.0 | | Android SDK Platforms | android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3)<br>android-26 (rev 2)<br>android-25 (rev 3)<br>android-24 (rev 2)<br>android-23 (rev 3)<br>android-22 (rev 2)<br>android-21 (rev 2)<br>android-20 (rev 2)<br>android-19 (rev 4) | -| Android SDK Platform-Tools | 34.0.1 | +| Android SDK Platform-Tools | 34.0.3 | | Android SDK Tools | 26.1.1 | | Android Support Repository | 47.0.0 | | CMake | 3.10.2<br>3.18.1<br>3.22.1 | From c07c474998dc5a54aad8d8d732bb648b02271c8a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 12 Jun 2023 13:00:49 +0000 Subject: [PATCH 1960/3485] Updating readme file for win22 version 20230606.1 (#7679) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2022-Readme.md | 84 ++++++++++++++++---------------- 1 file changed, 43 insertions(+), 41 deletions(-) diff --git a/images/win/Windows2022-Readme.md b/images/win/Windows2022-Readme.md index 4b497688b6ed..7f9fd773edd9 100644 --- a/images/win/Windows2022-Readme.md +++ b/images/win/Windows2022-Readme.md @@ -1,10 +1,12 @@ | Announcements | |-| -| [python2.7 will be removed from the images on May 22, 2023](https://github.com/actions/runner-images/issues/7401) | +| [[All OSs] .NET 3.1 will be removed from the images on July, 3](https://github.com/actions/runner-images/issues/7667) | +| [Actions runner image scheduled maintenance (June 2 2023 through June 12 20223)](https://github.com/actions/runner-images/issues/7660) | +| [python2.7 will be removed from the images on June 12, 2023](https://github.com/actions/runner-images/issues/7401) | *** # Windows Server 2022 - OS Version: 10.0.20348 Build 1726 -- Image Version: 20230517.1 +- Image Version: 20230606.1 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -24,16 +26,16 @@ - Ruby 3.0.6p216 ### Package Management -- Chocolatey 1.4.0 -- Composer 2.5.5 +- Chocolatey 2.0.0 +- Composer 2.5.7 - Helm 3.11.3 - Miniconda 23.3.1 (pre-installed on the image but not added to PATH) - NPM 9.5.1 -- NuGet 6.5.0.154 +- NuGet 6.6.0.61 - pip 23.1.2 (python 3.9) - Pipx 1.2.0 - RubyGems 3.2.33 -- Vcpkg (build from commit 7b30311f0) +- Vcpkg (build from commit 750591668) - Yarn 1.22.19 #### Environment variables @@ -46,78 +48,78 @@ - Ant 1.10.13 - Gradle 8.1 - Maven 3.8.7 -- sbt 1.8.3 +- sbt 1.9.0 ### Tools - 7zip 22.01 - aria2 1.36.0 -- azcopy 10.18.1 -- Bazel 6.2.0 +- azcopy 10.19.0 +- Bazel 6.2.1 - Bazelisk 1.13.2 - Bicep 0.17.1 - Cabal 3.10.1.0 -- CMake 3.26.3 -- CodeQL Action Bundles 2.13.0 2.13.1 -- Docker 24.0.0 +- CMake 3.26.4 +- CodeQL Action Bundles 2.13.1 2.13.3 +- Docker 24.0.2 - Docker Compose v1 1.29.2 - Docker Compose v2 2.18.1 - Docker-wincred 0.7.0 -- ghc 9.6.1 -- Git 2.40.1.windows.1 +- ghc 9.6.2 +- Git 2.41.0.windows.1 - Git LFS 3.3.0 -- ImageMagick 7.1.1-9 +- ImageMagick 7.1.1-11 - InnoSetup 6.2.2 - jq 1.6 - Kind 0.19.0 -- Kubectl 1.27.1 +- Kubectl 1.27.2 - Mercurial 5.0 - Mingw-w64 11.2.0 - Newman 5.3.2 - NSIS 3.08 -- OpenSSL 1.1.1t +- OpenSSL 1.1.1u - Packer 1.8.7 -- Pulumi 3.67.1 +- Pulumi 3.69.0 - R 4.3.0 - Service Fabric SDK 9.1.1436.9590 -- Stack 2.9.3 +- Stack 2.11.1 - Subversion (SVN) 1.14.2 - Swig 4.1.1 - VSWhere 3.1.4 - WinAppDriver 1.2.2009.02003 - WiX Toolset 3.11.2.4516 -- yamllint 1.31.0 +- yamllint 1.32.0 - zstd 1.5.5 ### CLI Tools -- Alibaba Cloud CLI 3.0.164 -- AWS CLI 2.11.20 -- AWS SAM CLI 1.84.0 +- Alibaba Cloud CLI 3.0.165 +- AWS CLI 2.11.25 +- AWS SAM CLI 1.86.0 - AWS Session Manager CLI 1.2.463.0 -- Azure CLI 2.48.1 +- Azure CLI 2.49.0 - Azure DevOps CLI extension 0.26.0 -- GitHub CLI 2.29.0 +- GitHub CLI 2.30.0 - Hub CLI 2.14.2 ### Rust Tools -- Cargo 1.69.0 -- Rust 1.69.0 -- Rustdoc 1.69.0 +- Cargo 1.70.0 +- Rust 1.70.0 +- Rustdoc 1.70.0 - Rustup 1.26.0 #### Packages - bindgen 0.65.1 - cargo-audit 0.17.6 - cargo-outdated 0.11.2 -- cbindgen 0.24.3 -- Clippy 0.1.69 +- cbindgen 0.24.5 +- Clippy 0.1.70 - Rustfmt 1.5.2 ### Browsers and Drivers -- Google Chrome 113.0.5672.127 -- Chrome Driver 113.0.5672.63 -- Microsoft Edge 113.0.1774.42 -- Microsoft Edge Driver 113.0.1774.42 -- Mozilla Firefox 113.0.1 +- Google Chrome 114.0.5735.110 +- Chrome Driver 114.0.5735.90 +- Microsoft Edge 114.0.1823.37 +- Microsoft Edge Driver 114.0.1823.37 +- Mozilla Firefox 114.0 - Gecko Driver 0.33.0 - IE Driver 4.8.0.0 - Selenium server 4.9.0 @@ -214,12 +216,12 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Name | Version | ConfigFile | ServiceName | ServiceStatus | ListenPort | | ------ | ------- | ------------------------------------- | ----------- | ------------- | ---------- | | Apache | 2.4.55 | C:\tools\Apache24\conf\httpd.conf | Apache | Stopped | 80 | -| Nginx | 1.23.4 | C:\tools\nginx-1.23.4\conf\nginx.conf | nginx | Stopped | 80 | +| Nginx | 1.25.0 | C:\tools\nginx-1.25.0\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2022 | Name | Version | Path | | ----------------------------- | -------------- | -------------------------------------------------------- | -| Visual Studio Enterprise 2022 | 17.6.33712.159 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | +| Visual Studio Enterprise 2022 | 17.6.33723.286 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | #### Workloads, components and extensions | Package | Version | @@ -533,7 +535,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Microsoft.AspNetCore.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 6.0.5, 6.0.16, 7.0.5 - Microsoft.NETCore.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 6.0.5, 6.0.16, 7.0.5 - Microsoft.WindowsDesktop.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 6.0.5, 6.0.16, 7.0.5 -- nbgv 3.6.132+bc56096f69 +- nbgv 3.6.133+2d32d93cb1 ### PowerShell Tools - PowerShell 7.2.11 @@ -545,7 +547,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Az (Cached): 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.334 +- AWSPowershell: 4.1.346 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 - Microsoft.Graph: 1.27.0 @@ -553,7 +555,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - PowerShellGet: 1.0.0.1, 2.2.5 - PSScriptAnalyzer: 1.21.0 - PSWindowsUpdate: 2.2.0.3 -- SqlServer: 22.0.59 +- SqlServer: 22.1.1 - VSSetup: 2.2.16 ``` Azure PowerShell module 2.1.0 and AzureRM PowerShell module 2.1.0 are installed @@ -568,7 +570,7 @@ All other versions are saved but not installed. | Android Emulator | 31.2.9 | | Android SDK Build-tools | 33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | | Android SDK Platforms | android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | -| Android SDK Platform-Tools | 34.0.1 | +| Android SDK Platform-Tools | 34.0.3 | | Android Support Repository | 47.0.0 | | CMake | 3.18.1<br>3.22.1 | | Google Play services | 49 | From 500995c0adc5830fd3da8b3347b97806c568a6be Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Mon, 12 Jun 2023 17:07:30 +0200 Subject: [PATCH 1961/3485] Set checkout options in inage generation pipeline (#7708) --- images.CI/linux-and-win/azure-pipelines/image-generation.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/images.CI/linux-and-win/azure-pipelines/image-generation.yml b/images.CI/linux-and-win/azure-pipelines/image-generation.yml index c7f546c4429a..1dfeac172a05 100644 --- a/images.CI/linux-and-win/azure-pipelines/image-generation.yml +++ b/images.CI/linux-and-win/azure-pipelines/image-generation.yml @@ -43,6 +43,9 @@ jobs: steps: - checkout: ${{ parameters.repository_ref }} + clean: true + fetchDepth: 0 + fetchTags: false - task: PowerShell@2 displayName: 'Download custom repository' From d6aaf8d4814ba7e53c694908e7f798618a452202 Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Wed, 14 Jun 2023 10:17:42 +0200 Subject: [PATCH 1962/3485] Update conditions for CI jobs (#7714) --- .github/workflows/macos11.yml | 2 +- .github/workflows/macos12.yml | 2 +- .github/workflows/ubuntu2004.yml | 2 +- .github/workflows/ubuntu2204.yml | 2 +- .github/workflows/windows2019.yml | 2 +- .github/workflows/windows2022.yml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/macos11.yml b/.github/workflows/macos11.yml index e421e096dd96..f77b630f70db 100644 --- a/.github/workflows/macos11.yml +++ b/.github/workflows/macos11.yml @@ -17,7 +17,7 @@ on: jobs: macOS_11: - if: ${{ (github.event.label.name == 'CI macos-all') || (github.event.label.name == 'CI macos-11') || (github.event_name == 'workflow_dispatch') || (github.event_name == 'schedule') }} + if: contains(github.event.pull_request.labels.*.name, 'CI macos-all') || contains(github.event.pull_request.labels.*.name, 'CI macos-11') || (github.event_name == 'workflow_dispatch') || (github.event_name == 'schedule') name: macOS-11_unstable.${{ github.run_id }}.${{ github.run_attempt }} uses: ./.github/workflows/macos-generation.yml with: diff --git a/.github/workflows/macos12.yml b/.github/workflows/macos12.yml index 9fc11a203c42..bb7fdd271aab 100644 --- a/.github/workflows/macos12.yml +++ b/.github/workflows/macos12.yml @@ -17,7 +17,7 @@ on: jobs: macOS_12: - if: ${{ (github.event.label.name == 'CI macos-all') || (github.event.label.name == 'CI macos-12') || (github.event_name == 'workflow_dispatch') || (github.event_name == 'schedule') }} + if: contains(github.event.pull_request.labels.*.name, 'CI macos-all') || contains(github.event.pull_request.labels.*.name, 'CI macos-12') || (github.event_name == 'workflow_dispatch') || (github.event_name == 'schedule') name: macOS-12_unstable.${{ github.run_id }}.${{ github.run_attempt }} uses: ./.github/workflows/macos-generation.yml with: diff --git a/.github/workflows/ubuntu2004.yml b/.github/workflows/ubuntu2004.yml index 17b462675b77..26f2f2d754be 100644 --- a/.github/workflows/ubuntu2004.yml +++ b/.github/workflows/ubuntu2004.yml @@ -17,7 +17,7 @@ on: jobs: Ubuntu_2004: - if: ${{ (github.event.label.name == 'CI ubuntu-all') || (github.event.label.name == 'CI ubuntu-2004') || (github.event_name == 'workflow_dispatch') || (github.event_name == 'schedule') }} + if: contains(github.event.pull_request.labels.*.name, 'CI ubuntu-all') || contains(github.event.pull_request.labels.*.name, 'CI ubuntu-2004') || (github.event_name == 'workflow_dispatch') || (github.event_name == 'schedule') uses: ./.github/workflows/ubuntu-win-generation.yml with: image_name: 'ubuntu2004' diff --git a/.github/workflows/ubuntu2204.yml b/.github/workflows/ubuntu2204.yml index bf3ff00f3880..f898fa9126af 100644 --- a/.github/workflows/ubuntu2204.yml +++ b/.github/workflows/ubuntu2204.yml @@ -17,7 +17,7 @@ on: jobs: Ubuntu_2204: - if: ${{ (github.event.label.name == 'CI ubuntu-all') || (github.event.label.name == 'CI ubuntu-2204') || (github.event_name == 'workflow_dispatch') || (github.event_name == 'schedule') }} + if: contains(github.event.pull_request.labels.*.name, 'CI ubuntu-all') || contains(github.event.pull_request.labels.*.name, 'CI ubuntu-2204') || (github.event_name == 'workflow_dispatch') || (github.event_name == 'schedule') uses: ./.github/workflows/ubuntu-win-generation.yml with: image_name: 'ubuntu2204' diff --git a/.github/workflows/windows2019.yml b/.github/workflows/windows2019.yml index 27d2a082418a..a8ed8cb47eff 100644 --- a/.github/workflows/windows2019.yml +++ b/.github/workflows/windows2019.yml @@ -17,7 +17,7 @@ on: jobs: Windows_2019: - if: ${{ (github.event.label.name == 'CI windows-all') || (github.event.label.name == 'CI windows-2019') || (github.event_name == 'workflow_dispatch') || (github.event_name == 'schedule') }} + if: contains(github.event.pull_request.labels.*.name, 'CI windows-all') || contains(github.event.pull_request.labels.*.name, 'CI windows-2019') || (github.event_name == 'workflow_dispatch') || (github.event_name == 'schedule') uses: ./.github/workflows/ubuntu-win-generation.yml with: image_name: 'windows2019' diff --git a/.github/workflows/windows2022.yml b/.github/workflows/windows2022.yml index ac7e93fb8786..f3ed7f3061ae 100644 --- a/.github/workflows/windows2022.yml +++ b/.github/workflows/windows2022.yml @@ -17,7 +17,7 @@ on: jobs: Windows_2022: - if: ${{ (github.event.label.name == 'CI windows-all') || (github.event.label.name == 'CI windows-2022') || (github.event_name == 'workflow_dispatch') || (github.event_name == 'schedule') }} + if: contains(github.event.pull_request.labels.*.name, 'CI windows-all') || contains(github.event.pull_request.labels.*.name, 'CI windows-2022') || (github.event_name == 'workflow_dispatch') || (github.event_name == 'schedule') uses: ./.github/workflows/ubuntu-win-generation.yml with: image_name: 'windows2022' From 6d66d249ac3e9d23800a1f77720417bfbac99918 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Wed, 14 Jun 2023 13:22:02 +0200 Subject: [PATCH 1963/3485] [Ubuntu] update curl command to work with https (#7723) --- images/linux/scripts/helpers/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/linux/scripts/helpers/install.sh b/images/linux/scripts/helpers/install.sh index 898d8d21ab0a..9fe39be2b4fe 100644 --- a/images/linux/scripts/helpers/install.sh +++ b/images/linux/scripts/helpers/install.sh @@ -72,7 +72,7 @@ get_github_package_download_url() { local VERSION=$3 local SEARCH_IN_COUNT="100" - json=$(curl -s "https://api.github.com/repos/${REPO_ORG}/releases?per_page=${SEARCH_IN_COUNT}") + json=$(curl -sSL "https://api.github.com/repos/${REPO_ORG}/releases?per_page=${SEARCH_IN_COUNT}") if [ -n "$VERSION" ]; then tagName=$(echo $json | jq -r '.[] | select(.prerelease==false).tag_name' | sort --unique --version-sort | egrep -v ".*-[a-z]|beta" | egrep "\w*${VERSION}" | tail -1) From 6cc825e8d6539bfeb3d92eab144cb27e13aabd6b Mon Sep 17 00:00:00 2001 From: Henry Mercer <henrymercer@github.com> Date: Wed, 14 Jun 2023 17:58:50 +0100 Subject: [PATCH 1964/3485] [macOS] CodeQL: Simplify the toolcache version number for bundles tagged using semver (#7717) --- images/macos/provision/core/codeql-bundle.sh | 36 +++++++++++++++++--- 1 file changed, 32 insertions(+), 4 deletions(-) diff --git a/images/macos/provision/core/codeql-bundle.sh b/images/macos/provision/core/codeql-bundle.sh index 53210a3d9232..dab0f9dc015c 100644 --- a/images/macos/provision/core/codeql-bundle.sh +++ b/images/macos/provision/core/codeql-bundle.sh @@ -1,16 +1,44 @@ #!/bin/bash -e -o pipefail source ~/utils/utils.sh -# Retrieve the name of the CodeQL bundle preferred by the Action (in the format codeql-bundle-YYYYMMDD). +# Retrieve the CLI versions and bundle tags of the latest two CodeQL bundles. base_url="$(curl -sSL https://raw.githubusercontent.com/github/codeql-action/v2/src/defaults.json)" codeql_tag_name="$(echo "$base_url" | jq -r '.bundleVersion')" codeql_cli_version="$(echo "$base_url" | jq -r '.cliVersion')" prior_codeql_tag_name="$(echo "$base_url" | jq -r '.priorBundleVersion')" prior_codeql_cli_version="$(echo "$base_url" | jq -r '.priorCliVersion')" -# Convert the tag names to bundles with a version number (x.y.z-YYYYMMDD). -codeql_bundle_version="${codeql_cli_version}-${codeql_tag_name##*-}" -prior_codeql_bundle_version="${prior_codeql_cli_version}-${prior_codeql_tag_name##*-}" +# Compute the toolcache version number for each bundle. This is either `x.y.z` or `x.y.z-YYYYMMDD`. +if [[ "${codeql_tag_name##*-}" == "v"* ]]; then + # Tag name of the format `codeql-bundle-vx.y.z`, where x.y.z is the CLI version. + # We don't need to include the tag name in the toolcache version number because it's derivable + # from the CLI version. + codeql_bundle_version="$codeql_cli_version" +elif [[ "${codeql_tag_name##*-}" =~ ^[0-9]+$ ]]; then + # Tag name of the format `codeql-bundle-YYYYMMDD`. + # We need to include the tag name in the toolcache version number because it can't be derived + # from the CLI version. + codeql_bundle_version="$codeql_cli_version-${codeql_tag_name##*-}" +else + echo "Unrecognised current CodeQL bundle tag name: $codeql_tag_name." \ + "Could not compute toolcache version number." + exit 1 +fi +if [[ "${prior_codeql_tag_name##*-}" == "v"* ]]; then + # Tag name of the format `codeql-bundle-vx.y.z`, where x.y.z is the CLI version. + # We don't need to include the tag name in the toolcache version number because it's derivable + # from the CLI version. + prior_codeql_bundle_version="$prior_codeql_cli_version" +elif [[ "${prior_codeql_tag_name##*-}" =~ ^[0-9]+$ ]]; then + # Tag name of the format `codeql-bundle-YYYYMMDD`. + # We need to include the tag name in the toolcache version number because it can't be derived + # from the CLI version. + prior_codeql_bundle_version="$prior_codeql_cli_version-${prior_codeql_tag_name##*-}" +else + echo "Unrecognised prior CodeQL bundle tag name: $prior_codeql_tag_name." \ + "Could not compute toolcache version number." + exit 1 +fi # Download and name both CodeQL bundles. codeql_bundle_versions=("${codeql_bundle_version}" "${prior_codeql_bundle_version}") From 33e68d3dc3b9480c71c91714478ace45264f5acd Mon Sep 17 00:00:00 2001 From: Henry Mercer <henrymercer@github.com> Date: Wed, 14 Jun 2023 17:59:32 +0100 Subject: [PATCH 1965/3485] [Windows] CodeQL: Simplify the toolcache version number for bundles tagged using semver (#7718) --- .../Installers/Install-CodeQLBundle.ps1 | 34 ++++++++++++++++--- 1 file changed, 30 insertions(+), 4 deletions(-) diff --git a/images/win/scripts/Installers/Install-CodeQLBundle.ps1 b/images/win/scripts/Installers/Install-CodeQLBundle.ps1 index 6c0aeecf8a7b..7a063cc2e04c 100644 --- a/images/win/scripts/Installers/Install-CodeQLBundle.ps1 +++ b/images/win/scripts/Installers/Install-CodeQLBundle.ps1 @@ -3,16 +3,42 @@ ## Desc: Install the CodeQL CLI Bundle to the toolcache. ################################################################################ -# Retrieve the name of the CodeQL bundle preferred by the Action (in the format codeql-bundle-YYYYMMDD). +# Retrieve the CLI versions and bundle tags of the latest two CodeQL bundles. $Defaults = (Invoke-RestMethod "https://raw.githubusercontent.com/github/codeql-action/v2/src/defaults.json") $CodeQLTagName = $Defaults.bundleVersion $CodeQLCliVersion = $Defaults.cliVersion $PriorCodeQLTagName = $Defaults.priorBundleVersion $PriorCodeQLCliVersion = $Defaults.priorCliVersion -# Convert the tag names to bundles with a version number (x.y.z-YYYYMMDD). -$CodeQLBundleVersion = $CodeQLCliVersion + "-" + $CodeQLTagName.split("-")[-1] -$PriorCodeQLBundleVersion = $PriorCodeQLCliVersion + "-" + $PriorCodeQLTagName.split("-")[-1] +# Compute the toolcache version number for each bundle. This is either `x.y.z` or `x.y.z-YYYYMMDD`. +if ($CodeQLTagName.split("-")[-1].StartsWith("v")) { + # Tag name of the format `codeql-bundle-vx.y.z`, where x.y.z is the CLI version. + # We don't need to include the tag name in the toolcache version number because it's derivable + # from the CLI version. + $CodeQLBundleVersion = $CodeQLCliVersion +} elseif ($CodeQLTagName.split("-")[-1] -match "^\d+$") { + # Tag name of the format `codeql-bundle-YYYYMMDD`. + # We need to include the tag name in the toolcache version number because it can't be derived + # from the CLI version. + $CodeQLBundleVersion = $CodeQLCliVersion + "-" + $CodeQLTagName.split("-")[-1] +} else { + Write-Error "Unrecognised current CodeQL bundle tag name: $CodeQLTagName. Could not compute toolcache version number." + exit 1 +} +if ($PriorCodeQLTagName.split("-")[-1].StartsWith("v")) { + # Tag name of the format `codeql-bundle-vx.y.z`, where x.y.z is the CLI version. + # We don't need to include the tag name in the toolcache version number because it's derivable + # from the CLI version. + $PriorCodeQLBundleVersion = $PriorCodeQLCliVersion +} elseif ($PriorCodeQLTagName.split("-")[-1] -match "^\d+$") { + # Tag name of the format `codeql-bundle-YYYYMMDD`. + # We need to include the tag name in the toolcache version number because it can't be derived + # from the CLI version. + $PriorCodeQLBundleVersion = $PriorCodeQLCliVersion + "-" + $PriorCodeQLTagName.split("-")[-1] +} else { + Write-Error "Unrecognised prior CodeQL bundle tag name: $PriorCodeQLTagName. Could not compute toolcache version number." + exit 1 +} $Bundles = @( [PSCustomObject]@{ From e2066c4d68c3d08d93d682c319f89017e60079d3 Mon Sep 17 00:00:00 2001 From: Henry Mercer <henrymercer@github.com> Date: Wed, 14 Jun 2023 18:00:16 +0100 Subject: [PATCH 1966/3485] [Linux] CodeQL: Simplify the toolcache version number for bundles tagged using semver (#7716) --- .../linux/scripts/installers/codeql-bundle.sh | 36 ++++++++++++++++--- 1 file changed, 32 insertions(+), 4 deletions(-) diff --git a/images/linux/scripts/installers/codeql-bundle.sh b/images/linux/scripts/installers/codeql-bundle.sh index 322f474b5098..f6b6f0612a51 100644 --- a/images/linux/scripts/installers/codeql-bundle.sh +++ b/images/linux/scripts/installers/codeql-bundle.sh @@ -6,16 +6,44 @@ source $HELPER_SCRIPTS/install.sh -# Retrieve the name of the CodeQL bundle preferred by the Action (in the format codeql-bundle-YYYYMMDD). +# Retrieve the CLI versions and bundle tags of the latest two CodeQL bundles. base_url="$(curl -sSL https://raw.githubusercontent.com/github/codeql-action/v2/src/defaults.json)" codeql_tag_name="$(echo "$base_url" | jq -r '.bundleVersion')" codeql_cli_version="$(echo "$base_url" | jq -r '.cliVersion')" prior_codeql_tag_name="$(echo "$base_url" | jq -r '.priorBundleVersion')" prior_codeql_cli_version="$(echo "$base_url" | jq -r '.priorCliVersion')" -# Convert the tag names to bundles with a version number (x.y.z-YYYYMMDD). -codeql_bundle_version="${codeql_cli_version}-${codeql_tag_name##*-}" -prior_codeql_bundle_version="${prior_codeql_cli_version}-${prior_codeql_tag_name##*-}" +# Compute the toolcache version number for each bundle. This is either `x.y.z` or `x.y.z-YYYYMMDD`. +if [[ "${codeql_tag_name##*-}" == "v"* ]]; then + # Tag name of the format `codeql-bundle-vx.y.z`, where x.y.z is the CLI version. + # We don't need to include the tag name in the toolcache version number because it's derivable + # from the CLI version. + codeql_bundle_version="$codeql_cli_version" +elif [[ "${codeql_tag_name##*-}" =~ ^[0-9]+$ ]]; then + # Tag name of the format `codeql-bundle-YYYYMMDD`. + # We need to include the tag name in the toolcache version number because it can't be derived + # from the CLI version. + codeql_bundle_version="$codeql_cli_version-${codeql_tag_name##*-}" +else + echo "Unrecognised current CodeQL bundle tag name: $codeql_tag_name." \ + "Could not compute toolcache version number." + exit 1 +fi +if [[ "${prior_codeql_tag_name##*-}" == "v"* ]]; then + # Tag name of the format `codeql-bundle-vx.y.z`, where x.y.z is the CLI version. + # We don't need to include the tag name in the toolcache version number because it's derivable + # from the CLI version. + prior_codeql_bundle_version="$prior_codeql_cli_version" +elif [[ "${prior_codeql_tag_name##*-}" =~ ^[0-9]+$ ]]; then + # Tag name of the format `codeql-bundle-YYYYMMDD`. + # We need to include the tag name in the toolcache version number because it can't be derived + # from the CLI version. + prior_codeql_bundle_version="$prior_codeql_cli_version-${prior_codeql_tag_name##*-}" +else + echo "Unrecognised prior CodeQL bundle tag name: $prior_codeql_tag_name." \ + "Could not compute toolcache version number." + exit 1 +fi # Download and name both CodeQL bundles. codeql_bundle_versions=("${codeql_bundle_version}" "${prior_codeql_bundle_version}") From 893c95aeb55466c99a0e7ed987c975d7cd2f8b83 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 15 Jun 2023 07:56:40 +0000 Subject: [PATCH 1967/3485] Updating readme file for win19 version 20230612.1 (#7711) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2019-Readme.md | 79 ++++++++++++++++---------------- 1 file changed, 39 insertions(+), 40 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index 7812845756f3..40f0fd2e25f3 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -1,12 +1,11 @@ | Announcements | |-| | [[All OSs] .NET 3.1 will be removed from the images on July, 3](https://github.com/actions/runner-images/issues/7667) | -| [Actions runner image scheduled maintenance (June 2 2023 through June 12 20223)](https://github.com/actions/runner-images/issues/7660) | -| [python2.7 will be removed from the images on June 12, 2023](https://github.com/actions/runner-images/issues/7401) | +| [Actions runner image scheduled maintenance (June 2 2023 through June 16 2023)](https://github.com/actions/runner-images/issues/7660) | *** # Windows Server 2019 - OS Version: 10.0.17763 Build 4377 -- Image Version: 20230606.1 +- Image Version: 20230612.1 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -15,19 +14,19 @@ ### Language and Runtime - Bash 5.2.15(1)-release -- Go 1.20.4 -- Julia 1.9.0 -- Kotlin 1.8.21 +- Go 1.20.5 +- Julia 1.9.1 +- Kotlin 1.8.22 - LLVM 15.0.7 - Node 18.16.0 - Perl 5.32.1 -- PHP 8.2.6 +- PHP 8.2.7 - Python 3.7.9 - Ruby 2.5.9p229 ### Package Management - Chocolatey 2.0.0 -- Composer 2.5.7 +- Composer 2.5.8 - Helm 3.11.3 - Miniconda 23.3.1 (pre-installed on the image but not added to PATH) - NPM 9.5.1 @@ -35,7 +34,7 @@ - pip 23.1.2 (python 3.7) - Pipx 1.2.0 - RubyGems 2.7.6.3 -- Vcpkg (build from commit 750591668) +- Vcpkg (build from commit 1ba9a2591) - Yarn 1.22.19 #### Environment variables @@ -56,7 +55,7 @@ - azcopy 10.19.0 - Bazel 6.2.1 - Bazelisk 1.13.2 -- Bicep 0.17.1 +- Bicep 0.18.4 - Cabal 3.10.1.0 - CMake 3.26.4 - CodeQL Action Bundles 2.13.1 2.13.3 @@ -78,9 +77,9 @@ - Newman 5.3.2 - NSIS 3.08 - OpenSSL 1.1.1u -- Packer 1.8.7 -- Parcel 2.9.1 -- Pulumi 3.69.0 +- Packer 1.9.0 +- Parcel 2.9.2 +- Pulumi 3.70.0 - R 4.3.0 - Service Fabric SDK 9.1.1436.9590 - Stack 2.11.1 @@ -93,9 +92,9 @@ - zstd 1.5.5 ### CLI Tools -- Alibaba Cloud CLI 3.0.165 -- AWS CLI 2.11.25 -- AWS SAM CLI 1.86.0 +- Alibaba Cloud CLI 3.0.167 +- AWS CLI 2.11.27 +- AWS SAM CLI 1.84.0 - AWS Session Manager CLI 1.2.463.0 - Azure CLI 2.49.0 - Azure DevOps CLI extension 0.26.0 @@ -120,12 +119,12 @@ ### Browsers and Drivers - Google Chrome 114.0.5735.110 - Chrome Driver 114.0.5735.90 -- Microsoft Edge 114.0.1823.37 -- Microsoft Edge Driver 114.0.1823.37 -- Mozilla Firefox 114.0 +- Microsoft Edge 114.0.1823.43 +- Microsoft Edge Driver 114.0.1823.43 +- Mozilla Firefox 114.0.1 - Gecko Driver 0.33.0 -- IE Driver 4.8.0.0 -- Selenium server 4.9.0 +- IE Driver 4.10.0.0 +- Selenium server 4.10.0 #### Environment variables | Name | Value | @@ -167,8 +166,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Go - 1.18.10 -- 1.19.9 -- 1.20.4 +- 1.19.10 +- 1.20.5 #### Node.js - 14.21.3 @@ -181,7 +180,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 3.8.10 - 3.9.13 - 3.10.11 -- 3.11.3 +- 3.11.4 #### PyPy - 2.7.18 [PyPy 7.3.11] @@ -513,10 +512,10 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Az (Cached): 1.0.0.zip, 1.6.0.zip, 2.3.2.zip, 2.6.0.zip, 3.1.0.zip, 3.5.0.zip, 3.8.0.zip, 4.3.0.zip, 4.4.0.zip, 4.7.0.zip, 5.5.0.zip, 5.9.0.zip, 6.6.0.zip, 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.346 +- AWSPowershell: 4.1.350 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 -- Microsoft.Graph: 1.27.0 +- Microsoft.Graph: 1.28.0 - Pester: 3.4.0, 5.4.1 - PowerShellGet: 1.0.0.1, 2.2.5 - PSScriptAnalyzer: 1.21.0 @@ -530,20 +529,20 @@ All other versions are saved but not installed. ``` ### Android -| Package Name | Version | -| -------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 8.0 | -| Android SDK Build-tools | 33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3<br>26.0.0 26.0.1 26.0.2 26.0.3<br>25.0.0 25.0.1 25.0.2 25.0.3<br>24.0.0 24.0.1 24.0.2 24.0.3<br>23.0.1 23.0.2 23.0.3<br>22.0.1<br>21.1.2<br>20.0.0<br>19.1.0 | -| Android SDK Platforms | android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3)<br>android-26 (rev 2)<br>android-25 (rev 3)<br>android-24 (rev 2)<br>android-23 (rev 3)<br>android-22 (rev 2)<br>android-21 (rev 2)<br>android-20 (rev 2)<br>android-19 (rev 4) | -| Android SDK Platform-Tools | 34.0.3 | -| Android SDK Tools | 26.1.1 | -| Android Support Repository | 47.0.0 | -| CMake | 3.10.2<br>3.18.1<br>3.22.1 | -| Google APIs | addon-google_apis-google-21<br>addon-google_apis-google-22<br>addon-google_apis-google-23<br>addon-google_apis-google-24 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 23.2.8568313<br>24.0.8215888<br>25.2.9519653 | -| SDK Patch Applier v4 | 1 | +| Package Name | Version | +| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | +| Android Command Line Tools | 8.0 | +| Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3<br>26.0.0 26.0.1 26.0.2 26.0.3<br>25.0.0 25.0.1 25.0.2 25.0.3<br>24.0.0 24.0.1 24.0.2 24.0.3<br>23.0.1 23.0.2 23.0.3<br>22.0.1<br>21.1.2<br>20.0.0<br>19.1.0 | +| Android SDK Platforms | android-34 (rev 1)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3)<br>android-26 (rev 2)<br>android-25 (rev 3)<br>android-24 (rev 2)<br>android-23 (rev 3)<br>android-22 (rev 2)<br>android-21 (rev 2)<br>android-20 (rev 2)<br>android-19 (rev 4) | +| Android SDK Platform-Tools | 34.0.3 | +| Android SDK Tools | 26.1.1 | +| Android Support Repository | 47.0.0 | +| CMake | 3.10.2<br>3.18.1<br>3.22.1 | +| Google APIs | addon-google_apis-google-21<br>addon-google_apis-google-22<br>addon-google_apis-google-23<br>addon-google_apis-google-24 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 23.2.8568313<br>24.0.8215888<br>25.2.9519653 | +| SDK Patch Applier v4 | 1 | #### Environment variables | Name | Value | From cced6d98e23582b58751dc8ba3ed772aa1c4e35f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 15 Jun 2023 07:56:55 +0000 Subject: [PATCH 1968/3485] Updating readme file for win22 version 20230612.1 (#7712) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2022-Readme.md | 111 +++++++++++++++---------------- 1 file changed, 55 insertions(+), 56 deletions(-) diff --git a/images/win/Windows2022-Readme.md b/images/win/Windows2022-Readme.md index 7f9fd773edd9..db816898f69d 100644 --- a/images/win/Windows2022-Readme.md +++ b/images/win/Windows2022-Readme.md @@ -1,12 +1,11 @@ | Announcements | |-| | [[All OSs] .NET 3.1 will be removed from the images on July, 3](https://github.com/actions/runner-images/issues/7667) | -| [Actions runner image scheduled maintenance (June 2 2023 through June 12 20223)](https://github.com/actions/runner-images/issues/7660) | -| [python2.7 will be removed from the images on June 12, 2023](https://github.com/actions/runner-images/issues/7401) | +| [Actions runner image scheduled maintenance (June 2 2023 through June 16 2023)](https://github.com/actions/runner-images/issues/7660) | *** # Windows Server 2022 - OS Version: 10.0.20348 Build 1726 -- Image Version: 20230606.1 +- Image Version: 20230612.1 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -15,19 +14,19 @@ ### Language and Runtime - Bash 5.2.15(1)-release -- Go 1.20.4 -- Julia 1.9.0 -- Kotlin 1.8.21 +- Go 1.20.5 +- Julia 1.9.1 +- Kotlin 1.8.22 - LLVM 15.0.7 - Node 18.16.0 - Perl 5.32.1 -- PHP 8.2.6 +- PHP 8.2.7 - Python 3.9.13 - Ruby 3.0.6p216 ### Package Management - Chocolatey 2.0.0 -- Composer 2.5.7 +- Composer 2.5.8 - Helm 3.11.3 - Miniconda 23.3.1 (pre-installed on the image but not added to PATH) - NPM 9.5.1 @@ -35,7 +34,7 @@ - pip 23.1.2 (python 3.9) - Pipx 1.2.0 - RubyGems 3.2.33 -- Vcpkg (build from commit 750591668) +- Vcpkg (build from commit 1ba9a2591) - Yarn 1.22.19 #### Environment variables @@ -56,7 +55,7 @@ - azcopy 10.19.0 - Bazel 6.2.1 - Bazelisk 1.13.2 -- Bicep 0.17.1 +- Bicep 0.18.4 - Cabal 3.10.1.0 - CMake 3.26.4 - CodeQL Action Bundles 2.13.1 2.13.3 @@ -77,8 +76,8 @@ - Newman 5.3.2 - NSIS 3.08 - OpenSSL 1.1.1u -- Packer 1.8.7 -- Pulumi 3.69.0 +- Packer 1.9.0 +- Pulumi 3.70.0 - R 4.3.0 - Service Fabric SDK 9.1.1436.9590 - Stack 2.11.1 @@ -91,9 +90,9 @@ - zstd 1.5.5 ### CLI Tools -- Alibaba Cloud CLI 3.0.165 -- AWS CLI 2.11.25 -- AWS SAM CLI 1.86.0 +- Alibaba Cloud CLI 3.0.167 +- AWS CLI 2.11.27 +- AWS SAM CLI 1.84.0 - AWS Session Manager CLI 1.2.463.0 - Azure CLI 2.49.0 - Azure DevOps CLI extension 0.26.0 @@ -117,12 +116,12 @@ ### Browsers and Drivers - Google Chrome 114.0.5735.110 - Chrome Driver 114.0.5735.90 -- Microsoft Edge 114.0.1823.37 -- Microsoft Edge Driver 114.0.1823.37 -- Mozilla Firefox 114.0 +- Microsoft Edge 114.0.1823.43 +- Microsoft Edge Driver 114.0.1823.43 +- Mozilla Firefox 114.0.1 - Gecko Driver 0.33.0 -- IE Driver 4.8.0.0 -- Selenium server 4.9.0 +- IE Driver 4.10.0.0 +- Selenium server 4.10.0 #### Environment variables | Name | Value | @@ -160,8 +159,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Go - 1.18.10 -- 1.19.9 -- 1.20.4 +- 1.19.10 +- 1.20.5 #### Node.js - 14.21.3 @@ -173,7 +172,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 3.8.10 - 3.9.13 - 3.10.11 -- 3.11.3 +- 3.11.4 #### PyPy - 2.7.18 [PyPy 7.3.11] @@ -382,24 +381,24 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.Spectre | 17.6.33605.316 | | Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64 | 17.6.33605.316 | | Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64.Spectre | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.35.17.5.ARM | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.35.17.5.ARM.Spectre | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.35.17.5.ARM64 | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.35.17.5.ARM64.Spectre | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.35.17.5.ATL | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.35.17.5.ATL.ARM | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.35.17.5.ATL.ARM.Spectre | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.35.17.5.ATL.ARM64 | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.35.17.5.ATL.ARM64.Spectre | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.35.17.5.ATL.Spectre | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.35.17.5.MFC | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.35.17.5.MFC.ARM | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.35.17.5.MFC.ARM.Spectre | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.35.17.5.MFC.ARM64 | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.35.17.5.MFC.ARM64.Spectre | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.35.17.5.MFC.Spectre | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.35.17.5.x86.x64 | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.35.17.5.x86.x64.Spectre | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.36.17.6.ARM | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.36.17.6.ARM.Spectre | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.36.17.6.ARM64 | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.36.17.6.ARM64.Spectre | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.36.17.6.ATL | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.36.17.6.ATL.ARM | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.36.17.6.ATL.ARM.Spectre | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.36.17.6.ATL.ARM64 | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.36.17.6.ATL.ARM64.Spectre | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.36.17.6.ATL.Spectre | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.36.17.6.MFC | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.36.17.6.MFC.ARM | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.36.17.6.MFC.ARM.Spectre | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.36.17.6.MFC.ARM64 | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.36.17.6.MFC.ARM64.Spectre | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.36.17.6.MFC.Spectre | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.36.17.6.x86.x64 | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.36.17.6.x86.x64.Spectre | 17.6.33605.316 | | Microsoft.VisualStudio.Component.VC.ASAN | 17.6.33605.316 | | Microsoft.VisualStudio.Component.VC.ATL | 17.6.33605.316 | | Microsoft.VisualStudio.Component.VC.ATL.ARM | 17.6.33605.316 | @@ -547,10 +546,10 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Az (Cached): 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.346 +- AWSPowershell: 4.1.350 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 -- Microsoft.Graph: 1.27.0 +- Microsoft.Graph: 1.28.0 - Pester: 3.4.0, 5.4.1 - PowerShellGet: 1.0.0.1, 2.2.5 - PSScriptAnalyzer: 1.21.0 @@ -564,19 +563,19 @@ All other versions are saved but not installed. ``` ### Android -| Package Name | Version | -| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | -| Android Command Line Tools | 8.0 | -| Android Emulator | 31.2.9 | -| Android SDK Build-tools | 33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | -| Android SDK Platforms | android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | -| Android SDK Platform-Tools | 34.0.3 | -| Android Support Repository | 47.0.0 | -| CMake | 3.18.1<br>3.22.1 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 23.2.8568313<br>24.0.8215888<br>25.2.9519653 | -| SDK Patch Applier v4 | 1 | +| Package Name | Version | +| -------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 8.0 | +| Android Emulator | 31.2.9 | +| Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | +| Android SDK Platforms | android-34 (rev 1)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | +| Android SDK Platform-Tools | 34.0.3 | +| Android Support Repository | 47.0.0 | +| CMake | 3.18.1<br>3.22.1 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 23.2.8568313<br>24.0.8215888<br>25.2.9519653 | +| SDK Patch Applier v4 | 1 | #### Environment variables | Name | Value | From 1d9251b881b5d4691a592cb96d1cf4ba05f5d9d9 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 15 Jun 2023 10:48:57 +0000 Subject: [PATCH 1969/3485] Updating readme file for ubuntu22 version 20230611.1 (#7701) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2204-Readme.md | 90 +++++++++++++++---------------- 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/images/linux/Ubuntu2204-Readme.md b/images/linux/Ubuntu2204-Readme.md index 98da729f75fa..774b29f88dce 100644 --- a/images/linux/Ubuntu2204-Readme.md +++ b/images/linux/Ubuntu2204-Readme.md @@ -1,13 +1,13 @@ | Announcements | |-| | [[All OSs] .NET 3.1 will be removed from the images on July, 3](https://github.com/actions/runner-images/issues/7667) | -| [Actions runner image scheduled maintenance (June 2 2023 through June 12 2023)](https://github.com/actions/runner-images/issues/7660) | +| [Actions runner image scheduled maintenance (June 2 2023 through June 16 2023)](https://github.com/actions/runner-images/issues/7660) | | [python2.7 will be removed from the images on June 12, 2023](https://github.com/actions/runner-images/issues/7401) | *** # Ubuntu 22.04 - OS Version: 22.04.2 LTS - Kernel Version: 5.15.0-1039-azure -- Image Version: 20230604.1 +- Image Version: 20230611.1 - Systemd version: 249.11-0ubuntu3.9 ## Installed Software @@ -20,8 +20,8 @@ - Dash 0.5.11+git20210903+057cd650a4ed-3build1 - GNU C++: 9.5.0, 10.4.0, 11.3.0, 12.1.0 - GNU Fortran: 9.5.0, 10.4.0, 11.3.0, 12.1.0 -- Julia 1.9.0 -- Kotlin 1.8.21-release-380 +- Julia 1.9.1 +- Kotlin 1.8.22-release-407 - Mono 6.12.0.182 - MSBuild 16.10.1.31701 (Mono 6.12.0.182) - Node.js 18.16.0 @@ -34,7 +34,7 @@ ### Package Management - cpan 1.64 - Helm 3.12.0 -- Homebrew 4.0.20 +- Homebrew 4.0.21 - Miniconda 23.3.1 - Npm 9.5.1 - NuGet 6.3.1.1 @@ -42,7 +42,7 @@ - Pip3 22.0.2 - Pipx 1.2.0 - RubyGems 3.3.5 -- Vcpkg (build from commit 662dbb50e) +- Vcpkg (build from commit 633664434) - Yarn 1.22.19 #### Environment variables @@ -60,7 +60,7 @@ to accomplish this. ``` ### Project Management -- Lerna 6.6.2 +- Lerna 7.0.0 - Maven 3.8.8 ### Tools @@ -75,7 +75,7 @@ to accomplish this. - CodeQL Action Bundles 2.13.1 2.13.3 - Docker Amazon ECR Credential Helper 0.7.1 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.18.0+azure-1 +- Docker Compose v2 2.18.1+azure-1 - Docker-Buildx 0.10.4 - Docker-Moby Client 20.10.25+azure-1 - Docker-Moby Server 20.10.25+azure-1 @@ -98,9 +98,9 @@ to accomplish this. - nvm 0.39.3 - OpenSSL 3.0.2-0ubuntu1.10 - Packer 1.9.1 -- Parcel 2.9.1 +- Parcel 2.9.2 - Podman 3.4.4 -- Pulumi 3.69.0 +- Pulumi 3.70.0 - R 4.3.0 - Skopeo 1.4.1 - Sphinx Open Source Search Server 2.2.11 @@ -111,19 +111,19 @@ to accomplish this. - zstd 1.5.5 ### CLI Tools -- Alibaba Cloud CLI 3.0.165 -- AWS CLI 2.11.25 +- Alibaba Cloud CLI 3.0.166 +- AWS CLI 2.11.27 - AWS CLI Session Manager Plugin 1.2.463.0 -- AWS SAM CLI 1.85.0 +- AWS SAM CLI 1.86.1 - Azure CLI 2.49.0 - Azure CLI (azure-devops) 0.26.0 - GitHub CLI 2.30.0 -- Google Cloud SDK 433.0.1 +- Google Cloud SDK 434.0.0 - Hub CLI 2.14.2 -- Netlify CLI 15.3.1 -- OpenShift CLI 4.13.1 +- Netlify CLI 15.4.1 +- OpenShift CLI 4.13.2 - ORAS CLI 1.0.0 -- Vercel CLI 30.1.2 +- Vercel CLI 30.2.1 ### Java | Version | Vendor | Environment Variable | @@ -134,7 +134,7 @@ to accomplish this. ### PHP Tools - PHP: 8.1.2 -- Composer 2.5.7 +- Composer 2.5.8 - PHPUnit 8.5.33 ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. @@ -161,13 +161,13 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.5.2 ### Browsers and Drivers -- Google Chrome 114.0.5735.90 +- Google Chrome 114.0.5735.106 - ChromeDriver 114.0.5735.90 - Chromium 114.0.5733.0 -- Microsoft Edge 114.0.1823.37 -- Microsoft Edge WebDriver 114.0.1823.37 -- Selenium server 4.9.0 -- Mozilla Firefox 114.0 +- Microsoft Edge 114.0.1823.43 +- Microsoft Edge WebDriver 114.0.1823.43 +- Selenium server 4.10.0 +- Mozilla Firefox 114.0.1 - Geckodriver 0.33.0 #### Environment variables @@ -210,8 +210,8 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Go - 1.18.10 -- 1.19.9 -- 1.20.4 +- 1.19.10 +- 1.20.5 #### Node.js - 14.21.3 @@ -219,11 +219,11 @@ Use the following command as a part of your job to start the service: 'sudo syst - 18.16.0 #### Python -- 3.7.16 -- 3.8.16 -- 3.9.16 -- 3.10.11 -- 3.11.3 +- 3.7.17 +- 3.8.17 +- 3.9.17 +- 3.10.12 +- 3.11.4 #### PyPy - 3.7.13 [PyPy 7.3.9] @@ -239,7 +239,7 @@ Use the following command as a part of your job to start the service: 'sudo syst #### PowerShell Modules - Az: 9.3.0 - MarkdownPS: 1.9 -- Microsoft.Graph: 1.27.0 +- Microsoft.Graph: 1.28.0 - Pester: 5.4.1 - PSScriptAnalyzer: 1.21.0 @@ -250,20 +250,20 @@ Use the following command as a part of your job to start the service: 'sudo syst | nginx | 1.18.0 | /etc/nginx/nginx.conf | inactive | 80 | ### Android -| Package Name | Version | -| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | -| Android Command Line Tools | 9.0 | -| Android Emulator | 32.1.13 | -| Android SDK Build-tools | 33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | -| Android SDK Platform-Tools | 34.0.3 | -| Android SDK Platforms | android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | -| Android SDK Tools | 26.1.1 | -| Android Support Repository | 47.0.0 | -| CMake | 3.10.2<br>3.18.1<br>3.22.1 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 23.2.8568313<br>24.0.8215888<br>25.2.9519653 (default) | -| SDK Patch Applier v4 | 1 | +| Package Name | Version | +| -------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 9.0 | +| Android Emulator | 32.1.13 | +| Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | +| Android SDK Platform-Tools | 34.0.3 | +| Android SDK Platforms | android-34 (rev 1)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | +| Android SDK Tools | 26.1.1 | +| Android Support Repository | 47.0.0 | +| CMake | 3.10.2<br>3.18.1<br>3.22.1 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 23.2.8568313<br>24.0.8215888<br>25.2.9519653 (default) | +| SDK Patch Applier v4 | 1 | #### Environment variables | Name | Value | From fea6530e4c144870da63d84c29a149afe161216c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 15 Jun 2023 10:52:02 +0000 Subject: [PATCH 1970/3485] Updating readme file for ubuntu20 version 20230611.1 (#7702) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2004-Readme.md | 92 +++++++++++++++---------------- 1 file changed, 46 insertions(+), 46 deletions(-) diff --git a/images/linux/Ubuntu2004-Readme.md b/images/linux/Ubuntu2004-Readme.md index 9afe4330e492..0ad6caefe00a 100644 --- a/images/linux/Ubuntu2004-Readme.md +++ b/images/linux/Ubuntu2004-Readme.md @@ -1,13 +1,13 @@ | Announcements | |-| | [[All OSs] .NET 3.1 will be removed from the images on July, 3](https://github.com/actions/runner-images/issues/7667) | -| [Actions runner image scheduled maintenance (June 2 2023 through June 12 2023)](https://github.com/actions/runner-images/issues/7660) | +| [Actions runner image scheduled maintenance (June 2 2023 through June 16 2023)](https://github.com/actions/runner-images/issues/7660) | | [python2.7 will be removed from the images on June 12, 2023](https://github.com/actions/runner-images/issues/7401) | *** # Ubuntu 20.04 - OS Version: 20.04.6 LTS - Kernel Version: 5.15.0-1039-azure -- Image Version: 20230604.1 +- Image Version: 20230611.1 - Systemd version: 245.4-4ubuntu3.21 ## Installed Software @@ -22,8 +22,8 @@ - Erlang rebar3 3.22.0 - GNU C++: 9.4.0, 10.3.0 - GNU Fortran: 9.4.0, 10.3.0 -- Julia 1.9.0 -- Kotlin 1.8.21-release-380 +- Julia 1.9.1 +- Kotlin 1.8.22-release-407 - Mono 6.12.0.182 - MSBuild 16.10.1.31701 (Mono 6.12.0.182) - Node.js 18.16.0 @@ -36,7 +36,7 @@ ### Package Management - cpan 1.64 - Helm 3.12.0 -- Homebrew 4.0.20 +- Homebrew 4.0.21 - Miniconda 23.3.1 - Npm 9.5.1 - NuGet 6.3.1.1 @@ -44,7 +44,7 @@ - Pip3 20.0.2 - Pipx 1.2.0 - RubyGems 3.1.2 -- Vcpkg (build from commit 662dbb50e) +- Vcpkg (build from commit 633664434) - Yarn 1.22.19 #### Environment variables @@ -64,7 +64,7 @@ to accomplish this. ### Project Management - Ant 1.10.7 - Gradle 8.1.1 -- Lerna 6.6.2 +- Lerna 7.0.0 - Maven 3.8.8 - Sbt 1.9.0 @@ -80,7 +80,7 @@ to accomplish this. - CodeQL Action Bundles 2.13.1 2.13.3 - Docker Amazon ECR Credential Helper 0.7.1 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.18.0+azure-1 +- Docker Compose v2 2.18.1+azure-1 - Docker-Buildx 0.10.4 - Docker-Moby Client 20.10.25+azure-1 - Docker-Moby Server 20.10.25+azure-1 @@ -104,10 +104,10 @@ to accomplish this. - nvm 0.39.3 - OpenSSL 1.1.1f-1ubuntu2.19 - Packer 1.9.1 -- Parcel 2.9.1 +- Parcel 2.9.2 - PhantomJS 2.1.1 2.1.1 - Podman 3.4.2 -- Pulumi 3.69.0 +- Pulumi 3.70.0 - R 4.3.0 - Skopeo 1.5.0 - Sphinx Open Source Search Server 2.2.11 @@ -118,19 +118,19 @@ to accomplish this. - zstd 1.5.5 ### CLI Tools -- Alibaba Cloud CLI 3.0.165 -- AWS CLI 2.11.25 +- Alibaba Cloud CLI 3.0.166 +- AWS CLI 2.11.27 - AWS CLI Session Manager Plugin 1.2.463.0 -- AWS SAM CLI 1.85.0 +- AWS SAM CLI 1.86.1 - Azure CLI 2.49.0 - Azure CLI (azure-devops) 0.26.0 - GitHub CLI 2.30.0 -- Google Cloud SDK 433.0.1 +- Google Cloud SDK 434.0.0 - Hub CLI 2.14.2 -- Netlify CLI 15.3.1 -- OpenShift CLI 4.13.1 +- Netlify CLI 15.4.1 +- OpenShift CLI 4.13.2 - ORAS CLI 1.0.0 -- Vercel CLI 30.1.2 +- Vercel CLI 30.2.1 ### Java | Version | Vendor | Environment Variable | @@ -140,8 +140,8 @@ to accomplish this. | 17.0.7+7 | Eclipse Temurin | JAVA_HOME_17_X64 | ### PHP Tools -- PHP: 7.4.33, 8.0.28, 8.1.18, 8.2.6 -- Composer 2.5.7 +- PHP: 7.4.33, 8.0.29, 8.1.20, 8.2.7 +- Composer 2.5.8 - PHPUnit 8.5.33 ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. @@ -168,13 +168,13 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.5.2 ### Browsers and Drivers -- Google Chrome 114.0.5735.90 +- Google Chrome 114.0.5735.106 - ChromeDriver 114.0.5735.90 - Chromium 114.0.5733.0 -- Microsoft Edge 114.0.1823.37 -- Microsoft Edge WebDriver 114.0.1823.37 -- Selenium server 4.9.0 -- Mozilla Firefox 114.0 +- Microsoft Edge 114.0.1823.43 +- Microsoft Edge WebDriver 114.0.1823.43 +- Selenium server 4.10.0 +- Mozilla Firefox 114.0.1 - Geckodriver 0.33.0 #### Environment variables @@ -218,8 +218,8 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Go - 1.18.10 -- 1.19.9 -- 1.20.4 +- 1.19.10 +- 1.20.5 #### Node.js - 14.21.3 @@ -228,11 +228,11 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Python - 3.6.15 -- 3.7.16 -- 3.8.16 -- 3.9.16 -- 3.10.11 -- 3.11.3 +- 3.7.17 +- 3.8.17 +- 3.9.17 +- 3.10.12 +- 3.11.4 #### PyPy - 2.7.18 [PyPy 7.3.11] @@ -255,7 +255,7 @@ Use the following command as a part of your job to start the service: 'sudo syst - Az: 9.3.0 - Az (Cached): 3.1.0.zip, 4.4.0.zip, 5.9.0.zip, 6.6.0.zip, 7.5.0.zip - MarkdownPS: 1.9 -- Microsoft.Graph: 1.27.0 +- Microsoft.Graph: 1.28.0 - Pester: 5.4.1 - PSScriptAnalyzer: 1.21.0 @@ -267,20 +267,20 @@ Use the following command as a part of your job to start the service: 'sudo syst | nginx | 1.18.0 | /etc/nginx/nginx.conf | inactive | 80 | ### Android -| Package Name | Version | -| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | -| Android Command Line Tools | 9.0 | -| Android Emulator | 32.1.13 | -| Android SDK Build-tools | 33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | -| Android SDK Platform-Tools | 34.0.3 | -| Android SDK Platforms | android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | -| Android SDK Tools | 26.1.1 | -| Android Support Repository | 47.0.0 | -| CMake | 3.10.2<br>3.18.1<br>3.22.1 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 23.2.8568313<br>24.0.8215888<br>25.2.9519653 (default) | -| SDK Patch Applier v4 | 1 | +| Package Name | Version | +| -------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 9.0 | +| Android Emulator | 32.1.13 | +| Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | +| Android SDK Platform-Tools | 34.0.3 | +| Android SDK Platforms | android-34 (rev 1)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | +| Android SDK Tools | 26.1.1 | +| Android Support Repository | 47.0.0 | +| CMake | 3.10.2<br>3.18.1<br>3.22.1 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 23.2.8568313<br>24.0.8215888<br>25.2.9519653 (default) | +| SDK Patch Applier v4 | 1 | #### Environment variables | Name | Value | From f83e4110358e039da3e65ddedee30cda4c9eb6a6 Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Fri, 16 Jun 2023 16:57:49 +0200 Subject: [PATCH 1971/3485] Update GenerateResourcesAndImage related documentation (#7738) --- docs/create-image-and-azure-resources.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/create-image-and-azure-resources.md b/docs/create-image-and-azure-resources.md index 6f340b6a62db..c951aa20d681 100644 --- a/docs/create-image-and-azure-resources.md +++ b/docs/create-image-and-azure-resources.md @@ -85,6 +85,11 @@ Then import [GenerateResourcesAndImage](../helpers/GenerateResourcesAndImage.ps1 Import-Module .\helpers\GenerateResourcesAndImage.ps1 ``` +> :warning: When running `GenerateResourcesAndImage` in PowerShell 7.3, following command should be executed first: +> ```powershell +> $PSNativeCommandArgumentPassing = 'Legacy' +> ``` + Finally, run `GenerateResourcesAndImage` function setting mandatory arguments: image type and where to create resources: - `SubscriptionId` - your Azure Subscription ID @@ -92,11 +97,6 @@ Finally, run `GenerateResourcesAndImage` function setting mandatory arguments: i - `AzureLocation` - location where resources will be created (e.g. "East US") - `ImageType` - what image to build (we suggest choosing "UbuntuMinimal" here, other valid options are "Windows2019", "Windows2022", "Ubuntu2004", "Ubuntu2204") -> :warning: When running `GenerateResourcesAndImage` in PowerShell 7.3, following command should be executed first: -> ```powershell -> $PSNativeCommandArgumentPassing = 'Legacy' -> ``` - This function automatically creates all required Azure resources and kicks off packer image generation for the selected image type. When image is ready you may proceed to [deployment](#generated-machine-deployment) From d0d97cd5f8a7de20d81e358706074d4b91225787 Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Fri, 16 Jun 2023 18:34:04 +0200 Subject: [PATCH 1972/3485] Cache Android SDK packages list (#7709) --- .../linux/scripts/helpers/Common.Helpers.psm1 | 17 ++++++++++++++--- .../SoftwareReport.Android.psm1 | 18 ++++++++++++++++-- .../scripts/ImageHelpers/InstallHelpers.ps1 | 12 +++++++++++- 3 files changed, 41 insertions(+), 6 deletions(-) diff --git a/images/linux/scripts/helpers/Common.Helpers.psm1 b/images/linux/scripts/helpers/Common.Helpers.psm1 index 6db094683481..5f0b3e068504 100644 --- a/images/linux/scripts/helpers/Common.Helpers.psm1 +++ b/images/linux/scripts/helpers/Common.Helpers.psm1 @@ -72,9 +72,20 @@ function Get-ToolsetValue { } function Get-AndroidPackages { - $androidSDKManagerPath = "/usr/local/lib/android/sdk/cmdline-tools/latest/bin/sdkmanager" - $androidPackages = & $androidSDKManagerPath --list --verbose 2>&1 - return $androidPackages + $packagesListFile = "/usr/local/lib/android/sdk/packages-list.txt" + + if (-Not (Test-Path -Path $packagesListFile -PathType Leaf)) { + (/usr/local/lib/android/sdk/cmdline-tools/latest/bin/sdkmanager --list --verbose 2>&1) | + Where-Object { $_ -Match "^[^\s]" } | + Where-Object { $_ -NotMatch "^(Loading |Info: Parsing |---|\[=+|Installed |Available )" } | + Where-Object { $_ -NotMatch "^[^;]*$" } | + Out-File -FilePath $packagesListFile + + Write-Host Android packages list: + Get-Content $packagesListFile + } + + return Get-Content $packagesListFile } function Get-EnvironmentVariable($variable) { diff --git a/images/macos/software-report/SoftwareReport.Android.psm1 b/images/macos/software-report/SoftwareReport.Android.psm1 index e2db090fd229..2ba8f23c7ecd 100644 --- a/images/macos/software-report/SoftwareReport.Android.psm1 +++ b/images/macos/software-report/SoftwareReport.Android.psm1 @@ -24,9 +24,23 @@ function Get-AndroidInstalledPackages { } function Get-AndroidPackages { + $androidSDKDir = Get-AndroidSDKRoot $androidSDKManagerPath = Get-AndroidSDKManagerPath - $androidPackages = & $androidSDKManagerPath --list --verbose - return $androidPackages + + $packagesListFile = Join-Path $androidSDKDir "packages-list.txt" + + if (-Not (Test-Path -Path $packagesListFile -PathType Leaf)) { + (& $androidSDKManagerPath --list --verbose) | + Where-Object { $_ -Match "^[^\s]" } | + Where-Object { $_ -NotMatch "^(Loading |Info: Parsing |---|\[=+|Installed |Available )" } | + Where-Object { $_ -NotMatch "^[^;]*$" } | + Out-File -FilePath $packagesListFile + + Write-Host Android packages list: + Get-Content $packagesListFile + } + + return Get-Content $packagesListFile } function Build-AndroidTable { diff --git a/images/win/scripts/ImageHelpers/InstallHelpers.ps1 b/images/win/scripts/ImageHelpers/InstallHelpers.ps1 index 2d895e77b0d2..ed142e17b244 100644 --- a/images/win/scripts/ImageHelpers/InstallHelpers.ps1 +++ b/images/win/scripts/ImageHelpers/InstallHelpers.ps1 @@ -489,7 +489,17 @@ function Get-AndroidPackages { [string]$AndroidSDKManagerPath ) - return (cmd /c "$AndroidSDKManagerPath --list --verbose 2>&1").Trim() | Foreach-Object { $_.Split()[0] } | Where-Object {$_} + $packagesListFile = "C:\Android\android-sdk\packages-list.txt" + + if (-Not (Test-Path -Path $packagesListFile -PathType Leaf)) { + (cmd /c "$AndroidSDKManagerPath --list --verbose 2>&1") | + Where-Object { $_ -Match "^[^\s]" } | + Where-Object { $_ -NotMatch "^(Loading |Info: Parsing |---|\[=+|Installed |Available )" } | + Where-Object { $_ -NotMatch "^[^;]*$" } | + Out-File -FilePath $packagesListFile + } + + return Get-Content $packagesListFile } function Get-AndroidPackagesByName { From c26258168863fb6f3f15307411be1665edfac90c Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Sun, 18 Jun 2023 20:21:53 +0200 Subject: [PATCH 1973/3485] Revert "[Windows] download MySQL from SA (#6769)" (#7732) --- images/win/scripts/Installers/Install-MysqlCli.ps1 | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/images/win/scripts/Installers/Install-MysqlCli.ps1 b/images/win/scripts/Installers/Install-MysqlCli.ps1 index 5b5c1f0d55fb..300e3b0cc493 100644 --- a/images/win/scripts/Installers/Install-MysqlCli.ps1 +++ b/images/win/scripts/Installers/Install-MysqlCli.ps1 @@ -14,14 +14,14 @@ Install-Binary -Url $InstallerURI -Name $InstallerName -ArgumentList $ArgumentLi [version]$MysqlVersion = (Get-ToolsetContent).mysql.version $MysqlVersionMajorMinor = $MysqlVersion.ToString(2) -# Temporary move to SA as Oracle's site is unavailable -if (Test-IsWin19) { - $MysqlVersionUrl = "https://githubpackercipoolmysql.blob.core.windows.net/mysql/mysql-5.7.40-winx64.zip" - $MysqlVersionFull = "5.7.40" -} elseif (Test-IsWin22) { - $MysqlVersionUrl = "https://githubpackercipoolmysql.blob.core.windows.net/mysql/mysql-8.0.31-winx64.zip" - $MysqlVersionFull = "8.0.31" +if ($MysqlVersion.Build -lt 0) { + $MysqlVersion = (Invoke-RestMethod -Uri "https://dev.mysql.com/downloads/mysql/${MysqlVersionMajorMinor}.html" | + Select-String -Pattern "${MysqlVersionMajorMinor}\.\d+").Matches.Value } + +$MysqlVersionFull = $MysqlVersion.ToString() +$MysqlVersionUrl = "https://cdn.mysql.com/Downloads/MySQL-${MysqlVersionMajorMinor}/mysql-${MysqlVersionFull}-winx64.zip" + $MysqlArchPath = Start-DownloadWithRetry -Url $MysqlVersionUrl -Name "mysql.zip" # Expand the zip From c9e74cbf8c89ed72cb742ec01640374f5e1a2b01 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 20 Jun 2023 09:26:05 +0000 Subject: [PATCH 1974/3485] Updating readme file for macOS-12 version 20230612.1 (#7727) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-12-Readme.md | 163 ++++++++++++++++---------------- 1 file changed, 84 insertions(+), 79 deletions(-) diff --git a/images/macos/macos-12-Readme.md b/images/macos/macos-12-Readme.md index 8b8ba9f2ecd6..bc686752c1c7 100644 --- a/images/macos/macos-12-Readme.md +++ b/images/macos/macos-12-Readme.md @@ -1,7 +1,12 @@ +| Announcements | +|-| +| [[All OSs] .NET 3.1 will be removed from the images on July, 3](https://github.com/actions/runner-images/issues/7667) | +| [Actions runner image scheduled maintenance (June 2 2023 through June 16 2023)](https://github.com/actions/runner-images/issues/7660) | +*** # macOS 12 -- OS Version: macOS 12.6.5 (21G531) +- OS Version: macOS 12.6.6 (21G646) - Kernel Version: Darwin 21.6.0 -- Image Version: 20230516.1 +- Image Version: 20230612.1 ## Installed Software @@ -10,39 +15,39 @@ - Bash 3.2.57(1)-release - Clang/LLVM 14.0.0 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` -- GCC 11 (Homebrew GCC 11.3.0) - available by `gcc-11` alias +- GCC 11 (Homebrew GCC 11.4.0) - available by `gcc-11` alias - GCC 12 (Homebrew GCC 12.3.0) - available by `gcc-12` alias -- GNU Fortran 11 (Homebrew GCC 11.3.0) - available by `gfortran-11` alias +- GNU Fortran 11 (Homebrew GCC 11.4.0) - available by `gfortran-11` alias - GNU Fortran 12 (Homebrew GCC 12.3.0) - available by `gfortran-12` alias -- Julia 1.9.0 -- Kotlin 1.8.21-release-380 -- Go 1.20.4 +- Julia 1.9.1 +- Kotlin 1.8.22-release-407 +- Go 1.20.5 - Mono 6.12.0.188 - MSBuild 16.10.1.51301 (Mono 6.12.0.188) - Node.js 18.16.0 - NVM 0.39.3 - NVM - Cached node versions: 14.21.3, 16.20.0, 18.16.0 - Perl 5.36.1 -- PHP 8.2.6 +- PHP 8.2.7 - Python 2.7.18 -- Python3 3.11.3 +- Python3 3.11.4 - R 4.3.0 - Ruby 3.0.6p216 ### Package Management -- Bundler 2.4.13 +- Bundler 2.4.14 - Carthage 0.39.0 - CocoaPods 1.12.1 -- Composer 2.5.5 -- Homebrew 4.0.18 +- Composer 2.5.8 +- Homebrew 4.0.22 - Miniconda 23.3.1 - NPM 9.5.1 - NuGet 6.3.1.1 - Pip 20.3.4 (python 2.7) - Pip3 23.1.2 (python 3.11) - Pipx 1.2.0 -- RubyGems 3.4.13 -- Vcpkg 2023 (build from commit a61863793) +- RubyGems 3.4.14 +- Vcpkg 2023 (build from commit 1ba9a2591) - Yarn 1.22.19 #### Environment variables @@ -55,79 +60,79 @@ - Apache Ant 1.10.13 - Apache Maven 3.9.2 - Gradle 8.1.1 -- Sbt 1.8.3 +- Sbt 1.9.0 ### Utilities - 7-Zip 17.05 - aria2 1.36.0 -- azcopy 10.18.1 -- bazel 6.2.0 +- azcopy 10.19.0 +- bazel 6.2.1 - bazelisk 1.17.0 - bsdtar 3.5.1 - available by 'tar' alias -- Curl 8.0.1 -- Git 2.40.1 +- Curl 8.1.2 +- Git 2.41.0 - Git LFS 3.3.0 -- GitHub CLI 2.29.0 +- GitHub CLI 2.30.0 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.4 -- gpg (GnuPG) 2.4.1 +- gpg (GnuPG) 2.4.2 - Hub CLI 2.14.2 -- ImageMagick 7.1.1-9 +- ImageMagick 7.1.1-11 - jq 1.6 -- mongo 5.0.15 -- mongod 5.0.15 -- OpenSSL 1.1.1t 7 Feb 2023 -- Packer 1.8.6 +- mongo 5.0.17 +- mongod 5.0.17 +- OpenSSL 1.1.1u 30 May 2023 +- Packer 1.9.1 - PostgreSQL 14.8 (Homebrew) - psql (PostgreSQL) 14.8 (Homebrew) - Sox 14.4.2 - Subversion (SVN) 1.14.2 - Switchaudio-osx 1.2.2 -- Vagrant 2.3.4 +- Vagrant 2.3.6 - VirtualBox 6.1.38r153438 -- yq 4.33.3 +- yq 4.34.1 - zstd 1.5.5 ### Tools -- App Center CLI 2.13.7 -- AWS CLI 2.11.20 -- AWS SAM CLI 1.84.0 +- App Center CLI 2.13.8 +- AWS CLI 2.11.27 +- AWS SAM CLI 1.86.1 - AWS Session Manager CLI 1.2.463.0 -- Azure CLI 2.48.1 +- Azure CLI 2.49.0 - Azure CLI (azure-devops) 0.26.0 -- Bicep CLI 0.17.1 +- Bicep CLI 0.18.4 - Cabal 3.6.2.0 -- Cmake 3.26.3 -- CodeQL Action Bundles 2.13.0 2.13.1 -- Colima 0.5.4 -- Fastlane 2.212.2 -- GHC 9.6.1 +- Cmake 3.26.4 +- CodeQL Action Bundles 2.13.1 2.13.3 +- Colima 0.5.5 +- Fastlane 2.213.0 +- GHC 9.6.2 - GHCup 0.1.19.2 - Jazzy 0.14.3 - Stack 2.9.3 -- SwiftFormat 0.51.9 +- SwiftFormat 0.51.11 - Swig 4.1.1 - Xcode Command Line Tools 14.2.0.0.1.1668646533 ### Linters - SwiftLint 0.52.2 -- Yamllint 1.31.0 +- Yamllint 1.32.0 ### Browsers -- Safari 16.4.1 (17615.1.26.101.10) -- SafariDriver 16.4.1 (17615.1.26.101.10) -- Google Chrome 113.0.5672.126 -- ChromeDriver 113.0.5672.63 -- Microsoft Edge 113.0.1774.42 -- Microsoft Edge WebDriver 113.0.1774.42 -- Mozilla Firefox 113.0.1 +- Safari 16.5 (17615.2.9.11.6) +- SafariDriver 16.5 (17615.2.9.11.6) +- Google Chrome 114.0.5735.106 +- ChromeDriver 114.0.5735.90 +- Microsoft Edge 114.0.1823.43 +- Microsoft Edge WebDriver 114.0.1823.43 +- Mozilla Firefox 114.0.1 - geckodriver 0.33.0 -- Selenium server 4.9.0 +- Selenium server 4.10.0 #### Environment variables | Name | Value | | --------------- | ---------------------------------------------- | -| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/113.0.5672.63 | +| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/114.0.5735.90 | | EDGEWEBDRIVER | /usr/local/share/edge_driver | | GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | @@ -146,11 +151,11 @@ - 3.1.4 #### Python -- 3.7.16 -- 3.8.16 -- 3.9.16 -- 3.10.11 -- 3.11.3 +- 3.7.17 +- 3.8.17 +- 3.9.17 +- 3.10.12 +- 3.11.4 #### PyPy - 2.7.18 [PyPy 7.3.11] @@ -165,28 +170,28 @@ #### Go - 1.18.10 -- 1.19.9 -- 1.20.4 +- 1.19.10 +- 1.20.5 ### Rust Tools -- Cargo 1.69.0 -- Rust 1.69.0 -- Rustdoc 1.69.0 +- Cargo 1.70.0 +- Rust 1.70.0 +- Rustdoc 1.70.0 - Rustup 1.26.0 #### Packages - Bindgen 0.65.1 - Cargo-audit 0.17.6 - Cargo-outdated 0.11.2 -- Cbindgen 0.24.3 -- Clippy 0.1.69 +- Cbindgen 0.24.5 +- Clippy 0.1.70 - Rustfmt 1.5.2-stable ### PowerShell Tools - PowerShell 7.2.11 #### PowerShell Modules -- Az: 9.7.1 +- Az: 10.0.0 - MarkdownPS: 1.9 - Pester: 5.4.1 - PSScriptAnalyzer: 1.21.0 @@ -195,7 +200,7 @@ | Name | Version | ConfigFile | ServiceStatus | ListenPort | | ----- | ------- | ------------------------------- | ------------- | ---------- | | httpd | 2.4.57 | /usr/local/etc/httpd/httpd.conf | none | 80 | -| nginx | 1.23.4 | /usr/local/etc/nginx/nginx.conf | none | 80 | +| nginx | 1.25.0 | /usr/local/etc/nginx/nginx.conf | none | 80 | ### Xamarin @@ -203,7 +208,7 @@ | Version | Build | Path | | -------------- | --------- | ------------------------------------ | | 2019 | 8.10.25.2 | /Applications/Visual Studio 2019.app | -| 2022 (default) | 17.5.4.8 | /Applications/Visual Studio.app | +| 2022 (default) | 17.5.6.3 | /Applications/Visual Studio.app | ##### Notes ``` @@ -319,19 +324,19 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" | watchOS 9.1 | 13.1<br>13.2.1<br>13.3.1<br>13.4.1<br>14.0.1<br>14.1<br>14.2 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | ### Android -| Package Name | Version | -| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | -| Android Command Line Tools | 8.0 | -| Android Emulator | 32.1.12 | -| Android SDK Build-tools | 33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | -| Android SDK Platforms | android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | -| Android SDK Platform-Tools | 34.0.1 | -| Android Support Repository | 47.0.0 | -| CMake | 3.18.1<br>3.22.1 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 23.2.8568313<br>24.0.8215888<br>25.2.9519653 (default) | -| SDK Patch Applier v4 | 1 | +| Package Name | Version | +| -------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 8.0 | +| Android Emulator | 32.1.13 | +| Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | +| Android SDK Platforms | android-34 (rev 1)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | +| Android SDK Platform-Tools | 34.0.3 | +| Android Support Repository | 47.0.0 | +| CMake | 3.18.1<br>3.22.1 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 23.2.8568313<br>24.0.8215888<br>25.2.9519653 (default) | +| SDK Patch Applier v4 | 1 | #### Environment variables | Name | Value | @@ -346,13 +351,13 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" ### Miscellaneous - libXext 1.3.5 - libXft 2.3.8 -- Tcl/Tk 8.6.13_2 +- Tcl/Tk 8.6.13_3 - Zlib 1.2.13 #### Environment variables | Name | Value | | ----------------- | ----------------------------------------------------------------------------------------- | -| PARALLELS_DMG_URL | https://download.parallels.com/desktop/v18/18.2.0-53488/ParallelsDesktop-18.2.0-53488.dmg | +| PARALLELS_DMG_URL | https://download.parallels.com/desktop/v18/18.3.1-53614/ParallelsDesktop-18.3.1-53614.dmg | ##### Notes ``` From 83c04bde69dffae6ee26e931acadc834dff248f4 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 20 Jun 2023 09:52:59 +0000 Subject: [PATCH 1975/3485] Updating readme file for macOS-11 version 20230612.1 (#7728) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-11-Readme.md | 159 ++++++++++++++++---------------- 1 file changed, 82 insertions(+), 77 deletions(-) diff --git a/images/macos/macos-11-Readme.md b/images/macos/macos-11-Readme.md index 16bf3faaf617..0a11b4469ea8 100644 --- a/images/macos/macos-11-Readme.md +++ b/images/macos/macos-11-Readme.md @@ -1,7 +1,12 @@ +| Announcements | +|-| +| [[All OSs] .NET 3.1 will be removed from the images on July, 3](https://github.com/actions/runner-images/issues/7667) | +| [Actions runner image scheduled maintenance (June 2 2023 through June 16 2023)](https://github.com/actions/runner-images/issues/7660) | +*** # macOS 11 -- OS Version: macOS 11.7.6 (20G1231) +- OS Version: macOS 11.7.7 (20G1345) - Kernel Version: Darwin 20.6.0 -- Image Version: 20230516.1 +- Image Version: 20230612.1 ## Installed Software @@ -11,40 +16,40 @@ - Clang/LLVM 13.0.0 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` - GCC 10 (Homebrew GCC 10.4.0) - available by `gcc-10` alias -- GCC 11 (Homebrew GCC 11.3.0) - available by `gcc-11` alias +- GCC 11 (Homebrew GCC 11.4.0) - available by `gcc-11` alias - GCC 12 (Homebrew GCC 12.3.0) - available by `gcc-12` alias - GNU Fortran 10 (Homebrew GCC 10.4.0) - available by `gfortran-10` alias -- GNU Fortran 11 (Homebrew GCC 11.3.0) - available by `gfortran-11` alias +- GNU Fortran 11 (Homebrew GCC 11.4.0) - available by `gfortran-11` alias - GNU Fortran 12 (Homebrew GCC 12.3.0) - available by `gfortran-12` alias -- Julia 1.9.0 -- Kotlin 1.8.21-release-380 -- Go 1.20.4 +- Julia 1.9.1 +- Kotlin 1.8.22-release-407 +- Go 1.20.5 - Mono 6.12.0.188 - MSBuild 16.10.1.51301 (Mono 6.12.0.188) - Node.js 18.16.0 - NVM 0.39.3 - NVM - Cached node versions: 14.21.3, 16.20.0, 18.16.0 - Perl 5.36.1 -- PHP 8.2.6 +- PHP 8.2.7 - Python 2.7.18 -- Python3 3.11.3 +- Python3 3.11.4 - R 4.3.0 - Ruby 2.7.8p225 ### Package Management -- Bundler 2.4.13 +- Bundler 2.4.14 - Carthage 0.39.0 - CocoaPods 1.12.1 -- Composer 2.5.5 -- Homebrew 4.0.18 +- Composer 2.5.8 +- Homebrew 4.0.22 - Miniconda 23.3.1 - NPM 9.5.1 - NuGet 6.3.1.1 - Pip 20.3.4 (python 2.7) - Pip3 23.1.2 (python 3.11) - Pipx 1.2.0 -- RubyGems 3.4.13 -- Vcpkg 2023 (build from commit a61863793) +- RubyGems 3.4.14 +- Vcpkg 2023 (build from commit 1ba9a2591) - Yarn 1.22.19 #### Environment variables @@ -57,79 +62,79 @@ - Apache Ant 1.10.13 - Apache Maven 3.9.2 - Gradle 8.1.1 -- Sbt 1.8.3 +- Sbt 1.9.0 ### Utilities - 7-Zip 17.05 - aria2 1.36.0 -- azcopy 10.18.1 -- bazel 6.2.0 +- azcopy 10.19.0 +- bazel 6.2.1 - bazelisk 1.17.0 - bsdtar 3.3.2 - available by 'tar' alias -- Curl 8.0.1 -- Git 2.40.1 +- Curl 8.1.2 +- Git 2.41.0 - Git LFS 3.3.0 -- GitHub CLI 2.29.0 +- GitHub CLI 2.30.0 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.4 -- gpg (GnuPG) 2.4.1 +- gpg (GnuPG) 2.4.2 - helm v3.12.0+gc9f554d - Hub CLI 2.14.2 -- ImageMagick 7.1.1-9 +- ImageMagick 7.1.1-11 - jq 1.6 -- mongo 5.0.15 -- mongod 5.0.15 +- mongo 5.0.17 +- mongod 5.0.17 - Newman 5.3.2 -- OpenSSL 1.1.1t 7 Feb 2023 -- Packer 1.8.6 +- OpenSSL 1.1.1u 30 May 2023 +- Packer 1.9.1 - PostgreSQL 14.8 (Homebrew) - psql (PostgreSQL) 14.8 (Homebrew) - Sox 14.4.2 - Subversion (SVN) 1.14.2 - Switchaudio-osx 1.2.2 -- yq 4.33.3 +- yq 4.34.1 - zstd 1.5.5 ### Tools -- Aliyun CLI 3.0.161 -- App Center CLI 2.13.7 -- AWS CLI 2.11.20 -- AWS SAM CLI 1.84.0 +- Aliyun CLI 3.0.165 +- App Center CLI 2.13.8 +- AWS CLI 2.11.27 +- AWS SAM CLI 1.86.1 - AWS Session Manager CLI 1.2.463.0 -- Azure CLI 2.48.1 +- Azure CLI 2.49.0 - Azure CLI (azure-devops) 0.26.0 -- Bicep CLI 0.17.1 +- Bicep CLI 0.18.4 - Cabal 3.6.2.0 -- Cmake 3.26.3 -- CodeQL Action Bundles 2.13.0 2.13.1 -- Fastlane 2.212.2 -- GHC 9.6.1 +- Cmake 3.26.4 +- CodeQL Action Bundles 2.13.1 2.13.3 +- Fastlane 2.213.0 +- GHC 9.6.2 - GHCup 0.1.19.2 - Jazzy 0.14.3 - Stack 2.9.3 -- SwiftFormat 0.51.9 +- SwiftFormat 0.51.11 - Swig 4.1.1 - Xcode Command Line Tools 13.2.0.0.1.1638488800 ### Linters - SwiftLint 0.48.0 -- Yamllint 1.31.0 +- Yamllint 1.32.0 ### Browsers -- Safari 16.4.1 (16615.1.26.101.10) -- SafariDriver 16.4.1 (16615.1.26.101.10) -- Google Chrome 113.0.5672.126 -- ChromeDriver 113.0.5672.63 -- Microsoft Edge 113.0.1774.42 -- Microsoft Edge WebDriver 113.0.1774.42 -- Mozilla Firefox 113.0.1 +- Safari 16.5 (16615.2.9.11.6) +- SafariDriver 16.5 (16615.2.9.11.6) +- Google Chrome 114.0.5735.106 +- ChromeDriver 114.0.5735.90 +- Microsoft Edge 114.0.1823.43 +- Microsoft Edge WebDriver 114.0.1823.43 +- Mozilla Firefox 114.0.1 - geckodriver 0.33.0 -- Selenium server 4.9.0 +- Selenium server 4.10.0 #### Environment variables | Name | Value | | --------------- | ---------------------------------------------- | -| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/113.0.5672.63 | +| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/114.0.5735.90 | | EDGEWEBDRIVER | /usr/local/share/edge_driver | | GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | @@ -151,11 +156,11 @@ - 3.1.4 #### Python -- 3.7.16 -- 3.8.16 -- 3.9.16 -- 3.10.11 -- 3.11.3 +- 3.7.17 +- 3.8.17 +- 3.9.17 +- 3.10.12 +- 3.11.4 #### PyPy - 2.7.18 [PyPy 7.3.11] @@ -170,28 +175,28 @@ #### Go - 1.18.10 -- 1.19.9 -- 1.20.4 +- 1.19.10 +- 1.20.5 ### Rust Tools -- Cargo 1.69.0 -- Rust 1.69.0 -- Rustdoc 1.69.0 +- Cargo 1.70.0 +- Rust 1.70.0 +- Rustdoc 1.70.0 - Rustup 1.26.0 #### Packages - Bindgen 0.65.1 - Cargo-audit 0.17.6 - Cargo-outdated 0.11.2 -- Cbindgen 0.24.3 -- Clippy 0.1.69 +- Cbindgen 0.24.5 +- Clippy 0.1.70 - Rustfmt 1.5.2-stable ### PowerShell Tools - PowerShell 7.2.11 #### PowerShell Modules -- Az: 9.7.1 +- Az: 10.0.0 - MarkdownPS: 1.9 - Pester: 5.4.1 - PSScriptAnalyzer: 1.21.0 @@ -200,7 +205,7 @@ | Name | Version | ConfigFile | ServiceStatus | ListenPort | | ----- | ------- | ------------------------------- | ------------- | ---------- | | httpd | 2.4.57 | /usr/local/etc/httpd/httpd.conf | none | 80 | -| nginx | 1.23.4 | /usr/local/etc/nginx/nginx.conf | none | 80 | +| nginx | 1.25.0 | /usr/local/etc/nginx/nginx.conf | none | 80 | ### Xamarin @@ -208,7 +213,7 @@ | Version | Build | Path | | -------------- | --------- | ------------------------------------ | | 2019 | 8.10.25.2 | /Applications/Visual Studio 2019.app | -| 2022 (default) | 17.5.4.8 | /Applications/Visual Studio.app | +| 2022 (default) | 17.5.6.3 | /Applications/Visual Studio.app | ##### Notes ``` @@ -321,19 +326,19 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" | watchOS 8.3 | 13.2.1 | Apple Watch Series 4 - 40mm<br>Apple Watch Series 4 - 44mm<br>Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | ### Android -| Package Name | Version | -| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | -| Android Command Line Tools | 8.0 | -| Android Emulator | 32.1.12 | -| Android SDK Build-tools | 33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | -| Android SDK Platforms | android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | -| Android SDK Platform-Tools | 34.0.1 | -| Android Support Repository | 47.0.0 | -| CMake | 3.10.2<br>3.18.1<br>3.22.1 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 23.2.8568313<br>24.0.8215888<br>25.2.9519653 (default) | -| SDK Patch Applier v4 | 1 | +| Package Name | Version | +| -------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 8.0 | +| Android Emulator | 32.1.13 | +| Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | +| Android SDK Platforms | android-34 (rev 1)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | +| Android SDK Platform-Tools | 34.0.3 | +| Android Support Repository | 47.0.0 | +| CMake | 3.10.2<br>3.18.1<br>3.22.1 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 23.2.8568313<br>24.0.8215888<br>25.2.9519653 (default) | +| SDK Patch Applier v4 | 1 | #### Environment variables | Name | Value | @@ -348,6 +353,6 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" ### Miscellaneous - libXext 1.3.5 - libXft 2.3.8 -- Tcl/Tk 8.6.13_2 +- Tcl/Tk 8.6.13_3 - Zlib 1.2.13 From a9bb38099f8f6faf14576a8386d34065835b42ba Mon Sep 17 00:00:00 2001 From: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com> Date: Tue, 20 Jun 2023 13:43:50 +0200 Subject: [PATCH 1976/3485] [macos] add pkg-config to macos-13 image (#7719) --- images/macos/toolsets/toolset-13.json | 1 + 1 file changed, 1 insertion(+) diff --git a/images/macos/toolsets/toolset-13.json b/images/macos/toolsets/toolset-13.json index 2dac37de9566..be4f2a1a5915 100644 --- a/images/macos/toolsets/toolset-13.json +++ b/images/macos/toolsets/toolset-13.json @@ -75,6 +75,7 @@ "p7zip", "packer", "perl", + "pkg-config", "swiftformat", "zstd", "gmp", From 2fdd5e58c252216b70e677ff7d1e4bd043bc86d0 Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Wed, 21 Jun 2023 10:16:01 +0200 Subject: [PATCH 1977/3485] [macos] Add sudo to SBOM generation (#7759) --- .github/workflows/create_sbom_report.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/create_sbom_report.yml b/.github/workflows/create_sbom_report.yml index fb3a43806d42..00ca3a3e8017 100644 --- a/.github/workflows/create_sbom_report.yml +++ b/.github/workflows/create_sbom_report.yml @@ -4,9 +4,8 @@ name: Create and upload a SBOM to release assets # github.event.client_payload.ReleaseID - Current release ID # github.event.client_payload.imageVersion - AzDO image version "major.minor" # github.event.client_payload.ReleaseBranchName - Necessary to identify workflow run -# +# # Current SYFT tool issues: -# macOS (minor): very long cataloging process (more than 6 hours) (https://github.com/anchore/syft/issues/1328), # macOS (major): prompt privilegies that blocking process indefinetely (https://github.com/anchore/syft/issues/1367) on: repository_dispatch: @@ -36,7 +35,7 @@ jobs: - name: Install SYFT tool on Ubuntu or macOS if: ${{ runner.os != 'Windows' }} run: curl -sSfL https://raw.githubusercontent.com/anchore/syft/main/install.sh | sh -s -- -b /usr/local/bin - #Running section. + #Running section. - name: Run SYFT on Windows if: ${{ runner.os == 'Windows' }} run: D:/syft/syft dir:C:/ -vv -o spdx-json=sbom.json @@ -45,7 +44,7 @@ jobs: run: syft dir:/ -vv -o spdx-json=sbom.json - name: Run SYFT on macOS if: ${{ runner.os == 'macOS' }} - run: syft dir:/ -vv -o spdx-json=sbom.json --exclude ./Users --exclude ./System/Volumes --exclude ./private + run: sudo syft dir:/ -vv -o spdx-json=sbom.json --exclude ./Users --exclude ./System/Volumes --exclude ./private shell: bash #Preparing artifact (raw SBOM.json is too big) - name: Compress SBOM file From 96f1383301c4d6866d3186b31c52c4d84e7b8812 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 21 Jun 2023 15:51:14 +0200 Subject: [PATCH 1978/3485] Updating readme file for macos-13 version 20230611.2 (#7707) Co-authored-by: Image generation service account <no-reply@microsoft.com> --- images/macos/macos-13-Readme.md | 157 +++++++++++++++++--------------- 1 file changed, 86 insertions(+), 71 deletions(-) diff --git a/images/macos/macos-13-Readme.md b/images/macos/macos-13-Readme.md index 0a6ae14a0733..2b374df120af 100644 --- a/images/macos/macos-13-Readme.md +++ b/images/macos/macos-13-Readme.md @@ -1,7 +1,12 @@ +| Announcements | +|-| +| [[All OSs] .NET 3.1 will be removed from the images on July, 3](https://github.com/actions/runner-images/issues/7667) | +| [Actions runner image scheduled maintenance (June 2 2023 through June 16 2023)](https://github.com/actions/runner-images/issues/7660) | +*** # macOS 13 - OS Version: macOS 13.4 (22F66) - Kernel Version: Darwin 22.5.0 -- Image Version: 20230524.1 +- Image Version: 20230611.2 ## Installed Software @@ -10,15 +15,15 @@ - Bash 3.2.57(1)-release - Clang/LLVM 14.0.0 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` -- GCC 11 (Homebrew GCC 11.3.0) - available by `gcc-11` alias +- GCC 11 (Homebrew GCC 11.4.0) - available by `gcc-11` alias - GCC 12 (Homebrew GCC 12.3.0) - available by `gcc-12` alias -- GNU Fortran 11 (Homebrew GCC 11.3.0) - available by `gfortran-11` alias +- GNU Fortran 11 (Homebrew GCC 11.4.0) - available by `gfortran-11` alias - GNU Fortran 12 (Homebrew GCC 12.3.0) - available by `gfortran-12` alias -- Julia 1.9.0 -- Kotlin 1.8.21-release-380 +- Julia 1.9.1 +- Kotlin 1.8.22-release-407 - Perl 5.36.1 -- PHP 8.2.6 -- Python3 3.11.3 +- PHP 8.2.7 +- Python3 3.11.4 - R 4.3.0 - Ruby 3.0.6p216 @@ -26,13 +31,13 @@ - Bundler 2.4.13 - Carthage 0.39.0 - CocoaPods 1.12.1 -- Composer 2.5.5 -- Homebrew 4.0.19 +- Composer 2.5.8 +- Homebrew 4.0.21 - NPM 9.5.1 - Pip3 23.1.2 (python 3.11) - Pipx 1.2.0 - RubyGems 3.4.13 -- Vcpkg 2023 (build from commit 2718aa52a) +- Vcpkg 2023 (build from commit 633664434) - Yarn 1.22.19 ### Project Management @@ -41,40 +46,40 @@ ### Utilities - 7-Zip 17.05 - aria2 1.36.0 -- azcopy 10.18.1 -- bazel 6.2.0 +- azcopy 10.19.0 +- bazel 6.2.1 - bazelisk 1.17.0 - bsdtar 3.5.3 - available by 'tar' alias -- Curl 8.1.1 -- Git 2.40.1 +- Curl 8.1.2 +- Git 2.41.0 - Git LFS 3.3.0 -- GitHub CLI 2.29.0 +- GitHub CLI 2.30.0 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.4 -- gpg (GnuPG) 2.4.1 +- gpg (GnuPG) 2.4.2 - jq 1.6 - OpenSSL LibreSSL 3.3.6 -- Packer 1.8.6 +- Packer 1.9.1 - Vagrant 2.3.6 - yq 4.34.1 - zstd 1.5.5 ### Tools -- AWS CLI 2.11.21 -- AWS SAM CLI 1.84.0 +- AWS CLI 2.11.27 +- AWS SAM CLI 1.86.1 - AWS Session Manager CLI 1.2.463.0 - Azure CLI 2.49.0 - Azure CLI (azure-devops) 0.26.0 - Bicep CLI 0.17.1 - Cabal 3.6.2.0 - Cmake 3.26.4 -- CodeQL Action Bundles 2.13.0 2.13.1 -- Fastlane 2.212.2 -- GHC 9.6.1 +- CodeQL Action Bundles 2.13.1 2.13.3 +- Fastlane 2.213.0 +- GHC 9.6.2 - GHCup 0.1.19.2 - Stack 2.9.3 -- SwiftFormat 0.51.10 -- Xcode Command Line Tools 14.3.0.0.1.1679647830 +- SwiftFormat 0.51.11 +- Xcode Command Line Tools 14.3.1.0.1.1683849156 ### Linters - SwiftLint 0.52.2 @@ -82,18 +87,18 @@ ### Browsers - Safari 16.5 (18615.2.9.11.4) - SafariDriver 16.5 (18615.2.9.11.4) -- Google Chrome 113.0.5672.126 -- ChromeDriver 113.0.5672.63 -- Microsoft Edge 113.0.1774.42 -- Microsoft Edge WebDriver 113.0.1774.50 -- Mozilla Firefox 113.0.2 +- Google Chrome 114.0.5735.106 +- ChromeDriver 114.0.5735.90 +- Microsoft Edge 114.0.1823.43 +- Microsoft Edge WebDriver 114.0.1823.43 +- Mozilla Firefox 114.0.1 - geckodriver 0.33.0 -- Selenium server 4.9.0 +- Selenium server 4.10.0 #### Environment variables | Name | Value | | --------------- | ---------------------------------------------- | -| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/113.0.5672.63 | +| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/114.0.5735.90 | | EDGEWEBDRIVER | /usr/local/share/edge_driver | | GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | @@ -111,10 +116,10 @@ - 3.1.4 #### Python -- 3.8.16 -- 3.9.16 -- 3.10.11 -- 3.11.3 +- 3.8.17 +- 3.9.17 +- 3.10.12 +- 3.11.4 #### PyPy - 2.7.18 [PyPy 7.3.11] @@ -127,21 +132,21 @@ - 18.16.0 #### Go -- 1.19.9 -- 1.20.4 +- 1.19.10 +- 1.20.5 ### Rust Tools -- Cargo 1.69.0 -- Rust 1.69.0 -- Rustdoc 1.69.0 +- Cargo 1.70.0 +- Rust 1.70.0 +- Rustdoc 1.70.0 - Rustup 1.26.0 #### Packages - Bindgen 0.65.1 - Cargo-audit 0.17.6 - Cargo-outdated 0.11.2 -- Cbindgen 0.24.3 -- Clippy 0.1.69 +- Cbindgen 0.24.5 +- Clippy 0.1.70 - Rustfmt 1.5.2-stable ### PowerShell Tools @@ -153,12 +158,13 @@ - PSScriptAnalyzer: 1.21.0 ### Xcode -| Version | Build | Path | -| -------------- | ------- | ------------------------------ | -| 14.3.1 | 14E300b | /Applications/Xcode_14.3.1.app | -| 14.3 | 14E222b | /Applications/Xcode_14.3.app | -| 14.2 (default) | 14C18 | /Applications/Xcode_14.2.app | -| 14.1 | 14B47b | /Applications/Xcode_14.1.app | +| Version | Build | Path | +| -------------- | -------- | ------------------------------ | +| 15.0 (beta) | 15A5160n | /Applications/Xcode_15.0.app | +| 14.3.1 | 14E300c | /Applications/Xcode_14.3.1.app | +| 14.3 | 14E222b | /Applications/Xcode_14.3.app | +| 14.2 (default) | 14C18 | /Applications/Xcode_14.2.app | +| 14.1 | 14B47b | /Applications/Xcode_14.1.app | #### Xcode Support Tools - xcpretty 0.3.0 @@ -170,52 +176,60 @@ | macOS 13.0 | macosx13.0 | 14.1 | | macOS 13.1 | macosx13.1 | 14.2 | | macOS 13.3 | macosx13.3 | 14.3, 14.3.1 | +| macOS 14.0 | macosx14.0 | 15.0 | | iOS 16.1 | iphoneos16.1 | 14.1 | | iOS 16.2 | iphoneos16.2 | 14.2 | | iOS 16.4 | iphoneos16.4 | 14.3, 14.3.1 | +| iOS 17.0 | iphoneos17.0 | 15.0 | | Simulator - iOS 16.1 | iphonesimulator16.1 | 14.1 | | Simulator - iOS 16.2 | iphonesimulator16.2 | 14.2 | | Simulator - iOS 16.4 | iphonesimulator16.4 | 14.3, 14.3.1 | +| Simulator - iOS 17.0 | iphonesimulator17.0 | 15.0 | | tvOS 16.1 | appletvos16.1 | 14.1, 14.2 | | tvOS 16.4 | appletvos16.4 | 14.3, 14.3.1 | +| tvOS 17.0 | appletvos17.0 | 15.0 | | Simulator - tvOS 16.1 | appletvsimulator16.1 | 14.1, 14.2 | | Simulator - tvOS 16.4 | appletvsimulator16.4 | 14.3, 14.3.1 | +| Simulator - tvOS 17.0 | appletvsimulator17.0 | 15.0 | | watchOS 9.1 | watchos9.1 | 14.1, 14.2 | | watchOS 9.4 | watchos9.4 | 14.3, 14.3.1 | +| watchOS 10.0 | watchos10.0 | 15.0 | | Simulator - watchOS 9.1 | watchsimulator9.1 | 14.1, 14.2 | | Simulator - watchOS 9.4 | watchsimulator9.4 | 14.3, 14.3.1 | +| Simulator - watchOS 10.0 | watchsimulator10.0 | 15.0 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3, 14.3.1 | -| Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3, 14.3.1 | | Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3, 14.3.1 | +| Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3, 14.3.1 | | DriverKit 22.1 | driverkit22.1 | 14.1 | | DriverKit 22.2 | driverkit22.2 | 14.2 | | DriverKit 22.4 | driverkit22.4 | 14.3, 14.3.1 | +| DriverKit 23.0 | driverkit23.0 | 15.0 | #### Installed Simulators -| OS | Xcode Version | Simulators | -| ----------- | ------------------------------ | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| iOS 16.1 | 14.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 16.2 | 14.2 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 16.4 | 14.3<br>14.3.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| tvOS 16.1 | 14.1<br>14.2<br>14.3<br>14.3.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 16.4 | 14.1<br>14.2<br>14.3<br>14.3.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| watchOS 9.1 | 14.1<br>14.2<br>14.3<br>14.3.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | -| watchOS 9.4 | 14.1<br>14.2<br>14.3<br>14.3.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | +| OS | Xcode Version | Simulators | +| ----------- | -------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| iOS 16.1 | 14.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 16.2 | 14.2 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 16.4 | 14.3<br>14.3.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| tvOS 16.1 | 14.1<br>14.2<br>14.3<br>14.3.1<br>15.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 16.4 | 14.1<br>14.2<br>14.3<br>14.3.1<br>15.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| watchOS 9.1 | 14.1<br>14.2<br>14.3<br>14.3.1<br>15.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | +| watchOS 9.4 | 14.1<br>14.2<br>14.3<br>14.3.1<br>15.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | ### Android -| Package Name | Version | -| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | -| Android Command Line Tools | 8.0 | -| Android Emulator | 32.1.13 | -| Android SDK Build-tools | 33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | -| Android SDK Platforms | android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | -| Android SDK Platform-Tools | 34.0.1 | -| Android Support Repository | 47.0.0 | -| CMake | 3.18.1<br>3.22.1 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 23.2.8568313<br>24.0.8215888<br>25.2.9519653 (default) | -| SDK Patch Applier v4 | 1 | +| Package Name | Version | +| -------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 8.0 | +| Android Emulator | 32.1.13 | +| Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | +| Android SDK Platforms | android-34 (rev 1)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | +| Android SDK Platform-Tools | 34.0.3 | +| Android Support Repository | 47.0.0 | +| CMake | 3.18.1<br>3.22.1 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 23.2.8568313<br>24.0.8215888<br>25.2.9519653 (default) | +| SDK Patch Applier v4 | 1 | #### Environment variables | Name | Value | @@ -226,3 +240,4 @@ | ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/25.2.9519653 | | ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk/25.2.9519653 | | ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | + From 5c0b2574b33322f2e975e08f21fb8f44e9c2ac9a Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Wed, 21 Jun 2023 17:22:41 +0200 Subject: [PATCH 1979/3485] Restore version 14.35 for VisualStudio build tools (#7756) --- images/win/toolsets/toolset-2022.json | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index 463371a09c63..2f88e3ccfc4c 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -254,6 +254,24 @@ "Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.ARM.Spectre", "Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.ARM64", "Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.ARM64.Spectre", + "Microsoft.VisualStudio.Component.VC.14.35.17.5.ARM.Spectre", + "Microsoft.VisualStudio.Component.VC.14.35.17.5.ARM", + "Microsoft.VisualStudio.Component.VC.14.35.17.5.ARM64.Spectre", + "Microsoft.VisualStudio.Component.VC.14.35.17.5.ARM64", + "Microsoft.VisualStudio.Component.VC.14.35.17.5.ATL.ARM.Spectre", + "Microsoft.VisualStudio.Component.VC.14.35.17.5.ATL.ARM", + "Microsoft.VisualStudio.Component.VC.14.35.17.5.ATL.ARM64.Spectre", + "Microsoft.VisualStudio.Component.VC.14.35.17.5.ATL.ARM64", + "Microsoft.VisualStudio.Component.VC.14.35.17.5.ATL.Spectre", + "Microsoft.VisualStudio.Component.VC.14.35.17.5.ATL", + "Microsoft.VisualStudio.Component.VC.14.35.17.5.MFC.ARM.Spectre", + "Microsoft.VisualStudio.Component.VC.14.35.17.5.MFC.ARM", + "Microsoft.VisualStudio.Component.VC.14.35.17.5.MFC.ARM64.Spectre", + "Microsoft.VisualStudio.Component.VC.14.35.17.5.MFC.ARM64", + "Microsoft.VisualStudio.Component.VC.14.35.17.5.MFC.Spectre", + "Microsoft.VisualStudio.Component.VC.14.35.17.5.MFC", + "Microsoft.VisualStudio.Component.VC.14.35.17.5.x86.x64.Spectre", + "Microsoft.VisualStudio.Component.VC.14.35.17.5.x86.x64", "Microsoft.VisualStudio.Component.VC.14.36.17.6.ARM.Spectre", "Microsoft.VisualStudio.Component.VC.14.36.17.6.ARM", "Microsoft.VisualStudio.Component.VC.14.36.17.6.ARM64.Spectre", From 18017c64971111c11fbddc400fbf1ad45d07166e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 22 Jun 2023 10:50:29 +0000 Subject: [PATCH 1980/3485] Updating readme file for ubuntu20 version 20230619.1.1 (#7747) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2004-Readme.md | 93 +++++++++++++++---------------- 1 file changed, 46 insertions(+), 47 deletions(-) diff --git a/images/linux/Ubuntu2004-Readme.md b/images/linux/Ubuntu2004-Readme.md index 0ad6caefe00a..9a0a36ef417f 100644 --- a/images/linux/Ubuntu2004-Readme.md +++ b/images/linux/Ubuntu2004-Readme.md @@ -2,13 +2,12 @@ |-| | [[All OSs] .NET 3.1 will be removed from the images on July, 3](https://github.com/actions/runner-images/issues/7667) | | [Actions runner image scheduled maintenance (June 2 2023 through June 16 2023)](https://github.com/actions/runner-images/issues/7660) | -| [python2.7 will be removed from the images on June 12, 2023](https://github.com/actions/runner-images/issues/7401) | *** # Ubuntu 20.04 - OS Version: 20.04.6 LTS -- Kernel Version: 5.15.0-1039-azure -- Image Version: 20230611.1 -- Systemd version: 245.4-4ubuntu3.21 +- Kernel Version: 5.15.0-1040-azure +- Image Version: 20230619.1.0 +- Systemd version: 245.4-4ubuntu3.22 ## Installed Software @@ -35,8 +34,8 @@ ### Package Management - cpan 1.64 -- Helm 3.12.0 -- Homebrew 4.0.21 +- Helm 3.12.1 +- Homebrew 4.0.24 - Miniconda 23.3.1 - Npm 9.5.1 - NuGet 6.3.1.1 @@ -44,7 +43,7 @@ - Pip3 20.0.2 - Pipx 1.2.0 - RubyGems 3.1.2 -- Vcpkg (build from commit 633664434) +- Vcpkg (build from commit 223b8d569) - Yarn 1.22.19 #### Environment variables @@ -64,7 +63,7 @@ to accomplish this. ### Project Management - Ant 1.10.7 - Gradle 8.1.1 -- Lerna 7.0.0 +- Lerna 7.0.2 - Maven 3.8.8 - Sbt 1.9.0 @@ -74,27 +73,27 @@ to accomplish this. - AzCopy 10.19.0 - available by `azcopy` and `azcopy10` aliases - Bazel 6.2.1 - Bazelisk 1.13.2 -- Bicep 0.17.1 +- Bicep 0.18.4 - Buildah 1.22.3 - CMake 3.26.4 - CodeQL Action Bundles 2.13.1 2.13.3 - Docker Amazon ECR Credential Helper 0.7.1 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.18.1+azure-1 -- Docker-Buildx 0.10.4 -- Docker-Moby Client 20.10.25+azure-1 -- Docker-Moby Server 20.10.25+azure-1 +- Docker Compose v2 2.18.1+azure-2 +- Docker-Buildx 0.11.0 +- Docker-Moby Client 20.10.25+azure-2 +- Docker-Moby Server 20.10.25+azure-2 - Fastlane 2.213.0 -- Git 2.40.1 +- Git 2.41.0 - Git LFS 3.3.0 - Git-ftp 1.6.0 - Haveged 1.9.1 -- Heroku 8.1.7 +- Heroku 8.1.8 - HHVM (HipHop VM) 4.172.1 - jq 1.6 -- Kind 0.19.0 -- Kubectl 1.27.2 -- Kustomize 5.0.3 +- Kind 0.20.0 +- Kubectl 1.27.3 +- Kustomize 5.1.0 - Leiningen 2.10.0 - MediaInfo 19.09 - Mercurial 5.3.1 @@ -107,30 +106,30 @@ to accomplish this. - Parcel 2.9.2 - PhantomJS 2.1.1 2.1.1 - Podman 3.4.2 -- Pulumi 3.70.0 +- Pulumi 3.72.2 - R 4.3.0 - Skopeo 1.5.0 - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 -- Terraform 1.4.6 +- Terraform 1.5.0 - yamllint 1.32.0 - yq 4.34.1 - zstd 1.5.5 ### CLI Tools -- Alibaba Cloud CLI 3.0.166 -- AWS CLI 2.11.27 +- Alibaba Cloud CLI 3.0.167 +- AWS CLI 2.12.1 - AWS CLI Session Manager Plugin 1.2.463.0 - AWS SAM CLI 1.86.1 - Azure CLI 2.49.0 - Azure CLI (azure-devops) 0.26.0 - GitHub CLI 2.30.0 -- Google Cloud SDK 434.0.0 +- Google Cloud SDK 435.0.1 - Hub CLI 2.14.2 -- Netlify CLI 15.4.1 -- OpenShift CLI 4.13.2 +- Netlify CLI 15.6.0 +- OpenShift CLI 4.13.3 - ORAS CLI 1.0.0 -- Vercel CLI 30.2.1 +- Vercel CLI 30.2.2 ### Java | Version | Vendor | Environment Variable | @@ -160,19 +159,19 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustup 1.26.0 #### Packages -- Bindgen 0.65.1 +- Bindgen 0.66.1 - Cargo audit 0.17.6 - Cargo clippy 0.1.70 -- Cargo outdated 0.11.2 +- Cargo outdated 0.13.0 - Cbindgen 0.24.5 - Rustfmt 1.5.2 ### Browsers and Drivers -- Google Chrome 114.0.5735.106 +- Google Chrome 114.0.5735.133 - ChromeDriver 114.0.5735.90 - Chromium 114.0.5733.0 -- Microsoft Edge 114.0.1823.43 -- Microsoft Edge WebDriver 114.0.1823.43 +- Microsoft Edge 114.0.1823.55 +- Microsoft Edge WebDriver 114.0.1823.51 - Selenium server 4.10.0 - Mozilla Firefox 114.0.1 - Geckodriver 0.33.0 @@ -186,7 +185,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | ### .NET Tools -- .NET Core SDK: 3.1.120, 3.1.202, 3.1.302, 3.1.426, 6.0.408, 7.0.105, 7.0.203, 7.0.302 +- .NET Core SDK: 3.1.120, 3.1.202, 3.1.302, 3.1.426, 6.0.410, 7.0.107, 7.0.203, 7.0.304 - nbgv 3.6.133+2d32d93cb1 ### Databases @@ -235,11 +234,11 @@ Use the following command as a part of your job to start the service: 'sudo syst - 3.11.4 #### PyPy -- 2.7.18 [PyPy 7.3.11] +- 2.7.18 [PyPy 7.3.12] - 3.6.12 [PyPy 7.3.3] - 3.7.13 [PyPy 7.3.9] - 3.8.16 [PyPy 7.3.11] -- 3.9.16 [PyPy 7.3.11] +- 3.9.17 [PyPy 7.3.12] #### Ruby - 2.5.9 @@ -296,25 +295,25 @@ Use the following command as a part of your job to start the service: 'sudo syst | Repository:Tag | Digest | Created | | ----------------------- | ------------------------------------------------------------------------ | ---------- | | alpine:3.14 | sha256:0f2d5c38dd7a4f4f733e688e3a6733cb5ab1ac6e3cb4603a5dd564e5bfb80eed | 2023-03-29 | -| alpine:3.15 | sha256:ecbdce53b2c2f43ab1b19418bcbd3f120a23547d9497030c8d978114512b883e | 2023-03-29 | -| alpine:3.16 | sha256:c2b622f6e510a0d25bccaffa9e67b75a6860cb09b74bb58cfc36a9ef4331109f | 2023-03-29 | -| alpine:3.17 | sha256:124c7d2707904eea7431fffe91522a01e5a861a624ee31d03372cc1d138a3126 | 2023-03-29 | -| buildpack-deps:bullseye | sha256:1b8ef32e6ebc10abab974c91d1c4659b3cda831bf2938ae857cdd2d36f58b1d8 | 2023-05-23 | -| buildpack-deps:buster | sha256:c15924ddbee8cbaac4ab82d735499f8e3fb14be38943544e3c8333c089c05485 | 2023-05-23 | +| alpine:3.15 | sha256:3362f865019db5f14ac5154cb0db2c3741ad1cce0416045be422ad4de441b081 | 2023-06-14 | +| alpine:3.16 | sha256:cbe5d5973103a2d03408d1689a6efde4ea4920bde9f4b51fe7872e60ce2d8e56 | 2023-06-14 | +| alpine:3.17 | sha256:e95676db9e4a4f16f6cc01a8915368f82b018cc07aba951c1bd1db586c081388 | 2023-06-14 | +| buildpack-deps:bullseye | sha256:2987a7a81a0eb17086c6498afedb19002689587038fdef7f5880c2cca973bf13 | 2023-06-13 | +| buildpack-deps:buster | sha256:0da9fe74d5f9bac9754a912b61cf81c62af1247ff3eed0b4f6df00da924f7f21 | 2023-06-13 | | buildpack-deps:stretch | sha256:78e995165a5788c2f55aed6e548d8f6c1534830d4310c870408fccb2da8c5b2e | 2022-06-23 | -| debian:10 | sha256:322859539526a04978dee1a2575b515295f6706f17d280f877a634299a7c1414 | 2023-05-23 | -| debian:11 | sha256:432f545c6ba13b79e2681f4cc4858788b0ab099fc1cca799cc0fae4687c69070 | 2023-05-23 | +| debian:10 | sha256:28842e4895d36e67c49015c0b41089fa3248e865c76994b19f706ab91e800b95 | 2023-06-12 | +| debian:11 | sha256:1e5f2d70c9441c971607727f56d0776fb9eecf23cd37b595b26db7a974b2301d | 2023-06-12 | | debian:9 | sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be | 2022-06-23 | | moby/buildkit:latest | sha256:d6fa89830c26919acba23c5cafa09df0c3ec1fbde20bb2a15ff349e0795241f4 | 2023-04-20 | | node:14 | sha256:a158d3b9b4e3fa813fa6c8c590b8f0a860e015ad4e59bbce5744d2f6fd8461aa | 2023-04-12 | | node:14-alpine | sha256:434215b487a329c9e867202ff89e704d3a75e554822e07f3e0c0f9e606121b33 | 2023-03-29 | -| node:16 | sha256:2ed6bba040f90005db9785927689c0d9a9442ca2cf9a59dc52297d684285c094 | 2023-05-23 | -| node:16-alpine | sha256:bca38851a77922e849907c57588bdf3dfcf95725186d7c26cdfd64da730989d3 | 2023-06-04 | -| node:18 | sha256:8cdf7234449f35e579f7491137807ddb3a089f028862f7ab69af437cc9f47ff1 | 2023-05-23 | -| node:18-alpine | sha256:f41850f74ff16a33daff988e2ea06ef8f5daeb6fb84913c7df09552a98caba09 | 2023-06-04 | +| node:16 | sha256:07ac708c46cc7136db9d54749c541ba1dc516dc316e126a94136083b842c2db9 | 2023-06-13 | +| node:16-alpine | sha256:296f32946d2fb5227e43fa51e608bbb11a208d648a833e9b264934fb0c7f404b | 2023-06-15 | +| node:18 | sha256:4a55308cc855cba1a925d19ae4e45838741dad2fd7bb8949a93b2a0f2ae339e3 | 2023-06-13 | +| node:18-alpine | sha256:9036ddb8252ba7089c2c83eb2b0dcaf74ff1069e8ddf86fe2bd6dc5fecc9492d | 2023-06-15 | | ubuntu:16.04 | sha256:1f1a2d56de1d604801a9671f301190704c25d604a416f59e03c04f5c6ffee0d6 | 2021-08-31 | | ubuntu:18.04 | sha256:152dc042452c496007f07ca9127571cb9c29697f42acbfad72324b2bb2e43c98 | 2023-05-30 | -| ubuntu:20.04 | sha256:db8bf6f4fb351aa7a26e27ba2686cf35a6a409f65603e59d4c203e58387dc6b3 | 2023-04-13 | +| ubuntu:20.04 | sha256:f8f658407c35733471596f25fdb4ed748b80e545ab57e84efbdb1dbbb01bd70e | 2023-06-05 | ### Installed apt packages | Name | Version | @@ -323,7 +322,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | aria2 | 1.35.0-1build1 | | autoconf | 2.69-11.1 | | automake | 1:1.16.1-4ubuntu6 | -| binutils | 2.34-6ubuntu1.5 | +| binutils | 2.34-6ubuntu1.6 | | bison | 2:3.5.1+dfsg-1 | | brotli | 1.0.7-6ubuntu0.1 | | coreutils | 8.30-3ubuntu2 | From 59f713795a1747e8ccbdc103a3942bfa2160100b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 22 Jun 2023 10:54:09 +0000 Subject: [PATCH 1981/3485] Updating readme file for ubuntu22 version 20230619.1.1 (#7748) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2204-Readme.md | 91 +++++++++++++++---------------- 1 file changed, 45 insertions(+), 46 deletions(-) diff --git a/images/linux/Ubuntu2204-Readme.md b/images/linux/Ubuntu2204-Readme.md index 774b29f88dce..f81786e986b4 100644 --- a/images/linux/Ubuntu2204-Readme.md +++ b/images/linux/Ubuntu2204-Readme.md @@ -2,12 +2,11 @@ |-| | [[All OSs] .NET 3.1 will be removed from the images on July, 3](https://github.com/actions/runner-images/issues/7667) | | [Actions runner image scheduled maintenance (June 2 2023 through June 16 2023)](https://github.com/actions/runner-images/issues/7660) | -| [python2.7 will be removed from the images on June 12, 2023](https://github.com/actions/runner-images/issues/7401) | *** # Ubuntu 22.04 - OS Version: 22.04.2 LTS -- Kernel Version: 5.15.0-1039-azure -- Image Version: 20230611.1 +- Kernel Version: 5.15.0-1040-azure +- Image Version: 20230619.1.0 - Systemd version: 249.11-0ubuntu3.9 ## Installed Software @@ -33,8 +32,8 @@ ### Package Management - cpan 1.64 -- Helm 3.12.0 -- Homebrew 4.0.21 +- Helm 3.12.1 +- Homebrew 4.0.24 - Miniconda 23.3.1 - Npm 9.5.1 - NuGet 6.3.1.1 @@ -42,7 +41,7 @@ - Pip3 22.0.2 - Pipx 1.2.0 - RubyGems 3.3.5 -- Vcpkg (build from commit 633664434) +- Vcpkg (build from commit 223b8d569) - Yarn 1.22.19 #### Environment variables @@ -60,7 +59,7 @@ to accomplish this. ``` ### Project Management -- Lerna 7.0.0 +- Lerna 7.0.2 - Maven 3.8.8 ### Tools @@ -69,26 +68,26 @@ to accomplish this. - AzCopy 10.19.0 - available by `azcopy` and `azcopy10` aliases - Bazel 6.2.1 - Bazelisk 1.13.2 -- Bicep 0.17.1 +- Bicep 0.18.4 - Buildah 1.23.1 - CMake 3.26.4 - CodeQL Action Bundles 2.13.1 2.13.3 - Docker Amazon ECR Credential Helper 0.7.1 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.18.1+azure-1 -- Docker-Buildx 0.10.4 -- Docker-Moby Client 20.10.25+azure-1 -- Docker-Moby Server 20.10.25+azure-1 +- Docker Compose v2 2.18.1+azure-2 +- Docker-Buildx 0.11.0 +- Docker-Moby Client 20.10.25+azure-2 +- Docker-Moby Server 20.10.25+azure-2 - Fastlane 2.213.0 -- Git 2.40.1 +- Git 2.41.0 - Git LFS 3.3.0 - Git-ftp 1.6.0 - Haveged 1.9.14 -- Heroku 8.1.7 +- Heroku 8.1.8 - jq 1.6 -- Kind 0.19.0 -- Kubectl 1.27.2 -- Kustomize 5.0.3 +- Kind 0.20.0 +- Kubectl 1.27.3 +- Kustomize 5.1.0 - Leiningen 2.10.0 - MediaInfo 21.09 - Mercurial 6.1.1 @@ -100,30 +99,30 @@ to accomplish this. - Packer 1.9.1 - Parcel 2.9.2 - Podman 3.4.4 -- Pulumi 3.70.0 +- Pulumi 3.72.2 - R 4.3.0 - Skopeo 1.4.1 - Sphinx Open Source Search Server 2.2.11 - SVN 1.14.1 -- Terraform 1.4.6 +- Terraform 1.5.0 - yamllint 1.32.0 - yq 4.34.1 - zstd 1.5.5 ### CLI Tools -- Alibaba Cloud CLI 3.0.166 -- AWS CLI 2.11.27 +- Alibaba Cloud CLI 3.0.167 +- AWS CLI 2.12.1 - AWS CLI Session Manager Plugin 1.2.463.0 - AWS SAM CLI 1.86.1 - Azure CLI 2.49.0 - Azure CLI (azure-devops) 0.26.0 - GitHub CLI 2.30.0 -- Google Cloud SDK 434.0.0 +- Google Cloud SDK 435.0.1 - Hub CLI 2.14.2 -- Netlify CLI 15.4.1 -- OpenShift CLI 4.13.2 +- Netlify CLI 15.6.0 +- OpenShift CLI 4.13.3 - ORAS CLI 1.0.0 -- Vercel CLI 30.2.1 +- Vercel CLI 30.2.2 ### Java | Version | Vendor | Environment Variable | @@ -153,19 +152,19 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustup 1.26.0 #### Packages -- Bindgen 0.65.1 +- Bindgen 0.66.1 - Cargo audit 0.17.6 - Cargo clippy 0.1.70 -- Cargo outdated 0.11.2 +- Cargo outdated 0.13.0 - Cbindgen 0.24.5 - Rustfmt 1.5.2 ### Browsers and Drivers -- Google Chrome 114.0.5735.106 +- Google Chrome 114.0.5735.133 - ChromeDriver 114.0.5735.90 - Chromium 114.0.5733.0 -- Microsoft Edge 114.0.1823.43 -- Microsoft Edge WebDriver 114.0.1823.43 +- Microsoft Edge 114.0.1823.55 +- Microsoft Edge WebDriver 114.0.1823.51 - Selenium server 4.10.0 - Mozilla Firefox 114.0.1 - Geckodriver 0.33.0 @@ -179,7 +178,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | ### .NET Tools -- .NET Core SDK: 6.0.408, 7.0.105, 7.0.203, 7.0.302 +- .NET Core SDK: 6.0.410, 7.0.107, 7.0.203, 7.0.304 - nbgv 3.6.133+2d32d93cb1 ### Databases @@ -228,7 +227,7 @@ Use the following command as a part of your job to start the service: 'sudo syst #### PyPy - 3.7.13 [PyPy 7.3.9] - 3.8.16 [PyPy 7.3.11] -- 3.9.16 [PyPy 7.3.11] +- 3.9.17 [PyPy 7.3.12] #### Ruby - 3.1.4 @@ -279,23 +278,23 @@ Use the following command as a part of your job to start the service: 'sudo syst | Repository:Tag | Digest | Created | | ----------------------- | ------------------------------------------------------------------------ | ---------- | | alpine:3.14 | sha256:0f2d5c38dd7a4f4f733e688e3a6733cb5ab1ac6e3cb4603a5dd564e5bfb80eed | 2023-03-29 | -| alpine:3.15 | sha256:ecbdce53b2c2f43ab1b19418bcbd3f120a23547d9497030c8d978114512b883e | 2023-03-29 | -| alpine:3.16 | sha256:c2b622f6e510a0d25bccaffa9e67b75a6860cb09b74bb58cfc36a9ef4331109f | 2023-03-29 | -| alpine:3.17 | sha256:124c7d2707904eea7431fffe91522a01e5a861a624ee31d03372cc1d138a3126 | 2023-03-29 | -| buildpack-deps:bullseye | sha256:1b8ef32e6ebc10abab974c91d1c4659b3cda831bf2938ae857cdd2d36f58b1d8 | 2023-05-23 | -| buildpack-deps:buster | sha256:c15924ddbee8cbaac4ab82d735499f8e3fb14be38943544e3c8333c089c05485 | 2023-05-23 | -| debian:10 | sha256:322859539526a04978dee1a2575b515295f6706f17d280f877a634299a7c1414 | 2023-05-23 | -| debian:11 | sha256:432f545c6ba13b79e2681f4cc4858788b0ab099fc1cca799cc0fae4687c69070 | 2023-05-23 | +| alpine:3.15 | sha256:3362f865019db5f14ac5154cb0db2c3741ad1cce0416045be422ad4de441b081 | 2023-06-14 | +| alpine:3.16 | sha256:cbe5d5973103a2d03408d1689a6efde4ea4920bde9f4b51fe7872e60ce2d8e56 | 2023-06-14 | +| alpine:3.17 | sha256:e95676db9e4a4f16f6cc01a8915368f82b018cc07aba951c1bd1db586c081388 | 2023-06-14 | +| buildpack-deps:bullseye | sha256:2987a7a81a0eb17086c6498afedb19002689587038fdef7f5880c2cca973bf13 | 2023-06-13 | +| buildpack-deps:buster | sha256:0da9fe74d5f9bac9754a912b61cf81c62af1247ff3eed0b4f6df00da924f7f21 | 2023-06-13 | +| debian:10 | sha256:28842e4895d36e67c49015c0b41089fa3248e865c76994b19f706ab91e800b95 | 2023-06-12 | +| debian:11 | sha256:1e5f2d70c9441c971607727f56d0776fb9eecf23cd37b595b26db7a974b2301d | 2023-06-12 | | moby/buildkit:latest | sha256:d6fa89830c26919acba23c5cafa09df0c3ec1fbde20bb2a15ff349e0795241f4 | 2023-04-20 | | node:14 | sha256:a158d3b9b4e3fa813fa6c8c590b8f0a860e015ad4e59bbce5744d2f6fd8461aa | 2023-04-12 | | node:14-alpine | sha256:434215b487a329c9e867202ff89e704d3a75e554822e07f3e0c0f9e606121b33 | 2023-03-29 | -| node:16 | sha256:2ed6bba040f90005db9785927689c0d9a9442ca2cf9a59dc52297d684285c094 | 2023-05-23 | -| node:16-alpine | sha256:bca38851a77922e849907c57588bdf3dfcf95725186d7c26cdfd64da730989d3 | 2023-06-04 | -| node:18 | sha256:8cdf7234449f35e579f7491137807ddb3a089f028862f7ab69af437cc9f47ff1 | 2023-05-23 | -| node:18-alpine | sha256:f41850f74ff16a33daff988e2ea06ef8f5daeb6fb84913c7df09552a98caba09 | 2023-06-04 | +| node:16 | sha256:07ac708c46cc7136db9d54749c541ba1dc516dc316e126a94136083b842c2db9 | 2023-06-13 | +| node:16-alpine | sha256:296f32946d2fb5227e43fa51e608bbb11a208d648a833e9b264934fb0c7f404b | 2023-06-15 | +| node:18 | sha256:4a55308cc855cba1a925d19ae4e45838741dad2fd7bb8949a93b2a0f2ae339e3 | 2023-06-13 | +| node:18-alpine | sha256:9036ddb8252ba7089c2c83eb2b0dcaf74ff1069e8ddf86fe2bd6dc5fecc9492d | 2023-06-15 | | ubuntu:18.04 | sha256:152dc042452c496007f07ca9127571cb9c29697f42acbfad72324b2bb2e43c98 | 2023-05-30 | -| ubuntu:20.04 | sha256:db8bf6f4fb351aa7a26e27ba2686cf35a6a409f65603e59d4c203e58387dc6b3 | 2023-04-13 | -| ubuntu:22.04 | sha256:ac58ff7fe25edc58bdf0067ca99df00014dbd032e2246d30a722fa348fd799a5 | 2023-05-22 | +| ubuntu:20.04 | sha256:f8f658407c35733471596f25fdb4ed748b80e545ab57e84efbdb1dbbb01bd70e | 2023-06-05 | +| ubuntu:22.04 | sha256:6120be6a2b7ce665d0cbddc3ce6eae60fe94637c6a66985312d1f02f63cc0bcd | 2023-06-05 | ### Installed apt packages | Name | Version | @@ -327,7 +326,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | libc++abi-dev | 1:14.0-55\~exp2 | | libc6-dev | 2.35-0ubuntu3.1 | | libcurl4 | 7.81.0-1ubuntu1.10 | -| libgbm-dev | 22.2.5-0ubuntu0.1\~22.04.1 | +| libgbm-dev | 22.2.5-0ubuntu0.1\~22.04.3 | | libgconf-2-4 | 3.2.6-7ubuntu2 | | libgsl-dev | 2.7.1+dfsg-3 | | libgtk-3-0 | 3.24.33-1ubuntu2 | From 13cd650de2d5ef9db2b4103ae142614b744133ca Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Thu, 22 Jun 2023 15:34:35 +0200 Subject: [PATCH 1982/3485] [macOS] Add pkg-config to the software report (#7751) --- images/macos/software-report/SoftwareReport.Generator.ps1 | 1 + 1 file changed, 1 insertion(+) diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1 index 08249e864829..58254d5aedbc 100644 --- a/images/macos/software-report/SoftwareReport.Generator.ps1 +++ b/images/macos/software-report/SoftwareReport.Generator.ps1 @@ -134,6 +134,7 @@ if ($os.IsBigSur) { } $utilities.AddToolVersion("OpenSSL", $(Get-OpenSSLVersion)) $utilities.AddToolVersion("Packer", $(Get-PackerVersion)) +$utilities.AddToolVersion("pkg-config", $(Get-PKGConfigVersion)) if ((-not $os.IsVentura) -and (-not $os.IsVenturaArm64)) { $utilities.AddToolVersion("PostgreSQL", $(Get-PostgresServerVersion)) $utilities.AddToolVersion("psql (PostgreSQL)", $(Get-PostgresClientVersion)) From 3f4d4c968c3a921da8f55704646d553b66d4c45e Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Thu, 22 Jun 2023 19:44:03 +0200 Subject: [PATCH 1983/3485] [ubuntu] Add additional repos to cloud-init template (#7768) --- images/linux/scripts/base/apt-ubuntu-archive.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/images/linux/scripts/base/apt-ubuntu-archive.sh b/images/linux/scripts/base/apt-ubuntu-archive.sh index 0f1b0fa88615..3a47d5b0012d 100644 --- a/images/linux/scripts/base/apt-ubuntu-archive.sh +++ b/images/linux/scripts/base/apt-ubuntu-archive.sh @@ -1,12 +1,12 @@ #!/bin/bash -e ################################################################################ ## File: apt-ubuntu-archive.sh -## Desc: Script for adding additional apt repo to /etc/apt/sources.list +## Desc: Script for adding additional apt repo to /etc/apt/sources.list and /etc/cloud/templates/sources.list.ubuntu.tmpl ################################################################################ -echo "deb http://archive.ubuntu.com/ubuntu/ $(lsb_release -cs) main restricted" | tee -a /etc/apt/sources.list -echo "deb http://archive.ubuntu.com/ubuntu/ $(lsb_release -cs)-updates main restricted" | tee -a /etc/apt/sources.list +echo "deb http://archive.ubuntu.com/ubuntu/ $(lsb_release -cs) main restricted" | tee -a /etc/apt/sources.list /etc/cloud/templates/sources.list.ubuntu.tmpl +echo "deb http://archive.ubuntu.com/ubuntu/ $(lsb_release -cs)-updates main restricted" | tee -a /etc/apt/sources.list /etc/cloud/templates/sources.list.ubuntu.tmpl -echo "deb http://security.ubuntu.com/ubuntu/ $(lsb_release -cs)-security main restricted" | tee -a /etc/apt/sources.list -echo "deb http://security.ubuntu.com/ubuntu/ $(lsb_release -cs)-security universe" | tee -a /etc/apt/sources.list -echo "deb http://security.ubuntu.com/ubuntu/ $(lsb_release -cs)-security multiverse" | tee -a /etc/apt/sources.list +echo "deb http://security.ubuntu.com/ubuntu/ $(lsb_release -cs)-security main restricted" | tee -a /etc/apt/sources.list /etc/cloud/templates/sources.list.ubuntu.tmpl +echo "deb http://security.ubuntu.com/ubuntu/ $(lsb_release -cs)-security universe" | tee -a /etc/apt/sources.list /etc/cloud/templates/sources.list.ubuntu.tmpl +echo "deb http://security.ubuntu.com/ubuntu/ $(lsb_release -cs)-security multiverse" | tee -a /etc/apt/sources.list /etc/cloud/templates/sources.list.ubuntu.tmpl From 8712f8364973e52f5fd1c72ad43425ea591c710a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 24 Jun 2023 10:38:27 +0000 Subject: [PATCH 1984/3485] Updating readme file for macOS-11 version 20230618.1 (#7752) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-11-Readme.md | 34 ++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/images/macos/macos-11-Readme.md b/images/macos/macos-11-Readme.md index 0a11b4469ea8..a930d4f9222d 100644 --- a/images/macos/macos-11-Readme.md +++ b/images/macos/macos-11-Readme.md @@ -6,12 +6,12 @@ # macOS 11 - OS Version: macOS 11.7.7 (20G1345) - Kernel Version: Darwin 20.6.0 -- Image Version: 20230612.1 +- Image Version: 20230618.1 ## Installed Software ### Language and Runtime -- .NET Core SDK: 3.1.101, 3.1.201, 3.1.302, 3.1.426, 6.0.408, 7.0.102, 7.0.202, 7.0.302 +- .NET Core SDK: 3.1.101, 3.1.201, 3.1.302, 3.1.426, 6.0.410, 7.0.102, 7.0.202, 7.0.304 - Bash 3.2.57(1)-release - Clang/LLVM 13.0.0 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` @@ -33,7 +33,7 @@ - PHP 8.2.7 - Python 2.7.18 - Python3 3.11.4 -- R 4.3.0 +- R 4.3.1 - Ruby 2.7.8p225 ### Package Management @@ -41,7 +41,7 @@ - Carthage 0.39.0 - CocoaPods 1.12.1 - Composer 2.5.8 -- Homebrew 4.0.22 +- Homebrew 4.0.23 - Miniconda 23.3.1 - NPM 9.5.1 - NuGet 6.3.1.1 @@ -49,7 +49,7 @@ - Pip3 23.1.2 (python 3.11) - Pipx 1.2.0 - RubyGems 3.4.14 -- Vcpkg 2023 (build from commit 1ba9a2591) +- Vcpkg 2023 (build from commit 80ecf3249) - Yarn 1.22.19 #### Environment variables @@ -78,7 +78,7 @@ - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.4 - gpg (GnuPG) 2.4.2 -- helm v3.12.0+gc9f554d +- helm v3.12.1+gf32a527 - Hub CLI 2.14.2 - ImageMagick 7.1.1-11 - jq 1.6 @@ -98,7 +98,7 @@ ### Tools - Aliyun CLI 3.0.165 - App Center CLI 2.13.8 -- AWS CLI 2.11.27 +- AWS CLI 2.12.1 - AWS SAM CLI 1.86.1 - AWS Session Manager CLI 1.2.463.0 - Azure CLI 2.49.0 @@ -112,7 +112,7 @@ - GHCup 0.1.19.2 - Jazzy 0.14.3 - Stack 2.9.3 -- SwiftFormat 0.51.11 +- SwiftFormat 0.51.12 - Swig 4.1.1 - Xcode Command Line Tools 13.2.0.0.1.1638488800 @@ -123,10 +123,10 @@ ### Browsers - Safari 16.5 (16615.2.9.11.6) - SafariDriver 16.5 (16615.2.9.11.6) -- Google Chrome 114.0.5735.106 +- Google Chrome 114.0.5735.133 - ChromeDriver 114.0.5735.90 -- Microsoft Edge 114.0.1823.43 -- Microsoft Edge WebDriver 114.0.1823.43 +- Microsoft Edge 114.0.1823.51 +- Microsoft Edge WebDriver 114.0.1823.51 - Mozilla Firefox 114.0.1 - geckodriver 0.33.0 - Selenium server 4.10.0 @@ -163,10 +163,10 @@ - 3.11.4 #### PyPy -- 2.7.18 [PyPy 7.3.11] +- 2.7.18 [PyPy 7.3.12] - 3.7.13 [PyPy 7.3.9] - 3.8.16 [PyPy 7.3.11] -- 3.9.16 [PyPy 7.3.11] +- 3.9.17 [PyPy 7.3.12] #### Node.js - 14.21.3 @@ -185,9 +185,9 @@ - Rustup 1.26.0 #### Packages -- Bindgen 0.65.1 +- Bindgen 0.66.0 - Cargo-audit 0.17.6 -- Cargo-outdated 0.11.2 +- Cargo-outdated 0.12.0 - Cbindgen 0.24.5 - Clippy 0.1.70 - Rustfmt 1.5.2-stable @@ -205,7 +205,7 @@ | Name | Version | ConfigFile | ServiceStatus | ListenPort | | ----- | ------- | ------------------------------- | ------------- | ---------- | | httpd | 2.4.57 | /usr/local/etc/httpd/httpd.conf | none | 80 | -| nginx | 1.25.0 | /usr/local/etc/nginx/nginx.conf | none | 80 | +| nginx | 1.25.1 | /usr/local/etc/nginx/nginx.conf | none | 80 | ### Xamarin @@ -213,7 +213,7 @@ | Version | Build | Path | | -------------- | --------- | ------------------------------------ | | 2019 | 8.10.25.2 | /Applications/Visual Studio 2019.app | -| 2022 (default) | 17.5.6.3 | /Applications/Visual Studio.app | +| 2022 (default) | 17.5.7.6 | /Applications/Visual Studio.app | ##### Notes ``` From 35643274da3fe32e8e9e0217c024187aae1f7841 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 24 Jun 2023 10:42:24 +0000 Subject: [PATCH 1985/3485] Updating readme file for macOS-12 version 20230618.1 (#7750) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-12-Readme.md | 34 ++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/images/macos/macos-12-Readme.md b/images/macos/macos-12-Readme.md index bc686752c1c7..a736136147bc 100644 --- a/images/macos/macos-12-Readme.md +++ b/images/macos/macos-12-Readme.md @@ -6,12 +6,12 @@ # macOS 12 - OS Version: macOS 12.6.6 (21G646) - Kernel Version: Darwin 21.6.0 -- Image Version: 20230612.1 +- Image Version: 20230618.1 ## Installed Software ### Language and Runtime -- .NET Core SDK: 3.1.101, 3.1.201, 3.1.302, 3.1.426, 6.0.408, 7.0.102, 7.0.202, 7.0.302 +- .NET Core SDK: 3.1.101, 3.1.201, 3.1.302, 3.1.426, 6.0.410, 7.0.102, 7.0.202, 7.0.304 - Bash 3.2.57(1)-release - Clang/LLVM 14.0.0 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` @@ -31,7 +31,7 @@ - PHP 8.2.7 - Python 2.7.18 - Python3 3.11.4 -- R 4.3.0 +- R 4.3.1 - Ruby 3.0.6p216 ### Package Management @@ -39,7 +39,7 @@ - Carthage 0.39.0 - CocoaPods 1.12.1 - Composer 2.5.8 -- Homebrew 4.0.22 +- Homebrew 4.0.23 - Miniconda 23.3.1 - NPM 9.5.1 - NuGet 6.3.1.1 @@ -47,7 +47,7 @@ - Pip3 23.1.2 (python 3.11) - Pipx 1.2.0 - RubyGems 3.4.14 -- Vcpkg 2023 (build from commit 1ba9a2591) +- Vcpkg 2023 (build from commit 80ecf3249) - Yarn 1.22.19 #### Environment variables @@ -88,14 +88,14 @@ - Sox 14.4.2 - Subversion (SVN) 1.14.2 - Switchaudio-osx 1.2.2 -- Vagrant 2.3.6 +- Vagrant 2.3.7 - VirtualBox 6.1.38r153438 - yq 4.34.1 - zstd 1.5.5 ### Tools - App Center CLI 2.13.8 -- AWS CLI 2.11.27 +- AWS CLI 2.12.1 - AWS SAM CLI 1.86.1 - AWS Session Manager CLI 1.2.463.0 - Azure CLI 2.49.0 @@ -110,7 +110,7 @@ - GHCup 0.1.19.2 - Jazzy 0.14.3 - Stack 2.9.3 -- SwiftFormat 0.51.11 +- SwiftFormat 0.51.12 - Swig 4.1.1 - Xcode Command Line Tools 14.2.0.0.1.1668646533 @@ -121,10 +121,10 @@ ### Browsers - Safari 16.5 (17615.2.9.11.6) - SafariDriver 16.5 (17615.2.9.11.6) -- Google Chrome 114.0.5735.106 +- Google Chrome 114.0.5735.133 - ChromeDriver 114.0.5735.90 -- Microsoft Edge 114.0.1823.43 -- Microsoft Edge WebDriver 114.0.1823.43 +- Microsoft Edge 114.0.1823.51 +- Microsoft Edge WebDriver 114.0.1823.51 - Mozilla Firefox 114.0.1 - geckodriver 0.33.0 - Selenium server 4.10.0 @@ -158,10 +158,10 @@ - 3.11.4 #### PyPy -- 2.7.18 [PyPy 7.3.11] +- 2.7.18 [PyPy 7.3.12] - 3.7.13 [PyPy 7.3.9] - 3.8.16 [PyPy 7.3.11] -- 3.9.16 [PyPy 7.3.11] +- 3.9.17 [PyPy 7.3.12] #### Node.js - 14.21.3 @@ -180,9 +180,9 @@ - Rustup 1.26.0 #### Packages -- Bindgen 0.65.1 +- Bindgen 0.66.0 - Cargo-audit 0.17.6 -- Cargo-outdated 0.11.2 +- Cargo-outdated 0.12.0 - Cbindgen 0.24.5 - Clippy 0.1.70 - Rustfmt 1.5.2-stable @@ -200,7 +200,7 @@ | Name | Version | ConfigFile | ServiceStatus | ListenPort | | ----- | ------- | ------------------------------- | ------------- | ---------- | | httpd | 2.4.57 | /usr/local/etc/httpd/httpd.conf | none | 80 | -| nginx | 1.25.0 | /usr/local/etc/nginx/nginx.conf | none | 80 | +| nginx | 1.25.1 | /usr/local/etc/nginx/nginx.conf | none | 80 | ### Xamarin @@ -208,7 +208,7 @@ | Version | Build | Path | | -------------- | --------- | ------------------------------------ | | 2019 | 8.10.25.2 | /Applications/Visual Studio 2019.app | -| 2022 (default) | 17.5.6.3 | /Applications/Visual Studio.app | +| 2022 (default) | 17.5.7.6 | /Applications/Visual Studio.app | ##### Notes ``` From ae86786dc296551bf02f2a2b1f1533b10fc30f06 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 26 Jun 2023 10:49:08 +0000 Subject: [PATCH 1986/3485] Windows Server 2019 (20230620) Image Update (#7760) * Updating readme file for win19 version 20230620.1.1 * Update Windows2019-Readme.md --------- Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2019-Readme.md | 74 ++++++++++++++++---------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index 40f0fd2e25f3..07d367209ad9 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -4,8 +4,8 @@ | [Actions runner image scheduled maintenance (June 2 2023 through June 16 2023)](https://github.com/actions/runner-images/issues/7660) | *** # Windows Server 2019 -- OS Version: 10.0.17763 Build 4377 -- Image Version: 20230612.1 +- OS Version: 10.0.17763 Build 4499 +- Image Version: 20230620.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -27,14 +27,14 @@ ### Package Management - Chocolatey 2.0.0 - Composer 2.5.8 -- Helm 3.11.3 +- Helm 3.12.0 - Miniconda 23.3.1 (pre-installed on the image but not added to PATH) - NPM 9.5.1 -- NuGet 6.6.0.61 +- NuGet 6.6.1.2 - pip 23.1.2 (python 3.7) - Pipx 1.2.0 - RubyGems 2.7.6.3 -- Vcpkg (build from commit 1ba9a2591) +- Vcpkg (build from commit f6a5d4e8e) - Yarn 1.22.19 #### Environment variables @@ -66,21 +66,21 @@ - ghc 9.6.2 - Git 2.41.0.windows.1 - Git LFS 3.3.0 -- Google Cloud SDK 434.0.0 +- Google Cloud SDK 435.0.1 - ImageMagick 7.1.1-11 - InnoSetup 6.2.2 - jq 1.6 -- Kind 0.19.0 -- Kubectl 1.27.2 +- Kind 0.20.0 +- Kubectl 1.27.3 - Mercurial 5.0 - Mingw-w64 8.1.0 - Newman 5.3.2 - NSIS 3.08 - OpenSSL 1.1.1u -- Packer 1.9.0 +- Packer 1.9.1 - Parcel 2.9.2 -- Pulumi 3.70.0 -- R 4.3.0 +- Pulumi 3.72.2 +- R 4.3.1 - Service Fabric SDK 9.1.1436.9590 - Stack 2.11.1 - Subversion (SVN) 1.14.2 @@ -93,13 +93,13 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.167 -- AWS CLI 2.11.27 -- AWS SAM CLI 1.84.0 +- AWS CLI 2.12.1 +- AWS SAM CLI 1.87.0 - AWS Session Manager CLI 1.2.463.0 - Azure CLI 2.49.0 - Azure DevOps CLI extension 0.26.0 - Cloud Foundry CLI 6.53.0 -- GitHub CLI 2.30.0 +- GitHub CLI 2.31.0 - Hub CLI 2.14.2 ### Rust Tools @@ -109,19 +109,19 @@ - Rustup 1.26.0 #### Packages -- bindgen 0.65.1 +- bindgen 0.66.1 - cargo-audit 0.17.6 -- cargo-outdated 0.11.2 +- cargo-outdated 0.13.1 - cbindgen 0.24.5 - Clippy 0.1.70 - Rustfmt 1.5.2 ### Browsers and Drivers -- Google Chrome 114.0.5735.110 +- Google Chrome 114.0.5735.134 - Chrome Driver 114.0.5735.90 -- Microsoft Edge 114.0.1823.43 -- Microsoft Edge Driver 114.0.1823.43 -- Mozilla Firefox 114.0.1 +- Microsoft Edge 114.0.1823.55 +- Microsoft Edge Driver 114.0.1823.55 +- Mozilla Firefox 114.0.2 - Gecko Driver 0.33.0 - IE Driver 4.10.0.0 - Selenium server 4.10.0 @@ -183,11 +183,11 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 3.11.4 #### PyPy -- 2.7.18 [PyPy 7.3.11] +- 2.7.18 [PyPy 7.3.12] - 3.6.12 [PyPy 7.3.3] - 3.7.13 [PyPy 7.3.9] - 3.8.16 [PyPy 7.3.11] -- 3.9.16 [PyPy 7.3.11] +- 3.9.17 [PyPy 7.3.12] #### Ruby - 2.4.10 @@ -219,7 +219,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Database tools - Azure CosmosDb Emulator 2.14.12.0 - DacFx 162.0.52.1 -- MySQL 5.7.40.0 +- MySQL 5.7.42.0 - SQL OLEDB Driver 18.6.3.0 - SQLPS 1.0 @@ -227,17 +227,17 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Name | Version | ConfigFile | ServiceName | ServiceStatus | ListenPort | | ------ | ------- | ------------------------------------- | ----------- | ------------- | ---------- | | Apache | 2.4.55 | C:\tools\Apache24\conf\httpd.conf | Apache | Stopped | 80 | -| Nginx | 1.25.0 | C:\tools\nginx-1.25.0\conf\nginx.conf | nginx | Stopped | 80 | +| Nginx | 1.25.1 | C:\tools\nginx-1.25.1\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2019 | Name | Version | Path | | ----------------------------- | --------------- | -------------------------------------------------------------- | -| Visual Studio Enterprise 2019 | 16.11.33529.622 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | +| Visual Studio Enterprise 2019 | 16.11.33801.447 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | #### Workloads, components and extensions | Package | Version | | ------------------------------------------------------------------------- | --------------- | -| Component.Android.NDK.R16B | 16.11.33529.419 | +| Component.Android.NDK.R16B | 16.11.33801.199 | | Component.Android.SDK25.Private | 16.0.28625.61 | | Component.Android.SDK30 | 16.10.31205.252 | | Component.Ant | 1.9.3.8 | @@ -357,7 +357,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Component.Unity | 16.0.28315.86 | | Microsoft.VisualStudio.Component.UWP.VC.ARM64 | 16.3.29207.166 | | Microsoft.VisualStudio.Component.VC.14.25.x86.x64 | 16.11.32428.96 | -| Microsoft.VisualStudio.Component.VC.140 | 16.10.31205.252 | +| Microsoft.VisualStudio.Component.VC.140 | 16.11.33801.447 | | Microsoft.VisualStudio.Component.VC.ASAN | 16.10.31205.252 | | Microsoft.VisualStudio.Component.VC.ATL | 16.4.29313.120 | | Microsoft.VisualStudio.Component.VC.ATL.ARM | 16.4.29313.120 | @@ -495,11 +495,11 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 10.0.22621.0 ### .NET Core Tools -- .NET Core SDK: 3.1.120, 3.1.202, 3.1.302, 3.1.426, 6.0.116, 6.0.203, 6.0.311, 6.0.408 +- .NET Core SDK: 3.1.120, 3.1.202, 3.1.302, 3.1.426, 6.0.118, 6.0.203, 6.0.313, 6.0.410 - .NET Framework: 4.7.2, 4.8 -- Microsoft.AspNetCore.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 6.0.5, 6.0.16 -- Microsoft.NETCore.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 6.0.5, 6.0.16 -- Microsoft.WindowsDesktop.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 6.0.5, 6.0.16 +- Microsoft.AspNetCore.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 6.0.5, 6.0.18 +- Microsoft.NETCore.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 6.0.5, 6.0.18 +- Microsoft.WindowsDesktop.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 6.0.5, 6.0.18 - nbgv 3.6.133+2d32d93cb1 ### PowerShell Tools @@ -512,7 +512,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Az (Cached): 1.0.0.zip, 1.6.0.zip, 2.3.2.zip, 2.6.0.zip, 3.1.0.zip, 3.5.0.zip, 3.8.0.zip, 4.3.0.zip, 4.4.0.zip, 4.7.0.zip, 5.5.0.zip, 5.9.0.zip, 6.6.0.zip, 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.350 +- AWSPowershell: 4.1.355 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 - Microsoft.Graph: 1.28.0 @@ -557,9 +557,9 @@ All other versions are saved but not installed. ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:e9d17b5d038480f88e2d2f8da53861e16700b04e102ce4501a93bbae67d4c913 | 2023-05-09 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:e62875919158e904fff9d25d72636b0f74c734e2e9c3ded10a401c35c242c4a9 | 2023-05-09 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:9db623acbde3fa385a4d246bd77c628bef8ece107d53307f378d45838a817dc5 | 2023-05-16 | -| mcr.microsoft.com/windows/nanoserver:1809 | sha256:fb78bd84ac937f6b1453e19015ccce41636bbeca5fe5bc6dc5c7d55adb4a2bc5 | 2023-05-05 | -| mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:12c61b7da616ca0065030ada32e78ba5bea0a1721affd994f40736b9b48620ae | 2023-05-05 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:fb6293d0c7618d01d0ea827668ff01d91464616e8f6ac91da886a231b1cfb816 | 2023-06-13 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:b6e98a2e7cb7fd70ede47790d2e36e5132c5bb6339ab8ddfbf7fe30515883f1b | 2023-06-13 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:9026d56e290d7f794153afc31e1d3d3481a735e8fbcf639adb9eb134766ef8f9 | 2023-06-13 | +| mcr.microsoft.com/windows/nanoserver:1809 | sha256:7b080e83b75a078efd2c9fef7bdb9735355ceb4f01bc4cbbfa86bf1692df5d30 | 2023-06-08 | +| mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:1130a3b7afb9b8f52b1ff99539b665e8e524a5d66829f480688fa14ee0370ef9 | 2023-06-08 | From 635b6468df2d4a30e3fa799084d2935f62ca5bc3 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 26 Jun 2023 10:51:33 +0000 Subject: [PATCH 1987/3485] Windows Server 2022 (20230620) Image Update (#7761) * Updating readme file for win22 version 20230620.1.1 * Update Windows2022-Readme.md --------- Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2022-Readme.md | 638 +++++++++++++++---------------- 1 file changed, 319 insertions(+), 319 deletions(-) diff --git a/images/win/Windows2022-Readme.md b/images/win/Windows2022-Readme.md index db816898f69d..433ce7a8d545 100644 --- a/images/win/Windows2022-Readme.md +++ b/images/win/Windows2022-Readme.md @@ -4,8 +4,8 @@ | [Actions runner image scheduled maintenance (June 2 2023 through June 16 2023)](https://github.com/actions/runner-images/issues/7660) | *** # Windows Server 2022 -- OS Version: 10.0.20348 Build 1726 -- Image Version: 20230612.1 +- OS Version: 10.0.20348 Build 1787 +- Image Version: 20230620.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -27,14 +27,14 @@ ### Package Management - Chocolatey 2.0.0 - Composer 2.5.8 -- Helm 3.11.3 +- Helm 3.12.0 - Miniconda 23.3.1 (pre-installed on the image but not added to PATH) - NPM 9.5.1 -- NuGet 6.6.0.61 +- NuGet 6.6.1.2 - pip 23.1.2 (python 3.9) - Pipx 1.2.0 - RubyGems 3.2.33 -- Vcpkg (build from commit 1ba9a2591) +- Vcpkg (build from commit f6a5d4e8e) - Yarn 1.22.19 #### Environment variables @@ -69,16 +69,16 @@ - ImageMagick 7.1.1-11 - InnoSetup 6.2.2 - jq 1.6 -- Kind 0.19.0 -- Kubectl 1.27.2 +- Kind 0.20.0 +- Kubectl 1.27.3 - Mercurial 5.0 - Mingw-w64 11.2.0 - Newman 5.3.2 - NSIS 3.08 - OpenSSL 1.1.1u -- Packer 1.9.0 -- Pulumi 3.70.0 -- R 4.3.0 +- Packer 1.9.1 +- Pulumi 3.72.2 +- R 4.3.1 - Service Fabric SDK 9.1.1436.9590 - Stack 2.11.1 - Subversion (SVN) 1.14.2 @@ -91,12 +91,12 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.167 -- AWS CLI 2.11.27 -- AWS SAM CLI 1.84.0 +- AWS CLI 2.12.1 +- AWS SAM CLI 1.87.0 - AWS Session Manager CLI 1.2.463.0 - Azure CLI 2.49.0 - Azure DevOps CLI extension 0.26.0 -- GitHub CLI 2.30.0 +- GitHub CLI 2.31.0 - Hub CLI 2.14.2 ### Rust Tools @@ -106,19 +106,19 @@ - Rustup 1.26.0 #### Packages -- bindgen 0.65.1 +- bindgen 0.66.1 - cargo-audit 0.17.6 -- cargo-outdated 0.11.2 +- cargo-outdated 0.13.1 - cbindgen 0.24.5 - Clippy 0.1.70 - Rustfmt 1.5.2 ### Browsers and Drivers -- Google Chrome 114.0.5735.110 +- Google Chrome 114.0.5735.134 - Chrome Driver 114.0.5735.90 -- Microsoft Edge 114.0.1823.43 -- Microsoft Edge Driver 114.0.1823.43 -- Mozilla Firefox 114.0.1 +- Microsoft Edge 114.0.1823.51 +- Microsoft Edge Driver 114.0.1823.55 +- Mozilla Firefox 114.0.2 - Gecko Driver 0.33.0 - IE Driver 4.10.0.0 - Selenium server 4.10.0 @@ -175,10 +175,10 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 3.11.4 #### PyPy -- 2.7.18 [PyPy 7.3.11] +- 2.7.18 [PyPy 7.3.12] - 3.7.13 [PyPy 7.3.9] - 3.8.16 [PyPy 7.3.11] -- 3.9.16 [PyPy 7.3.11] +- 3.9.17 [PyPy 7.3.12] #### Ruby - 2.7.8 @@ -207,7 +207,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Database tools - Azure CosmosDb Emulator 2.14.12.0 - DacFx 162.0.52.1 -- MySQL 8.0.31.0 +- MySQL 8.0.33.0 - SQL OLEDB Driver 18.6.3.0 - SQLPS 1.0 @@ -215,299 +215,299 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Name | Version | ConfigFile | ServiceName | ServiceStatus | ListenPort | | ------ | ------- | ------------------------------------- | ----------- | ------------- | ---------- | | Apache | 2.4.55 | C:\tools\Apache24\conf\httpd.conf | Apache | Stopped | 80 | -| Nginx | 1.25.0 | C:\tools\nginx-1.25.0\conf\nginx.conf | nginx | Stopped | 80 | +| Nginx | 1.25.1 | C:\tools\nginx-1.25.1\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2022 | Name | Version | Path | | ----------------------------- | -------------- | -------------------------------------------------------- | -| Visual Studio Enterprise 2022 | 17.6.33723.286 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | +| Visual Studio Enterprise 2022 | 17.6.33815.320 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | #### Workloads, components and extensions -| Package | Version | -| ------------------------------------------------------------------------- | -------------- | -| android | 33.0.46.0 | -| Component.Android.Emulator.MDD | 17.6.33605.316 | -| Component.Android.NDK.R23C | 17.6.33605.316 | -| Component.Android.SDK.MAUI | 17.6.33605.316 | -| Component.CPython39.x64 | 3.9.13 | -| Component.Dotfuscator | 17.6.33605.316 | -| Component.HAXM.Private | 17.6.33605.316 | -| Component.Linux.CMake | 17.6.33605.316 | -| Component.Linux.RemoteFileExplorer | 17.6.33605.316 | -| Component.MDD.Android | 17.6.33605.316 | -| Component.MDD.Linux | 17.6.33605.316 | -| Component.MDD.Linux.GCC.arm | 17.6.33605.316 | -| Component.Microsoft.VisualStudio.LiveShare.2022 | 1.0.5843 | -| Component.Microsoft.VisualStudio.RazorExtension | 17.6.33605.316 | -| Component.Microsoft.VisualStudio.Web.AzureFunctions | 17.6.33605.316 | -| Component.Microsoft.Web.LibraryManager | 17.6.33605.316 | -| Component.Microsoft.WebTools.BrowserLink.WebLivePreview | 17.6.81.44349 | -| Component.Microsoft.Windows.DriverKit | 10.0.22621.0 | -| Component.OpenJDK | 17.6.33605.316 | -| Component.UnityEngine.x64 | 17.6.33605.316 | -| Component.Unreal | 17.6.33605.316 | -| Component.Unreal.Android | 17.6.33605.316 | -| Component.Unreal.Ide | 17.6.33605.316 | -| Component.VSInstallerProjects2022 | 2.0.0 | -| Component.WixToolset.VisualStudioExtension.Dev17 | 1.0.0.22 | -| Component.WixToolset.VisualStudioExtension.Schemas3 | 1.0.0.22 | -| Component.Xamarin | 17.6.33605.316 | -| Component.Xamarin.RemotedSimulator | 17.6.33605.316 | -| ios | 16.4.7054.0 | -| maccatalyst | 16.4.7054.0 | -| maui.android | 7.0.86.0 | -| maui.blazor | 7.0.86.0 | -| maui.core | 7.0.86.0 | -| maui.ios | 7.0.86.0 | -| maui.maccatalyst | 7.0.86.0 | -| maui.windows | 7.0.86.0 | -| Microsoft.Component.Azure.DataLake.Tools | 17.6.33605.316 | -| Microsoft.Component.ClickOnce | 17.6.33605.316 | -| Microsoft.Component.CodeAnalysis.SDK | 17.6.33605.316 | -| Microsoft.Component.MSBuild | 17.6.33605.316 | -| Microsoft.Component.NetFX.Native | 17.6.33605.316 | -| Microsoft.Component.PythonTools | 17.6.33605.316 | -| Microsoft.Component.PythonTools.Web | 17.6.33605.316 | -| Microsoft.Component.VC.Runtime.UCRTSDK | 17.6.33605.316 | -| Microsoft.ComponentGroup.Blend | 17.6.33605.316 | -| Microsoft.ComponentGroup.ClickOnce.Publish | 17.6.33605.316 | -| Microsoft.Net.Component.4.5.2.TargetingPack | 17.6.33605.316 | -| Microsoft.Net.Component.4.6.2.TargetingPack | 17.6.33605.316 | -| Microsoft.Net.Component.4.6.TargetingPack | 17.6.33605.316 | -| Microsoft.Net.Component.4.7.1.TargetingPack | 17.6.33605.316 | -| Microsoft.Net.Component.4.7.2.TargetingPack | 17.6.33605.316 | -| Microsoft.Net.Component.4.7.TargetingPack | 17.6.33605.316 | -| Microsoft.Net.Component.4.8.1.SDK | 17.6.33605.316 | -| Microsoft.Net.Component.4.8.1.TargetingPack | 17.6.33605.316 | -| Microsoft.Net.Component.4.8.SDK | 17.6.33605.316 | -| Microsoft.Net.Component.4.8.TargetingPack | 17.6.33605.316 | -| Microsoft.Net.ComponentGroup.4.8.DeveloperTools | 17.6.33605.316 | -| Microsoft.Net.ComponentGroup.DevelopmentPrerequisites | 17.6.33605.316 | -| Microsoft.Net.ComponentGroup.TargetingPacks.Common | 17.6.33605.316 | -| microsoft.net.runtime.android | 7.0.523.17405 | -| microsoft.net.runtime.android.aot | 7.0.523.17405 | -| microsoft.net.runtime.android.aot.net6 | 7.0.523.17405 | -| microsoft.net.runtime.android.net6 | 7.0.523.17405 | -| microsoft.net.runtime.ios | 7.0.523.17405 | -| microsoft.net.runtime.ios.net6 | 7.0.523.17405 | -| microsoft.net.runtime.maccatalyst | 7.0.523.17405 | -| microsoft.net.runtime.maccatalyst.net6 | 7.0.523.17405 | -| microsoft.net.runtime.mono.tooling | 7.0.523.17405 | -| microsoft.net.runtime.mono.tooling.net6 | 7.0.523.17405 | -| microsoft.net.sdk.emscripten.net7 | 7.0.8.17301 | -| Microsoft.NetCore.Component.DevelopmentTools | 17.6.33605.316 | -| Microsoft.NetCore.Component.Runtime.6.0 | 17.6.33711.286 | -| Microsoft.NetCore.Component.Runtime.7.0 | 17.6.33711.286 | -| Microsoft.NetCore.Component.SDK | 17.6.33711.286 | -| Microsoft.NetCore.Component.Web | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.AppInsights.Tools | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.AspNet | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.AspNet45 | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.Azure.AuthoringTools | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.Azure.ClientLibs | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.Azure.Compute.Emulator | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.Azure.Powershell | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.Azure.ResourceManager.Tools | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.Azure.ServiceFabric.Tools | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.Azure.Waverton | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.Azure.Waverton.BuildTools | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.ClassDesigner | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.CodeMap | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.Common.Azure.Tools | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.CoreEditor | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.Debugger.JustInTime | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.Debugger.Snapshot | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.DiagnosticTools | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.DockerTools | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.DotNetModelBuilder | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.DslTools | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.Embedded | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.EntityFramework | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.FSharp | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.FSharp.Desktop | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.FSharp.WebTemplates | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.GraphDocument | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.Graphics | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.Graphics.Tools | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.HLSL | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.IISExpress | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.IntelliCode | 17.6.33625.640 | -| Microsoft.VisualStudio.Component.IntelliTrace.FrontEnd | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.JavaScript.Diagnostics | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.JavaScript.TypeScript | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.LinqToSql | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.LiveUnitTesting | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.ManagedDesktop.Core | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.ManagedDesktop.Prerequisites | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.Merq | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.MonoDebugger | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.MSODBC.SQL | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.MSSQL.CMDLnUtils | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.Node.Tools | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.NuGet | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.NuGet.BuildTools | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.PortableLibrary | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.Roslyn.Compiler | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.Roslyn.LanguageServices | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.SecurityIssueAnalysis | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.Sharepoint.Tools | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.SQL.CLR | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.SQL.DataSources | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.SQL.LocalDB.Runtime | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.SQL.SSDT | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.TeamOffice | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.TestTools.CodedUITest | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.TestTools.WebLoadTest | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.TextTemplating | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.TypeScript.TSServer | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.Unity | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.UWP.VC.ARM64 | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.UWP.VC.ARM64EC | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM.Spectre | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM64 | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM64.Spectre | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM.Spectre | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM64 | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM64.Spectre | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.Spectre | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.ARM | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.ARM.Spectre | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.ARM64 | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.ARM64.Spectre | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.Spectre | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64 | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64.Spectre | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.36.17.6.ARM | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.36.17.6.ARM.Spectre | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.36.17.6.ARM64 | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.36.17.6.ARM64.Spectre | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.36.17.6.ATL | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.36.17.6.ATL.ARM | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.36.17.6.ATL.ARM.Spectre | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.36.17.6.ATL.ARM64 | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.36.17.6.ATL.ARM64.Spectre | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.36.17.6.ATL.Spectre | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.36.17.6.MFC | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.36.17.6.MFC.ARM | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.36.17.6.MFC.ARM.Spectre | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.36.17.6.MFC.ARM64 | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.36.17.6.MFC.ARM64.Spectre | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.36.17.6.MFC.Spectre | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.36.17.6.x86.x64 | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.36.17.6.x86.x64.Spectre | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.ASAN | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.ATL | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.ATL.ARM | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.ATL.ARM.Spectre | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.ATL.ARM64 | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.ATL.ARM64.Spectre | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.ATL.Spectre | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.ATLMFC | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.ATLMFC.Spectre | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.CLI.Support | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.CMake.Project | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.CoreIde | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.DiagnosticTools | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.Llvm.Clang | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.Llvm.ClangToolset | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.MFC.ARM | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.MFC.ARM.Spectre | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.MFC.ARM64 | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.MFC.ARM64.Spectre | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.Modules.x86.x64 | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.Redist.14.Latest | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.Redist.MSM | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.Runtimes.ARM.Spectre | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.Runtimes.ARM64.Spectre | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.Runtimes.ARM64EC.Spectre | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.Runtimes.x86.x64.Spectre | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.TestAdapterForBoostTest | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.TestAdapterForGoogleTest | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.Tools.ARM | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.Tools.ARM64 | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.Tools.ARM64EC | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.Tools.x86.x64 | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.v141.ARM | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.v141.ARM.Spectre | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.v141.ARM64 | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.v141.ARM64.Spectre | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.v141.ATL | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.v141.ATL.Spectre | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.v141.MFC | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.v141.MFC.Spectre | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.v141.x86.x64 | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.v141.x86.x64.Spectre | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.Vcpkg | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VSSDK | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.Wcf.Tooling | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.Web | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.WebDeploy | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.Windows10SDK | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.Windows10SDK.19041 | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.Windows10SDK.20348 | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.Windows11SDK.22000 | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.Windows11SDK.22621 | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.Workflow | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.WslDebugging | 17.6.33605.316 | -| Microsoft.VisualStudio.ComponentGroup.ArchitectureTools.Native | 17.6.33605.316 | -| Microsoft.VisualStudio.ComponentGroup.Azure.CloudServices | 17.6.33605.316 | -| Microsoft.VisualStudio.ComponentGroup.Azure.Prerequisites | 17.6.33605.316 | -| Microsoft.VisualStudio.ComponentGroup.Azure.ResourceManager.Tools | 17.6.33605.316 | -| Microsoft.VisualStudio.ComponentGroup.AzureFunctions | 17.6.33605.316 | -| Microsoft.VisualStudio.ComponentGroup.Maui.All | 17.6.33605.316 | -| Microsoft.VisualStudio.ComponentGroup.Maui.Android | 17.6.33605.316 | -| Microsoft.VisualStudio.ComponentGroup.Maui.Blazor | 17.6.33605.316 | -| Microsoft.VisualStudio.ComponentGroup.Maui.iOS | 17.6.33605.316 | -| Microsoft.VisualStudio.ComponentGroup.Maui.MacCatalyst | 17.6.33605.316 | -| Microsoft.VisualStudio.ComponentGroup.Maui.Shared | 17.6.33605.316 | -| Microsoft.VisualStudio.ComponentGroup.Maui.Windows | 17.6.33605.316 | -| Microsoft.VisualStudio.ComponentGroup.MSIX.Packaging | 17.6.33605.316 | -| Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core | 17.6.33605.316 | -| Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Llvm.Clang | 17.6.33605.316 | -| Microsoft.VisualStudio.ComponentGroup.UWP.NetCoreAndStandard | 17.6.33605.316 | -| Microsoft.VisualStudio.ComponentGroup.UWP.Support | 17.6.33605.316 | -| Microsoft.VisualStudio.ComponentGroup.UWP.VC.v142 | 17.6.33605.316 | -| Microsoft.VisualStudio.ComponentGroup.UWP.Xamarin | 17.6.33605.316 | -| Microsoft.VisualStudio.ComponentGroup.VC.Tools.142.x86.x64 | 17.6.33605.316 | -| Microsoft.VisualStudio.ComponentGroup.VisualStudioExtension.Prerequisites | 17.6.33605.316 | -| Microsoft.VisualStudio.ComponentGroup.Web | 17.6.33605.316 | -| Microsoft.VisualStudio.ComponentGroup.Web.CloudTools | 17.6.33605.316 | -| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions | 17.6.33605.316 | -| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.CMake | 17.6.33605.316 | -| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.TemplateEngine | 17.6.33605.316 | -| Microsoft.VisualStudio.Workload.Azure | 17.6.33605.316 | -| Microsoft.VisualStudio.Workload.CoreEditor | 17.6.33605.316 | -| Microsoft.VisualStudio.Workload.Data | 17.6.33605.316 | -| Microsoft.VisualStudio.Workload.DataScience | 17.6.33605.316 | -| Microsoft.VisualStudio.Workload.ManagedDesktop | 17.6.33605.316 | -| Microsoft.VisualStudio.Workload.ManagedGame | 17.6.33605.316 | -| Microsoft.VisualStudio.Workload.NativeCrossPlat | 17.6.33605.316 | -| Microsoft.VisualStudio.Workload.NativeDesktop | 17.6.33605.316 | -| Microsoft.VisualStudio.Workload.NativeGame | 17.6.33605.316 | -| Microsoft.VisualStudio.Workload.NativeMobile | 17.6.33605.316 | -| Microsoft.VisualStudio.Workload.NetCrossPlat | 17.6.33605.316 | -| Microsoft.VisualStudio.Workload.NetWeb | 17.6.33605.316 | -| Microsoft.VisualStudio.Workload.Node | 17.6.33605.316 | -| Microsoft.VisualStudio.Workload.Office | 17.6.33605.316 | -| Microsoft.VisualStudio.Workload.Python | 17.6.33605.316 | -| Microsoft.VisualStudio.Workload.Universal | 17.6.33605.316 | -| Microsoft.VisualStudio.Workload.VisualStudioExtension | 17.6.33605.316 | -| runtimes.ios | 7.0.523.17405 | -| runtimes.ios.net6 | 7.0.523.17405 | -| runtimes.maccatalyst | 7.0.523.17405 | -| runtimes.maccatalyst.net6 | 7.0.523.17405 | -| wasm.tools | 7.0.523.17405 | -| ProBITools.MicrosoftAnalysisServicesModelingProjects2022 | 3.0.4 | -| ProBITools.MicrosoftReportProjectsforVisualStudio2022 | 3.0.1 | -| VisualStudioClient.MicrosoftVisualStudio2022InstallerProjects | 2.0.0 | -| Windows Driver Kit | 10.1.22621.382 | -| Windows Driver Kit Visual Studio Extension | 10.0.22621.0 | -| Windows Software Development Kit | 10.1.22621.755 | -| WixToolset.WixToolsetVisualStudio2022Extension | 1.0.0.22 | +| Package | Version | +| ------------------------------------------------------------------------- | --------------- | +| android | 33.0.46.0 | +| Component.Android.Emulator.MDD | 17.6.33605.316 | +| Component.Android.NDK.R23C | 17.6.33605.316 | +| Component.Android.SDK.MAUI | 17.6.33605.316 | +| Component.CPython39.x64 | 3.9.13 | +| Component.Dotfuscator | 17.6.33605.316 | +| Component.HAXM.Private | 17.6.33605.316 | +| Component.Linux.CMake | 17.6.33605.316 | +| Component.Linux.RemoteFileExplorer | 17.6.33605.316 | +| Component.MDD.Android | 17.6.33605.316 | +| Component.MDD.Linux | 17.6.33605.316 | +| Component.MDD.Linux.GCC.arm | 17.6.33605.316 | +| Component.Microsoft.VisualStudio.LiveShare.2022 | 1.0.5843 | +| Component.Microsoft.VisualStudio.RazorExtension | 17.6.33605.316 | +| Component.Microsoft.VisualStudio.Web.AzureFunctions | 17.6.33605.316 | +| Component.Microsoft.Web.LibraryManager | 17.6.33605.316 | +| Component.Microsoft.WebTools.BrowserLink.WebLivePreview | 17.6.81.44349 | +| Component.Microsoft.Windows.DriverKit | 10.0.22621.0 | +| Component.OpenJDK | 17.6.33605.316 | +| Component.UnityEngine.x64 | 17.6.33605.316 | +| Component.Unreal | 17.6.33605.316 | +| Component.Unreal.Android | 17.6.33605.316 | +| Component.Unreal.Ide | 17.6.33605.316 | +| Component.VSInstallerProjects2022 | 2.0.0 | +| Component.WixToolset.VisualStudioExtension.Dev17 | 1.0.0.22 | +| Component.WixToolset.VisualStudioExtension.Schemas3 | 1.0.0.22 | +| Component.Xamarin | 17.6.33605.316 | +| Component.Xamarin.RemotedSimulator | 17.6.33605.316 | +| ios | 16.4.7067.0 | +| maccatalyst | 16.4.7067.0 | +| maui.android | 7.0.86.0 | +| maui.blazor | 7.0.86.0 | +| maui.core | 7.0.86.0 | +| maui.ios | 7.0.86.0 | +| maui.maccatalyst | 7.0.86.0 | +| maui.windows | 7.0.86.0 | +| Microsoft.Component.Azure.DataLake.Tools | 17.6.33605.316 | +| Microsoft.Component.ClickOnce | 17.6.33605.316 | +| Microsoft.Component.CodeAnalysis.SDK | 17.6.33605.316 | +| Microsoft.Component.MSBuild | 17.6.33605.316 | +| Microsoft.Component.NetFX.Native | 17.6.33605.316 | +| Microsoft.Component.PythonTools | 17.6.33605.316 | +| Microsoft.Component.PythonTools.Web | 17.6.33605.316 | +| Microsoft.Component.VC.Runtime.UCRTSDK | 17.6.33605.316 | +| Microsoft.ComponentGroup.Blend | 17.6.33605.316 | +| Microsoft.ComponentGroup.ClickOnce.Publish | 17.6.33605.316 | +| Microsoft.Net.Component.4.5.2.TargetingPack | 17.6.33605.316 | +| Microsoft.Net.Component.4.6.2.TargetingPack | 17.6.33605.316 | +| Microsoft.Net.Component.4.6.TargetingPack | 17.6.33605.316 | +| Microsoft.Net.Component.4.7.1.TargetingPack | 17.6.33605.316 | +| Microsoft.Net.Component.4.7.2.TargetingPack | 17.6.33605.316 | +| Microsoft.Net.Component.4.7.TargetingPack | 17.6.33605.316 | +| Microsoft.Net.Component.4.8.1.SDK | 17.6.33605.316 | +| Microsoft.Net.Component.4.8.1.TargetingPack | 17.6.33605.316 | +| Microsoft.Net.Component.4.8.SDK | 17.6.33605.316 | +| Microsoft.Net.Component.4.8.TargetingPack | 17.6.33605.316 | +| Microsoft.Net.ComponentGroup.4.8.DeveloperTools | 17.6.33605.316 | +| Microsoft.Net.ComponentGroup.DevelopmentPrerequisites | 17.6.33605.316 | +| Microsoft.Net.ComponentGroup.TargetingPacks.Common | 17.6.33605.316 | +| microsoft.net.runtime.android | 7.0.723.27404 | +| microsoft.net.runtime.android.aot | 7.0.723.27404 | +| microsoft.net.runtime.android.aot.net6 | 7.0.723.27404 | +| microsoft.net.runtime.android.net6 | 7.0.723.27404 | +| microsoft.net.runtime.ios | 7.0.723.27404 | +| microsoft.net.runtime.ios.net6 | 7.0.723.27404 | +| microsoft.net.runtime.maccatalyst | 7.0.723.27404 | +| microsoft.net.runtime.maccatalyst.net6 | 7.0.723.27404 | +| microsoft.net.runtime.mono.tooling | 7.0.723.27404 | +| microsoft.net.runtime.mono.tooling.net6 | 7.0.723.27404 | +| microsoft.net.sdk.emscripten.net7 | 7.0.8.26101 | +| Microsoft.NetCore.Component.DevelopmentTools | 17.6.33605.316 | +| Microsoft.NetCore.Component.Runtime.6.0 | 17.6.33801.368 | +| Microsoft.NetCore.Component.Runtime.7.0 | 17.6.33801.368 | +| Microsoft.NetCore.Component.SDK | 17.6.33801.368 | +| Microsoft.NetCore.Component.Web | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.AppInsights.Tools | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.AspNet | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.AspNet45 | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.Azure.AuthoringTools | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.Azure.ClientLibs | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.Azure.Compute.Emulator | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.Azure.Powershell | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.Azure.ResourceManager.Tools | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.Azure.ServiceFabric.Tools | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.Azure.Waverton | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.Azure.Waverton.BuildTools | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.ClassDesigner | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.CodeMap | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.Common.Azure.Tools | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.CoreEditor | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.Debugger.JustInTime | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.Debugger.Snapshot | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.DiagnosticTools | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.DockerTools | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.DotNetModelBuilder | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.DslTools | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.Embedded | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.EntityFramework | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.FSharp | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.FSharp.Desktop | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.FSharp.WebTemplates | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.GraphDocument | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.Graphics | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.Graphics.Tools | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.HLSL | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.IISExpress | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.IntelliCode | 17.6.33815.150 | +| Microsoft.VisualStudio.Component.IntelliTrace.FrontEnd | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.JavaScript.Diagnostics | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.JavaScript.TypeScript | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.LinqToSql | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.LiveUnitTesting | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.ManagedDesktop.Core | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.ManagedDesktop.Prerequisites | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.Merq | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.MonoDebugger | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.MSODBC.SQL | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.MSSQL.CMDLnUtils | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.Node.Tools | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.NuGet | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.NuGet.BuildTools | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.PortableLibrary | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.Roslyn.Compiler | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.Roslyn.LanguageServices | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.SecurityIssueAnalysis | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.Sharepoint.Tools | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.SQL.CLR | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.SQL.DataSources | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.SQL.LocalDB.Runtime | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.SQL.SSDT | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.TeamOffice | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.TestTools.CodedUITest | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.TestTools.WebLoadTest | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.TextTemplating | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.TypeScript.TSServer | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.Unity | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.UWP.VC.ARM64 | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.UWP.VC.ARM64EC | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM.Spectre | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM64 | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM64.Spectre | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM.Spectre | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM64 | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM64.Spectre | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.Spectre | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.ARM | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.ARM.Spectre | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.ARM64 | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.ARM64.Spectre | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.Spectre | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64 | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64.Spectre | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.36.17.6.ARM | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.36.17.6.ARM.Spectre | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.36.17.6.ARM64 | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.36.17.6.ARM64.Spectre | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.36.17.6.ATL | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.36.17.6.ATL.ARM | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.36.17.6.ATL.ARM.Spectre | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.36.17.6.ATL.ARM64 | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.36.17.6.ATL.ARM64.Spectre | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.36.17.6.ATL.Spectre | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.36.17.6.MFC | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.36.17.6.MFC.ARM | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.36.17.6.MFC.ARM.Spectre | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.36.17.6.MFC.ARM64 | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.36.17.6.MFC.ARM64.Spectre | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.36.17.6.MFC.Spectre | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.36.17.6.x86.x64 | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.36.17.6.x86.x64.Spectre | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.ASAN | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.ATL | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.ATL.ARM | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.ATL.ARM.Spectre | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.ATL.ARM64 | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.ATL.ARM64.Spectre | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.ATL.Spectre | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.ATLMFC | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.ATLMFC.Spectre | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.CLI.Support | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.CMake.Project | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.CoreIde | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.DiagnosticTools | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.Llvm.Clang | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.Llvm.ClangToolset | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.MFC.ARM | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.MFC.ARM.Spectre | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.MFC.ARM64 | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.MFC.ARM64.Spectre | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.Modules.x86.x64 | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.Redist.14.Latest | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.Redist.MSM | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.Runtimes.ARM.Spectre | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.Runtimes.ARM64.Spectre | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.Runtimes.ARM64EC.Spectre | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.Runtimes.x86.x64.Spectre | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.TestAdapterForBoostTest | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.TestAdapterForGoogleTest | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.Tools.ARM | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.Tools.ARM64 | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.Tools.ARM64EC | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.Tools.x86.x64 | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.v141.ARM | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.v141.ARM.Spectre | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.v141.ARM64 | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.v141.ARM64.Spectre | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.v141.ATL | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.v141.ATL.Spectre | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.v141.MFC | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.v141.MFC.Spectre | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.v141.x86.x64 | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.v141.x86.x64.Spectre | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.Vcpkg | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VSSDK | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.Wcf.Tooling | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.Web | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.WebDeploy | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.Windows10SDK | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.Windows10SDK.19041 | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.Windows10SDK.20348 | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.Windows11SDK.22000 | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.Windows11SDK.22621 | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.Workflow | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.WslDebugging | 17.6.33605.316 | +| Microsoft.VisualStudio.ComponentGroup.ArchitectureTools.Native | 17.6.33605.316 | +| Microsoft.VisualStudio.ComponentGroup.Azure.CloudServices | 17.6.33605.316 | +| Microsoft.VisualStudio.ComponentGroup.Azure.Prerequisites | 17.6.33605.316 | +| Microsoft.VisualStudio.ComponentGroup.Azure.ResourceManager.Tools | 17.6.33605.316 | +| Microsoft.VisualStudio.ComponentGroup.AzureFunctions | 17.6.33605.316 | +| Microsoft.VisualStudio.ComponentGroup.Maui.All | 17.6.33605.316 | +| Microsoft.VisualStudio.ComponentGroup.Maui.Android | 17.6.33605.316 | +| Microsoft.VisualStudio.ComponentGroup.Maui.Blazor | 17.6.33605.316 | +| Microsoft.VisualStudio.ComponentGroup.Maui.iOS | 17.6.33605.316 | +| Microsoft.VisualStudio.ComponentGroup.Maui.MacCatalyst | 17.6.33605.316 | +| Microsoft.VisualStudio.ComponentGroup.Maui.Shared | 17.6.33605.316 | +| Microsoft.VisualStudio.ComponentGroup.Maui.Windows | 17.6.33605.316 | +| Microsoft.VisualStudio.ComponentGroup.MSIX.Packaging | 17.6.33605.316 | +| Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core | 17.6.33605.316 | +| Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Llvm.Clang | 17.6.33605.316 | +| Microsoft.VisualStudio.ComponentGroup.UWP.NetCoreAndStandard | 17.6.33605.316 | +| Microsoft.VisualStudio.ComponentGroup.UWP.Support | 17.6.33605.316 | +| Microsoft.VisualStudio.ComponentGroup.UWP.VC.v142 | 17.6.33605.316 | +| Microsoft.VisualStudio.ComponentGroup.UWP.Xamarin | 17.6.33605.316 | +| Microsoft.VisualStudio.ComponentGroup.VC.Tools.142.x86.x64 | 17.6.33605.316 | +| Microsoft.VisualStudio.ComponentGroup.VisualStudioExtension.Prerequisites | 17.6.33605.316 | +| Microsoft.VisualStudio.ComponentGroup.Web | 17.6.33605.316 | +| Microsoft.VisualStudio.ComponentGroup.Web.CloudTools | 17.6.33605.316 | +| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions | 17.6.33605.316 | +| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.CMake | 17.6.33605.316 | +| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.TemplateEngine | 17.6.33605.316 | +| Microsoft.VisualStudio.Workload.Azure | 17.6.33605.316 | +| Microsoft.VisualStudio.Workload.CoreEditor | 17.6.33605.316 | +| Microsoft.VisualStudio.Workload.Data | 17.6.33605.316 | +| Microsoft.VisualStudio.Workload.DataScience | 17.6.33605.316 | +| Microsoft.VisualStudio.Workload.ManagedDesktop | 17.6.33605.316 | +| Microsoft.VisualStudio.Workload.ManagedGame | 17.6.33605.316 | +| Microsoft.VisualStudio.Workload.NativeCrossPlat | 17.6.33605.316 | +| Microsoft.VisualStudio.Workload.NativeDesktop | 17.6.33605.316 | +| Microsoft.VisualStudio.Workload.NativeGame | 17.6.33605.316 | +| Microsoft.VisualStudio.Workload.NativeMobile | 17.6.33605.316 | +| Microsoft.VisualStudio.Workload.NetCrossPlat | 17.6.33605.316 | +| Microsoft.VisualStudio.Workload.NetWeb | 17.6.33605.316 | +| Microsoft.VisualStudio.Workload.Node | 17.6.33605.316 | +| Microsoft.VisualStudio.Workload.Office | 17.6.33605.316 | +| Microsoft.VisualStudio.Workload.Python | 17.6.33605.316 | +| Microsoft.VisualStudio.Workload.Universal | 17.6.33605.316 | +| Microsoft.VisualStudio.Workload.VisualStudioExtension | 17.6.33605.316 | +| runtimes.ios | 7.0.723.27404 | +| runtimes.ios.net6 | 7.0.723.27404 | +| runtimes.maccatalyst | 7.0.723.27404 | +| runtimes.maccatalyst.net6 | 7.0.723.27404 | +| wasm.tools | 7.0.723.27404 | +| ProBITools.MicrosoftAnalysisServicesModelingProjects2022 | 3.0.4 | +| ProBITools.MicrosoftReportProjectsforVisualStudio2022 | 3.0.1 | +| VisualStudioClient.MicrosoftVisualStudio2022InstallerProjects | 2.0.0 | +| Windows Driver Kit | 10.1.22621.382 | +| Windows Driver Kit Visual Studio Extension | 10.0.22621.0 | +| Windows Software Development Kit | 10.1.22621.1778 | +| WixToolset.WixToolsetVisualStudio2022Extension | 1.0.0.22 | #### Microsoft Visual C++ | Name | Architecture | Version | @@ -529,11 +529,11 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 10.0.22621.0 ### .NET Core Tools -- .NET Core SDK: 3.1.120, 3.1.202, 3.1.302, 3.1.426, 6.0.116, 6.0.203, 6.0.311, 6.0.408, 7.0.302 +- .NET Core SDK: 3.1.120, 3.1.202, 3.1.302, 3.1.426, 6.0.118, 6.0.203, 6.0.313, 6.0.410, 7.0.304 - .NET Framework: 4.8, 4.8.1 -- Microsoft.AspNetCore.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 6.0.5, 6.0.16, 7.0.5 -- Microsoft.NETCore.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 6.0.5, 6.0.16, 7.0.5 -- Microsoft.WindowsDesktop.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 6.0.5, 6.0.16, 7.0.5 +- Microsoft.AspNetCore.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 6.0.5, 6.0.18, 7.0.7 +- Microsoft.NETCore.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 6.0.5, 6.0.18, 7.0.7 +- Microsoft.WindowsDesktop.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 6.0.5, 6.0.18, 7.0.7 - nbgv 3.6.133+2d32d93cb1 ### PowerShell Tools @@ -546,7 +546,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Az (Cached): 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.350 +- AWSPowershell: 4.1.355 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 - Microsoft.Graph: 1.28.0 @@ -590,9 +590,9 @@ All other versions are saved but not installed. ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2022 | sha256:45633555c20a487ddaf15ff3834acbaae814239e297d52f022bb710221b44f5b | 2023-05-09 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2022 | sha256:40777910f78729f9dd29f0ee129fa59a09aaf916ea2aa4b49e9f84e44cdfb206 | 2023-05-09 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:2d8fc8aa28fd949bc0b1728f6739e35982ba62ec5a89f47512384f786cd25cc9 | 2023-05-16 | -| mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:dffd1e0990e23f9dd85358cd178b25be3c8253a24e5fb8ebe0bd1740a9d28f94 | 2023-05-05 | -| mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:2710869ec9a4fb04aa8410502b0bad2ae5a4d63ac89a44566965278dbdc4272d | 2023-05-05 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2022 | sha256:a23d696a3fa02f481768af1abcab54057c5442b57a0e3ac54933aff3b9319d92 | 2023-06-13 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2022 | sha256:101d49c1c328b47aebbd45c05c33286aaa5db2930cf5089e62f23ba8dd21e363 | 2023-06-13 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:1c040db3ce19fecc2c1ddac3f44f0b9d593c45e2e18a4cd13111bd675d915ea0 | 2023-06-13 | +| mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:cde6d90e1f745f1eba0ab4669e2c57bd773a4216e04416a26f8a55a31509b752 | 2023-06-08 | +| mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:6f792e5bc39b7bc96ef4048a8f17d425b106941e71d550e6f9ba3a37043a161a | 2023-06-08 | From 7d99ce2cad17e7ebdf0c65d6586d845bfd9fab8e Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Mon, 26 Jun 2023 19:44:27 +0200 Subject: [PATCH 1988/3485] Update SBOM report workflow's version-check job (#7793) --- .github/workflows/create_sbom_report.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/create_sbom_report.yml b/.github/workflows/create_sbom_report.yml index 00ca3a3e8017..0041ba5e3611 100644 --- a/.github/workflows/create_sbom_report.yml +++ b/.github/workflows/create_sbom_report.yml @@ -20,8 +20,11 @@ jobs: steps: - name: Available image version check for ${{ github.event.client_payload.ReleaseBranchName }} run: | - if ($env:ImageVersion -ne '${{ github.event.client_payload.imageVersion }}') { - throw "Current runner $env:ImageVersion image version don't match ${{ github.event.client_payload.imageVersion }}." + $imageVersionComponents = $env:ImageVersion.Split('.') + $imageMajorVersion = $imageVersionComponents[0] + $imageMinorVersion = $imageVersionComponents[1] + if ("$imageMajorVersion.$imageMinorVersion" -ne '${{ github.event.client_payload.imageVersion }}') { + throw "Current runner $imageMajorVersion.$imageMinorVersion image version doesn't match ${{ github.event.client_payload.imageVersion }}." } #Install and run SYFT, compress SBOM, upload it to release assets create-sbom: From 3ede1f95a7f1ef969b3e34d60c8c197baffbeda9 Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Mon, 26 Jun 2023 19:45:09 +0200 Subject: [PATCH 1989/3485] Fix software and release URLs for windows and ubuntu (#7790) --- images/linux/scripts/installers/preimagedata.sh | 6 ++++-- images/win/scripts/Installers/Update-ImageData.ps1 | 11 +++++++---- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/images/linux/scripts/installers/preimagedata.sh b/images/linux/scripts/installers/preimagedata.sh index 136bfefa8c55..62c6d3bed28e 100644 --- a/images/linux/scripts/installers/preimagedata.sh +++ b/images/linux/scripts/installers/preimagedata.sh @@ -2,6 +2,8 @@ imagedata_file=$IMAGEDATA_FILE image_version=$IMAGE_VERSION +image_version_major=${image_version/.*/} +image_version_minor=$(echo $image_version | cut -d "." -f 2) os_name=$(lsb_release -ds | sed "s/ /\\\n/g") os_version=$(lsb_release -rs) image_label="ubuntu-${os_version}" @@ -9,8 +11,8 @@ version_major=${os_version/.*/} version_wo_dot=${os_version/./} github_url="https://github.com/actions/runner-images/blob" -software_url="${github_url}/ubuntu${version_major}/${image_version}/images/linux/Ubuntu${version_wo_dot}-Readme.md" -releaseUrl="https://github.com/actions/runner-images/releases/tag/ubuntu${version_major}%2F${image_version}" +software_url="${github_url}/ubuntu${version_major}/${image_version_major}.${image_version_minor}/images/linux/Ubuntu${version_wo_dot}-Readme.md" +releaseUrl="https://github.com/actions/runner-images/releases/tag/ubuntu${version_major}%2F${image_version_major}.${image_version_minor}" cat <<EOF > $imagedata_file [ diff --git a/images/win/scripts/Installers/Update-ImageData.ps1 b/images/win/scripts/Installers/Update-ImageData.ps1 index dc9f1482cab2..0afa2bdd2af4 100644 --- a/images/win/scripts/Installers/Update-ImageData.ps1 +++ b/images/win/scripts/Installers/Update-ImageData.ps1 @@ -4,17 +4,20 @@ $osName = $caption.Substring(0, $caption.LastIndexOf(" ")) $osEdition = $caption.Substring($caption.LastIndexOf(" ")+1) $osVersion = $os.Version $imageVersion = $env:IMAGE_VERSION +$imageVersionComponents = $imageVersion.Split('.') +$imageMajorVersion = $imageVersionComponents[0] +$imageMinorVersion = $imageVersionComponents[1] $imageDataFile = $env:IMAGEDATA_FILE $githubUrl="https://github.com/actions/runner-images/blob" if (Test-IsWin22) { $imageLabel = "windows-2022" - $softwareUrl = "${githubUrl}/win22/${imageVersion}/images/win/Windows2022-Readme.md" - $releaseUrl="https://github.com/actions/runner-images/releases/tag/win22%2F${imageVersion}" + $softwareUrl = "${githubUrl}/win22/$imageMajorVersion.$imageMinorVersion/images/win/Windows2022-Readme.md" + $releaseUrl="https://github.com/actions/runner-images/releases/tag/win22%2F$imageMajorVersion.$imageMinorVersion" } elseif (Test-IsWin19) { $imageLabel = "windows-2019" - $softwareUrl = "${githubUrl}/win19/${imageVersion}/images/win/Windows2019-Readme.md" - $releaseUrl="https://github.com/actions/runner-images/releases/tag/win19%2F${imageVersion}" + $softwareUrl = "${githubUrl}/win19/$imageMajorVersion.$imageMinorVersion/images/win/Windows2019-Readme.md" + $releaseUrl="https://github.com/actions/runner-images/releases/tag/win19%2F$imageMajorVersion.$imageMinorVersion" } else { throw "Invalid platform version is found. Either Windows Server 2019 or 2022 are required" } From f0c7d3c5b11ad046315a6d1ec31848cf8d765510 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 29 Jun 2023 08:06:20 +0000 Subject: [PATCH 1990/3485] Updating readme file for macOS-11 version 20230623.1 (#7785) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-11-Readme.md | 52 ++++++++++++++++----------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/images/macos/macos-11-Readme.md b/images/macos/macos-11-Readme.md index a930d4f9222d..ef2eb263d360 100644 --- a/images/macos/macos-11-Readme.md +++ b/images/macos/macos-11-Readme.md @@ -1,17 +1,16 @@ | Announcements | |-| | [[All OSs] .NET 3.1 will be removed from the images on July, 3](https://github.com/actions/runner-images/issues/7667) | -| [Actions runner image scheduled maintenance (June 2 2023 through June 16 2023)](https://github.com/actions/runner-images/issues/7660) | *** # macOS 11 -- OS Version: macOS 11.7.7 (20G1345) +- OS Version: macOS 11.7.8 (20G1351) - Kernel Version: Darwin 20.6.0 -- Image Version: 20230618.1 +- Image Version: 20230623.1 ## Installed Software ### Language and Runtime -- .NET Core SDK: 3.1.101, 3.1.201, 3.1.302, 3.1.426, 6.0.410, 7.0.102, 7.0.202, 7.0.304 +- .NET Core SDK: 3.1.101, 3.1.201, 3.1.302, 3.1.426, 6.0.411, 7.0.102, 7.0.202, 7.0.305 - Bash 3.2.57(1)-release - Clang/LLVM 13.0.0 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` @@ -26,9 +25,9 @@ - Go 1.20.5 - Mono 6.12.0.188 - MSBuild 16.10.1.51301 (Mono 6.12.0.188) -- Node.js 18.16.0 +- Node.js 18.16.1 - NVM 0.39.3 -- NVM - Cached node versions: 14.21.3, 16.20.0, 18.16.0 +- NVM - Cached node versions: 14.21.3, 16.20.1, 18.16.1 - Perl 5.36.1 - PHP 8.2.7 - Python 2.7.18 @@ -41,7 +40,7 @@ - Carthage 0.39.0 - CocoaPods 1.12.1 - Composer 2.5.8 -- Homebrew 4.0.23 +- Homebrew 4.0.24 - Miniconda 23.3.1 - NPM 9.5.1 - NuGet 6.3.1.1 @@ -49,7 +48,7 @@ - Pip3 23.1.2 (python 3.11) - Pipx 1.2.0 - RubyGems 3.4.14 -- Vcpkg 2023 (build from commit 80ecf3249) +- Vcpkg 2023 (build from commit 1286cac87) - Yarn 1.22.19 #### Environment variables @@ -74,7 +73,7 @@ - Curl 8.1.2 - Git 2.41.0 - Git LFS 3.3.0 -- GitHub CLI 2.30.0 +- GitHub CLI 2.31.0 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.4 - gpg (GnuPG) 2.4.2 @@ -87,6 +86,7 @@ - Newman 5.3.2 - OpenSSL 1.1.1u 30 May 2023 - Packer 1.9.1 +- pkg-config 0.29.2 - PostgreSQL 14.8 (Homebrew) - psql (PostgreSQL) 14.8 (Homebrew) - Sox 14.4.2 @@ -96,17 +96,17 @@ - zstd 1.5.5 ### Tools -- Aliyun CLI 3.0.165 +- Aliyun CLI 3.0.167 - App Center CLI 2.13.8 -- AWS CLI 2.12.1 -- AWS SAM CLI 1.86.1 +- AWS CLI 2.12.2 +- AWS SAM CLI 1.88.0 - AWS Session Manager CLI 1.2.463.0 - Azure CLI 2.49.0 - Azure CLI (azure-devops) 0.26.0 - Bicep CLI 0.18.4 - Cabal 3.6.2.0 - Cmake 3.26.4 -- CodeQL Action Bundles 2.13.1 2.13.3 +- CodeQL Action Bundles 2.13.3 2.13.4 - Fastlane 2.213.0 - GHC 9.6.2 - GHCup 0.1.19.2 @@ -121,13 +121,13 @@ - Yamllint 1.32.0 ### Browsers -- Safari 16.5 (16615.2.9.11.6) -- SafariDriver 16.5 (16615.2.9.11.6) +- Safari 16.5.1 (16615.2.9.11.7) +- SafariDriver 16.5.1 (16615.2.9.11.7) - Google Chrome 114.0.5735.133 - ChromeDriver 114.0.5735.90 -- Microsoft Edge 114.0.1823.51 -- Microsoft Edge WebDriver 114.0.1823.51 -- Mozilla Firefox 114.0.1 +- Microsoft Edge 114.0.1823.58 +- Microsoft Edge WebDriver 114.0.1823.58 +- Mozilla Firefox 114.0.2 - geckodriver 0.33.0 - Selenium server 4.10.0 @@ -170,8 +170,8 @@ #### Node.js - 14.21.3 -- 16.20.0 -- 18.16.0 +- 16.20.1 +- 18.16.1 #### Go - 1.18.10 @@ -185,9 +185,9 @@ - Rustup 1.26.0 #### Packages -- Bindgen 0.66.0 +- Bindgen 0.66.1 - Cargo-audit 0.17.6 -- Cargo-outdated 0.12.0 +- Cargo-outdated 0.13.1 - Cbindgen 0.24.5 - Clippy 0.1.70 - Rustfmt 1.5.2-stable @@ -210,10 +210,10 @@ ### Xamarin #### Visual Studio for Mac -| Version | Build | Path | -| -------------- | --------- | ------------------------------------ | -| 2019 | 8.10.25.2 | /Applications/Visual Studio 2019.app | -| 2022 (default) | 17.5.7.6 | /Applications/Visual Studio.app | +| Version | Build | Path | +| -------------- | ----------- | ------------------------------------ | +| 2019 | 8.10.25.2 | /Applications/Visual Studio 2019.app | +| 2022 (default) | 17.6.0.1575 | /Applications/Visual Studio.app | ##### Notes ``` From 32bb7d9e9941de51cbb21f0341979ce3284505ca Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Thu, 29 Jun 2023 10:18:16 +0200 Subject: [PATCH 1991/3485] [Windows] Rework common tools software report script (#7801) --- .../SoftwareReport/SoftwareReport.Common.psm1 | 87 +++++++------------ 1 file changed, 31 insertions(+), 56 deletions(-) diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 index 2ccce45b66b5..929c215649a8 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 @@ -22,95 +22,79 @@ function Build-OSInfoSection { } function Get-BashVersion { - $version = bash --% -c 'echo ${BASH_VERSION}' - return $version + bash --% -c 'echo ${BASH_VERSION}' } function Get-RustVersion { - $rustVersion = [regex]::matches($(rustc --version), "\d+\.\d+\.\d+").Value - return $rustVersion + rustc --version | Take-Part -Part 1 } function Get-RustupVersion { - $rustupInfo = cmd /c "rustup --version 2>NUL" - $version = [regex]::matches($rustupInfo, "\d+\.\d+\.\d+").Value - return $version + cmd /c "rustup --version 2>NUL" | Take-Part -Part 1 } function Get-RustCargoVersion { - $version = [regex]::matches($(cargo --version), "\d+\.\d+\.\d+").Value - return $version + cargo --version | Take-Part -Part 1 } function Get-RustdocVersion { - $version = [regex]::matches($(rustdoc --version), "\d+\.\d+\.\d+").Value - return $version + rustdoc --version | Take-Part -Part 1 } function Get-RustfmtVersion { - $version = [regex]::matches($(rustfmt --version), "\d+\.\d+\.\d+").Value - return $version + rustfmt --version | Take-Part -Part 1 } function Get-RustClippyVersion { - $version = [regex]::matches($(cargo clippy --version), "\d+\.\d+\.\d+").Value - return $version + cargo clippy --version | Take-Part -Part 1 } function Get-BindgenVersion { - return ((bindgen --version) -replace "^bindgen").Trim() + bindgen --version | Take-Part -Part 1 } function Get-CbindgenVersion { - return ((cbindgen --version) -replace "^cbindgen").Trim() + cbindgen --version | Take-Part -Part 1 } function Get-CargoAuditVersion { - return ((cargo-audit --version) -replace "^cargo-audit").Trim() + cargo-audit --version | Take-Part -Part 1 } function Get-CargoOutdatedVersion { - return ((cargo outdated --version) -replace "^cargo-outdated").Trim() + cargo outdated --version | Take-Part -Part 1 } function Get-PythonVersion { - return ((python --version) -replace "^Python").Trim() + python --version | Take-Part -Part 1 } function Get-PowershellCoreVersion { - return ((pwsh --version) -replace "^PowerShell").Trim() + pwsh --version | Take-Part -Part 1 } function Get-RubyVersion { - $rubyVersion = $(ruby --version).split(" ")[1] - return $rubyVersion + ruby --version | Take-Part -Part 1 } function Get-GoVersion { - $(go version) -match "go(?<version>\d+\.\d+\.\d+)" | Out-Null - $goVersion = $Matches.Version - return $goVersion + go version | Take-Part -Part 2 | Take-Part -Part 1 -Delimiter ('o') } function Get-KotlinVersion { - $kotlinVersion = $((cmd /c "kotlinc -version 2>&1") | Out-String).split(" ")[2] - return $kotlinVersion + cmd /c "kotlinc -version 2>&1" | Take-Part -Part 2 } function Get-PHPVersion { - ($(php --version) | Out-String) -match "PHP (?<version>\d+\.\d+\.\d+)" | Out-Null - $phpVersion = $Matches.Version - return $phpVersion + php --version | Out-String | Take-Part -Part 1 } function Get-JuliaVersion { - $juliaVersion = [regex]::matches($(julia --version), "\d+\.\d+\.\d+").Value - return $juliaVersion + julia --version | Take-Part -Part 2 } function Get-LLVMVersion { - $llvmVersion = [regex]::matches($(clang --version), "\d+\.\d+\.\d+").Value - return $llvmVersion + (clang --version) -match "clang" | Take-Part -Part 2 } function Get-PerlVersion { @@ -120,12 +104,11 @@ function Get-PerlVersion { } function Get-NodeVersion { - $nodeVersion = $(node --version).split("v")[1] - return $nodeVersion + node --version | Take-Part -Part 0 -Delimiter ('v') } function Get-ChocoVersion { - return $(choco --version) + choco --version } function Get-VcpkgVersion { @@ -134,15 +117,15 @@ function Get-VcpkgVersion { } function Get-NPMVersion { - return $(npm -version) + npm -version } function Get-YarnVersion { - return $(yarn -version) + yarn -version } function Get-RubyGemsVersion { - return $(gem --version) + gem --version } function Get-HelmVersion { @@ -152,10 +135,7 @@ function Get-HelmVersion { } function Get-PipVersion { - ($(pip --version) | Out-String) -match "(?<version>pip [\d\.]+) .+ (?<python>\(python [\d\.]+\))" | Out-Null - $pipVersion = $Matches.Version - $pythonVersion = $Matches.Python - return ("$pipVersion $pythonVersion" -replace "^pip").Trim() + (pip --version) -match "pip" | Take-Part -Part 1,4,5 } function Get-CondaVersion { @@ -168,19 +148,15 @@ function Get-ComposerVersion { } function Get-NugetVersion { - return (((nuget help) -match "NuGet Version") -replace "NuGet Version:").Trim() + (nuget help) -match "Nuget Version" | Take-Part -Part 2 } function Get-AntVersion { - ($(ant -version) | Out-String) -match "version (?<version>\d+\.\d+\.\d+)" | Out-Null - $antVersion = $Matches.Version - return $antVersion + (ant -version) -match "version" | Take-Part -Part 3 } function Get-MavenVersion { - ($(mvn -version) | Out-String) -match "Apache Maven (?<version>\d+\.\d+\.\d+)" | Out-Null - $mavenVersion = $Matches.Version - return $mavenVersion + (mvn -version) -match "Apache Maven" | Take-Part -Part 2 } function Get-GradleVersion { @@ -190,7 +166,7 @@ function Get-GradleVersion { } function Get-SbtVersion { - return ((sbt -version) -match "sbt script version:" -replace "sbt script version:").Trim() + (sbt -version) -match "sbt script" | Take-Part -Part 3 } function Get-DotnetSdks { @@ -326,7 +302,7 @@ function Get-PacmanVersion { } function Get-YAMLLintVersion { - return ((yamllint --version) -replace "^yamllint").Trim() + yamllint --version | Take-Part -Part 1 } function Get-BizTalkVersion { @@ -335,8 +311,7 @@ function Get-BizTalkVersion { } function Get-PipxVersion { - $pipxVersion = pipx --version - return $pipxVersion + pipx --version } function Build-PackageManagementEnvironmentTable { From 5fe5278e60665353ac4dda16448ab9639162744c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 29 Jun 2023 09:04:26 +0000 Subject: [PATCH 1992/3485] Updating readme file for ubuntu20 version 20230623.1.1 (#7789) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2004-Readme.md | 53 +++++++++++++++---------------- 1 file changed, 26 insertions(+), 27 deletions(-) diff --git a/images/linux/Ubuntu2004-Readme.md b/images/linux/Ubuntu2004-Readme.md index 9a0a36ef417f..f70c0466f75b 100644 --- a/images/linux/Ubuntu2004-Readme.md +++ b/images/linux/Ubuntu2004-Readme.md @@ -1,12 +1,11 @@ | Announcements | |-| | [[All OSs] .NET 3.1 will be removed from the images on July, 3](https://github.com/actions/runner-images/issues/7667) | -| [Actions runner image scheduled maintenance (June 2 2023 through June 16 2023)](https://github.com/actions/runner-images/issues/7660) | *** # Ubuntu 20.04 - OS Version: 20.04.6 LTS - Kernel Version: 5.15.0-1040-azure -- Image Version: 20230619.1.0 +- Image Version: 20230623.1.0 - Systemd version: 245.4-4ubuntu3.22 ## Installed Software @@ -25,7 +24,7 @@ - Kotlin 1.8.22-release-407 - Mono 6.12.0.182 - MSBuild 16.10.1.31701 (Mono 6.12.0.182) -- Node.js 18.16.0 +- Node.js 18.16.1 - Perl 5.30.0 - Python 3.8.10 - Python3 3.8.10 @@ -43,7 +42,7 @@ - Pip3 20.0.2 - Pipx 1.2.0 - RubyGems 3.1.2 -- Vcpkg (build from commit 223b8d569) +- Vcpkg (build from commit 288e8bebf) - Yarn 1.22.19 #### Environment variables @@ -76,10 +75,10 @@ to accomplish this. - Bicep 0.18.4 - Buildah 1.22.3 - CMake 3.26.4 -- CodeQL Action Bundles 2.13.1 2.13.3 +- CodeQL Action Bundles 2.13.3 2.13.4 - Docker Amazon ECR Credential Helper 0.7.1 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.18.1+azure-2 +- Docker Compose v2 2.19.0+azure-1 - Docker-Buildx 0.11.0 - Docker-Moby Client 20.10.25+azure-2 - Docker-Moby Server 20.10.25+azure-2 @@ -88,7 +87,7 @@ to accomplish this. - Git LFS 3.3.0 - Git-ftp 1.6.0 - Haveged 1.9.1 -- Heroku 8.1.8 +- Heroku 8.1.9 - HHVM (HipHop VM) 4.172.1 - jq 1.6 - Kind 0.20.0 @@ -106,30 +105,30 @@ to accomplish this. - Parcel 2.9.2 - PhantomJS 2.1.1 2.1.1 - Podman 3.4.2 -- Pulumi 3.72.2 +- Pulumi 3.73.0 - R 4.3.0 - Skopeo 1.5.0 - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 -- Terraform 1.5.0 +- Terraform 1.5.1 - yamllint 1.32.0 - yq 4.34.1 - zstd 1.5.5 ### CLI Tools - Alibaba Cloud CLI 3.0.167 -- AWS CLI 2.12.1 +- AWS CLI 2.12.3 - AWS CLI Session Manager Plugin 1.2.463.0 -- AWS SAM CLI 1.86.1 +- AWS SAM CLI 1.88.0 - Azure CLI 2.49.0 - Azure CLI (azure-devops) 0.26.0 -- GitHub CLI 2.30.0 -- Google Cloud SDK 435.0.1 +- GitHub CLI 2.31.0 +- Google Cloud SDK 436.0.0 - Hub CLI 2.14.2 - Netlify CLI 15.6.0 -- OpenShift CLI 4.13.3 +- OpenShift CLI 4.13.4 - ORAS CLI 1.0.0 -- Vercel CLI 30.2.2 +- Vercel CLI 30.2.3 ### Java | Version | Vendor | Environment Variable | @@ -162,7 +161,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Bindgen 0.66.1 - Cargo audit 0.17.6 - Cargo clippy 0.1.70 -- Cargo outdated 0.13.0 +- Cargo outdated 0.13.1 - Cbindgen 0.24.5 - Rustfmt 1.5.2 @@ -170,10 +169,10 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Google Chrome 114.0.5735.133 - ChromeDriver 114.0.5735.90 - Chromium 114.0.5733.0 -- Microsoft Edge 114.0.1823.55 -- Microsoft Edge WebDriver 114.0.1823.51 +- Microsoft Edge 114.0.1823.58 +- Microsoft Edge WebDriver 114.0.1823.58 - Selenium server 4.10.0 -- Mozilla Firefox 114.0.1 +- Mozilla Firefox 114.0.2 - Geckodriver 0.33.0 #### Environment variables @@ -185,7 +184,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | ### .NET Tools -- .NET Core SDK: 3.1.120, 3.1.202, 3.1.302, 3.1.426, 6.0.410, 7.0.107, 7.0.203, 7.0.304 +- .NET Core SDK: 3.1.120, 3.1.202, 3.1.302, 3.1.426, 6.0.411, 7.0.108, 7.0.203, 7.0.305 - nbgv 3.6.133+2d32d93cb1 ### Databases @@ -222,8 +221,8 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Node.js - 14.21.3 -- 16.20.0 -- 18.16.0 +- 16.20.1 +- 18.16.1 #### Python - 3.6.15 @@ -307,10 +306,10 @@ Use the following command as a part of your job to start the service: 'sudo syst | moby/buildkit:latest | sha256:d6fa89830c26919acba23c5cafa09df0c3ec1fbde20bb2a15ff349e0795241f4 | 2023-04-20 | | node:14 | sha256:a158d3b9b4e3fa813fa6c8c590b8f0a860e015ad4e59bbce5744d2f6fd8461aa | 2023-04-12 | | node:14-alpine | sha256:434215b487a329c9e867202ff89e704d3a75e554822e07f3e0c0f9e606121b33 | 2023-03-29 | -| node:16 | sha256:07ac708c46cc7136db9d54749c541ba1dc516dc316e126a94136083b842c2db9 | 2023-06-13 | -| node:16-alpine | sha256:296f32946d2fb5227e43fa51e608bbb11a208d648a833e9b264934fb0c7f404b | 2023-06-15 | -| node:18 | sha256:4a55308cc855cba1a925d19ae4e45838741dad2fd7bb8949a93b2a0f2ae339e3 | 2023-06-13 | -| node:18-alpine | sha256:9036ddb8252ba7089c2c83eb2b0dcaf74ff1069e8ddf86fe2bd6dc5fecc9492d | 2023-06-15 | +| node:16 | sha256:fddc8c24ce0bce462d5050667a80a3681c9c6f9d645c151d5a85e968b21e167a | 2023-06-21 | +| node:16-alpine | sha256:6c381d5dc2a11dcdb693f0301e8587e43f440c90cdb8933eaaaabb905d44cdb9 | 2023-06-21 | +| node:18 | sha256:19892542dd80e33aec50a51619ab36db0921de240c6a4ff6024d801f84881293 | 2023-06-21 | +| node:18-alpine | sha256:d5b2a7869a4016b1847986ea52098fa404421e44281bb7615a9e3615e07f37fb | 2023-06-21 | | ubuntu:16.04 | sha256:1f1a2d56de1d604801a9671f301190704c25d604a416f59e03c04f5c6ffee0d6 | 2021-08-31 | | ubuntu:18.04 | sha256:152dc042452c496007f07ca9127571cb9c29697f42acbfad72324b2bb2e43c98 | 2023-05-30 | | ubuntu:20.04 | sha256:f8f658407c35733471596f25fdb4ed748b80e545ab57e84efbdb1dbbb01bd70e | 2023-06-05 | @@ -327,7 +326,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | brotli | 1.0.7-6ubuntu0.1 | | coreutils | 8.30-3ubuntu2 | | dbus | 1.12.16-2ubuntu2.3 | -| dnsutils | 1:9.16.1-0ubuntu2.14 | +| dnsutils | 1:9.16.1-0ubuntu2.15 | | dpkg | 1.19.7ubuntu3.2 | | dpkg-dev | 1.19.7ubuntu3.2 | | fakeroot | 1.24-1 | From bd6b3eaafbf6e04d169f71890f5640da343c94bc Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 29 Jun 2023 09:08:35 +0000 Subject: [PATCH 1993/3485] Updating readme file for ubuntu22 version 20230625.1.1 (#7786) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2204-Readme.md | 57 +++++++++++++++---------------- 1 file changed, 28 insertions(+), 29 deletions(-) diff --git a/images/linux/Ubuntu2204-Readme.md b/images/linux/Ubuntu2204-Readme.md index f81786e986b4..ee5bc70b6dfd 100644 --- a/images/linux/Ubuntu2204-Readme.md +++ b/images/linux/Ubuntu2204-Readme.md @@ -1,12 +1,11 @@ | Announcements | |-| | [[All OSs] .NET 3.1 will be removed from the images on July, 3](https://github.com/actions/runner-images/issues/7667) | -| [Actions runner image scheduled maintenance (June 2 2023 through June 16 2023)](https://github.com/actions/runner-images/issues/7660) | *** # Ubuntu 22.04 - OS Version: 22.04.2 LTS - Kernel Version: 5.15.0-1040-azure -- Image Version: 20230619.1.0 +- Image Version: 20230625.1.0 - Systemd version: 249.11-0ubuntu3.9 ## Installed Software @@ -23,7 +22,7 @@ - Kotlin 1.8.22-release-407 - Mono 6.12.0.182 - MSBuild 16.10.1.31701 (Mono 6.12.0.182) -- Node.js 18.16.0 +- Node.js 18.16.1 - Perl 5.34.0 - Python 3.10.6 - Python3 3.10.6 @@ -41,7 +40,7 @@ - Pip3 22.0.2 - Pipx 1.2.0 - RubyGems 3.3.5 -- Vcpkg (build from commit 223b8d569) +- Vcpkg (build from commit 288e8bebf) - Yarn 1.22.19 #### Environment variables @@ -63,7 +62,7 @@ to accomplish this. - Maven 3.8.8 ### Tools -- Ansible 2.15.0 +- Ansible 2.15.1 - apt-fast 1.9.12 - AzCopy 10.19.0 - available by `azcopy` and `azcopy10` aliases - Bazel 6.2.1 @@ -71,10 +70,10 @@ to accomplish this. - Bicep 0.18.4 - Buildah 1.23.1 - CMake 3.26.4 -- CodeQL Action Bundles 2.13.1 2.13.3 +- CodeQL Action Bundles 2.13.3 2.13.4 - Docker Amazon ECR Credential Helper 0.7.1 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.18.1+azure-2 +- Docker Compose v2 2.19.0+azure-1 - Docker-Buildx 0.11.0 - Docker-Moby Client 20.10.25+azure-2 - Docker-Moby Server 20.10.25+azure-2 @@ -83,7 +82,7 @@ to accomplish this. - Git LFS 3.3.0 - Git-ftp 1.6.0 - Haveged 1.9.14 -- Heroku 8.1.8 +- Heroku 8.1.9 - jq 1.6 - Kind 0.20.0 - Kubectl 1.27.3 @@ -97,32 +96,32 @@ to accomplish this. - nvm 0.39.3 - OpenSSL 3.0.2-0ubuntu1.10 - Packer 1.9.1 -- Parcel 2.9.2 +- Parcel 2.9.3 - Podman 3.4.4 -- Pulumi 3.72.2 +- Pulumi 3.73.0 - R 4.3.0 - Skopeo 1.4.1 - Sphinx Open Source Search Server 2.2.11 - SVN 1.14.1 -- Terraform 1.5.0 +- Terraform 1.5.1 - yamllint 1.32.0 - yq 4.34.1 - zstd 1.5.5 ### CLI Tools - Alibaba Cloud CLI 3.0.167 -- AWS CLI 2.12.1 +- AWS CLI 2.12.3 - AWS CLI Session Manager Plugin 1.2.463.0 -- AWS SAM CLI 1.86.1 +- AWS SAM CLI 1.88.0 - Azure CLI 2.49.0 - Azure CLI (azure-devops) 0.26.0 -- GitHub CLI 2.30.0 -- Google Cloud SDK 435.0.1 +- GitHub CLI 2.31.0 +- Google Cloud SDK 436.0.0 - Hub CLI 2.14.2 - Netlify CLI 15.6.0 -- OpenShift CLI 4.13.3 +- OpenShift CLI 4.13.4 - ORAS CLI 1.0.0 -- Vercel CLI 30.2.2 +- Vercel CLI 30.2.3 ### Java | Version | Vendor | Environment Variable | @@ -155,7 +154,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Bindgen 0.66.1 - Cargo audit 0.17.6 - Cargo clippy 0.1.70 -- Cargo outdated 0.13.0 +- Cargo outdated 0.13.1 - Cbindgen 0.24.5 - Rustfmt 1.5.2 @@ -163,10 +162,10 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Google Chrome 114.0.5735.133 - ChromeDriver 114.0.5735.90 - Chromium 114.0.5733.0 -- Microsoft Edge 114.0.1823.55 -- Microsoft Edge WebDriver 114.0.1823.51 +- Microsoft Edge 114.0.1823.58 +- Microsoft Edge WebDriver 114.0.1823.58 - Selenium server 4.10.0 -- Mozilla Firefox 114.0.1 +- Mozilla Firefox 114.0.2 - Geckodriver 0.33.0 #### Environment variables @@ -178,7 +177,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | ### .NET Tools -- .NET Core SDK: 6.0.410, 7.0.107, 7.0.203, 7.0.304 +- .NET Core SDK: 6.0.411, 7.0.108, 7.0.203, 7.0.305 - nbgv 3.6.133+2d32d93cb1 ### Databases @@ -214,8 +213,8 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Node.js - 14.21.3 -- 16.20.0 -- 18.16.0 +- 16.20.1 +- 18.16.1 #### Python - 3.7.17 @@ -288,10 +287,10 @@ Use the following command as a part of your job to start the service: 'sudo syst | moby/buildkit:latest | sha256:d6fa89830c26919acba23c5cafa09df0c3ec1fbde20bb2a15ff349e0795241f4 | 2023-04-20 | | node:14 | sha256:a158d3b9b4e3fa813fa6c8c590b8f0a860e015ad4e59bbce5744d2f6fd8461aa | 2023-04-12 | | node:14-alpine | sha256:434215b487a329c9e867202ff89e704d3a75e554822e07f3e0c0f9e606121b33 | 2023-03-29 | -| node:16 | sha256:07ac708c46cc7136db9d54749c541ba1dc516dc316e126a94136083b842c2db9 | 2023-06-13 | -| node:16-alpine | sha256:296f32946d2fb5227e43fa51e608bbb11a208d648a833e9b264934fb0c7f404b | 2023-06-15 | -| node:18 | sha256:4a55308cc855cba1a925d19ae4e45838741dad2fd7bb8949a93b2a0f2ae339e3 | 2023-06-13 | -| node:18-alpine | sha256:9036ddb8252ba7089c2c83eb2b0dcaf74ff1069e8ddf86fe2bd6dc5fecc9492d | 2023-06-15 | +| node:16 | sha256:fddc8c24ce0bce462d5050667a80a3681c9c6f9d645c151d5a85e968b21e167a | 2023-06-21 | +| node:16-alpine | sha256:6c381d5dc2a11dcdb693f0301e8587e43f440c90cdb8933eaaaabb905d44cdb9 | 2023-06-21 | +| node:18 | sha256:19892542dd80e33aec50a51619ab36db0921de240c6a4ff6024d801f84881293 | 2023-06-21 | +| node:18-alpine | sha256:d5b2a7869a4016b1847986ea52098fa404421e44281bb7615a9e3615e07f37fb | 2023-06-21 | | ubuntu:18.04 | sha256:152dc042452c496007f07ca9127571cb9c29697f42acbfad72324b2bb2e43c98 | 2023-05-30 | | ubuntu:20.04 | sha256:f8f658407c35733471596f25fdb4ed748b80e545ab57e84efbdb1dbbb01bd70e | 2023-06-05 | | ubuntu:22.04 | sha256:6120be6a2b7ce665d0cbddc3ce6eae60fe94637c6a66985312d1f02f63cc0bcd | 2023-06-05 | @@ -308,7 +307,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | brotli | 1.0.9-2build6 | | coreutils | 8.32-4.1ubuntu1 | | dbus | 1.12.20-2ubuntu4.1 | -| dnsutils | 1:9.18.12-0ubuntu0.22.04.1 | +| dnsutils | 1:9.18.12-0ubuntu0.22.04.2 | | dpkg | 1.21.1ubuntu2.2 | | dpkg-dev | 1.21.1ubuntu2.2 | | fakeroot | 1.28-1ubuntu1 | From dcf2bd287074254863131d7c5e58f6c591a7247e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 29 Jun 2023 12:57:07 +0000 Subject: [PATCH 1994/3485] Windows Server 2022 (20230625) Image Update (#7798) * Updating readme file for win22 version 20230625.1.1 * Update Windows2022-Readme.md --------- Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2022-Readme.md | 63 ++++++++++++++++++++------------ 1 file changed, 40 insertions(+), 23 deletions(-) diff --git a/images/win/Windows2022-Readme.md b/images/win/Windows2022-Readme.md index 433ce7a8d545..148724ea3468 100644 --- a/images/win/Windows2022-Readme.md +++ b/images/win/Windows2022-Readme.md @@ -1,11 +1,10 @@ | Announcements | |-| | [[All OSs] .NET 3.1 will be removed from the images on July, 3](https://github.com/actions/runner-images/issues/7667) | -| [Actions runner image scheduled maintenance (June 2 2023 through June 16 2023)](https://github.com/actions/runner-images/issues/7660) | *** # Windows Server 2022 - OS Version: 10.0.20348 Build 1787 -- Image Version: 20230620.1.0 +- Image Version: 20230625.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -34,7 +33,7 @@ - pip 23.1.2 (python 3.9) - Pipx 1.2.0 - RubyGems 3.2.33 -- Vcpkg (build from commit f6a5d4e8e) +- Vcpkg (build from commit 288e8bebf) - Yarn 1.22.19 #### Environment variables @@ -50,7 +49,7 @@ - sbt 1.9.0 ### Tools -- 7zip 22.01 +- 7zip 23.01 - aria2 1.36.0 - azcopy 10.19.0 - Bazel 6.2.1 @@ -58,10 +57,10 @@ - Bicep 0.18.4 - Cabal 3.10.1.0 - CMake 3.26.4 -- CodeQL Action Bundles 2.13.1 2.13.3 +- CodeQL Action Bundles 2.13.3 2.13.4 - Docker 24.0.2 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.18.1 +- Docker Compose v2 2.19.0 - Docker-wincred 0.7.0 - ghc 9.6.2 - Git 2.41.0.windows.1 @@ -77,7 +76,7 @@ - NSIS 3.08 - OpenSSL 1.1.1u - Packer 1.9.1 -- Pulumi 3.72.2 +- Pulumi 3.73.0 - R 4.3.1 - Service Fabric SDK 9.1.1436.9590 - Stack 2.11.1 @@ -91,8 +90,8 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.167 -- AWS CLI 2.12.1 -- AWS SAM CLI 1.87.0 +- AWS CLI 2.12.3 +- AWS SAM CLI 1.88.0 - AWS Session Manager CLI 1.2.463.0 - Azure CLI 2.49.0 - Azure DevOps CLI extension 0.26.0 @@ -116,8 +115,8 @@ ### Browsers and Drivers - Google Chrome 114.0.5735.134 - Chrome Driver 114.0.5735.90 -- Microsoft Edge 114.0.1823.51 -- Microsoft Edge Driver 114.0.1823.55 +- Microsoft Edge 114.0.1823.58 +- Microsoft Edge Driver 114.0.1823.58 - Mozilla Firefox 114.0.2 - Gecko Driver 0.33.0 - IE Driver 4.10.0.0 @@ -164,8 +163,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Node.js - 14.21.3 -- 16.20.0 -- 18.16.0 +- 16.20.1 +- 18.16.1 #### Python - 3.7.9 @@ -381,6 +380,24 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.Spectre | 17.6.33605.316 | | Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64 | 17.6.33605.316 | | Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64.Spectre | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.35.17.5.ARM | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.35.17.5.ARM.Spectre | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.35.17.5.ARM64 | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.35.17.5.ARM64.Spectre | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.35.17.5.ATL | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.35.17.5.ATL.ARM | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.35.17.5.ATL.ARM.Spectre | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.35.17.5.ATL.ARM64 | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.35.17.5.ATL.ARM64.Spectre | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.35.17.5.ATL.Spectre | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.35.17.5.MFC | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.35.17.5.MFC.ARM | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.35.17.5.MFC.ARM.Spectre | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.35.17.5.MFC.ARM64 | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.35.17.5.MFC.ARM64.Spectre | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.35.17.5.MFC.Spectre | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.35.17.5.x86.x64 | 17.6.33605.316 | +| Microsoft.VisualStudio.Component.VC.14.35.17.5.x86.x64.Spectre | 17.6.33605.316 | | Microsoft.VisualStudio.Component.VC.14.36.17.6.ARM | 17.6.33605.316 | | Microsoft.VisualStudio.Component.VC.14.36.17.6.ARM.Spectre | 17.6.33605.316 | | Microsoft.VisualStudio.Component.VC.14.36.17.6.ARM64 | 17.6.33605.316 | @@ -529,11 +546,11 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 10.0.22621.0 ### .NET Core Tools -- .NET Core SDK: 3.1.120, 3.1.202, 3.1.302, 3.1.426, 6.0.118, 6.0.203, 6.0.313, 6.0.410, 7.0.304 +- .NET Core SDK: 3.1.120, 3.1.202, 3.1.302, 3.1.426, 6.0.119, 6.0.203, 6.0.314, 6.0.411, 7.0.304 - .NET Framework: 4.8, 4.8.1 -- Microsoft.AspNetCore.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 6.0.5, 6.0.18, 7.0.7 -- Microsoft.NETCore.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 6.0.5, 6.0.18, 7.0.7 -- Microsoft.WindowsDesktop.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 6.0.5, 6.0.18, 7.0.7 +- Microsoft.AspNetCore.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 6.0.5, 6.0.18, 6.0.19, 7.0.7 +- Microsoft.NETCore.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 6.0.5, 6.0.18, 6.0.19, 7.0.7 +- Microsoft.WindowsDesktop.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 6.0.5, 6.0.18, 6.0.19, 7.0.7 - nbgv 3.6.133+2d32d93cb1 ### PowerShell Tools @@ -546,7 +563,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Az (Cached): 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.355 +- AWSPowershell: 4.1.359 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 - Microsoft.Graph: 1.28.0 @@ -590,9 +607,9 @@ All other versions are saved but not installed. ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2022 | sha256:a23d696a3fa02f481768af1abcab54057c5442b57a0e3ac54933aff3b9319d92 | 2023-06-13 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2022 | sha256:101d49c1c328b47aebbd45c05c33286aaa5db2930cf5089e62f23ba8dd21e363 | 2023-06-13 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:1c040db3ce19fecc2c1ddac3f44f0b9d593c45e2e18a4cd13111bd675d915ea0 | 2023-06-13 | -| mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:cde6d90e1f745f1eba0ab4669e2c57bd773a4216e04416a26f8a55a31509b752 | 2023-06-08 | -| mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:6f792e5bc39b7bc96ef4048a8f17d425b106941e71d550e6f9ba3a37043a161a | 2023-06-08 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2022 | sha256:7c75a9896911634a3d63c5f38096e54f94958ac4c5b31d79bed311cae8d2169c | 2023-06-23 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2022 | sha256:d426990d3e3b03dbc3b03e1eeafbf3bddc5da7d1a091e0d15f6bfa1e6057feee | 2023-06-23 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:bf06038f0298f5444b6fb4f10708fa42acb33bbb5ea4581d634983746609e262 | 2023-06-23 | +| mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:c1426561e854da32f5e8bed3ce41e9eb5c8cb693b5d992323bcc47ed48acd99c | 2023-06-21 | +| mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:bc3ec9f19112d40ff23f14a806afd7de7c28ce8a4b69ae1e7e7725bbdeba8964 | 2023-06-21 | From 527823bc50f69443798014771c57ce02eb69e999 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 29 Jun 2023 13:03:54 +0000 Subject: [PATCH 1995/3485] Windows Server 2019 (20230625) Image Update (#7799) * Updating readme file for win19 version 20230625.1.1 * Update Windows2019-Readme.md --------- Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2019-Readme.md | 49 ++++++++++++++++---------------- 1 file changed, 24 insertions(+), 25 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index 07d367209ad9..9f297b238f9e 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -1,11 +1,10 @@ | Announcements | |-| | [[All OSs] .NET 3.1 will be removed from the images on July, 3](https://github.com/actions/runner-images/issues/7667) | -| [Actions runner image scheduled maintenance (June 2 2023 through June 16 2023)](https://github.com/actions/runner-images/issues/7660) | *** # Windows Server 2019 - OS Version: 10.0.17763 Build 4499 -- Image Version: 20230620.1.0 +- Image Version: 20230625.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -34,7 +33,7 @@ - pip 23.1.2 (python 3.7) - Pipx 1.2.0 - RubyGems 2.7.6.3 -- Vcpkg (build from commit f6a5d4e8e) +- Vcpkg (build from commit 288e8bebf) - Yarn 1.22.19 #### Environment variables @@ -50,7 +49,7 @@ - sbt 1.9.0 ### Tools -- 7zip 22.01 +- 7zip 23.01 - aria2 1.36.0 - azcopy 10.19.0 - Bazel 6.2.1 @@ -58,15 +57,15 @@ - Bicep 0.18.4 - Cabal 3.10.1.0 - CMake 3.26.4 -- CodeQL Action Bundles 2.13.1 2.13.3 +- CodeQL Action Bundles 2.13.3 2.13.4 - Docker 24.0.2 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.18.1 +- Docker Compose v2 2.19.0 - Docker-wincred 0.7.0 - ghc 9.6.2 - Git 2.41.0.windows.1 - Git LFS 3.3.0 -- Google Cloud SDK 435.0.1 +- Google Cloud SDK 436.0.0 - ImageMagick 7.1.1-11 - InnoSetup 6.2.2 - jq 1.6 @@ -78,8 +77,8 @@ - NSIS 3.08 - OpenSSL 1.1.1u - Packer 1.9.1 -- Parcel 2.9.2 -- Pulumi 3.72.2 +- Parcel 2.9.3 +- Pulumi 3.73.0 - R 4.3.1 - Service Fabric SDK 9.1.1436.9590 - Stack 2.11.1 @@ -93,8 +92,8 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.167 -- AWS CLI 2.12.1 -- AWS SAM CLI 1.87.0 +- AWS CLI 2.12.3 +- AWS SAM CLI 1.88.0 - AWS Session Manager CLI 1.2.463.0 - Azure CLI 2.49.0 - Azure DevOps CLI extension 0.26.0 @@ -119,8 +118,8 @@ ### Browsers and Drivers - Google Chrome 114.0.5735.134 - Chrome Driver 114.0.5735.90 -- Microsoft Edge 114.0.1823.55 -- Microsoft Edge Driver 114.0.1823.55 +- Microsoft Edge 114.0.1823.58 +- Microsoft Edge Driver 114.0.1823.58 - Mozilla Firefox 114.0.2 - Gecko Driver 0.33.0 - IE Driver 4.10.0.0 @@ -171,8 +170,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Node.js - 14.21.3 -- 16.20.0 -- 18.16.0 +- 16.20.1 +- 18.16.1 #### Python - 3.6.8 @@ -495,11 +494,11 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 10.0.22621.0 ### .NET Core Tools -- .NET Core SDK: 3.1.120, 3.1.202, 3.1.302, 3.1.426, 6.0.118, 6.0.203, 6.0.313, 6.0.410 +- .NET Core SDK: 3.1.120, 3.1.202, 3.1.302, 3.1.426, 6.0.119, 6.0.203, 6.0.314, 6.0.411 - .NET Framework: 4.7.2, 4.8 -- Microsoft.AspNetCore.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 6.0.5, 6.0.18 -- Microsoft.NETCore.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 6.0.5, 6.0.18 -- Microsoft.WindowsDesktop.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 6.0.5, 6.0.18 +- Microsoft.AspNetCore.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 6.0.5, 6.0.19 +- Microsoft.NETCore.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 6.0.5, 6.0.19 +- Microsoft.WindowsDesktop.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 6.0.5, 6.0.19 - nbgv 3.6.133+2d32d93cb1 ### PowerShell Tools @@ -512,7 +511,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Az (Cached): 1.0.0.zip, 1.6.0.zip, 2.3.2.zip, 2.6.0.zip, 3.1.0.zip, 3.5.0.zip, 3.8.0.zip, 4.3.0.zip, 4.4.0.zip, 4.7.0.zip, 5.5.0.zip, 5.9.0.zip, 6.6.0.zip, 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.355 +- AWSPowershell: 4.1.359 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 - Microsoft.Graph: 1.28.0 @@ -557,9 +556,9 @@ All other versions are saved but not installed. ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:fb6293d0c7618d01d0ea827668ff01d91464616e8f6ac91da886a231b1cfb816 | 2023-06-13 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:b6e98a2e7cb7fd70ede47790d2e36e5132c5bb6339ab8ddfbf7fe30515883f1b | 2023-06-13 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:9026d56e290d7f794153afc31e1d3d3481a735e8fbcf639adb9eb134766ef8f9 | 2023-06-13 | -| mcr.microsoft.com/windows/nanoserver:1809 | sha256:7b080e83b75a078efd2c9fef7bdb9735355ceb4f01bc4cbbfa86bf1692df5d30 | 2023-06-08 | -| mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:1130a3b7afb9b8f52b1ff99539b665e8e524a5d66829f480688fa14ee0370ef9 | 2023-06-08 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:1c8e6d213d957497d12eb3ea2e462c64ba6b8ae88cc6c828bd5a0a9494274858 | 2023-06-23 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:49aad131a4250da60e604cdeaac75c7b39fdb7665cfe5d7f45ac288e5e6861b1 | 2023-06-23 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:7f3424f6c04d174c4e6c5e96f437b00e42ed5af958a73ea915d96ccf4d26c89e | 2023-06-23 | +| mcr.microsoft.com/windows/nanoserver:1809 | sha256:81ab2c2f7ac2edf154915667f33ef9e2e77fdbe092c7cc562fff1fcf1762de22 | 2023-06-21 | +| mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:341ab68cf115626b5181a9621c2054f71ea6637d05f9d312c2b45a4204c0b94d | 2023-06-21 | From aab84abc029015d4482e956a7e8cc1b0c1d2754d Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Thu, 29 Jun 2023 15:50:45 +0200 Subject: [PATCH 1996/3485] [Ubuntu] do not check ssl cert for hhvm (#7817) --- images/linux/scripts/installers/hhvm.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/images/linux/scripts/installers/hhvm.sh b/images/linux/scripts/installers/hhvm.sh index 988233102e4d..9ddbf3ef7c15 100644 --- a/images/linux/scripts/installers/hhvm.sh +++ b/images/linux/scripts/installers/hhvm.sh @@ -6,7 +6,9 @@ apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xB4112585D386EB94 add-apt-repository https://dl.hhvm.com/ubuntu +echo 'Acquire::https::dl.hhvm.com::Verify-Peer "false";' > /etc/apt/apt.conf.d/99hhvm-cert apt-get update apt-get -qq install -y hhvm +rm /etc/apt/apt.conf.d/99hhvm-cert invoke_tests "Tools" "HHVM" From cdac016c21809b21a02e3d5d720e915b45863f50 Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Thu, 29 Jun 2023 16:46:25 +0200 Subject: [PATCH 1997/3485] [Windows] Remove .Net 3.1 as its EOL (#7813) --- images/win/toolsets/toolset-2019.json | 1 - images/win/toolsets/toolset-2022.json | 1 - 2 files changed, 2 deletions(-) diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index fddb93f92d4c..fb2fe8597a97 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -434,7 +434,6 @@ }, "dotnet": { "versions": [ - "3.1", "6.0" ], "tools": [ diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index 2f88e3ccfc4c..fe2071659928 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -366,7 +366,6 @@ }, "dotnet": { "versions": [ - "3.1", "6.0" ], "tools": [ From 8f4a6df4b20520ef1bd95a33169edbc700508d45 Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Thu, 29 Jun 2023 18:40:46 +0200 Subject: [PATCH 1998/3485] [Ubuntu] Remove .Net 3.1 as its EOL (#7812) --- images/linux/toolsets/toolset-2004.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index 83d72f68d514..a4b94e3cc7aa 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -263,12 +263,10 @@ ], "dotnet": { "aptPackages": [ - "dotnet-sdk-3.1", "dotnet-sdk-6.0", "dotnet-sdk-7.0" ], "versions": [ - "3.1", "6.0", "7.0" ], From 0a6e640250d4b1406160dabadcf2f832e0ec6393 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 29 Jun 2023 20:01:49 +0200 Subject: [PATCH 1999/3485] Updating readme file for macOS-12 version 20230623.2 (#7787) Co-authored-by: Image generation service account <no-reply@microsoft.com> --- images/macos/macos-12-Readme.md | 52 ++++++++++++++++----------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/images/macos/macos-12-Readme.md b/images/macos/macos-12-Readme.md index a736136147bc..5e10ce11b25f 100644 --- a/images/macos/macos-12-Readme.md +++ b/images/macos/macos-12-Readme.md @@ -1,17 +1,16 @@ | Announcements | |-| | [[All OSs] .NET 3.1 will be removed from the images on July, 3](https://github.com/actions/runner-images/issues/7667) | -| [Actions runner image scheduled maintenance (June 2 2023 through June 16 2023)](https://github.com/actions/runner-images/issues/7660) | *** # macOS 12 -- OS Version: macOS 12.6.6 (21G646) +- OS Version: macOS 12.6.7 (21G651) - Kernel Version: Darwin 21.6.0 -- Image Version: 20230618.1 +- Image Version: 20230623.2 ## Installed Software ### Language and Runtime -- .NET Core SDK: 3.1.101, 3.1.201, 3.1.302, 3.1.426, 6.0.410, 7.0.102, 7.0.202, 7.0.304 +- .NET Core SDK: 3.1.101, 3.1.201, 3.1.302, 3.1.426, 6.0.411, 7.0.102, 7.0.202, 7.0.305 - Bash 3.2.57(1)-release - Clang/LLVM 14.0.0 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` @@ -24,9 +23,9 @@ - Go 1.20.5 - Mono 6.12.0.188 - MSBuild 16.10.1.51301 (Mono 6.12.0.188) -- Node.js 18.16.0 +- Node.js 18.16.1 - NVM 0.39.3 -- NVM - Cached node versions: 14.21.3, 16.20.0, 18.16.0 +- NVM - Cached node versions: 14.21.3, 16.20.1, 18.16.1 - Perl 5.36.1 - PHP 8.2.7 - Python 2.7.18 @@ -39,7 +38,7 @@ - Carthage 0.39.0 - CocoaPods 1.12.1 - Composer 2.5.8 -- Homebrew 4.0.23 +- Homebrew 4.0.24 - Miniconda 23.3.1 - NPM 9.5.1 - NuGet 6.3.1.1 @@ -47,7 +46,7 @@ - Pip3 23.1.2 (python 3.11) - Pipx 1.2.0 - RubyGems 3.4.14 -- Vcpkg 2023 (build from commit 80ecf3249) +- Vcpkg 2023 (build from commit 1286cac87) - Yarn 1.22.19 #### Environment variables @@ -72,7 +71,7 @@ - Curl 8.1.2 - Git 2.41.0 - Git LFS 3.3.0 -- GitHub CLI 2.30.0 +- GitHub CLI 2.31.0 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.4 - gpg (GnuPG) 2.4.2 @@ -83,6 +82,7 @@ - mongod 5.0.17 - OpenSSL 1.1.1u 30 May 2023 - Packer 1.9.1 +- pkg-config 0.29.2 - PostgreSQL 14.8 (Homebrew) - psql (PostgreSQL) 14.8 (Homebrew) - Sox 14.4.2 @@ -95,15 +95,15 @@ ### Tools - App Center CLI 2.13.8 -- AWS CLI 2.12.1 -- AWS SAM CLI 1.86.1 +- AWS CLI 2.12.2 +- AWS SAM CLI 1.88.0 - AWS Session Manager CLI 1.2.463.0 - Azure CLI 2.49.0 - Azure CLI (azure-devops) 0.26.0 - Bicep CLI 0.18.4 - Cabal 3.6.2.0 - Cmake 3.26.4 -- CodeQL Action Bundles 2.13.1 2.13.3 +- CodeQL Action Bundles 2.13.3 2.13.4 - Colima 0.5.5 - Fastlane 2.213.0 - GHC 9.6.2 @@ -115,17 +115,17 @@ - Xcode Command Line Tools 14.2.0.0.1.1668646533 ### Linters -- SwiftLint 0.52.2 +- SwiftLint 0.52.3 - Yamllint 1.32.0 ### Browsers -- Safari 16.5 (17615.2.9.11.6) -- SafariDriver 16.5 (17615.2.9.11.6) +- Safari 16.5.1 (17615.2.9.11.7) +- SafariDriver 16.5.1 (17615.2.9.11.7) - Google Chrome 114.0.5735.133 - ChromeDriver 114.0.5735.90 -- Microsoft Edge 114.0.1823.51 -- Microsoft Edge WebDriver 114.0.1823.51 -- Mozilla Firefox 114.0.1 +- Microsoft Edge 114.0.1823.58 +- Microsoft Edge WebDriver 114.0.1823.58 +- Mozilla Firefox 114.0.2 - geckodriver 0.33.0 - Selenium server 4.10.0 @@ -165,8 +165,8 @@ #### Node.js - 14.21.3 -- 16.20.0 -- 18.16.0 +- 16.20.1 +- 18.16.1 #### Go - 1.18.10 @@ -180,9 +180,9 @@ - Rustup 1.26.0 #### Packages -- Bindgen 0.66.0 +- Bindgen 0.66.1 - Cargo-audit 0.17.6 -- Cargo-outdated 0.12.0 +- Cargo-outdated 0.13.1 - Cbindgen 0.24.5 - Clippy 0.1.70 - Rustfmt 1.5.2-stable @@ -205,10 +205,10 @@ ### Xamarin #### Visual Studio for Mac -| Version | Build | Path | -| -------------- | --------- | ------------------------------------ | -| 2019 | 8.10.25.2 | /Applications/Visual Studio 2019.app | -| 2022 (default) | 17.5.7.6 | /Applications/Visual Studio.app | +| Version | Build | Path | +| -------------- | ----------- | ------------------------------------ | +| 2019 | 8.10.25.2 | /Applications/Visual Studio 2019.app | +| 2022 (default) | 17.6.0.1575 | /Applications/Visual Studio.app | ##### Notes ``` From 470ea9355ee0816a5201c96bec15af7fb1e95c8a Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Fri, 30 Jun 2023 12:17:03 +0200 Subject: [PATCH 2000/3485] [macOS] Remove .Net 3.1 as its EOL (#7811) --- images/macos/toolsets/toolset-11.json | 1 - images/macos/toolsets/toolset-12.json | 1 - 2 files changed, 2 deletions(-) diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index d01248ff7410..595c2089a71c 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -312,7 +312,6 @@ "arch":{ "x64": { "versions": [ - "3.1", "6.0", "7.0" ] diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index 9abbcfd8c65b..e319b95df2fa 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -295,7 +295,6 @@ "arch":{ "x64": { "versions": [ - "3.1", "6.0", "7.0" ] From 508ad6524a5eea54bd22e4bbb21da67f4ff66147 Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Fri, 30 Jun 2023 12:23:01 +0200 Subject: [PATCH 2001/3485] Add CI job to remove skipped CI runs (#7736) --- .github/workflows/ci-cleanup.yml | 55 ++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 .github/workflows/ci-cleanup.yml diff --git a/.github/workflows/ci-cleanup.yml b/.github/workflows/ci-cleanup.yml new file mode 100644 index 000000000000..f266b97f54e0 --- /dev/null +++ b/.github/workflows/ci-cleanup.yml @@ -0,0 +1,55 @@ +run-name: Cleanup ${{ github.head_ref }} +on: + pull_request_target: + types: labeled + paths: + - 'images/**' + +jobs: + clean_ci: + name: Clean CI runs + runs-on: ubuntu-latest + permissions: + actions: write + steps: + - env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + shell: pwsh + run: | + $startDate = Get-Date -UFormat %s + $workflows = @("macos11", "macos12", "ubuntu2004", "ubuntu2204", "windows2019", "windows2022") + + while ($true) { + $continue = $false + foreach ($wf in $workflows) { + $skippedCommand = "gh run list --workflow ${wf}.yml --branch ${{ github.event.pull_request.head.ref }} --repo ${{ github.repository }} --status skipped --json databaseId" + $skippedIds = Invoke-Expression -Command $skippedCommand | ConvertFrom-Json | ForEach-Object { $_.databaseId } + + $skippedIds | ForEach-Object { + $deleteCommand = "gh run delete --repo ${{ github.repository }} $_" + Invoke-Expression -Command $deleteCommand + } + + $pendingCommand = "gh run list --workflow ${wf}.yml --branch ${{ github.event.pull_request.head.ref }} --repo ${{ github.repository }} --status requested --json databaseId --template '{{ . | len }}'" + $pending = Invoke-Expression -Command $pendingCommand + + if ($pending -gt 0) { + Write-Host "Pending for ${wf}.yml: $pending run(s)" + $continue = $true + } + } + + if ($continue -eq $false) { + Write-Host "All done, exiting" + break + } + + $curDate = Get-Date -UFormat %s + if (($curDate - $startDate) -gt 60) { + Write-Host "Reached timeout, exiting" + break + } + + Write-Host "Waiting 5 seconds..." + Start-Sleep -Seconds 5 + } From 5ebe1af48916ef3c07e0e23902004b65603dbf4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Kie=C5=82kowicz?= <pkiekowicz@splunk.com> Date: Fri, 30 Jun 2023 13:58:12 +0200 Subject: [PATCH 2002/3485] [Ubuntu] Add alpine 3.18 docker image (#7810) --- images/linux/toolsets/toolset-2004.json | 1 + images/linux/toolsets/toolset-2204.json | 1 + 2 files changed, 2 insertions(+) diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index a4b94e3cc7aa..6cf62fdaab93 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -233,6 +233,7 @@ "alpine:3.15", "alpine:3.16", "alpine:3.17", + "alpine:3.18", "buildpack-deps:stretch", "buildpack-deps:buster", "buildpack-deps:bullseye", diff --git a/images/linux/toolsets/toolset-2204.json b/images/linux/toolsets/toolset-2204.json index 8d2e10dec589..3217f68e99dc 100644 --- a/images/linux/toolsets/toolset-2204.json +++ b/images/linux/toolsets/toolset-2204.json @@ -219,6 +219,7 @@ "alpine:3.15", "alpine:3.16", "alpine:3.17", + "alpine:3.18", "buildpack-deps:buster", "buildpack-deps:bullseye", "debian:10", From 9f98ea446189a947c8a13ac29ef7fb9003ba7821 Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Fri, 30 Jun 2023 17:14:01 +0200 Subject: [PATCH 2003/3485] Fix XCode simulators installation (#7769) --- images/macos/helpers/Xcode.Installer.psm1 | 6 +++--- images/macos/provision/core/xcode.ps1 | 6 ++++-- images/macos/tests/Xcode.Tests.ps1 | 4 ++++ 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/images/macos/helpers/Xcode.Installer.psm1 b/images/macos/helpers/Xcode.Installer.psm1 index 5f1812e75a86..e1b5bb6e1347 100644 --- a/images/macos/helpers/Xcode.Installer.psm1 +++ b/images/macos/helpers/Xcode.Installer.psm1 @@ -166,14 +166,14 @@ function Install-AdditionalSimulatorRuntimes { [string]$Version ) - if (-not $Version.StartsWith("14.")) { + if ($Version.Split(".")[0] -lt 14) { # Additional simulator runtimes are included by default for Xcode < 14 return } - Write-Host "Installing Simulator Runtimes for Xcode $($_.link) ..." + Write-Host "Installing Simulator Runtimes for Xcode $Version ..." $xcodebuildPath = Get-XcodeToolPath -Version $Version -ToolName "xcodebuild" - Invoke-ValidateCommand "$xcodebuildPath -downloadAllPlatforms" + Invoke-ValidateCommand "$xcodebuildPath -downloadAllPlatforms | xcpretty" } function Build-XcodeSymlinks { diff --git a/images/macos/provision/core/xcode.ps1 b/images/macos/provision/core/xcode.ps1 index 3c9b10363bc3..f05f9fc00eb8 100644 --- a/images/macos/provision/core/xcode.ps1 +++ b/images/macos/provision/core/xcode.ps1 @@ -36,11 +36,13 @@ $xcodeVersions | ForEach-Object -ThrottleLimit $threadCount -Parallel { Write-Host "Configuring Xcode versions..." $xcodeVersions | ForEach-Object { Write-Host "Configuring Xcode $($_.link) ..." - Invoke-XcodeRunFirstLaunch -Version $_.link - Install-AdditionalSimulatorRuntimes -Version $_.link } +$latestVersion = $xcodeVersions | Sort-Object -Property link -Descending | Select-Object -First 1 -ExpandProperty link +Write-Host "Installing simulators for version $latestVersion..." +Install-AdditionalSimulatorRuntimes -Version $latestVersion + Invoke-XcodeRunFirstLaunch -Version $defaultXcode Write-Host "Configuring Xcode symlinks..." diff --git a/images/macos/tests/Xcode.Tests.ps1 b/images/macos/tests/Xcode.Tests.ps1 index 9abec6586618..2d00a42a7c57 100644 --- a/images/macos/tests/Xcode.Tests.ps1 +++ b/images/macos/tests/Xcode.Tests.ps1 @@ -98,12 +98,16 @@ Describe "Xcode simulators" { It "No duplicates in devices" -TestCases $testCase { Switch-Xcode -Version $XcodeVersion [array]$devicesList = @(Get-XcodeDevicesList | Where-Object { $_ }) + Write-Host "Devices for $XcodeVersion" + Write-Host ($devicesList -join "`n") Validate-ArrayWithoutDuplicates $devicesList -Because "Found duplicate device simulators" } It "No duplicates in pairs" -TestCases $testCase { Switch-Xcode -Version $XcodeVersion [array]$pairsList = @(Get-XcodePairsList | Where-Object { $_ }) + Write-Host "Pairs for $XcodeVersion" + Write-Host ($pairsList -join "`n") Validate-ArrayWithoutDuplicates $pairsList -Because "Found duplicate pairs simulators" } } From a0745542adc20d925cdedb2436e03220c3b124b4 Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Tue, 4 Jul 2023 14:09:29 +0200 Subject: [PATCH 2004/3485] [Windows] Rm "-stable" part from rustfmt version (#7847) --- images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 index 929c215649a8..e059910be4e9 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 @@ -42,7 +42,7 @@ function Get-RustdocVersion { } function Get-RustfmtVersion { - rustfmt --version | Take-Part -Part 1 + rustfmt --version | Take-Part -Part 1 | Take-Part -Part 0 -Delimiter ('-') } function Get-RustClippyVersion { From 2f4b2192f3455cbc409cc86374ec013de857e1f2 Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <vpolikarpov-akvelon@github.com> Date: Tue, 4 Jul 2023 17:57:53 +0200 Subject: [PATCH 2005/3485] Don't try to copy test results Test results generation was removed here: https://github.com/actions/runner-images/pull/2261 --- images.CI/macos/azure-pipelines/image-generation.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/images.CI/macos/azure-pipelines/image-generation.yml b/images.CI/macos/azure-pipelines/image-generation.yml index 3b87e10a6397..e553b5e07dc3 100644 --- a/images.CI/macos/azure-pipelines/image-generation.yml +++ b/images.CI/macos/azure-pipelines/image-generation.yml @@ -101,12 +101,8 @@ jobs: PACKER_LOG_PATH: $(Agent.TempDirectory)/packer-log.txt - bash: | - echo "Copy image output files" - cp -R "images/image-output/software-report/." "$(Build.ArtifactStagingDirectory)/" - - echo "Copy test results" - cp -R "images/image-output/tests/." "$(Common.TestResultsDirectory)/" - ls $(Common.TestResultsDirectory) + echo "Copy software report files" + cp -vR "images/image-output/software-report/." "$(Build.ArtifactStagingDirectory)/" echo "Put VM name to 'VM_Done_Name' file" echo "$(VirtualMachineName)" > "$(Build.ArtifactStagingDirectory)/VM_Done_Name" From 406a7844ab068639618c1ceb715df5070f0d22be Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 6 Jul 2023 06:46:48 +0000 Subject: [PATCH 2006/3485] Updating readme file for ubuntu20 version 20230702.1.1 (#7841) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2004-Readme.md | 54 ++++++++++++++++--------------- 1 file changed, 28 insertions(+), 26 deletions(-) diff --git a/images/linux/Ubuntu2004-Readme.md b/images/linux/Ubuntu2004-Readme.md index f70c0466f75b..cf018ec6c581 100644 --- a/images/linux/Ubuntu2004-Readme.md +++ b/images/linux/Ubuntu2004-Readme.md @@ -1,11 +1,12 @@ | Announcements | |-| +| [[Ubuntu] Alpine 3.14 & 3.15 docker image will be removed on July, 17](https://github.com/actions/runner-images/issues/7824) | | [[All OSs] .NET 3.1 will be removed from the images on July, 3](https://github.com/actions/runner-images/issues/7667) | *** # Ubuntu 20.04 - OS Version: 20.04.6 LTS -- Kernel Version: 5.15.0-1040-azure -- Image Version: 20230623.1.0 +- Kernel Version: 5.15.0-1041-azure +- Image Version: 20230702.1.0 - Systemd version: 245.4-4ubuntu3.22 ## Installed Software @@ -34,15 +35,15 @@ ### Package Management - cpan 1.64 - Helm 3.12.1 -- Homebrew 4.0.24 +- Homebrew 4.0.26 - Miniconda 23.3.1 - Npm 9.5.1 -- NuGet 6.3.1.1 +- NuGet 6.6.1.2 - Pip 20.0.2 - Pip3 20.0.2 - Pipx 1.2.0 - RubyGems 3.1.2 -- Vcpkg (build from commit 288e8bebf) +- Vcpkg (build from commit 64adda19c) - Yarn 1.22.19 #### Environment variables @@ -61,10 +62,10 @@ to accomplish this. ### Project Management - Ant 1.10.7 -- Gradle 8.1.1 -- Lerna 7.0.2 +- Gradle 8.2 +- Lerna 7.1.1 - Maven 3.8.8 -- Sbt 1.9.0 +- Sbt 1.9.1 ### Tools - Ansible 2.13.10 @@ -102,33 +103,33 @@ to accomplish this. - nvm 0.39.3 - OpenSSL 1.1.1f-1ubuntu2.19 - Packer 1.9.1 -- Parcel 2.9.2 +- Parcel 2.9.3 - PhantomJS 2.1.1 2.1.1 - Podman 3.4.2 -- Pulumi 3.73.0 -- R 4.3.0 +- Pulumi 3.74.0 +- R 4.3.1 - Skopeo 1.5.0 - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 -- Terraform 1.5.1 +- Terraform 1.5.2 - yamllint 1.32.0 - yq 4.34.1 - zstd 1.5.5 ### CLI Tools - Alibaba Cloud CLI 3.0.167 -- AWS CLI 2.12.3 +- AWS CLI 2.12.6 - AWS CLI Session Manager Plugin 1.2.463.0 -- AWS SAM CLI 1.88.0 +- AWS SAM CLI 1.89.0 - Azure CLI 2.49.0 - Azure CLI (azure-devops) 0.26.0 - GitHub CLI 2.31.0 -- Google Cloud SDK 436.0.0 +- Google Cloud SDK 437.0.1 - Hub CLI 2.14.2 -- Netlify CLI 15.6.0 +- Netlify CLI 15.8.0 - OpenShift CLI 4.13.4 - ORAS CLI 1.0.0 -- Vercel CLI 30.2.3 +- Vercel CLI 31.0.1 ### Java | Version | Vendor | Environment Variable | @@ -148,7 +149,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ### Haskell Tools - Cabal 3.10.1.0 - GHC 9.6.2 -- GHCup 0.1.19.2 +- GHCup 0.1.19.4 - Stack 2.11.1 ### Rust Tools @@ -166,13 +167,13 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.5.2 ### Browsers and Drivers -- Google Chrome 114.0.5735.133 +- Google Chrome 114.0.5735.198 - ChromeDriver 114.0.5735.90 - Chromium 114.0.5733.0 -- Microsoft Edge 114.0.1823.58 -- Microsoft Edge WebDriver 114.0.1823.58 +- Microsoft Edge 114.0.1823.67 +- Microsoft Edge WebDriver 114.0.1823.67 - Selenium server 4.10.0 -- Mozilla Firefox 114.0.2 +- Mozilla Firefox 115.0 - Geckodriver 0.33.0 #### Environment variables @@ -184,7 +185,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | ### .NET Tools -- .NET Core SDK: 3.1.120, 3.1.202, 3.1.302, 3.1.426, 6.0.411, 7.0.108, 7.0.203, 7.0.305 +- .NET Core SDK: 6.0.411, 7.0.108, 7.0.203, 7.0.305 - nbgv 3.6.133+2d32d93cb1 ### Databases @@ -247,14 +248,14 @@ Use the following command as a part of your job to start the service: 'sudo syst - 3.1.4 ### PowerShell Tools -- PowerShell 7.2.11 +- PowerShell 7.2.12 #### PowerShell Modules - Az: 9.3.0 - Az (Cached): 3.1.0.zip, 4.4.0.zip, 5.9.0.zip, 6.6.0.zip, 7.5.0.zip - MarkdownPS: 1.9 - Microsoft.Graph: 1.28.0 -- Pester: 5.4.1 +- Pester: 5.5.0 - PSScriptAnalyzer: 1.21.0 ### Web Servers @@ -268,7 +269,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | Package Name | Version | | -------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 9.0 | -| Android Emulator | 32.1.13 | +| Android Emulator | 32.1.14 | | Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | | Android SDK Platform-Tools | 34.0.3 | | Android SDK Platforms | android-34 (rev 1)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | @@ -297,6 +298,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | alpine:3.15 | sha256:3362f865019db5f14ac5154cb0db2c3741ad1cce0416045be422ad4de441b081 | 2023-06-14 | | alpine:3.16 | sha256:cbe5d5973103a2d03408d1689a6efde4ea4920bde9f4b51fe7872e60ce2d8e56 | 2023-06-14 | | alpine:3.17 | sha256:e95676db9e4a4f16f6cc01a8915368f82b018cc07aba951c1bd1db586c081388 | 2023-06-14 | +| alpine:3.18 | sha256:82d1e9d7ed48a7523bdebc18cf6290bdb97b82302a8a9c27d4fe885949ea94d1 | 2023-06-14 | | buildpack-deps:bullseye | sha256:2987a7a81a0eb17086c6498afedb19002689587038fdef7f5880c2cca973bf13 | 2023-06-13 | | buildpack-deps:buster | sha256:0da9fe74d5f9bac9754a912b61cf81c62af1247ff3eed0b4f6df00da924f7f21 | 2023-06-13 | | buildpack-deps:stretch | sha256:78e995165a5788c2f55aed6e548d8f6c1534830d4310c870408fccb2da8c5b2e | 2022-06-23 | From 63b7bc4bde1bc38eb1a695b0b50770fcf651360d Mon Sep 17 00:00:00 2001 From: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com> Date: Thu, 6 Jul 2023 11:36:08 +0200 Subject: [PATCH 2007/3485] [macos] refactor XCode installation approach (#7858) * [macos] refactor XCode installation approach xcversion does not work anymore, we are switching to storing XCode installers in intermediate Azure storage * remove xcode_install_user, xcode_install_password * rename xcode_install_storage --> xcode_install_storage_url * mark xcode installation variables sensitive * remove xcversion_auth_cookie variable * renamed forgotten xcode_install_storage --> xcode_install_storage_url * remove leftover xcode_install_user --- .github/workflows/macos-generation.yml | 10 ---------- .../azure-pipelines/image-generation.yml | 5 ++--- images/macos/helpers/Xcode.Installer.psm1 | 19 ++++++++---------- images/macos/provision/core/xcode.ps1 | 7 ------- images/macos/templates/macOS-11.anka.pkr.hcl | 19 ++++-------------- images/macos/templates/macOS-11.json | 18 ++++------------- images/macos/templates/macOS-12.anka.pkr.hcl | 19 ++++-------------- images/macos/templates/macOS-12.json | 18 ++++------------- images/macos/templates/macOS-13.anka.pkr.hcl | 19 ++++-------------- .../templates/macOS-13.arm64.anka.pkr.hcl | 19 ++++-------------- images/macos/toolsets/toolset-11.json | 12 +++++------ images/macos/toolsets/toolset-12.json | 14 ++++++------- images/macos/toolsets/toolset-13.json | 20 +++++++++---------- 13 files changed, 57 insertions(+), 142 deletions(-) diff --git a/.github/workflows/macos-generation.yml b/.github/workflows/macos-generation.yml index 74ccb58b7c31..8d9f680bfcad 100644 --- a/.github/workflows/macos-generation.yml +++ b/.github/workflows/macos-generation.yml @@ -105,13 +105,6 @@ jobs: -VIPassword ${{ secrets.VI_PASSWORD }} ` -Cluster ${{ env.ESXI_CLUSTER }} - - name: Create xcversion session cookie file - shell: bash - run: | - mkdir -p ${{ runner.temp }}/xcversion-cookie - cookie='${{ secrets.XCVERSION_AUTH_COOKIE }}' - echo "$cookie" > ${{ runner.temp }}/xcversion-cookie/cookie - - name: Build VM run: | $SensitiveData = @( @@ -131,9 +124,6 @@ jobs: -var="github_api_pat=${{ secrets.GH_FEED_TOKEN }}" ` -var="build_id=${{ env.VM_NAME }}" ` -var="baseimage_name=${{ inputs.base_image_name }}" ` - -var="xcode_install_user=${{ secrets.XCODE_USER }}" ` - -var="xcode_install_password=${{ secrets.XCODE_PASSWORD }}" ` - -var="xcversion_auth_cookie=${{ env.XCVERSION_COOKIE_PATH }}" ` -color=false ` ${{ inputs.template_path }} ` | Where-Object { diff --git a/images.CI/macos/azure-pipelines/image-generation.yml b/images.CI/macos/azure-pipelines/image-generation.yml index 3b87e10a6397..4794f7ac82b6 100644 --- a/images.CI/macos/azure-pipelines/image-generation.yml +++ b/images.CI/macos/azure-pipelines/image-generation.yml @@ -83,9 +83,8 @@ jobs: -var="github_api_pat=$(github_api_pat)" ` -var="build_id=$(VirtualMachineName)" ` -var="baseimage_name=${{ parameters.base_image_name }}" ` - -var="xcode_install_user=$(xcode-installation-user)" ` - -var="xcode_install_password=$(xcode-installation-password)" ` - -var="xcversion_auth_cookie=$(xcVersionCookie.secureFilePath)" ` + -var="xcode_install_storage_url=$(xcode_install_storage_url)" ` + -var="xcode_install_sas=$(xcode_install_sas)" ` -color=false ` ${{ parameters.template_path }} ` | Where-Object { diff --git a/images/macos/helpers/Xcode.Installer.psm1 b/images/macos/helpers/Xcode.Installer.psm1 index e1b5bb6e1347..c0a05ca72472 100644 --- a/images/macos/helpers/Xcode.Installer.psm1 +++ b/images/macos/helpers/Xcode.Installer.psm1 @@ -24,17 +24,14 @@ function Invoke-DownloadXcodeArchive { [string]$Version ) - $resolvedVersion = Resolve-ExactXcodeVersion -Version $Version - if (-not $resolvedVersion) { - throw "Version '$Version' can't be matched to any available version" - } - Write-Host "Downloading Xcode $resolvedVersion" - Invoke-XCVersion -Arguments "install '$resolvedVersion' --no-install" | Out-Host + Write-Host "Downloading Xcode $Version" + + $tempXipDirectory = New-Item -Path $DownloadDirectory -Name "Xcode$Version" -ItemType "Directory" + + $xcodeFileName = 'Xcode-{0}.xip' -f $Version + $xcodeUri = '{0}{1}{2}'-f ${env:XCODE_INSTALL_STORAGE_URL}, $xcodeFileName, ${env:XCODE_INSTALL_SAS} - $xcodeXipName = "$resolvedVersion" -replace " ", "_" - $xcodeXipFile = Get-ChildItem -Path $DownloadDirectory -Filter "Xcode_$xcodeXipName.xip" | Select-Object -First 1 - $tempXipDirectory = New-Item -Path $DownloadDirectory -Name "Xcode$xcodeXipName" -ItemType "Directory" - Move-Item -Path "$xcodeXipFile" -Destination $tempXipDirectory + Invoke-WebRequest -Uri $xcodeUri -OutFile (Join-Path $tempXipDirectory $xcodeFileName) return $tempXipDirectory @@ -86,7 +83,7 @@ function Expand-XcodeXipArchive { [string]$TargetPath ) - $xcodeXipPath = Get-ChildItem -Path $DownloadDirectory -Filter "Xcode_*.xip" | Select-Object -First 1 + $xcodeXipPath = Get-ChildItem -Path $DownloadDirectory -Filter "Xcode-*.xip" | Select-Object -First 1 Write-Host "Extracting Xcode from '$xcodeXipPath'" Push-Location $DownloadDirectory diff --git a/images/macos/provision/core/xcode.ps1 b/images/macos/provision/core/xcode.ps1 index f05f9fc00eb8..0af0dcdf2e9c 100644 --- a/images/macos/provision/core/xcode.ps1 +++ b/images/macos/provision/core/xcode.ps1 @@ -1,15 +1,8 @@ -# The script currently requires 2 external variables to be set: XCODE_INSTALL_USER -# and XCODE_INSTALL_PASSWORD, in order to access the Apple Developer Center - $ErrorActionPreference = "Stop" Import-Module "$env:HOME/image-generation/helpers/Common.Helpers.psm1" Import-Module "$env:HOME/image-generation/helpers/Xcode.Installer.psm1" -if ([string]::IsNullOrEmpty($env:XCODE_INSTALL_USER) -or [string]::IsNullOrEmpty($env:XCODE_INSTALL_PASSWORD)) { - throw "Required environment variables XCODE_INSTALL_USER and XCODE_INSTALL_PASSWORD are not set" -} - # Spaceship Apple ID login fails due to Apple ID prompting to be upgraded to 2FA. # https://github.com/fastlane/fastlane/pull/18116 $env:SPACESHIP_SKIP_2FA_UPGRADE = 1 diff --git a/images/macos/templates/macOS-11.anka.pkr.hcl b/images/macos/templates/macOS-11.anka.pkr.hcl index 6c86c5f20446..1cbe84124463 100644 --- a/images/macos/templates/macOS-11.anka.pkr.hcl +++ b/images/macos/templates/macOS-11.anka.pkr.hcl @@ -34,21 +34,16 @@ variable "github_api_pat" { default = "" } -variable "xcode_install_user" { +variable "xcode_install_storage_url" { type = string sensitive = true } -variable "xcode_install_password" { +variable "xcode_install_sas" { type = string sensitive = true } -variable "xcversion_auth_cookie" { - type = string - default = "" -} - variable "vcpu_count" { type = string default = "6" @@ -187,17 +182,11 @@ build { ] execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" } - provisioner "shell" { - inline = [ - "mkdir -p ~/.fastlane/spaceship/${var.xcode_install_user}", - "echo ${var.xcversion_auth_cookie} | base64 --decode > ~/.fastlane/spaceship/${var.xcode_install_user}/cookie" - ] - } provisioner "shell" { script = "./provision/core/xcode.ps1" environment_vars = [ - "XCODE_INSTALL_USER=${var.xcode_install_user}", - "XCODE_INSTALL_PASSWORD=${var.xcode_install_password}" + "XCODE_INSTALL_STORAGE_URL=${var.xcode_install_storage_url}", + "XCODE_INSTALL_SAS=${var.xcode_install_sas}" ] execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} pwsh -f {{ .Path }}" } diff --git a/images/macos/templates/macOS-11.json b/images/macos/templates/macOS-11.json index 74a424f6ce72..8572fae04702 100644 --- a/images/macos/templates/macOS-11.json +++ b/images/macos/templates/macOS-11.json @@ -12,9 +12,8 @@ "vm_username": null, "vm_password": null, "github_api_pat": null, - "xcode_install_user": null, - "xcode_install_password": null, - "xcversion_auth_cookie": null, + "xcode_install_storage_url": null, + "xcode_install_sas": null, "image_os": "macos11" }, "builders": [ @@ -165,22 +164,13 @@ "API_PAT={{user `github_api_pat`}}" ] }, - { - "type": "shell", - "inline": "mkdir -p ~/.fastlane/spaceship/{{user `xcode_install_user`}}" - }, - { - "type": "file", - "source": "{{user `xcversion_auth_cookie`}}", - "destination": "~/.fastlane/spaceship/{{user `xcode_install_user`}}/cookie" - }, { "type": "shell", "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} pwsh -f {{ .Path }}", "script": "./provision/core/xcode.ps1", "environment_vars": [ - "XCODE_INSTALL_USER={{user `xcode_install_user`}}", - "XCODE_INSTALL_PASSWORD={{user `xcode_install_password`}}" + "XCODE_INSTALL_STORAGE_URL={{user `xcode_install_storage_url`}}", + "XCODE_INSTALL_SAS={{user `xcode_install_sas`}}" ] }, { diff --git a/images/macos/templates/macOS-12.anka.pkr.hcl b/images/macos/templates/macOS-12.anka.pkr.hcl index 1b4adfe747bf..f15ee7e30041 100644 --- a/images/macos/templates/macOS-12.anka.pkr.hcl +++ b/images/macos/templates/macOS-12.anka.pkr.hcl @@ -34,21 +34,16 @@ variable "github_api_pat" { default = "" } -variable "xcode_install_user" { +variable "xcode_install_storage_url" { type = string sensitive = true } -variable "xcode_install_password" { +variable "xcode_install_sas" { type = string sensitive = true } -variable "xcversion_auth_cookie" { - type = string - default = "" -} - variable "vcpu_count" { type = string default = "6" @@ -188,17 +183,11 @@ build { ] execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" } - provisioner "shell" { - inline = [ - "mkdir -p ~/.fastlane/spaceship/${var.xcode_install_user}", - "echo ${var.xcversion_auth_cookie} | base64 --decode > ~/.fastlane/spaceship/${var.xcode_install_user}/cookie" - ] - } provisioner "shell" { script = "./provision/core/xcode.ps1" environment_vars = [ - "XCODE_INSTALL_USER=${var.xcode_install_user}", - "XCODE_INSTALL_PASSWORD=${var.xcode_install_password}" + "XCODE_INSTALL_STORAGE_URL=${var.xcode_install_storage_url}", + "XCODE_INSTALL_SAS=${var.xcode_install_sas}" ] execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} pwsh -f {{ .Path }}" } diff --git a/images/macos/templates/macOS-12.json b/images/macos/templates/macOS-12.json index 281c3170058e..57d7bc7240dd 100644 --- a/images/macos/templates/macOS-12.json +++ b/images/macos/templates/macOS-12.json @@ -12,9 +12,8 @@ "vm_username": null, "vm_password": null, "github_api_pat": null, - "xcode_install_user": null, - "xcode_install_password": null, - "xcversion_auth_cookie": null, + "xcode_install_storage_url": null, + "xcode_install_sas": null, "image_os": "macos12" }, "builders": [ @@ -167,22 +166,13 @@ "USER_PASSWORD={{user `vm_password`}}" ] }, - { - "type": "shell", - "inline": "mkdir -p ~/.fastlane/spaceship/{{user `xcode_install_user`}}" - }, - { - "type": "file", - "source": "{{user `xcversion_auth_cookie`}}", - "destination": "~/.fastlane/spaceship/{{user `xcode_install_user`}}/cookie" - }, { "type": "shell", "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} pwsh -f {{ .Path }}", "script": "./provision/core/xcode.ps1", "environment_vars": [ - "XCODE_INSTALL_USER={{user `xcode_install_user`}}", - "XCODE_INSTALL_PASSWORD={{user `xcode_install_password`}}" + "XCODE_INSTALL_STORAGE_URL={{user `xcode_install_storage_url`}}", + "XCODE_INSTALL_SAS={{user `xcode_install_sas`}}" ] }, { diff --git a/images/macos/templates/macOS-13.anka.pkr.hcl b/images/macos/templates/macOS-13.anka.pkr.hcl index 27e0a679d783..d6252bed9c1b 100644 --- a/images/macos/templates/macOS-13.anka.pkr.hcl +++ b/images/macos/templates/macOS-13.anka.pkr.hcl @@ -34,21 +34,16 @@ variable "github_api_pat" { default = "" } -variable "xcode_install_user" { +variable "xcode_install_storage_url" { type = string sensitive = true } -variable "xcode_install_password" { +variable "xcode_install_sas" { type = string sensitive = true } -variable "xcversion_auth_cookie" { - type = string - default = "" -} - variable "vcpu_count" { type = string default = "6" @@ -182,17 +177,11 @@ build { ] execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" } - provisioner "shell" { - inline = [ - "mkdir -p ~/.fastlane/spaceship/${var.xcode_install_user}", - "echo ${var.xcversion_auth_cookie} | base64 --decode > ~/.fastlane/spaceship/${var.xcode_install_user}/cookie" - ] - } provisioner "shell" { script = "./provision/core/xcode.ps1" environment_vars = [ - "XCODE_INSTALL_USER=${var.xcode_install_user}", - "XCODE_INSTALL_PASSWORD=${var.xcode_install_password}" + "XCODE_INSTALL_STORAGE_URL=${var.xcode_install_storage_url}", + "XCODE_INSTALL_SAS=${var.xcode_install_sas}" ] execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} pwsh -f {{ .Path }}" } diff --git a/images/macos/templates/macOS-13.arm64.anka.pkr.hcl b/images/macos/templates/macOS-13.arm64.anka.pkr.hcl index 558cd5601030..562e6d311eba 100644 --- a/images/macos/templates/macOS-13.arm64.anka.pkr.hcl +++ b/images/macos/templates/macOS-13.arm64.anka.pkr.hcl @@ -34,21 +34,16 @@ variable "github_api_pat" { default = "" } -variable "xcode_install_user" { +variable "xcode_install_storage_url" { type = string sensitive = true } -variable "xcode_install_password" { +variable "xcode_install_sas" { type = string sensitive = true } -variable "xcversion_auth_cookie" { - type = string - default = "" -} - variable "vcpu_count" { type = string default = "6" @@ -182,17 +177,11 @@ build { ] execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" } - provisioner "shell" { - inline = [ - "mkdir -p ~/.fastlane/spaceship/${var.xcode_install_user}", - "echo ${var.xcversion_auth_cookie} | base64 --decode > ~/.fastlane/spaceship/${var.xcode_install_user}/cookie" - ] - } provisioner "shell" { script = "./provision/core/xcode.ps1" environment_vars = [ - "XCODE_INSTALL_USER=${var.xcode_install_user}", - "XCODE_INSTALL_PASSWORD=${var.xcode_install_password}" + "XCODE_INSTALL_STORAGE_URL=${var.xcode_install_storage_url}", + "XCODE_INSTALL_SAS=${var.xcode_install_sas}" ] execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} pwsh -f {{ .Path }}" } diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index 595c2089a71c..9e575c9e2d9b 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -3,12 +3,12 @@ "default": "13.2.1", "x64": { "versions": [ - { "link": "13.2.1", "version": "13.2.1", "symlinks": ["13.2"] }, - { "link": "13.1", "version": "13.1.0" }, - { "link": "13.0", "version": "13.0.0" }, - { "link": "12.5.1", "version": "12.5.1", "symlinks": ["12.5"] }, - { "link": "12.4", "version": "12.4.0" }, - { "link": "11.7", "version": "11.7.0", "symlinks": ["11.7_beta"] } + { "link": "13.2.1", "version": "13.2.1+13C100", "symlinks": ["13.2"] }, + { "link": "13.1", "version": "13.1.0+13A1030d" }, + { "link": "13.0", "version": "13.0.0+13A233" }, + { "link": "12.5.1", "version": "12.5.1+12E507", "symlinks": ["12.5"] }, + { "link": "12.4", "version": "12.4.0+12D4e" }, + { "link": "11.7", "version": "11.7.0-GM+11E801a", "symlinks": ["11.7_beta"] } ] } }, diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index e319b95df2fa..24215e4eb960 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -3,13 +3,13 @@ "default": "14.2", "x64": { "versions": [ - { "link": "14.2", "version": "14.2.0" }, - { "link": "14.1", "version": "14.1.0" }, - { "link": "14.0.1", "version": "14.0.1", "symlinks": ["14.0"] }, - { "link": "13.4.1", "version": "13.4.1", "symlinks": ["13.4"] }, - { "link": "13.3.1", "version": "13.3.1", "symlinks": ["13.3"] }, - { "link": "13.2.1", "version": "13.2.1", "symlinks": ["13.2"] }, - { "link": "13.1", "version": "13.1.0" } + { "link": "14.2", "version": "14.2.0+14C18" }, + { "link": "14.1", "version": "14.1.0+14B47b" }, + { "link": "14.0.1", "version": "14.0.1+14A400", "symlinks": ["14.0"] }, + { "link": "13.4.1", "version": "13.4.1+13F100", "symlinks": ["13.4"] }, + { "link": "13.3.1", "version": "13.3.1+13E500a", "symlinks": ["13.3"] }, + { "link": "13.2.1", "version": "13.2.1+13C100", "symlinks": ["13.2"] }, + { "link": "13.1", "version": "13.1.0+13A1030d" } ] } }, diff --git a/images/macos/toolsets/toolset-13.json b/images/macos/toolsets/toolset-13.json index be4f2a1a5915..70a94302f9a6 100644 --- a/images/macos/toolsets/toolset-13.json +++ b/images/macos/toolsets/toolset-13.json @@ -3,20 +3,20 @@ "default": "14.2", "x64": { "versions": [ - { "link": "15.0", "version": "15.0.0" }, - { "link": "14.3.1", "version": "14.3.1" }, - { "link": "14.3", "version": "14.3.0" }, - { "link": "14.2", "version": "14.2.0" }, - { "link": "14.1", "version": "14.1.0" } + { "link": "15.0", "version": "15.0.0-Beta.2+15A5161b" }, + { "link": "14.3.1", "version": "14.3.1+14E300c" }, + { "link": "14.3", "version": "14.3.0+14E222b" }, + { "link": "14.2", "version": "14.2.0+14C18" }, + { "link": "14.1", "version": "14.1.0+14B47b" } ] }, "arm64":{ "versions": [ - { "link": "15.0", "version": "15.0.0" }, - { "link": "14.3.1", "version": "14.3.1" }, - { "link": "14.3", "version": "14.3.0" }, - { "link": "14.2", "version": "14.2.0" }, - { "link": "14.1", "version": "14.1.0" } + { "link": "15.0", "version": "15.0.0-Beta.2+15A5161b" }, + { "link": "14.3.1", "version": "14.3.1+14E300c" }, + { "link": "14.3", "version": "14.3.0+14E222b" }, + { "link": "14.2", "version": "14.2.0+14C18" }, + { "link": "14.1", "version": "14.1.0+14B47b" } ] } }, From f1f2de712a39891fa77432dd98dd24ffe8ddad41 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 6 Jul 2023 12:06:25 +0000 Subject: [PATCH 2008/3485] Updating readme file for win19 version 20230630.1.1 (#7844) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2019-Readme.md | 42 ++++++++++++++++---------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index 9f297b238f9e..145633cb8bfc 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -4,7 +4,7 @@ *** # Windows Server 2019 - OS Version: 10.0.17763 Build 4499 -- Image Version: 20230625.1.0 +- Image Version: 20230630.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -17,14 +17,14 @@ - Julia 1.9.1 - Kotlin 1.8.22 - LLVM 15.0.7 -- Node 18.16.0 +- Node 18.16.1 - Perl 5.32.1 - PHP 8.2.7 - Python 3.7.9 - Ruby 2.5.9p229 ### Package Management -- Chocolatey 2.0.0 +- Chocolatey 2.1.0 - Composer 2.5.8 - Helm 3.12.0 - Miniconda 23.3.1 (pre-installed on the image but not added to PATH) @@ -33,7 +33,7 @@ - pip 23.1.2 (python 3.7) - Pipx 1.2.0 - RubyGems 2.7.6.3 -- Vcpkg (build from commit 288e8bebf) +- Vcpkg (build from commit 4a3c366f2) - Yarn 1.22.19 #### Environment variables @@ -60,13 +60,13 @@ - CodeQL Action Bundles 2.13.3 2.13.4 - Docker 24.0.2 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.19.0 +- Docker Compose v2 2.19.1 - Docker-wincred 0.7.0 - ghc 9.6.2 - Git 2.41.0.windows.1 - Git LFS 3.3.0 -- Google Cloud SDK 436.0.0 -- ImageMagick 7.1.1-11 +- Google Cloud SDK 437.0.1 +- ImageMagick 7.1.1-12 - InnoSetup 6.2.2 - jq 1.6 - Kind 0.20.0 @@ -78,7 +78,7 @@ - OpenSSL 1.1.1u - Packer 1.9.1 - Parcel 2.9.3 -- Pulumi 3.73.0 +- Pulumi 3.74.0 - R 4.3.1 - Service Fabric SDK 9.1.1436.9590 - Stack 2.11.1 @@ -92,8 +92,8 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.167 -- AWS CLI 2.12.3 -- AWS SAM CLI 1.88.0 +- AWS CLI 2.12.5 +- AWS SAM CLI 1.89.0 - AWS Session Manager CLI 1.2.463.0 - Azure CLI 2.49.0 - Azure DevOps CLI extension 0.26.0 @@ -113,13 +113,13 @@ - cargo-outdated 0.13.1 - cbindgen 0.24.5 - Clippy 0.1.70 -- Rustfmt 1.5.2 +- Rustfmt 1.5.2-stable ### Browsers and Drivers -- Google Chrome 114.0.5735.134 +- Google Chrome 114.0.5735.199 - Chrome Driver 114.0.5735.90 -- Microsoft Edge 114.0.1823.58 -- Microsoft Edge Driver 114.0.1823.58 +- Microsoft Edge 114.0.1823.67 +- Microsoft Edge Driver 114.0.1823.67 - Mozilla Firefox 114.0.2 - Gecko Driver 0.33.0 - IE Driver 4.10.0.0 @@ -494,15 +494,15 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 10.0.22621.0 ### .NET Core Tools -- .NET Core SDK: 3.1.120, 3.1.202, 3.1.302, 3.1.426, 6.0.119, 6.0.203, 6.0.314, 6.0.411 +- .NET Core SDK: 6.0.119, 6.0.203, 6.0.314, 6.0.411 - .NET Framework: 4.7.2, 4.8 -- Microsoft.AspNetCore.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 6.0.5, 6.0.19 -- Microsoft.NETCore.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 6.0.5, 6.0.19 -- Microsoft.WindowsDesktop.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 6.0.5, 6.0.19 +- Microsoft.AspNetCore.App: 6.0.5, 6.0.19 +- Microsoft.NETCore.App: 6.0.5, 6.0.19 +- Microsoft.WindowsDesktop.App: 6.0.5, 6.0.19 - nbgv 3.6.133+2d32d93cb1 ### PowerShell Tools -- PowerShell 7.2.11 +- PowerShell 7.2.12 #### Powershell Modules - Az: 9.3.0 @@ -511,11 +511,11 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Az (Cached): 1.0.0.zip, 1.6.0.zip, 2.3.2.zip, 2.6.0.zip, 3.1.0.zip, 3.5.0.zip, 3.8.0.zip, 4.3.0.zip, 4.4.0.zip, 4.7.0.zip, 5.5.0.zip, 5.9.0.zip, 6.6.0.zip, 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.359 +- AWSPowershell: 4.1.363 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 - Microsoft.Graph: 1.28.0 -- Pester: 3.4.0, 5.4.1 +- Pester: 3.4.0, 5.5.0 - PowerShellGet: 1.0.0.1, 2.2.5 - PSScriptAnalyzer: 1.21.0 - PSWindowsUpdate: 2.2.0.3 From 712e7c378ae1c450da3a90b18b735e2b4366dee0 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 6 Jul 2023 12:15:38 +0000 Subject: [PATCH 2009/3485] Updating readme file for win22 version 20230630.1.1 (#7843) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2022-Readme.md | 38 ++++++++++++++++---------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/images/win/Windows2022-Readme.md b/images/win/Windows2022-Readme.md index 148724ea3468..cb864a657c64 100644 --- a/images/win/Windows2022-Readme.md +++ b/images/win/Windows2022-Readme.md @@ -4,7 +4,7 @@ *** # Windows Server 2022 - OS Version: 10.0.20348 Build 1787 -- Image Version: 20230625.1.0 +- Image Version: 20230630.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -17,14 +17,14 @@ - Julia 1.9.1 - Kotlin 1.8.22 - LLVM 15.0.7 -- Node 18.16.0 +- Node 18.16.1 - Perl 5.32.1 - PHP 8.2.7 - Python 3.9.13 - Ruby 3.0.6p216 ### Package Management -- Chocolatey 2.0.0 +- Chocolatey 2.1.0 - Composer 2.5.8 - Helm 3.12.0 - Miniconda 23.3.1 (pre-installed on the image but not added to PATH) @@ -33,7 +33,7 @@ - pip 23.1.2 (python 3.9) - Pipx 1.2.0 - RubyGems 3.2.33 -- Vcpkg (build from commit 288e8bebf) +- Vcpkg (build from commit 4a3c366f2) - Yarn 1.22.19 #### Environment variables @@ -60,12 +60,12 @@ - CodeQL Action Bundles 2.13.3 2.13.4 - Docker 24.0.2 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.19.0 +- Docker Compose v2 2.19.1 - Docker-wincred 0.7.0 - ghc 9.6.2 - Git 2.41.0.windows.1 - Git LFS 3.3.0 -- ImageMagick 7.1.1-11 +- ImageMagick 7.1.1-12 - InnoSetup 6.2.2 - jq 1.6 - Kind 0.20.0 @@ -76,7 +76,7 @@ - NSIS 3.08 - OpenSSL 1.1.1u - Packer 1.9.1 -- Pulumi 3.73.0 +- Pulumi 3.74.0 - R 4.3.1 - Service Fabric SDK 9.1.1436.9590 - Stack 2.11.1 @@ -90,8 +90,8 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.167 -- AWS CLI 2.12.3 -- AWS SAM CLI 1.88.0 +- AWS CLI 2.12.5 +- AWS SAM CLI 1.89.0 - AWS Session Manager CLI 1.2.463.0 - Azure CLI 2.49.0 - Azure DevOps CLI extension 0.26.0 @@ -110,13 +110,13 @@ - cargo-outdated 0.13.1 - cbindgen 0.24.5 - Clippy 0.1.70 -- Rustfmt 1.5.2 +- Rustfmt 1.5.2-stable ### Browsers and Drivers -- Google Chrome 114.0.5735.134 +- Google Chrome 114.0.5735.199 - Chrome Driver 114.0.5735.90 - Microsoft Edge 114.0.1823.58 -- Microsoft Edge Driver 114.0.1823.58 +- Microsoft Edge Driver 114.0.1823.67 - Mozilla Firefox 114.0.2 - Gecko Driver 0.33.0 - IE Driver 4.10.0.0 @@ -546,15 +546,15 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 10.0.22621.0 ### .NET Core Tools -- .NET Core SDK: 3.1.120, 3.1.202, 3.1.302, 3.1.426, 6.0.119, 6.0.203, 6.0.314, 6.0.411, 7.0.304 +- .NET Core SDK: 6.0.119, 6.0.203, 6.0.314, 6.0.411, 7.0.304 - .NET Framework: 4.8, 4.8.1 -- Microsoft.AspNetCore.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 6.0.5, 6.0.18, 6.0.19, 7.0.7 -- Microsoft.NETCore.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 6.0.5, 6.0.18, 6.0.19, 7.0.7 -- Microsoft.WindowsDesktop.App: 3.1.4, 3.1.6, 3.1.20, 3.1.32, 6.0.5, 6.0.18, 6.0.19, 7.0.7 +- Microsoft.AspNetCore.App: 6.0.5, 6.0.18, 6.0.19, 7.0.7 +- Microsoft.NETCore.App: 6.0.5, 6.0.18, 6.0.19, 7.0.7 +- Microsoft.WindowsDesktop.App: 6.0.5, 6.0.18, 6.0.19, 7.0.7 - nbgv 3.6.133+2d32d93cb1 ### PowerShell Tools -- PowerShell 7.2.11 +- PowerShell 7.2.12 #### Powershell Modules - Az: 9.3.0 @@ -563,11 +563,11 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Az (Cached): 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.359 +- AWSPowershell: 4.1.363 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 - Microsoft.Graph: 1.28.0 -- Pester: 3.4.0, 5.4.1 +- Pester: 3.4.0, 5.5.0 - PowerShellGet: 1.0.0.1, 2.2.5 - PSScriptAnalyzer: 1.21.0 - PSWindowsUpdate: 2.2.0.3 From 073c513015de72b6a1783953a52c32d081cae4b6 Mon Sep 17 00:00:00 2001 From: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com> Date: Thu, 6 Jul 2023 14:23:25 +0200 Subject: [PATCH 2010/3485] [macos] propagate XCode install variables to github image generation (#7865) --- .github/workflows/macos-generation.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/macos-generation.yml b/.github/workflows/macos-generation.yml index 8d9f680bfcad..eac3eefe3bb1 100644 --- a/.github/workflows/macos-generation.yml +++ b/.github/workflows/macos-generation.yml @@ -121,6 +121,8 @@ jobs: -var="output_folder=${{ env.OUTPUT_FOLDER }}" ` -var="vm_username=${{ secrets.VM_USERNAME }}" ` -var="vm_password=${{ secrets.VM_PASSWORD }}" ` + -var="xcode_install_storage_url=${{ secrets.xcode_install_storage_url }}" ` + -var="xcode_install_sas=${{ secrets.xcode_install_sas }}" ` -var="github_api_pat=${{ secrets.GH_FEED_TOKEN }}" ` -var="build_id=${{ env.VM_NAME }}" ` -var="baseimage_name=${{ inputs.base_image_name }}" ` From 2b8425307de2a466d00eef667967dd8a54d158d8 Mon Sep 17 00:00:00 2001 From: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com> Date: Thu, 6 Jul 2023 16:36:33 +0200 Subject: [PATCH 2011/3485] [macos] add workaround for homebrew/core, homebrew/cask (#7866) it was found that "git clone --depth 1 .." followed by "brew tap.." actually works even if some git index accidently broken --- images/macos/provision/configuration/environment/bashrc | 1 - images/macos/provision/core/homebrew.sh | 6 ++++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/images/macos/provision/configuration/environment/bashrc b/images/macos/provision/configuration/environment/bashrc index 548820c2b2ec..2282126099dc 100644 --- a/images/macos/provision/configuration/environment/bashrc +++ b/images/macos/provision/configuration/environment/bashrc @@ -25,7 +25,6 @@ export DOTNET_ROOT=$HOME/.dotnet export DOTNET_MULTILEVEL_LOOKUP=0 export HOMEBREW_NO_AUTO_UPDATE=1 -export HOMEBREW_NO_INSTALL_FROM_API=1 export HOMEBREW_CLEANUP_PERIODIC_FULL_DAYS=3650 export HOMEBREW_CASK_OPTS="--no-quarantine" diff --git a/images/macos/provision/core/homebrew.sh b/images/macos/provision/core/homebrew.sh index 9dd91d00aab3..7ae4aac26922 100755 --- a/images/macos/provision/core/homebrew.sh +++ b/images/macos/provision/core/homebrew.sh @@ -8,6 +8,12 @@ echo "Installing Homebrew..." HOMEBREW_INSTALL_URL="https://raw.githubusercontent.com/Homebrew/install/master/install.sh" /bin/bash -c "$(curl -fsSL ${HOMEBREW_INSTALL_URL})" +git clone https://github.com/Homebrew/homebrew-cask $(brew --repository)/Library/Taps/homebrew/homebrew-cask --origin=origin --template= --config core.fsmonitor=false --depth 1 +git clone https://github.com/Homebrew/homebrew-core $(brew --repository)/Library/Taps/homebrew/homebrew-core --origin=origin --template= --config core.fsmonitor=false --depth 1 + +brew tap homebrew/cask +brew tap homebrew/core + if [[ $arch == "arm64" ]]; then /opt/homebrew/bin/brew update /opt/homebrew/bin/brew upgrade From b84c1bed0d9f97f49e7494a35e9e44c743e46ff2 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 6 Jul 2023 16:16:00 +0000 Subject: [PATCH 2012/3485] Updating readme file for ubuntu22 version 20230702.1.1 (#7842) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2204-Readme.md | 46 ++++++++++++++++--------------- 1 file changed, 24 insertions(+), 22 deletions(-) diff --git a/images/linux/Ubuntu2204-Readme.md b/images/linux/Ubuntu2204-Readme.md index ee5bc70b6dfd..b100f56c30be 100644 --- a/images/linux/Ubuntu2204-Readme.md +++ b/images/linux/Ubuntu2204-Readme.md @@ -1,11 +1,12 @@ | Announcements | |-| +| [[Ubuntu] Alpine 3.14 & 3.15 docker image will be removed on July, 17](https://github.com/actions/runner-images/issues/7824) | | [[All OSs] .NET 3.1 will be removed from the images on July, 3](https://github.com/actions/runner-images/issues/7667) | *** # Ubuntu 22.04 - OS Version: 22.04.2 LTS -- Kernel Version: 5.15.0-1040-azure -- Image Version: 20230625.1.0 +- Kernel Version: 5.15.0-1041-azure +- Image Version: 20230702.1.0 - Systemd version: 249.11-0ubuntu3.9 ## Installed Software @@ -32,15 +33,15 @@ ### Package Management - cpan 1.64 - Helm 3.12.1 -- Homebrew 4.0.24 +- Homebrew 4.0.26 - Miniconda 23.3.1 - Npm 9.5.1 -- NuGet 6.3.1.1 +- NuGet 6.6.1.2 - Pip 22.0.2 - Pip3 22.0.2 - Pipx 1.2.0 - RubyGems 3.3.5 -- Vcpkg (build from commit 288e8bebf) +- Vcpkg (build from commit 64adda19c) - Yarn 1.22.19 #### Environment variables @@ -58,7 +59,7 @@ to accomplish this. ``` ### Project Management -- Lerna 7.0.2 +- Lerna 7.1.1 - Maven 3.8.8 ### Tools @@ -98,30 +99,30 @@ to accomplish this. - Packer 1.9.1 - Parcel 2.9.3 - Podman 3.4.4 -- Pulumi 3.73.0 -- R 4.3.0 +- Pulumi 3.74.0 +- R 4.3.1 - Skopeo 1.4.1 - Sphinx Open Source Search Server 2.2.11 - SVN 1.14.1 -- Terraform 1.5.1 +- Terraform 1.5.2 - yamllint 1.32.0 - yq 4.34.1 - zstd 1.5.5 ### CLI Tools - Alibaba Cloud CLI 3.0.167 -- AWS CLI 2.12.3 +- AWS CLI 2.12.6 - AWS CLI Session Manager Plugin 1.2.463.0 -- AWS SAM CLI 1.88.0 +- AWS SAM CLI 1.89.0 - Azure CLI 2.49.0 - Azure CLI (azure-devops) 0.26.0 - GitHub CLI 2.31.0 -- Google Cloud SDK 436.0.0 +- Google Cloud SDK 437.0.1 - Hub CLI 2.14.2 -- Netlify CLI 15.6.0 +- Netlify CLI 15.8.0 - OpenShift CLI 4.13.4 - ORAS CLI 1.0.0 -- Vercel CLI 30.2.3 +- Vercel CLI 31.0.1 ### Java | Version | Vendor | Environment Variable | @@ -141,7 +142,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ### Haskell Tools - Cabal 3.10.1.0 - GHC 9.6.2 -- GHCup 0.1.19.2 +- GHCup 0.1.19.4 - Stack 2.11.1 ### Rust Tools @@ -159,13 +160,13 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.5.2 ### Browsers and Drivers -- Google Chrome 114.0.5735.133 +- Google Chrome 114.0.5735.198 - ChromeDriver 114.0.5735.90 - Chromium 114.0.5733.0 -- Microsoft Edge 114.0.1823.58 -- Microsoft Edge WebDriver 114.0.1823.58 +- Microsoft Edge 114.0.1823.67 +- Microsoft Edge WebDriver 114.0.1823.67 - Selenium server 4.10.0 -- Mozilla Firefox 114.0.2 +- Mozilla Firefox 115.0 - Geckodriver 0.33.0 #### Environment variables @@ -232,13 +233,13 @@ Use the following command as a part of your job to start the service: 'sudo syst - 3.1.4 ### PowerShell Tools -- PowerShell 7.2.11 +- PowerShell 7.2.12 #### PowerShell Modules - Az: 9.3.0 - MarkdownPS: 1.9 - Microsoft.Graph: 1.28.0 -- Pester: 5.4.1 +- Pester: 5.5.0 - PSScriptAnalyzer: 1.21.0 ### Web Servers @@ -251,7 +252,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | Package Name | Version | | -------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 9.0 | -| Android Emulator | 32.1.13 | +| Android Emulator | 32.1.14 | | Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | | Android SDK Platform-Tools | 34.0.3 | | Android SDK Platforms | android-34 (rev 1)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | @@ -280,6 +281,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | alpine:3.15 | sha256:3362f865019db5f14ac5154cb0db2c3741ad1cce0416045be422ad4de441b081 | 2023-06-14 | | alpine:3.16 | sha256:cbe5d5973103a2d03408d1689a6efde4ea4920bde9f4b51fe7872e60ce2d8e56 | 2023-06-14 | | alpine:3.17 | sha256:e95676db9e4a4f16f6cc01a8915368f82b018cc07aba951c1bd1db586c081388 | 2023-06-14 | +| alpine:3.18 | sha256:82d1e9d7ed48a7523bdebc18cf6290bdb97b82302a8a9c27d4fe885949ea94d1 | 2023-06-14 | | buildpack-deps:bullseye | sha256:2987a7a81a0eb17086c6498afedb19002689587038fdef7f5880c2cca973bf13 | 2023-06-13 | | buildpack-deps:buster | sha256:0da9fe74d5f9bac9754a912b61cf81c62af1247ff3eed0b4f6df00da924f7f21 | 2023-06-13 | | debian:10 | sha256:28842e4895d36e67c49015c0b41089fa3248e865c76994b19f706ab91e800b95 | 2023-06-12 | From f44460e76b546d09fa121d27a827f6c303e81885 Mon Sep 17 00:00:00 2001 From: Michael B <137917377+mbean-epc@users.noreply.github.com> Date: Thu, 6 Jul 2023 12:54:34 -0600 Subject: [PATCH 2013/3485] Typo fix in create-image-and-azure-resources.md `subsctiption` -> `subscription` --- docs/create-image-and-azure-resources.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/create-image-and-azure-resources.md b/docs/create-image-and-azure-resources.md index c951aa20d681..2cd713cdc702 100644 --- a/docs/create-image-and-azure-resources.md +++ b/docs/create-image-and-azure-resources.md @@ -67,7 +67,7 @@ In any case you will need these software installed: ## Automated image generation This repo bundles script that automates image generation process. -You only need a build agent configured as described above and active Azure subsctiption. +You only need a build agent configured as described above and active Azure subscription. We suggest to start with UbuntuMinimal image because it includes only a minimal set of required software and builds in less then half an hour. All steps here are supposed to run in Powershell. From 2ccef4f1005354274efa8c006927aec8601150d4 Mon Sep 17 00:00:00 2001 From: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com> Date: Fri, 7 Jul 2023 16:24:33 +0200 Subject: [PATCH 2014/3485] [macos] fix XCode simulator install behaviour (#7878) * [macos] fix XCode simulator install behaviour in https://github.com/actions/runner-images/commit/3929bc9f6e249a4731ad86b7b11793af9fec2d03 was introduced regression: simulators were installed only for latest XCode-14 instance. However, they should be installed for all XCode-14 instances. let us revert that behaviour * improve code readability by moving version comparison outside loop * rework brew installation for ARM64 --- images/macos/helpers/Xcode.Installer.psm1 | 5 ----- images/macos/provision/core/homebrew.sh | 12 ++++++------ images/macos/provision/core/xcode.ps1 | 10 ++++++---- 3 files changed, 12 insertions(+), 15 deletions(-) diff --git a/images/macos/helpers/Xcode.Installer.psm1 b/images/macos/helpers/Xcode.Installer.psm1 index c0a05ca72472..af7e1ec6e055 100644 --- a/images/macos/helpers/Xcode.Installer.psm1 +++ b/images/macos/helpers/Xcode.Installer.psm1 @@ -163,11 +163,6 @@ function Install-AdditionalSimulatorRuntimes { [string]$Version ) - if ($Version.Split(".")[0] -lt 14) { - # Additional simulator runtimes are included by default for Xcode < 14 - return - } - Write-Host "Installing Simulator Runtimes for Xcode $Version ..." $xcodebuildPath = Get-XcodeToolPath -Version $Version -ToolName "xcodebuild" Invoke-ValidateCommand "$xcodebuildPath -downloadAllPlatforms | xcpretty" diff --git a/images/macos/provision/core/homebrew.sh b/images/macos/provision/core/homebrew.sh index 7ae4aac26922..4e5b63795d29 100755 --- a/images/macos/provision/core/homebrew.sh +++ b/images/macos/provision/core/homebrew.sh @@ -8,12 +8,6 @@ echo "Installing Homebrew..." HOMEBREW_INSTALL_URL="https://raw.githubusercontent.com/Homebrew/install/master/install.sh" /bin/bash -c "$(curl -fsSL ${HOMEBREW_INSTALL_URL})" -git clone https://github.com/Homebrew/homebrew-cask $(brew --repository)/Library/Taps/homebrew/homebrew-cask --origin=origin --template= --config core.fsmonitor=false --depth 1 -git clone https://github.com/Homebrew/homebrew-core $(brew --repository)/Library/Taps/homebrew/homebrew-core --origin=origin --template= --config core.fsmonitor=false --depth 1 - -brew tap homebrew/cask -brew tap homebrew/core - if [[ $arch == "arm64" ]]; then /opt/homebrew/bin/brew update /opt/homebrew/bin/brew upgrade @@ -22,6 +16,12 @@ if [[ $arch == "arm64" ]]; then eval "$(/opt/homebrew/bin/brew shellenv)" fi +git clone https://github.com/Homebrew/homebrew-cask $(brew --repository)/Library/Taps/homebrew/homebrew-cask --origin=origin --template= --config core.fsmonitor=false --depth 1 +git clone https://github.com/Homebrew/homebrew-core $(brew --repository)/Library/Taps/homebrew/homebrew-core --origin=origin --template= --config core.fsmonitor=false --depth 1 + +brew tap homebrew/cask +brew tap homebrew/core + echo "Disabling Homebrew analytics..." brew analytics off diff --git a/images/macos/provision/core/xcode.ps1 b/images/macos/provision/core/xcode.ps1 index 0af0dcdf2e9c..e051fa4ca6e5 100644 --- a/images/macos/provision/core/xcode.ps1 +++ b/images/macos/provision/core/xcode.ps1 @@ -30,11 +30,13 @@ Write-Host "Configuring Xcode versions..." $xcodeVersions | ForEach-Object { Write-Host "Configuring Xcode $($_.link) ..." Invoke-XcodeRunFirstLaunch -Version $_.link -} -$latestVersion = $xcodeVersions | Sort-Object -Property link -Descending | Select-Object -First 1 -ExpandProperty link -Write-Host "Installing simulators for version $latestVersion..." -Install-AdditionalSimulatorRuntimes -Version $latestVersion + if ($_.link.Split(".")[0] -ge 14) { + # Additional simulator runtimes are included by default for Xcode < 14 + Install-AdditionalSimulatorRuntimes -Version $_.link + } + +} Invoke-XcodeRunFirstLaunch -Version $defaultXcode From c5579bd0e95a1544cee2eb2196b8faed6b97e807 Mon Sep 17 00:00:00 2001 From: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com> Date: Fri, 7 Jul 2023 22:46:36 +0200 Subject: [PATCH 2015/3485] [macos] temporarily disable simulators on XCode-15 (#7880) --- images/macos/provision/core/xcode.ps1 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/images/macos/provision/core/xcode.ps1 b/images/macos/provision/core/xcode.ps1 index e051fa4ca6e5..b94ca98c6e9a 100644 --- a/images/macos/provision/core/xcode.ps1 +++ b/images/macos/provision/core/xcode.ps1 @@ -31,7 +31,8 @@ $xcodeVersions | ForEach-Object { Write-Host "Configuring Xcode $($_.link) ..." Invoke-XcodeRunFirstLaunch -Version $_.link - if ($_.link.Split(".")[0] -ge 14) { + ##if ($_.link.Split(".")[0] -ge 14) { + if ($_.link.Split(".")[0] -eq 14) { # Additional simulator runtimes are included by default for Xcode < 14 Install-AdditionalSimulatorRuntimes -Version $_.link } From 1bf18b5a8a5b4b91d597f6b1109b9ccc07ea6f4b Mon Sep 17 00:00:00 2001 From: sergei-pyshnoi <sergei-pyshnoi@github.com> Date: Mon, 10 Jul 2023 16:24:32 +0200 Subject: [PATCH 2016/3485] add chown for .cache and .config for arm64 --- images/macos/provision/core/powershell.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/macos/provision/core/powershell.sh b/images/macos/provision/core/powershell.sh index 6d3ce1b6f737..1060a99e2e18 100644 --- a/images/macos/provision/core/powershell.sh +++ b/images/macos/provision/core/powershell.sh @@ -42,7 +42,7 @@ for module in ${psModules[@]}; do done if [[ $arch == "arm64" ]]; then - sudo chown -R $USER ~/.local + sudo chown -R $USER ~/.local ~/.cache ~/.config fi # A dummy call to initialize .IdentityService directory From d4a497eaab70af6c4aa0f49235d0add039dc2023 Mon Sep 17 00:00:00 2001 From: sergei-pyshnoi <sergei-pyshnoi@github.com> Date: Tue, 11 Jul 2023 11:41:45 +0200 Subject: [PATCH 2017/3485] add comment --- images/macos/provision/core/powershell.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/images/macos/provision/core/powershell.sh b/images/macos/provision/core/powershell.sh index 1060a99e2e18..424909f2c497 100644 --- a/images/macos/provision/core/powershell.sh +++ b/images/macos/provision/core/powershell.sh @@ -41,6 +41,7 @@ for module in ${psModules[@]}; do fi done +# Fix permission root => runner after installing powershell for arm64 arch if [[ $arch == "arm64" ]]; then sudo chown -R $USER ~/.local ~/.cache ~/.config fi From a5619dace1d43dbd138019e04b62002fea733fd2 Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Tue, 11 Jul 2023 12:21:46 +0200 Subject: [PATCH 2018/3485] [Windows] Disable Edge auto-updates (#7868) * [win] Disable Edge auto-updates * [win] Edge auto-updates: add terminating condition --- images/win/scripts/Installers/Install-Edge.ps1 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/images/win/scripts/Installers/Install-Edge.ps1 b/images/win/scripts/Installers/Install-Edge.ps1 index 317ff0501678..be100e096e4b 100644 --- a/images/win/scripts/Installers/Install-Edge.ps1 +++ b/images/win/scripts/Installers/Install-Edge.ps1 @@ -8,6 +8,9 @@ if (-not (Test-IsWin22)) { Choco-Install -PackageName microsoft-edge } +# Disable Edge auto-updates +Rename-Item -Path "C:\Program Files (x86)\Microsoft\EdgeUpdate\MicrosoftEdgeUpdate.exe" -NewName "Disabled_MicrosoftEdgeUpdate.exe" -ErrorAction Stop + # Install Microsoft Edge WebDriver Write-Host "Install Edge WebDriver..." $EdgeDriverPath = "$($env:SystemDrive)\SeleniumWebDrivers\EdgeDriver" From 38e96ca31af53461098beda948145b79b23e60bc Mon Sep 17 00:00:00 2001 From: sergei-pyshnoi <121864472+sergei-pyshnoi@users.noreply.github.com> Date: Tue, 11 Jul 2023 12:49:06 +0200 Subject: [PATCH 2019/3485] [Mac OS] Add permissions for provisioner to Terminal and Screen recording (#7803) * give permissions for provisioner * add additional permissions --- .../macos/provision/configuration/configure-tccdb-macos.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/images/macos/provision/configuration/configure-tccdb-macos.sh b/images/macos/provision/configuration/configure-tccdb-macos.sh index f9c8980128cc..3df44a01180d 100644 --- a/images/macos/provision/configuration/configure-tccdb-macos.sh +++ b/images/macos/provision/configuration/configure-tccdb-macos.sh @@ -19,6 +19,9 @@ systemValuesArray=( "'kTCCServiceMicrophone','/usr/local/opt/runner/runprovisioner.sh',1,2,0,1,NULL,NULL,NULL,'UNUSED',NULL,NULL,1576661342" "'kTCCServiceScreenCapture','/bin/bash',1,2,0,1,NULL,NULL,NULL,'UNUSED',NULL,0,1599831148" "'kTCCServiceAccessibility','/Library/Application Support/Veertu/Anka/addons/ankarund',1,2,4,1,X'fade0c00000000ac0000000100000006000000020000001e636f6d2e7665657274752e616e6b612e6164646f6e732e616e6b6172756e0000000000060000000f000000060000000e000000010000000a2a864886f76364060206000000000000000000060000000e000000000000000a2a864886f7636406010d0000000000000000000b000000000000000a7375626a6563742e4f550000000000010000000a545439464157503656340000',NULL,0,'UNUSED',NULL,0,1644565949" + "'kTCCServiceScreenCapture','/usr/local/opt/runner/provisioner/provisioner',0,2,4,1,NULL,NULL,0,'UNUSED',NULL,0,1687786159" + "'kTCCServiceAppleEvents','/usr/local/opt/runner/provisioner/provisioner',1,2,3,1,NULL,NULL,0,'com.apple.finder',X'fade0c000000002c00000001000000060000000200000010636f6d2e6170706c652e66696e64657200000003',NULL,1592919552" + "'kTCCServiceAccessibility','/usr/local/opt/runner/provisioner/provisioner',1,2,4,1,NULL,NULL,0,'UNUSED',NULL,NULL,1592919552" # Allow Full Disk Access for "Microsoft Defender for macOS" to bypass installation on-flight "'kTCCServiceSystemPolicyAllFiles','com.microsoft.wdav',0,2,4,1,NULL,NULL,NULL,'UNUSED',NULL,0,1643970979" "'kTCCServiceSystemPolicyAllFiles','com.microsoft.wdav.epsext',0,2,4,1,NULL,NULL,NULL,'UNUSED',NULL,0,1643970979" @@ -50,6 +53,9 @@ userValuesArray=( "'kTCCServiceAppleEvents','/Library/Application Support/Veertu/Anka/addons/ankarund',1,2,3,1,X'fade0c00000000ac0000000100000006000000020000001e636f6d2e7665657274752e616e6b612e6164646f6e732e616e6b6172756e0000000000060000000f000000060000000e000000010000000a2a864886f76364060206000000000000000000060000000e000000000000000a2a864886f7636406010d0000000000000000000b000000000000000a7375626a6563742e4f550000000000010000000a545439464157503656340000',NULL,0,'com.apple.Terminal',X'fade0c000000003000000001000000060000000200000012636f6d2e6170706c652e5465726d696e616c000000000003',NULL,1655808179" "'kTCCServiceAppleEvents','/usr/libexec/sshd-keygen-wrapper',1,2,3,1,X'fade0c000000003c0000000100000006000000020000001d636f6d2e6170706c652e737368642d6b657967656e2d7772617070657200000000000003',NULL,0,'com.apple.Terminal',X'fade0c000000003000000001000000060000000200000012636f6d2e6170706c652e5465726d696e616c000000000003',NULL,1650386089" "'kTCCServicePostEvent','/bin/bash',1,2,0,1,NULL,NULL,NULL,'UNUSED',NULL,0,1583997993" + "'kTCCServiceAppleEvents','/usr/local/opt/runner/provisioner/provisioner',1,2,3,1,NULL,NULL,0,'com.apple.finder',X'fade0c000000002c00000001000000060000000200000010636f6d2e6170706c652e66696e64657200000003',NULL,1592919552" + "'kTCCServiceScreenCapture','/usr/local/opt/runner/provisioner/provisioner',0,2,4,1,NULL,NULL,0,'UNUSED',NULL,0,1687786159" + "'kTCCServiceAppleEvents','/usr/local/opt/runner/provisioner/provisioner',1,2,3,1,NULL,NULL,0,'com.apple.systemevents',X'fade0c000000003400000001000000060000000200000016636f6d2e6170706c652e73797374656d6576656e7473000000000003',NULL,1592919552" ) for values in "${userValuesArray[@]}"; do configure_user_tccdb "$values" From ad3c78a4fc9f629b77df646758cea1003637b6b0 Mon Sep 17 00:00:00 2001 From: David Dauer <dsegoviatomas@gmail.com> Date: Wed, 12 Jul 2023 17:41:56 +0200 Subject: [PATCH 2020/3485] [ubuntu] include apt vital pkgs in software report (#7845) --- images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 index c23d1d6d5610..562f029d289a 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 @@ -322,7 +322,7 @@ function Get-CachedDockerImagesTableData { function Get-AptPackages { $apt = (Get-ToolsetContent).Apt $output = @() - ForEach ($pkg in ($apt.common_packages + $apt.cmd_packages)) { + ForEach ($pkg in ($apt.vital_packages + $apt.common_packages + $apt.cmd_packages)) { $version = $(dpkg-query -W -f '${Version}' $pkg) if ($Null -eq $version) { $version = $(dpkg-query -W -f '${Version}' "$pkg*") From c145d7897c0690e9b556c6c821b8783dc8af86a8 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 13 Jul 2023 11:21:57 +0000 Subject: [PATCH 2021/3485] Updating readme file for ubuntu22 version 20230710.1.1 (#7906) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2204-Readme.md | 50 +++++++++++++++---------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/images/linux/Ubuntu2204-Readme.md b/images/linux/Ubuntu2204-Readme.md index b100f56c30be..16f88299b7ce 100644 --- a/images/linux/Ubuntu2204-Readme.md +++ b/images/linux/Ubuntu2204-Readme.md @@ -6,7 +6,7 @@ # Ubuntu 22.04 - OS Version: 22.04.2 LTS - Kernel Version: 5.15.0-1041-azure -- Image Version: 20230702.1.0 +- Image Version: 20230710.1.0 - Systemd version: 249.11-0ubuntu3.9 ## Installed Software @@ -19,10 +19,10 @@ - Dash 0.5.11+git20210903+057cd650a4ed-3build1 - GNU C++: 9.5.0, 10.4.0, 11.3.0, 12.1.0 - GNU Fortran: 9.5.0, 10.4.0, 11.3.0, 12.1.0 -- Julia 1.9.1 -- Kotlin 1.8.22-release-407 -- Mono 6.12.0.182 -- MSBuild 16.10.1.31701 (Mono 6.12.0.182) +- Julia 1.9.2 +- Kotlin 1.9.0-release-358 +- Mono 6.12.0.199 +- MSBuild 16.10.1.31701 (Mono 6.12.0.199) - Node.js 18.16.1 - Perl 5.34.0 - Python 3.10.6 @@ -33,7 +33,7 @@ ### Package Management - cpan 1.64 - Helm 3.12.1 -- Homebrew 4.0.26 +- Homebrew 4.0.28 - Miniconda 23.3.1 - Npm 9.5.1 - NuGet 6.6.1.2 @@ -41,7 +41,7 @@ - Pip3 22.0.2 - Pipx 1.2.0 - RubyGems 3.3.5 -- Vcpkg (build from commit 64adda19c) +- Vcpkg (build from commit dafef74af) - Yarn 1.22.19 #### Environment variables @@ -71,11 +71,11 @@ to accomplish this. - Bicep 0.18.4 - Buildah 1.23.1 - CMake 3.26.4 -- CodeQL Action Bundles 2.13.3 2.13.4 +- CodeQL Action Bundles 2.13.4 2.13.5 - Docker Amazon ECR Credential Helper 0.7.1 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.19.0+azure-1 -- Docker-Buildx 0.11.0 +- Docker Compose v2 2.19.1+azure-1 +- Docker-Buildx 0.11.1 - Docker-Moby Client 20.10.25+azure-2 - Docker-Moby Server 20.10.25+azure-2 - Fastlane 2.213.0 @@ -110,16 +110,16 @@ to accomplish this. - zstd 1.5.5 ### CLI Tools -- Alibaba Cloud CLI 3.0.167 -- AWS CLI 2.12.6 +- Alibaba Cloud CLI 3.0.169 +- AWS CLI 2.13.0 - AWS CLI Session Manager Plugin 1.2.463.0 -- AWS SAM CLI 1.89.0 -- Azure CLI 2.49.0 +- AWS SAM CLI 1.90.0 +- Azure CLI 2.50.0 - Azure CLI (azure-devops) 0.26.0 - GitHub CLI 2.31.0 - Google Cloud SDK 437.0.1 - Hub CLI 2.14.2 -- Netlify CLI 15.8.0 +- Netlify CLI 15.8.1 - OpenShift CLI 4.13.4 - ORAS CLI 1.0.0 - Vercel CLI 31.0.1 @@ -166,7 +166,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Microsoft Edge 114.0.1823.67 - Microsoft Edge WebDriver 114.0.1823.67 - Selenium server 4.10.0 -- Mozilla Firefox 115.0 +- Mozilla Firefox 115.0.1 - Geckodriver 0.33.0 #### Environment variables @@ -238,7 +238,7 @@ Use the following command as a part of your job to start the service: 'sudo syst #### PowerShell Modules - Az: 9.3.0 - MarkdownPS: 1.9 -- Microsoft.Graph: 1.28.0 +- Microsoft.Graph: 2.0.0 - Pester: 5.5.0 - PSScriptAnalyzer: 1.21.0 @@ -282,20 +282,20 @@ Use the following command as a part of your job to start the service: 'sudo syst | alpine:3.16 | sha256:cbe5d5973103a2d03408d1689a6efde4ea4920bde9f4b51fe7872e60ce2d8e56 | 2023-06-14 | | alpine:3.17 | sha256:e95676db9e4a4f16f6cc01a8915368f82b018cc07aba951c1bd1db586c081388 | 2023-06-14 | | alpine:3.18 | sha256:82d1e9d7ed48a7523bdebc18cf6290bdb97b82302a8a9c27d4fe885949ea94d1 | 2023-06-14 | -| buildpack-deps:bullseye | sha256:2987a7a81a0eb17086c6498afedb19002689587038fdef7f5880c2cca973bf13 | 2023-06-13 | -| buildpack-deps:buster | sha256:0da9fe74d5f9bac9754a912b61cf81c62af1247ff3eed0b4f6df00da924f7f21 | 2023-06-13 | -| debian:10 | sha256:28842e4895d36e67c49015c0b41089fa3248e865c76994b19f706ab91e800b95 | 2023-06-12 | -| debian:11 | sha256:1e5f2d70c9441c971607727f56d0776fb9eecf23cd37b595b26db7a974b2301d | 2023-06-12 | +| buildpack-deps:bullseye | sha256:7742ec0838b3c91afb08f8e2e3a5abc2a5379fe6f7e6c242ed4d3b472c7c5c73 | 2023-07-04 | +| buildpack-deps:buster | sha256:93d76989e9b0ebdfe9b96e96095ea6f87c710ecd01b66ce85418232c7af430c3 | 2023-07-04 | +| debian:10 | sha256:c21dbb23d41cb3f1c1a7f841e8642bf713934fb4dc5187979bd46f0b4b488616 | 2023-07-04 | +| debian:11 | sha256:a648e10e02af129706b1fb89e1ac9694ae3db7f2b8439aa906321e68cc281bc0 | 2023-07-04 | | moby/buildkit:latest | sha256:d6fa89830c26919acba23c5cafa09df0c3ec1fbde20bb2a15ff349e0795241f4 | 2023-04-20 | | node:14 | sha256:a158d3b9b4e3fa813fa6c8c590b8f0a860e015ad4e59bbce5744d2f6fd8461aa | 2023-04-12 | | node:14-alpine | sha256:434215b487a329c9e867202ff89e704d3a75e554822e07f3e0c0f9e606121b33 | 2023-03-29 | -| node:16 | sha256:fddc8c24ce0bce462d5050667a80a3681c9c6f9d645c151d5a85e968b21e167a | 2023-06-21 | +| node:16 | sha256:466d0a05ecb1e5b9890960592311fa10c2bc6012fc27dbfdcc74abf10fc324fc | 2023-07-04 | | node:16-alpine | sha256:6c381d5dc2a11dcdb693f0301e8587e43f440c90cdb8933eaaaabb905d44cdb9 | 2023-06-21 | -| node:18 | sha256:19892542dd80e33aec50a51619ab36db0921de240c6a4ff6024d801f84881293 | 2023-06-21 | +| node:18 | sha256:f4698d49371c8a9fa7dd78b97fb2a532213903066e47966542b3b1d403449da4 | 2023-07-04 | | node:18-alpine | sha256:d5b2a7869a4016b1847986ea52098fa404421e44281bb7615a9e3615e07f37fb | 2023-06-21 | | ubuntu:18.04 | sha256:152dc042452c496007f07ca9127571cb9c29697f42acbfad72324b2bb2e43c98 | 2023-05-30 | -| ubuntu:20.04 | sha256:f8f658407c35733471596f25fdb4ed748b80e545ab57e84efbdb1dbbb01bd70e | 2023-06-05 | -| ubuntu:22.04 | sha256:6120be6a2b7ce665d0cbddc3ce6eae60fe94637c6a66985312d1f02f63cc0bcd | 2023-06-05 | +| ubuntu:20.04 | sha256:c9820a44b950956a790c354700c1166a7ec648bc0d215fa438d3a339812f1d01 | 2023-06-28 | +| ubuntu:22.04 | sha256:0bced47fffa3361afa981854fcabcd4577cd43cebbb808cea2b1f33a3dd7f508 | 2023-06-28 | ### Installed apt packages | Name | Version | From 48a11cfaddc00044ad4af1a9162d872f3d695b47 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 13 Jul 2023 11:37:03 +0000 Subject: [PATCH 2022/3485] Updating readme file for ubuntu20 version 20230710.1.1 (#7905) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2004-Readme.md | 58 +++++++++++++++---------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/images/linux/Ubuntu2004-Readme.md b/images/linux/Ubuntu2004-Readme.md index cf018ec6c581..17d6e82e4139 100644 --- a/images/linux/Ubuntu2004-Readme.md +++ b/images/linux/Ubuntu2004-Readme.md @@ -6,7 +6,7 @@ # Ubuntu 20.04 - OS Version: 20.04.6 LTS - Kernel Version: 5.15.0-1041-azure -- Image Version: 20230702.1.0 +- Image Version: 20230710.1.0 - Systemd version: 245.4-4ubuntu3.22 ## Installed Software @@ -21,10 +21,10 @@ - Erlang rebar3 3.22.0 - GNU C++: 9.4.0, 10.3.0 - GNU Fortran: 9.4.0, 10.3.0 -- Julia 1.9.1 -- Kotlin 1.8.22-release-407 -- Mono 6.12.0.182 -- MSBuild 16.10.1.31701 (Mono 6.12.0.182) +- Julia 1.9.2 +- Kotlin 1.9.0-release-358 +- Mono 6.12.0.199 +- MSBuild 16.10.1.31701 (Mono 6.12.0.199) - Node.js 18.16.1 - Perl 5.30.0 - Python 3.8.10 @@ -35,7 +35,7 @@ ### Package Management - cpan 1.64 - Helm 3.12.1 -- Homebrew 4.0.26 +- Homebrew 4.0.28 - Miniconda 23.3.1 - Npm 9.5.1 - NuGet 6.6.1.2 @@ -43,7 +43,7 @@ - Pip3 20.0.2 - Pipx 1.2.0 - RubyGems 3.1.2 -- Vcpkg (build from commit 64adda19c) +- Vcpkg (build from commit dafef74af) - Yarn 1.22.19 #### Environment variables @@ -65,7 +65,7 @@ to accomplish this. - Gradle 8.2 - Lerna 7.1.1 - Maven 3.8.8 -- Sbt 1.9.1 +- Sbt 1.9.2 ### Tools - Ansible 2.13.10 @@ -76,11 +76,11 @@ to accomplish this. - Bicep 0.18.4 - Buildah 1.22.3 - CMake 3.26.4 -- CodeQL Action Bundles 2.13.3 2.13.4 +- CodeQL Action Bundles 2.13.4 2.13.5 - Docker Amazon ECR Credential Helper 0.7.1 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.19.0+azure-1 -- Docker-Buildx 0.11.0 +- Docker Compose v2 2.19.1+azure-1 +- Docker-Buildx 0.11.1 - Docker-Moby Client 20.10.25+azure-2 - Docker-Moby Server 20.10.25+azure-2 - Fastlane 2.213.0 @@ -117,16 +117,16 @@ to accomplish this. - zstd 1.5.5 ### CLI Tools -- Alibaba Cloud CLI 3.0.167 -- AWS CLI 2.12.6 +- Alibaba Cloud CLI 3.0.169 +- AWS CLI 2.13.0 - AWS CLI Session Manager Plugin 1.2.463.0 -- AWS SAM CLI 1.89.0 -- Azure CLI 2.49.0 +- AWS SAM CLI 1.90.0 +- Azure CLI 2.50.0 - Azure CLI (azure-devops) 0.26.0 - GitHub CLI 2.31.0 - Google Cloud SDK 437.0.1 - Hub CLI 2.14.2 -- Netlify CLI 15.8.0 +- Netlify CLI 15.8.1 - OpenShift CLI 4.13.4 - ORAS CLI 1.0.0 - Vercel CLI 31.0.1 @@ -139,7 +139,7 @@ to accomplish this. | 17.0.7+7 | Eclipse Temurin | JAVA_HOME_17_X64 | ### PHP Tools -- PHP: 7.4.33, 8.0.29, 8.1.20, 8.2.7 +- PHP: 7.4.33, 8.0.29, 8.1.21, 8.2.8 - Composer 2.5.8 - PHPUnit 8.5.33 ``` @@ -173,7 +173,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Microsoft Edge 114.0.1823.67 - Microsoft Edge WebDriver 114.0.1823.67 - Selenium server 4.10.0 -- Mozilla Firefox 115.0 +- Mozilla Firefox 115.0.1 - Geckodriver 0.33.0 #### Environment variables @@ -254,7 +254,7 @@ Use the following command as a part of your job to start the service: 'sudo syst - Az: 9.3.0 - Az (Cached): 3.1.0.zip, 4.4.0.zip, 5.9.0.zip, 6.6.0.zip, 7.5.0.zip - MarkdownPS: 1.9 -- Microsoft.Graph: 1.28.0 +- Microsoft.Graph: 2.0.0 - Pester: 5.5.0 - PSScriptAnalyzer: 1.21.0 @@ -299,22 +299,22 @@ Use the following command as a part of your job to start the service: 'sudo syst | alpine:3.16 | sha256:cbe5d5973103a2d03408d1689a6efde4ea4920bde9f4b51fe7872e60ce2d8e56 | 2023-06-14 | | alpine:3.17 | sha256:e95676db9e4a4f16f6cc01a8915368f82b018cc07aba951c1bd1db586c081388 | 2023-06-14 | | alpine:3.18 | sha256:82d1e9d7ed48a7523bdebc18cf6290bdb97b82302a8a9c27d4fe885949ea94d1 | 2023-06-14 | -| buildpack-deps:bullseye | sha256:2987a7a81a0eb17086c6498afedb19002689587038fdef7f5880c2cca973bf13 | 2023-06-13 | -| buildpack-deps:buster | sha256:0da9fe74d5f9bac9754a912b61cf81c62af1247ff3eed0b4f6df00da924f7f21 | 2023-06-13 | +| buildpack-deps:bullseye | sha256:7742ec0838b3c91afb08f8e2e3a5abc2a5379fe6f7e6c242ed4d3b472c7c5c73 | 2023-07-04 | +| buildpack-deps:buster | sha256:93d76989e9b0ebdfe9b96e96095ea6f87c710ecd01b66ce85418232c7af430c3 | 2023-07-04 | | buildpack-deps:stretch | sha256:78e995165a5788c2f55aed6e548d8f6c1534830d4310c870408fccb2da8c5b2e | 2022-06-23 | -| debian:10 | sha256:28842e4895d36e67c49015c0b41089fa3248e865c76994b19f706ab91e800b95 | 2023-06-12 | -| debian:11 | sha256:1e5f2d70c9441c971607727f56d0776fb9eecf23cd37b595b26db7a974b2301d | 2023-06-12 | +| debian:10 | sha256:c21dbb23d41cb3f1c1a7f841e8642bf713934fb4dc5187979bd46f0b4b488616 | 2023-07-04 | +| debian:11 | sha256:a648e10e02af129706b1fb89e1ac9694ae3db7f2b8439aa906321e68cc281bc0 | 2023-07-04 | | debian:9 | sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be | 2022-06-23 | | moby/buildkit:latest | sha256:d6fa89830c26919acba23c5cafa09df0c3ec1fbde20bb2a15ff349e0795241f4 | 2023-04-20 | | node:14 | sha256:a158d3b9b4e3fa813fa6c8c590b8f0a860e015ad4e59bbce5744d2f6fd8461aa | 2023-04-12 | | node:14-alpine | sha256:434215b487a329c9e867202ff89e704d3a75e554822e07f3e0c0f9e606121b33 | 2023-03-29 | -| node:16 | sha256:fddc8c24ce0bce462d5050667a80a3681c9c6f9d645c151d5a85e968b21e167a | 2023-06-21 | +| node:16 | sha256:466d0a05ecb1e5b9890960592311fa10c2bc6012fc27dbfdcc74abf10fc324fc | 2023-07-04 | | node:16-alpine | sha256:6c381d5dc2a11dcdb693f0301e8587e43f440c90cdb8933eaaaabb905d44cdb9 | 2023-06-21 | -| node:18 | sha256:19892542dd80e33aec50a51619ab36db0921de240c6a4ff6024d801f84881293 | 2023-06-21 | +| node:18 | sha256:f4698d49371c8a9fa7dd78b97fb2a532213903066e47966542b3b1d403449da4 | 2023-07-04 | | node:18-alpine | sha256:d5b2a7869a4016b1847986ea52098fa404421e44281bb7615a9e3615e07f37fb | 2023-06-21 | | ubuntu:16.04 | sha256:1f1a2d56de1d604801a9671f301190704c25d604a416f59e03c04f5c6ffee0d6 | 2021-08-31 | | ubuntu:18.04 | sha256:152dc042452c496007f07ca9127571cb9c29697f42acbfad72324b2bb2e43c98 | 2023-05-30 | -| ubuntu:20.04 | sha256:f8f658407c35733471596f25fdb4ed748b80e545ab57e84efbdb1dbbb01bd70e | 2023-06-05 | +| ubuntu:20.04 | sha256:c9820a44b950956a790c354700c1166a7ec648bc0d215fa438d3a339812f1d01 | 2023-06-28 | ### Installed apt packages | Name | Version | @@ -338,7 +338,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | ftp | 0.17-34.1 | | gnupg2 | 2.2.19-3ubuntu2.2 | | haveged | 1.9.1-6ubuntu1 | -| imagemagick | 8:6.9.10.23+dfsg-2.1ubuntu11.7 | +| imagemagick | 8:6.9.10.23+dfsg-2.1ubuntu11.9 | | iproute2 | 5.5.0-1ubuntu1 | | iputils-ping | 3:20190709-3 | | lib32z1 | 1:1.2.11.dfsg-2ubuntu1.5 | @@ -351,8 +351,8 @@ Use the following command as a part of your job to start the service: 'sudo syst | libgsl-dev | 2.5+dfsg-6build1 | | libgtk-3-0 | 3.24.20-0ubuntu1.1 | | libmagic-dev | 1:5.38-4 | -| libmagickcore-dev | 8:6.9.10.23+dfsg-2.1ubuntu11.7 | -| libmagickwand-dev | 8:6.9.10.23+dfsg-2.1ubuntu11.7 | +| libmagickcore-dev | 8:6.9.10.23+dfsg-2.1ubuntu11.9 | +| libmagickwand-dev | 8:6.9.10.23+dfsg-2.1ubuntu11.9 | | libsecret-1-dev | 0.20.4-0ubuntu1 | | libsqlite3-dev | 3.31.1-4ubuntu0.5 | | libtool | 2.4.6-14 | From dc38839721af9380d466f7ab597f3eb1a3c91940 Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Fri, 14 Jul 2023 09:39:01 +0200 Subject: [PATCH 2023/3485] [macos] Cleanup xcversion leftovers (#7911) --- .github/workflows/macos-generation.yml | 1 - images.CI/macos/azure-pipelines/image-generation.yml | 6 ------ 2 files changed, 7 deletions(-) diff --git a/.github/workflows/macos-generation.yml b/.github/workflows/macos-generation.yml index eac3eefe3bb1..8e9083c3ce37 100644 --- a/.github/workflows/macos-generation.yml +++ b/.github/workflows/macos-generation.yml @@ -138,7 +138,6 @@ jobs: env: PACKER_LOG: 1 PACKER_LOG_PATH: ${{ runner.temp }}/packer-log.txt - XCVERSION_COOKIE_PATH: ${{ runner.temp }}/xcversion-cookie/cookie - name: Prepare artifact shell: bash diff --git a/images.CI/macos/azure-pipelines/image-generation.yml b/images.CI/macos/azure-pipelines/image-generation.yml index a8df6292b5b9..5379faaf2465 100644 --- a/images.CI/macos/azure-pipelines/image-generation.yml +++ b/images.CI/macos/azure-pipelines/image-generation.yml @@ -58,12 +58,6 @@ jobs: -VIPassword '$(vcenter-password-v2)' ` -Cluster "$(esxi-cluster-v2)" - - task: DownloadSecureFile@1 - name: xcVersionCookie - displayName: 'Download xcversion session cookie' - inputs: - secureFile: 'cookie' - - pwsh: | $SensitiveData = @( 'IP address:', From 8871622efc7e9156fe8c0338b7743f17dd4de1ed Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 14 Jul 2023 11:34:53 +0200 Subject: [PATCH 2024/3485] Updating readme file for win19 version 20230707.1.1 (#7892) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2019-Readme.md | 40 ++++++++++++++++---------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index 145633cb8bfc..f6679468e3b7 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -4,7 +4,7 @@ *** # Windows Server 2019 - OS Version: 10.0.17763 Build 4499 -- Image Version: 20230630.1.0 +- Image Version: 20230707.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -14,12 +14,12 @@ ### Language and Runtime - Bash 5.2.15(1)-release - Go 1.20.5 -- Julia 1.9.1 -- Kotlin 1.8.22 +- Julia 1.9.2 +- Kotlin 1.9.0 - LLVM 15.0.7 - Node 18.16.1 - Perl 5.32.1 -- PHP 8.2.7 +- PHP 8.2.8 - Python 3.7.9 - Ruby 2.5.9p229 @@ -33,7 +33,7 @@ - pip 23.1.2 (python 3.7) - Pipx 1.2.0 - RubyGems 2.7.6.3 -- Vcpkg (build from commit 4a3c366f2) +- Vcpkg (build from commit dafef74af) - Yarn 1.22.19 #### Environment variables @@ -57,13 +57,13 @@ - Bicep 0.18.4 - Cabal 3.10.1.0 - CMake 3.26.4 -- CodeQL Action Bundles 2.13.3 2.13.4 -- Docker 24.0.2 +- CodeQL Action Bundles 2.13.4 2.13.5 +- Docker 24.0.4 - Docker Compose v1 1.29.2 - Docker Compose v2 2.19.1 - Docker-wincred 0.7.0 - ghc 9.6.2 -- Git 2.41.0.windows.1 +- Git 2.41.0.windows.2 - Git LFS 3.3.0 - Google Cloud SDK 437.0.1 - ImageMagick 7.1.1-12 @@ -84,18 +84,18 @@ - Stack 2.11.1 - Subversion (SVN) 1.14.2 - Swig 4.1.1 -- VSWhere 3.1.4 +- VSWhere 3.1.7 - WinAppDriver 1.2.2009.02003 - WiX Toolset 3.11.2.4516 - yamllint 1.32.0 - zstd 1.5.5 ### CLI Tools -- Alibaba Cloud CLI 3.0.167 -- AWS CLI 2.12.5 -- AWS SAM CLI 1.89.0 +- Alibaba Cloud CLI 3.0.169 +- AWS CLI 2.12.7 +- AWS SAM CLI 1.90.0 - AWS Session Manager CLI 1.2.463.0 -- Azure CLI 2.49.0 +- Azure CLI 2.50.0 - Azure DevOps CLI extension 0.26.0 - Cloud Foundry CLI 6.53.0 - GitHub CLI 2.31.0 @@ -113,14 +113,14 @@ - cargo-outdated 0.13.1 - cbindgen 0.24.5 - Clippy 0.1.70 -- Rustfmt 1.5.2-stable +- Rustfmt 1.5.2 ### Browsers and Drivers - Google Chrome 114.0.5735.199 - Chrome Driver 114.0.5735.90 - Microsoft Edge 114.0.1823.67 - Microsoft Edge Driver 114.0.1823.67 -- Mozilla Firefox 114.0.2 +- Mozilla Firefox 115.0.1 - Gecko Driver 0.33.0 - IE Driver 4.10.0.0 - Selenium server 4.10.0 @@ -511,10 +511,10 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Az (Cached): 1.0.0.zip, 1.6.0.zip, 2.3.2.zip, 2.6.0.zip, 3.1.0.zip, 3.5.0.zip, 3.8.0.zip, 4.3.0.zip, 4.4.0.zip, 4.7.0.zip, 5.5.0.zip, 5.9.0.zip, 6.6.0.zip, 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.363 +- AWSPowershell: 4.1.367 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 -- Microsoft.Graph: 1.28.0 +- Microsoft.Graph: 2.0.0 - Pester: 3.4.0, 5.5.0 - PowerShellGet: 1.0.0.1, 2.2.5 - PSScriptAnalyzer: 1.21.0 @@ -556,9 +556,9 @@ All other versions are saved but not installed. ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:1c8e6d213d957497d12eb3ea2e462c64ba6b8ae88cc6c828bd5a0a9494274858 | 2023-06-23 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:49aad131a4250da60e604cdeaac75c7b39fdb7665cfe5d7f45ac288e5e6861b1 | 2023-06-23 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:7f3424f6c04d174c4e6c5e96f437b00e42ed5af958a73ea915d96ccf4d26c89e | 2023-06-23 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:919c9c2fa5d9decd934157a82e4c037cb383f16182b5f21f705ba195c109c9bc | 2023-07-06 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:1307429f86090e12b8bd3041d4e2283cab766a5c9d8e33d6ab01d022114e4104 | 2023-07-06 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:b97a9c0d1ef553da2d6a512b340d33f69ed0bafd9017cf99d13d7c4b7f11d1a0 | 2023-07-06 | | mcr.microsoft.com/windows/nanoserver:1809 | sha256:81ab2c2f7ac2edf154915667f33ef9e2e77fdbe092c7cc562fff1fcf1762de22 | 2023-06-21 | | mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:341ab68cf115626b5181a9621c2054f71ea6637d05f9d312c2b45a4204c0b94d | 2023-06-21 | From 28fb48a4e9475b77db10eb7394903a921db3f4f1 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 14 Jul 2023 11:35:31 +0200 Subject: [PATCH 2025/3485] Updating readme file for win22 version 20230706.1.1 (#7891) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2022-Readme.md | 38 ++++++++++++++++---------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/images/win/Windows2022-Readme.md b/images/win/Windows2022-Readme.md index cb864a657c64..a29b9b1aa2e5 100644 --- a/images/win/Windows2022-Readme.md +++ b/images/win/Windows2022-Readme.md @@ -4,7 +4,7 @@ *** # Windows Server 2022 - OS Version: 10.0.20348 Build 1787 -- Image Version: 20230630.1.0 +- Image Version: 20230706.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -14,12 +14,12 @@ ### Language and Runtime - Bash 5.2.15(1)-release - Go 1.20.5 -- Julia 1.9.1 -- Kotlin 1.8.22 +- Julia 1.9.2 +- Kotlin 1.9.0 - LLVM 15.0.7 - Node 18.16.1 - Perl 5.32.1 -- PHP 8.2.7 +- PHP 8.2.8 - Python 3.9.13 - Ruby 3.0.6p216 @@ -33,7 +33,7 @@ - pip 23.1.2 (python 3.9) - Pipx 1.2.0 - RubyGems 3.2.33 -- Vcpkg (build from commit 4a3c366f2) +- Vcpkg (build from commit d1e11918f) - Yarn 1.22.19 #### Environment variables @@ -57,8 +57,8 @@ - Bicep 0.18.4 - Cabal 3.10.1.0 - CMake 3.26.4 -- CodeQL Action Bundles 2.13.3 2.13.4 -- Docker 24.0.2 +- CodeQL Action Bundles 2.13.4 2.13.5 +- Docker 24.0.3 - Docker Compose v1 1.29.2 - Docker Compose v2 2.19.1 - Docker-wincred 0.7.0 @@ -82,18 +82,18 @@ - Stack 2.11.1 - Subversion (SVN) 1.14.2 - Swig 4.1.1 -- VSWhere 3.1.4 +- VSWhere 3.1.7 - WinAppDriver 1.2.2009.02003 - WiX Toolset 3.11.2.4516 - yamllint 1.32.0 - zstd 1.5.5 ### CLI Tools -- Alibaba Cloud CLI 3.0.167 -- AWS CLI 2.12.5 -- AWS SAM CLI 1.89.0 +- Alibaba Cloud CLI 3.0.169 +- AWS CLI 2.12.7 +- AWS SAM CLI 1.90.0 - AWS Session Manager CLI 1.2.463.0 -- Azure CLI 2.49.0 +- Azure CLI 2.50.0 - Azure DevOps CLI extension 0.26.0 - GitHub CLI 2.31.0 - Hub CLI 2.14.2 @@ -110,14 +110,14 @@ - cargo-outdated 0.13.1 - cbindgen 0.24.5 - Clippy 0.1.70 -- Rustfmt 1.5.2-stable +- Rustfmt 1.5.2 ### Browsers and Drivers - Google Chrome 114.0.5735.199 - Chrome Driver 114.0.5735.90 -- Microsoft Edge 114.0.1823.58 +- Microsoft Edge 114.0.1823.67 - Microsoft Edge Driver 114.0.1823.67 -- Mozilla Firefox 114.0.2 +- Mozilla Firefox 115.0 - Gecko Driver 0.33.0 - IE Driver 4.10.0.0 - Selenium server 4.10.0 @@ -563,10 +563,10 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Az (Cached): 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.363 +- AWSPowershell: 4.1.366 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 -- Microsoft.Graph: 1.28.0 +- Microsoft.Graph: 2.0.0 - Pester: 3.4.0, 5.5.0 - PowerShellGet: 1.0.0.1, 2.2.5 - PSScriptAnalyzer: 1.21.0 @@ -607,9 +607,9 @@ All other versions are saved but not installed. ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2022 | sha256:7c75a9896911634a3d63c5f38096e54f94958ac4c5b31d79bed311cae8d2169c | 2023-06-23 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2022 | sha256:8c956c715b4d006228dec3c581871d5ccef4afc72ecd88a2df8f0bac1b5c2c94 | 2023-07-06 | | mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2022 | sha256:d426990d3e3b03dbc3b03e1eeafbf3bddc5da7d1a091e0d15f6bfa1e6057feee | 2023-06-23 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:bf06038f0298f5444b6fb4f10708fa42acb33bbb5ea4581d634983746609e262 | 2023-06-23 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:d1a454a7c53f7e2e89c8c143b25cd3cdc05b4f1c219008f2274290291549a640 | 2023-07-06 | | mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:c1426561e854da32f5e8bed3ce41e9eb5c8cb693b5d992323bcc47ed48acd99c | 2023-06-21 | | mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:bc3ec9f19112d40ff23f14a806afd7de7c28ce8a4b69ae1e7e7725bbdeba8964 | 2023-06-21 | From 48e0cd3828ebd1dca461bf67a802c301a0f58de6 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Fri, 14 Jul 2023 11:36:56 +0200 Subject: [PATCH 2026/3485] Add trailing newline to bash_profile (#7909) --- images/macos/provision/configuration/environment/bashprofile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/macos/provision/configuration/environment/bashprofile b/images/macos/provision/configuration/environment/bashprofile index 223689e83a8f..ab4f94c25cc5 100644 --- a/images/macos/provision/configuration/environment/bashprofile +++ b/images/macos/provision/configuration/environment/bashprofile @@ -1 +1 @@ -[ -f $HOME/.bashrc ] && source $HOME/.bashrc \ No newline at end of file +[ -f $HOME/.bashrc ] && source $HOME/.bashrc From 30e6965a6d3d140aa5052cecb203764853126476 Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Mon, 17 Jul 2023 12:39:09 +0200 Subject: [PATCH 2027/3485] Revert "[Ubuntu] do not check ssl cert for hhvm (#7817)" (#7922) This reverts commit aab84abc029015d4482e956a7e8cc1b0c1d2754d. --- images/linux/scripts/installers/hhvm.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/images/linux/scripts/installers/hhvm.sh b/images/linux/scripts/installers/hhvm.sh index 9ddbf3ef7c15..988233102e4d 100644 --- a/images/linux/scripts/installers/hhvm.sh +++ b/images/linux/scripts/installers/hhvm.sh @@ -6,9 +6,7 @@ apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xB4112585D386EB94 add-apt-repository https://dl.hhvm.com/ubuntu -echo 'Acquire::https::dl.hhvm.com::Verify-Peer "false";' > /etc/apt/apt.conf.d/99hhvm-cert apt-get update apt-get -qq install -y hhvm -rm /etc/apt/apt.conf.d/99hhvm-cert invoke_tests "Tools" "HHVM" From c49cbf8408a0f999449c41e2cfea1167c0b71823 Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Mon, 17 Jul 2023 14:59:28 +0200 Subject: [PATCH 2028/3485] [Ubuntu] Remove old Alpine Docker images (#7926) --- images/linux/toolsets/toolset-2004.json | 2 -- images/linux/toolsets/toolset-2204.json | 2 -- 2 files changed, 4 deletions(-) diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index 6cf62fdaab93..d16d3de53653 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -229,8 +229,6 @@ ], "docker": { "images": [ - "alpine:3.14", - "alpine:3.15", "alpine:3.16", "alpine:3.17", "alpine:3.18", diff --git a/images/linux/toolsets/toolset-2204.json b/images/linux/toolsets/toolset-2204.json index 3217f68e99dc..b5bbac7426c2 100644 --- a/images/linux/toolsets/toolset-2204.json +++ b/images/linux/toolsets/toolset-2204.json @@ -215,8 +215,6 @@ ], "docker": { "images": [ - "alpine:3.14", - "alpine:3.15", "alpine:3.16", "alpine:3.17", "alpine:3.18", From 21597cf4f45bf28bbb5c3fe5d0eeeb0b4a2fc6c3 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 18 Jul 2023 10:29:46 +0000 Subject: [PATCH 2029/3485] Updating readme file for macOS-11 version 20230709.1 (#7910) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-11-Readme.md | 68 ++++++++++++++++----------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/images/macos/macos-11-Readme.md b/images/macos/macos-11-Readme.md index ef2eb263d360..2fe839f1b62d 100644 --- a/images/macos/macos-11-Readme.md +++ b/images/macos/macos-11-Readme.md @@ -5,12 +5,12 @@ # macOS 11 - OS Version: macOS 11.7.8 (20G1351) - Kernel Version: Darwin 20.6.0 -- Image Version: 20230623.1 +- Image Version: 20230709.1 ## Installed Software ### Language and Runtime -- .NET Core SDK: 3.1.101, 3.1.201, 3.1.302, 3.1.426, 6.0.411, 7.0.102, 7.0.202, 7.0.305 +- .NET Core SDK: 6.0.411, 7.0.102, 7.0.202, 7.0.305 - Bash 3.2.57(1)-release - Clang/LLVM 13.0.0 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` @@ -20,8 +20,8 @@ - GNU Fortran 10 (Homebrew GCC 10.4.0) - available by `gfortran-10` alias - GNU Fortran 11 (Homebrew GCC 11.4.0) - available by `gfortran-11` alias - GNU Fortran 12 (Homebrew GCC 12.3.0) - available by `gfortran-12` alias -- Julia 1.9.1 -- Kotlin 1.8.22-release-407 +- Julia 1.9.2 +- Kotlin 1.9.0-release-358 - Go 1.20.5 - Mono 6.12.0.188 - MSBuild 16.10.1.51301 (Mono 6.12.0.188) @@ -29,26 +29,26 @@ - NVM 0.39.3 - NVM - Cached node versions: 14.21.3, 16.20.1, 18.16.1 - Perl 5.36.1 -- PHP 8.2.7 +- PHP 8.2.8 - Python 2.7.18 - Python3 3.11.4 - R 4.3.1 - Ruby 2.7.8p225 ### Package Management -- Bundler 2.4.14 +- Bundler 2.4.15 - Carthage 0.39.0 - CocoaPods 1.12.1 - Composer 2.5.8 -- Homebrew 4.0.24 +- Homebrew 4.0.28 - Miniconda 23.3.1 - NPM 9.5.1 - NuGet 6.3.1.1 - Pip 20.3.4 (python 2.7) - Pip3 23.1.2 (python 3.11) - Pipx 1.2.0 -- RubyGems 3.4.14 -- Vcpkg 2023 (build from commit 1286cac87) +- RubyGems 3.4.15 +- Vcpkg 2023 (build from commit dafef74af) - Yarn 1.22.19 #### Environment variables @@ -59,9 +59,9 @@ ### Project Management - Apache Ant 1.10.13 -- Apache Maven 3.9.2 -- Gradle 8.1.1 -- Sbt 1.9.0 +- Apache Maven 3.9.3 +- Gradle 8.2 +- Sbt 1.9.1 ### Utilities - 7-Zip 17.05 @@ -76,10 +76,10 @@ - GitHub CLI 2.31.0 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.4 -- gpg (GnuPG) 2.4.2 +- gpg (GnuPG) 2.4.3 - helm v3.12.1+gf32a527 - Hub CLI 2.14.2 -- ImageMagick 7.1.1-11 +- ImageMagick 7.1.1-12 - jq 1.6 - mongo 5.0.17 - mongod 5.0.17 @@ -96,20 +96,20 @@ - zstd 1.5.5 ### Tools -- Aliyun CLI 3.0.167 -- App Center CLI 2.13.8 -- AWS CLI 2.12.2 -- AWS SAM CLI 1.88.0 +- Aliyun CLI 3.0.169 +- App Center CLI 2.13.9 +- AWS CLI 2.13.0 +- AWS SAM CLI 1.90.0 - AWS Session Manager CLI 1.2.463.0 -- Azure CLI 2.49.0 +- Azure CLI 2.50.0 - Azure CLI (azure-devops) 0.26.0 - Bicep CLI 0.18.4 - Cabal 3.6.2.0 - Cmake 3.26.4 -- CodeQL Action Bundles 2.13.3 2.13.4 +- CodeQL Action Bundles 2.13.4 2.13.5 - Fastlane 2.213.0 - GHC 9.6.2 -- GHCup 0.1.19.2 +- GHCup 0.1.19.4 - Jazzy 0.14.3 - Stack 2.9.3 - SwiftFormat 0.51.12 @@ -123,11 +123,11 @@ ### Browsers - Safari 16.5.1 (16615.2.9.11.7) - SafariDriver 16.5.1 (16615.2.9.11.7) -- Google Chrome 114.0.5735.133 +- Google Chrome 114.0.5735.198 - ChromeDriver 114.0.5735.90 -- Microsoft Edge 114.0.1823.58 -- Microsoft Edge WebDriver 114.0.1823.58 -- Mozilla Firefox 114.0.2 +- Microsoft Edge 114.0.1823.67 +- Microsoft Edge WebDriver 114.0.1823.67 +- Mozilla Firefox 115.0.1 - geckodriver 0.33.0 - Selenium server 4.10.0 @@ -193,19 +193,19 @@ - Rustfmt 1.5.2-stable ### PowerShell Tools -- PowerShell 7.2.11 +- PowerShell 7.2.12 #### PowerShell Modules -- Az: 10.0.0 +- Az: 10.1.0 - MarkdownPS: 1.9 -- Pester: 5.4.1 +- Pester: 5.5.0 - PSScriptAnalyzer: 1.21.0 ### Web Servers -| Name | Version | ConfigFile | ServiceStatus | ListenPort | -| ----- | ------- | ------------------------------- | ------------- | ---------- | -| httpd | 2.4.57 | /usr/local/etc/httpd/httpd.conf | none | 80 | -| nginx | 1.25.1 | /usr/local/etc/nginx/nginx.conf | none | 80 | +| Name | Version | ConfigFile | ServiceStatus | ListenPort | +| ----- | -------- | ------------------------------- | ------------- | ---------- | +| httpd | 2.4.57_1 | /usr/local/etc/httpd/httpd.conf | none | 80 | +| nginx | 1.25.1_1 | /usr/local/etc/nginx/nginx.conf | none | 80 | ### Xamarin @@ -329,7 +329,7 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" | Package Name | Version | | -------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 8.0 | -| Android Emulator | 32.1.13 | +| Android Emulator | 32.1.14 | | Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | | Android SDK Platforms | android-34 (rev 1)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | | Android SDK Platform-Tools | 34.0.3 | @@ -353,6 +353,6 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" ### Miscellaneous - libXext 1.3.5 - libXft 2.3.8 -- Tcl/Tk 8.6.13_3 +- Tcl/Tk 8.6.13_4 - Zlib 1.2.13 From 0f7d7a82caa1a89cac0b656cf840ada34caaa37e Mon Sep 17 00:00:00 2001 From: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com> Date: Tue, 18 Jul 2023 17:47:39 +0200 Subject: [PATCH 2030/3485] [macos] download XCode installer with retries (#7898) --- images/macos/helpers/Xcode.Installer.psm1 | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/images/macos/helpers/Xcode.Installer.psm1 b/images/macos/helpers/Xcode.Installer.psm1 index af7e1ec6e055..89024f6d0184 100644 --- a/images/macos/helpers/Xcode.Installer.psm1 +++ b/images/macos/helpers/Xcode.Installer.psm1 @@ -11,7 +11,7 @@ function Install-XcodeVersion { $xcodeDownloadDirectory = "$env:HOME/Library/Caches/XcodeInstall" $xcodeTargetPath = Get-XcodeRootPath -Version $LinkTo $xcodeXipDirectory = Invoke-DownloadXcodeArchive -DownloadDirectory $xcodeDownloadDirectory -Version $Version - Expand-XcodeXipArchive -DownloadDirectory $xcodeXipDirectory -TargetPath $xcodeTargetPath + Expand-XcodeXipArchive -DownloadDirectory $xcodeXipDirectory.FullName -TargetPath $xcodeTargetPath Remove-Item -Path $xcodeXipDirectory -Force -Recurse } @@ -31,8 +31,7 @@ function Invoke-DownloadXcodeArchive { $xcodeFileName = 'Xcode-{0}.xip' -f $Version $xcodeUri = '{0}{1}{2}'-f ${env:XCODE_INSTALL_STORAGE_URL}, $xcodeFileName, ${env:XCODE_INSTALL_SAS} - Invoke-WebRequest -Uri $xcodeUri -OutFile (Join-Path $tempXipDirectory $xcodeFileName) - + Start-DownloadWithRetry -Url $xcodeUri -DownloadPath $tempXipDirectory.FullName -Name $xcodeFileName return $tempXipDirectory } From 07b561b31a95a099281eb06bf4633a34599e78f5 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 19 Jul 2023 07:36:56 +0000 Subject: [PATCH 2031/3485] Updating readme file for macOS-12 version 20230709.1 (#7904) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-12-Readme.md | 70 ++++++++++++++++----------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/images/macos/macos-12-Readme.md b/images/macos/macos-12-Readme.md index 5e10ce11b25f..ca1537d9492a 100644 --- a/images/macos/macos-12-Readme.md +++ b/images/macos/macos-12-Readme.md @@ -5,12 +5,12 @@ # macOS 12 - OS Version: macOS 12.6.7 (21G651) - Kernel Version: Darwin 21.6.0 -- Image Version: 20230623.2 +- Image Version: 20230709.1 ## Installed Software ### Language and Runtime -- .NET Core SDK: 3.1.101, 3.1.201, 3.1.302, 3.1.426, 6.0.411, 7.0.102, 7.0.202, 7.0.305 +- .NET Core SDK: 6.0.411, 7.0.102, 7.0.202, 7.0.305 - Bash 3.2.57(1)-release - Clang/LLVM 14.0.0 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` @@ -18,8 +18,8 @@ - GCC 12 (Homebrew GCC 12.3.0) - available by `gcc-12` alias - GNU Fortran 11 (Homebrew GCC 11.4.0) - available by `gfortran-11` alias - GNU Fortran 12 (Homebrew GCC 12.3.0) - available by `gfortran-12` alias -- Julia 1.9.1 -- Kotlin 1.8.22-release-407 +- Julia 1.9.2 +- Kotlin 1.9.0-release-358 - Go 1.20.5 - Mono 6.12.0.188 - MSBuild 16.10.1.51301 (Mono 6.12.0.188) @@ -27,26 +27,26 @@ - NVM 0.39.3 - NVM - Cached node versions: 14.21.3, 16.20.1, 18.16.1 - Perl 5.36.1 -- PHP 8.2.7 +- PHP 8.2.8 - Python 2.7.18 - Python3 3.11.4 - R 4.3.1 - Ruby 3.0.6p216 ### Package Management -- Bundler 2.4.14 +- Bundler 2.4.15 - Carthage 0.39.0 - CocoaPods 1.12.1 - Composer 2.5.8 -- Homebrew 4.0.24 +- Homebrew 4.0.28 - Miniconda 23.3.1 - NPM 9.5.1 - NuGet 6.3.1.1 - Pip 20.3.4 (python 2.7) - Pip3 23.1.2 (python 3.11) - Pipx 1.2.0 -- RubyGems 3.4.14 -- Vcpkg 2023 (build from commit 1286cac87) +- RubyGems 3.4.15 +- Vcpkg 2023 (build from commit dafef74af) - Yarn 1.22.19 #### Environment variables @@ -57,9 +57,9 @@ ### Project Management - Apache Ant 1.10.13 -- Apache Maven 3.9.2 -- Gradle 8.1.1 -- Sbt 1.9.0 +- Apache Maven 3.9.3 +- Gradle 8.2 +- Sbt 1.9.1 ### Utilities - 7-Zip 17.05 @@ -74,9 +74,9 @@ - GitHub CLI 2.31.0 - GNU Tar 1.34 - available by 'gtar' alias - GNU Wget 1.21.4 -- gpg (GnuPG) 2.4.2 +- gpg (GnuPG) 2.4.3 - Hub CLI 2.14.2 -- ImageMagick 7.1.1-11 +- ImageMagick 7.1.1-12 - jq 1.6 - mongo 5.0.17 - mongod 5.0.17 @@ -94,20 +94,20 @@ - zstd 1.5.5 ### Tools -- App Center CLI 2.13.8 -- AWS CLI 2.12.2 -- AWS SAM CLI 1.88.0 +- App Center CLI 2.13.9 +- AWS CLI 2.13.0 +- AWS SAM CLI 1.90.0 - AWS Session Manager CLI 1.2.463.0 -- Azure CLI 2.49.0 +- Azure CLI 2.50.0 - Azure CLI (azure-devops) 0.26.0 - Bicep CLI 0.18.4 - Cabal 3.6.2.0 - Cmake 3.26.4 -- CodeQL Action Bundles 2.13.3 2.13.4 +- CodeQL Action Bundles 2.13.4 2.13.5 - Colima 0.5.5 - Fastlane 2.213.0 - GHC 9.6.2 -- GHCup 0.1.19.2 +- GHCup 0.1.19.4 - Jazzy 0.14.3 - Stack 2.9.3 - SwiftFormat 0.51.12 @@ -115,17 +115,17 @@ - Xcode Command Line Tools 14.2.0.0.1.1668646533 ### Linters -- SwiftLint 0.52.3 +- SwiftLint 0.52.4 - Yamllint 1.32.0 ### Browsers - Safari 16.5.1 (17615.2.9.11.7) - SafariDriver 16.5.1 (17615.2.9.11.7) -- Google Chrome 114.0.5735.133 +- Google Chrome 114.0.5735.198 - ChromeDriver 114.0.5735.90 -- Microsoft Edge 114.0.1823.58 -- Microsoft Edge WebDriver 114.0.1823.58 -- Mozilla Firefox 114.0.2 +- Microsoft Edge 114.0.1823.67 +- Microsoft Edge WebDriver 114.0.1823.67 +- Mozilla Firefox 115.0.1 - geckodriver 0.33.0 - Selenium server 4.10.0 @@ -188,19 +188,19 @@ - Rustfmt 1.5.2-stable ### PowerShell Tools -- PowerShell 7.2.11 +- PowerShell 7.2.12 #### PowerShell Modules -- Az: 10.0.0 +- Az: 10.1.0 - MarkdownPS: 1.9 -- Pester: 5.4.1 +- Pester: 5.5.0 - PSScriptAnalyzer: 1.21.0 ### Web Servers -| Name | Version | ConfigFile | ServiceStatus | ListenPort | -| ----- | ------- | ------------------------------- | ------------- | ---------- | -| httpd | 2.4.57 | /usr/local/etc/httpd/httpd.conf | none | 80 | -| nginx | 1.25.1 | /usr/local/etc/nginx/nginx.conf | none | 80 | +| Name | Version | ConfigFile | ServiceStatus | ListenPort | +| ----- | -------- | ------------------------------- | ------------- | ---------- | +| httpd | 2.4.57_1 | /usr/local/etc/httpd/httpd.conf | none | 80 | +| nginx | 1.25.1_1 | /usr/local/etc/nginx/nginx.conf | none | 80 | ### Xamarin @@ -327,7 +327,7 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" | Package Name | Version | | -------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 8.0 | -| Android Emulator | 32.1.13 | +| Android Emulator | 32.1.14 | | Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | | Android SDK Platforms | android-34 (rev 1)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | | Android SDK Platform-Tools | 34.0.3 | @@ -351,13 +351,13 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" ### Miscellaneous - libXext 1.3.5 - libXft 2.3.8 -- Tcl/Tk 8.6.13_3 +- Tcl/Tk 8.6.13_4 - Zlib 1.2.13 #### Environment variables | Name | Value | | ----------------- | ----------------------------------------------------------------------------------------- | -| PARALLELS_DMG_URL | https://download.parallels.com/desktop/v18/18.3.1-53614/ParallelsDesktop-18.3.1-53614.dmg | +| PARALLELS_DMG_URL | https://download.parallels.com/desktop/v18/18.3.2-53621/ParallelsDesktop-18.3.2-53621.dmg | ##### Notes ``` From f0ea46b3ff3ec32a0f32b53481419328fb474a6c Mon Sep 17 00:00:00 2001 From: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com> Date: Wed, 19 Jul 2023 15:41:03 +0200 Subject: [PATCH 2032/3485] [windows] add SQL Server Integration Services Projects 2022 (#7930) --- images/win/toolsets/toolset-2022.json | 1 + 1 file changed, 1 insertion(+) diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index fe2071659928..896a5760f197 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -322,6 +322,7 @@ "wasm.tools" ], "vsix": [ + "SSIS.MicrosoftDataToolsIntegrationServices", "VisualStudioClient.MicrosoftVisualStudio2022InstallerProjects", "WixToolset.WixToolsetVisualStudio2022Extension", "ProBITools.MicrosoftReportProjectsforVisualStudio2022", From c9e6a45f28571ccb940c9e012e5bded4dbd588e3 Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Wed, 19 Jul 2023 18:01:40 +0200 Subject: [PATCH 2033/3485] [macOS] Remove sensitive data from a download log (#7934) --- .../provision/bootstrap-provisioner/installNewProvisioner.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/images/macos/provision/bootstrap-provisioner/installNewProvisioner.sh b/images/macos/provision/bootstrap-provisioner/installNewProvisioner.sh index 81cdbdffc22f..0546addbf4b7 100644 --- a/images/macos/provision/bootstrap-provisioner/installNewProvisioner.sh +++ b/images/macos/provision/bootstrap-provisioner/installNewProvisioner.sh @@ -37,6 +37,10 @@ aria2c \ --file-allocation=none \ -d ${BOOTSTRAP_PATH} "${ProvisionerScriptUri}" >> ${BOOTSTRAP_PATH}/download.log +# Remove sensitive data from logs +sed -i '' 's/'${ProvisionerPackageUri}'/ProvisionerPackageUri/' ${BOOTSTRAP_PATH}/download.log +sed -i '' 's/'${ProvisionerScriptUri}'/ProvisionerScriptUri/' ${BOOTSTRAP_PATH}/download.log + chmod +x ${BOOTSTRAP_PATH}/${ScriptName} # Install Provisioner with provided scripts From e2d7e61adf214506afd93ceac55032cf64c153e9 Mon Sep 17 00:00:00 2001 From: UncertainBadg3r <139782199+UncertainBadg3r@users.noreply.github.com> Date: Thu, 20 Jul 2023 06:22:09 -0400 Subject: [PATCH 2034/3485] Fix minor typo in workflow file (#7931) --- .github/workflows/ubuntu-win-generation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ubuntu-win-generation.yml b/.github/workflows/ubuntu-win-generation.yml index 48dea710e0b7..96a19b47222b 100644 --- a/.github/workflows/ubuntu-win-generation.yml +++ b/.github/workflows/ubuntu-win-generation.yml @@ -62,7 +62,7 @@ jobs: repository: '${{ inputs.custom_repo }}' ref: '${{ inputs.custom_repo_commit_hash }}' - - name: Set image varibles + - name: Set image variables run: | $ImageType = "${{ inputs.image_name }}" From 0c0055cb9d574a0b6f13bf8e08978530696a71ec Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 20 Jul 2023 10:47:52 +0000 Subject: [PATCH 2035/3485] Updating readme file for ubuntu20 version 20230716.1.1 (#7925) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2004-Readme.md | 79 +++++++++++++++++-------------- 1 file changed, 44 insertions(+), 35 deletions(-) diff --git a/images/linux/Ubuntu2004-Readme.md b/images/linux/Ubuntu2004-Readme.md index 17d6e82e4139..d79d0523875b 100644 --- a/images/linux/Ubuntu2004-Readme.md +++ b/images/linux/Ubuntu2004-Readme.md @@ -6,7 +6,7 @@ # Ubuntu 20.04 - OS Version: 20.04.6 LTS - Kernel Version: 5.15.0-1041-azure -- Image Version: 20230710.1.0 +- Image Version: 20230716.1.0 - Systemd version: 245.4-4ubuntu3.22 ## Installed Software @@ -23,8 +23,8 @@ - GNU Fortran: 9.4.0, 10.3.0 - Julia 1.9.2 - Kotlin 1.9.0-release-358 -- Mono 6.12.0.199 -- MSBuild 16.10.1.31701 (Mono 6.12.0.199) +- Mono 6.12.0.200 +- MSBuild 16.10.1.31701 (Mono 6.12.0.200) - Node.js 18.16.1 - Perl 5.30.0 - Python 3.8.10 @@ -34,16 +34,16 @@ ### Package Management - cpan 1.64 -- Helm 3.12.1 +- Helm 3.12.2 - Homebrew 4.0.28 -- Miniconda 23.3.1 +- Miniconda 23.5.2 - Npm 9.5.1 - NuGet 6.6.1.2 - Pip 20.0.2 - Pip3 20.0.2 - Pipx 1.2.0 - RubyGems 3.1.2 -- Vcpkg (build from commit dafef74af) +- Vcpkg (build from commit fba81a6a5) - Yarn 1.22.19 #### Environment variables @@ -62,8 +62,8 @@ to accomplish this. ### Project Management - Ant 1.10.7 -- Gradle 8.2 -- Lerna 7.1.1 +- Gradle 8.2.1 +- Lerna 7.1.4 - Maven 3.8.8 - Sbt 1.9.2 @@ -73,17 +73,17 @@ to accomplish this. - AzCopy 10.19.0 - available by `azcopy` and `azcopy10` aliases - Bazel 6.2.1 - Bazelisk 1.13.2 -- Bicep 0.18.4 +- Bicep 0.19.5 - Buildah 1.22.3 - CMake 3.26.4 -- CodeQL Action Bundles 2.13.4 2.13.5 +- CodeQL Action Bundles 2.13.5 2.14.0 - Docker Amazon ECR Credential Helper 0.7.1 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.19.1+azure-1 +- Docker Compose v2 2.20.0+azure-1 - Docker-Buildx 0.11.1 - Docker-Moby Client 20.10.25+azure-2 - Docker-Moby Server 20.10.25+azure-2 -- Fastlane 2.213.0 +- Fastlane 2.214.0 - Git 2.41.0 - Git LFS 3.3.0 - Git-ftp 1.6.0 @@ -106,30 +106,30 @@ to accomplish this. - Parcel 2.9.3 - PhantomJS 2.1.1 2.1.1 - Podman 3.4.2 -- Pulumi 3.74.0 +- Pulumi 3.75.0 - R 4.3.1 - Skopeo 1.5.0 - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 -- Terraform 1.5.2 +- Terraform 1.5.3 - yamllint 1.32.0 -- yq 4.34.1 +- yq 4.34.2 - zstd 1.5.5 ### CLI Tools - Alibaba Cloud CLI 3.0.169 -- AWS CLI 2.13.0 +- AWS CLI 2.13.1 - AWS CLI Session Manager Plugin 1.2.463.0 - AWS SAM CLI 1.90.0 - Azure CLI 2.50.0 - Azure CLI (azure-devops) 0.26.0 -- GitHub CLI 2.31.0 -- Google Cloud SDK 437.0.1 +- GitHub CLI 2.32.0 +- Google Cloud SDK 438.0.0 - Hub CLI 2.14.2 -- Netlify CLI 15.8.1 +- Netlify CLI 15.9.0 - OpenShift CLI 4.13.4 - ORAS CLI 1.0.0 -- Vercel CLI 31.0.1 +- Vercel CLI 31.0.3 ### Java | Version | Vendor | Environment Variable | @@ -153,15 +153,15 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Stack 2.11.1 ### Rust Tools -- Cargo 1.70.0 -- Rust 1.70.0 -- Rustdoc 1.70.0 +- Cargo 1.71.0 +- Rust 1.71.0 +- Rustdoc 1.71.0 - Rustup 1.26.0 #### Packages - Bindgen 0.66.1 - Cargo audit 0.17.6 -- Cargo clippy 0.1.70 +- Cargo clippy 0.1.71 - Cargo outdated 0.13.1 - Cbindgen 0.24.5 - Rustfmt 1.5.2 @@ -170,10 +170,10 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Google Chrome 114.0.5735.198 - ChromeDriver 114.0.5735.90 - Chromium 114.0.5733.0 -- Microsoft Edge 114.0.1823.67 -- Microsoft Edge WebDriver 114.0.1823.67 +- Microsoft Edge 114.0.1823.82 +- Microsoft Edge WebDriver 114.0.1823.82 - Selenium server 4.10.0 -- Mozilla Firefox 115.0.1 +- Mozilla Firefox 115.0.2 - Geckodriver 0.33.0 #### Environment variables @@ -185,11 +185,11 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | ### .NET Tools -- .NET Core SDK: 6.0.411, 7.0.108, 7.0.203, 7.0.305 +- .NET Core SDK: 6.0.412, 7.0.109, 7.0.203, 7.0.306 - nbgv 3.6.133+2d32d93cb1 ### Databases -- MongoDB 5.0.18 +- MongoDB 5.0.19 - sqlite3 3.31.1 #### PostgreSQL @@ -217,8 +217,8 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Go - 1.18.10 -- 1.19.10 -- 1.20.5 +- 1.19.11 +- 1.20.6 #### Node.js - 14.21.3 @@ -248,13 +248,13 @@ Use the following command as a part of your job to start the service: 'sudo syst - 3.1.4 ### PowerShell Tools -- PowerShell 7.2.12 +- PowerShell 7.2.13 #### PowerShell Modules - Az: 9.3.0 - Az (Cached): 3.1.0.zip, 4.4.0.zip, 5.9.0.zip, 6.6.0.zip, 7.5.0.zip - MarkdownPS: 1.9 -- Microsoft.Graph: 2.0.0 +- Microsoft.Graph: 2.1.0 - Pester: 5.5.0 - PSScriptAnalyzer: 1.21.0 @@ -271,7 +271,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | Android Command Line Tools | 9.0 | | Android Emulator | 32.1.14 | | Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | -| Android SDK Platform-Tools | 34.0.3 | +| Android SDK Platform-Tools | 34.0.4 | | Android SDK Platforms | android-34 (rev 1)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | | Android SDK Tools | 26.1.1 | | Android Support Repository | 47.0.0 | @@ -305,7 +305,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | debian:10 | sha256:c21dbb23d41cb3f1c1a7f841e8642bf713934fb4dc5187979bd46f0b4b488616 | 2023-07-04 | | debian:11 | sha256:a648e10e02af129706b1fb89e1ac9694ae3db7f2b8439aa906321e68cc281bc0 | 2023-07-04 | | debian:9 | sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be | 2022-06-23 | -| moby/buildkit:latest | sha256:d6fa89830c26919acba23c5cafa09df0c3ec1fbde20bb2a15ff349e0795241f4 | 2023-04-20 | +| moby/buildkit:latest | sha256:e70e7a9bfaeafd2cb101b050ca78e1f73032473fc0aac5b10f35c5d26df1e2c6 | 2023-07-12 | | node:14 | sha256:a158d3b9b4e3fa813fa6c8c590b8f0a860e015ad4e59bbce5744d2f6fd8461aa | 2023-04-12 | | node:14-alpine | sha256:434215b487a329c9e867202ff89e704d3a75e554822e07f3e0c0f9e606121b33 | 2023-03-29 | | node:16 | sha256:466d0a05ecb1e5b9890960592311fa10c2bc6012fc27dbfdcc74abf10fc324fc | 2023-07-04 | @@ -326,7 +326,9 @@ Use the following command as a part of your job to start the service: 'sudo syst | binutils | 2.34-6ubuntu1.6 | | bison | 2:3.5.1+dfsg-1 | | brotli | 1.0.7-6ubuntu0.1 | +| bzip2 | 1.0.8-2 | | coreutils | 8.30-3ubuntu2 | +| curl | 7.68.0-1ubuntu2.18 | | dbus | 1.12.16-2ubuntu2.3 | | dnsutils | 1:9.16.1-0ubuntu2.15 | | dpkg | 1.19.7ubuntu3.2 | @@ -336,11 +338,14 @@ Use the following command as a part of your job to start the service: 'sudo syst | flex | 2.6.4-6.2 | | fonts-noto-color-emoji | 0\~20200916-1\~ubuntu20.04.1 | | ftp | 0.17-34.1 | +| g++ | 4:9.3.0-1ubuntu2 | +| gcc | 4:9.3.0-1ubuntu2 | | gnupg2 | 2.2.19-3ubuntu2.2 | | haveged | 1.9.1-6ubuntu1 | | imagemagick | 8:6.9.10.23+dfsg-2.1ubuntu11.9 | | iproute2 | 5.5.0-1ubuntu1 | | iputils-ping | 3:20190709-3 | +| jq | 1.6-1ubuntu0.20.04.1 | | lib32z1 | 1:1.2.11.dfsg-2ubuntu1.5 | | libc++-dev | 1:10.0-50\~exp1 | | libc++abi-dev | 1:10.0-50\~exp1 | @@ -362,6 +367,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | libyaml-dev | 0.2.2-1 | | locales | 2.31-0ubuntu9.9 | | m4 | 1.4.18-4 | +| make | 4.2.1-1.2 | | mediainfo | 19.09-1build1 | | mercurial | 5.3.1-1ubuntu1 | | net-tools | 1.60+git20180626.aebd88e-1ubuntu1 | @@ -385,12 +391,15 @@ Use the following command as a part of your job to start the service: 'sudo syst | subversion | 1.13.0-3ubuntu0.2 | | sudo | 1.8.31-1ubuntu1.5 | | swig | 4.0.1-5build1 | +| tar | 1.30+dfsg-7ubuntu0.20.04.3 | | telnet | 0.17-41.2build1 | | texinfo | 6.7.0.dfsg.2-5 | | time | 1.7-25.1build1 | | tk | 8.6.9+1 | | tzdata | 2023c-0ubuntu0.20.04.2 | +| unzip | 6.0-25ubuntu1.1 | | upx | 3.95-2build1 | +| wget | 1.20.3-1ubuntu2 | | xorriso | 1.5.2-1 | | xvfb | 2:1.20.13-1ubuntu1\~20.04.8 | | xz-utils | 5.2.4-1ubuntu1.1 | From c3ba48f4d802b3ed8bed761b02c1e1e696073b0b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 20 Jul 2023 13:07:47 +0000 Subject: [PATCH 2036/3485] Updating readme file for win19 version 20230716.1.1 (#7927) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2019-Readme.md | 76 ++++++++++++++++---------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index f6679468e3b7..59085aae2a63 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -3,8 +3,8 @@ | [[All OSs] .NET 3.1 will be removed from the images on July, 3](https://github.com/actions/runner-images/issues/7667) | *** # Windows Server 2019 -- OS Version: 10.0.17763 Build 4499 -- Image Version: 20230707.1.0 +- OS Version: 10.0.17763 Build 4645 +- Image Version: 20230716.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -13,7 +13,7 @@ ### Language and Runtime - Bash 5.2.15(1)-release -- Go 1.20.5 +- Go 1.20.6 - Julia 1.9.2 - Kotlin 1.9.0 - LLVM 15.0.7 @@ -26,14 +26,14 @@ ### Package Management - Chocolatey 2.1.0 - Composer 2.5.8 -- Helm 3.12.0 -- Miniconda 23.3.1 (pre-installed on the image but not added to PATH) +- Helm 3.12.1 +- Miniconda 23.5.2 (pre-installed on the image but not added to PATH) - NPM 9.5.1 - NuGet 6.6.1.2 -- pip 23.1.2 (python 3.7) +- pip 23.2 (python 3.7) - Pipx 1.2.0 - RubyGems 2.7.6.3 -- Vcpkg (build from commit dafef74af) +- Vcpkg (build from commit fba81a6a5) - Yarn 1.22.19 #### Environment variables @@ -46,7 +46,7 @@ - Ant 1.10.13 - Gradle 8.1 - Maven 3.8.7 -- sbt 1.9.0 +- sbt 1.9.2 ### Tools - 7zip 23.01 @@ -54,18 +54,18 @@ - azcopy 10.19.0 - Bazel 6.2.1 - Bazelisk 1.13.2 -- Bicep 0.18.4 +- Bicep 0.19.5 - Cabal 3.10.1.0 - CMake 3.26.4 -- CodeQL Action Bundles 2.13.4 2.13.5 +- CodeQL Action Bundles 2.13.5 2.14.0 - Docker 24.0.4 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.19.1 +- Docker Compose v2 2.20.0 - Docker-wincred 0.7.0 - ghc 9.6.2 -- Git 2.41.0.windows.2 +- Git 2.41.0.windows.1 - Git LFS 3.3.0 -- Google Cloud SDK 437.0.1 +- Google Cloud SDK 438.0.0 - ImageMagick 7.1.1-12 - InnoSetup 6.2.2 - jq 1.6 @@ -78,7 +78,7 @@ - OpenSSL 1.1.1u - Packer 1.9.1 - Parcel 2.9.3 -- Pulumi 3.74.0 +- Pulumi 3.75.0 - R 4.3.1 - Service Fabric SDK 9.1.1436.9590 - Stack 2.11.1 @@ -92,19 +92,19 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.169 -- AWS CLI 2.12.7 +- AWS CLI 2.13.1 - AWS SAM CLI 1.90.0 - AWS Session Manager CLI 1.2.463.0 - Azure CLI 2.50.0 - Azure DevOps CLI extension 0.26.0 - Cloud Foundry CLI 6.53.0 -- GitHub CLI 2.31.0 +- GitHub CLI 2.32.0 - Hub CLI 2.14.2 ### Rust Tools -- Cargo 1.70.0 -- Rust 1.70.0 -- Rustdoc 1.70.0 +- Cargo 1.71.0 +- Rust 1.71.0 +- Rustdoc 1.71.0 - Rustup 1.26.0 #### Packages @@ -112,15 +112,15 @@ - cargo-audit 0.17.6 - cargo-outdated 0.13.1 - cbindgen 0.24.5 -- Clippy 0.1.70 +- Clippy 0.1.71 - Rustfmt 1.5.2 ### Browsers and Drivers - Google Chrome 114.0.5735.199 - Chrome Driver 114.0.5735.90 -- Microsoft Edge 114.0.1823.67 -- Microsoft Edge Driver 114.0.1823.67 -- Mozilla Firefox 115.0.1 +- Microsoft Edge 114.0.1823.82 +- Microsoft Edge Driver 114.0.1823.82 +- Mozilla Firefox 115.0.2 - Gecko Driver 0.33.0 - IE Driver 4.10.0.0 - Selenium server 4.10.0 @@ -165,8 +165,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Go - 1.18.10 -- 1.19.10 -- 1.20.5 +- 1.19.11 +- 1.20.6 #### Node.js - 14.21.3 @@ -494,15 +494,15 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 10.0.22621.0 ### .NET Core Tools -- .NET Core SDK: 6.0.119, 6.0.203, 6.0.314, 6.0.411 +- .NET Core SDK: 6.0.120, 6.0.203, 6.0.315, 6.0.412 - .NET Framework: 4.7.2, 4.8 -- Microsoft.AspNetCore.App: 6.0.5, 6.0.19 -- Microsoft.NETCore.App: 6.0.5, 6.0.19 -- Microsoft.WindowsDesktop.App: 6.0.5, 6.0.19 +- Microsoft.AspNetCore.App: 6.0.5, 6.0.20 +- Microsoft.NETCore.App: 6.0.5, 6.0.20 +- Microsoft.WindowsDesktop.App: 6.0.5, 6.0.20 - nbgv 3.6.133+2d32d93cb1 ### PowerShell Tools -- PowerShell 7.2.12 +- PowerShell 7.2.13 #### Powershell Modules - Az: 9.3.0 @@ -511,10 +511,10 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Az (Cached): 1.0.0.zip, 1.6.0.zip, 2.3.2.zip, 2.6.0.zip, 3.1.0.zip, 3.5.0.zip, 3.8.0.zip, 4.3.0.zip, 4.4.0.zip, 4.7.0.zip, 5.5.0.zip, 5.9.0.zip, 6.6.0.zip, 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.367 +- AWSPowershell: 4.1.370 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 -- Microsoft.Graph: 2.0.0 +- Microsoft.Graph: 2.1.0 - Pester: 3.4.0, 5.5.0 - PowerShellGet: 1.0.0.1, 2.2.5 - PSScriptAnalyzer: 1.21.0 @@ -533,7 +533,7 @@ All other versions are saved but not installed. | Android Command Line Tools | 8.0 | | Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3<br>26.0.0 26.0.1 26.0.2 26.0.3<br>25.0.0 25.0.1 25.0.2 25.0.3<br>24.0.0 24.0.1 24.0.2 24.0.3<br>23.0.1 23.0.2 23.0.3<br>22.0.1<br>21.1.2<br>20.0.0<br>19.1.0 | | Android SDK Platforms | android-34 (rev 1)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3)<br>android-26 (rev 2)<br>android-25 (rev 3)<br>android-24 (rev 2)<br>android-23 (rev 3)<br>android-22 (rev 2)<br>android-21 (rev 2)<br>android-20 (rev 2)<br>android-19 (rev 4) | -| Android SDK Platform-Tools | 34.0.3 | +| Android SDK Platform-Tools | 34.0.4 | | Android SDK Tools | 26.1.1 | | Android Support Repository | 47.0.0 | | CMake | 3.10.2<br>3.18.1<br>3.22.1 | @@ -556,9 +556,9 @@ All other versions are saved but not installed. ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:919c9c2fa5d9decd934157a82e4c037cb383f16182b5f21f705ba195c109c9bc | 2023-07-06 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:1307429f86090e12b8bd3041d4e2283cab766a5c9d8e33d6ab01d022114e4104 | 2023-07-06 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:b97a9c0d1ef553da2d6a512b340d33f69ed0bafd9017cf99d13d7c4b7f11d1a0 | 2023-07-06 | -| mcr.microsoft.com/windows/nanoserver:1809 | sha256:81ab2c2f7ac2edf154915667f33ef9e2e77fdbe092c7cc562fff1fcf1762de22 | 2023-06-21 | -| mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:341ab68cf115626b5181a9621c2054f71ea6637d05f9d312c2b45a4204c0b94d | 2023-06-21 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:ad983ebdf56d22cb9ff0691ffcf8dc53d91452527c46f3c2011c2afaff0a0e3f | 2023-07-11 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:fd5580f420bddc5d9f9723df0006a5bb37ac0858d696d054732cc9037d1606eb | 2023-07-11 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:5ff317aa3f2f0e19610c95bae5b9ba66cbe151fdf96765399ef552fb29e03b2d | 2023-07-11 | +| mcr.microsoft.com/windows/nanoserver:1809 | sha256:184914b6008b14ddaf1f9f8944a38c0b2f5ef7e9b13c694a5913528370eed73e | 2023-07-07 | +| mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:31c6e1eb571ced8af4a543204ec1e410161677de56a6f76ce0983928b02af07c | 2023-07-07 | From 434c6431b4cbf2bfbcbd9f894df32a0f31f182e0 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 20 Jul 2023 13:23:08 +0000 Subject: [PATCH 2037/3485] Updating readme file for win22 version 20230716.1.1 (#7928) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2022-Readme.md | 116 +++++++++++++++---------------- 1 file changed, 58 insertions(+), 58 deletions(-) diff --git a/images/win/Windows2022-Readme.md b/images/win/Windows2022-Readme.md index a29b9b1aa2e5..9cb57c5ba7c1 100644 --- a/images/win/Windows2022-Readme.md +++ b/images/win/Windows2022-Readme.md @@ -3,8 +3,8 @@ | [[All OSs] .NET 3.1 will be removed from the images on July, 3](https://github.com/actions/runner-images/issues/7667) | *** # Windows Server 2022 -- OS Version: 10.0.20348 Build 1787 -- Image Version: 20230706.1.0 +- OS Version: 10.0.20348 Build 1850 +- Image Version: 20230716.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -13,7 +13,7 @@ ### Language and Runtime - Bash 5.2.15(1)-release -- Go 1.20.5 +- Go 1.20.6 - Julia 1.9.2 - Kotlin 1.9.0 - LLVM 15.0.7 @@ -26,14 +26,14 @@ ### Package Management - Chocolatey 2.1.0 - Composer 2.5.8 -- Helm 3.12.0 -- Miniconda 23.3.1 (pre-installed on the image but not added to PATH) +- Helm 3.12.1 +- Miniconda 23.5.2 (pre-installed on the image but not added to PATH) - NPM 9.5.1 - NuGet 6.6.1.2 -- pip 23.1.2 (python 3.9) +- pip 23.2 (python 3.9) - Pipx 1.2.0 - RubyGems 3.2.33 -- Vcpkg (build from commit d1e11918f) +- Vcpkg (build from commit fba81a6a5) - Yarn 1.22.19 #### Environment variables @@ -46,7 +46,7 @@ - Ant 1.10.13 - Gradle 8.1 - Maven 3.8.7 -- sbt 1.9.0 +- sbt 1.9.2 ### Tools - 7zip 23.01 @@ -54,13 +54,13 @@ - azcopy 10.19.0 - Bazel 6.2.1 - Bazelisk 1.13.2 -- Bicep 0.18.4 +- Bicep 0.19.5 - Cabal 3.10.1.0 - CMake 3.26.4 -- CodeQL Action Bundles 2.13.4 2.13.5 -- Docker 24.0.3 +- CodeQL Action Bundles 2.13.5 2.14.0 +- Docker 24.0.4 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.19.1 +- Docker Compose v2 2.20.0 - Docker-wincred 0.7.0 - ghc 9.6.2 - Git 2.41.0.windows.1 @@ -76,7 +76,7 @@ - NSIS 3.08 - OpenSSL 1.1.1u - Packer 1.9.1 -- Pulumi 3.74.0 +- Pulumi 3.75.0 - R 4.3.1 - Service Fabric SDK 9.1.1436.9590 - Stack 2.11.1 @@ -90,18 +90,18 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.169 -- AWS CLI 2.12.7 +- AWS CLI 2.13.1 - AWS SAM CLI 1.90.0 - AWS Session Manager CLI 1.2.463.0 - Azure CLI 2.50.0 - Azure DevOps CLI extension 0.26.0 -- GitHub CLI 2.31.0 +- GitHub CLI 2.32.0 - Hub CLI 2.14.2 ### Rust Tools -- Cargo 1.70.0 -- Rust 1.70.0 -- Rustdoc 1.70.0 +- Cargo 1.71.0 +- Rust 1.71.0 +- Rustdoc 1.71.0 - Rustup 1.26.0 #### Packages @@ -109,15 +109,15 @@ - cargo-audit 0.17.6 - cargo-outdated 0.13.1 - cbindgen 0.24.5 -- Clippy 0.1.70 +- Clippy 0.1.71 - Rustfmt 1.5.2 ### Browsers and Drivers - Google Chrome 114.0.5735.199 - Chrome Driver 114.0.5735.90 -- Microsoft Edge 114.0.1823.67 -- Microsoft Edge Driver 114.0.1823.67 -- Mozilla Firefox 115.0 +- Microsoft Edge 114.0.1823.82 +- Microsoft Edge Driver 114.0.1823.82 +- Mozilla Firefox 115.0.2 - Gecko Driver 0.33.0 - IE Driver 4.10.0.0 - Selenium server 4.10.0 @@ -158,8 +158,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Go - 1.18.10 -- 1.19.10 -- 1.20.5 +- 1.19.11 +- 1.20.6 #### Node.js - 14.21.3 @@ -219,7 +219,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Visual Studio Enterprise 2022 | Name | Version | Path | | ----------------------------- | -------------- | -------------------------------------------------------- | -| Visual Studio Enterprise 2022 | 17.6.33815.320 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | +| Visual Studio Enterprise 2022 | 17.6.33829.357 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | #### Workloads, components and extensions | Package | Version | @@ -283,21 +283,21 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.Net.ComponentGroup.4.8.DeveloperTools | 17.6.33605.316 | | Microsoft.Net.ComponentGroup.DevelopmentPrerequisites | 17.6.33605.316 | | Microsoft.Net.ComponentGroup.TargetingPacks.Common | 17.6.33605.316 | -| microsoft.net.runtime.android | 7.0.723.27404 | -| microsoft.net.runtime.android.aot | 7.0.723.27404 | -| microsoft.net.runtime.android.aot.net6 | 7.0.723.27404 | -| microsoft.net.runtime.android.net6 | 7.0.723.27404 | -| microsoft.net.runtime.ios | 7.0.723.27404 | -| microsoft.net.runtime.ios.net6 | 7.0.723.27404 | -| microsoft.net.runtime.maccatalyst | 7.0.723.27404 | -| microsoft.net.runtime.maccatalyst.net6 | 7.0.723.27404 | -| microsoft.net.runtime.mono.tooling | 7.0.723.27404 | -| microsoft.net.runtime.mono.tooling.net6 | 7.0.723.27404 | -| microsoft.net.sdk.emscripten.net7 | 7.0.8.26101 | +| microsoft.net.runtime.android | 7.0.923.32018 | +| microsoft.net.runtime.android.aot | 7.0.923.32018 | +| microsoft.net.runtime.android.aot.net6 | 7.0.923.32018 | +| microsoft.net.runtime.android.net6 | 7.0.923.32018 | +| microsoft.net.runtime.ios | 7.0.923.32018 | +| microsoft.net.runtime.ios.net6 | 7.0.923.32018 | +| microsoft.net.runtime.maccatalyst | 7.0.923.32018 | +| microsoft.net.runtime.maccatalyst.net6 | 7.0.923.32018 | +| microsoft.net.runtime.mono.tooling | 7.0.923.32018 | +| microsoft.net.runtime.mono.tooling.net6 | 7.0.923.32018 | +| microsoft.net.sdk.emscripten.net7 | 7.0.8.32002 | | Microsoft.NetCore.Component.DevelopmentTools | 17.6.33605.316 | -| Microsoft.NetCore.Component.Runtime.6.0 | 17.6.33801.368 | -| Microsoft.NetCore.Component.Runtime.7.0 | 17.6.33801.368 | -| Microsoft.NetCore.Component.SDK | 17.6.33801.368 | +| Microsoft.NetCore.Component.Runtime.6.0 | 17.6.33829.270 | +| Microsoft.NetCore.Component.Runtime.7.0 | 17.6.33829.270 | +| Microsoft.NetCore.Component.SDK | 17.6.33829.270 | | Microsoft.NetCore.Component.Web | 17.6.33605.316 | | Microsoft.VisualStudio.Component.AppInsights.Tools | 17.6.33605.316 | | Microsoft.VisualStudio.Component.AspNet | 17.6.33605.316 | @@ -330,7 +330,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Component.Graphics.Tools | 17.6.33605.316 | | Microsoft.VisualStudio.Component.HLSL | 17.6.33605.316 | | Microsoft.VisualStudio.Component.IISExpress | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.IntelliCode | 17.6.33815.150 | +| Microsoft.VisualStudio.Component.IntelliCode | 17.6.33828.476 | | Microsoft.VisualStudio.Component.IntelliTrace.FrontEnd | 17.6.33605.316 | | Microsoft.VisualStudio.Component.JavaScript.Diagnostics | 17.6.33605.316 | | Microsoft.VisualStudio.Component.JavaScript.TypeScript | 17.6.33605.316 | @@ -513,11 +513,11 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Workload.Python | 17.6.33605.316 | | Microsoft.VisualStudio.Workload.Universal | 17.6.33605.316 | | Microsoft.VisualStudio.Workload.VisualStudioExtension | 17.6.33605.316 | -| runtimes.ios | 7.0.723.27404 | -| runtimes.ios.net6 | 7.0.723.27404 | -| runtimes.maccatalyst | 7.0.723.27404 | -| runtimes.maccatalyst.net6 | 7.0.723.27404 | -| wasm.tools | 7.0.723.27404 | +| runtimes.ios | 7.0.923.32018 | +| runtimes.ios.net6 | 7.0.923.32018 | +| runtimes.maccatalyst | 7.0.923.32018 | +| runtimes.maccatalyst.net6 | 7.0.923.32018 | +| wasm.tools | 7.0.923.32018 | | ProBITools.MicrosoftAnalysisServicesModelingProjects2022 | 3.0.4 | | ProBITools.MicrosoftReportProjectsforVisualStudio2022 | 3.0.1 | | VisualStudioClient.MicrosoftVisualStudio2022InstallerProjects | 2.0.0 | @@ -546,15 +546,15 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 10.0.22621.0 ### .NET Core Tools -- .NET Core SDK: 6.0.119, 6.0.203, 6.0.314, 6.0.411, 7.0.304 +- .NET Core SDK: 6.0.120, 6.0.203, 6.0.315, 6.0.412, 7.0.306 - .NET Framework: 4.8, 4.8.1 -- Microsoft.AspNetCore.App: 6.0.5, 6.0.18, 6.0.19, 7.0.7 -- Microsoft.NETCore.App: 6.0.5, 6.0.18, 6.0.19, 7.0.7 -- Microsoft.WindowsDesktop.App: 6.0.5, 6.0.18, 6.0.19, 7.0.7 +- Microsoft.AspNetCore.App: 6.0.5, 6.0.20, 7.0.9 +- Microsoft.NETCore.App: 6.0.5, 6.0.20, 7.0.9 +- Microsoft.WindowsDesktop.App: 6.0.5, 6.0.20, 7.0.9 - nbgv 3.6.133+2d32d93cb1 ### PowerShell Tools -- PowerShell 7.2.12 +- PowerShell 7.2.13 #### Powershell Modules - Az: 9.3.0 @@ -563,10 +563,10 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Az (Cached): 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.366 +- AWSPowershell: 4.1.370 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 -- Microsoft.Graph: 2.0.0 +- Microsoft.Graph: 2.1.0 - Pester: 3.4.0, 5.5.0 - PowerShellGet: 1.0.0.1, 2.2.5 - PSScriptAnalyzer: 1.21.0 @@ -586,7 +586,7 @@ All other versions are saved but not installed. | Android Emulator | 31.2.9 | | Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | | Android SDK Platforms | android-34 (rev 1)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | -| Android SDK Platform-Tools | 34.0.3 | +| Android SDK Platform-Tools | 34.0.4 | | Android Support Repository | 47.0.0 | | CMake | 3.18.1<br>3.22.1 | | Google Play services | 49 | @@ -607,9 +607,9 @@ All other versions are saved but not installed. ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2022 | sha256:8c956c715b4d006228dec3c581871d5ccef4afc72ecd88a2df8f0bac1b5c2c94 | 2023-07-06 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2022 | sha256:d426990d3e3b03dbc3b03e1eeafbf3bddc5da7d1a091e0d15f6bfa1e6057feee | 2023-06-23 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:d1a454a7c53f7e2e89c8c143b25cd3cdc05b4f1c219008f2274290291549a640 | 2023-07-06 | -| mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:c1426561e854da32f5e8bed3ce41e9eb5c8cb693b5d992323bcc47ed48acd99c | 2023-06-21 | -| mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:bc3ec9f19112d40ff23f14a806afd7de7c28ce8a4b69ae1e7e7725bbdeba8964 | 2023-06-21 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2022 | sha256:addee0a3f1f13a887a52a398b41db9bd095bf86c98c7e5b10666a00ebbb7fe08 | 2023-07-11 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2022 | sha256:44293c778435bbf640f1c1982d6aa0d672ac2a510be3c3169e87ae1389da1abb | 2023-07-11 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:fb90325630afd46ff0ad5e39c2b34a9cdc1b5cfca4cbb84b13f13f6080306afb | 2023-07-11 | +| mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:0e847c01d2565d9abba138dd6bd1eaf5e8c6076d43ecfaff50e94f142899b9f1 | 2023-07-07 | +| mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:7c07bd85c69a70b536ff05c59f49c1e308bf704906e59825d1a30e0cee86a84a | 2023-07-07 | From 26354abedfd80675ad954806265fd20b12646430 Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Thu, 20 Jul 2023 15:24:23 +0200 Subject: [PATCH 2038/3485] [macOS] Access for TestCafe to the ScreenCapture (#7893) --- images/macos/provision/configuration/configure-tccdb-macos.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/images/macos/provision/configuration/configure-tccdb-macos.sh b/images/macos/provision/configuration/configure-tccdb-macos.sh index 3df44a01180d..34bbf693cd9f 100644 --- a/images/macos/provision/configuration/configure-tccdb-macos.sh +++ b/images/macos/provision/configuration/configure-tccdb-macos.sh @@ -18,6 +18,7 @@ systemValuesArray=( "'kTCCServiceAccessibility','/bin/bash',1,2,0,1,NULL,NULL,NULL,'UNUSED',NULL,0,1583997993" "'kTCCServiceMicrophone','/usr/local/opt/runner/runprovisioner.sh',1,2,0,1,NULL,NULL,NULL,'UNUSED',NULL,NULL,1576661342" "'kTCCServiceScreenCapture','/bin/bash',1,2,0,1,NULL,NULL,NULL,'UNUSED',NULL,0,1599831148" + "'kTCCServiceScreenCapture','com.devexpress.testcafe-browser-tools',0,2,3,1,X'fade0c0000000068000000010000000700000007000000080000001443fa4ca5141baeda21aeca1f50894673b440d4690000000800000014f8afcf6e69791b283e55bd0b03e39e422745770e0000000800000014bf4fc1aed64c871a49fc6bc9dd3878ce5d4d17c6',NULL,0,'UNUSED',NULL,0,1687952810" "'kTCCServiceAccessibility','/Library/Application Support/Veertu/Anka/addons/ankarund',1,2,4,1,X'fade0c00000000ac0000000100000006000000020000001e636f6d2e7665657274752e616e6b612e6164646f6e732e616e6b6172756e0000000000060000000f000000060000000e000000010000000a2a864886f76364060206000000000000000000060000000e000000000000000a2a864886f7636406010d0000000000000000000b000000000000000a7375626a6563742e4f550000000000010000000a545439464157503656340000',NULL,0,'UNUSED',NULL,0,1644565949" "'kTCCServiceScreenCapture','/usr/local/opt/runner/provisioner/provisioner',0,2,4,1,NULL,NULL,0,'UNUSED',NULL,0,1687786159" "'kTCCServiceAppleEvents','/usr/local/opt/runner/provisioner/provisioner',1,2,3,1,NULL,NULL,0,'com.apple.finder',X'fade0c000000002c00000001000000060000000200000010636f6d2e6170706c652e66696e64657200000003',NULL,1592919552" From f2de28ac7d0fc04e3079a6d0f9145bbc2f2c3339 Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Thu, 20 Jul 2023 16:15:00 +0200 Subject: [PATCH 2039/3485] Fix chromedriver download process (#7940) --- images/linux/scripts/installers/google-chrome.sh | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/images/linux/scripts/installers/google-chrome.sh b/images/linux/scripts/installers/google-chrome.sh index 5a6ca806b070..cc011ba6c484 100644 --- a/images/linux/scripts/installers/google-chrome.sh +++ b/images/linux/scripts/installers/google-chrome.sh @@ -58,21 +58,17 @@ rm -f /etc/cron.daily/google-chrome /etc/apt/sources.list.d/google-chrome.list / # Parse Google Chrome version FULL_CHROME_VERSION=$(google-chrome --product-version) -CHROME_VERSION=${FULL_CHROME_VERSION%.*} -# Determine the latest release of chromedriver -# Compatibility of Google Chrome and Chromedriver: https://sites.google.com/a/chromium.org/chromedriver/downloads/version-selection -LATEST_CHROMEDRIVER_VERSION=$(curl -sL "https://chromedriver.storage.googleapis.com/LATEST_RELEASE_$CHROME_VERSION") +# Determine the download url for chromedriver +CHROME_VERSIONS_JSON=$(curl -fsSL https://googlechromelabs.github.io/chrome-for-testing/known-good-versions-with-downloads.json) +CHROMEDRIVER_URL=$(echo $CHROME_VERSIONS_JSON | jq -r '.versions[] | select(.version=="'"$FULL_CHROME_VERSION"'").downloads.chromedriver[] | select(.platform=="linux64").url') # Download and unpack the latest release of chromedriver -echo "Downloading chromedriver v$LATEST_CHROMEDRIVER_VERSION..." -CHROMEDRIVER_DIR="/usr/local/share/chrome_driver" -CHROMEDRIVER_BIN="$CHROMEDRIVER_DIR/chromedriver" -CHROMEDRIVER_URL="https://chromedriver.storage.googleapis.com/$LATEST_CHROMEDRIVER_VERSION/chromedriver_linux64.zip" download_with_retries $CHROMEDRIVER_URL "/tmp" "chromedriver_linux64.zip" +unzip -qq /tmp/chromedriver_linux64.zip -d /usr/local/share -mkdir -p $CHROMEDRIVER_DIR -unzip -qq /tmp/chromedriver_linux64.zip -d $CHROMEDRIVER_DIR +CHROMEDRIVER_DIR="/usr/local/share/chromedriver-linux64" +CHROMEDRIVER_BIN="$CHROMEDRIVER_DIR/chromedriver" chmod +x $CHROMEDRIVER_BIN ln -s "$CHROMEDRIVER_BIN" /usr/bin/ echo "CHROMEWEBDRIVER=$CHROMEDRIVER_DIR" | tee -a /etc/environment From be30fbc5437332097d4426e61c1c457cd072ebbd Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 20 Jul 2023 16:34:52 +0000 Subject: [PATCH 2040/3485] Updating readme file for ubuntu22 version 20230716.1.1 (#7924) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2204-Readme.md | 75 +++++++++++++++++-------------- 1 file changed, 42 insertions(+), 33 deletions(-) diff --git a/images/linux/Ubuntu2204-Readme.md b/images/linux/Ubuntu2204-Readme.md index 16f88299b7ce..67a51449ccb4 100644 --- a/images/linux/Ubuntu2204-Readme.md +++ b/images/linux/Ubuntu2204-Readme.md @@ -6,7 +6,7 @@ # Ubuntu 22.04 - OS Version: 22.04.2 LTS - Kernel Version: 5.15.0-1041-azure -- Image Version: 20230710.1.0 +- Image Version: 20230716.1.0 - Systemd version: 249.11-0ubuntu3.9 ## Installed Software @@ -21,8 +21,8 @@ - GNU Fortran: 9.5.0, 10.4.0, 11.3.0, 12.1.0 - Julia 1.9.2 - Kotlin 1.9.0-release-358 -- Mono 6.12.0.199 -- MSBuild 16.10.1.31701 (Mono 6.12.0.199) +- Mono 6.12.0.200 +- MSBuild 16.10.1.31701 (Mono 6.12.0.200) - Node.js 18.16.1 - Perl 5.34.0 - Python 3.10.6 @@ -32,16 +32,16 @@ ### Package Management - cpan 1.64 -- Helm 3.12.1 +- Helm 3.12.2 - Homebrew 4.0.28 -- Miniconda 23.3.1 +- Miniconda 23.5.2 - Npm 9.5.1 - NuGet 6.6.1.2 - Pip 22.0.2 - Pip3 22.0.2 - Pipx 1.2.0 - RubyGems 3.3.5 -- Vcpkg (build from commit dafef74af) +- Vcpkg (build from commit fba81a6a5) - Yarn 1.22.19 #### Environment variables @@ -59,7 +59,7 @@ to accomplish this. ``` ### Project Management -- Lerna 7.1.1 +- Lerna 7.1.4 - Maven 3.8.8 ### Tools @@ -68,17 +68,17 @@ to accomplish this. - AzCopy 10.19.0 - available by `azcopy` and `azcopy10` aliases - Bazel 6.2.1 - Bazelisk 1.13.2 -- Bicep 0.18.4 +- Bicep 0.19.5 - Buildah 1.23.1 - CMake 3.26.4 -- CodeQL Action Bundles 2.13.4 2.13.5 +- CodeQL Action Bundles 2.13.5 2.14.0 - Docker Amazon ECR Credential Helper 0.7.1 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.19.1+azure-1 +- Docker Compose v2 2.20.0+azure-1 - Docker-Buildx 0.11.1 - Docker-Moby Client 20.10.25+azure-2 - Docker-Moby Server 20.10.25+azure-2 -- Fastlane 2.213.0 +- Fastlane 2.214.0 - Git 2.41.0 - Git LFS 3.3.0 - Git-ftp 1.6.0 @@ -99,30 +99,30 @@ to accomplish this. - Packer 1.9.1 - Parcel 2.9.3 - Podman 3.4.4 -- Pulumi 3.74.0 +- Pulumi 3.75.0 - R 4.3.1 - Skopeo 1.4.1 - Sphinx Open Source Search Server 2.2.11 - SVN 1.14.1 -- Terraform 1.5.2 +- Terraform 1.5.3 - yamllint 1.32.0 -- yq 4.34.1 +- yq 4.34.2 - zstd 1.5.5 ### CLI Tools - Alibaba Cloud CLI 3.0.169 -- AWS CLI 2.13.0 +- AWS CLI 2.13.1 - AWS CLI Session Manager Plugin 1.2.463.0 - AWS SAM CLI 1.90.0 - Azure CLI 2.50.0 - Azure CLI (azure-devops) 0.26.0 -- GitHub CLI 2.31.0 -- Google Cloud SDK 437.0.1 +- GitHub CLI 2.32.0 +- Google Cloud SDK 438.0.0 - Hub CLI 2.14.2 -- Netlify CLI 15.8.1 +- Netlify CLI 15.9.0 - OpenShift CLI 4.13.4 - ORAS CLI 1.0.0 -- Vercel CLI 31.0.1 +- Vercel CLI 31.0.3 ### Java | Version | Vendor | Environment Variable | @@ -146,15 +146,15 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Stack 2.11.1 ### Rust Tools -- Cargo 1.70.0 -- Rust 1.70.0 -- Rustdoc 1.70.0 +- Cargo 1.71.0 +- Rust 1.71.0 +- Rustdoc 1.71.0 - Rustup 1.26.0 #### Packages - Bindgen 0.66.1 - Cargo audit 0.17.6 -- Cargo clippy 0.1.70 +- Cargo clippy 0.1.71 - Cargo outdated 0.13.1 - Cbindgen 0.24.5 - Rustfmt 1.5.2 @@ -163,10 +163,10 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Google Chrome 114.0.5735.198 - ChromeDriver 114.0.5735.90 - Chromium 114.0.5733.0 -- Microsoft Edge 114.0.1823.67 -- Microsoft Edge WebDriver 114.0.1823.67 +- Microsoft Edge 114.0.1823.82 +- Microsoft Edge WebDriver 114.0.1823.82 - Selenium server 4.10.0 -- Mozilla Firefox 115.0.1 +- Mozilla Firefox 115.0.2 - Geckodriver 0.33.0 #### Environment variables @@ -178,7 +178,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | ### .NET Tools -- .NET Core SDK: 6.0.411, 7.0.108, 7.0.203, 7.0.305 +- .NET Core SDK: 6.0.412, 7.0.109, 7.0.203, 7.0.306 - nbgv 3.6.133+2d32d93cb1 ### Databases @@ -209,8 +209,8 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Go - 1.18.10 -- 1.19.10 -- 1.20.5 +- 1.19.11 +- 1.20.6 #### Node.js - 14.21.3 @@ -233,12 +233,12 @@ Use the following command as a part of your job to start the service: 'sudo syst - 3.1.4 ### PowerShell Tools -- PowerShell 7.2.12 +- PowerShell 7.2.13 #### PowerShell Modules - Az: 9.3.0 - MarkdownPS: 1.9 -- Microsoft.Graph: 2.0.0 +- Microsoft.Graph: 2.1.0 - Pester: 5.5.0 - PSScriptAnalyzer: 1.21.0 @@ -254,7 +254,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | Android Command Line Tools | 9.0 | | Android Emulator | 32.1.14 | | Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | -| Android SDK Platform-Tools | 34.0.3 | +| Android SDK Platform-Tools | 34.0.4 | | Android SDK Platforms | android-34 (rev 1)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | | Android SDK Tools | 26.1.1 | | Android Support Repository | 47.0.0 | @@ -286,7 +286,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | buildpack-deps:buster | sha256:93d76989e9b0ebdfe9b96e96095ea6f87c710ecd01b66ce85418232c7af430c3 | 2023-07-04 | | debian:10 | sha256:c21dbb23d41cb3f1c1a7f841e8642bf713934fb4dc5187979bd46f0b4b488616 | 2023-07-04 | | debian:11 | sha256:a648e10e02af129706b1fb89e1ac9694ae3db7f2b8439aa906321e68cc281bc0 | 2023-07-04 | -| moby/buildkit:latest | sha256:d6fa89830c26919acba23c5cafa09df0c3ec1fbde20bb2a15ff349e0795241f4 | 2023-04-20 | +| moby/buildkit:latest | sha256:e70e7a9bfaeafd2cb101b050ca78e1f73032473fc0aac5b10f35c5d26df1e2c6 | 2023-07-12 | | node:14 | sha256:a158d3b9b4e3fa813fa6c8c590b8f0a860e015ad4e59bbce5744d2f6fd8461aa | 2023-04-12 | | node:14-alpine | sha256:434215b487a329c9e867202ff89e704d3a75e554822e07f3e0c0f9e606121b33 | 2023-03-29 | | node:16 | sha256:466d0a05ecb1e5b9890960592311fa10c2bc6012fc27dbfdcc74abf10fc324fc | 2023-07-04 | @@ -307,7 +307,9 @@ Use the following command as a part of your job to start the service: 'sudo syst | binutils | 2.38-4ubuntu2.2 | | bison | 2:3.8.2+dfsg-1build1 | | brotli | 1.0.9-2build6 | +| bzip2 | 1.0.8-5build1 | | coreutils | 8.32-4.1ubuntu1 | +| curl | 7.81.0-1ubuntu1.10 | | dbus | 1.12.20-2ubuntu4.1 | | dnsutils | 1:9.18.12-0ubuntu0.22.04.2 | | dpkg | 1.21.1ubuntu2.2 | @@ -317,11 +319,14 @@ Use the following command as a part of your job to start the service: 'sudo syst | flex | 2.6.4-8build2 | | fonts-noto-color-emoji | 2.038-0ubuntu1 | | ftp | 20210827-4build1 | +| g++ | 4:11.2.0-1ubuntu1 | +| gcc | 4:11.2.0-1ubuntu1 | | gnupg2 | 2.2.27-3ubuntu2.1 | | haveged | 1.9.14-1ubuntu1 | | imagemagick | 8:6.9.11.60+dfsg-1.3ubuntu0.22.04.3 | | iproute2 | 5.15.0-1ubuntu2 | | iputils-ping | 3:20211215-1 | +| jq | 1.6-2.1ubuntu3 | | lib32z1 | 1:1.2.11.dfsg-2ubuntu9.2 | | libc++-dev | 1:14.0-55\~exp2 | | libc++abi-dev | 1:14.0-55\~exp2 | @@ -345,6 +350,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | locales | 2.35-0ubuntu3.1 | | lz4 | 1.9.3-2build2 | | m4 | 1.4.18-5ubuntu2 | +| make | 4.3-4.1build1 | | mediainfo | 22.03-1 | | mercurial | 6.1.1-1ubuntu1 | | net-tools | 1.60+git20181103.0eebece-1ubuntu5 | @@ -368,12 +374,15 @@ Use the following command as a part of your job to start the service: 'sudo syst | subversion | 1.14.1-3ubuntu0.22.04.1 | | sudo | 1.9.9-1ubuntu2.4 | | swig | 4.0.2-1ubuntu1 | +| tar | 1.34+dfsg-1ubuntu0.1.22.04.1 | | telnet | 0.17-44build1 | | texinfo | 6.8-4build1 | | time | 1.9-0.1build2 | | tk | 8.6.11+1build2 | | tzdata | 2023c-0ubuntu0.22.04.2 | +| unzip | 6.0-26ubuntu3.1 | | upx | 3.96-3 | +| wget | 1.21.2-2ubuntu1 | | xorriso | 1.5.4-2 | | xvfb | 2:21.1.4-2ubuntu1.7\~22.04.1 | | xz-utils | 5.2.5-2ubuntu1 | From 64d9f902205e919c82c3c72e286baedb6d9776b3 Mon Sep 17 00:00:00 2001 From: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com> Date: Fri, 21 Jul 2023 10:02:53 +0200 Subject: [PATCH 2041/3485] use unique run_id instead of repeative run_number for VM releases (#7941) --- .github/workflows/ubuntu-win-generation.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ubuntu-win-generation.yml b/.github/workflows/ubuntu-win-generation.yml index 96a19b47222b..0a464e3bf5fb 100644 --- a/.github/workflows/ubuntu-win-generation.yml +++ b/.github/workflows/ubuntu-win-generation.yml @@ -86,7 +86,7 @@ jobs: -ClientId ${{ secrets.CLIENT_ID }} ` -ClientSecret ${{ secrets.CLIENT_SECRET }} ` -Location ${{ secrets.AZURE_LOCATION }} ` - -ResourcesNamePrefix ${{ github.run_number }} ` + -ResourcesNamePrefix ${{ github.run_id }} ` -ResourceGroup ${{ secrets.AZURE_RESOURCE_GROUP }} ` -StorageAccount ${{ secrets.AZURE_STORAGE_ACCOUNT }} ` -SubscriptionId ${{ secrets.AZURE_SUBSCRIPTION }} ` @@ -113,7 +113,7 @@ jobs: - name: Create release for VM deployment run: | ./images.CI/linux-and-win/create-release.ps1 ` - -BuildId ${{ github.run_number }} ` + -BuildId ${{ github.run_id }} ` -Organization ${{ secrets.RELEASE_TARGET_ORGANIZATION }} ` -DefinitionId ${{ secrets.RELEASE_TARGET_DEFINITION_ID }} ` -Project ${{ secrets.RELEASE_TARGET_PROJECT }} ` From fe199ce2326898ee268a6a9341bddaf8e739fa30 Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Fri, 21 Jul 2023 10:03:46 +0200 Subject: [PATCH 2042/3485] Stop processing when release list download fails (#7932) --- images/macos/provision/utils/utils.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/macos/provision/utils/utils.sh b/images/macos/provision/utils/utils.sh index 778d8737613c..125c1761c597 100755 --- a/images/macos/provision/utils/utils.sh +++ b/images/macos/provision/utils/utils.sh @@ -202,7 +202,7 @@ get_github_package_download_url() { [ -n "$API_PAT" ] && authString=(-H "Authorization: token ${API_PAT}") - json=$(curl "${authString[@]}" -s "https://api.github.com/repos/${REPO_ORG}/releases?per_page=${SEARCH_IN_COUNT}") + json=$(curl "${authString[@]}" -sSf "https://api.github.com/repos/${REPO_ORG}/releases?per_page=${SEARCH_IN_COUNT}") if [[ "$VERSION" == "latest" ]]; then tagName=$(echo $json | jq -r '.[] | select((.prerelease==false) and (.assets | length > 0)).tag_name' | sort --unique --version-sort | egrep -v ".*-[a-z]" | tail -1) From e486e6c0c73dc434a62aa85d12da378e9953fe13 Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Fri, 21 Jul 2023 13:54:40 +0200 Subject: [PATCH 2043/3485] Temporarily hardcode chromium revision (#7948) --- images/linux/scripts/installers/google-chrome.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/images/linux/scripts/installers/google-chrome.sh b/images/linux/scripts/installers/google-chrome.sh index cc011ba6c484..ee1c6dfd8e1c 100644 --- a/images/linux/scripts/installers/google-chrome.sh +++ b/images/linux/scripts/installers/google-chrome.sh @@ -14,6 +14,12 @@ function GetChromiumRevision { URL="https://omahaproxy.appspot.com/deps.json?version=${CHROME_VERSION}" REVISION=$(curl -s $URL | jq -r '.chromium_base_position') + # Temporarily hardcode revision as both requests + # for 115.0.5790.102 and 115.0.5790.98 return old incorrect revision + if [ $REVISION -eq "1583" ]; then + REVISION="1134878" + fi + # Some Google Chrome versions are based on Chromium revisions for which a (usually very old) Chromium release with the same number exist. So far this has heppened with 4 digits long Chromium revisions (1060, 1086). # Use the previous Chromium release when this happens to avoid downloading and installing very old Chromium releases that would break image build because of incompatibilities. # First reported with: https://github.com/actions/runner-images/issues/5256 From d63b6a7793bffb3ec38ef299dda5479ea2cda106 Mon Sep 17 00:00:00 2001 From: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com> Date: Fri, 21 Jul 2023 14:01:03 +0200 Subject: [PATCH 2044/3485] [ubuntu, windows] cast "run_id" to 32 bit unsigned to match BuildId (#7950) * [ubuntu, windows] cast "run_id" to 32 bit unsigned to match BuildId restriction ./images.CI/linux-and-win/create-release.ps1 ` -BuildId 5621210575 ` -Organization *** ` -DefinitionId *** ` -Project *** ` -ImageName ubuntu2204 ` -AccessToken *** shell: /usr/bin/pwsh -command ". '{0}'" env: CHECKOUT_TYPE: pull_request TemplatePath: /home/vsts/Agents/image-generation/_work/runner-images/runner-images/images/linux/ubuntu2204.pkr.hcl TemplateDirectoryPath: /home/vsts/Agents/image-generation/_work/runner-images/runner-images/images/linux ImageType: ubuntu2204 create-release.ps1: /home/vsts/Agents/image-generation/_work/_temp/ee00e9c3-e508-4c8d-b369-ffe3e2afcbc9.ps1:3 Line | 3 | -BuildId 5621210575 ` | ~~~~~~~~~~ | Cannot process argument transformation on parameter 'BuildId'. Cannot | convert value "5621210575" to type "System.UInt32". Error: "Value was | either too large or too small for a UInt32." * cast another occurence to UInt32 MaxValue --- .github/workflows/ubuntu-win-generation.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ubuntu-win-generation.yml b/.github/workflows/ubuntu-win-generation.yml index 0a464e3bf5fb..33d9ab5cbc02 100644 --- a/.github/workflows/ubuntu-win-generation.yml +++ b/.github/workflows/ubuntu-win-generation.yml @@ -86,7 +86,7 @@ jobs: -ClientId ${{ secrets.CLIENT_ID }} ` -ClientSecret ${{ secrets.CLIENT_SECRET }} ` -Location ${{ secrets.AZURE_LOCATION }} ` - -ResourcesNamePrefix ${{ github.run_id }} ` + -ResourcesNamePrefix ${{ github.run_id }} % [System.UInt32]::MaxValue ` -ResourceGroup ${{ secrets.AZURE_RESOURCE_GROUP }} ` -StorageAccount ${{ secrets.AZURE_STORAGE_ACCOUNT }} ` -SubscriptionId ${{ secrets.AZURE_SUBSCRIPTION }} ` @@ -113,7 +113,7 @@ jobs: - name: Create release for VM deployment run: | ./images.CI/linux-and-win/create-release.ps1 ` - -BuildId ${{ github.run_id }} ` + -BuildId ${{ github.run_id }} % [System.UInt32]::MaxValue ` -Organization ${{ secrets.RELEASE_TARGET_ORGANIZATION }} ` -DefinitionId ${{ secrets.RELEASE_TARGET_DEFINITION_ID }} ` -Project ${{ secrets.RELEASE_TARGET_PROJECT }} ` From 089b4016074395e2478d0be2ab9116947e5d4424 Mon Sep 17 00:00:00 2001 From: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com> Date: Fri, 21 Jul 2023 14:39:00 +0200 Subject: [PATCH 2045/3485] temporarily revert PR7941 (#7952) --- .github/workflows/ubuntu-win-generation.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ubuntu-win-generation.yml b/.github/workflows/ubuntu-win-generation.yml index 33d9ab5cbc02..96a19b47222b 100644 --- a/.github/workflows/ubuntu-win-generation.yml +++ b/.github/workflows/ubuntu-win-generation.yml @@ -86,7 +86,7 @@ jobs: -ClientId ${{ secrets.CLIENT_ID }} ` -ClientSecret ${{ secrets.CLIENT_SECRET }} ` -Location ${{ secrets.AZURE_LOCATION }} ` - -ResourcesNamePrefix ${{ github.run_id }} % [System.UInt32]::MaxValue ` + -ResourcesNamePrefix ${{ github.run_number }} ` -ResourceGroup ${{ secrets.AZURE_RESOURCE_GROUP }} ` -StorageAccount ${{ secrets.AZURE_STORAGE_ACCOUNT }} ` -SubscriptionId ${{ secrets.AZURE_SUBSCRIPTION }} ` @@ -113,7 +113,7 @@ jobs: - name: Create release for VM deployment run: | ./images.CI/linux-and-win/create-release.ps1 ` - -BuildId ${{ github.run_id }} % [System.UInt32]::MaxValue ` + -BuildId ${{ github.run_number }} ` -Organization ${{ secrets.RELEASE_TARGET_ORGANIZATION }} ` -DefinitionId ${{ secrets.RELEASE_TARGET_DEFINITION_ID }} ` -Project ${{ secrets.RELEASE_TARGET_PROJECT }} ` From 54cc4924c5333c65b101139f37f66f0150058a89 Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Fri, 21 Jul 2023 16:03:18 +0200 Subject: [PATCH 2046/3485] [Ubuntu] Install latest chromedriver for current build (#7946) --- images/linux/scripts/installers/google-chrome.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/images/linux/scripts/installers/google-chrome.sh b/images/linux/scripts/installers/google-chrome.sh index ee1c6dfd8e1c..dfb356ced15f 100644 --- a/images/linux/scripts/installers/google-chrome.sh +++ b/images/linux/scripts/installers/google-chrome.sh @@ -64,12 +64,16 @@ rm -f /etc/cron.daily/google-chrome /etc/apt/sources.list.d/google-chrome.list / # Parse Google Chrome version FULL_CHROME_VERSION=$(google-chrome --product-version) +CHROME_VERSION=${FULL_CHROME_VERSION%.*} +echo "Chrome version is $FULL_CHROME_VERSION" # Determine the download url for chromedriver -CHROME_VERSIONS_JSON=$(curl -fsSL https://googlechromelabs.github.io/chrome-for-testing/known-good-versions-with-downloads.json) -CHROMEDRIVER_URL=$(echo $CHROME_VERSIONS_JSON | jq -r '.versions[] | select(.version=="'"$FULL_CHROME_VERSION"'").downloads.chromedriver[] | select(.platform=="linux64").url') +CHROME_VERSIONS_JSON=$(curl -fsSL https://googlechromelabs.github.io/chrome-for-testing/latest-patch-versions-per-build-with-downloads.json) +CHROMEDRIVER_VERSION=$(echo $CHROME_VERSIONS_JSON | jq -r '.builds["'"$CHROME_VERSION"'"].version') +CHROMEDRIVER_URL=$(echo $CHROME_VERSIONS_JSON | jq -r '.builds["'"$CHROME_VERSION"'"].downloads.chromedriver[] | select(.platform=="linux64").url') # Download and unpack the latest release of chromedriver +echo "Installing chromedriver version $CHROMEDRIVER_VERSION" download_with_retries $CHROMEDRIVER_URL "/tmp" "chromedriver_linux64.zip" unzip -qq /tmp/chromedriver_linux64.zip -d /usr/local/share From a5632eb5f287861bdbc4d7acd0ef4b93bf15ec76 Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Fri, 21 Jul 2023 16:26:19 +0200 Subject: [PATCH 2047/3485] [windows] Temporarily pin syft version for SBOM report (#7953) --- .github/workflows/create_sbom_report.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/create_sbom_report.yml b/.github/workflows/create_sbom_report.yml index 0041ba5e3611..a44c3b1e02b8 100644 --- a/.github/workflows/create_sbom_report.yml +++ b/.github/workflows/create_sbom_report.yml @@ -34,7 +34,7 @@ jobs: #Installation section - name: Install SYFT tool on Windows if: ${{ runner.os == 'Windows' }} - run: curl -sSfL https://raw.githubusercontent.com/anchore/syft/main/install.sh | sh -s -- -b D:/syft + run: curl -sSfL https://raw.githubusercontent.com/anchore/syft/main/install.sh | sh -s -- -b D:/syft v0.84.1 - name: Install SYFT tool on Ubuntu or macOS if: ${{ runner.os != 'Windows' }} run: curl -sSfL https://raw.githubusercontent.com/anchore/syft/main/install.sh | sh -s -- -b /usr/local/bin From 654d8a6688a46ab8636309fdc47d378c5d9a2e07 Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Mon, 24 Jul 2023 09:28:34 +0200 Subject: [PATCH 2048/3485] [Windows] Fix chromedriver download process (#7942) --- .../scripts/ImageHelpers/InstallHelpers.ps1 | 6 ++-- .../win/scripts/Installers/Install-Chrome.ps1 | 30 ++++++++++++------- 2 files changed, 24 insertions(+), 12 deletions(-) diff --git a/images/win/scripts/ImageHelpers/InstallHelpers.ps1 b/images/win/scripts/ImageHelpers/InstallHelpers.ps1 index ed142e17b244..7ee8ab94fb3b 100644 --- a/images/win/scripts/ImageHelpers/InstallHelpers.ps1 +++ b/images/win/scripts/ImageHelpers/InstallHelpers.ps1 @@ -451,11 +451,13 @@ function Extract-7Zip { [Parameter(Mandatory=$true)] [string]$Path, [Parameter(Mandatory=$true)] - [string]$DestinationPath + [string]$DestinationPath, + [ValidateSet("x", "e")] + [char]$ExtractMethod = "x" ) Write-Host "Expand archive '$PATH' to '$DestinationPath' directory" - 7z.exe x "$Path" -o"$DestinationPath" -y | Out-Null + 7z.exe $ExtractMethod "$Path" -o"$DestinationPath" -y | Out-Null if ($LASTEXITCODE -ne 0) { diff --git a/images/win/scripts/Installers/Install-Chrome.ps1 b/images/win/scripts/Installers/Install-Chrome.ps1 index 756c7321f0d2..486d4d76d570 100644 --- a/images/win/scripts/Installers/Install-Chrome.ps1 +++ b/images/win/scripts/Installers/Install-Chrome.ps1 @@ -48,23 +48,33 @@ if (-not (Test-Path -Path $ChromeDriverPath)) New-Item -Path $ChromeDriverPath -ItemType Directory -Force } -Write-Host "Get the Chrome WebDriver version..." +Write-Host "Get the Chrome WebDriver download URL..." $RegistryPath = "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths" $ChromePath = (Get-ItemProperty "$RegistryPath\chrome.exe").'(default)' [version]$ChromeVersion = [System.Diagnostics.FileVersionInfo]::GetVersionInfo($ChromePath).ProductVersion -$ChromeDriverVersionUrl = "https://chromedriver.storage.googleapis.com/LATEST_RELEASE_$($ChromeVersion.Major).$($ChromeVersion.Minor).$($ChromeVersion.Build)" +$ChromeBuild = "$($ChromeVersion.Major).$($ChromeVersion.Minor).$($ChromeVersion.Build)" +$ChromeDriverVersionsUrl = "https://googlechromelabs.github.io/chrome-for-testing/latest-patch-versions-per-build-with-downloads.json" -$ChromeDriverVersionFile = Start-DownloadWithRetry -Url $ChromeDriverVersionUrl -Name "versioninfo.txt" -DownloadPath $ChromeDriverPath +Write-Host "Chrome version is $ChromeVersion" +$ChromeDriverVersions = Invoke-RestMethod -Uri $ChromeDriverVersionsUrl +$ChromeDriverVersion = $ChromeDriverVersions.builds.$ChromeBuild -Write-Host "Download Chrome WebDriver..." -$ChromeDriverVersion = Get-Content -Path $ChromeDriverVersionFile -$ChromeDriverArchName = "chromedriver_win32.zip" -$ChromeDriverZipDownloadUrl = "https://chromedriver.storage.googleapis.com/${ChromeDriverVersion}/${ChromeDriverArchName}" +if (-not ($ChromeDriverVersion)) { + $availableVersions = $ChromeDriverVersions.builds | Get-Member | Select-Object -ExpandProperty Name + Write-Host "Available chromedriver builds are $availableVersions" + Throw "Can't determine chromedriver version that matches chrome build $ChromeBuild" +} + +$ChromeDriverVersion.version | Out-File -FilePath "$ChromeDriverPath\versioninfo.txt" -Force; + +Write-Host "Chrome WebDriver version to install is $($ChromeDriverVersion.version)" +$ChromeDriverZipDownloadUrl = ($ChromeDriverVersion.downloads.chromedriver | Where-Object platform -eq "win64").url -$ChromeDriverArchPath = Start-DownloadWithRetry -Url $ChromeDriverZipDownloadUrl -Name $ChromeDriverArchName +Write-Host "Download Chrome WebDriver from $ChromeDriverZipDownloadUrl..." +$ChromeDriverArchPath = Start-DownloadWithRetry -Url $ChromeDriverZipDownloadUrl -Write-Host "Expand Chrome WebDriver archive..." -Extract-7Zip -Path $ChromeDriverArchPath -DestinationPath $ChromeDriverPath +Write-Host "Expand Chrome WebDriver archive (without using directory names)..." +Extract-7Zip -Path $ChromeDriverArchPath -DestinationPath $ChromeDriverPath -ExtractMethod "e" Write-Host "Setting the environment variables..." setx ChromeWebDriver "$ChromeDriverPath" /M From a2250d38f5f3791e9adb77500298a43ceeb11903 Mon Sep 17 00:00:00 2001 From: Ray Xu <ritchxu@github.com> Date: Mon, 24 Jul 2023 00:44:55 -0700 Subject: [PATCH 2049/3485] Enable `nf_conntrack_tcp_be_liberal` for Ubuntu 22.04 until kernel update (#7860) --- images/linux/scripts/installers/configure-environment.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/images/linux/scripts/installers/configure-environment.sh b/images/linux/scripts/installers/configure-environment.sh index 049283f67a90..f7973d54d23e 100644 --- a/images/linux/scripts/installers/configure-environment.sh +++ b/images/linux/scripts/installers/configure-environment.sh @@ -36,6 +36,13 @@ echo 'vm.max_map_count=262144' | tee -a /etc/sysctl.conf echo 'fs.inotify.max_user_watches=655360' | tee -a /etc/sysctl.conf echo 'fs.inotify.max_user_instances=1280' | tee -a /etc/sysctl.conf +# https://github.com/actions/runner-images/pull/7860 +netfilter_rule='/etc/udev/rules.d/50-netfilter.rules' +rulesd="$(dirname "${netfilter_rule}")" +mkdir -p $rulesd +touch $netfilter_rule +echo 'ACTION=="add", SUBSYSTEM=="module", KERNEL=="nf_conntrack", RUN+="/usr/sbin/sysctl net.netfilter.nf_conntrack_tcp_be_liberal=1"' | tee -a $netfilter_rule + # Create symlink for tests running chmod +x $HELPER_SCRIPTS/invoke-tests.sh ln -s $HELPER_SCRIPTS/invoke-tests.sh /usr/local/bin/invoke_tests From 9215ea61f833398d3074f4f9105c2a5c88da26ab Mon Sep 17 00:00:00 2001 From: Tom Burgess <36605761+brgsstm@users.noreply.github.com> Date: Mon, 24 Jul 2023 09:48:38 +0100 Subject: [PATCH 2050/3485] specify min tls for supporting stg acct - to support MS policy (#7920) --- helpers/GenerateResourcesAndImage.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/helpers/GenerateResourcesAndImage.ps1 b/helpers/GenerateResourcesAndImage.ps1 index 6bd81896b28f..17cdda22a2cb 100644 --- a/helpers/GenerateResourcesAndImage.ps1 +++ b/helpers/GenerateResourcesAndImage.ps1 @@ -198,9 +198,9 @@ Function GenerateResourcesAndImage { } if ($tags) { - New-AzStorageAccount -ResourceGroupName $ResourceGroupName -AccountName $storageAccountName -Location $AzureLocation -SkuName "Standard_LRS" -AllowBlobPublicAccess $AllowBlobPublicAccess -EnableHttpsTrafficOnly $EnableHttpsTrafficOnly -Tag $tags + New-AzStorageAccount -ResourceGroupName $ResourceGroupName -AccountName $storageAccountName -Location $AzureLocation -SkuName "Standard_LRS" -AllowBlobPublicAccess $AllowBlobPublicAccess -EnableHttpsTrafficOnly $EnableHttpsTrafficOnly -MinimumTlsVersion "TLS1_2" -Tag $tags } else { - New-AzStorageAccount -ResourceGroupName $ResourceGroupName -AccountName $storageAccountName -Location $AzureLocation -SkuName "Standard_LRS" -AllowBlobPublicAccess $AllowBlobPublicAccess -EnableHttpsTrafficOnly $EnableHttpsTrafficOnly + New-AzStorageAccount -ResourceGroupName $ResourceGroupName -AccountName $storageAccountName -Location $AzureLocation -SkuName "Standard_LRS" -AllowBlobPublicAccess $AllowBlobPublicAccess -EnableHttpsTrafficOnly $EnableHttpsTrafficOnly -MinimumTlsVersion "TLS1_2" } if ([string]::IsNullOrEmpty($AzureClientId)) { From 2733b9fa28c141603991a62766425903e08601e3 Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Tue, 25 Jul 2023 15:16:35 +0200 Subject: [PATCH 2051/3485] [macOS] Install swiftlint from Homebrew (#7912) --- images/macos/provision/core/swiftlint.sh | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/images/macos/provision/core/swiftlint.sh b/images/macos/provision/core/swiftlint.sh index 5be1b0377a04..d01b730830b2 100644 --- a/images/macos/provision/core/swiftlint.sh +++ b/images/macos/provision/core/swiftlint.sh @@ -1,19 +1,16 @@ #!/bin/bash -e -o pipefail source ~/utils/utils.sh -echo "Install SwiftLint" -# SwiftLint now requires Swift 5.6 or higher to build, and macOS 12 or higher to run https://github.com/realm/SwiftLint/releases/tag/0.49.0 +echo Installing Swiftlint... if is_BigSur; then - version="0.48.0" + # SwiftLint now requires Swift 5.6 or higher to build, and macOS 12 or higher to run https://github.com/realm/SwiftLint/releases/tag/0.49.0 + COMMIT=d1d5743344227fe6e3c37cfba19f0cfe15a9448a + FORMULA_URL="https://raw.githubusercontent.com/Homebrew/homebrew-core/$COMMIT/Formula/swiftlint.rb" + + curl -fsSL "$FORMULA_URL" > $(find $(brew --repository) -name swiftlint.rb) + HOMEBREW_NO_AUTO_UPDATE=1 HOMEBREW_NO_INSTALL_FROM_API=1 brew install swiftlint else - version="latest" + brew_smart_install "swiftlint" fi -swiftlintUrl=$(get_github_package_download_url "realm/SwiftLint" "contains(\"portable_swiftlint.zip\")" "$version" "$API_PAT") -download_with_retries $swiftlintUrl "/tmp" "portable_swiftlint.zip" -unzip -q "/tmp/portable_swiftlint.zip" -d /usr/local/bin -# Remove the LICENSE file that comes along with the binary and the downloaded archive -rm -rf "/usr/local/bin/LICENSE" -rm -rf "/tmp/portable_swiftlint.zip" - invoke_tests "Linters" "SwiftLint" From c0ed5f679e28ce8cf435fc4a2baaa7e8a2cf0618 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Tue, 25 Jul 2023 18:16:30 +0200 Subject: [PATCH 2052/3485] Remove cron job from CI (#7977) --- .github/workflows/macos11.yml | 2 -- .github/workflows/macos12.yml | 2 -- .github/workflows/ubuntu2004.yml | 2 -- .github/workflows/ubuntu2204.yml | 2 -- .github/workflows/windows2019.yml | 2 -- .github/workflows/windows2022.yml | 2 -- 6 files changed, 12 deletions(-) diff --git a/.github/workflows/macos11.yml b/.github/workflows/macos11.yml index f77b630f70db..6a15c418a728 100644 --- a/.github/workflows/macos11.yml +++ b/.github/workflows/macos11.yml @@ -12,8 +12,6 @@ on: types: labeled paths: - 'images/macos/**' - schedule: - - cron: '45 0 * * *' jobs: macOS_11: diff --git a/.github/workflows/macos12.yml b/.github/workflows/macos12.yml index bb7fdd271aab..b12e15f22e22 100644 --- a/.github/workflows/macos12.yml +++ b/.github/workflows/macos12.yml @@ -12,8 +12,6 @@ on: types: labeled paths: - 'images/macos/**' - schedule: - - cron: '0 0 * * *' jobs: macOS_12: diff --git a/.github/workflows/ubuntu2004.yml b/.github/workflows/ubuntu2004.yml index 26f2f2d754be..534b33654095 100644 --- a/.github/workflows/ubuntu2004.yml +++ b/.github/workflows/ubuntu2004.yml @@ -12,8 +12,6 @@ on: types: labeled paths: - 'images/linux/**' - schedule: - - cron: '0 0 * * *' jobs: Ubuntu_2004: diff --git a/.github/workflows/ubuntu2204.yml b/.github/workflows/ubuntu2204.yml index f898fa9126af..92fa85f53fc2 100644 --- a/.github/workflows/ubuntu2204.yml +++ b/.github/workflows/ubuntu2204.yml @@ -12,8 +12,6 @@ on: types: labeled paths: - 'images/linux/**' - schedule: - - cron: '0 0 * * *' jobs: Ubuntu_2204: diff --git a/.github/workflows/windows2019.yml b/.github/workflows/windows2019.yml index a8ed8cb47eff..ae1d4a421f92 100644 --- a/.github/workflows/windows2019.yml +++ b/.github/workflows/windows2019.yml @@ -12,8 +12,6 @@ on: types: labeled paths: - 'images/win/**' - schedule: - - cron: '0 0 * * *' jobs: Windows_2019: diff --git a/.github/workflows/windows2022.yml b/.github/workflows/windows2022.yml index f3ed7f3061ae..bf54836b743d 100644 --- a/.github/workflows/windows2022.yml +++ b/.github/workflows/windows2022.yml @@ -12,8 +12,6 @@ on: types: labeled paths: - 'images/win/**' - schedule: - - cron: '0 0 * * *' jobs: Windows_2022: From 291627a3e3e2c99c61a8c0ad94c201fa3e9ecab1 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 26 Jul 2023 07:36:40 +0000 Subject: [PATCH 2053/3485] Updating readme file for ubuntu20 version 20230724.1.1 (#7968) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2004-Readme.md | 77 +++++++++++++++---------------- 1 file changed, 37 insertions(+), 40 deletions(-) diff --git a/images/linux/Ubuntu2004-Readme.md b/images/linux/Ubuntu2004-Readme.md index d79d0523875b..8b02c166c999 100644 --- a/images/linux/Ubuntu2004-Readme.md +++ b/images/linux/Ubuntu2004-Readme.md @@ -1,12 +1,11 @@ | Announcements | |-| -| [[Ubuntu] Alpine 3.14 & 3.15 docker image will be removed on July, 17](https://github.com/actions/runner-images/issues/7824) | -| [[All OSs] .NET 3.1 will be removed from the images on July, 3](https://github.com/actions/runner-images/issues/7667) | +| [[Ubuntu] Alpine 3.14 & 3.15 docker image will be removed on July, 24](https://github.com/actions/runner-images/issues/7824) | *** # Ubuntu 20.04 - OS Version: 20.04.6 LTS - Kernel Version: 5.15.0-1041-azure -- Image Version: 20230716.1.0 +- Image Version: 20230724.1.0 - Systemd version: 245.4-4ubuntu3.22 ## Installed Software @@ -25,7 +24,7 @@ - Kotlin 1.9.0-release-358 - Mono 6.12.0.200 - MSBuild 16.10.1.31701 (Mono 6.12.0.200) -- Node.js 18.16.1 +- Node.js 18.17.0 - Perl 5.30.0 - Python 3.8.10 - Python3 3.8.10 @@ -35,15 +34,15 @@ ### Package Management - cpan 1.64 - Helm 3.12.2 -- Homebrew 4.0.28 +- Homebrew 4.1.0 - Miniconda 23.5.2 -- Npm 9.5.1 +- Npm 9.6.7 - NuGet 6.6.1.2 - Pip 20.0.2 - Pip3 20.0.2 - Pipx 1.2.0 - RubyGems 3.1.2 -- Vcpkg (build from commit fba81a6a5) +- Vcpkg (build from commit d765306b0) - Yarn 1.22.19 #### Environment variables @@ -65,22 +64,22 @@ to accomplish this. - Gradle 8.2.1 - Lerna 7.1.4 - Maven 3.8.8 -- Sbt 1.9.2 +- Sbt 1.9.3 ### Tools -- Ansible 2.13.10 +- Ansible 2.13.11 - apt-fast 1.9.12 - AzCopy 10.19.0 - available by `azcopy` and `azcopy10` aliases - Bazel 6.2.1 - Bazelisk 1.13.2 - Bicep 0.19.5 - Buildah 1.22.3 -- CMake 3.26.4 +- CMake 3.27.0 - CodeQL Action Bundles 2.13.5 2.14.0 - Docker Amazon ECR Credential Helper 0.7.1 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.20.0+azure-1 -- Docker-Buildx 0.11.1 +- Docker Compose v2 2.20.2+azure-1 +- Docker-Buildx 0.11.2 - Docker-Moby Client 20.10.25+azure-2 - Docker-Moby Server 20.10.25+azure-2 - Fastlane 2.214.0 @@ -92,21 +91,21 @@ to accomplish this. - HHVM (HipHop VM) 4.172.1 - jq 1.6 - Kind 0.20.0 -- Kubectl 1.27.3 +- Kubectl 1.27.4 - Kustomize 5.1.0 - Leiningen 2.10.0 - MediaInfo 19.09 - Mercurial 5.3.1 -- Minikube 1.30.1 +- Minikube 1.31.1 - n 9.1.0 - Newman 5.3.2 - nvm 0.39.3 - OpenSSL 1.1.1f-1ubuntu2.19 -- Packer 1.9.1 +- Packer 1.9.2 - Parcel 2.9.3 - PhantomJS 2.1.1 2.1.1 - Podman 3.4.2 -- Pulumi 3.75.0 +- Pulumi 3.76.0 - R 4.3.1 - Skopeo 1.5.0 - Sphinx Open Source Search Server 2.2.11 @@ -117,19 +116,19 @@ to accomplish this. - zstd 1.5.5 ### CLI Tools -- Alibaba Cloud CLI 3.0.169 -- AWS CLI 2.13.1 +- Alibaba Cloud CLI 3.0.170 +- AWS CLI 2.13.3 - AWS CLI Session Manager Plugin 1.2.463.0 -- AWS SAM CLI 1.90.0 +- AWS SAM CLI 1.93.0 - Azure CLI 2.50.0 - Azure CLI (azure-devops) 0.26.0 - GitHub CLI 2.32.0 -- Google Cloud SDK 438.0.0 +- Google Cloud SDK 439.0.0 - Hub CLI 2.14.2 -- Netlify CLI 15.9.0 -- OpenShift CLI 4.13.4 +- Netlify CLI 15.9.1 +- OpenShift CLI 4.13.5 - ORAS CLI 1.0.0 -- Vercel CLI 31.0.3 +- Vercel CLI 31.0.4 ### Java | Version | Vendor | Environment Variable | @@ -167,22 +166,22 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.5.2 ### Browsers and Drivers -- Google Chrome 114.0.5735.198 -- ChromeDriver 114.0.5735.90 +- Google Chrome 115.0.5790.102 +- ChromeDriver 115.0.5790.102 - Chromium 114.0.5733.0 -- Microsoft Edge 114.0.1823.82 -- Microsoft Edge WebDriver 114.0.1823.82 +- Microsoft Edge 115.0.1901.183 +- Microsoft Edge WebDriver 115.0.1901.183 - Selenium server 4.10.0 - Mozilla Firefox 115.0.2 - Geckodriver 0.33.0 #### Environment variables -| Name | Value | -| ----------------- | ----------------------------------- | -| CHROMEWEBDRIVER | /usr/local/share/chrome_driver | -| EDGEWEBDRIVER | /usr/local/share/edge_driver | -| GECKOWEBDRIVER | /usr/local/share/gecko_driver | -| SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | +| Name | Value | +| ----------------- | ------------------------------------- | +| CHROMEWEBDRIVER | /usr/local/share/chromedriver-linux64 | +| EDGEWEBDRIVER | /usr/local/share/edge_driver | +| GECKOWEBDRIVER | /usr/local/share/gecko_driver | +| SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | ### .NET Tools - .NET Core SDK: 6.0.412, 7.0.109, 7.0.203, 7.0.306 @@ -223,7 +222,7 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Node.js - 14.21.3 - 16.20.1 -- 18.16.1 +- 18.17.0 #### Python - 3.6.15 @@ -294,8 +293,6 @@ Use the following command as a part of your job to start the service: 'sudo syst ### Cached Docker images | Repository:Tag | Digest | Created | | ----------------------- | ------------------------------------------------------------------------ | ---------- | -| alpine:3.14 | sha256:0f2d5c38dd7a4f4f733e688e3a6733cb5ab1ac6e3cb4603a5dd564e5bfb80eed | 2023-03-29 | -| alpine:3.15 | sha256:3362f865019db5f14ac5154cb0db2c3741ad1cce0416045be422ad4de441b081 | 2023-06-14 | | alpine:3.16 | sha256:cbe5d5973103a2d03408d1689a6efde4ea4920bde9f4b51fe7872e60ce2d8e56 | 2023-06-14 | | alpine:3.17 | sha256:e95676db9e4a4f16f6cc01a8915368f82b018cc07aba951c1bd1db586c081388 | 2023-06-14 | | alpine:3.18 | sha256:82d1e9d7ed48a7523bdebc18cf6290bdb97b82302a8a9c27d4fe885949ea94d1 | 2023-06-14 | @@ -310,8 +307,8 @@ Use the following command as a part of your job to start the service: 'sudo syst | node:14-alpine | sha256:434215b487a329c9e867202ff89e704d3a75e554822e07f3e0c0f9e606121b33 | 2023-03-29 | | node:16 | sha256:466d0a05ecb1e5b9890960592311fa10c2bc6012fc27dbfdcc74abf10fc324fc | 2023-07-04 | | node:16-alpine | sha256:6c381d5dc2a11dcdb693f0301e8587e43f440c90cdb8933eaaaabb905d44cdb9 | 2023-06-21 | -| node:18 | sha256:f4698d49371c8a9fa7dd78b97fb2a532213903066e47966542b3b1d403449da4 | 2023-07-04 | -| node:18-alpine | sha256:d5b2a7869a4016b1847986ea52098fa404421e44281bb7615a9e3615e07f37fb | 2023-06-21 | +| node:18 | sha256:e7e0921e352fc579d4d1807ecb2a91f42548cb5097e8bd2742e13bd672b7dc4a | 2023-07-19 | +| node:18-alpine | sha256:93d91deea65c9a0475507e8bc8b1917d6278522322f00c00b3ab09cab6830060 | 2023-07-19 | | ubuntu:16.04 | sha256:1f1a2d56de1d604801a9671f301190704c25d604a416f59e03c04f5c6ffee0d6 | 2021-08-31 | | ubuntu:18.04 | sha256:152dc042452c496007f07ca9127571cb9c29697f42acbfad72324b2bb2e43c98 | 2023-05-30 | | ubuntu:20.04 | sha256:c9820a44b950956a790c354700c1166a7ec648bc0d215fa438d3a339812f1d01 | 2023-06-28 | @@ -328,7 +325,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | brotli | 1.0.7-6ubuntu0.1 | | bzip2 | 1.0.8-2 | | coreutils | 8.30-3ubuntu2 | -| curl | 7.68.0-1ubuntu2.18 | +| curl | 7.68.0-1ubuntu2.19 | | dbus | 1.12.16-2ubuntu2.3 | | dnsutils | 1:9.16.1-0ubuntu2.15 | | dpkg | 1.19.7ubuntu3.2 | @@ -350,7 +347,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | libc++-dev | 1:10.0-50\~exp1 | | libc++abi-dev | 1:10.0-50\~exp1 | | libc6-dev | 2.31-0ubuntu9.9 | -| libcurl4 | 7.68.0-1ubuntu2.18 | +| libcurl4 | 7.68.0-1ubuntu2.19 | | libgbm-dev | 21.2.6-0ubuntu0.1\~20.04.2 | | libgconf-2-4 | 3.2.6-6ubuntu1 | | libgsl-dev | 2.5+dfsg-6build1 | From e62d60981121f6c2a2db3a555668ac18275da73a Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Wed, 26 Jul 2023 11:43:20 +0200 Subject: [PATCH 2054/3485] [macOS] Remove ankarund signatures from TCC.db (#7979) --- .../provision/configuration/configure-tccdb-macos.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/images/macos/provision/configuration/configure-tccdb-macos.sh b/images/macos/provision/configuration/configure-tccdb-macos.sh index 34bbf693cd9f..8c5315befaf8 100644 --- a/images/macos/provision/configuration/configure-tccdb-macos.sh +++ b/images/macos/provision/configuration/configure-tccdb-macos.sh @@ -19,7 +19,7 @@ systemValuesArray=( "'kTCCServiceMicrophone','/usr/local/opt/runner/runprovisioner.sh',1,2,0,1,NULL,NULL,NULL,'UNUSED',NULL,NULL,1576661342" "'kTCCServiceScreenCapture','/bin/bash',1,2,0,1,NULL,NULL,NULL,'UNUSED',NULL,0,1599831148" "'kTCCServiceScreenCapture','com.devexpress.testcafe-browser-tools',0,2,3,1,X'fade0c0000000068000000010000000700000007000000080000001443fa4ca5141baeda21aeca1f50894673b440d4690000000800000014f8afcf6e69791b283e55bd0b03e39e422745770e0000000800000014bf4fc1aed64c871a49fc6bc9dd3878ce5d4d17c6',NULL,0,'UNUSED',NULL,0,1687952810" - "'kTCCServiceAccessibility','/Library/Application Support/Veertu/Anka/addons/ankarund',1,2,4,1,X'fade0c00000000ac0000000100000006000000020000001e636f6d2e7665657274752e616e6b612e6164646f6e732e616e6b6172756e0000000000060000000f000000060000000e000000010000000a2a864886f76364060206000000000000000000060000000e000000000000000a2a864886f7636406010d0000000000000000000b000000000000000a7375626a6563742e4f550000000000010000000a545439464157503656340000',NULL,0,'UNUSED',NULL,0,1644565949" + "'kTCCServicePostEvent','/Library/Application Support/Veertu/Anka/addons/ankarund',1,2,4,1,NULL,NULL,0,'UNUSED',NULL,0,1644565949" "'kTCCServiceScreenCapture','/usr/local/opt/runner/provisioner/provisioner',0,2,4,1,NULL,NULL,0,'UNUSED',NULL,0,1687786159" "'kTCCServiceAppleEvents','/usr/local/opt/runner/provisioner/provisioner',1,2,3,1,NULL,NULL,0,'com.apple.finder',X'fade0c000000002c00000001000000060000000200000010636f6d2e6170706c652e66696e64657200000003',NULL,1592919552" "'kTCCServiceAccessibility','/usr/local/opt/runner/provisioner/provisioner',1,2,4,1,NULL,NULL,0,'UNUSED',NULL,NULL,1592919552" @@ -49,9 +49,9 @@ userValuesArray=( "'kTCCServiceMicrophone','/usr/local/opt/runner/runprovisioner.sh',1,2,0,1,NULL,NULL,NULL,'UNUSED',NULL,NULL,1576661342" "'kTCCServiceUbiquity','/System/Library/PrivateFrameworks/PhotoLibraryServices.framework/Versions/A/Support/photolibraryd',1,2,5,1,NULL,NULL,NULL,'UNUSED',NULL,0,1619461750" "'kTCCServiceUbiquity','com.apple.PassKitCore',0,2,5,1,NULL,NULL,NULL,'UNUSED',NULL,0,1619516250" - "'kTCCServiceAppleEvents','/Library/Application Support/Veertu/Anka/addons/ankarund',1,2,3,1,X'fade0c00000000ac0000000100000006000000020000001e636f6d2e7665657274752e616e6b612e6164646f6e732e616e6b6172756e0000000000060000000f000000060000000e000000010000000a2a864886f76364060206000000000000000000060000000e000000000000000a2a864886f7636406010d0000000000000000000b000000000000000a7375626a6563742e4f550000000000010000000a545439464157503656340000',NULL,0,'com.apple.finder',X'fade0c000000002c00000001000000060000000200000010636f6d2e6170706c652e66696e64657200000003',NULL,1629294900" - "'kTCCServiceAppleEvents','/Library/Application Support/Veertu/Anka/addons/ankarund',1,2,3,1,X'fade0c00000000ac0000000100000006000000020000001e636f6d2e7665657274752e616e6b612e6164646f6e732e616e6b6172756e0000000000060000000f000000060000000e000000010000000a2a864886f76364060206000000000000000000060000000e000000000000000a2a864886f7636406010d0000000000000000000b000000000000000a7375626a6563742e4f550000000000010000000a545439464157503656340000',NULL,0,'com.apple.systemevents',X'fade0c000000003400000001000000060000000200000016636f6d2e6170706c652e73797374656d6576656e7473000000000003',NULL,164456761" - "'kTCCServiceAppleEvents','/Library/Application Support/Veertu/Anka/addons/ankarund',1,2,3,1,X'fade0c00000000ac0000000100000006000000020000001e636f6d2e7665657274752e616e6b612e6164646f6e732e616e6b6172756e0000000000060000000f000000060000000e000000010000000a2a864886f76364060206000000000000000000060000000e000000000000000a2a864886f7636406010d0000000000000000000b000000000000000a7375626a6563742e4f550000000000010000000a545439464157503656340000',NULL,0,'com.apple.Terminal',X'fade0c000000003000000001000000060000000200000012636f6d2e6170706c652e5465726d696e616c000000000003',NULL,1655808179" + "'kTCCServiceAppleEvents','/Library/Application Support/Veertu/Anka/addons/ankarund',1,2,3,1,NULL,NULL,0,'com.apple.finder',X'fade0c000000002c00000001000000060000000200000010636f6d2e6170706c652e66696e64657200000003',NULL,1629294900" + "'kTCCServiceAppleEvents','/Library/Application Support/Veertu/Anka/addons/ankarund',1,2,3,1,NULL,NULL,0,'com.apple.systemevents',X'fade0c000000003400000001000000060000000200000016636f6d2e6170706c652e73797374656d6576656e7473000000000003',NULL,164456761" + "'kTCCServiceAppleEvents','/Library/Application Support/Veertu/Anka/addons/ankarund',1,2,3,1,NULL,NULL,0,'com.apple.Terminal',X'fade0c000000003000000001000000060000000200000012636f6d2e6170706c652e5465726d696e616c000000000003',NULL,1655808179" "'kTCCServiceAppleEvents','/usr/libexec/sshd-keygen-wrapper',1,2,3,1,X'fade0c000000003c0000000100000006000000020000001d636f6d2e6170706c652e737368642d6b657967656e2d7772617070657200000000000003',NULL,0,'com.apple.Terminal',X'fade0c000000003000000001000000060000000200000012636f6d2e6170706c652e5465726d696e616c000000000003',NULL,1650386089" "'kTCCServicePostEvent','/bin/bash',1,2,0,1,NULL,NULL,NULL,'UNUSED',NULL,0,1583997993" "'kTCCServiceAppleEvents','/usr/local/opt/runner/provisioner/provisioner',1,2,3,1,NULL,NULL,0,'com.apple.finder',X'fade0c000000002c00000001000000060000000200000010636f6d2e6170706c652e66696e64657200000003',NULL,1592919552" From 35b2bdbc78cea0fc1415da39494df69382c9a75f Mon Sep 17 00:00:00 2001 From: Mike McQuaid <mike@mikemcquaid.com> Date: Wed, 26 Jul 2023 10:45:08 +0100 Subject: [PATCH 2055/3485] macOS bashrc: don't cleanup Homebrew on installation. (#7975) This is unnecessary in ephemeral environments like GitHub Actions. `HOMEBREW_CLEANUP_PERIODIC_FULL_DAYS` avoided the longer periodic cleanup but this is a better fix for speeding up Homebrew a bit in GitHub Actions. --- images/macos/provision/configuration/environment/bashrc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/macos/provision/configuration/environment/bashrc b/images/macos/provision/configuration/environment/bashrc index 2282126099dc..aedd17a65f84 100644 --- a/images/macos/provision/configuration/environment/bashrc +++ b/images/macos/provision/configuration/environment/bashrc @@ -25,8 +25,8 @@ export DOTNET_ROOT=$HOME/.dotnet export DOTNET_MULTILEVEL_LOOKUP=0 export HOMEBREW_NO_AUTO_UPDATE=1 -export HOMEBREW_CLEANUP_PERIODIC_FULL_DAYS=3650 +export HOMEBREW_NO_INSTALL_CLEANUP=1 export HOMEBREW_CASK_OPTS="--no-quarantine" export BOOTSTRAP_HASKELL_NONINTERACTIVE=1 -export BOOTSTRAP_HASKELL_INSTALL_NO_STACK_HOOK=1 \ No newline at end of file +export BOOTSTRAP_HASKELL_INSTALL_NO_STACK_HOOK=1 From f7d3e12c85960eb30b11dee87e70b0392d948d19 Mon Sep 17 00:00:00 2001 From: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com> Date: Wed, 26 Jul 2023 13:37:10 +0200 Subject: [PATCH 2056/3485] second attempt to switch to run_id for release number generation (#7981) --- .github/workflows/ubuntu-win-generation.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ubuntu-win-generation.yml b/.github/workflows/ubuntu-win-generation.yml index 96a19b47222b..c7944d5335ca 100644 --- a/.github/workflows/ubuntu-win-generation.yml +++ b/.github/workflows/ubuntu-win-generation.yml @@ -81,12 +81,13 @@ jobs: - name: Build image run: | + $ResourcesNamePrefix = ${{ github.run_id }} % [System.UInt32]::MaxValue ./images.CI/linux-and-win/build-image.ps1 ` -TemplatePath ${{ env.TemplatePath }} ` -ClientId ${{ secrets.CLIENT_ID }} ` -ClientSecret ${{ secrets.CLIENT_SECRET }} ` -Location ${{ secrets.AZURE_LOCATION }} ` - -ResourcesNamePrefix ${{ github.run_number }} ` + -ResourcesNamePrefix $ResourcesNamePrefix ` -ResourceGroup ${{ secrets.AZURE_RESOURCE_GROUP }} ` -StorageAccount ${{ secrets.AZURE_STORAGE_ACCOUNT }} ` -SubscriptionId ${{ secrets.AZURE_SUBSCRIPTION }} ` @@ -112,8 +113,9 @@ jobs: - name: Create release for VM deployment run: | + $BuildId = ${{ github.run_id }} % [System.UInt32]::MaxValue ./images.CI/linux-and-win/create-release.ps1 ` - -BuildId ${{ github.run_number }} ` + -BuildId $BuildId ` -Organization ${{ secrets.RELEASE_TARGET_ORGANIZATION }} ` -DefinitionId ${{ secrets.RELEASE_TARGET_DEFINITION_ID }} ` -Project ${{ secrets.RELEASE_TARGET_PROJECT }} ` From 79252fad3a14bc2c1893881d39d51905c4d2d50d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 26 Jul 2023 13:08:46 +0000 Subject: [PATCH 2057/3485] Updating readme file for ubuntu22 version 20230724.1.1 (#7967) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2204-Readme.md | 75 +++++++++++++++---------------- 1 file changed, 36 insertions(+), 39 deletions(-) diff --git a/images/linux/Ubuntu2204-Readme.md b/images/linux/Ubuntu2204-Readme.md index 67a51449ccb4..bcac79eb1a49 100644 --- a/images/linux/Ubuntu2204-Readme.md +++ b/images/linux/Ubuntu2204-Readme.md @@ -1,12 +1,11 @@ | Announcements | |-| -| [[Ubuntu] Alpine 3.14 & 3.15 docker image will be removed on July, 17](https://github.com/actions/runner-images/issues/7824) | -| [[All OSs] .NET 3.1 will be removed from the images on July, 3](https://github.com/actions/runner-images/issues/7667) | +| [[Ubuntu] Alpine 3.14 & 3.15 docker image will be removed on July, 24](https://github.com/actions/runner-images/issues/7824) | *** # Ubuntu 22.04 - OS Version: 22.04.2 LTS - Kernel Version: 5.15.0-1041-azure -- Image Version: 20230716.1.0 +- Image Version: 20230724.1.0 - Systemd version: 249.11-0ubuntu3.9 ## Installed Software @@ -23,7 +22,7 @@ - Kotlin 1.9.0-release-358 - Mono 6.12.0.200 - MSBuild 16.10.1.31701 (Mono 6.12.0.200) -- Node.js 18.16.1 +- Node.js 18.17.0 - Perl 5.34.0 - Python 3.10.6 - Python3 3.10.6 @@ -33,15 +32,15 @@ ### Package Management - cpan 1.64 - Helm 3.12.2 -- Homebrew 4.0.28 +- Homebrew 4.1.0 - Miniconda 23.5.2 -- Npm 9.5.1 +- Npm 9.6.7 - NuGet 6.6.1.2 - Pip 22.0.2 - Pip3 22.0.2 - Pipx 1.2.0 - RubyGems 3.3.5 -- Vcpkg (build from commit fba81a6a5) +- Vcpkg (build from commit d765306b0) - Yarn 1.22.19 #### Environment variables @@ -63,19 +62,19 @@ to accomplish this. - Maven 3.8.8 ### Tools -- Ansible 2.15.1 +- Ansible 2.15.2 - apt-fast 1.9.12 - AzCopy 10.19.0 - available by `azcopy` and `azcopy10` aliases - Bazel 6.2.1 - Bazelisk 1.13.2 - Bicep 0.19.5 - Buildah 1.23.1 -- CMake 3.26.4 +- CMake 3.27.0 - CodeQL Action Bundles 2.13.5 2.14.0 - Docker Amazon ECR Credential Helper 0.7.1 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.20.0+azure-1 -- Docker-Buildx 0.11.1 +- Docker Compose v2 2.20.2+azure-1 +- Docker-Buildx 0.11.2 - Docker-Moby Client 20.10.25+azure-2 - Docker-Moby Server 20.10.25+azure-2 - Fastlane 2.214.0 @@ -86,20 +85,20 @@ to accomplish this. - Heroku 8.1.9 - jq 1.6 - Kind 0.20.0 -- Kubectl 1.27.3 +- Kubectl 1.27.4 - Kustomize 5.1.0 - Leiningen 2.10.0 - MediaInfo 21.09 - Mercurial 6.1.1 -- Minikube 1.30.1 +- Minikube 1.31.1 - n 9.1.0 - Newman 5.3.2 - nvm 0.39.3 - OpenSSL 3.0.2-0ubuntu1.10 -- Packer 1.9.1 +- Packer 1.9.2 - Parcel 2.9.3 - Podman 3.4.4 -- Pulumi 3.75.0 +- Pulumi 3.76.0 - R 4.3.1 - Skopeo 1.4.1 - Sphinx Open Source Search Server 2.2.11 @@ -110,19 +109,19 @@ to accomplish this. - zstd 1.5.5 ### CLI Tools -- Alibaba Cloud CLI 3.0.169 -- AWS CLI 2.13.1 +- Alibaba Cloud CLI 3.0.170 +- AWS CLI 2.13.3 - AWS CLI Session Manager Plugin 1.2.463.0 -- AWS SAM CLI 1.90.0 +- AWS SAM CLI 1.93.0 - Azure CLI 2.50.0 - Azure CLI (azure-devops) 0.26.0 - GitHub CLI 2.32.0 -- Google Cloud SDK 438.0.0 +- Google Cloud SDK 439.0.0 - Hub CLI 2.14.2 -- Netlify CLI 15.9.0 -- OpenShift CLI 4.13.4 +- Netlify CLI 15.9.1 +- OpenShift CLI 4.13.5 - ORAS CLI 1.0.0 -- Vercel CLI 31.0.3 +- Vercel CLI 31.0.4 ### Java | Version | Vendor | Environment Variable | @@ -160,22 +159,22 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.5.2 ### Browsers and Drivers -- Google Chrome 114.0.5735.198 -- ChromeDriver 114.0.5735.90 +- Google Chrome 115.0.5790.102 +- ChromeDriver 115.0.5790.102 - Chromium 114.0.5733.0 -- Microsoft Edge 114.0.1823.82 -- Microsoft Edge WebDriver 114.0.1823.82 +- Microsoft Edge 115.0.1901.183 +- Microsoft Edge WebDriver 115.0.1901.183 - Selenium server 4.10.0 - Mozilla Firefox 115.0.2 - Geckodriver 0.33.0 #### Environment variables -| Name | Value | -| ----------------- | ----------------------------------- | -| CHROMEWEBDRIVER | /usr/local/share/chrome_driver | -| EDGEWEBDRIVER | /usr/local/share/edge_driver | -| GECKOWEBDRIVER | /usr/local/share/gecko_driver | -| SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | +| Name | Value | +| ----------------- | ------------------------------------- | +| CHROMEWEBDRIVER | /usr/local/share/chromedriver-linux64 | +| EDGEWEBDRIVER | /usr/local/share/edge_driver | +| GECKOWEBDRIVER | /usr/local/share/gecko_driver | +| SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | ### .NET Tools - .NET Core SDK: 6.0.412, 7.0.109, 7.0.203, 7.0.306 @@ -215,7 +214,7 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Node.js - 14.21.3 - 16.20.1 -- 18.16.1 +- 18.17.0 #### Python - 3.7.17 @@ -277,8 +276,6 @@ Use the following command as a part of your job to start the service: 'sudo syst ### Cached Docker images | Repository:Tag | Digest | Created | | ----------------------- | ------------------------------------------------------------------------ | ---------- | -| alpine:3.14 | sha256:0f2d5c38dd7a4f4f733e688e3a6733cb5ab1ac6e3cb4603a5dd564e5bfb80eed | 2023-03-29 | -| alpine:3.15 | sha256:3362f865019db5f14ac5154cb0db2c3741ad1cce0416045be422ad4de441b081 | 2023-06-14 | | alpine:3.16 | sha256:cbe5d5973103a2d03408d1689a6efde4ea4920bde9f4b51fe7872e60ce2d8e56 | 2023-06-14 | | alpine:3.17 | sha256:e95676db9e4a4f16f6cc01a8915368f82b018cc07aba951c1bd1db586c081388 | 2023-06-14 | | alpine:3.18 | sha256:82d1e9d7ed48a7523bdebc18cf6290bdb97b82302a8a9c27d4fe885949ea94d1 | 2023-06-14 | @@ -291,8 +288,8 @@ Use the following command as a part of your job to start the service: 'sudo syst | node:14-alpine | sha256:434215b487a329c9e867202ff89e704d3a75e554822e07f3e0c0f9e606121b33 | 2023-03-29 | | node:16 | sha256:466d0a05ecb1e5b9890960592311fa10c2bc6012fc27dbfdcc74abf10fc324fc | 2023-07-04 | | node:16-alpine | sha256:6c381d5dc2a11dcdb693f0301e8587e43f440c90cdb8933eaaaabb905d44cdb9 | 2023-06-21 | -| node:18 | sha256:f4698d49371c8a9fa7dd78b97fb2a532213903066e47966542b3b1d403449da4 | 2023-07-04 | -| node:18-alpine | sha256:d5b2a7869a4016b1847986ea52098fa404421e44281bb7615a9e3615e07f37fb | 2023-06-21 | +| node:18 | sha256:e7e0921e352fc579d4d1807ecb2a91f42548cb5097e8bd2742e13bd672b7dc4a | 2023-07-19 | +| node:18-alpine | sha256:93d91deea65c9a0475507e8bc8b1917d6278522322f00c00b3ab09cab6830060 | 2023-07-19 | | ubuntu:18.04 | sha256:152dc042452c496007f07ca9127571cb9c29697f42acbfad72324b2bb2e43c98 | 2023-05-30 | | ubuntu:20.04 | sha256:c9820a44b950956a790c354700c1166a7ec648bc0d215fa438d3a339812f1d01 | 2023-06-28 | | ubuntu:22.04 | sha256:0bced47fffa3361afa981854fcabcd4577cd43cebbb808cea2b1f33a3dd7f508 | 2023-06-28 | @@ -309,7 +306,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | brotli | 1.0.9-2build6 | | bzip2 | 1.0.8-5build1 | | coreutils | 8.32-4.1ubuntu1 | -| curl | 7.81.0-1ubuntu1.10 | +| curl | 7.81.0-1ubuntu1.13 | | dbus | 1.12.20-2ubuntu4.1 | | dnsutils | 1:9.18.12-0ubuntu0.22.04.2 | | dpkg | 1.21.1ubuntu2.2 | @@ -331,7 +328,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | libc++-dev | 1:14.0-55\~exp2 | | libc++abi-dev | 1:14.0-55\~exp2 | | libc6-dev | 2.35-0ubuntu3.1 | -| libcurl4 | 7.81.0-1ubuntu1.10 | +| libcurl4 | 7.81.0-1ubuntu1.13 | | libgbm-dev | 22.2.5-0ubuntu0.1\~22.04.3 | | libgconf-2-4 | 3.2.6-7ubuntu2 | | libgsl-dev | 2.7.1+dfsg-3 | From 27d2a9eb47b99e6f41a5e8a0ecf4b0230396a23e Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Wed, 26 Jul 2023 16:04:32 +0200 Subject: [PATCH 2058/3485] Remove pull_request_target trigger and condition (#7983) --- .github/workflows/macos11.yml | 6 +----- .github/workflows/macos12.yml | 6 +----- .github/workflows/ubuntu2004.yml | 6 +----- .github/workflows/ubuntu2204.yml | 6 +----- .github/workflows/windows2019.yml | 6 +----- .github/workflows/windows2022.yml | 6 +----- 6 files changed, 6 insertions(+), 30 deletions(-) diff --git a/.github/workflows/macos11.yml b/.github/workflows/macos11.yml index 6a15c418a728..c6ecb73b0966 100644 --- a/.github/workflows/macos11.yml +++ b/.github/workflows/macos11.yml @@ -8,14 +8,10 @@ on: CUSTOM_REPOSITORY_COMMIT_HASH: description: 'Commit hash' required: false - pull_request_target: - types: labeled - paths: - - 'images/macos/**' jobs: macOS_11: - if: contains(github.event.pull_request.labels.*.name, 'CI macos-all') || contains(github.event.pull_request.labels.*.name, 'CI macos-11') || (github.event_name == 'workflow_dispatch') || (github.event_name == 'schedule') + if: (github.event_name == 'workflow_dispatch') || (github.event_name == 'schedule') name: macOS-11_unstable.${{ github.run_id }}.${{ github.run_attempt }} uses: ./.github/workflows/macos-generation.yml with: diff --git a/.github/workflows/macos12.yml b/.github/workflows/macos12.yml index b12e15f22e22..1504ab07df91 100644 --- a/.github/workflows/macos12.yml +++ b/.github/workflows/macos12.yml @@ -8,14 +8,10 @@ on: CUSTOM_REPOSITORY_COMMIT_HASH: description: 'Commit hash' required: false - pull_request_target: - types: labeled - paths: - - 'images/macos/**' jobs: macOS_12: - if: contains(github.event.pull_request.labels.*.name, 'CI macos-all') || contains(github.event.pull_request.labels.*.name, 'CI macos-12') || (github.event_name == 'workflow_dispatch') || (github.event_name == 'schedule') + if: (github.event_name == 'workflow_dispatch') || (github.event_name == 'schedule') name: macOS-12_unstable.${{ github.run_id }}.${{ github.run_attempt }} uses: ./.github/workflows/macos-generation.yml with: diff --git a/.github/workflows/ubuntu2004.yml b/.github/workflows/ubuntu2004.yml index 534b33654095..ffc88cf10d01 100644 --- a/.github/workflows/ubuntu2004.yml +++ b/.github/workflows/ubuntu2004.yml @@ -8,14 +8,10 @@ on: CUSTOM_REPOSITORY_COMMIT_HASH: description: 'Commit hash' required: false - pull_request_target: - types: labeled - paths: - - 'images/linux/**' jobs: Ubuntu_2004: - if: contains(github.event.pull_request.labels.*.name, 'CI ubuntu-all') || contains(github.event.pull_request.labels.*.name, 'CI ubuntu-2004') || (github.event_name == 'workflow_dispatch') || (github.event_name == 'schedule') + if: (github.event_name == 'workflow_dispatch') || (github.event_name == 'schedule') uses: ./.github/workflows/ubuntu-win-generation.yml with: image_name: 'ubuntu2004' diff --git a/.github/workflows/ubuntu2204.yml b/.github/workflows/ubuntu2204.yml index 92fa85f53fc2..cd11693f3067 100644 --- a/.github/workflows/ubuntu2204.yml +++ b/.github/workflows/ubuntu2204.yml @@ -8,14 +8,10 @@ on: CUSTOM_REPOSITORY_COMMIT_HASH: description: 'Commit hash' required: false - pull_request_target: - types: labeled - paths: - - 'images/linux/**' jobs: Ubuntu_2204: - if: contains(github.event.pull_request.labels.*.name, 'CI ubuntu-all') || contains(github.event.pull_request.labels.*.name, 'CI ubuntu-2204') || (github.event_name == 'workflow_dispatch') || (github.event_name == 'schedule') + if: (github.event_name == 'workflow_dispatch') || (github.event_name == 'schedule') uses: ./.github/workflows/ubuntu-win-generation.yml with: image_name: 'ubuntu2204' diff --git a/.github/workflows/windows2019.yml b/.github/workflows/windows2019.yml index ae1d4a421f92..3df371d9167f 100644 --- a/.github/workflows/windows2019.yml +++ b/.github/workflows/windows2019.yml @@ -8,14 +8,10 @@ on: CUSTOM_REPOSITORY_COMMIT_HASH: description: 'Commit hash' required: false - pull_request_target: - types: labeled - paths: - - 'images/win/**' jobs: Windows_2019: - if: contains(github.event.pull_request.labels.*.name, 'CI windows-all') || contains(github.event.pull_request.labels.*.name, 'CI windows-2019') || (github.event_name == 'workflow_dispatch') || (github.event_name == 'schedule') + if: (github.event_name == 'workflow_dispatch') || (github.event_name == 'schedule') uses: ./.github/workflows/ubuntu-win-generation.yml with: image_name: 'windows2019' diff --git a/.github/workflows/windows2022.yml b/.github/workflows/windows2022.yml index bf54836b743d..a456c224f411 100644 --- a/.github/workflows/windows2022.yml +++ b/.github/workflows/windows2022.yml @@ -8,14 +8,10 @@ on: CUSTOM_REPOSITORY_COMMIT_HASH: description: 'Commit hash' required: false - pull_request_target: - types: labeled - paths: - - 'images/win/**' jobs: Windows_2022: - if: contains(github.event.pull_request.labels.*.name, 'CI windows-all') || contains(github.event.pull_request.labels.*.name, 'CI windows-2022') || (github.event_name == 'workflow_dispatch') || (github.event_name == 'schedule') + if: (github.event_name == 'workflow_dispatch') || (github.event_name == 'schedule') uses: ./.github/workflows/ubuntu-win-generation.yml with: image_name: 'windows2022' From 52b92ff310885b9276df13a7ecd25826d26f42b0 Mon Sep 17 00:00:00 2001 From: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com> Date: Wed, 26 Jul 2023 17:41:57 +0200 Subject: [PATCH 2059/3485] [macos] supress nonsignificant powershell warning (#7985) veertu-anka-vm-clone.template: Installing Xcode versions... veertu-anka-vm-clone.template: WARNING: The names of some imported commands from the module 'Xcode.Installer' include unapproved verbs that might make them less discoverable. To find the commands with unapproved verbs, run the Import-Module command again with the Verbose parameter. For a list of approved verbs, type Get-Verb. veertu-anka-vm-clone.template: WARNING: The names of some imported commands from the module 'Xcode.Installer' include unapproved verbs that might make them less discoverable. To find the commands with unapproved verbs, run the Import-Module command again with the Verbose parameter. For a list of approved verbs, type Get-Verb. veertu-anka-vm-clone.template: WARNING: The names of some imported commands from the module 'Xcode.Installer' include unapproved verbs that might make them less discoverable. To find the commands with unapproved verbs, run the Import-Module command again with the Verbose parameter. For a list of approved verbs, type Get-Verb. veertu-anka-vm-clone.template: WARNING: The names of some imported commands from the module 'Xcode.Installer' include unapproved verbs that might make them less discoverable. To find the commands with unapproved verbs, run the Import-Module command again with the Verbose parameter. For a list of approved verbs, type Get-Verb. veertu-anka-vm-clone.template: WARNING: The names of some imported commands from the module 'Xcode.Installer' include unapproved verbs that might make them less discoverable. To find the commands with unapproved verbs, run the Import-Module command again with the Verbose parameter. For a list of approved verbs, type Get-Verb. --- images/macos/provision/core/xcode.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/macos/provision/core/xcode.ps1 b/images/macos/provision/core/xcode.ps1 index b94ca98c6e9a..4836596ae157 100644 --- a/images/macos/provision/core/xcode.ps1 +++ b/images/macos/provision/core/xcode.ps1 @@ -1,7 +1,7 @@ $ErrorActionPreference = "Stop" Import-Module "$env:HOME/image-generation/helpers/Common.Helpers.psm1" -Import-Module "$env:HOME/image-generation/helpers/Xcode.Installer.psm1" +Import-Module "$env:HOME/image-generation/helpers/Xcode.Installer.psm1" -DisableNameChecking # Spaceship Apple ID login fails due to Apple ID prompting to be upgraded to 2FA. # https://github.com/fastlane/fastlane/pull/18116 @@ -19,7 +19,7 @@ Write-Host "Installing Xcode versions..." $xcodeVersions | ForEach-Object -ThrottleLimit $threadCount -Parallel { $ErrorActionPreference = "Stop" Import-Module "$env:HOME/image-generation/helpers/Common.Helpers.psm1" - Import-Module "$env:HOME/image-generation/helpers/Xcode.Installer.psm1" + Import-Module "$env:HOME/image-generation/helpers/Xcode.Installer.psm1" -DisableNameChecking Install-XcodeVersion -Version $_.version -LinkTo $_.link Confirm-XcodeIntegrity -Version $_.link From 1865ac151c696892f03aa2d7806f17326a9232da Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Thu, 27 Jul 2023 09:55:51 +0200 Subject: [PATCH 2060/3485] Fix chromium revision (#7984) --- images/linux/scripts/installers/google-chrome.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/linux/scripts/installers/google-chrome.sh b/images/linux/scripts/installers/google-chrome.sh index dfb356ced15f..849b39cf7b37 100644 --- a/images/linux/scripts/installers/google-chrome.sh +++ b/images/linux/scripts/installers/google-chrome.sh @@ -17,7 +17,7 @@ function GetChromiumRevision { # Temporarily hardcode revision as both requests # for 115.0.5790.102 and 115.0.5790.98 return old incorrect revision if [ $REVISION -eq "1583" ]; then - REVISION="1134878" + REVISION="1148114" fi # Some Google Chrome versions are based on Chromium revisions for which a (usually very old) Chromium release with the same number exist. So far this has heppened with 4 digits long Chromium revisions (1060, 1086). From 52e6774737d45af588f964644227687023c73cd3 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 27 Jul 2023 10:15:09 +0000 Subject: [PATCH 2061/3485] Updating readme file for win19 version 20230724.1.1 (#7972) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2019-Readme.md | 57 +++++++++++++++----------------- 1 file changed, 26 insertions(+), 31 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index 59085aae2a63..00f04fb64538 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -1,10 +1,6 @@ -| Announcements | -|-| -| [[All OSs] .NET 3.1 will be removed from the images on July, 3](https://github.com/actions/runner-images/issues/7667) | -*** # Windows Server 2019 - OS Version: 10.0.17763 Build 4645 -- Image Version: 20230716.1.0 +- Image Version: 20230724.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -17,7 +13,7 @@ - Julia 1.9.2 - Kotlin 1.9.0 - LLVM 15.0.7 -- Node 18.16.1 +- Node 18.17.0 - Perl 5.32.1 - PHP 8.2.8 - Python 3.7.9 @@ -28,12 +24,12 @@ - Composer 2.5.8 - Helm 3.12.1 - Miniconda 23.5.2 (pre-installed on the image but not added to PATH) -- NPM 9.5.1 +- NPM 9.6.7 - NuGet 6.6.1.2 -- pip 23.2 (python 3.7) +- pip 23.2.1 (python 3.7) - Pipx 1.2.0 - RubyGems 2.7.6.3 -- Vcpkg (build from commit fba81a6a5) +- Vcpkg (build from commit d765306b0) - Yarn 1.22.19 #### Environment variables @@ -56,17 +52,17 @@ - Bazelisk 1.13.2 - Bicep 0.19.5 - Cabal 3.10.1.0 -- CMake 3.26.4 +- CMake 3.27.0 - CodeQL Action Bundles 2.13.5 2.14.0 - Docker 24.0.4 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.20.0 -- Docker-wincred 0.7.0 +- Docker Compose v2 2.20.2 +- Docker-wincred 0.8.0 - ghc 9.6.2 -- Git 2.41.0.windows.1 +- Git 2.41.0.windows.3 - Git LFS 3.3.0 -- Google Cloud SDK 438.0.0 -- ImageMagick 7.1.1-12 +- Google Cloud SDK 439.0.0 +- ImageMagick 7.1.1-14 - InnoSetup 6.2.2 - jq 1.6 - Kind 0.20.0 @@ -78,7 +74,7 @@ - OpenSSL 1.1.1u - Packer 1.9.1 - Parcel 2.9.3 -- Pulumi 3.75.0 +- Pulumi 3.76.0 - R 4.3.1 - Service Fabric SDK 9.1.1436.9590 - Stack 2.11.1 @@ -91,9 +87,9 @@ - zstd 1.5.5 ### CLI Tools -- Alibaba Cloud CLI 3.0.169 -- AWS CLI 2.13.1 -- AWS SAM CLI 1.90.0 +- Alibaba Cloud CLI 3.0.170 +- AWS CLI 2.13.3 +- AWS SAM CLI 1.93.0 - AWS Session Manager CLI 1.2.463.0 - Azure CLI 2.50.0 - Azure DevOps CLI extension 0.26.0 @@ -116,10 +112,10 @@ - Rustfmt 1.5.2 ### Browsers and Drivers -- Google Chrome 114.0.5735.199 -- Chrome Driver 114.0.5735.90 -- Microsoft Edge 114.0.1823.82 -- Microsoft Edge Driver 114.0.1823.82 +- Google Chrome 115.0.5790.102 +- Chrome Driver 115.0.5790.102 +- Microsoft Edge 115.0.1901.183 +- Microsoft Edge Driver 115.0.1901.183 - Mozilla Firefox 115.0.2 - Gecko Driver 0.33.0 - IE Driver 4.10.0.0 @@ -136,10 +132,10 @@ ### Java | Version | Vendor | Environment Variable | | ------------------- | --------------- | -------------------- | -| 8.0.372+7 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | -| 11.0.19+7 | Eclipse Temurin | JAVA_HOME_11_X64 | +| 8.0.382+5 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | +| 11.0.20+8 | Eclipse Temurin | JAVA_HOME_11_X64 | | 13.0.2+8.1 | Adopt OpenJDK | JAVA_HOME_13_X64 | -| 17.0.7+7 | Eclipse Temurin | JAVA_HOME_17_X64 | +| 17.0.8+7 | Eclipse Temurin | JAVA_HOME_17_X64 | ### Shells | Name | Target | @@ -171,7 +167,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Node.js - 14.21.3 - 16.20.1 -- 18.16.1 +- 18.17.0 #### Python - 3.6.8 @@ -218,7 +214,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Database tools - Azure CosmosDb Emulator 2.14.12.0 - DacFx 162.0.52.1 -- MySQL 5.7.42.0 +- MySQL 5.7.43.0 - SQL OLEDB Driver 18.6.3.0 - SQLPS 1.0 @@ -459,7 +455,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | ms-biztalk.BizTalk | 3.13.2.0 | | ProBITools.MicrosoftAnalysisServicesModelingProjects | 2.9.18 | | ProBITools.MicrosoftReportProjectsforVisualStudio | 2.6.11 | -| SSIS.SqlServerIntegrationServicesProjects | 4.4 | +| SSIS.SqlServerIntegrationServicesProjects | 4.5 | | VisualStudioClient.MicrosoftVisualStudio2017InstallerProjects | 1.0.2 | | Windows Driver Kit | 10.1.22000.1 | | Windows Driver Kit Visual Studio Extension | 10.0.21381.0 | @@ -511,7 +507,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Az (Cached): 1.0.0.zip, 1.6.0.zip, 2.3.2.zip, 2.6.0.zip, 3.1.0.zip, 3.5.0.zip, 3.8.0.zip, 4.3.0.zip, 4.4.0.zip, 4.7.0.zip, 5.5.0.zip, 5.9.0.zip, 6.6.0.zip, 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.370 +- AWSPowershell: 4.1.376 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 - Microsoft.Graph: 2.1.0 @@ -561,4 +557,3 @@ All other versions are saved but not installed. | mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:5ff317aa3f2f0e19610c95bae5b9ba66cbe151fdf96765399ef552fb29e03b2d | 2023-07-11 | | mcr.microsoft.com/windows/nanoserver:1809 | sha256:184914b6008b14ddaf1f9f8944a38c0b2f5ef7e9b13c694a5913528370eed73e | 2023-07-07 | | mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:31c6e1eb571ced8af4a543204ec1e410161677de56a6f76ce0983928b02af07c | 2023-07-07 | - From 9a403df7bda5868203ec8bd1036c28ad12fee294 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 27 Jul 2023 10:38:54 +0000 Subject: [PATCH 2062/3485] Updating readme file for win22 version 20230724.1.1 (#7973) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2022-Readme.md | 57 +++++++++++++++----------------- 1 file changed, 27 insertions(+), 30 deletions(-) diff --git a/images/win/Windows2022-Readme.md b/images/win/Windows2022-Readme.md index 9cb57c5ba7c1..caecc7882c7f 100644 --- a/images/win/Windows2022-Readme.md +++ b/images/win/Windows2022-Readme.md @@ -1,10 +1,6 @@ -| Announcements | -|-| -| [[All OSs] .NET 3.1 will be removed from the images on July, 3](https://github.com/actions/runner-images/issues/7667) | -*** # Windows Server 2022 - OS Version: 10.0.20348 Build 1850 -- Image Version: 20230716.1.0 +- Image Version: 20230724.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -17,7 +13,7 @@ - Julia 1.9.2 - Kotlin 1.9.0 - LLVM 15.0.7 -- Node 18.16.1 +- Node 18.17.0 - Perl 5.32.1 - PHP 8.2.8 - Python 3.9.13 @@ -28,12 +24,12 @@ - Composer 2.5.8 - Helm 3.12.1 - Miniconda 23.5.2 (pre-installed on the image but not added to PATH) -- NPM 9.5.1 +- NPM 9.6.7 - NuGet 6.6.1.2 -- pip 23.2 (python 3.9) +- pip 23.2.1 (python 3.9) - Pipx 1.2.0 - RubyGems 3.2.33 -- Vcpkg (build from commit fba81a6a5) +- Vcpkg (build from commit d765306b0) - Yarn 1.22.19 #### Environment variables @@ -56,16 +52,16 @@ - Bazelisk 1.13.2 - Bicep 0.19.5 - Cabal 3.10.1.0 -- CMake 3.26.4 +- CMake 3.27.0 - CodeQL Action Bundles 2.13.5 2.14.0 - Docker 24.0.4 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.20.0 -- Docker-wincred 0.7.0 +- Docker Compose v2 2.20.2 +- Docker-wincred 0.8.0 - ghc 9.6.2 -- Git 2.41.0.windows.1 +- Git 2.41.0.windows.3 - Git LFS 3.3.0 -- ImageMagick 7.1.1-12 +- ImageMagick 7.1.1-14 - InnoSetup 6.2.2 - jq 1.6 - Kind 0.20.0 @@ -76,7 +72,7 @@ - NSIS 3.08 - OpenSSL 1.1.1u - Packer 1.9.1 -- Pulumi 3.75.0 +- Pulumi 3.76.0 - R 4.3.1 - Service Fabric SDK 9.1.1436.9590 - Stack 2.11.1 @@ -89,9 +85,9 @@ - zstd 1.5.5 ### CLI Tools -- Alibaba Cloud CLI 3.0.169 -- AWS CLI 2.13.1 -- AWS SAM CLI 1.90.0 +- Alibaba Cloud CLI 3.0.170 +- AWS CLI 2.13.3 +- AWS SAM CLI 1.93.0 - AWS Session Manager CLI 1.2.463.0 - Azure CLI 2.50.0 - Azure DevOps CLI extension 0.26.0 @@ -113,10 +109,10 @@ - Rustfmt 1.5.2 ### Browsers and Drivers -- Google Chrome 114.0.5735.199 -- Chrome Driver 114.0.5735.90 -- Microsoft Edge 114.0.1823.82 -- Microsoft Edge Driver 114.0.1823.82 +- Google Chrome 115.0.5790.102 +- Chrome Driver 115.0.5790.102 +- Microsoft Edge 115.0.1901.183 +- Microsoft Edge Driver 115.0.1901.183 - Mozilla Firefox 115.0.2 - Gecko Driver 0.33.0 - IE Driver 4.10.0.0 @@ -133,9 +129,9 @@ ### Java | Version | Vendor | Environment Variable | | ------------------- | --------------- | -------------------- | -| 8.0.372+7 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | -| 11.0.19+7 | Eclipse Temurin | JAVA_HOME_11_X64 | -| 17.0.7+7 | Eclipse Temurin | JAVA_HOME_17_X64 | +| 8.0.382+5 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | +| 11.0.20+8 | Eclipse Temurin | JAVA_HOME_11_X64 | +| 17.0.8+7 | Eclipse Temurin | JAVA_HOME_17_X64 | ### Shells | Name | Target | @@ -164,7 +160,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Node.js - 14.21.3 - 16.20.1 -- 18.16.1 +- 18.17.0 #### Python - 3.7.9 @@ -206,8 +202,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Database tools - Azure CosmosDb Emulator 2.14.12.0 - DacFx 162.0.52.1 -- MySQL 8.0.33.0 -- SQL OLEDB Driver 18.6.3.0 +- MySQL 8.0.34.0 +- SQL OLEDB Driver 18.6.4.0 - SQLPS 1.0 ### Web Servers @@ -238,6 +234,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Component.MDD.Linux.GCC.arm | 17.6.33605.316 | | Component.Microsoft.VisualStudio.LiveShare.2022 | 1.0.5843 | | Component.Microsoft.VisualStudio.RazorExtension | 17.6.33605.316 | +| Component.Microsoft.VisualStudio.Tools.Applications.amd64 | 17.0.33617.0 | | Component.Microsoft.VisualStudio.Web.AzureFunctions | 17.6.33605.316 | | Component.Microsoft.Web.LibraryManager | 17.6.33605.316 | | Component.Microsoft.WebTools.BrowserLink.WebLivePreview | 17.6.81.44349 | @@ -520,6 +517,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | wasm.tools | 7.0.923.32018 | | ProBITools.MicrosoftAnalysisServicesModelingProjects2022 | 3.0.4 | | ProBITools.MicrosoftReportProjectsforVisualStudio2022 | 3.0.1 | +| SSIS.MicrosoftDataToolsIntegrationServices | 1.1 | | VisualStudioClient.MicrosoftVisualStudio2022InstallerProjects | 2.0.0 | | Windows Driver Kit | 10.1.22621.382 | | Windows Driver Kit Visual Studio Extension | 10.0.22621.0 | @@ -563,7 +561,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Az (Cached): 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.370 +- AWSPowershell: 4.1.376 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 - Microsoft.Graph: 2.1.0 @@ -612,4 +610,3 @@ All other versions are saved but not installed. | mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:fb90325630afd46ff0ad5e39c2b34a9cdc1b5cfca4cbb84b13f13f6080306afb | 2023-07-11 | | mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:0e847c01d2565d9abba138dd6bd1eaf5e8c6076d43ecfaff50e94f142899b9f1 | 2023-07-07 | | mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:7c07bd85c69a70b536ff05c59f49c1e308bf704906e59825d1a30e0cee86a84a | 2023-07-07 | - From fc2f35d5934e530f0732887b5d2c92ab36899779 Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Fri, 28 Jul 2023 12:37:00 +0200 Subject: [PATCH 2063/3485] [macos] Add toolcache for arm (#7974) --- images/macos/helpers/Common.Helpers.psm1 | 10 ++ .../provision/core/configure-toolset.ps1 | 8 +- images/macos/provision/core/pypy.sh | 3 +- images/macos/provision/core/ruby.sh | 2 +- images/macos/provision/core/toolset.ps1 | 6 +- .../templates/macOS-13.arm64.anka.pkr.hcl | 7 ++ images/macos/tests/Toolcache.Tests.ps1 | 11 ++- images/macos/toolsets/toolset-11.json | 89 ++++++++++-------- images/macos/toolsets/toolset-12.json | 83 +++++++++------- images/macos/toolsets/toolset-13.json | 94 +++++++++++++------ 10 files changed, 199 insertions(+), 114 deletions(-) diff --git a/images/macos/helpers/Common.Helpers.psm1 b/images/macos/helpers/Common.Helpers.psm1 index 86bc324705aa..457793276a2f 100644 --- a/images/macos/helpers/Common.Helpers.psm1 +++ b/images/macos/helpers/Common.Helpers.psm1 @@ -156,3 +156,13 @@ function Add-EnvironmentVariable { function isVeertu { return (Test-Path -Path "/Library/Application Support/Veertu") } + +function Get-Architecture { + $arch = arch + if ($arch -ne "arm64") + { + $arch = "x64" + } + + return $arch +} diff --git a/images/macos/provision/core/configure-toolset.ps1 b/images/macos/provision/core/configure-toolset.ps1 index d569eee6903f..8450b820d65c 100644 --- a/images/macos/provision/core/configure-toolset.ps1 +++ b/images/macos/provision/core/configure-toolset.ps1 @@ -22,23 +22,23 @@ function Get-ToolsetToolFullPath return $installationDir } +$arch = Get-Architecture $toolcache = Get-ToolsetValue "toolcache" foreach ($tool in $toolcache) { $toolName = $tool.name - $toolArch = $tool.arch - $toolEnvironment = $tool.variable_template + $toolEnvironment = $tool.arch.$arch.variable_template if (-not $toolEnvironment) { continue } - foreach ($toolVersion in $tool.versions) + foreach ($toolVersion in $tool.arch.$arch.versions) { Write-Host "Set $toolName $toolVersion environment variable..." - $toolPath = Get-ToolsetToolFullPath -ToolName $toolName -ToolVersion $toolVersion -ToolArchitecture $toolArch + $toolPath = Get-ToolsetToolFullPath -ToolName $toolName -ToolVersion $toolVersion -ToolArchitecture $arch $envName = $toolEnvironment -f $toolVersion.split(".") # Add environment variable name=value diff --git a/images/macos/provision/core/pypy.sh b/images/macos/provision/core/pypy.sh index eab316845abc..95d060a62622 100644 --- a/images/macos/provision/core/pypy.sh +++ b/images/macos/provision/core/pypy.sh @@ -75,8 +75,9 @@ function InstallPyPy rm -f $PACKAGE_TAR_TEMP_PATH } +arch=$(get_arch) pypyVersions=$(curl https://downloads.python.org/pypy/versions.json) -toolsetVersions=$(get_toolset_value '.toolcache[] | select(.name | contains("PyPy")) | .versions[]') +toolsetVersions=$(get_toolset_value '.toolcache[] | select(.name | contains("PyPy")) | .arch.'$arch'.versions[]') for toolsetVersion in $toolsetVersions; do latestMajorPyPyVersion=$(echo $pypyVersions | diff --git a/images/macos/provision/core/ruby.sh b/images/macos/provision/core/ruby.sh index 62fb937dbeea..104e4c95d0b2 100755 --- a/images/macos/provision/core/ruby.sh +++ b/images/macos/provision/core/ruby.sh @@ -23,7 +23,7 @@ if ! is_VenturaArm64; then echo "Install Ruby from toolset..." [ -n "$API_PAT" ] && authString=(-H "Authorization: token ${API_PAT}") PACKAGE_TAR_NAMES=$(curl "${authString[@]}" -s "https://api.github.com/repos/ruby/ruby-builder/releases/latest" | jq -r '.assets[].name') - TOOLSET_VERSIONS=$(get_toolset_value '.toolcache[] | select(.name | contains("Ruby")) | .versions[]') + TOOLSET_VERSIONS=$(get_toolset_value '.toolcache[] | select(.name | contains("Ruby")) | .arch.'$arch'.versions[]') RUBY_PATH="$AGENT_TOOLSDIRECTORY/Ruby" echo "Check if Ruby hostedtoolcache folder exists..." diff --git a/images/macos/provision/core/toolset.ps1 b/images/macos/provision/core/toolset.ps1 index e2c4efe8f7d8..8d6869327c72 100644 --- a/images/macos/provision/core/toolset.ps1 +++ b/images/macos/provision/core/toolset.ps1 @@ -28,6 +28,8 @@ Function Install-Asset { Pop-Location } +$arch = Get-Architecture + # Get toolcache content from toolset $toolsToInstall = @("Python", "Node", "Go") $tools = Get-ToolsetValue "toolcache" | Where-Object {$toolsToInstall -contains $_.Name} @@ -37,10 +39,10 @@ foreach ($tool in $tools) { $assets = Invoke-RestMethodWithRetry -Url $tool.url # Get github release asset for each version - foreach ($version in $tool.versions) { + foreach ($version in $tool.arch.$arch.versions) { $asset = $assets | Where-Object version -like $version ` | Select-Object -ExpandProperty files ` - | Where-Object { ($_.platform -eq $tool.platform) -and ($_.arch -eq $tool.arch) -and ($_.platform_version -eq $tool.platform_version)} ` + | Where-Object { ($_.platform -eq $tool.platform) -and ($_.arch -eq $arch)} ` | Select-Object -First 1 Write-Host "Installing $($tool.name) $version..." diff --git a/images/macos/templates/macOS-13.arm64.anka.pkr.hcl b/images/macos/templates/macOS-13.arm64.anka.pkr.hcl index 562e6d311eba..ace69c5ad5b4 100644 --- a/images/macos/templates/macOS-13.arm64.anka.pkr.hcl +++ b/images/macos/templates/macOS-13.arm64.anka.pkr.hcl @@ -206,6 +206,13 @@ build { ] execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" } + provisioner "shell" { + scripts = [ + "./provision/core/toolset.ps1", + "./provision/core/configure-toolset.ps1" + ] + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} pwsh -f {{ .Path }}" + } provisioner "shell" { script = "./provision/core/delete-duplicate-sims.rb" execute_command = "source $HOME/.bash_profile; ruby {{ .Path }}" diff --git a/images/macos/tests/Toolcache.Tests.ps1 b/images/macos/tests/Toolcache.Tests.ps1 index ee2b0fe8fc97..30c58953be9a 100644 --- a/images/macos/tests/Toolcache.Tests.ps1 +++ b/images/macos/tests/Toolcache.Tests.ps1 @@ -1,6 +1,7 @@ Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1" -DisableNameChecking +$arch = Get-Architecture $os = Get-OSVersion Describe "Toolcache" { @@ -8,12 +9,12 @@ Describe "Toolcache" { [array]$packages += Get-ToolsetValue -KeyPath "toolcache" | ForEach-Object { return [PSCustomObject] @{ ToolName = ($_.name).ToLower() - Arch = $_.arch - Versions = $_.versions | ForEach-Object { $_.Replace(".*", "") } + Arch = $arch + Versions = $_.arch.$arch | Where-Object{ $_ } | ForEach-Object { $_.versions.Replace(".*", "") } } } - Context "Python" -Skip:($os.IsVenturaArm64) { + Context "Python" { $pythonDirectory = Join-Path $toolcacheDirectory "Python" $pythonPackage = $packages | Where-Object { $_.ToolName -eq "python" } | Select-Object -First 1 $testCase = @{ PythonDirectory = $pythonDirectory } @@ -142,7 +143,7 @@ Describe "Toolcache" { } } - Context "Node" -Skip:($os.IsVenturaArm64) { + Context "Node" { $nodeDirectory = Join-Path $toolcacheDirectory "node" $nodePackage = $packages | Where-Object { $_.ToolName -eq "node" } | Select-Object -First 1 $testCase = @{ NodeDirectory = $nodeDirectory } @@ -192,7 +193,7 @@ Describe "Toolcache" { } } - Context "Go" -Skip:($os.IsVenturaArm64) { + Context "Go" { $goDirectory = Join-Path $toolcacheDirectory "go" $goPackage = $packages | Where-Object { $_.ToolName -eq "go" } | Select-Object -First 1 $testCase = @{ GoDirectory = $goDirectory } diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index 9e575c9e2d9b..e796aeee0ed4 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -245,61 +245,76 @@ { "name": "Python", "url" : "https://raw.githubusercontent.com/actions/python-versions/main/versions-manifest.json", - "arch": "x64", "platform" : "darwin", - "versions": [ - "3.7.*", - "3.8.*", - "3.9.*", - "3.10.*", - "3.11.*" - ] + "arch": { + "x64": { + "versions": [ + "3.7.*", + "3.8.*", + "3.9.*", + "3.10.*", + "3.11.*" + ] + } + } }, { "name": "PyPy", - "arch": "x64", "platform" : "darwin", - "versions": [ - "2.7", - "3.7", - "3.8", - "3.9" - ] + "arch": { + "x64": { + "versions": [ + "2.7", + "3.7", + "3.8", + "3.9" + ] + } + } }, { "name": "Node", "url" : "https://raw.githubusercontent.com/actions/node-versions/main/versions-manifest.json", "platform" : "darwin", - "arch": "x64", - "versions": [ - "14.*", - "16.*", - "18.*" - ] + "arch": { + "x64": { + "versions": [ + "14.*", + "16.*", + "18.*" + ] + } + } }, { "name": "Go", "url" : "https://raw.githubusercontent.com/actions/go-versions/main/versions-manifest.json", - "arch": "x64", "platform" : "darwin", - "variable_template" : "GOROOT_{0}_{1}_X64", - "versions": [ - "1.18.*", - "1.19.*", - "1.20.*" - ] + "arch": { + "x64": { + "variable_template" : "GOROOT_{0}_{1}_X64", + "versions": [ + "1.18.*", + "1.19.*", + "1.20.*" + ] + } + } }, { "name": "Ruby", - "arch": "x64", - "versions": [ - "2.4.*", - "2.5.*", - "2.6.*", - "2.7.*", - "3.0.*", - "3.1.*" - ] + "arch": { + "x64": { + "versions": [ + "2.4.*", + "2.5.*", + "2.6.*", + "2.7.*", + "3.0.*", + "3.1.*" + ] + } + } } ], "pipx": [ diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index 24215e4eb960..d2e669daddcf 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -231,58 +231,73 @@ { "name": "Python", "url" : "https://raw.githubusercontent.com/actions/python-versions/main/versions-manifest.json", - "arch": "x64", "platform" : "darwin", - "versions": [ - "3.7.*", - "3.8.*", - "3.9.*", - "3.10.*", - "3.11.*" - ] + "arch": { + "x64": { + "versions": [ + "3.7.*", + "3.8.*", + "3.9.*", + "3.10.*", + "3.11.*" + ] + } + } }, { "name": "PyPy", - "arch": "x64", "platform" : "darwin", - "versions": [ - "2.7", - "3.7", - "3.8", - "3.9" - ] + "arch": { + "x64": { + "versions": [ + "2.7", + "3.7", + "3.8", + "3.9" + ] + } + } }, { "name": "Node", "url" : "https://raw.githubusercontent.com/actions/node-versions/main/versions-manifest.json", "platform" : "darwin", - "arch": "x64", - "versions": [ - "14.*", - "16.*", - "18.*" - ] + "arch": { + "x64": { + "versions": [ + "14.*", + "16.*", + "18.*" + ] + } + } }, { "name": "Go", "url" : "https://raw.githubusercontent.com/actions/go-versions/main/versions-manifest.json", - "arch": "x64", "platform" : "darwin", - "variable_template" : "GOROOT_{0}_{1}_X64", - "versions": [ - "1.18.*", - "1.19.*", - "1.20.*" - ] + "arch": { + "x64": { + "variable_template" : "GOROOT_{0}_{1}_X64", + "versions": [ + "1.18.*", + "1.19.*", + "1.20.*" + ] + } + } }, { "name": "Ruby", - "arch": "x64", - "versions": [ - "2.7.*", - "3.0.*", - "3.1.*" - ] + "arch": { + "x64": { + "versions": [ + "2.7.*", + "3.0.*", + "3.1.*" + ] + } + } } ], "pipx": [ diff --git a/images/macos/toolsets/toolset-13.json b/images/macos/toolsets/toolset-13.json index 70a94302f9a6..763953f40ff3 100644 --- a/images/macos/toolsets/toolset-13.json +++ b/images/macos/toolsets/toolset-13.json @@ -121,54 +121,88 @@ { "name": "Python", "url" : "https://raw.githubusercontent.com/actions/python-versions/main/versions-manifest.json", - "arch": "x64", "platform" : "darwin", - "versions": [ - "3.8.*", - "3.9.*", - "3.10.*", - "3.11.*" - ] + "arch": { + "x64": { + "versions": [ + "3.8.*", + "3.9.*", + "3.10.*", + "3.11.*" + ] + }, + "arm64": { + "versions": [ + "3.10.*", + "3.11.*" + ] + } + } }, { "name": "PyPy", - "arch": "x64", "platform" : "darwin", - "versions": [ - "2.7", - "3.7", - "3.8", - "3.9" - ] + "arch": { + "x64": { + "versions": [ + "2.7", + "3.7", + "3.8", + "3.9" + ] + } + } }, { "name": "Node", "url" : "https://raw.githubusercontent.com/actions/node-versions/main/versions-manifest.json", "platform" : "darwin", - "arch": "x64", - "versions": [ - "16.*", - "18.*" - ] + "arch": { + "x64": { + "versions": [ + "16.*", + "18.*" + ] + }, + "arm64": { + "versions": [ + "16.*", + "18.*" + ] + } + } }, { "name": "Go", "url" : "https://raw.githubusercontent.com/actions/go-versions/main/versions-manifest.json", - "arch": "x64", "platform" : "darwin", - "variable_template" : "GOROOT_{0}_{1}_X64", - "versions": [ - "1.19.*", - "1.20.*" - ] + "arch": { + "x64": { + "variable_template" : "GOROOT_{0}_{1}_X64", + "versions": [ + "1.19.*", + "1.20.*" + ] + }, + "arm64": { + "variable_template" : "GOROOT_{0}_{1}_ARM64", + "versions": [ + "1.19.*", + "1.20.*" + ] + } + } }, { "name": "Ruby", - "arch": "x64", - "versions": [ - "3.0.*", - "3.1.*" - ] + "arch": { + "x64": { + "versions": [ + "3.0.*", + "3.1.*" + ] + } + } } ], "go": { From 1190d2f46f57ed6ab92cc558ebecc0b5a4a8012a Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Fri, 28 Jul 2023 13:53:13 +0200 Subject: [PATCH 2064/3485] Revert "[WinLin] Remove schedules from Azure pipe" (#7996) --- images.CI/linux-and-win/azure-pipelines/ubuntu2004.yml | 8 ++++++++ images.CI/linux-and-win/azure-pipelines/ubuntu2204.yml | 8 ++++++++ images.CI/linux-and-win/azure-pipelines/windows2019.yml | 8 ++++++++ images.CI/linux-and-win/azure-pipelines/windows2022.yml | 8 ++++++++ 4 files changed, 32 insertions(+) diff --git a/images.CI/linux-and-win/azure-pipelines/ubuntu2004.yml b/images.CI/linux-and-win/azure-pipelines/ubuntu2004.yml index 51a1d0bbff0a..4bf78c183957 100644 --- a/images.CI/linux-and-win/azure-pipelines/ubuntu2004.yml +++ b/images.CI/linux-and-win/azure-pipelines/ubuntu2004.yml @@ -1,3 +1,11 @@ +schedules: +- cron: "0 0 * * *" + displayName: Daily + branches: + include: + - main + always: true + trigger: none pr: autoCancel: true diff --git a/images.CI/linux-and-win/azure-pipelines/ubuntu2204.yml b/images.CI/linux-and-win/azure-pipelines/ubuntu2204.yml index a0458ac67692..8fc4c7b69f79 100644 --- a/images.CI/linux-and-win/azure-pipelines/ubuntu2204.yml +++ b/images.CI/linux-and-win/azure-pipelines/ubuntu2204.yml @@ -1,3 +1,11 @@ +schedules: +- cron: "0 0 * * *" + displayName: Daily + branches: + include: + - main + always: true + trigger: none pr: autoCancel: true diff --git a/images.CI/linux-and-win/azure-pipelines/windows2019.yml b/images.CI/linux-and-win/azure-pipelines/windows2019.yml index 7f2b8a801286..ccad8f882cdd 100644 --- a/images.CI/linux-and-win/azure-pipelines/windows2019.yml +++ b/images.CI/linux-and-win/azure-pipelines/windows2019.yml @@ -1,3 +1,11 @@ +schedules: +- cron: "0 0 * * *" + displayName: Daily + branches: + include: + - main + always: true + trigger: none pr: autoCancel: true diff --git a/images.CI/linux-and-win/azure-pipelines/windows2022.yml b/images.CI/linux-and-win/azure-pipelines/windows2022.yml index a0c9efcfb3a6..30dcfa3665b5 100644 --- a/images.CI/linux-and-win/azure-pipelines/windows2022.yml +++ b/images.CI/linux-and-win/azure-pipelines/windows2022.yml @@ -1,3 +1,11 @@ +schedules: +- cron: "0 0 * * *" + displayName: Daily + branches: + include: + - main + always: true + trigger: none pr: autoCancel: true From 51de0dda194c461a24666dbc31f37e4d83c5f1e6 Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Fri, 28 Jul 2023 14:23:39 +0200 Subject: [PATCH 2065/3485] Get revision for chromium from new source (#7988) --- .../linux/scripts/installers/google-chrome.sh | 79 +++++++------------ 1 file changed, 30 insertions(+), 49 deletions(-) diff --git a/images/linux/scripts/installers/google-chrome.sh b/images/linux/scripts/installers/google-chrome.sh index 849b39cf7b37..fabb42195a21 100644 --- a/images/linux/scripts/installers/google-chrome.sh +++ b/images/linux/scripts/installers/google-chrome.sh @@ -8,48 +8,27 @@ source $HELPER_SCRIPTS/install.sh function GetChromiumRevision { - CHROME_VERSION=$1 + CHROME_REVISION=$1 - # Get the required Chromium revision corresponding to the Chrome version - URL="https://omahaproxy.appspot.com/deps.json?version=${CHROME_VERSION}" - REVISION=$(curl -s $URL | jq -r '.chromium_base_position') - - # Temporarily hardcode revision as both requests - # for 115.0.5790.102 and 115.0.5790.98 return old incorrect revision - if [ $REVISION -eq "1583" ]; then - REVISION="1148114" - fi - - # Some Google Chrome versions are based on Chromium revisions for which a (usually very old) Chromium release with the same number exist. So far this has heppened with 4 digits long Chromium revisions (1060, 1086). - # Use the previous Chromium release when this happens to avoid downloading and installing very old Chromium releases that would break image build because of incompatibilities. - # First reported with: https://github.com/actions/runner-images/issues/5256 - if [ ${#REVISION} -le 4 ]; then - CURRENT_REVISIONS=$(curl -s "https://omahaproxy.appspot.com/all.json?os=linux&channel=stable") - PREVIOUS_VERSION=$(echo "$CURRENT_REVISIONS" | jq -r '.[].versions[].previous_version') - URL="https://omahaproxy.appspot.com/deps.json?version=${PREVIOUS_VERSION}" - REVISION=$(curl -s $URL | jq -r '.chromium_base_position') - fi # Take the first part of the revision variable to search not only for a specific version, # but also for similar ones, so that we can get a previous one if the required revision is not found - FIRST_PART_OF_REVISION=${REVISION:0:${#REVISION}/2} - FIRST_PART_OF_PREVIOUS_REVISION=$(expr $FIRST_PART_OF_REVISION - 1) - URL="https://www.googleapis.com/storage/v1/b/chromium-browser-snapshots/o?delimiter=/&prefix=Linux_x64" + CHROME_REVISION_PREFIX=${CHROME_REVISION:0:${#CHROME_REVISION}/2+1} + SEARCH_URL="https://www.googleapis.com/storage/v1/b/chromium-browser-snapshots/o?delimiter=/&prefix=Linux_x64" # Revision can include a hash instead of a number. Need to filter it out https://github.com/actions/runner-images/issues/5256 - VERSIONS=$((curl -s $URL/${FIRST_PART_OF_REVISION} | jq -r '.prefixes[]' && curl -s $URL/${FIRST_PART_OF_PREVIOUS_REVISION} | jq -r '.prefixes[]') | grep -E "Linux_x64\/[0-9]+\/"| cut -d "/" -f 2 | sort --version-sort) + REVISIONS_AVAILABLE=$(curl -s $SEARCH_URL/${CHROME_REVISION_PREFIX} | jq -r '.prefixes[]' | grep -E "Linux_x64\/[0-9]+\/"| cut -d "/" -f 2 | sort --version-sort) # If required Chromium revision is not found in the list # we should have to decrement the revision number until we find one. # This is mentioned in the documentation we use for this installation: # https://www.chromium.org/getting-involved/download-chromium - RIGHT_REVISION=$(echo $VERSIONS | cut -f 1 -d " ") - for version in $VERSIONS; do - if [ $REVISION -lt $version ]; then - echo $RIGHT_REVISION - return + LATEST_VALID_REVISION=$(echo $REVISIONS_AVAILABLE | cut -f 1 -d " ") + for REVISION in $REVISIONS_AVAILABLE; do + if [ "$CHROME_REVISION" -lt "$REVISION" ]; then + break fi - RIGHT_REVISION=$version + LATEST_VALID_REVISION=$REVISION done - echo $RIGHT_REVISION + echo $LATEST_VALID_REVISION } # Download and install Google Chrome @@ -67,36 +46,38 @@ FULL_CHROME_VERSION=$(google-chrome --product-version) CHROME_VERSION=${FULL_CHROME_VERSION%.*} echo "Chrome version is $FULL_CHROME_VERSION" -# Determine the download url for chromedriver -CHROME_VERSIONS_JSON=$(curl -fsSL https://googlechromelabs.github.io/chrome-for-testing/latest-patch-versions-per-build-with-downloads.json) -CHROMEDRIVER_VERSION=$(echo $CHROME_VERSIONS_JSON | jq -r '.builds["'"$CHROME_VERSION"'"].version') -CHROMEDRIVER_URL=$(echo $CHROME_VERSIONS_JSON | jq -r '.builds["'"$CHROME_VERSION"'"].downloads.chromedriver[] | select(.platform=="linux64").url') +# Get chrome versions information +CHROME_PLATFORM="linux64" +CHROME_VERSIONS_URL="https://googlechromelabs.github.io/chrome-for-testing/latest-patch-versions-per-build-with-downloads.json" +CHROME_VERSIONS_JSON=$(curl -fsSL "${CHROME_VERSIONS_URL}") # Download and unpack the latest release of chromedriver -echo "Installing chromedriver version $CHROMEDRIVER_VERSION" -download_with_retries $CHROMEDRIVER_URL "/tmp" "chromedriver_linux64.zip" -unzip -qq /tmp/chromedriver_linux64.zip -d /usr/local/share - +CHROMEDRIVER_VERSION=$(echo "${CHROME_VERSIONS_JSON}" | jq -r '.builds["'"$CHROME_VERSION"'"].version') +CHROMEDRIVER_URL=$(echo "${CHROME_VERSIONS_JSON}" | jq -r '.builds["'"$CHROME_VERSION"'"].downloads.chromedriver[] | select(.platform=="'"${CHROME_PLATFORM}"'").url') +CHROMEDRIVER_ARCHIVE="chromedriver_linux64.zip" CHROMEDRIVER_DIR="/usr/local/share/chromedriver-linux64" CHROMEDRIVER_BIN="$CHROMEDRIVER_DIR/chromedriver" + +echo "Installing chromedriver version $CHROMEDRIVER_VERSION" +download_with_retries $CHROMEDRIVER_URL "/tmp" $CHROMEDRIVER_ARCHIVE +unzip -qq /tmp/$CHROMEDRIVER_ARCHIVE -d /usr/local/share + chmod +x $CHROMEDRIVER_BIN ln -s "$CHROMEDRIVER_BIN" /usr/bin/ echo "CHROMEWEBDRIVER=$CHROMEDRIVER_DIR" | tee -a /etc/environment # Download and unpack Chromium -# Get Chromium version corresponding to the Google Chrome version -REVISION=$(GetChromiumRevision $FULL_CHROME_VERSION) - -ZIP_URL="https://www.googleapis.com/download/storage/v1/b/chromium-browser-snapshots/o/Linux_x64%2F${REVISION}%2Fchrome-linux.zip?alt=media" -ZIP_FILE="${REVISION}-chromium-linux.zip" - +CHROME_REVISION=$(echo "${CHROME_VERSIONS_JSON}" | jq -r '.builds["'"$CHROME_VERSION"'"].revision') +CHROMIUM_REVISION=$(GetChromiumRevision $CHROME_REVISION) +CHROMIUM_URL="https://www.googleapis.com/download/storage/v1/b/chromium-browser-snapshots/o/Linux_x64%2F${CHROMIUM_REVISION}%2Fchrome-linux.zip?alt=media" +CHROMIUM_ARCHIVE="${CHROMIUM_REVISION}-chromium-linux.zip" CHROMIUM_DIR="/usr/local/share/chromium" -CHROMIUM_BIN="$CHROMIUM_DIR/chrome-linux/chrome" +CHROMIUM_BIN="${CHROMIUM_DIR}/chrome-linux/chrome" -# Download and unzip Chromium archive -download_with_retries $ZIP_URL "/tmp" $ZIP_FILE +echo "Installing chromium revision $CHROMIUM_REVISION" +download_with_retries $CHROMIUM_URL "/tmp" $CHROMIUM_ARCHIVE mkdir $CHROMIUM_DIR -unzip -qq /tmp/${ZIP_FILE} -d $CHROMIUM_DIR +unzip -qq /tmp/$CHROMIUM_ARCHIVE -d $CHROMIUM_DIR ln -s $CHROMIUM_BIN /usr/bin/chromium ln -s $CHROMIUM_BIN /usr/bin/chromium-browser From 3c7978b1166b63ea342f51d1778c48d5ce362c65 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Fri, 28 Jul 2023 16:12:54 +0200 Subject: [PATCH 2066/3485] [macOS] update dotnet core version json path (#7995) --- images/macos/provision/core/dotnet.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/macos/provision/core/dotnet.sh b/images/macos/provision/core/dotnet.sh index 6e71ae364b19..eb877600ddbf 100755 --- a/images/macos/provision/core/dotnet.sh +++ b/images/macos/provision/core/dotnet.sh @@ -23,7 +23,7 @@ echo "Parsing dotnet SDK (except rc and preview versions) from .json..." DOTNET_VERSIONS=($(get_toolset_value ".dotnet.arch[\"$arch\"].versions | .[]")) for DOTNET_VERSION in "${DOTNET_VERSIONS[@]}"; do - RELEASE_URL="https://raw.githubusercontent.com/dotnet/core/master/release-notes/${DOTNET_VERSION}/releases.json" + RELEASE_URL="https://raw.githubusercontent.com/dotnet/core/main/release-notes/${DOTNET_VERSION}/releases.json" download_with_retries "$RELEASE_URL" "/tmp" "dotnet_${DOTNET_VERSION}.json" if [[ $DOTNET_VERSION == "6.0" ]]; then From 7e863227d712fb79fad43c243c0e07f998572fa2 Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Fri, 28 Jul 2023 20:18:41 +0200 Subject: [PATCH 2067/3485] [Ubuntu] Set flags for curl (#7993) --- images/linux/scripts/base/apt.sh | 2 +- images/linux/scripts/helpers/install.sh | 2 +- images/linux/scripts/installers/azure-cli.sh | 2 +- images/linux/scripts/installers/cmake.sh | 2 +- images/linux/scripts/installers/codeql-bundle.sh | 2 +- images/linux/scripts/installers/docker-compose.sh | 2 +- images/linux/scripts/installers/docker-moby.sh | 2 +- images/linux/scripts/installers/git.sh | 2 +- images/linux/scripts/installers/haskell.sh | 4 ++-- images/linux/scripts/installers/heroku.sh | 2 +- images/linux/scripts/installers/java-tools.sh | 2 +- images/linux/scripts/installers/julia.sh | 2 +- images/linux/scripts/installers/kubernetes-tools.sh | 12 ++++++------ images/linux/scripts/installers/leiningen.sh | 2 +- images/linux/scripts/installers/microsoft-edge.sh | 2 +- images/linux/scripts/installers/miniconda.sh | 2 +- images/linux/scripts/installers/nodejs.sh | 2 +- images/linux/scripts/installers/nvm.sh | 4 ++-- images/linux/scripts/installers/packer.sh | 2 +- images/linux/scripts/installers/pulumi.sh | 2 +- images/linux/scripts/installers/pypy.sh | 2 +- images/linux/scripts/installers/ruby.sh | 2 +- images/linux/scripts/installers/rust.sh | 2 +- images/linux/scripts/installers/swift.sh | 2 +- images/linux/scripts/installers/terraform.sh | 2 +- images/linux/scripts/installers/zstd.sh | 2 +- 26 files changed, 33 insertions(+), 33 deletions(-) diff --git a/images/linux/scripts/base/apt.sh b/images/linux/scripts/base/apt.sh index f50866b554d5..725757498869 100644 --- a/images/linux/scripts/base/apt.sh +++ b/images/linux/scripts/base/apt.sh @@ -40,4 +40,4 @@ apt-get install jq # Install apt-fast using quick-install.sh # https://github.com/ilikenwf/apt-fast -bash -c "$(curl -sL https://raw.githubusercontent.com/ilikenwf/apt-fast/master/quick-install.sh)" +bash -c "$(curl -fsSL https://raw.githubusercontent.com/ilikenwf/apt-fast/master/quick-install.sh)" diff --git a/images/linux/scripts/helpers/install.sh b/images/linux/scripts/helpers/install.sh index 9fe39be2b4fe..55aa7816fd39 100644 --- a/images/linux/scripts/helpers/install.sh +++ b/images/linux/scripts/helpers/install.sh @@ -72,7 +72,7 @@ get_github_package_download_url() { local VERSION=$3 local SEARCH_IN_COUNT="100" - json=$(curl -sSL "https://api.github.com/repos/${REPO_ORG}/releases?per_page=${SEARCH_IN_COUNT}") + json=$(curl -fsSL "https://api.github.com/repos/${REPO_ORG}/releases?per_page=${SEARCH_IN_COUNT}") if [ -n "$VERSION" ]; then tagName=$(echo $json | jq -r '.[] | select(.prerelease==false).tag_name' | sort --unique --version-sort | egrep -v ".*-[a-z]|beta" | egrep "\w*${VERSION}" | tail -1) diff --git a/images/linux/scripts/installers/azure-cli.sh b/images/linux/scripts/installers/azure-cli.sh index 45a32b9cd748..bca11b8b34f7 100644 --- a/images/linux/scripts/installers/azure-cli.sh +++ b/images/linux/scripts/installers/azure-cli.sh @@ -5,7 +5,7 @@ ################################################################################ # Install Azure CLI (instructions taken from https://docs.microsoft.com/en-us/cli/azure/install-azure-cli) -curl -sL https://aka.ms/InstallAzureCLIDeb | sudo bash +curl -fsSL https://aka.ms/InstallAzureCLIDeb | sudo bash echo "azure-cli https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt" >> $HELPER_SCRIPTS/apt-sources.txt rm -f /etc/apt/sources.list.d/azure-cli.list rm -f /etc/apt/sources.list.d/azure-cli.list.save diff --git a/images/linux/scripts/installers/cmake.sh b/images/linux/scripts/installers/cmake.sh index 51aab62503ba..4bf5ca814aa5 100644 --- a/images/linux/scripts/installers/cmake.sh +++ b/images/linux/scripts/installers/cmake.sh @@ -13,7 +13,7 @@ if command -v cmake; then echo "cmake is already installed" else downloadUrl=$(get_github_package_download_url "Kitware/CMake" "endswith(\"inux-x86_64.sh\")") - curl -sL ${downloadUrl} -o cmakeinstall.sh \ + curl -fsSL ${downloadUrl} -o cmakeinstall.sh \ && chmod +x cmakeinstall.sh \ && ./cmakeinstall.sh --prefix=/usr/local --exclude-subdir \ && rm cmakeinstall.sh diff --git a/images/linux/scripts/installers/codeql-bundle.sh b/images/linux/scripts/installers/codeql-bundle.sh index f6b6f0612a51..23daa4ef14cb 100644 --- a/images/linux/scripts/installers/codeql-bundle.sh +++ b/images/linux/scripts/installers/codeql-bundle.sh @@ -7,7 +7,7 @@ source $HELPER_SCRIPTS/install.sh # Retrieve the CLI versions and bundle tags of the latest two CodeQL bundles. -base_url="$(curl -sSL https://raw.githubusercontent.com/github/codeql-action/v2/src/defaults.json)" +base_url="$(curl -fsSL https://raw.githubusercontent.com/github/codeql-action/v2/src/defaults.json)" codeql_tag_name="$(echo "$base_url" | jq -r '.bundleVersion')" codeql_cli_version="$(echo "$base_url" | jq -r '.cliVersion')" prior_codeql_tag_name="$(echo "$base_url" | jq -r '.priorBundleVersion')" diff --git a/images/linux/scripts/installers/docker-compose.sh b/images/linux/scripts/installers/docker-compose.sh index 40db139caa03..019d0937ec4d 100644 --- a/images/linux/scripts/installers/docker-compose.sh +++ b/images/linux/scripts/installers/docker-compose.sh @@ -6,7 +6,7 @@ # Install docker-compose v1 from releases URL="https://github.com/docker/compose/releases/download/1.29.2/docker-compose-Linux-x86_64" -curl -L $URL -o /usr/local/bin/docker-compose +curl -fsSL $URL -o /usr/local/bin/docker-compose chmod +x /usr/local/bin/docker-compose invoke_tests "Tools" "Docker-compose v1" diff --git a/images/linux/scripts/installers/docker-moby.sh b/images/linux/scripts/installers/docker-moby.sh index 3db9ae3de7fe..3e66905f784a 100644 --- a/images/linux/scripts/installers/docker-moby.sh +++ b/images/linux/scripts/installers/docker-moby.sh @@ -52,7 +52,7 @@ fi # Install amazon-ecr-credential-helper aws_latest_release_url="https://api.github.com/repos/awslabs/amazon-ecr-credential-helper/releases/latest" -aws_helper_url=$(curl "${authString[@]}" -sL $aws_latest_release_url | jq -r '.body' | awk -F'[()]' '/linux-amd64/ {print $2}') +aws_helper_url=$(curl "${authString[@]}" -fsSL $aws_latest_release_url | jq -r '.body' | awk -F'[()]' '/linux-amd64/ {print $2}') download_with_retries "$aws_helper_url" "/usr/bin" docker-credential-ecr-login chmod +x /usr/bin/docker-credential-ecr-login diff --git a/images/linux/scripts/installers/git.sh b/images/linux/scripts/installers/git.sh index 2d2a030a74f2..b02e020c3ecc 100644 --- a/images/linux/scripts/installers/git.sh +++ b/images/linux/scripts/installers/git.sh @@ -22,7 +22,7 @@ cat <<EOF >> /etc/gitconfig EOF # Install git-lfs -curl -s $GIT_LFS_REPO/script.deb.sh | bash +curl -fsSL $GIT_LFS_REPO/script.deb.sh | bash apt-get install -y git-lfs # Install git-ftp diff --git a/images/linux/scripts/installers/haskell.sh b/images/linux/scripts/installers/haskell.sh index fe775e138762..4a7f6347821b 100644 --- a/images/linux/scripts/installers/haskell.sh +++ b/images/linux/scripts/installers/haskell.sh @@ -17,7 +17,7 @@ setEtcEnvironmentVariable "BOOTSTRAP_HASKELL_NONINTERACTIVE" $BOOTSTRAP_HASKELL_ setEtcEnvironmentVariable "GHCUP_INSTALL_BASE_PREFIX" $GHCUP_INSTALL_BASE_PREFIX # Install GHCup -curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | sh > /dev/null 2>&1 || true +curl --proto '=https' --tlsv1.2 -fsSL https://get-ghcup.haskell.org | sh > /dev/null 2>&1 || true export PATH="$ghcup_bin:$PATH" prependEtcEnvironmentPath $ghcup_bin @@ -39,6 +39,6 @@ chmod -R 777 $GHCUP_INSTALL_BASE_PREFIX/.ghcup ln -s $GHCUP_INSTALL_BASE_PREFIX/.ghcup /etc/skel/.ghcup # Install the latest stable release of haskell stack -curl -sSL https://get.haskellstack.org/ | sh +curl -fsSL https://get.haskellstack.org/ | sh invoke_tests "Haskell" diff --git a/images/linux/scripts/installers/heroku.sh b/images/linux/scripts/installers/heroku.sh index fa1e2d4bef45..55637a1cef38 100644 --- a/images/linux/scripts/installers/heroku.sh +++ b/images/linux/scripts/installers/heroku.sh @@ -5,6 +5,6 @@ ################################################################################ # Install Heroku CLI -curl https://cli-assets.heroku.com/install.sh | sh +curl -fsSL https://cli-assets.heroku.com/install.sh | sh invoke_tests "Tools" "Heroku" \ No newline at end of file diff --git a/images/linux/scripts/installers/java-tools.sh b/images/linux/scripts/installers/java-tools.sh index 989a6e74b251..12348f24feb3 100644 --- a/images/linux/scripts/installers/java-tools.sh +++ b/images/linux/scripts/installers/java-tools.sh @@ -136,7 +136,7 @@ ln -s /usr/share/apache-maven-${mavenVersion}/bin/mvn /usr/bin/mvn # Install Gradle # This script founds the latest gradle release from https://services.gradle.org/versions/all # The release is downloaded, extracted, a symlink is created that points to it, and GRADLE_HOME is set. -gradleJson=$(curl -s https://services.gradle.org/versions/all) +gradleJson=$(curl -fsSL https://services.gradle.org/versions/all) gradleLatestVersion=$(echo ${gradleJson} | jq -r '.[] | select(.version | contains("-") | not).version' | sort -V | tail -n1) gradleDownloadUrl=$(echo ${gradleJson} | jq -r ".[] | select(.version==\"$gradleLatestVersion\") | .downloadUrl") echo "gradleUrl=${gradleDownloadUrl}" diff --git a/images/linux/scripts/installers/julia.sh b/images/linux/scripts/installers/julia.sh index 90bbfeb12238..715a5ea36af2 100644 --- a/images/linux/scripts/installers/julia.sh +++ b/images/linux/scripts/installers/julia.sh @@ -8,7 +8,7 @@ source $HELPER_SCRIPTS/install.sh # get the latest julia version -json=$(curl -sL "https://julialang-s3.julialang.org/bin/versions.json") +json=$(curl -fsSL "https://julialang-s3.julialang.org/bin/versions.json") julia_version=$(echo $json | jq -r '.[].files[] | select(.triplet=="x86_64-linux-gnu" and (.version | contains("-") | not)).version' | sort -V | tail -n1) # download julia archive diff --git a/images/linux/scripts/installers/kubernetes-tools.sh b/images/linux/scripts/installers/kubernetes-tools.sh index 83be26728ac5..79a8c2802c51 100644 --- a/images/linux/scripts/installers/kubernetes-tools.sh +++ b/images/linux/scripts/installers/kubernetes-tools.sh @@ -9,24 +9,24 @@ source $HELPER_SCRIPTS/install.sh # Install KIND URL=$(get_github_package_download_url "kubernetes-sigs/kind" "contains(\"kind-linux-amd64\")") -curl -L -o /usr/local/bin/kind $URL +curl -fsSL -o /usr/local/bin/kind $URL chmod +x /usr/local/bin/kind ## Install kubectl -KUBECTL_VERSION=$(curl -L -s "https://dl.k8s.io/release/stable.txt") -curl -o /usr/local/bin/kubectl -LO "https://dl.k8s.io/release/$KUBECTL_VERSION/bin/linux/amd64/kubectl" +KUBECTL_VERSION=$(curl -fsSL "https://dl.k8s.io/release/stable.txt") +curl -fsSL -o /usr/local/bin/kubectl "https://dl.k8s.io/release/$KUBECTL_VERSION/bin/linux/amd64/kubectl" chmod +x /usr/local/bin/kubectl # Install Helm -curl https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3 | bash +curl -fsSL https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3 | bash # Install minikube -curl -LO https://storage.googleapis.com/minikube/releases/latest/minikube-linux-amd64 +curl -fsSL -O https://storage.googleapis.com/minikube/releases/latest/minikube-linux-amd64 sudo install minikube-linux-amd64 /usr/local/bin/minikube # Install kustomize download_url="https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh" -curl -s "$download_url" | bash +curl -fsSL "$download_url" | bash mv kustomize /usr/local/bin invoke_tests "Tools" "Kubernetes tools" diff --git a/images/linux/scripts/installers/leiningen.sh b/images/linux/scripts/installers/leiningen.sh index 045ada42ded3..2197b02efa03 100644 --- a/images/linux/scripts/installers/leiningen.sh +++ b/images/linux/scripts/installers/leiningen.sh @@ -5,7 +5,7 @@ ################################################################################ LEIN_BIN=/usr/local/bin/lein -curl -s https://raw.githubusercontent.com/technomancy/leiningen/stable/bin/lein > $LEIN_BIN +curl -fsSL https://raw.githubusercontent.com/technomancy/leiningen/stable/bin/lein > $LEIN_BIN chmod 0755 $LEIN_BIN # Run lein to trigger self-install diff --git a/images/linux/scripts/installers/microsoft-edge.sh b/images/linux/scripts/installers/microsoft-edge.sh index dc3ef46f64f9..5cf105cb235b 100644 --- a/images/linux/scripts/installers/microsoft-edge.sh +++ b/images/linux/scripts/installers/microsoft-edge.sh @@ -35,7 +35,7 @@ EDGE_VERSION_MAJOR=$(echo $EDGE_VERSION | cut -d'.' -f 1) EDGE_DRIVER_VERSION_URL="https://msedgedriver.azureedge.net/LATEST_RELEASE_${EDGE_VERSION_MAJOR}_LINUX" # Convert a resulting file to normal UTF-8 -EDGE_DRIVER_LATEST_VERSION=$(curl -s "$EDGE_DRIVER_VERSION_URL" | iconv -f utf-16 -t utf-8 | tr -d '\r') +EDGE_DRIVER_LATEST_VERSION=$(curl -fsSL "$EDGE_DRIVER_VERSION_URL" | iconv -f utf-16 -t utf-8 | tr -d '\r') EDGEDRIVER_URL="https://msedgedriver.azureedge.net/${EDGE_DRIVER_LATEST_VERSION}/edgedriver_linux64.zip" download_with_retries $EDGEDRIVER_URL "/tmp" "edgedriver_linux64.zip" diff --git a/images/linux/scripts/installers/miniconda.sh b/images/linux/scripts/installers/miniconda.sh index 02a370b2cdfe..3a3e7d295693 100644 --- a/images/linux/scripts/installers/miniconda.sh +++ b/images/linux/scripts/installers/miniconda.sh @@ -5,7 +5,7 @@ ################################################################################ # Install Miniconda -curl -sL https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -o miniconda.sh \ +curl -fsSL https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -o miniconda.sh \ && chmod +x miniconda.sh \ && ./miniconda.sh -b -p /usr/share/miniconda \ && rm miniconda.sh diff --git a/images/linux/scripts/installers/nodejs.sh b/images/linux/scripts/installers/nodejs.sh index 97b82fed5a46..46ef75b8c710 100644 --- a/images/linux/scripts/installers/nodejs.sh +++ b/images/linux/scripts/installers/nodejs.sh @@ -9,7 +9,7 @@ source $HELPER_SCRIPTS/install.sh # Install default Node.js defaultVersion=$(get_toolset_value '.node.default') -curl -L https://raw.githubusercontent.com/tj/n/master/bin/n -o ~/n +curl -fsSL https://raw.githubusercontent.com/tj/n/master/bin/n -o ~/n bash ~/n $defaultVersion # Install node modules diff --git a/images/linux/scripts/installers/nvm.sh b/images/linux/scripts/installers/nvm.sh index ddb146119833..71ae4b8d65ea 100644 --- a/images/linux/scripts/installers/nvm.sh +++ b/images/linux/scripts/installers/nvm.sh @@ -6,8 +6,8 @@ export NVM_DIR="/etc/skel/.nvm" mkdir $NVM_DIR -VERSION=$(curl -s https://api.github.com/repos/nvm-sh/nvm/releases/latest | jq -r '.tag_name') -curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/$VERSION/install.sh | bash +VERSION=$(curl -fsSL https://api.github.com/repos/nvm-sh/nvm/releases/latest | jq -r '.tag_name') +curl -fsSL https://raw.githubusercontent.com/nvm-sh/nvm/$VERSION/install.sh | bash echo 'NVM_DIR=$HOME/.nvm' | tee -a /etc/environment echo '[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm' | tee -a /etc/skel/.bash_profile [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" diff --git a/images/linux/scripts/installers/packer.sh b/images/linux/scripts/installers/packer.sh index 34c7f01ebd56..2433963cf979 100644 --- a/images/linux/scripts/installers/packer.sh +++ b/images/linux/scripts/installers/packer.sh @@ -7,7 +7,7 @@ source $HELPER_SCRIPTS/install.sh # Install Packer -URL=$(curl -s https://api.releases.hashicorp.com/v1/releases/packer/latest | jq -r '.builds[] | select((.arch=="amd64") and (.os=="linux")).url') +URL=$(curl -fsSL https://api.releases.hashicorp.com/v1/releases/packer/latest | jq -r '.builds[] | select((.arch=="amd64") and (.os=="linux")).url') ZIP_NAME="packer_linux_amd64.zip" download_with_retries "${URL}" "/tmp" "${ZIP_NAME}" unzip -qq "/tmp/${ZIP_NAME}" -d /usr/local/bin diff --git a/images/linux/scripts/installers/pulumi.sh b/images/linux/scripts/installers/pulumi.sh index e0081349f9e7..9c15de3f2b07 100644 --- a/images/linux/scripts/installers/pulumi.sh +++ b/images/linux/scripts/installers/pulumi.sh @@ -8,7 +8,7 @@ source $HELPER_SCRIPTS/install.sh # Install Pulumi -VERSION=$(curl --fail --silent -L "https://www.pulumi.com/latest-version") +VERSION=$(curl -fsSL "https://www.pulumi.com/latest-version") TARBALL_URL="https://get.pulumi.com/releases/sdk/pulumi-v${VERSION}-linux-x64.tar.gz" download_with_retries ${TARBALL_URL} "/tmp" pulumi-v${VERSION}.tar.gz tar --strip=1 -xf /tmp/pulumi-v${VERSION}.tar.gz -C /usr/local/bin diff --git a/images/linux/scripts/installers/pypy.sh b/images/linux/scripts/installers/pypy.sh index 547c72020e9d..32cb2ffc3438 100644 --- a/images/linux/scripts/installers/pypy.sh +++ b/images/linux/scripts/installers/pypy.sh @@ -74,7 +74,7 @@ function InstallPyPy } # Installation PyPy -pypyVersions=$(curl https://downloads.python.org/pypy/versions.json) +pypyVersions=$(curl -fsSL https://downloads.python.org/pypy/versions.json) toolsetVersions=$(get_toolset_value '.toolcache[] | select(.name | contains("PyPy")) | .versions[]') for toolsetVersion in $toolsetVersions; do diff --git a/images/linux/scripts/installers/ruby.sh b/images/linux/scripts/installers/ruby.sh index bf97974752fa..5c25fe69c975 100644 --- a/images/linux/scripts/installers/ruby.sh +++ b/images/linux/scripts/installers/ruby.sh @@ -22,7 +22,7 @@ fi apt-get install -y libz-dev openssl libssl-dev echo "Install Ruby from toolset..." -PACKAGE_TAR_NAMES=$(curl -s "https://api.github.com/repos/ruby/ruby-builder/releases/latest" | jq -r '.assets[].name') +PACKAGE_TAR_NAMES=$(curl -fsSL "https://api.github.com/repos/ruby/ruby-builder/releases/latest" | jq -r '.assets[].name') TOOLSET_VERSIONS=$(get_toolset_value '.toolcache[] | select(.name | contains("Ruby")) | .versions[]') PLATFORM_VERSION=$(get_toolset_value '.toolcache[] | select(.name | contains("Ruby")) | .platform_version') RUBY_PATH="$AGENT_TOOLSDIRECTORY/Ruby" diff --git a/images/linux/scripts/installers/rust.sh b/images/linux/scripts/installers/rust.sh index 5e0b4658848e..adec5a65a66f 100644 --- a/images/linux/scripts/installers/rust.sh +++ b/images/linux/scripts/installers/rust.sh @@ -11,7 +11,7 @@ source $HELPER_SCRIPTS/os.sh export RUSTUP_HOME=/etc/skel/.rustup export CARGO_HOME=/etc/skel/.cargo -curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain=stable --profile=minimal +curl -fsSL https://sh.rustup.rs | sh -s -- -y --default-toolchain=stable --profile=minimal # Initialize environment variables source $CARGO_HOME/env diff --git a/images/linux/scripts/installers/swift.sh b/images/linux/scripts/installers/swift.sh index f482d6021a59..ef7a7c09f5e8 100644 --- a/images/linux/scripts/installers/swift.sh +++ b/images/linux/scripts/installers/swift.sh @@ -9,7 +9,7 @@ source $HELPER_SCRIPTS/install.sh # Install image_label="$(lsb_release -rs)" -swift_version=$(curl -s "https://api.github.com/repos/apple/swift/releases/latest" | jq -r '.tag_name | match("[0-9.]+").string') +swift_version=$(curl -fsSL "https://api.github.com/repos/apple/swift/releases/latest" | jq -r '.tag_name | match("[0-9.]+").string') swift_tar_name="swift-$swift_version-RELEASE-ubuntu$image_label.tar.gz" swift_tar_url="https://swift.org/builds/swift-$swift_version-release/ubuntu${image_label//./}/swift-$swift_version-RELEASE/$swift_tar_name" diff --git a/images/linux/scripts/installers/terraform.sh b/images/linux/scripts/installers/terraform.sh index bed616fb84c6..0e8f5553713b 100644 --- a/images/linux/scripts/installers/terraform.sh +++ b/images/linux/scripts/installers/terraform.sh @@ -7,7 +7,7 @@ source $HELPER_SCRIPTS/install.sh # Install Terraform -URL=$(curl -s https://api.releases.hashicorp.com/v1/releases/terraform/latest | jq -r '.builds[] | select((.arch=="amd64") and (.os=="linux")).url') +URL=$(curl -fsSL https://api.releases.hashicorp.com/v1/releases/terraform/latest | jq -r '.builds[] | select((.arch=="amd64") and (.os=="linux")).url') ZIP_NAME="terraform_linux_amd64.zip" download_with_retries "${URL}" "/tmp" "${ZIP_NAME}" unzip -qq "/tmp/${ZIP_NAME}" -d /usr/local/bin diff --git a/images/linux/scripts/installers/zstd.sh b/images/linux/scripts/installers/zstd.sh index 8c738f4c09b3..d845b97f9d55 100644 --- a/images/linux/scripts/installers/zstd.sh +++ b/images/linux/scripts/installers/zstd.sh @@ -8,7 +8,7 @@ source $HELPER_SCRIPTS/install.sh apt-get install -y liblz4-dev -release_tag=$(curl https://api.github.com/repos/facebook/zstd/releases/latest | jq -r '.tag_name') +release_tag=$(curl -fsSL https://api.github.com/repos/facebook/zstd/releases/latest | jq -r '.tag_name') zstd_tar_name=zstd-${release_tag//v}.tar.gz URL=https://github.com/facebook/zstd/releases/download/${release_tag}/${zstd_tar_name} download_with_retries "${URL}" "/tmp" "${zstd_tar_name}" From ae5b1c7dff86a06366f0b52c6e639067ad9274c6 Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Fri, 28 Jul 2023 21:09:52 +0200 Subject: [PATCH 2068/3485] Install chrome for testing in mac OS (#7990) --- images/macos/provision/core/chrome.sh | 45 ++++++++++++++++--- .../SoftwareReport.Browsers.psm1 | 9 +++- images/macos/tests/Browsers.Tests.ps1 | 10 ++++- 3 files changed, 55 insertions(+), 9 deletions(-) diff --git a/images/macos/provision/core/chrome.sh b/images/macos/provision/core/chrome.sh index 056f356a891e..51458aab679a 100644 --- a/images/macos/provision/core/chrome.sh +++ b/images/macos/provision/core/chrome.sh @@ -1,16 +1,49 @@ #!/bin/bash -e -o pipefail source ~/utils/utils.sh +arch=$(get_arch) -echo "Installing Chrome..." +echo "Installing Google Chrome..." brew_cask_install_ignoring_sha256 "google-chrome" -echo "Installing Chrome Driver" -brew install --cask chromedriver +# Parse Google Chrome version +FULL_CHROME_VERSION=$("/Applications/Google Chrome.app/Contents/MacOS/Google Chrome" --version) +FULL_CHROME_VERSION=${FULL_CHROME_VERSION#Google Chrome } +CHROME_VERSION=${FULL_CHROME_VERSION%.*} +echo "Google Chrome version is $FULL_CHROME_VERSION" + +# Get Google Chrome versions information +CHROME_PLATFORM="mac-$arch" +CHROME_VERSIONS_URL="https://googlechromelabs.github.io/chrome-for-testing/latest-patch-versions-per-build-with-downloads.json" +CHROME_VERSIONS_JSON=$(curl -fsSL "${CHROME_VERSIONS_URL}") + +# Download and unpack the latest release of Chrome Driver +CHROMEDRIVER_VERSION=$(echo "${CHROME_VERSIONS_JSON}" | jq -r '.builds["'"$CHROME_VERSION"'"].version') +echo "Installing Chrome Driver version $CHROMEDRIVER_VERSION" + +CHROMEDRIVER_URL=$(echo "${CHROME_VERSIONS_JSON}" | jq -r '.builds["'"$CHROME_VERSION"'"].downloads.chromedriver[] | select(.platform=="'"${CHROME_PLATFORM}"'").url') +CHROMEDRIVER_ARCHIVE="chromedriver-${CHROME_PLATFORM}.zip" +CHROMEDRIVER_DIR="/usr/local/share/chromedriver-${CHROME_PLATFORM}" +CHROMEDRIVER_BIN="$CHROMEDRIVER_DIR/chromedriver" + +download_with_retries "$CHROMEDRIVER_URL" "/tmp" "$CHROMEDRIVER_ARCHIVE" +unzip -qq /tmp/$CHROMEDRIVER_ARCHIVE -d /usr/local/share +chmod +x $CHROMEDRIVER_BIN +ln -s "$CHROMEDRIVER_BIN" /usr/local/bin/chromedriver +echo "export CHROMEWEBDRIVER=$CHROMEDRIVER_DIR" >> "${HOME}/.bashrc" + +# Download and unpack the latest release of Google Chrome for Testing +CHROME_FOR_TESTING_VERSION=$(echo "${CHROME_VERSIONS_JSON}" | jq -r '.builds["'"$CHROME_VERSION"'"].version') +echo "Installing Google Chrome for Testing version $CHROME_FOR_TESTING_VERSION" + +CHROME_FOR_TESTING_URL=$(echo "${CHROME_VERSIONS_JSON}" | jq -r '.builds["'"$CHROME_VERSION"'"].downloads.chrome[] | select(.platform=="'"${CHROME_PLATFORM}"'").url') +CHROME_FOR_TESTING_ARCHIVE="chrome-${CHROME_PLATFORM}.zip" +CHROME_FOR_TESTING_APP="Google Chrome for Testing.app" + +download_with_retries $CHROME_FOR_TESTING_URL "/tmp" $CHROME_FOR_TESTING_ARCHIVE +unzip -qq /tmp/$CHROME_FOR_TESTING_ARCHIVE -d /tmp/ +mv "/tmp/chrome-${CHROME_PLATFORM}/${CHROME_FOR_TESTING_APP}" "/Applications/${CHROME_FOR_TESTING_APP}" echo "Installing Selenium" brew_smart_install "selenium-server" -CHROMEWEBDRIVER_DIR=$(readlink $(which chromedriver) | xargs dirname) -echo "export CHROMEWEBDRIVER=$CHROMEWEBDRIVER_DIR" >> "${HOME}/.bashrc" - invoke_tests "Browsers" "Chrome" diff --git a/images/macos/software-report/SoftwareReport.Browsers.psm1 b/images/macos/software-report/SoftwareReport.Browsers.psm1 index 6dbf1fbf55c6..3bc568f070b9 100644 --- a/images/macos/software-report/SoftwareReport.Browsers.psm1 +++ b/images/macos/software-report/SoftwareReport.Browsers.psm1 @@ -3,6 +3,7 @@ function Build-BrowserSection { [ToolVersionNode]::new("Safari", $(Get-SafariVersion)) [ToolVersionNode]::new("SafariDriver", $(Get-SafariDriverVersion)) [ToolVersionNode]::new("Google Chrome", $(Get-ChromeVersion)) + [ToolVersionNode]::new("Google Chrome for Testing", $(Get-ChromeForTestingVersion)) [ToolVersionNode]::new("ChromeDriver", $(Get-ChromeDriverVersion)) [ToolVersionNode]::new("Microsoft Edge", $(Get-EdgeVersion)) [ToolVersionNode]::new("Microsoft Edge WebDriver", $(Get-EdgeDriverVersion)) @@ -19,7 +20,7 @@ function Get-SafariVersion { } function Get-SafariDriverVersion { - $version = Run-Command "safaridriver --version" | Take-Part -Part 3,4 + $version = Run-Command "safaridriver --version" | Take-Part -Part 3, 4 return $version } @@ -29,6 +30,12 @@ function Get-ChromeVersion { return ($version -replace ("^Google Chrome")).Trim() } +function Get-ChromeForTestingVersion { + $chromePath = "/Applications/Google Chrome for Testing.app/Contents/MacOS/Google Chrome for Testing" + $version = Run-Command "'${chromePath}' --version" + return ($version -replace ("^Google Chrome for Testing")).Trim() +} + function Get-ChromeDriverVersion { $rawOutput = Run-Command "chromedriver --version" $version = $rawOutput | Take-Part -Part 1 diff --git a/images/macos/tests/Browsers.Tests.ps1 b/images/macos/tests/Browsers.Tests.ps1 index 1b7499b34aad..4a2b93c7eaf5 100644 --- a/images/macos/tests/Browsers.Tests.ps1 +++ b/images/macos/tests/Browsers.Tests.ps1 @@ -4,6 +4,7 @@ $os = Get-OSVersion Describe "Chrome" -Skip:($os.IsVenturaArm64) { BeforeAll { $chromeLocation = "/Applications/Google Chrome.app/Contents/MacOS/Google Chrome" + $chromeForTestingLocation = "/Applications/Google Chrome for Testing.app/Contents/MacOS/Google Chrome for Testing" } It "Chrome" { @@ -11,12 +12,17 @@ Describe "Chrome" -Skip:($os.IsVenturaArm64) { "'$chromeLocation' --version" | Should -ReturnZeroExitCode } + It "Chrome for Testing" { + $chromeForTestingLocation | Should -Exist + "'$chromeForTestingLocation' --version" | Should -ReturnZeroExitCode + } + It "Chrome Driver" { "chromedriver --version" | Should -ReturnZeroExitCode } - It "Chrome and Chrome Driver major versions are the same" { - $chromeMajor = (& $chromeLocation --version).Trim("Google Chrome ").Split(".")[0] + It "Chrome for Testing and Chrome Driver major versions are the same" { + $chromeMajor = (& $chromeForTestingLocation --version).Trim("Google Chrome for Testing ").Split(".")[0] $chromeDriverMajor = (chromedriver --version).Trim("ChromeDriver ").Split(".")[0] $chromeMajor | Should -BeExactly $chromeDriverMajor } From 739db6e683de5bd10862d0b8b6fa3ff7f58143cd Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Mon, 31 Jul 2023 15:49:39 +0200 Subject: [PATCH 2069/3485] [Ubuntu] Pin Android cmdline-tools version (#8002) --- images/linux/toolsets/toolset-2004.json | 2 +- images/linux/toolsets/toolset-2204.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index d16d3de53653..86067a5c1e7c 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -87,7 +87,7 @@ "maven": "3.8.8" }, "android": { - "cmdline-tools": "latest", + "cmdline-tools": "commandlinetools-linux-9477386_latest.zip", "platform_min_version": "27", "build_tools_min_version": "27.0.0", "extra_list": [ diff --git a/images/linux/toolsets/toolset-2204.json b/images/linux/toolsets/toolset-2204.json index b5bbac7426c2..d0f27732a33b 100644 --- a/images/linux/toolsets/toolset-2204.json +++ b/images/linux/toolsets/toolset-2204.json @@ -76,7 +76,7 @@ "maven": "3.8.8" }, "android": { - "cmdline-tools": "latest", + "cmdline-tools": "commandlinetools-linux-9477386_latest.zip", "platform_min_version": "27", "build_tools_min_version": "27.0.0", "extra_list": [ From c545cacd84d28de91c71df098a91a845cac52e8f Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Tue, 1 Aug 2023 09:24:55 +0200 Subject: [PATCH 2070/3485] [Windows] Update Edge installer (#8006) --- images/win/scripts/Installers/Install-Edge.ps1 | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/images/win/scripts/Installers/Install-Edge.ps1 b/images/win/scripts/Installers/Install-Edge.ps1 index be100e096e4b..5e5b42c3d307 100644 --- a/images/win/scripts/Installers/Install-Edge.ps1 +++ b/images/win/scripts/Installers/Install-Edge.ps1 @@ -1,13 +1,8 @@ ################################################################################ ## File: Install-Edge.ps1 -## Desc: Install latest stable version of Microsoft Edge browser +## Desc: Configure Edge browser and install Edge WebDriver ################################################################################ -# Installed by default on Windows Server 2022 -if (-not (Test-IsWin22)) { - Choco-Install -PackageName microsoft-edge -} - # Disable Edge auto-updates Rename-Item -Path "C:\Program Files (x86)\Microsoft\EdgeUpdate\MicrosoftEdgeUpdate.exe" -NewName "Disabled_MicrosoftEdgeUpdate.exe" -ErrorAction Stop From 67f9c37eeea730c21b2ed904da8642a92c68c863 Mon Sep 17 00:00:00 2001 From: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com> Date: Tue, 1 Aug 2023 10:01:30 +0200 Subject: [PATCH 2071/3485] [macos] enable simulators for XCode-15 (#8001) test on simulators is really weird, after deep investigation we deviced to disable it for a while --- images/macos/provision/core/xcode.ps1 | 3 +-- images/macos/tests/Xcode.Tests.ps1 | 14 +++++++------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/images/macos/provision/core/xcode.ps1 b/images/macos/provision/core/xcode.ps1 index 4836596ae157..a5609e81972b 100644 --- a/images/macos/provision/core/xcode.ps1 +++ b/images/macos/provision/core/xcode.ps1 @@ -31,8 +31,7 @@ $xcodeVersions | ForEach-Object { Write-Host "Configuring Xcode $($_.link) ..." Invoke-XcodeRunFirstLaunch -Version $_.link - ##if ($_.link.Split(".")[0] -ge 14) { - if ($_.link.Split(".")[0] -eq 14) { + if ($_.link.Split(".")[0] -ge 14) { # Additional simulator runtimes are included by default for Xcode < 14 Install-AdditionalSimulatorRuntimes -Version $_.link } diff --git a/images/macos/tests/Xcode.Tests.ps1 b/images/macos/tests/Xcode.Tests.ps1 index 2d00a42a7c57..a38a996d5dd9 100644 --- a/images/macos/tests/Xcode.Tests.ps1 +++ b/images/macos/tests/Xcode.Tests.ps1 @@ -103,13 +103,13 @@ Describe "Xcode simulators" { Validate-ArrayWithoutDuplicates $devicesList -Because "Found duplicate device simulators" } - It "No duplicates in pairs" -TestCases $testCase { - Switch-Xcode -Version $XcodeVersion - [array]$pairsList = @(Get-XcodePairsList | Where-Object { $_ }) - Write-Host "Pairs for $XcodeVersion" - Write-Host ($pairsList -join "`n") - Validate-ArrayWithoutDuplicates $pairsList -Because "Found duplicate pairs simulators" - } +# It "No duplicates in pairs" -TestCases $testCase { +# Switch-Xcode -Version $XcodeVersion +# [array]$pairsList = @(Get-XcodePairsList | Where-Object { $_ }) +# Write-Host "Pairs for $XcodeVersion" +# Write-Host ($pairsList -join "`n") +# Validate-ArrayWithoutDuplicates $pairsList -Because "Found duplicate pairs simulators" +# } } } From 463cbf01cf818f27b45e79c0304343c3bca38f0d Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Tue, 1 Aug 2023 15:42:44 +0200 Subject: [PATCH 2072/3485] [mac OS] Set flags for curl invocations (#8008) --- images/macos/provision/configuration/configure-machine.sh | 2 +- images/macos/provision/core/codeql-bundle.sh | 2 +- images/macos/provision/core/dotnet.sh | 2 +- images/macos/provision/core/edge.sh | 2 +- images/macos/provision/core/haskell.sh | 2 +- images/macos/provision/core/miniconda.sh | 2 +- images/macos/provision/core/node.sh | 2 +- images/macos/provision/core/nvm.sh | 4 ++-- images/macos/provision/core/openjdk.sh | 4 ++-- images/macos/provision/core/powershell.sh | 2 +- images/macos/provision/core/pypy.sh | 2 +- images/macos/provision/core/ruby.sh | 2 +- images/macos/provision/core/vsmac.sh | 6 +++--- images/macos/provision/utils/utils.sh | 2 +- 14 files changed, 18 insertions(+), 18 deletions(-) diff --git a/images/macos/provision/configuration/configure-machine.sh b/images/macos/provision/configuration/configure-machine.sh index 2e80198d035c..9b268a80aa2b 100644 --- a/images/macos/provision/configuration/configure-machine.sh +++ b/images/macos/provision/configuration/configure-machine.sh @@ -47,7 +47,7 @@ certs=( for cert in ${certs[@]}; do echo "Adding ${cert} certificate" cert_path="${HOME}/${cert}" - curl "https://www.apple.com/certificateauthority/${cert}" --output ${cert_path} --silent + curl -fsSL "https://www.apple.com/certificateauthority/${cert}" --output ${cert_path} sudo ./add-certificate ${cert_path} diff --git a/images/macos/provision/core/codeql-bundle.sh b/images/macos/provision/core/codeql-bundle.sh index dab0f9dc015c..abce292e5246 100644 --- a/images/macos/provision/core/codeql-bundle.sh +++ b/images/macos/provision/core/codeql-bundle.sh @@ -2,7 +2,7 @@ source ~/utils/utils.sh # Retrieve the CLI versions and bundle tags of the latest two CodeQL bundles. -base_url="$(curl -sSL https://raw.githubusercontent.com/github/codeql-action/v2/src/defaults.json)" +base_url="$(curl -fsSL https://raw.githubusercontent.com/github/codeql-action/v2/src/defaults.json)" codeql_tag_name="$(echo "$base_url" | jq -r '.bundleVersion')" codeql_cli_version="$(echo "$base_url" | jq -r '.cliVersion')" prior_codeql_tag_name="$(echo "$base_url" | jq -r '.priorBundleVersion')" diff --git a/images/macos/provision/core/dotnet.sh b/images/macos/provision/core/dotnet.sh index eb877600ddbf..8e86c56427df 100755 --- a/images/macos/provision/core/dotnet.sh +++ b/images/macos/provision/core/dotnet.sh @@ -14,7 +14,7 @@ arch=$(get_arch) # Download installer from dot.net and keep it locally DOTNET_INSTALL_SCRIPT="https://dot.net/v1/dotnet-install.sh" -curl -L -o "dotnet-install.sh" "$DOTNET_INSTALL_SCRIPT" +curl -fsSL -o "dotnet-install.sh" "$DOTNET_INSTALL_SCRIPT" chmod +x ./dotnet-install.sh ARGS_LIST=() diff --git a/images/macos/provision/core/edge.sh b/images/macos/provision/core/edge.sh index 388c6dbf54b0..25ff3ffb421c 100644 --- a/images/macos/provision/core/edge.sh +++ b/images/macos/provision/core/edge.sh @@ -13,7 +13,7 @@ echo "Version of Microsoft Edge: ${EDGE_VERSION}" echo "Installing Microsoft Edge WebDriver..." EDGE_DRIVER_VERSION_URL="https://msedgedriver.azureedge.net/LATEST_RELEASE_${EDGE_VERSION_MAJOR}_MACOS" -EDGE_DRIVER_LATEST_VERSION=$(curl -s "$EDGE_DRIVER_VERSION_URL" | iconv -f utf-16 -t utf-8 | tr -d '\r') +EDGE_DRIVER_LATEST_VERSION=$(curl -fsSL "$EDGE_DRIVER_VERSION_URL" | iconv -f utf-16 -t utf-8 | tr -d '\r') EDGE_DRIVER_URL="https://msedgedriver.azureedge.net/${EDGE_DRIVER_LATEST_VERSION}/edgedriver_mac64.zip" echo "Compatible version of WebDriver: ${EDGE_DRIVER_LATEST_VERSION}" diff --git a/images/macos/provision/core/haskell.sh b/images/macos/provision/core/haskell.sh index 342c5f6ec69e..93aaf14bc82a 100644 --- a/images/macos/provision/core/haskell.sh +++ b/images/macos/provision/core/haskell.sh @@ -1,6 +1,6 @@ #!/bin/bash -e -o pipefail -curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | sh +curl --proto '=https' --tlsv1.2 -fsSL https://get-ghcup.haskell.org | sh export PATH="$HOME/.ghcup/bin:$PATH" echo 'export PATH="$PATH:$HOME/.ghcup/bin"' >> "$HOME/.bashrc" diff --git a/images/macos/provision/core/miniconda.sh b/images/macos/provision/core/miniconda.sh index 1032afdf8da1..acbbacb8590e 100644 --- a/images/macos/provision/core/miniconda.sh +++ b/images/macos/provision/core/miniconda.sh @@ -1,7 +1,7 @@ #!/bin/bash -e -o pipefail MINICONDA_INSTALLER="/tmp/miniconda.sh" -curl -sL https://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh -o $MINICONDA_INSTALLER +curl -fsSL https://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh -o $MINICONDA_INSTALLER chmod +x $MINICONDA_INSTALLER sudo $MINICONDA_INSTALLER -b -p /usr/local/miniconda diff --git a/images/macos/provision/core/node.sh b/images/macos/provision/core/node.sh index ae6145861a31..4407f1c626fb 100644 --- a/images/macos/provision/core/node.sh +++ b/images/macos/provision/core/node.sh @@ -8,7 +8,7 @@ brew_smart_install "node@$defaultVersion" brew link node@$defaultVersion --force --overwrite echo Installing yarn... -curl -o- -L https://yarnpkg.com/install.sh | bash +curl -fsSL https://yarnpkg.com/install.sh | bash npm_global_packages=$(get_toolset_value '.npm.global_packages[].name') for module in ${npm_global_packages[@]}; do diff --git a/images/macos/provision/core/nvm.sh b/images/macos/provision/core/nvm.sh index 098861139c04..7d30908bad28 100755 --- a/images/macos/provision/core/nvm.sh +++ b/images/macos/provision/core/nvm.sh @@ -6,8 +6,8 @@ source ~/utils/utils.sh [ -n "$API_PAT" ] && authString=(-H "Authorization: token ${API_PAT}") -VERSION=$(curl "${authString[@]}" -s https://api.github.com/repos/nvm-sh/nvm/releases/latest | jq -r '.tag_name') -curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/$VERSION/install.sh | bash +VERSION=$(curl "${authString[@]}" -fsSL https://api.github.com/repos/nvm-sh/nvm/releases/latest | jq -r '.tag_name') +curl -fsSL https://raw.githubusercontent.com/nvm-sh/nvm/$VERSION/install.sh | bash if [ $? -eq 0 ]; then . ~/.bashrc diff --git a/images/macos/provision/core/openjdk.sh b/images/macos/provision/core/openjdk.sh index 8311154364fb..8f6dec9ecbe2 100755 --- a/images/macos/provision/core/openjdk.sh +++ b/images/macos/provision/core/openjdk.sh @@ -23,9 +23,9 @@ installOpenJDK() { # Get link for Java binaries and Java version if [[ ${VENDOR_NAME} == "Temurin-Hotspot" ]]; then - assetUrl=$(curl -s "https://api.adoptium.net/v3/assets/latest/${JAVA_VERSION}/hotspot") + assetUrl=$(curl -fsSL "https://api.adoptium.net/v3/assets/latest/${JAVA_VERSION}/hotspot") elif [[ ${VENDOR_NAME} == "Adopt" ]]; then - assetUrl=$(curl -s "https://api.adoptopenjdk.net/v3/assets/latest/${JAVA_VERSION}/hotspot") + assetUrl=$(curl -fsSL "https://api.adoptopenjdk.net/v3/assets/latest/${JAVA_VERSION}/hotspot") else echo "${VENDOR_NAME} is invalid, valid names are: Temurin-Hotspot and Adopt" exit 1 diff --git a/images/macos/provision/core/powershell.sh b/images/macos/provision/core/powershell.sh index 424909f2c497..d503fb4d75d8 100644 --- a/images/macos/provision/core/powershell.sh +++ b/images/macos/provision/core/powershell.sh @@ -4,7 +4,7 @@ source ~/utils/utils.sh echo Installing PowerShell... arch=$(get_arch) -psmetadata=$(curl "https://raw.githubusercontent.com/PowerShell/PowerShell/master/tools/metadata.json" -s) +psmetadata=$(curl -fsSL "https://raw.githubusercontent.com/PowerShell/PowerShell/master/tools/metadata.json") psver=$(echo $psmetadata | jq -r '.LTSReleaseTag[0]') psDownloadUrl=$(get_github_package_download_url "PowerShell/PowerShell" "contains(\"osx-$arch.pkg\")" "$psver" "$API_PAT") download_with_retries $psDownloadUrl "/tmp" "powershell.pkg" diff --git a/images/macos/provision/core/pypy.sh b/images/macos/provision/core/pypy.sh index 95d060a62622..d9f0707c3e28 100644 --- a/images/macos/provision/core/pypy.sh +++ b/images/macos/provision/core/pypy.sh @@ -76,7 +76,7 @@ function InstallPyPy } arch=$(get_arch) -pypyVersions=$(curl https://downloads.python.org/pypy/versions.json) +pypyVersions=$(curl -fsSL https://downloads.python.org/pypy/versions.json) toolsetVersions=$(get_toolset_value '.toolcache[] | select(.name | contains("PyPy")) | .arch.'$arch'.versions[]') for toolsetVersion in $toolsetVersions; do diff --git a/images/macos/provision/core/ruby.sh b/images/macos/provision/core/ruby.sh index 104e4c95d0b2..e931b2c9a6b6 100755 --- a/images/macos/provision/core/ruby.sh +++ b/images/macos/provision/core/ruby.sh @@ -22,7 +22,7 @@ fi if ! is_VenturaArm64; then echo "Install Ruby from toolset..." [ -n "$API_PAT" ] && authString=(-H "Authorization: token ${API_PAT}") - PACKAGE_TAR_NAMES=$(curl "${authString[@]}" -s "https://api.github.com/repos/ruby/ruby-builder/releases/latest" | jq -r '.assets[].name') + PACKAGE_TAR_NAMES=$(curl "${authString[@]}" -fsSL "https://api.github.com/repos/ruby/ruby-builder/releases/latest" | jq -r '.assets[].name') TOOLSET_VERSIONS=$(get_toolset_value '.toolcache[] | select(.name | contains("Ruby")) | .arch.'$arch'.versions[]') RUBY_PATH="$AGENT_TOOLSDIRECTORY/Ruby" diff --git a/images/macos/provision/core/vsmac.sh b/images/macos/provision/core/vsmac.sh index dfcb37ba9abf..7e4cbc4ee777 100644 --- a/images/macos/provision/core/vsmac.sh +++ b/images/macos/provision/core/vsmac.sh @@ -6,11 +6,11 @@ install_vsmac() { local VSMAC_VERSION=$1 local VSMAC_DEFAULT=$2 if [ $VSMAC_VERSION == "2019" ]; then - VSMAC_DOWNLOAD_URL=$(curl -sL "https://aka.ms/manifest/stable" | jq -r '.items[] | select(.genericName=="VisualStudioMac").url') + VSMAC_DOWNLOAD_URL=$(curl -fsSL "https://aka.ms/manifest/stable" | jq -r '.items[] | select(.genericName=="VisualStudioMac").url') elif [ $VSMAC_VERSION == "2022" ]; then - VSMAC_DOWNLOAD_URL=$(curl -sL "https://aka.ms/manifest/stable-2022" | jq -r '.items[] | select(.genericName=="VisualStudioMac").url') + VSMAC_DOWNLOAD_URL=$(curl -fsSL "https://aka.ms/manifest/stable-2022" | jq -r '.items[] | select(.genericName=="VisualStudioMac").url') elif [ $VSMAC_VERSION == "preview" ]; then - VSMAC_DOWNLOAD_URL=$(curl -sL "https://aka.ms/manifest/preview" | jq -r '.items[] | select(.genericName=="VisualStudioMac").url') + VSMAC_DOWNLOAD_URL=$(curl -fsSL "https://aka.ms/manifest/preview" | jq -r '.items[] | select(.genericName=="VisualStudioMac").url') else VSMAC_DOWNLOAD_URL=$(buildVSMacDownloadUrl $VSMAC_VERSION) fi diff --git a/images/macos/provision/utils/utils.sh b/images/macos/provision/utils/utils.sh index 125c1761c597..eb8dd76d1a32 100755 --- a/images/macos/provision/utils/utils.sh +++ b/images/macos/provision/utils/utils.sh @@ -202,7 +202,7 @@ get_github_package_download_url() { [ -n "$API_PAT" ] && authString=(-H "Authorization: token ${API_PAT}") - json=$(curl "${authString[@]}" -sSf "https://api.github.com/repos/${REPO_ORG}/releases?per_page=${SEARCH_IN_COUNT}") + json=$(curl "${authString[@]}" -fsSL "https://api.github.com/repos/${REPO_ORG}/releases?per_page=${SEARCH_IN_COUNT}") if [[ "$VERSION" == "latest" ]]; then tagName=$(echo $json | jq -r '.[] | select((.prerelease==false) and (.assets | length > 0)).tag_name' | sort --unique --version-sort | egrep -v ".*-[a-z]" | tail -1) From 67b63b6c4ed7e17920c9a306d7616dae30ef7307 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 1 Aug 2023 15:01:12 +0000 Subject: [PATCH 2073/3485] Updating readme file for macos-13 version 20230731.2 (#8013) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-13-Readme.md | 235 ++++++++++++++++---------------- 1 file changed, 119 insertions(+), 116 deletions(-) diff --git a/images/macos/macos-13-Readme.md b/images/macos/macos-13-Readme.md index 2b374df120af..3ffd41a935ed 100644 --- a/images/macos/macos-13-Readme.md +++ b/images/macos/macos-13-Readme.md @@ -1,17 +1,12 @@ -| Announcements | -|-| -| [[All OSs] .NET 3.1 will be removed from the images on July, 3](https://github.com/actions/runner-images/issues/7667) | -| [Actions runner image scheduled maintenance (June 2 2023 through June 16 2023)](https://github.com/actions/runner-images/issues/7660) | -*** # macOS 13 -- OS Version: macOS 13.4 (22F66) -- Kernel Version: Darwin 22.5.0 -- Image Version: 20230611.2 +- OS Version: macOS 13.5 (22G74) +- Kernel Version: Darwin 22.6.0 +- Image Version: 20230731.2 ## Installed Software ### Language and Runtime -- .NET Core SDK: 7.0.102, 7.0.202, 7.0.302 +- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306 - Bash 3.2.57(1)-release - Clang/LLVM 14.0.0 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` @@ -19,25 +14,25 @@ - GCC 12 (Homebrew GCC 12.3.0) - available by `gcc-12` alias - GNU Fortran 11 (Homebrew GCC 11.4.0) - available by `gfortran-11` alias - GNU Fortran 12 (Homebrew GCC 12.3.0) - available by `gfortran-12` alias -- Julia 1.9.1 -- Kotlin 1.8.22-release-407 +- Julia 1.9.2 +- Kotlin 1.9.0-release-358 - Perl 5.36.1 -- PHP 8.2.7 +- PHP 8.2.8 - Python3 3.11.4 -- R 4.3.0 +- R 4.3.1 - Ruby 3.0.6p216 ### Package Management -- Bundler 2.4.13 +- Bundler 2.4.17 - Carthage 0.39.0 - CocoaPods 1.12.1 - Composer 2.5.8 -- Homebrew 4.0.21 -- NPM 9.5.1 -- Pip3 23.1.2 (python 3.11) +- Homebrew 4.1.3 +- NPM 9.6.7 +- Pip3 23.2.1 (python 3.11) - Pipx 1.2.0 -- RubyGems 3.4.13 -- Vcpkg 2023 (build from commit 633664434) +- RubyGems 3.4.17 +- Vcpkg 2023 (build from commit b43873aa8) - Yarn 1.22.19 ### Project Management @@ -46,68 +41,70 @@ ### Utilities - 7-Zip 17.05 - aria2 1.36.0 -- azcopy 10.19.0 -- bazel 6.2.1 +- azcopy 10.20.0 +- bazel 6.3.1 - bazelisk 1.17.0 - bsdtar 3.5.3 - available by 'tar' alias -- Curl 8.1.2 +- Curl 8.2.1 - Git 2.41.0 -- Git LFS 3.3.0 -- GitHub CLI 2.30.0 -- GNU Tar 1.34 - available by 'gtar' alias +- Git LFS 3.4.0 +- GitHub CLI 2.32.1 +- GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.21.4 -- gpg (GnuPG) 2.4.2 +- gpg (GnuPG) 2.4.3 - jq 1.6 -- OpenSSL LibreSSL 3.3.6 -- Packer 1.9.1 -- Vagrant 2.3.6 -- yq 4.34.1 +- OpenSSL 3.1.1 30 May 2023 (Library: OpenSSL 3.1.1 30 May 2023) +- Packer 1.9.2 +- pkg-config 0.29.2 +- Vagrant 2.3.7 +- yq 4.34.2 - zstd 1.5.5 ### Tools -- AWS CLI 2.11.27 -- AWS SAM CLI 1.86.1 +- AWS CLI 2.13.5 +- AWS SAM CLI 1.94.0 - AWS Session Manager CLI 1.2.463.0 -- Azure CLI 2.49.0 +- Azure CLI 2.50.0 - Azure CLI (azure-devops) 0.26.0 -- Bicep CLI 0.17.1 +- Bicep CLI 0.19.5 - Cabal 3.6.2.0 -- Cmake 3.26.4 -- CodeQL Action Bundles 2.13.1 2.13.3 -- Fastlane 2.213.0 +- Cmake 3.27.1 +- CodeQL Action Bundles 2.14.0 2.14.1 +- Fastlane 2.214.0 - GHC 9.6.2 -- GHCup 0.1.19.2 +- GHCup 0.1.19.4 - Stack 2.9.3 -- SwiftFormat 0.51.11 +- SwiftFormat 0.51.13 - Xcode Command Line Tools 14.3.1.0.1.1683849156 ### Linters -- SwiftLint 0.52.2 +- SwiftLint 0.52.4 ### Browsers -- Safari 16.5 (18615.2.9.11.4) -- SafariDriver 16.5 (18615.2.9.11.4) -- Google Chrome 114.0.5735.106 -- ChromeDriver 114.0.5735.90 -- Microsoft Edge 114.0.1823.43 -- Microsoft Edge WebDriver 114.0.1823.43 -- Mozilla Firefox 114.0.1 +- Safari 16.6 (18615.3.12.11.2) +- SafariDriver 16.6 (18615.3.12.11.2) +- Google Chrome 115.0.5790.114 +- Google Chrome for Testing 115.0.5790.102 +- ChromeDriver 115.0.5790.102 +- Microsoft Edge 115.0.1901.188 +- Microsoft Edge WebDriver 115.0.1901.188 +- Mozilla Firefox 115.0.3 - geckodriver 0.33.0 - Selenium server 4.10.0 #### Environment variables -| Name | Value | -| --------------- | ---------------------------------------------- | -| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/114.0.5735.90 | -| EDGEWEBDRIVER | /usr/local/share/edge_driver | -| GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | +| Name | Value | +| --------------- | ------------------------------------- | +| CHROMEWEBDRIVER | /usr/local/share/chromedriver-mac-x64 | +| EDGEWEBDRIVER | /usr/local/share/edge_driver | +| GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | ### Java | Version | Vendor | Environment Variable | | ------------------ | --------------- | -------------------- | -| 8.0.372+7 | Eclipse Temurin | JAVA_HOME_8_X64 | -| 11.0.19+7 | Eclipse Temurin | JAVA_HOME_11_X64 | -| 17.0.7+7 (default) | Eclipse Temurin | JAVA_HOME_17_X64 | +| 8.0.382+5 | Eclipse Temurin | JAVA_HOME_8_X64 | +| 11.0.20+8 | Eclipse Temurin | JAVA_HOME_11_X64 | +| 17.0.8+7 (default) | Eclipse Temurin | JAVA_HOME_17_X64 | ### Cached Tools @@ -122,45 +119,45 @@ - 3.11.4 #### PyPy -- 2.7.18 [PyPy 7.3.11] +- 2.7.18 [PyPy 7.3.12] - 3.7.13 [PyPy 7.3.9] - 3.8.16 [PyPy 7.3.11] -- 3.9.16 [PyPy 7.3.11] +- 3.9.17 [PyPy 7.3.12] #### Node.js -- 16.20.0 -- 18.16.0 +- 16.20.1 +- 18.17.0 #### Go -- 1.19.10 -- 1.20.5 +- 1.19.11 +- 1.20.6 ### Rust Tools -- Cargo 1.70.0 -- Rust 1.70.0 -- Rustdoc 1.70.0 +- Cargo 1.71.0 +- Rust 1.71.0 +- Rustdoc 1.71.0 - Rustup 1.26.0 #### Packages -- Bindgen 0.65.1 +- Bindgen 0.66.1 - Cargo-audit 0.17.6 -- Cargo-outdated 0.11.2 +- Cargo-outdated 0.13.1 - Cbindgen 0.24.5 -- Clippy 0.1.70 +- Clippy 0.1.71 - Rustfmt 1.5.2-stable ### PowerShell Tools -- PowerShell 7.2.11 +- PowerShell 7.2.13 #### PowerShell Modules -- Az: 10.0.0 -- Pester: 5.4.1 +- Az: 10.1.0 +- Pester: 5.5.0 - PSScriptAnalyzer: 1.21.0 ### Xcode | Version | Build | Path | | -------------- | -------- | ------------------------------ | -| 15.0 (beta) | 15A5160n | /Applications/Xcode_15.0.app | +| 15.0 (beta) | 15A5161b | /Applications/Xcode_15.0.app | | 14.3.1 | 14E300c | /Applications/Xcode_14.3.1.app | | 14.3 | 14E222b | /Applications/Xcode_14.3.app | | 14.2 (default) | 14C18 | /Applications/Xcode_14.2.app | @@ -171,59 +168,66 @@ - xcversion 2.8.1 #### Installed SDKs -| SDK | SDK Name | Xcode Version | -| ------------------------------------------------------- | --------------------------------------------- | ------------- | -| macOS 13.0 | macosx13.0 | 14.1 | -| macOS 13.1 | macosx13.1 | 14.2 | -| macOS 13.3 | macosx13.3 | 14.3, 14.3.1 | -| macOS 14.0 | macosx14.0 | 15.0 | -| iOS 16.1 | iphoneos16.1 | 14.1 | -| iOS 16.2 | iphoneos16.2 | 14.2 | -| iOS 16.4 | iphoneos16.4 | 14.3, 14.3.1 | -| iOS 17.0 | iphoneos17.0 | 15.0 | -| Simulator - iOS 16.1 | iphonesimulator16.1 | 14.1 | -| Simulator - iOS 16.2 | iphonesimulator16.2 | 14.2 | -| Simulator - iOS 16.4 | iphonesimulator16.4 | 14.3, 14.3.1 | -| Simulator - iOS 17.0 | iphonesimulator17.0 | 15.0 | -| tvOS 16.1 | appletvos16.1 | 14.1, 14.2 | -| tvOS 16.4 | appletvos16.4 | 14.3, 14.3.1 | -| tvOS 17.0 | appletvos17.0 | 15.0 | -| Simulator - tvOS 16.1 | appletvsimulator16.1 | 14.1, 14.2 | -| Simulator - tvOS 16.4 | appletvsimulator16.4 | 14.3, 14.3.1 | -| Simulator - tvOS 17.0 | appletvsimulator17.0 | 15.0 | -| watchOS 9.1 | watchos9.1 | 14.1, 14.2 | -| watchOS 9.4 | watchos9.4 | 14.3, 14.3.1 | -| watchOS 10.0 | watchos10.0 | 15.0 | -| Simulator - watchOS 9.1 | watchsimulator9.1 | 14.1, 14.2 | -| Simulator - watchOS 9.4 | watchsimulator9.4 | 14.3, 14.3.1 | -| Simulator - watchOS 10.0 | watchsimulator10.0 | 15.0 | -| Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3, 14.3.1 | -| Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3, 14.3.1 | -| Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3, 14.3.1 | -| DriverKit 22.1 | driverkit22.1 | 14.1 | -| DriverKit 22.2 | driverkit22.2 | 14.2 | -| DriverKit 22.4 | driverkit22.4 | 14.3, 14.3.1 | -| DriverKit 23.0 | driverkit23.0 | 15.0 | +| SDK | SDK Name | Xcode Version | +| ------------------------------------------------------- | ----------------------------------------------- | ------------- | +| macOS 13.0 | macosx13.0 | 14.1 | +| macOS 13.1 | macosx13.1 | 14.2 | +| macOS 13.3 | macosx13.3 | 14.3, 14.3.1 | +| macOS 14.0 | macosx14.0 | 15.0 | +| iOS 16.1 | iphoneos16.1 | 14.1 | +| iOS 16.2 | iphoneos16.2 | 14.2 | +| iOS 16.4 | iphoneos16.4 | 14.3, 14.3.1 | +| iOS 17.0 | iphoneos17.0 | 15.0 | +| Simulator - iOS 16.1 | iphonesimulator16.1 | 14.1 | +| Simulator - iOS 16.2 | iphonesimulator16.2 | 14.2 | +| Simulator - iOS 16.4 | iphonesimulator16.4 | 14.3, 14.3.1 | +| Simulator - iOS 17.0 | iphonesimulator17.0 | 15.0 | +| tvOS 16.1 | appletvos16.1 | 14.1, 14.2 | +| tvOS 16.4 | appletvos16.4 | 14.3, 14.3.1 | +| tvOS 17.0 | appletvos17.0 | 15.0 | +| Simulator - tvOS 16.1 | appletvsimulator16.1 | 14.1, 14.2 | +| Simulator - tvOS 16.4 | appletvsimulator16.4 | 14.3, 14.3.1 | +| Simulator - tvOS 17.0 | appletvsimulator17.0 | 15.0 | +| watchOS 9.1 | watchos9.1 | 14.1, 14.2 | +| watchOS 9.4 | watchos9.4 | 14.3, 14.3.1 | +| watchOS 10.0 | watchos10.0 | 15.0 | +| Simulator - watchOS 9.1 | watchsimulator9.1 | 14.1, 14.2 | +| Simulator - watchOS 9.4 | watchsimulator9.4 | 14.3, 14.3.1 | +| Simulator - watchOS 10.0 | watchsimulator10.0 | 15.0 | +| visionOS 1.0 | xros1.0 | 15.0 | +| Simulator - visionOS 1.0 | xrsimulator1.0 | 15.0 | +| Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3, 14.3.1 | +| Xcode 15.0 | com.apple.dt.xcode.xros.support.internal | 15.0 | +| Xcode 15.0 | com.apple.dt.xcode.xrsimulator.support.internal | 15.0 | +| Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3, 14.3.1 | +| Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3, 14.3.1 | +| DriverKit 22.1 | driverkit22.1 | 14.1 | +| DriverKit 22.2 | driverkit22.2 | 14.2 | +| DriverKit 22.4 | driverkit22.4 | 14.3, 14.3.1 | +| DriverKit 23.0 | driverkit23.0 | 15.0 | #### Installed Simulators -| OS | Xcode Version | Simulators | -| ----------- | -------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| iOS 16.1 | 14.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 16.2 | 14.2 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 16.4 | 14.3<br>14.3.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| tvOS 16.1 | 14.1<br>14.2<br>14.3<br>14.3.1<br>15.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 16.4 | 14.1<br>14.2<br>14.3<br>14.3.1<br>15.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| watchOS 9.1 | 14.1<br>14.2<br>14.3<br>14.3.1<br>15.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | -| watchOS 9.4 | 14.1<br>14.2<br>14.3<br>14.3.1<br>15.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | +| OS | Xcode Version | Simulators | +| ------------ | -------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| iOS 16.1 | 14.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 16.2 | 14.2 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 16.4 | 14.3<br>14.3.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 17.0 | 14.1<br>14.2<br>14.3<br>14.3.1<br>15.0 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| tvOS 16.1 | 14.1<br>14.2<br>14.3<br>14.3.1<br>15.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 16.4 | 14.1<br>14.2<br>14.3<br>14.3.1<br>15.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 17.0 | 14.1<br>14.2<br>14.3<br>14.3.1<br>15.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| watchOS 9.1 | 14.1<br>14.2<br>14.3<br>14.3.1<br>15.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | +| watchOS 9.4 | 14.1<br>14.2<br>14.3<br>14.3.1<br>15.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | +| watchOS 10.0 | 14.1<br>14.2<br>14.3<br>14.3.1<br>15.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | ### Android | Package Name | Version | | -------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 8.0 | -| Android Emulator | 32.1.13 | +| Android Emulator | 32.1.14 | | Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | | Android SDK Platforms | android-34 (rev 1)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | -| Android SDK Platform-Tools | 34.0.3 | +| Android SDK Platform-Tools | 34.0.4 | | Android Support Repository | 47.0.0 | | CMake | 3.18.1<br>3.22.1 | | Google Play services | 49 | @@ -240,4 +244,3 @@ | ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/25.2.9519653 | | ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk/25.2.9519653 | | ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | - From 910dbd423093c3ccb4ae1779a1ae6eac4990e2cb Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Tue, 1 Aug 2023 21:22:34 +0200 Subject: [PATCH 2074/3485] [macOS] Pin OpenSSL version for macOS 13 (#8019) --- images/macos/templates/macOS-13.anka.pkr.hcl | 1 + images/macos/tests/OpenSSL.Tests.ps1 | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/images/macos/templates/macOS-13.anka.pkr.hcl b/images/macos/templates/macOS-13.anka.pkr.hcl index d6252bed9c1b..16eded673ca1 100644 --- a/images/macos/templates/macOS-13.anka.pkr.hcl +++ b/images/macos/templates/macOS-13.anka.pkr.hcl @@ -165,6 +165,7 @@ build { "./provision/core/dotnet.sh", "./provision/core/python.sh", "./provision/core/azcopy.sh", + "./provision/core/openssl.sh", "./provision/core/ruby.sh", "./provision/core/rubygem.sh", "./provision/core/git.sh", diff --git a/images/macos/tests/OpenSSL.Tests.ps1 b/images/macos/tests/OpenSSL.Tests.ps1 index 8da41bba7369..ea0c39da0e69 100644 --- a/images/macos/tests/OpenSSL.Tests.ps1 +++ b/images/macos/tests/OpenSSL.Tests.ps1 @@ -1,7 +1,7 @@ Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" $os = Get-OSVersion -Describe "OpenSSL" -Skip:($os.IsVentura -or $os.IsVenturaArm64) { +Describe "OpenSSL" -Skip:($os.IsVenturaArm64) { Context "OpenSSL Version" { It "OpenSSL is available" { "openssl version" | Should -ReturnZeroExitCode From eb354eb95a11606ed9fb98acb4b5164905391fa7 Mon Sep 17 00:00:00 2001 From: jeffreyguerra-testing <140553895+jeffreyguerra-testing@users.noreply.github.com> Date: Tue, 1 Aug 2023 13:29:00 -0700 Subject: [PATCH 2075/3485] Update create-image-and-azure-resources.md Update file. This is a test. Please DM Jeffreyguerra with any questions. --- docs/create-image-and-azure-resources.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/create-image-and-azure-resources.md b/docs/create-image-and-azure-resources.md index 2cd713cdc702..bbbd23402b1a 100644 --- a/docs/create-image-and-azure-resources.md +++ b/docs/create-image-and-azure-resources.md @@ -275,3 +275,4 @@ The scripts are copied to the VHD during the image generation process to the fol - **InternetExplorerConfiguration** - turns off the Internet Explorer Enhanced Security feature - **Msys2FirstLaunch.ps1** - initializes bash user profile in MSYS2 - **VSConfiguration.ps1** - performs initial Visual Studio configuration + From da18545f2f92c7f0231f738634544006514fd702 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 1 Aug 2023 23:54:04 +0000 Subject: [PATCH 2076/3485] Updating readme file for macos-13 version 20230801.2 (#8021) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-13-Readme.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/images/macos/macos-13-Readme.md b/images/macos/macos-13-Readme.md index 3ffd41a935ed..5bf9b5ef6576 100644 --- a/images/macos/macos-13-Readme.md +++ b/images/macos/macos-13-Readme.md @@ -1,7 +1,7 @@ # macOS 13 - OS Version: macOS 13.5 (22G74) - Kernel Version: Darwin 22.6.0 -- Image Version: 20230731.2 +- Image Version: 20230801.2 ## Installed Software @@ -32,7 +32,7 @@ - Pip3 23.2.1 (python 3.11) - Pipx 1.2.0 - RubyGems 3.4.17 -- Vcpkg 2023 (build from commit b43873aa8) +- Vcpkg 2023 (build from commit 0895a8130) - Yarn 1.22.19 ### Project Management @@ -53,7 +53,7 @@ - GNU Wget 1.21.4 - gpg (GnuPG) 2.4.3 - jq 1.6 -- OpenSSL 3.1.1 30 May 2023 (Library: OpenSSL 3.1.1 30 May 2023) +- OpenSSL 1.1.1u 30 May 2023 - Packer 1.9.2 - pkg-config 0.29.2 - Vagrant 2.3.7 @@ -88,7 +88,7 @@ - ChromeDriver 115.0.5790.102 - Microsoft Edge 115.0.1901.188 - Microsoft Edge WebDriver 115.0.1901.188 -- Mozilla Firefox 115.0.3 +- Mozilla Firefox 116.0 - geckodriver 0.33.0 - Selenium server 4.10.0 @@ -150,7 +150,7 @@ - PowerShell 7.2.13 #### PowerShell Modules -- Az: 10.1.0 +- Az: 10.2.0 - Pester: 5.5.0 - PSScriptAnalyzer: 1.21.0 From 2a1b5d19a343951e575efddd01d2e561fd02b848 Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Wed, 2 Aug 2023 11:56:11 +0200 Subject: [PATCH 2077/3485] [Ubuntu] Remove AdoptOpenJDK (#8022) --- .../SoftwareReport/SoftwareReport.Java.psm1 | 9 +-- images/linux/scripts/installers/java-tools.sh | 68 ++++--------------- images/linux/scripts/tests/Java.Tests.ps1 | 20 ++---- images/linux/toolsets/toolset-2004.json | 12 +--- images/linux/toolsets/toolset-2204.json | 8 +-- 5 files changed, 23 insertions(+), 94 deletions(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Java.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Java.psm1 index a27fc61463fc..4495cc6fac0d 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Java.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Java.psm1 @@ -1,22 +1,17 @@ function Get-JavaVersionsTable { $javaToolcacheVersions = Get-ChildItem $env:AGENT_TOOLSDIRECTORY/Java*/* -Directory | Sort-Object { [int]$_.Name.Split(".")[0] } - $existingVersions = $javaToolcacheVersions | ForEach-Object { + return $javaToolcacheVersions | ForEach-Object { $majorVersion = $_.Name.split(".")[0] $fullVersion = $_.Name.Replace("-", "+") $defaultJavaPath = $env:JAVA_HOME $javaPath = Get-Item env:JAVA_HOME_${majorVersion}_X64 $defaultPostfix = ($javaPath.Value -eq $defaultJavaPath) ? " (default)" : "" - $vendorName = ($_.FullName -like '*Java_Adopt_jdk*') ? "Adopt OpenJDK" : "Eclipse Temurin" [PSCustomObject] @{ - "Version" = $fullVersion + $defaultPostfix - "Vendor" = $vendorName + "Version" = $fullVersion + $defaultPostfix "Environment Variable" = $javaPath.Name } } - # Return all the vendors which are not Adopt, also look for version 12 of Adopt (Eclipse Temurin does not have this version) - $versionsToReturn = $existingVersions | Where-Object {$_.Vendor -notlike "Adopt*" -or $_.Version.Split(".")[0] -eq 12} - return $versionsToReturn } diff --git a/images/linux/scripts/installers/java-tools.sh b/images/linux/scripts/installers/java-tools.sh index 12348f24feb3..2220c13eefa7 100644 --- a/images/linux/scripts/installers/java-tools.sh +++ b/images/linux/scripts/installers/java-tools.sh @@ -10,21 +10,9 @@ source $HELPER_SCRIPTS/etc-environment.sh createJavaEnvironmentalVariable() { local JAVA_VERSION=$1 - local VENDOR_NAME=$2 - local DEFAULT=$3 + local DEFAULT=$2 - case ${VENDOR_NAME} in - - "Adopt" ) - INSTALL_PATH_PATTERN="/usr/lib/jvm/adoptopenjdk-${JAVA_VERSION}-hotspot-amd64" ;; - - "Temurin-Hotspot" ) - INSTALL_PATH_PATTERN="/usr/lib/jvm/temurin-${JAVA_VERSION}-jdk-amd64" ;; - *) - echo "Unknown vendor" - exit 1 - - esac + local INSTALL_PATH_PATTERN="/usr/lib/jvm/temurin-${JAVA_VERSION}-jdk-amd64" if [[ ${DEFAULT} == "True" ]]; then echo "Setting up JAVA_HOME variable to ${INSTALL_PATH_PATTERN}" @@ -38,14 +26,7 @@ createJavaEnvironmentalVariable() { } enableRepositories() { - -osLabel=$(getOSVersionLabel) - - if isUbuntu20; then - # Add Adopt PPA - wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | gpg --dearmor > /usr/share/keyrings/adopt.gpg - echo "deb [signed-by=/usr/share/keyrings/adopt.gpg] https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ $osLabel main" > /etc/apt/sources.list.d/adopt.list - fi + osLabel=$(getOSVersionLabel) # Add Addoptium PPA # apt-key is deprecated, dearmor and add manually @@ -56,21 +37,12 @@ osLabel=$(getOSVersionLabel) installOpenJDK() { local JAVA_VERSION=$1 - local VENDOR_NAME=$2 # Install Java from PPA repositories. - if [[ ${VENDOR_NAME} == "Temurin-Hotspot" ]]; then - apt-get -y install temurin-${JAVA_VERSION}-jdk=\* - javaVersionPath="/usr/lib/jvm/temurin-${JAVA_VERSION}-jdk-amd64" - elif [[ ${VENDOR_NAME} == "Adopt" ]]; then - apt-get -y install adoptopenjdk-${JAVA_VERSION}-hotspot=\* - javaVersionPath="/usr/lib/jvm/adoptopenjdk-${JAVA_VERSION}-hotspot-amd64" - else - echo "${VENDOR_NAME} is invalid, valid names are: Temurin-Hotspot and Adopt" - exit 1 - fi + apt-get -y install temurin-${JAVA_VERSION}-jdk=\* + javaVersionPath="/usr/lib/jvm/temurin-${JAVA_VERSION}-jdk-amd64" - JAVA_TOOLCACHE_PATH="${AGENT_TOOLSDIRECTORY}/Java_${VENDOR_NAME}_jdk" + JAVA_TOOLCACHE_PATH="${AGENT_TOOLSDIRECTORY}/Java_Temurin-Hotspot_jdk" fullJavaVersion=$(cat "${javaVersionPath}/release" | grep "^SEMANTIC" | cut -d "=" -f 2 | tr -d "\"" | tr "+" "-") @@ -101,25 +73,17 @@ enableRepositories apt-get update defaultVersion=$(get_toolset_value '.java.default') -defaultVendor=$(get_toolset_value '.java.default_vendor') -jdkVendors=($(get_toolset_value '.java.vendors[].name')) +jdkVersionsToInstall=($(get_toolset_value ".java.versions[]")) -for jdkVendor in ${jdkVendors[@]}; do +for jdkVersionToInstall in ${jdkVersionsToInstall[@]}; do + installOpenJDK ${jdkVersionToInstall} - # get vendor-specific versions - jdkVersionsToInstall=($(get_toolset_value ".java.vendors[] | select (.name==\"${jdkVendor}\") | .versions[]")) - - for jdkVersionToInstall in ${jdkVersionsToInstall[@]}; do - - installOpenJDK ${jdkVersionToInstall} ${jdkVendor} - - isDefaultVersion=False; [[ ${jdkVersionToInstall} == ${defaultVersion} ]] && isDefaultVersion=True - - if [[ ${jdkVendor} == ${defaultVendor} ]]; then - createJavaEnvironmentalVariable ${jdkVersionToInstall} ${jdkVendor} ${isDefaultVersion} - fi - - done + if [[ ${jdkVersionToInstall} == ${defaultVersion} ]] + then + createJavaEnvironmentalVariable ${jdkVersionToInstall} True + else + createJavaEnvironmentalVariable ${jdkVersionToInstall} False + fi done # Install Ant @@ -147,10 +111,8 @@ ln -s /usr/share/gradle-"${gradleLatestVersion}"/bin/gradle /usr/bin/gradle echo "GRADLE_HOME=$(find /usr/share -depth -maxdepth 1 -name "gradle*")" | tee -a /etc/environment # Delete java repositories and keys -rm -f /etc/apt/sources.list.d/adopt.list rm -f /etc/apt/sources.list.d/adoptium.list rm -f /etc/apt/sources.list.d/zulu.list -rm -f /usr/share/keyrings/adopt.gpg rm -f /usr/share/keyrings/adoptium.gpg rm -f /usr/share/keyrings/zulu.gpg diff --git a/images/linux/scripts/tests/Java.Tests.ps1 b/images/linux/scripts/tests/Java.Tests.ps1 index 9a16b566d905..a93fbdcb6fe9 100644 --- a/images/linux/scripts/tests/Java.Tests.ps1 +++ b/images/linux/scripts/tests/Java.Tests.ps1 @@ -3,11 +3,9 @@ Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" -DisableNameCheckin Describe "Java" { $toolsetJava = (Get-ToolsetContent).java $defaultVersion = $toolsetJava.default - $defaultVendor = $toolsetJava.default_vendor - $javaVendors = $toolsetJava.vendors + $jdkVersions = $toolsetJava.versions - [array]$jdkVersions = ($javaVendors | Where-Object {$_.name -eq $defaultVendor}).versions | ForEach-Object { @{Version = $_} } - [array]$adoptJdkVersions = ($javaVendors | Where-Object {$_.name -eq "Adopt"}).versions | ForEach-Object { @{Version = $_} } + [array]$testCases = $jdkVersions | ForEach-Object { @{Version = $_ } } It "Java <DefaultJavaVersion> is default" -TestCases @{ DefaultJavaVersion = $defaultVersion } { $actualJavaPath = Get-EnvironmentVariable "JAVA_HOME" @@ -37,7 +35,7 @@ Describe "Java" { "`"$GradlePath`" -version" | Should -ReturnZeroExitCode } - It "Java <Version>" -TestCases $jdkVersions { + It "Java <Version>" -TestCases $testCases { $javaVariableValue = Get-EnvironmentVariable "JAVA_HOME_${Version}_X64" $javaVariableValue | Should -Not -BeNullOrEmpty $javaPath = Join-Path $javaVariableValue "bin/java" @@ -47,16 +45,6 @@ Describe "Java" { if ($Version -eq 8) { $Version = "1.${Version}" } - "`"$javaPath`" -version" | Should -MatchCommandOutput ([regex]::Escape("openjdk version `"${Version}.")) - } - - It "Java Adopt <Version>" -TestCases $adoptJdkVersions -Skip:(Test-IsUbuntu22) { - $javaPath = Join-Path (Get-ChildItem ${env:AGENT_TOOLSDIRECTORY}\Java_Adopt_jdk\${Version}*) "x64\bin\java" - "`"$javaPath`" -version" | Should -ReturnZeroExitCode - - if ($Version -eq 8) { - $Version = "1.${Version}" - } - "`"$javaPath`" -version" | Should -MatchCommandOutput ([regex]::Escape("openjdk version `"${Version}.")) + "`"$javaPath`" -version" | Should -MatchCommandOutput ([regex]::Escape("openjdk version `"${Version}.")) } } diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index 86067a5c1e7c..2dbcc725ac3f 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -73,17 +73,7 @@ ], "java": { "default": "11", - "default_vendor": "Temurin-Hotspot", - "vendors": [ - { - "name": "Temurin-Hotspot", - "versions": [ "8", "11", "17" ] - }, - { - "name": "Adopt", - "versions": [ "8", "11" ] - } - ], + "versions": [ "8", "11", "17" ], "maven": "3.8.8" }, "android": { diff --git a/images/linux/toolsets/toolset-2204.json b/images/linux/toolsets/toolset-2204.json index d0f27732a33b..654cdd082f95 100644 --- a/images/linux/toolsets/toolset-2204.json +++ b/images/linux/toolsets/toolset-2204.json @@ -66,13 +66,7 @@ ], "java": { "default": "11", - "default_vendor": "Temurin-Hotspot", - "vendors": [ - { - "name": "Temurin-Hotspot", - "versions": [ "8", "11", "17" ] - } - ], + "versions": [ "8", "11", "17" ], "maven": "3.8.8" }, "android": { From e1d1163c159a5b8278fc3d00c373f1169d0aa99e Mon Sep 17 00:00:00 2001 From: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com> Date: Thu, 3 Aug 2023 10:19:29 +0200 Subject: [PATCH 2078/3485] [win] specify accept header when downloading mysql meta (#8009) as reported in https://github.com/actions/runner-images/issues/8004 dev.mysql.com behaviour has changed, it requires "Accept: text/html" for download page Co-authored-by: Miguel Nieto <m.nieto@kevull.com> --- images/win/scripts/Installers/Install-MysqlCli.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/win/scripts/Installers/Install-MysqlCli.ps1 b/images/win/scripts/Installers/Install-MysqlCli.ps1 index 300e3b0cc493..dd3be4bce3f3 100644 --- a/images/win/scripts/Installers/Install-MysqlCli.ps1 +++ b/images/win/scripts/Installers/Install-MysqlCli.ps1 @@ -15,7 +15,7 @@ Install-Binary -Url $InstallerURI -Name $InstallerName -ArgumentList $ArgumentLi $MysqlVersionMajorMinor = $MysqlVersion.ToString(2) if ($MysqlVersion.Build -lt 0) { - $MysqlVersion = (Invoke-RestMethod -Uri "https://dev.mysql.com/downloads/mysql/${MysqlVersionMajorMinor}.html" | + $MysqlVersion = (Invoke-RestMethod -Uri "https://dev.mysql.com/downloads/mysql/${MysqlVersionMajorMinor}.html" -Headers @{'Accept'='text/html'} | Select-String -Pattern "${MysqlVersionMajorMinor}\.\d+").Matches.Value } From 974c7589b90b182d80d7dda07b31197b6b12317c Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Thu, 3 Aug 2023 10:32:48 +0200 Subject: [PATCH 2079/3485] [Windows] Remove AdoptOpenJDK (#8026) --- .../scripts/Installers/Install-JavaTools.ps1 | 69 ++++++------------- .../SoftwareReport/SoftwareReport.Java.psm1 | 4 +- images/win/scripts/Tests/Java.Tests.ps1 | 21 +----- images/win/toolsets/toolset-2019.json | 12 +--- images/win/toolsets/toolset-2022.json | 12 +--- 5 files changed, 27 insertions(+), 91 deletions(-) diff --git a/images/win/scripts/Installers/Install-JavaTools.ps1 b/images/win/scripts/Installers/Install-JavaTools.ps1 index e884da49876b..c02a1aff7f76 100644 --- a/images/win/scripts/Installers/Install-JavaTools.ps1 +++ b/images/win/scripts/Installers/Install-JavaTools.ps1 @@ -7,11 +7,10 @@ function Set-JavaPath { param ( [string] $Version, [string] $Architecture = "x64", - [switch] $Default, - [string] $VendorName + [switch] $Default ) - $javaPathPattern = Join-Path -Path $env:AGENT_TOOLSDIRECTORY -ChildPath "Java_${VendorName}_jdk/${Version}*/${Architecture}" + $javaPathPattern = Join-Path -Path $env:AGENT_TOOLSDIRECTORY -ChildPath "Java_Temurin-Hotspot_jdk/${Version}*/${Architecture}" $javaPath = (Get-Item -Path $javaPathPattern).FullName if ([string]::IsNullOrEmpty($javaPath)) { @@ -22,18 +21,15 @@ function Set-JavaPath { Write-Host "Set 'JAVA_HOME_${Version}_X64' environmental variable as $javaPath" setx JAVA_HOME_${Version}_X64 $javaPath /M - if ($Default) - { + if ($Default) { # Clean up any other Java folders from PATH to make sure that they won't conflict with each other $currentPath = Get-MachinePath $pathSegments = $currentPath.Split(';') $newPathSegments = @() - foreach ($pathSegment in $pathSegments) - { - if ($pathSegment -notlike '*java*') - { + foreach ($pathSegment in $pathSegments) { + if ($pathSegment -notlike '*java*') { $newPathSegments += $pathSegment } } @@ -52,22 +48,16 @@ function Set-JavaPath { function Install-JavaJDK { param( [string] $JDKVersion, - [string] $Architecture = "x64", - [string] $VendorName + [string] $Architecture = "x64" ) # Get Java version from api - if ($VendorName -eq "Temurin-Hotspot") { - $assetUrl = Invoke-RestMethod -Uri "https://api.adoptium.net/v3/assets/latest/${JDKVersion}/hotspot" - } elseif ($VendorName -eq "Adopt") { - $assetUrl = Invoke-RestMethod -Uri "https://api.adoptopenjdk.net/v3/assets/latest/${JDKVersion}/hotspot" - } else { - throw "$VendorName is invalid vendor name. 'Adopt' and 'Temurin-Hotspot' are allowed values" - } + $assetUrl = Invoke-RestMethod -Uri "https://api.adoptium.net/v3/assets/latest/${JDKVersion}/hotspot" + $asset = $assetUrl | Where-Object { $_.binary.os -eq "windows" ` - -and $_.binary.architecture -eq $Architecture ` - -and $_.binary.image_type -eq "jdk" + -and $_.binary.architecture -eq $Architecture ` + -and $_.binary.image_type -eq "jdk" } # Download and extract java binaries to temporary folder @@ -77,13 +67,12 @@ function Install-JavaJDK { # We have to replace '+' sign in the version to '-' due to the issue with incorrect path in Android builds https://github.com/actions/runner-images/issues/3014 $fullJavaVersion = $asset.version.semver -replace '\+', '-' # Create directories in toolcache path - $javaToolcachePath = Join-Path -Path $env:AGENT_TOOLSDIRECTORY -ChildPath "Java_${VendorName}_jdk" + $javaToolcachePath = Join-Path -Path $env:AGENT_TOOLSDIRECTORY -ChildPath "Java_Temurin-Hotspot_jdk" $javaVersionPath = Join-Path -Path $javaToolcachePath -ChildPath $fullJavaVersion $javaArchPath = Join-Path -Path $javaVersionPath -ChildPath $Architecture - if (-not (Test-Path $javaToolcachePath)) - { - Write-Host "Creating ${VendorName} toolcache folder" + if (-not (Test-Path $javaToolcachePath)) { + Write-Host "Creating Temurin-Hotspot toolcache folder" New-Item -ItemType Directory -Path $javaToolcachePath | Out-Null } @@ -99,37 +88,21 @@ function Install-JavaJDK { } $toolsetJava = (Get-ToolsetContent).java -$jdkVendors = $toolsetJava.vendors -$defaultVendor = $toolsetJava.default_vendor $defaultVersion = $toolsetJava.default +$jdkVersionsToInstall = $toolsetJava.versions -foreach ($jdkVendor in $jdkVendors) { - $jdkVendorName = $jdkVendor.name - $jdkVersionsToInstall = $jdkVendor.versions - - $isDefaultVendor = $jdkVendorName -eq $defaultVendor - - foreach ($jdkVersionToInstall in $jdkVersionsToInstall) { - $isDefaultVersion = $jdkVersionToInstall -eq $defaultVersion +foreach ($jdkVersionToInstall in $jdkVersionsToInstall) { + $isDefaultVersion = $jdkVersionToInstall -eq $defaultVersion - Install-JavaJDK -VendorName $jdkVendorName -JDKVersion $jdkVersionToInstall + Install-JavaJDK -JDKVersion $jdkVersionToInstall - if ($isDefaultVendor) { - if ($isDefaultVersion) { - Set-JavaPath -Version $jdkVersionToInstall -VendorName $jdkVendorName -Default - } else { - Set-JavaPath -Version $jdkVersionToInstall -VendorName $jdkVendorName - } - } + if ($isDefaultVersion) { + Set-JavaPath -Version $jdkVersionToInstall -Default + } else { + Set-JavaPath -Version $jdkVersionToInstall } } -# Setup JAVA_HOME_13_X64 as this is the only Adopt version needed -# There is no jdk 13 on Windows 2022 -if (-not (Test-IsWin22)) { - Set-JavaPath -Version "13" -VendorName "Adopt" -} - # Install Java tools # Force chocolatey to ignore dependencies on Ant and Maven or else they will download the Oracle JDK Choco-Install -PackageName ant -ArgumentList "-i" diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Java.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Java.psm1 index 4fca13dc5ae7..d2d8232bbcf4 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Java.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Java.psm1 @@ -13,11 +13,9 @@ function Get-JavaVersions { $versionInPath = (Split-Path $javaPath) -replace "\w:\\.*\\" $version = $versionInPath -replace '-', '+' $defaultPostfix = ($javaPath -eq $defaultJavaPath) ? " (default)" : "" - $VendorName = ($javaPath -like '*Java_Adopt_jdk*') ? "Adopt OpenJDK" : "Eclipse Temurin" [PSCustomObject] @{ - "Version" = $version + $defaultPostfix - "Vendor" = $VendorName + "Version" = $version + $defaultPostfix "Environment Variable" = $_.Name } } diff --git a/images/win/scripts/Tests/Java.Tests.ps1 b/images/win/scripts/Tests/Java.Tests.ps1 index 85c40a8b601b..9a44486aa877 100644 --- a/images/win/scripts/Tests/Java.Tests.ps1 +++ b/images/win/scripts/Tests/Java.Tests.ps1 @@ -1,11 +1,9 @@ Describe "Java" { $toolsetJava = (Get-ToolsetContent).java - $defaultVendor = $toolsetJava.default_vendor - $javaVendors = $toolsetJava.vendors $defaultVersion = $toolsetJava.default + $jdkVersions = $toolsetJava.versions - [array]$jdkVersions = ($javaVendors | Where-Object {$_.name -eq $defaultVendor}).versions | ForEach-Object { @{Version = $_} } - [array]$adoptJdkVersions = ($javaVendors | Where-Object {$_.name -eq "Adopt"}).versions | ForEach-Object { @{Version = $_} } + [array]$testCases = $jdkVersions | ForEach-Object { @{Version = $_ } } It "Java <DefaultJavaVersion> is default" -TestCases @(@{ DefaultJavaVersion = $defaultVersion }) { $actualJavaPath = Get-EnvironmentVariable "JAVA_HOME" @@ -25,7 +23,7 @@ Describe "Java" { "$ToolName -version" | Should -ReturnZeroExitCode } - It "Java <Version>" -TestCases $jdkVersions { + It "Java <Version>" -TestCases $testCases { $javaVariableValue = Get-EnvironmentVariable "JAVA_HOME_${Version}_X64" $javaVariableValue | Should -Not -BeNullOrEmpty $javaPath = Join-Path $javaVariableValue "bin\java" @@ -39,17 +37,4 @@ Describe "Java" { $outputPattern = "openjdk version `"${Version}" $result.Output[0] | Should -Match $outputPattern } - - It "Java Adopt Jdk <Version>" -TestCases $adoptJdkVersions { - $adoptPath = Join-Path (Get-ChildItem ${env:AGENT_TOOLSDIRECTORY}\Java_Adopt_jdk\${Version}*) "x64\bin\java" - - $result = Get-CommandResult "`"$adoptPath`" -version" - $result.ExitCode | Should -Be 0 - - if ($Version -eq 8) { - $Version = "1.${Version}" - } - $outputPattern = "openjdk version `"${Version}" - $result.Output[0] | Should -Match $outputPattern - } } diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index fb2fe8597a97..6c084e264cc8 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -147,17 +147,7 @@ ], "java": { "default": "8", - "default_vendor": "Temurin-Hotspot", - "vendors": [ - { - "name": "Temurin-Hotspot", - "versions": [ "8", "11", "17" ] - }, - { - "name": "Adopt", - "versions": [ "8", "11", "13" ] - } - ] + "versions": [ "8", "11", "17" ] }, "android": { "platform_min_version": "19", diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index 896a5760f197..ca2845dc4586 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -128,17 +128,7 @@ ], "java": { "default": "8", - "default_vendor": "Temurin-Hotspot", - "vendors": [ - { - "name": "Temurin-Hotspot", - "versions": [ "8", "11", "17" ] - }, - { - "name": "Adopt", - "versions": [ "8", "11"] - } - ] + "versions": [ "8", "11", "17" ] }, "android": { "platform_min_version": "27", From 89acd994b2d7e2a5beadf01ba995205525e143da Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Thu, 3 Aug 2023 10:42:41 +0200 Subject: [PATCH 2080/3485] [mac OS] Remove AdoptOpenJDK (#8025) --- images/macos/provision/core/openjdk.sh | 51 +++++++------------ .../software-report/SoftwareReport.Java.psm1 | 4 +- images/macos/tests/Java.Tests.ps1 | 18 +------ images/macos/toolsets/toolset-11.json | 12 +---- images/macos/toolsets/toolset-12.json | 12 +---- images/macos/toolsets/toolset-13.json | 8 +-- 6 files changed, 22 insertions(+), 83 deletions(-) diff --git a/images/macos/provision/core/openjdk.sh b/images/macos/provision/core/openjdk.sh index 8f6dec9ecbe2..2803cb179906 100755 --- a/images/macos/provision/core/openjdk.sh +++ b/images/macos/provision/core/openjdk.sh @@ -3,10 +3,9 @@ source ~/utils/utils.sh createEnvironmentVariable() { local JAVA_VERSION=$1 - local VENDOR_NAME=$2 - local DEFAULT=$3 + local DEFAULT=$2 - INSTALL_PATH_PATTERN=$(echo ${AGENT_TOOLSDIRECTORY}/Java_${VENDOR_NAME}_jdk/${JAVA_VERSION}*/x64/Contents/Home/) + INSTALL_PATH_PATTERN=$(echo ${AGENT_TOOLSDIRECTORY}/Java_Temurin-Hotspot_jdk/${JAVA_VERSION}*/x64/Contents/Home/) if [[ ${DEFAULT} == "True" ]]; then echo "Setting up JAVA_HOME variable to ${INSTALL_PATH_PATTERN}" @@ -19,62 +18,46 @@ createEnvironmentVariable() { installOpenJDK() { local JAVA_VERSION=$1 - local VENDOR_NAME=$2 # Get link for Java binaries and Java version - if [[ ${VENDOR_NAME} == "Temurin-Hotspot" ]]; then - assetUrl=$(curl -fsSL "https://api.adoptium.net/v3/assets/latest/${JAVA_VERSION}/hotspot") - elif [[ ${VENDOR_NAME} == "Adopt" ]]; then - assetUrl=$(curl -fsSL "https://api.adoptopenjdk.net/v3/assets/latest/${JAVA_VERSION}/hotspot") - else - echo "${VENDOR_NAME} is invalid, valid names are: Temurin-Hotspot and Adopt" - exit 1 - fi + assetUrl=$(curl -fsSL "https://api.adoptium.net/v3/assets/latest/${JAVA_VERSION}/hotspot") asset=$(echo ${assetUrl} | jq -r '.[] | select(.binary.os=="mac" and .binary.image_type=="jdk" and .binary.architecture=="x64")') archivePath=$(echo ${asset} | jq -r '.binary.package.link') fullVersion=$(echo ${asset} | jq -r '.version.semver' | tr '+' '-') - JAVA_TOOLCACHE_PATH=${AGENT_TOOLSDIRECTORY}/Java_${VENDOR_NAME}_jdk + JAVA_TOOLCACHE_PATH=${AGENT_TOOLSDIRECTORY}/Java_Temurin-Hotspot_jdk javaToolcacheVersionPath=$JAVA_TOOLCACHE_PATH/${fullVersion} javaToolcacheVersionArchPath=${javaToolcacheVersionPath}/x64 # Download and extract Java binaries - download_with_retries ${archivePath} /tmp OpenJDK-${VENDOR_NAME}-${fullVersion}.tar.gz + download_with_retries ${archivePath} /tmp OpenJDK-${fullVersion}.tar.gz echo "Creating ${javaToolcacheVersionArchPath} directory" mkdir -p ${javaToolcacheVersionArchPath} - tar -xf /tmp/OpenJDK-${VENDOR_NAME}-${fullVersion}.tar.gz -C ${javaToolcacheVersionArchPath} --strip-components=1 + tar -xf /tmp/OpenJDK-${fullVersion}.tar.gz -C ${javaToolcacheVersionArchPath} --strip-components=1 # Create complete file touch ${javaToolcacheVersionPath}/x64.complete # Create a symlink to '/Library/Java/JavaVirtualMachines' # so '/usr/libexec/java_home' will be able to find Java - sudo ln -sf ${javaToolcacheVersionArchPath} /Library/Java/JavaVirtualMachines/${VENDOR_NAME}-${JAVA_VERSION}.jdk + sudo ln -sf ${javaToolcacheVersionArchPath} /Library/Java/JavaVirtualMachines/Temurin-Hotspot-${JAVA_VERSION}.jdk } defaultVersion=$(get_toolset_value '.java.default') -defaultVendor=$(get_toolset_value '.java.default_vendor') -jdkVendors=($(get_toolset_value '.java.vendors[].name')) - -for jdkVendor in ${jdkVendors[@]}; do - - # get vendor-specific versions - jdkVersionsToInstall=($(get_toolset_value ".java.vendors[] | select (.name==\"${jdkVendor}\") | .versions[]")) - - for jdkVersionToInstall in ${jdkVersionsToInstall[@]}; do - - installOpenJDK ${jdkVersionToInstall} ${jdkVendor} +jdkVersionsToInstall=($(get_toolset_value ".java.versions[]")) - isDefaultVersion=False; [[ ${jdkVersionToInstall} == ${defaultVersion} ]] && isDefaultVersion=True - - if [[ ${jdkVendor} == ${defaultVendor} ]]; then - createEnvironmentVariable ${jdkVersionToInstall} ${jdkVendor} ${isDefaultVersion} - fi - - done +for jdkVersionToInstall in ${jdkVersionsToInstall[@]}; do + installOpenJDK ${jdkVersionToInstall} + + if [[ ${jdkVersionToInstall} == ${defaultVersion} ]] + then + createEnvironmentVariable ${jdkVersionToInstall} True + else + createEnvironmentVariable ${jdkVersionToInstall} False + fi done echo Installing Maven... diff --git a/images/macos/software-report/SoftwareReport.Java.psm1 b/images/macos/software-report/SoftwareReport.Java.psm1 index 9b52247252b2..6b034d2acd1c 100644 --- a/images/macos/software-report/SoftwareReport.Java.psm1 +++ b/images/macos/software-report/SoftwareReport.Java.psm1 @@ -12,11 +12,9 @@ function Get-JavaVersions { $version = $javaPath.split('/')[5] $fullVersion = $version.Replace('-', '+') $defaultPostfix = ($javaPath -eq $defaultJavaPath) ? " (default)" : "" - $vendorName = ($javaPath -like '*Java_Adopt_jdk*') ? "Adopt OpenJDK" : "Eclipse Temurin" [PSCustomObject] @{ - "Version" = $fullVersion + $defaultPostfix - "Vendor" = $vendorName + "Version" = $fullVersion + $defaultPostfix "Environment Variable" = $_.Name } } diff --git a/images/macos/tests/Java.Tests.ps1 b/images/macos/tests/Java.Tests.ps1 index 10a5ea7ac367..70e06599fa12 100644 --- a/images/macos/tests/Java.Tests.ps1 +++ b/images/macos/tests/Java.Tests.ps1 @@ -27,13 +27,8 @@ Describe "Java" -Skip:($os.IsVenturaArm64) { $toolsetJava = Get-ToolsetValue "java" $defaultVersion = $toolsetJava.default - $defaultVendor = $toolsetJava.default_vendor - $javaVendors = $toolsetJava.vendors + $jdkVersions = $toolsetJava.versions - [array]$jdkVersions = ($javaVendors | Where-Object {$_.name -eq $defaultVendor}).versions - [array]$adoptJdkVersions = ($javaVendors | Where-Object {$_.name -eq "Adopt"}).versions - - $adoptCases = $adoptJdkVersions | ForEach-Object { @{Version = $_} } $testCases = $jdkVersions | ForEach-Object { @{ Title = $_; Version = (Get-NativeVersionFormat $_); EnvVariable = "JAVA_HOME_${_}_X64" } } $testCases += @{ Title = "Default"; Version = (Get-NativeVersionFormat $defaultVersion); EnvVariable = "JAVA_HOME" } @@ -57,17 +52,6 @@ Describe "Java" -Skip:($os.IsVenturaArm64) { } } - Context "Java Adopt" { - Describe "Java Adopt" -Skip:($os.IsVentura -or $os.IsVenturaArm64) { - It "Java Adopt <Version>" -TestCases $adoptCases { - $adoptPath = Join-Path (Get-ChildItem ${env:AGENT_TOOLSDIRECTORY}\Java_Adopt_jdk\${Version}*) "x64\Contents\Home\bin\java" - - $result = Get-CommandResult "`"$adoptPath`" -version" - $result.ExitCode | Should -Be 0 - } - } - } - Context "Maven" { Describe "Maven" { It "Maven" { diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index e796aeee0ed4..62ebc92bba46 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -154,17 +154,7 @@ }, "java": { "default": "8", - "default_vendor": "Temurin-Hotspot", - "vendors": [ - { - "name": "Temurin-Hotspot", - "versions": [ "8", "11", "17" ] - }, - { - "name": "Adopt", - "versions": [ "8", "11" ] - } - ] + "versions": [ "8", "11", "17" ] }, "android": { "platform_min_version": "27", diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index d2e669daddcf..dd135ac0acc8 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -141,17 +141,7 @@ }, "java": { "default": "8", - "default_vendor": "Temurin-Hotspot", - "vendors": [ - { - "name": "Temurin-Hotspot", - "versions": [ "8", "11", "17" ] - }, - { - "name": "Adopt", - "versions": [ "8", "11" ] - } - ] + "versions": [ "8", "11", "17" ] }, "android": { "platform_min_version": "27", diff --git a/images/macos/toolsets/toolset-13.json b/images/macos/toolsets/toolset-13.json index 763953f40ff3..40495d02cf3c 100644 --- a/images/macos/toolsets/toolset-13.json +++ b/images/macos/toolsets/toolset-13.json @@ -28,13 +28,7 @@ }, "java": { "default": "17", - "default_vendor": "Temurin-Hotspot", - "vendors": [ - { - "name": "Temurin-Hotspot", - "versions": [ "8", "11", "17" ] - } - ] + "versions": [ "8", "11", "17" ] }, "android": { "platform_min_version": "27", From a93b17cc72126855d0c97b21b12572aad89355c9 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 3 Aug 2023 10:34:33 +0000 Subject: [PATCH 2081/3485] Updating readme file for ubuntu20 version 20230728.3.1 (#8005) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2004-Readme.md | 75 +++++++++++++++---------------- 1 file changed, 35 insertions(+), 40 deletions(-) diff --git a/images/linux/Ubuntu2004-Readme.md b/images/linux/Ubuntu2004-Readme.md index 8b02c166c999..dc5a789b690b 100644 --- a/images/linux/Ubuntu2004-Readme.md +++ b/images/linux/Ubuntu2004-Readme.md @@ -1,11 +1,7 @@ -| Announcements | -|-| -| [[Ubuntu] Alpine 3.14 & 3.15 docker image will be removed on July, 24](https://github.com/actions/runner-images/issues/7824) | -*** # Ubuntu 20.04 - OS Version: 20.04.6 LTS -- Kernel Version: 5.15.0-1041-azure -- Image Version: 20230724.1.0 +- Kernel Version: 5.15.0-1042-azure +- Image Version: 20230728.3.0 - Systemd version: 245.4-4ubuntu3.22 ## Installed Software @@ -34,7 +30,7 @@ ### Package Management - cpan 1.64 - Helm 3.12.2 -- Homebrew 4.1.0 +- Homebrew 4.1.2 - Miniconda 23.5.2 - Npm 9.6.7 - NuGet 6.6.1.2 @@ -42,7 +38,7 @@ - Pip3 20.0.2 - Pipx 1.2.0 - RubyGems 3.1.2 -- Vcpkg (build from commit d765306b0) +- Vcpkg (build from commit 8b04a7bd9) - Yarn 1.22.19 #### Environment variables @@ -69,22 +65,22 @@ to accomplish this. ### Tools - Ansible 2.13.11 - apt-fast 1.9.12 -- AzCopy 10.19.0 - available by `azcopy` and `azcopy10` aliases -- Bazel 6.2.1 +- AzCopy 10.20.0 - available by `azcopy` and `azcopy10` aliases +- Bazel 6.3.0 - Bazelisk 1.13.2 - Bicep 0.19.5 - Buildah 1.22.3 -- CMake 3.27.0 -- CodeQL Action Bundles 2.13.5 2.14.0 +- CMake 3.27.1 +- CodeQL Action Bundles 2.14.0 2.14.1 - Docker Amazon ECR Credential Helper 0.7.1 - Docker Compose v1 1.29.2 - Docker Compose v2 2.20.2+azure-1 - Docker-Buildx 0.11.2 -- Docker-Moby Client 20.10.25+azure-2 -- Docker-Moby Server 20.10.25+azure-2 +- Docker-Moby Client 23.0.6+azure-2 +- Docker-Moby Server 23.0.6+azure-2 - Fastlane 2.214.0 - Git 2.41.0 -- Git LFS 3.3.0 +- Git LFS 3.4.0 - Git-ftp 1.6.0 - Haveged 1.9.1 - Heroku 8.1.9 @@ -99,36 +95,36 @@ to accomplish this. - Minikube 1.31.1 - n 9.1.0 - Newman 5.3.2 -- nvm 0.39.3 +- nvm 0.39.4 - OpenSSL 1.1.1f-1ubuntu2.19 - Packer 1.9.2 - Parcel 2.9.3 - PhantomJS 2.1.1 2.1.1 - Podman 3.4.2 -- Pulumi 3.76.0 +- Pulumi 3.76.1 - R 4.3.1 - Skopeo 1.5.0 - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 -- Terraform 1.5.3 +- Terraform 1.5.4 - yamllint 1.32.0 - yq 4.34.2 - zstd 1.5.5 ### CLI Tools - Alibaba Cloud CLI 3.0.170 -- AWS CLI 2.13.3 +- AWS CLI 2.13.5 - AWS CLI Session Manager Plugin 1.2.463.0 -- AWS SAM CLI 1.93.0 +- AWS SAM CLI 1.94.0 - Azure CLI 2.50.0 - Azure CLI (azure-devops) 0.26.0 -- GitHub CLI 2.32.0 -- Google Cloud SDK 439.0.0 +- GitHub CLI 2.32.1 +- Google Cloud SDK 440.0.0 - Hub CLI 2.14.2 - Netlify CLI 15.9.1 -- OpenShift CLI 4.13.5 +- OpenShift CLI 4.13.6 - ORAS CLI 1.0.0 -- Vercel CLI 31.0.4 +- Vercel CLI 31.1.1 ### Java | Version | Vendor | Environment Variable | @@ -166,13 +162,13 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.5.2 ### Browsers and Drivers -- Google Chrome 115.0.5790.102 +- Google Chrome 115.0.5790.110 - ChromeDriver 115.0.5790.102 -- Chromium 114.0.5733.0 -- Microsoft Edge 115.0.1901.183 -- Microsoft Edge WebDriver 115.0.1901.183 +- Chromium 115.0.5790.0 +- Microsoft Edge 115.0.1901.188 +- Microsoft Edge WebDriver 115.0.1901.188 - Selenium server 4.10.0 -- Mozilla Firefox 115.0.2 +- Mozilla Firefox 116.0 - Geckodriver 0.33.0 #### Environment variables @@ -200,7 +196,7 @@ Use the following command as a part of your job to start the service: 'sudo syst ``` #### MySQL -- MySQL 8.0.33-0ubuntu0.20.04.2 +- MySQL 8.0.33-0ubuntu0.20.04.4 ``` User: root Password: root @@ -253,7 +249,7 @@ Use the following command as a part of your job to start the service: 'sudo syst - Az: 9.3.0 - Az (Cached): 3.1.0.zip, 4.4.0.zip, 5.9.0.zip, 6.6.0.zip, 7.5.0.zip - MarkdownPS: 1.9 -- Microsoft.Graph: 2.1.0 +- Microsoft.Graph: 2.2.0 - Pester: 5.5.0 - PSScriptAnalyzer: 1.21.0 @@ -296,18 +292,18 @@ Use the following command as a part of your job to start the service: 'sudo syst | alpine:3.16 | sha256:cbe5d5973103a2d03408d1689a6efde4ea4920bde9f4b51fe7872e60ce2d8e56 | 2023-06-14 | | alpine:3.17 | sha256:e95676db9e4a4f16f6cc01a8915368f82b018cc07aba951c1bd1db586c081388 | 2023-06-14 | | alpine:3.18 | sha256:82d1e9d7ed48a7523bdebc18cf6290bdb97b82302a8a9c27d4fe885949ea94d1 | 2023-06-14 | -| buildpack-deps:bullseye | sha256:7742ec0838b3c91afb08f8e2e3a5abc2a5379fe6f7e6c242ed4d3b472c7c5c73 | 2023-07-04 | -| buildpack-deps:buster | sha256:93d76989e9b0ebdfe9b96e96095ea6f87c710ecd01b66ce85418232c7af430c3 | 2023-07-04 | +| buildpack-deps:bullseye | sha256:593db75ce93184b16d45021566ed2d77f5009a8ce88da8254919a2e9e6ec14bf | 2023-07-28 | +| buildpack-deps:buster | sha256:b2c2267e1944a42dcdd448b66e8c8c889a3f5d1ab9705421326077a40a8aa0bc | 2023-07-28 | | buildpack-deps:stretch | sha256:78e995165a5788c2f55aed6e548d8f6c1534830d4310c870408fccb2da8c5b2e | 2022-06-23 | -| debian:10 | sha256:c21dbb23d41cb3f1c1a7f841e8642bf713934fb4dc5187979bd46f0b4b488616 | 2023-07-04 | -| debian:11 | sha256:a648e10e02af129706b1fb89e1ac9694ae3db7f2b8439aa906321e68cc281bc0 | 2023-07-04 | +| debian:10 | sha256:7cd85d3d51a435062010581f14c5e3f9428388ac7234cc9a1e23dd14d7e4e914 | 2023-07-27 | +| debian:11 | sha256:630454da4c59041a2bca987a0d54c68962f1d6ea37a3641bd61db42b753234f2 | 2023-07-27 | | debian:9 | sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be | 2022-06-23 | | moby/buildkit:latest | sha256:e70e7a9bfaeafd2cb101b050ca78e1f73032473fc0aac5b10f35c5d26df1e2c6 | 2023-07-12 | | node:14 | sha256:a158d3b9b4e3fa813fa6c8c590b8f0a860e015ad4e59bbce5744d2f6fd8461aa | 2023-04-12 | | node:14-alpine | sha256:434215b487a329c9e867202ff89e704d3a75e554822e07f3e0c0f9e606121b33 | 2023-03-29 | -| node:16 | sha256:466d0a05ecb1e5b9890960592311fa10c2bc6012fc27dbfdcc74abf10fc324fc | 2023-07-04 | +| node:16 | sha256:c83c7fa87b7449675b422877f547233f3d05ac75a4363ed030fc3635dd9cc395 | 2023-07-04 | | node:16-alpine | sha256:6c381d5dc2a11dcdb693f0301e8587e43f440c90cdb8933eaaaabb905d44cdb9 | 2023-06-21 | -| node:18 | sha256:e7e0921e352fc579d4d1807ecb2a91f42548cb5097e8bd2742e13bd672b7dc4a | 2023-07-19 | +| node:18 | sha256:5b0596963c8653bac197457d0da388ac603658011f13cb15d303a54bb83679fa | 2023-07-19 | | node:18-alpine | sha256:93d91deea65c9a0475507e8bc8b1917d6278522322f00c00b3ab09cab6830060 | 2023-07-19 | | ubuntu:16.04 | sha256:1f1a2d56de1d604801a9671f301190704c25d604a416f59e03c04f5c6ffee0d6 | 2021-08-31 | | ubuntu:18.04 | sha256:152dc042452c496007f07ca9127571cb9c29697f42acbfad72324b2bb2e43c98 | 2023-05-30 | @@ -369,7 +365,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | mercurial | 5.3.1-1ubuntu1 | | net-tools | 1.60+git20180626.aebd88e-1ubuntu1 | | netcat | 1.206-1ubuntu1 | -| openssh-client | 1:8.2p1-4ubuntu0.7 | +| openssh-client | 1:8.2p1-4ubuntu0.8 | | p7zip-full | 16.02+dfsg-7build1 | | p7zip-rar | 16.02-3build1 | | parallel | 20161222-1.1 | @@ -383,7 +379,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | shellcheck | 0.7.0-2build2 | | sphinxsearch | 2.2.11-2ubuntu2 | | sqlite3 | 3.31.1-4ubuntu0.5 | -| ssh | 1:8.2p1-4ubuntu0.7 | +| ssh | 1:8.2p1-4ubuntu0.8 | | sshpass | 1.06-1 | | subversion | 1.13.0-3ubuntu0.2 | | sudo | 1.8.31-1ubuntu1.5 | @@ -402,4 +398,3 @@ Use the following command as a part of your job to start the service: 'sudo syst | xz-utils | 5.2.4-1ubuntu1.1 | | zip | 3.0-11build1 | | zsync | 0.6.2-3ubuntu1 | - From ba7e64630443819b55e3a7d47138022aa87f2c33 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 3 Aug 2023 10:38:04 +0000 Subject: [PATCH 2082/3485] Updating readme file for ubuntu22 version 20230728.3.1 (#8003) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2204-Readme.md | 75 +++++++++++++++---------------- 1 file changed, 35 insertions(+), 40 deletions(-) diff --git a/images/linux/Ubuntu2204-Readme.md b/images/linux/Ubuntu2204-Readme.md index bcac79eb1a49..f3f0e7519b46 100644 --- a/images/linux/Ubuntu2204-Readme.md +++ b/images/linux/Ubuntu2204-Readme.md @@ -1,11 +1,7 @@ -| Announcements | -|-| -| [[Ubuntu] Alpine 3.14 & 3.15 docker image will be removed on July, 24](https://github.com/actions/runner-images/issues/7824) | -*** # Ubuntu 22.04 - OS Version: 22.04.2 LTS -- Kernel Version: 5.15.0-1041-azure -- Image Version: 20230724.1.0 +- Kernel Version: 5.15.0-1042-azure +- Image Version: 20230728.3.0 - Systemd version: 249.11-0ubuntu3.9 ## Installed Software @@ -32,7 +28,7 @@ ### Package Management - cpan 1.64 - Helm 3.12.2 -- Homebrew 4.1.0 +- Homebrew 4.1.2 - Miniconda 23.5.2 - Npm 9.6.7 - NuGet 6.6.1.2 @@ -40,7 +36,7 @@ - Pip3 22.0.2 - Pipx 1.2.0 - RubyGems 3.3.5 -- Vcpkg (build from commit d765306b0) +- Vcpkg (build from commit 8b04a7bd9) - Yarn 1.22.19 #### Environment variables @@ -64,22 +60,22 @@ to accomplish this. ### Tools - Ansible 2.15.2 - apt-fast 1.9.12 -- AzCopy 10.19.0 - available by `azcopy` and `azcopy10` aliases -- Bazel 6.2.1 +- AzCopy 10.20.0 - available by `azcopy` and `azcopy10` aliases +- Bazel 6.3.0 - Bazelisk 1.13.2 - Bicep 0.19.5 - Buildah 1.23.1 -- CMake 3.27.0 -- CodeQL Action Bundles 2.13.5 2.14.0 +- CMake 3.27.1 +- CodeQL Action Bundles 2.14.0 2.14.1 - Docker Amazon ECR Credential Helper 0.7.1 - Docker Compose v1 1.29.2 - Docker Compose v2 2.20.2+azure-1 - Docker-Buildx 0.11.2 -- Docker-Moby Client 20.10.25+azure-2 -- Docker-Moby Server 20.10.25+azure-2 +- Docker-Moby Client 23.0.6+azure-2 +- Docker-Moby Server 23.0.6+azure-2 - Fastlane 2.214.0 - Git 2.41.0 -- Git LFS 3.3.0 +- Git LFS 3.4.0 - Git-ftp 1.6.0 - Haveged 1.9.14 - Heroku 8.1.9 @@ -93,35 +89,35 @@ to accomplish this. - Minikube 1.31.1 - n 9.1.0 - Newman 5.3.2 -- nvm 0.39.3 +- nvm 0.39.4 - OpenSSL 3.0.2-0ubuntu1.10 - Packer 1.9.2 - Parcel 2.9.3 - Podman 3.4.4 -- Pulumi 3.76.0 +- Pulumi 3.76.1 - R 4.3.1 - Skopeo 1.4.1 - Sphinx Open Source Search Server 2.2.11 - SVN 1.14.1 -- Terraform 1.5.3 +- Terraform 1.5.4 - yamllint 1.32.0 - yq 4.34.2 - zstd 1.5.5 ### CLI Tools - Alibaba Cloud CLI 3.0.170 -- AWS CLI 2.13.3 +- AWS CLI 2.13.5 - AWS CLI Session Manager Plugin 1.2.463.0 -- AWS SAM CLI 1.93.0 +- AWS SAM CLI 1.94.0 - Azure CLI 2.50.0 - Azure CLI (azure-devops) 0.26.0 -- GitHub CLI 2.32.0 -- Google Cloud SDK 439.0.0 +- GitHub CLI 2.32.1 +- Google Cloud SDK 440.0.0 - Hub CLI 2.14.2 - Netlify CLI 15.9.1 -- OpenShift CLI 4.13.5 +- OpenShift CLI 4.13.6 - ORAS CLI 1.0.0 -- Vercel CLI 31.0.4 +- Vercel CLI 31.1.1 ### Java | Version | Vendor | Environment Variable | @@ -159,13 +155,13 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.5.2 ### Browsers and Drivers -- Google Chrome 115.0.5790.102 +- Google Chrome 115.0.5790.110 - ChromeDriver 115.0.5790.102 -- Chromium 114.0.5733.0 -- Microsoft Edge 115.0.1901.183 -- Microsoft Edge WebDriver 115.0.1901.183 +- Chromium 115.0.5790.0 +- Microsoft Edge 115.0.1901.188 +- Microsoft Edge WebDriver 115.0.1901.188 - Selenium server 4.10.0 -- Mozilla Firefox 115.0.2 +- Mozilla Firefox 116.0 - Geckodriver 0.33.0 #### Environment variables @@ -192,7 +188,7 @@ Use the following command as a part of your job to start the service: 'sudo syst ``` #### MySQL -- MySQL 8.0.33-0ubuntu0.22.04.2 +- MySQL 8.0.33-0ubuntu0.22.04.4 ``` User: root Password: root @@ -237,7 +233,7 @@ Use the following command as a part of your job to start the service: 'sudo syst #### PowerShell Modules - Az: 9.3.0 - MarkdownPS: 1.9 -- Microsoft.Graph: 2.1.0 +- Microsoft.Graph: 2.2.0 - Pester: 5.5.0 - PSScriptAnalyzer: 1.21.0 @@ -279,16 +275,16 @@ Use the following command as a part of your job to start the service: 'sudo syst | alpine:3.16 | sha256:cbe5d5973103a2d03408d1689a6efde4ea4920bde9f4b51fe7872e60ce2d8e56 | 2023-06-14 | | alpine:3.17 | sha256:e95676db9e4a4f16f6cc01a8915368f82b018cc07aba951c1bd1db586c081388 | 2023-06-14 | | alpine:3.18 | sha256:82d1e9d7ed48a7523bdebc18cf6290bdb97b82302a8a9c27d4fe885949ea94d1 | 2023-06-14 | -| buildpack-deps:bullseye | sha256:7742ec0838b3c91afb08f8e2e3a5abc2a5379fe6f7e6c242ed4d3b472c7c5c73 | 2023-07-04 | -| buildpack-deps:buster | sha256:93d76989e9b0ebdfe9b96e96095ea6f87c710ecd01b66ce85418232c7af430c3 | 2023-07-04 | -| debian:10 | sha256:c21dbb23d41cb3f1c1a7f841e8642bf713934fb4dc5187979bd46f0b4b488616 | 2023-07-04 | -| debian:11 | sha256:a648e10e02af129706b1fb89e1ac9694ae3db7f2b8439aa906321e68cc281bc0 | 2023-07-04 | +| buildpack-deps:bullseye | sha256:593db75ce93184b16d45021566ed2d77f5009a8ce88da8254919a2e9e6ec14bf | 2023-07-28 | +| buildpack-deps:buster | sha256:b2c2267e1944a42dcdd448b66e8c8c889a3f5d1ab9705421326077a40a8aa0bc | 2023-07-28 | +| debian:10 | sha256:7cd85d3d51a435062010581f14c5e3f9428388ac7234cc9a1e23dd14d7e4e914 | 2023-07-27 | +| debian:11 | sha256:630454da4c59041a2bca987a0d54c68962f1d6ea37a3641bd61db42b753234f2 | 2023-07-27 | | moby/buildkit:latest | sha256:e70e7a9bfaeafd2cb101b050ca78e1f73032473fc0aac5b10f35c5d26df1e2c6 | 2023-07-12 | | node:14 | sha256:a158d3b9b4e3fa813fa6c8c590b8f0a860e015ad4e59bbce5744d2f6fd8461aa | 2023-04-12 | | node:14-alpine | sha256:434215b487a329c9e867202ff89e704d3a75e554822e07f3e0c0f9e606121b33 | 2023-03-29 | -| node:16 | sha256:466d0a05ecb1e5b9890960592311fa10c2bc6012fc27dbfdcc74abf10fc324fc | 2023-07-04 | +| node:16 | sha256:c83c7fa87b7449675b422877f547233f3d05ac75a4363ed030fc3635dd9cc395 | 2023-07-04 | | node:16-alpine | sha256:6c381d5dc2a11dcdb693f0301e8587e43f440c90cdb8933eaaaabb905d44cdb9 | 2023-06-21 | -| node:18 | sha256:e7e0921e352fc579d4d1807ecb2a91f42548cb5097e8bd2742e13bd672b7dc4a | 2023-07-19 | +| node:18 | sha256:5b0596963c8653bac197457d0da388ac603658011f13cb15d303a54bb83679fa | 2023-07-19 | | node:18-alpine | sha256:93d91deea65c9a0475507e8bc8b1917d6278522322f00c00b3ab09cab6830060 | 2023-07-19 | | ubuntu:18.04 | sha256:152dc042452c496007f07ca9127571cb9c29697f42acbfad72324b2bb2e43c98 | 2023-05-30 | | ubuntu:20.04 | sha256:c9820a44b950956a790c354700c1166a7ec648bc0d215fa438d3a339812f1d01 | 2023-06-28 | @@ -352,7 +348,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | mercurial | 6.1.1-1ubuntu1 | | net-tools | 1.60+git20181103.0eebece-1ubuntu5 | | netcat | 1.218-4ubuntu1 | -| openssh-client | 1:8.9p1-3ubuntu0.1 | +| openssh-client | 1:8.9p1-3ubuntu0.3 | | p7zip-full | 16.02+dfsg-8 | | p7zip-rar | 16.02-3build1 | | parallel | 20210822+ds-2 | @@ -366,7 +362,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | shellcheck | 0.8.0-2 | | sphinxsearch | 2.2.11-8 | | sqlite3 | 3.37.2-2ubuntu0.1 | -| ssh | 1:8.9p1-3ubuntu0.1 | +| ssh | 1:8.9p1-3ubuntu0.3 | | sshpass | 1.09-1 | | subversion | 1.14.1-3ubuntu0.22.04.1 | | sudo | 1.9.9-1ubuntu2.4 | @@ -385,4 +381,3 @@ Use the following command as a part of your job to start the service: 'sudo syst | xz-utils | 5.2.5-2ubuntu1 | | zip | 3.0-12build2 | | zsync | 0.6.2-3ubuntu1 | - From 49e424dc8ced4421cf82b66f81e7728cca6b5ef4 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 3 Aug 2023 11:54:30 +0000 Subject: [PATCH 2083/3485] Updating readme file for win19 version 20230731.1.1 (#8012) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2019-Readme.md | 44 ++++++++++++++++---------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index 00f04fb64538..4c06a458a7fa 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -1,6 +1,6 @@ # Windows Server 2019 - OS Version: 10.0.17763 Build 4645 -- Image Version: 20230724.1.0 +- Image Version: 20230731.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -20,7 +20,7 @@ - Ruby 2.5.9p229 ### Package Management -- Chocolatey 2.1.0 +- Chocolatey 2.2.0 - Composer 2.5.8 - Helm 3.12.1 - Miniconda 23.5.2 (pre-installed on the image but not added to PATH) @@ -29,7 +29,7 @@ - pip 23.2.1 (python 3.7) - Pipx 1.2.0 - RubyGems 2.7.6.3 -- Vcpkg (build from commit d765306b0) +- Vcpkg (build from commit 8b04a7bd9) - Yarn 1.22.19 #### Environment variables @@ -47,21 +47,21 @@ ### Tools - 7zip 23.01 - aria2 1.36.0 -- azcopy 10.19.0 -- Bazel 6.2.1 +- azcopy 10.20.0 +- Bazel 6.3.1 - Bazelisk 1.13.2 - Bicep 0.19.5 - Cabal 3.10.1.0 -- CMake 3.27.0 -- CodeQL Action Bundles 2.13.5 2.14.0 -- Docker 24.0.4 +- CMake 3.27.1 +- CodeQL Action Bundles 2.14.0 2.14.1 +- Docker 24.0.5 - Docker Compose v1 1.29.2 - Docker Compose v2 2.20.2 - Docker-wincred 0.8.0 - ghc 9.6.2 - Git 2.41.0.windows.3 - Git LFS 3.3.0 -- Google Cloud SDK 439.0.0 +- Google Cloud SDK 440.0.0 - ImageMagick 7.1.1-14 - InnoSetup 6.2.2 - jq 1.6 @@ -72,9 +72,9 @@ - Newman 5.3.2 - NSIS 3.08 - OpenSSL 1.1.1u -- Packer 1.9.1 +- Packer 1.9.2 - Parcel 2.9.3 -- Pulumi 3.76.0 +- Pulumi 3.76.1 - R 4.3.1 - Service Fabric SDK 9.1.1436.9590 - Stack 2.11.1 @@ -88,13 +88,13 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.170 -- AWS CLI 2.13.3 -- AWS SAM CLI 1.93.0 +- AWS CLI 2.13.4 +- AWS SAM CLI 1.94.0 - AWS Session Manager CLI 1.2.463.0 - Azure CLI 2.50.0 - Azure DevOps CLI extension 0.26.0 - Cloud Foundry CLI 6.53.0 -- GitHub CLI 2.32.0 +- GitHub CLI 2.32.1 - Hub CLI 2.14.2 ### Rust Tools @@ -112,11 +112,11 @@ - Rustfmt 1.5.2 ### Browsers and Drivers -- Google Chrome 115.0.5790.102 +- Google Chrome 115.0.5790.110 - Chrome Driver 115.0.5790.102 -- Microsoft Edge 115.0.1901.183 -- Microsoft Edge Driver 115.0.1901.183 -- Mozilla Firefox 115.0.2 +- Microsoft Edge 115.0.1901.188 +- Microsoft Edge Driver 115.0.1901.188 +- Mozilla Firefox 115.0.3 - Gecko Driver 0.33.0 - IE Driver 4.10.0.0 - Selenium server 4.10.0 @@ -227,12 +227,12 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Visual Studio Enterprise 2019 | Name | Version | Path | | ----------------------------- | --------------- | -------------------------------------------------------------- | -| Visual Studio Enterprise 2019 | 16.11.33801.447 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | +| Visual Studio Enterprise 2019 | 16.11.33920.266 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | #### Workloads, components and extensions | Package | Version | | ------------------------------------------------------------------------- | --------------- | -| Component.Android.NDK.R16B | 16.11.33801.199 | +| Component.Android.NDK.R16B | 16.11.33919.289 | | Component.Android.SDK25.Private | 16.0.28625.61 | | Component.Android.SDK30 | 16.10.31205.252 | | Component.Ant | 1.9.3.8 | @@ -507,10 +507,10 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Az (Cached): 1.0.0.zip, 1.6.0.zip, 2.3.2.zip, 2.6.0.zip, 3.1.0.zip, 3.5.0.zip, 3.8.0.zip, 4.3.0.zip, 4.4.0.zip, 4.7.0.zip, 5.5.0.zip, 5.9.0.zip, 6.6.0.zip, 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.376 +- AWSPowershell: 4.1.382 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 -- Microsoft.Graph: 2.1.0 +- Microsoft.Graph: 2.2.0 - Pester: 3.4.0, 5.5.0 - PowerShellGet: 1.0.0.1, 2.2.5 - PSScriptAnalyzer: 1.21.0 From b762375cfcda4881ff53cc25410727742f836bb0 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 3 Aug 2023 12:07:32 +0000 Subject: [PATCH 2084/3485] Updating readme file for win22 version 20230730.1.1 (#8011) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2022-Readme.md | 38 ++++++++++++++++---------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/images/win/Windows2022-Readme.md b/images/win/Windows2022-Readme.md index caecc7882c7f..85b5636517ef 100644 --- a/images/win/Windows2022-Readme.md +++ b/images/win/Windows2022-Readme.md @@ -1,6 +1,6 @@ # Windows Server 2022 - OS Version: 10.0.20348 Build 1850 -- Image Version: 20230724.1.0 +- Image Version: 20230730.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -20,7 +20,7 @@ - Ruby 3.0.6p216 ### Package Management -- Chocolatey 2.1.0 +- Chocolatey 2.2.0 - Composer 2.5.8 - Helm 3.12.1 - Miniconda 23.5.2 (pre-installed on the image but not added to PATH) @@ -29,7 +29,7 @@ - pip 23.2.1 (python 3.9) - Pipx 1.2.0 - RubyGems 3.2.33 -- Vcpkg (build from commit d765306b0) +- Vcpkg (build from commit 8b04a7bd9) - Yarn 1.22.19 #### Environment variables @@ -47,14 +47,14 @@ ### Tools - 7zip 23.01 - aria2 1.36.0 -- azcopy 10.19.0 -- Bazel 6.2.1 +- azcopy 10.20.0 +- Bazel 6.3.0 - Bazelisk 1.13.2 - Bicep 0.19.5 - Cabal 3.10.1.0 -- CMake 3.27.0 -- CodeQL Action Bundles 2.13.5 2.14.0 -- Docker 24.0.4 +- CMake 3.27.1 +- CodeQL Action Bundles 2.14.0 2.14.1 +- Docker 24.0.5 - Docker Compose v1 1.29.2 - Docker Compose v2 2.20.2 - Docker-wincred 0.8.0 @@ -71,8 +71,8 @@ - Newman 5.3.2 - NSIS 3.08 - OpenSSL 1.1.1u -- Packer 1.9.1 -- Pulumi 3.76.0 +- Packer 1.9.2 +- Pulumi 3.76.1 - R 4.3.1 - Service Fabric SDK 9.1.1436.9590 - Stack 2.11.1 @@ -86,12 +86,12 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.170 -- AWS CLI 2.13.3 -- AWS SAM CLI 1.93.0 +- AWS CLI 2.13.4 +- AWS SAM CLI 1.94.0 - AWS Session Manager CLI 1.2.463.0 - Azure CLI 2.50.0 - Azure DevOps CLI extension 0.26.0 -- GitHub CLI 2.32.0 +- GitHub CLI 2.32.1 - Hub CLI 2.14.2 ### Rust Tools @@ -109,11 +109,11 @@ - Rustfmt 1.5.2 ### Browsers and Drivers -- Google Chrome 115.0.5790.102 +- Google Chrome 115.0.5790.110 - Chrome Driver 115.0.5790.102 -- Microsoft Edge 115.0.1901.183 -- Microsoft Edge Driver 115.0.1901.183 -- Mozilla Firefox 115.0.2 +- Microsoft Edge 115.0.1901.188 +- Microsoft Edge Driver 115.0.1901.188 +- Mozilla Firefox 115.0.3 - Gecko Driver 0.33.0 - IE Driver 4.10.0.0 - Selenium server 4.10.0 @@ -561,10 +561,10 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Az (Cached): 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.376 +- AWSPowershell: 4.1.382 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 -- Microsoft.Graph: 2.1.0 +- Microsoft.Graph: 2.2.0 - Pester: 3.4.0, 5.5.0 - PowerShellGet: 1.0.0.1, 2.2.5 - PSScriptAnalyzer: 1.21.0 From ff6a3d4b29bd9570f9978264e0531b0ff3620ff5 Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Thu, 3 Aug 2023 18:20:16 +0200 Subject: [PATCH 2085/3485] [macos] Utilise arch helper function (#8036) --- images/macos/provision/core/xcode.ps1 | 3 +-- images/macos/tests/Xcode.Tests.ps1 | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/images/macos/provision/core/xcode.ps1 b/images/macos/provision/core/xcode.ps1 index a5609e81972b..634526bc54f1 100644 --- a/images/macos/provision/core/xcode.ps1 +++ b/images/macos/provision/core/xcode.ps1 @@ -7,8 +7,7 @@ Import-Module "$env:HOME/image-generation/helpers/Xcode.Installer.psm1" -Disable # https://github.com/fastlane/fastlane/pull/18116 $env:SPACESHIP_SKIP_2FA_UPGRADE = 1 -$ARCH = arch -if ($ARCH -ne "arm64") { $ARCH = "x64" } +$ARCH = Get-Architecture [Array]$xcodeVersions = Get-ToolsetValue "xcode.$ARCH.versions" write-host $xcodeVersions $defaultXcode = Get-ToolsetValue "xcode.default" diff --git a/images/macos/tests/Xcode.Tests.ps1 b/images/macos/tests/Xcode.Tests.ps1 index a38a996d5dd9..5eb49fdb5459 100644 --- a/images/macos/tests/Xcode.Tests.ps1 +++ b/images/macos/tests/Xcode.Tests.ps1 @@ -2,8 +2,7 @@ Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" Import-Module "$PSScriptRoot/../helpers/Xcode.Helpers.psm1" Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1" -DisableNameChecking -$ARCH = arch -if ($ARCH -ne "arm64") { $ARCH = "x64" } +$ARCH = Get-Architecture $xcodeVersions = Get-ToolsetValue "xcode.$ARCH.versions" $defaultXcode = Get-ToolsetValue "xcode.default" $latestXcodeVersion = $xcodeVersions | Select-Object -First 1 From 38a9b4344ff14ec17d20ea94f4f82d7e884bb17c Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Fri, 4 Aug 2023 12:29:31 +0200 Subject: [PATCH 2086/3485] [Ubuntu] Remove duplicated line with Python version from report (#8035) --- .../linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 | 6 ------ .../scripts/SoftwareReport/SoftwareReport.Generator.ps1 | 1 - 2 files changed, 7 deletions(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 index 562f029d289a..02ddd0c6d976 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 @@ -99,12 +99,6 @@ function Get-PythonVersion { return $version } -function Get-Python3Version { - $result = Get-CommandResult "python3 --version" - $version = $result.Output | Take-OutputPart -Part 1 - return $version -} - function Get-PowershellVersion { return $(pwsh --version) | Take-OutputPart -Part 1 } diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index daa32686e3fc..9923937f1d86 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -54,7 +54,6 @@ $languageAndRuntime.AddToolVersion("MSBuild", $(Get-MsbuildVersion)) $languageAndRuntime.AddToolVersion("Node.js", $(Get-NodeVersion)) $languageAndRuntime.AddToolVersion("Perl", $(Get-PerlVersion)) $languageAndRuntime.AddToolVersion("Python", $(Get-PythonVersion)) -$languageAndRuntime.AddToolVersion("Python3", $(Get-Python3Version)) $languageAndRuntime.AddToolVersion("Ruby", $(Get-RubyVersion)) $languageAndRuntime.AddToolVersion("Swift", $(Get-SwiftVersion)) From 08794b334159f011ad68ff80fd3c2f734b4fdd8c Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Fri, 4 Aug 2023 19:37:29 +0200 Subject: [PATCH 2087/3485] [Linux] Update miniconda download link (#8043) --- images/linux/scripts/installers/miniconda.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/linux/scripts/installers/miniconda.sh b/images/linux/scripts/installers/miniconda.sh index 3a3e7d295693..8a68c802c7df 100644 --- a/images/linux/scripts/installers/miniconda.sh +++ b/images/linux/scripts/installers/miniconda.sh @@ -5,7 +5,7 @@ ################################################################################ # Install Miniconda -curl -fsSL https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -o miniconda.sh \ +curl -fsSL https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh -o miniconda.sh \ && chmod +x miniconda.sh \ && ./miniconda.sh -b -p /usr/share/miniconda \ && rm miniconda.sh From 0bb547e62c2142e6883cdcf36b40572cdd4c61f8 Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Fri, 4 Aug 2023 19:38:18 +0200 Subject: [PATCH 2088/3485] [mac OS] Update miniconda download link (#8042) --- images/macos/provision/core/miniconda.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/macos/provision/core/miniconda.sh b/images/macos/provision/core/miniconda.sh index acbbacb8590e..b680dd42b860 100644 --- a/images/macos/provision/core/miniconda.sh +++ b/images/macos/provision/core/miniconda.sh @@ -1,7 +1,7 @@ #!/bin/bash -e -o pipefail MINICONDA_INSTALLER="/tmp/miniconda.sh" -curl -fsSL https://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh -o $MINICONDA_INSTALLER +curl -fsSL https://repo.anaconda.com/miniconda/Miniconda3-latest-MacOSX-x86_64.sh -o $MINICONDA_INSTALLER chmod +x $MINICONDA_INSTALLER sudo $MINICONDA_INSTALLER -b -p /usr/local/miniconda From 55a4c8c33c50c42f285f181a5a663291f52b2136 Mon Sep 17 00:00:00 2001 From: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com> Date: Fri, 4 Aug 2023 19:39:13 +0200 Subject: [PATCH 2089/3485] Macos 13 xcode 15 beta5 (#8037) --- images/macos/helpers/Xcode.Installer.psm1 | 5 ++++- images/macos/toolsets/toolset-13.json | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/images/macos/helpers/Xcode.Installer.psm1 b/images/macos/helpers/Xcode.Installer.psm1 index 89024f6d0184..e23982940543 100644 --- a/images/macos/helpers/Xcode.Installer.psm1 +++ b/images/macos/helpers/Xcode.Installer.psm1 @@ -124,7 +124,10 @@ function Approve-XcodeLicense { $XcodeRootPath = Get-XcodeRootPath -Version $Version Write-Host "Approving Xcode license for '$XcodeRootPath'..." $xcodeBuildPath = Get-XcodeToolPath -XcodeRootPath $XcodeRootPath -ToolName "xcodebuild" - Invoke-ValidateCommand "sudo $xcodeBuildPath -license accept" + try { + Invoke-Expression -Command "sudo $xcodeBuildPath -license accept" 2>&1 | Out-Null + } catch { } + } function Install-XcodeAdditionalPackages { diff --git a/images/macos/toolsets/toolset-13.json b/images/macos/toolsets/toolset-13.json index 40495d02cf3c..5067ee2de19c 100644 --- a/images/macos/toolsets/toolset-13.json +++ b/images/macos/toolsets/toolset-13.json @@ -3,7 +3,7 @@ "default": "14.2", "x64": { "versions": [ - { "link": "15.0", "version": "15.0.0-Beta.2+15A5161b" }, + { "link": "15.0", "version": "15.0.0-Beta.5+15A5209g" }, { "link": "14.3.1", "version": "14.3.1+14E300c" }, { "link": "14.3", "version": "14.3.0+14E222b" }, { "link": "14.2", "version": "14.2.0+14C18" }, @@ -12,7 +12,7 @@ }, "arm64":{ "versions": [ - { "link": "15.0", "version": "15.0.0-Beta.2+15A5161b" }, + { "link": "15.0", "version": "15.0.0-Beta.5+15A5209g" }, { "link": "14.3.1", "version": "14.3.1+14E300c" }, { "link": "14.3", "version": "14.3.0+14E222b" }, { "link": "14.2", "version": "14.2.0+14C18" }, From c493b069d2d6365822d83a3b1b8fbf4699b39589 Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Sun, 6 Aug 2023 10:57:38 +0200 Subject: [PATCH 2090/3485] [Windows] Update miniconda download link (#8041) --- images/win/scripts/Installers/Install-Miniconda.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/win/scripts/Installers/Install-Miniconda.ps1 b/images/win/scripts/Installers/Install-Miniconda.ps1 index 71706b3bcdeb..26131081652f 100644 --- a/images/win/scripts/Installers/Install-Miniconda.ps1 +++ b/images/win/scripts/Installers/Install-Miniconda.ps1 @@ -7,7 +7,7 @@ $CondaDestination = "C:\Miniconda" # Install the latest Miniconda $InstallerName = "Miniconda3-latest-Windows-x86_64.exe" -$InstallerUrl = "https://repo.continuum.io/miniconda/${InstallerName}" +$InstallerUrl = "https://repo.anaconda.com/miniconda/${InstallerName}" $ArgumentList = ("/S", "/AddToPath=0", "/RegisterPython=0", "/D=$CondaDestination") Install-Binary -Url $InstallerUrl -Name $InstallerName -ArgumentList $ArgumentList From 4ec9fdae13222a0b2b278ae1ddcdc9e8b44901ed Mon Sep 17 00:00:00 2001 From: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com> Date: Mon, 7 Aug 2023 11:53:07 +0200 Subject: [PATCH 2091/3485] [macos] use unxip if available for XCode unpacking (#7992) --- images/macos/helpers/Common.Helpers.psm1 | 9 +++++++++ images/macos/helpers/Xcode.Installer.psm1 | 7 ++++++- images/macos/toolsets/toolset-12.json | 3 ++- images/macos/toolsets/toolset-13.json | 3 ++- 4 files changed, 19 insertions(+), 3 deletions(-) diff --git a/images/macos/helpers/Common.Helpers.psm1 b/images/macos/helpers/Common.Helpers.psm1 index 457793276a2f..638899dcab61 100644 --- a/images/macos/helpers/Common.Helpers.psm1 +++ b/images/macos/helpers/Common.Helpers.psm1 @@ -166,3 +166,12 @@ function Get-Architecture { return $arch } + +function Test-CommandExists { + param + ( + [Parameter(Mandatory)] [string] $Command + ) + + [boolean] (Get-Command $Command -ErrorAction 'SilentlyContinue') +} diff --git a/images/macos/helpers/Xcode.Installer.psm1 b/images/macos/helpers/Xcode.Installer.psm1 index e23982940543..25eaeef1adae 100644 --- a/images/macos/helpers/Xcode.Installer.psm1 +++ b/images/macos/helpers/Xcode.Installer.psm1 @@ -1,3 +1,4 @@ +Import-Module "$PSScriptRoot/Common.Helpers.psm1" Import-Module "$PSScriptRoot/Xcode.Helpers.psm1" function Install-XcodeVersion { @@ -86,7 +87,11 @@ function Expand-XcodeXipArchive { Write-Host "Extracting Xcode from '$xcodeXipPath'" Push-Location $DownloadDirectory - Invoke-ValidateCommand "xip -x $xcodeXipPath" + if(Test-CommandExists 'unxip') { + Invoke-ValidateCommand "unxip $xcodeXipPath" + } else { + Invoke-ValidateCommand "xip -x $xcodeXipPath" + } Pop-Location if (Test-Path "$DownloadDirectory/Xcode-beta.app") { diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index dd135ac0acc8..a417d9b73be2 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -202,7 +202,8 @@ "tcl-tk", "r", "yq", - "imagemagick" + "imagemagick", + "unxip" ], "cask_packages": [ "julia", diff --git a/images/macos/toolsets/toolset-13.json b/images/macos/toolsets/toolset-13.json index 5067ee2de19c..c1da99980283 100644 --- a/images/macos/toolsets/toolset-13.json +++ b/images/macos/toolsets/toolset-13.json @@ -74,7 +74,8 @@ "zstd", "gmp", "r", - "yq" + "yq", + "unxip" ], "cask_packages": [ "julia", From 6ed173f0ada9e3679f77fd063ac69290dd527deb Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Wed, 9 Aug 2023 11:50:49 +0200 Subject: [PATCH 2092/3485] Fix issue where tags json is wrong in PS5 (#8058) --- helpers/GenerateResourcesAndImage.ps1 | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/helpers/GenerateResourcesAndImage.ps1 b/helpers/GenerateResourcesAndImage.ps1 index 17cdda22a2cb..326e18471047 100644 --- a/helpers/GenerateResourcesAndImage.ps1 +++ b/helpers/GenerateResourcesAndImage.ps1 @@ -288,6 +288,12 @@ Function GenerateResourcesAndImage { } } + $TagsJson = $Tags | ConvertTo-Json -Compress + if ($PSVersionTable.PSVersion.Major -eq 5) { + Write-Verbose "PowerShell 5 detected. Replacing double quotes with escaped double quotes in tags JSON." + $TagsJson = $TagsJson -replace '"', '\"' + } + & $packerBinary build -on-error="$($OnError)" ` -var "client_id=$($spClientId)" ` -var "client_secret=$($ServicePrincipalClientSecret)" ` @@ -298,7 +304,7 @@ Function GenerateResourcesAndImage { -var "storage_account=$($storageAccountName)" ` -var "install_password=$($InstallPassword)" ` -var "allowed_inbound_ip_addresses=$($AgentIp)" ` - -var "azure_tags=$($Tags | ConvertTo-Json -Compress)" ` + -var "azure_tags=$($TagsJson)" ` $builderScriptPath } catch { From 8ee2d5203af0fe7f1ee31ad6fcfc0fe5f2141778 Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Wed, 9 Aug 2023 12:07:49 +0200 Subject: [PATCH 2093/3485] [mac OS] Add PyPy 3.10 (#8040) --- images/macos/toolsets/toolset-11.json | 3 ++- images/macos/toolsets/toolset-12.json | 3 ++- images/macos/toolsets/toolset-13.json | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index 62ebc92bba46..b27da27b9a84 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -257,7 +257,8 @@ "2.7", "3.7", "3.8", - "3.9" + "3.9", + "3.10" ] } } diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index a417d9b73be2..56ebe460ccbe 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -244,7 +244,8 @@ "2.7", "3.7", "3.8", - "3.9" + "3.9", + "3.10" ] } } diff --git a/images/macos/toolsets/toolset-13.json b/images/macos/toolsets/toolset-13.json index c1da99980283..a8c80dc1f862 100644 --- a/images/macos/toolsets/toolset-13.json +++ b/images/macos/toolsets/toolset-13.json @@ -143,7 +143,8 @@ "2.7", "3.7", "3.8", - "3.9" + "3.9", + "3.10" ] } } From 8c81cda4bb2aa64c28d374d9b77099b0c2860d81 Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Wed, 9 Aug 2023 12:08:16 +0200 Subject: [PATCH 2094/3485] [Windows] Add PyPy 3.10 (#8039) --- images/win/toolsets/toolset-2019.json | 3 ++- images/win/toolsets/toolset-2022.json | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index 6c084e264cc8..ccec4dc93d5a 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -52,7 +52,8 @@ "3.6", "3.7", "3.8", - "3.9" + "3.9", + "3.10" ] }, { diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index ca2845dc4586..959e5a89427a 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -46,7 +46,8 @@ "2.7", "3.7", "3.8", - "3.9" + "3.9", + "3.10" ] }, { From 9c598da9cb4826b1d4582bbec5cc4f237c8001ec Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Wed, 9 Aug 2023 12:08:45 +0200 Subject: [PATCH 2095/3485] [Ubuntu] Add PyPy 3.10 (#8038) --- images/linux/toolsets/toolset-2004.json | 3 ++- images/linux/toolsets/toolset-2204.json | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index 2dbcc725ac3f..0fdd8b2828fa 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -24,7 +24,8 @@ "3.6", "3.7", "3.8", - "3.9" + "3.9", + "3.10" ] }, { diff --git a/images/linux/toolsets/toolset-2204.json b/images/linux/toolsets/toolset-2204.json index 654cdd082f95..08fb0ca0af3c 100644 --- a/images/linux/toolsets/toolset-2204.json +++ b/images/linux/toolsets/toolset-2204.json @@ -21,7 +21,8 @@ "versions": [ "3.7", "3.8", - "3.9" + "3.9", + "3.10" ] }, { From 8b4ff6aec267e20b843bcaabbcb3e19dd8e875f1 Mon Sep 17 00:00:00 2001 From: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com> Date: Wed, 9 Aug 2023 12:09:34 +0200 Subject: [PATCH 2096/3485] [macos] suppress swiftc warnings regarding deprecated API (#7989) ==> veertu-anka-vm-clone.template: /Users/<sensitive>/image-generation/add-certificate.swift:21:5: warning: 'SecKeychainSetPreferenceDomain' was deprecated in macOS 10.10: SecKeychain is deprecated ==> veertu-anka-vm-clone.template: SecKeychainSetPreferenceDomain(SecPreferencesDomain.system) ==> veertu-anka-vm-clone.template: ^ ==> veertu-anka-vm-clone.template: /Users/<sensitive>/image-generation/add-certificate.swift:22:5: warning: result of call to 'deleteCertificateFromKeyChain' is unused ==> veertu-anka-vm-clone.template: deleteCertificateFromKeyChain(certificateLabel) ==> veertu-anka-vm-clone.template: ^ ~~~~~~~~~~~~~~~~~~ ==> veertu-anka-vm-clone.template: /Users/<sensitive>/image-generation/add-certificate.swift:36:9: warning: initialization of variable 'status' was never used; consider replacing with assignment to '_' or removing it ==> veertu-anka-vm-clone.template: var status = SecTrustSettingsSetTrustSettings(certificate, SecTrustSettingsDomain.admin, nil) ==> veertu-anka-vm-clone.template: ~~~~^~~~~~ ==> veertu-anka-vm-clone.template: _ --- images/macos/provision/configuration/configure-machine.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/macos/provision/configuration/configure-machine.sh b/images/macos/provision/configuration/configure-machine.sh index 9b268a80aa2b..32beba10ee3c 100644 --- a/images/macos/provision/configuration/configure-machine.sh +++ b/images/macos/provision/configuration/configure-machine.sh @@ -37,7 +37,7 @@ defaults write com.apple.VoiceOver4/default SCREnableAppleScript -bool YES # sudo security delete-certificate -Z FF6797793A3CD798DC5B2ABEF56F73EDC9F83A64 /Library/Keychains/System.keychain # Big Sur requires user interaction to add a cert https://developer.apple.com/forums/thread/671582, we need to use a workaround with SecItemAdd swift method -swiftc "${HOME}/image-generation/add-certificate.swift" +swiftc -suppress-warnings "${HOME}/image-generation/add-certificate.swift" certs=( From 4780184e3db04df1e8a7e06db999c027866d5cab Mon Sep 17 00:00:00 2001 From: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com> Date: Wed, 9 Aug 2023 14:17:01 +0200 Subject: [PATCH 2097/3485] Unpin veertu packer (#8061) --- images/macos/templates/macOS-11.anka.pkr.hcl | 2 +- images/macos/templates/macOS-12.anka.pkr.hcl | 2 +- images/macos/templates/macOS-13.anka.pkr.hcl | 2 +- images/macos/templates/macOS-13.arm64.anka.pkr.hcl | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/images/macos/templates/macOS-11.anka.pkr.hcl b/images/macos/templates/macOS-11.anka.pkr.hcl index 1cbe84124463..3b1dc79a51d8 100644 --- a/images/macos/templates/macOS-11.anka.pkr.hcl +++ b/images/macos/templates/macOS-11.anka.pkr.hcl @@ -1,7 +1,7 @@ packer { required_plugins { veertu-anka = { - version = "= v3.1.0" + version = ">= v3.2.0" source = "github.com/veertuinc/veertu-anka" } } diff --git a/images/macos/templates/macOS-12.anka.pkr.hcl b/images/macos/templates/macOS-12.anka.pkr.hcl index f15ee7e30041..44bdbe58db61 100644 --- a/images/macos/templates/macOS-12.anka.pkr.hcl +++ b/images/macos/templates/macOS-12.anka.pkr.hcl @@ -1,7 +1,7 @@ packer { required_plugins { veertu-anka = { - version = "= v3.1.0" + version = ">= v3.2.0" source = "github.com/veertuinc/veertu-anka" } } diff --git a/images/macos/templates/macOS-13.anka.pkr.hcl b/images/macos/templates/macOS-13.anka.pkr.hcl index 16eded673ca1..17ca5fdf3f1d 100644 --- a/images/macos/templates/macOS-13.anka.pkr.hcl +++ b/images/macos/templates/macOS-13.anka.pkr.hcl @@ -1,7 +1,7 @@ packer { required_plugins { veertu-anka = { - version = "= v3.1.0" + version = ">= v3.2.0" source = "github.com/veertuinc/veertu-anka" } } diff --git a/images/macos/templates/macOS-13.arm64.anka.pkr.hcl b/images/macos/templates/macOS-13.arm64.anka.pkr.hcl index ace69c5ad5b4..c95214dc64f4 100644 --- a/images/macos/templates/macOS-13.arm64.anka.pkr.hcl +++ b/images/macos/templates/macOS-13.arm64.anka.pkr.hcl @@ -1,7 +1,7 @@ packer { required_plugins { veertu-anka = { - version = "= v3.1.0" + version = ">= v3.2.0" source = "github.com/veertuinc/veertu-anka" } } From ba971095262aaea3f0d9dcc4e9eddd2f8ce4cb99 Mon Sep 17 00:00:00 2001 From: sergei-pyshnoi <121864472+sergei-pyshnoi@users.noreply.github.com> Date: Wed, 9 Aug 2023 14:28:33 +0200 Subject: [PATCH 2098/3485] [Windows] Change mongodb installation from choco to .msi download (#8032) --- .../scripts/Installers/Install-MongoDB.ps1 | 21 +++++++++++++++++-- images/win/toolsets/toolset-2019.json | 2 +- images/win/toolsets/toolset-2022.json | 2 +- 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/images/win/scripts/Installers/Install-MongoDB.ps1 b/images/win/scripts/Installers/Install-MongoDB.ps1 index ce73fe5a2dc1..d82342450bbc 100644 --- a/images/win/scripts/Installers/Install-MongoDB.ps1 +++ b/images/win/scripts/Installers/Install-MongoDB.ps1 @@ -5,8 +5,25 @@ # Install mongodb package $toolsetVersion = (Get-ToolsetContent).mongodb.version -$latestChocoPackage = Get-LatestChocoPackageVersion -TargetVersion $toolsetVersion -PackageName "mongodb" -Choco-Install -PackageName mongodb -ArgumentList "--version=$latestChocoPackage" + +$getMongoReleases = Invoke-WebRequest -Uri "https://www.mongodb.com/docs/upcoming/release-notes/$toolsetVersion" -UseBasicParsing +$TargetReleases = $getMongoReleases.Links.href | Where-Object {$_ -like "*std-label-$toolsetVersion*"} + +$MinorVersions = @() +foreach ($release in $TargetReleases) { + $pattern = '\d+\.\d+\.\d+' + $version = $release | Select-String -Pattern $pattern -AllMatches | ForEach-Object { $_.Matches } | ForEach-Object { $_.Value } + $MinorVersions += $version + } + +$LatestVersion = $MinorVersions[0] + +$installDir = "c:\PROGRA~1\MongoDB" +$binaryName = "mongodb-windows-x86_64-$LatestVersion-signed.msi" +$downloadURL = "https://fastdl.mongodb.org/windows/$BinaryName" +$installArg = "INSTALLLOCATION=$installDir ADDLOCAL=all" +Install-Binary -Url $downloadURL -Name $binaryName -ArgumentList ("/q","/i","${env:Temp}\$binaryName", $installArg) + # Add mongodb to the PATH $mongodbService = "mongodb" diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index ccec4dc93d5a..64ef60915cd3 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -469,7 +469,7 @@ "version": "5.7" }, "mongodb": { - "version": "5.0.15" + "version": "5.0" }, "nsis": { "version": "3.08" diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index 959e5a89427a..5782aa3819c9 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -401,7 +401,7 @@ "version": "8.0" }, "mongodb": { - "version": "5.0.15" + "version": "5.0" }, "nsis": { "version": "3.08" From 895b9c79c7e219237bc1c8c9ddfc2dc92383fd0c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 10 Aug 2023 09:09:48 +0000 Subject: [PATCH 2099/3485] Updating readme file for win19 version 20230806.1.1 (#8054) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2019-Readme.md | 64 +++++++++++++++++--------------- 1 file changed, 34 insertions(+), 30 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index 4c06a458a7fa..0e3017ace539 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -1,6 +1,10 @@ +| Announcements | +|-| +| [[All OSes] Adopt OpenJDK will be removed from images on August, 7](https://github.com/actions/runner-images/issues/8030) | +*** # Windows Server 2019 - OS Version: 10.0.17763 Build 4645 -- Image Version: 20230731.1.0 +- Image Version: 20230806.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -9,13 +13,13 @@ ### Language and Runtime - Bash 5.2.15(1)-release -- Go 1.20.6 +- Go 1.20.7 - Julia 1.9.2 - Kotlin 1.9.0 - LLVM 15.0.7 - Node 18.17.0 - Perl 5.32.1 -- PHP 8.2.8 +- PHP 8.2.9 - Python 3.7.9 - Ruby 2.5.9p229 @@ -29,7 +33,7 @@ - pip 23.2.1 (python 3.7) - Pipx 1.2.0 - RubyGems 2.7.6.3 -- Vcpkg (build from commit 8b04a7bd9) +- Vcpkg (build from commit 78b61582c) - Yarn 1.22.19 #### Environment variables @@ -50,7 +54,7 @@ - azcopy 10.20.0 - Bazel 6.3.1 - Bazelisk 1.13.2 -- Bicep 0.19.5 +- Bicep 0.20.4 - Cabal 3.10.1.0 - CMake 3.27.1 - CodeQL Action Bundles 2.14.0 2.14.1 @@ -61,8 +65,8 @@ - ghc 9.6.2 - Git 2.41.0.windows.3 - Git LFS 3.3.0 -- Google Cloud SDK 440.0.0 -- ImageMagick 7.1.1-14 +- Google Cloud SDK 441.0.0 +- ImageMagick 7.1.1-15 - InnoSetup 6.2.2 - jq 1.6 - Kind 0.20.0 @@ -71,10 +75,10 @@ - Mingw-w64 8.1.0 - Newman 5.3.2 - NSIS 3.08 -- OpenSSL 1.1.1u +- OpenSSL 1.1.1v - Packer 1.9.2 - Parcel 2.9.3 -- Pulumi 3.76.1 +- Pulumi 3.77.1 - R 4.3.1 - Service Fabric SDK 9.1.1436.9590 - Stack 2.11.1 @@ -87,20 +91,20 @@ - zstd 1.5.5 ### CLI Tools -- Alibaba Cloud CLI 3.0.170 -- AWS CLI 2.13.4 +- Alibaba Cloud CLI 3.0.172 +- AWS CLI 2.13.7 - AWS SAM CLI 1.94.0 -- AWS Session Manager CLI 1.2.463.0 -- Azure CLI 2.50.0 +- AWS Session Manager CLI 1.2.497.0 +- Azure CLI 2.51.0 - Azure DevOps CLI extension 0.26.0 - Cloud Foundry CLI 6.53.0 - GitHub CLI 2.32.1 - Hub CLI 2.14.2 ### Rust Tools -- Cargo 1.71.0 -- Rust 1.71.0 -- Rustdoc 1.71.0 +- Cargo 1.71.1 +- Rust 1.71.1 +- Rustdoc 1.71.1 - Rustup 1.26.0 #### Packages @@ -112,14 +116,14 @@ - Rustfmt 1.5.2 ### Browsers and Drivers -- Google Chrome 115.0.5790.110 -- Chrome Driver 115.0.5790.102 +- Google Chrome 115.0.5790.171 +- Chrome Driver 115.0.5790.170 - Microsoft Edge 115.0.1901.188 - Microsoft Edge Driver 115.0.1901.188 -- Mozilla Firefox 115.0.3 +- Mozilla Firefox 116.0.1 - Gecko Driver 0.33.0 -- IE Driver 4.10.0.0 -- Selenium server 4.10.0 +- IE Driver 4.11.0.0 +- Selenium server 4.11.0 #### Environment variables | Name | Value | @@ -130,12 +134,11 @@ | SELENIUM_JAR_PATH | C:\selenium\selenium-server.jar | ### Java -| Version | Vendor | Environment Variable | -| ------------------- | --------------- | -------------------- | -| 8.0.382+5 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | -| 11.0.20+8 | Eclipse Temurin | JAVA_HOME_11_X64 | -| 13.0.2+8.1 | Adopt OpenJDK | JAVA_HOME_13_X64 | -| 17.0.8+7 | Eclipse Temurin | JAVA_HOME_17_X64 | +| Version | Environment Variable | +| ------------------- | -------------------- | +| 8.0.382+5 (default) | JAVA_HOME_8_X64 | +| 11.0.20+8 | JAVA_HOME_11_X64 | +| 17.0.8+7 | JAVA_HOME_17_X64 | ### Shells | Name | Target | @@ -161,8 +164,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Go - 1.18.10 -- 1.19.11 -- 1.20.6 +- 1.19.12 +- 1.20.7 #### Node.js - 14.21.3 @@ -507,7 +510,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Az (Cached): 1.0.0.zip, 1.6.0.zip, 2.3.2.zip, 2.6.0.zip, 3.1.0.zip, 3.5.0.zip, 3.8.0.zip, 4.3.0.zip, 4.4.0.zip, 4.7.0.zip, 5.5.0.zip, 5.9.0.zip, 6.6.0.zip, 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.382 +- AWSPowershell: 4.1.387 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 - Microsoft.Graph: 2.2.0 @@ -557,3 +560,4 @@ All other versions are saved but not installed. | mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:5ff317aa3f2f0e19610c95bae5b9ba66cbe151fdf96765399ef552fb29e03b2d | 2023-07-11 | | mcr.microsoft.com/windows/nanoserver:1809 | sha256:184914b6008b14ddaf1f9f8944a38c0b2f5ef7e9b13c694a5913528370eed73e | 2023-07-07 | | mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:31c6e1eb571ced8af4a543204ec1e410161677de56a6f76ce0983928b02af07c | 2023-07-07 | + From 3217accdcdd3791647574820d0168561ec7c49aa Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 10 Aug 2023 09:20:44 +0000 Subject: [PATCH 2100/3485] Updating readme file for ubuntu20 version 20230806.1.1 (#8050) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2004-Readme.md | 76 ++++++++++++++++--------------- 1 file changed, 40 insertions(+), 36 deletions(-) diff --git a/images/linux/Ubuntu2004-Readme.md b/images/linux/Ubuntu2004-Readme.md index dc5a789b690b..0e68f5764ac5 100644 --- a/images/linux/Ubuntu2004-Readme.md +++ b/images/linux/Ubuntu2004-Readme.md @@ -1,7 +1,11 @@ +| Announcements | +|-| +| [[All OSes] Adopt OpenJDK will be removed from images on August, 7](https://github.com/actions/runner-images/issues/8030) | +*** # Ubuntu 20.04 - OS Version: 20.04.6 LTS - Kernel Version: 5.15.0-1042-azure -- Image Version: 20230728.3.0 +- Image Version: 20230806.1.0 - Systemd version: 245.4-4ubuntu3.22 ## Installed Software @@ -13,9 +17,9 @@ - Clang-tidy: 10.0.0, 11.0.0, 12.0.0 - Dash 0.5.10.2-6 - Erlang 25.3 (Eshell 13.2) -- Erlang rebar3 3.22.0 -- GNU C++: 9.4.0, 10.3.0 -- GNU Fortran: 9.4.0, 10.3.0 +- Erlang rebar3 3.22.1 +- GNU C++: 9.4.0, 10.5.0 +- GNU Fortran: 9.4.0, 10.5.0 - Julia 1.9.2 - Kotlin 1.9.0-release-358 - Mono 6.12.0.200 @@ -23,14 +27,13 @@ - Node.js 18.17.0 - Perl 5.30.0 - Python 3.8.10 -- Python3 3.8.10 - Ruby 2.7.0p0 - Swift 5.8.1 ### Package Management - cpan 1.64 - Helm 3.12.2 -- Homebrew 4.1.2 +- Homebrew 4.1.3 - Miniconda 23.5.2 - Npm 9.6.7 - NuGet 6.6.1.2 @@ -38,7 +41,7 @@ - Pip3 20.0.2 - Pipx 1.2.0 - RubyGems 3.1.2 -- Vcpkg (build from commit 8b04a7bd9) +- Vcpkg (build from commit 78b61582c) - Yarn 1.22.19 #### Environment variables @@ -66,9 +69,9 @@ to accomplish this. - Ansible 2.13.11 - apt-fast 1.9.12 - AzCopy 10.20.0 - available by `azcopy` and `azcopy10` aliases -- Bazel 6.3.0 +- Bazel 6.3.1 - Bazelisk 1.13.2 -- Bicep 0.19.5 +- Bicep 0.20.4 - Buildah 1.22.3 - CMake 3.27.1 - CodeQL Action Bundles 2.14.0 2.14.1 @@ -88,7 +91,7 @@ to accomplish this. - jq 1.6 - Kind 0.20.0 - Kubectl 1.27.4 -- Kustomize 5.1.0 +- Kustomize 5.1.1 - Leiningen 2.10.0 - MediaInfo 19.09 - Mercurial 5.3.1 @@ -101,7 +104,7 @@ to accomplish this. - Parcel 2.9.3 - PhantomJS 2.1.1 2.1.1 - Podman 3.4.2 -- Pulumi 3.76.1 +- Pulumi 3.77.1 - R 4.3.1 - Skopeo 1.5.0 - Sphinx Open Source Search Server 2.2.11 @@ -112,26 +115,26 @@ to accomplish this. - zstd 1.5.5 ### CLI Tools -- Alibaba Cloud CLI 3.0.170 -- AWS CLI 2.13.5 -- AWS CLI Session Manager Plugin 1.2.463.0 +- Alibaba Cloud CLI 3.0.172 +- AWS CLI 2.13.7 +- AWS CLI Session Manager Plugin 1.2.497.0 - AWS SAM CLI 1.94.0 -- Azure CLI 2.50.0 +- Azure CLI 2.51.0 - Azure CLI (azure-devops) 0.26.0 - GitHub CLI 2.32.1 -- Google Cloud SDK 440.0.0 +- Google Cloud SDK 441.0.0 - Hub CLI 2.14.2 -- Netlify CLI 15.9.1 +- Netlify CLI 15.10.0 - OpenShift CLI 4.13.6 - ORAS CLI 1.0.0 -- Vercel CLI 31.1.1 +- Vercel CLI 31.2.2 ### Java -| Version | Vendor | Environment Variable | -| ------------------- | --------------- | -------------------- | -| 8.0.372+7 | Eclipse Temurin | JAVA_HOME_8_X64 | -| 11.0.19+7 (default) | Eclipse Temurin | JAVA_HOME_11_X64 | -| 17.0.7+7 | Eclipse Temurin | JAVA_HOME_17_X64 | +| Version | Environment Variable | +| ------------------- | -------------------- | +| 8.0.382+5 | JAVA_HOME_8_X64 | +| 11.0.20+8 (default) | JAVA_HOME_11_X64 | +| 17.0.8+7 | JAVA_HOME_17_X64 | ### PHP Tools - PHP: 7.4.33, 8.0.29, 8.1.21, 8.2.8 @@ -148,9 +151,9 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Stack 2.11.1 ### Rust Tools -- Cargo 1.71.0 -- Rust 1.71.0 -- Rustdoc 1.71.0 +- Cargo 1.71.1 +- Rust 1.71.1 +- Rustdoc 1.71.1 - Rustup 1.26.0 #### Packages @@ -162,13 +165,13 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.5.2 ### Browsers and Drivers -- Google Chrome 115.0.5790.110 -- ChromeDriver 115.0.5790.102 +- Google Chrome 115.0.5790.170 +- ChromeDriver 115.0.5790.170 - Chromium 115.0.5790.0 - Microsoft Edge 115.0.1901.188 - Microsoft Edge WebDriver 115.0.1901.188 -- Selenium server 4.10.0 -- Mozilla Firefox 116.0 +- Selenium server 4.11.0 +- Mozilla Firefox 116.0.1 - Geckodriver 0.33.0 #### Environment variables @@ -212,8 +215,8 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Go - 1.18.10 -- 1.19.11 -- 1.20.6 +- 1.19.12 +- 1.20.7 #### Node.js - 14.21.3 @@ -298,16 +301,16 @@ Use the following command as a part of your job to start the service: 'sudo syst | debian:10 | sha256:7cd85d3d51a435062010581f14c5e3f9428388ac7234cc9a1e23dd14d7e4e914 | 2023-07-27 | | debian:11 | sha256:630454da4c59041a2bca987a0d54c68962f1d6ea37a3641bd61db42b753234f2 | 2023-07-27 | | debian:9 | sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be | 2022-06-23 | -| moby/buildkit:latest | sha256:e70e7a9bfaeafd2cb101b050ca78e1f73032473fc0aac5b10f35c5d26df1e2c6 | 2023-07-12 | +| moby/buildkit:latest | sha256:d91fe5e6dad11f2c2cee6d268d5843ad64bf2e9852365d56b12d02f2315edce5 | 2023-08-02 | | node:14 | sha256:a158d3b9b4e3fa813fa6c8c590b8f0a860e015ad4e59bbce5744d2f6fd8461aa | 2023-04-12 | | node:14-alpine | sha256:434215b487a329c9e867202ff89e704d3a75e554822e07f3e0c0f9e606121b33 | 2023-03-29 | -| node:16 | sha256:c83c7fa87b7449675b422877f547233f3d05ac75a4363ed030fc3635dd9cc395 | 2023-07-04 | +| node:16 | sha256:6cd6581a9ae814ebbc8077afd63ecbf4d37f9b59ac9d9304a1b5a9e743ac13e0 | 2023-07-28 | | node:16-alpine | sha256:6c381d5dc2a11dcdb693f0301e8587e43f440c90cdb8933eaaaabb905d44cdb9 | 2023-06-21 | -| node:18 | sha256:5b0596963c8653bac197457d0da388ac603658011f13cb15d303a54bb83679fa | 2023-07-19 | +| node:18 | sha256:c85dc4392f44f5de1d0d72dd20a088a542734445f99bed7aa8ac895c706d370d | 2023-07-28 | | node:18-alpine | sha256:93d91deea65c9a0475507e8bc8b1917d6278522322f00c00b3ab09cab6830060 | 2023-07-19 | | ubuntu:16.04 | sha256:1f1a2d56de1d604801a9671f301190704c25d604a416f59e03c04f5c6ffee0d6 | 2021-08-31 | | ubuntu:18.04 | sha256:152dc042452c496007f07ca9127571cb9c29697f42acbfad72324b2bb2e43c98 | 2023-05-30 | -| ubuntu:20.04 | sha256:c9820a44b950956a790c354700c1166a7ec648bc0d215fa438d3a339812f1d01 | 2023-06-28 | +| ubuntu:20.04 | sha256:33a5cc25d22c45900796a1aca487ad7a7cb09f09ea00b779e3b2026b4fc2faba | 2023-08-01 | ### Installed apt packages | Name | Version | @@ -398,3 +401,4 @@ Use the following command as a part of your job to start the service: 'sudo syst | xz-utils | 5.2.4-1ubuntu1.1 | | zip | 3.0-11build1 | | zsync | 0.6.2-3ubuntu1 | + From b0fc3ecdd4fa2f27b2fb0ebbde707f1771a341ab Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 10 Aug 2023 09:28:11 +0000 Subject: [PATCH 2101/3485] Updating readme file for ubuntu22 version 20230806.1.1 (#8049) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2204-Readme.md | 84 ++++++++++++++++--------------- 1 file changed, 44 insertions(+), 40 deletions(-) diff --git a/images/linux/Ubuntu2204-Readme.md b/images/linux/Ubuntu2204-Readme.md index f3f0e7519b46..dbaae8bc789e 100644 --- a/images/linux/Ubuntu2204-Readme.md +++ b/images/linux/Ubuntu2204-Readme.md @@ -1,7 +1,11 @@ +| Announcements | +|-| +| [[All OSes] Adopt OpenJDK will be removed from images on August, 7](https://github.com/actions/runner-images/issues/8030) | +*** # Ubuntu 22.04 -- OS Version: 22.04.2 LTS +- OS Version: 22.04.3 LTS - Kernel Version: 5.15.0-1042-azure -- Image Version: 20230728.3.0 +- Image Version: 20230806.1.0 - Systemd version: 249.11-0ubuntu3.9 ## Installed Software @@ -12,23 +16,22 @@ - Clang-format: 12.0.1, 13.0.1, 14.0.0 - Clang-tidy: 12.0.1, 13.0.1, 14.0.0 - Dash 0.5.11+git20210903+057cd650a4ed-3build1 -- GNU C++: 9.5.0, 10.4.0, 11.3.0, 12.1.0 -- GNU Fortran: 9.5.0, 10.4.0, 11.3.0, 12.1.0 +- GNU C++: 9.5.0, 10.5.0, 11.4.0, 12.3.0 +- GNU Fortran: 9.5.0, 10.5.0, 11.4.0, 12.3.0 - Julia 1.9.2 - Kotlin 1.9.0-release-358 - Mono 6.12.0.200 - MSBuild 16.10.1.31701 (Mono 6.12.0.200) - Node.js 18.17.0 - Perl 5.34.0 -- Python 3.10.6 -- Python3 3.10.6 +- Python 3.10.12 - Ruby 3.0.2p107 - Swift 5.8.1 ### Package Management - cpan 1.64 - Helm 3.12.2 -- Homebrew 4.1.2 +- Homebrew 4.1.3 - Miniconda 23.5.2 - Npm 9.6.7 - NuGet 6.6.1.2 @@ -36,7 +39,7 @@ - Pip3 22.0.2 - Pipx 1.2.0 - RubyGems 3.3.5 -- Vcpkg (build from commit 8b04a7bd9) +- Vcpkg (build from commit 78b61582c) - Yarn 1.22.19 #### Environment variables @@ -61,9 +64,9 @@ to accomplish this. - Ansible 2.15.2 - apt-fast 1.9.12 - AzCopy 10.20.0 - available by `azcopy` and `azcopy10` aliases -- Bazel 6.3.0 +- Bazel 6.3.1 - Bazelisk 1.13.2 -- Bicep 0.19.5 +- Bicep 0.20.4 - Buildah 1.23.1 - CMake 3.27.1 - CodeQL Action Bundles 2.14.0 2.14.1 @@ -82,7 +85,7 @@ to accomplish this. - jq 1.6 - Kind 0.20.0 - Kubectl 1.27.4 -- Kustomize 5.1.0 +- Kustomize 5.1.1 - Leiningen 2.10.0 - MediaInfo 21.09 - Mercurial 6.1.1 @@ -94,7 +97,7 @@ to accomplish this. - Packer 1.9.2 - Parcel 2.9.3 - Podman 3.4.4 -- Pulumi 3.76.1 +- Pulumi 3.77.1 - R 4.3.1 - Skopeo 1.4.1 - Sphinx Open Source Search Server 2.2.11 @@ -105,26 +108,26 @@ to accomplish this. - zstd 1.5.5 ### CLI Tools -- Alibaba Cloud CLI 3.0.170 -- AWS CLI 2.13.5 -- AWS CLI Session Manager Plugin 1.2.463.0 +- Alibaba Cloud CLI 3.0.172 +- AWS CLI 2.13.7 +- AWS CLI Session Manager Plugin 1.2.497.0 - AWS SAM CLI 1.94.0 -- Azure CLI 2.50.0 +- Azure CLI 2.51.0 - Azure CLI (azure-devops) 0.26.0 - GitHub CLI 2.32.1 -- Google Cloud SDK 440.0.0 +- Google Cloud SDK 441.0.0 - Hub CLI 2.14.2 -- Netlify CLI 15.9.1 +- Netlify CLI 15.10.0 - OpenShift CLI 4.13.6 - ORAS CLI 1.0.0 -- Vercel CLI 31.1.1 +- Vercel CLI 31.2.2 ### Java -| Version | Vendor | Environment Variable | -| ------------------- | --------------- | -------------------- | -| 8.0.372+7 | Eclipse Temurin | JAVA_HOME_8_X64 | -| 11.0.19+7 (default) | Eclipse Temurin | JAVA_HOME_11_X64 | -| 17.0.7+7 | Eclipse Temurin | JAVA_HOME_17_X64 | +| Version | Environment Variable | +| ------------------- | -------------------- | +| 8.0.382+5 | JAVA_HOME_8_X64 | +| 11.0.20+8 (default) | JAVA_HOME_11_X64 | +| 17.0.8+7 | JAVA_HOME_17_X64 | ### PHP Tools - PHP: 8.1.2 @@ -141,9 +144,9 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Stack 2.11.1 ### Rust Tools -- Cargo 1.71.0 -- Rust 1.71.0 -- Rustdoc 1.71.0 +- Cargo 1.71.1 +- Rust 1.71.1 +- Rustdoc 1.71.1 - Rustup 1.26.0 #### Packages @@ -155,13 +158,13 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.5.2 ### Browsers and Drivers -- Google Chrome 115.0.5790.110 -- ChromeDriver 115.0.5790.102 +- Google Chrome 115.0.5790.170 +- ChromeDriver 115.0.5790.170 - Chromium 115.0.5790.0 - Microsoft Edge 115.0.1901.188 - Microsoft Edge WebDriver 115.0.1901.188 -- Selenium server 4.10.0 -- Mozilla Firefox 116.0 +- Selenium server 4.11.0 +- Mozilla Firefox 116.0.1 - Geckodriver 0.33.0 #### Environment variables @@ -204,8 +207,8 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Go - 1.18.10 -- 1.19.11 -- 1.20.6 +- 1.19.12 +- 1.20.7 #### Node.js - 14.21.3 @@ -279,15 +282,15 @@ Use the following command as a part of your job to start the service: 'sudo syst | buildpack-deps:buster | sha256:b2c2267e1944a42dcdd448b66e8c8c889a3f5d1ab9705421326077a40a8aa0bc | 2023-07-28 | | debian:10 | sha256:7cd85d3d51a435062010581f14c5e3f9428388ac7234cc9a1e23dd14d7e4e914 | 2023-07-27 | | debian:11 | sha256:630454da4c59041a2bca987a0d54c68962f1d6ea37a3641bd61db42b753234f2 | 2023-07-27 | -| moby/buildkit:latest | sha256:e70e7a9bfaeafd2cb101b050ca78e1f73032473fc0aac5b10f35c5d26df1e2c6 | 2023-07-12 | +| moby/buildkit:latest | sha256:d91fe5e6dad11f2c2cee6d268d5843ad64bf2e9852365d56b12d02f2315edce5 | 2023-08-02 | | node:14 | sha256:a158d3b9b4e3fa813fa6c8c590b8f0a860e015ad4e59bbce5744d2f6fd8461aa | 2023-04-12 | | node:14-alpine | sha256:434215b487a329c9e867202ff89e704d3a75e554822e07f3e0c0f9e606121b33 | 2023-03-29 | -| node:16 | sha256:c83c7fa87b7449675b422877f547233f3d05ac75a4363ed030fc3635dd9cc395 | 2023-07-04 | +| node:16 | sha256:6cd6581a9ae814ebbc8077afd63ecbf4d37f9b59ac9d9304a1b5a9e743ac13e0 | 2023-07-28 | | node:16-alpine | sha256:6c381d5dc2a11dcdb693f0301e8587e43f440c90cdb8933eaaaabb905d44cdb9 | 2023-06-21 | -| node:18 | sha256:5b0596963c8653bac197457d0da388ac603658011f13cb15d303a54bb83679fa | 2023-07-19 | +| node:18 | sha256:c85dc4392f44f5de1d0d72dd20a088a542734445f99bed7aa8ac895c706d370d | 2023-07-28 | | node:18-alpine | sha256:93d91deea65c9a0475507e8bc8b1917d6278522322f00c00b3ab09cab6830060 | 2023-07-19 | | ubuntu:18.04 | sha256:152dc042452c496007f07ca9127571cb9c29697f42acbfad72324b2bb2e43c98 | 2023-05-30 | -| ubuntu:20.04 | sha256:c9820a44b950956a790c354700c1166a7ec648bc0d215fa438d3a339812f1d01 | 2023-06-28 | +| ubuntu:20.04 | sha256:33a5cc25d22c45900796a1aca487ad7a7cb09f09ea00b779e3b2026b4fc2faba | 2023-08-01 | | ubuntu:22.04 | sha256:0bced47fffa3361afa981854fcabcd4577cd43cebbb808cea2b1f33a3dd7f508 | 2023-06-28 | ### Installed apt packages @@ -297,7 +300,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | aria2 | 1.36.0-1 | | autoconf | 2.71-2 | | automake | 1:1.16.5-1.3 | -| binutils | 2.38-4ubuntu2.2 | +| binutils | 2.38-4ubuntu2.3 | | bison | 2:3.8.2+dfsg-1build1 | | brotli | 1.0.9-2build6 | | bzip2 | 1.0.8-5build1 | @@ -325,7 +328,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | libc++abi-dev | 1:14.0-55\~exp2 | | libc6-dev | 2.35-0ubuntu3.1 | | libcurl4 | 7.81.0-1ubuntu1.13 | -| libgbm-dev | 22.2.5-0ubuntu0.1\~22.04.3 | +| libgbm-dev | 23.0.4-0ubuntu1\~22.04.1 | | libgconf-2-4 | 3.2.6-7ubuntu2 | | libgsl-dev | 2.7.1+dfsg-3 | | libgtk-3-0 | 3.24.33-1ubuntu2 | @@ -336,7 +339,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | libsqlite3-dev | 3.37.2-2ubuntu0.1 | | libssl-dev | 3.0.2-0ubuntu1.10 | | libtool | 2.4.6-15build2 | -| libunwind8 | 1.3.2-2build2 | +| libunwind8 | 1.3.2-2build2.1 | | libxkbfile-dev | 1:1.1.0-1build3 | | libxss1 | 1:1.2.3-1build2 | | libyaml-dev | 0.2.2-1build2 | @@ -381,3 +384,4 @@ Use the following command as a part of your job to start the service: 'sudo syst | xz-utils | 5.2.5-2ubuntu1 | | zip | 3.0-12build2 | | zsync | 0.6.2-3ubuntu1 | + From 50ff20755c52194844caa4ccacfd92152ac05664 Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Fri, 11 Aug 2023 11:47:08 +0200 Subject: [PATCH 2102/3485] [macOS] Install Google Chrome cask with default method (#8070) Reverting pretty old rework: https://github.com/actions/runner-images/pull/1861. --- images/macos/provision/core/chrome.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/macos/provision/core/chrome.sh b/images/macos/provision/core/chrome.sh index 51458aab679a..e90c37879377 100644 --- a/images/macos/provision/core/chrome.sh +++ b/images/macos/provision/core/chrome.sh @@ -3,7 +3,7 @@ source ~/utils/utils.sh arch=$(get_arch) echo "Installing Google Chrome..." -brew_cask_install_ignoring_sha256 "google-chrome" +brew install --cask google-chrome # Parse Google Chrome version FULL_CHROME_VERSION=$("/Applications/Google Chrome.app/Contents/MacOS/Google Chrome" --version) From a25fd359ca6a35b2d28abe302798adf3126cc09e Mon Sep 17 00:00:00 2001 From: sergei-pyshnoi <121864472+sergei-pyshnoi@users.noreply.github.com> Date: Fri, 11 Aug 2023 11:48:01 +0200 Subject: [PATCH 2103/3485] add go 1.21 to toolset (#8062) --- images/win/toolsets/toolset-2019.json | 3 ++- images/win/toolsets/toolset-2022.json | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index 64ef60915cd3..6e53672b6fc7 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -75,7 +75,8 @@ "versions": [ "1.18.*", "1.19.*", - "1.20.*" + "1.20.*", + "1.21.*" ], "default": "1.20.*" } diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index 5782aa3819c9..945fde6c62e2 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -69,7 +69,8 @@ "versions": [ "1.18.*", "1.19.*", - "1.20.*" + "1.20.*", + "1.21.*" ], "default": "1.20.*" } From 18c1c43509fa054a01699b2ad3bc4a523f2b5d06 Mon Sep 17 00:00:00 2001 From: sergei-pyshnoi <121864472+sergei-pyshnoi@users.noreply.github.com> Date: Fri, 11 Aug 2023 11:50:47 +0200 Subject: [PATCH 2104/3485] add go 1.21 to toolset (#8063) --- images/macos/toolsets/toolset-11.json | 3 ++- images/macos/toolsets/toolset-12.json | 3 ++- images/macos/toolsets/toolset-13.json | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index b27da27b9a84..fda5bd3766bc 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -287,7 +287,8 @@ "versions": [ "1.18.*", "1.19.*", - "1.20.*" + "1.20.*", + "1.21.*" ] } } diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index 56ebe460ccbe..6ef6bd088b2d 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -274,7 +274,8 @@ "versions": [ "1.18.*", "1.19.*", - "1.20.*" + "1.20.*", + "1.21.*" ] } } diff --git a/images/macos/toolsets/toolset-13.json b/images/macos/toolsets/toolset-13.json index a8c80dc1f862..f2b21304cc5e 100644 --- a/images/macos/toolsets/toolset-13.json +++ b/images/macos/toolsets/toolset-13.json @@ -177,7 +177,8 @@ "variable_template" : "GOROOT_{0}_{1}_X64", "versions": [ "1.19.*", - "1.20.*" + "1.20.*", + "1.21.*" ] }, "arm64": { From 48103268c5da6dfc5d3974dbaeca6546b28821f1 Mon Sep 17 00:00:00 2001 From: sergei-pyshnoi <121864472+sergei-pyshnoi@users.noreply.github.com> Date: Fri, 11 Aug 2023 11:51:11 +0200 Subject: [PATCH 2105/3485] add go 1.21 to toolset (#8064) --- images/linux/toolsets/toolset-2004.json | 3 ++- images/linux/toolsets/toolset-2204.json | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index 0fdd8b2828fa..629d766ab4b0 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -47,7 +47,8 @@ "versions": [ "1.18.*", "1.19.*", - "1.20.*" + "1.20.*", + "1.21.*" ], "default": "1.20.*" }, diff --git a/images/linux/toolsets/toolset-2204.json b/images/linux/toolsets/toolset-2204.json index 08fb0ca0af3c..9dac6a78c935 100644 --- a/images/linux/toolsets/toolset-2204.json +++ b/images/linux/toolsets/toolset-2204.json @@ -44,7 +44,8 @@ "versions": [ "1.18.*", "1.19.*", - "1.20.*" + "1.20.*", + "1.21.*" ], "default": "1.20.*" }, From 556ef3eb638f38367a1210404683709e67b072a0 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 11 Aug 2023 12:19:54 +0000 Subject: [PATCH 2106/3485] Updating readme file for macOS-11 version 20230803.1 (#8051) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-11-Readme.md | 139 ++++++++++++++++---------------- 1 file changed, 70 insertions(+), 69 deletions(-) diff --git a/images/macos/macos-11-Readme.md b/images/macos/macos-11-Readme.md index 2fe839f1b62d..8c3af4e52c8a 100644 --- a/images/macos/macos-11-Readme.md +++ b/images/macos/macos-11-Readme.md @@ -1,33 +1,33 @@ | Announcements | |-| -| [[All OSs] .NET 3.1 will be removed from the images on July, 3](https://github.com/actions/runner-images/issues/7667) | +| [[All OSes] Adopt OpenJDK will be removed from images on August, 7](https://github.com/actions/runner-images/issues/8030) | *** # macOS 11 - OS Version: macOS 11.7.8 (20G1351) - Kernel Version: Darwin 20.6.0 -- Image Version: 20230709.1 +- Image Version: 20230803.1 ## Installed Software ### Language and Runtime -- .NET Core SDK: 6.0.411, 7.0.102, 7.0.202, 7.0.305 +- .NET Core SDK: 6.0.412, 7.0.102, 7.0.202, 7.0.306 - Bash 3.2.57(1)-release - Clang/LLVM 13.0.0 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` -- GCC 10 (Homebrew GCC 10.4.0) - available by `gcc-10` alias +- GCC 10 (Homebrew GCC 10.5.0) - available by `gcc-10` alias - GCC 11 (Homebrew GCC 11.4.0) - available by `gcc-11` alias - GCC 12 (Homebrew GCC 12.3.0) - available by `gcc-12` alias -- GNU Fortran 10 (Homebrew GCC 10.4.0) - available by `gfortran-10` alias +- GNU Fortran 10 (Homebrew GCC 10.5.0) - available by `gfortran-10` alias - GNU Fortran 11 (Homebrew GCC 11.4.0) - available by `gfortran-11` alias - GNU Fortran 12 (Homebrew GCC 12.3.0) - available by `gfortran-12` alias - Julia 1.9.2 - Kotlin 1.9.0-release-358 -- Go 1.20.5 +- Go 1.20.7 - Mono 6.12.0.188 - MSBuild 16.10.1.51301 (Mono 6.12.0.188) -- Node.js 18.16.1 -- NVM 0.39.3 -- NVM - Cached node versions: 14.21.3, 16.20.1, 18.16.1 +- Node.js 18.17.0 +- NVM 0.39.4 +- NVM - Cached node versions: 14.21.3, 16.20.1, 18.17.0 - Perl 5.36.1 - PHP 8.2.8 - Python 2.7.18 @@ -36,19 +36,19 @@ - Ruby 2.7.8p225 ### Package Management -- Bundler 2.4.15 +- Bundler 2.4.18 - Carthage 0.39.0 - CocoaPods 1.12.1 - Composer 2.5.8 -- Homebrew 4.0.28 -- Miniconda 23.3.1 -- NPM 9.5.1 +- Homebrew 4.1.3 +- Miniconda 23.5.2 +- NPM 9.6.7 - NuGet 6.3.1.1 - Pip 20.3.4 (python 2.7) -- Pip3 23.1.2 (python 3.11) +- Pip3 23.2.1 (python 3.11) - Pipx 1.2.0 -- RubyGems 3.4.15 -- Vcpkg 2023 (build from commit dafef74af) +- RubyGems 3.4.18 +- Vcpkg 2023 (build from commit 1e9cf6939) - Yarn 1.22.19 #### Environment variables @@ -60,59 +60,59 @@ ### Project Management - Apache Ant 1.10.13 - Apache Maven 3.9.3 -- Gradle 8.2 -- Sbt 1.9.1 +- Gradle 8.2.1 +- Sbt 1.9.3 ### Utilities - 7-Zip 17.05 - aria2 1.36.0 -- azcopy 10.19.0 -- bazel 6.2.1 +- azcopy 10.20.0 +- bazel 6.3.1 - bazelisk 1.17.0 - bsdtar 3.3.2 - available by 'tar' alias -- Curl 8.1.2 +- Curl 8.2.1 - Git 2.41.0 -- Git LFS 3.3.0 -- GitHub CLI 2.31.0 -- GNU Tar 1.34 - available by 'gtar' alias +- Git LFS 3.4.0 +- GitHub CLI 2.32.1 +- GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.21.4 - gpg (GnuPG) 2.4.3 -- helm v3.12.1+gf32a527 +- helm v3.12.2+g1e210a2 - Hub CLI 2.14.2 -- ImageMagick 7.1.1-12 +- ImageMagick 7.1.1-15 - jq 1.6 - mongo 5.0.17 - mongod 5.0.17 - Newman 5.3.2 -- OpenSSL 1.1.1u 30 May 2023 -- Packer 1.9.1 +- OpenSSL 1.1.1v 1 Aug 2023 +- Packer 1.9.2 - pkg-config 0.29.2 - PostgreSQL 14.8 (Homebrew) - psql (PostgreSQL) 14.8 (Homebrew) - Sox 14.4.2 - Subversion (SVN) 1.14.2 - Switchaudio-osx 1.2.2 -- yq 4.34.1 +- yq 4.34.2 - zstd 1.5.5 ### Tools -- Aliyun CLI 3.0.169 -- App Center CLI 2.13.9 -- AWS CLI 2.13.0 -- AWS SAM CLI 1.90.0 +- Aliyun CLI 3.0.170 +- App Center CLI 2.14.0 +- AWS CLI 2.13.6 +- AWS SAM CLI 1.94.0 - AWS Session Manager CLI 1.2.463.0 - Azure CLI 2.50.0 - Azure CLI (azure-devops) 0.26.0 -- Bicep CLI 0.18.4 +- Bicep CLI 0.20.4 - Cabal 3.6.2.0 -- Cmake 3.26.4 -- CodeQL Action Bundles 2.13.4 2.13.5 -- Fastlane 2.213.0 +- Cmake 3.27.1 +- CodeQL Action Bundles 2.14.0 2.14.1 +- Fastlane 2.214.0 - GHC 9.6.2 - GHCup 0.1.19.4 - Jazzy 0.14.3 - Stack 2.9.3 -- SwiftFormat 0.51.12 +- SwiftFormat 0.51.13 - Swig 4.1.1 - Xcode Command Line Tools 13.2.0.0.1.1638488800 @@ -121,29 +121,30 @@ - Yamllint 1.32.0 ### Browsers -- Safari 16.5.1 (16615.2.9.11.7) -- SafariDriver 16.5.1 (16615.2.9.11.7) -- Google Chrome 114.0.5735.198 -- ChromeDriver 114.0.5735.90 -- Microsoft Edge 114.0.1823.67 -- Microsoft Edge WebDriver 114.0.1823.67 -- Mozilla Firefox 115.0.1 +- Safari 16.5.2 (16615.2.9.101.1) +- SafariDriver 16.5.2 (16615.2.9.101.1) +- Google Chrome 115.0.5790.170 +- Google Chrome for Testing 115.0.5790.170 +- ChromeDriver 115.0.5790.170 +- Microsoft Edge 115.0.1901.188 +- Microsoft Edge WebDriver 115.0.1901.188 +- Mozilla Firefox 116.0 - geckodriver 0.33.0 - Selenium server 4.10.0 #### Environment variables -| Name | Value | -| --------------- | ---------------------------------------------- | -| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/114.0.5735.90 | -| EDGEWEBDRIVER | /usr/local/share/edge_driver | -| GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | +| Name | Value | +| --------------- | ------------------------------------- | +| CHROMEWEBDRIVER | /usr/local/share/chromedriver-mac-x64 | +| EDGEWEBDRIVER | /usr/local/share/edge_driver | +| GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | ### Java -| Version | Vendor | Environment Variable | -| ------------------- | --------------- | -------------------- | -| 8.0.372+7 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | -| 11.0.19+7 | Eclipse Temurin | JAVA_HOME_11_X64 | -| 17.0.7+7 | Eclipse Temurin | JAVA_HOME_17_X64 | +| Version | Environment Variable | +| ------------------- | -------------------- | +| 8.0.382+5 (default) | JAVA_HOME_8_X64 | +| 11.0.20+8 | JAVA_HOME_11_X64 | +| 17.0.8+7 | JAVA_HOME_17_X64 | ### Cached Tools @@ -171,17 +172,17 @@ #### Node.js - 14.21.3 - 16.20.1 -- 18.16.1 +- 18.17.0 #### Go - 1.18.10 -- 1.19.10 -- 1.20.5 +- 1.19.12 +- 1.20.7 ### Rust Tools -- Cargo 1.70.0 -- Rust 1.70.0 -- Rustdoc 1.70.0 +- Cargo 1.71.1 +- Rust 1.71.1 +- Rustdoc 1.71.1 - Rustup 1.26.0 #### Packages @@ -189,14 +190,14 @@ - Cargo-audit 0.17.6 - Cargo-outdated 0.13.1 - Cbindgen 0.24.5 -- Clippy 0.1.70 +- Clippy 0.1.71 - Rustfmt 1.5.2-stable ### PowerShell Tools -- PowerShell 7.2.12 +- PowerShell 7.2.13 #### PowerShell Modules -- Az: 10.1.0 +- Az: 10.2.0 - MarkdownPS: 1.9 - Pester: 5.5.0 - PSScriptAnalyzer: 1.21.0 @@ -210,10 +211,10 @@ ### Xamarin #### Visual Studio for Mac -| Version | Build | Path | -| -------------- | ----------- | ------------------------------------ | -| 2019 | 8.10.25.2 | /Applications/Visual Studio 2019.app | -| 2022 (default) | 17.6.0.1575 | /Applications/Visual Studio.app | +| Version | Build | Path | +| -------------- | ---------- | ------------------------------------ | +| 2019 | 8.10.25.2 | /Applications/Visual Studio 2019.app | +| 2022 (default) | 17.6.2.405 | /Applications/Visual Studio.app | ##### Notes ``` @@ -332,7 +333,7 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" | Android Emulator | 32.1.14 | | Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | | Android SDK Platforms | android-34 (rev 1)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | -| Android SDK Platform-Tools | 34.0.3 | +| Android SDK Platform-Tools | 34.0.4 | | Android Support Repository | 47.0.0 | | CMake | 3.10.2<br>3.18.1<br>3.22.1 | | Google Play services | 49 | From d2c69950cef29860f5802e8aae10b4b1efbf909d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 11 Aug 2023 12:26:54 +0000 Subject: [PATCH 2107/3485] Updating readme file for win22 version 20230804.1.1 (#8048) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2022-Readme.md | 61 +++++++++++++++++--------------- 1 file changed, 33 insertions(+), 28 deletions(-) diff --git a/images/win/Windows2022-Readme.md b/images/win/Windows2022-Readme.md index 85b5636517ef..611f844a8866 100644 --- a/images/win/Windows2022-Readme.md +++ b/images/win/Windows2022-Readme.md @@ -1,6 +1,10 @@ +| Announcements | +|-| +| [[All OSes] Adopt OpenJDK will be removed from images on August, 7](https://github.com/actions/runner-images/issues/8030) | +*** # Windows Server 2022 - OS Version: 10.0.20348 Build 1850 -- Image Version: 20230730.1.0 +- Image Version: 20230804.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -9,13 +13,13 @@ ### Language and Runtime - Bash 5.2.15(1)-release -- Go 1.20.6 +- Go 1.20.7 - Julia 1.9.2 - Kotlin 1.9.0 - LLVM 15.0.7 - Node 18.17.0 - Perl 5.32.1 -- PHP 8.2.8 +- PHP 8.2.9 - Python 3.9.13 - Ruby 3.0.6p216 @@ -29,7 +33,7 @@ - pip 23.2.1 (python 3.9) - Pipx 1.2.0 - RubyGems 3.2.33 -- Vcpkg (build from commit 8b04a7bd9) +- Vcpkg (build from commit 78b61582c) - Yarn 1.22.19 #### Environment variables @@ -48,9 +52,9 @@ - 7zip 23.01 - aria2 1.36.0 - azcopy 10.20.0 -- Bazel 6.3.0 +- Bazel 6.3.1 - Bazelisk 1.13.2 -- Bicep 0.19.5 +- Bicep 0.20.4 - Cabal 3.10.1.0 - CMake 3.27.1 - CodeQL Action Bundles 2.14.0 2.14.1 @@ -61,7 +65,7 @@ - ghc 9.6.2 - Git 2.41.0.windows.3 - Git LFS 3.3.0 -- ImageMagick 7.1.1-14 +- ImageMagick 7.1.1-15 - InnoSetup 6.2.2 - jq 1.6 - Kind 0.20.0 @@ -70,7 +74,7 @@ - Mingw-w64 11.2.0 - Newman 5.3.2 - NSIS 3.08 -- OpenSSL 1.1.1u +- OpenSSL 1.1.1v - Packer 1.9.2 - Pulumi 3.76.1 - R 4.3.1 @@ -85,19 +89,19 @@ - zstd 1.5.5 ### CLI Tools -- Alibaba Cloud CLI 3.0.170 -- AWS CLI 2.13.4 +- Alibaba Cloud CLI 3.0.172 +- AWS CLI 2.13.6 - AWS SAM CLI 1.94.0 -- AWS Session Manager CLI 1.2.463.0 -- Azure CLI 2.50.0 +- AWS Session Manager CLI 1.2.497.0 +- Azure CLI 2.51.0 - Azure DevOps CLI extension 0.26.0 - GitHub CLI 2.32.1 - Hub CLI 2.14.2 ### Rust Tools -- Cargo 1.71.0 -- Rust 1.71.0 -- Rustdoc 1.71.0 +- Cargo 1.71.1 +- Rust 1.71.1 +- Rustdoc 1.71.1 - Rustup 1.26.0 #### Packages @@ -109,14 +113,14 @@ - Rustfmt 1.5.2 ### Browsers and Drivers -- Google Chrome 115.0.5790.110 -- Chrome Driver 115.0.5790.102 +- Google Chrome 115.0.5790.171 +- Chrome Driver 115.0.5790.170 - Microsoft Edge 115.0.1901.188 - Microsoft Edge Driver 115.0.1901.188 -- Mozilla Firefox 115.0.3 +- Mozilla Firefox 116.0.1 - Gecko Driver 0.33.0 -- IE Driver 4.10.0.0 -- Selenium server 4.10.0 +- IE Driver 4.11.0.0 +- Selenium server 4.11.0 #### Environment variables | Name | Value | @@ -127,11 +131,11 @@ | SELENIUM_JAR_PATH | C:\selenium\selenium-server.jar | ### Java -| Version | Vendor | Environment Variable | -| ------------------- | --------------- | -------------------- | -| 8.0.382+5 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | -| 11.0.20+8 | Eclipse Temurin | JAVA_HOME_11_X64 | -| 17.0.8+7 | Eclipse Temurin | JAVA_HOME_17_X64 | +| Version | Environment Variable | +| ------------------- | -------------------- | +| 8.0.382+5 (default) | JAVA_HOME_8_X64 | +| 11.0.20+8 | JAVA_HOME_11_X64 | +| 17.0.8+7 | JAVA_HOME_17_X64 | ### Shells | Name | Target | @@ -154,8 +158,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Go - 1.18.10 -- 1.19.11 -- 1.20.6 +- 1.19.12 +- 1.20.7 #### Node.js - 14.21.3 @@ -561,7 +565,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Az (Cached): 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.382 +- AWSPowershell: 4.1.386 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 - Microsoft.Graph: 2.2.0 @@ -610,3 +614,4 @@ All other versions are saved but not installed. | mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:fb90325630afd46ff0ad5e39c2b34a9cdc1b5cfca4cbb84b13f13f6080306afb | 2023-07-11 | | mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:0e847c01d2565d9abba138dd6bd1eaf5e8c6076d43ecfaff50e94f142899b9f1 | 2023-07-07 | | mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:7c07bd85c69a70b536ff05c59f49c1e308bf704906e59825d1a30e0cee86a84a | 2023-07-07 | + From 7fa63e2b95b104d0a626378e744c575937883c99 Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Fri, 11 Aug 2023 14:30:33 +0200 Subject: [PATCH 2108/3485] [ubuntu] Update apt sources (#8075) --- images/linux/scripts/base/apt-ubuntu-archive.sh | 15 +++++++++------ images/linux/ubuntu2004.json | 4 ++-- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/images/linux/scripts/base/apt-ubuntu-archive.sh b/images/linux/scripts/base/apt-ubuntu-archive.sh index 3a47d5b0012d..db4445228f99 100644 --- a/images/linux/scripts/base/apt-ubuntu-archive.sh +++ b/images/linux/scripts/base/apt-ubuntu-archive.sh @@ -1,12 +1,15 @@ #!/bin/bash -e ################################################################################ ## File: apt-ubuntu-archive.sh -## Desc: Script for adding additional apt repo to /etc/apt/sources.list and /etc/cloud/templates/sources.list.ubuntu.tmpl +## Desc: Script for configuring apt sources. https://manpages.ubuntu.com/manpages/jammy/en/man1/apt-transport-mirror.1.html ################################################################################ -echo "deb http://archive.ubuntu.com/ubuntu/ $(lsb_release -cs) main restricted" | tee -a /etc/apt/sources.list /etc/cloud/templates/sources.list.ubuntu.tmpl -echo "deb http://archive.ubuntu.com/ubuntu/ $(lsb_release -cs)-updates main restricted" | tee -a /etc/apt/sources.list /etc/cloud/templates/sources.list.ubuntu.tmpl +touch /etc/apt/apt-mirrors.txt -echo "deb http://security.ubuntu.com/ubuntu/ $(lsb_release -cs)-security main restricted" | tee -a /etc/apt/sources.list /etc/cloud/templates/sources.list.ubuntu.tmpl -echo "deb http://security.ubuntu.com/ubuntu/ $(lsb_release -cs)-security universe" | tee -a /etc/apt/sources.list /etc/cloud/templates/sources.list.ubuntu.tmpl -echo "deb http://security.ubuntu.com/ubuntu/ $(lsb_release -cs)-security multiverse" | tee -a /etc/apt/sources.list /etc/cloud/templates/sources.list.ubuntu.tmpl +printf "http://azure.archive.ubuntu.com/ubuntu/\tpriority:1\n" | tee -a /etc/apt/apt-mirrors.txt +printf "http://archive.ubuntu.com/ubuntu/\tpriority:2\n" | tee -a /etc/apt/apt-mirrors.txt +printf "http://security.ubuntu.com/ubuntu/\tpriority:3\n" | tee -a /etc/apt/apt-mirrors.txt + +sed -i 's/http:\/\/azure.archive.ubuntu.com\/ubuntu\//mirror+file:\/etc\/apt\/apt-mirrors.txt/' /etc/apt/sources.list + +cp -f /etc/apt/sources.list /etc/cloud/templates/sources.list.ubuntu.tmpl \ No newline at end of file diff --git a/images/linux/ubuntu2004.json b/images/linux/ubuntu2004.json index e89da3bb72cb..bfe69eaac44c 100644 --- a/images/linux/ubuntu2004.json +++ b/images/linux/ubuntu2004.json @@ -84,7 +84,7 @@ }, { "type": "shell", - "script": "{{template_dir}}/scripts/base/apt.sh", + "script": "{{template_dir}}/scripts/base/apt-ubuntu-archive.sh", "environment_vars": [ "DEBIAN_FRONTEND=noninteractive" ], @@ -92,7 +92,7 @@ }, { "type": "shell", - "script": "{{template_dir}}/scripts/base/apt-ubuntu-archive.sh", + "script": "{{template_dir}}/scripts/base/apt.sh", "environment_vars": [ "DEBIAN_FRONTEND=noninteractive" ], From 5fca0f3f62f8049ebc802571d0eae46016831bc1 Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Fri, 11 Aug 2023 14:31:07 +0200 Subject: [PATCH 2109/3485] Rewrite helper script for image generation (#8065) --- docs/create-image-and-azure-resources.md | 14 - helpers/GenerateResourcesAndImage.ps1 | 448 +++++++++++++---------- 2 files changed, 264 insertions(+), 198 deletions(-) diff --git a/docs/create-image-and-azure-resources.md b/docs/create-image-and-azure-resources.md index bbbd23402b1a..83a6baa431bd 100644 --- a/docs/create-image-and-azure-resources.md +++ b/docs/create-image-and-azure-resources.md @@ -56,14 +56,6 @@ In any case you will need these software installed: Start-Process msiexec.exe -Wait -ArgumentList '/I AzureCLI.msi /quiet'; rm .\AzureCLI.msi ``` -- [Az Powershell module](https://docs.microsoft.com/en-us/powershell/azure/install-az-ps). - - Run this command in Powershell: - - ```powershell - Install-Module -Name Az -Repository PSGallery -Force - ``` - ## Automated image generation This repo bundles script that automates image generation process. @@ -85,11 +77,6 @@ Then import [GenerateResourcesAndImage](../helpers/GenerateResourcesAndImage.ps1 Import-Module .\helpers\GenerateResourcesAndImage.ps1 ``` -> :warning: When running `GenerateResourcesAndImage` in PowerShell 7.3, following command should be executed first: -> ```powershell -> $PSNativeCommandArgumentPassing = 'Legacy' -> ``` - Finally, run `GenerateResourcesAndImage` function setting mandatory arguments: image type and where to create resources: - `SubscriptionId` - your Azure Subscription ID @@ -275,4 +262,3 @@ The scripts are copied to the VHD during the image generation process to the fol - **InternetExplorerConfiguration** - turns off the Internet Explorer Enhanced Security feature - **Msys2FirstLaunch.ps1** - initializes bash user profile in MSYS2 - **VSConfiguration.ps1** - performs initial Visual Studio configuration - diff --git a/helpers/GenerateResourcesAndImage.ps1 b/helpers/GenerateResourcesAndImage.ps1 index 326e18471047..1a1765825f50 100644 --- a/helpers/GenerateResourcesAndImage.ps1 +++ b/helpers/GenerateResourcesAndImage.ps1 @@ -1,10 +1,10 @@ $ErrorActionPreference = 'Stop' enum ImageType { - Windows2019 = 1 - Windows2022 = 2 - Ubuntu2004 = 3 - Ubuntu2204 = 4 + Windows2019 = 1 + Windows2022 = 2 + Ubuntu2004 = 3 + Ubuntu2204 = 4 UbuntuMinimal = 5 } @@ -38,55 +38,78 @@ Function Get-PackerTemplatePath { $imageTemplatePath = [IO.Path]::Combine($RepositoryRoot, "images", $relativeTemplatePath) if (-not (Test-Path $imageTemplatePath)) { - throw "Template for image '$ImageType' doesn't exist on path '$imageTemplatePath'" + throw "Template for image '$ImageType' doesn't exist on path '$imageTemplatePath'." } return $imageTemplatePath; } -Function Get-LatestCommit { +Function Show-LatestCommit { [CmdletBinding()] param() process { - Write-Host "Latest commit:" - git --no-pager log --pretty=format:"Date: %cd; Commit: %H - %s; Author: %an <%ae>" -1 + $latestCommit = (git --no-pager log --pretty=format:"Date: %cd; Commit: %H - %s; Author: %an <%ae>" -1) + Write-Host "Latest commit: $latestCommit." } } +function Start-Sleep($seconds) { + $doneDT = (Get-Date).AddSeconds($seconds) + while ($doneDT -gt (Get-Date)) { + $secondsLeft = $doneDT.Subtract((Get-Date)).TotalSeconds + $percent = ($seconds - $secondsLeft) / $seconds * 100 + Write-Progress -Activity "Sleeping" -Status "Sleeping..." -SecondsRemaining $secondsLeft -PercentComplete $percent + [System.Threading.Thread]::Sleep(500) + } + Write-Progress -Activity "Sleeping" -Status "Sleeping..." -SecondsRemaining 0 -Completed +} + Function GenerateResourcesAndImage { <# .SYNOPSIS A helper function to help generate an image. .DESCRIPTION - Creates Azure resources and kicks off a packer image generation for the selected image type. + This function will generate the Azure resources and image for the specified image type. .PARAMETER SubscriptionId - The Azure subscription Id where resources will be created. + The Azure subscription id where the Azure resources will be created. .PARAMETER ResourceGroupName - The Azure resource group name where the Azure resources will be created. - .PARAMETER ImageGenerationRepositoryRoot - The root path of the image generation repository source. + The name of the resource group to create the Azure resources in. .PARAMETER ImageType - The type of the image being generated. Valid options are: {"Windows2019", "Windows2022", "Ubuntu2004", "Ubuntu2204", "UbuntuMinimal"}. + The type of image to generate. Valid values are: Windows2019, Windows2022, Ubuntu2004, Ubuntu2204, UbuntuMinimal. .PARAMETER AzureLocation - The location of the resources being created in Azure. For example "East US". - .PARAMETER Force - Delete the resource group if it exists without user confirmation. + The Azure location where the Azure resources will be created. For example: "East US" + .PARAMETER ImageGenerationRepositoryRoot + The root directory of the image generation repository. This is used to locate the packer template. + .PARAMETER SecondsToWaitForServicePrincipalSetup + The number of seconds to wait for the service principal to be setup. The default is 120 seconds. .PARAMETER AzureClientId - Client id needs to be provided for optional authentication via service principal. Example: "11111111-1111-1111-1111-111111111111" + The Azure client id to use to authenticate with Azure. If not specified, the current user's credentials will be used. .PARAMETER AzureClientSecret - Client secret needs to be provided for optional authentication via service principal. Example: "11111111-1111-1111-1111-111111111111" + The Azure client secret to use to authenticate with Azure. If not specified, the current user's credentials will be used. .PARAMETER AzureTenantId - Tenant needs to be provided for optional authentication via service principal. Example: "11111111-1111-1111-1111-111111111111" + The Azure tenant id to use to authenticate with Azure. If not specified, the current user's credentials will be used. .PARAMETER RestrictToAgentIpAddress If set, access to the VM used by packer to generate the image is restricted to the public IP address this script is run from. This parameter cannot be used in combination with the virtual_network_name packer parameter. + .PARAMETER Force + Delete the resource group if it exists without user confirmation. + .PARAMETER ReuseResourceGroup + Reuse the resource group if it exists without user confirmation. .PARAMETER AllowBlobPublicAccess - The Azure storage account will be created with this option. + Allow public access to the generated image blob. .PARAMETER EnableHttpsTrafficOnly - The Azure storage account will be created with this option. + Enable https traffic only for the generated image blob. .PARAMETER OnError Specify how packer handles an error during image creation. + Options: + abort - abort immediately + ask - ask user for input + cleanup - attempt to cleanup and then abort + run-cleanup-provisioner - run the cleanup provisioner and then abort + The default is 'ask'. + .PARAMETER Tags + Tags to be applied to the Azure resources created. .EXAMPLE GenerateResourcesAndImage -SubscriptionId {YourSubscriptionId} -ResourceGroupName "shsamytest1" -ImageGenerationRepositoryRoot "C:\runner-images" -ImageType Ubuntu2004 -AzureLocation "East US" #> @@ -102,7 +125,7 @@ Function GenerateResourcesAndImage { [Parameter(Mandatory = $False)] [string] $ImageGenerationRepositoryRoot = $pwd, [Parameter(Mandatory = $False)] - [int] $SecondsToWaitForServicePrincipalSetup = 30, + [int] $SecondsToWaitForServicePrincipalSetup = 120, [Parameter(Mandatory = $False)] [string] $AzureClientId, [Parameter(Mandatory = $False)] @@ -110,219 +133,276 @@ Function GenerateResourcesAndImage { [Parameter(Mandatory = $False)] [string] $AzureTenantId, [Parameter(Mandatory = $False)] - [Switch] $RestrictToAgentIpAddress, + [switch] $RestrictToAgentIpAddress, + [Parameter(Mandatory = $False)] + [switch] $Force, [Parameter(Mandatory = $False)] - [Switch] $Force, + [switch] $ReuseResourceGroup, [Parameter(Mandatory = $False)] [bool] $AllowBlobPublicAccess = $False, [Parameter(Mandatory = $False)] [bool] $EnableHttpsTrafficOnly = $False, [Parameter(Mandatory = $False)] - [ValidateSet("abort","ask","cleanup","run-cleanup-provisioner")] + [ValidateSet("abort", "ask", "cleanup", "run-cleanup-provisioner")] [string] $OnError = "ask", [Parameter(Mandatory = $False)] - [hashtable] $Tags + [hashtable] $Tags = @{} ) - try { - $builderScriptPath = Get-PackerTemplatePath -RepositoryRoot $ImageGenerationRepositoryRoot -ImageType $ImageType - $ServicePrincipalClientSecret = $env:UserName + [System.GUID]::NewGuid().ToString().ToUpper() - $InstallPassword = $env:UserName + [System.GUID]::NewGuid().ToString().ToUpper() + if ($Force -and $ReuseResourceGroup) { + throw "Force and ReuseResourceGroup cannot be used together." + } + + Show-LatestCommit -ErrorAction SilentlyContinue - if ([string]::IsNullOrEmpty($AzureClientId)) - { - Connect-AzAccount - } else { - $AzSecureSecret = ConvertTo-SecureString $AzureClientSecret -AsPlainText -Force - $AzureAppCred = New-Object System.Management.Automation.PSCredential($AzureClientId, $AzSecureSecret) - Connect-AzAccount -ServicePrincipal -Credential $AzureAppCred -Tenant $AzureTenantId - } - Set-AzContext -SubscriptionId $SubscriptionId + # Validate packer is installed + $PackerBinary = Get-Command "packer" + if (-not ($PackerBinary)) { + throw "'packer' binary is not found on PATH." + } - $alreadyExists = $true; - try { - Get-AzResourceGroup -Name $ResourceGroupName - Write-Verbose "Resource group was found, will delete and recreate it." - } - catch { - Write-Verbose "Resource group was not found, will create it." - $alreadyExists = $false; - } + # Get template path + $TemplatePath = Get-PackerTemplatePath -RepositoryRoot $ImageGenerationRepositoryRoot -ImageType $ImageType + Write-Debug "Template path: $TemplatePath." - if ($alreadyExists) { - if($Force -eq $true) { - # Cleanup the resource group if it already exitsted before - Remove-AzResourceGroup -Name $ResourceGroupName -Force - New-AzResourceGroup -Name $ResourceGroupName -Location $AzureLocation -Tag $tags + # Prepare list of allowed inbound IP addresses + if ($RestrictToAgentIpAddress) { + $AgentIp = (Invoke-RestMethod http://ipinfo.io/json).ip + if (-not $AgentIp) { + throw "Unable to determine agent IP address." + } + Write-Host "Access to packer generated VM will be restricted to agent IP Address: $AgentIp." + if ($TemplatePath.Contains("pkr.hcl")) { + if ($PSVersionTable.PSVersion.Major -eq 5) { + Write-Verbose "PowerShell 5 detected. Replacing double quotes with escaped double quotes in allowed inbound IP addresses." + $AllowedInboundIpAddresses = '[\"{0}\"]' -f $AgentIp } else { - $title = "Delete Resource Group" - $message = "The resource group you specified already exists. Do you want to clean it up?" - - $yes = New-Object System.Management.Automation.Host.ChoiceDescription "&Yes", ` - "Delete the resource group including all resources." - - $no = New-Object System.Management.Automation.Host.ChoiceDescription "&No", ` - "Keep the resource group and continue." - - $stop = New-Object System.Management.Automation.Host.ChoiceDescription "&Stop", ` - "Stop the current action." - - $options = [System.Management.Automation.Host.ChoiceDescription[]]($yes, $no, $stop) - $result = $host.ui.PromptForChoice($title, $message, $options, 0) - - switch ($result) - { - 0 { Remove-AzResourceGroup -Name $ResourceGroupName -Force; New-AzResourceGroup -Name $ResourceGroupName -Location $AzureLocation -Tag $tags } - 1 { <# Do nothing #> } - 2 { exit } - } + $AllowedInboundIpAddresses = '["{0}"]' -f $AgentIp } } else { - New-AzResourceGroup -Name $ResourceGroupName -Location $AzureLocation -Tag $tags + $AllowedInboundIpAddresses = $AgentIp } - - # This script should follow the recommended naming conventions for azure resources - $storageAccountName = if($ResourceGroupName.EndsWith("-rg")) { - $ResourceGroupName.Substring(0, $ResourceGroupName.Length -3) - } else { $ResourceGroupName } - - # Resource group names may contain special characters, that are not allowed in the storage account name - $storageAccountName = $storageAccountName.Replace("-", "").Replace("_", "").Replace("(", "").Replace(")", "").ToLower() - $storageAccountName += "001" - - - # Storage Account Name can only be 24 characters long - if ($storageAccountName.Length -gt 24){ - $storageAccountName = $storageAccountName.Substring(0, 24) + } else { + if ($TemplatePath.Contains("pkr.hcl")) { + $AllowedInboundIpAddresses = "[]" + } else { + $AllowedInboundIpAddresses = "" + } + } + Write-Debug "Allowed inbound IP addresses: $AllowedInboundIpAddresses." + + # Prepare tags + $TagsList = $Tags.GetEnumerator() | ForEach-Object { "$($_.Key)=$($_.Value)" } + Write-Debug "Tags list: $TagsList." + $TagsJson = $Tags | ConvertTo-Json -Compress + if ($PSVersionTable.PSVersion.Major -eq 5) { + Write-Verbose "PowerShell 5 detected. Replacing double quotes with escaped double quotes in tags JSON." + $TagsJson = $TagsJson -replace '"', '\"' + } + Write-Debug "Tags JSON: $TagsJson." + if ($TemplatePath.Contains(".json")) { + Write-Verbose "Injecting tags into packer template." + if ($Tags) { + $BuilderScriptPathInjected = $TemplatePath.Replace(".json", "-temp.json") + $PackerTemplateContent = Get-Content -Path $TemplatePath | ConvertFrom-Json + $PackerTemplateContent.builders | Add-Member -Name "azure_tags" -Value $Tags -MemberType NoteProperty + $PackerTemplateContent | ConvertTo-Json -Depth 3 | Out-File -Encoding Ascii $BuilderScriptPathInjected + $TemplatePath = $BuilderScriptPathInjected } + } + + $InstallPassword = $env:UserName + [System.GUID]::NewGuid().ToString().ToUpper() + + Write-Host "Validating packer template..." + & $PackerBinary validate ` + "-var=client_id=fake" ` + "-var=client_secret=fake" ` + "-var=subscription_id=$($SubscriptionId)" ` + "-var=tenant_id=fake" ` + "-var=location=$($AzureLocation)" ` + "-var=resource_group=$($ResourceGroupName)" ` + "-var=storage_account=fake" ` + "-var=install_password=$($InstallPassword)" ` + "-var=allowed_inbound_ip_addresses=$($AllowedInboundIpAddresses)" ` + "-var=azure_tags=$($TagsJson)" ` + $TemplatePath + + if ($LastExitCode -ne 0) { + throw "Packer template validation failed." + } - if ($tags) { - New-AzStorageAccount -ResourceGroupName $ResourceGroupName -AccountName $storageAccountName -Location $AzureLocation -SkuName "Standard_LRS" -AllowBlobPublicAccess $AllowBlobPublicAccess -EnableHttpsTrafficOnly $EnableHttpsTrafficOnly -MinimumTlsVersion "TLS1_2" -Tag $tags + try { + # Login to Azure subscription + if ([string]::IsNullOrEmpty($AzureClientId)) { + Write-Verbose "No AzureClientId was provided, will use interactive login." + az login --output none } else { - New-AzStorageAccount -ResourceGroupName $ResourceGroupName -AccountName $storageAccountName -Location $AzureLocation -SkuName "Standard_LRS" -AllowBlobPublicAccess $AllowBlobPublicAccess -EnableHttpsTrafficOnly $EnableHttpsTrafficOnly -MinimumTlsVersion "TLS1_2" + Write-Verbose "AzureClientId was provided, will use service principal login." + az login --service-principal --username $AzureClientId --password $AzureClientSecret --tenant $AzureTenantId --output none + } + az account set --subscription $SubscriptionId + if ($LastExitCode -ne 0) { + throw "Failed to login to Azure subscription '$SubscriptionId'." } - if ([string]::IsNullOrEmpty($AzureClientId)) { - # Interactive authentication: A service principal is created during runtime. - $spDisplayName = [System.GUID]::NewGuid().ToString().ToUpper() - $startDate = Get-Date - $endDate = $startDate.AddYears(1) + # Check resource group + $ResourceGroupExists = [System.Convert]::ToBoolean((az group exists --name $ResourceGroupName)); + if ($ResourceGroupExists) { + Write-Verbose "Resource group '$ResourceGroupName' already exists." + } - if ('Microsoft.Azure.Commands.ActiveDirectory.PSADPasswordCredential' -as [type]) { - $credentials = [Microsoft.Azure.Commands.ActiveDirectory.PSADPasswordCredential]@{ - StartDate = $startDate - EndDate = $endDate - Password = $ServicePrincipalClientSecret + # Remove resource group if it exists and we are not reusing it + if ($ResourceGroupExists -and -not $ReuseResourceGroup) { + if ($Force) { + # Delete and recreate the resource group + Write-Host "Deleting resource group '$ResourceGroupName'..." + az group delete --name $ResourceGroupName --yes --output none + if ($LastExitCode -ne 0) { + throw "Failed to delete resource group '$ResourceGroupName'." } - $sp = New-AzADServicePrincipal -DisplayName $spDisplayName -PasswordCredential $credentials - $spClientId = $sp.ApplicationId - $azRoleParam = @{ - RoleDefinitionName = "Contributor" - ServicePrincipalName = $spClientId + Write-Host "Resource group '$ResourceGroupName' was deleted." + $ResourceGroupExists = $false + } else { + # Resource group already exists, ask the user what to do + $title = "Resource group '$ResourceGroupName' already exists" + $message = "Do you want to delete the resource group and all resources in it?" + + $options = @( + [System.Management.Automation.Host.ChoiceDescription]::new("&Yes", "Delete the resource group and all resources in it."), + [System.Management.Automation.Host.ChoiceDescription]::new("&No", "Keep the resource group and continue."), + [System.Management.Automation.Host.ChoiceDescription]::new("&Abort", "Abort execution.") + ) + $result = $Host.UI.PromptForChoice($title, $message, $options, 0) + + switch ($result) { + 0 { + # Delete and recreate the resource group + Write-Host "Deleting resource group '$ResourceGroupName'..." + az group delete --name $ResourceGroupName --yes + if ($LastExitCode -ne 0) { + throw "Failed to delete resource group '$ResourceGroupName'." + } + Write-Host "Resource group '$ResourceGroupName' was deleted." + $ResourceGroupExists = $false + } + 1 { + # Keep the resource group and continue + } + 2 { + # Stop the current action + Write-Error "User stopped the action." + exit 1 + } } } + } - if ('Microsoft.Azure.PowerShell.Cmdlets.Resources.MSGraph.Models.ApiV10.MicrosoftGraphPasswordCredential' -as [type]) { - $credentials = [Microsoft.Azure.PowerShell.Cmdlets.Resources.MSGraph.Models.ApiV10.MicrosoftGraphPasswordCredential]@{ - StartDateTime = $startDate - EndDateTime = $endDate - } - $sp = New-AzADServicePrincipal -DisplayName $spDisplayName - $appCred = New-AzADAppCredential -ApplicationId $sp.AppId -PasswordCredentials $credentials - $spClientId = $sp.AppId - $azRoleParam = @{ - RoleDefinitionName = "Contributor" - PrincipalId = $sp.Id - } - $ServicePrincipalClientSecret = $appCred.SecretText + # Create resource group + if (-not $ResourceGroupExists) { + Write-Host "Creating resource group '$ResourceGroupName' in location '$AzureLocation'..." + if ($TagsList) { + az group create --name $ResourceGroupName --location $AzureLocation --tags $TagsList --query id + } else { + az group create --name $ResourceGroupName --location $AzureLocation --query id + } + if ($LastExitCode -ne 0) { + throw "Failed to create resource group '$ResourceGroupName'." } - - Start-Sleep -Seconds $SecondsToWaitForServicePrincipalSetup - New-AzRoleAssignment @azRoleParam - Start-Sleep -Seconds $SecondsToWaitForServicePrincipalSetup - $sub = Get-AzSubscription -SubscriptionId $SubscriptionId - $tenantId = $sub.TenantId - - # Remove ADPrincipal after the script completed - $isCleanupADPrincipal = $true - } else { - # Parametrized Authentication via given service principal: The service principal with the data provided via the command line - # is used for all authentication purposes. - $spClientId = $AzureClientId - $credentials = $AzureAppCred - $ServicePrincipalClientSecret = $AzureClientSecret - $tenantId = $AzureTenantId } - Get-LatestCommit -ErrorAction SilentlyContinue - - $packerBinary = Get-Command "packer" - if (-not ($packerBinary)) { - throw "'packer' binary is not found on PATH" + # Generate proper name for the storage account that follows the recommended naming conventions for azure resources + $StorageAccountName = $ResourceGroupName + if ($ResourceGroupName.EndsWith("-rg")) { + $StorageAccountName = $ResourceGroupName.Substring(0, $ResourceGroupName.Length - 3) } - - if ($RestrictToAgentIpAddress) { - $AgentIp = (Invoke-RestMethod http://ipinfo.io/json).ip - Write-Host "Restricting access to packer generated VM to agent IP Address: $AgentIp" + $StorageAccountName = $StorageAccountName.Replace("-", "").Replace("_", "").Replace("(", "").Replace(")", "").ToLower() + $StorageAccountName += "001" + if ($StorageAccountName.Length -gt 24) { + $StorageAccountName = $StorageAccountName.Substring(0, 24) + } + + try { + $StorageAccountId = (az storage account show --name $StorageAccountName --resource-group $ResourceGroupName --query id 2>$null) + $StorageAccountExists = "$StorageAccountId" -ne "" + } catch { + $StorageAccountExists = $false } - if ($builderScriptPath.Contains("pkr.hcl")) { - if ($AgentIp) { - $AgentIp = '[ \"{0}\" ]' -f $AgentIp + # Create storage account + if ($StorageAccountExists) { + Write-Verbose "Storage account '$StorageAccountName' already exists." + } else { + Write-Host "Creating storage account..." + if ($TagsList) { + az storage account create --name $StorageAccountName --resource-group $ResourceGroupName --location $AzureLocation --sku Standard_LRS --allow-blob-public-access $AllowBlobPublicAccess --https-only $EnableHttpsTrafficOnly --min-tls-version TLS1_2 --tags $TagsList --query id } else { - $AgentIp = "[]" + az storage account create --name $StorageAccountName --resource-group $ResourceGroupName --location $AzureLocation --sku Standard_LRS --allow-blob-public-access $AllowBlobPublicAccess --https-only $EnableHttpsTrafficOnly --min-tls-version TLS1_2 --query id } - if (-not $Tags) { - $Tags = @{} + if ($LastExitCode -ne 0) { + throw "Failed to create storage account '$StorageAccountName'." } } - if ($builderScriptPath.Contains(".json")) { - if ($Tags) { - $builderScriptPath_temp = $builderScriptPath.Replace(".json", "-temp.json") - $packer_script = Get-Content -Path $builderScriptPath | ConvertFrom-Json - $packer_script.builders | Add-Member -Name "azure_tags" -Value $Tags -MemberType NoteProperty - $packer_script | ConvertTo-Json -Depth 3 | Out-File -Encoding Ascii $builderScriptPath_temp - $builderScriptPath = $builderScriptPath_temp - } - } + # Create service principal + if ([string]::IsNullOrEmpty($AzureClientId)) { + Write-Host "Creating service principal for packer..." + $ADCleanupRequired = $true - $TagsJson = $Tags | ConvertTo-Json -Compress - if ($PSVersionTable.PSVersion.Major -eq 5) { - Write-Verbose "PowerShell 5 detected. Replacing double quotes with escaped double quotes in tags JSON." - $TagsJson = $TagsJson -replace '"', '\"' + $ServicePrincipalName = "packer-" + [System.GUID]::NewGuid().ToString().ToUpper() + $ServicePrincipal = az ad sp create-for-rbac --name $ServicePrincipalName --role Contributor --scopes /subscriptions/$SubscriptionId --only-show-errors | ConvertFrom-Json + if ($LastExitCode -ne 0) { + throw "Failed to create service principal '$ServicePrincipalName'." + } + + $ServicePrincipalAppId = $ServicePrincipal.appId + $ServicePrincipalPassword = $ServicePrincipal.password + $TenantId = $ServicePrincipal.tenant + + Write-Verbose "Waiting for service principal to propagate..." + Start-Sleep $SecondsToWaitForServicePrincipalSetup + Write-Host "Service principal created with id '$ServicePrincipalAppId'. It will be deleted after the build." + } else { + $ServicePrincipalAppId = $AzureClientId + $ServicePrincipalPassword = $AzureClientSecret + $TenantId = $AzureTenantId } + Write-Debug "Service principal app id: $ServicePrincipalAppId." + Write-Debug "Tenant id: $TenantId." - & $packerBinary build -on-error="$($OnError)" ` - -var "client_id=$($spClientId)" ` - -var "client_secret=$($ServicePrincipalClientSecret)" ` + & $PackerBinary build -on-error="$($OnError)" ` + -var "client_id=$($ServicePrincipalAppId)" ` + -var "client_secret=$($ServicePrincipalPassword)" ` -var "subscription_id=$($SubscriptionId)" ` - -var "tenant_id=$($tenantId)" ` + -var "tenant_id=$($TenantId)" ` -var "location=$($AzureLocation)" ` -var "resource_group=$($ResourceGroupName)" ` - -var "storage_account=$($storageAccountName)" ` + -var "storage_account=$($StorageAccountName)" ` -var "install_password=$($InstallPassword)" ` - -var "allowed_inbound_ip_addresses=$($AgentIp)" ` + -var "allowed_inbound_ip_addresses=$($AllowedInboundIpAddresses)" ` -var "azure_tags=$($TagsJson)" ` - $builderScriptPath - } - catch { + $TemplatePath + + if ($LastExitCode -ne 0) { + throw "Failed to build image." + } + } catch { Write-Error $_ - } - finally { + } finally { + Write-Verbose "`nCleaning up..." + # Remove ADServicePrincipal and ADApplication - if ($isCleanupADPrincipal) { - Write-Host "`nRemoving ${spDisplayName}/${spClientId}:" - if (Get-AzADServicePrincipal -DisplayName $spDisplayName) { - Write-Host " [+] ADServicePrincipal" - Remove-AzADServicePrincipal -DisplayName $spDisplayName -Confirm:$false + if ($ADCleanupRequired) { + Write-Host "Removing ADServicePrincipal..." + if (az ad sp show --id $ServicePrincipalAppId --query id) { + az ad sp delete --id $ServicePrincipalAppId } - if (Get-AzADApplication -DisplayName $spDisplayName) { - Write-Host " [+] ADApplication" - Remove-AzADApplication -DisplayName $spDisplayName -Confirm:$false + Write-Host "Removing ADApplication..." + if (az ad app show --id $ServicePrincipalAppId --query id) { + az ad app delete --id $ServicePrincipalAppId } } + Write-Verbose "Cleanup completed." } } From 982d4ab3ab455b248494fb4d7eae9db1b608179f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 11 Aug 2023 12:58:29 +0000 Subject: [PATCH 2110/3485] Updating readme file for macOS-12 version 20230803.1 (#8052) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-12-Readme.md | 131 ++++++++++++++++---------------- 1 file changed, 66 insertions(+), 65 deletions(-) diff --git a/images/macos/macos-12-Readme.md b/images/macos/macos-12-Readme.md index ca1537d9492a..5c0ee2198cdd 100644 --- a/images/macos/macos-12-Readme.md +++ b/images/macos/macos-12-Readme.md @@ -1,16 +1,16 @@ | Announcements | |-| -| [[All OSs] .NET 3.1 will be removed from the images on July, 3](https://github.com/actions/runner-images/issues/7667) | +| [[All OSes] Adopt OpenJDK will be removed from images on August, 7](https://github.com/actions/runner-images/issues/8030) | *** # macOS 12 - OS Version: macOS 12.6.7 (21G651) - Kernel Version: Darwin 21.6.0 -- Image Version: 20230709.1 +- Image Version: 20230803.1 ## Installed Software ### Language and Runtime -- .NET Core SDK: 6.0.411, 7.0.102, 7.0.202, 7.0.305 +- .NET Core SDK: 6.0.412, 7.0.102, 7.0.202, 7.0.306 - Bash 3.2.57(1)-release - Clang/LLVM 14.0.0 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` @@ -20,12 +20,12 @@ - GNU Fortran 12 (Homebrew GCC 12.3.0) - available by `gfortran-12` alias - Julia 1.9.2 - Kotlin 1.9.0-release-358 -- Go 1.20.5 +- Go 1.20.7 - Mono 6.12.0.188 - MSBuild 16.10.1.51301 (Mono 6.12.0.188) -- Node.js 18.16.1 -- NVM 0.39.3 -- NVM - Cached node versions: 14.21.3, 16.20.1, 18.16.1 +- Node.js 18.17.0 +- NVM 0.39.4 +- NVM - Cached node versions: 14.21.3, 16.20.1, 18.17.0 - Perl 5.36.1 - PHP 8.2.8 - Python 2.7.18 @@ -34,19 +34,19 @@ - Ruby 3.0.6p216 ### Package Management -- Bundler 2.4.15 +- Bundler 2.4.18 - Carthage 0.39.0 - CocoaPods 1.12.1 - Composer 2.5.8 -- Homebrew 4.0.28 -- Miniconda 23.3.1 -- NPM 9.5.1 +- Homebrew 4.1.3 +- Miniconda 23.5.2 +- NPM 9.6.7 - NuGet 6.3.1.1 - Pip 20.3.4 (python 2.7) -- Pip3 23.1.2 (python 3.11) +- Pip3 23.2.1 (python 3.11) - Pipx 1.2.0 -- RubyGems 3.4.15 -- Vcpkg 2023 (build from commit dafef74af) +- RubyGems 3.4.18 +- Vcpkg 2023 (build from commit 1e9cf6939) - Yarn 1.22.19 #### Environment variables @@ -58,30 +58,30 @@ ### Project Management - Apache Ant 1.10.13 - Apache Maven 3.9.3 -- Gradle 8.2 -- Sbt 1.9.1 +- Gradle 8.2.1 +- Sbt 1.9.3 ### Utilities - 7-Zip 17.05 - aria2 1.36.0 -- azcopy 10.19.0 -- bazel 6.2.1 +- azcopy 10.20.0 +- bazel 6.3.1 - bazelisk 1.17.0 - bsdtar 3.5.1 - available by 'tar' alias -- Curl 8.1.2 +- Curl 8.2.1 - Git 2.41.0 -- Git LFS 3.3.0 -- GitHub CLI 2.31.0 -- GNU Tar 1.34 - available by 'gtar' alias +- Git LFS 3.4.0 +- GitHub CLI 2.32.1 +- GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.21.4 - gpg (GnuPG) 2.4.3 - Hub CLI 2.14.2 -- ImageMagick 7.1.1-12 +- ImageMagick 7.1.1-15 - jq 1.6 - mongo 5.0.17 - mongod 5.0.17 -- OpenSSL 1.1.1u 30 May 2023 -- Packer 1.9.1 +- OpenSSL 1.1.1v 1 Aug 2023 +- Packer 1.9.2 - pkg-config 0.29.2 - PostgreSQL 14.8 (Homebrew) - psql (PostgreSQL) 14.8 (Homebrew) @@ -90,27 +90,27 @@ - Switchaudio-osx 1.2.2 - Vagrant 2.3.7 - VirtualBox 6.1.38r153438 -- yq 4.34.1 +- yq 4.34.2 - zstd 1.5.5 ### Tools -- App Center CLI 2.13.9 -- AWS CLI 2.13.0 -- AWS SAM CLI 1.90.0 +- App Center CLI 2.14.0 +- AWS CLI 2.13.6 +- AWS SAM CLI 1.94.0 - AWS Session Manager CLI 1.2.463.0 - Azure CLI 2.50.0 - Azure CLI (azure-devops) 0.26.0 -- Bicep CLI 0.18.4 +- Bicep CLI 0.20.4 - Cabal 3.6.2.0 -- Cmake 3.26.4 -- CodeQL Action Bundles 2.13.4 2.13.5 +- Cmake 3.27.1 +- CodeQL Action Bundles 2.14.0 2.14.1 - Colima 0.5.5 -- Fastlane 2.213.0 +- Fastlane 2.214.0 - GHC 9.6.2 - GHCup 0.1.19.4 - Jazzy 0.14.3 - Stack 2.9.3 -- SwiftFormat 0.51.12 +- SwiftFormat 0.51.13 - Swig 4.1.1 - Xcode Command Line Tools 14.2.0.0.1.1668646533 @@ -119,29 +119,30 @@ - Yamllint 1.32.0 ### Browsers -- Safari 16.5.1 (17615.2.9.11.7) -- SafariDriver 16.5.1 (17615.2.9.11.7) -- Google Chrome 114.0.5735.198 -- ChromeDriver 114.0.5735.90 -- Microsoft Edge 114.0.1823.67 -- Microsoft Edge WebDriver 114.0.1823.67 -- Mozilla Firefox 115.0.1 +- Safari 16.5.2 (17615.2.9.101.1) +- SafariDriver 16.5.2 (17615.2.9.101.1) +- Google Chrome 115.0.5790.170 +- Google Chrome for Testing 115.0.5790.170 +- ChromeDriver 115.0.5790.170 +- Microsoft Edge 115.0.1901.188 +- Microsoft Edge WebDriver 115.0.1901.188 +- Mozilla Firefox 116.0 - geckodriver 0.33.0 - Selenium server 4.10.0 #### Environment variables -| Name | Value | -| --------------- | ---------------------------------------------- | -| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/114.0.5735.90 | -| EDGEWEBDRIVER | /usr/local/share/edge_driver | -| GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | +| Name | Value | +| --------------- | ------------------------------------- | +| CHROMEWEBDRIVER | /usr/local/share/chromedriver-mac-x64 | +| EDGEWEBDRIVER | /usr/local/share/edge_driver | +| GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | ### Java -| Version | Vendor | Environment Variable | -| ------------------- | --------------- | -------------------- | -| 8.0.372+7 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | -| 11.0.19+7 | Eclipse Temurin | JAVA_HOME_11_X64 | -| 17.0.7+7 | Eclipse Temurin | JAVA_HOME_17_X64 | +| Version | Environment Variable | +| ------------------- | -------------------- | +| 8.0.382+5 (default) | JAVA_HOME_8_X64 | +| 11.0.20+8 | JAVA_HOME_11_X64 | +| 17.0.8+7 | JAVA_HOME_17_X64 | ### Cached Tools @@ -166,17 +167,17 @@ #### Node.js - 14.21.3 - 16.20.1 -- 18.16.1 +- 18.17.0 #### Go - 1.18.10 -- 1.19.10 -- 1.20.5 +- 1.19.12 +- 1.20.7 ### Rust Tools -- Cargo 1.70.0 -- Rust 1.70.0 -- Rustdoc 1.70.0 +- Cargo 1.71.1 +- Rust 1.71.1 +- Rustdoc 1.71.1 - Rustup 1.26.0 #### Packages @@ -184,14 +185,14 @@ - Cargo-audit 0.17.6 - Cargo-outdated 0.13.1 - Cbindgen 0.24.5 -- Clippy 0.1.70 +- Clippy 0.1.71 - Rustfmt 1.5.2-stable ### PowerShell Tools -- PowerShell 7.2.12 +- PowerShell 7.2.13 #### PowerShell Modules -- Az: 10.1.0 +- Az: 10.2.0 - MarkdownPS: 1.9 - Pester: 5.5.0 - PSScriptAnalyzer: 1.21.0 @@ -205,10 +206,10 @@ ### Xamarin #### Visual Studio for Mac -| Version | Build | Path | -| -------------- | ----------- | ------------------------------------ | -| 2019 | 8.10.25.2 | /Applications/Visual Studio 2019.app | -| 2022 (default) | 17.6.0.1575 | /Applications/Visual Studio.app | +| Version | Build | Path | +| -------------- | ---------- | ------------------------------------ | +| 2019 | 8.10.25.2 | /Applications/Visual Studio 2019.app | +| 2022 (default) | 17.6.2.405 | /Applications/Visual Studio.app | ##### Notes ``` @@ -330,7 +331,7 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" | Android Emulator | 32.1.14 | | Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | | Android SDK Platforms | android-34 (rev 1)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | -| Android SDK Platform-Tools | 34.0.3 | +| Android SDK Platform-Tools | 34.0.4 | | Android Support Repository | 47.0.0 | | CMake | 3.18.1<br>3.22.1 | | Google Play services | 49 | From 9f81916bc7fdc7170be68a746d7ec1860d5baccb Mon Sep 17 00:00:00 2001 From: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com> Date: Fri, 11 Aug 2023 17:29:06 +0200 Subject: [PATCH 2111/3485] macos-13: update XCode-15 to Beta 6 (#8076) --- images/macos/helpers/Common.Helpers.psm1 | 34 +++++++++++++++++++---- images/macos/helpers/Xcode.Installer.psm1 | 5 +--- images/macos/toolsets/toolset-13.json | 4 +-- 3 files changed, 32 insertions(+), 11 deletions(-) diff --git a/images/macos/helpers/Common.Helpers.psm1 b/images/macos/helpers/Common.Helpers.psm1 index 638899dcab61..9c8f2cacaa07 100644 --- a/images/macos/helpers/Common.Helpers.psm1 +++ b/images/macos/helpers/Common.Helpers.psm1 @@ -86,14 +86,38 @@ function Invoke-RestMethodWithRetry { function Invoke-ValidateCommand { param( [Parameter(Mandatory)] - [string]$Command + [string]$Command, + [Uint] $Timeout = 0 ) - $output = Invoke-Expression -Command $Command - if ($LASTEXITCODE -ne 0) { - throw "Command '$Command' has finished with exit code $LASTEXITCODE" + if ($Timeout -eq 0) + { + $output = Invoke-Expression -Command $Command + if ($LASTEXITCODE -ne 0) { + throw "Command '$Command' has finished with exit code $LASTEXITCODE" + } + return $output + } + else + { + $job = $command | Start-Job -ScriptBlock { + $output = Invoke-Expression -Command $input + if ($LASTEXITCODE -ne 0) { + throw 'Command failed' + } + return $output + } + $waitObject = $job | Wait-Job -Timeout $Timeout + if(-not $waitObject) + { + throw "Command '$Command' has timed out" + } + if($waitObject.State -eq 'Failed') + { + throw "Command '$Command' has failed" + } + Receive-Job -Job $job } - return $output } function Start-DownloadWithRetry { diff --git a/images/macos/helpers/Xcode.Installer.psm1 b/images/macos/helpers/Xcode.Installer.psm1 index 25eaeef1adae..69c8c33d5438 100644 --- a/images/macos/helpers/Xcode.Installer.psm1 +++ b/images/macos/helpers/Xcode.Installer.psm1 @@ -129,10 +129,7 @@ function Approve-XcodeLicense { $XcodeRootPath = Get-XcodeRootPath -Version $Version Write-Host "Approving Xcode license for '$XcodeRootPath'..." $xcodeBuildPath = Get-XcodeToolPath -XcodeRootPath $XcodeRootPath -ToolName "xcodebuild" - try { - Invoke-Expression -Command "sudo $xcodeBuildPath -license accept" 2>&1 | Out-Null - } catch { } - + Invoke-ValidateCommand -Command "sudo $xcodeBuildPath -license accept" -Timeout 15 } function Install-XcodeAdditionalPackages { diff --git a/images/macos/toolsets/toolset-13.json b/images/macos/toolsets/toolset-13.json index f2b21304cc5e..2606b4d0eddd 100644 --- a/images/macos/toolsets/toolset-13.json +++ b/images/macos/toolsets/toolset-13.json @@ -3,7 +3,7 @@ "default": "14.2", "x64": { "versions": [ - { "link": "15.0", "version": "15.0.0-Beta.5+15A5209g" }, + { "link": "15.0", "version": "15.0.0-Beta.6+15A5219j" }, { "link": "14.3.1", "version": "14.3.1+14E300c" }, { "link": "14.3", "version": "14.3.0+14E222b" }, { "link": "14.2", "version": "14.2.0+14C18" }, @@ -12,7 +12,7 @@ }, "arm64":{ "versions": [ - { "link": "15.0", "version": "15.0.0-Beta.5+15A5209g" }, + { "link": "15.0", "version": "15.0.0-Beta.6+15A5219j" }, { "link": "14.3.1", "version": "14.3.1+14E300c" }, { "link": "14.3", "version": "14.3.0+14E222b" }, { "link": "14.2", "version": "14.2.0+14C18" }, From 5487dbaad90e49ff2133842932aff9e75e0a6a8d Mon Sep 17 00:00:00 2001 From: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com> Date: Tue, 15 Aug 2023 15:23:02 +0200 Subject: [PATCH 2112/3485] use "license accept timeout" only on MacOS-13 (#8084) --- images/macos/helpers/Xcode.Installer.psm1 | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/images/macos/helpers/Xcode.Installer.psm1 b/images/macos/helpers/Xcode.Installer.psm1 index 69c8c33d5438..36aef42df260 100644 --- a/images/macos/helpers/Xcode.Installer.psm1 +++ b/images/macos/helpers/Xcode.Installer.psm1 @@ -126,10 +126,17 @@ function Approve-XcodeLicense { [string]$Version ) + $os = Get-OSVersion + $XcodeRootPath = Get-XcodeRootPath -Version $Version Write-Host "Approving Xcode license for '$XcodeRootPath'..." $xcodeBuildPath = Get-XcodeToolPath -XcodeRootPath $XcodeRootPath -ToolName "xcodebuild" - Invoke-ValidateCommand -Command "sudo $xcodeBuildPath -license accept" -Timeout 15 + + if ($os.IsVentura -or $os.IsVenturaArm64) { + Invoke-ValidateCommand -Command "sudo $xcodeBuildPath -license accept" -Timeout 15 + } else { + Invoke-ValidateCommand -Command "sudo $xcodeBuildPath -license accept" + } } function Install-XcodeAdditionalPackages { From 33f3ffd0998bc71b991b4b1ae55c43f42cba2cb9 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 15 Aug 2023 15:42:11 +0000 Subject: [PATCH 2113/3485] Updating readme file for macos-13 version 20230814.1 (#8085) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-13-Readme.md | 144 ++++++++++++++++---------------- 1 file changed, 72 insertions(+), 72 deletions(-) diff --git a/images/macos/macos-13-Readme.md b/images/macos/macos-13-Readme.md index 5bf9b5ef6576..fdf5a1dfdab4 100644 --- a/images/macos/macos-13-Readme.md +++ b/images/macos/macos-13-Readme.md @@ -1,12 +1,12 @@ # macOS 13 - OS Version: macOS 13.5 (22G74) - Kernel Version: Darwin 22.6.0 -- Image Version: 20230801.2 +- Image Version: 20230814.1 ## Installed Software ### Language and Runtime -- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306 +- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.400 - Bash 3.2.57(1)-release - Clang/LLVM 14.0.0 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` @@ -23,16 +23,16 @@ - Ruby 3.0.6p216 ### Package Management -- Bundler 2.4.17 +- Bundler 2.4.18 - Carthage 0.39.0 - CocoaPods 1.12.1 - Composer 2.5.8 -- Homebrew 4.1.3 +- Homebrew 4.1.5 - NPM 9.6.7 - Pip3 23.2.1 (python 3.11) - Pipx 1.2.0 -- RubyGems 3.4.17 -- Vcpkg 2023 (build from commit 0895a8130) +- RubyGems 3.4.18 +- Vcpkg 2023 (build from commit 0fa8459cf) - Yarn 1.22.19 ### Project Management @@ -41,8 +41,8 @@ ### Utilities - 7-Zip 17.05 - aria2 1.36.0 -- azcopy 10.20.0 -- bazel 6.3.1 +- azcopy 10.20.1 +- bazel 6.3.2 - bazelisk 1.17.0 - bsdtar 3.5.3 - available by 'tar' alias - Curl 8.2.1 @@ -53,28 +53,28 @@ - GNU Wget 1.21.4 - gpg (GnuPG) 2.4.3 - jq 1.6 -- OpenSSL 1.1.1u 30 May 2023 +- OpenSSL 1.1.1v 1 Aug 2023 - Packer 1.9.2 - pkg-config 0.29.2 - Vagrant 2.3.7 -- yq 4.34.2 +- yq 4.35.1 - zstd 1.5.5 ### Tools -- AWS CLI 2.13.5 -- AWS SAM CLI 1.94.0 +- AWS CLI 2.13.9 +- AWS SAM CLI 1.95.0 - AWS Session Manager CLI 1.2.463.0 - Azure CLI 2.50.0 - Azure CLI (azure-devops) 0.26.0 -- Bicep CLI 0.19.5 +- Bicep CLI 0.20.4 - Cabal 3.6.2.0 -- Cmake 3.27.1 -- CodeQL Action Bundles 2.14.0 2.14.1 +- Cmake 3.27.2 +- CodeQL Action Bundles 2.14.1 2.14.2 - Fastlane 2.214.0 - GHC 9.6.2 - GHCup 0.1.19.4 - Stack 2.9.3 -- SwiftFormat 0.51.13 +- SwiftFormat 0.52.0 - Xcode Command Line Tools 14.3.1.0.1.1683849156 ### Linters @@ -83,12 +83,12 @@ ### Browsers - Safari 16.6 (18615.3.12.11.2) - SafariDriver 16.6 (18615.3.12.11.2) -- Google Chrome 115.0.5790.114 -- Google Chrome for Testing 115.0.5790.102 -- ChromeDriver 115.0.5790.102 -- Microsoft Edge 115.0.1901.188 -- Microsoft Edge WebDriver 115.0.1901.188 -- Mozilla Firefox 116.0 +- Google Chrome 115.0.5790.170 +- Google Chrome for Testing 115.0.5790.170 +- ChromeDriver 115.0.5790.170 +- Microsoft Edge 115.0.1901.203 +- Microsoft Edge WebDriver 115.0.1901.203 +- Mozilla Firefox 116.0.2 - geckodriver 0.33.0 - Selenium server 4.10.0 @@ -100,11 +100,11 @@ | GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | ### Java -| Version | Vendor | Environment Variable | -| ------------------ | --------------- | -------------------- | -| 8.0.382+5 | Eclipse Temurin | JAVA_HOME_8_X64 | -| 11.0.20+8 | Eclipse Temurin | JAVA_HOME_11_X64 | -| 17.0.8+7 (default) | Eclipse Temurin | JAVA_HOME_17_X64 | +| Version | Environment Variable | +| ------------------ | -------------------- | +| 8.0.382+5 | JAVA_HOME_8_X64 | +| 11.0.20+8 | JAVA_HOME_11_X64 | +| 17.0.8+7 (default) | JAVA_HOME_17_X64 | ### Cached Tools @@ -123,19 +123,21 @@ - 3.7.13 [PyPy 7.3.9] - 3.8.16 [PyPy 7.3.11] - 3.9.17 [PyPy 7.3.12] +- 3.10.12 [PyPy 7.3.12] #### Node.js -- 16.20.1 -- 18.17.0 +- 16.20.2 +- 18.17.1 #### Go -- 1.19.11 -- 1.20.6 +- 1.19.12 +- 1.20.7 +- 1.21.0 ### Rust Tools -- Cargo 1.71.0 -- Rust 1.71.0 -- Rustdoc 1.71.0 +- Cargo 1.71.1 +- Rust 1.71.1 +- Rustdoc 1.71.1 - Rustup 1.26.0 #### Packages @@ -157,7 +159,7 @@ ### Xcode | Version | Build | Path | | -------------- | -------- | ------------------------------ | -| 15.0 (beta) | 15A5161b | /Applications/Xcode_15.0.app | +| 15.0 (beta) | 15A5219j | /Applications/Xcode_15.0.app | | 14.3.1 | 14E300c | /Applications/Xcode_14.3.1.app | | 14.3 | 14E222b | /Applications/Xcode_14.3.app | | 14.2 (default) | 14C18 | /Applications/Xcode_14.2.app | @@ -168,43 +170,41 @@ - xcversion 2.8.1 #### Installed SDKs -| SDK | SDK Name | Xcode Version | -| ------------------------------------------------------- | ----------------------------------------------- | ------------- | -| macOS 13.0 | macosx13.0 | 14.1 | -| macOS 13.1 | macosx13.1 | 14.2 | -| macOS 13.3 | macosx13.3 | 14.3, 14.3.1 | -| macOS 14.0 | macosx14.0 | 15.0 | -| iOS 16.1 | iphoneos16.1 | 14.1 | -| iOS 16.2 | iphoneos16.2 | 14.2 | -| iOS 16.4 | iphoneos16.4 | 14.3, 14.3.1 | -| iOS 17.0 | iphoneos17.0 | 15.0 | -| Simulator - iOS 16.1 | iphonesimulator16.1 | 14.1 | -| Simulator - iOS 16.2 | iphonesimulator16.2 | 14.2 | -| Simulator - iOS 16.4 | iphonesimulator16.4 | 14.3, 14.3.1 | -| Simulator - iOS 17.0 | iphonesimulator17.0 | 15.0 | -| tvOS 16.1 | appletvos16.1 | 14.1, 14.2 | -| tvOS 16.4 | appletvos16.4 | 14.3, 14.3.1 | -| tvOS 17.0 | appletvos17.0 | 15.0 | -| Simulator - tvOS 16.1 | appletvsimulator16.1 | 14.1, 14.2 | -| Simulator - tvOS 16.4 | appletvsimulator16.4 | 14.3, 14.3.1 | -| Simulator - tvOS 17.0 | appletvsimulator17.0 | 15.0 | -| watchOS 9.1 | watchos9.1 | 14.1, 14.2 | -| watchOS 9.4 | watchos9.4 | 14.3, 14.3.1 | -| watchOS 10.0 | watchos10.0 | 15.0 | -| Simulator - watchOS 9.1 | watchsimulator9.1 | 14.1, 14.2 | -| Simulator - watchOS 9.4 | watchsimulator9.4 | 14.3, 14.3.1 | -| Simulator - watchOS 10.0 | watchsimulator10.0 | 15.0 | -| visionOS 1.0 | xros1.0 | 15.0 | -| Simulator - visionOS 1.0 | xrsimulator1.0 | 15.0 | -| Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3, 14.3.1 | -| Xcode 15.0 | com.apple.dt.xcode.xros.support.internal | 15.0 | -| Xcode 15.0 | com.apple.dt.xcode.xrsimulator.support.internal | 15.0 | -| Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3, 14.3.1 | -| Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3, 14.3.1 | -| DriverKit 22.1 | driverkit22.1 | 14.1 | -| DriverKit 22.2 | driverkit22.2 | 14.2 | -| DriverKit 22.4 | driverkit22.4 | 14.3, 14.3.1 | -| DriverKit 23.0 | driverkit23.0 | 15.0 | +| SDK | SDK Name | Xcode Version | +| ------------------------------------------------------- | --------------------------------------------- | ------------- | +| macOS 13.0 | macosx13.0 | 14.1 | +| macOS 13.1 | macosx13.1 | 14.2 | +| macOS 13.3 | macosx13.3 | 14.3, 14.3.1 | +| macOS 14.0 | macosx14.0 | 15.0 | +| iOS 16.1 | iphoneos16.1 | 14.1 | +| iOS 16.2 | iphoneos16.2 | 14.2 | +| iOS 16.4 | iphoneos16.4 | 14.3, 14.3.1 | +| iOS 17.0 | iphoneos17.0 | 15.0 | +| Simulator - iOS 16.1 | iphonesimulator16.1 | 14.1 | +| Simulator - iOS 16.2 | iphonesimulator16.2 | 14.2 | +| Simulator - iOS 16.4 | iphonesimulator16.4 | 14.3, 14.3.1 | +| Simulator - iOS 17.0 | iphonesimulator17.0 | 15.0 | +| tvOS 16.1 | appletvos16.1 | 14.1, 14.2 | +| tvOS 16.4 | appletvos16.4 | 14.3, 14.3.1 | +| tvOS 17.0 | appletvos17.0 | 15.0 | +| Simulator - tvOS 16.1 | appletvsimulator16.1 | 14.1, 14.2 | +| Simulator - tvOS 16.4 | appletvsimulator16.4 | 14.3, 14.3.1 | +| Simulator - tvOS 17.0 | appletvsimulator17.0 | 15.0 | +| watchOS 9.1 | watchos9.1 | 14.1, 14.2 | +| watchOS 9.4 | watchos9.4 | 14.3, 14.3.1 | +| watchOS 10.0 | watchos10.0 | 15.0 | +| Simulator - watchOS 9.1 | watchsimulator9.1 | 14.1, 14.2 | +| Simulator - watchOS 9.4 | watchsimulator9.4 | 14.3, 14.3.1 | +| Simulator - watchOS 10.0 | watchsimulator10.0 | 15.0 | +| Simulator - visionOS 1.0 | xrsimulator1.0 | 15.0 | +| visionOS 1.0 | xros1.0 | 15.0 | +| Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3, 14.3.1 | +| Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3, 14.3.1 | +| Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3, 14.3.1 | +| DriverKit 22.1 | driverkit22.1 | 14.1 | +| DriverKit 22.2 | driverkit22.2 | 14.2 | +| DriverKit 22.4 | driverkit22.4 | 14.3, 14.3.1 | +| DriverKit 23.0 | driverkit23.0 | 15.0 | #### Installed Simulators | OS | Xcode Version | Simulators | From ff7979437754f791aeb83ff5d23725242ba785bc Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Wed, 16 Aug 2023 09:49:28 +0200 Subject: [PATCH 2114/3485] [Windows] Add Hyper-V PowerShell module (#8079) --- images/win/toolsets/toolset-2022.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index 945fde6c62e2..b93c2c719315 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -168,7 +168,8 @@ { "name": "Client-ProjFS", "optionalFeature": true }, { "name": "NET-Framework-Features", "includeAllSubFeatures": true }, { "name": "Hyper-V", "includeAllSubFeatures": true }, - { "name": "HypervisorPlatform", "optionalFeature": true } + { "name": "HypervisorPlatform", "optionalFeature": true }, + { "name": "Hyper-V-PowerShell" } ], "visualStudio": { "version" : "2022", From c64e2f53f13bf9bf2d977f9af3a5f859ae99d1bc Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Wed, 16 Aug 2023 18:22:39 +0200 Subject: [PATCH 2115/3485] [windows] Change Az Cli to x64 (#8096) --- images/win/scripts/Installers/Install-AzureCli.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/win/scripts/Installers/Install-AzureCli.ps1 b/images/win/scripts/Installers/Install-AzureCli.ps1 index 71bb8f2765d2..c76c8f5073cb 100644 --- a/images/win/scripts/Installers/Install-AzureCli.ps1 +++ b/images/win/scripts/Installers/Install-AzureCli.ps1 @@ -4,7 +4,7 @@ ################################################################################ Write-Host "Install the latest Azure CLI release" -$azCliUrl = "https://aka.ms/installazurecliwindows" +$azCliUrl = "https://aka.ms/installazurecliwindowsx64" Install-Binary -Url $azCliUrl -Name "azure-cli.msi" $azureCliExtensionPath = Join-Path $Env:CommonProgramFiles 'AzureCliExtensionDirectory' From e6705a3f9c6792d77fbc15d3876d1037b85536ba Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Wed, 16 Aug 2023 18:25:29 +0200 Subject: [PATCH 2116/3485] [ubuntu] Adjust kubectl version handling (#8098) --- images/linux/scripts/tests/Tools.Tests.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/linux/scripts/tests/Tools.Tests.ps1 b/images/linux/scripts/tests/Tools.Tests.ps1 index 4ba13faa5f5f..4fbf015ac1b2 100644 --- a/images/linux/scripts/tests/Tools.Tests.ps1 +++ b/images/linux/scripts/tests/Tools.Tests.ps1 @@ -284,7 +284,7 @@ Describe "Kubernetes tools" { } It "kubectl" { - "kubectl version" | Should -MatchCommandOutput "Client Version: version.Info" + "kubectl version" | Should -MatchCommandOutput "Client Version: v" } It "helm" { From a951af97cd23d28e517310d5cd4119b03590c73f Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Thu, 17 Aug 2023 10:12:47 +0200 Subject: [PATCH 2117/3485] [Windows] use VsixInstaller from the installer (#8103) --- .../win/scripts/ImageHelpers/InstallHelpers.ps1 | 15 ++++----------- images/win/scripts/Installers/Install-Vsix.ps1 | 3 +-- images/win/scripts/Installers/Install-WDK.ps1 | 4 +--- 3 files changed, 6 insertions(+), 16 deletions(-) diff --git a/images/win/scripts/ImageHelpers/InstallHelpers.ps1 b/images/win/scripts/ImageHelpers/InstallHelpers.ps1 index 7ee8ab94fb3b..e727de9cae56 100644 --- a/images/win/scripts/ImageHelpers/InstallHelpers.ps1 +++ b/images/win/scripts/ImageHelpers/InstallHelpers.ps1 @@ -272,8 +272,6 @@ function Install-VsixExtension [Parameter(Mandatory = $true)] [string] $Name, [string] $FilePath, - [Parameter(Mandatory = $true)] - [string] $VSversion, [int] $Retries = 20, [switch] $InstallOnly ) @@ -288,20 +286,14 @@ function Install-VsixExtension do { Write-Host "Starting Install $Name..." - $vsEdition = (Get-ToolsetContent).visualStudio.edition try { $installPath = ${env:ProgramFiles(x86)} - if (Test-IsWin22) - { - $installPath = ${env:ProgramFiles} - } - - #There are 2 types of packages at the moment - exe and vsix + # There are 2 types of packages at the moment - exe and vsix if ($Name -match "vsix") { - $process = Start-Process -FilePath "${installPath}\Microsoft Visual Studio\${VSversion}\${vsEdition}\Common7\IDE\VSIXInstaller.exe" -ArgumentList $argumentList -Wait -PassThru + $process = Start-Process -FilePath "${installPath}\Microsoft Visual Studio\Installer\resources\app\ServiceHub\Services\Microsoft.VisualStudio.Setup.Service\VSIXInstaller.exe" -ArgumentList $argumentList -Wait -PassThru } else { @@ -327,7 +319,8 @@ function Install-VsixExtension $Retries-- if ($Retries -eq 0) { Write-Host "The $Name couldn't be installed after 20 attempts." - }else { + exit 1 + } else { Write-Host "Waiting 10 seconds before retrying. Retries left: $Retries" Start-Sleep -Seconds 10 } diff --git a/images/win/scripts/Installers/Install-Vsix.ps1 b/images/win/scripts/Installers/Install-Vsix.ps1 index 5f3c2c59f40b..e9170cabcc0b 100644 --- a/images/win/scripts/Installers/Install-Vsix.ps1 +++ b/images/win/scripts/Installers/Install-Vsix.ps1 @@ -10,12 +10,11 @@ if (-not $vsixPackagesList) { exit 0 } -$vsVersion = $toolset.visualStudio.Version $vsixPackagesList | ForEach-Object { # Retrieve cdn endpoint to avoid HTTP error 429 https://github.com/actions/runner-images/issues/3074 $vsixPackage = Get-VsixExtenstionFromMarketplace -ExtensionMarketPlaceName $_ if ($vsixPackage.FileName.EndsWith(".vsix")) { - Install-VsixExtension -Url $vsixPackage.DownloadUri -Name $vsixPackage.FileName -VSversion $vsVersion + Install-VsixExtension -Url $vsixPackage.DownloadUri -Name $vsixPackage.FileName } else { $argumentList = ('/install', '/quiet', '/norestart') Install-Binary -Url $vsixPackage.DownloadUri -Name $vsixPackage.FileName -ArgumentList $argumentList diff --git a/images/win/scripts/Installers/Install-WDK.ps1 b/images/win/scripts/Installers/Install-WDK.ps1 index 6682569882f4..04c13e187fc4 100644 --- a/images/win/scripts/Installers/Install-WDK.ps1 +++ b/images/win/scripts/Installers/Install-WDK.ps1 @@ -8,12 +8,10 @@ if (Test-IsWin22) { # SDK available through Visual Studio $wdkUrl = "https://go.microsoft.com/fwlink/?linkid=2196230" $FilePath = "C:\Program Files (x86)\Windows Kits\10\Vsix\VS2022\*\WDK.vsix" - $VSver = "2022" } elseif (Test-IsWin19) { $winSdkUrl = "https://go.microsoft.com/fwlink/?linkid=2173743" $wdkUrl = "https://go.microsoft.com/fwlink/?linkid=2166289" $FilePath = "C:\Program Files (x86)\Windows Kits\10\Vsix\VS2019\WDK.vsix" - $VSver = "2019" } else { throw "Invalid version of Visual Studio is found. Either 2019 or 2022 are required" } @@ -30,6 +28,6 @@ Install-Binary -Url $wdkUrl -Name "wdksetup.exe" -ArgumentList $argumentList # Need to install the VSIX to get the build targets when running VSBuild $FilePath = Resolve-Path -Path $FilePath -Install-VsixExtension -FilePath $FilePath -Name "WDK.vsix" -VSversion $VSver -InstallOnly +Install-VsixExtension -FilePath $FilePath -Name "WDK.vsix" -InstallOnly Invoke-PesterTests -TestFile "WDK" From 5368cb6a69b66a21aba3ec718939505bd3f529f6 Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Thu, 17 Aug 2023 10:26:46 +0200 Subject: [PATCH 2118/3485] [Windows] Remove deprecated kubectl flag (#8099) --- images/win/scripts/Tests/Tools.Tests.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/win/scripts/Tests/Tools.Tests.ps1 b/images/win/scripts/Tests/Tools.Tests.ps1 index ad94ce146250..26675fed5767 100644 --- a/images/win/scripts/Tests/Tools.Tests.ps1 +++ b/images/win/scripts/Tests/Tools.Tests.ps1 @@ -95,7 +95,7 @@ Describe "KubernetesTools" { } It "kubectl" { - "kubectl version --client=true --short=true" | Should -ReturnZeroExitCode + "kubectl version --client=true" | Should -ReturnZeroExitCode } It "Helm" { From 0c0af47317c54473237050978ab91a8454b8ba53 Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Thu, 17 Aug 2023 19:06:48 +0200 Subject: [PATCH 2119/3485] [ubuntu20] Pin aliyun to 3.0.174 (#8109) --- images/linux/scripts/installers/aliyun-cli.sh | 10 +++++++++- images/linux/toolsets/toolset-2004.json | 3 +++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/images/linux/scripts/installers/aliyun-cli.sh b/images/linux/scripts/installers/aliyun-cli.sh index 63b98ecad955..756b86d39b2d 100644 --- a/images/linux/scripts/installers/aliyun-cli.sh +++ b/images/linux/scripts/installers/aliyun-cli.sh @@ -5,10 +5,18 @@ ################################################################################ # Source the helpers for use with the script +source $HELPER_SCRIPTS/os.sh source $HELPER_SCRIPTS/install.sh # Install Alibaba Cloud CLI -downloadUrl="https://aliyuncli.alicdn.com/aliyun-cli-linux-latest-amd64.tgz" +# Pin tool version on ubuntu20 due to issues with GLIBC_2.32 not available +if isUbuntu20; then + toolsetVersion=$(get_toolset_value '.aliyunCli.version') + downloadUrl="https://github.com/aliyun/aliyun-cli/releases/download/v$toolsetVersion/aliyun-cli-linux-$toolsetVersion-amd64.tgz" +else + downloadUrl="https://aliyuncli.alicdn.com/aliyun-cli-linux-latest-amd64.tgz" +fi + download_with_retries $downloadUrl "/tmp" tar xzf /tmp/aliyun-cli-linux-*-amd64.tgz mv aliyun /usr/local/bin diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index 629d766ab4b0..829b5475d217 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -361,5 +361,8 @@ }, "pwsh": { "version": "7.2" + }, + "aliyunCli": { + "version": "3.0.174" } } From d9169bba1e28bd781128a8d8cdb28d0b182db9c6 Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Fri, 18 Aug 2023 12:43:00 +0200 Subject: [PATCH 2120/3485] Try installing Google Chrome for Testing (#7997) --- .../win/scripts/Installers/Install-Chrome.ps1 | 93 ++++++------------- images/win/scripts/Tests/Browsers.Tests.ps1 | 15 +-- 2 files changed, 31 insertions(+), 77 deletions(-) diff --git a/images/win/scripts/Installers/Install-Chrome.ps1 b/images/win/scripts/Installers/Install-Chrome.ps1 index 486d4d76d570..5a4d20eb6404 100644 --- a/images/win/scripts/Installers/Install-Chrome.ps1 +++ b/images/win/scripts/Installers/Install-Chrome.ps1 @@ -3,80 +3,43 @@ ## Desc: Install Google Chrome ################################################################################ -# Download and install latest Chrome browser -$ChromeInstallerFile = "googlechromestandaloneenterprise64.msi" -$ChromeInstallerUrl = "https://dl.google.com/tag/s/dl/chrome/install/${ChromeInstallerFile}" -Install-Binary -Url $ChromeInstallerUrl -Name $ChromeInstallerFile -ArgumentList @() - -# Prepare firewall rules -Write-Host "Adding the firewall rule for Google update blocking..." -New-NetFirewallRule -DisplayName "BlockGoogleUpdate" -Direction Outbound -Action Block -Program "C:\Program Files (x86)\Google\Update\GoogleUpdate.exe" - -$GoogleSvcs = ('gupdate','gupdatem') -$GoogleSvcs | Stop-SvcWithErrHandling -StopOnError -$GoogleSvcs | Set-SvcWithErrHandling -Arguments @{StartupType = "Disabled"} - -$regGoogleUpdatePath = "HKLM:\SOFTWARE\Policies\Google\Update" -$regGoogleUpdateChrome = "HKLM:\SOFTWARE\Policies\Google\Chrome" -($regGoogleUpdatePath, $regGoogleUpdateChrome) | ForEach-Object { - New-Item -Path $_ -Force +# Get versions info +$ChromeVersionsUrl = "https://googlechromelabs.github.io/chrome-for-testing/last-known-good-versions-with-downloads.json" +$ChromeVersions = Invoke-RestMethod -Uri $ChromeVersionsUrl +$ChromeVersionInfo = $ChromeVersions.channels.Stable + +# Install Google Chrome for Testing +$ChromeVersion = $ChromeVersionInfo.version +$ChromeUrl = ($ChromeVersionInfo.downloads.chrome | Where-Object platform -eq "win64").url + +Write-Host "Installing Google Chrome for Testing version $ChromeVersion" +$ChromePath = "$($env:SystemDrive)\Program Files\Google\Chrome" +if (-not (Test-Path -Path $ChromePath)) { + New-Item -Path $ChromePath -ItemType Directory -Force } -$regGoogleParameters = @( - @{ Name = "AutoUpdateCheckPeriodMinutes"; Value = 00000000}, - @{ Name = "UpdateDefault"; Value = 00000000 }, - @{ Name = "DisableAutoUpdateChecksCheckboxValue"; Value = 00000001 }, - @{ Name = "Update{8A69D345-D564-463C-AFF1-A69D9E530F96}"; Value = 00000000 }, - @{ Path = $regGoogleUpdateChrome; Name = "DefaultBrowserSettingEnabled"; Value = 00000000 } -) +$ChromeArchivePath = Start-DownloadWithRetry -Url $ChromeUrl +Extract-7Zip -Path $ChromeArchivePath -DestinationPath $ChromePath +Rename-Item "$ChromePath\chrome-win64" "$ChromePath\Application" -$regGoogleParameters | ForEach-Object { - $Arguments = $_ - if (-not ($Arguments.Path)) - { - $Arguments.Add("Path", $regGoogleUpdatePath) - } - $Arguments.Add("Force", $true) - New-ItemProperty @Arguments -} +$chromeRegPath = "HKLM:SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\chrome.exe" +New-Item $chromeRegPath +Set-ItemProperty $chromeRegPath "(default)" "$ChromePath\Application\chrome.exe" + +# Install Chrome Driver +$ChromeDriverVersion = $ChromeVersionInfo.version +$ChromeDriverUrl = ($ChromeVersionInfo.downloads.chromedriver | Where-Object platform -eq "win64").url -# Install Chrome WebDriver -Write-Host "Install Chrome WebDriver..." +Write-Host "Installing ChromeDriver version $ChromeDriverVersion" $ChromeDriverPath = "$($env:SystemDrive)\SeleniumWebDrivers\ChromeDriver" -if (-not (Test-Path -Path $ChromeDriverPath)) -{ +if (-not (Test-Path -Path $ChromeDriverPath)) { New-Item -Path $ChromeDriverPath -ItemType Directory -Force } -Write-Host "Get the Chrome WebDriver download URL..." -$RegistryPath = "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths" -$ChromePath = (Get-ItemProperty "$RegistryPath\chrome.exe").'(default)' -[version]$ChromeVersion = [System.Diagnostics.FileVersionInfo]::GetVersionInfo($ChromePath).ProductVersion -$ChromeBuild = "$($ChromeVersion.Major).$($ChromeVersion.Minor).$($ChromeVersion.Build)" -$ChromeDriverVersionsUrl = "https://googlechromelabs.github.io/chrome-for-testing/latest-patch-versions-per-build-with-downloads.json" - -Write-Host "Chrome version is $ChromeVersion" -$ChromeDriverVersions = Invoke-RestMethod -Uri $ChromeDriverVersionsUrl -$ChromeDriverVersion = $ChromeDriverVersions.builds.$ChromeBuild - -if (-not ($ChromeDriverVersion)) { - $availableVersions = $ChromeDriverVersions.builds | Get-Member | Select-Object -ExpandProperty Name - Write-Host "Available chromedriver builds are $availableVersions" - Throw "Can't determine chromedriver version that matches chrome build $ChromeBuild" -} - -$ChromeDriverVersion.version | Out-File -FilePath "$ChromeDriverPath\versioninfo.txt" -Force; - -Write-Host "Chrome WebDriver version to install is $($ChromeDriverVersion.version)" -$ChromeDriverZipDownloadUrl = ($ChromeDriverVersion.downloads.chromedriver | Where-Object platform -eq "win64").url - -Write-Host "Download Chrome WebDriver from $ChromeDriverZipDownloadUrl..." -$ChromeDriverArchPath = Start-DownloadWithRetry -Url $ChromeDriverZipDownloadUrl - -Write-Host "Expand Chrome WebDriver archive (without using directory names)..." -Extract-7Zip -Path $ChromeDriverArchPath -DestinationPath $ChromeDriverPath -ExtractMethod "e" +$ChromeDriverVersion | Out-File -FilePath "$ChromeDriverPath\versioninfo.txt" -Force; +$ChromeDriverArchivePath = Start-DownloadWithRetry -Url $ChromeDriverUrl +Extract-7Zip -Path $ChromeDriverArchivePath -DestinationPath $ChromeDriverPath -ExtractMethod "e" -Write-Host "Setting the environment variables..." setx ChromeWebDriver "$ChromeDriverPath" /M $regEnvKey = 'HKLM:\SYSTEM\CurrentControlSet\Control\Session Manager\Environment\' diff --git a/images/win/scripts/Tests/Browsers.Tests.ps1 b/images/win/scripts/Tests/Browsers.Tests.ps1 index ba5db877abf0..1d03c7a6fc45 100644 --- a/images/win/scripts/Tests/Browsers.Tests.ps1 +++ b/images/win/scripts/Tests/Browsers.Tests.ps1 @@ -28,18 +28,9 @@ Describe "Chrome" { $versionInfo | Should -Not -BeNullOrEmpty } - It "gupdate service is stopped" { - $svc = Get-Service -Name gupdate - $svc.Status | Should -BeExactly Stopped - } - - It "gupdatem service is stopped" { - $svc = Get-Service -Name gupdatem - $svc.Status | Should -BeExactly Stopped - } - - It "BlockGoogleUpdate firewall rule exists" { - Get-NetFirewallRule -DisplayName BlockGoogleUpdate | Should -Not -BeNullOrEmpty + It "Chrome Product Name should be 'Google Chrome for Testing'" -TestCases @{chromePath = $chromePath } { + $productName = (Get-Item $chromePath).VersionInfo.ProductName + $productName | Should -BeExactly "Google Chrome for Testing" } It "<chromePath> is installed" -TestCases @{chromePath = $chromePath} { From 6adb752638f40a269a2bf0fe571c732e902c4f13 Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Fri, 18 Aug 2023 12:44:06 +0200 Subject: [PATCH 2121/3485] [Ubuntu] Make k8s tools tests consistent across OS (#8112) --- images/linux/scripts/tests/Tools.Tests.ps1 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/images/linux/scripts/tests/Tools.Tests.ps1 b/images/linux/scripts/tests/Tools.Tests.ps1 index 4fbf015ac1b2..22f677daef6b 100644 --- a/images/linux/scripts/tests/Tools.Tests.ps1 +++ b/images/linux/scripts/tests/Tools.Tests.ps1 @@ -280,19 +280,19 @@ Describe "Julia" { Describe "Kubernetes tools" { It "kind" { - "kind --version" | Should -ReturnZeroExitCode + "kind version" | Should -ReturnZeroExitCode } It "kubectl" { - "kubectl version" | Should -MatchCommandOutput "Client Version: v" + "kubectl version --client=true" | Should -MatchCommandOutput "Client Version: v" } It "helm" { - "helm version" | Should -ReturnZeroExitCode + "helm version --short" | Should -ReturnZeroExitCode } It "minikube" { - "minikube version" | Should -ReturnZeroExitCode + "minikube version --short" | Should -ReturnZeroExitCode } It "kustomize" { From 392aa0ebd4b94b92404459eeb1c0ae152a66eebe Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Fri, 18 Aug 2023 12:45:38 +0200 Subject: [PATCH 2122/3485] [Ubuntu] do not source os-release during mysql installation (#8108) --- images/linux/scripts/installers/mysql.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/images/linux/scripts/installers/mysql.sh b/images/linux/scripts/installers/mysql.sh index 893915118d0d..5e650d7e4e19 100644 --- a/images/linux/scripts/installers/mysql.sh +++ b/images/linux/scripts/installers/mysql.sh @@ -4,7 +4,6 @@ ## Desc: Installs MySQL Client ################################################################################ -source /etc/os-release source $HELPER_SCRIPTS/os.sh # Mysql setting up root password From d44b8a46e2e742af69c4955b4bba9848478f8627 Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Fri, 18 Aug 2023 23:41:11 +0200 Subject: [PATCH 2123/3485] [ubuntu] Change docker to install from official repository (#8107) --- .../SoftwareReport.Generator.ps1 | 4 +-- .../SoftwareReport/SoftwareReport.Tools.psm1 | 8 ++--- .../installers/{docker-moby.sh => docker.sh} | 33 +++++++++++-------- images/linux/ubuntu2004.json | 28 ++++++++-------- images/linux/ubuntu2204.pkr.hcl | 12 +++---- 5 files changed, 45 insertions(+), 40 deletions(-) rename images/linux/scripts/installers/{docker-moby.sh => docker.sh} (69%) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index 9923937f1d86..7d28939cdc9f 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -108,8 +108,8 @@ $tools.AddToolVersion("Docker Amazon ECR Credential Helper", $(Get-DockerAmazonE $tools.AddToolVersion("Docker Compose v1", $(Get-DockerComposeV1Version)) $tools.AddToolVersion("Docker Compose v2", $(Get-DockerComposeV2Version)) $tools.AddToolVersion("Docker-Buildx", $(Get-DockerBuildxVersion)) -$tools.AddToolVersion("Docker-Moby Client", $(Get-DockerMobyClientVersion)) -$tools.AddToolVersion("Docker-Moby Server", $(Get-DockerMobyServerVersion)) +$tools.AddToolVersion("Docker Client", $(Get-DockerClientVersion)) +$tools.AddToolVersion("Docker Server", $(Get-DockerServerVersion)) if ((Test-IsUbuntu20) -or (Test-IsUbuntu22)) { $tools.AddToolVersion("Fastlane", $(Get-FastlaneVersion)) } diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 index 120ed23277c9..9c07f38cc9f8 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 @@ -69,22 +69,22 @@ function Get-DockerComposeV1Version { } function Get-DockerComposeV2Version { - $composeVersion = docker compose version | Take-OutputPart -Part 3 + $composeVersion = docker compose version | Take-OutputPart -Part 3 | Take-OutputPart -Part 0 -Delimiter "v" return $composeVersion } -function Get-DockerMobyClientVersion { +function Get-DockerClientVersion { $dockerClientVersion = sudo docker version --format '{{.Client.Version}}' return $dockerClientVersion } -function Get-DockerMobyServerVersion { +function Get-DockerServerVersion { $dockerServerVersion = sudo docker version --format '{{.Server.Version}}' return $dockerServerVersion } function Get-DockerBuildxVersion { - $buildxVersion = docker buildx version | Take-OutputPart -Part 1 | Take-OutputPart -Part 0 -Delimiter "+" + $buildxVersion = docker buildx version | Take-OutputPart -Part 1 | Take-OutputPart -Part 0 -Delimiter "v" return $buildxVersion } diff --git a/images/linux/scripts/installers/docker-moby.sh b/images/linux/scripts/installers/docker.sh similarity index 69% rename from images/linux/scripts/installers/docker-moby.sh rename to images/linux/scripts/installers/docker.sh index 3e66905f784a..50b85c1a7c34 100644 --- a/images/linux/scripts/installers/docker-moby.sh +++ b/images/linux/scripts/installers/docker.sh @@ -1,25 +1,26 @@ #!/bin/bash -e ################################################################################ -## File: docker-moby.sh +## File: docker.sh ## Desc: Installs docker onto the image ################################################################################ # Source the helpers for use with the script +source $HELPER_SCRIPTS/os.sh source $HELPER_SCRIPTS/install.sh -# Check to see if docker is already installed -docker_package=moby -echo "Determing if Docker ($docker_package) is installed" -if ! IsPackageInstalled $docker_package; then - echo "Docker ($docker_package) was not found. Installing..." - apt-get remove -y moby-engine moby-cli - apt-get update - apt-get install -y moby-engine moby-cli - apt-get install --no-install-recommends -y moby-buildx - apt-get install -y moby-compose -else - echo "Docker ($docker_package) is already installed" -fi +repo_url="https://download.docker.com/linux/ubuntu" +gpg_key="/usr/share/keyrings/docker.gpg" +repo_path="/etc/apt/sources.list.d/docker.list" + +curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o $gpg_key +echo "deb [arch=amd64 signed-by=$gpg_key] $repo_url $(getOSVersionLabel) stable" > $repo_path +apt-get update +apt-get install --no-install-recommends docker-ce docker-ce-cli containerd.io docker-buildx-plugin + +# Install docker compose v2 from releases +URL=$(get_github_package_download_url "docker/compose" "contains(\"compose-linux-x86_64\")") +curl -fsSL $URL -o /usr/libexec/docker/cli-plugins/docker-compose +chmod +x /usr/libexec/docker/cli-plugins/docker-compose # Enable docker.service systemctl is-active --quiet docker.service || systemctl start docker.service @@ -56,6 +57,10 @@ aws_helper_url=$(curl "${authString[@]}" -fsSL $aws_latest_release_url | jq -r ' download_with_retries "$aws_helper_url" "/usr/bin" docker-credential-ecr-login chmod +x /usr/bin/docker-credential-ecr-login +# Cleanup custom repositories +rm $gpg_key +rm $repo_path + invoke_tests "Tools" "Docker" if [ "${DOCKERHUB_PULL_IMAGES:-yes}" -eq "yes" ]; then invoke_tests "Tools" "Docker images" diff --git a/images/linux/ubuntu2004.json b/images/linux/ubuntu2004.json index bfe69eaac44c..ee368db138d6 100644 --- a/images/linux/ubuntu2004.json +++ b/images/linux/ubuntu2004.json @@ -196,20 +196,6 @@ ], "execute_command": "sudo sh -c '{{ .Vars }} pwsh -f {{ .Path }}'" }, - { - "type": "shell", - "scripts": [ - "{{template_dir}}/scripts/installers/docker-compose.sh", - "{{template_dir}}/scripts/installers/docker-moby.sh" - ], - "environment_vars": [ - "HELPER_SCRIPTS={{user `helper_script_folder`}}", - "INSTALLER_SCRIPT_FOLDER={{user `installer_script_folder`}}", - "DOCKERHUB_LOGIN={{user `dockerhub_login`}}", - "DOCKERHUB_PASSWORD={{user `dockerhub_password`}}" - ], - "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" - }, { "type": "shell", "scripts": [ @@ -282,6 +268,20 @@ ], "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" }, + { + "type": "shell", + "scripts": [ + "{{template_dir}}/scripts/installers/docker-compose.sh", + "{{template_dir}}/scripts/installers/docker.sh" + ], + "environment_vars": [ + "HELPER_SCRIPTS={{user `helper_script_folder`}}", + "INSTALLER_SCRIPT_FOLDER={{user `installer_script_folder`}}", + "DOCKERHUB_LOGIN={{user `dockerhub_login`}}", + "DOCKERHUB_PASSWORD={{user `dockerhub_password`}}" + ], + "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" + }, { "type": "shell", "scripts": [ diff --git a/images/linux/ubuntu2204.pkr.hcl b/images/linux/ubuntu2204.pkr.hcl index 7225623141be..d4018a44c68d 100644 --- a/images/linux/ubuntu2204.pkr.hcl +++ b/images/linux/ubuntu2204.pkr.hcl @@ -280,12 +280,6 @@ build { scripts = ["${path.root}/scripts/installers/Install-PowerShellModules.ps1", "${path.root}/scripts/installers/Install-AzureModules.ps1"] } - provisioner "shell" { - environment_vars = ["HELPER_SCRIPTS=${var.helper_script_folder}", "INSTALLER_SCRIPT_FOLDER=${var.installer_script_folder}", "DOCKERHUB_LOGIN=${var.dockerhub_login}", "DOCKERHUB_PASSWORD=${var.dockerhub_password}"] - execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" - scripts = ["${path.root}/scripts/installers/docker-compose.sh", "${path.root}/scripts/installers/docker-moby.sh"] - } - provisioner "shell" { environment_vars = ["HELPER_SCRIPTS=${var.helper_script_folder}", "INSTALLER_SCRIPT_FOLDER=${var.installer_script_folder}", "DEBIAN_FRONTEND=noninteractive"] execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" @@ -350,6 +344,12 @@ build { ] } + provisioner "shell" { + environment_vars = ["HELPER_SCRIPTS=${var.helper_script_folder}", "INSTALLER_SCRIPT_FOLDER=${var.installer_script_folder}", "DOCKERHUB_LOGIN=${var.dockerhub_login}", "DOCKERHUB_PASSWORD=${var.dockerhub_password}"] + execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" + scripts = ["${path.root}/scripts/installers/docker-compose.sh", "${path.root}/scripts/installers/docker.sh"] + } + provisioner "shell" { environment_vars = ["HELPER_SCRIPTS=${var.helper_script_folder}", "INSTALLER_SCRIPT_FOLDER=${var.installer_script_folder}"] execute_command = "sudo sh -c '{{ .Vars }} pwsh -f {{ .Path }}'" From 01a2ae2ba85ecf8017e16e3a64c4a48ec66af6be Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 21 Aug 2023 10:59:27 +0000 Subject: [PATCH 2124/3485] Updating readme file for ubuntu20 version 20230814.1.0 (#8091) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2004-Readme.md | 85 +++++++++++++++---------------- 1 file changed, 41 insertions(+), 44 deletions(-) diff --git a/images/linux/Ubuntu2004-Readme.md b/images/linux/Ubuntu2004-Readme.md index 0e68f5764ac5..c04b063c8ba4 100644 --- a/images/linux/Ubuntu2004-Readme.md +++ b/images/linux/Ubuntu2004-Readme.md @@ -1,11 +1,7 @@ -| Announcements | -|-| -| [[All OSes] Adopt OpenJDK will be removed from images on August, 7](https://github.com/actions/runner-images/issues/8030) | -*** # Ubuntu 20.04 - OS Version: 20.04.6 LTS - Kernel Version: 5.15.0-1042-azure -- Image Version: 20230806.1.0 +- Image Version: 20230814.1.0 - Systemd version: 245.4-4ubuntu3.22 ## Installed Software @@ -24,7 +20,7 @@ - Kotlin 1.9.0-release-358 - Mono 6.12.0.200 - MSBuild 16.10.1.31701 (Mono 6.12.0.200) -- Node.js 18.17.0 +- Node.js 18.17.1 - Perl 5.30.0 - Python 3.8.10 - Ruby 2.7.0p0 @@ -32,8 +28,8 @@ ### Package Management - cpan 1.64 -- Helm 3.12.2 -- Homebrew 4.1.3 +- Helm 3.12.3 +- Homebrew 4.1.5 - Miniconda 23.5.2 - Npm 9.6.7 - NuGet 6.6.1.2 @@ -41,7 +37,7 @@ - Pip3 20.0.2 - Pipx 1.2.0 - RubyGems 3.1.2 -- Vcpkg (build from commit 78b61582c) +- Vcpkg (build from commit 5fa92f467) - Yarn 1.22.19 #### Environment variables @@ -61,20 +57,20 @@ to accomplish this. ### Project Management - Ant 1.10.7 - Gradle 8.2.1 -- Lerna 7.1.4 +- Lerna 7.1.5 - Maven 3.8.8 - Sbt 1.9.3 ### Tools - Ansible 2.13.11 - apt-fast 1.9.12 -- AzCopy 10.20.0 - available by `azcopy` and `azcopy10` aliases -- Bazel 6.3.1 +- AzCopy 10.20.1 - available by `azcopy` and `azcopy10` aliases +- Bazel 6.3.2 - Bazelisk 1.13.2 - Bicep 0.20.4 - Buildah 1.22.3 -- CMake 3.27.1 -- CodeQL Action Bundles 2.14.0 2.14.1 +- CMake 3.27.2 +- CodeQL Action Bundles 2.14.1 2.14.2 - Docker Amazon ECR Credential Helper 0.7.1 - Docker Compose v1 1.29.2 - Docker Compose v2 2.20.2+azure-1 @@ -104,30 +100,30 @@ to accomplish this. - Parcel 2.9.3 - PhantomJS 2.1.1 2.1.1 - Podman 3.4.2 -- Pulumi 3.77.1 +- Pulumi 3.78.1 - R 4.3.1 - Skopeo 1.5.0 - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 -- Terraform 1.5.4 +- Terraform 1.5.5 - yamllint 1.32.0 -- yq 4.34.2 +- yq 4.35.1 - zstd 1.5.5 ### CLI Tools - Alibaba Cloud CLI 3.0.172 -- AWS CLI 2.13.7 +- AWS CLI 2.13.9 - AWS CLI Session Manager Plugin 1.2.497.0 -- AWS SAM CLI 1.94.0 +- AWS SAM CLI 1.95.0 - Azure CLI 2.51.0 - Azure CLI (azure-devops) 0.26.0 - GitHub CLI 2.32.1 -- Google Cloud SDK 441.0.0 +- Google Cloud SDK 442.0.0 - Hub CLI 2.14.2 -- Netlify CLI 15.10.0 -- OpenShift CLI 4.13.6 -- ORAS CLI 1.0.0 -- Vercel CLI 31.2.2 +- Netlify CLI 16.0.3 +- OpenShift CLI 4.13.8 +- ORAS CLI 1.0.1 +- Vercel CLI 31.3.0 ### Java | Version | Environment Variable | @@ -137,7 +133,7 @@ to accomplish this. | 17.0.8+7 | JAVA_HOME_17_X64 | ### PHP Tools -- PHP: 7.4.33, 8.0.29, 8.1.21, 8.2.8 +- PHP: 7.4.33, 8.0.30, 8.1.22, 8.2.8 - Composer 2.5.8 - PHPUnit 8.5.33 ``` @@ -168,10 +164,10 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Google Chrome 115.0.5790.170 - ChromeDriver 115.0.5790.170 - Chromium 115.0.5790.0 -- Microsoft Edge 115.0.1901.188 -- Microsoft Edge WebDriver 115.0.1901.188 +- Microsoft Edge 115.0.1901.203 +- Microsoft Edge WebDriver 115.0.1901.203 - Selenium server 4.11.0 -- Mozilla Firefox 116.0.1 +- Mozilla Firefox 116.0.3 - Geckodriver 0.33.0 #### Environment variables @@ -183,15 +179,15 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | ### .NET Tools -- .NET Core SDK: 6.0.412, 7.0.109, 7.0.203, 7.0.306 +- .NET Core SDK: 6.0.413, 7.0.110, 7.0.203, 7.0.307, 7.0.400 - nbgv 3.6.133+2d32d93cb1 ### Databases -- MongoDB 5.0.19 +- MongoDB 5.0.20 - sqlite3 3.31.1 #### PostgreSQL -- PostgreSQL 14.8 +- PostgreSQL 14.9 ``` User: postgres PostgreSQL service is disabled by default. @@ -217,11 +213,12 @@ Use the following command as a part of your job to start the service: 'sudo syst - 1.18.10 - 1.19.12 - 1.20.7 +- 1.21.0 #### Node.js - 14.21.3 -- 16.20.1 -- 18.17.0 +- 16.20.2 +- 18.17.1 #### Python - 3.6.15 @@ -237,6 +234,7 @@ Use the following command as a part of your job to start the service: 'sudo syst - 3.7.13 [PyPy 7.3.9] - 3.8.16 [PyPy 7.3.11] - 3.9.17 [PyPy 7.3.12] +- 3.10.12 [PyPy 7.3.12] #### Ruby - 2.5.9 @@ -252,7 +250,7 @@ Use the following command as a part of your job to start the service: 'sudo syst - Az: 9.3.0 - Az (Cached): 3.1.0.zip, 4.4.0.zip, 5.9.0.zip, 6.6.0.zip, 7.5.0.zip - MarkdownPS: 1.9 -- Microsoft.Graph: 2.2.0 +- Microsoft.Graph: 2.3.0 - Pester: 5.5.0 - PSScriptAnalyzer: 1.21.0 @@ -292,9 +290,9 @@ Use the following command as a part of your job to start the service: 'sudo syst ### Cached Docker images | Repository:Tag | Digest | Created | | ----------------------- | ------------------------------------------------------------------------ | ---------- | -| alpine:3.16 | sha256:cbe5d5973103a2d03408d1689a6efde4ea4920bde9f4b51fe7872e60ce2d8e56 | 2023-06-14 | -| alpine:3.17 | sha256:e95676db9e4a4f16f6cc01a8915368f82b018cc07aba951c1bd1db586c081388 | 2023-06-14 | -| alpine:3.18 | sha256:82d1e9d7ed48a7523bdebc18cf6290bdb97b82302a8a9c27d4fe885949ea94d1 | 2023-06-14 | +| alpine:3.16 | sha256:a8cbb8c69ee71561f4b69c066bad07f7e510caaa523da26fbfc606b10bd7934b | 2023-08-07 | +| alpine:3.17 | sha256:f71a5f071694a785e064f05fed657bf8277f1b2113a8ed70c90ad486d6ee54dc | 2023-08-07 | +| alpine:3.18 | sha256:7144f7bab3d4c2648d7e59409f15ec52a18006a128c733fcff20d3a4a54ba44a | 2023-08-07 | | buildpack-deps:bullseye | sha256:593db75ce93184b16d45021566ed2d77f5009a8ce88da8254919a2e9e6ec14bf | 2023-07-28 | | buildpack-deps:buster | sha256:b2c2267e1944a42dcdd448b66e8c8c889a3f5d1ab9705421326077a40a8aa0bc | 2023-07-28 | | buildpack-deps:stretch | sha256:78e995165a5788c2f55aed6e548d8f6c1534830d4310c870408fccb2da8c5b2e | 2022-06-23 | @@ -304,10 +302,10 @@ Use the following command as a part of your job to start the service: 'sudo syst | moby/buildkit:latest | sha256:d91fe5e6dad11f2c2cee6d268d5843ad64bf2e9852365d56b12d02f2315edce5 | 2023-08-02 | | node:14 | sha256:a158d3b9b4e3fa813fa6c8c590b8f0a860e015ad4e59bbce5744d2f6fd8461aa | 2023-04-12 | | node:14-alpine | sha256:434215b487a329c9e867202ff89e704d3a75e554822e07f3e0c0f9e606121b33 | 2023-03-29 | -| node:16 | sha256:6cd6581a9ae814ebbc8077afd63ecbf4d37f9b59ac9d9304a1b5a9e743ac13e0 | 2023-07-28 | -| node:16-alpine | sha256:6c381d5dc2a11dcdb693f0301e8587e43f440c90cdb8933eaaaabb905d44cdb9 | 2023-06-21 | -| node:18 | sha256:c85dc4392f44f5de1d0d72dd20a088a542734445f99bed7aa8ac895c706d370d | 2023-07-28 | -| node:18-alpine | sha256:93d91deea65c9a0475507e8bc8b1917d6278522322f00c00b3ab09cab6830060 | 2023-07-19 | +| node:16 | sha256:8c3c7e253d9484a35ed9db3e6ba296d859a382f48602d0321e4734a91311ac95 | 2023-08-10 | +| node:16-alpine | sha256:a1f9d027912b58a7c75be7716c97cfbc6d3099f3a97ed84aa490be9dee20e787 | 2023-08-10 | +| node:18 | sha256:87b15e8e40a6b088012ca65d6685b89948ec722c1955bc0f6bbf9ad20855781a | 2023-08-10 | +| node:18-alpine | sha256:3482a20c97e401b56ac50ba8920cc7b5b2022bfc6aa7d4e4c231755770cf892f | 2023-08-10 | | ubuntu:16.04 | sha256:1f1a2d56de1d604801a9671f301190704c25d604a416f59e03c04f5c6ffee0d6 | 2021-08-31 | | ubuntu:18.04 | sha256:152dc042452c496007f07ca9127571cb9c29697f42acbfad72324b2bb2e43c98 | 2023-05-30 | | ubuntu:20.04 | sha256:33a5cc25d22c45900796a1aca487ad7a7cb09f09ea00b779e3b2026b4fc2faba | 2023-08-01 | @@ -368,7 +366,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | mercurial | 5.3.1-1ubuntu1 | | net-tools | 1.60+git20180626.aebd88e-1ubuntu1 | | netcat | 1.206-1ubuntu1 | -| openssh-client | 1:8.2p1-4ubuntu0.8 | +| openssh-client | 1:8.2p1-4ubuntu0.9 | | p7zip-full | 16.02+dfsg-7build1 | | p7zip-rar | 16.02-3build1 | | parallel | 20161222-1.1 | @@ -382,7 +380,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | shellcheck | 0.7.0-2build2 | | sphinxsearch | 2.2.11-2ubuntu2 | | sqlite3 | 3.31.1-4ubuntu0.5 | -| ssh | 1:8.2p1-4ubuntu0.8 | +| ssh | 1:8.2p1-4ubuntu0.9 | | sshpass | 1.06-1 | | subversion | 1.13.0-3ubuntu0.2 | | sudo | 1.8.31-1ubuntu1.5 | @@ -401,4 +399,3 @@ Use the following command as a part of your job to start the service: 'sudo syst | xz-utils | 5.2.4-1ubuntu1.1 | | zip | 3.0-11build1 | | zsync | 0.6.2-3ubuntu1 | - From 14fa2c5ff177d0a41a568665564118322abb8d04 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 21 Aug 2023 12:35:25 +0000 Subject: [PATCH 2125/3485] Updating readme file for win19 version 20230814.1.0 (#8095) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2019-Readme.md | 79 +++++++++++++++----------------- 1 file changed, 38 insertions(+), 41 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index 0e3017ace539..819d45692ed7 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -1,10 +1,6 @@ -| Announcements | -|-| -| [[All OSes] Adopt OpenJDK will be removed from images on August, 7](https://github.com/actions/runner-images/issues/8030) | -*** # Windows Server 2019 -- OS Version: 10.0.17763 Build 4645 -- Image Version: 20230806.1.0 +- OS Version: 10.0.17763 Build 4737 +- Image Version: 20230814.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -17,23 +13,23 @@ - Julia 1.9.2 - Kotlin 1.9.0 - LLVM 15.0.7 -- Node 18.17.0 +- Node 18.17.1 - Perl 5.32.1 - PHP 8.2.9 - Python 3.7.9 - Ruby 2.5.9p229 ### Package Management -- Chocolatey 2.2.0 +- Chocolatey 2.2.2 - Composer 2.5.8 -- Helm 3.12.1 +- Helm 3.12.2 - Miniconda 23.5.2 (pre-installed on the image but not added to PATH) - NPM 9.6.7 -- NuGet 6.6.1.2 +- NuGet 6.7.0.127 - pip 23.2.1 (python 3.7) - Pipx 1.2.0 - RubyGems 2.7.6.3 -- Vcpkg (build from commit 78b61582c) +- Vcpkg (build from commit 576f3f1ad) - Yarn 1.22.19 #### Environment variables @@ -51,21 +47,21 @@ ### Tools - 7zip 23.01 - aria2 1.36.0 -- azcopy 10.20.0 -- Bazel 6.3.1 +- azcopy 10.20.1 +- Bazel 6.3.2 - Bazelisk 1.13.2 - Bicep 0.20.4 - Cabal 3.10.1.0 -- CMake 3.27.1 -- CodeQL Action Bundles 2.14.0 2.14.1 +- CMake 3.27.2 +- CodeQL Action Bundles 2.14.1 2.14.2 - Docker 24.0.5 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.20.2 +- Docker Compose v2 2.20.3 - Docker-wincred 0.8.0 - ghc 9.6.2 - Git 2.41.0.windows.3 - Git LFS 3.3.0 -- Google Cloud SDK 441.0.0 +- Google Cloud SDK 442.0.0 - ImageMagick 7.1.1-15 - InnoSetup 6.2.2 - jq 1.6 @@ -78,7 +74,7 @@ - OpenSSL 1.1.1v - Packer 1.9.2 - Parcel 2.9.3 -- Pulumi 3.77.1 +- Pulumi 3.78.1 - R 4.3.1 - Service Fabric SDK 9.1.1436.9590 - Stack 2.11.1 @@ -92,8 +88,8 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.172 -- AWS CLI 2.13.7 -- AWS SAM CLI 1.94.0 +- AWS CLI 2.13.9 +- AWS SAM CLI 1.95.0 - AWS Session Manager CLI 1.2.497.0 - Azure CLI 2.51.0 - Azure DevOps CLI extension 0.26.0 @@ -118,9 +114,9 @@ ### Browsers and Drivers - Google Chrome 115.0.5790.171 - Chrome Driver 115.0.5790.170 -- Microsoft Edge 115.0.1901.188 -- Microsoft Edge Driver 115.0.1901.188 -- Mozilla Firefox 116.0.1 +- Microsoft Edge 115.0.1901.203 +- Microsoft Edge Driver 115.0.1901.203 +- Mozilla Firefox 116.0.2 - Gecko Driver 0.33.0 - IE Driver 4.11.0.0 - Selenium server 4.11.0 @@ -166,11 +162,12 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 1.18.10 - 1.19.12 - 1.20.7 +- 1.21.0 #### Node.js - 14.21.3 -- 16.20.1 -- 18.17.0 +- 16.20.2 +- 18.17.1 #### Python - 3.6.8 @@ -186,6 +183,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 3.7.13 [PyPy 7.3.9] - 3.8.16 [PyPy 7.3.11] - 3.9.17 [PyPy 7.3.12] +- 3.10.12 [PyPy 7.3.12] #### Ruby - 2.4.10 @@ -201,7 +199,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Property | Value | | -------------------- | ------------------------------------------------------------------------------------------------------------------------------------ | | ServiceName | postgresql-x64-14 | -| Version | 14.8 | +| Version | 14.9 | | ServiceStatus | Stopped | | ServiceStartType | Disabled | | EnvironmentVariables | PGBIN=C:\Program Files\PostgreSQL\14\bin <br> PGDATA=C:\Program Files\PostgreSQL\14\data <br> PGROOT=C:\Program Files\PostgreSQL\14 | @@ -212,7 +210,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### MongoDB | Version | ServiceName | ServiceStatus | ServiceStartType | | -------- | ----------- | ------------- | ---------------- | -| 5.0.15.0 | MongoDB | Stopped | Disabled | +| 5.0.19.0 | MongoDB | Stopped | Disabled | ### Database tools - Azure CosmosDb Emulator 2.14.12.0 @@ -230,12 +228,12 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Visual Studio Enterprise 2019 | Name | Version | Path | | ----------------------------- | --------------- | -------------------------------------------------------------- | -| Visual Studio Enterprise 2019 | 16.11.33920.266 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | +| Visual Studio Enterprise 2019 | 16.11.33927.289 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | #### Workloads, components and extensions | Package | Version | | ------------------------------------------------------------------------- | --------------- | -| Component.Android.NDK.R16B | 16.11.33919.289 | +| Component.Android.NDK.R16B | 16.11.33925.288 | | Component.Android.SDK25.Private | 16.0.28625.61 | | Component.Android.SDK30 | 16.10.31205.252 | | Component.Ant | 1.9.3.8 | @@ -493,11 +491,11 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 10.0.22621.0 ### .NET Core Tools -- .NET Core SDK: 6.0.120, 6.0.203, 6.0.315, 6.0.412 +- .NET Core SDK: 6.0.121, 6.0.203, 6.0.316, 6.0.413 - .NET Framework: 4.7.2, 4.8 -- Microsoft.AspNetCore.App: 6.0.5, 6.0.20 -- Microsoft.NETCore.App: 6.0.5, 6.0.20 -- Microsoft.WindowsDesktop.App: 6.0.5, 6.0.20 +- Microsoft.AspNetCore.App: 6.0.5, 6.0.21 +- Microsoft.NETCore.App: 6.0.5, 6.0.21 +- Microsoft.WindowsDesktop.App: 6.0.5, 6.0.21 - nbgv 3.6.133+2d32d93cb1 ### PowerShell Tools @@ -510,10 +508,10 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Az (Cached): 1.0.0.zip, 1.6.0.zip, 2.3.2.zip, 2.6.0.zip, 3.1.0.zip, 3.5.0.zip, 3.8.0.zip, 4.3.0.zip, 4.4.0.zip, 4.7.0.zip, 5.5.0.zip, 5.9.0.zip, 6.6.0.zip, 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.387 +- AWSPowershell: 4.1.392 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 -- Microsoft.Graph: 2.2.0 +- Microsoft.Graph: 2.3.0 - Pester: 3.4.0, 5.5.0 - PowerShellGet: 1.0.0.1, 2.2.5 - PSScriptAnalyzer: 1.21.0 @@ -555,9 +553,8 @@ All other versions are saved but not installed. ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:ad983ebdf56d22cb9ff0691ffcf8dc53d91452527c46f3c2011c2afaff0a0e3f | 2023-07-11 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:fd5580f420bddc5d9f9723df0006a5bb37ac0858d696d054732cc9037d1606eb | 2023-07-11 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:5ff317aa3f2f0e19610c95bae5b9ba66cbe151fdf96765399ef552fb29e03b2d | 2023-07-11 | -| mcr.microsoft.com/windows/nanoserver:1809 | sha256:184914b6008b14ddaf1f9f8944a38c0b2f5ef7e9b13c694a5913528370eed73e | 2023-07-07 | -| mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:31c6e1eb571ced8af4a543204ec1e410161677de56a6f76ce0983928b02af07c | 2023-07-07 | - +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:65945f57f4fe7da7a8fcf9f4deb406bef640d8acb4d58ed482cddb173b24b165 | 2023-08-08 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:7ec4e85a7271b680162d7643a102cae0d7c869c80992eb70416fee45fc62acc3 | 2023-08-08 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:1b3c35fc580fe7b5c837b700e336313c47b1ada0708be0b568b909a2a11efe67 | 2023-08-08 | +| mcr.microsoft.com/windows/nanoserver:1809 | sha256:8f37d0675b1526a2c1a62032ec27cc5a1c3005505c7cc1a02fbd6b17c49128e3 | 2023-08-02 | +| mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:b90fc3f0259aa56a97616946f6f5d061bd54c3d5c08d2eaff482fd56ab95a6f4 | 2023-08-02 | From 587d1e44359275bbbb28a28c76e531280fefaab4 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 21 Aug 2023 15:46:44 +0000 Subject: [PATCH 2126/3485] Updating readme file for macOS-11 version 20230812.3 (#8087) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-11-Readme.md | 56 ++++++++++++++++----------------- 1 file changed, 27 insertions(+), 29 deletions(-) diff --git a/images/macos/macos-11-Readme.md b/images/macos/macos-11-Readme.md index 8c3af4e52c8a..c85086f36238 100644 --- a/images/macos/macos-11-Readme.md +++ b/images/macos/macos-11-Readme.md @@ -1,16 +1,12 @@ -| Announcements | -|-| -| [[All OSes] Adopt OpenJDK will be removed from images on August, 7](https://github.com/actions/runner-images/issues/8030) | -*** # macOS 11 - OS Version: macOS 11.7.8 (20G1351) - Kernel Version: Darwin 20.6.0 -- Image Version: 20230803.1 +- Image Version: 20230812.3 ## Installed Software ### Language and Runtime -- .NET Core SDK: 6.0.412, 7.0.102, 7.0.202, 7.0.306 +- .NET Core SDK: 6.0.413, 7.0.102, 7.0.202, 7.0.306, 7.0.400 - Bash 3.2.57(1)-release - Clang/LLVM 13.0.0 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` @@ -25,9 +21,9 @@ - Go 1.20.7 - Mono 6.12.0.188 - MSBuild 16.10.1.51301 (Mono 6.12.0.188) -- Node.js 18.17.0 +- Node.js 18.17.1 - NVM 0.39.4 -- NVM - Cached node versions: 14.21.3, 16.20.1, 18.17.0 +- NVM - Cached node versions: 14.21.3, 16.20.2, 18.17.1 - Perl 5.36.1 - PHP 8.2.8 - Python 2.7.18 @@ -40,7 +36,7 @@ - Carthage 0.39.0 - CocoaPods 1.12.1 - Composer 2.5.8 -- Homebrew 4.1.3 +- Homebrew 4.1.4 - Miniconda 23.5.2 - NPM 9.6.7 - NuGet 6.3.1.1 @@ -48,7 +44,7 @@ - Pip3 23.2.1 (python 3.11) - Pipx 1.2.0 - RubyGems 3.4.18 -- Vcpkg 2023 (build from commit 1e9cf6939) +- Vcpkg 2023 (build from commit 0fa8459cf) - Yarn 1.22.19 #### Environment variables @@ -59,15 +55,15 @@ ### Project Management - Apache Ant 1.10.13 -- Apache Maven 3.9.3 +- Apache Maven 3.9.4 - Gradle 8.2.1 - Sbt 1.9.3 ### Utilities - 7-Zip 17.05 - aria2 1.36.0 -- azcopy 10.20.0 -- bazel 6.3.1 +- azcopy 10.20.1 +- bazel 6.3.2 - bazelisk 1.17.0 - bsdtar 3.3.2 - available by 'tar' alias - Curl 8.2.1 @@ -77,7 +73,7 @@ - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.21.4 - gpg (GnuPG) 2.4.3 -- helm v3.12.2+g1e210a2 +- helm v3.12.3+g3a31588 - Hub CLI 2.14.2 - ImageMagick 7.1.1-15 - jq 1.6 @@ -87,32 +83,32 @@ - OpenSSL 1.1.1v 1 Aug 2023 - Packer 1.9.2 - pkg-config 0.29.2 -- PostgreSQL 14.8 (Homebrew) -- psql (PostgreSQL) 14.8 (Homebrew) +- PostgreSQL 14.9 (Homebrew) +- psql (PostgreSQL) 14.9 (Homebrew) - Sox 14.4.2 - Subversion (SVN) 1.14.2 - Switchaudio-osx 1.2.2 -- yq 4.34.2 +- yq 4.35.1 - zstd 1.5.5 ### Tools - Aliyun CLI 3.0.170 - App Center CLI 2.14.0 -- AWS CLI 2.13.6 -- AWS SAM CLI 1.94.0 +- AWS CLI 2.13.9 +- AWS SAM CLI 1.95.0 - AWS Session Manager CLI 1.2.463.0 - Azure CLI 2.50.0 - Azure CLI (azure-devops) 0.26.0 - Bicep CLI 0.20.4 - Cabal 3.6.2.0 -- Cmake 3.27.1 +- Cmake 3.27.2 - CodeQL Action Bundles 2.14.0 2.14.1 - Fastlane 2.214.0 - GHC 9.6.2 - GHCup 0.1.19.4 - Jazzy 0.14.3 - Stack 2.9.3 -- SwiftFormat 0.51.13 +- SwiftFormat 0.51.15 - Swig 4.1.1 - Xcode Command Line Tools 13.2.0.0.1.1638488800 @@ -121,14 +117,14 @@ - Yamllint 1.32.0 ### Browsers -- Safari 16.5.2 (16615.2.9.101.1) -- SafariDriver 16.5.2 (16615.2.9.101.1) +- Safari 16.6 (16615.3.12.11.3) +- SafariDriver 16.6 (16615.3.12.11.3) - Google Chrome 115.0.5790.170 - Google Chrome for Testing 115.0.5790.170 - ChromeDriver 115.0.5790.170 -- Microsoft Edge 115.0.1901.188 -- Microsoft Edge WebDriver 115.0.1901.188 -- Mozilla Firefox 116.0 +- Microsoft Edge 115.0.1901.203 +- Microsoft Edge WebDriver 115.0.1901.203 +- Mozilla Firefox 116.0.2 - geckodriver 0.33.0 - Selenium server 4.10.0 @@ -168,16 +164,18 @@ - 3.7.13 [PyPy 7.3.9] - 3.8.16 [PyPy 7.3.11] - 3.9.17 [PyPy 7.3.12] +- 3.10.12 [PyPy 7.3.12] #### Node.js - 14.21.3 -- 16.20.1 -- 18.17.0 +- 16.20.2 +- 18.17.1 #### Go - 1.18.10 - 1.19.12 - 1.20.7 +- 1.21.0 ### Rust Tools - Cargo 1.71.1 @@ -214,7 +212,7 @@ | Version | Build | Path | | -------------- | ---------- | ------------------------------------ | | 2019 | 8.10.25.2 | /Applications/Visual Studio 2019.app | -| 2022 (default) | 17.6.2.405 | /Applications/Visual Studio.app | +| 2022 (default) | 17.6.3.421 | /Applications/Visual Studio.app | ##### Notes ``` From b2b0e8f4d6b5f37d1cf6b69a134995b26afca917 Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Mon, 21 Aug 2023 17:51:16 +0200 Subject: [PATCH 2127/3485] Revert "[macOS] Remove sensitive data from a download log (#7934)" (#8121) This reverts commit c9e6a45f28571ccb940c9e012e5bded4dbd588e3. --- .../provision/bootstrap-provisioner/installNewProvisioner.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/images/macos/provision/bootstrap-provisioner/installNewProvisioner.sh b/images/macos/provision/bootstrap-provisioner/installNewProvisioner.sh index 0546addbf4b7..81cdbdffc22f 100644 --- a/images/macos/provision/bootstrap-provisioner/installNewProvisioner.sh +++ b/images/macos/provision/bootstrap-provisioner/installNewProvisioner.sh @@ -37,10 +37,6 @@ aria2c \ --file-allocation=none \ -d ${BOOTSTRAP_PATH} "${ProvisionerScriptUri}" >> ${BOOTSTRAP_PATH}/download.log -# Remove sensitive data from logs -sed -i '' 's/'${ProvisionerPackageUri}'/ProvisionerPackageUri/' ${BOOTSTRAP_PATH}/download.log -sed -i '' 's/'${ProvisionerScriptUri}'/ProvisionerScriptUri/' ${BOOTSTRAP_PATH}/download.log - chmod +x ${BOOTSTRAP_PATH}/${ScriptName} # Install Provisioner with provided scripts From 0d6cb0cc830ea81a760807425f68e6357c9c49f4 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 21 Aug 2023 16:38:53 +0000 Subject: [PATCH 2128/3485] Updating readme file for ubuntu22 version 20230814.1.0 (#8092) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2204-Readme.md | 81 +++++++++++++++---------------- 1 file changed, 39 insertions(+), 42 deletions(-) diff --git a/images/linux/Ubuntu2204-Readme.md b/images/linux/Ubuntu2204-Readme.md index dbaae8bc789e..e5208c04b623 100644 --- a/images/linux/Ubuntu2204-Readme.md +++ b/images/linux/Ubuntu2204-Readme.md @@ -1,11 +1,7 @@ -| Announcements | -|-| -| [[All OSes] Adopt OpenJDK will be removed from images on August, 7](https://github.com/actions/runner-images/issues/8030) | -*** # Ubuntu 22.04 - OS Version: 22.04.3 LTS -- Kernel Version: 5.15.0-1042-azure -- Image Version: 20230806.1.0 +- Kernel Version: 5.15.0-1041-azure +- Image Version: 20230814.1.0 - Systemd version: 249.11-0ubuntu3.9 ## Installed Software @@ -22,7 +18,7 @@ - Kotlin 1.9.0-release-358 - Mono 6.12.0.200 - MSBuild 16.10.1.31701 (Mono 6.12.0.200) -- Node.js 18.17.0 +- Node.js 18.17.1 - Perl 5.34.0 - Python 3.10.12 - Ruby 3.0.2p107 @@ -30,8 +26,8 @@ ### Package Management - cpan 1.64 -- Helm 3.12.2 -- Homebrew 4.1.3 +- Helm 3.12.3 +- Homebrew 4.1.5 - Miniconda 23.5.2 - Npm 9.6.7 - NuGet 6.6.1.2 @@ -39,7 +35,7 @@ - Pip3 22.0.2 - Pipx 1.2.0 - RubyGems 3.3.5 -- Vcpkg (build from commit 78b61582c) +- Vcpkg (build from commit 5fa92f467) - Yarn 1.22.19 #### Environment variables @@ -57,19 +53,19 @@ to accomplish this. ``` ### Project Management -- Lerna 7.1.4 +- Lerna 7.1.5 - Maven 3.8.8 ### Tools -- Ansible 2.15.2 +- Ansible 2.15.3 - apt-fast 1.9.12 -- AzCopy 10.20.0 - available by `azcopy` and `azcopy10` aliases -- Bazel 6.3.1 +- AzCopy 10.20.1 - available by `azcopy` and `azcopy10` aliases +- Bazel 6.3.2 - Bazelisk 1.13.2 - Bicep 0.20.4 - Buildah 1.23.1 -- CMake 3.27.1 -- CodeQL Action Bundles 2.14.0 2.14.1 +- CMake 3.27.2 +- CodeQL Action Bundles 2.14.1 2.14.2 - Docker Amazon ECR Credential Helper 0.7.1 - Docker Compose v1 1.29.2 - Docker Compose v2 2.20.2+azure-1 @@ -97,30 +93,30 @@ to accomplish this. - Packer 1.9.2 - Parcel 2.9.3 - Podman 3.4.4 -- Pulumi 3.77.1 +- Pulumi 3.78.1 - R 4.3.1 - Skopeo 1.4.1 - Sphinx Open Source Search Server 2.2.11 - SVN 1.14.1 -- Terraform 1.5.4 +- Terraform 1.5.5 - yamllint 1.32.0 -- yq 4.34.2 +- yq 4.35.1 - zstd 1.5.5 ### CLI Tools - Alibaba Cloud CLI 3.0.172 -- AWS CLI 2.13.7 +- AWS CLI 2.13.9 - AWS CLI Session Manager Plugin 1.2.497.0 -- AWS SAM CLI 1.94.0 +- AWS SAM CLI 1.95.0 - Azure CLI 2.51.0 - Azure CLI (azure-devops) 0.26.0 - GitHub CLI 2.32.1 -- Google Cloud SDK 441.0.0 +- Google Cloud SDK 442.0.0 - Hub CLI 2.14.2 -- Netlify CLI 15.10.0 -- OpenShift CLI 4.13.6 -- ORAS CLI 1.0.0 -- Vercel CLI 31.2.2 +- Netlify CLI 16.0.3 +- OpenShift CLI 4.13.8 +- ORAS CLI 1.0.1 +- Vercel CLI 31.3.0 ### Java | Version | Environment Variable | @@ -161,10 +157,10 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Google Chrome 115.0.5790.170 - ChromeDriver 115.0.5790.170 - Chromium 115.0.5790.0 -- Microsoft Edge 115.0.1901.188 -- Microsoft Edge WebDriver 115.0.1901.188 +- Microsoft Edge 115.0.1901.203 +- Microsoft Edge WebDriver 115.0.1901.203 - Selenium server 4.11.0 -- Mozilla Firefox 116.0.1 +- Mozilla Firefox 116.0.3 - Geckodriver 0.33.0 #### Environment variables @@ -176,14 +172,14 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | ### .NET Tools -- .NET Core SDK: 6.0.412, 7.0.109, 7.0.203, 7.0.306 +- .NET Core SDK: 6.0.413, 7.0.110, 7.0.203, 7.0.307, 7.0.400 - nbgv 3.6.133+2d32d93cb1 ### Databases - sqlite3 3.37.2 #### PostgreSQL -- PostgreSQL 14.8 +- PostgreSQL 14.9 ``` User: postgres PostgreSQL service is disabled by default. @@ -209,11 +205,12 @@ Use the following command as a part of your job to start the service: 'sudo syst - 1.18.10 - 1.19.12 - 1.20.7 +- 1.21.0 #### Node.js - 14.21.3 -- 16.20.1 -- 18.17.0 +- 16.20.2 +- 18.17.1 #### Python - 3.7.17 @@ -226,6 +223,7 @@ Use the following command as a part of your job to start the service: 'sudo syst - 3.7.13 [PyPy 7.3.9] - 3.8.16 [PyPy 7.3.11] - 3.9.17 [PyPy 7.3.12] +- 3.10.12 [PyPy 7.3.12] #### Ruby - 3.1.4 @@ -236,7 +234,7 @@ Use the following command as a part of your job to start the service: 'sudo syst #### PowerShell Modules - Az: 9.3.0 - MarkdownPS: 1.9 -- Microsoft.Graph: 2.2.0 +- Microsoft.Graph: 2.3.0 - Pester: 5.5.0 - PSScriptAnalyzer: 1.21.0 @@ -275,9 +273,9 @@ Use the following command as a part of your job to start the service: 'sudo syst ### Cached Docker images | Repository:Tag | Digest | Created | | ----------------------- | ------------------------------------------------------------------------ | ---------- | -| alpine:3.16 | sha256:cbe5d5973103a2d03408d1689a6efde4ea4920bde9f4b51fe7872e60ce2d8e56 | 2023-06-14 | -| alpine:3.17 | sha256:e95676db9e4a4f16f6cc01a8915368f82b018cc07aba951c1bd1db586c081388 | 2023-06-14 | -| alpine:3.18 | sha256:82d1e9d7ed48a7523bdebc18cf6290bdb97b82302a8a9c27d4fe885949ea94d1 | 2023-06-14 | +| alpine:3.16 | sha256:a8cbb8c69ee71561f4b69c066bad07f7e510caaa523da26fbfc606b10bd7934b | 2023-08-07 | +| alpine:3.17 | sha256:f71a5f071694a785e064f05fed657bf8277f1b2113a8ed70c90ad486d6ee54dc | 2023-08-07 | +| alpine:3.18 | sha256:7144f7bab3d4c2648d7e59409f15ec52a18006a128c733fcff20d3a4a54ba44a | 2023-08-07 | | buildpack-deps:bullseye | sha256:593db75ce93184b16d45021566ed2d77f5009a8ce88da8254919a2e9e6ec14bf | 2023-07-28 | | buildpack-deps:buster | sha256:b2c2267e1944a42dcdd448b66e8c8c889a3f5d1ab9705421326077a40a8aa0bc | 2023-07-28 | | debian:10 | sha256:7cd85d3d51a435062010581f14c5e3f9428388ac7234cc9a1e23dd14d7e4e914 | 2023-07-27 | @@ -285,10 +283,10 @@ Use the following command as a part of your job to start the service: 'sudo syst | moby/buildkit:latest | sha256:d91fe5e6dad11f2c2cee6d268d5843ad64bf2e9852365d56b12d02f2315edce5 | 2023-08-02 | | node:14 | sha256:a158d3b9b4e3fa813fa6c8c590b8f0a860e015ad4e59bbce5744d2f6fd8461aa | 2023-04-12 | | node:14-alpine | sha256:434215b487a329c9e867202ff89e704d3a75e554822e07f3e0c0f9e606121b33 | 2023-03-29 | -| node:16 | sha256:6cd6581a9ae814ebbc8077afd63ecbf4d37f9b59ac9d9304a1b5a9e743ac13e0 | 2023-07-28 | -| node:16-alpine | sha256:6c381d5dc2a11dcdb693f0301e8587e43f440c90cdb8933eaaaabb905d44cdb9 | 2023-06-21 | -| node:18 | sha256:c85dc4392f44f5de1d0d72dd20a088a542734445f99bed7aa8ac895c706d370d | 2023-07-28 | -| node:18-alpine | sha256:93d91deea65c9a0475507e8bc8b1917d6278522322f00c00b3ab09cab6830060 | 2023-07-19 | +| node:16 | sha256:8c3c7e253d9484a35ed9db3e6ba296d859a382f48602d0321e4734a91311ac95 | 2023-08-10 | +| node:16-alpine | sha256:a1f9d027912b58a7c75be7716c97cfbc6d3099f3a97ed84aa490be9dee20e787 | 2023-08-10 | +| node:18 | sha256:87b15e8e40a6b088012ca65d6685b89948ec722c1955bc0f6bbf9ad20855781a | 2023-08-10 | +| node:18-alpine | sha256:3482a20c97e401b56ac50ba8920cc7b5b2022bfc6aa7d4e4c231755770cf892f | 2023-08-10 | | ubuntu:18.04 | sha256:152dc042452c496007f07ca9127571cb9c29697f42acbfad72324b2bb2e43c98 | 2023-05-30 | | ubuntu:20.04 | sha256:33a5cc25d22c45900796a1aca487ad7a7cb09f09ea00b779e3b2026b4fc2faba | 2023-08-01 | | ubuntu:22.04 | sha256:0bced47fffa3361afa981854fcabcd4577cd43cebbb808cea2b1f33a3dd7f508 | 2023-06-28 | @@ -384,4 +382,3 @@ Use the following command as a part of your job to start the service: 'sudo syst | xz-utils | 5.2.5-2ubuntu1 | | zip | 3.0-12build2 | | zsync | 0.6.2-3ubuntu1 | - From 6bf51e6351db8dffff0fe3f555310487c6746df5 Mon Sep 17 00:00:00 2001 From: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com> Date: Tue, 22 Aug 2023 10:01:24 +0200 Subject: [PATCH 2129/3485] [macos] move license accept out of parallel ForEach (#8120) --- images/macos/provision/core/xcode.ps1 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/images/macos/provision/core/xcode.ps1 b/images/macos/provision/core/xcode.ps1 index 634526bc54f1..3eb25d92223c 100644 --- a/images/macos/provision/core/xcode.ps1 +++ b/images/macos/provision/core/xcode.ps1 @@ -22,6 +22,9 @@ $xcodeVersions | ForEach-Object -ThrottleLimit $threadCount -Parallel { Install-XcodeVersion -Version $_.version -LinkTo $_.link Confirm-XcodeIntegrity -Version $_.link +} + +$xcodeVersions | ForEach-Object { Approve-XcodeLicense -Version $_.link } From 3f3600e02968802fea2a212e606ed9069cfd0c37 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Tue, 22 Aug 2023 10:35:20 +0200 Subject: [PATCH 2130/3485] Remove images GitHub Actions CI from repo (#8131) --- .github/workflows/ci-cleanup.yml | 55 ------ .github/workflows/macos-generation.yml | 207 -------------------- .github/workflows/macos11.yml | 24 --- .github/workflows/macos12.yml | 24 --- .github/workflows/ubuntu-win-generation.yml | 135 ------------- .github/workflows/ubuntu2004.yml | 21 -- .github/workflows/ubuntu2204.yml | 21 -- .github/workflows/windows2019.yml | 21 -- .github/workflows/windows2022.yml | 21 -- 9 files changed, 529 deletions(-) delete mode 100644 .github/workflows/ci-cleanup.yml delete mode 100644 .github/workflows/macos-generation.yml delete mode 100644 .github/workflows/macos11.yml delete mode 100644 .github/workflows/macos12.yml delete mode 100644 .github/workflows/ubuntu-win-generation.yml delete mode 100644 .github/workflows/ubuntu2004.yml delete mode 100644 .github/workflows/ubuntu2204.yml delete mode 100644 .github/workflows/windows2019.yml delete mode 100644 .github/workflows/windows2022.yml diff --git a/.github/workflows/ci-cleanup.yml b/.github/workflows/ci-cleanup.yml deleted file mode 100644 index f266b97f54e0..000000000000 --- a/.github/workflows/ci-cleanup.yml +++ /dev/null @@ -1,55 +0,0 @@ -run-name: Cleanup ${{ github.head_ref }} -on: - pull_request_target: - types: labeled - paths: - - 'images/**' - -jobs: - clean_ci: - name: Clean CI runs - runs-on: ubuntu-latest - permissions: - actions: write - steps: - - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - shell: pwsh - run: | - $startDate = Get-Date -UFormat %s - $workflows = @("macos11", "macos12", "ubuntu2004", "ubuntu2204", "windows2019", "windows2022") - - while ($true) { - $continue = $false - foreach ($wf in $workflows) { - $skippedCommand = "gh run list --workflow ${wf}.yml --branch ${{ github.event.pull_request.head.ref }} --repo ${{ github.repository }} --status skipped --json databaseId" - $skippedIds = Invoke-Expression -Command $skippedCommand | ConvertFrom-Json | ForEach-Object { $_.databaseId } - - $skippedIds | ForEach-Object { - $deleteCommand = "gh run delete --repo ${{ github.repository }} $_" - Invoke-Expression -Command $deleteCommand - } - - $pendingCommand = "gh run list --workflow ${wf}.yml --branch ${{ github.event.pull_request.head.ref }} --repo ${{ github.repository }} --status requested --json databaseId --template '{{ . | len }}'" - $pending = Invoke-Expression -Command $pendingCommand - - if ($pending -gt 0) { - Write-Host "Pending for ${wf}.yml: $pending run(s)" - $continue = $true - } - } - - if ($continue -eq $false) { - Write-Host "All done, exiting" - break - } - - $curDate = Get-Date -UFormat %s - if (($curDate - $startDate) -gt 60) { - Write-Host "Reached timeout, exiting" - break - } - - Write-Host "Waiting 5 seconds..." - Start-Sleep -Seconds 5 - } diff --git a/.github/workflows/macos-generation.yml b/.github/workflows/macos-generation.yml deleted file mode 100644 index 8e9083c3ce37..000000000000 --- a/.github/workflows/macos-generation.yml +++ /dev/null @@ -1,207 +0,0 @@ -name: macOS image generation -on: - workflow_call: - inputs: - image_label: - type: string - description: macOS codename - required: true - base_image_name: - type: string - description: Base clean image - required: true - template_path: - type: string - description: Packer template path - required: true - target_datastore: - type: string - description: Image datastore - required: true - custom_repo: - type: string - description: Custom repo to checkout - required: false - custom_repo_commit_hash: - type: string - description: Custom repo commit hash - required: false - -env: - KEYVAULT: imagegeneration - ESXI_CLUSTER: mcv2-build-unstable - VCENTER_DATACENTER: imagegen - OUTPUT_FOLDER: mms-output - BUILD_DATASTORE: ds-image - -defaults: - run: - shell: pwsh - -jobs: - build: - # - # "macos-vmware" is dedicated runner not available in forks. - # to reduce undesired run attempts in forks, stick jobs to "actions" organization only - # - runs-on: macos-vmware - if: ${{ github.repository_owner == 'actions' }} - timeout-minutes: 1200 - steps: - - name: Set image variables - run: | - $currentDate = Get-Date -Format "yyyyMMdd" - $templatePath = "${{ inputs.template_path }}" - $osName = $(($templatePath.Split("/")[-1]).Split(".")[0]) - $virtualMachineName = "${osName}_${currentDate}_unstable.${{ github.run_id }}.${{ github.run_attempt }}" - "VM_NAME=$virtualMachineName" | Out-File -Append -FilePath $env:GITHUB_ENV - - - name: Determine checkout type - run: | - if ("${{ inputs.custom_repo }}" -and "${{ inputs.custom_repo_commit_hash }}") { - $checkoutType = "custom_repo" - } elseif (("${{ github.event_name }}" -eq "pull_request_target") -and ("${{ github.event.action }}" -eq "labeled" )) { - $checkoutType = "pull_request" - } else { - $checkoutType = "main" - } - "CHECKOUT_TYPE=$checkoutType" | Out-File -Append $env:GITHUB_ENV - - - name: Checkout repository - if: ${{ env.CHECKOUT_TYPE == 'main' }} - uses: actions/checkout@v3 - with: - repository: actions/runner-images - - - name: Checkout PR - if: ${{ env.CHECKOUT_TYPE == 'pull_request' }} - uses: actions/checkout@v3 - with: - ref: ${{ github.event.pull_request.head.sha }} - - - name: Checkout custom repository - if: ${{ env.CHECKOUT_TYPE == 'custom_repo' }} - uses: actions/checkout@v3 - with: - repository: '${{ inputs.custom_repo }}' - ref: '${{ inputs.custom_repo_commit_hash }}' - - - name: Validate contributor permissions - if: ${{ github.event_name == 'pull_request_target' }} - run: | - [string]$contributorAllowList = "${{ vars.CONTRIBUTOR_ALLOWLIST }}" - ./images.CI/macos/validate-contributor.ps1 ` - -RepositoryName ${{ github.repository }} ` - -AccessToken ${{ secrets.GH_FEED }} ` - -SourceBranch "refs/pull/${{ github.event.pull_request.number }}/merge" ` - -ContributorAllowList $contributorAllowList - - - name: Select datastore - run: | - ./images.CI/macos/select-datastore.ps1 ` - -VMName "${{ env.VM_NAME }}" ` - -VIServer ${{ secrets.VISERVER_V2 }} ` - -VIUserName ${{ secrets.VI_USER_NAME }} ` - -VIPassword ${{ secrets.VI_PASSWORD }} ` - -Cluster ${{ env.ESXI_CLUSTER }} - - - name: Build VM - run: | - $SensitiveData = @( - 'IP address:', - 'Using ssh communicator to connect:' - ) - packer build -on-error=abort ` - -var="vcenter_server=${{ secrets.VISERVER_V2 }}" ` - -var="vcenter_username=${{ secrets.VI_USER_NAME }}" ` - -var="vcenter_password=${{ secrets.VI_PASSWORD }}" ` - -var="vcenter_datacenter=${{ env.VCENTER_DATACENTER }}" ` - -var="cluster_or_esxi_host=${{ env.ESXI_CLUSTER }}" ` - -var="esxi_datastore=${{ env.BUILD_DATASTORE }}" ` - -var="output_folder=${{ env.OUTPUT_FOLDER }}" ` - -var="vm_username=${{ secrets.VM_USERNAME }}" ` - -var="vm_password=${{ secrets.VM_PASSWORD }}" ` - -var="xcode_install_storage_url=${{ secrets.xcode_install_storage_url }}" ` - -var="xcode_install_sas=${{ secrets.xcode_install_sas }}" ` - -var="github_api_pat=${{ secrets.GH_FEED_TOKEN }}" ` - -var="build_id=${{ env.VM_NAME }}" ` - -var="baseimage_name=${{ inputs.base_image_name }}" ` - -color=false ` - ${{ inputs.template_path }} ` - | Where-Object { - #Filter sensitive data from Packer logs - $currentString = $_ - $sensitiveString = $SensitiveData | Where-Object { $currentString -match $_ } - $sensitiveString -eq $null - } - working-directory: images/macos - env: - PACKER_LOG: 1 - PACKER_LOG_PATH: ${{ runner.temp }}/packer-log.txt - - - name: Prepare artifact - shell: bash - run: | - echo "Preparing artifact directory" - mkdir -p ${{ runner.temp }}/artifacts - - echo "Copy image output files" - cp -R "images/image-output/software-report/." "${{ runner.temp }}/artifacts" - - echo "Put VM name to 'VM_Done_Name' file" - echo "${{ env.VM_NAME }}" > "${{ runner.temp }}/artifacts/VM_Done_Name" - - - name: Print markdown software report - run: | - Get-Content "${{ runner.temp }}/artifacts/systeminfo.md" - - - name: Print json software report - run: | - Get-Content "${{ runner.temp }}/artifacts/systeminfo.json" - - - name: Publish Artifacts - uses: actions/upload-artifact@v3 - with: - name: Built_VM_Artifacts - path: ${{ runner.temp }}/artifacts/ - - - name: Print provisioners duration - run: | - ./images.CI/measure-provisioners-duration.ps1 ` - -PackerLogPath "${{ runner.temp }}/packer-log.txt" ` - -PrintTopNLongest 25 - - - name: Move vm to cold storage and clear datastore tag - if: ${{ always() }} - run: | - ./images.CI/macos/move-vm.ps1 ` - -VMName "${{ env.VM_NAME }}" ` - -TargetDataStore "${{ inputs.target_datastore }}" ` - -VIServer "${{ secrets.VISERVER_V2 }}" ` - -VIUserName "${{ secrets.VI_USER_NAME }}" ` - -VIPassword "${{ secrets.VI_PASSWORD }}" ` - -JobStatus "${{ job.status }}" - - - name: Set VM size - run: | - $cpuCount = 3 - $coresPerSocketCount = 3 - $memory = 14336 - - ./images.CI/macos/set-vm-size.ps1 ` - -VMName "${{ env.VM_NAME }}" ` - -CpuCount "$cpuCount" ` - -CoresPerSocketCount "$coresPerSocketCount" ` - -Memory "$memory" ` - -VIServer "${{ secrets.VISERVER_V2 }}" ` - -VIUserName "${{ secrets.VI_USER_NAME }}" ` - -VIPassword "${{ secrets.VI_PASSWORD }}" - - - name: Destroy VM (if build canceled only) - if: ${{ cancelled() }} - run: | - ./images.CI/macos/destroy-vm.ps1 ` - -VMName "${{ env.VM_NAME }}" ` - -VIServer "${{ secrets.VISERVER_V2 }}" ` - -VIUserName "${{ secrets.VI_USER_NAME }}" ` - -VIPassword "${{ secrets.VI_PASSWORD }}" \ No newline at end of file diff --git a/.github/workflows/macos11.yml b/.github/workflows/macos11.yml deleted file mode 100644 index c6ecb73b0966..000000000000 --- a/.github/workflows/macos11.yml +++ /dev/null @@ -1,24 +0,0 @@ -run-name: macOS-11_unstable.${{ github.run_id }}.${{ github.run_attempt }} -on: - workflow_dispatch: - inputs: - CUSTOM_REPOSITORY: - description: 'Custom repository (owner/repo)' - required: false - CUSTOM_REPOSITORY_COMMIT_HASH: - description: 'Commit hash' - required: false - -jobs: - macOS_11: - if: (github.event_name == 'workflow_dispatch') || (github.event_name == 'schedule') - name: macOS-11_unstable.${{ github.run_id }}.${{ github.run_attempt }} - uses: ./.github/workflows/macos-generation.yml - with: - image_label: 'macOS Big Sur' - base_image_name: 'clean-macOS-11-380Gb-runner' - template_path: 'templates/macOS-11.json' - target_datastore: 'ds-image' - custom_repo: ${{ github.event.inputs.CUSTOM_REPOSITORY }} - custom_repo_commit_hash: ${{ github.event.inputs.CUSTOM_REPOSITORY_COMMIT_HASH }} - secrets: inherit diff --git a/.github/workflows/macos12.yml b/.github/workflows/macos12.yml deleted file mode 100644 index 1504ab07df91..000000000000 --- a/.github/workflows/macos12.yml +++ /dev/null @@ -1,24 +0,0 @@ -run-name: macOS-12_unstable.${{ github.run_id }}.${{ github.run_attempt }} -on: - workflow_dispatch: - inputs: - CUSTOM_REPOSITORY: - description: 'Custom repository (owner/repo)' - required: false - CUSTOM_REPOSITORY_COMMIT_HASH: - description: 'Commit hash' - required: false - -jobs: - macOS_12: - if: (github.event_name == 'workflow_dispatch') || (github.event_name == 'schedule') - name: macOS-12_unstable.${{ github.run_id }}.${{ github.run_attempt }} - uses: ./.github/workflows/macos-generation.yml - with: - image_label: 'macOS Monterey' - base_image_name: 'clean-macOS-12-380Gb-runner' - template_path: 'templates/macOS-12.json' - target_datastore: 'ds-image' - custom_repo: ${{ github.event.inputs.CUSTOM_REPOSITORY }} - custom_repo_commit_hash: ${{ github.event.inputs.CUSTOM_REPOSITORY_COMMIT_HASH }} - secrets: inherit diff --git a/.github/workflows/ubuntu-win-generation.yml b/.github/workflows/ubuntu-win-generation.yml deleted file mode 100644 index c7944d5335ca..000000000000 --- a/.github/workflows/ubuntu-win-generation.yml +++ /dev/null @@ -1,135 +0,0 @@ -name: MMS image generation -on: - workflow_call: - inputs: - image_name: - type: string - description: An OS image to build - required: true - image_readme_name: - type: string - description: README file path - required: true - custom_repo: - type: string - description: Custom repo to checkout - required: false - custom_repo_commit_hash: - type: string - description: Custom repo commit hash - required: false -defaults: - run: - shell: pwsh - -jobs: - build: - # - # "azure-builds" is dedicated runner not available in forks. - # to reduce undesired run attempts in forks, stick jobs to "actions" organization only - # - runs-on: azure-builds - if: ${{ github.repository_owner == 'actions' }} - timeout-minutes: 1200 - steps: - - name: Determine checkout type - run: | - if ("${{ inputs.custom_repo }}" -and "${{ inputs.custom_repo_commit_hash }}") { - $checkoutType = "custom_repo" - } elseif (("${{ github.event_name }}" -eq "pull_request_target") -and ("${{ github.event.action }}" -eq "labeled" )) { - $checkoutType = "pull_request" - } else { - $checkoutType = "main" - } - "CHECKOUT_TYPE=$checkoutType" | Out-File -Append $env:GITHUB_ENV - - - name: Checkout repository - if: ${{ env.CHECKOUT_TYPE == 'main' }} - uses: actions/checkout@v3 - with: - repository: actions/runner-images - - - name: Checkout PR - if: ${{ env.CHECKOUT_TYPE == 'pull_request' }} - uses: actions/checkout@v3 - with: - ref: ${{ github.event.pull_request.head.sha }} - - - name: Checkout custom repository - if: ${{ env.CHECKOUT_TYPE == 'custom_repo' }} - uses: actions/checkout@v3 - with: - repository: '${{ inputs.custom_repo }}' - ref: '${{ inputs.custom_repo_commit_hash }}' - - - name: Set image variables - run: | - $ImageType = "${{ inputs.image_name }}" - - if ($ImageType.StartsWith("ubuntu")) { $TemplateDirectoryName = "linux" } else { $TemplateDirectoryName = "win" } - - $TemplateDirectoryPath = Join-Path "images" $TemplateDirectoryName | Resolve-Path - $TemplatePath = Join-Path $TemplateDirectoryPath "$ImageType.pkr.hcl" - - if ( -not (Test-Path $TemplatePath) ) { - $TemplatePath = Join-Path $TemplateDirectoryPath "$ImageType.json" - } - - "TemplatePath=$TemplatePath" | Out-File -Append -FilePath $env:GITHUB_ENV - "TemplateDirectoryPath=$TemplateDirectoryPath" | Out-File -Append -FilePath $env:GITHUB_ENV - "ImageType=$ImageType" | Out-File -Append -FilePath $env:GITHUB_ENV - - - name: Build image - run: | - $ResourcesNamePrefix = ${{ github.run_id }} % [System.UInt32]::MaxValue - ./images.CI/linux-and-win/build-image.ps1 ` - -TemplatePath ${{ env.TemplatePath }} ` - -ClientId ${{ secrets.CLIENT_ID }} ` - -ClientSecret ${{ secrets.CLIENT_SECRET }} ` - -Location ${{ secrets.AZURE_LOCATION }} ` - -ResourcesNamePrefix $ResourcesNamePrefix ` - -ResourceGroup ${{ secrets.AZURE_RESOURCE_GROUP }} ` - -StorageAccount ${{ secrets.AZURE_STORAGE_ACCOUNT }} ` - -SubscriptionId ${{ secrets.AZURE_SUBSCRIPTION }} ` - -TenantId ${{ secrets.AZURE_TENANT }} ` - -VirtualNetworkName ${{ secrets.BUILD_AGENT_VNET_NAME }} ` - -VirtualNetworkSubnet ${{ secrets.BUILD_AGENT_SUBNET_NAME }} ` - -VirtualNetworkRG ${{ secrets.BUILD_AGENT_VNET_RESOURCE_GROUP }} ` - env: - PACKER_LOG: 1 - PACKER_LOG_PATH: ${{ runner.temp }}/packer-log.txt - RUN_VALIDATION_FLAG: true - - - name: Output Readme file content - run: | - Get-Content -Path (Join-Path "$env:TemplateDirectoryPath" "${{ inputs.image_readme_name }}") - - - name: Print provisioners duration - run: | - ./images.CI/measure-provisioners-duration.ps1 ` - -PackerLogPath "${{ runner.temp }}/packer-log.txt" ` - -PrefixToPathTrim ${{ env.TemplateDirectoryPath }} ` - -PrintTopNLongest 25 - - - name: Create release for VM deployment - run: | - $BuildId = ${{ github.run_id }} % [System.UInt32]::MaxValue - ./images.CI/linux-and-win/create-release.ps1 ` - -BuildId $BuildId ` - -Organization ${{ secrets.RELEASE_TARGET_ORGANIZATION }} ` - -DefinitionId ${{ secrets.RELEASE_TARGET_DEFINITION_ID }} ` - -Project ${{ secrets.RELEASE_TARGET_PROJECT }} ` - -ImageName ${{ env.ImageType }} ` - -AccessToken ${{ secrets.RELEASE_TARGET_TOKEN }} - - - name: Clean up resources - if: ${{ always() }} - run: | - ./images.CI/linux-and-win/cleanup.ps1 ` - -ResourcesNamePrefix ${{ github.run_number }} ` - -Image ${{ env.ImageType }} ` - -StorageAccount ${{ secrets.AZURE_STORAGE_ACCOUNT }} ` - -SubscriptionId ${{ secrets.AZURE_SUBSCRIPTION }} ` - -ClientId ${{ secrets.CLIENT_ID }} ` - -ClientSecret ${{ secrets.CLIENT_SECRET }} ` - -TenantId ${{ secrets.AZURE_TENANT }} diff --git a/.github/workflows/ubuntu2004.yml b/.github/workflows/ubuntu2004.yml deleted file mode 100644 index ffc88cf10d01..000000000000 --- a/.github/workflows/ubuntu2004.yml +++ /dev/null @@ -1,21 +0,0 @@ -run-name: Ubuntu20.04 - ${{ (github.event.pull_request.title || 'scheduled/manual run') }} -on: - workflow_dispatch: - inputs: - CUSTOM_REPOSITORY: - description: 'Custom repository (owner/repo)' - required: false - CUSTOM_REPOSITORY_COMMIT_HASH: - description: 'Commit hash' - required: false - -jobs: - Ubuntu_2004: - if: (github.event_name == 'workflow_dispatch') || (github.event_name == 'schedule') - uses: ./.github/workflows/ubuntu-win-generation.yml - with: - image_name: 'ubuntu2004' - image_readme_name: 'Ubuntu2004-Readme.md' - custom_repo: ${{ github.event.inputs.CUSTOM_REPOSITORY }} - custom_repo_commit_hash: ${{ github.event.inputs.CUSTOM_REPOSITORY_COMMIT_HASH }} - secrets: inherit diff --git a/.github/workflows/ubuntu2204.yml b/.github/workflows/ubuntu2204.yml deleted file mode 100644 index cd11693f3067..000000000000 --- a/.github/workflows/ubuntu2204.yml +++ /dev/null @@ -1,21 +0,0 @@ -run-name: Ubuntu22.04 - ${{ (github.event.pull_request.title || 'scheduled/manual run') }} -on: - workflow_dispatch: - inputs: - CUSTOM_REPOSITORY: - description: 'Custom repository (owner/repo)' - required: false - CUSTOM_REPOSITORY_COMMIT_HASH: - description: 'Commit hash' - required: false - -jobs: - Ubuntu_2204: - if: (github.event_name == 'workflow_dispatch') || (github.event_name == 'schedule') - uses: ./.github/workflows/ubuntu-win-generation.yml - with: - image_name: 'ubuntu2204' - image_readme_name: 'Ubuntu2204-Readme.md' - custom_repo: ${{ github.event.inputs.CUSTOM_REPOSITORY }} - custom_repo_commit_hash: ${{ github.event.inputs.CUSTOM_REPOSITORY_COMMIT_HASH }} - secrets: inherit diff --git a/.github/workflows/windows2019.yml b/.github/workflows/windows2019.yml deleted file mode 100644 index 3df371d9167f..000000000000 --- a/.github/workflows/windows2019.yml +++ /dev/null @@ -1,21 +0,0 @@ -run-name: Windows 2019 - ${{ (github.event.pull_request.title || 'scheduled/manual run') }} -on: - workflow_dispatch: - inputs: - CUSTOM_REPOSITORY: - description: 'Custom repository (owner/repo)' - required: false - CUSTOM_REPOSITORY_COMMIT_HASH: - description: 'Commit hash' - required: false - -jobs: - Windows_2019: - if: (github.event_name == 'workflow_dispatch') || (github.event_name == 'schedule') - uses: ./.github/workflows/ubuntu-win-generation.yml - with: - image_name: 'windows2019' - image_readme_name: 'Windows2019-Readme.md' - custom_repo: ${{ github.event.inputs.CUSTOM_REPOSITORY }} - custom_repo_commit_hash: ${{ github.event.inputs.CUSTOM_REPOSITORY_COMMIT_HASH }} - secrets: inherit diff --git a/.github/workflows/windows2022.yml b/.github/workflows/windows2022.yml deleted file mode 100644 index a456c224f411..000000000000 --- a/.github/workflows/windows2022.yml +++ /dev/null @@ -1,21 +0,0 @@ -run-name: Windows 2022 - ${{ (github.event.pull_request.title || 'scheduled/manual run') }} -on: - workflow_dispatch: - inputs: - CUSTOM_REPOSITORY: - description: 'Custom repository (owner/repo)' - required: false - CUSTOM_REPOSITORY_COMMIT_HASH: - description: 'Commit hash' - required: false - -jobs: - Windows_2022: - if: (github.event_name == 'workflow_dispatch') || (github.event_name == 'schedule') - uses: ./.github/workflows/ubuntu-win-generation.yml - with: - image_name: 'windows2022' - image_readme_name: 'Windows2022-Readme.md' - custom_repo: ${{ github.event.inputs.CUSTOM_REPOSITORY }} - custom_repo_commit_hash: ${{ github.event.inputs.CUSTOM_REPOSITORY_COMMIT_HASH }} - secrets: inherit From 1ac680fb5f997ed582886ce443a57d0f581ef9a3 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 22 Aug 2023 08:59:46 +0000 Subject: [PATCH 2131/3485] Updating readme file for macOS-12 version 20230812.3 (#8088) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-12-Readme.md | 54 ++++++++++++++++----------------- 1 file changed, 26 insertions(+), 28 deletions(-) diff --git a/images/macos/macos-12-Readme.md b/images/macos/macos-12-Readme.md index 5c0ee2198cdd..90b0fe0e2b51 100644 --- a/images/macos/macos-12-Readme.md +++ b/images/macos/macos-12-Readme.md @@ -1,16 +1,12 @@ -| Announcements | -|-| -| [[All OSes] Adopt OpenJDK will be removed from images on August, 7](https://github.com/actions/runner-images/issues/8030) | -*** # macOS 12 - OS Version: macOS 12.6.7 (21G651) - Kernel Version: Darwin 21.6.0 -- Image Version: 20230803.1 +- Image Version: 20230812.3 ## Installed Software ### Language and Runtime -- .NET Core SDK: 6.0.412, 7.0.102, 7.0.202, 7.0.306 +- .NET Core SDK: 6.0.413, 7.0.102, 7.0.202, 7.0.306, 7.0.400 - Bash 3.2.57(1)-release - Clang/LLVM 14.0.0 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` @@ -23,9 +19,9 @@ - Go 1.20.7 - Mono 6.12.0.188 - MSBuild 16.10.1.51301 (Mono 6.12.0.188) -- Node.js 18.17.0 +- Node.js 18.17.1 - NVM 0.39.4 -- NVM - Cached node versions: 14.21.3, 16.20.1, 18.17.0 +- NVM - Cached node versions: 14.21.3, 16.20.2, 18.17.1 - Perl 5.36.1 - PHP 8.2.8 - Python 2.7.18 @@ -38,7 +34,7 @@ - Carthage 0.39.0 - CocoaPods 1.12.1 - Composer 2.5.8 -- Homebrew 4.1.3 +- Homebrew 4.1.4 - Miniconda 23.5.2 - NPM 9.6.7 - NuGet 6.3.1.1 @@ -46,7 +42,7 @@ - Pip3 23.2.1 (python 3.11) - Pipx 1.2.0 - RubyGems 3.4.18 -- Vcpkg 2023 (build from commit 1e9cf6939) +- Vcpkg 2023 (build from commit 0fa8459cf) - Yarn 1.22.19 #### Environment variables @@ -57,15 +53,15 @@ ### Project Management - Apache Ant 1.10.13 -- Apache Maven 3.9.3 +- Apache Maven 3.9.4 - Gradle 8.2.1 - Sbt 1.9.3 ### Utilities - 7-Zip 17.05 - aria2 1.36.0 -- azcopy 10.20.0 -- bazel 6.3.1 +- azcopy 10.20.1 +- bazel 6.3.2 - bazelisk 1.17.0 - bsdtar 3.5.1 - available by 'tar' alias - Curl 8.2.1 @@ -83,26 +79,26 @@ - OpenSSL 1.1.1v 1 Aug 2023 - Packer 1.9.2 - pkg-config 0.29.2 -- PostgreSQL 14.8 (Homebrew) -- psql (PostgreSQL) 14.8 (Homebrew) +- PostgreSQL 14.9 (Homebrew) +- psql (PostgreSQL) 14.9 (Homebrew) - Sox 14.4.2 - Subversion (SVN) 1.14.2 - Switchaudio-osx 1.2.2 - Vagrant 2.3.7 - VirtualBox 6.1.38r153438 -- yq 4.34.2 +- yq 4.35.1 - zstd 1.5.5 ### Tools - App Center CLI 2.14.0 -- AWS CLI 2.13.6 -- AWS SAM CLI 1.94.0 +- AWS CLI 2.13.9 +- AWS SAM CLI 1.95.0 - AWS Session Manager CLI 1.2.463.0 - Azure CLI 2.50.0 - Azure CLI (azure-devops) 0.26.0 - Bicep CLI 0.20.4 - Cabal 3.6.2.0 -- Cmake 3.27.1 +- Cmake 3.27.2 - CodeQL Action Bundles 2.14.0 2.14.1 - Colima 0.5.5 - Fastlane 2.214.0 @@ -110,7 +106,7 @@ - GHCup 0.1.19.4 - Jazzy 0.14.3 - Stack 2.9.3 -- SwiftFormat 0.51.13 +- SwiftFormat 0.51.15 - Swig 4.1.1 - Xcode Command Line Tools 14.2.0.0.1.1668646533 @@ -119,14 +115,14 @@ - Yamllint 1.32.0 ### Browsers -- Safari 16.5.2 (17615.2.9.101.1) -- SafariDriver 16.5.2 (17615.2.9.101.1) +- Safari 16.6 (17615.3.12.11.3) +- SafariDriver 16.6 (17615.3.12.11.3) - Google Chrome 115.0.5790.170 - Google Chrome for Testing 115.0.5790.170 - ChromeDriver 115.0.5790.170 -- Microsoft Edge 115.0.1901.188 -- Microsoft Edge WebDriver 115.0.1901.188 -- Mozilla Firefox 116.0 +- Microsoft Edge 115.0.1901.203 +- Microsoft Edge WebDriver 115.0.1901.203 +- Mozilla Firefox 116.0.2 - geckodriver 0.33.0 - Selenium server 4.10.0 @@ -163,16 +159,18 @@ - 3.7.13 [PyPy 7.3.9] - 3.8.16 [PyPy 7.3.11] - 3.9.17 [PyPy 7.3.12] +- 3.10.12 [PyPy 7.3.12] #### Node.js - 14.21.3 -- 16.20.1 -- 18.17.0 +- 16.20.2 +- 18.17.1 #### Go - 1.18.10 - 1.19.12 - 1.20.7 +- 1.21.0 ### Rust Tools - Cargo 1.71.1 @@ -209,7 +207,7 @@ | Version | Build | Path | | -------------- | ---------- | ------------------------------------ | | 2019 | 8.10.25.2 | /Applications/Visual Studio 2019.app | -| 2022 (default) | 17.6.2.405 | /Applications/Visual Studio.app | +| 2022 (default) | 17.6.3.421 | /Applications/Visual Studio.app | ##### Notes ``` From ac8bbd9fc2adb467c8e2613380afdc9454f4d694 Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Wed, 23 Aug 2023 12:55:49 +0200 Subject: [PATCH 2132/3485] Configure formatting and extensions for vscode (#8136) --- .gitignore | 5 ++++- .vscode/extensions.json | 9 +++++++++ .vscode/settings.json | 20 ++++++++++++++++++++ 3 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 .vscode/extensions.json create mode 100644 .vscode/settings.json diff --git a/.gitignore b/.gitignore index c056d3befe45..6018a375704f 100644 --- a/.gitignore +++ b/.gitignore @@ -268,7 +268,10 @@ paket-files/ *.sln.iml # VSCode settings -.vscode/settings.json +.vscode/** +!.vscode/extensions.json +!.vscode/settings.json +!.vscode/tasks.json # CodeRush .cr/ diff --git a/.vscode/extensions.json b/.vscode/extensions.json new file mode 100644 index 000000000000..4336e1e43d47 --- /dev/null +++ b/.vscode/extensions.json @@ -0,0 +1,9 @@ +{ + "recommendations": [ + "streetsidesoftware.code-spell-checker", + "hashicorp.hcl", + "davidanson.vscode-markdownlint", + "ms-vscode.powershell", + "timonwong.shellcheck" + ] +} \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 000000000000..ddd8d2ec0c2a --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,20 @@ +{ + "powershell.codeFormatting.addWhitespaceAroundPipe": true, + "powershell.codeFormatting.alignPropertyValuePairs": true, + "powershell.codeFormatting.autoCorrectAliases": true, + "powershell.codeFormatting.newLineAfterCloseBrace": true, + "powershell.codeFormatting.newLineAfterOpenBrace": true, + "powershell.codeFormatting.openBraceOnSameLine": true, + "powershell.codeFormatting.pipelineIndentationStyle": "IncreaseIndentationForFirstPipeline", + "powershell.codeFormatting.preset": "Stroustrup", + "powershell.codeFormatting.trimWhitespaceAroundPipe": true, + "powershell.codeFormatting.whitespaceAfterSeparator": true, + "powershell.codeFormatting.whitespaceAroundOperator": true, + "powershell.codeFormatting.whitespaceBeforeOpenBrace": true, + "powershell.codeFormatting.whitespaceBeforeOpenParen": true, + "powershell.codeFormatting.whitespaceBetweenParameters": true, + "powershell.codeFormatting.whitespaceInsideBrace": true, + "shellcheck.exclude": [ + "SC1091" + ] +} \ No newline at end of file From cb978fdbcbc0068fccc1ff616f3f1e418ca7c299 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 23 Aug 2023 13:20:19 +0000 Subject: [PATCH 2133/3485] Updating readme file for macos-13 version 20230821.3 (#8130) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-13-Readme.md | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/images/macos/macos-13-Readme.md b/images/macos/macos-13-Readme.md index fdf5a1dfdab4..a53375419a90 100644 --- a/images/macos/macos-13-Readme.md +++ b/images/macos/macos-13-Readme.md @@ -1,7 +1,7 @@ # macOS 13 - OS Version: macOS 13.5 (22G74) - Kernel Version: Darwin 22.6.0 -- Image Version: 20230814.1 +- Image Version: 20230821.3 ## Installed Software @@ -17,13 +17,13 @@ - Julia 1.9.2 - Kotlin 1.9.0-release-358 - Perl 5.36.1 -- PHP 8.2.8 +- PHP 8.2.9 - Python3 3.11.4 - R 4.3.1 - Ruby 3.0.6p216 ### Package Management -- Bundler 2.4.18 +- Bundler 2.4.19 - Carthage 0.39.0 - CocoaPods 1.12.1 - Composer 2.5.8 @@ -31,8 +31,8 @@ - NPM 9.6.7 - Pip3 23.2.1 (python 3.11) - Pipx 1.2.0 -- RubyGems 3.4.18 -- Vcpkg 2023 (build from commit 0fa8459cf) +- RubyGems 3.4.19 +- Vcpkg 2023 (build from commit c95000e1b) - Yarn 1.22.19 ### Project Management @@ -54,27 +54,27 @@ - gpg (GnuPG) 2.4.3 - jq 1.6 - OpenSSL 1.1.1v 1 Aug 2023 -- Packer 1.9.2 +- Packer 1.9.4 - pkg-config 0.29.2 - Vagrant 2.3.7 - yq 4.35.1 - zstd 1.5.5 ### Tools -- AWS CLI 2.13.9 +- AWS CLI 2.13.11 - AWS SAM CLI 1.95.0 - AWS Session Manager CLI 1.2.463.0 - Azure CLI 2.50.0 - Azure CLI (azure-devops) 0.26.0 - Bicep CLI 0.20.4 - Cabal 3.6.2.0 -- Cmake 3.27.2 +- Cmake 3.27.3 - CodeQL Action Bundles 2.14.1 2.14.2 - Fastlane 2.214.0 - GHC 9.6.2 - GHCup 0.1.19.4 - Stack 2.9.3 -- SwiftFormat 0.52.0 +- SwiftFormat 0.52.2 - Xcode Command Line Tools 14.3.1.0.1.1683849156 ### Linters @@ -83,12 +83,12 @@ ### Browsers - Safari 16.6 (18615.3.12.11.2) - SafariDriver 16.6 (18615.3.12.11.2) -- Google Chrome 115.0.5790.170 -- Google Chrome for Testing 115.0.5790.170 -- ChromeDriver 115.0.5790.170 +- Google Chrome 116.0.5845.96 +- Google Chrome for Testing 116.0.5845.96 +- ChromeDriver 116.0.5845.96 - Microsoft Edge 115.0.1901.203 - Microsoft Edge WebDriver 115.0.1901.203 -- Mozilla Firefox 116.0.2 +- Mozilla Firefox 116.0.3 - geckodriver 0.33.0 - Selenium server 4.10.0 @@ -226,7 +226,7 @@ | Android Command Line Tools | 8.0 | | Android Emulator | 32.1.14 | | Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | -| Android SDK Platforms | android-34 (rev 1)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | +| Android SDK Platforms | android-34 (rev 2)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | | Android SDK Platform-Tools | 34.0.4 | | Android Support Repository | 47.0.0 | | CMake | 3.18.1<br>3.22.1 | From fa54b5b0dc570e587c2e8e41cfac9744ca9f3c9d Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Wed, 23 Aug 2023 20:32:49 +0200 Subject: [PATCH 2134/3485] [Windows] Update software report (ant version) (#8139) --- images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 index e059910be4e9..32e7b6b75bab 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 @@ -152,7 +152,7 @@ function Get-NugetVersion { } function Get-AntVersion { - (ant -version) -match "version" | Take-Part -Part 3 + ant -version | Take-Part -Part 3 } function Get-MavenVersion { From 02eb087db06503abbd228dc9e7c38cbb74c930c9 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Thu, 24 Aug 2023 09:52:26 +0200 Subject: [PATCH 2135/3485] [Windows] Update LLVM version to 16 (#8134) --- images/win/toolsets/toolset-2019.json | 2 +- images/win/toolsets/toolset-2022.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index 6e53672b6fc7..e54fdf49c388 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -479,7 +479,7 @@ "version": "8.2" }, "llvm": { - "version": "15" + "version": "16" }, "postgresql": { "version": "14" diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index b93c2c719315..4d344e3e6727 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -409,7 +409,7 @@ "version": "3.08" }, "llvm": { - "version": "15" + "version": "16" }, "php": { "version": "8.2" From 960b38329fc7f697fdb283d78c73762b96aab08d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 24 Aug 2023 11:06:16 +0000 Subject: [PATCH 2136/3485] Updating readme file for ubuntu20 version 20230821.1.0 (#8123) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2004-Readme.md | 58 +++++++++++++++---------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/images/linux/Ubuntu2004-Readme.md b/images/linux/Ubuntu2004-Readme.md index c04b063c8ba4..d36b5ecc839b 100644 --- a/images/linux/Ubuntu2004-Readme.md +++ b/images/linux/Ubuntu2004-Readme.md @@ -1,7 +1,7 @@ # Ubuntu 20.04 - OS Version: 20.04.6 LTS - Kernel Version: 5.15.0-1042-azure -- Image Version: 20230814.1.0 +- Image Version: 20230821.1.0 - Systemd version: 245.4-4ubuntu3.22 ## Installed Software @@ -37,7 +37,7 @@ - Pip3 20.0.2 - Pipx 1.2.0 - RubyGems 3.1.2 -- Vcpkg (build from commit 5fa92f467) +- Vcpkg (build from commit c95000e1b) - Yarn 1.22.19 #### Environment variables @@ -56,7 +56,7 @@ to accomplish this. ### Project Management - Ant 1.10.7 -- Gradle 8.2.1 +- Gradle 8.3 - Lerna 7.1.5 - Maven 3.8.8 - Sbt 1.9.3 @@ -69,34 +69,34 @@ to accomplish this. - Bazelisk 1.13.2 - Bicep 0.20.4 - Buildah 1.22.3 -- CMake 3.27.2 +- CMake 3.27.3 - CodeQL Action Bundles 2.14.1 2.14.2 - Docker Amazon ECR Credential Helper 0.7.1 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.20.2+azure-1 +- Docker Compose v2 2.20.3 - Docker-Buildx 0.11.2 -- Docker-Moby Client 23.0.6+azure-2 -- Docker-Moby Server 23.0.6+azure-2 +- Docker Client 24.0.5 +- Docker Server 24.0.5 - Fastlane 2.214.0 - Git 2.41.0 - Git LFS 3.4.0 - Git-ftp 1.6.0 - Haveged 1.9.1 -- Heroku 8.1.9 +- Heroku 8.3.1 - HHVM (HipHop VM) 4.172.1 - jq 1.6 - Kind 0.20.0 -- Kubectl 1.27.4 +- Kubectl 1.28.0 - Kustomize 5.1.1 - Leiningen 2.10.0 - MediaInfo 19.09 - Mercurial 5.3.1 -- Minikube 1.31.1 +- Minikube 1.31.2 - n 9.1.0 - Newman 5.3.2 - nvm 0.39.4 - OpenSSL 1.1.1f-1ubuntu2.19 -- Packer 1.9.2 +- Packer 1.9.4 - Parcel 2.9.3 - PhantomJS 2.1.1 2.1.1 - Podman 3.4.2 @@ -111,19 +111,19 @@ to accomplish this. - zstd 1.5.5 ### CLI Tools -- Alibaba Cloud CLI 3.0.172 -- AWS CLI 2.13.9 +- Alibaba Cloud CLI 3.0.174 +- AWS CLI 2.13.11 - AWS CLI Session Manager Plugin 1.2.497.0 - AWS SAM CLI 1.95.0 - Azure CLI 2.51.0 - Azure CLI (azure-devops) 0.26.0 - GitHub CLI 2.32.1 -- Google Cloud SDK 442.0.0 +- Google Cloud SDK 443.0.0 - Hub CLI 2.14.2 -- Netlify CLI 16.0.3 -- OpenShift CLI 4.13.8 +- Netlify CLI 16.1.0 +- OpenShift CLI 4.13.9 - ORAS CLI 1.0.1 -- Vercel CLI 31.3.0 +- Vercel CLI 31.4.0 ### Java | Version | Environment Variable | @@ -133,7 +133,7 @@ to accomplish this. | 17.0.8+7 | JAVA_HOME_17_X64 | ### PHP Tools -- PHP: 7.4.33, 8.0.30, 8.1.22, 8.2.8 +- PHP: 7.4.33, 8.0.30, 8.1.22, 8.2.9 - Composer 2.5.8 - PHPUnit 8.5.33 ``` @@ -161,9 +161,9 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.5.2 ### Browsers and Drivers -- Google Chrome 115.0.5790.170 -- ChromeDriver 115.0.5790.170 -- Chromium 115.0.5790.0 +- Google Chrome 116.0.5845.96 +- ChromeDriver 116.0.5845.96 +- Chromium 116.0.5845.0 - Microsoft Edge 115.0.1901.203 - Microsoft Edge WebDriver 115.0.1901.203 - Selenium server 4.11.0 @@ -195,7 +195,7 @@ Use the following command as a part of your job to start the service: 'sudo syst ``` #### MySQL -- MySQL 8.0.33-0ubuntu0.20.04.4 +- MySQL 8.0.34-0ubuntu0.20.04.1 ``` User: root Password: root @@ -268,7 +268,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | Android Emulator | 32.1.14 | | Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | | Android SDK Platform-Tools | 34.0.4 | -| Android SDK Platforms | android-34 (rev 1)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | +| Android SDK Platforms | android-34 (rev 2)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | | Android SDK Tools | 26.1.1 | | Android Support Repository | 47.0.0 | | CMake | 3.10.2<br>3.18.1<br>3.22.1 | @@ -293,18 +293,18 @@ Use the following command as a part of your job to start the service: 'sudo syst | alpine:3.16 | sha256:a8cbb8c69ee71561f4b69c066bad07f7e510caaa523da26fbfc606b10bd7934b | 2023-08-07 | | alpine:3.17 | sha256:f71a5f071694a785e064f05fed657bf8277f1b2113a8ed70c90ad486d6ee54dc | 2023-08-07 | | alpine:3.18 | sha256:7144f7bab3d4c2648d7e59409f15ec52a18006a128c733fcff20d3a4a54ba44a | 2023-08-07 | -| buildpack-deps:bullseye | sha256:593db75ce93184b16d45021566ed2d77f5009a8ce88da8254919a2e9e6ec14bf | 2023-07-28 | -| buildpack-deps:buster | sha256:b2c2267e1944a42dcdd448b66e8c8c889a3f5d1ab9705421326077a40a8aa0bc | 2023-07-28 | +| buildpack-deps:bullseye | sha256:930a1ea53e70457cde2c9d449b531979475330c50366fef8d22520d676c2bb0d | 2023-08-16 | +| buildpack-deps:buster | sha256:c6cfa5c691f91c0760341abf073efe1c4b0437ad05375290b3298b8e1219de5b | 2023-08-16 | | buildpack-deps:stretch | sha256:78e995165a5788c2f55aed6e548d8f6c1534830d4310c870408fccb2da8c5b2e | 2022-06-23 | -| debian:10 | sha256:7cd85d3d51a435062010581f14c5e3f9428388ac7234cc9a1e23dd14d7e4e914 | 2023-07-27 | -| debian:11 | sha256:630454da4c59041a2bca987a0d54c68962f1d6ea37a3641bd61db42b753234f2 | 2023-07-27 | +| debian:10 | sha256:b86bfc1dd2fb1820fea6c1e0b6e23d155198b518b3a506f6edad71bf6e9a8cef | 2023-08-16 | +| debian:11 | sha256:1beb7cf458bdfe71b5220cb2069eb45e3fc7eb77a1ccfb169eaebf5f6c4809ab | 2023-08-16 | | debian:9 | sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be | 2022-06-23 | | moby/buildkit:latest | sha256:d91fe5e6dad11f2c2cee6d268d5843ad64bf2e9852365d56b12d02f2315edce5 | 2023-08-02 | | node:14 | sha256:a158d3b9b4e3fa813fa6c8c590b8f0a860e015ad4e59bbce5744d2f6fd8461aa | 2023-04-12 | | node:14-alpine | sha256:434215b487a329c9e867202ff89e704d3a75e554822e07f3e0c0f9e606121b33 | 2023-03-29 | -| node:16 | sha256:8c3c7e253d9484a35ed9db3e6ba296d859a382f48602d0321e4734a91311ac95 | 2023-08-10 | +| node:16 | sha256:818b5adc1ee4a04e8ad5efeb70871571efe414315ad7f16844f24f9962ffdc7e | 2023-08-17 | | node:16-alpine | sha256:a1f9d027912b58a7c75be7716c97cfbc6d3099f3a97ed84aa490be9dee20e787 | 2023-08-10 | -| node:18 | sha256:87b15e8e40a6b088012ca65d6685b89948ec722c1955bc0f6bbf9ad20855781a | 2023-08-10 | +| node:18 | sha256:11e9c297fc51f6f65f7d0c7c8a8581e5721f2f16de43ceff1a199fd3ef609f95 | 2023-08-17 | | node:18-alpine | sha256:3482a20c97e401b56ac50ba8920cc7b5b2022bfc6aa7d4e4c231755770cf892f | 2023-08-10 | | ubuntu:16.04 | sha256:1f1a2d56de1d604801a9671f301190704c25d604a416f59e03c04f5c6ffee0d6 | 2021-08-31 | | ubuntu:18.04 | sha256:152dc042452c496007f07ca9127571cb9c29697f42acbfad72324b2bb2e43c98 | 2023-05-30 | From 874cab74964a3bc8eb850296553eccfef10c6a4b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 24 Aug 2023 11:06:39 +0000 Subject: [PATCH 2137/3485] Updating readme file for ubuntu22 version 20230821.1.0 (#8124) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2204-Readme.md | 56 +++++++++++++++---------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/images/linux/Ubuntu2204-Readme.md b/images/linux/Ubuntu2204-Readme.md index e5208c04b623..4526e76ffed0 100644 --- a/images/linux/Ubuntu2204-Readme.md +++ b/images/linux/Ubuntu2204-Readme.md @@ -1,7 +1,7 @@ # Ubuntu 22.04 - OS Version: 22.04.3 LTS - Kernel Version: 5.15.0-1041-azure -- Image Version: 20230814.1.0 +- Image Version: 20230821.1.0 - Systemd version: 249.11-0ubuntu3.9 ## Installed Software @@ -35,7 +35,7 @@ - Pip3 22.0.2 - Pipx 1.2.0 - RubyGems 3.3.5 -- Vcpkg (build from commit 5fa92f467) +- Vcpkg (build from commit c95000e1b) - Yarn 1.22.19 #### Environment variables @@ -64,33 +64,33 @@ to accomplish this. - Bazelisk 1.13.2 - Bicep 0.20.4 - Buildah 1.23.1 -- CMake 3.27.2 +- CMake 3.27.3 - CodeQL Action Bundles 2.14.1 2.14.2 - Docker Amazon ECR Credential Helper 0.7.1 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.20.2+azure-1 +- Docker Compose v2 2.20.3 - Docker-Buildx 0.11.2 -- Docker-Moby Client 23.0.6+azure-2 -- Docker-Moby Server 23.0.6+azure-2 +- Docker Client 24.0.5 +- Docker Server 24.0.5 - Fastlane 2.214.0 - Git 2.41.0 - Git LFS 3.4.0 - Git-ftp 1.6.0 - Haveged 1.9.14 -- Heroku 8.1.9 +- Heroku 8.3.1 - jq 1.6 - Kind 0.20.0 -- Kubectl 1.27.4 +- Kubectl 1.28.0 - Kustomize 5.1.1 - Leiningen 2.10.0 - MediaInfo 21.09 - Mercurial 6.1.1 -- Minikube 1.31.1 +- Minikube 1.31.2 - n 9.1.0 - Newman 5.3.2 - nvm 0.39.4 - OpenSSL 3.0.2-0ubuntu1.10 -- Packer 1.9.2 +- Packer 1.9.4 - Parcel 2.9.3 - Podman 3.4.4 - Pulumi 3.78.1 @@ -104,19 +104,19 @@ to accomplish this. - zstd 1.5.5 ### CLI Tools -- Alibaba Cloud CLI 3.0.172 -- AWS CLI 2.13.9 +- Alibaba Cloud CLI 3.0.177 +- AWS CLI 2.13.11 - AWS CLI Session Manager Plugin 1.2.497.0 - AWS SAM CLI 1.95.0 - Azure CLI 2.51.0 - Azure CLI (azure-devops) 0.26.0 - GitHub CLI 2.32.1 -- Google Cloud SDK 442.0.0 +- Google Cloud SDK 443.0.0 - Hub CLI 2.14.2 -- Netlify CLI 16.0.3 -- OpenShift CLI 4.13.8 +- Netlify CLI 16.1.0 +- OpenShift CLI 4.13.9 - ORAS CLI 1.0.1 -- Vercel CLI 31.3.0 +- Vercel CLI 31.4.0 ### Java | Version | Environment Variable | @@ -154,9 +154,9 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.5.2 ### Browsers and Drivers -- Google Chrome 115.0.5790.170 -- ChromeDriver 115.0.5790.170 -- Chromium 115.0.5790.0 +- Google Chrome 116.0.5845.96 +- ChromeDriver 116.0.5845.96 +- Chromium 116.0.5845.0 - Microsoft Edge 115.0.1901.203 - Microsoft Edge WebDriver 115.0.1901.203 - Selenium server 4.11.0 @@ -187,7 +187,7 @@ Use the following command as a part of your job to start the service: 'sudo syst ``` #### MySQL -- MySQL 8.0.33-0ubuntu0.22.04.4 +- MySQL 8.0.34-0ubuntu0.22.04.1 ``` User: root Password: root @@ -251,7 +251,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | Android Emulator | 32.1.14 | | Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | | Android SDK Platform-Tools | 34.0.4 | -| Android SDK Platforms | android-34 (rev 1)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | +| Android SDK Platforms | android-34 (rev 2)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | | Android SDK Tools | 26.1.1 | | Android Support Repository | 47.0.0 | | CMake | 3.10.2<br>3.18.1<br>3.22.1 | @@ -276,20 +276,20 @@ Use the following command as a part of your job to start the service: 'sudo syst | alpine:3.16 | sha256:a8cbb8c69ee71561f4b69c066bad07f7e510caaa523da26fbfc606b10bd7934b | 2023-08-07 | | alpine:3.17 | sha256:f71a5f071694a785e064f05fed657bf8277f1b2113a8ed70c90ad486d6ee54dc | 2023-08-07 | | alpine:3.18 | sha256:7144f7bab3d4c2648d7e59409f15ec52a18006a128c733fcff20d3a4a54ba44a | 2023-08-07 | -| buildpack-deps:bullseye | sha256:593db75ce93184b16d45021566ed2d77f5009a8ce88da8254919a2e9e6ec14bf | 2023-07-28 | -| buildpack-deps:buster | sha256:b2c2267e1944a42dcdd448b66e8c8c889a3f5d1ab9705421326077a40a8aa0bc | 2023-07-28 | -| debian:10 | sha256:7cd85d3d51a435062010581f14c5e3f9428388ac7234cc9a1e23dd14d7e4e914 | 2023-07-27 | -| debian:11 | sha256:630454da4c59041a2bca987a0d54c68962f1d6ea37a3641bd61db42b753234f2 | 2023-07-27 | +| buildpack-deps:bullseye | sha256:930a1ea53e70457cde2c9d449b531979475330c50366fef8d22520d676c2bb0d | 2023-08-16 | +| buildpack-deps:buster | sha256:c6cfa5c691f91c0760341abf073efe1c4b0437ad05375290b3298b8e1219de5b | 2023-08-16 | +| debian:10 | sha256:b86bfc1dd2fb1820fea6c1e0b6e23d155198b518b3a506f6edad71bf6e9a8cef | 2023-08-16 | +| debian:11 | sha256:1beb7cf458bdfe71b5220cb2069eb45e3fc7eb77a1ccfb169eaebf5f6c4809ab | 2023-08-16 | | moby/buildkit:latest | sha256:d91fe5e6dad11f2c2cee6d268d5843ad64bf2e9852365d56b12d02f2315edce5 | 2023-08-02 | | node:14 | sha256:a158d3b9b4e3fa813fa6c8c590b8f0a860e015ad4e59bbce5744d2f6fd8461aa | 2023-04-12 | | node:14-alpine | sha256:434215b487a329c9e867202ff89e704d3a75e554822e07f3e0c0f9e606121b33 | 2023-03-29 | -| node:16 | sha256:8c3c7e253d9484a35ed9db3e6ba296d859a382f48602d0321e4734a91311ac95 | 2023-08-10 | +| node:16 | sha256:818b5adc1ee4a04e8ad5efeb70871571efe414315ad7f16844f24f9962ffdc7e | 2023-08-17 | | node:16-alpine | sha256:a1f9d027912b58a7c75be7716c97cfbc6d3099f3a97ed84aa490be9dee20e787 | 2023-08-10 | -| node:18 | sha256:87b15e8e40a6b088012ca65d6685b89948ec722c1955bc0f6bbf9ad20855781a | 2023-08-10 | +| node:18 | sha256:11e9c297fc51f6f65f7d0c7c8a8581e5721f2f16de43ceff1a199fd3ef609f95 | 2023-08-17 | | node:18-alpine | sha256:3482a20c97e401b56ac50ba8920cc7b5b2022bfc6aa7d4e4c231755770cf892f | 2023-08-10 | | ubuntu:18.04 | sha256:152dc042452c496007f07ca9127571cb9c29697f42acbfad72324b2bb2e43c98 | 2023-05-30 | | ubuntu:20.04 | sha256:33a5cc25d22c45900796a1aca487ad7a7cb09f09ea00b779e3b2026b4fc2faba | 2023-08-01 | -| ubuntu:22.04 | sha256:0bced47fffa3361afa981854fcabcd4577cd43cebbb808cea2b1f33a3dd7f508 | 2023-06-28 | +| ubuntu:22.04 | sha256:ec050c32e4a6085b423d36ecd025c0d3ff00c38ab93a3d71a460ff1c44fa6d77 | 2023-08-04 | ### Installed apt packages | Name | Version | From 862df5867346359bc58a7260e8af8e54fcc19e37 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 24 Aug 2023 12:34:51 +0000 Subject: [PATCH 2138/3485] Updating readme file for win19 version 20230820.1.0 (#8129) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2019-Readme.md | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index 819d45692ed7..1c783fbf9aec 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -1,6 +1,6 @@ # Windows Server 2019 - OS Version: 10.0.17763 Build 4737 -- Image Version: 20230814.1.0 +- Image Version: 20230820.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -29,7 +29,7 @@ - pip 23.2.1 (python 3.7) - Pipx 1.2.0 - RubyGems 2.7.6.3 -- Vcpkg (build from commit 576f3f1ad) +- Vcpkg (build from commit c95000e1b) - Yarn 1.22.19 #### Environment variables @@ -52,7 +52,7 @@ - Bazelisk 1.13.2 - Bicep 0.20.4 - Cabal 3.10.1.0 -- CMake 3.27.2 +- CMake 3.27.3 - CodeQL Action Bundles 2.14.1 2.14.2 - Docker 24.0.5 - Docker Compose v1 1.29.2 @@ -61,7 +61,7 @@ - ghc 9.6.2 - Git 2.41.0.windows.3 - Git LFS 3.3.0 -- Google Cloud SDK 442.0.0 +- Google Cloud SDK 443.0.0 - ImageMagick 7.1.1-15 - InnoSetup 6.2.2 - jq 1.6 @@ -87,7 +87,7 @@ - zstd 1.5.5 ### CLI Tools -- Alibaba Cloud CLI 3.0.172 +- Alibaba Cloud CLI 3.0.177 - AWS CLI 2.13.9 - AWS SAM CLI 1.95.0 - AWS Session Manager CLI 1.2.497.0 @@ -112,11 +112,11 @@ - Rustfmt 1.5.2 ### Browsers and Drivers -- Google Chrome 115.0.5790.171 -- Chrome Driver 115.0.5790.170 +- Google Chrome 116.0.5845.96 +- Chrome Driver 116.0.5845.96 - Microsoft Edge 115.0.1901.203 - Microsoft Edge Driver 115.0.1901.203 -- Mozilla Firefox 116.0.2 +- Mozilla Firefox 116.0.3 - Gecko Driver 0.33.0 - IE Driver 4.11.0.0 - Selenium server 4.11.0 @@ -223,7 +223,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Name | Version | ConfigFile | ServiceName | ServiceStatus | ListenPort | | ------ | ------- | ------------------------------------- | ----------- | ------------- | ---------- | | Apache | 2.4.55 | C:\tools\Apache24\conf\httpd.conf | Apache | Stopped | 80 | -| Nginx | 1.25.1 | C:\tools\nginx-1.25.1\conf\nginx.conf | nginx | Stopped | 80 | +| Nginx | 1.25.2 | C:\tools\nginx-1.25.2\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2019 | Name | Version | Path | @@ -508,7 +508,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Az (Cached): 1.0.0.zip, 1.6.0.zip, 2.3.2.zip, 2.6.0.zip, 3.1.0.zip, 3.5.0.zip, 3.8.0.zip, 4.3.0.zip, 4.4.0.zip, 4.7.0.zip, 5.5.0.zip, 5.9.0.zip, 6.6.0.zip, 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.392 +- AWSPowershell: 4.1.397 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 - Microsoft.Graph: 2.3.0 @@ -529,7 +529,7 @@ All other versions are saved but not installed. | -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | | Android Command Line Tools | 8.0 | | Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3<br>26.0.0 26.0.1 26.0.2 26.0.3<br>25.0.0 25.0.1 25.0.2 25.0.3<br>24.0.0 24.0.1 24.0.2 24.0.3<br>23.0.1 23.0.2 23.0.3<br>22.0.1<br>21.1.2<br>20.0.0<br>19.1.0 | -| Android SDK Platforms | android-34 (rev 1)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3)<br>android-26 (rev 2)<br>android-25 (rev 3)<br>android-24 (rev 2)<br>android-23 (rev 3)<br>android-22 (rev 2)<br>android-21 (rev 2)<br>android-20 (rev 2)<br>android-19 (rev 4) | +| Android SDK Platforms | android-34 (rev 2)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3)<br>android-26 (rev 2)<br>android-25 (rev 3)<br>android-24 (rev 2)<br>android-23 (rev 3)<br>android-22 (rev 2)<br>android-21 (rev 2)<br>android-20 (rev 2)<br>android-19 (rev 4) | | Android SDK Platform-Tools | 34.0.4 | | Android SDK Tools | 26.1.1 | | Android Support Repository | 47.0.0 | From 5ff59cadc419a292fc07cf528a2b551be3f59d5b Mon Sep 17 00:00:00 2001 From: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com> Date: Thu, 24 Aug 2023 15:15:31 +0200 Subject: [PATCH 2139/3485] [macos] use mist-cli for downloading OS distribution when generating anka clean vm (#8141) --- images.CI/macos/anka/CreateCleanAnkaTemplate.ps1 | 2 +- images.CI/macos/anka/Service.Helpers.psm1 | 15 ++++----------- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/images.CI/macos/anka/CreateCleanAnkaTemplate.ps1 b/images.CI/macos/anka/CreateCleanAnkaTemplate.ps1 index c7b6c056bba9..ec692d465c9b 100644 --- a/images.CI/macos/anka/CreateCleanAnkaTemplate.ps1 +++ b/images.CI/macos/anka/CreateCleanAnkaTemplate.ps1 @@ -180,7 +180,7 @@ Remove-AnkaVM -VMName $TemplateName Write-Host "`t[*] Creating Anka VM template with name '$TemplateName' and '$TemplateUsername' user" Write-Host "`t[*] CPU Count: $CPUCount, RamSize: ${RamSizeGb}G, DiskSizeGb: ${DiskSizeGb}G, InstallerPath: $macOSInstaller, TemplateName: $TemplateName" -New-AnkaVMTemplate -InstallerPath $macOSInstaller ` +New-AnkaVMTemplate -InstallerPath "$macOSInstaller" ` -TemplateName $TemplateName ` -TemplateUsername $TemplateUsername ` -TemplatePassword $TemplatePassword ` diff --git a/images.CI/macos/anka/Service.Helpers.psm1 b/images.CI/macos/anka/Service.Helpers.psm1 index 4d08547e1c9e..5bf54ef6ca14 100644 --- a/images.CI/macos/anka/Service.Helpers.psm1 +++ b/images.CI/macos/anka/Service.Helpers.psm1 @@ -180,26 +180,19 @@ function Get-MacOSInstaller { exit 1 } - $installerPathPattern = "/Applications/Install macOS ${macOSName}*.app" - if (Test-Path $installerPathPattern) { - $previousInstallerPath = Get-Item -Path $installerPathPattern - Write-Host "`t[*] Removing '$previousInstallerPath' installation app before downloading the new one" - sudo rm -rf "$previousInstallerPath" - } - # Clear LastRecommendedMajorOSBundleIdentifier to prevent error during fetching updates # Install failed with error: Update not found Update-SoftwareBundle # Download macOS installer Write-Host "`t[*] Requested macOS '$MacOSVersion' version installer found, fetching it from Apple Software Update" - $result = Invoke-WithRetry { /usr/sbin/softwareupdate --fetch-full-installer --full-installer-version $MacOSVersion } {$LASTEXITCODE -eq 0} | Out-String - if (-not $result.Contains("Install finished successfully")) { - Write-Host "`t[x] Failed to fetch $MacOSVersion macOS `n$result" + Invoke-WithRetry -Command { sudo /usr/local/bin/mist download installer $MacOSVersion application --force --export installer.json --output-directory /Applications } -BreakCondition { $LASTEXITCODE -eq 0 } | Out-Null + if (-not(Test-Path installer.json -PathType leaf)) { + Write-Host "`t[x] Failed to fetch $MacOSVersion macOS" exit 1 } - $installerPath = (Get-Item -Path $installerPathPattern).FullName + $installerPath = (Get-Content installer.json | Out-String | ConvertFrom-Json).options.applicationPath if (-not $installerPath) { Write-Host "`t[x] Path not found using '$installerPathPattern'" exit 1 From 37b9221f4d47d74a2a6d5506c47e2a0ee5486c57 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Thu, 24 Aug 2023 18:40:20 +0200 Subject: [PATCH 2140/3485] report Tool nodes with null or empty versions (#8154) --- helpers/software-report-base/SoftwareReport.Nodes.psm1 | 10 ++++++++++ .../tests/SoftwareReport.Nodes.Unit.Tests.ps1 | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/helpers/software-report-base/SoftwareReport.Nodes.psm1 b/helpers/software-report-base/SoftwareReport.Nodes.psm1 index 5d0b1d356215..418909271474 100644 --- a/helpers/software-report-base/SoftwareReport.Nodes.psm1 +++ b/helpers/software-report-base/SoftwareReport.Nodes.psm1 @@ -161,6 +161,11 @@ class ToolVersionNode: BaseToolNode { [String] $Version ToolVersionNode([String] $ToolName, [String] $Version): base($ToolName) { + + if ([String]::IsNullOrEmpty($Version)) { + throw "ToolVersionNode '$($this.ToolName)' has empty version" + } + $this.Version = $Version } @@ -196,6 +201,11 @@ class ToolVersionsListNode: BaseToolNode { ToolVersionsListNode([String] $ToolName, [String[]] $Versions, [String] $MajorVersionRegex, [String] $ListType): base($ToolName) { $this.Versions = $Versions + + if ([String]::IsNullOrEmpty($Versions)) { + throw "ToolVersionsListNode '$($this.ToolName)' has empty versions list" + } + $this.MajorVersionRegex = [Regex]::new($MajorVersionRegex) $this.ListType = $ListType $this.ValidateMajorVersionRegex() diff --git a/helpers/software-report-base/tests/SoftwareReport.Nodes.Unit.Tests.ps1 b/helpers/software-report-base/tests/SoftwareReport.Nodes.Unit.Tests.ps1 index 94bcf3a74fef..d8f2324734f2 100644 --- a/helpers/software-report-base/tests/SoftwareReport.Nodes.Unit.Tests.ps1 +++ b/helpers/software-report-base/tests/SoftwareReport.Nodes.Unit.Tests.ps1 @@ -26,7 +26,7 @@ Describe "Nodes.UnitTests" { It "Deserialization" { { [ToolVersionNode]::FromJsonObject(@{ NodeType = "ToolVersionNode"; ToolName = ""; Version = "2.1.3" }) } | Should -Throw '*Exception setting "ToolName": "The argument is null or empty.*' - { [ToolVersionNode]::FromJsonObject(@{ NodeType = "ToolVersionNode"; ToolName = "MyTool"; Version = "" }) } | Should -Throw '*Exception setting "Version": "The argument is null or empty.*' + { [ToolVersionNode]::FromJsonObject(@{ NodeType = "ToolVersionNode"; ToolName = "MyTool"; Version = "" }) } | Should -Throw 'ToolVersionNode ''MyTool'' has empty version' { [ToolVersionNode]::FromJsonObject(@{ NodeType = "ToolVersionNode"; ToolName = "MyTool"; Version = "2.1.3" }) } | Should -Not -Throw } From a68981286565eb5217eee6a655af2beaebbbb034 Mon Sep 17 00:00:00 2001 From: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com> Date: Fri, 25 Aug 2023 09:27:10 +0200 Subject: [PATCH 2141/3485] [macos] update XCode 15 to Beta 7 (#8165) --- images/macos/toolsets/toolset-13.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/macos/toolsets/toolset-13.json b/images/macos/toolsets/toolset-13.json index 2606b4d0eddd..91e97e9604cd 100644 --- a/images/macos/toolsets/toolset-13.json +++ b/images/macos/toolsets/toolset-13.json @@ -3,7 +3,7 @@ "default": "14.2", "x64": { "versions": [ - { "link": "15.0", "version": "15.0.0-Beta.6+15A5219j" }, + { "link": "15.0", "version": "15.0.0-Beta.7+15A5229h" }, { "link": "14.3.1", "version": "14.3.1+14E300c" }, { "link": "14.3", "version": "14.3.0+14E222b" }, { "link": "14.2", "version": "14.2.0+14C18" }, @@ -12,7 +12,7 @@ }, "arm64":{ "versions": [ - { "link": "15.0", "version": "15.0.0-Beta.6+15A5219j" }, + { "link": "15.0", "version": "15.0.0-Beta.7+15A5229h" }, { "link": "14.3.1", "version": "14.3.1+14E300c" }, { "link": "14.3", "version": "14.3.0+14E222b" }, { "link": "14.2", "version": "14.2.0+14C18" }, From b21ec054ff74b0db93ceda03e75071405edbe1f1 Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Fri, 25 Aug 2023 10:46:18 +0200 Subject: [PATCH 2142/3485] Fix powershell code format configuration (#8155) --- .vscode/settings.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index ddd8d2ec0c2a..dd30ae4c08da 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -2,11 +2,11 @@ "powershell.codeFormatting.addWhitespaceAroundPipe": true, "powershell.codeFormatting.alignPropertyValuePairs": true, "powershell.codeFormatting.autoCorrectAliases": true, - "powershell.codeFormatting.newLineAfterCloseBrace": true, + "powershell.codeFormatting.newLineAfterCloseBrace": false, "powershell.codeFormatting.newLineAfterOpenBrace": true, "powershell.codeFormatting.openBraceOnSameLine": true, "powershell.codeFormatting.pipelineIndentationStyle": "IncreaseIndentationForFirstPipeline", - "powershell.codeFormatting.preset": "Stroustrup", + "powershell.codeFormatting.preset": "OTBS", "powershell.codeFormatting.trimWhitespaceAroundPipe": true, "powershell.codeFormatting.whitespaceAfterSeparator": true, "powershell.codeFormatting.whitespaceAroundOperator": true, From a4f3c433b424ea2bbce7fbfa5ffab85fddd9d6cc Mon Sep 17 00:00:00 2001 From: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com> Date: Fri, 25 Aug 2023 11:29:01 +0200 Subject: [PATCH 2143/3485] [macos] check exit code in Invoke-SSHPassCommand (#8156) --- images.CI/macos/anka/Anka.Helpers.psm1 | 2 +- images.CI/macos/anka/CreateCleanAnkaTemplate.ps1 | 2 ++ images.CI/macos/anka/Service.Helpers.psm1 | 12 ++++++++++-- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/images.CI/macos/anka/Anka.Helpers.psm1 b/images.CI/macos/anka/Anka.Helpers.psm1 index 8f73d15fb62b..7d710b2b691e 100644 --- a/images.CI/macos/anka/Anka.Helpers.psm1 +++ b/images.CI/macos/anka/Anka.Helpers.psm1 @@ -67,7 +67,7 @@ function Invoke-AnkaCommand { [string] $Command ) - $result = bash -c "$Command 2>&1" | Out-String + $result = bash -c "$Command 2>&1" if ($LASTEXITCODE -ne 0) { Write-Error "There is an error during command execution:`n$result" exit 1 diff --git a/images.CI/macos/anka/CreateCleanAnkaTemplate.ps1 b/images.CI/macos/anka/CreateCleanAnkaTemplate.ps1 index ec692d465c9b..d3624798fcd9 100644 --- a/images.CI/macos/anka/CreateCleanAnkaTemplate.ps1 +++ b/images.CI/macos/anka/CreateCleanAnkaTemplate.ps1 @@ -45,6 +45,8 @@ function Invoke-EnableAutoLogon { $ipAddress = Get-AnkaVMIPAddress -VMName $TemplateName + Wait-AnkaVMSSHService -VMName $TemplateName -Seconds 30 + Write-Host "`t[*] Enable AutoLogon" Enable-AutoLogon -HostName $ipAddress -UserName $TemplateUsername -Password $TemplatePassword diff --git a/images.CI/macos/anka/Service.Helpers.psm1 b/images.CI/macos/anka/Service.Helpers.psm1 index 5bf54ef6ca14..94ee6a68957e 100644 --- a/images.CI/macos/anka/Service.Helpers.psm1 +++ b/images.CI/macos/anka/Service.Helpers.psm1 @@ -292,7 +292,12 @@ function Invoke-SSHPassCommand { "${env:SSHUSER}@${HostName}" ) $sshPassOptions = $sshArg -join " " - bash -c "$sshPassOptions \""$Command\"" 2>&1" + $result = bash -c "$sshPassOptions \""$Command\"" 2>&1" + if ($LASTEXITCODE -ne 0) { + Write-Error "There is an error during command execution:`n$result" + exit 1 + } + $result } function Invoke-WithRetry { @@ -330,7 +335,10 @@ function Restart-VMSSH { [string] $HostName ) - $command = "sudo reboot" + # + # https://unix.stackexchange.com/questions/58271/closing-connection-after-executing-reboot-using-ssh-command + # + $command = '(sleep 1 && sudo reboot &) && exit' Invoke-SSHPassCommand -HostName $HostName -Command $command } From 71e9516cb7fc9345b5e1787d44557fde50c128f4 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Sun, 27 Aug 2023 22:28:39 +0200 Subject: [PATCH 2144/3485] [macOS] remove Xcode 14.3, default to 14.3.1 (#8173) --- images/macos/toolsets/toolset-13.json | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/images/macos/toolsets/toolset-13.json b/images/macos/toolsets/toolset-13.json index 91e97e9604cd..bfd46714f30f 100644 --- a/images/macos/toolsets/toolset-13.json +++ b/images/macos/toolsets/toolset-13.json @@ -1,11 +1,10 @@ { "xcode": { - "default": "14.2", + "default": "14.3.1", "x64": { "versions": [ { "link": "15.0", "version": "15.0.0-Beta.7+15A5229h" }, - { "link": "14.3.1", "version": "14.3.1+14E300c" }, - { "link": "14.3", "version": "14.3.0+14E222b" }, + { "link": "14.3.1", "version": "14.3.1+14E300c","symlinks": ["14.3"] }, { "link": "14.2", "version": "14.2.0+14C18" }, { "link": "14.1", "version": "14.1.0+14B47b" } ] @@ -13,8 +12,7 @@ "arm64":{ "versions": [ { "link": "15.0", "version": "15.0.0-Beta.7+15A5229h" }, - { "link": "14.3.1", "version": "14.3.1+14E300c" }, - { "link": "14.3", "version": "14.3.0+14E222b" }, + { "link": "14.3.1", "version": "14.3.1+14E300c","symlinks": ["14.3"] }, { "link": "14.2", "version": "14.2.0+14C18" }, { "link": "14.1", "version": "14.1.0+14B47b" } ] From d5d4c565dffff750a33f0f7d020bc12a4a896d90 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 28 Aug 2023 12:12:47 +0000 Subject: [PATCH 2145/3485] Updating readme file for win22 version 20230820.1.0 (#8126) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2022-Readme.md | 665 +++++++++++++++---------------- 1 file changed, 332 insertions(+), 333 deletions(-) diff --git a/images/win/Windows2022-Readme.md b/images/win/Windows2022-Readme.md index 611f844a8866..68e3f1db9222 100644 --- a/images/win/Windows2022-Readme.md +++ b/images/win/Windows2022-Readme.md @@ -1,10 +1,6 @@ -| Announcements | -|-| -| [[All OSes] Adopt OpenJDK will be removed from images on August, 7](https://github.com/actions/runner-images/issues/8030) | -*** # Windows Server 2022 -- OS Version: 10.0.20348 Build 1850 -- Image Version: 20230804.1.0 +- OS Version: 10.0.20348 Build 1906 +- Image Version: 20230820.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -17,23 +13,23 @@ - Julia 1.9.2 - Kotlin 1.9.0 - LLVM 15.0.7 -- Node 18.17.0 +- Node 18.17.1 - Perl 5.32.1 - PHP 8.2.9 - Python 3.9.13 - Ruby 3.0.6p216 ### Package Management -- Chocolatey 2.2.0 +- Chocolatey 2.2.2 - Composer 2.5.8 -- Helm 3.12.1 +- Helm 3.12.2 - Miniconda 23.5.2 (pre-installed on the image but not added to PATH) - NPM 9.6.7 -- NuGet 6.6.1.2 +- NuGet 6.7.0.127 - pip 23.2.1 (python 3.9) - Pipx 1.2.0 - RubyGems 3.2.33 -- Vcpkg (build from commit 78b61582c) +- Vcpkg (build from commit c95000e1b) - Yarn 1.22.19 #### Environment variables @@ -51,16 +47,16 @@ ### Tools - 7zip 23.01 - aria2 1.36.0 -- azcopy 10.20.0 -- Bazel 6.3.1 +- azcopy 10.20.1 +- Bazel 6.3.2 - Bazelisk 1.13.2 - Bicep 0.20.4 - Cabal 3.10.1.0 -- CMake 3.27.1 -- CodeQL Action Bundles 2.14.0 2.14.1 +- CMake 3.27.3 +- CodeQL Action Bundles 2.14.1 2.14.2 - Docker 24.0.5 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.20.2 +- Docker Compose v2 2.20.3 - Docker-wincred 0.8.0 - ghc 9.6.2 - Git 2.41.0.windows.3 @@ -76,7 +72,7 @@ - NSIS 3.08 - OpenSSL 1.1.1v - Packer 1.9.2 -- Pulumi 3.76.1 +- Pulumi 3.78.1 - R 4.3.1 - Service Fabric SDK 9.1.1436.9590 - Stack 2.11.1 @@ -89,9 +85,9 @@ - zstd 1.5.5 ### CLI Tools -- Alibaba Cloud CLI 3.0.172 -- AWS CLI 2.13.6 -- AWS SAM CLI 1.94.0 +- Alibaba Cloud CLI 3.0.177 +- AWS CLI 2.13.9 +- AWS SAM CLI 1.95.0 - AWS Session Manager CLI 1.2.497.0 - Azure CLI 2.51.0 - Azure DevOps CLI extension 0.26.0 @@ -113,11 +109,11 @@ - Rustfmt 1.5.2 ### Browsers and Drivers -- Google Chrome 115.0.5790.171 -- Chrome Driver 115.0.5790.170 -- Microsoft Edge 115.0.1901.188 -- Microsoft Edge Driver 115.0.1901.188 -- Mozilla Firefox 116.0.1 +- Google Chrome 116.0.5845.96 +- Chrome Driver 116.0.5845.96 +- Microsoft Edge 115.0.1901.203 +- Microsoft Edge Driver 115.0.1901.203 +- Mozilla Firefox 116.0.3 - Gecko Driver 0.33.0 - IE Driver 4.11.0.0 - Selenium server 4.11.0 @@ -160,11 +156,12 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 1.18.10 - 1.19.12 - 1.20.7 +- 1.21.0 #### Node.js - 14.21.3 -- 16.20.1 -- 18.17.0 +- 16.20.2 +- 18.17.1 #### Python - 3.7.9 @@ -178,6 +175,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 3.7.13 [PyPy 7.3.9] - 3.8.16 [PyPy 7.3.11] - 3.9.17 [PyPy 7.3.12] +- 3.10.12 [PyPy 7.3.12] #### Ruby - 2.7.8 @@ -190,7 +188,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Property | Value | | -------------------- | ------------------------------------------------------------------------------------------------------------------------------------ | | ServiceName | postgresql-x64-14 | -| Version | 14.8 | +| Version | 14.9 | | ServiceStatus | Stopped | | ServiceStartType | Disabled | | EnvironmentVariables | PGBIN=C:\Program Files\PostgreSQL\14\bin <br> PGDATA=C:\Program Files\PostgreSQL\14\data <br> PGROOT=C:\Program Files\PostgreSQL\14 | @@ -201,7 +199,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### MongoDB | Version | ServiceName | ServiceStatus | ServiceStartType | | -------- | ----------- | ------------- | ---------------- | -| 5.0.15.0 | MongoDB | Stopped | Disabled | +| 5.0.19.0 | MongoDB | Stopped | Disabled | ### Database tools - Azure CosmosDb Emulator 2.14.12.0 @@ -214,311 +212,313 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Name | Version | ConfigFile | ServiceName | ServiceStatus | ListenPort | | ------ | ------- | ------------------------------------- | ----------- | ------------- | ---------- | | Apache | 2.4.55 | C:\tools\Apache24\conf\httpd.conf | Apache | Stopped | 80 | -| Nginx | 1.25.1 | C:\tools\nginx-1.25.1\conf\nginx.conf | nginx | Stopped | 80 | +| Nginx | 1.25.2 | C:\tools\nginx-1.25.2\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2022 | Name | Version | Path | | ----------------------------- | -------------- | -------------------------------------------------------- | -| Visual Studio Enterprise 2022 | 17.6.33829.357 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | +| Visual Studio Enterprise 2022 | 17.7.34009.444 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | #### Workloads, components and extensions | Package | Version | | ------------------------------------------------------------------------- | --------------- | -| android | 33.0.46.0 | -| Component.Android.Emulator.MDD | 17.6.33605.316 | -| Component.Android.NDK.R23C | 17.6.33605.316 | -| Component.Android.SDK.MAUI | 17.6.33605.316 | +| android | 33.0.68.0 | +| Component.Android.Emulator.MDD | 17.7.33905.399 | +| Component.Android.NDK.R23C | 17.7.33905.399 | +| Component.Android.SDK.MAUI | 17.7.33905.399 | | Component.CPython39.x64 | 3.9.13 | -| Component.Dotfuscator | 17.6.33605.316 | -| Component.HAXM.Private | 17.6.33605.316 | -| Component.Linux.CMake | 17.6.33605.316 | -| Component.Linux.RemoteFileExplorer | 17.6.33605.316 | -| Component.MDD.Android | 17.6.33605.316 | -| Component.MDD.Linux | 17.6.33605.316 | -| Component.MDD.Linux.GCC.arm | 17.6.33605.316 | -| Component.Microsoft.VisualStudio.LiveShare.2022 | 1.0.5843 | -| Component.Microsoft.VisualStudio.RazorExtension | 17.6.33605.316 | +| Component.Dotfuscator | 17.7.33905.399 | +| Component.HAXM.Private | 17.7.33905.399 | +| Component.Linux.CMake | 17.7.33905.399 | +| Component.Linux.RemoteFileExplorer | 17.7.33905.399 | +| Component.MDD.Android | 17.7.33905.399 | +| Component.MDD.Linux | 17.7.33905.399 | +| Component.MDD.Linux.GCC.arm | 17.7.33905.399 | +| Component.Microsoft.VisualStudio.LiveShare.2022 | 1.0.5875 | +| Component.Microsoft.VisualStudio.RazorExtension | 17.7.33905.399 | | Component.Microsoft.VisualStudio.Tools.Applications.amd64 | 17.0.33617.0 | -| Component.Microsoft.VisualStudio.Web.AzureFunctions | 17.6.33605.316 | -| Component.Microsoft.Web.LibraryManager | 17.6.33605.316 | -| Component.Microsoft.WebTools.BrowserLink.WebLivePreview | 17.6.81.44349 | +| Component.Microsoft.VisualStudio.Web.AzureFunctions | 17.7.33905.399 | +| Component.Microsoft.Web.LibraryManager | 17.7.33905.399 | +| Component.Microsoft.WebTools.BrowserLink.WebLivePreview | 17.7.70.21405 | | Component.Microsoft.Windows.DriverKit | 10.0.22621.0 | -| Component.OpenJDK | 17.6.33605.316 | -| Component.UnityEngine.x64 | 17.6.33605.316 | -| Component.Unreal | 17.6.33605.316 | -| Component.Unreal.Android | 17.6.33605.316 | -| Component.Unreal.Ide | 17.6.33605.316 | +| Component.OpenJDK | 17.7.33905.399 | +| Component.UnityEngine.x64 | 17.7.33905.399 | +| Component.Unreal | 17.7.33905.399 | +| Component.Unreal.Android | 17.7.33905.399 | +| Component.Unreal.Ide | 17.7.33913.275 | | Component.VSInstallerProjects2022 | 2.0.0 | | Component.WixToolset.VisualStudioExtension.Dev17 | 1.0.0.22 | | Component.WixToolset.VisualStudioExtension.Schemas3 | 1.0.0.22 | -| Component.Xamarin | 17.6.33605.316 | -| Component.Xamarin.RemotedSimulator | 17.6.33605.316 | -| ios | 16.4.7067.0 | -| maccatalyst | 16.4.7067.0 | -| maui.android | 7.0.86.0 | -| maui.blazor | 7.0.86.0 | -| maui.core | 7.0.86.0 | -| maui.ios | 7.0.86.0 | -| maui.maccatalyst | 7.0.86.0 | -| maui.windows | 7.0.86.0 | -| Microsoft.Component.Azure.DataLake.Tools | 17.6.33605.316 | -| Microsoft.Component.ClickOnce | 17.6.33605.316 | -| Microsoft.Component.CodeAnalysis.SDK | 17.6.33605.316 | -| Microsoft.Component.MSBuild | 17.6.33605.316 | -| Microsoft.Component.NetFX.Native | 17.6.33605.316 | -| Microsoft.Component.PythonTools | 17.6.33605.316 | -| Microsoft.Component.PythonTools.Web | 17.6.33605.316 | -| Microsoft.Component.VC.Runtime.UCRTSDK | 17.6.33605.316 | -| Microsoft.ComponentGroup.Blend | 17.6.33605.316 | -| Microsoft.ComponentGroup.ClickOnce.Publish | 17.6.33605.316 | -| Microsoft.Net.Component.4.5.2.TargetingPack | 17.6.33605.316 | -| Microsoft.Net.Component.4.6.2.TargetingPack | 17.6.33605.316 | -| Microsoft.Net.Component.4.6.TargetingPack | 17.6.33605.316 | -| Microsoft.Net.Component.4.7.1.TargetingPack | 17.6.33605.316 | -| Microsoft.Net.Component.4.7.2.TargetingPack | 17.6.33605.316 | -| Microsoft.Net.Component.4.7.TargetingPack | 17.6.33605.316 | -| Microsoft.Net.Component.4.8.1.SDK | 17.6.33605.316 | -| Microsoft.Net.Component.4.8.1.TargetingPack | 17.6.33605.316 | -| Microsoft.Net.Component.4.8.SDK | 17.6.33605.316 | -| Microsoft.Net.Component.4.8.TargetingPack | 17.6.33605.316 | -| Microsoft.Net.ComponentGroup.4.8.DeveloperTools | 17.6.33605.316 | -| Microsoft.Net.ComponentGroup.DevelopmentPrerequisites | 17.6.33605.316 | -| Microsoft.Net.ComponentGroup.TargetingPacks.Common | 17.6.33605.316 | -| microsoft.net.runtime.android | 7.0.923.32018 | -| microsoft.net.runtime.android.aot | 7.0.923.32018 | -| microsoft.net.runtime.android.aot.net6 | 7.0.923.32018 | -| microsoft.net.runtime.android.net6 | 7.0.923.32018 | -| microsoft.net.runtime.ios | 7.0.923.32018 | -| microsoft.net.runtime.ios.net6 | 7.0.923.32018 | -| microsoft.net.runtime.maccatalyst | 7.0.923.32018 | -| microsoft.net.runtime.maccatalyst.net6 | 7.0.923.32018 | -| microsoft.net.runtime.mono.tooling | 7.0.923.32018 | -| microsoft.net.runtime.mono.tooling.net6 | 7.0.923.32018 | -| microsoft.net.sdk.emscripten.net7 | 7.0.8.32002 | -| Microsoft.NetCore.Component.DevelopmentTools | 17.6.33605.316 | -| Microsoft.NetCore.Component.Runtime.6.0 | 17.6.33829.270 | -| Microsoft.NetCore.Component.Runtime.7.0 | 17.6.33829.270 | -| Microsoft.NetCore.Component.SDK | 17.6.33829.270 | -| Microsoft.NetCore.Component.Web | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.AppInsights.Tools | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.AspNet | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.AspNet45 | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.Azure.AuthoringTools | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.Azure.ClientLibs | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.Azure.Compute.Emulator | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.Azure.Powershell | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.Azure.ResourceManager.Tools | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.Azure.ServiceFabric.Tools | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.Azure.Waverton | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.Azure.Waverton.BuildTools | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.ClassDesigner | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.CodeMap | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.Common.Azure.Tools | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.CoreEditor | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.Debugger.JustInTime | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.Debugger.Snapshot | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.DiagnosticTools | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.DockerTools | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.DotNetModelBuilder | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.DslTools | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.Embedded | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.EntityFramework | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.FSharp | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.FSharp.Desktop | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.FSharp.WebTemplates | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.GraphDocument | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.Graphics | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.Graphics.Tools | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.HLSL | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.IISExpress | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.IntelliCode | 17.6.33828.476 | -| Microsoft.VisualStudio.Component.IntelliTrace.FrontEnd | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.JavaScript.Diagnostics | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.JavaScript.TypeScript | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.LinqToSql | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.LiveUnitTesting | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.ManagedDesktop.Core | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.ManagedDesktop.Prerequisites | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.Merq | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.MonoDebugger | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.MSODBC.SQL | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.MSSQL.CMDLnUtils | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.Node.Tools | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.NuGet | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.NuGet.BuildTools | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.PortableLibrary | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.Roslyn.Compiler | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.Roslyn.LanguageServices | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.SecurityIssueAnalysis | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.Sharepoint.Tools | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.SQL.CLR | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.SQL.DataSources | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.SQL.LocalDB.Runtime | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.SQL.SSDT | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.TeamOffice | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.TestTools.CodedUITest | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.TestTools.WebLoadTest | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.TextTemplating | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.TypeScript.TSServer | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.Unity | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.UWP.VC.ARM64 | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.UWP.VC.ARM64EC | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM.Spectre | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM64 | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM64.Spectre | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM.Spectre | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM64 | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM64.Spectre | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.Spectre | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.ARM | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.ARM.Spectre | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.ARM64 | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.ARM64.Spectre | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.Spectre | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64 | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64.Spectre | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.35.17.5.ARM | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.35.17.5.ARM.Spectre | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.35.17.5.ARM64 | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.35.17.5.ARM64.Spectre | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.35.17.5.ATL | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.35.17.5.ATL.ARM | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.35.17.5.ATL.ARM.Spectre | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.35.17.5.ATL.ARM64 | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.35.17.5.ATL.ARM64.Spectre | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.35.17.5.ATL.Spectre | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.35.17.5.MFC | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.35.17.5.MFC.ARM | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.35.17.5.MFC.ARM.Spectre | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.35.17.5.MFC.ARM64 | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.35.17.5.MFC.ARM64.Spectre | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.35.17.5.MFC.Spectre | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.35.17.5.x86.x64 | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.35.17.5.x86.x64.Spectre | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.36.17.6.ARM | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.36.17.6.ARM.Spectre | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.36.17.6.ARM64 | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.36.17.6.ARM64.Spectre | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.36.17.6.ATL | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.36.17.6.ATL.ARM | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.36.17.6.ATL.ARM.Spectre | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.36.17.6.ATL.ARM64 | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.36.17.6.ATL.ARM64.Spectre | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.36.17.6.ATL.Spectre | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.36.17.6.MFC | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.36.17.6.MFC.ARM | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.36.17.6.MFC.ARM.Spectre | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.36.17.6.MFC.ARM64 | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.36.17.6.MFC.ARM64.Spectre | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.36.17.6.MFC.Spectre | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.36.17.6.x86.x64 | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.14.36.17.6.x86.x64.Spectre | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.ASAN | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.ATL | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.ATL.ARM | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.ATL.ARM.Spectre | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.ATL.ARM64 | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.ATL.ARM64.Spectre | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.ATL.Spectre | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.ATLMFC | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.ATLMFC.Spectre | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.CLI.Support | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.CMake.Project | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.CoreIde | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.DiagnosticTools | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.Llvm.Clang | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.Llvm.ClangToolset | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.MFC.ARM | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.MFC.ARM.Spectre | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.MFC.ARM64 | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.MFC.ARM64.Spectre | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.Modules.x86.x64 | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.Redist.14.Latest | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.Redist.MSM | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.Runtimes.ARM.Spectre | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.Runtimes.ARM64.Spectre | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.Runtimes.ARM64EC.Spectre | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.Runtimes.x86.x64.Spectre | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.TestAdapterForBoostTest | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.TestAdapterForGoogleTest | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.Tools.ARM | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.Tools.ARM64 | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.Tools.ARM64EC | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.Tools.x86.x64 | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.v141.ARM | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.v141.ARM.Spectre | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.v141.ARM64 | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.v141.ARM64.Spectre | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.v141.ATL | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.v141.ATL.Spectre | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.v141.MFC | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.v141.MFC.Spectre | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.v141.x86.x64 | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VC.v141.x86.x64.Spectre | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.Vcpkg | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.VSSDK | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.Wcf.Tooling | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.Web | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.WebDeploy | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.Windows10SDK | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.Windows10SDK.19041 | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.Windows10SDK.20348 | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.Windows11SDK.22000 | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.Windows11SDK.22621 | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.Workflow | 17.6.33605.316 | -| Microsoft.VisualStudio.Component.WslDebugging | 17.6.33605.316 | -| Microsoft.VisualStudio.ComponentGroup.ArchitectureTools.Native | 17.6.33605.316 | -| Microsoft.VisualStudio.ComponentGroup.Azure.CloudServices | 17.6.33605.316 | -| Microsoft.VisualStudio.ComponentGroup.Azure.Prerequisites | 17.6.33605.316 | -| Microsoft.VisualStudio.ComponentGroup.Azure.ResourceManager.Tools | 17.6.33605.316 | -| Microsoft.VisualStudio.ComponentGroup.AzureFunctions | 17.6.33605.316 | -| Microsoft.VisualStudio.ComponentGroup.Maui.All | 17.6.33605.316 | -| Microsoft.VisualStudio.ComponentGroup.Maui.Android | 17.6.33605.316 | -| Microsoft.VisualStudio.ComponentGroup.Maui.Blazor | 17.6.33605.316 | -| Microsoft.VisualStudio.ComponentGroup.Maui.iOS | 17.6.33605.316 | -| Microsoft.VisualStudio.ComponentGroup.Maui.MacCatalyst | 17.6.33605.316 | -| Microsoft.VisualStudio.ComponentGroup.Maui.Shared | 17.6.33605.316 | -| Microsoft.VisualStudio.ComponentGroup.Maui.Windows | 17.6.33605.316 | -| Microsoft.VisualStudio.ComponentGroup.MSIX.Packaging | 17.6.33605.316 | -| Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core | 17.6.33605.316 | -| Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Llvm.Clang | 17.6.33605.316 | -| Microsoft.VisualStudio.ComponentGroup.UWP.NetCoreAndStandard | 17.6.33605.316 | -| Microsoft.VisualStudio.ComponentGroup.UWP.Support | 17.6.33605.316 | -| Microsoft.VisualStudio.ComponentGroup.UWP.VC.v142 | 17.6.33605.316 | -| Microsoft.VisualStudio.ComponentGroup.UWP.Xamarin | 17.6.33605.316 | -| Microsoft.VisualStudio.ComponentGroup.VC.Tools.142.x86.x64 | 17.6.33605.316 | -| Microsoft.VisualStudio.ComponentGroup.VisualStudioExtension.Prerequisites | 17.6.33605.316 | -| Microsoft.VisualStudio.ComponentGroup.Web | 17.6.33605.316 | -| Microsoft.VisualStudio.ComponentGroup.Web.CloudTools | 17.6.33605.316 | -| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions | 17.6.33605.316 | -| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.CMake | 17.6.33605.316 | -| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.TemplateEngine | 17.6.33605.316 | -| Microsoft.VisualStudio.Workload.Azure | 17.6.33605.316 | -| Microsoft.VisualStudio.Workload.CoreEditor | 17.6.33605.316 | -| Microsoft.VisualStudio.Workload.Data | 17.6.33605.316 | -| Microsoft.VisualStudio.Workload.DataScience | 17.6.33605.316 | -| Microsoft.VisualStudio.Workload.ManagedDesktop | 17.6.33605.316 | -| Microsoft.VisualStudio.Workload.ManagedGame | 17.6.33605.316 | -| Microsoft.VisualStudio.Workload.NativeCrossPlat | 17.6.33605.316 | -| Microsoft.VisualStudio.Workload.NativeDesktop | 17.6.33605.316 | -| Microsoft.VisualStudio.Workload.NativeGame | 17.6.33605.316 | -| Microsoft.VisualStudio.Workload.NativeMobile | 17.6.33605.316 | -| Microsoft.VisualStudio.Workload.NetCrossPlat | 17.6.33605.316 | -| Microsoft.VisualStudio.Workload.NetWeb | 17.6.33605.316 | -| Microsoft.VisualStudio.Workload.Node | 17.6.33605.316 | -| Microsoft.VisualStudio.Workload.Office | 17.6.33605.316 | -| Microsoft.VisualStudio.Workload.Python | 17.6.33605.316 | -| Microsoft.VisualStudio.Workload.Universal | 17.6.33605.316 | -| Microsoft.VisualStudio.Workload.VisualStudioExtension | 17.6.33605.316 | -| runtimes.ios | 7.0.923.32018 | -| runtimes.ios.net6 | 7.0.923.32018 | -| runtimes.maccatalyst | 7.0.923.32018 | -| runtimes.maccatalyst.net6 | 7.0.923.32018 | -| wasm.tools | 7.0.923.32018 | +| Component.Xamarin | 17.7.33905.399 | +| Component.Xamarin.RemotedSimulator | 17.7.33905.399 | +| ios | 16.4.7089.0 | +| maccatalyst | 16.4.7089.0 | +| maui.android | 7.0.92.0 | +| maui.blazor | 7.0.92.0 | +| maui.core | 7.0.92.0 | +| maui.ios | 7.0.92.0 | +| maui.maccatalyst | 7.0.92.0 | +| maui.windows | 7.0.92.0 | +| Microsoft.Component.Azure.DataLake.Tools | 17.7.33905.399 | +| Microsoft.Component.ClickOnce | 17.7.33905.399 | +| Microsoft.Component.CodeAnalysis.SDK | 17.7.33905.399 | +| Microsoft.Component.MSBuild | 17.7.33905.399 | +| Microsoft.Component.NetFX.Native | 17.7.33913.275 | +| Microsoft.Component.PythonTools | 17.7.33905.399 | +| Microsoft.Component.PythonTools.Web | 17.7.33905.399 | +| Microsoft.Component.VC.Runtime.UCRTSDK | 17.7.33905.399 | +| Microsoft.ComponentGroup.Blend | 17.7.33905.399 | +| Microsoft.ComponentGroup.ClickOnce.Publish | 17.7.33905.399 | +| Microsoft.Net.Component.4.5.2.TargetingPack | 17.7.33905.399 | +| Microsoft.Net.Component.4.6.2.TargetingPack | 17.7.33905.399 | +| Microsoft.Net.Component.4.6.TargetingPack | 17.7.33905.399 | +| Microsoft.Net.Component.4.7.1.TargetingPack | 17.7.33905.399 | +| Microsoft.Net.Component.4.7.2.TargetingPack | 17.7.33905.399 | +| Microsoft.Net.Component.4.7.TargetingPack | 17.7.33905.399 | +| Microsoft.Net.Component.4.8.1.SDK | 17.7.33905.399 | +| Microsoft.Net.Component.4.8.1.TargetingPack | 17.7.33905.399 | +| Microsoft.Net.Component.4.8.SDK | 17.7.33905.399 | +| Microsoft.Net.Component.4.8.TargetingPack | 17.7.33905.399 | +| Microsoft.Net.ComponentGroup.4.8.DeveloperTools | 17.7.33905.399 | +| Microsoft.Net.ComponentGroup.DevelopmentPrerequisites | 17.7.33905.399 | +| Microsoft.Net.ComponentGroup.TargetingPacks.Common | 17.7.33905.399 | +| microsoft.net.runtime.android | 7.0.1023.36312 | +| microsoft.net.runtime.android.aot | 7.0.1023.36312 | +| microsoft.net.runtime.android.aot.net6 | 7.0.1023.36312 | +| microsoft.net.runtime.android.net6 | 7.0.1023.36312 | +| microsoft.net.runtime.ios | 7.0.1023.36312 | +| microsoft.net.runtime.ios.net6 | 7.0.1023.36312 | +| microsoft.net.runtime.maccatalyst | 7.0.1023.36312 | +| microsoft.net.runtime.maccatalyst.net6 | 7.0.1023.36312 | +| microsoft.net.runtime.mono.tooling | 7.0.1023.36312 | +| microsoft.net.runtime.mono.tooling.net6 | 7.0.1023.36312 | +| microsoft.net.sdk.emscripten.net7 | 7.0.8.36202 | +| Microsoft.NetCore.Component.DevelopmentTools | 17.7.33905.399 | +| Microsoft.NetCore.Component.Runtime.6.0 | 17.7.34002.345 | +| Microsoft.NetCore.Component.Runtime.7.0 | 17.7.34002.345 | +| Microsoft.NetCore.Component.SDK | 17.7.34002.345 | +| Microsoft.NetCore.Component.Web | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.AppInsights.Tools | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.AspNet | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.AspNet45 | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.Azure.AuthoringTools | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.Azure.ClientLibs | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.Azure.Compute.Emulator | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.Azure.Powershell | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.Azure.ResourceManager.Tools | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.Azure.ServiceFabric.Tools | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.Azure.Waverton | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.Azure.Waverton.BuildTools | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.ClassDesigner | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.CodeMap | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.Common.Azure.Tools | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.CoreEditor | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.CppBuildInsights | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.Debugger.JustInTime | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.Debugger.Snapshot | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.DiagnosticTools | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.DockerTools | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.DotNetModelBuilder | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.DslTools | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.Embedded | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.EntityFramework | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.FSharp | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.FSharp.Desktop | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.FSharp.WebTemplates | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.GraphDocument | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.Graphics | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.Graphics.Tools | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.HLSL | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.IISExpress | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.IntelliCode | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.IntelliTrace.FrontEnd | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.JavaScript.Diagnostics | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.JavaScript.TypeScript | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.LinqToSql | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.LiveUnitTesting | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.ManagedDesktop.Core | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.ManagedDesktop.Prerequisites | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.Merq | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.MonoDebugger | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.MSODBC.SQL | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.MSSQL.CMDLnUtils | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.Node.Tools | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.NuGet | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.NuGet.BuildTools | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.PortableLibrary | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.Roslyn.Compiler | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.Roslyn.LanguageServices | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.SecurityIssueAnalysis | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.Sharepoint.Tools | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.SQL.CLR | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.SQL.DataSources | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.SQL.LocalDB.Runtime | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.SQL.SSDT | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.TeamOffice | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.TestTools.CodedUITest | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.TestTools.WebLoadTest | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.TextTemplating | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.TypeScript.TSServer | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.Unity | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.UWP.VC.ARM64 | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.UWP.VC.ARM64EC | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM.Spectre | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM64 | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM64.Spectre | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM.Spectre | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM64 | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM64.Spectre | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.Spectre | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.ARM | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.ARM.Spectre | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.ARM64 | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.ARM64.Spectre | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.Spectre | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64 | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64.Spectre | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.14.35.17.5.ARM | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.14.35.17.5.ARM.Spectre | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.14.35.17.5.ARM64 | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.14.35.17.5.ARM64.Spectre | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.14.35.17.5.ATL | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.14.35.17.5.ATL.ARM | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.14.35.17.5.ATL.ARM.Spectre | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.14.35.17.5.ATL.ARM64 | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.14.35.17.5.ATL.ARM64.Spectre | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.14.35.17.5.ATL.Spectre | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.14.35.17.5.MFC | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.14.35.17.5.MFC.ARM | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.14.35.17.5.MFC.ARM.Spectre | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.14.35.17.5.MFC.ARM64 | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.14.35.17.5.MFC.ARM64.Spectre | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.14.35.17.5.MFC.Spectre | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.14.35.17.5.x86.x64 | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.14.35.17.5.x86.x64.Spectre | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.14.36.17.6.ARM | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.14.36.17.6.ARM.Spectre | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.14.36.17.6.ARM64 | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.14.36.17.6.ARM64.Spectre | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.14.36.17.6.ATL | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.14.36.17.6.ATL.ARM | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.14.36.17.6.ATL.ARM.Spectre | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.14.36.17.6.ATL.ARM64 | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.14.36.17.6.ATL.ARM64.Spectre | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.14.36.17.6.ATL.Spectre | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.14.36.17.6.MFC | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.14.36.17.6.MFC.ARM | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.14.36.17.6.MFC.ARM.Spectre | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.14.36.17.6.MFC.ARM64 | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.14.36.17.6.MFC.ARM64.Spectre | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.14.36.17.6.MFC.Spectre | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.14.36.17.6.x86.x64 | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.14.36.17.6.x86.x64.Spectre | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.ASAN | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.ATL | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.ATL.ARM | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.ATL.ARM.Spectre | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.ATL.ARM64 | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.ATL.ARM64.Spectre | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.ATL.Spectre | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.ATLMFC | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.ATLMFC.Spectre | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.CLI.Support | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.CMake.Project | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.CoreIde | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.DiagnosticTools | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.Llvm.Clang | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.Llvm.ClangToolset | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.MFC.ARM | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.MFC.ARM.Spectre | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.MFC.ARM64 | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.MFC.ARM64.Spectre | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.Modules.x86.x64 | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.Redist.14.Latest | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.Redist.MSM | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.Runtimes.ARM.Spectre | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.Runtimes.ARM64.Spectre | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.Runtimes.ARM64EC.Spectre | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.Runtimes.x86.x64.Spectre | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.TestAdapterForBoostTest | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.TestAdapterForGoogleTest | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.Tools.ARM | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.Tools.ARM64 | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.Tools.ARM64EC | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.Tools.x86.x64 | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.v141.ARM | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.v141.ARM.Spectre | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.v141.ARM64 | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.v141.ARM64.Spectre | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.v141.ATL | 17.7.33913.275 | +| Microsoft.VisualStudio.Component.VC.v141.ATL.Spectre | 17.7.33913.275 | +| Microsoft.VisualStudio.Component.VC.v141.MFC | 17.7.33913.275 | +| Microsoft.VisualStudio.Component.VC.v141.MFC.Spectre | 17.7.33913.275 | +| Microsoft.VisualStudio.Component.VC.v141.x86.x64 | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.v141.x86.x64.Spectre | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.Vcpkg | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VSSDK | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.Wcf.Tooling | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.Web | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.WebDeploy | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.Windows10SDK | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.Windows10SDK.19041 | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.Windows10SDK.20348 | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.Windows11SDK.22000 | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.Windows11SDK.22621 | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.Windows11Sdk.WindowsPerformanceToolkit | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.Workflow | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.WslDebugging | 17.7.33905.399 | +| Microsoft.VisualStudio.ComponentGroup.ArchitectureTools.Native | 17.7.33905.399 | +| Microsoft.VisualStudio.ComponentGroup.Azure.CloudServices | 17.7.33905.399 | +| Microsoft.VisualStudio.ComponentGroup.Azure.Prerequisites | 17.7.33905.399 | +| Microsoft.VisualStudio.ComponentGroup.Azure.ResourceManager.Tools | 17.7.33905.399 | +| Microsoft.VisualStudio.ComponentGroup.AzureFunctions | 17.7.33905.399 | +| Microsoft.VisualStudio.ComponentGroup.Maui.All | 17.7.33905.399 | +| Microsoft.VisualStudio.ComponentGroup.Maui.Android | 17.7.33905.399 | +| Microsoft.VisualStudio.ComponentGroup.Maui.Blazor | 17.7.33905.399 | +| Microsoft.VisualStudio.ComponentGroup.Maui.iOS | 17.7.33905.399 | +| Microsoft.VisualStudio.ComponentGroup.Maui.MacCatalyst | 17.7.33905.399 | +| Microsoft.VisualStudio.ComponentGroup.Maui.Shared | 17.7.33905.399 | +| Microsoft.VisualStudio.ComponentGroup.Maui.Windows | 17.7.33905.399 | +| Microsoft.VisualStudio.ComponentGroup.MSIX.Packaging | 17.7.33905.399 | +| Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core | 17.7.33905.399 | +| Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Llvm.Clang | 17.7.33905.399 | +| Microsoft.VisualStudio.ComponentGroup.UWP.NetCoreAndStandard | 17.7.33905.399 | +| Microsoft.VisualStudio.ComponentGroup.UWP.Support | 17.7.34002.345 | +| Microsoft.VisualStudio.ComponentGroup.UWP.VC.v142 | 17.7.33905.399 | +| Microsoft.VisualStudio.ComponentGroup.UWP.Xamarin | 17.7.33905.399 | +| Microsoft.VisualStudio.ComponentGroup.VC.Tools.142.x86.x64 | 17.7.33905.399 | +| Microsoft.VisualStudio.ComponentGroup.VisualStudioExtension.Prerequisites | 17.7.33905.399 | +| Microsoft.VisualStudio.ComponentGroup.Web | 17.7.33905.399 | +| Microsoft.VisualStudio.ComponentGroup.Web.CloudTools | 17.7.33905.399 | +| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions | 17.7.33905.399 | +| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.CMake | 17.7.33905.399 | +| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.TemplateEngine | 17.7.33905.399 | +| Microsoft.VisualStudio.Workload.Azure | 17.7.33905.399 | +| Microsoft.VisualStudio.Workload.CoreEditor | 17.7.33905.399 | +| Microsoft.VisualStudio.Workload.Data | 17.7.33905.399 | +| Microsoft.VisualStudio.Workload.DataScience | 17.7.33905.399 | +| Microsoft.VisualStudio.Workload.ManagedDesktop | 17.7.34002.345 | +| Microsoft.VisualStudio.Workload.ManagedGame | 17.7.33905.399 | +| Microsoft.VisualStudio.Workload.NativeCrossPlat | 17.7.33905.399 | +| Microsoft.VisualStudio.Workload.NativeDesktop | 17.7.33905.399 | +| Microsoft.VisualStudio.Workload.NativeGame | 17.7.33905.399 | +| Microsoft.VisualStudio.Workload.NativeMobile | 17.7.33905.399 | +| Microsoft.VisualStudio.Workload.NetCrossPlat | 17.7.34009.333 | +| Microsoft.VisualStudio.Workload.NetWeb | 17.7.34002.345 | +| Microsoft.VisualStudio.Workload.Node | 17.7.33905.399 | +| Microsoft.VisualStudio.Workload.Office | 17.7.33905.399 | +| Microsoft.VisualStudio.Workload.Python | 17.7.33905.399 | +| Microsoft.VisualStudio.Workload.Universal | 17.7.33905.399 | +| Microsoft.VisualStudio.Workload.VisualStudioExtension | 17.7.33905.399 | +| runtimes.ios | 7.0.1023.36312 | +| runtimes.ios.net6 | 7.0.1023.36312 | +| runtimes.maccatalyst | 7.0.1023.36312 | +| runtimes.maccatalyst.net6 | 7.0.1023.36312 | +| wasm.tools | 7.0.1023.36312 | | ProBITools.MicrosoftAnalysisServicesModelingProjects2022 | 3.0.4 | | ProBITools.MicrosoftReportProjectsforVisualStudio2022 | 3.0.1 | | SSIS.MicrosoftDataToolsIntegrationServices | 1.1 | @@ -548,11 +548,11 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 10.0.22621.0 ### .NET Core Tools -- .NET Core SDK: 6.0.120, 6.0.203, 6.0.315, 6.0.412, 7.0.306 +- .NET Core SDK: 6.0.121, 6.0.203, 6.0.316, 6.0.413, 7.0.400 - .NET Framework: 4.8, 4.8.1 -- Microsoft.AspNetCore.App: 6.0.5, 6.0.20, 7.0.9 -- Microsoft.NETCore.App: 6.0.5, 6.0.20, 7.0.9 -- Microsoft.WindowsDesktop.App: 6.0.5, 6.0.20, 7.0.9 +- Microsoft.AspNetCore.App: 6.0.5, 6.0.21, 7.0.10 +- Microsoft.NETCore.App: 6.0.5, 6.0.21, 7.0.10 +- Microsoft.WindowsDesktop.App: 6.0.5, 6.0.21, 7.0.10 - nbgv 3.6.133+2d32d93cb1 ### PowerShell Tools @@ -565,10 +565,10 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Az (Cached): 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.386 +- AWSPowershell: 4.1.397 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 -- Microsoft.Graph: 2.2.0 +- Microsoft.Graph: 2.3.0 - Pester: 3.4.0, 5.5.0 - PowerShellGet: 1.0.0.1, 2.2.5 - PSScriptAnalyzer: 1.21.0 @@ -587,7 +587,7 @@ All other versions are saved but not installed. | Android Command Line Tools | 8.0 | | Android Emulator | 31.2.9 | | Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | -| Android SDK Platforms | android-34 (rev 1)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | +| Android SDK Platforms | android-34 (rev 2)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | | Android SDK Platform-Tools | 34.0.4 | | Android Support Repository | 47.0.0 | | CMake | 3.18.1<br>3.22.1 | @@ -609,9 +609,8 @@ All other versions are saved but not installed. ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2022 | sha256:addee0a3f1f13a887a52a398b41db9bd095bf86c98c7e5b10666a00ebbb7fe08 | 2023-07-11 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2022 | sha256:44293c778435bbf640f1c1982d6aa0d672ac2a510be3c3169e87ae1389da1abb | 2023-07-11 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:fb90325630afd46ff0ad5e39c2b34a9cdc1b5cfca4cbb84b13f13f6080306afb | 2023-07-11 | -| mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:0e847c01d2565d9abba138dd6bd1eaf5e8c6076d43ecfaff50e94f142899b9f1 | 2023-07-07 | -| mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:7c07bd85c69a70b536ff05c59f49c1e308bf704906e59825d1a30e0cee86a84a | 2023-07-07 | - +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2022 | sha256:12a06ca80b319d7933f5f09eb6c3122140d02f2617e06dd79c1e86babc6574cc | 2023-08-08 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2022 | sha256:5bbc1f0666ae0709c9f8772bc11428eb123537dae4d74d80d5dd8750e6a32099 | 2023-08-08 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:ed059488bf55bdb47598574ce042dceee5f8c4923a332618ceddcdcce7d2a7f7 | 2023-08-08 | +| mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:385844aa0840c876ffd207643c709355ad68e906013961dac4b347e37bccb98a | 2023-08-03 | +| mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:f1974546e8a73746e6c60781895341dd7a6760e28534d3d0cc5f3c88c1f5825a | 2023-08-03 | From 46489c281882ac2705858811b32b6455cb32d4ef Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 29 Aug 2023 09:35:07 +0000 Subject: [PATCH 2146/3485] Updating readme file for macOS-11 version 20230818.1 (#8122) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-11-Readme.md | 38 ++++++++++++++++----------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/images/macos/macos-11-Readme.md b/images/macos/macos-11-Readme.md index c85086f36238..7bb84032f2e5 100644 --- a/images/macos/macos-11-Readme.md +++ b/images/macos/macos-11-Readme.md @@ -1,7 +1,7 @@ # macOS 11 - OS Version: macOS 11.7.8 (20G1351) - Kernel Version: Darwin 20.6.0 -- Image Version: 20230812.3 +- Image Version: 20230818.1 ## Installed Software @@ -25,26 +25,26 @@ - NVM 0.39.4 - NVM - Cached node versions: 14.21.3, 16.20.2, 18.17.1 - Perl 5.36.1 -- PHP 8.2.8 +- PHP 8.2.9 - Python 2.7.18 - Python3 3.11.4 - R 4.3.1 - Ruby 2.7.8p225 ### Package Management -- Bundler 2.4.18 +- Bundler 2.4.19 - Carthage 0.39.0 - CocoaPods 1.12.1 - Composer 2.5.8 -- Homebrew 4.1.4 +- Homebrew 4.1.5 - Miniconda 23.5.2 - NPM 9.6.7 - NuGet 6.3.1.1 - Pip 20.3.4 (python 2.7) - Pip3 23.2.1 (python 3.11) - Pipx 1.2.0 -- RubyGems 3.4.18 -- Vcpkg 2023 (build from commit 0fa8459cf) +- RubyGems 3.4.19 +- Vcpkg 2023 (build from commit c7fc29984) - Yarn 1.22.19 #### Environment variables @@ -56,7 +56,7 @@ ### Project Management - Apache Ant 1.10.13 - Apache Maven 3.9.4 -- Gradle 8.2.1 +- Gradle 8.3 - Sbt 1.9.3 ### Utilities @@ -81,7 +81,7 @@ - mongod 5.0.17 - Newman 5.3.2 - OpenSSL 1.1.1v 1 Aug 2023 -- Packer 1.9.2 +- Packer 1.9.3 - pkg-config 0.29.2 - PostgreSQL 14.9 (Homebrew) - psql (PostgreSQL) 14.9 (Homebrew) @@ -92,23 +92,23 @@ - zstd 1.5.5 ### Tools -- Aliyun CLI 3.0.170 +- Aliyun CLI 3.0.176 - App Center CLI 2.14.0 -- AWS CLI 2.13.9 +- AWS CLI 2.13.10 - AWS SAM CLI 1.95.0 - AWS Session Manager CLI 1.2.463.0 - Azure CLI 2.50.0 - Azure CLI (azure-devops) 0.26.0 - Bicep CLI 0.20.4 - Cabal 3.6.2.0 -- Cmake 3.27.2 -- CodeQL Action Bundles 2.14.0 2.14.1 +- Cmake 3.27.3 +- CodeQL Action Bundles 2.14.1 2.14.2 - Fastlane 2.214.0 - GHC 9.6.2 - GHCup 0.1.19.4 - Jazzy 0.14.3 - Stack 2.9.3 -- SwiftFormat 0.51.15 +- SwiftFormat 0.52.1 - Swig 4.1.1 - Xcode Command Line Tools 13.2.0.0.1.1638488800 @@ -119,12 +119,12 @@ ### Browsers - Safari 16.6 (16615.3.12.11.3) - SafariDriver 16.6 (16615.3.12.11.3) -- Google Chrome 115.0.5790.170 -- Google Chrome for Testing 115.0.5790.170 -- ChromeDriver 115.0.5790.170 +- Google Chrome 116.0.5845.96 +- Google Chrome for Testing 116.0.5845.96 +- ChromeDriver 116.0.5845.96 - Microsoft Edge 115.0.1901.203 - Microsoft Edge WebDriver 115.0.1901.203 -- Mozilla Firefox 116.0.2 +- Mozilla Firefox 116.0.3 - geckodriver 0.33.0 - Selenium server 4.10.0 @@ -204,7 +204,7 @@ | Name | Version | ConfigFile | ServiceStatus | ListenPort | | ----- | -------- | ------------------------------- | ------------- | ---------- | | httpd | 2.4.57_1 | /usr/local/etc/httpd/httpd.conf | none | 80 | -| nginx | 1.25.1_1 | /usr/local/etc/nginx/nginx.conf | none | 80 | +| nginx | 1.25.2 | /usr/local/etc/nginx/nginx.conf | none | 80 | ### Xamarin @@ -330,7 +330,7 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" | Android Command Line Tools | 8.0 | | Android Emulator | 32.1.14 | | Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | -| Android SDK Platforms | android-34 (rev 1)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | +| Android SDK Platforms | android-34 (rev 2)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | | Android SDK Platform-Tools | 34.0.4 | | Android Support Repository | 47.0.0 | | CMake | 3.10.2<br>3.18.1<br>3.22.1 | From 49ea494d52a12a9af2494ba735e29342b3c64b37 Mon Sep 17 00:00:00 2001 From: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com> Date: Tue, 29 Aug 2023 15:21:37 +0200 Subject: [PATCH 2147/3485] [macos] cleanup Homebrew cache after image generation (#8182) --- images/macos/provision/configuration/cleanup-brew.sh | 7 +++++++ images/macos/templates/macOS-13.anka.pkr.hcl | 1 + 2 files changed, 8 insertions(+) create mode 100644 images/macos/provision/configuration/cleanup-brew.sh diff --git a/images/macos/provision/configuration/cleanup-brew.sh b/images/macos/provision/configuration/cleanup-brew.sh new file mode 100644 index 000000000000..99d596b14853 --- /dev/null +++ b/images/macos/provision/configuration/cleanup-brew.sh @@ -0,0 +1,7 @@ +#!/bin/bash -e -o pipefail +########################################################################### +# The script removes local Homebrew cache +# +########################################################################### + +rm -rf "$(brew --cache)" diff --git a/images/macos/templates/macOS-13.anka.pkr.hcl b/images/macos/templates/macOS-13.anka.pkr.hcl index 17ca5fdf3f1d..94eee2065a6f 100644 --- a/images/macos/templates/macOS-13.anka.pkr.hcl +++ b/images/macos/templates/macOS-13.anka.pkr.hcl @@ -246,6 +246,7 @@ build { provisioner "shell" { scripts = [ "./provision/configuration/configure-hostname.sh", + "./provision/configuration/cleanup-brew.sh", "./provision/configuration/finalize-vm.sh" ] execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" From 36ddc88274a09e4a41a6aceb9f0e9e97180013d5 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Tue, 29 Aug 2023 21:42:30 +0200 Subject: [PATCH 2148/3485] Revert "Try installing Google Chrome for Testing (#7997)" (#8190) This reverts commit d9169bba1e28bd781128a8d8cdb28d0b182db9c6. --- .../win/scripts/Installers/Install-Chrome.ps1 | 93 +++++++++++++------ images/win/scripts/Tests/Browsers.Tests.ps1 | 15 ++- 2 files changed, 77 insertions(+), 31 deletions(-) diff --git a/images/win/scripts/Installers/Install-Chrome.ps1 b/images/win/scripts/Installers/Install-Chrome.ps1 index 5a4d20eb6404..486d4d76d570 100644 --- a/images/win/scripts/Installers/Install-Chrome.ps1 +++ b/images/win/scripts/Installers/Install-Chrome.ps1 @@ -3,43 +3,80 @@ ## Desc: Install Google Chrome ################################################################################ -# Get versions info -$ChromeVersionsUrl = "https://googlechromelabs.github.io/chrome-for-testing/last-known-good-versions-with-downloads.json" -$ChromeVersions = Invoke-RestMethod -Uri $ChromeVersionsUrl -$ChromeVersionInfo = $ChromeVersions.channels.Stable - -# Install Google Chrome for Testing -$ChromeVersion = $ChromeVersionInfo.version -$ChromeUrl = ($ChromeVersionInfo.downloads.chrome | Where-Object platform -eq "win64").url - -Write-Host "Installing Google Chrome for Testing version $ChromeVersion" -$ChromePath = "$($env:SystemDrive)\Program Files\Google\Chrome" -if (-not (Test-Path -Path $ChromePath)) { - New-Item -Path $ChromePath -ItemType Directory -Force -} +# Download and install latest Chrome browser +$ChromeInstallerFile = "googlechromestandaloneenterprise64.msi" +$ChromeInstallerUrl = "https://dl.google.com/tag/s/dl/chrome/install/${ChromeInstallerFile}" +Install-Binary -Url $ChromeInstallerUrl -Name $ChromeInstallerFile -ArgumentList @() + +# Prepare firewall rules +Write-Host "Adding the firewall rule for Google update blocking..." +New-NetFirewallRule -DisplayName "BlockGoogleUpdate" -Direction Outbound -Action Block -Program "C:\Program Files (x86)\Google\Update\GoogleUpdate.exe" + +$GoogleSvcs = ('gupdate','gupdatem') +$GoogleSvcs | Stop-SvcWithErrHandling -StopOnError +$GoogleSvcs | Set-SvcWithErrHandling -Arguments @{StartupType = "Disabled"} -$ChromeArchivePath = Start-DownloadWithRetry -Url $ChromeUrl -Extract-7Zip -Path $ChromeArchivePath -DestinationPath $ChromePath -Rename-Item "$ChromePath\chrome-win64" "$ChromePath\Application" +$regGoogleUpdatePath = "HKLM:\SOFTWARE\Policies\Google\Update" +$regGoogleUpdateChrome = "HKLM:\SOFTWARE\Policies\Google\Chrome" +($regGoogleUpdatePath, $regGoogleUpdateChrome) | ForEach-Object { + New-Item -Path $_ -Force +} -$chromeRegPath = "HKLM:SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\chrome.exe" -New-Item $chromeRegPath -Set-ItemProperty $chromeRegPath "(default)" "$ChromePath\Application\chrome.exe" +$regGoogleParameters = @( + @{ Name = "AutoUpdateCheckPeriodMinutes"; Value = 00000000}, + @{ Name = "UpdateDefault"; Value = 00000000 }, + @{ Name = "DisableAutoUpdateChecksCheckboxValue"; Value = 00000001 }, + @{ Name = "Update{8A69D345-D564-463C-AFF1-A69D9E530F96}"; Value = 00000000 }, + @{ Path = $regGoogleUpdateChrome; Name = "DefaultBrowserSettingEnabled"; Value = 00000000 } +) -# Install Chrome Driver -$ChromeDriverVersion = $ChromeVersionInfo.version -$ChromeDriverUrl = ($ChromeVersionInfo.downloads.chromedriver | Where-Object platform -eq "win64").url +$regGoogleParameters | ForEach-Object { + $Arguments = $_ + if (-not ($Arguments.Path)) + { + $Arguments.Add("Path", $regGoogleUpdatePath) + } + $Arguments.Add("Force", $true) + New-ItemProperty @Arguments +} -Write-Host "Installing ChromeDriver version $ChromeDriverVersion" +# Install Chrome WebDriver +Write-Host "Install Chrome WebDriver..." $ChromeDriverPath = "$($env:SystemDrive)\SeleniumWebDrivers\ChromeDriver" -if (-not (Test-Path -Path $ChromeDriverPath)) { +if (-not (Test-Path -Path $ChromeDriverPath)) +{ New-Item -Path $ChromeDriverPath -ItemType Directory -Force } -$ChromeDriverVersion | Out-File -FilePath "$ChromeDriverPath\versioninfo.txt" -Force; -$ChromeDriverArchivePath = Start-DownloadWithRetry -Url $ChromeDriverUrl -Extract-7Zip -Path $ChromeDriverArchivePath -DestinationPath $ChromeDriverPath -ExtractMethod "e" +Write-Host "Get the Chrome WebDriver download URL..." +$RegistryPath = "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths" +$ChromePath = (Get-ItemProperty "$RegistryPath\chrome.exe").'(default)' +[version]$ChromeVersion = [System.Diagnostics.FileVersionInfo]::GetVersionInfo($ChromePath).ProductVersion +$ChromeBuild = "$($ChromeVersion.Major).$($ChromeVersion.Minor).$($ChromeVersion.Build)" +$ChromeDriverVersionsUrl = "https://googlechromelabs.github.io/chrome-for-testing/latest-patch-versions-per-build-with-downloads.json" + +Write-Host "Chrome version is $ChromeVersion" +$ChromeDriverVersions = Invoke-RestMethod -Uri $ChromeDriverVersionsUrl +$ChromeDriverVersion = $ChromeDriverVersions.builds.$ChromeBuild + +if (-not ($ChromeDriverVersion)) { + $availableVersions = $ChromeDriverVersions.builds | Get-Member | Select-Object -ExpandProperty Name + Write-Host "Available chromedriver builds are $availableVersions" + Throw "Can't determine chromedriver version that matches chrome build $ChromeBuild" +} + +$ChromeDriverVersion.version | Out-File -FilePath "$ChromeDriverPath\versioninfo.txt" -Force; + +Write-Host "Chrome WebDriver version to install is $($ChromeDriverVersion.version)" +$ChromeDriverZipDownloadUrl = ($ChromeDriverVersion.downloads.chromedriver | Where-Object platform -eq "win64").url + +Write-Host "Download Chrome WebDriver from $ChromeDriverZipDownloadUrl..." +$ChromeDriverArchPath = Start-DownloadWithRetry -Url $ChromeDriverZipDownloadUrl + +Write-Host "Expand Chrome WebDriver archive (without using directory names)..." +Extract-7Zip -Path $ChromeDriverArchPath -DestinationPath $ChromeDriverPath -ExtractMethod "e" +Write-Host "Setting the environment variables..." setx ChromeWebDriver "$ChromeDriverPath" /M $regEnvKey = 'HKLM:\SYSTEM\CurrentControlSet\Control\Session Manager\Environment\' diff --git a/images/win/scripts/Tests/Browsers.Tests.ps1 b/images/win/scripts/Tests/Browsers.Tests.ps1 index 1d03c7a6fc45..ba5db877abf0 100644 --- a/images/win/scripts/Tests/Browsers.Tests.ps1 +++ b/images/win/scripts/Tests/Browsers.Tests.ps1 @@ -28,9 +28,18 @@ Describe "Chrome" { $versionInfo | Should -Not -BeNullOrEmpty } - It "Chrome Product Name should be 'Google Chrome for Testing'" -TestCases @{chromePath = $chromePath } { - $productName = (Get-Item $chromePath).VersionInfo.ProductName - $productName | Should -BeExactly "Google Chrome for Testing" + It "gupdate service is stopped" { + $svc = Get-Service -Name gupdate + $svc.Status | Should -BeExactly Stopped + } + + It "gupdatem service is stopped" { + $svc = Get-Service -Name gupdatem + $svc.Status | Should -BeExactly Stopped + } + + It "BlockGoogleUpdate firewall rule exists" { + Get-NetFirewallRule -DisplayName BlockGoogleUpdate | Should -Not -BeNullOrEmpty } It "<chromePath> is installed" -TestCases @{chromePath = $chromePath} { From 6315e88f65de6fea5514146a4a33d2a394e6f0ca Mon Sep 17 00:00:00 2001 From: sergei-pyshnoi <121864472+sergei-pyshnoi@users.noreply.github.com> Date: Wed, 30 Aug 2023 12:51:14 +0200 Subject: [PATCH 2149/3485] [macOS] Fix open file limits (#8187) --- .../provision/configuration/max-files.sh | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/images/macos/provision/configuration/max-files.sh b/images/macos/provision/configuration/max-files.sh index d788693551f8..a18d7033a3e0 100755 --- a/images/macos/provision/configuration/max-files.sh +++ b/images/macos/provision/configuration/max-files.sh @@ -12,14 +12,8 @@ cat > "${Launch_Daemons}/limit.maxfiles.plist" << EOF <dict> <key>Label</key> <string>limit.maxfiles</string> - <key>ProgramArguments</key> - <array> - <string>launchctl</string> - <string>limit</string> - <string>maxfiles</string> - <string>65536</string> - <string>524288</string> - </array> + <key>Program</key> + <string>/Users/runner/limit-maxfiles.sh</string> <key>RunAtLoad</key> <true/> <key>ServiceIPC</key> @@ -28,6 +22,17 @@ cat > "${Launch_Daemons}/limit.maxfiles.plist" << EOF </plist> EOF +# Creating script for applying workaround https://developer.apple.com/forums/thread/735798 + +cat > "/Users/runner/limit-maxfiles.sh" << EOF +#!/bin/bash +sudo launchctl limit maxfiles 256 unlimited +sudo launchctl limit maxfiles 65536 524288 +EOF + +echo "limit.maxfiles.sh permissions changing" +chmod +x "/Users/runner/limit-maxfiles.sh" + echo "limit.maxfiles.plist permissions changing" chown root:wheel "${Launch_Daemons}/limit.maxfiles.plist" chmod 0644 "${Launch_Daemons}/limit.maxfiles.plist" From c9608d744ff5a2833620abcc0ec8d1159f7485c6 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Wed, 30 Aug 2023 15:07:36 +0200 Subject: [PATCH 2150/3485] [macOS] do not iterate over npm packages on Ventura (#8175) --- images/macos/provision/core/node.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/images/macos/provision/core/node.sh b/images/macos/provision/core/node.sh index 4407f1c626fb..9e858503a202 100644 --- a/images/macos/provision/core/node.sh +++ b/images/macos/provision/core/node.sh @@ -10,10 +10,12 @@ brew link node@$defaultVersion --force --overwrite echo Installing yarn... curl -fsSL https://yarnpkg.com/install.sh | bash -npm_global_packages=$(get_toolset_value '.npm.global_packages[].name') -for module in ${npm_global_packages[@]}; do - echo "Install $module" - npm install -g $module +if ! is_Ventura || ! is_VenturaArm64; then + npm_global_packages=$(get_toolset_value '.npm.global_packages[].name') + for module in ${npm_global_packages[@]}; do + echo "Install $module" + npm install -g $module done +fi invoke_tests "Node" "Node.js" From e7ad9c5de43efda712bee05ff278697a8550122e Mon Sep 17 00:00:00 2001 From: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com> Date: Wed, 30 Aug 2023 17:57:24 +0200 Subject: [PATCH 2151/3485] [macos] update XCode 15 to Beta 8 (#8194) --- images/macos/toolsets/toolset-13.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/macos/toolsets/toolset-13.json b/images/macos/toolsets/toolset-13.json index bfd46714f30f..61a097141429 100644 --- a/images/macos/toolsets/toolset-13.json +++ b/images/macos/toolsets/toolset-13.json @@ -3,7 +3,7 @@ "default": "14.3.1", "x64": { "versions": [ - { "link": "15.0", "version": "15.0.0-Beta.7+15A5229h" }, + { "link": "15.0", "version": "15.0.0-Beta.8+15A5229m" }, { "link": "14.3.1", "version": "14.3.1+14E300c","symlinks": ["14.3"] }, { "link": "14.2", "version": "14.2.0+14C18" }, { "link": "14.1", "version": "14.1.0+14B47b" } @@ -11,7 +11,7 @@ }, "arm64":{ "versions": [ - { "link": "15.0", "version": "15.0.0-Beta.7+15A5229h" }, + { "link": "15.0", "version": "15.0.0-Beta.8+15A5229m" }, { "link": "14.3.1", "version": "14.3.1+14E300c","symlinks": ["14.3"] }, { "link": "14.2", "version": "14.2.0+14C18" }, { "link": "14.1", "version": "14.1.0+14B47b" } From 4679a8bf0ad63035c81815446df4b896c1a89c05 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 30 Aug 2023 16:09:18 +0000 Subject: [PATCH 2152/3485] Updating readme file for macOS-12 version 20230818.2 (#8133) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-12-Readme.md | 36 ++++++++++++++++----------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/images/macos/macos-12-Readme.md b/images/macos/macos-12-Readme.md index 90b0fe0e2b51..8a8005a69b17 100644 --- a/images/macos/macos-12-Readme.md +++ b/images/macos/macos-12-Readme.md @@ -1,7 +1,7 @@ # macOS 12 - OS Version: macOS 12.6.7 (21G651) - Kernel Version: Darwin 21.6.0 -- Image Version: 20230812.3 +- Image Version: 20230818.2 ## Installed Software @@ -23,26 +23,26 @@ - NVM 0.39.4 - NVM - Cached node versions: 14.21.3, 16.20.2, 18.17.1 - Perl 5.36.1 -- PHP 8.2.8 +- PHP 8.2.9 - Python 2.7.18 - Python3 3.11.4 - R 4.3.1 - Ruby 3.0.6p216 ### Package Management -- Bundler 2.4.18 +- Bundler 2.4.19 - Carthage 0.39.0 - CocoaPods 1.12.1 - Composer 2.5.8 -- Homebrew 4.1.4 +- Homebrew 4.1.5 - Miniconda 23.5.2 - NPM 9.6.7 - NuGet 6.3.1.1 - Pip 20.3.4 (python 2.7) - Pip3 23.2.1 (python 3.11) - Pipx 1.2.0 -- RubyGems 3.4.18 -- Vcpkg 2023 (build from commit 0fa8459cf) +- RubyGems 3.4.19 +- Vcpkg 2023 (build from commit c95000e1b) - Yarn 1.22.19 #### Environment variables @@ -54,7 +54,7 @@ ### Project Management - Apache Ant 1.10.13 - Apache Maven 3.9.4 -- Gradle 8.2.1 +- Gradle 8.3 - Sbt 1.9.3 ### Utilities @@ -77,7 +77,7 @@ - mongo 5.0.17 - mongod 5.0.17 - OpenSSL 1.1.1v 1 Aug 2023 -- Packer 1.9.2 +- Packer 1.9.4 - pkg-config 0.29.2 - PostgreSQL 14.9 (Homebrew) - psql (PostgreSQL) 14.9 (Homebrew) @@ -91,22 +91,22 @@ ### Tools - App Center CLI 2.14.0 -- AWS CLI 2.13.9 +- AWS CLI 2.13.11 - AWS SAM CLI 1.95.0 - AWS Session Manager CLI 1.2.463.0 - Azure CLI 2.50.0 - Azure CLI (azure-devops) 0.26.0 - Bicep CLI 0.20.4 - Cabal 3.6.2.0 -- Cmake 3.27.2 -- CodeQL Action Bundles 2.14.0 2.14.1 +- Cmake 3.27.3 +- CodeQL Action Bundles 2.14.1 2.14.2 - Colima 0.5.5 - Fastlane 2.214.0 - GHC 9.6.2 - GHCup 0.1.19.4 - Jazzy 0.14.3 - Stack 2.9.3 -- SwiftFormat 0.51.15 +- SwiftFormat 0.52.1 - Swig 4.1.1 - Xcode Command Line Tools 14.2.0.0.1.1668646533 @@ -117,12 +117,12 @@ ### Browsers - Safari 16.6 (17615.3.12.11.3) - SafariDriver 16.6 (17615.3.12.11.3) -- Google Chrome 115.0.5790.170 -- Google Chrome for Testing 115.0.5790.170 -- ChromeDriver 115.0.5790.170 +- Google Chrome 116.0.5845.96 +- Google Chrome for Testing 116.0.5845.96 +- ChromeDriver 116.0.5845.96 - Microsoft Edge 115.0.1901.203 - Microsoft Edge WebDriver 115.0.1901.203 -- Mozilla Firefox 116.0.2 +- Mozilla Firefox 116.0.3 - geckodriver 0.33.0 - Selenium server 4.10.0 @@ -199,7 +199,7 @@ | Name | Version | ConfigFile | ServiceStatus | ListenPort | | ----- | -------- | ------------------------------- | ------------- | ---------- | | httpd | 2.4.57_1 | /usr/local/etc/httpd/httpd.conf | none | 80 | -| nginx | 1.25.1_1 | /usr/local/etc/nginx/nginx.conf | none | 80 | +| nginx | 1.25.2 | /usr/local/etc/nginx/nginx.conf | none | 80 | ### Xamarin @@ -328,7 +328,7 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" | Android Command Line Tools | 8.0 | | Android Emulator | 32.1.14 | | Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | -| Android SDK Platforms | android-34 (rev 1)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 2)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | +| Android SDK Platforms | android-34 (rev 2)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | | Android SDK Platform-Tools | 34.0.4 | | Android Support Repository | 47.0.0 | | CMake | 3.18.1<br>3.22.1 | From 74d698d40f5928151730e017033f7e310af8f8a0 Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Thu, 31 Aug 2023 13:07:34 +0200 Subject: [PATCH 2153/3485] [ubuntu] Change docker group ID (#8201) --- images/linux/scripts/installers/docker.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/images/linux/scripts/installers/docker.sh b/images/linux/scripts/installers/docker.sh index 50b85c1a7c34..00370d1504bb 100644 --- a/images/linux/scripts/installers/docker.sh +++ b/images/linux/scripts/installers/docker.sh @@ -22,6 +22,11 @@ URL=$(get_github_package_download_url "docker/compose" "contains(\"compose-linux curl -fsSL $URL -o /usr/libexec/docker/cli-plugins/docker-compose chmod +x /usr/libexec/docker/cli-plugins/docker-compose +# docker from official repo introduced different GID generation: https://github.com/actions/runner-images/issues/8157 +gid=$(cut -d ":" -f 3 /etc/group | grep "^1..$" | sort -n | tail -n 1 | awk '{ print $1+1 }') +groupmod -g $gid docker +chgrp -hR docker /run/docker.sock + # Enable docker.service systemctl is-active --quiet docker.service || systemctl start docker.service systemctl is-enabled --quiet docker.service || systemctl enable docker.service From d09a712b718c362160a0224a8082ed7b88a9cdd3 Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Thu, 31 Aug 2023 14:25:51 +0200 Subject: [PATCH 2154/3485] [Ubuntu] Install pigz utility (#8209) --- images/linux/toolsets/toolset-2004.json | 1 + images/linux/toolsets/toolset-2204.json | 1 + 2 files changed, 2 insertions(+) diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index 829b5475d217..228168c532bc 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -202,6 +202,7 @@ "parallel", "pass", "patchelf", + "pigz", "pollinate", "rsync", "shellcheck", diff --git a/images/linux/toolsets/toolset-2204.json b/images/linux/toolsets/toolset-2204.json index 9dac6a78c935..9aac23bcdf37 100644 --- a/images/linux/toolsets/toolset-2204.json +++ b/images/linux/toolsets/toolset-2204.json @@ -192,6 +192,7 @@ "parallel", "pass", "patchelf", + "pigz", "pollinate", "rsync", "shellcheck", From 8077d7b42b297abc90177489c58aec67f0d5c1f2 Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Thu, 31 Aug 2023 16:21:15 +0200 Subject: [PATCH 2155/3485] Switch to build managed image instead of VHD (#8167) (#8208) --- CONTRIBUTING.md | 13 +- docs/create-image-and-azure-resources.md | 26 ++- helpers/CreateAzureVMFromPackerTemplate.ps1 | 19 +- helpers/GenerateResourcesAndImage.ps1 | 77 +++----- .../azure-pipelines/image-generation.yml | 82 +++++--- images.CI/linux-and-win/build-image.ps1 | 18 +- images.CI/linux-and-win/cleanup.ps1 | 7 +- images.CI/linux-and-win/convert-to-vhd.ps1 | 185 ++++++++++++++++++ images.CI/linux-and-win/create-release.ps1 | 8 + images/linux/ubuntu2004.json | 11 +- images/linux/ubuntu2204.pkr.hcl | 24 +-- images/linux/ubuntuminimal.pkr.hcl | 23 +-- images/win/windows2019.json | 13 +- images/win/windows2022.json | 13 +- 14 files changed, 350 insertions(+), 169 deletions(-) create mode 100644 images.CI/linux-and-win/convert-to-vhd.ps1 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 21222c5c7687..1a874be807a3 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,4 +1,4 @@ -## Contributing +# Contributing [fork]: https://github.com/actions/runner-images/fork [pr]: https://github.com//actions/runner-images/compare @@ -15,13 +15,13 @@ Please note that this project is released with a [Contributor Code of Conduct][c 1. [Fork][fork] and clone the repository 1. Create a new branch: `git checkout -b my-branch-name` 1. Make your changes, ensure that they include steps to install, validate post-install and update software report (please see [How to add new tool](CONTRIBUTING.md#how-to-add-new-tool) for details). -1. Test your changes by [creating VHD and deploying a VM](docs/create-image-and-azure-resources.md). +1. Test your changes by [creating image and deploying a VM](docs/create-image-and-azure-resources.md). 1. Push to your fork and [submit a pull request][pr] Here are a few things you can do that will increase the likelihood of your pull request being accepted: - Follow the style guide for [Powershell](https://github.com/PoshCode/PowerShellPracticeAndStyle) when writing Windows scripts. There is currently no set style for the Shell scripts that run Linux installs :soon:. -- Include complete details of why this is needed in the PR description. +- Include complete details of why this is needed in the PR description. - Keep your change as focused as possible. If there are multiple changes you would like to make that are not dependent upon each other, consider submitting them as separate pull requests. - Write [good commit messages](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html). - For new tools: @@ -29,7 +29,9 @@ Here are a few things you can do that will increase the likelihood of your pull - Create an issue and get an approval from us to add this tool to the image before creating the pull request. ## How to add new tool + ### General rules + - For every new tool add validation scripts and update software report script to make sure that it is included to documentation - If the tool is available in other platforms (macOS, Windows, Linux), make sure you include it in as many as possible. - If installing a few versions of the tool, consider putting the list of versions in the corresponding `toolset.json` file. It will help other customers to configure their builds flexibly. See [toolset-windows-2019.json](images/win/toolsets/toolset-2019.json) as example. @@ -37,6 +39,7 @@ Here are a few things you can do that will increase the likelihood of your pull - Validation scripts should be simple and shouldn't change image content ### Windows + - Add a script that will install the tool and put the script in the `scripts/Installers` folder. There are a bunch of helper functions that could simplify your code: `Choco-Install`, `Install-Binary`, `Install-VsixExtension`, `Start-DownloadWithRetry`, `Test-IsWin19`, `Test-IsWin22` (find the full list of helpers in [ImageHelpers.psm1](images/win/scripts/ImageHelpers/ImageHelpers.psm1)). - Add a script that will validate the tool installation and put the script in the `scripts/Tests` folder. @@ -45,13 +48,15 @@ Add `Invoke-PesterTests -TestFile <testFileName> [-TestName <describeName>]` at - Add changes to the software report generator `images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1`. The software report generator is used to generate an image's README file, e.g. [Windows2019-Readme.md](images/win/Windows2019-Readme.md) and uses [MarkdownPS](https://github.com/Sarafian/MarkdownPS). ### Ubuntu + - Add script that will install and validate the tool and put the script in the `scripts/installers` folder. Use existing scripts such as [github-cli.sh](images/linux/scripts/installers/github-cli.sh) as a starting point. - Use [helpers](images/linux/scripts/helpers/install.sh) to simplify installation process. - Validation part should `exit 1` if any issue with installation. -- Add changes to the software report generator `images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1`. The software report generator is used to generate an image's README file, e.g. [Ubuntu2004-Readme.md](images/linux/Ubuntu2004-README.md) and it uses [MarkdownPS](https://github.com/Sarafian/MarkdownPS). +- Add changes to the software report generator `images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1`. The software report generator is used to generate an image's README file, e.g. [Ubuntu2004-Readme.md](images/linux/Ubuntu2004-README.md) and it uses [MarkdownPS](https://github.com/Sarafian/MarkdownPS). ### macOS + macOS source lives in this repository and available for everyone. However, macOS image-generation CI doesn't support external contributions yet so we are not able to accept pull-requests for now. We are in the process of preparing macOS CI to accept contributions. Until then, we appreciate your patience and ask you continue to make tool requests by filing issues. diff --git a/docs/create-image-and-azure-resources.md b/docs/create-image-and-azure-resources.md index 83a6baa431bd..15f9daf8d27f 100644 --- a/docs/create-image-and-azure-resources.md +++ b/docs/create-image-and-azure-resources.md @@ -12,8 +12,7 @@ If the VM deployment succeeds, Packer connects it using ssh or WinRM and begins If any step fails, image generation is aborted and the temporary VM is terminated. Packer also attempts to cleanup all the temporary resources it created (unless otherwise configured). -After successful completion of all installation steps Packer converts snapshot of the temporary VM to VHD image -and uploads it to the specified Azure Storage Account. +After successful completion of all installation steps Packer creates managed image from the temporary VM's disk and deletes the VM. ## Build agent preparation @@ -147,31 +146,29 @@ Start-Sleep -Seconds 30 ## Generated machine deployment -After the successful image generation, Virtual Machine can be created from the generated VHD using [CreateAzureVMFromPackerTemplate](../helpers/CreateAzureVMFromPackerTemplate.ps1) script. +After the successful image generation, Virtual Machine can be created from the generated image using [CreateAzureVMFromPackerTemplate](../helpers/CreateAzureVMFromPackerTemplate.ps1) script. ```powershell Import-Module .\helpers\CreateAzureVMFromPackerTemplate.ps1 -CreateAzureVMFromPackerTemplate -SubscriptionId {YourSubscriptionId} -ResourceGroupName {ResourceGroupName} -TemplateFile "C:\BuildVmImages\temporaryTemplate.json" -VirtualMachineName "testvm1" -AdminUsername "shady1" -AdminPassword "SomeSecurePassword1" -AzureLocation "eastus" +CreateAzureVMFromPackerTemplate -SubscriptionId {YourSubscriptionId} -ResourceGroupName {ResourceGroupName} -ManagedImageName "Runner-Image-Ubuntu2204" -VirtualMachineName "testvm1" -AdminUsername "shady1" -AdminPassword "SomeSecurePassword1" -AzureLocation "eastus" ``` Where: - `SubscriptionId` - The Azure subscription Id where resources will be created. - `ResourceGroupName` - The Azure resource group name where the Azure virtual machine will be created. -- `TemplateFilePath` - The path to the json ARM-template generated by packer during image generation locally.* +- `ManagedImageName` - The name of the managed image to be used for the virtual machine creation. - `VirtualMachineName` - The name of the virtual machine to be generated. - `AdminUserName` - The administrator username for the virtual machine to be created. - `AdminPassword` - The administrator password for the virtual machine to be created. - `AzureLocation` - The location where the Azure virtual machine will be provisioned. Example: "eastus" -\* *ARM-template can be obtained from the Packer output. For now, it seems like there is an [Az CLI bug](https://github.com/Azure/azure-cli/issues/5899) with specifying the template through a URI, so download the template from URI, that will be printed at the bottom of image-generation log, and use the local path of the template file.* - -The function creates an Azure VM from a template and generates network resources in Azure to make the VM accessible. +The function creates an Azure VM and generates network resources in Azure to make the VM accessible. ## Manual image generation -If you want more control over image generation process you may run Packer directly. This section describes variables defined in Packer template. Some of them may be set using environment variabes. +If you want more control over image generation process you may run Packer directly. This section describes variables defined in Packer template. Some of them may be set using environment variables. ### Required variables @@ -182,11 +179,11 @@ If you want more control over image generation process you may run Packer direct | `client_secret` | `ARM_CLIENT_SECRET` | The password or secret for your service principal; may be omitted if `client_cert_path` is set. | `client_cert_path` | `ARM_CLIENT_CERT_PATH` | The location of a PEM file containing a certificate and private key for service principal; may be omitted if `client_secret` is set. | `location` | `ARM_RESOURCE_LOCATION` | Azure datacenter in which your VM will build. -| `resource_group` | `ARM_RESOURCE_GROUP` | Resource group under which the final artifact will be stored. -| `storage_account` | `ARM_STORAGE_ACCOUNT` | Storage account under which the final artifact will be stored. +| `managed_image_resource_group_name` | `ARM_RESOURCE_GROUP` | Resource group under which the final artifact will be stored. ### Optional variables +- `managed_image_name` - Name of the managed image to create. If not specified, "Runner-Image-{{ImageType}}" will be used. - `build_resource_group_name` - Specify an existing resource group to run the build in it. By default, a temporary resource group will be created and destroyed as part of the build. If you do not have permission to do so, use build_resource_group_name to specify an existing resource group to run the build in it. - `object_id` - The object ID for the AAD SP. Will be derived from the oAuth token if empty. - `tenant_id` - The Active Directory tenant identifier with which your `client_id` and `subscription_id` are associated. If not specified, `tenant_id` will be looked up using `subscription_id`. @@ -195,13 +192,12 @@ If you want more control over image generation process you may run Packer direct - `virtual_network_name` - Use a pre-existing virtual network for the VM. This option enables private communication with the VM, no public IP address is used or provisioned (unless you set `private_virtual_network_with_public_ip`). - `virtual_network_resource_group_name` - If `virtual_network_name` is set, this value may also be set. If `virtual_network_name` is set, and this value is not set the builder attempts to determine the resource group containing the virtual network. If the resource group cannot be found, or it cannot be disambiguated, this value should be set. - `virtual_network_subnet_name` - If `virtual_network_name` is set, this value may also be set. If `virtual_network_name` is set, and this value is not set the builder attempts to determine the subnet to use with the virtual network. If the subnet cannot be found, or it cannot be disambiguated, this value should be set. -- `capture_name_prefix` - VHD prefix. The final artifacts will be named PREFIX-osDisk.UUID and PREFIX-vmTemplate.UUID. ### Builder variables The `builders` section contains variables for the `azure-arm` builder used in the project. Most of the builder variables are inherited from the `user variables` section, however, the variables can be overwritten to adjust image-generation performance. -- `vm_size` - Size of the VM used for building. This can be changed when you deploy a VM from your VHD. +- `vm_size` - Size of the VM used for building. This can be changed when you deploy a VM from your image. - `image_os` - Type of OS that will be deployed as a temporary VM. - `image_version` - Specify version of an OS to boot from. @@ -221,14 +217,14 @@ Generated tool versions and details can be found in related projects: > :warning: These scripts are intended to run on a VM deployed in Azure -The user, created during the image generation, does not exist in the result VHD hence some configuration files related to the user's home directory need to be changed as well as the file permissions for some directories. Scripts for that are located in the `post-generation` folder in the repository: +The user, created during the image generation, does not exist in the result image hence some configuration files related to the user's home directory need to be changed as well as the file permissions for some directories. Scripts for that are located in the `post-generation` folder in the repository: - Windows: <https://github.com/actions/runner-images/tree/main/images/win/post-generation> - Linux: <https://github.com/actions/runner-images/tree/main/images/linux/post-generation> **Note:** The default user for Linux should have `sudo privileges`. -The scripts are copied to the VHD during the image generation process to the following paths: +The scripts are copied to the image during the generation process to the following paths: - Windows: `C:\post-generation` - Linux: `/opt/post-generation` diff --git a/helpers/CreateAzureVMFromPackerTemplate.ps1 b/helpers/CreateAzureVMFromPackerTemplate.ps1 index 770161c2f6e2..7a7c9cacdea4 100644 --- a/helpers/CreateAzureVMFromPackerTemplate.ps1 +++ b/helpers/CreateAzureVMFromPackerTemplate.ps1 @@ -12,8 +12,8 @@ Function CreateAzureVMFromPackerTemplate { .PARAMETER ResourceGroupName The Azure resource group name where the Azure virtual machine will be created. - .PARAMETER TemplatFilePath - The path for the json template generated by packer during image generation locally. + .PARAMETER ManagedImageName + The name of the managed image to be used to create the virtual machine. .PARAMETER VirtualMachineName The name of the virtual machine to be generated. @@ -36,7 +36,7 @@ Function CreateAzureVMFromPackerTemplate { [Parameter(Mandatory = $True)] [string] $ResourceGroupName, [Parameter(Mandatory = $True)] - [string] $TemplateFilePath, + [string] $ManagedImageName, [Parameter(Mandatory = $True)] [string] $VirtualMachineName, [Parameter(Mandatory = $True)] @@ -52,7 +52,7 @@ Function CreateAzureVMFromPackerTemplate { $vnetName = $env:UserName + "vnet-" + $guid $subnetName = $env:UserName + "subnet-" + $guid $nicName = $env:UserName + "nic-" + $guid - $publicIpName = $env:UserName + "pip-" + $guid + $publicIpName = $env:UserName + "pip-" + $guid Write-Host "Creating a virtual network and subnet" ($vnet = az network vnet create -g $ResourceGroupName -l $AzureLocation -n $vnetName --address-prefixes 10.0.0.0/16 --subnet-name $subnetName --subnet-prefixes 10.0.1.0/24 --subscription $subscriptionId -o json) @@ -70,7 +70,16 @@ Function CreateAzureVMFromPackerTemplate { az network nic ip-config update -g $ResourceGroupName -n ipconfig1 --nic-name $nicName --public-ip-address $publicIpId --subscription $subscriptionId Write-Host "`nCreating the VM" - az deployment group create -g $ResourceGroupName -n $VirtualMachineName --subscription $subscriptionId --template-file $templateFilePath --parameters vmSize=$vmSize vmName=$VirtualMachineName adminUserName=$AdminUsername adminPassword=$AdminPassword networkInterfaceId=$networkId + az vm create ` + --resource-group $ResourceGroupName ` + --name $VirtualMachineName ` + --image $ManagedImageName ` + --size $vmSize ` + --admin-username $AdminUsername ` + --admin-password $AdminPassword ` + --nics $networkId ` + --subscription $subscriptionId ` + --location $AzureLocation Write-Host "`nCreated in ${ResourceGroupName}:`n vnet ${vnetName}`n subnet ${subnetName}`n nic ${nicName}`n publicip ${publicIpName}`n vm ${VirtualMachineName}" } diff --git a/helpers/GenerateResourcesAndImage.ps1 b/helpers/GenerateResourcesAndImage.ps1 index 1a1765825f50..2ca3503de30b 100644 --- a/helpers/GenerateResourcesAndImage.ps1 +++ b/helpers/GenerateResourcesAndImage.ps1 @@ -77,6 +77,8 @@ Function GenerateResourcesAndImage { The name of the resource group to create the Azure resources in. .PARAMETER ImageType The type of image to generate. Valid values are: Windows2019, Windows2022, Ubuntu2004, Ubuntu2204, UbuntuMinimal. + .PARAMETER ManagedImageName + The name of the managed image to create. The default is "Runner-Image-{{ImageType}}". .PARAMETER AzureLocation The Azure location where the Azure resources will be created. For example: "East US" .PARAMETER ImageGenerationRepositoryRoot @@ -96,10 +98,6 @@ Function GenerateResourcesAndImage { Delete the resource group if it exists without user confirmation. .PARAMETER ReuseResourceGroup Reuse the resource group if it exists without user confirmation. - .PARAMETER AllowBlobPublicAccess - Allow public access to the generated image blob. - .PARAMETER EnableHttpsTrafficOnly - Enable https traffic only for the generated image blob. .PARAMETER OnError Specify how packer handles an error during image creation. Options: @@ -120,6 +118,8 @@ Function GenerateResourcesAndImage { [string] $ResourceGroupName, [Parameter(Mandatory = $True)] [ImageType] $ImageType, + [Parameter(Mandatory = $False)] + [string] $ManagedImageName = "Runner-Image-$($ImageType)", [Parameter(Mandatory = $True)] [string] $AzureLocation, [Parameter(Mandatory = $False)] @@ -139,10 +139,6 @@ Function GenerateResourcesAndImage { [Parameter(Mandatory = $False)] [switch] $ReuseResourceGroup, [Parameter(Mandatory = $False)] - [bool] $AllowBlobPublicAccess = $False, - [Parameter(Mandatory = $False)] - [bool] $EnableHttpsTrafficOnly = $False, - [Parameter(Mandatory = $False)] [ValidateSet("abort", "ask", "cleanup", "run-cleanup-provisioner")] [string] $OnError = "ask", [Parameter(Mandatory = $False)] @@ -177,16 +173,20 @@ Function GenerateResourcesAndImage { if ($PSVersionTable.PSVersion.Major -eq 5) { Write-Verbose "PowerShell 5 detected. Replacing double quotes with escaped double quotes in allowed inbound IP addresses." $AllowedInboundIpAddresses = '[\"{0}\"]' -f $AgentIp - } else { + } + else { $AllowedInboundIpAddresses = '["{0}"]' -f $AgentIp } - } else { + } + else { $AllowedInboundIpAddresses = $AgentIp } - } else { + } + else { if ($TemplatePath.Contains("pkr.hcl")) { $AllowedInboundIpAddresses = "[]" - } else { + } + else { $AllowedInboundIpAddresses = "" } } @@ -221,8 +221,8 @@ Function GenerateResourcesAndImage { "-var=subscription_id=$($SubscriptionId)" ` "-var=tenant_id=fake" ` "-var=location=$($AzureLocation)" ` - "-var=resource_group=$($ResourceGroupName)" ` - "-var=storage_account=fake" ` + "-var=managed_image_name=$($ManagedImageName)" ` + "-var=managed_image_resource_group_name=$($ResourceGroupName)" ` "-var=install_password=$($InstallPassword)" ` "-var=allowed_inbound_ip_addresses=$($AllowedInboundIpAddresses)" ` "-var=azure_tags=$($TagsJson)" ` @@ -237,7 +237,8 @@ Function GenerateResourcesAndImage { if ([string]::IsNullOrEmpty($AzureClientId)) { Write-Verbose "No AzureClientId was provided, will use interactive login." az login --output none - } else { + } + else { Write-Verbose "AzureClientId was provided, will use service principal login." az login --service-principal --username $AzureClientId --password $AzureClientSecret --tenant $AzureTenantId --output none } @@ -263,7 +264,8 @@ Function GenerateResourcesAndImage { } Write-Host "Resource group '$ResourceGroupName' was deleted." $ResourceGroupExists = $false - } else { + } + else { # Resource group already exists, ask the user what to do $title = "Resource group '$ResourceGroupName' already exists" $message = "Do you want to delete the resource group and all resources in it?" @@ -303,7 +305,8 @@ Function GenerateResourcesAndImage { Write-Host "Creating resource group '$ResourceGroupName' in location '$AzureLocation'..." if ($TagsList) { az group create --name $ResourceGroupName --location $AzureLocation --tags $TagsList --query id - } else { + } + else { az group create --name $ResourceGroupName --location $AzureLocation --query id } if ($LastExitCode -ne 0) { @@ -311,39 +314,6 @@ Function GenerateResourcesAndImage { } } - # Generate proper name for the storage account that follows the recommended naming conventions for azure resources - $StorageAccountName = $ResourceGroupName - if ($ResourceGroupName.EndsWith("-rg")) { - $StorageAccountName = $ResourceGroupName.Substring(0, $ResourceGroupName.Length - 3) - } - $StorageAccountName = $StorageAccountName.Replace("-", "").Replace("_", "").Replace("(", "").Replace(")", "").ToLower() - $StorageAccountName += "001" - if ($StorageAccountName.Length -gt 24) { - $StorageAccountName = $StorageAccountName.Substring(0, 24) - } - - try { - $StorageAccountId = (az storage account show --name $StorageAccountName --resource-group $ResourceGroupName --query id 2>$null) - $StorageAccountExists = "$StorageAccountId" -ne "" - } catch { - $StorageAccountExists = $false - } - - # Create storage account - if ($StorageAccountExists) { - Write-Verbose "Storage account '$StorageAccountName' already exists." - } else { - Write-Host "Creating storage account..." - if ($TagsList) { - az storage account create --name $StorageAccountName --resource-group $ResourceGroupName --location $AzureLocation --sku Standard_LRS --allow-blob-public-access $AllowBlobPublicAccess --https-only $EnableHttpsTrafficOnly --min-tls-version TLS1_2 --tags $TagsList --query id - } else { - az storage account create --name $StorageAccountName --resource-group $ResourceGroupName --location $AzureLocation --sku Standard_LRS --allow-blob-public-access $AllowBlobPublicAccess --https-only $EnableHttpsTrafficOnly --min-tls-version TLS1_2 --query id - } - if ($LastExitCode -ne 0) { - throw "Failed to create storage account '$StorageAccountName'." - } - } - # Create service principal if ([string]::IsNullOrEmpty($AzureClientId)) { Write-Host "Creating service principal for packer..." @@ -362,7 +332,8 @@ Function GenerateResourcesAndImage { Write-Verbose "Waiting for service principal to propagate..." Start-Sleep $SecondsToWaitForServicePrincipalSetup Write-Host "Service principal created with id '$ServicePrincipalAppId'. It will be deleted after the build." - } else { + } + else { $ServicePrincipalAppId = $AzureClientId $ServicePrincipalPassword = $AzureClientSecret $TenantId = $AzureTenantId @@ -376,8 +347,8 @@ Function GenerateResourcesAndImage { -var "subscription_id=$($SubscriptionId)" ` -var "tenant_id=$($TenantId)" ` -var "location=$($AzureLocation)" ` - -var "resource_group=$($ResourceGroupName)" ` - -var "storage_account=$($StorageAccountName)" ` + -var "managed_image_name=$($ManagedImageName)" ` + -var "managed_image_resource_group_name=$($ResourceGroupName)" ` -var "install_password=$($InstallPassword)" ` -var "allowed_inbound_ip_addresses=$($AllowedInboundIpAddresses)" ` -var "azure_tags=$($TagsJson)" ` diff --git a/images.CI/linux-and-win/azure-pipelines/image-generation.yml b/images.CI/linux-and-win/azure-pipelines/image-generation.yml index 1dfeac172a05..c83c46d1436d 100644 --- a/images.CI/linux-and-win/azure-pipelines/image-generation.yml +++ b/images.CI/linux-and-win/azure-pipelines/image-generation.yml @@ -57,7 +57,7 @@ jobs: -RepoBranch $(CUSTOM_REPOSITORY_BRANCH) - task: PowerShell@2 - displayName: 'Set image template variables' + displayName: 'Set variables' inputs: targetType: 'inline' script: | @@ -71,28 +71,57 @@ jobs: Write-Host "##vso[task.setvariable variable=TemplateDirectoryPath;]$TemplateDirectoryPath" Write-Host "##vso[task.setvariable variable=TemplatePath;]$TemplatePath" + $ManagedImageName = "${{ parameters.image_type }}-$(Build.BuildId)" + Write-Host "##vso[task.setvariable variable=ManagedImageName;]$ManagedImageName" + + $VhdName = "$ManagedImageName.vhd" + Write-Host "##vso[task.setvariable variable=VhdName;]$VhdName" + + $TempResourceGroupName = "packer-temp-$ManagedImageName" + Write-Host "##vso[task.setvariable variable=TempResourceGroupName;]$TempResourceGroupName" + - task: PowerShell@2 displayName: 'Build VM' inputs: targetType: filePath filePath: ./images.CI/linux-and-win/build-image.ps1 - arguments: -ResourcesNamePrefix $(Build.BuildId) ` - -ClientId $(CLIENT_ID) ` - -ClientSecret $(CLIENT_SECRET) ` - -TemplatePath $(TemplatePath) ` - -ResourceGroup $(AZURE_RESOURCE_GROUP) ` - -StorageAccount $(AZURE_STORAGE_ACCOUNT) ` - -SubscriptionId $(AZURE_SUBSCRIPTION) ` - -TenantId $(AZURE_TENANT) ` - -Location $(AZURE_LOCATION) ` - -VirtualNetworkName $(BUILD_AGENT_VNET_NAME) ` - -VirtualNetworkRG $(BUILD_AGENT_VNET_RESOURCE_GROUP) ` - -VirtualNetworkSubnet $(BUILD_AGENT_SUBNET_NAME) + arguments: -ClientId $(CLIENT_ID) ` + -ClientSecret $(CLIENT_SECRET) ` + -TemplatePath $(TemplatePath) ` + -ImageName "$(ManagedImageName)" ` + -ImageResourceGroupName $(AZURE_RESOURCE_GROUP) ` + -TempResourceGroupName "$(TempResourceGroupName)" ` + -SubscriptionId $(AZURE_SUBSCRIPTION) ` + -TenantId $(AZURE_TENANT) ` + -Location $(AZURE_LOCATION) ` + -VirtualNetworkName $(BUILD_AGENT_VNET_NAME) ` + -VirtualNetworkRG $(BUILD_AGENT_VNET_RESOURCE_GROUP) ` + -VirtualNetworkSubnet $(BUILD_AGENT_SUBNET_NAME) env: PACKER_LOG: 1 PACKER_LOG_PATH: "$(Agent.TempDirectory)/packer-log.txt" - + + - task: PowerShell@2 + displayName: 'Convert managed image to VHD' + inputs: + targetType: filePath + filePath: ./images.CI/linux-and-win/convert-to-vhd.ps1 + arguments: -SubscriptionId $(AZURE_SUBSCRIPTION) ` + -Location $(AZURE_LOCATION) ` + -ResourceGroupName $(AZURE_RESOURCE_GROUP) ` + -ManagedImageName "$(ManagedImageName)" ` + -GalleryName "github_imagegeneration_convert_to_vhd" ` + -GalleryImageSku "${{ parameters.image_type }}" ` + -GalleryImageVersion "0.0.$(Build.BuildId)" ` + -StorageAccountName $(AZURE_STORAGE_ACCOUNT) ` + -StorageAccountContainerName "images" ` + -VhdName "$(VhdName)" ` + -ClientId $(CLIENT_ID) ` + -ClientSecret $(CLIENT_SECRET) ` + -TenantId $(AZURE_TENANT) ` + -RemoveManagedImage + - task: PowerShell@2 displayName: 'Copy image artifacts to the separate directory' inputs: @@ -144,11 +173,13 @@ jobs: targetType: filePath filePath: ./images.CI/linux-and-win/create-release.ps1 arguments: -BuildId $(Build.BuildId) ` - -Organization $(RELEASE_TARGET_ORGANIZATION) ` - -DefinitionId $(RELEASE_TARGET_DEFINITION_ID) ` - -Project $(RELEASE_TARGET_PROJECT) ` - -ImageName ${{ parameters.image_type }} ` - -AccessToken $(RELEASE_TARGET_TOKEN) + -Organization $(RELEASE_TARGET_ORGANIZATION) ` + -DefinitionId $(RELEASE_TARGET_DEFINITION_ID) ` + -Project $(RELEASE_TARGET_PROJECT) ` + -ImageName "${{ parameters.image_type }}" ` + -StorageAccountContainerName "images" ` + -VhdName "$(VhdName)" ` + -AccessToken $(RELEASE_TARGET_TOKEN) - task: PowerShell@2 displayName: 'Clean up resources' @@ -156,10 +187,9 @@ jobs: inputs: targetType: filePath filePath: ./images.CI/linux-and-win/cleanup.ps1 - arguments: -ResourcesNamePrefix $(Build.BuildId) ` - -Image ${{ parameters.image_type }} ` - -StorageAccount $(AZURE_STORAGE_ACCOUNT) ` - -SubscriptionId $(AZURE_SUBSCRIPTION) ` - -ClientId $(CLIENT_ID) ` - -ClientSecret $(CLIENT_SECRET) ` - -TenantId $(AZURE_TENANT) + arguments: -TempResourceGroupName "$(TempResourceGroupName)" ` + -StorageAccount $(AZURE_STORAGE_ACCOUNT) ` + -SubscriptionId $(AZURE_SUBSCRIPTION) ` + -ClientId $(CLIENT_ID) ` + -ClientSecret $(CLIENT_SECRET) ` + -TenantId $(AZURE_TENANT) diff --git a/images.CI/linux-and-win/build-image.ps1 b/images.CI/linux-and-win/build-image.ps1 index 8c0086597dc3..47b6cd67dc05 100644 --- a/images.CI/linux-and-win/build-image.ps1 +++ b/images.CI/linux-and-win/build-image.ps1 @@ -2,10 +2,10 @@ param( [String] [Parameter (Mandatory=$true)] $TemplatePath, [String] [Parameter (Mandatory=$true)] $ClientId, [String] [Parameter (Mandatory=$true)] $ClientSecret, - [String] [Parameter (Mandatory=$true)] $ResourcesNamePrefix, [String] [Parameter (Mandatory=$true)] $Location, - [String] [Parameter (Mandatory=$true)] $ResourceGroup, - [String] [Parameter (Mandatory=$true)] $StorageAccount, + [String] [Parameter (Mandatory=$true)] $ImageName, + [String] [Parameter (Mandatory=$true)] $ImageResourceGroupName, + [String] [Parameter (Mandatory=$true)] $TempResourceGroupName, [String] [Parameter (Mandatory=$true)] $SubscriptionId, [String] [Parameter (Mandatory=$true)] $TenantId, [String] [Parameter (Mandatory=$false)] $VirtualNetworkName, @@ -19,8 +19,7 @@ if (-not (Test-Path $TemplatePath)) exit 1 } -$Image = [io.path]::GetFileName($TemplatePath).Split(".")[0] -$TempResourceGroupName = "${ResourcesNamePrefix}_${Image}" +$ImageTemplateName = [io.path]::GetFileName($TemplatePath).Split(".")[0] $InstallPassword = [System.GUID]::NewGuid().ToString().ToUpper() packer validate -syntax-only $TemplatePath @@ -38,14 +37,13 @@ $SensitiveData = @( Write-Host "Show Packer Version" packer --version -Write-Host "Build $Image VM" -packer build -var "capture_name_prefix=$ResourcesNamePrefix" ` - -var "client_id=$ClientId" ` +Write-Host "Build $ImageTemplateName VM" +packer build -var "client_id=$ClientId" ` -var "client_secret=$ClientSecret" ` -var "install_password=$InstallPassword" ` -var "location=$Location" ` - -var "resource_group=$ResourceGroup" ` - -var "storage_account=$StorageAccount" ` + -var "managed_image_name=$ImageName" ` + -var "managed_image_resource_group_name=$ImageResourceGroupName" ` -var "subscription_id=$SubscriptionId" ` -var "temp_resource_group_name=$TempResourceGroupName" ` -var "tenant_id=$TenantId" ` diff --git a/images.CI/linux-and-win/cleanup.ps1 b/images.CI/linux-and-win/cleanup.ps1 index 8f7b35d5ce56..691bda29cc29 100644 --- a/images.CI/linux-and-win/cleanup.ps1 +++ b/images.CI/linux-and-win/cleanup.ps1 @@ -1,17 +1,14 @@ param( - [String] [Parameter (Mandatory=$true)] $Image, - [String] [Parameter (Mandatory=$true)] $ResourcesNamePrefix, + [String] [Parameter (Mandatory=$true)] $TempResourceGroupName, [String] [Parameter (Mandatory=$true)] $StorageAccount, + [String] [Parameter (Mandatory=$true)] $SubscriptionId, [String] [Parameter (Mandatory=$true)] $ClientId, [String] [Parameter (Mandatory=$true)] $ClientSecret, - [String] [Parameter (Mandatory=$true)] $SubscriptionId, [String] [Parameter (Mandatory=$true)] $TenantId ) az login --service-principal --username $ClientId --password $ClientSecret --tenant $TenantId | Out-Null -$TempResourceGroupName = "${ResourcesNamePrefix}_${Image}" - $groupExist = az group exists --name $TempResourceGroupName --subscription $SubscriptionId if ($groupExist -eq "true") { $osDiskName = az deployment group list --resource-group $TempResourceGroupName --query "[].properties.parameters.osDiskName.value" -o tsv diff --git a/images.CI/linux-and-win/convert-to-vhd.ps1 b/images.CI/linux-and-win/convert-to-vhd.ps1 new file mode 100644 index 000000000000..aff2806aff90 --- /dev/null +++ b/images.CI/linux-and-win/convert-to-vhd.ps1 @@ -0,0 +1,185 @@ +param ( + [String] [Parameter (Mandatory = $true)] $SubscriptionId, + [String] [Parameter (Mandatory = $true)] $Location, + [String] [Parameter (Mandatory = $true)] $ResourceGroupName, + + [String] [Parameter (Mandatory = $true)] $ManagedImageName, + + [String] [Parameter (Mandatory = $true)] $GalleryName, + [String] [Parameter (Mandatory = $true)] $GalleryImageSku, + [String] [Parameter (Mandatory = $true)] $GalleryImageVersion, + + [String] [Parameter (Mandatory = $true)] $StorageAccountName, + [String] [Parameter (Mandatory = $true)] $StorageAccountContainerName, + [String] [Parameter (Mandatory = $true)] $VhdName, + + [Switch] [Parameter (Mandatory = $false)] $RemoveManagedImage, + + [String] [Parameter (Mandatory = $true)] $ClientId, + [String] [Parameter (Mandatory = $true)] $ClientSecret, + [String] [Parameter (Mandatory = $true)] $TenantId +) + +$ErrorActionPreference = "Stop" + +# Login to Azure +az login --service-principal --username $ClientId --password $ClientSecret --tenant $TenantId | Out-Null +az account set --subscription $SubscriptionId | Out-Null + +# Create Compute Image Gallery if it doesn't exist +Write-Host "Creating Compute Image Gallery '$GalleryName'..." +$galleryExists = az sig list --resource-group $ResourceGroupName --query "[?name=='$GalleryName']" -o tsv +if ($null -eq $galleryExists) { + az sig create --resource-group $ResourceGroupName --gallery-name $GalleryName --location $Location +} + +# Create Image Definition if it doesn't exist +Write-Host "Creating Image Definition '$ManagedImageName'..." +$imageDefinitionName = "RunnerImage-$GalleryImageSku" +if ($ManagedImageName -like "*windows*") { + $imageOsType = "Windows" +} elseif ($ManagedImageName -like "*ubuntu*") { + $imageOsType = "Linux" +} else { + throw "Unknown OS type for image '$ManagedImageName'" +} + +$galleryImageExists = az sig image-definition list --resource-group $ResourceGroupName --gallery-name $GalleryName --query "[?name=='$imageDefinitionName']" -o tsv +if ($null -eq $galleryImageExists) { + az sig image-definition create ` + --resource-group $ResourceGroupName ` + --gallery-name $GalleryName ` + --gallery-image-definition $imageDefinitionName ` + --publisher "GuthubImagesGeneration" ` + --offer "RunnerImage" ` + --sku $GalleryImageSku ` + --os-type $imageOsType ` + --location $Location +} + +# Create Image Version from existing Managed Image +Write-Host "Creating Image Version '$GalleryImageVersion' from Managed Image '$ManagedImageName'..." +az sig image-version create ` + --resource-group $ResourceGroupName ` + --gallery-name $GalleryName ` + --gallery-image-definition $imageDefinitionName ` + --gallery-image-version $GalleryImageVersion ` + --managed-image "/subscriptions/$SubscriptionId/resourceGroups/$ResourceGroupName/providers/Microsoft.Compute/images/$ManagedImageName" ` + --target-regions $Location ` + --replica-count 1 ` + --location $Location + +# Create Azure Managed Disk from Shared Image Gallery +Write-Host "Creating Azure Managed Disk '$ManagedImageName' from Shared Image Gallery..." +az disk create ` + --resource-group $ResourceGroupName ` + --name $ManagedImageName ` + --location $Location ` + --gallery-image-reference "/subscriptions/$SubscriptionId/resourceGroups/$ResourceGroupName/providers/Microsoft.Compute/galleries/$GalleryName/images/$imageDefinitionName/versions/$GalleryImageVersion" + +# Generate SAS URL for the Managed Disk +Write-Host "Generating SAS URL for the Managed Disk '$ManagedImageName'..." +$sourceDiskUri = az disk grant-access ` + --resource-group $ResourceGroupName ` + --name $ManagedImageName ` + --duration-in-seconds 86400 ` + --access-level Read ` + --query [accessSas] -o tsv + +Write-Host "Querying key for the storage account '$StorageAccountName'..." +$targetKey = az storage account keys list ` + --resource-group $ResourceGroupName ` + --account-name $StorageAccountName ` + --query "[0].value" -o tsv + +Write-Host ("Copying VHD blob from '{0}' to 'https://{1}.blob.core.windows.net/{2}/{3}'..." ` + -f $sourceDiskUri.Split('?')[0], $StorageAccountName, $StorageAccountContainerName, $VhdName) + +az storage blob copy start ` + --source-uri """$sourceDiskUri""" ` + --destination-blob $VhdName ` + --destination-container $StorageAccountContainerName ` + --account-name $StorageAccountName ` + --account-key $targetKey ` + --only-show-errors + +Write-Host "Waiting for the copy to complete..." +while ($true) { + $status = az storage blob show ` + --container-name $StorageAccountContainerName ` + --name $VhdName ` + --account-name $StorageAccountName ` + --account-key $targetKey ` + --query "properties.copy.status" -o tsv + + if ($status -eq "success") { + Write-Host "Copy completed successfully." + break + } elseif ($status -ne "pending") { + Write-Host "Copy failed with status '$status', see blob information below:" + az storage blob show ` + --container-name $StorageAccountContainerName ` + --name $VhdName ` + --account-name $StorageAccountName ` + --account-key $targetKey + throw "Copy failed with status '$status'" + } + + $progress = az storage blob show ` + --container-name $StorageAccountContainerName ` + --name $VhdName ` + --account-name $StorageAccountName ` + --account-key $targetKey ` + --query "properties.copy.progress" -o tsv + + Write-Host "Progress: $(($progress.Split("/")[0] / $progress.Split("/")[1]).ToString("P"))" + Start-Sleep -Seconds 15 +} + +Write-Host "Successfully converted '$ManagedImageName' to '$VhdName' in '$StorageAccountName' storage account." + +# Remove Managed Image if requested +if ($RemoveManagedImage) { + Write-Host "Removing Managed Image '$ManagedImageName'..." + az image delete ` + --resource-group $ResourceGroupName ` + --name $ManagedImageName ` + --only-show-errors + if ($LastExitCode) { + Write-Host "Warning: Failed to delete the Managed Image '$ManagedImageName'." + } +} + +Write-Host "Cleaning up..." + +# Revoke SAS URL for the Managed Disk +az disk revoke-access ` + --resource-group $ResourceGroupName ` + --name $ManagedImageName ` + --only-show-errors +if ($LastExitCode) { + Write-Host "Warning: Failed to revoke access to the Managed Disk '$ManagedImageName'." +} + +# Delete Azure Managed Disk from Shared Image Gallery +az disk delete ` + --resource-group $ResourceGroupName ` + --name $ManagedImageName ` + --only-show-errors ` + --yes +if ($LastExitCode) { + Write-Host "Warning: Failed to delete the Managed Disk '$ManagedImageName'." +} + +# Delete Image Version from Shared Image Gallery +az sig image-version delete ` + --resource-group $ResourceGroupName ` + --gallery-name $GalleryName ` + --gallery-image-definition $imageDefinitionName ` + --gallery-image-version $GalleryImageVersion ` + --only-show-errors +if ($LastExitCode) { + Write-Host "Warning: Failed to delete the Image Version '$GalleryImageVersion'." +} + +Write-Host "Done." diff --git a/images.CI/linux-and-win/create-release.ps1 b/images.CI/linux-and-win/create-release.ps1 index f32974c2d3c0..1dcb95afca26 100644 --- a/images.CI/linux-and-win/create-release.ps1 +++ b/images.CI/linux-and-win/create-release.ps1 @@ -3,6 +3,8 @@ param( [String] [Parameter (Mandatory)] $Organization, [String] [Parameter (Mandatory)] $Project, [String] [Parameter (Mandatory)] $ImageName, + [String] [Parameter (Mandatory)] $StorageAccountContainerName, + [String] [Parameter (Mandatory)] $VhdName, [String] [Parameter (Mandatory)] $DefinitionId, [String] [Parameter (Mandatory)] $AccessToken ) @@ -16,6 +18,12 @@ $Body = @{ ImageName = @{ value = $ImageName } + ImageStorageContainerName = @{ + value = $StorageAccountContainerName + } + ImageBlobPath = @{ + value = $VhdName + } } isDraft = "false" } | ConvertTo-Json -Depth 3 diff --git a/images/linux/ubuntu2004.json b/images/linux/ubuntu2004.json index ee368db138d6..b9514c57a700 100644 --- a/images/linux/ubuntu2004.json +++ b/images/linux/ubuntu2004.json @@ -5,8 +5,7 @@ "client_cert_path": "{{env `ARM_CLIENT_CERT_PATH`}}", "subscription_id": "{{env `ARM_SUBSCRIPTION_ID`}}", "tenant_id": "{{env `ARM_TENANT_ID`}}", - "resource_group": "{{env `ARM_RESOURCE_GROUP`}}", - "storage_account": "{{env `ARM_STORAGE_ACCOUNT`}}", + "managed_image_resource_group_name": "{{env `ARM_RESOURCE_GROUP`}}", "build_resource_group_name": "{{env `BUILD_RESOURCE_GROUP_NAME`}}", "temp_resource_group_name": "{{env `TEMP_RESOURCE_GROUP_NAME`}}", "location": "{{env `ARM_RESOURCE_LOCATION`}}", @@ -20,7 +19,7 @@ "installer_script_folder": "/imagegeneration/installers", "helper_script_folder": "/imagegeneration/helpers", "vm_size": "Standard_D4s_v4", - "capture_name_prefix": "packer", + "managed_image_name": "packer-ubuntu20-dev", "image_version": "dev", "image_os": "ubuntu20", "run_validation_diskspace": "false", @@ -40,12 +39,10 @@ "tenant_id": "{{user `tenant_id`}}", "location": "{{user `location`}}", "vm_size": "{{user `vm_size`}}", - "resource_group_name": "{{user `resource_group`}}", - "storage_account": "{{user `storage_account`}}", + "managed_image_name": "{{user `managed_image_name`}}", + "managed_image_resource_group_name": "{{user `managed_image_resource_group_name`}}", "build_resource_group_name": "{{user `build_resource_group_name`}}", "temp_resource_group_name": "{{user `temp_resource_group_name`}}", - "capture_container_name": "images", - "capture_name_prefix": "{{user `capture_name_prefix`}}", "virtual_network_name": "{{user `virtual_network_name`}}", "virtual_network_resource_group_name": "{{user `virtual_network_resource_group_name`}}", "virtual_network_subnet_name": "{{user `virtual_network_subnet_name`}}", diff --git a/images/linux/ubuntu2204.pkr.hcl b/images/linux/ubuntu2204.pkr.hcl index d4018a44c68d..0001838c8d90 100644 --- a/images/linux/ubuntu2204.pkr.hcl +++ b/images/linux/ubuntu2204.pkr.hcl @@ -1,3 +1,6 @@ +locals { + managed_image_name = var.managed_image_name != "" ? var.managed_image_name : "packer-${var.image_os}-${var.image_version}" +} variable "allowed_inbound_ip_addresses" { type = list(string) @@ -14,9 +17,9 @@ variable "build_resource_group_name" { default = "${env("BUILD_RESOURCE_GROUP_NAME")}" } -variable "capture_name_prefix" { +variable "managed_image_name" { type = string - default = "packer" + default = "" } variable "client_id" { @@ -95,7 +98,7 @@ variable "private_virtual_network_with_public_ip" { default = false } -variable "resource_group" { +variable "managed_image_resource_group_name" { type = string default = "${env("ARM_RESOURCE_GROUP")}" } @@ -105,11 +108,6 @@ variable "run_validation_diskspace" { default = false } -variable "storage_account" { - type = string - default = "${env("ARM_STORAGE_ACCOUNT")}" -} - variable "subscription_id" { type = string default = "${env("ARM_SUBSCRIPTION_ID")}" @@ -145,11 +143,9 @@ variable "vm_size" { default = "Standard_D4s_v4" } -source "azure-arm" "build_vhd" { +source "azure-arm" "build_image" { allowed_inbound_ip_addresses = "${var.allowed_inbound_ip_addresses}" build_resource_group_name = "${var.build_resource_group_name}" - capture_container_name = "images" - capture_name_prefix = "${var.capture_name_prefix}" client_id = "${var.client_id}" client_secret = "${var.client_secret}" client_cert_path = "${var.client_cert_path}" @@ -160,8 +156,8 @@ source "azure-arm" "build_vhd" { os_disk_size_gb = "86" os_type = "Linux" private_virtual_network_with_public_ip = "${var.private_virtual_network_with_public_ip}" - resource_group_name = "${var.resource_group}" - storage_account = "${var.storage_account}" + managed_image_name = "${local.managed_image_name}" + managed_image_resource_group_name = "${var.managed_image_resource_group_name}" subscription_id = "${var.subscription_id}" temp_resource_group_name = "${var.temp_resource_group_name}" tenant_id = "${var.tenant_id}" @@ -180,7 +176,7 @@ source "azure-arm" "build_vhd" { } build { - sources = ["source.azure-arm.build_vhd"] + sources = ["source.azure-arm.build_image"] provisioner "shell" { execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" diff --git a/images/linux/ubuntuminimal.pkr.hcl b/images/linux/ubuntuminimal.pkr.hcl index f81e1a2ea888..6798420a4dee 100644 --- a/images/linux/ubuntuminimal.pkr.hcl +++ b/images/linux/ubuntuminimal.pkr.hcl @@ -7,6 +7,8 @@ locals { helper_script_folder = "/imagegeneration/helpers" installer_script_folder = "/imagegeneration/installers" imagedata_file = "/imagegeneration/imagedata.json" + + managed_image_name = var.managed_image_name != "" ? var.managed_image_name : "packer-${var.image_os}-${var.image_version}" } variable "allowed_inbound_ip_addresses" { @@ -24,9 +26,9 @@ variable "build_resource_group_name" { default = "${env("BUILD_RESOURCE_GROUP_NAME")}" } -variable "capture_name_prefix" { +variable "managed_image_name" { type = string - default = "packer" + default = "" } variable "client_id" { @@ -70,7 +72,7 @@ variable "private_virtual_network_with_public_ip" { default = false } -variable "resource_group" { +variable "managed_image_resource_group_name" { type = string default = "${env("ARM_RESOURCE_GROUP")}" } @@ -80,11 +82,6 @@ variable "run_validation_diskspace" { default = false } -variable "storage_account" { - type = string - default = "${env("ARM_STORAGE_ACCOUNT")}" -} - variable "subscription_id" { type = string default = "${env("ARM_SUBSCRIPTION_ID")}" @@ -120,7 +117,7 @@ variable "vm_size" { default = "Standard_D4s_v4" } -source "azure-arm" "build_vhd" { +source "azure-arm" "build_image" { location = "${var.location}" // Auth @@ -136,10 +133,8 @@ source "azure-arm" "build_vhd" { image_sku = "22_04-lts" // Target location - storage_account = "${var.storage_account}" - resource_group_name = "${var.resource_group}" - capture_container_name = "images" - capture_name_prefix = "${var.capture_name_prefix}" + managed_image_name = "${local.managed_image_name}" + managed_image_resource_group_name = "${var.managed_image_resource_group_name}" // Resource group for VM build_resource_group_name = "${var.build_resource_group_name}" @@ -167,7 +162,7 @@ source "azure-arm" "build_vhd" { } build { - sources = ["source.azure-arm.build_vhd"] + sources = ["source.azure-arm.build_image"] // Create folder to store temporary data provisioner "shell" { diff --git a/images/win/windows2019.json b/images/win/windows2019.json index 03f13124d18b..161472f9362c 100644 --- a/images/win/windows2019.json +++ b/images/win/windows2019.json @@ -6,8 +6,7 @@ "subscription_id": "{{env `ARM_SUBSCRIPTION_ID`}}", "tenant_id": "{{env `ARM_TENANT_ID`}}", "object_id": "{{env `ARM_OBJECT_ID`}}", - "resource_group": "{{env `ARM_RESOURCE_GROUP`}}", - "storage_account": "{{env `ARM_STORAGE_ACCOUNT`}}", + "managed_image_resource_group_name": "{{env `ARM_RESOURCE_GROUP`}}", "build_resource_group_name": "{{env `BUILD_RESOURCE_GROUP_NAME`}}", "temp_resource_group_name": "{{env `TEMP_RESOURCE_GROUP_NAME`}}", "location": "{{env `ARM_RESOURCE_LOCATION`}}", @@ -23,7 +22,7 @@ "agent_tools_directory": "C:\\hostedtoolcache\\windows", "install_user": "installer", "install_password": null, - "capture_name_prefix": "packer", + "managed_image_name": "packer-win19-dev", "image_version": "dev", "image_os": "win19" }, @@ -33,7 +32,7 @@ ], "builders": [ { - "name": "vhd", + "name": "image", "type": "azure-arm", "client_id": "{{user `client_id`}}", "client_secret": "{{user `client_secret`}}", @@ -44,12 +43,10 @@ "os_disk_size_gb": "256", "location": "{{user `location`}}", "vm_size": "{{user `vm_size`}}", - "resource_group_name": "{{user `resource_group`}}", - "storage_account": "{{user `storage_account`}}", + "managed_image_name": "{{user `managed_image_name`}}", + "managed_image_resource_group_name": "{{user `managed_image_resource_group_name`}}", "build_resource_group_name": "{{user `build_resource_group_name`}}", "temp_resource_group_name": "{{user `temp_resource_group_name`}}", - "capture_container_name": "images", - "capture_name_prefix": "{{user `capture_name_prefix`}}", "virtual_network_name": "{{user `virtual_network_name`}}", "virtual_network_resource_group_name": "{{user `virtual_network_resource_group_name`}}", "virtual_network_subnet_name": "{{user `virtual_network_subnet_name`}}", diff --git a/images/win/windows2022.json b/images/win/windows2022.json index 2f5a05610e14..8d79abf20b2d 100644 --- a/images/win/windows2022.json +++ b/images/win/windows2022.json @@ -6,8 +6,7 @@ "subscription_id": "{{env `ARM_SUBSCRIPTION_ID`}}", "tenant_id": "{{env `ARM_TENANT_ID`}}", "object_id": "{{env `ARM_OBJECT_ID`}}", - "resource_group": "{{env `ARM_RESOURCE_GROUP`}}", - "storage_account": "{{env `ARM_STORAGE_ACCOUNT`}}", + "managed_image_resource_group_name": "{{env `ARM_RESOURCE_GROUP`}}", "build_resource_group_name": "{{env `BUILD_RESOURCE_GROUP_NAME`}}", "temp_resource_group_name": "{{env `TEMP_RESOURCE_GROUP_NAME`}}", "location": "{{env `ARM_RESOURCE_LOCATION`}}", @@ -23,7 +22,7 @@ "agent_tools_directory": "C:\\hostedtoolcache\\windows", "install_user": "installer", "install_password": null, - "capture_name_prefix": "packer", + "managed_image_name": "packer-win22-dev", "image_version": "dev", "image_os": "win22" }, @@ -33,7 +32,7 @@ ], "builders": [ { - "name": "vhd", + "name": "image", "type": "azure-arm", "client_id": "{{user `client_id`}}", "client_secret": "{{user `client_secret`}}", @@ -44,12 +43,10 @@ "os_disk_size_gb": "256", "location": "{{user `location`}}", "vm_size": "{{user `vm_size`}}", - "resource_group_name": "{{user `resource_group`}}", - "storage_account": "{{user `storage_account`}}", + "managed_image_name": "{{user `managed_image_name`}}", + "managed_image_resource_group_name": "{{user `managed_image_resource_group_name`}}", "build_resource_group_name": "{{user `build_resource_group_name`}}", "temp_resource_group_name": "{{user `temp_resource_group_name`}}", - "capture_container_name": "images", - "capture_name_prefix": "{{user `capture_name_prefix`}}", "virtual_network_name": "{{user `virtual_network_name`}}", "virtual_network_resource_group_name": "{{user `virtual_network_resource_group_name`}}", "virtual_network_subnet_name": "{{user `virtual_network_subnet_name`}}", From 587a8c8e6fd8bf320282e3465d88c8aa50bbd79c Mon Sep 17 00:00:00 2001 From: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com> Date: Fri, 1 Sep 2023 11:44:00 +0200 Subject: [PATCH 2156/3485] [windows] cleanup DotNETSdk install script (#8200) * [win] some cleanup of DonetSDK installer FixPublish workaround not needed anymore, we do not install 3.1 C:\Temp not needed as well --- .../scripts/Installers/Install-DotnetSDK.ps1 | 21 +++---------------- 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/images/win/scripts/Installers/Install-DotnetSDK.ps1 b/images/win/scripts/Installers/Install-DotnetSDK.ps1 index 6b0f650a8731..fb4caff7b434 100644 --- a/images/win/scripts/Installers/Install-DotnetSDK.ps1 +++ b/images/win/scripts/Installers/Install-DotnetSDK.ps1 @@ -4,9 +4,6 @@ ## cache. Should run after VS and Node ################################################################################ -# ensure temp -New-Item -Path C:\Temp -Force -ItemType Directory - # Set environment variables Set-SystemVariable -SystemVariable DOTNET_MULTILEVEL_LOOKUP -Value "0" Set-SystemVariable -SystemVariable DOTNET_NOLOGO -Value "1" @@ -14,6 +11,7 @@ Set-SystemVariable -SystemVariable DOTNET_SKIP_FIRST_TIME_EXPERIENCE -Value "1" [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor "Tls12" +#region "Functions" function Get-SDKVersionsToInstall ( $DotnetVersion ) { @@ -52,18 +50,6 @@ function Invoke-Warmup ( } } -function Fix-ImportPublishProfile ( - $SdkVersion -) { - if (Test-IsWin19) { - # Fix for issue https://github.com/dotnet/sdk/issues/1276. This will be fixed in 3.1. - $sdkTargetsName = "Microsoft.NET.Sdk.ImportPublishProfile.targets" - $sdkTargetsUrl = "https://raw.githubusercontent.com/dotnet/sdk/82bc30c99f1325dfaa7ad450be96857a4fca2845/src/Tasks/Microsoft.NET.Build.Tasks/targets/${sdkTargetsName}" - $sdkTargetsPath = "C:\Program Files\dotnet\sdk\$sdkVersion\Sdks\Microsoft.NET.Sdk\targets" - Start-DownloadWithRetry -Url $sdkTargetsUrl -DownloadPath $sdkTargetsPath -Name $sdkTargetsName - } -} - function InstallSDKVersion ( $SdkVersion, $Warmup @@ -72,15 +58,13 @@ function InstallSDKVersion ( if (!(Test-Path -Path "C:\Program Files\dotnet\sdk\$sdkVersion")) { Write-Host "Installing dotnet $sdkVersion" - .\dotnet-install.ps1 -Architecture x64 -Version $sdkVersion -InstallDir $(Join-Path -Path $env:ProgramFiles -ChildPath 'dotnet') + .\dotnet-install.ps1 -Version $sdkVersion -InstallDir $(Join-Path -Path $env:ProgramFiles -ChildPath 'dotnet') } else { Write-Host "Sdk version $sdkVersion already installed" } - Fix-ImportPublishProfile -SdkVersion $SdkVersion - if ($Warmup) { Invoke-Warmup -SdkVersion $SdkVersion } @@ -138,6 +122,7 @@ function RunPostInstallationSteps() # Add %USERPROFILE%\.dotnet\tools to USER PATH Add-DefaultPathItem "%USERPROFILE%\.dotnet\tools" } +#endregion InstallAllValidSdks RunPostInstallationSteps From 0a6c637b3fc3544666669f8a76ed308a72263afc Mon Sep 17 00:00:00 2001 From: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com> Date: Fri, 1 Sep 2023 22:06:41 +0200 Subject: [PATCH 2157/3485] macos: drop Hardware_Accelerated_Execution_Manager (#8216) --- images/macos/provision/core/android-toolsets.sh | 5 ----- images/macos/software-report/SoftwareReport.Android.psm1 | 8 -------- images/macos/toolsets/toolset-11.json | 2 +- images/macos/toolsets/toolset-12.json | 2 +- images/macos/toolsets/toolset-13.json | 2 +- 5 files changed, 3 insertions(+), 16 deletions(-) diff --git a/images/macos/provision/core/android-toolsets.sh b/images/macos/provision/core/android-toolsets.sh index 36373be616d4..4b7a09baa3c0 100755 --- a/images/macos/provision/core/android-toolsets.sh +++ b/images/macos/provision/core/android-toolsets.sh @@ -93,11 +93,6 @@ do echo y | $SDKMANAGER "extras;$extra_name" done -# Intel x86 Emulator Accelerator (HAXM installer) -# The Android Emulator uses the built-in Hypervisor.Framework by default, and falls back to using Intel HAXM if Hypervisor.Framework fails to initialize -# https://developer.android.com/studio/run/emulator-acceleration#vm-mac -# The installation doesn't work properly on macOS Big Sur, /dev/HAX is not created - for addon_name in "${ANDROID_ADDON_LIST[@]}" do echo "Installing add-on $addon_name ..." diff --git a/images/macos/software-report/SoftwareReport.Android.psm1 b/images/macos/software-report/SoftwareReport.Android.psm1 index 2ba8f23c7ecd..08f4b0746ca8 100644 --- a/images/macos/software-report/SoftwareReport.Android.psm1 +++ b/images/macos/software-report/SoftwareReport.Android.psm1 @@ -199,11 +199,3 @@ function Get-AndroidNDKVersions { $_ + $defaultPostfix } | Join-String -Separator "<br>") } - -function Get-IntelHaxmVersion { - kextstat | Where-Object { $_ -match "com.intel.kext.intelhaxm \((?<version>(\d+\.){1,}\d+)\)" } | Out-Null - return [PSCustomObject] @{ - "Package Name" = "Intel HAXM" - "Version" = $Matches.Version - } -} \ No newline at end of file diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index fda5bd3766bc..cb426de76644 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -160,7 +160,7 @@ "platform_min_version": "27", "build_tools_min_version": "27.0.0", "extra-list": [ - "android;m2repository", "google;m2repository", "google;google_play_services", "intel;Hardware_Accelerated_Execution_Manager" + "android;m2repository", "google;m2repository", "google;google_play_services" ], "addon-list": [], "additional-tools": [ diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index 6ef6bd088b2d..c060db3d9719 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -147,7 +147,7 @@ "platform_min_version": "27", "build_tools_min_version": "27.0.0", "extra-list": [ - "android;m2repository", "google;m2repository", "google;google_play_services", "intel;Hardware_Accelerated_Execution_Manager" + "android;m2repository", "google;m2repository", "google;google_play_services" ], "addon-list": [], "additional-tools": [ diff --git a/images/macos/toolsets/toolset-13.json b/images/macos/toolsets/toolset-13.json index 61a097141429..6d9e78493490 100644 --- a/images/macos/toolsets/toolset-13.json +++ b/images/macos/toolsets/toolset-13.json @@ -32,7 +32,7 @@ "platform_min_version": "27", "build_tools_min_version": "27.0.0", "extra-list": [ - "android;m2repository", "google;m2repository", "google;google_play_services", "intel;Hardware_Accelerated_Execution_Manager" + "android;m2repository", "google;m2repository", "google;google_play_services" ], "addon-list": [], "additional-tools": [ From 1e590b77aab883dbe2e4ebb6bd6797d3ffba180f Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Sat, 2 Sep 2023 12:25:52 +0200 Subject: [PATCH 2158/3485] [Windows] Add VC components for VS 17.7 (#8151) * [Windows] Add VC components for VS 17.7 * Try to debug VS installation * Add more components for VS * Use response file * Remove 14.36.17.6 build tools components * Fix issue where config is bad for VS2019 installer --- .../ImageHelpers/VisualStudioHelpers.ps1 | 92 ++++++++++++++----- images/win/scripts/Installers/Install-VS.ps1 | 19 ++-- images/win/toolsets/toolset-2022.json | 36 ++++---- 3 files changed, 91 insertions(+), 56 deletions(-) diff --git a/images/win/scripts/ImageHelpers/VisualStudioHelpers.ps1 b/images/win/scripts/ImageHelpers/VisualStudioHelpers.ps1 index a02311f78df7..e68f76479148 100644 --- a/images/win/scripts/ImageHelpers/VisualStudioHelpers.ps1 +++ b/images/win/scripts/ImageHelpers/VisualStudioHelpers.ps1 @@ -1,5 +1,4 @@ -Function Install-VisualStudio -{ +Function Install-VisualStudio { <# .SYNOPSIS A helper function to install Visual Studio. @@ -7,56 +6,99 @@ Function Install-VisualStudio .DESCRIPTION Prepare system environment, and install Visual Studio bootstrapper with selected workloads. - .PARAMETER BootstrapperUrl - The URL from which the bootstrapper will be downloaded. Required parameter. + .PARAMETER Version + The version of Visual Studio that will be installed. Required parameter. - .PARAMETER WorkLoads - The string that contain workloads that will be passed to the installer. + .PARAMETER Edition + The edition of Visual Studio that will be installed. Required parameter. + + .PARAMETER Channel + The channel of Visual Studio that will be installed. Required parameter. + + .PARAMETER RequiredComponents + The list of required components. Required parameter. + + .PARAMETER ExtraArgs + The extra arguments to pass to the bootstrapper. Optional parameter. #> Param ( - [Parameter(Mandatory)] - [String] $BootstrapperUrl, - [String] $WorkLoads + [Parameter(Mandatory)] [String] $Version, + [Parameter(Mandatory)] [String] $Edition, + [Parameter(Mandatory)] [String] $Channel, + [Parameter(Mandatory)] [String[]] $RequiredComponents, + [String] $ExtraArgs = "" ) + $bootstrapperUrl = "https://aka.ms/vs/${Version}/${Channel}/vs_${Edition}.exe" + $channelUri = "https://aka.ms/vs/${Version}/${Channel}/channel" + $channelId = "VisualStudio.${Version}.Release" + $productId = "Microsoft.VisualStudio.Product.${Edition}" + Write-Host "Downloading Bootstrapper ..." $BootstrapperName = [IO.Path]::GetFileName($BootstrapperUrl) $bootstrapperFilePath = Start-DownloadWithRetry -Url $BootstrapperUrl -Name $BootstrapperName - try - { + try { Write-Host "Enable short name support on Windows needed for Xamarin Android AOT, defaults appear to have been changed in Azure VMs" $shortNameEnableProcess = Start-Process -FilePath fsutil.exe -ArgumentList ('8dot3name', 'set', '0') -Wait -PassThru $shortNameEnableExitCode = $shortNameEnableProcess.ExitCode - if ($shortNameEnableExitCode -ne 0) - { + if ($shortNameEnableExitCode -ne 0) { Write-Host "Enabling short name support on Windows failed. This needs to be enabled prior to VS 2017 install for Xamarin Andriod AOT to work." exit $shortNameEnableExitCode } + $responseData = @{ + "channelUri" = $channelUri + "channelId" = $channelId + "productId" = $productId + "arch" = "x64" + "add" = $RequiredComponents | ForEach-Object { "$_;includeRecommended" } + } + + # Create json file with response data + $responseDataPath = "$env:TEMP\vs_install_response.json" + $responseData | ConvertTo-Json | Out-File -FilePath $responseDataPath + Write-Host "Starting Install ..." - $bootstrapperArgumentList = ('/c', $bootstrapperFilePath, $WorkLoads, '--quiet', '--norestart', '--wait', '--nocache' ) + $bootstrapperArgumentList = ('/c', $bootstrapperFilePath, '--in', $responseDataPath, $ExtraArgs, '--quiet', '--norestart', '--wait', '--nocache' ) + Write-Host "Bootstrapper arguments: $bootstrapperArgumentList" $process = Start-Process -FilePath cmd.exe -ArgumentList $bootstrapperArgumentList -Wait -PassThru $exitCode = $process.ExitCode - if ($exitCode -eq 0 -or $exitCode -eq 3010) - { + if ($exitCode -eq 0 -or $exitCode -eq 3010) { Write-Host "Installation successful" return $exitCode - } - else - { - $setupErrorLogPath = "$env:TEMP\dd_setup_*_errors.log" - if (Test-Path -Path $setupErrorLogPath) - { - $logErrors = Get-Content -Path $setupErrorLogPath -Raw - Write-Host "$logErrors" + } else { + Write-Host "Non zero exit code returned by the installation process : $exitCode" + + # Try to download tool to collect logs + $collectExeUrl = "https://aka.ms/vscollect.exe" + $collectExeName = [IO.Path]::GetFileName($collectExeUrl) + $collectExePath = Start-DownloadWithRetry -Url $collectExeUrl -Name $collectExeName + + # Collect installation logs using the collect.exe tool and check if it is successful + & "$collectExePath" + if ($LastExitCode -ne 0) { + Write-Host "Failed to collect logs using collect.exe tool. Exit code : $LastExitCode" + exit $exitCode } - Write-Host "Non zero exit code returned by the installation process : $exitCode" + # Expand the zip file + Expand-Archive -Path "$env:TEMP\vslogs.zip" -DestinationPath "$env:TEMP\vslogs" + + # Print logs + $vsLogsPath = "$env:TEMP\vslogs" + $vsLogs = Get-ChildItem -Path $vsLogsPath -Recurse | Where-Object { -not $_.PSIsContainer } | Select-Object -ExpandProperty FullName + foreach ($log in $vsLogs) { + Write-Host "============================" + Write-Host "== Log file : $log " + Write-Host "============================" + Get-Content -Path $log -ErrorAction Continue + } + exit $exitCode } } diff --git a/images/win/scripts/Installers/Install-VS.ps1 b/images/win/scripts/Installers/Install-VS.ps1 index 1273975f61ff..707080f0e1d4 100644 --- a/images/win/scripts/Installers/Install-VS.ps1 +++ b/images/win/scripts/Installers/Install-VS.ps1 @@ -4,21 +4,14 @@ ################################################################################ $toolset = Get-ToolsetContent -$requiredComponents = $toolset.visualStudio.workloads | ForEach-Object { "--add $_" } -$workLoads = @( - "--allWorkloads --includeRecommended" - $requiredComponents - "--remove Component.CPython3.x64" -) -$workLoadsArgument = [String]::Join(" ", $workLoads) - -$releaseInPath = $toolset.visualStudio.edition -$subVersion = $toolset.visualStudio.subversion -$channel = $toolset.visualStudio.channel -$bootstrapperUrl = "https://aka.ms/vs/${subVersion}/${channel}/vs_${releaseInPath}.exe" # Install VS -Install-VisualStudio -BootstrapperUrl $bootstrapperUrl -WorkLoads $workLoadsArgument +Install-VisualStudio ` + -Version $toolset.visualStudio.subversion ` + -Edition $toolset.visualStudio.edition ` + -Channel $toolset.visualStudio.channel ` + -RequiredComponents $toolset.visualStudio.workloads ` + -ExtraArgs "--allWorkloads --includeRecommended --remove Component.CPython3.x64" # Find the version of VS installed for this instance # Only supports a single instance diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index 4d344e3e6727..138bc09e8283 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -265,24 +265,24 @@ "Microsoft.VisualStudio.Component.VC.14.35.17.5.MFC", "Microsoft.VisualStudio.Component.VC.14.35.17.5.x86.x64.Spectre", "Microsoft.VisualStudio.Component.VC.14.35.17.5.x86.x64", - "Microsoft.VisualStudio.Component.VC.14.36.17.6.ARM.Spectre", - "Microsoft.VisualStudio.Component.VC.14.36.17.6.ARM", - "Microsoft.VisualStudio.Component.VC.14.36.17.6.ARM64.Spectre", - "Microsoft.VisualStudio.Component.VC.14.36.17.6.ARM64", - "Microsoft.VisualStudio.Component.VC.14.36.17.6.ATL.ARM.Spectre", - "Microsoft.VisualStudio.Component.VC.14.36.17.6.ATL.ARM", - "Microsoft.VisualStudio.Component.VC.14.36.17.6.ATL.ARM64.Spectre", - "Microsoft.VisualStudio.Component.VC.14.36.17.6.ATL.ARM64", - "Microsoft.VisualStudio.Component.VC.14.36.17.6.ATL.Spectre", - "Microsoft.VisualStudio.Component.VC.14.36.17.6.ATL", - "Microsoft.VisualStudio.Component.VC.14.36.17.6.MFC.ARM.Spectre", - "Microsoft.VisualStudio.Component.VC.14.36.17.6.MFC.ARM", - "Microsoft.VisualStudio.Component.VC.14.36.17.6.MFC.ARM64.Spectre", - "Microsoft.VisualStudio.Component.VC.14.36.17.6.MFC.ARM64", - "Microsoft.VisualStudio.Component.VC.14.36.17.6.MFC.Spectre", - "Microsoft.VisualStudio.Component.VC.14.36.17.6.MFC", - "Microsoft.VisualStudio.Component.VC.14.36.17.6.x86.x64.Spectre", - "Microsoft.VisualStudio.Component.VC.14.36.17.6.x86.x64", + "Microsoft.VisualStudio.Component.VC.14.37.17.7.ARM.Spectre", + "Microsoft.VisualStudio.Component.VC.14.37.17.7.ARM", + "Microsoft.VisualStudio.Component.VC.14.37.17.7.ARM64.Spectre", + "Microsoft.VisualStudio.Component.VC.14.37.17.7.ARM64", + "Microsoft.VisualStudio.Component.VC.14.37.17.7.ATL.ARM.Spectre", + "Microsoft.VisualStudio.Component.VC.14.37.17.7.ATL.ARM", + "Microsoft.VisualStudio.Component.VC.14.37.17.7.ATL.ARM64.Spectre", + "Microsoft.VisualStudio.Component.VC.14.37.17.7.ATL.ARM64", + "Microsoft.VisualStudio.Component.VC.14.37.17.7.ATL.Spectre", + "Microsoft.VisualStudio.Component.VC.14.37.17.7.ATL", + "Microsoft.VisualStudio.Component.VC.14.37.17.7.MFC.ARM.Spectre", + "Microsoft.VisualStudio.Component.VC.14.37.17.7.MFC.ARM", + "Microsoft.VisualStudio.Component.VC.14.37.17.7.MFC.ARM64.Spectre", + "Microsoft.VisualStudio.Component.VC.14.37.17.7.MFC.ARM64", + "Microsoft.VisualStudio.Component.VC.14.37.17.7.MFC.Spectre", + "Microsoft.VisualStudio.Component.VC.14.37.17.7.MFC", + "Microsoft.VisualStudio.Component.VC.14.37.17.7.x86.x64.Spectre", + "Microsoft.VisualStudio.Component.VC.14.37.17.7.x86.x64", "Microsoft.VisualStudio.Component.VC.ATLMFC", "Microsoft.VisualStudio.Component.VC.ATLMFC.Spectre", "Microsoft.VisualStudio.Component.Windows10SDK.19041", From 1a30e20713cfc03483b15cc0105259ed6ef9a8df Mon Sep 17 00:00:00 2001 From: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com> Date: Mon, 4 Sep 2023 10:50:30 +0200 Subject: [PATCH 2159/3485] [ubuntu] pin podmanm, add testcase for podman networking (#7763) Related: https://github.com/actions/runner-images/issues/7753 --- images/linux/scripts/installers/containers.sh | 10 +++++++++- images/linux/scripts/tests/Tools.Tests.ps1 | 6 ++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/images/linux/scripts/installers/containers.sh b/images/linux/scripts/installers/containers.sh index 418494a87a82..38a9d89ab591 100644 --- a/images/linux/scripts/installers/containers.sh +++ b/images/linux/scripts/installers/containers.sh @@ -6,7 +6,15 @@ source $HELPER_SCRIPTS/os.sh -install_packages=(podman buildah skopeo) +# +# pin podman due to https://github.com/actions/runner-images/issues/7753 +# https://bugs.launchpad.net/ubuntu/+source/libpod/+bug/2024394 +# +if isUbuntu20; then + install_packages=(podman buildah skopeo) +else + install_packages=(podman=3.4.4+ds1-1ubuntu1 buildah skopeo) +fi # Packages is available in the official Ubuntu upstream starting from Ubuntu 21 if isUbuntu20; then diff --git a/images/linux/scripts/tests/Tools.Tests.ps1 b/images/linux/scripts/tests/Tools.Tests.ps1 index 22f677daef6b..aa6cc8f47d46 100644 --- a/images/linux/scripts/tests/Tools.Tests.ps1 +++ b/images/linux/scripts/tests/Tools.Tests.ps1 @@ -341,6 +341,12 @@ Describe "Containers" { "$ContainerCommand -v" | Should -ReturnZeroExitCode } + + # https://github.com/actions/runner-images/issues/7753 + It "podman networking" -TestCases "podman CNI plugins" { + "podman network create -d bridge test-net && podman network ls" | Should -Not -MatchCommandOutput "Error" + } + } Describe "nvm" { From d500bc875866fbfdea67834c440317a2685dd8c4 Mon Sep 17 00:00:00 2001 From: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com> Date: Mon, 4 Sep 2023 14:02:01 +0200 Subject: [PATCH 2160/3485] [macos] macos 13: retire VS Mac (#8213) due to official retirement of Visual Studio for Mac, let us drop it from macos-13 --- images/macos/templates/macOS-13.anka.pkr.hcl | 1 - images/macos/templates/macOS-13.arm64.anka.pkr.hcl | 1 - images/macos/toolsets/toolset-13.json | 6 ------ 3 files changed, 8 deletions(-) diff --git a/images/macos/templates/macOS-13.anka.pkr.hcl b/images/macos/templates/macOS-13.anka.pkr.hcl index 94eee2065a6f..f9628ce05f22 100644 --- a/images/macos/templates/macOS-13.anka.pkr.hcl +++ b/images/macos/templates/macOS-13.anka.pkr.hcl @@ -204,7 +204,6 @@ build { "./provision/core/stack.sh", "./provision/core/cocoapods.sh", "./provision/core/android-toolsets.sh", - "./provision/core/vsmac.sh", "./provision/core/apache.sh", "./provision/core/vcpkg.sh", "./provision/core/safari.sh", diff --git a/images/macos/templates/macOS-13.arm64.anka.pkr.hcl b/images/macos/templates/macOS-13.arm64.anka.pkr.hcl index c95214dc64f4..7702e2e3421c 100644 --- a/images/macos/templates/macOS-13.arm64.anka.pkr.hcl +++ b/images/macos/templates/macOS-13.arm64.anka.pkr.hcl @@ -196,7 +196,6 @@ build { "./provision/core/rust.sh", "./provision/core/gcc.sh", "./provision/core/cocoapods.sh", - "./provision/core/vsmac.sh", "./provision/core/safari.sh", "./provision/core/bicep.sh", "./provision/core/codeql-bundle.sh" diff --git a/images/macos/toolsets/toolset-13.json b/images/macos/toolsets/toolset-13.json index 6d9e78493490..23f32f295075 100644 --- a/images/macos/toolsets/toolset-13.json +++ b/images/macos/toolsets/toolset-13.json @@ -18,12 +18,6 @@ ] } }, - "xamarin": { - "vsmac": { - "default": "2022", - "versions": [ "2022" ] - } - }, "java": { "default": "17", "versions": [ "8", "11", "17" ] From da4a5336a28e559ee6dac389858f793270261f27 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 4 Sep 2023 13:17:08 +0000 Subject: [PATCH 2161/3485] Updating readme file for macos-13 version 20230903.1 (#8223) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-13-Readme.md | 143 ++++++++++++++++---------------- 1 file changed, 71 insertions(+), 72 deletions(-) diff --git a/images/macos/macos-13-Readme.md b/images/macos/macos-13-Readme.md index a53375419a90..5335ddaa53d8 100644 --- a/images/macos/macos-13-Readme.md +++ b/images/macos/macos-13-Readme.md @@ -1,24 +1,24 @@ # macOS 13 -- OS Version: macOS 13.5 (22G74) +- OS Version: macOS 13.5.1 (22G90) - Kernel Version: Darwin 22.6.0 -- Image Version: 20230821.3 +- Image Version: 20230903.1 ## Installed Software ### Language and Runtime - .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.400 - Bash 3.2.57(1)-release -- Clang/LLVM 14.0.0 +- Clang/LLVM 14.0.3 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` - GCC 11 (Homebrew GCC 11.4.0) - available by `gcc-11` alias - GCC 12 (Homebrew GCC 12.3.0) - available by `gcc-12` alias - GNU Fortran 11 (Homebrew GCC 11.4.0) - available by `gfortran-11` alias - GNU Fortran 12 (Homebrew GCC 12.3.0) - available by `gfortran-12` alias -- Julia 1.9.2 -- Kotlin 1.9.0-release-358 +- Julia 1.9.3 +- Kotlin 1.9.10-release-459 - Perl 5.36.1 -- PHP 8.2.9 -- Python3 3.11.4 +- PHP 8.2.10 +- Python3 3.11.5 - R 4.3.1 - Ruby 3.0.6p216 @@ -26,29 +26,29 @@ - Bundler 2.4.19 - Carthage 0.39.0 - CocoaPods 1.12.1 -- Composer 2.5.8 -- Homebrew 4.1.5 +- Composer 2.6.2 +- Homebrew 4.1.7 - NPM 9.6.7 - Pip3 23.2.1 (python 3.11) - Pipx 1.2.0 - RubyGems 3.4.19 -- Vcpkg 2023 (build from commit c95000e1b) +- Vcpkg 2023 (build from commit 4a600e9fe) - Yarn 1.22.19 ### Project Management -- Apache Ant 1.10.13 +- Apache Ant 1.10.14 ### Utilities - 7-Zip 17.05 - aria2 1.36.0 - azcopy 10.20.1 - bazel 6.3.2 -- bazelisk 1.17.0 +- bazelisk 1.18.0 - bsdtar 3.5.3 - available by 'tar' alias - Curl 8.2.1 -- Git 2.41.0 +- Git 2.42.0 - Git LFS 3.4.0 -- GitHub CLI 2.32.1 +- GitHub CLI 2.33.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.21.4 - gpg (GnuPG) 2.4.3 @@ -61,20 +61,20 @@ - zstd 1.5.5 ### Tools -- AWS CLI 2.13.11 -- AWS SAM CLI 1.95.0 +- AWS CLI 2.13.15 +- AWS SAM CLI 1.96.0 - AWS Session Manager CLI 1.2.463.0 - Azure CLI 2.50.0 - Azure CLI (azure-devops) 0.26.0 - Bicep CLI 0.20.4 - Cabal 3.6.2.0 -- Cmake 3.27.3 -- CodeQL Action Bundles 2.14.1 2.14.2 +- Cmake 3.27.4 +- CodeQL Action Bundles 2.14.2 2.14.3 - Fastlane 2.214.0 - GHC 9.6.2 - GHCup 0.1.19.4 - Stack 2.9.3 -- SwiftFormat 0.52.2 +- SwiftFormat 0.52.3 - Xcode Command Line Tools 14.3.1.0.1.1683849156 ### Linters @@ -83,14 +83,14 @@ ### Browsers - Safari 16.6 (18615.3.12.11.2) - SafariDriver 16.6 (18615.3.12.11.2) -- Google Chrome 116.0.5845.96 +- Google Chrome 116.0.5845.140 - Google Chrome for Testing 116.0.5845.96 - ChromeDriver 116.0.5845.96 -- Microsoft Edge 115.0.1901.203 -- Microsoft Edge WebDriver 115.0.1901.203 -- Mozilla Firefox 116.0.3 +- Microsoft Edge 116.0.1938.69 +- Microsoft Edge WebDriver 116.0.1938.69 +- Mozilla Firefox 117.0 - geckodriver 0.33.0 -- Selenium server 4.10.0 +- Selenium server 4.12.0 #### Environment variables | Name | Value | @@ -100,11 +100,11 @@ | GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | ### Java -| Version | Environment Variable | -| ------------------ | -------------------- | -| 8.0.382+5 | JAVA_HOME_8_X64 | -| 11.0.20+8 | JAVA_HOME_11_X64 | -| 17.0.8+7 (default) | JAVA_HOME_17_X64 | +| Version | Environment Variable | +| -------------------- | -------------------- | +| 8.0.382+5 | JAVA_HOME_8_X64 | +| 11.0.20+101 | JAVA_HOME_11_X64 | +| 17.0.8+101 (default) | JAVA_HOME_17_X64 | ### Cached Tools @@ -113,10 +113,10 @@ - 3.1.4 #### Python -- 3.8.17 -- 3.9.17 -- 3.10.12 -- 3.11.4 +- 3.8.18 +- 3.9.18 +- 3.10.13 +- 3.11.5 #### PyPy - 2.7.18 [PyPy 7.3.12] @@ -135,18 +135,18 @@ - 1.21.0 ### Rust Tools -- Cargo 1.71.1 -- Rust 1.71.1 -- Rustdoc 1.71.1 +- Cargo 1.72.0 +- Rust 1.72.0 +- Rustdoc 1.72.0 - Rustup 1.26.0 #### Packages - Bindgen 0.66.1 -- Cargo-audit 0.17.6 +- Cargo-audit 0.18.1 - Cargo-outdated 0.13.1 -- Cbindgen 0.24.5 -- Clippy 0.1.71 -- Rustfmt 1.5.2-stable +- Cbindgen 0.25.0 +- Clippy 0.1.72 +- Rustfmt 1.6.0-stable ### PowerShell Tools - PowerShell 7.2.13 @@ -157,13 +157,12 @@ - PSScriptAnalyzer: 1.21.0 ### Xcode -| Version | Build | Path | -| -------------- | -------- | ------------------------------ | -| 15.0 (beta) | 15A5219j | /Applications/Xcode_15.0.app | -| 14.3.1 | 14E300c | /Applications/Xcode_14.3.1.app | -| 14.3 | 14E222b | /Applications/Xcode_14.3.app | -| 14.2 (default) | 14C18 | /Applications/Xcode_14.2.app | -| 14.1 | 14B47b | /Applications/Xcode_14.1.app | +| Version | Build | Path | +| ---------------- | -------- | ------------------------------ | +| 15.0 (beta) | 15A5229m | /Applications/Xcode_15.0.app | +| 14.3.1 (default) | 14E300c | /Applications/Xcode_14.3.1.app | +| 14.2 | 14C18 | /Applications/Xcode_14.2.app | +| 14.1 | 14B47b | /Applications/Xcode_14.1.app | #### Xcode Support Tools - xcpretty 0.3.0 @@ -174,57 +173,57 @@ | ------------------------------------------------------- | --------------------------------------------- | ------------- | | macOS 13.0 | macosx13.0 | 14.1 | | macOS 13.1 | macosx13.1 | 14.2 | -| macOS 13.3 | macosx13.3 | 14.3, 14.3.1 | +| macOS 13.3 | macosx13.3 | 14.3.1 | | macOS 14.0 | macosx14.0 | 15.0 | | iOS 16.1 | iphoneos16.1 | 14.1 | | iOS 16.2 | iphoneos16.2 | 14.2 | -| iOS 16.4 | iphoneos16.4 | 14.3, 14.3.1 | +| iOS 16.4 | iphoneos16.4 | 14.3.1 | | iOS 17.0 | iphoneos17.0 | 15.0 | | Simulator - iOS 16.1 | iphonesimulator16.1 | 14.1 | | Simulator - iOS 16.2 | iphonesimulator16.2 | 14.2 | -| Simulator - iOS 16.4 | iphonesimulator16.4 | 14.3, 14.3.1 | +| Simulator - iOS 16.4 | iphonesimulator16.4 | 14.3.1 | | Simulator - iOS 17.0 | iphonesimulator17.0 | 15.0 | | tvOS 16.1 | appletvos16.1 | 14.1, 14.2 | -| tvOS 16.4 | appletvos16.4 | 14.3, 14.3.1 | +| tvOS 16.4 | appletvos16.4 | 14.3.1 | | tvOS 17.0 | appletvos17.0 | 15.0 | | Simulator - tvOS 16.1 | appletvsimulator16.1 | 14.1, 14.2 | -| Simulator - tvOS 16.4 | appletvsimulator16.4 | 14.3, 14.3.1 | +| Simulator - tvOS 16.4 | appletvsimulator16.4 | 14.3.1 | | Simulator - tvOS 17.0 | appletvsimulator17.0 | 15.0 | | watchOS 9.1 | watchos9.1 | 14.1, 14.2 | -| watchOS 9.4 | watchos9.4 | 14.3, 14.3.1 | +| watchOS 9.4 | watchos9.4 | 14.3.1 | | watchOS 10.0 | watchos10.0 | 15.0 | | Simulator - watchOS 9.1 | watchsimulator9.1 | 14.1, 14.2 | -| Simulator - watchOS 9.4 | watchsimulator9.4 | 14.3, 14.3.1 | +| Simulator - watchOS 9.4 | watchsimulator9.4 | 14.3.1 | | Simulator - watchOS 10.0 | watchsimulator10.0 | 15.0 | -| Simulator - visionOS 1.0 | xrsimulator1.0 | 15.0 | | visionOS 1.0 | xros1.0 | 15.0 | -| Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3, 14.3.1 | -| Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3, 14.3.1 | -| Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3, 14.3.1 | +| Simulator - visionOS 1.0 | xrsimulator1.0 | 15.0 | +| Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | +| Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | +| Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | | DriverKit 22.1 | driverkit22.1 | 14.1 | | DriverKit 22.2 | driverkit22.2 | 14.2 | -| DriverKit 22.4 | driverkit22.4 | 14.3, 14.3.1 | +| DriverKit 22.4 | driverkit22.4 | 14.3.1 | | DriverKit 23.0 | driverkit23.0 | 15.0 | #### Installed Simulators -| OS | Xcode Version | Simulators | -| ------------ | -------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| iOS 16.1 | 14.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 16.2 | 14.2 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 16.4 | 14.3<br>14.3.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 17.0 | 14.1<br>14.2<br>14.3<br>14.3.1<br>15.0 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| tvOS 16.1 | 14.1<br>14.2<br>14.3<br>14.3.1<br>15.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 16.4 | 14.1<br>14.2<br>14.3<br>14.3.1<br>15.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 17.0 | 14.1<br>14.2<br>14.3<br>14.3.1<br>15.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| watchOS 9.1 | 14.1<br>14.2<br>14.3<br>14.3.1<br>15.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | -| watchOS 9.4 | 14.1<br>14.2<br>14.3<br>14.3.1<br>15.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | -| watchOS 10.0 | 14.1<br>14.2<br>14.3<br>14.3.1<br>15.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | +| OS | Xcode Version | Simulators | +| ------------ | ------------------------------ | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| iOS 16.1 | 14.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 16.2 | 14.2 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 16.4 | 14.3.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 17.0 | 14.1<br>14.2<br>14.3.1<br>15.0 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| tvOS 16.1 | 14.1<br>14.2<br>14.3.1<br>15.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 16.4 | 14.1<br>14.2<br>14.3.1<br>15.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 17.0 | 14.1<br>14.2<br>14.3.1<br>15.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| watchOS 9.1 | 14.1<br>14.2<br>14.3.1<br>15.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | +| watchOS 9.4 | 14.1<br>14.2<br>14.3.1<br>15.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | +| watchOS 10.0 | 14.1<br>14.2<br>14.3.1<br>15.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | ### Android | Package Name | Version | | -------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 8.0 | -| Android Emulator | 32.1.14 | +| Android Emulator | 32.1.15 | | Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | | Android SDK Platforms | android-34 (rev 2)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | | Android SDK Platform-Tools | 34.0.4 | From 48ee94f88297e53941010bb878eaa91eadaf92cd Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 4 Sep 2023 15:29:49 +0000 Subject: [PATCH 2162/3485] Updating readme file for macOS-12 version 20230825.1 (#8188) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-12-Readme.md | 50 ++++++++++++++++----------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/images/macos/macos-12-Readme.md b/images/macos/macos-12-Readme.md index 8a8005a69b17..904d06c7c1a2 100644 --- a/images/macos/macos-12-Readme.md +++ b/images/macos/macos-12-Readme.md @@ -1,7 +1,7 @@ # macOS 12 - OS Version: macOS 12.6.7 (21G651) - Kernel Version: Darwin 21.6.0 -- Image Version: 20230818.2 +- Image Version: 20230825.1 ## Installed Software @@ -14,13 +14,13 @@ - GCC 12 (Homebrew GCC 12.3.0) - available by `gcc-12` alias - GNU Fortran 11 (Homebrew GCC 11.4.0) - available by `gfortran-11` alias - GNU Fortran 12 (Homebrew GCC 12.3.0) - available by `gfortran-12` alias -- Julia 1.9.2 -- Kotlin 1.9.0-release-358 +- Julia 1.9.3 +- Kotlin 1.9.10-release-459 - Go 1.20.7 - Mono 6.12.0.188 - MSBuild 16.10.1.51301 (Mono 6.12.0.188) - Node.js 18.17.1 -- NVM 0.39.4 +- NVM 0.39.5 - NVM - Cached node versions: 14.21.3, 16.20.2, 18.17.1 - Perl 5.36.1 - PHP 8.2.9 @@ -34,7 +34,7 @@ - Carthage 0.39.0 - CocoaPods 1.12.1 - Composer 2.5.8 -- Homebrew 4.1.5 +- Homebrew 4.1.6 - Miniconda 23.5.2 - NPM 9.6.7 - NuGet 6.3.1.1 @@ -42,7 +42,7 @@ - Pip3 23.2.1 (python 3.11) - Pipx 1.2.0 - RubyGems 3.4.19 -- Vcpkg 2023 (build from commit c95000e1b) +- Vcpkg 2023 (build from commit 436a061a5) - Yarn 1.22.19 #### Environment variables @@ -52,22 +52,22 @@ | VCPKG_INSTALLATION_ROOT | /usr/local/share/vcpkg | ### Project Management -- Apache Ant 1.10.13 +- Apache Ant 1.10.14 - Apache Maven 3.9.4 - Gradle 8.3 -- Sbt 1.9.3 +- Sbt 1.9.4 ### Utilities - 7-Zip 17.05 - aria2 1.36.0 - azcopy 10.20.1 - bazel 6.3.2 -- bazelisk 1.17.0 +- bazelisk 1.18.0 - bsdtar 3.5.1 - available by 'tar' alias - Curl 8.2.1 -- Git 2.41.0 +- Git 2.42.0 - Git LFS 3.4.0 -- GitHub CLI 2.32.1 +- GitHub CLI 2.33.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.21.4 - gpg (GnuPG) 2.4.3 @@ -91,14 +91,14 @@ ### Tools - App Center CLI 2.14.0 -- AWS CLI 2.13.11 +- AWS CLI 2.13.13 - AWS SAM CLI 1.95.0 - AWS Session Manager CLI 1.2.463.0 - Azure CLI 2.50.0 - Azure CLI (azure-devops) 0.26.0 - Bicep CLI 0.20.4 - Cabal 3.6.2.0 -- Cmake 3.27.3 +- Cmake 3.27.4 - CodeQL Action Bundles 2.14.1 2.14.2 - Colima 0.5.5 - Fastlane 2.214.0 @@ -106,7 +106,7 @@ - GHCup 0.1.19.4 - Jazzy 0.14.3 - Stack 2.9.3 -- SwiftFormat 0.52.1 +- SwiftFormat 0.52.2 - Swig 4.1.1 - Xcode Command Line Tools 14.2.0.0.1.1668646533 @@ -117,11 +117,11 @@ ### Browsers - Safari 16.6 (17615.3.12.11.3) - SafariDriver 16.6 (17615.3.12.11.3) -- Google Chrome 116.0.5845.96 +- Google Chrome 116.0.5845.110 - Google Chrome for Testing 116.0.5845.96 - ChromeDriver 116.0.5845.96 -- Microsoft Edge 115.0.1901.203 -- Microsoft Edge WebDriver 115.0.1901.203 +- Microsoft Edge 116.0.1938.54 +- Microsoft Edge WebDriver 116.0.1938.62 - Mozilla Firefox 116.0.3 - geckodriver 0.33.0 - Selenium server 4.10.0 @@ -173,18 +173,18 @@ - 1.21.0 ### Rust Tools -- Cargo 1.71.1 -- Rust 1.71.1 -- Rustdoc 1.71.1 +- Cargo 1.72.0 +- Rust 1.72.0 +- Rustdoc 1.72.0 - Rustup 1.26.0 #### Packages - Bindgen 0.66.1 - Cargo-audit 0.17.6 - Cargo-outdated 0.13.1 -- Cbindgen 0.24.5 -- Clippy 0.1.71 -- Rustfmt 1.5.2-stable +- Cbindgen 0.25.0 +- Clippy 0.1.72 +- Rustfmt 1.6.0-stable ### PowerShell Tools - PowerShell 7.2.13 @@ -351,12 +351,12 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" - libXext 1.3.5 - libXft 2.3.8 - Tcl/Tk 8.6.13_4 -- Zlib 1.2.13 +- Zlib 1.3 #### Environment variables | Name | Value | | ----------------- | ----------------------------------------------------------------------------------------- | -| PARALLELS_DMG_URL | https://download.parallels.com/desktop/v18/18.3.2-53621/ParallelsDesktop-18.3.2-53621.dmg | +| PARALLELS_DMG_URL | https://download.parallels.com/desktop/v19/19.0.0-54570/ParallelsDesktop-19.0.0-54570.dmg | ##### Notes ``` From 0f35a386c1af2df258fe087a40a3287d6c418760 Mon Sep 17 00:00:00 2001 From: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com> Date: Tue, 5 Sep 2023 10:19:03 +0200 Subject: [PATCH 2163/3485] [macos] disable VS Tests on macos-13 (#8227) --- images/macos/tests/Common.Tests.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/macos/tests/Common.Tests.ps1 b/images/macos/tests/Common.Tests.ps1 index a58a05613176..1ac30ee413c9 100644 --- a/images/macos/tests/Common.Tests.ps1 +++ b/images/macos/tests/Common.Tests.ps1 @@ -78,7 +78,7 @@ Describe "CocoaPods" { } } -Describe "VSMac" { +Describe "VSMac" -Skip:($os.IsVentura -or $os.IsVenturaArm64) { $vsMacVersions = Get-ToolsetValue "xamarin.vsmac.versions" $defaultVSMacVersion = Get-ToolsetValue "xamarin.vsmac.default" From bd1f57a2d3bfa1a3948861a69802d6ff4bd3fb85 Mon Sep 17 00:00:00 2001 From: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com> Date: Tue, 5 Sep 2023 14:34:09 +0200 Subject: [PATCH 2164/3485] [windows] introduce user warmup (#8225) some User warmup may be transferred to C:\Users\Default to speedup provisioning. Especially, this is important for large runners --- images/win/scripts/Installers/Warmup-User.ps1 | 25 +++++++++++++++++++ images/win/windows2019.json | 3 ++- images/win/windows2022.json | 3 ++- 3 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 images/win/scripts/Installers/Warmup-User.ps1 diff --git a/images/win/scripts/Installers/Warmup-User.ps1 b/images/win/scripts/Installers/Warmup-User.ps1 new file mode 100644 index 000000000000..19dc41265a1e --- /dev/null +++ b/images/win/scripts/Installers/Warmup-User.ps1 @@ -0,0 +1,25 @@ +################################################################################ +## File: Warmup-User.ps1 +## Desc: Performs user part of warm up and moves data to C:\Users\Default +################################################################################ + +# +# more: https://github.com/actions/runner-images-internal/issues/5320 +# https://github.com/actions/runner-images/issues/5301#issuecomment-1648292990 +# + +Write-Host "Warmup 'devenv.exe /updateconfiguration'" + +$vsInstallRoot = (Get-VisualStudioInstance).InstallationPath +$devEnvPath = "$vsInstallRoot\Common7\IDE\devenv.exe" + +cmd.exe /c "`"$devEnvPath`" /updateconfiguration" + +Copy-Item ${env:USERPROFILE}\AppData\Local\Microsoft\VisualStudio -Destination c:\users\default\AppData\Local\Microsoft\VisualStudio -Recurse + +reg.exe load HKLM\DEFAULT c:\users\default\ntuser.dat +reg.exe copy HKCU\Software\Microsoft\VisualStudio HKLM\DEFAULT\Software\Microsoft\VisualStudio /s +reg.exe unload HKLM\DEFAULT + + +Write-Host "Warmup-User.ps1 - completed" \ No newline at end of file diff --git a/images/win/windows2019.json b/images/win/windows2019.json index 161472f9362c..4eb1ae07b9cd 100644 --- a/images/win/windows2019.json +++ b/images/win/windows2019.json @@ -339,7 +339,8 @@ "skip_clean": true, "scripts": [ "{{ template_dir }}/scripts/Installers/Run-NGen.ps1", - "{{ template_dir }}/scripts/Installers/Finalize-VM.ps1" + "{{ template_dir }}/scripts/Installers/Finalize-VM.ps1", + "{{ template_dir }}/scripts/Installers/Warmup-User.ps1" ], "environment_vars": [ "INSTALL_USER={{user `install_user`}}" diff --git a/images/win/windows2022.json b/images/win/windows2022.json index 8d79abf20b2d..e4f0e32004ac 100644 --- a/images/win/windows2022.json +++ b/images/win/windows2022.json @@ -326,7 +326,8 @@ "skip_clean": true, "scripts": [ "{{ template_dir }}/scripts/Installers/Run-NGen.ps1", - "{{ template_dir }}/scripts/Installers/Finalize-VM.ps1" + "{{ template_dir }}/scripts/Installers/Finalize-VM.ps1", + "{{ template_dir }}/scripts/Installers/Warmup-User.ps1" ], "environment_vars": [ "INSTALL_USER={{user `install_user`}}" From 63a3a7646f9b389ec987332b04c0380b9e499827 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Wed, 6 Sep 2023 13:45:11 +0200 Subject: [PATCH 2165/3485] [macOS 13] cleanup yarn cache (#8240) --- images/macos/provision/configuration/finalize-vm.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/images/macos/provision/configuration/finalize-vm.sh b/images/macos/provision/configuration/finalize-vm.sh index 55c3f4924f7c..a49ca9192e0e 100644 --- a/images/macos/provision/configuration/finalize-vm.sh +++ b/images/macos/provision/configuration/finalize-vm.sh @@ -28,9 +28,8 @@ rm -rf ~/.fastlane npm cache clean --force # Clean yarn cache -if ! is_Ventura; then - yarn cache clean -fi +yarn cache clean + # Clean up temporary directories sudo rm -rf ~/utils /tmp/* From b59fd09847f6651d6a65683637f8eac2a2337569 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Wed, 6 Sep 2023 14:52:52 +0200 Subject: [PATCH 2166/3485] README: update environment version screenshot (#8243) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9452c1252120..d9b4ddf5a7e9 100644 --- a/README.md +++ b/README.md @@ -173,7 +173,7 @@ The availability of images for GitHub Actions and Azure DevOps is the same. Howe <summary><b><i>What image version is used in my build?</b></i></summary> Usually, image deployment takes 2-3 days, and documentation in the `main` branch is only updated when deployment is finished. To find out which image version and what software versions are used in a specific build, see `Set up job` (GitHub Actions) or `Initialize job` (Azure DevOps) step log. -<img width="1440" alt="actions-runner-image" src="https://user-images.githubusercontent.com/56982181/169595536-91a8a79b-d5e0-47d1-a736-510cff6cfb83.png"> +<img width="1440" alt="actions-runner-image" src="https://github.com/actions/runner-images/assets/88318005/922a8bf5-3e4d-4265-9527-b3b51e6bf9c8"> </details> <details> From 452c8ec89fb0bbb005ee82fd81c7945947c37baf Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Thu, 7 Sep 2023 12:51:50 +0200 Subject: [PATCH 2167/3485] Fix CI for runners with powershell 7 (#8245) --- images.CI/linux-and-win/convert-to-vhd.ps1 | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/images.CI/linux-and-win/convert-to-vhd.ps1 b/images.CI/linux-and-win/convert-to-vhd.ps1 index aff2806aff90..41ff16e1fba7 100644 --- a/images.CI/linux-and-win/convert-to-vhd.ps1 +++ b/images.CI/linux-and-win/convert-to-vhd.ps1 @@ -95,8 +95,12 @@ $targetKey = az storage account keys list ` Write-Host ("Copying VHD blob from '{0}' to 'https://{1}.blob.core.windows.net/{2}/{3}'..." ` -f $sourceDiskUri.Split('?')[0], $StorageAccountName, $StorageAccountContainerName, $VhdName) +if ($env:OS) { + $sourceDiskUri = """{0}""" -f $sourceDiskUri +} + az storage blob copy start ` - --source-uri """$sourceDiskUri""" ` + --source-uri $sourceDiskUri ` --destination-blob $VhdName ` --destination-container $StorageAccountContainerName ` --account-name $StorageAccountName ` From 76ab7d5c961da48630f9b056bb22040b4e56742b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 7 Sep 2023 11:26:24 +0000 Subject: [PATCH 2168/3485] Updating readme file for win19 version 20230903.1.0 (#8233) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2019-Readme.md | 82 ++++++++++++++++---------------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index 1c783fbf9aec..e18363d24806 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -1,6 +1,6 @@ # Windows Server 2019 - OS Version: 10.0.17763 Build 4737 -- Image Version: 20230820.1.0 +- Image Version: 20230903.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -10,26 +10,26 @@ ### Language and Runtime - Bash 5.2.15(1)-release - Go 1.20.7 -- Julia 1.9.2 -- Kotlin 1.9.0 -- LLVM 15.0.7 +- Julia 1.9.3 +- Kotlin 1.9.10 +- LLVM 16.0.6 - Node 18.17.1 - Perl 5.32.1 -- PHP 8.2.9 +- PHP 8.2.10 - Python 3.7.9 - Ruby 2.5.9p229 ### Package Management - Chocolatey 2.2.2 -- Composer 2.5.8 -- Helm 3.12.2 +- Composer 2.6.2 +- Helm 3.12.3 - Miniconda 23.5.2 (pre-installed on the image but not added to PATH) - NPM 9.6.7 - NuGet 6.7.0.127 - pip 23.2.1 (python 3.7) - Pipx 1.2.0 - RubyGems 2.7.6.3 -- Vcpkg (build from commit c95000e1b) +- Vcpkg (build from commit 4a600e9fe) - Yarn 1.22.19 #### Environment variables @@ -39,29 +39,29 @@ | CONDA | C:\Miniconda | ### Project Management -- Ant 1.10.13 -- Gradle 8.1 +- Ant 1.10.14 +- Gradle 8.3 - Maven 3.8.7 -- sbt 1.9.2 +- sbt 1.9.4 ### Tools - 7zip 23.01 - aria2 1.36.0 - azcopy 10.20.1 - Bazel 6.3.2 -- Bazelisk 1.13.2 +- Bazelisk 1.18.0 - Bicep 0.20.4 - Cabal 3.10.1.0 -- CMake 3.27.3 -- CodeQL Action Bundles 2.14.1 2.14.2 +- CMake 3.27.4 +- CodeQL Action Bundles 2.14.2 2.14.3 - Docker 24.0.5 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.20.3 +- Docker Compose v2 2.21.0 - Docker-wincred 0.8.0 - ghc 9.6.2 -- Git 2.41.0.windows.3 -- Git LFS 3.3.0 -- Google Cloud SDK 443.0.0 +- Git 2.42.0.windows.2 +- Git LFS 3.4.0 +- Google Cloud SDK 444.0.0 - ImageMagick 7.1.1-15 - InnoSetup 6.2.2 - jq 1.6 @@ -74,7 +74,7 @@ - OpenSSL 1.1.1v - Packer 1.9.2 - Parcel 2.9.3 -- Pulumi 3.78.1 +- Pulumi 3.80.0 - R 4.3.1 - Service Fabric SDK 9.1.1436.9590 - Stack 2.11.1 @@ -87,39 +87,39 @@ - zstd 1.5.5 ### CLI Tools -- Alibaba Cloud CLI 3.0.177 -- AWS CLI 2.13.9 -- AWS SAM CLI 1.95.0 +- Alibaba Cloud CLI 3.0.180 +- AWS CLI 2.13.15 +- AWS SAM CLI 1.96.0 - AWS Session Manager CLI 1.2.497.0 - Azure CLI 2.51.0 - Azure DevOps CLI extension 0.26.0 - Cloud Foundry CLI 6.53.0 -- GitHub CLI 2.32.1 +- GitHub CLI 2.33.0 - Hub CLI 2.14.2 ### Rust Tools -- Cargo 1.71.1 -- Rust 1.71.1 -- Rustdoc 1.71.1 +- Cargo 1.72.0 +- Rust 1.72.0 +- Rustdoc 1.72.0 - Rustup 1.26.0 #### Packages - bindgen 0.66.1 -- cargo-audit 0.17.6 +- cargo-audit 0.18.1 - cargo-outdated 0.13.1 -- cbindgen 0.24.5 -- Clippy 0.1.71 -- Rustfmt 1.5.2 +- cbindgen 0.25.0 +- Clippy 0.1.72 +- Rustfmt 1.6.0 ### Browsers and Drivers -- Google Chrome 116.0.5845.96 +- Google Chrome 116.0.5845.141 - Chrome Driver 116.0.5845.96 -- Microsoft Edge 115.0.1901.203 -- Microsoft Edge Driver 115.0.1901.203 -- Mozilla Firefox 116.0.3 +- Microsoft Edge 116.0.1938.69 +- Microsoft Edge Driver 116.0.1938.69 +- Mozilla Firefox 117.0 - Gecko Driver 0.33.0 - IE Driver 4.11.0.0 -- Selenium server 4.11.0 +- Selenium server 4.12.0 #### Environment variables | Name | Value | @@ -133,8 +133,8 @@ | Version | Environment Variable | | ------------------- | -------------------- | | 8.0.382+5 (default) | JAVA_HOME_8_X64 | -| 11.0.20+8 | JAVA_HOME_11_X64 | -| 17.0.8+7 | JAVA_HOME_17_X64 | +| 11.0.20+101 | JAVA_HOME_11_X64 | +| 17.0.8+101 | JAVA_HOME_17_X64 | ### Shells | Name | Target | @@ -175,7 +175,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 3.8.10 - 3.9.13 - 3.10.11 -- 3.11.4 +- 3.11.5 #### PyPy - 2.7.18 [PyPy 7.3.12] @@ -210,7 +210,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### MongoDB | Version | ServiceName | ServiceStatus | ServiceStartType | | -------- | ----------- | ------------- | ---------------- | -| 5.0.19.0 | MongoDB | Stopped | Disabled | +| 5.0.20.0 | MongoDB | Stopped | Disabled | ### Database tools - Azure CosmosDb Emulator 2.14.12.0 @@ -508,10 +508,10 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Az (Cached): 1.0.0.zip, 1.6.0.zip, 2.3.2.zip, 2.6.0.zip, 3.1.0.zip, 3.5.0.zip, 3.8.0.zip, 4.3.0.zip, 4.4.0.zip, 4.7.0.zip, 5.5.0.zip, 5.9.0.zip, 6.6.0.zip, 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.397 +- AWSPowershell: 4.1.407 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 -- Microsoft.Graph: 2.3.0 +- Microsoft.Graph: 2.4.0 - Pester: 3.4.0, 5.5.0 - PowerShellGet: 1.0.0.1, 2.2.5 - PSScriptAnalyzer: 1.21.0 From 4a0c3808de19abe49a8cbdbfe8254ae92ed026e5 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 7 Sep 2023 11:28:26 +0000 Subject: [PATCH 2169/3485] Updating readme file for win22 version 20230903.2.0 (#8232) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2022-Readme.md | 124 +++++++++++++++---------------- 1 file changed, 62 insertions(+), 62 deletions(-) diff --git a/images/win/Windows2022-Readme.md b/images/win/Windows2022-Readme.md index 68e3f1db9222..31fabdbb3f00 100644 --- a/images/win/Windows2022-Readme.md +++ b/images/win/Windows2022-Readme.md @@ -1,6 +1,6 @@ # Windows Server 2022 - OS Version: 10.0.20348 Build 1906 -- Image Version: 20230820.1.0 +- Image Version: 20230903.2.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -10,26 +10,26 @@ ### Language and Runtime - Bash 5.2.15(1)-release - Go 1.20.7 -- Julia 1.9.2 -- Kotlin 1.9.0 -- LLVM 15.0.7 +- Julia 1.9.3 +- Kotlin 1.9.10 +- LLVM 16.0.6 - Node 18.17.1 - Perl 5.32.1 -- PHP 8.2.9 +- PHP 8.2.10 - Python 3.9.13 - Ruby 3.0.6p216 ### Package Management - Chocolatey 2.2.2 -- Composer 2.5.8 -- Helm 3.12.2 +- Composer 2.6.2 +- Helm 3.12.3 - Miniconda 23.5.2 (pre-installed on the image but not added to PATH) - NPM 9.6.7 - NuGet 6.7.0.127 - pip 23.2.1 (python 3.9) - Pipx 1.2.0 - RubyGems 3.2.33 -- Vcpkg (build from commit c95000e1b) +- Vcpkg (build from commit 4a600e9fe) - Yarn 1.22.19 #### Environment variables @@ -39,28 +39,28 @@ | CONDA | C:\Miniconda | ### Project Management -- Ant 1.10.13 -- Gradle 8.1 +- Ant 1.10.14 +- Gradle 8.3 - Maven 3.8.7 -- sbt 1.9.2 +- sbt 1.9.4 ### Tools - 7zip 23.01 - aria2 1.36.0 - azcopy 10.20.1 - Bazel 6.3.2 -- Bazelisk 1.13.2 +- Bazelisk 1.18.0 - Bicep 0.20.4 - Cabal 3.10.1.0 -- CMake 3.27.3 -- CodeQL Action Bundles 2.14.1 2.14.2 +- CMake 3.27.4 +- CodeQL Action Bundles 2.14.2 2.14.3 - Docker 24.0.5 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.20.3 +- Docker Compose v2 2.21.0 - Docker-wincred 0.8.0 - ghc 9.6.2 -- Git 2.41.0.windows.3 -- Git LFS 3.3.0 +- Git 2.42.0.windows.2 +- Git LFS 3.4.0 - ImageMagick 7.1.1-15 - InnoSetup 6.2.2 - jq 1.6 @@ -72,7 +72,7 @@ - NSIS 3.08 - OpenSSL 1.1.1v - Packer 1.9.2 -- Pulumi 3.78.1 +- Pulumi 3.80.0 - R 4.3.1 - Service Fabric SDK 9.1.1436.9590 - Stack 2.11.1 @@ -85,38 +85,38 @@ - zstd 1.5.5 ### CLI Tools -- Alibaba Cloud CLI 3.0.177 -- AWS CLI 2.13.9 -- AWS SAM CLI 1.95.0 +- Alibaba Cloud CLI 3.0.180 +- AWS CLI 2.13.15 +- AWS SAM CLI 1.96.0 - AWS Session Manager CLI 1.2.497.0 - Azure CLI 2.51.0 - Azure DevOps CLI extension 0.26.0 -- GitHub CLI 2.32.1 +- GitHub CLI 2.33.0 - Hub CLI 2.14.2 ### Rust Tools -- Cargo 1.71.1 -- Rust 1.71.1 -- Rustdoc 1.71.1 +- Cargo 1.72.0 +- Rust 1.72.0 +- Rustdoc 1.72.0 - Rustup 1.26.0 #### Packages - bindgen 0.66.1 -- cargo-audit 0.17.6 +- cargo-audit 0.18.1 - cargo-outdated 0.13.1 -- cbindgen 0.24.5 -- Clippy 0.1.71 -- Rustfmt 1.5.2 +- cbindgen 0.25.0 +- Clippy 0.1.72 +- Rustfmt 1.6.0 ### Browsers and Drivers -- Google Chrome 116.0.5845.96 +- Google Chrome 116.0.5845.141 - Chrome Driver 116.0.5845.96 -- Microsoft Edge 115.0.1901.203 -- Microsoft Edge Driver 115.0.1901.203 -- Mozilla Firefox 116.0.3 +- Microsoft Edge 116.0.1938.69 +- Microsoft Edge Driver 116.0.1938.69 +- Mozilla Firefox 117.0 - Gecko Driver 0.33.0 - IE Driver 4.11.0.0 -- Selenium server 4.11.0 +- Selenium server 4.12.0 #### Environment variables | Name | Value | @@ -130,8 +130,8 @@ | Version | Environment Variable | | ------------------- | -------------------- | | 8.0.382+5 (default) | JAVA_HOME_8_X64 | -| 11.0.20+8 | JAVA_HOME_11_X64 | -| 17.0.8+7 | JAVA_HOME_17_X64 | +| 11.0.20+101 | JAVA_HOME_11_X64 | +| 17.0.8+101 | JAVA_HOME_17_X64 | ### Shells | Name | Target | @@ -168,7 +168,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 3.8.10 - 3.9.13 - 3.10.11 -- 3.11.4 +- 3.11.5 #### PyPy - 2.7.18 [PyPy 7.3.12] @@ -199,7 +199,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### MongoDB | Version | ServiceName | ServiceStatus | ServiceStartType | | -------- | ----------- | ------------- | ---------------- | -| 5.0.19.0 | MongoDB | Stopped | Disabled | +| 5.0.20.0 | MongoDB | Stopped | Disabled | ### Database tools - Azure CosmosDb Emulator 2.14.12.0 @@ -217,7 +217,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Visual Studio Enterprise 2022 | Name | Version | Path | | ----------------------------- | -------------- | -------------------------------------------------------- | -| Visual Studio Enterprise 2022 | 17.7.34009.444 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | +| Visual Studio Enterprise 2022 | 17.7.34024.191 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | #### Workloads, components and extensions | Package | Version | @@ -251,8 +251,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Component.WixToolset.VisualStudioExtension.Schemas3 | 1.0.0.22 | | Component.Xamarin | 17.7.33905.399 | | Component.Xamarin.RemotedSimulator | 17.7.33905.399 | -| ios | 16.4.7089.0 | -| maccatalyst | 16.4.7089.0 | +| ios | 16.4.7098.0 | +| maccatalyst | 16.4.7098.0 | | maui.android | 7.0.92.0 | | maui.blazor | 7.0.92.0 | | maui.core | 7.0.92.0 | @@ -330,7 +330,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Component.Graphics.Tools | 17.7.33905.399 | | Microsoft.VisualStudio.Component.HLSL | 17.7.33905.399 | | Microsoft.VisualStudio.Component.IISExpress | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.IntelliCode | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.IntelliCode | 17.7.34024.25 | | Microsoft.VisualStudio.Component.IntelliTrace.FrontEnd | 17.7.33905.399 | | Microsoft.VisualStudio.Component.JavaScript.Diagnostics | 17.7.33905.399 | | Microsoft.VisualStudio.Component.JavaScript.TypeScript | 17.7.33905.399 | @@ -398,24 +398,24 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Component.VC.14.35.17.5.MFC.Spectre | 17.7.33905.399 | | Microsoft.VisualStudio.Component.VC.14.35.17.5.x86.x64 | 17.7.33905.399 | | Microsoft.VisualStudio.Component.VC.14.35.17.5.x86.x64.Spectre | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.14.36.17.6.ARM | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.14.36.17.6.ARM.Spectre | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.14.36.17.6.ARM64 | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.14.36.17.6.ARM64.Spectre | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.14.36.17.6.ATL | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.14.36.17.6.ATL.ARM | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.14.36.17.6.ATL.ARM.Spectre | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.14.36.17.6.ATL.ARM64 | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.14.36.17.6.ATL.ARM64.Spectre | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.14.36.17.6.ATL.Spectre | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.14.36.17.6.MFC | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.14.36.17.6.MFC.ARM | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.14.36.17.6.MFC.ARM.Spectre | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.14.36.17.6.MFC.ARM64 | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.14.36.17.6.MFC.ARM64.Spectre | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.14.36.17.6.MFC.Spectre | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.14.36.17.6.x86.x64 | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.14.36.17.6.x86.x64.Spectre | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.14.37.17.7.ARM | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.14.37.17.7.ARM.Spectre | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.14.37.17.7.ARM64 | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.14.37.17.7.ARM64.Spectre | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.14.37.17.7.ATL | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.14.37.17.7.ATL.ARM | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.14.37.17.7.ATL.ARM.Spectre | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.14.37.17.7.ATL.ARM64 | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.14.37.17.7.ATL.ARM64.Spectre | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.14.37.17.7.ATL.Spectre | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.14.37.17.7.MFC | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.14.37.17.7.MFC.ARM | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.14.37.17.7.MFC.ARM.Spectre | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.14.37.17.7.MFC.ARM64 | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.14.37.17.7.MFC.ARM64.Spectre | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.14.37.17.7.MFC.Spectre | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.14.37.17.7.x86.x64 | 17.7.33905.399 | +| Microsoft.VisualStudio.Component.VC.14.37.17.7.x86.x64.Spectre | 17.7.33905.399 | | Microsoft.VisualStudio.Component.VC.ASAN | 17.7.33905.399 | | Microsoft.VisualStudio.Component.VC.ATL | 17.7.33905.399 | | Microsoft.VisualStudio.Component.VC.ATL.ARM | 17.7.33905.399 | @@ -565,10 +565,10 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Az (Cached): 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.397 +- AWSPowershell: 4.1.407 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 -- Microsoft.Graph: 2.3.0 +- Microsoft.Graph: 2.4.0 - Pester: 3.4.0, 5.5.0 - PowerShellGet: 1.0.0.1, 2.2.5 - PSScriptAnalyzer: 1.21.0 From 75c3a75a803901854368855f72f414ca11bce0db Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 7 Sep 2023 11:34:19 +0000 Subject: [PATCH 2170/3485] Updating readme file for ubuntu22 version 20230903.1.0 (#8231) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2204-Readme.md | 95 ++++++++++++++++--------------- 1 file changed, 48 insertions(+), 47 deletions(-) diff --git a/images/linux/Ubuntu2204-Readme.md b/images/linux/Ubuntu2204-Readme.md index 4526e76ffed0..0ca80612d6d4 100644 --- a/images/linux/Ubuntu2204-Readme.md +++ b/images/linux/Ubuntu2204-Readme.md @@ -1,7 +1,7 @@ # Ubuntu 22.04 - OS Version: 22.04.3 LTS - Kernel Version: 5.15.0-1041-azure -- Image Version: 20230821.1.0 +- Image Version: 20230903.1.0 - Systemd version: 249.11-0ubuntu3.9 ## Installed Software @@ -14,8 +14,8 @@ - Dash 0.5.11+git20210903+057cd650a4ed-3build1 - GNU C++: 9.5.0, 10.5.0, 11.4.0, 12.3.0 - GNU Fortran: 9.5.0, 10.5.0, 11.4.0, 12.3.0 -- Julia 1.9.2 -- Kotlin 1.9.0-release-358 +- Julia 1.9.3 +- Kotlin 1.9.10-release-459 - Mono 6.12.0.200 - MSBuild 16.10.1.31701 (Mono 6.12.0.200) - Node.js 18.17.1 @@ -27,7 +27,7 @@ ### Package Management - cpan 1.64 - Helm 3.12.3 -- Homebrew 4.1.5 +- Homebrew 4.1.7 - Miniconda 23.5.2 - Npm 9.6.7 - NuGet 6.6.1.2 @@ -35,7 +35,7 @@ - Pip3 22.0.2 - Pipx 1.2.0 - RubyGems 3.3.5 -- Vcpkg (build from commit c95000e1b) +- Vcpkg (build from commit 4a600e9fe) - Yarn 1.22.19 #### Environment variables @@ -53,7 +53,7 @@ to accomplish this. ``` ### Project Management -- Lerna 7.1.5 +- Lerna 7.2.0 - Maven 3.8.8 ### Tools @@ -61,26 +61,26 @@ to accomplish this. - apt-fast 1.9.12 - AzCopy 10.20.1 - available by `azcopy` and `azcopy10` aliases - Bazel 6.3.2 -- Bazelisk 1.13.2 +- Bazelisk 1.18.0 - Bicep 0.20.4 - Buildah 1.23.1 -- CMake 3.27.3 -- CodeQL Action Bundles 2.14.1 2.14.2 +- CMake 3.27.4 +- CodeQL Action Bundles 2.14.2 2.14.3 - Docker Amazon ECR Credential Helper 0.7.1 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.20.3 +- Docker Compose v2 2.21.0 - Docker-Buildx 0.11.2 - Docker Client 24.0.5 - Docker Server 24.0.5 - Fastlane 2.214.0 -- Git 2.41.0 +- Git 2.42.0 - Git LFS 3.4.0 - Git-ftp 1.6.0 - Haveged 1.9.14 -- Heroku 8.3.1 +- Heroku 8.4.2 - jq 1.6 - Kind 0.20.0 -- Kubectl 1.28.0 +- Kubectl 1.28.1 - Kustomize 5.1.1 - Leiningen 2.10.0 - MediaInfo 21.09 @@ -88,46 +88,46 @@ to accomplish this. - Minikube 1.31.2 - n 9.1.0 - Newman 5.3.2 -- nvm 0.39.4 +- nvm 0.39.5 - OpenSSL 3.0.2-0ubuntu1.10 - Packer 1.9.4 - Parcel 2.9.3 - Podman 3.4.4 -- Pulumi 3.78.1 +- Pulumi 3.80.0 - R 4.3.1 - Skopeo 1.4.1 - Sphinx Open Source Search Server 2.2.11 - SVN 1.14.1 -- Terraform 1.5.5 +- Terraform 1.5.6 - yamllint 1.32.0 - yq 4.35.1 - zstd 1.5.5 ### CLI Tools -- Alibaba Cloud CLI 3.0.177 -- AWS CLI 2.13.11 +- Alibaba Cloud CLI 3.0.180 +- AWS CLI 2.13.15 - AWS CLI Session Manager Plugin 1.2.497.0 -- AWS SAM CLI 1.95.0 +- AWS SAM CLI 1.96.0 - Azure CLI 2.51.0 - Azure CLI (azure-devops) 0.26.0 -- GitHub CLI 2.32.1 -- Google Cloud SDK 443.0.0 +- GitHub CLI 2.33.0 +- Google Cloud SDK 444.0.0 - Hub CLI 2.14.2 -- Netlify CLI 16.1.0 -- OpenShift CLI 4.13.9 +- Netlify CLI 16.2.0 +- OpenShift CLI 4.13.10 - ORAS CLI 1.0.1 -- Vercel CLI 31.4.0 +- Vercel CLI 32.1.0 ### Java | Version | Environment Variable | | ------------------- | -------------------- | | 8.0.382+5 | JAVA_HOME_8_X64 | -| 11.0.20+8 (default) | JAVA_HOME_11_X64 | -| 17.0.8+7 | JAVA_HOME_17_X64 | +| 11.0.20+1 (default) | JAVA_HOME_11_X64 | +| 17.0.8+1 | JAVA_HOME_17_X64 | ### PHP Tools - PHP: 8.1.2 -- Composer 2.5.8 +- Composer 2.6.2 - PHPUnit 8.5.33 ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. @@ -140,27 +140,27 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Stack 2.11.1 ### Rust Tools -- Cargo 1.71.1 -- Rust 1.71.1 -- Rustdoc 1.71.1 +- Cargo 1.72.0 +- Rust 1.72.0 +- Rustdoc 1.72.0 - Rustup 1.26.0 #### Packages - Bindgen 0.66.1 -- Cargo audit 0.17.6 -- Cargo clippy 0.1.71 +- Cargo audit 0.18.1 +- Cargo clippy 0.1.72 - Cargo outdated 0.13.1 -- Cbindgen 0.24.5 -- Rustfmt 1.5.2 +- Cbindgen 0.25.0 +- Rustfmt 1.6.0 ### Browsers and Drivers -- Google Chrome 116.0.5845.96 +- Google Chrome 116.0.5845.140 - ChromeDriver 116.0.5845.96 - Chromium 116.0.5845.0 -- Microsoft Edge 115.0.1901.203 -- Microsoft Edge WebDriver 115.0.1901.203 -- Selenium server 4.11.0 -- Mozilla Firefox 116.0.3 +- Microsoft Edge 116.0.1938.69 +- Microsoft Edge WebDriver 116.0.1938.69 +- Selenium server 4.12.0 +- Mozilla Firefox 117.0 - Geckodriver 0.33.0 #### Environment variables @@ -214,10 +214,10 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Python - 3.7.17 -- 3.8.17 -- 3.9.17 -- 3.10.12 -- 3.11.4 +- 3.8.18 +- 3.9.18 +- 3.10.13 +- 3.11.5 #### PyPy - 3.7.13 [PyPy 7.3.9] @@ -234,7 +234,7 @@ Use the following command as a part of your job to start the service: 'sudo syst #### PowerShell Modules - Az: 9.3.0 - MarkdownPS: 1.9 -- Microsoft.Graph: 2.3.0 +- Microsoft.Graph: 2.4.0 - Pester: 5.5.0 - PSScriptAnalyzer: 1.21.0 @@ -248,7 +248,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | Package Name | Version | | -------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 9.0 | -| Android Emulator | 32.1.14 | +| Android Emulator | 32.1.15 | | Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | | Android SDK Platform-Tools | 34.0.4 | | Android SDK Platforms | android-34 (rev 2)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | @@ -280,7 +280,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | buildpack-deps:buster | sha256:c6cfa5c691f91c0760341abf073efe1c4b0437ad05375290b3298b8e1219de5b | 2023-08-16 | | debian:10 | sha256:b86bfc1dd2fb1820fea6c1e0b6e23d155198b518b3a506f6edad71bf6e9a8cef | 2023-08-16 | | debian:11 | sha256:1beb7cf458bdfe71b5220cb2069eb45e3fc7eb77a1ccfb169eaebf5f6c4809ab | 2023-08-16 | -| moby/buildkit:latest | sha256:d91fe5e6dad11f2c2cee6d268d5843ad64bf2e9852365d56b12d02f2315edce5 | 2023-08-02 | +| moby/buildkit:latest | sha256:890dcae054e3039f6c6b76bf0da80a130fa6e6bb1f3624063ef0210ac2c57b06 | 2023-08-24 | | node:14 | sha256:a158d3b9b4e3fa813fa6c8c590b8f0a860e015ad4e59bbce5744d2f6fd8461aa | 2023-04-12 | | node:14-alpine | sha256:434215b487a329c9e867202ff89e704d3a75e554822e07f3e0c0f9e606121b33 | 2023-03-29 | | node:16 | sha256:818b5adc1ee4a04e8ad5efeb70871571efe414315ad7f16844f24f9962ffdc7e | 2023-08-17 | @@ -289,7 +289,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | node:18-alpine | sha256:3482a20c97e401b56ac50ba8920cc7b5b2022bfc6aa7d4e4c231755770cf892f | 2023-08-10 | | ubuntu:18.04 | sha256:152dc042452c496007f07ca9127571cb9c29697f42acbfad72324b2bb2e43c98 | 2023-05-30 | | ubuntu:20.04 | sha256:33a5cc25d22c45900796a1aca487ad7a7cb09f09ea00b779e3b2026b4fc2faba | 2023-08-01 | -| ubuntu:22.04 | sha256:ec050c32e4a6085b423d36ecd025c0d3ff00c38ab93a3d71a460ff1c44fa6d77 | 2023-08-04 | +| ubuntu:22.04 | sha256:aabed3296a3d45cede1dc866a24476c4d7e093aa806263c27ddaadbdce3c1054 | 2023-08-16 | ### Installed apt packages | Name | Version | @@ -355,6 +355,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | parallel | 20210822+ds-2 | | pass | 1.7.4-5 | | patchelf | 0.14.3-1 | +| pigz | 2.6-1 | | pkg-config | 0.29.2-1ubuntu3 | | pollinate | 4.33-3ubuntu2 | | python-is-python3 | 3.9.2-2 | From 08f6a0590445016b813efe25048da76ad3e4c0b1 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 7 Sep 2023 11:49:34 +0000 Subject: [PATCH 2171/3485] Updating readme file for ubuntu20 version 20230903.1.0 (#8230) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2004-Readme.md | 97 ++++++++++++++++--------------- 1 file changed, 49 insertions(+), 48 deletions(-) diff --git a/images/linux/Ubuntu2004-Readme.md b/images/linux/Ubuntu2004-Readme.md index d36b5ecc839b..1bf8ae761d49 100644 --- a/images/linux/Ubuntu2004-Readme.md +++ b/images/linux/Ubuntu2004-Readme.md @@ -1,7 +1,7 @@ # Ubuntu 20.04 - OS Version: 20.04.6 LTS -- Kernel Version: 5.15.0-1042-azure -- Image Version: 20230821.1.0 +- Kernel Version: 5.15.0-1045-azure +- Image Version: 20230903.1.0 - Systemd version: 245.4-4ubuntu3.22 ## Installed Software @@ -16,8 +16,8 @@ - Erlang rebar3 3.22.1 - GNU C++: 9.4.0, 10.5.0 - GNU Fortran: 9.4.0, 10.5.0 -- Julia 1.9.2 -- Kotlin 1.9.0-release-358 +- Julia 1.9.3 +- Kotlin 1.9.10-release-459 - Mono 6.12.0.200 - MSBuild 16.10.1.31701 (Mono 6.12.0.200) - Node.js 18.17.1 @@ -29,7 +29,7 @@ ### Package Management - cpan 1.64 - Helm 3.12.3 -- Homebrew 4.1.5 +- Homebrew 4.1.7 - Miniconda 23.5.2 - Npm 9.6.7 - NuGet 6.6.1.2 @@ -37,7 +37,7 @@ - Pip3 20.0.2 - Pipx 1.2.0 - RubyGems 3.1.2 -- Vcpkg (build from commit c95000e1b) +- Vcpkg (build from commit 4a600e9fe) - Yarn 1.22.19 #### Environment variables @@ -57,36 +57,36 @@ to accomplish this. ### Project Management - Ant 1.10.7 - Gradle 8.3 -- Lerna 7.1.5 +- Lerna 7.2.0 - Maven 3.8.8 -- Sbt 1.9.3 +- Sbt 1.9.4 ### Tools - Ansible 2.13.11 - apt-fast 1.9.12 - AzCopy 10.20.1 - available by `azcopy` and `azcopy10` aliases - Bazel 6.3.2 -- Bazelisk 1.13.2 +- Bazelisk 1.18.0 - Bicep 0.20.4 - Buildah 1.22.3 -- CMake 3.27.3 -- CodeQL Action Bundles 2.14.1 2.14.2 +- CMake 3.27.4 +- CodeQL Action Bundles 2.14.2 2.14.3 - Docker Amazon ECR Credential Helper 0.7.1 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.20.3 +- Docker Compose v2 2.21.0 - Docker-Buildx 0.11.2 - Docker Client 24.0.5 - Docker Server 24.0.5 - Fastlane 2.214.0 -- Git 2.41.0 +- Git 2.42.0 - Git LFS 3.4.0 - Git-ftp 1.6.0 - Haveged 1.9.1 -- Heroku 8.3.1 +- Heroku 8.4.2 - HHVM (HipHop VM) 4.172.1 - jq 1.6 - Kind 0.20.0 -- Kubectl 1.28.0 +- Kubectl 1.28.1 - Kustomize 5.1.1 - Leiningen 2.10.0 - MediaInfo 19.09 @@ -94,47 +94,47 @@ to accomplish this. - Minikube 1.31.2 - n 9.1.0 - Newman 5.3.2 -- nvm 0.39.4 +- nvm 0.39.5 - OpenSSL 1.1.1f-1ubuntu2.19 - Packer 1.9.4 - Parcel 2.9.3 - PhantomJS 2.1.1 2.1.1 - Podman 3.4.2 -- Pulumi 3.78.1 +- Pulumi 3.80.0 - R 4.3.1 - Skopeo 1.5.0 - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 -- Terraform 1.5.5 +- Terraform 1.5.6 - yamllint 1.32.0 - yq 4.35.1 - zstd 1.5.5 ### CLI Tools - Alibaba Cloud CLI 3.0.174 -- AWS CLI 2.13.11 +- AWS CLI 2.13.15 - AWS CLI Session Manager Plugin 1.2.497.0 -- AWS SAM CLI 1.95.0 +- AWS SAM CLI 1.96.0 - Azure CLI 2.51.0 - Azure CLI (azure-devops) 0.26.0 -- GitHub CLI 2.32.1 -- Google Cloud SDK 443.0.0 +- GitHub CLI 2.33.0 +- Google Cloud SDK 444.0.0 - Hub CLI 2.14.2 -- Netlify CLI 16.1.0 -- OpenShift CLI 4.13.9 +- Netlify CLI 16.2.0 +- OpenShift CLI 4.13.10 - ORAS CLI 1.0.1 -- Vercel CLI 31.4.0 +- Vercel CLI 32.1.0 ### Java | Version | Environment Variable | | ------------------- | -------------------- | | 8.0.382+5 | JAVA_HOME_8_X64 | -| 11.0.20+8 (default) | JAVA_HOME_11_X64 | -| 17.0.8+7 | JAVA_HOME_17_X64 | +| 11.0.20+1 (default) | JAVA_HOME_11_X64 | +| 17.0.8+1 | JAVA_HOME_17_X64 | ### PHP Tools -- PHP: 7.4.33, 8.0.30, 8.1.22, 8.2.9 -- Composer 2.5.8 +- PHP: 7.4.33, 8.0.30, 8.1.23, 8.2.10 +- Composer 2.6.2 - PHPUnit 8.5.33 ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. @@ -147,27 +147,27 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Stack 2.11.1 ### Rust Tools -- Cargo 1.71.1 -- Rust 1.71.1 -- Rustdoc 1.71.1 +- Cargo 1.72.0 +- Rust 1.72.0 +- Rustdoc 1.72.0 - Rustup 1.26.0 #### Packages - Bindgen 0.66.1 -- Cargo audit 0.17.6 -- Cargo clippy 0.1.71 +- Cargo audit 0.18.1 +- Cargo clippy 0.1.72 - Cargo outdated 0.13.1 -- Cbindgen 0.24.5 -- Rustfmt 1.5.2 +- Cbindgen 0.25.0 +- Rustfmt 1.6.0 ### Browsers and Drivers -- Google Chrome 116.0.5845.96 +- Google Chrome 116.0.5845.140 - ChromeDriver 116.0.5845.96 - Chromium 116.0.5845.0 -- Microsoft Edge 115.0.1901.203 -- Microsoft Edge WebDriver 115.0.1901.203 -- Selenium server 4.11.0 -- Mozilla Firefox 116.0.3 +- Microsoft Edge 116.0.1938.69 +- Microsoft Edge WebDriver 116.0.1938.69 +- Selenium server 4.12.0 +- Mozilla Firefox 117.0 - Geckodriver 0.33.0 #### Environment variables @@ -223,10 +223,10 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Python - 3.6.15 - 3.7.17 -- 3.8.17 -- 3.9.17 -- 3.10.12 -- 3.11.4 +- 3.8.18 +- 3.9.18 +- 3.10.13 +- 3.11.5 #### PyPy - 2.7.18 [PyPy 7.3.12] @@ -250,7 +250,7 @@ Use the following command as a part of your job to start the service: 'sudo syst - Az: 9.3.0 - Az (Cached): 3.1.0.zip, 4.4.0.zip, 5.9.0.zip, 6.6.0.zip, 7.5.0.zip - MarkdownPS: 1.9 -- Microsoft.Graph: 2.3.0 +- Microsoft.Graph: 2.4.0 - Pester: 5.5.0 - PSScriptAnalyzer: 1.21.0 @@ -265,7 +265,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | Package Name | Version | | -------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 9.0 | -| Android Emulator | 32.1.14 | +| Android Emulator | 32.1.15 | | Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | | Android SDK Platform-Tools | 34.0.4 | | Android SDK Platforms | android-34 (rev 2)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | @@ -299,7 +299,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | debian:10 | sha256:b86bfc1dd2fb1820fea6c1e0b6e23d155198b518b3a506f6edad71bf6e9a8cef | 2023-08-16 | | debian:11 | sha256:1beb7cf458bdfe71b5220cb2069eb45e3fc7eb77a1ccfb169eaebf5f6c4809ab | 2023-08-16 | | debian:9 | sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be | 2022-06-23 | -| moby/buildkit:latest | sha256:d91fe5e6dad11f2c2cee6d268d5843ad64bf2e9852365d56b12d02f2315edce5 | 2023-08-02 | +| moby/buildkit:latest | sha256:890dcae054e3039f6c6b76bf0da80a130fa6e6bb1f3624063ef0210ac2c57b06 | 2023-08-24 | | node:14 | sha256:a158d3b9b4e3fa813fa6c8c590b8f0a860e015ad4e59bbce5744d2f6fd8461aa | 2023-04-12 | | node:14-alpine | sha256:434215b487a329c9e867202ff89e704d3a75e554822e07f3e0c0f9e606121b33 | 2023-03-29 | | node:16 | sha256:818b5adc1ee4a04e8ad5efeb70871571efe414315ad7f16844f24f9962ffdc7e | 2023-08-17 | @@ -372,6 +372,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | parallel | 20161222-1.1 | | pass | 1.7.3-2 | | patchelf | 0.10-2build1 | +| pigz | 2.4-1 | | pkg-config | 0.29.1-0ubuntu4 | | pollinate | 4.33-3ubuntu1.20.04.1 | | python-is-python3 | 3.8.2-4 | From acd00737c68e03eeea6ebdaedd87aa74e3481370 Mon Sep 17 00:00:00 2001 From: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com> Date: Fri, 8 Sep 2023 10:48:51 +0200 Subject: [PATCH 2172/3485] [windows] implement checksum validation for Powershell Core (#8247) --- .../Installers/Install-PowershellCore.ps1 | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/images/win/scripts/Installers/Install-PowershellCore.ps1 b/images/win/scripts/Installers/Install-PowershellCore.ps1 index c0f7208e6f50..6f36959f9631 100644 --- a/images/win/scripts/Installers/Install-PowershellCore.ps1 +++ b/images/win/scripts/Installers/Install-PowershellCore.ps1 @@ -1,10 +1,25 @@ ################################################################################ ## File: Install-PowershellCore.ps1 ## Desc: Install PowerShell Core +## Supply chain security: checksum validation ################################################################################ $ErrorActionPreference = "Stop" +#region functions +Function Get-PowerShellCoreHash +{ + Param ( + [Parameter(Mandatory = $True)] + [string] $Release +) + + $hashURL = "https://github.com/PowerShell/PowerShell/releases/download/v${Release}/hashes.sha256" + (Invoke-RestMethod -Uri $hashURL).ToString().Split("`n").Where({ $_ -ilike "*PowerShell-${Release}-win-x64.msi*" }).Split(' ')[0] + +} +#endregion + $tempDir = Join-Path ([System.IO.Path]::GetTempPath()) ([System.IO.Path]::GetRandomFileName()) $null = New-Item -ItemType Directory -Path $tempDir -Force -ErrorAction SilentlyContinue try { @@ -21,6 +36,19 @@ try { $packagePath = Join-Path -Path $tempDir -ChildPath $packageName Invoke-WebRequest -Uri $downloadURL -OutFile $packagePath + #region Supply chain security + Write-Verbose "Performing checksum verification" + + $distributor_file_hash = Get-PowerShellCoreHash -Release $release + $local_file_hash = (Get-FileHash -Path $packagePath -Algorithm SHA256).Hash + + if ($local_file_hash -ne $distributor_file_hash) { + Write-Host "hash must be equal to: ${distributor_file_hash}" + Write-Host "actual hash is: ${local_file_hash}" + throw 'Checksum verification failed, please rerun install' + } + #endregion + Write-Verbose "Performing quiet install" $ArgumentList=@("/i", $packagePath, "/quiet") $process = Start-Process msiexec -ArgumentList $ArgumentList -Wait -PassThru From 05d3e0c5a18a83e1c52adf3df2e6d9d49b20643b Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Fri, 8 Sep 2023 12:39:21 +0200 Subject: [PATCH 2173/3485] [macOS] Update Xamarin.Android version to 13.2.1.2 (#8250) --- images/macos/toolsets/toolset-12.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index c060db3d9719..075f7527031d 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -28,7 +28,7 @@ "9.1.0.5", "9.0.0.27", "8.12.0.2", "8.10.0.5", "8.8.0.3", "8.6.0.3", "8.4.0.0", "8.2.0.17", "7.14.0.27" ], "android-versions": [ - "13.2.0.0", "13.1.0.1", "13.0.0.0", "12.3.3.3", "12.2.8.3", "12.1.0.2", "12.0.0.3", "11.3.0.4" + "13.2.1.2", "13.1.0.1", "13.0.0.0", "12.3.3.3", "12.2.8.3", "12.1.0.2", "12.0.0.3", "11.3.0.4" ], "bundle-default": "6_12_21", "bundles": [ From 30104e6c1379b5bf5258867213fe64165324e393 Mon Sep 17 00:00:00 2001 From: sergei-pyshnoi <121864472+sergei-pyshnoi@users.noreply.github.com> Date: Fri, 8 Sep 2023 17:06:33 +0200 Subject: [PATCH 2174/3485] [windows] change source for mongodb version parser (#8248) --- images/win/scripts/Installers/Install-MongoDB.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/win/scripts/Installers/Install-MongoDB.ps1 b/images/win/scripts/Installers/Install-MongoDB.ps1 index d82342450bbc..c76978109441 100644 --- a/images/win/scripts/Installers/Install-MongoDB.ps1 +++ b/images/win/scripts/Installers/Install-MongoDB.ps1 @@ -6,8 +6,8 @@ # Install mongodb package $toolsetVersion = (Get-ToolsetContent).mongodb.version -$getMongoReleases = Invoke-WebRequest -Uri "https://www.mongodb.com/docs/upcoming/release-notes/$toolsetVersion" -UseBasicParsing -$TargetReleases = $getMongoReleases.Links.href | Where-Object {$_ -like "*std-label-$toolsetVersion*"} +$getMongoReleases = Invoke-WebRequest -Uri "https://www.mongodb.com/docs/v$toolsetVersion/release-notes/$toolsetVersion-changelog/" -UseBasicParsing +$TargetReleases = $getMongoReleases.Links.href | Where-Object {$_ -like "#$toolsetVersion*-changelog"} $MinorVersions = @() foreach ($release in $TargetReleases) { From 6a44d736b47295aced04924d1a2488528eb7238d Mon Sep 17 00:00:00 2001 From: sergei-pyshnoi <121864472+sergei-pyshnoi@users.noreply.github.com> Date: Mon, 11 Sep 2023 11:30:31 +0200 Subject: [PATCH 2175/3485] add clang-15 to ubuntu-22 (#8255) --- images/linux/toolsets/toolset-2204.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/images/linux/toolsets/toolset-2204.json b/images/linux/toolsets/toolset-2204.json index 9aac23bcdf37..0f7037b2adfd 100644 --- a/images/linux/toolsets/toolset-2204.json +++ b/images/linux/toolsets/toolset-2204.json @@ -258,7 +258,8 @@ "versions": [ "12", "13", - "14" + "14", + "15" ], "default_version": "14" }, From 1410e7c1f19d3acfb7e1d5414218fdf0974351b4 Mon Sep 17 00:00:00 2001 From: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com> Date: Mon, 11 Sep 2023 13:39:00 +0200 Subject: [PATCH 2176/3485] [macos] introduce additional runtimes for XCode (#8254) --- images/macos/helpers/Xcode.Installer.psm1 | 2 +- images/macos/provision/core/xcode.ps1 | 6 ++++++ images/macos/toolsets/toolset-13.json | 4 ++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/images/macos/helpers/Xcode.Installer.psm1 b/images/macos/helpers/Xcode.Installer.psm1 index 36aef42df260..66f5252195e5 100644 --- a/images/macos/helpers/Xcode.Installer.psm1 +++ b/images/macos/helpers/Xcode.Installer.psm1 @@ -176,7 +176,7 @@ function Install-AdditionalSimulatorRuntimes { Write-Host "Installing Simulator Runtimes for Xcode $Version ..." $xcodebuildPath = Get-XcodeToolPath -Version $Version -ToolName "xcodebuild" - Invoke-ValidateCommand "$xcodebuildPath -downloadAllPlatforms | xcpretty" + Invoke-ValidateCommand "$xcodebuildPath -downloadAllPlatforms" } function Build-XcodeSymlinks { diff --git a/images/macos/provision/core/xcode.ps1 b/images/macos/provision/core/xcode.ps1 index 3eb25d92223c..e7c56759fa4c 100644 --- a/images/macos/provision/core/xcode.ps1 +++ b/images/macos/provision/core/xcode.ps1 @@ -38,6 +38,12 @@ $xcodeVersions | ForEach-Object { Install-AdditionalSimulatorRuntimes -Version $_.link } + ForEach($runtime in $_.runtimes) { + Write-Host "Installing Additional runtimes for Xcode '$runtime' ..." + $xcodebuildPath = Get-XcodeToolPath -Version $_.link -ToolName 'xcodebuild' + Invoke-ValidateCommand "sudo $xcodebuildPath -downloadPlatform $runtime" + } + } Invoke-XcodeRunFirstLaunch -Version $defaultXcode diff --git a/images/macos/toolsets/toolset-13.json b/images/macos/toolsets/toolset-13.json index 23f32f295075..9f67c0b50066 100644 --- a/images/macos/toolsets/toolset-13.json +++ b/images/macos/toolsets/toolset-13.json @@ -3,7 +3,7 @@ "default": "14.3.1", "x64": { "versions": [ - { "link": "15.0", "version": "15.0.0-Beta.8+15A5229m" }, + { "link": "15.0", "version": "15.0.0-Beta.8+15A5229m", "runtimes": [ "visionOS" ] }, { "link": "14.3.1", "version": "14.3.1+14E300c","symlinks": ["14.3"] }, { "link": "14.2", "version": "14.2.0+14C18" }, { "link": "14.1", "version": "14.1.0+14B47b" } @@ -11,7 +11,7 @@ }, "arm64":{ "versions": [ - { "link": "15.0", "version": "15.0.0-Beta.8+15A5229m" }, + { "link": "15.0", "version": "15.0.0-Beta.8+15A5229m", "runtimes": [ "visionOS" ] }, { "link": "14.3.1", "version": "14.3.1+14E300c","symlinks": ["14.3"] }, { "link": "14.2", "version": "14.2.0+14C18" }, { "link": "14.1", "version": "14.1.0+14B47b" } From 878fa3c8d6b1434deb86fa91b83d39d7a4853f7c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 11 Sep 2023 12:17:14 +0000 Subject: [PATCH 2177/3485] Updating readme file for macOS-12 version 20230901.1 (#8226) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-12-Readme.md | 44 ++++++++++++++++----------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/images/macos/macos-12-Readme.md b/images/macos/macos-12-Readme.md index 904d06c7c1a2..2d334c5f099e 100644 --- a/images/macos/macos-12-Readme.md +++ b/images/macos/macos-12-Readme.md @@ -1,7 +1,7 @@ # macOS 12 -- OS Version: macOS 12.6.7 (21G651) +- OS Version: macOS 12.6.8 (21G725) - Kernel Version: Darwin 21.6.0 -- Image Version: 20230825.1 +- Image Version: 20230901.1 ## Installed Software @@ -23,9 +23,9 @@ - NVM 0.39.5 - NVM - Cached node versions: 14.21.3, 16.20.2, 18.17.1 - Perl 5.36.1 -- PHP 8.2.9 +- PHP 8.2.10 - Python 2.7.18 -- Python3 3.11.4 +- Python3 3.11.5 - R 4.3.1 - Ruby 3.0.6p216 @@ -33,8 +33,8 @@ - Bundler 2.4.19 - Carthage 0.39.0 - CocoaPods 1.12.1 -- Composer 2.5.8 -- Homebrew 4.1.6 +- Composer 2.6.1 +- Homebrew 4.1.7 - Miniconda 23.5.2 - NPM 9.6.7 - NuGet 6.3.1.1 @@ -42,7 +42,7 @@ - Pip3 23.2.1 (python 3.11) - Pipx 1.2.0 - RubyGems 3.4.19 -- Vcpkg 2023 (build from commit 436a061a5) +- Vcpkg 2023 (build from commit 4a600e9fe) - Yarn 1.22.19 #### Environment variables @@ -91,15 +91,15 @@ ### Tools - App Center CLI 2.14.0 -- AWS CLI 2.13.13 -- AWS SAM CLI 1.95.0 +- AWS CLI 2.13.15 +- AWS SAM CLI 1.96.0 - AWS Session Manager CLI 1.2.463.0 - Azure CLI 2.50.0 - Azure CLI (azure-devops) 0.26.0 - Bicep CLI 0.20.4 - Cabal 3.6.2.0 - Cmake 3.27.4 -- CodeQL Action Bundles 2.14.1 2.14.2 +- CodeQL Action Bundles 2.14.2 2.14.3 - Colima 0.5.5 - Fastlane 2.214.0 - GHC 9.6.2 @@ -117,12 +117,12 @@ ### Browsers - Safari 16.6 (17615.3.12.11.3) - SafariDriver 16.6 (17615.3.12.11.3) -- Google Chrome 116.0.5845.110 +- Google Chrome 116.0.5845.140 - Google Chrome for Testing 116.0.5845.96 - ChromeDriver 116.0.5845.96 -- Microsoft Edge 116.0.1938.54 -- Microsoft Edge WebDriver 116.0.1938.62 -- Mozilla Firefox 116.0.3 +- Microsoft Edge 116.0.1938.69 +- Microsoft Edge WebDriver 116.0.1938.69 +- Mozilla Firefox 117.0 - geckodriver 0.33.0 - Selenium server 4.10.0 @@ -137,8 +137,8 @@ | Version | Environment Variable | | ------------------- | -------------------- | | 8.0.382+5 (default) | JAVA_HOME_8_X64 | -| 11.0.20+8 | JAVA_HOME_11_X64 | -| 17.0.8+7 | JAVA_HOME_17_X64 | +| 11.0.20+101 | JAVA_HOME_11_X64 | +| 17.0.8+101 | JAVA_HOME_17_X64 | ### Cached Tools @@ -149,10 +149,10 @@ #### Python - 3.7.17 -- 3.8.17 -- 3.9.17 -- 3.10.12 -- 3.11.4 +- 3.8.18 +- 3.9.18 +- 3.10.13 +- 3.11.5 #### PyPy - 2.7.18 [PyPy 7.3.12] @@ -180,7 +180,7 @@ #### Packages - Bindgen 0.66.1 -- Cargo-audit 0.17.6 +- Cargo-audit 0.18.1 - Cargo-outdated 0.13.1 - Cbindgen 0.25.0 - Clippy 0.1.72 @@ -326,7 +326,7 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" | Package Name | Version | | -------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 8.0 | -| Android Emulator | 32.1.14 | +| Android Emulator | 32.1.15 | | Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | | Android SDK Platforms | android-34 (rev 2)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | | Android SDK Platform-Tools | 34.0.4 | From 9a4861b4ee2522ac60da48e90cdeece3df8b7b22 Mon Sep 17 00:00:00 2001 From: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com> Date: Tue, 12 Sep 2023 10:04:14 +0200 Subject: [PATCH 2178/3485] [windows] switch to Powershell Gallery when preparing Azure modules (#8264) --- .../Installers/Install-AzureModules.ps1 | 57 ++++--------------- images/win/toolsets/toolset-2019.json | 3 - images/win/toolsets/toolset-2022.json | 3 - 3 files changed, 11 insertions(+), 52 deletions(-) diff --git a/images/win/scripts/Installers/Install-AzureModules.ps1 b/images/win/scripts/Installers/Install-AzureModules.ps1 index d5a96ffb48f6..66ebfe63ce52 100644 --- a/images/win/scripts/Installers/Install-AzureModules.ps1 +++ b/images/win/scripts/Installers/Install-AzureModules.ps1 @@ -1,8 +1,14 @@ ################################################################################ ## File: Install-AzureModules.ps1 ## Desc: Install Azure PowerShell modules +## Supply chain security: package manager ################################################################################ +# +# prepares the environment for the Azure PowerShell modules +# used by AzureFileCopy@4, AzureFileCopy@5, AzurePowerShell@4, AzurePowerShell@5 tasks +# + # The correct Modules need to be saved in C:\Modules $installPSModulePath = "C:\\Modules" if (-not (Test-Path -LiteralPath $installPSModulePath)) @@ -25,56 +31,15 @@ foreach ($module in $modules) { $modulePath = Join-Path -Path $installPSModulePath -ChildPath "${moduleName}_${version}" Write-Host " - $version [$modulePath]" - try - { - Save-Module -Path $modulePath -Name $moduleName -RequiredVersion $version -Force -ErrorAction Stop - } - catch - { - Write-Host "Error: $_" - exit 1 - } - } - - if($null -ne $module.url) - { - $assets = Invoke-RestMethod $module.url + Save-Module -Path $modulePath -Name $moduleName -RequiredVersion $version -Force -ErrorAction Stop } foreach ($version in $module.zip_versions) { - # Install modules from GH Release - if($null -ne $assets) - { - $asset = $assets | Where-Object version -eq $version ` - | Select-Object -ExpandProperty files ` - | Select-Object -First 1 - - Write-Host "Installing $($module.name) $version ..." - if ($null -ne $asset) { - Start-DownloadWithRetry -Url $asset.download_url -Name $asset.filename -DownloadPath $installPSModulePath - } else { - Write-Host "Asset was not found in versions manifest" - exit 1 - } - } - # Install modules from vsts blob - else - { - $modulePath = Join-Path -Path $installPSModulePath -ChildPath "${moduleName}_${version}" - $filename = "${moduleName}_${version}.zip" - $download_url = [System.String]::Concat($module.blob_url,$filename) - Write-Host " - $version [$modulePath]" - try - { - Start-DownloadWithRetry -Url $download_url -Name $filename -DownloadPath $installPSModulePath - } - catch - { - Write-Host "Error: $_" - exit 1 - } - } + $modulePath = Join-Path -Path $installPSModulePath -ChildPath "${moduleName}_${version}" + Save-Module -Path $modulePath -Name $moduleName -RequiredVersion $version -Force -ErrorAction Stop + Compress-Archive -Path $modulePath -DestinationPath "${modulePath}.zip" + Remove-Item $modulePath -Recurse -Force } # Append default tool version to machine path if ($null -ne $module.default) diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index e54fdf49c388..db520b17ae8c 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -96,7 +96,6 @@ "azureModules": [ { "name": "azurerm", - "blob_url": "https://vstsagenttools.blob.core.windows.net/tools/azurepowershellmodules/", "versions": [ "2.1.0", "6.13.1" @@ -111,7 +110,6 @@ }, { "name": "azure", - "blob_url": "https://vstsagenttools.blob.core.windows.net/tools/azurepowershellmodules/", "versions": [ "2.1.0", "5.3.0" @@ -125,7 +123,6 @@ }, { "name": "az", - "url" : "https://raw.githubusercontent.com/Azure/az-ps-module-versions/main/versions-manifest.json", "versions": [ "9.3.0" ], diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index 138bc09e8283..9e4fa125814e 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -90,7 +90,6 @@ "azureModules": [ { "name": "azurerm", - "blob_url": "https://vstsagenttools.blob.core.windows.net/tools/azurepowershellmodules/", "versions": [ "2.1.0", "6.13.1" @@ -105,7 +104,6 @@ }, { "name": "azure", - "blob_url": "https://vstsagenttools.blob.core.windows.net/tools/azurepowershellmodules/", "versions": [ "2.1.0", "5.3.0" @@ -119,7 +117,6 @@ }, { "name": "az", - "url" : "https://raw.githubusercontent.com/Azure/az-ps-module-versions/main/versions-manifest.json", "versions": [ "9.3.0" ], From f5bbdcbe4f8743bdcb0e26fb1a590340222b5ab9 Mon Sep 17 00:00:00 2001 From: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com> Date: Tue, 12 Sep 2023 10:05:26 +0200 Subject: [PATCH 2179/3485] [windows] implement checksum validation for docker-wincred (#8256) --- .../win/scripts/Installers/Install-Docker.ps1 | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/images/win/scripts/Installers/Install-Docker.ps1 b/images/win/scripts/Installers/Install-Docker.ps1 index ce10c8914397..cf93e547edcb 100644 --- a/images/win/scripts/Installers/Install-Docker.ps1 +++ b/images/win/scripts/Installers/Install-Docker.ps1 @@ -3,8 +3,23 @@ ## Desc: Install Docker. ## Must be an independent step because it requires a restart before we ## can continue. +## Supply chain security: (docker-wincred) checksum validation ################################################################################ +#region functions +Function Get-DockerWincredHash +{ + Param ( + [Parameter(Mandatory = $True)] + [string] $Release +) + + $hashURL = "https://github.com/docker/docker-credential-helpers/releases/download/${Release}/checksums.txt " + (Invoke-RestMethod -Uri $hashURL).ToString().Split("`n").Where({ $_ -ilike "*docker-credential-wincred-${Release}.windows-amd64.exe*" }).Split(' ')[0] + +} +#endregion + Write-Host "Get latest release of Docker CE" $mobyLatestReleaseVersion = (Invoke-RestMethod -Uri "https://api.github.com/repos/moby/moby/releases/latest").tag_name.Trim("v") $dockerceUrl = "https://download.docker.com/win/static/stable/x86_64/" @@ -49,6 +64,17 @@ $dockerCredLatestRelease = Invoke-RestMethod -Uri "https://api.github.com/repos/ $dockerCredDownloadUrl = $dockerCredLatestRelease.assets.browser_download_url -match "docker-credential-wincred-.+\.exe" | Select-Object -First 1 Start-DownloadWithRetry -Url $dockerCredDownloadUrl -DownloadPath "C:\Windows\System32" -Name "docker-credential-wincred.exe" +#region Supply chain security +$distributor_file_hash = Get-DockerWincredHash -Release $dockerCredLatestRelease.name +$local_file_hash = (Get-FileHash -Path 'C:\Windows\System32\docker-credential-wincred.exe' -Algorithm SHA256).Hash + +if ($local_file_hash -ne $distributor_file_hash) { + Write-Host "hash must be equal to: ${distributor_file_hash}" + Write-Host "actual hash is: ${local_file_hash}" + throw 'Checksum verification failed, please rerun install' +} +#endregion + Write-Host "Download docker images" $dockerImages = (Get-ToolsetContent).docker.images foreach ($dockerImage in $dockerImages) { From 117712f38f3d904dcdb440b7231d559f8735d0f7 Mon Sep 17 00:00:00 2001 From: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com> Date: Tue, 12 Sep 2023 12:57:25 +0200 Subject: [PATCH 2180/3485] [windows] implement checksum validation for OpenSSL (#8257) --- .../scripts/Installers/Install-OpenSSL.ps1 | 49 ++++++++++++------- 1 file changed, 31 insertions(+), 18 deletions(-) diff --git a/images/win/scripts/Installers/Install-OpenSSL.ps1 b/images/win/scripts/Installers/Install-OpenSSL.ps1 index ee5f87fc6c72..2655ecc8d2e4 100644 --- a/images/win/scripts/Installers/Install-OpenSSL.ps1 +++ b/images/win/scripts/Installers/Install-OpenSSL.ps1 @@ -1,38 +1,51 @@ ################################################################################ ## File: Install-OpenSSL.ps1 ## Desc: Install win64-openssl. +## Supply chain security: checksum validation ################################################################################ -$arch = "INTEL" -$bits = "64" -$light = $false +$arch = 'INTEL' +$bits = '64' +$light = 'false' $installer = "exe" $version = (Get-ToolsetContent).openssl.version $installDir = "$Env:ProgramFiles\OpenSSL" # Fetch available installers list $jsonUrl = 'https://raw.githubusercontent.com/slproweb/opensslhashes/master/win32_openssl_hashes.json' -$installersAvailable = @() -(Invoke-RestMethod $jsonUrl).files.PSObject.Properties | -Where-Object MemberType -Eq NoteProperty | -ForEach-Object { $installersAvailable += $_.Value } - -# Select appropriate installers -$installersMatching = $installersAvailable | Where-Object { - ($_.basever -Eq $version -Or $_.basever -Like "$version.*") -And $_.arch -Eq $arch -And $_.bits -Eq $bits -And $_.light -Eq $light -And $_.installer -Eq $installer -} -# Get installer of the latest version -$latestInstaller = $installersMatching | -Sort-Object { [version]$_.basever }, subver | -Select-Object -Last 1 +$installersAvailable = (Invoke-RestMethod $jsonUrl).files + +$distributor_file_hash = $null +$installerUrl = $null +$installerName = $null + +$installersAvailable | Get-Member -MemberType NoteProperty | ForEach-Object { + $key = $_.Name + if(($installersAvailable.$key.light -eq $light) -and ($installersAvailable.$key.arch -eq $arch) -and ($installersAvailable.$key.bits -eq $bits) -and ($installersAvailable.$key.installer -eq $installer) -and ($installersAvailable.$key.basever -eq $version)) { + $installerUrl = $installersAvailable.$key.url + $installerName = $key + $distributor_file_hash = $installersAvailable.$key.sha512 + Break; + } +} # Invoke installation -$installerUrl = $latestInstaller.url -$installerName = "openssl-$($latestInstaller.basever)$($latestInstaller.subver)-setup.$($latestInstaller.installer)" + $installerArgs = '/silent', '/sp-', '/suppressmsgboxes', "/DIR=`"$installDir`"" Install-Binary -Url "$installerUrl" -Name "$installerName" -ArgumentList $installerArgs +#region Supply chain security +Write-Verbose "Performing checksum verification" +$local_file_hash = (Get-FileHash -Path (Join-Path ${env:TEMP} $installerName) -Algorithm SHA512).Hash + +if ($local_file_hash -ne $distributor_file_hash) { + Write-Host "hash must be equal to: ${distributor_file_hash}" + Write-Host "actual hash is: ${local_file_hash}" + throw 'Checksum verification failed, please rerun install' +} +#endregion + # Update PATH Add-MachinePathItem "$installDir\bin" $env:Path = Get-MachinePath From fc8f6d479dadc2f029e46b83c77bee6405acffc3 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 12 Sep 2023 15:55:33 +0000 Subject: [PATCH 2181/3485] Updating readme file for macOS-11 version 20230901.1 (#8228) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-11-Readme.md | 82 ++++++++++++++++----------------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/images/macos/macos-11-Readme.md b/images/macos/macos-11-Readme.md index 7bb84032f2e5..299ef6675b81 100644 --- a/images/macos/macos-11-Readme.md +++ b/images/macos/macos-11-Readme.md @@ -1,7 +1,7 @@ # macOS 11 -- OS Version: macOS 11.7.8 (20G1351) +- OS Version: macOS 11.7.9 (20G1426) - Kernel Version: Darwin 20.6.0 -- Image Version: 20230818.1 +- Image Version: 20230901.1 ## Installed Software @@ -16,18 +16,18 @@ - GNU Fortran 10 (Homebrew GCC 10.5.0) - available by `gfortran-10` alias - GNU Fortran 11 (Homebrew GCC 11.4.0) - available by `gfortran-11` alias - GNU Fortran 12 (Homebrew GCC 12.3.0) - available by `gfortran-12` alias -- Julia 1.9.2 -- Kotlin 1.9.0-release-358 +- Julia 1.9.3 +- Kotlin 1.9.10-release-459 - Go 1.20.7 - Mono 6.12.0.188 - MSBuild 16.10.1.51301 (Mono 6.12.0.188) - Node.js 18.17.1 -- NVM 0.39.4 +- NVM 0.39.5 - NVM - Cached node versions: 14.21.3, 16.20.2, 18.17.1 - Perl 5.36.1 -- PHP 8.2.9 +- PHP 8.2.10 - Python 2.7.18 -- Python3 3.11.4 +- Python3 3.11.5 - R 4.3.1 - Ruby 2.7.8p225 @@ -35,8 +35,8 @@ - Bundler 2.4.19 - Carthage 0.39.0 - CocoaPods 1.12.1 -- Composer 2.5.8 -- Homebrew 4.1.5 +- Composer 2.6.1 +- Homebrew 4.1.7 - Miniconda 23.5.2 - NPM 9.6.7 - NuGet 6.3.1.1 @@ -44,7 +44,7 @@ - Pip3 23.2.1 (python 3.11) - Pipx 1.2.0 - RubyGems 3.4.19 -- Vcpkg 2023 (build from commit c7fc29984) +- Vcpkg 2023 (build from commit 4a600e9fe) - Yarn 1.22.19 #### Environment variables @@ -54,22 +54,22 @@ | VCPKG_INSTALLATION_ROOT | /usr/local/share/vcpkg | ### Project Management -- Apache Ant 1.10.13 +- Apache Ant 1.10.14 - Apache Maven 3.9.4 - Gradle 8.3 -- Sbt 1.9.3 +- Sbt 1.9.4 ### Utilities - 7-Zip 17.05 - aria2 1.36.0 - azcopy 10.20.1 - bazel 6.3.2 -- bazelisk 1.17.0 +- bazelisk 1.18.0 - bsdtar 3.3.2 - available by 'tar' alias - Curl 8.2.1 -- Git 2.41.0 +- Git 2.42.0 - Git LFS 3.4.0 -- GitHub CLI 2.32.1 +- GitHub CLI 2.33.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.21.4 - gpg (GnuPG) 2.4.3 @@ -81,7 +81,7 @@ - mongod 5.0.17 - Newman 5.3.2 - OpenSSL 1.1.1v 1 Aug 2023 -- Packer 1.9.3 +- Packer 1.9.4 - pkg-config 0.29.2 - PostgreSQL 14.9 (Homebrew) - psql (PostgreSQL) 14.9 (Homebrew) @@ -92,23 +92,23 @@ - zstd 1.5.5 ### Tools -- Aliyun CLI 3.0.176 +- Aliyun CLI 3.0.180 - App Center CLI 2.14.0 -- AWS CLI 2.13.10 -- AWS SAM CLI 1.95.0 +- AWS CLI 2.13.15 +- AWS SAM CLI 1.96.0 - AWS Session Manager CLI 1.2.463.0 - Azure CLI 2.50.0 - Azure CLI (azure-devops) 0.26.0 - Bicep CLI 0.20.4 - Cabal 3.6.2.0 -- Cmake 3.27.3 -- CodeQL Action Bundles 2.14.1 2.14.2 +- Cmake 3.27.4 +- CodeQL Action Bundles 2.14.2 2.14.3 - Fastlane 2.214.0 - GHC 9.6.2 - GHCup 0.1.19.4 - Jazzy 0.14.3 - Stack 2.9.3 -- SwiftFormat 0.52.1 +- SwiftFormat 0.52.2 - Swig 4.1.1 - Xcode Command Line Tools 13.2.0.0.1.1638488800 @@ -119,12 +119,12 @@ ### Browsers - Safari 16.6 (16615.3.12.11.3) - SafariDriver 16.6 (16615.3.12.11.3) -- Google Chrome 116.0.5845.96 +- Google Chrome 116.0.5845.140 - Google Chrome for Testing 116.0.5845.96 - ChromeDriver 116.0.5845.96 -- Microsoft Edge 115.0.1901.203 -- Microsoft Edge WebDriver 115.0.1901.203 -- Mozilla Firefox 116.0.3 +- Microsoft Edge 116.0.1938.69 +- Microsoft Edge WebDriver 116.0.1938.69 +- Mozilla Firefox 117.0 - geckodriver 0.33.0 - Selenium server 4.10.0 @@ -139,8 +139,8 @@ | Version | Environment Variable | | ------------------- | -------------------- | | 8.0.382+5 (default) | JAVA_HOME_8_X64 | -| 11.0.20+8 | JAVA_HOME_11_X64 | -| 17.0.8+7 | JAVA_HOME_17_X64 | +| 11.0.20+101 | JAVA_HOME_11_X64 | +| 17.0.8+101 | JAVA_HOME_17_X64 | ### Cached Tools @@ -154,10 +154,10 @@ #### Python - 3.7.17 -- 3.8.17 -- 3.9.17 -- 3.10.12 -- 3.11.4 +- 3.8.18 +- 3.9.18 +- 3.10.13 +- 3.11.5 #### PyPy - 2.7.18 [PyPy 7.3.12] @@ -178,18 +178,18 @@ - 1.21.0 ### Rust Tools -- Cargo 1.71.1 -- Rust 1.71.1 -- Rustdoc 1.71.1 +- Cargo 1.72.0 +- Rust 1.72.0 +- Rustdoc 1.72.0 - Rustup 1.26.0 #### Packages - Bindgen 0.66.1 -- Cargo-audit 0.17.6 +- Cargo-audit 0.18.1 - Cargo-outdated 0.13.1 -- Cbindgen 0.24.5 -- Clippy 0.1.71 -- Rustfmt 1.5.2-stable +- Cbindgen 0.25.0 +- Clippy 0.1.72 +- Rustfmt 1.6.0-stable ### PowerShell Tools - PowerShell 7.2.13 @@ -328,7 +328,7 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" | Package Name | Version | | -------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 8.0 | -| Android Emulator | 32.1.14 | +| Android Emulator | 32.1.15 | | Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | | Android SDK Platforms | android-34 (rev 2)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | | Android SDK Platform-Tools | 34.0.4 | @@ -353,5 +353,5 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" - libXext 1.3.5 - libXft 2.3.8 - Tcl/Tk 8.6.13_4 -- Zlib 1.2.13 +- Zlib 1.3 From 5ffd15d845c7466f1eedda2b3e9a69c055b85d15 Mon Sep 17 00:00:00 2001 From: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com> Date: Wed, 13 Sep 2023 11:45:19 +0200 Subject: [PATCH 2182/3485] [macos] suppress xcodebuild output (#8276) --- images/macos/helpers/Xcode.Installer.psm1 | 2 +- images/macos/provision/core/xcode.ps1 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/images/macos/helpers/Xcode.Installer.psm1 b/images/macos/helpers/Xcode.Installer.psm1 index 66f5252195e5..a6ae0f3e86f5 100644 --- a/images/macos/helpers/Xcode.Installer.psm1 +++ b/images/macos/helpers/Xcode.Installer.psm1 @@ -176,7 +176,7 @@ function Install-AdditionalSimulatorRuntimes { Write-Host "Installing Simulator Runtimes for Xcode $Version ..." $xcodebuildPath = Get-XcodeToolPath -Version $Version -ToolName "xcodebuild" - Invoke-ValidateCommand "$xcodebuildPath -downloadAllPlatforms" + Invoke-ValidateCommand "$xcodebuildPath -downloadAllPlatforms" | Out-Null } function Build-XcodeSymlinks { diff --git a/images/macos/provision/core/xcode.ps1 b/images/macos/provision/core/xcode.ps1 index e7c56759fa4c..772906ab7909 100644 --- a/images/macos/provision/core/xcode.ps1 +++ b/images/macos/provision/core/xcode.ps1 @@ -41,7 +41,7 @@ $xcodeVersions | ForEach-Object { ForEach($runtime in $_.runtimes) { Write-Host "Installing Additional runtimes for Xcode '$runtime' ..." $xcodebuildPath = Get-XcodeToolPath -Version $_.link -ToolName 'xcodebuild' - Invoke-ValidateCommand "sudo $xcodebuildPath -downloadPlatform $runtime" + Invoke-ValidateCommand "sudo $xcodebuildPath -downloadPlatform $runtime" | Out-Null } } From 50f1c72a1858a90abe2a5636b2b0ac303b161ad6 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Thu, 14 Sep 2023 11:21:42 +0200 Subject: [PATCH 2183/3485] [macos] Add exclusion for macOS 13 to the Xamarin test (#8274) --- images/macos/tests/Xamarin.Tests.ps1 | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/images/macos/tests/Xamarin.Tests.ps1 b/images/macos/tests/Xamarin.Tests.ps1 index ad9e098fa111..e610dbba821b 100644 --- a/images/macos/tests/Xamarin.Tests.ps1 +++ b/images/macos/tests/Xamarin.Tests.ps1 @@ -2,10 +2,11 @@ Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1" -DisableNameChecking $os = Get-OSVersion -$MONO_VERSIONS = Get-ToolsetValue "xamarin.mono-versions" -$XAMARIN_IOS_VERSIONS = Get-ToolsetValue "xamarin.ios-versions" -$XAMARIN_MAC_VERSIONS = Get-ToolsetValue "xamarin.mac-versions" -$XAMARIN_ANDROID_VERSIONS = Get-ToolsetValue "xamarin.android-versions" +if ((-not $os.IsVentura) -and (-not $os.IsVenturaArm64)) { + $MONO_VERSIONS = Get-ToolsetValue "xamarin.mono-versions" + $XAMARIN_IOS_VERSIONS = Get-ToolsetValue "xamarin.ios-versions" + $XAMARIN_MAC_VERSIONS = Get-ToolsetValue "xamarin.mac-versions" + $XAMARIN_ANDROID_VERSIONS = Get-ToolsetValue "xamarin.android-versions" BeforeAll { function Get-ShortSymlink { @@ -297,4 +298,6 @@ Describe "Nuget" -Skip:($os.IsVentura -or $os.IsVenturaArm64) { It "Nuget config contains nuget.org feed" { Get-Content $env:HOME/.config/NuGet/NuGet.Config | Out-String | Should -Match "nuget.org" } +} + } \ No newline at end of file From 462858ccf93a76b8b3e01e8ed20caf6d14fb8a56 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 14 Sep 2023 11:09:57 +0000 Subject: [PATCH 2184/3485] Updating readme file for ubuntu20 version 20230911.1.0 (#8271) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2004-Readme.md | 75 +++++++++++++++++-------------- 1 file changed, 41 insertions(+), 34 deletions(-) diff --git a/images/linux/Ubuntu2004-Readme.md b/images/linux/Ubuntu2004-Readme.md index 1bf8ae761d49..eabbee467400 100644 --- a/images/linux/Ubuntu2004-Readme.md +++ b/images/linux/Ubuntu2004-Readme.md @@ -1,7 +1,13 @@ +| Announcements | +|-| +| [Clang 12 will be removed from Ubuntu 22.04 image on September 25](https://github.com/actions/runner-images/issues/8263) | +| [Python 3.6.x will be removed from Ubuntu 20.04 and Windows 2019 images on September 18](https://github.com/actions/runner-images/issues/8238) | +| [[All OSes] Go 1.18.x will be removed on September, 18](https://github.com/actions/runner-images/issues/8237) | +*** # Ubuntu 20.04 - OS Version: 20.04.6 LTS -- Kernel Version: 5.15.0-1045-azure -- Image Version: 20230903.1.0 +- Kernel Version: 5.15.0-1046-azure +- Image Version: 20230911.1.0 - Systemd version: 245.4-4ubuntu3.22 ## Installed Software @@ -29,7 +35,7 @@ ### Package Management - cpan 1.64 - Helm 3.12.3 -- Homebrew 4.1.7 +- Homebrew 4.1.11 - Miniconda 23.5.2 - Npm 9.6.7 - NuGet 6.6.1.2 @@ -37,7 +43,7 @@ - Pip3 20.0.2 - Pipx 1.2.0 - RubyGems 3.1.2 -- Vcpkg (build from commit 4a600e9fe) +- Vcpkg (build from commit 962e5e39f) - Yarn 1.22.19 #### Environment variables @@ -62,12 +68,12 @@ to accomplish this. - Sbt 1.9.4 ### Tools -- Ansible 2.13.11 +- Ansible 2.13.12 - apt-fast 1.9.12 - AzCopy 10.20.1 - available by `azcopy` and `azcopy10` aliases - Bazel 6.3.2 - Bazelisk 1.18.0 -- Bicep 0.20.4 +- Bicep 0.21.1 - Buildah 1.22.3 - CMake 3.27.4 - CodeQL Action Bundles 2.14.2 2.14.3 @@ -75,8 +81,8 @@ to accomplish this. - Docker Compose v1 1.29.2 - Docker Compose v2 2.21.0 - Docker-Buildx 0.11.2 -- Docker Client 24.0.5 -- Docker Server 24.0.5 +- Docker Client 24.0.6 +- Docker Server 24.0.6 - Fastlane 2.214.0 - Git 2.42.0 - Git LFS 3.4.0 @@ -100,30 +106,30 @@ to accomplish this. - Parcel 2.9.3 - PhantomJS 2.1.1 2.1.1 - Podman 3.4.2 -- Pulumi 3.80.0 +- Pulumi 3.81.0 - R 4.3.1 - Skopeo 1.5.0 - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 -- Terraform 1.5.6 +- Terraform 1.5.7 - yamllint 1.32.0 - yq 4.35.1 - zstd 1.5.5 ### CLI Tools - Alibaba Cloud CLI 3.0.174 -- AWS CLI 2.13.15 +- AWS CLI 2.13.17 - AWS CLI Session Manager Plugin 1.2.497.0 -- AWS SAM CLI 1.96.0 -- Azure CLI 2.51.0 +- AWS SAM CLI 1.97.0 +- Azure CLI 2.52.0 - Azure CLI (azure-devops) 0.26.0 -- GitHub CLI 2.33.0 -- Google Cloud SDK 444.0.0 +- GitHub CLI 2.34.0 +- Google Cloud SDK 445.0.0 - Hub CLI 2.14.2 -- Netlify CLI 16.2.0 -- OpenShift CLI 4.13.10 -- ORAS CLI 1.0.1 -- Vercel CLI 32.1.0 +- Netlify CLI 16.3.1 +- OpenShift CLI 4.13.11 +- ORAS CLI 1.1.0 +- Vercel CLI 32.2.1 ### Java | Version | Environment Variable | @@ -153,7 +159,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustup 1.26.0 #### Packages -- Bindgen 0.66.1 +- Bindgen 0.68.1 - Cargo audit 0.18.1 - Cargo clippy 0.1.72 - Cargo outdated 0.13.1 @@ -161,11 +167,11 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.6.0 ### Browsers and Drivers -- Google Chrome 116.0.5845.140 +- Google Chrome 116.0.5845.187 - ChromeDriver 116.0.5845.96 - Chromium 116.0.5845.0 -- Microsoft Edge 116.0.1938.69 -- Microsoft Edge WebDriver 116.0.1938.69 +- Microsoft Edge 116.0.1938.76 +- Microsoft Edge WebDriver 116.0.1938.76 - Selenium server 4.12.0 - Mozilla Firefox 117.0 - Geckodriver 0.33.0 @@ -183,7 +189,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - nbgv 3.6.133+2d32d93cb1 ### Databases -- MongoDB 5.0.20 +- MongoDB 5.0.21 - sqlite3 3.31.1 #### PostgreSQL @@ -211,9 +217,9 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Go - 1.18.10 -- 1.19.12 -- 1.20.7 -- 1.21.0 +- 1.19.13 +- 1.20.8 +- 1.21.1 #### Node.js - 14.21.3 @@ -250,7 +256,7 @@ Use the following command as a part of your job to start the service: 'sudo syst - Az: 9.3.0 - Az (Cached): 3.1.0.zip, 4.4.0.zip, 5.9.0.zip, 6.6.0.zip, 7.5.0.zip - MarkdownPS: 1.9 -- Microsoft.Graph: 2.4.0 +- Microsoft.Graph: 2.5.0 - Pester: 5.5.0 - PSScriptAnalyzer: 1.21.0 @@ -293,18 +299,18 @@ Use the following command as a part of your job to start the service: 'sudo syst | alpine:3.16 | sha256:a8cbb8c69ee71561f4b69c066bad07f7e510caaa523da26fbfc606b10bd7934b | 2023-08-07 | | alpine:3.17 | sha256:f71a5f071694a785e064f05fed657bf8277f1b2113a8ed70c90ad486d6ee54dc | 2023-08-07 | | alpine:3.18 | sha256:7144f7bab3d4c2648d7e59409f15ec52a18006a128c733fcff20d3a4a54ba44a | 2023-08-07 | -| buildpack-deps:bullseye | sha256:930a1ea53e70457cde2c9d449b531979475330c50366fef8d22520d676c2bb0d | 2023-08-16 | -| buildpack-deps:buster | sha256:c6cfa5c691f91c0760341abf073efe1c4b0437ad05375290b3298b8e1219de5b | 2023-08-16 | +| buildpack-deps:bullseye | sha256:ccd2a733ab835437d0d52753724b4f860a70cfd79a2bc8dcfa90c469cd0a67b5 | 2023-09-07 | +| buildpack-deps:buster | sha256:ff4e70591f2e117f3b751bf55e9102cec6f1d728159a0daaac0ceaebd7742e26 | 2023-09-07 | | buildpack-deps:stretch | sha256:78e995165a5788c2f55aed6e548d8f6c1534830d4310c870408fccb2da8c5b2e | 2022-06-23 | -| debian:10 | sha256:b86bfc1dd2fb1820fea6c1e0b6e23d155198b518b3a506f6edad71bf6e9a8cef | 2023-08-16 | -| debian:11 | sha256:1beb7cf458bdfe71b5220cb2069eb45e3fc7eb77a1ccfb169eaebf5f6c4809ab | 2023-08-16 | +| debian:10 | sha256:972a285e4630b87e839bdcc09cb6fad08956524397b4d3878a5b65a8e6c3fdee | 2023-09-07 | +| debian:11 | sha256:f33900927c0a8bcf3f0e2281fd0237f4780cc6bc59729bb3a10e75b0703c5ca7 | 2023-09-07 | | debian:9 | sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be | 2022-06-23 | | moby/buildkit:latest | sha256:890dcae054e3039f6c6b76bf0da80a130fa6e6bb1f3624063ef0210ac2c57b06 | 2023-08-24 | | node:14 | sha256:a158d3b9b4e3fa813fa6c8c590b8f0a860e015ad4e59bbce5744d2f6fd8461aa | 2023-04-12 | | node:14-alpine | sha256:434215b487a329c9e867202ff89e704d3a75e554822e07f3e0c0f9e606121b33 | 2023-03-29 | -| node:16 | sha256:818b5adc1ee4a04e8ad5efeb70871571efe414315ad7f16844f24f9962ffdc7e | 2023-08-17 | +| node:16 | sha256:f77a1aef2da8d83e45ec990f45df50f1a286c5fe8bbfb8c6e4246c6389705c0b | 2023-09-07 | | node:16-alpine | sha256:a1f9d027912b58a7c75be7716c97cfbc6d3099f3a97ed84aa490be9dee20e787 | 2023-08-10 | -| node:18 | sha256:11e9c297fc51f6f65f7d0c7c8a8581e5721f2f16de43ceff1a199fd3ef609f95 | 2023-08-17 | +| node:18 | sha256:933bcfad91e9052a02bc29eb5aa29033e542afac4174f9524b79066d97b23c24 | 2023-09-07 | | node:18-alpine | sha256:3482a20c97e401b56ac50ba8920cc7b5b2022bfc6aa7d4e4c231755770cf892f | 2023-08-10 | | ubuntu:16.04 | sha256:1f1a2d56de1d604801a9671f301190704c25d604a416f59e03c04f5c6ffee0d6 | 2021-08-31 | | ubuntu:18.04 | sha256:152dc042452c496007f07ca9127571cb9c29697f42acbfad72324b2bb2e43c98 | 2023-05-30 | @@ -400,3 +406,4 @@ Use the following command as a part of your job to start the service: 'sudo syst | xz-utils | 5.2.4-1ubuntu1.1 | | zip | 3.0-11build1 | | zsync | 0.6.2-3ubuntu1 | + From 32d213064f3575cdc6b05f3e317e8a1341cfdbac Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Thu, 14 Sep 2023 15:04:30 +0200 Subject: [PATCH 2185/3485] [macos] remove vagrant from macos 13 (#8283) --- images/macos/software-report/SoftwareReport.Generator.ps1 | 6 ++---- images/macos/tests/BasicTools.Tests.ps1 | 2 +- images/macos/toolsets/toolset-13.json | 3 +-- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1 index 58254d5aedbc..5032c798f018 100644 --- a/images/macos/software-report/SoftwareReport.Generator.ps1 +++ b/images/macos/software-report/SoftwareReport.Generator.ps1 @@ -142,11 +142,9 @@ if ((-not $os.IsVentura) -and (-not $os.IsVenturaArm64)) { $utilities.AddToolVersion("Subversion (SVN)", $(Get-SVNVersion)) $utilities.AddToolVersion("Switchaudio-osx", $(Get-SwitchAudioOsxVersion)) } -if (-not $os.IsBigSur) { +if ((-not $os.IsBigSur) -and (-not $os.IsVentura) -and (-not $os.IsVenturaArm64)) { $utilities.AddToolVersion("Vagrant", $(Get-VagrantVersion)) - if ((-not $os.IsVentura) -and (-not $os.IsVenturaArm64)) { - $utilities.AddToolVersion("VirtualBox", $(Get-VirtualBoxVersion)) - } + $utilities.AddToolVersion("VirtualBox", $(Get-VirtualBoxVersion)) } $utilities.AddToolVersion("yq", $(Get-YqVersion)) $utilities.AddToolVersion("zstd", $(Get-ZstdVersion)) diff --git a/images/macos/tests/BasicTools.Tests.ps1 b/images/macos/tests/BasicTools.Tests.ps1 index 5ca408c40ce0..345772ffe947 100644 --- a/images/macos/tests/BasicTools.Tests.ps1 +++ b/images/macos/tests/BasicTools.Tests.ps1 @@ -139,7 +139,7 @@ Describe "wget" { } } -Describe "vagrant" -Skip:($os.IsBigSur) { +Describe "vagrant" -Skip:($os.IsBigSur -or $os.IsVentura -or $os.IsVenturaArm64) { It "vagrant" { "vagrant --version" | Should -ReturnZeroExitCode } diff --git a/images/macos/toolsets/toolset-13.json b/images/macos/toolsets/toolset-13.json index 9f67c0b50066..18edac75c9dd 100644 --- a/images/macos/toolsets/toolset-13.json +++ b/images/macos/toolsets/toolset-13.json @@ -70,8 +70,7 @@ "unxip" ], "cask_packages": [ - "julia", - "vagrant" + "julia" ] }, "gcc": { From 276efb2a890cfff16ded7c4e4b366b48202dcbeb Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Thu, 14 Sep 2023 16:24:16 +0200 Subject: [PATCH 2186/3485] Remove OS selection condition (#8284) --- images.CI/linux-and-win/convert-to-vhd.ps1 | 4 ---- 1 file changed, 4 deletions(-) diff --git a/images.CI/linux-and-win/convert-to-vhd.ps1 b/images.CI/linux-and-win/convert-to-vhd.ps1 index 41ff16e1fba7..4af5b1a60587 100644 --- a/images.CI/linux-and-win/convert-to-vhd.ps1 +++ b/images.CI/linux-and-win/convert-to-vhd.ps1 @@ -95,10 +95,6 @@ $targetKey = az storage account keys list ` Write-Host ("Copying VHD blob from '{0}' to 'https://{1}.blob.core.windows.net/{2}/{3}'..." ` -f $sourceDiskUri.Split('?')[0], $StorageAccountName, $StorageAccountContainerName, $VhdName) -if ($env:OS) { - $sourceDiskUri = """{0}""" -f $sourceDiskUri -} - az storage blob copy start ` --source-uri $sourceDiskUri ` --destination-blob $VhdName ` From 2dcfa5d0657f5cf8dfc0700158cb5e40ab5f46eb Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 14 Sep 2023 15:06:29 +0000 Subject: [PATCH 2187/3485] Updating readme file for win22 version 20230910.1.0 (#8272) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2022-Readme.md | 51 ++++++++++++++++++-------------- 1 file changed, 29 insertions(+), 22 deletions(-) diff --git a/images/win/Windows2022-Readme.md b/images/win/Windows2022-Readme.md index 31fabdbb3f00..24d05e41d694 100644 --- a/images/win/Windows2022-Readme.md +++ b/images/win/Windows2022-Readme.md @@ -1,6 +1,12 @@ +| Announcements | +|-| +| [Ruby 2.4.x will be removed from the macOS 11 and Windows 2019 images on September 18](https://github.com/actions/runner-images/issues/8239) | +| [Python 3.6.x will be removed from Ubuntu 20.04 and Windows 2019 images on September 18](https://github.com/actions/runner-images/issues/8238) | +| [[All OSes] Go 1.18.x will be removed on September, 18](https://github.com/actions/runner-images/issues/8237) | +*** # Windows Server 2022 - OS Version: 10.0.20348 Build 1906 -- Image Version: 20230903.2.0 +- Image Version: 20230910.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -9,7 +15,7 @@ ### Language and Runtime - Bash 5.2.15(1)-release -- Go 1.20.7 +- Go 1.20.8 - Julia 1.9.3 - Kotlin 1.9.10 - LLVM 16.0.6 @@ -29,7 +35,7 @@ - pip 23.2.1 (python 3.9) - Pipx 1.2.0 - RubyGems 3.2.33 -- Vcpkg (build from commit 4a600e9fe) +- Vcpkg (build from commit 962e5e39f) - Yarn 1.22.19 #### Environment variables @@ -50,11 +56,11 @@ - azcopy 10.20.1 - Bazel 6.3.2 - Bazelisk 1.18.0 -- Bicep 0.20.4 +- Bicep 0.21.1 - Cabal 3.10.1.0 - CMake 3.27.4 - CodeQL Action Bundles 2.14.2 2.14.3 -- Docker 24.0.5 +- Docker 24.0.6 - Docker Compose v1 1.29.2 - Docker Compose v2 2.21.0 - Docker-wincred 0.8.0 @@ -65,14 +71,14 @@ - InnoSetup 6.2.2 - jq 1.6 - Kind 0.20.0 -- Kubectl 1.27.3 +- Kubectl 1.28.1 - Mercurial 5.0 - Mingw-w64 11.2.0 - Newman 5.3.2 - NSIS 3.08 - OpenSSL 1.1.1v - Packer 1.9.2 -- Pulumi 3.80.0 +- Pulumi 3.81.0 - R 4.3.1 - Service Fabric SDK 9.1.1436.9590 - Stack 2.11.1 @@ -85,13 +91,13 @@ - zstd 1.5.5 ### CLI Tools -- Alibaba Cloud CLI 3.0.180 -- AWS CLI 2.13.15 -- AWS SAM CLI 1.96.0 +- Alibaba Cloud CLI 3.0.181 +- AWS CLI 2.13.16 +- AWS SAM CLI 1.97.0 - AWS Session Manager CLI 1.2.497.0 -- Azure CLI 2.51.0 +- Azure CLI 2.52.0 - Azure DevOps CLI extension 0.26.0 -- GitHub CLI 2.33.0 +- GitHub CLI 2.34.0 - Hub CLI 2.14.2 ### Rust Tools @@ -101,7 +107,7 @@ - Rustup 1.26.0 #### Packages -- bindgen 0.66.1 +- bindgen 0.68.1 - cargo-audit 0.18.1 - cargo-outdated 0.13.1 - cbindgen 0.25.0 @@ -109,10 +115,10 @@ - Rustfmt 1.6.0 ### Browsers and Drivers -- Google Chrome 116.0.5845.141 +- Google Chrome 116.0.5845.180 - Chrome Driver 116.0.5845.96 -- Microsoft Edge 116.0.1938.69 -- Microsoft Edge Driver 116.0.1938.69 +- Microsoft Edge 116.0.1938.76 +- Microsoft Edge Driver 116.0.1938.76 - Mozilla Firefox 117.0 - Gecko Driver 0.33.0 - IE Driver 4.11.0.0 @@ -154,9 +160,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Go - 1.18.10 -- 1.19.12 -- 1.20.7 -- 1.21.0 +- 1.19.13 +- 1.20.8 +- 1.21.1 #### Node.js - 14.21.3 @@ -199,7 +205,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### MongoDB | Version | ServiceName | ServiceStatus | ServiceStartType | | -------- | ----------- | ------------- | ---------------- | -| 5.0.20.0 | MongoDB | Stopped | Disabled | +| 5.0.21.0 | MongoDB | Stopped | Disabled | ### Database tools - Azure CosmosDb Emulator 2.14.12.0 @@ -565,10 +571,10 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Az (Cached): 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.407 +- AWSPowershell: 4.1.411 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 -- Microsoft.Graph: 2.4.0 +- Microsoft.Graph: 2.5.0 - Pester: 3.4.0, 5.5.0 - PowerShellGet: 1.0.0.1, 2.2.5 - PSScriptAnalyzer: 1.21.0 @@ -614,3 +620,4 @@ All other versions are saved but not installed. | mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:ed059488bf55bdb47598574ce042dceee5f8c4923a332618ceddcdcce7d2a7f7 | 2023-08-08 | | mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:385844aa0840c876ffd207643c709355ad68e906013961dac4b347e37bccb98a | 2023-08-03 | | mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:f1974546e8a73746e6c60781895341dd7a6760e28534d3d0cc5f3c88c1f5825a | 2023-08-03 | + From ffab35113c309a06a734e8369642113cc3084e85 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 14 Sep 2023 16:27:52 +0000 Subject: [PATCH 2188/3485] Updating readme file for ubuntu22 version 20230911.1.0 (#8270) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2204-Readme.md | 77 +++++++++++++++++-------------- 1 file changed, 42 insertions(+), 35 deletions(-) diff --git a/images/linux/Ubuntu2204-Readme.md b/images/linux/Ubuntu2204-Readme.md index 0ca80612d6d4..b4554ed9d7e3 100644 --- a/images/linux/Ubuntu2204-Readme.md +++ b/images/linux/Ubuntu2204-Readme.md @@ -1,7 +1,13 @@ +| Announcements | +|-| +| [Clang 12 will be removed from Ubuntu 22.04 image on September 25](https://github.com/actions/runner-images/issues/8263) | +| [Python 3.6.x will be removed from Ubuntu 20.04 and Windows 2019 images on September 18](https://github.com/actions/runner-images/issues/8238) | +| [[All OSes] Go 1.18.x will be removed on September, 18](https://github.com/actions/runner-images/issues/8237) | +*** # Ubuntu 22.04 - OS Version: 22.04.3 LTS -- Kernel Version: 5.15.0-1041-azure -- Image Version: 20230903.1.0 +- Kernel Version: 6.2.0-1011-azure +- Image Version: 20230911.1.0 - Systemd version: 249.11-0ubuntu3.9 ## Installed Software @@ -10,7 +16,7 @@ - Bash 5.1.16(1)-release - Clang: 12.0.1, 13.0.1, 14.0.0 - Clang-format: 12.0.1, 13.0.1, 14.0.0 -- Clang-tidy: 12.0.1, 13.0.1, 14.0.0 +- Clang-tidy: 12.0.1, 13.0.1, 14.0.0, 15.0.7 - Dash 0.5.11+git20210903+057cd650a4ed-3build1 - GNU C++: 9.5.0, 10.5.0, 11.4.0, 12.3.0 - GNU Fortran: 9.5.0, 10.5.0, 11.4.0, 12.3.0 @@ -27,7 +33,7 @@ ### Package Management - cpan 1.64 - Helm 3.12.3 -- Homebrew 4.1.7 +- Homebrew 4.1.11 - Miniconda 23.5.2 - Npm 9.6.7 - NuGet 6.6.1.2 @@ -35,7 +41,7 @@ - Pip3 22.0.2 - Pipx 1.2.0 - RubyGems 3.3.5 -- Vcpkg (build from commit 4a600e9fe) +- Vcpkg (build from commit 962e5e39f) - Yarn 1.22.19 #### Environment variables @@ -57,12 +63,12 @@ to accomplish this. - Maven 3.8.8 ### Tools -- Ansible 2.15.3 +- Ansible 2.15.4 - apt-fast 1.9.12 - AzCopy 10.20.1 - available by `azcopy` and `azcopy10` aliases - Bazel 6.3.2 - Bazelisk 1.18.0 -- Bicep 0.20.4 +- Bicep 0.21.1 - Buildah 1.23.1 - CMake 3.27.4 - CodeQL Action Bundles 2.14.2 2.14.3 @@ -70,8 +76,8 @@ to accomplish this. - Docker Compose v1 1.29.2 - Docker Compose v2 2.21.0 - Docker-Buildx 0.11.2 -- Docker Client 24.0.5 -- Docker Server 24.0.5 +- Docker Client 24.0.6 +- Docker Server 24.0.6 - Fastlane 2.214.0 - Git 2.42.0 - Git LFS 3.4.0 @@ -93,30 +99,30 @@ to accomplish this. - Packer 1.9.4 - Parcel 2.9.3 - Podman 3.4.4 -- Pulumi 3.80.0 +- Pulumi 3.81.0 - R 4.3.1 - Skopeo 1.4.1 - Sphinx Open Source Search Server 2.2.11 - SVN 1.14.1 -- Terraform 1.5.6 +- Terraform 1.5.7 - yamllint 1.32.0 - yq 4.35.1 - zstd 1.5.5 ### CLI Tools -- Alibaba Cloud CLI 3.0.180 -- AWS CLI 2.13.15 +- Alibaba Cloud CLI 3.0.181 +- AWS CLI 2.13.17 - AWS CLI Session Manager Plugin 1.2.497.0 -- AWS SAM CLI 1.96.0 -- Azure CLI 2.51.0 +- AWS SAM CLI 1.97.0 +- Azure CLI 2.52.0 - Azure CLI (azure-devops) 0.26.0 -- GitHub CLI 2.33.0 -- Google Cloud SDK 444.0.0 +- GitHub CLI 2.34.0 +- Google Cloud SDK 445.0.0 - Hub CLI 2.14.2 -- Netlify CLI 16.2.0 -- OpenShift CLI 4.13.10 -- ORAS CLI 1.0.1 -- Vercel CLI 32.1.0 +- Netlify CLI 16.3.1 +- OpenShift CLI 4.13.11 +- ORAS CLI 1.1.0 +- Vercel CLI 32.2.1 ### Java | Version | Environment Variable | @@ -146,7 +152,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustup 1.26.0 #### Packages -- Bindgen 0.66.1 +- Bindgen 0.68.1 - Cargo audit 0.18.1 - Cargo clippy 0.1.72 - Cargo outdated 0.13.1 @@ -154,11 +160,11 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.6.0 ### Browsers and Drivers -- Google Chrome 116.0.5845.140 +- Google Chrome 116.0.5845.187 - ChromeDriver 116.0.5845.96 - Chromium 116.0.5845.0 -- Microsoft Edge 116.0.1938.69 -- Microsoft Edge WebDriver 116.0.1938.69 +- Microsoft Edge 116.0.1938.76 +- Microsoft Edge WebDriver 116.0.1938.76 - Selenium server 4.12.0 - Mozilla Firefox 117.0 - Geckodriver 0.33.0 @@ -203,9 +209,9 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Go - 1.18.10 -- 1.19.12 -- 1.20.7 -- 1.21.0 +- 1.19.13 +- 1.20.8 +- 1.21.1 #### Node.js - 14.21.3 @@ -234,7 +240,7 @@ Use the following command as a part of your job to start the service: 'sudo syst #### PowerShell Modules - Az: 9.3.0 - MarkdownPS: 1.9 -- Microsoft.Graph: 2.4.0 +- Microsoft.Graph: 2.5.0 - Pester: 5.5.0 - PSScriptAnalyzer: 1.21.0 @@ -276,16 +282,16 @@ Use the following command as a part of your job to start the service: 'sudo syst | alpine:3.16 | sha256:a8cbb8c69ee71561f4b69c066bad07f7e510caaa523da26fbfc606b10bd7934b | 2023-08-07 | | alpine:3.17 | sha256:f71a5f071694a785e064f05fed657bf8277f1b2113a8ed70c90ad486d6ee54dc | 2023-08-07 | | alpine:3.18 | sha256:7144f7bab3d4c2648d7e59409f15ec52a18006a128c733fcff20d3a4a54ba44a | 2023-08-07 | -| buildpack-deps:bullseye | sha256:930a1ea53e70457cde2c9d449b531979475330c50366fef8d22520d676c2bb0d | 2023-08-16 | -| buildpack-deps:buster | sha256:c6cfa5c691f91c0760341abf073efe1c4b0437ad05375290b3298b8e1219de5b | 2023-08-16 | -| debian:10 | sha256:b86bfc1dd2fb1820fea6c1e0b6e23d155198b518b3a506f6edad71bf6e9a8cef | 2023-08-16 | -| debian:11 | sha256:1beb7cf458bdfe71b5220cb2069eb45e3fc7eb77a1ccfb169eaebf5f6c4809ab | 2023-08-16 | +| buildpack-deps:bullseye | sha256:ccd2a733ab835437d0d52753724b4f860a70cfd79a2bc8dcfa90c469cd0a67b5 | 2023-09-07 | +| buildpack-deps:buster | sha256:ff4e70591f2e117f3b751bf55e9102cec6f1d728159a0daaac0ceaebd7742e26 | 2023-09-07 | +| debian:10 | sha256:972a285e4630b87e839bdcc09cb6fad08956524397b4d3878a5b65a8e6c3fdee | 2023-09-07 | +| debian:11 | sha256:f33900927c0a8bcf3f0e2281fd0237f4780cc6bc59729bb3a10e75b0703c5ca7 | 2023-09-07 | | moby/buildkit:latest | sha256:890dcae054e3039f6c6b76bf0da80a130fa6e6bb1f3624063ef0210ac2c57b06 | 2023-08-24 | | node:14 | sha256:a158d3b9b4e3fa813fa6c8c590b8f0a860e015ad4e59bbce5744d2f6fd8461aa | 2023-04-12 | | node:14-alpine | sha256:434215b487a329c9e867202ff89e704d3a75e554822e07f3e0c0f9e606121b33 | 2023-03-29 | -| node:16 | sha256:818b5adc1ee4a04e8ad5efeb70871571efe414315ad7f16844f24f9962ffdc7e | 2023-08-17 | +| node:16 | sha256:f77a1aef2da8d83e45ec990f45df50f1a286c5fe8bbfb8c6e4246c6389705c0b | 2023-09-07 | | node:16-alpine | sha256:a1f9d027912b58a7c75be7716c97cfbc6d3099f3a97ed84aa490be9dee20e787 | 2023-08-10 | -| node:18 | sha256:11e9c297fc51f6f65f7d0c7c8a8581e5721f2f16de43ceff1a199fd3ef609f95 | 2023-08-17 | +| node:18 | sha256:933bcfad91e9052a02bc29eb5aa29033e542afac4174f9524b79066d97b23c24 | 2023-09-07 | | node:18-alpine | sha256:3482a20c97e401b56ac50ba8920cc7b5b2022bfc6aa7d4e4c231755770cf892f | 2023-08-10 | | ubuntu:18.04 | sha256:152dc042452c496007f07ca9127571cb9c29697f42acbfad72324b2bb2e43c98 | 2023-05-30 | | ubuntu:20.04 | sha256:33a5cc25d22c45900796a1aca487ad7a7cb09f09ea00b779e3b2026b4fc2faba | 2023-08-01 | @@ -383,3 +389,4 @@ Use the following command as a part of your job to start the service: 'sudo syst | xz-utils | 5.2.5-2ubuntu1 | | zip | 3.0-12build2 | | zsync | 0.6.2-3ubuntu1 | + From e7ff445c6086ae8b45bc7243243e650f8653a881 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 14 Sep 2023 18:32:39 +0000 Subject: [PATCH 2189/3485] Updating readme file for win19 version 20230912.1.0 (#8278) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2019-Readme.md | 81 +++++++++++++++++--------------- 1 file changed, 44 insertions(+), 37 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index e18363d24806..a0d5ce8900d2 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -1,6 +1,12 @@ +| Announcements | +|-| +| [Ruby 2.4.x will be removed from the macOS 11 and Windows 2019 images on September 18](https://github.com/actions/runner-images/issues/8239) | +| [Python 3.6.x will be removed from Ubuntu 20.04 and Windows 2019 images on September 18](https://github.com/actions/runner-images/issues/8238) | +| [[All OSes] Go 1.18.x will be removed on September, 18](https://github.com/actions/runner-images/issues/8237) | +*** # Windows Server 2019 -- OS Version: 10.0.17763 Build 4737 -- Image Version: 20230903.1.0 +- OS Version: 10.0.17763 Build 4851 +- Image Version: 20230912.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -9,7 +15,7 @@ ### Language and Runtime - Bash 5.2.15(1)-release -- Go 1.20.7 +- Go 1.20.8 - Julia 1.9.3 - Kotlin 1.9.10 - LLVM 16.0.6 @@ -29,7 +35,7 @@ - pip 23.2.1 (python 3.7) - Pipx 1.2.0 - RubyGems 2.7.6.3 -- Vcpkg (build from commit 4a600e9fe) +- Vcpkg (build from commit da21e45c9) - Yarn 1.22.19 #### Environment variables @@ -50,31 +56,31 @@ - azcopy 10.20.1 - Bazel 6.3.2 - Bazelisk 1.18.0 -- Bicep 0.20.4 +- Bicep 0.21.1 - Cabal 3.10.1.0 - CMake 3.27.4 - CodeQL Action Bundles 2.14.2 2.14.3 -- Docker 24.0.5 +- Docker 24.0.6 - Docker Compose v1 1.29.2 - Docker Compose v2 2.21.0 - Docker-wincred 0.8.0 - ghc 9.6.2 - Git 2.42.0.windows.2 - Git LFS 3.4.0 -- Google Cloud SDK 444.0.0 +- Google Cloud SDK 446.0.0 - ImageMagick 7.1.1-15 - InnoSetup 6.2.2 - jq 1.6 - Kind 0.20.0 -- Kubectl 1.27.3 +- Kubectl 1.28.1 - Mercurial 5.0 - Mingw-w64 8.1.0 - Newman 5.3.2 - NSIS 3.08 -- OpenSSL 1.1.1v +- OpenSSL 1.1.1i - Packer 1.9.2 - Parcel 2.9.3 -- Pulumi 3.80.0 +- Pulumi 3.81.0 - R 4.3.1 - Service Fabric SDK 9.1.1436.9590 - Stack 2.11.1 @@ -87,14 +93,14 @@ - zstd 1.5.5 ### CLI Tools -- Alibaba Cloud CLI 3.0.180 -- AWS CLI 2.13.15 -- AWS SAM CLI 1.96.0 +- Alibaba Cloud CLI 3.0.181 +- AWS CLI 2.13.16 +- AWS SAM CLI 1.97.0 - AWS Session Manager CLI 1.2.497.0 -- Azure CLI 2.51.0 +- Azure CLI 2.52.0 - Azure DevOps CLI extension 0.26.0 - Cloud Foundry CLI 6.53.0 -- GitHub CLI 2.33.0 +- GitHub CLI 2.34.0 - Hub CLI 2.14.2 ### Rust Tools @@ -104,7 +110,7 @@ - Rustup 1.26.0 #### Packages -- bindgen 0.66.1 +- bindgen 0.68.1 - cargo-audit 0.18.1 - cargo-outdated 0.13.1 - cbindgen 0.25.0 @@ -112,11 +118,11 @@ - Rustfmt 1.6.0 ### Browsers and Drivers -- Google Chrome 116.0.5845.141 -- Chrome Driver 116.0.5845.96 -- Microsoft Edge 116.0.1938.69 -- Microsoft Edge Driver 116.0.1938.69 -- Mozilla Firefox 117.0 +- Google Chrome 117.0.5938.63 +- Chrome Driver 117.0.5938.62 +- Microsoft Edge 116.0.1938.76 +- Microsoft Edge Driver 116.0.1938.76 +- Mozilla Firefox 117.0.1 - Gecko Driver 0.33.0 - IE Driver 4.11.0.0 - Selenium server 4.12.0 @@ -160,9 +166,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Go - 1.18.10 -- 1.19.12 -- 1.20.7 -- 1.21.0 +- 1.19.13 +- 1.20.8 +- 1.21.1 #### Node.js - 14.21.3 @@ -210,7 +216,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### MongoDB | Version | ServiceName | ServiceStatus | ServiceStartType | | -------- | ----------- | ------------- | ---------------- | -| 5.0.20.0 | MongoDB | Stopped | Disabled | +| 5.0.21.0 | MongoDB | Stopped | Disabled | ### Database tools - Azure CosmosDb Emulator 2.14.12.0 @@ -226,14 +232,14 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Nginx | 1.25.2 | C:\tools\nginx-1.25.2\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2019 -| Name | Version | Path | -| ----------------------------- | --------------- | -------------------------------------------------------------- | -| Visual Studio Enterprise 2019 | 16.11.33927.289 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | +| Name | Version | Path | +| ----------------------------- | -------------- | -------------------------------------------------------------- | +| Visual Studio Enterprise 2019 | 16.11.34031.81 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | #### Workloads, components and extensions | Package | Version | | ------------------------------------------------------------------------- | --------------- | -| Component.Android.NDK.R16B | 16.11.33925.288 | +| Component.Android.NDK.R16B | 16.11.34031.81 | | Component.Android.SDK25.Private | 16.0.28625.61 | | Component.Android.SDK30 | 16.10.31205.252 | | Component.Ant | 1.9.3.8 | @@ -491,11 +497,11 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 10.0.22621.0 ### .NET Core Tools -- .NET Core SDK: 6.0.121, 6.0.203, 6.0.316, 6.0.413 +- .NET Core SDK: 6.0.122, 6.0.203, 6.0.317, 6.0.414 - .NET Framework: 4.7.2, 4.8 -- Microsoft.AspNetCore.App: 6.0.5, 6.0.21 -- Microsoft.NETCore.App: 6.0.5, 6.0.21 -- Microsoft.WindowsDesktop.App: 6.0.5, 6.0.21 +- Microsoft.AspNetCore.App: 6.0.5, 6.0.22 +- Microsoft.NETCore.App: 6.0.5, 6.0.22 +- Microsoft.WindowsDesktop.App: 6.0.5, 6.0.22 - nbgv 3.6.133+2d32d93cb1 ### PowerShell Tools @@ -508,10 +514,10 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Az (Cached): 1.0.0.zip, 1.6.0.zip, 2.3.2.zip, 2.6.0.zip, 3.1.0.zip, 3.5.0.zip, 3.8.0.zip, 4.3.0.zip, 4.4.0.zip, 4.7.0.zip, 5.5.0.zip, 5.9.0.zip, 6.6.0.zip, 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.407 +- AWSPowershell: 4.1.412 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 -- Microsoft.Graph: 2.4.0 +- Microsoft.Graph: 2.5.0 - Pester: 3.4.0, 5.5.0 - PowerShellGet: 1.0.0.1, 2.2.5 - PSScriptAnalyzer: 1.21.0 @@ -556,5 +562,6 @@ All other versions are saved but not installed. | mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:65945f57f4fe7da7a8fcf9f4deb406bef640d8acb4d58ed482cddb173b24b165 | 2023-08-08 | | mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:7ec4e85a7271b680162d7643a102cae0d7c869c80992eb70416fee45fc62acc3 | 2023-08-08 | | mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:1b3c35fc580fe7b5c837b700e336313c47b1ada0708be0b568b909a2a11efe67 | 2023-08-08 | -| mcr.microsoft.com/windows/nanoserver:1809 | sha256:8f37d0675b1526a2c1a62032ec27cc5a1c3005505c7cc1a02fbd6b17c49128e3 | 2023-08-02 | -| mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:b90fc3f0259aa56a97616946f6f5d061bd54c3d5c08d2eaff482fd56ab95a6f4 | 2023-08-02 | +| mcr.microsoft.com/windows/nanoserver:1809 | sha256:4bb2610b0e4f848e81d091cba672b0308a8eebf6c4a4f006e9c4c12b85d1823e | 2023-08-29 | +| mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:3cba12bffca83466997158c8a0d38f20a18fb14f5ec62cd6454dfdd328278d87 | 2023-08-29 | + From 734a8c8e9d5164d0158c454e0b93922d2ec6b169 Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Thu, 14 Sep 2023 21:25:24 +0200 Subject: [PATCH 2190/3485] [windows2019] Remove Python 3.6 (#8291) --- images/win/toolsets/toolset-2019.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index db520b17ae8c..8647bb0ee01c 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -20,7 +20,6 @@ "arch": "x64", "platform" : "win32", "versions": [ - "3.6.*", "3.7.*", "3.8.*", "3.9.*", @@ -35,7 +34,6 @@ "arch": "x86", "platform" : "win32", "versions": [ - "3.6.*", "3.7.*", "3.8.*", "3.9.*", From 9a07550a9e01ac9c54b98e732990e22415b20141 Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Thu, 14 Sep 2023 21:46:26 +0200 Subject: [PATCH 2191/3485] [ubuntu20.04] Remove Python 3.6 (#8292) --- images/linux/toolsets/toolset-2004.json | 1 - 1 file changed, 1 deletion(-) diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index 228168c532bc..9c3c4c3e7338 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -7,7 +7,6 @@ "platform_version": "20.04", "arch": "x64", "versions": [ - "3.6.*", "3.7.*", "3.8.*", "3.9.*", From 14094ed9ed7981ecdd6a55b9951f3cd8e5119aef Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Thu, 14 Sep 2023 21:48:49 +0200 Subject: [PATCH 2192/3485] [macos11] Remove Ruby 2.4 from toolcache (#8289) --- images/macos/toolsets/toolset-11.json | 1 - 1 file changed, 1 deletion(-) diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index cb426de76644..ce0540960fb8 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -298,7 +298,6 @@ "arch": { "x64": { "versions": [ - "2.4.*", "2.5.*", "2.6.*", "2.7.*", From f23546c95324b0c5e234165e8fdd318cb9d40dd1 Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Thu, 14 Sep 2023 22:05:24 +0200 Subject: [PATCH 2193/3485] [macos] Add Xcode15 rc1 (#8288) --- images/macos/toolsets/toolset-13.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/macos/toolsets/toolset-13.json b/images/macos/toolsets/toolset-13.json index 18edac75c9dd..cf5818d27b65 100644 --- a/images/macos/toolsets/toolset-13.json +++ b/images/macos/toolsets/toolset-13.json @@ -3,7 +3,7 @@ "default": "14.3.1", "x64": { "versions": [ - { "link": "15.0", "version": "15.0.0-Beta.8+15A5229m", "runtimes": [ "visionOS" ] }, + { "link": "15.0", "version": "15.0.0-Release.Candidate+15A240d"}, { "link": "14.3.1", "version": "14.3.1+14E300c","symlinks": ["14.3"] }, { "link": "14.2", "version": "14.2.0+14C18" }, { "link": "14.1", "version": "14.1.0+14B47b" } @@ -11,7 +11,7 @@ }, "arm64":{ "versions": [ - { "link": "15.0", "version": "15.0.0-Beta.8+15A5229m", "runtimes": [ "visionOS" ] }, + { "link": "15.0", "version": "15.0.0-Release.Candidate+15A240d"}, { "link": "14.3.1", "version": "14.3.1+14E300c","symlinks": ["14.3"] }, { "link": "14.2", "version": "14.2.0+14C18" }, { "link": "14.1", "version": "14.1.0+14B47b" } From 27777e9f102287c619268ce96ab5d894ae20282d Mon Sep 17 00:00:00 2001 From: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com> Date: Thu, 14 Sep 2023 22:17:45 +0200 Subject: [PATCH 2194/3485] [windows] disabling windows defender scheduled task (#8285) it turned out that windows defender creates deleted tasks. proper way of disabling is Set-MpPreference -ScanScheduleDay 8 --- images/win/scripts/Installers/Configure-Antivirus.ps1 | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/images/win/scripts/Installers/Configure-Antivirus.ps1 b/images/win/scripts/Installers/Configure-Antivirus.ps1 index 6323fa1c75ed..d4aed1985cc5 100644 --- a/images/win/scripts/Installers/Configure-Antivirus.ps1 +++ b/images/win/scripts/Installers/Configure-Antivirus.ps1 @@ -17,6 +17,7 @@ $avPreference = @( @{SubmitSamplesConsent = 2} @{ScanAvgCPULoadFactor = 5; ExclusionPath = @("D:\", "C:\")} @{DisableRealtimeMonitoring = $true} + @{ScanScheduleDay = 8} ) $avPreference += @( @@ -29,9 +30,6 @@ $avPreference | Foreach-Object { Set-MpPreference @avParams } -Write-Host "Disable Windows Defender scheduled tasks" -Get-ScheduledTask -TaskPath '\Microsoft\Windows\Windows Defender\' | Disable-ScheduledTask | Out-Null - # https://github.com/actions/runner-images/issues/4277 # https://docs.microsoft.com/en-us/microsoft-365/security/defender-endpoint/microsoft-defender-antivirus-compatibility?view=o365-worldwide $atpRegPath = 'HKLM:\SOFTWARE\Policies\Microsoft\Windows Advanced Threat Protection' From 79ed5c1ac1f7d459fdc218ffdb497b664a0a21ae Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Fri, 15 Sep 2023 09:51:32 +0200 Subject: [PATCH 2195/3485] [windows2019] Remove Ruby 2.4 (#8290) --- images/win/toolsets/toolset-2019.json | 1 - 1 file changed, 1 deletion(-) diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index 8647bb0ee01c..6d1a3931ec85 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -5,7 +5,6 @@ "arch": "x64", "platform" : "win32", "versions": [ - "2.4", "2.5", "2.6", "2.7", From fa9f2bc4a36943bb45e61cd1544ac280d95df2f5 Mon Sep 17 00:00:00 2001 From: sergei-pyshnoi <121864472+sergei-pyshnoi@users.noreply.github.com> Date: Fri, 15 Sep 2023 12:17:27 +0200 Subject: [PATCH 2196/3485] [windows] update version mingw => 12.2.0.03042023 (#8287) --- images/win/toolsets/toolset-2022.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index 9e4fa125814e..23f4ed0b3496 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -151,7 +151,7 @@ } }, "mingw": { - "version": "11.2.0.07112021" + "version": "12.2.0.03042023" }, "MsysPackages": { "msys2": [], From 329ed9bb081640ffccd2755514c3393945f444ee Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Fri, 15 Sep 2023 14:32:34 +0200 Subject: [PATCH 2197/3485] Adjust MacOs13 arm64 base image generation script (#8303) --- images.CI/macos/anka/Service.Helpers.psm1 | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/images.CI/macos/anka/Service.Helpers.psm1 b/images.CI/macos/anka/Service.Helpers.psm1 index 94ee6a68957e..b6b9d23113fb 100644 --- a/images.CI/macos/anka/Service.Helpers.psm1 +++ b/images.CI/macos/anka/Service.Helpers.psm1 @@ -63,11 +63,11 @@ function Get-AvailableIPSWVersions { ) if ($IsBeta) { - $command = { mist list installer "$MacOSCodeNameOrVersion" --include-betas --latest --export "/Applications/export.json"} + $command = { mist list firmware "$MacOSCodeNameOrVersion" --include-betas --latest --export "/Applications/export.json"} } elseif ($IsLatest) { - $command = { mist list installer "$MacOSCodeNameOrVersion" --latest --export "/Applications/export.json" } + $command = { mist list firmware "$MacOSCodeNameOrVersion" --latest --export "/Applications/export.json" } } else { - $command = { mist list installer "$MacOSCodeNameOrVersion" --export "/Applications/export.json" } + $command = { mist list firmware "$MacOSCodeNameOrVersion" --export "/Applications/export.json" } } $condition = { $LASTEXITCODE -eq 0 } @@ -76,7 +76,7 @@ function Get-AvailableIPSWVersions { $turgetVersion = ($softwareList | ConvertFrom-Json).version if ($null -eq $turgetVersion) { Write-Host "Requested macOS '$MacOSCodeNameOrVersion' version not found in the list of available installers." - $command = { mist list installer "$($MacOSCodeNameOrVersion.split('.')[0])" } + $command = { mist list firmware "$($MacOSCodeNameOrVersion.split('.')[0])" } Invoke-WithRetry -Command $command -BreakCondition $condition exit 1 } @@ -133,6 +133,7 @@ function Get-MacOSIPSWInstaller { } return $result } + function Get-MacOSInstaller { param ( [Parameter(Mandatory)] From 7704a85e7f0a0dcab94608297f5bf99266f098dd Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Fri, 15 Sep 2023 15:58:25 +0200 Subject: [PATCH 2198/3485] [ubuntu] Remove Go 1.18.x (#8302) --- images/linux/toolsets/toolset-2004.json | 1 - images/linux/toolsets/toolset-2204.json | 1 - 2 files changed, 2 deletions(-) diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index 9c3c4c3e7338..89012b384857 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -44,7 +44,6 @@ "arch": "x64", "platform" : "linux", "versions": [ - "1.18.*", "1.19.*", "1.20.*", "1.21.*" diff --git a/images/linux/toolsets/toolset-2204.json b/images/linux/toolsets/toolset-2204.json index 0f7037b2adfd..d961d51928ed 100644 --- a/images/linux/toolsets/toolset-2204.json +++ b/images/linux/toolsets/toolset-2204.json @@ -42,7 +42,6 @@ "arch": "x64", "platform" : "linux", "versions": [ - "1.18.*", "1.19.*", "1.20.*", "1.21.*" From b19da9c52d42c5098d335164bc87257b23c750ff Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Fri, 15 Sep 2023 21:03:27 +0200 Subject: [PATCH 2199/3485] [macos] Remove Go 1.18x (#8300) --- images/macos/toolsets/toolset-11.json | 1 - images/macos/toolsets/toolset-12.json | 1 - 2 files changed, 2 deletions(-) diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index ce0540960fb8..fb31c4ed1c9c 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -285,7 +285,6 @@ "x64": { "variable_template" : "GOROOT_{0}_{1}_X64", "versions": [ - "1.18.*", "1.19.*", "1.20.*", "1.21.*" diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index 075f7527031d..9852756f30a2 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -272,7 +272,6 @@ "x64": { "variable_template" : "GOROOT_{0}_{1}_X64", "versions": [ - "1.18.*", "1.19.*", "1.20.*", "1.21.*" From 824743a42922d7e646a07090578b98aff22f43fc Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Fri, 15 Sep 2023 21:06:16 +0200 Subject: [PATCH 2200/3485] [windows] Remove Go 1.18x (#8301) --- images/win/toolsets/toolset-2019.json | 1 - images/win/toolsets/toolset-2022.json | 1 - 2 files changed, 2 deletions(-) diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index 6d1a3931ec85..7b349912803f 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -70,7 +70,6 @@ "arch": "x64", "platform" : "win32", "versions": [ - "1.18.*", "1.19.*", "1.20.*", "1.21.*" diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index 23f4ed0b3496..e93c13eba7a0 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -67,7 +67,6 @@ "arch": "x64", "platform" : "win32", "versions": [ - "1.18.*", "1.19.*", "1.20.*", "1.21.*" From 68e600ace0ca580ac83521a20913fe6f585868ae Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Mon, 18 Sep 2023 12:00:27 +0200 Subject: [PATCH 2201/3485] [Windows] Add some helpers to work with checksums (#8262) --- .../scripts/ImageHelpers/ImageHelpers.psm1 | 2 + .../scripts/ImageHelpers/InstallHelpers.ps1 | 57 +++++++++++++++++++ 2 files changed, 59 insertions(+) diff --git a/images/win/scripts/ImageHelpers/ImageHelpers.psm1 b/images/win/scripts/ImageHelpers/ImageHelpers.psm1 index a83ab7831ebb..779ca579b650 100644 --- a/images/win/scripts/ImageHelpers/ImageHelpers.psm1 +++ b/images/win/scripts/ImageHelpers/ImageHelpers.psm1 @@ -55,4 +55,6 @@ Export-ModuleMember -Function @( 'Get-WindowsUpdatesHistory' 'New-ItemPath' 'Get-ModuleVersionAsJob' + 'Use-ChecksumСomparison' + 'Get-HashFromGitHubReleaseBody' ) diff --git a/images/win/scripts/ImageHelpers/InstallHelpers.ps1 b/images/win/scripts/ImageHelpers/InstallHelpers.ps1 index e727de9cae56..c482515f889f 100644 --- a/images/win/scripts/ImageHelpers/InstallHelpers.ps1 +++ b/images/win/scripts/ImageHelpers/InstallHelpers.ps1 @@ -630,3 +630,60 @@ function Get-GitHubPackageDownloadUrl { return $downloadUrl } +function Use-ChecksumСomparison { + param ( + [Parameter(Mandatory=$true)] + [string]$LocalFileHash, + [Parameter(Mandatory=$true)] + [string]$DistributorFileHash + ) + + Write-Verbose "Performing checksum verification" + + if ($LocalFileHash -ne $DistributorFileHash) { + throw "Checksum verification failed. Expected hash: $DistributorFileHash; Actual hash: $LocalFileHash." + } else { + Write-Verbose "Checksum verification passed" + } +} + +function Get-HashFromGitHubReleaseBody { + param ( + [string]$RepoOwner, + [string]$RepoName, + [Parameter(Mandatory=$true)] + [string]$FileName, + [string]$Url, + [string]$Version = "latest", + [boolean]$IsPrerelease = $false, + [int]$SearchInCount = 100, + [string]$Delimiter = '|', + [int]$WordNumber = 1 + ) + + if ($Url) { + $releaseUrl = $Url + } else { + if ($Version -eq "latest") { + $releaseUrl = "https://api.github.com/repos/${RepoOwner}/${RepoName}/releases/latest" + } else { + $json = Invoke-RestMethod -Uri "https://api.github.com/repos/${RepoOwner}/${RepoName}/releases?per_page=${SearchInCount}" + $tags = $json.Where{ $_.prerelease -eq $IsPrerelease }.tag_name + $tag = $tags -match $Version + if (-not $tag) { + throw "Failed to get a tag name for version $Version." + } + $releaseUrl = "https://api.github.com/repos/${RepoOwner}/${RepoName}/releases/tag/$tag" + } + } + $body = (Invoke-RestMethod -Uri $releaseUrl).body -replace('`', "") -join "`n" + $matchingLine = $body.Split("`n") | Where-Object { $_ -like "*$FileName*" } + if ([string]::IsNullOrEmpty($matchingLine)) { + throw "File name '$FileName' not found in release body." + } + $result = $matchingLine.Split($Delimiter)[$WordNumber] -replace "[^a-zA-Z0-9]", "" + if ([string]::IsNullOrEmpty($result)) { + throw "Empty result. Check Split method parameters (delimiter and/or word number) for the matching line." + } + return $result +} From 2633136009ac213ba5474bd17080bc8f9e8c66d0 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Mon, 18 Sep 2023 16:01:58 +0200 Subject: [PATCH 2202/3485] [Windows] Update VM and Disk sizes in packer (#8311) --- images/win/windows2019.json | 4 +++- images/win/windows2022.json | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/images/win/windows2019.json b/images/win/windows2019.json index 4eb1ae07b9cd..48c95a21fb04 100644 --- a/images/win/windows2019.json +++ b/images/win/windows2019.json @@ -7,6 +7,7 @@ "tenant_id": "{{env `ARM_TENANT_ID`}}", "object_id": "{{env `ARM_OBJECT_ID`}}", "managed_image_resource_group_name": "{{env `ARM_RESOURCE_GROUP`}}", + "managed_image_storage_account_type": "Premium_LRS", "build_resource_group_name": "{{env `BUILD_RESOURCE_GROUP_NAME`}}", "temp_resource_group_name": "{{env `TEMP_RESOURCE_GROUP_NAME`}}", "location": "{{env `ARM_RESOURCE_LOCATION`}}", @@ -15,7 +16,7 @@ "virtual_network_subnet_name": "{{env `VNET_SUBNET`}}", "private_virtual_network_with_public_ip": "{{env `PRIVATE_VIRTUAL_NETWORK_WITH_PUBLIC_IP`}}", "allowed_inbound_ip_addresses": "{{env `AGENT_IP`}}", - "vm_size": "Standard_D8s_v4", + "vm_size": "Standard_F8s_v2", "image_folder": "C:\\image", "imagedata_file": "C:\\imagedata.json", "helper_script_folder": "C:\\Program Files\\WindowsPowerShell\\Modules\\", @@ -45,6 +46,7 @@ "vm_size": "{{user `vm_size`}}", "managed_image_name": "{{user `managed_image_name`}}", "managed_image_resource_group_name": "{{user `managed_image_resource_group_name`}}", + "managed_image_storage_account_type": "{{user `managed_image_storage_account_type`}}", "build_resource_group_name": "{{user `build_resource_group_name`}}", "temp_resource_group_name": "{{user `temp_resource_group_name`}}", "virtual_network_name": "{{user `virtual_network_name`}}", diff --git a/images/win/windows2022.json b/images/win/windows2022.json index e4f0e32004ac..7f099c116da4 100644 --- a/images/win/windows2022.json +++ b/images/win/windows2022.json @@ -7,6 +7,7 @@ "tenant_id": "{{env `ARM_TENANT_ID`}}", "object_id": "{{env `ARM_OBJECT_ID`}}", "managed_image_resource_group_name": "{{env `ARM_RESOURCE_GROUP`}}", + "managed_image_storage_account_type": "Premium_LRS", "build_resource_group_name": "{{env `BUILD_RESOURCE_GROUP_NAME`}}", "temp_resource_group_name": "{{env `TEMP_RESOURCE_GROUP_NAME`}}", "location": "{{env `ARM_RESOURCE_LOCATION`}}", @@ -15,7 +16,7 @@ "virtual_network_subnet_name": "{{env `VNET_SUBNET`}}", "private_virtual_network_with_public_ip": "{{env `PRIVATE_VIRTUAL_NETWORK_WITH_PUBLIC_IP`}}", "allowed_inbound_ip_addresses": "{{env `AGENT_IP`}}", - "vm_size": "Standard_D8s_v4", + "vm_size": "Standard_F8s_v2", "image_folder": "C:\\image", "imagedata_file": "C:\\imagedata.json", "helper_script_folder": "C:\\Program Files\\WindowsPowerShell\\Modules\\", @@ -45,6 +46,7 @@ "vm_size": "{{user `vm_size`}}", "managed_image_name": "{{user `managed_image_name`}}", "managed_image_resource_group_name": "{{user `managed_image_resource_group_name`}}", + "managed_image_storage_account_type": "{{user `managed_image_storage_account_type`}}", "build_resource_group_name": "{{user `build_resource_group_name`}}", "temp_resource_group_name": "{{user `temp_resource_group_name`}}", "virtual_network_name": "{{user `virtual_network_name`}}", From 55c68fc638883930c78979ba57eeb626f966a780 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Mon, 18 Sep 2023 16:28:37 +0200 Subject: [PATCH 2203/3485] Move the conversion step after the software report (#8312) --- .../azure-pipelines/image-generation.yml | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/images.CI/linux-and-win/azure-pipelines/image-generation.yml b/images.CI/linux-and-win/azure-pipelines/image-generation.yml index c83c46d1436d..750713209528 100644 --- a/images.CI/linux-and-win/azure-pipelines/image-generation.yml +++ b/images.CI/linux-and-win/azure-pipelines/image-generation.yml @@ -102,26 +102,6 @@ jobs: PACKER_LOG: 1 PACKER_LOG_PATH: "$(Agent.TempDirectory)/packer-log.txt" - - task: PowerShell@2 - displayName: 'Convert managed image to VHD' - inputs: - targetType: filePath - filePath: ./images.CI/linux-and-win/convert-to-vhd.ps1 - arguments: -SubscriptionId $(AZURE_SUBSCRIPTION) ` - -Location $(AZURE_LOCATION) ` - -ResourceGroupName $(AZURE_RESOURCE_GROUP) ` - -ManagedImageName "$(ManagedImageName)" ` - -GalleryName "github_imagegeneration_convert_to_vhd" ` - -GalleryImageSku "${{ parameters.image_type }}" ` - -GalleryImageVersion "0.0.$(Build.BuildId)" ` - -StorageAccountName $(AZURE_STORAGE_ACCOUNT) ` - -StorageAccountContainerName "images" ` - -VhdName "$(VhdName)" ` - -ClientId $(CLIENT_ID) ` - -ClientSecret $(CLIENT_SECRET) ` - -TenantId $(AZURE_TENANT) ` - -RemoveManagedImage - - task: PowerShell@2 displayName: 'Copy image artifacts to the separate directory' inputs: @@ -166,6 +146,26 @@ jobs: -PrefixToPathTrim "$(TemplateDirectoryPath)" ` -PrintTopNLongest 25 + - task: PowerShell@2 + displayName: 'Convert managed image to VHD' + inputs: + targetType: filePath + filePath: ./images.CI/linux-and-win/convert-to-vhd.ps1 + arguments: -SubscriptionId $(AZURE_SUBSCRIPTION) ` + -Location $(AZURE_LOCATION) ` + -ResourceGroupName $(AZURE_RESOURCE_GROUP) ` + -ManagedImageName "$(ManagedImageName)" ` + -GalleryName "github_imagegeneration_convert_to_vhd" ` + -GalleryImageSku "${{ parameters.image_type }}" ` + -GalleryImageVersion "0.0.$(Build.BuildId)" ` + -StorageAccountName $(AZURE_STORAGE_ACCOUNT) ` + -StorageAccountContainerName "images" ` + -VhdName "$(VhdName)" ` + -ClientId $(CLIENT_ID) ` + -ClientSecret $(CLIENT_SECRET) ` + -TenantId $(AZURE_TENANT) ` + -RemoveManagedImage + - ${{ if eq(parameters.create_release, true) }}: - task: PowerShell@2 displayName: 'Create release for VM deployment' From 3b6bcd7dcaae7654c823edc153d0496e0ea40029 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Mon, 18 Sep 2023 18:02:56 +0200 Subject: [PATCH 2204/3485] [macOS] drop spaceship env variables from Xcode.ps1 (#8310) --- images/macos/provision/core/xcode.ps1 | 4 ---- 1 file changed, 4 deletions(-) diff --git a/images/macos/provision/core/xcode.ps1 b/images/macos/provision/core/xcode.ps1 index 772906ab7909..9dbc09d221b2 100644 --- a/images/macos/provision/core/xcode.ps1 +++ b/images/macos/provision/core/xcode.ps1 @@ -3,10 +3,6 @@ $ErrorActionPreference = "Stop" Import-Module "$env:HOME/image-generation/helpers/Common.Helpers.psm1" Import-Module "$env:HOME/image-generation/helpers/Xcode.Installer.psm1" -DisableNameChecking -# Spaceship Apple ID login fails due to Apple ID prompting to be upgraded to 2FA. -# https://github.com/fastlane/fastlane/pull/18116 -$env:SPACESHIP_SKIP_2FA_UPGRADE = 1 - $ARCH = Get-Architecture [Array]$xcodeVersions = Get-ToolsetValue "xcode.$ARCH.versions" write-host $xcodeVersions From cd9413ee05db8f0e3f05402091cedf54e060542a Mon Sep 17 00:00:00 2001 From: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com> Date: Mon, 18 Sep 2023 18:11:13 +0200 Subject: [PATCH 2205/3485] [windows] fix openssl installation (#8313) --- images/win/scripts/Installers/Install-OpenSSL.ps1 | 1 - 1 file changed, 1 deletion(-) diff --git a/images/win/scripts/Installers/Install-OpenSSL.ps1 b/images/win/scripts/Installers/Install-OpenSSL.ps1 index 2655ecc8d2e4..aabbd43ba258 100644 --- a/images/win/scripts/Installers/Install-OpenSSL.ps1 +++ b/images/win/scripts/Installers/Install-OpenSSL.ps1 @@ -26,7 +26,6 @@ $installersAvailable | Get-Member -MemberType NoteProperty | ForEach-Object { $installerUrl = $installersAvailable.$key.url $installerName = $key $distributor_file_hash = $installersAvailable.$key.sha512 - Break; } } From 609078e3775c63610303d2e3e283ac0b4039ad3f Mon Sep 17 00:00:00 2001 From: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com> Date: Mon, 18 Sep 2023 18:37:14 +0200 Subject: [PATCH 2206/3485] [windows] clarify Install-AzureModules description (#8273) --- images/win/scripts/Installers/Install-AzureModules.ps1 | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/images/win/scripts/Installers/Install-AzureModules.ps1 b/images/win/scripts/Installers/Install-AzureModules.ps1 index 66ebfe63ce52..183fcb7d3697 100644 --- a/images/win/scripts/Installers/Install-AzureModules.ps1 +++ b/images/win/scripts/Installers/Install-AzureModules.ps1 @@ -1,14 +1,9 @@ ################################################################################ ## File: Install-AzureModules.ps1 -## Desc: Install Azure PowerShell modules +## Desc: PowerShell modules used by AzureFileCopy@4, AzureFileCopy@5, AzurePowerShell@4, AzurePowerShell@5 tasks ## Supply chain security: package manager ################################################################################ -# -# prepares the environment for the Azure PowerShell modules -# used by AzureFileCopy@4, AzureFileCopy@5, AzurePowerShell@4, AzurePowerShell@5 tasks -# - # The correct Modules need to be saved in C:\Modules $installPSModulePath = "C:\\Modules" if (-not (Test-Path -LiteralPath $installPSModulePath)) From 1e0ff7bfd74b1cbe5c78a1f372866b6be76fe52e Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Tue, 19 Sep 2023 00:34:08 +0200 Subject: [PATCH 2207/3485] [macOS] pin openssl@1.1.1 in arm64 image (#8315) --- images/macos/templates/macOS-13.arm64.anka.pkr.hcl | 1 + 1 file changed, 1 insertion(+) diff --git a/images/macos/templates/macOS-13.arm64.anka.pkr.hcl b/images/macos/templates/macOS-13.arm64.anka.pkr.hcl index 7702e2e3421c..69986ec23949 100644 --- a/images/macos/templates/macOS-13.arm64.anka.pkr.hcl +++ b/images/macos/templates/macOS-13.arm64.anka.pkr.hcl @@ -165,6 +165,7 @@ build { "./provision/core/powershell.sh", "./provision/core/dotnet.sh", "./provision/core/azcopy.sh", + "./provision/core/openssl.sh", "./provision/core/ruby.sh", "./provision/core/rubygem.sh", "./provision/core/git.sh", From e3032a9bc3f0d7051c79b3a3da55dd2345af73ff Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Tue, 19 Sep 2023 14:46:33 +0200 Subject: [PATCH 2208/3485] [macOS] do not install intel related symlinks on arm64 openssl (#8328) --- images/macos/provision/core/openssl.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/images/macos/provision/core/openssl.sh b/images/macos/provision/core/openssl.sh index c956fb2dc074..c2308a240196 100755 --- a/images/macos/provision/core/openssl.sh +++ b/images/macos/provision/core/openssl.sh @@ -4,10 +4,13 @@ source ~/utils/utils.sh echo "Install openssl@1.1" brew_smart_install "openssl@1.1" -# Symlink brew openssl@1.1 to `/usr/local/bin` as Homebrew refuses -ln -sf $(brew --prefix openssl@1.1)/bin/openssl /usr/local/bin/openssl +# Intel-related symlinks, not needed on arm64 for now +if ! is_VenturaArm64; then + # Symlink brew openssl@1.1 to `/usr/local/bin` as Homebrew refuses + ln -sf $(brew --prefix openssl@1.1)/bin/openssl /usr/local/bin/openssl -# Most of buildsystems and scripts look up ssl here -ln -sf $(brew --cellar openssl@1.1)/1.1* /usr/local/opt/openssl + # Most of buildsystems and scripts look up ssl here + ln -sf $(brew --cellar openssl@1.1)/1.1* /usr/local/opt/openssl +fi invoke_tests "OpenSSL" From 89c7ff156e0fe0fffa667724f880da08a34c902c Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Tue, 19 Sep 2023 19:22:57 +0200 Subject: [PATCH 2209/3485] [Ubuntu] Add Android NDK 26 (#8330) --- images/linux/toolsets/toolset-2004.json | 2 +- images/linux/toolsets/toolset-2204.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index 89012b384857..03c77b18eeea 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -95,7 +95,7 @@ "ndk": { "default": "25", "versions": [ - "23", "24", "25" + "23", "24", "25", "26" ] } }, diff --git a/images/linux/toolsets/toolset-2204.json b/images/linux/toolsets/toolset-2204.json index d961d51928ed..f982c1f6f8bb 100644 --- a/images/linux/toolsets/toolset-2204.json +++ b/images/linux/toolsets/toolset-2204.json @@ -89,7 +89,7 @@ "ndk": { "default": "25", "versions": [ - "23", "24", "25" + "23", "24", "25", "26" ] } }, From 869433e6b288b142072e94d71e0be2741a2c2d47 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Tue, 19 Sep 2023 19:25:14 +0200 Subject: [PATCH 2210/3485] [Ubuntu] move clang 12 from 22.04 (#8329) --- images/linux/toolsets/toolset-2204.json | 1 - 1 file changed, 1 deletion(-) diff --git a/images/linux/toolsets/toolset-2204.json b/images/linux/toolsets/toolset-2204.json index f982c1f6f8bb..511beadb64b3 100644 --- a/images/linux/toolsets/toolset-2204.json +++ b/images/linux/toolsets/toolset-2204.json @@ -255,7 +255,6 @@ }, "clang": { "versions": [ - "12", "13", "14", "15" From 1040b412a738fe47df6cc8ea9e0da87ad13b478a Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Wed, 20 Sep 2023 09:38:03 +0200 Subject: [PATCH 2211/3485] [macOS] Update Xcode 15.0 to 15A240d (#8324) --- images/macos/toolsets/toolset-13.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/macos/toolsets/toolset-13.json b/images/macos/toolsets/toolset-13.json index cf5818d27b65..a6ebae34606c 100644 --- a/images/macos/toolsets/toolset-13.json +++ b/images/macos/toolsets/toolset-13.json @@ -3,7 +3,7 @@ "default": "14.3.1", "x64": { "versions": [ - { "link": "15.0", "version": "15.0.0-Release.Candidate+15A240d"}, + { "link": "15.0", "version": "15.0.0+15A240d"}, { "link": "14.3.1", "version": "14.3.1+14E300c","symlinks": ["14.3"] }, { "link": "14.2", "version": "14.2.0+14C18" }, { "link": "14.1", "version": "14.1.0+14B47b" } @@ -11,7 +11,7 @@ }, "arm64":{ "versions": [ - { "link": "15.0", "version": "15.0.0-Release.Candidate+15A240d"}, + { "link": "15.0", "version": "15.0.0+15A240d"}, { "link": "14.3.1", "version": "14.3.1+14E300c","symlinks": ["14.3"] }, { "link": "14.2", "version": "14.2.0+14C18" }, { "link": "14.1", "version": "14.1.0+14B47b" } From ede9c210d85dfb095604770ace4c16bfe3f3d384 Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Wed, 20 Sep 2023 09:38:22 +0200 Subject: [PATCH 2212/3485] [Windows] Add Android NDK 26 (#8332) --- images/win/toolsets/toolset-2019.json | 2 +- images/win/toolsets/toolset-2022.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index 7b349912803f..ab5693d4c17e 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -171,7 +171,7 @@ "ndk": { "default": "25", "versions": [ - "23", "24", "25" + "23", "24", "25", "26" ] } }, diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index e93c13eba7a0..d04cd0a3c391 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -145,7 +145,7 @@ "ndk": { "default": "25", "versions": [ - "23", "24", "25" + "23", "24", "25", "26" ] } }, From efb0feba5e67d6065ec4826e3fcae7e41f9c2536 Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Wed, 20 Sep 2023 09:38:40 +0200 Subject: [PATCH 2213/3485] [macOS] Add Android NDK 26 (#8331) --- images/macos/toolsets/toolset-11.json | 2 +- images/macos/toolsets/toolset-12.json | 2 +- images/macos/toolsets/toolset-13.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index fb31c4ed1c9c..05084aff1036 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -171,7 +171,7 @@ "ndk": { "default": "25", "versions": [ - "23", "24", "25" + "23", "24", "25", "26" ] } }, diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index 9852756f30a2..11ce30db47b3 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -157,7 +157,7 @@ "ndk": { "default": "25", "versions": [ - "23", "24", "25" + "23", "24", "25", "26" ] } }, diff --git a/images/macos/toolsets/toolset-13.json b/images/macos/toolsets/toolset-13.json index a6ebae34606c..73650b768148 100644 --- a/images/macos/toolsets/toolset-13.json +++ b/images/macos/toolsets/toolset-13.json @@ -36,7 +36,7 @@ "ndk": { "default": "25", "versions": [ - "23", "24", "25" + "23", "24", "25", "26" ] } }, From 601b21b1a61d5d825cdb423e8a7a0f7985884581 Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Wed, 20 Sep 2023 16:32:41 +0200 Subject: [PATCH 2214/3485] Rename Google Cloud SDK to CLI (#8335) --- .../SoftwareReport/SoftwareReport.Generator.ps1 | 2 +- .../scripts/SoftwareReport/SoftwareReport.Tools.psm1 | 2 +- .../{google-cloud-sdk.sh => google-cloud-cli.sh} | 10 +++++----- images/linux/scripts/tests/CLI.Tools.Tests.ps1 | 4 ++-- images/linux/ubuntu2004.json | 2 +- images/linux/ubuntu2204.pkr.hcl | 2 +- ...l-GoogleCloudSDK.ps1 => Install-GoogleCloudCLI.ps1} | 10 +++++----- .../SoftwareReport/SoftwareReport.Generator.ps1 | 2 +- .../scripts/SoftwareReport/SoftwareReport.Tools.psm1 | 2 +- images/win/scripts/Tests/Tools.Tests.ps1 | 2 +- images/win/windows2019.json | 2 +- 11 files changed, 20 insertions(+), 20 deletions(-) rename images/linux/scripts/installers/{google-cloud-sdk.sh => google-cloud-cli.sh} (79%) rename images/win/scripts/Installers/{Install-GoogleCloudSDK.ps1 => Install-GoogleCloudCLI.ps1} (57%) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index 7d28939cdc9f..e4fef5d1cd6f 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -158,7 +158,7 @@ $cliTools.AddToolVersion("AWS SAM CLI", $(Get-AWSSAMVersion)) $cliTools.AddToolVersion("Azure CLI", $(Get-AzureCliVersion)) $cliTools.AddToolVersion("Azure CLI (azure-devops)", $(Get-AzureDevopsVersion)) $cliTools.AddToolVersion("GitHub CLI", $(Get-GitHubCliVersion)) -$cliTools.AddToolVersion("Google Cloud SDK", $(Get-GoogleCloudSDKVersion)) +$cliTools.AddToolVersion("Google Cloud CLI", $(Get-GoogleCloudCLIVersion)) $cliTools.AddToolVersion("Hub CLI", $(Get-HubCliVersion)) $cliTools.AddToolVersion("Netlify CLI", $(Get-NetlifyCliVersion)) $cliTools.AddToolVersion("OpenShift CLI", $(Get-OCCliVersion)) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 index 9c07f38cc9f8..594aeeb6bf0a 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 @@ -109,7 +109,7 @@ function Get-GitFTPVersion { return $gitftpVersion } -function Get-GoogleCloudSDKVersion { +function Get-GoogleCloudCLIVersion { return (gcloud --version | Select-Object -First 1) | Take-OutputPart -Part 3 } diff --git a/images/linux/scripts/installers/google-cloud-sdk.sh b/images/linux/scripts/installers/google-cloud-cli.sh similarity index 79% rename from images/linux/scripts/installers/google-cloud-sdk.sh rename to images/linux/scripts/installers/google-cloud-cli.sh index 81b91925fa1b..88708155f74f 100644 --- a/images/linux/scripts/installers/google-cloud-sdk.sh +++ b/images/linux/scripts/installers/google-cloud-cli.sh @@ -1,16 +1,16 @@ #!/bin/bash -e ################################################################################ -## File: google-cloud-sdk.sh -## Desc: Installs the Google Cloud SDK +## File: google-cloud-cli.sh +## Desc: Installs the Google Cloud CLI ################################################################################ REPO_URL="https://packages.cloud.google.com/apt" -# Install the Google Cloud SDK +# Install the Google Cloud CLI echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] $REPO_URL cloud-sdk main" > /etc/apt/sources.list.d/google-cloud-sdk.list wget -qO- https://packages.cloud.google.com/apt/doc/apt-key.gpg | gpg --dearmor > /usr/share/keyrings/cloud.google.gpg apt-get update -y -apt-get install -y google-cloud-sdk +apt-get install -y google-cloud-cli # remove apt rm /etc/apt/sources.list.d/google-cloud-sdk.list @@ -19,4 +19,4 @@ rm /usr/share/keyrings/cloud.google.gpg # add repo to the apt-sources.txt echo "google-cloud-sdk $REPO_URL" >> $HELPER_SCRIPTS/apt-sources.txt -invoke_tests "CLI.Tools" "Google Cloud SDK" +invoke_tests "CLI.Tools" "Google Cloud CLI" diff --git a/images/linux/scripts/tests/CLI.Tools.Tests.ps1 b/images/linux/scripts/tests/CLI.Tools.Tests.ps1 index 5be4d67eae34..2f6ecdfd5723 100644 --- a/images/linux/scripts/tests/CLI.Tools.Tests.ps1 +++ b/images/linux/scripts/tests/CLI.Tools.Tests.ps1 @@ -41,8 +41,8 @@ Describe "GitHub CLI" { } } -Describe "Google Cloud SDK" { - It "Google Cloud SDK" { +Describe "Google Cloud CLI" { + It "Google Cloud CLI" { "gcloud --version" | Should -ReturnZeroExitCode } } diff --git a/images/linux/ubuntu2004.json b/images/linux/ubuntu2004.json index b9514c57a700..5fc6d909f2af 100644 --- a/images/linux/ubuntu2004.json +++ b/images/linux/ubuntu2004.json @@ -218,7 +218,7 @@ "{{template_dir}}/scripts/installers/git.sh", "{{template_dir}}/scripts/installers/github-cli.sh", "{{template_dir}}/scripts/installers/google-chrome.sh", - "{{template_dir}}/scripts/installers/google-cloud-sdk.sh", + "{{template_dir}}/scripts/installers/google-cloud-cli.sh", "{{template_dir}}/scripts/installers/haskell.sh", "{{template_dir}}/scripts/installers/heroku.sh", "{{template_dir}}/scripts/installers/hhvm.sh", diff --git a/images/linux/ubuntu2204.pkr.hcl b/images/linux/ubuntu2204.pkr.hcl index 0001838c8d90..1f06f8212d92 100644 --- a/images/linux/ubuntu2204.pkr.hcl +++ b/images/linux/ubuntu2204.pkr.hcl @@ -301,7 +301,7 @@ build { "${path.root}/scripts/installers/git.sh", "${path.root}/scripts/installers/github-cli.sh", "${path.root}/scripts/installers/google-chrome.sh", - "${path.root}/scripts/installers/google-cloud-sdk.sh", + "${path.root}/scripts/installers/google-cloud-cli.sh", "${path.root}/scripts/installers/haskell.sh", "${path.root}/scripts/installers/heroku.sh", "${path.root}/scripts/installers/java-tools.sh", diff --git a/images/win/scripts/Installers/Install-GoogleCloudSDK.ps1 b/images/win/scripts/Installers/Install-GoogleCloudCLI.ps1 similarity index 57% rename from images/win/scripts/Installers/Install-GoogleCloudSDK.ps1 rename to images/win/scripts/Installers/Install-GoogleCloudCLI.ps1 index 03b9e8ddf22a..fdb0b4f7cb5a 100644 --- a/images/win/scripts/Installers/Install-GoogleCloudSDK.ps1 +++ b/images/win/scripts/Installers/Install-GoogleCloudCLI.ps1 @@ -1,11 +1,11 @@ ################################################################################ -## File: Install-GoogleCloudSDK.ps1 -## Desc: Install Google Cloud SDK +## File: Install-GoogleCloudCLI.ps1 +## Desc: Install Google Cloud CLI ################################################################################ # https://cloud.google.com/sdk/docs/downloads-interactive -$googleCloudSDKInstaller = "https://dl.google.com/dl/cloudsdk/channels/rapid/GoogleCloudSDKInstaller.exe" +$googleCloudCLIInstaller = "https://dl.google.com/dl/cloudsdk/channels/rapid/GoogleCloudSDKInstaller.exe" $argumentList = @("/S", "/allusers", "/noreporting") -Install-Binary -Url $googleCloudSDKInstaller -Name "GoogleCloudSDKInstaller.exe" -ArgumentList $argumentList +Install-Binary -Url $googleCloudCLIInstaller -Name "GoogleCloudSDKInstaller.exe" -ArgumentList $argumentList -Invoke-PesterTests -TestFile "Tools" -TestName "GoogleCloudSDK" +Invoke-PesterTests -TestFile "Tools" -TestName "GoogleCloudCLI" diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index 2f26df19db1c..f76a96a8d355 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -78,7 +78,7 @@ $tools.AddToolVersion("ghc", $(Get-GHCVersion)) $tools.AddToolVersion("Git", $(Get-GitVersion)) $tools.AddToolVersion("Git LFS", $(Get-GitLFSVersion)) if (Test-IsWin19) { - $tools.AddToolVersion("Google Cloud SDK", $(Get-GoogleCloudSDKVersion)) + $tools.AddToolVersion("Google Cloud CLI", $(Get-GoogleCloudCLIVersion)) } $tools.AddToolVersion("ImageMagick", $(Get-ImageMagickVersion)) $tools.AddToolVersion("InnoSetup", $(Get-InnoSetupVersion)) diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 index 543c7553649c..4952e90e871c 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 @@ -262,7 +262,7 @@ function Get-StackVersion { return $stackVersion } -function Get-GoogleCloudSDKVersion { +function Get-GoogleCloudCLIVersion { return (((cmd /c "gcloud --version") -match "Google Cloud SDK") -replace "Google Cloud SDK").Trim() } diff --git a/images/win/scripts/Tests/Tools.Tests.ps1 b/images/win/scripts/Tests/Tools.Tests.ps1 index 26675fed5767..80dbfbea71a3 100644 --- a/images/win/scripts/Tests/Tools.Tests.ps1 +++ b/images/win/scripts/Tests/Tools.Tests.ps1 @@ -117,7 +117,7 @@ Describe "Mingw64" { } } -Describe "GoogleCloudSDK" -Skip:(Test-IsWin22) { +Describe "GoogleCloudCLI" -Skip:(Test-IsWin22) { It "<ToolName>" -TestCases @( @{ ToolName = "bq" } @{ ToolName = "gcloud" } diff --git a/images/win/windows2019.json b/images/win/windows2019.json index 48c95a21fb04..1cb5e2922000 100644 --- a/images/win/windows2019.json +++ b/images/win/windows2019.json @@ -269,7 +269,7 @@ "{{ template_dir }}/scripts/Installers/Install-AliyunCli.ps1", "{{ template_dir }}/scripts/Installers/Install-RootCA.ps1", "{{ template_dir }}/scripts/Installers/Install-MongoDB.ps1", - "{{ template_dir }}/scripts/Installers/Install-GoogleCloudSDK.ps1", + "{{ template_dir }}/scripts/Installers/Install-GoogleCloudCLI.ps1", "{{ template_dir }}/scripts/Installers/Install-CodeQLBundle.ps1", "{{ template_dir }}/scripts/Installers/Install-BizTalkBuildComponent.ps1", "{{ template_dir }}/scripts/Installers/Disable-JITDebugger.ps1", From 7c2097edaba374b7c4c2d4f00c894fb782dba0da Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Wed, 20 Sep 2023 17:21:04 +0200 Subject: [PATCH 2215/3485] [Windows] Fix typo in function name (#8345) --- images/win/scripts/ImageHelpers/ImageHelpers.psm1 | 2 +- images/win/scripts/ImageHelpers/InstallHelpers.ps1 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/images/win/scripts/ImageHelpers/ImageHelpers.psm1 b/images/win/scripts/ImageHelpers/ImageHelpers.psm1 index 779ca579b650..f2ae79e4cf58 100644 --- a/images/win/scripts/ImageHelpers/ImageHelpers.psm1 +++ b/images/win/scripts/ImageHelpers/ImageHelpers.psm1 @@ -55,6 +55,6 @@ Export-ModuleMember -Function @( 'Get-WindowsUpdatesHistory' 'New-ItemPath' 'Get-ModuleVersionAsJob' - 'Use-ChecksumСomparison' + 'Use-ChecksumComparison' 'Get-HashFromGitHubReleaseBody' ) diff --git a/images/win/scripts/ImageHelpers/InstallHelpers.ps1 b/images/win/scripts/ImageHelpers/InstallHelpers.ps1 index c482515f889f..58f2b6f25379 100644 --- a/images/win/scripts/ImageHelpers/InstallHelpers.ps1 +++ b/images/win/scripts/ImageHelpers/InstallHelpers.ps1 @@ -630,7 +630,7 @@ function Get-GitHubPackageDownloadUrl { return $downloadUrl } -function Use-ChecksumСomparison { +function Use-ChecksumComparison { param ( [Parameter(Mandatory=$true)] [string]$LocalFileHash, From e145f2fa368b6afa58050062afd64b50d1d330bf Mon Sep 17 00:00:00 2001 From: garfthoffman <109185460+garfthoffman@users.noreply.github.com> Date: Wed, 20 Sep 2023 12:06:52 -0400 Subject: [PATCH 2216/3485] add boolean to control when to run anka push during clean generation (#8305) --- images.CI/macos/anka/CreateCleanAnkaTemplate.ps1 | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/images.CI/macos/anka/CreateCleanAnkaTemplate.ps1 b/images.CI/macos/anka/CreateCleanAnkaTemplate.ps1 index d3624798fcd9..676e6c5f7855 100644 --- a/images.CI/macos/anka/CreateCleanAnkaTemplate.ps1 +++ b/images.CI/macos/anka/CreateCleanAnkaTemplate.ps1 @@ -19,6 +19,7 @@ param( [string] $TemplateName, [bool] $DownloadLatestVersion = $true, + [bool] $PushToRegistry = $true, [bool] $BetaSearch = $false, [bool] $InstallSoftwareUpdate = $true, [bool] $EnableAutoLogon = $true, @@ -204,6 +205,8 @@ Set-AnkaVMVideoController -VMName $TemplateName -ShortMacOSVersion $ShortMacOSVe Write-Host "`t[*] Setting screen resolution to $DisplayResolution for $TemplateName" Set-AnkaVMDisplayResolution -VMName $TemplateName -DisplayResolution $DisplayResolution -# Push a VM template (and tag) to the Cloud -Write-Host "`t[*] Pushing '$TemplateName' image with '$TagName' tag to the '$RegistryUrl' registry..." -Push-AnkaTemplateToRegistry -RegistryUrl $registryUrl -TagName $TagName -TemplateName $TemplateName +if ($PushToRegistry) { + # Push a VM template (and tag) to the Cloud + Write-Host "`t[*] Pushing '$TemplateName' image with '$TagName' tag to the '$RegistryUrl' registry..." + Push-AnkaTemplateToRegistry -RegistryUrl $registryUrl -TagName $TagName -TemplateName $TemplateName +} From 1a5e1b25a2cbcbd048011a902b6af1a3bbf6f5a7 Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Wed, 20 Sep 2023 18:58:26 +0200 Subject: [PATCH 2217/3485] Update vscode configuration (#8346) --- .vscode/settings.json | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index dd30ae4c08da..f0ce6b6ac015 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,4 +1,6 @@ { + "files.trimFinalNewlines": true, + "files.insertFinalNewline": true, "powershell.codeFormatting.addWhitespaceAroundPipe": true, "powershell.codeFormatting.alignPropertyValuePairs": true, "powershell.codeFormatting.autoCorrectAliases": true, @@ -15,6 +17,9 @@ "powershell.codeFormatting.whitespaceBetweenParameters": true, "powershell.codeFormatting.whitespaceInsideBrace": true, "shellcheck.exclude": [ - "SC1091" + "SC1090","SC2096" + ], + "shellcheck.customArgs": [ + "-x" ] -} \ No newline at end of file +} From e3723b394add83fc2fbfa0200caf1a8197f1b0ba Mon Sep 17 00:00:00 2001 From: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com> Date: Thu, 21 Sep 2023 11:46:14 +0200 Subject: [PATCH 2218/3485] [windows] fix openssl package condition (#8347) we intend to install full package, not light. accidently condition was incorrect --- images/win/scripts/Installers/Install-OpenSSL.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/win/scripts/Installers/Install-OpenSSL.ps1 b/images/win/scripts/Installers/Install-OpenSSL.ps1 index aabbd43ba258..47441808a845 100644 --- a/images/win/scripts/Installers/Install-OpenSSL.ps1 +++ b/images/win/scripts/Installers/Install-OpenSSL.ps1 @@ -6,7 +6,7 @@ $arch = 'INTEL' $bits = '64' -$light = 'false' +$light = $false $installer = "exe" $version = (Get-ToolsetContent).openssl.version $installDir = "$Env:ProgramFiles\OpenSSL" From 4669a5d34fae41fcddf5d5617622f35770874461 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 21 Sep 2023 10:38:54 +0000 Subject: [PATCH 2219/3485] Updating readme file for win19 version 20230918.1.0 (#8334) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2019-Readme.md | 49 +++++++++++++++----------------- 1 file changed, 23 insertions(+), 26 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index a0d5ce8900d2..b79762b929e3 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -6,7 +6,7 @@ *** # Windows Server 2019 - OS Version: 10.0.17763 Build 4851 -- Image Version: 20230912.1.0 +- Image Version: 20230918.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -27,7 +27,7 @@ ### Package Management - Chocolatey 2.2.2 -- Composer 2.6.2 +- Composer 2.6.3 - Helm 3.12.3 - Miniconda 23.5.2 (pre-installed on the image but not added to PATH) - NPM 9.6.7 @@ -35,7 +35,7 @@ - pip 23.2.1 (python 3.7) - Pipx 1.2.0 - RubyGems 2.7.6.3 -- Vcpkg (build from commit da21e45c9) +- Vcpkg (build from commit 0a50c9623) - Yarn 1.22.19 #### Environment variables @@ -48,7 +48,7 @@ - Ant 1.10.14 - Gradle 8.3 - Maven 3.8.7 -- sbt 1.9.4 +- sbt 1.9.6 ### Tools - 7zip 23.01 @@ -58,8 +58,8 @@ - Bazelisk 1.18.0 - Bicep 0.21.1 - Cabal 3.10.1.0 -- CMake 3.27.4 -- CodeQL Action Bundles 2.14.2 2.14.3 +- CMake 3.27.5 +- CodeQL Action Bundles 2.14.4 2.14.5 - Docker 24.0.6 - Docker Compose v1 1.29.2 - Docker Compose v2 2.21.0 @@ -67,20 +67,20 @@ - ghc 9.6.2 - Git 2.42.0.windows.2 - Git LFS 3.4.0 -- Google Cloud SDK 446.0.0 +- Google Cloud SDK 446.0.1 - ImageMagick 7.1.1-15 - InnoSetup 6.2.2 -- jq 1.6 +- jq 1.7-dirty - Kind 0.20.0 -- Kubectl 1.28.1 +- Kubectl 1.28.2 - Mercurial 5.0 - Mingw-w64 8.1.0 -- Newman 5.3.2 +- Newman 6.0.0 - NSIS 3.08 -- OpenSSL 1.1.1i -- Packer 1.9.2 +- OpenSSL 1.1.1v +- Packer 1.9.4 - Parcel 2.9.3 -- Pulumi 3.81.0 +- Pulumi 3.83.0 - R 4.3.1 - Service Fabric SDK 9.1.1436.9590 - Stack 2.11.1 @@ -94,7 +94,7 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.181 -- AWS CLI 2.13.16 +- AWS CLI 2.13.19 - AWS SAM CLI 1.97.0 - AWS Session Manager CLI 1.2.497.0 - Azure CLI 2.52.0 @@ -113,15 +113,15 @@ - bindgen 0.68.1 - cargo-audit 0.18.1 - cargo-outdated 0.13.1 -- cbindgen 0.25.0 +- cbindgen 0.26.0 - Clippy 0.1.72 - Rustfmt 1.6.0 ### Browsers and Drivers -- Google Chrome 117.0.5938.63 -- Chrome Driver 117.0.5938.62 -- Microsoft Edge 116.0.1938.76 -- Microsoft Edge Driver 116.0.1938.76 +- Google Chrome 117.0.5938.89 +- Chrome Driver 117.0.5938.88 +- Microsoft Edge 117.0.2045.31 +- Microsoft Edge Driver 117.0.2045.31 - Mozilla Firefox 117.0.1 - Gecko Driver 0.33.0 - IE Driver 4.11.0.0 @@ -165,7 +165,6 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Cached Tools #### Go -- 1.18.10 - 1.19.13 - 1.20.8 - 1.21.1 @@ -176,7 +175,6 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 18.17.1 #### Python -- 3.6.8 - 3.7.9 - 3.8.10 - 3.9.13 @@ -192,7 +190,6 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 3.10.12 [PyPy 7.3.12] #### Ruby -- 2.4.10 - 2.5.9 - 2.6.10 - 2.7.8 @@ -514,7 +511,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Az (Cached): 1.0.0.zip, 1.6.0.zip, 2.3.2.zip, 2.6.0.zip, 3.1.0.zip, 3.5.0.zip, 3.8.0.zip, 4.3.0.zip, 4.4.0.zip, 4.7.0.zip, 5.5.0.zip, 5.9.0.zip, 6.6.0.zip, 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.412 +- AWSPowershell: 4.1.416 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 - Microsoft.Graph: 2.5.0 @@ -559,9 +556,9 @@ All other versions are saved but not installed. ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:65945f57f4fe7da7a8fcf9f4deb406bef640d8acb4d58ed482cddb173b24b165 | 2023-08-08 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:7ec4e85a7271b680162d7643a102cae0d7c869c80992eb70416fee45fc62acc3 | 2023-08-08 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:1b3c35fc580fe7b5c837b700e336313c47b1ada0708be0b568b909a2a11efe67 | 2023-08-08 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:604f8ccbeebb10fc9e6ffcea3402459a7ed4b30ff0a39f21337696d5782ab52a | 2023-09-12 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:bf0217fdc494f804953ec59b004fcd52c111e38d79c8daef35c2f41af5a63b87 | 2023-09-12 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:2669cf0d359f8eb800c539920ea7f73429f7ab61173d1c0f850260d521f1a38d | 2023-09-12 | | mcr.microsoft.com/windows/nanoserver:1809 | sha256:4bb2610b0e4f848e81d091cba672b0308a8eebf6c4a4f006e9c4c12b85d1823e | 2023-08-29 | | mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:3cba12bffca83466997158c8a0d38f20a18fb14f5ec62cd6454dfdd328278d87 | 2023-08-29 | From 055b86c09f652be4585a3a460fb4ea95e64cd4dc Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 21 Sep 2023 10:45:58 +0000 Subject: [PATCH 2220/3485] Updating readme file for ubuntu20 version 20230917.1.0 (#8308) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2004-Readme.md | 50 +++++++++++++++---------------- 1 file changed, 24 insertions(+), 26 deletions(-) diff --git a/images/linux/Ubuntu2004-Readme.md b/images/linux/Ubuntu2004-Readme.md index eabbee467400..2c5b2a400253 100644 --- a/images/linux/Ubuntu2004-Readme.md +++ b/images/linux/Ubuntu2004-Readme.md @@ -7,7 +7,7 @@ # Ubuntu 20.04 - OS Version: 20.04.6 LTS - Kernel Version: 5.15.0-1046-azure -- Image Version: 20230911.1.0 +- Image Version: 20230917.1.0 - Systemd version: 245.4-4ubuntu3.22 ## Installed Software @@ -43,7 +43,7 @@ - Pip3 20.0.2 - Pipx 1.2.0 - RubyGems 3.1.2 -- Vcpkg (build from commit 962e5e39f) +- Vcpkg (build from commit e8c2a04eb) - Yarn 1.22.19 #### Environment variables @@ -63,9 +63,9 @@ to accomplish this. ### Project Management - Ant 1.10.7 - Gradle 8.3 -- Lerna 7.2.0 +- Lerna 7.3.0 - Maven 3.8.8 -- Sbt 1.9.4 +- Sbt 1.9.6 ### Tools - Ansible 2.13.12 @@ -75,15 +75,15 @@ to accomplish this. - Bazelisk 1.18.0 - Bicep 0.21.1 - Buildah 1.22.3 -- CMake 3.27.4 -- CodeQL Action Bundles 2.14.2 2.14.3 +- CMake 3.27.5 +- CodeQL Action Bundles 2.14.4 2.14.5 - Docker Amazon ECR Credential Helper 0.7.1 - Docker Compose v1 1.29.2 - Docker Compose v2 2.21.0 - Docker-Buildx 0.11.2 - Docker Client 24.0.6 - Docker Server 24.0.6 -- Fastlane 2.214.0 +- Fastlane 2.215.1 - Git 2.42.0 - Git LFS 3.4.0 - Git-ftp 1.6.0 @@ -92,21 +92,21 @@ to accomplish this. - HHVM (HipHop VM) 4.172.1 - jq 1.6 - Kind 0.20.0 -- Kubectl 1.28.1 +- Kubectl 1.28.2 - Kustomize 5.1.1 - Leiningen 2.10.0 - MediaInfo 19.09 - Mercurial 5.3.1 - Minikube 1.31.2 - n 9.1.0 -- Newman 5.3.2 +- Newman 6.0.0 - nvm 0.39.5 - OpenSSL 1.1.1f-1ubuntu2.19 - Packer 1.9.4 - Parcel 2.9.3 - PhantomJS 2.1.1 2.1.1 - Podman 3.4.2 -- Pulumi 3.81.0 +- Pulumi 3.83.0 - R 4.3.1 - Skopeo 1.5.0 - Sphinx Open Source Search Server 2.2.11 @@ -118,18 +118,18 @@ to accomplish this. ### CLI Tools - Alibaba Cloud CLI 3.0.174 -- AWS CLI 2.13.17 +- AWS CLI 2.13.19 - AWS CLI Session Manager Plugin 1.2.497.0 - AWS SAM CLI 1.97.0 - Azure CLI 2.52.0 - Azure CLI (azure-devops) 0.26.0 - GitHub CLI 2.34.0 -- Google Cloud SDK 445.0.0 +- Google Cloud SDK 446.0.1 - Hub CLI 2.14.2 -- Netlify CLI 16.3.1 -- OpenShift CLI 4.13.11 +- Netlify CLI 16.3.3 +- OpenShift CLI 4.13.12 - ORAS CLI 1.1.0 -- Vercel CLI 32.2.1 +- Vercel CLI 32.2.4 ### Java | Version | Environment Variable | @@ -140,7 +140,7 @@ to accomplish this. ### PHP Tools - PHP: 7.4.33, 8.0.30, 8.1.23, 8.2.10 -- Composer 2.6.2 +- Composer 2.6.3 - PHPUnit 8.5.33 ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. @@ -163,17 +163,17 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Cargo audit 0.18.1 - Cargo clippy 0.1.72 - Cargo outdated 0.13.1 -- Cbindgen 0.25.0 +- Cbindgen 0.26.0 - Rustfmt 1.6.0 ### Browsers and Drivers -- Google Chrome 116.0.5845.187 -- ChromeDriver 116.0.5845.96 -- Chromium 116.0.5845.0 -- Microsoft Edge 116.0.1938.76 -- Microsoft Edge WebDriver 116.0.1938.76 +- Google Chrome 117.0.5938.88 +- ChromeDriver 117.0.5938.88 +- Chromium 117.0.5938.0 +- Microsoft Edge 117.0.2045.31 +- Microsoft Edge WebDriver 117.0.2045.31 - Selenium server 4.12.0 -- Mozilla Firefox 117.0 +- Mozilla Firefox 117.0.1 - Geckodriver 0.33.0 #### Environment variables @@ -185,7 +185,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | ### .NET Tools -- .NET Core SDK: 6.0.413, 7.0.110, 7.0.203, 7.0.307, 7.0.400 +- .NET Core SDK: 6.0.414, 7.0.111, 7.0.203, 7.0.308, 7.0.401 - nbgv 3.6.133+2d32d93cb1 ### Databases @@ -216,7 +216,6 @@ Use the following command as a part of your job to start the service: 'sudo syst ### Cached Tools #### Go -- 1.18.10 - 1.19.13 - 1.20.8 - 1.21.1 @@ -227,7 +226,6 @@ Use the following command as a part of your job to start the service: 'sudo syst - 18.17.1 #### Python -- 3.6.15 - 3.7.17 - 3.8.18 - 3.9.18 From a0f082f47bc52c6c49b573ff3ca6b98dd28d6985 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 21 Sep 2023 10:51:53 +0000 Subject: [PATCH 2221/3485] Updating readme file for win22 version 20230918.1.0 (#8323) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2022-Readme.md | 103 +++++++++++++++---------------- 1 file changed, 51 insertions(+), 52 deletions(-) diff --git a/images/win/Windows2022-Readme.md b/images/win/Windows2022-Readme.md index 24d05e41d694..0315a30b898b 100644 --- a/images/win/Windows2022-Readme.md +++ b/images/win/Windows2022-Readme.md @@ -5,8 +5,8 @@ | [[All OSes] Go 1.18.x will be removed on September, 18](https://github.com/actions/runner-images/issues/8237) | *** # Windows Server 2022 -- OS Version: 10.0.20348 Build 1906 -- Image Version: 20230910.1.0 +- OS Version: 10.0.20348 Build 1970 +- Image Version: 20230918.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -27,7 +27,7 @@ ### Package Management - Chocolatey 2.2.2 -- Composer 2.6.2 +- Composer 2.6.3 - Helm 3.12.3 - Miniconda 23.5.2 (pre-installed on the image but not added to PATH) - NPM 9.6.7 @@ -35,7 +35,7 @@ - pip 23.2.1 (python 3.9) - Pipx 1.2.0 - RubyGems 3.2.33 -- Vcpkg (build from commit 962e5e39f) +- Vcpkg (build from commit 0a50c9623) - Yarn 1.22.19 #### Environment variables @@ -48,7 +48,7 @@ - Ant 1.10.14 - Gradle 8.3 - Maven 3.8.7 -- sbt 1.9.4 +- sbt 1.9.6 ### Tools - 7zip 23.01 @@ -58,8 +58,8 @@ - Bazelisk 1.18.0 - Bicep 0.21.1 - Cabal 3.10.1.0 -- CMake 3.27.4 -- CodeQL Action Bundles 2.14.2 2.14.3 +- CMake 3.27.5 +- CodeQL Action Bundles 2.14.4 2.14.5 - Docker 24.0.6 - Docker Compose v1 1.29.2 - Docker Compose v2 2.21.0 @@ -69,16 +69,16 @@ - Git LFS 3.4.0 - ImageMagick 7.1.1-15 - InnoSetup 6.2.2 -- jq 1.6 +- jq 1.7-dirty - Kind 0.20.0 -- Kubectl 1.28.1 +- Kubectl 1.28.2 - Mercurial 5.0 -- Mingw-w64 11.2.0 -- Newman 5.3.2 +- Mingw-w64 12.2.0 +- Newman 6.0.0 - NSIS 3.08 - OpenSSL 1.1.1v -- Packer 1.9.2 -- Pulumi 3.81.0 +- Packer 1.9.4 +- Pulumi 3.83.0 - R 4.3.1 - Service Fabric SDK 9.1.1436.9590 - Stack 2.11.1 @@ -92,7 +92,7 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.181 -- AWS CLI 2.13.16 +- AWS CLI 2.13.19 - AWS SAM CLI 1.97.0 - AWS Session Manager CLI 1.2.497.0 - Azure CLI 2.52.0 @@ -110,16 +110,16 @@ - bindgen 0.68.1 - cargo-audit 0.18.1 - cargo-outdated 0.13.1 -- cbindgen 0.25.0 +- cbindgen 0.26.0 - Clippy 0.1.72 - Rustfmt 1.6.0 ### Browsers and Drivers -- Google Chrome 116.0.5845.180 -- Chrome Driver 116.0.5845.96 -- Microsoft Edge 116.0.1938.76 -- Microsoft Edge Driver 116.0.1938.76 -- Mozilla Firefox 117.0 +- Google Chrome 117.0.5938.89 +- Chrome Driver 117.0.5938.88 +- Microsoft Edge 117.0.2045.31 +- Microsoft Edge Driver 117.0.2045.31 +- Mozilla Firefox 117.0.1 - Gecko Driver 0.33.0 - IE Driver 4.11.0.0 - Selenium server 4.12.0 @@ -159,7 +159,6 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Cached Tools #### Go -- 1.18.10 - 1.19.13 - 1.20.8 - 1.21.1 @@ -223,7 +222,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Visual Studio Enterprise 2022 | Name | Version | Path | | ----------------------------- | -------------- | -------------------------------------------------------- | -| Visual Studio Enterprise 2022 | 17.7.34024.191 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | +| Visual Studio Enterprise 2022 | 17.7.34031.279 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | #### Workloads, components and extensions | Package | Version | @@ -288,21 +287,21 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.Net.ComponentGroup.4.8.DeveloperTools | 17.7.33905.399 | | Microsoft.Net.ComponentGroup.DevelopmentPrerequisites | 17.7.33905.399 | | Microsoft.Net.ComponentGroup.TargetingPacks.Common | 17.7.33905.399 | -| microsoft.net.runtime.android | 7.0.1023.36312 | -| microsoft.net.runtime.android.aot | 7.0.1023.36312 | -| microsoft.net.runtime.android.aot.net6 | 7.0.1023.36312 | -| microsoft.net.runtime.android.net6 | 7.0.1023.36312 | -| microsoft.net.runtime.ios | 7.0.1023.36312 | -| microsoft.net.runtime.ios.net6 | 7.0.1023.36312 | -| microsoft.net.runtime.maccatalyst | 7.0.1023.36312 | -| microsoft.net.runtime.maccatalyst.net6 | 7.0.1023.36312 | -| microsoft.net.runtime.mono.tooling | 7.0.1023.36312 | -| microsoft.net.runtime.mono.tooling.net6 | 7.0.1023.36312 | -| microsoft.net.sdk.emscripten.net7 | 7.0.8.36202 | +| microsoft.net.runtime.android | 7.0.1123.42427 | +| microsoft.net.runtime.android.aot | 7.0.1123.42427 | +| microsoft.net.runtime.android.aot.net6 | 7.0.1123.42427 | +| microsoft.net.runtime.android.net6 | 7.0.1123.42427 | +| microsoft.net.runtime.ios | 7.0.1123.42427 | +| microsoft.net.runtime.ios.net6 | 7.0.1123.42427 | +| microsoft.net.runtime.maccatalyst | 7.0.1123.42427 | +| microsoft.net.runtime.maccatalyst.net6 | 7.0.1123.42427 | +| microsoft.net.runtime.mono.tooling | 7.0.1123.42427 | +| microsoft.net.runtime.mono.tooling.net6 | 7.0.1123.42427 | +| microsoft.net.sdk.emscripten.net7 | 7.0.8.42402 | | Microsoft.NetCore.Component.DevelopmentTools | 17.7.33905.399 | -| Microsoft.NetCore.Component.Runtime.6.0 | 17.7.34002.345 | -| Microsoft.NetCore.Component.Runtime.7.0 | 17.7.34002.345 | -| Microsoft.NetCore.Component.SDK | 17.7.34002.345 | +| Microsoft.NetCore.Component.Runtime.6.0 | 17.7.34031.279 | +| Microsoft.NetCore.Component.Runtime.7.0 | 17.7.34031.279 | +| Microsoft.NetCore.Component.SDK | 17.7.34031.279 | | Microsoft.NetCore.Component.Web | 17.7.33905.399 | | Microsoft.VisualStudio.Component.AppInsights.Tools | 17.7.33905.399 | | Microsoft.VisualStudio.Component.AspNet | 17.7.33905.399 | @@ -520,14 +519,14 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Workload.Python | 17.7.33905.399 | | Microsoft.VisualStudio.Workload.Universal | 17.7.33905.399 | | Microsoft.VisualStudio.Workload.VisualStudioExtension | 17.7.33905.399 | -| runtimes.ios | 7.0.1023.36312 | -| runtimes.ios.net6 | 7.0.1023.36312 | -| runtimes.maccatalyst | 7.0.1023.36312 | -| runtimes.maccatalyst.net6 | 7.0.1023.36312 | -| wasm.tools | 7.0.1023.36312 | +| runtimes.ios | 7.0.1123.42427 | +| runtimes.ios.net6 | 7.0.1123.42427 | +| runtimes.maccatalyst | 7.0.1123.42427 | +| runtimes.maccatalyst.net6 | 7.0.1123.42427 | +| wasm.tools | 7.0.1123.42427 | | ProBITools.MicrosoftAnalysisServicesModelingProjects2022 | 3.0.4 | | ProBITools.MicrosoftReportProjectsforVisualStudio2022 | 3.0.1 | -| SSIS.MicrosoftDataToolsIntegrationServices | 1.1 | +| SSIS.MicrosoftDataToolsIntegrationServices | 1.2 | | VisualStudioClient.MicrosoftVisualStudio2022InstallerProjects | 2.0.0 | | Windows Driver Kit | 10.1.22621.382 | | Windows Driver Kit Visual Studio Extension | 10.0.22621.0 | @@ -554,11 +553,11 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 10.0.22621.0 ### .NET Core Tools -- .NET Core SDK: 6.0.121, 6.0.203, 6.0.316, 6.0.413, 7.0.400 +- .NET Core SDK: 6.0.122, 6.0.203, 6.0.317, 6.0.414, 7.0.401 - .NET Framework: 4.8, 4.8.1 -- Microsoft.AspNetCore.App: 6.0.5, 6.0.21, 7.0.10 -- Microsoft.NETCore.App: 6.0.5, 6.0.21, 7.0.10 -- Microsoft.WindowsDesktop.App: 6.0.5, 6.0.21, 7.0.10 +- Microsoft.AspNetCore.App: 6.0.5, 6.0.22, 7.0.11 +- Microsoft.NETCore.App: 6.0.5, 6.0.22, 7.0.11 +- Microsoft.WindowsDesktop.App: 6.0.5, 6.0.22, 7.0.11 - nbgv 3.6.133+2d32d93cb1 ### PowerShell Tools @@ -571,7 +570,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Az (Cached): 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.411 +- AWSPowershell: 4.1.416 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 - Microsoft.Graph: 2.5.0 @@ -615,9 +614,9 @@ All other versions are saved but not installed. ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2022 | sha256:12a06ca80b319d7933f5f09eb6c3122140d02f2617e06dd79c1e86babc6574cc | 2023-08-08 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2022 | sha256:5bbc1f0666ae0709c9f8772bc11428eb123537dae4d74d80d5dd8750e6a32099 | 2023-08-08 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:ed059488bf55bdb47598574ce042dceee5f8c4923a332618ceddcdcce7d2a7f7 | 2023-08-08 | -| mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:385844aa0840c876ffd207643c709355ad68e906013961dac4b347e37bccb98a | 2023-08-03 | -| mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:f1974546e8a73746e6c60781895341dd7a6760e28534d3d0cc5f3c88c1f5825a | 2023-08-03 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2022 | sha256:5aa61257ffbd2dbc534f2591d70dbc56fad6e8ca363d48f5aa4f2c2b2ab64821 | 2023-09-12 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2022 | sha256:49bb37677c8d61281f15a49d3291baff4f5583e6cf5846fc4cee7527e59ff1c5 | 2023-09-12 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:1477b5cc53a36a8a5e8b865a5e11a32e836ba6061c120e4e5b0a1eea1fdf6c98 | 2023-09-12 | +| mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:6562c9a2580260e4f2e3a081cc2cf1d960899cbce7c4568fb851e4848ca50e07 | 2023-09-01 | +| mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:d227d7ab11f4aa0da7779adc31616924cf0b15846a10313d83a644541208f80b | 2023-09-01 | From ed105d016eeb5523421580d8927aa88f3c2f24d8 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Thu, 21 Sep 2023 13:57:24 +0200 Subject: [PATCH 2222/3485] [macOS] improve openssl@1.1 installation on arm64 (#8353) --- images/macos/provision/core/openssl.sh | 6 +++++- images/macos/tests/OpenSSL.Tests.ps1 | 7 +++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/images/macos/provision/core/openssl.sh b/images/macos/provision/core/openssl.sh index c2308a240196..0cfbcb07f199 100755 --- a/images/macos/provision/core/openssl.sh +++ b/images/macos/provision/core/openssl.sh @@ -4,11 +4,15 @@ source ~/utils/utils.sh echo "Install openssl@1.1" brew_smart_install "openssl@1.1" -# Intel-related symlinks, not needed on arm64 for now if ! is_VenturaArm64; then # Symlink brew openssl@1.1 to `/usr/local/bin` as Homebrew refuses ln -sf $(brew --prefix openssl@1.1)/bin/openssl /usr/local/bin/openssl +else + # arm64 has a different installation prefix for brew + ln -sf $(brew --prefix openssl@1.1)/bin/openssl /opt/homebrew/bin/openssl +fi +if ! is_VenturaArm64; then # Most of buildsystems and scripts look up ssl here ln -sf $(brew --cellar openssl@1.1)/1.1* /usr/local/opt/openssl fi diff --git a/images/macos/tests/OpenSSL.Tests.ps1 b/images/macos/tests/OpenSSL.Tests.ps1 index ea0c39da0e69..4b74b2603d30 100644 --- a/images/macos/tests/OpenSSL.Tests.ps1 +++ b/images/macos/tests/OpenSSL.Tests.ps1 @@ -1,7 +1,6 @@ Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" -$os = Get-OSVersion -Describe "OpenSSL" -Skip:($os.IsVenturaArm64) { +Describe "OpenSSL" { Context "OpenSSL Version" { It "OpenSSL is available" { "openssl version" | Should -ReturnZeroExitCode @@ -10,7 +9,7 @@ Describe "OpenSSL" -Skip:($os.IsVenturaArm64) { Context "OpenSSL 1.1 Path Check" { It "OpenSSL 1.1 path exists" { - $openSSLpath = "/usr/local/opt/openssl@1.1" + $openSSLpath = brew --prefix openssl@1.1 $openSSLpath | Should -Exist } } @@ -21,4 +20,4 @@ Describe "OpenSSL" -Skip:($os.IsVenturaArm64) { $commandResult.Output | Should -Match "OpenSSL 1.1" } } -} \ No newline at end of file +} From 632035024caf302ed3661128ce3e5fef65ba0381 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 21 Sep 2023 16:28:02 +0000 Subject: [PATCH 2223/3485] Updating readme file for ubuntu22 version 20230917.1.0 (#8307) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2204-Readme.md | 61 +++++++++++++++---------------- 1 file changed, 30 insertions(+), 31 deletions(-) diff --git a/images/linux/Ubuntu2204-Readme.md b/images/linux/Ubuntu2204-Readme.md index b4554ed9d7e3..d8e0df4c45d9 100644 --- a/images/linux/Ubuntu2204-Readme.md +++ b/images/linux/Ubuntu2204-Readme.md @@ -7,8 +7,8 @@ # Ubuntu 22.04 - OS Version: 22.04.3 LTS - Kernel Version: 6.2.0-1011-azure -- Image Version: 20230911.1.0 -- Systemd version: 249.11-0ubuntu3.9 +- Image Version: 20230917.1.0 +- Systemd version: 249.11-0ubuntu3.10 ## Installed Software @@ -41,7 +41,7 @@ - Pip3 22.0.2 - Pipx 1.2.0 - RubyGems 3.3.5 -- Vcpkg (build from commit 962e5e39f) +- Vcpkg (build from commit e8c2a04eb) - Yarn 1.22.19 #### Environment variables @@ -59,7 +59,7 @@ to accomplish this. ``` ### Project Management -- Lerna 7.2.0 +- Lerna 7.3.0 - Maven 3.8.8 ### Tools @@ -70,15 +70,15 @@ to accomplish this. - Bazelisk 1.18.0 - Bicep 0.21.1 - Buildah 1.23.1 -- CMake 3.27.4 -- CodeQL Action Bundles 2.14.2 2.14.3 +- CMake 3.27.5 +- CodeQL Action Bundles 2.14.4 2.14.5 - Docker Amazon ECR Credential Helper 0.7.1 - Docker Compose v1 1.29.2 - Docker Compose v2 2.21.0 - Docker-Buildx 0.11.2 - Docker Client 24.0.6 - Docker Server 24.0.6 -- Fastlane 2.214.0 +- Fastlane 2.215.1 - Git 2.42.0 - Git LFS 3.4.0 - Git-ftp 1.6.0 @@ -86,20 +86,20 @@ to accomplish this. - Heroku 8.4.2 - jq 1.6 - Kind 0.20.0 -- Kubectl 1.28.1 +- Kubectl 1.28.2 - Kustomize 5.1.1 - Leiningen 2.10.0 - MediaInfo 21.09 - Mercurial 6.1.1 - Minikube 1.31.2 - n 9.1.0 -- Newman 5.3.2 +- Newman 6.0.0 - nvm 0.39.5 - OpenSSL 3.0.2-0ubuntu1.10 - Packer 1.9.4 - Parcel 2.9.3 - Podman 3.4.4 -- Pulumi 3.81.0 +- Pulumi 3.83.0 - R 4.3.1 - Skopeo 1.4.1 - Sphinx Open Source Search Server 2.2.11 @@ -111,18 +111,18 @@ to accomplish this. ### CLI Tools - Alibaba Cloud CLI 3.0.181 -- AWS CLI 2.13.17 +- AWS CLI 2.13.19 - AWS CLI Session Manager Plugin 1.2.497.0 - AWS SAM CLI 1.97.0 - Azure CLI 2.52.0 - Azure CLI (azure-devops) 0.26.0 - GitHub CLI 2.34.0 -- Google Cloud SDK 445.0.0 +- Google Cloud SDK 446.0.1 - Hub CLI 2.14.2 -- Netlify CLI 16.3.1 -- OpenShift CLI 4.13.11 +- Netlify CLI 16.3.3 +- OpenShift CLI 4.13.12 - ORAS CLI 1.1.0 -- Vercel CLI 32.2.1 +- Vercel CLI 32.2.4 ### Java | Version | Environment Variable | @@ -133,7 +133,7 @@ to accomplish this. ### PHP Tools - PHP: 8.1.2 -- Composer 2.6.2 +- Composer 2.6.3 - PHPUnit 8.5.33 ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. @@ -156,17 +156,17 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Cargo audit 0.18.1 - Cargo clippy 0.1.72 - Cargo outdated 0.13.1 -- Cbindgen 0.25.0 +- Cbindgen 0.26.0 - Rustfmt 1.6.0 ### Browsers and Drivers -- Google Chrome 116.0.5845.187 -- ChromeDriver 116.0.5845.96 -- Chromium 116.0.5845.0 -- Microsoft Edge 116.0.1938.76 -- Microsoft Edge WebDriver 116.0.1938.76 +- Google Chrome 117.0.5938.88 +- ChromeDriver 117.0.5938.88 +- Chromium 117.0.5938.0 +- Microsoft Edge 117.0.2045.31 +- Microsoft Edge WebDriver 117.0.2045.31 - Selenium server 4.12.0 -- Mozilla Firefox 117.0 +- Mozilla Firefox 117.0.1 - Geckodriver 0.33.0 #### Environment variables @@ -178,7 +178,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | ### .NET Tools -- .NET Core SDK: 6.0.413, 7.0.110, 7.0.203, 7.0.307, 7.0.400 +- .NET Core SDK: 6.0.414, 7.0.111, 7.0.203, 7.0.308, 7.0.401 - nbgv 3.6.133+2d32d93cb1 ### Databases @@ -208,7 +208,6 @@ Use the following command as a part of your job to start the service: 'sudo syst ### Cached Tools #### Go -- 1.18.10 - 1.19.13 - 1.20.8 - 1.21.1 @@ -315,7 +314,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | dpkg | 1.21.1ubuntu2.2 | | dpkg-dev | 1.21.1ubuntu2.2 | | fakeroot | 1.28-1ubuntu1 | -| file | 1:5.41-3 | +| file | 1:5.41-3ubuntu0.1 | | flex | 2.6.4-8build2 | | fonts-noto-color-emoji | 2.038-0ubuntu1 | | ftp | 20210827-4build1 | @@ -330,13 +329,13 @@ Use the following command as a part of your job to start the service: 'sudo syst | lib32z1 | 1:1.2.11.dfsg-2ubuntu9.2 | | libc++-dev | 1:14.0-55\~exp2 | | libc++abi-dev | 1:14.0-55\~exp2 | -| libc6-dev | 2.35-0ubuntu3.1 | +| libc6-dev | 2.35-0ubuntu3.3 | | libcurl4 | 7.81.0-1ubuntu1.13 | | libgbm-dev | 23.0.4-0ubuntu1\~22.04.1 | | libgconf-2-4 | 3.2.6-7ubuntu2 | | libgsl-dev | 2.7.1+dfsg-3 | | libgtk-3-0 | 3.24.33-1ubuntu2 | -| libmagic-dev | 1:5.41-3 | +| libmagic-dev | 1:5.41-3ubuntu0.1 | | libmagickcore-dev | 8:6.9.11.60+dfsg-1.3ubuntu0.22.04.3 | | libmagickwand-dev | 8:6.9.11.60+dfsg-1.3ubuntu0.22.04.3 | | libsecret-1-dev | 0.20.5-2 | @@ -347,7 +346,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | libxkbfile-dev | 1:1.1.0-1build3 | | libxss1 | 1:1.2.3-1build2 | | libyaml-dev | 0.2.2-1build2 | -| locales | 2.35-0ubuntu3.1 | +| locales | 2.35-0ubuntu3.3 | | lz4 | 1.9.3-2build2 | | m4 | 1.4.18-5ubuntu2 | | make | 4.3-4.1build1 | @@ -355,7 +354,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | mercurial | 6.1.1-1ubuntu1 | | net-tools | 1.60+git20181103.0eebece-1ubuntu5 | | netcat | 1.218-4ubuntu1 | -| openssh-client | 1:8.9p1-3ubuntu0.3 | +| openssh-client | 1:8.9p1-3ubuntu0.4 | | p7zip-full | 16.02+dfsg-8 | | p7zip-rar | 16.02-3build1 | | parallel | 20210822+ds-2 | @@ -370,7 +369,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | shellcheck | 0.8.0-2 | | sphinxsearch | 2.2.11-8 | | sqlite3 | 3.37.2-2ubuntu0.1 | -| ssh | 1:8.9p1-3ubuntu0.3 | +| ssh | 1:8.9p1-3ubuntu0.4 | | sshpass | 1.09-1 | | subversion | 1.14.1-3ubuntu0.22.04.1 | | sudo | 1.9.9-1ubuntu2.4 | From c0a84fc9dd3d8612bd594eb5bf6c7ddff4cae56d Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Fri, 22 Sep 2023 10:26:55 +0200 Subject: [PATCH 2224/3485] Switch to the new Azure Function (#8359) --- README.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index d9b4ddf5a7e9..79f121f1a74a 100644 --- a/README.md +++ b/README.md @@ -21,13 +21,13 @@ To build a VM machine from this repo's source, see the [instructions](docs/creat | Image | YAML Label | Included Software | Rollout Progress of Latest Image Release | | --------------------|---------------------|--------------------|---------------------| -| Ubuntu 22.04 | `ubuntu-latest` or `ubuntu-22.04` | [ubuntu-22.04] | [![status22](https://runnerimagesdeploymentstatus.azurewebsites.net/api/status?imageName=ubuntu22&badge=1)](https://runnerimagesdeploymentstatus.azurewebsites.net/api/status?imageName=ubuntu22&redirect=1) -| Ubuntu 20.04 | `ubuntu-20.04` | [ubuntu-20.04] | [![status20](https://runnerimagesdeploymentstatus.azurewebsites.net/api/status?imageName=ubuntu20&badge=1)](https://runnerimagesdeploymentstatus.azurewebsites.net/api/status?imageName=ubuntu20&redirect=1) -| macOS 13 [beta] | `macos-13` or `macos-13-xl`| [macOS-13] | [![statusumac13](https://runnerimagesdeploymentstatus.azurewebsites.net/api/status?imageName=macos-13&badge=1)](https://runnerimagesdeploymentstatus.azurewebsites.net/api/status?imageName=macos-13&redirect=1) -| macOS 12 | `macos-latest`, `macos-latest-xl`, `macos-12`, or `macos-12-xl`| [macOS-12] | [![statusumac12](https://runnerimagesdeploymentstatus.azurewebsites.net/api/status?imageName=macos-12&badge=1)](https://runnerimagesdeploymentstatus.azurewebsites.net/api/status?imageName=macos-12&redirect=1) -| macOS 11 | `macos-11`| [macOS-11] | [![statusmac11](https://runnerimagesdeploymentstatus.azurewebsites.net/api/status?imageName=macos-11&badge=1)](https://runnerimagesdeploymentstatus.azurewebsites.net/api/status?imageName=macos-11&redirect=1) -| Windows Server 2022 | `windows-latest` or `windows-2022` | [windows-2022] | [![statuswin22](https://runnerimagesdeploymentstatus.azurewebsites.net/api/status?imageName=windows-2022&badge=1)](https://runnerimagesdeploymentstatus.azurewebsites.net/api/status?imageName=windows-2022&redirect=1) | -| Windows Server 2019 | `windows-2019` | [windows-2019] | [![statuswin19](https://runnerimagesdeploymentstatus.azurewebsites.net/api/status?imageName=windows-2019&badge=1)](https://runnerimagesdeploymentstatus.azurewebsites.net/api/status?imageName=windows-2019&redirect=1) +| Ubuntu 22.04 | `ubuntu-latest` or `ubuntu-22.04` | [ubuntu-22.04] | [![status22](https://gh-runnerimagesdeploymentstatus.azurewebsites.net/api/status?imageName=ubuntu22&badge=1)](https://gh-runnerimagesdeploymentstatus.azurewebsites.net/api/status?imageName=ubuntu22&redirect=1) +| Ubuntu 20.04 | `ubuntu-20.04` | [ubuntu-20.04] | [![status20](https://gh-runnerimagesdeploymentstatus.azurewebsites.net/api/status?imageName=ubuntu20&badge=1)](https://gh-runnerimagesdeploymentstatus.azurewebsites.net/api/status?imageName=ubuntu20&redirect=1) +| macOS 13 [beta] | `macos-13` or `macos-13-xl`| [macOS-13] | [![statusumac13](https://gh-runnerimagesdeploymentstatus.azurewebsites.net/api/status?imageName=macos-13&badge=1)](https://gh-runnerimagesdeploymentstatus.azurewebsites.net/api/status?imageName=macos-13&redirect=1) +| macOS 12 | `macos-latest`, `macos-latest-xl`, `macos-12`, or `macos-12-xl`| [macOS-12] | [![statusumac12](https://gh-runnerimagesdeploymentstatus.azurewebsites.net/api/status?imageName=macos-12&badge=1)](https://gh-runnerimagesdeploymentstatus.azurewebsites.net/api/status?imageName=macos-12&redirect=1) +| macOS 11 | `macos-11`| [macOS-11] | [![statusmac11](https://gh-runnerimagesdeploymentstatus.azurewebsites.net/api/status?imageName=macos-11&badge=1)](https://gh-runnerimagesdeploymentstatus.azurewebsites.net/api/status?imageName=macos-11&redirect=1) +| Windows Server 2022 | `windows-latest` or `windows-2022` | [windows-2022] | [![statuswin22](https://gh-runnerimagesdeploymentstatus.azurewebsites.net/api/status?imageName=windows-2022&badge=1)](https://gh-runnerimagesdeploymentstatus.azurewebsites.net/api/status?imageName=windows-2022&redirect=1) | +| Windows Server 2019 | `windows-2019` | [windows-2019] | [![statuswin19](https://gh-runnerimagesdeploymentstatus.azurewebsites.net/api/status?imageName=windows-2019&badge=1)](https://gh-runnerimagesdeploymentstatus.azurewebsites.net/api/status?imageName=windows-2019&redirect=1) ### Label scheme From 55ce401f7ff74f46fc03aeb4b7e1058c1af0c8b7 Mon Sep 17 00:00:00 2001 From: sergei-pyshnoi <121864472+sergei-pyshnoi@users.noreply.github.com> Date: Fri, 22 Sep 2023 10:52:16 +0200 Subject: [PATCH 2225/3485] [Windows] Add signature validator for MongoDB (#8304) --- .../scripts/ImageHelpers/InstallHelpers.ps1 | 38 ++++++++++++++++++- .../scripts/Installers/Install-MongoDB.ps1 | 2 +- images/win/toolsets/toolset-2019.json | 3 +- images/win/toolsets/toolset-2022.json | 3 +- 4 files changed, 41 insertions(+), 5 deletions(-) diff --git a/images/win/scripts/ImageHelpers/InstallHelpers.ps1 b/images/win/scripts/ImageHelpers/InstallHelpers.ps1 index 58f2b6f25379..e5499625630e 100644 --- a/images/win/scripts/ImageHelpers/InstallHelpers.ps1 +++ b/images/win/scripts/ImageHelpers/InstallHelpers.ps1 @@ -17,7 +17,7 @@ function Install-Binary The list of arguments that will be passed to the installer. Required for .exe binaries. .EXAMPLE - Install-Binary -Url "https://go.microsoft.com/fwlink/p/?linkid=2083338" -Name "winsdksetup.exe" -ArgumentList ("/features", "+", "/quiet") + Install-Binary -Url "https://go.microsoft.com/fwlink/p/?linkid=2083338" -Name "winsdksetup.exe" -ArgumentList ("/features", "+", "/quiet") -ExpectedSignature "XXXXXXXXXXXXXXXXXXXXXXXXXX" #> Param @@ -28,7 +28,8 @@ function Install-Binary [String] $Name, [Parameter(Mandatory, ParameterSetName="LocalPath")] [String] $FilePath, - [String[]] $ArgumentList + [String[]] $ArgumentList, + [String] $ExpectedSignature ) if ($PSCmdlet.ParameterSetName -eq "LocalPath") @@ -41,6 +42,19 @@ function Install-Binary $filePath = Start-DownloadWithRetry -Url $Url -Name $Name } + if ($PSBoundParameters.ContainsKey('ExpectedSignature')) + { + if ($ExpectedSignature) + { + Test-FileSignature -FilePath $filePath -ExpectedThumbprint $ExpectedSignature + + } + else + { + throw "ExpectedSignature parameter is specified, but no signature is provided." + } + } + # MSI binaries should be installed via msiexec.exe $fileExtension = ([System.IO.Path]::GetExtension($Name)).Replace(".", "") if ($fileExtension -eq "msi") @@ -687,3 +701,23 @@ function Get-HashFromGitHubReleaseBody { } return $result } +function Test-FileSignature { + param( + [Parameter(Mandatory=$true)] + [string]$FilePath, + [Parameter(Mandatory=$true)] + [string]$ExpectedThumbprint + ) + + $signature = Get-AuthenticodeSignature $FilePath + + if ($signature.Status -ne "Valid") { + throw "Signature status is not valid. Status: $($signature.Status)" + } + + if ($signature.SignerCertificate.Thumbprint.Contains($ExpectedThumbprint) -ne $true) { + throw "Signature thumbprint do not match expected" + } + + Write-Output "Signature for $FilePath is valid" +} \ No newline at end of file diff --git a/images/win/scripts/Installers/Install-MongoDB.ps1 b/images/win/scripts/Installers/Install-MongoDB.ps1 index c76978109441..0387aa26d5d4 100644 --- a/images/win/scripts/Installers/Install-MongoDB.ps1 +++ b/images/win/scripts/Installers/Install-MongoDB.ps1 @@ -22,7 +22,7 @@ $installDir = "c:\PROGRA~1\MongoDB" $binaryName = "mongodb-windows-x86_64-$LatestVersion-signed.msi" $downloadURL = "https://fastdl.mongodb.org/windows/$BinaryName" $installArg = "INSTALLLOCATION=$installDir ADDLOCAL=all" -Install-Binary -Url $downloadURL -Name $binaryName -ArgumentList ("/q","/i","${env:Temp}\$binaryName", $installArg) +Install-Binary -Url $downloadURL -Name $binaryName -ArgumentList ("/q","/i","${env:Temp}\$binaryName", $installArg) -ExpectedSignature (Get-ToolsetContent).mongodb.signature # Add mongodb to the PATH diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index ab5693d4c17e..0837e56a4dc2 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -463,7 +463,8 @@ "version": "5.7" }, "mongodb": { - "version": "5.0" + "version": "5.0", + "signature": "F2D7C28591847BB2CB2B1C2A0C59459FDC728A38" }, "nsis": { "version": "3.08" diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index d04cd0a3c391..51894eed2894 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -399,7 +399,8 @@ "version": "8.0" }, "mongodb": { - "version": "5.0" + "version": "5.0", + "signature": "F2D7C28591847BB2CB2B1C2A0C59459FDC728A38" }, "nsis": { "version": "3.08" From 6cc56bac934d65047ef520dce0e8cdfaa20c98c1 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 22 Sep 2023 09:04:21 +0000 Subject: [PATCH 2226/3485] Updating readme file for macOS-11 version 20230915.2 (#8309) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-11-Readme.md | 81 +++++++++++++++++---------------- 1 file changed, 42 insertions(+), 39 deletions(-) diff --git a/images/macos/macos-11-Readme.md b/images/macos/macos-11-Readme.md index 299ef6675b81..39c20c9869ac 100644 --- a/images/macos/macos-11-Readme.md +++ b/images/macos/macos-11-Readme.md @@ -1,12 +1,17 @@ +| Announcements | +|-| +| [Ruby 2.4.x will be removed from the macOS 11 and Windows 2019 images on September 18](https://github.com/actions/runner-images/issues/8239) | +| [[All OSes] Go 1.18.x will be removed on September, 18](https://github.com/actions/runner-images/issues/8237) | +*** # macOS 11 -- OS Version: macOS 11.7.9 (20G1426) +- OS Version: macOS 11.7.10 (20G1427) - Kernel Version: Darwin 20.6.0 -- Image Version: 20230901.1 +- Image Version: 20230915.2 ## Installed Software ### Language and Runtime -- .NET Core SDK: 6.0.413, 7.0.102, 7.0.202, 7.0.306, 7.0.400 +- .NET Core SDK: 6.0.414, 7.0.102, 7.0.202, 7.0.306, 7.0.401 - Bash 3.2.57(1)-release - Clang/LLVM 13.0.0 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` @@ -18,7 +23,7 @@ - GNU Fortran 12 (Homebrew GCC 12.3.0) - available by `gfortran-12` alias - Julia 1.9.3 - Kotlin 1.9.10-release-459 -- Go 1.20.7 +- Go 1.20.8 - Mono 6.12.0.188 - MSBuild 16.10.1.51301 (Mono 6.12.0.188) - Node.js 18.17.1 @@ -35,8 +40,8 @@ - Bundler 2.4.19 - Carthage 0.39.0 - CocoaPods 1.12.1 -- Composer 2.6.1 -- Homebrew 4.1.7 +- Composer 2.6.3 +- Homebrew 4.1.11 - Miniconda 23.5.2 - NPM 9.6.7 - NuGet 6.3.1.1 @@ -44,7 +49,7 @@ - Pip3 23.2.1 (python 3.11) - Pipx 1.2.0 - RubyGems 3.4.19 -- Vcpkg 2023 (build from commit 4a600e9fe) +- Vcpkg 2023 (build from commit e8c2a04eb) - Yarn 1.22.19 #### Environment variables @@ -57,7 +62,7 @@ - Apache Ant 1.10.14 - Apache Maven 3.9.4 - Gradle 8.3 -- Sbt 1.9.4 +- Sbt 1.9.5 ### Utilities - 7-Zip 17.05 @@ -66,21 +71,21 @@ - bazel 6.3.2 - bazelisk 1.18.0 - bsdtar 3.3.2 - available by 'tar' alias -- Curl 8.2.1 +- Curl 8.3.0 - Git 2.42.0 - Git LFS 3.4.0 -- GitHub CLI 2.33.0 +- GitHub CLI 2.34.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.21.4 - gpg (GnuPG) 2.4.3 - helm v3.12.3+g3a31588 - Hub CLI 2.14.2 - ImageMagick 7.1.1-15 -- jq 1.6 +- jq 1.7 - mongo 5.0.17 - mongod 5.0.17 -- Newman 5.3.2 -- OpenSSL 1.1.1v 1 Aug 2023 +- Newman 6.0.0 +- OpenSSL 1.1.1w 11 Sep 2023 - Packer 1.9.4 - pkg-config 0.29.2 - PostgreSQL 14.9 (Homebrew) @@ -92,23 +97,23 @@ - zstd 1.5.5 ### Tools -- Aliyun CLI 3.0.180 +- Aliyun CLI 3.0.181 - App Center CLI 2.14.0 -- AWS CLI 2.13.15 -- AWS SAM CLI 1.96.0 -- AWS Session Manager CLI 1.2.463.0 -- Azure CLI 2.50.0 +- AWS CLI 2.13.19 +- AWS SAM CLI 1.97.0 +- AWS Session Manager CLI 1.2.497.0 +- Azure CLI 2.52.0 - Azure CLI (azure-devops) 0.26.0 -- Bicep CLI 0.20.4 +- Bicep CLI 0.21.1 - Cabal 3.6.2.0 -- Cmake 3.27.4 -- CodeQL Action Bundles 2.14.2 2.14.3 +- Cmake 3.27.5 +- CodeQL Action Bundles 2.14.4 2.14.5 - Fastlane 2.214.0 - GHC 9.6.2 - GHCup 0.1.19.4 - Jazzy 0.14.3 - Stack 2.9.3 -- SwiftFormat 0.52.2 +- SwiftFormat 0.52.3 - Swig 4.1.1 - Xcode Command Line Tools 13.2.0.0.1.1638488800 @@ -119,14 +124,14 @@ ### Browsers - Safari 16.6 (16615.3.12.11.3) - SafariDriver 16.6 (16615.3.12.11.3) -- Google Chrome 116.0.5845.140 -- Google Chrome for Testing 116.0.5845.96 -- ChromeDriver 116.0.5845.96 -- Microsoft Edge 116.0.1938.69 -- Microsoft Edge WebDriver 116.0.1938.69 -- Mozilla Firefox 117.0 +- Google Chrome 117.0.5938.88 +- Google Chrome for Testing 117.0.5938.88 +- ChromeDriver 117.0.5938.88 +- Microsoft Edge 117.0.2045.31 +- Microsoft Edge WebDriver 117.0.2045.31 +- Mozilla Firefox 117.0.1 - geckodriver 0.33.0 -- Selenium server 4.10.0 +- Selenium server 4.12.1 #### Environment variables | Name | Value | @@ -145,7 +150,6 @@ ### Cached Tools #### Ruby -- 2.4.10 - 2.5.9 - 2.6.10 - 2.7.8 @@ -172,10 +176,9 @@ - 18.17.1 #### Go -- 1.18.10 -- 1.19.12 -- 1.20.7 -- 1.21.0 +- 1.19.13 +- 1.20.8 +- 1.21.1 ### Rust Tools - Cargo 1.72.0 @@ -184,10 +187,10 @@ - Rustup 1.26.0 #### Packages -- Bindgen 0.66.1 +- Bindgen 0.68.1 - Cargo-audit 0.18.1 - Cargo-outdated 0.13.1 -- Cbindgen 0.25.0 +- Cbindgen 0.26.0 - Clippy 0.1.72 - Rustfmt 1.6.0-stable @@ -195,7 +198,7 @@ - PowerShell 7.2.13 #### PowerShell Modules -- Az: 10.2.0 +- Az: 10.3.0 - MarkdownPS: 1.9 - Pester: 5.5.0 - PSScriptAnalyzer: 1.21.0 @@ -212,7 +215,7 @@ | Version | Build | Path | | -------------- | ---------- | ------------------------------------ | | 2019 | 8.10.25.2 | /Applications/Visual Studio 2019.app | -| 2022 (default) | 17.6.3.421 | /Applications/Visual Studio.app | +| 2022 (default) | 17.6.4.472 | /Applications/Visual Studio.app | ##### Notes ``` @@ -352,6 +355,6 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" ### Miscellaneous - libXext 1.3.5 - libXft 2.3.8 -- Tcl/Tk 8.6.13_4 +- Tcl/Tk 8.6.13_5 - Zlib 1.3 From e1ac652396a578559eb8a2541225746a6f2fcbfa Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Fri, 22 Sep 2023 11:26:00 +0200 Subject: [PATCH 2227/3485] [Windows] Add checksum verification for Kotlin (#8318) --- images/win/scripts/Installers/Install-Kotlin.ps1 | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/images/win/scripts/Installers/Install-Kotlin.ps1 b/images/win/scripts/Installers/Install-Kotlin.ps1 index 09009433c27f..b5084fd51e41 100644 --- a/images/win/scripts/Installers/Install-Kotlin.ps1 +++ b/images/win/scripts/Installers/Install-Kotlin.ps1 @@ -1,6 +1,7 @@ ################################################################################ ## File: Install-Kotlin.ps1 ## Desc: Install Kotlin +## Supply chain security: Kotlin - checksum validation ################################################################################ # Install Kotlin @@ -10,6 +11,12 @@ $kotlinBinaryName = (Get-ToolsetContent).kotlin.binary_name $kotlinDownloadUrl = Get-GitHubPackageDownloadUrl -RepoOwner "JetBrains" -RepoName "kotlin" -BinaryName $kotlinBinaryName -Version $kotlinVersion -UrlFilter "*{BinaryName}-{Version}.zip" $kotlinInstallerPath = Start-DownloadWithRetry -Url $kotlinDownloadUrl -Name "$kotlinBinaryName.zip" +#region Supply chain security +$fileHash = (Get-FileHash -Path $kotlinInstallerPath -Algorithm SHA256).Hash +$externalHash = Get-HashFromGitHubReleaseBody -RepoOwner "JetBrains" -RepoName "kotlin" -FileName "$kotlinBinaryName" -Version $kotlinVersion -WordNumber 2 +Use-ChecksumComparison $fileHash $externalHash +#endregion + Write-Host "Expand Kotlin archive" $kotlinPath = "C:\tools" Extract-7Zip -Path $kotlinInstallerPath -DestinationPath $kotlinPath @@ -17,4 +24,4 @@ Extract-7Zip -Path $kotlinInstallerPath -DestinationPath $kotlinPath # Add to PATH Add-MachinePathItem "$kotlinPath\kotlinc\bin" -Invoke-PesterTests -TestFile "Tools" -TestName "Kotlin" \ No newline at end of file +Invoke-PesterTests -TestFile "Tools" -TestName "Kotlin" From 73b4a8a4f2c8a36fa7a0e1d994743848e815b442 Mon Sep 17 00:00:00 2001 From: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com> Date: Fri, 22 Sep 2023 11:34:04 +0200 Subject: [PATCH 2228/3485] helpers/GenerateResourcesAndImage.ps1: check for interactive mode (#8326) * helpers/GenerateResourcesAndImage.ps1: check for interactive mode when RG already exists, we asked user whether to delete it, however it is only possible in interactive mode * mention -ReuseResourceGroup as an option, add back new line --- helpers/GenerateResourcesAndImage.ps1 | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/helpers/GenerateResourcesAndImage.ps1 b/helpers/GenerateResourcesAndImage.ps1 index 2ca3503de30b..120e27760c58 100644 --- a/helpers/GenerateResourcesAndImage.ps1 +++ b/helpers/GenerateResourcesAndImage.ps1 @@ -266,16 +266,23 @@ Function GenerateResourcesAndImage { $ResourceGroupExists = $false } else { - # Resource group already exists, ask the user what to do - $title = "Resource group '$ResourceGroupName' already exists" - $message = "Do you want to delete the resource group and all resources in it?" + # are we running in a non-interactive session? + # https://stackoverflow.com/questions/9738535/powershell-test-for-noninteractive-mode + if ([System.Console]::IsOutputRedirected -or ![Environment]::UserInteractive -or !!([Environment]::GetCommandLineArgs() | Where-Object { $_ -ilike '-noni*' })) { + throw "Non-interactive mode, resource group '$ResourceGroupName' already exists, either specify -Force to delete it, or -ReuseResourceGroup to reuse." + } + else { + # Resource group already exists, ask the user what to do + $title = "Resource group '$ResourceGroupName' already exists" + $message = "Do you want to delete the resource group and all resources in it?" - $options = @( - [System.Management.Automation.Host.ChoiceDescription]::new("&Yes", "Delete the resource group and all resources in it."), - [System.Management.Automation.Host.ChoiceDescription]::new("&No", "Keep the resource group and continue."), - [System.Management.Automation.Host.ChoiceDescription]::new("&Abort", "Abort execution.") - ) - $result = $Host.UI.PromptForChoice($title, $message, $options, 0) + $options = @( + [System.Management.Automation.Host.ChoiceDescription]::new("&Yes", "Delete the resource group and all resources in it."), + [System.Management.Automation.Host.ChoiceDescription]::new("&No", "Keep the resource group and continue."), + [System.Management.Automation.Host.ChoiceDescription]::new("&Abort", "Abort execution.") + ) + $result = $Host.UI.PromptForChoice($title, $message, $options, 0) + } switch ($result) { 0 { From fb634ef6525e090f5af8749f55438421c7d29cab Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Fri, 22 Sep 2023 11:36:22 +0200 Subject: [PATCH 2229/3485] Update manual to clarify helper script purpose (#8356) * Update manual to clarify helper script purpose * Update structure and add table of contents --- docs/create-image-and-azure-resources.md | 84 +++++++++++++++++++----- 1 file changed, 67 insertions(+), 17 deletions(-) diff --git a/docs/create-image-and-azure-resources.md b/docs/create-image-and-azure-resources.md index 15f9daf8d27f..a1f14ee7152b 100644 --- a/docs/create-image-and-azure-resources.md +++ b/docs/create-image-and-azure-resources.md @@ -14,6 +14,22 @@ Packer also attempts to cleanup all the temporary resources it created (unless o After successful completion of all installation steps Packer creates managed image from the temporary VM's disk and deletes the VM. +- [Build agent preparation](#build-agent-preparation) +- [Manual image generation](#manual-image-generation) +- [Manual image generation customization](#manual-image-generation-customization) + - [Network security](#network-security) + - [Azure subscription authentication](#azure-subscription-authentication) +- [Generated machine deployment](#generated-machine-deployment) +- [Automated image generation](#automated-image-generation) + - [Required variables](#required-variables) + - [Optional variables](#optional-variables) +- [Builder variables](#builder-variables) +- [Toolset](#toolset) +- [Post-generation scripts](#post-generation-scripts) + - [Running scripts](#running-scripts) + - [Script details: Ubuntu](#script-details-ubuntu) + - [Script details: Windows](#script-details-windows) + ## Build agent preparation Build agent is a machine where Packer process will be started. @@ -55,15 +71,15 @@ In any case you will need these software installed: Start-Process msiexec.exe -Wait -ArgumentList '/I AzureCLI.msi /quiet'; rm .\AzureCLI.msi ``` -## Automated image generation +## Manual image generation -This repo bundles script that automates image generation process. -You only need a build agent configured as described above and active Azure subscription. -We suggest to start with UbuntuMinimal image because it includes only a minimal set of required software and builds in less then half an hour. +This repo bundles script that helps generating images in Azure. +All you need are Azure subscription and build agent configured as described above. +We suggest starting with building UbuntuMinimal image because it includes only basic software and build in less than 30 minutes. -All steps here are supposed to run in Powershell. +All the commands below should be executed in Powershell. -First, clone runner-images repository and change directory: +First clone runner-images repository and set current directory to it: ```powershell git clone https://github.com/actions/runner-images.git @@ -87,7 +103,7 @@ This function automatically creates all required Azure resources and kicks off p When image is ready you may proceed to [deployment](#generated-machine-deployment) -## Image generation customization +## Manual image generation customization Function `GenerateResourcesAndImage` accepts a bunch of arguments that may help you generating image in your specific environment. @@ -166,12 +182,46 @@ Where: The function creates an Azure VM and generates network resources in Azure to make the VM accessible. -## Manual image generation +## Automated image generation -If you want more control over image generation process you may run Packer directly. This section describes variables defined in Packer template. Some of them may be set using environment variables. +If you want to generate images automatically (e.g. as a part of CI/CD pipeline) +you can use Packer directly. To do that you will need: + +- A build agent configured as described in + [Build agent preparation](#build-agent-preparation) section. +- Azure subscription and Service Principal configured as described in + [Azure subscription authentication](#azure-subscription-authentication) section. +- Resource group created in your Azure subscription where managed image will be stored. +- String to be used as password for the user used to install software (Windows only). + +Then you can invoke Packer in you CI/CD pipeline using the following command: + +```powershell +packer build -var "subscription_id=$SubscriptionId" ` + -var "client_id=$ClientId" ` + -var "client_secret=$ClientSecret" ` + -var "install_password=$InstallPassword" ` + -var "location=$Location" ` + -var "managed_image_name=$ImageName" ` + -var "managed_image_resource_group_name=$ImageResourceGroupName" ` + -var "tenant_id=$TenantId" ` + $TemplatePath +``` + +Where: + +- `SubscriptionId` - your Azure Subscription ID +- `ClientId` and `ClientSecret` - Service Principal credentials +- `TenantId` - Azure Tenant ID +- `InstallPassword` - password for the user used to install software (Windows only) +- `Location` - location where resources will be created (e.g. "East US") +- `ImageName` and `ImageResourceGroupName` - name of the resource group where managed image will be stored +- `TemplatePath` - path to the Packer template file (e.g. "images/win/windows2022.json") ### Required variables +The following variables are required to be passed to Packer process: + | Template var | Env var | Description | ------------ | ------- | ----------- | `subscription_id` | `ARM_SUBSCRIPTION_ID` | Subscription under which the build will be performed. @@ -183,6 +233,8 @@ If you want more control over image generation process you may run Packer direct ### Optional variables +The following variables are optional: + - `managed_image_name` - Name of the managed image to create. If not specified, "Runner-Image-{{ImageType}}" will be used. - `build_resource_group_name` - Specify an existing resource group to run the build in it. By default, a temporary resource group will be created and destroyed as part of the build. If you do not have permission to do so, use build_resource_group_name to specify an existing resource group to run the build in it. - `object_id` - The object ID for the AAD SP. Will be derived from the oAuth token if empty. @@ -193,7 +245,7 @@ If you want more control over image generation process you may run Packer direct - `virtual_network_resource_group_name` - If `virtual_network_name` is set, this value may also be set. If `virtual_network_name` is set, and this value is not set the builder attempts to determine the resource group containing the virtual network. If the resource group cannot be found, or it cannot be disambiguated, this value should be set. - `virtual_network_subnet_name` - If `virtual_network_name` is set, this value may also be set. If `virtual_network_name` is set, and this value is not set the builder attempts to determine the subnet to use with the virtual network. If the subnet cannot be found, or it cannot be disambiguated, this value should be set. -### Builder variables +## Builder variables The `builders` section contains variables for the `azure-arm` builder used in the project. Most of the builder variables are inherited from the `user variables` section, however, the variables can be overwritten to adjust image-generation performance. @@ -203,7 +255,7 @@ The `builders` section contains variables for the `azure-arm` builder used in th **Detailed Azure builders documentation can be found in [packer documentation](https://www.packer.io/docs/builders/azure).** -### Toolset +## Toolset Configuration for some installed software is located in `toolset.json` files. These files define the list of Ruby, Python, Go versions, the list of PowerShell modules and VS components that will be installed to image. They can be changed if these tools are not required to reduce image generation time or image size. @@ -213,7 +265,7 @@ Generated tool versions and details can be found in related projects: - [Go](https://github.com/actions/go-versions) - [Node](https://github.com/actions/node-versions) -### Post-generation scripts +## Post-generation scripts > :warning: These scripts are intended to run on a VM deployed in Azure @@ -229,7 +281,7 @@ The scripts are copied to the image during the generation process to the followi - Windows: `C:\post-generation` - Linux: `/opt/post-generation` -#### Running scripts +### Running scripts - Ubuntu @@ -243,16 +295,14 @@ The scripts are copied to the image during the generation process to the followi Get-ChildItem C:\post-generation -Filter *.ps1 | ForEach-Object { & $_.FullName } ``` -#### Script details - -##### Ubuntu +### Script details: Ubuntu - **cleanup-logs.sh** - removes all build process logs from the machine - **environment-variables.sh** - replaces `$HOME` with the default user's home directory for environmental variables related to the default user home directory - **homebrew-permissions.sh** - Resets homebrew repository directory by running `git reset --hard` to make the working tree clean after chmoding /home and changes the repository directory owner to the current user - **rust-permissions.sh** - fixes permissions for the Rust folder. Detailed issue explanation is provided in [runner-images/issues/572](https://github.com/actions/runner-images/issues/572). -##### Windows +### Script details: Windows - **GenerateIISExpressCertificate.ps1** - generates and imports a certificate to run applications with IIS Express through HTTPS - **InternetExplorerConfiguration** - turns off the Internet Explorer Enhanced Security feature From 19c23d12083011cd942ddf0acd0cd6b8e12ec501 Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Fri, 22 Sep 2023 12:33:37 +0200 Subject: [PATCH 2230/3485] Add mono to mac OS 13 image (#8342) --- images/macos/provision/core/mono.sh | 54 +++++++++++++++++++ .../SoftwareReport.Generator.ps1 | 6 ++- images/macos/templates/macOS-13.anka.pkr.hcl | 1 + .../templates/macOS-13.arm64.anka.pkr.hcl | 1 + images/macos/tests/Xamarin.Tests.ps1 | 32 ++++++----- images/macos/toolsets/toolset-13.json | 8 +++ 6 files changed, 87 insertions(+), 15 deletions(-) create mode 100644 images/macos/provision/core/mono.sh diff --git a/images/macos/provision/core/mono.sh b/images/macos/provision/core/mono.sh new file mode 100644 index 000000000000..f4052a252ca4 --- /dev/null +++ b/images/macos/provision/core/mono.sh @@ -0,0 +1,54 @@ +#!/bin/bash -e -o pipefail + +################################################################################ +## File: mono.sh +## Desc: Installs Mono Framework +################################################################################ + +# Source utility functions +source ~/utils/utils.sh + +# Create a temporary directory to store downloaded files +TMP_DIR=$(mktemp -d /tmp/visualstudio.XXXX) + +# Install Mono Framework +MONO_VERSION_FULL=$(get_toolset_value '.mono.framework.version') +MONO_VERSION=$(echo "$MONO_VERSION_FULL" | cut -d. -f 1,2,3) +MONO_VERSION_SHORT=$(echo $MONO_VERSION_FULL | cut -d. -f 1,2) +MONO_PKG_URL="https://download.mono-project.com/archive/${MONO_VERSION}/macos-10-universal/MonoFramework-MDK-${MONO_VERSION_FULL}.macos10.xamarin.universal.pkg" +MONO_PKG_NAME=${MONO_PKG_URL##*/} +MONO_VERSIONS_PATH='/Library/Frameworks/Mono.framework/Versions' + +download_with_retries "$MONO_PKG_URL" "$TMP_DIR" +echo "Installing $MONO_PKG_NAME..." +sudo installer -pkg "$TMP_DIR/$MONO_PKG_NAME" -target / + +# Download and install NUnit console +NUNIT_VERSION=$(get_toolset_value '.mono.nunit.version') +NUNIT_ARCHIVE_URL="https://github.com/nunit/nunit-console/releases/download/${NUNIT_VERSION}/NUnit.Console-${NUNIT_VERSION}.zip" +NUNIT_ARCHIVE_NAME=${NUNIT_ARCHIVE_URL##*/} +NUNIT_PATH="/Library/Developer/nunit" +NUNIT_VERSION_PATH="$NUNIT_PATH/$NUNIT_VERSION" + +download_with_retries "$NUNIT_ARCHIVE_URL" "$TMP_DIR" +echo "Installing $NUNIT_ARCHIVE_NAME..." +sudo mkdir -p "$NUNIT_VERSION_PATH" +sudo unzip -q "$TMP_DIR/$NUNIT_ARCHIVE_NAME" -d "$NUNIT_VERSION_PATH" + +# Create a wrapper script for nunit3-console +echo "Creating nunit3-console wrapper..." +NUNIT3_CONSOLE_WRAPPER=nunit3-console +cat <<EOF > "${TMP_DIR}/${NUNIT3_CONSOLE_WRAPPER}" +#!/bin/bash -e -o pipefail +exec ${MONO_VERSIONS_PATH}/${MONO_VERSION}/bin/mono --debug \$MONO_OPTIONS $NUNIT_VERSION_PATH/nunit3-console.exe "\$@" +EOF +cat "${TMP_DIR}/${NUNIT3_CONSOLE_WRAPPER}" +sudo chmod +x "${TMP_DIR}/${NUNIT3_CONSOLE_WRAPPER}" +sudo mv "${TMP_DIR}/${NUNIT3_CONSOLE_WRAPPER}" "${MONO_VERSIONS_PATH}/${MONO_VERSION}/Commands/${NUNIT3_CONSOLE_WRAPPER}" + +# Create a symlink for the short version of Mono (e.g., 6.12) +echo "Creating short symlink '${MONO_VERSION_SHORT}'..." +sudo ln -s "${MONO_VERSIONS_PATH}/${MONO_VERSION}" "${MONO_VERSIONS_PATH}/${MONO_VERSION_SHORT}" + +# Invoke tests for Xamarin and Mono +invoke_tests "Xamarin" "Mono" diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1 index 5032c798f018..f75ec124b810 100644 --- a/images/macos/software-report/SoftwareReport.Generator.ps1 +++ b/images/macos/software-report/SoftwareReport.Generator.ps1 @@ -42,7 +42,9 @@ $languageAndRuntime.AddToolVersion("Julia", $(Get-JuliaVersion)) $languageAndRuntime.AddToolVersion("Kotlin", $(Get-KotlinVersion)) if ((-not $os.IsVentura) -and (-not $os.IsVenturaArm64)) { $languageAndRuntime.AddToolVersion("Go", $(Get-GoVersion)) - $languageAndRuntime.AddToolVersion("Mono", $(Get-MonoVersion)) +} +$languageAndRuntime.AddToolVersion("Mono", $(Get-MonoVersion)) +if ((-not $os.IsVentura) -and (-not $os.IsVenturaArm64)) { $languageAndRuntime.AddToolVersion("MSBuild", $(Get-MSBuildVersion)) $languageAndRuntime.AddToolVersion("Node.js", $(Get-NodeVersion)) $languageAndRuntime.AddToolVersion("NVM", $(Get-NVMVersion)) @@ -74,8 +76,8 @@ if ((-not $os.IsVentura) -and (-not $os.IsVenturaArm64)) { $packageManagement.AddToolVersion("Miniconda", $(Get-CondaVersion)) } $packageManagement.AddToolVersion("NPM", $(Get-NPMVersion)) +$packageManagement.AddToolVersion("NuGet", $(Get-NuGetVersion)) if ((-not $os.IsVentura) -and (-not $os.IsVenturaArm64)) { - $packageManagement.AddToolVersion("NuGet", $(Get-NuGetVersion)) $packageManagement.AddToolVersion("Pip", $(Get-PipVersion -Version 2)) } diff --git a/images/macos/templates/macOS-13.anka.pkr.hcl b/images/macos/templates/macOS-13.anka.pkr.hcl index f9628ce05f22..3b8f36495525 100644 --- a/images/macos/templates/macOS-13.anka.pkr.hcl +++ b/images/macos/templates/macOS-13.anka.pkr.hcl @@ -162,6 +162,7 @@ build { scripts = [ "./provision/core/open_windows_check.sh", "./provision/core/powershell.sh", + "./provision/core/mono.sh", "./provision/core/dotnet.sh", "./provision/core/python.sh", "./provision/core/azcopy.sh", diff --git a/images/macos/templates/macOS-13.arm64.anka.pkr.hcl b/images/macos/templates/macOS-13.arm64.anka.pkr.hcl index 69986ec23949..78d7450e2158 100644 --- a/images/macos/templates/macOS-13.arm64.anka.pkr.hcl +++ b/images/macos/templates/macOS-13.arm64.anka.pkr.hcl @@ -163,6 +163,7 @@ build { pause_before = "30s" scripts = [ "./provision/core/powershell.sh", + "./provision/core/mono.sh", "./provision/core/dotnet.sh", "./provision/core/azcopy.sh", "./provision/core/openssl.sh", diff --git a/images/macos/tests/Xamarin.Tests.ps1 b/images/macos/tests/Xamarin.Tests.ps1 index e610dbba821b..789aa656d7fc 100644 --- a/images/macos/tests/Xamarin.Tests.ps1 +++ b/images/macos/tests/Xamarin.Tests.ps1 @@ -2,11 +2,17 @@ Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1" -DisableNameChecking $os = Get-OSVersion -if ((-not $os.IsVentura) -and (-not $os.IsVenturaArm64)) { +if ($os.IsVentura -or $os.IsVenturaArm64) { + $MONO_VERSIONS = @(Get-ToolsetValue "mono.framework.version") + $XAMARIN_IOS_VERSIONS = @() + $XAMARIN_MAC_VERSIONS = @() + $XAMARIN_ANDROID_VERSIONS = @() +} elseif ($os.IsBigSur -or $os.IsMonterey) { $MONO_VERSIONS = Get-ToolsetValue "xamarin.mono-versions" $XAMARIN_IOS_VERSIONS = Get-ToolsetValue "xamarin.ios-versions" $XAMARIN_MAC_VERSIONS = Get-ToolsetValue "xamarin.mac-versions" $XAMARIN_ANDROID_VERSIONS = Get-ToolsetValue "xamarin.android-versions" +} BeforeAll { function Get-ShortSymlink { @@ -19,7 +25,7 @@ BeforeAll { } } -Describe "Mono" -Skip:($os.IsVentura -or $os.IsVenturaArm64) { +Describe "Mono" { $MONO_VERSIONS | ForEach-Object { Context "$_" { $MONO_VERSIONS_PATH = "/Library/Frameworks/Mono.framework/Versions" @@ -116,12 +122,12 @@ Describe "Xamarin.iOS" -Skip:($os.IsVentura -or $os.IsVenturaArm64) { } } -Describe "Xamarin.Mac" -Skip:($os.IsVentura-or $os.IsVenturaArm64) { +Describe "Xamarin.Mac" -Skip:($os.IsVentura -or $os.IsVenturaArm64) { $XAMARIN_MAC_VERSIONS | ForEach-Object { Context "$_" { $XAMARIN_MAC_VERSIONS_PATH = "/Library/Frameworks/Xamarin.Mac.framework/Versions" $versionFolderPath = Join-Path $XAMARIN_MAC_VERSIONS_PATH $_ - $testCase = @{ XamarinMacVersion = $_; VersionFolderPath = $versionFolderPath; MacVersionsPath = $XAMARIN_MAC_VERSIONS_PATH } + $testCase = @{ XamarinMacVersion = $_; VersionFolderPath = $versionFolderPath; MacVersionsPath = $XAMARIN_MAC_VERSIONS_PATH } It "is installed" -TestCases $testCase { param ( [string] $VersionFolderPath ) @@ -197,28 +203,30 @@ Describe "Xamarin Bundles" -Skip:($os.IsVentura -or $os.IsVenturaArm64) { $XAMARIN_ANDROID_VERSIONS_PATH = "/Library/Frameworks/Xamarin.Android.framework/Versions" } + If ($XAMARIN_BUNDLES.Count -eq 0) { return } # Skip this test if there are no bundles + [array]$XAMARIN_BUNDLES = Get-ToolsetValue "xamarin.bundles" $XAMARIN_DEFAULT_BUNDLE = Get-ToolsetValue "xamarin.bundle-default" If ($XAMARIN_DEFAULT_BUNDLE -eq "latest") { $XAMARIN_DEFAULT_BUNDLE = $XAMARIN_BUNDLES[0].symlink } $currentBundle = [PSCustomObject] @{ symlink = "Current" - mono = $XAMARIN_DEFAULT_BUNDLE - ios = $XAMARIN_DEFAULT_BUNDLE - mac = $XAMARIN_DEFAULT_BUNDLE + mono = $XAMARIN_DEFAULT_BUNDLE + ios = $XAMARIN_DEFAULT_BUNDLE + mac = $XAMARIN_DEFAULT_BUNDLE android = $XAMARIN_DEFAULT_BUNDLE } $latestBundle = [PSCustomObject] @{ symlink = "Latest" - mono = $XAMARIN_BUNDLES[0].mono - ios = $XAMARIN_BUNDLES[0].ios - mac = $XAMARIN_BUNDLES[0].mac + mono = $XAMARIN_BUNDLES[0].mono + ios = $XAMARIN_BUNDLES[0].ios + mac = $XAMARIN_BUNDLES[0].mac android = $XAMARIN_BUNDLES[0].android } $bundles = $XAMARIN_BUNDLES + $currentBundle + $latestBundle - $allBundles = $bundles | ForEach-Object { @{BundleSymlink = $_.symlink; BundleMono = $_.mono; BundleIos = $_.ios; BundleMac = $_.mac; BundleAndroid = $_.android} } + $allBundles = $bundles | ForEach-Object { @{BundleSymlink = $_.symlink; BundleMono = $_.mono; BundleIos = $_.ios; BundleMac = $_.mac; BundleAndroid = $_.android } } It "Mono symlink <BundleSymlink> exists" -TestCases $allBundles { param ( [string] $BundleSymlink ) @@ -299,5 +307,3 @@ Describe "Nuget" -Skip:($os.IsVentura -or $os.IsVenturaArm64) { Get-Content $env:HOME/.config/NuGet/NuGet.Config | Out-String | Should -Match "nuget.org" } } - -} \ No newline at end of file diff --git a/images/macos/toolsets/toolset-13.json b/images/macos/toolsets/toolset-13.json index 73650b768148..cdc1b7570cc9 100644 --- a/images/macos/toolsets/toolset-13.json +++ b/images/macos/toolsets/toolset-13.json @@ -204,5 +204,13 @@ }, "php": { "version": "8.2" + }, + "mono": { + "framework":{ + "version": "6.12.0.188" + }, + "nunit": { + "version": "3.15.4" + } } } From 0ac9d155ab63dfebe079716d8aa343348fec34b5 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Fri, 22 Sep 2023 16:29:25 +0200 Subject: [PATCH 2231/3485] [macOS] do not install xcode-install gem on Ventura (#8366) --- images/macos/toolsets/toolset-13.json | 1 - 1 file changed, 1 deletion(-) diff --git a/images/macos/toolsets/toolset-13.json b/images/macos/toolsets/toolset-13.json index cdc1b7570cc9..c7d121a92304 100644 --- a/images/macos/toolsets/toolset-13.json +++ b/images/macos/toolsets/toolset-13.json @@ -96,7 +96,6 @@ "ruby": { "default": "3.0", "rubygems": [ - "xcode-install", "cocoapods", "xcpretty", "bundler", From e72f9755c3a20a733d2032a1301f309c088668e9 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 23 Sep 2023 14:34:51 +0000 Subject: [PATCH 2232/3485] Updating readme file for macOS-12 version 20230916.1 (#8322) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-12-Readme.md | 78 +++++++++++++++++---------------- 1 file changed, 41 insertions(+), 37 deletions(-) diff --git a/images/macos/macos-12-Readme.md b/images/macos/macos-12-Readme.md index 2d334c5f099e..7676bf2ad121 100644 --- a/images/macos/macos-12-Readme.md +++ b/images/macos/macos-12-Readme.md @@ -1,12 +1,17 @@ +| Announcements | +|-| +| [Ruby 2.4.x will be removed from the macOS 11 and Windows 2019 images on September 18](https://github.com/actions/runner-images/issues/8239) | +| [[All OSes] Go 1.18.x will be removed on September, 18](https://github.com/actions/runner-images/issues/8237) | +*** # macOS 12 -- OS Version: macOS 12.6.8 (21G725) +- OS Version: macOS 12.6.9 (21G726) - Kernel Version: Darwin 21.6.0 -- Image Version: 20230901.1 +- Image Version: 20230916.1 ## Installed Software ### Language and Runtime -- .NET Core SDK: 6.0.413, 7.0.102, 7.0.202, 7.0.306, 7.0.400 +- .NET Core SDK: 6.0.414, 7.0.102, 7.0.202, 7.0.306, 7.0.401 - Bash 3.2.57(1)-release - Clang/LLVM 14.0.0 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` @@ -16,7 +21,7 @@ - GNU Fortran 12 (Homebrew GCC 12.3.0) - available by `gfortran-12` alias - Julia 1.9.3 - Kotlin 1.9.10-release-459 -- Go 1.20.7 +- Go 1.20.8 - Mono 6.12.0.188 - MSBuild 16.10.1.51301 (Mono 6.12.0.188) - Node.js 18.17.1 @@ -33,8 +38,8 @@ - Bundler 2.4.19 - Carthage 0.39.0 - CocoaPods 1.12.1 -- Composer 2.6.1 -- Homebrew 4.1.7 +- Composer 2.6.3 +- Homebrew 4.1.11 - Miniconda 23.5.2 - NPM 9.6.7 - NuGet 6.3.1.1 @@ -42,7 +47,7 @@ - Pip3 23.2.1 (python 3.11) - Pipx 1.2.0 - RubyGems 3.4.19 -- Vcpkg 2023 (build from commit 4a600e9fe) +- Vcpkg 2023 (build from commit e8c2a04eb) - Yarn 1.22.19 #### Environment variables @@ -55,7 +60,7 @@ - Apache Ant 1.10.14 - Apache Maven 3.9.4 - Gradle 8.3 -- Sbt 1.9.4 +- Sbt 1.9.6 ### Utilities - 7-Zip 17.05 @@ -64,19 +69,19 @@ - bazel 6.3.2 - bazelisk 1.18.0 - bsdtar 3.5.1 - available by 'tar' alias -- Curl 8.2.1 +- Curl 8.3.0 - Git 2.42.0 - Git LFS 3.4.0 -- GitHub CLI 2.33.0 +- GitHub CLI 2.34.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.21.4 - gpg (GnuPG) 2.4.3 - Hub CLI 2.14.2 - ImageMagick 7.1.1-15 -- jq 1.6 +- jq 1.7 - mongo 5.0.17 - mongod 5.0.17 -- OpenSSL 1.1.1v 1 Aug 2023 +- OpenSSL 1.1.1w 11 Sep 2023 - Packer 1.9.4 - pkg-config 0.29.2 - PostgreSQL 14.9 (Homebrew) @@ -91,22 +96,22 @@ ### Tools - App Center CLI 2.14.0 -- AWS CLI 2.13.15 -- AWS SAM CLI 1.96.0 -- AWS Session Manager CLI 1.2.463.0 -- Azure CLI 2.50.0 +- AWS CLI 2.13.19 +- AWS SAM CLI 1.97.0 +- AWS Session Manager CLI 1.2.497.0 +- Azure CLI 2.52.0 - Azure CLI (azure-devops) 0.26.0 -- Bicep CLI 0.20.4 +- Bicep CLI 0.21.1 - Cabal 3.6.2.0 -- Cmake 3.27.4 -- CodeQL Action Bundles 2.14.2 2.14.3 +- Cmake 3.27.5 +- CodeQL Action Bundles 2.14.4 2.14.5 - Colima 0.5.5 -- Fastlane 2.214.0 +- Fastlane 2.215.0 - GHC 9.6.2 - GHCup 0.1.19.4 - Jazzy 0.14.3 - Stack 2.9.3 -- SwiftFormat 0.52.2 +- SwiftFormat 0.52.3 - Swig 4.1.1 - Xcode Command Line Tools 14.2.0.0.1.1668646533 @@ -117,14 +122,14 @@ ### Browsers - Safari 16.6 (17615.3.12.11.3) - SafariDriver 16.6 (17615.3.12.11.3) -- Google Chrome 116.0.5845.140 -- Google Chrome for Testing 116.0.5845.96 -- ChromeDriver 116.0.5845.96 -- Microsoft Edge 116.0.1938.69 -- Microsoft Edge WebDriver 116.0.1938.69 -- Mozilla Firefox 117.0 +- Google Chrome 117.0.5938.88 +- Google Chrome for Testing 117.0.5938.88 +- ChromeDriver 117.0.5938.88 +- Microsoft Edge 117.0.2045.31 +- Microsoft Edge WebDriver 117.0.2045.31 +- Mozilla Firefox 117.0.1 - geckodriver 0.33.0 -- Selenium server 4.10.0 +- Selenium server 4.12.1 #### Environment variables | Name | Value | @@ -167,10 +172,9 @@ - 18.17.1 #### Go -- 1.18.10 -- 1.19.12 -- 1.20.7 -- 1.21.0 +- 1.19.13 +- 1.20.8 +- 1.21.1 ### Rust Tools - Cargo 1.72.0 @@ -179,10 +183,10 @@ - Rustup 1.26.0 #### Packages -- Bindgen 0.66.1 +- Bindgen 0.68.1 - Cargo-audit 0.18.1 - Cargo-outdated 0.13.1 -- Cbindgen 0.25.0 +- Cbindgen 0.26.0 - Clippy 0.1.72 - Rustfmt 1.6.0-stable @@ -190,7 +194,7 @@ - PowerShell 7.2.13 #### PowerShell Modules -- Az: 10.2.0 +- Az: 10.3.0 - MarkdownPS: 1.9 - Pester: 5.5.0 - PSScriptAnalyzer: 1.21.0 @@ -207,7 +211,7 @@ | Version | Build | Path | | -------------- | ---------- | ------------------------------------ | | 2019 | 8.10.25.2 | /Applications/Visual Studio 2019.app | -| 2022 (default) | 17.6.3.421 | /Applications/Visual Studio.app | +| 2022 (default) | 17.6.4.472 | /Applications/Visual Studio.app | ##### Notes ``` @@ -350,7 +354,7 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" ### Miscellaneous - libXext 1.3.5 - libXft 2.3.8 -- Tcl/Tk 8.6.13_4 +- Tcl/Tk 8.6.13_5 - Zlib 1.3 #### Environment variables From 37b6325815a8af6c0406d201eef47561ea603109 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Sun, 24 Sep 2023 13:11:11 +0200 Subject: [PATCH 2233/3485] [macOS] do not list Xcode-install in sw report on OS13 (#8370) --- images/macos/software-report/SoftwareReport.Xcode.psm1 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/images/macos/software-report/SoftwareReport.Xcode.psm1 b/images/macos/software-report/SoftwareReport.Xcode.psm1 index f3032df5157d..b5d0de877d6b 100644 --- a/images/macos/software-report/SoftwareReport.Xcode.psm1 +++ b/images/macos/software-report/SoftwareReport.Xcode.psm1 @@ -236,7 +236,9 @@ function Build-XcodeSupportToolsSection { $xcversion = Run-Command "xcversion --version" | Select-String "^[0-9]" $toolNodes += [ToolVersionNode]::new("xcpretty", $xcpretty) - $toolNodes += [ToolVersionNode]::new("xcversion", $xcversion) + if ($os.IsBigSur -or $os.IsMonterey) { + $toolNodes += [ToolVersionNode]::new("xcversion", $xcversion) + } $nomadOutput = Run-Command "gem list nomad-cli" $nomadCLI = [regex]::matches($nomadOutput, "(\d+.){2}\d+").Value From ac365421b0d228bbbb731e349190151c23a731f8 Mon Sep 17 00:00:00 2001 From: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com> Date: Mon, 25 Sep 2023 11:51:41 +0200 Subject: [PATCH 2234/3485] [windows] implement checksum validation for rustup (#8314) --- images/win/scripts/Installers/Install-Rust.ps1 | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/images/win/scripts/Installers/Install-Rust.ps1 b/images/win/scripts/Installers/Install-Rust.ps1 index 1942b6b98c1e..5778fd37a914 100644 --- a/images/win/scripts/Installers/Install-Rust.ps1 +++ b/images/win/scripts/Installers/Install-Rust.ps1 @@ -1,6 +1,7 @@ ################################################################################ ## File: Install-Rust.ps1 ## Desc: Install Rust for Windows +## Supply chain security: checksum validation for bootstrap, managed by rustup for workloads ################################################################################ # Rust Env @@ -11,6 +12,13 @@ $env:CARGO_HOME = "C:\Users\Default\.cargo" # See https://rustup.rs/# $rustupPath = Start-DownloadWithRetry -Url "https://static.rust-lang.org/rustup/dist/x86_64-pc-windows-msvc/rustup-init.exe" -Name "rustup-init.exe" +#region Supply chain security +$localFileHash = (Get-FileHash -Path (Join-Path ${env:TEMP} 'rustup-init.exe') -Algorithm SHA256).Hash +$distributorFileHash = (Invoke-RestMethod -Uri 'https://static.rust-lang.org/rustup/dist/x86_64-pc-windows-msvc/rustup-init.exe.sha256').Trim() + +Use-ChecksumComparison -LocalFileHash $localFileHash -DistributorFileHash $distributorFileHash +#endregion + # Install Rust by running rustup-init.exe (disabling the confirmation prompt with -y) & $rustupPath -y --default-toolchain=stable --profile=minimal From fe051ba2ba91a7d5ee27b8ffc240fafb8e92892f Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Mon, 25 Sep 2023 11:58:47 +0200 Subject: [PATCH 2235/3485] [Windows] Add checksum verification for Git (#8317) --- images/win/scripts/Installers/Install-Git.ps1 | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/images/win/scripts/Installers/Install-Git.ps1 b/images/win/scripts/Installers/Install-Git.ps1 index eac134129c33..fdada8836009 100644 --- a/images/win/scripts/Installers/Install-Git.ps1 +++ b/images/win/scripts/Installers/Install-Git.ps1 @@ -1,16 +1,24 @@ ################################################################################ ## File: Install-Git.ps1 ## Desc: Install Git for Windows +## Supply chain security: Git - checksum validation, Hub CLI - managed by package manager ################################################################################ Import-Module "$env:ChocolateyInstall\helpers\chocolateyProfile.psm1" # Install the latest version of Git for Windows -$gitReleases = Invoke-RestMethod "https://api.github.com/repos/git-for-windows/git/releases/latest" +$repoURL = "https://api.github.com/repos/git-for-windows/git/releases/latest" +$gitReleases = Invoke-RestMethod $repoURL [string]$downloadUrl = $gitReleases.assets.browser_download_url -match "Git-.+-64-bit.exe" - $installerFile = Split-Path $downloadUrl -Leaf -Install-Binary -Url $downloadUrl ` - -Name $installerFile ` +$packagePath = Start-DownloadWithRetry -Url $downloadUrl -Name $installerFile + +#region Supply chain security - Git +$fileHash = (Get-FileHash -Path $packagePath -Algorithm SHA256).Hash +$externalHash = Get-HashFromGitHubReleaseBody -Url $RepoURL -FileName $installerFile +Use-ChecksumComparison $fileHash $externalHash +#endregion + +Install-Binary -FilePath $packagePath ` -ArgumentList ( "/VERYSILENT", ` "/NORESTART", ` From f05152105fda26c660b8b8d24bdd788a2be3f8a3 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 25 Sep 2023 12:38:13 +0000 Subject: [PATCH 2236/3485] Updating readme file for macos-13 version 20230924.1 (#8375) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-13-Readme.md | 147 ++++++++++++++++---------------- 1 file changed, 75 insertions(+), 72 deletions(-) diff --git a/images/macos/macos-13-Readme.md b/images/macos/macos-13-Readme.md index 5335ddaa53d8..5231b8d3c4c8 100644 --- a/images/macos/macos-13-Readme.md +++ b/images/macos/macos-13-Readme.md @@ -1,12 +1,16 @@ +| Announcements | +|-| +| [[All OS] hub utility will be removed on October 2](https://github.com/actions/runner-images/issues/8362) | +*** # macOS 13 -- OS Version: macOS 13.5.1 (22G90) +- OS Version: macOS 13.6 (22G120) - Kernel Version: Darwin 22.6.0 -- Image Version: 20230903.1 +- Image Version: 20230924.1 ## Installed Software ### Language and Runtime -- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.400 +- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.401 - Bash 3.2.57(1)-release - Clang/LLVM 14.0.3 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` @@ -16,6 +20,7 @@ - GNU Fortran 12 (Homebrew GCC 12.3.0) - available by `gfortran-12` alias - Julia 1.9.3 - Kotlin 1.9.10-release-459 +- Mono 6.12.0.188 - Perl 5.36.1 - PHP 8.2.10 - Python3 3.11.5 @@ -24,15 +29,16 @@ ### Package Management - Bundler 2.4.19 -- Carthage 0.39.0 -- CocoaPods 1.12.1 -- Composer 2.6.2 -- Homebrew 4.1.7 -- NPM 9.6.7 +- Carthage 0.39.1 +- CocoaPods 1.13.0 +- Composer 2.6.3 +- Homebrew 4.1.12 +- NPM 9.8.1 +- NuGet 6.3.1.1 - Pip3 23.2.1 (python 3.11) - Pipx 1.2.0 - RubyGems 3.4.19 -- Vcpkg 2023 (build from commit 4a600e9fe) +- Vcpkg 2023 (build from commit 5a38b5ec0) - Yarn 1.22.19 ### Project Management @@ -45,37 +51,36 @@ - bazel 6.3.2 - bazelisk 1.18.0 - bsdtar 3.5.3 - available by 'tar' alias -- Curl 8.2.1 +- Curl 8.3.0 - Git 2.42.0 - Git LFS 3.4.0 -- GitHub CLI 2.33.0 +- GitHub CLI 2.35.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.21.4 - gpg (GnuPG) 2.4.3 -- jq 1.6 -- OpenSSL 1.1.1v 1 Aug 2023 +- jq 1.7 +- OpenSSL 1.1.1w 11 Sep 2023 - Packer 1.9.4 - pkg-config 0.29.2 -- Vagrant 2.3.7 - yq 4.35.1 - zstd 1.5.5 ### Tools -- AWS CLI 2.13.15 -- AWS SAM CLI 1.96.0 -- AWS Session Manager CLI 1.2.463.0 -- Azure CLI 2.50.0 +- AWS CLI 2.13.21 +- AWS SAM CLI 1.97.0 +- AWS Session Manager CLI 1.2.497.0 +- Azure CLI 2.52.0 - Azure CLI (azure-devops) 0.26.0 -- Bicep CLI 0.20.4 +- Bicep CLI 0.21.1 - Cabal 3.6.2.0 -- Cmake 3.27.4 -- CodeQL Action Bundles 2.14.2 2.14.3 -- Fastlane 2.214.0 +- Cmake 3.27.6 +- CodeQL Action Bundles 2.14.4 2.14.5 +- Fastlane 2.216.0 - GHC 9.6.2 - GHCup 0.1.19.4 - Stack 2.9.3 -- SwiftFormat 0.52.3 -- Xcode Command Line Tools 14.3.1.0.1.1683849156 +- SwiftFormat 0.52.4 +- Xcode Command Line Tools 15.0.0.0.1.1694021235 ### Linters - SwiftLint 0.52.4 @@ -83,14 +88,14 @@ ### Browsers - Safari 16.6 (18615.3.12.11.2) - SafariDriver 16.6 (18615.3.12.11.2) -- Google Chrome 116.0.5845.140 -- Google Chrome for Testing 116.0.5845.96 -- ChromeDriver 116.0.5845.96 -- Microsoft Edge 116.0.1938.69 -- Microsoft Edge WebDriver 116.0.1938.69 -- Mozilla Firefox 117.0 +- Google Chrome 117.0.5938.92 +- Google Chrome for Testing 117.0.5938.92 +- ChromeDriver 117.0.5938.92 +- Microsoft Edge 117.0.2045.40 +- Microsoft Edge WebDriver 117.0.2045.40 +- Mozilla Firefox 117.0.1 - geckodriver 0.33.0 -- Selenium server 4.12.0 +- Selenium server 4.12.1 #### Environment variables | Name | Value | @@ -127,46 +132,45 @@ #### Node.js - 16.20.2 -- 18.17.1 +- 18.18.0 #### Go -- 1.19.12 -- 1.20.7 -- 1.21.0 +- 1.19.13 +- 1.20.8 +- 1.21.1 ### Rust Tools -- Cargo 1.72.0 -- Rust 1.72.0 -- Rustdoc 1.72.0 +- Cargo 1.72.1 +- Rust 1.72.1 +- Rustdoc 1.72.1 - Rustup 1.26.0 #### Packages -- Bindgen 0.66.1 +- Bindgen 0.68.1 - Cargo-audit 0.18.1 - Cargo-outdated 0.13.1 -- Cbindgen 0.25.0 +- Cbindgen 0.26.0 - Clippy 0.1.72 - Rustfmt 1.6.0-stable ### PowerShell Tools -- PowerShell 7.2.13 +- PowerShell 7.2.14 #### PowerShell Modules -- Az: 10.2.0 +- Az: 10.3.0 - Pester: 5.5.0 - PSScriptAnalyzer: 1.21.0 ### Xcode -| Version | Build | Path | -| ---------------- | -------- | ------------------------------ | -| 15.0 (beta) | 15A5229m | /Applications/Xcode_15.0.app | -| 14.3.1 (default) | 14E300c | /Applications/Xcode_14.3.1.app | -| 14.2 | 14C18 | /Applications/Xcode_14.2.app | -| 14.1 | 14B47b | /Applications/Xcode_14.1.app | +| Version | Build | Path | +| ---------------- | ------- | ------------------------------ | +| 15.0 | 15A240d | /Applications/Xcode_15.0.app | +| 14.3.1 (default) | 14E300c | /Applications/Xcode_14.3.1.app | +| 14.2 | 14C18 | /Applications/Xcode_14.2.app | +| 14.1 | 14B47b | /Applications/Xcode_14.1.app | #### Xcode Support Tools - xcpretty 0.3.0 -- xcversion 2.8.1 #### Installed SDKs | SDK | SDK Name | Xcode Version | @@ -195,8 +199,6 @@ | Simulator - watchOS 9.1 | watchsimulator9.1 | 14.1, 14.2 | | Simulator - watchOS 9.4 | watchsimulator9.4 | 14.3.1 | | Simulator - watchOS 10.0 | watchsimulator10.0 | 15.0 | -| visionOS 1.0 | xros1.0 | 15.0 | -| Simulator - visionOS 1.0 | xrsimulator1.0 | 15.0 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | @@ -206,18 +208,18 @@ | DriverKit 23.0 | driverkit23.0 | 15.0 | #### Installed Simulators -| OS | Xcode Version | Simulators | -| ------------ | ------------------------------ | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| iOS 16.1 | 14.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 16.2 | 14.2 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 16.4 | 14.3.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 17.0 | 14.1<br>14.2<br>14.3.1<br>15.0 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| tvOS 16.1 | 14.1<br>14.2<br>14.3.1<br>15.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 16.4 | 14.1<br>14.2<br>14.3.1<br>15.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 17.0 | 14.1<br>14.2<br>14.3.1<br>15.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| watchOS 9.1 | 14.1<br>14.2<br>14.3.1<br>15.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | -| watchOS 9.4 | 14.1<br>14.2<br>14.3.1<br>15.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | -| watchOS 10.0 | 14.1<br>14.2<br>14.3.1<br>15.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | +| OS | Xcode Version | Simulators | +| ------------ | ------------------------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| iOS 16.1 | 14.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 16.2 | 14.2 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 16.4 | 14.3.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 17.0 | 14.1<br>14.2<br>14.3.1<br>15.0 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| tvOS 16.1 | 14.1<br>14.2<br>14.3.1<br>15.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 16.4 | 14.1<br>14.2<br>14.3.1<br>15.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 17.0 | 14.1<br>14.2<br>14.3.1<br>15.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| watchOS 9.1 | 14.1<br>14.2<br>14.3.1<br>15.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | +| watchOS 9.4 | 14.1<br>14.2<br>14.3.1<br>15.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | +| watchOS 10.0 | 14.1<br>14.2<br>14.3.1<br>15.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | ### Android | Package Name | Version | @@ -231,15 +233,16 @@ | CMake | 3.18.1<br>3.22.1 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 23.2.8568313<br>24.0.8215888<br>25.2.9519653 (default) | +| NDK | 23.2.8568313<br>24.0.8215888<br>25.2.9519653 (default)<br>26.0.10792818 | | SDK Patch Applier v4 | 1 | #### Environment variables -| Name | Value | -| ----------------------- | -------------------------------------------------- | -| ANDROID_HOME | /Users/runner/Library/Android/sdk | -| ANDROID_NDK | /Users/runner/Library/Android/sdk/ndk/25.2.9519653 | -| ANDROID_NDK_HOME | /Users/runner/Library/Android/sdk/ndk/25.2.9519653 | -| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/25.2.9519653 | -| ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk/25.2.9519653 | -| ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | +| Name | Value | +| ----------------------- | --------------------------------------------------- | +| ANDROID_HOME | /Users/runner/Library/Android/sdk | +| ANDROID_NDK | /Users/runner/Library/Android/sdk/ndk/25.2.9519653 | +| ANDROID_NDK_HOME | /Users/runner/Library/Android/sdk/ndk/25.2.9519653 | +| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/26.0.10792818 | +| ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk/25.2.9519653 | +| ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | + From 9f764f74298ae97cc4bb2300b400442dc6f5fb4f Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Tue, 26 Sep 2023 09:30:27 +0200 Subject: [PATCH 2237/3485] [Windows] Remove hub utility (#8365) --- images/win/scripts/Installers/Install-Git.ps1 | 5 ----- .../win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 | 1 - images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 | 6 ------ images/win/scripts/Tests/CLI.Tools.Tests.ps1 | 6 ------ 4 files changed, 18 deletions(-) diff --git a/images/win/scripts/Installers/Install-Git.ps1 b/images/win/scripts/Installers/Install-Git.ps1 index fdada8836009..8219f6dec071 100644 --- a/images/win/scripts/Installers/Install-Git.ps1 +++ b/images/win/scripts/Installers/Install-Git.ps1 @@ -35,10 +35,6 @@ Update-SessionEnvironment git config --system --add safe.directory "*" -# Install hub with --ignore-dependencies option to prevent the installation of the git package. -# See details in https://github.com/actions/runner-images/issues/2375 -Choco-Install -PackageName hub -ArgumentList "--ignore-dependencies" - # Disable GCM machine-wide [Environment]::SetEnvironmentVariable("GCM_INTERACTIVE", "Never", [System.EnvironmentVariableTarget]::Machine) @@ -50,4 +46,3 @@ ssh-keyscan -t rsa,ecdsa,ed25519 github.com >> "C:\Program Files\Git\etc\ssh\ssh ssh-keyscan -t rsa ssh.dev.azure.com >> "C:\Program Files\Git\etc\ssh\ssh_known_hosts" Invoke-PesterTests -TestFile "Git" -Invoke-PesterTests -TestFile "CLI.Tools" -TestName "Hub CLI" diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index f76a96a8d355..558542718d9f 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -118,7 +118,6 @@ if (Test-IsWin19) { $cliTools.AddToolVersion("Cloud Foundry CLI", $(Get-CloudFoundryVersion)) } $cliTools.AddToolVersion("GitHub CLI", $(Get-GHVersion)) -$cliTools.AddToolVersion("Hub CLI", $(Get-HubVersion)) # Rust Tools Initialize-RustEnvironment diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 index 4952e90e871c..86a645f8f045 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 @@ -232,12 +232,6 @@ function Get-CloudFoundryVersion { return $cfVersion } -function Get-HubVersion { - ($(hub version) | Select-String -Pattern "hub version") -match "hub version (?<version>\d+\.\d+\.\d+)" | Out-Null - $hubVersion = $Matches.Version - return $hubVersion -} - function Get-7zipVersion { (7z | Out-String) -match "7-Zip (?<version>\d+\.\d+\.?\d*)" | Out-Null $version = $Matches.Version diff --git a/images/win/scripts/Tests/CLI.Tools.Tests.ps1 b/images/win/scripts/Tests/CLI.Tools.Tests.ps1 index cbf5d38c6fb8..51e45b429c9e 100644 --- a/images/win/scripts/Tests/CLI.Tools.Tests.ps1 +++ b/images/win/scripts/Tests/CLI.Tools.Tests.ps1 @@ -48,9 +48,3 @@ Describe "CloudFoundry CLI" -Skip:(Test-IsWin22) { "cf --version" | Should -ReturnZeroExitCode } } - -Describe "Hub CLI" { - It "hub is installed" { - "hub --version" | Should -ReturnZeroExitCode - } -} \ No newline at end of file From 8cb738bb54c18810c521aab0ab1d4645fc644d86 Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Tue, 26 Sep 2023 09:31:34 +0200 Subject: [PATCH 2238/3485] [Ubuntu] Remove hub utility (#8363) --- .../SoftwareReport/SoftwareReport.Generator.ps1 | 1 - .../scripts/SoftwareReport/SoftwareReport.Tools.psm1 | 7 +------ images/linux/scripts/installers/git.sh | 10 +--------- images/linux/scripts/tests/CLI.Tools.Tests.ps1 | 6 +----- images/linux/scripts/tests/Tools.Tests.ps1 | 4 ---- 5 files changed, 3 insertions(+), 25 deletions(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index e4fef5d1cd6f..e9e6747fe47b 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -159,7 +159,6 @@ $cliTools.AddToolVersion("Azure CLI", $(Get-AzureCliVersion)) $cliTools.AddToolVersion("Azure CLI (azure-devops)", $(Get-AzureDevopsVersion)) $cliTools.AddToolVersion("GitHub CLI", $(Get-GitHubCliVersion)) $cliTools.AddToolVersion("Google Cloud CLI", $(Get-GoogleCloudCLIVersion)) -$cliTools.AddToolVersion("Hub CLI", $(Get-HubCliVersion)) $cliTools.AddToolVersion("Netlify CLI", $(Get-NetlifyCliVersion)) $cliTools.AddToolVersion("OpenShift CLI", $(Get-OCCliVersion)) $cliTools.AddToolVersion("ORAS CLI", $(Get-ORASCliVersion)) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 index 594aeeb6bf0a..3f8882481ea7 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 @@ -234,11 +234,6 @@ function Get-FastlaneVersion { return $fastlaneVersion } -function Get-HubCliVersion { - $hubVersion = hub --version | Select-String "hub version" | Take-OutputPart -Part 2 - return $hubVersion -} - function Get-GitHubCliVersion { $ghVersion = gh --version | Select-String "gh version" | Take-OutputPart -Part 2 return $ghVersion @@ -291,4 +286,4 @@ function Get-ZstdVersion { function Get-YqVersion { $yqVersion = $(yq -V) | Take-OutputPart -Part 3 return $yqVersion.TrimStart("v").Trim() -} \ No newline at end of file +} diff --git a/images/linux/scripts/installers/git.sh b/images/linux/scripts/installers/git.sh index b02e020c3ecc..e6f80ef5b769 100644 --- a/images/linux/scripts/installers/git.sh +++ b/images/linux/scripts/installers/git.sh @@ -36,16 +36,8 @@ rm /etc/apt/sources.list.d/github_git-lfs.list echo "git-core $GIT_REPO" >> $HELPER_SCRIPTS/apt-sources.txt echo "git-lfs $GIT_LFS_REPO" >> $HELPER_SCRIPTS/apt-sources.txt -#Install hub -tmp_hub="/tmp/hub" -mkdir -p "$tmp_hub" -downloadUrl=$(get_github_package_download_url "github/hub" "contains(\"hub-linux-amd64\")") -download_with_retries "$downloadUrl" "$tmp_hub" -tar xzf "$tmp_hub"/hub-linux-amd64-*.tgz --strip-components 1 -C "$tmp_hub" -mv "$tmp_hub"/bin/hub /usr/local/bin - # Add well-known SSH host keys to known_hosts ssh-keyscan -t rsa,ecdsa,ed25519 github.com >> /etc/ssh/ssh_known_hosts ssh-keyscan -t rsa ssh.dev.azure.com >> /etc/ssh/ssh_known_hosts -invoke_tests "Tools" "Git" \ No newline at end of file +invoke_tests "Tools" "Git" diff --git a/images/linux/scripts/tests/CLI.Tools.Tests.ps1 b/images/linux/scripts/tests/CLI.Tools.Tests.ps1 index 2f6ecdfd5723..2cd42df7b97b 100644 --- a/images/linux/scripts/tests/CLI.Tools.Tests.ps1 +++ b/images/linux/scripts/tests/CLI.Tools.Tests.ps1 @@ -35,10 +35,6 @@ Describe "GitHub CLI" { It "gh cli" { "gh --version" | Should -ReturnZeroExitCode } - - It "hub is installed" { - "hub --version" | Should -ReturnZeroExitCode - } } Describe "Google Cloud CLI" { @@ -57,4 +53,4 @@ Describe "Oras CLI" { It "Oras CLI" { "oras version" | Should -ReturnZeroExitCode } -} \ No newline at end of file +} diff --git a/images/linux/scripts/tests/Tools.Tests.ps1 b/images/linux/scripts/tests/Tools.Tests.ps1 index aa6cc8f47d46..396eed4b1fe6 100644 --- a/images/linux/scripts/tests/Tools.Tests.ps1 +++ b/images/linux/scripts/tests/Tools.Tests.ps1 @@ -248,10 +248,6 @@ Describe "Git" { It "git-ftp" { "git-ftp --version" | Should -ReturnZeroExitCode } - - It "hub-cli" { - "hub --version" | Should -ReturnZeroExitCode - } } Describe "Heroku" { From 2cbf4a7f93fb107c5a5e12af353466e490a42bae Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Tue, 26 Sep 2023 09:32:02 +0200 Subject: [PATCH 2239/3485] [Mac OS] Remove hub utility (#8364) --- images/macos/provision/core/git.sh | 3 --- images/macos/software-report/SoftwareReport.Common.psm1 | 7 +------ images/macos/software-report/SoftwareReport.Generator.ps1 | 1 - images/macos/tests/Git.Tests.ps1 | 5 ----- 4 files changed, 1 insertion(+), 15 deletions(-) diff --git a/images/macos/provision/core/git.sh b/images/macos/provision/core/git.sh index 3a62d85e13d4..5721d6275b16 100644 --- a/images/macos/provision/core/git.sh +++ b/images/macos/provision/core/git.sh @@ -14,9 +14,6 @@ git lfs install # Update system git config sudo git lfs install --system -echo Installing Hub -brew_smart_install "hub" - echo Disable all the Git help messages... git config --global advice.pushUpdateRejected false git config --global advice.pushNonFFCurrent false diff --git a/images/macos/software-report/SoftwareReport.Common.psm1 b/images/macos/software-report/SoftwareReport.Common.psm1 index c060f453e608..55ea6d4b8994 100644 --- a/images/macos/software-report/SoftwareReport.Common.psm1 +++ b/images/macos/software-report/SoftwareReport.Common.psm1 @@ -302,11 +302,6 @@ function Get-GitHubCLIVersion { return $ghVersion } -function Get-HubVersion { - $hubVersion = Run-Command "brew list --versions hub" | Take-Part -Part 1 - return $hubVersion -} - function Get-WgetVersion { $wgetVersion = Run-Command "wget --version" | Select-String "GNU Wget" | Take-Part -Part 2 return $wgetVersion @@ -634,4 +629,4 @@ function Get-ColimaVersion { function Get-PKGConfigVersion { $pkgconfigVersion = Run-Command "pkg-config --version" return $pkgconfigVersion -} \ No newline at end of file +} diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1 index f75ec124b810..83ba5ff9f37e 100644 --- a/images/macos/software-report/SoftwareReport.Generator.ps1 +++ b/images/macos/software-report/SoftwareReport.Generator.ps1 @@ -123,7 +123,6 @@ if ($os.IsBigSur) { $utilities.AddToolVersion("helm", $(Get-HelmVersion)) } if ((-not $os.IsVentura) -and (-not $os.IsVenturaArm64)) { - $utilities.AddToolVersion("Hub CLI", $(Get-HubVersion)) $utilities.AddToolVersion("ImageMagick", $(Get-ImageMagickVersion)) } $utilities.AddToolVersion("jq", $(Get-JqVersion)) diff --git a/images/macos/tests/Git.Tests.ps1 b/images/macos/tests/Git.Tests.ps1 index 0122c9fa3185..2a9f731e459c 100644 --- a/images/macos/tests/Git.Tests.ps1 +++ b/images/macos/tests/Git.Tests.ps1 @@ -8,8 +8,3 @@ Describe "Git" { "git lfs version" | Should -ReturnZeroExitCode } } -Describe "hub CLI" -Skip:($os.IsVentura -or $os.IsVenturaArm64) { - It "hub CLI is installed" { - "hub --version" | Should -ReturnZeroExitCode - } -} \ No newline at end of file From 9eabbcd8d0d024c29882e0c2b1107bdb03caa3d7 Mon Sep 17 00:00:00 2001 From: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com> Date: Tue, 26 Sep 2023 09:35:12 +0200 Subject: [PATCH 2240/3485] [windows] missing openssl pester tests (#8351) add tests for (*) OpenSSL location (*) OpenSSL package type ("full" is required) --- images/win/scripts/Tests/Tools.Tests.ps1 | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/images/win/scripts/Tests/Tools.Tests.ps1 b/images/win/scripts/Tests/Tools.Tests.ps1 index 80dbfbea71a3..9c91ac55b7dd 100644 --- a/images/win/scripts/Tests/Tools.Tests.ps1 +++ b/images/win/scripts/Tests/Tools.Tests.ps1 @@ -225,8 +225,16 @@ Describe "SQL OLEDB Driver" { } Describe "OpenSSL" { - It "OpenSSL" { + It "OpenSSL Version" { $OpenSSLVersion = (Get-ToolsetContent).openssl.version openssl version | Should -BeLike "* ${OpenSSLVersion}*" } + + It "OpenSSL Path" { + (Get-Command openssl).Source -eq (Join-Path ${env:ProgramFiles} 'OpenSSL\bin\openssl.exe') | Should -Be $true + } + + It "OpenSSL Full package" { + Join-Path ${env:ProgramFiles} 'OpenSSL\include' | Should -Exist + } } From a1206f1a5c7b40384b9ab3bcc31bfb33ab149f7d Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Tue, 26 Sep 2023 13:08:31 +0200 Subject: [PATCH 2241/3485] [Windows] Add checksum verification for GitHub CLI (#8360) --- .../scripts/Installers/Install-GitHub-CLI.ps1 | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/images/win/scripts/Installers/Install-GitHub-CLI.ps1 b/images/win/scripts/Installers/Install-GitHub-CLI.ps1 index 1efb2f74ecac..cf8278ac8125 100644 --- a/images/win/scripts/Installers/Install-GitHub-CLI.ps1 +++ b/images/win/scripts/Installers/Install-GitHub-CLI.ps1 @@ -1,15 +1,25 @@ ################################################################################ ## File: Install-GitHub-CLI.ps1 ## Desc: Install GitHub CLI +## Supply chain security: GitHub CLI - checksum validation ################################################################################ Write-Host "Get the latest gh version..." -$Name = "gh_windows_amd64.msi" -$Assets = (Invoke-RestMethod -Uri "https://api.github.com/repos/cli/cli/releases/latest").assets -$DownloadUrl = ($Assets.browser_download_url -match "windows_amd64.msi") | Select-Object -First 1 +$repoUrl = "https://api.github.com/repos/cli/cli/releases/latest" +$installerFile = "gh_windows_amd64.msi" +$assets = (Invoke-RestMethod -Uri $repoUrl).assets +$downloadUrl = ($assets.browser_download_url -match "windows_amd64.msi") | Select-Object -First 1 +$packagePath = Start-DownloadWithRetry -Url $downloadUrl -Name $installerFile -Install-Binary -Url $DownloadUrl -Name $Name +#region Supply chain security - GitHub CLI +$fileHash = (Get-FileHash -Path $packagePath -Algorithm SHA256).Hash +$hashUrl = ($assets.browser_download_url -match "checksums.txt") | Select-Object -First 1 +$externalHash = (Invoke-RestMethod -Uri $hashURL).ToString().Split("`n").Where({ $_ -ilike "*windows_amd64.msi*" }).Split(' ')[0] +Use-ChecksumComparison $fileHash $externalHash +#endregion + +Install-Binary -FilePath $packagePath Add-MachinePathItem "C:\Program Files (x86)\GitHub CLI" From 64f732022de885321d913960c8536a08858b875f Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Wed, 27 Sep 2023 13:00:07 +0200 Subject: [PATCH 2242/3485] [macOS] remove macOS 11 anka packer template (#8391) --- images/macos/templates/macOS-11.anka.pkr.hcl | 265 ------------------- 1 file changed, 265 deletions(-) delete mode 100644 images/macos/templates/macOS-11.anka.pkr.hcl diff --git a/images/macos/templates/macOS-11.anka.pkr.hcl b/images/macos/templates/macOS-11.anka.pkr.hcl deleted file mode 100644 index 3b1dc79a51d8..000000000000 --- a/images/macos/templates/macOS-11.anka.pkr.hcl +++ /dev/null @@ -1,265 +0,0 @@ -packer { - required_plugins { - veertu-anka = { - version = ">= v3.2.0" - source = "github.com/veertuinc/veertu-anka" - } - } -} - -variable "source_vm_name" { - type = string -} - -variable "source_vm_tag" { - type = string -} - -variable "build_id" { - type = string -} - -variable "vm_username" { - type = string - sensitive = true -} - -variable "vm_password" { - type = string - sensitive = true -} - -variable "github_api_pat" { - type = string - default = "" -} - -variable "xcode_install_storage_url" { - type = string - sensitive = true -} - -variable "xcode_install_sas" { - type = string - sensitive = true -} - -variable "vcpu_count" { - type = string - default = "6" -} - -variable "ram_size" { - type = string - default = "24G" -} - -variable "image_os" { - type = string - default = "macos11" -} - -source "veertu-anka-vm-clone" "template" { - vm_name = "${var.build_id}" - source_vm_name = "${var.source_vm_name}" - source_vm_tag = "${var.source_vm_tag}" - vcpu_count = "${var.vcpu_count}" - ram_size = "${var.ram_size}" - stop_vm = "true" -} - -build { - sources = [ - "source.veertu-anka-vm-clone.template" - ] - provisioner "shell" { - inline = [ - "mkdir ~/image-generation" - ] - } - provisioner "file" { - destination = "image-generation/" - sources = [ - "./provision/assets", - "./tests", - "./software-report", - "./helpers" - ] - } - provisioner "file" { - destination = "image-generation/software-report/" - source = "../../helpers/software-report-base" - } - provisioner "file" { - destination = "image-generation/add-certificate.swift" - source = "./provision/configuration/add-certificate.swift" - } - provisioner "file" { - destination = ".bashrc" - source = "./provision/configuration/environment/bashrc" - } - provisioner "file" { - destination = ".bash_profile" - source = "./provision/configuration/environment/bashprofile" - } - provisioner "file" { - destination = "./" - source = "./provision/utils" - } - provisioner "shell" { - inline = [ - "mkdir ~/bootstrap" - ] - } - provisioner "file" { - destination = "bootstrap" - source = "./provision/bootstrap-provisioner/" - } - provisioner "file" { - destination = "image-generation/toolset.json" - source = "./toolsets/toolset-11.json" - } - provisioner "shell" { - scripts = [ - "./provision/core/xcode-clt.sh", - "./provision/core/homebrew.sh" - ] - execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" - } - provisioner "shell" { - scripts = [ - "./provision/configuration/configure-tccdb-macos.sh", - "./provision/configuration/add-network-interface-detection.sh", - "./provision/configuration/autologin.sh", - "./provision/configuration/disable-auto-updates.sh", - "./provision/configuration/screensaver-off.sh", - "./provision/configuration/ntpconf.sh", - "./provision/configuration/max-files.sh", - "./provision/configuration/shell-change.sh", - ] - environment_vars = [ - "PASSWORD=${var.vm_password}", - "USERNAME=${var.vm_username}" - ] - execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}" - } - provisioner "shell" { - scripts = [ - "./provision/configuration/preimagedata.sh", - "./provision/configuration/configure-ssh.sh", - "./provision/configuration/configure-machine.sh" - ] - environment_vars = [ - "IMAGE_VERSION=${var.build_id}", - "IMAGE_OS=${var.image_os}" - ] - execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" - } - provisioner "shell" { - script = "./provision/core/reboot.sh" - execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}" - expect_disconnect = true - } - provisioner "shell" { - pause_before = "30s" - scripts = [ - "./provision/core/open_windows_check.sh", - "./provision/core/powershell.sh", - "./provision/core/dotnet.sh", - "./provision/core/python.sh", - "./provision/core/azcopy.sh", - "./provision/core/openssl.sh", - "./provision/core/ruby.sh", - "./provision/core/rubygem.sh", - "./provision/core/git.sh", - "./provision/core/mongodb.sh", - "./provision/core/node.sh", - "./provision/core/commonutils.sh", - ] - environment_vars = [ - "API_PAT=${var.github_api_pat}", - "USER_PASSWORD=${var.vm_password}" - ] - execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" - } - provisioner "shell" { - script = "./provision/core/xcode.ps1" - environment_vars = [ - "XCODE_INSTALL_STORAGE_URL=${var.xcode_install_storage_url}", - "XCODE_INSTALL_SAS=${var.xcode_install_sas}" - ] - execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} pwsh -f {{ .Path }}" - } - provisioner "shell" { - script = "./provision/core/reboot.sh" - execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}" - expect_disconnect = true - } - provisioner "shell" { - scripts = [ - "./provision/core/llvm.sh", - "./provision/core/golang.sh", - "./provision/core/swiftlint.sh", - "./provision/core/openjdk.sh", - "./provision/core/php.sh", - "./provision/core/aws.sh", - "./provision/core/rust.sh", - "./provision/core/gcc.sh", - "./provision/core/haskell.sh", - "./provision/core/stack.sh", - "./provision/core/cocoapods.sh", - "./provision/core/android-toolsets.sh", - "./provision/core/xamarin.sh", - "./provision/core/vsmac.sh", - "./provision/core/nvm.sh", - "./provision/core/apache.sh", - "./provision/core/nginx.sh", - "./provision/core/postgresql.sh", - "./provision/core/audiodevice.sh", - "./provision/core/vcpkg.sh", - "./provision/core/miniconda.sh", - "./provision/core/safari.sh", - "./provision/core/chrome.sh", - "./provision/core/edge.sh", - "./provision/core/firefox.sh", - "./provision/core/pypy.sh", - "./provision/core/pipx-packages.sh", - "./provision/core/bicep.sh", - "./provision/core/codeql-bundle.sh" - ] - environment_vars = [ - "API_PAT=${var.github_api_pat}" - ] - execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" - } - provisioner "shell" { - scripts = [ - "./provision/core/toolset.ps1", - "./provision/core/configure-toolset.ps1" - ] - execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} pwsh -f {{ .Path }}" - } - provisioner "shell" { - script = "./provision/core/delete-duplicate-sims.rb" - execute_command = "source $HOME/.bash_profile; ruby {{ .Path }}" - } - provisioner "shell" { - inline = [ - "pwsh -File \"$HOME/image-generation/software-report/SoftwareReport.Generator.ps1\" -OutputDirectory \"$HOME/image-generation/output/software-report\" -ImageName ${var.build_id}", - "pwsh -File \"$HOME/image-generation/tests/RunAll-Tests.ps1\"" - ] - execute_command = "source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" - } - provisioner "file" { - destination = "../image-output/" - direction = "download" - source = "./image-generation/output/" - } - provisioner "shell" { - scripts = [ - "./provision/configuration/configure-hostname.sh", - "./provision/configuration/finalize-vm.sh" - ] - execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" - } -} From 77724a96722bcb628c88cbb8b9901ffb6aef261f Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Wed, 27 Sep 2023 13:00:54 +0200 Subject: [PATCH 2243/3485] [Windows] Add checksum verification for AWS SAM CLI (#8316) --- images/win/scripts/Installers/Install-AWS.ps1 | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/images/win/scripts/Installers/Install-AWS.ps1 b/images/win/scripts/Installers/Install-AWS.ps1 index 9c1e88998733..0a319a3ecac0 100644 --- a/images/win/scripts/Installers/Install-AWS.ps1 +++ b/images/win/scripts/Installers/Install-AWS.ps1 @@ -1,6 +1,7 @@ ################################################################################ ## File: Install-AWS.ps1 ## Desc: Install AWS tools(AWS CLI, Session Manager Plugin for the AWS CLI, AWS SAM CLI) +## Supply chain security: AWS CLI - managed by package manager, Session Manager Plugin for the AWS CLI - missing, AWS SAM CLI - checksum validation ################################################################################ # Install AWS CLI @@ -13,6 +14,16 @@ Install-Binary -Url $sessionManagerUrl -Name $sessionManagerName -ArgumentList ( $env:Path = $env:Path + ";$env:ProgramFiles\Amazon\SessionManagerPlugin\bin" # Install AWS SAM CLI -Install-Binary -Url "https://github.com/awslabs/aws-sam-cli/releases/latest/download/AWS_SAM_CLI_64_PY3.msi" -Name "AWS_SAM_CLI_64_PY3.msi" +$packageName = "AWS_SAM_CLI_64_PY3.msi" +$packageUrl = "https://github.com/awslabs/aws-sam-cli/releases/latest/download/$packageName" +$packagePath = Start-DownloadWithRetry -Url $packageUrl -Name $packageName -Invoke-PesterTests -TestFile "CLI.Tools" -TestName "AWS" \ No newline at end of file +#region Supply chain security - AWS SAM CLI +$fileHash = (Get-FileHash -Path $packagePath -Algorithm SHA256).Hash +$externalHash = Get-HashFromGitHubReleaseBody -RepoOwner "awslabs" -RepoName "aws-sam-cli" -FileName $packageName +Use-ChecksumComparison $fileHash $externalHash +#endregion + +Install-Binary -FilePath $packagePath + +Invoke-PesterTests -TestFile "CLI.Tools" -TestName "AWS" From 978a92f44cb366f79509aae054859ad8104b48b6 Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Wed, 27 Sep 2023 13:01:51 +0200 Subject: [PATCH 2244/3485] [Windows] Add checksum validation for MSYS2 (#8385) --- images/win/scripts/Installers/Install-Msys2.ps1 | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/images/win/scripts/Installers/Install-Msys2.ps1 b/images/win/scripts/Installers/Install-Msys2.ps1 index ff1cc6982d82..09aca9a12a79 100644 --- a/images/win/scripts/Installers/Install-Msys2.ps1 +++ b/images/win/scripts/Installers/Install-Msys2.ps1 @@ -12,14 +12,21 @@ $origPath = $env:PATH function Install-Msys2 { $msys2_release = "https://api.github.com/repos/msys2/msys2-installer/releases/latest" - $msys2Uri = ((Invoke-RestMethod $msys2_release).assets | Where-Object { - $_.name -match "^msys2-x86_64" -and $_.name.EndsWith(".exe") }).browser_download_url - + $assets = (Invoke-RestMethod -Uri $msys2_release).assets + $msys2Uri = ($assets | Where-Object { $_.name -match "^msys2-x86_64" -and $_.name.EndsWith(".exe") }).browser_download_url + # Download the latest msys2 x86_64, filename includes release date Write-Host "Starting msys2 download using $($msys2Uri.split('/')[-1])" $msys2File = Start-DownloadWithRetry -Url $msys2Uri Write-Host "Finished download" + #region Supply chain security - Kind + $fileHash = (Get-FileHash -Path $msys2File -Algorithm SHA256).Hash + $hashUrl = ($assets.browser_download_url -match "msys2-checksums.txt") | Select-Object -First 1 + $externalHash = (Invoke-RestMethod -Uri $hashURL).ToString().Split("`n").Where({ $_ -ilike "*msys2-x86_64*" }).Split(' ')[0] + Use-ChecksumComparison $fileHash $externalHash + #endregion + # extract tar.xz to C:\ Write-Host "Starting msys2 installation" & $msys2File in --confirm-command --accept-messages --root C:/msys64 @@ -89,4 +96,4 @@ Install-MingwPackages -Packages $toolsetContent.mingw $env:PATH = $origPath Write-Host "`nMSYS2 installation completed" -Invoke-PesterTests -TestFile "MSYS2" \ No newline at end of file +Invoke-PesterTests -TestFile "MSYS2" From ab3cfaf685ec68b32f69f3c2485a49ec5adbed5f Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Wed, 27 Sep 2023 21:52:46 +0200 Subject: [PATCH 2245/3485] Remove not used variable group (#8396) --- images.CI/macos/azure-pipelines/image-generation.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/images.CI/macos/azure-pipelines/image-generation.yml b/images.CI/macos/azure-pipelines/image-generation.yml index 5379faaf2465..226e08a653d1 100644 --- a/images.CI/macos/azure-pipelines/image-generation.yml +++ b/images.CI/macos/azure-pipelines/image-generation.yml @@ -6,7 +6,6 @@ jobs: name: Mac-Cloud Image Generation variables: - group: Mac-Cloud Image Generation - - group: Mac-Cloud Image Generation Key Vault steps: - pwsh: | From 5e9e8cd16d1e79f138e110e2fd6f5b447a92df93 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 28 Sep 2023 06:48:30 +0000 Subject: [PATCH 2246/3485] Updating readme file for ubuntu20 version 20230924.1.0 (#8381) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2004-Readme.md | 97 +++++++++++++++---------------- 1 file changed, 48 insertions(+), 49 deletions(-) diff --git a/images/linux/Ubuntu2004-Readme.md b/images/linux/Ubuntu2004-Readme.md index 2c5b2a400253..eba622523f78 100644 --- a/images/linux/Ubuntu2004-Readme.md +++ b/images/linux/Ubuntu2004-Readme.md @@ -1,13 +1,12 @@ | Announcements | |-| +| [[All OS] hub utility will be removed on October 2](https://github.com/actions/runner-images/issues/8362) | | [Clang 12 will be removed from Ubuntu 22.04 image on September 25](https://github.com/actions/runner-images/issues/8263) | -| [Python 3.6.x will be removed from Ubuntu 20.04 and Windows 2019 images on September 18](https://github.com/actions/runner-images/issues/8238) | -| [[All OSes] Go 1.18.x will be removed on September, 18](https://github.com/actions/runner-images/issues/8237) | *** # Ubuntu 20.04 - OS Version: 20.04.6 LTS -- Kernel Version: 5.15.0-1046-azure -- Image Version: 20230917.1.0 +- Kernel Version: 5.15.0-1047-azure +- Image Version: 20230924.1.0 - Systemd version: 245.4-4ubuntu3.22 ## Installed Software @@ -26,24 +25,24 @@ - Kotlin 1.9.10-release-459 - Mono 6.12.0.200 - MSBuild 16.10.1.31701 (Mono 6.12.0.200) -- Node.js 18.17.1 +- Node.js 18.18.0 - Perl 5.30.0 - Python 3.8.10 - Ruby 2.7.0p0 -- Swift 5.8.1 +- Swift 5.9 ### Package Management - cpan 1.64 - Helm 3.12.3 -- Homebrew 4.1.11 +- Homebrew 4.1.12 - Miniconda 23.5.2 -- Npm 9.6.7 +- Npm 9.8.1 - NuGet 6.6.1.2 - Pip 20.0.2 - Pip3 20.0.2 - Pipx 1.2.0 - RubyGems 3.1.2 -- Vcpkg (build from commit e8c2a04eb) +- Vcpkg (build from commit 5a38b5ec0) - Yarn 1.22.19 #### Environment variables @@ -75,20 +74,20 @@ to accomplish this. - Bazelisk 1.18.0 - Bicep 0.21.1 - Buildah 1.22.3 -- CMake 3.27.5 +- CMake 3.27.6 - CodeQL Action Bundles 2.14.4 2.14.5 - Docker Amazon ECR Credential Helper 0.7.1 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.21.0 +- Docker Compose v2 2.22.0 - Docker-Buildx 0.11.2 - Docker Client 24.0.6 - Docker Server 24.0.6 -- Fastlane 2.215.1 +- Fastlane 2.216.0 - Git 2.42.0 - Git LFS 3.4.0 - Git-ftp 1.6.0 - Haveged 1.9.1 -- Heroku 8.4.2 +- Heroku 8.4.3 - HHVM (HipHop VM) 4.172.1 - jq 1.6 - Kind 0.20.0 @@ -106,7 +105,7 @@ to accomplish this. - Parcel 2.9.3 - PhantomJS 2.1.1 2.1.1 - Podman 3.4.2 -- Pulumi 3.83.0 +- Pulumi 3.85.0 - R 4.3.1 - Skopeo 1.5.0 - Sphinx Open Source Search Server 2.2.11 @@ -118,18 +117,18 @@ to accomplish this. ### CLI Tools - Alibaba Cloud CLI 3.0.174 -- AWS CLI 2.13.19 +- AWS CLI 2.13.21 - AWS CLI Session Manager Plugin 1.2.497.0 - AWS SAM CLI 1.97.0 - Azure CLI 2.52.0 - Azure CLI (azure-devops) 0.26.0 -- GitHub CLI 2.34.0 -- Google Cloud SDK 446.0.1 +- GitHub CLI 2.35.0 +- Google Cloud CLI 447.0.0 - Hub CLI 2.14.2 -- Netlify CLI 16.3.3 -- OpenShift CLI 4.13.12 +- Netlify CLI 16.4.2 +- OpenShift CLI 4.13.13 - ORAS CLI 1.1.0 -- Vercel CLI 32.2.4 +- Vercel CLI 32.3.1 ### Java | Version | Environment Variable | @@ -141,7 +140,7 @@ to accomplish this. ### PHP Tools - PHP: 7.4.33, 8.0.30, 8.1.23, 8.2.10 - Composer 2.6.3 -- PHPUnit 8.5.33 +- PHPUnit 8.5.34 ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ``` @@ -153,9 +152,9 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Stack 2.11.1 ### Rust Tools -- Cargo 1.72.0 -- Rust 1.72.0 -- Rustdoc 1.72.0 +- Cargo 1.72.1 +- Rust 1.72.1 +- Rustdoc 1.72.1 - Rustup 1.26.0 #### Packages @@ -167,13 +166,13 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.6.0 ### Browsers and Drivers -- Google Chrome 117.0.5938.88 -- ChromeDriver 117.0.5938.88 +- Google Chrome 117.0.5938.92 +- ChromeDriver 117.0.5938.92 - Chromium 117.0.5938.0 -- Microsoft Edge 117.0.2045.31 -- Microsoft Edge WebDriver 117.0.2045.31 +- Microsoft Edge 117.0.2045.40 +- Microsoft Edge WebDriver 117.0.2045.40 - Selenium server 4.12.0 -- Mozilla Firefox 117.0.1 +- Mozilla Firefox 118.0 - Geckodriver 0.33.0 #### Environment variables @@ -223,7 +222,7 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Node.js - 14.21.3 - 16.20.2 -- 18.17.1 +- 18.18.0 #### Python - 3.7.17 @@ -248,13 +247,13 @@ Use the following command as a part of your job to start the service: 'sudo syst - 3.1.4 ### PowerShell Tools -- PowerShell 7.2.13 +- PowerShell 7.2.14 #### PowerShell Modules - Az: 9.3.0 - Az (Cached): 3.1.0.zip, 4.4.0.zip, 5.9.0.zip, 6.6.0.zip, 7.5.0.zip - MarkdownPS: 1.9 -- Microsoft.Graph: 2.5.0 +- Microsoft.Graph: 2.6.1 - Pester: 5.5.0 - PSScriptAnalyzer: 1.21.0 @@ -278,18 +277,18 @@ Use the following command as a part of your job to start the service: 'sudo syst | CMake | 3.10.2<br>3.18.1<br>3.22.1 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 23.2.8568313<br>24.0.8215888<br>25.2.9519653 (default) | +| NDK | 23.2.8568313<br>24.0.8215888<br>25.2.9519653 (default)<br>26.0.10792818 | | SDK Patch Applier v4 | 1 | #### Environment variables -| Name | Value | -| ----------------------- | ------------------------------------------- | -| ANDROID_HOME | /usr/local/lib/android/sdk | -| ANDROID_NDK | /usr/local/lib/android/sdk/ndk/25.2.9519653 | -| ANDROID_NDK_HOME | /usr/local/lib/android/sdk/ndk/25.2.9519653 | -| ANDROID_NDK_LATEST_HOME | /usr/local/lib/android/sdk/ndk/25.2.9519653 | -| ANDROID_NDK_ROOT | /usr/local/lib/android/sdk/ndk/25.2.9519653 | -| ANDROID_SDK_ROOT | /usr/local/lib/android/sdk | +| Name | Value | +| ----------------------- | -------------------------------------------- | +| ANDROID_HOME | /usr/local/lib/android/sdk | +| ANDROID_NDK | /usr/local/lib/android/sdk/ndk/25.2.9519653 | +| ANDROID_NDK_HOME | /usr/local/lib/android/sdk/ndk/25.2.9519653 | +| ANDROID_NDK_LATEST_HOME | /usr/local/lib/android/sdk/ndk/26.0.10792818 | +| ANDROID_NDK_ROOT | /usr/local/lib/android/sdk/ndk/25.2.9519653 | +| ANDROID_SDK_ROOT | /usr/local/lib/android/sdk | ### Cached Docker images | Repository:Tag | Digest | Created | @@ -297,19 +296,19 @@ Use the following command as a part of your job to start the service: 'sudo syst | alpine:3.16 | sha256:a8cbb8c69ee71561f4b69c066bad07f7e510caaa523da26fbfc606b10bd7934b | 2023-08-07 | | alpine:3.17 | sha256:f71a5f071694a785e064f05fed657bf8277f1b2113a8ed70c90ad486d6ee54dc | 2023-08-07 | | alpine:3.18 | sha256:7144f7bab3d4c2648d7e59409f15ec52a18006a128c733fcff20d3a4a54ba44a | 2023-08-07 | -| buildpack-deps:bullseye | sha256:ccd2a733ab835437d0d52753724b4f860a70cfd79a2bc8dcfa90c469cd0a67b5 | 2023-09-07 | -| buildpack-deps:buster | sha256:ff4e70591f2e117f3b751bf55e9102cec6f1d728159a0daaac0ceaebd7742e26 | 2023-09-07 | +| buildpack-deps:bullseye | sha256:8ee57204a7af0468a61a3e47fbf8412d6ad1d479050bb702d99fd1d3664d7173 | 2023-09-20 | +| buildpack-deps:buster | sha256:0bc568b581ed3e9a13f818fd20258edb623cf67e6d354afadf77fb9095d798a2 | 2023-09-20 | | buildpack-deps:stretch | sha256:78e995165a5788c2f55aed6e548d8f6c1534830d4310c870408fccb2da8c5b2e | 2022-06-23 | -| debian:10 | sha256:972a285e4630b87e839bdcc09cb6fad08956524397b4d3878a5b65a8e6c3fdee | 2023-09-07 | -| debian:11 | sha256:f33900927c0a8bcf3f0e2281fd0237f4780cc6bc59729bb3a10e75b0703c5ca7 | 2023-09-07 | +| debian:10 | sha256:484cc8ab0d73f513e3f9bacd03424eb081bd90f594d7ebde42587843fdc242f3 | 2023-09-20 | +| debian:11 | sha256:54d33aaad0bc936a9a40d856764c7bc35c0afaa9cab51f88bb95f6cd8004438d | 2023-09-20 | | debian:9 | sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be | 2022-06-23 | | moby/buildkit:latest | sha256:890dcae054e3039f6c6b76bf0da80a130fa6e6bb1f3624063ef0210ac2c57b06 | 2023-08-24 | | node:14 | sha256:a158d3b9b4e3fa813fa6c8c590b8f0a860e015ad4e59bbce5744d2f6fd8461aa | 2023-04-12 | | node:14-alpine | sha256:434215b487a329c9e867202ff89e704d3a75e554822e07f3e0c0f9e606121b33 | 2023-03-29 | | node:16 | sha256:f77a1aef2da8d83e45ec990f45df50f1a286c5fe8bbfb8c6e4246c6389705c0b | 2023-09-07 | | node:16-alpine | sha256:a1f9d027912b58a7c75be7716c97cfbc6d3099f3a97ed84aa490be9dee20e787 | 2023-08-10 | -| node:18 | sha256:933bcfad91e9052a02bc29eb5aa29033e542afac4174f9524b79066d97b23c24 | 2023-09-07 | -| node:18-alpine | sha256:3482a20c97e401b56ac50ba8920cc7b5b2022bfc6aa7d4e4c231755770cf892f | 2023-08-10 | +| node:18 | sha256:ee0a21d64211d92d4340b225c556e9ef1a8bce1d5b03b49f5f07bf1dbbaa5626 | 2023-09-21 | +| node:18-alpine | sha256:619ce27eb37c7c0476bd518085bf1ba892e2148fc1ab5dbaff2f20c56e50444d | 2023-09-20 | | ubuntu:16.04 | sha256:1f1a2d56de1d604801a9671f301190704c25d604a416f59e03c04f5c6ffee0d6 | 2021-08-31 | | ubuntu:18.04 | sha256:152dc042452c496007f07ca9127571cb9c29697f42acbfad72324b2bb2e43c98 | 2023-05-30 | | ubuntu:20.04 | sha256:33a5cc25d22c45900796a1aca487ad7a7cb09f09ea00b779e3b2026b4fc2faba | 2023-08-01 | @@ -328,7 +327,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | coreutils | 8.30-3ubuntu2 | | curl | 7.68.0-1ubuntu2.19 | | dbus | 1.12.16-2ubuntu2.3 | -| dnsutils | 1:9.16.1-0ubuntu2.15 | +| dnsutils | 1:9.16.1-0ubuntu2.16 | | dpkg | 1.19.7ubuntu3.2 | | dpkg-dev | 1.19.7ubuntu3.2 | | fakeroot | 1.24-1 | @@ -381,7 +380,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | pollinate | 4.33-3ubuntu1.20.04.1 | | python-is-python3 | 3.8.2-4 | | rpm | 4.14.2.1+dfsg1-1build2 | -| rsync | 3.1.3-8ubuntu0.5 | +| rsync | 3.1.3-8ubuntu0.7 | | shellcheck | 0.7.0-2build2 | | sphinxsearch | 2.2.11-2ubuntu2 | | sqlite3 | 3.31.1-4ubuntu0.5 | From 62e9da75e7b3877ec48704e7342dad56d51330c8 Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Thu, 28 Sep 2023 09:56:05 +0200 Subject: [PATCH 2247/3485] [Windows] Fix mingw related lines in software report (#8389) --- .../SoftwareReport/SoftwareReport.Generator.ps1 | 4 +++- .../SoftwareReport/SoftwareReport.Tools.psm1 | 16 ++++++++++++++-- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index 558542718d9f..dcd76b889859 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -86,7 +86,9 @@ $tools.AddToolVersion("jq", $(Get-JQVersion)) $tools.AddToolVersion("Kind", $(Get-KindVersion)) $tools.AddToolVersion("Kubectl", $(Get-KubectlVersion)) $tools.AddToolVersion("Mercurial", $(Get-MercurialVersion)) -$tools.AddToolVersion("Mingw-w64", $(Get-MinGWVersion)) +$tools.AddToolVersion("gcc", $(Get-GCCVersion)) +$tools.AddToolVersion("gdb", $(Get-GDBVersion)) +$tools.AddToolVersion("GNU Binutils", $(Get-GNUBinutilsVersion)) $tools.AddToolVersion("Newman", $(Get-NewmanVersion)) $tools.AddToolVersion("NSIS", $(Get-NSISVersion)) $tools.AddToolVersion("OpenSSL", $(Get-OpenSSLVersion)) diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 index 86a645f8f045..b1038167e3ed 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 @@ -107,8 +107,20 @@ function Get-KindVersion { return $kindVersion } -function Get-MinGWVersion { - (gcc --version | Select-String -Pattern "MinGW-W64") -match "(?<version>\d+\.\d+\.\d+)" | Out-Null +function Get-GCCVersion { + (gcc --version | Select-String -Pattern "gcc.exe") -match "(?<version>\d+\.\d+\.\d+)" | Out-Null + $mingwVersion = $Matches.Version + return $mingwVersion +} + +function Get-GDBVersion { + (gdb --version | Select-String -Pattern "GNU gdb") -match "(?<version>\d+\.\d+)" | Out-Null + $mingwVersion = $Matches.Version + return $mingwVersion +} + +function Get-GNUBinutilsVersion { + (ld --version | Select-String -Pattern "GNU Binutils") -match "(?<version>\d+\.\d+)" | Out-Null $mingwVersion = $Matches.Version return $mingwVersion } From 74242a46873a7eed571fd47f0ae68869614b94d7 Mon Sep 17 00:00:00 2001 From: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com> Date: Thu, 28 Sep 2023 10:03:09 +0200 Subject: [PATCH 2248/3485] [windows] disable TSVNCache.exe (#8374) TortoiseSVN scans all drives for SVN repos. it eats disk IO, let us add registry setting which disables that activity --- images/win/scripts/Installers/Warmup-User.ps1 | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/images/win/scripts/Installers/Warmup-User.ps1 b/images/win/scripts/Installers/Warmup-User.ps1 index 19dc41265a1e..3ffcbb80876b 100644 --- a/images/win/scripts/Installers/Warmup-User.ps1 +++ b/images/win/scripts/Installers/Warmup-User.ps1 @@ -19,7 +19,15 @@ Copy-Item ${env:USERPROFILE}\AppData\Local\Microsoft\VisualStudio -Destination c reg.exe load HKLM\DEFAULT c:\users\default\ntuser.dat reg.exe copy HKCU\Software\Microsoft\VisualStudio HKLM\DEFAULT\Software\Microsoft\VisualStudio /s -reg.exe unload HKLM\DEFAULT +# disable TSVNCache.exe +$registryKeyPath = 'HKCU:\Software\TortoiseSVN' +if (-not(Test-Path -Path $registryKeyPath)) { + New-Item -Path $registryKeyPath -ItemType Directory -Force +} + +New-ItemProperty -Path $RegistryKeyPath -Name CacheType -PropertyType DWORD -Value 0 +reg.exe copy HKCU\Software\TortoiseSVN HKLM\DEFAULT\Software\TortoiseSVN /s -Write-Host "Warmup-User.ps1 - completed" \ No newline at end of file +reg.exe unload HKLM\DEFAULT +Write-Host "Warmup-User.ps1 - completed" From 620e2c26b268b514573b229a1c85f821ef6cc298 Mon Sep 17 00:00:00 2001 From: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com> Date: Thu, 28 Sep 2023 11:33:59 +0200 Subject: [PATCH 2249/3485] [windows] disable StorSvc for runners (#8388) --- images/win/scripts/Installers/Finalize-VM.ps1 | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/images/win/scripts/Installers/Finalize-VM.ps1 b/images/win/scripts/Installers/Finalize-VM.ps1 index 21f5f88117b9..70b740138b5f 100644 --- a/images/win/scripts/Installers/Finalize-VM.ps1 +++ b/images/win/scripts/Installers/Finalize-VM.ps1 @@ -91,13 +91,14 @@ $regUserServicesToDisables | ForEach-Object { # Disabled services $servicesToDisable = @( - "wuauserv" - "DiagTrack" - "dmwappushservice" - "PcaSvc" - "SysMain" - "gupdate" - "gupdatem" + 'wuauserv' + 'DiagTrack' + 'dmwappushservice' + 'PcaSvc' + 'SysMain' + 'gupdate' + 'gupdatem' + 'StorSvc' ) $servicesToDisable | ForEach-Object { From 8de4497f770b439ff490438db27c4bae8fbb1c84 Mon Sep 17 00:00:00 2001 From: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com> Date: Thu, 28 Sep 2023 11:57:30 +0200 Subject: [PATCH 2250/3485] [windows] implement DotNETSDK checksum validation (#8355) --- .../win/scripts/Installers/Install-DotnetSDK.ps1 | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/images/win/scripts/Installers/Install-DotnetSDK.ps1 b/images/win/scripts/Installers/Install-DotnetSDK.ps1 index fb4caff7b434..b1afdff46f87 100644 --- a/images/win/scripts/Installers/Install-DotnetSDK.ps1 +++ b/images/win/scripts/Installers/Install-DotnetSDK.ps1 @@ -2,6 +2,7 @@ ## File: Install-DotnetSDK.ps1 ## Desc: Install all released versions of the dotnet sdk and populate package ## cache. Should run after VS and Node +## Supply chain security: checksum validation ################################################################################ # Set environment variables @@ -52,13 +53,22 @@ function Invoke-Warmup ( function InstallSDKVersion ( $SdkVersion, + $dotnetVersion, $Warmup ) { if (!(Test-Path -Path "C:\Program Files\dotnet\sdk\$sdkVersion")) { Write-Host "Installing dotnet $sdkVersion" - .\dotnet-install.ps1 -Version $sdkVersion -InstallDir $(Join-Path -Path $env:ProgramFiles -ChildPath 'dotnet') + $ZipPath = [System.IO.Path]::combine([System.IO.Path]::GetTempPath(), [System.IO.Path]::GetRandomFileName()) + .\dotnet-install.ps1 -Version $sdkVersion -InstallDir $(Join-Path -Path $env:ProgramFiles -ChildPath 'dotnet') -ZipPath $ZipPath -KeepZip + + #region Supply chain security + $distributorFileHash = (Invoke-RestMethod -Uri "https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/$dotnetVersion/releases.json").releases.sdks.Where({$_.version -eq $SdkVersion}).files.Where({ $_.name -eq 'dotnet-sdk-win-x64.zip'}).hash + $localFileHash = (Get-FileHash -Path $ZipPath -Algorithm 'SHA512').Hash + + Use-ChecksumComparison -LocalFileHash $localFileHash -DistributorFileHash $distributorFileHash + #endregion } else { @@ -89,7 +99,7 @@ function InstallAllValidSdks() ForEach ($sdkVersion in $sdkVersionsToInstall) { - InstallSDKVersion -SdkVersion $sdkVersion -Warmup $warmup + InstallSDKVersion -SdkVersion $sdkVersion -DotnetVersion $dotnetVersion -Warmup $warmup } } } From f3d376e1911afbe8ba59ed4c8f5ba2f8c9adc382 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 28 Sep 2023 10:29:41 +0000 Subject: [PATCH 2251/3485] Updating readme file for win19 version 20230924.1.0 (#8378) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2019-Readme.md | 66 ++++++++++++++++---------------- 1 file changed, 32 insertions(+), 34 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index b79762b929e3..d30cce858d82 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -1,12 +1,10 @@ | Announcements | |-| -| [Ruby 2.4.x will be removed from the macOS 11 and Windows 2019 images on September 18](https://github.com/actions/runner-images/issues/8239) | -| [Python 3.6.x will be removed from Ubuntu 20.04 and Windows 2019 images on September 18](https://github.com/actions/runner-images/issues/8238) | -| [[All OSes] Go 1.18.x will be removed on September, 18](https://github.com/actions/runner-images/issues/8237) | +| [[All OS] hub utility will be removed on October 2](https://github.com/actions/runner-images/issues/8362) | *** # Windows Server 2019 - OS Version: 10.0.17763 Build 4851 -- Image Version: 20230918.1.0 +- Image Version: 20230924.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -19,7 +17,7 @@ - Julia 1.9.3 - Kotlin 1.9.10 - LLVM 16.0.6 -- Node 18.17.1 +- Node 18.18.0 - Perl 5.32.1 - PHP 8.2.10 - Python 3.7.9 @@ -30,12 +28,12 @@ - Composer 2.6.3 - Helm 3.12.3 - Miniconda 23.5.2 (pre-installed on the image but not added to PATH) -- NPM 9.6.7 +- NPM 9.8.1 - NuGet 6.7.0.127 - pip 23.2.1 (python 3.7) - Pipx 1.2.0 - RubyGems 2.7.6.3 -- Vcpkg (build from commit 0a50c9623) +- Vcpkg (build from commit 5a38b5ec0) - Yarn 1.22.19 #### Environment variables @@ -58,17 +56,17 @@ - Bazelisk 1.18.0 - Bicep 0.21.1 - Cabal 3.10.1.0 -- CMake 3.27.5 +- CMake 3.27.6 - CodeQL Action Bundles 2.14.4 2.14.5 - Docker 24.0.6 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.21.0 +- Docker Compose v2 2.22.0 - Docker-wincred 0.8.0 - ghc 9.6.2 - Git 2.42.0.windows.2 - Git LFS 3.4.0 -- Google Cloud SDK 446.0.1 -- ImageMagick 7.1.1-15 +- Google Cloud CLI 447.0.0 +- ImageMagick 7.1.1-18 - InnoSetup 6.2.2 - jq 1.7-dirty - Kind 0.20.0 @@ -80,7 +78,7 @@ - OpenSSL 1.1.1v - Packer 1.9.4 - Parcel 2.9.3 -- Pulumi 3.83.0 +- Pulumi 3.85.0 - R 4.3.1 - Service Fabric SDK 9.1.1436.9590 - Stack 2.11.1 @@ -94,19 +92,19 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.181 -- AWS CLI 2.13.19 +- AWS CLI 2.13.20 - AWS SAM CLI 1.97.0 - AWS Session Manager CLI 1.2.497.0 - Azure CLI 2.52.0 - Azure DevOps CLI extension 0.26.0 - Cloud Foundry CLI 6.53.0 -- GitHub CLI 2.34.0 +- GitHub CLI 2.35.0 - Hub CLI 2.14.2 ### Rust Tools -- Cargo 1.72.0 -- Rust 1.72.0 -- Rustdoc 1.72.0 +- Cargo 1.72.1 +- Rust 1.72.1 +- Rustdoc 1.72.1 - Rustup 1.26.0 #### Packages @@ -118,10 +116,10 @@ - Rustfmt 1.6.0 ### Browsers and Drivers -- Google Chrome 117.0.5938.89 -- Chrome Driver 117.0.5938.88 -- Microsoft Edge 117.0.2045.31 -- Microsoft Edge Driver 117.0.2045.31 +- Google Chrome 117.0.5938.92 +- Chrome Driver 117.0.5938.92 +- Microsoft Edge 117.0.2045.36 +- Microsoft Edge Driver 117.0.2045.41 - Mozilla Firefox 117.0.1 - Gecko Driver 0.33.0 - IE Driver 4.11.0.0 @@ -172,7 +170,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Node.js - 14.21.3 - 16.20.2 -- 18.17.1 +- 18.18.0 #### Python - 3.7.9 @@ -502,7 +500,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - nbgv 3.6.133+2d32d93cb1 ### PowerShell Tools -- PowerShell 7.2.13 +- PowerShell 7.2.14 #### Powershell Modules - Az: 9.3.0 @@ -511,10 +509,10 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Az (Cached): 1.0.0.zip, 1.6.0.zip, 2.3.2.zip, 2.6.0.zip, 3.1.0.zip, 3.5.0.zip, 3.8.0.zip, 4.3.0.zip, 4.4.0.zip, 4.7.0.zip, 5.5.0.zip, 5.9.0.zip, 6.6.0.zip, 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.416 +- AWSPowershell: 4.1.420 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 -- Microsoft.Graph: 2.5.0 +- Microsoft.Graph: 2.6.1 - Pester: 3.4.0, 5.5.0 - PowerShellGet: 1.0.0.1, 2.2.5 - PSScriptAnalyzer: 1.21.0 @@ -540,18 +538,18 @@ All other versions are saved but not installed. | Google APIs | addon-google_apis-google-21<br>addon-google_apis-google-22<br>addon-google_apis-google-23<br>addon-google_apis-google-24 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 23.2.8568313<br>24.0.8215888<br>25.2.9519653 | +| NDK | 23.2.8568313<br>24.0.8215888<br>25.2.9519653<br>26.0.10792818 | | SDK Patch Applier v4 | 1 | #### Environment variables -| Name | Value | -| ----------------------- | --------------------------------------- | -| ANDROID_HOME | C:\Android\android-sdk | -| ANDROID_NDK | C:\Android\android-sdk\ndk\25.2.9519653 | -| ANDROID_NDK_HOME | C:\Android\android-sdk\ndk\25.2.9519653 | -| ANDROID_NDK_LATEST_HOME | C:\Android\android-sdk\ndk\25.2.9519653 | -| ANDROID_NDK_ROOT | C:\Android\android-sdk\ndk\25.2.9519653 | -| ANDROID_SDK_ROOT | C:\Android\android-sdk | +| Name | Value | +| ----------------------- | ---------------------------------------- | +| ANDROID_HOME | C:\Android\android-sdk | +| ANDROID_NDK | C:\Android\android-sdk\ndk\25.2.9519653 | +| ANDROID_NDK_HOME | C:\Android\android-sdk\ndk\25.2.9519653 | +| ANDROID_NDK_LATEST_HOME | C:\Android\android-sdk\ndk\26.0.10792818 | +| ANDROID_NDK_ROOT | C:\Android\android-sdk\ndk\25.2.9519653 | +| ANDROID_SDK_ROOT | C:\Android\android-sdk | ### Cached Docker images | Repository:Tag | Digest | Created | From 4d9ce81db6b8cc0c712e6359e1d011adeead31cb Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 28 Sep 2023 10:41:59 +0000 Subject: [PATCH 2252/3485] Updating readme file for win22 version 20230924.1.0 (#8379) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2022-Readme.md | 64 ++++++++++++++++---------------- 1 file changed, 31 insertions(+), 33 deletions(-) diff --git a/images/win/Windows2022-Readme.md b/images/win/Windows2022-Readme.md index 0315a30b898b..58b760abe881 100644 --- a/images/win/Windows2022-Readme.md +++ b/images/win/Windows2022-Readme.md @@ -1,12 +1,10 @@ | Announcements | |-| -| [Ruby 2.4.x will be removed from the macOS 11 and Windows 2019 images on September 18](https://github.com/actions/runner-images/issues/8239) | -| [Python 3.6.x will be removed from Ubuntu 20.04 and Windows 2019 images on September 18](https://github.com/actions/runner-images/issues/8238) | -| [[All OSes] Go 1.18.x will be removed on September, 18](https://github.com/actions/runner-images/issues/8237) | +| [[All OS] hub utility will be removed on October 2](https://github.com/actions/runner-images/issues/8362) | *** # Windows Server 2022 - OS Version: 10.0.20348 Build 1970 -- Image Version: 20230918.1.0 +- Image Version: 20230924.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -19,7 +17,7 @@ - Julia 1.9.3 - Kotlin 1.9.10 - LLVM 16.0.6 -- Node 18.17.1 +- Node 18.18.0 - Perl 5.32.1 - PHP 8.2.10 - Python 3.9.13 @@ -30,12 +28,12 @@ - Composer 2.6.3 - Helm 3.12.3 - Miniconda 23.5.2 (pre-installed on the image but not added to PATH) -- NPM 9.6.7 +- NPM 9.8.1 - NuGet 6.7.0.127 - pip 23.2.1 (python 3.9) - Pipx 1.2.0 - RubyGems 3.2.33 -- Vcpkg (build from commit 0a50c9623) +- Vcpkg (build from commit 5a38b5ec0) - Yarn 1.22.19 #### Environment variables @@ -58,16 +56,16 @@ - Bazelisk 1.18.0 - Bicep 0.21.1 - Cabal 3.10.1.0 -- CMake 3.27.5 +- CMake 3.27.6 - CodeQL Action Bundles 2.14.4 2.14.5 - Docker 24.0.6 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.21.0 +- Docker Compose v2 2.22.0 - Docker-wincred 0.8.0 - ghc 9.6.2 - Git 2.42.0.windows.2 - Git LFS 3.4.0 -- ImageMagick 7.1.1-15 +- ImageMagick 7.1.1-18 - InnoSetup 6.2.2 - jq 1.7-dirty - Kind 0.20.0 @@ -78,7 +76,7 @@ - NSIS 3.08 - OpenSSL 1.1.1v - Packer 1.9.4 -- Pulumi 3.83.0 +- Pulumi 3.85.0 - R 4.3.1 - Service Fabric SDK 9.1.1436.9590 - Stack 2.11.1 @@ -92,18 +90,18 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.181 -- AWS CLI 2.13.19 +- AWS CLI 2.13.20 - AWS SAM CLI 1.97.0 - AWS Session Manager CLI 1.2.497.0 - Azure CLI 2.52.0 - Azure DevOps CLI extension 0.26.0 -- GitHub CLI 2.34.0 +- GitHub CLI 2.35.0 - Hub CLI 2.14.2 ### Rust Tools -- Cargo 1.72.0 -- Rust 1.72.0 -- Rustdoc 1.72.0 +- Cargo 1.72.1 +- Rust 1.72.1 +- Rustdoc 1.72.1 - Rustup 1.26.0 #### Packages @@ -115,10 +113,10 @@ - Rustfmt 1.6.0 ### Browsers and Drivers -- Google Chrome 117.0.5938.89 -- Chrome Driver 117.0.5938.88 -- Microsoft Edge 117.0.2045.31 -- Microsoft Edge Driver 117.0.2045.31 +- Google Chrome 117.0.5938.92 +- Chrome Driver 117.0.5938.92 +- Microsoft Edge 117.0.2045.36 +- Microsoft Edge Driver 117.0.2045.41 - Mozilla Firefox 117.0.1 - Gecko Driver 0.33.0 - IE Driver 4.11.0.0 @@ -166,7 +164,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Node.js - 14.21.3 - 16.20.2 -- 18.17.1 +- 18.18.0 #### Python - 3.7.9 @@ -561,7 +559,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - nbgv 3.6.133+2d32d93cb1 ### PowerShell Tools -- PowerShell 7.2.13 +- PowerShell 7.2.14 #### Powershell Modules - Az: 9.3.0 @@ -570,10 +568,10 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Az (Cached): 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.416 +- AWSPowershell: 4.1.420 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 -- Microsoft.Graph: 2.5.0 +- Microsoft.Graph: 2.6.1 - Pester: 3.4.0, 5.5.0 - PowerShellGet: 1.0.0.1, 2.2.5 - PSScriptAnalyzer: 1.21.0 @@ -598,18 +596,18 @@ All other versions are saved but not installed. | CMake | 3.18.1<br>3.22.1 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 23.2.8568313<br>24.0.8215888<br>25.2.9519653 | +| NDK | 23.2.8568313<br>24.0.8215888<br>25.2.9519653<br>26.0.10792818 | | SDK Patch Applier v4 | 1 | #### Environment variables -| Name | Value | -| ----------------------- | --------------------------------------- | -| ANDROID_HOME | C:\Android\android-sdk | -| ANDROID_NDK | C:\Android\android-sdk\ndk\25.2.9519653 | -| ANDROID_NDK_HOME | C:\Android\android-sdk\ndk\25.2.9519653 | -| ANDROID_NDK_LATEST_HOME | C:\Android\android-sdk\ndk\25.2.9519653 | -| ANDROID_NDK_ROOT | C:\Android\android-sdk\ndk\25.2.9519653 | -| ANDROID_SDK_ROOT | C:\Android\android-sdk | +| Name | Value | +| ----------------------- | ---------------------------------------- | +| ANDROID_HOME | C:\Android\android-sdk | +| ANDROID_NDK | C:\Android\android-sdk\ndk\25.2.9519653 | +| ANDROID_NDK_HOME | C:\Android\android-sdk\ndk\25.2.9519653 | +| ANDROID_NDK_LATEST_HOME | C:\Android\android-sdk\ndk\26.0.10792818 | +| ANDROID_NDK_ROOT | C:\Android\android-sdk\ndk\25.2.9519653 | +| ANDROID_SDK_ROOT | C:\Android\android-sdk | ### Cached Docker images | Repository:Tag | Digest | Created | From db8e758cb7a40a4bb5a3a7cc381677db20938a68 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Thu, 28 Sep 2023 14:10:08 +0200 Subject: [PATCH 2253/3485] [macOS] remove python 3.10 from arm64 toolcache (#8405) --- images/macos/toolsets/toolset-13.json | 1 - 1 file changed, 1 deletion(-) diff --git a/images/macos/toolsets/toolset-13.json b/images/macos/toolsets/toolset-13.json index c7d121a92304..3bbfcca0927b 100644 --- a/images/macos/toolsets/toolset-13.json +++ b/images/macos/toolsets/toolset-13.json @@ -118,7 +118,6 @@ }, "arm64": { "versions": [ - "3.10.*", "3.11.*" ] } From a4234d46c7b5db3e2187af0db44790e1a898c802 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 28 Sep 2023 12:35:08 +0000 Subject: [PATCH 2254/3485] Updating readme file for ubuntu22 version 20230924.1.0 (#8382) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2204-Readme.md | 101 +++++++++++++++--------------- 1 file changed, 50 insertions(+), 51 deletions(-) diff --git a/images/linux/Ubuntu2204-Readme.md b/images/linux/Ubuntu2204-Readme.md index d8e0df4c45d9..5b2ef7f3a49d 100644 --- a/images/linux/Ubuntu2204-Readme.md +++ b/images/linux/Ubuntu2204-Readme.md @@ -1,22 +1,21 @@ | Announcements | |-| +| [[All OS] hub utility will be removed on October 2](https://github.com/actions/runner-images/issues/8362) | | [Clang 12 will be removed from Ubuntu 22.04 image on September 25](https://github.com/actions/runner-images/issues/8263) | -| [Python 3.6.x will be removed from Ubuntu 20.04 and Windows 2019 images on September 18](https://github.com/actions/runner-images/issues/8238) | -| [[All OSes] Go 1.18.x will be removed on September, 18](https://github.com/actions/runner-images/issues/8237) | *** # Ubuntu 22.04 - OS Version: 22.04.3 LTS -- Kernel Version: 6.2.0-1011-azure -- Image Version: 20230917.1.0 +- Kernel Version: 6.2.0-1012-azure +- Image Version: 20230924.1.0 - Systemd version: 249.11-0ubuntu3.10 ## Installed Software ### Language and Runtime - Bash 5.1.16(1)-release -- Clang: 12.0.1, 13.0.1, 14.0.0 -- Clang-format: 12.0.1, 13.0.1, 14.0.0 -- Clang-tidy: 12.0.1, 13.0.1, 14.0.0, 15.0.7 +- Clang: 13.0.1, 14.0.0 +- Clang-format: 13.0.1, 14.0.0 +- Clang-tidy: 13.0.1, 14.0.0, 15.0.7 - Dash 0.5.11+git20210903+057cd650a4ed-3build1 - GNU C++: 9.5.0, 10.5.0, 11.4.0, 12.3.0 - GNU Fortran: 9.5.0, 10.5.0, 11.4.0, 12.3.0 @@ -24,24 +23,24 @@ - Kotlin 1.9.10-release-459 - Mono 6.12.0.200 - MSBuild 16.10.1.31701 (Mono 6.12.0.200) -- Node.js 18.17.1 +- Node.js 18.18.0 - Perl 5.34.0 - Python 3.10.12 - Ruby 3.0.2p107 -- Swift 5.8.1 +- Swift 5.9 ### Package Management - cpan 1.64 - Helm 3.12.3 -- Homebrew 4.1.11 +- Homebrew 4.1.12 - Miniconda 23.5.2 -- Npm 9.6.7 +- Npm 9.8.1 - NuGet 6.6.1.2 - Pip 22.0.2 - Pip3 22.0.2 - Pipx 1.2.0 - RubyGems 3.3.5 -- Vcpkg (build from commit e8c2a04eb) +- Vcpkg (build from commit 5a38b5ec0) - Yarn 1.22.19 #### Environment variables @@ -70,20 +69,20 @@ to accomplish this. - Bazelisk 1.18.0 - Bicep 0.21.1 - Buildah 1.23.1 -- CMake 3.27.5 +- CMake 3.27.6 - CodeQL Action Bundles 2.14.4 2.14.5 - Docker Amazon ECR Credential Helper 0.7.1 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.21.0 +- Docker Compose v2 2.22.0 - Docker-Buildx 0.11.2 - Docker Client 24.0.6 - Docker Server 24.0.6 -- Fastlane 2.215.1 +- Fastlane 2.216.0 - Git 2.42.0 - Git LFS 3.4.0 - Git-ftp 1.6.0 - Haveged 1.9.14 -- Heroku 8.4.2 +- Heroku 8.4.3 - jq 1.6 - Kind 0.20.0 - Kubectl 1.28.2 @@ -99,7 +98,7 @@ to accomplish this. - Packer 1.9.4 - Parcel 2.9.3 - Podman 3.4.4 -- Pulumi 3.83.0 +- Pulumi 3.85.0 - R 4.3.1 - Skopeo 1.4.1 - Sphinx Open Source Search Server 2.2.11 @@ -111,18 +110,18 @@ to accomplish this. ### CLI Tools - Alibaba Cloud CLI 3.0.181 -- AWS CLI 2.13.19 +- AWS CLI 2.13.21 - AWS CLI Session Manager Plugin 1.2.497.0 - AWS SAM CLI 1.97.0 - Azure CLI 2.52.0 - Azure CLI (azure-devops) 0.26.0 -- GitHub CLI 2.34.0 -- Google Cloud SDK 446.0.1 +- GitHub CLI 2.35.0 +- Google Cloud CLI 447.0.0 - Hub CLI 2.14.2 -- Netlify CLI 16.3.3 -- OpenShift CLI 4.13.12 +- Netlify CLI 16.4.2 +- OpenShift CLI 4.13.13 - ORAS CLI 1.1.0 -- Vercel CLI 32.2.4 +- Vercel CLI 32.3.1 ### Java | Version | Environment Variable | @@ -134,7 +133,7 @@ to accomplish this. ### PHP Tools - PHP: 8.1.2 - Composer 2.6.3 -- PHPUnit 8.5.33 +- PHPUnit 8.5.34 ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ``` @@ -146,9 +145,9 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Stack 2.11.1 ### Rust Tools -- Cargo 1.72.0 -- Rust 1.72.0 -- Rustdoc 1.72.0 +- Cargo 1.72.1 +- Rust 1.72.1 +- Rustdoc 1.72.1 - Rustup 1.26.0 #### Packages @@ -160,13 +159,13 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.6.0 ### Browsers and Drivers -- Google Chrome 117.0.5938.88 -- ChromeDriver 117.0.5938.88 +- Google Chrome 117.0.5938.92 +- ChromeDriver 117.0.5938.92 - Chromium 117.0.5938.0 -- Microsoft Edge 117.0.2045.31 -- Microsoft Edge WebDriver 117.0.2045.31 +- Microsoft Edge 117.0.2045.40 +- Microsoft Edge WebDriver 117.0.2045.40 - Selenium server 4.12.0 -- Mozilla Firefox 117.0.1 +- Mozilla Firefox 118.0 - Geckodriver 0.33.0 #### Environment variables @@ -215,7 +214,7 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Node.js - 14.21.3 - 16.20.2 -- 18.17.1 +- 18.18.0 #### Python - 3.7.17 @@ -234,12 +233,12 @@ Use the following command as a part of your job to start the service: 'sudo syst - 3.1.4 ### PowerShell Tools -- PowerShell 7.2.13 +- PowerShell 7.2.14 #### PowerShell Modules - Az: 9.3.0 - MarkdownPS: 1.9 -- Microsoft.Graph: 2.5.0 +- Microsoft.Graph: 2.6.1 - Pester: 5.5.0 - PSScriptAnalyzer: 1.21.0 @@ -262,18 +261,18 @@ Use the following command as a part of your job to start the service: 'sudo syst | CMake | 3.10.2<br>3.18.1<br>3.22.1 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 23.2.8568313<br>24.0.8215888<br>25.2.9519653 (default) | +| NDK | 23.2.8568313<br>24.0.8215888<br>25.2.9519653 (default)<br>26.0.10792818 | | SDK Patch Applier v4 | 1 | #### Environment variables -| Name | Value | -| ----------------------- | ------------------------------------------- | -| ANDROID_HOME | /usr/local/lib/android/sdk | -| ANDROID_NDK | /usr/local/lib/android/sdk/ndk/25.2.9519653 | -| ANDROID_NDK_HOME | /usr/local/lib/android/sdk/ndk/25.2.9519653 | -| ANDROID_NDK_LATEST_HOME | /usr/local/lib/android/sdk/ndk/25.2.9519653 | -| ANDROID_NDK_ROOT | /usr/local/lib/android/sdk/ndk/25.2.9519653 | -| ANDROID_SDK_ROOT | /usr/local/lib/android/sdk | +| Name | Value | +| ----------------------- | -------------------------------------------- | +| ANDROID_HOME | /usr/local/lib/android/sdk | +| ANDROID_NDK | /usr/local/lib/android/sdk/ndk/25.2.9519653 | +| ANDROID_NDK_HOME | /usr/local/lib/android/sdk/ndk/25.2.9519653 | +| ANDROID_NDK_LATEST_HOME | /usr/local/lib/android/sdk/ndk/26.0.10792818 | +| ANDROID_NDK_ROOT | /usr/local/lib/android/sdk/ndk/25.2.9519653 | +| ANDROID_SDK_ROOT | /usr/local/lib/android/sdk | ### Cached Docker images | Repository:Tag | Digest | Created | @@ -281,17 +280,17 @@ Use the following command as a part of your job to start the service: 'sudo syst | alpine:3.16 | sha256:a8cbb8c69ee71561f4b69c066bad07f7e510caaa523da26fbfc606b10bd7934b | 2023-08-07 | | alpine:3.17 | sha256:f71a5f071694a785e064f05fed657bf8277f1b2113a8ed70c90ad486d6ee54dc | 2023-08-07 | | alpine:3.18 | sha256:7144f7bab3d4c2648d7e59409f15ec52a18006a128c733fcff20d3a4a54ba44a | 2023-08-07 | -| buildpack-deps:bullseye | sha256:ccd2a733ab835437d0d52753724b4f860a70cfd79a2bc8dcfa90c469cd0a67b5 | 2023-09-07 | -| buildpack-deps:buster | sha256:ff4e70591f2e117f3b751bf55e9102cec6f1d728159a0daaac0ceaebd7742e26 | 2023-09-07 | -| debian:10 | sha256:972a285e4630b87e839bdcc09cb6fad08956524397b4d3878a5b65a8e6c3fdee | 2023-09-07 | -| debian:11 | sha256:f33900927c0a8bcf3f0e2281fd0237f4780cc6bc59729bb3a10e75b0703c5ca7 | 2023-09-07 | +| buildpack-deps:bullseye | sha256:8ee57204a7af0468a61a3e47fbf8412d6ad1d479050bb702d99fd1d3664d7173 | 2023-09-20 | +| buildpack-deps:buster | sha256:0bc568b581ed3e9a13f818fd20258edb623cf67e6d354afadf77fb9095d798a2 | 2023-09-20 | +| debian:10 | sha256:484cc8ab0d73f513e3f9bacd03424eb081bd90f594d7ebde42587843fdc242f3 | 2023-09-20 | +| debian:11 | sha256:54d33aaad0bc936a9a40d856764c7bc35c0afaa9cab51f88bb95f6cd8004438d | 2023-09-20 | | moby/buildkit:latest | sha256:890dcae054e3039f6c6b76bf0da80a130fa6e6bb1f3624063ef0210ac2c57b06 | 2023-08-24 | | node:14 | sha256:a158d3b9b4e3fa813fa6c8c590b8f0a860e015ad4e59bbce5744d2f6fd8461aa | 2023-04-12 | | node:14-alpine | sha256:434215b487a329c9e867202ff89e704d3a75e554822e07f3e0c0f9e606121b33 | 2023-03-29 | | node:16 | sha256:f77a1aef2da8d83e45ec990f45df50f1a286c5fe8bbfb8c6e4246c6389705c0b | 2023-09-07 | | node:16-alpine | sha256:a1f9d027912b58a7c75be7716c97cfbc6d3099f3a97ed84aa490be9dee20e787 | 2023-08-10 | -| node:18 | sha256:933bcfad91e9052a02bc29eb5aa29033e542afac4174f9524b79066d97b23c24 | 2023-09-07 | -| node:18-alpine | sha256:3482a20c97e401b56ac50ba8920cc7b5b2022bfc6aa7d4e4c231755770cf892f | 2023-08-10 | +| node:18 | sha256:ee0a21d64211d92d4340b225c556e9ef1a8bce1d5b03b49f5f07bf1dbbaa5626 | 2023-09-21 | +| node:18-alpine | sha256:619ce27eb37c7c0476bd518085bf1ba892e2148fc1ab5dbaff2f20c56e50444d | 2023-09-20 | | ubuntu:18.04 | sha256:152dc042452c496007f07ca9127571cb9c29697f42acbfad72324b2bb2e43c98 | 2023-05-30 | | ubuntu:20.04 | sha256:33a5cc25d22c45900796a1aca487ad7a7cb09f09ea00b779e3b2026b4fc2faba | 2023-08-01 | | ubuntu:22.04 | sha256:aabed3296a3d45cede1dc866a24476c4d7e093aa806263c27ddaadbdce3c1054 | 2023-08-16 | @@ -310,7 +309,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | coreutils | 8.32-4.1ubuntu1 | | curl | 7.81.0-1ubuntu1.13 | | dbus | 1.12.20-2ubuntu4.1 | -| dnsutils | 1:9.18.12-0ubuntu0.22.04.2 | +| dnsutils | 1:9.18.12-0ubuntu0.22.04.3 | | dpkg | 1.21.1ubuntu2.2 | | dpkg-dev | 1.21.1ubuntu2.2 | | fakeroot | 1.28-1ubuntu1 | From b427c0b2b3125fe6df99876687e100d55d7a67cd Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 29 Sep 2023 09:26:59 +0000 Subject: [PATCH 2255/3485] Updating readme file for macOS-11 version 20230921.4 (#8377) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-11-Readme.md | 71 ++++++++++++++++----------------- 1 file changed, 35 insertions(+), 36 deletions(-) diff --git a/images/macos/macos-11-Readme.md b/images/macos/macos-11-Readme.md index 39c20c9869ac..da3493c7ffb5 100644 --- a/images/macos/macos-11-Readme.md +++ b/images/macos/macos-11-Readme.md @@ -1,12 +1,11 @@ | Announcements | |-| -| [Ruby 2.4.x will be removed from the macOS 11 and Windows 2019 images on September 18](https://github.com/actions/runner-images/issues/8239) | -| [[All OSes] Go 1.18.x will be removed on September, 18](https://github.com/actions/runner-images/issues/8237) | +| [[All OS] hub utility will be removed on October 2](https://github.com/actions/runner-images/issues/8362) | *** # macOS 11 - OS Version: macOS 11.7.10 (20G1427) - Kernel Version: Darwin 20.6.0 -- Image Version: 20230915.2 +- Image Version: 20230921.4 ## Installed Software @@ -26,9 +25,9 @@ - Go 1.20.8 - Mono 6.12.0.188 - MSBuild 16.10.1.51301 (Mono 6.12.0.188) -- Node.js 18.17.1 +- Node.js 18.18.0 - NVM 0.39.5 -- NVM - Cached node versions: 14.21.3, 16.20.2, 18.17.1 +- NVM - Cached node versions: 14.21.3, 16.20.2, 18.18.0 - Perl 5.36.1 - PHP 8.2.10 - Python 2.7.18 @@ -38,18 +37,18 @@ ### Package Management - Bundler 2.4.19 -- Carthage 0.39.0 +- Carthage 0.39.1 - CocoaPods 1.12.1 - Composer 2.6.3 -- Homebrew 4.1.11 +- Homebrew 4.1.12 - Miniconda 23.5.2 -- NPM 9.6.7 +- NPM 9.8.1 - NuGet 6.3.1.1 - Pip 20.3.4 (python 2.7) - Pip3 23.2.1 (python 3.11) - Pipx 1.2.0 - RubyGems 3.4.19 -- Vcpkg 2023 (build from commit e8c2a04eb) +- Vcpkg 2023 (build from commit 7476f0d4e) - Yarn 1.22.19 #### Environment variables @@ -62,7 +61,7 @@ - Apache Ant 1.10.14 - Apache Maven 3.9.4 - Gradle 8.3 -- Sbt 1.9.5 +- Sbt 1.9.6 ### Utilities - 7-Zip 17.05 @@ -74,13 +73,13 @@ - Curl 8.3.0 - Git 2.42.0 - Git LFS 3.4.0 -- GitHub CLI 2.34.0 +- GitHub CLI 2.35.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.21.4 - gpg (GnuPG) 2.4.3 - helm v3.12.3+g3a31588 - Hub CLI 2.14.2 -- ImageMagick 7.1.1-15 +- ImageMagick 7.1.1-17 - jq 1.7 - mongo 5.0.17 - mongod 5.0.17 @@ -99,21 +98,21 @@ ### Tools - Aliyun CLI 3.0.181 - App Center CLI 2.14.0 -- AWS CLI 2.13.19 +- AWS CLI 2.13.20 - AWS SAM CLI 1.97.0 - AWS Session Manager CLI 1.2.497.0 - Azure CLI 2.52.0 - Azure CLI (azure-devops) 0.26.0 - Bicep CLI 0.21.1 - Cabal 3.6.2.0 -- Cmake 3.27.5 +- Cmake 3.27.6 - CodeQL Action Bundles 2.14.4 2.14.5 -- Fastlane 2.214.0 +- Fastlane 2.216.0 - GHC 9.6.2 - GHCup 0.1.19.4 -- Jazzy 0.14.3 +- Jazzy 0.14.4 - Stack 2.9.3 -- SwiftFormat 0.52.3 +- SwiftFormat 0.52.4 - Swig 4.1.1 - Xcode Command Line Tools 13.2.0.0.1.1638488800 @@ -124,11 +123,11 @@ ### Browsers - Safari 16.6 (16615.3.12.11.3) - SafariDriver 16.6 (16615.3.12.11.3) -- Google Chrome 117.0.5938.88 -- Google Chrome for Testing 117.0.5938.88 -- ChromeDriver 117.0.5938.88 -- Microsoft Edge 117.0.2045.31 -- Microsoft Edge WebDriver 117.0.2045.31 +- Google Chrome 117.0.5938.92 +- Google Chrome for Testing 117.0.5938.92 +- ChromeDriver 117.0.5938.92 +- Microsoft Edge 117.0.2045.35 +- Microsoft Edge WebDriver 117.0.2045.35 - Mozilla Firefox 117.0.1 - geckodriver 0.33.0 - Selenium server 4.12.1 @@ -173,7 +172,7 @@ #### Node.js - 14.21.3 - 16.20.2 -- 18.17.1 +- 18.18.0 #### Go - 1.19.13 @@ -181,9 +180,9 @@ - 1.21.1 ### Rust Tools -- Cargo 1.72.0 -- Rust 1.72.0 -- Rustdoc 1.72.0 +- Cargo 1.72.1 +- Rust 1.72.1 +- Rustdoc 1.72.1 - Rustup 1.26.0 #### Packages @@ -195,7 +194,7 @@ - Rustfmt 1.6.0-stable ### PowerShell Tools -- PowerShell 7.2.13 +- PowerShell 7.2.14 #### PowerShell Modules - Az: 10.3.0 @@ -339,18 +338,18 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" | CMake | 3.10.2<br>3.18.1<br>3.22.1 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 23.2.8568313<br>24.0.8215888<br>25.2.9519653 (default) | +| NDK | 23.2.8568313<br>24.0.8215888<br>25.2.9519653 (default)<br>26.0.10792818 | | SDK Patch Applier v4 | 1 | #### Environment variables -| Name | Value | -| ----------------------- | -------------------------------------------------- | -| ANDROID_HOME | /Users/runner/Library/Android/sdk | -| ANDROID_NDK | /Users/runner/Library/Android/sdk/ndk/25.2.9519653 | -| ANDROID_NDK_HOME | /Users/runner/Library/Android/sdk/ndk/25.2.9519653 | -| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/25.2.9519653 | -| ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk/25.2.9519653 | -| ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | +| Name | Value | +| ----------------------- | --------------------------------------------------- | +| ANDROID_HOME | /Users/runner/Library/Android/sdk | +| ANDROID_NDK | /Users/runner/Library/Android/sdk/ndk/25.2.9519653 | +| ANDROID_NDK_HOME | /Users/runner/Library/Android/sdk/ndk/25.2.9519653 | +| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/26.0.10792818 | +| ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk/25.2.9519653 | +| ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | ### Miscellaneous - libXext 1.3.5 From fca7da39695af736688e9cd5741c258d55a8706d Mon Sep 17 00:00:00 2001 From: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com> Date: Fri, 29 Sep 2023 12:14:12 +0200 Subject: [PATCH 2256/3485] [windows] implement PyPy checksum validation (#8338) --- .../win/scripts/Installers/Install-PyPy.ps1 | 27 ++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/images/win/scripts/Installers/Install-PyPy.ps1 b/images/win/scripts/Installers/Install-PyPy.ps1 index eb31c86f4e18..4a8ef90244ec 100644 --- a/images/win/scripts/Installers/Install-PyPy.ps1 +++ b/images/win/scripts/Installers/Install-PyPy.ps1 @@ -2,6 +2,7 @@ ## File: Install-PyPy.ps1 ## Team: CI-Build ## Desc: Install PyPy +## Supply chain security: checksum validation ################################################################################ function Install-PyPy { @@ -82,6 +83,11 @@ $toolsetVersions = Get-ToolsetContent | Select-Object -ExpandProperty toolcache # Get PyPy releases $pypyVersions = Invoke-RestMethod https://downloads.python.org/pypy/versions.json +# required for html parsing +Install-Module PowerHTML -Scope CurrentUser +Import-Module PowerHTML +$checksums = (Invoke-RestMethod -Uri 'https://www.pypy.org/checksums.html' | ConvertFrom-HTML).SelectNodes('//*[@id="content"]/article/div/pre') + Write-Host "Starting installation PyPy..." foreach($toolsetVersion in $toolsetVersions.versions) { @@ -93,8 +99,23 @@ foreach($toolsetVersion in $toolsetVersions.versions) if ($latestMajorPyPyVersion) { - Write-Host "Found PyPy '$($latestMajorPyPyVersion.filename)' package" - $tempPyPyPackagePath = Start-DownloadWithRetry -Url $latestMajorPyPyVersion.download_url -Name $latestMajorPyPyVersion.filename + $filename = $latestMajorPyPyVersion.filename + Write-Host "Found PyPy '$filename' package" + $tempPyPyPackagePath = Start-DownloadWithRetry -Url $latestMajorPyPyVersion.download_url -Name $filename + + #region Supply chain security + $localFileHash = (Get-FileHash -Path $tempPyPyPackagePath -Algorithm SHA256).Hash + $distributorFileHash = $null + + ForEach($node in $checksums) { + if($node.InnerText -ilike "*${filename}*") { + $distributorFileHash = $node.InnerText.ToString().Split("`n").Where({ $_ -ilike "*${filename}*" }).Split(' ')[0] + } + } + + Use-ChecksumComparison -LocalFileHash $localFileHash -DistributorFileHash $distributorFileHash + #endregion + Install-PyPy -PackagePath $tempPyPyPackagePath -Architecture $toolsetVersions.arch } else @@ -102,4 +123,4 @@ foreach($toolsetVersion in $toolsetVersions.versions) Write-Host "Failed to query PyPy version '$toolsetVersion'" exit 1 } -} \ No newline at end of file +} From 361127db51f9c5d6c5c024f4ffa650e2bd7ca345 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Fri, 29 Sep 2023 12:18:57 +0200 Subject: [PATCH 2257/3485] [macOS] add README file for M1 runner (#8414) --- images/macos/macos-13-arm64-Readme.md | 151 ++++++++++++++++++++++++++ 1 file changed, 151 insertions(+) create mode 100644 images/macos/macos-13-arm64-Readme.md diff --git a/images/macos/macos-13-arm64-Readme.md b/images/macos/macos-13-arm64-Readme.md new file mode 100644 index 000000000000..4da3476a0899 --- /dev/null +++ b/images/macos/macos-13-arm64-Readme.md @@ -0,0 +1,151 @@ +# macOS 13 +- OS Version: macOS 13.6 (22G120) +- Kernel Version: Darwin 22.6.0 +- Image Version: 20230924.3 + +## Installed Software + +### Language and Runtime +- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.401 +- Bash 3.2.57(1)-release +- Clang/LLVM 14.0.3 +- Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` +- GCC 11 (Homebrew GCC 11.4.0) - available by `gcc-11` alias +- GCC 12 (Homebrew GCC 12.3.0) - available by `gcc-12` alias +- GNU Fortran 11 (Homebrew GCC 11.4.0) - available by `gfortran-11` alias +- GNU Fortran 12 (Homebrew GCC 12.3.0) - available by `gfortran-12` alias +- Julia 1.9.3 +- Kotlin 1.9.10-release-459 +- Mono 6.12.0.188 +- Perl 5.36.1 +- R 4.3.1 +- Ruby 3.0.6p216 + +### Package Management +- Bundler 2.4.19 +- Carthage 0.39.1 +- CocoaPods 1.13.0 +- Composer command +- Homebrew 4.1.12 +- NPM 9.8.1 +- NuGet 6.3.1.1 +- RubyGems 3.4.19 +- Yarn 1.22.19 + +### Project Management +- Apache Ant 1.10.14 + +### Utilities +- 7-Zip 17.05 +- aria2 1.36.0 +- azcopy 10.20.1 +- bazel 6.3.2 +- bazelisk 1.18.0 +- bsdtar 3.5.3 - available by 'tar' alias +- Curl 8.1.2 +- Git 2.42.0 +- Git LFS 3.4.0 +- GitHub CLI 2.35.0 +- GNU Tar 1.35 - available by 'gtar' alias +- GNU Wget 1.21.4 +- gpg (GnuPG) 2.4.3 +- jq 1.7 +- OpenSSL 1.1.1w 11 Sep 2023 +- Packer 1.9.4 +- pkg-config 0.29.2 +- yq 4.35.1 +- zstd 1.5.5 + +### Tools +- Azure CLI 2.52.0 +- Azure CLI (azure-devops) 0.26.0 +- Bicep CLI 0.21.1 +- Cmake 3.27.6 +- CodeQL Action Bundles 2.14.4 2.14.5 +- Fastlane 2.216.0 +- SwiftFormat 0.52.4 +- Xcode Command Line Tools 15.0.0.0.1.1694021235 + +### Linters + +### Rust Tools +- Cargo 1.72.1 +- Rust 1.72.1 +- Rustdoc 1.72.1 +- Rustup 1.26.0 + +#### Packages +- Bindgen 0.68.1 +- Cargo-audit 0.18.1 +- Cargo-outdated 0.13.1 +- Cbindgen 0.26.0 +- Clippy 0.1.72 +- Rustfmt 1.6.0-stable + +### PowerShell Tools +- PowerShell 7.2.14 + +#### PowerShell Modules +- Az: 10.3.0 +- Pester: 5.5.0 +- PSScriptAnalyzer: 1.21.0 + +### Xcode +| Version | Build | Path | +| ---------------- | ------- | ------------------------------ | +| 15.0 | 15A240d | /Applications/Xcode_15.0.app | +| 14.3.1 (default) | 14E300c | /Applications/Xcode_14.3.1.app | +| 14.2 | 14C18 | /Applications/Xcode_14.2.app | +| 14.1 | 14B47b | /Applications/Xcode_14.1.app | + +#### Xcode Support Tools +- xcpretty 0.3.0 + +#### Installed SDKs +| SDK | SDK Name | Xcode Version | +| ------------------------------------------------------- | --------------------------------------------- | ------------- | +| macOS 13.0 | macosx13.0 | 14.1 | +| macOS 13.1 | macosx13.1 | 14.2 | +| macOS 13.3 | macosx13.3 | 14.3.1 | +| macOS 14.0 | macosx14.0 | 15.0 | +| iOS 16.1 | iphoneos16.1 | 14.1 | +| iOS 16.2 | iphoneos16.2 | 14.2 | +| iOS 16.4 | iphoneos16.4 | 14.3.1 | +| iOS 17.0 | iphoneos17.0 | 15.0 | +| Simulator - iOS 16.1 | iphonesimulator16.1 | 14.1 | +| Simulator - iOS 16.2 | iphonesimulator16.2 | 14.2 | +| Simulator - iOS 16.4 | iphonesimulator16.4 | 14.3.1 | +| Simulator - iOS 17.0 | iphonesimulator17.0 | 15.0 | +| tvOS 16.1 | appletvos16.1 | 14.1, 14.2 | +| tvOS 16.4 | appletvos16.4 | 14.3.1 | +| tvOS 17.0 | appletvos17.0 | 15.0 | +| Simulator - tvOS 16.1 | appletvsimulator16.1 | 14.1, 14.2 | +| Simulator - tvOS 16.4 | appletvsimulator16.4 | 14.3.1 | +| Simulator - tvOS 17.0 | appletvsimulator17.0 | 15.0 | +| watchOS 9.1 | watchos9.1 | 14.1, 14.2 | +| watchOS 9.4 | watchos9.4 | 14.3.1 | +| watchOS 10.0 | watchos10.0 | 15.0 | +| Simulator - watchOS 9.1 | watchsimulator9.1 | 14.1, 14.2 | +| Simulator - watchOS 9.4 | watchsimulator9.4 | 14.3.1 | +| Simulator - watchOS 10.0 | watchsimulator10.0 | 15.0 | +| Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | +| Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | +| Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | +| DriverKit 22.1 | driverkit22.1 | 14.1 | +| DriverKit 22.2 | driverkit22.2 | 14.2 | +| DriverKit 22.4 | driverkit22.4 | 14.3.1 | +| DriverKit 23.0 | driverkit23.0 | 15.0 | + +#### Installed Simulators +| OS | Xcode Version | Simulators | +| ------------ | ------------------------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| iOS 16.1 | 14.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 16.2 | 14.2 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 16.4 | 14.3.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 17.0 | 14.1<br>14.2<br>14.3.1<br>15.0 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| tvOS 16.1 | 14.1<br>14.2<br>14.3.1<br>15.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 16.4 | 14.1<br>14.2<br>14.3.1<br>15.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 17.0 | 14.1<br>14.2<br>14.3.1<br>15.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| watchOS 9.1 | 14.1<br>14.2<br>14.3.1<br>15.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | +| watchOS 9.4 | 14.1<br>14.2<br>14.3.1<br>15.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | +| watchOS 10.0 | 14.1<br>14.2<br>14.3.1<br>15.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | From 0b7b4144a25af2cff36c0963df6b99a5000959d4 Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Fri, 29 Sep 2023 12:20:16 +0200 Subject: [PATCH 2258/3485] [Windows] Add checksum validation for Kind (#8384) --- .../Installers/Install-KubernetesTools.ps1 | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/images/win/scripts/Installers/Install-KubernetesTools.ps1 b/images/win/scripts/Installers/Install-KubernetesTools.ps1 index e0482bb1deac..eb44761fd5b7 100644 --- a/images/win/scripts/Installers/Install-KubernetesTools.ps1 +++ b/images/win/scripts/Installers/Install-KubernetesTools.ps1 @@ -1,15 +1,25 @@ ################################################################################ ## File: Install-KubernetesTools.ps1 ## Desc: Install tools for K8s. +## Supply chain security: GitHub Kind - checksum validation, Kubectl, Helm, Minikube - by package manager ################################################################################ Write-Host "Install Kind" # Choco installation can't be used because it depends on docker-desktop -$url = 'https://api.github.com/repos/kubernetes-sigs/kind/releases/latest' -[System.String] $kindDownloadLink = (Invoke-RestMethod -Uri $url).assets.browser_download_url -match "kind-windows-amd64$" +$repoUrl = 'https://api.github.com/repos/kubernetes-sigs/kind/releases/latest' +$assets = (Invoke-RestMethod -Uri $repoUrl).assets +[System.String] $kindDownloadLink = $assets.browser_download_url -match "kind-windows-amd64$" $destFilePath = "C:\ProgramData\kind" $null = New-Item -Path $destFilePath -ItemType Directory -Force -Start-DownloadWithRetry -Url $kindDownloadLink -Name "kind.exe" -DownloadPath $destFilePath +$packagePath = Start-DownloadWithRetry -Url $kindDownloadLink -Name "kind.exe" -DownloadPath $destFilePath + +#region Supply chain security - Kind +$fileHash = (Get-FileHash -Path $packagePath -Algorithm SHA256).Hash +$hashUrl = ($assets.browser_download_url -match "kind-windows-amd64.sha256sum") | Select-Object -First 1 +$externalHash = (Invoke-RestMethod -Uri $hashURL).ToString().Split("`n").Where({ $_ -ilike "*kind-windows-amd64*" }).Split(' ')[0] +Use-ChecksumComparison $fileHash $externalHash +#endregion + Add-MachinePathItem $destFilePath Write-Host "Install Kubectl" @@ -21,4 +31,4 @@ Choco-Install -PackageName kubernetes-helm Write-Host "Install Minikube" Choco-Install -PackageName minikube -Invoke-PesterTests -TestFile "Tools" -TestName "KubernetesTools" \ No newline at end of file +Invoke-PesterTests -TestFile "Tools" -TestName "KubernetesTools" From febcdc62d301649051c24d927c8bb2e6510c62e4 Mon Sep 17 00:00:00 2001 From: sergei-pyshnoi <121864472+sergei-pyshnoi@users.noreply.github.com> Date: Fri, 29 Sep 2023 12:35:23 +0200 Subject: [PATCH 2259/3485] [Windows] Rework MySQL installation script (#8398) --- .../scripts/Installers/Install-MysqlCli.ps1 | 20 +++++++------------ images/win/toolsets/toolset-2019.json | 3 ++- images/win/toolsets/toolset-2022.json | 3 ++- 3 files changed, 11 insertions(+), 15 deletions(-) diff --git a/images/win/scripts/Installers/Install-MysqlCli.ps1 b/images/win/scripts/Installers/Install-MysqlCli.ps1 index dd3be4bce3f3..079ac5b514d0 100644 --- a/images/win/scripts/Installers/Install-MysqlCli.ps1 +++ b/images/win/scripts/Installers/Install-MysqlCli.ps1 @@ -7,10 +7,11 @@ $InstallerName = "vcredist_x64.exe" $InstallerURI = "https://download.microsoft.com/download/0/5/6/056dcda9-d667-4e27-8001-8a0c6971d6b1/${InstallerName}" $ArgumentList = ("/install", "/quiet", "/norestart") +$InstallerSignatureThumbrint = "3BDA323E552DB1FDE5F4FBEE75D6D5B2B187EEDC" -Install-Binary -Url $InstallerURI -Name $InstallerName -ArgumentList $ArgumentList +Install-Binary -Url $InstallerURI -Name $InstallerName -ArgumentList $ArgumentList -ExpectedSignature $InstallerSignatureThumbrint -## Downloading mysql +# Downloading mysql [version]$MysqlVersion = (Get-ToolsetContent).mysql.version $MysqlVersionMajorMinor = $MysqlVersion.ToString(2) @@ -20,20 +21,13 @@ if ($MysqlVersion.Build -lt 0) { } $MysqlVersionFull = $MysqlVersion.ToString() -$MysqlVersionUrl = "https://cdn.mysql.com/Downloads/MySQL-${MysqlVersionMajorMinor}/mysql-${MysqlVersionFull}-winx64.zip" +$MysqlVersionUrl = "https://cdn.mysql.com/Downloads/MySQL-${MysqlVersionMajorMinor}/mysql-${MysqlVersionFull}-winx64.msi" -$MysqlArchPath = Start-DownloadWithRetry -Url $MysqlVersionUrl -Name "mysql.zip" - -# Expand the zip -Extract-7Zip -Path $MysqlArchPath -DestinationPath "C:\" - -# Rename mysql-version to mysql folder -$MysqlPath = "C:\mysql" -Invoke-SBWithRetry -Command { - Rename-Item -Path "C:\mysql-${MysqlVersionFull}-winx64" -NewName $MysqlPath -ErrorAction Stop -} +Install-Binary -Url $MysqlVersionUrl -Name "mysql-${MysqlVersionFull}-winx64.msi" -ExpectedSignature (Get-ToolsetContent).mysql.signature # Adding mysql in system environment path +$MysqlPath = $(Get-ChildItem -Path "C:\PROGRA~1\MySQL" -Directory)[0].FullName + Add-MachinePathItem "${MysqlPath}\bin" Invoke-PesterTests -TestFile "Databases" -TestName "MySQL" diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index 0837e56a4dc2..333cea42510b 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -460,7 +460,8 @@ "version": "3.8" }, "mysql": { - "version": "5.7" + "version": "5.7", + "signature": "DD34D7C71F160972DE0CE25B695A0D6A9C95BD91" }, "mongodb": { "version": "5.0", diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index 51894eed2894..4135324a8731 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -396,7 +396,8 @@ "version": "3.8" }, "mysql": { - "version": "8.0" + "version": "8.0", + "signature": "DD34D7C71F160972DE0CE25B695A0D6A9C95BD91" }, "mongodb": { "version": "5.0", From 5bb622f98c477241434ffefb7e826df0bab82934 Mon Sep 17 00:00:00 2001 From: sergei-pyshnoi <121864472+sergei-pyshnoi@users.noreply.github.com> Date: Fri, 29 Sep 2023 12:36:01 +0200 Subject: [PATCH 2260/3485] add 20 node to toolsets (#8407) --- images/linux/toolsets/toolset-2004.json | 5 ++++- images/linux/toolsets/toolset-2204.json | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index 03c77b18eeea..7eaa4a0dc5ae 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -35,7 +35,8 @@ "versions": [ "14.*", "16.*", - "18.*" + "18.*", + "20.*" ] }, { @@ -233,9 +234,11 @@ "node:14", "node:16", "node:18", + "node:20", "node:14-alpine", "node:16-alpine", "node:18-alpine", + "node:20-alpine", "ubuntu:16.04", "ubuntu:18.04", "ubuntu:20.04" diff --git a/images/linux/toolsets/toolset-2204.json b/images/linux/toolsets/toolset-2204.json index 511beadb64b3..2516d02c3aa6 100644 --- a/images/linux/toolsets/toolset-2204.json +++ b/images/linux/toolsets/toolset-2204.json @@ -33,7 +33,8 @@ "versions": [ "14.*", "16.*", - "18.*" + "18.*", + "20.*" ] }, { @@ -222,9 +223,11 @@ "node:14", "node:16", "node:18", + "node:20", "node:14-alpine", "node:16-alpine", "node:18-alpine", + "node:20-alpine", "ubuntu:18.04", "ubuntu:20.04", "ubuntu:22.04" From 6f2f889b0ae7158fb0aa201e3f327b8b32067c60 Mon Sep 17 00:00:00 2001 From: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com> Date: Fri, 29 Sep 2023 17:02:51 +0200 Subject: [PATCH 2261/3485] [windows] warmup "az devops" for the first run (#8410) --- .../Installers/Install-AzureDevOpsCli.ps1 | 37 ++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/images/win/scripts/Installers/Install-AzureDevOpsCli.ps1 b/images/win/scripts/Installers/Install-AzureDevOpsCli.ps1 index 1c7d1bbfdb8f..05368f26f40f 100644 --- a/images/win/scripts/Installers/Install-AzureDevOpsCli.ps1 +++ b/images/win/scripts/Installers/Install-AzureDevOpsCli.ps1 @@ -3,6 +3,41 @@ ## Desc: Install Azure DevOps CLI ################################################################################ +$azureDevOpsCliConfigPath = 'C:\azureDevOpsCli' +# Store azure-devops-cli cache outside of the provisioning user's profile +[Environment]::SetEnvironmentVariable('AZURE_DEVOPS_EXT_CONFIG_DIR', $azureDevOpsCliConfigPath, [System.EnvironmentVariableTarget]::Machine) +# make variable to be available in the current session +${env:AZURE_DEVOPS_EXT_CONFIG_DIR} = $azureDevOpsCliConfigPath + +$azureDevOpsCliCachePath = Join-Path $azureDevOpsCliConfigPath 'cache' +$null = New-Item -ItemType 'Directory' -Path $azureDevOpsCliCachePath + +[Environment]::SetEnvironmentVariable('AZURE_DEVOPS_CACHE_DIR', $azureDevOpsCliCachePath, [System.EnvironmentVariableTarget]::Machine) +# make variable to be available in the current session +${env:AZURE_DEVOPS_CACHE_DIR} = $azureDevOpsCliCachePath + az extension add -n azure-devops +if ($LASTEXITCODE -ne 0) +{ + throw "Command 'az extension add -n azure-devops' failed" +} + +# Warm-up Azure DevOps CLI + +Write-Host "Warmup 'az-devops'" +@('devops', 'pipelines', 'boards', 'repos', 'artifacts') | ForEach-Object { + + az $_ --help + if ($LASTEXITCODE -ne 0) + { + throw "Command 'az $_ --help' failed" + } + +} + +# calling az devops login to force it to install `keyring`. Login will actually fail, redirecting error to null +Write-Host 'fake token' | az devops login | Out-Null +# calling az devops logout to be sure no credentials remain. +az devops logout | out-null -Invoke-PesterTests -TestFile "CLI.Tools" -TestName "Azure DevOps CLI" \ No newline at end of file +Invoke-PesterTests -TestFile 'CLI.Tools' -TestName 'Azure DevOps CLI' From b3852fe5b9f944ac09012a1d4868d20b9fd964f5 Mon Sep 17 00:00:00 2001 From: sergei-pyshnoi <121864472+sergei-pyshnoi@users.noreply.github.com> Date: Sat, 30 Sep 2023 09:04:14 +0200 Subject: [PATCH 2262/3485] [windows] add node v20 (#8406) --- images/win/toolsets/toolset-2019.json | 3 ++- images/win/toolsets/toolset-2022.json | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index 333cea42510b..77c6887ed82b 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -61,7 +61,8 @@ "versions": [ "14.*", "16.*", - "18.*" + "18.*", + "20.*" ] }, { diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index 4135324a8731..675789710d07 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -58,7 +58,8 @@ "versions": [ "14.*", "16.*", - "18.*" + "18.*", + "20.*" ] }, { From fa1886007117cb7df72f9027fd793913ca2802ab Mon Sep 17 00:00:00 2001 From: Henry Mercer <henrymercer@github.com> Date: Mon, 2 Oct 2023 09:45:16 +0100 Subject: [PATCH 2263/3485] Linux: Cache only the latest version of CodeQL (#8419) Previously, we cached two versions since we prioritized hitting the toolcache over landing new releases quicker. However after experimenting with this, we have decided to prioritize getting new releases into customers' hands more quickly. --- .../SoftwareReport.Generator.ps1 | 2 +- .../SoftwareReport/SoftwareReport.Tools.psm1 | 15 ++-- .../linux/scripts/installers/codeql-bundle.sh | 76 +++++-------------- images/linux/scripts/tests/Toolset.Tests.ps1 | 15 +--- 4 files changed, 24 insertions(+), 84 deletions(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index e9e6747fe47b..0aef771b6c04 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -103,7 +103,7 @@ $tools.AddToolVersion("Bazelisk", $(Get-BazeliskVersion)) $tools.AddToolVersion("Bicep", $(Get-BicepVersion)) $tools.AddToolVersion("Buildah", $(Get-BuildahVersion)) $tools.AddToolVersion("CMake", $(Get-CMakeVersion)) -$tools.AddToolVersion("CodeQL Action Bundles", $(Get-CodeQLBundleVersions)) +$tools.AddToolVersion("CodeQL Action Bundle", $(Get-CodeQLBundleVersion)) $tools.AddToolVersion("Docker Amazon ECR Credential Helper", $(Get-DockerAmazonECRCredHelperVersion)) $tools.AddToolVersion("Docker Compose v1", $(Get-DockerComposeV1Version)) $tools.AddToolVersion("Docker Compose v2", $(Get-DockerComposeV2Version)) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 index 3f8882481ea7..fab8249aece3 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 @@ -30,17 +30,12 @@ function Get-BicepVersion { return $Matches.Version } -function Get-CodeQLBundleVersions { +function Get-CodeQLBundleVersion { $CodeQLVersionsWildcard = Join-Path $Env:AGENT_TOOLSDIRECTORY -ChildPath "CodeQL" | Join-Path -ChildPath "*" - $CodeQLVersionPaths = Get-ChildItem $CodeQLVersionsWildcard - $CodeQlVersions=@() - foreach ($CodeQLVersionPath in $CodeQLVersionPaths) { - $FullCodeQLVersionPath = $CodeQLVersionPath | Select-Object -Expand FullName - $CodeQLPath = Join-Path $FullCodeQLVersionPath -ChildPath "x64" | Join-Path -ChildPath "codeql" | Join-Path -ChildPath "codeql" - $CodeQLVersion = & $CodeQLPath version --quiet - $CodeQLVersions += $CodeQLVersion - } - return $CodeQLVersions + $CodeQLVersionPath = Get-ChildItem $CodeQLVersionsWildcard | Select-Object -First 1 -Expand FullName + $CodeQLPath = Join-Path $CodeQLVersionPath -ChildPath "x64" | Join-Path -ChildPath "codeql" | Join-Path -ChildPath "codeql" + $CodeQLVersion = & $CodeQLPath version --quiet + return $CodeQLVersion } function Get-PodManVersion { diff --git a/images/linux/scripts/installers/codeql-bundle.sh b/images/linux/scripts/installers/codeql-bundle.sh index 23daa4ef14cb..3b62955c6085 100644 --- a/images/linux/scripts/installers/codeql-bundle.sh +++ b/images/linux/scripts/installers/codeql-bundle.sh @@ -6,68 +6,26 @@ source $HELPER_SCRIPTS/install.sh -# Retrieve the CLI versions and bundle tags of the latest two CodeQL bundles. +# Retrieve the CLI version of the latest CodeQL bundle. base_url="$(curl -fsSL https://raw.githubusercontent.com/github/codeql-action/v2/src/defaults.json)" -codeql_tag_name="$(echo "$base_url" | jq -r '.bundleVersion')" -codeql_cli_version="$(echo "$base_url" | jq -r '.cliVersion')" -prior_codeql_tag_name="$(echo "$base_url" | jq -r '.priorBundleVersion')" -prior_codeql_cli_version="$(echo "$base_url" | jq -r '.priorCliVersion')" +bundle_version="$(echo "$base_url" | jq -r '.cliVersion')" +bundle_tag_name="codeql-bundle-v$bundle_version" -# Compute the toolcache version number for each bundle. This is either `x.y.z` or `x.y.z-YYYYMMDD`. -if [[ "${codeql_tag_name##*-}" == "v"* ]]; then - # Tag name of the format `codeql-bundle-vx.y.z`, where x.y.z is the CLI version. - # We don't need to include the tag name in the toolcache version number because it's derivable - # from the CLI version. - codeql_bundle_version="$codeql_cli_version" -elif [[ "${codeql_tag_name##*-}" =~ ^[0-9]+$ ]]; then - # Tag name of the format `codeql-bundle-YYYYMMDD`. - # We need to include the tag name in the toolcache version number because it can't be derived - # from the CLI version. - codeql_bundle_version="$codeql_cli_version-${codeql_tag_name##*-}" -else - echo "Unrecognised current CodeQL bundle tag name: $codeql_tag_name." \ - "Could not compute toolcache version number." - exit 1 -fi -if [[ "${prior_codeql_tag_name##*-}" == "v"* ]]; then - # Tag name of the format `codeql-bundle-vx.y.z`, where x.y.z is the CLI version. - # We don't need to include the tag name in the toolcache version number because it's derivable - # from the CLI version. - prior_codeql_bundle_version="$prior_codeql_cli_version" -elif [[ "${prior_codeql_tag_name##*-}" =~ ^[0-9]+$ ]]; then - # Tag name of the format `codeql-bundle-YYYYMMDD`. - # We need to include the tag name in the toolcache version number because it can't be derived - # from the CLI version. - prior_codeql_bundle_version="$prior_codeql_cli_version-${prior_codeql_tag_name##*-}" -else - echo "Unrecognised prior CodeQL bundle tag name: $prior_codeql_tag_name." \ - "Could not compute toolcache version number." - exit 1 -fi +echo "Downloading CodeQL bundle $bundle_version..." +# Note that this is the all-platforms CodeQL bundle, to support scenarios where customers run +# different operating systems within containers. +download_with_retries "https://github.com/github/codeql-action/releases/download/$bundle_tag_name/codeql-bundle.tar.gz" "/tmp" "codeql-bundle.tar.gz" +codeql_archive="/tmp/codeql-bundle.tar.gz" -# Download and name both CodeQL bundles. -codeql_bundle_versions=("${codeql_bundle_version}" "${prior_codeql_bundle_version}") -codeql_tag_names=("${codeql_tag_name}" "${prior_codeql_tag_name}") +codeql_toolcache_path="$AGENT_TOOLSDIRECTORY/CodeQL/$bundle_version/x64" +mkdir -p "$codeql_toolcache_path" -for index in "${!codeql_bundle_versions[@]}"; do - bundle_version="${codeql_bundle_versions[$index]}" - bundle_tag_name="${codeql_tag_names[$index]}" - - echo "Downloading CodeQL bundle $bundle_version..." - download_with_retries "https://github.com/github/codeql-action/releases/download/$bundle_tag_name/codeql-bundle.tar.gz" "/tmp" "codeql-bundle.tar.gz" - codeql_archive="/tmp/codeql-bundle.tar.gz" +echo "Unpacking the downloaded CodeQL bundle archive..." +tar -xzf "$codeql_archive" -C "$codeql_toolcache_path" - codeql_toolcache_path="$AGENT_TOOLSDIRECTORY/CodeQL/$bundle_version/x64" - mkdir -p "$codeql_toolcache_path" +# Touch a file to indicate to the CodeQL Action that this bundle shipped with the toolcache. This is +# to support overriding the CodeQL version specified in defaults.json on GitHub Enterprise. +touch "$codeql_toolcache_path/pinned-version" - echo "Unpacking the downloaded CodeQL bundle archive..." - tar -xzf "$codeql_archive" -C "$codeql_toolcache_path" - - # We only pin the latest version in the toolcache, to support overriding the CodeQL version specified in defaults.json on GitHub Enterprise. - if [[ "$bundle_version" == "$codeql_bundle_version" ]]; then - touch "$codeql_toolcache_path/pinned-version" - fi - - # Touch a file to indicate to the toolcache that setting up CodeQL is complete. - touch "$codeql_toolcache_path.complete" -done +# Touch a file to indicate to the toolcache that setting up CodeQL is complete. +touch "$codeql_toolcache_path.complete" diff --git a/images/linux/scripts/tests/Toolset.Tests.ps1 b/images/linux/scripts/tests/Toolset.Tests.ps1 index 981d6093dd75..2ac3e12bc6d4 100644 --- a/images/linux/scripts/tests/Toolset.Tests.ps1 +++ b/images/linux/scripts/tests/Toolset.Tests.ps1 @@ -60,20 +60,7 @@ Describe "Toolset" { } } } - - # Validate that there are two versions of CodeQL included. - if ($toolName -eq "CodeQL") { - $foundPriorVersion = Get-Item $expectedVersionPath ` - | Sort-Object -Property {[SemVer]$_.name} -Descending ` - | Select-Object -Last 1 - $foundPriorVersionPath = Join-Path $foundPriorVersion $tool.arch - - $priorExecutablePath = Join-Path $foundPriorVersionPath "codeql/codeql" - It "Validate prior version of codeql/codeql" -TestCases @{PriorExecutablePath = $priorExecutablePath} { - $PriorExecutablePath | Should -Exist - } - } } } } -} \ No newline at end of file +} From d8373eebdbd9bb1d9e26d7f5f4cc4839c90f0f13 Mon Sep 17 00:00:00 2001 From: sergei-pyshnoi <121864472+sergei-pyshnoi@users.noreply.github.com> Date: Mon, 2 Oct 2023 10:45:53 +0200 Subject: [PATCH 2264/3485] add 20 node to toolsets (#8408) --- images/macos/toolsets/toolset-11.json | 3 ++- images/macos/toolsets/toolset-12.json | 3 ++- images/macos/toolsets/toolset-13.json | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index 05084aff1036..40c2546be716 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -272,7 +272,8 @@ "versions": [ "14.*", "16.*", - "18.*" + "18.*", + "20.*" ] } } diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index 11ce30db47b3..aa36b1b36609 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -259,7 +259,8 @@ "versions": [ "14.*", "16.*", - "18.*" + "18.*", + "20.*" ] } } diff --git a/images/macos/toolsets/toolset-13.json b/images/macos/toolsets/toolset-13.json index 3bbfcca0927b..7dbc75d4c207 100644 --- a/images/macos/toolsets/toolset-13.json +++ b/images/macos/toolsets/toolset-13.json @@ -146,7 +146,8 @@ "x64": { "versions": [ "16.*", - "18.*" + "18.*", + "20.*" ] }, "arm64": { From 953177d098bc976e4cb74a12a3e3d90a8eb4246d Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Mon, 2 Oct 2023 15:18:08 +0200 Subject: [PATCH 2265/3485] [macOS] Update software report for macOS 13 arm64 (#8433) --- images/macos/software-report/SoftwareReport.Generator.ps1 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1 index 83ba5ff9f37e..479da6641098 100644 --- a/images/macos/software-report/SoftwareReport.Generator.ps1 +++ b/images/macos/software-report/SoftwareReport.Generator.ps1 @@ -70,7 +70,9 @@ $packageManagement = $installedSoftware.AddHeader("Package Management") $packageManagement.AddToolVersion("Bundler", $(Get-BundlerVersion)) $packageManagement.AddToolVersion("Carthage", $(Get-CarthageVersion)) $packageManagement.AddToolVersion("CocoaPods", $(Get-CocoaPodsVersion)) -$packageManagement.AddToolVersion("Composer", $(Get-ComposerVersion)) +if (-not $os.IsVenturaArm64) { + $packageManagement.AddToolVersion("Composer", $(Get-ComposerVersion)) +} $packageManagement.AddToolVersion("Homebrew", $(Get-HomebrewVersion)) if ((-not $os.IsVentura) -and (-not $os.IsVenturaArm64)) { $packageManagement.AddToolVersion("Miniconda", $(Get-CondaVersion)) From b3c54ca36bfd804a55f295d8c2a6e64066aba5c6 Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Mon, 2 Oct 2023 15:52:49 +0200 Subject: [PATCH 2266/3485] [Ubuntu] Improve errexit option handling (#8352) --- images/linux/scripts/helpers/install.sh | 14 +++++++++++--- images/linux/scripts/installers/firefox.sh | 1 - images/linux/scripts/installers/pypy.sh | 2 +- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/images/linux/scripts/helpers/install.sh b/images/linux/scripts/helpers/install.sh index 55aa7816fd39..61faedc279c6 100644 --- a/images/linux/scripts/helpers/install.sh +++ b/images/linux/scripts/helpers/install.sh @@ -19,16 +19,24 @@ download_with_retries() { local COMMAND="curl $URL -4 -sL -o '$DEST/$NAME' -w '%{http_code}'" fi + # Save current errexit state and disable it to prevent unexpected exit on error + if echo $SHELLOPTS | grep '\(^\|:\)errexit\(:\|$\)' > /dev/null; + then + local ERR_EXIT_ENABLED=true + else + local ERR_EXIT_ENABLED=false + fi + set +e + echo "Downloading '$URL' to '${DEST}/${NAME}'..." retries=20 interval=30 while [ $retries -gt 0 ]; do ((retries--)) - # Temporary disable exit on error to retry on non-zero exit code - set +e + test "$ERR_EXIT_ENABLED" = true && set +e http_code=$(eval $COMMAND) exit_code=$? - set -e + test "$ERR_EXIT_ENABLED" = true && set -e if [ $http_code -eq 200 ] && [ $exit_code -eq 0 ]; then echo "Download completed" return 0 diff --git a/images/linux/scripts/installers/firefox.sh b/images/linux/scripts/installers/firefox.sh index 5008d962dd22..39416cc99717 100644 --- a/images/linux/scripts/installers/firefox.sh +++ b/images/linux/scripts/installers/firefox.sh @@ -26,7 +26,6 @@ echo 'pref("intl.locale.requested","en_US");' >> "/usr/lib/firefox/browser/defau # Download and unpack latest release of geckodriver downloadUrl=$(get_github_package_download_url "mozilla/geckodriver" "test(\"linux64.tar.gz$\")") -echo "Downloading geckodriver $downloadUrl" download_with_retries "$downloadUrl" "/tmp" geckodriver.tar.gz GECKODRIVER_DIR="/usr/local/share/gecko_driver" diff --git a/images/linux/scripts/installers/pypy.sh b/images/linux/scripts/installers/pypy.sh index 32cb2ffc3438..5c8e373cbcb7 100644 --- a/images/linux/scripts/installers/pypy.sh +++ b/images/linux/scripts/installers/pypy.sh @@ -13,7 +13,7 @@ function InstallPyPy PACKAGE_URL=$1 PACKAGE_TAR_NAME=$(echo $PACKAGE_URL | awk -F/ '{print $NF}') - echo "Downloading tar archive '$PACKAGE_TAR_NAME' - '$PACKAGE_URL'" + echo "Downloading tar archive '$PACKAGE_TAR_NAME'" PACKAGE_TAR_TEMP_PATH="/tmp/$PACKAGE_TAR_NAME" download_with_retries $PACKAGE_URL "/tmp" $PACKAGE_TAR_NAME From 375e9a1c270ec81a3ffd5b429dcdee9508b46124 Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Mon, 2 Oct 2023 17:41:15 +0200 Subject: [PATCH 2267/3485] [Windows] PyPy3.9-7.3.13 SHA missing on pypy.org (#8429) --- images/win/scripts/Installers/Install-PyPy.ps1 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/images/win/scripts/Installers/Install-PyPy.ps1 b/images/win/scripts/Installers/Install-PyPy.ps1 index 4a8ef90244ec..fddbf160567b 100644 --- a/images/win/scripts/Installers/Install-PyPy.ps1 +++ b/images/win/scripts/Installers/Install-PyPy.ps1 @@ -112,6 +112,11 @@ foreach($toolsetVersion in $toolsetVersions.versions) $distributorFileHash = $node.InnerText.ToString().Split("`n").Where({ $_ -ilike "*${filename}*" }).Split(' ')[0] } } + + #Temp patch for pypy3.9-v7.3.13-win64.zip checksum, delete me when pypy.org will be fixed + if ($filename -ilike "*pypy3.9-v7.3.13-win64*") { + $distributorFileHash = "09EA41154AD1DCD3E8378609A73196A6C108B17AA05EF3CBB240610744102803" + } Use-ChecksumComparison -LocalFileHash $localFileHash -DistributorFileHash $distributorFileHash #endregion From 72bdf7ea7c3c9e0ee454ac3da92c3354cad143af Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Tue, 3 Oct 2023 09:48:40 +0200 Subject: [PATCH 2268/3485] [Windows] Install mingw binaries manually (#8418) --- .../scripts/Installers/Install-Mingw64.ps1 | 70 +++++++++++++++++-- images/win/toolsets/toolset-2019.json | 3 - images/win/toolsets/toolset-2022.json | 3 +- 3 files changed, 66 insertions(+), 10 deletions(-) diff --git a/images/win/scripts/Installers/Install-Mingw64.ps1 b/images/win/scripts/Installers/Install-Mingw64.ps1 index 6d9043a80ba3..f1bd5f685730 100644 --- a/images/win/scripts/Installers/Install-Mingw64.ps1 +++ b/images/win/scripts/Installers/Install-Mingw64.ps1 @@ -3,12 +3,70 @@ ## Desc: Install GNU tools for Windows ################################################################################ -$toolsetVersion = (Get-ToolsetContent).mingw.version -Choco-Install -PackageName mingw -ArgumentList "--version=$toolsetVersion" +if (Test-IsWin19) { + # If Windows 2019, install version 8.1.0 form sourceforge + $baseUrl = "https://sourceforge.net/projects/mingw-w64/files" -# Make a copy of mingw32-make.exe to make.exe, which is a more discoverable name -# and so the same command line can be used on Windows as on macOS and Linux -$path = where.exe mingw32-make.exe | Get-Item -Copy-Item -Path $path -Destination (Join-Path $path.Directory 'make.exe') + $("mingw32", "mingw64") | ForEach-Object { + if ($_ -eq "mingw32") { + $url = "$baseUrl/Toolchains%20targetting%20Win32/Personal%20Builds/mingw-builds/8.1.0/threads-posix/dwarf/i686-8.1.0-release-posix-dwarf-rt_v6-rev0.7z/download" + $sha256sum = 'adb84b70094c0225dd30187ff995e311d19424b1eb8f60934c60e4903297f946' + } elseif ($_ -eq "mingw64") { + $url = "$baseUrl/Toolchains%20targetting%20Win64/Personal%20Builds/mingw-builds/8.1.0/threads-posix/seh/x86_64-8.1.0-release-posix-seh-rt_v6-rev0.7z/download" + $sha256sum = '853970527b5de4a55ec8ca4d3fd732c00ae1c69974cc930c82604396d43e79f8' + } else { + throw "Unknown architecture $_" + } + + $packagePath = Start-DownloadWithRetry -Url $url -Name "$_.7z" + $hash = Get-FileHash -Path $packagePath -Algorithm SHA256 + if ($hash.Hash -ne $sha256sum) { + throw "Checksum verification failed for $packagePath" + } + Extract-7Zip -Path $packagePath -DestinationPath "C:\" + + # Make a copy of mingw-make.exe to make.exe, which is a more discoverable name + # and so the same command line can be used on Windows as on macOS and Linux + $path = "C:\$_\bin\mingw32-make.exe" | Get-Item + Copy-Item -Path $path -Destination (Join-Path $path.Directory 'make.exe') + } + + Add-MachinePathItem "C:\mingw64\bin" + +} else { + $version = (Get-ToolsetContent).mingw.version + $runtime = (Get-ToolsetContent).mingw.runtime + + $("mingw32", "mingw64") | ForEach-Object { + if ($_ -eq "mingw32") { + $arch = "i686" + $threads = "posix" + $exceptions = "dwarf" + } elseif ($_ -eq "mingw64") { + $arch = "x86_64" + $threads = "posix" + $exceptions = "seh" + } else { + throw "Unknown architecture $_" + } + + $url = Get-GitHubPackageDownloadUrl ` + -RepoOwner "niXman" ` + -RepoName "mingw-builds-binaries" ` + -BinaryName "" ` + -Version $version ` + -UrlFilter "*$arch-{Version}-release-$threads-$exceptions-$runtime-*.7z" + + $packagePath = Start-DownloadWithRetry -Url $url -Name "$_.7z" + Extract-7Zip -Path $packagePath -DestinationPath "C:\" + + # Make a copy of mingw-make.exe to make.exe, which is a more discoverable name + # and so the same command line can be used on Windows as on macOS and Linux + $path = "C:\$_\bin\mingw32-make.exe" | Get-Item + Copy-Item -Path $path -Destination (Join-Path $path.Directory 'make.exe') + } + + Add-MachinePathItem "C:\mingw64\bin" +} Invoke-PesterTests -TestFile "Tools" -TestName "Mingw64" diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index 77c6887ed82b..54aa99888ae2 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -176,9 +176,6 @@ ] } }, - "mingw": { - "version": "8.1.0" - }, "MsysPackages": { "msys2": [ "base-devel", diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index 675789710d07..48f8f36d6d20 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -151,7 +151,8 @@ } }, "mingw": { - "version": "12.2.0.03042023" + "version": "12.2.0", + "runtime": "ucrt" }, "MsysPackages": { "msys2": [], From 82de56d5d6ce419f981f5ae1087ec08ab7fd7495 Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Tue, 3 Oct 2023 11:40:35 +0200 Subject: [PATCH 2269/3485] [macos] Adjust Xcode storage Uri (#8445) --- images/macos/helpers/Xcode.Installer.psm1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/macos/helpers/Xcode.Installer.psm1 b/images/macos/helpers/Xcode.Installer.psm1 index a6ae0f3e86f5..1bb9d0406916 100644 --- a/images/macos/helpers/Xcode.Installer.psm1 +++ b/images/macos/helpers/Xcode.Installer.psm1 @@ -30,7 +30,7 @@ function Invoke-DownloadXcodeArchive { $tempXipDirectory = New-Item -Path $DownloadDirectory -Name "Xcode$Version" -ItemType "Directory" $xcodeFileName = 'Xcode-{0}.xip' -f $Version - $xcodeUri = '{0}{1}{2}'-f ${env:XCODE_INSTALL_STORAGE_URL}, $xcodeFileName, ${env:XCODE_INSTALL_SAS} + $xcodeUri = '{0}{1}?{2}'-f ${env:XCODE_INSTALL_STORAGE_URL}, $xcodeFileName, ${env:XCODE_INSTALL_SAS} Start-DownloadWithRetry -Url $xcodeUri -DownloadPath $tempXipDirectory.FullName -Name $xcodeFileName return $tempXipDirectory From fe838dd11fcada65dc55fd8d892cd13b6f21b086 Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Tue, 3 Oct 2023 17:47:21 +0200 Subject: [PATCH 2270/3485] [ubuntu] Add python 3.12 to toolcache (#8450) --- images/linux/toolsets/toolset-2004.json | 3 ++- images/linux/toolsets/toolset-2204.json | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index 7eaa4a0dc5ae..fb6d5578c13c 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -11,7 +11,8 @@ "3.8.*", "3.9.*", "3.10.*", - "3.11.*" + "3.11.*", + "3.12.*" ] }, { diff --git a/images/linux/toolsets/toolset-2204.json b/images/linux/toolsets/toolset-2204.json index 2516d02c3aa6..522db3d2060c 100644 --- a/images/linux/toolsets/toolset-2204.json +++ b/images/linux/toolsets/toolset-2204.json @@ -11,7 +11,8 @@ "3.8.*", "3.9.*", "3.10.*", - "3.11.*" + "3.11.*", + "3.12.*" ] }, { From 44b47c7bae7ce751a36f4f7b8fd101ecc2e8b5d6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 3 Oct 2023 16:08:22 +0000 Subject: [PATCH 2271/3485] Updating readme file for macOS-12 version 20230921.4 (#8376) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-12-Readme.md | 75 ++++++++++++++++----------------- 1 file changed, 37 insertions(+), 38 deletions(-) diff --git a/images/macos/macos-12-Readme.md b/images/macos/macos-12-Readme.md index 7676bf2ad121..93603ac7ed11 100644 --- a/images/macos/macos-12-Readme.md +++ b/images/macos/macos-12-Readme.md @@ -1,12 +1,11 @@ | Announcements | |-| -| [Ruby 2.4.x will be removed from the macOS 11 and Windows 2019 images on September 18](https://github.com/actions/runner-images/issues/8239) | -| [[All OSes] Go 1.18.x will be removed on September, 18](https://github.com/actions/runner-images/issues/8237) | +| [[All OS] hub utility will be removed on October 2](https://github.com/actions/runner-images/issues/8362) | *** # macOS 12 -- OS Version: macOS 12.6.9 (21G726) +- OS Version: macOS 12.7 (21G816) - Kernel Version: Darwin 21.6.0 -- Image Version: 20230916.1 +- Image Version: 20230921.4 ## Installed Software @@ -24,9 +23,9 @@ - Go 1.20.8 - Mono 6.12.0.188 - MSBuild 16.10.1.51301 (Mono 6.12.0.188) -- Node.js 18.17.1 +- Node.js 18.18.0 - NVM 0.39.5 -- NVM - Cached node versions: 14.21.3, 16.20.2, 18.17.1 +- NVM - Cached node versions: 14.21.3, 16.20.2, 18.18.0 - Perl 5.36.1 - PHP 8.2.10 - Python 2.7.18 @@ -36,18 +35,18 @@ ### Package Management - Bundler 2.4.19 -- Carthage 0.39.0 +- Carthage 0.39.1 - CocoaPods 1.12.1 - Composer 2.6.3 -- Homebrew 4.1.11 +- Homebrew 4.1.12 - Miniconda 23.5.2 -- NPM 9.6.7 +- NPM 9.8.1 - NuGet 6.3.1.1 - Pip 20.3.4 (python 2.7) - Pip3 23.2.1 (python 3.11) - Pipx 1.2.0 - RubyGems 3.4.19 -- Vcpkg 2023 (build from commit e8c2a04eb) +- Vcpkg 2023 (build from commit 7476f0d4e) - Yarn 1.22.19 #### Environment variables @@ -72,12 +71,12 @@ - Curl 8.3.0 - Git 2.42.0 - Git LFS 3.4.0 -- GitHub CLI 2.34.0 +- GitHub CLI 2.35.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.21.4 - gpg (GnuPG) 2.4.3 - Hub CLI 2.14.2 -- ImageMagick 7.1.1-15 +- ImageMagick 7.1.1-17 - jq 1.7 - mongo 5.0.17 - mongod 5.0.17 @@ -96,22 +95,22 @@ ### Tools - App Center CLI 2.14.0 -- AWS CLI 2.13.19 +- AWS CLI 2.13.20 - AWS SAM CLI 1.97.0 - AWS Session Manager CLI 1.2.497.0 - Azure CLI 2.52.0 - Azure CLI (azure-devops) 0.26.0 - Bicep CLI 0.21.1 - Cabal 3.6.2.0 -- Cmake 3.27.5 +- Cmake 3.27.6 - CodeQL Action Bundles 2.14.4 2.14.5 - Colima 0.5.5 -- Fastlane 2.215.0 +- Fastlane 2.216.0 - GHC 9.6.2 - GHCup 0.1.19.4 -- Jazzy 0.14.3 +- Jazzy 0.14.4 - Stack 2.9.3 -- SwiftFormat 0.52.3 +- SwiftFormat 0.52.4 - Swig 4.1.1 - Xcode Command Line Tools 14.2.0.0.1.1668646533 @@ -120,13 +119,13 @@ - Yamllint 1.32.0 ### Browsers -- Safari 16.6 (17615.3.12.11.3) -- SafariDriver 16.6 (17615.3.12.11.3) -- Google Chrome 117.0.5938.88 -- Google Chrome for Testing 117.0.5938.88 -- ChromeDriver 117.0.5938.88 -- Microsoft Edge 117.0.2045.31 -- Microsoft Edge WebDriver 117.0.2045.31 +- Safari 16.6.1 (17615.3.12.11.5) +- SafariDriver 16.6.1 (17615.3.12.11.5) +- Google Chrome 117.0.5938.92 +- Google Chrome for Testing 117.0.5938.92 +- ChromeDriver 117.0.5938.92 +- Microsoft Edge 117.0.2045.35 +- Microsoft Edge WebDriver 117.0.2045.35 - Mozilla Firefox 117.0.1 - geckodriver 0.33.0 - Selenium server 4.12.1 @@ -169,7 +168,7 @@ #### Node.js - 14.21.3 - 16.20.2 -- 18.17.1 +- 18.18.0 #### Go - 1.19.13 @@ -177,9 +176,9 @@ - 1.21.1 ### Rust Tools -- Cargo 1.72.0 -- Rust 1.72.0 -- Rustdoc 1.72.0 +- Cargo 1.72.1 +- Rust 1.72.1 +- Rustdoc 1.72.1 - Rustup 1.26.0 #### Packages @@ -191,7 +190,7 @@ - Rustfmt 1.6.0-stable ### PowerShell Tools -- PowerShell 7.2.13 +- PowerShell 7.2.14 #### PowerShell Modules - Az: 10.3.0 @@ -338,18 +337,18 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" | CMake | 3.18.1<br>3.22.1 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 23.2.8568313<br>24.0.8215888<br>25.2.9519653 (default) | +| NDK | 23.2.8568313<br>24.0.8215888<br>25.2.9519653 (default)<br>26.0.10792818 | | SDK Patch Applier v4 | 1 | #### Environment variables -| Name | Value | -| ----------------------- | -------------------------------------------------- | -| ANDROID_HOME | /Users/runner/Library/Android/sdk | -| ANDROID_NDK | /Users/runner/Library/Android/sdk/ndk/25.2.9519653 | -| ANDROID_NDK_HOME | /Users/runner/Library/Android/sdk/ndk/25.2.9519653 | -| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/25.2.9519653 | -| ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk/25.2.9519653 | -| ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | +| Name | Value | +| ----------------------- | --------------------------------------------------- | +| ANDROID_HOME | /Users/runner/Library/Android/sdk | +| ANDROID_NDK | /Users/runner/Library/Android/sdk/ndk/25.2.9519653 | +| ANDROID_NDK_HOME | /Users/runner/Library/Android/sdk/ndk/25.2.9519653 | +| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/26.0.10792818 | +| ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk/25.2.9519653 | +| ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | ### Miscellaneous - libXext 1.3.5 From f444d7b666b61ee60c3bcb18f4d2e725d3a19646 Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Tue, 3 Oct 2023 21:20:02 +0200 Subject: [PATCH 2272/3485] [windows] Add python 3.12 to toolcache (#8451) --- images/win/toolsets/toolset-2019.json | 6 ++++-- images/win/toolsets/toolset-2022.json | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index 54aa99888ae2..dd33e30f72cc 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -23,7 +23,8 @@ "3.8.*", "3.9.*", "3.10.*", - "3.11.*" + "3.11.*", + "3.12.*" ], "default": "3.7.*" }, @@ -37,7 +38,8 @@ "3.8.*", "3.9.*", "3.10.*", - "3.11.*" + "3.11.*", + "3.12.*" ] }, { diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index 48f8f36d6d20..cd9086248a94 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -21,7 +21,8 @@ "3.8.*", "3.9.*", "3.10.*", - "3.11.*" + "3.11.*", + "3.12.*" ], "default": "3.9.*" }, @@ -35,7 +36,8 @@ "3.8.*", "3.9.*", "3.10.*", - "3.11.*" + "3.11.*", + "3.12.*" ] }, { From 038cb56f853d3e81ed9d4746d7bb7c5a35ca071b Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Wed, 4 Oct 2023 09:21:16 +0200 Subject: [PATCH 2273/3485] [Windows] Exclude KB5001148 from windows update (#8456) --- images/win/scripts/Installers/Install-WindowsUpdates.ps1 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/images/win/scripts/Installers/Install-WindowsUpdates.ps1 b/images/win/scripts/Installers/Install-WindowsUpdates.ps1 index 299604093df1..c6828719f40a 100644 --- a/images/win/scripts/Installers/Install-WindowsUpdates.ps1 +++ b/images/win/scripts/Installers/Install-WindowsUpdates.ps1 @@ -8,8 +8,10 @@ function Install-WindowsUpdates { Write-Host "Starting wuauserv" Start-Service -Name wuauserv -PassThru | Out-Host + # Temporarily exclude Windows update KB5001148 since it throws an error. + # The KB5001148 itself is quite old and looks like not needed (https://support.microsoft.com/en-us/topic/kb5001148-visual-studio-client-detector-utility-for-administrator-updates-ad593454-547c-43c3-b5a3-6f201ae63f03) Write-Host "Getting list of available windows updates" - Get-WindowsUpdate -MicrosoftUpdate -OutVariable updates | Out-Host + Get-WindowsUpdate -MicrosoftUpdate -NotKBArticleID "KB5001148" -OutVariable updates | Out-Host if ( -not $updates ) { Write-Host "There are no windows updates to install" @@ -17,7 +19,7 @@ function Install-WindowsUpdates { } Write-Host "Installing windows updates" - Get-WindowsUpdate -MicrosoftUpdate -AcceptAll -Install -IgnoreUserInput -IgnoreReboot | Out-Host + Get-WindowsUpdate -MicrosoftUpdate -NotKBArticleID "KB5001148" -AcceptAll -Install -IgnoreUserInput -IgnoreReboot | Out-Host Write-Host "Validating windows updates installation and skip Microsoft Defender Antivirus" # Azure service can automatic updates AV engine(Microsoft.Azure.Security.AntimalwareSignature.AntimalwareConfiguration) From 8b23f693e9a2ee77a3374d063484aa0ef7de93ce Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Wed, 4 Oct 2023 14:44:05 +0200 Subject: [PATCH 2274/3485] [Windows] Install NSIS package from Chocolatey (#8394) --- images/win/scripts/Installers/Install-NSIS.ps1 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/images/win/scripts/Installers/Install-NSIS.ps1 b/images/win/scripts/Installers/Install-NSIS.ps1 index 49a58fc5249e..7995c39e1ab3 100644 --- a/images/win/scripts/Installers/Install-NSIS.ps1 +++ b/images/win/scripts/Installers/Install-NSIS.ps1 @@ -1,10 +1,12 @@ ################################################################################ ## File: Install-NSIS.ps1 ## Desc: Install NSIS +## Supply chain security: NSIS - managed by package manager ################################################################################ $NsisVersion = (Get-ToolsetContent).nsis.version -Install-Binary -Url "https://downloads.sourceforge.net/project/nsis/NSIS%203/${NsisVersion}/nsis-${NsisVersion}-setup.exe" -Name "nsis-${NsisVersion}-setup.exe" -ArgumentList ('/S') + +Choco-Install -PackageName nsis -ArgumentList "--version", "$NsisVersion" $NsisPath = "${env:ProgramFiles(x86)}\NSIS\" Add-MachinePathItem $NsisPath From ae487529f383479af89499cea4548c1d89d9ffb0 Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Wed, 4 Oct 2023 14:58:45 +0200 Subject: [PATCH 2275/3485] [Windows] Add checksum validation for Stack (#8403) --- images/win/scripts/Installers/Install-Stack.ps1 | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/images/win/scripts/Installers/Install-Stack.ps1 b/images/win/scripts/Installers/Install-Stack.ps1 index d1e53ed5bc0a..95cb35a284ba 100644 --- a/images/win/scripts/Installers/Install-Stack.ps1 +++ b/images/win/scripts/Installers/Install-Stack.ps1 @@ -1,6 +1,7 @@ ################################################################################ ## File: Install-Stack.ps1 ## Desc: Install Stack for Windows +## Supply chain security: Stack - checksum validation ################################################################################ Write-Host "Get the latest Stack version..." @@ -14,6 +15,13 @@ $StackToolcachePath = Join-Path $Env:AGENT_TOOLSDIRECTORY "stack\$Version" $DestinationPath = Join-Path $StackToolcachePath "x64" $StackArchivePath = Start-DownloadWithRetry -Url $DownloadUrl +#region Supply chain security - Stack +$fileHash = (Get-FileHash -Path $StackArchivePath -Algorithm SHA256).Hash +$hashUrl = $StackReleasesJson.assets | Where-Object { $_.name.EndsWith("$DownloadFilePattern.sha256") } | Select-Object -ExpandProperty "browser_download_url" -First 1 +$externalHash = (Invoke-RestMethod -Uri $hashURL).ToString().Split("`n").Where({ $_ -ilike "*$DownloadFilePattern*" }).Split(' ')[0] +Use-ChecksumComparison $fileHash $externalHash +#endregion + Write-Host "Expand stack archive" Extract-7Zip -Path $StackArchivePath -DestinationPath $DestinationPath From e1bcc61827c083a463e1b9500d6121b03985b38e Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Wed, 4 Oct 2023 14:59:44 +0200 Subject: [PATCH 2276/3485] [Windows] Add checksum validation for JDKs (#8404) --- images/win/scripts/Installers/Install-JavaTools.ps1 | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/images/win/scripts/Installers/Install-JavaTools.ps1 b/images/win/scripts/Installers/Install-JavaTools.ps1 index c02a1aff7f76..a5f7e31a9d77 100644 --- a/images/win/scripts/Installers/Install-JavaTools.ps1 +++ b/images/win/scripts/Installers/Install-JavaTools.ps1 @@ -1,6 +1,7 @@ ################################################################################ ## File: Install-JavaTools.ps1 ## Desc: Install various JDKs and java tools +## Supply chain security: JDK - checksum validation ################################################################################ function Set-JavaPath { @@ -64,6 +65,12 @@ function Install-JavaJDK { $downloadUrl = $asset.binary.package.link $archivePath = Start-DownloadWithRetry -Url $downloadUrl -Name $([IO.Path]::GetFileName($downloadUrl)) + #region Supply chain security - JDK + $fileHash = (Get-FileHash -Path $archivePath -Algorithm SHA256).Hash + $externalHash = $asset.binary.package.checksum + Use-ChecksumComparison $fileHash $externalHash + #endregion + # We have to replace '+' sign in the version to '-' due to the issue with incorrect path in Android builds https://github.com/actions/runner-images/issues/3014 $fullJavaVersion = $asset.version.semver -replace '\+', '-' # Create directories in toolcache path From 59805f59ab6cb5786cb20a24eca822271bbeb94f Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Wed, 4 Oct 2023 15:44:28 +0200 Subject: [PATCH 2277/3485] [macOS] Exclude virtualbox from macOS 13 arm64 (#8469) --- images/macos/provision/core/commonutils.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/macos/provision/core/commonutils.sh b/images/macos/provision/core/commonutils.sh index fe1e09a6c35f..350f8705ff91 100644 --- a/images/macos/provision/core/commonutils.sh +++ b/images/macos/provision/core/commonutils.sh @@ -14,7 +14,7 @@ cask_packages=$(get_toolset_value '.brew.cask_packages[]') for package in $cask_packages; do echo "Installing $package..." if [[ $package == "virtualbox" ]]; then - if ! is_Ventura; then + if ! is_Ventura || ! is_VenturaArm64; then # VirtualBox 7 crashes # macOS host: Dropped all kernel extensions. VirtualBox relies fully on the hypervisor and vmnet frameworks provided by Apple now. vbcask_url="https://raw.githubusercontent.com/Homebrew/homebrew-cask/aa3c55951fc9d687acce43e5c0338f42c1ddff7b/Casks/virtualbox.rb" From 5669edde7597b63910572942fbc688fa3fa825fe Mon Sep 17 00:00:00 2001 From: Henry Mercer <henrymercer@github.com> Date: Wed, 4 Oct 2023 15:31:00 +0100 Subject: [PATCH 2278/3485] [Windows] Cache only the latest version of CodeQL (#8421) * Windows: Cache only the latest version of CodeQL Previously, we cached two versions since we prioritized hitting the toolcache over landing new releases quicker. However after experimenting with this, we have decided to prioritize getting new releases into customers' hands more quickly. * Break Windows tests down into separate assertions * List contents of bundle after extracting --- .../Installers/Install-CodeQLBundle.ps1 | 85 +++++-------------- .../SoftwareReport.Generator.ps1 | 2 +- .../SoftwareReport/SoftwareReport.Tools.psm1 | 15 ++-- images/win/scripts/Tests/Tools.Tests.ps1 | 38 +++------ 4 files changed, 39 insertions(+), 101 deletions(-) diff --git a/images/win/scripts/Installers/Install-CodeQLBundle.ps1 b/images/win/scripts/Installers/Install-CodeQLBundle.ps1 index 7a063cc2e04c..b21977a20de3 100644 --- a/images/win/scripts/Installers/Install-CodeQLBundle.ps1 +++ b/images/win/scripts/Installers/Install-CodeQLBundle.ps1 @@ -3,75 +3,34 @@ ## Desc: Install the CodeQL CLI Bundle to the toolcache. ################################################################################ -# Retrieve the CLI versions and bundle tags of the latest two CodeQL bundles. +# Retrieve the CLI version of the latest CodeQL bundle. $Defaults = (Invoke-RestMethod "https://raw.githubusercontent.com/github/codeql-action/v2/src/defaults.json") -$CodeQLTagName = $Defaults.bundleVersion -$CodeQLCliVersion = $Defaults.cliVersion -$PriorCodeQLTagName = $Defaults.priorBundleVersion -$PriorCodeQLCliVersion = $Defaults.priorCliVersion +$CliVersion = $Defaults.cliVersion +$TagName = "codeql-bundle-v" + $CliVersion -# Compute the toolcache version number for each bundle. This is either `x.y.z` or `x.y.z-YYYYMMDD`. -if ($CodeQLTagName.split("-")[-1].StartsWith("v")) { - # Tag name of the format `codeql-bundle-vx.y.z`, where x.y.z is the CLI version. - # We don't need to include the tag name in the toolcache version number because it's derivable - # from the CLI version. - $CodeQLBundleVersion = $CodeQLCliVersion -} elseif ($CodeQLTagName.split("-")[-1] -match "^\d+$") { - # Tag name of the format `codeql-bundle-YYYYMMDD`. - # We need to include the tag name in the toolcache version number because it can't be derived - # from the CLI version. - $CodeQLBundleVersion = $CodeQLCliVersion + "-" + $CodeQLTagName.split("-")[-1] -} else { - Write-Error "Unrecognised current CodeQL bundle tag name: $CodeQLTagName. Could not compute toolcache version number." - exit 1 -} -if ($PriorCodeQLTagName.split("-")[-1].StartsWith("v")) { - # Tag name of the format `codeql-bundle-vx.y.z`, where x.y.z is the CLI version. - # We don't need to include the tag name in the toolcache version number because it's derivable - # from the CLI version. - $PriorCodeQLBundleVersion = $PriorCodeQLCliVersion -} elseif ($PriorCodeQLTagName.split("-")[-1] -match "^\d+$") { - # Tag name of the format `codeql-bundle-YYYYMMDD`. - # We need to include the tag name in the toolcache version number because it can't be derived - # from the CLI version. - $PriorCodeQLBundleVersion = $PriorCodeQLCliVersion + "-" + $PriorCodeQLTagName.split("-")[-1] -} else { - Write-Error "Unrecognised prior CodeQL bundle tag name: $PriorCodeQLTagName. Could not compute toolcache version number." - exit 1 -} +Write-Host "Downloading CodeQL bundle $($CliVersion)..." +# Note that this is the all-platforms CodeQL bundle, to support scenarios where customers run +# different operating systems within containers. +$CodeQLBundlePath = Start-DownloadWithRetry -Url "https://github.com/github/codeql-action/releases/download/$($TagName)/codeql-bundle.tar.gz" -Name "codeql-bundle.tar.gz" +$DownloadDirectoryPath = (Get-Item $CodeQLBundlePath).Directory.FullName -$Bundles = @( - [PSCustomObject]@{ - TagName=$CodeQLTagName; - BundleVersion=$CodeQLBundleVersion; - }, - [PSCustomObject]@{ - TagName=$PriorCodeQLTagName; - BundleVersion=$PriorCodeQLBundleVersion; - } -) +$CodeQLToolcachePath = Join-Path $Env:AGENT_TOOLSDIRECTORY -ChildPath "CodeQL" | Join-Path -ChildPath $CliVersion | Join-Path -ChildPath "x64" +New-Item -Path $CodeQLToolcachePath -ItemType Directory -Force | Out-Null -foreach ($Bundle in $Bundles) { - Write-Host "Downloading CodeQL bundle $($Bundle.BundleVersion)..." - $CodeQLBundlePath = Start-DownloadWithRetry -Url "https://github.com/github/codeql-action/releases/download/$($Bundle.TagName)/codeql-bundle.tar.gz" -Name "codeql-bundle.tar.gz" - $DownloadDirectoryPath = (Get-Item $CodeQLBundlePath).Directory.FullName +Write-Host "Unpacking the downloaded CodeQL bundle archive..." +Extract-7Zip -Path $CodeQLBundlePath -DestinationPath $DownloadDirectoryPath +$UnGzipedCodeQLBundlePath = Join-Path $DownloadDirectoryPath "codeql-bundle.tar" +Extract-7Zip -Path $UnGzipedCodeQLBundlePath -DestinationPath $CodeQLToolcachePath - $CodeQLToolcachePath = Join-Path $Env:AGENT_TOOLSDIRECTORY -ChildPath "CodeQL" | Join-Path -ChildPath $Bundle.BundleVersion | Join-Path -ChildPath "x64" - New-Item -Path $CodeQLToolcachePath -ItemType Directory -Force | Out-Null +Write-Host "CodeQL bundle at $($CodeQLToolcachePath) contains the following directories:" +Get-ChildItem -Path $CodeQLToolcachePath -Depth 2 - Write-Host "Unpacking the downloaded CodeQL bundle archive..." - Extract-7Zip -Path $CodeQLBundlePath -DestinationPath $DownloadDirectoryPath - $UnGzipedCodeQLBundlePath = Join-Path $DownloadDirectoryPath "codeql-bundle.tar" - Extract-7Zip -Path $UnGzipedCodeQLBundlePath -DestinationPath $CodeQLToolcachePath +# Touch a file to indicate to the CodeQL Action that this bundle shipped with the toolcache. This is +# to support overriding the CodeQL version specified in defaults.json on GitHub Enterprise. +New-Item -ItemType file (Join-Path $CodeQLToolcachePath -ChildPath "pinned-version") - # We only pin the latest version in the toolcache, to support overriding the CodeQL version specified in defaults.json on GitHub Enterprise. - if ($Bundle.BundleVersion -eq $CodeQLBundleVersion) { - New-Item -ItemType file (Join-Path $CodeQLToolcachePath -ChildPath "pinned-version") - } - - # Touch a file to indicate to the toolcache that setting up CodeQL is complete. - New-Item -ItemType file "$CodeQLToolcachePath.complete" -} +# Touch a file to indicate to the toolcache that setting up CodeQL is complete. +New-Item -ItemType file "$CodeQLToolcachePath.complete" # Test that the tools have been extracted successfully. -Invoke-PesterTests -TestFile "Tools" -TestName "CodeQLBundles" +Invoke-PesterTests -TestFile "Tools" -TestName "CodeQL Bundle" diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index dcd76b889859..70c0021eb382 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -69,7 +69,7 @@ $tools.AddToolVersion("Bazelisk", $(Get-BazeliskVersion)) $tools.AddToolVersion("Bicep", $(Get-BicepVersion)) $tools.AddToolVersion("Cabal", $(Get-CabalVersion)) $tools.AddToolVersion("CMake", $(Get-CMakeVersion)) -$tools.AddToolVersion("CodeQL Action Bundles", $(Get-CodeQLBundleVersions)) +$tools.AddToolVersion("CodeQL Action Bundle", $(Get-CodeQLBundleVersion)) $tools.AddToolVersion("Docker", $(Get-DockerVersion)) $tools.AddToolVersion("Docker Compose v1", $(Get-DockerComposeVersion)) $tools.AddToolVersion("Docker Compose v2", $(Get-DockerComposeVersionV2)) diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 index b1038167e3ed..ce997c84f449 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 @@ -42,17 +42,12 @@ function Get-CMakeVersion { return $cmakeVersion } -function Get-CodeQLBundleVersions { +function Get-CodeQLBundleVersion { $CodeQLVersionsWildcard = Join-Path $Env:AGENT_TOOLSDIRECTORY -ChildPath "CodeQL" | Join-Path -ChildPath "*" - $CodeQLVersionPaths = Get-ChildItem $CodeQLVersionsWildcard - $CodeQlVersions=@() - foreach ($CodeQLVersionPath in $CodeQLVersionPaths) { - $FullCodeQLVersionPath = $CodeQLVersionPath | Select-Object -Expand FullName - $CodeQLPath = Join-Path $FullCodeQLVersionPath -ChildPath "x64" | Join-Path -ChildPath "codeql" | Join-Path -ChildPath "codeql.exe" - $CodeQLVersion = & $CodeQLPath version --quiet - $CodeQLVersions += $CodeQLVersion - } - return $CodeQLVersions + $CodeQLVersionPath = Get-ChildItem $CodeQLVersionsWildcard | Select-Object -First 1 -Expand FullName + $CodeQLPath = Join-Path $CodeQLVersionPath -ChildPath "x64" | Join-Path -ChildPath "codeql" | Join-Path -ChildPath "codeql.exe" + $CodeQLVersion = & $CodeQLPath version --quiet + return $CodeQLVersion } function Get-DockerVersion { diff --git a/images/win/scripts/Tests/Tools.Tests.ps1 b/images/win/scripts/Tests/Tools.Tests.ps1 index 9c91ac55b7dd..be8864d8b1ad 100644 --- a/images/win/scripts/Tests/Tools.Tests.ps1 +++ b/images/win/scripts/Tests/Tools.Tests.ps1 @@ -21,41 +21,25 @@ Describe "Bazel" { } } -Describe "CodeQLBundles" { - It "Latest CodeQL Bundle" { +Describe "CodeQL Bundle" { + It "Single distribution installed" { $CodeQLVersionsWildcard = Join-Path $Env:AGENT_TOOLSDIRECTORY -ChildPath "CodeQL" | Join-Path -ChildPath "*" - $LatestCodeQLVersionPath = Get-ChildItem $CodeQLVersionsWildcard | Sort-Object -Descending | Select-Object -First 1 -Expand FullName - $LatestCodeQLPath = Join-Path $LatestCodeQLVersionPath -ChildPath "x64" | Join-Path -ChildPath "codeql" | Join-Path -ChildPath "codeql.exe" - "$LatestCodeQLPath version --quiet" | Should -ReturnZeroExitCode - - $LatestCodeQLPacksPath = Join-Path $LatestCodeQLVersionPath -ChildPath "x64" | Join-Path -ChildPath "codeql" | Join-Path -ChildPath "qlpacks" - $LatestCodeQLPacksPath | Should -Exist + $CodeQLVersionPath = Get-ChildItem $CodeQLVersionsWildcard | Should -HaveCount 1 } - It "Prior CodeQL Bundle" { + It "Contains CodeQL executable" { $CodeQLVersionsWildcard = Join-Path $Env:AGENT_TOOLSDIRECTORY -ChildPath "CodeQL" | Join-Path -ChildPath "*" - $PriorCodeQLVersionPath = Get-ChildItem $CodeQLVersionsWildcard | Sort-Object -Descending | Select-Object -Last 1 -Expand FullName - $PriorCodeQLPath = Join-Path $PriorCodeQLVersionPath -ChildPath "x64" | Join-Path -ChildPath "codeql" | Join-Path -ChildPath "codeql.exe" - "$PriorCodeQLPath version --quiet" | Should -ReturnZeroExitCode - - $PriorCodeQLPacksPath = Join-Path $PriorCodeQLVersionPath -ChildPath "x64" | Join-Path -ChildPath "codeql" | Join-Path -ChildPath "qlpacks" - $PriorCodeQLPacksPath | Should -Exist + $CodeQLVersionPath = Get-ChildItem $CodeQLVersionsWildcard | Sort-Object -Descending | Select-Object -First 1 -Expand FullName + $CodeQLPath = Join-Path $CodeQLVersionPath -ChildPath "x64" | Join-Path -ChildPath "codeql" | Join-Path -ChildPath "codeql.exe" + "$CodeQLPath version --quiet" | Should -ReturnZeroExitCode } - It "Latest and Prior CodeQL Bundles are unique" { + It "Contains CodeQL packs" { $CodeQLVersionsWildcard = Join-Path $Env:AGENT_TOOLSDIRECTORY -ChildPath "CodeQL" | Join-Path -ChildPath "*" - - $LatestCodeQLVersionPath = Get-ChildItem $CodeQLVersionsWildcard | Sort-Object -Descending | Select-Object -First 1 -Expand FullName - $LatestCodeQLPath = Join-Path $LatestCodeQLVersionPath -ChildPath "x64" | Join-Path -ChildPath "codeql" | Join-Path -ChildPath "codeql.exe" - $LatestCodeQLVersion = & $LatestCodeQLPath version --quiet - - $PriorCodeQLVersionPath = Get-ChildItem $CodeQLVersionsWildcard | Sort-Object -Descending | Select-Object -Last 1 -Expand FullName - $PriorCodeQLPath = Join-Path $PriorCodeQLVersionPath -ChildPath "x64" | Join-Path -ChildPath "codeql" | Join-Path -ChildPath "codeql.exe" - $PriorCodeQLVersion = & $PriorCodeQLPath version --quiet - - $LatestCodeQLVersion | Should -Not -Match $PriorCodeQLVersion + $CodeQLVersionPath = Get-ChildItem $CodeQLVersionsWildcard | Sort-Object -Descending | Select-Object -First 1 -Expand FullName + $CodeQLPacksPath = Join-Path $CodeQLVersionPath -ChildPath "x64" | Join-Path -ChildPath "codeql" | Join-Path -ChildPath "qlpacks" + $CodeQLPacksPath | Should -Exist } - } Describe "R" { From 2fea4ebd8d9c5314ef18241bb0a5c30bcc10a259 Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Wed, 4 Oct 2023 17:20:54 +0200 Subject: [PATCH 2279/3485] [Windows] Verify hash sum for cobertura (#8447) --- images/win/scripts/Installers/Install-JavaTools.ps1 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/images/win/scripts/Installers/Install-JavaTools.ps1 b/images/win/scripts/Installers/Install-JavaTools.ps1 index a5f7e31a9d77..7670b4c3a3f6 100644 --- a/images/win/scripts/Installers/Install-JavaTools.ps1 +++ b/images/win/scripts/Installers/Install-JavaTools.ps1 @@ -133,9 +133,12 @@ setx MAVEN_OPTS $maven_opts /M # Download cobertura jars $uri = 'https://repo1.maven.org/maven2/net/sourceforge/cobertura/cobertura/2.1.1/cobertura-2.1.1-bin.zip' +$sha256sum = '79479DDE416B082F38ECD1F2F7C6DEBD4D0C2249AF80FD046D1CE05D628F2EC6' $coberturaPath = "C:\cobertura-2.1.1" $archivePath = Start-DownloadWithRetry -Url $uri -Name "cobertura.zip" +$fileHash = (Get-FileHash -Path $archivePath -Algorithm SHA256).Hash +Use-ChecksumComparison $fileHash $sha256sum Extract-7Zip -Path $archivePath -DestinationPath "C:\" setx COBERTURA_HOME $coberturaPath /M From 543e7cbf49bbb48dba42966db108191dc670dd21 Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Wed, 4 Oct 2023 17:23:04 +0200 Subject: [PATCH 2280/3485] [macos] Add python 3.12 to toolcache (#8449) --- images/macos/toolsets/toolset-11.json | 3 ++- images/macos/toolsets/toolset-12.json | 3 ++- images/macos/toolsets/toolset-13.json | 6 ++++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index 40c2546be716..afc662567871 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -243,7 +243,8 @@ "3.8.*", "3.9.*", "3.10.*", - "3.11.*" + "3.11.*", + "3.12.*" ] } } diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index aa36b1b36609..f216c7df6469 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -230,7 +230,8 @@ "3.8.*", "3.9.*", "3.10.*", - "3.11.*" + "3.11.*", + "3.12.*" ] } } diff --git a/images/macos/toolsets/toolset-13.json b/images/macos/toolsets/toolset-13.json index 7dbc75d4c207..c0b80dd82615 100644 --- a/images/macos/toolsets/toolset-13.json +++ b/images/macos/toolsets/toolset-13.json @@ -113,12 +113,14 @@ "3.8.*", "3.9.*", "3.10.*", - "3.11.*" + "3.11.*", + "3.12.*" ] }, "arm64": { "versions": [ - "3.11.*" + "3.11.*", + "3.12.*" ] } } From 31a055838e0555e67b8987fb8719e3b37c9d644c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 4 Oct 2023 18:18:23 +0000 Subject: [PATCH 2281/3485] Updating readme file for macos-13 version 20231002.1 (#8446) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-13-Readme.md | 57 +++++++++++++++++---------------- 1 file changed, 30 insertions(+), 27 deletions(-) diff --git a/images/macos/macos-13-Readme.md b/images/macos/macos-13-Readme.md index 5231b8d3c4c8..c3c01c1fd589 100644 --- a/images/macos/macos-13-Readme.md +++ b/images/macos/macos-13-Readme.md @@ -1,11 +1,13 @@ | Announcements | |-| +| [[macOS] Apple Silicon (M1) powered macOS runners are now available in public beta!](https://github.com/actions/runner-images/issues/8439) | +| [[All OS] Android NDK r23 will be removed from images on October 9](https://github.com/actions/runner-images/issues/8383) | | [[All OS] hub utility will be removed on October 2](https://github.com/actions/runner-images/issues/8362) | *** # macOS 13 - OS Version: macOS 13.6 (22G120) - Kernel Version: Darwin 22.6.0 -- Image Version: 20230924.1 +- Image Version: 20231002.1 ## Installed Software @@ -21,24 +23,24 @@ - Julia 1.9.3 - Kotlin 1.9.10-release-459 - Mono 6.12.0.188 -- Perl 5.36.1 -- PHP 8.2.10 +- Perl 5.38.0 +- PHP 8.2.11 - Python3 3.11.5 - R 4.3.1 - Ruby 3.0.6p216 ### Package Management -- Bundler 2.4.19 +- Bundler 2.4.20 - Carthage 0.39.1 - CocoaPods 1.13.0 -- Composer 2.6.3 -- Homebrew 4.1.12 +- Composer 2.6.4 +- Homebrew 4.1.14 - NPM 9.8.1 - NuGet 6.3.1.1 - Pip3 23.2.1 (python 3.11) - Pipx 1.2.0 -- RubyGems 3.4.19 -- Vcpkg 2023 (build from commit 5a38b5ec0) +- RubyGems 3.4.20 +- Vcpkg 2023 (build from commit 38dd6b15a) - Yarn 1.22.19 ### Project Management @@ -47,7 +49,7 @@ ### Utilities - 7-Zip 17.05 - aria2 1.36.0 -- azcopy 10.20.1 +- azcopy 10.21.0 - bazel 6.3.2 - bazelisk 1.18.0 - bsdtar 3.5.3 - available by 'tar' alias @@ -62,40 +64,40 @@ - OpenSSL 1.1.1w 11 Sep 2023 - Packer 1.9.4 - pkg-config 0.29.2 -- yq 4.35.1 +- yq 4.35.2 - zstd 1.5.5 ### Tools -- AWS CLI 2.13.21 +- AWS CLI 2.13.22 - AWS SAM CLI 1.97.0 - AWS Session Manager CLI 1.2.497.0 -- Azure CLI 2.52.0 +- Azure CLI 2.53.0 - Azure CLI (azure-devops) 0.26.0 - Bicep CLI 0.21.1 - Cabal 3.6.2.0 - Cmake 3.27.6 -- CodeQL Action Bundles 2.14.4 2.14.5 +- CodeQL Action Bundles 2.14.5 2.14.6 - Fastlane 2.216.0 -- GHC 9.6.2 +- GHC 9.6.3 - GHCup 0.1.19.4 -- Stack 2.9.3 -- SwiftFormat 0.52.4 +- Stack 2.11.1 +- SwiftFormat 0.52.6 - Xcode Command Line Tools 15.0.0.0.1.1694021235 ### Linters -- SwiftLint 0.52.4 +- SwiftLint 0.53.0 ### Browsers - Safari 16.6 (18615.3.12.11.2) - SafariDriver 16.6 (18615.3.12.11.2) -- Google Chrome 117.0.5938.92 +- Google Chrome 117.0.5938.132 - Google Chrome for Testing 117.0.5938.92 - ChromeDriver 117.0.5938.92 -- Microsoft Edge 117.0.2045.40 -- Microsoft Edge WebDriver 117.0.2045.40 -- Mozilla Firefox 117.0.1 +- Microsoft Edge 117.0.2045.47 +- Microsoft Edge WebDriver 117.0.2045.47 +- Mozilla Firefox 118.0.1 - geckodriver 0.33.0 -- Selenium server 4.12.1 +- Selenium server 4.13.0 #### Environment variables | Name | Value | @@ -124,15 +126,16 @@ - 3.11.5 #### PyPy -- 2.7.18 [PyPy 7.3.12] +- 2.7.18 [PyPy 7.3.13] - 3.7.13 [PyPy 7.3.9] - 3.8.16 [PyPy 7.3.11] -- 3.9.17 [PyPy 7.3.12] -- 3.10.12 [PyPy 7.3.12] +- 3.9.18 [PyPy 7.3.13] +- 3.10.13 [PyPy 7.3.13] #### Node.js - 16.20.2 - 18.18.0 +- 20.8.0 #### Go - 1.19.13 @@ -147,7 +150,7 @@ #### Packages - Bindgen 0.68.1 -- Cargo-audit 0.18.1 +- Cargo-audit 0.18.2 - Cargo-outdated 0.13.1 - Cbindgen 0.26.0 - Clippy 0.1.72 @@ -157,7 +160,7 @@ - PowerShell 7.2.14 #### PowerShell Modules -- Az: 10.3.0 +- Az: 10.4.1 - Pester: 5.5.0 - PSScriptAnalyzer: 1.21.0 From 2e47a88733e4b6b53ba249f73e19bbf7f1122d34 Mon Sep 17 00:00:00 2001 From: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com> Date: Thu, 5 Oct 2023 09:31:22 +0200 Subject: [PATCH 2282/3485] [windows] implement Android SDK cmdtools checksum (#8357) --- images/win/scripts/Installers/Install-AndroidSDK.ps1 | 10 +++++++++- images/win/toolsets/toolset-2019.json | 2 ++ images/win/toolsets/toolset-2022.json | 2 ++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/images/win/scripts/Installers/Install-AndroidSDK.ps1 b/images/win/scripts/Installers/Install-AndroidSDK.ps1 index 1ac43665dbab..ed7b859d665a 100644 --- a/images/win/scripts/Installers/Install-AndroidSDK.ps1 +++ b/images/win/scripts/Installers/Install-AndroidSDK.ps1 @@ -1,14 +1,22 @@ ################################################################################ ## File: Install-AndroidSDK.ps1 ## Desc: Install and update Android SDK and tools +## Supply chain security: checksum validation ################################################################################ # get packages to install from the toolset $androidToolset = (Get-ToolsetContent).android # Newer version(s) require Java 11 by default # See https://github.com/actions/runner-images/issues/6960 -$cmdlineToolsUrl = "https://dl.google.com/android/repository/commandlinetools-win-9123335_latest.zip" +$cmdlineToolsUrl = $androidToolset.commandline_tools_url $cmdlineToolsArchPath = Start-DownloadWithRetry -Url $cmdlineToolsUrl -Name "cmdline-tools.zip" + +#region Supply chain security +$localFileHash = (Get-FileHash -Path $cmdlineToolsArchPath -Algorithm SHA256).Hash + +Use-ChecksumComparison -LocalFileHash $localFileHash -DistributorFileHash $androidToolset.hash +#endregion + $sdkInstallRoot = "C:\Program Files (x86)\Android\android-sdk" $sdkRoot = "C:\Android\android-sdk" Extract-7Zip -Path $cmdlineToolsArchPath -DestinationPath "${sdkInstallRoot}\cmdline-tools" diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index dd33e30f72cc..a0b65ab8cb54 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -148,6 +148,8 @@ "versions": [ "8", "11", "17" ] }, "android": { + "commandline_tools_url": "https://dl.google.com/android/repository/commandlinetools-win-9123335_latest.zip", + "hash": "8A90E6A3DEB2FA13229B2E335EFD07687DCC8A55A3C544DA9F40B41404993E7D", "platform_min_version": "19", "build_tools_min_version": "19.1.0", "extra_list": [ diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index cd9086248a94..dbd241475fff 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -132,6 +132,8 @@ "versions": [ "8", "11", "17" ] }, "android": { + "commandline_tools_url": "https://dl.google.com/android/repository/commandlinetools-win-9123335_latest.zip", + "hash": "8A90E6A3DEB2FA13229B2E335EFD07687DCC8A55A3C544DA9F40B41404993E7D", "platform_min_version": "27", "build_tools_min_version": "27.0.0", "extra_list": [ From 3a8f506d584a7250e30040fd81799884efb34d1e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 5 Oct 2023 08:36:51 +0000 Subject: [PATCH 2283/3485] Updating readme file for ubuntu22 version 20231001.1.0 (#8437) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2204-Readme.md | 56 ++++++++++++++++--------------- 1 file changed, 29 insertions(+), 27 deletions(-) diff --git a/images/linux/Ubuntu2204-Readme.md b/images/linux/Ubuntu2204-Readme.md index 5b2ef7f3a49d..e49a9ccabb88 100644 --- a/images/linux/Ubuntu2204-Readme.md +++ b/images/linux/Ubuntu2204-Readme.md @@ -1,12 +1,12 @@ | Announcements | |-| +| [[All OS] Android NDK r23 will be removed from images on October 9](https://github.com/actions/runner-images/issues/8383) | | [[All OS] hub utility will be removed on October 2](https://github.com/actions/runner-images/issues/8362) | -| [Clang 12 will be removed from Ubuntu 22.04 image on September 25](https://github.com/actions/runner-images/issues/8263) | *** # Ubuntu 22.04 - OS Version: 22.04.3 LTS - Kernel Version: 6.2.0-1012-azure -- Image Version: 20230924.1.0 +- Image Version: 20231001.1.0 - Systemd version: 249.11-0ubuntu3.10 ## Installed Software @@ -31,8 +31,8 @@ ### Package Management - cpan 1.64 -- Helm 3.12.3 -- Homebrew 4.1.12 +- Helm 3.13.0 +- Homebrew 4.1.13 - Miniconda 23.5.2 - Npm 9.8.1 - NuGet 6.6.1.2 @@ -40,7 +40,7 @@ - Pip3 22.0.2 - Pipx 1.2.0 - RubyGems 3.3.5 -- Vcpkg (build from commit 5a38b5ec0) +- Vcpkg (build from commit c6d6efed3) - Yarn 1.22.19 #### Environment variables @@ -64,13 +64,13 @@ to accomplish this. ### Tools - Ansible 2.15.4 - apt-fast 1.9.12 -- AzCopy 10.20.1 - available by `azcopy` and `azcopy10` aliases +- AzCopy 10.21.0 - available by `azcopy` and `azcopy10` aliases - Bazel 6.3.2 - Bazelisk 1.18.0 - Bicep 0.21.1 - Buildah 1.23.1 - CMake 3.27.6 -- CodeQL Action Bundles 2.14.4 2.14.5 +- CodeQL Action Bundles 2.14.5 2.14.6 - Docker Amazon ECR Credential Helper 0.7.1 - Docker Compose v1 1.29.2 - Docker Compose v2 2.22.0 @@ -82,7 +82,7 @@ to accomplish this. - Git LFS 3.4.0 - Git-ftp 1.6.0 - Haveged 1.9.14 -- Heroku 8.4.3 +- Heroku 8.5.0 - jq 1.6 - Kind 0.20.0 - Kubectl 1.28.2 @@ -98,26 +98,25 @@ to accomplish this. - Packer 1.9.4 - Parcel 2.9.3 - Podman 3.4.4 -- Pulumi 3.85.0 +- Pulumi 3.86.0 - R 4.3.1 - Skopeo 1.4.1 - Sphinx Open Source Search Server 2.2.11 - SVN 1.14.1 - Terraform 1.5.7 - yamllint 1.32.0 -- yq 4.35.1 +- yq 4.35.2 - zstd 1.5.5 ### CLI Tools - Alibaba Cloud CLI 3.0.181 -- AWS CLI 2.13.21 +- AWS CLI 2.13.22 - AWS CLI Session Manager Plugin 1.2.497.0 - AWS SAM CLI 1.97.0 -- Azure CLI 2.52.0 +- Azure CLI 2.53.0 - Azure CLI (azure-devops) 0.26.0 - GitHub CLI 2.35.0 -- Google Cloud CLI 447.0.0 -- Hub CLI 2.14.2 +- Google Cloud CLI 448.0.0 - Netlify CLI 16.4.2 - OpenShift CLI 4.13.13 - ORAS CLI 1.1.0 @@ -132,7 +131,7 @@ to accomplish this. ### PHP Tools - PHP: 8.1.2 -- Composer 2.6.3 +- Composer 2.6.4 - PHPUnit 8.5.34 ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. @@ -140,9 +139,9 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ### Haskell Tools - Cabal 3.10.1.0 -- GHC 9.6.2 +- GHC 9.6.3 - GHCup 0.1.19.4 -- Stack 2.11.1 +- Stack 2.13.1 ### Rust Tools - Cargo 1.72.1 @@ -152,20 +151,20 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. #### Packages - Bindgen 0.68.1 -- Cargo audit 0.18.1 +- Cargo audit 0.18.2 - Cargo clippy 0.1.72 - Cargo outdated 0.13.1 - Cbindgen 0.26.0 - Rustfmt 1.6.0 ### Browsers and Drivers -- Google Chrome 117.0.5938.92 +- Google Chrome 117.0.5938.132 - ChromeDriver 117.0.5938.92 - Chromium 117.0.5938.0 -- Microsoft Edge 117.0.2045.40 -- Microsoft Edge WebDriver 117.0.2045.40 -- Selenium server 4.12.0 -- Mozilla Firefox 118.0 +- Microsoft Edge 117.0.2045.47 +- Microsoft Edge WebDriver 117.0.2045.47 +- Selenium server 4.13.0 +- Mozilla Firefox 118.0.1 - Geckodriver 0.33.0 #### Environment variables @@ -215,6 +214,7 @@ Use the following command as a part of your job to start the service: 'sudo syst - 14.21.3 - 16.20.2 - 18.18.0 +- 20.8.0 #### Python - 3.7.17 @@ -226,8 +226,8 @@ Use the following command as a part of your job to start the service: 'sudo syst #### PyPy - 3.7.13 [PyPy 7.3.9] - 3.8.16 [PyPy 7.3.11] -- 3.9.17 [PyPy 7.3.12] -- 3.10.12 [PyPy 7.3.12] +- 3.9.18 [PyPy 7.3.13] +- 3.10.13 [PyPy 7.3.13] #### Ruby - 3.1.4 @@ -279,7 +279,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | ----------------------- | ------------------------------------------------------------------------ | ---------- | | alpine:3.16 | sha256:a8cbb8c69ee71561f4b69c066bad07f7e510caaa523da26fbfc606b10bd7934b | 2023-08-07 | | alpine:3.17 | sha256:f71a5f071694a785e064f05fed657bf8277f1b2113a8ed70c90ad486d6ee54dc | 2023-08-07 | -| alpine:3.18 | sha256:7144f7bab3d4c2648d7e59409f15ec52a18006a128c733fcff20d3a4a54ba44a | 2023-08-07 | +| alpine:3.18 | sha256:eece025e432126ce23f223450a0326fbebde39cdf496a85d8c016293fc851978 | 2023-09-28 | | buildpack-deps:bullseye | sha256:8ee57204a7af0468a61a3e47fbf8412d6ad1d479050bb702d99fd1d3664d7173 | 2023-09-20 | | buildpack-deps:buster | sha256:0bc568b581ed3e9a13f818fd20258edb623cf67e6d354afadf77fb9095d798a2 | 2023-09-20 | | debian:10 | sha256:484cc8ab0d73f513e3f9bacd03424eb081bd90f594d7ebde42587843fdc242f3 | 2023-09-20 | @@ -290,7 +290,9 @@ Use the following command as a part of your job to start the service: 'sudo syst | node:16 | sha256:f77a1aef2da8d83e45ec990f45df50f1a286c5fe8bbfb8c6e4246c6389705c0b | 2023-09-07 | | node:16-alpine | sha256:a1f9d027912b58a7c75be7716c97cfbc6d3099f3a97ed84aa490be9dee20e787 | 2023-08-10 | | node:18 | sha256:ee0a21d64211d92d4340b225c556e9ef1a8bce1d5b03b49f5f07bf1dbbaa5626 | 2023-09-21 | -| node:18-alpine | sha256:619ce27eb37c7c0476bd518085bf1ba892e2148fc1ab5dbaff2f20c56e50444d | 2023-09-20 | +| node:18-alpine | sha256:a315556d82ef54561e54fca7d8ee333382de183d4e56841dcefcd05b55310f46 | 2023-09-29 | +| node:20 | sha256:6b3f9aa7eefa8d4c93d43914e78aa2bfea9a12808b0059e5da78854dfa8b8768 | 2023-09-29 | +| node:20-alpine | sha256:37750e51d61bef92165b2e29a77da4277ba0777258446b7a9c99511f119db096 | 2023-09-29 | | ubuntu:18.04 | sha256:152dc042452c496007f07ca9127571cb9c29697f42acbfad72324b2bb2e43c98 | 2023-05-30 | | ubuntu:20.04 | sha256:33a5cc25d22c45900796a1aca487ad7a7cb09f09ea00b779e3b2026b4fc2faba | 2023-08-01 | | ubuntu:22.04 | sha256:aabed3296a3d45cede1dc866a24476c4d7e093aa806263c27ddaadbdce3c1054 | 2023-08-16 | From 7e34d946161aa7f8b6738062690e20c668015015 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 5 Oct 2023 08:52:06 +0000 Subject: [PATCH 2284/3485] Updating readme file for ubuntu20 version 20231002.1.0 (#8438) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2004-Readme.md | 58 ++++++++++++++++--------------- 1 file changed, 30 insertions(+), 28 deletions(-) diff --git a/images/linux/Ubuntu2004-Readme.md b/images/linux/Ubuntu2004-Readme.md index eba622523f78..60728734d1bb 100644 --- a/images/linux/Ubuntu2004-Readme.md +++ b/images/linux/Ubuntu2004-Readme.md @@ -1,12 +1,12 @@ | Announcements | |-| +| [[All OS] Android NDK r23 will be removed from images on October 9](https://github.com/actions/runner-images/issues/8383) | | [[All OS] hub utility will be removed on October 2](https://github.com/actions/runner-images/issues/8362) | -| [Clang 12 will be removed from Ubuntu 22.04 image on September 25](https://github.com/actions/runner-images/issues/8263) | *** # Ubuntu 20.04 - OS Version: 20.04.6 LTS - Kernel Version: 5.15.0-1047-azure -- Image Version: 20230924.1.0 +- Image Version: 20231002.1.0 - Systemd version: 245.4-4ubuntu3.22 ## Installed Software @@ -33,8 +33,8 @@ ### Package Management - cpan 1.64 -- Helm 3.12.3 -- Homebrew 4.1.12 +- Helm 3.13.0 +- Homebrew 4.1.13 - Miniconda 23.5.2 - Npm 9.8.1 - NuGet 6.6.1.2 @@ -42,7 +42,7 @@ - Pip3 20.0.2 - Pipx 1.2.0 - RubyGems 3.1.2 -- Vcpkg (build from commit 5a38b5ec0) +- Vcpkg (build from commit c6d6efed3) - Yarn 1.22.19 #### Environment variables @@ -69,13 +69,13 @@ to accomplish this. ### Tools - Ansible 2.13.12 - apt-fast 1.9.12 -- AzCopy 10.20.1 - available by `azcopy` and `azcopy10` aliases +- AzCopy 10.21.0 - available by `azcopy` and `azcopy10` aliases - Bazel 6.3.2 - Bazelisk 1.18.0 - Bicep 0.21.1 - Buildah 1.22.3 - CMake 3.27.6 -- CodeQL Action Bundles 2.14.4 2.14.5 +- CodeQL Action Bundle 2.14.6 - Docker Amazon ECR Credential Helper 0.7.1 - Docker Compose v1 1.29.2 - Docker Compose v2 2.22.0 @@ -87,7 +87,7 @@ to accomplish this. - Git LFS 3.4.0 - Git-ftp 1.6.0 - Haveged 1.9.1 -- Heroku 8.4.3 +- Heroku 8.5.0 - HHVM (HipHop VM) 4.172.1 - jq 1.6 - Kind 0.20.0 @@ -105,26 +105,25 @@ to accomplish this. - Parcel 2.9.3 - PhantomJS 2.1.1 2.1.1 - Podman 3.4.2 -- Pulumi 3.85.0 +- Pulumi 3.86.0 - R 4.3.1 - Skopeo 1.5.0 - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 - Terraform 1.5.7 - yamllint 1.32.0 -- yq 4.35.1 +- yq 4.35.2 - zstd 1.5.5 ### CLI Tools - Alibaba Cloud CLI 3.0.174 -- AWS CLI 2.13.21 +- AWS CLI 2.13.22 - AWS CLI Session Manager Plugin 1.2.497.0 - AWS SAM CLI 1.97.0 -- Azure CLI 2.52.0 +- Azure CLI 2.53.0 - Azure CLI (azure-devops) 0.26.0 - GitHub CLI 2.35.0 -- Google Cloud CLI 447.0.0 -- Hub CLI 2.14.2 +- Google Cloud CLI 448.0.0 - Netlify CLI 16.4.2 - OpenShift CLI 4.13.13 - ORAS CLI 1.1.0 @@ -139,7 +138,7 @@ to accomplish this. ### PHP Tools - PHP: 7.4.33, 8.0.30, 8.1.23, 8.2.10 -- Composer 2.6.3 +- Composer 2.6.4 - PHPUnit 8.5.34 ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. @@ -147,9 +146,9 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ### Haskell Tools - Cabal 3.10.1.0 -- GHC 9.6.2 +- GHC 9.6.3 - GHCup 0.1.19.4 -- Stack 2.11.1 +- Stack 2.13.1 ### Rust Tools - Cargo 1.72.1 @@ -159,20 +158,20 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. #### Packages - Bindgen 0.68.1 -- Cargo audit 0.18.1 +- Cargo audit 0.18.2 - Cargo clippy 0.1.72 - Cargo outdated 0.13.1 - Cbindgen 0.26.0 - Rustfmt 1.6.0 ### Browsers and Drivers -- Google Chrome 117.0.5938.92 +- Google Chrome 117.0.5938.132 - ChromeDriver 117.0.5938.92 - Chromium 117.0.5938.0 -- Microsoft Edge 117.0.2045.40 -- Microsoft Edge WebDriver 117.0.2045.40 -- Selenium server 4.12.0 -- Mozilla Firefox 118.0 +- Microsoft Edge 117.0.2045.47 +- Microsoft Edge WebDriver 117.0.2045.47 +- Selenium server 4.13.0 +- Mozilla Firefox 118.0.1 - Geckodriver 0.33.0 #### Environment variables @@ -223,6 +222,7 @@ Use the following command as a part of your job to start the service: 'sudo syst - 14.21.3 - 16.20.2 - 18.18.0 +- 20.8.0 #### Python - 3.7.17 @@ -232,12 +232,12 @@ Use the following command as a part of your job to start the service: 'sudo syst - 3.11.5 #### PyPy -- 2.7.18 [PyPy 7.3.12] +- 2.7.18 [PyPy 7.3.13] - 3.6.12 [PyPy 7.3.3] - 3.7.13 [PyPy 7.3.9] - 3.8.16 [PyPy 7.3.11] -- 3.9.17 [PyPy 7.3.12] -- 3.10.12 [PyPy 7.3.12] +- 3.9.18 [PyPy 7.3.13] +- 3.10.13 [PyPy 7.3.13] #### Ruby - 2.5.9 @@ -295,7 +295,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | ----------------------- | ------------------------------------------------------------------------ | ---------- | | alpine:3.16 | sha256:a8cbb8c69ee71561f4b69c066bad07f7e510caaa523da26fbfc606b10bd7934b | 2023-08-07 | | alpine:3.17 | sha256:f71a5f071694a785e064f05fed657bf8277f1b2113a8ed70c90ad486d6ee54dc | 2023-08-07 | -| alpine:3.18 | sha256:7144f7bab3d4c2648d7e59409f15ec52a18006a128c733fcff20d3a4a54ba44a | 2023-08-07 | +| alpine:3.18 | sha256:eece025e432126ce23f223450a0326fbebde39cdf496a85d8c016293fc851978 | 2023-09-28 | | buildpack-deps:bullseye | sha256:8ee57204a7af0468a61a3e47fbf8412d6ad1d479050bb702d99fd1d3664d7173 | 2023-09-20 | | buildpack-deps:buster | sha256:0bc568b581ed3e9a13f818fd20258edb623cf67e6d354afadf77fb9095d798a2 | 2023-09-20 | | buildpack-deps:stretch | sha256:78e995165a5788c2f55aed6e548d8f6c1534830d4310c870408fccb2da8c5b2e | 2022-06-23 | @@ -308,7 +308,9 @@ Use the following command as a part of your job to start the service: 'sudo syst | node:16 | sha256:f77a1aef2da8d83e45ec990f45df50f1a286c5fe8bbfb8c6e4246c6389705c0b | 2023-09-07 | | node:16-alpine | sha256:a1f9d027912b58a7c75be7716c97cfbc6d3099f3a97ed84aa490be9dee20e787 | 2023-08-10 | | node:18 | sha256:ee0a21d64211d92d4340b225c556e9ef1a8bce1d5b03b49f5f07bf1dbbaa5626 | 2023-09-21 | -| node:18-alpine | sha256:619ce27eb37c7c0476bd518085bf1ba892e2148fc1ab5dbaff2f20c56e50444d | 2023-09-20 | +| node:18-alpine | sha256:a315556d82ef54561e54fca7d8ee333382de183d4e56841dcefcd05b55310f46 | 2023-09-29 | +| node:20 | sha256:6b3f9aa7eefa8d4c93d43914e78aa2bfea9a12808b0059e5da78854dfa8b8768 | 2023-09-29 | +| node:20-alpine | sha256:37750e51d61bef92165b2e29a77da4277ba0777258446b7a9c99511f119db096 | 2023-09-29 | | ubuntu:16.04 | sha256:1f1a2d56de1d604801a9671f301190704c25d604a416f59e03c04f5c6ffee0d6 | 2021-08-31 | | ubuntu:18.04 | sha256:152dc042452c496007f07ca9127571cb9c29697f42acbfad72324b2bb2e43c98 | 2023-05-30 | | ubuntu:20.04 | sha256:33a5cc25d22c45900796a1aca487ad7a7cb09f09ea00b779e3b2026b4fc2faba | 2023-08-01 | From 2ffd260f96f5a2b471001413a861e9338891d70e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 5 Oct 2023 10:40:50 +0000 Subject: [PATCH 2285/3485] Updating readme file for win19 version 20231002.2.0 (#8443) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2019-Readme.md | 53 +++++++++++++++++--------------- 1 file changed, 28 insertions(+), 25 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index d30cce858d82..9a10b133e7a1 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -1,10 +1,11 @@ | Announcements | |-| +| [[All OS] Android NDK r23 will be removed from images on October 9](https://github.com/actions/runner-images/issues/8383) | | [[All OS] hub utility will be removed on October 2](https://github.com/actions/runner-images/issues/8362) | *** # Windows Server 2019 - OS Version: 10.0.17763 Build 4851 -- Image Version: 20230924.1.0 +- Image Version: 20231002.2.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -19,13 +20,13 @@ - LLVM 16.0.6 - Node 18.18.0 - Perl 5.32.1 -- PHP 8.2.10 +- PHP 8.2.11 - Python 3.7.9 - Ruby 2.5.9p229 ### Package Management - Chocolatey 2.2.2 -- Composer 2.6.3 +- Composer 2.6.4 - Helm 3.12.3 - Miniconda 23.5.2 (pre-installed on the image but not added to PATH) - NPM 9.8.1 @@ -33,7 +34,7 @@ - pip 23.2.1 (python 3.7) - Pipx 1.2.0 - RubyGems 2.7.6.3 -- Vcpkg (build from commit 5a38b5ec0) +- Vcpkg (build from commit c6d6efed3) - Yarn 1.22.19 #### Environment variables @@ -51,37 +52,39 @@ ### Tools - 7zip 23.01 - aria2 1.36.0 -- azcopy 10.20.1 +- azcopy 10.21.0 - Bazel 6.3.2 - Bazelisk 1.18.0 - Bicep 0.21.1 - Cabal 3.10.1.0 - CMake 3.27.6 -- CodeQL Action Bundles 2.14.4 2.14.5 +- CodeQL Action Bundles 2.14.5 2.14.6 - Docker 24.0.6 - Docker Compose v1 1.29.2 - Docker Compose v2 2.22.0 - Docker-wincred 0.8.0 -- ghc 9.6.2 +- ghc 9.6.3 - Git 2.42.0.windows.2 - Git LFS 3.4.0 -- Google Cloud CLI 447.0.0 -- ImageMagick 7.1.1-18 +- Google Cloud CLI 448.0.0 +- ImageMagick 7.1.1-19 - InnoSetup 6.2.2 - jq 1.7-dirty - Kind 0.20.0 - Kubectl 1.28.2 - Mercurial 5.0 -- Mingw-w64 8.1.0 +- gcc 8.1.0 +- gdb 8.1 +- GNU Binutils 2.30 - Newman 6.0.0 - NSIS 3.08 -- OpenSSL 1.1.1v +- OpenSSL 1.1.1w - Packer 1.9.4 - Parcel 2.9.3 -- Pulumi 3.85.0 +- Pulumi 3.86.0 - R 4.3.1 - Service Fabric SDK 9.1.1436.9590 -- Stack 2.11.1 +- Stack 2.13.1 - Subversion (SVN) 1.14.2 - Swig 4.1.1 - VSWhere 3.1.7 @@ -95,11 +98,10 @@ - AWS CLI 2.13.20 - AWS SAM CLI 1.97.0 - AWS Session Manager CLI 1.2.497.0 -- Azure CLI 2.52.0 +- Azure CLI 2.53.0 - Azure DevOps CLI extension 0.26.0 - Cloud Foundry CLI 6.53.0 - GitHub CLI 2.35.0 -- Hub CLI 2.14.2 ### Rust Tools - Cargo 1.72.1 @@ -109,21 +111,21 @@ #### Packages - bindgen 0.68.1 -- cargo-audit 0.18.1 +- cargo-audit 0.18.2 - cargo-outdated 0.13.1 - cbindgen 0.26.0 - Clippy 0.1.72 - Rustfmt 1.6.0 ### Browsers and Drivers -- Google Chrome 117.0.5938.92 +- Google Chrome 117.0.5938.132 - Chrome Driver 117.0.5938.92 -- Microsoft Edge 117.0.2045.36 -- Microsoft Edge Driver 117.0.2045.41 -- Mozilla Firefox 117.0.1 +- Microsoft Edge 117.0.2045.47 +- Microsoft Edge Driver 117.0.2045.47 +- Mozilla Firefox 118.0.1 - Gecko Driver 0.33.0 - IE Driver 4.11.0.0 -- Selenium server 4.12.0 +- Selenium server 4.13.0 #### Environment variables | Name | Value | @@ -171,6 +173,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 14.21.3 - 16.20.2 - 18.18.0 +- 20.8.0 #### Python - 3.7.9 @@ -180,12 +183,12 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 3.11.5 #### PyPy -- 2.7.18 [PyPy 7.3.12] +- 2.7.18 [PyPy 7.3.13] - 3.6.12 [PyPy 7.3.3] - 3.7.13 [PyPy 7.3.9] - 3.8.16 [PyPy 7.3.11] -- 3.9.17 [PyPy 7.3.12] -- 3.10.12 [PyPy 7.3.12] +- 3.9.18 [PyPy 7.3.13] +- 3.10.13 [PyPy 7.3.13] #### Ruby - 2.5.9 @@ -509,7 +512,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Az (Cached): 1.0.0.zip, 1.6.0.zip, 2.3.2.zip, 2.6.0.zip, 3.1.0.zip, 3.5.0.zip, 3.8.0.zip, 4.3.0.zip, 4.4.0.zip, 4.7.0.zip, 5.5.0.zip, 5.9.0.zip, 6.6.0.zip, 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.420 +- AWSPowershell: 4.1.424 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 - Microsoft.Graph: 2.6.1 From 8d1fc7309c2997e845d57fbcc0444e65bb794f7b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 5 Oct 2023 10:41:47 +0000 Subject: [PATCH 2286/3485] Updating readme file for win22 version 20231002.1.0 (#8444) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2022-Readme.md | 55 +++++++++++++++++--------------- 1 file changed, 29 insertions(+), 26 deletions(-) diff --git a/images/win/Windows2022-Readme.md b/images/win/Windows2022-Readme.md index 58b760abe881..a1a27432cf63 100644 --- a/images/win/Windows2022-Readme.md +++ b/images/win/Windows2022-Readme.md @@ -1,10 +1,11 @@ | Announcements | |-| +| [[All OS] Android NDK r23 will be removed from images on October 9](https://github.com/actions/runner-images/issues/8383) | | [[All OS] hub utility will be removed on October 2](https://github.com/actions/runner-images/issues/8362) | *** # Windows Server 2022 - OS Version: 10.0.20348 Build 1970 -- Image Version: 20230924.1.0 +- Image Version: 20231002.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -19,13 +20,13 @@ - LLVM 16.0.6 - Node 18.18.0 - Perl 5.32.1 -- PHP 8.2.10 +- PHP 8.2.11 - Python 3.9.13 - Ruby 3.0.6p216 ### Package Management - Chocolatey 2.2.2 -- Composer 2.6.3 +- Composer 2.6.4 - Helm 3.12.3 - Miniconda 23.5.2 (pre-installed on the image but not added to PATH) - NPM 9.8.1 @@ -33,7 +34,7 @@ - pip 23.2.1 (python 3.9) - Pipx 1.2.0 - RubyGems 3.2.33 -- Vcpkg (build from commit 5a38b5ec0) +- Vcpkg (build from commit c6d6efed3) - Yarn 1.22.19 #### Environment variables @@ -51,35 +52,37 @@ ### Tools - 7zip 23.01 - aria2 1.36.0 -- azcopy 10.20.1 +- azcopy 10.21.0 - Bazel 6.3.2 - Bazelisk 1.18.0 - Bicep 0.21.1 - Cabal 3.10.1.0 - CMake 3.27.6 -- CodeQL Action Bundles 2.14.4 2.14.5 +- CodeQL Action Bundles 2.14.5 2.14.6 - Docker 24.0.6 - Docker Compose v1 1.29.2 - Docker Compose v2 2.22.0 - Docker-wincred 0.8.0 -- ghc 9.6.2 +- ghc 9.6.3 - Git 2.42.0.windows.2 - Git LFS 3.4.0 -- ImageMagick 7.1.1-18 +- ImageMagick 7.1.1-19 - InnoSetup 6.2.2 - jq 1.7-dirty - Kind 0.20.0 - Kubectl 1.28.2 - Mercurial 5.0 -- Mingw-w64 12.2.0 +- gcc 12.2.0 +- gdb 11.2 +- GNU Binutils 2.39 - Newman 6.0.0 - NSIS 3.08 -- OpenSSL 1.1.1v +- OpenSSL 1.1.1w - Packer 1.9.4 -- Pulumi 3.85.0 +- Pulumi 3.86.0 - R 4.3.1 - Service Fabric SDK 9.1.1436.9590 -- Stack 2.11.1 +- Stack 2.13.1 - Subversion (SVN) 1.14.2 - Swig 4.1.1 - VSWhere 3.1.7 @@ -93,10 +96,9 @@ - AWS CLI 2.13.20 - AWS SAM CLI 1.97.0 - AWS Session Manager CLI 1.2.497.0 -- Azure CLI 2.52.0 +- Azure CLI 2.53.0 - Azure DevOps CLI extension 0.26.0 - GitHub CLI 2.35.0 -- Hub CLI 2.14.2 ### Rust Tools - Cargo 1.72.1 @@ -106,21 +108,21 @@ #### Packages - bindgen 0.68.1 -- cargo-audit 0.18.1 +- cargo-audit 0.18.2 - cargo-outdated 0.13.1 - cbindgen 0.26.0 - Clippy 0.1.72 - Rustfmt 1.6.0 ### Browsers and Drivers -- Google Chrome 117.0.5938.92 +- Google Chrome 117.0.5938.132 - Chrome Driver 117.0.5938.92 -- Microsoft Edge 117.0.2045.36 -- Microsoft Edge Driver 117.0.2045.41 -- Mozilla Firefox 117.0.1 +- Microsoft Edge 117.0.2045.47 +- Microsoft Edge Driver 117.0.2045.47 +- Mozilla Firefox 118.0.1 - Gecko Driver 0.33.0 - IE Driver 4.11.0.0 -- Selenium server 4.12.0 +- Selenium server 4.13.0 #### Environment variables | Name | Value | @@ -165,6 +167,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 14.21.3 - 16.20.2 - 18.18.0 +- 20.8.0 #### Python - 3.7.9 @@ -174,11 +177,11 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 3.11.5 #### PyPy -- 2.7.18 [PyPy 7.3.12] +- 2.7.18 [PyPy 7.3.13] - 3.7.13 [PyPy 7.3.9] - 3.8.16 [PyPy 7.3.11] -- 3.9.17 [PyPy 7.3.12] -- 3.10.12 [PyPy 7.3.12] +- 3.9.18 [PyPy 7.3.13] +- 3.10.13 [PyPy 7.3.13] #### Ruby - 2.7.8 @@ -249,7 +252,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Component.Unreal | 17.7.33905.399 | | Component.Unreal.Android | 17.7.33905.399 | | Component.Unreal.Ide | 17.7.33913.275 | -| Component.VSInstallerProjects2022 | 2.0.0 | +| Component.VSInstallerProjects2022 | 2.0.1 | | Component.WixToolset.VisualStudioExtension.Dev17 | 1.0.0.22 | | Component.WixToolset.VisualStudioExtension.Schemas3 | 1.0.0.22 | | Component.Xamarin | 17.7.33905.399 | @@ -525,7 +528,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | ProBITools.MicrosoftAnalysisServicesModelingProjects2022 | 3.0.4 | | ProBITools.MicrosoftReportProjectsforVisualStudio2022 | 3.0.1 | | SSIS.MicrosoftDataToolsIntegrationServices | 1.2 | -| VisualStudioClient.MicrosoftVisualStudio2022InstallerProjects | 2.0.0 | +| VisualStudioClient.MicrosoftVisualStudio2022InstallerProjects | 2.0.1 | | Windows Driver Kit | 10.1.22621.382 | | Windows Driver Kit Visual Studio Extension | 10.0.22621.0 | | Windows Software Development Kit | 10.1.22621.1778 | @@ -568,7 +571,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Az (Cached): 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.420 +- AWSPowershell: 4.1.424 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 - Microsoft.Graph: 2.6.1 From 60963fb52e25c7e731d0c7a16290c03bdf3feb15 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Thu, 5 Oct 2023 12:42:16 +0200 Subject: [PATCH 2287/3485] [macOS] Add java to the macOS 13 arm64 (#8395) --- images/macos/provision/core/openjdk.sh | 47 ++++++++++++++----- .../SoftwareReport.Generator.ps1 | 4 +- .../templates/macOS-13.arm64.anka.pkr.hcl | 1 + images/macos/tests/Java.Tests.ps1 | 25 ++++++---- images/macos/tests/Xamarin.Tests.ps1 | 2 +- images/macos/toolsets/toolset-13.json | 10 +++- 6 files changed, 65 insertions(+), 24 deletions(-) diff --git a/images/macos/provision/core/openjdk.sh b/images/macos/provision/core/openjdk.sh index 2803cb179906..cc9208e724f3 100755 --- a/images/macos/provision/core/openjdk.sh +++ b/images/macos/provision/core/openjdk.sh @@ -5,15 +5,24 @@ createEnvironmentVariable() { local JAVA_VERSION=$1 local DEFAULT=$2 - INSTALL_PATH_PATTERN=$(echo ${AGENT_TOOLSDIRECTORY}/Java_Temurin-Hotspot_jdk/${JAVA_VERSION}*/x64/Contents/Home/) + if [[ $arch == "arm64" ]]; then + INSTALL_PATH_PATTERN=$(echo ${AGENT_TOOLSDIRECTORY}/Java_Temurin-Hotspot_jdk/${JAVA_VERSION}*/arm64/Contents/Home/) + else + INSTALL_PATH_PATTERN=$(echo ${AGENT_TOOLSDIRECTORY}/Java_Temurin-Hotspot_jdk/${JAVA_VERSION}*/x64/Contents/Home/) + fi if [[ ${DEFAULT} == "True" ]]; then echo "Setting up JAVA_HOME variable to ${INSTALL_PATH_PATTERN}" echo "export JAVA_HOME=${INSTALL_PATH_PATTERN}" >> "${HOME}/.bashrc" fi - echo "Setting up JAVA_HOME_${JAVA_VERSION}_X64 variable to ${INSTALL_PATH_PATTERN}" - echo "export JAVA_HOME_${JAVA_VERSION}_X64=${INSTALL_PATH_PATTERN}" >> "${HOME}/.bashrc" + if [[ $arch == "arm64" ]]; then + echo "Setting up JAVA_HOME_${JAVA_VERSION}_arm64 variable to ${INSTALL_PATH_PATTERN}" + echo "export JAVA_HOME_${JAVA_VERSION}_arm64=${INSTALL_PATH_PATTERN}" >> "${HOME}/.bashrc" + else + echo "Setting up JAVA_HOME_${JAVA_VERSION}_X64 variable to ${INSTALL_PATH_PATTERN}" + echo "export JAVA_HOME_${JAVA_VERSION}_X64=${INSTALL_PATH_PATTERN}" >> "${HOME}/.bashrc" + fi } installOpenJDK() { @@ -22,36 +31,52 @@ installOpenJDK() { # Get link for Java binaries and Java version assetUrl=$(curl -fsSL "https://api.adoptium.net/v3/assets/latest/${JAVA_VERSION}/hotspot") - asset=$(echo ${assetUrl} | jq -r '.[] | select(.binary.os=="mac" and .binary.image_type=="jdk" and .binary.architecture=="x64")') + if [[ $arch == "arm64" ]]; then + asset=$(echo ${assetUrl} | jq -r '.[] | select(.binary.os=="mac" and .binary.image_type=="jdk" and .binary.architecture=="aarch64")') + else + asset=$(echo ${assetUrl} | jq -r '.[] | select(.binary.os=="mac" and .binary.image_type=="jdk" and .binary.architecture=="x64")') + fi + archivePath=$(echo ${asset} | jq -r '.binary.package.link') fullVersion=$(echo ${asset} | jq -r '.version.semver' | tr '+' '-') JAVA_TOOLCACHE_PATH=${AGENT_TOOLSDIRECTORY}/Java_Temurin-Hotspot_jdk - javaToolcacheVersionPath=$JAVA_TOOLCACHE_PATH/${fullVersion} - javaToolcacheVersionArchPath=${javaToolcacheVersionPath}/x64 + + if [[ $arch == "arm64" ]]; then + javaToolcacheVersionArchPath=${javaToolcacheVersionPath}/arm64 + else + javaToolcacheVersionArchPath=${javaToolcacheVersionPath}/x64 + fi # Download and extract Java binaries download_with_retries ${archivePath} /tmp OpenJDK-${fullVersion}.tar.gz - + echo "Creating ${javaToolcacheVersionArchPath} directory" mkdir -p ${javaToolcacheVersionArchPath} tar -xf /tmp/OpenJDK-${fullVersion}.tar.gz -C ${javaToolcacheVersionArchPath} --strip-components=1 + # Create complete file - touch ${javaToolcacheVersionPath}/x64.complete + if [[ $arch == "arm64" ]]; then + touch ${javaToolcacheVersionPath}/arm64.complete + else + touch ${javaToolcacheVersionPath}/x64.complete + fi # Create a symlink to '/Library/Java/JavaVirtualMachines' # so '/usr/libexec/java_home' will be able to find Java sudo ln -sf ${javaToolcacheVersionArchPath} /Library/Java/JavaVirtualMachines/Temurin-Hotspot-${JAVA_VERSION}.jdk } -defaultVersion=$(get_toolset_value '.java.default') -jdkVersionsToInstall=($(get_toolset_value ".java.versions[]")) +arch=$(get_arch) +echo $arch +defaultVersion=$(get_toolset_value '.java.'$arch'.default') +jdkVersionsToInstall=($(get_toolset_value ".java.${arch}.versions[]")) for jdkVersionToInstall in ${jdkVersionsToInstall[@]}; do installOpenJDK ${jdkVersionToInstall} - + if [[ ${jdkVersionToInstall} == ${defaultVersion} ]] then createEnvironmentVariable ${jdkVersionToInstall} True diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1 index 479da6641098..428f9be743b5 100644 --- a/images/macos/software-report/SoftwareReport.Generator.ps1 +++ b/images/macos/software-report/SoftwareReport.Generator.ps1 @@ -100,9 +100,9 @@ if ((-not $os.IsVentura) -and (-not $os.IsVenturaArm64)) { # Project Management $projectManagement = $installedSoftware.AddHeader("Project Management") $projectManagement.AddToolVersion("Apache Ant", $(Get-ApacheAntVersion)) +$projectManagement.AddToolVersion("Apache Maven", $(Get-MavenVersion)) +$projectManagement.AddToolVersion("Gradle", $(Get-GradleVersion)) if ((-not $os.IsVentura) -and (-not $os.IsVenturaArm64)) { - $projectManagement.AddToolVersion("Apache Maven", $(Get-MavenVersion)) - $projectManagement.AddToolVersion("Gradle", $(Get-GradleVersion)) $projectManagement.AddToolVersion("Sbt", $(Get-SbtVersion)) } diff --git a/images/macos/templates/macOS-13.arm64.anka.pkr.hcl b/images/macos/templates/macOS-13.arm64.anka.pkr.hcl index 78d7450e2158..d022109df3ab 100644 --- a/images/macos/templates/macOS-13.arm64.anka.pkr.hcl +++ b/images/macos/templates/macOS-13.arm64.anka.pkr.hcl @@ -195,6 +195,7 @@ build { provisioner "shell" { scripts = [ "./provision/core/llvm.sh", + "./provision/core/openjdk.sh", "./provision/core/rust.sh", "./provision/core/gcc.sh", "./provision/core/cocoapods.sh", diff --git a/images/macos/tests/Java.Tests.ps1 b/images/macos/tests/Java.Tests.ps1 index 70e06599fa12..ef73eb96dbee 100644 --- a/images/macos/tests/Java.Tests.ps1 +++ b/images/macos/tests/Java.Tests.ps1 @@ -2,6 +2,7 @@ Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1" -DisableNameChecking $os = Get-OSVersion +$arch = Get-Architecture function Get-NativeVersionFormat { param($Version) @@ -11,7 +12,7 @@ function Get-NativeVersionFormat { return $Version } -Describe "Java" -Skip:($os.IsVenturaArm64) { +Describe "Java" { BeforeAll { function Validate-JavaVersion { param($JavaCommand, $ExpectedVersion) @@ -26,10 +27,14 @@ Describe "Java" -Skip:($os.IsVenturaArm64) { } $toolsetJava = Get-ToolsetValue "java" - $defaultVersion = $toolsetJava.default - $jdkVersions = $toolsetJava.versions + $defaultVersion = $toolsetJava.$arch.default + $jdkVersions = $toolsetJava.$arch.versions - $testCases = $jdkVersions | ForEach-Object { @{ Title = $_; Version = (Get-NativeVersionFormat $_); EnvVariable = "JAVA_HOME_${_}_X64" } } + if ($os.IsVenturaArm64) { + $testCases = $jdkVersions | ForEach-Object { @{ Title = $_; Version = (Get-NativeVersionFormat $_); EnvVariable = "JAVA_HOME_${_}_arm64" } } + } else { + $testCases = $jdkVersions | ForEach-Object { @{ Title = $_; Version = (Get-NativeVersionFormat $_); EnvVariable = "JAVA_HOME_${_}_X64" } } + } $testCases += @{ Title = "Default"; Version = (Get-NativeVersionFormat $defaultVersion); EnvVariable = "JAVA_HOME" } $testCases | ForEach-Object { @@ -59,16 +64,20 @@ Describe "Java" -Skip:($os.IsVenturaArm64) { } } } - + Context "Gradle" { Describe "Gradle" { It "Gradle is installed" { "gradle --version" | Should -ReturnZeroExitCode } - - It "Gradle is installed to /usr/local/bin" { + + It "Gradle is installed to /usr/local/bin" -Skip:($os.IsVenturaArm64) { (Get-Command "gradle").Path | Should -BeExactly "/usr/local/bin/gradle" } + + It "Gradle is installed to /opt/homebrew/bin/gradle" -Skip:($os.IsVentura) { + (Get-Command "gradle").Path | Should -BeExactly "/opt/homebrew/bin/gradle" + } } } -} \ No newline at end of file +} diff --git a/images/macos/tests/Xamarin.Tests.ps1 b/images/macos/tests/Xamarin.Tests.ps1 index 789aa656d7fc..5e00ff48a94f 100644 --- a/images/macos/tests/Xamarin.Tests.ps1 +++ b/images/macos/tests/Xamarin.Tests.ps1 @@ -2,7 +2,7 @@ Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1" -DisableNameChecking $os = Get-OSVersion -if ($os.IsVentura -or $os.IsVenturaArm64) { +if ($os.IsVentura -or $os.IsVenturaArm64) { $MONO_VERSIONS = @(Get-ToolsetValue "mono.framework.version") $XAMARIN_IOS_VERSIONS = @() $XAMARIN_MAC_VERSIONS = @() diff --git a/images/macos/toolsets/toolset-13.json b/images/macos/toolsets/toolset-13.json index c0b80dd82615..69eac0bd6ee1 100644 --- a/images/macos/toolsets/toolset-13.json +++ b/images/macos/toolsets/toolset-13.json @@ -19,8 +19,14 @@ } }, "java": { - "default": "17", - "versions": [ "8", "11", "17" ] + "x64": { + "default": "17", + "versions": [ "8", "11", "17" ] + }, + "arm64": { + "default": "17", + "versions": [ "11", "17" ] + } }, "android": { "platform_min_version": "27", From fbaf4c67c6792f00c255a1ac43e5023509281517 Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Thu, 5 Oct 2023 15:02:18 +0200 Subject: [PATCH 2288/3485] [Windows] Simplify ghcup installation (#8454) --- .../win/scripts/Installers/Install-Haskell.ps1 | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/images/win/scripts/Installers/Install-Haskell.ps1 b/images/win/scripts/Installers/Install-Haskell.ps1 index e322370687b5..07317ddd9f6d 100644 --- a/images/win/scripts/Installers/Install-Haskell.ps1 +++ b/images/win/scripts/Installers/Install-Haskell.ps1 @@ -9,8 +9,20 @@ Write-Host 'Installing ghcup...' $msysPath = "C:\msys64" $ghcupPrefix = "C:\" $cabalDir = "C:\cabal" -$bootstrapHaskell = Invoke-WebRequest https://www.haskell.org/ghcup/sh/bootstrap-haskell.ps1 -UseBasicParsing -Invoke-Command -ScriptBlock ([ScriptBlock]::Create($bootstrapHaskell)) -ArgumentList $false, $true, $true, $false, $true, $false, $false, $ghcupPrefix, "", $msysPath, $cabalDir + +$ghcupDownloadURL = "https://downloads.haskell.org/~ghcup/x86_64-mingw64-ghcup.exe" + +# If you want to install a specific version of ghcup, uncomment the following lines +# $ghver = "0.1.19.4" +# $ghcupDownloadURL = "https://downloads.haskell.org/~ghcup/${ghver}/x86_64-mingw64-ghcup-${ghver}.exe" + +# Other option is to download ghcup from GitHub releases: +# https://github.com/haskell/ghcup-hs/releases/latest + +New-Item -Path "$ghcupPrefix\ghcup" -ItemType 'directory' -ErrorAction SilentlyContinue | Out-Null +New-Item -Path "$ghcupPrefix\ghcup\bin" -ItemType 'directory' -ErrorAction SilentlyContinue | Out-Null +Start-DownloadWithRetry -Url $ghcupDownloadURL -Name "ghcup.exe" -DownloadPath "$ghcupPrefix\ghcup\bin" + Set-SystemVariable "GHCUP_INSTALL_BASE_PREFIX" $ghcupPrefix Set-SystemVariable "GHCUP_MSYS2" $msysPath Set-SystemVariable "CABAL_DIR" $cabalDir From 0795b9ed8be55c2c08f33647e103f70dd18d9df6 Mon Sep 17 00:00:00 2001 From: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com> Date: Thu, 5 Oct 2023 15:03:58 +0200 Subject: [PATCH 2289/3485] [windows] warmup Azure CLI (#8427) * [windows] warmup Azure CLI Improve Azure CLI first run timing. Follow up: https://github.com/actions/runner-images/pull/8294 Co-authored-by: Jesse Houwing <jesse.houwing@gmail.com> * expose AZURE_EXTENSION_DIR to image generation * suppress az warmup output * refresh PATH before warmup --------- Co-authored-by: Jesse Houwing <jesse.houwing@gmail.com> --- .../scripts/Installers/Install-AzureCli.ps1 | 32 +++++++++++++++---- 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/images/win/scripts/Installers/Install-AzureCli.ps1 b/images/win/scripts/Installers/Install-AzureCli.ps1 index c76c8f5073cb..8b3af147f4c0 100644 --- a/images/win/scripts/Installers/Install-AzureCli.ps1 +++ b/images/win/scripts/Installers/Install-AzureCli.ps1 @@ -3,13 +3,33 @@ ## Desc: Install Azure CLI ################################################################################ -Write-Host "Install the latest Azure CLI release" -$azCliUrl = "https://aka.ms/installazurecliwindowsx64" -Install-Binary -Url $azCliUrl -Name "azure-cli.msi" +Write-Host 'Install the latest Azure CLI release' + +$azureCliConfigPath = 'C:\azureCli' +# Store azure-cli cache outside of the provisioning user's profile +[Environment]::SetEnvironmentVariable('AZURE_CONFIG_DIR', $azureCliConfigPath, [System.EnvironmentVariableTarget]::Machine) +# make variable to be available in the current session +${env:AZURE_CONFIG_DIR} = $azureCliConfigPath + +$azCliUrl = 'https://aka.ms/installazurecliwindowsx64' +Install-Binary -Url $azCliUrl -Name 'azure-cli.msi' $azureCliExtensionPath = Join-Path $Env:CommonProgramFiles 'AzureCliExtensionDirectory' -$null = New-Item -ItemType "Directory" -Path $azureCliExtensionPath +$null = New-Item -ItemType 'Directory' -Path $azureCliExtensionPath + +[Environment]::SetEnvironmentVariable('AZURE_EXTENSION_DIR', $azureCliExtensionPath, [System.EnvironmentVariableTarget]::Machine) +# make variable to be available in the current session +${env:AZURE_EXTENSION_DIR} = $azureCliExtensionPath + +# Warm-up Azure CLI + +Write-Host "Warmup 'az'" -[Environment]::SetEnvironmentVariable("AZURE_EXTENSION_DIR", $azureCliExtensionPath, [System.EnvironmentVariableTarget]::Machine) +$env:PATH = [Environment]::GetEnvironmentVariable('PATH', 'Machine') +az --help | Out-Null +if ($LASTEXITCODE -ne 0) +{ + throw "Command 'az --help' failed" +} -Invoke-PesterTests -TestFile "CLI.Tools" -TestName "Azure CLI" \ No newline at end of file +Invoke-PesterTests -TestFile 'CLI.Tools' -TestName 'Azure CLI' From f6b2dd2dddf6d3e916970f0d7c0a29b152318d69 Mon Sep 17 00:00:00 2001 From: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com> Date: Fri, 6 Oct 2023 02:14:06 +0200 Subject: [PATCH 2290/3485] [windows] disable Windows Update Medic Service (#8431) Related: https://github.com/actions/runner-images-internal/issues/5463 --- images/win/scripts/Installers/Initialize-VM.ps1 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/images/win/scripts/Installers/Initialize-VM.ps1 b/images/win/scripts/Installers/Initialize-VM.ps1 index 3e3af7421013..b3d18a605e6b 100644 --- a/images/win/scripts/Installers/Initialize-VM.ps1 +++ b/images/win/scripts/Installers/Initialize-VM.ps1 @@ -49,6 +49,9 @@ Get-ScheduledTask -TaskName ServerManager | Disable-ScheduledTask Write-Host "Disable 'Allow your PC to be discoverable by other PCs' popup" New-Item -Path HKLM:\System\CurrentControlSet\Control\Network -Name NewNetworkWindowOff -Force +Write-Host 'Disable Windows Update Medic Service' +Set-ItemProperty -Path HKLM:\System\CurrentControlSet\Services\WaaSMedicSvc -Name Start -Value 4 -Force + Write-Host "Disable Windows Update" Disable-WindowsUpdate @@ -73,4 +76,4 @@ Set-ItemProperty -Path 'HKLM:\SYSTEM\CurrentControlSet\Control\FileSystem' -Name $driveLetter = "C" $size = Get-PartitionSupportedSize -DriveLetter $driveLetter Resize-Partition -DriveLetter $driveLetter -Size $size.SizeMax -Get-Volume | Select-Object DriveLetter, SizeRemaining, Size | Sort-Object DriveLetter \ No newline at end of file +Get-Volume | Select-Object DriveLetter, SizeRemaining, Size | Sort-Object DriveLetter From dfc4f9c7af8f274d6132a9686d090176c554d656 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Fri, 6 Oct 2023 11:28:54 +0200 Subject: [PATCH 2291/3485] [Ubuntu] pin az-cli to v2.52.0 (#8479) --- images/linux/scripts/installers/azure-cli.sh | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/images/linux/scripts/installers/azure-cli.sh b/images/linux/scripts/installers/azure-cli.sh index bca11b8b34f7..2a146e690241 100644 --- a/images/linux/scripts/installers/azure-cli.sh +++ b/images/linux/scripts/installers/azure-cli.sh @@ -5,7 +5,17 @@ ################################################################################ # Install Azure CLI (instructions taken from https://docs.microsoft.com/en-us/cli/azure/install-azure-cli) -curl -fsSL https://aka.ms/InstallAzureCLIDeb | sudo bash +# temporary pin v2.25.0 +sudo mkdir -p /etc/apt/keyrings +curl -sLS https://packages.microsoft.com/keys/microsoft.asc | +gpg --dearmor | +sudo tee /etc/apt/keyrings/microsoft.gpg > /dev/null +sudo chmod go+r /etc/apt/keyrings/microsoft.gpg +AZ_DIST=$(lsb_release -cs) +echo "deb [arch=`dpkg --print-architecture` signed-by=/etc/apt/keyrings/microsoft.gpg] https://packages.microsoft.com/repos/azure-cli/ $AZ_DIST main" | sudo tee /etc/apt/sources.list.d/azure-cli.list +sudo apt-get update +AZ_VER=2.52.0 +sudo apt-get install azure-cli=$AZ_VER-1~$AZ_DIST echo "azure-cli https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt" >> $HELPER_SCRIPTS/apt-sources.txt rm -f /etc/apt/sources.list.d/azure-cli.list rm -f /etc/apt/sources.list.d/azure-cli.list.save From e2c5aaf70ac7e766e7665c3d6a46ae6c6c80f0b4 Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Fri, 6 Oct 2023 11:31:36 +0200 Subject: [PATCH 2292/3485] [Windows] Exit on Docker installation failure (#8473) --- .../win/scripts/Installers/Install-Docker.ps1 | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/images/win/scripts/Installers/Install-Docker.ps1 b/images/win/scripts/Installers/Install-Docker.ps1 index cf93e547edcb..add81b01b8e1 100644 --- a/images/win/scripts/Installers/Install-Docker.ps1 +++ b/images/win/scripts/Installers/Install-Docker.ps1 @@ -20,20 +20,22 @@ Function Get-DockerWincredHash } #endregion -Write-Host "Get latest release of Docker CE" +Write-Host "Get latest Moby release" $mobyLatestReleaseVersion = (Invoke-RestMethod -Uri "https://api.github.com/repos/moby/moby/releases/latest").tag_name.Trim("v") $dockerceUrl = "https://download.docker.com/win/static/stable/x86_64/" $dockerceBinaries = Invoke-WebRequest -Uri $dockerceUrl -UseBasicParsing -Write-Host "Checking $mobyLatestReleaseVersion version" +Write-Host "Check Moby version $mobyLatestReleaseVersion" $mobyRelease = $dockerceBinaries.Links.href -match "${mobyLatestReleaseVersion}\.zip" | Select-Object -Last 1 if (-not $mobyRelease) { Write-Host "Release not found for $mobyLatestRelease version" - $versions = [regex]::Matches($dockerceBinaries.Links.href, "docker-(\d+\.\d+\.\d+)\.zip") | Sort-Object {[version]$_.Groups[1].Value} + $versions = [regex]::Matches($dockerceBinaries.Links.href, "docker-(\d+\.\d+\.\d+)\.zip") | Sort-Object { [version]$_.Groups[1].Value } $mobyRelease = $versions | Select-Object -ExpandProperty Value -Last 1 Write-Host "Found $mobyRelease" } $mobyReleaseUrl = $dockerceUrl + $mobyRelease + +Write-Host "Install Moby $mobyRelease..." $mobyArchivePath = Start-DownloadWithRetry -Url $mobyReleaseUrl -Name $mobyRelease Expand-Archive -Path $mobyArchivePath -DestinationPath $env:TEMP $dockerPath = "$env:TEMP\docker\docker.exe" @@ -43,6 +45,10 @@ Write-Host "Install Docker CE" $instScriptUrl = "https://raw.githubusercontent.com/microsoft/Windows-Containers/Main/helpful_tools/Install-DockerCE/install-docker-ce.ps1" $instScriptPath = Start-DownloadWithRetry -Url $instScriptUrl -Name "install-docker-ce.ps1" & $instScriptPath -DockerPath $dockerPath -DockerDPath $dockerdPath +if ($LastExitCode -ne 0) { + Write-Host "Docker installation failed with exit code $LastExitCode" + exit $exitCode +} # Fix AZ CLI DOCKER_COMMAND_ERROR # cli.azure.cli.command_modules.acr.custom: Could not run 'docker.exe' command. @@ -69,9 +75,9 @@ $distributor_file_hash = Get-DockerWincredHash -Release $dockerCredLatestRelease $local_file_hash = (Get-FileHash -Path 'C:\Windows\System32\docker-credential-wincred.exe' -Algorithm SHA256).Hash if ($local_file_hash -ne $distributor_file_hash) { - Write-Host "hash must be equal to: ${distributor_file_hash}" - Write-Host "actual hash is: ${local_file_hash}" - throw 'Checksum verification failed, please rerun install' + Write-Host "hash must be equal to: ${distributor_file_hash}" + Write-Host "actual hash is: ${local_file_hash}" + throw 'Checksum verification failed, please rerun install' } #endregion @@ -87,4 +93,4 @@ foreach ($dockerImage in $dockerImages) { } } -Invoke-PesterTests -TestFile "Docker" \ No newline at end of file +Invoke-PesterTests -TestFile "Docker" From 6d730133bf0c7294671856ebe1ed4a43266200be Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Fri, 6 Oct 2023 11:53:28 +0200 Subject: [PATCH 2293/3485] [windows] Pin Azure CLI to 2.52.0 (#8478) --- images/win/scripts/Installers/Install-AzureCli.ps1 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/images/win/scripts/Installers/Install-AzureCli.ps1 b/images/win/scripts/Installers/Install-AzureCli.ps1 index 8b3af147f4c0..532460f553d4 100644 --- a/images/win/scripts/Installers/Install-AzureCli.ps1 +++ b/images/win/scripts/Installers/Install-AzureCli.ps1 @@ -11,7 +11,8 @@ $azureCliConfigPath = 'C:\azureCli' # make variable to be available in the current session ${env:AZURE_CONFIG_DIR} = $azureCliConfigPath -$azCliUrl = 'https://aka.ms/installazurecliwindowsx64' +#temporary pin 2.52.0 version +$azCliUrl = 'https://azcliprod.blob.core.windows.net/msi/azure-cli-2.52.0-x64.msi' Install-Binary -Url $azCliUrl -Name 'azure-cli.msi' $azureCliExtensionPath = Join-Path $Env:CommonProgramFiles 'AzureCliExtensionDirectory' From cbe9acb6bc718978cae8f9d2deb155dc41020051 Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Fri, 6 Oct 2023 11:54:51 +0200 Subject: [PATCH 2294/3485] Fix code style in Install-AzureCli.ps1 (#8480) Following https://github.com/actions/runner-images/commit/0795b9ed8be55c2c08f33647e103f70dd18d9df6 --- images/win/scripts/Installers/Install-AzureCli.ps1 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/images/win/scripts/Installers/Install-AzureCli.ps1 b/images/win/scripts/Installers/Install-AzureCli.ps1 index 532460f553d4..f5ef1724bd7e 100644 --- a/images/win/scripts/Installers/Install-AzureCli.ps1 +++ b/images/win/scripts/Installers/Install-AzureCli.ps1 @@ -28,8 +28,7 @@ Write-Host "Warmup 'az'" $env:PATH = [Environment]::GetEnvironmentVariable('PATH', 'Machine') az --help | Out-Null -if ($LASTEXITCODE -ne 0) -{ +if ($LASTEXITCODE -ne 0) { throw "Command 'az --help' failed" } From 2925b3ae953afa73b1f3df8916944caeeccc668c Mon Sep 17 00:00:00 2001 From: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com> Date: Fri, 6 Oct 2023 12:03:28 +0200 Subject: [PATCH 2295/3485] [windows] introduce dedicated PowerShell configuration step (#8453) * windows: implement separate step for configuring Powershell * windows: refactor PyPy checksum validation PyPy checksum validation uses PowerHTML module which is now available as a part of powershell profile * reformat * Update images/win/scripts/Installers/Configure-PowerShell.ps1 Co-authored-by: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> --------- Co-authored-by: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> --- .../Installers/Configure-PowerShell.ps1 | 29 +++++++++++++++++++ .../Installers/Install-PowerShellModules.ps1 | 8 +---- .../win/scripts/Installers/Install-PyPy.ps1 | 2 -- images/win/windows2019.json | 1 + images/win/windows2022.json | 1 + 5 files changed, 32 insertions(+), 9 deletions(-) create mode 100644 images/win/scripts/Installers/Configure-PowerShell.ps1 diff --git a/images/win/scripts/Installers/Configure-PowerShell.ps1 b/images/win/scripts/Installers/Configure-PowerShell.ps1 new file mode 100644 index 000000000000..98cb83055fe0 --- /dev/null +++ b/images/win/scripts/Installers/Configure-PowerShell.ps1 @@ -0,0 +1,29 @@ +################################################################################ +## File: Configure-Powershell.ps1 +## Desc: Manage PowerShell configuration +################################################################################ + +#region System +Write-Host "Setup PowerShellGet" +Install-PackageProvider -Name NuGet -MinimumVersion 2.8.5.201 -Force + +# Specifies the installation policy +Set-PSRepository -InstallationPolicy Trusted -Name PSGallery +#endregion + +#region User (current user, image generation only) +if (-not (Test-Path $profile)) { + New-Item $profile -ItemType File -Force +} + +@" + if ( -not(Get-Module -ListAvailable -Name PowerHTML)) { + Install-Module PowerHTML -Scope CurrentUser + } + + if ( -not(Get-Module -Name PowerHTML)) { + Import-Module PowerHTML + } +"@ | Add-Content -Path $profile -Force + +#endregion diff --git a/images/win/scripts/Installers/Install-PowerShellModules.ps1 b/images/win/scripts/Installers/Install-PowerShellModules.ps1 index f0afb9e6c916..b3ab7a35df7b 100644 --- a/images/win/scripts/Installers/Install-PowerShellModules.ps1 +++ b/images/win/scripts/Installers/Install-PowerShellModules.ps1 @@ -1,12 +1,6 @@ # Set TLS1.2 [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor "Tls12" -Write-Host "Setup PowerShellGet" -Install-PackageProvider -Name NuGet -MinimumVersion 2.8.5.201 -Force - -# Specifies the installation policy -Set-PSRepository -InstallationPolicy Trusted -Name PSGallery - # Install PowerShell modules $modules = (Get-ToolsetContent).powershellModules @@ -29,4 +23,4 @@ foreach($module in $modules) } Import-Module Pester -Invoke-PesterTests -TestFile "PowerShellModules" -TestName "PowerShellModules" \ No newline at end of file +Invoke-PesterTests -TestFile "PowerShellModules" -TestName "PowerShellModules" diff --git a/images/win/scripts/Installers/Install-PyPy.ps1 b/images/win/scripts/Installers/Install-PyPy.ps1 index fddbf160567b..8b570c195b84 100644 --- a/images/win/scripts/Installers/Install-PyPy.ps1 +++ b/images/win/scripts/Installers/Install-PyPy.ps1 @@ -84,8 +84,6 @@ $toolsetVersions = Get-ToolsetContent | Select-Object -ExpandProperty toolcache $pypyVersions = Invoke-RestMethod https://downloads.python.org/pypy/versions.json # required for html parsing -Install-Module PowerHTML -Scope CurrentUser -Import-Module PowerHTML $checksums = (Invoke-RestMethod -Uri 'https://www.pypy.org/checksums.html' | ConvertFrom-HTML).SelectNodes('//*[@id="content"]/article/div/pre') Write-Host "Starting installation PyPy..." diff --git a/images/win/windows2019.json b/images/win/windows2019.json index 1cb5e2922000..07d3a6f02c32 100644 --- a/images/win/windows2019.json +++ b/images/win/windows2019.json @@ -150,6 +150,7 @@ ], "scripts": [ "{{ template_dir }}/scripts/Installers/Configure-Antivirus.ps1", + "{{ template_dir }}/scripts/Installers/Configure-PowerShell.ps1", "{{ template_dir }}/scripts/Installers/Install-PowerShellModules.ps1", "{{ template_dir }}/scripts/Installers/Install-WindowsFeatures.ps1", "{{ template_dir }}/scripts/Installers/Install-Choco.ps1", diff --git a/images/win/windows2022.json b/images/win/windows2022.json index 7f099c116da4..db4a671f355b 100644 --- a/images/win/windows2022.json +++ b/images/win/windows2022.json @@ -134,6 +134,7 @@ ], "scripts": [ "{{ template_dir }}/scripts/Installers/Configure-Antivirus.ps1", + "{{ template_dir }}/scripts/Installers/Configure-PowerShell.ps1", "{{ template_dir }}/scripts/Installers/Install-PowerShellModules.ps1", "{{ template_dir }}/scripts/Installers/Install-WindowsFeatures.ps1", "{{ template_dir }}/scripts/Installers/Install-Choco.ps1", From c6820d1a5b4a4b1e18b047688f7870db2fbddcbd Mon Sep 17 00:00:00 2001 From: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com> Date: Fri, 6 Oct 2023 12:22:00 +0200 Subject: [PATCH 2296/3485] [windows] add SQL LocalDB warmup (#8435) --- images/win/scripts/Installers/Warmup-User.ps1 | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/images/win/scripts/Installers/Warmup-User.ps1 b/images/win/scripts/Installers/Warmup-User.ps1 index 3ffcbb80876b..fffb1fd7ce4f 100644 --- a/images/win/scripts/Installers/Warmup-User.ps1 +++ b/images/win/scripts/Installers/Warmup-User.ps1 @@ -29,5 +29,22 @@ if (-not(Test-Path -Path $registryKeyPath)) { New-ItemProperty -Path $RegistryKeyPath -Name CacheType -PropertyType DWORD -Value 0 reg.exe copy HKCU\Software\TortoiseSVN HKLM\DEFAULT\Software\TortoiseSVN /s + +# warmup SQL LocalDB +# https://github.com/actions/runner-images/issues/8164 + +sqllocaldb create MSSQLLocalDB + +$localDBInstance = Get-ChildItem -Path 'HKCU:\Software\Microsoft\Microsoft SQL Server\UserInstances' +$instanceName = ($localDBInstance.Name).Split('\').where({ $true },'Last') +$instancePath = 'HKCU:\Software\Microsoft\Microsoft SQL Server\UserInstances\' + $instanceName +$dataDirectory = (Get-ItemProperty -Path $instancePath -Name 'DataDirectory').DataDirectory +$localDBPath = 'C:\LocalDB' +New-Item -ItemType 'Directory' -Path $localDBPath +Move-Item -Path "$dataDirectory\*" -Destination $localDBPath +Set-ItemProperty -Path $instancePath -Name 'DataDirectory' -Value $localDBPath + +reg.exe copy 'HKCU\Software\Microsoft\Microsoft SQL Server' 'HKLM\DEFAULT\Software\Microsoft\Microsoft SQL Server' /s + reg.exe unload HKLM\DEFAULT Write-Host "Warmup-User.ps1 - completed" From 23ff0d746804fc3c0ac7f961f2fbca953824c775 Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Fri, 6 Oct 2023 15:51:08 +0200 Subject: [PATCH 2297/3485] Add GitHub ci workflows (#8464) --- .github/workflows/ci-cleanup.yml | 48 +++++++++++++++++++ .../workflows/trigger-ubuntu-win-build.yml | 47 ++++++++++++++++++ .github/workflows/ubuntu2004.yml | 20 ++++++++ .github/workflows/ubuntu2204.yml | 20 ++++++++ .github/workflows/windows2019.yml | 20 ++++++++ .github/workflows/windows2022.yml | 20 ++++++++ 6 files changed, 175 insertions(+) create mode 100644 .github/workflows/ci-cleanup.yml create mode 100644 .github/workflows/trigger-ubuntu-win-build.yml create mode 100644 .github/workflows/ubuntu2004.yml create mode 100644 .github/workflows/ubuntu2204.yml create mode 100644 .github/workflows/windows2019.yml create mode 100644 .github/workflows/windows2022.yml diff --git a/.github/workflows/ci-cleanup.yml b/.github/workflows/ci-cleanup.yml new file mode 100644 index 000000000000..3b532e4cc672 --- /dev/null +++ b/.github/workflows/ci-cleanup.yml @@ -0,0 +1,48 @@ +run-name: Cleanup ${{ github.head_ref }} +on: + pull_request_target: + types: labeled + paths: + - 'images/**' + +jobs: + clean_ci: + name: Clean CI runs + runs-on: ubuntu-latest + permissions: + actions: write + steps: + - env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + shell: pwsh + run: | + $startDate = Get-Date -UFormat %s + $workflows = @("macos11", "macos12", "ubuntu2004", "ubuntu2204", "windows2019", "windows2022") + while ($true) { + $continue = $false + foreach ($wf in $workflows) { + $skippedCommand = "gh run list --workflow ${wf}.yml --branch ${{ github.event.pull_request.head.ref }} --repo ${{ github.repository }} --status skipped --json databaseId" + $skippedIds = Invoke-Expression -Command $skippedCommand | ConvertFrom-Json | ForEach-Object { $_.databaseId } + $skippedIds | ForEach-Object { + $deleteCommand = "gh run delete --repo ${{ github.repository }} $_" + Invoke-Expression -Command $deleteCommand + } + $pendingCommand = "gh run list --workflow ${wf}.yml --branch ${{ github.event.pull_request.head.ref }} --repo ${{ github.repository }} --status requested --json databaseId --template '{{ . | len }}'" + $pending = Invoke-Expression -Command $pendingCommand + if ($pending -gt 0) { + Write-Host "Pending for ${wf}.yml: $pending run(s)" + $continue = $true + } + } + if ($continue -eq $false) { + Write-Host "All done, exiting" + break + } + $curDate = Get-Date -UFormat %s + if (($curDate - $startDate) -gt 60) { + Write-Host "Reached timeout, exiting" + break + } + Write-Host "Waiting 5 seconds..." + Start-Sleep -Seconds 5 + } diff --git a/.github/workflows/trigger-ubuntu-win-build.yml b/.github/workflows/trigger-ubuntu-win-build.yml new file mode 100644 index 000000000000..973a325f01f3 --- /dev/null +++ b/.github/workflows/trigger-ubuntu-win-build.yml @@ -0,0 +1,47 @@ +name: Trigger Build workflow + +on: + workflow_call: + inputs: + image_type: + required: true + type: string + +defaults: + run: + shell: pwsh + +jobs: + trigger-workflow: + runs-on: ubuntu-latest + steps: + - name: Trigger Build workflow + env: + CI_PR_TOKEN: ${{ secrets.CI_PR_TOKEN }} + PR_TITLE: ${{ github.event.pull_request.title }} + CI_PR: ${{ secrets.CI_REPO }} + run: | + $headers = @{ + Authorization="Bearer $env:CI_PR_TOKEN" + } + + # Private repository for builds + $apiRepoUrl = "https://api.github.com/repos/$env:CI_PR" + + $eventType = "trigger-${{ inputs.image_type }}-build" + $body = @{ + event_type = $eventType; + client_payload = @{ + pr_title = "$env:PR_TITLE" + custom_repo = "${{ github.event.pull_request.head.repo.full_name }}" + custom_repo_commit_hash = "${{ github.event.pull_request.head.sha }}" + } + } + + $bodyString = $body | ConvertTo-Json + + try { + Invoke-WebRequest -Uri "$apiRepoUrl/dispatches" -Method Post -Headers $headers -Body $bodyString | Out-Null + } catch { + throw "$($_.exception[0].message)" + } diff --git a/.github/workflows/ubuntu2004.yml b/.github/workflows/ubuntu2004.yml new file mode 100644 index 000000000000..cfe71fd34105 --- /dev/null +++ b/.github/workflows/ubuntu2004.yml @@ -0,0 +1,20 @@ +name: Trigger Ubuntu20.04 CI +run-name: Ubuntu20.04 - ${{ github.event.pull_request.title }} + +on: + pull_request_target: + types: labeled + paths: + - 'images/linux/**' + +defaults: + run: + shell: pwsh + +jobs: + Ubuntu_2004: + if: contains(github.event.pull_request.labels.*.name, 'CI ubuntu-all') || contains(github.event.pull_request.labels.*.name, 'CI ubuntu-2004') + uses: ./.github/workflows/trigger-ubuntu-win-build.yml + with: + image_type: 'ubuntu2004' + secrets: inherit diff --git a/.github/workflows/ubuntu2204.yml b/.github/workflows/ubuntu2204.yml new file mode 100644 index 000000000000..634bb536986c --- /dev/null +++ b/.github/workflows/ubuntu2204.yml @@ -0,0 +1,20 @@ +name: Trigger Ubuntu22.04 CI +run-name: Ubuntu22.04 - ${{ github.event.pull_request.title }} + +on: + pull_request_target: + types: labeled + paths: + - 'images/linux/**' + +defaults: + run: + shell: pwsh + +jobs: + Ubuntu_2204: + if: contains(github.event.pull_request.labels.*.name, 'CI ubuntu-all') || contains(github.event.pull_request.labels.*.name, 'CI ubuntu-2204') + uses: ./.github/workflows/trigger-ubuntu-win-build.yml + with: + image_type: 'ubuntu2204' + secrets: inherit diff --git a/.github/workflows/windows2019.yml b/.github/workflows/windows2019.yml new file mode 100644 index 000000000000..72ba473399ce --- /dev/null +++ b/.github/workflows/windows2019.yml @@ -0,0 +1,20 @@ +name: Trigger Windows19 CI +run-name: Windows2019 - ${{ github.event.pull_request.title }} + +on: + pull_request_target: + types: labeled + paths: + - 'images/win/**' + +defaults: + run: + shell: pwsh + +jobs: + Windows_2019: + if: contains(github.event.pull_request.labels.*.name, 'CI windows-all') || contains(github.event.pull_request.labels.*.name, 'CI windows-2019') + uses: ./.github/workflows/trigger-ubuntu-win-build.yml + with: + image_type: 'windows2019' + secrets: inherit diff --git a/.github/workflows/windows2022.yml b/.github/workflows/windows2022.yml new file mode 100644 index 000000000000..0454811e293d --- /dev/null +++ b/.github/workflows/windows2022.yml @@ -0,0 +1,20 @@ +name: Trigger Windows22 CI +run-name: Windows2022 - ${{ github.event.pull_request.title }} + +on: + pull_request_target: + types: labeled + paths: + - 'images/win/**' + +defaults: + run: + shell: pwsh + +jobs: + Windows_2022: + if: contains(github.event.pull_request.labels.*.name, 'CI windows-all') || contains(github.event.pull_request.labels.*.name, 'CI windows-2022') + uses: ./.github/workflows/trigger-ubuntu-win-build.yml + with: + image_type: 'windows2022' + secrets: inherit From ddebd052570b5d488b2caaedba6d34e4a9d02f2b Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Mon, 9 Oct 2023 10:55:12 +0200 Subject: [PATCH 2298/3485] [Windows] Use function to get selenium asset url (#8448) --- .../scripts/ImageHelpers/InstallHelpers.ps1 | 42 +++++++++++++------ .../Installers/Install-IEWebDriver.ps1 | 20 +++++---- .../scripts/Installers/Install-Selenium.ps1 | 9 +++- 3 files changed, 48 insertions(+), 23 deletions(-) diff --git a/images/win/scripts/ImageHelpers/InstallHelpers.ps1 b/images/win/scripts/ImageHelpers/InstallHelpers.ps1 index e5499625630e..ffedcff5ff04 100644 --- a/images/win/scripts/ImageHelpers/InstallHelpers.ps1 +++ b/images/win/scripts/ImageHelpers/InstallHelpers.ps1 @@ -617,6 +617,7 @@ function Get-GitHubPackageDownloadUrl { [string]$Version, [string]$UrlFilter, [boolean]$IsPrerelease = $false, + [boolean]$LatestReleaseOnly = $true, [int]$SearchInCount = 100 ) @@ -626,20 +627,35 @@ function Get-GitHubPackageDownloadUrl { $json = Invoke-RestMethod -Uri "https://api.github.com/repos/${RepoOwner}/${RepoName}/releases?per_page=${SearchInCount}" $tags = $json.Where{ $_.prerelease -eq $IsPrerelease -and $_.assets }.tag_name - $versionToDownload = $tags | - Select-String -Pattern "\d+.\d+.\d+" | - ForEach-Object { $_.Matches.Value } | - Where-Object { $_ -like "$Version.*" -or $_ -eq $Version } | - Sort-Object { [version]$_ } | - Select-Object -Last 1 - - if (-not $versionToDownload) { - Write-Host "Failed to get a tag name from ${RepoOwner}/${RepoName} releases" - exit 1 + $availableVersions = $tags | + Select-String -Pattern "\d+.\d+.\d+" | + ForEach-Object { $_.Matches.Value } | + Where-Object { $_ -like "$Version.*" -or $_ -eq $Version } | + Sort-Object -Descending { [version]$_ } + + if (-not $availableVersions) { + throw "Failed to get available versions from ${RepoOwner}/${RepoName} releases" + } + + if ($LatestReleaseOnly) { + $latestVersion = $availableVersions | Select-Object -First 1 + $urlFilterReplaced = $UrlFilter -replace "{BinaryName}", $BinaryName -replace "{Version}", $latestVersion + $downloadUrl = $json.assets.browser_download_url -like $urlFilterReplaced + } else { + foreach ($version in $availableVersions) { + $urlFilterReplaced = $UrlFilter -replace "{BinaryName}", $BinaryName -replace "{Version}", $version + $downloadUrl = $json.assets.browser_download_url -like $urlFilterReplaced + + if ($downloadUrl) { + Write-Host "Found download url for ${RepoOwner}/${RepoName} ${BinaryName} ${version}" + break + } + } } - $UrlFilter = $UrlFilter -replace "{BinaryName}",$BinaryName -replace "{Version}",$versionToDownload - $downloadUrl = $json.assets.browser_download_url -like $UrlFilter + if (-not $downloadUrl) { + throw "Failed to get download url for ${RepoOwner}/${RepoName} ${BinaryName}" + } return $downloadUrl } @@ -720,4 +736,4 @@ function Test-FileSignature { } Write-Output "Signature for $FilePath is valid" -} \ No newline at end of file +} diff --git a/images/win/scripts/Installers/Install-IEWebDriver.ps1 b/images/win/scripts/Installers/Install-IEWebDriver.ps1 index afc533697f80..e7d34f632c4b 100644 --- a/images/win/scripts/Installers/Install-IEWebDriver.ps1 +++ b/images/win/scripts/Installers/Install-IEWebDriver.ps1 @@ -1,18 +1,22 @@ ################################################################################ -## File: Install-SeleniumWebDrivers.ps1 -## Desc: Install Selenium Web Drivers +## File: Install-IEWebDriver.ps1 +## Desc: Install IE Web Driver ################################################################################ - -$json = Invoke-RestMethod -Uri "https://api.github.com/repos/SeleniumHQ/selenium/releases?per_page=100" -$ieDriverUrl = $json.Where{-not $_.prerelease}.assets.browser_download_url | Where-Object { $_ -like "*IEDriverServer_x64_*.zip" } | Select-Object -First 1 +$seleniumMajorVersion = (Get-ToolsetContent).selenium.version +$ieDriverUrl = Get-GitHubPackageDownloadUrl ` + -RepoOwner "SeleniumHQ" ` + -RepoName "selenium" ` + -BinaryName "IEDriverServer_x64" ` + -Version $seleniumMajorVersion ` + -UrlFilter "*{BinaryName}_{Version}.zip" ` + -LatestReleaseOnly $false # Download IE selenium driver try { Write-Host "Selenium IEDriverServer download and install..." $driverZipFile = Start-DownloadWithRetry -Url $ieDriverUrl -Name "SeleniumWebDrivers.zip" -} -catch { +} catch { Write-Error "[!] Failed to download $ieDriverUrl" exit 1 } @@ -31,4 +35,4 @@ Write-Host "Get the IEDriver version..." Write-Host "Setting the IEWebDriver environment variables" setx IEWebDriver $ieDriverPath /M -Invoke-PesterTests -TestFile "Browsers" -TestName "Internet Explorer" \ No newline at end of file +Invoke-PesterTests -TestFile "Browsers" -TestName "Internet Explorer" diff --git a/images/win/scripts/Installers/Install-Selenium.ps1 b/images/win/scripts/Installers/Install-Selenium.ps1 index 0214e16c1b53..7a1043f660ba 100644 --- a/images/win/scripts/Installers/Install-Selenium.ps1 +++ b/images/win/scripts/Installers/Install-Selenium.ps1 @@ -11,8 +11,13 @@ New-Item -ItemType directory -Path $seleniumDirectory $seleniumMajorVersion = (Get-ToolsetContent).selenium.version $seleniumBinaryName = (Get-ToolsetContent).selenium.binary_name $seleniumFileName = "$seleniumBinaryName.jar" -$json = Invoke-RestMethod -Uri "https://api.github.com/repos/SeleniumHQ/selenium/releases?per_page=100" -$seleniumDownloadUrl = $json.Where{-not $_.prerelease}.assets.browser_download_url | Where-Object { $_ -like "*${seleniumBinaryName}-${seleniumMajorVersion}.*jar" } | Select-Object -First 1 + +$seleniumDownloadUrl = Get-GitHubPackageDownloadUrl ` + -RepoOwner "SeleniumHQ" ` + -RepoName "selenium" ` + -BinaryName "$seleniumBinaryName" ` + -Version $seleniumMajorVersion ` + -UrlFilter "*{BinaryName}-{Version}.jar" Start-DownloadWithRetry -Url $seleniumDownloadUrl -Name $seleniumFileName -DownloadPath $seleniumDirectory From d71a0fe1a5d2b8e47382710f40a24bbb3eb75d3b Mon Sep 17 00:00:00 2001 From: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com> Date: Mon, 9 Oct 2023 11:47:56 +0200 Subject: [PATCH 2299/3485] [windows] actually suppress output of "az devops login" (#8492) --- images/win/scripts/Installers/Install-AzureDevOpsCli.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/win/scripts/Installers/Install-AzureDevOpsCli.ps1 b/images/win/scripts/Installers/Install-AzureDevOpsCli.ps1 index 05368f26f40f..cc2a11dcdc7e 100644 --- a/images/win/scripts/Installers/Install-AzureDevOpsCli.ps1 +++ b/images/win/scripts/Installers/Install-AzureDevOpsCli.ps1 @@ -36,7 +36,7 @@ Write-Host "Warmup 'az-devops'" } # calling az devops login to force it to install `keyring`. Login will actually fail, redirecting error to null -Write-Host 'fake token' | az devops login | Out-Null +Write-Output 'fake token' | az devops login | Out-Null # calling az devops logout to be sure no credentials remain. az devops logout | out-null From 804736733e1b44ddbe952c12dced2a081eb00b29 Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Mon, 9 Oct 2023 15:34:51 +0200 Subject: [PATCH 2300/3485] [macos13] Fix preimagedata for arm64 (#8488) --- images/macos/provision/configuration/preimagedata.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/images/macos/provision/configuration/preimagedata.sh b/images/macos/provision/configuration/preimagedata.sh index de95e4b9f597..47cc926c4e2e 100644 --- a/images/macos/provision/configuration/preimagedata.sh +++ b/images/macos/provision/configuration/preimagedata.sh @@ -2,6 +2,7 @@ source ~/utils/utils.sh +arch=$(get_arch) imagedata_file="$HOME/imagedata.json" image_version=$(echo $IMAGE_VERSION | cut -d _ -f 2) os_name=$(sw_vers -productName) @@ -9,7 +10,11 @@ os_version=$(sw_vers -productVersion) os_build=$(sw_vers -buildVersion) label_version=$(echo $os_version | cut -d. -f1) -image_label="macos-${label_version}" +if [[ $arch == "arm64" ]]; then + image_label="macos-${label_version}-arm64" +else + image_label="macos-${label_version}" +fi release_label="macOS-${label_version}" if is_Ventura; then @@ -34,4 +39,4 @@ cat <<EOF > $imagedata_file EOF echo "export ImageVersion=$image_version" >> $HOME/.bashrc -echo "export ImageOS=$IMAGE_OS" >> $HOME/.bashrc \ No newline at end of file +echo "export ImageOS=$IMAGE_OS" >> $HOME/.bashrc From 99642f1c19c2aec7ceca264972ade9c910fdcf70 Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Mon, 9 Oct 2023 15:39:39 +0200 Subject: [PATCH 2301/3485] [macos] Add activesupport gem workaround for cocoapods (#8497) --- images/macos/provision/core/rubygem.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/macos/provision/core/rubygem.sh b/images/macos/provision/core/rubygem.sh index 237c2f52a64c..da587914b169 100755 --- a/images/macos/provision/core/rubygem.sh +++ b/images/macos/provision/core/rubygem.sh @@ -12,7 +12,7 @@ if [ -n "$gemsToInstall" ]; then done fi -# Temporary uninstall public_suffix 5.0 gem as Cocoapods is not compatible with it yet https://github.com/actions/runner-images/issues/6149 -gem uninstall public_suffix -v 5.0.0 +# Temporarily install activesupport 7.0.8 due to compatibility issues with cocoapods https://github.com/CocoaPods/CocoaPods/issues/12081 +gem install activesupport -v 7.0.8 && gem uninstall activesupport -v 7.1.0 invoke_tests "RubyGem" From 2ac4c5a6fd017a898c0d6e3ae049b074c46e5f1d Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Mon, 9 Oct 2023 15:47:15 +0200 Subject: [PATCH 2302/3485] [Ubuntu] Change destination for toolcache assets (#8485) --- images/linux/scripts/installers/Install-Toolset.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/linux/scripts/installers/Install-Toolset.ps1 b/images/linux/scripts/installers/Install-Toolset.ps1 index e53bf87b3150..87c14f512ea8 100644 --- a/images/linux/scripts/installers/Install-Toolset.ps1 +++ b/images/linux/scripts/installers/Install-Toolset.ps1 @@ -14,7 +14,7 @@ Function Install-Asset { wget $ReleaseAsset.download_url -nv --retry-connrefused --tries=10 Write-Host "Extract $($ReleaseAsset.filename) content..." - $assetFolderPath = Join-Path $env:INSTALLER_SCRIPT_FOLDER $($ReleaseAsset.filename) + $assetFolderPath = Join-Path "/tmp" $($ReleaseAsset.filename) New-Item -ItemType Directory -Path $assetFolderPath tar -xzf $ReleaseAsset.filename -C $assetFolderPath From cb397d0be961c68d68749aefd4863e59c2fc83a3 Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Tue, 10 Oct 2023 09:02:52 +0200 Subject: [PATCH 2303/3485] [windows] Fix code style in Install-VCRedist.ps1 (#8496) --- .../scripts/Installers/Install-VCRedist.ps1 | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/images/win/scripts/Installers/Install-VCRedist.ps1 b/images/win/scripts/Installers/Install-VCRedist.ps1 index 469dd24d1654..41a62f7d28ba 100644 --- a/images/win/scripts/Installers/Install-VCRedist.ps1 +++ b/images/win/scripts/Installers/Install-VCRedist.ps1 @@ -1,10 +1,15 @@ -# Install vcredist2010 -$Vc2010x86Name = "vcredist_x86.exe" -$Vc2010x86URI = "https://download.microsoft.com/download/1/6/5/165255E7-1014-4D0A-B094-B6A430A6BFFC/${Vc2010x86Name}" -$Vc2010x64Name = "vcredist_x64.exe" -$Vc2010x64URI = "https://download.microsoft.com/download/1/6/5/165255E7-1014-4D0A-B094-B6A430A6BFFC/${Vc2010x64Name}" -$ArgumentList = ("/install", "/quiet", "/norestart") -Install-Binary -Url $Vc2010x86URI -Name $Vc2010x86Name -ArgumentList $ArgumentList -Install-Binary -Url $Vc2010x64URI -Name $Vc2010x64Name -ArgumentList $ArgumentList +################################################################################ +## File: Install-VCRedist.ps1 +## Desc: Install Visual C++ Redistributable +################################################################################ + +$vc2010x86Name = "vcredist_x86.exe" +$vc2010x86URI = "https://download.microsoft.com/download/1/6/5/165255E7-1014-4D0A-B094-B6A430A6BFFC/${vc2010x86Name}" +$vc2010x64Name = "vcredist_x64.exe" +$vc2010x64URI = "https://download.microsoft.com/download/1/6/5/165255E7-1014-4D0A-B094-B6A430A6BFFC/${Vc2010x64Name}" +$argumentList = ("/install", "/quiet", "/norestart") + +Install-Binary -Url $vc2010x86URI -Name $vc2010x86Name -ArgumentList $argumentList +Install-Binary -Url $vc2010x64URI -Name $vc2010x64Name -ArgumentList $argumentList Invoke-PesterTests -TestFile "Tools" -TestName "VCRedist" From 92111d1caa900fb324c0723a536925df20a64b73 Mon Sep 17 00:00:00 2001 From: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com> Date: Tue, 10 Oct 2023 13:48:18 +0200 Subject: [PATCH 2304/3485] [windows] create powershell modules cache permanently (#8495) --- images/win/scripts/Installers/Configure-PowerShell.ps1 | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/images/win/scripts/Installers/Configure-PowerShell.ps1 b/images/win/scripts/Installers/Configure-PowerShell.ps1 index 98cb83055fe0..32fdb0310051 100644 --- a/images/win/scripts/Installers/Configure-PowerShell.ps1 +++ b/images/win/scripts/Installers/Configure-PowerShell.ps1 @@ -9,6 +9,15 @@ Install-PackageProvider -Name NuGet -MinimumVersion 2.8.5.201 -Force # Specifies the installation policy Set-PSRepository -InstallationPolicy Trusted -Name PSGallery + +Write-Host 'Warmup PSModuleAnalysisCachePath (speedup first powershell invocation by 20s)' +$PSModuleAnalysisCachePath = 'C:\PSModuleAnalysisCachePath\ModuleAnalysisCache' + +[Environment]::SetEnvironmentVariable('PSModuleAnalysisCachePath', $PSModuleAnalysisCachePath, [System.EnvironmentVariableTarget]::Machine) +# make variable to be available in the current session +${env:PSModuleAnalysisCachePath} = $PSModuleAnalysisCachePath + +$null = New-Item -Path $PSModuleAnalysisCachePath -ItemType 'File' -Force #endregion #region User (current user, image generation only) From 4d6ce38166b6942984d53fc83a0a71593c2d82ee Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Tue, 10 Oct 2023 13:52:01 +0200 Subject: [PATCH 2305/3485] [Ubuntu] Pin Terraform 1.5.7 (#8504) --- images/linux/scripts/installers/terraform.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/images/linux/scripts/installers/terraform.sh b/images/linux/scripts/installers/terraform.sh index 0e8f5553713b..9e424a3e9e8b 100644 --- a/images/linux/scripts/installers/terraform.sh +++ b/images/linux/scripts/installers/terraform.sh @@ -7,10 +7,12 @@ source $HELPER_SCRIPTS/install.sh # Install Terraform -URL=$(curl -fsSL https://api.releases.hashicorp.com/v1/releases/terraform/latest | jq -r '.builds[] | select((.arch=="amd64") and (.os=="linux")).url') +# Pin Terraform until v1.6.1 is released +# Ref: https://github.com/hashicorp/terraform/issues/33977 +URL=$(curl -fsSL https://api.releases.hashicorp.com/v1/releases/terraform/1.5.7 | jq -r '.builds[] | select((.arch=="amd64") and (.os=="linux")).url') ZIP_NAME="terraform_linux_amd64.zip" download_with_retries "${URL}" "/tmp" "${ZIP_NAME}" unzip -qq "/tmp/${ZIP_NAME}" -d /usr/local/bin rm -f "/tmp/${ZIP_NAME}" -invoke_tests "Tools" "Terraform" \ No newline at end of file +invoke_tests "Tools" "Terraform" From a50d7b432d4f6cd1b86c516afab7f41a9940b824 Mon Sep 17 00:00:00 2001 From: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com> Date: Tue, 10 Oct 2023 15:26:22 +0200 Subject: [PATCH 2306/3485] [windows] reverting SQL LocalDB warmup (#8505) --- images/win/scripts/Installers/Warmup-User.ps1 | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/images/win/scripts/Installers/Warmup-User.ps1 b/images/win/scripts/Installers/Warmup-User.ps1 index fffb1fd7ce4f..3ffcbb80876b 100644 --- a/images/win/scripts/Installers/Warmup-User.ps1 +++ b/images/win/scripts/Installers/Warmup-User.ps1 @@ -29,22 +29,5 @@ if (-not(Test-Path -Path $registryKeyPath)) { New-ItemProperty -Path $RegistryKeyPath -Name CacheType -PropertyType DWORD -Value 0 reg.exe copy HKCU\Software\TortoiseSVN HKLM\DEFAULT\Software\TortoiseSVN /s - -# warmup SQL LocalDB -# https://github.com/actions/runner-images/issues/8164 - -sqllocaldb create MSSQLLocalDB - -$localDBInstance = Get-ChildItem -Path 'HKCU:\Software\Microsoft\Microsoft SQL Server\UserInstances' -$instanceName = ($localDBInstance.Name).Split('\').where({ $true },'Last') -$instancePath = 'HKCU:\Software\Microsoft\Microsoft SQL Server\UserInstances\' + $instanceName -$dataDirectory = (Get-ItemProperty -Path $instancePath -Name 'DataDirectory').DataDirectory -$localDBPath = 'C:\LocalDB' -New-Item -ItemType 'Directory' -Path $localDBPath -Move-Item -Path "$dataDirectory\*" -Destination $localDBPath -Set-ItemProperty -Path $instancePath -Name 'DataDirectory' -Value $localDBPath - -reg.exe copy 'HKCU\Software\Microsoft\Microsoft SQL Server' 'HKLM\DEFAULT\Software\Microsoft\Microsoft SQL Server' /s - reg.exe unload HKLM\DEFAULT Write-Host "Warmup-User.ps1 - completed" From f35025b90ea9e760f5d1ea72915dd7520896c1f8 Mon Sep 17 00:00:00 2001 From: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com> Date: Tue, 10 Oct 2023 15:27:13 +0200 Subject: [PATCH 2307/3485] [windows] ignore error on copying user profile warmup (#8493) --- images/win/scripts/Installers/Warmup-User.ps1 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/images/win/scripts/Installers/Warmup-User.ps1 b/images/win/scripts/Installers/Warmup-User.ps1 index 3ffcbb80876b..4cb9808e66fb 100644 --- a/images/win/scripts/Installers/Warmup-User.ps1 +++ b/images/win/scripts/Installers/Warmup-User.ps1 @@ -15,7 +15,8 @@ $devEnvPath = "$vsInstallRoot\Common7\IDE\devenv.exe" cmd.exe /c "`"$devEnvPath`" /updateconfiguration" -Copy-Item ${env:USERPROFILE}\AppData\Local\Microsoft\VisualStudio -Destination c:\users\default\AppData\Local\Microsoft\VisualStudio -Recurse +# we are fine if some file is locked and cannot be copied +Copy-Item ${env:USERPROFILE}\AppData\Local\Microsoft\VisualStudio -Destination c:\users\default\AppData\Local\Microsoft\VisualStudio -Recurse -ErrorAction SilentlyContinue reg.exe load HKLM\DEFAULT c:\users\default\ntuser.dat reg.exe copy HKCU\Software\Microsoft\VisualStudio HKLM\DEFAULT\Software\Microsoft\VisualStudio /s From 929931f61727947eb60ba4ecae57fe82202728ed Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Tue, 10 Oct 2023 16:14:09 +0200 Subject: [PATCH 2308/3485] Remove Python 3.12 from the toolcache (#8510) --- images/linux/toolsets/toolset-2004.json | 3 +-- images/linux/toolsets/toolset-2204.json | 3 +-- images/macos/toolsets/toolset-11.json | 3 +-- images/macos/toolsets/toolset-12.json | 3 +-- images/macos/toolsets/toolset-13.json | 6 ++---- images/win/toolsets/toolset-2019.json | 3 +-- images/win/toolsets/toolset-2022.json | 3 +-- 7 files changed, 8 insertions(+), 16 deletions(-) diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index fb6d5578c13c..7eaa4a0dc5ae 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -11,8 +11,7 @@ "3.8.*", "3.9.*", "3.10.*", - "3.11.*", - "3.12.*" + "3.11.*" ] }, { diff --git a/images/linux/toolsets/toolset-2204.json b/images/linux/toolsets/toolset-2204.json index 522db3d2060c..2516d02c3aa6 100644 --- a/images/linux/toolsets/toolset-2204.json +++ b/images/linux/toolsets/toolset-2204.json @@ -11,8 +11,7 @@ "3.8.*", "3.9.*", "3.10.*", - "3.11.*", - "3.12.*" + "3.11.*" ] }, { diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index afc662567871..40c2546be716 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -243,8 +243,7 @@ "3.8.*", "3.9.*", "3.10.*", - "3.11.*", - "3.12.*" + "3.11.*" ] } } diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index f216c7df6469..aa36b1b36609 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -230,8 +230,7 @@ "3.8.*", "3.9.*", "3.10.*", - "3.11.*", - "3.12.*" + "3.11.*" ] } } diff --git a/images/macos/toolsets/toolset-13.json b/images/macos/toolsets/toolset-13.json index 69eac0bd6ee1..71ba5f937043 100644 --- a/images/macos/toolsets/toolset-13.json +++ b/images/macos/toolsets/toolset-13.json @@ -119,14 +119,12 @@ "3.8.*", "3.9.*", "3.10.*", - "3.11.*", - "3.12.*" + "3.11.*" ] }, "arm64": { "versions": [ - "3.11.*", - "3.12.*" + "3.11.*" ] } } diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index a0b65ab8cb54..823b25f10d66 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -38,8 +38,7 @@ "3.8.*", "3.9.*", "3.10.*", - "3.11.*", - "3.12.*" + "3.11.*" ] }, { diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index dbd241475fff..1a9625cd5fae 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -36,8 +36,7 @@ "3.8.*", "3.9.*", "3.10.*", - "3.11.*", - "3.12.*" + "3.11.*" ] }, { From 47a634e28bd7010e83a3a0be4d8837bae9c0a566 Mon Sep 17 00:00:00 2001 From: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com> Date: Wed, 11 Oct 2023 11:01:06 +0200 Subject: [PATCH 2309/3485] [windows] implement checksum validation for Miniconda (#8506) --- .../scripts/Installers/Install-Miniconda.ps1 | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/images/win/scripts/Installers/Install-Miniconda.ps1 b/images/win/scripts/Installers/Install-Miniconda.ps1 index 26131081652f..746723e5c5a5 100644 --- a/images/win/scripts/Installers/Install-Miniconda.ps1 +++ b/images/win/scripts/Installers/Install-Miniconda.ps1 @@ -1,6 +1,7 @@ ################################################################################ ## File: Install-Miniconda.ps1 ## Desc: Install the latest version of Miniconda and set $env:CONDA +## Supply chain security: checksum validation ################################################################################ $CondaDestination = "C:\Miniconda" @@ -13,4 +14,19 @@ $ArgumentList = ("/S", "/AddToPath=0", "/RegisterPython=0", "/D=$CondaDestinatio Install-Binary -Url $InstallerUrl -Name $InstallerName -ArgumentList $ArgumentList Set-SystemVariable -SystemVariable "CONDA" -Value $CondaDestination -Invoke-PesterTests -TestFile "Miniconda" \ No newline at end of file +#region Supply chain security +$localFileHash = (Get-FileHash -Path (Join-Path ${env:TEMP} $installerName) -Algorithm SHA256).Hash +$distributorFileHash = $null + +$checksums = (Invoke-RestMethod -Uri 'https://repo.anaconda.com/miniconda/' | ConvertFrom-HTML).SelectNodes('//html/body/table/tr') + +ForEach($node in $checksums) { + if ($node.ChildNodes[1].InnerText -eq $InstallerName) { + $distributorFileHash = $node.ChildNodes[7].InnerText + } +} + +Use-ChecksumComparison -LocalFileHash $localFileHash -DistributorFileHash $distributorFileHash +#endregion + +Invoke-PesterTests -TestFile "Miniconda" From 6315b7ed2c677bbbce41cbe2cc10e33283293fb2 Mon Sep 17 00:00:00 2001 From: sergei-pyshnoi <121864472+sergei-pyshnoi@users.noreply.github.com> Date: Wed, 11 Oct 2023 11:02:59 +0200 Subject: [PATCH 2310/3485] [Windows] Add signature validation (#8390) --- .../scripts/ImageHelpers/ImageHelpers.psm1 | 1 + .../scripts/ImageHelpers/InstallHelpers.ps1 | 28 ++++++++++++------- .../ImageHelpers/VisualStudioHelpers.ps1 | 8 ++++-- images/win/scripts/Installers/Install-AWS.ps1 | 3 +- .../scripts/Installers/Install-AzureCli.ps1 | 3 +- .../Install-AzureCosmosDbEmulator.ps1 | 5 ++-- .../Install-BizTalkBuildComponent.ps1 | 7 ++++- .../win/scripts/Installers/Install-Choco.ps1 | 7 +++-- .../win/scripts/Installers/Install-Chrome.ps1 | 5 ++-- .../Installers/Install-CloudFoundryCli.ps1 | 6 +++- .../win/scripts/Installers/Install-DACFx.ps1 | 5 ++-- .../win/scripts/Installers/Install-Edge.ps1 | 5 ++++ .../scripts/Installers/Install-Firefox.ps1 | 6 +++- .../Installers/Install-GoogleCloudCLI.ps1 | 4 ++- .../Installers/Install-NET48-devpack.ps1 | 5 ++-- .../win/scripts/Installers/Install-NET48.ps1 | 3 +- .../scripts/Installers/Install-PostgreSQL.ps1 | 4 +-- .../Installers/Install-SQLPowerShellTools.ps1 | 7 +++-- .../Installers/Install-ServiceFabricSDK.ps1 | 6 ++-- .../scripts/Installers/Install-VCRedist.ps1 | 5 ++-- images/win/scripts/Installers/Install-VS.ps1 | 23 +++++++++------ images/win/scripts/Installers/Install-WDK.ps1 | 7 +++-- .../Install-WebPlatformInstaller.ps1 | 5 ++-- .../Installers/Install-WinAppDriver.ps1 | 3 +- images/win/toolsets/toolset-2019.json | 10 +++++-- images/win/toolsets/toolset-2022.json | 10 +++++-- 26 files changed, 122 insertions(+), 59 deletions(-) diff --git a/images/win/scripts/ImageHelpers/ImageHelpers.psm1 b/images/win/scripts/ImageHelpers/ImageHelpers.psm1 index f2ae79e4cf58..76c31bb1fb93 100644 --- a/images/win/scripts/ImageHelpers/ImageHelpers.psm1 +++ b/images/win/scripts/ImageHelpers/ImageHelpers.psm1 @@ -57,4 +57,5 @@ Export-ModuleMember -Function @( 'Get-ModuleVersionAsJob' 'Use-ChecksumComparison' 'Get-HashFromGitHubReleaseBody' + 'Test-FileSignature' ) diff --git a/images/win/scripts/ImageHelpers/InstallHelpers.ps1 b/images/win/scripts/ImageHelpers/InstallHelpers.ps1 index ffedcff5ff04..a40202530e89 100644 --- a/images/win/scripts/ImageHelpers/InstallHelpers.ps1 +++ b/images/win/scripts/ImageHelpers/InstallHelpers.ps1 @@ -29,7 +29,7 @@ function Install-Binary [Parameter(Mandatory, ParameterSetName="LocalPath")] [String] $FilePath, [String[]] $ArgumentList, - [String] $ExpectedSignature + [String[]] $ExpectedSignature ) if ($PSCmdlet.ParameterSetName -eq "LocalPath") @@ -47,14 +47,13 @@ function Install-Binary if ($ExpectedSignature) { Test-FileSignature -FilePath $filePath -ExpectedThumbprint $ExpectedSignature - } else { throw "ExpectedSignature parameter is specified, but no signature is provided." } } - + # MSI binaries should be installed via msiexec.exe $fileExtension = ([System.IO.Path]::GetExtension($Name)).Replace(".", "") if ($fileExtension -eq "msi") @@ -722,18 +721,27 @@ function Test-FileSignature { [Parameter(Mandatory=$true)] [string]$FilePath, [Parameter(Mandatory=$true)] - [string]$ExpectedThumbprint + [string[]]$ExpectedThumbprint ) - + $signature = Get-AuthenticodeSignature $FilePath - + if ($signature.Status -ne "Valid") { throw "Signature status is not valid. Status: $($signature.Status)" } - - if ($signature.SignerCertificate.Thumbprint.Contains($ExpectedThumbprint) -ne $true) { - throw "Signature thumbprint do not match expected" + + foreach ($thumbprint in $ExpectedThumbprint) { + if ($signature.SignerCertificate.Thumbprint.Contains($thumbprint)) { + Write-Output "Signature for $FilePath is valid" + $signatureMatched = $true + return + } } - Write-Output "Signature for $FilePath is valid" + if ($signatureMatched) { + Write-Output "Signature for $FilePath is valid" + } + else { + throw "Signature thumbprint do not match expected." + } } diff --git a/images/win/scripts/ImageHelpers/VisualStudioHelpers.ps1 b/images/win/scripts/ImageHelpers/VisualStudioHelpers.ps1 index e68f76479148..e02c52fadcad 100644 --- a/images/win/scripts/ImageHelpers/VisualStudioHelpers.ps1 +++ b/images/win/scripts/ImageHelpers/VisualStudioHelpers.ps1 @@ -28,7 +28,8 @@ Function Install-VisualStudio { [Parameter(Mandatory)] [String] $Edition, [Parameter(Mandatory)] [String] $Channel, [Parameter(Mandatory)] [String[]] $RequiredComponents, - [String] $ExtraArgs = "" + [String] $ExtraArgs = "", + [Parameter(Mandatory)] [String] $SignatureThumbprint ) $bootstrapperUrl = "https://aka.ms/vs/${Version}/${Channel}/vs_${Edition}.exe" @@ -40,6 +41,9 @@ Function Install-VisualStudio { $BootstrapperName = [IO.Path]::GetFileName($BootstrapperUrl) $bootstrapperFilePath = Start-DownloadWithRetry -Url $BootstrapperUrl -Name $BootstrapperName + # Verify that the bootstrapper is signed by Microsoft + Test-FileSignature -FilePath $bootstrapperFilePath -ExpectedThumbprint $SignatureThumbprint + try { Write-Host "Enable short name support on Windows needed for Xamarin Android AOT, defaults appear to have been changed in Azure VMs" $shortNameEnableProcess = Start-Process -FilePath fsutil.exe -ArgumentList ('8dot3name', 'set', '0') -Wait -PassThru @@ -124,4 +128,4 @@ function Get-VisualStudioComponents { (Get-VisualStudioInstance).Packages | Where-Object type -in 'Component', 'Workload' | Sort-Object Id, Version | Select-Object @{n = 'Package'; e = {$_.Id}}, Version | Where-Object { $_.Package -notmatch "[0-9a-fA-F]{8}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{12}" } -} \ No newline at end of file +} diff --git a/images/win/scripts/Installers/Install-AWS.ps1 b/images/win/scripts/Installers/Install-AWS.ps1 index 0a319a3ecac0..347525439735 100644 --- a/images/win/scripts/Installers/Install-AWS.ps1 +++ b/images/win/scripts/Installers/Install-AWS.ps1 @@ -10,7 +10,8 @@ Choco-Install -PackageName awscli # Install Session Manager Plugin for the AWS CLI $sessionManagerName = "SessionManagerPluginSetup.exe" $sessionManagerUrl = "https://s3.amazonaws.com/session-manager-downloads/plugin/latest/windows/$sessionManagerName" -Install-Binary -Url $sessionManagerUrl -Name $sessionManagerName -ArgumentList ("/silent", "/install") +$sessionManagerSignatureThumbprint = "FF457E5732E98A9F156E657F8CC7C4432507C3BB" +Install-Binary -Url $sessionManagerUrl -Name $sessionManagerName -ArgumentList ("/silent", "/install") -ExpectedSignature $sessionManagerSignatureThumbprint $env:Path = $env:Path + ";$env:ProgramFiles\Amazon\SessionManagerPlugin\bin" # Install AWS SAM CLI diff --git a/images/win/scripts/Installers/Install-AzureCli.ps1 b/images/win/scripts/Installers/Install-AzureCli.ps1 index f5ef1724bd7e..e3a02dac4411 100644 --- a/images/win/scripts/Installers/Install-AzureCli.ps1 +++ b/images/win/scripts/Installers/Install-AzureCli.ps1 @@ -13,7 +13,8 @@ ${env:AZURE_CONFIG_DIR} = $azureCliConfigPath #temporary pin 2.52.0 version $azCliUrl = 'https://azcliprod.blob.core.windows.net/msi/azure-cli-2.52.0-x64.msi' -Install-Binary -Url $azCliUrl -Name 'azure-cli.msi' +$azCliSignatureThumbprint = "72105B6D5F370B62FD5C82F1512F7AD7DEE5F2C0" +Install-Binary -Url $azCliUrl -Name 'azure-cli.msi' -ExpectedSignature $azCliSignatureThumbprint $azureCliExtensionPath = Join-Path $Env:CommonProgramFiles 'AzureCliExtensionDirectory' $null = New-Item -ItemType 'Directory' -Path $azureCliExtensionPath diff --git a/images/win/scripts/Installers/Install-AzureCosmosDbEmulator.ps1 b/images/win/scripts/Installers/Install-AzureCosmosDbEmulator.ps1 index ba7922a73e74..697eaf853b87 100644 --- a/images/win/scripts/Installers/Install-AzureCosmosDbEmulator.ps1 +++ b/images/win/scripts/Installers/Install-AzureCosmosDbEmulator.ps1 @@ -5,7 +5,8 @@ $InstallerName = "AzureCosmosDBEmulator.msi" $InstallerUrl = "https://aka.ms/cosmosdb-emulator" +$SignatureThumbprint = "F372C27F6E052A6BE8BAB3112B465C692196CD6F" -Install-Binary -Url $InstallerUrl -Name $InstallerName +Install-Binary -Url $InstallerUrl -Name $InstallerName -ExpectedSignature $SignatureThumbprint -Invoke-PesterTests -TestFile "Tools" -TestName "Azure Cosmos DB Emulator" \ No newline at end of file +Invoke-PesterTests -TestFile "Tools" -TestName "Azure Cosmos DB Emulator" diff --git a/images/win/scripts/Installers/Install-BizTalkBuildComponent.ps1 b/images/win/scripts/Installers/Install-BizTalkBuildComponent.ps1 index 8f4462961310..2dd4cbbf0ac7 100644 --- a/images/win/scripts/Installers/Install-BizTalkBuildComponent.ps1 +++ b/images/win/scripts/Installers/Install-BizTalkBuildComponent.ps1 @@ -73,6 +73,11 @@ Write-Host "Unzip $setupZipFile to $setupPath..." Extract-7Zip -Path $setupZipFile -DestinationPath $setupPath Remove-Item $setupZipFile +# Verify signature +$BuildComponentSignatureThumbprint = "8740DF4ACB749640AD318E4BE842F72EC651AD80" +Test-FileSignature -FilePath "$setupPath\Bootstrap.msi" -ExpectedThumbprint $BuildComponentSignatureThumbprint +Test-FileSignature -FilePath "$setupPath\BuildComponentSetup.msi" -ExpectedThumbprint $BuildComponentSignatureThumbprint + # Install Install-Msi -MsiPath "$setupPath\Bootstrap.msi" -LogPath "$setupPath\bootstrap.log" Install-Msi -MsiPath "$setupPath\BuildComponentSetup.msi" -LogPath "$setupPath\buildComponentSetup.log" @@ -80,4 +85,4 @@ Install-Msi -MsiPath "$setupPath\BuildComponentSetup.msi" -LogPath "$setupPath\ Remove-Item $setupPath -Recurse -Force # Test -Invoke-PesterTests -TestFile "BizTalk" -TestName "BizTalk Build Component Setup" \ No newline at end of file +Invoke-PesterTests -TestFile "BizTalk" -TestName "BizTalk Build Component Setup" diff --git a/images/win/scripts/Installers/Install-Choco.ps1 b/images/win/scripts/Installers/Install-Choco.ps1 index 4aa814a56b1e..889c350d3086 100644 --- a/images/win/scripts/Installers/Install-Choco.ps1 +++ b/images/win/scripts/Installers/Install-Choco.ps1 @@ -17,8 +17,11 @@ if ($userPath) { $env:Path = $systemPath } -# Run the installer -Invoke-Expression ((new-object net.webclient).DownloadString('https://chocolatey.org/install.ps1')) +# Verify and run choco installer +$signatureThumbprint = "83AC7D88C66CB8680BCE802E0F0F5C179722764B" +$InstallScriptPath = Start-DownloadWithRetry -Url 'https://chocolatey.org/install.ps1' +Test-FileSignature -FilePath $InstallScriptPath -ExpectedThumbprint $signatureThumbprint +Invoke-Expression $InstallScriptPath # Turn off confirmation choco feature enable -n allowGlobalConfirmation diff --git a/images/win/scripts/Installers/Install-Chrome.ps1 b/images/win/scripts/Installers/Install-Chrome.ps1 index 486d4d76d570..6ae1473e33aa 100644 --- a/images/win/scripts/Installers/Install-Chrome.ps1 +++ b/images/win/scripts/Installers/Install-Chrome.ps1 @@ -4,9 +4,10 @@ ################################################################################ # Download and install latest Chrome browser +$ChromeSignatureThumbprint = "2673EA6CC23BEFFDA49AC715B121544098A1284C" $ChromeInstallerFile = "googlechromestandaloneenterprise64.msi" $ChromeInstallerUrl = "https://dl.google.com/tag/s/dl/chrome/install/${ChromeInstallerFile}" -Install-Binary -Url $ChromeInstallerUrl -Name $ChromeInstallerFile -ArgumentList @() +Install-Binary -Url $ChromeInstallerUrl -Name $ChromeInstallerFile -ArgumentList @() -ExpectedSignature $ChromeSignatureThumbprint # Prepare firewall rules Write-Host "Adding the firewall rule for Google update blocking..." @@ -84,4 +85,4 @@ $PathValue = Get-ItemPropertyValue -Path $regEnvKey -Name 'Path' $PathValue += ";$ChromeDriverPath\" Set-ItemProperty -Path $regEnvKey -Name 'Path' -Value $PathValue -Invoke-PesterTests -TestFile "Browsers" -TestName "Chrome" \ No newline at end of file +Invoke-PesterTests -TestFile "Browsers" -TestName "Chrome" diff --git a/images/win/scripts/Installers/Install-CloudFoundryCli.ps1 b/images/win/scripts/Installers/Install-CloudFoundryCli.ps1 index 2bc7e4b0d54d..8b4416b17af3 100644 --- a/images/win/scripts/Installers/Install-CloudFoundryCli.ps1 +++ b/images/win/scripts/Installers/Install-CloudFoundryCli.ps1 @@ -20,4 +20,8 @@ Extract-7Zip -Path $CloudFoundryArchPath -DestinationPath $CloudFoundryCliPath # Add cf to path Add-MachinePathItem $CloudFoundryCliPath -Invoke-PesterTests -TestFile "CLI.Tools" -TestName "CloudFoundry CLI" \ No newline at end of file +# Validate cf signature +$CloudFoundrySignatureThumbprint = "4C69EDD13930ED01B83DD1D17B09C434DC1F2177" +Test-FileSignature -FilePath "$CloudFoundryCliPath\cf.exe" -ExpectedThumbprint $CloudFoundrySignatureThumbprint + +Invoke-PesterTests -TestFile "CLI.Tools" -TestName "CloudFoundry CLI" diff --git a/images/win/scripts/Installers/Install-DACFx.ps1 b/images/win/scripts/Installers/Install-DACFx.ps1 index 86695a559534..087ae63362da 100644 --- a/images/win/scripts/Installers/Install-DACFx.ps1 +++ b/images/win/scripts/Installers/Install-DACFx.ps1 @@ -5,7 +5,8 @@ $InstallerName = "DacFramework.msi" $InstallerUrl = "https://aka.ms/dacfx-msi" +$SignatureThumbprint = "72105B6D5F370B62FD5C82F1512F7AD7DEE5F2C0" -Install-Binary -Url $InstallerUrl -Name $InstallerName +Install-Binary -Url $InstallerUrl -Name $InstallerName -ExpectedSignature $SignatureThumbprint -Invoke-PesterTests -TestFile "Tools" -TestName "DACFx" \ No newline at end of file +Invoke-PesterTests -TestFile "Tools" -TestName "DACFx" diff --git a/images/win/scripts/Installers/Install-Edge.ps1 b/images/win/scripts/Installers/Install-Edge.ps1 index 5e5b42c3d307..57ba8940e560 100644 --- a/images/win/scripts/Installers/Install-Edge.ps1 +++ b/images/win/scripts/Installers/Install-Edge.ps1 @@ -26,6 +26,7 @@ Write-Host "Download Microsoft Edge WebDriver..." $EdgeDriverLatestVersion = Get-Content -Path $EdgeDriverVersionFile $EdgeDriverArchName = "edgedriver_win64.zip" + $EdgeDriverDownloadUrl = "https://msedgedriver.azureedge.net/${EdgeDriverLatestVersion}/${EdgeDriverArchName}" $EdgeDriverArchPath = Start-DownloadWithRetry -Url $EdgeDriverDownloadUrl -Name $EdgeDriverArchName @@ -33,6 +34,10 @@ $EdgeDriverArchPath = Start-DownloadWithRetry -Url $EdgeDriverDownloadUrl -Name Write-Host "Expand Microsoft Edge WebDriver archive..." Extract-7Zip -Path $EdgeDriverArchPath -DestinationPath $EdgeDriverPath +#Validate the EdgeDriver signature +$EdgeDriverSignatureThumbprint = ("7C94971221A799907BB45665663BBFD587BAC9F8", "70E52D50651BB9E8DC08DE566C4DD5713833B038") +Test-FileSignature -FilePath "$EdgeDriverPath\msedgedriver.exe" -ExpectedThumbprint $EdgeDriverSignatureThumbprint + Write-Host "Setting the environment variables..." setx EdgeWebDriver "$EdgeDriverPath" /M diff --git a/images/win/scripts/Installers/Install-Firefox.ps1 b/images/win/scripts/Installers/Install-Firefox.ps1 index f66a72e1bd52..ad91611eb187 100644 --- a/images/win/scripts/Installers/Install-Firefox.ps1 +++ b/images/win/scripts/Installers/Install-Firefox.ps1 @@ -45,8 +45,12 @@ $GeckoDriverArchPath = Start-DownloadWithRetry -Url $GeckoDriverDownloadUrl -Nam Write-Host "Expand Gecko WebDriver archive..." Extract-7Zip -Path $GeckoDriverArchPath -DestinationPath $GeckoDriverPath +# Validate Gecko WebDriver signature +$GeckoDriverSignatureThumbprint = "1326B39C3D5D2CA012F66FB439026F7B59CB1974" +Test-FileSignature -FilePath "$GeckoDriverPath/geckodriver.exe" -ExpectedThumbprint $GeckoDriverSignatureThumbprint + Write-Host "Setting the environment variables..." Add-MachinePathItem -PathItem $GeckoDriverPath setx GeckoWebDriver "$GeckoDriverPath" /M -Invoke-PesterTests -TestFile "Browsers" -TestName "Firefox" \ No newline at end of file +Invoke-PesterTests -TestFile "Browsers" -TestName "Firefox" diff --git a/images/win/scripts/Installers/Install-GoogleCloudCLI.ps1 b/images/win/scripts/Installers/Install-GoogleCloudCLI.ps1 index fdb0b4f7cb5a..8b793b3b762f 100644 --- a/images/win/scripts/Installers/Install-GoogleCloudCLI.ps1 +++ b/images/win/scripts/Installers/Install-GoogleCloudCLI.ps1 @@ -6,6 +6,8 @@ # https://cloud.google.com/sdk/docs/downloads-interactive $googleCloudCLIInstaller = "https://dl.google.com/dl/cloudsdk/channels/rapid/GoogleCloudSDKInstaller.exe" $argumentList = @("/S", "/allusers", "/noreporting") -Install-Binary -Url $googleCloudCLIInstaller -Name "GoogleCloudSDKInstaller.exe" -ArgumentList $argumentList +$googleCloudCLISignatureThumbprint = "2673EA6CC23BEFFDA49AC715B121544098A1284C" + +Install-Binary -Url $googleCloudCLIInstaller -Name "GoogleCloudSDKInstaller.exe" -ArgumentList $argumentList -ExpectedSignature $googleCloudCLISignatureThumbprint Invoke-PesterTests -TestFile "Tools" -TestName "GoogleCloudCLI" diff --git a/images/win/scripts/Installers/Install-NET48-devpack.ps1 b/images/win/scripts/Installers/Install-NET48-devpack.ps1 index 33d4f355e4cf..348924908a22 100644 --- a/images/win/scripts/Installers/Install-NET48-devpack.ps1 +++ b/images/win/scripts/Installers/Install-NET48-devpack.ps1 @@ -6,8 +6,9 @@ # .NET 4.8 Dev pack $InstallerName = "ndp48-devpack-enu.exe" $InstallerUrl = "https://download.visualstudio.microsoft.com/download/pr/014120d7-d689-4305-befd-3cb711108212/0307177e14752e359fde5423ab583e43/${InstallerName}" +$InstallerSignatureThumbprint = "C82273A065EC470FB1EBDE846A91E6FFB29E9C12" $ArgumentList = ("Setup", "/passive", "/norestart") -Install-Binary -Url $InstallerUrl -Name $InstallerName -ArgumentList $ArgumentList +Install-Binary -Url $InstallerUrl -Name $InstallerName -ArgumentList $ArgumentList -ExpectedSignature $InstallerSignatureThumbprint -Invoke-PesterTests -TestFile "Tools" -TestName "NET48" \ No newline at end of file +Invoke-PesterTests -TestFile "Tools" -TestName "NET48" diff --git a/images/win/scripts/Installers/Install-NET48.ps1 b/images/win/scripts/Installers/Install-NET48.ps1 index 4e4c507c0941..271b11cd50d4 100644 --- a/images/win/scripts/Installers/Install-NET48.ps1 +++ b/images/win/scripts/Installers/Install-NET48.ps1 @@ -6,6 +6,7 @@ # .NET 4.8 Dev pack $InstallerName = "ndp48-x86-x64-allos-enu.exe" $InstallerUrl = "https://download.visualstudio.microsoft.com/download/pr/2d6bb6b2-226a-4baa-bdec-798822606ff1/8494001c276a4b96804cde7829c04d7f/${InstallerName}" +$InstallerSignatureThumbprint = "ABDCA79AF9DD48A0EA702AD45260B3C03093FB4B" $ArgumentList = ("Setup", "/passive", "/norestart") -Install-Binary -Url $InstallerUrl -Name $InstallerName -ArgumentList $ArgumentList +Install-Binary -Url $InstallerUrl -Name $InstallerName -ArgumentList $ArgumentList -ExpectedSignature $InstallerSignatureThumbprint diff --git a/images/win/scripts/Installers/Install-PostgreSQL.ps1 b/images/win/scripts/Installers/Install-PostgreSQL.ps1 index 38be7e00b9e7..40fd2e00f27d 100644 --- a/images/win/scripts/Installers/Install-PostgreSQL.ps1 +++ b/images/win/scripts/Installers/Install-PostgreSQL.ps1 @@ -48,7 +48,7 @@ do { $ErrorActionPreference = $ErrorActionOldValue $InstallerName = $InstallerUrl.Split('/')[-1] $ArgumentList = ("--install_runtimes 0","--superpassword root","--enable_acledit 1","--unattendedmodeui none","--mode unattended") -Install-Binary -Url $InstallerUrl -Name $InstallerName -ArgumentList $ArgumentList +Install-Binary -Url $InstallerUrl -Name $InstallerName -ArgumentList $ArgumentList -ExpectedSignature (Get-ToolsetContent).postgresql.signature # Get Path to pg_ctl.exe $pgPath = (Get-CimInstance Win32_Service -Filter "Name LIKE 'postgresql-%'").PathName @@ -79,4 +79,4 @@ $pgService = Get-Service -Name postgresql* Stop-Service -InputObject $pgService Set-Service -InputObject $pgService -StartupType Disabled -Invoke-PesterTests -TestFile "Databases" -TestName "PostgreSQL" \ No newline at end of file +Invoke-PesterTests -TestFile "Databases" -TestName "PostgreSQL" diff --git a/images/win/scripts/Installers/Install-SQLPowerShellTools.ps1 b/images/win/scripts/Installers/Install-SQLPowerShellTools.ps1 index 37f5ece9b1b7..1be0946a708a 100644 --- a/images/win/scripts/Installers/Install-SQLPowerShellTools.ps1 +++ b/images/win/scripts/Installers/Install-SQLPowerShellTools.ps1 @@ -4,16 +4,17 @@ ################################################################################ $BaseUrl = "https://download.microsoft.com/download/B/1/7/B1783FE9-717B-4F78-A39A-A2E27E3D679D/ENU/x64" +$SignatureThumbrint = "9ACA9419E53D3C9E56396DD2335FF683A8B0B8F3" # install required MSIs $SQLSysClrTypesName = "SQLSysClrTypes.msi" $SQLSysClrTypesUrl = "${BaseUrl}/${SQLSysClrTypesName}" -Install-Binary -Url $SQLSysClrTypesUrl -Name $SQLSysClrTypesName +Install-Binary -Url $SQLSysClrTypesUrl -Name $SQLSysClrTypesName -ExpectedSignature $SignatureThumbrint $SharedManagementObjectsName = "SharedManagementObjects.msi" $SharedManagementObjectsUrl = "${BaseUrl}/${SharedManagementObjectsName}" -Install-Binary -Url $SharedManagementObjectsUrl -Name $SharedManagementObjectsName +Install-Binary -Url $SharedManagementObjectsUrl -Name $SharedManagementObjectsName -ExpectedSignature $SignatureThumbrint $PowerShellToolsName = "PowerShellTools.msi" $PowerShellToolsUrl = "${BaseUrl}/${PowerShellToolsName}" -Install-Binary -Url $PowerShellToolsUrl -Name $PowerShellToolsName +Install-Binary -Url $PowerShellToolsUrl -Name $PowerShellToolsName -ExpectedSignature $SignatureThumbrint diff --git a/images/win/scripts/Installers/Install-ServiceFabricSDK.ps1 b/images/win/scripts/Installers/Install-ServiceFabricSDK.ps1 index 12c544ffde8e..abd3a0e99c6d 100644 --- a/images/win/scripts/Installers/Install-ServiceFabricSDK.ps1 +++ b/images/win/scripts/Installers/Install-ServiceFabricSDK.ps1 @@ -15,11 +15,11 @@ $serviceFabricSDKVersion = (Get-ToolsetContent).serviceFabric.sdk.version $InstallerName = "MicrosoftServiceFabric.${serviceFabricRuntimeVersion}.exe" $InstallerUrl = "https://download.microsoft.com/download/b/8/a/b8a2fb98-0ec1-41e5-be98-9d8b5abf7856/${InstallerName}" $ArgumentList = ("/accepteula ","/quiet","/force") -Install-Binary -Url $InstallerUrl -Name $InstallerName -ArgumentList $ArgumentList +Install-Binary -Url $InstallerUrl -Name $InstallerName -ArgumentList $ArgumentList -ExpectedSignature (Get-ToolsetContent).serviceFabric.runtime.signature # Install Service Fabric SDK $InstallerName = "MicrosoftServiceFabricSDK.${serviceFabricSDKVersion}.msi" $InstallerUrl = "https://download.microsoft.com/download/b/8/a/b8a2fb98-0ec1-41e5-be98-9d8b5abf7856/${InstallerName}" -Install-Binary -Url $InstallerUrl -Name $InstallerName +Install-Binary -Url $InstallerUrl -Name $InstallerName -ExpectedSignature (Get-ToolsetContent).serviceFabric.sdk.signature -Invoke-PesterTests -TestFile "Tools" -TestName "ServiceFabricSDK" +Invoke-PesterTests -TestFile "Tools" -TestName "ServiceFabricSDK" diff --git a/images/win/scripts/Installers/Install-VCRedist.ps1 b/images/win/scripts/Installers/Install-VCRedist.ps1 index 41a62f7d28ba..46646fb09d61 100644 --- a/images/win/scripts/Installers/Install-VCRedist.ps1 +++ b/images/win/scripts/Installers/Install-VCRedist.ps1 @@ -8,8 +8,9 @@ $vc2010x86URI = "https://download.microsoft.com/download/1/6/5/165255E7-1014-4D0 $vc2010x64Name = "vcredist_x64.exe" $vc2010x64URI = "https://download.microsoft.com/download/1/6/5/165255E7-1014-4D0A-B094-B6A430A6BFFC/${Vc2010x64Name}" $argumentList = ("/install", "/quiet", "/norestart") +$vcSignatureThumbprint = "ABDCA79AF9DD48A0EA702AD45260B3C03093FB4B" -Install-Binary -Url $vc2010x86URI -Name $vc2010x86Name -ArgumentList $argumentList -Install-Binary -Url $vc2010x64URI -Name $vc2010x64Name -ArgumentList $argumentList +Install-Binary -Url $vc2010x86URI -Name $vc2010x86Name -ArgumentList $argumentList -ExpectedSignature $vcSignatureThumbprint +Install-Binary -Url $vc2010x64URI -Name $vc2010x64Name -ArgumentList $argumentList -ExpectedSignature $vcSignatureThumbprint Invoke-PesterTests -TestFile "Tools" -TestName "VCRedist" diff --git a/images/win/scripts/Installers/Install-VS.ps1 b/images/win/scripts/Installers/Install-VS.ps1 index 707080f0e1d4..b9865294ec22 100644 --- a/images/win/scripts/Installers/Install-VS.ps1 +++ b/images/win/scripts/Installers/Install-VS.ps1 @@ -11,7 +11,8 @@ Install-VisualStudio ` -Edition $toolset.visualStudio.edition ` -Channel $toolset.visualStudio.channel ` -RequiredComponents $toolset.visualStudio.workloads ` - -ExtraArgs "--allWorkloads --includeRecommended --remove Component.CPython3.x64" + -ExtraArgs "--allWorkloads --includeRecommended --remove Component.CPython3.x64" ` + -SignatureThumbprint $toolset.visualStudio.signature # Find the version of VS installed for this instance # Only supports a single instance @@ -30,25 +31,29 @@ $newContent = '{"Extensions":[{"Key":"1e906ff5-9da8-4091-a299-5c253c55fdc9","Val Set-Content -Path "$vsInstallRoot\Common7\IDE\Extensions\MachineState.json" -Value $newContent if (Test-IsWin19) { + # Install Windows 10 SDK version 10.0.14393.795 + $sdkSignatureThumbprint = "C91545B333C52C4465DE8B90A3FAF4E1D9C58DFA" $sdkUrl = "https://go.microsoft.com/fwlink/p/?LinkId=838916" $sdkFileName = "sdksetup14393.exe" $argumentList = ("/q", "/norestart", "/ceip off", "/features OptionId.WindowsSoftwareDevelopmentKit") - Install-Binary -Url $sdkUrl -Name $sdkFileName -ArgumentList $argumentList - + Install-Binary -Url $sdkUrl -Name $sdkFileName -ArgumentList $argumentList -ExpectedSignature $sdkSignatureThumbprint + # Install Windows 11 SDK version 10.0.22621.0 - $sdkUrl = "https://go.microsoft.com/fwlink/p/?linkid=2196241" - $sdkFileName = "sdksetup22621.exe" - $argumentList = ("/q", "/norestart", "/ceip off", "/features OptionId.UWPManaged OptionId.UWPCPP OptionId.UWPLocalized OptionId.DesktopCPPx86 OptionId.DesktopCPPx64 OptionId.DesktopCPParm64") - Install-Binary -Url $sdkUrl -Name $sdkFileName -ArgumentList $argumentList + $sdkSignatureThumbprint = "E4C5C5FCDB68B930EE4E19BC25D431EF6D864C51" + $sdkUrl = "https://go.microsoft.com/fwlink/p/?linkid=2196241" + $sdkFileName = "sdksetup22621.exe" + $argumentList = ("/q", "/norestart", "/ceip off", "/features OptionId.UWPManaged OptionId.UWPCPP OptionId.UWPLocalized OptionId.DesktopCPPx86 OptionId.DesktopCPPx64 OptionId.DesktopCPParm64") + Install-Binary -Url $sdkUrl -Name $sdkFileName -ArgumentList $argumentList -ExpectedSignature $sdkSignatureThumbprint } -if (Test-IsWin22) { +if (Test-IsWin22) { # Install Windows 10 SDK version 10.0.17763 + $sdkSignatureThumbprint = "7535269B94C1FEA4A5EF6D808E371DA242F27936" $sdkUrl = "https://go.microsoft.com/fwlink/p/?LinkID=2033908" $sdkFileName = "sdksetup17763.exe" $argumentList = ("/q", "/norestart", "/ceip off", "/features OptionId.UWPManaged OptionId.UWPCPP OptionId.UWPLocalized OptionId.DesktopCPPx86 OptionId.DesktopCPPx64 OptionId.DesktopCPParm64") - Install-Binary -Url $sdkUrl -Name $sdkFileName -ArgumentList $argumentList + Install-Binary -Url $sdkUrl -Name $sdkFileName -ArgumentList $argumentList -ExpectedSignature $sdkSignatureThumbprint } Invoke-PesterTests -TestFile "VisualStudio" diff --git a/images/win/scripts/Installers/Install-WDK.ps1 b/images/win/scripts/Installers/Install-WDK.ps1 index 04c13e187fc4..345bbe541e5f 100644 --- a/images/win/scripts/Installers/Install-WDK.ps1 +++ b/images/win/scripts/Installers/Install-WDK.ps1 @@ -8,10 +8,13 @@ if (Test-IsWin22) { # SDK available through Visual Studio $wdkUrl = "https://go.microsoft.com/fwlink/?linkid=2196230" $FilePath = "C:\Program Files (x86)\Windows Kits\10\Vsix\VS2022\*\WDK.vsix" + $wdkSignatureThumbprint = "DE2396BCEB7E3CD13BF3D370424A560F97CABDE7" } elseif (Test-IsWin19) { $winSdkUrl = "https://go.microsoft.com/fwlink/?linkid=2173743" $wdkUrl = "https://go.microsoft.com/fwlink/?linkid=2166289" $FilePath = "C:\Program Files (x86)\Windows Kits\10\Vsix\VS2019\WDK.vsix" + $wdkSignatureThumbprint = "914A09C2E02C696AF394048BCB8D95449BCD5B9E" + $winSdkSignatureThumbprint = "44796EB5BD439B4BFB078E1DC2F8345AE313CBB1" } else { throw "Invalid version of Visual Studio is found. Either 2019 or 2022 are required" } @@ -20,11 +23,11 @@ $argumentList = ("/features", "+", "/quiet") if (Test-IsWin19) { # `winsdksetup.exe /features + /quiet` installs all features without showing the GUI - Install-Binary -Url $winSdkUrl -Name "winsdksetup.exe" -ArgumentList $argumentList + Install-Binary -Url $winSdkUrl -Name "winsdksetup.exe" -ArgumentList $argumentList -ExpectedSignature $winSdkSignatureThumbprint } # `wdksetup.exe /features + /quiet` installs all features without showing the GUI -Install-Binary -Url $wdkUrl -Name "wdksetup.exe" -ArgumentList $argumentList +Install-Binary -Url $wdkUrl -Name "wdksetup.exe" -ArgumentList $argumentList -ExpectedSignature $wdkSignatureThumbprint # Need to install the VSIX to get the build targets when running VSBuild $FilePath = Resolve-Path -Path $FilePath diff --git a/images/win/scripts/Installers/Install-WebPlatformInstaller.ps1 b/images/win/scripts/Installers/Install-WebPlatformInstaller.ps1 index 90e102d00138..c83dd458ec1c 100644 --- a/images/win/scripts/Installers/Install-WebPlatformInstaller.ps1 +++ b/images/win/scripts/Installers/Install-WebPlatformInstaller.ps1 @@ -6,6 +6,7 @@ # Download and install WebPlatformInstaller $webPlatformInstallerFile = "WebPlatformInstaller_x64_en-US.msi" $webPlatformInstallerUrl = "http://go.microsoft.com/fwlink/?LinkId=287166" -Install-Binary -Url $webPlatformInstallerUrl -Name $webPlatformInstallerFile +$webPlatformInstallerSignatureThumbprint = "C3A3D43788E7ABCD287CB4F5B6583043774F99D2" +Install-Binary -Url $webPlatformInstallerUrl -Name $webPlatformInstallerFile -ExpectedSignature $webPlatformInstallerSignatureThumbprint -Invoke-PesterTests -TestFile "Tools" -TestName "WebPlatformInstaller" \ No newline at end of file +Invoke-PesterTests -TestFile "Tools" -TestName "WebPlatformInstaller" diff --git a/images/win/scripts/Installers/Install-WinAppDriver.ps1 b/images/win/scripts/Installers/Install-WinAppDriver.ps1 index 3a503b8b7638..cdd34079e8d8 100644 --- a/images/win/scripts/Installers/Install-WinAppDriver.ps1 +++ b/images/win/scripts/Installers/Install-WinAppDriver.ps1 @@ -6,8 +6,9 @@ $LatestReleaseUrl = 'https://api.github.com/repos/microsoft/WinAppDriver/releases/latest' $InstallerUrl = (Invoke-RestMethod -Uri $LatestReleaseUrl).assets.browser_download_url $InstallerName = "WindowsApplicationDriver.msi" +$InstallerSignatureThumbprint = "2485A7AFA98E178CB8F30C9838346B514AEA4769" [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 -Install-Binary -Url $InstallerUrl -Name $InstallerName +Install-Binary -Url $InstallerUrl -Name $InstallerName -ExpectedSignature $InstallerSignatureThumbprint Invoke-PesterTests -TestFile "WinAppDriver" -TestName "WinAppDriver" diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index 823b25f10d66..c8f29f715aae 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -267,6 +267,7 @@ "subversion" : "16", "edition" : "Enterprise", "channel": "release", + "signature": "72105B6D5F370B62FD5C82F1512F7AD7DEE5F2C0", "workloads": [ "Component.Dotfuscator", "Component.Linux.CMake", @@ -412,10 +413,12 @@ }, "serviceFabric": { "runtime": { - "version": "9.1.1436.9590" + "version": "9.1.1436.9590", + "signature": "AFBF0B8B6A18F7E23CCA1DDCD0AC1A55B4035173" }, "sdk": { - "version": "6.1.1436" + "version": "6.1.1436", + "signature": "AFBF0B8B6A18F7E23CCA1DDCD0AC1A55B4035173" } }, "dotnet": { @@ -478,7 +481,8 @@ "version": "16" }, "postgresql": { - "version": "14" + "version": "14", + "signature": "698BA51AA27CC31282AACA5055E4B9190BC6C0E9" }, "kotlin": { "version": "latest", diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index 1a9625cd5fae..a85dd6ee7767 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -177,6 +177,7 @@ "subversion" : "17", "edition" : "Enterprise", "channel": "release", + "signature": "72105B6D5F370B62FD5C82F1512F7AD7DEE5F2C0", "workloads": [ "Component.Dotfuscator", "Component.Linux.CMake", @@ -353,10 +354,12 @@ }, "serviceFabric": { "runtime": { - "version": "9.1.1436.9590" + "version": "9.1.1436.9590", + "signature": "AFBF0B8B6A18F7E23CCA1DDCD0AC1A55B4035173" }, "sdk": { - "version": "6.1.1436" + "version": "6.1.1436", + "signature": "AFBF0B8B6A18F7E23CCA1DDCD0AC1A55B4035173" } }, "dotnet": { @@ -418,7 +421,8 @@ "version": "8.2" }, "postgresql": { - "version": "14" + "version": "14", + "signature": "698BA51AA27CC31282AACA5055E4B9190BC6C0E9" }, "kotlin": { "version": "latest", From be42f35015296cc9cd3bb2e0ddde48b0a727fb76 Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Wed, 11 Oct 2023 11:06:47 +0200 Subject: [PATCH 2311/3485] [Windows] Add checksum verification for Firefox browser (#8411) --- images/win/scripts/Installers/Install-Firefox.ps1 | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/images/win/scripts/Installers/Install-Firefox.ps1 b/images/win/scripts/Installers/Install-Firefox.ps1 index ad91611eb187..a100b239e751 100644 --- a/images/win/scripts/Installers/Install-Firefox.ps1 +++ b/images/win/scripts/Installers/Install-Firefox.ps1 @@ -1,16 +1,23 @@ ################################################################################ ## File: Install-Firefox.ps1 ## Desc: Install Mozilla Firefox +## Supply chain security: Firefox browser - checksum validation ################################################################################ # Install and configure Firefox browser Write-Host "Install latest Firefox browser..." $VersionsManifest = Invoke-RestMethod "https://product-details.mozilla.org/1.0/firefox_versions.json" -$InstallerName = "firefox-browser.exe" $InstallerUrl = "https://download.mozilla.org/?product=firefox-$($VersionsManifest.LATEST_FIREFOX_VERSION)&os=win64&lang=en-US" -$ArgumentList = ("/silent", "/install") +$packagePath = Start-DownloadWithRetry -Url $InstallerUrl -Name "FirefoxSetup.exe" -Install-Binary -Url $InstallerUrl -Name $InstallerName -ArgumentList $ArgumentList +#region Supply chain security - Stack +$fileHash = (Get-FileHash -Path $packagePath -Algorithm SHA256).Hash +$hashUrl = "https://archive.mozilla.org/pub/firefox/releases/$($VersionsManifest.LATEST_FIREFOX_VERSION)/SHA256SUMS" +$externalHash = (Invoke-RestMethod -Uri $hashURL).ToString().Split("`n").Where({ $_ -ilike "*win64/en-US/Firefox Setup*exe*" }).Split(' ')[0] +Use-ChecksumComparison $fileHash $externalHash +#endregion + +Install-Binary -FilePath $packagePath -ArgumentList "/silent", "/install" Write-Host "Disable autoupdate..." $FirefoxDirectoryPath = Join-Path $env:ProgramFiles "Mozilla Firefox" From a2cf90ce21d014de076344f21b7dd630eed37285 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Wed, 11 Oct 2023 13:01:19 +0200 Subject: [PATCH 2312/3485] Revert "[Ubuntu] Pin Terraform 1.5.7 (#8504)" (#8522) This reverts commit 4d6ce38166b6942984d53fc83a0a71593c2d82ee. --- images/linux/scripts/installers/terraform.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/images/linux/scripts/installers/terraform.sh b/images/linux/scripts/installers/terraform.sh index 9e424a3e9e8b..0e8f5553713b 100644 --- a/images/linux/scripts/installers/terraform.sh +++ b/images/linux/scripts/installers/terraform.sh @@ -7,12 +7,10 @@ source $HELPER_SCRIPTS/install.sh # Install Terraform -# Pin Terraform until v1.6.1 is released -# Ref: https://github.com/hashicorp/terraform/issues/33977 -URL=$(curl -fsSL https://api.releases.hashicorp.com/v1/releases/terraform/1.5.7 | jq -r '.builds[] | select((.arch=="amd64") and (.os=="linux")).url') +URL=$(curl -fsSL https://api.releases.hashicorp.com/v1/releases/terraform/latest | jq -r '.builds[] | select((.arch=="amd64") and (.os=="linux")).url') ZIP_NAME="terraform_linux_amd64.zip" download_with_retries "${URL}" "/tmp" "${ZIP_NAME}" unzip -qq "/tmp/${ZIP_NAME}" -d /usr/local/bin rm -f "/tmp/${ZIP_NAME}" -invoke_tests "Tools" "Terraform" +invoke_tests "Tools" "Terraform" \ No newline at end of file From 32f2e8a812ed77d8411eb38fa8487db6a3121dab Mon Sep 17 00:00:00 2001 From: sergei-pyshnoi <121864472+sergei-pyshnoi@users.noreply.github.com> Date: Wed, 11 Oct 2023 18:43:25 +0200 Subject: [PATCH 2313/3485] [Windows] update signature for VS studio installer (#8524) --- images/win/toolsets/toolset-2019.json | 2 +- images/win/toolsets/toolset-2022.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index c8f29f715aae..c1c90a1f765e 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -267,7 +267,7 @@ "subversion" : "16", "edition" : "Enterprise", "channel": "release", - "signature": "72105B6D5F370B62FD5C82F1512F7AD7DEE5F2C0", + "signature": "6E78B3DCE2998F6C2457C3E54DA90A01034916AE", "workloads": [ "Component.Dotfuscator", "Component.Linux.CMake", diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index a85dd6ee7767..2cb7d638017b 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -177,7 +177,7 @@ "subversion" : "17", "edition" : "Enterprise", "channel": "release", - "signature": "72105B6D5F370B62FD5C82F1512F7AD7DEE5F2C0", + "signature": "6E78B3DCE2998F6C2457C3E54DA90A01034916AE", "workloads": [ "Component.Dotfuscator", "Component.Linux.CMake", From a80012b48e894bb33cb743a8711fc56cd7bf61db Mon Sep 17 00:00:00 2001 From: Tingluo Huang <tingluohuang@github.com> Date: Wed, 11 Oct 2023 13:31:13 -0400 Subject: [PATCH 2314/3485] [Ubuntu] cache most used GitHub actions --- .../installers/action-archive-cache.sh | 26 +++++++++++++++++++ .../tests/ActionArchiveCache.Tests.ps1 | 15 +++++++++++ images/linux/ubuntu2004.json | 1 + images/linux/ubuntu2204.pkr.hcl | 1 + 4 files changed, 43 insertions(+) create mode 100755 images/linux/scripts/installers/action-archive-cache.sh create mode 100644 images/linux/scripts/tests/ActionArchiveCache.Tests.ps1 diff --git a/images/linux/scripts/installers/action-archive-cache.sh b/images/linux/scripts/installers/action-archive-cache.sh new file mode 100755 index 000000000000..c54c7d06c614 --- /dev/null +++ b/images/linux/scripts/installers/action-archive-cache.sh @@ -0,0 +1,26 @@ +#!/bin/bash -e +################################################################################ +## File: action-archive-cache.sh +## Desc: Download latest release from https://github.com/actions/action-verions +## and un-tar to /opt/actionarchivecache +## Maintainer: #actions-runtime and @TingluoHuang +################################################################################ + +# Source the helpers for use with the script +source $HELPER_SCRIPTS/install.sh +source $HELPER_SCRIPTS/etc-environment.sh + +# Prepare directory and env variable for ACTIONS_RUNNER_ACTION_ARCHIVE_CACHE +ACTION_ARCHIVE_CACHE_DIR=/opt/actionarchivecache +mkdir -p $ACTION_ARCHIVE_CACHE_DIR +chmod -R 777 $ACTION_ARCHIVE_CACHE_DIR +echo "Setting up ACTIONS_RUNNER_ACTION_ARCHIVE_CACHE variable to ${ACTION_ARCHIVE_CACHE_DIR}" +addEtcEnvironmentVariable ACTIONS_RUNNER_ACTION_ARCHIVE_CACHE ${ACTION_ARCHIVE_CACHE_DIR} + +# Download latest release from github.com/actions/action-versions and untar to /opt/actionarchivecache +downloadUrl=$(get_github_package_download_url "actions/action-versions" "contains(\"action-versions.tar.gz\")") +echo "Downloading action-versions $downloadUrl" +download_with_retries "$downloadUrl" "/tmp" action-versions.tar.gz +tar -xzf /tmp/action-versions.tar.gz -C $ACTION_ARCHIVE_CACHE_DIR + +invoke_tests "ActionArchiveCache" diff --git a/images/linux/scripts/tests/ActionArchiveCache.Tests.ps1 b/images/linux/scripts/tests/ActionArchiveCache.Tests.ps1 new file mode 100644 index 000000000000..6da1eb9349f2 --- /dev/null +++ b/images/linux/scripts/tests/ActionArchiveCache.Tests.ps1 @@ -0,0 +1,15 @@ +Describe "ActionArchiveCache" { + Context "Action archive cache directory not empty" { + It "/opt/actionarchivecache not empty" { + (Get-ChildItem -Path "/opt/actionarchivecache/*.tar.gz" -Recurse).Count | Should -BeGreaterThan 0 + } + } + + Context "Action tarball not empty" { + $testCases = Get-ChildItem -Path "/opt/actionarchivecache/*.tar.gz" -Recurse | ForEach-Object { @{ ActionTarball = $_.FullName } } + It "<ActionTarball>" -TestCases $testCases { + param ([string] $ActionTarball) + (Get-Item "$ActionTarball").Length | Should -BeGreaterThan 0 + } + } +} diff --git a/images/linux/ubuntu2004.json b/images/linux/ubuntu2004.json index 5fc6d909f2af..5e66c9bb9377 100644 --- a/images/linux/ubuntu2004.json +++ b/images/linux/ubuntu2004.json @@ -196,6 +196,7 @@ { "type": "shell", "scripts": [ + "{{template_dir}}/scripts/installers/action-archive-cache.sh", "{{template_dir}}/scripts/installers/apt-common.sh", "{{template_dir}}/scripts/installers/azcopy.sh", "{{template_dir}}/scripts/installers/azure-cli.sh", diff --git a/images/linux/ubuntu2204.pkr.hcl b/images/linux/ubuntu2204.pkr.hcl index 1f06f8212d92..c437616936ad 100644 --- a/images/linux/ubuntu2204.pkr.hcl +++ b/images/linux/ubuntu2204.pkr.hcl @@ -280,6 +280,7 @@ build { environment_vars = ["HELPER_SCRIPTS=${var.helper_script_folder}", "INSTALLER_SCRIPT_FOLDER=${var.installer_script_folder}", "DEBIAN_FRONTEND=noninteractive"] execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" scripts = [ + "${path.root}/scripts/installers/action-archive-cache.sh", "${path.root}/scripts/installers/apt-common.sh", "${path.root}/scripts/installers/azcopy.sh", "${path.root}/scripts/installers/azure-cli.sh", From c7517abd086f626291c90e371261d38e6f256084 Mon Sep 17 00:00:00 2001 From: Tingluo Huang <tingluohuang@github.com> Date: Thu, 12 Oct 2023 04:43:41 -0400 Subject: [PATCH 2315/3485] [Windows] cache most used GitHub actions * Download actions/action_versions latest release on Windows and set ACTIONS_RUNNER_ACTION_ARCHIVE_CACHE. * feedback * fix get latest package on Windows. * invoke test --- .../Installers/Install-ActionArchiveCache.ps1 | 21 +++++++++++++++++++ .../scripts/Installers/Update-ImageData.ps1 | 3 ++- .../Tests/ActionArchiveCache.Tests.ps1 | 15 +++++++++++++ images/win/windows2019.json | 4 +++- images/win/windows2022.json | 2 ++ 5 files changed, 43 insertions(+), 2 deletions(-) create mode 100644 images/win/scripts/Installers/Install-ActionArchiveCache.ps1 create mode 100644 images/win/scripts/Tests/ActionArchiveCache.Tests.ps1 diff --git a/images/win/scripts/Installers/Install-ActionArchiveCache.ps1 b/images/win/scripts/Installers/Install-ActionArchiveCache.ps1 new file mode 100644 index 000000000000..4f4bc00b55b8 --- /dev/null +++ b/images/win/scripts/Installers/Install-ActionArchiveCache.ps1 @@ -0,0 +1,21 @@ +################################################################################ +## File: Install-ActionArchiveCache.ps1 +## Desc: Download latest release from https://github.com/actions/action-versions +## and un-zip to C:\actionarchivecache +## Maintainer: #actions-runtime and @TingluoHuang +################################################################################ + +if (-not (Test-Path $env:ACTIONS_RUNNER_ACTION_ARCHIVE_CACHE)) +{ + Write-Host "Creating action archive cache folder" + New-Item -ItemType Directory -Path $env:ACTIONS_RUNNER_ACTION_ARCHIVE_CACHE | Out-Null +} + +$downloadUrl = Get-GitHubPackageDownloadUrl -RepoOwner "actions" -RepoName "action-versions" -Version "latest" -UrlFilter "*/v{Version}/action-versions.zip" +Write-Host "Download Latest action-versions archive from $downloadUrl" +$actionVersionsArchivePath = Start-DownloadWithRetry -Url $downloadUrl -Name "action-versions.zip" + +Write-Host "Expand action-versions archive" +Extract-7Zip -Path $actionVersionsArchivePath -DestinationPath $env:ACTIONS_RUNNER_ACTION_ARCHIVE_CACHE + +Invoke-PesterTests -TestFile "ActionArchiveCache" diff --git a/images/win/scripts/Installers/Update-ImageData.ps1 b/images/win/scripts/Installers/Update-ImageData.ps1 index 0afa2bdd2af4..f27b5c7e4115 100644 --- a/images/win/scripts/Installers/Update-ImageData.ps1 +++ b/images/win/scripts/Installers/Update-ImageData.ps1 @@ -41,4 +41,5 @@ $json | Out-File -FilePath $imageDataFile # Set static env vars setx ImageVersion $env:IMAGE_VERSION /m setx ImageOS $env:IMAGE_OS /m -setx AGENT_TOOLSDIRECTORY $env:AGENT_TOOLSDIRECTORY /m \ No newline at end of file +setx AGENT_TOOLSDIRECTORY $env:AGENT_TOOLSDIRECTORY /m +setx ACTIONS_RUNNER_ACTION_ARCHIVE_CACHE $env:ACTIONS_RUNNER_ACTION_ARCHIVE_CACHE /m diff --git a/images/win/scripts/Tests/ActionArchiveCache.Tests.ps1 b/images/win/scripts/Tests/ActionArchiveCache.Tests.ps1 new file mode 100644 index 000000000000..e0bb71172e30 --- /dev/null +++ b/images/win/scripts/Tests/ActionArchiveCache.Tests.ps1 @@ -0,0 +1,15 @@ +Describe "ActionArchiveCache" { + Context "Action archive cache directory not empty" { + It "C:\actionarchivecache not empty" { + (Get-ChildItem -Path "C:\actionarchivecache\*.zip" -Recurse).Count | Should -BeGreaterThan 0 + } + } + + Context "Action zipball not empty" { + $testCases = Get-ChildItem -Path "C:\actionarchivecache\*.zip" -Recurse | ForEach-Object { @{ ActionZipball = $_.FullName } } + It "<ActionZipball>" -TestCases $testCases { + param ([string] $ActionZipball) + (Get-Item "$ActionZipball").Length | Should -BeGreaterThan 0 + } + } +} diff --git a/images/win/windows2019.json b/images/win/windows2019.json index 07d3a6f02c32..834a0c3c5cbc 100644 --- a/images/win/windows2019.json +++ b/images/win/windows2019.json @@ -146,6 +146,7 @@ "IMAGE_VERSION={{user `image_version`}}", "IMAGE_OS={{user `image_os`}}", "AGENT_TOOLSDIRECTORY={{user `agent_tools_directory`}}", + "ACTIONS_RUNNER_ACTION_ARCHIVE_CACHE=C:\\actionarchivecache\\", "IMAGEDATA_FILE={{user `imagedata_file`}}" ], "scripts": [ @@ -225,6 +226,7 @@ { "type": "powershell", "scripts": [ + "{{ template_dir }}/scripts/Installers/Install-ActionArchiveCache.ps1", "{{ template_dir }}/scripts/Installers/Install-Ruby.ps1", "{{ template_dir }}/scripts/Installers/Install-PyPy.ps1", "{{ template_dir }}/scripts/Installers/Install-Toolset.ps1", @@ -362,4 +364,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/images/win/windows2022.json b/images/win/windows2022.json index db4a671f355b..bccf2df30c7e 100644 --- a/images/win/windows2022.json +++ b/images/win/windows2022.json @@ -130,6 +130,7 @@ "IMAGE_VERSION={{user `image_version`}}", "IMAGE_OS={{user `image_os`}}", "AGENT_TOOLSDIRECTORY={{user `agent_tools_directory`}}", + "ACTIONS_RUNNER_ACTION_ARCHIVE_CACHE=C:\\actionarchivecache\\", "IMAGEDATA_FILE={{user `imagedata_file`}}" ], "scripts": [ @@ -215,6 +216,7 @@ { "type": "powershell", "scripts": [ + "{{ template_dir }}/scripts/Installers/Install-ActionArchiveCache.ps1", "{{ template_dir }}/scripts/Installers/Install-Ruby.ps1", "{{ template_dir }}/scripts/Installers/Install-PyPy.ps1", "{{ template_dir }}/scripts/Installers/Install-Toolset.ps1", From d77bb13e9741ebfe3aa859d3313492a8d43990fc Mon Sep 17 00:00:00 2001 From: Tingluo Huang <tingluohuang@github.com> Date: Thu, 12 Oct 2023 04:54:39 -0400 Subject: [PATCH 2316/3485] [macOS] cache most used GitHub actions * Download actions/action_versions latest release on macOS and set ACTIONS_RUNNER_ACTION_ARCHIVE_CACHE. * Feedback. --- .../configuration/environment/bashrc | 1 + .../provision/core/action-archive-cache.sh | 22 +++++++++++++++++++ images/macos/templates/macOS-11.json | 1 + images/macos/templates/macOS-12.anka.pkr.hcl | 1 + images/macos/templates/macOS-12.json | 1 + images/macos/templates/macOS-13.anka.pkr.hcl | 1 + .../templates/macOS-13.arm64.anka.pkr.hcl | 1 + .../macos/tests/ActionArchiveCache.Tests.ps1 | 15 +++++++++++++ 8 files changed, 43 insertions(+) create mode 100755 images/macos/provision/core/action-archive-cache.sh create mode 100644 images/macos/tests/ActionArchiveCache.Tests.ps1 diff --git a/images/macos/provision/configuration/environment/bashrc b/images/macos/provision/configuration/environment/bashrc index aedd17a65f84..ca021fd78d2d 100644 --- a/images/macos/provision/configuration/environment/bashrc +++ b/images/macos/provision/configuration/environment/bashrc @@ -12,6 +12,7 @@ export NUNIT3_PATH=/Library/Developer/nunit/3.6.0 export AGENT_TOOLSDIRECTORY=$HOME/hostedtoolcache export RUNNER_TOOL_CACHE=$HOME/hostedtoolcache +export ACTIONS_RUNNER_ACTION_ARCHIVE_CACHE=$HOME/actionarchivecache export PATH=/Library/Frameworks/Mono.framework/Versions/Current/Commands:$PATH export PATH=/Library/Frameworks/Python.framework/Versions/Current/bin:$PATH diff --git a/images/macos/provision/core/action-archive-cache.sh b/images/macos/provision/core/action-archive-cache.sh new file mode 100755 index 000000000000..99ad6a0c650b --- /dev/null +++ b/images/macos/provision/core/action-archive-cache.sh @@ -0,0 +1,22 @@ +#!/bin/bash -e -o pipefail + +################################################################################ +## File: action-archive-cache.sh +## Desc: Download latest release from https://github.com/actions/action-verions +## and un-tar to $HOME/actionarchivecache +## Maintainer: #actions-runtime and @TingluoHuang +################################################################################ + +source ~/utils/utils.sh + +echo "Check if ACTIONS_RUNNER_ACTION_ARCHIVE_CACHE folder exist..." +if [ ! -d $ACTIONS_RUNNER_ACTION_ARCHIVE_CACHE ]; then + mkdir -p $ACTIONS_RUNNER_ACTION_ARCHIVE_CACHE +fi + +downloadUrl=$(get_github_package_download_url "actions/action-versions" "contains(\"action-versions.tar.gz\")" "latest") +echo "Downloading action-versions $downloadUrl" +download_with_retries "$downloadUrl" "/tmp" action-versions.tar.gz +tar -xzf /tmp/action-versions.tar.gz -C $ACTIONS_RUNNER_ACTION_ARCHIVE_CACHE + +invoke_tests "ActionArchiveCache" diff --git a/images/macos/templates/macOS-11.json b/images/macos/templates/macOS-11.json index 8572fae04702..e7f682c420dd 100644 --- a/images/macos/templates/macOS-11.json +++ b/images/macos/templates/macOS-11.json @@ -183,6 +183,7 @@ "type": "shell", "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}", "scripts": [ + "./provision/core/action-archive-cache.sh", "./provision/core/commonutils.sh", "./provision/core/llvm.sh", "./provision/core/golang.sh", diff --git a/images/macos/templates/macOS-12.anka.pkr.hcl b/images/macos/templates/macOS-12.anka.pkr.hcl index 44bdbe58db61..c13e60fa9a1c 100644 --- a/images/macos/templates/macOS-12.anka.pkr.hcl +++ b/images/macos/templates/macOS-12.anka.pkr.hcl @@ -198,6 +198,7 @@ build { } provisioner "shell" { scripts = [ + "./provision/core/action-archive-cache.sh", "./provision/core/llvm.sh", "./provision/core/golang.sh", "./provision/core/swiftlint.sh", diff --git a/images/macos/templates/macOS-12.json b/images/macos/templates/macOS-12.json index 57d7bc7240dd..424600365664 100644 --- a/images/macos/templates/macOS-12.json +++ b/images/macos/templates/macOS-12.json @@ -185,6 +185,7 @@ "type": "shell", "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}", "scripts": [ + "./provision/core/action-archive-cache.sh", "./provision/core/llvm.sh", "./provision/core/golang.sh", "./provision/core/swiftlint.sh", diff --git a/images/macos/templates/macOS-13.anka.pkr.hcl b/images/macos/templates/macOS-13.anka.pkr.hcl index 3b8f36495525..7b833065ed2c 100644 --- a/images/macos/templates/macOS-13.anka.pkr.hcl +++ b/images/macos/templates/macOS-13.anka.pkr.hcl @@ -194,6 +194,7 @@ build { } provisioner "shell" { scripts = [ + "./provision/core/action-archive-cache.sh", "./provision/core/llvm.sh", "./provision/core/swiftlint.sh", "./provision/core/openjdk.sh", diff --git a/images/macos/templates/macOS-13.arm64.anka.pkr.hcl b/images/macos/templates/macOS-13.arm64.anka.pkr.hcl index d022109df3ab..6074f294b694 100644 --- a/images/macos/templates/macOS-13.arm64.anka.pkr.hcl +++ b/images/macos/templates/macOS-13.arm64.anka.pkr.hcl @@ -194,6 +194,7 @@ build { } provisioner "shell" { scripts = [ + "./provision/core/action-archive-cache.sh", "./provision/core/llvm.sh", "./provision/core/openjdk.sh", "./provision/core/rust.sh", diff --git a/images/macos/tests/ActionArchiveCache.Tests.ps1 b/images/macos/tests/ActionArchiveCache.Tests.ps1 new file mode 100644 index 000000000000..d45755dbf217 --- /dev/null +++ b/images/macos/tests/ActionArchiveCache.Tests.ps1 @@ -0,0 +1,15 @@ +Describe "ActionArchiveCache" { + Context "Action archive cache directory not empty" { + It "$HOME/actionarchivecache not empty" { + (Get-ChildItem -Path "$env:HOME/actionarchivecache/*.tar.gz" -Recurse).Count | Should -BeGreaterThan 0 + } + } + + Context "Action tarball not empty" { + $testCases = Get-ChildItem -Path "$env:HOME/actionarchivecache/*.tar.gz" -Recurse | ForEach-Object { @{ ActionTarball = $_.FullName } } + It "<ActionTarball>" -TestCases $testCases { + param ([string] $ActionTarball) + (Get-Item "$ActionTarball").Length | Should -BeGreaterThan 0 + } + } +} From eff24a90c946bc51bb8c800dadfea9b76ef5e016 Mon Sep 17 00:00:00 2001 From: sergei-pyshnoi <121864472+sergei-pyshnoi@users.noreply.github.com> Date: Thu, 12 Oct 2023 11:31:35 +0200 Subject: [PATCH 2317/3485] [MacOS] Add closing System Preference window for arm64 (#8470) --- images/macos/provision/core/open_windows_check.sh | 8 ++++++++ images/macos/templates/macOS-13.arm64.anka.pkr.hcl | 1 + 2 files changed, 9 insertions(+) diff --git a/images/macos/provision/core/open_windows_check.sh b/images/macos/provision/core/open_windows_check.sh index 002c254bdf9c..de0827c4afca 100644 --- a/images/macos/provision/core/open_windows_check.sh +++ b/images/macos/provision/core/open_windows_check.sh @@ -1,5 +1,13 @@ #!/bin/bash -e -o pipefail +source ~/utils/utils.sh + +# Close System Preferences window because in Ventura arm64 it is opened by default on Apperance tab +if is_VenturaArm64; then + echo "Close System Preferences window" + osascript -e 'tell application "System Preferences" to quit' +fi + retry=10 while [ $retry -gt 0 ]; do openwindows=$(osascript -e 'tell application "System Events" to get every window of (every process whose class of windows contains window)') && break diff --git a/images/macos/templates/macOS-13.arm64.anka.pkr.hcl b/images/macos/templates/macOS-13.arm64.anka.pkr.hcl index 6074f294b694..3956b3fbbd3b 100644 --- a/images/macos/templates/macOS-13.arm64.anka.pkr.hcl +++ b/images/macos/templates/macOS-13.arm64.anka.pkr.hcl @@ -162,6 +162,7 @@ build { provisioner "shell" { pause_before = "30s" scripts = [ + "./provision/core/open_windows_check.sh", "./provision/core/powershell.sh", "./provision/core/mono.sh", "./provision/core/dotnet.sh", From cde475b36be079e59597a8ebaace303943921f55 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Thu, 12 Oct 2023 15:06:30 +0200 Subject: [PATCH 2318/3485] Update anka clean script (#8537) --- images.CI/macos/anka/CreateCleanAnkaTemplate.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images.CI/macos/anka/CreateCleanAnkaTemplate.ps1 b/images.CI/macos/anka/CreateCleanAnkaTemplate.ps1 index 676e6c5f7855..ce367cdaedb7 100644 --- a/images.CI/macos/anka/CreateCleanAnkaTemplate.ps1 +++ b/images.CI/macos/anka/CreateCleanAnkaTemplate.ps1 @@ -90,7 +90,7 @@ function Invoke-SoftwareUpdate { Write-Host "`t[*] Fetching Software Updates ready to install on '$TemplateName' VM:" Show-StringWithFormat $newUpdates - $listOfNewUpdates = $($($newUpdates.Split("*")).Split("Title") | Where-Object {$_ -match "Label:"}).Replace("Label: ", '') + $listOfNewUpdates = $($($newUpdates.Split("*")).Split("Title") | Where-Object {$_ -match "Label:"}).Replace("Label: ", '') | Where-Object {$_ -notmatch "macOS Sonoma"} Write-Host "`t[*] Installing Software Updates on '$TemplateName' VM:" Install-SoftwareUpdate -HostName $ipAddress -listOfUpdates $listOfNewUpdates -Password $Password | Show-StringWithFormat @@ -99,7 +99,7 @@ function Invoke-SoftwareUpdate { $listOfNewUpdates = $newUpdates.split('*').Trim('') foreach ($newupdate in $listOfNewUpdates) { # Will be True if the value is not Venture, not empty, and contains "Action: restart" words - if ($newupdate.Contains("Action: restart") -and !$newupdate.Contains("macOS Ventura") -and (-not [String]::IsNullOrEmpty($newupdate))) { + if ($newupdate.Contains("Action: restart") -and (!$newupdate.Contains("macOS Ventura") -or !$newupdate.Contains("macOS Sonoma")) -and (-not [String]::IsNullOrEmpty($newupdate))) { Write-Host "`t[*] Sleep 60 seconds before the software updates have been installed" Start-Sleep -Seconds 60 From ddfdbbac21a4d38b87264741ce77092058d658bb Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Thu, 12 Oct 2023 17:47:45 +0200 Subject: [PATCH 2319/3485] [macOS] Fix java info in toolsets (#8538) --- images/macos/toolsets/toolset-11.json | 6 ++++-- images/macos/toolsets/toolset-12.json | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index 40c2546be716..c3c76b561353 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -153,8 +153,10 @@ ] }, "java": { - "default": "8", - "versions": [ "8", "11", "17" ] + "x64": { + "default": "8", + "versions": [ "8", "11", "17" ] + } }, "android": { "platform_min_version": "27", diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index aa36b1b36609..df6d2d180e85 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -140,8 +140,10 @@ ] }, "java": { - "default": "8", - "versions": [ "8", "11", "17" ] + "x64": { + "default": "8", + "versions": [ "8", "11", "17" ] + } }, "android": { "platform_min_version": "27", From acbe023579d8dfb837abebe3d6ec585eafbb7790 Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Thu, 12 Oct 2023 18:55:52 +0200 Subject: [PATCH 2320/3485] [macOS] Add XCode 15.0.1 RC1 (#8532) --- images/macos/toolsets/toolset-13.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/images/macos/toolsets/toolset-13.json b/images/macos/toolsets/toolset-13.json index 71ba5f937043..b952f8e44f29 100644 --- a/images/macos/toolsets/toolset-13.json +++ b/images/macos/toolsets/toolset-13.json @@ -3,6 +3,7 @@ "default": "14.3.1", "x64": { "versions": [ + { "link": "15.0.1", "version": "15.0.1-Release.Candidate+15A507"}, { "link": "15.0", "version": "15.0.0+15A240d"}, { "link": "14.3.1", "version": "14.3.1+14E300c","symlinks": ["14.3"] }, { "link": "14.2", "version": "14.2.0+14C18" }, @@ -11,6 +12,7 @@ }, "arm64":{ "versions": [ + { "link": "15.0.1", "version": "15.0.1-Release.Candidate+15A507"}, { "link": "15.0", "version": "15.0.0+15A240d"}, { "link": "14.3.1", "version": "14.3.1+14E300c","symlinks": ["14.3"] }, { "link": "14.2", "version": "14.2.0+14C18" }, From 229285b76d2b040a8bf7a249eca6e9bbc5d458ac Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Thu, 12 Oct 2023 19:06:03 +0200 Subject: [PATCH 2321/3485] [macos] Adjust activesupport ruby gem version pinning (#8541) --- images/macos/provision/core/rubygem.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/images/macos/provision/core/rubygem.sh b/images/macos/provision/core/rubygem.sh index da587914b169..9b9b4cb63953 100755 --- a/images/macos/provision/core/rubygem.sh +++ b/images/macos/provision/core/rubygem.sh @@ -4,6 +4,9 @@ source ~/utils/utils.sh echo Updating RubyGems... gem update --system +# Temporarily install activesupport 7.0.8 due to compatibility issues with cocoapods https://github.com/CocoaPods/CocoaPods/issues/12081 +gem install activesupport -v 7.0.8 + gemsToInstall=$(get_toolset_value '.ruby.rubygems | .[]') if [ -n "$gemsToInstall" ]; then for gem in $gemsToInstall; do @@ -12,7 +15,4 @@ if [ -n "$gemsToInstall" ]; then done fi -# Temporarily install activesupport 7.0.8 due to compatibility issues with cocoapods https://github.com/CocoaPods/CocoaPods/issues/12081 -gem install activesupport -v 7.0.8 && gem uninstall activesupport -v 7.1.0 - invoke_tests "RubyGem" From 15a60352c01b1f59a641ad3f9415e43d3342f380 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Thu, 12 Oct 2023 20:38:12 +0200 Subject: [PATCH 2322/3485] [macOS] Fix Gradle test (#8543) --- images/macos/provision/core/openjdk.sh | 1 - images/macos/tests/Java.Tests.ps1 | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/images/macos/provision/core/openjdk.sh b/images/macos/provision/core/openjdk.sh index cc9208e724f3..dbbc1c6299e0 100755 --- a/images/macos/provision/core/openjdk.sh +++ b/images/macos/provision/core/openjdk.sh @@ -70,7 +70,6 @@ installOpenJDK() { } arch=$(get_arch) -echo $arch defaultVersion=$(get_toolset_value '.java.'$arch'.default') jdkVersionsToInstall=($(get_toolset_value ".java.${arch}.versions[]")) diff --git a/images/macos/tests/Java.Tests.ps1 b/images/macos/tests/Java.Tests.ps1 index ef73eb96dbee..5948b5a2e761 100644 --- a/images/macos/tests/Java.Tests.ps1 +++ b/images/macos/tests/Java.Tests.ps1 @@ -75,7 +75,7 @@ Describe "Java" { (Get-Command "gradle").Path | Should -BeExactly "/usr/local/bin/gradle" } - It "Gradle is installed to /opt/homebrew/bin/gradle" -Skip:($os.IsVentura) { + It "Gradle is installed to /opt/homebrew/bin/gradle" -Skip:(-not $os.IsVenturaArm64) { (Get-Command "gradle").Path | Should -BeExactly "/opt/homebrew/bin/gradle" } } From c138066e21ddfc7972b524af6a6f11466ef6ebd7 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Fri, 13 Oct 2023 14:05:09 +0200 Subject: [PATCH 2323/3485] [Ubuntu] revert azcli to the latest version (#8548) --- images/linux/scripts/installers/azure-cli.sh | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/images/linux/scripts/installers/azure-cli.sh b/images/linux/scripts/installers/azure-cli.sh index 2a146e690241..bca11b8b34f7 100644 --- a/images/linux/scripts/installers/azure-cli.sh +++ b/images/linux/scripts/installers/azure-cli.sh @@ -5,17 +5,7 @@ ################################################################################ # Install Azure CLI (instructions taken from https://docs.microsoft.com/en-us/cli/azure/install-azure-cli) -# temporary pin v2.25.0 -sudo mkdir -p /etc/apt/keyrings -curl -sLS https://packages.microsoft.com/keys/microsoft.asc | -gpg --dearmor | -sudo tee /etc/apt/keyrings/microsoft.gpg > /dev/null -sudo chmod go+r /etc/apt/keyrings/microsoft.gpg -AZ_DIST=$(lsb_release -cs) -echo "deb [arch=`dpkg --print-architecture` signed-by=/etc/apt/keyrings/microsoft.gpg] https://packages.microsoft.com/repos/azure-cli/ $AZ_DIST main" | sudo tee /etc/apt/sources.list.d/azure-cli.list -sudo apt-get update -AZ_VER=2.52.0 -sudo apt-get install azure-cli=$AZ_VER-1~$AZ_DIST +curl -fsSL https://aka.ms/InstallAzureCLIDeb | sudo bash echo "azure-cli https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt" >> $HELPER_SCRIPTS/apt-sources.txt rm -f /etc/apt/sources.list.d/azure-cli.list rm -f /etc/apt/sources.list.d/azure-cli.list.save From 53d0847239174c0f26a8bfa9749c65e563733874 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Fri, 13 Oct 2023 14:20:43 +0200 Subject: [PATCH 2324/3485] [Anka] Exclude upgrade to Sonoma (#8551) --- images.CI/macos/anka/CreateCleanAnkaTemplate.ps1 | 4 ++-- images.CI/macos/anka/Service.Helpers.psm1 | 15 ++++++++++++--- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/images.CI/macos/anka/CreateCleanAnkaTemplate.ps1 b/images.CI/macos/anka/CreateCleanAnkaTemplate.ps1 index ce367cdaedb7..bba755b95ce6 100644 --- a/images.CI/macos/anka/CreateCleanAnkaTemplate.ps1 +++ b/images.CI/macos/anka/CreateCleanAnkaTemplate.ps1 @@ -90,7 +90,7 @@ function Invoke-SoftwareUpdate { Write-Host "`t[*] Fetching Software Updates ready to install on '$TemplateName' VM:" Show-StringWithFormat $newUpdates - $listOfNewUpdates = $($($newUpdates.Split("*")).Split("Title") | Where-Object {$_ -match "Label:"}).Replace("Label: ", '') | Where-Object {$_ -notmatch "macOS Sonoma"} + $listOfNewUpdates = $($($newUpdates.Split("*")).Split("Title") | Where-Object {$_ -match "Label:"}).Replace("Label: ", '') Write-Host "`t[*] Installing Software Updates on '$TemplateName' VM:" Install-SoftwareUpdate -HostName $ipAddress -listOfUpdates $listOfNewUpdates -Password $Password | Show-StringWithFormat @@ -99,7 +99,7 @@ function Invoke-SoftwareUpdate { $listOfNewUpdates = $newUpdates.split('*').Trim('') foreach ($newupdate in $listOfNewUpdates) { # Will be True if the value is not Venture, not empty, and contains "Action: restart" words - if ($newupdate.Contains("Action: restart") -and (!$newupdate.Contains("macOS Ventura") -or !$newupdate.Contains("macOS Sonoma")) -and (-not [String]::IsNullOrEmpty($newupdate))) { + if ($newupdate.Contains("Action: restart") -and !$newupdate.Contains("macOS Ventura") -and !$newupdate.Contains("macOS Sonoma") -and (-not [String]::IsNullOrEmpty($newupdate))) { Write-Host "`t[*] Sleep 60 seconds before the software updates have been installed" Start-Sleep -Seconds 60 diff --git a/images.CI/macos/anka/Service.Helpers.psm1 b/images.CI/macos/anka/Service.Helpers.psm1 index b6b9d23113fb..d999765f370a 100644 --- a/images.CI/macos/anka/Service.Helpers.psm1 +++ b/images.CI/macos/anka/Service.Helpers.psm1 @@ -244,9 +244,10 @@ function Install-SoftwareUpdate { [array] $listOfUpdates, [string] $Password ) - $osVersion = [Environment]::OSVersion - # If an update is happening on macOS 12 we will use the prepared list of updates, otherwise, we will install all updates. - if ($osVersion.Version.Major -eq "12") { + # If an update is happening on macOS 12 or 13 we will use the prepared list of updates, otherwise, we will install all updates. + $command = "sw_vers" + $guestMacosVersion = Invoke-SSHPassCommand -HostName $HostName -Command $command + if ($guestMacosVersion[1] -match "12") { foreach ($update in $listOfUpdates){ # Filtering updates that contain "Ventura" word if ($update -notmatch "Ventura") { @@ -254,6 +255,14 @@ function Install-SoftwareUpdate { Invoke-SSHPassCommand -HostName $HostName -Command $command } } + } elseif ($guestMacosVersion[1] -match "13") { + foreach ($update in $listOfUpdates){ + # Filtering updates that contain "Sonoma" word + if ($update -notmatch "Sonoma") { + $command = "sudo /usr/sbin/softwareupdate --restart --verbose --install '$($update.trim())'" + Invoke-SSHPassCommand -HostName $HostName -Command $command + } + } } else { $osArch = $(arch) if ($osArch -eq "arm64") { From 2fd64bb024d77fde406ad2eb6af4054dc2464026 Mon Sep 17 00:00:00 2001 From: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com> Date: Fri, 13 Oct 2023 14:29:01 +0200 Subject: [PATCH 2325/3485] [macos] add retries when installing DotNETSDK (#8550) --- images/macos/provision/core/dotnet.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/macos/provision/core/dotnet.sh b/images/macos/provision/core/dotnet.sh index 8e86c56427df..f9fea2371d7c 100755 --- a/images/macos/provision/core/dotnet.sh +++ b/images/macos/provision/core/dotnet.sh @@ -14,7 +14,7 @@ arch=$(get_arch) # Download installer from dot.net and keep it locally DOTNET_INSTALL_SCRIPT="https://dot.net/v1/dotnet-install.sh" -curl -fsSL -o "dotnet-install.sh" "$DOTNET_INSTALL_SCRIPT" +download_with_retries $DOTNET_INSTALL_SCRIPT . chmod +x ./dotnet-install.sh ARGS_LIST=() From 36165e08cd4be57c1cc68edf37318ad6c9c5462c Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Fri, 13 Oct 2023 14:35:56 +0200 Subject: [PATCH 2326/3485] [Windows] revert Az CLI to the latest version (#8549) --- images/win/scripts/Installers/Install-AzureCli.ps1 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/images/win/scripts/Installers/Install-AzureCli.ps1 b/images/win/scripts/Installers/Install-AzureCli.ps1 index e3a02dac4411..fe5c5ca3338f 100644 --- a/images/win/scripts/Installers/Install-AzureCli.ps1 +++ b/images/win/scripts/Installers/Install-AzureCli.ps1 @@ -11,8 +11,7 @@ $azureCliConfigPath = 'C:\azureCli' # make variable to be available in the current session ${env:AZURE_CONFIG_DIR} = $azureCliConfigPath -#temporary pin 2.52.0 version -$azCliUrl = 'https://azcliprod.blob.core.windows.net/msi/azure-cli-2.52.0-x64.msi' +$azCliUrl = 'https://aka.ms/installazurecliwindowsx64' $azCliSignatureThumbprint = "72105B6D5F370B62FD5C82F1512F7AD7DEE5F2C0" Install-Binary -Url $azCliUrl -Name 'azure-cli.msi' -ExpectedSignature $azCliSignatureThumbprint From 8bc2448fe17188a8dd61efa324fddc43e91a29b0 Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Fri, 13 Oct 2023 15:45:18 +0200 Subject: [PATCH 2327/3485] [Windows] Add Java 21 (#8534) --- images/win/toolsets/toolset-2019.json | 2 +- images/win/toolsets/toolset-2022.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index c1c90a1f765e..5042e92e2bfe 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -144,7 +144,7 @@ ], "java": { "default": "8", - "versions": [ "8", "11", "17" ] + "versions": [ "8", "11", "17", "21"] }, "android": { "commandline_tools_url": "https://dl.google.com/android/repository/commandlinetools-win-9123335_latest.zip", diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index 2cb7d638017b..b3a2718539d0 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -128,7 +128,7 @@ ], "java": { "default": "8", - "versions": [ "8", "11", "17" ] + "versions": [ "8", "11", "17", "21"] }, "android": { "commandline_tools_url": "https://dl.google.com/android/repository/commandlinetools-win-9123335_latest.zip", From efb9babb4bbf9f62e8decdee85d0504bac08bf70 Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Fri, 13 Oct 2023 15:48:17 +0200 Subject: [PATCH 2328/3485] [macOS] Install Java 21 on MacOS x64 (#8535) --- images/macos/toolsets/toolset-11.json | 2 +- images/macos/toolsets/toolset-12.json | 2 +- images/macos/toolsets/toolset-13.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index c3c76b561353..ee539620a9df 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -155,7 +155,7 @@ "java": { "x64": { "default": "8", - "versions": [ "8", "11", "17" ] + "versions": [ "8", "11", "17", "21"] } }, "android": { diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index df6d2d180e85..a359f3944389 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -142,7 +142,7 @@ "java": { "x64": { "default": "8", - "versions": [ "8", "11", "17" ] + "versions": [ "8", "11", "17", "21"] } }, "android": { diff --git a/images/macos/toolsets/toolset-13.json b/images/macos/toolsets/toolset-13.json index b952f8e44f29..435aa8bc1809 100644 --- a/images/macos/toolsets/toolset-13.json +++ b/images/macos/toolsets/toolset-13.json @@ -23,7 +23,7 @@ "java": { "x64": { "default": "17", - "versions": [ "8", "11", "17" ] + "versions": [ "8", "11", "17", "21"] }, "arm64": { "default": "17", From 060ad1383a7231762cbd2d61a04116a2dc7905e0 Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Fri, 13 Oct 2023 16:00:45 +0200 Subject: [PATCH 2329/3485] [macOS] Install Java 21 on MacOS 13 arm64 (#8545) --- .../macos/software-report/SoftwareReport.Generator.ps1 | 8 ++++---- images/macos/software-report/SoftwareReport.Java.psm1 | 10 ++++++++-- images/macos/toolsets/toolset-13.json | 2 +- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1 index 428f9be743b5..7b6631d5a29c 100644 --- a/images/macos/software-report/SoftwareReport.Generator.ps1 +++ b/images/macos/software-report/SoftwareReport.Generator.ps1 @@ -207,11 +207,11 @@ if (-not $os.IsVenturaArm64) { $browsers = $installedSoftware.AddHeader("Browsers") $browsers.AddNodes($(Build-BrowserSection)) $browsers.AddNode($(Build-BrowserWebdriversEnvironmentTable)) - - # Java - $java = $installedSoftware.AddHeader("Java") - $java.AddTable($(Get-JavaVersions)) } +# Java +$java = $installedSoftware.AddHeader("Java") +$java.AddTable($(Get-JavaVersions)) + if (-not $os.IsVenturaArm64) { # Toolcache $toolcache = $installedSoftware.AddHeader("Cached Tools") diff --git a/images/macos/software-report/SoftwareReport.Java.psm1 b/images/macos/software-report/SoftwareReport.Java.psm1 index 6b034d2acd1c..c3f5020cb0ad 100644 --- a/images/macos/software-report/SoftwareReport.Java.psm1 +++ b/images/macos/software-report/SoftwareReport.Java.psm1 @@ -1,6 +1,12 @@ function Get-JavaVersions { $defaultJavaPath = (Get-Item env:JAVA_HOME).value - $javaVersions = Get-Item env:JAVA_HOME_*_X64 + + $os = Get-OSVersion + if ($os.IsVenturaArm64) { + $javaVersions = Get-Item env:JAVA_HOME_*_arm64 + } else { + $javaVersions = Get-Item env:JAVA_HOME_*_X64 + } $sortRules = @{ Expression = { [Int32]$_.Name.Split("_")[2] } Descending = $false @@ -18,4 +24,4 @@ function Get-JavaVersions { "Environment Variable" = $_.Name } } -} \ No newline at end of file +} diff --git a/images/macos/toolsets/toolset-13.json b/images/macos/toolsets/toolset-13.json index 435aa8bc1809..0919ed5835d5 100644 --- a/images/macos/toolsets/toolset-13.json +++ b/images/macos/toolsets/toolset-13.json @@ -27,7 +27,7 @@ }, "arm64": { "default": "17", - "versions": [ "11", "17" ] + "versions": [ "11", "17", "21"] } }, "android": { From b3b303d294ff511c0d1cb33571e93dc741238870 Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Sun, 15 Oct 2023 20:34:15 +0200 Subject: [PATCH 2330/3485] [macos] Remove python2 UnixTools and adjust brew symlinks (#8452) --- images/macos/provision/core/python.sh | 17 +++++++++++++---- .../software-report/SoftwareReport.Common.psm1 | 4 ++-- images/macos/tests/Python.Tests.ps1 | 12 ++---------- 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/images/macos/provision/core/python.sh b/images/macos/provision/core/python.sh index 287070b1b227..be801340bed2 100755 --- a/images/macos/provision/core/python.sh +++ b/images/macos/provision/core/python.sh @@ -7,7 +7,18 @@ if is_Monterey || is_BigSur; then echo "Install latest Python 2" Python2Url="https://www.python.org/ftp/python/2.7.18/python-2.7.18-macosx10.9.pkg" download_with_retries $Python2Url "/tmp" "python2.pkg" - sudo installer -pkg /tmp/python2.pkg -target / + + sudo installer -showChoiceChangesXML -pkg /tmp/python2.pkg -target / > /tmp/python2_choices.xml + + # To avoid symlink conflicts, remove tools installation in /usr/local/bin using installer choices + xmllint --shell /tmp/python2_choices.xml <<EOF + cd //array/dict[string[text()='org.python.Python.PythonUnixTools-2.7']]/integer + set 0 + save +EOF + + sudo installer -applyChoiceChangesXML /tmp/python2_choices.xml -pkg /tmp/python2.pkg -target / + pip install --upgrade pip echo "Install Python2 certificates" @@ -19,10 +30,8 @@ if is_Veertu; then close_finder_window fi -# Explicitly overwrite symlinks created by Python2 such as /usr/local/bin/2to3 since they conflict with symlinks from Python3 -# https://github.com/actions/runner-images/issues/2322 echo "Brew Installing Python 3" -brew_smart_install "python@3.11" || brew link --overwrite python@3.11 +brew_smart_install "python@3.11" echo "Installing pipx" export PIPX_BIN_DIR=/usr/local/opt/pipx_bin diff --git a/images/macos/software-report/SoftwareReport.Common.psm1 b/images/macos/software-report/SoftwareReport.Common.psm1 index 55ea6d4b8994..beaaa30a3970 100644 --- a/images/macos/software-report/SoftwareReport.Common.psm1 +++ b/images/macos/software-report/SoftwareReport.Common.psm1 @@ -129,7 +129,7 @@ function Get-PipVersion { [int] $Version ) - $command = If ($Version -eq 2) { "pip --version" } Else { "pip3 --version" } + $command = If ($Version -eq 2) { "/Library/Frameworks/Python.framework/Versions/2.7/bin/pip --version" } Else { "pip3 --version" } $commandOutput = Run-Command $command $versionPart1 = $commandOutput | Take-Part -Part 1 $versionPart2 = $commandOutput | Take-Part -Part 4 @@ -192,7 +192,7 @@ function Get-PerlVersion { } function Get-PythonVersion { - $pythonVersion = Run-Command "python --version" + $pythonVersion = Run-Command "/Library/Frameworks/Python.framework/Versions/2.7/bin/python --version" return ($pythonVersion -replace "^Python").Trim() } diff --git a/images/macos/tests/Python.Tests.ps1 b/images/macos/tests/Python.Tests.ps1 index 6433dc7db801..4c1f7086e0c6 100644 --- a/images/macos/tests/Python.Tests.ps1 +++ b/images/macos/tests/Python.Tests.ps1 @@ -30,19 +30,11 @@ Describe "Python3" -Skip:($os.IsVenturaArm64) { Describe "Python2" -Skip:($os.IsVenturaArm64 -or $os.IsVentura) { It "Python 2 is available" { - "python --version" | Should -ReturnZeroExitCode - } - - It "Python 2 is real 2.x" { - (Get-CommandResult "python --version").Output | Should -BeLike "Python 2.*" - } - - It "Python 2 is installed under /usr/local/bin" { - Get-WhichTool "python" | Should -BeLike "/usr/local/bin*" + "/Library/Frameworks/Python.framework/Versions/2.7/bin/python --version" | Should -ReturnZeroExitCode } It "Pip 2 is available" { - "pip --version" | Should -ReturnZeroExitCode + "/Library/Frameworks/Python.framework/Versions/2.7/bin/pip --version" | Should -ReturnZeroExitCode } It "2to3 symlink does not point to Python 2" { From 486298a5661bdbe0798d5139a4f3f2a133b74ebc Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Mon, 16 Oct 2023 09:45:23 +0200 Subject: [PATCH 2331/3485] [Windows] Add checksum verification for Aliyun CLI (#8512) --- .../scripts/Installers/Install-AliyunCli.ps1 | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/images/win/scripts/Installers/Install-AliyunCli.ps1 b/images/win/scripts/Installers/Install-AliyunCli.ps1 index d46622e2ecd5..9aef5955aeb3 100644 --- a/images/win/scripts/Installers/Install-AliyunCli.ps1 +++ b/images/win/scripts/Installers/Install-AliyunCli.ps1 @@ -1,18 +1,29 @@ ################################################################################ ## File: Install-AliyunCli.ps1 ## Desc: Install Alibaba Cloud CLI +## Supply chain security: Alibaba Cloud CLI - checksum validation ################################################################################ Write-Host "Download Latest aliyun-cli archive" -$ZipballUrl = 'https://aliyuncli.alicdn.com/aliyun-cli-windows-latest-amd64.zip' -$aliyunArchivePath = Start-DownloadWithRetry -Url $ZipballUrl -Name "aliyun-cli.zip" +$repoUrl = "https://api.github.com/repos/aliyun/aliyun-cli/releases/latest" +$installerFileName = "aliyun-cli-windows" +$assets = (Invoke-RestMethod -Uri $repoUrl).assets +$downloadUrl = ($assets.browser_download_url -ilike "*aliyun-cli-windows-*-amd64.zip*") | Select-Object -First 1 +$packagePath = Start-DownloadWithRetry -Url $downloadUrl -Name "$installerFileName.zip" + +#region Supply chain security - Alibaba Cloud CLI +$fileHash = (Get-FileHash -Path $packagePath -Algorithm SHA256).Hash +$hashUrl = ($assets.browser_download_url -ilike "*SHASUMS256.txt*") | Select-Object -First 1 +$externalHash = (Invoke-RestMethod -Uri $hashURL).ToString().Split("`n").Where({ $_ -ilike "*$installerFileName*" }).Split(' ')[0] +Use-ChecksumComparison $fileHash $externalHash +#endregion Write-Host "Expand aliyun-cli archive" $aliyunPath = "C:\aliyun-cli" New-Item -Path $aliyunPath -ItemType Directory -Force -Extract-7Zip -Path $aliyunArchivePath -DestinationPath $aliyunPath +Extract-7Zip -Path $packagePath -DestinationPath $aliyunPath # Add aliyun-cli to path Add-MachinePathItem $aliyunPath -Invoke-PesterTests -TestFile "CLI.Tools" -TestName "Aliyun CLI" \ No newline at end of file +Invoke-PesterTests -TestFile "CLI.Tools" -TestName "Aliyun CLI" From de1f5298828227e51deb10f135d8ed35aff93101 Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Mon, 16 Oct 2023 09:59:56 +0200 Subject: [PATCH 2332/3485] [macos] Add nvm 20 to toolset (#8559) --- images/macos/toolsets/toolset-11.json | 3 ++- images/macos/toolsets/toolset-12.json | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index ee539620a9df..f7462b85827a 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -346,7 +346,8 @@ "nvm_versions": [ "14", "16", - "18" + "18", + "20" ] }, "llvm": { diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index a359f3944389..fd3f73191ca8 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -330,7 +330,8 @@ "nvm_versions": [ "14", "16", - "18" + "18", + "20" ] }, "llvm": { From 20515646882f4918c687f642c3dd54b617956a2e Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Mon, 16 Oct 2023 15:18:23 +0200 Subject: [PATCH 2333/3485] Set static UUID to the clean image (#8564) --- images.CI/macos/anka/Anka.Helpers.psm1 | 16 ++++++++++++++++ images.CI/macos/anka/CreateCleanAnkaTemplate.ps1 | 6 +++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/images.CI/macos/anka/Anka.Helpers.psm1 b/images.CI/macos/anka/Anka.Helpers.psm1 index 7d710b2b691e..69801c135ec2 100644 --- a/images.CI/macos/anka/Anka.Helpers.psm1 +++ b/images.CI/macos/anka/Anka.Helpers.psm1 @@ -233,3 +233,19 @@ function Wait-AnkaVMSSHService { exit 1 } } + +function Set-AnkaVMUuid { + param( + [Parameter(Mandatory)] + [ValidateNotNullOrEmpty()] + [string] $VMName, + + [Parameter(Mandatory)] + [ValidateNotNullOrEmpty()] + [string] $Uuid + ) + + $command = "anka modify $VMName set custom-variable hw.uuid $Uuid" + Write-Host "`t[*] Setting $VMName uuid to $Uuid" + Invoke-AnkaCommand -Command $command +} diff --git a/images.CI/macos/anka/CreateCleanAnkaTemplate.ps1 b/images.CI/macos/anka/CreateCleanAnkaTemplate.ps1 index bba755b95ce6..c5e88e217786 100644 --- a/images.CI/macos/anka/CreateCleanAnkaTemplate.ps1 +++ b/images.CI/macos/anka/CreateCleanAnkaTemplate.ps1 @@ -27,7 +27,8 @@ param( [int] $RamSizeGb = 7, [int] $DiskSizeGb = 300, [string] $DisplayResolution = "1920x1080", - [string] $TagName = [DateTimeOffset]::Now.ToUnixTimeSeconds() + [string] $TagName = [DateTimeOffset]::Now.ToUnixTimeSeconds(), + [string] $Uuid = "4203018E-580F-C1B5-9525-B745CECA79EB" ) $ErrorActionPreference = "Stop" @@ -205,6 +206,9 @@ Set-AnkaVMVideoController -VMName $TemplateName -ShortMacOSVersion $ShortMacOSVe Write-Host "`t[*] Setting screen resolution to $DisplayResolution for $TemplateName" Set-AnkaVMDisplayResolution -VMName $TemplateName -DisplayResolution $DisplayResolution +# Set static UUID +Set-AnkaVMUuid -VMName $TemplateName -Uuid $Uuid + if ($PushToRegistry) { # Push a VM template (and tag) to the Cloud Write-Host "`t[*] Pushing '$TemplateName' image with '$TagName' tag to the '$RegistryUrl' registry..." From 3aa3daa4f960e992fd1000f7cc370025ea415243 Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Mon, 16 Oct 2023 15:19:04 +0200 Subject: [PATCH 2334/3485] [Ubuntu] Add Mozilla PPA manually (#8561) --- images/linux/scripts/installers/firefox.sh | 23 +++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/images/linux/scripts/installers/firefox.sh b/images/linux/scripts/installers/firefox.sh index 39416cc99717..5ac72a816ea9 100644 --- a/images/linux/scripts/installers/firefox.sh +++ b/images/linux/scripts/installers/firefox.sh @@ -5,20 +5,29 @@ ################################################################################ # Source the helpers for use with the script -source $HELPER_SCRIPTS/install.sh +# shellcheck source=../helpers/install.sh +source "$HELPER_SCRIPTS/install.sh" +# shellcheck source=../helpers/os.sh +source "$HELPER_SCRIPTS/os.sh" -FIREFOX_REPO="ppa:mozillateam/ppa" +# Mozillateam PPA is added manually because sometimes +# lanuchad portal sends empty answer when trying to add it automatically + +repo_url="http://ppa.launchpad.net/mozillateam/ppa/ubuntu" +gpg_fingerprint="0ab215679c571d1c8325275b9bdb3d89ce49ec21" +gpg_key="/etc/apt/trusted.gpg.d/mozillateam_ubuntu_ppa.gpg" +repo_path="/etc/apt/sources.list.d/mozillateam-ubuntu-ppa-focal.list" # Install Firefox -add-apt-repository $FIREFOX_REPO -y +curl -fsSL "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x${gpg_fingerprint}" | sudo gpg --dearmor -o $gpg_key +echo "deb $repo_url $(getOSVersionLabel) main" > $repo_path + apt-get update apt-get install --target-release 'o=LP-PPA-mozillateam' -y firefox - -# Remove source repo's -add-apt-repository --remove $FIREFOX_REPO +rm $repo_path # Document apt source repo's -echo "mozillateam $FIREFOX_REPO" >> $HELPER_SCRIPTS/apt-sources.txt +echo "mozillateam $repo_url" >> $HELPER_SCRIPTS/apt-sources.txt # add to gloabl system preferences for firefox locale en_US, because other browsers have en_US local. # Default firefox local is en_GB From 9d1c61329a11dbc41c69dbde7ba7a1596cafe218 Mon Sep 17 00:00:00 2001 From: sergei-pyshnoi <121864472+sergei-pyshnoi@users.noreply.github.com> Date: Mon, 16 Oct 2023 17:03:27 +0200 Subject: [PATCH 2335/3485] Update and refactor SQLOLEDBDriver installer (#8553) --- images/win/scripts/Installers/Install-SQLOLEDBDriver.ps1 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/images/win/scripts/Installers/Install-SQLOLEDBDriver.ps1 b/images/win/scripts/Installers/Install-SQLOLEDBDriver.ps1 index 93df7f5264e9..503363b05b1d 100644 --- a/images/win/scripts/Installers/Install-SQLOLEDBDriver.ps1 +++ b/images/win/scripts/Installers/Install-SQLOLEDBDriver.ps1 @@ -3,6 +3,7 @@ ## Desc: Install SQL OLEDB Driver ################################################################################ -$binaryDownloadPath = Start-DownloadWithRetry "https://go.microsoft.com/fwlink/?linkid=2183083" "msoledbsql.msi" +$binaryDownloadPath = Start-DownloadWithRetry "https://go.microsoft.com/fwlink/?linkid=2242656" "msoledbsql.msi" +$binarySignatureThumbprint = "6E78B3DCE2998F6C2457C3E54DA90A01034916AE" $ArgumentList = ("/i", "$binaryDownloadPath", "ADDLOCAL=ALL", "IACCEPTMSOLEDBSQLLICENSETERMS=YES", "/qn") -Install-Binary -FilePath msiexec.exe -ArgumentList $ArgumentList \ No newline at end of file +Install-Binary -FilePath $binaryDownloadPath -ArgumentList $ArgumentList -ExpectedSignature $binarySignatureThumbprint From 1a9f44f7be328bfa890b438249f6df104262ea0b Mon Sep 17 00:00:00 2001 From: sergei-pyshnoi <121864472+sergei-pyshnoi@users.noreply.github.com> Date: Tue, 17 Oct 2023 09:31:49 +0200 Subject: [PATCH 2336/3485] update heroku cli installation script (#8566) --- images/linux/scripts/installers/heroku.sh | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/images/linux/scripts/installers/heroku.sh b/images/linux/scripts/installers/heroku.sh index 55637a1cef38..5c81325f3a78 100644 --- a/images/linux/scripts/installers/heroku.sh +++ b/images/linux/scripts/installers/heroku.sh @@ -1,10 +1,21 @@ #!/bin/bash -e ################################################################################ ## File: heroku.sh -## Desc: Installs Heroku CLI +## Desc: This script installs Heroku CLI. Based on instructions found here: https://devcenter.heroku.com/articles/heroku-cli ################################################################################ -# Install Heroku CLI -curl -fsSL https://cli-assets.heroku.com/install.sh | sh +## Install Heroku CLI -invoke_tests "Tools" "Heroku" \ No newline at end of file +# add heroku repository to apt +echo "deb https://cli-assets.heroku.com/channels/stable/apt ./" > /etc/apt/sources.list.d/heroku.list + +# install heroku's release key for package verification +curl https://cli-assets.heroku.com/channels/stable/apt/release.key | apt-key add - + +# install heroku +apt-get update -y && apt-get install -y heroku + +# remove heroku's apt repository +rm /etc/apt/sources.list.d/heroku.list + +invoke_tests "Tools" "Heroku" From 9e6658b0b2ed2ee60e7622d033d40e4684d9e0d0 Mon Sep 17 00:00:00 2001 From: sergei-pyshnoi <121864472+sergei-pyshnoi@users.noreply.github.com> Date: Tue, 17 Oct 2023 09:32:26 +0200 Subject: [PATCH 2337/3485] add gcc-13 to ubuntu22 (#8562) --- images/linux/toolsets/toolset-2204.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/images/linux/toolsets/toolset-2204.json b/images/linux/toolsets/toolset-2204.json index 2516d02c3aa6..6001c348fcdb 100644 --- a/images/linux/toolsets/toolset-2204.json +++ b/images/linux/toolsets/toolset-2204.json @@ -268,7 +268,8 @@ "versions": [ "g++-9", "g++-10", - "g++-12" + "g++-12", + "g++-13" ] }, "gfortran": { From c598da4d84da23aa7d4c72fb46fb31340eaa98ec Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Tue, 17 Oct 2023 09:35:03 +0200 Subject: [PATCH 2338/3485] [macOS] Add Chrome to arm64 image (#8526) --- images/macos/provision/core/chrome.sh | 4 +-- .../SoftwareReport.Browsers.psm1 | 32 +++++++++++++++---- .../SoftwareReport.Generator.ps1 | 11 +++---- .../templates/macOS-13.arm64.anka.pkr.hcl | 1 + images/macos/tests/Browsers.Tests.ps1 | 14 +++++--- 5 files changed, 44 insertions(+), 18 deletions(-) diff --git a/images/macos/provision/core/chrome.sh b/images/macos/provision/core/chrome.sh index e90c37879377..84692abcc11b 100644 --- a/images/macos/provision/core/chrome.sh +++ b/images/macos/provision/core/chrome.sh @@ -26,8 +26,8 @@ CHROMEDRIVER_DIR="/usr/local/share/chromedriver-${CHROME_PLATFORM}" CHROMEDRIVER_BIN="$CHROMEDRIVER_DIR/chromedriver" download_with_retries "$CHROMEDRIVER_URL" "/tmp" "$CHROMEDRIVER_ARCHIVE" -unzip -qq /tmp/$CHROMEDRIVER_ARCHIVE -d /usr/local/share -chmod +x $CHROMEDRIVER_BIN +unzip -qq /tmp/$CHROMEDRIVER_ARCHIVE -d /tmp/ +sudo mv "/tmp/chromedriver-${CHROME_PLATFORM}" "$CHROMEDRIVER_DIR" ln -s "$CHROMEDRIVER_BIN" /usr/local/bin/chromedriver echo "export CHROMEWEBDRIVER=$CHROMEDRIVER_DIR" >> "${HOME}/.bashrc" diff --git a/images/macos/software-report/SoftwareReport.Browsers.psm1 b/images/macos/software-report/SoftwareReport.Browsers.psm1 index 3bc568f070b9..3658c701c777 100644 --- a/images/macos/software-report/SoftwareReport.Browsers.psm1 +++ b/images/macos/software-report/SoftwareReport.Browsers.psm1 @@ -1,16 +1,30 @@ function Build-BrowserSection { - return @( + + $nodes = @() + $os = Get-OSVersion + + $nodes += @( [ToolVersionNode]::new("Safari", $(Get-SafariVersion)) [ToolVersionNode]::new("SafariDriver", $(Get-SafariDriverVersion)) [ToolVersionNode]::new("Google Chrome", $(Get-ChromeVersion)) [ToolVersionNode]::new("Google Chrome for Testing", $(Get-ChromeForTestingVersion)) [ToolVersionNode]::new("ChromeDriver", $(Get-ChromeDriverVersion)) - [ToolVersionNode]::new("Microsoft Edge", $(Get-EdgeVersion)) - [ToolVersionNode]::new("Microsoft Edge WebDriver", $(Get-EdgeDriverVersion)) - [ToolVersionNode]::new("Mozilla Firefox", $(Get-FirefoxVersion)) - [ToolVersionNode]::new("geckodriver", $(Get-GeckodriverVersion)) + ) + + if (-not $os.IsVenturaArm64) { + $nodes += @( + [ToolVersionNode]::new("Microsoft Edge", $(Get-EdgeVersion)) + [ToolVersionNode]::new("Microsoft Edge WebDriver", $(Get-EdgeDriverVersion)) + [ToolVersionNode]::new("Mozilla Firefox", $(Get-FirefoxVersion)) + [ToolVersionNode]::new("geckodriver", $(Get-GeckodriverVersion)) + ) + } + + $nodes += @( [ToolVersionNode]::new("Selenium server", $(Get-SeleniumVersion)) ) + + return $nodes } function Get-SafariVersion { @@ -64,7 +78,13 @@ function Get-GeckodriverVersion { } function Get-SeleniumVersion { - $seleniumVersion = (Get-ChildItem -Path "/usr/local/Cellar/selenium-server*/*").Name + $os = Get-OSVersion + if ($os.IsVenturaArm64) { + $cellarPath = "/opt/homebrew/Cellar" + } else { + $cellarPath = "/usr/local/Cellar" + } + $seleniumVersion = (Get-ChildItem -Path "$cellarPath/selenium-server*/*").Name return $seleniumVersion } diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1 index 7b6631d5a29c..c94590cdf893 100644 --- a/images/macos/software-report/SoftwareReport.Generator.ps1 +++ b/images/macos/software-report/SoftwareReport.Generator.ps1 @@ -202,12 +202,11 @@ if ((-not $os.IsVentura) -and (-not $os.IsVenturaArm64)) { $linters.AddToolVersion("Yamllint", $(Get-YamllintVersion)) } -if (-not $os.IsVenturaArm64) { - # Browsers - $browsers = $installedSoftware.AddHeader("Browsers") - $browsers.AddNodes($(Build-BrowserSection)) - $browsers.AddNode($(Build-BrowserWebdriversEnvironmentTable)) -} +# Browsers +$browsers = $installedSoftware.AddHeader("Browsers") +$browsers.AddNodes($(Build-BrowserSection)) +$browsers.AddNode($(Build-BrowserWebdriversEnvironmentTable)) + # Java $java = $installedSoftware.AddHeader("Java") $java.AddTable($(Get-JavaVersions)) diff --git a/images/macos/templates/macOS-13.arm64.anka.pkr.hcl b/images/macos/templates/macOS-13.arm64.anka.pkr.hcl index 3956b3fbbd3b..6969689bd89f 100644 --- a/images/macos/templates/macOS-13.arm64.anka.pkr.hcl +++ b/images/macos/templates/macOS-13.arm64.anka.pkr.hcl @@ -202,6 +202,7 @@ build { "./provision/core/gcc.sh", "./provision/core/cocoapods.sh", "./provision/core/safari.sh", + "./provision/core/chrome.sh", "./provision/core/bicep.sh", "./provision/core/codeql-bundle.sh" ] diff --git a/images/macos/tests/Browsers.Tests.ps1 b/images/macos/tests/Browsers.Tests.ps1 index 4a2b93c7eaf5..480c5e76d1a6 100644 --- a/images/macos/tests/Browsers.Tests.ps1 +++ b/images/macos/tests/Browsers.Tests.ps1 @@ -1,7 +1,7 @@ Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" $os = Get-OSVersion -Describe "Chrome" -Skip:($os.IsVenturaArm64) { +Describe "Chrome" { BeforeAll { $chromeLocation = "/Applications/Google Chrome.app/Contents/MacOS/Google Chrome" $chromeForTestingLocation = "/Applications/Google Chrome for Testing.app/Contents/MacOS/Google Chrome for Testing" @@ -28,9 +28,15 @@ Describe "Chrome" -Skip:($os.IsVenturaArm64) { } } -Describe "Selenium server" -Skip:($os.IsVenturaArm64) { +Describe "Selenium server" { It "Selenium server" { - (Get-ChildItem -Path "/usr/local/Cellar/selenium-server*/*").Name | Should -BeLike "4.*" + $os = Get-OSVersion + if ($os.IsVenturaArm64) { + $cellarPath = "/opt/homebrew/Cellar" + } else { + $cellarPath = "/usr/local/Cellar" + } + (Get-ChildItem -Path "$cellarPath/selenium-server*/*").Name | Should -BeLike "4.*" } } @@ -66,4 +72,4 @@ Describe "Safari" { $commandResult.ExitCode | Should -Be 0 $commandResult.Output | Should -Be "true" } -} \ No newline at end of file +} From 0050697619814b821f996341b3958b79bc7e3f1d Mon Sep 17 00:00:00 2001 From: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com> Date: Tue, 17 Oct 2023 11:23:09 +0200 Subject: [PATCH 2339/3485] [macos] move android "cmdline-tools" to toolset (#8565) --- .../macos/provision/core/android-toolsets.sh | 26 +++++++++++++++---- images/macos/toolsets/toolset-11.json | 1 + images/macos/toolsets/toolset-12.json | 1 + images/macos/toolsets/toolset-13.json | 1 + 4 files changed, 24 insertions(+), 5 deletions(-) diff --git a/images/macos/provision/core/android-toolsets.sh b/images/macos/provision/core/android-toolsets.sh index 4b7a09baa3c0..3e4efc663c76 100755 --- a/images/macos/provision/core/android-toolsets.sh +++ b/images/macos/provision/core/android-toolsets.sh @@ -37,21 +37,37 @@ ANDROID_NDK_MAJOR_LATEST=$(get_toolset_value '.android.ndk."versions"[-1]') # Get the latest command line tools from https://developer.android.com/studio#cmdline-tools # Newer version(s) require Java 11 by default # See https://github.com/actions/runner-images/issues/6960 -ANDROID_OSX_SDK_URL="https://dl.google.com/android/repository/commandlinetools-mac-9123335_latest.zip" ANDROID_HOME=$HOME/Library/Android/sdk ANDROID_OSX_SDK_FILE=tools-macosx.zip -pushd $HOME +# Download the latest command line tools so that we can accept all of the licenses. +# See https://developer.android.com/studio/#command-tools +cmdlineToolsVersion=$(get_toolset_value '.android."cmdline-tools"') + +if [[ $cmdlineToolsVersion == "latest" ]]; then + repositoryXmlUrl="https://dl.google.com/android/repository/repository2-1.xml" + download_with_retries $repositoryXmlUrl "/tmp" "repository2-1.xml" + cmdlineToolsVersion=$( + yq -p=xml \ + '.sdk-repository.remotePackage[] | select(."+@path" == "cmdline-tools;latest" and .channelRef."+@ref" == "channel-0").archives.archive[].complete.url | select(contains("commandlinetools-mac"))' \ + /tmp/repository2-1.xml + ) + + if [[ -z $cmdlineToolsVersion ]]; then + echo "Failed to parse latest command-line tools version" + exit 1 + fi +fi echo "Downloading android command line tools..." -download_with_retries $ANDROID_OSX_SDK_URL "." $ANDROID_OSX_SDK_FILE +download_with_retries "https://dl.google.com/android/repository/${cmdlineToolsVersion}" /tmp $ANDROID_OSX_SDK_FILE echo "Uncompressing android command line tools..." mkdir -p $HOME/Library/Android/sdk -unzip -q $ANDROID_OSX_SDK_FILE -d $HOME/Library/Android/sdk/cmdline-tools +unzip -q /tmp/$ANDROID_OSX_SDK_FILE -d $HOME/Library/Android/sdk/cmdline-tools # Command line tools need to be placed in $HOME/Library/Android/sdk/cmdline-tools/latest to function properly mv $HOME/Library/Android/sdk/cmdline-tools/cmdline-tools $HOME/Library/Android/sdk/cmdline-tools/latest -rm -f $ANDROID_OSX_SDK_FILE +rm -f /tmp/$ANDROID_OSX_SDK_FILE echo ANDROID_HOME is $ANDROID_HOME export PATH=$PATH:$ANDROID_HOME/cmdline-tools/latest:$ANDROID_HOME/cmdline-tools/latest/bin diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index f7462b85827a..b140e5d8c561 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -159,6 +159,7 @@ } }, "android": { + "cmdline-tools": "commandlinetools-mac-9123335_latest.zip", "platform_min_version": "27", "build_tools_min_version": "27.0.0", "extra-list": [ diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index fd3f73191ca8..688be72ff040 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -146,6 +146,7 @@ } }, "android": { + "cmdline-tools": "commandlinetools-mac-9123335_latest.zip", "platform_min_version": "27", "build_tools_min_version": "27.0.0", "extra-list": [ diff --git a/images/macos/toolsets/toolset-13.json b/images/macos/toolsets/toolset-13.json index 0919ed5835d5..91323add8951 100644 --- a/images/macos/toolsets/toolset-13.json +++ b/images/macos/toolsets/toolset-13.json @@ -31,6 +31,7 @@ } }, "android": { + "cmdline-tools": "commandlinetools-mac-9123335_latest.zip", "platform_min_version": "27", "build_tools_min_version": "27.0.0", "extra-list": [ From 5c4b424bf669167393e0ec997ba05514cc9e70a6 Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Tue, 17 Oct 2023 12:27:13 +0200 Subject: [PATCH 2340/3485] [Ubuntu] Add helpers to work with checksums (#8552) --- images/linux/scripts/helpers/install.sh | 78 +++++++++++++++++++++++++ 1 file changed, 78 insertions(+) diff --git a/images/linux/scripts/helpers/install.sh b/images/linux/scripts/helpers/install.sh index 61faedc279c6..b90d10073dbf 100644 --- a/images/linux/scripts/helpers/install.sh +++ b/images/linux/scripts/helpers/install.sh @@ -95,3 +95,81 @@ get_github_package_download_url() { fi echo $downloadUrl } + +get_github_package_hash() { + local repo_owner=$1 + local repo_name=$2 + local file_name=$3 + local url=$4 + local version=${5:-"latest"} + local prerelease=${6:-false} + local delimiter=${7:-'|'} + local word_number=${8:-2} + + if [[ -z "$file_name" ]]; then + echo "File name is not specified." + exit 1 + fi + + if [[ -n "$url" ]]; then + release_url="$url" + else + if [ "$version" == "latest" ]; then + release_url="https://api.github.com/repos/${repo_owner}/${repo_name}/releases/latest" + else + json=$(curl -fsSL "https://api.github.com/repos/${repo_owner}/${repo_name}/releases?per_page=100") + tags=$(echo "$json" | jq -r --arg prerelease "$prerelease" '.[] | select(.prerelease == ($prerelease | test("true"; "i"))) | .tag_name') + tag=$(echo "$tags" | grep -o "$version") + if [[ "$(echo "$tag" | wc -l)" -gt 1 ]]; then + echo "Multiple tags found matching the version $version. Please specify a more specific version." + exit 1 + fi + if [[ -z "$tag" ]]; then + echo "Failed to get a tag name for version $version." + exit 1 + fi + release_url="https://api.github.com/repos/${repo_owner}/${repo_name}/releases/tags/$tag" + fi + fi + + body=$(curl -fsSL "$release_url" | jq -r '.body' | tr -d '`') + matching_line=$(echo "$body" | grep "$file_name") + if [[ "$(echo "$matching_line" | wc -l)" -gt 1 ]]; then + echo "Multiple lines found included the file $file_name. Please specify a more specific file name." + exit 1 + fi + if [[ -z "$matching_line" ]]; then + echo "File name '$file_name' not found in release body." + exit 1 + fi + + result=$(echo "$matching_line" | cut -d "$delimiter" -f "$word_number" | tr -d -c '[:alnum:]') + if [[ -z "$result" ]]; then + echo "Empty result. Check parameters delimiter and/or word_number for the matching line." + exit 1 + fi + + echo "$result" +} + +use_checksum_comparison() { + local file_path=$1 + local checksum=$2 + local sha_type=${3:-"256"} + + echo "Performing checksum verification" + + if [[ ! -f "$file_path" ]]; then + echo "File not found: $file_path" + exit 1 + fi + + local_file_hash=$(shasum --algorithm "$sha_type" "$file_path" | awk '{print $1}') + + if [[ "$local_file_hash" != "$checksum" ]]; then + echo "Checksum verification failed. Expected hash: $checksum; Actual hash: $local_file_hash." + exit 1 + else + echo "Checksum verification passed" + fi +} From f2d892281b2389a22cbe1b509e6b0388f9993514 Mon Sep 17 00:00:00 2001 From: Henry Mercer <henrymercer@github.com> Date: Tue, 17 Oct 2023 21:18:48 +0100 Subject: [PATCH 2341/3485] macOS: Cache only the latest version of CodeQL (#8420) Previously, we cached two versions since we prioritized hitting the toolcache over landing new releases quicker. However after experimenting with this, we have decided to prioritize getting new releases into customers' hands more quickly. --- images/macos/provision/core/codeql-bundle.sh | 78 +++++-------------- .../SoftwareReport.Common.psm1 | 18 ++--- .../SoftwareReport.Generator.ps1 | 2 +- images/macos/tests/Common.Tests.ps1 | 42 +++------- 4 files changed, 35 insertions(+), 105 deletions(-) diff --git a/images/macos/provision/core/codeql-bundle.sh b/images/macos/provision/core/codeql-bundle.sh index abce292e5246..032c18b2dbcb 100644 --- a/images/macos/provision/core/codeql-bundle.sh +++ b/images/macos/provision/core/codeql-bundle.sh @@ -1,70 +1,28 @@ #!/bin/bash -e -o pipefail source ~/utils/utils.sh -# Retrieve the CLI versions and bundle tags of the latest two CodeQL bundles. +# Retrieve the CLI version of the latest CodeQL bundle. base_url="$(curl -fsSL https://raw.githubusercontent.com/github/codeql-action/v2/src/defaults.json)" -codeql_tag_name="$(echo "$base_url" | jq -r '.bundleVersion')" -codeql_cli_version="$(echo "$base_url" | jq -r '.cliVersion')" -prior_codeql_tag_name="$(echo "$base_url" | jq -r '.priorBundleVersion')" -prior_codeql_cli_version="$(echo "$base_url" | jq -r '.priorCliVersion')" +bundle_version="$(echo "$base_url" | jq -r '.cliVersion')" +bundle_tag_name="codeql-bundle-v$bundle_version" -# Compute the toolcache version number for each bundle. This is either `x.y.z` or `x.y.z-YYYYMMDD`. -if [[ "${codeql_tag_name##*-}" == "v"* ]]; then - # Tag name of the format `codeql-bundle-vx.y.z`, where x.y.z is the CLI version. - # We don't need to include the tag name in the toolcache version number because it's derivable - # from the CLI version. - codeql_bundle_version="$codeql_cli_version" -elif [[ "${codeql_tag_name##*-}" =~ ^[0-9]+$ ]]; then - # Tag name of the format `codeql-bundle-YYYYMMDD`. - # We need to include the tag name in the toolcache version number because it can't be derived - # from the CLI version. - codeql_bundle_version="$codeql_cli_version-${codeql_tag_name##*-}" -else - echo "Unrecognised current CodeQL bundle tag name: $codeql_tag_name." \ - "Could not compute toolcache version number." - exit 1 -fi -if [[ "${prior_codeql_tag_name##*-}" == "v"* ]]; then - # Tag name of the format `codeql-bundle-vx.y.z`, where x.y.z is the CLI version. - # We don't need to include the tag name in the toolcache version number because it's derivable - # from the CLI version. - prior_codeql_bundle_version="$prior_codeql_cli_version" -elif [[ "${prior_codeql_tag_name##*-}" =~ ^[0-9]+$ ]]; then - # Tag name of the format `codeql-bundle-YYYYMMDD`. - # We need to include the tag name in the toolcache version number because it can't be derived - # from the CLI version. - prior_codeql_bundle_version="$prior_codeql_cli_version-${prior_codeql_tag_name##*-}" -else - echo "Unrecognised prior CodeQL bundle tag name: $prior_codeql_tag_name." \ - "Could not compute toolcache version number." - exit 1 -fi +echo "Downloading CodeQL bundle $bundle_version..." +# Note that this is the all-platforms CodeQL bundle, to support scenarios where customers run +# different operating systems within containers. +download_with_retries "https://github.com/github/codeql-action/releases/download/$bundle_tag_name/codeql-bundle.tar.gz" "/tmp" "codeql-bundle.tar.gz" +codeql_archive="/tmp/codeql-bundle.tar.gz" -# Download and name both CodeQL bundles. -codeql_bundle_versions=("${codeql_bundle_version}" "${prior_codeql_bundle_version}") -codeql_tag_names=("${codeql_tag_name}" "${prior_codeql_tag_name}") +codeql_toolcache_path="$AGENT_TOOLSDIRECTORY/CodeQL/$bundle_version/x64" +mkdir -p "$codeql_toolcache_path" -for index in "${!codeql_bundle_versions[@]}"; do - bundle_version="${codeql_bundle_versions[$index]}" - bundle_tag_name="${codeql_tag_names[$index]}" - - echo "Downloading CodeQL bundle $bundle_version..." - download_with_retries "https://github.com/github/codeql-action/releases/download/$bundle_tag_name/codeql-bundle.tar.gz" "/tmp" "codeql-bundle.tar.gz" - codeql_archive="/tmp/codeql-bundle.tar.gz" +echo "Unpacking the downloaded CodeQL bundle archive..." +tar -xzf "$codeql_archive" -C "$codeql_toolcache_path" - codeql_toolcache_path="$AGENT_TOOLSDIRECTORY/CodeQL/$bundle_version/x64" - mkdir -p "$codeql_toolcache_path" +# Touch a file to indicate to the CodeQL Action that this bundle shipped with the toolcache. This is +# to support overriding the CodeQL version specified in defaults.json on GitHub Enterprise. +touch "$codeql_toolcache_path/pinned-version" - echo "Unpacking the downloaded CodeQL bundle archive..." - tar -xzf "$codeql_archive" -C "$codeql_toolcache_path" +# Touch a file to indicate to the toolcache that setting up CodeQL is complete. +touch "$codeql_toolcache_path.complete" - # We only pin the latest version in the toolcache, to support overriding the CodeQL version specified in defaults.json on GitHub Enterprise. - if [[ "$bundle_version" == "$codeql_bundle_version" ]]; then - touch "$codeql_toolcache_path/pinned-version" - fi - - # Touch a file to indicate to the toolcache that setting up CodeQL is complete. - touch "$codeql_toolcache_path.complete" -done - -invoke_tests "Common" "CodeQLBundles" +invoke_tests "Common" "CodeQL Bundle" diff --git a/images/macos/software-report/SoftwareReport.Common.psm1 b/images/macos/software-report/SoftwareReport.Common.psm1 index beaaa30a3970..29d2e9db7005 100644 --- a/images/macos/software-report/SoftwareReport.Common.psm1 +++ b/images/macos/software-report/SoftwareReport.Common.psm1 @@ -608,17 +608,13 @@ function Build-MiscellaneousEnvironmentTable { } } -function Get-CodeQLBundleVersions { - $CodeQLVersionsWildcard = Join-Path $Env:AGENT_TOOLSDIRECTORY -ChildPath "CodeQL" | Join-Path -ChildPath "*" - $CodeQLVersionPaths = Get-ChildItem $CodeQLVersionsWildcard - $CodeQlVersions=@() - foreach ($CodeQLVersionPath in $CodeQLVersionPaths) { - $FullCodeQLVersionPath = $CodeQLVersionPath | Select-Object -Expand FullName - $CodeQLPath = Join-Path $FullCodeQLVersionPath -ChildPath "x64" | Join-Path -ChildPath "codeql" | Join-Path -ChildPath "codeql" - $CodeQLVersion = & $CodeQLPath version --quiet - $CodeQLVersions += $CodeQLVersion - } - return $CodeQLVersions + +function Get-CodeQLBundleVersion { + $CodeQLVersionWildcard = Join-Path $Env:AGENT_TOOLSDIRECTORY -ChildPath "CodeQL" | Join-Path -ChildPath "*" + $CodeQLVersionPath = Get-ChildItem $CodeQLVersionWildcard | Select-Object -First 1 -Expand FullName + $CodeQLPath = Join-Path $CodeQLVersionPath -ChildPath "x64" | Join-Path -ChildPath "codeql" | Join-Path -ChildPath "codeql" + $CodeQLVersion = & $CodeQLPath version --quiet + return $CodeQLVersion } function Get-ColimaVersion { diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1 index c94590cdf893..160565588fde 100644 --- a/images/macos/software-report/SoftwareReport.Generator.ps1 +++ b/images/macos/software-report/SoftwareReport.Generator.ps1 @@ -172,7 +172,7 @@ if (-not $os.IsVenturaArm64) { $tools.AddToolVersion("Cabal", $(Get-CabalVersion)) } $tools.AddToolVersion("Cmake", $(Get-CmakeVersion)) -$tools.AddToolVersion("CodeQL Action Bundles", $(Get-CodeQLBundleVersions)) +$tools.AddToolVersion("CodeQL Action Bundle", $(Get-CodeQLBundleVersion)) if ($os.IsMonterey) { $tools.AddToolVersion("Colima", $(Get-ColimaVersion)) } diff --git a/images/macos/tests/Common.Tests.ps1 b/images/macos/tests/Common.Tests.ps1 index 1ac30ee413c9..e1e645e7f5af 100644 --- a/images/macos/tests/Common.Tests.ps1 +++ b/images/macos/tests/Common.Tests.ps1 @@ -129,39 +129,15 @@ Describe "VirtualBox" -Skip:($os.IsBigSur -or $os.IsVentura -or $os.IsVenturaArm } } -Describe "CodeQLBundles" { - It "Latest CodeQL Bundle" { - $CodeQLVersionWildcards = Join-Path $Env:AGENT_TOOLSDIRECTORY -ChildPath "CodeQL" | Join-Path -ChildPath "*" - $LatestCodeQLVersionPath = Get-ChildItem $CodeQLVersionWildcards | Sort-Object -Property { [SemVer]$_.name } -Descending | Select-Object -First 1 -Expand FullName - $LatestCodeQLPath = Join-Path $LatestCodeQLVersionPath -ChildPath "x64" | Join-Path -ChildPath "codeql" | Join-Path -ChildPath "codeql" - "$LatestCodeQLPath version --quiet" | Should -ReturnZeroExitCode - - $LatestCodeQLPacksPath = Join-Path $LatestCodeQLVersionPath -ChildPath "x64" | Join-Path -ChildPath "codeql" | Join-Path -ChildPath "qlpacks" - $LatestCodeQLPacksPath | Should -Exist - } - - It "Prior CodeQL Bundle" { - $CodeQLVersionWildcards = Join-Path $Env:AGENT_TOOLSDIRECTORY -ChildPath "CodeQL" | Join-Path -ChildPath "*" - $PriorCodeQLVersionPath = Get-ChildItem $CodeQLVersionWildcards | Sort-Object -Property { [SemVer]$_.name } -Descending | Select-Object -Last 1 -Expand FullName - $PriorCodeQLPath = Join-Path $PriorCodeQLVersionPath -ChildPath "x64" | Join-Path -ChildPath "codeql" | Join-Path -ChildPath "codeql" - "$PriorCodeQLPath version --quiet" | Should -ReturnZeroExitCode - - $PriorCodeQLPacksPath = Join-Path $PriorCodeQLVersionPath -ChildPath "x64" | Join-Path -ChildPath "codeql" | Join-Path -ChildPath "qlpacks" - $PriorCodeQLPacksPath | Should -Exist - } - - It "Latest and Prior CodeQL Bundles are unique" { - $CodeQLVersionWildcards = Join-Path $Env:AGENT_TOOLSDIRECTORY -ChildPath "CodeQL" | Join-Path -ChildPath "*" - - $LatestCodeQLVersionPath = Get-ChildItem $CodeQLVersionWildcards | Sort-Object -Property { [SemVer]$_.name } -Descending | Select-Object -First 1 -Expand FullName - $LatestCodeQLPath = Join-Path $LatestCodeQLVersionPath -ChildPath "x64" | Join-Path -ChildPath "codeql" | Join-Path -ChildPath "codeql" - $LatestCodeQLVersion = & $LatestCodeQLPath version --quiet - - $PriorCodeQLVersionPath = Get-ChildItem $CodeQLVersionWildcards | Sort-Object -Property { [SemVer]$_.name } -Descending | Select-Object -Last 1 -Expand FullName - $PriorCodeQLPath = Join-Path $PriorCodeQLVersionPath -ChildPath "x64" | Join-Path -ChildPath "codeql" | Join-Path -ChildPath "codeql" - $PriorCodeQLVersion = & $PriorCodeQLPath version --quiet - - $LatestCodeQLVersion | Should -Not -Match $PriorCodeQLVersion +Describe "CodeQL Bundle" { + It "Is installed" { + $CodeQLVersionWildcard = Join-Path $Env:AGENT_TOOLSDIRECTORY -ChildPath "CodeQL" | Join-Path -ChildPath "*" + $CodeQLVersionPath = Get-ChildItem $CodeQLVersionWildcard | Select-Object -First 1 -Expand FullName + $CodeQLPath = Join-Path $CodeQLVersionPath -ChildPath "x64" | Join-Path -ChildPath "codeql" | Join-Path -ChildPath "codeql" + "$CodeQLPath version --quiet" | Should -ReturnZeroExitCode + + $CodeQLPacksPath = Join-Path $CodeQLVersionPath -ChildPath "x64" | Join-Path -ChildPath "codeql" | Join-Path -ChildPath "qlpacks" + $CodeQLPacksPath | Should -Exist } } From 0253f21ea57f0c22120e8c60f43d1c25034fc04c Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Wed, 18 Oct 2023 09:51:22 +0200 Subject: [PATCH 2342/3485] [Ubuntu] Add Java 21 (#8560) --- images/linux/scripts/installers/java-tools.sh | 5 +++++ images/linux/scripts/tests/Java.Tests.ps1 | 2 +- images/linux/toolsets/toolset-2004.json | 2 +- images/linux/toolsets/toolset-2204.json | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/images/linux/scripts/installers/java-tools.sh b/images/linux/scripts/installers/java-tools.sh index 2220c13eefa7..cc15bbe39d3c 100644 --- a/images/linux/scripts/installers/java-tools.sh +++ b/images/linux/scripts/installers/java-tools.sh @@ -53,7 +53,12 @@ installOpenJDK() { # https://github.com/adoptium/temurin-build/issues/2248 [[ ${fullJavaVersion} =~ ^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+ ]] && fullJavaVersion=$(echo $fullJavaVersion | sed -E 's/\.[0-9]+-/-/') + # When version string is too short, add extra ".0" to make it valid semver + [[ ${fullJavaVersion} =~ ^[0-9]+- ]] && fullJavaVersion=$(echo $fullJavaVersion | sed -E 's/-/.0-/') + [[ ${fullJavaVersion} =~ ^[0-9]+\.[0-9]+- ]] && fullJavaVersion=$(echo $fullJavaVersion | sed -E 's/-/.0-/') + javaToolcacheVersionPath="${JAVA_TOOLCACHE_PATH}/${fullJavaVersion}" + echo "Java ${JAVA_VERSION} Toolcache Version Path: ${javaToolcacheVersionPath}" mkdir -p "${javaToolcacheVersionPath}" # Create a complete file diff --git a/images/linux/scripts/tests/Java.Tests.ps1 b/images/linux/scripts/tests/Java.Tests.ps1 index a93fbdcb6fe9..7a5c2eb678d3 100644 --- a/images/linux/scripts/tests/Java.Tests.ps1 +++ b/images/linux/scripts/tests/Java.Tests.ps1 @@ -45,6 +45,6 @@ Describe "Java" { if ($Version -eq 8) { $Version = "1.${Version}" } - "`"$javaPath`" -version" | Should -MatchCommandOutput ([regex]::Escape("openjdk version `"${Version}.")) + "`"$javaPath`" -version" | Should -MatchCommandOutput "openjdk\ version\ `"${Version}(\.[0-9_\.]+)?`"" } } diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index 7eaa4a0dc5ae..dd8bfabe885d 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -74,7 +74,7 @@ ], "java": { "default": "11", - "versions": [ "8", "11", "17" ], + "versions": [ "8", "11", "17", "21"], "maven": "3.8.8" }, "android": { diff --git a/images/linux/toolsets/toolset-2204.json b/images/linux/toolsets/toolset-2204.json index 6001c348fcdb..690799a79c11 100644 --- a/images/linux/toolsets/toolset-2204.json +++ b/images/linux/toolsets/toolset-2204.json @@ -68,7 +68,7 @@ ], "java": { "default": "11", - "versions": [ "8", "11", "17" ], + "versions": [ "8", "11", "17", "21"], "maven": "3.8.8" }, "android": { From 59fd426420da9647506bb2d037936e5178e3f99a Mon Sep 17 00:00:00 2001 From: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com> Date: Wed, 18 Oct 2023 09:55:17 +0200 Subject: [PATCH 2343/3485] [macos] retry powershell meta download (#8571) --- images/macos/provision/core/powershell.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/macos/provision/core/powershell.sh b/images/macos/provision/core/powershell.sh index d503fb4d75d8..428345e50253 100644 --- a/images/macos/provision/core/powershell.sh +++ b/images/macos/provision/core/powershell.sh @@ -4,8 +4,8 @@ source ~/utils/utils.sh echo Installing PowerShell... arch=$(get_arch) -psmetadata=$(curl -fsSL "https://raw.githubusercontent.com/PowerShell/PowerShell/master/tools/metadata.json") -psver=$(echo $psmetadata | jq -r '.LTSReleaseTag[0]') +download_with_retries "https://raw.githubusercontent.com/PowerShell/PowerShell/master/tools/metadata.json" "/tmp" "powershell-metadata.json" +psver=$(cat /tmp/powershell-metadata.json | jq -r '.LTSReleaseTag[0]') psDownloadUrl=$(get_github_package_download_url "PowerShell/PowerShell" "contains(\"osx-$arch.pkg\")" "$psver" "$API_PAT") download_with_retries $psDownloadUrl "/tmp" "powershell.pkg" From e113e2f6b829f0e6fd528b93a1241c52410873a2 Mon Sep 17 00:00:00 2001 From: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com> Date: Wed, 18 Oct 2023 10:17:43 +0200 Subject: [PATCH 2344/3485] [macos] introduce toolset possibility to install Android SDK Tools (#8573) --- images/macos/provision/core/android-toolsets.sh | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/images/macos/provision/core/android-toolsets.sh b/images/macos/provision/core/android-toolsets.sh index 3e4efc663c76..5673ad33ce29 100755 --- a/images/macos/provision/core/android-toolsets.sh +++ b/images/macos/provision/core/android-toolsets.sh @@ -121,4 +121,13 @@ do echo y | $SDKMANAGER "$tool_name" done +# Download SDK tools to preserve backward compatibility +sdkTools="android-sdk-tools.zip" +sdkToolsVersion=$(get_toolset_value '.android."sdk-tools"') +if [ "$sdkToolsVersion" != "null" ]; then + download_with_retries "https://dl.google.com/android/repository/${sdkToolsVersion}" "." $sdkTools + unzip -qq $sdkTools -d ${ANDROID_SDK_ROOT} + rm -f $sdkTools +fi + invoke_tests "Android" From aaa37dfbbde9c7e05543c4f737f1771b22326b0a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 18 Oct 2023 12:46:58 +0000 Subject: [PATCH 2345/3485] Updating readme file for ubuntu20 version 20231016.1.1 (#8576) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2004-Readme.md | 121 +++++++++++++++--------------- 1 file changed, 60 insertions(+), 61 deletions(-) diff --git a/images/linux/Ubuntu2004-Readme.md b/images/linux/Ubuntu2004-Readme.md index 60728734d1bb..1f26dad2da53 100644 --- a/images/linux/Ubuntu2004-Readme.md +++ b/images/linux/Ubuntu2004-Readme.md @@ -1,12 +1,11 @@ | Announcements | |-| | [[All OS] Android NDK r23 will be removed from images on October 9](https://github.com/actions/runner-images/issues/8383) | -| [[All OS] hub utility will be removed on October 2](https://github.com/actions/runner-images/issues/8362) | *** # Ubuntu 20.04 - OS Version: 20.04.6 LTS -- Kernel Version: 5.15.0-1047-azure -- Image Version: 20231002.1.0 +- Kernel Version: 5.15.0-1049-azure +- Image Version: 20231016.1.0 - Systemd version: 245.4-4ubuntu3.22 ## Installed Software @@ -25,7 +24,7 @@ - Kotlin 1.9.10-release-459 - Mono 6.12.0.200 - MSBuild 16.10.1.31701 (Mono 6.12.0.200) -- Node.js 18.18.0 +- Node.js 18.18.2 - Perl 5.30.0 - Python 3.8.10 - Ruby 2.7.0p0 @@ -33,8 +32,8 @@ ### Package Management - cpan 1.64 -- Helm 3.13.0 -- Homebrew 4.1.13 +- Helm 3.13.1 +- Homebrew 4.1.16 - Miniconda 23.5.2 - Npm 9.8.1 - NuGet 6.6.1.2 @@ -42,7 +41,7 @@ - Pip3 20.0.2 - Pipx 1.2.0 - RubyGems 3.1.2 -- Vcpkg (build from commit c6d6efed3) +- Vcpkg (build from commit e57b2167e) - Yarn 1.22.19 #### Environment variables @@ -61,21 +60,21 @@ to accomplish this. ### Project Management - Ant 1.10.7 -- Gradle 8.3 -- Lerna 7.3.0 +- Gradle 8.4 +- Lerna 7.3.1 - Maven 3.8.8 - Sbt 1.9.6 ### Tools -- Ansible 2.13.12 +- Ansible 2.13.13 - apt-fast 1.9.12 - AzCopy 10.21.0 - available by `azcopy` and `azcopy10` aliases - Bazel 6.3.2 - Bazelisk 1.18.0 -- Bicep 0.21.1 +- Bicep 0.22.6 - Buildah 1.22.3 -- CMake 3.27.6 -- CodeQL Action Bundle 2.14.6 +- CMake 3.27.7 +- CodeQL Action Bundle 2.15.0 - Docker Amazon ECR Credential Helper 0.7.1 - Docker Compose v1 1.29.2 - Docker Compose v2 2.22.0 @@ -87,7 +86,7 @@ to accomplish this. - Git LFS 3.4.0 - Git-ftp 1.6.0 - Haveged 1.9.1 -- Heroku 8.5.0 +- Heroku 8.6.0 - HHVM (HipHop VM) 4.172.1 - jq 1.6 - Kind 0.20.0 @@ -97,37 +96,37 @@ to accomplish this. - MediaInfo 19.09 - Mercurial 5.3.1 - Minikube 1.31.2 -- n 9.1.0 +- n 9.2.0 - Newman 6.0.0 - nvm 0.39.5 - OpenSSL 1.1.1f-1ubuntu2.19 - Packer 1.9.4 -- Parcel 2.9.3 +- Parcel 2.10.0 - PhantomJS 2.1.1 2.1.1 - Podman 3.4.2 -- Pulumi 3.86.0 +- Pulumi 3.88.1 - R 4.3.1 - Skopeo 1.5.0 - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 -- Terraform 1.5.7 +- Terraform 1.6.1 - yamllint 1.32.0 - yq 4.35.2 - zstd 1.5.5 ### CLI Tools - Alibaba Cloud CLI 3.0.174 -- AWS CLI 2.13.22 +- AWS CLI 2.13.26 - AWS CLI Session Manager Plugin 1.2.497.0 -- AWS SAM CLI 1.97.0 +- AWS SAM CLI 1.98.0 - Azure CLI 2.53.0 - Azure CLI (azure-devops) 0.26.0 -- GitHub CLI 2.35.0 -- Google Cloud CLI 448.0.0 -- Netlify CLI 16.4.2 -- OpenShift CLI 4.13.13 +- GitHub CLI 2.36.0 +- Google Cloud CLI 450.0.0 +- Netlify CLI 16.7.0 +- OpenShift CLI 4.13.15 - ORAS CLI 1.1.0 -- Vercel CLI 32.3.1 +- Vercel CLI 32.4.1 ### Java | Version | Environment Variable | @@ -137,8 +136,8 @@ to accomplish this. | 17.0.8+1 | JAVA_HOME_17_X64 | ### PHP Tools -- PHP: 7.4.33, 8.0.30, 8.1.23, 8.2.10 -- Composer 2.6.4 +- PHP: 7.4.33, 8.0.30, 8.1.24, 8.2.11 +- Composer 2.6.5 - PHPUnit 8.5.34 ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. @@ -146,32 +145,32 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ### Haskell Tools - Cabal 3.10.1.0 -- GHC 9.6.3 +- GHC 9.8.1 - GHCup 0.1.19.4 - Stack 2.13.1 ### Rust Tools -- Cargo 1.72.1 -- Rust 1.72.1 -- Rustdoc 1.72.1 +- Cargo 1.73.0 +- Rust 1.73.0 +- Rustdoc 1.73.0 - Rustup 1.26.0 #### Packages - Bindgen 0.68.1 - Cargo audit 0.18.2 -- Cargo clippy 0.1.72 +- Cargo clippy 0.1.73 - Cargo outdated 0.13.1 - Cbindgen 0.26.0 - Rustfmt 1.6.0 ### Browsers and Drivers -- Google Chrome 117.0.5938.132 -- ChromeDriver 117.0.5938.92 -- Chromium 117.0.5938.0 -- Microsoft Edge 117.0.2045.47 -- Microsoft Edge WebDriver 117.0.2045.47 -- Selenium server 4.13.0 -- Mozilla Firefox 118.0.1 +- Google Chrome 118.0.5993.70 +- ChromeDriver 118.0.5993.70 +- Chromium 118.0.5993.0 +- Microsoft Edge 118.0.2088.46 +- Microsoft Edge WebDriver 118.0.2088.46 +- Selenium server 4.14.0 +- Mozilla Firefox 118.0.2 - Geckodriver 0.33.0 #### Environment variables @@ -183,7 +182,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | ### .NET Tools -- .NET Core SDK: 6.0.414, 7.0.111, 7.0.203, 7.0.308, 7.0.401 +- .NET Core SDK: 6.0.415, 7.0.112, 7.0.203, 7.0.309, 7.0.402 - nbgv 3.6.133+2d32d93cb1 ### Databases @@ -215,21 +214,21 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Go - 1.19.13 -- 1.20.8 -- 1.21.1 +- 1.20.10 +- 1.21.3 #### Node.js - 14.21.3 - 16.20.2 -- 18.18.0 -- 20.8.0 +- 18.18.2 +- 20.8.1 #### Python - 3.7.17 - 3.8.18 - 3.9.18 - 3.10.13 -- 3.11.5 +- 3.11.6 #### PyPy - 2.7.18 [PyPy 7.3.13] @@ -247,7 +246,7 @@ Use the following command as a part of your job to start the service: 'sudo syst - 3.1.4 ### PowerShell Tools -- PowerShell 7.2.14 +- PowerShell 7.2.15 #### PowerShell Modules - Az: 9.3.0 @@ -277,7 +276,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | CMake | 3.10.2<br>3.18.1<br>3.22.1 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 23.2.8568313<br>24.0.8215888<br>25.2.9519653 (default)<br>26.0.10792818 | +| NDK | 23.2.8568313<br>24.0.8215888<br>25.2.9519653 (default)<br>26.1.10909125 | | SDK Patch Applier v4 | 1 | #### Environment variables @@ -286,7 +285,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | ANDROID_HOME | /usr/local/lib/android/sdk | | ANDROID_NDK | /usr/local/lib/android/sdk/ndk/25.2.9519653 | | ANDROID_NDK_HOME | /usr/local/lib/android/sdk/ndk/25.2.9519653 | -| ANDROID_NDK_LATEST_HOME | /usr/local/lib/android/sdk/ndk/26.0.10792818 | +| ANDROID_NDK_LATEST_HOME | /usr/local/lib/android/sdk/ndk/26.1.10909125 | | ANDROID_NDK_ROOT | /usr/local/lib/android/sdk/ndk/25.2.9519653 | | ANDROID_SDK_ROOT | /usr/local/lib/android/sdk | @@ -296,24 +295,24 @@ Use the following command as a part of your job to start the service: 'sudo syst | alpine:3.16 | sha256:a8cbb8c69ee71561f4b69c066bad07f7e510caaa523da26fbfc606b10bd7934b | 2023-08-07 | | alpine:3.17 | sha256:f71a5f071694a785e064f05fed657bf8277f1b2113a8ed70c90ad486d6ee54dc | 2023-08-07 | | alpine:3.18 | sha256:eece025e432126ce23f223450a0326fbebde39cdf496a85d8c016293fc851978 | 2023-09-28 | -| buildpack-deps:bullseye | sha256:8ee57204a7af0468a61a3e47fbf8412d6ad1d479050bb702d99fd1d3664d7173 | 2023-09-20 | -| buildpack-deps:buster | sha256:0bc568b581ed3e9a13f818fd20258edb623cf67e6d354afadf77fb9095d798a2 | 2023-09-20 | +| buildpack-deps:bullseye | sha256:e5587c367e13ef9c01dede7c4085056a65e24caa7257a53c303c6c074fe6034e | 2023-10-12 | +| buildpack-deps:buster | sha256:82e25c1dea159632964a4c576380aa6ae9fd1d28c42b1f967d5474167ee4f6a1 | 2023-10-12 | | buildpack-deps:stretch | sha256:78e995165a5788c2f55aed6e548d8f6c1534830d4310c870408fccb2da8c5b2e | 2022-06-23 | -| debian:10 | sha256:484cc8ab0d73f513e3f9bacd03424eb081bd90f594d7ebde42587843fdc242f3 | 2023-09-20 | -| debian:11 | sha256:54d33aaad0bc936a9a40d856764c7bc35c0afaa9cab51f88bb95f6cd8004438d | 2023-09-20 | +| debian:10 | sha256:853b9ec779e55f670cbdcb5e15bfb778b5be2c5c61fc8c655638b7a977d273c6 | 2023-10-11 | +| debian:11 | sha256:c141beaa9e0767774221cc82efe3a6712a1cc4f75d2699334dfd9a28a6f7357b | 2023-10-11 | | debian:9 | sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be | 2022-06-23 | | moby/buildkit:latest | sha256:890dcae054e3039f6c6b76bf0da80a130fa6e6bb1f3624063ef0210ac2c57b06 | 2023-08-24 | | node:14 | sha256:a158d3b9b4e3fa813fa6c8c590b8f0a860e015ad4e59bbce5744d2f6fd8461aa | 2023-04-12 | | node:14-alpine | sha256:434215b487a329c9e867202ff89e704d3a75e554822e07f3e0c0f9e606121b33 | 2023-03-29 | | node:16 | sha256:f77a1aef2da8d83e45ec990f45df50f1a286c5fe8bbfb8c6e4246c6389705c0b | 2023-09-07 | | node:16-alpine | sha256:a1f9d027912b58a7c75be7716c97cfbc6d3099f3a97ed84aa490be9dee20e787 | 2023-08-10 | -| node:18 | sha256:ee0a21d64211d92d4340b225c556e9ef1a8bce1d5b03b49f5f07bf1dbbaa5626 | 2023-09-21 | -| node:18-alpine | sha256:a315556d82ef54561e54fca7d8ee333382de183d4e56841dcefcd05b55310f46 | 2023-09-29 | -| node:20 | sha256:6b3f9aa7eefa8d4c93d43914e78aa2bfea9a12808b0059e5da78854dfa8b8768 | 2023-09-29 | -| node:20-alpine | sha256:37750e51d61bef92165b2e29a77da4277ba0777258446b7a9c99511f119db096 | 2023-09-29 | +| node:18 | sha256:d764525456dfe2f96a436ba00f864ee8ae3690bfb457c9f12a3a2a35b2d8be41 | 2023-10-16 | +| node:18-alpine | sha256:0fe7402d11d8c85474c6ec6f9c9c8048cd0549c95535832b7f0735a4b47690a5 | 2023-10-16 | +| node:20 | sha256:98f80754df0cf581de86a2cbbf85692cccde41916b35a97a1c84b0a971b8d578 | 2023-10-16 | +| node:20-alpine | sha256:a369136b6f7640f85acf300ce9d6498d8161972b855a72bbc79273150d4dd0c7 | 2023-10-16 | | ubuntu:16.04 | sha256:1f1a2d56de1d604801a9671f301190704c25d604a416f59e03c04f5c6ffee0d6 | 2021-08-31 | | ubuntu:18.04 | sha256:152dc042452c496007f07ca9127571cb9c29697f42acbfad72324b2bb2e43c98 | 2023-05-30 | -| ubuntu:20.04 | sha256:33a5cc25d22c45900796a1aca487ad7a7cb09f09ea00b779e3b2026b4fc2faba | 2023-08-01 | +| ubuntu:20.04 | sha256:ed4a42283d9943135ed87d4ee34e542f7f5ad9ecf2f244870e23122f703f91c2 | 2023-10-03 | ### Installed apt packages | Name | Version | @@ -327,7 +326,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | brotli | 1.0.7-6ubuntu0.1 | | bzip2 | 1.0.8-2 | | coreutils | 8.30-3ubuntu2 | -| curl | 7.68.0-1ubuntu2.19 | +| curl | 7.68.0-1ubuntu2.20 | | dbus | 1.12.16-2ubuntu2.3 | | dnsutils | 1:9.16.1-0ubuntu2.16 | | dpkg | 1.19.7ubuntu3.2 | @@ -348,8 +347,8 @@ Use the following command as a part of your job to start the service: 'sudo syst | lib32z1 | 1:1.2.11.dfsg-2ubuntu1.5 | | libc++-dev | 1:10.0-50\~exp1 | | libc++abi-dev | 1:10.0-50\~exp1 | -| libc6-dev | 2.31-0ubuntu9.9 | -| libcurl4 | 7.68.0-1ubuntu2.19 | +| libc6-dev | 2.31-0ubuntu9.12 | +| libcurl4 | 7.68.0-1ubuntu2.20 | | libgbm-dev | 21.2.6-0ubuntu0.1\~20.04.2 | | libgconf-2-4 | 3.2.6-6ubuntu1 | | libgsl-dev | 2.5+dfsg-6build1 | @@ -364,7 +363,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | libxkbfile-dev | 1:1.1.0-1 | | libxss1 | 1:1.2.3-1 | | libyaml-dev | 0.2.2-1 | -| locales | 2.31-0ubuntu9.9 | +| locales | 2.31-0ubuntu9.12 | | m4 | 1.4.18-4 | | make | 4.2.1-1.2 | | mediainfo | 19.09-1build1 | From 29ce1c3a2bf91aa06cbf6e74eb61a1a743e1b7d1 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Wed, 18 Oct 2023 15:46:20 +0200 Subject: [PATCH 2346/3485] [Ubuntu] fix VersionPattern for Clang v15 (#8575) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Alexey Ayupov <“alexey.ayupov@akvelon.com”> --- .../linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 index 02ddd0c6d976..b22769f363b9 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 @@ -30,7 +30,7 @@ function Get-ClangToolVersions { [Parameter(Mandatory = $true)] [string] $ToolName, [string] $VersionLineMatcher = "${ToolName} version", - [string] $VersionPattern = "\d+\.\d+\.\d+)-" + [string] $VersionPattern = "\d+\.\d+\.\d+)" ) $result = Get-CommandResult "apt list --installed" -Multiline @@ -355,4 +355,4 @@ function Get-SystemdVersion { $matches = [regex]::Matches((systemctl --version | head -n 1), "\((.*?)\)") $result = foreach ($match in $matches) {$match.Groups[1].Value} return $result -} \ No newline at end of file +} From 691345d5ba81894385be8f050abd7ab28503efbf Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Wed, 18 Oct 2023 15:48:23 +0200 Subject: [PATCH 2347/3485] [MacOS] Install latest version of stack with ghcup (#8525) --- images/macos/provision/core/haskell.sh | 3 +++ images/macos/provision/core/stack.sh | 24 -------------------- images/macos/templates/macOS-11.json | 1 - images/macos/templates/macOS-12.anka.pkr.hcl | 1 - images/macos/templates/macOS-12.json | 1 - images/macos/templates/macOS-13.anka.pkr.hcl | 1 - 6 files changed, 3 insertions(+), 28 deletions(-) delete mode 100644 images/macos/provision/core/stack.sh diff --git a/images/macos/provision/core/haskell.sh b/images/macos/provision/core/haskell.sh index 93aaf14bc82a..ce9ba682ed7e 100644 --- a/images/macos/provision/core/haskell.sh +++ b/images/macos/provision/core/haskell.sh @@ -19,4 +19,7 @@ done echo "install cabal..." ghcup install-cabal +echo "Updating stack..." +ghcup install stack latest + invoke_tests "Haskell" diff --git a/images/macos/provision/core/stack.sh b/images/macos/provision/core/stack.sh deleted file mode 100644 index c84cd2646f0f..000000000000 --- a/images/macos/provision/core/stack.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash -e -o pipefail -source ~/utils/utils.sh - -echo "Get the latest Stack version..." -stackDownloadUrl=$(get_github_package_download_url "commercialhaskell/stack" "contains(\"osx-x86_64.tar.gz\")" "latest" "$API_PAT") -stackVersion=$(echo $stackDownloadUrl | cut -d "/" -f8 | tr -d "v") -stackArchive="/tmp/stack.tar.gz" - -echo "Download stack version $stackVersion..." -download_with_retries $stackDownloadUrl "/tmp" "stack.tar.gz" - -stackToolcachePath="$AGENT_TOOLSDIRECTORY/stack/$stackVersion" -destinationPath="$stackToolcachePath/x64" - -mkdir -p $destinationPath - -echo "Unzip stack archive..." -tar -xzf $stackArchive -C $destinationPath --strip 1 - -touch $stackToolcachePath/x64.complete - -echo "export PATH="\$PATH":$destinationPath" >> "$HOME/.bashrc" - -invoke_tests "Common" "Stack" diff --git a/images/macos/templates/macOS-11.json b/images/macos/templates/macOS-11.json index e7f682c420dd..814580fbfb68 100644 --- a/images/macos/templates/macOS-11.json +++ b/images/macos/templates/macOS-11.json @@ -194,7 +194,6 @@ "./provision/core/rust.sh", "./provision/core/gcc.sh", "./provision/core/haskell.sh", - "./provision/core/stack.sh", "./provision/core/cocoapods.sh", "./provision/core/android-toolsets.sh", "./provision/core/xamarin.sh", diff --git a/images/macos/templates/macOS-12.anka.pkr.hcl b/images/macos/templates/macOS-12.anka.pkr.hcl index c13e60fa9a1c..5c1755b007fe 100644 --- a/images/macos/templates/macOS-12.anka.pkr.hcl +++ b/images/macos/templates/macOS-12.anka.pkr.hcl @@ -208,7 +208,6 @@ build { "./provision/core/rust.sh", "./provision/core/gcc.sh", "./provision/core/haskell.sh", - "./provision/core/stack.sh", "./provision/core/cocoapods.sh", "./provision/core/android-toolsets.sh", "./provision/core/xamarin.sh", diff --git a/images/macos/templates/macOS-12.json b/images/macos/templates/macOS-12.json index 424600365664..587d4d6db2f5 100644 --- a/images/macos/templates/macOS-12.json +++ b/images/macos/templates/macOS-12.json @@ -195,7 +195,6 @@ "./provision/core/rust.sh", "./provision/core/gcc.sh", "./provision/core/haskell.sh", - "./provision/core/stack.sh", "./provision/core/cocoapods.sh", "./provision/core/android-toolsets.sh", "./provision/core/xamarin.sh", diff --git a/images/macos/templates/macOS-13.anka.pkr.hcl b/images/macos/templates/macOS-13.anka.pkr.hcl index 7b833065ed2c..3366d803a1fb 100644 --- a/images/macos/templates/macOS-13.anka.pkr.hcl +++ b/images/macos/templates/macOS-13.anka.pkr.hcl @@ -203,7 +203,6 @@ build { "./provision/core/rust.sh", "./provision/core/gcc.sh", "./provision/core/haskell.sh", - "./provision/core/stack.sh", "./provision/core/cocoapods.sh", "./provision/core/android-toolsets.sh", "./provision/core/apache.sh", From e78225c3497c891032f4dfa212dd4821d5f66e78 Mon Sep 17 00:00:00 2001 From: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com> Date: Wed, 18 Oct 2023 16:49:00 +0200 Subject: [PATCH 2348/3485] [macos] add retries to PyPy installation (#8578) --- images/macos/provision/core/pypy.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/macos/provision/core/pypy.sh b/images/macos/provision/core/pypy.sh index d9f0707c3e28..eae5c389040f 100644 --- a/images/macos/provision/core/pypy.sh +++ b/images/macos/provision/core/pypy.sh @@ -76,11 +76,11 @@ function InstallPyPy } arch=$(get_arch) -pypyVersions=$(curl -fsSL https://downloads.python.org/pypy/versions.json) +download_with_retries "https://downloads.python.org/pypy/versions.json" "/tmp" "pypy-versions.json" toolsetVersions=$(get_toolset_value '.toolcache[] | select(.name | contains("PyPy")) | .arch.'$arch'.versions[]') for toolsetVersion in $toolsetVersions; do - latestMajorPyPyVersion=$(echo $pypyVersions | + latestMajorPyPyVersion=$(cat /tmp/pypy-versions.json | jq -r --arg toolsetVersion $toolsetVersion '.[] | select((.python_version | startswith($toolsetVersion)) and .stable == true).files[] | select(.platform == "darwin").download_url' | head -1) From e9fc71683f7b5fea6956b642cfdfc484b80825b4 Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Wed, 18 Oct 2023 19:11:46 +0200 Subject: [PATCH 2349/3485] Remove Storage Account and VHD refs (#8581) --- .../azure-pipelines/image-generation.yml | 29 +-- images.CI/linux-and-win/cleanup.ps1 | 22 +-- images.CI/linux-and-win/convert-to-vhd.ps1 | 185 ------------------ images.CI/linux-and-win/create-release.ps1 | 28 ++- 4 files changed, 23 insertions(+), 241 deletions(-) delete mode 100644 images.CI/linux-and-win/convert-to-vhd.ps1 diff --git a/images.CI/linux-and-win/azure-pipelines/image-generation.yml b/images.CI/linux-and-win/azure-pipelines/image-generation.yml index 750713209528..20954bdb8090 100644 --- a/images.CI/linux-and-win/azure-pipelines/image-generation.yml +++ b/images.CI/linux-and-win/azure-pipelines/image-generation.yml @@ -74,9 +74,6 @@ jobs: $ManagedImageName = "${{ parameters.image_type }}-$(Build.BuildId)" Write-Host "##vso[task.setvariable variable=ManagedImageName;]$ManagedImageName" - $VhdName = "$ManagedImageName.vhd" - Write-Host "##vso[task.setvariable variable=VhdName;]$VhdName" - $TempResourceGroupName = "packer-temp-$ManagedImageName" Write-Host "##vso[task.setvariable variable=TempResourceGroupName;]$TempResourceGroupName" @@ -146,26 +143,6 @@ jobs: -PrefixToPathTrim "$(TemplateDirectoryPath)" ` -PrintTopNLongest 25 - - task: PowerShell@2 - displayName: 'Convert managed image to VHD' - inputs: - targetType: filePath - filePath: ./images.CI/linux-and-win/convert-to-vhd.ps1 - arguments: -SubscriptionId $(AZURE_SUBSCRIPTION) ` - -Location $(AZURE_LOCATION) ` - -ResourceGroupName $(AZURE_RESOURCE_GROUP) ` - -ManagedImageName "$(ManagedImageName)" ` - -GalleryName "github_imagegeneration_convert_to_vhd" ` - -GalleryImageSku "${{ parameters.image_type }}" ` - -GalleryImageVersion "0.0.$(Build.BuildId)" ` - -StorageAccountName $(AZURE_STORAGE_ACCOUNT) ` - -StorageAccountContainerName "images" ` - -VhdName "$(VhdName)" ` - -ClientId $(CLIENT_ID) ` - -ClientSecret $(CLIENT_SECRET) ` - -TenantId $(AZURE_TENANT) ` - -RemoveManagedImage - - ${{ if eq(parameters.create_release, true) }}: - task: PowerShell@2 displayName: 'Create release for VM deployment' @@ -176,9 +153,8 @@ jobs: -Organization $(RELEASE_TARGET_ORGANIZATION) ` -DefinitionId $(RELEASE_TARGET_DEFINITION_ID) ` -Project $(RELEASE_TARGET_PROJECT) ` - -ImageName "${{ parameters.image_type }}" ` - -StorageAccountContainerName "images" ` - -VhdName "$(VhdName)" ` + -ImageType "${{ parameters.image_type }}" ` + -ManagedImageName "$(ManagedImageName)" ` -AccessToken $(RELEASE_TARGET_TOKEN) - task: PowerShell@2 @@ -188,7 +164,6 @@ jobs: targetType: filePath filePath: ./images.CI/linux-and-win/cleanup.ps1 arguments: -TempResourceGroupName "$(TempResourceGroupName)" ` - -StorageAccount $(AZURE_STORAGE_ACCOUNT) ` -SubscriptionId $(AZURE_SUBSCRIPTION) ` -ClientId $(CLIENT_ID) ` -ClientSecret $(CLIENT_SECRET) ` diff --git a/images.CI/linux-and-win/cleanup.ps1 b/images.CI/linux-and-win/cleanup.ps1 index 691bda29cc29..121aad5ffeac 100644 --- a/images.CI/linux-and-win/cleanup.ps1 +++ b/images.CI/linux-and-win/cleanup.ps1 @@ -1,23 +1,19 @@ param( - [String] [Parameter (Mandatory=$true)] $TempResourceGroupName, - [String] [Parameter (Mandatory=$true)] $StorageAccount, - [String] [Parameter (Mandatory=$true)] $SubscriptionId, - [String] [Parameter (Mandatory=$true)] $ClientId, - [String] [Parameter (Mandatory=$true)] $ClientSecret, - [String] [Parameter (Mandatory=$true)] $TenantId + [Parameter (Mandatory=$true)] [string] $TempResourceGroupName, + [Parameter (Mandatory=$true)] [string] $SubscriptionId, + [Parameter (Mandatory=$true)] [string] $ClientId, + [Parameter (Mandatory=$true)] [string] $ClientSecret, + [Parameter (Mandatory=$true)] [string] $TenantId ) az login --service-principal --username $ClientId --password $ClientSecret --tenant $TenantId | Out-Null +az account set --subscription $SubscriptionId | Out-Null -$groupExist = az group exists --name $TempResourceGroupName --subscription $SubscriptionId +$groupExist = az group exists --name $TempResourceGroupName if ($groupExist -eq "true") { - $osDiskName = az deployment group list --resource-group $TempResourceGroupName --query "[].properties.parameters.osDiskName.value" -o tsv Write-Host "Found a match, deleting temporary files" - az group delete --name $TempResourceGroupName --subscription $SubscriptionId --yes | Out-Null + az group delete --name $TempResourceGroupName --yes | Out-Null Write-Host "Temporary group was deleted successfully" - Write-Host "Deleting OS disk" - az storage remove --account-name $StorageAccount -c "images" -n "$osDiskName.vhd" --only-show-errors | Out-Null - Write-Host "OS disk deleted" } else { Write-Host "No temporary groups found" -} \ No newline at end of file +} diff --git a/images.CI/linux-and-win/convert-to-vhd.ps1 b/images.CI/linux-and-win/convert-to-vhd.ps1 deleted file mode 100644 index 4af5b1a60587..000000000000 --- a/images.CI/linux-and-win/convert-to-vhd.ps1 +++ /dev/null @@ -1,185 +0,0 @@ -param ( - [String] [Parameter (Mandatory = $true)] $SubscriptionId, - [String] [Parameter (Mandatory = $true)] $Location, - [String] [Parameter (Mandatory = $true)] $ResourceGroupName, - - [String] [Parameter (Mandatory = $true)] $ManagedImageName, - - [String] [Parameter (Mandatory = $true)] $GalleryName, - [String] [Parameter (Mandatory = $true)] $GalleryImageSku, - [String] [Parameter (Mandatory = $true)] $GalleryImageVersion, - - [String] [Parameter (Mandatory = $true)] $StorageAccountName, - [String] [Parameter (Mandatory = $true)] $StorageAccountContainerName, - [String] [Parameter (Mandatory = $true)] $VhdName, - - [Switch] [Parameter (Mandatory = $false)] $RemoveManagedImage, - - [String] [Parameter (Mandatory = $true)] $ClientId, - [String] [Parameter (Mandatory = $true)] $ClientSecret, - [String] [Parameter (Mandatory = $true)] $TenantId -) - -$ErrorActionPreference = "Stop" - -# Login to Azure -az login --service-principal --username $ClientId --password $ClientSecret --tenant $TenantId | Out-Null -az account set --subscription $SubscriptionId | Out-Null - -# Create Compute Image Gallery if it doesn't exist -Write-Host "Creating Compute Image Gallery '$GalleryName'..." -$galleryExists = az sig list --resource-group $ResourceGroupName --query "[?name=='$GalleryName']" -o tsv -if ($null -eq $galleryExists) { - az sig create --resource-group $ResourceGroupName --gallery-name $GalleryName --location $Location -} - -# Create Image Definition if it doesn't exist -Write-Host "Creating Image Definition '$ManagedImageName'..." -$imageDefinitionName = "RunnerImage-$GalleryImageSku" -if ($ManagedImageName -like "*windows*") { - $imageOsType = "Windows" -} elseif ($ManagedImageName -like "*ubuntu*") { - $imageOsType = "Linux" -} else { - throw "Unknown OS type for image '$ManagedImageName'" -} - -$galleryImageExists = az sig image-definition list --resource-group $ResourceGroupName --gallery-name $GalleryName --query "[?name=='$imageDefinitionName']" -o tsv -if ($null -eq $galleryImageExists) { - az sig image-definition create ` - --resource-group $ResourceGroupName ` - --gallery-name $GalleryName ` - --gallery-image-definition $imageDefinitionName ` - --publisher "GuthubImagesGeneration" ` - --offer "RunnerImage" ` - --sku $GalleryImageSku ` - --os-type $imageOsType ` - --location $Location -} - -# Create Image Version from existing Managed Image -Write-Host "Creating Image Version '$GalleryImageVersion' from Managed Image '$ManagedImageName'..." -az sig image-version create ` - --resource-group $ResourceGroupName ` - --gallery-name $GalleryName ` - --gallery-image-definition $imageDefinitionName ` - --gallery-image-version $GalleryImageVersion ` - --managed-image "/subscriptions/$SubscriptionId/resourceGroups/$ResourceGroupName/providers/Microsoft.Compute/images/$ManagedImageName" ` - --target-regions $Location ` - --replica-count 1 ` - --location $Location - -# Create Azure Managed Disk from Shared Image Gallery -Write-Host "Creating Azure Managed Disk '$ManagedImageName' from Shared Image Gallery..." -az disk create ` - --resource-group $ResourceGroupName ` - --name $ManagedImageName ` - --location $Location ` - --gallery-image-reference "/subscriptions/$SubscriptionId/resourceGroups/$ResourceGroupName/providers/Microsoft.Compute/galleries/$GalleryName/images/$imageDefinitionName/versions/$GalleryImageVersion" - -# Generate SAS URL for the Managed Disk -Write-Host "Generating SAS URL for the Managed Disk '$ManagedImageName'..." -$sourceDiskUri = az disk grant-access ` - --resource-group $ResourceGroupName ` - --name $ManagedImageName ` - --duration-in-seconds 86400 ` - --access-level Read ` - --query [accessSas] -o tsv - -Write-Host "Querying key for the storage account '$StorageAccountName'..." -$targetKey = az storage account keys list ` - --resource-group $ResourceGroupName ` - --account-name $StorageAccountName ` - --query "[0].value" -o tsv - -Write-Host ("Copying VHD blob from '{0}' to 'https://{1}.blob.core.windows.net/{2}/{3}'..." ` - -f $sourceDiskUri.Split('?')[0], $StorageAccountName, $StorageAccountContainerName, $VhdName) - -az storage blob copy start ` - --source-uri $sourceDiskUri ` - --destination-blob $VhdName ` - --destination-container $StorageAccountContainerName ` - --account-name $StorageAccountName ` - --account-key $targetKey ` - --only-show-errors - -Write-Host "Waiting for the copy to complete..." -while ($true) { - $status = az storage blob show ` - --container-name $StorageAccountContainerName ` - --name $VhdName ` - --account-name $StorageAccountName ` - --account-key $targetKey ` - --query "properties.copy.status" -o tsv - - if ($status -eq "success") { - Write-Host "Copy completed successfully." - break - } elseif ($status -ne "pending") { - Write-Host "Copy failed with status '$status', see blob information below:" - az storage blob show ` - --container-name $StorageAccountContainerName ` - --name $VhdName ` - --account-name $StorageAccountName ` - --account-key $targetKey - throw "Copy failed with status '$status'" - } - - $progress = az storage blob show ` - --container-name $StorageAccountContainerName ` - --name $VhdName ` - --account-name $StorageAccountName ` - --account-key $targetKey ` - --query "properties.copy.progress" -o tsv - - Write-Host "Progress: $(($progress.Split("/")[0] / $progress.Split("/")[1]).ToString("P"))" - Start-Sleep -Seconds 15 -} - -Write-Host "Successfully converted '$ManagedImageName' to '$VhdName' in '$StorageAccountName' storage account." - -# Remove Managed Image if requested -if ($RemoveManagedImage) { - Write-Host "Removing Managed Image '$ManagedImageName'..." - az image delete ` - --resource-group $ResourceGroupName ` - --name $ManagedImageName ` - --only-show-errors - if ($LastExitCode) { - Write-Host "Warning: Failed to delete the Managed Image '$ManagedImageName'." - } -} - -Write-Host "Cleaning up..." - -# Revoke SAS URL for the Managed Disk -az disk revoke-access ` - --resource-group $ResourceGroupName ` - --name $ManagedImageName ` - --only-show-errors -if ($LastExitCode) { - Write-Host "Warning: Failed to revoke access to the Managed Disk '$ManagedImageName'." -} - -# Delete Azure Managed Disk from Shared Image Gallery -az disk delete ` - --resource-group $ResourceGroupName ` - --name $ManagedImageName ` - --only-show-errors ` - --yes -if ($LastExitCode) { - Write-Host "Warning: Failed to delete the Managed Disk '$ManagedImageName'." -} - -# Delete Image Version from Shared Image Gallery -az sig image-version delete ` - --resource-group $ResourceGroupName ` - --gallery-name $GalleryName ` - --gallery-image-definition $imageDefinitionName ` - --gallery-image-version $GalleryImageVersion ` - --only-show-errors -if ($LastExitCode) { - Write-Host "Warning: Failed to delete the Image Version '$GalleryImageVersion'." -} - -Write-Host "Done." diff --git a/images.CI/linux-and-win/create-release.ps1 b/images.CI/linux-and-win/create-release.ps1 index 1dcb95afca26..ebed56161084 100644 --- a/images.CI/linux-and-win/create-release.ps1 +++ b/images.CI/linux-and-win/create-release.ps1 @@ -1,12 +1,11 @@ param( - [UInt32] [Parameter (Mandatory)] $BuildId, - [String] [Parameter (Mandatory)] $Organization, - [String] [Parameter (Mandatory)] $Project, - [String] [Parameter (Mandatory)] $ImageName, - [String] [Parameter (Mandatory)] $StorageAccountContainerName, - [String] [Parameter (Mandatory)] $VhdName, - [String] [Parameter (Mandatory)] $DefinitionId, - [String] [Parameter (Mandatory)] $AccessToken + [Parameter (Mandatory)] [UInt32] $BuildId, + [Parameter (Mandatory)] [string] $Organization, + [Parameter (Mandatory)] [string] $Project, + [Parameter (Mandatory)] [string] $ImageType, + [Parameter (Mandatory)] [string] $ManagedImageName, + [Parameter (Mandatory)] [string] $DefinitionId, + [Parameter (Mandatory)] [string] $AccessToken ) $Body = @{ @@ -15,14 +14,11 @@ $Body = @{ ImageBuildId = @{ value = $BuildId } - ImageName = @{ - value = $ImageName + ImageType = @{ + value = $ImageType } - ImageStorageContainerName = @{ - value = $StorageAccountContainerName - } - ImageBlobPath = @{ - value = $VhdName + ManagedImageName = @{ + value = $ManagedImageName } } isDraft = "false" @@ -37,4 +33,4 @@ $headers = @{ [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 -bor [Net.SecurityProtocolType]::Tls13 $NewRelease = Invoke-RestMethod $URL -Body $Body -Method "POST" -Headers $headers -ContentType "application/json" -Write-Host "Created release: $($NewRelease._links.web.href)" \ No newline at end of file +Write-Host "Created release: $($NewRelease._links.web.href)" From 13db67011862b0c3d9ff620f9143ae20904c7bc7 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 18 Oct 2023 17:25:35 +0000 Subject: [PATCH 2350/3485] Updating readme file for win19 version 20231016.1.1 (#8580) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2019-Readme.md | 117 ++++++++++++++++--------------- 1 file changed, 59 insertions(+), 58 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index 9a10b133e7a1..515859ae7554 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -1,11 +1,10 @@ | Announcements | |-| | [[All OS] Android NDK r23 will be removed from images on October 9](https://github.com/actions/runner-images/issues/8383) | -| [[All OS] hub utility will be removed on October 2](https://github.com/actions/runner-images/issues/8362) | *** # Windows Server 2019 -- OS Version: 10.0.17763 Build 4851 -- Image Version: 20231002.2.0 +- OS Version: 10.0.17763 Build 4974 +- Image Version: 20231016.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -14,27 +13,27 @@ ### Language and Runtime - Bash 5.2.15(1)-release -- Go 1.20.8 +- Go 1.20.10 - Julia 1.9.3 - Kotlin 1.9.10 - LLVM 16.0.6 -- Node 18.18.0 -- Perl 5.32.1 +- Node 18.18.2 +- Perl 5.38.0 - PHP 8.2.11 - Python 3.7.9 - Ruby 2.5.9p229 ### Package Management - Chocolatey 2.2.2 -- Composer 2.6.4 -- Helm 3.12.3 +- Composer 2.6.5 +- Helm 3.13.0 - Miniconda 23.5.2 (pre-installed on the image but not added to PATH) - NPM 9.8.1 - NuGet 6.7.0.127 -- pip 23.2.1 (python 3.7) +- pip 23.3 (python 3.7) - Pipx 1.2.0 - RubyGems 2.7.6.3 -- Vcpkg (build from commit c6d6efed3) +- Vcpkg (build from commit e57b2167e) - Yarn 1.22.19 #### Environment variables @@ -45,7 +44,7 @@ ### Project Management - Ant 1.10.14 -- Gradle 8.3 +- Gradle 8.4 - Maven 3.8.7 - sbt 1.9.6 @@ -55,19 +54,19 @@ - azcopy 10.21.0 - Bazel 6.3.2 - Bazelisk 1.18.0 -- Bicep 0.21.1 +- Bicep 0.22.6 - Cabal 3.10.1.0 -- CMake 3.27.6 -- CodeQL Action Bundles 2.14.5 2.14.6 +- CMake 3.26.4 +- CodeQL Action Bundle 2.15.0 - Docker 24.0.6 - Docker Compose v1 1.29.2 - Docker Compose v2 2.22.0 - Docker-wincred 0.8.0 -- ghc 9.6.3 +- ghc 9.8.1 - Git 2.42.0.windows.2 - Git LFS 3.4.0 -- Google Cloud CLI 448.0.0 -- ImageMagick 7.1.1-19 +- Google Cloud CLI 450.0.0 +- ImageMagick 7.1.1-20 - InnoSetup 6.2.2 - jq 1.7-dirty - Kind 0.20.0 @@ -80,8 +79,8 @@ - NSIS 3.08 - OpenSSL 1.1.1w - Packer 1.9.4 -- Parcel 2.9.3 -- Pulumi 3.86.0 +- Parcel 2.10.0 +- Pulumi 3.88.1 - R 4.3.1 - Service Fabric SDK 9.1.1436.9590 - Stack 2.13.1 @@ -94,19 +93,19 @@ - zstd 1.5.5 ### CLI Tools -- Alibaba Cloud CLI 3.0.181 -- AWS CLI 2.13.20 -- AWS SAM CLI 1.97.0 +- Alibaba Cloud CLI 3.0.183 +- AWS CLI 2.13.26 +- AWS SAM CLI 1.98.0 - AWS Session Manager CLI 1.2.497.0 - Azure CLI 2.53.0 - Azure DevOps CLI extension 0.26.0 - Cloud Foundry CLI 6.53.0 -- GitHub CLI 2.35.0 +- GitHub CLI 2.36.0 ### Rust Tools -- Cargo 1.72.1 -- Rust 1.72.1 -- Rustdoc 1.72.1 +- Cargo 1.73.0 +- Rust 1.73.0 +- Rustdoc 1.73.0 - Rustup 1.26.0 #### Packages @@ -114,18 +113,18 @@ - cargo-audit 0.18.2 - cargo-outdated 0.13.1 - cbindgen 0.26.0 -- Clippy 0.1.72 +- Clippy 0.1.73 - Rustfmt 1.6.0 ### Browsers and Drivers -- Google Chrome 117.0.5938.132 -- Chrome Driver 117.0.5938.92 -- Microsoft Edge 117.0.2045.47 -- Microsoft Edge Driver 117.0.2045.47 -- Mozilla Firefox 118.0.1 +- Google Chrome 118.0.5993.71 +- Chrome Driver 118.0.5993.70 +- Microsoft Edge 118.0.2088.46 +- Microsoft Edge Driver 118.0.2088.46 +- Mozilla Firefox 118.0.2 - Gecko Driver 0.33.0 -- IE Driver 4.11.0.0 -- Selenium server 4.13.0 +- IE Driver 4.14.0.0 +- Selenium server 4.14.0 #### Environment variables | Name | Value | @@ -141,6 +140,7 @@ | 8.0.382+5 (default) | JAVA_HOME_8_X64 | | 11.0.20+101 | JAVA_HOME_11_X64 | | 17.0.8+101 | JAVA_HOME_17_X64 | +| 21.0.0+35.0.LTS | JAVA_HOME_21_X64 | ### Shells | Name | Target | @@ -166,21 +166,22 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Go - 1.19.13 -- 1.20.8 -- 1.21.1 +- 1.20.10 +- 1.21.3 #### Node.js - 14.21.3 - 16.20.2 -- 18.18.0 -- 20.8.0 +- 18.18.2 +- 20.8.1 #### Python - 3.7.9 - 3.8.10 - 3.9.13 - 3.10.11 -- 3.11.5 +- 3.11.6 +- 3.12.0 #### PyPy - 2.7.18 [PyPy 7.3.13] @@ -220,7 +221,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Azure CosmosDb Emulator 2.14.12.0 - DacFx 162.0.52.1 - MySQL 5.7.43.0 -- SQL OLEDB Driver 18.6.3.0 +- SQL OLEDB Driver 18.6.7.0 - SQLPS 1.0 ### Web Servers @@ -230,14 +231,14 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Nginx | 1.25.2 | C:\tools\nginx-1.25.2\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2019 -| Name | Version | Path | -| ----------------------------- | -------------- | -------------------------------------------------------------- | -| Visual Studio Enterprise 2019 | 16.11.34031.81 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | +| Name | Version | Path | +| ----------------------------- | --------------- | -------------------------------------------------------------- | +| Visual Studio Enterprise 2019 | 16.11.34114.132 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | #### Workloads, components and extensions | Package | Version | | ------------------------------------------------------------------------- | --------------- | -| Component.Android.NDK.R16B | 16.11.34031.81 | +| Component.Android.NDK.R16B | 16.11.34114.51 | | Component.Android.SDK25.Private | 16.0.28625.61 | | Component.Android.SDK30 | 16.10.31205.252 | | Component.Ant | 1.9.3.8 | @@ -495,15 +496,15 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 10.0.22621.0 ### .NET Core Tools -- .NET Core SDK: 6.0.122, 6.0.203, 6.0.317, 6.0.414 +- .NET Core SDK: 6.0.123, 6.0.203, 6.0.318, 6.0.415 - .NET Framework: 4.7.2, 4.8 -- Microsoft.AspNetCore.App: 6.0.5, 6.0.22 -- Microsoft.NETCore.App: 6.0.5, 6.0.22 -- Microsoft.WindowsDesktop.App: 6.0.5, 6.0.22 +- Microsoft.AspNetCore.App: 6.0.5, 6.0.23 +- Microsoft.NETCore.App: 6.0.5, 6.0.23 +- Microsoft.WindowsDesktop.App: 6.0.5, 6.0.23 - nbgv 3.6.133+2d32d93cb1 ### PowerShell Tools -- PowerShell 7.2.14 +- PowerShell 7.2.15 #### Powershell Modules - Az: 9.3.0 @@ -512,7 +513,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Az (Cached): 1.0.0.zip, 1.6.0.zip, 2.3.2.zip, 2.6.0.zip, 3.1.0.zip, 3.5.0.zip, 3.8.0.zip, 4.3.0.zip, 4.4.0.zip, 4.7.0.zip, 5.5.0.zip, 5.9.0.zip, 6.6.0.zip, 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.424 +- AWSPowershell: 4.1.430 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 - Microsoft.Graph: 2.6.1 @@ -534,14 +535,14 @@ All other versions are saved but not installed. | Android Command Line Tools | 8.0 | | Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3<br>26.0.0 26.0.1 26.0.2 26.0.3<br>25.0.0 25.0.1 25.0.2 25.0.3<br>24.0.0 24.0.1 24.0.2 24.0.3<br>23.0.1 23.0.2 23.0.3<br>22.0.1<br>21.1.2<br>20.0.0<br>19.1.0 | | Android SDK Platforms | android-34 (rev 2)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3)<br>android-26 (rev 2)<br>android-25 (rev 3)<br>android-24 (rev 2)<br>android-23 (rev 3)<br>android-22 (rev 2)<br>android-21 (rev 2)<br>android-20 (rev 2)<br>android-19 (rev 4) | -| Android SDK Platform-Tools | 34.0.4 | +| Android SDK Platform-Tools | 34.0.5 | | Android SDK Tools | 26.1.1 | | Android Support Repository | 47.0.0 | | CMake | 3.10.2<br>3.18.1<br>3.22.1 | | Google APIs | addon-google_apis-google-21<br>addon-google_apis-google-22<br>addon-google_apis-google-23<br>addon-google_apis-google-24 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 23.2.8568313<br>24.0.8215888<br>25.2.9519653<br>26.0.10792818 | +| NDK | 23.2.8568313<br>24.0.8215888<br>25.2.9519653<br>26.1.10909125 | | SDK Patch Applier v4 | 1 | #### Environment variables @@ -550,16 +551,16 @@ All other versions are saved but not installed. | ANDROID_HOME | C:\Android\android-sdk | | ANDROID_NDK | C:\Android\android-sdk\ndk\25.2.9519653 | | ANDROID_NDK_HOME | C:\Android\android-sdk\ndk\25.2.9519653 | -| ANDROID_NDK_LATEST_HOME | C:\Android\android-sdk\ndk\26.0.10792818 | +| ANDROID_NDK_LATEST_HOME | C:\Android\android-sdk\ndk\26.1.10909125 | | ANDROID_NDK_ROOT | C:\Android\android-sdk\ndk\25.2.9519653 | | ANDROID_SDK_ROOT | C:\Android\android-sdk | ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:604f8ccbeebb10fc9e6ffcea3402459a7ed4b30ff0a39f21337696d5782ab52a | 2023-09-12 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:bf0217fdc494f804953ec59b004fcd52c111e38d79c8daef35c2f41af5a63b87 | 2023-09-12 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:2669cf0d359f8eb800c539920ea7f73429f7ab61173d1c0f850260d521f1a38d | 2023-09-12 | -| mcr.microsoft.com/windows/nanoserver:1809 | sha256:4bb2610b0e4f848e81d091cba672b0308a8eebf6c4a4f006e9c4c12b85d1823e | 2023-08-29 | -| mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:3cba12bffca83466997158c8a0d38f20a18fb14f5ec62cd6454dfdd328278d87 | 2023-08-29 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:ff2952603dbf90761b5b8af0f9bdd3d1cdd123a43d2cd54b09c871e18864aa6e | 2023-10-10 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:2173a3e2b0c4d9f77bb32846c36c0e9fe27813fe2f19ad868fb5f891486bbc7e | 2023-10-10 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:9d2262cd7ac6f4dd4964086e353ba9253be48b5709f850564f877b8dea9614ec | 2023-10-10 | +| mcr.microsoft.com/windows/nanoserver:1809 | sha256:bed3cb2d55f44371fdeebdabf97e8679347748c16dec0d2c351e25fb0b7bbb32 | 2023-10-02 | +| mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:b3b5f1d43d7004541aae6f0c2ead0c70d943c85653f0e37861c73eaa9d687c42 | 2023-10-02 | From faac8776f4cfc45a36eb83ca68469defd6b0cafb Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 18 Oct 2023 17:35:11 +0000 Subject: [PATCH 2351/3485] Updating readme file for ubuntu22 version 20231016.1.1 (#8577) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2204-Readme.md | 121 +++++++++++++++--------------- 1 file changed, 60 insertions(+), 61 deletions(-) diff --git a/images/linux/Ubuntu2204-Readme.md b/images/linux/Ubuntu2204-Readme.md index e49a9ccabb88..e312eeedbc8b 100644 --- a/images/linux/Ubuntu2204-Readme.md +++ b/images/linux/Ubuntu2204-Readme.md @@ -1,12 +1,11 @@ | Announcements | |-| | [[All OS] Android NDK r23 will be removed from images on October 9](https://github.com/actions/runner-images/issues/8383) | -| [[All OS] hub utility will be removed on October 2](https://github.com/actions/runner-images/issues/8362) | *** # Ubuntu 22.04 - OS Version: 22.04.3 LTS -- Kernel Version: 6.2.0-1012-azure -- Image Version: 20231001.1.0 +- Kernel Version: 6.2.0-1014-azure +- Image Version: 20231016.1.0 - Systemd version: 249.11-0ubuntu3.10 ## Installed Software @@ -23,7 +22,7 @@ - Kotlin 1.9.10-release-459 - Mono 6.12.0.200 - MSBuild 16.10.1.31701 (Mono 6.12.0.200) -- Node.js 18.18.0 +- Node.js 18.18.2 - Perl 5.34.0 - Python 3.10.12 - Ruby 3.0.2p107 @@ -31,8 +30,8 @@ ### Package Management - cpan 1.64 -- Helm 3.13.0 -- Homebrew 4.1.13 +- Helm 3.13.1 +- Homebrew 4.1.16 - Miniconda 23.5.2 - Npm 9.8.1 - NuGet 6.6.1.2 @@ -40,7 +39,7 @@ - Pip3 22.0.2 - Pipx 1.2.0 - RubyGems 3.3.5 -- Vcpkg (build from commit c6d6efed3) +- Vcpkg (build from commit e57b2167e) - Yarn 1.22.19 #### Environment variables @@ -58,19 +57,19 @@ to accomplish this. ``` ### Project Management -- Lerna 7.3.0 +- Lerna 7.3.1 - Maven 3.8.8 ### Tools -- Ansible 2.15.4 +- Ansible 2.15.5 - apt-fast 1.9.12 - AzCopy 10.21.0 - available by `azcopy` and `azcopy10` aliases - Bazel 6.3.2 - Bazelisk 1.18.0 -- Bicep 0.21.1 +- Bicep 0.22.6 - Buildah 1.23.1 -- CMake 3.27.6 -- CodeQL Action Bundles 2.14.5 2.14.6 +- CMake 3.27.7 +- CodeQL Action Bundle 2.15.0 - Docker Amazon ECR Credential Helper 0.7.1 - Docker Compose v1 1.29.2 - Docker Compose v2 2.22.0 @@ -82,7 +81,7 @@ to accomplish this. - Git LFS 3.4.0 - Git-ftp 1.6.0 - Haveged 1.9.14 -- Heroku 8.5.0 +- Heroku 8.6.0 - jq 1.6 - Kind 0.20.0 - Kubectl 1.28.2 @@ -91,36 +90,36 @@ to accomplish this. - MediaInfo 21.09 - Mercurial 6.1.1 - Minikube 1.31.2 -- n 9.1.0 +- n 9.2.0 - Newman 6.0.0 - nvm 0.39.5 - OpenSSL 3.0.2-0ubuntu1.10 - Packer 1.9.4 -- Parcel 2.9.3 +- Parcel 2.10.0 - Podman 3.4.4 -- Pulumi 3.86.0 +- Pulumi 3.88.1 - R 4.3.1 - Skopeo 1.4.1 - Sphinx Open Source Search Server 2.2.11 - SVN 1.14.1 -- Terraform 1.5.7 +- Terraform 1.6.1 - yamllint 1.32.0 - yq 4.35.2 - zstd 1.5.5 ### CLI Tools -- Alibaba Cloud CLI 3.0.181 -- AWS CLI 2.13.22 +- Alibaba Cloud CLI 3.0.183 +- AWS CLI 2.13.26 - AWS CLI Session Manager Plugin 1.2.497.0 -- AWS SAM CLI 1.97.0 +- AWS SAM CLI 1.98.0 - Azure CLI 2.53.0 - Azure CLI (azure-devops) 0.26.0 -- GitHub CLI 2.35.0 -- Google Cloud CLI 448.0.0 -- Netlify CLI 16.4.2 -- OpenShift CLI 4.13.13 +- GitHub CLI 2.36.0 +- Google Cloud CLI 450.0.0 +- Netlify CLI 16.7.0 +- OpenShift CLI 4.13.15 - ORAS CLI 1.1.0 -- Vercel CLI 32.3.1 +- Vercel CLI 32.4.1 ### Java | Version | Environment Variable | @@ -131,7 +130,7 @@ to accomplish this. ### PHP Tools - PHP: 8.1.2 -- Composer 2.6.4 +- Composer 2.6.5 - PHPUnit 8.5.34 ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. @@ -139,32 +138,32 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ### Haskell Tools - Cabal 3.10.1.0 -- GHC 9.6.3 +- GHC 9.8.1 - GHCup 0.1.19.4 - Stack 2.13.1 ### Rust Tools -- Cargo 1.72.1 -- Rust 1.72.1 -- Rustdoc 1.72.1 +- Cargo 1.73.0 +- Rust 1.73.0 +- Rustdoc 1.73.0 - Rustup 1.26.0 #### Packages - Bindgen 0.68.1 - Cargo audit 0.18.2 -- Cargo clippy 0.1.72 +- Cargo clippy 0.1.73 - Cargo outdated 0.13.1 - Cbindgen 0.26.0 - Rustfmt 1.6.0 ### Browsers and Drivers -- Google Chrome 117.0.5938.132 -- ChromeDriver 117.0.5938.92 -- Chromium 117.0.5938.0 -- Microsoft Edge 117.0.2045.47 -- Microsoft Edge WebDriver 117.0.2045.47 -- Selenium server 4.13.0 -- Mozilla Firefox 118.0.1 +- Google Chrome 118.0.5993.70 +- ChromeDriver 118.0.5993.70 +- Chromium 118.0.5993.0 +- Microsoft Edge 118.0.2088.46 +- Microsoft Edge WebDriver 118.0.2088.46 +- Selenium server 4.14.0 +- Mozilla Firefox 118.0.2 - Geckodriver 0.33.0 #### Environment variables @@ -176,7 +175,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | ### .NET Tools -- .NET Core SDK: 6.0.414, 7.0.111, 7.0.203, 7.0.308, 7.0.401 +- .NET Core SDK: 6.0.415, 7.0.112, 7.0.203, 7.0.309, 7.0.402 - nbgv 3.6.133+2d32d93cb1 ### Databases @@ -207,21 +206,21 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Go - 1.19.13 -- 1.20.8 -- 1.21.1 +- 1.20.10 +- 1.21.3 #### Node.js - 14.21.3 - 16.20.2 -- 18.18.0 -- 20.8.0 +- 18.18.2 +- 20.8.1 #### Python - 3.7.17 - 3.8.18 - 3.9.18 - 3.10.13 -- 3.11.5 +- 3.11.6 #### PyPy - 3.7.13 [PyPy 7.3.9] @@ -233,7 +232,7 @@ Use the following command as a part of your job to start the service: 'sudo syst - 3.1.4 ### PowerShell Tools -- PowerShell 7.2.14 +- PowerShell 7.2.15 #### PowerShell Modules - Az: 9.3.0 @@ -261,7 +260,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | CMake | 3.10.2<br>3.18.1<br>3.22.1 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 23.2.8568313<br>24.0.8215888<br>25.2.9519653 (default)<br>26.0.10792818 | +| NDK | 23.2.8568313<br>24.0.8215888<br>25.2.9519653 (default)<br>26.1.10909125 | | SDK Patch Applier v4 | 1 | #### Environment variables @@ -270,7 +269,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | ANDROID_HOME | /usr/local/lib/android/sdk | | ANDROID_NDK | /usr/local/lib/android/sdk/ndk/25.2.9519653 | | ANDROID_NDK_HOME | /usr/local/lib/android/sdk/ndk/25.2.9519653 | -| ANDROID_NDK_LATEST_HOME | /usr/local/lib/android/sdk/ndk/26.0.10792818 | +| ANDROID_NDK_LATEST_HOME | /usr/local/lib/android/sdk/ndk/26.1.10909125 | | ANDROID_NDK_ROOT | /usr/local/lib/android/sdk/ndk/25.2.9519653 | | ANDROID_SDK_ROOT | /usr/local/lib/android/sdk | @@ -280,22 +279,22 @@ Use the following command as a part of your job to start the service: 'sudo syst | alpine:3.16 | sha256:a8cbb8c69ee71561f4b69c066bad07f7e510caaa523da26fbfc606b10bd7934b | 2023-08-07 | | alpine:3.17 | sha256:f71a5f071694a785e064f05fed657bf8277f1b2113a8ed70c90ad486d6ee54dc | 2023-08-07 | | alpine:3.18 | sha256:eece025e432126ce23f223450a0326fbebde39cdf496a85d8c016293fc851978 | 2023-09-28 | -| buildpack-deps:bullseye | sha256:8ee57204a7af0468a61a3e47fbf8412d6ad1d479050bb702d99fd1d3664d7173 | 2023-09-20 | -| buildpack-deps:buster | sha256:0bc568b581ed3e9a13f818fd20258edb623cf67e6d354afadf77fb9095d798a2 | 2023-09-20 | -| debian:10 | sha256:484cc8ab0d73f513e3f9bacd03424eb081bd90f594d7ebde42587843fdc242f3 | 2023-09-20 | -| debian:11 | sha256:54d33aaad0bc936a9a40d856764c7bc35c0afaa9cab51f88bb95f6cd8004438d | 2023-09-20 | +| buildpack-deps:bullseye | sha256:e5587c367e13ef9c01dede7c4085056a65e24caa7257a53c303c6c074fe6034e | 2023-10-12 | +| buildpack-deps:buster | sha256:82e25c1dea159632964a4c576380aa6ae9fd1d28c42b1f967d5474167ee4f6a1 | 2023-10-12 | +| debian:10 | sha256:853b9ec779e55f670cbdcb5e15bfb778b5be2c5c61fc8c655638b7a977d273c6 | 2023-10-11 | +| debian:11 | sha256:c141beaa9e0767774221cc82efe3a6712a1cc4f75d2699334dfd9a28a6f7357b | 2023-10-11 | | moby/buildkit:latest | sha256:890dcae054e3039f6c6b76bf0da80a130fa6e6bb1f3624063ef0210ac2c57b06 | 2023-08-24 | | node:14 | sha256:a158d3b9b4e3fa813fa6c8c590b8f0a860e015ad4e59bbce5744d2f6fd8461aa | 2023-04-12 | | node:14-alpine | sha256:434215b487a329c9e867202ff89e704d3a75e554822e07f3e0c0f9e606121b33 | 2023-03-29 | | node:16 | sha256:f77a1aef2da8d83e45ec990f45df50f1a286c5fe8bbfb8c6e4246c6389705c0b | 2023-09-07 | | node:16-alpine | sha256:a1f9d027912b58a7c75be7716c97cfbc6d3099f3a97ed84aa490be9dee20e787 | 2023-08-10 | -| node:18 | sha256:ee0a21d64211d92d4340b225c556e9ef1a8bce1d5b03b49f5f07bf1dbbaa5626 | 2023-09-21 | -| node:18-alpine | sha256:a315556d82ef54561e54fca7d8ee333382de183d4e56841dcefcd05b55310f46 | 2023-09-29 | -| node:20 | sha256:6b3f9aa7eefa8d4c93d43914e78aa2bfea9a12808b0059e5da78854dfa8b8768 | 2023-09-29 | -| node:20-alpine | sha256:37750e51d61bef92165b2e29a77da4277ba0777258446b7a9c99511f119db096 | 2023-09-29 | +| node:18 | sha256:d764525456dfe2f96a436ba00f864ee8ae3690bfb457c9f12a3a2a35b2d8be41 | 2023-10-16 | +| node:18-alpine | sha256:0fe7402d11d8c85474c6ec6f9c9c8048cd0549c95535832b7f0735a4b47690a5 | 2023-10-16 | +| node:20 | sha256:98f80754df0cf581de86a2cbbf85692cccde41916b35a97a1c84b0a971b8d578 | 2023-10-16 | +| node:20-alpine | sha256:a369136b6f7640f85acf300ce9d6498d8161972b855a72bbc79273150d4dd0c7 | 2023-10-16 | | ubuntu:18.04 | sha256:152dc042452c496007f07ca9127571cb9c29697f42acbfad72324b2bb2e43c98 | 2023-05-30 | -| ubuntu:20.04 | sha256:33a5cc25d22c45900796a1aca487ad7a7cb09f09ea00b779e3b2026b4fc2faba | 2023-08-01 | -| ubuntu:22.04 | sha256:aabed3296a3d45cede1dc866a24476c4d7e093aa806263c27ddaadbdce3c1054 | 2023-08-16 | +| ubuntu:20.04 | sha256:ed4a42283d9943135ed87d4ee34e542f7f5ad9ecf2f244870e23122f703f91c2 | 2023-10-03 | +| ubuntu:22.04 | sha256:2b7412e6465c3c7fc5bb21d3e6f1917c167358449fecac8176c6e496e5c1f05f | 2023-10-05 | ### Installed apt packages | Name | Version | @@ -309,7 +308,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | brotli | 1.0.9-2build6 | | bzip2 | 1.0.8-5build1 | | coreutils | 8.32-4.1ubuntu1 | -| curl | 7.81.0-1ubuntu1.13 | +| curl | 7.81.0-1ubuntu1.14 | | dbus | 1.12.20-2ubuntu4.1 | | dnsutils | 1:9.18.12-0ubuntu0.22.04.3 | | dpkg | 1.21.1ubuntu2.2 | @@ -330,8 +329,8 @@ Use the following command as a part of your job to start the service: 'sudo syst | lib32z1 | 1:1.2.11.dfsg-2ubuntu9.2 | | libc++-dev | 1:14.0-55\~exp2 | | libc++abi-dev | 1:14.0-55\~exp2 | -| libc6-dev | 2.35-0ubuntu3.3 | -| libcurl4 | 7.81.0-1ubuntu1.13 | +| libc6-dev | 2.35-0ubuntu3.4 | +| libcurl4 | 7.81.0-1ubuntu1.14 | | libgbm-dev | 23.0.4-0ubuntu1\~22.04.1 | | libgconf-2-4 | 3.2.6-7ubuntu2 | | libgsl-dev | 2.7.1+dfsg-3 | @@ -347,7 +346,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | libxkbfile-dev | 1:1.1.0-1build3 | | libxss1 | 1:1.2.3-1build2 | | libyaml-dev | 0.2.2-1build2 | -| locales | 2.35-0ubuntu3.3 | +| locales | 2.35-0ubuntu3.4 | | lz4 | 1.9.3-2build2 | | m4 | 1.4.18-5ubuntu2 | | make | 4.3-4.1build1 | From 87d32217309153ea156cc44c38d6e4aaaacc9399 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 18 Oct 2023 18:01:34 +0000 Subject: [PATCH 2352/3485] Updating readme file for win22 version 20231016.1.1 (#8579) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2022-Readme.md | 161 ++++++++++++++++--------------- 1 file changed, 81 insertions(+), 80 deletions(-) diff --git a/images/win/Windows2022-Readme.md b/images/win/Windows2022-Readme.md index a1a27432cf63..4762002333c7 100644 --- a/images/win/Windows2022-Readme.md +++ b/images/win/Windows2022-Readme.md @@ -1,11 +1,10 @@ | Announcements | |-| | [[All OS] Android NDK r23 will be removed from images on October 9](https://github.com/actions/runner-images/issues/8383) | -| [[All OS] hub utility will be removed on October 2](https://github.com/actions/runner-images/issues/8362) | *** # Windows Server 2022 -- OS Version: 10.0.20348 Build 1970 -- Image Version: 20231002.1.0 +- OS Version: 10.0.20348 Build 2031 +- Image Version: 20231016.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -14,27 +13,27 @@ ### Language and Runtime - Bash 5.2.15(1)-release -- Go 1.20.8 +- Go 1.20.10 - Julia 1.9.3 - Kotlin 1.9.10 - LLVM 16.0.6 -- Node 18.18.0 -- Perl 5.32.1 +- Node 18.18.2 +- Perl 5.38.0 - PHP 8.2.11 - Python 3.9.13 - Ruby 3.0.6p216 ### Package Management - Chocolatey 2.2.2 -- Composer 2.6.4 -- Helm 3.12.3 +- Composer 2.6.5 +- Helm 3.13.0 - Miniconda 23.5.2 (pre-installed on the image but not added to PATH) - NPM 9.8.1 - NuGet 6.7.0.127 -- pip 23.2.1 (python 3.9) +- pip 23.3 (python 3.9) - Pipx 1.2.0 - RubyGems 3.2.33 -- Vcpkg (build from commit c6d6efed3) +- Vcpkg (build from commit e57b2167e) - Yarn 1.22.19 #### Environment variables @@ -45,7 +44,7 @@ ### Project Management - Ant 1.10.14 -- Gradle 8.3 +- Gradle 8.4 - Maven 3.8.7 - sbt 1.9.6 @@ -55,18 +54,18 @@ - azcopy 10.21.0 - Bazel 6.3.2 - Bazelisk 1.18.0 -- Bicep 0.21.1 +- Bicep 0.22.6 - Cabal 3.10.1.0 -- CMake 3.27.6 -- CodeQL Action Bundles 2.14.5 2.14.6 +- CMake 3.26.4 +- CodeQL Action Bundle 2.15.0 - Docker 24.0.6 - Docker Compose v1 1.29.2 - Docker Compose v2 2.22.0 - Docker-wincred 0.8.0 -- ghc 9.6.3 +- ghc 9.8.1 - Git 2.42.0.windows.2 - Git LFS 3.4.0 -- ImageMagick 7.1.1-19 +- ImageMagick 7.1.1-20 - InnoSetup 6.2.2 - jq 1.7-dirty - Kind 0.20.0 @@ -79,7 +78,7 @@ - NSIS 3.08 - OpenSSL 1.1.1w - Packer 1.9.4 -- Pulumi 3.86.0 +- Pulumi 3.88.1 - R 4.3.1 - Service Fabric SDK 9.1.1436.9590 - Stack 2.13.1 @@ -92,18 +91,18 @@ - zstd 1.5.5 ### CLI Tools -- Alibaba Cloud CLI 3.0.181 -- AWS CLI 2.13.20 -- AWS SAM CLI 1.97.0 +- Alibaba Cloud CLI 3.0.183 +- AWS CLI 2.13.26 +- AWS SAM CLI 1.98.0 - AWS Session Manager CLI 1.2.497.0 - Azure CLI 2.53.0 - Azure DevOps CLI extension 0.26.0 -- GitHub CLI 2.35.0 +- GitHub CLI 2.36.0 ### Rust Tools -- Cargo 1.72.1 -- Rust 1.72.1 -- Rustdoc 1.72.1 +- Cargo 1.73.0 +- Rust 1.73.0 +- Rustdoc 1.73.0 - Rustup 1.26.0 #### Packages @@ -111,18 +110,18 @@ - cargo-audit 0.18.2 - cargo-outdated 0.13.1 - cbindgen 0.26.0 -- Clippy 0.1.72 +- Clippy 0.1.73 - Rustfmt 1.6.0 ### Browsers and Drivers -- Google Chrome 117.0.5938.132 -- Chrome Driver 117.0.5938.92 -- Microsoft Edge 117.0.2045.47 -- Microsoft Edge Driver 117.0.2045.47 -- Mozilla Firefox 118.0.1 +- Google Chrome 118.0.5993.71 +- Chrome Driver 118.0.5993.70 +- Microsoft Edge 118.0.2088.46 +- Microsoft Edge Driver 118.0.2088.46 +- Mozilla Firefox 118.0.2 - Gecko Driver 0.33.0 -- IE Driver 4.11.0.0 -- Selenium server 4.13.0 +- IE Driver 4.14.0.0 +- Selenium server 4.14.0 #### Environment variables | Name | Value | @@ -138,6 +137,7 @@ | 8.0.382+5 (default) | JAVA_HOME_8_X64 | | 11.0.20+101 | JAVA_HOME_11_X64 | | 17.0.8+101 | JAVA_HOME_17_X64 | +| 21.0.0+35.0.LTS | JAVA_HOME_21_X64 | ### Shells | Name | Target | @@ -160,21 +160,22 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Go - 1.19.13 -- 1.20.8 -- 1.21.1 +- 1.20.10 +- 1.21.3 #### Node.js - 14.21.3 - 16.20.2 -- 18.18.0 -- 20.8.0 +- 18.18.2 +- 20.8.1 #### Python - 3.7.9 - 3.8.10 - 3.9.13 - 3.10.11 -- 3.11.5 +- 3.11.6 +- 3.12.0 #### PyPy - 2.7.18 [PyPy 7.3.13] @@ -211,7 +212,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Azure CosmosDb Emulator 2.14.12.0 - DacFx 162.0.52.1 - MySQL 8.0.34.0 -- SQL OLEDB Driver 18.6.4.0 +- SQL OLEDB Driver 18.6.7.0 - SQLPS 1.0 ### Web Servers @@ -223,7 +224,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Visual Studio Enterprise 2022 | Name | Version | Path | | ----------------------------- | -------------- | -------------------------------------------------------- | -| Visual Studio Enterprise 2022 | 17.7.34031.279 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | +| Visual Studio Enterprise 2022 | 17.7.34202.233 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | #### Workloads, components and extensions | Package | Version | @@ -257,14 +258,14 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Component.WixToolset.VisualStudioExtension.Schemas3 | 1.0.0.22 | | Component.Xamarin | 17.7.33905.399 | | Component.Xamarin.RemotedSimulator | 17.7.33905.399 | -| ios | 16.4.7098.0 | -| maccatalyst | 16.4.7098.0 | -| maui.android | 7.0.92.0 | -| maui.blazor | 7.0.92.0 | -| maui.core | 7.0.92.0 | -| maui.ios | 7.0.92.0 | -| maui.maccatalyst | 7.0.92.0 | -| maui.windows | 7.0.92.0 | +| ios | 16.4.7107.0 | +| maccatalyst | 16.4.7107.0 | +| maui.android | 7.0.96.0 | +| maui.blazor | 7.0.96.0 | +| maui.core | 7.0.96.0 | +| maui.ios | 7.0.96.0 | +| maui.maccatalyst | 7.0.96.0 | +| maui.windows | 7.0.96.0 | | Microsoft.Component.Azure.DataLake.Tools | 17.7.33905.399 | | Microsoft.Component.ClickOnce | 17.7.33905.399 | | Microsoft.Component.CodeAnalysis.SDK | 17.7.33905.399 | @@ -288,21 +289,21 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.Net.ComponentGroup.4.8.DeveloperTools | 17.7.33905.399 | | Microsoft.Net.ComponentGroup.DevelopmentPrerequisites | 17.7.33905.399 | | Microsoft.Net.ComponentGroup.TargetingPacks.Common | 17.7.33905.399 | -| microsoft.net.runtime.android | 7.0.1123.42427 | -| microsoft.net.runtime.android.aot | 7.0.1123.42427 | -| microsoft.net.runtime.android.aot.net6 | 7.0.1123.42427 | -| microsoft.net.runtime.android.net6 | 7.0.1123.42427 | -| microsoft.net.runtime.ios | 7.0.1123.42427 | -| microsoft.net.runtime.ios.net6 | 7.0.1123.42427 | -| microsoft.net.runtime.maccatalyst | 7.0.1123.42427 | -| microsoft.net.runtime.maccatalyst.net6 | 7.0.1123.42427 | -| microsoft.net.runtime.mono.tooling | 7.0.1123.42427 | -| microsoft.net.runtime.mono.tooling.net6 | 7.0.1123.42427 | -| microsoft.net.sdk.emscripten.net7 | 7.0.8.42402 | +| microsoft.net.runtime.android | 7.0.1223.47720 | +| microsoft.net.runtime.android.aot | 7.0.1223.47720 | +| microsoft.net.runtime.android.aot.net6 | 7.0.1223.47720 | +| microsoft.net.runtime.android.net6 | 7.0.1223.47720 | +| microsoft.net.runtime.ios | 7.0.1223.47720 | +| microsoft.net.runtime.ios.net6 | 7.0.1223.47720 | +| microsoft.net.runtime.maccatalyst | 7.0.1223.47720 | +| microsoft.net.runtime.maccatalyst.net6 | 7.0.1223.47720 | +| microsoft.net.runtime.mono.tooling | 7.0.1223.47720 | +| microsoft.net.runtime.mono.tooling.net6 | 7.0.1223.47720 | +| microsoft.net.sdk.emscripten.net7 | 7.0.8.43102 | | Microsoft.NetCore.Component.DevelopmentTools | 17.7.33905.399 | -| Microsoft.NetCore.Component.Runtime.6.0 | 17.7.34031.279 | -| Microsoft.NetCore.Component.Runtime.7.0 | 17.7.34031.279 | -| Microsoft.NetCore.Component.SDK | 17.7.34031.279 | +| Microsoft.NetCore.Component.Runtime.6.0 | 17.7.34202.233 | +| Microsoft.NetCore.Component.Runtime.7.0 | 17.7.34202.233 | +| Microsoft.NetCore.Component.SDK | 17.7.34202.233 | | Microsoft.NetCore.Component.Web | 17.7.33905.399 | | Microsoft.VisualStudio.Component.AppInsights.Tools | 17.7.33905.399 | | Microsoft.VisualStudio.Component.AspNet | 17.7.33905.399 | @@ -520,11 +521,11 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Workload.Python | 17.7.33905.399 | | Microsoft.VisualStudio.Workload.Universal | 17.7.33905.399 | | Microsoft.VisualStudio.Workload.VisualStudioExtension | 17.7.33905.399 | -| runtimes.ios | 7.0.1123.42427 | -| runtimes.ios.net6 | 7.0.1123.42427 | -| runtimes.maccatalyst | 7.0.1123.42427 | -| runtimes.maccatalyst.net6 | 7.0.1123.42427 | -| wasm.tools | 7.0.1123.42427 | +| runtimes.ios | 7.0.1223.47720 | +| runtimes.ios.net6 | 7.0.1223.47720 | +| runtimes.maccatalyst | 7.0.1223.47720 | +| runtimes.maccatalyst.net6 | 7.0.1223.47720 | +| wasm.tools | 7.0.1223.47720 | | ProBITools.MicrosoftAnalysisServicesModelingProjects2022 | 3.0.4 | | ProBITools.MicrosoftReportProjectsforVisualStudio2022 | 3.0.1 | | SSIS.MicrosoftDataToolsIntegrationServices | 1.2 | @@ -554,15 +555,15 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 10.0.22621.0 ### .NET Core Tools -- .NET Core SDK: 6.0.122, 6.0.203, 6.0.317, 6.0.414, 7.0.401 +- .NET Core SDK: 6.0.123, 6.0.203, 6.0.318, 6.0.415, 7.0.402 - .NET Framework: 4.8, 4.8.1 -- Microsoft.AspNetCore.App: 6.0.5, 6.0.22, 7.0.11 -- Microsoft.NETCore.App: 6.0.5, 6.0.22, 7.0.11 -- Microsoft.WindowsDesktop.App: 6.0.5, 6.0.22, 7.0.11 +- Microsoft.AspNetCore.App: 6.0.5, 6.0.23, 7.0.12 +- Microsoft.NETCore.App: 6.0.5, 6.0.23, 7.0.12 +- Microsoft.WindowsDesktop.App: 6.0.5, 6.0.23, 7.0.12 - nbgv 3.6.133+2d32d93cb1 ### PowerShell Tools -- PowerShell 7.2.14 +- PowerShell 7.2.15 #### Powershell Modules - Az: 9.3.0 @@ -571,7 +572,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Az (Cached): 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.424 +- AWSPowershell: 4.1.430 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 - Microsoft.Graph: 2.6.1 @@ -594,12 +595,12 @@ All other versions are saved but not installed. | Android Emulator | 31.2.9 | | Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | | Android SDK Platforms | android-34 (rev 2)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | -| Android SDK Platform-Tools | 34.0.4 | +| Android SDK Platform-Tools | 34.0.5 | | Android Support Repository | 47.0.0 | | CMake | 3.18.1<br>3.22.1 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 23.2.8568313<br>24.0.8215888<br>25.2.9519653<br>26.0.10792818 | +| NDK | 23.2.8568313<br>24.0.8215888<br>25.2.9519653<br>26.1.10909125 | | SDK Patch Applier v4 | 1 | #### Environment variables @@ -608,16 +609,16 @@ All other versions are saved but not installed. | ANDROID_HOME | C:\Android\android-sdk | | ANDROID_NDK | C:\Android\android-sdk\ndk\25.2.9519653 | | ANDROID_NDK_HOME | C:\Android\android-sdk\ndk\25.2.9519653 | -| ANDROID_NDK_LATEST_HOME | C:\Android\android-sdk\ndk\26.0.10792818 | +| ANDROID_NDK_LATEST_HOME | C:\Android\android-sdk\ndk\26.1.10909125 | | ANDROID_NDK_ROOT | C:\Android\android-sdk\ndk\25.2.9519653 | | ANDROID_SDK_ROOT | C:\Android\android-sdk | ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2022 | sha256:5aa61257ffbd2dbc534f2591d70dbc56fad6e8ca363d48f5aa4f2c2b2ab64821 | 2023-09-12 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2022 | sha256:49bb37677c8d61281f15a49d3291baff4f5583e6cf5846fc4cee7527e59ff1c5 | 2023-09-12 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:1477b5cc53a36a8a5e8b865a5e11a32e836ba6061c120e4e5b0a1eea1fdf6c98 | 2023-09-12 | -| mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:6562c9a2580260e4f2e3a081cc2cf1d960899cbce7c4568fb851e4848ca50e07 | 2023-09-01 | -| mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:d227d7ab11f4aa0da7779adc31616924cf0b15846a10313d83a644541208f80b | 2023-09-01 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2022 | sha256:019daa2ef10618362e2c8cb79408b048d604813aaf39f5c3e248b4c1132e92fd | 2023-10-10 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2022 | sha256:8786c438d878b03be3abd125665d51ff9bb9c6429ea0802978f07b60dd910745 | 2023-10-10 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:180b44ab71dfd238ab4428baf047fee08663de4c317de0bce0887f12e4c7734c | 2023-10-10 | +| mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:0e6791612f9448aa2e6713d95ffabdefa26122b58a0b341aace6b5a2d65aee8c | 2023-10-06 | +| mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:40525c24f8e0a1cd4feca7330cf0bcdf125c0f7f2158852f4701dbe7ded2dd7f | 2023-10-06 | From 6449d50ffd7132cf45e819f21029cd2b749598d2 Mon Sep 17 00:00:00 2001 From: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com> Date: Thu, 19 Oct 2023 09:38:19 +0200 Subject: [PATCH 2353/3485] [macos] add retries to yarn install script (#8593) --- images/macos/provision/core/node.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/images/macos/provision/core/node.sh b/images/macos/provision/core/node.sh index 9e858503a202..db012971e7cb 100644 --- a/images/macos/provision/core/node.sh +++ b/images/macos/provision/core/node.sh @@ -8,7 +8,8 @@ brew_smart_install "node@$defaultVersion" brew link node@$defaultVersion --force --overwrite echo Installing yarn... -curl -fsSL https://yarnpkg.com/install.sh | bash +download_with_retries "https://yarnpkg.com/install.sh" "/tmp" "yarn-install.sh" +bash /tmp/yarn-install.sh if ! is_Ventura || ! is_VenturaArm64; then npm_global_packages=$(get_toolset_value '.npm.global_packages[].name') From 3e7beab7fa567eed17b3602951a75b0718823fdb Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Thu, 19 Oct 2023 11:38:41 +0200 Subject: [PATCH 2354/3485] [Windows] Fix Java 21 location (#8585) --- images/win/scripts/Installers/Install-JavaTools.ps1 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/images/win/scripts/Installers/Install-JavaTools.ps1 b/images/win/scripts/Installers/Install-JavaTools.ps1 index 7670b4c3a3f6..d56d503584c8 100644 --- a/images/win/scripts/Installers/Install-JavaTools.ps1 +++ b/images/win/scripts/Installers/Install-JavaTools.ps1 @@ -73,6 +73,8 @@ function Install-JavaJDK { # We have to replace '+' sign in the version to '-' due to the issue with incorrect path in Android builds https://github.com/actions/runner-images/issues/3014 $fullJavaVersion = $asset.version.semver -replace '\+', '-' + # Remove 'LTS' suffix from the version if present + $fullJavaVersion = $fullJavaVersion -replace '\.LTS$', '' # Create directories in toolcache path $javaToolcachePath = Join-Path -Path $env:AGENT_TOOLSDIRECTORY -ChildPath "Java_Temurin-Hotspot_jdk" $javaVersionPath = Join-Path -Path $javaToolcachePath -ChildPath $fullJavaVersion From 10d8554b86499973e42ca229166ce6e1970995a8 Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Thu, 19 Oct 2023 11:49:01 +0200 Subject: [PATCH 2355/3485] [Mac OS] Fix Edge Updater configuration steps (#8569) --- images/macos/provision/core/edge.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/images/macos/provision/core/edge.sh b/images/macos/provision/core/edge.sh index 25ff3ffb421c..32aa34416990 100644 --- a/images/macos/provision/core/edge.sh +++ b/images/macos/provision/core/edge.sh @@ -38,9 +38,9 @@ popd > /dev/null # Configure Edge Updater to prevent auto update # https://learn.microsoft.com/en-us/deployedge/edge-learnmore-edgeupdater-for-macos -mkdir "Library/Managed Preferences" +sudo mkdir "/Library/Managed Preferences" -cat <<EOF > "Library/Managed Preferences/com.microsoft.EdgeUpdater.plist" +cat <<EOF | sudo tee "/Library/Managed Preferences/com.microsoft.EdgeUpdater.plist" > /dev/null <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <plist version="1.0"> @@ -57,6 +57,6 @@ cat <<EOF > "Library/Managed Preferences/com.microsoft.EdgeUpdater.plist" </plist> EOF -chown root:wheel "/Library/Managed Preferences/com.microsoft.EdgeUpdater.plist" +sudo chown root:wheel "/Library/Managed Preferences/com.microsoft.EdgeUpdater.plist" invoke_tests "Browsers" "Edge" From 9a9a185b1a4306acb6dd3e8ba96d0286a302ccf5 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Thu, 19 Oct 2023 14:43:42 +0200 Subject: [PATCH 2356/3485] [macOS] add node to software report macOS 13 arm64 (#8603) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Alexey Ayupov <“alexey.ayupov@akvelon.com”> --- .../SoftwareReport.Generator.ps1 | 10 ++++----- .../SoftwareReport.Toolcache.psm1 | 22 ++++++++++++++----- 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1 index 160565588fde..4f19089a5cd2 100644 --- a/images/macos/software-report/SoftwareReport.Generator.ps1 +++ b/images/macos/software-report/SoftwareReport.Generator.ps1 @@ -44,9 +44,9 @@ if ((-not $os.IsVentura) -and (-not $os.IsVenturaArm64)) { $languageAndRuntime.AddToolVersion("Go", $(Get-GoVersion)) } $languageAndRuntime.AddToolVersion("Mono", $(Get-MonoVersion)) +$languageAndRuntime.AddToolVersion("Node.js", $(Get-NodeVersion)) if ((-not $os.IsVentura) -and (-not $os.IsVenturaArm64)) { $languageAndRuntime.AddToolVersion("MSBuild", $(Get-MSBuildVersion)) - $languageAndRuntime.AddToolVersion("Node.js", $(Get-NodeVersion)) $languageAndRuntime.AddToolVersion("NVM", $(Get-NVMVersion)) $languageAndRuntime.AddToolVersionsListInline("NVM - Cached node versions", $(Get-NVMNodeVersionList), '^\d+') } @@ -211,11 +211,9 @@ $browsers.AddNode($(Build-BrowserWebdriversEnvironmentTable)) $java = $installedSoftware.AddHeader("Java") $java.AddTable($(Get-JavaVersions)) -if (-not $os.IsVenturaArm64) { - # Toolcache - $toolcache = $installedSoftware.AddHeader("Cached Tools") - $toolcache.AddNodes($(Build-ToolcacheSection)) -} +# Toolcache +$toolcache = $installedSoftware.AddHeader("Cached Tools") +$toolcache.AddNodes($(Build-ToolcacheSection)) # Rust $rust = $installedSoftware.AddHeader("Rust Tools") diff --git a/images/macos/software-report/SoftwareReport.Toolcache.psm1 b/images/macos/software-report/SoftwareReport.Toolcache.psm1 index a7296b203e2f..0878024cbf4d 100644 --- a/images/macos/software-report/SoftwareReport.Toolcache.psm1 +++ b/images/macos/software-report/SoftwareReport.Toolcache.psm1 @@ -33,14 +33,24 @@ function Get-ToolcacheGoVersions { return Get-ChildItem $toolcachePath -Name | Sort-Object { [Version]$_ } } -function Build-ToolcacheSection { - return @( - [ToolVersionsListNode]::new("Ruby", $(Get-ToolcacheRubyVersions), '^\d+\.\d+', "List"), - [ToolVersionsListNode]::new("Python", $(Get-ToolcachePythonVersions), '^\d+\.\d+', "List"), - [ToolVersionsListNode]::new("PyPy", $(Get-ToolcachePyPyVersions), '^\d+\.\d+', "List"), +function Build-ToolcacheSection { + + $nodes = @() + + if (-not $os.IsVenturaArm64) { + $nodes += @( + [ToolVersionsListNode]::new("Ruby", $(Get-ToolcacheRubyVersions), '^\d+\.\d+', "List"), + [ToolVersionsListNode]::new("PyPy", $(Get-ToolcachePyPyVersions), '^\d+\.\d+', "List") + ) + } + + $nodes += @( + [ToolVersionsListNode]::new("Python", $(Get-ToolcachePythonVersions), '^\d+\.\d+', "List"), [ToolVersionsListNode]::new("Node.js", $(Get-ToolcacheNodeVersions), '^\d+', "List"), [ToolVersionsListNode]::new("Go", $(Get-ToolcacheGoVersions), '^\d+\.\d+', "List") ) + + return $nodes } function Get-PowerShellModules { @@ -50,4 +60,4 @@ function Get-PowerShellModules { $moduleVersions = Get-Module -Name $moduleName -ListAvailable | Select-Object -ExpandProperty Version | Sort-Object -Unique return [ToolVersionsListNode]::new($moduleName, $moduleVersions, '^\d+', "Inline") } -} \ No newline at end of file +} From b06da59aba5150536f1d0df8b0670845e3f9713d Mon Sep 17 00:00:00 2001 From: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com> Date: Thu, 19 Oct 2023 15:47:41 +0200 Subject: [PATCH 2357/3485] [macos] add reties to CodeQL download step (#8582) Co-authored-by: Henry Mercer <henry.mercer@me.com> --- images/macos/provision/core/codeql-bundle.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/macos/provision/core/codeql-bundle.sh b/images/macos/provision/core/codeql-bundle.sh index 032c18b2dbcb..12044bdd8cbb 100644 --- a/images/macos/provision/core/codeql-bundle.sh +++ b/images/macos/provision/core/codeql-bundle.sh @@ -2,8 +2,8 @@ source ~/utils/utils.sh # Retrieve the CLI version of the latest CodeQL bundle. -base_url="$(curl -fsSL https://raw.githubusercontent.com/github/codeql-action/v2/src/defaults.json)" -bundle_version="$(echo "$base_url" | jq -r '.cliVersion')" +download_with_retries https://raw.githubusercontent.com/github/codeql-action/v2/src/defaults.json "/tmp" "codeql-defaults.json" +bundle_version="$(jq -r '.cliVersion' /tmp/codeql-defaults.json)" bundle_tag_name="codeql-bundle-v$bundle_version" echo "Downloading CodeQL bundle $bundle_version..." From 4ea41b2f200a26a348e3d2c8fffd4b5390496b22 Mon Sep 17 00:00:00 2001 From: sergei-pyshnoi <121864472+sergei-pyshnoi@users.noreply.github.com> Date: Thu, 19 Oct 2023 17:57:16 +0200 Subject: [PATCH 2358/3485] add filter for upcoming version in mongodb parser (#8589) --- images/win/scripts/Installers/Install-MongoDB.ps1 | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/images/win/scripts/Installers/Install-MongoDB.ps1 b/images/win/scripts/Installers/Install-MongoDB.ps1 index 0387aa26d5d4..82b1a36d4f6f 100644 --- a/images/win/scripts/Installers/Install-MongoDB.ps1 +++ b/images/win/scripts/Installers/Install-MongoDB.ps1 @@ -6,14 +6,16 @@ # Install mongodb package $toolsetVersion = (Get-ToolsetContent).mongodb.version -$getMongoReleases = Invoke-WebRequest -Uri "https://www.mongodb.com/docs/v$toolsetVersion/release-notes/$toolsetVersion-changelog/" -UseBasicParsing -$TargetReleases = $getMongoReleases.Links.href | Where-Object {$_ -like "#$toolsetVersion*-changelog"} +$getMongoReleases = Invoke-WebRequest -Uri "mongodb.com/docs/manual/release-notes/$toolsetVersion/" -UseBasicParsing +$TargetReleases = $getMongoReleases.Links.href | Where-Object {$_ -like "#$toolsetVersion*---*"} $MinorVersions = @() foreach ($release in $TargetReleases) { - $pattern = '\d+\.\d+\.\d+' - $version = $release | Select-String -Pattern $pattern -AllMatches | ForEach-Object { $_.Matches } | ForEach-Object { $_.Value } - $MinorVersions += $version + if ($release -notlike "*upcoming*") { + $pattern = '\d+\.\d+\.\d+' + $version = $release | Select-String -Pattern $pattern -AllMatches | ForEach-Object { $_.Matches } | ForEach-Object { $_.Value } + $MinorVersions += $version + } } $LatestVersion = $MinorVersions[0] @@ -39,4 +41,4 @@ $svc.WaitForStatus('Running','00:01:00') Stop-Service -Name $mongodbService Set-Service $mongodbService -StartupType Disabled -Invoke-PesterTests -TestFile "Databases" -TestName "MongoDB" \ No newline at end of file +Invoke-PesterTests -TestFile "Databases" -TestName "MongoDB" From a1ef070e659b0f30d1ec24ec1a0afc22954d7bd8 Mon Sep 17 00:00:00 2001 From: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com> Date: Fri, 20 Oct 2023 08:50:04 +0200 Subject: [PATCH 2359/3485] [macos] add retries to edge install script (#8592) --- images/macos/provision/core/edge.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/images/macos/provision/core/edge.sh b/images/macos/provision/core/edge.sh index 32aa34416990..122add096eea 100644 --- a/images/macos/provision/core/edge.sh +++ b/images/macos/provision/core/edge.sh @@ -13,7 +13,8 @@ echo "Version of Microsoft Edge: ${EDGE_VERSION}" echo "Installing Microsoft Edge WebDriver..." EDGE_DRIVER_VERSION_URL="https://msedgedriver.azureedge.net/LATEST_RELEASE_${EDGE_VERSION_MAJOR}_MACOS" -EDGE_DRIVER_LATEST_VERSION=$(curl -fsSL "$EDGE_DRIVER_VERSION_URL" | iconv -f utf-16 -t utf-8 | tr -d '\r') +download_with_retries "$EDGE_DRIVER_VERSION_URL" "/tmp" "edge-version" +EDGE_DRIVER_LATEST_VERSION=$(cat /tmp/edge-version | iconv -f utf-16 -t utf-8 | tr -d '\r') EDGE_DRIVER_URL="https://msedgedriver.azureedge.net/${EDGE_DRIVER_LATEST_VERSION}/edgedriver_mac64.zip" echo "Compatible version of WebDriver: ${EDGE_DRIVER_LATEST_VERSION}" From 8c66e96beaf15a528d9db11a9762332cc9210cdf Mon Sep 17 00:00:00 2001 From: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com> Date: Fri, 20 Oct 2023 08:50:55 +0200 Subject: [PATCH 2360/3485] [macos] use brew_smart_install where appropriate (#8607) --- images/macos/provision/core/apache.sh | 4 +++- images/macos/provision/core/aws.sh | 2 +- images/macos/provision/core/azcopy.sh | 2 +- images/macos/provision/core/bicep.sh | 4 +++- images/macos/provision/core/homebrew.sh | 4 ++-- images/macos/provision/core/nginx.sh | 4 +++- 6 files changed, 13 insertions(+), 7 deletions(-) diff --git a/images/macos/provision/core/apache.sh b/images/macos/provision/core/apache.sh index 08639cba319d..8fa375f99c7f 100644 --- a/images/macos/provision/core/apache.sh +++ b/images/macos/provision/core/apache.sh @@ -1,6 +1,8 @@ #!/bin/bash -e -o pipefail -brew install httpd +source ~/utils/utils.sh + +brew_smart_install httpd sudo sed -Ei '' 's/Listen .*/Listen 80/' $(brew --prefix)/etc/httpd/httpd.conf invoke_tests "WebServers" "Apache" diff --git a/images/macos/provision/core/aws.sh b/images/macos/provision/core/aws.sh index 8c05a16cde29..8b93dae50974 100644 --- a/images/macos/provision/core/aws.sh +++ b/images/macos/provision/core/aws.sh @@ -8,7 +8,7 @@ sudo installer -pkg /tmp/AWSCLIV2.pkg -target / echo Installing aws sam cli... brew tap aws/tap -brew install aws-sam-cli +brew_smart_install aws-sam-cli echo "Install aws cli session manager" brew install --cask session-manager-plugin diff --git a/images/macos/provision/core/azcopy.sh b/images/macos/provision/core/azcopy.sh index cc188c73f1dc..5d540a7d03c8 100755 --- a/images/macos/provision/core/azcopy.sh +++ b/images/macos/provision/core/azcopy.sh @@ -4,7 +4,7 @@ arch=$(get_arch) # Check MacOS architecture and if ARM install using brew if [ $arch == "arm64" ]; then - brew install azcopy + brew_smart_install azcopy else AZCOPY_DOWNLOAD_URL="https://aka.ms/downloadazcopy-v10-mac" diff --git a/images/macos/provision/core/bicep.sh b/images/macos/provision/core/bicep.sh index a2e7b5849331..87ca8ee9ea17 100644 --- a/images/macos/provision/core/bicep.sh +++ b/images/macos/provision/core/bicep.sh @@ -1,7 +1,9 @@ #!/bin/bash -e -o pipefail +source ~/utils/utils.sh + echo Installing bicep cli... brew tap azure/bicep -brew install bicep +brew_smart_install bicep invoke_tests "Common" "Bicep" diff --git a/images/macos/provision/core/homebrew.sh b/images/macos/provision/core/homebrew.sh index 4e5b63795d29..e68db37bd37d 100755 --- a/images/macos/provision/core/homebrew.sh +++ b/images/macos/provision/core/homebrew.sh @@ -27,10 +27,10 @@ brew analytics off # jq is required for further installation scripts echo "Installing jq..." -brew install jq +brew_smart_install jq echo "Installing curl..." -brew install curl +brew_smart_install curl echo "Installing wget..." brew_smart_install "wget" diff --git a/images/macos/provision/core/nginx.sh b/images/macos/provision/core/nginx.sh index 616c19eed617..f9c1e4c7f808 100644 --- a/images/macos/provision/core/nginx.sh +++ b/images/macos/provision/core/nginx.sh @@ -1,6 +1,8 @@ #!/bin/bash -e -o pipefail -brew install nginx +source ~/utils/utils.sh + +brew_smart_install nginx sudo sed -Ei '' 's/listen.*/listen 80;/' $(brew --prefix)/etc/nginx/nginx.conf invoke_tests "WebServers" "Nginx" From 16f681595d9412e61dbbb5fc8a3f2409a07775af Mon Sep 17 00:00:00 2001 From: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com> Date: Fri, 20 Oct 2023 09:36:17 +0200 Subject: [PATCH 2361/3485] [windows] disable WindowsUpdate service (#8605) --- images/win/scripts/Installers/Finalize-VM.ps1 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/images/win/scripts/Installers/Finalize-VM.ps1 b/images/win/scripts/Installers/Finalize-VM.ps1 index 70b740138b5f..398b59c822e0 100644 --- a/images/win/scripts/Installers/Finalize-VM.ps1 +++ b/images/win/scripts/Installers/Finalize-VM.ps1 @@ -89,6 +89,9 @@ $regUserServicesToDisables | ForEach-Object { } | Out-Null +Write-Host 'Disable Windows Update Service' +Set-ItemProperty -Path HKLM:\System\CurrentControlSet\Services\wuauserv -Name Start -Value 4 -Force + # Disabled services $servicesToDisable = @( 'wuauserv' @@ -102,6 +105,7 @@ $servicesToDisable = @( ) $servicesToDisable | ForEach-Object { + Stop-Service -Name $_ Set-Service -Name $_ -StartupType Disabled -ErrorAction Ignore } | Out-Null From 34fa3471f8a79446c988b320e955e63edc422b10 Mon Sep 17 00:00:00 2001 From: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com> Date: Fri, 20 Oct 2023 11:22:53 +0200 Subject: [PATCH 2362/3485] [macos] introduce more flexible way of managind xcode runtimes (#8572) --- images/macos/provision/core/xcode.ps1 | 2 +- images/macos/toolsets/toolset-12.json | 6 +++--- images/macos/toolsets/toolset-13.json | 20 ++++++++++---------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/images/macos/provision/core/xcode.ps1 b/images/macos/provision/core/xcode.ps1 index 9dbc09d221b2..9f6c07c72d91 100644 --- a/images/macos/provision/core/xcode.ps1 +++ b/images/macos/provision/core/xcode.ps1 @@ -29,7 +29,7 @@ $xcodeVersions | ForEach-Object { Write-Host "Configuring Xcode $($_.link) ..." Invoke-XcodeRunFirstLaunch -Version $_.link - if ($_.link.Split(".")[0] -ge 14) { + if ($_.install_runtimes -eq 'true') { # Additional simulator runtimes are included by default for Xcode < 14 Install-AdditionalSimulatorRuntimes -Version $_.link } diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index 688be72ff040..8d36240c3504 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -3,9 +3,9 @@ "default": "14.2", "x64": { "versions": [ - { "link": "14.2", "version": "14.2.0+14C18" }, - { "link": "14.1", "version": "14.1.0+14B47b" }, - { "link": "14.0.1", "version": "14.0.1+14A400", "symlinks": ["14.0"] }, + { "link": "14.2", "version": "14.2.0+14C18", "install_runtimes": "true" }, + { "link": "14.1", "version": "14.1.0+14B47b", "install_runtimes": "true" }, + { "link": "14.0.1", "version": "14.0.1+14A400", "symlinks": ["14.0"], "install_runtimes": "true" }, { "link": "13.4.1", "version": "13.4.1+13F100", "symlinks": ["13.4"] }, { "link": "13.3.1", "version": "13.3.1+13E500a", "symlinks": ["13.3"] }, { "link": "13.2.1", "version": "13.2.1+13C100", "symlinks": ["13.2"] }, diff --git a/images/macos/toolsets/toolset-13.json b/images/macos/toolsets/toolset-13.json index 91323add8951..8d8f73b6018f 100644 --- a/images/macos/toolsets/toolset-13.json +++ b/images/macos/toolsets/toolset-13.json @@ -3,20 +3,20 @@ "default": "14.3.1", "x64": { "versions": [ - { "link": "15.0.1", "version": "15.0.1-Release.Candidate+15A507"}, - { "link": "15.0", "version": "15.0.0+15A240d"}, - { "link": "14.3.1", "version": "14.3.1+14E300c","symlinks": ["14.3"] }, - { "link": "14.2", "version": "14.2.0+14C18" }, - { "link": "14.1", "version": "14.1.0+14B47b" } + { "link": "15.0.1", "version": "15.0.1-Release.Candidate+15A507", "install_runtimes": "true"}, + { "link": "15.0", "version": "15.0.0+15A240d", "install_runtimes": "true"}, + { "link": "14.3.1", "version": "14.3.1+14E300c","symlinks": ["14.3"], "install_runtimes": "true" }, + { "link": "14.2", "version": "14.2.0+14C18", "install_runtimes": "true" }, + { "link": "14.1", "version": "14.1.0+14B47b", "install_runtimes": "true" } ] }, "arm64":{ "versions": [ - { "link": "15.0.1", "version": "15.0.1-Release.Candidate+15A507"}, - { "link": "15.0", "version": "15.0.0+15A240d"}, - { "link": "14.3.1", "version": "14.3.1+14E300c","symlinks": ["14.3"] }, - { "link": "14.2", "version": "14.2.0+14C18" }, - { "link": "14.1", "version": "14.1.0+14B47b" } + { "link": "15.0.1", "version": "15.0.1-Release.Candidate+15A507", "install_runtimes": "true"}, + { "link": "15.0", "version": "15.0.0+15A240d", "install_runtimes": "true"}, + { "link": "14.3.1", "version": "14.3.1+14E300c","symlinks": ["14.3"], "install_runtimes": "true" }, + { "link": "14.2", "version": "14.2.0+14C18", "install_runtimes": "true" }, + { "link": "14.1", "version": "14.1.0+14B47b", "install_runtimes": "true" } ] } }, From 5780fe814306d214f81fe6b23b4425d022ba9c8e Mon Sep 17 00:00:00 2001 From: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com> Date: Fri, 20 Oct 2023 11:23:41 +0200 Subject: [PATCH 2363/3485] [macos] enable android cmdtools on macos-13 arm64 (#8587) --- images/macos/toolsets/toolset-13.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/images/macos/toolsets/toolset-13.json b/images/macos/toolsets/toolset-13.json index 8d8f73b6018f..d8ddacc34b55 100644 --- a/images/macos/toolsets/toolset-13.json +++ b/images/macos/toolsets/toolset-13.json @@ -31,21 +31,21 @@ } }, "android": { - "cmdline-tools": "commandlinetools-mac-9123335_latest.zip", - "platform_min_version": "27", - "build_tools_min_version": "27.0.0", + "cmdline-tools": "commandlinetools-mac-10406996_latest.zip", + "sdk-tools": "sdk-tools-darwin-4333796.zip", + "platform_min_version": "33", + "build_tools_min_version": "33.0.2", "extra-list": [ "android;m2repository", "google;m2repository", "google;google_play_services" ], "addon-list": [], "additional-tools": [ - "cmake;3.18.1", "cmake;3.22.1" ], "ndk": { - "default": "25", + "default": "26", "versions": [ - "23", "24", "25", "26" + "24", "25", "26" ] } }, From 09416daff2507de69768283b1565d009e4bf4dfd Mon Sep 17 00:00:00 2001 From: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com> Date: Fri, 20 Oct 2023 15:56:54 +0200 Subject: [PATCH 2364/3485] [macos] add retries to "brew install" (#8608) --- images/macos/provision/utils/utils.sh | 32 +++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/images/macos/provision/utils/utils.sh b/images/macos/provision/utils/utils.sh index eb8dd76d1a32..023701f2ce0b 100755 --- a/images/macos/provision/utils/utils.sh +++ b/images/macos/provision/utils/utils.sh @@ -173,6 +173,38 @@ brew_smart_install() { brew install --build-from-source $tool_name else echo "Downloading $tool_name..." + + # get deps & cache em + + failed=true + for i in {1..10}; do + brew deps $tool_name > /tmp/$tool_name && failed=false || sleep 60 + if [ "$failed" = false ]; then + break + fi + done + + if [ "$failed" = true ]; then + echo "Failed: brew deps $tool_name" + exit 1; + fi + + for dep in $(cat /tmp/$tool_name); do + + failed=true + for i in {1..10}; do + brew --cache $dep && failed=false || sleep 60 + if [ "$failed" = false ]; then + break + fi + done + + if [ "$failed" = true ]; then + echo "Failed: brew --cache $dep" + exit 1; + fi + done + brew install $tool_name fi } From 62cd627ce7376e09c7654b38427092aec34ebedd Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Fri, 20 Oct 2023 22:17:58 +0200 Subject: [PATCH 2365/3485] [Windows] Rollback and pin Strawberry Perl (#8622) --- images/win/toolsets/toolset-2019.json | 5 ++++- images/win/toolsets/toolset-2022.json | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index 5042e92e2bfe..6bc9a89afe6a 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -441,7 +441,10 @@ { "name": "jq" }, { "name": "NuGet.CommandLine" }, { "name": "packer" }, - { "name": "strawberryperl" }, + { + "name": "strawberryperl" , + "args": [ "--version", "5.32.1.1" ] + }, { "name": "pulumi" }, { "name": "tortoisesvn" }, { "name": "swig" }, diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index b3a2718539d0..9421307905e5 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -381,7 +381,10 @@ { "name": "jq" }, { "name": "NuGet.CommandLine" }, { "name": "packer" }, - { "name": "strawberryperl" }, + { + "name": "strawberryperl" , + "args": [ "--version", "5.32.1.1" ] + }, { "name": "pulumi" }, { "name": "tortoisesvn" }, { "name": "swig" }, From 6a98903627388773fcaffe342f74e1aacd3c39f8 Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Sun, 22 Oct 2023 15:47:36 +0200 Subject: [PATCH 2366/3485] [Ubuntu] Add checksum validation for Aliyun CLI, CMake, Docker Compose v2 (#8612) * Add checksums for Aliyun, CMake, Docker Compose v2 * After review changes * Download Aliyun CLI from github release --- images/linux/scripts/helpers/install.sh | 36 +++++++++++++++++++ images/linux/scripts/installers/aliyun-cli.sh | 19 +++++++--- images/linux/scripts/installers/cmake.sh | 13 +++++-- images/linux/scripts/installers/docker.sh | 10 ++++-- 4 files changed, 68 insertions(+), 10 deletions(-) diff --git a/images/linux/scripts/helpers/install.sh b/images/linux/scripts/helpers/install.sh index b90d10073dbf..56356ebcdd44 100644 --- a/images/linux/scripts/helpers/install.sh +++ b/images/linux/scripts/helpers/install.sh @@ -152,6 +152,42 @@ get_github_package_hash() { echo "$result" } +get_hash_from_remote_file() { + local url=$1 + local keywords=("$2" "$3") + local delimiter=${4:-' '} + local word_number=${5:-1} + + if [[ -z "${keywords[0]}" || -z "$url" ]]; then + echo "File name and/or URL is not specified." + exit 1 + fi + + matching_line=$(curl -fsSL "$url" | tr -d '`') + for keyword in "${keywords[@]}"; do + matching_line=$(echo "$matching_line" | grep "$keyword") + done + + if [[ "$(echo "$matching_line" | wc -l)" -gt 1 ]]; then + echo "Multiple lines found including the words: ${keywords[*]}. Please use a more specific filter." + exit 1 + fi + + if [[ -z "$matching_line" ]]; then + echo "Keywords (${keywords[*]}) not found in the file with hashes." + exit 1 + fi + + result=$(echo "$matching_line" | cut -d "$delimiter" -f "$word_number" | tr -d -c '[:alnum:]') + if [[ ${#result} -ne 64 && ${#result} -ne 128 ]]; then + echo "Invalid result length. Expected 64 or 128 characters. Please check delimiter and/or word_number parameters." + echo "Result: $result" + exit 1 + fi + + echo "$result" +} + use_checksum_comparison() { local file_path=$1 local checksum=$2 diff --git a/images/linux/scripts/installers/aliyun-cli.sh b/images/linux/scripts/installers/aliyun-cli.sh index 756b86d39b2d..d5495085d99c 100644 --- a/images/linux/scripts/installers/aliyun-cli.sh +++ b/images/linux/scripts/installers/aliyun-cli.sh @@ -2,6 +2,7 @@ ################################################################################ ## File: aliyun-cli.sh ## Desc: Installs Alibaba Cloud CLI +## Supply chain security: Alibaba Cloud CLI - checksum validation ################################################################################ # Source the helpers for use with the script @@ -11,14 +12,22 @@ source $HELPER_SCRIPTS/install.sh # Install Alibaba Cloud CLI # Pin tool version on ubuntu20 due to issues with GLIBC_2.32 not available if isUbuntu20; then - toolsetVersion=$(get_toolset_value '.aliyunCli.version') - downloadUrl="https://github.com/aliyun/aliyun-cli/releases/download/v$toolsetVersion/aliyun-cli-linux-$toolsetVersion-amd64.tgz" + toolset_version=$(get_toolset_value '.aliyunCli.version') + download_url="https://github.com/aliyun/aliyun-cli/releases/download/v$toolset_version/aliyun-cli-linux-$toolset_version-amd64.tgz" + hash_url="https://github.com/aliyun/aliyun-cli/releases/download/v$toolset_version/SHASUMS256.txt" else - downloadUrl="https://aliyuncli.alicdn.com/aliyun-cli-linux-latest-amd64.tgz" + download_url=$(get_github_package_download_url "aliyun/aliyun-cli" "contains(\"aliyun-cli-linux\") and endswith(\"amd64.tgz\")") + hash_url="https://github.com/aliyun/aliyun-cli/releases/latest/download/SHASUMS256.txt" fi -download_with_retries $downloadUrl "/tmp" -tar xzf /tmp/aliyun-cli-linux-*-amd64.tgz +package_name="aliyun-cli-linux-amd64.tgz" +download_with_retries "$download_url" "/tmp" "$package_name" + +# Supply chain security - Alibaba Cloud CLI +external_hash=$(get_hash_from_remote_file "$hash_url" "aliyun-cli-linux" "amd64.tgz") +use_checksum_comparison "/tmp/$package_name" "$external_hash" + +tar xzf "/tmp/$package_name" mv aliyun /usr/local/bin invoke_tests "CLI.Tools" "Aliyun CLI" diff --git a/images/linux/scripts/installers/cmake.sh b/images/linux/scripts/installers/cmake.sh index 4bf5ca814aa5..588f9295b16d 100644 --- a/images/linux/scripts/installers/cmake.sh +++ b/images/linux/scripts/installers/cmake.sh @@ -2,6 +2,7 @@ ################################################################################ ## File: cmake.sh ## Desc: Installs CMake +## Supply chain security: CMake - checksum validation ################################################################################ # Source the helpers for use with the script @@ -12,9 +13,15 @@ echo "Checking to see if the installer script has already been run" if command -v cmake; then echo "cmake is already installed" else - downloadUrl=$(get_github_package_download_url "Kitware/CMake" "endswith(\"inux-x86_64.sh\")") - curl -fsSL ${downloadUrl} -o cmakeinstall.sh \ - && chmod +x cmakeinstall.sh \ + # Download script to install CMake + download_url=$(get_github_package_download_url "Kitware/CMake" "endswith(\"inux-x86_64.sh\")") + curl -fsSL "${download_url}" -o cmakeinstall.sh + # Supply chain security - CMake + hash_url=$(get_github_package_download_url "Kitware/CMake" "endswith(\"SHA-256.txt\")") + external_hash=$(get_hash_from_remote_file "$hash_url" "linux-x86_64.sh") + use_checksum_comparison "cmakeinstall.sh" "$external_hash" + # Install CMake and remove the install script + chmod +x cmakeinstall.sh \ && ./cmakeinstall.sh --prefix=/usr/local --exclude-subdir \ && rm cmakeinstall.sh fi diff --git a/images/linux/scripts/installers/docker.sh b/images/linux/scripts/installers/docker.sh index 00370d1504bb..4c8b2c154ebb 100644 --- a/images/linux/scripts/installers/docker.sh +++ b/images/linux/scripts/installers/docker.sh @@ -2,6 +2,7 @@ ################################################################################ ## File: docker.sh ## Desc: Installs docker onto the image +## Supply chain security: Docker Compose v2 - checksum validation ################################################################################ # Source the helpers for use with the script @@ -19,8 +20,13 @@ apt-get install --no-install-recommends docker-ce docker-ce-cli containerd.io do # Install docker compose v2 from releases URL=$(get_github_package_download_url "docker/compose" "contains(\"compose-linux-x86_64\")") -curl -fsSL $URL -o /usr/libexec/docker/cli-plugins/docker-compose -chmod +x /usr/libexec/docker/cli-plugins/docker-compose +curl -fsSL "${URL}" -o /tmp/docker-compose +# Supply chain security - CMake +hash_url=$(get_github_package_download_url "docker/compose" "contains(\"checksums.txt\")") +external_hash=$(get_hash_from_remote_file "$hash_url" "compose-linux-x86_64") +use_checksum_comparison "/tmp/docker-compose" "$external_hash" +install /tmp/docker-compose /usr/libexec/docker/cli-plugins/docker-compose + # docker from official repo introduced different GID generation: https://github.com/actions/runner-images/issues/8157 gid=$(cut -d ":" -f 3 /etc/group | grep "^1..$" | sort -n | tail -n 1 | awk '{ print $1+1 }') From 58ccf6762a0c00a29cd496ab892245a30566fff2 Mon Sep 17 00:00:00 2001 From: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com> Date: Mon, 23 Oct 2023 09:17:15 +0200 Subject: [PATCH 2367/3485] [macos] improve brew caching approach (#8630) --- images/macos/provision/core/homebrew.sh | 4 ++-- images/macos/provision/core/nvm.sh | 3 ++- images/macos/provision/utils/utils.sh | 24 +++++++++++++++--------- 3 files changed, 19 insertions(+), 12 deletions(-) diff --git a/images/macos/provision/core/homebrew.sh b/images/macos/provision/core/homebrew.sh index e68db37bd37d..dea00c931646 100755 --- a/images/macos/provision/core/homebrew.sh +++ b/images/macos/provision/core/homebrew.sh @@ -5,8 +5,8 @@ source ~/utils/utils.sh arch=$(get_arch) echo "Installing Homebrew..." -HOMEBREW_INSTALL_URL="https://raw.githubusercontent.com/Homebrew/install/master/install.sh" -/bin/bash -c "$(curl -fsSL ${HOMEBREW_INSTALL_URL})" +download_with_retries "https://raw.githubusercontent.com/Homebrew/install/master/install.sh" "/tmp" "homebrew-install.sh" +/bin/bash /tmp/homebrew-install.sh if [[ $arch == "arm64" ]]; then /opt/homebrew/bin/brew update diff --git a/images/macos/provision/core/nvm.sh b/images/macos/provision/core/nvm.sh index 7d30908bad28..7eaa2fcd1a0a 100755 --- a/images/macos/provision/core/nvm.sh +++ b/images/macos/provision/core/nvm.sh @@ -7,7 +7,8 @@ source ~/utils/utils.sh [ -n "$API_PAT" ] && authString=(-H "Authorization: token ${API_PAT}") VERSION=$(curl "${authString[@]}" -fsSL https://api.github.com/repos/nvm-sh/nvm/releases/latest | jq -r '.tag_name') -curl -fsSL https://raw.githubusercontent.com/nvm-sh/nvm/$VERSION/install.sh | bash +download_with_retries "https://raw.githubusercontent.com/nvm-sh/nvm/$VERSION/install.sh" "/tmp" "nvm-install.sh" +bash /tmp/nvm-install.sh if [ $? -eq 0 ]; then . ~/.bashrc diff --git a/images/macos/provision/utils/utils.sh b/images/macos/provision/utils/utils.sh index 023701f2ce0b..5cb86690e3a6 100755 --- a/images/macos/provision/utils/utils.sh +++ b/images/macos/provision/utils/utils.sh @@ -179,9 +179,7 @@ brew_smart_install() { failed=true for i in {1..10}; do brew deps $tool_name > /tmp/$tool_name && failed=false || sleep 60 - if [ "$failed" = false ]; then - break - fi + [ "$failed" = false ] && break done if [ "$failed" = true ]; then @@ -189,14 +187,12 @@ brew_smart_install() { exit 1; fi - for dep in $(cat /tmp/$tool_name); do + for dep in $(cat /tmp/$tool_name) $tool_name; do failed=true for i in {1..10}; do - brew --cache $dep && failed=false || sleep 60 - if [ "$failed" = false ]; then - break - fi + brew --cache $dep >/dev/null && failed=false || sleep 60 + [ "$failed" = false ] && break done if [ "$failed" = true ]; then @@ -205,7 +201,17 @@ brew_smart_install() { fi done - brew install $tool_name + failed=true + for i in {1..10}; do + brew install $tool_name >/dev/null && failed=false || sleep 60 + [ "$failed" = false ] && break + done + + if [ "$failed" = true ]; then + echo "Failed: brew install $tool_name" + exit 1; + fi + fi } From 254e66d02d44090b09327d1682949e7d204ffc2f Mon Sep 17 00:00:00 2001 From: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com> Date: Mon, 23 Oct 2023 10:05:30 +0200 Subject: [PATCH 2368/3485] unpin PyPy checksum (#8633) --- images/win/scripts/Installers/Install-PyPy.ps1 | 5 ----- 1 file changed, 5 deletions(-) diff --git a/images/win/scripts/Installers/Install-PyPy.ps1 b/images/win/scripts/Installers/Install-PyPy.ps1 index 8b570c195b84..4808b3b6aced 100644 --- a/images/win/scripts/Installers/Install-PyPy.ps1 +++ b/images/win/scripts/Installers/Install-PyPy.ps1 @@ -111,11 +111,6 @@ foreach($toolsetVersion in $toolsetVersions.versions) } } - #Temp patch for pypy3.9-v7.3.13-win64.zip checksum, delete me when pypy.org will be fixed - if ($filename -ilike "*pypy3.9-v7.3.13-win64*") { - $distributorFileHash = "09EA41154AD1DCD3E8378609A73196A6C108B17AA05EF3CBB240610744102803" - } - Use-ChecksumComparison -LocalFileHash $localFileHash -DistributorFileHash $distributorFileHash #endregion From 567d74923a1b56a0cac40c5f59a22b451c97eda5 Mon Sep 17 00:00:00 2001 From: sergei-pyshnoi <121864472+sergei-pyshnoi@users.noreply.github.com> Date: Mon, 23 Oct 2023 14:34:26 +0200 Subject: [PATCH 2369/3485] [Ubuntu] Fix kubernetes tools install (#8609) --- images/linux/scripts/installers/kubernetes-tools.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/images/linux/scripts/installers/kubernetes-tools.sh b/images/linux/scripts/installers/kubernetes-tools.sh index 79a8c2802c51..b79f05206abc 100644 --- a/images/linux/scripts/installers/kubernetes-tools.sh +++ b/images/linux/scripts/installers/kubernetes-tools.sh @@ -13,9 +13,11 @@ curl -fsSL -o /usr/local/bin/kind $URL chmod +x /usr/local/bin/kind ## Install kubectl -KUBECTL_VERSION=$(curl -fsSL "https://dl.k8s.io/release/stable.txt") -curl -fsSL -o /usr/local/bin/kubectl "https://dl.k8s.io/release/$KUBECTL_VERSION/bin/linux/amd64/kubectl" -chmod +x /usr/local/bin/kubectl +KUBECTL_MINOR_VERSION=$(curl -fsSL "https://dl.k8s.io/release/stable.txt" | cut -d'.' -f1,2 ) +curl -fsSL https://pkgs.k8s.io/core:/stable:/$KUBECTL_MINOR_VERSION/deb/Release.key | sudo gpg --dearmor -o /etc/apt/keyrings/kubernetes-apt-keyring.gpg +echo 'deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring.gpg] https://pkgs.k8s.io/core:/stable:/'$KUBECTL_MINOR_VERSION'/deb/ /' | sudo tee /etc/apt/sources.list.d/kubernetes.list +sudo apt-get update -y && sudo apt-get install -y kubectl +rm -f /etc/apt/sources.list.d/kubernetes.list # Install Helm curl -fsSL https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3 | bash From d818bf1a011a72b2a6ff2bfff11acc6d47b52a01 Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Mon, 23 Oct 2023 14:36:13 +0200 Subject: [PATCH 2370/3485] Add hash check for Kotlin, Minikube, AWS SAM CLI (#8596) --- images/linux/scripts/installers/aws.sh | 16 +++++++++++----- images/linux/scripts/installers/kotlin.sh | 14 ++++++++++---- .../linux/scripts/installers/kubernetes-tools.sh | 6 ++++++ 3 files changed, 27 insertions(+), 9 deletions(-) diff --git a/images/linux/scripts/installers/aws.sh b/images/linux/scripts/installers/aws.sh index 6bf8898f56d9..7cb8d67cb400 100644 --- a/images/linux/scripts/installers/aws.sh +++ b/images/linux/scripts/installers/aws.sh @@ -2,6 +2,7 @@ ################################################################################ ## File: aws.sh ## Desc: Installs the AWS CLI, Session Manager plugin for the AWS CLI, and AWS SAM CLI +## Supply chain security: AWS SAM CLI - checksum validation ################################################################################ # Source the helpers for use with the script @@ -15,11 +16,16 @@ unzip -qq /tmp/awscliv2.zip -d /tmp download_with_retries "https://s3.amazonaws.com/session-manager-downloads/plugin/latest/ubuntu_64bit/session-manager-plugin.deb" "/tmp" "session-manager-plugin.deb" apt install /tmp/session-manager-plugin.deb -# Download & install the latest aws sam cli release -zipName="aws-sam-cli-linux-x86_64.zip" -zipUrl="https://github.com/aws/aws-sam-cli/releases/latest/download/${zipName}" -download_with_retries $zipUrl "/tmp" $zipName -unzip /tmp/${zipName} -d /tmp +# Download the latest aws sam cli release +aws_sam_cli_zip_name="aws-sam-cli-linux-x86_64.zip" +download_with_retries "https://github.com/aws/aws-sam-cli/releases/latest/download/${aws_sam_cli_zip_name}" "/tmp" $aws_sam_cli_zip_name + +# Supply chain security - AWS SAM CLI +aws_sam_cli_hash=$(get_github_package_hash "aws" "aws-sam-cli" "${aws_sam_cli_zip_name}.. ") +use_checksum_comparison "/tmp/${aws_sam_cli_zip_name}" "$aws_sam_cli_hash" + +# Install the latest aws sam cli release +unzip /tmp/${aws_sam_cli_zip_name} -d /tmp /tmp/install invoke_tests "CLI.Tools" "AWS" diff --git a/images/linux/scripts/installers/kotlin.sh b/images/linux/scripts/installers/kotlin.sh index c7d0253f8ae2..59b3f8894de8 100644 --- a/images/linux/scripts/installers/kotlin.sh +++ b/images/linux/scripts/installers/kotlin.sh @@ -2,16 +2,22 @@ ################################################################################ ## File: kotlin.sh ## Desc: Installs Kotlin +## Supply chain security: Kotlin - checksum validation ################################################################################ source $HELPER_SCRIPTS/install.sh KOTLIN_ROOT="/usr/share" -downloadUrl=$(get_github_package_download_url "JetBrains/kotlin" "contains(\"kotlin-compiler\")") -download_with_retries "$downloadUrl" "/tmp" +kotlin_zip_name="kotlin-compiler.zip" +download_url=$(get_github_package_download_url "JetBrains/kotlin" "contains(\"kotlin-compiler\")") +download_with_retries "$download_url" "/tmp" "$kotlin_zip_name" -unzip -qq /tmp/kotlin-compiler*.zip -d $KOTLIN_ROOT +# Supply chain security - Kotlin +kotlin_hash=$(get_github_package_hash "JetBrains" "kotlin" "kotlin-compiler" "" "latest" "false" "|" 3) +use_checksum_comparison "/tmp/${kotlin_zip_name}" "$kotlin_hash" + +unzip -qq /tmp/${kotlin_zip_name} -d $KOTLIN_ROOT rm $KOTLIN_ROOT/kotlinc/bin/*.bat ln -sf $KOTLIN_ROOT/kotlinc/bin/* /usr/bin -invoke_tests "Tools" "Kotlin" \ No newline at end of file +invoke_tests "Tools" "Kotlin" diff --git a/images/linux/scripts/installers/kubernetes-tools.sh b/images/linux/scripts/installers/kubernetes-tools.sh index b79f05206abc..3858061a69a0 100644 --- a/images/linux/scripts/installers/kubernetes-tools.sh +++ b/images/linux/scripts/installers/kubernetes-tools.sh @@ -2,6 +2,7 @@ ################################################################################ ## File: kubernetes-tools.sh ## Desc: Installs kubectl, helm, kustomize +## Supply chain security: minikube - checksum validation ################################################################################ # Source the helpers for use with the script @@ -24,6 +25,11 @@ curl -fsSL https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3 # Install minikube curl -fsSL -O https://storage.googleapis.com/minikube/releases/latest/minikube-linux-amd64 + +# Supply chain security - minikube +minikube_hash=$(get_github_package_hash "kubernetes" "minikube" "linux-amd64" "" "latest" "false" ":" 2) +use_checksum_comparison "minikube-linux-amd64" "$minikube_hash" + sudo install minikube-linux-amd64 /usr/local/bin/minikube # Install kustomize From e4a68e6300ef8f0b1f47035564d0c3dae9f35952 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Mon, 23 Oct 2023 21:49:38 +0200 Subject: [PATCH 2371/3485] Revert "Remove Python 3.12 from the toolcache (#8510)" (#8638) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 929931f61727947eb60ba4ecae57fe82202728ed. Co-authored-by: Alexey Ayupov <“alexey.ayupov@akvelon.com”> --- images/linux/toolsets/toolset-2004.json | 3 ++- images/linux/toolsets/toolset-2204.json | 3 ++- images/macos/toolsets/toolset-11.json | 3 ++- images/macos/toolsets/toolset-12.json | 3 ++- images/macos/toolsets/toolset-13.json | 6 ++++-- images/win/toolsets/toolset-2019.json | 3 ++- images/win/toolsets/toolset-2022.json | 3 ++- 7 files changed, 16 insertions(+), 8 deletions(-) diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index dd8bfabe885d..11ae990f75e8 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -11,7 +11,8 @@ "3.8.*", "3.9.*", "3.10.*", - "3.11.*" + "3.11.*", + "3.12.*" ] }, { diff --git a/images/linux/toolsets/toolset-2204.json b/images/linux/toolsets/toolset-2204.json index 690799a79c11..990319efa4c4 100644 --- a/images/linux/toolsets/toolset-2204.json +++ b/images/linux/toolsets/toolset-2204.json @@ -11,7 +11,8 @@ "3.8.*", "3.9.*", "3.10.*", - "3.11.*" + "3.11.*", + "3.12.*" ] }, { diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index b140e5d8c561..0b7c7a7f2a0b 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -246,7 +246,8 @@ "3.8.*", "3.9.*", "3.10.*", - "3.11.*" + "3.11.*", + "3.12.*" ] } } diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index 8d36240c3504..225122e7bd0c 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -233,7 +233,8 @@ "3.8.*", "3.9.*", "3.10.*", - "3.11.*" + "3.11.*", + "3.12.*" ] } } diff --git a/images/macos/toolsets/toolset-13.json b/images/macos/toolsets/toolset-13.json index d8ddacc34b55..af4f41afbad0 100644 --- a/images/macos/toolsets/toolset-13.json +++ b/images/macos/toolsets/toolset-13.json @@ -122,12 +122,14 @@ "3.8.*", "3.9.*", "3.10.*", - "3.11.*" + "3.11.*", + "3.12.*" ] }, "arm64": { "versions": [ - "3.11.*" + "3.11.*", + "3.12.*" ] } } diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index 6bc9a89afe6a..b15f5d5ac3f2 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -38,7 +38,8 @@ "3.8.*", "3.9.*", "3.10.*", - "3.11.*" + "3.11.*", + "3.12.*" ] }, { diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index 9421307905e5..a2582ff85255 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -36,7 +36,8 @@ "3.8.*", "3.9.*", "3.10.*", - "3.11.*" + "3.11.*", + "3.12.*" ] }, { From 834cd084aa6a9a1862d4df4aaebf303a1463f247 Mon Sep 17 00:00:00 2001 From: sergei-pyshnoi <121864472+sergei-pyshnoi@users.noreply.github.com> Date: Mon, 23 Oct 2023 21:59:31 +0200 Subject: [PATCH 2372/3485] [macOS] add gcc 13 to macos images (#8563) --- images/macos/toolsets/toolset-12.json | 3 ++- images/macos/toolsets/toolset-13.json | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index 225122e7bd0c..75a2aff6eb3f 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -218,7 +218,8 @@ "gcc": { "versions": [ "11", - "12" + "12", + "13" ] }, "toolcache": [ diff --git a/images/macos/toolsets/toolset-13.json b/images/macos/toolsets/toolset-13.json index af4f41afbad0..4114b660098d 100644 --- a/images/macos/toolsets/toolset-13.json +++ b/images/macos/toolsets/toolset-13.json @@ -85,7 +85,8 @@ "gcc": { "versions": [ "11", - "12" + "12", + "13" ] }, "dotnet": { From 1687f31a3b1ce5f61a7e1e9a4ca23d22ba6e2f7c Mon Sep 17 00:00:00 2001 From: sergei-pyshnoi <121864472+sergei-pyshnoi@users.noreply.github.com> Date: Tue, 24 Oct 2023 15:09:52 +0200 Subject: [PATCH 2373/3485] [MacOS] Add xcode 15.0.1 (#8604) --- images/macos/toolsets/toolset-13.json | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/images/macos/toolsets/toolset-13.json b/images/macos/toolsets/toolset-13.json index 4114b660098d..3ec9f2ad0529 100644 --- a/images/macos/toolsets/toolset-13.json +++ b/images/macos/toolsets/toolset-13.json @@ -3,17 +3,15 @@ "default": "14.3.1", "x64": { "versions": [ - { "link": "15.0.1", "version": "15.0.1-Release.Candidate+15A507", "install_runtimes": "true"}, - { "link": "15.0", "version": "15.0.0+15A240d", "install_runtimes": "true"}, - { "link": "14.3.1", "version": "14.3.1+14E300c","symlinks": ["14.3"], "install_runtimes": "true" }, - { "link": "14.2", "version": "14.2.0+14C18", "install_runtimes": "true" }, - { "link": "14.1", "version": "14.1.0+14B47b", "install_runtimes": "true" } + { "link": "15.0.1", "version": "15.0.1+15A507", "symlinks": ["15.0"], "install_runtimes": "true"}, + { "link": "14.3.1", "version": "14.3.1+14E300c","symlinks": ["14.3"], "install_runtimes": "true"}, + { "link": "14.2", "version": "14.2.0+14C18", "install_runtimes": "true"}, + { "link": "14.1", "version": "14.1.0+14B47b", "install_runtimes": "true"} ] }, "arm64":{ "versions": [ - { "link": "15.0.1", "version": "15.0.1-Release.Candidate+15A507", "install_runtimes": "true"}, - { "link": "15.0", "version": "15.0.0+15A240d", "install_runtimes": "true"}, + { "link": "15.0.1", "version": "15.0.1+15A507", "symlinks": ["15.0"], "install_runtimes": "true"}, { "link": "14.3.1", "version": "14.3.1+14E300c","symlinks": ["14.3"], "install_runtimes": "true" }, { "link": "14.2", "version": "14.2.0+14C18", "install_runtimes": "true" }, { "link": "14.1", "version": "14.1.0+14B47b", "install_runtimes": "true" } From 1e73eaf18254d424fb3028161ecbd4f5f2e31a65 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 26 Oct 2023 03:51:17 +0000 Subject: [PATCH 2374/3485] Updating readme file for macos-13 version 20231018.14 (#8601) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-13-Readme.md | 152 ++++++++++++++++---------------- 1 file changed, 77 insertions(+), 75 deletions(-) diff --git a/images/macos/macos-13-Readme.md b/images/macos/macos-13-Readme.md index c3c01c1fd589..9c0e99087d96 100644 --- a/images/macos/macos-13-Readme.md +++ b/images/macos/macos-13-Readme.md @@ -1,18 +1,16 @@ | Announcements | |-| -| [[macOS] Apple Silicon (M1) powered macOS runners are now available in public beta!](https://github.com/actions/runner-images/issues/8439) | | [[All OS] Android NDK r23 will be removed from images on October 9](https://github.com/actions/runner-images/issues/8383) | -| [[All OS] hub utility will be removed on October 2](https://github.com/actions/runner-images/issues/8362) | *** # macOS 13 - OS Version: macOS 13.6 (22G120) - Kernel Version: Darwin 22.6.0 -- Image Version: 20231002.1 +- Image Version: 20231018.14 ## Installed Software ### Language and Runtime -- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.401 +- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.402 - Bash 3.2.57(1)-release - Clang/LLVM 14.0.3 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` @@ -25,26 +23,28 @@ - Mono 6.12.0.188 - Perl 5.38.0 - PHP 8.2.11 -- Python3 3.11.5 +- Python3 3.11.6 - R 4.3.1 - Ruby 3.0.6p216 ### Package Management -- Bundler 2.4.20 +- Bundler 2.4.21 - Carthage 0.39.1 - CocoaPods 1.13.0 -- Composer 2.6.4 -- Homebrew 4.1.14 +- Composer 2.6.5 +- Homebrew 4.1.16 - NPM 9.8.1 - NuGet 6.3.1.1 -- Pip3 23.2.1 (python 3.11) +- Pip3 23.3 (python 3.11) - Pipx 1.2.0 -- RubyGems 3.4.20 -- Vcpkg 2023 (build from commit 38dd6b15a) +- RubyGems 3.4.21 +- Vcpkg 2023 (build from commit a9794606a) - Yarn 1.22.19 ### Project Management - Apache Ant 1.10.14 +- Apache Maven 3.9.5 +- Gradle 8.4 ### Utilities - 7-Zip 17.05 @@ -53,10 +53,10 @@ - bazel 6.3.2 - bazelisk 1.18.0 - bsdtar 3.5.3 - available by 'tar' alias -- Curl 8.3.0 +- Curl 8.4.0 - Git 2.42.0 - Git LFS 3.4.0 -- GitHub CLI 2.35.0 +- GitHub CLI 2.37.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.21.4 - gpg (GnuPG) 2.4.3 @@ -68,36 +68,36 @@ - zstd 1.5.5 ### Tools -- AWS CLI 2.13.22 -- AWS SAM CLI 1.97.0 +- AWS CLI 2.13.26 +- AWS SAM CLI 1.98.0 - AWS Session Manager CLI 1.2.497.0 - Azure CLI 2.53.0 - Azure CLI (azure-devops) 0.26.0 -- Bicep CLI 0.21.1 +- Bicep CLI 0.22.6 - Cabal 3.6.2.0 -- Cmake 3.27.6 -- CodeQL Action Bundles 2.14.5 2.14.6 +- Cmake 3.27.7 +- CodeQL Action Bundle 2.15.0 - Fastlane 2.216.0 -- GHC 9.6.3 +- GHC 9.8.1 - GHCup 0.1.19.4 -- Stack 2.11.1 -- SwiftFormat 0.52.6 +- Stack 2.13.1 +- SwiftFormat 0.52.7 - Xcode Command Line Tools 15.0.0.0.1.1694021235 ### Linters - SwiftLint 0.53.0 ### Browsers -- Safari 16.6 (18615.3.12.11.2) -- SafariDriver 16.6 (18615.3.12.11.2) -- Google Chrome 117.0.5938.132 -- Google Chrome for Testing 117.0.5938.92 -- ChromeDriver 117.0.5938.92 -- Microsoft Edge 117.0.2045.47 -- Microsoft Edge WebDriver 117.0.2045.47 -- Mozilla Firefox 118.0.1 +- Safari 17.0 (18616.1.27.111.22) +- SafariDriver 17.0 (18616.1.27.111.22) +- Google Chrome 118.0.5993.88 +- Google Chrome for Testing 118.0.5993.70 +- ChromeDriver 118.0.5993.70 +- Microsoft Edge 118.0.2088.46 +- Microsoft Edge WebDriver 118.0.2088.46 +- Mozilla Firefox 118.0.2 - geckodriver 0.33.0 -- Selenium server 4.13.0 +- Selenium server 4.14.1 #### Environment variables | Name | Value | @@ -110,8 +110,9 @@ | Version | Environment Variable | | -------------------- | -------------------- | | 8.0.382+5 | JAVA_HOME_8_X64 | -| 11.0.20+101 | JAVA_HOME_11_X64 | +| 11.0.21+9 | JAVA_HOME_11_X64 | | 17.0.8+101 (default) | JAVA_HOME_17_X64 | +| 21.0.0+35.0.LTS | JAVA_HOME_21_X64 | ### Cached Tools @@ -123,7 +124,7 @@ - 3.8.18 - 3.9.18 - 3.10.13 -- 3.11.5 +- 3.11.6 #### PyPy - 2.7.18 [PyPy 7.3.13] @@ -134,18 +135,18 @@ #### Node.js - 16.20.2 -- 18.18.0 -- 20.8.0 +- 18.18.2 +- 20.8.1 #### Go - 1.19.13 -- 1.20.8 -- 1.21.1 +- 1.20.10 +- 1.21.3 ### Rust Tools -- Cargo 1.72.1 -- Rust 1.72.1 -- Rustdoc 1.72.1 +- Cargo 1.73.0 +- Rust 1.73.0 +- Rustdoc 1.73.0 - Rustup 1.26.0 #### Packages @@ -153,11 +154,11 @@ - Cargo-audit 0.18.2 - Cargo-outdated 0.13.1 - Cbindgen 0.26.0 -- Clippy 0.1.72 +- Clippy 0.1.73 - Rustfmt 1.6.0-stable ### PowerShell Tools -- PowerShell 7.2.14 +- PowerShell 7.2.15 #### PowerShell Modules - Az: 10.4.1 @@ -167,6 +168,7 @@ ### Xcode | Version | Build | Path | | ---------------- | ------- | ------------------------------ | +| 15.0.1 | 15A507 | /Applications/Xcode_15.0.1.app | | 15.0 | 15A240d | /Applications/Xcode_15.0.app | | 14.3.1 (default) | 14E300c | /Applications/Xcode_14.3.1.app | | 14.2 | 14C18 | /Applications/Xcode_14.2.app | @@ -181,63 +183,63 @@ | macOS 13.0 | macosx13.0 | 14.1 | | macOS 13.1 | macosx13.1 | 14.2 | | macOS 13.3 | macosx13.3 | 14.3.1 | -| macOS 14.0 | macosx14.0 | 15.0 | +| macOS 14.0 | macosx14.0 | 15.0, 15.0.1 | | iOS 16.1 | iphoneos16.1 | 14.1 | | iOS 16.2 | iphoneos16.2 | 14.2 | | iOS 16.4 | iphoneos16.4 | 14.3.1 | -| iOS 17.0 | iphoneos17.0 | 15.0 | +| iOS 17.0 | iphoneos17.0 | 15.0, 15.0.1 | | Simulator - iOS 16.1 | iphonesimulator16.1 | 14.1 | | Simulator - iOS 16.2 | iphonesimulator16.2 | 14.2 | | Simulator - iOS 16.4 | iphonesimulator16.4 | 14.3.1 | -| Simulator - iOS 17.0 | iphonesimulator17.0 | 15.0 | +| Simulator - iOS 17.0 | iphonesimulator17.0 | 15.0, 15.0.1 | | tvOS 16.1 | appletvos16.1 | 14.1, 14.2 | | tvOS 16.4 | appletvos16.4 | 14.3.1 | -| tvOS 17.0 | appletvos17.0 | 15.0 | +| tvOS 17.0 | appletvos17.0 | 15.0, 15.0.1 | | Simulator - tvOS 16.1 | appletvsimulator16.1 | 14.1, 14.2 | | Simulator - tvOS 16.4 | appletvsimulator16.4 | 14.3.1 | -| Simulator - tvOS 17.0 | appletvsimulator17.0 | 15.0 | +| Simulator - tvOS 17.0 | appletvsimulator17.0 | 15.0, 15.0.1 | | watchOS 9.1 | watchos9.1 | 14.1, 14.2 | | watchOS 9.4 | watchos9.4 | 14.3.1 | -| watchOS 10.0 | watchos10.0 | 15.0 | +| watchOS 10.0 | watchos10.0 | 15.0, 15.0.1 | | Simulator - watchOS 9.1 | watchsimulator9.1 | 14.1, 14.2 | | Simulator - watchOS 9.4 | watchsimulator9.4 | 14.3.1 | -| Simulator - watchOS 10.0 | watchsimulator10.0 | 15.0 | +| Simulator - watchOS 10.0 | watchsimulator10.0 | 15.0, 15.0.1 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | | DriverKit 22.1 | driverkit22.1 | 14.1 | | DriverKit 22.2 | driverkit22.2 | 14.2 | | DriverKit 22.4 | driverkit22.4 | 14.3.1 | -| DriverKit 23.0 | driverkit23.0 | 15.0 | +| DriverKit 23.0 | driverkit23.0 | 15.0, 15.0.1 | #### Installed Simulators -| OS | Xcode Version | Simulators | -| ------------ | ------------------------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| iOS 16.1 | 14.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 16.2 | 14.2 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 16.4 | 14.3.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 17.0 | 14.1<br>14.2<br>14.3.1<br>15.0 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| tvOS 16.1 | 14.1<br>14.2<br>14.3.1<br>15.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 16.4 | 14.1<br>14.2<br>14.3.1<br>15.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 17.0 | 14.1<br>14.2<br>14.3.1<br>15.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| watchOS 9.1 | 14.1<br>14.2<br>14.3.1<br>15.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | -| watchOS 9.4 | 14.1<br>14.2<br>14.3.1<br>15.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | -| watchOS 10.0 | 14.1<br>14.2<br>14.3.1<br>15.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | +| OS | Xcode Version | Simulators | +| ------------ | ---------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| iOS 16.1 | 14.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 16.2 | 14.2 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 16.4 | 14.3.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 17.0 | 14.1<br>14.2<br>14.3.1<br>15.0<br>15.0.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| tvOS 16.1 | 14.1<br>14.2<br>14.3.1<br>15.0<br>15.0.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 16.4 | 14.1<br>14.2<br>14.3.1<br>15.0<br>15.0.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 17.0 | 14.1<br>14.2<br>14.3.1<br>15.0<br>15.0.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| watchOS 9.1 | 14.1<br>14.2<br>14.3.1<br>15.0<br>15.0.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | +| watchOS 9.4 | 14.1<br>14.2<br>14.3.1<br>15.0<br>15.0.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | +| watchOS 10.0 | 14.1<br>14.2<br>14.3.1<br>15.0<br>15.0.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | ### Android -| Package Name | Version | -| -------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 8.0 | -| Android Emulator | 32.1.15 | -| Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | -| Android SDK Platforms | android-34 (rev 2)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | -| Android SDK Platform-Tools | 34.0.4 | -| Android Support Repository | 47.0.0 | -| CMake | 3.18.1<br>3.22.1 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 23.2.8568313<br>24.0.8215888<br>25.2.9519653 (default)<br>26.0.10792818 | -| SDK Patch Applier v4 | 1 | +| Package Name | Version | +| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 8.0 | +| Android Emulator | 32.1.15 | +| Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | +| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34 (rev 2)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | +| Android SDK Platform-Tools | 34.0.5 | +| Android Support Repository | 47.0.0 | +| CMake | 3.18.1<br>3.22.1 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 23.2.8568313<br>24.0.8215888<br>25.2.9519653 (default)<br>26.1.10909125 | +| SDK Patch Applier v4 | 1 | #### Environment variables | Name | Value | @@ -245,7 +247,7 @@ | ANDROID_HOME | /Users/runner/Library/Android/sdk | | ANDROID_NDK | /Users/runner/Library/Android/sdk/ndk/25.2.9519653 | | ANDROID_NDK_HOME | /Users/runner/Library/Android/sdk/ndk/25.2.9519653 | -| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/26.0.10792818 | +| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/26.1.10909125 | | ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk/25.2.9519653 | | ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | From fc9431c2ebba291df0a9bf4d8c1a7345842016fd Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 26 Oct 2023 10:55:05 +0200 Subject: [PATCH 2375/3485] Updating readme file for macos-13-arm64 version 20231017.1 (#8586) Co-authored-by: Image generation service account <no-reply@microsoft.com> --- images/macos/macos-13-arm64-Readme.md | 113 ++++++++++++++++---------- 1 file changed, 71 insertions(+), 42 deletions(-) diff --git a/images/macos/macos-13-arm64-Readme.md b/images/macos/macos-13-arm64-Readme.md index 4da3476a0899..324c78e94072 100644 --- a/images/macos/macos-13-arm64-Readme.md +++ b/images/macos/macos-13-arm64-Readme.md @@ -1,12 +1,16 @@ +| Announcements | +|-| +| [[All OS] Android NDK r23 will be removed from images on October 9](https://github.com/actions/runner-images/issues/8383) | +*** # macOS 13 - OS Version: macOS 13.6 (22G120) - Kernel Version: Darwin 22.6.0 -- Image Version: 20230924.3 +- Image Version: 20231017.1 ## Installed Software ### Language and Runtime -- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.401 +- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.402 - Bash 3.2.57(1)-release - Clang/LLVM 14.0.3 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` @@ -17,35 +21,36 @@ - Julia 1.9.3 - Kotlin 1.9.10-release-459 - Mono 6.12.0.188 -- Perl 5.36.1 +- Perl 5.38.0 - R 4.3.1 - Ruby 3.0.6p216 ### Package Management -- Bundler 2.4.19 +- Bundler 2.4.21 - Carthage 0.39.1 - CocoaPods 1.13.0 -- Composer command -- Homebrew 4.1.12 +- Homebrew 4.1.16 - NPM 9.8.1 - NuGet 6.3.1.1 -- RubyGems 3.4.19 +- RubyGems 3.4.21 - Yarn 1.22.19 ### Project Management - Apache Ant 1.10.14 +- Apache Maven 3.9.5 +- Gradle 8.4 ### Utilities - 7-Zip 17.05 - aria2 1.36.0 -- azcopy 10.20.1 +- azcopy 10.21.0 - bazel 6.3.2 - bazelisk 1.18.0 - bsdtar 3.5.3 - available by 'tar' alias - Curl 8.1.2 - Git 2.42.0 - Git LFS 3.4.0 -- GitHub CLI 2.35.0 +- GitHub CLI 2.37.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.21.4 - gpg (GnuPG) 2.4.3 @@ -53,46 +58,69 @@ - OpenSSL 1.1.1w 11 Sep 2023 - Packer 1.9.4 - pkg-config 0.29.2 -- yq 4.35.1 +- yq 4.35.2 - zstd 1.5.5 ### Tools -- Azure CLI 2.52.0 +- Azure CLI 2.53.0 - Azure CLI (azure-devops) 0.26.0 -- Bicep CLI 0.21.1 -- Cmake 3.27.6 -- CodeQL Action Bundles 2.14.4 2.14.5 +- Bicep CLI 0.22.6 +- Cmake 3.27.7 +- CodeQL Action Bundle 2.15.0 - Fastlane 2.216.0 -- SwiftFormat 0.52.4 +- SwiftFormat 0.52.7 - Xcode Command Line Tools 15.0.0.0.1.1694021235 ### Linters +### Browsers +- Safari 17.0 (18616.1.27.111.22) +- SafariDriver 17.0 (18616.1.27.111.22) +- Google Chrome 118.0.5993.88 +- Google Chrome for Testing 118.0.5993.70 +- ChromeDriver 118.0.5993.70 +- Selenium server 4.14.1 + +#### Environment variables +| Name | Value | +| --------------- | --------------------------------------- | +| CHROMEWEBDRIVER | /usr/local/share/chromedriver-mac-arm64 | +| EDGEWEBDRIVER | | +| GECKOWEBDRIVER | | + +### Java +| Version | Environment Variable | +| -------------------- | -------------------- | +| 11.0.20+101 | JAVA_HOME_11_arm64 | +| 17.0.8+101 (default) | JAVA_HOME_17_arm64 | +| 21.0.0+35.0.LTS | JAVA_HOME_21_arm64 | + ### Rust Tools -- Cargo 1.72.1 -- Rust 1.72.1 -- Rustdoc 1.72.1 +- Cargo 1.73.0 +- Rust 1.73.0 +- Rustdoc 1.73.0 - Rustup 1.26.0 #### Packages - Bindgen 0.68.1 -- Cargo-audit 0.18.1 +- Cargo-audit 0.18.2 - Cargo-outdated 0.13.1 - Cbindgen 0.26.0 -- Clippy 0.1.72 +- Clippy 0.1.73 - Rustfmt 1.6.0-stable ### PowerShell Tools -- PowerShell 7.2.14 +- PowerShell 7.2.15 #### PowerShell Modules -- Az: 10.3.0 +- Az: 10.4.1 - Pester: 5.5.0 - PSScriptAnalyzer: 1.21.0 ### Xcode | Version | Build | Path | | ---------------- | ------- | ------------------------------ | +| 15.0.1 | 15A507 | /Applications/Xcode_15.0.1.app | | 15.0 | 15A240d | /Applications/Xcode_15.0.app | | 14.3.1 (default) | 14E300c | /Applications/Xcode_14.3.1.app | | 14.2 | 14C18 | /Applications/Xcode_14.2.app | @@ -107,45 +135,46 @@ | macOS 13.0 | macosx13.0 | 14.1 | | macOS 13.1 | macosx13.1 | 14.2 | | macOS 13.3 | macosx13.3 | 14.3.1 | -| macOS 14.0 | macosx14.0 | 15.0 | +| macOS 14.0 | macosx14.0 | 15.0, 15.0.1 | | iOS 16.1 | iphoneos16.1 | 14.1 | | iOS 16.2 | iphoneos16.2 | 14.2 | | iOS 16.4 | iphoneos16.4 | 14.3.1 | -| iOS 17.0 | iphoneos17.0 | 15.0 | +| iOS 17.0 | iphoneos17.0 | 15.0, 15.0.1 | | Simulator - iOS 16.1 | iphonesimulator16.1 | 14.1 | | Simulator - iOS 16.2 | iphonesimulator16.2 | 14.2 | | Simulator - iOS 16.4 | iphonesimulator16.4 | 14.3.1 | -| Simulator - iOS 17.0 | iphonesimulator17.0 | 15.0 | +| Simulator - iOS 17.0 | iphonesimulator17.0 | 15.0, 15.0.1 | | tvOS 16.1 | appletvos16.1 | 14.1, 14.2 | | tvOS 16.4 | appletvos16.4 | 14.3.1 | -| tvOS 17.0 | appletvos17.0 | 15.0 | +| tvOS 17.0 | appletvos17.0 | 15.0, 15.0.1 | | Simulator - tvOS 16.1 | appletvsimulator16.1 | 14.1, 14.2 | | Simulator - tvOS 16.4 | appletvsimulator16.4 | 14.3.1 | -| Simulator - tvOS 17.0 | appletvsimulator17.0 | 15.0 | +| Simulator - tvOS 17.0 | appletvsimulator17.0 | 15.0, 15.0.1 | | watchOS 9.1 | watchos9.1 | 14.1, 14.2 | | watchOS 9.4 | watchos9.4 | 14.3.1 | -| watchOS 10.0 | watchos10.0 | 15.0 | +| watchOS 10.0 | watchos10.0 | 15.0, 15.0.1 | | Simulator - watchOS 9.1 | watchsimulator9.1 | 14.1, 14.2 | | Simulator - watchOS 9.4 | watchsimulator9.4 | 14.3.1 | -| Simulator - watchOS 10.0 | watchsimulator10.0 | 15.0 | +| Simulator - watchOS 10.0 | watchsimulator10.0 | 15.0, 15.0.1 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | | DriverKit 22.1 | driverkit22.1 | 14.1 | | DriverKit 22.2 | driverkit22.2 | 14.2 | | DriverKit 22.4 | driverkit22.4 | 14.3.1 | -| DriverKit 23.0 | driverkit23.0 | 15.0 | +| DriverKit 23.0 | driverkit23.0 | 15.0, 15.0.1 | #### Installed Simulators -| OS | Xcode Version | Simulators | -| ------------ | ------------------------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| iOS 16.1 | 14.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 16.2 | 14.2 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 16.4 | 14.3.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 17.0 | 14.1<br>14.2<br>14.3.1<br>15.0 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| tvOS 16.1 | 14.1<br>14.2<br>14.3.1<br>15.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 16.4 | 14.1<br>14.2<br>14.3.1<br>15.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 17.0 | 14.1<br>14.2<br>14.3.1<br>15.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| watchOS 9.1 | 14.1<br>14.2<br>14.3.1<br>15.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | -| watchOS 9.4 | 14.1<br>14.2<br>14.3.1<br>15.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | -| watchOS 10.0 | 14.1<br>14.2<br>14.3.1<br>15.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | +| OS | Xcode Version | Simulators | +| ------------ | ---------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| iOS 16.1 | 14.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 16.2 | 14.2 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 16.4 | 14.3.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 17.0 | 14.1<br>14.2<br>14.3.1<br>15.0<br>15.0.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| tvOS 16.1 | 14.1<br>14.2<br>14.3.1<br>15.0<br>15.0.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 16.4 | 14.1<br>14.2<br>14.3.1<br>15.0<br>15.0.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 17.0 | 14.1<br>14.2<br>14.3.1<br>15.0<br>15.0.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| watchOS 9.1 | 14.1<br>14.2<br>14.3.1<br>15.0<br>15.0.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | +| watchOS 9.4 | 14.1<br>14.2<br>14.3.1<br>15.0<br>15.0.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | +| watchOS 10.0 | 14.1<br>14.2<br>14.3.1<br>15.0<br>15.0.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | + From 378c4d75115a45b8fe10d241ed386bc51a35b969 Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Thu, 26 Oct 2023 11:28:45 +0200 Subject: [PATCH 2376/3485] [MacOS] improve errexit option handling (#8432) * [MacOS] improve errexit option handling * Prevent prompting for override when unzipping * Explicitly allow failing when installing virtualbox * Remove libtcl symlinks * Add debug output --- images/macos/provision/core/android-toolsets.sh | 2 +- images/macos/provision/core/commonutils.sh | 10 ++-------- images/macos/provision/core/pypy.sh | 4 ++-- images/macos/provision/utils/utils.sh | 15 +++++++++++---- images/macos/tests/BasicTools.Tests.ps1 | 13 ++++++++++--- 5 files changed, 26 insertions(+), 18 deletions(-) diff --git a/images/macos/provision/core/android-toolsets.sh b/images/macos/provision/core/android-toolsets.sh index 5673ad33ce29..0589a5a438f4 100755 --- a/images/macos/provision/core/android-toolsets.sh +++ b/images/macos/provision/core/android-toolsets.sh @@ -126,7 +126,7 @@ sdkTools="android-sdk-tools.zip" sdkToolsVersion=$(get_toolset_value '.android."sdk-tools"') if [ "$sdkToolsVersion" != "null" ]; then download_with_retries "https://dl.google.com/android/repository/${sdkToolsVersion}" "." $sdkTools - unzip -qq $sdkTools -d ${ANDROID_SDK_ROOT} + unzip -o -qq $sdkTools -d ${ANDROID_SDK_ROOT} rm -f $sdkTools fi diff --git a/images/macos/provision/core/commonutils.sh b/images/macos/provision/core/commonutils.sh index 350f8705ff91..cbe0b9c4cf23 100644 --- a/images/macos/provision/core/commonutils.sh +++ b/images/macos/provision/core/commonutils.sh @@ -36,6 +36,7 @@ fi # System Preferences -> Security & Privacy -> General -> Unlock -> Allow -> Not now if is_Monterey; then if is_Veertu; then + echo "Executing AppleScript to change security preferences (with retries)" retry=5 while [ $retry -gt 0 ]; do { @@ -48,6 +49,7 @@ if is_Monterey; then sleep 10 done else + echo "Executing AppleScript to change security preferences" osascript $HOME/utils/confirm-identified-developers.scpt $USER_PASSWORD fi fi @@ -82,13 +84,5 @@ bazel # Install Azure DevOps extension for Azure Command Line Interface az extension add -n azure-devops -# Workaround https://github.com/actions/runner-images/issues/4931 -# by making Tcl/Tk paths the same on macOS 10.15 and macOS 11 -if is_Monterey; then - version=$(brew info tcl-tk --json | jq -r '.[].installed[].version') - ln -s /usr/local/Cellar/tcl-tk/$version/lib/libtcl8.6.dylib /usr/local/lib/libtcl8.6.dylib - ln -s /usr/local/Cellar/tcl-tk/$version/lib/libtk8.6.dylib /usr/local/lib/libtk8.6.dylib -fi - # Invoke tests for all basic tools invoke_tests "BasicTools" diff --git a/images/macos/provision/core/pypy.sh b/images/macos/provision/core/pypy.sh index eae5c389040f..6e12ed9cf29c 100644 --- a/images/macos/provision/core/pypy.sh +++ b/images/macos/provision/core/pypy.sh @@ -11,7 +11,7 @@ function InstallPyPy PACKAGE_URL=$1 PACKAGE_TAR_NAME=$(echo $PACKAGE_URL | awk -F/ '{print $NF}') - echo "Downloading tar archive '$PACKAGE_TAR_NAME' - '$PACKAGE_URL'" + echo "Downloading tar archive '$PACKAGE_TAR_NAME'" PACKAGE_TAR_TEMP_PATH="/tmp/$PACKAGE_TAR_NAME" download_with_retries $PACKAGE_URL "/tmp" "$PACKAGE_TAR_NAME" @@ -89,4 +89,4 @@ for toolsetVersion in $toolsetVersions; do exit 1 fi InstallPyPy $latestMajorPyPyVersion -done \ No newline at end of file +done diff --git a/images/macos/provision/utils/utils.sh b/images/macos/provision/utils/utils.sh index 5cb86690e3a6..35daaef22fae 100755 --- a/images/macos/provision/utils/utils.sh +++ b/images/macos/provision/utils/utils.sh @@ -15,15 +15,24 @@ download_with_retries() { local COMMAND="curl $URL -4 -sL -o '$DEST/$NAME' -w '%{http_code}'" fi + # Save current errexit state and disable it to prevent unexpected exit on error + if echo $SHELLOPTS | grep '\(^\|:\)errexit\(:\|$\)' > /dev/null; + then + local ERR_EXIT_ENABLED=true + else + local ERR_EXIT_ENABLED=false + fi + set +e + echo "Downloading '$URL' to '${DEST}/${NAME}'..." retries=20 interval=30 while [ $retries -gt 0 ]; do ((retries--)) - # Temporary disable exit on error to retry on non-zero exit code - set +e + test "$ERR_EXIT_ENABLED" = true && set +e http_code=$(eval $COMMAND) exit_code=$? + test "$ERR_EXIT_ENABLED" = true && set -e if [ $http_code -eq 200 ] && [ $exit_code -eq 0 ]; then echo "Download completed" return 0 @@ -31,8 +40,6 @@ download_with_retries() { echo "Error — Either HTTP response code for '$URL' is wrong - '$http_code' or exit code is not 0 - '$exit_code'. Waiting $interval seconds before the next attempt, $retries attempts left" sleep 30 fi - # Enable exit on error back - set -e done echo "Could not download $URL" diff --git a/images/macos/tests/BasicTools.Tests.ps1 b/images/macos/tests/BasicTools.Tests.ps1 index 345772ffe947..c4b763cdf83b 100644 --- a/images/macos/tests/BasicTools.Tests.ps1 +++ b/images/macos/tests/BasicTools.Tests.ps1 @@ -67,6 +67,13 @@ Describe "Helm" -Skip:($os.IsMonterey -or $os.IsVentura -or $os.IsVenturaArm64) } } +Describe "Tcl/Tk" { + It "libtcl" { + "file /usr/local/lib/libtcl8.6.dylib" | Should -ReturnZeroExitCode + "file /usr/local/lib/libtk8.6.dylib" | Should -ReturnZeroExitCode + } +} + Describe "bazelisk" { It "bazelisk" { "bazelisk version" | Should -ReturnZeroExitCode @@ -164,9 +171,9 @@ Describe "Homebrew" { } Describe "Kotlin" { - $kotlinPackages = @("kapt", "kotlin", "kotlinc", "kotlinc-jvm", "kotlin-dce-js") + $kotlinPackages = @("kapt", "kotlin", "kotlinc", "kotlinc-jvm", "kotlin-dce-js") - It "<toolName> is available" -TestCases ($kotlinPackages | ForEach-Object { @{ toolName = $_ } }) { + It "<toolName> is available" -TestCases ($kotlinPackages | ForEach-Object { @{ toolName = $_ } }) { "$toolName -version" | Should -ReturnZeroExitCode } } @@ -187,4 +194,4 @@ Describe "imagemagick" -Skip:($os.IsVentura -or $os.IsVenturaArm64) { It "imagemagick" { "magick -version" | Should -ReturnZeroExitCode } -} \ No newline at end of file +} From ad34bed33ee26de0337eb082dbda0680026d7ac6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 26 Oct 2023 12:20:49 +0200 Subject: [PATCH 2377/3485] Updating readme file for ubuntu20 version 20231022.1.1 (#8637) Co-authored-by: Image generation service account <no-reply@microsoft.com> --- images/linux/Ubuntu2004-Readme.md | 91 ++++++++++++++++--------------- 1 file changed, 46 insertions(+), 45 deletions(-) diff --git a/images/linux/Ubuntu2004-Readme.md b/images/linux/Ubuntu2004-Readme.md index 1f26dad2da53..8b911d14869b 100644 --- a/images/linux/Ubuntu2004-Readme.md +++ b/images/linux/Ubuntu2004-Readme.md @@ -4,8 +4,8 @@ *** # Ubuntu 20.04 - OS Version: 20.04.6 LTS -- Kernel Version: 5.15.0-1049-azure -- Image Version: 20231016.1.0 +- Kernel Version: 5.15.0-1050-azure +- Image Version: 20231022.1.0 - Systemd version: 245.4-4ubuntu3.22 ## Installed Software @@ -28,20 +28,20 @@ - Perl 5.30.0 - Python 3.8.10 - Ruby 2.7.0p0 -- Swift 5.9 +- Swift 5.9.1 ### Package Management - cpan 1.64 - Helm 3.13.1 - Homebrew 4.1.16 -- Miniconda 23.5.2 +- Miniconda 23.9.0 - Npm 9.8.1 - NuGet 6.6.1.2 - Pip 20.0.2 - Pip3 20.0.2 - Pipx 1.2.0 - RubyGems 3.1.2 -- Vcpkg (build from commit e57b2167e) +- Vcpkg (build from commit 830f86fb3) - Yarn 1.22.19 #### Environment variables @@ -61,7 +61,7 @@ to accomplish this. ### Project Management - Ant 1.10.7 - Gradle 8.4 -- Lerna 7.3.1 +- Lerna 7.4.1 - Maven 3.8.8 - Sbt 1.9.6 @@ -69,15 +69,15 @@ to accomplish this. - Ansible 2.13.13 - apt-fast 1.9.12 - AzCopy 10.21.0 - available by `azcopy` and `azcopy10` aliases -- Bazel 6.3.2 +- Bazel 6.4.0 - Bazelisk 1.18.0 - Bicep 0.22.6 - Buildah 1.22.3 - CMake 3.27.7 -- CodeQL Action Bundle 2.15.0 +- CodeQL Action Bundle 2.15.1 - Docker Amazon ECR Credential Helper 0.7.1 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.22.0 +- Docker Compose v2 2.23.0 - Docker-Buildx 0.11.2 - Docker Client 24.0.6 - Docker Server 24.0.6 @@ -90,8 +90,8 @@ to accomplish this. - HHVM (HipHop VM) 4.172.1 - jq 1.6 - Kind 0.20.0 -- Kubectl 1.28.2 -- Kustomize 5.1.1 +- Kubectl 1.28.3 +- Kustomize 5.2.1 - Leiningen 2.10.0 - MediaInfo 19.09 - Mercurial 5.3.1 @@ -104,29 +104,29 @@ to accomplish this. - Parcel 2.10.0 - PhantomJS 2.1.1 2.1.1 - Podman 3.4.2 -- Pulumi 3.88.1 +- Pulumi 3.89.0 - R 4.3.1 - Skopeo 1.5.0 - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 -- Terraform 1.6.1 +- Terraform 1.6.2 - yamllint 1.32.0 - yq 4.35.2 - zstd 1.5.5 ### CLI Tools - Alibaba Cloud CLI 3.0.174 -- AWS CLI 2.13.26 +- AWS CLI 2.13.28 - AWS CLI Session Manager Plugin 1.2.497.0 -- AWS SAM CLI 1.98.0 +- AWS SAM CLI 1.99.0 - Azure CLI 2.53.0 - Azure CLI (azure-devops) 0.26.0 -- GitHub CLI 2.36.0 -- Google Cloud CLI 450.0.0 -- Netlify CLI 16.7.0 -- OpenShift CLI 4.13.15 +- GitHub CLI 2.37.0 +- Google Cloud CLI 451.0.1 +- Netlify CLI 16.9.1 +- OpenShift CLI 4.13.17 - ORAS CLI 1.1.0 -- Vercel CLI 32.4.1 +- Vercel CLI 32.5.0 ### Java | Version | Environment Variable | @@ -134,6 +134,7 @@ to accomplish this. | 8.0.382+5 | JAVA_HOME_8_X64 | | 11.0.20+1 (default) | JAVA_HOME_11_X64 | | 17.0.8+1 | JAVA_HOME_17_X64 | +| 21.0.0+35 | JAVA_HOME_21_X64 | ### PHP Tools - PHP: 7.4.33, 8.0.30, 8.1.24, 8.2.11 @@ -164,13 +165,13 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.6.0 ### Browsers and Drivers -- Google Chrome 118.0.5993.70 +- Google Chrome 118.0.5993.88 - ChromeDriver 118.0.5993.70 - Chromium 118.0.5993.0 -- Microsoft Edge 118.0.2088.46 -- Microsoft Edge WebDriver 118.0.2088.46 +- Microsoft Edge 118.0.2088.61 +- Microsoft Edge WebDriver 118.0.2088.61 - Selenium server 4.14.0 -- Mozilla Firefox 118.0.2 +- Mozilla Firefox 119.0 - Geckodriver 0.33.0 #### Environment variables @@ -208,7 +209,7 @@ Use the following command as a part of your job to start the service: 'sudo syst #### MS SQL - sqlcmd 17.10.0001.1 -- SqlPackage 162.0.52.1 +- SqlPackage 162.1.167.1 ### Cached Tools @@ -252,7 +253,7 @@ Use the following command as a part of your job to start the service: 'sudo syst - Az: 9.3.0 - Az (Cached): 3.1.0.zip, 4.4.0.zip, 5.9.0.zip, 6.6.0.zip, 7.5.0.zip - MarkdownPS: 1.9 -- Microsoft.Graph: 2.6.1 +- Microsoft.Graph: 2.8.0 - Pester: 5.5.0 - PSScriptAnalyzer: 1.21.0 @@ -264,20 +265,20 @@ Use the following command as a part of your job to start the service: 'sudo syst | nginx | 1.18.0 | /etc/nginx/nginx.conf | inactive | 80 | ### Android -| Package Name | Version | -| -------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 9.0 | -| Android Emulator | 32.1.15 | -| Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | -| Android SDK Platform-Tools | 34.0.4 | -| Android SDK Platforms | android-34 (rev 2)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | -| Android SDK Tools | 26.1.1 | -| Android Support Repository | 47.0.0 | -| CMake | 3.10.2<br>3.18.1<br>3.22.1 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 23.2.8568313<br>24.0.8215888<br>25.2.9519653 (default)<br>26.1.10909125 | -| SDK Patch Applier v4 | 1 | +| Package Name | Version | +| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 9.0 | +| Android Emulator | 32.1.15 | +| Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | +| Android SDK Platform-Tools | 34.0.5 | +| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34 (rev 2)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | +| Android SDK Tools | 26.1.1 | +| Android Support Repository | 47.0.0 | +| CMake | 3.10.2<br>3.18.1<br>3.22.1 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 23.2.8568313<br>24.0.8215888<br>25.2.9519653 (default)<br>26.1.10909125 | +| SDK Patch Applier v4 | 1 | #### Environment variables | Name | Value | @@ -301,15 +302,15 @@ Use the following command as a part of your job to start the service: 'sudo syst | debian:10 | sha256:853b9ec779e55f670cbdcb5e15bfb778b5be2c5c61fc8c655638b7a977d273c6 | 2023-10-11 | | debian:11 | sha256:c141beaa9e0767774221cc82efe3a6712a1cc4f75d2699334dfd9a28a6f7357b | 2023-10-11 | | debian:9 | sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be | 2022-06-23 | -| moby/buildkit:latest | sha256:890dcae054e3039f6c6b76bf0da80a130fa6e6bb1f3624063ef0210ac2c57b06 | 2023-08-24 | +| moby/buildkit:latest | sha256:d4187a7326f20d04fafd075f80ccc5d3f8cfd4f665c6e03d158a78e4f64bf3db | 2023-10-19 | | node:14 | sha256:a158d3b9b4e3fa813fa6c8c590b8f0a860e015ad4e59bbce5744d2f6fd8461aa | 2023-04-12 | | node:14-alpine | sha256:434215b487a329c9e867202ff89e704d3a75e554822e07f3e0c0f9e606121b33 | 2023-03-29 | | node:16 | sha256:f77a1aef2da8d83e45ec990f45df50f1a286c5fe8bbfb8c6e4246c6389705c0b | 2023-09-07 | | node:16-alpine | sha256:a1f9d027912b58a7c75be7716c97cfbc6d3099f3a97ed84aa490be9dee20e787 | 2023-08-10 | -| node:18 | sha256:d764525456dfe2f96a436ba00f864ee8ae3690bfb457c9f12a3a2a35b2d8be41 | 2023-10-16 | -| node:18-alpine | sha256:0fe7402d11d8c85474c6ec6f9c9c8048cd0549c95535832b7f0735a4b47690a5 | 2023-10-16 | -| node:20 | sha256:98f80754df0cf581de86a2cbbf85692cccde41916b35a97a1c84b0a971b8d578 | 2023-10-16 | -| node:20-alpine | sha256:a369136b6f7640f85acf300ce9d6498d8161972b855a72bbc79273150d4dd0c7 | 2023-10-16 | +| node:18 | sha256:a6385a6bb2fdcb7c48fc871e35e32af8daaa82c518900be49b76d10c005864c2 | 2023-10-18 | +| node:18-alpine | sha256:435dcad253bb5b7f347ebc69c8cc52de7c912eb7241098b920f2fc2d7843183d | 2023-10-18 | +| node:20 | sha256:bd20621deff56cb66c6cd10772d26db1a0d480f2b08609eb96b799ba6260f3ed | 2023-10-18 | +| node:20-alpine | sha256:002b6ee25b63b81dc4e47c9378ffe20915c3fa0e98e834c46584438468b1d0b5 | 2023-10-18 | | ubuntu:16.04 | sha256:1f1a2d56de1d604801a9671f301190704c25d604a416f59e03c04f5c6ffee0d6 | 2021-08-31 | | ubuntu:18.04 | sha256:152dc042452c496007f07ca9127571cb9c29697f42acbfad72324b2bb2e43c98 | 2023-05-30 | | ubuntu:20.04 | sha256:ed4a42283d9943135ed87d4ee34e542f7f5ad9ecf2f244870e23122f703f91c2 | 2023-10-03 | From 388d55d0d741619a8718061d401166ebdc1f01f5 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 26 Oct 2023 12:21:11 +0200 Subject: [PATCH 2378/3485] Updating readme file for ubuntu22 version 20231022.1.1 (#8636) Co-authored-by: Image generation service account <no-reply@microsoft.com> --- images/linux/Ubuntu2204-Readme.md | 99 ++++++++++++++++--------------- 1 file changed, 50 insertions(+), 49 deletions(-) diff --git a/images/linux/Ubuntu2204-Readme.md b/images/linux/Ubuntu2204-Readme.md index e312eeedbc8b..bd9d8ebb9f7a 100644 --- a/images/linux/Ubuntu2204-Readme.md +++ b/images/linux/Ubuntu2204-Readme.md @@ -4,19 +4,19 @@ *** # Ubuntu 22.04 - OS Version: 22.04.3 LTS -- Kernel Version: 6.2.0-1014-azure -- Image Version: 20231016.1.0 +- Kernel Version: 6.2.0-1015-azure +- Image Version: 20231022.1.0 - Systemd version: 249.11-0ubuntu3.10 ## Installed Software ### Language and Runtime - Bash 5.1.16(1)-release -- Clang: 13.0.1, 14.0.0 -- Clang-format: 13.0.1, 14.0.0 +- Clang: 13.0.1, 14.0.0, 15.0.7 +- Clang-format: 13.0.1, 14.0.0, 15.0.7 - Clang-tidy: 13.0.1, 14.0.0, 15.0.7 - Dash 0.5.11+git20210903+057cd650a4ed-3build1 -- GNU C++: 9.5.0, 10.5.0, 11.4.0, 12.3.0 +- GNU C++: 9.5.0, 10.5.0, 11.4.0, 12.3.0, 13.1.0 - GNU Fortran: 9.5.0, 10.5.0, 11.4.0, 12.3.0 - Julia 1.9.3 - Kotlin 1.9.10-release-459 @@ -26,20 +26,20 @@ - Perl 5.34.0 - Python 3.10.12 - Ruby 3.0.2p107 -- Swift 5.9 +- Swift 5.9.1 ### Package Management - cpan 1.64 - Helm 3.13.1 - Homebrew 4.1.16 -- Miniconda 23.5.2 +- Miniconda 23.9.0 - Npm 9.8.1 - NuGet 6.6.1.2 - Pip 22.0.2 - Pip3 22.0.2 - Pipx 1.2.0 - RubyGems 3.3.5 -- Vcpkg (build from commit e57b2167e) +- Vcpkg (build from commit 830f86fb3) - Yarn 1.22.19 #### Environment variables @@ -57,22 +57,22 @@ to accomplish this. ``` ### Project Management -- Lerna 7.3.1 +- Lerna 7.4.1 - Maven 3.8.8 ### Tools - Ansible 2.15.5 - apt-fast 1.9.12 - AzCopy 10.21.0 - available by `azcopy` and `azcopy10` aliases -- Bazel 6.3.2 +- Bazel 6.4.0 - Bazelisk 1.18.0 - Bicep 0.22.6 - Buildah 1.23.1 - CMake 3.27.7 -- CodeQL Action Bundle 2.15.0 +- CodeQL Action Bundle 2.15.1 - Docker Amazon ECR Credential Helper 0.7.1 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.22.0 +- Docker Compose v2 2.23.0 - Docker-Buildx 0.11.2 - Docker Client 24.0.6 - Docker Server 24.0.6 @@ -84,8 +84,8 @@ to accomplish this. - Heroku 8.6.0 - jq 1.6 - Kind 0.20.0 -- Kubectl 1.28.2 -- Kustomize 5.1.1 +- Kubectl 1.28.3 +- Kustomize 5.2.1 - Leiningen 2.10.0 - MediaInfo 21.09 - Mercurial 6.1.1 @@ -97,29 +97,29 @@ to accomplish this. - Packer 1.9.4 - Parcel 2.10.0 - Podman 3.4.4 -- Pulumi 3.88.1 +- Pulumi 3.89.0 - R 4.3.1 - Skopeo 1.4.1 - Sphinx Open Source Search Server 2.2.11 - SVN 1.14.1 -- Terraform 1.6.1 +- Terraform 1.6.2 - yamllint 1.32.0 - yq 4.35.2 - zstd 1.5.5 ### CLI Tools -- Alibaba Cloud CLI 3.0.183 -- AWS CLI 2.13.26 +- Alibaba Cloud CLI 3.0.184 +- AWS CLI 2.13.28 - AWS CLI Session Manager Plugin 1.2.497.0 -- AWS SAM CLI 1.98.0 +- AWS SAM CLI 1.99.0 - Azure CLI 2.53.0 - Azure CLI (azure-devops) 0.26.0 -- GitHub CLI 2.36.0 -- Google Cloud CLI 450.0.0 -- Netlify CLI 16.7.0 -- OpenShift CLI 4.13.15 +- GitHub CLI 2.37.0 +- Google Cloud CLI 451.0.1 +- Netlify CLI 16.9.1 +- OpenShift CLI 4.13.17 - ORAS CLI 1.1.0 -- Vercel CLI 32.4.1 +- Vercel CLI 32.5.0 ### Java | Version | Environment Variable | @@ -127,6 +127,7 @@ to accomplish this. | 8.0.382+5 | JAVA_HOME_8_X64 | | 11.0.20+1 (default) | JAVA_HOME_11_X64 | | 17.0.8+1 | JAVA_HOME_17_X64 | +| 21.0.0+35 | JAVA_HOME_21_X64 | ### PHP Tools - PHP: 8.1.2 @@ -157,13 +158,13 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.6.0 ### Browsers and Drivers -- Google Chrome 118.0.5993.70 +- Google Chrome 118.0.5993.88 - ChromeDriver 118.0.5993.70 - Chromium 118.0.5993.0 -- Microsoft Edge 118.0.2088.46 -- Microsoft Edge WebDriver 118.0.2088.46 +- Microsoft Edge 118.0.2088.61 +- Microsoft Edge WebDriver 118.0.2088.61 - Selenium server 4.14.0 -- Mozilla Firefox 118.0.2 +- Mozilla Firefox 119.0 - Geckodriver 0.33.0 #### Environment variables @@ -200,7 +201,7 @@ Use the following command as a part of your job to start the service: 'sudo syst #### MS SQL - sqlcmd 17.10.0001.1 -- SqlPackage 162.0.52.1 +- SqlPackage 162.1.167.1 ### Cached Tools @@ -237,7 +238,7 @@ Use the following command as a part of your job to start the service: 'sudo syst #### PowerShell Modules - Az: 9.3.0 - MarkdownPS: 1.9 -- Microsoft.Graph: 2.6.1 +- Microsoft.Graph: 2.8.0 - Pester: 5.5.0 - PSScriptAnalyzer: 1.21.0 @@ -248,20 +249,20 @@ Use the following command as a part of your job to start the service: 'sudo syst | nginx | 1.18.0 | /etc/nginx/nginx.conf | inactive | 80 | ### Android -| Package Name | Version | -| -------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 9.0 | -| Android Emulator | 32.1.15 | -| Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | -| Android SDK Platform-Tools | 34.0.4 | -| Android SDK Platforms | android-34 (rev 2)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | -| Android SDK Tools | 26.1.1 | -| Android Support Repository | 47.0.0 | -| CMake | 3.10.2<br>3.18.1<br>3.22.1 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 23.2.8568313<br>24.0.8215888<br>25.2.9519653 (default)<br>26.1.10909125 | -| SDK Patch Applier v4 | 1 | +| Package Name | Version | +| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 9.0 | +| Android Emulator | 32.1.15 | +| Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | +| Android SDK Platform-Tools | 34.0.5 | +| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34 (rev 2)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | +| Android SDK Tools | 26.1.1 | +| Android Support Repository | 47.0.0 | +| CMake | 3.10.2<br>3.18.1<br>3.22.1 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 23.2.8568313<br>24.0.8215888<br>25.2.9519653 (default)<br>26.1.10909125 | +| SDK Patch Applier v4 | 1 | #### Environment variables | Name | Value | @@ -283,15 +284,15 @@ Use the following command as a part of your job to start the service: 'sudo syst | buildpack-deps:buster | sha256:82e25c1dea159632964a4c576380aa6ae9fd1d28c42b1f967d5474167ee4f6a1 | 2023-10-12 | | debian:10 | sha256:853b9ec779e55f670cbdcb5e15bfb778b5be2c5c61fc8c655638b7a977d273c6 | 2023-10-11 | | debian:11 | sha256:c141beaa9e0767774221cc82efe3a6712a1cc4f75d2699334dfd9a28a6f7357b | 2023-10-11 | -| moby/buildkit:latest | sha256:890dcae054e3039f6c6b76bf0da80a130fa6e6bb1f3624063ef0210ac2c57b06 | 2023-08-24 | +| moby/buildkit:latest | sha256:d4187a7326f20d04fafd075f80ccc5d3f8cfd4f665c6e03d158a78e4f64bf3db | 2023-10-19 | | node:14 | sha256:a158d3b9b4e3fa813fa6c8c590b8f0a860e015ad4e59bbce5744d2f6fd8461aa | 2023-04-12 | | node:14-alpine | sha256:434215b487a329c9e867202ff89e704d3a75e554822e07f3e0c0f9e606121b33 | 2023-03-29 | | node:16 | sha256:f77a1aef2da8d83e45ec990f45df50f1a286c5fe8bbfb8c6e4246c6389705c0b | 2023-09-07 | | node:16-alpine | sha256:a1f9d027912b58a7c75be7716c97cfbc6d3099f3a97ed84aa490be9dee20e787 | 2023-08-10 | -| node:18 | sha256:d764525456dfe2f96a436ba00f864ee8ae3690bfb457c9f12a3a2a35b2d8be41 | 2023-10-16 | -| node:18-alpine | sha256:0fe7402d11d8c85474c6ec6f9c9c8048cd0549c95535832b7f0735a4b47690a5 | 2023-10-16 | -| node:20 | sha256:98f80754df0cf581de86a2cbbf85692cccde41916b35a97a1c84b0a971b8d578 | 2023-10-16 | -| node:20-alpine | sha256:a369136b6f7640f85acf300ce9d6498d8161972b855a72bbc79273150d4dd0c7 | 2023-10-16 | +| node:18 | sha256:a6385a6bb2fdcb7c48fc871e35e32af8daaa82c518900be49b76d10c005864c2 | 2023-10-18 | +| node:18-alpine | sha256:435dcad253bb5b7f347ebc69c8cc52de7c912eb7241098b920f2fc2d7843183d | 2023-10-18 | +| node:20 | sha256:bd20621deff56cb66c6cd10772d26db1a0d480f2b08609eb96b799ba6260f3ed | 2023-10-18 | +| node:20-alpine | sha256:002b6ee25b63b81dc4e47c9378ffe20915c3fa0e98e834c46584438468b1d0b5 | 2023-10-18 | | ubuntu:18.04 | sha256:152dc042452c496007f07ca9127571cb9c29697f42acbfad72324b2bb2e43c98 | 2023-05-30 | | ubuntu:20.04 | sha256:ed4a42283d9943135ed87d4ee34e542f7f5ad9ecf2f244870e23122f703f91c2 | 2023-10-03 | | ubuntu:22.04 | sha256:2b7412e6465c3c7fc5bb21d3e6f1917c167358449fecac8176c6e496e5c1f05f | 2023-10-05 | From 83cac0bd20863082415252ef42718d1d5f862226 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 26 Oct 2023 11:00:00 +0000 Subject: [PATCH 2379/3485] Updating readme file for win19 version 20231023.1.1 (#8644) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2019-Readme.md | 80 ++++++++++++++++---------------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index 515859ae7554..7ac8561a3a46 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -4,7 +4,7 @@ *** # Windows Server 2019 - OS Version: 10.0.17763 Build 4974 -- Image Version: 20231016.1.0 +- Image Version: 20231023.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -18,7 +18,7 @@ - Kotlin 1.9.10 - LLVM 16.0.6 - Node 18.18.2 -- Perl 5.38.0 +- Perl 5.32.1 - PHP 8.2.11 - Python 3.7.9 - Ruby 2.5.9p229 @@ -27,13 +27,13 @@ - Chocolatey 2.2.2 - Composer 2.6.5 - Helm 3.13.0 -- Miniconda 23.5.2 (pre-installed on the image but not added to PATH) +- Miniconda 23.9.0 (pre-installed on the image but not added to PATH) - NPM 9.8.1 - NuGet 6.7.0.127 -- pip 23.3 (python 3.7) -- Pipx 1.2.0 +- pip 23.3.1 (python 3.7) +- Pipx 1.2.1 - RubyGems 2.7.6.3 -- Vcpkg (build from commit e57b2167e) +- Vcpkg (build from commit 830f86fb3) - Yarn 1.22.19 #### Environment variables @@ -52,21 +52,21 @@ - 7zip 23.01 - aria2 1.36.0 - azcopy 10.21.0 -- Bazel 6.3.2 +- Bazel 6.4.0 - Bazelisk 1.18.0 - Bicep 0.22.6 - Cabal 3.10.1.0 -- CMake 3.26.4 -- CodeQL Action Bundle 2.15.0 +- CMake 3.27.7 +- CodeQL Action Bundle 2.15.1 - Docker 24.0.6 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.22.0 +- Docker Compose v2 2.23.0 - Docker-wincred 0.8.0 - ghc 9.8.1 - Git 2.42.0.windows.2 - Git LFS 3.4.0 -- Google Cloud CLI 450.0.0 -- ImageMagick 7.1.1-20 +- Google Cloud CLI 451.0.1 +- ImageMagick 7.1.1-21 - InnoSetup 6.2.2 - jq 1.7-dirty - Kind 0.20.0 @@ -80,7 +80,7 @@ - OpenSSL 1.1.1w - Packer 1.9.4 - Parcel 2.10.0 -- Pulumi 3.88.1 +- Pulumi 3.89.0 - R 4.3.1 - Service Fabric SDK 9.1.1436.9590 - Stack 2.13.1 @@ -93,14 +93,14 @@ - zstd 1.5.5 ### CLI Tools -- Alibaba Cloud CLI 3.0.183 -- AWS CLI 2.13.26 -- AWS SAM CLI 1.98.0 +- Alibaba Cloud CLI 3.0.184 +- AWS CLI 2.13.28 +- AWS SAM CLI 1.99.0 - AWS Session Manager CLI 1.2.497.0 - Azure CLI 2.53.0 - Azure DevOps CLI extension 0.26.0 - Cloud Foundry CLI 6.53.0 -- GitHub CLI 2.36.0 +- GitHub CLI 2.37.0 ### Rust Tools - Cargo 1.73.0 @@ -117,10 +117,10 @@ - Rustfmt 1.6.0 ### Browsers and Drivers -- Google Chrome 118.0.5993.71 +- Google Chrome 118.0.5993.89 - Chrome Driver 118.0.5993.70 -- Microsoft Edge 118.0.2088.46 -- Microsoft Edge Driver 118.0.2088.46 +- Microsoft Edge 118.0.2088.61 +- Microsoft Edge Driver 118.0.2088.61 - Mozilla Firefox 118.0.2 - Gecko Driver 0.33.0 - IE Driver 4.14.0.0 @@ -137,10 +137,10 @@ ### Java | Version | Environment Variable | | ------------------- | -------------------- | -| 8.0.382+5 (default) | JAVA_HOME_8_X64 | -| 11.0.20+101 | JAVA_HOME_11_X64 | +| 8.0.392+8 (default) | JAVA_HOME_8_X64 | +| 11.0.21+9 | JAVA_HOME_11_X64 | | 17.0.8+101 | JAVA_HOME_17_X64 | -| 21.0.0+35.0.LTS | JAVA_HOME_21_X64 | +| 21.0.0+35.0 | JAVA_HOME_21_X64 | ### Shells | Name | Target | @@ -219,7 +219,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Database tools - Azure CosmosDb Emulator 2.14.12.0 -- DacFx 162.0.52.1 +- DacFx 162.1.167.1 - MySQL 5.7.43.0 - SQL OLEDB Driver 18.6.7.0 - SQLPS 1.0 @@ -513,10 +513,10 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Az (Cached): 1.0.0.zip, 1.6.0.zip, 2.3.2.zip, 2.6.0.zip, 3.1.0.zip, 3.5.0.zip, 3.8.0.zip, 4.3.0.zip, 4.4.0.zip, 4.7.0.zip, 5.5.0.zip, 5.9.0.zip, 6.6.0.zip, 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.430 +- AWSPowershell: 4.1.435 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 -- Microsoft.Graph: 2.6.1 +- Microsoft.Graph: 2.8.0 - Pester: 3.4.0, 5.5.0 - PowerShellGet: 1.0.0.1, 2.2.5 - PSScriptAnalyzer: 1.21.0 @@ -530,20 +530,20 @@ All other versions are saved but not installed. ``` ### Android -| Package Name | Version | -| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | -| Android Command Line Tools | 8.0 | -| Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3<br>26.0.0 26.0.1 26.0.2 26.0.3<br>25.0.0 25.0.1 25.0.2 25.0.3<br>24.0.0 24.0.1 24.0.2 24.0.3<br>23.0.1 23.0.2 23.0.3<br>22.0.1<br>21.1.2<br>20.0.0<br>19.1.0 | -| Android SDK Platforms | android-34 (rev 2)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3)<br>android-26 (rev 2)<br>android-25 (rev 3)<br>android-24 (rev 2)<br>android-23 (rev 3)<br>android-22 (rev 2)<br>android-21 (rev 2)<br>android-20 (rev 2)<br>android-19 (rev 4) | -| Android SDK Platform-Tools | 34.0.5 | -| Android SDK Tools | 26.1.1 | -| Android Support Repository | 47.0.0 | -| CMake | 3.10.2<br>3.18.1<br>3.22.1 | -| Google APIs | addon-google_apis-google-21<br>addon-google_apis-google-22<br>addon-google_apis-google-23<br>addon-google_apis-google-24 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 23.2.8568313<br>24.0.8215888<br>25.2.9519653<br>26.1.10909125 | -| SDK Patch Applier v4 | 1 | +| Package Name | Version | +| -------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 8.0 | +| Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3<br>26.0.0 26.0.1 26.0.2 26.0.3<br>25.0.0 25.0.1 25.0.2 25.0.3<br>24.0.0 24.0.1 24.0.2 24.0.3<br>23.0.1 23.0.2 23.0.3<br>22.0.1<br>21.1.2<br>20.0.0<br>19.1.0 | +| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34 (rev 2)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3)<br>android-26 (rev 2)<br>android-25 (rev 3)<br>android-24 (rev 2)<br>android-23 (rev 3)<br>android-22 (rev 2)<br>android-21 (rev 2)<br>android-20 (rev 2)<br>android-19 (rev 4) | +| Android SDK Platform-Tools | 34.0.5 | +| Android SDK Tools | 26.1.1 | +| Android Support Repository | 47.0.0 | +| CMake | 3.10.2<br>3.18.1<br>3.22.1 | +| Google APIs | addon-google_apis-google-21<br>addon-google_apis-google-22<br>addon-google_apis-google-23<br>addon-google_apis-google-24 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 23.2.8568313<br>24.0.8215888<br>25.2.9519653<br>26.1.10909125 | +| SDK Patch Applier v4 | 1 | #### Environment variables | Name | Value | From 7ca7296ba50a2dddcb8a1e29e5e243772c358d2b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 26 Oct 2023 11:19:22 +0000 Subject: [PATCH 2380/3485] Updating readme file for win22 version 20231023.1.1 (#8643) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2022-Readme.md | 76 ++++++++++++++++---------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/images/win/Windows2022-Readme.md b/images/win/Windows2022-Readme.md index 4762002333c7..01b9a05cee3d 100644 --- a/images/win/Windows2022-Readme.md +++ b/images/win/Windows2022-Readme.md @@ -4,7 +4,7 @@ *** # Windows Server 2022 - OS Version: 10.0.20348 Build 2031 -- Image Version: 20231016.1.0 +- Image Version: 20231023.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -18,7 +18,7 @@ - Kotlin 1.9.10 - LLVM 16.0.6 - Node 18.18.2 -- Perl 5.38.0 +- Perl 5.32.1 - PHP 8.2.11 - Python 3.9.13 - Ruby 3.0.6p216 @@ -27,13 +27,13 @@ - Chocolatey 2.2.2 - Composer 2.6.5 - Helm 3.13.0 -- Miniconda 23.5.2 (pre-installed on the image but not added to PATH) +- Miniconda 23.9.0 (pre-installed on the image but not added to PATH) - NPM 9.8.1 - NuGet 6.7.0.127 -- pip 23.3 (python 3.9) -- Pipx 1.2.0 +- pip 23.3.1 (python 3.9) +- Pipx 1.2.1 - RubyGems 3.2.33 -- Vcpkg (build from commit e57b2167e) +- Vcpkg (build from commit 830f86fb3) - Yarn 1.22.19 #### Environment variables @@ -52,20 +52,20 @@ - 7zip 23.01 - aria2 1.36.0 - azcopy 10.21.0 -- Bazel 6.3.2 +- Bazel 6.4.0 - Bazelisk 1.18.0 - Bicep 0.22.6 - Cabal 3.10.1.0 -- CMake 3.26.4 -- CodeQL Action Bundle 2.15.0 +- CMake 3.27.7 +- CodeQL Action Bundle 2.15.1 - Docker 24.0.6 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.22.0 +- Docker Compose v2 2.23.0 - Docker-wincred 0.8.0 - ghc 9.8.1 - Git 2.42.0.windows.2 - Git LFS 3.4.0 -- ImageMagick 7.1.1-20 +- ImageMagick 7.1.1-21 - InnoSetup 6.2.2 - jq 1.7-dirty - Kind 0.20.0 @@ -78,7 +78,7 @@ - NSIS 3.08 - OpenSSL 1.1.1w - Packer 1.9.4 -- Pulumi 3.88.1 +- Pulumi 3.89.0 - R 4.3.1 - Service Fabric SDK 9.1.1436.9590 - Stack 2.13.1 @@ -91,13 +91,13 @@ - zstd 1.5.5 ### CLI Tools -- Alibaba Cloud CLI 3.0.183 -- AWS CLI 2.13.26 -- AWS SAM CLI 1.98.0 +- Alibaba Cloud CLI 3.0.184 +- AWS CLI 2.13.28 +- AWS SAM CLI 1.99.0 - AWS Session Manager CLI 1.2.497.0 - Azure CLI 2.53.0 - Azure DevOps CLI extension 0.26.0 -- GitHub CLI 2.36.0 +- GitHub CLI 2.37.0 ### Rust Tools - Cargo 1.73.0 @@ -114,10 +114,10 @@ - Rustfmt 1.6.0 ### Browsers and Drivers -- Google Chrome 118.0.5993.71 +- Google Chrome 118.0.5993.89 - Chrome Driver 118.0.5993.70 -- Microsoft Edge 118.0.2088.46 -- Microsoft Edge Driver 118.0.2088.46 +- Microsoft Edge 118.0.2088.61 +- Microsoft Edge Driver 118.0.2088.61 - Mozilla Firefox 118.0.2 - Gecko Driver 0.33.0 - IE Driver 4.14.0.0 @@ -134,10 +134,10 @@ ### Java | Version | Environment Variable | | ------------------- | -------------------- | -| 8.0.382+5 (default) | JAVA_HOME_8_X64 | -| 11.0.20+101 | JAVA_HOME_11_X64 | +| 8.0.392+8 (default) | JAVA_HOME_8_X64 | +| 11.0.21+9 | JAVA_HOME_11_X64 | | 17.0.8+101 | JAVA_HOME_17_X64 | -| 21.0.0+35.0.LTS | JAVA_HOME_21_X64 | +| 21.0.0+35.0 | JAVA_HOME_21_X64 | ### Shells | Name | Target | @@ -210,7 +210,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Database tools - Azure CosmosDb Emulator 2.14.12.0 -- DacFx 162.0.52.1 +- DacFx 162.1.167.1 - MySQL 8.0.34.0 - SQL OLEDB Driver 18.6.7.0 - SQLPS 1.0 @@ -572,10 +572,10 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Az (Cached): 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.430 +- AWSPowershell: 4.1.435 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 -- Microsoft.Graph: 2.6.1 +- Microsoft.Graph: 2.8.0 - Pester: 3.4.0, 5.5.0 - PowerShellGet: 1.0.0.1, 2.2.5 - PSScriptAnalyzer: 1.21.0 @@ -589,19 +589,19 @@ All other versions are saved but not installed. ``` ### Android -| Package Name | Version | -| -------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 8.0 | -| Android Emulator | 31.2.9 | -| Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | -| Android SDK Platforms | android-34 (rev 2)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | -| Android SDK Platform-Tools | 34.0.5 | -| Android Support Repository | 47.0.0 | -| CMake | 3.18.1<br>3.22.1 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 23.2.8568313<br>24.0.8215888<br>25.2.9519653<br>26.1.10909125 | -| SDK Patch Applier v4 | 1 | +| Package Name | Version | +| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 8.0 | +| Android Emulator | 31.2.9 | +| Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | +| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34 (rev 2)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | +| Android SDK Platform-Tools | 34.0.5 | +| Android Support Repository | 47.0.0 | +| CMake | 3.18.1<br>3.22.1 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 23.2.8568313<br>24.0.8215888<br>25.2.9519653<br>26.1.10909125 | +| SDK Patch Applier v4 | 1 | #### Environment variables | Name | Value | From 883df0594b07186e80a09fe1820bf7ffdd2288ce Mon Sep 17 00:00:00 2001 From: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com> Date: Thu, 26 Oct 2023 15:17:57 +0200 Subject: [PATCH 2381/3485] [macos] simplify "brew_smart_install" helper (#8639) * [macos] homebrew: use hardcoded condition for jq installation we cannot use "jq" if we are asked to install "jq" * [macos] always use "brew install" * [macos] add retries to "get_github_package_download_url" helper * [macos] add retries to chrome install script * [macos] add retries to OpenJDK install script * [macos] add retries to miniconda installer * Update images/macos/provision/core/openjdk.sh Co-authored-by: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> * fix copy-paste error * Update images/macos/provision/core/openjdk.sh Co-authored-by: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> * Update images/macos/provision/core/openjdk.sh Co-authored-by: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> --------- Co-authored-by: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> --- images/macos/provision/core/chrome.sh | 3 +- images/macos/provision/core/miniconda.sh | 10 +- images/macos/provision/core/openjdk.sh | 6 +- images/macos/provision/utils/utils.sh | 125 ++++++++--------------- 4 files changed, 55 insertions(+), 89 deletions(-) diff --git a/images/macos/provision/core/chrome.sh b/images/macos/provision/core/chrome.sh index 84692abcc11b..53cae0a204fa 100644 --- a/images/macos/provision/core/chrome.sh +++ b/images/macos/provision/core/chrome.sh @@ -14,7 +14,8 @@ echo "Google Chrome version is $FULL_CHROME_VERSION" # Get Google Chrome versions information CHROME_PLATFORM="mac-$arch" CHROME_VERSIONS_URL="https://googlechromelabs.github.io/chrome-for-testing/latest-patch-versions-per-build-with-downloads.json" -CHROME_VERSIONS_JSON=$(curl -fsSL "${CHROME_VERSIONS_URL}") +download_with_retries "$CHROME_VERSIONS_URL" "/tmp" "latest-patch-versions-per-build-with-downloads.json" +CHROME_VERSIONS_JSON=$(cat /tmp/latest-patch-versions-per-build-with-downloads.json) # Download and unpack the latest release of Chrome Driver CHROMEDRIVER_VERSION=$(echo "${CHROME_VERSIONS_JSON}" | jq -r '.builds["'"$CHROME_VERSION"'"].version') diff --git a/images/macos/provision/core/miniconda.sh b/images/macos/provision/core/miniconda.sh index b680dd42b860..7a781b7cf1ae 100644 --- a/images/macos/provision/core/miniconda.sh +++ b/images/macos/provision/core/miniconda.sh @@ -1,9 +1,11 @@ #!/bin/bash -e -o pipefail -MINICONDA_INSTALLER="/tmp/miniconda.sh" -curl -fsSL https://repo.anaconda.com/miniconda/Miniconda3-latest-MacOSX-x86_64.sh -o $MINICONDA_INSTALLER -chmod +x $MINICONDA_INSTALLER -sudo $MINICONDA_INSTALLER -b -p /usr/local/miniconda +source ~/utils/utils.sh + +download_with_retries "https://repo.anaconda.com/miniconda/Miniconda3-latest-MacOSX-x86_64.sh" "/tmp" "miniconda.sh" + +chmod +x /tmp/miniconda.sh +sudo /tmp/miniconda.sh -b -p /usr/local/miniconda # Chmod with full permissions recursively to avoid permissions restrictions sudo chmod -R 777 /usr/local/miniconda diff --git a/images/macos/provision/core/openjdk.sh b/images/macos/provision/core/openjdk.sh index dbbc1c6299e0..bf55493ce6f7 100755 --- a/images/macos/provision/core/openjdk.sh +++ b/images/macos/provision/core/openjdk.sh @@ -29,12 +29,12 @@ installOpenJDK() { local JAVA_VERSION=$1 # Get link for Java binaries and Java version - assetUrl=$(curl -fsSL "https://api.adoptium.net/v3/assets/latest/${JAVA_VERSION}/hotspot") + download_with_retries "https://api.adoptium.net/v3/assets/latest/${JAVA_VERSION}/hotspot" "/tmp" "openjdk-hotspot.json" if [[ $arch == "arm64" ]]; then - asset=$(echo ${assetUrl} | jq -r '.[] | select(.binary.os=="mac" and .binary.image_type=="jdk" and .binary.architecture=="aarch64")') + asset=$(jq -r '.[] | select(.binary.os=="mac" and .binary.image_type=="jdk" and .binary.architecture=="aarch64")' /tmp/openjdk-hotspot.json) else - asset=$(echo ${assetUrl} | jq -r '.[] | select(.binary.os=="mac" and .binary.image_type=="jdk" and .binary.architecture=="x64")') + asset=$(jq -r '.[] | select(.binary.os=="mac" and .binary.image_type=="jdk" and .binary.architecture=="x64")' /tmp/openjdk-hotspot.json) fi archivePath=$(echo ${asset} | jq -r '.binary.package.link') diff --git a/images/macos/provision/utils/utils.sh b/images/macos/provision/utils/utils.sh index 35daaef22fae..04d9eec3f5bf 100755 --- a/images/macos/provision/utils/utils.sh +++ b/images/macos/provision/utils/utils.sh @@ -127,98 +127,50 @@ get_brew_os_keyword() { fi } -should_build_from_source() { - local tool_name=$1 - local os_name=$2 - # If one of the parsers aborts with an error, - # we will get an empty variable notification in the logs - set -u - - # Geting tool info from brew to find available install methods except build from source - local tool_info=$(brew info --json=v1 $tool_name) - - # No need to build from source if a bottle is disabled - local bottle_disabled=$(echo -E $tool_info | jq ".[0].bottle_disabled") - if [[ $bottle_disabled == "true" ]]; then - echo "false" - return - fi - - # No need to build from source if a universal bottle is available - local all_bottle=$(echo -E $tool_info | jq ".[0].bottle.stable.files.all") - if [[ "$all_bottle" != "null" ]]; then - echo "false" - return - fi - - # No need to build from source if a bottle for current OS is available - local os_bottle=$(echo -E $tool_info | jq ".[0].bottle.stable.files.$os_name") - if [[ "$os_bottle" != "null" ]]; then - echo "false" - return - fi - - # Available method wasn't found - should build from source - echo "true" -} - # brew provides package bottles for different macOS versions # The 'brew install' command will fail if a package bottle does not exist # Use the '--build-from-source' option to build from source in this case brew_smart_install() { local tool_name=$1 - local os_name=$(get_brew_os_keyword) - if [[ "$os_name" == "null" ]]; then - echo "$OSTYPE is unknown operating system" - exit 1 - fi + echo "Downloading $tool_name..." - local build_from_source=$(should_build_from_source "$tool_name" "$os_name") - if $build_from_source; then - echo "Bottle of the $tool_name for the $os_name was not found. Building $tool_name from source..." - brew install --build-from-source $tool_name - else - echo "Downloading $tool_name..." + # get deps & cache em + + failed=true + for i in {1..10}; do + brew deps $tool_name > /tmp/$tool_name && failed=false || sleep 60 + [ "$failed" = false ] && break + done - # get deps & cache em + if [ "$failed" = true ]; then + echo "Failed: brew deps $tool_name" + exit 1; + fi - failed=true - for i in {1..10}; do - brew deps $tool_name > /tmp/$tool_name && failed=false || sleep 60 - [ "$failed" = false ] && break - done + for dep in $(cat /tmp/$tool_name) $tool_name; do - if [ "$failed" = true ]; then - echo "Failed: brew deps $tool_name" - exit 1; - fi + failed=true + for i in {1..10}; do + brew --cache $dep >/dev/null && failed=false || sleep 60 + [ "$failed" = false ] && break + done - for dep in $(cat /tmp/$tool_name) $tool_name; do - - failed=true - for i in {1..10}; do - brew --cache $dep >/dev/null && failed=false || sleep 60 - [ "$failed" = false ] && break - done - - if [ "$failed" = true ]; then - echo "Failed: brew --cache $dep" - exit 1; - fi - done - - failed=true - for i in {1..10}; do - brew install $tool_name >/dev/null && failed=false || sleep 60 - [ "$failed" = false ] && break - done - - if [ "$failed" = true ]; then - echo "Failed: brew install $tool_name" - exit 1; - fi + if [ "$failed" = true ]; then + echo "Failed: brew --cache $dep" + exit 1; + fi + done + failed=true + for i in {1..10}; do + brew install $tool_name >/dev/null && failed=false || sleep 60 + [ "$failed" = false ] && break + done + + if [ "$failed" = true ]; then + echo "Failed: brew install $tool_name" + exit 1; fi } @@ -247,7 +199,18 @@ get_github_package_download_url() { [ -n "$API_PAT" ] && authString=(-H "Authorization: token ${API_PAT}") - json=$(curl "${authString[@]}" -fsSL "https://api.github.com/repos/${REPO_ORG}/releases?per_page=${SEARCH_IN_COUNT}") + failed=true + for i in {1..10}; do + curl "${authString[@]}" -fsSL "https://api.github.com/repos/${REPO_ORG}/releases?per_page=${SEARCH_IN_COUNT}" >/tmp/get_github_package_download_url.json && failed=false || sleep 60 + [ "$failed" = false ] && break + done + + if [ "$failed" = true ]; then + echo "Failed: get_github_package_download_url" + exit 1; + fi + + json=$(cat /tmp/get_github_package_download_url.json) if [[ "$VERSION" == "latest" ]]; then tagName=$(echo $json | jq -r '.[] | select((.prerelease==false) and (.assets | length > 0)).tag_name' | sort --unique --version-sort | egrep -v ".*-[a-z]" | tail -1) From 470e6967e695c2bb6435f13938be9f9eb7d2d737 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 26 Oct 2023 18:53:04 +0000 Subject: [PATCH 2382/3485] Updating readme file for ubuntu22 version 20231025.1.1 (#8663) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2204-Readme.md | 54 ++++++++++++++----------------- 1 file changed, 25 insertions(+), 29 deletions(-) diff --git a/images/linux/Ubuntu2204-Readme.md b/images/linux/Ubuntu2204-Readme.md index bd9d8ebb9f7a..fd4e28e9ac86 100644 --- a/images/linux/Ubuntu2204-Readme.md +++ b/images/linux/Ubuntu2204-Readme.md @@ -1,11 +1,7 @@ -| Announcements | -|-| -| [[All OS] Android NDK r23 will be removed from images on October 9](https://github.com/actions/runner-images/issues/8383) | -*** # Ubuntu 22.04 - OS Version: 22.04.3 LTS - Kernel Version: 6.2.0-1015-azure -- Image Version: 20231022.1.0 +- Image Version: 20231025.1.0 - Systemd version: 249.11-0ubuntu3.10 ## Installed Software @@ -31,15 +27,15 @@ ### Package Management - cpan 1.64 - Helm 3.13.1 -- Homebrew 4.1.16 +- Homebrew 4.1.17 - Miniconda 23.9.0 - Npm 9.8.1 - NuGet 6.6.1.2 - Pip 22.0.2 - Pip3 22.0.2 -- Pipx 1.2.0 +- Pipx 1.2.1 - RubyGems 3.3.5 -- Vcpkg (build from commit 830f86fb3) +- Vcpkg (build from commit 213c01f87) - Yarn 1.22.19 #### Environment variables @@ -63,7 +59,7 @@ to accomplish this. ### Tools - Ansible 2.15.5 - apt-fast 1.9.12 -- AzCopy 10.21.0 - available by `azcopy` and `azcopy10` aliases +- AzCopy 10.21.1 - available by `azcopy` and `azcopy10` aliases - Bazel 6.4.0 - Bazelisk 1.18.0 - Bicep 0.22.6 @@ -81,7 +77,7 @@ to accomplish this. - Git LFS 3.4.0 - Git-ftp 1.6.0 - Haveged 1.9.14 -- Heroku 8.6.0 +- Heroku 8.7.0 - jq 1.6 - Kind 0.20.0 - Kubectl 1.28.3 @@ -93,11 +89,11 @@ to accomplish this. - n 9.2.0 - Newman 6.0.0 - nvm 0.39.5 -- OpenSSL 3.0.2-0ubuntu1.10 +- OpenSSL 3.0.2-0ubuntu1.12 - Packer 1.9.4 -- Parcel 2.10.0 +- Parcel 2.10.1 - Podman 3.4.4 -- Pulumi 3.89.0 +- Pulumi 3.90.1 - R 4.3.1 - Skopeo 1.4.1 - Sphinx Open Source Search Server 2.2.11 @@ -109,15 +105,15 @@ to accomplish this. ### CLI Tools - Alibaba Cloud CLI 3.0.184 -- AWS CLI 2.13.28 +- AWS CLI 2.13.29 - AWS CLI Session Manager Plugin 1.2.497.0 - AWS SAM CLI 1.99.0 -- Azure CLI 2.53.0 +- Azure CLI 2.53.1 - Azure CLI (azure-devops) 0.26.0 - GitHub CLI 2.37.0 -- Google Cloud CLI 451.0.1 -- Netlify CLI 16.9.1 -- OpenShift CLI 4.13.17 +- Google Cloud CLI 452.0.0 +- Netlify CLI 16.9.2 +- OpenShift CLI 4.13.18 - ORAS CLI 1.1.0 - Vercel CLI 32.5.0 @@ -151,18 +147,18 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. #### Packages - Bindgen 0.68.1 -- Cargo audit 0.18.2 +- Cargo audit 0.18.3 - Cargo clippy 0.1.73 - Cargo outdated 0.13.1 - Cbindgen 0.26.0 - Rustfmt 1.6.0 ### Browsers and Drivers -- Google Chrome 118.0.5993.88 +- Google Chrome 118.0.5993.117 - ChromeDriver 118.0.5993.70 - Chromium 118.0.5993.0 -- Microsoft Edge 118.0.2088.61 -- Microsoft Edge WebDriver 118.0.2088.61 +- Microsoft Edge 118.0.2088.69 +- Microsoft Edge WebDriver 118.0.2088.69 - Selenium server 4.14.0 - Mozilla Firefox 119.0 - Geckodriver 0.33.0 @@ -176,7 +172,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | ### .NET Tools -- .NET Core SDK: 6.0.415, 7.0.112, 7.0.203, 7.0.309, 7.0.402 +- .NET Core SDK: 6.0.416, 7.0.113, 7.0.203, 7.0.310, 7.0.403 - nbgv 3.6.133+2d32d93cb1 ### Databases @@ -214,7 +210,7 @@ Use the following command as a part of your job to start the service: 'sudo syst - 14.21.3 - 16.20.2 - 18.18.2 -- 20.8.1 +- 20.9.0 #### Python - 3.7.17 @@ -222,6 +218,7 @@ Use the following command as a part of your job to start the service: 'sudo syst - 3.9.18 - 3.10.13 - 3.11.6 +- 3.12.0 #### PyPy - 3.7.13 [PyPy 7.3.9] @@ -291,8 +288,8 @@ Use the following command as a part of your job to start the service: 'sudo syst | node:16-alpine | sha256:a1f9d027912b58a7c75be7716c97cfbc6d3099f3a97ed84aa490be9dee20e787 | 2023-08-10 | | node:18 | sha256:a6385a6bb2fdcb7c48fc871e35e32af8daaa82c518900be49b76d10c005864c2 | 2023-10-18 | | node:18-alpine | sha256:435dcad253bb5b7f347ebc69c8cc52de7c912eb7241098b920f2fc2d7843183d | 2023-10-18 | -| node:20 | sha256:bd20621deff56cb66c6cd10772d26db1a0d480f2b08609eb96b799ba6260f3ed | 2023-10-18 | -| node:20-alpine | sha256:002b6ee25b63b81dc4e47c9378ffe20915c3fa0e98e834c46584438468b1d0b5 | 2023-10-18 | +| node:20 | sha256:178f3b2d431a28b6df273ca5d169435850f1072745fff3f9b81000cc44daf500 | 2023-10-25 | +| node:20-alpine | sha256:4df6c64a9bc595ea1eb3782b909d257cd53300822f53d11f1a221a00cd61e983 | 2023-10-25 | | ubuntu:18.04 | sha256:152dc042452c496007f07ca9127571cb9c29697f42acbfad72324b2bb2e43c98 | 2023-05-30 | | ubuntu:20.04 | sha256:ed4a42283d9943135ed87d4ee34e542f7f5ad9ecf2f244870e23122f703f91c2 | 2023-10-03 | | ubuntu:22.04 | sha256:2b7412e6465c3c7fc5bb21d3e6f1917c167358449fecac8176c6e496e5c1f05f | 2023-10-05 | @@ -341,7 +338,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | libmagickwand-dev | 8:6.9.11.60+dfsg-1.3ubuntu0.22.04.3 | | libsecret-1-dev | 0.20.5-2 | | libsqlite3-dev | 3.37.2-2ubuntu0.1 | -| libssl-dev | 3.0.2-0ubuntu1.10 | +| libssl-dev | 3.0.2-0ubuntu1.12 | | libtool | 2.4.6-15build2 | | libunwind8 | 1.3.2-2build2.1 | | libxkbfile-dev | 1:1.1.0-1build3 | @@ -385,8 +382,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | upx | 3.96-3 | | wget | 1.21.2-2ubuntu1 | | xorriso | 1.5.4-2 | -| xvfb | 2:21.1.4-2ubuntu1.7\~22.04.1 | +| xvfb | 2:21.1.4-2ubuntu1.7\~22.04.2 | | xz-utils | 5.2.5-2ubuntu1 | | zip | 3.0-12build2 | | zsync | 0.6.2-3ubuntu1 | - From 49cf80684ef7504d1bff17c5014196f360e05c02 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 26 Oct 2023 18:59:36 +0000 Subject: [PATCH 2383/3485] Updating readme file for ubuntu20 version 20231025.1.1 (#8664) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2004-Readme.md | 52 ++++++++++++++----------------- 1 file changed, 24 insertions(+), 28 deletions(-) diff --git a/images/linux/Ubuntu2004-Readme.md b/images/linux/Ubuntu2004-Readme.md index 8b911d14869b..ba6f06b1cf3c 100644 --- a/images/linux/Ubuntu2004-Readme.md +++ b/images/linux/Ubuntu2004-Readme.md @@ -1,11 +1,7 @@ -| Announcements | -|-| -| [[All OS] Android NDK r23 will be removed from images on October 9](https://github.com/actions/runner-images/issues/8383) | -*** # Ubuntu 20.04 - OS Version: 20.04.6 LTS - Kernel Version: 5.15.0-1050-azure -- Image Version: 20231022.1.0 +- Image Version: 20231025.1.0 - Systemd version: 245.4-4ubuntu3.22 ## Installed Software @@ -33,15 +29,15 @@ ### Package Management - cpan 1.64 - Helm 3.13.1 -- Homebrew 4.1.16 +- Homebrew 4.1.17 - Miniconda 23.9.0 - Npm 9.8.1 - NuGet 6.6.1.2 - Pip 20.0.2 - Pip3 20.0.2 -- Pipx 1.2.0 +- Pipx 1.2.1 - RubyGems 3.1.2 -- Vcpkg (build from commit 830f86fb3) +- Vcpkg (build from commit 213c01f87) - Yarn 1.22.19 #### Environment variables @@ -63,12 +59,12 @@ to accomplish this. - Gradle 8.4 - Lerna 7.4.1 - Maven 3.8.8 -- Sbt 1.9.6 +- Sbt 1.9.7 ### Tools - Ansible 2.13.13 - apt-fast 1.9.12 -- AzCopy 10.21.0 - available by `azcopy` and `azcopy10` aliases +- AzCopy 10.21.1 - available by `azcopy` and `azcopy10` aliases - Bazel 6.4.0 - Bazelisk 1.18.0 - Bicep 0.22.6 @@ -86,7 +82,7 @@ to accomplish this. - Git LFS 3.4.0 - Git-ftp 1.6.0 - Haveged 1.9.1 -- Heroku 8.6.0 +- Heroku 8.7.0 - HHVM (HipHop VM) 4.172.1 - jq 1.6 - Kind 0.20.0 @@ -99,12 +95,12 @@ to accomplish this. - n 9.2.0 - Newman 6.0.0 - nvm 0.39.5 -- OpenSSL 1.1.1f-1ubuntu2.19 +- OpenSSL 1.1.1f-1ubuntu2.20 - Packer 1.9.4 -- Parcel 2.10.0 +- Parcel 2.10.1 - PhantomJS 2.1.1 2.1.1 - Podman 3.4.2 -- Pulumi 3.89.0 +- Pulumi 3.90.1 - R 4.3.1 - Skopeo 1.5.0 - Sphinx Open Source Search Server 2.2.11 @@ -116,15 +112,15 @@ to accomplish this. ### CLI Tools - Alibaba Cloud CLI 3.0.174 -- AWS CLI 2.13.28 +- AWS CLI 2.13.29 - AWS CLI Session Manager Plugin 1.2.497.0 - AWS SAM CLI 1.99.0 -- Azure CLI 2.53.0 +- Azure CLI 2.53.1 - Azure CLI (azure-devops) 0.26.0 - GitHub CLI 2.37.0 -- Google Cloud CLI 451.0.1 -- Netlify CLI 16.9.1 -- OpenShift CLI 4.13.17 +- Google Cloud CLI 452.0.0 +- Netlify CLI 16.9.2 +- OpenShift CLI 4.13.18 - ORAS CLI 1.1.0 - Vercel CLI 32.5.0 @@ -158,17 +154,17 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. #### Packages - Bindgen 0.68.1 -- Cargo audit 0.18.2 +- Cargo audit 0.18.3 - Cargo clippy 0.1.73 - Cargo outdated 0.13.1 - Cbindgen 0.26.0 - Rustfmt 1.6.0 ### Browsers and Drivers -- Google Chrome 118.0.5993.88 +- Google Chrome 118.0.5993.117 - ChromeDriver 118.0.5993.70 - Chromium 118.0.5993.0 -- Microsoft Edge 118.0.2088.61 +- Microsoft Edge 118.0.2088.69 - Microsoft Edge WebDriver 118.0.2088.61 - Selenium server 4.14.0 - Mozilla Firefox 119.0 @@ -183,7 +179,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | ### .NET Tools -- .NET Core SDK: 6.0.415, 7.0.112, 7.0.203, 7.0.309, 7.0.402 +- .NET Core SDK: 6.0.416, 7.0.113, 7.0.203, 7.0.310, 7.0.403 - nbgv 3.6.133+2d32d93cb1 ### Databases @@ -222,7 +218,7 @@ Use the following command as a part of your job to start the service: 'sudo syst - 14.21.3 - 16.20.2 - 18.18.2 -- 20.8.1 +- 20.9.0 #### Python - 3.7.17 @@ -230,6 +226,7 @@ Use the following command as a part of your job to start the service: 'sudo syst - 3.9.18 - 3.10.13 - 3.11.6 +- 3.12.0 #### PyPy - 2.7.18 [PyPy 7.3.13] @@ -309,8 +306,8 @@ Use the following command as a part of your job to start the service: 'sudo syst | node:16-alpine | sha256:a1f9d027912b58a7c75be7716c97cfbc6d3099f3a97ed84aa490be9dee20e787 | 2023-08-10 | | node:18 | sha256:a6385a6bb2fdcb7c48fc871e35e32af8daaa82c518900be49b76d10c005864c2 | 2023-10-18 | | node:18-alpine | sha256:435dcad253bb5b7f347ebc69c8cc52de7c912eb7241098b920f2fc2d7843183d | 2023-10-18 | -| node:20 | sha256:bd20621deff56cb66c6cd10772d26db1a0d480f2b08609eb96b799ba6260f3ed | 2023-10-18 | -| node:20-alpine | sha256:002b6ee25b63b81dc4e47c9378ffe20915c3fa0e98e834c46584438468b1d0b5 | 2023-10-18 | +| node:20 | sha256:178f3b2d431a28b6df273ca5d169435850f1072745fff3f9b81000cc44daf500 | 2023-10-25 | +| node:20-alpine | sha256:4df6c64a9bc595ea1eb3782b909d257cd53300822f53d11f1a221a00cd61e983 | 2023-10-25 | | ubuntu:16.04 | sha256:1f1a2d56de1d604801a9671f301190704c25d604a416f59e03c04f5c6ffee0d6 | 2021-08-31 | | ubuntu:18.04 | sha256:152dc042452c496007f07ca9127571cb9c29697f42acbfad72324b2bb2e43c98 | 2023-05-30 | | ubuntu:20.04 | sha256:ed4a42283d9943135ed87d4ee34e542f7f5ad9ecf2f244870e23122f703f91c2 | 2023-10-03 | @@ -401,8 +398,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | upx | 3.95-2build1 | | wget | 1.20.3-1ubuntu2 | | xorriso | 1.5.2-1 | -| xvfb | 2:1.20.13-1ubuntu1\~20.04.8 | +| xvfb | 2:1.20.13-1ubuntu1\~20.04.9 | | xz-utils | 5.2.4-1ubuntu1.1 | | zip | 3.0-11build1 | | zsync | 0.6.2-3ubuntu1 | - From bc078d123222fe7a096d99a5c9d1b988b583cd8a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 26 Oct 2023 22:39:05 +0000 Subject: [PATCH 2384/3485] Updating readme file for win22 version 20231024.1.1 (#8668) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2022-Readme.md | 43 ++++++++++++++------------------ 1 file changed, 19 insertions(+), 24 deletions(-) diff --git a/images/win/Windows2022-Readme.md b/images/win/Windows2022-Readme.md index 01b9a05cee3d..c8f8d5778158 100644 --- a/images/win/Windows2022-Readme.md +++ b/images/win/Windows2022-Readme.md @@ -1,10 +1,6 @@ -| Announcements | -|-| -| [[All OS] Android NDK r23 will be removed from images on October 9](https://github.com/actions/runner-images/issues/8383) | -*** # Windows Server 2022 - OS Version: 10.0.20348 Build 2031 -- Image Version: 20231023.1.0 +- Image Version: 20231024.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -33,7 +29,7 @@ - pip 23.3.1 (python 3.9) - Pipx 1.2.1 - RubyGems 3.2.33 -- Vcpkg (build from commit 830f86fb3) +- Vcpkg (build from commit 7a6f366ce) - Yarn 1.22.19 #### Environment variables @@ -46,7 +42,7 @@ - Ant 1.10.14 - Gradle 8.4 - Maven 3.8.7 -- sbt 1.9.6 +- sbt 1.9.7 ### Tools - 7zip 23.01 @@ -78,7 +74,7 @@ - NSIS 3.08 - OpenSSL 1.1.1w - Packer 1.9.4 -- Pulumi 3.89.0 +- Pulumi 3.90.0 - R 4.3.1 - Service Fabric SDK 9.1.1436.9590 - Stack 2.13.1 @@ -95,7 +91,7 @@ - AWS CLI 2.13.28 - AWS SAM CLI 1.99.0 - AWS Session Manager CLI 1.2.497.0 -- Azure CLI 2.53.0 +- Azure CLI 2.53.1 - Azure DevOps CLI extension 0.26.0 - GitHub CLI 2.37.0 @@ -107,18 +103,18 @@ #### Packages - bindgen 0.68.1 -- cargo-audit 0.18.2 +- cargo-audit 0.18.3 - cargo-outdated 0.13.1 - cbindgen 0.26.0 - Clippy 0.1.73 - Rustfmt 1.6.0 ### Browsers and Drivers -- Google Chrome 118.0.5993.89 +- Google Chrome 118.0.5993.118 - Chrome Driver 118.0.5993.70 - Microsoft Edge 118.0.2088.61 - Microsoft Edge Driver 118.0.2088.61 -- Mozilla Firefox 118.0.2 +- Mozilla Firefox 119.0 - Gecko Driver 0.33.0 - IE Driver 4.14.0.0 - Selenium server 4.14.0 @@ -222,9 +218,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Nginx | 1.25.2 | C:\tools\nginx-1.25.2\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2022 -| Name | Version | Path | -| ----------------------------- | -------------- | -------------------------------------------------------- | -| Visual Studio Enterprise 2022 | 17.7.34202.233 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | +| Name | Version | Path | +| ----------------------------- | ------------- | -------------------------------------------------------- | +| Visual Studio Enterprise 2022 | 17.7.34221.43 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | #### Workloads, components and extensions | Package | Version | @@ -301,9 +297,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | microsoft.net.runtime.mono.tooling.net6 | 7.0.1223.47720 | | microsoft.net.sdk.emscripten.net7 | 7.0.8.43102 | | Microsoft.NetCore.Component.DevelopmentTools | 17.7.33905.399 | -| Microsoft.NetCore.Component.Runtime.6.0 | 17.7.34202.233 | -| Microsoft.NetCore.Component.Runtime.7.0 | 17.7.34202.233 | -| Microsoft.NetCore.Component.SDK | 17.7.34202.233 | +| Microsoft.NetCore.Component.Runtime.6.0 | 17.7.34221.43 | +| Microsoft.NetCore.Component.Runtime.7.0 | 17.7.34221.43 | +| Microsoft.NetCore.Component.SDK | 17.7.34221.43 | | Microsoft.NetCore.Component.Web | 17.7.33905.399 | | Microsoft.VisualStudio.Component.AppInsights.Tools | 17.7.33905.399 | | Microsoft.VisualStudio.Component.AspNet | 17.7.33905.399 | @@ -555,11 +551,11 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 10.0.22621.0 ### .NET Core Tools -- .NET Core SDK: 6.0.123, 6.0.203, 6.0.318, 6.0.415, 7.0.402 +- .NET Core SDK: 6.0.124, 6.0.203, 6.0.319, 6.0.416, 7.0.403 - .NET Framework: 4.8, 4.8.1 -- Microsoft.AspNetCore.App: 6.0.5, 6.0.23, 7.0.12 -- Microsoft.NETCore.App: 6.0.5, 6.0.23, 7.0.12 -- Microsoft.WindowsDesktop.App: 6.0.5, 6.0.23, 7.0.12 +- Microsoft.AspNetCore.App: 6.0.5, 6.0.23, 6.0.24, 7.0.13 +- Microsoft.NETCore.App: 6.0.5, 6.0.23, 6.0.24, 7.0.13 +- Microsoft.WindowsDesktop.App: 6.0.5, 6.0.24, 7.0.13 - nbgv 3.6.133+2d32d93cb1 ### PowerShell Tools @@ -572,7 +568,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Az (Cached): 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.435 +- AWSPowershell: 4.1.436 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 - Microsoft.Graph: 2.8.0 @@ -621,4 +617,3 @@ All other versions are saved but not installed. | mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:180b44ab71dfd238ab4428baf047fee08663de4c317de0bce0887f12e4c7734c | 2023-10-10 | | mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:0e6791612f9448aa2e6713d95ffabdefa26122b58a0b341aace6b5a2d65aee8c | 2023-10-06 | | mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:40525c24f8e0a1cd4feca7330cf0bcdf125c0f7f2158852f4701dbe7ded2dd7f | 2023-10-06 | - From a9d78d77870707ee0e7311d7b88ab4aaeb5f2832 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 26 Oct 2023 22:52:29 +0000 Subject: [PATCH 2385/3485] Windows Server 2019 (20231025) Image Update (#8667) * Updating readme file for win19 version 20231025.2.1 * Update Windows2019-Readme.md --------- Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2019-Readme.md | 45 ++++++++++++++------------------ 1 file changed, 20 insertions(+), 25 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index 7ac8561a3a46..bcf2387215f4 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -1,10 +1,6 @@ -| Announcements | -|-| -| [[All OS] Android NDK r23 will be removed from images on October 9](https://github.com/actions/runner-images/issues/8383) | -*** # Windows Server 2019 - OS Version: 10.0.17763 Build 4974 -- Image Version: 20231023.1.0 +- Image Version: 20231025.2.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -19,7 +15,7 @@ - LLVM 16.0.6 - Node 18.18.2 - Perl 5.32.1 -- PHP 8.2.11 +- PHP 8.2.12 - Python 3.7.9 - Ruby 2.5.9p229 @@ -33,7 +29,7 @@ - pip 23.3.1 (python 3.7) - Pipx 1.2.1 - RubyGems 2.7.6.3 -- Vcpkg (build from commit 830f86fb3) +- Vcpkg (build from commit 213c01f87) - Yarn 1.22.19 #### Environment variables @@ -46,7 +42,7 @@ - Ant 1.10.14 - Gradle 8.4 - Maven 3.8.7 -- sbt 1.9.6 +- sbt 1.9.7 ### Tools - 7zip 23.01 @@ -65,7 +61,7 @@ - ghc 9.8.1 - Git 2.42.0.windows.2 - Git LFS 3.4.0 -- Google Cloud CLI 451.0.1 +- Google Cloud CLI 452.0.0 - ImageMagick 7.1.1-21 - InnoSetup 6.2.2 - jq 1.7-dirty @@ -79,8 +75,8 @@ - NSIS 3.08 - OpenSSL 1.1.1w - Packer 1.9.4 -- Parcel 2.10.0 -- Pulumi 3.89.0 +- Parcel 2.10.1 +- Pulumi 3.90.1 - R 4.3.1 - Service Fabric SDK 9.1.1436.9590 - Stack 2.13.1 @@ -97,7 +93,7 @@ - AWS CLI 2.13.28 - AWS SAM CLI 1.99.0 - AWS Session Manager CLI 1.2.497.0 -- Azure CLI 2.53.0 +- Azure CLI 2.53.1 - Azure DevOps CLI extension 0.26.0 - Cloud Foundry CLI 6.53.0 - GitHub CLI 2.37.0 @@ -110,18 +106,18 @@ #### Packages - bindgen 0.68.1 -- cargo-audit 0.18.2 +- cargo-audit 0.18.3 - cargo-outdated 0.13.1 - cbindgen 0.26.0 - Clippy 0.1.73 - Rustfmt 1.6.0 ### Browsers and Drivers -- Google Chrome 118.0.5993.89 +- Google Chrome 118.0.5993.118 - Chrome Driver 118.0.5993.70 - Microsoft Edge 118.0.2088.61 -- Microsoft Edge Driver 118.0.2088.61 -- Mozilla Firefox 118.0.2 +- Microsoft Edge Driver 118.0.2088.69 +- Mozilla Firefox 119.0 - Gecko Driver 0.33.0 - IE Driver 4.14.0.0 - Selenium server 4.14.0 @@ -173,7 +169,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 14.21.3 - 16.20.2 - 18.18.2 -- 20.8.1 +- 20.9.0 #### Python - 3.7.9 @@ -220,7 +216,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Database tools - Azure CosmosDb Emulator 2.14.12.0 - DacFx 162.1.167.1 -- MySQL 5.7.43.0 +- MySQL 5.7.44.0 - SQL OLEDB Driver 18.6.7.0 - SQLPS 1.0 @@ -228,7 +224,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Name | Version | ConfigFile | ServiceName | ServiceStatus | ListenPort | | ------ | ------- | ------------------------------------- | ----------- | ------------- | ---------- | | Apache | 2.4.55 | C:\tools\Apache24\conf\httpd.conf | Apache | Stopped | 80 | -| Nginx | 1.25.2 | C:\tools\nginx-1.25.2\conf\nginx.conf | nginx | Stopped | 80 | +| Nginx | 1.25.3 | C:\tools\nginx-1.25.3\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2019 | Name | Version | Path | @@ -496,11 +492,11 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 10.0.22621.0 ### .NET Core Tools -- .NET Core SDK: 6.0.123, 6.0.203, 6.0.318, 6.0.415 +- .NET Core SDK: 6.0.124, 6.0.203, 6.0.319, 6.0.416 - .NET Framework: 4.7.2, 4.8 -- Microsoft.AspNetCore.App: 6.0.5, 6.0.23 -- Microsoft.NETCore.App: 6.0.5, 6.0.23 -- Microsoft.WindowsDesktop.App: 6.0.5, 6.0.23 +- Microsoft.AspNetCore.App: 6.0.5, 6.0.24 +- Microsoft.NETCore.App: 6.0.5, 6.0.24 +- Microsoft.WindowsDesktop.App: 6.0.5, 6.0.24 - nbgv 3.6.133+2d32d93cb1 ### PowerShell Tools @@ -513,7 +509,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Az (Cached): 1.0.0.zip, 1.6.0.zip, 2.3.2.zip, 2.6.0.zip, 3.1.0.zip, 3.5.0.zip, 3.8.0.zip, 4.3.0.zip, 4.4.0.zip, 4.7.0.zip, 5.5.0.zip, 5.9.0.zip, 6.6.0.zip, 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.435 +- AWSPowershell: 4.1.437 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 - Microsoft.Graph: 2.8.0 @@ -563,4 +559,3 @@ All other versions are saved but not installed. | mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:9d2262cd7ac6f4dd4964086e353ba9253be48b5709f850564f877b8dea9614ec | 2023-10-10 | | mcr.microsoft.com/windows/nanoserver:1809 | sha256:bed3cb2d55f44371fdeebdabf97e8679347748c16dec0d2c351e25fb0b7bbb32 | 2023-10-02 | | mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:b3b5f1d43d7004541aae6f0c2ead0c70d943c85653f0e37861c73eaa9d687c42 | 2023-10-02 | - From a84b44268aec10ed001caecdc01bfee8b91714e7 Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Fri, 27 Oct 2023 09:32:43 +0200 Subject: [PATCH 2386/3485] [Mac OS] Fix logic for retrying AppleScript execution (#8662) --- images/macos/provision/core/commonutils.sh | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/images/macos/provision/core/commonutils.sh b/images/macos/provision/core/commonutils.sh index cbe0b9c4cf23..d93cb708cdd9 100644 --- a/images/macos/provision/core/commonutils.sh +++ b/images/macos/provision/core/commonutils.sh @@ -36,16 +36,20 @@ fi # System Preferences -> Security & Privacy -> General -> Unlock -> Allow -> Not now if is_Monterey; then if is_Veertu; then - echo "Executing AppleScript to change security preferences (with retries)" - retry=5 - while [ $retry -gt 0 ]; do + for retry in {4..0}; do + echo "Executing AppleScript to change security preferences. Retries left: $retry" { + set -e osascript -e 'tell application "System Events" to get application processes where visible is true' - } - osascript $HOME/utils/confirm-identified-developers.scpt $USER_PASSWORD + osascript $HOME/utils/confirm-identified-developers.scpt $USER_PASSWORD + } && break - retry=$((retry-1)) - echo "retries left "$retry + if [ "$retry" -eq 0 ]; then + echo "Executing AppleScript failed. No retries left" + exit 1 + fi + + echo "Executing AppleScript failed. Sleeping for 10 seconds and retrying" sleep 10 done else From 917c3930d447f50f02d60240d053bd4841fe60c9 Mon Sep 17 00:00:00 2001 From: sergei-pyshnoi <121864472+sergei-pyshnoi@users.noreply.github.com> Date: Fri, 27 Oct 2023 11:13:35 +0200 Subject: [PATCH 2387/3485] [Ubuntu] Add PGP validation for swift (#8652) --- images/linux/scripts/installers/swift.sh | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/images/linux/scripts/installers/swift.sh b/images/linux/scripts/installers/swift.sh index ef7a7c09f5e8..97bcc76a543f 100644 --- a/images/linux/scripts/installers/swift.sh +++ b/images/linux/scripts/installers/swift.sh @@ -15,6 +15,19 @@ swift_tar_name="swift-$swift_version-RELEASE-ubuntu$image_label.tar.gz" swift_tar_url="https://swift.org/builds/swift-$swift_version-release/ubuntu${image_label//./}/swift-$swift_version-RELEASE/$swift_tar_name" download_with_retries $swift_tar_url "/tmp" "$swift_tar_name" +# Verifing pgp signature using official swift pgp key. Referring to https://www.swift.org/install/linux/#Installation-via-Tarball +# Download swift pgp key +download_with_retries "https://swift.org/keys/all-keys.asc" "/tmp" "all-keys.asc" +# Import swift pgp key +gpg --no-default-keyring --keyring swift --import /tmp/all-keys.asc +# Download signature file +download_with_retries "$swift_tar_url.sig" "/tmp" "$swift_tar_name.sig" +# Verify signature +gpg --no-default-keyring --keyring swift --verify "/tmp/$swift_tar_name.sig" "/tmp/$swift_tar_name" +# Remove swift pgp public key with temporary keyring +rm ~/.gnupg/swift + + tar xzf /tmp/$swift_tar_name SWIFT_INSTALL_ROOT="/usr/share/swift" From 804aabd7865f95346be468c49b728164d0791cf2 Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Fri, 27 Oct 2023 15:52:17 +0200 Subject: [PATCH 2388/3485] [Windows] Remove out-of-support vs components (#8678) --- images/win/toolsets/toolset-2022.json | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index a2582ff85255..812d5fedf5e5 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -250,24 +250,6 @@ "Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.ARM.Spectre", "Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.ARM64", "Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.ARM64.Spectre", - "Microsoft.VisualStudio.Component.VC.14.35.17.5.ARM.Spectre", - "Microsoft.VisualStudio.Component.VC.14.35.17.5.ARM", - "Microsoft.VisualStudio.Component.VC.14.35.17.5.ARM64.Spectre", - "Microsoft.VisualStudio.Component.VC.14.35.17.5.ARM64", - "Microsoft.VisualStudio.Component.VC.14.35.17.5.ATL.ARM.Spectre", - "Microsoft.VisualStudio.Component.VC.14.35.17.5.ATL.ARM", - "Microsoft.VisualStudio.Component.VC.14.35.17.5.ATL.ARM64.Spectre", - "Microsoft.VisualStudio.Component.VC.14.35.17.5.ATL.ARM64", - "Microsoft.VisualStudio.Component.VC.14.35.17.5.ATL.Spectre", - "Microsoft.VisualStudio.Component.VC.14.35.17.5.ATL", - "Microsoft.VisualStudio.Component.VC.14.35.17.5.MFC.ARM.Spectre", - "Microsoft.VisualStudio.Component.VC.14.35.17.5.MFC.ARM", - "Microsoft.VisualStudio.Component.VC.14.35.17.5.MFC.ARM64.Spectre", - "Microsoft.VisualStudio.Component.VC.14.35.17.5.MFC.ARM64", - "Microsoft.VisualStudio.Component.VC.14.35.17.5.MFC.Spectre", - "Microsoft.VisualStudio.Component.VC.14.35.17.5.MFC", - "Microsoft.VisualStudio.Component.VC.14.35.17.5.x86.x64.Spectre", - "Microsoft.VisualStudio.Component.VC.14.35.17.5.x86.x64", "Microsoft.VisualStudio.Component.VC.14.37.17.7.ARM.Spectre", "Microsoft.VisualStudio.Component.VC.14.37.17.7.ARM", "Microsoft.VisualStudio.Component.VC.14.37.17.7.ARM64.Spectre", From f3d011eec1140de7544c9dbf4824a396f25c8447 Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Fri, 27 Oct 2023 15:59:45 +0200 Subject: [PATCH 2389/3485] [MacOS] Unpin Virtualbox (#8653) * [MacOS] Unpin Virtualbox * Remove obsolete virtualbox kext pester test --- images/macos/provision/core/commonutils.sh | 13 +------------ images/macos/tests/Common.Tests.ps1 | 6 ------ 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/images/macos/provision/core/commonutils.sh b/images/macos/provision/core/commonutils.sh index d93cb708cdd9..1f472d2d4a96 100644 --- a/images/macos/provision/core/commonutils.sh +++ b/images/macos/provision/core/commonutils.sh @@ -13,18 +13,7 @@ done cask_packages=$(get_toolset_value '.brew.cask_packages[]') for package in $cask_packages; do echo "Installing $package..." - if [[ $package == "virtualbox" ]]; then - if ! is_Ventura || ! is_VenturaArm64; then - # VirtualBox 7 crashes - # macOS host: Dropped all kernel extensions. VirtualBox relies fully on the hypervisor and vmnet frameworks provided by Apple now. - vbcask_url="https://raw.githubusercontent.com/Homebrew/homebrew-cask/aa3c55951fc9d687acce43e5c0338f42c1ddff7b/Casks/virtualbox.rb" - download_with_retries $vbcask_url - brew install ./virtualbox.rb - rm ./virtualbox.rb - fi - else - brew install --cask $package - fi + brew install --cask $package done # Load "Parallels International GmbH" diff --git a/images/macos/tests/Common.Tests.ps1 b/images/macos/tests/Common.Tests.ps1 index e1e645e7f5af..9e278773363e 100644 --- a/images/macos/tests/Common.Tests.ps1 +++ b/images/macos/tests/Common.Tests.ps1 @@ -123,12 +123,6 @@ Describe "Go" -Skip:($os.IsVentura -or $os.IsVenturaArm64) { } } -Describe "VirtualBox" -Skip:($os.IsBigSur -or $os.IsVentura -or $os.IsVenturaArm64) { - It "Check kext kernel modules" { - kextstat | Out-String | Should -Match "org.virtualbox.kext" - } -} - Describe "CodeQL Bundle" { It "Is installed" { $CodeQLVersionWildcard = Join-Path $Env:AGENT_TOOLSDIRECTORY -ChildPath "CodeQL" | Join-Path -ChildPath "*" From 441bf91f04245773e2a20b175b578e07537e202c Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Mon, 30 Oct 2023 11:36:22 +0100 Subject: [PATCH 2390/3485] [Ubuntu] Update apt repos list in documentation (#8634) --- README.md | 404 +++++++++++++++++++++++++++--------------------------- 1 file changed, 202 insertions(+), 202 deletions(-) diff --git a/README.md b/README.md index 79f121f1a74a..2605cddceb23 100644 --- a/README.md +++ b/README.md @@ -1,202 +1,202 @@ - -# GitHub Actions Runner Images - -**Table of Contents** - -- [About](#about) -- [Available Images](#available-images) -- [Announcements](#announcements) -- [Image Definitions](#image-definitions) -- [Image Releases](#image-releases) -- [Software and Image Support](#software-and-image-support) -- [How to Interact with the Repo](#how-to-interact-with-the-repo) -- [FAQs](#faqs) - -## About - -This repository contains the source code used to create the VM images for [GitHub-hosted runners](https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners) used for Actions, as well as for [Microsoft-hosted agents](https://docs.microsoft.com/en-us/azure/devops/pipelines/agents/hosted?view=azure-devops#use-a-microsoft-hosted-agent) used for Azure Pipelines. -To build a VM machine from this repo's source, see the [instructions](docs/create-image-and-azure-resources.md). - -## Available Images - -| Image | YAML Label | Included Software | Rollout Progress of Latest Image Release | -| --------------------|---------------------|--------------------|---------------------| -| Ubuntu 22.04 | `ubuntu-latest` or `ubuntu-22.04` | [ubuntu-22.04] | [![status22](https://gh-runnerimagesdeploymentstatus.azurewebsites.net/api/status?imageName=ubuntu22&badge=1)](https://gh-runnerimagesdeploymentstatus.azurewebsites.net/api/status?imageName=ubuntu22&redirect=1) -| Ubuntu 20.04 | `ubuntu-20.04` | [ubuntu-20.04] | [![status20](https://gh-runnerimagesdeploymentstatus.azurewebsites.net/api/status?imageName=ubuntu20&badge=1)](https://gh-runnerimagesdeploymentstatus.azurewebsites.net/api/status?imageName=ubuntu20&redirect=1) -| macOS 13 [beta] | `macos-13` or `macos-13-xl`| [macOS-13] | [![statusumac13](https://gh-runnerimagesdeploymentstatus.azurewebsites.net/api/status?imageName=macos-13&badge=1)](https://gh-runnerimagesdeploymentstatus.azurewebsites.net/api/status?imageName=macos-13&redirect=1) -| macOS 12 | `macos-latest`, `macos-latest-xl`, `macos-12`, or `macos-12-xl`| [macOS-12] | [![statusumac12](https://gh-runnerimagesdeploymentstatus.azurewebsites.net/api/status?imageName=macos-12&badge=1)](https://gh-runnerimagesdeploymentstatus.azurewebsites.net/api/status?imageName=macos-12&redirect=1) -| macOS 11 | `macos-11`| [macOS-11] | [![statusmac11](https://gh-runnerimagesdeploymentstatus.azurewebsites.net/api/status?imageName=macos-11&badge=1)](https://gh-runnerimagesdeploymentstatus.azurewebsites.net/api/status?imageName=macos-11&redirect=1) -| Windows Server 2022 | `windows-latest` or `windows-2022` | [windows-2022] | [![statuswin22](https://gh-runnerimagesdeploymentstatus.azurewebsites.net/api/status?imageName=windows-2022&badge=1)](https://gh-runnerimagesdeploymentstatus.azurewebsites.net/api/status?imageName=windows-2022&redirect=1) | -| Windows Server 2019 | `windows-2019` | [windows-2019] | [![statuswin19](https://gh-runnerimagesdeploymentstatus.azurewebsites.net/api/status?imageName=windows-2019&badge=1)](https://gh-runnerimagesdeploymentstatus.azurewebsites.net/api/status?imageName=windows-2019&redirect=1) - -### Label scheme - -- In general the `-latest` label is used for the latest OS image version that is GA -- Before moving the`-latest` label to a new OS version we will announce the change and give sufficient lead time for users to update their workflows - -[ubuntu-22.04]: https://github.com/actions/runner-images/blob/main/images/linux/Ubuntu2204-Readme.md -[ubuntu-20.04]: https://github.com/actions/runner-images/blob/main/images/linux/Ubuntu2004-Readme.md -[windows-2022]: https://github.com/actions/runner-images/blob/main/images/win/Windows2022-Readme.md -[windows-2019]: https://github.com/actions/runner-images/blob/main/images/win/Windows2019-Readme.md -[macOS-11]: https://github.com/actions/runner-images/blob/main/images/macos/macos-11-Readme.md -[macOS-12]: https://github.com/actions/runner-images/blob/main/images/macos/macos-12-Readme.md -[macOS-13]: https://github.com/actions/runner-images/blob/main/images/macos/macos-13-Readme.md -[macOS-10.15]: https://github.com/actions/runner-images/blob/main/images/macos/macos-10.15-Readme.md -[self-hosted runners]: https://help.github.com/en/actions/hosting-your-own-runners - -## Announcements - -See notable upcoming changes by viewing issues with the [Announcement](https://github.com/actions/runner-images/labels/Announcement) label. - -## Image Definitions - -### Beta - -The purpose of a Beta is to collect feedback on an image before it is released to GA. The goal of a Beta is to identify and fix any potential issues that exist on that -image. Images are updated on a weekly cadence. Any workflows that run on a beta image do not fall under the customer [SLA](https://github.com/customer-terms/github-online-services-sla) in place for Actions. -Customers choosing to use Beta images are encouraged to provide feedback in the runner-images repo by creating an issue. A Beta may take on different availability, i.e. public vs private. - -### GA - -A GA (General Availability) image has been through a Beta period and is deemed ready for general use. Images are updated on a weekly cadence. In order to be moved to -GA the image must meet the following criteria: - -1. Has been through a Beta period (public or private) -2. Most major software we install on the image has a compatible -version for the underlying OS and -3. All major bugs reported during the Beta period have been addressed. - -This image type falls under the customer [SLA](https://github.com/customer-terms/github-online-services-sla) for actions. GA images are eventually deprecated according to our guidelines as we only support the -latest 2 versions of an OS. - -#### Latest Migration Process - -GitHub Actions and Azure DevOps use the `-latest` YAML label (ex: `ubuntu-latest`, `windows-latest`, and `macos-latest`). These labels point towards the newest stable OS version available. - - -The `-latest` migration process is gradual and happens over 1-2 months in order to allow customers to adapt their workflows to the newest OS version. During this process, any workflow using the `-latest` label, may see changes in the OS version in their workflows or pipelines. To avoid unwanted migration, users can specify a specific OS version in the yaml file (ex: macos-12, windows-2022, ubuntu-22.04). - - -## Image Releases - -*How to best follow along with changes* - -1. Find the latest releases for this repository [here.](https://github.com/actions/runner-images/releases) -2. Subscribe to the releases coming out of this repository, instructions [here.](https://docs.github.com/en/account-and-profile/managing-subscriptions-and-notifications-on-github/setting-up-notifications/configuring-notifications#configuring-your-watch-settings-for-an-individual-repository) -3. Upcoming changes: A pre-release is created when the deployment of an image has started. As soon as the deployment is finished, the pre-release is converted to a release. If you have subscribed to releases, you will get notified of pre-releases as well. - - - You can also track upcoming changes using the [awaiting-deployment](https://github.com/actions/runner-images/labels/awaiting-deployment) label. -4. For high impact changes, we will post these in advance to the GitHub Changelog on our [blog](https://github.blog/changelog/) and on [twitter](https://twitter.com/GHchangelog). - - Ex: breaking changes, GA or deprecation of images - -*Cadence* - -- We typically deploy weekly updates to the software on the runner images. - -## Software and Image Support - -### Support Policy - -- Tools and versions will typically be removed 6 months after they are deprecated or have reached end-of-life -- We support (at maximum) 2 GA images and 1 beta image at a time. We begin the deprecation process of the oldest image label once the newest OS image label has been released to GA. -- The images generally contain the latest versions of packages installed except for Ubuntu LTS where we mostly rely on the Canonical-provided repositories. - -- Popular tools can have several versions installed side-by-side with the following strategy: - -| Tool name | Installation strategy | -|-----------|-----------------------| -| Docker images | not more than 3 latest LTS OS\tool versions. New images or new versions of current images are added using the standard tool request process | -| Java | all LTS versions | -| Node.js | 3 latest LTS versions | -| Go | 3 latest minor versions | -| Python <br/> Ruby | 5 most popular `major.minor` versions | -| PyPy | 3 most popular `major.minor` versions | -| .NET Core | 2 latest LTS versions and 1 latest version. For each feature version only latest patch is installed | -| GCC <br/> GNU Fortran <br/> Clang <br/> GNU C++ | 3 latest major versions | -| Android NDK | 1 latest non-LTS, 2 latest LTS versions | -| Xcode | - all OS compatible versions side-by-side <br/> - for beta, GM versions - latest beta only <br/> - old patch versions are deprecated in 3 months | - -### Package managers usage - -We use third-party package managers to install software during the image generation process. The table below lists the package managers and the software installed. -> **Note**: third-party repositories are re-evaluated every year to identify if they are still useful and secure. - -| Operating system | Package manager | Third-party repos and packages | -| :--- | :---: | ---: | -| Ubuntu | [APT](https://wiki.debian.org/Apt) | [Eclipse-Temurin (Adoptium)](https://packages.adoptium.net/artifactory/deb) </br> [Erlang](https://packages.erlang-solutions.com/ubuntu) </br>[Firefox](https://launchpad.net/~mozillateam/+archive/ubuntu/ppa) </br> [gcc, gfortran](https://launchpad.net/~ubuntu-toolchain-r/+archive/ubuntu/test) </br> [git](https://launchpad.net/~git-core/+archive/ubuntu/ppa) </br> [HHvm](https://dl.hhvm.com/ubuntu) </br> [PHP](https://launchpad.net/~ondrej/+archive/ubuntu/php) (Ubuntu 20 only) </br> [Mono](https://download.mono-project.com/repo/ubuntu) </br> [PostgreSQL](https://apt.postgresql.org/pub/repos/apt) </br> [R](https://cloud.r-project.org/bin/linux/ubuntu) | -| | [pipx](https://pypa.github.io/pipx) | ansible-core </br>yamllint | -| Windows | [Chocolatey](https://chocolatey.org) | No third-party repos installed | -| macOS | [Homebrew](https://brew.sh) | [aws-cli v2](https://github.com/aws/homebrew-tap) </br> [azure/bicep](https://github.com/Azure/homebrew-bicep) </br> [mongodb/brew](https://github.com/mongodb/homebrew-brew) | -| | [pipx](https://pypa.github.io/pipx/) | yamllint | - -### Image Deprecation Policy - -- Images begin the deprecation process of the oldest image label once a new GA OS version has been released. -- Deprecation process begins with an announcement that sets a date for deprecation -- As it gets closer to the date, GitHub begins doing scheduled brownouts of the image -- During this time there will be an Announcement pinned in the repo to remind users of the deprecation. -- Finally GitHub will deprecate the image and it will no longer be available - -### Preinstallation Policy - -In general, these are the guidelines we follow when deciding what to pre-install on our images: - -- Popularity: widely-used tools and ecosystems will be given priority. -- Latest Technology: recent versions of tools will be given priority. -- Deprecation: end-of-life tools and versions will not be added. -- Licensing: MIT, Apache, or GNU licenses are allowed. -- Time & Space on the Image: we will evaluate how much time is saved and how much space is used by having the tool pre-installed. -- Support: If a tool requires the support of more than one version, we will consider the cost of this maintenance. - -### Default Version Update Policy - -- In general, once a new version is installed on the image, we announce the default version update 2 weeks prior to deploying it. -- For potentially dangerous updates, we may extend the timeline up to 1 month between the announcement and deployment. - -## How to Interact with the Repo - -- **Issues**: To file a bug report, or request tools to be added/updated, please [open an issue using the appropriate template](https://github.com/actions/runner-images/issues/new/choose) -- **Discussions**: If you want to share your thoughts about image configuration, installed software, or bring a new idea, please create a new topic in a [discussion](https://github.com/actions/runner-images/discussions) for a corresponding category. Before making a new discussion please make sure no similar topics were created earlier. -- For general questions about using the runner images or writing your Actions workflow, please open requests in the [GitHub Actions Community Forum](https://github.community/c/github-actions/41). - -## FAQs - -<details> - <summary><b><i>What images are available for GitHub Actions and Azure DevOps?</b></i></summary> - -The availability of images for GitHub Actions and Azure DevOps is the same. However, deprecation policies may differ. See documentation for more details: -- [GitHub Actions](https://docs.github.com/en/free-pro-team@latest/actions/reference/specifications-for-github-hosted-runners#supported-runners-and-hardware-resources) -- [Azure DevOps](https://docs.microsoft.com/en-us/azure/devops/pipelines/agents/hosted?view=azure-devops&tabs=yaml#software) -</details> - -<details> - <summary><b><i>What image version is used in my build?</b></i></summary> - -Usually, image deployment takes 2-3 days, and documentation in the `main` branch is only updated when deployment is finished. To find out which image version and what software versions are used in a specific build, see `Set up job` (GitHub Actions) or `Initialize job` (Azure DevOps) step log. -<img width="1440" alt="actions-runner-image" src="https://github.com/actions/runner-images/assets/88318005/922a8bf5-3e4d-4265-9527-b3b51e6bf9c8"> -</details> - -<details> - <summary><b><i>Looking for other Linux distributions?</b></i></summary> - -We do not plan to offer other Linux distributions. We recommend using Docker if you'd like to build using other distributions with the hosted runner images. Alternatively, you can leverage [self-hosted runners] and fully customize your VM image to your needs. -</details> - -<details> - <summary><b><i>How do I contribute to the macOS source?</b></i></summary> - -macOS source lives in this repository and is available for everyone. However, macOS image-generation CI doesn't support external contributions yet so we are not able to accept pull-requests for now. - -We are in the process of preparing macOS CI to accept contributions. Until then, we appreciate your patience and ask you to continue to make tool requests by filing issues. -</details> - -<details> - <summary><b><i>How does GitHub determine what tools are installed on the images?</b></i></summary> - -For some tools, we always install the latest at the time of the deployment; for others, we pin the tool to specific version(s). For more details please see the [Preinstallation Policy](#preinstallation-policy) -</details> - -<details> - <summary><b><i>How do I request that a new tool be pre-installed on the image?</b></i></summary> -Please create an issue and get an approval from us to add this tool to the image before creating the pull request. -</details> + +# GitHub Actions Runner Images + +**Table of Contents** + +- [About](#about) +- [Available Images](#available-images) +- [Announcements](#announcements) +- [Image Definitions](#image-definitions) +- [Image Releases](#image-releases) +- [Software and Image Support](#software-and-image-support) +- [How to Interact with the Repo](#how-to-interact-with-the-repo) +- [FAQs](#faqs) + +## About + +This repository contains the source code used to create the VM images for [GitHub-hosted runners](https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners) used for Actions, as well as for [Microsoft-hosted agents](https://docs.microsoft.com/en-us/azure/devops/pipelines/agents/hosted?view=azure-devops#use-a-microsoft-hosted-agent) used for Azure Pipelines. +To build a VM machine from this repo's source, see the [instructions](docs/create-image-and-azure-resources.md). + +## Available Images + +| Image | YAML Label | Included Software | Rollout Progress of Latest Image Release | +| --------------------|---------------------|--------------------|---------------------| +| Ubuntu 22.04 | `ubuntu-latest` or `ubuntu-22.04` | [ubuntu-22.04] | [![status22](https://gh-runnerimagesdeploymentstatus.azurewebsites.net/api/status?imageName=ubuntu22&badge=1)](https://gh-runnerimagesdeploymentstatus.azurewebsites.net/api/status?imageName=ubuntu22&redirect=1) +| Ubuntu 20.04 | `ubuntu-20.04` | [ubuntu-20.04] | [![status20](https://gh-runnerimagesdeploymentstatus.azurewebsites.net/api/status?imageName=ubuntu20&badge=1)](https://gh-runnerimagesdeploymentstatus.azurewebsites.net/api/status?imageName=ubuntu20&redirect=1) +| macOS 13 [beta] | `macos-13` or `macos-13-xl`| [macOS-13] | [![statusumac13](https://gh-runnerimagesdeploymentstatus.azurewebsites.net/api/status?imageName=macos-13&badge=1)](https://gh-runnerimagesdeploymentstatus.azurewebsites.net/api/status?imageName=macos-13&redirect=1) +| macOS 12 | `macos-latest`, `macos-latest-xl`, `macos-12`, or `macos-12-xl`| [macOS-12] | [![statusumac12](https://gh-runnerimagesdeploymentstatus.azurewebsites.net/api/status?imageName=macos-12&badge=1)](https://gh-runnerimagesdeploymentstatus.azurewebsites.net/api/status?imageName=macos-12&redirect=1) +| macOS 11 | `macos-11`| [macOS-11] | [![statusmac11](https://gh-runnerimagesdeploymentstatus.azurewebsites.net/api/status?imageName=macos-11&badge=1)](https://gh-runnerimagesdeploymentstatus.azurewebsites.net/api/status?imageName=macos-11&redirect=1) +| Windows Server 2022 | `windows-latest` or `windows-2022` | [windows-2022] | [![statuswin22](https://gh-runnerimagesdeploymentstatus.azurewebsites.net/api/status?imageName=windows-2022&badge=1)](https://gh-runnerimagesdeploymentstatus.azurewebsites.net/api/status?imageName=windows-2022&redirect=1) | +| Windows Server 2019 | `windows-2019` | [windows-2019] | [![statuswin19](https://gh-runnerimagesdeploymentstatus.azurewebsites.net/api/status?imageName=windows-2019&badge=1)](https://gh-runnerimagesdeploymentstatus.azurewebsites.net/api/status?imageName=windows-2019&redirect=1) + +### Label scheme + +- In general the `-latest` label is used for the latest OS image version that is GA +- Before moving the`-latest` label to a new OS version we will announce the change and give sufficient lead time for users to update their workflows + +[ubuntu-22.04]: https://github.com/actions/runner-images/blob/main/images/linux/Ubuntu2204-Readme.md +[ubuntu-20.04]: https://github.com/actions/runner-images/blob/main/images/linux/Ubuntu2004-Readme.md +[windows-2022]: https://github.com/actions/runner-images/blob/main/images/win/Windows2022-Readme.md +[windows-2019]: https://github.com/actions/runner-images/blob/main/images/win/Windows2019-Readme.md +[macOS-11]: https://github.com/actions/runner-images/blob/main/images/macos/macos-11-Readme.md +[macOS-12]: https://github.com/actions/runner-images/blob/main/images/macos/macos-12-Readme.md +[macOS-13]: https://github.com/actions/runner-images/blob/main/images/macos/macos-13-Readme.md +[macOS-10.15]: https://github.com/actions/runner-images/blob/main/images/macos/macos-10.15-Readme.md +[self-hosted runners]: https://help.github.com/en/actions/hosting-your-own-runners + +## Announcements + +See notable upcoming changes by viewing issues with the [Announcement](https://github.com/actions/runner-images/labels/Announcement) label. + +## Image Definitions + +### Beta + +The purpose of a Beta is to collect feedback on an image before it is released to GA. The goal of a Beta is to identify and fix any potential issues that exist on that +image. Images are updated on a weekly cadence. Any workflows that run on a beta image do not fall under the customer [SLA](https://github.com/customer-terms/github-online-services-sla) in place for Actions. +Customers choosing to use Beta images are encouraged to provide feedback in the runner-images repo by creating an issue. A Beta may take on different availability, i.e. public vs private. + +### GA + +A GA (General Availability) image has been through a Beta period and is deemed ready for general use. Images are updated on a weekly cadence. In order to be moved to +GA the image must meet the following criteria: + +1. Has been through a Beta period (public or private) +2. Most major software we install on the image has a compatible +version for the underlying OS and +3. All major bugs reported during the Beta period have been addressed. + +This image type falls under the customer [SLA](https://github.com/customer-terms/github-online-services-sla) for actions. GA images are eventually deprecated according to our guidelines as we only support the +latest 2 versions of an OS. + +#### Latest Migration Process + +GitHub Actions and Azure DevOps use the `-latest` YAML label (ex: `ubuntu-latest`, `windows-latest`, and `macos-latest`). These labels point towards the newest stable OS version available. + + +The `-latest` migration process is gradual and happens over 1-2 months in order to allow customers to adapt their workflows to the newest OS version. During this process, any workflow using the `-latest` label, may see changes in the OS version in their workflows or pipelines. To avoid unwanted migration, users can specify a specific OS version in the yaml file (ex: macos-12, windows-2022, ubuntu-22.04). + + +## Image Releases + +*How to best follow along with changes* + +1. Find the latest releases for this repository [here.](https://github.com/actions/runner-images/releases) +2. Subscribe to the releases coming out of this repository, instructions [here.](https://docs.github.com/en/account-and-profile/managing-subscriptions-and-notifications-on-github/setting-up-notifications/configuring-notifications#configuring-your-watch-settings-for-an-individual-repository) +3. Upcoming changes: A pre-release is created when the deployment of an image has started. As soon as the deployment is finished, the pre-release is converted to a release. If you have subscribed to releases, you will get notified of pre-releases as well. + + - You can also track upcoming changes using the [awaiting-deployment](https://github.com/actions/runner-images/labels/awaiting-deployment) label. +4. For high impact changes, we will post these in advance to the GitHub Changelog on our [blog](https://github.blog/changelog/) and on [twitter](https://twitter.com/GHchangelog). + - Ex: breaking changes, GA or deprecation of images + +*Cadence* + +- We typically deploy weekly updates to the software on the runner images. + +## Software and Image Support + +### Support Policy + +- Tools and versions will typically be removed 6 months after they are deprecated or have reached end-of-life +- We support (at maximum) 2 GA images and 1 beta image at a time. We begin the deprecation process of the oldest image label once the newest OS image label has been released to GA. +- The images generally contain the latest versions of packages installed except for Ubuntu LTS where we mostly rely on the Canonical-provided repositories. + +- Popular tools can have several versions installed side-by-side with the following strategy: + +| Tool name | Installation strategy | +|-----------|-----------------------| +| Docker images | not more than 3 latest LTS OS\tool versions. New images or new versions of current images are added using the standard tool request process | +| Java | all LTS versions | +| Node.js | 3 latest LTS versions | +| Go | 3 latest minor versions | +| Python <br/> Ruby | 5 most popular `major.minor` versions | +| PyPy | 3 most popular `major.minor` versions | +| .NET Core | 2 latest LTS versions and 1 latest version. For each feature version only latest patch is installed | +| GCC <br/> GNU Fortran <br/> Clang <br/> GNU C++ | 3 latest major versions | +| Android NDK | 1 latest non-LTS, 2 latest LTS versions | +| Xcode | - all OS compatible versions side-by-side <br/> - for beta, GM versions - latest beta only <br/> - old patch versions are deprecated in 3 months | + +### Package managers usage + +We use third-party package managers to install software during the image generation process. The table below lists the package managers and the software installed. +> **Note**: third-party repositories are re-evaluated every year to identify if they are still useful and secure. + +| Operating system | Package manager | Third-party repos and packages | +| :--- | :---: | ---: | +| Ubuntu | [APT](https://wiki.debian.org/Apt) | [containers](https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) (Ubuntu 20 only) <br/> [docker](https://download.docker.com/linux/ubuntu) <br/> [Eclipse-Temurin (Adoptium)](https://packages.adoptium.net/artifactory/deb/) <br/> [Erlang](https://packages.erlang-solutions.com/ubuntu) <br/> [Firefox](http://ppa.launchpad.net/mozillateam/ppa/ubuntu) <br/> [gcc, gfortran](https://launchpad.net/~ubuntu-toolchain-r/+archive/ubuntu/test) <br/> [git-lfs](https://packagecloud.io/install/repositories/github/git-lfs) <br/> [git](https://launchpad.net/~git-core/+archive/ubuntu/ppa) <br/> [Google Cloud CLI](https://packages.cloud.google.com/apt) <br/> [Heroku](https://cli-assets.heroku.com/channels/stable/apt) <br/> [HHvm](https://dl.hhvm.com/ubuntu) <br/> [MongoDB](https://repo.mongodb.org/apt/ubuntu) <br/> [Mono](https://download.mono-project.com/repo/ubuntu) <br/> [MS Edge](https://packages.microsoft.com/repos/edge) <br/> [PostgreSQL](https://apt.postgresql.org/pub/repos/apt/) <br/> [R](https://cloud.r-project.org/bin/linux/ubuntu) | +| | [pipx](https://pypa.github.io/pipx) | ansible-core <br/>yamllint | +| Windows | [Chocolatey](https://chocolatey.org) | No third-party repos installed | +| macOS | [Homebrew](https://brew.sh) | [aws-cli v2](https://github.com/aws/homebrew-tap) </br> [azure/bicep](https://github.com/Azure/homebrew-bicep) </br> [mongodb/brew](https://github.com/mongodb/homebrew-brew) | +| | [pipx](https://pypa.github.io/pipx/) | yamllint | + +### Image Deprecation Policy + +- Images begin the deprecation process of the oldest image label once a new GA OS version has been released. +- Deprecation process begins with an announcement that sets a date for deprecation +- As it gets closer to the date, GitHub begins doing scheduled brownouts of the image +- During this time there will be an Announcement pinned in the repo to remind users of the deprecation. +- Finally GitHub will deprecate the image and it will no longer be available + +### Preinstallation Policy + +In general, these are the guidelines we follow when deciding what to pre-install on our images: + +- Popularity: widely-used tools and ecosystems will be given priority. +- Latest Technology: recent versions of tools will be given priority. +- Deprecation: end-of-life tools and versions will not be added. +- Licensing: MIT, Apache, or GNU licenses are allowed. +- Time & Space on the Image: we will evaluate how much time is saved and how much space is used by having the tool pre-installed. +- Support: If a tool requires the support of more than one version, we will consider the cost of this maintenance. + +### Default Version Update Policy + +- In general, once a new version is installed on the image, we announce the default version update 2 weeks prior to deploying it. +- For potentially dangerous updates, we may extend the timeline up to 1 month between the announcement and deployment. + +## How to Interact with the Repo + +- **Issues**: To file a bug report, or request tools to be added/updated, please [open an issue using the appropriate template](https://github.com/actions/runner-images/issues/new/choose) +- **Discussions**: If you want to share your thoughts about image configuration, installed software, or bring a new idea, please create a new topic in a [discussion](https://github.com/actions/runner-images/discussions) for a corresponding category. Before making a new discussion please make sure no similar topics were created earlier. +- For general questions about using the runner images or writing your Actions workflow, please open requests in the [GitHub Actions Community Forum](https://github.community/c/github-actions/41). + +## FAQs + +<details> + <summary><b><i>What images are available for GitHub Actions and Azure DevOps?</b></i></summary> + +The availability of images for GitHub Actions and Azure DevOps is the same. However, deprecation policies may differ. See documentation for more details: +- [GitHub Actions](https://docs.github.com/en/free-pro-team@latest/actions/reference/specifications-for-github-hosted-runners#supported-runners-and-hardware-resources) +- [Azure DevOps](https://docs.microsoft.com/en-us/azure/devops/pipelines/agents/hosted?view=azure-devops&tabs=yaml#software) +</details> + +<details> + <summary><b><i>What image version is used in my build?</b></i></summary> + +Usually, image deployment takes 2-3 days, and documentation in the `main` branch is only updated when deployment is finished. To find out which image version and what software versions are used in a specific build, see `Set up job` (GitHub Actions) or `Initialize job` (Azure DevOps) step log. +<img width="1440" alt="actions-runner-image" src="https://github.com/actions/runner-images/assets/88318005/922a8bf5-3e4d-4265-9527-b3b51e6bf9c8"> +</details> + +<details> + <summary><b><i>Looking for other Linux distributions?</b></i></summary> + +We do not plan to offer other Linux distributions. We recommend using Docker if you'd like to build using other distributions with the hosted runner images. Alternatively, you can leverage [self-hosted runners] and fully customize your VM image to your needs. +</details> + +<details> + <summary><b><i>How do I contribute to the macOS source?</b></i></summary> + +macOS source lives in this repository and is available for everyone. However, macOS image-generation CI doesn't support external contributions yet so we are not able to accept pull-requests for now. + +We are in the process of preparing macOS CI to accept contributions. Until then, we appreciate your patience and ask you to continue to make tool requests by filing issues. +</details> + +<details> + <summary><b><i>How does GitHub determine what tools are installed on the images?</b></i></summary> + +For some tools, we always install the latest at the time of the deployment; for others, we pin the tool to specific version(s). For more details please see the [Preinstallation Policy](#preinstallation-policy) +</details> + +<details> + <summary><b><i>How do I request that a new tool be pre-installed on the image?</b></i></summary> +Please create an issue and get an approval from us to add this tool to the image before creating the pull request. +</details> From 7cd555ab9e74bb1ed762fa9f603adecace8ea62a Mon Sep 17 00:00:00 2001 From: Jakub Oskera <iam@jakuboskera.dev> Date: Mon, 30 Oct 2023 11:51:09 +0100 Subject: [PATCH 2391/3485] fix: bump libssl version to ubuntu2.20 (#8682) Signed-off-by: Jakub Oskera <iam@jakuboskera.dev> Co-authored-by: Jakub Oskera <jakub.oskera@rws.com> --- images/linux/scripts/installers/sqlpackage.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/linux/scripts/installers/sqlpackage.sh b/images/linux/scripts/installers/sqlpackage.sh index f09571c78777..c78f2169ba3e 100644 --- a/images/linux/scripts/installers/sqlpackage.sh +++ b/images/linux/scripts/installers/sqlpackage.sh @@ -10,8 +10,8 @@ source $HELPER_SCRIPTS/os.sh # Install libssl1.1 dependency if isUbuntu22; then - download_with_retries "http://security.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.1f-1ubuntu2.19_amd64.deb" "/tmp" - dpkg -i /tmp/libssl1.1_1.1.1f-1ubuntu2.19_amd64.deb + download_with_retries "http://security.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.1f-1ubuntu2.20_amd64.deb" "/tmp" + dpkg -i /tmp/libssl1.1_1.1.1f-1ubuntu2.20_amd64.deb fi # Install SqlPackage From e52e9c94e843f80169d5aeb1fd13ad45e0727319 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Tue, 31 Oct 2023 14:17:30 +0100 Subject: [PATCH 2392/3485] [macOS] increase timeout for the macOS ci (#8692) --- images.CI/macos/azure-pipelines/image-generation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images.CI/macos/azure-pipelines/image-generation.yml b/images.CI/macos/azure-pipelines/image-generation.yml index 226e08a653d1..bda268b9f442 100644 --- a/images.CI/macos/azure-pipelines/image-generation.yml +++ b/images.CI/macos/azure-pipelines/image-generation.yml @@ -1,7 +1,7 @@ jobs: - job: Image_generation displayName: Image Generation (${{ parameters.image_label }}) - timeoutInMinutes: 720 + timeoutInMinutes: 1200 pool: name: Mac-Cloud Image Generation variables: From 2d1868a0502ae4db3fcace6098301780d9577310 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 31 Oct 2023 20:54:36 +0000 Subject: [PATCH 2393/3485] Updating readme file for macos-13-arm64 version 20231024.2 (#8673) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-13-arm64-Readme.md | 91 +++++++++++++++------------ 1 file changed, 51 insertions(+), 40 deletions(-) diff --git a/images/macos/macos-13-arm64-Readme.md b/images/macos/macos-13-arm64-Readme.md index 324c78e94072..2c5a84f56bc3 100644 --- a/images/macos/macos-13-arm64-Readme.md +++ b/images/macos/macos-13-arm64-Readme.md @@ -1,26 +1,25 @@ -| Announcements | -|-| -| [[All OS] Android NDK r23 will be removed from images on October 9](https://github.com/actions/runner-images/issues/8383) | -*** # macOS 13 - OS Version: macOS 13.6 (22G120) - Kernel Version: Darwin 22.6.0 -- Image Version: 20231017.1 +- Image Version: 20231024.2 ## Installed Software ### Language and Runtime -- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.402 +- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.403 - Bash 3.2.57(1)-release - Clang/LLVM 14.0.3 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` - GCC 11 (Homebrew GCC 11.4.0) - available by `gcc-11` alias - GCC 12 (Homebrew GCC 12.3.0) - available by `gcc-12` alias +- GCC 13 (Homebrew GCC 13.2.0) - available by `gcc-13` alias - GNU Fortran 11 (Homebrew GCC 11.4.0) - available by `gfortran-11` alias - GNU Fortran 12 (Homebrew GCC 12.3.0) - available by `gfortran-12` alias +- GNU Fortran 13 (Homebrew GCC 13.2.0) - available by `gfortran-13` alias - Julia 1.9.3 - Kotlin 1.9.10-release-459 - Mono 6.12.0.188 +- Node.js 18.18.2 - Perl 5.38.0 - R 4.3.1 - Ruby 3.0.6p216 @@ -29,7 +28,7 @@ - Bundler 2.4.21 - Carthage 0.39.1 - CocoaPods 1.13.0 -- Homebrew 4.1.16 +- Homebrew 4.1.17 - NPM 9.8.1 - NuGet 6.3.1.1 - RubyGems 3.4.21 @@ -44,7 +43,7 @@ - 7-Zip 17.05 - aria2 1.36.0 - azcopy 10.21.0 -- bazel 6.3.2 +- bazel 6.4.0 - bazelisk 1.18.0 - bsdtar 3.5.3 - available by 'tar' alias - Curl 8.1.2 @@ -62,13 +61,13 @@ - zstd 1.5.5 ### Tools -- Azure CLI 2.53.0 +- Azure CLI 2.53.1 - Azure CLI (azure-devops) 0.26.0 - Bicep CLI 0.22.6 - Cmake 3.27.7 -- CodeQL Action Bundle 2.15.0 +- CodeQL Action Bundle 2.15.1 - Fastlane 2.216.0 -- SwiftFormat 0.52.7 +- SwiftFormat 0.52.8 - Xcode Command Line Tools 15.0.0.0.1.1694021235 ### Linters @@ -76,7 +75,7 @@ ### Browsers - Safari 17.0 (18616.1.27.111.22) - SafariDriver 17.0 (18616.1.27.111.22) -- Google Chrome 118.0.5993.88 +- Google Chrome 118.0.5993.117 - Google Chrome for Testing 118.0.5993.70 - ChromeDriver 118.0.5993.70 - Selenium server 4.14.1 @@ -89,11 +88,25 @@ | GECKOWEBDRIVER | | ### Java -| Version | Environment Variable | -| -------------------- | -------------------- | -| 11.0.20+101 | JAVA_HOME_11_arm64 | -| 17.0.8+101 (default) | JAVA_HOME_17_arm64 | -| 21.0.0+35.0.LTS | JAVA_HOME_21_arm64 | +| Version | Environment Variable | +| ------------------ | -------------------- | +| 11.0.21+9 | JAVA_HOME_11_arm64 | +| 17.0.9+9 (default) | JAVA_HOME_17_arm64 | +| 21.0.1+12.0.LTS | JAVA_HOME_21_arm64 | + +### Cached Tools + +#### Python +- 3.11.6 +- 3.12.0 + +#### Node.js +- 16.20.1 +- 18.16.1 + +#### Go +- 1.19.13 +- 1.20.8 ### Rust Tools - Cargo 1.73.0 @@ -103,7 +116,7 @@ #### Packages - Bindgen 0.68.1 -- Cargo-audit 0.18.2 +- Cargo-audit 0.18.3 - Cargo-outdated 0.13.1 - Cbindgen 0.26.0 - Clippy 0.1.73 @@ -121,7 +134,6 @@ | Version | Build | Path | | ---------------- | ------- | ------------------------------ | | 15.0.1 | 15A507 | /Applications/Xcode_15.0.1.app | -| 15.0 | 15A240d | /Applications/Xcode_15.0.app | | 14.3.1 (default) | 14E300c | /Applications/Xcode_14.3.1.app | | 14.2 | 14C18 | /Applications/Xcode_14.2.app | | 14.1 | 14B47b | /Applications/Xcode_14.1.app | @@ -135,46 +147,45 @@ | macOS 13.0 | macosx13.0 | 14.1 | | macOS 13.1 | macosx13.1 | 14.2 | | macOS 13.3 | macosx13.3 | 14.3.1 | -| macOS 14.0 | macosx14.0 | 15.0, 15.0.1 | +| macOS 14.0 | macosx14.0 | 15.0.1 | | iOS 16.1 | iphoneos16.1 | 14.1 | | iOS 16.2 | iphoneos16.2 | 14.2 | | iOS 16.4 | iphoneos16.4 | 14.3.1 | -| iOS 17.0 | iphoneos17.0 | 15.0, 15.0.1 | +| iOS 17.0 | iphoneos17.0 | 15.0.1 | | Simulator - iOS 16.1 | iphonesimulator16.1 | 14.1 | | Simulator - iOS 16.2 | iphonesimulator16.2 | 14.2 | | Simulator - iOS 16.4 | iphonesimulator16.4 | 14.3.1 | -| Simulator - iOS 17.0 | iphonesimulator17.0 | 15.0, 15.0.1 | +| Simulator - iOS 17.0 | iphonesimulator17.0 | 15.0.1 | | tvOS 16.1 | appletvos16.1 | 14.1, 14.2 | | tvOS 16.4 | appletvos16.4 | 14.3.1 | -| tvOS 17.0 | appletvos17.0 | 15.0, 15.0.1 | +| tvOS 17.0 | appletvos17.0 | 15.0.1 | | Simulator - tvOS 16.1 | appletvsimulator16.1 | 14.1, 14.2 | | Simulator - tvOS 16.4 | appletvsimulator16.4 | 14.3.1 | -| Simulator - tvOS 17.0 | appletvsimulator17.0 | 15.0, 15.0.1 | +| Simulator - tvOS 17.0 | appletvsimulator17.0 | 15.0.1 | | watchOS 9.1 | watchos9.1 | 14.1, 14.2 | | watchOS 9.4 | watchos9.4 | 14.3.1 | -| watchOS 10.0 | watchos10.0 | 15.0, 15.0.1 | +| watchOS 10.0 | watchos10.0 | 15.0.1 | | Simulator - watchOS 9.1 | watchsimulator9.1 | 14.1, 14.2 | | Simulator - watchOS 9.4 | watchsimulator9.4 | 14.3.1 | -| Simulator - watchOS 10.0 | watchsimulator10.0 | 15.0, 15.0.1 | +| Simulator - watchOS 10.0 | watchsimulator10.0 | 15.0.1 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | | DriverKit 22.1 | driverkit22.1 | 14.1 | | DriverKit 22.2 | driverkit22.2 | 14.2 | | DriverKit 22.4 | driverkit22.4 | 14.3.1 | -| DriverKit 23.0 | driverkit23.0 | 15.0, 15.0.1 | +| DriverKit 23.0 | driverkit23.0 | 15.0.1 | #### Installed Simulators -| OS | Xcode Version | Simulators | -| ------------ | ---------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| iOS 16.1 | 14.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 16.2 | 14.2 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 16.4 | 14.3.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 17.0 | 14.1<br>14.2<br>14.3.1<br>15.0<br>15.0.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| tvOS 16.1 | 14.1<br>14.2<br>14.3.1<br>15.0<br>15.0.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 16.4 | 14.1<br>14.2<br>14.3.1<br>15.0<br>15.0.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 17.0 | 14.1<br>14.2<br>14.3.1<br>15.0<br>15.0.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| watchOS 9.1 | 14.1<br>14.2<br>14.3.1<br>15.0<br>15.0.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | -| watchOS 9.4 | 14.1<br>14.2<br>14.3.1<br>15.0<br>15.0.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | -| watchOS 10.0 | 14.1<br>14.2<br>14.3.1<br>15.0<br>15.0.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | - +| OS | Xcode Version | Simulators | +| ------------ | -------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| iOS 16.1 | 14.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 16.2 | 14.2 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 16.4 | 14.3.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 17.0 | 14.1<br>14.2<br>14.3.1<br>15.0.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| tvOS 16.1 | 14.1<br>14.2<br>14.3.1<br>15.0.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 16.4 | 14.1<br>14.2<br>14.3.1<br>15.0.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 17.0 | 14.1<br>14.2<br>14.3.1<br>15.0.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| watchOS 9.1 | 14.1<br>14.2<br>14.3.1<br>15.0.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | +| watchOS 9.4 | 14.1<br>14.2<br>14.3.1<br>15.0.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | +| watchOS 10.0 | 14.1<br>14.2<br>14.3.1<br>15.0.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | From 2094c7eb2cf1616f13b21959ad0abd088ee04255 Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Wed, 1 Nov 2023 20:19:37 +0100 Subject: [PATCH 2394/3485] Escape quotes when running in PowerShell 7.0-7.2 (#8705) --- helpers/GenerateResourcesAndImage.ps1 | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/helpers/GenerateResourcesAndImage.ps1 b/helpers/GenerateResourcesAndImage.ps1 index 120e27760c58..5dd3b9ca0ea2 100644 --- a/helpers/GenerateResourcesAndImage.ps1 +++ b/helpers/GenerateResourcesAndImage.ps1 @@ -174,6 +174,10 @@ Function GenerateResourcesAndImage { Write-Verbose "PowerShell 5 detected. Replacing double quotes with escaped double quotes in allowed inbound IP addresses." $AllowedInboundIpAddresses = '[\"{0}\"]' -f $AgentIp } + elseif ($PSVersionTable.PSVersion.Major -eq 7 -and $PSVersionTable.PSVersion.Minor -le 2) { + Write-Verbose "PowerShell 7.0-7.2 detected. Replacing double quotes with escaped double quotes in allowed inbound IP addresses." + $AllowedInboundIpAddresses = '[\"{0}\"]' -f $AgentIp + } else { $AllowedInboundIpAddresses = '["{0}"]' -f $AgentIp } @@ -200,6 +204,10 @@ Function GenerateResourcesAndImage { Write-Verbose "PowerShell 5 detected. Replacing double quotes with escaped double quotes in tags JSON." $TagsJson = $TagsJson -replace '"', '\"' } + elseif ($PSVersionTable.PSVersion.Major -eq 7 -and $PSVersionTable.PSVersion.Minor -le 2) { + Write-Verbose "PowerShell 7.0-7.2 detected. Replacing double quotes with escaped double quotes in tags JSON." + $TagsJson = $TagsJson -replace '"', '\"' + } Write-Debug "Tags JSON: $TagsJson." if ($TemplatePath.Contains(".json")) { Write-Verbose "Injecting tags into packer template." From cdbbd8a4455b608075cbf785bf0e969c13681890 Mon Sep 17 00:00:00 2001 From: Luke Fritts <luketfritts@gmail.com> Date: Wed, 1 Nov 2023 18:00:44 -0400 Subject: [PATCH 2395/3485] fix: checksum search for Kotlin (#8704) * [Ubuntu] Fix checksum search for Kotlin * [Windows] Fixed checksum search for Kotlin --- images/linux/scripts/installers/kotlin.sh | 2 +- images/win/scripts/Installers/Install-Kotlin.ps1 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/images/linux/scripts/installers/kotlin.sh b/images/linux/scripts/installers/kotlin.sh index 59b3f8894de8..9275875025e0 100644 --- a/images/linux/scripts/installers/kotlin.sh +++ b/images/linux/scripts/installers/kotlin.sh @@ -13,7 +13,7 @@ download_url=$(get_github_package_download_url "JetBrains/kotlin" "contains(\"ko download_with_retries "$download_url" "/tmp" "$kotlin_zip_name" # Supply chain security - Kotlin -kotlin_hash=$(get_github_package_hash "JetBrains" "kotlin" "kotlin-compiler" "" "latest" "false" "|" 3) +kotlin_hash=$(get_github_package_hash "JetBrains" "kotlin" "kotlin-compiler-.*\.zip" "" "latest" "false" "|" 3) use_checksum_comparison "/tmp/${kotlin_zip_name}" "$kotlin_hash" unzip -qq /tmp/${kotlin_zip_name} -d $KOTLIN_ROOT diff --git a/images/win/scripts/Installers/Install-Kotlin.ps1 b/images/win/scripts/Installers/Install-Kotlin.ps1 index b5084fd51e41..6558680dc4ee 100644 --- a/images/win/scripts/Installers/Install-Kotlin.ps1 +++ b/images/win/scripts/Installers/Install-Kotlin.ps1 @@ -13,7 +13,7 @@ $kotlinInstallerPath = Start-DownloadWithRetry -Url $kotlinDownloadUrl -Name "$k #region Supply chain security $fileHash = (Get-FileHash -Path $kotlinInstallerPath -Algorithm SHA256).Hash -$externalHash = Get-HashFromGitHubReleaseBody -RepoOwner "JetBrains" -RepoName "kotlin" -FileName "$kotlinBinaryName" -Version $kotlinVersion -WordNumber 2 +$externalHash = Get-HashFromGitHubReleaseBody -RepoOwner "JetBrains" -RepoName "kotlin" -FileName "$kotlinBinaryName-*.zip" -Version $kotlinVersion -WordNumber 2 Use-ChecksumComparison $fileHash $externalHash #endregion From 3146c7010eafd72b0d4a957c8e20667eff4a4c1f Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Thu, 2 Nov 2023 13:52:24 +0100 Subject: [PATCH 2396/3485] [Ubuntu] Pin bindgen cli version to avoid bug (#8714) --- images/linux/scripts/installers/rust.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/images/linux/scripts/installers/rust.sh b/images/linux/scripts/installers/rust.sh index adec5a65a66f..abf3454b4e43 100644 --- a/images/linux/scripts/installers/rust.sh +++ b/images/linux/scripts/installers/rust.sh @@ -20,9 +20,11 @@ source $CARGO_HOME/env rustup component add rustfmt clippy if isUbuntu22; then - cargo install bindgen-cli cbindgen cargo-audit cargo-outdated + cargo install bindgen-cli --version 0.68.1 # Temp fix for https://github.com/rust-lang/rust-bindgen/issues/2677 + cargo install cbindgen cargo-audit cargo-outdated else - cargo install --locked bindgen-cli cbindgen cargo-audit cargo-outdated + cargo install --locked bindgen-cli --version 0.68.1 # Temp fix for https://github.com/rust-lang/rust-bindgen/issues/2677 + cargo install --locked cbindgen cargo-audit cargo-outdated fi # Cleanup Cargo cache From 53416cd923175a5ce0e4e997eba812065a599601 Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Thu, 2 Nov 2023 15:40:32 +0100 Subject: [PATCH 2397/3485] [Ubuntu] Add more checksum validations (#8660) --- images/linux/scripts/helpers/install.sh | 2 +- .../scripts/installers/docker-compose.sh | 14 ++++++++-- images/linux/scripts/installers/docker.sh | 28 +++++++++++-------- images/linux/scripts/installers/github-cli.sh | 12 ++++++-- .../scripts/installers/kubernetes-tools.sh | 19 +++++++------ images/linux/scripts/installers/oras-cli.sh | 17 +++++++---- images/linux/scripts/installers/pulumi.sh | 15 ++++++---- images/linux/scripts/installers/yq.sh | 12 ++++++-- images/linux/scripts/installers/zstd.sh | 8 +++++- 9 files changed, 86 insertions(+), 41 deletions(-) diff --git a/images/linux/scripts/helpers/install.sh b/images/linux/scripts/helpers/install.sh index 56356ebcdd44..e6b793bac50a 100644 --- a/images/linux/scripts/helpers/install.sh +++ b/images/linux/scripts/helpers/install.sh @@ -163,7 +163,7 @@ get_hash_from_remote_file() { exit 1 fi - matching_line=$(curl -fsSL "$url" | tr -d '`') + matching_line=$(curl -fsSL "$url" | sed 's/ */ /g' | tr -d '`') for keyword in "${keywords[@]}"; do matching_line=$(echo "$matching_line" | grep "$keyword") done diff --git a/images/linux/scripts/installers/docker-compose.sh b/images/linux/scripts/installers/docker-compose.sh index 019d0937ec4d..a7383baa983e 100644 --- a/images/linux/scripts/installers/docker-compose.sh +++ b/images/linux/scripts/installers/docker-compose.sh @@ -1,12 +1,20 @@ #!/bin/bash -e ################################################################################ ## File: docker-compose.sh -## Desc: Installs Docker Compose +## Desc: Installs Docker Compose v1 +## Supply chain security: Docker Compose v1 - checksum validation ################################################################################ +# Source the helpers for use with the script +source $HELPER_SCRIPTS/install.sh + # Install docker-compose v1 from releases URL="https://github.com/docker/compose/releases/download/1.29.2/docker-compose-Linux-x86_64" -curl -fsSL $URL -o /usr/local/bin/docker-compose -chmod +x /usr/local/bin/docker-compose +curl -fsSL "${URL}" -o /tmp/docker-compose-v1 + +# Supply chain security - Docker Compose v1 +external_hash=$(get_hash_from_remote_file "${URL}.sha256" "compose-Linux-x86_64") +use_checksum_comparison "/tmp/docker-compose-v1" "${external_hash}" +install /tmp/docker-compose-v1 /usr/local/bin/docker-compose invoke_tests "Tools" "Docker-compose v1" diff --git a/images/linux/scripts/installers/docker.sh b/images/linux/scripts/installers/docker.sh index 4c8b2c154ebb..a11fbd193257 100644 --- a/images/linux/scripts/installers/docker.sh +++ b/images/linux/scripts/installers/docker.sh @@ -2,7 +2,7 @@ ################################################################################ ## File: docker.sh ## Desc: Installs docker onto the image -## Supply chain security: Docker Compose v2 - checksum validation +## Supply chain security: Docker Compose v2, amazon-ecr-credential-helper - checksum validation ################################################################################ # Source the helpers for use with the script @@ -18,13 +18,14 @@ echo "deb [arch=amd64 signed-by=$gpg_key] $repo_url $(getOSVersionLabel) stable" apt-get update apt-get install --no-install-recommends docker-ce docker-ce-cli containerd.io docker-buildx-plugin -# Install docker compose v2 from releases +# Download docker compose v2 from releases URL=$(get_github_package_download_url "docker/compose" "contains(\"compose-linux-x86_64\")") curl -fsSL "${URL}" -o /tmp/docker-compose -# Supply chain security - CMake -hash_url=$(get_github_package_download_url "docker/compose" "contains(\"checksums.txt\")") -external_hash=$(get_hash_from_remote_file "$hash_url" "compose-linux-x86_64") -use_checksum_comparison "/tmp/docker-compose" "$external_hash" +# Supply chain security - Docker Compose v2 +compose_hash_url=$(get_github_package_download_url "docker/compose" "contains(\"checksums.txt\")") +compose_external_hash=$(get_hash_from_remote_file "${compose_hash_url}" "compose-linux-x86_64") +use_checksum_comparison "/tmp/docker-compose" "${compose_external_hash}" +# Install docker compose v2 install /tmp/docker-compose /usr/libexec/docker/cli-plugins/docker-compose @@ -62,17 +63,22 @@ else echo "Skipping docker images pulling" fi -# Install amazon-ecr-credential-helper +# Download amazon-ecr-credential-helper +aws_helper="docker-credential-ecr-login" aws_latest_release_url="https://api.github.com/repos/awslabs/amazon-ecr-credential-helper/releases/latest" -aws_helper_url=$(curl "${authString[@]}" -fsSL $aws_latest_release_url | jq -r '.body' | awk -F'[()]' '/linux-amd64/ {print $2}') -download_with_retries "$aws_helper_url" "/usr/bin" docker-credential-ecr-login -chmod +x /usr/bin/docker-credential-ecr-login +aws_helper_url=$(curl "${authString[@]}" -fsSL "${aws_latest_release_url}" | jq -r '.body' | awk -F'[()]' '/linux-amd64/ {print $2}') +download_with_retries "${aws_helper_url}" "/tmp" "${aws_helper}" +# Supply chain security - amazon-ecr-credential-helper +aws_helper_external_hash=$(get_hash_from_remote_file "${aws_helper_url}.sha256" "${aws_helper}") +use_checksum_comparison "/tmp/${aws_helper}" "${aws_helper_external_hash}" +# Install amazon-ecr-credential-helper +install "/tmp/${aws_helper}" "/usr/bin/${aws_helper}" # Cleanup custom repositories rm $gpg_key rm $repo_path invoke_tests "Tools" "Docker" -if [ "${DOCKERHUB_PULL_IMAGES:-yes}" -eq "yes" ]; then +if [ "${DOCKERHUB_PULL_IMAGES:-yes}" == "yes" ]; then invoke_tests "Tools" "Docker images" fi diff --git a/images/linux/scripts/installers/github-cli.sh b/images/linux/scripts/installers/github-cli.sh index c27e690c6350..303cafa61fba 100644 --- a/images/linux/scripts/installers/github-cli.sh +++ b/images/linux/scripts/installers/github-cli.sh @@ -3,14 +3,20 @@ ## File: github-cli.sh ## Desc: Installs GitHub CLI ## Must be run as non-root user after homebrew +## Supply chain security: GitHub CLI - checksum validation ################################################################################ # Source the helpers for use with the script source $HELPER_SCRIPTS/install.sh +# Download GitHub CLI +URL=$(get_github_package_download_url "cli/cli" "contains(\"linux\") and contains(\"amd64\") and contains(\".deb\")") +download_with_retries "${URL}" "/tmp" "gh_cli_linux_amd64.deb" +# Supply chain security - GitHub CLI +hash_url=$(get_github_package_download_url "cli/cli" "contains(\"checksums.txt\")") +external_hash=$(get_hash_from_remote_file "${hash_url}" "linux_amd64.deb") +use_checksum_comparison "/tmp/gh_cli_linux_amd64.deb" "${external_hash}" # Install GitHub CLI -downloadUrl=$(get_github_package_download_url "cli/cli" "contains(\"linux\") and contains(\"amd64\") and contains(\".deb\")") -download_with_retries $downloadUrl "/tmp" -apt install /tmp/gh_*_linux_amd64.deb +apt install /tmp/gh_cli_linux_amd64.deb invoke_tests "CLI.Tools" "GitHub CLI" diff --git a/images/linux/scripts/installers/kubernetes-tools.sh b/images/linux/scripts/installers/kubernetes-tools.sh index 3858061a69a0..12935cc32eb5 100644 --- a/images/linux/scripts/installers/kubernetes-tools.sh +++ b/images/linux/scripts/installers/kubernetes-tools.sh @@ -2,16 +2,20 @@ ################################################################################ ## File: kubernetes-tools.sh ## Desc: Installs kubectl, helm, kustomize -## Supply chain security: minikube - checksum validation +## Supply chain security: KIND, minikube - checksum validation ################################################################################ # Source the helpers for use with the script source $HELPER_SCRIPTS/install.sh +# Download KIND +kind_url=$(get_github_package_download_url "kubernetes-sigs/kind" "contains(\"kind-linux-amd64\")") +curl -fsSL -o /tmp/kind "${kind_url}" +# Supply chain security - KIND +kind_external_hash=$(get_hash_from_remote_file "${kind_url}.sha256sum" "kind-linux-amd64") +use_checksum_comparison "/tmp/kind" "${kind_external_hash}" # Install KIND -URL=$(get_github_package_download_url "kubernetes-sigs/kind" "contains(\"kind-linux-amd64\")") -curl -fsSL -o /usr/local/bin/kind $URL -chmod +x /usr/local/bin/kind +sudo install /tmp/kind /usr/local/bin/kind ## Install kubectl KUBECTL_MINOR_VERSION=$(curl -fsSL "https://dl.k8s.io/release/stable.txt" | cut -d'.' -f1,2 ) @@ -23,13 +27,12 @@ rm -f /etc/apt/sources.list.d/kubernetes.list # Install Helm curl -fsSL https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3 | bash -# Install minikube +# Download minikube curl -fsSL -O https://storage.googleapis.com/minikube/releases/latest/minikube-linux-amd64 - # Supply chain security - minikube minikube_hash=$(get_github_package_hash "kubernetes" "minikube" "linux-amd64" "" "latest" "false" ":" 2) -use_checksum_comparison "minikube-linux-amd64" "$minikube_hash" - +use_checksum_comparison "minikube-linux-amd64" "${minikube_hash}" +# Install minikube sudo install minikube-linux-amd64 /usr/local/bin/minikube # Install kustomize diff --git a/images/linux/scripts/installers/oras-cli.sh b/images/linux/scripts/installers/oras-cli.sh index 5db36a9a86b2..294e3b9c5a84 100644 --- a/images/linux/scripts/installers/oras-cli.sh +++ b/images/linux/scripts/installers/oras-cli.sh @@ -2,17 +2,22 @@ ################################################################################ ## File: oras-cli.sh ## Desc: Installs ORAS CLI +## Supply chain security: ORAS CLI - checksum validation ################################################################################ source $HELPER_SCRIPTS/install.sh # Determine latest ORAS CLI version -ORAS_CLI_DOWNLOAD_URL=$(get_github_package_download_url "oras-project/oras" "endswith(\"linux_amd64.tar.gz\")") -ORAS_CLI_ARCHIVE=$(basename $ORAS_CLI_DOWNLOAD_URL) +URL=$(get_github_package_download_url "oras-project/oras" "endswith(\"linux_amd64.tar.gz\")") +archive_name=$(basename "${URL}") -# Install ORAS CLI -cd /tmp -download_with_retries $ORAS_CLI_DOWNLOAD_URL -tar xzf $ORAS_CLI_ARCHIVE -C /usr/local/bin oras +# Download ORAS CLI +download_with_retries "${URL}" "/tmp" "${archive_name}" +# Supply chain security - ORAS CLI +hash_url=$(get_github_package_download_url "oras-project/oras" "contains(\"checksums.txt\")") +external_hash=$(get_hash_from_remote_file "${hash_url}" "linux_amd64.tar.gz") +use_checksum_comparison "/tmp/${archive_name}" "${external_hash}" +# Unzip ORAS CLI +tar xzf "/tmp/${archive_name}" -C /usr/local/bin oras invoke_tests "CLI.Tools" "Oras CLI" diff --git a/images/linux/scripts/installers/pulumi.sh b/images/linux/scripts/installers/pulumi.sh index 9c15de3f2b07..769d3282ded5 100644 --- a/images/linux/scripts/installers/pulumi.sh +++ b/images/linux/scripts/installers/pulumi.sh @@ -2,15 +2,20 @@ ################################################################################ ## File: pulumi.sh ## Desc: Installs Pulumi +## Supply chain security: Pulumi - checksum validation ################################################################################ # Source the helpers for use with the script source $HELPER_SCRIPTS/install.sh -# Install Pulumi -VERSION=$(curl -fsSL "https://www.pulumi.com/latest-version") -TARBALL_URL="https://get.pulumi.com/releases/sdk/pulumi-v${VERSION}-linux-x64.tar.gz" -download_with_retries ${TARBALL_URL} "/tmp" pulumi-v${VERSION}.tar.gz -tar --strip=1 -xf /tmp/pulumi-v${VERSION}.tar.gz -C /usr/local/bin +# Dowload Pulumi +version=$(curl -fsSL "https://www.pulumi.com/latest-version") +URL="https://get.pulumi.com/releases/sdk/pulumi-v${version}-linux-x64.tar.gz" +download_with_retries "${URL}" "/tmp" "pulumi-v${version}.tar.gz" +# Supply chain security - Pulumi +external_hash=$(get_hash_from_remote_file "https://github.com/pulumi/pulumi/releases/download/v${version}/SHA512SUMS" "linux-x64.tar.gz") +use_checksum_comparison "/tmp/pulumi-v${version}.tar.gz" "${external_hash}" "512" +# Unzipping Pulumi +tar --strip=1 -xf "/tmp/pulumi-v${version}.tar.gz" -C /usr/local/bin invoke_tests "Tools" "Pulumi" diff --git a/images/linux/scripts/installers/yq.sh b/images/linux/scripts/installers/yq.sh index 19d4e976a7d3..fa1192c2e101 100644 --- a/images/linux/scripts/installers/yq.sh +++ b/images/linux/scripts/installers/yq.sh @@ -2,13 +2,19 @@ ################################################################################ ## File: yq.sh ## Desc: Installs YQ +## Supply chain security: YQ - checksum validation ################################################################################ # Source the helpers for use with the script source $HELPER_SCRIPTS/install.sh -YQ_URL="https://github.com/mikefarah/yq/releases/latest/download/yq_linux_amd64" -download_with_retries "$YQ_URL" "/usr/bin" "yq" -chmod +x /usr/bin/yq +# Download YQ +base_url="https://github.com/mikefarah/yq/releases/latest/download" +download_with_retries "${base_url}/yq_linux_amd64" "/tmp" "yq" +# Supply chain security - YQ +external_hash=$(get_hash_from_remote_file "${base_url}/checksums" "yq_linux_amd64 " "" " " "19") +use_checksum_comparison "/tmp/yq" "${external_hash}" +# Install YQ +sudo install /tmp/yq /usr/bin/yq invoke_tests "Tools" "yq" diff --git a/images/linux/scripts/installers/zstd.sh b/images/linux/scripts/installers/zstd.sh index d845b97f9d55..ebd8df860dae 100644 --- a/images/linux/scripts/installers/zstd.sh +++ b/images/linux/scripts/installers/zstd.sh @@ -2,16 +2,22 @@ ################################################################################ ## File: zstd.sh ## Desc: Installs zstd +## Supply chain security: zstd - checksum validation ################################################################################ # Source the helpers for use with the script source $HELPER_SCRIPTS/install.sh -apt-get install -y liblz4-dev +# Download zstd release_tag=$(curl -fsSL https://api.github.com/repos/facebook/zstd/releases/latest | jq -r '.tag_name') zstd_tar_name=zstd-${release_tag//v}.tar.gz URL=https://github.com/facebook/zstd/releases/download/${release_tag}/${zstd_tar_name} download_with_retries "${URL}" "/tmp" "${zstd_tar_name}" +# Supply chain security - zstd +external_hash=$(get_hash_from_remote_file "${URL}.sha256" "${zstd_tar_name}") +use_checksum_comparison "/tmp/${zstd_tar_name}" "${external_hash}" +# Install zstd +apt-get install -y liblz4-dev tar xzf /tmp/$zstd_tar_name -C /tmp make -C /tmp/zstd-${release_tag//v}/contrib/pzstd all make -C /tmp/zstd-${release_tag//v} zstd-release From 1dac9b9f6bc5607f6a672b9b366afbb89d1f7ec0 Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Thu, 2 Nov 2023 15:56:35 +0100 Subject: [PATCH 2398/3485] [Windows] Pin bindgen cli version to avoid bug (#8713) --- images/win/scripts/Installers/Install-Rust.ps1 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/images/win/scripts/Installers/Install-Rust.ps1 b/images/win/scripts/Installers/Install-Rust.ps1 index 5778fd37a914..55eb40289e23 100644 --- a/images/win/scripts/Installers/Install-Rust.ps1 +++ b/images/win/scripts/Installers/Install-Rust.ps1 @@ -35,7 +35,8 @@ rustup target add x86_64-pc-windows-gnu # Install common tools rustup component add rustfmt clippy -cargo install --locked bindgen-cli cbindgen cargo-audit cargo-outdated +cargo install --locked bindgen-cli --version 0.68.1 # Temp fix for https://github.com/rust-lang/rust-bindgen/issues/2677 +cargo install --locked cbindgen cargo-audit cargo-outdated # Cleanup Cargo crates cache Remove-Item "${env:CARGO_HOME}\registry\*" -Recurse -Force From a8e7f69ab1e672a07c67b66bbcb1255618419e03 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 2 Nov 2023 15:58:10 +0000 Subject: [PATCH 2399/3485] Updating readme file for ubuntu22 version 20231030.2.1 (#8691) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2204-Readme.md | 36 +++++++++++++++---------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/images/linux/Ubuntu2204-Readme.md b/images/linux/Ubuntu2204-Readme.md index fd4e28e9ac86..952a806ead68 100644 --- a/images/linux/Ubuntu2204-Readme.md +++ b/images/linux/Ubuntu2204-Readme.md @@ -1,8 +1,8 @@ # Ubuntu 22.04 - OS Version: 22.04.3 LTS - Kernel Version: 6.2.0-1015-azure -- Image Version: 20231025.1.0 -- Systemd version: 249.11-0ubuntu3.10 +- Image Version: 20231030.2.0 +- Systemd version: 249.11-0ubuntu3.11 ## Installed Software @@ -35,7 +35,7 @@ - Pip3 22.0.2 - Pipx 1.2.1 - RubyGems 3.3.5 -- Vcpkg (build from commit 213c01f87) +- Vcpkg (build from commit 06c79a9af) - Yarn 1.22.19 #### Environment variables @@ -70,8 +70,8 @@ to accomplish this. - Docker Compose v1 1.29.2 - Docker Compose v2 2.23.0 - Docker-Buildx 0.11.2 -- Docker Client 24.0.6 -- Docker Server 24.0.6 +- Docker Client 24.0.7 +- Docker Server 24.0.7 - Fastlane 2.216.0 - Git 2.42.0 - Git LFS 3.4.0 @@ -93,7 +93,7 @@ to accomplish this. - Packer 1.9.4 - Parcel 2.10.1 - Podman 3.4.4 -- Pulumi 3.90.1 +- Pulumi 3.91.1 - R 4.3.1 - Skopeo 1.4.1 - Sphinx Open Source Search Server 2.2.11 @@ -105,14 +105,14 @@ to accomplish this. ### CLI Tools - Alibaba Cloud CLI 3.0.184 -- AWS CLI 2.13.29 +- AWS CLI 2.13.30 - AWS CLI Session Manager Plugin 1.2.497.0 - AWS SAM CLI 1.99.0 - Azure CLI 2.53.1 - Azure CLI (azure-devops) 0.26.0 - GitHub CLI 2.37.0 -- Google Cloud CLI 452.0.0 -- Netlify CLI 16.9.2 +- Google Cloud CLI 452.0.1 +- Netlify CLI 16.9.3 - OpenShift CLI 4.13.18 - ORAS CLI 1.1.0 - Vercel CLI 32.5.0 @@ -121,9 +121,9 @@ to accomplish this. | Version | Environment Variable | | ------------------- | -------------------- | | 8.0.382+5 | JAVA_HOME_8_X64 | -| 11.0.20+1 (default) | JAVA_HOME_11_X64 | -| 17.0.8+1 | JAVA_HOME_17_X64 | -| 21.0.0+35 | JAVA_HOME_21_X64 | +| 11.0.21+9 (default) | JAVA_HOME_11_X64 | +| 17.0.9+9 | JAVA_HOME_17_X64 | +| 21.0.1+12 | JAVA_HOME_21_X64 | ### PHP Tools - PHP: 8.1.2 @@ -157,8 +157,8 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Google Chrome 118.0.5993.117 - ChromeDriver 118.0.5993.70 - Chromium 118.0.5993.0 -- Microsoft Edge 118.0.2088.69 -- Microsoft Edge WebDriver 118.0.2088.69 +- Microsoft Edge 118.0.2088.76 +- Microsoft Edge WebDriver 118.0.2088.76 - Selenium server 4.14.0 - Mozilla Firefox 119.0 - Geckodriver 0.33.0 @@ -230,7 +230,7 @@ Use the following command as a part of your job to start the service: 'sudo syst - 3.1.4 ### PowerShell Tools -- PowerShell 7.2.15 +- PowerShell 7.2.16 #### PowerShell Modules - Az: 9.3.0 @@ -288,8 +288,8 @@ Use the following command as a part of your job to start the service: 'sudo syst | node:16-alpine | sha256:a1f9d027912b58a7c75be7716c97cfbc6d3099f3a97ed84aa490be9dee20e787 | 2023-08-10 | | node:18 | sha256:a6385a6bb2fdcb7c48fc871e35e32af8daaa82c518900be49b76d10c005864c2 | 2023-10-18 | | node:18-alpine | sha256:435dcad253bb5b7f347ebc69c8cc52de7c912eb7241098b920f2fc2d7843183d | 2023-10-18 | -| node:20 | sha256:178f3b2d431a28b6df273ca5d169435850f1072745fff3f9b81000cc44daf500 | 2023-10-25 | -| node:20-alpine | sha256:4df6c64a9bc595ea1eb3782b909d257cd53300822f53d11f1a221a00cd61e983 | 2023-10-25 | +| node:20 | sha256:62efd17e997bc843aefa4c003ed84f43dfac83fa6228c57c898482e50a02e45c | 2023-10-25 | +| node:20-alpine | sha256:8e015de364a2eb2ed7c52a558e9f716dcb615560ffd132234087c10ccc1f2c63 | 2023-10-25 | | ubuntu:18.04 | sha256:152dc042452c496007f07ca9127571cb9c29697f42acbfad72324b2bb2e43c98 | 2023-05-30 | | ubuntu:20.04 | sha256:ed4a42283d9943135ed87d4ee34e542f7f5ad9ecf2f244870e23122f703f91c2 | 2023-10-03 | | ubuntu:22.04 | sha256:2b7412e6465c3c7fc5bb21d3e6f1917c167358449fecac8176c6e496e5c1f05f | 2023-10-05 | @@ -308,7 +308,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | coreutils | 8.32-4.1ubuntu1 | | curl | 7.81.0-1ubuntu1.14 | | dbus | 1.12.20-2ubuntu4.1 | -| dnsutils | 1:9.18.12-0ubuntu0.22.04.3 | +| dnsutils | 1:9.18.18-0ubuntu0.22.04.1 | | dpkg | 1.21.1ubuntu2.2 | | dpkg-dev | 1.21.1ubuntu2.2 | | fakeroot | 1.28-1ubuntu1 | From 960f3f05f6babd3cfe4c060940335bd8249efebf Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 2 Nov 2023 16:01:11 +0000 Subject: [PATCH 2400/3485] Updating readme file for ubuntu20 version 20231030.2.1 (#8690) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/linux/Ubuntu2004-Readme.md | 36 +++++++++++++++---------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/images/linux/Ubuntu2004-Readme.md b/images/linux/Ubuntu2004-Readme.md index ba6f06b1cf3c..34761f96a9da 100644 --- a/images/linux/Ubuntu2004-Readme.md +++ b/images/linux/Ubuntu2004-Readme.md @@ -1,7 +1,7 @@ # Ubuntu 20.04 - OS Version: 20.04.6 LTS - Kernel Version: 5.15.0-1050-azure -- Image Version: 20231025.1.0 +- Image Version: 20231030.2.0 - Systemd version: 245.4-4ubuntu3.22 ## Installed Software @@ -37,7 +37,7 @@ - Pip3 20.0.2 - Pipx 1.2.1 - RubyGems 3.1.2 -- Vcpkg (build from commit 213c01f87) +- Vcpkg (build from commit 06c79a9af) - Yarn 1.22.19 #### Environment variables @@ -75,8 +75,8 @@ to accomplish this. - Docker Compose v1 1.29.2 - Docker Compose v2 2.23.0 - Docker-Buildx 0.11.2 -- Docker Client 24.0.6 -- Docker Server 24.0.6 +- Docker Client 24.0.7 +- Docker Server 24.0.7 - Fastlane 2.216.0 - Git 2.42.0 - Git LFS 3.4.0 @@ -100,7 +100,7 @@ to accomplish this. - Parcel 2.10.1 - PhantomJS 2.1.1 2.1.1 - Podman 3.4.2 -- Pulumi 3.90.1 +- Pulumi 3.91.1 - R 4.3.1 - Skopeo 1.5.0 - Sphinx Open Source Search Server 2.2.11 @@ -112,14 +112,14 @@ to accomplish this. ### CLI Tools - Alibaba Cloud CLI 3.0.174 -- AWS CLI 2.13.29 +- AWS CLI 2.13.30 - AWS CLI Session Manager Plugin 1.2.497.0 - AWS SAM CLI 1.99.0 - Azure CLI 2.53.1 - Azure CLI (azure-devops) 0.26.0 - GitHub CLI 2.37.0 -- Google Cloud CLI 452.0.0 -- Netlify CLI 16.9.2 +- Google Cloud CLI 452.0.1 +- Netlify CLI 16.9.3 - OpenShift CLI 4.13.18 - ORAS CLI 1.1.0 - Vercel CLI 32.5.0 @@ -128,12 +128,12 @@ to accomplish this. | Version | Environment Variable | | ------------------- | -------------------- | | 8.0.382+5 | JAVA_HOME_8_X64 | -| 11.0.20+1 (default) | JAVA_HOME_11_X64 | -| 17.0.8+1 | JAVA_HOME_17_X64 | -| 21.0.0+35 | JAVA_HOME_21_X64 | +| 11.0.21+9 (default) | JAVA_HOME_11_X64 | +| 17.0.9+9 | JAVA_HOME_17_X64 | +| 21.0.1+12 | JAVA_HOME_21_X64 | ### PHP Tools -- PHP: 7.4.33, 8.0.30, 8.1.24, 8.2.11 +- PHP: 7.4.33, 8.0.30, 8.1.25, 8.2.12 - Composer 2.6.5 - PHPUnit 8.5.34 ``` @@ -164,8 +164,8 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Google Chrome 118.0.5993.117 - ChromeDriver 118.0.5993.70 - Chromium 118.0.5993.0 -- Microsoft Edge 118.0.2088.69 -- Microsoft Edge WebDriver 118.0.2088.61 +- Microsoft Edge 118.0.2088.76 +- Microsoft Edge WebDriver 118.0.2088.76 - Selenium server 4.14.0 - Mozilla Firefox 119.0 - Geckodriver 0.33.0 @@ -183,7 +183,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - nbgv 3.6.133+2d32d93cb1 ### Databases -- MongoDB 5.0.21 +- MongoDB 5.0.22 - sqlite3 3.31.1 #### PostgreSQL @@ -244,7 +244,7 @@ Use the following command as a part of your job to start the service: 'sudo syst - 3.1.4 ### PowerShell Tools -- PowerShell 7.2.15 +- PowerShell 7.2.16 #### PowerShell Modules - Az: 9.3.0 @@ -306,8 +306,8 @@ Use the following command as a part of your job to start the service: 'sudo syst | node:16-alpine | sha256:a1f9d027912b58a7c75be7716c97cfbc6d3099f3a97ed84aa490be9dee20e787 | 2023-08-10 | | node:18 | sha256:a6385a6bb2fdcb7c48fc871e35e32af8daaa82c518900be49b76d10c005864c2 | 2023-10-18 | | node:18-alpine | sha256:435dcad253bb5b7f347ebc69c8cc52de7c912eb7241098b920f2fc2d7843183d | 2023-10-18 | -| node:20 | sha256:178f3b2d431a28b6df273ca5d169435850f1072745fff3f9b81000cc44daf500 | 2023-10-25 | -| node:20-alpine | sha256:4df6c64a9bc595ea1eb3782b909d257cd53300822f53d11f1a221a00cd61e983 | 2023-10-25 | +| node:20 | sha256:62efd17e997bc843aefa4c003ed84f43dfac83fa6228c57c898482e50a02e45c | 2023-10-25 | +| node:20-alpine | sha256:8e015de364a2eb2ed7c52a558e9f716dcb615560ffd132234087c10ccc1f2c63 | 2023-10-25 | | ubuntu:16.04 | sha256:1f1a2d56de1d604801a9671f301190704c25d604a416f59e03c04f5c6ffee0d6 | 2021-08-31 | | ubuntu:18.04 | sha256:152dc042452c496007f07ca9127571cb9c29697f42acbfad72324b2bb2e43c98 | 2023-05-30 | | ubuntu:20.04 | sha256:ed4a42283d9943135ed87d4ee34e542f7f5ad9ecf2f244870e23122f703f91c2 | 2023-10-03 | From eee63d18fc0ad31ddefe99ed3a8a489bed1f4735 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 2 Nov 2023 19:13:09 +0000 Subject: [PATCH 2401/3485] Updating readme file for win19 version 20231029.1.1 (#8687) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2019-Readme.md | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index bcf2387215f4..38ea4d6bf19e 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -1,6 +1,6 @@ # Windows Server 2019 - OS Version: 10.0.17763 Build 4974 -- Image Version: 20231025.2.0 +- Image Version: 20231029.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -29,7 +29,7 @@ - pip 23.3.1 (python 3.7) - Pipx 1.2.1 - RubyGems 2.7.6.3 -- Vcpkg (build from commit 213c01f87) +- Vcpkg (build from commit 06c79a9af) - Yarn 1.22.19 #### Environment variables @@ -47,21 +47,21 @@ ### Tools - 7zip 23.01 - aria2 1.36.0 -- azcopy 10.21.0 +- azcopy 10.21.1 - Bazel 6.4.0 - Bazelisk 1.18.0 - Bicep 0.22.6 - Cabal 3.10.1.0 - CMake 3.27.7 - CodeQL Action Bundle 2.15.1 -- Docker 24.0.6 +- Docker 24.0.7 - Docker Compose v1 1.29.2 - Docker Compose v2 2.23.0 - Docker-wincred 0.8.0 - ghc 9.8.1 - Git 2.42.0.windows.2 - Git LFS 3.4.0 -- Google Cloud CLI 452.0.0 +- Google Cloud CLI 452.0.1 - ImageMagick 7.1.1-21 - InnoSetup 6.2.2 - jq 1.7-dirty @@ -76,7 +76,7 @@ - OpenSSL 1.1.1w - Packer 1.9.4 - Parcel 2.10.1 -- Pulumi 3.90.1 +- Pulumi 3.91.1 - R 4.3.1 - Service Fabric SDK 9.1.1436.9590 - Stack 2.13.1 @@ -90,7 +90,7 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.184 -- AWS CLI 2.13.28 +- AWS CLI 2.13.30 - AWS SAM CLI 1.99.0 - AWS Session Manager CLI 1.2.497.0 - Azure CLI 2.53.1 @@ -115,8 +115,8 @@ ### Browsers and Drivers - Google Chrome 118.0.5993.118 - Chrome Driver 118.0.5993.70 -- Microsoft Edge 118.0.2088.61 -- Microsoft Edge Driver 118.0.2088.69 +- Microsoft Edge 118.0.2088.76 +- Microsoft Edge Driver 118.0.2088.76 - Mozilla Firefox 119.0 - Gecko Driver 0.33.0 - IE Driver 4.14.0.0 @@ -135,8 +135,8 @@ | ------------------- | -------------------- | | 8.0.392+8 (default) | JAVA_HOME_8_X64 | | 11.0.21+9 | JAVA_HOME_11_X64 | -| 17.0.8+101 | JAVA_HOME_17_X64 | -| 21.0.0+35.0 | JAVA_HOME_21_X64 | +| 17.0.9+9.1 | JAVA_HOME_17_X64 | +| 21.0.1+12.1 | JAVA_HOME_21_X64 | ### Shells | Name | Target | @@ -500,7 +500,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - nbgv 3.6.133+2d32d93cb1 ### PowerShell Tools -- PowerShell 7.2.15 +- PowerShell 7.2.16 #### Powershell Modules - Az: 9.3.0 @@ -509,7 +509,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Az (Cached): 1.0.0.zip, 1.6.0.zip, 2.3.2.zip, 2.6.0.zip, 3.1.0.zip, 3.5.0.zip, 3.8.0.zip, 4.3.0.zip, 4.4.0.zip, 4.7.0.zip, 5.5.0.zip, 5.9.0.zip, 6.6.0.zip, 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.437 +- AWSPowershell: 4.1.440 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 - Microsoft.Graph: 2.8.0 From 318ec94985378f2142952576677ea174e5f57d88 Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Thu, 2 Nov 2023 21:46:42 +0100 Subject: [PATCH 2402/3485] Revert "[Windows] Pin bindgen cli version to avoid bug (#8713)" (#8719) This reverts commit 1dac9b9f6bc5607f6a672b9b366afbb89d1f7ec0. --- images/win/scripts/Installers/Install-Rust.ps1 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/images/win/scripts/Installers/Install-Rust.ps1 b/images/win/scripts/Installers/Install-Rust.ps1 index 55eb40289e23..5778fd37a914 100644 --- a/images/win/scripts/Installers/Install-Rust.ps1 +++ b/images/win/scripts/Installers/Install-Rust.ps1 @@ -35,8 +35,7 @@ rustup target add x86_64-pc-windows-gnu # Install common tools rustup component add rustfmt clippy -cargo install --locked bindgen-cli --version 0.68.1 # Temp fix for https://github.com/rust-lang/rust-bindgen/issues/2677 -cargo install --locked cbindgen cargo-audit cargo-outdated +cargo install --locked bindgen-cli cbindgen cargo-audit cargo-outdated # Cleanup Cargo crates cache Remove-Item "${env:CARGO_HOME}\registry\*" -Recurse -Force From 50803a9ecd4fcbf0f3a517fd6d49fded73ab439e Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Thu, 2 Nov 2023 21:47:24 +0100 Subject: [PATCH 2403/3485] Revert "[Ubuntu] Pin bindgen cli version to avoid bug (#8714)" (#8720) This reverts commit 3146c7010eafd72b0d4a957c8e20667eff4a4c1f. --- images/linux/scripts/installers/rust.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/images/linux/scripts/installers/rust.sh b/images/linux/scripts/installers/rust.sh index abf3454b4e43..adec5a65a66f 100644 --- a/images/linux/scripts/installers/rust.sh +++ b/images/linux/scripts/installers/rust.sh @@ -20,11 +20,9 @@ source $CARGO_HOME/env rustup component add rustfmt clippy if isUbuntu22; then - cargo install bindgen-cli --version 0.68.1 # Temp fix for https://github.com/rust-lang/rust-bindgen/issues/2677 - cargo install cbindgen cargo-audit cargo-outdated + cargo install bindgen-cli cbindgen cargo-audit cargo-outdated else - cargo install --locked bindgen-cli --version 0.68.1 # Temp fix for https://github.com/rust-lang/rust-bindgen/issues/2677 - cargo install --locked cbindgen cargo-audit cargo-outdated + cargo install --locked bindgen-cli cbindgen cargo-audit cargo-outdated fi # Cleanup Cargo cache From 586dfe691114f1fe9e2fad75667641ddfe491766 Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Thu, 2 Nov 2023 21:47:49 +0100 Subject: [PATCH 2404/3485] [Mac OS] Temporary disable VNC for Mac OS 14 (#8717) --- images.CI/macos/anka/CreateCleanAnkaTemplate.ps1 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/images.CI/macos/anka/CreateCleanAnkaTemplate.ps1 b/images.CI/macos/anka/CreateCleanAnkaTemplate.ps1 index c5e88e217786..9e35ef64fcb6 100644 --- a/images.CI/macos/anka/CreateCleanAnkaTemplate.ps1 +++ b/images.CI/macos/anka/CreateCleanAnkaTemplate.ps1 @@ -182,6 +182,12 @@ Write-Host "`n[#2] Create a VM template:" Write-Host "`t[*] Deleting existed template with name '$TemplateName' before creating a new one" Remove-AnkaVM -VMName $TemplateName +# Temporary disable VNC for macOS 14 +# It's probably Anka's bug fixed in 3.3.2 +if ($shortMacOSVersion -eq "14") { + $env:ANKA_CREATE_VNC = 0 +} + Write-Host "`t[*] Creating Anka VM template with name '$TemplateName' and '$TemplateUsername' user" Write-Host "`t[*] CPU Count: $CPUCount, RamSize: ${RamSizeGb}G, DiskSizeGb: ${DiskSizeGb}G, InstallerPath: $macOSInstaller, TemplateName: $TemplateName" New-AnkaVMTemplate -InstallerPath "$macOSInstaller" ` From 28248792382fb5534a8af0e454c52d363dfd06d9 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 2 Nov 2023 21:15:56 +0000 Subject: [PATCH 2405/3485] Updating readme file for win22 version 20231029.1.1 (#8686) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/win/Windows2022-Readme.md | 50 ++++++++++---------------------- 1 file changed, 16 insertions(+), 34 deletions(-) diff --git a/images/win/Windows2022-Readme.md b/images/win/Windows2022-Readme.md index c8f8d5778158..57157d5ce3bb 100644 --- a/images/win/Windows2022-Readme.md +++ b/images/win/Windows2022-Readme.md @@ -1,6 +1,6 @@ # Windows Server 2022 - OS Version: 10.0.20348 Build 2031 -- Image Version: 20231024.1.0 +- Image Version: 20231029.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -15,7 +15,7 @@ - LLVM 16.0.6 - Node 18.18.2 - Perl 5.32.1 -- PHP 8.2.11 +- PHP 8.2.12 - Python 3.9.13 - Ruby 3.0.6p216 @@ -29,7 +29,7 @@ - pip 23.3.1 (python 3.9) - Pipx 1.2.1 - RubyGems 3.2.33 -- Vcpkg (build from commit 7a6f366ce) +- Vcpkg (build from commit 06c79a9af) - Yarn 1.22.19 #### Environment variables @@ -47,14 +47,14 @@ ### Tools - 7zip 23.01 - aria2 1.36.0 -- azcopy 10.21.0 +- azcopy 10.21.1 - Bazel 6.4.0 - Bazelisk 1.18.0 - Bicep 0.22.6 - Cabal 3.10.1.0 - CMake 3.27.7 - CodeQL Action Bundle 2.15.1 -- Docker 24.0.6 +- Docker 24.0.7 - Docker Compose v1 1.29.2 - Docker Compose v2 2.23.0 - Docker-wincred 0.8.0 @@ -74,7 +74,7 @@ - NSIS 3.08 - OpenSSL 1.1.1w - Packer 1.9.4 -- Pulumi 3.90.0 +- Pulumi 3.91.1 - R 4.3.1 - Service Fabric SDK 9.1.1436.9590 - Stack 2.13.1 @@ -88,7 +88,7 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.184 -- AWS CLI 2.13.28 +- AWS CLI 2.13.30 - AWS SAM CLI 1.99.0 - AWS Session Manager CLI 1.2.497.0 - Azure CLI 2.53.1 @@ -112,8 +112,8 @@ ### Browsers and Drivers - Google Chrome 118.0.5993.118 - Chrome Driver 118.0.5993.70 -- Microsoft Edge 118.0.2088.61 -- Microsoft Edge Driver 118.0.2088.61 +- Microsoft Edge 118.0.2088.76 +- Microsoft Edge Driver 118.0.2088.76 - Mozilla Firefox 119.0 - Gecko Driver 0.33.0 - IE Driver 4.14.0.0 @@ -132,8 +132,8 @@ | ------------------- | -------------------- | | 8.0.392+8 (default) | JAVA_HOME_8_X64 | | 11.0.21+9 | JAVA_HOME_11_X64 | -| 17.0.8+101 | JAVA_HOME_17_X64 | -| 21.0.0+35.0 | JAVA_HOME_21_X64 | +| 17.0.9+9.1 | JAVA_HOME_17_X64 | +| 21.0.1+12.1 | JAVA_HOME_21_X64 | ### Shells | Name | Target | @@ -163,7 +163,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 14.21.3 - 16.20.2 - 18.18.2 -- 20.8.1 +- 20.9.0 #### Python - 3.7.9 @@ -207,7 +207,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Database tools - Azure CosmosDb Emulator 2.14.12.0 - DacFx 162.1.167.1 -- MySQL 8.0.34.0 +- MySQL 8.0.35.0 - SQL OLEDB Driver 18.6.7.0 - SQLPS 1.0 @@ -215,7 +215,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Name | Version | ConfigFile | ServiceName | ServiceStatus | ListenPort | | ------ | ------- | ------------------------------------- | ----------- | ------------- | ---------- | | Apache | 2.4.55 | C:\tools\Apache24\conf\httpd.conf | Apache | Stopped | 80 | -| Nginx | 1.25.2 | C:\tools\nginx-1.25.2\conf\nginx.conf | nginx | Stopped | 80 | +| Nginx | 1.25.3 | C:\tools\nginx-1.25.3\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2022 | Name | Version | Path | @@ -383,24 +383,6 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.Spectre | 17.7.33905.399 | | Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64 | 17.7.33905.399 | | Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64.Spectre | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.14.35.17.5.ARM | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.14.35.17.5.ARM.Spectre | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.14.35.17.5.ARM64 | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.14.35.17.5.ARM64.Spectre | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.14.35.17.5.ATL | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.14.35.17.5.ATL.ARM | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.14.35.17.5.ATL.ARM.Spectre | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.14.35.17.5.ATL.ARM64 | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.14.35.17.5.ATL.ARM64.Spectre | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.14.35.17.5.ATL.Spectre | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.14.35.17.5.MFC | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.14.35.17.5.MFC.ARM | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.14.35.17.5.MFC.ARM.Spectre | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.14.35.17.5.MFC.ARM64 | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.14.35.17.5.MFC.ARM64.Spectre | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.14.35.17.5.MFC.Spectre | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.14.35.17.5.x86.x64 | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.14.35.17.5.x86.x64.Spectre | 17.7.33905.399 | | Microsoft.VisualStudio.Component.VC.14.37.17.7.ARM | 17.7.33905.399 | | Microsoft.VisualStudio.Component.VC.14.37.17.7.ARM.Spectre | 17.7.33905.399 | | Microsoft.VisualStudio.Component.VC.14.37.17.7.ARM64 | 17.7.33905.399 | @@ -559,7 +541,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - nbgv 3.6.133+2d32d93cb1 ### PowerShell Tools -- PowerShell 7.2.15 +- PowerShell 7.2.16 #### Powershell Modules - Az: 9.3.0 @@ -568,7 +550,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Az (Cached): 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.436 +- AWSPowershell: 4.1.440 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 - Microsoft.Graph: 2.8.0 From 5d6938f680075d63fa71f8aa70990866cd12884b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 3 Nov 2023 11:57:42 +0000 Subject: [PATCH 2406/3485] Updating readme file for macOS-11 version 20231030.1 (#8694) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-11-Readme.md | 184 ++++++++++++++++---------------- 1 file changed, 91 insertions(+), 93 deletions(-) diff --git a/images/macos/macos-11-Readme.md b/images/macos/macos-11-Readme.md index da3493c7ffb5..9ab11bcb618a 100644 --- a/images/macos/macos-11-Readme.md +++ b/images/macos/macos-11-Readme.md @@ -1,16 +1,12 @@ -| Announcements | -|-| -| [[All OS] hub utility will be removed on October 2](https://github.com/actions/runner-images/issues/8362) | -*** # macOS 11 - OS Version: macOS 11.7.10 (20G1427) - Kernel Version: Darwin 20.6.0 -- Image Version: 20230921.4 +- Image Version: 20231030.1 ## Installed Software ### Language and Runtime -- .NET Core SDK: 6.0.414, 7.0.102, 7.0.202, 7.0.306, 7.0.401 +- .NET Core SDK: 6.0.416, 7.0.102, 7.0.202, 7.0.306, 7.0.403 - Bash 3.2.57(1)-release - Clang/LLVM 13.0.0 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` @@ -22,33 +18,33 @@ - GNU Fortran 12 (Homebrew GCC 12.3.0) - available by `gfortran-12` alias - Julia 1.9.3 - Kotlin 1.9.10-release-459 -- Go 1.20.8 +- Go 1.20.10 - Mono 6.12.0.188 +- Node.js 18.18.2 - MSBuild 16.10.1.51301 (Mono 6.12.0.188) -- Node.js 18.18.0 - NVM 0.39.5 -- NVM - Cached node versions: 14.21.3, 16.20.2, 18.18.0 -- Perl 5.36.1 -- PHP 8.2.10 +- NVM - Cached node versions: 14.21.3, 16.20.2, 18.18.2, 20.9.0 +- Perl 5.38.0 +- PHP 8.2.12 - Python 2.7.18 -- Python3 3.11.5 +- Python3 3.12.0 - R 4.3.1 - Ruby 2.7.8p225 ### Package Management -- Bundler 2.4.19 +- Bundler 2.4.21 - Carthage 0.39.1 -- CocoaPods 1.12.1 -- Composer 2.6.3 -- Homebrew 4.1.12 -- Miniconda 23.5.2 +- CocoaPods 1.14.2 +- Composer 2.6.5 +- Homebrew 4.1.17 +- Miniconda 23.9.0 - NPM 9.8.1 - NuGet 6.3.1.1 - Pip 20.3.4 (python 2.7) -- Pip3 23.2.1 (python 3.11) -- Pipx 1.2.0 -- RubyGems 3.4.19 -- Vcpkg 2023 (build from commit 7476f0d4e) +- Pip3 23.3.1 (python 3.12) +- Pipx 1.2.1 +- RubyGems 3.4.21 +- Vcpkg 2023 (build from commit 3715d743a) - Yarn 1.22.19 #### Environment variables @@ -59,30 +55,29 @@ ### Project Management - Apache Ant 1.10.14 -- Apache Maven 3.9.4 -- Gradle 8.3 -- Sbt 1.9.6 +- Apache Maven 3.9.5 +- Gradle 8.4 +- Sbt 1.9.7 ### Utilities - 7-Zip 17.05 - aria2 1.36.0 -- azcopy 10.20.1 -- bazel 6.3.2 +- azcopy 10.21.1 +- bazel 6.4.0 - bazelisk 1.18.0 - bsdtar 3.3.2 - available by 'tar' alias -- Curl 8.3.0 +- Curl 8.4.0 - Git 2.42.0 - Git LFS 3.4.0 -- GitHub CLI 2.35.0 +- GitHub CLI 2.37.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.21.4 - gpg (GnuPG) 2.4.3 -- helm v3.12.3+g3a31588 -- Hub CLI 2.14.2 -- ImageMagick 7.1.1-17 +- helm v3.13.1+g3547a4b +- ImageMagick 7.1.1-21 - jq 1.7 -- mongo 5.0.17 -- mongod 5.0.17 +- mongo 5.0.21 +- mongod 5.0.21 - Newman 6.0.0 - OpenSSL 1.1.1w 11 Sep 2023 - Packer 1.9.4 @@ -92,27 +87,27 @@ - Sox 14.4.2 - Subversion (SVN) 1.14.2 - Switchaudio-osx 1.2.2 -- yq 4.35.1 +- yq 4.35.2 - zstd 1.5.5 ### Tools -- Aliyun CLI 3.0.181 +- Aliyun CLI 3.0.184 - App Center CLI 2.14.0 -- AWS CLI 2.13.20 -- AWS SAM CLI 1.97.0 +- AWS CLI 2.13.30 +- AWS SAM CLI 1.99.0 - AWS Session Manager CLI 1.2.497.0 -- Azure CLI 2.52.0 +- Azure CLI 2.53.1 - Azure CLI (azure-devops) 0.26.0 -- Bicep CLI 0.21.1 -- Cabal 3.6.2.0 -- Cmake 3.27.6 -- CodeQL Action Bundles 2.14.4 2.14.5 +- Bicep CLI 0.22.6 +- Cabal 3.10.1.0 +- Cmake 3.27.7 +- CodeQL Action Bundle 2.15.1 - Fastlane 2.216.0 - GHC 9.6.2 - GHCup 0.1.19.4 - Jazzy 0.14.4 -- Stack 2.9.3 -- SwiftFormat 0.52.4 +- Stack 2.13.1 +- SwiftFormat 0.52.8 - Swig 4.1.1 - Xcode Command Line Tools 13.2.0.0.1.1638488800 @@ -121,16 +116,16 @@ - Yamllint 1.32.0 ### Browsers -- Safari 16.6 (16615.3.12.11.3) -- SafariDriver 16.6 (16615.3.12.11.3) -- Google Chrome 117.0.5938.92 -- Google Chrome for Testing 117.0.5938.92 -- ChromeDriver 117.0.5938.92 -- Microsoft Edge 117.0.2045.35 -- Microsoft Edge WebDriver 117.0.2045.35 -- Mozilla Firefox 117.0.1 +- Safari 16.6.1 (16615.3.12.11.5) +- SafariDriver 16.6.1 (16615.3.12.11.5) +- Google Chrome 118.0.5993.117 +- Google Chrome for Testing 118.0.5993.70 +- ChromeDriver 118.0.5993.70 +- Microsoft Edge 118.0.2088.76 +- Microsoft Edge WebDriver 118.0.2088.76 +- Mozilla Firefox 119.0 - geckodriver 0.33.0 -- Selenium server 4.12.1 +- Selenium server 4.14.1 #### Environment variables | Name | Value | @@ -142,9 +137,10 @@ ### Java | Version | Environment Variable | | ------------------- | -------------------- | -| 8.0.382+5 (default) | JAVA_HOME_8_X64 | -| 11.0.20+101 | JAVA_HOME_11_X64 | -| 17.0.8+101 | JAVA_HOME_17_X64 | +| 8.0.392+8 (default) | JAVA_HOME_8_X64 | +| 11.0.21+9 | JAVA_HOME_11_X64 | +| 17.0.9+9 | JAVA_HOME_17_X64 | +| 21.0.1+12.0.LTS | JAVA_HOME_21_X64 | ### Cached Tools @@ -155,58 +151,60 @@ - 3.0.6 - 3.1.4 +#### PyPy +- 2.7.18 [PyPy 7.3.13] +- 3.7.13 [PyPy 7.3.9] +- 3.8.16 [PyPy 7.3.11] +- 3.9.18 [PyPy 7.3.13] +- 3.10.13 [PyPy 7.3.13] + #### Python - 3.7.17 - 3.8.18 - 3.9.18 - 3.10.13 -- 3.11.5 - -#### PyPy -- 2.7.18 [PyPy 7.3.12] -- 3.7.13 [PyPy 7.3.9] -- 3.8.16 [PyPy 7.3.11] -- 3.9.17 [PyPy 7.3.12] -- 3.10.12 [PyPy 7.3.12] +- 3.11.6 +- 3.12.0 #### Node.js - 14.21.3 - 16.20.2 -- 18.18.0 +- 18.18.2 +- 20.9.0 #### Go - 1.19.13 -- 1.20.8 -- 1.21.1 +- 1.20.10 +- 1.21.3 ### Rust Tools -- Cargo 1.72.1 -- Rust 1.72.1 -- Rustdoc 1.72.1 +- Cargo 1.73.0 +- Rust 1.73.0 +- Rustdoc 1.73.0 - Rustup 1.26.0 #### Packages - Bindgen 0.68.1 -- Cargo-audit 0.18.1 +- Cargo-audit 0.18.3 - Cargo-outdated 0.13.1 - Cbindgen 0.26.0 -- Clippy 0.1.72 +- Clippy 0.1.73 - Rustfmt 1.6.0-stable ### PowerShell Tools -- PowerShell 7.2.14 +- PowerShell 7.2.16 #### PowerShell Modules -- Az: 10.3.0 +- Az: 10.4.1 - MarkdownPS: 1.9 - Pester: 5.5.0 - PSScriptAnalyzer: 1.21.0 ### Web Servers -| Name | Version | ConfigFile | ServiceStatus | ListenPort | -| ----- | -------- | ------------------------------- | ------------- | ---------- | -| httpd | 2.4.57_1 | /usr/local/etc/httpd/httpd.conf | none | 80 | -| nginx | 1.25.2 | /usr/local/etc/nginx/nginx.conf | none | 80 | +| Name | Version | ConfigFile | ServiceStatus | ListenPort | +| ----- | ------- | ------------------------------- | ------------- | ---------- | +| httpd | 2.4.58 | /usr/local/etc/httpd/httpd.conf | none | 80 | +| nginx | 1.25.3 | /usr/local/etc/nginx/nginx.conf | none | 80 | ### Xamarin @@ -214,7 +212,7 @@ | Version | Build | Path | | -------------- | ---------- | ------------------------------------ | | 2019 | 8.10.25.2 | /Applications/Visual Studio 2019.app | -| 2022 (default) | 17.6.4.472 | /Applications/Visual Studio.app | +| 2022 (default) | 17.6.6.408 | /Applications/Visual Studio.app | ##### Notes ``` @@ -327,19 +325,19 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" | watchOS 8.3 | 13.2.1 | Apple Watch Series 4 - 40mm<br>Apple Watch Series 4 - 44mm<br>Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | ### Android -| Package Name | Version | -| -------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 8.0 | -| Android Emulator | 32.1.15 | -| Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | -| Android SDK Platforms | android-34 (rev 2)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | -| Android SDK Platform-Tools | 34.0.4 | -| Android Support Repository | 47.0.0 | -| CMake | 3.10.2<br>3.18.1<br>3.22.1 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 23.2.8568313<br>24.0.8215888<br>25.2.9519653 (default)<br>26.0.10792818 | -| SDK Patch Applier v4 | 1 | +| Package Name | Version | +| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 8.0 | +| Android Emulator | 32.1.15 | +| Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | +| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34 (rev 2)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | +| Android SDK Platform-Tools | 34.0.5 | +| Android Support Repository | 47.0.0 | +| CMake | 3.10.2<br>3.18.1<br>3.22.1 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 23.2.8568313<br>24.0.8215888<br>25.2.9519653 (default)<br>26.1.10909125 | +| SDK Patch Applier v4 | 1 | #### Environment variables | Name | Value | @@ -347,7 +345,7 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" | ANDROID_HOME | /Users/runner/Library/Android/sdk | | ANDROID_NDK | /Users/runner/Library/Android/sdk/ndk/25.2.9519653 | | ANDROID_NDK_HOME | /Users/runner/Library/Android/sdk/ndk/25.2.9519653 | -| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/26.0.10792818 | +| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/26.1.10909125 | | ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk/25.2.9519653 | | ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | From 972784c043f2cef854006738f1456d6f1c40b69a Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Fri, 3 Nov 2023 16:46:38 +0100 Subject: [PATCH 2407/3485] [Mac OS] Add template for Mac OS 14 image (#8733) --- images/macos/templates/macOS-14.anka.pkr.hcl | 246 +++++++++++++++++++ images/macos/toolsets/toolset-14.json | 114 +++++++++ 2 files changed, 360 insertions(+) create mode 100644 images/macos/templates/macOS-14.anka.pkr.hcl create mode 100644 images/macos/toolsets/toolset-14.json diff --git a/images/macos/templates/macOS-14.anka.pkr.hcl b/images/macos/templates/macOS-14.anka.pkr.hcl new file mode 100644 index 000000000000..580a2d88f2ce --- /dev/null +++ b/images/macos/templates/macOS-14.anka.pkr.hcl @@ -0,0 +1,246 @@ +packer { + required_plugins { + veertu-anka = { + version = ">= v3.2.0" + source = "github.com/veertuinc/veertu-anka" + } + } +} + +variable "source_vm_name" { + type = string +} + +variable "source_vm_tag" { + type = string +} + +variable "build_id" { + type = string +} + +variable "vm_username" { + type = string + sensitive = true +} + +variable "vm_password" { + type = string + sensitive = true +} + +variable "github_api_pat" { + type = string + default = "" +} + +variable "xcode_install_storage_url" { + type = string + sensitive = true +} + +variable "xcode_install_sas" { + type = string + sensitive = true +} + +variable "vcpu_count" { + type = string + default = "6" +} + +variable "ram_size" { + type = string + default = "24G" +} + +variable "image_os" { + type = string + default = "macos14" +} + +source "veertu-anka-vm-clone" "template" { + vm_name = "${var.build_id}" + source_vm_name = "${var.source_vm_name}" + source_vm_tag = "${var.source_vm_tag}" + vcpu_count = "${var.vcpu_count}" + ram_size = "${var.ram_size}" + stop_vm = "true" +} + +build { + sources = [ + "source.veertu-anka-vm-clone.template" + ] + provisioner "shell" { + inline = [ + "mkdir ~/image-generation" + ] + } + provisioner "file" { + destination = "image-generation/" + sources = [ + "./provision/assets", + "./tests", + "./software-report", + "./helpers" + ] + } + provisioner "file" { + destination = "image-generation/software-report/" + source = "../../helpers/software-report-base" + } + provisioner "file" { + destination = "image-generation/add-certificate.swift" + source = "./provision/configuration/add-certificate.swift" + } + provisioner "file" { + destination = ".bashrc" + source = "./provision/configuration/environment/bashrc" + } + provisioner "file" { + destination = ".bash_profile" + source = "./provision/configuration/environment/bashprofile" + } + provisioner "file" { + destination = "./" + source = "./provision/utils" + } + provisioner "shell" { + inline = [ + "mkdir ~/bootstrap" + ] + } + provisioner "file" { + destination = "bootstrap" + source = "./provision/bootstrap-provisioner/" + } + provisioner "file" { + destination = "image-generation/toolset.json" + source = "./toolsets/toolset-14.json" + } + provisioner "shell" { + scripts = [ + "./provision/core/xcode-clt.sh", + "./provision/core/homebrew.sh" + ] + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" + } + provisioner "shell" { + scripts = [ + "./provision/configuration/configure-tccdb-macos.sh", + "./provision/configuration/disable-auto-updates.sh", + "./provision/configuration/ntpconf.sh", + "./provision/configuration/shell-change.sh" + ] + environment_vars = [ + "PASSWORD=${var.vm_password}", + "USERNAME=${var.vm_username}" + ] + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}" + } + provisioner "shell" { + scripts = [ + "./provision/configuration/preimagedata.sh", + "./provision/configuration/configure-ssh.sh", + "./provision/configuration/configure-machine.sh" + ] + environment_vars = [ + "IMAGE_VERSION=${var.build_id}", + "IMAGE_OS=${var.image_os}", + "PASSWORD=${var.vm_password}" + ] + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" + } + provisioner "shell" { + script = "./provision/core/reboot.sh" + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}" + expect_disconnect = true + } + provisioner "shell" { + pause_before = "30s" + scripts = [ + "./provision/core/open_windows_check.sh", + "./provision/core/powershell.sh", + "./provision/core/mono.sh", + "./provision/core/dotnet.sh", + "./provision/core/python.sh", + "./provision/core/azcopy.sh", + "./provision/core/openssl.sh", + "./provision/core/ruby.sh", + "./provision/core/rubygem.sh", + "./provision/core/git.sh", + "./provision/core/node.sh", + "./provision/core/commonutils.sh" + ] + environment_vars = [ + "API_PAT=${var.github_api_pat}", + "USER_PASSWORD=${var.vm_password}" + ] + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" + } + provisioner "shell" { + script = "./provision/core/xcode.ps1" + environment_vars = [ + "XCODE_INSTALL_STORAGE_URL=${var.xcode_install_storage_url}", + "XCODE_INSTALL_SAS=${var.xcode_install_sas}" + ] + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} pwsh -f {{ .Path }}" + } + provisioner "shell" { + script = "./provision/core/reboot.sh" + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}" + expect_disconnect = true + } + provisioner "shell" { + scripts = [ + "./provision/core/action-archive-cache.sh", + "./provision/core/llvm.sh", + "./provision/core/swiftlint.sh", + "./provision/core/openjdk.sh", + "./provision/core/php.sh", + "./provision/core/aws.sh", + "./provision/core/rust.sh", + "./provision/core/gcc.sh", + "./provision/core/haskell.sh", + "./provision/core/cocoapods.sh", + "./provision/core/android-toolsets.sh", + "./provision/core/apache.sh", + "./provision/core/vcpkg.sh", + "./provision/core/safari.sh", + "./provision/core/chrome.sh", + "./provision/core/edge.sh", + "./provision/core/firefox.sh", + "./provision/core/pypy.sh", + "./provision/core/bicep.sh", + "./provision/core/codeql-bundle.sh" + ] + environment_vars = [ + "API_PAT=${var.github_api_pat}" + ] + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" + } + provisioner "shell" { + script = "./provision/core/delete-duplicate-sims.rb" + execute_command = "source $HOME/.bash_profile; ruby {{ .Path }}" + } + provisioner "shell" { + inline = [ + "pwsh -File \"$HOME/image-generation/software-report/SoftwareReport.Generator.ps1\" -OutputDirectory \"$HOME/image-generation/output/software-report\" -ImageName ${var.build_id}" + ] + execute_command = "source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" + } + provisioner "file" { + destination = "../image-output/" + direction = "download" + source = "./image-generation/output/" + } + provisioner "shell" { + scripts = [ + "./provision/configuration/configure-hostname.sh", + "./provision/configuration/cleanup-brew.sh", + "./provision/configuration/finalize-vm.sh" + ] + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" + } +} diff --git a/images/macos/toolsets/toolset-14.json b/images/macos/toolsets/toolset-14.json new file mode 100644 index 000000000000..69fc0efee404 --- /dev/null +++ b/images/macos/toolsets/toolset-14.json @@ -0,0 +1,114 @@ +{ + "xcode": { + "default": "15.0.1", + "x64": { + "versions": [ + { "link": "15.0.1", "version": "15.0.1+15A507", "symlinks": ["15.0"], "install_runtimes": "true"}, + { "link": "14.3.1", "version": "14.3.1+14E300c","symlinks": ["14.3"], "install_runtimes": "true"} + ] + } + }, + "java": { + "x64": { + "default": "21", + "versions": [ "8", "11", "17", "21"] + } + }, + "android": { + "cmdline-tools": "commandlinetools-mac-10406996_latest.zip", + "sdk-tools": "sdk-tools-darwin-4333796.zip", + "platform_min_version": "33", + "build_tools_min_version": "33.0.2", + "extra-list": [ + "android;m2repository", "google;m2repository", "google;google_play_services" + ], + "addon-list": [], + "additional-tools": [ + "cmake;3.22.1" + ], + "ndk": { + "default": "26", + "versions": [ + "24", "25", "26" + ] + } + }, + "powershellModules": [ + { "name": "Az" }, + { "name": "Pester" }, + { "name": "PSScriptAnalyzer" } + ], + "brew": { + "common_packages": [ + "ant", + "aria2", + "azure-cli", + "bazelisk", + "carthage", + "cmake", + "gh", + "gnupg", + "gnu-tar", + "kotlin", + "libpq", + "p7zip", + "packer", + "perl", + "pkg-config", + "swiftformat", + "zstd", + "gmp", + "r", + "yq", + "unxip" + ], + "cask_packages": [ + "julia" + ] + }, + "gcc": { + "versions": [ + "11", + "12", + "13" + ] + }, + "dotnet": { + "arch":{ + "x64": { + "versions": [ + "7.0" + ] + } + } + }, + "ruby": { + "default": "3.0", + "rubygems": [ + "cocoapods", + "xcpretty", + "bundler", + "fastlane" + ] + }, + "go": { + "default": "1.20" + }, + "node": { + "default": "18" + }, + "llvm": { + "version": "15" + }, + "php": { + "version": "8.2" + }, + "mono": { + "framework":{ + "version": "6.12.0.188" + }, + "nunit": { + "version": "3.15.4" + } + } +} From b4c925075cc2acfddbc39daad43b7666aaebcd7a Mon Sep 17 00:00:00 2001 From: Harmen Stoppels <harmenstoppels@gmail.com> Date: Fri, 3 Nov 2023 21:27:06 +0100 Subject: [PATCH 2408/3485] Add gfortran-13 (#8702) --- images/linux/toolsets/toolset-2204.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/images/linux/toolsets/toolset-2204.json b/images/linux/toolsets/toolset-2204.json index 990319efa4c4..5c6c82abe5ff 100644 --- a/images/linux/toolsets/toolset-2204.json +++ b/images/linux/toolsets/toolset-2204.json @@ -277,7 +277,8 @@ "versions": [ "gfortran-9", "gfortran-10", - "gfortran-12" + "gfortran-12", + "gfortran-13" ] }, "php": { From 0226f7ba027b42db6980bd37c1e2f222f3932e99 Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Mon, 6 Nov 2023 11:53:10 +0100 Subject: [PATCH 2409/3485] Revert "[MacOS] Unpin Virtualbox" (#8731) * Revert "[MacOS] Unpin Virtualbox (#8653)" This reverts commit f3d011eec1140de7544c9dbf4824a396f25c8447. * Add more info --- images/macos/provision/core/commonutils.sh | 13 ++++++++++++- images/macos/tests/Common.Tests.ps1 | 6 ++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/images/macos/provision/core/commonutils.sh b/images/macos/provision/core/commonutils.sh index 1f472d2d4a96..1010158858e4 100644 --- a/images/macos/provision/core/commonutils.sh +++ b/images/macos/provision/core/commonutils.sh @@ -13,7 +13,18 @@ done cask_packages=$(get_toolset_value '.brew.cask_packages[]') for package in $cask_packages; do echo "Installing $package..." - brew install --cask $package + if [[ $package == "virtualbox" ]]; then + if ! is_Ventura || ! is_VenturaArm64; then + # Do not update VirtualBox on macOS 12 due to the issue with VMs in gurumediation state which blocks Vagrant on macOS: https://github.com/actions/runner-images/issues/8730 + # macOS host: Dropped all kernel extensions. VirtualBox relies fully on the hypervisor and vmnet frameworks provided by Apple now. + vbcask_url="https://raw.githubusercontent.com/Homebrew/homebrew-cask/aa3c55951fc9d687acce43e5c0338f42c1ddff7b/Casks/virtualbox.rb" + download_with_retries $vbcask_url + brew install ./virtualbox.rb + rm ./virtualbox.rb + fi + else + brew install --cask $package + fi done # Load "Parallels International GmbH" diff --git a/images/macos/tests/Common.Tests.ps1 b/images/macos/tests/Common.Tests.ps1 index 9e278773363e..e1e645e7f5af 100644 --- a/images/macos/tests/Common.Tests.ps1 +++ b/images/macos/tests/Common.Tests.ps1 @@ -123,6 +123,12 @@ Describe "Go" -Skip:($os.IsVentura -or $os.IsVenturaArm64) { } } +Describe "VirtualBox" -Skip:($os.IsBigSur -or $os.IsVentura -or $os.IsVenturaArm64) { + It "Check kext kernel modules" { + kextstat | Out-String | Should -Match "org.virtualbox.kext" + } +} + Describe "CodeQL Bundle" { It "Is installed" { $CodeQLVersionWildcard = Join-Path $Env:AGENT_TOOLSDIRECTORY -ChildPath "CodeQL" | Join-Path -ChildPath "*" From a276d820b22dd49139ae95c75ff61ee50b211804 Mon Sep 17 00:00:00 2001 From: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com> Date: Mon, 6 Nov 2023 11:54:23 +0100 Subject: [PATCH 2410/3485] [ubuntu] split git and git-lfs into separate install scripts (#8711) for better observability of integrity validation let us split install script into two --- images/linux/scripts/installers/git-lfs.sh | 22 ++++++++++++++++++++++ images/linux/scripts/installers/git.sh | 7 ------- images/linux/scripts/tests/Tools.Tests.ps1 | 10 ++++++---- images/linux/ubuntu2004.json | 1 + images/linux/ubuntu2204.pkr.hcl | 1 + images/linux/ubuntuminimal.pkr.hcl | 1 + 6 files changed, 31 insertions(+), 11 deletions(-) create mode 100644 images/linux/scripts/installers/git-lfs.sh diff --git a/images/linux/scripts/installers/git-lfs.sh b/images/linux/scripts/installers/git-lfs.sh new file mode 100644 index 000000000000..a379a7c0fa5e --- /dev/null +++ b/images/linux/scripts/installers/git-lfs.sh @@ -0,0 +1,22 @@ +#!/bin/bash -e +################################################################################ +## File: git-lfs.sh +## Desc: Installs Git-lfs +################################################################################ + +# Source the helpers for use with the script +source $HELPER_SCRIPTS/install.sh + +GIT_LFS_REPO="https://packagecloud.io/install/repositories/github/git-lfs" + +# Install git-lfs +curl -fsSL $GIT_LFS_REPO/script.deb.sh | bash +apt-get install -y git-lfs + +# Remove source repo's +rm /etc/apt/sources.list.d/github_git-lfs.list + +# Document apt source repo's +echo "git-lfs $GIT_LFS_REPO" >> $HELPER_SCRIPTS/apt-sources.txt + +invoke_tests "Tools" "Git-lfs" diff --git a/images/linux/scripts/installers/git.sh b/images/linux/scripts/installers/git.sh index e6f80ef5b769..9e7e8c477a22 100644 --- a/images/linux/scripts/installers/git.sh +++ b/images/linux/scripts/installers/git.sh @@ -8,7 +8,6 @@ source $HELPER_SCRIPTS/install.sh GIT_REPO="ppa:git-core/ppa" -GIT_LFS_REPO="https://packagecloud.io/install/repositories/github/git-lfs" ## Install git add-apt-repository $GIT_REPO -y @@ -21,20 +20,14 @@ cat <<EOF >> /etc/gitconfig directory = * EOF -# Install git-lfs -curl -fsSL $GIT_LFS_REPO/script.deb.sh | bash -apt-get install -y git-lfs - # Install git-ftp apt-get install git-ftp -y # Remove source repo's add-apt-repository --remove $GIT_REPO -rm /etc/apt/sources.list.d/github_git-lfs.list # Document apt source repo's echo "git-core $GIT_REPO" >> $HELPER_SCRIPTS/apt-sources.txt -echo "git-lfs $GIT_LFS_REPO" >> $HELPER_SCRIPTS/apt-sources.txt # Add well-known SSH host keys to known_hosts ssh-keyscan -t rsa,ecdsa,ed25519 github.com >> /etc/ssh/ssh_known_hosts diff --git a/images/linux/scripts/tests/Tools.Tests.ps1 b/images/linux/scripts/tests/Tools.Tests.ps1 index 396eed4b1fe6..e420314ef76b 100644 --- a/images/linux/scripts/tests/Tools.Tests.ps1 +++ b/images/linux/scripts/tests/Tools.Tests.ps1 @@ -241,15 +241,17 @@ Describe "Git" { "git --version" | Should -ReturnZeroExitCode } - It "git-lfs" { - "git-lfs --version" | Should -ReturnZeroExitCode - } - It "git-ftp" { "git-ftp --version" | Should -ReturnZeroExitCode } } +Describe "Git-lfs" { + It "git-lfs" { + "git-lfs --version" | Should -ReturnZeroExitCode + } +} + Describe "Heroku" { It "heroku" { "heroku --version" | Should -ReturnZeroExitCode diff --git a/images/linux/ubuntu2004.json b/images/linux/ubuntu2004.json index 5e66c9bb9377..875edeafb659 100644 --- a/images/linux/ubuntu2004.json +++ b/images/linux/ubuntu2004.json @@ -217,6 +217,7 @@ "{{template_dir}}/scripts/installers/gcc.sh", "{{template_dir}}/scripts/installers/gfortran.sh", "{{template_dir}}/scripts/installers/git.sh", + "{{template_dir}}/scripts/installers/git-lfs.sh", "{{template_dir}}/scripts/installers/github-cli.sh", "{{template_dir}}/scripts/installers/google-chrome.sh", "{{template_dir}}/scripts/installers/google-cloud-cli.sh", diff --git a/images/linux/ubuntu2204.pkr.hcl b/images/linux/ubuntu2204.pkr.hcl index c437616936ad..500d959f4192 100644 --- a/images/linux/ubuntu2204.pkr.hcl +++ b/images/linux/ubuntu2204.pkr.hcl @@ -300,6 +300,7 @@ build { "${path.root}/scripts/installers/gcc.sh", "${path.root}/scripts/installers/gfortran.sh", "${path.root}/scripts/installers/git.sh", + "${path.root}/scripts/installers/git-lfs.sh", "${path.root}/scripts/installers/github-cli.sh", "${path.root}/scripts/installers/google-chrome.sh", "${path.root}/scripts/installers/google-cloud-cli.sh", diff --git a/images/linux/ubuntuminimal.pkr.hcl b/images/linux/ubuntuminimal.pkr.hcl index 6798420a4dee..373fc06f43e0 100644 --- a/images/linux/ubuntuminimal.pkr.hcl +++ b/images/linux/ubuntuminimal.pkr.hcl @@ -257,6 +257,7 @@ build { execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" scripts = [ "${path.root}/scripts/installers/git.sh", + "${path.root}/scripts/installers/git-lfs.sh", "${path.root}/scripts/installers/github-cli.sh", "${path.root}/scripts/installers/zstd.sh" ] From 7b64e0503ed2f3fcec42ffb8a4e518a7f975135f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 6 Nov 2023 13:02:40 +0000 Subject: [PATCH 2411/3485] Updating readme file for macOS-12 version 20231029.1 (#8695) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-12-Readme.md | 192 ++++++++++++++++---------------- 1 file changed, 96 insertions(+), 96 deletions(-) diff --git a/images/macos/macos-12-Readme.md b/images/macos/macos-12-Readme.md index 93603ac7ed11..57f5bd978902 100644 --- a/images/macos/macos-12-Readme.md +++ b/images/macos/macos-12-Readme.md @@ -1,52 +1,50 @@ -| Announcements | -|-| -| [[All OS] hub utility will be removed on October 2](https://github.com/actions/runner-images/issues/8362) | -*** # macOS 12 - OS Version: macOS 12.7 (21G816) - Kernel Version: Darwin 21.6.0 -- Image Version: 20230921.4 +- Image Version: 20231029.1 ## Installed Software ### Language and Runtime -- .NET Core SDK: 6.0.414, 7.0.102, 7.0.202, 7.0.306, 7.0.401 +- .NET Core SDK: 6.0.416, 7.0.102, 7.0.202, 7.0.306, 7.0.403 - Bash 3.2.57(1)-release - Clang/LLVM 14.0.0 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` - GCC 11 (Homebrew GCC 11.4.0) - available by `gcc-11` alias - GCC 12 (Homebrew GCC 12.3.0) - available by `gcc-12` alias +- GCC 13 (Homebrew GCC 13.2.0) - available by `gcc-13` alias - GNU Fortran 11 (Homebrew GCC 11.4.0) - available by `gfortran-11` alias - GNU Fortran 12 (Homebrew GCC 12.3.0) - available by `gfortran-12` alias +- GNU Fortran 13 (Homebrew GCC 13.2.0) - available by `gfortran-13` alias - Julia 1.9.3 - Kotlin 1.9.10-release-459 -- Go 1.20.8 +- Go 1.20.10 - Mono 6.12.0.188 +- Node.js 18.18.2 - MSBuild 16.10.1.51301 (Mono 6.12.0.188) -- Node.js 18.18.0 - NVM 0.39.5 -- NVM - Cached node versions: 14.21.3, 16.20.2, 18.18.0 -- Perl 5.36.1 -- PHP 8.2.10 +- NVM - Cached node versions: 14.21.3, 16.20.2, 18.18.2, 20.9.0 +- Perl 5.38.0 +- PHP 8.2.12 - Python 2.7.18 -- Python3 3.11.5 +- Python3 3.12.0 - R 4.3.1 - Ruby 3.0.6p216 ### Package Management -- Bundler 2.4.19 +- Bundler 2.4.21 - Carthage 0.39.1 -- CocoaPods 1.12.1 -- Composer 2.6.3 -- Homebrew 4.1.12 -- Miniconda 23.5.2 +- CocoaPods 1.14.2 +- Composer 2.6.5 +- Homebrew 4.1.17 +- Miniconda 23.9.0 - NPM 9.8.1 - NuGet 6.3.1.1 - Pip 20.3.4 (python 2.7) -- Pip3 23.2.1 (python 3.11) -- Pipx 1.2.0 -- RubyGems 3.4.19 -- Vcpkg 2023 (build from commit 7476f0d4e) +- Pip3 23.3.1 (python 3.12) +- Pipx 1.2.1 +- RubyGems 3.4.21 +- Vcpkg 2023 (build from commit 06c79a9af) - Yarn 1.22.19 #### Environment variables @@ -57,29 +55,28 @@ ### Project Management - Apache Ant 1.10.14 -- Apache Maven 3.9.4 -- Gradle 8.3 -- Sbt 1.9.6 +- Apache Maven 3.9.5 +- Gradle 8.4 +- Sbt 1.9.7 ### Utilities - 7-Zip 17.05 - aria2 1.36.0 -- azcopy 10.20.1 -- bazel 6.3.2 +- azcopy 10.21.1 +- bazel 6.4.0 - bazelisk 1.18.0 - bsdtar 3.5.1 - available by 'tar' alias -- Curl 8.3.0 +- Curl 8.4.0 - Git 2.42.0 - Git LFS 3.4.0 -- GitHub CLI 2.35.0 +- GitHub CLI 2.37.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.21.4 - gpg (GnuPG) 2.4.3 -- Hub CLI 2.14.2 -- ImageMagick 7.1.1-17 +- ImageMagick 7.1.1-21 - jq 1.7 -- mongo 5.0.17 -- mongod 5.0.17 +- mongo 5.0.21 +- mongod 5.0.21 - OpenSSL 1.1.1w 11 Sep 2023 - Packer 1.9.4 - pkg-config 0.29.2 @@ -88,47 +85,47 @@ - Sox 14.4.2 - Subversion (SVN) 1.14.2 - Switchaudio-osx 1.2.2 -- Vagrant 2.3.7 -- VirtualBox 6.1.38r153438 -- yq 4.35.1 +- Vagrant 2.4.0 +- VirtualBox 7.0.12r159484 +- yq 4.35.2 - zstd 1.5.5 ### Tools - App Center CLI 2.14.0 -- AWS CLI 2.13.20 -- AWS SAM CLI 1.97.0 +- AWS CLI 2.13.30 +- AWS SAM CLI 1.99.0 - AWS Session Manager CLI 1.2.497.0 -- Azure CLI 2.52.0 +- Azure CLI 2.53.1 - Azure CLI (azure-devops) 0.26.0 -- Bicep CLI 0.21.1 +- Bicep CLI 0.22.6 - Cabal 3.6.2.0 -- Cmake 3.27.6 -- CodeQL Action Bundles 2.14.4 2.14.5 -- Colima 0.5.5 +- Cmake 3.27.7 +- CodeQL Action Bundle 2.15.1 +- Colima 0.5.6 - Fastlane 2.216.0 -- GHC 9.6.2 +- GHC 9.8.1 - GHCup 0.1.19.4 - Jazzy 0.14.4 -- Stack 2.9.3 -- SwiftFormat 0.52.4 +- Stack 2.13.1 +- SwiftFormat 0.52.8 - Swig 4.1.1 - Xcode Command Line Tools 14.2.0.0.1.1668646533 ### Linters -- SwiftLint 0.52.4 +- SwiftLint 0.53.0 - Yamllint 1.32.0 ### Browsers -- Safari 16.6.1 (17615.3.12.11.5) -- SafariDriver 16.6.1 (17615.3.12.11.5) -- Google Chrome 117.0.5938.92 -- Google Chrome for Testing 117.0.5938.92 -- ChromeDriver 117.0.5938.92 -- Microsoft Edge 117.0.2045.35 -- Microsoft Edge WebDriver 117.0.2045.35 -- Mozilla Firefox 117.0.1 +- Safari 17.0 (17616.1.27.111.22) +- SafariDriver 17.0 (17616.1.27.111.22) +- Google Chrome 118.0.5993.117 +- Google Chrome for Testing 118.0.5993.70 +- ChromeDriver 118.0.5993.70 +- Microsoft Edge 118.0.2088.76 +- Microsoft Edge WebDriver 118.0.2088.76 +- Mozilla Firefox 119.0 - geckodriver 0.33.0 -- Selenium server 4.12.1 +- Selenium server 4.14.1 #### Environment variables | Name | Value | @@ -140,9 +137,10 @@ ### Java | Version | Environment Variable | | ------------------- | -------------------- | -| 8.0.382+5 (default) | JAVA_HOME_8_X64 | -| 11.0.20+101 | JAVA_HOME_11_X64 | -| 17.0.8+101 | JAVA_HOME_17_X64 | +| 8.0.392+8 (default) | JAVA_HOME_8_X64 | +| 11.0.21+9 | JAVA_HOME_11_X64 | +| 17.0.9+9 | JAVA_HOME_17_X64 | +| 21.0.1+12.0.LTS | JAVA_HOME_21_X64 | ### Cached Tools @@ -151,58 +149,60 @@ - 3.0.6 - 3.1.4 +#### PyPy +- 2.7.18 [PyPy 7.3.13] +- 3.7.13 [PyPy 7.3.9] +- 3.8.16 [PyPy 7.3.11] +- 3.9.18 [PyPy 7.3.13] +- 3.10.13 [PyPy 7.3.13] + #### Python - 3.7.17 - 3.8.18 - 3.9.18 - 3.10.13 -- 3.11.5 - -#### PyPy -- 2.7.18 [PyPy 7.3.12] -- 3.7.13 [PyPy 7.3.9] -- 3.8.16 [PyPy 7.3.11] -- 3.9.17 [PyPy 7.3.12] -- 3.10.12 [PyPy 7.3.12] +- 3.11.6 +- 3.12.0 #### Node.js - 14.21.3 - 16.20.2 -- 18.18.0 +- 18.18.2 +- 20.9.0 #### Go - 1.19.13 -- 1.20.8 -- 1.21.1 +- 1.20.10 +- 1.21.3 ### Rust Tools -- Cargo 1.72.1 -- Rust 1.72.1 -- Rustdoc 1.72.1 +- Cargo 1.73.0 +- Rust 1.73.0 +- Rustdoc 1.73.0 - Rustup 1.26.0 #### Packages - Bindgen 0.68.1 -- Cargo-audit 0.18.1 +- Cargo-audit 0.18.3 - Cargo-outdated 0.13.1 - Cbindgen 0.26.0 -- Clippy 0.1.72 +- Clippy 0.1.73 - Rustfmt 1.6.0-stable ### PowerShell Tools -- PowerShell 7.2.14 +- PowerShell 7.2.16 #### PowerShell Modules -- Az: 10.3.0 +- Az: 10.4.1 - MarkdownPS: 1.9 - Pester: 5.5.0 - PSScriptAnalyzer: 1.21.0 ### Web Servers -| Name | Version | ConfigFile | ServiceStatus | ListenPort | -| ----- | -------- | ------------------------------- | ------------- | ---------- | -| httpd | 2.4.57_1 | /usr/local/etc/httpd/httpd.conf | none | 80 | -| nginx | 1.25.2 | /usr/local/etc/nginx/nginx.conf | none | 80 | +| Name | Version | ConfigFile | ServiceStatus | ListenPort | +| ----- | ------- | ------------------------------- | ------------- | ---------- | +| httpd | 2.4.58 | /usr/local/etc/httpd/httpd.conf | none | 80 | +| nginx | 1.25.3 | /usr/local/etc/nginx/nginx.conf | none | 80 | ### Xamarin @@ -210,7 +210,7 @@ | Version | Build | Path | | -------------- | ---------- | ------------------------------------ | | 2019 | 8.10.25.2 | /Applications/Visual Studio 2019.app | -| 2022 (default) | 17.6.4.472 | /Applications/Visual Studio.app | +| 2022 (default) | 17.6.6.408 | /Applications/Visual Studio.app | ##### Notes ``` @@ -326,19 +326,19 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" | watchOS 9.1 | 13.1<br>13.2.1<br>13.3.1<br>13.4.1<br>14.0.1<br>14.1<br>14.2 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | ### Android -| Package Name | Version | -| -------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 8.0 | -| Android Emulator | 32.1.15 | -| Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | -| Android SDK Platforms | android-34 (rev 2)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | -| Android SDK Platform-Tools | 34.0.4 | -| Android Support Repository | 47.0.0 | -| CMake | 3.18.1<br>3.22.1 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 23.2.8568313<br>24.0.8215888<br>25.2.9519653 (default)<br>26.0.10792818 | -| SDK Patch Applier v4 | 1 | +| Package Name | Version | +| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 8.0 | +| Android Emulator | 32.1.15 | +| Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | +| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34 (rev 2)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | +| Android SDK Platform-Tools | 34.0.5 | +| Android Support Repository | 47.0.0 | +| CMake | 3.18.1<br>3.22.1 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 23.2.8568313<br>24.0.8215888<br>25.2.9519653 (default)<br>26.1.10909125 | +| SDK Patch Applier v4 | 1 | #### Environment variables | Name | Value | @@ -346,7 +346,7 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" | ANDROID_HOME | /Users/runner/Library/Android/sdk | | ANDROID_NDK | /Users/runner/Library/Android/sdk/ndk/25.2.9519653 | | ANDROID_NDK_HOME | /Users/runner/Library/Android/sdk/ndk/25.2.9519653 | -| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/26.0.10792818 | +| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/26.1.10909125 | | ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk/25.2.9519653 | | ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | @@ -359,7 +359,7 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" #### Environment variables | Name | Value | | ----------------- | ----------------------------------------------------------------------------------------- | -| PARALLELS_DMG_URL | https://download.parallels.com/desktop/v19/19.0.0-54570/ParallelsDesktop-19.0.0-54570.dmg | +| PARALLELS_DMG_URL | https://download.parallels.com/desktop/v19/19.1.0-54729/ParallelsDesktop-19.1.0-54729.dmg | ##### Notes ``` From 2caa346dc5fc489e3376dc970d167834ffbae880 Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Mon, 6 Nov 2023 18:05:31 +0100 Subject: [PATCH 2412/3485] [Windows] Remove Android SDK Patch applier v4 (#8750) --- images/linux/scripts/tests/Android.Tests.ps1 | 3 +-- images/win/toolsets/toolset-2019.json | 3 +-- images/win/toolsets/toolset-2022.json | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/images/linux/scripts/tests/Android.Tests.ps1 b/images/linux/scripts/tests/Android.Tests.ps1 index 4c0b29964330..0ed6847e5a6d 100644 --- a/images/linux/scripts/tests/Android.Tests.ps1 +++ b/images/linux/scripts/tests/Android.Tests.ps1 @@ -33,7 +33,6 @@ Describe "Android" { # Convert 'm2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta1' -> # 'm2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-beta1' # 'cmake;3.6.4111459' -> 'cmake/3.6.4111459' - # 'patcher;v4' -> 'patcher/v4' $PackageName = $PackageName.Replace(";", "/") $targetPath = Join-Path $env:ANDROID_HOME $PackageName $targetPath | Should -Exist @@ -65,4 +64,4 @@ Describe "Android" { Validate-AndroidPackage $PackageName } } -} \ No newline at end of file +} diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index b15f5d5ac3f2..366cc92fcebe 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -170,8 +170,7 @@ "additional_tools": [ "cmake;3.10.2.4988404", "cmake;3.18.1", - "cmake;3.22.1", - "patcher;v4" + "cmake;3.22.1" ], "ndk": { "default": "25", diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index 812d5fedf5e5..fc09ab007343 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -144,8 +144,7 @@ "addon_list": [], "additional_tools": [ "cmake;3.18.1", - "cmake;3.22.1", - "patcher;v4" + "cmake;3.22.1" ], "ndk": { "default": "25", From da0af62e917dfbd8562957242b89ac8f5425e2c3 Mon Sep 17 00:00:00 2001 From: sergei-pyshnoi <121864472+sergei-pyshnoi@users.noreply.github.com> Date: Mon, 6 Nov 2023 19:09:03 +0100 Subject: [PATCH 2413/3485] remove ndk 23 from macos images (#8747) --- images/macos/toolsets/toolset-11.json | 2 +- images/macos/toolsets/toolset-12.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index 0b7c7a7f2a0b..20220cb92cdb 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -174,7 +174,7 @@ "ndk": { "default": "25", "versions": [ - "23", "24", "25", "26" + "24", "25", "26" ] } }, diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index 75a2aff6eb3f..b5f3d8f7f6ad 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -160,7 +160,7 @@ "ndk": { "default": "25", "versions": [ - "23", "24", "25", "26" + "24", "25", "26" ] } }, From 98c6d29ec958daadbbe3300d7931b604fb4b08b8 Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Mon, 6 Nov 2023 19:24:44 +0100 Subject: [PATCH 2414/3485] [Mac OS] Remove 'LTS' suffix from OpenJDK version (#8751) --- images/macos/provision/core/openjdk.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/images/macos/provision/core/openjdk.sh b/images/macos/provision/core/openjdk.sh index bf55493ce6f7..496abd0780cf 100755 --- a/images/macos/provision/core/openjdk.sh +++ b/images/macos/provision/core/openjdk.sh @@ -40,6 +40,9 @@ installOpenJDK() { archivePath=$(echo ${asset} | jq -r '.binary.package.link') fullVersion=$(echo ${asset} | jq -r '.version.semver' | tr '+' '-') + # Remove 'LTS' suffix from the version if present + fullVersion="${fullVersion//.LTS/}" + JAVA_TOOLCACHE_PATH=${AGENT_TOOLSDIRECTORY}/Java_Temurin-Hotspot_jdk javaToolcacheVersionPath=$JAVA_TOOLCACHE_PATH/${fullVersion} From 030fc05665fa84f586b4e8a02129742af772fd43 Mon Sep 17 00:00:00 2001 From: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com> Date: Mon, 6 Nov 2023 19:40:33 +0100 Subject: [PATCH 2415/3485] [windows] split docker install into 3 scripts (#8688) * [windows] split docker install into 3 scripts the idea is to end with 1 script per 1 component for better observability * Update images/win/scripts/Installers/Install-Docker-Compose.ps1 Co-authored-by: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> * Update images/win/scripts/Installers/Install-Docker-WinCred.ps1 Co-authored-by: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> * fix test --------- Co-authored-by: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Co-authored-by: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> --- .../Installers/Install-Docker-Compose.ps1 | 17 +++++++ .../Installers/Install-Docker-WinCred.ps1 | 35 +++++++++++++++ .../win/scripts/Installers/Install-Docker.ps1 | 44 +------------------ images/win/scripts/Tests/Docker.Tests.ps1 | 30 ++++++++----- images/win/windows2019.json | 2 + images/win/windows2022.json | 2 + 6 files changed, 76 insertions(+), 54 deletions(-) create mode 100644 images/win/scripts/Installers/Install-Docker-Compose.ps1 create mode 100644 images/win/scripts/Installers/Install-Docker-WinCred.ps1 diff --git a/images/win/scripts/Installers/Install-Docker-Compose.ps1 b/images/win/scripts/Installers/Install-Docker-Compose.ps1 new file mode 100644 index 000000000000..3cbbd3a15859 --- /dev/null +++ b/images/win/scripts/Installers/Install-Docker-Compose.ps1 @@ -0,0 +1,17 @@ +################################################################################ +## File: Install-Docker-Compose.ps1 +## Desc: Install Docker Compose. +## Supply chain security: Docker Compose v1 - by package manager +################################################################################ + +Write-Host "Install-Package Docker-Compose v1" +$versionToInstall = Get-LatestChocoPackageVersion -TargetVersion "1.29" -PackageName "docker-compose" +Choco-Install -PackageName docker-compose -ArgumentList "--version=$versionToInstall" + +Write-Host "Install-Package Docker-Compose v2" +$dockerComposev2Url = "https://github.com/docker/compose/releases/latest/download/docker-compose-windows-x86_64.exe" +$cliPluginsDir = "C:\ProgramData\docker\cli-plugins" +New-Item -Path $cliPluginsDir -ItemType Directory +Start-DownloadWithRetry -Url $dockerComposev2Url -Name docker-compose.exe -DownloadPath $cliPluginsDir + +Invoke-PesterTests -TestFile "Docker" -TestName "DockerCompose" diff --git a/images/win/scripts/Installers/Install-Docker-WinCred.ps1 b/images/win/scripts/Installers/Install-Docker-WinCred.ps1 new file mode 100644 index 000000000000..a1d764becc4e --- /dev/null +++ b/images/win/scripts/Installers/Install-Docker-WinCred.ps1 @@ -0,0 +1,35 @@ +################################################################################ +## File: Install-Docker-WinCred.ps1 +## Desc: Install Docker credential helper. +## Supply chain security: checksum validation +################################################################################ + +#region functions +function Get-DockerWincredHash { + Param ( + [Parameter(Mandatory = $True)] + [string] $Release + ) + + $hashURL = "https://github.com/docker/docker-credential-helpers/releases/download/${Release}/checksums.txt" + (Invoke-RestMethod -Uri $hashURL).ToString().Split("`n").Where({ $_ -ilike "*docker-credential-wincred-${Release}.windows-amd64.exe*" }).Split(' ')[0] +} +#endregion + +Write-Host "Install docker-wincred" +$dockerCredLatestRelease = Invoke-RestMethod -Uri "https://api.github.com/repos/docker/docker-credential-helpers/releases/latest" +$dockerCredDownloadUrl = $dockerCredLatestRelease.assets.browser_download_url -match "docker-credential-wincred-.+\.exe" | Select-Object -First 1 +Start-DownloadWithRetry -Url $dockerCredDownloadUrl -DownloadPath "C:\Windows\System32" -Name "docker-credential-wincred.exe" + +#region Supply chain security +$distributor_file_hash = Get-DockerWincredHash -Release $dockerCredLatestRelease.name +$local_file_hash = (Get-FileHash -Path 'C:\Windows\System32\docker-credential-wincred.exe' -Algorithm SHA256).Hash + +if ($local_file_hash -ne $distributor_file_hash) { + Write-Host "hash must be equal to: ${distributor_file_hash}" + Write-Host "actual hash is: ${local_file_hash}" + throw 'Checksum verification failed, please rerun install' +} +#endregion + +Invoke-PesterTests -TestFile "Docker" -TestName "DockerWinCred" diff --git a/images/win/scripts/Installers/Install-Docker.ps1 b/images/win/scripts/Installers/Install-Docker.ps1 index add81b01b8e1..5b2c9e734ab8 100644 --- a/images/win/scripts/Installers/Install-Docker.ps1 +++ b/images/win/scripts/Installers/Install-Docker.ps1 @@ -3,23 +3,8 @@ ## Desc: Install Docker. ## Must be an independent step because it requires a restart before we ## can continue. -## Supply chain security: (docker-wincred) checksum validation ################################################################################ -#region functions -Function Get-DockerWincredHash -{ - Param ( - [Parameter(Mandatory = $True)] - [string] $Release -) - - $hashURL = "https://github.com/docker/docker-credential-helpers/releases/download/${Release}/checksums.txt " - (Invoke-RestMethod -Uri $hashURL).ToString().Split("`n").Where({ $_ -ilike "*docker-credential-wincred-${Release}.windows-amd64.exe*" }).Split(' ')[0] - -} -#endregion - Write-Host "Get latest Moby release" $mobyLatestReleaseVersion = (Invoke-RestMethod -Uri "https://api.github.com/repos/moby/moby/releases/latest").tag_name.Trim("v") $dockerceUrl = "https://download.docker.com/win/static/stable/x86_64/" @@ -55,32 +40,6 @@ if ($LastExitCode -ne 0) { # https://github.com/Azure/azure-cli/issues/18766 New-Item -ItemType SymbolicLink -Path "C:\Windows\SysWOW64\docker.exe" -Target "C:\Windows\System32\docker.exe" -Write-Host "Install-Package Docker-Compose v1" -$versionToInstall = Get-LatestChocoPackageVersion -TargetVersion "1.29" -PackageName "docker-compose" -Choco-Install -PackageName docker-compose -ArgumentList "--version=$versionToInstall" - -Write-Host "Install-Package Docker-Compose v2" -$dockerComposev2Url = "https://github.com/docker/compose/releases/latest/download/docker-compose-windows-x86_64.exe" -$cliPluginsDir = "C:\ProgramData\docker\cli-plugins" -New-Item -Path $cliPluginsDir -ItemType Directory -Start-DownloadWithRetry -Url $dockerComposev2Url -Name docker-compose.exe -DownloadPath $cliPluginsDir - -Write-Host "Install docker-wincred" -$dockerCredLatestRelease = Invoke-RestMethod -Uri "https://api.github.com/repos/docker/docker-credential-helpers/releases/latest" -$dockerCredDownloadUrl = $dockerCredLatestRelease.assets.browser_download_url -match "docker-credential-wincred-.+\.exe" | Select-Object -First 1 -Start-DownloadWithRetry -Url $dockerCredDownloadUrl -DownloadPath "C:\Windows\System32" -Name "docker-credential-wincred.exe" - -#region Supply chain security -$distributor_file_hash = Get-DockerWincredHash -Release $dockerCredLatestRelease.name -$local_file_hash = (Get-FileHash -Path 'C:\Windows\System32\docker-credential-wincred.exe' -Algorithm SHA256).Hash - -if ($local_file_hash -ne $distributor_file_hash) { - Write-Host "hash must be equal to: ${distributor_file_hash}" - Write-Host "actual hash is: ${local_file_hash}" - throw 'Checksum verification failed, please rerun install' -} -#endregion - Write-Host "Download docker images" $dockerImages = (Get-ToolsetContent).docker.images foreach ($dockerImage in $dockerImages) { @@ -93,4 +52,5 @@ foreach ($dockerImage in $dockerImages) { } } -Invoke-PesterTests -TestFile "Docker" +Invoke-PesterTests -TestFile "Docker" -TestName "Docker" +Invoke-PesterTests -TestFile "Docker" -TestName "DockerImages" diff --git a/images/win/scripts/Tests/Docker.Tests.ps1 b/images/win/scripts/Tests/Docker.Tests.ps1 index 4b4b2a36dde0..d5a325ef8169 100644 --- a/images/win/scripts/Tests/Docker.Tests.ps1 +++ b/images/win/scripts/Tests/Docker.Tests.ps1 @@ -1,25 +1,31 @@ Describe "Docker" { - It "<ToolName>" -TestCases @( - @{ ToolName = "docker" } - @{ ToolName = "docker-compose" } - ) { - "$ToolName --version" | Should -ReturnZeroExitCode + It "docker is installed" { + "docker --version" | Should -ReturnZeroExitCode } - It "docker-wincred" { - "docker-credential-wincred version" | Should -ReturnZeroExitCode + It "docker service is up" { + "docker images" | Should -ReturnZeroExitCode + } + + It "docker symlink" { + "C:\Windows\SysWOW64\docker.exe ps" | Should -ReturnZeroExitCode + } +} + +Describe "DockerCompose" { + It "docker-compose is installed" { + "docker-compose --version" | Should -ReturnZeroExitCode } It "docker compose v2" { "docker compose version" | Should -ReturnZeroExitCode } - It "docker service is up" { - "docker images" | Should -ReturnZeroExitCode - } +} - It "docker symlink" { - "C:\Windows\SysWOW64\docker.exe ps" | Should -ReturnZeroExitCode +Describe "DockerWinCred" { + It "docker-wincred" { + "docker-credential-wincred version" | Should -ReturnZeroExitCode } } diff --git a/images/win/windows2019.json b/images/win/windows2019.json index 834a0c3c5cbc..c00ac5d58147 100644 --- a/images/win/windows2019.json +++ b/images/win/windows2019.json @@ -170,6 +170,8 @@ "scripts": [ "{{ template_dir }}/scripts/Installers/Install-VCRedist.ps1", "{{ template_dir }}/scripts/Installers/Install-Docker.ps1", + "{{ template_dir }}/scripts/Installers/Install-Docker-WinCred.ps1", + "{{ template_dir }}/scripts/Installers/Install-Docker-Compose.ps1", "{{ template_dir }}/scripts/Installers/Install-PowershellCore.ps1", "{{ template_dir }}/scripts/Installers/Install-WebPlatformInstaller.ps1" ] diff --git a/images/win/windows2022.json b/images/win/windows2022.json index bccf2df30c7e..74d2092e734e 100644 --- a/images/win/windows2022.json +++ b/images/win/windows2022.json @@ -155,6 +155,8 @@ "type": "powershell", "scripts": [ "{{ template_dir }}/scripts/Installers/Install-Docker.ps1", + "{{ template_dir }}/scripts/Installers/Install-Docker-WinCred.ps1", + "{{ template_dir }}/scripts/Installers/Install-Docker-Compose.ps1", "{{ template_dir }}/scripts/Installers/Install-PowershellCore.ps1", "{{ template_dir }}/scripts/Installers/Install-WebPlatformInstaller.ps1" ] From 9d94573ccdf4eec31338c23b77d0684fae68a2d8 Mon Sep 17 00:00:00 2001 From: sergei-pyshnoi <121864472+sergei-pyshnoi@users.noreply.github.com> Date: Mon, 6 Nov 2023 20:49:14 +0100 Subject: [PATCH 2416/3485] remove ndk 23 from ubuntu images (#8745) --- images/linux/toolsets/toolset-2004.json | 2 +- images/linux/toolsets/toolset-2204.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index 11ae990f75e8..5bf9da70db22 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -97,7 +97,7 @@ "ndk": { "default": "25", "versions": [ - "23", "24", "25", "26" + "24", "25", "26" ] } }, diff --git a/images/linux/toolsets/toolset-2204.json b/images/linux/toolsets/toolset-2204.json index 5c6c82abe5ff..f0817d329435 100644 --- a/images/linux/toolsets/toolset-2204.json +++ b/images/linux/toolsets/toolset-2204.json @@ -91,7 +91,7 @@ "ndk": { "default": "25", "versions": [ - "23", "24", "25", "26" + "24", "25", "26" ] } }, From be3fa4f3c3cd658d625e8a7fa75674bff199aed5 Mon Sep 17 00:00:00 2001 From: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com> Date: Tue, 7 Nov 2023 09:20:25 +0100 Subject: [PATCH 2417/3485] [macos] add android SDK to SW report on Ventura ARM64 (#8715) --- .../software-report/SoftwareReport.Generator.ps1 | 14 +++++++------- images/macos/templates/macOS-13.arm64.anka.pkr.hcl | 1 + images/macos/tests/Android.Tests.ps1 | 6 +++--- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1 index 4f19089a5cd2..99b9508c404c 100644 --- a/images/macos/software-report/SoftwareReport.Generator.ps1 +++ b/images/macos/software-report/SoftwareReport.Generator.ps1 @@ -280,15 +280,15 @@ $installedSdks.AddTable($(Build-XcodeSDKTable $xcodeInfo)) $installedSimulators = $xcode.AddHeader("Installed Simulators") $installedSimulators.AddTable($(Build-XcodeSimulatorsTable $xcodeInfo)) -if (-not $os.IsVenturaArm64) { + # Android section - $android = $installedSoftware.AddHeader("Android") - $androidTable = Build-AndroidTable - $android.AddTable($androidTable) +$android = $installedSoftware.AddHeader("Android") +$androidTable = Build-AndroidTable +$android.AddTable($androidTable) + +$androidEnv = $android.AddHeader("Environment variables") +$androidEnv.AddTable($(Build-AndroidEnvironmentTable)) - $androidEnv = $android.AddHeader("Environment variables") - $androidEnv.AddTable($(Build-AndroidEnvironmentTable)) -} if ((-not $os.IsVentura) -and (-not $os.IsVenturaArm64)) { $miscellaneous = $installedSoftware.AddHeader("Miscellaneous") $miscellaneous.AddToolVersion("libXext", $(Get-LibXextVersion)) diff --git a/images/macos/templates/macOS-13.arm64.anka.pkr.hcl b/images/macos/templates/macOS-13.arm64.anka.pkr.hcl index 6969689bd89f..05434398d03e 100644 --- a/images/macos/templates/macOS-13.arm64.anka.pkr.hcl +++ b/images/macos/templates/macOS-13.arm64.anka.pkr.hcl @@ -201,6 +201,7 @@ build { "./provision/core/rust.sh", "./provision/core/gcc.sh", "./provision/core/cocoapods.sh", + "./provision/core/android-toolsets.sh", "./provision/core/safari.sh", "./provision/core/chrome.sh", "./provision/core/bicep.sh", diff --git a/images/macos/tests/Android.Tests.ps1 b/images/macos/tests/Android.Tests.ps1 index f19e2087fa34..54b18e3319e0 100644 --- a/images/macos/tests/Android.Tests.ps1 +++ b/images/macos/tests/Android.Tests.ps1 @@ -4,7 +4,7 @@ Import-Module "$PSScriptRoot/../software-report/SoftwareReport.Android.psm1" -Di $os = Get-OSVersion -Describe "Android" -Skip:($os.IsVenturaArm64) { +Describe "Android" { $androidSdkManagerPackages = Get-AndroidPackages [int]$platformMinVersion = Get-ToolsetValue "android.platform_min_version" [version]$buildToolsMinVersion = Get-ToolsetValue "android.build_tools_min_version" @@ -50,7 +50,7 @@ Describe "Android" -Skip:($os.IsVenturaArm64) { } } - Context "SDKManagers" -Skip:($os.IsVenturaArm64) { + Context "SDKManagers" { if (-not $os.IsVentura -and -not $os.IsVenturaArm64) { $testCases = @( @{ @@ -76,7 +76,7 @@ Describe "Android" -Skip:($os.IsVenturaArm64) { } } - Context "Packages" -Skip:($os.IsVenturaArm64) { + Context "Packages" { $testCases = $androidPackages | ForEach-Object { @{ PackageName = $_ } } It "<PackageName>" -TestCases $testCases { From bbbda7bddf36f8245cbabed7d568d251aa5d3ac9 Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Tue, 7 Nov 2023 16:05:11 +0100 Subject: [PATCH 2418/3485] [Mac OS] Update Anka Helpers to build Mac OS 14 ARM image (#8757) * Update Anka Helpers to build Mac OS 14 ARM image * Drop Powershell 5 support --- images.CI/macos/anka/Service.Helpers.psm1 | 47 +++++++++++++---------- 1 file changed, 27 insertions(+), 20 deletions(-) diff --git a/images.CI/macos/anka/Service.Helpers.psm1 b/images.CI/macos/anka/Service.Helpers.psm1 index d999765f370a..4805ade0cfc2 100644 --- a/images.CI/macos/anka/Service.Helpers.psm1 +++ b/images.CI/macos/anka/Service.Helpers.psm1 @@ -63,24 +63,24 @@ function Get-AvailableIPSWVersions { ) if ($IsBeta) { - $command = { mist list firmware "$MacOSCodeNameOrVersion" --include-betas --latest --export "/Applications/export.json"} + $command = { mist list firmware "$MacOSCodeNameOrVersion" --compatible --include-betas --latest --export "/Applications/export.json" } } elseif ($IsLatest) { - $command = { mist list firmware "$MacOSCodeNameOrVersion" --latest --export "/Applications/export.json" } + $command = { mist list firmware "$MacOSCodeNameOrVersion" --compatible --latest --export "/Applications/export.json" } } else { - $command = { mist list firmware "$MacOSCodeNameOrVersion" --export "/Applications/export.json" } + $command = { mist list firmware "$MacOSCodeNameOrVersion" --compatible --export "/Applications/export.json" } } $condition = { $LASTEXITCODE -eq 0 } Invoke-WithRetry -Command $command -BreakCondition $condition | Out-Null $softwareList = get-content -Path "/Applications/export.json" - $turgetVersion = ($softwareList | ConvertFrom-Json).version - if ($null -eq $turgetVersion) { + $availableBuilds = ($softwareList | ConvertFrom-Json).build + if ($null -eq $availableBuilds) { Write-Host "Requested macOS '$MacOSCodeNameOrVersion' version not found in the list of available installers." $command = { mist list firmware "$($MacOSCodeNameOrVersion.split('.')[0])" } Invoke-WithRetry -Command $command -BreakCondition $condition exit 1 } - return $turgetVersion + return $availableBuilds } function Get-MacOSIPSWInstaller { @@ -100,17 +100,20 @@ function Get-MacOSIPSWInstaller { $MacOSName = $MacOSVersion.ToString() } - Write-Host "`t[*] Finding available full installers" if ($DownloadLatestVersion -eq $true) { - $targetVersion = Get-AvailableIPSWVersions -IsLatest $true -MacOSCodeNameOrVersion $MacOSName - Write-host "`t[*] The 'DownloadLatestVersion' flag is set to true. Latest macOS version is '$MacOSName' - '$targetVersion' now" + $targetBuild = Get-AvailableIPSWVersions -IsLatest $true -MacOSCodeNameOrVersion $MacOSName + Write-Host "`t[*] The 'DownloadLatestVersion' flag is set to true. Latest compatible macOS build of '$MacOSName' is '$targetBuild'" } elseif ($BetaSearch -eq $true) { - $targetVersion = Get-AvailableIPSWVersions -IsBeta $true -MacOSCodeNameOrVersion $MacOSName - Write-host "`t[*] The 'BetaSearch' flag is set to true. Latestbeta macOS version is '$MacOSName' - '$targetVersion' now" + $targetBuild = Get-AvailableIPSWVersions -IsBeta $true -MacOSCodeNameOrVersion $MacOSName + Write-Host "`t[*] The 'BetaSearch' flag is set to true. Latest compatible beta macOS build of '$MacOSName' is '$targetBuild'" } else { - $targetVersion = Get-AvailableIPSWVersions -MacOSCodeNameOrVersion $MacOSName -IsLatest $false - Write-host "`t[*] The exact version was specified - '$MacOSName' " + $targetBuild = Get-AvailableIPSWVersions -MacOSCodeNameOrVersion $MacOSName -IsLatest $false + Write-Host "`t[*] Available compatible macOS builds of '$MacOSName' are: $($targetBuild -join ', ')" + if ($targetBuild.Count -gt 1) { + Write-Error "`t[*] Please specify the exact build number of macOS you want to install" + exit 1 + } } $installerPathPattern = "/Applications/Install ${macOSName}*.ipsw" @@ -123,12 +126,12 @@ function Get-MacOSIPSWInstaller { # Download macOS installer $installerDir = "/Applications/" $installerName = "Install ${macOSName}.ipsw" - Write-Host "`t[*] Requested macOS '$targetVersion' version installer found, fetching it from mist database" - Invoke-WithRetry { mist download firmware "$targetVersion" --output-directory $installerDir --firmware-name "$installerName" } {$LASTEXITCODE -eq 0} | Out-Null + Write-Host "`t[*] Requested macOS '$targetBuild' version installer found, fetching it from mist database" + Invoke-WithRetry { mist download firmware "$targetBuild" --output-directory $installerDir --firmware-name "$installerName" } { $LASTEXITCODE -eq 0 } | Out-Null if (Test-Path "$installerDir$installerName") { $result = "$installerDir$installerName" } else { - Write-host "`t[*] Requested macOS '$targetVersion' version installer failed to download" + Write-Error "`t[*] Requested macOS '$targetBuild' version installer failed to download" exit 1 } return $result @@ -169,7 +172,7 @@ function Get-MacOSInstaller { exit 1 } Show-StringWithFormat $filteredVersions - $osVersions = $filteredVersions.OSVersion | Sort-Object {[version]$_} + $osVersions = $filteredVersions.OSVersion | Sort-Object { [version]$_ } $MacOSVersion = $osVersions | Select-Object -Last 1 Write-Host "`t[*] The 'DownloadLatestVersion' flag is set. Latest macOS version is '$MacOSVersion' now" } @@ -248,7 +251,7 @@ function Install-SoftwareUpdate { $command = "sw_vers" $guestMacosVersion = Invoke-SSHPassCommand -HostName $HostName -Command $command if ($guestMacosVersion[1] -match "12") { - foreach ($update in $listOfUpdates){ + foreach ($update in $listOfUpdates) { # Filtering updates that contain "Ventura" word if ($update -notmatch "Ventura") { $command = "sudo /usr/sbin/softwareupdate --restart --verbose --install '$($update.trim())'" @@ -256,7 +259,7 @@ function Install-SoftwareUpdate { } } } elseif ($guestMacosVersion[1] -match "13") { - foreach ($update in $listOfUpdates){ + foreach ($update in $listOfUpdates) { # Filtering updates that contain "Sonoma" word if ($update -notmatch "Sonoma") { $command = "sudo /usr/sbin/softwareupdate --restart --verbose --install '$($update.trim())'" @@ -302,7 +305,11 @@ function Invoke-SSHPassCommand { "${env:SSHUSER}@${HostName}" ) $sshPassOptions = $sshArg -join " " - $result = bash -c "$sshPassOptions \""$Command\"" 2>&1" + if ($PSVersionTable.PSVersion.Major -eq 7 -and $PSVersionTable.PSVersion.Minor -le 2) { + $result = bash -c "$sshPassOptions \""$Command\"" 2>&1" + } else { + $result = bash -c "$sshPassOptions `"$Command`" 2>&1" + } if ($LASTEXITCODE -ne 0) { Write-Error "There is an error during command execution:`n$result" exit 1 From 8998a4c907a2ac9fceeacd2c6b80a343d2b884aa Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Tue, 7 Nov 2023 17:27:55 +0100 Subject: [PATCH 2419/3485] [Mac OS] Add missing macOS Sonoma selector (#8759) --- images.CI/macos/anka/Service.Helpers.psm1 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/images.CI/macos/anka/Service.Helpers.psm1 b/images.CI/macos/anka/Service.Helpers.psm1 index 4805ade0cfc2..db8907fdf427 100644 --- a/images.CI/macos/anka/Service.Helpers.psm1 +++ b/images.CI/macos/anka/Service.Helpers.psm1 @@ -96,6 +96,8 @@ function Get-MacOSIPSWInstaller { $MacOSName = "macOS Monterey" } elseif ($MacOSVersion -eq [version] "13.0") { $MacOSName = "macOS Ventura" + } elseif ($MacOSVersion -eq [version] "14.0") { + $MacOSName = "macOS Sonoma" } else { $MacOSName = $MacOSVersion.ToString() } From afcc76b48aeb0b2892543978a05f0fff80fbc922 Mon Sep 17 00:00:00 2001 From: sergei-pyshnoi <121864472+sergei-pyshnoi@users.noreply.github.com> Date: Tue, 7 Nov 2023 18:52:47 +0100 Subject: [PATCH 2420/3485] remove ndk23 from windows images (#8746) --- images/win/toolsets/toolset-2019.json | 2 +- images/win/toolsets/toolset-2022.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index 366cc92fcebe..353aed4d082a 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -175,7 +175,7 @@ "ndk": { "default": "25", "versions": [ - "23", "24", "25", "26" + "24", "25", "26" ] } }, diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index fc09ab007343..a954ad94a49d 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -149,7 +149,7 @@ "ndk": { "default": "25", "versions": [ - "23", "24", "25", "26" + "24", "25", "26" ] } }, From 433178adf5d64cca48a8bf96525b38385e3b7682 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 7 Nov 2023 20:06:04 +0100 Subject: [PATCH 2421/3485] Updating readme file for macos-13 version 20231025.2 (#8672) Co-authored-by: Image generation service account <no-reply@microsoft.com> --- images/macos/macos-13-Readme.md | 146 ++++++++++++++++---------------- 1 file changed, 72 insertions(+), 74 deletions(-) diff --git a/images/macos/macos-13-Readme.md b/images/macos/macos-13-Readme.md index 9c0e99087d96..0ad49ccd6877 100644 --- a/images/macos/macos-13-Readme.md +++ b/images/macos/macos-13-Readme.md @@ -1,29 +1,28 @@ -| Announcements | -|-| -| [[All OS] Android NDK r23 will be removed from images on October 9](https://github.com/actions/runner-images/issues/8383) | -*** # macOS 13 - OS Version: macOS 13.6 (22G120) - Kernel Version: Darwin 22.6.0 -- Image Version: 20231018.14 +- Image Version: 20231025.2 ## Installed Software ### Language and Runtime -- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.402 +- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.403 - Bash 3.2.57(1)-release - Clang/LLVM 14.0.3 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` - GCC 11 (Homebrew GCC 11.4.0) - available by `gcc-11` alias - GCC 12 (Homebrew GCC 12.3.0) - available by `gcc-12` alias +- GCC 13 (Homebrew GCC 13.2.0) - available by `gcc-13` alias - GNU Fortran 11 (Homebrew GCC 11.4.0) - available by `gfortran-11` alias - GNU Fortran 12 (Homebrew GCC 12.3.0) - available by `gfortran-12` alias +- GNU Fortran 13 (Homebrew GCC 13.2.0) - available by `gfortran-13` alias - Julia 1.9.3 - Kotlin 1.9.10-release-459 - Mono 6.12.0.188 +- Node.js 18.18.2 - Perl 5.38.0 - PHP 8.2.11 -- Python3 3.11.6 +- Python3 3.12.0 - R 4.3.1 - Ruby 3.0.6p216 @@ -32,13 +31,13 @@ - Carthage 0.39.1 - CocoaPods 1.13.0 - Composer 2.6.5 -- Homebrew 4.1.16 +- Homebrew 4.1.17 - NPM 9.8.1 - NuGet 6.3.1.1 -- Pip3 23.3 (python 3.11) -- Pipx 1.2.0 +- Pip3 23.3.1 (python 3.12) +- Pipx 1.2.1 - RubyGems 3.4.21 -- Vcpkg 2023 (build from commit a9794606a) +- Vcpkg 2023 (build from commit 213c01f87) - Yarn 1.22.19 ### Project Management @@ -49,8 +48,8 @@ ### Utilities - 7-Zip 17.05 - aria2 1.36.0 -- azcopy 10.21.0 -- bazel 6.3.2 +- azcopy 10.21.1 +- bazel 6.4.0 - bazelisk 1.18.0 - bsdtar 3.5.3 - available by 'tar' alias - Curl 8.4.0 @@ -68,20 +67,20 @@ - zstd 1.5.5 ### Tools -- AWS CLI 2.13.26 -- AWS SAM CLI 1.98.0 +- AWS CLI 2.13.29 +- AWS SAM CLI 1.99.0 - AWS Session Manager CLI 1.2.497.0 -- Azure CLI 2.53.0 +- Azure CLI 2.53.1 - Azure CLI (azure-devops) 0.26.0 - Bicep CLI 0.22.6 - Cabal 3.6.2.0 - Cmake 3.27.7 -- CodeQL Action Bundle 2.15.0 +- CodeQL Action Bundle 2.15.1 - Fastlane 2.216.0 - GHC 9.8.1 - GHCup 0.1.19.4 - Stack 2.13.1 -- SwiftFormat 0.52.7 +- SwiftFormat 0.52.8 - Xcode Command Line Tools 15.0.0.0.1.1694021235 ### Linters @@ -90,12 +89,12 @@ ### Browsers - Safari 17.0 (18616.1.27.111.22) - SafariDriver 17.0 (18616.1.27.111.22) -- Google Chrome 118.0.5993.88 +- Google Chrome 118.0.5993.117 - Google Chrome for Testing 118.0.5993.70 - ChromeDriver 118.0.5993.70 -- Microsoft Edge 118.0.2088.46 -- Microsoft Edge WebDriver 118.0.2088.46 -- Mozilla Firefox 118.0.2 +- Microsoft Edge 118.0.2088.69 +- Microsoft Edge WebDriver 118.0.2088.69 +- Mozilla Firefox 119.0 - geckodriver 0.33.0 - Selenium server 4.14.1 @@ -107,12 +106,12 @@ | GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | ### Java -| Version | Environment Variable | -| -------------------- | -------------------- | -| 8.0.382+5 | JAVA_HOME_8_X64 | -| 11.0.21+9 | JAVA_HOME_11_X64 | -| 17.0.8+101 (default) | JAVA_HOME_17_X64 | -| 21.0.0+35.0.LTS | JAVA_HOME_21_X64 | +| Version | Environment Variable | +| ------------------ | -------------------- | +| 8.0.392+8 | JAVA_HOME_8_X64 | +| 11.0.21+9 | JAVA_HOME_11_X64 | +| 17.0.9+9 (default) | JAVA_HOME_17_X64 | +| 21.0.1+12.0.LTS | JAVA_HOME_21_X64 | ### Cached Tools @@ -120,12 +119,6 @@ - 3.0.6 - 3.1.4 -#### Python -- 3.8.18 -- 3.9.18 -- 3.10.13 -- 3.11.6 - #### PyPy - 2.7.18 [PyPy 7.3.13] - 3.7.13 [PyPy 7.3.9] @@ -133,10 +126,17 @@ - 3.9.18 [PyPy 7.3.13] - 3.10.13 [PyPy 7.3.13] +#### Python +- 3.8.18 +- 3.9.18 +- 3.10.13 +- 3.11.6 +- 3.12.0 + #### Node.js - 16.20.2 - 18.18.2 -- 20.8.1 +- 20.9.0 #### Go - 1.19.13 @@ -151,7 +151,7 @@ #### Packages - Bindgen 0.68.1 -- Cargo-audit 0.18.2 +- Cargo-audit 0.18.3 - Cargo-outdated 0.13.1 - Cbindgen 0.26.0 - Clippy 0.1.73 @@ -169,7 +169,6 @@ | Version | Build | Path | | ---------------- | ------- | ------------------------------ | | 15.0.1 | 15A507 | /Applications/Xcode_15.0.1.app | -| 15.0 | 15A240d | /Applications/Xcode_15.0.app | | 14.3.1 (default) | 14E300c | /Applications/Xcode_14.3.1.app | | 14.2 | 14C18 | /Applications/Xcode_14.2.app | | 14.1 | 14B47b | /Applications/Xcode_14.1.app | @@ -183,71 +182,70 @@ | macOS 13.0 | macosx13.0 | 14.1 | | macOS 13.1 | macosx13.1 | 14.2 | | macOS 13.3 | macosx13.3 | 14.3.1 | -| macOS 14.0 | macosx14.0 | 15.0, 15.0.1 | +| macOS 14.0 | macosx14.0 | 15.0.1 | | iOS 16.1 | iphoneos16.1 | 14.1 | | iOS 16.2 | iphoneos16.2 | 14.2 | | iOS 16.4 | iphoneos16.4 | 14.3.1 | -| iOS 17.0 | iphoneos17.0 | 15.0, 15.0.1 | +| iOS 17.0 | iphoneos17.0 | 15.0.1 | | Simulator - iOS 16.1 | iphonesimulator16.1 | 14.1 | | Simulator - iOS 16.2 | iphonesimulator16.2 | 14.2 | | Simulator - iOS 16.4 | iphonesimulator16.4 | 14.3.1 | -| Simulator - iOS 17.0 | iphonesimulator17.0 | 15.0, 15.0.1 | +| Simulator - iOS 17.0 | iphonesimulator17.0 | 15.0.1 | | tvOS 16.1 | appletvos16.1 | 14.1, 14.2 | | tvOS 16.4 | appletvos16.4 | 14.3.1 | -| tvOS 17.0 | appletvos17.0 | 15.0, 15.0.1 | +| tvOS 17.0 | appletvos17.0 | 15.0.1 | | Simulator - tvOS 16.1 | appletvsimulator16.1 | 14.1, 14.2 | | Simulator - tvOS 16.4 | appletvsimulator16.4 | 14.3.1 | -| Simulator - tvOS 17.0 | appletvsimulator17.0 | 15.0, 15.0.1 | +| Simulator - tvOS 17.0 | appletvsimulator17.0 | 15.0.1 | | watchOS 9.1 | watchos9.1 | 14.1, 14.2 | | watchOS 9.4 | watchos9.4 | 14.3.1 | -| watchOS 10.0 | watchos10.0 | 15.0, 15.0.1 | +| watchOS 10.0 | watchos10.0 | 15.0.1 | | Simulator - watchOS 9.1 | watchsimulator9.1 | 14.1, 14.2 | | Simulator - watchOS 9.4 | watchsimulator9.4 | 14.3.1 | -| Simulator - watchOS 10.0 | watchsimulator10.0 | 15.0, 15.0.1 | +| Simulator - watchOS 10.0 | watchsimulator10.0 | 15.0.1 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | | DriverKit 22.1 | driverkit22.1 | 14.1 | | DriverKit 22.2 | driverkit22.2 | 14.2 | | DriverKit 22.4 | driverkit22.4 | 14.3.1 | -| DriverKit 23.0 | driverkit23.0 | 15.0, 15.0.1 | +| DriverKit 23.0 | driverkit23.0 | 15.0.1 | #### Installed Simulators -| OS | Xcode Version | Simulators | -| ------------ | ---------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| iOS 16.1 | 14.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 16.2 | 14.2 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 16.4 | 14.3.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 17.0 | 14.1<br>14.2<br>14.3.1<br>15.0<br>15.0.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| tvOS 16.1 | 14.1<br>14.2<br>14.3.1<br>15.0<br>15.0.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 16.4 | 14.1<br>14.2<br>14.3.1<br>15.0<br>15.0.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 17.0 | 14.1<br>14.2<br>14.3.1<br>15.0<br>15.0.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| watchOS 9.1 | 14.1<br>14.2<br>14.3.1<br>15.0<br>15.0.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | -| watchOS 9.4 | 14.1<br>14.2<br>14.3.1<br>15.0<br>15.0.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | -| watchOS 10.0 | 14.1<br>14.2<br>14.3.1<br>15.0<br>15.0.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | +| OS | Xcode Version | Simulators | +| ------------ | -------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| iOS 16.1 | 14.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 16.2 | 14.2 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 16.4 | 14.3.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 17.0 | 14.1<br>14.2<br>14.3.1<br>15.0.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| tvOS 16.1 | 14.1<br>14.2<br>14.3.1<br>15.0.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 16.4 | 14.1<br>14.2<br>14.3.1<br>15.0.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 17.0 | 14.1<br>14.2<br>14.3.1<br>15.0.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| watchOS 9.1 | 14.1<br>14.2<br>14.3.1<br>15.0.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | +| watchOS 9.4 | 14.1<br>14.2<br>14.3.1<br>15.0.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | +| watchOS 10.0 | 14.1<br>14.2<br>14.3.1<br>15.0.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | ### Android -| Package Name | Version | -| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 8.0 | -| Android Emulator | 32.1.15 | -| Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | -| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34 (rev 2)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | -| Android SDK Platform-Tools | 34.0.5 | -| Android Support Repository | 47.0.0 | -| CMake | 3.18.1<br>3.22.1 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 23.2.8568313<br>24.0.8215888<br>25.2.9519653 (default)<br>26.1.10909125 | -| SDK Patch Applier v4 | 1 | +| Package Name | Version | +| -------------------------- | ------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 11.0 | +| Android Emulator | 32.1.15 | +| Android SDK Build-tools | 34.0.0<br>33.0.2 | +| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34 (rev 2)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | +| Android SDK Platform-Tools | 34.0.5 | +| Android Support Repository | 47.0.0 | +| CMake | 3.22.1 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 24.0.8215888<br>25.2.9519653<br>26.1.10909125 (default) | +| SDK Patch Applier v4 | 1 | #### Environment variables | Name | Value | | ----------------------- | --------------------------------------------------- | | ANDROID_HOME | /Users/runner/Library/Android/sdk | -| ANDROID_NDK | /Users/runner/Library/Android/sdk/ndk/25.2.9519653 | -| ANDROID_NDK_HOME | /Users/runner/Library/Android/sdk/ndk/25.2.9519653 | +| ANDROID_NDK | /Users/runner/Library/Android/sdk/ndk/26.1.10909125 | +| ANDROID_NDK_HOME | /Users/runner/Library/Android/sdk/ndk/26.1.10909125 | | ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/26.1.10909125 | -| ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk/25.2.9519653 | +| ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk/26.1.10909125 | | ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | - From 01fe87da2e18cd3bc34192886194c51b0612ad19 Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Thu, 9 Nov 2023 11:29:07 +0100 Subject: [PATCH 2422/3485] [Mac OS] Adapt code for Mac OS 14 image (#8760) --- images/macos/helpers/Common.Helpers.psm1 | 1 + images/macos/helpers/Xcode.Installer.psm1 | 2 +- .../configuration/configure-tccdb-macos.sh | 14 ++- .../provision/configuration/preimagedata.sh | 2 +- images/macos/provision/core/commonutils.sh | 16 ++-- images/macos/provision/core/node.sh | 2 +- images/macos/provision/utils/utils.sh | 10 ++ .../SoftwareReport.Generator.ps1 | 92 ++++++++++--------- images/macos/tests/Android.Tests.ps1 | 35 +++---- images/macos/tests/BasicTools.Tests.ps1 | 14 +-- images/macos/tests/Common.Tests.ps1 | 12 +-- images/macos/tests/Databases.Tests.ps1 | 6 +- images/macos/tests/Node.Tests.ps1 | 3 +- images/macos/tests/PipxPackages.Tests.ps1 | 4 +- images/macos/tests/Python.Tests.ps1 | 4 +- images/macos/tests/Ruby.arm64.Tests.ps1 | 2 +- images/macos/tests/RubyGem.Tests.ps1 | 6 +- images/macos/tests/System.Tests.ps1 | 2 +- images/macos/tests/Xamarin.Tests.ps1 | 12 +-- images/macos/toolsets/toolset-14.json | 15 +++ 20 files changed, 142 insertions(+), 112 deletions(-) diff --git a/images/macos/helpers/Common.Helpers.psm1 b/images/macos/helpers/Common.Helpers.psm1 index 9c8f2cacaa07..2a2951200eed 100644 --- a/images/macos/helpers/Common.Helpers.psm1 +++ b/images/macos/helpers/Common.Helpers.psm1 @@ -36,6 +36,7 @@ function Get-OSVersion { IsMonterey = $osVersion.Version.Major -eq "12" IsVentura = $($osVersion.Version.Major -eq "13" -and $processorArchitecture -ne "arm64") IsVenturaArm64 = $($osVersion.Version.Major -eq "13" -and $processorArchitecture -eq "arm64") + IsSonoma = $($osVersion.Version.Major -eq "14") } } diff --git a/images/macos/helpers/Xcode.Installer.psm1 b/images/macos/helpers/Xcode.Installer.psm1 index 1bb9d0406916..57cc2e55aee3 100644 --- a/images/macos/helpers/Xcode.Installer.psm1 +++ b/images/macos/helpers/Xcode.Installer.psm1 @@ -132,7 +132,7 @@ function Approve-XcodeLicense { Write-Host "Approving Xcode license for '$XcodeRootPath'..." $xcodeBuildPath = Get-XcodeToolPath -XcodeRootPath $XcodeRootPath -ToolName "xcodebuild" - if ($os.IsVentura -or $os.IsVenturaArm64) { + if ($os.IsVentura -or $os.IsVenturaArm64 -or $os.IsSonoma) { Invoke-ValidateCommand -Command "sudo $xcodeBuildPath -license accept" -Timeout 15 } else { Invoke-ValidateCommand -Command "sudo $xcodeBuildPath -license accept" diff --git a/images/macos/provision/configuration/configure-tccdb-macos.sh b/images/macos/provision/configuration/configure-tccdb-macos.sh index 8c5315befaf8..1d863b42ec2d 100644 --- a/images/macos/provision/configuration/configure-tccdb-macos.sh +++ b/images/macos/provision/configuration/configure-tccdb-macos.sh @@ -30,7 +30,12 @@ systemValuesArray=( "'kTCCServiceSystemPolicyNetworkVolumes','com.apple.Terminal',0,2,4,1,X'fade0c000000003000000001000000060000000200000012636f6d2e6170706c652e5465726d696e616c000000000003',NULL,0,'UNUSED',NULL,0,1678990068" ) for values in "${systemValuesArray[@]}"; do - configure_system_tccdb "$values" + if is_Sonoma; then + # TCC access table in Sonoma has extra 4 columns: pid, pid_version, boot_uuid, last_reminded + configure_system_tccdb "$values,NULL,NULL,'UNUSED',${values##*,}" + else + configure_system_tccdb "$values" + fi done # $HOME/Library/Application\ Support/com.apple.TCC/TCC.db @@ -59,5 +64,10 @@ userValuesArray=( "'kTCCServiceAppleEvents','/usr/local/opt/runner/provisioner/provisioner',1,2,3,1,NULL,NULL,0,'com.apple.systemevents',X'fade0c000000003400000001000000060000000200000016636f6d2e6170706c652e73797374656d6576656e7473000000000003',NULL,1592919552" ) for values in "${userValuesArray[@]}"; do - configure_user_tccdb "$values" + if is_Sonoma; then + # TCC access table in Sonoma has extra 4 columns: pid, pid_version, boot_uuid, last_reminded + configure_user_tccdb "$values,NULL,NULL,'UNUSED',${values##*,}" + else + configure_user_tccdb "$values" + fi done diff --git a/images/macos/provision/configuration/preimagedata.sh b/images/macos/provision/configuration/preimagedata.sh index 47cc926c4e2e..fee38f07199b 100644 --- a/images/macos/provision/configuration/preimagedata.sh +++ b/images/macos/provision/configuration/preimagedata.sh @@ -17,7 +17,7 @@ else fi release_label="macOS-${label_version}" -if is_Ventura; then +if is_Ventura || is_Sonoma; then software_url="https://github.com/actions/runner-images/blob/${image_label}/${image_version}/images/macos/${image_label}-Readme.md" releaseUrl="https://github.com/actions/runner-images/releases/tag/${image_label}%2F${image_version}" else diff --git a/images/macos/provision/core/commonutils.sh b/images/macos/provision/core/commonutils.sh index 1010158858e4..8d704582c9d0 100644 --- a/images/macos/provision/core/commonutils.sh +++ b/images/macos/provision/core/commonutils.sh @@ -13,15 +13,13 @@ done cask_packages=$(get_toolset_value '.brew.cask_packages[]') for package in $cask_packages; do echo "Installing $package..." - if [[ $package == "virtualbox" ]]; then - if ! is_Ventura || ! is_VenturaArm64; then - # Do not update VirtualBox on macOS 12 due to the issue with VMs in gurumediation state which blocks Vagrant on macOS: https://github.com/actions/runner-images/issues/8730 - # macOS host: Dropped all kernel extensions. VirtualBox relies fully on the hypervisor and vmnet frameworks provided by Apple now. - vbcask_url="https://raw.githubusercontent.com/Homebrew/homebrew-cask/aa3c55951fc9d687acce43e5c0338f42c1ddff7b/Casks/virtualbox.rb" - download_with_retries $vbcask_url - brew install ./virtualbox.rb - rm ./virtualbox.rb - fi + if is_Monterey && [[ $package == "virtualbox" ]]; then + # Do not update VirtualBox on macOS 12 due to the issue with VMs in gurumediation state which blocks Vagrant on macOS: https://github.com/actions/runner-images/issues/8730 + # macOS host: Dropped all kernel extensions. VirtualBox relies fully on the hypervisor and vmnet frameworks provided by Apple now. + vbcask_url="https://raw.githubusercontent.com/Homebrew/homebrew-cask/aa3c55951fc9d687acce43e5c0338f42c1ddff7b/Casks/virtualbox.rb" + download_with_retries $vbcask_url + brew install ./virtualbox.rb + rm ./virtualbox.rb else brew install --cask $package fi diff --git a/images/macos/provision/core/node.sh b/images/macos/provision/core/node.sh index db012971e7cb..c4e3d8b904e3 100644 --- a/images/macos/provision/core/node.sh +++ b/images/macos/provision/core/node.sh @@ -11,7 +11,7 @@ echo Installing yarn... download_with_retries "https://yarnpkg.com/install.sh" "/tmp" "yarn-install.sh" bash /tmp/yarn-install.sh -if ! is_Ventura || ! is_VenturaArm64; then +if is_BigSur || is_Monterey; then npm_global_packages=$(get_toolset_value '.npm.global_packages[].name') for module in ${npm_global_packages[@]}; do echo "Install $module" diff --git a/images/macos/provision/utils/utils.sh b/images/macos/provision/utils/utils.sh index 04d9eec3f5bf..c4374d7c0f31 100755 --- a/images/macos/provision/utils/utils.sh +++ b/images/macos/provision/utils/utils.sh @@ -55,6 +55,14 @@ is_VenturaArm64() { fi } +is_Sonoma() { + if [ "$OSTYPE" = "darwin23" ]; then + true + else + false + fi +} + is_Ventura() { if [ "$OSTYPE" = "darwin22" ]; then true @@ -122,6 +130,8 @@ get_brew_os_keyword() { echo "monterey" elif is_Ventura; then echo "ventura" + elif is_Sonoma; then + echo "sonoma" else echo "null" fi diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1 index 99b9508c404c..ff694767611d 100644 --- a/images/macos/software-report/SoftwareReport.Generator.ps1 +++ b/images/macos/software-report/SoftwareReport.Generator.ps1 @@ -40,12 +40,12 @@ $languageAndRuntime.AddNodes($(Get-GccVersions)) $languageAndRuntime.AddNodes($(Get-FortranVersions)) $languageAndRuntime.AddToolVersion("Julia", $(Get-JuliaVersion)) $languageAndRuntime.AddToolVersion("Kotlin", $(Get-KotlinVersion)) -if ((-not $os.IsVentura) -and (-not $os.IsVenturaArm64)) { +if ((-not $os.IsVentura) -and (-not $os.IsVenturaArm64) -and (-not $os.IsSonoma)) { $languageAndRuntime.AddToolVersion("Go", $(Get-GoVersion)) } $languageAndRuntime.AddToolVersion("Mono", $(Get-MonoVersion)) $languageAndRuntime.AddToolVersion("Node.js", $(Get-NodeVersion)) -if ((-not $os.IsVentura) -and (-not $os.IsVenturaArm64)) { +if ((-not $os.IsVentura) -and (-not $os.IsVenturaArm64) -and (-not $os.IsSonoma)) { $languageAndRuntime.AddToolVersion("MSBuild", $(Get-MSBuildVersion)) $languageAndRuntime.AddToolVersion("NVM", $(Get-NVMVersion)) $languageAndRuntime.AddToolVersionsListInline("NVM - Cached node versions", $(Get-NVMNodeVersionList), '^\d+') @@ -55,7 +55,7 @@ if (-not $os.IsVenturaArm64) { $languageAndRuntime.AddToolVersion("PHP", $(Get-PHPVersion)) } -if ((-not $os.IsVentura) -and (-not $os.IsVenturaArm64)) { +if ((-not $os.IsVentura) -and (-not $os.IsVenturaArm64) -and (-not $os.IsSonoma)) { $languageAndRuntime.AddToolVersion("Python", $(Get-PythonVersion)) } @@ -74,12 +74,12 @@ if (-not $os.IsVenturaArm64) { $packageManagement.AddToolVersion("Composer", $(Get-ComposerVersion)) } $packageManagement.AddToolVersion("Homebrew", $(Get-HomebrewVersion)) -if ((-not $os.IsVentura) -and (-not $os.IsVenturaArm64)) { +if ((-not $os.IsVentura) -and (-not $os.IsVenturaArm64) -and (-not $os.IsSonoma)) { $packageManagement.AddToolVersion("Miniconda", $(Get-CondaVersion)) } $packageManagement.AddToolVersion("NPM", $(Get-NPMVersion)) $packageManagement.AddToolVersion("NuGet", $(Get-NuGetVersion)) -if ((-not $os.IsVentura) -and (-not $os.IsVenturaArm64)) { +if ((-not $os.IsVentura) -and (-not $os.IsVenturaArm64) -and (-not $os.IsSonoma)) { $packageManagement.AddToolVersion("Pip", $(Get-PipVersion -Version 2)) } @@ -94,7 +94,7 @@ if (-not $os.IsVenturaArm64) { } $packageManagement.AddToolVersion("Yarn", $(Get-YarnVersion)) -if ((-not $os.IsVentura) -and (-not $os.IsVenturaArm64)) { +if ((-not $os.IsVentura) -and (-not $os.IsVenturaArm64) -and (-not $os.IsSonoma)) { $packageManagement.AddNode($(Build-PackageManagementEnvironmentTable)) } # Project Management @@ -102,7 +102,7 @@ $projectManagement = $installedSoftware.AddHeader("Project Management") $projectManagement.AddToolVersion("Apache Ant", $(Get-ApacheAntVersion)) $projectManagement.AddToolVersion("Apache Maven", $(Get-MavenVersion)) $projectManagement.AddToolVersion("Gradle", $(Get-GradleVersion)) -if ((-not $os.IsVentura) -and (-not $os.IsVenturaArm64)) { +if ((-not $os.IsVentura) -and (-not $os.IsVenturaArm64) -and (-not $os.IsSonoma)) { $projectManagement.AddToolVersion("Sbt", $(Get-SbtVersion)) } @@ -124,11 +124,11 @@ $utilities.AddToolVersion("gpg (GnuPG)", $(Get-GPGVersion)) if ($os.IsBigSur) { $utilities.AddToolVersion("helm", $(Get-HelmVersion)) } -if ((-not $os.IsVentura) -and (-not $os.IsVenturaArm64)) { +if ((-not $os.IsVentura) -and (-not $os.IsVenturaArm64) -and (-not $os.IsSonoma)) { $utilities.AddToolVersion("ImageMagick", $(Get-ImageMagickVersion)) } $utilities.AddToolVersion("jq", $(Get-JqVersion)) -if ((-not $os.IsVentura) -and (-not $os.IsVenturaArm64)) { +if ((-not $os.IsVentura) -and (-not $os.IsVenturaArm64) -and (-not $os.IsSonoma)) { $utilities.AddToolVersion("mongo", $(Get-MongoVersion)) $utilities.AddToolVersion("mongod", $(Get-MongodVersion)) } @@ -138,14 +138,14 @@ if ($os.IsBigSur) { $utilities.AddToolVersion("OpenSSL", $(Get-OpenSSLVersion)) $utilities.AddToolVersion("Packer", $(Get-PackerVersion)) $utilities.AddToolVersion("pkg-config", $(Get-PKGConfigVersion)) -if ((-not $os.IsVentura) -and (-not $os.IsVenturaArm64)) { +if ((-not $os.IsVentura) -and (-not $os.IsVenturaArm64) -and (-not $os.IsSonoma)) { $utilities.AddToolVersion("PostgreSQL", $(Get-PostgresServerVersion)) $utilities.AddToolVersion("psql (PostgreSQL)", $(Get-PostgresClientVersion)) $utilities.AddToolVersion("Sox", $(Get-SoxVersion)) $utilities.AddToolVersion("Subversion (SVN)", $(Get-SVNVersion)) $utilities.AddToolVersion("Switchaudio-osx", $(Get-SwitchAudioOsxVersion)) } -if ((-not $os.IsBigSur) -and (-not $os.IsVentura) -and (-not $os.IsVenturaArm64)) { +if ($os.IsMonterey) { $utilities.AddToolVersion("Vagrant", $(Get-VagrantVersion)) $utilities.AddToolVersion("VirtualBox", $(Get-VirtualBoxVersion)) } @@ -157,7 +157,7 @@ $tools = $installedSoftware.AddHeader("Tools") if ($os.IsBigSur) { $tools.AddToolVersion("Aliyun CLI", $(Get-AliyunCLIVersion)) } -if ((-not $os.IsVentura) -and (-not $os.IsVenturaArm64)) { +if ((-not $os.IsVentura) -and (-not $os.IsVenturaArm64) -and (-not $os.IsSonoma)) { $tools.AddToolVersion("App Center CLI", $(Get-AppCenterCLIVersion)) } if (-not $os.IsVenturaArm64) { @@ -181,14 +181,14 @@ if (-not $os.IsVenturaArm64) { $tools.AddToolVersion("GHC", $(Get-GHCVersion)) $tools.AddToolVersion("GHCup", $(Get-GHCupVersion)) } -if ((-not $os.IsVentura) -and (-not $os.IsVenturaArm64)) { +if ((-not $os.IsVentura) -and (-not $os.IsVenturaArm64) -and (-not $os.IsSonoma)) { $tools.AddToolVersion("Jazzy", $(Get-JazzyVersion)) } if (-not $os.IsVenturaArm64) { $tools.AddToolVersion("Stack", $(Get-StackVersion)) } $tools.AddToolVersion("SwiftFormat", $(Get-SwiftFormatVersion)) -if ((-not $os.IsVentura) -and (-not $os.IsVenturaArm64)) { +if ((-not $os.IsVentura) -and (-not $os.IsVenturaArm64) -and (-not $os.IsSonoma)) { $tools.AddToolVersion("Swig", $(Get-SwigVersion)) } $tools.AddToolVersion("Xcode Command Line Tools", $(Get-XcodeCommandLineToolsVersion)) @@ -198,7 +198,7 @@ $linters = $installedSoftware.AddHeader("Linters") if (-not $os.IsVenturaArm64) { $linters.AddToolVersion("SwiftLint", $(Get-SwiftLintVersion)) } -if ((-not $os.IsVentura) -and (-not $os.IsVenturaArm64)) { +if ((-not $os.IsVentura) -and (-not $os.IsVenturaArm64) -and (-not $os.IsSonoma)) { $linters.AddToolVersion("Yamllint", $(Get-YamllintVersion)) } @@ -212,23 +212,25 @@ $java = $installedSoftware.AddHeader("Java") $java.AddTable($(Get-JavaVersions)) # Toolcache -$toolcache = $installedSoftware.AddHeader("Cached Tools") -$toolcache.AddNodes($(Build-ToolcacheSection)) - -# Rust -$rust = $installedSoftware.AddHeader("Rust Tools") -$rust.AddToolVersion("Cargo", $(Get-RustCargoVersion)) -$rust.AddToolVersion("Rust", $(Get-RustVersion)) -$rust.AddToolVersion("Rustdoc", $(Get-RustdocVersion)) -$rust.AddToolVersion("Rustup", $(Get-RustupVersion)) - -$rustPackages = $rust.AddHeader("Packages") -$rustPackages.AddToolVersion("Bindgen", $(Get-Bindgen)) -$rustPackages.AddToolVersion("Cargo-audit", $(Get-Cargoaudit)) -$rustPackages.AddToolVersion("Cargo-outdated", $(Get-Cargooutdated)) -$rustPackages.AddToolVersion("Cbindgen", $(Get-Cbindgen)) -$rustPackages.AddToolVersion("Clippy", $(Get-RustClippyVersion)) -$rustPackages.AddToolVersion("Rustfmt", $(Get-RustfmtVersion)) +if (-not $os.IsSonoma) { + $toolcache = $installedSoftware.AddHeader("Cached Tools") + $toolcache.AddNodes($(Build-ToolcacheSection)) + + # Rust + $rust = $installedSoftware.AddHeader("Rust Tools") + $rust.AddToolVersion("Cargo", $(Get-RustCargoVersion)) + $rust.AddToolVersion("Rust", $(Get-RustVersion)) + $rust.AddToolVersion("Rustdoc", $(Get-RustdocVersion)) + $rust.AddToolVersion("Rustup", $(Get-RustupVersion)) + + $rustPackages = $rust.AddHeader("Packages") + $rustPackages.AddToolVersion("Bindgen", $(Get-Bindgen)) + $rustPackages.AddToolVersion("Cargo-audit", $(Get-Cargoaudit)) + $rustPackages.AddToolVersion("Cargo-outdated", $(Get-Cargooutdated)) + $rustPackages.AddToolVersion("Cbindgen", $(Get-Cbindgen)) + $rustPackages.AddToolVersion("Clippy", $(Get-RustClippyVersion)) + $rustPackages.AddToolVersion("Rustfmt", $(Get-RustfmtVersion)) +} # PowerShell $powerShell = $installedSoftware.AddHeader("PowerShell Tools") @@ -238,30 +240,30 @@ $powerShellModules = $powerShell.AddHeader("PowerShell Modules") $powerShellModules.AddNodes($(Get-PowerShellModules)) # Web Servers -if ((-not $os.IsVentura) -and (-not $os.IsVenturaArm64)) { +if ((-not $os.IsVentura) -and (-not $os.IsVenturaArm64) -and (-not $os.IsSonoma)) { $webServers = $installedSoftware.AddHeader("Web Servers") $webServers.AddTable($(Build-WebServersSection)) } # Xamarin section -if ((-not $os.IsVentura) -and (-not $os.IsVenturaArm64)) { -$xamarin = $installedSoftware.AddHeader("Xamarin") -$vsForMac = $xamarin.AddHeader("Visual Studio for Mac") -$vsForMac.AddTable($(Build-VSMacTable)) -$note = +if ((-not $os.IsVentura) -and (-not $os.IsVenturaArm64) -and (-not $os.IsSonoma)) { + $xamarin = $installedSoftware.AddHeader("Xamarin") + $vsForMac = $xamarin.AddHeader("Visual Studio for Mac") + $vsForMac.AddTable($(Build-VSMacTable)) + $note = @' To use Visual Studio 2019 by default rename the app: mv "/Applications/Visual Studio.app" "/Applications/Visual Studio 2022.app" mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" '@ -$vsForMacNotes = $vsForMac.AddHeader("Notes") -$vsForMacNotes.AddNote($note) + $vsForMacNotes = $vsForMac.AddHeader("Notes") + $vsForMacNotes.AddNote($note) -$xamarinBundles = $xamarin.AddHeader("Xamarin bundles") -$xamarinBundles.AddTable($(Build-XamarinTable)) + $xamarinBundles = $xamarin.AddHeader("Xamarin bundles") + $xamarinBundles.AddTable($(Build-XamarinTable)) -$unitTestFramework = $xamarin.AddHeader("Unit Test Framework") -$unitTestFramework.AddToolVersion("NUnit", $(Get-NUnitVersion)) + $unitTestFramework = $xamarin.AddHeader("Unit Test Framework") + $unitTestFramework.AddToolVersion("NUnit", $(Get-NUnitVersion)) } # Xcode section @@ -289,7 +291,7 @@ $android.AddTable($androidTable) $androidEnv = $android.AddHeader("Environment variables") $androidEnv.AddTable($(Build-AndroidEnvironmentTable)) -if ((-not $os.IsVentura) -and (-not $os.IsVenturaArm64)) { +if ($os.IsBigSur -or $os.IsMonterey) { $miscellaneous = $installedSoftware.AddHeader("Miscellaneous") $miscellaneous.AddToolVersion("libXext", $(Get-LibXextVersion)) $miscellaneous.AddToolVersion("libXft", $(Get-LibXftVersion)) diff --git a/images/macos/tests/Android.Tests.ps1 b/images/macos/tests/Android.Tests.ps1 index 54b18e3319e0..d399f558d639 100644 --- a/images/macos/tests/Android.Tests.ps1 +++ b/images/macos/tests/Android.Tests.ps1 @@ -9,14 +9,14 @@ Describe "Android" { [int]$platformMinVersion = Get-ToolsetValue "android.platform_min_version" [version]$buildToolsMinVersion = Get-ToolsetValue "android.build_tools_min_version" [array]$ndkVersions = Get-ToolsetValue "android.ndk.versions" - $ndkFullVersions = $ndkVersions | ForEach-Object { Get-ChildItem "$env:ANDROID_HOME/ndk/${_}.*" -Name | Select-Object -Last 1} | ForEach-Object { "ndk/${_}" } + $ndkFullVersions = $ndkVersions | ForEach-Object { Get-ChildItem "$env:ANDROID_HOME/ndk/${_}.*" -Name | Select-Object -Last 1 } | ForEach-Object { "ndk/${_}" } # Platforms starting with a letter are the preview versions, which is not installed on the image $platformVersionsList = ($androidSdkManagerPackages | Where-Object { "$_".StartsWith("platforms;") }) -replace 'platforms;android-', '' | Where-Object { $_ -match "^\d" } | Sort-Object -Unique $platformsInstalled = $platformVersionsList | Where-Object { [int]($_.Split("-")[0]) -ge $platformMinVersion } | ForEach-Object { "platforms/android-${_}" } $buildToolsList = ($androidSdkManagerPackages | Where-Object { "$_".StartsWith("build-tools;") }) -replace 'build-tools;', '' - $buildTools = $buildToolsList | Where-Object { $_ -match "\d+(\.\d+){2,}$"} | Where-Object { [version]$_ -ge $buildToolsMinVersion } | Sort-Object -Unique | - ForEach-Object { "build-tools/${_}" } + $buildTools = $buildToolsList | Where-Object { $_ -match "\d+(\.\d+){2,}$" } | Where-Object { [version]$_ -ge $buildToolsMinVersion } | Sort-Object -Unique | + ForEach-Object { "build-tools/${_}" } $androidPackages = @( "tools", @@ -31,14 +31,14 @@ Describe "Android" { ) | ForEach-Object { $_ } # Remove empty strings from array to avoid possible issues - $androidPackages = $androidPackages | Where-Object {$_} + $androidPackages = $androidPackages | Where-Object { $_ } BeforeAll { $ANDROID_SDK_DIR = Join-Path $env:HOME "Library" "Android" "sdk" function Validate-AndroidPackage { param ( - [Parameter(Mandatory=$true)] + [Parameter(Mandatory = $true)] [string]$PackageName ) @@ -51,22 +51,17 @@ Describe "Android" { } Context "SDKManagers" { - if (-not $os.IsVentura -and -not $os.IsVenturaArm64) { - $testCases = @( + $testCases = @( + @{ + PackageName = "Command-line tools" + Sdkmanager = "$env:ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager" + } + ) + if ($os.IsBigSur -or $os.IsMonterey) { + $testCases += @( @{ PackageName = "SDK tools" - Sdkmanager = "$env:ANDROID_HOME/tools/bin/sdkmanager" - }, - @{ - PackageName = "Command-line tools" - Sdkmanager = "$env:ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager" - } - ) - }else { - $testCases = @( - @{ - PackageName = "Command-line tools" - Sdkmanager = "$env:ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager" + Sdkmanager = "$env:ANDROID_HOME/tools/bin/sdkmanager" } ) } @@ -84,4 +79,4 @@ Describe "Android" { Validate-AndroidPackage $PackageName } } -} \ No newline at end of file +} diff --git a/images/macos/tests/BasicTools.Tests.ps1 b/images/macos/tests/BasicTools.Tests.ps1 index c4b763cdf83b..081959a0ce9a 100644 --- a/images/macos/tests/BasicTools.Tests.ps1 +++ b/images/macos/tests/BasicTools.Tests.ps1 @@ -25,7 +25,7 @@ Describe "cmake" { } } -Describe "Subversion" -Skip:($os.IsVentura -or $os.IsVenturaArm64) { +Describe "Subversion" -Skip:($os.IsVentura -or $os.IsVenturaArm64 -or $os.IsSonoma) { It "Subversion" { "svn --version" | Should -ReturnZeroExitCode } @@ -61,7 +61,7 @@ Describe "Perl" { } } -Describe "Helm" -Skip:($os.IsMonterey -or $os.IsVentura -or $os.IsVenturaArm64) { +Describe "Helm" -Skip:($os.IsMonterey -or $os.IsVentura -or $os.IsVenturaArm64 -or $os.IsSonoma) { It "Helm" { "helm version --short" | Should -ReturnZeroExitCode } @@ -116,7 +116,7 @@ Describe "bazel" { } } -Describe "Aliyun CLI" -Skip:($os.IsMonterey -or $os.IsVentura -or $os.IsVenturaArm64) { +Describe "Aliyun CLI" -Skip:($os.IsMonterey -or $os.IsVentura -or $os.IsVenturaArm64 -or $os.IsSonoma) { It "Aliyun CLI" { "aliyun --version" | Should -ReturnZeroExitCode } @@ -146,13 +146,13 @@ Describe "wget" { } } -Describe "vagrant" -Skip:($os.IsBigSur -or $os.IsVentura -or $os.IsVenturaArm64) { +Describe "vagrant" -Skip:($os.IsBigSur -or $os.IsVentura -or $os.IsVenturaArm64 -or $os.IsSonoma) { It "vagrant" { "vagrant --version" | Should -ReturnZeroExitCode } } -Describe "virtualbox" -Skip:($os.IsBigSur -or $os.IsVentura -or $os.IsVenturaArm64) { +Describe "virtualbox" -Skip:($os.IsBigSur -or $os.IsVentura -or $os.IsVenturaArm64 -or $os.IsSonoma) { It "virtualbox" { "vboxmanage -v" | Should -ReturnZeroExitCode } @@ -178,7 +178,7 @@ Describe "Kotlin" { } } -Describe "sbt" -Skip:($os.IsVentura -or $os.IsVenturaArm64) { +Describe "sbt" -Skip:($os.IsVentura -or $os.IsVenturaArm64 -or $os.IsSonoma) { It "sbt" { "sbt -version" | Should -ReturnZeroExitCode } @@ -190,7 +190,7 @@ Describe "yq" { } } -Describe "imagemagick" -Skip:($os.IsVentura -or $os.IsVenturaArm64) { +Describe "imagemagick" -Skip:($os.IsVentura -or $os.IsVenturaArm64 -or $os.IsSonoma) { It "imagemagick" { "magick -version" | Should -ReturnZeroExitCode } diff --git a/images/macos/tests/Common.Tests.ps1 b/images/macos/tests/Common.Tests.ps1 index e1e645e7f5af..f0d4f830513b 100644 --- a/images/macos/tests/Common.Tests.ps1 +++ b/images/macos/tests/Common.Tests.ps1 @@ -58,7 +58,7 @@ Describe "AzCopy" { } } -Describe "Miniconda" -Skip:($os.IsVentura -or $os.IsVenturaArm64) { +Describe "Miniconda" -Skip:($os.IsVentura -or $os.IsVenturaArm64 -or $os.IsSonoma) { It "Conda" { Get-EnvironmentVariable "CONDA" | Should -Not -BeNullOrEmpty $condaBinPath = Join-Path $env:CONDA "bin" "conda" @@ -78,7 +78,7 @@ Describe "CocoaPods" { } } -Describe "VSMac" -Skip:($os.IsVentura -or $os.IsVenturaArm64) { +Describe "VSMac" -Skip:($os.IsVentura -or $os.IsVenturaArm64 -or $os.IsSonoma) { $vsMacVersions = Get-ToolsetValue "xamarin.vsmac.versions" $defaultVSMacVersion = Get-ToolsetValue "xamarin.vsmac.default" @@ -105,7 +105,7 @@ Describe "VSMac" -Skip:($os.IsVentura -or $os.IsVenturaArm64) { } } -Describe "Swig" -Skip:($os.IsVentura -or $os.IsVenturaArm64) { +Describe "Swig" -Skip:($os.IsVentura -or $os.IsVenturaArm64 -or $os.IsSonoma) { It "Swig" { "swig -version" | Should -ReturnZeroExitCode } @@ -117,13 +117,13 @@ Describe "Bicep" { } } -Describe "Go" -Skip:($os.IsVentura -or $os.IsVenturaArm64) { +Describe "Go" -Skip:($os.IsVentura -or $os.IsVenturaArm64 -or $os.IsSonoma) { It "Go" { "go version" | Should -ReturnZeroExitCode } } -Describe "VirtualBox" -Skip:($os.IsBigSur -or $os.IsVentura -or $os.IsVenturaArm64) { +Describe "VirtualBox" -Skip:($os.IsBigSur -or $os.IsVentura -or $os.IsVenturaArm64 -or $os.IsSonoma) { It "Check kext kernel modules" { kextstat | Out-String | Should -Match "org.virtualbox.kext" } @@ -141,7 +141,7 @@ Describe "CodeQL Bundle" { } } -Describe "Colima" -Skip:($os.IsVentura -or $os.IsVenturaArm64) { +Describe "Colima" -Skip:($os.IsVentura -or $os.IsVenturaArm64 -or $os.IsSonoma) { It "Colima" { "colima version" | Should -ReturnZeroExitCode } diff --git a/images/macos/tests/Databases.Tests.ps1 b/images/macos/tests/Databases.Tests.ps1 index 36eebcd5bb13..3dda00eeddec 100644 --- a/images/macos/tests/Databases.Tests.ps1 +++ b/images/macos/tests/Databases.Tests.ps1 @@ -2,7 +2,7 @@ Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" $os = Get-OSVersion -Describe "MongoDB" -Skip:($os.IsVentura -or $os.IsVenturaArm64) { +Describe "MongoDB" -Skip:($os.IsVentura -or $os.IsVenturaArm64 -or $os.IsSonoma) { It "<ToolName>" -TestCases @( @{ ToolName = "mongo" } @{ ToolName = "mongod" } @@ -12,7 +12,7 @@ Describe "MongoDB" -Skip:($os.IsVentura -or $os.IsVenturaArm64) { } } -Describe "PostgreSQL" -Skip:($os.IsVentura -or $os.IsVenturaArm64) { +Describe "PostgreSQL" -Skip:($os.IsVentura -or $os.IsVenturaArm64 -or $os.IsSonoma) { It "PostgreSQL version should correspond to the version in the toolset" { $toolsetVersion = Get-ToolsetValue 'postgresql.version' # Client version @@ -20,4 +20,4 @@ Describe "PostgreSQL" -Skip:($os.IsVentura -or $os.IsVenturaArm64) { # Server version (pg_config --version).split()[-2] | Should -BeLike "$toolsetVersion*" } -} \ No newline at end of file +} diff --git a/images/macos/tests/Node.Tests.ps1 b/images/macos/tests/Node.Tests.ps1 index 9f13fe431680..b84aee350090 100644 --- a/images/macos/tests/Node.Tests.ps1 +++ b/images/macos/tests/Node.Tests.ps1 @@ -21,7 +21,7 @@ Describe "Node.js" { } } -Describe "nvm" -Skip:($os.IsVentura -or $os.IsVenturaArm64) { +Describe "nvm" -Skip:($os.IsVentura -or $os.IsVenturaArm64 -or $os.IsSonoma) { BeforeAll { $nvmPath = Join-Path $env:HOME ".nvm" "nvm.sh" $nvmInitCommand = ". $nvmPath > /dev/null 2>&1 || true" @@ -54,4 +54,3 @@ Describe "Global NPM Packages" { $Test | Should -ReturnZeroExitCode } } - diff --git a/images/macos/tests/PipxPackages.Tests.ps1 b/images/macos/tests/PipxPackages.Tests.ps1 index f95d35639e1f..adfd45c3140a 100644 --- a/images/macos/tests/PipxPackages.Tests.ps1 +++ b/images/macos/tests/PipxPackages.Tests.ps1 @@ -3,10 +3,10 @@ Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" $os = Get-OSVersion -Describe "PipxPackages" -Skip:($os.IsVentura -or $os.IsVenturaArm64) { +Describe "PipxPackages" -Skip:($os.IsVentura -or $os.IsVenturaArm64 -or $os.IsSonoma) { $pipxToolset = Get-ToolsetValue "pipx" $testCases = $pipxToolset | ForEach-Object { @{package = $_.package; cmd = $_.cmd} } It "<package>" -TestCases $testCases { "$cmd" | Should -ReturnZeroExitCode } -} \ No newline at end of file +} diff --git a/images/macos/tests/Python.Tests.ps1 b/images/macos/tests/Python.Tests.ps1 index 4c1f7086e0c6..2504b9651ca1 100644 --- a/images/macos/tests/Python.Tests.ps1 +++ b/images/macos/tests/Python.Tests.ps1 @@ -28,7 +28,7 @@ Describe "Python3" -Skip:($os.IsVenturaArm64) { } -Describe "Python2" -Skip:($os.IsVenturaArm64 -or $os.IsVentura) { +Describe "Python2" -Skip:($os.IsVenturaArm64 -or $os.IsVentura -or $os.IsSonoma) { It "Python 2 is available" { "/Library/Frameworks/Python.framework/Versions/2.7/bin/python --version" | Should -ReturnZeroExitCode } @@ -41,4 +41,4 @@ Describe "Python2" -Skip:($os.IsVenturaArm64 -or $os.IsVentura) { $2to3path = (Get-ChildItem (Get-Command 2to3).Path).Target $2to3path | Should -Not -BeLike '/Frameworks/Python.framework/Versions/2.*' } -} \ No newline at end of file +} diff --git a/images/macos/tests/Ruby.arm64.Tests.ps1 b/images/macos/tests/Ruby.arm64.Tests.ps1 index 2e380ac1bfca..c8b77fac0a10 100644 --- a/images/macos/tests/Ruby.arm64.Tests.ps1 +++ b/images/macos/tests/Ruby.arm64.Tests.ps1 @@ -3,7 +3,7 @@ Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1" -DisableNameChecking $os = Get-OSVersion -Describe "Ruby" -Skip:($os.IsVentura -or $os.IsBigSur -or $os.IsMonterey) { +Describe "Ruby" -Skip:($os.IsVentura -or $os.IsBigSur -or $os.IsMonterey -or $os.IsSonoma) { It "Ruby is available" { "ruby --version" | Should -ReturnZeroExitCode } diff --git a/images/macos/tests/RubyGem.Tests.ps1 b/images/macos/tests/RubyGem.Tests.ps1 index 4546c9519565..81f178d95d1b 100644 --- a/images/macos/tests/RubyGem.Tests.ps1 +++ b/images/macos/tests/RubyGem.Tests.ps1 @@ -20,7 +20,7 @@ Describe "Bundler" { } } -Describe "Nomad shenzhen CLI" -Skip:($os.IsMonterey -or $os.IsVentura -or $os.IsVenturaArm64) { +Describe "Nomad shenzhen CLI" -Skip:($os.IsMonterey -or $os.IsVentura -or $os.IsVenturaArm64 -or $os.IsSonoma) { It "Nomad shenzhen CLI" { "ipa --version" | Should -ReturnZeroExitCode } @@ -38,8 +38,8 @@ Describe "xcpretty" { } } -Describe "jazzy" -Skip:($os.IsVentura -or $os.IsVenturaArm64) { +Describe "jazzy" -Skip:($os.IsVentura -or $os.IsVenturaArm64 -or $os.IsSonoma) { It "jazzy" { "jazzy --version" | Should -ReturnZeroExitCode } -} \ No newline at end of file +} diff --git a/images/macos/tests/System.Tests.ps1 b/images/macos/tests/System.Tests.ps1 index 4d56aafcdef2..3dd7e802f51a 100644 --- a/images/macos/tests/System.Tests.ps1 +++ b/images/macos/tests/System.Tests.ps1 @@ -25,7 +25,7 @@ Describe "Certificate" { } } -Describe "Audio device" -Skip:($os.IsVentura -or $os.IsVenturaArm64) { +Describe "Audio device" -Skip:($os.IsVentura -or $os.IsVenturaArm64 -or $os.IsSonoma) { It "Sox is installed" { "sox --version" | Should -ReturnZeroExitCode } diff --git a/images/macos/tests/Xamarin.Tests.ps1 b/images/macos/tests/Xamarin.Tests.ps1 index 5e00ff48a94f..69ced6747d49 100644 --- a/images/macos/tests/Xamarin.Tests.ps1 +++ b/images/macos/tests/Xamarin.Tests.ps1 @@ -2,7 +2,7 @@ Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1" -DisableNameChecking $os = Get-OSVersion -if ($os.IsVentura -or $os.IsVenturaArm64) { +if ($os.IsVentura -or $os.IsVenturaArm64 -or $os.IsSonoma) { $MONO_VERSIONS = @(Get-ToolsetValue "mono.framework.version") $XAMARIN_IOS_VERSIONS = @() $XAMARIN_MAC_VERSIONS = @() @@ -89,7 +89,7 @@ Describe "Mono" { } } -Describe "Xamarin.iOS" -Skip:($os.IsVentura -or $os.IsVenturaArm64) { +Describe "Xamarin.iOS" -Skip:($os.IsVentura -or $os.IsVenturaArm64 -or $os.IsSonoma) { $XAMARIN_IOS_VERSIONS | ForEach-Object { Context "$_" { $XAMARIN_IOS_VERSIONS_PATH = "/Library/Frameworks/Xamarin.iOS.framework/Versions" @@ -122,7 +122,7 @@ Describe "Xamarin.iOS" -Skip:($os.IsVentura -or $os.IsVenturaArm64) { } } -Describe "Xamarin.Mac" -Skip:($os.IsVentura -or $os.IsVenturaArm64) { +Describe "Xamarin.Mac" -Skip:($os.IsVentura -or $os.IsVenturaArm64 -or $os.IsSonoma) { $XAMARIN_MAC_VERSIONS | ForEach-Object { Context "$_" { $XAMARIN_MAC_VERSIONS_PATH = "/Library/Frameworks/Xamarin.Mac.framework/Versions" @@ -155,7 +155,7 @@ Describe "Xamarin.Mac" -Skip:($os.IsVentura -or $os.IsVenturaArm64) { } } -Describe "Xamarin.Android" -Skip:($os.IsVentura -or $os.IsVenturaArm64) { +Describe "Xamarin.Android" -Skip:($os.IsVentura -or $os.IsVenturaArm64 -or $os.IsSonoma) { $XAMARIN_ANDROID_VERSIONS | ForEach-Object { Context "$_" { $XAMARIN_ANDROID_VERSIONS_PATH = "/Library/Frameworks/Xamarin.Android.framework/Versions" @@ -195,7 +195,7 @@ Describe "Xamarin.Android" -Skip:($os.IsVentura -or $os.IsVenturaArm64) { } } -Describe "Xamarin Bundles" -Skip:($os.IsVentura -or $os.IsVenturaArm64) { +Describe "Xamarin Bundles" -Skip:($os.IsVentura -or $os.IsVenturaArm64 -or $os.IsSonoma) { BeforeAll { $MONO_VERSIONS_PATH = "/Library/Frameworks/Mono.framework/Versions" $XAMARIN_IOS_VERSIONS_PATH = "/Library/Frameworks/Xamarin.iOS.framework/Versions" @@ -302,7 +302,7 @@ Describe "Xamarin Bundles" -Skip:($os.IsVentura -or $os.IsVenturaArm64) { } } -Describe "Nuget" -Skip:($os.IsVentura -or $os.IsVenturaArm64) { +Describe "Nuget" -Skip:($os.IsVentura -or $os.IsVenturaArm64 -or $os.IsSonoma) { It "Nuget config contains nuget.org feed" { Get-Content $env:HOME/.config/NuGet/NuGet.Config | Out-String | Should -Match "nuget.org" } diff --git a/images/macos/toolsets/toolset-14.json b/images/macos/toolsets/toolset-14.json index 69fc0efee404..7ef04cd6fa53 100644 --- a/images/macos/toolsets/toolset-14.json +++ b/images/macos/toolsets/toolset-14.json @@ -6,12 +6,22 @@ { "link": "15.0.1", "version": "15.0.1+15A507", "symlinks": ["15.0"], "install_runtimes": "true"}, { "link": "14.3.1", "version": "14.3.1+14E300c","symlinks": ["14.3"], "install_runtimes": "true"} ] + }, + "arm64":{ + "versions": [ + { "link": "15.0.1", "version": "15.0.1+15A507", "symlinks": ["15.0"], "install_runtimes": "true"}, + { "link": "14.3.1", "version": "14.3.1+14E300c","symlinks": ["14.3"], "install_runtimes": "true"} + ] } }, "java": { "x64": { "default": "21", "versions": [ "8", "11", "17", "21"] + }, + "arm64": { + "default": "21", + "versions": [ "11", "17", "21"] } }, "android": { @@ -79,6 +89,11 @@ "versions": [ "7.0" ] + }, + "arm64": { + "versions": [ + "7.0" + ] } } }, From e2f77cd4de2c9306441a0313a417bfcbc167bbca Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Thu, 9 Nov 2023 11:31:45 +0100 Subject: [PATCH 2423/3485] [Mac OS] Add newer versions of Go and Node.js (#8752) --- images/macos/toolsets/toolset-13.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/images/macos/toolsets/toolset-13.json b/images/macos/toolsets/toolset-13.json index 3ec9f2ad0529..cceb73e1d081 100644 --- a/images/macos/toolsets/toolset-13.json +++ b/images/macos/toolsets/toolset-13.json @@ -163,7 +163,8 @@ "arm64": { "versions": [ "16.*", - "18.*" + "18.*", + "20.*" ] } } @@ -185,7 +186,8 @@ "variable_template" : "GOROOT_{0}_{1}_ARM64", "versions": [ "1.19.*", - "1.20.*" + "1.20.*", + "1.21.*" ] } } From 7a11d3fc9856ccd45ca9d0ab2f2e470177b192d5 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Thu, 9 Nov 2023 15:45:50 +0100 Subject: [PATCH 2424/3485] Fix macOS 13 arm64 software update part (#8772) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Alexey Ayupov <“alexey.ayupov@akvelon.com”> --- .../macos/anka/CreateCleanAnkaTemplate.ps1 | 19 +++++++-- images.CI/macos/anka/Service.Helpers.psm1 | 42 ++++++++++++++----- .../auto-software-update-arm64.exp | 2 +- 3 files changed, 48 insertions(+), 15 deletions(-) diff --git a/images.CI/macos/anka/CreateCleanAnkaTemplate.ps1 b/images.CI/macos/anka/CreateCleanAnkaTemplate.ps1 index 9e35ef64fcb6..b6e63c2107b8 100644 --- a/images.CI/macos/anka/CreateCleanAnkaTemplate.ps1 +++ b/images.CI/macos/anka/CreateCleanAnkaTemplate.ps1 @@ -96,13 +96,20 @@ function Invoke-SoftwareUpdate { Install-SoftwareUpdate -HostName $ipAddress -listOfUpdates $listOfNewUpdates -Password $Password | Show-StringWithFormat # Check if Action: restart + # Define the next macOS version + $command = "sw_vers" + $guestMacosVersion = Invoke-SSHPassCommand -HostName $ipAddress -Command $command + switch -regex ($guestMacosVersion[1]) { + '12.\d' { $nextOSVersion = 'macOS Ventura' } + '13.\d' { $nextOSVersion = 'macOS Sonoma' } + } # Make an array of updates $listOfNewUpdates = $newUpdates.split('*').Trim('') foreach ($newupdate in $listOfNewUpdates) { # Will be True if the value is not Venture, not empty, and contains "Action: restart" words - if ($newupdate.Contains("Action: restart") -and !$newupdate.Contains("macOS Ventura") -and !$newupdate.Contains("macOS Sonoma") -and (-not [String]::IsNullOrEmpty($newupdate))) { - Write-Host "`t[*] Sleep 60 seconds before the software updates have been installed" - Start-Sleep -Seconds 60 + if ($newupdate.Contains("Action: restart") -and !$newupdate.Contains("$nextOSVersion") -and (-not [String]::IsNullOrEmpty($newupdate))) { + Write-Host "`t[*] Sleep 120 seconds before the software updates have been installed" + Start-Sleep -Seconds 120 Write-Host "`t[*] Waiting for loginwindow process" Wait-LoginWindow -HostName $ipAddress | Show-StringWithFormat @@ -112,7 +119,7 @@ function Invoke-SoftwareUpdate { # Check software updates have been installed $updates = Get-SoftwareUpdate -HostName $ipAddress - if ($updates.Contains("Action: restart")) { + if ($updates.Contains("Action: restart") -and !$updates.Contains("$nextOSVersion")) { Write-Host "`t[x] Software updates failed to install: " Show-StringWithFormat $updates exit 1 @@ -123,6 +130,10 @@ function Invoke-SoftwareUpdate { Write-Host "`t[*] Show the install history:" $hUpdates = Get-SoftwareUpdateHistory -HostName $ipAddress Show-StringWithFormat $hUpdates + + Write-Host "`t[*] The current macOS version:" + $command = "sw_vers" + Invoke-SSHPassCommand -HostName $ipAddress -Command $command | Show-StringWithFormat } function Invoke-UpdateSettings { diff --git a/images.CI/macos/anka/Service.Helpers.psm1 b/images.CI/macos/anka/Service.Helpers.psm1 index db8907fdf427..74a1e1e6ba4a 100644 --- a/images.CI/macos/anka/Service.Helpers.psm1 +++ b/images.CI/macos/anka/Service.Helpers.psm1 @@ -28,14 +28,31 @@ function Invoke-SoftwareUpdateArm64 { [Parameter(Mandatory)] [ValidateNotNullOrEmpty()] - [string] $Password + [string] $Password, + + [Parameter(Mandatory)] + [ValidateNotNullOrEmpty()] + [array] $ListOfUpdates ) + # Define the next macOS version + $command = "sw_vers" + $guestMacosVersion = Invoke-SSHPassCommand -HostName $HostName -Command $command + switch -regex ($guestMacosVersion[1]) { + '13.\d' { $nextOSVersion = 'Sonoma' } + '14.\d' { $nextOSVersion = 'NotYetDefined' } + } + $url = "https://raw.githubusercontent.com/actions/runner-images/main/images/macos/provision/configuration/auto-software-update-arm64.exp" $script = Invoke-RestMethod -Uri $url - $base64 = [Convert]::ToBase64String($script.ToCharArray()) - $command = "echo $base64 | base64 --decode > ./auto-software-update-arm64.exp;chmod +x ./auto-software-update-arm64.exp; ./auto-software-update-arm64.exp ${Password};rm ./auto-software-update-arm64.exp" - Invoke-SSHPassCommand -HostName $HostName -Command $command + foreach ($update in $listOfUpdates) { + if ($update -notmatch "$nextOSVersion") { + $updatedScript = $script.Replace("MACOSUPDATE", $($($update.trim()).Replace(" ","\ "))) + $base64 = [Convert]::ToBase64String($updatedScript.ToCharArray()) + $command = "echo $base64 | base64 --decode > ./auto-software-update-arm64.exp;chmod +x ./auto-software-update-arm64.exp; ./auto-software-update-arm64.exp ${Password};rm ./auto-software-update-arm64.exp" + Invoke-SSHPassCommand -HostName $HostName -Command $command + } + } } function Get-AvailableVersions { @@ -261,17 +278,22 @@ function Install-SoftwareUpdate { } } } elseif ($guestMacosVersion[1] -match "13") { - foreach ($update in $listOfUpdates) { - # Filtering updates that contain "Sonoma" word - if ($update -notmatch "Sonoma") { - $command = "sudo /usr/sbin/softwareupdate --restart --verbose --install '$($update.trim())'" - Invoke-SSHPassCommand -HostName $HostName -Command $command + $osArch = $(arch) + if ($osArch -eq "arm64") { + Invoke-SoftwareUpdateArm64 -HostName $HostName -Password $Password -ListOfUpdates $listOfUpdates + } else { + foreach ($update in $listOfUpdates) { + # Filtering updates that contain "Sonoma" word + if ($update -notmatch "Sonoma") { + $command = "sudo /usr/sbin/softwareupdate --restart --verbose --install '$($update.trim())'" + Invoke-SSHPassCommand -HostName $HostName -Command $command + } } } } else { $osArch = $(arch) if ($osArch -eq "arm64") { - Invoke-SoftwareUpdateArm64 -HostName $HostName -Password $Password + Invoke-SoftwareUpdateArm64 -HostName $HostName -Password $Password -ListOfUpdates $listOfUpdates } else { $command = "sudo /usr/sbin/softwareupdate --all --install --restart --verbose" Invoke-SSHPassCommand -HostName $HostName -Command $command diff --git a/images/macos/provision/configuration/auto-software-update-arm64.exp b/images/macos/provision/configuration/auto-software-update-arm64.exp index 9ef9da4765a8..f848acc8ace5 100644 --- a/images/macos/provision/configuration/auto-software-update-arm64.exp +++ b/images/macos/provision/configuration/auto-software-update-arm64.exp @@ -1,7 +1,7 @@ #! /usr/bin/expect -f set timeout -1 -spawn sudo /usr/sbin/softwareupdate --all --install --restart --verbose +spawn sudo /usr/sbin/softwareupdate --restart --verbose --install "MACOSUPDATE" expect "Password*" send "[lindex $argv 0]\r" expect eof From 25a3a04fb0352a05796bdfb39e96fc7df09ebd5a Mon Sep 17 00:00:00 2001 From: Peter Shepehrd <109117968+pshepherd10@users.noreply.github.com> Date: Thu, 9 Nov 2023 15:43:12 -0500 Subject: [PATCH 2425/3485] [Ubuntu] add runner-package to curated images (#8474) --- .../linux/scripts/installers/runner-package.sh | 18 ++++++++++++++++++ .../linux/scripts/tests/RunnerCache.Tests.ps1 | 7 +++++++ images/linux/ubuntu2004.json | 4 ++-- images/linux/ubuntu2204.pkr.hcl | 1 + 4 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 images/linux/scripts/installers/runner-package.sh create mode 100644 images/linux/scripts/tests/RunnerCache.Tests.ps1 diff --git a/images/linux/scripts/installers/runner-package.sh b/images/linux/scripts/installers/runner-package.sh new file mode 100644 index 000000000000..1e8b063ebd1e --- /dev/null +++ b/images/linux/scripts/installers/runner-package.sh @@ -0,0 +1,18 @@ +#!/bin/bash -e +################################################################################ +## File: runner-package.sh +## Desc: Downloads and Installs runner package +################################################################################ + +# Source the helpers for use with the script +source $HELPER_SCRIPTS/install.sh + +DOWNLOAD_URL=$(get_github_package_download_url "actions/runner" 'test("actions-runner-linux-x64-[0-9]+\\.[0-9]{3}\\.[0-9]+\\.tar\\.gz")') + +FILE_NAME="${DOWNLOAD_URL##*/}" + +sudo mkdir -p /opt/runner-cache + +download_with_retries "${DOWNLOAD_URL}" "/tmp" "${FILE_NAME}" + +sudo mv /tmp/$FILE_NAME /opt/runner-cache/$FILE_NAME diff --git a/images/linux/scripts/tests/RunnerCache.Tests.ps1 b/images/linux/scripts/tests/RunnerCache.Tests.ps1 new file mode 100644 index 000000000000..76c1a7278432 --- /dev/null +++ b/images/linux/scripts/tests/RunnerCache.Tests.ps1 @@ -0,0 +1,7 @@ +Describe "RunnerCache" { + Context "runner cache directory not empty" { + It "/opt/runner-cache not empty" { + (Get-ChildItem -Path "/opt/runner-cache/*.tar.gz" -Recurse).Count | Should -BeGreaterThan 0 + } + } +} diff --git a/images/linux/ubuntu2004.json b/images/linux/ubuntu2004.json index 875edeafb659..2e524036fda5 100644 --- a/images/linux/ubuntu2004.json +++ b/images/linux/ubuntu2004.json @@ -197,6 +197,7 @@ "type": "shell", "scripts": [ "{{template_dir}}/scripts/installers/action-archive-cache.sh", + "{{template_dir}}/scripts/installers/runner-package.sh", "{{template_dir}}/scripts/installers/apt-common.sh", "{{template_dir}}/scripts/installers/azcopy.sh", "{{template_dir}}/scripts/installers/azure-cli.sh", @@ -258,8 +259,7 @@ "{{template_dir}}/scripts/installers/android.sh", "{{template_dir}}/scripts/installers/pypy.sh", "{{template_dir}}/scripts/installers/python.sh", - "{{template_dir}}/scripts/installers/zstd.sh" - ], + "{{template_dir}}/scripts/installers/zstd.sh" ], "environment_vars": [ "HELPER_SCRIPTS={{user `helper_script_folder`}}", "INSTALLER_SCRIPT_FOLDER={{user `installer_script_folder`}}", diff --git a/images/linux/ubuntu2204.pkr.hcl b/images/linux/ubuntu2204.pkr.hcl index 500d959f4192..650711a87ef0 100644 --- a/images/linux/ubuntu2204.pkr.hcl +++ b/images/linux/ubuntu2204.pkr.hcl @@ -281,6 +281,7 @@ build { execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" scripts = [ "${path.root}/scripts/installers/action-archive-cache.sh", + "${path.root}/scripts/installers/runner-package.sh", "${path.root}/scripts/installers/apt-common.sh", "${path.root}/scripts/installers/azcopy.sh", "${path.root}/scripts/installers/azure-cli.sh", From 286fb24a6328f1956eadbdadc6c08c505a2fc2fd Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Fri, 10 Nov 2023 11:22:42 +0100 Subject: [PATCH 2426/3485] [macOS] Add AWS cli to the macOS 13 arm64 (#8774) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Alexey Ayupov <“alexey.ayupov@akvelon.com”> --- images/macos/software-report/SoftwareReport.Generator.ps1 | 8 +++----- images/macos/templates/macOS-13.arm64.anka.pkr.hcl | 1 + images/macos/tests/Common.Tests.ps1 | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1 index ff694767611d..d58a2769cc62 100644 --- a/images/macos/software-report/SoftwareReport.Generator.ps1 +++ b/images/macos/software-report/SoftwareReport.Generator.ps1 @@ -160,11 +160,9 @@ if ($os.IsBigSur) { if ((-not $os.IsVentura) -and (-not $os.IsVenturaArm64) -and (-not $os.IsSonoma)) { $tools.AddToolVersion("App Center CLI", $(Get-AppCenterCLIVersion)) } -if (-not $os.IsVenturaArm64) { - $tools.AddToolVersion("AWS CLI", $(Get-AWSCLIVersion)) - $tools.AddToolVersion("AWS SAM CLI", $(Get-AWSSAMCLIVersion)) - $tools.AddToolVersion("AWS Session Manager CLI", $(Get-AWSSessionManagerCLIVersion)) -} +$tools.AddToolVersion("AWS CLI", $(Get-AWSCLIVersion)) +$tools.AddToolVersion("AWS SAM CLI", $(Get-AWSSAMCLIVersion)) +$tools.AddToolVersion("AWS Session Manager CLI", $(Get-AWSSessionManagerCLIVersion)) $tools.AddToolVersion("Azure CLI", $(Get-AzureCLIVersion)) $tools.AddToolVersion("Azure CLI (azure-devops)", $(Get-AzureDevopsVersion)) $tools.AddToolVersion("Bicep CLI", $(Get-BicepVersion)) diff --git a/images/macos/templates/macOS-13.arm64.anka.pkr.hcl b/images/macos/templates/macOS-13.arm64.anka.pkr.hcl index 05434398d03e..4e273277c281 100644 --- a/images/macos/templates/macOS-13.arm64.anka.pkr.hcl +++ b/images/macos/templates/macOS-13.arm64.anka.pkr.hcl @@ -198,6 +198,7 @@ build { "./provision/core/action-archive-cache.sh", "./provision/core/llvm.sh", "./provision/core/openjdk.sh", + "./provision/core/aws.sh", "./provision/core/rust.sh", "./provision/core/gcc.sh", "./provision/core/cocoapods.sh", diff --git a/images/macos/tests/Common.Tests.ps1 b/images/macos/tests/Common.Tests.ps1 index f0d4f830513b..8fa92dd0c245 100644 --- a/images/macos/tests/Common.Tests.ps1 +++ b/images/macos/tests/Common.Tests.ps1 @@ -39,7 +39,7 @@ Describe "vcpkg" -Skip:($os.IsVenturaArm64) { } } -Describe "AWS" -Skip:($os.IsVenturaArm64) { +Describe "AWS" { It "AWS CLI" { "aws --version" | Should -ReturnZeroExitCode } From 495f740eda37b8302e06e13d0ea6f7d56d756035 Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Fri, 10 Nov 2023 16:25:40 +0100 Subject: [PATCH 2427/3485] Adjust services handling in Finalize-VM and helpers (#8771) --- .../scripts/ImageHelpers/InstallHelpers.ps1 | 65 ++++++++----------- images/win/scripts/Installers/Finalize-VM.ps1 | 6 +- 2 files changed, 29 insertions(+), 42 deletions(-) diff --git a/images/win/scripts/ImageHelpers/InstallHelpers.ps1 b/images/win/scripts/ImageHelpers/InstallHelpers.ps1 index a40202530e89..ad466aaab024 100644 --- a/images/win/scripts/ImageHelpers/InstallHelpers.ps1 +++ b/images/win/scripts/ImageHelpers/InstallHelpers.ps1 @@ -92,8 +92,7 @@ function Install-Binary } } -function Stop-SvcWithErrHandling -{ +function Stop-SvcWithErrHandling { <# .DESCRIPTION Function for stopping the Windows Service with error handling @@ -104,36 +103,26 @@ function Stop-SvcWithErrHandling .PARAMETER StopOnError Switch for stopping the script and exit from PowerShell if one service is absent #> - Param - ( + Param ( [Parameter(Mandatory, ValueFromPipeLine = $true)] [string] $ServiceName, [switch] $StopOnError ) - Process - { + Process { $service = Get-Service $ServiceName -ErrorAction SilentlyContinue - if (-not $service) - { + if (-not $service) { Write-Warning "[!] Service [$ServiceName] is not found" - if ($StopOnError) - { + if ($StopOnError) { exit 1 } - - } - else - { + } else { Write-Host "Try to stop service [$ServiceName]" - try - { + try { Stop-Service -Name $ServiceName -Force $service.WaitForStatus("Stopped", "00:01:00") Write-Host "Service [$ServiceName] has been stopped successfuly" - } - catch - { + } catch { Write-Error "[!] Failed to stop service [$ServiceName] with error:" $_ | Out-String | Write-Error } @@ -141,8 +130,7 @@ function Stop-SvcWithErrHandling } } -function Set-SvcWithErrHandling -{ +function Set-SvcWithErrHandling { <# .DESCRIPTION Function for setting the Windows Service parameter with error handling @@ -152,32 +140,33 @@ function Set-SvcWithErrHandling .PARAMETER Arguments Hashtable for service arguments + + .PARAMETER StopOnError + Switch for stopping the script and exit from PowerShell if one service is absent #> - Param - ( + Param ( [Parameter(Mandatory, ValueFromPipeLine = $true)] [string] $ServiceName, [Parameter(Mandatory)] - [hashtable] $Arguments + [hashtable] $Arguments, + [switch] $StopOnError ) - Process - { + Process { $service = Get-Service $ServiceName -ErrorAction SilentlyContinue - if (-not $service) - { - Write-Warning "[!] Service [$ServiceName] is not found" + if (-not $service) { + Write-Warning "[!] Service [$ServiceName] is not found" + if ($StopOnError) { + exit 1 + } + } else { + try { + Set-Service $serviceName @Arguments + } catch { + Write-Error "[!] Failed to set service [$ServiceName] arguments with error:" + $_ | Out-String | Write-Error } - - try - { - Set-Service $serviceName @Arguments - } - catch - { - Write-Error "[!] Failed to set service [$ServiceName] arguments with error:" - $_ | Out-String | Write-Error } } } diff --git a/images/win/scripts/Installers/Finalize-VM.ps1 b/images/win/scripts/Installers/Finalize-VM.ps1 index 398b59c822e0..8e64259e5412 100644 --- a/images/win/scripts/Installers/Finalize-VM.ps1 +++ b/images/win/scripts/Installers/Finalize-VM.ps1 @@ -104,10 +104,8 @@ $servicesToDisable = @( 'StorSvc' ) -$servicesToDisable | ForEach-Object { - Stop-Service -Name $_ - Set-Service -Name $_ -StartupType Disabled -ErrorAction Ignore -} | Out-Null +$servicesToDisable | Stop-SvcWithErrHandling +$servicesToDisable | Set-SvcWithErrHandling -Arguments @{StartupType = "Disabled"} # Disable scheduled tasks $allTasksInTaskPath = @( From ded4e461b0193622f8bac51fbd43951ab0b8c39d Mon Sep 17 00:00:00 2001 From: Luke Fritts <luketfritts@gmail.com> Date: Fri, 10 Nov 2023 10:38:32 -0500 Subject: [PATCH 2428/3485] [Windows] Set user agent header to get mysql patch version (#8773) --- images/win/scripts/Installers/Install-MysqlCli.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/win/scripts/Installers/Install-MysqlCli.ps1 b/images/win/scripts/Installers/Install-MysqlCli.ps1 index 079ac5b514d0..a05b56cd3fce 100644 --- a/images/win/scripts/Installers/Install-MysqlCli.ps1 +++ b/images/win/scripts/Installers/Install-MysqlCli.ps1 @@ -16,7 +16,7 @@ Install-Binary -Url $InstallerURI -Name $InstallerName -ArgumentList $ArgumentLi $MysqlVersionMajorMinor = $MysqlVersion.ToString(2) if ($MysqlVersion.Build -lt 0) { - $MysqlVersion = (Invoke-RestMethod -Uri "https://dev.mysql.com/downloads/mysql/${MysqlVersionMajorMinor}.html" -Headers @{'Accept'='text/html'} | + $MysqlVersion = (Invoke-RestMethod -Uri "https://dev.mysql.com/downloads/mysql/${MysqlVersionMajorMinor}.html" -Headers @{ 'User-Agent'='curl/8.4.0' } | Select-String -Pattern "${MysqlVersionMajorMinor}\.\d+").Matches.Value } From 23e386d1c25df14873408747bdbdd0b1f992568e Mon Sep 17 00:00:00 2001 From: Peter Shepehrd <109117968+pshepherd10@users.noreply.github.com> Date: Fri, 10 Nov 2023 11:24:16 -0500 Subject: [PATCH 2429/3485] add runner install script for windows image (#8671) --- images/win/scripts/Installers/Install-Runner.ps1 | 14 ++++++++++++++ images/win/scripts/Tests/RunnerCache.tests.ps1 | 7 +++++++ images/win/windows2019.json | 3 ++- images/win/windows2022.json | 3 ++- 4 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 images/win/scripts/Installers/Install-Runner.ps1 create mode 100644 images/win/scripts/Tests/RunnerCache.tests.ps1 diff --git a/images/win/scripts/Installers/Install-Runner.ps1 b/images/win/scripts/Installers/Install-Runner.ps1 new file mode 100644 index 000000000000..559875a1192e --- /dev/null +++ b/images/win/scripts/Installers/Install-Runner.ps1 @@ -0,0 +1,14 @@ +################################################################################ +## File: Install-Runner.ps1 +## Desc: Install Runner for GitHub Actions +## Supply chain security: none +################################################################################ + +Write-Host "Download latest Runner for GitHub Actions" +$release = Invoke-RestMethod -Uri "https://api.github.com/repos/actions/runner/releases/latest" +$version = $release.tag_name.Trim("v") +$downloadUrl = ($release.assets.browser_download_url -ilike "*actions-runner-win-x64-${version}.zip*") | Select-Object -First 1 +New-Item -Path "C:\ProgramData\runner" -ItemType Directory +$packagePath = Start-DownloadWithRetry -Url $downloadUrl -DownloadPath "C:\ProgramData\runner" + +Invoke-PesterTests -TestFile "RunnerCache" diff --git a/images/win/scripts/Tests/RunnerCache.tests.ps1 b/images/win/scripts/Tests/RunnerCache.tests.ps1 new file mode 100644 index 000000000000..8c932fb92299 --- /dev/null +++ b/images/win/scripts/Tests/RunnerCache.tests.ps1 @@ -0,0 +1,7 @@ +Describe "RunnerCache" { + Context "runner cache directory not empty" { + It "C:\ProgramData\runner" { + (Get-ChildItem -Path "C:\ProgramData\runner\*.zip" -Recurse).Count | Should -BeGreaterThan 0 + } + } +} diff --git a/images/win/windows2019.json b/images/win/windows2019.json index c00ac5d58147..dea37bf830c6 100644 --- a/images/win/windows2019.json +++ b/images/win/windows2019.json @@ -173,7 +173,8 @@ "{{ template_dir }}/scripts/Installers/Install-Docker-WinCred.ps1", "{{ template_dir }}/scripts/Installers/Install-Docker-Compose.ps1", "{{ template_dir }}/scripts/Installers/Install-PowershellCore.ps1", - "{{ template_dir }}/scripts/Installers/Install-WebPlatformInstaller.ps1" + "{{ template_dir }}/scripts/Installers/Install-WebPlatformInstaller.ps1", + "{{ template_dir }}/scripts/Installers/Install-Runner.ps1" ] }, { diff --git a/images/win/windows2022.json b/images/win/windows2022.json index 74d2092e734e..1ab93251d352 100644 --- a/images/win/windows2022.json +++ b/images/win/windows2022.json @@ -158,7 +158,8 @@ "{{ template_dir }}/scripts/Installers/Install-Docker-WinCred.ps1", "{{ template_dir }}/scripts/Installers/Install-Docker-Compose.ps1", "{{ template_dir }}/scripts/Installers/Install-PowershellCore.ps1", - "{{ template_dir }}/scripts/Installers/Install-WebPlatformInstaller.ps1" + "{{ template_dir }}/scripts/Installers/Install-WebPlatformInstaller.ps1", + "{{ template_dir }}/scripts/Installers/Install-Runner.ps1" ] }, { From f68553311049ee9c72c71019fbc98d0bac200f60 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Fri, 10 Nov 2023 18:05:14 +0100 Subject: [PATCH 2430/3485] [macOS] Remove Haskell and Cargo packages (#8775) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Alexey Ayupov <“alexey.ayupov@akvelon.com”> --- images/macos/provision/core/rust.sh | 5 ++++- .../software-report/SoftwareReport.Generator.ps1 | 16 ++++++++-------- images/macos/templates/macOS-13.anka.pkr.hcl | 1 - images/macos/templates/macOS-14.anka.pkr.hcl | 1 - images/macos/tests/Haskell.Tests.ps1 | 4 ++-- images/macos/tests/Rust.Tests.ps1 | 6 ++++-- 6 files changed, 18 insertions(+), 15 deletions(-) diff --git a/images/macos/provision/core/rust.sh b/images/macos/provision/core/rust.sh index bf2a61607e3a..d2cc3b646e39 100644 --- a/images/macos/provision/core/rust.sh +++ b/images/macos/provision/core/rust.sh @@ -12,7 +12,10 @@ CARGO_HOME=$HOME/.cargo echo Install common tools... rustup component add rustfmt clippy -cargo install --locked bindgen-cli cbindgen cargo-audit cargo-outdated + +if is_BigSur || is_Monterey; then + cargo install --locked bindgen-cli cbindgen cargo-audit cargo-outdated +fi echo Cleanup Cargo registry cached data... rm -rf $CARGO_HOME/registry/* diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1 index d58a2769cc62..6cc47dc76f2b 100644 --- a/images/macos/software-report/SoftwareReport.Generator.ps1 +++ b/images/macos/software-report/SoftwareReport.Generator.ps1 @@ -166,7 +166,7 @@ $tools.AddToolVersion("AWS Session Manager CLI", $(Get-AWSSessionManagerCLIVersi $tools.AddToolVersion("Azure CLI", $(Get-AzureCLIVersion)) $tools.AddToolVersion("Azure CLI (azure-devops)", $(Get-AzureDevopsVersion)) $tools.AddToolVersion("Bicep CLI", $(Get-BicepVersion)) -if (-not $os.IsVenturaArm64) { +if ((-not $os.IsVentura) -and (-not $os.IsVenturaArm64) -and (-not $os.IsSonoma)) { $tools.AddToolVersion("Cabal", $(Get-CabalVersion)) } $tools.AddToolVersion("Cmake", $(Get-CmakeVersion)) @@ -175,11 +175,9 @@ if ($os.IsMonterey) { $tools.AddToolVersion("Colima", $(Get-ColimaVersion)) } $tools.AddToolVersion("Fastlane", $(Get-FastlaneVersion)) -if (-not $os.IsVenturaArm64) { +if ((-not $os.IsVentura) -and (-not $os.IsVenturaArm64) -and (-not $os.IsSonoma)) { $tools.AddToolVersion("GHC", $(Get-GHCVersion)) $tools.AddToolVersion("GHCup", $(Get-GHCupVersion)) -} -if ((-not $os.IsVentura) -and (-not $os.IsVenturaArm64) -and (-not $os.IsSonoma)) { $tools.AddToolVersion("Jazzy", $(Get-JazzyVersion)) } if (-not $os.IsVenturaArm64) { @@ -222,10 +220,12 @@ if (-not $os.IsSonoma) { $rust.AddToolVersion("Rustup", $(Get-RustupVersion)) $rustPackages = $rust.AddHeader("Packages") - $rustPackages.AddToolVersion("Bindgen", $(Get-Bindgen)) - $rustPackages.AddToolVersion("Cargo-audit", $(Get-Cargoaudit)) - $rustPackages.AddToolVersion("Cargo-outdated", $(Get-Cargooutdated)) - $rustPackages.AddToolVersion("Cbindgen", $(Get-Cbindgen)) + if ((-not $os.IsVentura) -and (-not $os.IsVenturaArm64)) { + $rustPackages.AddToolVersion("Bindgen", $(Get-Bindgen)) + $rustPackages.AddToolVersion("Cargo-audit", $(Get-Cargoaudit)) + $rustPackages.AddToolVersion("Cargo-outdated", $(Get-Cargooutdated)) + $rustPackages.AddToolVersion("Cbindgen", $(Get-Cbindgen)) + } $rustPackages.AddToolVersion("Clippy", $(Get-RustClippyVersion)) $rustPackages.AddToolVersion("Rustfmt", $(Get-RustfmtVersion)) } diff --git a/images/macos/templates/macOS-13.anka.pkr.hcl b/images/macos/templates/macOS-13.anka.pkr.hcl index 3366d803a1fb..7756bba84c5e 100644 --- a/images/macos/templates/macOS-13.anka.pkr.hcl +++ b/images/macos/templates/macOS-13.anka.pkr.hcl @@ -202,7 +202,6 @@ build { "./provision/core/aws.sh", "./provision/core/rust.sh", "./provision/core/gcc.sh", - "./provision/core/haskell.sh", "./provision/core/cocoapods.sh", "./provision/core/android-toolsets.sh", "./provision/core/apache.sh", diff --git a/images/macos/templates/macOS-14.anka.pkr.hcl b/images/macos/templates/macOS-14.anka.pkr.hcl index 580a2d88f2ce..8699a6f51d3f 100644 --- a/images/macos/templates/macOS-14.anka.pkr.hcl +++ b/images/macos/templates/macOS-14.anka.pkr.hcl @@ -202,7 +202,6 @@ build { "./provision/core/aws.sh", "./provision/core/rust.sh", "./provision/core/gcc.sh", - "./provision/core/haskell.sh", "./provision/core/cocoapods.sh", "./provision/core/android-toolsets.sh", "./provision/core/apache.sh", diff --git a/images/macos/tests/Haskell.Tests.ps1 b/images/macos/tests/Haskell.Tests.ps1 index f1a342d7297d..b4e965b34a4b 100644 --- a/images/macos/tests/Haskell.Tests.ps1 +++ b/images/macos/tests/Haskell.Tests.ps1 @@ -1,7 +1,7 @@ Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" $os = Get-OSVersion -Describe "Haskell" -Skip:($os.IsVenturaArm64) { +Describe "Haskell" -Skip:($os.IsVentura -or $os.IsVenturaArm64 -or $os.IsSonoma) { Context "GHCup" { It "GHCup" { "ghcup --version" | Should -ReturnZeroExitCode @@ -26,4 +26,4 @@ Describe "Haskell" -Skip:($os.IsVenturaArm64) { "$HOME/.stack/hooks/ghc-install.sh" | Should -Not -Exist } } -} \ No newline at end of file +} diff --git a/images/macos/tests/Rust.Tests.ps1 b/images/macos/tests/Rust.Tests.ps1 index 894ef4431207..3b5e5b8b5408 100644 --- a/images/macos/tests/Rust.Tests.ps1 +++ b/images/macos/tests/Rust.Tests.ps1 @@ -1,3 +1,6 @@ +Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" +$os = Get-OSVersion + Describe "Rust" { Context "Rust" { It "Rustup is installed" { @@ -14,8 +17,7 @@ Describe "Rust" { "cargo --version" | Should -ReturnZeroExitCode } } - - Context "Cargo dependencies" { + Context "Cargo dependencies" -Skip:($os.IsVentura -or $os.IsVenturaArm64 -or $os.IsSonoma) { It "bindgen" { "bindgen --version" | Should -ReturnZeroExitCode } From df292beac661b90149e01af46f80bd8aa2923c44 Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Fri, 10 Nov 2023 18:53:24 +0100 Subject: [PATCH 2431/3485] [Mac OS] Configure template for Mac OS 14 ARM64 image (#8769) * Configure template for Mac OS 14 ARM64 image * Change conditions for ruby --- images/macos/helpers/Common.Helpers.psm1 | 14 +- images/macos/helpers/Xcode.Installer.psm1 | 2 +- .../provision/configuration/preimagedata.sh | 2 +- .../provision/core/open_windows_check.sh | 2 +- images/macos/provision/core/openssl.sh | 4 +- images/macos/provision/core/ruby.sh | 2 +- images/macos/provision/utils/utils.sh | 55 ++-- .../SoftwareReport.Browsers.psm1 | 4 +- .../SoftwareReport.Generator.ps1 | 50 ++-- .../software-report/SoftwareReport.Java.psm1 | 2 +- .../SoftwareReport.Toolcache.psm1 | 2 +- .../templates/macOS-14.arm64.anka.pkr.hcl | 237 ++++++++++++++++++ images/macos/tests/BasicTools.Tests.ps1 | 14 +- images/macos/tests/Browsers.Tests.ps1 | 6 +- images/macos/tests/Common.Tests.ps1 | 18 +- images/macos/tests/Databases.Tests.ps1 | 4 +- images/macos/tests/Haskell.Tests.ps1 | 2 +- images/macos/tests/Java.Tests.ps1 | 166 ++++++------ images/macos/tests/Linters.Tests.ps1 | 4 +- images/macos/tests/Node.Tests.ps1 | 2 +- images/macos/tests/PHP.Tests.ps1 | 4 +- images/macos/tests/PipxPackages.Tests.ps1 | 2 +- images/macos/tests/Python.Tests.ps1 | 4 +- images/macos/tests/Ruby.arm64.Tests.ps1 | 2 +- images/macos/tests/Ruby.x64.Tests.ps1 | 2 +- images/macos/tests/RubyGem.Tests.ps1 | 4 +- images/macos/tests/Rust.Tests.ps1 | 2 +- images/macos/tests/System.Tests.ps1 | 2 +- images/macos/tests/Toolcache.Tests.ps1 | 6 +- images/macos/tests/WebServers.Tests.ps1 | 4 +- images/macos/tests/Xamarin.Tests.ps1 | 12 +- 31 files changed, 434 insertions(+), 202 deletions(-) create mode 100644 images/macos/templates/macOS-14.arm64.anka.pkr.hcl diff --git a/images/macos/helpers/Common.Helpers.psm1 b/images/macos/helpers/Common.Helpers.psm1 index 2a2951200eed..68a0e343fa66 100644 --- a/images/macos/helpers/Common.Helpers.psm1 +++ b/images/macos/helpers/Common.Helpers.psm1 @@ -30,13 +30,17 @@ function Get-OSVersion { $osVersionMajorMinor = $osVersion.Version.ToString(2) $processorArchitecture = arch return [PSCustomObject]@{ - Version = $osVersion.Version - Platform = $osVersion.Platform - IsBigSur = $osVersion.Version.Major -eq "11" - IsMonterey = $osVersion.Version.Major -eq "12" - IsVentura = $($osVersion.Version.Major -eq "13" -and $processorArchitecture -ne "arm64") + Version = $osVersion.Version + Platform = $osVersion.Platform + IsArm64 = $processorArchitecture -eq "arm64" + IsBigSur = $osVersion.Version.Major -eq "11" + IsMonterey = $osVersion.Version.Major -eq "12" + IsVentura = $($osVersion.Version.Major -eq "13") IsVenturaArm64 = $($osVersion.Version.Major -eq "13" -and $processorArchitecture -eq "arm64") + IsVenturaX64 = $($osVersion.Version.Major -eq "13" -and $processorArchitecture -ne "arm64") IsSonoma = $($osVersion.Version.Major -eq "14") + IsSonomaArm64 = $($osVersion.Version.Major -eq "14" -and $processorArchitecture -eq "arm64") + IsSonomaX64 = $($osVersion.Version.Major -eq "14" -and $processorArchitecture -ne "arm64") } } diff --git a/images/macos/helpers/Xcode.Installer.psm1 b/images/macos/helpers/Xcode.Installer.psm1 index 57cc2e55aee3..86e65734a07e 100644 --- a/images/macos/helpers/Xcode.Installer.psm1 +++ b/images/macos/helpers/Xcode.Installer.psm1 @@ -132,7 +132,7 @@ function Approve-XcodeLicense { Write-Host "Approving Xcode license for '$XcodeRootPath'..." $xcodeBuildPath = Get-XcodeToolPath -XcodeRootPath $XcodeRootPath -ToolName "xcodebuild" - if ($os.IsVentura -or $os.IsVenturaArm64 -or $os.IsSonoma) { + if ($os.IsVentura -or $os.IsSonoma) { Invoke-ValidateCommand -Command "sudo $xcodeBuildPath -license accept" -Timeout 15 } else { Invoke-ValidateCommand -Command "sudo $xcodeBuildPath -license accept" diff --git a/images/macos/provision/configuration/preimagedata.sh b/images/macos/provision/configuration/preimagedata.sh index fee38f07199b..4f8e284b5518 100644 --- a/images/macos/provision/configuration/preimagedata.sh +++ b/images/macos/provision/configuration/preimagedata.sh @@ -17,7 +17,7 @@ else fi release_label="macOS-${label_version}" -if is_Ventura || is_Sonoma; then +if is_VenturaX64 || is_SonomaX64; then software_url="https://github.com/actions/runner-images/blob/${image_label}/${image_version}/images/macos/${image_label}-Readme.md" releaseUrl="https://github.com/actions/runner-images/releases/tag/${image_label}%2F${image_version}" else diff --git a/images/macos/provision/core/open_windows_check.sh b/images/macos/provision/core/open_windows_check.sh index de0827c4afca..dab538ed072b 100644 --- a/images/macos/provision/core/open_windows_check.sh +++ b/images/macos/provision/core/open_windows_check.sh @@ -3,7 +3,7 @@ source ~/utils/utils.sh # Close System Preferences window because in Ventura arm64 it is opened by default on Apperance tab -if is_VenturaArm64; then +if is_Arm64; then echo "Close System Preferences window" osascript -e 'tell application "System Preferences" to quit' fi diff --git a/images/macos/provision/core/openssl.sh b/images/macos/provision/core/openssl.sh index 0cfbcb07f199..80f023699c6b 100755 --- a/images/macos/provision/core/openssl.sh +++ b/images/macos/provision/core/openssl.sh @@ -4,7 +4,7 @@ source ~/utils/utils.sh echo "Install openssl@1.1" brew_smart_install "openssl@1.1" -if ! is_VenturaArm64; then +if ! is_Arm64; then # Symlink brew openssl@1.1 to `/usr/local/bin` as Homebrew refuses ln -sf $(brew --prefix openssl@1.1)/bin/openssl /usr/local/bin/openssl else @@ -12,7 +12,7 @@ else ln -sf $(brew --prefix openssl@1.1)/bin/openssl /opt/homebrew/bin/openssl fi -if ! is_VenturaArm64; then +if ! is_Arm64; then # Most of buildsystems and scripts look up ssl here ln -sf $(brew --cellar openssl@1.1)/1.1* /usr/local/opt/openssl fi diff --git a/images/macos/provision/core/ruby.sh b/images/macos/provision/core/ruby.sh index e931b2c9a6b6..b139b712bd7a 100755 --- a/images/macos/provision/core/ruby.sh +++ b/images/macos/provision/core/ruby.sh @@ -19,7 +19,7 @@ else echo 'export PATH="$GEM_PATH:/usr/local/opt/ruby@'${DEFAULT_RUBY_VERSION}'/bin:$PATH"' >> "$HOME/.bashrc" fi -if ! is_VenturaArm64; then +if ! is_Arm64; then echo "Install Ruby from toolset..." [ -n "$API_PAT" ] && authString=(-H "Authorization: token ${API_PAT}") PACKAGE_TAR_NAMES=$(curl "${authString[@]}" -fsSL "https://api.github.com/repos/ruby/ruby-builder/releases/latest" | jq -r '.assets[].name') diff --git a/images/macos/provision/utils/utils.sh b/images/macos/provision/utils/utils.sh index c4374d7c0f31..8af3db3cdac0 100755 --- a/images/macos/provision/utils/utils.sh +++ b/images/macos/provision/utils/utils.sh @@ -46,53 +46,44 @@ download_with_retries() { return 1 } -is_VenturaArm64() { - arch=$(get_arch) - if [ "$OSTYPE" = "darwin22" ] && [ $arch = "arm64" ]; then - true - else - false - fi +is_Arm64() { + [ "$(arch)" = "arm64" ] } is_Sonoma() { - if [ "$OSTYPE" = "darwin23" ]; then - true - else - false - fi + [ "$OSTYPE" = "darwin23" ] +} + +is_SonomaArm64() { + is_Sonoma && is_Arm64 +} + +is_SonomaX64() { + is_Sonoma && ! is_Arm64 } is_Ventura() { - if [ "$OSTYPE" = "darwin22" ]; then - true - else - false - fi + [ "$OSTYPE" = "darwin22" ] +} + +is_VenturaArm64() { + is_Ventura && is_Arm64 +} + +is_VenturaX64() { + is_Ventura && ! is_Arm64 } is_Monterey() { - if [ "$OSTYPE" = "darwin21" ]; then - true - else - false - fi + [ "$OSTYPE" = "darwin21" ] } is_BigSur() { - if [ "$OSTYPE" = "darwin20" ]; then - true - else - false - fi + [ "$OSTYPE" = "darwin20" ] } is_Veertu() { - if [ -d "/Library/Application Support/Veertu" ]; then - true - else - false - fi + [ -d "/Library/Application Support/Veertu" ] } get_toolset_path() { diff --git a/images/macos/software-report/SoftwareReport.Browsers.psm1 b/images/macos/software-report/SoftwareReport.Browsers.psm1 index 3658c701c777..e19865bc08f9 100644 --- a/images/macos/software-report/SoftwareReport.Browsers.psm1 +++ b/images/macos/software-report/SoftwareReport.Browsers.psm1 @@ -11,7 +11,7 @@ function Build-BrowserSection { [ToolVersionNode]::new("ChromeDriver", $(Get-ChromeDriverVersion)) ) - if (-not $os.IsVenturaArm64) { + if ((-not $os.IsVenturaArm64) -and (-not $os.IsSonomaArm64)) { $nodes += @( [ToolVersionNode]::new("Microsoft Edge", $(Get-EdgeVersion)) [ToolVersionNode]::new("Microsoft Edge WebDriver", $(Get-EdgeDriverVersion)) @@ -79,7 +79,7 @@ function Get-GeckodriverVersion { function Get-SeleniumVersion { $os = Get-OSVersion - if ($os.IsVenturaArm64) { + if ($os.IsVenturaArm64 -or $os.IsSonomaArm64) { $cellarPath = "/opt/homebrew/Cellar" } else { $cellarPath = "/usr/local/Cellar" diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1 index 6cc47dc76f2b..50b5f72c5444 100644 --- a/images/macos/software-report/SoftwareReport.Generator.ps1 +++ b/images/macos/software-report/SoftwareReport.Generator.ps1 @@ -40,26 +40,26 @@ $languageAndRuntime.AddNodes($(Get-GccVersions)) $languageAndRuntime.AddNodes($(Get-FortranVersions)) $languageAndRuntime.AddToolVersion("Julia", $(Get-JuliaVersion)) $languageAndRuntime.AddToolVersion("Kotlin", $(Get-KotlinVersion)) -if ((-not $os.IsVentura) -and (-not $os.IsVenturaArm64) -and (-not $os.IsSonoma)) { +if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) { $languageAndRuntime.AddToolVersion("Go", $(Get-GoVersion)) } $languageAndRuntime.AddToolVersion("Mono", $(Get-MonoVersion)) $languageAndRuntime.AddToolVersion("Node.js", $(Get-NodeVersion)) -if ((-not $os.IsVentura) -and (-not $os.IsVenturaArm64) -and (-not $os.IsSonoma)) { +if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) { $languageAndRuntime.AddToolVersion("MSBuild", $(Get-MSBuildVersion)) $languageAndRuntime.AddToolVersion("NVM", $(Get-NVMVersion)) $languageAndRuntime.AddToolVersionsListInline("NVM - Cached node versions", $(Get-NVMNodeVersionList), '^\d+') } $languageAndRuntime.AddToolVersion("Perl", $(Get-PerlVersion)) -if (-not $os.IsVenturaArm64) { +if ((-not $os.IsVenturaArm64) -and (-not $os.IsSonomaArm64)) { $languageAndRuntime.AddToolVersion("PHP", $(Get-PHPVersion)) } -if ((-not $os.IsVentura) -and (-not $os.IsVenturaArm64) -and (-not $os.IsSonoma)) { +if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) { $languageAndRuntime.AddToolVersion("Python", $(Get-PythonVersion)) } -if (-not $os.IsVenturaArm64) { +if ((-not $os.IsVenturaArm64) -and (-not $os.IsSonomaArm64)) { $languageAndRuntime.AddToolVersion("Python3", $(Get-Python3Version)) } $languageAndRuntime.AddToolVersion("R", $(Get-RVersion)) @@ -70,31 +70,31 @@ $packageManagement = $installedSoftware.AddHeader("Package Management") $packageManagement.AddToolVersion("Bundler", $(Get-BundlerVersion)) $packageManagement.AddToolVersion("Carthage", $(Get-CarthageVersion)) $packageManagement.AddToolVersion("CocoaPods", $(Get-CocoaPodsVersion)) -if (-not $os.IsVenturaArm64) { +if ((-not $os.IsVenturaArm64) -and (-not $os.IsSonomaArm64)) { $packageManagement.AddToolVersion("Composer", $(Get-ComposerVersion)) } $packageManagement.AddToolVersion("Homebrew", $(Get-HomebrewVersion)) -if ((-not $os.IsVentura) -and (-not $os.IsVenturaArm64) -and (-not $os.IsSonoma)) { +if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) { $packageManagement.AddToolVersion("Miniconda", $(Get-CondaVersion)) } $packageManagement.AddToolVersion("NPM", $(Get-NPMVersion)) $packageManagement.AddToolVersion("NuGet", $(Get-NuGetVersion)) -if ((-not $os.IsVentura) -and (-not $os.IsVenturaArm64) -and (-not $os.IsSonoma)) { +if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) { $packageManagement.AddToolVersion("Pip", $(Get-PipVersion -Version 2)) } -if (-not $os.IsVenturaArm64) { +if ((-not $os.IsVenturaArm64) -and (-not $os.IsSonomaArm64)) { $packageManagement.AddToolVersion("Pip3", $(Get-PipVersion -Version 3)) $packageManagement.AddToolVersion("Pipx", $(Get-PipxVersion)) } $packageManagement.AddToolVersion("RubyGems", $(Get-RubyGemsVersion)) -if (-not $os.IsVenturaArm64) { +if ((-not $os.IsVenturaArm64) -and (-not $os.IsSonomaArm64)) { $packageManagement.AddToolVersion("Vcpkg", $(Get-VcpkgVersion)) } $packageManagement.AddToolVersion("Yarn", $(Get-YarnVersion)) -if ((-not $os.IsVentura) -and (-not $os.IsVenturaArm64) -and (-not $os.IsSonoma)) { +if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) { $packageManagement.AddNode($(Build-PackageManagementEnvironmentTable)) } # Project Management @@ -102,7 +102,7 @@ $projectManagement = $installedSoftware.AddHeader("Project Management") $projectManagement.AddToolVersion("Apache Ant", $(Get-ApacheAntVersion)) $projectManagement.AddToolVersion("Apache Maven", $(Get-MavenVersion)) $projectManagement.AddToolVersion("Gradle", $(Get-GradleVersion)) -if ((-not $os.IsVentura) -and (-not $os.IsVenturaArm64) -and (-not $os.IsSonoma)) { +if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) { $projectManagement.AddToolVersion("Sbt", $(Get-SbtVersion)) } @@ -124,11 +124,11 @@ $utilities.AddToolVersion("gpg (GnuPG)", $(Get-GPGVersion)) if ($os.IsBigSur) { $utilities.AddToolVersion("helm", $(Get-HelmVersion)) } -if ((-not $os.IsVentura) -and (-not $os.IsVenturaArm64) -and (-not $os.IsSonoma)) { +if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) { $utilities.AddToolVersion("ImageMagick", $(Get-ImageMagickVersion)) } $utilities.AddToolVersion("jq", $(Get-JqVersion)) -if ((-not $os.IsVentura) -and (-not $os.IsVenturaArm64) -and (-not $os.IsSonoma)) { +if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) { $utilities.AddToolVersion("mongo", $(Get-MongoVersion)) $utilities.AddToolVersion("mongod", $(Get-MongodVersion)) } @@ -138,7 +138,7 @@ if ($os.IsBigSur) { $utilities.AddToolVersion("OpenSSL", $(Get-OpenSSLVersion)) $utilities.AddToolVersion("Packer", $(Get-PackerVersion)) $utilities.AddToolVersion("pkg-config", $(Get-PKGConfigVersion)) -if ((-not $os.IsVentura) -and (-not $os.IsVenturaArm64) -and (-not $os.IsSonoma)) { +if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) { $utilities.AddToolVersion("PostgreSQL", $(Get-PostgresServerVersion)) $utilities.AddToolVersion("psql (PostgreSQL)", $(Get-PostgresClientVersion)) $utilities.AddToolVersion("Sox", $(Get-SoxVersion)) @@ -157,7 +157,7 @@ $tools = $installedSoftware.AddHeader("Tools") if ($os.IsBigSur) { $tools.AddToolVersion("Aliyun CLI", $(Get-AliyunCLIVersion)) } -if ((-not $os.IsVentura) -and (-not $os.IsVenturaArm64) -and (-not $os.IsSonoma)) { +if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) { $tools.AddToolVersion("App Center CLI", $(Get-AppCenterCLIVersion)) } $tools.AddToolVersion("AWS CLI", $(Get-AWSCLIVersion)) @@ -166,7 +166,7 @@ $tools.AddToolVersion("AWS Session Manager CLI", $(Get-AWSSessionManagerCLIVersi $tools.AddToolVersion("Azure CLI", $(Get-AzureCLIVersion)) $tools.AddToolVersion("Azure CLI (azure-devops)", $(Get-AzureDevopsVersion)) $tools.AddToolVersion("Bicep CLI", $(Get-BicepVersion)) -if ((-not $os.IsVentura) -and (-not $os.IsVenturaArm64) -and (-not $os.IsSonoma)) { +if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) { $tools.AddToolVersion("Cabal", $(Get-CabalVersion)) } $tools.AddToolVersion("Cmake", $(Get-CmakeVersion)) @@ -175,26 +175,26 @@ if ($os.IsMonterey) { $tools.AddToolVersion("Colima", $(Get-ColimaVersion)) } $tools.AddToolVersion("Fastlane", $(Get-FastlaneVersion)) -if ((-not $os.IsVentura) -and (-not $os.IsVenturaArm64) -and (-not $os.IsSonoma)) { +if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) { $tools.AddToolVersion("GHC", $(Get-GHCVersion)) $tools.AddToolVersion("GHCup", $(Get-GHCupVersion)) $tools.AddToolVersion("Jazzy", $(Get-JazzyVersion)) } -if (-not $os.IsVenturaArm64) { +if ((-not $os.IsVenturaArm64) -and (-not $os.IsSonomaArm64)) { $tools.AddToolVersion("Stack", $(Get-StackVersion)) } $tools.AddToolVersion("SwiftFormat", $(Get-SwiftFormatVersion)) -if ((-not $os.IsVentura) -and (-not $os.IsVenturaArm64) -and (-not $os.IsSonoma)) { +if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) { $tools.AddToolVersion("Swig", $(Get-SwigVersion)) } $tools.AddToolVersion("Xcode Command Line Tools", $(Get-XcodeCommandLineToolsVersion)) # Linters $linters = $installedSoftware.AddHeader("Linters") -if (-not $os.IsVenturaArm64) { +if ((-not $os.IsVenturaArm64) -and (-not $os.IsSonomaArm64)) { $linters.AddToolVersion("SwiftLint", $(Get-SwiftLintVersion)) } -if ((-not $os.IsVentura) -and (-not $os.IsVenturaArm64) -and (-not $os.IsSonoma)) { +if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) { $linters.AddToolVersion("Yamllint", $(Get-YamllintVersion)) } @@ -220,7 +220,7 @@ if (-not $os.IsSonoma) { $rust.AddToolVersion("Rustup", $(Get-RustupVersion)) $rustPackages = $rust.AddHeader("Packages") - if ((-not $os.IsVentura) -and (-not $os.IsVenturaArm64)) { + if (-not $os.IsVentura) { $rustPackages.AddToolVersion("Bindgen", $(Get-Bindgen)) $rustPackages.AddToolVersion("Cargo-audit", $(Get-Cargoaudit)) $rustPackages.AddToolVersion("Cargo-outdated", $(Get-Cargooutdated)) @@ -238,13 +238,13 @@ $powerShellModules = $powerShell.AddHeader("PowerShell Modules") $powerShellModules.AddNodes($(Get-PowerShellModules)) # Web Servers -if ((-not $os.IsVentura) -and (-not $os.IsVenturaArm64) -and (-not $os.IsSonoma)) { +if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) { $webServers = $installedSoftware.AddHeader("Web Servers") $webServers.AddTable($(Build-WebServersSection)) } # Xamarin section -if ((-not $os.IsVentura) -and (-not $os.IsVenturaArm64) -and (-not $os.IsSonoma)) { +if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) { $xamarin = $installedSoftware.AddHeader("Xamarin") $vsForMac = $xamarin.AddHeader("Visual Studio for Mac") $vsForMac.AddTable($(Build-VSMacTable)) diff --git a/images/macos/software-report/SoftwareReport.Java.psm1 b/images/macos/software-report/SoftwareReport.Java.psm1 index c3f5020cb0ad..46c0a6deff6d 100644 --- a/images/macos/software-report/SoftwareReport.Java.psm1 +++ b/images/macos/software-report/SoftwareReport.Java.psm1 @@ -2,7 +2,7 @@ function Get-JavaVersions { $defaultJavaPath = (Get-Item env:JAVA_HOME).value $os = Get-OSVersion - if ($os.IsVenturaArm64) { + if ($os.IsVenturaArm64 -or $os.IsSonomaArm64) { $javaVersions = Get-Item env:JAVA_HOME_*_arm64 } else { $javaVersions = Get-Item env:JAVA_HOME_*_X64 diff --git a/images/macos/software-report/SoftwareReport.Toolcache.psm1 b/images/macos/software-report/SoftwareReport.Toolcache.psm1 index 0878024cbf4d..a7187eb55489 100644 --- a/images/macos/software-report/SoftwareReport.Toolcache.psm1 +++ b/images/macos/software-report/SoftwareReport.Toolcache.psm1 @@ -37,7 +37,7 @@ function Build-ToolcacheSection { $nodes = @() - if (-not $os.IsVenturaArm64) { + if ((-not $os.IsVenturaArm64) -and (-not $os.IsSonomaArm64)) { $nodes += @( [ToolVersionsListNode]::new("Ruby", $(Get-ToolcacheRubyVersions), '^\d+\.\d+', "List"), [ToolVersionsListNode]::new("PyPy", $(Get-ToolcachePyPyVersions), '^\d+\.\d+', "List") diff --git a/images/macos/templates/macOS-14.arm64.anka.pkr.hcl b/images/macos/templates/macOS-14.arm64.anka.pkr.hcl new file mode 100644 index 000000000000..abb617c32180 --- /dev/null +++ b/images/macos/templates/macOS-14.arm64.anka.pkr.hcl @@ -0,0 +1,237 @@ +packer { + required_plugins { + veertu-anka = { + version = ">= v3.2.0" + source = "github.com/veertuinc/veertu-anka" + } + } +} + +variable "source_vm_name" { + type = string +} + +variable "source_vm_tag" { + type = string +} + +variable "build_id" { + type = string +} + +variable "vm_username" { + type = string + sensitive = true +} + +variable "vm_password" { + type = string + sensitive = true +} + +variable "github_api_pat" { + type = string + default = "" +} + +variable "xcode_install_storage_url" { + type = string + sensitive = true +} + +variable "xcode_install_sas" { + type = string + sensitive = true +} + +variable "vcpu_count" { + type = string + default = "6" +} + +variable "ram_size" { + type = string + default = "8G" +} + +variable "image_os" { + type = string + default = "macos14" +} + +source "veertu-anka-vm-clone" "template" { + vm_name = "${var.build_id}" + source_vm_name = "${var.source_vm_name}" + source_vm_tag = "${var.source_vm_tag}" + vcpu_count = "${var.vcpu_count}" + ram_size = "${var.ram_size}" + stop_vm = "true" + log_level = "debug" +} + +build { + sources = [ + "source.veertu-anka-vm-clone.template" + ] + provisioner "shell" { + inline = [ + "mkdir ~/image-generation" + ] + } + provisioner "file" { + destination = "image-generation/" + sources = [ + "./provision/assets", + "./tests", + "./software-report", + "./helpers" + ] + } + provisioner "file" { + destination = "image-generation/software-report/" + source = "../../helpers/software-report-base" + } + provisioner "file" { + destination = "image-generation/add-certificate.swift" + source = "./provision/configuration/add-certificate.swift" + } + provisioner "file" { + destination = ".bashrc" + source = "./provision/configuration/environment/bashrc" + } + provisioner "file" { + destination = ".bash_profile" + source = "./provision/configuration/environment/bashprofile" + } + provisioner "file" { + destination = "./" + source = "./provision/utils" + } + provisioner "shell" { + inline = [ + "mkdir ~/bootstrap" + ] + } + provisioner "file" { + destination = "bootstrap" + source = "./provision/bootstrap-provisioner/" + } + provisioner "file" { + destination = "image-generation/toolset.json" + source = "./toolsets/toolset-14.json" + } + provisioner "shell" { + scripts = [ + "./provision/core/xcode-clt.sh", + "./provision/core/homebrew.sh", + "./provision/core/rosetta.sh" + ] + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" + } + provisioner "shell" { + scripts = [ + "./provision/configuration/configure-tccdb-macos.sh", + "./provision/configuration/disable-auto-updates.sh", + "./provision/configuration/ntpconf.sh", + "./provision/configuration/shell-change.sh" + ] + environment_vars = [ + "PASSWORD=${var.vm_password}", + "USERNAME=${var.vm_username}" + ] + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}" + } + provisioner "shell" { + scripts = [ + "./provision/configuration/preimagedata.sh", + "./provision/configuration/configure-ssh.sh", + "./provision/configuration/configure-machine.sh" + ] + environment_vars = [ + "IMAGE_VERSION=${var.build_id}", + "IMAGE_OS=${var.image_os}", + "PASSWORD=${var.vm_password}" + ] + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" + } + provisioner "shell" { + script = "./provision/core/reboot.sh" + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}" + expect_disconnect = true + } + provisioner "shell" { + pause_before = "30s" + scripts = [ + "./provision/core/open_windows_check.sh", + "./provision/core/powershell.sh", + "./provision/core/mono.sh", + "./provision/core/dotnet.sh", + "./provision/core/azcopy.sh", + "./provision/core/openssl.sh", + "./provision/core/ruby.sh", + "./provision/core/rubygem.sh", + "./provision/core/git.sh", + "./provision/core/node.sh", + "./provision/core/commonutils.sh" + ] + environment_vars = [ + "API_PAT=${var.github_api_pat}", + "USER_PASSWORD=${var.vm_password}" + ] + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" + } + provisioner "shell" { + script = "./provision/core/xcode.ps1" + environment_vars = [ + "XCODE_INSTALL_STORAGE_URL=${var.xcode_install_storage_url}", + "XCODE_INSTALL_SAS=${var.xcode_install_sas}" + ] + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} pwsh -f {{ .Path }}" + } + provisioner "shell" { + script = "./provision/core/reboot.sh" + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}" + expect_disconnect = true + } + provisioner "shell" { + scripts = [ + "./provision/core/action-archive-cache.sh", + "./provision/core/llvm.sh", + "./provision/core/openjdk.sh", + "./provision/core/aws.sh", + "./provision/core/rust.sh", + "./provision/core/gcc.sh", + "./provision/core/cocoapods.sh", + "./provision/core/android-toolsets.sh", + "./provision/core/safari.sh", + "./provision/core/chrome.sh", + "./provision/core/bicep.sh", + "./provision/core/codeql-bundle.sh" + ] + environment_vars = [ + "API_PAT=${var.github_api_pat}" + ] + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" + } + provisioner "shell" { + script = "./provision/core/delete-duplicate-sims.rb" + execute_command = "source $HOME/.bash_profile; ruby {{ .Path }}" + } + provisioner "shell" { + inline = [ + "pwsh -File \"$HOME/image-generation/software-report/SoftwareReport.Generator.ps1\" -OutputDirectory \"$HOME/image-generation/output/software-report\" -ImageName ${var.build_id}" + ] + execute_command = "source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" + } + provisioner "file" { + destination = "../image-output/" + direction = "download" + source = "./image-generation/output/" + } + provisioner "shell" { + scripts = [ + "./provision/configuration/configure-hostname.sh" + ] + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" + } +} diff --git a/images/macos/tests/BasicTools.Tests.ps1 b/images/macos/tests/BasicTools.Tests.ps1 index 081959a0ce9a..9b49c75caa7a 100644 --- a/images/macos/tests/BasicTools.Tests.ps1 +++ b/images/macos/tests/BasicTools.Tests.ps1 @@ -25,7 +25,7 @@ Describe "cmake" { } } -Describe "Subversion" -Skip:($os.IsVentura -or $os.IsVenturaArm64 -or $os.IsSonoma) { +Describe "Subversion" -Skip:($os.IsVentura -or $os.IsSonoma) { It "Subversion" { "svn --version" | Should -ReturnZeroExitCode } @@ -61,7 +61,7 @@ Describe "Perl" { } } -Describe "Helm" -Skip:($os.IsMonterey -or $os.IsVentura -or $os.IsVenturaArm64 -or $os.IsSonoma) { +Describe "Helm" -Skip:($os.IsMonterey -or $os.IsVentura -or $os.IsSonoma) { It "Helm" { "helm version --short" | Should -ReturnZeroExitCode } @@ -116,7 +116,7 @@ Describe "bazel" { } } -Describe "Aliyun CLI" -Skip:($os.IsMonterey -or $os.IsVentura -or $os.IsVenturaArm64 -or $os.IsSonoma) { +Describe "Aliyun CLI" -Skip:($os.IsMonterey -or $os.IsVentura -or $os.IsSonoma) { It "Aliyun CLI" { "aliyun --version" | Should -ReturnZeroExitCode } @@ -146,13 +146,13 @@ Describe "wget" { } } -Describe "vagrant" -Skip:($os.IsBigSur -or $os.IsVentura -or $os.IsVenturaArm64 -or $os.IsSonoma) { +Describe "vagrant" -Skip:($os.IsBigSur -or $os.IsVentura -or $os.IsSonoma) { It "vagrant" { "vagrant --version" | Should -ReturnZeroExitCode } } -Describe "virtualbox" -Skip:($os.IsBigSur -or $os.IsVentura -or $os.IsVenturaArm64 -or $os.IsSonoma) { +Describe "virtualbox" -Skip:($os.IsBigSur -or $os.IsVentura -or $os.IsSonoma) { It "virtualbox" { "vboxmanage -v" | Should -ReturnZeroExitCode } @@ -178,7 +178,7 @@ Describe "Kotlin" { } } -Describe "sbt" -Skip:($os.IsVentura -or $os.IsVenturaArm64 -or $os.IsSonoma) { +Describe "sbt" -Skip:($os.IsVentura -or $os.IsSonoma) { It "sbt" { "sbt -version" | Should -ReturnZeroExitCode } @@ -190,7 +190,7 @@ Describe "yq" { } } -Describe "imagemagick" -Skip:($os.IsVentura -or $os.IsVenturaArm64 -or $os.IsSonoma) { +Describe "imagemagick" -Skip:($os.IsVentura -or $os.IsSonoma) { It "imagemagick" { "magick -version" | Should -ReturnZeroExitCode } diff --git a/images/macos/tests/Browsers.Tests.ps1 b/images/macos/tests/Browsers.Tests.ps1 index 480c5e76d1a6..61c8baaec235 100644 --- a/images/macos/tests/Browsers.Tests.ps1 +++ b/images/macos/tests/Browsers.Tests.ps1 @@ -31,7 +31,7 @@ Describe "Chrome" { Describe "Selenium server" { It "Selenium server" { $os = Get-OSVersion - if ($os.IsVenturaArm64) { + if ($os.IsArm64) { $cellarPath = "/opt/homebrew/Cellar" } else { $cellarPath = "/usr/local/Cellar" @@ -40,7 +40,7 @@ Describe "Selenium server" { } } -Describe "Edge" -Skip:($os.IsVenturaArm64) { +Describe "Edge" -Skip:($os.IsVenturaArm64 -or $os.IsSonomaArm64) { It "Microsoft Edge" { $edgeLocation = "/Applications/Microsoft Edge.app/Contents/MacOS/Microsoft Edge" $edgeLocation | Should -Exist @@ -52,7 +52,7 @@ Describe "Edge" -Skip:($os.IsVenturaArm64) { } } -Describe "Firefox" -Skip:($os.IsVenturaArm64) { +Describe "Firefox" -Skip:($os.IsVenturaArm64 -or $os.IsSonomaArm64) { It "Firefox" { $firefoxLocation = "/Applications/Firefox.app/Contents/MacOS/firefox" $firefoxLocation | Should -Exist diff --git a/images/macos/tests/Common.Tests.ps1 b/images/macos/tests/Common.Tests.ps1 index 8fa92dd0c245..54f1d71dad0a 100644 --- a/images/macos/tests/Common.Tests.ps1 +++ b/images/macos/tests/Common.Tests.ps1 @@ -10,7 +10,7 @@ Describe ".NET" { } Describe "GCC" { - $testCases = Get-ToolsetValue -KeyPath gcc.versions | ForEach-Object { @{Version = $_} } + $testCases = Get-ToolsetValue -KeyPath gcc.versions | ForEach-Object { @{Version = $_ } } It "GCC <Version>" -TestCases $testCases { param ( @@ -33,7 +33,7 @@ Describe "GCC" { } } -Describe "vcpkg" -Skip:($os.IsVenturaArm64) { +Describe "vcpkg" -Skip:($os.IsVenturaArm64 -or $os.IsSonomaArm64) { It "vcpkg" { "vcpkg version" | Should -ReturnZeroExitCode } @@ -58,7 +58,7 @@ Describe "AzCopy" { } } -Describe "Miniconda" -Skip:($os.IsVentura -or $os.IsVenturaArm64 -or $os.IsSonoma) { +Describe "Miniconda" -Skip:($os.IsVentura -or $os.IsSonoma) { It "Conda" { Get-EnvironmentVariable "CONDA" | Should -Not -BeNullOrEmpty $condaBinPath = Join-Path $env:CONDA "bin" "conda" @@ -66,7 +66,7 @@ Describe "Miniconda" -Skip:($os.IsVentura -or $os.IsVenturaArm64 -or $os.IsSonom } } -Describe "Stack" -Skip:($os.IsVenturaArm64) { +Describe "Stack" -Skip:($os.IsVenturaArm64 -or $os.IsSonomaArm64) { It "Stack" { "stack --version" | Should -ReturnZeroExitCode } @@ -78,7 +78,7 @@ Describe "CocoaPods" { } } -Describe "VSMac" -Skip:($os.IsVentura -or $os.IsVenturaArm64 -or $os.IsSonoma) { +Describe "VSMac" -Skip:($os.IsVentura -or $os.IsSonoma) { $vsMacVersions = Get-ToolsetValue "xamarin.vsmac.versions" $defaultVSMacVersion = Get-ToolsetValue "xamarin.vsmac.default" @@ -105,7 +105,7 @@ Describe "VSMac" -Skip:($os.IsVentura -or $os.IsVenturaArm64 -or $os.IsSonoma) { } } -Describe "Swig" -Skip:($os.IsVentura -or $os.IsVenturaArm64 -or $os.IsSonoma) { +Describe "Swig" -Skip:($os.IsVentura -or $os.IsSonoma) { It "Swig" { "swig -version" | Should -ReturnZeroExitCode } @@ -117,13 +117,13 @@ Describe "Bicep" { } } -Describe "Go" -Skip:($os.IsVentura -or $os.IsVenturaArm64 -or $os.IsSonoma) { +Describe "Go" -Skip:($os.IsVentura -or $os.IsSonoma) { It "Go" { "go version" | Should -ReturnZeroExitCode } } -Describe "VirtualBox" -Skip:($os.IsBigSur -or $os.IsVentura -or $os.IsVenturaArm64 -or $os.IsSonoma) { +Describe "VirtualBox" -Skip:($os.IsBigSur -or $os.IsVentura -or $os.IsSonoma) { It "Check kext kernel modules" { kextstat | Out-String | Should -Match "org.virtualbox.kext" } @@ -141,7 +141,7 @@ Describe "CodeQL Bundle" { } } -Describe "Colima" -Skip:($os.IsVentura -or $os.IsVenturaArm64 -or $os.IsSonoma) { +Describe "Colima" -Skip:($os.IsVentura -or $os.IsSonoma) { It "Colima" { "colima version" | Should -ReturnZeroExitCode } diff --git a/images/macos/tests/Databases.Tests.ps1 b/images/macos/tests/Databases.Tests.ps1 index 3dda00eeddec..68c0fd390cb7 100644 --- a/images/macos/tests/Databases.Tests.ps1 +++ b/images/macos/tests/Databases.Tests.ps1 @@ -2,7 +2,7 @@ Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" $os = Get-OSVersion -Describe "MongoDB" -Skip:($os.IsVentura -or $os.IsVenturaArm64 -or $os.IsSonoma) { +Describe "MongoDB" -Skip:($os.IsVentura -or $os.IsSonoma) { It "<ToolName>" -TestCases @( @{ ToolName = "mongo" } @{ ToolName = "mongod" } @@ -12,7 +12,7 @@ Describe "MongoDB" -Skip:($os.IsVentura -or $os.IsVenturaArm64 -or $os.IsSonoma) } } -Describe "PostgreSQL" -Skip:($os.IsVentura -or $os.IsVenturaArm64 -or $os.IsSonoma) { +Describe "PostgreSQL" -Skip:($os.IsVentura -or $os.IsSonoma) { It "PostgreSQL version should correspond to the version in the toolset" { $toolsetVersion = Get-ToolsetValue 'postgresql.version' # Client version diff --git a/images/macos/tests/Haskell.Tests.ps1 b/images/macos/tests/Haskell.Tests.ps1 index b4e965b34a4b..dbfc402bd436 100644 --- a/images/macos/tests/Haskell.Tests.ps1 +++ b/images/macos/tests/Haskell.Tests.ps1 @@ -1,7 +1,7 @@ Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" $os = Get-OSVersion -Describe "Haskell" -Skip:($os.IsVentura -or $os.IsVenturaArm64 -or $os.IsSonoma) { +Describe "Haskell" -Skip:($os.IsVentura -or $os.IsSonoma) { Context "GHCup" { It "GHCup" { "ghcup --version" | Should -ReturnZeroExitCode diff --git a/images/macos/tests/Java.Tests.ps1 b/images/macos/tests/Java.Tests.ps1 index 5948b5a2e761..65238c1d1e4e 100644 --- a/images/macos/tests/Java.Tests.ps1 +++ b/images/macos/tests/Java.Tests.ps1 @@ -1,83 +1,83 @@ -Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" -Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1" -DisableNameChecking - -$os = Get-OSVersion -$arch = Get-Architecture - -function Get-NativeVersionFormat { - param($Version) - if ($Version -in "8") { - return "1.${Version}" - } - return $Version -} - -Describe "Java" { - BeforeAll { - function Validate-JavaVersion { - param($JavaCommand, $ExpectedVersion) - - $commandResult = Get-CommandResult $JavaCommand - $commandResult.ExitCode | Should -Be 0 - $matchResult = $commandResult.Output | Select-String '^openjdk version \"([\d\._]+)\"' - $matchResult.Matches.Success | Should -BeTrue - $version = $matchResult.Matches.Groups[1].Value - $version | Should -BeLike "${ExpectedVersion}*" - } - } - - $toolsetJava = Get-ToolsetValue "java" - $defaultVersion = $toolsetJava.$arch.default - $jdkVersions = $toolsetJava.$arch.versions - - if ($os.IsVenturaArm64) { - $testCases = $jdkVersions | ForEach-Object { @{ Title = $_; Version = (Get-NativeVersionFormat $_); EnvVariable = "JAVA_HOME_${_}_arm64" } } - } else { - $testCases = $jdkVersions | ForEach-Object { @{ Title = $_; Version = (Get-NativeVersionFormat $_); EnvVariable = "JAVA_HOME_${_}_X64" } } - } - $testCases += @{ Title = "Default"; Version = (Get-NativeVersionFormat $defaultVersion); EnvVariable = "JAVA_HOME" } - - $testCases | ForEach-Object { - Context $_.Title { - It "Version is found by 'java_home'" -TestCases $_ { - "/usr/libexec/java_home -v${Version}" | Should -ReturnZeroExitCode - } - - It "Java <Version>" -TestCases $_ { - $envVariablePath = Get-EnvironmentVariable $EnvVariable - $javaBinPath = Join-Path $envVariablePath "/bin/java" - Validate-JavaVersion -JavaCommand "$javaBinPath -version" -ExpectedVersion $Version - } - - if ($_.Title -eq "Default") { - It "Version is default" -TestCases $_ { - Validate-JavaVersion -JavaCommand "java -version" -ExpectedVersion $Version - } - } - } - } - - Context "Maven" { - Describe "Maven" { - It "Maven" { - "mvn --version" | Should -ReturnZeroExitCode - } - } - } - - Context "Gradle" { - Describe "Gradle" { - It "Gradle is installed" { - "gradle --version" | Should -ReturnZeroExitCode - } - - It "Gradle is installed to /usr/local/bin" -Skip:($os.IsVenturaArm64) { - (Get-Command "gradle").Path | Should -BeExactly "/usr/local/bin/gradle" - } - - It "Gradle is installed to /opt/homebrew/bin/gradle" -Skip:(-not $os.IsVenturaArm64) { - (Get-Command "gradle").Path | Should -BeExactly "/opt/homebrew/bin/gradle" - } - } - } -} +Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" +Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1" -DisableNameChecking + +$os = Get-OSVersion +$arch = Get-Architecture + +function Get-NativeVersionFormat { + param($Version) + if ($Version -in "8") { + return "1.${Version}" + } + return $Version +} + +Describe "Java" { + BeforeAll { + function Validate-JavaVersion { + param($JavaCommand, $ExpectedVersion) + + $commandResult = Get-CommandResult $JavaCommand + $commandResult.ExitCode | Should -Be 0 + $matchResult = $commandResult.Output | Select-String '^openjdk version \"([\d\._]+)\"' + $matchResult.Matches.Success | Should -BeTrue + $version = $matchResult.Matches.Groups[1].Value + $version | Should -BeLike "${ExpectedVersion}*" + } + } + + $toolsetJava = Get-ToolsetValue "java" + $defaultVersion = $toolsetJava.$arch.default + $jdkVersions = $toolsetJava.$arch.versions + + if ($os.IsArm64) { + $testCases = $jdkVersions | ForEach-Object { @{ Title = $_; Version = (Get-NativeVersionFormat $_); EnvVariable = "JAVA_HOME_${_}_arm64" } } + } else { + $testCases = $jdkVersions | ForEach-Object { @{ Title = $_; Version = (Get-NativeVersionFormat $_); EnvVariable = "JAVA_HOME_${_}_X64" } } + } + $testCases += @{ Title = "Default"; Version = (Get-NativeVersionFormat $defaultVersion); EnvVariable = "JAVA_HOME" } + + $testCases | ForEach-Object { + Context $_.Title { + It "Version is found by 'java_home'" -TestCases $_ { + "/usr/libexec/java_home -v${Version}" | Should -ReturnZeroExitCode + } + + It "Java <Version>" -TestCases $_ { + $envVariablePath = Get-EnvironmentVariable $EnvVariable + $javaBinPath = Join-Path $envVariablePath "/bin/java" + Validate-JavaVersion -JavaCommand "$javaBinPath -version" -ExpectedVersion $Version + } + + if ($_.Title -eq "Default") { + It "Version is default" -TestCases $_ { + Validate-JavaVersion -JavaCommand "java -version" -ExpectedVersion $Version + } + } + } + } + + Context "Maven" { + Describe "Maven" { + It "Maven" { + "mvn --version" | Should -ReturnZeroExitCode + } + } + } + + Context "Gradle" { + Describe "Gradle" { + It "Gradle is installed" { + "gradle --version" | Should -ReturnZeroExitCode + } + + It "Gradle is installed to /usr/local/bin" -Skip:($os.IsArm64) { + (Get-Command "gradle").Path | Should -BeExactly "/usr/local/bin/gradle" + } + + It "Gradle is installed to /opt/homebrew/bin/gradle" -Skip:(-not $os.IsArm64) { + (Get-Command "gradle").Path | Should -BeExactly "/opt/homebrew/bin/gradle" + } + } + } +} diff --git a/images/macos/tests/Linters.Tests.ps1 b/images/macos/tests/Linters.Tests.ps1 index 79bf639b41a0..d4a2fdded30e 100644 --- a/images/macos/tests/Linters.Tests.ps1 +++ b/images/macos/tests/Linters.Tests.ps1 @@ -2,8 +2,8 @@ Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1" -DisableNameChecking $os = Get-OSVersion -Describe "SwiftLint" -Skip:($os.IsVenturaArm64) { +Describe "SwiftLint" -Skip:($os.IsVenturaArm64 -or $os.IsSonomaArm64) { It "SwiftLint" { "swiftlint version" | Should -ReturnZeroExitCode } -} \ No newline at end of file +} diff --git a/images/macos/tests/Node.Tests.ps1 b/images/macos/tests/Node.Tests.ps1 index b84aee350090..6c11f161ae50 100644 --- a/images/macos/tests/Node.Tests.ps1 +++ b/images/macos/tests/Node.Tests.ps1 @@ -21,7 +21,7 @@ Describe "Node.js" { } } -Describe "nvm" -Skip:($os.IsVentura -or $os.IsVenturaArm64 -or $os.IsSonoma) { +Describe "nvm" -Skip:($os.IsVentura -or $os.IsSonoma) { BeforeAll { $nvmPath = Join-Path $env:HOME ".nvm" "nvm.sh" $nvmInitCommand = ". $nvmPath > /dev/null 2>&1 || true" diff --git a/images/macos/tests/PHP.Tests.ps1 b/images/macos/tests/PHP.Tests.ps1 index 2ac1b55d949a..fb063da397af 100644 --- a/images/macos/tests/PHP.Tests.ps1 +++ b/images/macos/tests/PHP.Tests.ps1 @@ -2,7 +2,7 @@ Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" $os = Get-OSVersion Describe "PHP" { - Context "PHP" -Skip:($os.IsVenturaArm64) { + Context "PHP" -Skip:($os.IsVenturaArm64 -or $os.IsSonomaArm64) { It "PHP Path" { Get-WhichTool "php" | Should -Not -BeLike "/usr/bin/php*" } @@ -13,7 +13,7 @@ Describe "PHP" { } } - Context "Composer" -Skip:($os.IsVenturaArm64) { + Context "Composer" -Skip:($os.IsVenturaArm64 -or $os.IsSonomaArm64) { It "Composer" { "composer --version" | Should -ReturnZeroExitCode } diff --git a/images/macos/tests/PipxPackages.Tests.ps1 b/images/macos/tests/PipxPackages.Tests.ps1 index adfd45c3140a..ec47311f46c9 100644 --- a/images/macos/tests/PipxPackages.Tests.ps1 +++ b/images/macos/tests/PipxPackages.Tests.ps1 @@ -3,7 +3,7 @@ Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" $os = Get-OSVersion -Describe "PipxPackages" -Skip:($os.IsVentura -or $os.IsVenturaArm64 -or $os.IsSonoma) { +Describe "PipxPackages" -Skip:($os.IsVentura -or $os.IsSonoma) { $pipxToolset = Get-ToolsetValue "pipx" $testCases = $pipxToolset | ForEach-Object { @{package = $_.package; cmd = $_.cmd} } It "<package>" -TestCases $testCases { diff --git a/images/macos/tests/Python.Tests.ps1 b/images/macos/tests/Python.Tests.ps1 index 2504b9651ca1..012f78084b08 100644 --- a/images/macos/tests/Python.Tests.ps1 +++ b/images/macos/tests/Python.Tests.ps1 @@ -3,7 +3,7 @@ Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1" -DisableNameChecking $os = Get-OSVersion -Describe "Python3" -Skip:($os.IsVenturaArm64) { +Describe "Python3" -Skip:($os.IsVenturaArm64 -or $os.IsSonomaArm64) { It "Python 3 is available" { "python3 --version" | Should -ReturnZeroExitCode } @@ -28,7 +28,7 @@ Describe "Python3" -Skip:($os.IsVenturaArm64) { } -Describe "Python2" -Skip:($os.IsVenturaArm64 -or $os.IsVentura -or $os.IsSonoma) { +Describe "Python2" -Skip:($os.IsVentura -or $os.IsSonoma) { It "Python 2 is available" { "/Library/Frameworks/Python.framework/Versions/2.7/bin/python --version" | Should -ReturnZeroExitCode } diff --git a/images/macos/tests/Ruby.arm64.Tests.ps1 b/images/macos/tests/Ruby.arm64.Tests.ps1 index c8b77fac0a10..cb0dacf9ef4f 100644 --- a/images/macos/tests/Ruby.arm64.Tests.ps1 +++ b/images/macos/tests/Ruby.arm64.Tests.ps1 @@ -3,7 +3,7 @@ Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1" -DisableNameChecking $os = Get-OSVersion -Describe "Ruby" -Skip:($os.IsVentura -or $os.IsBigSur -or $os.IsMonterey -or $os.IsSonoma) { +Describe "Ruby" -Skip:(-not $os.IsArm64) { It "Ruby is available" { "ruby --version" | Should -ReturnZeroExitCode } diff --git a/images/macos/tests/Ruby.x64.Tests.ps1 b/images/macos/tests/Ruby.x64.Tests.ps1 index ff438c7cd70c..97dc24cacd9f 100644 --- a/images/macos/tests/Ruby.x64.Tests.ps1 +++ b/images/macos/tests/Ruby.x64.Tests.ps1 @@ -3,7 +3,7 @@ Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1" -DisableNameChecking $os = Get-OSVersion -Describe "Ruby" -Skip:($os.IsVenturaArm64) { +Describe "Ruby" -Skip:($os.IsArm64) { It "Ruby is available" { "ruby --version" | Should -ReturnZeroExitCode } diff --git a/images/macos/tests/RubyGem.Tests.ps1 b/images/macos/tests/RubyGem.Tests.ps1 index 81f178d95d1b..fb07ce9beaf9 100644 --- a/images/macos/tests/RubyGem.Tests.ps1 +++ b/images/macos/tests/RubyGem.Tests.ps1 @@ -20,7 +20,7 @@ Describe "Bundler" { } } -Describe "Nomad shenzhen CLI" -Skip:($os.IsMonterey -or $os.IsVentura -or $os.IsVenturaArm64 -or $os.IsSonoma) { +Describe "Nomad shenzhen CLI" -Skip:($os.IsMonterey -or $os.IsVentura -or $os.IsSonoma) { It "Nomad shenzhen CLI" { "ipa --version" | Should -ReturnZeroExitCode } @@ -38,7 +38,7 @@ Describe "xcpretty" { } } -Describe "jazzy" -Skip:($os.IsVentura -or $os.IsVenturaArm64 -or $os.IsSonoma) { +Describe "jazzy" -Skip:($os.IsVentura -or $os.IsSonoma) { It "jazzy" { "jazzy --version" | Should -ReturnZeroExitCode } diff --git a/images/macos/tests/Rust.Tests.ps1 b/images/macos/tests/Rust.Tests.ps1 index 3b5e5b8b5408..72cb59a6979a 100644 --- a/images/macos/tests/Rust.Tests.ps1 +++ b/images/macos/tests/Rust.Tests.ps1 @@ -17,7 +17,7 @@ Describe "Rust" { "cargo --version" | Should -ReturnZeroExitCode } } - Context "Cargo dependencies" -Skip:($os.IsVentura -or $os.IsVenturaArm64 -or $os.IsSonoma) { + Context "Cargo dependencies" -Skip:($os.IsVentura -or $os.IsSonoma) { It "bindgen" { "bindgen --version" | Should -ReturnZeroExitCode } diff --git a/images/macos/tests/System.Tests.ps1 b/images/macos/tests/System.Tests.ps1 index 3dd7e802f51a..cf785a9b56cc 100644 --- a/images/macos/tests/System.Tests.ps1 +++ b/images/macos/tests/System.Tests.ps1 @@ -25,7 +25,7 @@ Describe "Certificate" { } } -Describe "Audio device" -Skip:($os.IsVentura -or $os.IsVenturaArm64 -or $os.IsSonoma) { +Describe "Audio device" -Skip:($os.IsVentura -or $os.IsSonoma) { It "Sox is installed" { "sox --version" | Should -ReturnZeroExitCode } diff --git a/images/macos/tests/Toolcache.Tests.ps1 b/images/macos/tests/Toolcache.Tests.ps1 index 30c58953be9a..d71ca1a8614a 100644 --- a/images/macos/tests/Toolcache.Tests.ps1 +++ b/images/macos/tests/Toolcache.Tests.ps1 @@ -57,7 +57,7 @@ Describe "Toolcache" { } } - Context "Ruby" -Skip:($os.IsVenturaArm64) { + Context "Ruby" -Skip:($os.IsVenturaArm64 -or $os.IsSonomaArm64) { $rubyDirectory = Join-Path $toolcacheDirectory "Ruby" $rubyPackage = $packages | Where-Object { $_.ToolName -eq "Ruby" } | Select-Object -First 1 $testCase = @{ RubyDirectory = $rubyDirectory } @@ -99,7 +99,7 @@ Describe "Toolcache" { } } } - Context "PyPy" -Skip:($os.IsVenturaArm64) { + Context "PyPy" -Skip:($os.IsVenturaArm64 -or $os.IsSonomaArm64) { $pypyDirectory = Join-Path $toolcacheDirectory "PyPy" $pypyPackage = $packages | Where-Object { $_.ToolName -eq "pypy" } | Select-Object -First 1 $testCase = @{ PypyDirectory = $pypyDirectory } @@ -229,4 +229,4 @@ Describe "Toolcache" { } } } -} \ No newline at end of file +} diff --git a/images/macos/tests/WebServers.Tests.ps1 b/images/macos/tests/WebServers.Tests.ps1 index ef0a128b598b..f1365b2ad7ef 100644 --- a/images/macos/tests/WebServers.Tests.ps1 +++ b/images/macos/tests/WebServers.Tests.ps1 @@ -2,7 +2,7 @@ Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" $os = Get-OSVersion -Describe "Apache" -Skip:($os.IsVenturaArm64) { +Describe "Apache" -Skip:($os.IsVenturaArm64 -or $os.IsSonomaArm64) { It "Apache CLI" { "httpd -v" | Should -ReturnZeroExitCode } @@ -12,7 +12,7 @@ Describe "Apache" -Skip:($os.IsVenturaArm64) { } } -Describe "Nginx" -Skip:($os.IsVentura -or $os.IsVenturaArm64) { +Describe "Nginx" -Skip:($os.IsVentura -or $os.IsSonoma) { It "Nginx CLI" { "nginx -v" | Should -ReturnZeroExitCode } diff --git a/images/macos/tests/Xamarin.Tests.ps1 b/images/macos/tests/Xamarin.Tests.ps1 index 69ced6747d49..335183345878 100644 --- a/images/macos/tests/Xamarin.Tests.ps1 +++ b/images/macos/tests/Xamarin.Tests.ps1 @@ -2,7 +2,7 @@ Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1" -DisableNameChecking $os = Get-OSVersion -if ($os.IsVentura -or $os.IsVenturaArm64 -or $os.IsSonoma) { +if ($os.IsVentura -or $os.IsSonoma) { $MONO_VERSIONS = @(Get-ToolsetValue "mono.framework.version") $XAMARIN_IOS_VERSIONS = @() $XAMARIN_MAC_VERSIONS = @() @@ -89,7 +89,7 @@ Describe "Mono" { } } -Describe "Xamarin.iOS" -Skip:($os.IsVentura -or $os.IsVenturaArm64 -or $os.IsSonoma) { +Describe "Xamarin.iOS" -Skip:($os.IsVentura -or $os.IsSonoma) { $XAMARIN_IOS_VERSIONS | ForEach-Object { Context "$_" { $XAMARIN_IOS_VERSIONS_PATH = "/Library/Frameworks/Xamarin.iOS.framework/Versions" @@ -122,7 +122,7 @@ Describe "Xamarin.iOS" -Skip:($os.IsVentura -or $os.IsVenturaArm64 -or $os.IsSon } } -Describe "Xamarin.Mac" -Skip:($os.IsVentura -or $os.IsVenturaArm64 -or $os.IsSonoma) { +Describe "Xamarin.Mac" -Skip:($os.IsVentura -or $os.IsSonoma) { $XAMARIN_MAC_VERSIONS | ForEach-Object { Context "$_" { $XAMARIN_MAC_VERSIONS_PATH = "/Library/Frameworks/Xamarin.Mac.framework/Versions" @@ -155,7 +155,7 @@ Describe "Xamarin.Mac" -Skip:($os.IsVentura -or $os.IsVenturaArm64 -or $os.IsSon } } -Describe "Xamarin.Android" -Skip:($os.IsVentura -or $os.IsVenturaArm64 -or $os.IsSonoma) { +Describe "Xamarin.Android" -Skip:($os.IsVentura -or $os.IsSonoma) { $XAMARIN_ANDROID_VERSIONS | ForEach-Object { Context "$_" { $XAMARIN_ANDROID_VERSIONS_PATH = "/Library/Frameworks/Xamarin.Android.framework/Versions" @@ -195,7 +195,7 @@ Describe "Xamarin.Android" -Skip:($os.IsVentura -or $os.IsVenturaArm64 -or $os.I } } -Describe "Xamarin Bundles" -Skip:($os.IsVentura -or $os.IsVenturaArm64 -or $os.IsSonoma) { +Describe "Xamarin Bundles" -Skip:($os.IsVentura -or $os.IsSonoma) { BeforeAll { $MONO_VERSIONS_PATH = "/Library/Frameworks/Mono.framework/Versions" $XAMARIN_IOS_VERSIONS_PATH = "/Library/Frameworks/Xamarin.iOS.framework/Versions" @@ -302,7 +302,7 @@ Describe "Xamarin Bundles" -Skip:($os.IsVentura -or $os.IsVenturaArm64 -or $os.I } } -Describe "Nuget" -Skip:($os.IsVentura -or $os.IsVenturaArm64 -or $os.IsSonoma) { +Describe "Nuget" -Skip:($os.IsVentura -or $os.IsSonoma) { It "Nuget config contains nuget.org feed" { Get-Content $env:HOME/.config/NuGet/NuGet.Config | Out-String | Should -Match "nuget.org" } From e5b8919eebf4da1abfd013d080a4d75e6db21e34 Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Sat, 11 Nov 2023 12:12:39 +0100 Subject: [PATCH 2432/3485] [macos11] Unlink brew ghc and cabal-install (#8778) --- images/macos/provision/core/haskell.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/images/macos/provision/core/haskell.sh b/images/macos/provision/core/haskell.sh index ce9ba682ed7e..859a8c147493 100644 --- a/images/macos/provision/core/haskell.sh +++ b/images/macos/provision/core/haskell.sh @@ -1,5 +1,12 @@ #!/bin/bash -e -o pipefail +source ~/utils/utils.sh + +# https://github.com/actions/runner-images/issues/8738 +if is_BigSur; then + brew unlink ghc cabal-install +fi + curl --proto '=https' --tlsv1.2 -fsSL https://get-ghcup.haskell.org | sh export PATH="$HOME/.ghcup/bin:$PATH" echo 'export PATH="$PATH:$HOME/.ghcup/bin"' >> "$HOME/.bashrc" From 1478804fa23da2ac5343c7f34060c5763a561556 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Mon, 13 Nov 2023 11:26:00 +0100 Subject: [PATCH 2433/3485] utils.sh: make brew_smart_install verbose (#8780) --- images/macos/provision/utils/utils.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/macos/provision/utils/utils.sh b/images/macos/provision/utils/utils.sh index 8af3db3cdac0..cdf79adaadee 100755 --- a/images/macos/provision/utils/utils.sh +++ b/images/macos/provision/utils/utils.sh @@ -165,7 +165,7 @@ brew_smart_install() { failed=true for i in {1..10}; do - brew install $tool_name >/dev/null && failed=false || sleep 60 + brew install $tool_name && failed=false || sleep 60 [ "$failed" = false ] && break done From 81ef6f228d68d81f3db70b80551aace30e2675b9 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Tue, 14 Nov 2023 11:58:29 +0100 Subject: [PATCH 2434/3485] [macOS] Exclude macOS 13 and 14 from "Stack" test (#8787) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Alexey Ayupov <“alexey.ayupov@akvelon.com”> --- images/macos/tests/Common.Tests.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/macos/tests/Common.Tests.ps1 b/images/macos/tests/Common.Tests.ps1 index 54f1d71dad0a..c7c812aa6b44 100644 --- a/images/macos/tests/Common.Tests.ps1 +++ b/images/macos/tests/Common.Tests.ps1 @@ -66,7 +66,7 @@ Describe "Miniconda" -Skip:($os.IsVentura -or $os.IsSonoma) { } } -Describe "Stack" -Skip:($os.IsVenturaArm64 -or $os.IsSonomaArm64) { +Describe "Stack" -Skip:($os.IsVentura -or $os.IsSonoma) { It "Stack" { "stack --version" | Should -ReturnZeroExitCode } From 6b001b53252bf02fa3b8a5c846c7aa8b6c729f8c Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Wed, 15 Nov 2023 10:31:31 +0100 Subject: [PATCH 2435/3485] [macOS] Reconsider YQ installation on macOS 11 (#8793) * [macOS] Reconsider YQ installation on macOS 11 * Revert previous YQ installation related changes --- images/macos/provision/core/commonutils.sh | 6 ++++++ images/macos/provision/core/haskell.sh | 5 ----- images/macos/toolsets/toolset-11.json | 1 - 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/images/macos/provision/core/commonutils.sh b/images/macos/provision/core/commonutils.sh index 8d704582c9d0..a22195aad93f 100644 --- a/images/macos/provision/core/commonutils.sh +++ b/images/macos/provision/core/commonutils.sh @@ -1,6 +1,12 @@ #!/bin/bash -e -o pipefail source ~/utils/utils.sh +# Download and install YQ in cases when it is not available in the formulae as for macOS 11: https://formulae.brew.sh/formula/yq +if is_BigSur; then + download_with_retries "https://github.com/mikefarah/yq/releases/latest/download/yq_darwin_amd64" "/tmp" "yq" + sudo install /tmp/yq /usr/local/bin/yq +fi + # Monterey needs future review: # aliyun-cli, gnupg, helm have issues with building from the source code. # Added gmp for now, because toolcache ruby needs its libs. Remove it when php starts to build from source code. diff --git a/images/macos/provision/core/haskell.sh b/images/macos/provision/core/haskell.sh index 859a8c147493..9856dc7dbe86 100644 --- a/images/macos/provision/core/haskell.sh +++ b/images/macos/provision/core/haskell.sh @@ -2,11 +2,6 @@ source ~/utils/utils.sh -# https://github.com/actions/runner-images/issues/8738 -if is_BigSur; then - brew unlink ghc cabal-install -fi - curl --proto '=https' --tlsv1.2 -fsSL https://get-ghcup.haskell.org | sh export PATH="$HOME/.ghcup/bin:$PATH" echo 'export PATH="$PATH:$HOME/.ghcup/bin"' >> "$HOME/.bashrc" diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index 20220cb92cdb..1f6b593c493f 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -220,7 +220,6 @@ "libxft", "tcl-tk", "r", - "yq", "imagemagick" ], "cask_packages": [ From 84a7deae246ddab0f1741f6b758440c3753f3752 Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Wed, 15 Nov 2023 11:22:43 +0100 Subject: [PATCH 2436/3485] [Windows] Update Visual Studio and .NET (#8805) * Update VS to 17.8 * Update signature for VS 2019 * Add dotnet 7 to toolset --- images/win/toolsets/toolset-2019.json | 5 +++-- images/win/toolsets/toolset-2022.json | 23 +++++++++++++++++++++-- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index 353aed4d082a..fdc24fbc5025 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -267,7 +267,7 @@ "subversion" : "16", "edition" : "Enterprise", "channel": "release", - "signature": "6E78B3DCE2998F6C2457C3E54DA90A01034916AE", + "signature": "72105B6D5F370B62FD5C82F1512F7AD7DEE5F2C0", "workloads": [ "Component.Dotfuscator", "Component.Linux.CMake", @@ -423,7 +423,8 @@ }, "dotnet": { "versions": [ - "6.0" + "6.0", + "7.0" ], "tools": [ { "name": "nbgv", "test": "nbgv --version", "getversion": "nbgv --version" } diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index a954ad94a49d..aee512f7d824 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -177,7 +177,7 @@ "subversion" : "17", "edition" : "Enterprise", "channel": "release", - "signature": "6E78B3DCE2998F6C2457C3E54DA90A01034916AE", + "signature": "72105B6D5F370B62FD5C82F1512F7AD7DEE5F2C0", "workloads": [ "Component.Dotfuscator", "Component.Linux.CMake", @@ -267,6 +267,24 @@ "Microsoft.VisualStudio.Component.VC.14.37.17.7.MFC", "Microsoft.VisualStudio.Component.VC.14.37.17.7.x86.x64.Spectre", "Microsoft.VisualStudio.Component.VC.14.37.17.7.x86.x64", + "Microsoft.VisualStudio.Component.VC.14.38.17.8.ARM", + "Microsoft.VisualStudio.Component.VC.14.38.17.8.ARM.Spectre", + "Microsoft.VisualStudio.Component.VC.14.38.17.8.ARM64", + "Microsoft.VisualStudio.Component.VC.14.38.17.8.ARM64.Spectre", + "Microsoft.VisualStudio.Component.VC.14.38.17.8.ATL", + "Microsoft.VisualStudio.Component.VC.14.38.17.8.ATL.ARM", + "Microsoft.VisualStudio.Component.VC.14.38.17.8.ATL.ARM.Spectre", + "Microsoft.VisualStudio.Component.VC.14.38.17.8.ATL.ARM64", + "Microsoft.VisualStudio.Component.VC.14.38.17.8.ATL.ARM64.Spectre", + "Microsoft.VisualStudio.Component.VC.14.38.17.8.ATL.Spectre", + "Microsoft.VisualStudio.Component.VC.14.38.17.8.MFC", + "Microsoft.VisualStudio.Component.VC.14.38.17.8.MFC.ARM", + "Microsoft.VisualStudio.Component.VC.14.38.17.8.MFC.ARM.Spectre", + "Microsoft.VisualStudio.Component.VC.14.38.17.8.MFC.ARM64", + "Microsoft.VisualStudio.Component.VC.14.38.17.8.MFC.ARM64.Spectre", + "Microsoft.VisualStudio.Component.VC.14.38.17.8.MFC.Spectre", + "Microsoft.VisualStudio.Component.VC.14.38.17.8.x86.x64", + "Microsoft.VisualStudio.Component.VC.14.38.17.8.x86.x64.Spectre", "Microsoft.VisualStudio.Component.VC.ATLMFC", "Microsoft.VisualStudio.Component.VC.ATLMFC.Spectre", "Microsoft.VisualStudio.Component.Windows10SDK.19041", @@ -346,7 +364,8 @@ }, "dotnet": { "versions": [ - "6.0" + "6.0", + "7.0" ], "tools": [ { "name": "nbgv", "test": "nbgv --version", "getversion": "nbgv --version" } From d1f2c9a3bedac344533bd2499133f030adab7d90 Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Wed, 15 Nov 2023 11:24:45 +0100 Subject: [PATCH 2437/3485] [Windows] Implement new directories hierarchy (#8616) --- .github/workflows/windows2019.yml | 2 +- .github/workflows/windows2022.yml | 2 +- CONTRIBUTING.md | 10 +- README.md | 5 +- docs/create-image-and-azure-resources.md | 6 +- helpers/GenerateResourcesAndImage.ps1 | 4 +- .../azure-pipelines/image-generation.yml | 25 +- .../azure-pipelines/windows2019.yml | 3 +- .../azure-pipelines/windows2022.yml | 3 +- images/win/scripts/README.md | 1 - images/{win => windows}/Windows2019-Readme.md | 0 images/{win => windows}/Windows2022-Readme.md | 0 .../GenerateIISExpressCertificate.ps1 | 0 .../InternetExplorerConfiguration.ps1 | 0 .../assets/post-gen}/Msys2FirstLaunch.ps1 | 0 .../assets/post-gen}/VSConfiguration.ps1 | 28 +- .../assets/post-gen}/warmup.vdproj | 0 .../scripts/build}/Configure-Antivirus.ps1 | 0 .../scripts/build}/Configure-DynamicPort.ps1 | 26 +- .../Configure-GDIProcessHandleQuota.ps1 | 0 .../scripts/build}/Configure-PowerShell.ps1 | 0 .../scripts/build}/Configure-Shell.ps1 | 0 .../scripts/build}/Configure-Toolset.ps1 | 0 .../scripts/build}/Disable-JITDebugger.ps1 | 30 +- .../scripts/build}/Enable-DeveloperMode.ps1 | 0 .../scripts/build}/Finalize-VM.ps1 | 0 .../scripts/build}/Initialize-VM.ps1 | 0 .../scripts/build}/Install-AWS.ps1 | 0 .../build}/Install-ActionArchiveCache.ps1 | 0 .../scripts/build}/Install-AliyunCli.ps1 | 58 ++-- .../scripts/build}/Install-AndroidSDK.ps1 | 0 .../scripts/build}/Install-Apache.ps1 | 0 .../scripts/build}/Install-AzureCli.ps1 | 0 .../build}/Install-AzureCosmosDbEmulator.ps1 | 0 .../scripts/build}/Install-AzureDevOpsCli.ps1 | 0 .../scripts/build}/Install-AzureModules.ps1 | 0 .../scripts/build}/Install-Bazel.ps1 | 18 +- .../build}/Install-BizTalkBuildComponent.ps1 | 0 .../scripts/build}/Install-Choco.ps1 | 0 .../scripts/build}/Install-Chrome.ps1 | 0 .../build}/Install-CloudFoundryCli.ps1 | 0 .../scripts/build}/Install-CodeQLBundle.ps1 | 0 .../scripts/build}/Install-CommonUtils.ps1 | 0 .../scripts/build}/Install-DACFx.ps1 | 0 .../scripts/build}/Install-Docker-Compose.ps1 | 0 .../scripts/build}/Install-Docker-WinCred.ps1 | 0 .../scripts/build}/Install-Docker.ps1 | 0 .../scripts/build}/Install-DotnetSDK.ps1 | 0 .../scripts/build}/Install-Edge.ps1 | 0 .../scripts/build}/Install-Firefox.ps1 | 0 .../scripts/build}/Install-Git.ps1 | 0 .../scripts/build}/Install-GitHub-CLI.ps1 | 0 .../scripts/build}/Install-GoogleCloudCLI.ps1 | 0 .../scripts/build}/Install-Haskell.ps1 | 0 .../scripts/build}/Install-IEWebDriver.ps1 | 0 .../scripts/build}/Install-JavaTools.ps1 | 0 .../scripts/build}/Install-Kotlin.ps1 | 0 .../build}/Install-KubernetesTools.ps1 | 0 .../scripts/build}/Install-LLVM.ps1 | 0 .../scripts/build}/Install-Mercurial.ps1 | 0 .../scripts/build}/Install-Mingw64.ps1 | 0 .../scripts/build}/Install-Miniconda.ps1 | 0 .../scripts/build}/Install-MongoDB.ps1 | 0 .../scripts/build}/Install-Msys2.ps1 | 0 .../scripts/build}/Install-MysqlCli.ps1 | 0 .../scripts/build}/Install-NET48-devpack.ps1 | 0 .../scripts/build}/Install-NET48.ps1 | 0 .../scripts/build}/Install-NSIS.ps1 | 0 .../scripts/build}/Install-Nginx.ps1 | 0 .../scripts/build}/Install-NodeLts.ps1 | 0 .../scripts/build}/Install-OpenSSL.ps1 | 0 .../scripts/build}/Install-PHP.ps1 | 0 .../scripts/build}/Install-Pipx.ps1 | 26 +- .../scripts/build}/Install-PipxPackages.ps1 | 22 +- .../scripts/build}/Install-PostgreSQL.ps1 | 0 .../build}/Install-PowerShellModules.ps1 | 52 +-- .../scripts/build}/Install-PowershellCore.ps1 | 0 .../scripts/build}/Install-PyPy.ps1 | 248 +++++++------- .../scripts/build}/Install-R.ps1 | 0 .../scripts/build}/Install-RootCA.ps1 | 0 .../scripts/build}/Install-Ruby.ps1 | 0 .../scripts/build}/Install-Runner.ps1 | 0 .../scripts/build}/Install-Rust.ps1 | 0 .../scripts/build}/Install-SQLOLEDBDriver.ps1 | 0 .../build}/Install-SQLPowerShellTools.ps1 | 0 .../scripts/build}/Install-Sbt.ps1 | 0 .../scripts/build}/Install-Selenium.ps1 | 0 .../build}/Install-ServiceFabricSDK.ps1 | 0 .../scripts/build}/Install-Stack.ps1 | 0 .../scripts/build}/Install-Toolset.ps1 | 114 +++---- .../scripts/build}/Install-VCRedist.ps1 | 0 .../scripts/build}/Install-VS.ps1 | 0 .../scripts/build}/Install-Vcpkg.ps1 | 0 .../scripts/build}/Install-Vsix.ps1 | 46 +-- .../scripts/build}/Install-WDK.ps1 | 0 .../build}/Install-WebPlatformInstaller.ps1 | 0 .../scripts/build}/Install-WinAppDriver.ps1 | 0 .../build}/Install-WindowsFeatures.ps1 | 0 .../scripts/build}/Install-WindowsUpdates.ps1 | 0 .../scripts/build}/Install-Wix.ps1 | 0 .../scripts/build}/Install-Zstd.ps1 | 0 .../scripts/build}/Run-NGen.ps1 | 10 +- .../scripts/build}/Update-DotnetTLS.ps1 | 0 .../scripts/build}/Update-ImageData.ps1 | 90 ++--- .../build}/Wait-WindowsUpdatesForInstall.ps1 | 0 .../scripts/build}/Warmup-User.ps1 | 0 .../docs-gen}/SoftwareReport.Android.psm1 | 0 .../docs-gen}/SoftwareReport.Browsers.psm1 | 0 .../docs-gen}/SoftwareReport.CachedTools.psm1 | 0 .../docs-gen}/SoftwareReport.Common.psm1 | 0 .../docs-gen}/SoftwareReport.Databases.psm1 | 64 ++-- .../docs-gen}/SoftwareReport.Generator.ps1 | 0 .../docs-gen}/SoftwareReport.Helpers.psm1 | 0 .../docs-gen}/SoftwareReport.Java.psm1 | 0 .../docs-gen}/SoftwareReport.Tools.psm1 | 0 .../SoftwareReport.VisualStudio.psm1 | 0 .../docs-gen}/SoftwareReport.WebServers.psm1 | 0 .../scripts/helpers}/ChocoHelpers.ps1 | 128 +++---- .../scripts/helpers}/ImageHelpers.psd1 | 214 ++++++------ .../scripts/helpers}/ImageHelpers.psm1 | 0 .../scripts/helpers}/InstallHelpers.ps1 | 0 .../scripts/helpers}/PathHelpers.ps1 | 0 .../scripts/helpers}/TestsHelpers.ps1 | 8 +- .../scripts/helpers}/VisualStudioHelpers.ps1 | 0 .../helpers}/test/ImageHelpers.Tests.ps1 | 0 .../helpers}/test/PathHelpers.Tests.ps1 | 0 .../tests}/ActionArchiveCache.Tests.ps1 | 0 .../scripts/tests}/Android.Tests.ps1 | 0 .../scripts/tests}/Apache.Tests.ps1 | 0 .../scripts/tests}/BizTalk.Tests.ps1 | 0 .../scripts/tests}/Browsers.Tests.ps1 | 318 +++++++++--------- .../scripts/tests}/CLI.Tools.Tests.ps1 | 0 .../scripts/tests}/ChocoPackages.Tests.ps1 | 0 .../scripts/tests}/Databases.Tests.ps1 | 0 .../scripts/tests}/Docker.Tests.ps1 | 0 .../scripts/tests}/DotnetSDK.Tests.ps1 | 0 .../scripts/tests}/Git.Tests.ps1 | 50 +-- .../scripts/tests}/Haskell.Tests.ps1 | 124 +++---- .../scripts/tests}/Java.Tests.ps1 | 0 .../scripts/tests}/LLVM.Tests.ps1 | 0 .../scripts/tests}/MSYS2.Tests.ps1 | 0 .../scripts/tests}/Miniconda.Tests.ps1 | 0 .../scripts/tests}/Nginx.Tests.ps1 | 0 .../scripts/tests}/Node.Tests.ps1 | 0 .../scripts/tests}/PHP.Tests.ps1 | 0 .../scripts/tests}/PipxPackages.Tests.ps1 | 0 .../tests}/PowerShellAzModules.Tests.ps1 | 0 .../tests}/PowerShellModules.Tests.ps1 | 0 .../scripts/tests}/RunAll-Tests.ps1 | 0 .../scripts/tests}/RunnerCache.tests.ps1 | 0 .../scripts/tests}/Rust.Tests.ps1 | 70 ++-- .../scripts/tests}/SSDTExtensions.Tests.ps1 | 0 .../scripts/tests}/Shell.Tests.ps1 | 0 .../scripts/tests}/Tools.Tests.ps1 | 0 .../scripts/tests}/Toolset.Tests.ps1 | 0 .../scripts/tests}/VisualStudio.Tests.ps1 | 0 .../scripts/tests}/Vsix.Tests.ps1 | 38 +-- .../scripts/tests}/WDK.Tests.ps1 | 0 .../scripts/tests}/WinAppDriver.Tests.ps1 | 0 .../scripts/tests}/WindowsFeatures.Tests.ps1 | 0 .../scripts/tests}/Wix.Tests.ps1 | 0 .../templates/windows-2019.json} | 227 ++++++------- .../templates/windows-2022.json} | 215 ++++++------ .../toolsets/toolset-2019.json | 0 .../toolsets/toolset-2022.json | 0 165 files changed, 1146 insertions(+), 1139 deletions(-) delete mode 100644 images/win/scripts/README.md rename images/{win => windows}/Windows2019-Readme.md (100%) rename images/{win => windows}/Windows2022-Readme.md (100%) rename images/{win/post-generation => windows/assets/post-gen}/GenerateIISExpressCertificate.ps1 (100%) rename images/{win/post-generation => windows/assets/post-gen}/InternetExplorerConfiguration.ps1 (100%) rename images/{win/post-generation => windows/assets/post-gen}/Msys2FirstLaunch.ps1 (100%) rename images/{win/post-generation => windows/assets/post-gen}/VSConfiguration.ps1 (97%) rename images/{win/post-generation => windows/assets/post-gen}/warmup.vdproj (100%) rename images/{win/scripts/Installers => windows/scripts/build}/Configure-Antivirus.ps1 (100%) rename images/{win/scripts/Installers => windows/scripts/build}/Configure-DynamicPort.ps1 (98%) rename images/{win/scripts/Installers => windows/scripts/build}/Configure-GDIProcessHandleQuota.ps1 (100%) rename images/{win/scripts/Installers => windows/scripts/build}/Configure-PowerShell.ps1 (100%) rename images/{win/scripts/Installers => windows/scripts/build}/Configure-Shell.ps1 (100%) rename images/{win/scripts/Installers => windows/scripts/build}/Configure-Toolset.ps1 (100%) rename images/{win/scripts/Installers => windows/scripts/build}/Disable-JITDebugger.ps1 (98%) rename images/{win/scripts/Installers => windows/scripts/build}/Enable-DeveloperMode.ps1 (100%) rename images/{win/scripts/Installers => windows/scripts/build}/Finalize-VM.ps1 (100%) rename images/{win/scripts/Installers => windows/scripts/build}/Initialize-VM.ps1 (100%) rename images/{win/scripts/Installers => windows/scripts/build}/Install-AWS.ps1 (100%) rename images/{win/scripts/Installers => windows/scripts/build}/Install-ActionArchiveCache.ps1 (100%) rename images/{win/scripts/Installers => windows/scripts/build}/Install-AliyunCli.ps1 (98%) rename images/{win/scripts/Installers => windows/scripts/build}/Install-AndroidSDK.ps1 (100%) rename images/{win/scripts/Installers => windows/scripts/build}/Install-Apache.ps1 (100%) rename images/{win/scripts/Installers => windows/scripts/build}/Install-AzureCli.ps1 (100%) rename images/{win/scripts/Installers => windows/scripts/build}/Install-AzureCosmosDbEmulator.ps1 (100%) rename images/{win/scripts/Installers => windows/scripts/build}/Install-AzureDevOpsCli.ps1 (100%) rename images/{win/scripts/Installers => windows/scripts/build}/Install-AzureModules.ps1 (100%) rename images/{win/scripts/Installers => windows/scripts/build}/Install-Bazel.ps1 (97%) rename images/{win/scripts/Installers => windows/scripts/build}/Install-BizTalkBuildComponent.ps1 (100%) rename images/{win/scripts/Installers => windows/scripts/build}/Install-Choco.ps1 (100%) rename images/{win/scripts/Installers => windows/scripts/build}/Install-Chrome.ps1 (100%) rename images/{win/scripts/Installers => windows/scripts/build}/Install-CloudFoundryCli.ps1 (100%) rename images/{win/scripts/Installers => windows/scripts/build}/Install-CodeQLBundle.ps1 (100%) rename images/{win/scripts/Installers => windows/scripts/build}/Install-CommonUtils.ps1 (100%) rename images/{win/scripts/Installers => windows/scripts/build}/Install-DACFx.ps1 (100%) rename images/{win/scripts/Installers => windows/scripts/build}/Install-Docker-Compose.ps1 (100%) rename images/{win/scripts/Installers => windows/scripts/build}/Install-Docker-WinCred.ps1 (100%) rename images/{win/scripts/Installers => windows/scripts/build}/Install-Docker.ps1 (100%) rename images/{win/scripts/Installers => windows/scripts/build}/Install-DotnetSDK.ps1 (100%) rename images/{win/scripts/Installers => windows/scripts/build}/Install-Edge.ps1 (100%) rename images/{win/scripts/Installers => windows/scripts/build}/Install-Firefox.ps1 (100%) rename images/{win/scripts/Installers => windows/scripts/build}/Install-Git.ps1 (100%) rename images/{win/scripts/Installers => windows/scripts/build}/Install-GitHub-CLI.ps1 (100%) rename images/{win/scripts/Installers => windows/scripts/build}/Install-GoogleCloudCLI.ps1 (100%) rename images/{win/scripts/Installers => windows/scripts/build}/Install-Haskell.ps1 (100%) rename images/{win/scripts/Installers => windows/scripts/build}/Install-IEWebDriver.ps1 (100%) rename images/{win/scripts/Installers => windows/scripts/build}/Install-JavaTools.ps1 (100%) rename images/{win/scripts/Installers => windows/scripts/build}/Install-Kotlin.ps1 (100%) rename images/{win/scripts/Installers => windows/scripts/build}/Install-KubernetesTools.ps1 (100%) rename images/{win/scripts/Installers => windows/scripts/build}/Install-LLVM.ps1 (100%) rename images/{win/scripts/Installers => windows/scripts/build}/Install-Mercurial.ps1 (100%) rename images/{win/scripts/Installers => windows/scripts/build}/Install-Mingw64.ps1 (100%) rename images/{win/scripts/Installers => windows/scripts/build}/Install-Miniconda.ps1 (100%) rename images/{win/scripts/Installers => windows/scripts/build}/Install-MongoDB.ps1 (100%) rename images/{win/scripts/Installers => windows/scripts/build}/Install-Msys2.ps1 (100%) rename images/{win/scripts/Installers => windows/scripts/build}/Install-MysqlCli.ps1 (100%) rename images/{win/scripts/Installers => windows/scripts/build}/Install-NET48-devpack.ps1 (100%) rename images/{win/scripts/Installers => windows/scripts/build}/Install-NET48.ps1 (100%) rename images/{win/scripts/Installers => windows/scripts/build}/Install-NSIS.ps1 (100%) rename images/{win/scripts/Installers => windows/scripts/build}/Install-Nginx.ps1 (100%) rename images/{win/scripts/Installers => windows/scripts/build}/Install-NodeLts.ps1 (100%) rename images/{win/scripts/Installers => windows/scripts/build}/Install-OpenSSL.ps1 (100%) rename images/{win/scripts/Installers => windows/scripts/build}/Install-PHP.ps1 (100%) rename images/{win/scripts/Installers => windows/scripts/build}/Install-Pipx.ps1 (97%) rename images/{win/scripts/Installers => windows/scripts/build}/Install-PipxPackages.ps1 (97%) rename images/{win/scripts/Installers => windows/scripts/build}/Install-PostgreSQL.ps1 (100%) rename images/{win/scripts/Installers => windows/scripts/build}/Install-PowerShellModules.ps1 (96%) rename images/{win/scripts/Installers => windows/scripts/build}/Install-PowershellCore.ps1 (100%) rename images/{win/scripts/Installers => windows/scripts/build}/Install-PyPy.ps1 (97%) rename images/{win/scripts/Installers => windows/scripts/build}/Install-R.ps1 (100%) rename images/{win/scripts/Installers => windows/scripts/build}/Install-RootCA.ps1 (100%) rename images/{win/scripts/Installers => windows/scripts/build}/Install-Ruby.ps1 (100%) rename images/{win/scripts/Installers => windows/scripts/build}/Install-Runner.ps1 (100%) rename images/{win/scripts/Installers => windows/scripts/build}/Install-Rust.ps1 (100%) rename images/{win/scripts/Installers => windows/scripts/build}/Install-SQLOLEDBDriver.ps1 (100%) rename images/{win/scripts/Installers => windows/scripts/build}/Install-SQLPowerShellTools.ps1 (100%) rename images/{win/scripts/Installers => windows/scripts/build}/Install-Sbt.ps1 (100%) rename images/{win/scripts/Installers => windows/scripts/build}/Install-Selenium.ps1 (100%) rename images/{win/scripts/Installers => windows/scripts/build}/Install-ServiceFabricSDK.ps1 (100%) rename images/{win/scripts/Installers => windows/scripts/build}/Install-Stack.ps1 (100%) rename images/{win/scripts/Installers => windows/scripts/build}/Install-Toolset.ps1 (97%) rename images/{win/scripts/Installers => windows/scripts/build}/Install-VCRedist.ps1 (100%) rename images/{win/scripts/Installers => windows/scripts/build}/Install-VS.ps1 (100%) rename images/{win/scripts/Installers => windows/scripts/build}/Install-Vcpkg.ps1 (100%) rename images/{win/scripts/Installers => windows/scripts/build}/Install-Vsix.ps1 (97%) rename images/{win/scripts/Installers => windows/scripts/build}/Install-WDK.ps1 (100%) rename images/{win/scripts/Installers => windows/scripts/build}/Install-WebPlatformInstaller.ps1 (100%) rename images/{win/scripts/Installers => windows/scripts/build}/Install-WinAppDriver.ps1 (100%) rename images/{win/scripts/Installers => windows/scripts/build}/Install-WindowsFeatures.ps1 (100%) rename images/{win/scripts/Installers => windows/scripts/build}/Install-WindowsUpdates.ps1 (100%) rename images/{win/scripts/Installers => windows/scripts/build}/Install-Wix.ps1 (100%) rename images/{win/scripts/Installers => windows/scripts/build}/Install-Zstd.ps1 (100%) rename images/{win/scripts/Installers => windows/scripts/build}/Run-NGen.ps1 (98%) rename images/{win/scripts/Installers => windows/scripts/build}/Update-DotnetTLS.ps1 (100%) rename images/{win/scripts/Installers => windows/scripts/build}/Update-ImageData.ps1 (62%) rename images/{win/scripts/Installers => windows/scripts/build}/Wait-WindowsUpdatesForInstall.ps1 (100%) rename images/{win/scripts/Installers => windows/scripts/build}/Warmup-User.ps1 (100%) rename images/{win/scripts/SoftwareReport => windows/scripts/docs-gen}/SoftwareReport.Android.psm1 (100%) rename images/{win/scripts/SoftwareReport => windows/scripts/docs-gen}/SoftwareReport.Browsers.psm1 (100%) rename images/{win/scripts/SoftwareReport => windows/scripts/docs-gen}/SoftwareReport.CachedTools.psm1 (100%) rename images/{win/scripts/SoftwareReport => windows/scripts/docs-gen}/SoftwareReport.Common.psm1 (100%) rename images/{win/scripts/SoftwareReport => windows/scripts/docs-gen}/SoftwareReport.Databases.psm1 (97%) rename images/{win/scripts/SoftwareReport => windows/scripts/docs-gen}/SoftwareReport.Generator.ps1 (100%) rename images/{win/scripts/SoftwareReport => windows/scripts/docs-gen}/SoftwareReport.Helpers.psm1 (100%) rename images/{win/scripts/SoftwareReport => windows/scripts/docs-gen}/SoftwareReport.Java.psm1 (100%) rename images/{win/scripts/SoftwareReport => windows/scripts/docs-gen}/SoftwareReport.Tools.psm1 (100%) rename images/{win/scripts/SoftwareReport => windows/scripts/docs-gen}/SoftwareReport.VisualStudio.psm1 (100%) rename images/{win/scripts/SoftwareReport => windows/scripts/docs-gen}/SoftwareReport.WebServers.psm1 (100%) rename images/{win/scripts/ImageHelpers => windows/scripts/helpers}/ChocoHelpers.ps1 (96%) rename images/{win/scripts/ImageHelpers => windows/scripts/helpers}/ImageHelpers.psd1 (97%) rename images/{win/scripts/ImageHelpers => windows/scripts/helpers}/ImageHelpers.psm1 (100%) rename images/{win/scripts/ImageHelpers => windows/scripts/helpers}/InstallHelpers.ps1 (100%) rename images/{win/scripts/ImageHelpers => windows/scripts/helpers}/PathHelpers.ps1 (100%) rename images/{win/scripts/ImageHelpers => windows/scripts/helpers}/TestsHelpers.ps1 (97%) rename images/{win/scripts/ImageHelpers => windows/scripts/helpers}/VisualStudioHelpers.ps1 (100%) rename images/{win/scripts/ImageHelpers => windows/scripts/helpers}/test/ImageHelpers.Tests.ps1 (100%) rename images/{win/scripts/ImageHelpers => windows/scripts/helpers}/test/PathHelpers.Tests.ps1 (100%) rename images/{win/scripts/Tests => windows/scripts/tests}/ActionArchiveCache.Tests.ps1 (100%) rename images/{win/scripts/Tests => windows/scripts/tests}/Android.Tests.ps1 (100%) rename images/{win/scripts/Tests => windows/scripts/tests}/Apache.Tests.ps1 (100%) rename images/{win/scripts/Tests => windows/scripts/tests}/BizTalk.Tests.ps1 (100%) rename images/{win/scripts/Tests => windows/scripts/tests}/Browsers.Tests.ps1 (97%) rename images/{win/scripts/Tests => windows/scripts/tests}/CLI.Tools.Tests.ps1 (100%) rename images/{win/scripts/Tests => windows/scripts/tests}/ChocoPackages.Tests.ps1 (100%) rename images/{win/scripts/Tests => windows/scripts/tests}/Databases.Tests.ps1 (100%) rename images/{win/scripts/Tests => windows/scripts/tests}/Docker.Tests.ps1 (100%) rename images/{win/scripts/Tests => windows/scripts/tests}/DotnetSDK.Tests.ps1 (100%) rename images/{win/scripts/Tests => windows/scripts/tests}/Git.Tests.ps1 (96%) rename images/{win/scripts/Tests => windows/scripts/tests}/Haskell.Tests.ps1 (97%) rename images/{win/scripts/Tests => windows/scripts/tests}/Java.Tests.ps1 (100%) rename images/{win/scripts/Tests => windows/scripts/tests}/LLVM.Tests.ps1 (100%) rename images/{win/scripts/Tests => windows/scripts/tests}/MSYS2.Tests.ps1 (100%) rename images/{win/scripts/Tests => windows/scripts/tests}/Miniconda.Tests.ps1 (100%) rename images/{win/scripts/Tests => windows/scripts/tests}/Nginx.Tests.ps1 (100%) rename images/{win/scripts/Tests => windows/scripts/tests}/Node.Tests.ps1 (100%) rename images/{win/scripts/Tests => windows/scripts/tests}/PHP.Tests.ps1 (100%) rename images/{win/scripts/Tests => windows/scripts/tests}/PipxPackages.Tests.ps1 (100%) rename images/{win/scripts/Tests => windows/scripts/tests}/PowerShellAzModules.Tests.ps1 (100%) rename images/{win/scripts/Tests => windows/scripts/tests}/PowerShellModules.Tests.ps1 (100%) rename images/{win/scripts/Tests => windows/scripts/tests}/RunAll-Tests.ps1 (100%) rename images/{win/scripts/Tests => windows/scripts/tests}/RunnerCache.tests.ps1 (100%) rename images/{win/scripts/Tests => windows/scripts/tests}/Rust.Tests.ps1 (97%) rename images/{win/scripts/Tests => windows/scripts/tests}/SSDTExtensions.Tests.ps1 (100%) rename images/{win/scripts/Tests => windows/scripts/tests}/Shell.Tests.ps1 (100%) rename images/{win/scripts/Tests => windows/scripts/tests}/Tools.Tests.ps1 (100%) rename images/{win/scripts/Tests => windows/scripts/tests}/Toolset.Tests.ps1 (100%) rename images/{win/scripts/Tests => windows/scripts/tests}/VisualStudio.Tests.ps1 (100%) rename images/{win/scripts/Tests => windows/scripts/tests}/Vsix.Tests.ps1 (97%) rename images/{win/scripts/Tests => windows/scripts/tests}/WDK.Tests.ps1 (100%) rename images/{win/scripts/Tests => windows/scripts/tests}/WinAppDriver.Tests.ps1 (100%) rename images/{win/scripts/Tests => windows/scripts/tests}/WindowsFeatures.Tests.ps1 (100%) rename images/{win/scripts/Tests => windows/scripts/tests}/Wix.Tests.ps1 (100%) rename images/{win/windows2019.json => windows/templates/windows-2019.json} (52%) rename images/{win/windows2022.json => windows/templates/windows-2022.json} (54%) rename images/{win => windows}/toolsets/toolset-2019.json (100%) rename images/{win => windows}/toolsets/toolset-2022.json (100%) diff --git a/.github/workflows/windows2019.yml b/.github/workflows/windows2019.yml index 72ba473399ce..0604f35726cb 100644 --- a/.github/workflows/windows2019.yml +++ b/.github/workflows/windows2019.yml @@ -5,7 +5,7 @@ on: pull_request_target: types: labeled paths: - - 'images/win/**' + - 'images/windows/**' defaults: run: diff --git a/.github/workflows/windows2022.yml b/.github/workflows/windows2022.yml index 0454811e293d..ae3a069bda32 100644 --- a/.github/workflows/windows2022.yml +++ b/.github/workflows/windows2022.yml @@ -5,7 +5,7 @@ on: pull_request_target: types: labeled paths: - - 'images/win/**' + - 'images/windows/**' defaults: run: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 1a874be807a3..8c72b54dcc23 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -34,18 +34,18 @@ Here are a few things you can do that will increase the likelihood of your pull - For every new tool add validation scripts and update software report script to make sure that it is included to documentation - If the tool is available in other platforms (macOS, Windows, Linux), make sure you include it in as many as possible. -- If installing a few versions of the tool, consider putting the list of versions in the corresponding `toolset.json` file. It will help other customers to configure their builds flexibly. See [toolset-windows-2019.json](images/win/toolsets/toolset-2019.json) as example. +- If installing a few versions of the tool, consider putting the list of versions in the corresponding `toolset.json` file. It will help other customers to configure their builds flexibly. See [toolset-windows-2019.json](images/windows/toolsets/toolset-2019.json) as example. - Use consistent naming across all files - Validation scripts should be simple and shouldn't change image content ### Windows -- Add a script that will install the tool and put the script in the `scripts/Installers` folder. -There are a bunch of helper functions that could simplify your code: `Choco-Install`, `Install-Binary`, `Install-VsixExtension`, `Start-DownloadWithRetry`, `Test-IsWin19`, `Test-IsWin22` (find the full list of helpers in [ImageHelpers.psm1](images/win/scripts/ImageHelpers/ImageHelpers.psm1)). -- Add a script that will validate the tool installation and put the script in the `scripts/Tests` folder. +- Add a script that will install the tool and put the script in the `scripts/build` folder. +There are a bunch of helper functions that could simplify your code: `Choco-Install`, `Install-Binary`, `Install-VsixExtension`, `Start-DownloadWithRetry`, `Test-IsWin19`, `Test-IsWin22` (find the full list of helpers in [ImageHelpers.psm1](images/windows/scripts/helpers/ImageHelpers.psm1)). +- Add a script that will validate the tool installation and put the script in the `scripts/tests` folder. We use [Pester v5](https://github.com/pester/pester) for validation scripts. If the tests for the tool are complex enough, create a separate `*.Tests.ps1`. Otherwise, use `Tools.Tests.ps1` for simple tests. Add `Invoke-PesterTests -TestFile <testFileName> [-TestName <describeName>]` at the end of the installation script to make sure that your tests will be run. -- Add changes to the software report generator `images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1`. The software report generator is used to generate an image's README file, e.g. [Windows2019-Readme.md](images/win/Windows2019-Readme.md) and uses [MarkdownPS](https://github.com/Sarafian/MarkdownPS). +- Add changes to the software report generator `images/windows/scripts/docs-gen/SoftwareReport.Generator.ps1`. The software report generator is used to generate an image's README file, e.g. [Windows2019-Readme.md](images/windows/Windows2019-Readme.md) and uses [MarkdownPS](https://github.com/Sarafian/MarkdownPS). ### Ubuntu diff --git a/README.md b/README.md index 2605cddceb23..cb4625b261a5 100644 --- a/README.md +++ b/README.md @@ -36,12 +36,11 @@ To build a VM machine from this repo's source, see the [instructions](docs/creat [ubuntu-22.04]: https://github.com/actions/runner-images/blob/main/images/linux/Ubuntu2204-Readme.md [ubuntu-20.04]: https://github.com/actions/runner-images/blob/main/images/linux/Ubuntu2004-Readme.md -[windows-2022]: https://github.com/actions/runner-images/blob/main/images/win/Windows2022-Readme.md -[windows-2019]: https://github.com/actions/runner-images/blob/main/images/win/Windows2019-Readme.md +[windows-2022]: https://github.com/actions/runner-images/blob/main/images/windows/Windows2022-Readme.md +[windows-2019]: https://github.com/actions/runner-images/blob/main/images/windows/Windows2019-Readme.md [macOS-11]: https://github.com/actions/runner-images/blob/main/images/macos/macos-11-Readme.md [macOS-12]: https://github.com/actions/runner-images/blob/main/images/macos/macos-12-Readme.md [macOS-13]: https://github.com/actions/runner-images/blob/main/images/macos/macos-13-Readme.md -[macOS-10.15]: https://github.com/actions/runner-images/blob/main/images/macos/macos-10.15-Readme.md [self-hosted runners]: https://help.github.com/en/actions/hosting-your-own-runners ## Announcements diff --git a/docs/create-image-and-azure-resources.md b/docs/create-image-and-azure-resources.md index a1f14ee7152b..57993feb6c3d 100644 --- a/docs/create-image-and-azure-resources.md +++ b/docs/create-image-and-azure-resources.md @@ -216,7 +216,7 @@ Where: - `InstallPassword` - password for the user used to install software (Windows only) - `Location` - location where resources will be created (e.g. "East US") - `ImageName` and `ImageResourceGroupName` - name of the resource group where managed image will be stored -- `TemplatePath` - path to the Packer template file (e.g. "images/win/windows2022.json") +- `TemplatePath` - path to the Packer template file (e.g. "images/windows/templates/windows-2022.json") ### Required variables @@ -269,9 +269,9 @@ Generated tool versions and details can be found in related projects: > :warning: These scripts are intended to run on a VM deployed in Azure -The user, created during the image generation, does not exist in the result image hence some configuration files related to the user's home directory need to be changed as well as the file permissions for some directories. Scripts for that are located in the `post-generation` folder in the repository: +The user, created during the image generation, does not exist in the result image hence some configuration files related to the user's home directory need to be changed as well as the file permissions for some directories. Scripts for that are located in the `post-gen` folder in the repository: -- Windows: <https://github.com/actions/runner-images/tree/main/images/win/post-generation> +- Windows: <https://github.com/actions/runner-images/tree/main/images/windows/assets/post-gen> - Linux: <https://github.com/actions/runner-images/tree/main/images/linux/post-generation> **Note:** The default user for Linux should have `sudo privileges`. diff --git a/helpers/GenerateResourcesAndImage.ps1 b/helpers/GenerateResourcesAndImage.ps1 index 5dd3b9ca0ea2..36528ad1bf5c 100644 --- a/helpers/GenerateResourcesAndImage.ps1 +++ b/helpers/GenerateResourcesAndImage.ps1 @@ -18,10 +18,10 @@ Function Get-PackerTemplatePath { switch ($ImageType) { ([ImageType]::Windows2019) { - $relativeTemplatePath = Join-Path "win" "windows2019.json" + $relativeTemplatePath = Join-Path "windows" "templates" "windows-2019.json" } ([ImageType]::Windows2022) { - $relativeTemplatePath = Join-Path "win" "windows2022.json" + $relativeTemplatePath = Join-Path "windows" "templates" "windows-2022.json" } ([ImageType]::Ubuntu2004) { $relativeTemplatePath = Join-Path "linux" "ubuntu2004.json" diff --git a/images.CI/linux-and-win/azure-pipelines/image-generation.yml b/images.CI/linux-and-win/azure-pipelines/image-generation.yml index 20954bdb8090..778ebb3cad44 100644 --- a/images.CI/linux-and-win/azure-pipelines/image-generation.yml +++ b/images.CI/linux-and-win/azure-pipelines/image-generation.yml @@ -12,6 +12,9 @@ parameters: - name: image_type type: string + - name: image_template_name + type: string + - name: image_readme_name type: string @@ -62,11 +65,17 @@ jobs: targetType: 'inline' script: | $ImageType = "${{ parameters.image_type }}" - $TemplateDirectoryName = if ($ImageType.StartsWith("ubuntu")) { "linux" } else { "win" } + $TemplateDirectoryName = if ($ImageType.StartsWith("ubuntu")) { "linux" } else { "windows/templates" } $TemplateDirectoryPath = Join-Path "images" $TemplateDirectoryName | Resolve-Path - $TemplatePath = Join-Path $TemplateDirectoryPath "$ImageType.pkr.hcl" - if ( -not (Test-Path $TemplatePath) ) { - $TemplatePath = Join-Path $TemplateDirectoryPath "$ImageType.json" + + $TemplateFileName = "${{ parameters.image_template_name }}" + if ($TemplateFileName) { + $TemplatePath = Join-Path $TemplateDirectoryPath $TemplateFileName + } else { + $TemplatePath = Join-Path $TemplateDirectoryPath "$ImageType.pkr.hcl" + if ( -not (Test-Path $TemplatePath) ) { + $TemplatePath = Join-Path $TemplateDirectoryPath "$ImageType.json" + } } Write-Host "##vso[task.setvariable variable=TemplateDirectoryPath;]$TemplateDirectoryPath" Write-Host "##vso[task.setvariable variable=TemplatePath;]$TemplatePath" @@ -104,8 +113,12 @@ jobs: inputs: targetType: 'inline' script: | - $readmePath = Join-Path "$(TemplateDirectoryPath)" "${{ parameters.image_readme_name }}" - $softwareReportPath = Join-Path "$(TemplateDirectoryPath)" "software-report.json" + $ImageType = "${{ parameters.image_type }}" + $rootDirectoryName = if ($ImageType.StartsWith("ubuntu")) { "linux" } else { "windows" } + $rootDirectoryPath = Join-Path "images" $rootDirectoryName | Resolve-Path + + $readmePath = Join-Path $rootDirectoryPath "${{ parameters.image_readme_name }}" + $softwareReportPath = Join-Path $rootDirectoryPath "software-report.json" Copy-Item -Path $readmePath -Destination "$(Build.ArtifactStagingDirectory)/" if (Test-Path $softwareReportPath) { diff --git a/images.CI/linux-and-win/azure-pipelines/windows2019.yml b/images.CI/linux-and-win/azure-pipelines/windows2019.yml index ccad8f882cdd..d81c173e0921 100644 --- a/images.CI/linux-and-win/azure-pipelines/windows2019.yml +++ b/images.CI/linux-and-win/azure-pipelines/windows2019.yml @@ -17,4 +17,5 @@ jobs: - template: image-generation.yml parameters: image_type: windows2019 - image_readme_name: Windows2019-Readme.md \ No newline at end of file + image_readme_name: Windows2019-Readme.md + image_template_name: windows-2019.json diff --git a/images.CI/linux-and-win/azure-pipelines/windows2022.yml b/images.CI/linux-and-win/azure-pipelines/windows2022.yml index 30dcfa3665b5..07e523563910 100644 --- a/images.CI/linux-and-win/azure-pipelines/windows2022.yml +++ b/images.CI/linux-and-win/azure-pipelines/windows2022.yml @@ -17,4 +17,5 @@ jobs: - template: image-generation.yml parameters: image_type: windows2022 - image_readme_name: Windows2022-Readme.md \ No newline at end of file + image_readme_name: Windows2022-Readme.md + image_template_name: windows-2022.json diff --git a/images/win/scripts/README.md b/images/win/scripts/README.md deleted file mode 100644 index 7204e5ff4fbf..000000000000 --- a/images/win/scripts/README.md +++ /dev/null @@ -1 +0,0 @@ -Common scripts for all Windows images regardless of Visual Studio or OS version diff --git a/images/win/Windows2019-Readme.md b/images/windows/Windows2019-Readme.md similarity index 100% rename from images/win/Windows2019-Readme.md rename to images/windows/Windows2019-Readme.md diff --git a/images/win/Windows2022-Readme.md b/images/windows/Windows2022-Readme.md similarity index 100% rename from images/win/Windows2022-Readme.md rename to images/windows/Windows2022-Readme.md diff --git a/images/win/post-generation/GenerateIISExpressCertificate.ps1 b/images/windows/assets/post-gen/GenerateIISExpressCertificate.ps1 similarity index 100% rename from images/win/post-generation/GenerateIISExpressCertificate.ps1 rename to images/windows/assets/post-gen/GenerateIISExpressCertificate.ps1 diff --git a/images/win/post-generation/InternetExplorerConfiguration.ps1 b/images/windows/assets/post-gen/InternetExplorerConfiguration.ps1 similarity index 100% rename from images/win/post-generation/InternetExplorerConfiguration.ps1 rename to images/windows/assets/post-gen/InternetExplorerConfiguration.ps1 diff --git a/images/win/post-generation/Msys2FirstLaunch.ps1 b/images/windows/assets/post-gen/Msys2FirstLaunch.ps1 similarity index 100% rename from images/win/post-generation/Msys2FirstLaunch.ps1 rename to images/windows/assets/post-gen/Msys2FirstLaunch.ps1 diff --git a/images/win/post-generation/VSConfiguration.ps1 b/images/windows/assets/post-gen/VSConfiguration.ps1 similarity index 97% rename from images/win/post-generation/VSConfiguration.ps1 rename to images/windows/assets/post-gen/VSConfiguration.ps1 index c21c8b2e55dc..99108897fc27 100644 --- a/images/win/post-generation/VSConfiguration.ps1 +++ b/images/windows/assets/post-gen/VSConfiguration.ps1 @@ -1,14 +1,14 @@ -$vsInstallRoot = (Get-VisualStudioInstance).InstallationPath -$devEnvPath = "$vsInstallRoot\Common7\IDE\devenv.exe" - -# Initialize Visual Studio Experimental Instance -# The Out-Null cmdlet is required to ensure PowerShell waits until the '/ResetSettings' command fully completes. -& "$devEnvPath" /RootSuffix Exp /ResetSettings General.vssettings /Command File.Exit | Out-Null - -cmd.exe /c "`"$devEnvPath`" /updateconfiguration" - -# -# https://github.com/actions/runner-images/issues/5301 -# -$warmup_vdproj = $(Join-Path $PSScriptRoot 'warmup.vdproj') -& "$devEnvPath" $warmup_vdproj /build Release | Out-Null +$vsInstallRoot = (Get-VisualStudioInstance).InstallationPath +$devEnvPath = "$vsInstallRoot\Common7\IDE\devenv.exe" + +# Initialize Visual Studio Experimental Instance +# The Out-Null cmdlet is required to ensure PowerShell waits until the '/ResetSettings' command fully completes. +& "$devEnvPath" /RootSuffix Exp /ResetSettings General.vssettings /Command File.Exit | Out-Null + +cmd.exe /c "`"$devEnvPath`" /updateconfiguration" + +# +# https://github.com/actions/runner-images/issues/5301 +# +$warmup_vdproj = $(Join-Path $PSScriptRoot 'warmup.vdproj') +& "$devEnvPath" $warmup_vdproj /build Release | Out-Null diff --git a/images/win/post-generation/warmup.vdproj b/images/windows/assets/post-gen/warmup.vdproj similarity index 100% rename from images/win/post-generation/warmup.vdproj rename to images/windows/assets/post-gen/warmup.vdproj diff --git a/images/win/scripts/Installers/Configure-Antivirus.ps1 b/images/windows/scripts/build/Configure-Antivirus.ps1 similarity index 100% rename from images/win/scripts/Installers/Configure-Antivirus.ps1 rename to images/windows/scripts/build/Configure-Antivirus.ps1 diff --git a/images/win/scripts/Installers/Configure-DynamicPort.ps1 b/images/windows/scripts/build/Configure-DynamicPort.ps1 similarity index 98% rename from images/win/scripts/Installers/Configure-DynamicPort.ps1 rename to images/windows/scripts/build/Configure-DynamicPort.ps1 index 88e8ae2039cb..39acdda45e8b 100644 --- a/images/win/scripts/Installers/Configure-DynamicPort.ps1 +++ b/images/windows/scripts/build/Configure-DynamicPort.ps1 @@ -1,14 +1,14 @@ -# https://support.microsoft.com/en-us/help/929851/the-default-dynamic-port-range-for-tcp-ip-has-changed-in-windows-vista -# The new default start port is 49152, and the new default end port is 65535. -# Default port configuration was changed during image generation by Visual Studio Enterprise Installer to: -# Protocol tcp Dynamic Port Range -# --------------------------------- -# Start Port : 1024 -# Number of Ports : 64511 -Write-Host "Set the dynamic port range to start at port 49152 and to end at the 65536 (16384 ports)" -$null = netsh int ipv4 set dynamicport tcp start=49152 num=16384 -$null = netsh int ipv4 set dynamicport udp start=49152 num=16384 -$null = netsh int ipv6 set dynamicport tcp start=49152 num=16384 -$null = netsh int ipv6 set dynamicport udp start=49152 num=16384 - +# https://support.microsoft.com/en-us/help/929851/the-default-dynamic-port-range-for-tcp-ip-has-changed-in-windows-vista +# The new default start port is 49152, and the new default end port is 65535. +# Default port configuration was changed during image generation by Visual Studio Enterprise Installer to: +# Protocol tcp Dynamic Port Range +# --------------------------------- +# Start Port : 1024 +# Number of Ports : 64511 +Write-Host "Set the dynamic port range to start at port 49152 and to end at the 65536 (16384 ports)" +$null = netsh int ipv4 set dynamicport tcp start=49152 num=16384 +$null = netsh int ipv4 set dynamicport udp start=49152 num=16384 +$null = netsh int ipv6 set dynamicport tcp start=49152 num=16384 +$null = netsh int ipv6 set dynamicport udp start=49152 num=16384 + Invoke-PesterTests -TestFile "WindowsFeatures" -TestName "DynamicPorts" \ No newline at end of file diff --git a/images/win/scripts/Installers/Configure-GDIProcessHandleQuota.ps1 b/images/windows/scripts/build/Configure-GDIProcessHandleQuota.ps1 similarity index 100% rename from images/win/scripts/Installers/Configure-GDIProcessHandleQuota.ps1 rename to images/windows/scripts/build/Configure-GDIProcessHandleQuota.ps1 diff --git a/images/win/scripts/Installers/Configure-PowerShell.ps1 b/images/windows/scripts/build/Configure-PowerShell.ps1 similarity index 100% rename from images/win/scripts/Installers/Configure-PowerShell.ps1 rename to images/windows/scripts/build/Configure-PowerShell.ps1 diff --git a/images/win/scripts/Installers/Configure-Shell.ps1 b/images/windows/scripts/build/Configure-Shell.ps1 similarity index 100% rename from images/win/scripts/Installers/Configure-Shell.ps1 rename to images/windows/scripts/build/Configure-Shell.ps1 diff --git a/images/win/scripts/Installers/Configure-Toolset.ps1 b/images/windows/scripts/build/Configure-Toolset.ps1 similarity index 100% rename from images/win/scripts/Installers/Configure-Toolset.ps1 rename to images/windows/scripts/build/Configure-Toolset.ps1 diff --git a/images/win/scripts/Installers/Disable-JITDebugger.ps1 b/images/windows/scripts/build/Disable-JITDebugger.ps1 similarity index 98% rename from images/win/scripts/Installers/Disable-JITDebugger.ps1 rename to images/windows/scripts/build/Disable-JITDebugger.ps1 index 1ae5d21bc7bc..b500a2946865 100644 --- a/images/win/scripts/Installers/Disable-JITDebugger.ps1 +++ b/images/windows/scripts/build/Disable-JITDebugger.ps1 @@ -1,16 +1,16 @@ -Write-Host "Disable Just-In-Time Debugger" - -# Turn off Application Error Debugger -New-ItemProperty -Path "HKLM:\SOFTWARE\Microsoft\Windows NT\CurrentVersion\AeDebug" -Name Debugger -Value "-" -Type String -Force -New-ItemProperty -Path "HKLM:\SOFTWARE\WOW6432Node\Microsoft\Windows NT\CurrentVersion\AeDebug" -Name Debugger -Value "-" -Type String -Force - -# Turn off the Debug dialog -New-ItemProperty -Path "HKLM:\SOFTWARE\Microsoft\.NETFramework" -Name DbgManagedDebugger -Value "-" -Type String -Force -New-ItemProperty -Path "HKLM:\SOFTWARE\WOW6432Node\Microsoft\.NETFramework" -Name DbgManagedDebugger -Value "-" -Type String -Force - -# Disable the WER UI -New-ItemProperty -Path "HKLM:\SOFTWARE\Microsoft\Windows\Windows Error Reporting" -Name DontShowUI -Value 1 -Type DWORD -Force -# Send all reports to the user's queue -New-ItemProperty -Path "HKLM:\SOFTWARE\Microsoft\Windows\Windows Error Reporting" -Name ForceQueue -Value 1 -Type DWORD -Force -# Default consent choice 1 - Always ask (default) +Write-Host "Disable Just-In-Time Debugger" + +# Turn off Application Error Debugger +New-ItemProperty -Path "HKLM:\SOFTWARE\Microsoft\Windows NT\CurrentVersion\AeDebug" -Name Debugger -Value "-" -Type String -Force +New-ItemProperty -Path "HKLM:\SOFTWARE\WOW6432Node\Microsoft\Windows NT\CurrentVersion\AeDebug" -Name Debugger -Value "-" -Type String -Force + +# Turn off the Debug dialog +New-ItemProperty -Path "HKLM:\SOFTWARE\Microsoft\.NETFramework" -Name DbgManagedDebugger -Value "-" -Type String -Force +New-ItemProperty -Path "HKLM:\SOFTWARE\WOW6432Node\Microsoft\.NETFramework" -Name DbgManagedDebugger -Value "-" -Type String -Force + +# Disable the WER UI +New-ItemProperty -Path "HKLM:\SOFTWARE\Microsoft\Windows\Windows Error Reporting" -Name DontShowUI -Value 1 -Type DWORD -Force +# Send all reports to the user's queue +New-ItemProperty -Path "HKLM:\SOFTWARE\Microsoft\Windows\Windows Error Reporting" -Name ForceQueue -Value 1 -Type DWORD -Force +# Default consent choice 1 - Always ask (default) New-ItemProperty -Path "HKLM:\SOFTWARE\Microsoft\Windows\Windows Error Reporting\Consent" -Name DefaultConsent -Value 1 -Type DWORD -Force \ No newline at end of file diff --git a/images/win/scripts/Installers/Enable-DeveloperMode.ps1 b/images/windows/scripts/build/Enable-DeveloperMode.ps1 similarity index 100% rename from images/win/scripts/Installers/Enable-DeveloperMode.ps1 rename to images/windows/scripts/build/Enable-DeveloperMode.ps1 diff --git a/images/win/scripts/Installers/Finalize-VM.ps1 b/images/windows/scripts/build/Finalize-VM.ps1 similarity index 100% rename from images/win/scripts/Installers/Finalize-VM.ps1 rename to images/windows/scripts/build/Finalize-VM.ps1 diff --git a/images/win/scripts/Installers/Initialize-VM.ps1 b/images/windows/scripts/build/Initialize-VM.ps1 similarity index 100% rename from images/win/scripts/Installers/Initialize-VM.ps1 rename to images/windows/scripts/build/Initialize-VM.ps1 diff --git a/images/win/scripts/Installers/Install-AWS.ps1 b/images/windows/scripts/build/Install-AWS.ps1 similarity index 100% rename from images/win/scripts/Installers/Install-AWS.ps1 rename to images/windows/scripts/build/Install-AWS.ps1 diff --git a/images/win/scripts/Installers/Install-ActionArchiveCache.ps1 b/images/windows/scripts/build/Install-ActionArchiveCache.ps1 similarity index 100% rename from images/win/scripts/Installers/Install-ActionArchiveCache.ps1 rename to images/windows/scripts/build/Install-ActionArchiveCache.ps1 diff --git a/images/win/scripts/Installers/Install-AliyunCli.ps1 b/images/windows/scripts/build/Install-AliyunCli.ps1 similarity index 98% rename from images/win/scripts/Installers/Install-AliyunCli.ps1 rename to images/windows/scripts/build/Install-AliyunCli.ps1 index 9aef5955aeb3..97f7c3711b3e 100644 --- a/images/win/scripts/Installers/Install-AliyunCli.ps1 +++ b/images/windows/scripts/build/Install-AliyunCli.ps1 @@ -1,29 +1,29 @@ -################################################################################ -## File: Install-AliyunCli.ps1 -## Desc: Install Alibaba Cloud CLI -## Supply chain security: Alibaba Cloud CLI - checksum validation -################################################################################ - -Write-Host "Download Latest aliyun-cli archive" -$repoUrl = "https://api.github.com/repos/aliyun/aliyun-cli/releases/latest" -$installerFileName = "aliyun-cli-windows" -$assets = (Invoke-RestMethod -Uri $repoUrl).assets -$downloadUrl = ($assets.browser_download_url -ilike "*aliyun-cli-windows-*-amd64.zip*") | Select-Object -First 1 -$packagePath = Start-DownloadWithRetry -Url $downloadUrl -Name "$installerFileName.zip" - -#region Supply chain security - Alibaba Cloud CLI -$fileHash = (Get-FileHash -Path $packagePath -Algorithm SHA256).Hash -$hashUrl = ($assets.browser_download_url -ilike "*SHASUMS256.txt*") | Select-Object -First 1 -$externalHash = (Invoke-RestMethod -Uri $hashURL).ToString().Split("`n").Where({ $_ -ilike "*$installerFileName*" }).Split(' ')[0] -Use-ChecksumComparison $fileHash $externalHash -#endregion - -Write-Host "Expand aliyun-cli archive" -$aliyunPath = "C:\aliyun-cli" -New-Item -Path $aliyunPath -ItemType Directory -Force -Extract-7Zip -Path $packagePath -DestinationPath $aliyunPath - -# Add aliyun-cli to path -Add-MachinePathItem $aliyunPath - -Invoke-PesterTests -TestFile "CLI.Tools" -TestName "Aliyun CLI" +################################################################################ +## File: Install-AliyunCli.ps1 +## Desc: Install Alibaba Cloud CLI +## Supply chain security: Alibaba Cloud CLI - checksum validation +################################################################################ + +Write-Host "Download Latest aliyun-cli archive" +$repoUrl = "https://api.github.com/repos/aliyun/aliyun-cli/releases/latest" +$installerFileName = "aliyun-cli-windows" +$assets = (Invoke-RestMethod -Uri $repoUrl).assets +$downloadUrl = ($assets.browser_download_url -ilike "*aliyun-cli-windows-*-amd64.zip*") | Select-Object -First 1 +$packagePath = Start-DownloadWithRetry -Url $downloadUrl -Name "$installerFileName.zip" + +#region Supply chain security - Alibaba Cloud CLI +$fileHash = (Get-FileHash -Path $packagePath -Algorithm SHA256).Hash +$hashUrl = ($assets.browser_download_url -ilike "*SHASUMS256.txt*") | Select-Object -First 1 +$externalHash = (Invoke-RestMethod -Uri $hashURL).ToString().Split("`n").Where({ $_ -ilike "*$installerFileName*" }).Split(' ')[0] +Use-ChecksumComparison $fileHash $externalHash +#endregion + +Write-Host "Expand aliyun-cli archive" +$aliyunPath = "C:\aliyun-cli" +New-Item -Path $aliyunPath -ItemType Directory -Force +Extract-7Zip -Path $packagePath -DestinationPath $aliyunPath + +# Add aliyun-cli to path +Add-MachinePathItem $aliyunPath + +Invoke-PesterTests -TestFile "CLI.Tools" -TestName "Aliyun CLI" diff --git a/images/win/scripts/Installers/Install-AndroidSDK.ps1 b/images/windows/scripts/build/Install-AndroidSDK.ps1 similarity index 100% rename from images/win/scripts/Installers/Install-AndroidSDK.ps1 rename to images/windows/scripts/build/Install-AndroidSDK.ps1 diff --git a/images/win/scripts/Installers/Install-Apache.ps1 b/images/windows/scripts/build/Install-Apache.ps1 similarity index 100% rename from images/win/scripts/Installers/Install-Apache.ps1 rename to images/windows/scripts/build/Install-Apache.ps1 diff --git a/images/win/scripts/Installers/Install-AzureCli.ps1 b/images/windows/scripts/build/Install-AzureCli.ps1 similarity index 100% rename from images/win/scripts/Installers/Install-AzureCli.ps1 rename to images/windows/scripts/build/Install-AzureCli.ps1 diff --git a/images/win/scripts/Installers/Install-AzureCosmosDbEmulator.ps1 b/images/windows/scripts/build/Install-AzureCosmosDbEmulator.ps1 similarity index 100% rename from images/win/scripts/Installers/Install-AzureCosmosDbEmulator.ps1 rename to images/windows/scripts/build/Install-AzureCosmosDbEmulator.ps1 diff --git a/images/win/scripts/Installers/Install-AzureDevOpsCli.ps1 b/images/windows/scripts/build/Install-AzureDevOpsCli.ps1 similarity index 100% rename from images/win/scripts/Installers/Install-AzureDevOpsCli.ps1 rename to images/windows/scripts/build/Install-AzureDevOpsCli.ps1 diff --git a/images/win/scripts/Installers/Install-AzureModules.ps1 b/images/windows/scripts/build/Install-AzureModules.ps1 similarity index 100% rename from images/win/scripts/Installers/Install-AzureModules.ps1 rename to images/windows/scripts/build/Install-AzureModules.ps1 diff --git a/images/win/scripts/Installers/Install-Bazel.ps1 b/images/windows/scripts/build/Install-Bazel.ps1 similarity index 97% rename from images/win/scripts/Installers/Install-Bazel.ps1 rename to images/windows/scripts/build/Install-Bazel.ps1 index 7d5479fdfe5c..61dd94ee632d 100644 --- a/images/win/scripts/Installers/Install-Bazel.ps1 +++ b/images/windows/scripts/build/Install-Bazel.ps1 @@ -1,10 +1,10 @@ -################################################################################ -## File: Install-Bazel.ps1 -## Desc: Install Bazel and Bazelisk (A user-friendly launcher for Bazel) -################################################################################ - -Choco-Install -PackageName bazel - -npm install -g @bazel/bazelisk - +################################################################################ +## File: Install-Bazel.ps1 +## Desc: Install Bazel and Bazelisk (A user-friendly launcher for Bazel) +################################################################################ + +Choco-Install -PackageName bazel + +npm install -g @bazel/bazelisk + Invoke-PesterTests -TestFile "Tools" -TestName "Bazel" \ No newline at end of file diff --git a/images/win/scripts/Installers/Install-BizTalkBuildComponent.ps1 b/images/windows/scripts/build/Install-BizTalkBuildComponent.ps1 similarity index 100% rename from images/win/scripts/Installers/Install-BizTalkBuildComponent.ps1 rename to images/windows/scripts/build/Install-BizTalkBuildComponent.ps1 diff --git a/images/win/scripts/Installers/Install-Choco.ps1 b/images/windows/scripts/build/Install-Choco.ps1 similarity index 100% rename from images/win/scripts/Installers/Install-Choco.ps1 rename to images/windows/scripts/build/Install-Choco.ps1 diff --git a/images/win/scripts/Installers/Install-Chrome.ps1 b/images/windows/scripts/build/Install-Chrome.ps1 similarity index 100% rename from images/win/scripts/Installers/Install-Chrome.ps1 rename to images/windows/scripts/build/Install-Chrome.ps1 diff --git a/images/win/scripts/Installers/Install-CloudFoundryCli.ps1 b/images/windows/scripts/build/Install-CloudFoundryCli.ps1 similarity index 100% rename from images/win/scripts/Installers/Install-CloudFoundryCli.ps1 rename to images/windows/scripts/build/Install-CloudFoundryCli.ps1 diff --git a/images/win/scripts/Installers/Install-CodeQLBundle.ps1 b/images/windows/scripts/build/Install-CodeQLBundle.ps1 similarity index 100% rename from images/win/scripts/Installers/Install-CodeQLBundle.ps1 rename to images/windows/scripts/build/Install-CodeQLBundle.ps1 diff --git a/images/win/scripts/Installers/Install-CommonUtils.ps1 b/images/windows/scripts/build/Install-CommonUtils.ps1 similarity index 100% rename from images/win/scripts/Installers/Install-CommonUtils.ps1 rename to images/windows/scripts/build/Install-CommonUtils.ps1 diff --git a/images/win/scripts/Installers/Install-DACFx.ps1 b/images/windows/scripts/build/Install-DACFx.ps1 similarity index 100% rename from images/win/scripts/Installers/Install-DACFx.ps1 rename to images/windows/scripts/build/Install-DACFx.ps1 diff --git a/images/win/scripts/Installers/Install-Docker-Compose.ps1 b/images/windows/scripts/build/Install-Docker-Compose.ps1 similarity index 100% rename from images/win/scripts/Installers/Install-Docker-Compose.ps1 rename to images/windows/scripts/build/Install-Docker-Compose.ps1 diff --git a/images/win/scripts/Installers/Install-Docker-WinCred.ps1 b/images/windows/scripts/build/Install-Docker-WinCred.ps1 similarity index 100% rename from images/win/scripts/Installers/Install-Docker-WinCred.ps1 rename to images/windows/scripts/build/Install-Docker-WinCred.ps1 diff --git a/images/win/scripts/Installers/Install-Docker.ps1 b/images/windows/scripts/build/Install-Docker.ps1 similarity index 100% rename from images/win/scripts/Installers/Install-Docker.ps1 rename to images/windows/scripts/build/Install-Docker.ps1 diff --git a/images/win/scripts/Installers/Install-DotnetSDK.ps1 b/images/windows/scripts/build/Install-DotnetSDK.ps1 similarity index 100% rename from images/win/scripts/Installers/Install-DotnetSDK.ps1 rename to images/windows/scripts/build/Install-DotnetSDK.ps1 diff --git a/images/win/scripts/Installers/Install-Edge.ps1 b/images/windows/scripts/build/Install-Edge.ps1 similarity index 100% rename from images/win/scripts/Installers/Install-Edge.ps1 rename to images/windows/scripts/build/Install-Edge.ps1 diff --git a/images/win/scripts/Installers/Install-Firefox.ps1 b/images/windows/scripts/build/Install-Firefox.ps1 similarity index 100% rename from images/win/scripts/Installers/Install-Firefox.ps1 rename to images/windows/scripts/build/Install-Firefox.ps1 diff --git a/images/win/scripts/Installers/Install-Git.ps1 b/images/windows/scripts/build/Install-Git.ps1 similarity index 100% rename from images/win/scripts/Installers/Install-Git.ps1 rename to images/windows/scripts/build/Install-Git.ps1 diff --git a/images/win/scripts/Installers/Install-GitHub-CLI.ps1 b/images/windows/scripts/build/Install-GitHub-CLI.ps1 similarity index 100% rename from images/win/scripts/Installers/Install-GitHub-CLI.ps1 rename to images/windows/scripts/build/Install-GitHub-CLI.ps1 diff --git a/images/win/scripts/Installers/Install-GoogleCloudCLI.ps1 b/images/windows/scripts/build/Install-GoogleCloudCLI.ps1 similarity index 100% rename from images/win/scripts/Installers/Install-GoogleCloudCLI.ps1 rename to images/windows/scripts/build/Install-GoogleCloudCLI.ps1 diff --git a/images/win/scripts/Installers/Install-Haskell.ps1 b/images/windows/scripts/build/Install-Haskell.ps1 similarity index 100% rename from images/win/scripts/Installers/Install-Haskell.ps1 rename to images/windows/scripts/build/Install-Haskell.ps1 diff --git a/images/win/scripts/Installers/Install-IEWebDriver.ps1 b/images/windows/scripts/build/Install-IEWebDriver.ps1 similarity index 100% rename from images/win/scripts/Installers/Install-IEWebDriver.ps1 rename to images/windows/scripts/build/Install-IEWebDriver.ps1 diff --git a/images/win/scripts/Installers/Install-JavaTools.ps1 b/images/windows/scripts/build/Install-JavaTools.ps1 similarity index 100% rename from images/win/scripts/Installers/Install-JavaTools.ps1 rename to images/windows/scripts/build/Install-JavaTools.ps1 diff --git a/images/win/scripts/Installers/Install-Kotlin.ps1 b/images/windows/scripts/build/Install-Kotlin.ps1 similarity index 100% rename from images/win/scripts/Installers/Install-Kotlin.ps1 rename to images/windows/scripts/build/Install-Kotlin.ps1 diff --git a/images/win/scripts/Installers/Install-KubernetesTools.ps1 b/images/windows/scripts/build/Install-KubernetesTools.ps1 similarity index 100% rename from images/win/scripts/Installers/Install-KubernetesTools.ps1 rename to images/windows/scripts/build/Install-KubernetesTools.ps1 diff --git a/images/win/scripts/Installers/Install-LLVM.ps1 b/images/windows/scripts/build/Install-LLVM.ps1 similarity index 100% rename from images/win/scripts/Installers/Install-LLVM.ps1 rename to images/windows/scripts/build/Install-LLVM.ps1 diff --git a/images/win/scripts/Installers/Install-Mercurial.ps1 b/images/windows/scripts/build/Install-Mercurial.ps1 similarity index 100% rename from images/win/scripts/Installers/Install-Mercurial.ps1 rename to images/windows/scripts/build/Install-Mercurial.ps1 diff --git a/images/win/scripts/Installers/Install-Mingw64.ps1 b/images/windows/scripts/build/Install-Mingw64.ps1 similarity index 100% rename from images/win/scripts/Installers/Install-Mingw64.ps1 rename to images/windows/scripts/build/Install-Mingw64.ps1 diff --git a/images/win/scripts/Installers/Install-Miniconda.ps1 b/images/windows/scripts/build/Install-Miniconda.ps1 similarity index 100% rename from images/win/scripts/Installers/Install-Miniconda.ps1 rename to images/windows/scripts/build/Install-Miniconda.ps1 diff --git a/images/win/scripts/Installers/Install-MongoDB.ps1 b/images/windows/scripts/build/Install-MongoDB.ps1 similarity index 100% rename from images/win/scripts/Installers/Install-MongoDB.ps1 rename to images/windows/scripts/build/Install-MongoDB.ps1 diff --git a/images/win/scripts/Installers/Install-Msys2.ps1 b/images/windows/scripts/build/Install-Msys2.ps1 similarity index 100% rename from images/win/scripts/Installers/Install-Msys2.ps1 rename to images/windows/scripts/build/Install-Msys2.ps1 diff --git a/images/win/scripts/Installers/Install-MysqlCli.ps1 b/images/windows/scripts/build/Install-MysqlCli.ps1 similarity index 100% rename from images/win/scripts/Installers/Install-MysqlCli.ps1 rename to images/windows/scripts/build/Install-MysqlCli.ps1 diff --git a/images/win/scripts/Installers/Install-NET48-devpack.ps1 b/images/windows/scripts/build/Install-NET48-devpack.ps1 similarity index 100% rename from images/win/scripts/Installers/Install-NET48-devpack.ps1 rename to images/windows/scripts/build/Install-NET48-devpack.ps1 diff --git a/images/win/scripts/Installers/Install-NET48.ps1 b/images/windows/scripts/build/Install-NET48.ps1 similarity index 100% rename from images/win/scripts/Installers/Install-NET48.ps1 rename to images/windows/scripts/build/Install-NET48.ps1 diff --git a/images/win/scripts/Installers/Install-NSIS.ps1 b/images/windows/scripts/build/Install-NSIS.ps1 similarity index 100% rename from images/win/scripts/Installers/Install-NSIS.ps1 rename to images/windows/scripts/build/Install-NSIS.ps1 diff --git a/images/win/scripts/Installers/Install-Nginx.ps1 b/images/windows/scripts/build/Install-Nginx.ps1 similarity index 100% rename from images/win/scripts/Installers/Install-Nginx.ps1 rename to images/windows/scripts/build/Install-Nginx.ps1 diff --git a/images/win/scripts/Installers/Install-NodeLts.ps1 b/images/windows/scripts/build/Install-NodeLts.ps1 similarity index 100% rename from images/win/scripts/Installers/Install-NodeLts.ps1 rename to images/windows/scripts/build/Install-NodeLts.ps1 diff --git a/images/win/scripts/Installers/Install-OpenSSL.ps1 b/images/windows/scripts/build/Install-OpenSSL.ps1 similarity index 100% rename from images/win/scripts/Installers/Install-OpenSSL.ps1 rename to images/windows/scripts/build/Install-OpenSSL.ps1 diff --git a/images/win/scripts/Installers/Install-PHP.ps1 b/images/windows/scripts/build/Install-PHP.ps1 similarity index 100% rename from images/win/scripts/Installers/Install-PHP.ps1 rename to images/windows/scripts/build/Install-PHP.ps1 diff --git a/images/win/scripts/Installers/Install-Pipx.ps1 b/images/windows/scripts/build/Install-Pipx.ps1 similarity index 97% rename from images/win/scripts/Installers/Install-Pipx.ps1 rename to images/windows/scripts/build/Install-Pipx.ps1 index a78cf456b3c9..b3e85f4f2b84 100644 --- a/images/win/scripts/Installers/Install-Pipx.ps1 +++ b/images/windows/scripts/build/Install-Pipx.ps1 @@ -1,14 +1,14 @@ -# Set custom directorys for pipx -$env:PIPX_BIN_DIR = "${env:ProgramFiles(x86)}\pipx_bin" -$env:PIPX_HOME = "${env:ProgramFiles(x86)}\pipx" - -# Install pipx -pip install pipx - -# Set environment variables -Add-MachinePathItem "${env:PIPX_BIN_DIR}" -Set-SystemVariable -SystemVariable PIPX_BIN_DIR -Value $env:PIPX_BIN_DIR -Set-SystemVariable -SystemVariable PIPX_HOME -Value $env:PIPX_HOME - -# Test pipx +# Set custom directorys for pipx +$env:PIPX_BIN_DIR = "${env:ProgramFiles(x86)}\pipx_bin" +$env:PIPX_HOME = "${env:ProgramFiles(x86)}\pipx" + +# Install pipx +pip install pipx + +# Set environment variables +Add-MachinePathItem "${env:PIPX_BIN_DIR}" +Set-SystemVariable -SystemVariable PIPX_BIN_DIR -Value $env:PIPX_BIN_DIR +Set-SystemVariable -SystemVariable PIPX_HOME -Value $env:PIPX_HOME + +# Test pipx Invoke-PesterTests -TestFile "Tools" -TestName "Pipx" \ No newline at end of file diff --git a/images/win/scripts/Installers/Install-PipxPackages.ps1 b/images/windows/scripts/build/Install-PipxPackages.ps1 similarity index 97% rename from images/win/scripts/Installers/Install-PipxPackages.ps1 rename to images/windows/scripts/build/Install-PipxPackages.ps1 index e83f5add40a0..c4a48ec93ac4 100644 --- a/images/win/scripts/Installers/Install-PipxPackages.ps1 +++ b/images/windows/scripts/build/Install-PipxPackages.ps1 @@ -1,12 +1,12 @@ -$pipxToolset = (Get-ToolsetContent).pipx -foreach($tool in $pipxToolset) { - if ($tool.python) { - $pythonPath = (Get-Item -Path "${env:AGENT_TOOLSDIRECTORY}\Python\${tool.python}.*\x64\python-${tool.python}*").FullName - Write-Host "Install ${tool.package} into python ${tool.python}" - pipx install $tool.package --python $pythonPath - } else { - Write-Host "Install ${tool.package} into default python" - pipx install $tool.package - } -} +$pipxToolset = (Get-ToolsetContent).pipx +foreach($tool in $pipxToolset) { + if ($tool.python) { + $pythonPath = (Get-Item -Path "${env:AGENT_TOOLSDIRECTORY}\Python\${tool.python}.*\x64\python-${tool.python}*").FullName + Write-Host "Install ${tool.package} into python ${tool.python}" + pipx install $tool.package --python $pythonPath + } else { + Write-Host "Install ${tool.package} into default python" + pipx install $tool.package + } +} Invoke-PesterTests -TestFile "PipxPackages" \ No newline at end of file diff --git a/images/win/scripts/Installers/Install-PostgreSQL.ps1 b/images/windows/scripts/build/Install-PostgreSQL.ps1 similarity index 100% rename from images/win/scripts/Installers/Install-PostgreSQL.ps1 rename to images/windows/scripts/build/Install-PostgreSQL.ps1 diff --git a/images/win/scripts/Installers/Install-PowerShellModules.ps1 b/images/windows/scripts/build/Install-PowerShellModules.ps1 similarity index 96% rename from images/win/scripts/Installers/Install-PowerShellModules.ps1 rename to images/windows/scripts/build/Install-PowerShellModules.ps1 index b3ab7a35df7b..ec8b45e1c848 100644 --- a/images/win/scripts/Installers/Install-PowerShellModules.ps1 +++ b/images/windows/scripts/build/Install-PowerShellModules.ps1 @@ -1,26 +1,26 @@ -# Set TLS1.2 -[Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor "Tls12" - -# Install PowerShell modules -$modules = (Get-ToolsetContent).powershellModules - -foreach($module in $modules) -{ - $moduleName = $module.name - Write-Host "Installing ${moduleName} module" - - if ($module.versions) - { - foreach ($version in $module.versions) - { - Write-Host " - $version" - Install-Module -Name $moduleName -RequiredVersion $version -Scope AllUsers -SkipPublisherCheck -Force - } - continue - } - - Install-Module -Name $moduleName -Scope AllUsers -SkipPublisherCheck -Force -} - -Import-Module Pester -Invoke-PesterTests -TestFile "PowerShellModules" -TestName "PowerShellModules" +# Set TLS1.2 +[Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor "Tls12" + +# Install PowerShell modules +$modules = (Get-ToolsetContent).powershellModules + +foreach($module in $modules) +{ + $moduleName = $module.name + Write-Host "Installing ${moduleName} module" + + if ($module.versions) + { + foreach ($version in $module.versions) + { + Write-Host " - $version" + Install-Module -Name $moduleName -RequiredVersion $version -Scope AllUsers -SkipPublisherCheck -Force + } + continue + } + + Install-Module -Name $moduleName -Scope AllUsers -SkipPublisherCheck -Force +} + +Import-Module Pester +Invoke-PesterTests -TestFile "PowerShellModules" -TestName "PowerShellModules" diff --git a/images/win/scripts/Installers/Install-PowershellCore.ps1 b/images/windows/scripts/build/Install-PowershellCore.ps1 similarity index 100% rename from images/win/scripts/Installers/Install-PowershellCore.ps1 rename to images/windows/scripts/build/Install-PowershellCore.ps1 diff --git a/images/win/scripts/Installers/Install-PyPy.ps1 b/images/windows/scripts/build/Install-PyPy.ps1 similarity index 97% rename from images/win/scripts/Installers/Install-PyPy.ps1 rename to images/windows/scripts/build/Install-PyPy.ps1 index 4808b3b6aced..69e3c32c6e5b 100644 --- a/images/win/scripts/Installers/Install-PyPy.ps1 +++ b/images/windows/scripts/build/Install-PyPy.ps1 @@ -1,124 +1,124 @@ -################################################################################ -## File: Install-PyPy.ps1 -## Team: CI-Build -## Desc: Install PyPy -## Supply chain security: checksum validation -################################################################################ -function Install-PyPy -{ - param( - [String]$PackagePath, - [String]$Architecture - ) - - # Create PyPy toolcache folder - $pypyToolcachePath = Join-Path -Path $env:AGENT_TOOLSDIRECTORY -ChildPath "PyPy" - if (-not (Test-Path $pypyToolcachePath)) { - Write-Host "Create PyPy toolcache folder" - New-Item -ItemType Directory -Path $pypyToolcachePath | Out-Null - } - - # Expand archive with binaries - $packageName = [IO.Path]::GetFileNameWithoutExtension((Split-Path -Path $packagePath -Leaf)) - $tempFolder = Join-Path -Path $pypyToolcachePath -ChildPath $packageName - Extract-7Zip -Path $packagePath -DestinationPath $pypyToolcachePath - - # Get Python version from binaries - $pypyApp = Get-ChildItem -Path "$tempFolder\pypy*.exe" | Where-Object Name -match "pypy(\d+)?.exe" | Select-Object -First 1 - $pythonVersion = & $pypyApp -c "import sys;print('{}.{}.{}'.format(sys.version_info[0],sys.version_info[1],sys.version_info[2]))" - - $pypyFullVersion = & $pypyApp -c "import sys;print('{}.{}.{}'.format(*sys.pypy_version_info[0:3]))" - Write-Host "Put '$pypyFullVersion' to PYPY_VERSION file" - New-Item -Path "$tempFolder\PYPY_VERSION" -Value $pypyFullVersion | Out-Null - - if ($pythonVersion) - { - Write-Host "Installing PyPy $pythonVersion" - $pypyVersionPath = Join-Path -Path $pypyToolcachePath -ChildPath $pythonVersion - $pypyArchPath = Join-Path -Path $pypyVersionPath -ChildPath $architecture - - Write-Host "Create PyPy '${pythonVersion}' folder in '${pypyVersionPath}'" - New-Item -ItemType Directory -Path $pypyVersionPath -Force | Out-Null - - Write-Host "Move PyPy '${pythonVersion}' files to '${pypyArchPath}'" - Invoke-SBWithRetry -Command { - Move-Item -Path $tempFolder -Destination $pypyArchPath -ErrorAction Stop | Out-Null - } - - Write-Host "Install PyPy '${pythonVersion}' in '${pypyArchPath}'" - if (Test-Path "$pypyArchPath\python.exe") { - cmd.exe /c "cd /d $pypyArchPath && python.exe -m ensurepip && python.exe -m pip install --upgrade pip" - } else { - $pypyName = $pypyApp.Name - cmd.exe /c "cd /d $pypyArchPath && mklink python.exe $pypyName && python.exe -m ensurepip && python.exe -m pip install --upgrade pip" - } - - # Create pip.exe if missing - $pipPath = Join-Path -Path $pypyArchPath -ChildPath "Scripts/pip.exe" - if (-not (Test-Path $pipPath)) - { - $pip3Path = Join-Path -Path $pypyArchPath -ChildPath "Scripts/pip3.exe" - Copy-Item -Path $pip3Path -Destination $pipPath - } - - if ($LASTEXITCODE -ne 0) - { - Throw "Error happened during PyPy installation" - exit 1 - } - - Write-Host "Create complete file" - New-Item -ItemType File -Path $pypyVersionPath -Name "$architecture.complete" | Out-Null - } - else - { - Write-Host "PyPy application is not found. Failed to expand '$packagePath' archive" - exit 1 - } -} - -# Get PyPy content from toolset -$toolsetVersions = Get-ToolsetContent | Select-Object -ExpandProperty toolcache | Where-Object Name -eq "PyPy" - -# Get PyPy releases -$pypyVersions = Invoke-RestMethod https://downloads.python.org/pypy/versions.json - -# required for html parsing -$checksums = (Invoke-RestMethod -Uri 'https://www.pypy.org/checksums.html' | ConvertFrom-HTML).SelectNodes('//*[@id="content"]/article/div/pre') - -Write-Host "Starting installation PyPy..." -foreach($toolsetVersion in $toolsetVersions.versions) -{ - # Query latest PyPy version - $latestMajorPyPyVersion = $pypyVersions | - Where-Object {$_.python_version.StartsWith("$toolsetVersion") -and $_.stable -eq $true} | - Select-Object -ExpandProperty files -First 1 | - Where-Object platform -like "win*" - - if ($latestMajorPyPyVersion) - { - $filename = $latestMajorPyPyVersion.filename - Write-Host "Found PyPy '$filename' package" - $tempPyPyPackagePath = Start-DownloadWithRetry -Url $latestMajorPyPyVersion.download_url -Name $filename - - #region Supply chain security - $localFileHash = (Get-FileHash -Path $tempPyPyPackagePath -Algorithm SHA256).Hash - $distributorFileHash = $null - - ForEach($node in $checksums) { - if($node.InnerText -ilike "*${filename}*") { - $distributorFileHash = $node.InnerText.ToString().Split("`n").Where({ $_ -ilike "*${filename}*" }).Split(' ')[0] - } - } - - Use-ChecksumComparison -LocalFileHash $localFileHash -DistributorFileHash $distributorFileHash - #endregion - - Install-PyPy -PackagePath $tempPyPyPackagePath -Architecture $toolsetVersions.arch - } - else - { - Write-Host "Failed to query PyPy version '$toolsetVersion'" - exit 1 - } -} +################################################################################ +## File: Install-PyPy.ps1 +## Team: CI-Build +## Desc: Install PyPy +## Supply chain security: checksum validation +################################################################################ +function Install-PyPy +{ + param( + [String]$PackagePath, + [String]$Architecture + ) + + # Create PyPy toolcache folder + $pypyToolcachePath = Join-Path -Path $env:AGENT_TOOLSDIRECTORY -ChildPath "PyPy" + if (-not (Test-Path $pypyToolcachePath)) { + Write-Host "Create PyPy toolcache folder" + New-Item -ItemType Directory -Path $pypyToolcachePath | Out-Null + } + + # Expand archive with binaries + $packageName = [IO.Path]::GetFileNameWithoutExtension((Split-Path -Path $packagePath -Leaf)) + $tempFolder = Join-Path -Path $pypyToolcachePath -ChildPath $packageName + Extract-7Zip -Path $packagePath -DestinationPath $pypyToolcachePath + + # Get Python version from binaries + $pypyApp = Get-ChildItem -Path "$tempFolder\pypy*.exe" | Where-Object Name -match "pypy(\d+)?.exe" | Select-Object -First 1 + $pythonVersion = & $pypyApp -c "import sys;print('{}.{}.{}'.format(sys.version_info[0],sys.version_info[1],sys.version_info[2]))" + + $pypyFullVersion = & $pypyApp -c "import sys;print('{}.{}.{}'.format(*sys.pypy_version_info[0:3]))" + Write-Host "Put '$pypyFullVersion' to PYPY_VERSION file" + New-Item -Path "$tempFolder\PYPY_VERSION" -Value $pypyFullVersion | Out-Null + + if ($pythonVersion) + { + Write-Host "Installing PyPy $pythonVersion" + $pypyVersionPath = Join-Path -Path $pypyToolcachePath -ChildPath $pythonVersion + $pypyArchPath = Join-Path -Path $pypyVersionPath -ChildPath $architecture + + Write-Host "Create PyPy '${pythonVersion}' folder in '${pypyVersionPath}'" + New-Item -ItemType Directory -Path $pypyVersionPath -Force | Out-Null + + Write-Host "Move PyPy '${pythonVersion}' files to '${pypyArchPath}'" + Invoke-SBWithRetry -Command { + Move-Item -Path $tempFolder -Destination $pypyArchPath -ErrorAction Stop | Out-Null + } + + Write-Host "Install PyPy '${pythonVersion}' in '${pypyArchPath}'" + if (Test-Path "$pypyArchPath\python.exe") { + cmd.exe /c "cd /d $pypyArchPath && python.exe -m ensurepip && python.exe -m pip install --upgrade pip" + } else { + $pypyName = $pypyApp.Name + cmd.exe /c "cd /d $pypyArchPath && mklink python.exe $pypyName && python.exe -m ensurepip && python.exe -m pip install --upgrade pip" + } + + # Create pip.exe if missing + $pipPath = Join-Path -Path $pypyArchPath -ChildPath "Scripts/pip.exe" + if (-not (Test-Path $pipPath)) + { + $pip3Path = Join-Path -Path $pypyArchPath -ChildPath "Scripts/pip3.exe" + Copy-Item -Path $pip3Path -Destination $pipPath + } + + if ($LASTEXITCODE -ne 0) + { + Throw "Error happened during PyPy installation" + exit 1 + } + + Write-Host "Create complete file" + New-Item -ItemType File -Path $pypyVersionPath -Name "$architecture.complete" | Out-Null + } + else + { + Write-Host "PyPy application is not found. Failed to expand '$packagePath' archive" + exit 1 + } +} + +# Get PyPy content from toolset +$toolsetVersions = Get-ToolsetContent | Select-Object -ExpandProperty toolcache | Where-Object Name -eq "PyPy" + +# Get PyPy releases +$pypyVersions = Invoke-RestMethod https://downloads.python.org/pypy/versions.json + +# required for html parsing +$checksums = (Invoke-RestMethod -Uri 'https://www.pypy.org/checksums.html' | ConvertFrom-HTML).SelectNodes('//*[@id="content"]/article/div/pre') + +Write-Host "Starting installation PyPy..." +foreach($toolsetVersion in $toolsetVersions.versions) +{ + # Query latest PyPy version + $latestMajorPyPyVersion = $pypyVersions | + Where-Object {$_.python_version.StartsWith("$toolsetVersion") -and $_.stable -eq $true} | + Select-Object -ExpandProperty files -First 1 | + Where-Object platform -like "win*" + + if ($latestMajorPyPyVersion) + { + $filename = $latestMajorPyPyVersion.filename + Write-Host "Found PyPy '$filename' package" + $tempPyPyPackagePath = Start-DownloadWithRetry -Url $latestMajorPyPyVersion.download_url -Name $filename + + #region Supply chain security + $localFileHash = (Get-FileHash -Path $tempPyPyPackagePath -Algorithm SHA256).Hash + $distributorFileHash = $null + + ForEach($node in $checksums) { + if($node.InnerText -ilike "*${filename}*") { + $distributorFileHash = $node.InnerText.ToString().Split("`n").Where({ $_ -ilike "*${filename}*" }).Split(' ')[0] + } + } + + Use-ChecksumComparison -LocalFileHash $localFileHash -DistributorFileHash $distributorFileHash + #endregion + + Install-PyPy -PackagePath $tempPyPyPackagePath -Architecture $toolsetVersions.arch + } + else + { + Write-Host "Failed to query PyPy version '$toolsetVersion'" + exit 1 + } +} diff --git a/images/win/scripts/Installers/Install-R.ps1 b/images/windows/scripts/build/Install-R.ps1 similarity index 100% rename from images/win/scripts/Installers/Install-R.ps1 rename to images/windows/scripts/build/Install-R.ps1 diff --git a/images/win/scripts/Installers/Install-RootCA.ps1 b/images/windows/scripts/build/Install-RootCA.ps1 similarity index 100% rename from images/win/scripts/Installers/Install-RootCA.ps1 rename to images/windows/scripts/build/Install-RootCA.ps1 diff --git a/images/win/scripts/Installers/Install-Ruby.ps1 b/images/windows/scripts/build/Install-Ruby.ps1 similarity index 100% rename from images/win/scripts/Installers/Install-Ruby.ps1 rename to images/windows/scripts/build/Install-Ruby.ps1 diff --git a/images/win/scripts/Installers/Install-Runner.ps1 b/images/windows/scripts/build/Install-Runner.ps1 similarity index 100% rename from images/win/scripts/Installers/Install-Runner.ps1 rename to images/windows/scripts/build/Install-Runner.ps1 diff --git a/images/win/scripts/Installers/Install-Rust.ps1 b/images/windows/scripts/build/Install-Rust.ps1 similarity index 100% rename from images/win/scripts/Installers/Install-Rust.ps1 rename to images/windows/scripts/build/Install-Rust.ps1 diff --git a/images/win/scripts/Installers/Install-SQLOLEDBDriver.ps1 b/images/windows/scripts/build/Install-SQLOLEDBDriver.ps1 similarity index 100% rename from images/win/scripts/Installers/Install-SQLOLEDBDriver.ps1 rename to images/windows/scripts/build/Install-SQLOLEDBDriver.ps1 diff --git a/images/win/scripts/Installers/Install-SQLPowerShellTools.ps1 b/images/windows/scripts/build/Install-SQLPowerShellTools.ps1 similarity index 100% rename from images/win/scripts/Installers/Install-SQLPowerShellTools.ps1 rename to images/windows/scripts/build/Install-SQLPowerShellTools.ps1 diff --git a/images/win/scripts/Installers/Install-Sbt.ps1 b/images/windows/scripts/build/Install-Sbt.ps1 similarity index 100% rename from images/win/scripts/Installers/Install-Sbt.ps1 rename to images/windows/scripts/build/Install-Sbt.ps1 diff --git a/images/win/scripts/Installers/Install-Selenium.ps1 b/images/windows/scripts/build/Install-Selenium.ps1 similarity index 100% rename from images/win/scripts/Installers/Install-Selenium.ps1 rename to images/windows/scripts/build/Install-Selenium.ps1 diff --git a/images/win/scripts/Installers/Install-ServiceFabricSDK.ps1 b/images/windows/scripts/build/Install-ServiceFabricSDK.ps1 similarity index 100% rename from images/win/scripts/Installers/Install-ServiceFabricSDK.ps1 rename to images/windows/scripts/build/Install-ServiceFabricSDK.ps1 diff --git a/images/win/scripts/Installers/Install-Stack.ps1 b/images/windows/scripts/build/Install-Stack.ps1 similarity index 100% rename from images/win/scripts/Installers/Install-Stack.ps1 rename to images/windows/scripts/build/Install-Stack.ps1 diff --git a/images/win/scripts/Installers/Install-Toolset.ps1 b/images/windows/scripts/build/Install-Toolset.ps1 similarity index 97% rename from images/win/scripts/Installers/Install-Toolset.ps1 rename to images/windows/scripts/build/Install-Toolset.ps1 index 0b373dc98fc7..be13e850af7d 100644 --- a/images/win/scripts/Installers/Install-Toolset.ps1 +++ b/images/windows/scripts/build/Install-Toolset.ps1 @@ -1,58 +1,58 @@ -################################################################################ -## File: Install-Toolset.ps1 -## Team: CI-Build -## Desc: Install toolset -################################################################################ - -[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 -bor [Net.SecurityProtocolType]::Tls13 - -Function Install-Asset { - param( - [Parameter(Mandatory=$true)] - [object] $ReleaseAsset - ) - - $releaseAssetName = [System.IO.Path]::GetFileNameWithoutExtension($ReleaseAsset.filename) - $assetFolderPath = Join-Path $env:TEMP $releaseAssetName - $assetArchivePath = Start-DownloadWithRetry -Url $ReleaseAsset.download_url -Name $ReleaseAsset.filename - - Write-Host "Extract $($ReleaseAsset.filename) content..." - if ($assetArchivePath.EndsWith(".tar.gz")) { - $assetTarPath = $assetArchivePath.TrimEnd(".tar.gz") - Extract-7Zip -Path $assetArchivePath -DestinationPath $assetTarPath - Extract-7Zip -Path $assetTarPath -DestinationPath $assetFolderPath - } else { - Extract-7Zip -Path $assetArchivePath -DestinationPath $assetFolderPath - } - - Write-Host "Invoke installation script..." - Push-Location -Path $assetFolderPath - Invoke-Expression .\setup.ps1 - Pop-Location -} - -# Get toolcache content from toolset -$ToolsToInstall = @("Python", "Node", "Go") - -$tools = Get-ToolsetContent | Select-Object -ExpandProperty toolcache | Where-Object { $ToolsToInstall -contains $_.Name } - -foreach ($tool in $tools) { - # Get versions manifest for current tool - $assets = Invoke-SBWithRetry -Command { Invoke-RestMethod $tool.url } - - # Get github release asset for each version - foreach ($toolVersion in $tool.versions) { - $asset = $assets | Where-Object version -like $toolVersion ` - | Select-Object -ExpandProperty files ` - | Where-Object { ($_.platform -eq $tool.platform) -and ($_.arch -eq $tool.arch) -and ($_.toolset -eq $tool.toolset) } ` - | Select-Object -First 1 - - Write-Host "Installing $($tool.name) $toolVersion $($tool.arch)..." - if ($null -ne $asset) { - Install-Asset -ReleaseAsset $asset - } else { - Write-Host "Asset was not found in versions manifest" - exit 1 - } - } +################################################################################ +## File: Install-Toolset.ps1 +## Team: CI-Build +## Desc: Install toolset +################################################################################ + +[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 -bor [Net.SecurityProtocolType]::Tls13 + +Function Install-Asset { + param( + [Parameter(Mandatory=$true)] + [object] $ReleaseAsset + ) + + $releaseAssetName = [System.IO.Path]::GetFileNameWithoutExtension($ReleaseAsset.filename) + $assetFolderPath = Join-Path $env:TEMP $releaseAssetName + $assetArchivePath = Start-DownloadWithRetry -Url $ReleaseAsset.download_url -Name $ReleaseAsset.filename + + Write-Host "Extract $($ReleaseAsset.filename) content..." + if ($assetArchivePath.EndsWith(".tar.gz")) { + $assetTarPath = $assetArchivePath.TrimEnd(".tar.gz") + Extract-7Zip -Path $assetArchivePath -DestinationPath $assetTarPath + Extract-7Zip -Path $assetTarPath -DestinationPath $assetFolderPath + } else { + Extract-7Zip -Path $assetArchivePath -DestinationPath $assetFolderPath + } + + Write-Host "Invoke installation script..." + Push-Location -Path $assetFolderPath + Invoke-Expression .\setup.ps1 + Pop-Location +} + +# Get toolcache content from toolset +$ToolsToInstall = @("Python", "Node", "Go") + +$tools = Get-ToolsetContent | Select-Object -ExpandProperty toolcache | Where-Object { $ToolsToInstall -contains $_.Name } + +foreach ($tool in $tools) { + # Get versions manifest for current tool + $assets = Invoke-SBWithRetry -Command { Invoke-RestMethod $tool.url } + + # Get github release asset for each version + foreach ($toolVersion in $tool.versions) { + $asset = $assets | Where-Object version -like $toolVersion ` + | Select-Object -ExpandProperty files ` + | Where-Object { ($_.platform -eq $tool.platform) -and ($_.arch -eq $tool.arch) -and ($_.toolset -eq $tool.toolset) } ` + | Select-Object -First 1 + + Write-Host "Installing $($tool.name) $toolVersion $($tool.arch)..." + if ($null -ne $asset) { + Install-Asset -ReleaseAsset $asset + } else { + Write-Host "Asset was not found in versions manifest" + exit 1 + } + } } \ No newline at end of file diff --git a/images/win/scripts/Installers/Install-VCRedist.ps1 b/images/windows/scripts/build/Install-VCRedist.ps1 similarity index 100% rename from images/win/scripts/Installers/Install-VCRedist.ps1 rename to images/windows/scripts/build/Install-VCRedist.ps1 diff --git a/images/win/scripts/Installers/Install-VS.ps1 b/images/windows/scripts/build/Install-VS.ps1 similarity index 100% rename from images/win/scripts/Installers/Install-VS.ps1 rename to images/windows/scripts/build/Install-VS.ps1 diff --git a/images/win/scripts/Installers/Install-Vcpkg.ps1 b/images/windows/scripts/build/Install-Vcpkg.ps1 similarity index 100% rename from images/win/scripts/Installers/Install-Vcpkg.ps1 rename to images/windows/scripts/build/Install-Vcpkg.ps1 diff --git a/images/win/scripts/Installers/Install-Vsix.ps1 b/images/windows/scripts/build/Install-Vsix.ps1 similarity index 97% rename from images/win/scripts/Installers/Install-Vsix.ps1 rename to images/windows/scripts/build/Install-Vsix.ps1 index e9170cabcc0b..cf132ea8909a 100644 --- a/images/win/scripts/Installers/Install-Vsix.ps1 +++ b/images/windows/scripts/build/Install-Vsix.ps1 @@ -1,24 +1,24 @@ -################################################################################### -## File: Install-Vsix.ps1 -## Desc: Install the Visual Studio Extensions from toolset.json -################################################################################### - -$toolset = Get-ToolsetContent -$vsixPackagesList = $toolset.visualStudio.vsix -if (-not $vsixPackagesList) { - Write-Host "No extensions to install" - exit 0 -} - -$vsixPackagesList | ForEach-Object { - # Retrieve cdn endpoint to avoid HTTP error 429 https://github.com/actions/runner-images/issues/3074 - $vsixPackage = Get-VsixExtenstionFromMarketplace -ExtensionMarketPlaceName $_ - if ($vsixPackage.FileName.EndsWith(".vsix")) { - Install-VsixExtension -Url $vsixPackage.DownloadUri -Name $vsixPackage.FileName - } else { - $argumentList = ('/install', '/quiet', '/norestart') - Install-Binary -Url $vsixPackage.DownloadUri -Name $vsixPackage.FileName -ArgumentList $argumentList - } -} - +################################################################################### +## File: Install-Vsix.ps1 +## Desc: Install the Visual Studio Extensions from toolset.json +################################################################################### + +$toolset = Get-ToolsetContent +$vsixPackagesList = $toolset.visualStudio.vsix +if (-not $vsixPackagesList) { + Write-Host "No extensions to install" + exit 0 +} + +$vsixPackagesList | ForEach-Object { + # Retrieve cdn endpoint to avoid HTTP error 429 https://github.com/actions/runner-images/issues/3074 + $vsixPackage = Get-VsixExtenstionFromMarketplace -ExtensionMarketPlaceName $_ + if ($vsixPackage.FileName.EndsWith(".vsix")) { + Install-VsixExtension -Url $vsixPackage.DownloadUri -Name $vsixPackage.FileName + } else { + $argumentList = ('/install', '/quiet', '/norestart') + Install-Binary -Url $vsixPackage.DownloadUri -Name $vsixPackage.FileName -ArgumentList $argumentList + } +} + Invoke-PesterTests -TestFile "Vsix" \ No newline at end of file diff --git a/images/win/scripts/Installers/Install-WDK.ps1 b/images/windows/scripts/build/Install-WDK.ps1 similarity index 100% rename from images/win/scripts/Installers/Install-WDK.ps1 rename to images/windows/scripts/build/Install-WDK.ps1 diff --git a/images/win/scripts/Installers/Install-WebPlatformInstaller.ps1 b/images/windows/scripts/build/Install-WebPlatformInstaller.ps1 similarity index 100% rename from images/win/scripts/Installers/Install-WebPlatformInstaller.ps1 rename to images/windows/scripts/build/Install-WebPlatformInstaller.ps1 diff --git a/images/win/scripts/Installers/Install-WinAppDriver.ps1 b/images/windows/scripts/build/Install-WinAppDriver.ps1 similarity index 100% rename from images/win/scripts/Installers/Install-WinAppDriver.ps1 rename to images/windows/scripts/build/Install-WinAppDriver.ps1 diff --git a/images/win/scripts/Installers/Install-WindowsFeatures.ps1 b/images/windows/scripts/build/Install-WindowsFeatures.ps1 similarity index 100% rename from images/win/scripts/Installers/Install-WindowsFeatures.ps1 rename to images/windows/scripts/build/Install-WindowsFeatures.ps1 diff --git a/images/win/scripts/Installers/Install-WindowsUpdates.ps1 b/images/windows/scripts/build/Install-WindowsUpdates.ps1 similarity index 100% rename from images/win/scripts/Installers/Install-WindowsUpdates.ps1 rename to images/windows/scripts/build/Install-WindowsUpdates.ps1 diff --git a/images/win/scripts/Installers/Install-Wix.ps1 b/images/windows/scripts/build/Install-Wix.ps1 similarity index 100% rename from images/win/scripts/Installers/Install-Wix.ps1 rename to images/windows/scripts/build/Install-Wix.ps1 diff --git a/images/win/scripts/Installers/Install-Zstd.ps1 b/images/windows/scripts/build/Install-Zstd.ps1 similarity index 100% rename from images/win/scripts/Installers/Install-Zstd.ps1 rename to images/windows/scripts/build/Install-Zstd.ps1 diff --git a/images/win/scripts/Installers/Run-NGen.ps1 b/images/windows/scripts/build/Run-NGen.ps1 similarity index 98% rename from images/win/scripts/Installers/Run-NGen.ps1 rename to images/windows/scripts/build/Run-NGen.ps1 index c00aa1a4ad07..4ecddd3cab04 100644 --- a/images/win/scripts/Installers/Run-NGen.ps1 +++ b/images/windows/scripts/build/Run-NGen.ps1 @@ -1,6 +1,6 @@ -Write-Host "NGen: Microsoft.PowerShell.Utility.Activities" -$null = & $env:SystemRoot\Microsoft.NET\Framework64\v4.0.30319\ngen.exe install "Microsoft.PowerShell.Utility.Activities, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" -Write-Host "NGen: Framework64" -$null = & $env:SystemRoot\Microsoft.NET\Framework64\v4.0.30319\ngen.exe update -Write-Host "NGen: Framework" +Write-Host "NGen: Microsoft.PowerShell.Utility.Activities" +$null = & $env:SystemRoot\Microsoft.NET\Framework64\v4.0.30319\ngen.exe install "Microsoft.PowerShell.Utility.Activities, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" +Write-Host "NGen: Framework64" +$null = & $env:SystemRoot\Microsoft.NET\Framework64\v4.0.30319\ngen.exe update +Write-Host "NGen: Framework" $null = & $env:SystemRoot\Microsoft.NET\Framework\v4.0.30319\ngen.exe update \ No newline at end of file diff --git a/images/win/scripts/Installers/Update-DotnetTLS.ps1 b/images/windows/scripts/build/Update-DotnetTLS.ps1 similarity index 100% rename from images/win/scripts/Installers/Update-DotnetTLS.ps1 rename to images/windows/scripts/build/Update-DotnetTLS.ps1 diff --git a/images/win/scripts/Installers/Update-ImageData.ps1 b/images/windows/scripts/build/Update-ImageData.ps1 similarity index 62% rename from images/win/scripts/Installers/Update-ImageData.ps1 rename to images/windows/scripts/build/Update-ImageData.ps1 index f27b5c7e4115..fa5abbd9477f 100644 --- a/images/win/scripts/Installers/Update-ImageData.ps1 +++ b/images/windows/scripts/build/Update-ImageData.ps1 @@ -1,45 +1,45 @@ -$os = Get-CimInstance -ClassName Win32_OperatingSystem -$caption = $os.Caption -$osName = $caption.Substring(0, $caption.LastIndexOf(" ")) -$osEdition = $caption.Substring($caption.LastIndexOf(" ")+1) -$osVersion = $os.Version -$imageVersion = $env:IMAGE_VERSION -$imageVersionComponents = $imageVersion.Split('.') -$imageMajorVersion = $imageVersionComponents[0] -$imageMinorVersion = $imageVersionComponents[1] -$imageDataFile = $env:IMAGEDATA_FILE -$githubUrl="https://github.com/actions/runner-images/blob" - -if (Test-IsWin22) { - $imageLabel = "windows-2022" - $softwareUrl = "${githubUrl}/win22/$imageMajorVersion.$imageMinorVersion/images/win/Windows2022-Readme.md" - $releaseUrl="https://github.com/actions/runner-images/releases/tag/win22%2F$imageMajorVersion.$imageMinorVersion" -} elseif (Test-IsWin19) { - $imageLabel = "windows-2019" - $softwareUrl = "${githubUrl}/win19/$imageMajorVersion.$imageMinorVersion/images/win/Windows2019-Readme.md" - $releaseUrl="https://github.com/actions/runner-images/releases/tag/win19%2F$imageMajorVersion.$imageMinorVersion" -} else { - throw "Invalid platform version is found. Either Windows Server 2019 or 2022 are required" -} - -$json = @" -[ - { - "group": "Operating System", - "detail": "${osName}\n${osVersion}\n${osEdition}" - }, - { - "group": "Runner Image", - "detail": "Image: ${imageLabel}\nVersion: ${imageVersion}\nIncluded Software: ${softwareUrl}\nImage Release: ${releaseUrl}" - } -] -"@ - -$json | Out-File -FilePath $imageDataFile - - -# Set static env vars -setx ImageVersion $env:IMAGE_VERSION /m -setx ImageOS $env:IMAGE_OS /m -setx AGENT_TOOLSDIRECTORY $env:AGENT_TOOLSDIRECTORY /m -setx ACTIONS_RUNNER_ACTION_ARCHIVE_CACHE $env:ACTIONS_RUNNER_ACTION_ARCHIVE_CACHE /m +$os = Get-CimInstance -ClassName Win32_OperatingSystem +$caption = $os.Caption +$osName = $caption.Substring(0, $caption.LastIndexOf(" ")) +$osEdition = $caption.Substring($caption.LastIndexOf(" ") + 1) +$osVersion = $os.Version +$imageVersion = $env:IMAGE_VERSION +$imageVersionComponents = $imageVersion.Split('.') +$imageMajorVersion = $imageVersionComponents[0] +$imageMinorVersion = $imageVersionComponents[1] +$imageDataFile = $env:IMAGEDATA_FILE +$githubUrl = "https://github.com/actions/runner-images/blob" + +if (Test-IsWin22) { + $imageLabel = "windows-2022" + $softwareUrl = "${githubUrl}/win22/$imageMajorVersion.$imageMinorVersion/images/windows/Windows2022-Readme.md" + $releaseUrl = "https://github.com/actions/runner-images/releases/tag/win22%2F$imageMajorVersion.$imageMinorVersion" +} elseif (Test-IsWin19) { + $imageLabel = "windows-2019" + $softwareUrl = "${githubUrl}/win19/$imageMajorVersion.$imageMinorVersion/images/windows/Windows2019-Readme.md" + $releaseUrl = "https://github.com/actions/runner-images/releases/tag/win19%2F$imageMajorVersion.$imageMinorVersion" +} else { + throw "Invalid platform version is found. Either Windows Server 2019 or 2022 are required" +} + +$json = @" +[ + { + "group": "Operating System", + "detail": "${osName}\n${osVersion}\n${osEdition}" + }, + { + "group": "Runner Image", + "detail": "Image: ${imageLabel}\nVersion: ${imageVersion}\nIncluded Software: ${softwareUrl}\nImage Release: ${releaseUrl}" + } +] +"@ + +$json | Out-File -FilePath $imageDataFile + + +# Set static env vars +setx ImageVersion $env:IMAGE_VERSION /m +setx ImageOS $env:IMAGE_OS /m +setx AGENT_TOOLSDIRECTORY $env:AGENT_TOOLSDIRECTORY /m +setx ACTIONS_RUNNER_ACTION_ARCHIVE_CACHE $env:ACTIONS_RUNNER_ACTION_ARCHIVE_CACHE /m diff --git a/images/win/scripts/Installers/Wait-WindowsUpdatesForInstall.ps1 b/images/windows/scripts/build/Wait-WindowsUpdatesForInstall.ps1 similarity index 100% rename from images/win/scripts/Installers/Wait-WindowsUpdatesForInstall.ps1 rename to images/windows/scripts/build/Wait-WindowsUpdatesForInstall.ps1 diff --git a/images/win/scripts/Installers/Warmup-User.ps1 b/images/windows/scripts/build/Warmup-User.ps1 similarity index 100% rename from images/win/scripts/Installers/Warmup-User.ps1 rename to images/windows/scripts/build/Warmup-User.ps1 diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Android.psm1 b/images/windows/scripts/docs-gen/SoftwareReport.Android.psm1 similarity index 100% rename from images/win/scripts/SoftwareReport/SoftwareReport.Android.psm1 rename to images/windows/scripts/docs-gen/SoftwareReport.Android.psm1 diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Browsers.psm1 b/images/windows/scripts/docs-gen/SoftwareReport.Browsers.psm1 similarity index 100% rename from images/win/scripts/SoftwareReport/SoftwareReport.Browsers.psm1 rename to images/windows/scripts/docs-gen/SoftwareReport.Browsers.psm1 diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.CachedTools.psm1 b/images/windows/scripts/docs-gen/SoftwareReport.CachedTools.psm1 similarity index 100% rename from images/win/scripts/SoftwareReport/SoftwareReport.CachedTools.psm1 rename to images/windows/scripts/docs-gen/SoftwareReport.CachedTools.psm1 diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 b/images/windows/scripts/docs-gen/SoftwareReport.Common.psm1 similarity index 100% rename from images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 rename to images/windows/scripts/docs-gen/SoftwareReport.Common.psm1 diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Databases.psm1 b/images/windows/scripts/docs-gen/SoftwareReport.Databases.psm1 similarity index 97% rename from images/win/scripts/SoftwareReport/SoftwareReport.Databases.psm1 rename to images/windows/scripts/docs-gen/SoftwareReport.Databases.psm1 index 9d5e612bc602..9cb6114bef6b 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Databases.psm1 +++ b/images/windows/scripts/docs-gen/SoftwareReport.Databases.psm1 @@ -1,32 +1,32 @@ -function Get-PostgreSQLTable -{ - $pgService = Get-CimInstance Win32_Service -Filter "Name LIKE 'postgresql-%'" - $pgPath = $pgService.PathName - $pgRoot = $pgPath.split('"')[1].replace("\bin\pg_ctl.exe", "") - $env:Path += ";${env:PGBIN}" - $pgVersion = (postgres --version).split()[2].Trim() - - return @( - [PSCustomObject]@{ Property = "ServiceName"; Value = $pgService.Name }, - [PSCustomObject]@{ Property = "Version"; Value = $pgVersion }, - [PSCustomObject]@{ Property = "ServiceStatus"; Value = $pgService.State }, - [PSCustomObject]@{ Property = "ServiceStartType"; Value = $pgService.StartMode }, - [PSCustomObject]@{ Property = "EnvironmentVariables"; Value = "`PGBIN=$env:PGBIN` <br> `PGDATA=$env:PGDATA` <br> `PGROOT=$env:PGROOT` " }, - [PSCustomObject]@{ Property = "Path"; Value = $pgRoot }, - [PSCustomObject]@{ Property = "UserName"; Value = $env:PGUSER }, - [PSCustomObject]@{ Property = "Password"; Value = $env:PGPASSWORD } - ) -} - -function Get-MongoDBTable -{ - $name = "MongoDB" - $mongoService = Get-Service -Name $name - $mongoVersion = (Get-Command -Name 'mongo').Version.ToString() - return [PSCustomObject]@{ - Version = $mongoVersion - ServiceName = $name - ServiceStatus = $mongoService.Status - ServiceStartType = $mongoService.StartType - } -} +function Get-PostgreSQLTable +{ + $pgService = Get-CimInstance Win32_Service -Filter "Name LIKE 'postgresql-%'" + $pgPath = $pgService.PathName + $pgRoot = $pgPath.split('"')[1].replace("\bin\pg_ctl.exe", "") + $env:Path += ";${env:PGBIN}" + $pgVersion = (postgres --version).split()[2].Trim() + + return @( + [PSCustomObject]@{ Property = "ServiceName"; Value = $pgService.Name }, + [PSCustomObject]@{ Property = "Version"; Value = $pgVersion }, + [PSCustomObject]@{ Property = "ServiceStatus"; Value = $pgService.State }, + [PSCustomObject]@{ Property = "ServiceStartType"; Value = $pgService.StartMode }, + [PSCustomObject]@{ Property = "EnvironmentVariables"; Value = "`PGBIN=$env:PGBIN` <br> `PGDATA=$env:PGDATA` <br> `PGROOT=$env:PGROOT` " }, + [PSCustomObject]@{ Property = "Path"; Value = $pgRoot }, + [PSCustomObject]@{ Property = "UserName"; Value = $env:PGUSER }, + [PSCustomObject]@{ Property = "Password"; Value = $env:PGPASSWORD } + ) +} + +function Get-MongoDBTable +{ + $name = "MongoDB" + $mongoService = Get-Service -Name $name + $mongoVersion = (Get-Command -Name 'mongo').Version.ToString() + return [PSCustomObject]@{ + Version = $mongoVersion + ServiceName = $name + ServiceStatus = $mongoService.Status + ServiceStartType = $mongoService.StartType + } +} diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/windows/scripts/docs-gen/SoftwareReport.Generator.ps1 similarity index 100% rename from images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 rename to images/windows/scripts/docs-gen/SoftwareReport.Generator.ps1 diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Helpers.psm1 b/images/windows/scripts/docs-gen/SoftwareReport.Helpers.psm1 similarity index 100% rename from images/win/scripts/SoftwareReport/SoftwareReport.Helpers.psm1 rename to images/windows/scripts/docs-gen/SoftwareReport.Helpers.psm1 diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Java.psm1 b/images/windows/scripts/docs-gen/SoftwareReport.Java.psm1 similarity index 100% rename from images/win/scripts/SoftwareReport/SoftwareReport.Java.psm1 rename to images/windows/scripts/docs-gen/SoftwareReport.Java.psm1 diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/windows/scripts/docs-gen/SoftwareReport.Tools.psm1 similarity index 100% rename from images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 rename to images/windows/scripts/docs-gen/SoftwareReport.Tools.psm1 diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.VisualStudio.psm1 b/images/windows/scripts/docs-gen/SoftwareReport.VisualStudio.psm1 similarity index 100% rename from images/win/scripts/SoftwareReport/SoftwareReport.VisualStudio.psm1 rename to images/windows/scripts/docs-gen/SoftwareReport.VisualStudio.psm1 diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.WebServers.psm1 b/images/windows/scripts/docs-gen/SoftwareReport.WebServers.psm1 similarity index 100% rename from images/win/scripts/SoftwareReport/SoftwareReport.WebServers.psm1 rename to images/windows/scripts/docs-gen/SoftwareReport.WebServers.psm1 diff --git a/images/win/scripts/ImageHelpers/ChocoHelpers.ps1 b/images/windows/scripts/helpers/ChocoHelpers.ps1 similarity index 96% rename from images/win/scripts/ImageHelpers/ChocoHelpers.ps1 rename to images/windows/scripts/helpers/ChocoHelpers.ps1 index 9405f3ebc455..46247620cf43 100644 --- a/images/win/scripts/ImageHelpers/ChocoHelpers.ps1 +++ b/images/windows/scripts/helpers/ChocoHelpers.ps1 @@ -1,65 +1,65 @@ -function Choco-Install { - [CmdletBinding()] - param( - [Parameter(Mandatory)] - [string] $PackageName, - [string[]] $ArgumentList, - [int] $RetryCount = 5 - ) - - process { - $count = 1 - while($true) - { - Write-Host "Running [#$count]: choco install $packageName -y $argumentList" - choco install $packageName -y @argumentList --no-progress - - $pkg = choco list --localonly $packageName --exact --all --limitoutput - if ($pkg) { - Write-Host "Package installed: $pkg" - break - } - else { - $count++ - if ($count -ge $retryCount) { - Write-Host "Could not install $packageName after $count attempts" - exit 1 - } - Start-Sleep -Seconds 30 - } - } - } -} - -function Send-RequestToChocolateyPackages { - param( - [Parameter(Mandatory)] - [string] $FilterQuery, - [string] $Url = "https://community.chocolatey.org/api", - [int] $ApiVersion = 2 - ) - - $response = Invoke-RestMethod "$Url/v$ApiVersion/Packages()?$filterQuery" - - return $response -} - -function Get-LatestChocoPackageVersion { - param( - [Parameter(Mandatory)] - [string] $PackageName, - [Parameter(Mandatory)] - [string] $TargetVersion - ) - - $versionNumbers = $TargetVersion.Split(".") - [int]$versionNumbers[-1] += 1 - $incrementedVersion = $versionNumbers -join "." - $filterQuery = "`$filter=(Id eq '$PackageName') and (IsPrerelease eq false) and (Version ge '$TargetVersion') and (Version lt '$incrementedVersion')" - $latestVersion = (Send-RequestToChocolateyPackages -FilterQuery $filterQuery).properties.Version | - Where-Object {$_ -Like "$TargetVersion.*" -or $_ -eq $TargetVersion} | - Sort-Object {[version]$_} | - Select-Object -Last 1 - - return $latestVersion +function Choco-Install { + [CmdletBinding()] + param( + [Parameter(Mandatory)] + [string] $PackageName, + [string[]] $ArgumentList, + [int] $RetryCount = 5 + ) + + process { + $count = 1 + while($true) + { + Write-Host "Running [#$count]: choco install $packageName -y $argumentList" + choco install $packageName -y @argumentList --no-progress + + $pkg = choco list --localonly $packageName --exact --all --limitoutput + if ($pkg) { + Write-Host "Package installed: $pkg" + break + } + else { + $count++ + if ($count -ge $retryCount) { + Write-Host "Could not install $packageName after $count attempts" + exit 1 + } + Start-Sleep -Seconds 30 + } + } + } +} + +function Send-RequestToChocolateyPackages { + param( + [Parameter(Mandatory)] + [string] $FilterQuery, + [string] $Url = "https://community.chocolatey.org/api", + [int] $ApiVersion = 2 + ) + + $response = Invoke-RestMethod "$Url/v$ApiVersion/Packages()?$filterQuery" + + return $response +} + +function Get-LatestChocoPackageVersion { + param( + [Parameter(Mandatory)] + [string] $PackageName, + [Parameter(Mandatory)] + [string] $TargetVersion + ) + + $versionNumbers = $TargetVersion.Split(".") + [int]$versionNumbers[-1] += 1 + $incrementedVersion = $versionNumbers -join "." + $filterQuery = "`$filter=(Id eq '$PackageName') and (IsPrerelease eq false) and (Version ge '$TargetVersion') and (Version lt '$incrementedVersion')" + $latestVersion = (Send-RequestToChocolateyPackages -FilterQuery $filterQuery).properties.Version | + Where-Object {$_ -Like "$TargetVersion.*" -or $_ -eq $TargetVersion} | + Sort-Object {[version]$_} | + Select-Object -Last 1 + + return $latestVersion } \ No newline at end of file diff --git a/images/win/scripts/ImageHelpers/ImageHelpers.psd1 b/images/windows/scripts/helpers/ImageHelpers.psd1 similarity index 97% rename from images/win/scripts/ImageHelpers/ImageHelpers.psd1 rename to images/windows/scripts/helpers/ImageHelpers.psd1 index bdb237c00851..317f86de9f0c 100644 --- a/images/win/scripts/ImageHelpers/ImageHelpers.psd1 +++ b/images/windows/scripts/helpers/ImageHelpers.psd1 @@ -1,107 +1,107 @@ -@{ - -# Script module or binary module file associated with this manifest. -RootModule = 'ImageHelpers.psm1' - -# Version number of this module. -ModuleVersion = '0.0.1' - -# Supported PSEditions -# CompatiblePSEditions = @() - -# ID used to uniquely identify this module -GUID = 'c9334909-16a1-48f1-a94a-c7baf1b961d9' - -# Description of the functionality provided by this module -Description = 'Helper functions for creating vsts images' - -# Minimum version of the Windows PowerShell engine required by this module -# PowerShellVersion = '' - -# Name of the Windows PowerShell host required by this module -# PowerShellHostName = '' - -# Minimum version of the Windows PowerShell host required by this module -# PowerShellHostVersion = '' - -# Minimum version of Microsoft .NET Framework required by this module. This prerequisite is valid for the PowerShell Desktop edition only. -# DotNetFrameworkVersion = '' - -# Minimum version of the common language runtime (CLR) required by this module. This prerequisite is valid for the PowerShell Desktop edition only. -# CLRVersion = '' - -# Processor architecture (None, X86, Amd64) required by this module -# ProcessorArchitecture = '' - -# Modules that must be imported into the global environment prior to importing this module -# RequiredModules = @() - -# Assemblies that must be loaded prior to importing this module -# RequiredAssemblies = @() - -# Script files (.ps1) that are run in the caller's environment prior to importing this module. -# ScriptsToProcess = @() - -# Type files (.ps1xml) to be loaded when importing this module -# TypesToProcess = @() - -# Format files (.ps1xml) to be loaded when importing this module -# FormatsToProcess = @() - -# Modules to import as nested modules of the module specified in RootModule/ModuleToProcess -# NestedModules = @() - -# Functions to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no functions to export. -FunctionsToExport = '*' - -# Cmdlets to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no cmdlets to export. -CmdletsToExport = '*' - -# Variables to export from this module -VariablesToExport = '*' - -# Aliases to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no aliases to export. -AliasesToExport = '*' - -# DSC resources to export from this module -# DscResourcesToExport = @() - -# List of all modules packaged with this module -# ModuleList = @() - -# List of all files packaged with this module -# FileList = @() - -# Private data to pass to the module specified in RootModule/ModuleToProcess. This may also contain a PSData hashtable with additional module metadata used by PowerShell. -PrivateData = @{ - - PSData = @{ - - # Tags applied to this module. These help with module discovery in online galleries. - # Tags = @() - - # A URL to the license for this module. - # LicenseUri = '' - - # A URL to the main website for this project. - # ProjectUri = '' - - # A URL to an icon representing this module. - # IconUri = '' - - # ReleaseNotes of this module - # ReleaseNotes = '' - - } # End of PSData hashtable - -} # End of PrivateData hashtable - -# HelpInfo URI of this module -# HelpInfoURI = '' - -# Default prefix for commands exported from this module. Override the default prefix using Import-Module -Prefix. -# DefaultCommandPrefix = '' - -} - - +@{ + +# Script module or binary module file associated with this manifest. +RootModule = 'ImageHelpers.psm1' + +# Version number of this module. +ModuleVersion = '0.0.1' + +# Supported PSEditions +# CompatiblePSEditions = @() + +# ID used to uniquely identify this module +GUID = 'c9334909-16a1-48f1-a94a-c7baf1b961d9' + +# Description of the functionality provided by this module +Description = 'Helper functions for creating vsts images' + +# Minimum version of the Windows PowerShell engine required by this module +# PowerShellVersion = '' + +# Name of the Windows PowerShell host required by this module +# PowerShellHostName = '' + +# Minimum version of the Windows PowerShell host required by this module +# PowerShellHostVersion = '' + +# Minimum version of Microsoft .NET Framework required by this module. This prerequisite is valid for the PowerShell Desktop edition only. +# DotNetFrameworkVersion = '' + +# Minimum version of the common language runtime (CLR) required by this module. This prerequisite is valid for the PowerShell Desktop edition only. +# CLRVersion = '' + +# Processor architecture (None, X86, Amd64) required by this module +# ProcessorArchitecture = '' + +# Modules that must be imported into the global environment prior to importing this module +# RequiredModules = @() + +# Assemblies that must be loaded prior to importing this module +# RequiredAssemblies = @() + +# Script files (.ps1) that are run in the caller's environment prior to importing this module. +# ScriptsToProcess = @() + +# Type files (.ps1xml) to be loaded when importing this module +# TypesToProcess = @() + +# Format files (.ps1xml) to be loaded when importing this module +# FormatsToProcess = @() + +# Modules to import as nested modules of the module specified in RootModule/ModuleToProcess +# NestedModules = @() + +# Functions to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no functions to export. +FunctionsToExport = '*' + +# Cmdlets to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no cmdlets to export. +CmdletsToExport = '*' + +# Variables to export from this module +VariablesToExport = '*' + +# Aliases to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no aliases to export. +AliasesToExport = '*' + +# DSC resources to export from this module +# DscResourcesToExport = @() + +# List of all modules packaged with this module +# ModuleList = @() + +# List of all files packaged with this module +# FileList = @() + +# Private data to pass to the module specified in RootModule/ModuleToProcess. This may also contain a PSData hashtable with additional module metadata used by PowerShell. +PrivateData = @{ + + PSData = @{ + + # Tags applied to this module. These help with module discovery in online galleries. + # Tags = @() + + # A URL to the license for this module. + # LicenseUri = '' + + # A URL to the main website for this project. + # ProjectUri = '' + + # A URL to an icon representing this module. + # IconUri = '' + + # ReleaseNotes of this module + # ReleaseNotes = '' + + } # End of PSData hashtable + +} # End of PrivateData hashtable + +# HelpInfo URI of this module +# HelpInfoURI = '' + +# Default prefix for commands exported from this module. Override the default prefix using Import-Module -Prefix. +# DefaultCommandPrefix = '' + +} + + diff --git a/images/win/scripts/ImageHelpers/ImageHelpers.psm1 b/images/windows/scripts/helpers/ImageHelpers.psm1 similarity index 100% rename from images/win/scripts/ImageHelpers/ImageHelpers.psm1 rename to images/windows/scripts/helpers/ImageHelpers.psm1 diff --git a/images/win/scripts/ImageHelpers/InstallHelpers.ps1 b/images/windows/scripts/helpers/InstallHelpers.ps1 similarity index 100% rename from images/win/scripts/ImageHelpers/InstallHelpers.ps1 rename to images/windows/scripts/helpers/InstallHelpers.ps1 diff --git a/images/win/scripts/ImageHelpers/PathHelpers.ps1 b/images/windows/scripts/helpers/PathHelpers.ps1 similarity index 100% rename from images/win/scripts/ImageHelpers/PathHelpers.ps1 rename to images/windows/scripts/helpers/PathHelpers.ps1 diff --git a/images/win/scripts/ImageHelpers/TestsHelpers.ps1 b/images/windows/scripts/helpers/TestsHelpers.ps1 similarity index 97% rename from images/win/scripts/ImageHelpers/TestsHelpers.ps1 rename to images/windows/scripts/helpers/TestsHelpers.ps1 index c6667de365ea..f22cd9c223ea 100644 --- a/images/win/scripts/ImageHelpers/TestsHelpers.ps1 +++ b/images/windows/scripts/helpers/TestsHelpers.ps1 @@ -41,21 +41,21 @@ function Invoke-PesterTests { [string] $TestName ) - $testPath = "C:\image\Tests\${TestFile}.Tests.ps1" + $testPath = "C:\image\tests\${TestFile}.Tests.ps1" if (-not (Test-Path $testPath)) { throw "Unable to find test file '$TestFile' on '$testPath'." } $configuration = [PesterConfiguration] @{ - Run = @{ Path = $testPath; PassThru = $true } - Output = @{ Verbosity = "Detailed"; RenderMode = "Plaintext"} + Run = @{ Path = $testPath; PassThru = $true } + Output = @{ Verbosity = "Detailed"; RenderMode = "Plaintext" } } if ($TestName) { $configuration.Filter.FullName = $TestName } if ($TestFile -eq "*") { $configuration.TestResult.Enabled = $true - $configuration.TestResult.OutputPath = "C:\image\Tests\testResults.xml" + $configuration.TestResult.OutputPath = "C:\image\tests\testResults.xml" } # Update environment variables without reboot diff --git a/images/win/scripts/ImageHelpers/VisualStudioHelpers.ps1 b/images/windows/scripts/helpers/VisualStudioHelpers.ps1 similarity index 100% rename from images/win/scripts/ImageHelpers/VisualStudioHelpers.ps1 rename to images/windows/scripts/helpers/VisualStudioHelpers.ps1 diff --git a/images/win/scripts/ImageHelpers/test/ImageHelpers.Tests.ps1 b/images/windows/scripts/helpers/test/ImageHelpers.Tests.ps1 similarity index 100% rename from images/win/scripts/ImageHelpers/test/ImageHelpers.Tests.ps1 rename to images/windows/scripts/helpers/test/ImageHelpers.Tests.ps1 diff --git a/images/win/scripts/ImageHelpers/test/PathHelpers.Tests.ps1 b/images/windows/scripts/helpers/test/PathHelpers.Tests.ps1 similarity index 100% rename from images/win/scripts/ImageHelpers/test/PathHelpers.Tests.ps1 rename to images/windows/scripts/helpers/test/PathHelpers.Tests.ps1 diff --git a/images/win/scripts/Tests/ActionArchiveCache.Tests.ps1 b/images/windows/scripts/tests/ActionArchiveCache.Tests.ps1 similarity index 100% rename from images/win/scripts/Tests/ActionArchiveCache.Tests.ps1 rename to images/windows/scripts/tests/ActionArchiveCache.Tests.ps1 diff --git a/images/win/scripts/Tests/Android.Tests.ps1 b/images/windows/scripts/tests/Android.Tests.ps1 similarity index 100% rename from images/win/scripts/Tests/Android.Tests.ps1 rename to images/windows/scripts/tests/Android.Tests.ps1 diff --git a/images/win/scripts/Tests/Apache.Tests.ps1 b/images/windows/scripts/tests/Apache.Tests.ps1 similarity index 100% rename from images/win/scripts/Tests/Apache.Tests.ps1 rename to images/windows/scripts/tests/Apache.Tests.ps1 diff --git a/images/win/scripts/Tests/BizTalk.Tests.ps1 b/images/windows/scripts/tests/BizTalk.Tests.ps1 similarity index 100% rename from images/win/scripts/Tests/BizTalk.Tests.ps1 rename to images/windows/scripts/tests/BizTalk.Tests.ps1 diff --git a/images/win/scripts/Tests/Browsers.Tests.ps1 b/images/windows/scripts/tests/Browsers.Tests.ps1 similarity index 97% rename from images/win/scripts/Tests/Browsers.Tests.ps1 rename to images/windows/scripts/tests/Browsers.Tests.ps1 index ba5db877abf0..24b65803b8a4 100644 --- a/images/win/scripts/Tests/Browsers.Tests.ps1 +++ b/images/windows/scripts/tests/Browsers.Tests.ps1 @@ -1,160 +1,160 @@ -Describe "Chrome" { - Context "WebDriver" { - It "ChromeWebDriver environment variable and path exists" { - $env:ChromeWebDriver | Should -Not -BeNullOrEmpty - $env:ChromeWebDriver | Should -BeExactly "C:\SeleniumWebDrivers\ChromeDriver" - $env:ChromeWebDriver | Should -Exist - } - - It "chromedriver.exe is installed" { - "$env:ChromeWebDriver\chromedriver.exe --version" | Should -ReturnZeroExitCode - } - - It "versioninfo.txt exists" { - "$env:ChromeWebDriver\versioninfo.txt" | Should -Exist - } - } - - Context "Browser" { - $chromeRegPath = "HKLM:SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\chrome.exe" - $chromePath = (Get-ItemProperty $chromeRegPath).'(default)' - - It "Chrome '<chromeRegPath>' registry path exists" -TestCases @{chromeRegPath = $chromeRegPath} { - $chromeRegPath | Should -Exist - } - - It "Chrome VersionInfo registry value exists" -TestCases @{chromePath = $chromePath} { - $versionInfo = (Get-Item $chromePath).VersionInfo - $versionInfo | Should -Not -BeNullOrEmpty - } - - It "gupdate service is stopped" { - $svc = Get-Service -Name gupdate - $svc.Status | Should -BeExactly Stopped - } - - It "gupdatem service is stopped" { - $svc = Get-Service -Name gupdatem - $svc.Status | Should -BeExactly Stopped - } - - It "BlockGoogleUpdate firewall rule exists" { - Get-NetFirewallRule -DisplayName BlockGoogleUpdate | Should -Not -BeNullOrEmpty - } - - It "<chromePath> is installed" -TestCases @{chromePath = $chromePath} { - $chromeName = (Get-Item $chromePath).Name - $chromePath | Should -Exist - $chromeName | Should -BeExactly "chrome.exe" - } - - It "Chrome and Chrome Driver major versions are the same" -TestCases @{chromePath = $chromePath} { - $chromeMajor = (Get-Item $chromePath).VersionInfo.ProductMajorPart - $chromeDriverMajor = (Get-Content $env:ChromeWebDriver\versioninfo.txt).Split(".")[0] - $chromeMajor | Should -BeExactly $chromeDriverMajor - } - } -} - -Describe "Edge" { - Context "WebDriver" { - It "EdgeWebDriver environment variable and path exists" { - $env:EdgeWebDriver | Should -Not -BeNullOrEmpty - $env:EdgeWebDriver | Should -BeExactly "C:\SeleniumWebDrivers\EdgeDriver" - $env:EdgeWebDriver | Should -Exist - } - - It "msedgedriver.exe is installed" { - "$env:EdgeWebDriver\msedgedriver.exe --version" | Should -ReturnZeroExitCode - } - - It "versioninfo.txt exists" { - "$env:EdgeWebDriver\versioninfo.txt" | Should -Exist - } - } - - Context "Browser" { - $edgeRegPath = "HKLM:SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\msedge.exe" - - It "Edge '<edgeRegPath>' registry path exists" -TestCases @{edgeRegPath = $edgeRegPath} { - $edgeRegPath | Should -Exist - } - - It "Edge VersionInfo registry value exists" -TestCases @{edgeRegPath = $edgeRegPath} { - $versionInfo = (Get-Item (Get-ItemProperty $edgeRegPath).'(Default)').VersionInfo - $versionInfo | Should -Not -BeNullOrEmpty - } - - It "msedge.exe is installed" { - "${env:ProgramFiles(x86)}\Microsoft\Edge\Application\msedge.exe" | Should -Exist - } - } -} - -Describe "Firefox" { - Context "WebDriver" { - It "GeckoWebDriver environment variable and path exists" { - $env:GeckoWebDriver | Should -Not -BeNullOrEmpty - $env:GeckoWebDriver | Should -BeExactly "C:\SeleniumWebDrivers\GeckoDriver" - $env:GeckoWebDriver | Should -Exist - } - - It "geckodriver.exe is installed" { - "$env:GeckoWebDriver\geckodriver.exe --version" | Should -ReturnZeroExitCode - } - - It "versioninfo.txt exists" { - "$env:GeckoWebDriver\versioninfo.txt" | Should -Exist - } - } - - Context "Browser" { - $firefoxRegPath = "HKLM:SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\firefox.exe" - - It "Firefox '<firefoxRegPath>' registry path exists" -TestCases @{firefoxRegPath = $firefoxRegPath} { - $firefoxRegPath | Should -Exist - } - - It "Firefox VersionInfo registry value exists" -TestCases @{firefoxRegPath = $firefoxRegPath} { - $versionInfo = (Get-Item (Get-ItemProperty $firefoxRegPath).'(Default)').VersionInfo - $versionInfo | Should -Not -BeNullOrEmpty - } - - It "firefox.exe is installed" { - "$env:ProgramFiles\Mozilla Firefox\firefox.exe" | Should -Exist - } - } -} - -Describe "Internet Explorer" { - Context "WebDriver" { - It "IEWebDriver environment variable and path exists" { - $env:IEWebDriver | Should -Not -BeNullOrEmpty - $env:IEWebDriver | Should -BeExactly "C:\SeleniumWebDrivers\IEDriver" - $env:IEWebDriver | Should -Exist - } - - It "iedriverserver.exe is installed" { - "$env:IEWebDriver\IEDriverServer.exe --version" | Should -ReturnZeroExitCode - } - - It "versioninfo.txt exists" { - "$env:IEWebDriver\versioninfo.txt" | Should -Exist - } - } -} - -Describe "Selenium" { - BeforeAll { - $seleniumBinaryName = (Get-ToolsetContent).selenium.binary_name - $seleniumBinPath = Join-Path "C:\selenium\" "$seleniumBinaryName.jar" - } - - It "Selenium server is installed" { - $seleniumBinPath | Should -Exist - } - - It "SELENIUM_JAR_PATH environment variable exists" { - Get-EnvironmentVariable "SELENIUM_JAR_PATH" | Should -BeExactly "$seleniumBinPath" - } +Describe "Chrome" { + Context "WebDriver" { + It "ChromeWebDriver environment variable and path exists" { + $env:ChromeWebDriver | Should -Not -BeNullOrEmpty + $env:ChromeWebDriver | Should -BeExactly "C:\SeleniumWebDrivers\ChromeDriver" + $env:ChromeWebDriver | Should -Exist + } + + It "chromedriver.exe is installed" { + "$env:ChromeWebDriver\chromedriver.exe --version" | Should -ReturnZeroExitCode + } + + It "versioninfo.txt exists" { + "$env:ChromeWebDriver\versioninfo.txt" | Should -Exist + } + } + + Context "Browser" { + $chromeRegPath = "HKLM:SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\chrome.exe" + $chromePath = (Get-ItemProperty $chromeRegPath).'(default)' + + It "Chrome '<chromeRegPath>' registry path exists" -TestCases @{chromeRegPath = $chromeRegPath} { + $chromeRegPath | Should -Exist + } + + It "Chrome VersionInfo registry value exists" -TestCases @{chromePath = $chromePath} { + $versionInfo = (Get-Item $chromePath).VersionInfo + $versionInfo | Should -Not -BeNullOrEmpty + } + + It "gupdate service is stopped" { + $svc = Get-Service -Name gupdate + $svc.Status | Should -BeExactly Stopped + } + + It "gupdatem service is stopped" { + $svc = Get-Service -Name gupdatem + $svc.Status | Should -BeExactly Stopped + } + + It "BlockGoogleUpdate firewall rule exists" { + Get-NetFirewallRule -DisplayName BlockGoogleUpdate | Should -Not -BeNullOrEmpty + } + + It "<chromePath> is installed" -TestCases @{chromePath = $chromePath} { + $chromeName = (Get-Item $chromePath).Name + $chromePath | Should -Exist + $chromeName | Should -BeExactly "chrome.exe" + } + + It "Chrome and Chrome Driver major versions are the same" -TestCases @{chromePath = $chromePath} { + $chromeMajor = (Get-Item $chromePath).VersionInfo.ProductMajorPart + $chromeDriverMajor = (Get-Content $env:ChromeWebDriver\versioninfo.txt).Split(".")[0] + $chromeMajor | Should -BeExactly $chromeDriverMajor + } + } +} + +Describe "Edge" { + Context "WebDriver" { + It "EdgeWebDriver environment variable and path exists" { + $env:EdgeWebDriver | Should -Not -BeNullOrEmpty + $env:EdgeWebDriver | Should -BeExactly "C:\SeleniumWebDrivers\EdgeDriver" + $env:EdgeWebDriver | Should -Exist + } + + It "msedgedriver.exe is installed" { + "$env:EdgeWebDriver\msedgedriver.exe --version" | Should -ReturnZeroExitCode + } + + It "versioninfo.txt exists" { + "$env:EdgeWebDriver\versioninfo.txt" | Should -Exist + } + } + + Context "Browser" { + $edgeRegPath = "HKLM:SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\msedge.exe" + + It "Edge '<edgeRegPath>' registry path exists" -TestCases @{edgeRegPath = $edgeRegPath} { + $edgeRegPath | Should -Exist + } + + It "Edge VersionInfo registry value exists" -TestCases @{edgeRegPath = $edgeRegPath} { + $versionInfo = (Get-Item (Get-ItemProperty $edgeRegPath).'(Default)').VersionInfo + $versionInfo | Should -Not -BeNullOrEmpty + } + + It "msedge.exe is installed" { + "${env:ProgramFiles(x86)}\Microsoft\Edge\Application\msedge.exe" | Should -Exist + } + } +} + +Describe "Firefox" { + Context "WebDriver" { + It "GeckoWebDriver environment variable and path exists" { + $env:GeckoWebDriver | Should -Not -BeNullOrEmpty + $env:GeckoWebDriver | Should -BeExactly "C:\SeleniumWebDrivers\GeckoDriver" + $env:GeckoWebDriver | Should -Exist + } + + It "geckodriver.exe is installed" { + "$env:GeckoWebDriver\geckodriver.exe --version" | Should -ReturnZeroExitCode + } + + It "versioninfo.txt exists" { + "$env:GeckoWebDriver\versioninfo.txt" | Should -Exist + } + } + + Context "Browser" { + $firefoxRegPath = "HKLM:SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\firefox.exe" + + It "Firefox '<firefoxRegPath>' registry path exists" -TestCases @{firefoxRegPath = $firefoxRegPath} { + $firefoxRegPath | Should -Exist + } + + It "Firefox VersionInfo registry value exists" -TestCases @{firefoxRegPath = $firefoxRegPath} { + $versionInfo = (Get-Item (Get-ItemProperty $firefoxRegPath).'(Default)').VersionInfo + $versionInfo | Should -Not -BeNullOrEmpty + } + + It "firefox.exe is installed" { + "$env:ProgramFiles\Mozilla Firefox\firefox.exe" | Should -Exist + } + } +} + +Describe "Internet Explorer" { + Context "WebDriver" { + It "IEWebDriver environment variable and path exists" { + $env:IEWebDriver | Should -Not -BeNullOrEmpty + $env:IEWebDriver | Should -BeExactly "C:\SeleniumWebDrivers\IEDriver" + $env:IEWebDriver | Should -Exist + } + + It "iedriverserver.exe is installed" { + "$env:IEWebDriver\IEDriverServer.exe --version" | Should -ReturnZeroExitCode + } + + It "versioninfo.txt exists" { + "$env:IEWebDriver\versioninfo.txt" | Should -Exist + } + } +} + +Describe "Selenium" { + BeforeAll { + $seleniumBinaryName = (Get-ToolsetContent).selenium.binary_name + $seleniumBinPath = Join-Path "C:\selenium\" "$seleniumBinaryName.jar" + } + + It "Selenium server is installed" { + $seleniumBinPath | Should -Exist + } + + It "SELENIUM_JAR_PATH environment variable exists" { + Get-EnvironmentVariable "SELENIUM_JAR_PATH" | Should -BeExactly "$seleniumBinPath" + } } \ No newline at end of file diff --git a/images/win/scripts/Tests/CLI.Tools.Tests.ps1 b/images/windows/scripts/tests/CLI.Tools.Tests.ps1 similarity index 100% rename from images/win/scripts/Tests/CLI.Tools.Tests.ps1 rename to images/windows/scripts/tests/CLI.Tools.Tests.ps1 diff --git a/images/win/scripts/Tests/ChocoPackages.Tests.ps1 b/images/windows/scripts/tests/ChocoPackages.Tests.ps1 similarity index 100% rename from images/win/scripts/Tests/ChocoPackages.Tests.ps1 rename to images/windows/scripts/tests/ChocoPackages.Tests.ps1 diff --git a/images/win/scripts/Tests/Databases.Tests.ps1 b/images/windows/scripts/tests/Databases.Tests.ps1 similarity index 100% rename from images/win/scripts/Tests/Databases.Tests.ps1 rename to images/windows/scripts/tests/Databases.Tests.ps1 diff --git a/images/win/scripts/Tests/Docker.Tests.ps1 b/images/windows/scripts/tests/Docker.Tests.ps1 similarity index 100% rename from images/win/scripts/Tests/Docker.Tests.ps1 rename to images/windows/scripts/tests/Docker.Tests.ps1 diff --git a/images/win/scripts/Tests/DotnetSDK.Tests.ps1 b/images/windows/scripts/tests/DotnetSDK.Tests.ps1 similarity index 100% rename from images/win/scripts/Tests/DotnetSDK.Tests.ps1 rename to images/windows/scripts/tests/DotnetSDK.Tests.ps1 diff --git a/images/win/scripts/Tests/Git.Tests.ps1 b/images/windows/scripts/tests/Git.Tests.ps1 similarity index 96% rename from images/win/scripts/Tests/Git.Tests.ps1 rename to images/windows/scripts/tests/Git.Tests.ps1 index 9b71aa0b806b..00b3d23024b2 100644 --- a/images/win/scripts/Tests/Git.Tests.ps1 +++ b/images/windows/scripts/tests/Git.Tests.ps1 @@ -1,25 +1,25 @@ -Describe "Git" { - $gitTools = 'bash', 'awk', 'git', 'git-lfs' - $gitTestCases = $gitTools | ForEach-Object { - @{ - toolName = $_ - source = [regex]::Escape("$env:ProgramFiles\Git") - } - } - - It "<toolName> is installed" -TestCases $gitTestCases { - "$toolName --version" | Should -ReturnZeroExitCode - } - - It "<toolName> is located in '<source>'" -TestCases $gitTestCases { - (Get-Command -Name $toolName).Source | Should -Match $source - } - - It "Git core.symlinks=true option is enabled" { - git config core.symlinks | Should -BeExactly true - } - - It "GCM_INTERACTIVE environment variable should be equal Never" { - $env:GCM_INTERACTIVE | Should -BeExactly Never - } -} +Describe "Git" { + $gitTools = 'bash', 'awk', 'git', 'git-lfs' + $gitTestCases = $gitTools | ForEach-Object { + @{ + toolName = $_ + source = [regex]::Escape("$env:ProgramFiles\Git") + } + } + + It "<toolName> is installed" -TestCases $gitTestCases { + "$toolName --version" | Should -ReturnZeroExitCode + } + + It "<toolName> is located in '<source>'" -TestCases $gitTestCases { + (Get-Command -Name $toolName).Source | Should -Match $source + } + + It "Git core.symlinks=true option is enabled" { + git config core.symlinks | Should -BeExactly true + } + + It "GCM_INTERACTIVE environment variable should be equal Never" { + $env:GCM_INTERACTIVE | Should -BeExactly Never + } +} diff --git a/images/win/scripts/Tests/Haskell.Tests.ps1 b/images/windows/scripts/tests/Haskell.Tests.ps1 similarity index 97% rename from images/win/scripts/Tests/Haskell.Tests.ps1 rename to images/windows/scripts/tests/Haskell.Tests.ps1 index fd6b6b2c7c98..6b4b9b5e4c0e 100644 --- a/images/win/scripts/Tests/Haskell.Tests.ps1 +++ b/images/windows/scripts/tests/Haskell.Tests.ps1 @@ -1,62 +1,62 @@ -Describe "Haskell" { - $ghcPackagesPath = "c:\ghcup\ghc" - [array]$ghcVersionList = Get-ChildItem -Path $ghcPackagesPath -Filter "*" | ForEach-Object { $_.Name.Trim() } - $ghcCount = $ghcVersionList.Count - $defaultGhcVersion = $ghcVersionList | Sort-Object {[Version]$_} | Select-Object -Last 1 - $ghcDefaultCases = @{ - defaultGhcVersion = $defaultGhcVersion - defaultGhcShortVersion = ([version]$defaultGhcVersion).ToString(3) - } - - $ghcTestCases = $ghcVersionList | ForEach-Object { - $ghcVersion = $_ - $ghcShortVersion = ([version]$ghcVersion).ToString(3) - $binGhcPath = Join-Path $ghcPackagesPath "$ghcShortVersion\bin\ghc.exe" - @{ - ghcVersion = $ghcVersion - ghcShortVersion = $ghcShortVersion - binGhcPath = $binGhcPath - } - } - - $ghcupEnvExists = @( - @{envVar = "GHCUP_INSTALL_BASE_PREFIX"} - @{envVar = "GHCUP_MSYS2"} - ) - - It "<envVar> environment variable exists" -TestCases $ghcupEnvExists { - Test-Path env:\$envVar - } - - It "Accurate 3 versions of GHC are installed" -TestCases @{ghcCount = $ghcCount} { - $ghcCount | Should -BeExactly 3 - } - - It "GHC <ghcVersion> is installed" -TestCases $ghcTestCases { - "$binGhcPath --version" | Should -MatchCommandOutput $ghcShortVersion - } - - It "GHC <defaultGhcVersion> is the default version and should be the latest installed" -TestCases $ghcDefaultCases { - "ghc --version" | Should -MatchCommandOutput $defaultGhcShortVersion - } - - It "Cabal is installed" { - "cabal --version" | Should -ReturnZeroExitCode - } - - It "cabal folder does not exist" { - $env:CABAL_DIR | Should -Not -Exist - } - - It "CABAL_DIR environment variable exists" { - Get-EnvironmentVariable CABAL_DIR | Should -BeExactly "C:\cabal" - } - - It "ghcup is installed" { - "ghcup --version" | Should -ReturnZeroExitCode - } - - It "ghcup can access msys2" { - "ghcup run --mingw-path -- pacman --version" | Should -ReturnZeroExitCode - } -} +Describe "Haskell" { + $ghcPackagesPath = "c:\ghcup\ghc" + [array]$ghcVersionList = Get-ChildItem -Path $ghcPackagesPath -Filter "*" | ForEach-Object { $_.Name.Trim() } + $ghcCount = $ghcVersionList.Count + $defaultGhcVersion = $ghcVersionList | Sort-Object {[Version]$_} | Select-Object -Last 1 + $ghcDefaultCases = @{ + defaultGhcVersion = $defaultGhcVersion + defaultGhcShortVersion = ([version]$defaultGhcVersion).ToString(3) + } + + $ghcTestCases = $ghcVersionList | ForEach-Object { + $ghcVersion = $_ + $ghcShortVersion = ([version]$ghcVersion).ToString(3) + $binGhcPath = Join-Path $ghcPackagesPath "$ghcShortVersion\bin\ghc.exe" + @{ + ghcVersion = $ghcVersion + ghcShortVersion = $ghcShortVersion + binGhcPath = $binGhcPath + } + } + + $ghcupEnvExists = @( + @{envVar = "GHCUP_INSTALL_BASE_PREFIX"} + @{envVar = "GHCUP_MSYS2"} + ) + + It "<envVar> environment variable exists" -TestCases $ghcupEnvExists { + Test-Path env:\$envVar + } + + It "Accurate 3 versions of GHC are installed" -TestCases @{ghcCount = $ghcCount} { + $ghcCount | Should -BeExactly 3 + } + + It "GHC <ghcVersion> is installed" -TestCases $ghcTestCases { + "$binGhcPath --version" | Should -MatchCommandOutput $ghcShortVersion + } + + It "GHC <defaultGhcVersion> is the default version and should be the latest installed" -TestCases $ghcDefaultCases { + "ghc --version" | Should -MatchCommandOutput $defaultGhcShortVersion + } + + It "Cabal is installed" { + "cabal --version" | Should -ReturnZeroExitCode + } + + It "cabal folder does not exist" { + $env:CABAL_DIR | Should -Not -Exist + } + + It "CABAL_DIR environment variable exists" { + Get-EnvironmentVariable CABAL_DIR | Should -BeExactly "C:\cabal" + } + + It "ghcup is installed" { + "ghcup --version" | Should -ReturnZeroExitCode + } + + It "ghcup can access msys2" { + "ghcup run --mingw-path -- pacman --version" | Should -ReturnZeroExitCode + } +} diff --git a/images/win/scripts/Tests/Java.Tests.ps1 b/images/windows/scripts/tests/Java.Tests.ps1 similarity index 100% rename from images/win/scripts/Tests/Java.Tests.ps1 rename to images/windows/scripts/tests/Java.Tests.ps1 diff --git a/images/win/scripts/Tests/LLVM.Tests.ps1 b/images/windows/scripts/tests/LLVM.Tests.ps1 similarity index 100% rename from images/win/scripts/Tests/LLVM.Tests.ps1 rename to images/windows/scripts/tests/LLVM.Tests.ps1 diff --git a/images/win/scripts/Tests/MSYS2.Tests.ps1 b/images/windows/scripts/tests/MSYS2.Tests.ps1 similarity index 100% rename from images/win/scripts/Tests/MSYS2.Tests.ps1 rename to images/windows/scripts/tests/MSYS2.Tests.ps1 diff --git a/images/win/scripts/Tests/Miniconda.Tests.ps1 b/images/windows/scripts/tests/Miniconda.Tests.ps1 similarity index 100% rename from images/win/scripts/Tests/Miniconda.Tests.ps1 rename to images/windows/scripts/tests/Miniconda.Tests.ps1 diff --git a/images/win/scripts/Tests/Nginx.Tests.ps1 b/images/windows/scripts/tests/Nginx.Tests.ps1 similarity index 100% rename from images/win/scripts/Tests/Nginx.Tests.ps1 rename to images/windows/scripts/tests/Nginx.Tests.ps1 diff --git a/images/win/scripts/Tests/Node.Tests.ps1 b/images/windows/scripts/tests/Node.Tests.ps1 similarity index 100% rename from images/win/scripts/Tests/Node.Tests.ps1 rename to images/windows/scripts/tests/Node.Tests.ps1 diff --git a/images/win/scripts/Tests/PHP.Tests.ps1 b/images/windows/scripts/tests/PHP.Tests.ps1 similarity index 100% rename from images/win/scripts/Tests/PHP.Tests.ps1 rename to images/windows/scripts/tests/PHP.Tests.ps1 diff --git a/images/win/scripts/Tests/PipxPackages.Tests.ps1 b/images/windows/scripts/tests/PipxPackages.Tests.ps1 similarity index 100% rename from images/win/scripts/Tests/PipxPackages.Tests.ps1 rename to images/windows/scripts/tests/PipxPackages.Tests.ps1 diff --git a/images/win/scripts/Tests/PowerShellAzModules.Tests.ps1 b/images/windows/scripts/tests/PowerShellAzModules.Tests.ps1 similarity index 100% rename from images/win/scripts/Tests/PowerShellAzModules.Tests.ps1 rename to images/windows/scripts/tests/PowerShellAzModules.Tests.ps1 diff --git a/images/win/scripts/Tests/PowerShellModules.Tests.ps1 b/images/windows/scripts/tests/PowerShellModules.Tests.ps1 similarity index 100% rename from images/win/scripts/Tests/PowerShellModules.Tests.ps1 rename to images/windows/scripts/tests/PowerShellModules.Tests.ps1 diff --git a/images/win/scripts/Tests/RunAll-Tests.ps1 b/images/windows/scripts/tests/RunAll-Tests.ps1 similarity index 100% rename from images/win/scripts/Tests/RunAll-Tests.ps1 rename to images/windows/scripts/tests/RunAll-Tests.ps1 diff --git a/images/win/scripts/Tests/RunnerCache.tests.ps1 b/images/windows/scripts/tests/RunnerCache.tests.ps1 similarity index 100% rename from images/win/scripts/Tests/RunnerCache.tests.ps1 rename to images/windows/scripts/tests/RunnerCache.tests.ps1 diff --git a/images/win/scripts/Tests/Rust.Tests.ps1 b/images/windows/scripts/tests/Rust.Tests.ps1 similarity index 97% rename from images/win/scripts/Tests/Rust.Tests.ps1 rename to images/windows/scripts/tests/Rust.Tests.ps1 index 3551871b5d53..1814396fd85a 100644 --- a/images/win/scripts/Tests/Rust.Tests.ps1 +++ b/images/windows/scripts/tests/Rust.Tests.ps1 @@ -1,35 +1,35 @@ -Describe "Rust" { - BeforeAll { - $env:RUSTUP_HOME = "C:\Users\Default\.rustup" - $env:CARGO_HOME = "C:\Users\Default\.cargo" - $env:Path += ";$env:CARGO_HOME\bin" - } - - $rustTools = @( - @{ToolName = "rustup"; binPath = "C:\Users\Default\.cargo\bin\rustup.exe"} - @{ToolName = "rustc"; binPath = "C:\Users\Default\.cargo\bin\rustc.exe"} - @{ToolName = "bindgen.exe"; binPath = "C:\Users\Default\.cargo\bin\bindgen.exe"} - @{ToolName = "cbindgen.exe"; binPath = "C:\Users\Default\.cargo\bin\cbindgen.exe"} - @{ToolName = "cargo"; binPath = "C:\Users\Default\.cargo\bin\cargo.exe"} - @{ToolName = "cargo audit"; binPath = "C:\Users\Default\.cargo\bin\cargo-audit.exe"} - @{ToolName = "cargo outdated"; binPath = "C:\Users\Default\.cargo\bin\cargo-outdated.exe"} - ) - - $rustEnvNotExists = @( - @{envVar = "RUSTUP_HOME"} - @{envVar = "CARGO_HOME"} - ) - - It "C:\Users\Default\.rustup and C:\Users\Default\.cargo folders exist" { - "C:\Users\Default\.rustup", "C:\Users\Default\.cargo" | Should -Exist - } - - It "<envVar> environment variable does not exist" -TestCases $rustEnvNotExists { - [Environment]::GetEnvironmentVariables("Machine").ContainsKey($envVar) | Should -BeFalse - } - - It "<ToolName> is installed to the '<binPath>' folder" -TestCases $rustTools { - "$ToolName --version" | Should -ReturnZeroExitCode - $binPath | Should -Exist - } -} +Describe "Rust" { + BeforeAll { + $env:RUSTUP_HOME = "C:\Users\Default\.rustup" + $env:CARGO_HOME = "C:\Users\Default\.cargo" + $env:Path += ";$env:CARGO_HOME\bin" + } + + $rustTools = @( + @{ToolName = "rustup"; binPath = "C:\Users\Default\.cargo\bin\rustup.exe"} + @{ToolName = "rustc"; binPath = "C:\Users\Default\.cargo\bin\rustc.exe"} + @{ToolName = "bindgen.exe"; binPath = "C:\Users\Default\.cargo\bin\bindgen.exe"} + @{ToolName = "cbindgen.exe"; binPath = "C:\Users\Default\.cargo\bin\cbindgen.exe"} + @{ToolName = "cargo"; binPath = "C:\Users\Default\.cargo\bin\cargo.exe"} + @{ToolName = "cargo audit"; binPath = "C:\Users\Default\.cargo\bin\cargo-audit.exe"} + @{ToolName = "cargo outdated"; binPath = "C:\Users\Default\.cargo\bin\cargo-outdated.exe"} + ) + + $rustEnvNotExists = @( + @{envVar = "RUSTUP_HOME"} + @{envVar = "CARGO_HOME"} + ) + + It "C:\Users\Default\.rustup and C:\Users\Default\.cargo folders exist" { + "C:\Users\Default\.rustup", "C:\Users\Default\.cargo" | Should -Exist + } + + It "<envVar> environment variable does not exist" -TestCases $rustEnvNotExists { + [Environment]::GetEnvironmentVariables("Machine").ContainsKey($envVar) | Should -BeFalse + } + + It "<ToolName> is installed to the '<binPath>' folder" -TestCases $rustTools { + "$ToolName --version" | Should -ReturnZeroExitCode + $binPath | Should -Exist + } +} diff --git a/images/win/scripts/Tests/SSDTExtensions.Tests.ps1 b/images/windows/scripts/tests/SSDTExtensions.Tests.ps1 similarity index 100% rename from images/win/scripts/Tests/SSDTExtensions.Tests.ps1 rename to images/windows/scripts/tests/SSDTExtensions.Tests.ps1 diff --git a/images/win/scripts/Tests/Shell.Tests.ps1 b/images/windows/scripts/tests/Shell.Tests.ps1 similarity index 100% rename from images/win/scripts/Tests/Shell.Tests.ps1 rename to images/windows/scripts/tests/Shell.Tests.ps1 diff --git a/images/win/scripts/Tests/Tools.Tests.ps1 b/images/windows/scripts/tests/Tools.Tests.ps1 similarity index 100% rename from images/win/scripts/Tests/Tools.Tests.ps1 rename to images/windows/scripts/tests/Tools.Tests.ps1 diff --git a/images/win/scripts/Tests/Toolset.Tests.ps1 b/images/windows/scripts/tests/Toolset.Tests.ps1 similarity index 100% rename from images/win/scripts/Tests/Toolset.Tests.ps1 rename to images/windows/scripts/tests/Toolset.Tests.ps1 diff --git a/images/win/scripts/Tests/VisualStudio.Tests.ps1 b/images/windows/scripts/tests/VisualStudio.Tests.ps1 similarity index 100% rename from images/win/scripts/Tests/VisualStudio.Tests.ps1 rename to images/windows/scripts/tests/VisualStudio.Tests.ps1 diff --git a/images/win/scripts/Tests/Vsix.Tests.ps1 b/images/windows/scripts/tests/Vsix.Tests.ps1 similarity index 97% rename from images/win/scripts/Tests/Vsix.Tests.ps1 rename to images/windows/scripts/tests/Vsix.Tests.ps1 index f09c086133c1..5c52da613b96 100644 --- a/images/win/scripts/Tests/Vsix.Tests.ps1 +++ b/images/windows/scripts/tests/Vsix.Tests.ps1 @@ -1,20 +1,20 @@ -Describe "Vsix" { - $toolset = Get-ToolsetContent - $requiredVsixs = $toolset.visualStudio.vsix - - $allPackages = (Get-VisualStudioInstance).Packages - $testCases = $requiredVsixs | ForEach-Object { - $vsix = Get-VsixExtenstionFromMarketplace -ExtensionMarketPlaceName $_ - @{ - VsixName = $vsix.ExtensionName - VsixId = $vsix.VsixId - AllPackages = $allPackages - } - } - if ($testCases.Count -gt 0) { - It "Extension <VsixName> is installed" -TestCases $testCases { - $objVsix = $AllPackages | Where-Object { $_.id -eq $VsixId } - $objVsix | Should -Not -BeNullOrEmpty - } - } +Describe "Vsix" { + $toolset = Get-ToolsetContent + $requiredVsixs = $toolset.visualStudio.vsix + + $allPackages = (Get-VisualStudioInstance).Packages + $testCases = $requiredVsixs | ForEach-Object { + $vsix = Get-VsixExtenstionFromMarketplace -ExtensionMarketPlaceName $_ + @{ + VsixName = $vsix.ExtensionName + VsixId = $vsix.VsixId + AllPackages = $allPackages + } + } + if ($testCases.Count -gt 0) { + It "Extension <VsixName> is installed" -TestCases $testCases { + $objVsix = $AllPackages | Where-Object { $_.id -eq $VsixId } + $objVsix | Should -Not -BeNullOrEmpty + } + } } \ No newline at end of file diff --git a/images/win/scripts/Tests/WDK.Tests.ps1 b/images/windows/scripts/tests/WDK.Tests.ps1 similarity index 100% rename from images/win/scripts/Tests/WDK.Tests.ps1 rename to images/windows/scripts/tests/WDK.Tests.ps1 diff --git a/images/win/scripts/Tests/WinAppDriver.Tests.ps1 b/images/windows/scripts/tests/WinAppDriver.Tests.ps1 similarity index 100% rename from images/win/scripts/Tests/WinAppDriver.Tests.ps1 rename to images/windows/scripts/tests/WinAppDriver.Tests.ps1 diff --git a/images/win/scripts/Tests/WindowsFeatures.Tests.ps1 b/images/windows/scripts/tests/WindowsFeatures.Tests.ps1 similarity index 100% rename from images/win/scripts/Tests/WindowsFeatures.Tests.ps1 rename to images/windows/scripts/tests/WindowsFeatures.Tests.ps1 diff --git a/images/win/scripts/Tests/Wix.Tests.ps1 b/images/windows/scripts/tests/Wix.Tests.ps1 similarity index 100% rename from images/win/scripts/Tests/Wix.Tests.ps1 rename to images/windows/scripts/tests/Wix.Tests.ps1 diff --git a/images/win/windows2019.json b/images/windows/templates/windows-2019.json similarity index 52% rename from images/win/windows2019.json rename to images/windows/templates/windows-2019.json index dea37bf830c6..ce5566b0c090 100644 --- a/images/win/windows2019.json +++ b/images/windows/templates/windows-2019.json @@ -73,33 +73,30 @@ }, { "type": "file", - "source": "{{ template_dir }}/scripts/ImageHelpers", - "destination": "{{user `helper_script_folder`}}" - }, - { - "type": "file", - "source": "{{ template_dir }}/scripts/SoftwareReport", - "destination": "{{user `image_folder`}}" - }, - { - "type": "file", - "source": "{{ template_dir }}/../../helpers/software-report-base", - "destination": "{{user `image_folder`}}/SoftwareReport/" - }, - { - "type": "file", - "source": "{{ template_dir }}/post-generation", - "destination": "C:/" + "sources": [ + "{{ template_dir }}/../assets", + "{{ template_dir }}/../scripts", + "{{ template_dir }}/../toolsets" + ], + "destination": "{{user `image_folder`}}\\" }, { "type": "file", - "source": "{{ template_dir }}/scripts/Tests", - "destination": "{{user `image_folder`}}" + "source": "{{ template_dir }}/../../../helpers/software-report-base", + "destination": "{{user `image_folder`}}\\scripts\\docs-gen\\" }, { - "type": "file", - "source": "{{template_dir}}/toolsets/toolset-2019.json", - "destination": "{{user `image_folder`}}\\toolset.json" + "type": "powershell", + "inline": [ + "Move-Item '{{user `image_folder`}}\\assets\\post-gen' 'C:\\post-generation'", + "Remove-Item -Recurse '{{user `image_folder`}}\\assets'", + "Move-Item '{{user `image_folder`}}\\scripts\\docs-gen' '{{user `image_folder`}}\\SoftwareReport'", + "Move-Item '{{user `image_folder`}}\\scripts\\helpers' '{{user `helper_script_folder`}}\\ImageHelpers'", + "Move-Item '{{user `image_folder`}}\\scripts\\tests' '{{user `image_folder`}}\\tests'", + "Remove-Item -Recurse '{{user `image_folder`}}\\scripts'", + "Move-Item '{{user `image_folder`}}\\toolsets\\toolset-2019.json' '{{user `image_folder`}}\\toolset.json'", + "Remove-Item -Recurse '{{user `image_folder`}}\\toolsets'" + ] }, { "type": "windows-shell", @@ -131,7 +128,7 @@ 3010 ], "scripts": [ - "{{ template_dir }}/scripts/Installers/Install-NET48.ps1" + "{{ template_dir }}/../scripts/build/Install-NET48.ps1" ], "elevated_user": "{{user `install_user`}}", "elevated_password": "{{user `install_password`}}" @@ -150,14 +147,14 @@ "IMAGEDATA_FILE={{user `imagedata_file`}}" ], "scripts": [ - "{{ template_dir }}/scripts/Installers/Configure-Antivirus.ps1", - "{{ template_dir }}/scripts/Installers/Configure-PowerShell.ps1", - "{{ template_dir }}/scripts/Installers/Install-PowerShellModules.ps1", - "{{ template_dir }}/scripts/Installers/Install-WindowsFeatures.ps1", - "{{ template_dir }}/scripts/Installers/Install-Choco.ps1", - "{{ template_dir }}/scripts/Installers/Initialize-VM.ps1", - "{{ template_dir }}/scripts/Installers/Update-ImageData.ps1", - "{{ template_dir }}/scripts/Installers/Update-DotnetTLS.ps1" + "{{ template_dir }}/../scripts/build/Configure-Antivirus.ps1", + "{{ template_dir }}/../scripts/build/Configure-PowerShell.ps1", + "{{ template_dir }}/../scripts/build/Install-PowerShellModules.ps1", + "{{ template_dir }}/../scripts/build/Install-WindowsFeatures.ps1", + "{{ template_dir }}/../scripts/build/Install-Choco.ps1", + "{{ template_dir }}/../scripts/build/Initialize-VM.ps1", + "{{ template_dir }}/../scripts/build/Update-ImageData.ps1", + "{{ template_dir }}/../scripts/build/Update-DotnetTLS.ps1" ], "execution_policy": "unrestricted" }, @@ -168,13 +165,13 @@ { "type": "powershell", "scripts": [ - "{{ template_dir }}/scripts/Installers/Install-VCRedist.ps1", - "{{ template_dir }}/scripts/Installers/Install-Docker.ps1", - "{{ template_dir }}/scripts/Installers/Install-Docker-WinCred.ps1", - "{{ template_dir }}/scripts/Installers/Install-Docker-Compose.ps1", - "{{ template_dir }}/scripts/Installers/Install-PowershellCore.ps1", - "{{ template_dir }}/scripts/Installers/Install-WebPlatformInstaller.ps1", - "{{ template_dir }}/scripts/Installers/Install-Runner.ps1" + "{{ template_dir }}/../scripts/build/Install-VCRedist.ps1", + "{{ template_dir }}/../scripts/build/Install-Docker.ps1", + "{{ template_dir }}/../scripts/build/Install-Docker-WinCred.ps1", + "{{ template_dir }}/../scripts/build/Install-Docker-Compose.ps1", + "{{ template_dir }}/../scripts/build/Install-PowershellCore.ps1", + "{{ template_dir }}/../scripts/build/Install-WebPlatformInstaller.ps1", + "{{ template_dir }}/../scripts/build/Install-Runner.ps1" ] }, { @@ -188,9 +185,9 @@ 3010 ], "scripts": [ - "{{ template_dir }}/scripts/Installers/Install-VS.ps1", - "{{ template_dir }}/scripts/Installers/Install-KubernetesTools.ps1", - "{{ template_dir }}/scripts/Installers/Install-NET48-devpack.ps1" + "{{ template_dir }}/../scripts/build/Install-VS.ps1", + "{{ template_dir }}/../scripts/build/Install-KubernetesTools.ps1", + "{{ template_dir }}/../scripts/build/Install-NET48-devpack.ps1" ], "elevated_user": "{{user `install_user`}}", "elevated_password": "{{user `install_password`}}" @@ -198,21 +195,21 @@ { "type": "powershell", "scripts": [ - "{{ template_dir }}/scripts/Installers/Install-Wix.ps1", - "{{ template_dir }}/scripts/Installers/Install-WDK.ps1", - "{{ template_dir }}/scripts/Installers/Install-Vsix.ps1", - "{{ template_dir }}/scripts/Installers/Install-AzureCli.ps1", - "{{ template_dir }}/scripts/Installers/Install-AzureDevOpsCli.ps1", - "{{ template_dir }}/scripts/Installers/Install-CommonUtils.ps1", - "{{ template_dir }}/scripts/Installers/Install-JavaTools.ps1", - "{{ template_dir }}/scripts/Installers/Install-Kotlin.ps1", - "{{ template_dir }}/scripts/Installers/Install-OpenSSL.ps1" + "{{ template_dir }}/../scripts/build/Install-Wix.ps1", + "{{ template_dir }}/../scripts/build/Install-WDK.ps1", + "{{ template_dir }}/../scripts/build/Install-Vsix.ps1", + "{{ template_dir }}/../scripts/build/Install-AzureCli.ps1", + "{{ template_dir }}/../scripts/build/Install-AzureDevOpsCli.ps1", + "{{ template_dir }}/../scripts/build/Install-CommonUtils.ps1", + "{{ template_dir }}/../scripts/build/Install-JavaTools.ps1", + "{{ template_dir }}/../scripts/build/Install-Kotlin.ps1", + "{{ template_dir }}/../scripts/build/Install-OpenSSL.ps1" ] }, { "type": "powershell", "scripts": [ - "{{ template_dir }}/scripts/Installers/Install-ServiceFabricSDK.ps1" + "{{ template_dir }}/../scripts/build/Install-ServiceFabricSDK.ps1" ], "execution_policy": "remotesigned" }, @@ -229,67 +226,67 @@ { "type": "powershell", "scripts": [ - "{{ template_dir }}/scripts/Installers/Install-ActionArchiveCache.ps1", - "{{ template_dir }}/scripts/Installers/Install-Ruby.ps1", - "{{ template_dir }}/scripts/Installers/Install-PyPy.ps1", - "{{ template_dir }}/scripts/Installers/Install-Toolset.ps1", - "{{ template_dir }}/scripts/Installers/Configure-Toolset.ps1", - "{{ template_dir }}/scripts/Installers/Install-NodeLts.ps1", - "{{ template_dir }}/scripts/Installers/Install-AndroidSDK.ps1", - "{{ template_dir }}/scripts/Installers/Install-AzureModules.ps1", - "{{ template_dir }}/scripts/Installers/Install-Pipx.ps1", - "{{ template_dir }}/scripts/Installers/Install-PipxPackages.ps1", - "{{ template_dir }}/scripts/Installers/Install-Git.ps1", - "{{ template_dir }}/scripts/Installers/Install-GitHub-CLI.ps1", - "{{ template_dir }}/scripts/Installers/Install-PHP.ps1", - "{{ template_dir }}/scripts/Installers/Install-Rust.ps1", - "{{ template_dir }}/scripts/Installers/Install-Sbt.ps1", - "{{ template_dir }}/scripts/Installers/Install-Chrome.ps1", - "{{ template_dir }}/scripts/Installers/Install-Edge.ps1", - "{{ template_dir }}/scripts/Installers/Install-Firefox.ps1", - "{{ template_dir }}/scripts/Installers/Install-Selenium.ps1", - "{{ template_dir }}/scripts/Installers/Install-IEWebDriver.ps1", - "{{ template_dir }}/scripts/Installers/Install-Apache.ps1", - "{{ template_dir }}/scripts/Installers/Install-Nginx.ps1", - "{{ template_dir }}/scripts/Installers/Install-Msys2.ps1", - "{{ template_dir }}/scripts/Installers/Install-WinAppDriver.ps1", - "{{ template_dir }}/scripts/Installers/Install-R.ps1", - "{{ template_dir }}/scripts/Installers/Install-AWS.ps1", - "{{ template_dir }}/scripts/Installers/Install-DACFx.ps1", - "{{ template_dir }}/scripts/Installers/Install-MysqlCli.ps1", - "{{ template_dir }}/scripts/Installers/Install-SQLPowerShellTools.ps1", - "{{ template_dir }}/scripts/Installers/Install-SQLOLEDBDriver.ps1", - "{{ template_dir }}/scripts/Installers/Install-DotnetSDK.ps1", - "{{ template_dir }}/scripts/Installers/Install-Mingw64.ps1", - "{{ template_dir }}/scripts/Installers/Install-Haskell.ps1", - "{{ template_dir }}/scripts/Installers/Install-Stack.ps1", - "{{ template_dir }}/scripts/Installers/Install-Miniconda.ps1", - "{{ template_dir }}/scripts/Installers/Install-AzureCosmosDbEmulator.ps1", - "{{ template_dir }}/scripts/Installers/Install-Mercurial.ps1", - "{{ template_dir }}/scripts/Installers/Install-Zstd.ps1", - "{{ template_dir }}/scripts/Installers/Install-NSIS.ps1", - "{{ template_dir }}/scripts/Installers/Install-CloudFoundryCli.ps1", - "{{ template_dir }}/scripts/Installers/Install-Vcpkg.ps1", - "{{ template_dir }}/scripts/Installers/Install-PostgreSQL.ps1", - "{{ template_dir }}/scripts/Installers/Install-Bazel.ps1", - "{{ template_dir }}/scripts/Installers/Install-AliyunCli.ps1", - "{{ template_dir }}/scripts/Installers/Install-RootCA.ps1", - "{{ template_dir }}/scripts/Installers/Install-MongoDB.ps1", - "{{ template_dir }}/scripts/Installers/Install-GoogleCloudCLI.ps1", - "{{ template_dir }}/scripts/Installers/Install-CodeQLBundle.ps1", - "{{ template_dir }}/scripts/Installers/Install-BizTalkBuildComponent.ps1", - "{{ template_dir }}/scripts/Installers/Disable-JITDebugger.ps1", - "{{ template_dir }}/scripts/Installers/Configure-DynamicPort.ps1", - "{{ template_dir }}/scripts/Installers/Configure-GDIProcessHandleQuota.ps1", - "{{ template_dir }}/scripts/Installers/Configure-Shell.ps1", - "{{ template_dir }}/scripts/Installers/Enable-DeveloperMode.ps1", - "{{ template_dir }}/scripts/Installers/Install-LLVM.ps1" + "{{ template_dir }}/../scripts/build/Install-ActionArchiveCache.ps1", + "{{ template_dir }}/../scripts/build/Install-Ruby.ps1", + "{{ template_dir }}/../scripts/build/Install-PyPy.ps1", + "{{ template_dir }}/../scripts/build/Install-Toolset.ps1", + "{{ template_dir }}/../scripts/build/Configure-Toolset.ps1", + "{{ template_dir }}/../scripts/build/Install-NodeLts.ps1", + "{{ template_dir }}/../scripts/build/Install-AndroidSDK.ps1", + "{{ template_dir }}/../scripts/build/Install-AzureModules.ps1", + "{{ template_dir }}/../scripts/build/Install-Pipx.ps1", + "{{ template_dir }}/../scripts/build/Install-PipxPackages.ps1", + "{{ template_dir }}/../scripts/build/Install-Git.ps1", + "{{ template_dir }}/../scripts/build/Install-GitHub-CLI.ps1", + "{{ template_dir }}/../scripts/build/Install-PHP.ps1", + "{{ template_dir }}/../scripts/build/Install-Rust.ps1", + "{{ template_dir }}/../scripts/build/Install-Sbt.ps1", + "{{ template_dir }}/../scripts/build/Install-Chrome.ps1", + "{{ template_dir }}/../scripts/build/Install-Edge.ps1", + "{{ template_dir }}/../scripts/build/Install-Firefox.ps1", + "{{ template_dir }}/../scripts/build/Install-Selenium.ps1", + "{{ template_dir }}/../scripts/build/Install-IEWebDriver.ps1", + "{{ template_dir }}/../scripts/build/Install-Apache.ps1", + "{{ template_dir }}/../scripts/build/Install-Nginx.ps1", + "{{ template_dir }}/../scripts/build/Install-Msys2.ps1", + "{{ template_dir }}/../scripts/build/Install-WinAppDriver.ps1", + "{{ template_dir }}/../scripts/build/Install-R.ps1", + "{{ template_dir }}/../scripts/build/Install-AWS.ps1", + "{{ template_dir }}/../scripts/build/Install-DACFx.ps1", + "{{ template_dir }}/../scripts/build/Install-MysqlCli.ps1", + "{{ template_dir }}/../scripts/build/Install-SQLPowerShellTools.ps1", + "{{ template_dir }}/../scripts/build/Install-SQLOLEDBDriver.ps1", + "{{ template_dir }}/../scripts/build/Install-DotnetSDK.ps1", + "{{ template_dir }}/../scripts/build/Install-Mingw64.ps1", + "{{ template_dir }}/../scripts/build/Install-Haskell.ps1", + "{{ template_dir }}/../scripts/build/Install-Stack.ps1", + "{{ template_dir }}/../scripts/build/Install-Miniconda.ps1", + "{{ template_dir }}/../scripts/build/Install-AzureCosmosDbEmulator.ps1", + "{{ template_dir }}/../scripts/build/Install-Mercurial.ps1", + "{{ template_dir }}/../scripts/build/Install-Zstd.ps1", + "{{ template_dir }}/../scripts/build/Install-NSIS.ps1", + "{{ template_dir }}/../scripts/build/Install-CloudFoundryCli.ps1", + "{{ template_dir }}/../scripts/build/Install-Vcpkg.ps1", + "{{ template_dir }}/../scripts/build/Install-PostgreSQL.ps1", + "{{ template_dir }}/../scripts/build/Install-Bazel.ps1", + "{{ template_dir }}/../scripts/build/Install-AliyunCli.ps1", + "{{ template_dir }}/../scripts/build/Install-RootCA.ps1", + "{{ template_dir }}/../scripts/build/Install-MongoDB.ps1", + "{{ template_dir }}/../scripts/build/Install-GoogleCloudCLI.ps1", + "{{ template_dir }}/../scripts/build/Install-CodeQLBundle.ps1", + "{{ template_dir }}/../scripts/build/Install-BizTalkBuildComponent.ps1", + "{{ template_dir }}/../scripts/build/Disable-JITDebugger.ps1", + "{{ template_dir }}/../scripts/build/Configure-DynamicPort.ps1", + "{{ template_dir }}/../scripts/build/Configure-GDIProcessHandleQuota.ps1", + "{{ template_dir }}/../scripts/build/Configure-Shell.ps1", + "{{ template_dir }}/../scripts/build/Enable-DeveloperMode.ps1", + "{{ template_dir }}/../scripts/build/Install-LLVM.ps1" ] }, { "type": "powershell", "scripts": [ - "{{ template_dir }}/scripts/Installers/Install-WindowsUpdates.ps1" + "{{ template_dir }}/../scripts/build/Install-WindowsUpdates.ps1" ], "elevated_user": "{{user `install_user`}}", "elevated_password": "{{user `install_password`}}" @@ -304,14 +301,14 @@ "type": "powershell", "pause_before": "2m", "scripts": [ - "{{ template_dir }}/scripts/Installers/Wait-WindowsUpdatesForInstall.ps1", - "{{ template_dir }}/scripts/Tests/RunAll-Tests.ps1" + "{{ template_dir }}/../scripts/build/Wait-WindowsUpdatesForInstall.ps1", + "{{ template_dir }}/../scripts/tests/RunAll-Tests.ps1" ] }, { "type": "powershell", "inline": [ - "if (-not (Test-Path {{user `image_folder`}}\\Tests\\testResults.xml)) { throw '{{user `image_folder`}}\\Tests\\testResults.xml not found' }" + "if (-not (Test-Path {{user `image_folder`}}\\tests\\testResults.xml)) { throw '{{user `image_folder`}}\\tests\\testResults.xml not found' }" ] }, { @@ -333,22 +330,22 @@ { "type": "file", "source": "C:\\software-report.md", - "destination": "{{ template_dir }}/Windows2019-Readme.md", + "destination": "{{ template_dir }}/../Windows2019-Readme.md", "direction": "download" }, { "type": "file", "source": "C:\\software-report.json", - "destination": "{{ template_dir }}/software-report.json", + "destination": "{{ template_dir }}/../software-report.json", "direction": "download" }, { "type": "powershell", "skip_clean": true, "scripts": [ - "{{ template_dir }}/scripts/Installers/Run-NGen.ps1", - "{{ template_dir }}/scripts/Installers/Finalize-VM.ps1", - "{{ template_dir }}/scripts/Installers/Warmup-User.ps1" + "{{ template_dir }}/../scripts/build/Run-NGen.ps1", + "{{ template_dir }}/../scripts/build/Finalize-VM.ps1", + "{{ template_dir }}/../scripts/build/Warmup-User.ps1" ], "environment_vars": [ "INSTALL_USER={{user `install_user`}}" diff --git a/images/win/windows2022.json b/images/windows/templates/windows-2022.json similarity index 54% rename from images/win/windows2022.json rename to images/windows/templates/windows-2022.json index 1ab93251d352..bfa4de3d3651 100644 --- a/images/win/windows2022.json +++ b/images/windows/templates/windows-2022.json @@ -73,33 +73,30 @@ }, { "type": "file", - "source": "{{ template_dir }}/scripts/ImageHelpers", - "destination": "{{user `helper_script_folder`}}" - }, - { - "type": "file", - "source": "{{ template_dir }}/scripts/SoftwareReport", - "destination": "{{user `image_folder`}}" - }, - { - "type": "file", - "source": "{{ template_dir }}/../../helpers/software-report-base", - "destination": "{{user `image_folder`}}/SoftwareReport/" - }, - { - "type": "file", - "source": "{{ template_dir }}/post-generation", - "destination": "C:/" + "sources": [ + "{{ template_dir }}/../assets", + "{{ template_dir }}/../scripts", + "{{ template_dir }}/../toolsets" + ], + "destination": "{{user `image_folder`}}\\" }, { "type": "file", - "source": "{{ template_dir }}/scripts/Tests", - "destination": "{{user `image_folder`}}" + "source": "{{ template_dir }}/../../../helpers/software-report-base", + "destination": "{{user `image_folder`}}\\scripts\\docs-gen\\" }, { - "type": "file", - "source": "{{template_dir}}/toolsets/toolset-2022.json", - "destination": "{{user `image_folder`}}\\toolset.json" + "type": "powershell", + "inline": [ + "Move-Item '{{user `image_folder`}}\\assets\\post-gen' 'C:\\post-generation'", + "Remove-Item -Recurse '{{user `image_folder`}}\\assets'", + "Move-Item '{{user `image_folder`}}\\scripts\\docs-gen' '{{user `image_folder`}}\\SoftwareReport'", + "Move-Item '{{user `image_folder`}}\\scripts\\helpers' '{{user `helper_script_folder`}}\\ImageHelpers'", + "Move-Item '{{user `image_folder`}}\\scripts\\tests' '{{user `image_folder`}}\\tests'", + "Remove-Item -Recurse '{{user `image_folder`}}\\scripts'", + "Move-Item '{{user `image_folder`}}\\toolsets\\toolset-2022.json' '{{user `image_folder`}}\\toolset.json'", + "Remove-Item -Recurse '{{user `image_folder`}}\\toolsets'" + ] }, { "type": "windows-shell", @@ -134,14 +131,14 @@ "IMAGEDATA_FILE={{user `imagedata_file`}}" ], "scripts": [ - "{{ template_dir }}/scripts/Installers/Configure-Antivirus.ps1", - "{{ template_dir }}/scripts/Installers/Configure-PowerShell.ps1", - "{{ template_dir }}/scripts/Installers/Install-PowerShellModules.ps1", - "{{ template_dir }}/scripts/Installers/Install-WindowsFeatures.ps1", - "{{ template_dir }}/scripts/Installers/Install-Choco.ps1", - "{{ template_dir }}/scripts/Installers/Initialize-VM.ps1", - "{{ template_dir }}/scripts/Installers/Update-ImageData.ps1", - "{{ template_dir }}/scripts/Installers/Update-DotnetTLS.ps1" + "{{ template_dir }}/../scripts/build/Configure-Antivirus.ps1", + "{{ template_dir }}/../scripts/build/Configure-PowerShell.ps1", + "{{ template_dir }}/../scripts/build/Install-PowerShellModules.ps1", + "{{ template_dir }}/../scripts/build/Install-WindowsFeatures.ps1", + "{{ template_dir }}/../scripts/build/Install-Choco.ps1", + "{{ template_dir }}/../scripts/build/Initialize-VM.ps1", + "{{ template_dir }}/../scripts/build/Update-ImageData.ps1", + "{{ template_dir }}/../scripts/build/Update-DotnetTLS.ps1" ], "execution_policy": "unrestricted" }, @@ -154,12 +151,12 @@ { "type": "powershell", "scripts": [ - "{{ template_dir }}/scripts/Installers/Install-Docker.ps1", - "{{ template_dir }}/scripts/Installers/Install-Docker-WinCred.ps1", - "{{ template_dir }}/scripts/Installers/Install-Docker-Compose.ps1", - "{{ template_dir }}/scripts/Installers/Install-PowershellCore.ps1", - "{{ template_dir }}/scripts/Installers/Install-WebPlatformInstaller.ps1", - "{{ template_dir }}/scripts/Installers/Install-Runner.ps1" + "{{ template_dir }}/../scripts/build/Install-Docker.ps1", + "{{ template_dir }}/../scripts/build/Install-Docker-WinCred.ps1", + "{{ template_dir }}/../scripts/build/Install-Docker-Compose.ps1", + "{{ template_dir }}/../scripts/build/Install-PowershellCore.ps1", + "{{ template_dir }}/../scripts/build/Install-WebPlatformInstaller.ps1", + "{{ template_dir }}/../scripts/build/Install-Runner.ps1" ] }, { @@ -173,8 +170,8 @@ 3010 ], "scripts": [ - "{{ template_dir }}/scripts/Installers/Install-VS.ps1", - "{{ template_dir }}/scripts/Installers/Install-KubernetesTools.ps1" + "{{ template_dir }}/../scripts/build/Install-VS.ps1", + "{{ template_dir }}/../scripts/build/Install-KubernetesTools.ps1" ], "elevated_user": "{{user `install_user`}}", "elevated_password": "{{user `install_password`}}" @@ -188,21 +185,21 @@ "type": "powershell", "pause_before": "2m", "scripts": [ - "{{ template_dir }}/scripts/Installers/Install-Wix.ps1", - "{{ template_dir }}/scripts/Installers/Install-WDK.ps1", - "{{ template_dir }}/scripts/Installers/Install-Vsix.ps1", - "{{ template_dir }}/scripts/Installers/Install-AzureCli.ps1", - "{{ template_dir }}/scripts/Installers/Install-AzureDevOpsCli.ps1", - "{{ template_dir }}/scripts/Installers/Install-CommonUtils.ps1", - "{{ template_dir }}/scripts/Installers/Install-JavaTools.ps1", - "{{ template_dir }}/scripts/Installers/Install-Kotlin.ps1", - "{{ template_dir }}/scripts/Installers/Install-OpenSSL.ps1" + "{{ template_dir }}/../scripts/build/Install-Wix.ps1", + "{{ template_dir }}/../scripts/build/Install-WDK.ps1", + "{{ template_dir }}/../scripts/build/Install-Vsix.ps1", + "{{ template_dir }}/../scripts/build/Install-AzureCli.ps1", + "{{ template_dir }}/../scripts/build/Install-AzureDevOpsCli.ps1", + "{{ template_dir }}/../scripts/build/Install-CommonUtils.ps1", + "{{ template_dir }}/../scripts/build/Install-JavaTools.ps1", + "{{ template_dir }}/../scripts/build/Install-Kotlin.ps1", + "{{ template_dir }}/../scripts/build/Install-OpenSSL.ps1" ] }, { "type": "powershell", "scripts": [ - "{{ template_dir }}/scripts/Installers/Install-ServiceFabricSDK.ps1" + "{{ template_dir }}/../scripts/build/Install-ServiceFabricSDK.ps1" ], "execution_policy": "remotesigned" }, @@ -219,64 +216,64 @@ { "type": "powershell", "scripts": [ - "{{ template_dir }}/scripts/Installers/Install-ActionArchiveCache.ps1", - "{{ template_dir }}/scripts/Installers/Install-Ruby.ps1", - "{{ template_dir }}/scripts/Installers/Install-PyPy.ps1", - "{{ template_dir }}/scripts/Installers/Install-Toolset.ps1", - "{{ template_dir }}/scripts/Installers/Configure-Toolset.ps1", - "{{ template_dir }}/scripts/Installers/Install-NodeLts.ps1", - "{{ template_dir }}/scripts/Installers/Install-AndroidSDK.ps1", - "{{ template_dir }}/scripts/Installers/Install-AzureModules.ps1", - "{{ template_dir }}/scripts/Installers/Install-Pipx.ps1", - "{{ template_dir }}/scripts/Installers/Install-PipxPackages.ps1", - "{{ template_dir }}/scripts/Installers/Install-Git.ps1", - "{{ template_dir }}/scripts/Installers/Install-GitHub-CLI.ps1", - "{{ template_dir }}/scripts/Installers/Install-PHP.ps1", - "{{ template_dir }}/scripts/Installers/Install-Rust.ps1", - "{{ template_dir }}/scripts/Installers/Install-Sbt.ps1", - "{{ template_dir }}/scripts/Installers/Install-Chrome.ps1", - "{{ template_dir }}/scripts/Installers/Install-Edge.ps1", - "{{ template_dir }}/scripts/Installers/Install-Firefox.ps1", - "{{ template_dir }}/scripts/Installers/Install-Selenium.ps1", - "{{ template_dir }}/scripts/Installers/Install-IEWebDriver.ps1", - "{{ template_dir }}/scripts/Installers/Install-Apache.ps1", - "{{ template_dir }}/scripts/Installers/Install-Nginx.ps1", - "{{ template_dir }}/scripts/Installers/Install-Msys2.ps1", - "{{ template_dir }}/scripts/Installers/Install-WinAppDriver.ps1", - "{{ template_dir }}/scripts/Installers/Install-R.ps1", - "{{ template_dir }}/scripts/Installers/Install-AWS.ps1", - "{{ template_dir }}/scripts/Installers/Install-DACFx.ps1", - "{{ template_dir }}/scripts/Installers/Install-MysqlCli.ps1", - "{{ template_dir }}/scripts/Installers/Install-SQLPowerShellTools.ps1", - "{{ template_dir }}/scripts/Installers/Install-SQLOLEDBDriver.ps1", - "{{ template_dir }}/scripts/Installers/Install-DotnetSDK.ps1", - "{{ template_dir }}/scripts/Installers/Install-Mingw64.ps1", - "{{ template_dir }}/scripts/Installers/Install-Haskell.ps1", - "{{ template_dir }}/scripts/Installers/Install-Stack.ps1", - "{{ template_dir }}/scripts/Installers/Install-Miniconda.ps1", - "{{ template_dir }}/scripts/Installers/Install-AzureCosmosDbEmulator.ps1", - "{{ template_dir }}/scripts/Installers/Install-Mercurial.ps1", - "{{ template_dir }}/scripts/Installers/Install-Zstd.ps1", - "{{ template_dir }}/scripts/Installers/Install-NSIS.ps1", - "{{ template_dir }}/scripts/Installers/Install-Vcpkg.ps1", - "{{ template_dir }}/scripts/Installers/Install-PostgreSQL.ps1", - "{{ template_dir }}/scripts/Installers/Install-Bazel.ps1", - "{{ template_dir }}/scripts/Installers/Install-AliyunCli.ps1", - "{{ template_dir }}/scripts/Installers/Install-RootCA.ps1", - "{{ template_dir }}/scripts/Installers/Install-MongoDB.ps1", - "{{ template_dir }}/scripts/Installers/Install-CodeQLBundle.ps1", - "{{ template_dir }}/scripts/Installers/Disable-JITDebugger.ps1" + "{{ template_dir }}/../scripts/build/Install-ActionArchiveCache.ps1", + "{{ template_dir }}/../scripts/build/Install-Ruby.ps1", + "{{ template_dir }}/../scripts/build/Install-PyPy.ps1", + "{{ template_dir }}/../scripts/build/Install-Toolset.ps1", + "{{ template_dir }}/../scripts/build/Configure-Toolset.ps1", + "{{ template_dir }}/../scripts/build/Install-NodeLts.ps1", + "{{ template_dir }}/../scripts/build/Install-AndroidSDK.ps1", + "{{ template_dir }}/../scripts/build/Install-AzureModules.ps1", + "{{ template_dir }}/../scripts/build/Install-Pipx.ps1", + "{{ template_dir }}/../scripts/build/Install-PipxPackages.ps1", + "{{ template_dir }}/../scripts/build/Install-Git.ps1", + "{{ template_dir }}/../scripts/build/Install-GitHub-CLI.ps1", + "{{ template_dir }}/../scripts/build/Install-PHP.ps1", + "{{ template_dir }}/../scripts/build/Install-Rust.ps1", + "{{ template_dir }}/../scripts/build/Install-Sbt.ps1", + "{{ template_dir }}/../scripts/build/Install-Chrome.ps1", + "{{ template_dir }}/../scripts/build/Install-Edge.ps1", + "{{ template_dir }}/../scripts/build/Install-Firefox.ps1", + "{{ template_dir }}/../scripts/build/Install-Selenium.ps1", + "{{ template_dir }}/../scripts/build/Install-IEWebDriver.ps1", + "{{ template_dir }}/../scripts/build/Install-Apache.ps1", + "{{ template_dir }}/../scripts/build/Install-Nginx.ps1", + "{{ template_dir }}/../scripts/build/Install-Msys2.ps1", + "{{ template_dir }}/../scripts/build/Install-WinAppDriver.ps1", + "{{ template_dir }}/../scripts/build/Install-R.ps1", + "{{ template_dir }}/../scripts/build/Install-AWS.ps1", + "{{ template_dir }}/../scripts/build/Install-DACFx.ps1", + "{{ template_dir }}/../scripts/build/Install-MysqlCli.ps1", + "{{ template_dir }}/../scripts/build/Install-SQLPowerShellTools.ps1", + "{{ template_dir }}/../scripts/build/Install-SQLOLEDBDriver.ps1", + "{{ template_dir }}/../scripts/build/Install-DotnetSDK.ps1", + "{{ template_dir }}/../scripts/build/Install-Mingw64.ps1", + "{{ template_dir }}/../scripts/build/Install-Haskell.ps1", + "{{ template_dir }}/../scripts/build/Install-Stack.ps1", + "{{ template_dir }}/../scripts/build/Install-Miniconda.ps1", + "{{ template_dir }}/../scripts/build/Install-AzureCosmosDbEmulator.ps1", + "{{ template_dir }}/../scripts/build/Install-Mercurial.ps1", + "{{ template_dir }}/../scripts/build/Install-Zstd.ps1", + "{{ template_dir }}/../scripts/build/Install-NSIS.ps1", + "{{ template_dir }}/../scripts/build/Install-Vcpkg.ps1", + "{{ template_dir }}/../scripts/build/Install-PostgreSQL.ps1", + "{{ template_dir }}/../scripts/build/Install-Bazel.ps1", + "{{ template_dir }}/../scripts/build/Install-AliyunCli.ps1", + "{{ template_dir }}/../scripts/build/Install-RootCA.ps1", + "{{ template_dir }}/../scripts/build/Install-MongoDB.ps1", + "{{ template_dir }}/../scripts/build/Install-CodeQLBundle.ps1", + "{{ template_dir }}/../scripts/build/Disable-JITDebugger.ps1" ] }, { "type": "powershell", "scripts": [ - "{{ template_dir }}/scripts/Installers/Install-WindowsUpdates.ps1", - "{{ template_dir }}/scripts/Installers/Configure-DynamicPort.ps1", - "{{ template_dir }}/scripts/Installers/Configure-GDIProcessHandleQuota.ps1", - "{{ template_dir }}/scripts/Installers/Configure-Shell.ps1", - "{{ template_dir }}/scripts/Installers/Enable-DeveloperMode.ps1", - "{{ template_dir }}/scripts/Installers/Install-LLVM.ps1" + "{{ template_dir }}/../scripts/build/Install-WindowsUpdates.ps1", + "{{ template_dir }}/../scripts/build/Configure-DynamicPort.ps1", + "{{ template_dir }}/../scripts/build/Configure-GDIProcessHandleQuota.ps1", + "{{ template_dir }}/../scripts/build/Configure-Shell.ps1", + "{{ template_dir }}/../scripts/build/Enable-DeveloperMode.ps1", + "{{ template_dir }}/../scripts/build/Install-LLVM.ps1" ], "elevated_user": "{{user `install_user`}}", "elevated_password": "{{user `install_password`}}" @@ -291,14 +288,14 @@ "type": "powershell", "pause_before": "2m", "scripts": [ - "{{ template_dir }}/scripts/Installers/Wait-WindowsUpdatesForInstall.ps1", - "{{ template_dir }}/scripts/Tests/RunAll-Tests.ps1" + "{{ template_dir }}/../scripts/build/Wait-WindowsUpdatesForInstall.ps1", + "{{ template_dir }}/../scripts/tests/RunAll-Tests.ps1" ] }, { "type": "powershell", "inline": [ - "if (-not (Test-Path {{user `image_folder`}}\\Tests\\testResults.xml)) { throw '{{user `image_folder`}}\\Tests\\testResults.xml not found' }" + "if (-not (Test-Path {{user `image_folder`}}\\tests\\testResults.xml)) { throw '{{user `image_folder`}}\\tests\\testResults.xml not found' }" ] }, { @@ -320,22 +317,22 @@ { "type": "file", "source": "C:\\software-report.md", - "destination": "{{ template_dir }}/Windows2022-Readme.md", + "destination": "{{ template_dir }}/../Windows2022-Readme.md", "direction": "download" }, { "type": "file", "source": "C:\\software-report.json", - "destination": "{{ template_dir }}/software-report.json", + "destination": "{{ template_dir }}/../software-report.json", "direction": "download" }, { "type": "powershell", "skip_clean": true, "scripts": [ - "{{ template_dir }}/scripts/Installers/Run-NGen.ps1", - "{{ template_dir }}/scripts/Installers/Finalize-VM.ps1", - "{{ template_dir }}/scripts/Installers/Warmup-User.ps1" + "{{ template_dir }}/../scripts/build/Run-NGen.ps1", + "{{ template_dir }}/../scripts/build/Finalize-VM.ps1", + "{{ template_dir }}/../scripts/build/Warmup-User.ps1" ], "environment_vars": [ "INSTALL_USER={{user `install_user`}}" diff --git a/images/win/toolsets/toolset-2019.json b/images/windows/toolsets/toolset-2019.json similarity index 100% rename from images/win/toolsets/toolset-2019.json rename to images/windows/toolsets/toolset-2019.json diff --git a/images/win/toolsets/toolset-2022.json b/images/windows/toolsets/toolset-2022.json similarity index 100% rename from images/win/toolsets/toolset-2022.json rename to images/windows/toolsets/toolset-2022.json From 5d40b1e2130ee3081ebf2a5f0b75854e3a4aff2e Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Wed, 15 Nov 2023 11:36:04 +0100 Subject: [PATCH 2438/3485] [Ubuntu] Implement new directories hierarchy (#8627) --- .github/workflows/ubuntu2004.yml | 2 +- .github/workflows/ubuntu2204.yml | 2 +- CONTRIBUTING.md | 8 +- README.md | 4 +- docs/create-image-and-azure-resources.md | 2 +- helpers/GenerateResourcesAndImage.ps1 | 6 +- .../azure-pipelines/image-generation.yml | 4 +- .../azure-pipelines/ubuntu2004.yml | 3 +- .../azure-pipelines/ubuntu2204.yml | 3 +- images.CI/shebang-linter.ps1 | 6 +- images/{linux => ubuntu}/Ubuntu2004-Readme.md | 0 images/{linux => ubuntu}/Ubuntu2204-Readme.md | 0 .../assets/post-gen}/cleanup-logs.sh | 0 .../assets/post-gen}/environment-variables.sh | 0 .../assets/post-gen}/systemd-linger.sh | 0 .../config => ubuntu/assets}/ubuntu2004.conf | 0 .../config => ubuntu/assets}/ubuntu2204.conf | 0 .../scripts/build}/Configure-Toolset.ps1 | 190 +++++++-------- .../scripts/build}/Install-AzureModules.ps1 | 0 .../build}/Install-PowerShellModules.ps1 | 68 +++--- .../scripts/build}/Install-Toolset.ps1 | 0 .../scripts/build}/action-archive-cache.sh | 0 .../scripts/build}/aliyun-cli.sh | 0 .../scripts/build}/android.sh | 0 .../scripts/build}/apache.sh | 0 .../scripts/build}/apt-common.sh | 0 .../scripts/build}/apt-mock-remove.sh | 0 .../base => ubuntu/scripts/build}/apt-mock.sh | 0 .../scripts/build}/apt-ubuntu-archive.sh | 0 .../scripts/build}/apt-vital.sh | 0 .../base => ubuntu/scripts/build}/apt.sh | 0 .../scripts/build}/aws.sh | 0 .../scripts/build}/azcopy.sh | 0 .../scripts/build}/azure-cli.sh | 0 .../scripts/build}/azure-devops-cli.sh | 0 .../scripts/build}/bazel.sh | 0 .../scripts/build}/bicep.sh | 0 .../scripts/build}/clang.sh | 0 .../scripts/build}/cleanup.sh | 0 .../scripts/build}/cmake.sh | 0 .../scripts/build}/codeql-bundle.sh | 0 .../scripts/build}/complete-snap-setup.sh | 0 .../scripts/build}/configure-environment.sh | 0 .../scripts/build}/containers.sh | 0 .../scripts/build}/docker-compose.sh | 0 .../scripts/build}/docker.sh | 0 .../scripts/build}/dotnetcore-sdk.sh | 0 .../scripts/build}/dpkg-config.sh | 0 .../scripts/build}/erlang.sh | 0 .../scripts/build}/example.sh | 0 .../scripts/build}/firefox.sh | 0 .../scripts/build}/gcc.sh | 0 .../scripts/build}/gfortran.sh | 0 .../scripts/build}/git-lfs.sh | 0 .../scripts/build}/git.sh | 0 .../scripts/build}/github-cli.sh | 0 .../scripts/build}/google-chrome.sh | 0 .../scripts/build}/google-cloud-cli.sh | 0 .../scripts/build}/haskell.sh | 0 .../scripts/build}/heroku.sh | 0 .../scripts/build}/hhvm.sh | 0 .../scripts/build}/homebrew.sh | 0 .../scripts/build}/java-tools.sh | 0 .../scripts/build}/julia.sh | 0 .../scripts/build}/kotlin.sh | 0 .../scripts/build}/kubernetes-tools.sh | 0 .../scripts/build}/leiningen.sh | 0 .../base => ubuntu/scripts/build}/limits.sh | 0 .../scripts/build}/microsoft-edge.sh | 0 .../scripts/build}/miniconda.sh | 0 .../scripts/build}/mongodb.sh | 0 .../scripts/build}/mono.sh | 0 .../scripts/build}/mssql-cmd-tools.sh | 0 .../scripts/build}/mysql.sh | 0 .../scripts/build}/nginx.sh | 0 .../scripts/build}/nodejs.sh | 0 .../scripts/build}/nvm.sh | 0 .../installers => ubuntu/scripts/build}/oc.sh | 0 .../scripts/build}/oras-cli.sh | 0 .../scripts/build}/packer.sh | 0 .../scripts/build}/phantomjs.sh | 0 .../scripts/build}/php.sh | 0 .../scripts/build}/pipx-packages.sh | 0 .../scripts/build}/post-deployment.sh | 0 .../scripts/build}/postgresql.sh | 0 .../scripts/build}/powershellcore.sh | 0 .../scripts/build}/preimagedata.sh | 2 +- .../scripts/build}/pulumi.sh | 0 .../scripts/build}/pypy.sh | 0 .../scripts/build}/python.sh | 0 .../installers => ubuntu/scripts/build}/r.sh | 0 .../base => ubuntu/scripts/build}/reboot.sh | 0 .../base => ubuntu/scripts/build}/repos.sh | 0 .../scripts/build}/ruby.sh | 0 .../scripts/build}/runner-package.sh | 0 .../scripts/build}/rust.sh | 0 .../scripts/build}/sbt.sh | 0 .../scripts/build}/selenium.sh | 0 .../base => ubuntu/scripts/build}/snap.sh | 0 .../scripts/build}/sphinx.sh | 0 .../scripts/build}/sqlpackage.sh | 0 .../scripts/build}/swift.sh | 0 .../scripts/build}/terraform.sh | 0 .../scripts/build}/validate-disk-space.sh | 0 .../scripts/build}/vcpkg.sh | 0 .../installers => ubuntu/scripts/build}/yq.sh | 0 .../scripts/build}/zstd.sh | 0 .../docs-gen}/SoftwareReport.Android.psm1 | 0 .../docs-gen}/SoftwareReport.Browsers.psm1 | 0 .../docs-gen}/SoftwareReport.CachedTools.psm1 | 0 .../docs-gen}/SoftwareReport.Common.psm1 | 0 .../docs-gen}/SoftwareReport.Databases.psm1 | 0 .../docs-gen}/SoftwareReport.Generator.ps1 | 0 .../docs-gen}/SoftwareReport.Java.psm1 | 0 .../docs-gen}/SoftwareReport.Rust.psm1 | 0 .../docs-gen}/SoftwareReport.Tools.psm1 | 0 .../docs-gen}/SoftwareReport.WebServers.psm1 | 0 .../scripts/helpers/Common.Helpers.psm1 | 0 .../helpers/SoftwareReport.Helpers.psm1 | 0 .../scripts/helpers/Tests.Helpers.psm1 | 0 .../scripts/helpers/etc-environment.sh | 0 .../scripts/helpers/install.sh | 0 .../scripts/helpers/invoke-tests.sh | 0 .../{linux => ubuntu}/scripts/helpers/os.sh | 0 .../tests/ActionArchiveCache.Tests.ps1 | 0 .../scripts/tests/Android.Tests.ps1 | 0 .../scripts/tests/Apt.Tests.ps1 | 0 .../scripts/tests/Browsers.Tests.ps1 | 0 .../scripts/tests/CLI.Tools.Tests.ps1 | 0 .../scripts/tests/Common.Tests.ps1 | 0 .../scripts/tests/Databases.Tests.ps1 | 0 .../scripts/tests/DotnetSDK.Tests.ps1 | 0 .../scripts/tests/Haskell.Tests.ps1 | 0 .../scripts/tests/Java.Tests.ps1 | 0 .../scripts/tests/Node.Tests.ps1 | 0 .../scripts/tests/PowerShellModules.Tests.ps1 | 0 .../scripts/tests/RunAll-Tests.ps1 | 0 .../scripts/tests/RunnerCache.Tests.ps1 | 0 .../scripts/tests/Tools.Tests.ps1 | 0 .../scripts/tests/Toolset.Tests.ps1 | 0 .../scripts/tests/WebServers.Tests.ps1 | 0 .../templates/ubuntu-20.04.json} | 225 +++++++++--------- .../templates/ubuntu-22.04.pkr.hcl} | 206 ++++++++-------- .../templates/ubuntu-minimal.pkr.hcl} | 65 ++--- .../toolsets/toolset-2004.json | 0 .../toolsets/toolset-2204.json | 0 146 files changed, 391 insertions(+), 405 deletions(-) rename images/{linux => ubuntu}/Ubuntu2004-Readme.md (100%) rename images/{linux => ubuntu}/Ubuntu2204-Readme.md (100%) rename images/{linux/post-generation => ubuntu/assets/post-gen}/cleanup-logs.sh (100%) rename images/{linux/post-generation => ubuntu/assets/post-gen}/environment-variables.sh (100%) rename images/{linux/post-generation => ubuntu/assets/post-gen}/systemd-linger.sh (100%) rename images/{linux/config => ubuntu/assets}/ubuntu2004.conf (100%) rename images/{linux/config => ubuntu/assets}/ubuntu2204.conf (100%) rename images/{linux/scripts/installers => ubuntu/scripts/build}/Configure-Toolset.ps1 (96%) rename images/{linux/scripts/installers => ubuntu/scripts/build}/Install-AzureModules.ps1 (100%) rename images/{linux/scripts/installers => ubuntu/scripts/build}/Install-PowerShellModules.ps1 (96%) rename images/{linux/scripts/installers => ubuntu/scripts/build}/Install-Toolset.ps1 (100%) rename images/{linux/scripts/installers => ubuntu/scripts/build}/action-archive-cache.sh (100%) mode change 100755 => 100644 rename images/{linux/scripts/installers => ubuntu/scripts/build}/aliyun-cli.sh (100%) rename images/{linux/scripts/installers => ubuntu/scripts/build}/android.sh (100%) rename images/{linux/scripts/installers => ubuntu/scripts/build}/apache.sh (100%) rename images/{linux/scripts/installers => ubuntu/scripts/build}/apt-common.sh (100%) rename images/{linux/scripts/base => ubuntu/scripts/build}/apt-mock-remove.sh (100%) rename images/{linux/scripts/base => ubuntu/scripts/build}/apt-mock.sh (100%) rename images/{linux/scripts/base => ubuntu/scripts/build}/apt-ubuntu-archive.sh (100%) rename images/{linux/scripts/installers => ubuntu/scripts/build}/apt-vital.sh (100%) rename images/{linux/scripts/base => ubuntu/scripts/build}/apt.sh (100%) rename images/{linux/scripts/installers => ubuntu/scripts/build}/aws.sh (100%) rename images/{linux/scripts/installers => ubuntu/scripts/build}/azcopy.sh (100%) rename images/{linux/scripts/installers => ubuntu/scripts/build}/azure-cli.sh (100%) rename images/{linux/scripts/installers => ubuntu/scripts/build}/azure-devops-cli.sh (100%) rename images/{linux/scripts/installers => ubuntu/scripts/build}/bazel.sh (100%) rename images/{linux/scripts/installers => ubuntu/scripts/build}/bicep.sh (100%) rename images/{linux/scripts/installers => ubuntu/scripts/build}/clang.sh (100%) rename images/{linux/scripts/installers => ubuntu/scripts/build}/cleanup.sh (100%) rename images/{linux/scripts/installers => ubuntu/scripts/build}/cmake.sh (100%) rename images/{linux/scripts/installers => ubuntu/scripts/build}/codeql-bundle.sh (100%) rename images/{linux/scripts/installers => ubuntu/scripts/build}/complete-snap-setup.sh (100%) rename images/{linux/scripts/installers => ubuntu/scripts/build}/configure-environment.sh (100%) rename images/{linux/scripts/installers => ubuntu/scripts/build}/containers.sh (100%) rename images/{linux/scripts/installers => ubuntu/scripts/build}/docker-compose.sh (100%) rename images/{linux/scripts/installers => ubuntu/scripts/build}/docker.sh (100%) rename images/{linux/scripts/installers => ubuntu/scripts/build}/dotnetcore-sdk.sh (100%) rename images/{linux/scripts/installers => ubuntu/scripts/build}/dpkg-config.sh (100%) rename images/{linux/scripts/installers => ubuntu/scripts/build}/erlang.sh (100%) rename images/{linux/scripts/installers => ubuntu/scripts/build}/example.sh (100%) rename images/{linux/scripts/installers => ubuntu/scripts/build}/firefox.sh (100%) rename images/{linux/scripts/installers => ubuntu/scripts/build}/gcc.sh (100%) rename images/{linux/scripts/installers => ubuntu/scripts/build}/gfortran.sh (100%) rename images/{linux/scripts/installers => ubuntu/scripts/build}/git-lfs.sh (100%) rename images/{linux/scripts/installers => ubuntu/scripts/build}/git.sh (100%) rename images/{linux/scripts/installers => ubuntu/scripts/build}/github-cli.sh (100%) rename images/{linux/scripts/installers => ubuntu/scripts/build}/google-chrome.sh (100%) rename images/{linux/scripts/installers => ubuntu/scripts/build}/google-cloud-cli.sh (100%) rename images/{linux/scripts/installers => ubuntu/scripts/build}/haskell.sh (100%) rename images/{linux/scripts/installers => ubuntu/scripts/build}/heroku.sh (100%) rename images/{linux/scripts/installers => ubuntu/scripts/build}/hhvm.sh (100%) rename images/{linux/scripts/installers => ubuntu/scripts/build}/homebrew.sh (100%) rename images/{linux/scripts/installers => ubuntu/scripts/build}/java-tools.sh (100%) rename images/{linux/scripts/installers => ubuntu/scripts/build}/julia.sh (100%) rename images/{linux/scripts/installers => ubuntu/scripts/build}/kotlin.sh (100%) rename images/{linux/scripts/installers => ubuntu/scripts/build}/kubernetes-tools.sh (100%) rename images/{linux/scripts/installers => ubuntu/scripts/build}/leiningen.sh (100%) rename images/{linux/scripts/base => ubuntu/scripts/build}/limits.sh (100%) rename images/{linux/scripts/installers => ubuntu/scripts/build}/microsoft-edge.sh (100%) rename images/{linux/scripts/installers => ubuntu/scripts/build}/miniconda.sh (100%) rename images/{linux/scripts/installers => ubuntu/scripts/build}/mongodb.sh (100%) rename images/{linux/scripts/installers => ubuntu/scripts/build}/mono.sh (100%) rename images/{linux/scripts/installers => ubuntu/scripts/build}/mssql-cmd-tools.sh (100%) rename images/{linux/scripts/installers => ubuntu/scripts/build}/mysql.sh (100%) rename images/{linux/scripts/installers => ubuntu/scripts/build}/nginx.sh (100%) rename images/{linux/scripts/installers => ubuntu/scripts/build}/nodejs.sh (100%) rename images/{linux/scripts/installers => ubuntu/scripts/build}/nvm.sh (100%) rename images/{linux/scripts/installers => ubuntu/scripts/build}/oc.sh (100%) rename images/{linux/scripts/installers => ubuntu/scripts/build}/oras-cli.sh (100%) rename images/{linux/scripts/installers => ubuntu/scripts/build}/packer.sh (100%) rename images/{linux/scripts/installers => ubuntu/scripts/build}/phantomjs.sh (100%) rename images/{linux/scripts/installers => ubuntu/scripts/build}/php.sh (100%) rename images/{linux/scripts/installers => ubuntu/scripts/build}/pipx-packages.sh (100%) rename images/{linux/scripts/installers => ubuntu/scripts/build}/post-deployment.sh (100%) rename images/{linux/scripts/installers => ubuntu/scripts/build}/postgresql.sh (100%) rename images/{linux/scripts/installers => ubuntu/scripts/build}/powershellcore.sh (100%) rename images/{linux/scripts/installers => ubuntu/scripts/build}/preimagedata.sh (91%) rename images/{linux/scripts/installers => ubuntu/scripts/build}/pulumi.sh (100%) rename images/{linux/scripts/installers => ubuntu/scripts/build}/pypy.sh (100%) rename images/{linux/scripts/installers => ubuntu/scripts/build}/python.sh (100%) rename images/{linux/scripts/installers => ubuntu/scripts/build}/r.sh (100%) rename images/{linux/scripts/base => ubuntu/scripts/build}/reboot.sh (100%) rename images/{linux/scripts/base => ubuntu/scripts/build}/repos.sh (100%) rename images/{linux/scripts/installers => ubuntu/scripts/build}/ruby.sh (100%) rename images/{linux/scripts/installers => ubuntu/scripts/build}/runner-package.sh (100%) rename images/{linux/scripts/installers => ubuntu/scripts/build}/rust.sh (100%) rename images/{linux/scripts/installers => ubuntu/scripts/build}/sbt.sh (100%) rename images/{linux/scripts/installers => ubuntu/scripts/build}/selenium.sh (100%) rename images/{linux/scripts/base => ubuntu/scripts/build}/snap.sh (100%) rename images/{linux/scripts/installers => ubuntu/scripts/build}/sphinx.sh (100%) rename images/{linux/scripts/installers => ubuntu/scripts/build}/sqlpackage.sh (100%) rename images/{linux/scripts/installers => ubuntu/scripts/build}/swift.sh (100%) rename images/{linux/scripts/installers => ubuntu/scripts/build}/terraform.sh (100%) rename images/{linux/scripts/installers => ubuntu/scripts/build}/validate-disk-space.sh (100%) rename images/{linux/scripts/installers => ubuntu/scripts/build}/vcpkg.sh (100%) rename images/{linux/scripts/installers => ubuntu/scripts/build}/yq.sh (100%) rename images/{linux/scripts/installers => ubuntu/scripts/build}/zstd.sh (100%) rename images/{linux/scripts/SoftwareReport => ubuntu/scripts/docs-gen}/SoftwareReport.Android.psm1 (100%) rename images/{linux/scripts/SoftwareReport => ubuntu/scripts/docs-gen}/SoftwareReport.Browsers.psm1 (100%) rename images/{linux/scripts/SoftwareReport => ubuntu/scripts/docs-gen}/SoftwareReport.CachedTools.psm1 (100%) mode change 100755 => 100644 rename images/{linux/scripts/SoftwareReport => ubuntu/scripts/docs-gen}/SoftwareReport.Common.psm1 (100%) rename images/{linux/scripts/SoftwareReport => ubuntu/scripts/docs-gen}/SoftwareReport.Databases.psm1 (100%) rename images/{linux/scripts/SoftwareReport => ubuntu/scripts/docs-gen}/SoftwareReport.Generator.ps1 (100%) rename images/{linux/scripts/SoftwareReport => ubuntu/scripts/docs-gen}/SoftwareReport.Java.psm1 (100%) rename images/{linux/scripts/SoftwareReport => ubuntu/scripts/docs-gen}/SoftwareReport.Rust.psm1 (100%) rename images/{linux/scripts/SoftwareReport => ubuntu/scripts/docs-gen}/SoftwareReport.Tools.psm1 (100%) rename images/{linux/scripts/SoftwareReport => ubuntu/scripts/docs-gen}/SoftwareReport.WebServers.psm1 (100%) rename images/{linux => ubuntu}/scripts/helpers/Common.Helpers.psm1 (100%) rename images/{linux => ubuntu}/scripts/helpers/SoftwareReport.Helpers.psm1 (100%) rename images/{linux => ubuntu}/scripts/helpers/Tests.Helpers.psm1 (100%) rename images/{linux => ubuntu}/scripts/helpers/etc-environment.sh (100%) rename images/{linux => ubuntu}/scripts/helpers/install.sh (100%) rename images/{linux => ubuntu}/scripts/helpers/invoke-tests.sh (100%) rename images/{linux => ubuntu}/scripts/helpers/os.sh (100%) rename images/{linux => ubuntu}/scripts/tests/ActionArchiveCache.Tests.ps1 (100%) rename images/{linux => ubuntu}/scripts/tests/Android.Tests.ps1 (100%) rename images/{linux => ubuntu}/scripts/tests/Apt.Tests.ps1 (100%) rename images/{linux => ubuntu}/scripts/tests/Browsers.Tests.ps1 (100%) rename images/{linux => ubuntu}/scripts/tests/CLI.Tools.Tests.ps1 (100%) rename images/{linux => ubuntu}/scripts/tests/Common.Tests.ps1 (100%) rename images/{linux => ubuntu}/scripts/tests/Databases.Tests.ps1 (100%) rename images/{linux => ubuntu}/scripts/tests/DotnetSDK.Tests.ps1 (100%) rename images/{linux => ubuntu}/scripts/tests/Haskell.Tests.ps1 (100%) rename images/{linux => ubuntu}/scripts/tests/Java.Tests.ps1 (100%) rename images/{linux => ubuntu}/scripts/tests/Node.Tests.ps1 (100%) rename images/{linux => ubuntu}/scripts/tests/PowerShellModules.Tests.ps1 (100%) rename images/{linux => ubuntu}/scripts/tests/RunAll-Tests.ps1 (100%) rename images/{linux => ubuntu}/scripts/tests/RunnerCache.Tests.ps1 (100%) rename images/{linux => ubuntu}/scripts/tests/Tools.Tests.ps1 (100%) rename images/{linux => ubuntu}/scripts/tests/Toolset.Tests.ps1 (100%) rename images/{linux => ubuntu}/scripts/tests/WebServers.Tests.ps1 (100%) rename images/{linux/ubuntu2004.json => ubuntu/templates/ubuntu-20.04.json} (61%) rename images/{linux/ubuntu2204.pkr.hcl => ubuntu/templates/ubuntu-22.04.pkr.hcl} (59%) rename images/{linux/ubuntuminimal.pkr.hcl => ubuntu/templates/ubuntu-minimal.pkr.hcl} (80%) rename images/{linux => ubuntu}/toolsets/toolset-2004.json (100%) rename images/{linux => ubuntu}/toolsets/toolset-2204.json (100%) diff --git a/.github/workflows/ubuntu2004.yml b/.github/workflows/ubuntu2004.yml index cfe71fd34105..c8368f3de639 100644 --- a/.github/workflows/ubuntu2004.yml +++ b/.github/workflows/ubuntu2004.yml @@ -5,7 +5,7 @@ on: pull_request_target: types: labeled paths: - - 'images/linux/**' + - 'images/ubuntu/**' defaults: run: diff --git a/.github/workflows/ubuntu2204.yml b/.github/workflows/ubuntu2204.yml index 634bb536986c..d116129d862f 100644 --- a/.github/workflows/ubuntu2204.yml +++ b/.github/workflows/ubuntu2204.yml @@ -5,7 +5,7 @@ on: pull_request_target: types: labeled paths: - - 'images/linux/**' + - 'images/ubuntu/**' defaults: run: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 8c72b54dcc23..9e430481f96b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -49,11 +49,11 @@ Add `Invoke-PesterTests -TestFile <testFileName> [-TestName <describeName>]` at ### Ubuntu -- Add script that will install and validate the tool and put the script in the `scripts/installers` folder. -Use existing scripts such as [github-cli.sh](images/linux/scripts/installers/github-cli.sh) as a starting point. - - Use [helpers](images/linux/scripts/helpers/install.sh) to simplify installation process. +- Add script that will install and validate the tool and put the script in the `scripts/build` folder. +Use existing scripts such as [github-cli.sh](images/ubuntu/scripts/build/github-cli.sh) as a starting point. + - Use [helpers](images/ubuntu/scripts/helpers/install.sh) to simplify installation process. - Validation part should `exit 1` if any issue with installation. -- Add changes to the software report generator `images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1`. The software report generator is used to generate an image's README file, e.g. [Ubuntu2004-Readme.md](images/linux/Ubuntu2004-README.md) and it uses [MarkdownPS](https://github.com/Sarafian/MarkdownPS). +- Add changes to the software report generator `images/ubuntu/scripts/docs-gen/SoftwareReport.Generator.ps1`. The software report generator is used to generate an image's README file, e.g. [Ubuntu2004-Readme.md](images/ubuntu/Ubuntu2004-README.md) and it uses [MarkdownPS](https://github.com/Sarafian/MarkdownPS). ### macOS diff --git a/README.md b/README.md index cb4625b261a5..dc17ae557d41 100644 --- a/README.md +++ b/README.md @@ -34,8 +34,8 @@ To build a VM machine from this repo's source, see the [instructions](docs/creat - In general the `-latest` label is used for the latest OS image version that is GA - Before moving the`-latest` label to a new OS version we will announce the change and give sufficient lead time for users to update their workflows -[ubuntu-22.04]: https://github.com/actions/runner-images/blob/main/images/linux/Ubuntu2204-Readme.md -[ubuntu-20.04]: https://github.com/actions/runner-images/blob/main/images/linux/Ubuntu2004-Readme.md +[ubuntu-22.04]: https://github.com/actions/runner-images/blob/main/images/ubuntu/Ubuntu2204-Readme.md +[ubuntu-20.04]: https://github.com/actions/runner-images/blob/main/images/ubuntu/Ubuntu2004-Readme.md [windows-2022]: https://github.com/actions/runner-images/blob/main/images/windows/Windows2022-Readme.md [windows-2019]: https://github.com/actions/runner-images/blob/main/images/windows/Windows2019-Readme.md [macOS-11]: https://github.com/actions/runner-images/blob/main/images/macos/macos-11-Readme.md diff --git a/docs/create-image-and-azure-resources.md b/docs/create-image-and-azure-resources.md index 57993feb6c3d..4414fe8b4bc8 100644 --- a/docs/create-image-and-azure-resources.md +++ b/docs/create-image-and-azure-resources.md @@ -272,7 +272,7 @@ Generated tool versions and details can be found in related projects: The user, created during the image generation, does not exist in the result image hence some configuration files related to the user's home directory need to be changed as well as the file permissions for some directories. Scripts for that are located in the `post-gen` folder in the repository: - Windows: <https://github.com/actions/runner-images/tree/main/images/windows/assets/post-gen> -- Linux: <https://github.com/actions/runner-images/tree/main/images/linux/post-generation> +- Linux: <https://github.com/actions/runner-images/tree/main/images/ubuntu/assets/post-gen> **Note:** The default user for Linux should have `sudo privileges`. diff --git a/helpers/GenerateResourcesAndImage.ps1 b/helpers/GenerateResourcesAndImage.ps1 index 36528ad1bf5c..4d6be9f72ef3 100644 --- a/helpers/GenerateResourcesAndImage.ps1 +++ b/helpers/GenerateResourcesAndImage.ps1 @@ -24,13 +24,13 @@ Function Get-PackerTemplatePath { $relativeTemplatePath = Join-Path "windows" "templates" "windows-2022.json" } ([ImageType]::Ubuntu2004) { - $relativeTemplatePath = Join-Path "linux" "ubuntu2004.json" + $relativeTemplatePath = Join-Path "ubuntu" "templates" "ubuntu-2004.json" } ([ImageType]::Ubuntu2204) { - $relativeTemplatePath = Join-Path "linux" "ubuntu2204.pkr.hcl" + $relativeTemplatePath = Join-Path "ubuntu" "templates" "ubuntu-2204.pkr.hcl" } ([ImageType]::UbuntuMinimal) { - $relativeTemplatePath = Join-Path "linux" "ubuntuminimal.pkr.hcl" + $relativeTemplatePath = Join-Path "ubuntu" "templates" "ubuntu-minimal.pkr.hcl" } default { throw "Unknown type of image" } } diff --git a/images.CI/linux-and-win/azure-pipelines/image-generation.yml b/images.CI/linux-and-win/azure-pipelines/image-generation.yml index 778ebb3cad44..c879b372b881 100644 --- a/images.CI/linux-and-win/azure-pipelines/image-generation.yml +++ b/images.CI/linux-and-win/azure-pipelines/image-generation.yml @@ -65,9 +65,9 @@ jobs: targetType: 'inline' script: | $ImageType = "${{ parameters.image_type }}" - $TemplateDirectoryName = if ($ImageType.StartsWith("ubuntu")) { "linux" } else { "windows/templates" } + $TemplateDirectoryName = if ($ImageType.StartsWith("ubuntu")) { "ubuntu/templates" } else { "windows/templates" } $TemplateDirectoryPath = Join-Path "images" $TemplateDirectoryName | Resolve-Path - + $TemplateFileName = "${{ parameters.image_template_name }}" if ($TemplateFileName) { $TemplatePath = Join-Path $TemplateDirectoryPath $TemplateFileName diff --git a/images.CI/linux-and-win/azure-pipelines/ubuntu2004.yml b/images.CI/linux-and-win/azure-pipelines/ubuntu2004.yml index 4bf78c183957..528e8d0dd341 100644 --- a/images.CI/linux-and-win/azure-pipelines/ubuntu2004.yml +++ b/images.CI/linux-and-win/azure-pipelines/ubuntu2004.yml @@ -17,4 +17,5 @@ jobs: - template: image-generation.yml parameters: image_type: ubuntu2004 - image_readme_name: Ubuntu2004-Readme.md \ No newline at end of file + image_readme_name: Ubuntu2004-Readme.md + image_template_name: ubuntu-20.04.json diff --git a/images.CI/linux-and-win/azure-pipelines/ubuntu2204.yml b/images.CI/linux-and-win/azure-pipelines/ubuntu2204.yml index 8fc4c7b69f79..b9e12815d5b8 100644 --- a/images.CI/linux-and-win/azure-pipelines/ubuntu2204.yml +++ b/images.CI/linux-and-win/azure-pipelines/ubuntu2204.yml @@ -17,4 +17,5 @@ jobs: - template: image-generation.yml parameters: image_type: ubuntu2204 - image_readme_name: Ubuntu2204-Readme.md \ No newline at end of file + image_readme_name: Ubuntu2204-Readme.md + image_template_name: ubuntu-22.04.pkr.hcl diff --git a/images.CI/shebang-linter.ps1 b/images.CI/shebang-linter.ps1 index a3862f65895c..53c7d9817c67 100644 --- a/images.CI/shebang-linter.ps1 +++ b/images.CI/shebang-linter.ps1 @@ -22,7 +22,7 @@ function Validate-Scripts { return $ScriptWithoutShebangLine } -$PathUbuntu = "./images/linux/scripts" +$PathUbuntu = "./images/ubuntu/scripts" $PathMacOS = "./images/macos/provision" $PatternUbuntu = "#!/bin/bash -e" $PatternMacOS = "#!/bin/bash -e -o pipefail" @@ -34,10 +34,10 @@ if ($ScriptsWithBrokenShebang.Length -gt 0) { $ScriptsWithBrokenShebang | ForEach-Object { Write-Host "##[error] '$_'" } - Write-Host "`n`n##[error] Expected shebang for scripts in 'images/linux' folder is '$PatternUbuntu'" + Write-Host "`n`n##[error] Expected shebang for scripts in 'images/ubuntu' folder is '$PatternUbuntu'" Write-Host "##[error] Expected shebang for scripts in 'images/macos' folder is '$PatternMacOS'" exit 1 else { Write-Host "All scripts have correct shebang." } -} \ No newline at end of file +} diff --git a/images/linux/Ubuntu2004-Readme.md b/images/ubuntu/Ubuntu2004-Readme.md similarity index 100% rename from images/linux/Ubuntu2004-Readme.md rename to images/ubuntu/Ubuntu2004-Readme.md diff --git a/images/linux/Ubuntu2204-Readme.md b/images/ubuntu/Ubuntu2204-Readme.md similarity index 100% rename from images/linux/Ubuntu2204-Readme.md rename to images/ubuntu/Ubuntu2204-Readme.md diff --git a/images/linux/post-generation/cleanup-logs.sh b/images/ubuntu/assets/post-gen/cleanup-logs.sh similarity index 100% rename from images/linux/post-generation/cleanup-logs.sh rename to images/ubuntu/assets/post-gen/cleanup-logs.sh diff --git a/images/linux/post-generation/environment-variables.sh b/images/ubuntu/assets/post-gen/environment-variables.sh similarity index 100% rename from images/linux/post-generation/environment-variables.sh rename to images/ubuntu/assets/post-gen/environment-variables.sh diff --git a/images/linux/post-generation/systemd-linger.sh b/images/ubuntu/assets/post-gen/systemd-linger.sh similarity index 100% rename from images/linux/post-generation/systemd-linger.sh rename to images/ubuntu/assets/post-gen/systemd-linger.sh diff --git a/images/linux/config/ubuntu2004.conf b/images/ubuntu/assets/ubuntu2004.conf similarity index 100% rename from images/linux/config/ubuntu2004.conf rename to images/ubuntu/assets/ubuntu2004.conf diff --git a/images/linux/config/ubuntu2204.conf b/images/ubuntu/assets/ubuntu2204.conf similarity index 100% rename from images/linux/config/ubuntu2204.conf rename to images/ubuntu/assets/ubuntu2204.conf diff --git a/images/linux/scripts/installers/Configure-Toolset.ps1 b/images/ubuntu/scripts/build/Configure-Toolset.ps1 similarity index 96% rename from images/linux/scripts/installers/Configure-Toolset.ps1 rename to images/ubuntu/scripts/build/Configure-Toolset.ps1 index dfef74e0cefd..c35866bf30ac 100644 --- a/images/linux/scripts/installers/Configure-Toolset.ps1 +++ b/images/ubuntu/scripts/build/Configure-Toolset.ps1 @@ -1,95 +1,95 @@ -################################################################################ -## File: Configure-Toolset.ps1 -## Team: CI-Build -## Desc: Configure toolset -################################################################################ - -Import-Module "$env:HELPER_SCRIPTS/Tests.Helpers.psm1" -DisableNameChecking - -function Get-ToolsetToolFullPath -{ - param - ( - [Parameter(Mandatory)] [string] $ToolName, - [Parameter(Mandatory)] [string] $ToolVersion, - [Parameter(Mandatory)] [string] $ToolArchitecture - ) - - $toolPath = Join-Path -Path $env:AGENT_TOOLSDIRECTORY -ChildPath $toolName - $toolPathVersion = Join-Path -Path $toolPath -ChildPath $toolVersion - $foundVersion = Get-Item $toolPathVersion | Sort-Object -Property {[version]$_.name} -Descending | Select-Object -First 1 - $installationDir = Join-Path -Path $foundVersion -ChildPath $toolArchitecture - return $installationDir -} - -function Add-EnvironmentVariable -{ - param - ( - [Parameter(Mandatory)] [string] $Name, - [Parameter(Mandatory)] [string] $Value, - [string] $FilePath = "/etc/environment" - ) - - $envVar = "{0}={1}" -f $name, $value - Tee-Object -InputObject $envVar -FilePath $filePath -Append -} - -$ErrorActionPreference = "Stop" - -Write-Host "Configure toolset tools environment..." -$toolsEnvironment = @{ - go = @{ - command = "ln -s {0}/bin/* /usr/bin/" - variableTemplate = "GOROOT_{0}_{1}_X64" - } -} - -$toolset = Get-Content -Path "$env:INSTALLER_SCRIPT_FOLDER/toolset.json" -Raw | ConvertFrom-Json - -foreach ($tool in $toolset.toolcache) -{ - $toolName = $tool.name - $toolArch = $tool.arch - $toolEnvironment = $toolsEnvironment[$toolName] - - if (-not $toolEnvironment) - { - continue - } - - foreach ($toolVersion in $tool.versions) - { - Write-Host "Set $toolName $toolVersion environment variable..." - $toolPath = Get-ToolsetToolFullPath -ToolName $toolName -ToolVersion $toolVersion -ToolArchitecture $toolArch - $envName = $toolEnvironment.variableTemplate -f $toolVersion.split(".") - - # Add environment variable name=value - Add-EnvironmentVariable -Name $envName -Value $toolPath - } - - # Invoke command and add env variable for the default tool version - $toolDefVersion = $tool.default - if (-not $toolDefVersion) - { - continue - } - - $envDefName = $toolEnvironment.defaultVariable - $toolPath = Get-ToolsetToolFullPath -ToolName $toolName -ToolVersion $toolDefVersion -ToolArchitecture $toolArch - - if ($envDefName) - { - Write-Host "Set default $envDefName for $toolName $toolDefVersion environment variable..." - Add-EnvironmentVariable -Name $envDefName -Value $toolPath - } - - if ($toolEnvironment.command) - { - $command = $toolEnvironment.command -f $toolPath - Write-Host "Invoke $command command for default $toolName $toolDefVersion..." - Invoke-Expression -Command $command - } -} - -Invoke-PesterTests -TestFile "Toolset" -TestName "Toolset" +################################################################################ +## File: Configure-Toolset.ps1 +## Team: CI-Build +## Desc: Configure toolset +################################################################################ + +Import-Module "$env:HELPER_SCRIPTS/Tests.Helpers.psm1" -DisableNameChecking + +function Get-ToolsetToolFullPath +{ + param + ( + [Parameter(Mandatory)] [string] $ToolName, + [Parameter(Mandatory)] [string] $ToolVersion, + [Parameter(Mandatory)] [string] $ToolArchitecture + ) + + $toolPath = Join-Path -Path $env:AGENT_TOOLSDIRECTORY -ChildPath $toolName + $toolPathVersion = Join-Path -Path $toolPath -ChildPath $toolVersion + $foundVersion = Get-Item $toolPathVersion | Sort-Object -Property {[version]$_.name} -Descending | Select-Object -First 1 + $installationDir = Join-Path -Path $foundVersion -ChildPath $toolArchitecture + return $installationDir +} + +function Add-EnvironmentVariable +{ + param + ( + [Parameter(Mandatory)] [string] $Name, + [Parameter(Mandatory)] [string] $Value, + [string] $FilePath = "/etc/environment" + ) + + $envVar = "{0}={1}" -f $name, $value + Tee-Object -InputObject $envVar -FilePath $filePath -Append +} + +$ErrorActionPreference = "Stop" + +Write-Host "Configure toolset tools environment..." +$toolsEnvironment = @{ + go = @{ + command = "ln -s {0}/bin/* /usr/bin/" + variableTemplate = "GOROOT_{0}_{1}_X64" + } +} + +$toolset = Get-Content -Path "$env:INSTALLER_SCRIPT_FOLDER/toolset.json" -Raw | ConvertFrom-Json + +foreach ($tool in $toolset.toolcache) +{ + $toolName = $tool.name + $toolArch = $tool.arch + $toolEnvironment = $toolsEnvironment[$toolName] + + if (-not $toolEnvironment) + { + continue + } + + foreach ($toolVersion in $tool.versions) + { + Write-Host "Set $toolName $toolVersion environment variable..." + $toolPath = Get-ToolsetToolFullPath -ToolName $toolName -ToolVersion $toolVersion -ToolArchitecture $toolArch + $envName = $toolEnvironment.variableTemplate -f $toolVersion.split(".") + + # Add environment variable name=value + Add-EnvironmentVariable -Name $envName -Value $toolPath + } + + # Invoke command and add env variable for the default tool version + $toolDefVersion = $tool.default + if (-not $toolDefVersion) + { + continue + } + + $envDefName = $toolEnvironment.defaultVariable + $toolPath = Get-ToolsetToolFullPath -ToolName $toolName -ToolVersion $toolDefVersion -ToolArchitecture $toolArch + + if ($envDefName) + { + Write-Host "Set default $envDefName for $toolName $toolDefVersion environment variable..." + Add-EnvironmentVariable -Name $envDefName -Value $toolPath + } + + if ($toolEnvironment.command) + { + $command = $toolEnvironment.command -f $toolPath + Write-Host "Invoke $command command for default $toolName $toolDefVersion..." + Invoke-Expression -Command $command + } +} + +Invoke-PesterTests -TestFile "Toolset" -TestName "Toolset" diff --git a/images/linux/scripts/installers/Install-AzureModules.ps1 b/images/ubuntu/scripts/build/Install-AzureModules.ps1 similarity index 100% rename from images/linux/scripts/installers/Install-AzureModules.ps1 rename to images/ubuntu/scripts/build/Install-AzureModules.ps1 diff --git a/images/linux/scripts/installers/Install-PowerShellModules.ps1 b/images/ubuntu/scripts/build/Install-PowerShellModules.ps1 similarity index 96% rename from images/linux/scripts/installers/Install-PowerShellModules.ps1 rename to images/ubuntu/scripts/build/Install-PowerShellModules.ps1 index 95e03545ee5c..8a41d7ed5c3a 100644 --- a/images/linux/scripts/installers/Install-PowerShellModules.ps1 +++ b/images/ubuntu/scripts/build/Install-PowerShellModules.ps1 @@ -1,34 +1,34 @@ -$ErrorActionPreference = "Stop" -$ProgressPreference = "SilentlyContinue" - -Import-Module "$env:HELPER_SCRIPTS/Tests.Helpers.psm1" -DisableNameChecking - -# Specifies the installation policy -Set-PSRepository -InstallationPolicy Trusted -Name PSGallery - -# Try to update PowerShellGet before the actual installation -Install-Module -Name PowerShellGet -Force -Update-Module -Name PowerShellGet -Force - -# Install PowerShell modules -$modules = (Get-ToolsetContent).powershellModules - -foreach($module in $modules) -{ - $moduleName = $module.name - Write-Host "Installing ${moduleName} module" - - if ($module.versions) - { - foreach ($version in $module.versions) - { - Write-Host " - $version" - Install-Module -Name $moduleName -RequiredVersion $version -Scope AllUsers -SkipPublisherCheck -Force - } - continue - } - - Install-Module -Name $moduleName -Scope AllUsers -SkipPublisherCheck -Force -} - -Invoke-PesterTests -TestFile "PowerShellModules" -TestName "PowerShellModules" +$ErrorActionPreference = "Stop" +$ProgressPreference = "SilentlyContinue" + +Import-Module "$env:HELPER_SCRIPTS/Tests.Helpers.psm1" -DisableNameChecking + +# Specifies the installation policy +Set-PSRepository -InstallationPolicy Trusted -Name PSGallery + +# Try to update PowerShellGet before the actual installation +Install-Module -Name PowerShellGet -Force +Update-Module -Name PowerShellGet -Force + +# Install PowerShell modules +$modules = (Get-ToolsetContent).powershellModules + +foreach($module in $modules) +{ + $moduleName = $module.name + Write-Host "Installing ${moduleName} module" + + if ($module.versions) + { + foreach ($version in $module.versions) + { + Write-Host " - $version" + Install-Module -Name $moduleName -RequiredVersion $version -Scope AllUsers -SkipPublisherCheck -Force + } + continue + } + + Install-Module -Name $moduleName -Scope AllUsers -SkipPublisherCheck -Force +} + +Invoke-PesterTests -TestFile "PowerShellModules" -TestName "PowerShellModules" diff --git a/images/linux/scripts/installers/Install-Toolset.ps1 b/images/ubuntu/scripts/build/Install-Toolset.ps1 similarity index 100% rename from images/linux/scripts/installers/Install-Toolset.ps1 rename to images/ubuntu/scripts/build/Install-Toolset.ps1 diff --git a/images/linux/scripts/installers/action-archive-cache.sh b/images/ubuntu/scripts/build/action-archive-cache.sh old mode 100755 new mode 100644 similarity index 100% rename from images/linux/scripts/installers/action-archive-cache.sh rename to images/ubuntu/scripts/build/action-archive-cache.sh diff --git a/images/linux/scripts/installers/aliyun-cli.sh b/images/ubuntu/scripts/build/aliyun-cli.sh similarity index 100% rename from images/linux/scripts/installers/aliyun-cli.sh rename to images/ubuntu/scripts/build/aliyun-cli.sh diff --git a/images/linux/scripts/installers/android.sh b/images/ubuntu/scripts/build/android.sh similarity index 100% rename from images/linux/scripts/installers/android.sh rename to images/ubuntu/scripts/build/android.sh diff --git a/images/linux/scripts/installers/apache.sh b/images/ubuntu/scripts/build/apache.sh similarity index 100% rename from images/linux/scripts/installers/apache.sh rename to images/ubuntu/scripts/build/apache.sh diff --git a/images/linux/scripts/installers/apt-common.sh b/images/ubuntu/scripts/build/apt-common.sh similarity index 100% rename from images/linux/scripts/installers/apt-common.sh rename to images/ubuntu/scripts/build/apt-common.sh diff --git a/images/linux/scripts/base/apt-mock-remove.sh b/images/ubuntu/scripts/build/apt-mock-remove.sh similarity index 100% rename from images/linux/scripts/base/apt-mock-remove.sh rename to images/ubuntu/scripts/build/apt-mock-remove.sh diff --git a/images/linux/scripts/base/apt-mock.sh b/images/ubuntu/scripts/build/apt-mock.sh similarity index 100% rename from images/linux/scripts/base/apt-mock.sh rename to images/ubuntu/scripts/build/apt-mock.sh diff --git a/images/linux/scripts/base/apt-ubuntu-archive.sh b/images/ubuntu/scripts/build/apt-ubuntu-archive.sh similarity index 100% rename from images/linux/scripts/base/apt-ubuntu-archive.sh rename to images/ubuntu/scripts/build/apt-ubuntu-archive.sh diff --git a/images/linux/scripts/installers/apt-vital.sh b/images/ubuntu/scripts/build/apt-vital.sh similarity index 100% rename from images/linux/scripts/installers/apt-vital.sh rename to images/ubuntu/scripts/build/apt-vital.sh diff --git a/images/linux/scripts/base/apt.sh b/images/ubuntu/scripts/build/apt.sh similarity index 100% rename from images/linux/scripts/base/apt.sh rename to images/ubuntu/scripts/build/apt.sh diff --git a/images/linux/scripts/installers/aws.sh b/images/ubuntu/scripts/build/aws.sh similarity index 100% rename from images/linux/scripts/installers/aws.sh rename to images/ubuntu/scripts/build/aws.sh diff --git a/images/linux/scripts/installers/azcopy.sh b/images/ubuntu/scripts/build/azcopy.sh similarity index 100% rename from images/linux/scripts/installers/azcopy.sh rename to images/ubuntu/scripts/build/azcopy.sh diff --git a/images/linux/scripts/installers/azure-cli.sh b/images/ubuntu/scripts/build/azure-cli.sh similarity index 100% rename from images/linux/scripts/installers/azure-cli.sh rename to images/ubuntu/scripts/build/azure-cli.sh diff --git a/images/linux/scripts/installers/azure-devops-cli.sh b/images/ubuntu/scripts/build/azure-devops-cli.sh similarity index 100% rename from images/linux/scripts/installers/azure-devops-cli.sh rename to images/ubuntu/scripts/build/azure-devops-cli.sh diff --git a/images/linux/scripts/installers/bazel.sh b/images/ubuntu/scripts/build/bazel.sh similarity index 100% rename from images/linux/scripts/installers/bazel.sh rename to images/ubuntu/scripts/build/bazel.sh diff --git a/images/linux/scripts/installers/bicep.sh b/images/ubuntu/scripts/build/bicep.sh similarity index 100% rename from images/linux/scripts/installers/bicep.sh rename to images/ubuntu/scripts/build/bicep.sh diff --git a/images/linux/scripts/installers/clang.sh b/images/ubuntu/scripts/build/clang.sh similarity index 100% rename from images/linux/scripts/installers/clang.sh rename to images/ubuntu/scripts/build/clang.sh diff --git a/images/linux/scripts/installers/cleanup.sh b/images/ubuntu/scripts/build/cleanup.sh similarity index 100% rename from images/linux/scripts/installers/cleanup.sh rename to images/ubuntu/scripts/build/cleanup.sh diff --git a/images/linux/scripts/installers/cmake.sh b/images/ubuntu/scripts/build/cmake.sh similarity index 100% rename from images/linux/scripts/installers/cmake.sh rename to images/ubuntu/scripts/build/cmake.sh diff --git a/images/linux/scripts/installers/codeql-bundle.sh b/images/ubuntu/scripts/build/codeql-bundle.sh similarity index 100% rename from images/linux/scripts/installers/codeql-bundle.sh rename to images/ubuntu/scripts/build/codeql-bundle.sh diff --git a/images/linux/scripts/installers/complete-snap-setup.sh b/images/ubuntu/scripts/build/complete-snap-setup.sh similarity index 100% rename from images/linux/scripts/installers/complete-snap-setup.sh rename to images/ubuntu/scripts/build/complete-snap-setup.sh diff --git a/images/linux/scripts/installers/configure-environment.sh b/images/ubuntu/scripts/build/configure-environment.sh similarity index 100% rename from images/linux/scripts/installers/configure-environment.sh rename to images/ubuntu/scripts/build/configure-environment.sh diff --git a/images/linux/scripts/installers/containers.sh b/images/ubuntu/scripts/build/containers.sh similarity index 100% rename from images/linux/scripts/installers/containers.sh rename to images/ubuntu/scripts/build/containers.sh diff --git a/images/linux/scripts/installers/docker-compose.sh b/images/ubuntu/scripts/build/docker-compose.sh similarity index 100% rename from images/linux/scripts/installers/docker-compose.sh rename to images/ubuntu/scripts/build/docker-compose.sh diff --git a/images/linux/scripts/installers/docker.sh b/images/ubuntu/scripts/build/docker.sh similarity index 100% rename from images/linux/scripts/installers/docker.sh rename to images/ubuntu/scripts/build/docker.sh diff --git a/images/linux/scripts/installers/dotnetcore-sdk.sh b/images/ubuntu/scripts/build/dotnetcore-sdk.sh similarity index 100% rename from images/linux/scripts/installers/dotnetcore-sdk.sh rename to images/ubuntu/scripts/build/dotnetcore-sdk.sh diff --git a/images/linux/scripts/installers/dpkg-config.sh b/images/ubuntu/scripts/build/dpkg-config.sh similarity index 100% rename from images/linux/scripts/installers/dpkg-config.sh rename to images/ubuntu/scripts/build/dpkg-config.sh diff --git a/images/linux/scripts/installers/erlang.sh b/images/ubuntu/scripts/build/erlang.sh similarity index 100% rename from images/linux/scripts/installers/erlang.sh rename to images/ubuntu/scripts/build/erlang.sh diff --git a/images/linux/scripts/installers/example.sh b/images/ubuntu/scripts/build/example.sh similarity index 100% rename from images/linux/scripts/installers/example.sh rename to images/ubuntu/scripts/build/example.sh diff --git a/images/linux/scripts/installers/firefox.sh b/images/ubuntu/scripts/build/firefox.sh similarity index 100% rename from images/linux/scripts/installers/firefox.sh rename to images/ubuntu/scripts/build/firefox.sh diff --git a/images/linux/scripts/installers/gcc.sh b/images/ubuntu/scripts/build/gcc.sh similarity index 100% rename from images/linux/scripts/installers/gcc.sh rename to images/ubuntu/scripts/build/gcc.sh diff --git a/images/linux/scripts/installers/gfortran.sh b/images/ubuntu/scripts/build/gfortran.sh similarity index 100% rename from images/linux/scripts/installers/gfortran.sh rename to images/ubuntu/scripts/build/gfortran.sh diff --git a/images/linux/scripts/installers/git-lfs.sh b/images/ubuntu/scripts/build/git-lfs.sh similarity index 100% rename from images/linux/scripts/installers/git-lfs.sh rename to images/ubuntu/scripts/build/git-lfs.sh diff --git a/images/linux/scripts/installers/git.sh b/images/ubuntu/scripts/build/git.sh similarity index 100% rename from images/linux/scripts/installers/git.sh rename to images/ubuntu/scripts/build/git.sh diff --git a/images/linux/scripts/installers/github-cli.sh b/images/ubuntu/scripts/build/github-cli.sh similarity index 100% rename from images/linux/scripts/installers/github-cli.sh rename to images/ubuntu/scripts/build/github-cli.sh diff --git a/images/linux/scripts/installers/google-chrome.sh b/images/ubuntu/scripts/build/google-chrome.sh similarity index 100% rename from images/linux/scripts/installers/google-chrome.sh rename to images/ubuntu/scripts/build/google-chrome.sh diff --git a/images/linux/scripts/installers/google-cloud-cli.sh b/images/ubuntu/scripts/build/google-cloud-cli.sh similarity index 100% rename from images/linux/scripts/installers/google-cloud-cli.sh rename to images/ubuntu/scripts/build/google-cloud-cli.sh diff --git a/images/linux/scripts/installers/haskell.sh b/images/ubuntu/scripts/build/haskell.sh similarity index 100% rename from images/linux/scripts/installers/haskell.sh rename to images/ubuntu/scripts/build/haskell.sh diff --git a/images/linux/scripts/installers/heroku.sh b/images/ubuntu/scripts/build/heroku.sh similarity index 100% rename from images/linux/scripts/installers/heroku.sh rename to images/ubuntu/scripts/build/heroku.sh diff --git a/images/linux/scripts/installers/hhvm.sh b/images/ubuntu/scripts/build/hhvm.sh similarity index 100% rename from images/linux/scripts/installers/hhvm.sh rename to images/ubuntu/scripts/build/hhvm.sh diff --git a/images/linux/scripts/installers/homebrew.sh b/images/ubuntu/scripts/build/homebrew.sh similarity index 100% rename from images/linux/scripts/installers/homebrew.sh rename to images/ubuntu/scripts/build/homebrew.sh diff --git a/images/linux/scripts/installers/java-tools.sh b/images/ubuntu/scripts/build/java-tools.sh similarity index 100% rename from images/linux/scripts/installers/java-tools.sh rename to images/ubuntu/scripts/build/java-tools.sh diff --git a/images/linux/scripts/installers/julia.sh b/images/ubuntu/scripts/build/julia.sh similarity index 100% rename from images/linux/scripts/installers/julia.sh rename to images/ubuntu/scripts/build/julia.sh diff --git a/images/linux/scripts/installers/kotlin.sh b/images/ubuntu/scripts/build/kotlin.sh similarity index 100% rename from images/linux/scripts/installers/kotlin.sh rename to images/ubuntu/scripts/build/kotlin.sh diff --git a/images/linux/scripts/installers/kubernetes-tools.sh b/images/ubuntu/scripts/build/kubernetes-tools.sh similarity index 100% rename from images/linux/scripts/installers/kubernetes-tools.sh rename to images/ubuntu/scripts/build/kubernetes-tools.sh diff --git a/images/linux/scripts/installers/leiningen.sh b/images/ubuntu/scripts/build/leiningen.sh similarity index 100% rename from images/linux/scripts/installers/leiningen.sh rename to images/ubuntu/scripts/build/leiningen.sh diff --git a/images/linux/scripts/base/limits.sh b/images/ubuntu/scripts/build/limits.sh similarity index 100% rename from images/linux/scripts/base/limits.sh rename to images/ubuntu/scripts/build/limits.sh diff --git a/images/linux/scripts/installers/microsoft-edge.sh b/images/ubuntu/scripts/build/microsoft-edge.sh similarity index 100% rename from images/linux/scripts/installers/microsoft-edge.sh rename to images/ubuntu/scripts/build/microsoft-edge.sh diff --git a/images/linux/scripts/installers/miniconda.sh b/images/ubuntu/scripts/build/miniconda.sh similarity index 100% rename from images/linux/scripts/installers/miniconda.sh rename to images/ubuntu/scripts/build/miniconda.sh diff --git a/images/linux/scripts/installers/mongodb.sh b/images/ubuntu/scripts/build/mongodb.sh similarity index 100% rename from images/linux/scripts/installers/mongodb.sh rename to images/ubuntu/scripts/build/mongodb.sh diff --git a/images/linux/scripts/installers/mono.sh b/images/ubuntu/scripts/build/mono.sh similarity index 100% rename from images/linux/scripts/installers/mono.sh rename to images/ubuntu/scripts/build/mono.sh diff --git a/images/linux/scripts/installers/mssql-cmd-tools.sh b/images/ubuntu/scripts/build/mssql-cmd-tools.sh similarity index 100% rename from images/linux/scripts/installers/mssql-cmd-tools.sh rename to images/ubuntu/scripts/build/mssql-cmd-tools.sh diff --git a/images/linux/scripts/installers/mysql.sh b/images/ubuntu/scripts/build/mysql.sh similarity index 100% rename from images/linux/scripts/installers/mysql.sh rename to images/ubuntu/scripts/build/mysql.sh diff --git a/images/linux/scripts/installers/nginx.sh b/images/ubuntu/scripts/build/nginx.sh similarity index 100% rename from images/linux/scripts/installers/nginx.sh rename to images/ubuntu/scripts/build/nginx.sh diff --git a/images/linux/scripts/installers/nodejs.sh b/images/ubuntu/scripts/build/nodejs.sh similarity index 100% rename from images/linux/scripts/installers/nodejs.sh rename to images/ubuntu/scripts/build/nodejs.sh diff --git a/images/linux/scripts/installers/nvm.sh b/images/ubuntu/scripts/build/nvm.sh similarity index 100% rename from images/linux/scripts/installers/nvm.sh rename to images/ubuntu/scripts/build/nvm.sh diff --git a/images/linux/scripts/installers/oc.sh b/images/ubuntu/scripts/build/oc.sh similarity index 100% rename from images/linux/scripts/installers/oc.sh rename to images/ubuntu/scripts/build/oc.sh diff --git a/images/linux/scripts/installers/oras-cli.sh b/images/ubuntu/scripts/build/oras-cli.sh similarity index 100% rename from images/linux/scripts/installers/oras-cli.sh rename to images/ubuntu/scripts/build/oras-cli.sh diff --git a/images/linux/scripts/installers/packer.sh b/images/ubuntu/scripts/build/packer.sh similarity index 100% rename from images/linux/scripts/installers/packer.sh rename to images/ubuntu/scripts/build/packer.sh diff --git a/images/linux/scripts/installers/phantomjs.sh b/images/ubuntu/scripts/build/phantomjs.sh similarity index 100% rename from images/linux/scripts/installers/phantomjs.sh rename to images/ubuntu/scripts/build/phantomjs.sh diff --git a/images/linux/scripts/installers/php.sh b/images/ubuntu/scripts/build/php.sh similarity index 100% rename from images/linux/scripts/installers/php.sh rename to images/ubuntu/scripts/build/php.sh diff --git a/images/linux/scripts/installers/pipx-packages.sh b/images/ubuntu/scripts/build/pipx-packages.sh similarity index 100% rename from images/linux/scripts/installers/pipx-packages.sh rename to images/ubuntu/scripts/build/pipx-packages.sh diff --git a/images/linux/scripts/installers/post-deployment.sh b/images/ubuntu/scripts/build/post-deployment.sh similarity index 100% rename from images/linux/scripts/installers/post-deployment.sh rename to images/ubuntu/scripts/build/post-deployment.sh diff --git a/images/linux/scripts/installers/postgresql.sh b/images/ubuntu/scripts/build/postgresql.sh similarity index 100% rename from images/linux/scripts/installers/postgresql.sh rename to images/ubuntu/scripts/build/postgresql.sh diff --git a/images/linux/scripts/installers/powershellcore.sh b/images/ubuntu/scripts/build/powershellcore.sh similarity index 100% rename from images/linux/scripts/installers/powershellcore.sh rename to images/ubuntu/scripts/build/powershellcore.sh diff --git a/images/linux/scripts/installers/preimagedata.sh b/images/ubuntu/scripts/build/preimagedata.sh similarity index 91% rename from images/linux/scripts/installers/preimagedata.sh rename to images/ubuntu/scripts/build/preimagedata.sh index 62c6d3bed28e..cc932532b142 100644 --- a/images/linux/scripts/installers/preimagedata.sh +++ b/images/ubuntu/scripts/build/preimagedata.sh @@ -11,7 +11,7 @@ version_major=${os_version/.*/} version_wo_dot=${os_version/./} github_url="https://github.com/actions/runner-images/blob" -software_url="${github_url}/ubuntu${version_major}/${image_version_major}.${image_version_minor}/images/linux/Ubuntu${version_wo_dot}-Readme.md" +software_url="${github_url}/ubuntu${version_major}/${image_version_major}.${image_version_minor}/images/ubuntu/Ubuntu${version_wo_dot}-Readme.md" releaseUrl="https://github.com/actions/runner-images/releases/tag/ubuntu${version_major}%2F${image_version_major}.${image_version_minor}" cat <<EOF > $imagedata_file diff --git a/images/linux/scripts/installers/pulumi.sh b/images/ubuntu/scripts/build/pulumi.sh similarity index 100% rename from images/linux/scripts/installers/pulumi.sh rename to images/ubuntu/scripts/build/pulumi.sh diff --git a/images/linux/scripts/installers/pypy.sh b/images/ubuntu/scripts/build/pypy.sh similarity index 100% rename from images/linux/scripts/installers/pypy.sh rename to images/ubuntu/scripts/build/pypy.sh diff --git a/images/linux/scripts/installers/python.sh b/images/ubuntu/scripts/build/python.sh similarity index 100% rename from images/linux/scripts/installers/python.sh rename to images/ubuntu/scripts/build/python.sh diff --git a/images/linux/scripts/installers/r.sh b/images/ubuntu/scripts/build/r.sh similarity index 100% rename from images/linux/scripts/installers/r.sh rename to images/ubuntu/scripts/build/r.sh diff --git a/images/linux/scripts/base/reboot.sh b/images/ubuntu/scripts/build/reboot.sh similarity index 100% rename from images/linux/scripts/base/reboot.sh rename to images/ubuntu/scripts/build/reboot.sh diff --git a/images/linux/scripts/base/repos.sh b/images/ubuntu/scripts/build/repos.sh similarity index 100% rename from images/linux/scripts/base/repos.sh rename to images/ubuntu/scripts/build/repos.sh diff --git a/images/linux/scripts/installers/ruby.sh b/images/ubuntu/scripts/build/ruby.sh similarity index 100% rename from images/linux/scripts/installers/ruby.sh rename to images/ubuntu/scripts/build/ruby.sh diff --git a/images/linux/scripts/installers/runner-package.sh b/images/ubuntu/scripts/build/runner-package.sh similarity index 100% rename from images/linux/scripts/installers/runner-package.sh rename to images/ubuntu/scripts/build/runner-package.sh diff --git a/images/linux/scripts/installers/rust.sh b/images/ubuntu/scripts/build/rust.sh similarity index 100% rename from images/linux/scripts/installers/rust.sh rename to images/ubuntu/scripts/build/rust.sh diff --git a/images/linux/scripts/installers/sbt.sh b/images/ubuntu/scripts/build/sbt.sh similarity index 100% rename from images/linux/scripts/installers/sbt.sh rename to images/ubuntu/scripts/build/sbt.sh diff --git a/images/linux/scripts/installers/selenium.sh b/images/ubuntu/scripts/build/selenium.sh similarity index 100% rename from images/linux/scripts/installers/selenium.sh rename to images/ubuntu/scripts/build/selenium.sh diff --git a/images/linux/scripts/base/snap.sh b/images/ubuntu/scripts/build/snap.sh similarity index 100% rename from images/linux/scripts/base/snap.sh rename to images/ubuntu/scripts/build/snap.sh diff --git a/images/linux/scripts/installers/sphinx.sh b/images/ubuntu/scripts/build/sphinx.sh similarity index 100% rename from images/linux/scripts/installers/sphinx.sh rename to images/ubuntu/scripts/build/sphinx.sh diff --git a/images/linux/scripts/installers/sqlpackage.sh b/images/ubuntu/scripts/build/sqlpackage.sh similarity index 100% rename from images/linux/scripts/installers/sqlpackage.sh rename to images/ubuntu/scripts/build/sqlpackage.sh diff --git a/images/linux/scripts/installers/swift.sh b/images/ubuntu/scripts/build/swift.sh similarity index 100% rename from images/linux/scripts/installers/swift.sh rename to images/ubuntu/scripts/build/swift.sh diff --git a/images/linux/scripts/installers/terraform.sh b/images/ubuntu/scripts/build/terraform.sh similarity index 100% rename from images/linux/scripts/installers/terraform.sh rename to images/ubuntu/scripts/build/terraform.sh diff --git a/images/linux/scripts/installers/validate-disk-space.sh b/images/ubuntu/scripts/build/validate-disk-space.sh similarity index 100% rename from images/linux/scripts/installers/validate-disk-space.sh rename to images/ubuntu/scripts/build/validate-disk-space.sh diff --git a/images/linux/scripts/installers/vcpkg.sh b/images/ubuntu/scripts/build/vcpkg.sh similarity index 100% rename from images/linux/scripts/installers/vcpkg.sh rename to images/ubuntu/scripts/build/vcpkg.sh diff --git a/images/linux/scripts/installers/yq.sh b/images/ubuntu/scripts/build/yq.sh similarity index 100% rename from images/linux/scripts/installers/yq.sh rename to images/ubuntu/scripts/build/yq.sh diff --git a/images/linux/scripts/installers/zstd.sh b/images/ubuntu/scripts/build/zstd.sh similarity index 100% rename from images/linux/scripts/installers/zstd.sh rename to images/ubuntu/scripts/build/zstd.sh diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Android.psm1 b/images/ubuntu/scripts/docs-gen/SoftwareReport.Android.psm1 similarity index 100% rename from images/linux/scripts/SoftwareReport/SoftwareReport.Android.psm1 rename to images/ubuntu/scripts/docs-gen/SoftwareReport.Android.psm1 diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Browsers.psm1 b/images/ubuntu/scripts/docs-gen/SoftwareReport.Browsers.psm1 similarity index 100% rename from images/linux/scripts/SoftwareReport/SoftwareReport.Browsers.psm1 rename to images/ubuntu/scripts/docs-gen/SoftwareReport.Browsers.psm1 diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.CachedTools.psm1 b/images/ubuntu/scripts/docs-gen/SoftwareReport.CachedTools.psm1 old mode 100755 new mode 100644 similarity index 100% rename from images/linux/scripts/SoftwareReport/SoftwareReport.CachedTools.psm1 rename to images/ubuntu/scripts/docs-gen/SoftwareReport.CachedTools.psm1 diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 b/images/ubuntu/scripts/docs-gen/SoftwareReport.Common.psm1 similarity index 100% rename from images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 rename to images/ubuntu/scripts/docs-gen/SoftwareReport.Common.psm1 diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Databases.psm1 b/images/ubuntu/scripts/docs-gen/SoftwareReport.Databases.psm1 similarity index 100% rename from images/linux/scripts/SoftwareReport/SoftwareReport.Databases.psm1 rename to images/ubuntu/scripts/docs-gen/SoftwareReport.Databases.psm1 diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/ubuntu/scripts/docs-gen/SoftwareReport.Generator.ps1 similarity index 100% rename from images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 rename to images/ubuntu/scripts/docs-gen/SoftwareReport.Generator.ps1 diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Java.psm1 b/images/ubuntu/scripts/docs-gen/SoftwareReport.Java.psm1 similarity index 100% rename from images/linux/scripts/SoftwareReport/SoftwareReport.Java.psm1 rename to images/ubuntu/scripts/docs-gen/SoftwareReport.Java.psm1 diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Rust.psm1 b/images/ubuntu/scripts/docs-gen/SoftwareReport.Rust.psm1 similarity index 100% rename from images/linux/scripts/SoftwareReport/SoftwareReport.Rust.psm1 rename to images/ubuntu/scripts/docs-gen/SoftwareReport.Rust.psm1 diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/ubuntu/scripts/docs-gen/SoftwareReport.Tools.psm1 similarity index 100% rename from images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 rename to images/ubuntu/scripts/docs-gen/SoftwareReport.Tools.psm1 diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.WebServers.psm1 b/images/ubuntu/scripts/docs-gen/SoftwareReport.WebServers.psm1 similarity index 100% rename from images/linux/scripts/SoftwareReport/SoftwareReport.WebServers.psm1 rename to images/ubuntu/scripts/docs-gen/SoftwareReport.WebServers.psm1 diff --git a/images/linux/scripts/helpers/Common.Helpers.psm1 b/images/ubuntu/scripts/helpers/Common.Helpers.psm1 similarity index 100% rename from images/linux/scripts/helpers/Common.Helpers.psm1 rename to images/ubuntu/scripts/helpers/Common.Helpers.psm1 diff --git a/images/linux/scripts/helpers/SoftwareReport.Helpers.psm1 b/images/ubuntu/scripts/helpers/SoftwareReport.Helpers.psm1 similarity index 100% rename from images/linux/scripts/helpers/SoftwareReport.Helpers.psm1 rename to images/ubuntu/scripts/helpers/SoftwareReport.Helpers.psm1 diff --git a/images/linux/scripts/helpers/Tests.Helpers.psm1 b/images/ubuntu/scripts/helpers/Tests.Helpers.psm1 similarity index 100% rename from images/linux/scripts/helpers/Tests.Helpers.psm1 rename to images/ubuntu/scripts/helpers/Tests.Helpers.psm1 diff --git a/images/linux/scripts/helpers/etc-environment.sh b/images/ubuntu/scripts/helpers/etc-environment.sh similarity index 100% rename from images/linux/scripts/helpers/etc-environment.sh rename to images/ubuntu/scripts/helpers/etc-environment.sh diff --git a/images/linux/scripts/helpers/install.sh b/images/ubuntu/scripts/helpers/install.sh similarity index 100% rename from images/linux/scripts/helpers/install.sh rename to images/ubuntu/scripts/helpers/install.sh diff --git a/images/linux/scripts/helpers/invoke-tests.sh b/images/ubuntu/scripts/helpers/invoke-tests.sh similarity index 100% rename from images/linux/scripts/helpers/invoke-tests.sh rename to images/ubuntu/scripts/helpers/invoke-tests.sh diff --git a/images/linux/scripts/helpers/os.sh b/images/ubuntu/scripts/helpers/os.sh similarity index 100% rename from images/linux/scripts/helpers/os.sh rename to images/ubuntu/scripts/helpers/os.sh diff --git a/images/linux/scripts/tests/ActionArchiveCache.Tests.ps1 b/images/ubuntu/scripts/tests/ActionArchiveCache.Tests.ps1 similarity index 100% rename from images/linux/scripts/tests/ActionArchiveCache.Tests.ps1 rename to images/ubuntu/scripts/tests/ActionArchiveCache.Tests.ps1 diff --git a/images/linux/scripts/tests/Android.Tests.ps1 b/images/ubuntu/scripts/tests/Android.Tests.ps1 similarity index 100% rename from images/linux/scripts/tests/Android.Tests.ps1 rename to images/ubuntu/scripts/tests/Android.Tests.ps1 diff --git a/images/linux/scripts/tests/Apt.Tests.ps1 b/images/ubuntu/scripts/tests/Apt.Tests.ps1 similarity index 100% rename from images/linux/scripts/tests/Apt.Tests.ps1 rename to images/ubuntu/scripts/tests/Apt.Tests.ps1 diff --git a/images/linux/scripts/tests/Browsers.Tests.ps1 b/images/ubuntu/scripts/tests/Browsers.Tests.ps1 similarity index 100% rename from images/linux/scripts/tests/Browsers.Tests.ps1 rename to images/ubuntu/scripts/tests/Browsers.Tests.ps1 diff --git a/images/linux/scripts/tests/CLI.Tools.Tests.ps1 b/images/ubuntu/scripts/tests/CLI.Tools.Tests.ps1 similarity index 100% rename from images/linux/scripts/tests/CLI.Tools.Tests.ps1 rename to images/ubuntu/scripts/tests/CLI.Tools.Tests.ps1 diff --git a/images/linux/scripts/tests/Common.Tests.ps1 b/images/ubuntu/scripts/tests/Common.Tests.ps1 similarity index 100% rename from images/linux/scripts/tests/Common.Tests.ps1 rename to images/ubuntu/scripts/tests/Common.Tests.ps1 diff --git a/images/linux/scripts/tests/Databases.Tests.ps1 b/images/ubuntu/scripts/tests/Databases.Tests.ps1 similarity index 100% rename from images/linux/scripts/tests/Databases.Tests.ps1 rename to images/ubuntu/scripts/tests/Databases.Tests.ps1 diff --git a/images/linux/scripts/tests/DotnetSDK.Tests.ps1 b/images/ubuntu/scripts/tests/DotnetSDK.Tests.ps1 similarity index 100% rename from images/linux/scripts/tests/DotnetSDK.Tests.ps1 rename to images/ubuntu/scripts/tests/DotnetSDK.Tests.ps1 diff --git a/images/linux/scripts/tests/Haskell.Tests.ps1 b/images/ubuntu/scripts/tests/Haskell.Tests.ps1 similarity index 100% rename from images/linux/scripts/tests/Haskell.Tests.ps1 rename to images/ubuntu/scripts/tests/Haskell.Tests.ps1 diff --git a/images/linux/scripts/tests/Java.Tests.ps1 b/images/ubuntu/scripts/tests/Java.Tests.ps1 similarity index 100% rename from images/linux/scripts/tests/Java.Tests.ps1 rename to images/ubuntu/scripts/tests/Java.Tests.ps1 diff --git a/images/linux/scripts/tests/Node.Tests.ps1 b/images/ubuntu/scripts/tests/Node.Tests.ps1 similarity index 100% rename from images/linux/scripts/tests/Node.Tests.ps1 rename to images/ubuntu/scripts/tests/Node.Tests.ps1 diff --git a/images/linux/scripts/tests/PowerShellModules.Tests.ps1 b/images/ubuntu/scripts/tests/PowerShellModules.Tests.ps1 similarity index 100% rename from images/linux/scripts/tests/PowerShellModules.Tests.ps1 rename to images/ubuntu/scripts/tests/PowerShellModules.Tests.ps1 diff --git a/images/linux/scripts/tests/RunAll-Tests.ps1 b/images/ubuntu/scripts/tests/RunAll-Tests.ps1 similarity index 100% rename from images/linux/scripts/tests/RunAll-Tests.ps1 rename to images/ubuntu/scripts/tests/RunAll-Tests.ps1 diff --git a/images/linux/scripts/tests/RunnerCache.Tests.ps1 b/images/ubuntu/scripts/tests/RunnerCache.Tests.ps1 similarity index 100% rename from images/linux/scripts/tests/RunnerCache.Tests.ps1 rename to images/ubuntu/scripts/tests/RunnerCache.Tests.ps1 diff --git a/images/linux/scripts/tests/Tools.Tests.ps1 b/images/ubuntu/scripts/tests/Tools.Tests.ps1 similarity index 100% rename from images/linux/scripts/tests/Tools.Tests.ps1 rename to images/ubuntu/scripts/tests/Tools.Tests.ps1 diff --git a/images/linux/scripts/tests/Toolset.Tests.ps1 b/images/ubuntu/scripts/tests/Toolset.Tests.ps1 similarity index 100% rename from images/linux/scripts/tests/Toolset.Tests.ps1 rename to images/ubuntu/scripts/tests/Toolset.Tests.ps1 diff --git a/images/linux/scripts/tests/WebServers.Tests.ps1 b/images/ubuntu/scripts/tests/WebServers.Tests.ps1 similarity index 100% rename from images/linux/scripts/tests/WebServers.Tests.ps1 rename to images/ubuntu/scripts/tests/WebServers.Tests.ps1 diff --git a/images/linux/ubuntu2004.json b/images/ubuntu/templates/ubuntu-20.04.json similarity index 61% rename from images/linux/ubuntu2004.json rename to images/ubuntu/templates/ubuntu-20.04.json index 2e524036fda5..2b5eda994334 100644 --- a/images/linux/ubuntu2004.json +++ b/images/ubuntu/templates/ubuntu-20.04.json @@ -66,13 +66,15 @@ }, { "type": "shell", - "script": "{{template_dir}}/scripts/base/apt-mock.sh", + "script": "{{template_dir}}/../scripts/build/apt-mock.sh", "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" }, { "type": "shell", "scripts": [ - "{{template_dir}}/scripts/base/repos.sh" + "{{template_dir}}/../scripts/build/repos.sh", + "{{template_dir}}/../scripts/build/apt-ubuntu-archive.sh", + "{{template_dir}}/../scripts/build/apt.sh" ], "environment_vars": [ "DEBIAN_FRONTEND=noninteractive" @@ -81,64 +83,50 @@ }, { "type": "shell", - "script": "{{template_dir}}/scripts/base/apt-ubuntu-archive.sh", - "environment_vars": [ - "DEBIAN_FRONTEND=noninteractive" - ], - "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" - }, - { - "type": "shell", - "script": "{{template_dir}}/scripts/base/apt.sh", - "environment_vars": [ - "DEBIAN_FRONTEND=noninteractive" - ], - "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" - }, - { - "type": "shell", - "script": "{{template_dir}}/scripts/base/limits.sh", + "script": "{{template_dir}}/../scripts/build/limits.sh", "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" }, { "type": "file", - "source": "{{template_dir}}/scripts/helpers", + "source": "{{template_dir}}/../scripts/helpers", "destination": "{{user `helper_script_folder`}}" }, { "type": "file", - "source": "{{template_dir}}/scripts/installers", + "source": "{{template_dir}}/../scripts/build", "destination": "{{user `installer_script_folder`}}" }, { "type": "file", - "source": "{{ template_dir }}/post-generation", - "destination": "{{user `image_folder`}}" - }, - { - "type": "file", - "source": "{{template_dir}}/scripts/tests", + "sources": [ + "{{template_dir}}/../scripts/tests", + "{{template_dir}}/../scripts/docs-gen", + "{{template_dir}}/../assets/post-gen" + ], "destination": "{{user `image_folder`}}" }, { "type": "file", - "source": "{{ template_dir }}/scripts/SoftwareReport", - "destination": "{{user `image_folder`}}" + "source": "{{template_dir}}/../../../helpers/software-report-base", + "destination": "{{user `image_folder`}}/docs-gen/" }, { "type": "file", - "source": "{{ template_dir }}/../../helpers/software-report-base", - "destination": "{{user `image_folder`}}/SoftwareReport/" + "source": "{{template_dir}}/../toolsets/toolset-2004.json", + "destination": "{{user `installer_script_folder`}}/toolset.json" }, { - "type": "file", - "source": "{{template_dir}}/toolsets/toolset-2004.json", - "destination": "{{user `installer_script_folder`}}/toolset.json" + "type": "shell", + "inline": [ + "mv {{user `image_folder`}}/docs-gen {{user `image_folder`}}/SoftwareReport", + "mv {{user `image_folder`}}/post-gen {{user `image_folder`}}/post-generation" + ], + "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" }, { "type": "shell", "scripts": [ - "{{template_dir}}/scripts/installers/preimagedata.sh" + "{{template_dir}}/../scripts/build/preimagedata.sh" ], "environment_vars": [ "IMAGE_VERSION={{user `image_version`}}", @@ -149,7 +137,7 @@ { "type": "shell", "scripts": [ - "{{template_dir}}/scripts/installers/configure-environment.sh" + "{{template_dir}}/../scripts/build/configure-environment.sh" ], "environment_vars": [ "IMAGE_VERSION={{user `image_version`}}", @@ -161,7 +149,7 @@ { "type": "shell", "scripts": [ - "{{template_dir}}/scripts/installers/apt-vital.sh" + "{{template_dir}}/../scripts/build/apt-vital.sh" ], "environment_vars": [ "HELPER_SCRIPTS={{user `helper_script_folder`}}", @@ -173,8 +161,8 @@ { "type": "shell", "scripts": [ - "{{template_dir}}/scripts/installers/complete-snap-setup.sh", - "{{template_dir}}/scripts/installers/powershellcore.sh" + "{{template_dir}}/../scripts/build/complete-snap-setup.sh", + "{{template_dir}}/../scripts/build/powershellcore.sh" ], "environment_vars": [ "HELPER_SCRIPTS={{user `helper_script_folder`}}" @@ -184,8 +172,8 @@ { "type": "shell", "scripts": [ - "{{template_dir}}/scripts/installers/Install-PowerShellModules.ps1", - "{{template_dir}}/scripts/installers/Install-AzureModules.ps1" + "{{template_dir}}/../scripts/build/Install-PowerShellModules.ps1", + "{{template_dir}}/../scripts/build/Install-AzureModules.ps1" ], "environment_vars": [ "HELPER_SCRIPTS={{user `helper_script_folder`}}", @@ -196,70 +184,71 @@ { "type": "shell", "scripts": [ - "{{template_dir}}/scripts/installers/action-archive-cache.sh", - "{{template_dir}}/scripts/installers/runner-package.sh", - "{{template_dir}}/scripts/installers/apt-common.sh", - "{{template_dir}}/scripts/installers/azcopy.sh", - "{{template_dir}}/scripts/installers/azure-cli.sh", - "{{template_dir}}/scripts/installers/azure-devops-cli.sh", - "{{template_dir}}/scripts/installers/bicep.sh", - "{{template_dir}}/scripts/installers/aliyun-cli.sh", - "{{template_dir}}/scripts/installers/apache.sh", - "{{template_dir}}/scripts/installers/aws.sh", - "{{template_dir}}/scripts/installers/clang.sh", - "{{template_dir}}/scripts/installers/swift.sh", - "{{template_dir}}/scripts/installers/cmake.sh", - "{{template_dir}}/scripts/installers/codeql-bundle.sh", - "{{template_dir}}/scripts/installers/containers.sh", - "{{template_dir}}/scripts/installers/dotnetcore-sdk.sh", - "{{template_dir}}/scripts/installers/erlang.sh", - "{{template_dir}}/scripts/installers/firefox.sh", - "{{template_dir}}/scripts/installers/microsoft-edge.sh", - "{{template_dir}}/scripts/installers/gcc.sh", - "{{template_dir}}/scripts/installers/gfortran.sh", - "{{template_dir}}/scripts/installers/git.sh", - "{{template_dir}}/scripts/installers/git-lfs.sh", - "{{template_dir}}/scripts/installers/github-cli.sh", - "{{template_dir}}/scripts/installers/google-chrome.sh", - "{{template_dir}}/scripts/installers/google-cloud-cli.sh", - "{{template_dir}}/scripts/installers/haskell.sh", - "{{template_dir}}/scripts/installers/heroku.sh", - "{{template_dir}}/scripts/installers/hhvm.sh", - "{{template_dir}}/scripts/installers/java-tools.sh", - "{{template_dir}}/scripts/installers/kubernetes-tools.sh", - "{{template_dir}}/scripts/installers/oc.sh", - "{{template_dir}}/scripts/installers/leiningen.sh", - "{{template_dir}}/scripts/installers/miniconda.sh", - "{{template_dir}}/scripts/installers/mono.sh", - "{{template_dir}}/scripts/installers/kotlin.sh", - "{{template_dir}}/scripts/installers/mysql.sh", - "{{template_dir}}/scripts/installers/mssql-cmd-tools.sh", - "{{template_dir}}/scripts/installers/sqlpackage.sh", - "{{template_dir}}/scripts/installers/nginx.sh", - "{{template_dir}}/scripts/installers/nvm.sh", - "{{template_dir}}/scripts/installers/nodejs.sh", - "{{template_dir}}/scripts/installers/bazel.sh", - "{{template_dir}}/scripts/installers/oras-cli.sh", - "{{template_dir}}/scripts/installers/phantomjs.sh", - "{{template_dir}}/scripts/installers/php.sh", - "{{template_dir}}/scripts/installers/postgresql.sh", - "{{template_dir}}/scripts/installers/pulumi.sh", - "{{template_dir}}/scripts/installers/ruby.sh", - "{{template_dir}}/scripts/installers/r.sh", - "{{template_dir}}/scripts/installers/rust.sh", - "{{template_dir}}/scripts/installers/julia.sh", - "{{template_dir}}/scripts/installers/sbt.sh", - "{{template_dir}}/scripts/installers/selenium.sh", - "{{template_dir}}/scripts/installers/terraform.sh", - "{{template_dir}}/scripts/installers/packer.sh", - "{{template_dir}}/scripts/installers/vcpkg.sh", - "{{template_dir}}/scripts/installers/dpkg-config.sh", - "{{template_dir}}/scripts/installers/mongodb.sh", - "{{template_dir}}/scripts/installers/yq.sh", - "{{template_dir}}/scripts/installers/android.sh", - "{{template_dir}}/scripts/installers/pypy.sh", - "{{template_dir}}/scripts/installers/python.sh", - "{{template_dir}}/scripts/installers/zstd.sh" ], + "{{template_dir}}/../scripts/build/action-archive-cache.sh", + "{{template_dir}}/../scripts/build/runner-package.sh", + "{{template_dir}}/../scripts/build/apt-common.sh", + "{{template_dir}}/../scripts/build/azcopy.sh", + "{{template_dir}}/../scripts/build/azure-cli.sh", + "{{template_dir}}/../scripts/build/azure-devops-cli.sh", + "{{template_dir}}/../scripts/build/bicep.sh", + "{{template_dir}}/../scripts/build/aliyun-cli.sh", + "{{template_dir}}/../scripts/build/apache.sh", + "{{template_dir}}/../scripts/build/aws.sh", + "{{template_dir}}/../scripts/build/clang.sh", + "{{template_dir}}/../scripts/build/swift.sh", + "{{template_dir}}/../scripts/build/cmake.sh", + "{{template_dir}}/../scripts/build/codeql-bundle.sh", + "{{template_dir}}/../scripts/build/containers.sh", + "{{template_dir}}/../scripts/build/dotnetcore-sdk.sh", + "{{template_dir}}/../scripts/build/erlang.sh", + "{{template_dir}}/../scripts/build/firefox.sh", + "{{template_dir}}/../scripts/build/microsoft-edge.sh", + "{{template_dir}}/../scripts/build/gcc.sh", + "{{template_dir}}/../scripts/build/gfortran.sh", + "{{template_dir}}/../scripts/build/git.sh", + "{{template_dir}}/../scripts/build/git-lfs.sh", + "{{template_dir}}/../scripts/build/github-cli.sh", + "{{template_dir}}/../scripts/build/google-chrome.sh", + "{{template_dir}}/../scripts/build/google-cloud-cli.sh", + "{{template_dir}}/../scripts/build/haskell.sh", + "{{template_dir}}/../scripts/build/heroku.sh", + "{{template_dir}}/../scripts/build/hhvm.sh", + "{{template_dir}}/../scripts/build/java-tools.sh", + "{{template_dir}}/../scripts/build/kubernetes-tools.sh", + "{{template_dir}}/../scripts/build/oc.sh", + "{{template_dir}}/../scripts/build/leiningen.sh", + "{{template_dir}}/../scripts/build/miniconda.sh", + "{{template_dir}}/../scripts/build/mono.sh", + "{{template_dir}}/../scripts/build/kotlin.sh", + "{{template_dir}}/../scripts/build/mysql.sh", + "{{template_dir}}/../scripts/build/mssql-cmd-tools.sh", + "{{template_dir}}/../scripts/build/sqlpackage.sh", + "{{template_dir}}/../scripts/build/nginx.sh", + "{{template_dir}}/../scripts/build/nvm.sh", + "{{template_dir}}/../scripts/build/nodejs.sh", + "{{template_dir}}/../scripts/build/bazel.sh", + "{{template_dir}}/../scripts/build/oras-cli.sh", + "{{template_dir}}/../scripts/build/phantomjs.sh", + "{{template_dir}}/../scripts/build/php.sh", + "{{template_dir}}/../scripts/build/postgresql.sh", + "{{template_dir}}/../scripts/build/pulumi.sh", + "{{template_dir}}/../scripts/build/ruby.sh", + "{{template_dir}}/../scripts/build/r.sh", + "{{template_dir}}/../scripts/build/rust.sh", + "{{template_dir}}/../scripts/build/julia.sh", + "{{template_dir}}/../scripts/build/sbt.sh", + "{{template_dir}}/../scripts/build/selenium.sh", + "{{template_dir}}/../scripts/build/terraform.sh", + "{{template_dir}}/../scripts/build/packer.sh", + "{{template_dir}}/../scripts/build/vcpkg.sh", + "{{template_dir}}/../scripts/build/dpkg-config.sh", + "{{template_dir}}/../scripts/build/mongodb.sh", + "{{template_dir}}/../scripts/build/yq.sh", + "{{template_dir}}/../scripts/build/android.sh", + "{{template_dir}}/../scripts/build/pypy.sh", + "{{template_dir}}/../scripts/build/python.sh", + "{{template_dir}}/../scripts/build/zstd.sh" + ], "environment_vars": [ "HELPER_SCRIPTS={{user `helper_script_folder`}}", "INSTALLER_SCRIPT_FOLDER={{user `installer_script_folder`}}", @@ -270,8 +259,8 @@ { "type": "shell", "scripts": [ - "{{template_dir}}/scripts/installers/docker-compose.sh", - "{{template_dir}}/scripts/installers/docker.sh" + "{{template_dir}}/../scripts/build/docker-compose.sh", + "{{template_dir}}/../scripts/build/docker.sh" ], "environment_vars": [ "HELPER_SCRIPTS={{user `helper_script_folder`}}", @@ -284,8 +273,8 @@ { "type": "shell", "scripts": [ - "{{template_dir}}/scripts/installers/Install-Toolset.ps1", - "{{template_dir}}/scripts/installers/Configure-Toolset.ps1" + "{{template_dir}}/../scripts/build/Install-Toolset.ps1", + "{{template_dir}}/../scripts/build/Configure-Toolset.ps1" ], "environment_vars": [ "HELPER_SCRIPTS={{user `helper_script_folder`}}", @@ -296,7 +285,7 @@ { "type": "shell", "scripts": [ - "{{template_dir}}/scripts/installers/pipx-packages.sh" + "{{template_dir}}/../scripts/build/pipx-packages.sh" ], "environment_vars": [ "HELPER_SCRIPTS={{user `helper_script_folder`}}", @@ -307,7 +296,7 @@ { "type": "shell", "scripts": [ - "{{template_dir}}/scripts/installers/homebrew.sh" + "{{template_dir}}/../scripts/build/homebrew.sh" ], "environment_vars": [ "HELPER_SCRIPTS={{user `helper_script_folder`}}", @@ -318,14 +307,14 @@ }, { "type": "shell", - "script": "{{template_dir}}/scripts/base/snap.sh", + "script": "{{template_dir}}/../scripts/build/snap.sh", "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" }, { "type": "shell", "expect_disconnect": true, "scripts": [ - "{{template_dir}}/scripts/base/reboot.sh" + "{{template_dir}}/../scripts/build/reboot.sh" ], "execute_command": "/bin/sh -c '{{ .Vars }} {{ .Path }}'" }, @@ -334,13 +323,13 @@ "pause_before": "60s", "start_retry_timeout": "10m", "scripts": [ - "{{template_dir}}/scripts/installers/cleanup.sh" + "{{template_dir}}/../scripts/build/cleanup.sh" ], "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" }, { "type": "shell", - "script": "{{template_dir}}/scripts/base/apt-mock-remove.sh", + "script": "{{template_dir}}/../scripts/build/apt-mock-remove.sh", "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" }, { @@ -373,7 +362,7 @@ { "type": "shell", "scripts":[ - "{{template_dir}}/scripts/installers/post-deployment.sh" + "{{template_dir}}/../scripts/build/post-deployment.sh" ], "environment_vars":[ "HELPER_SCRIPT_FOLDER={{user `helper_script_folder`}}", @@ -385,7 +374,7 @@ { "type": "shell", "scripts":[ - "{{template_dir}}/scripts/installers/validate-disk-space.sh" + "{{template_dir}}/../scripts/build/validate-disk-space.sh" ], "environment_vars": [ "RUN_VALIDATION={{user `run_validation_diskspace`}}" @@ -393,7 +382,7 @@ }, { "type": "file", - "source": "{{template_dir}}/config/ubuntu2004.conf", + "source": "{{template_dir}}/../assets/ubuntu2004.conf", "destination": "/tmp/" }, { diff --git a/images/linux/ubuntu2204.pkr.hcl b/images/ubuntu/templates/ubuntu-22.04.pkr.hcl similarity index 59% rename from images/linux/ubuntu2204.pkr.hcl rename to images/ubuntu/templates/ubuntu-22.04.pkr.hcl index 650711a87ef0..7269557755f4 100644 --- a/images/linux/ubuntu2204.pkr.hcl +++ b/images/ubuntu/templates/ubuntu-22.04.pkr.hcl @@ -185,209 +185,203 @@ build { provisioner "shell" { execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" - script = "${path.root}/scripts/base/apt-mock.sh" + script = "${path.root}/../scripts/build/apt-mock.sh" } provisioner "shell" { environment_vars = ["DEBIAN_FRONTEND=noninteractive"] execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" - scripts = ["${path.root}/scripts/base/repos.sh"] - } - - provisioner "shell" { - environment_vars = ["DEBIAN_FRONTEND=noninteractive"] - execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" - scripts = ["${path.root}/scripts/base/apt-ubuntu-archive.sh"] - } - - provisioner "shell" { - environment_vars = ["DEBIAN_FRONTEND=noninteractive"] - execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" - script = "${path.root}/scripts/base/apt.sh" + scripts = [ + "${path.root}/../scripts/build/repos.sh", + "${path.root}/../scripts/build/apt-ubuntu-archive.sh", + "${path.root}/../scripts/build/apt.sh" + ] } provisioner "shell" { execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" - script = "${path.root}/scripts/base/limits.sh" + script = "${path.root}/../scripts/build/limits.sh" } provisioner "file" { destination = "${var.helper_script_folder}" - source = "${path.root}/scripts/helpers" + source = "${path.root}/../scripts/helpers" } provisioner "file" { destination = "${var.installer_script_folder}" - source = "${path.root}/scripts/installers" + source = "${path.root}/../scripts/build" } provisioner "file" { destination = "${var.image_folder}" - source = "${path.root}/post-generation" + sources = [ + "${path.root}/../assets/post-gen", + "${path.root}/../scripts/tests", + "${path.root}/../scripts/docs-gen" + ] } provisioner "file" { - destination = "${var.image_folder}" - source = "${path.root}/scripts/tests" - } - - provisioner "file" { - destination = "${var.image_folder}" - source = "${path.root}/scripts/SoftwareReport" + destination = "${var.image_folder}/docs-gen/" + source = "${path.root}/../../../helpers/software-report-base" } provisioner "file" { - destination = "${var.image_folder}/SoftwareReport/" - source = "${path.root}/../../helpers/software-report-base" + destination = "${var.installer_script_folder}/toolset.json" + source = "${path.root}/../toolsets/toolset-2204.json" } - provisioner "file" { - destination = "${var.installer_script_folder}/toolset.json" - source = "${path.root}/toolsets/toolset-2204.json" + provisioner "shell" { + execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" + inline = [ + "mv ${var.image_folder}/docs-gen ${var.image_folder}/SoftwareReport", + "mv ${var.image_folder}/post-gen ${var.image_folder}/post-generation" + ] } provisioner "shell" { environment_vars = ["IMAGE_VERSION=${var.image_version}", "IMAGEDATA_FILE=${var.imagedata_file}"] execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" - scripts = ["${path.root}/scripts/installers/preimagedata.sh"] + scripts = ["${path.root}/../scripts/build/preimagedata.sh"] } provisioner "shell" { environment_vars = ["IMAGE_VERSION=${var.image_version}", "IMAGE_OS=${var.image_os}", "HELPER_SCRIPTS=${var.helper_script_folder}"] execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" - scripts = ["${path.root}/scripts/installers/configure-environment.sh"] + scripts = ["${path.root}/../scripts/build/configure-environment.sh"] } provisioner "shell" { environment_vars = ["DEBIAN_FRONTEND=noninteractive", "HELPER_SCRIPTS=${var.helper_script_folder}", "INSTALLER_SCRIPT_FOLDER=${var.installer_script_folder}"] execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" - scripts = ["${path.root}/scripts/installers/apt-vital.sh"] + scripts = ["${path.root}/../scripts/build/apt-vital.sh"] } provisioner "shell" { environment_vars = ["HELPER_SCRIPTS=${var.helper_script_folder}"] execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" - scripts = ["${path.root}/scripts/installers/complete-snap-setup.sh", "${path.root}/scripts/installers/powershellcore.sh"] + scripts = ["${path.root}/../scripts/build/complete-snap-setup.sh", "${path.root}/../scripts/build/powershellcore.sh"] } provisioner "shell" { environment_vars = ["HELPER_SCRIPTS=${var.helper_script_folder}", "INSTALLER_SCRIPT_FOLDER=${var.installer_script_folder}"] execute_command = "sudo sh -c '{{ .Vars }} pwsh -f {{ .Path }}'" - scripts = ["${path.root}/scripts/installers/Install-PowerShellModules.ps1", "${path.root}/scripts/installers/Install-AzureModules.ps1"] + scripts = ["${path.root}/../scripts/build/Install-PowerShellModules.ps1", "${path.root}/../scripts/build/Install-AzureModules.ps1"] } provisioner "shell" { environment_vars = ["HELPER_SCRIPTS=${var.helper_script_folder}", "INSTALLER_SCRIPT_FOLDER=${var.installer_script_folder}", "DEBIAN_FRONTEND=noninteractive"] execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" scripts = [ - "${path.root}/scripts/installers/action-archive-cache.sh", - "${path.root}/scripts/installers/runner-package.sh", - "${path.root}/scripts/installers/apt-common.sh", - "${path.root}/scripts/installers/azcopy.sh", - "${path.root}/scripts/installers/azure-cli.sh", - "${path.root}/scripts/installers/azure-devops-cli.sh", - "${path.root}/scripts/installers/bicep.sh", - "${path.root}/scripts/installers/aliyun-cli.sh", - "${path.root}/scripts/installers/apache.sh", - "${path.root}/scripts/installers/aws.sh", - "${path.root}/scripts/installers/clang.sh", - "${path.root}/scripts/installers/swift.sh", - "${path.root}/scripts/installers/cmake.sh", - "${path.root}/scripts/installers/codeql-bundle.sh", - "${path.root}/scripts/installers/containers.sh", - "${path.root}/scripts/installers/dotnetcore-sdk.sh", - "${path.root}/scripts/installers/firefox.sh", - "${path.root}/scripts/installers/microsoft-edge.sh", - "${path.root}/scripts/installers/gcc.sh", - "${path.root}/scripts/installers/gfortran.sh", - "${path.root}/scripts/installers/git.sh", - "${path.root}/scripts/installers/git-lfs.sh", - "${path.root}/scripts/installers/github-cli.sh", - "${path.root}/scripts/installers/google-chrome.sh", - "${path.root}/scripts/installers/google-cloud-cli.sh", - "${path.root}/scripts/installers/haskell.sh", - "${path.root}/scripts/installers/heroku.sh", - "${path.root}/scripts/installers/java-tools.sh", - "${path.root}/scripts/installers/kubernetes-tools.sh", - "${path.root}/scripts/installers/oc.sh", - "${path.root}/scripts/installers/leiningen.sh", - "${path.root}/scripts/installers/miniconda.sh", - "${path.root}/scripts/installers/mono.sh", - "${path.root}/scripts/installers/kotlin.sh", - "${path.root}/scripts/installers/mysql.sh", - "${path.root}/scripts/installers/mssql-cmd-tools.sh", - "${path.root}/scripts/installers/sqlpackage.sh", - "${path.root}/scripts/installers/nginx.sh", - "${path.root}/scripts/installers/nvm.sh", - "${path.root}/scripts/installers/nodejs.sh", - "${path.root}/scripts/installers/bazel.sh", - "${path.root}/scripts/installers/oras-cli.sh", - "${path.root}/scripts/installers/php.sh", - "${path.root}/scripts/installers/postgresql.sh", - "${path.root}/scripts/installers/pulumi.sh", - "${path.root}/scripts/installers/ruby.sh", - "${path.root}/scripts/installers/r.sh", - "${path.root}/scripts/installers/rust.sh", - "${path.root}/scripts/installers/julia.sh", - "${path.root}/scripts/installers/sbt.sh", - "${path.root}/scripts/installers/selenium.sh", - "${path.root}/scripts/installers/terraform.sh", - "${path.root}/scripts/installers/packer.sh", - "${path.root}/scripts/installers/vcpkg.sh", - "${path.root}/scripts/installers/dpkg-config.sh", - "${path.root}/scripts/installers/yq.sh", - "${path.root}/scripts/installers/android.sh", - "${path.root}/scripts/installers/pypy.sh", - "${path.root}/scripts/installers/python.sh", - "${path.root}/scripts/installers/zstd.sh" + "${path.root}/../scripts/build/action-archive-cache.sh", + "${path.root}/../scripts/build/runner-package.sh", + "${path.root}/../scripts/build/apt-common.sh", + "${path.root}/../scripts/build/azcopy.sh", + "${path.root}/../scripts/build/azure-cli.sh", + "${path.root}/../scripts/build/azure-devops-cli.sh", + "${path.root}/../scripts/build/bicep.sh", + "${path.root}/../scripts/build/aliyun-cli.sh", + "${path.root}/../scripts/build/apache.sh", + "${path.root}/../scripts/build/aws.sh", + "${path.root}/../scripts/build/clang.sh", + "${path.root}/../scripts/build/swift.sh", + "${path.root}/../scripts/build/cmake.sh", + "${path.root}/../scripts/build/codeql-bundle.sh", + "${path.root}/../scripts/build/containers.sh", + "${path.root}/../scripts/build/dotnetcore-sdk.sh", + "${path.root}/../scripts/build/firefox.sh", + "${path.root}/../scripts/build/microsoft-edge.sh", + "${path.root}/../scripts/build/gcc.sh", + "${path.root}/../scripts/build/gfortran.sh", + "${path.root}/../scripts/build/git.sh", + "${path.root}/../scripts/build/git-lfs.sh", + "${path.root}/../scripts/build/github-cli.sh", + "${path.root}/../scripts/build/google-chrome.sh", + "${path.root}/../scripts/build/google-cloud-cli.sh", + "${path.root}/../scripts/build/haskell.sh", + "${path.root}/../scripts/build/heroku.sh", + "${path.root}/../scripts/build/java-tools.sh", + "${path.root}/../scripts/build/kubernetes-tools.sh", + "${path.root}/../scripts/build/oc.sh", + "${path.root}/../scripts/build/leiningen.sh", + "${path.root}/../scripts/build/miniconda.sh", + "${path.root}/../scripts/build/mono.sh", + "${path.root}/../scripts/build/kotlin.sh", + "${path.root}/../scripts/build/mysql.sh", + "${path.root}/../scripts/build/mssql-cmd-tools.sh", + "${path.root}/../scripts/build/sqlpackage.sh", + "${path.root}/../scripts/build/nginx.sh", + "${path.root}/../scripts/build/nvm.sh", + "${path.root}/../scripts/build/nodejs.sh", + "${path.root}/../scripts/build/bazel.sh", + "${path.root}/../scripts/build/oras-cli.sh", + "${path.root}/../scripts/build/php.sh", + "${path.root}/../scripts/build/postgresql.sh", + "${path.root}/../scripts/build/pulumi.sh", + "${path.root}/../scripts/build/ruby.sh", + "${path.root}/../scripts/build/r.sh", + "${path.root}/../scripts/build/rust.sh", + "${path.root}/../scripts/build/julia.sh", + "${path.root}/../scripts/build/sbt.sh", + "${path.root}/../scripts/build/selenium.sh", + "${path.root}/../scripts/build/terraform.sh", + "${path.root}/../scripts/build/packer.sh", + "${path.root}/../scripts/build/vcpkg.sh", + "${path.root}/../scripts/build/dpkg-config.sh", + "${path.root}/../scripts/build/yq.sh", + "${path.root}/../scripts/build/android.sh", + "${path.root}/../scripts/build/pypy.sh", + "${path.root}/../scripts/build/python.sh", + "${path.root}/../scripts/build/zstd.sh" ] } provisioner "shell" { environment_vars = ["HELPER_SCRIPTS=${var.helper_script_folder}", "INSTALLER_SCRIPT_FOLDER=${var.installer_script_folder}", "DOCKERHUB_LOGIN=${var.dockerhub_login}", "DOCKERHUB_PASSWORD=${var.dockerhub_password}"] execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" - scripts = ["${path.root}/scripts/installers/docker-compose.sh", "${path.root}/scripts/installers/docker.sh"] + scripts = ["${path.root}/../scripts/build/docker-compose.sh", "${path.root}/../scripts/build/docker.sh"] } provisioner "shell" { environment_vars = ["HELPER_SCRIPTS=${var.helper_script_folder}", "INSTALLER_SCRIPT_FOLDER=${var.installer_script_folder}"] execute_command = "sudo sh -c '{{ .Vars }} pwsh -f {{ .Path }}'" - scripts = ["${path.root}/scripts/installers/Install-Toolset.ps1", "${path.root}/scripts/installers/Configure-Toolset.ps1"] + scripts = ["${path.root}/../scripts/build/Install-Toolset.ps1", "${path.root}/../scripts/build/Configure-Toolset.ps1"] } provisioner "shell" { environment_vars = ["HELPER_SCRIPTS=${var.helper_script_folder}", "INSTALLER_SCRIPT_FOLDER=${var.installer_script_folder}"] execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" - scripts = ["${path.root}/scripts/installers/pipx-packages.sh"] + scripts = ["${path.root}/../scripts/build/pipx-packages.sh"] } provisioner "shell" { environment_vars = ["HELPER_SCRIPTS=${var.helper_script_folder}", "DEBIAN_FRONTEND=noninteractive", "INSTALLER_SCRIPT_FOLDER=${var.installer_script_folder}"] execute_command = "/bin/sh -c '{{ .Vars }} {{ .Path }}'" - scripts = ["${path.root}/scripts/installers/homebrew.sh"] + scripts = ["${path.root}/../scripts/build/homebrew.sh"] } provisioner "shell" { execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" - script = "${path.root}/scripts/base/snap.sh" + script = "${path.root}/../scripts/build/snap.sh" } provisioner "shell" { execute_command = "/bin/sh -c '{{ .Vars }} {{ .Path }}'" expect_disconnect = true - scripts = ["${path.root}/scripts/base/reboot.sh"] + scripts = ["${path.root}/../scripts/build/reboot.sh"] } provisioner "shell" { execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" pause_before = "1m0s" - scripts = ["${path.root}/scripts/installers/cleanup.sh"] + scripts = ["${path.root}/../scripts/build/cleanup.sh"] start_retry_timeout = "10m" } provisioner "shell" { execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" - script = "${path.root}/scripts/base/apt-mock-remove.sh" + script = "${path.root}/../scripts/build/apt-mock-remove.sh" } provisioner "shell" { @@ -410,17 +404,17 @@ build { provisioner "shell" { environment_vars = ["HELPER_SCRIPT_FOLDER=${var.helper_script_folder}", "INSTALLER_SCRIPT_FOLDER=${var.installer_script_folder}", "IMAGE_FOLDER=${var.image_folder}"] execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" - scripts = ["${path.root}/scripts/installers/post-deployment.sh"] + scripts = ["${path.root}/../scripts/build/post-deployment.sh"] } provisioner "shell" { environment_vars = ["RUN_VALIDATION=${var.run_validation_diskspace}"] - scripts = ["${path.root}/scripts/installers/validate-disk-space.sh"] + scripts = ["${path.root}/../scripts/build/validate-disk-space.sh"] } provisioner "file" { destination = "/tmp/" - source = "${path.root}/config/ubuntu2204.conf" + source = "${path.root}/../assets/ubuntu2204.conf" } provisioner "shell" { diff --git a/images/linux/ubuntuminimal.pkr.hcl b/images/ubuntu/templates/ubuntu-minimal.pkr.hcl similarity index 80% rename from images/linux/ubuntuminimal.pkr.hcl rename to images/ubuntu/templates/ubuntu-minimal.pkr.hcl index 373fc06f43e0..9ccc6202403d 100644 --- a/images/linux/ubuntuminimal.pkr.hcl +++ b/images/ubuntu/templates/ubuntu-minimal.pkr.hcl @@ -146,12 +146,12 @@ source "azure-arm" "build_image" { virtual_network_name = "${var.virtual_network_name}" virtual_network_subnet_name = "${var.virtual_network_subnet_name}" allowed_inbound_ip_addresses = "${var.allowed_inbound_ip_addresses}" - + // VM Configuration vm_size = "${var.vm_size}" os_disk_size_gb = "86" os_type = "Linux" - + dynamic "azure_tag" { for_each = var.azure_tags content { @@ -174,122 +174,123 @@ build { // Add apt wrapper to implement retries provisioner "shell" { execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" - script = "${path.root}/scripts/base/apt-mock.sh" - } - - // Install MS package repos - provisioner "shell" { - environment_vars = ["DEBIAN_FRONTEND=noninteractive"] - execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" - scripts = ["${path.root}/scripts/base/repos.sh"] + script = "${path.root}/../scripts/build/apt-mock.sh" } - // Configure apt + // Install MS package repos, Configure apt provisioner "shell" { environment_vars = ["DEBIAN_FRONTEND=noninteractive"] execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" - script = "${path.root}/scripts/base/apt.sh" + scripts = [ + "${path.root}/../scripts/build/repos.sh", + "${path.root}/../scripts/build/apt.sh" + ] } // Configure limits provisioner "shell" { execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" - script = "${path.root}/scripts/base/limits.sh" + script = "${path.root}/../scripts/build/limits.sh" } provisioner "file" { destination = "${local.helper_script_folder}" - source = "${path.root}/scripts/helpers" + source = "${path.root}/../scripts/helpers" } provisioner "file" { destination = "${local.installer_script_folder}" - source = "${path.root}/scripts/installers" + source = "${path.root}/../scripts/build" } provisioner "file" { destination = "${local.image_folder}" sources = [ - "${path.root}/post-generation", - "${path.root}/scripts/tests" + "${path.root}/../assets/post-gen", + "${path.root}/../scripts/tests" ] } provisioner "file" { destination = "${local.installer_script_folder}/toolset.json" - source = "${path.root}/toolsets/${local.toolset_file_name}" + source = "${path.root}/../toolsets/${local.toolset_file_name}" + } + + provisioner "shell" { + execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" + inline = ["mv ${local.image_folder}/post-gen ${local.image_folder}/post-generation"] } // Generate image data file provisioner "shell" { environment_vars = ["IMAGE_VERSION=${var.image_version}", "IMAGEDATA_FILE=${local.imagedata_file}"] execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" - scripts = ["${path.root}/scripts/installers/preimagedata.sh"] + scripts = ["${path.root}/../scripts/build/preimagedata.sh"] } // Create /etc/environment, configure waagent etc. provisioner "shell" { environment_vars = ["IMAGE_VERSION=${var.image_version}", "IMAGE_OS=${local.image_os}", "HELPER_SCRIPTS=${local.helper_script_folder}"] execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" - scripts = ["${path.root}/scripts/installers/configure-environment.sh"] + scripts = ["${path.root}/../scripts/build/configure-environment.sh"] } provisioner "shell" { environment_vars = ["DEBIAN_FRONTEND=noninteractive", "HELPER_SCRIPTS=${local.helper_script_folder}", "INSTALLER_SCRIPT_FOLDER=${local.installer_script_folder}"] execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" - scripts = ["${path.root}/scripts/installers/apt-vital.sh"] + scripts = ["${path.root}/../scripts/build/apt-vital.sh"] } provisioner "shell" { environment_vars = ["DEBIAN_FRONTEND=noninteractive", "HELPER_SCRIPTS=${local.helper_script_folder}"] execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" - scripts = ["${path.root}/scripts/installers/powershellcore.sh"] + scripts = ["${path.root}/../scripts/build/powershellcore.sh"] } provisioner "shell" { environment_vars = ["HELPER_SCRIPTS=${local.helper_script_folder}", "INSTALLER_SCRIPT_FOLDER=${local.installer_script_folder}"] execute_command = "sudo sh -c '{{ .Vars }} pwsh -f {{ .Path }}'" - scripts = ["${path.root}/scripts/installers/Install-PowerShellModules.ps1"] + scripts = ["${path.root}/../scripts/build/Install-PowerShellModules.ps1"] } provisioner "shell" { environment_vars = ["DEBIAN_FRONTEND=noninteractive", "HELPER_SCRIPTS=${local.helper_script_folder}", "INSTALLER_SCRIPT_FOLDER=${local.installer_script_folder}"] execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" scripts = [ - "${path.root}/scripts/installers/git.sh", - "${path.root}/scripts/installers/git-lfs.sh", - "${path.root}/scripts/installers/github-cli.sh", - "${path.root}/scripts/installers/zstd.sh" + "${path.root}/../scripts/build/git.sh", + "${path.root}/../scripts/build/git-lfs.sh", + "${path.root}/../scripts/build/github-cli.sh", + "${path.root}/../scripts/build/zstd.sh" ] } provisioner "shell" { execute_command = "/bin/sh -c '{{ .Vars }} {{ .Path }}'" expect_disconnect = true - scripts = ["${path.root}/scripts/base/reboot.sh"] + scripts = ["${path.root}/../scripts/build/reboot.sh"] } provisioner "shell" { execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" pause_before = "1m0s" - scripts = ["${path.root}/scripts/installers/cleanup.sh"] + scripts = ["${path.root}/../scripts/build/cleanup.sh"] start_retry_timeout = "10m" } provisioner "shell" { execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" - script = "${path.root}/scripts/base/apt-mock-remove.sh" + script = "${path.root}/../scripts/build/apt-mock-remove.sh" } provisioner "shell" { environment_vars = ["HELPER_SCRIPT_FOLDER=${local.helper_script_folder}", "INSTALLER_SCRIPT_FOLDER=${local.installer_script_folder}", "IMAGE_FOLDER=${local.image_folder}"] execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" - scripts = ["${path.root}/scripts/installers/post-deployment.sh"] + scripts = ["${path.root}/../scripts/build/post-deployment.sh"] } provisioner "shell" { environment_vars = ["RUN_VALIDATION=${var.run_validation_diskspace}"] - scripts = ["${path.root}/scripts/installers/validate-disk-space.sh"] + scripts = ["${path.root}/../scripts/build/validate-disk-space.sh"] } provisioner "shell" { diff --git a/images/linux/toolsets/toolset-2004.json b/images/ubuntu/toolsets/toolset-2004.json similarity index 100% rename from images/linux/toolsets/toolset-2004.json rename to images/ubuntu/toolsets/toolset-2004.json diff --git a/images/linux/toolsets/toolset-2204.json b/images/ubuntu/toolsets/toolset-2204.json similarity index 100% rename from images/linux/toolsets/toolset-2204.json rename to images/ubuntu/toolsets/toolset-2204.json From 8d6a01b370d473b5b2d0763a401f9b6522806920 Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Wed, 15 Nov 2023 12:12:28 +0100 Subject: [PATCH 2439/3485] [macOS] Implement new directories hierarchy (#8741) --- images.CI/macos/anka/Service.Helpers.psm1 | 4 +- images.CI/shebang-linter.ps1 | 2 +- .../add-certificate.swift | 0 .../auto-software-update-arm64.exp | 0 .../environment => assets}/bashprofile | 0 .../environment => assets}/bashrc | 0 .../bootstrap-provisioner/change_password | 0 .../installNewProvisioner.sh | 0 .../bootstrap-provisioner/kcpassword.py | 0 .../bootstrap-provisioner/setAutoLogin.sh | 0 .../select-xamarin-sdk-v2.sh | 0 .../xamarin-selector}/select-xamarin-sdk.sh | 0 .../build}/action-archive-cache.sh | 0 .../build}/add-network-interface-detection.sh | 0 .../build}/android-toolsets.sh | 0 .../core => scripts/build}/apache.sh | 0 .../core => scripts/build}/audiodevice.sh | 0 .../build}/autologin.sh | 0 .../{provision/core => scripts/build}/aws.sh | 0 .../core => scripts/build}/azcopy.sh | 0 .../core => scripts/build}/bicep.sh | 0 .../build}/build-xcode-symlinks.sh | 0 .../core => scripts/build}/chrome.sh | 0 .../build}/cleanup-brew.sh | 0 .../core => scripts/build}/cocoapods.sh | 0 .../core => scripts/build}/codeql-bundle.sh | 0 .../core => scripts/build}/commonutils.sh | 0 .../build}/configure-hostname.sh | 0 .../build}/configure-machine.sh | 0 .../build}/configure-ssh.sh | 0 .../build}/configure-tccdb-macos.sh | 0 .../build}/configure-toolset.ps1 | 0 .../build}/delete-duplicate-sims.rb | 0 .../build}/disable-auto-updates.sh | 0 .../core => scripts/build}/dotnet.sh | 0 .../{provision/core => scripts/build}/edge.sh | 0 .../build}/finalize-vm.sh | 0 .../core => scripts/build}/firefox.sh | 0 .../build}/fix-xcode-simulators.ps1 | 0 .../{provision/core => scripts/build}/gcc.sh | 0 .../{provision/core => scripts/build}/git.sh | 0 .../core => scripts/build}/golang.sh | 0 .../core => scripts/build}/haskell.sh | 0 .../core => scripts/build}/homebrew.sh | 0 .../{provision/core => scripts/build}/llvm.sh | 0 .../build}/max-files.sh | 0 .../core => scripts/build}/miniconda.sh | 0 .../core => scripts/build}/mongodb.sh | 0 .../{provision/core => scripts/build}/mono.sh | 0 .../core => scripts/build}/nginx.sh | 0 .../{provision/core => scripts/build}/node.sh | 0 .../build}/ntpconf.sh | 0 .../{provision/core => scripts/build}/nvm.sh | 0 .../build}/open_windows_check.sh | 0 .../core => scripts/build}/openjdk.sh | 0 .../core => scripts/build}/openssl.sh | 0 .../{provision/core => scripts/build}/php.sh | 0 .../core => scripts/build}/pipx-packages.sh | 0 .../core => scripts/build}/postgresql.sh | 0 .../core => scripts/build}/powershell.sh | 0 .../build}/preimagedata.sh | 0 .../{provision/core => scripts/build}/pypy.sh | 0 .../core => scripts/build}/python.sh | 0 .../core => scripts/build}/reboot.sh | 0 .../core => scripts/build}/rosetta.sh | 0 .../{provision/core => scripts/build}/ruby.sh | 0 .../core => scripts/build}/rubygem.sh | 0 .../{provision/core => scripts/build}/rust.sh | 0 .../core => scripts/build}/safari.sh | 0 .../build}/screensaver-off.sh | 0 .../build}/shell-change.sh | 0 .../core => scripts/build}/swiftlint.sh | 0 .../core => scripts/build}/toolset.ps1 | 114 ++-- .../core => scripts/build}/vcpkg.sh | 0 .../core => scripts/build}/vsmac.sh | 0 .../core => scripts/build}/xamarin.sh | 0 .../core => scripts/build}/xcode-clt.sh | 0 .../core => scripts/build}/xcode-postbuild.sh | 0 .../core => scripts/build}/xcode-sims.sh | 0 .../core => scripts/build}/xcode.ps1 | 0 .../docs-gen}/SoftwareReport.Android.psm1 | 0 .../docs-gen}/SoftwareReport.Browsers.psm1 | 0 .../docs-gen}/SoftwareReport.Common.psm1 | 0 .../docs-gen}/SoftwareReport.Generator.ps1 | 638 +++++++++--------- .../docs-gen}/SoftwareReport.Java.psm1 | 0 .../docs-gen}/SoftwareReport.Toolcache.psm1 | 0 .../docs-gen}/SoftwareReport.WebServers.psm1 | 0 .../docs-gen}/SoftwareReport.Xamarin.psm1 | 0 .../docs-gen}/SoftwareReport.Xcode.psm1 | 0 .../{ => scripts}/helpers/Common.Helpers.psm1 | 0 .../helpers/SoftwareReport.Helpers.psm1 | 0 .../{ => scripts}/helpers/Tests.Helpers.psm1 | 0 .../{ => scripts}/helpers/Xcode.Helpers.psm1 | 0 .../helpers/Xcode.Installer.psm1 | 0 .../confirm-identified-developers.scpt | 0 .../utils => scripts/helpers}/invoke-tests.sh | 0 .../utils => scripts/helpers}/utils.sh | 0 .../helpers}/xamarin-utils.sh | 0 .../tests/ActionArchiveCache.Tests.ps1 | 0 .../{ => scripts}/tests/Android.Tests.ps1 | 164 ++--- .../{ => scripts}/tests/BasicTools.Tests.ps1 | 0 .../{ => scripts}/tests/Browsers.Tests.ps1 | 0 .../{ => scripts}/tests/Common.Tests.ps1 | 0 .../{ => scripts}/tests/Databases.Tests.ps1 | 0 .../macos/{ => scripts}/tests/Git.Tests.ps1 | 0 .../{ => scripts}/tests/Haskell.Tests.ps1 | 0 .../macos/{ => scripts}/tests/Java.Tests.ps1 | 0 .../macos/{ => scripts}/tests/LLVM.Tests.ps1 | 0 .../{ => scripts}/tests/Linters.Tests.ps1 | 18 +- .../macos/{ => scripts}/tests/Node.Tests.ps1 | 112 +-- .../{ => scripts}/tests/OpenSSL.Tests.ps1 | 0 .../macos/{ => scripts}/tests/PHP.Tests.ps1 | 0 .../tests/PipxPackages.Tests.ps1 | 0 .../{ => scripts}/tests/Powershell.Tests.ps1 | 84 +-- .../{ => scripts}/tests/Python.Tests.ps1 | 88 +-- .../{ => scripts}/tests/Ruby.arm64.Tests.ps1 | 0 .../{ => scripts}/tests/Ruby.x64.Tests.ps1 | 0 .../{ => scripts}/tests/RubyGem.Tests.ps1 | 0 .../{ => scripts}/tests/RunAll-Tests.ps1 | 0 .../macos/{ => scripts}/tests/Rust.Tests.ps1 | 0 .../{ => scripts}/tests/System.Tests.ps1 | 0 .../{ => scripts}/tests/Toolcache.Tests.ps1 | 0 .../tests}/Toolset.Tests.ps1 | 286 ++++---- .../{ => scripts}/tests/WebServers.Tests.ps1 | 0 .../{ => scripts}/tests/Xamarin.Tests.ps1 | 618 ++++++++--------- .../macos/{ => scripts}/tests/Xcode.Tests.ps1 | 270 ++++---- images/macos/templates/macOS-11.json | 174 +++-- images/macos/templates/macOS-12.anka.pkr.hcl | 160 ++--- images/macos/templates/macOS-12.json | 174 +++-- images/macos/templates/macOS-13.anka.pkr.hcl | 132 ++-- .../templates/macOS-13.arm64.anka.pkr.hcl | 114 ++-- images/macos/templates/macOS-14.anka.pkr.hcl | 128 ++-- .../templates/macOS-14.arm64.anka.pkr.hcl | 110 +-- 133 files changed, 1713 insertions(+), 1677 deletions(-) rename images/macos/{provision/configuration => assets}/add-certificate.swift (100%) rename images/macos/{provision/configuration => assets}/auto-software-update-arm64.exp (100%) rename images/macos/{provision/configuration/environment => assets}/bashprofile (100%) rename images/macos/{provision/configuration/environment => assets}/bashrc (100%) rename images/macos/{provision => assets}/bootstrap-provisioner/change_password (100%) mode change 100755 => 100644 rename images/macos/{provision => assets}/bootstrap-provisioner/installNewProvisioner.sh (100%) rename images/macos/{provision => assets}/bootstrap-provisioner/kcpassword.py (100%) mode change 100755 => 100644 rename images/macos/{provision => assets}/bootstrap-provisioner/setAutoLogin.sh (100%) rename images/macos/{provision/assets => assets/xamarin-selector}/select-xamarin-sdk-v2.sh (100%) rename images/macos/{provision/assets => assets/xamarin-selector}/select-xamarin-sdk.sh (100%) rename images/macos/{provision/core => scripts/build}/action-archive-cache.sh (100%) mode change 100755 => 100644 rename images/macos/{provision/configuration => scripts/build}/add-network-interface-detection.sh (100%) mode change 100755 => 100644 rename images/macos/{provision/core => scripts/build}/android-toolsets.sh (100%) mode change 100755 => 100644 rename images/macos/{provision/core => scripts/build}/apache.sh (100%) rename images/macos/{provision/core => scripts/build}/audiodevice.sh (100%) rename images/macos/{provision/configuration => scripts/build}/autologin.sh (100%) mode change 100755 => 100644 rename images/macos/{provision/core => scripts/build}/aws.sh (100%) rename images/macos/{provision/core => scripts/build}/azcopy.sh (100%) mode change 100755 => 100644 rename images/macos/{provision/core => scripts/build}/bicep.sh (100%) rename images/macos/{provision/core => scripts/build}/build-xcode-symlinks.sh (100%) rename images/macos/{provision/core => scripts/build}/chrome.sh (100%) rename images/macos/{provision/configuration => scripts/build}/cleanup-brew.sh (100%) rename images/macos/{provision/core => scripts/build}/cocoapods.sh (100%) mode change 100755 => 100644 rename images/macos/{provision/core => scripts/build}/codeql-bundle.sh (100%) rename images/macos/{provision/core => scripts/build}/commonutils.sh (100%) rename images/macos/{provision/configuration => scripts/build}/configure-hostname.sh (100%) rename images/macos/{provision/configuration => scripts/build}/configure-machine.sh (100%) rename images/macos/{provision/configuration => scripts/build}/configure-ssh.sh (100%) mode change 100755 => 100644 rename images/macos/{provision/configuration => scripts/build}/configure-tccdb-macos.sh (100%) rename images/macos/{provision/core => scripts/build}/configure-toolset.ps1 (100%) rename images/macos/{provision/core => scripts/build}/delete-duplicate-sims.rb (100%) rename images/macos/{provision/configuration => scripts/build}/disable-auto-updates.sh (100%) mode change 100755 => 100644 rename images/macos/{provision/core => scripts/build}/dotnet.sh (100%) mode change 100755 => 100644 rename images/macos/{provision/core => scripts/build}/edge.sh (100%) rename images/macos/{provision/configuration => scripts/build}/finalize-vm.sh (100%) rename images/macos/{provision/core => scripts/build}/firefox.sh (100%) rename images/macos/{provision/core => scripts/build}/fix-xcode-simulators.ps1 (100%) rename images/macos/{provision/core => scripts/build}/gcc.sh (100%) rename images/macos/{provision/core => scripts/build}/git.sh (100%) rename images/macos/{provision/core => scripts/build}/golang.sh (100%) rename images/macos/{provision/core => scripts/build}/haskell.sh (100%) rename images/macos/{provision/core => scripts/build}/homebrew.sh (100%) mode change 100755 => 100644 rename images/macos/{provision/core => scripts/build}/llvm.sh (100%) rename images/macos/{provision/configuration => scripts/build}/max-files.sh (100%) mode change 100755 => 100644 rename images/macos/{provision/core => scripts/build}/miniconda.sh (100%) rename images/macos/{provision/core => scripts/build}/mongodb.sh (100%) rename images/macos/{provision/core => scripts/build}/mono.sh (100%) rename images/macos/{provision/core => scripts/build}/nginx.sh (100%) rename images/macos/{provision/core => scripts/build}/node.sh (100%) rename images/macos/{provision/configuration => scripts/build}/ntpconf.sh (100%) mode change 100755 => 100644 rename images/macos/{provision/core => scripts/build}/nvm.sh (100%) mode change 100755 => 100644 rename images/macos/{provision/core => scripts/build}/open_windows_check.sh (100%) rename images/macos/{provision/core => scripts/build}/openjdk.sh (100%) mode change 100755 => 100644 rename images/macos/{provision/core => scripts/build}/openssl.sh (100%) mode change 100755 => 100644 rename images/macos/{provision/core => scripts/build}/php.sh (100%) rename images/macos/{provision/core => scripts/build}/pipx-packages.sh (100%) rename images/macos/{provision/core => scripts/build}/postgresql.sh (100%) rename images/macos/{provision/core => scripts/build}/powershell.sh (100%) rename images/macos/{provision/configuration => scripts/build}/preimagedata.sh (100%) rename images/macos/{provision/core => scripts/build}/pypy.sh (100%) rename images/macos/{provision/core => scripts/build}/python.sh (100%) mode change 100755 => 100644 rename images/macos/{provision/core => scripts/build}/reboot.sh (100%) rename images/macos/{provision/core => scripts/build}/rosetta.sh (100%) rename images/macos/{provision/core => scripts/build}/ruby.sh (100%) mode change 100755 => 100644 rename images/macos/{provision/core => scripts/build}/rubygem.sh (100%) mode change 100755 => 100644 rename images/macos/{provision/core => scripts/build}/rust.sh (100%) rename images/macos/{provision/core => scripts/build}/safari.sh (100%) rename images/macos/{provision/configuration => scripts/build}/screensaver-off.sh (100%) mode change 100755 => 100644 rename images/macos/{provision/configuration => scripts/build}/shell-change.sh (100%) rename images/macos/{provision/core => scripts/build}/swiftlint.sh (100%) rename images/macos/{provision/core => scripts/build}/toolset.ps1 (97%) rename images/macos/{provision/core => scripts/build}/vcpkg.sh (100%) rename images/macos/{provision/core => scripts/build}/vsmac.sh (100%) rename images/macos/{provision/core => scripts/build}/xamarin.sh (100%) mode change 100755 => 100644 rename images/macos/{provision/core => scripts/build}/xcode-clt.sh (100%) rename images/macos/{provision/core => scripts/build}/xcode-postbuild.sh (100%) rename images/macos/{provision/core => scripts/build}/xcode-sims.sh (100%) mode change 100755 => 100644 rename images/macos/{provision/core => scripts/build}/xcode.ps1 (100%) rename images/macos/{software-report => scripts/docs-gen}/SoftwareReport.Android.psm1 (100%) rename images/macos/{software-report => scripts/docs-gen}/SoftwareReport.Browsers.psm1 (100%) rename images/macos/{software-report => scripts/docs-gen}/SoftwareReport.Common.psm1 (100%) rename images/macos/{software-report => scripts/docs-gen}/SoftwareReport.Generator.ps1 (97%) rename images/macos/{software-report => scripts/docs-gen}/SoftwareReport.Java.psm1 (100%) rename images/macos/{software-report => scripts/docs-gen}/SoftwareReport.Toolcache.psm1 (100%) rename images/macos/{software-report => scripts/docs-gen}/SoftwareReport.WebServers.psm1 (100%) rename images/macos/{software-report => scripts/docs-gen}/SoftwareReport.Xamarin.psm1 (100%) rename images/macos/{software-report => scripts/docs-gen}/SoftwareReport.Xcode.psm1 (100%) rename images/macos/{ => scripts}/helpers/Common.Helpers.psm1 (100%) rename images/macos/{ => scripts}/helpers/SoftwareReport.Helpers.psm1 (100%) rename images/macos/{ => scripts}/helpers/Tests.Helpers.psm1 (100%) rename images/macos/{ => scripts}/helpers/Xcode.Helpers.psm1 (100%) rename images/macos/{ => scripts}/helpers/Xcode.Installer.psm1 (100%) rename images/macos/{provision/utils => scripts/helpers}/confirm-identified-developers.scpt (100%) rename images/macos/{provision/utils => scripts/helpers}/invoke-tests.sh (100%) rename images/macos/{provision/utils => scripts/helpers}/utils.sh (100%) mode change 100755 => 100644 rename images/macos/{provision/utils => scripts/helpers}/xamarin-utils.sh (100%) rename images/macos/{ => scripts}/tests/ActionArchiveCache.Tests.ps1 (100%) rename images/macos/{ => scripts}/tests/Android.Tests.ps1 (97%) rename images/macos/{ => scripts}/tests/BasicTools.Tests.ps1 (100%) rename images/macos/{ => scripts}/tests/Browsers.Tests.ps1 (100%) rename images/macos/{ => scripts}/tests/Common.Tests.ps1 (100%) rename images/macos/{ => scripts}/tests/Databases.Tests.ps1 (100%) rename images/macos/{ => scripts}/tests/Git.Tests.ps1 (100%) rename images/macos/{ => scripts}/tests/Haskell.Tests.ps1 (100%) rename images/macos/{ => scripts}/tests/Java.Tests.ps1 (100%) rename images/macos/{ => scripts}/tests/LLVM.Tests.ps1 (100%) rename images/macos/{ => scripts}/tests/Linters.Tests.ps1 (96%) rename images/macos/{ => scripts}/tests/Node.Tests.ps1 (96%) rename images/macos/{ => scripts}/tests/OpenSSL.Tests.ps1 (100%) rename images/macos/{ => scripts}/tests/PHP.Tests.ps1 (100%) rename images/macos/{ => scripts}/tests/PipxPackages.Tests.ps1 (100%) rename images/macos/{ => scripts}/tests/Powershell.Tests.ps1 (97%) rename images/macos/{ => scripts}/tests/Python.Tests.ps1 (97%) rename images/macos/{ => scripts}/tests/Ruby.arm64.Tests.ps1 (100%) rename images/macos/{ => scripts}/tests/Ruby.x64.Tests.ps1 (100%) rename images/macos/{ => scripts}/tests/RubyGem.Tests.ps1 (100%) rename images/macos/{ => scripts}/tests/RunAll-Tests.ps1 (100%) rename images/macos/{ => scripts}/tests/Rust.Tests.ps1 (100%) rename images/macos/{ => scripts}/tests/System.Tests.ps1 (100%) rename images/macos/{ => scripts}/tests/Toolcache.Tests.ps1 (100%) rename images/macos/{toolsets => scripts/tests}/Toolset.Tests.ps1 (97%) rename images/macos/{ => scripts}/tests/WebServers.Tests.ps1 (100%) rename images/macos/{ => scripts}/tests/Xamarin.Tests.ps1 (97%) rename images/macos/{ => scripts}/tests/Xcode.Tests.ps1 (97%) diff --git a/images.CI/macos/anka/Service.Helpers.psm1 b/images.CI/macos/anka/Service.Helpers.psm1 index 74a1e1e6ba4a..e7af5cb8fecb 100644 --- a/images.CI/macos/anka/Service.Helpers.psm1 +++ b/images.CI/macos/anka/Service.Helpers.psm1 @@ -13,7 +13,7 @@ function Enable-AutoLogon { [string] $Password ) - $url = "https://raw.githubusercontent.com/actions/runner-images/main/images/macos/provision/bootstrap-provisioner/setAutoLogin.sh" + $url = "https://raw.githubusercontent.com/actions/runner-images/main/images/macos/assets/bootstrap-provisioner/setAutoLogin.sh" $script = Invoke-RestMethod -Uri $url $base64 = [Convert]::ToBase64String($script.ToCharArray()) $command = "echo $base64 | base64 --decode > ./setAutoLogin.sh;sudo bash ./setAutoLogin.sh '${UserName}' '${Password}';rm ./setAutoLogin.sh" @@ -43,7 +43,7 @@ function Invoke-SoftwareUpdateArm64 { '14.\d' { $nextOSVersion = 'NotYetDefined' } } - $url = "https://raw.githubusercontent.com/actions/runner-images/main/images/macos/provision/configuration/auto-software-update-arm64.exp" + $url = "https://raw.githubusercontent.com/actions/runner-images/main/images/macos/assets/auto-software-update-arm64.exp" $script = Invoke-RestMethod -Uri $url foreach ($update in $listOfUpdates) { if ($update -notmatch "$nextOSVersion") { diff --git a/images.CI/shebang-linter.ps1 b/images.CI/shebang-linter.ps1 index 53c7d9817c67..08f8c19d86a1 100644 --- a/images.CI/shebang-linter.ps1 +++ b/images.CI/shebang-linter.ps1 @@ -23,7 +23,7 @@ function Validate-Scripts { } $PathUbuntu = "./images/ubuntu/scripts" -$PathMacOS = "./images/macos/provision" +$PathMacOS = "./images/macos" $PatternUbuntu = "#!/bin/bash -e" $PatternMacOS = "#!/bin/bash -e -o pipefail" $ScriptsWithBrokenShebang = @() diff --git a/images/macos/provision/configuration/add-certificate.swift b/images/macos/assets/add-certificate.swift similarity index 100% rename from images/macos/provision/configuration/add-certificate.swift rename to images/macos/assets/add-certificate.swift diff --git a/images/macos/provision/configuration/auto-software-update-arm64.exp b/images/macos/assets/auto-software-update-arm64.exp similarity index 100% rename from images/macos/provision/configuration/auto-software-update-arm64.exp rename to images/macos/assets/auto-software-update-arm64.exp diff --git a/images/macos/provision/configuration/environment/bashprofile b/images/macos/assets/bashprofile similarity index 100% rename from images/macos/provision/configuration/environment/bashprofile rename to images/macos/assets/bashprofile diff --git a/images/macos/provision/configuration/environment/bashrc b/images/macos/assets/bashrc similarity index 100% rename from images/macos/provision/configuration/environment/bashrc rename to images/macos/assets/bashrc diff --git a/images/macos/provision/bootstrap-provisioner/change_password b/images/macos/assets/bootstrap-provisioner/change_password old mode 100755 new mode 100644 similarity index 100% rename from images/macos/provision/bootstrap-provisioner/change_password rename to images/macos/assets/bootstrap-provisioner/change_password diff --git a/images/macos/provision/bootstrap-provisioner/installNewProvisioner.sh b/images/macos/assets/bootstrap-provisioner/installNewProvisioner.sh similarity index 100% rename from images/macos/provision/bootstrap-provisioner/installNewProvisioner.sh rename to images/macos/assets/bootstrap-provisioner/installNewProvisioner.sh diff --git a/images/macos/provision/bootstrap-provisioner/kcpassword.py b/images/macos/assets/bootstrap-provisioner/kcpassword.py old mode 100755 new mode 100644 similarity index 100% rename from images/macos/provision/bootstrap-provisioner/kcpassword.py rename to images/macos/assets/bootstrap-provisioner/kcpassword.py diff --git a/images/macos/provision/bootstrap-provisioner/setAutoLogin.sh b/images/macos/assets/bootstrap-provisioner/setAutoLogin.sh similarity index 100% rename from images/macos/provision/bootstrap-provisioner/setAutoLogin.sh rename to images/macos/assets/bootstrap-provisioner/setAutoLogin.sh diff --git a/images/macos/provision/assets/select-xamarin-sdk-v2.sh b/images/macos/assets/xamarin-selector/select-xamarin-sdk-v2.sh similarity index 100% rename from images/macos/provision/assets/select-xamarin-sdk-v2.sh rename to images/macos/assets/xamarin-selector/select-xamarin-sdk-v2.sh diff --git a/images/macos/provision/assets/select-xamarin-sdk.sh b/images/macos/assets/xamarin-selector/select-xamarin-sdk.sh similarity index 100% rename from images/macos/provision/assets/select-xamarin-sdk.sh rename to images/macos/assets/xamarin-selector/select-xamarin-sdk.sh diff --git a/images/macos/provision/core/action-archive-cache.sh b/images/macos/scripts/build/action-archive-cache.sh old mode 100755 new mode 100644 similarity index 100% rename from images/macos/provision/core/action-archive-cache.sh rename to images/macos/scripts/build/action-archive-cache.sh diff --git a/images/macos/provision/configuration/add-network-interface-detection.sh b/images/macos/scripts/build/add-network-interface-detection.sh old mode 100755 new mode 100644 similarity index 100% rename from images/macos/provision/configuration/add-network-interface-detection.sh rename to images/macos/scripts/build/add-network-interface-detection.sh diff --git a/images/macos/provision/core/android-toolsets.sh b/images/macos/scripts/build/android-toolsets.sh old mode 100755 new mode 100644 similarity index 100% rename from images/macos/provision/core/android-toolsets.sh rename to images/macos/scripts/build/android-toolsets.sh diff --git a/images/macos/provision/core/apache.sh b/images/macos/scripts/build/apache.sh similarity index 100% rename from images/macos/provision/core/apache.sh rename to images/macos/scripts/build/apache.sh diff --git a/images/macos/provision/core/audiodevice.sh b/images/macos/scripts/build/audiodevice.sh similarity index 100% rename from images/macos/provision/core/audiodevice.sh rename to images/macos/scripts/build/audiodevice.sh diff --git a/images/macos/provision/configuration/autologin.sh b/images/macos/scripts/build/autologin.sh old mode 100755 new mode 100644 similarity index 100% rename from images/macos/provision/configuration/autologin.sh rename to images/macos/scripts/build/autologin.sh diff --git a/images/macos/provision/core/aws.sh b/images/macos/scripts/build/aws.sh similarity index 100% rename from images/macos/provision/core/aws.sh rename to images/macos/scripts/build/aws.sh diff --git a/images/macos/provision/core/azcopy.sh b/images/macos/scripts/build/azcopy.sh old mode 100755 new mode 100644 similarity index 100% rename from images/macos/provision/core/azcopy.sh rename to images/macos/scripts/build/azcopy.sh diff --git a/images/macos/provision/core/bicep.sh b/images/macos/scripts/build/bicep.sh similarity index 100% rename from images/macos/provision/core/bicep.sh rename to images/macos/scripts/build/bicep.sh diff --git a/images/macos/provision/core/build-xcode-symlinks.sh b/images/macos/scripts/build/build-xcode-symlinks.sh similarity index 100% rename from images/macos/provision/core/build-xcode-symlinks.sh rename to images/macos/scripts/build/build-xcode-symlinks.sh diff --git a/images/macos/provision/core/chrome.sh b/images/macos/scripts/build/chrome.sh similarity index 100% rename from images/macos/provision/core/chrome.sh rename to images/macos/scripts/build/chrome.sh diff --git a/images/macos/provision/configuration/cleanup-brew.sh b/images/macos/scripts/build/cleanup-brew.sh similarity index 100% rename from images/macos/provision/configuration/cleanup-brew.sh rename to images/macos/scripts/build/cleanup-brew.sh diff --git a/images/macos/provision/core/cocoapods.sh b/images/macos/scripts/build/cocoapods.sh old mode 100755 new mode 100644 similarity index 100% rename from images/macos/provision/core/cocoapods.sh rename to images/macos/scripts/build/cocoapods.sh diff --git a/images/macos/provision/core/codeql-bundle.sh b/images/macos/scripts/build/codeql-bundle.sh similarity index 100% rename from images/macos/provision/core/codeql-bundle.sh rename to images/macos/scripts/build/codeql-bundle.sh diff --git a/images/macos/provision/core/commonutils.sh b/images/macos/scripts/build/commonutils.sh similarity index 100% rename from images/macos/provision/core/commonutils.sh rename to images/macos/scripts/build/commonutils.sh diff --git a/images/macos/provision/configuration/configure-hostname.sh b/images/macos/scripts/build/configure-hostname.sh similarity index 100% rename from images/macos/provision/configuration/configure-hostname.sh rename to images/macos/scripts/build/configure-hostname.sh diff --git a/images/macos/provision/configuration/configure-machine.sh b/images/macos/scripts/build/configure-machine.sh similarity index 100% rename from images/macos/provision/configuration/configure-machine.sh rename to images/macos/scripts/build/configure-machine.sh diff --git a/images/macos/provision/configuration/configure-ssh.sh b/images/macos/scripts/build/configure-ssh.sh old mode 100755 new mode 100644 similarity index 100% rename from images/macos/provision/configuration/configure-ssh.sh rename to images/macos/scripts/build/configure-ssh.sh diff --git a/images/macos/provision/configuration/configure-tccdb-macos.sh b/images/macos/scripts/build/configure-tccdb-macos.sh similarity index 100% rename from images/macos/provision/configuration/configure-tccdb-macos.sh rename to images/macos/scripts/build/configure-tccdb-macos.sh diff --git a/images/macos/provision/core/configure-toolset.ps1 b/images/macos/scripts/build/configure-toolset.ps1 similarity index 100% rename from images/macos/provision/core/configure-toolset.ps1 rename to images/macos/scripts/build/configure-toolset.ps1 diff --git a/images/macos/provision/core/delete-duplicate-sims.rb b/images/macos/scripts/build/delete-duplicate-sims.rb similarity index 100% rename from images/macos/provision/core/delete-duplicate-sims.rb rename to images/macos/scripts/build/delete-duplicate-sims.rb diff --git a/images/macos/provision/configuration/disable-auto-updates.sh b/images/macos/scripts/build/disable-auto-updates.sh old mode 100755 new mode 100644 similarity index 100% rename from images/macos/provision/configuration/disable-auto-updates.sh rename to images/macos/scripts/build/disable-auto-updates.sh diff --git a/images/macos/provision/core/dotnet.sh b/images/macos/scripts/build/dotnet.sh old mode 100755 new mode 100644 similarity index 100% rename from images/macos/provision/core/dotnet.sh rename to images/macos/scripts/build/dotnet.sh diff --git a/images/macos/provision/core/edge.sh b/images/macos/scripts/build/edge.sh similarity index 100% rename from images/macos/provision/core/edge.sh rename to images/macos/scripts/build/edge.sh diff --git a/images/macos/provision/configuration/finalize-vm.sh b/images/macos/scripts/build/finalize-vm.sh similarity index 100% rename from images/macos/provision/configuration/finalize-vm.sh rename to images/macos/scripts/build/finalize-vm.sh diff --git a/images/macos/provision/core/firefox.sh b/images/macos/scripts/build/firefox.sh similarity index 100% rename from images/macos/provision/core/firefox.sh rename to images/macos/scripts/build/firefox.sh diff --git a/images/macos/provision/core/fix-xcode-simulators.ps1 b/images/macos/scripts/build/fix-xcode-simulators.ps1 similarity index 100% rename from images/macos/provision/core/fix-xcode-simulators.ps1 rename to images/macos/scripts/build/fix-xcode-simulators.ps1 diff --git a/images/macos/provision/core/gcc.sh b/images/macos/scripts/build/gcc.sh similarity index 100% rename from images/macos/provision/core/gcc.sh rename to images/macos/scripts/build/gcc.sh diff --git a/images/macos/provision/core/git.sh b/images/macos/scripts/build/git.sh similarity index 100% rename from images/macos/provision/core/git.sh rename to images/macos/scripts/build/git.sh diff --git a/images/macos/provision/core/golang.sh b/images/macos/scripts/build/golang.sh similarity index 100% rename from images/macos/provision/core/golang.sh rename to images/macos/scripts/build/golang.sh diff --git a/images/macos/provision/core/haskell.sh b/images/macos/scripts/build/haskell.sh similarity index 100% rename from images/macos/provision/core/haskell.sh rename to images/macos/scripts/build/haskell.sh diff --git a/images/macos/provision/core/homebrew.sh b/images/macos/scripts/build/homebrew.sh old mode 100755 new mode 100644 similarity index 100% rename from images/macos/provision/core/homebrew.sh rename to images/macos/scripts/build/homebrew.sh diff --git a/images/macos/provision/core/llvm.sh b/images/macos/scripts/build/llvm.sh similarity index 100% rename from images/macos/provision/core/llvm.sh rename to images/macos/scripts/build/llvm.sh diff --git a/images/macos/provision/configuration/max-files.sh b/images/macos/scripts/build/max-files.sh old mode 100755 new mode 100644 similarity index 100% rename from images/macos/provision/configuration/max-files.sh rename to images/macos/scripts/build/max-files.sh diff --git a/images/macos/provision/core/miniconda.sh b/images/macos/scripts/build/miniconda.sh similarity index 100% rename from images/macos/provision/core/miniconda.sh rename to images/macos/scripts/build/miniconda.sh diff --git a/images/macos/provision/core/mongodb.sh b/images/macos/scripts/build/mongodb.sh similarity index 100% rename from images/macos/provision/core/mongodb.sh rename to images/macos/scripts/build/mongodb.sh diff --git a/images/macos/provision/core/mono.sh b/images/macos/scripts/build/mono.sh similarity index 100% rename from images/macos/provision/core/mono.sh rename to images/macos/scripts/build/mono.sh diff --git a/images/macos/provision/core/nginx.sh b/images/macos/scripts/build/nginx.sh similarity index 100% rename from images/macos/provision/core/nginx.sh rename to images/macos/scripts/build/nginx.sh diff --git a/images/macos/provision/core/node.sh b/images/macos/scripts/build/node.sh similarity index 100% rename from images/macos/provision/core/node.sh rename to images/macos/scripts/build/node.sh diff --git a/images/macos/provision/configuration/ntpconf.sh b/images/macos/scripts/build/ntpconf.sh old mode 100755 new mode 100644 similarity index 100% rename from images/macos/provision/configuration/ntpconf.sh rename to images/macos/scripts/build/ntpconf.sh diff --git a/images/macos/provision/core/nvm.sh b/images/macos/scripts/build/nvm.sh old mode 100755 new mode 100644 similarity index 100% rename from images/macos/provision/core/nvm.sh rename to images/macos/scripts/build/nvm.sh diff --git a/images/macos/provision/core/open_windows_check.sh b/images/macos/scripts/build/open_windows_check.sh similarity index 100% rename from images/macos/provision/core/open_windows_check.sh rename to images/macos/scripts/build/open_windows_check.sh diff --git a/images/macos/provision/core/openjdk.sh b/images/macos/scripts/build/openjdk.sh old mode 100755 new mode 100644 similarity index 100% rename from images/macos/provision/core/openjdk.sh rename to images/macos/scripts/build/openjdk.sh diff --git a/images/macos/provision/core/openssl.sh b/images/macos/scripts/build/openssl.sh old mode 100755 new mode 100644 similarity index 100% rename from images/macos/provision/core/openssl.sh rename to images/macos/scripts/build/openssl.sh diff --git a/images/macos/provision/core/php.sh b/images/macos/scripts/build/php.sh similarity index 100% rename from images/macos/provision/core/php.sh rename to images/macos/scripts/build/php.sh diff --git a/images/macos/provision/core/pipx-packages.sh b/images/macos/scripts/build/pipx-packages.sh similarity index 100% rename from images/macos/provision/core/pipx-packages.sh rename to images/macos/scripts/build/pipx-packages.sh diff --git a/images/macos/provision/core/postgresql.sh b/images/macos/scripts/build/postgresql.sh similarity index 100% rename from images/macos/provision/core/postgresql.sh rename to images/macos/scripts/build/postgresql.sh diff --git a/images/macos/provision/core/powershell.sh b/images/macos/scripts/build/powershell.sh similarity index 100% rename from images/macos/provision/core/powershell.sh rename to images/macos/scripts/build/powershell.sh diff --git a/images/macos/provision/configuration/preimagedata.sh b/images/macos/scripts/build/preimagedata.sh similarity index 100% rename from images/macos/provision/configuration/preimagedata.sh rename to images/macos/scripts/build/preimagedata.sh diff --git a/images/macos/provision/core/pypy.sh b/images/macos/scripts/build/pypy.sh similarity index 100% rename from images/macos/provision/core/pypy.sh rename to images/macos/scripts/build/pypy.sh diff --git a/images/macos/provision/core/python.sh b/images/macos/scripts/build/python.sh old mode 100755 new mode 100644 similarity index 100% rename from images/macos/provision/core/python.sh rename to images/macos/scripts/build/python.sh diff --git a/images/macos/provision/core/reboot.sh b/images/macos/scripts/build/reboot.sh similarity index 100% rename from images/macos/provision/core/reboot.sh rename to images/macos/scripts/build/reboot.sh diff --git a/images/macos/provision/core/rosetta.sh b/images/macos/scripts/build/rosetta.sh similarity index 100% rename from images/macos/provision/core/rosetta.sh rename to images/macos/scripts/build/rosetta.sh diff --git a/images/macos/provision/core/ruby.sh b/images/macos/scripts/build/ruby.sh old mode 100755 new mode 100644 similarity index 100% rename from images/macos/provision/core/ruby.sh rename to images/macos/scripts/build/ruby.sh diff --git a/images/macos/provision/core/rubygem.sh b/images/macos/scripts/build/rubygem.sh old mode 100755 new mode 100644 similarity index 100% rename from images/macos/provision/core/rubygem.sh rename to images/macos/scripts/build/rubygem.sh diff --git a/images/macos/provision/core/rust.sh b/images/macos/scripts/build/rust.sh similarity index 100% rename from images/macos/provision/core/rust.sh rename to images/macos/scripts/build/rust.sh diff --git a/images/macos/provision/core/safari.sh b/images/macos/scripts/build/safari.sh similarity index 100% rename from images/macos/provision/core/safari.sh rename to images/macos/scripts/build/safari.sh diff --git a/images/macos/provision/configuration/screensaver-off.sh b/images/macos/scripts/build/screensaver-off.sh old mode 100755 new mode 100644 similarity index 100% rename from images/macos/provision/configuration/screensaver-off.sh rename to images/macos/scripts/build/screensaver-off.sh diff --git a/images/macos/provision/configuration/shell-change.sh b/images/macos/scripts/build/shell-change.sh similarity index 100% rename from images/macos/provision/configuration/shell-change.sh rename to images/macos/scripts/build/shell-change.sh diff --git a/images/macos/provision/core/swiftlint.sh b/images/macos/scripts/build/swiftlint.sh similarity index 100% rename from images/macos/provision/core/swiftlint.sh rename to images/macos/scripts/build/swiftlint.sh diff --git a/images/macos/provision/core/toolset.ps1 b/images/macos/scripts/build/toolset.ps1 similarity index 97% rename from images/macos/provision/core/toolset.ps1 rename to images/macos/scripts/build/toolset.ps1 index 8d6869327c72..5648623bb832 100644 --- a/images/macos/provision/core/toolset.ps1 +++ b/images/macos/scripts/build/toolset.ps1 @@ -1,58 +1,58 @@ -################################################################################ -## File: toolset.ps1 -## Team: CI-Build -## Desc: Install toolset -################################################################################ -Import-Module "~/image-generation/helpers/Tests.Helpers.psm1" -Import-Module "~/image-generation/helpers/Common.Helpers.psm1" - -Function Install-Asset { - param( - [Parameter(Mandatory=$true)] - [object] $ReleaseAsset - ) - - $assetFolderPath = Join-Path "/tmp" "$($ReleaseAsset.filename)-temp-dir" - New-Item -ItemType Directory -Path $assetFolderPath | Out-Null - $assetArchivePath = Join-Path $assetFolderPath $ReleaseAsset.filename - - Write-Host "Download $($ReleaseAsset.filename) archive to the $assetFolderPath folder..." - Start-DownloadWithRetry -Url $ReleaseAsset.download_url -DownloadPath $assetFolderPath - - Write-Host "Extract $($ReleaseAsset.filename) content..." - tar -xzf $assetArchivePath -C $assetFolderPath - - Write-Host "Invoke installation script..." - Push-Location -Path $assetFolderPath - Invoke-Expression "bash ./setup.sh" - Pop-Location -} - -$arch = Get-Architecture - -# Get toolcache content from toolset -$toolsToInstall = @("Python", "Node", "Go") -$tools = Get-ToolsetValue "toolcache" | Where-Object {$toolsToInstall -contains $_.Name} - -foreach ($tool in $tools) { - # Get versions manifest for current tool - $assets = Invoke-RestMethodWithRetry -Url $tool.url - - # Get github release asset for each version - foreach ($version in $tool.arch.$arch.versions) { - $asset = $assets | Where-Object version -like $version ` - | Select-Object -ExpandProperty files ` - | Where-Object { ($_.platform -eq $tool.platform) -and ($_.arch -eq $arch)} ` - | Select-Object -First 1 - - Write-Host "Installing $($tool.name) $version..." - if ($null -ne $asset) { - Install-Asset -ReleaseAsset $asset - } else { - Write-Host "Asset was not found in versions manifest" - exit 1 - } - } -} - +################################################################################ +## File: toolset.ps1 +## Team: CI-Build +## Desc: Install toolset +################################################################################ +Import-Module "~/image-generation/helpers/Tests.Helpers.psm1" +Import-Module "~/image-generation/helpers/Common.Helpers.psm1" + +Function Install-Asset { + param( + [Parameter(Mandatory=$true)] + [object] $ReleaseAsset + ) + + $assetFolderPath = Join-Path "/tmp" "$($ReleaseAsset.filename)-temp-dir" + New-Item -ItemType Directory -Path $assetFolderPath | Out-Null + $assetArchivePath = Join-Path $assetFolderPath $ReleaseAsset.filename + + Write-Host "Download $($ReleaseAsset.filename) archive to the $assetFolderPath folder..." + Start-DownloadWithRetry -Url $ReleaseAsset.download_url -DownloadPath $assetFolderPath + + Write-Host "Extract $($ReleaseAsset.filename) content..." + tar -xzf $assetArchivePath -C $assetFolderPath + + Write-Host "Invoke installation script..." + Push-Location -Path $assetFolderPath + Invoke-Expression "bash ./setup.sh" + Pop-Location +} + +$arch = Get-Architecture + +# Get toolcache content from toolset +$toolsToInstall = @("Python", "Node", "Go") +$tools = Get-ToolsetValue "toolcache" | Where-Object {$toolsToInstall -contains $_.Name} + +foreach ($tool in $tools) { + # Get versions manifest for current tool + $assets = Invoke-RestMethodWithRetry -Url $tool.url + + # Get github release asset for each version + foreach ($version in $tool.arch.$arch.versions) { + $asset = $assets | Where-Object version -like $version ` + | Select-Object -ExpandProperty files ` + | Where-Object { ($_.platform -eq $tool.platform) -and ($_.arch -eq $arch)} ` + | Select-Object -First 1 + + Write-Host "Installing $($tool.name) $version..." + if ($null -ne $asset) { + Install-Asset -ReleaseAsset $asset + } else { + Write-Host "Asset was not found in versions manifest" + exit 1 + } + } +} + Invoke-PesterTests "Toolcache" \ No newline at end of file diff --git a/images/macos/provision/core/vcpkg.sh b/images/macos/scripts/build/vcpkg.sh similarity index 100% rename from images/macos/provision/core/vcpkg.sh rename to images/macos/scripts/build/vcpkg.sh diff --git a/images/macos/provision/core/vsmac.sh b/images/macos/scripts/build/vsmac.sh similarity index 100% rename from images/macos/provision/core/vsmac.sh rename to images/macos/scripts/build/vsmac.sh diff --git a/images/macos/provision/core/xamarin.sh b/images/macos/scripts/build/xamarin.sh old mode 100755 new mode 100644 similarity index 100% rename from images/macos/provision/core/xamarin.sh rename to images/macos/scripts/build/xamarin.sh diff --git a/images/macos/provision/core/xcode-clt.sh b/images/macos/scripts/build/xcode-clt.sh similarity index 100% rename from images/macos/provision/core/xcode-clt.sh rename to images/macos/scripts/build/xcode-clt.sh diff --git a/images/macos/provision/core/xcode-postbuild.sh b/images/macos/scripts/build/xcode-postbuild.sh similarity index 100% rename from images/macos/provision/core/xcode-postbuild.sh rename to images/macos/scripts/build/xcode-postbuild.sh diff --git a/images/macos/provision/core/xcode-sims.sh b/images/macos/scripts/build/xcode-sims.sh old mode 100755 new mode 100644 similarity index 100% rename from images/macos/provision/core/xcode-sims.sh rename to images/macos/scripts/build/xcode-sims.sh diff --git a/images/macos/provision/core/xcode.ps1 b/images/macos/scripts/build/xcode.ps1 similarity index 100% rename from images/macos/provision/core/xcode.ps1 rename to images/macos/scripts/build/xcode.ps1 diff --git a/images/macos/software-report/SoftwareReport.Android.psm1 b/images/macos/scripts/docs-gen/SoftwareReport.Android.psm1 similarity index 100% rename from images/macos/software-report/SoftwareReport.Android.psm1 rename to images/macos/scripts/docs-gen/SoftwareReport.Android.psm1 diff --git a/images/macos/software-report/SoftwareReport.Browsers.psm1 b/images/macos/scripts/docs-gen/SoftwareReport.Browsers.psm1 similarity index 100% rename from images/macos/software-report/SoftwareReport.Browsers.psm1 rename to images/macos/scripts/docs-gen/SoftwareReport.Browsers.psm1 diff --git a/images/macos/software-report/SoftwareReport.Common.psm1 b/images/macos/scripts/docs-gen/SoftwareReport.Common.psm1 similarity index 100% rename from images/macos/software-report/SoftwareReport.Common.psm1 rename to images/macos/scripts/docs-gen/SoftwareReport.Common.psm1 diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/scripts/docs-gen/SoftwareReport.Generator.ps1 similarity index 97% rename from images/macos/software-report/SoftwareReport.Generator.ps1 rename to images/macos/scripts/docs-gen/SoftwareReport.Generator.ps1 index 50b5f72c5444..321d7d1c8dd8 100644 --- a/images/macos/software-report/SoftwareReport.Generator.ps1 +++ b/images/macos/scripts/docs-gen/SoftwareReport.Generator.ps1 @@ -1,319 +1,319 @@ -using module ./software-report-base/SoftwareReport.psm1 -using module ./software-report-base/SoftwareReport.Nodes.psm1 - -param ( - [Parameter(Mandatory)][string] - $OutputDirectory, - $ImageName -) - -$ErrorActionPreference = "Stop" - -Import-Module "$PSScriptRoot/SoftwareReport.Common.psm1" -DisableNameChecking -Import-Module "$PSScriptRoot/SoftwareReport.Xcode.psm1" -DisableNameChecking -Import-Module "$PSScriptRoot/SoftwareReport.Android.psm1" -DisableNameChecking -Import-Module "$PSScriptRoot/SoftwareReport.Java.psm1" -DisableNameChecking -Import-Module "$PSScriptRoot/SoftwareReport.Xamarin.psm1" -DisableNameChecking -Import-Module "$PSScriptRoot/SoftwareReport.Toolcache.psm1" -DisableNameChecking -Import-Module "$PSScriptRoot/SoftwareReport.Browsers.psm1" -DisableNameChecking -Import-Module "$PSScriptRoot/SoftwareReport.WebServers.psm1" -DisableNameChecking -Import-Module "$PSScriptRoot/../helpers/SoftwareReport.Helpers.psm1" -Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" -Import-Module "$PSScriptRoot/../helpers/Xcode.Helpers.psm1" - -# Operating System info -$os = Get-OSVersion - -# OS info -$osInfo = Build-OSInfoSection $ImageName - -# Software report -$softwareReport = [SoftwareReport]::new($osInfo) -$installedSoftware = $softwareReport.Root.AddHeader("Installed Software") - -# Language and Runtime -$languageAndRuntime = $installedSoftware.AddHeader("Language and Runtime") -$languageAndRuntime.AddToolVersionsListInline(".NET Core SDK", $(Get-DotnetVersionList), '^\d+\.\d+\.\d') -$languageAndRuntime.AddToolVersion("Bash", $(Get-BashVersion)) -$languageAndRuntime.AddNodes($(Get-ClangLLVMVersions)) -$languageAndRuntime.AddNodes($(Get-GccVersions)) -$languageAndRuntime.AddNodes($(Get-FortranVersions)) -$languageAndRuntime.AddToolVersion("Julia", $(Get-JuliaVersion)) -$languageAndRuntime.AddToolVersion("Kotlin", $(Get-KotlinVersion)) -if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) { - $languageAndRuntime.AddToolVersion("Go", $(Get-GoVersion)) -} -$languageAndRuntime.AddToolVersion("Mono", $(Get-MonoVersion)) -$languageAndRuntime.AddToolVersion("Node.js", $(Get-NodeVersion)) -if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) { - $languageAndRuntime.AddToolVersion("MSBuild", $(Get-MSBuildVersion)) - $languageAndRuntime.AddToolVersion("NVM", $(Get-NVMVersion)) - $languageAndRuntime.AddToolVersionsListInline("NVM - Cached node versions", $(Get-NVMNodeVersionList), '^\d+') -} -$languageAndRuntime.AddToolVersion("Perl", $(Get-PerlVersion)) -if ((-not $os.IsVenturaArm64) -and (-not $os.IsSonomaArm64)) { - $languageAndRuntime.AddToolVersion("PHP", $(Get-PHPVersion)) -} - -if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) { - $languageAndRuntime.AddToolVersion("Python", $(Get-PythonVersion)) -} - -if ((-not $os.IsVenturaArm64) -and (-not $os.IsSonomaArm64)) { - $languageAndRuntime.AddToolVersion("Python3", $(Get-Python3Version)) -} -$languageAndRuntime.AddToolVersion("R", $(Get-RVersion)) -$languageAndRuntime.AddToolVersion("Ruby", $(Get-RubyVersion)) - -# Package Management -$packageManagement = $installedSoftware.AddHeader("Package Management") -$packageManagement.AddToolVersion("Bundler", $(Get-BundlerVersion)) -$packageManagement.AddToolVersion("Carthage", $(Get-CarthageVersion)) -$packageManagement.AddToolVersion("CocoaPods", $(Get-CocoaPodsVersion)) -if ((-not $os.IsVenturaArm64) -and (-not $os.IsSonomaArm64)) { - $packageManagement.AddToolVersion("Composer", $(Get-ComposerVersion)) -} -$packageManagement.AddToolVersion("Homebrew", $(Get-HomebrewVersion)) -if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) { - $packageManagement.AddToolVersion("Miniconda", $(Get-CondaVersion)) -} -$packageManagement.AddToolVersion("NPM", $(Get-NPMVersion)) -$packageManagement.AddToolVersion("NuGet", $(Get-NuGetVersion)) -if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) { - $packageManagement.AddToolVersion("Pip", $(Get-PipVersion -Version 2)) -} - -if ((-not $os.IsVenturaArm64) -and (-not $os.IsSonomaArm64)) { - $packageManagement.AddToolVersion("Pip3", $(Get-PipVersion -Version 3)) - $packageManagement.AddToolVersion("Pipx", $(Get-PipxVersion)) -} - -$packageManagement.AddToolVersion("RubyGems", $(Get-RubyGemsVersion)) -if ((-not $os.IsVenturaArm64) -and (-not $os.IsSonomaArm64)) { - $packageManagement.AddToolVersion("Vcpkg", $(Get-VcpkgVersion)) -} -$packageManagement.AddToolVersion("Yarn", $(Get-YarnVersion)) - -if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) { - $packageManagement.AddNode($(Build-PackageManagementEnvironmentTable)) -} -# Project Management -$projectManagement = $installedSoftware.AddHeader("Project Management") -$projectManagement.AddToolVersion("Apache Ant", $(Get-ApacheAntVersion)) -$projectManagement.AddToolVersion("Apache Maven", $(Get-MavenVersion)) -$projectManagement.AddToolVersion("Gradle", $(Get-GradleVersion)) -if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) { - $projectManagement.AddToolVersion("Sbt", $(Get-SbtVersion)) -} - -# Utilities -$utilities = $installedSoftware.AddHeader("Utilities") -$utilities.AddToolVersion("7-Zip", $(Get-7zipVersion)) -$utilities.AddToolVersion("aria2", $(Get-Aria2Version)) -$utilities.AddToolVersion("azcopy", $(Get-AzcopyVersion)) -$utilities.AddToolVersion("bazel", $(Get-BazelVersion)) -$utilities.AddToolVersion("bazelisk", $(Get-BazeliskVersion)) -$utilities.AddToolVersion("bsdtar", $(Get-BsdtarVersion)) -$utilities.AddToolVersion("Curl", $(Get-CurlVersion)) -$utilities.AddToolVersion("Git", $(Get-GitVersion)) -$utilities.AddToolVersion("Git LFS", $(Get-GitLFSVersion)) -$utilities.AddToolVersion("GitHub CLI", $(Get-GitHubCLIVersion)) -$utilities.AddToolVersion("GNU Tar", $(Get-GnuTarVersion)) -$utilities.AddToolVersion("GNU Wget", $(Get-WgetVersion)) -$utilities.AddToolVersion("gpg (GnuPG)", $(Get-GPGVersion)) -if ($os.IsBigSur) { - $utilities.AddToolVersion("helm", $(Get-HelmVersion)) -} -if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) { - $utilities.AddToolVersion("ImageMagick", $(Get-ImageMagickVersion)) -} -$utilities.AddToolVersion("jq", $(Get-JqVersion)) -if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) { - $utilities.AddToolVersion("mongo", $(Get-MongoVersion)) - $utilities.AddToolVersion("mongod", $(Get-MongodVersion)) -} -if ($os.IsBigSur) { - $utilities.AddToolVersion("Newman", $(Get-NewmanVersion)) -} -$utilities.AddToolVersion("OpenSSL", $(Get-OpenSSLVersion)) -$utilities.AddToolVersion("Packer", $(Get-PackerVersion)) -$utilities.AddToolVersion("pkg-config", $(Get-PKGConfigVersion)) -if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) { - $utilities.AddToolVersion("PostgreSQL", $(Get-PostgresServerVersion)) - $utilities.AddToolVersion("psql (PostgreSQL)", $(Get-PostgresClientVersion)) - $utilities.AddToolVersion("Sox", $(Get-SoxVersion)) - $utilities.AddToolVersion("Subversion (SVN)", $(Get-SVNVersion)) - $utilities.AddToolVersion("Switchaudio-osx", $(Get-SwitchAudioOsxVersion)) -} -if ($os.IsMonterey) { - $utilities.AddToolVersion("Vagrant", $(Get-VagrantVersion)) - $utilities.AddToolVersion("VirtualBox", $(Get-VirtualBoxVersion)) -} -$utilities.AddToolVersion("yq", $(Get-YqVersion)) -$utilities.AddToolVersion("zstd", $(Get-ZstdVersion)) - -# Tools -$tools = $installedSoftware.AddHeader("Tools") -if ($os.IsBigSur) { - $tools.AddToolVersion("Aliyun CLI", $(Get-AliyunCLIVersion)) -} -if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) { - $tools.AddToolVersion("App Center CLI", $(Get-AppCenterCLIVersion)) -} -$tools.AddToolVersion("AWS CLI", $(Get-AWSCLIVersion)) -$tools.AddToolVersion("AWS SAM CLI", $(Get-AWSSAMCLIVersion)) -$tools.AddToolVersion("AWS Session Manager CLI", $(Get-AWSSessionManagerCLIVersion)) -$tools.AddToolVersion("Azure CLI", $(Get-AzureCLIVersion)) -$tools.AddToolVersion("Azure CLI (azure-devops)", $(Get-AzureDevopsVersion)) -$tools.AddToolVersion("Bicep CLI", $(Get-BicepVersion)) -if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) { - $tools.AddToolVersion("Cabal", $(Get-CabalVersion)) -} -$tools.AddToolVersion("Cmake", $(Get-CmakeVersion)) -$tools.AddToolVersion("CodeQL Action Bundle", $(Get-CodeQLBundleVersion)) -if ($os.IsMonterey) { - $tools.AddToolVersion("Colima", $(Get-ColimaVersion)) -} -$tools.AddToolVersion("Fastlane", $(Get-FastlaneVersion)) -if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) { - $tools.AddToolVersion("GHC", $(Get-GHCVersion)) - $tools.AddToolVersion("GHCup", $(Get-GHCupVersion)) - $tools.AddToolVersion("Jazzy", $(Get-JazzyVersion)) -} -if ((-not $os.IsVenturaArm64) -and (-not $os.IsSonomaArm64)) { - $tools.AddToolVersion("Stack", $(Get-StackVersion)) -} -$tools.AddToolVersion("SwiftFormat", $(Get-SwiftFormatVersion)) -if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) { - $tools.AddToolVersion("Swig", $(Get-SwigVersion)) -} -$tools.AddToolVersion("Xcode Command Line Tools", $(Get-XcodeCommandLineToolsVersion)) - -# Linters -$linters = $installedSoftware.AddHeader("Linters") -if ((-not $os.IsVenturaArm64) -and (-not $os.IsSonomaArm64)) { - $linters.AddToolVersion("SwiftLint", $(Get-SwiftLintVersion)) -} -if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) { - $linters.AddToolVersion("Yamllint", $(Get-YamllintVersion)) -} - -# Browsers -$browsers = $installedSoftware.AddHeader("Browsers") -$browsers.AddNodes($(Build-BrowserSection)) -$browsers.AddNode($(Build-BrowserWebdriversEnvironmentTable)) - -# Java -$java = $installedSoftware.AddHeader("Java") -$java.AddTable($(Get-JavaVersions)) - -# Toolcache -if (-not $os.IsSonoma) { - $toolcache = $installedSoftware.AddHeader("Cached Tools") - $toolcache.AddNodes($(Build-ToolcacheSection)) - - # Rust - $rust = $installedSoftware.AddHeader("Rust Tools") - $rust.AddToolVersion("Cargo", $(Get-RustCargoVersion)) - $rust.AddToolVersion("Rust", $(Get-RustVersion)) - $rust.AddToolVersion("Rustdoc", $(Get-RustdocVersion)) - $rust.AddToolVersion("Rustup", $(Get-RustupVersion)) - - $rustPackages = $rust.AddHeader("Packages") - if (-not $os.IsVentura) { - $rustPackages.AddToolVersion("Bindgen", $(Get-Bindgen)) - $rustPackages.AddToolVersion("Cargo-audit", $(Get-Cargoaudit)) - $rustPackages.AddToolVersion("Cargo-outdated", $(Get-Cargooutdated)) - $rustPackages.AddToolVersion("Cbindgen", $(Get-Cbindgen)) - } - $rustPackages.AddToolVersion("Clippy", $(Get-RustClippyVersion)) - $rustPackages.AddToolVersion("Rustfmt", $(Get-RustfmtVersion)) -} - -# PowerShell -$powerShell = $installedSoftware.AddHeader("PowerShell Tools") -$powerShell.AddToolVersion("PowerShell", $(Get-PowershellVersion)) - -$powerShellModules = $powerShell.AddHeader("PowerShell Modules") -$powerShellModules.AddNodes($(Get-PowerShellModules)) - -# Web Servers -if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) { - $webServers = $installedSoftware.AddHeader("Web Servers") - $webServers.AddTable($(Build-WebServersSection)) -} - -# Xamarin section -if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) { - $xamarin = $installedSoftware.AddHeader("Xamarin") - $vsForMac = $xamarin.AddHeader("Visual Studio for Mac") - $vsForMac.AddTable($(Build-VSMacTable)) - $note = - @' -To use Visual Studio 2019 by default rename the app: -mv "/Applications/Visual Studio.app" "/Applications/Visual Studio 2022.app" -mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" -'@ - $vsForMacNotes = $vsForMac.AddHeader("Notes") - $vsForMacNotes.AddNote($note) - - $xamarinBundles = $xamarin.AddHeader("Xamarin bundles") - $xamarinBundles.AddTable($(Build-XamarinTable)) - - $unitTestFramework = $xamarin.AddHeader("Unit Test Framework") - $unitTestFramework.AddToolVersion("NUnit", $(Get-NUnitVersion)) -} - -# Xcode section -$xcode = $installedSoftware.AddHeader("Xcode") -# First run doesn't provide full data about devices and runtimes -Get-XcodeInfoList | Out-Null - -$xcodeInfo = Get-XcodeInfoList -$xcode.AddTable($(Build-XcodeTable $xcodeInfo)) - -$xcodeTools = $xcode.AddHeader("Xcode Support Tools") -$xcodeTools.AddNodes($(Build-XcodeSupportToolsSection)) - -$installedSdks = $xcode.AddHeader("Installed SDKs") -$installedSdks.AddTable($(Build-XcodeSDKTable $xcodeInfo)) - -$installedSimulators = $xcode.AddHeader("Installed Simulators") -$installedSimulators.AddTable($(Build-XcodeSimulatorsTable $xcodeInfo)) - -# Android section -$android = $installedSoftware.AddHeader("Android") -$androidTable = Build-AndroidTable -$android.AddTable($androidTable) - -$androidEnv = $android.AddHeader("Environment variables") -$androidEnv.AddTable($(Build-AndroidEnvironmentTable)) - -if ($os.IsBigSur -or $os.IsMonterey) { - $miscellaneous = $installedSoftware.AddHeader("Miscellaneous") - $miscellaneous.AddToolVersion("libXext", $(Get-LibXextVersion)) - $miscellaneous.AddToolVersion("libXft", $(Get-LibXftVersion)) - $miscellaneous.AddToolVersion("Tcl/Tk", $(Get-TclTkVersion)) - $miscellaneous.AddToolVersion("Zlib", $(Get-ZlibVersion)) -} - -if ($os.IsMonterey) { - $miscellaneousEnv = $miscellaneous.AddHeader("Environment variables") - $miscellaneousEnv.AddTable($(Build-MiscellaneousEnvironmentTable)) - - $notes = @' -If you want to use Parallels Desktop you should download a package from URL stored in -PARALLELS_DMG_URL environment variable. A system extension is allowed for this version. -'@ - $miscellaneousEnvNotes = $miscellaneousEnv.AddHeader("Notes") - $miscellaneousEnvNotes.AddNote($notes) -} - -if (-not (Test-Path $OutputDirectory)) { New-Item -Path $OutputDirectory -ItemType Directory | Out-Null } - -# -# Write final reports -# -Write-Host $markdownExtended -$softwareReport.ToJson() | Out-File -FilePath "${OutputDirectory}/systeminfo.json" -Encoding UTF8NoBOM -$softwareReport.ToMarkdown() | Out-File -FilePath "${OutputDirectory}/systeminfo.md" -Encoding UTF8NoBOM +using module ./software-report-base/SoftwareReport.psm1 +using module ./software-report-base/SoftwareReport.Nodes.psm1 + +param ( + [Parameter(Mandatory)][string] + $OutputDirectory, + $ImageName +) + +$ErrorActionPreference = "Stop" + +Import-Module "$PSScriptRoot/SoftwareReport.Common.psm1" -DisableNameChecking +Import-Module "$PSScriptRoot/SoftwareReport.Xcode.psm1" -DisableNameChecking +Import-Module "$PSScriptRoot/SoftwareReport.Android.psm1" -DisableNameChecking +Import-Module "$PSScriptRoot/SoftwareReport.Java.psm1" -DisableNameChecking +Import-Module "$PSScriptRoot/SoftwareReport.Xamarin.psm1" -DisableNameChecking +Import-Module "$PSScriptRoot/SoftwareReport.Toolcache.psm1" -DisableNameChecking +Import-Module "$PSScriptRoot/SoftwareReport.Browsers.psm1" -DisableNameChecking +Import-Module "$PSScriptRoot/SoftwareReport.WebServers.psm1" -DisableNameChecking +Import-Module "$PSScriptRoot/../helpers/SoftwareReport.Helpers.psm1" +Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" +Import-Module "$PSScriptRoot/../helpers/Xcode.Helpers.psm1" + +# Operating System info +$os = Get-OSVersion + +# OS info +$osInfo = Build-OSInfoSection $ImageName + +# Software report +$softwareReport = [SoftwareReport]::new($osInfo) +$installedSoftware = $softwareReport.Root.AddHeader("Installed Software") + +# Language and Runtime +$languageAndRuntime = $installedSoftware.AddHeader("Language and Runtime") +$languageAndRuntime.AddToolVersionsListInline(".NET Core SDK", $(Get-DotnetVersionList), '^\d+\.\d+\.\d') +$languageAndRuntime.AddToolVersion("Bash", $(Get-BashVersion)) +$languageAndRuntime.AddNodes($(Get-ClangLLVMVersions)) +$languageAndRuntime.AddNodes($(Get-GccVersions)) +$languageAndRuntime.AddNodes($(Get-FortranVersions)) +$languageAndRuntime.AddToolVersion("Julia", $(Get-JuliaVersion)) +$languageAndRuntime.AddToolVersion("Kotlin", $(Get-KotlinVersion)) +if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) { + $languageAndRuntime.AddToolVersion("Go", $(Get-GoVersion)) +} +$languageAndRuntime.AddToolVersion("Mono", $(Get-MonoVersion)) +$languageAndRuntime.AddToolVersion("Node.js", $(Get-NodeVersion)) +if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) { + $languageAndRuntime.AddToolVersion("MSBuild", $(Get-MSBuildVersion)) + $languageAndRuntime.AddToolVersion("NVM", $(Get-NVMVersion)) + $languageAndRuntime.AddToolVersionsListInline("NVM - Cached node versions", $(Get-NVMNodeVersionList), '^\d+') +} +$languageAndRuntime.AddToolVersion("Perl", $(Get-PerlVersion)) +if ((-not $os.IsVenturaArm64) -and (-not $os.IsSonomaArm64)) { + $languageAndRuntime.AddToolVersion("PHP", $(Get-PHPVersion)) +} + +if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) { + $languageAndRuntime.AddToolVersion("Python", $(Get-PythonVersion)) +} + +if ((-not $os.IsVenturaArm64) -and (-not $os.IsSonomaArm64)) { + $languageAndRuntime.AddToolVersion("Python3", $(Get-Python3Version)) +} +$languageAndRuntime.AddToolVersion("R", $(Get-RVersion)) +$languageAndRuntime.AddToolVersion("Ruby", $(Get-RubyVersion)) + +# Package Management +$packageManagement = $installedSoftware.AddHeader("Package Management") +$packageManagement.AddToolVersion("Bundler", $(Get-BundlerVersion)) +$packageManagement.AddToolVersion("Carthage", $(Get-CarthageVersion)) +$packageManagement.AddToolVersion("CocoaPods", $(Get-CocoaPodsVersion)) +if ((-not $os.IsVenturaArm64) -and (-not $os.IsSonomaArm64)) { + $packageManagement.AddToolVersion("Composer", $(Get-ComposerVersion)) +} +$packageManagement.AddToolVersion("Homebrew", $(Get-HomebrewVersion)) +if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) { + $packageManagement.AddToolVersion("Miniconda", $(Get-CondaVersion)) +} +$packageManagement.AddToolVersion("NPM", $(Get-NPMVersion)) +$packageManagement.AddToolVersion("NuGet", $(Get-NuGetVersion)) +if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) { + $packageManagement.AddToolVersion("Pip", $(Get-PipVersion -Version 2)) +} + +if ((-not $os.IsVenturaArm64) -and (-not $os.IsSonomaArm64)) { + $packageManagement.AddToolVersion("Pip3", $(Get-PipVersion -Version 3)) + $packageManagement.AddToolVersion("Pipx", $(Get-PipxVersion)) +} + +$packageManagement.AddToolVersion("RubyGems", $(Get-RubyGemsVersion)) +if ((-not $os.IsVenturaArm64) -and (-not $os.IsSonomaArm64)) { + $packageManagement.AddToolVersion("Vcpkg", $(Get-VcpkgVersion)) +} +$packageManagement.AddToolVersion("Yarn", $(Get-YarnVersion)) + +if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) { + $packageManagement.AddNode($(Build-PackageManagementEnvironmentTable)) +} +# Project Management +$projectManagement = $installedSoftware.AddHeader("Project Management") +$projectManagement.AddToolVersion("Apache Ant", $(Get-ApacheAntVersion)) +$projectManagement.AddToolVersion("Apache Maven", $(Get-MavenVersion)) +$projectManagement.AddToolVersion("Gradle", $(Get-GradleVersion)) +if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) { + $projectManagement.AddToolVersion("Sbt", $(Get-SbtVersion)) +} + +# Utilities +$utilities = $installedSoftware.AddHeader("Utilities") +$utilities.AddToolVersion("7-Zip", $(Get-7zipVersion)) +$utilities.AddToolVersion("aria2", $(Get-Aria2Version)) +$utilities.AddToolVersion("azcopy", $(Get-AzcopyVersion)) +$utilities.AddToolVersion("bazel", $(Get-BazelVersion)) +$utilities.AddToolVersion("bazelisk", $(Get-BazeliskVersion)) +$utilities.AddToolVersion("bsdtar", $(Get-BsdtarVersion)) +$utilities.AddToolVersion("Curl", $(Get-CurlVersion)) +$utilities.AddToolVersion("Git", $(Get-GitVersion)) +$utilities.AddToolVersion("Git LFS", $(Get-GitLFSVersion)) +$utilities.AddToolVersion("GitHub CLI", $(Get-GitHubCLIVersion)) +$utilities.AddToolVersion("GNU Tar", $(Get-GnuTarVersion)) +$utilities.AddToolVersion("GNU Wget", $(Get-WgetVersion)) +$utilities.AddToolVersion("gpg (GnuPG)", $(Get-GPGVersion)) +if ($os.IsBigSur) { + $utilities.AddToolVersion("helm", $(Get-HelmVersion)) +} +if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) { + $utilities.AddToolVersion("ImageMagick", $(Get-ImageMagickVersion)) +} +$utilities.AddToolVersion("jq", $(Get-JqVersion)) +if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) { + $utilities.AddToolVersion("mongo", $(Get-MongoVersion)) + $utilities.AddToolVersion("mongod", $(Get-MongodVersion)) +} +if ($os.IsBigSur) { + $utilities.AddToolVersion("Newman", $(Get-NewmanVersion)) +} +$utilities.AddToolVersion("OpenSSL", $(Get-OpenSSLVersion)) +$utilities.AddToolVersion("Packer", $(Get-PackerVersion)) +$utilities.AddToolVersion("pkg-config", $(Get-PKGConfigVersion)) +if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) { + $utilities.AddToolVersion("PostgreSQL", $(Get-PostgresServerVersion)) + $utilities.AddToolVersion("psql (PostgreSQL)", $(Get-PostgresClientVersion)) + $utilities.AddToolVersion("Sox", $(Get-SoxVersion)) + $utilities.AddToolVersion("Subversion (SVN)", $(Get-SVNVersion)) + $utilities.AddToolVersion("Switchaudio-osx", $(Get-SwitchAudioOsxVersion)) +} +if ($os.IsMonterey) { + $utilities.AddToolVersion("Vagrant", $(Get-VagrantVersion)) + $utilities.AddToolVersion("VirtualBox", $(Get-VirtualBoxVersion)) +} +$utilities.AddToolVersion("yq", $(Get-YqVersion)) +$utilities.AddToolVersion("zstd", $(Get-ZstdVersion)) + +# Tools +$tools = $installedSoftware.AddHeader("Tools") +if ($os.IsBigSur) { + $tools.AddToolVersion("Aliyun CLI", $(Get-AliyunCLIVersion)) +} +if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) { + $tools.AddToolVersion("App Center CLI", $(Get-AppCenterCLIVersion)) +} +$tools.AddToolVersion("AWS CLI", $(Get-AWSCLIVersion)) +$tools.AddToolVersion("AWS SAM CLI", $(Get-AWSSAMCLIVersion)) +$tools.AddToolVersion("AWS Session Manager CLI", $(Get-AWSSessionManagerCLIVersion)) +$tools.AddToolVersion("Azure CLI", $(Get-AzureCLIVersion)) +$tools.AddToolVersion("Azure CLI (azure-devops)", $(Get-AzureDevopsVersion)) +$tools.AddToolVersion("Bicep CLI", $(Get-BicepVersion)) +if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) { + $tools.AddToolVersion("Cabal", $(Get-CabalVersion)) +} +$tools.AddToolVersion("Cmake", $(Get-CmakeVersion)) +$tools.AddToolVersion("CodeQL Action Bundle", $(Get-CodeQLBundleVersion)) +if ($os.IsMonterey) { + $tools.AddToolVersion("Colima", $(Get-ColimaVersion)) +} +$tools.AddToolVersion("Fastlane", $(Get-FastlaneVersion)) +if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) { + $tools.AddToolVersion("GHC", $(Get-GHCVersion)) + $tools.AddToolVersion("GHCup", $(Get-GHCupVersion)) + $tools.AddToolVersion("Jazzy", $(Get-JazzyVersion)) +} +if ((-not $os.IsVenturaArm64) -and (-not $os.IsSonomaArm64)) { + $tools.AddToolVersion("Stack", $(Get-StackVersion)) +} +$tools.AddToolVersion("SwiftFormat", $(Get-SwiftFormatVersion)) +if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) { + $tools.AddToolVersion("Swig", $(Get-SwigVersion)) +} +$tools.AddToolVersion("Xcode Command Line Tools", $(Get-XcodeCommandLineToolsVersion)) + +# Linters +$linters = $installedSoftware.AddHeader("Linters") +if ((-not $os.IsVenturaArm64) -and (-not $os.IsSonomaArm64)) { + $linters.AddToolVersion("SwiftLint", $(Get-SwiftLintVersion)) +} +if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) { + $linters.AddToolVersion("Yamllint", $(Get-YamllintVersion)) +} + +# Browsers +$browsers = $installedSoftware.AddHeader("Browsers") +$browsers.AddNodes($(Build-BrowserSection)) +$browsers.AddNode($(Build-BrowserWebdriversEnvironmentTable)) + +# Java +$java = $installedSoftware.AddHeader("Java") +$java.AddTable($(Get-JavaVersions)) + +# Toolcache +if (-not $os.IsSonoma) { + $toolcache = $installedSoftware.AddHeader("Cached Tools") + $toolcache.AddNodes($(Build-ToolcacheSection)) + + # Rust + $rust = $installedSoftware.AddHeader("Rust Tools") + $rust.AddToolVersion("Cargo", $(Get-RustCargoVersion)) + $rust.AddToolVersion("Rust", $(Get-RustVersion)) + $rust.AddToolVersion("Rustdoc", $(Get-RustdocVersion)) + $rust.AddToolVersion("Rustup", $(Get-RustupVersion)) + + $rustPackages = $rust.AddHeader("Packages") + if (-not $os.IsVentura) { + $rustPackages.AddToolVersion("Bindgen", $(Get-Bindgen)) + $rustPackages.AddToolVersion("Cargo-audit", $(Get-Cargoaudit)) + $rustPackages.AddToolVersion("Cargo-outdated", $(Get-Cargooutdated)) + $rustPackages.AddToolVersion("Cbindgen", $(Get-Cbindgen)) + } + $rustPackages.AddToolVersion("Clippy", $(Get-RustClippyVersion)) + $rustPackages.AddToolVersion("Rustfmt", $(Get-RustfmtVersion)) +} + +# PowerShell +$powerShell = $installedSoftware.AddHeader("PowerShell Tools") +$powerShell.AddToolVersion("PowerShell", $(Get-PowershellVersion)) + +$powerShellModules = $powerShell.AddHeader("PowerShell Modules") +$powerShellModules.AddNodes($(Get-PowerShellModules)) + +# Web Servers +if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) { + $webServers = $installedSoftware.AddHeader("Web Servers") + $webServers.AddTable($(Build-WebServersSection)) +} + +# Xamarin section +if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) { + $xamarin = $installedSoftware.AddHeader("Xamarin") + $vsForMac = $xamarin.AddHeader("Visual Studio for Mac") + $vsForMac.AddTable($(Build-VSMacTable)) + $note = + @' +To use Visual Studio 2019 by default rename the app: +mv "/Applications/Visual Studio.app" "/Applications/Visual Studio 2022.app" +mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" +'@ + $vsForMacNotes = $vsForMac.AddHeader("Notes") + $vsForMacNotes.AddNote($note) + + $xamarinBundles = $xamarin.AddHeader("Xamarin bundles") + $xamarinBundles.AddTable($(Build-XamarinTable)) + + $unitTestFramework = $xamarin.AddHeader("Unit Test Framework") + $unitTestFramework.AddToolVersion("NUnit", $(Get-NUnitVersion)) +} + +# Xcode section +$xcode = $installedSoftware.AddHeader("Xcode") +# First run doesn't provide full data about devices and runtimes +Get-XcodeInfoList | Out-Null + +$xcodeInfo = Get-XcodeInfoList +$xcode.AddTable($(Build-XcodeTable $xcodeInfo)) + +$xcodeTools = $xcode.AddHeader("Xcode Support Tools") +$xcodeTools.AddNodes($(Build-XcodeSupportToolsSection)) + +$installedSdks = $xcode.AddHeader("Installed SDKs") +$installedSdks.AddTable($(Build-XcodeSDKTable $xcodeInfo)) + +$installedSimulators = $xcode.AddHeader("Installed Simulators") +$installedSimulators.AddTable($(Build-XcodeSimulatorsTable $xcodeInfo)) + +# Android section +$android = $installedSoftware.AddHeader("Android") +$androidTable = Build-AndroidTable +$android.AddTable($androidTable) + +$androidEnv = $android.AddHeader("Environment variables") +$androidEnv.AddTable($(Build-AndroidEnvironmentTable)) + +if ($os.IsBigSur -or $os.IsMonterey) { + $miscellaneous = $installedSoftware.AddHeader("Miscellaneous") + $miscellaneous.AddToolVersion("libXext", $(Get-LibXextVersion)) + $miscellaneous.AddToolVersion("libXft", $(Get-LibXftVersion)) + $miscellaneous.AddToolVersion("Tcl/Tk", $(Get-TclTkVersion)) + $miscellaneous.AddToolVersion("Zlib", $(Get-ZlibVersion)) +} + +if ($os.IsMonterey) { + $miscellaneousEnv = $miscellaneous.AddHeader("Environment variables") + $miscellaneousEnv.AddTable($(Build-MiscellaneousEnvironmentTable)) + + $notes = @' +If you want to use Parallels Desktop you should download a package from URL stored in +PARALLELS_DMG_URL environment variable. A system extension is allowed for this version. +'@ + $miscellaneousEnvNotes = $miscellaneousEnv.AddHeader("Notes") + $miscellaneousEnvNotes.AddNote($notes) +} + +if (-not (Test-Path $OutputDirectory)) { New-Item -Path $OutputDirectory -ItemType Directory | Out-Null } + +# +# Write final reports +# +Write-Host $markdownExtended +$softwareReport.ToJson() | Out-File -FilePath "${OutputDirectory}/systeminfo.json" -Encoding UTF8NoBOM +$softwareReport.ToMarkdown() | Out-File -FilePath "${OutputDirectory}/systeminfo.md" -Encoding UTF8NoBOM diff --git a/images/macos/software-report/SoftwareReport.Java.psm1 b/images/macos/scripts/docs-gen/SoftwareReport.Java.psm1 similarity index 100% rename from images/macos/software-report/SoftwareReport.Java.psm1 rename to images/macos/scripts/docs-gen/SoftwareReport.Java.psm1 diff --git a/images/macos/software-report/SoftwareReport.Toolcache.psm1 b/images/macos/scripts/docs-gen/SoftwareReport.Toolcache.psm1 similarity index 100% rename from images/macos/software-report/SoftwareReport.Toolcache.psm1 rename to images/macos/scripts/docs-gen/SoftwareReport.Toolcache.psm1 diff --git a/images/macos/software-report/SoftwareReport.WebServers.psm1 b/images/macos/scripts/docs-gen/SoftwareReport.WebServers.psm1 similarity index 100% rename from images/macos/software-report/SoftwareReport.WebServers.psm1 rename to images/macos/scripts/docs-gen/SoftwareReport.WebServers.psm1 diff --git a/images/macos/software-report/SoftwareReport.Xamarin.psm1 b/images/macos/scripts/docs-gen/SoftwareReport.Xamarin.psm1 similarity index 100% rename from images/macos/software-report/SoftwareReport.Xamarin.psm1 rename to images/macos/scripts/docs-gen/SoftwareReport.Xamarin.psm1 diff --git a/images/macos/software-report/SoftwareReport.Xcode.psm1 b/images/macos/scripts/docs-gen/SoftwareReport.Xcode.psm1 similarity index 100% rename from images/macos/software-report/SoftwareReport.Xcode.psm1 rename to images/macos/scripts/docs-gen/SoftwareReport.Xcode.psm1 diff --git a/images/macos/helpers/Common.Helpers.psm1 b/images/macos/scripts/helpers/Common.Helpers.psm1 similarity index 100% rename from images/macos/helpers/Common.Helpers.psm1 rename to images/macos/scripts/helpers/Common.Helpers.psm1 diff --git a/images/macos/helpers/SoftwareReport.Helpers.psm1 b/images/macos/scripts/helpers/SoftwareReport.Helpers.psm1 similarity index 100% rename from images/macos/helpers/SoftwareReport.Helpers.psm1 rename to images/macos/scripts/helpers/SoftwareReport.Helpers.psm1 diff --git a/images/macos/helpers/Tests.Helpers.psm1 b/images/macos/scripts/helpers/Tests.Helpers.psm1 similarity index 100% rename from images/macos/helpers/Tests.Helpers.psm1 rename to images/macos/scripts/helpers/Tests.Helpers.psm1 diff --git a/images/macos/helpers/Xcode.Helpers.psm1 b/images/macos/scripts/helpers/Xcode.Helpers.psm1 similarity index 100% rename from images/macos/helpers/Xcode.Helpers.psm1 rename to images/macos/scripts/helpers/Xcode.Helpers.psm1 diff --git a/images/macos/helpers/Xcode.Installer.psm1 b/images/macos/scripts/helpers/Xcode.Installer.psm1 similarity index 100% rename from images/macos/helpers/Xcode.Installer.psm1 rename to images/macos/scripts/helpers/Xcode.Installer.psm1 diff --git a/images/macos/provision/utils/confirm-identified-developers.scpt b/images/macos/scripts/helpers/confirm-identified-developers.scpt similarity index 100% rename from images/macos/provision/utils/confirm-identified-developers.scpt rename to images/macos/scripts/helpers/confirm-identified-developers.scpt diff --git a/images/macos/provision/utils/invoke-tests.sh b/images/macos/scripts/helpers/invoke-tests.sh similarity index 100% rename from images/macos/provision/utils/invoke-tests.sh rename to images/macos/scripts/helpers/invoke-tests.sh diff --git a/images/macos/provision/utils/utils.sh b/images/macos/scripts/helpers/utils.sh old mode 100755 new mode 100644 similarity index 100% rename from images/macos/provision/utils/utils.sh rename to images/macos/scripts/helpers/utils.sh diff --git a/images/macos/provision/utils/xamarin-utils.sh b/images/macos/scripts/helpers/xamarin-utils.sh similarity index 100% rename from images/macos/provision/utils/xamarin-utils.sh rename to images/macos/scripts/helpers/xamarin-utils.sh diff --git a/images/macos/tests/ActionArchiveCache.Tests.ps1 b/images/macos/scripts/tests/ActionArchiveCache.Tests.ps1 similarity index 100% rename from images/macos/tests/ActionArchiveCache.Tests.ps1 rename to images/macos/scripts/tests/ActionArchiveCache.Tests.ps1 diff --git a/images/macos/tests/Android.Tests.ps1 b/images/macos/scripts/tests/Android.Tests.ps1 similarity index 97% rename from images/macos/tests/Android.Tests.ps1 rename to images/macos/scripts/tests/Android.Tests.ps1 index d399f558d639..fe247262f021 100644 --- a/images/macos/tests/Android.Tests.ps1 +++ b/images/macos/scripts/tests/Android.Tests.ps1 @@ -1,82 +1,82 @@ -Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" -Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1" -DisableNameChecking -Import-Module "$PSScriptRoot/../software-report/SoftwareReport.Android.psm1" -DisableNameChecking - -$os = Get-OSVersion - -Describe "Android" { - $androidSdkManagerPackages = Get-AndroidPackages - [int]$platformMinVersion = Get-ToolsetValue "android.platform_min_version" - [version]$buildToolsMinVersion = Get-ToolsetValue "android.build_tools_min_version" - [array]$ndkVersions = Get-ToolsetValue "android.ndk.versions" - $ndkFullVersions = $ndkVersions | ForEach-Object { Get-ChildItem "$env:ANDROID_HOME/ndk/${_}.*" -Name | Select-Object -Last 1 } | ForEach-Object { "ndk/${_}" } - # Platforms starting with a letter are the preview versions, which is not installed on the image - $platformVersionsList = ($androidSdkManagerPackages | Where-Object { "$_".StartsWith("platforms;") }) -replace 'platforms;android-', '' | Where-Object { $_ -match "^\d" } | Sort-Object -Unique - $platformsInstalled = $platformVersionsList | Where-Object { [int]($_.Split("-")[0]) -ge $platformMinVersion } | ForEach-Object { "platforms/android-${_}" } - - $buildToolsList = ($androidSdkManagerPackages | Where-Object { "$_".StartsWith("build-tools;") }) -replace 'build-tools;', '' - $buildTools = $buildToolsList | Where-Object { $_ -match "\d+(\.\d+){2,}$" } | Where-Object { [version]$_ -ge $buildToolsMinVersion } | Sort-Object -Unique | - ForEach-Object { "build-tools/${_}" } - - $androidPackages = @( - "tools", - "platform-tools", - "cmake", - $platformsInstalled, - $buildTools, - $ndkFullVersions, - (Get-ToolsetValue "android.extra-list" | ForEach-Object { "extras/${_}" }), - (Get-ToolsetValue "android.addon-list" | ForEach-Object { "add-ons/${_}" }), - (Get-ToolsetValue "android.additional-tools") - ) | ForEach-Object { $_ } - - # Remove empty strings from array to avoid possible issues - $androidPackages = $androidPackages | Where-Object { $_ } - - BeforeAll { - $ANDROID_SDK_DIR = Join-Path $env:HOME "Library" "Android" "sdk" - - function Validate-AndroidPackage { - param ( - [Parameter(Mandatory = $true)] - [string]$PackageName - ) - - # Convert 'm2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta1' -> - # 'm2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-beta1' - $PackageName = $PackageName.Replace(";", "/") - $targetPath = Join-Path $ANDROID_SDK_DIR $PackageName - $targetPath | Should -Exist - } - } - - Context "SDKManagers" { - $testCases = @( - @{ - PackageName = "Command-line tools" - Sdkmanager = "$env:ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager" - } - ) - if ($os.IsBigSur -or $os.IsMonterey) { - $testCases += @( - @{ - PackageName = "SDK tools" - Sdkmanager = "$env:ANDROID_HOME/tools/bin/sdkmanager" - } - ) - } - - It "Sdkmanager from <PackageName> is available" -TestCases $testCases { - "$Sdkmanager --version" | Should -ReturnZeroExitCode - } - } - - Context "Packages" { - $testCases = $androidPackages | ForEach-Object { @{ PackageName = $_ } } - - It "<PackageName>" -TestCases $testCases { - param ([string] $PackageName) - Validate-AndroidPackage $PackageName - } - } -} +Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" +Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1" -DisableNameChecking +Import-Module "$PSScriptRoot/../software-report/SoftwareReport.Android.psm1" -DisableNameChecking + +$os = Get-OSVersion + +Describe "Android" { + $androidSdkManagerPackages = Get-AndroidPackages + [int]$platformMinVersion = Get-ToolsetValue "android.platform_min_version" + [version]$buildToolsMinVersion = Get-ToolsetValue "android.build_tools_min_version" + [array]$ndkVersions = Get-ToolsetValue "android.ndk.versions" + $ndkFullVersions = $ndkVersions | ForEach-Object { Get-ChildItem "$env:ANDROID_HOME/ndk/${_}.*" -Name | Select-Object -Last 1 } | ForEach-Object { "ndk/${_}" } + # Platforms starting with a letter are the preview versions, which is not installed on the image + $platformVersionsList = ($androidSdkManagerPackages | Where-Object { "$_".StartsWith("platforms;") }) -replace 'platforms;android-', '' | Where-Object { $_ -match "^\d" } | Sort-Object -Unique + $platformsInstalled = $platformVersionsList | Where-Object { [int]($_.Split("-")[0]) -ge $platformMinVersion } | ForEach-Object { "platforms/android-${_}" } + + $buildToolsList = ($androidSdkManagerPackages | Where-Object { "$_".StartsWith("build-tools;") }) -replace 'build-tools;', '' + $buildTools = $buildToolsList | Where-Object { $_ -match "\d+(\.\d+){2,}$" } | Where-Object { [version]$_ -ge $buildToolsMinVersion } | Sort-Object -Unique | + ForEach-Object { "build-tools/${_}" } + + $androidPackages = @( + "tools", + "platform-tools", + "cmake", + $platformsInstalled, + $buildTools, + $ndkFullVersions, + (Get-ToolsetValue "android.extra-list" | ForEach-Object { "extras/${_}" }), + (Get-ToolsetValue "android.addon-list" | ForEach-Object { "add-ons/${_}" }), + (Get-ToolsetValue "android.additional-tools") + ) | ForEach-Object { $_ } + + # Remove empty strings from array to avoid possible issues + $androidPackages = $androidPackages | Where-Object { $_ } + + BeforeAll { + $ANDROID_SDK_DIR = Join-Path $env:HOME "Library" "Android" "sdk" + + function Validate-AndroidPackage { + param ( + [Parameter(Mandatory = $true)] + [string]$PackageName + ) + + # Convert 'm2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta1' -> + # 'm2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-beta1' + $PackageName = $PackageName.Replace(";", "/") + $targetPath = Join-Path $ANDROID_SDK_DIR $PackageName + $targetPath | Should -Exist + } + } + + Context "SDKManagers" { + $testCases = @( + @{ + PackageName = "Command-line tools" + Sdkmanager = "$env:ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager" + } + ) + if ($os.IsBigSur -or $os.IsMonterey) { + $testCases += @( + @{ + PackageName = "SDK tools" + Sdkmanager = "$env:ANDROID_HOME/tools/bin/sdkmanager" + } + ) + } + + It "Sdkmanager from <PackageName> is available" -TestCases $testCases { + "$Sdkmanager --version" | Should -ReturnZeroExitCode + } + } + + Context "Packages" { + $testCases = $androidPackages | ForEach-Object { @{ PackageName = $_ } } + + It "<PackageName>" -TestCases $testCases { + param ([string] $PackageName) + Validate-AndroidPackage $PackageName + } + } +} diff --git a/images/macos/tests/BasicTools.Tests.ps1 b/images/macos/scripts/tests/BasicTools.Tests.ps1 similarity index 100% rename from images/macos/tests/BasicTools.Tests.ps1 rename to images/macos/scripts/tests/BasicTools.Tests.ps1 diff --git a/images/macos/tests/Browsers.Tests.ps1 b/images/macos/scripts/tests/Browsers.Tests.ps1 similarity index 100% rename from images/macos/tests/Browsers.Tests.ps1 rename to images/macos/scripts/tests/Browsers.Tests.ps1 diff --git a/images/macos/tests/Common.Tests.ps1 b/images/macos/scripts/tests/Common.Tests.ps1 similarity index 100% rename from images/macos/tests/Common.Tests.ps1 rename to images/macos/scripts/tests/Common.Tests.ps1 diff --git a/images/macos/tests/Databases.Tests.ps1 b/images/macos/scripts/tests/Databases.Tests.ps1 similarity index 100% rename from images/macos/tests/Databases.Tests.ps1 rename to images/macos/scripts/tests/Databases.Tests.ps1 diff --git a/images/macos/tests/Git.Tests.ps1 b/images/macos/scripts/tests/Git.Tests.ps1 similarity index 100% rename from images/macos/tests/Git.Tests.ps1 rename to images/macos/scripts/tests/Git.Tests.ps1 diff --git a/images/macos/tests/Haskell.Tests.ps1 b/images/macos/scripts/tests/Haskell.Tests.ps1 similarity index 100% rename from images/macos/tests/Haskell.Tests.ps1 rename to images/macos/scripts/tests/Haskell.Tests.ps1 diff --git a/images/macos/tests/Java.Tests.ps1 b/images/macos/scripts/tests/Java.Tests.ps1 similarity index 100% rename from images/macos/tests/Java.Tests.ps1 rename to images/macos/scripts/tests/Java.Tests.ps1 diff --git a/images/macos/tests/LLVM.Tests.ps1 b/images/macos/scripts/tests/LLVM.Tests.ps1 similarity index 100% rename from images/macos/tests/LLVM.Tests.ps1 rename to images/macos/scripts/tests/LLVM.Tests.ps1 diff --git a/images/macos/tests/Linters.Tests.ps1 b/images/macos/scripts/tests/Linters.Tests.ps1 similarity index 96% rename from images/macos/tests/Linters.Tests.ps1 rename to images/macos/scripts/tests/Linters.Tests.ps1 index d4a2fdded30e..38fcfda5c18f 100644 --- a/images/macos/tests/Linters.Tests.ps1 +++ b/images/macos/scripts/tests/Linters.Tests.ps1 @@ -1,9 +1,9 @@ -Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1" -DisableNameChecking - -$os = Get-OSVersion - -Describe "SwiftLint" -Skip:($os.IsVenturaArm64 -or $os.IsSonomaArm64) { - It "SwiftLint" { - "swiftlint version" | Should -ReturnZeroExitCode - } -} +Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1" -DisableNameChecking + +$os = Get-OSVersion + +Describe "SwiftLint" -Skip:($os.IsVenturaArm64 -or $os.IsSonomaArm64) { + It "SwiftLint" { + "swiftlint version" | Should -ReturnZeroExitCode + } +} diff --git a/images/macos/tests/Node.Tests.ps1 b/images/macos/scripts/tests/Node.Tests.ps1 similarity index 96% rename from images/macos/tests/Node.Tests.ps1 rename to images/macos/scripts/tests/Node.Tests.ps1 index 6c11f161ae50..28a81f63949d 100644 --- a/images/macos/tests/Node.Tests.ps1 +++ b/images/macos/scripts/tests/Node.Tests.ps1 @@ -1,56 +1,56 @@ -Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" -Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1" -DisableNameChecking - -$os = Get-OSVersion - -Describe "Node.js" { - It "Node.js is installed" { - "node --version" | Should -ReturnZeroExitCode - } - - It "Node.js version should correspond to the version in the toolset" { - node --version | Should -BeLike "v$(Get-ToolsetValue 'node.default')*" - } - - It "NPM is installed" { - "npm --version" | Should -ReturnZeroExitCode - } - - It "Yarn is installed" { - "yarn --version" | Should -ReturnZeroExitCode - } -} - -Describe "nvm" -Skip:($os.IsVentura -or $os.IsSonoma) { - BeforeAll { - $nvmPath = Join-Path $env:HOME ".nvm" "nvm.sh" - $nvmInitCommand = ". $nvmPath > /dev/null 2>&1 || true" - } - - It "nvm is installed" { - $nvmPath | Should -Exist - "$nvmInitCommand && nvm --version" | Should -ReturnZeroExitCode - } - - Context "nvm versions" { - [array]$nvmVersions = Get-ToolsetValue 'node.nvm_versions' - $testCases = $nvmVersions | ForEach-Object { @{NvmVersion = $_} } - - It "<NvmVersion>" -TestCases $testCases { - param ( - [string] $NvmVersion - ) - - "$nvmInitCommand && nvm ls $($NvmVersion)" | Should -ReturnZeroExitCode - } - } -} - -Describe "Global NPM Packages" { - $globalNpmPackages = Get-ToolsetValue "npm.global_packages" - $globalNpmPackagesWithTests = $globalNpmPackages | Where-Object { $_.test } | ForEach-Object { @{ Name = $_.name; Test = $_.test } } - - It "<Name>" -TestCases $globalNpmPackagesWithTests { - $Test | Should -ReturnZeroExitCode - } -} +Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" +Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1" -DisableNameChecking + +$os = Get-OSVersion + +Describe "Node.js" { + It "Node.js is installed" { + "node --version" | Should -ReturnZeroExitCode + } + + It "Node.js version should correspond to the version in the toolset" { + node --version | Should -BeLike "v$(Get-ToolsetValue 'node.default')*" + } + + It "NPM is installed" { + "npm --version" | Should -ReturnZeroExitCode + } + + It "Yarn is installed" { + "yarn --version" | Should -ReturnZeroExitCode + } +} + +Describe "nvm" -Skip:($os.IsVentura -or $os.IsSonoma) { + BeforeAll { + $nvmPath = Join-Path $env:HOME ".nvm" "nvm.sh" + $nvmInitCommand = ". $nvmPath > /dev/null 2>&1 || true" + } + + It "nvm is installed" { + $nvmPath | Should -Exist + "$nvmInitCommand && nvm --version" | Should -ReturnZeroExitCode + } + + Context "nvm versions" { + [array]$nvmVersions = Get-ToolsetValue 'node.nvm_versions' + $testCases = $nvmVersions | ForEach-Object { @{NvmVersion = $_} } + + It "<NvmVersion>" -TestCases $testCases { + param ( + [string] $NvmVersion + ) + + "$nvmInitCommand && nvm ls $($NvmVersion)" | Should -ReturnZeroExitCode + } + } +} + +Describe "Global NPM Packages" { + $globalNpmPackages = Get-ToolsetValue "npm.global_packages" + $globalNpmPackagesWithTests = $globalNpmPackages | Where-Object { $_.test } | ForEach-Object { @{ Name = $_.name; Test = $_.test } } + + It "<Name>" -TestCases $globalNpmPackagesWithTests { + $Test | Should -ReturnZeroExitCode + } +} diff --git a/images/macos/tests/OpenSSL.Tests.ps1 b/images/macos/scripts/tests/OpenSSL.Tests.ps1 similarity index 100% rename from images/macos/tests/OpenSSL.Tests.ps1 rename to images/macos/scripts/tests/OpenSSL.Tests.ps1 diff --git a/images/macos/tests/PHP.Tests.ps1 b/images/macos/scripts/tests/PHP.Tests.ps1 similarity index 100% rename from images/macos/tests/PHP.Tests.ps1 rename to images/macos/scripts/tests/PHP.Tests.ps1 diff --git a/images/macos/tests/PipxPackages.Tests.ps1 b/images/macos/scripts/tests/PipxPackages.Tests.ps1 similarity index 100% rename from images/macos/tests/PipxPackages.Tests.ps1 rename to images/macos/scripts/tests/PipxPackages.Tests.ps1 diff --git a/images/macos/tests/Powershell.Tests.ps1 b/images/macos/scripts/tests/Powershell.Tests.ps1 similarity index 97% rename from images/macos/tests/Powershell.Tests.ps1 rename to images/macos/scripts/tests/Powershell.Tests.ps1 index 0674b1ef00bb..939957472e74 100644 --- a/images/macos/tests/Powershell.Tests.ps1 +++ b/images/macos/scripts/tests/Powershell.Tests.ps1 @@ -1,43 +1,43 @@ -Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" -Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1" -DisableNameChecking - -Describe "Powershell" { - Context "Powershell is installed" { - It "Powershell is installed" { - "pwsh -v" | Should -ReturnZeroExitCode - } - } - - Context "Powershell Modules" { - $modules = Get-ToolsetValue powershellModules - $withoutVersionsModules = $modules | Where-Object {-not $_.versions} | ForEach-Object { - @{moduleName = $_.name} - } - - $withVersionsModules = $modules | Where-Object {$_.versions} | ForEach-Object { - $moduleName = $_.name - $_.versions | ForEach-Object { - @{moduleName = $moduleName; expectedVersion = $_} - } - } - - It "<moduleName> is installed" -TestCases $withoutVersionsModules { - param ( - [string] $moduleName - ) - - Get-Module -Name $moduleName -ListAvailable | Should -BeTrue - } - - if ($withVersionsModules) { - It "<moduleName> with <expectedVersion> is installed" -TestCases $withVersionsModules { - param ( - [string] $moduleName, - [string] $expectedVersion - ) - - (Get-Module -Name $moduleName -ListAvailable).Version -contains $expectedVersion | Should -BeTrue - } - } - } +Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" +Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1" -DisableNameChecking + +Describe "Powershell" { + Context "Powershell is installed" { + It "Powershell is installed" { + "pwsh -v" | Should -ReturnZeroExitCode + } + } + + Context "Powershell Modules" { + $modules = Get-ToolsetValue powershellModules + $withoutVersionsModules = $modules | Where-Object {-not $_.versions} | ForEach-Object { + @{moduleName = $_.name} + } + + $withVersionsModules = $modules | Where-Object {$_.versions} | ForEach-Object { + $moduleName = $_.name + $_.versions | ForEach-Object { + @{moduleName = $moduleName; expectedVersion = $_} + } + } + + It "<moduleName> is installed" -TestCases $withoutVersionsModules { + param ( + [string] $moduleName + ) + + Get-Module -Name $moduleName -ListAvailable | Should -BeTrue + } + + if ($withVersionsModules) { + It "<moduleName> with <expectedVersion> is installed" -TestCases $withVersionsModules { + param ( + [string] $moduleName, + [string] $expectedVersion + ) + + (Get-Module -Name $moduleName -ListAvailable).Version -contains $expectedVersion | Should -BeTrue + } + } + } } \ No newline at end of file diff --git a/images/macos/tests/Python.Tests.ps1 b/images/macos/scripts/tests/Python.Tests.ps1 similarity index 97% rename from images/macos/tests/Python.Tests.ps1 rename to images/macos/scripts/tests/Python.Tests.ps1 index 012f78084b08..6126ee9f2aea 100644 --- a/images/macos/tests/Python.Tests.ps1 +++ b/images/macos/scripts/tests/Python.Tests.ps1 @@ -1,44 +1,44 @@ -Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" -Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1" -DisableNameChecking - -$os = Get-OSVersion - -Describe "Python3" -Skip:($os.IsVenturaArm64 -or $os.IsSonomaArm64) { - It "Python 3 is available" { - "python3 --version" | Should -ReturnZeroExitCode - } - - It "Python 3 is installed under /usr/local/bin" { - Get-WhichTool "python3" | Should -BeLike "/usr/local/bin*" - } - - It "Pip 3 is available" { - "pip3 --version" | Should -ReturnZeroExitCode - } - - It "Pipx is available" { - "pipx --version" | Should -ReturnZeroExitCode - } - - It "Pip 3 and Python 3 came from the same brew formula" { - $pip3Path = Split-Path (readlink (which pip3)) - $python3Path = Split-Path (readlink (which python3)) - $pip3Path | Should -BeExactly $python3Path - } - -} - -Describe "Python2" -Skip:($os.IsVentura -or $os.IsSonoma) { - It "Python 2 is available" { - "/Library/Frameworks/Python.framework/Versions/2.7/bin/python --version" | Should -ReturnZeroExitCode - } - - It "Pip 2 is available" { - "/Library/Frameworks/Python.framework/Versions/2.7/bin/pip --version" | Should -ReturnZeroExitCode - } - - It "2to3 symlink does not point to Python 2" { - $2to3path = (Get-ChildItem (Get-Command 2to3).Path).Target - $2to3path | Should -Not -BeLike '/Frameworks/Python.framework/Versions/2.*' - } -} +Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" +Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1" -DisableNameChecking + +$os = Get-OSVersion + +Describe "Python3" -Skip:($os.IsVenturaArm64 -or $os.IsSonomaArm64) { + It "Python 3 is available" { + "python3 --version" | Should -ReturnZeroExitCode + } + + It "Python 3 is installed under /usr/local/bin" { + Get-WhichTool "python3" | Should -BeLike "/usr/local/bin*" + } + + It "Pip 3 is available" { + "pip3 --version" | Should -ReturnZeroExitCode + } + + It "Pipx is available" { + "pipx --version" | Should -ReturnZeroExitCode + } + + It "Pip 3 and Python 3 came from the same brew formula" { + $pip3Path = Split-Path (readlink (which pip3)) + $python3Path = Split-Path (readlink (which python3)) + $pip3Path | Should -BeExactly $python3Path + } + +} + +Describe "Python2" -Skip:($os.IsVentura -or $os.IsSonoma) { + It "Python 2 is available" { + "/Library/Frameworks/Python.framework/Versions/2.7/bin/python --version" | Should -ReturnZeroExitCode + } + + It "Pip 2 is available" { + "/Library/Frameworks/Python.framework/Versions/2.7/bin/pip --version" | Should -ReturnZeroExitCode + } + + It "2to3 symlink does not point to Python 2" { + $2to3path = (Get-ChildItem (Get-Command 2to3).Path).Target + $2to3path | Should -Not -BeLike '/Frameworks/Python.framework/Versions/2.*' + } +} diff --git a/images/macos/tests/Ruby.arm64.Tests.ps1 b/images/macos/scripts/tests/Ruby.arm64.Tests.ps1 similarity index 100% rename from images/macos/tests/Ruby.arm64.Tests.ps1 rename to images/macos/scripts/tests/Ruby.arm64.Tests.ps1 diff --git a/images/macos/tests/Ruby.x64.Tests.ps1 b/images/macos/scripts/tests/Ruby.x64.Tests.ps1 similarity index 100% rename from images/macos/tests/Ruby.x64.Tests.ps1 rename to images/macos/scripts/tests/Ruby.x64.Tests.ps1 diff --git a/images/macos/tests/RubyGem.Tests.ps1 b/images/macos/scripts/tests/RubyGem.Tests.ps1 similarity index 100% rename from images/macos/tests/RubyGem.Tests.ps1 rename to images/macos/scripts/tests/RubyGem.Tests.ps1 diff --git a/images/macos/tests/RunAll-Tests.ps1 b/images/macos/scripts/tests/RunAll-Tests.ps1 similarity index 100% rename from images/macos/tests/RunAll-Tests.ps1 rename to images/macos/scripts/tests/RunAll-Tests.ps1 diff --git a/images/macos/tests/Rust.Tests.ps1 b/images/macos/scripts/tests/Rust.Tests.ps1 similarity index 100% rename from images/macos/tests/Rust.Tests.ps1 rename to images/macos/scripts/tests/Rust.Tests.ps1 diff --git a/images/macos/tests/System.Tests.ps1 b/images/macos/scripts/tests/System.Tests.ps1 similarity index 100% rename from images/macos/tests/System.Tests.ps1 rename to images/macos/scripts/tests/System.Tests.ps1 diff --git a/images/macos/tests/Toolcache.Tests.ps1 b/images/macos/scripts/tests/Toolcache.Tests.ps1 similarity index 100% rename from images/macos/tests/Toolcache.Tests.ps1 rename to images/macos/scripts/tests/Toolcache.Tests.ps1 diff --git a/images/macos/toolsets/Toolset.Tests.ps1 b/images/macos/scripts/tests/Toolset.Tests.ps1 similarity index 97% rename from images/macos/toolsets/Toolset.Tests.ps1 rename to images/macos/scripts/tests/Toolset.Tests.ps1 index 8e5b69ef2ec8..098d15629e92 100644 --- a/images/macos/toolsets/Toolset.Tests.ps1 +++ b/images/macos/scripts/tests/Toolset.Tests.ps1 @@ -1,144 +1,144 @@ -Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1" - -$toolsets = Get-ChildItem -Path $PSScriptRoot -Filter "toolset-*.json" - -function Get-ShortVersion([System.Version] $Version) { - return [System.Version]::Parse($Version).ToString(2) -} - -function Invoke-BashUtilsFunction([string] $FunctionName, [string]$parameter) { - $xamarinUtilsPath = "$PSScriptRoot/../provision/utils/xamarin-utils.sh" - return Invoke-Expression "bash -c `"source $xamarinUtilsPath && $FunctionName $parameter`"" -} - -Describe "Toolset JSON validation" { - $toolsets | ForEach-Object { - It "$($_.Name) is valid" { - $jsonContent = Get-Content -Raw $_.Fullname - $jsonContent | Test-Json | Should -BeTrue - } - } -} - -$toolsets | ForEach-Object { - Describe "$($_.Name)" { - $toolset = Get-Content -Raw $_.Fullname | ConvertFrom-Json - - Context "Xcode" { - It "Default Xcode should be defined" { - $toolset.xcode.default | Should -BeTrue - } - - It "Default Xcode is listed in Xcode list" { - $toolset.xcode.versions | Should -Contain $toolset.xcode.default - } - } - - Context "VSMac" { - $vsmacVersion = $toolset.xamarin.vsmac - - It "Version '$vsmacVersion' is available and can be downloaded" { - $vsmacUrl = Invoke-BashUtilsFunction("buildVSMacDownloadUrl", $vsmacVersion) - Validate-Url $vsmacUrl - } - } - - Context "Mono" { - $sdkVersions = $toolset.xamarin."mono-versions" - - $sdkVersions | ForEach-Object { - It "Version '$_' is available and can be downloaded" { - $sdkUrl = Invoke-BashUtilsFunction("buildMonoDownloadUrl", $_) - Validate-Url $sdkUrl - } - } - - It "Version list doesn't contain versions with the same major/minor version" { - $versions = $sdkVersions | ForEach-Object { Get-ShortVersion $_ } - Validate-ArrayWithoutDuplicates $versions -Because "It doesn't allow to install more than one version with the same major/minor" - } - } - - Context "Xamarin.iOS" { - $sdkVersions = $toolset.xamarin."ios-versions" - - $sdkVersions | ForEach-Object { - It "Version '$_' is available and can be downloaded" { - $sdkUrl = Invoke-BashUtilsFunction("buildXamariniIOSDownloadUrl", $_) - Validate-Url $sdkUrl - } - } - - It "Version list doesn't contain versions with the same major/minor version" { - $versions = $sdkVersions | ForEach-Object { Get-ShortVersion $_ } - Validate-ArrayWithoutDuplicates $versions -Because "It doesn't allow to install more than one version with the same major/minor" - } - } - - Context "Xamarin.Mac" { - $sdkVersions = $toolset.xamarin."mac-versions" - - $sdkVersions | ForEach-Object { - It "Version '$_' is available and can be downloaded" { - $sdkUrl = Invoke-BashUtilsFunction("buildXamarinMacDownloadUrl", $_) - Validate-Url $sdkUrl - } - } - - It "Version list doesn't contain versions with the same major/minor version" { - $versions = $sdkVersions | ForEach-Object { Get-ShortVersion $_ } - Validate-ArrayWithoutDuplicates $versions -Because "It doesn't allow to install more than one version with the same major/minor" - } - } - - Context "Xamarin.Android" { - $sdkVersions = $toolset.xamarin."android-versions" - - $sdkVersions | ForEach-Object { - It "Version '$_' is available and can be downloaded" { - $sdkUrl = Invoke-BashUtilsFunction("buildXamarinAndroidDownloadUrl", $_) - Validate-Url $sdkUrl - } - } - - It "Version list doesn't contain versions with the same major/minor version" { - $versions = $sdkVersions | ForEach-Object { $_.Replace("-", ".") } | ForEach-Object { Get-ShortVersion $_ } - Validate-ArrayWithoutDuplicates $versions -Because "It doesn't allow to install more than one version with the same major/minor" - } - } - - Context "Xamarin bundles" { - $monoVersions = $toolset.xamarin."mono-versions" | ForEach-Object { Get-ShortVersion $_ } - $iOSVersions = $toolset.xamarin."ios-versions" | ForEach-Object { Get-ShortVersion $_ } - $macVersions = $toolset.xamarin."mac-versions" | ForEach-Object { Get-ShortVersion $_ } - # Old Xamarin.Android version looks like "9.0.0-18" that doesn't support by System.Version - $androidVersions = $toolset.xamarin."android-versions" | ForEach-Object { Get-ShortVersion $_.Replace("-", ".") } - - - $bundles = $toolset.xamarin.bundles - $bundles | ForEach-Object { - It "'$($_.symlink)' is valid" { - $monoVersions | Should -Contain $_.mono - $iOSVersions | Should -Contain $_.ios - $macVersions | Should -Contain $_.mac - $androidVersions | Should -Contain $_.android - } - } - - It "Each bundle has unique symlink" { - $symlinks = $bundles | ForEach-Object { $_.symlink } - Validate-ArrayWithoutDuplicates $symlinks -Because "Bundle symlinks should be unique" - } - - It "Current bundle is valid" { - $currentBundleSymlink = $toolset.xamarin."bundle-default" - if ($currentBundleSymlink -ne "latest") { - $bundleSymlinks = $bundles | ForEach-Object { $_.symlink } - $bundleSymlinks | Should -Contain $currentBundleSymlink -Because "Current bundle should be installed" - } - - } - - } - } +Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1" + +$toolsets = Get-ChildItem -Path $PSScriptRoot -Filter "toolset-*.json" + +function Get-ShortVersion([System.Version] $Version) { + return [System.Version]::Parse($Version).ToString(2) +} + +function Invoke-BashUtilsFunction([string] $FunctionName, [string]$parameter) { + $xamarinUtilsPath = "$PSScriptRoot/../provision/utils/xamarin-utils.sh" + return Invoke-Expression "bash -c `"source $xamarinUtilsPath && $FunctionName $parameter`"" +} + +Describe "Toolset JSON validation" { + $toolsets | ForEach-Object { + It "$($_.Name) is valid" { + $jsonContent = Get-Content -Raw $_.Fullname + $jsonContent | Test-Json | Should -BeTrue + } + } +} + +$toolsets | ForEach-Object { + Describe "$($_.Name)" { + $toolset = Get-Content -Raw $_.Fullname | ConvertFrom-Json + + Context "Xcode" { + It "Default Xcode should be defined" { + $toolset.xcode.default | Should -BeTrue + } + + It "Default Xcode is listed in Xcode list" { + $toolset.xcode.versions | Should -Contain $toolset.xcode.default + } + } + + Context "VSMac" { + $vsmacVersion = $toolset.xamarin.vsmac + + It "Version '$vsmacVersion' is available and can be downloaded" { + $vsmacUrl = Invoke-BashUtilsFunction("buildVSMacDownloadUrl", $vsmacVersion) + Validate-Url $vsmacUrl + } + } + + Context "Mono" { + $sdkVersions = $toolset.xamarin."mono-versions" + + $sdkVersions | ForEach-Object { + It "Version '$_' is available and can be downloaded" { + $sdkUrl = Invoke-BashUtilsFunction("buildMonoDownloadUrl", $_) + Validate-Url $sdkUrl + } + } + + It "Version list doesn't contain versions with the same major/minor version" { + $versions = $sdkVersions | ForEach-Object { Get-ShortVersion $_ } + Validate-ArrayWithoutDuplicates $versions -Because "It doesn't allow to install more than one version with the same major/minor" + } + } + + Context "Xamarin.iOS" { + $sdkVersions = $toolset.xamarin."ios-versions" + + $sdkVersions | ForEach-Object { + It "Version '$_' is available and can be downloaded" { + $sdkUrl = Invoke-BashUtilsFunction("buildXamariniIOSDownloadUrl", $_) + Validate-Url $sdkUrl + } + } + + It "Version list doesn't contain versions with the same major/minor version" { + $versions = $sdkVersions | ForEach-Object { Get-ShortVersion $_ } + Validate-ArrayWithoutDuplicates $versions -Because "It doesn't allow to install more than one version with the same major/minor" + } + } + + Context "Xamarin.Mac" { + $sdkVersions = $toolset.xamarin."mac-versions" + + $sdkVersions | ForEach-Object { + It "Version '$_' is available and can be downloaded" { + $sdkUrl = Invoke-BashUtilsFunction("buildXamarinMacDownloadUrl", $_) + Validate-Url $sdkUrl + } + } + + It "Version list doesn't contain versions with the same major/minor version" { + $versions = $sdkVersions | ForEach-Object { Get-ShortVersion $_ } + Validate-ArrayWithoutDuplicates $versions -Because "It doesn't allow to install more than one version with the same major/minor" + } + } + + Context "Xamarin.Android" { + $sdkVersions = $toolset.xamarin."android-versions" + + $sdkVersions | ForEach-Object { + It "Version '$_' is available and can be downloaded" { + $sdkUrl = Invoke-BashUtilsFunction("buildXamarinAndroidDownloadUrl", $_) + Validate-Url $sdkUrl + } + } + + It "Version list doesn't contain versions with the same major/minor version" { + $versions = $sdkVersions | ForEach-Object { $_.Replace("-", ".") } | ForEach-Object { Get-ShortVersion $_ } + Validate-ArrayWithoutDuplicates $versions -Because "It doesn't allow to install more than one version with the same major/minor" + } + } + + Context "Xamarin bundles" { + $monoVersions = $toolset.xamarin."mono-versions" | ForEach-Object { Get-ShortVersion $_ } + $iOSVersions = $toolset.xamarin."ios-versions" | ForEach-Object { Get-ShortVersion $_ } + $macVersions = $toolset.xamarin."mac-versions" | ForEach-Object { Get-ShortVersion $_ } + # Old Xamarin.Android version looks like "9.0.0-18" that doesn't support by System.Version + $androidVersions = $toolset.xamarin."android-versions" | ForEach-Object { Get-ShortVersion $_.Replace("-", ".") } + + + $bundles = $toolset.xamarin.bundles + $bundles | ForEach-Object { + It "'$($_.symlink)' is valid" { + $monoVersions | Should -Contain $_.mono + $iOSVersions | Should -Contain $_.ios + $macVersions | Should -Contain $_.mac + $androidVersions | Should -Contain $_.android + } + } + + It "Each bundle has unique symlink" { + $symlinks = $bundles | ForEach-Object { $_.symlink } + Validate-ArrayWithoutDuplicates $symlinks -Because "Bundle symlinks should be unique" + } + + It "Current bundle is valid" { + $currentBundleSymlink = $toolset.xamarin."bundle-default" + if ($currentBundleSymlink -ne "latest") { + $bundleSymlinks = $bundles | ForEach-Object { $_.symlink } + $bundleSymlinks | Should -Contain $currentBundleSymlink -Because "Current bundle should be installed" + } + + } + + } + } } \ No newline at end of file diff --git a/images/macos/tests/WebServers.Tests.ps1 b/images/macos/scripts/tests/WebServers.Tests.ps1 similarity index 100% rename from images/macos/tests/WebServers.Tests.ps1 rename to images/macos/scripts/tests/WebServers.Tests.ps1 diff --git a/images/macos/tests/Xamarin.Tests.ps1 b/images/macos/scripts/tests/Xamarin.Tests.ps1 similarity index 97% rename from images/macos/tests/Xamarin.Tests.ps1 rename to images/macos/scripts/tests/Xamarin.Tests.ps1 index 335183345878..8eb12ba35374 100644 --- a/images/macos/tests/Xamarin.Tests.ps1 +++ b/images/macos/scripts/tests/Xamarin.Tests.ps1 @@ -1,309 +1,309 @@ -Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" -Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1" -DisableNameChecking - -$os = Get-OSVersion -if ($os.IsVentura -or $os.IsSonoma) { - $MONO_VERSIONS = @(Get-ToolsetValue "mono.framework.version") - $XAMARIN_IOS_VERSIONS = @() - $XAMARIN_MAC_VERSIONS = @() - $XAMARIN_ANDROID_VERSIONS = @() -} elseif ($os.IsBigSur -or $os.IsMonterey) { - $MONO_VERSIONS = Get-ToolsetValue "xamarin.mono-versions" - $XAMARIN_IOS_VERSIONS = Get-ToolsetValue "xamarin.ios-versions" - $XAMARIN_MAC_VERSIONS = Get-ToolsetValue "xamarin.mac-versions" - $XAMARIN_ANDROID_VERSIONS = Get-ToolsetValue "xamarin.android-versions" -} - -BeforeAll { - function Get-ShortSymlink { - param ( - [string] $Version - ) - - $versionParts = $Version.Split(".") - return [String]::Join(".", $versionParts[0..1]) - } -} - -Describe "Mono" { - $MONO_VERSIONS | ForEach-Object { - Context "$_" { - $MONO_VERSIONS_PATH = "/Library/Frameworks/Mono.framework/Versions" - $versionFolderPath = Join-Path $MONO_VERSIONS_PATH ([System.Version]::Parse($_).ToString(3)) - $testCase = @{ MonoVersion = $_; VersionFolderPath = $versionFolderPath; MonoVersionsPath = $MONO_VERSIONS_PATH } - - It "is installed" -TestCases $testCase { - param ( [string] $VersionFolderPath ) - - $monoBinPath = Join-Path $VersionFolderPath "bin" "mono" - $VersionFolderPath | Should -Exist - $monoBinPath | Should -Exist - } - - It "is available via short link" -TestCases $testCase { - param ( - [string] $MonoVersion, - [string] $MonoVersionsPath, - [string] $VersionFolderPath - ) - - $shortSymlink = Get-ShortSymlink $MonoVersion # only 'major.minor' - $shortSymlinkFolderPath = Join-Path $MonoVersionsPath $shortSymlink - if ($shortSymlink -eq "4.8") { return } # Skip this test for Mono 4.8 because it doesn't contain VERSION file - $shortVersionPath = Join-Path $shortSymlinkFolderPath "VERSION" - $fullVersionPath = Join-Path $VersionFolderPath "VERSION" - - Validate-IdenticalFileContent -File1 $shortVersionPath -File2 $fullVersionPath - } - - It "NUnit console is installed" -TestCases $testCase { - param ( [string] $VersionFolderPath ) - - $nunitPath = Join-Path $VersionFolderPath "Commands" "nunit3-console" - $nunitPath | Should -Exist - } - - It "Nuget is installed" -TestCases $testCase { - param ( [string] $VersionFolderPath ) - - $nugetBinaryPath = Join-Path $VersionFolderPath "lib" "mono" "nuget" "nuget.exe" - $nugetBinaryWrapperPath = Join-Path $VersionFolderPath "bin" "nuget" - $nugetCommandPath = Join-Path $VersionFolderPath "Commands" "nuget" - - $nugetBinaryPath | Should -Exist - $nugetCommandPath | Should -Exist - $nugetBinaryWrapperPath | Should -Exist - } - - It "Nuget is valid" -TestCases $testCase { - param ( [string] $VersionFolderPath ) - - $nugetBinaryWrapperPath = Join-Path $VersionFolderPath "bin" "nuget" - "$nugetBinaryWrapperPath" | Should -ReturnZeroExitCode - } - } - } - - It "MSBuild is available" { - "msbuild -version" | Should -ReturnZeroExitCode - } -} - -Describe "Xamarin.iOS" -Skip:($os.IsVentura -or $os.IsSonoma) { - $XAMARIN_IOS_VERSIONS | ForEach-Object { - Context "$_" { - $XAMARIN_IOS_VERSIONS_PATH = "/Library/Frameworks/Xamarin.iOS.framework/Versions" - $versionFolderPath = Join-Path $XAMARIN_IOS_VERSIONS_PATH $_ - $testCase = @{ XamarinIosVersion = $_; VersionFolderPath = $versionFolderPath; IosVersionsPath = $XAMARIN_IOS_VERSIONS_PATH } - - It "is installed" -TestCases $testCase { - param ( [string] $VersionFolderPath ) - - $xamarinBinPath = Join-Path $VersionFolderPath "bin" - $VersionFolderPath | Should -Exist - $xamarinBinPath | Should -Exist - } - - It "is available via short link" -TestCases $testCase { - param ( - [string] $XamarinIosVersion, - [string] $IosVersionsPath, - [string] $VersionFolderPath - ) - - $shortSymlink = Get-ShortSymlink $XamarinIosVersion # only 'major.minor' - $shortSymlinkFolderPath = Join-Path $IosVersionsPath $shortSymlink - $shortVersionPath = Join-Path $shortSymlinkFolderPath "VERSION" - $fullVersionPath = Join-Path $VersionFolderPath "VERSION" - - Validate-IdenticalFileContent -File1 $shortVersionPath -File2 $fullVersionPath - } - } - } -} - -Describe "Xamarin.Mac" -Skip:($os.IsVentura -or $os.IsSonoma) { - $XAMARIN_MAC_VERSIONS | ForEach-Object { - Context "$_" { - $XAMARIN_MAC_VERSIONS_PATH = "/Library/Frameworks/Xamarin.Mac.framework/Versions" - $versionFolderPath = Join-Path $XAMARIN_MAC_VERSIONS_PATH $_ - $testCase = @{ XamarinMacVersion = $_; VersionFolderPath = $versionFolderPath; MacVersionsPath = $XAMARIN_MAC_VERSIONS_PATH } - - It "is installed" -TestCases $testCase { - param ( [string] $VersionFolderPath ) - - $xamarinBinPath = Join-Path $VersionFolderPath "bin" - $VersionFolderPath | Should -Exist - $xamarinBinPath | Should -Exist - } - - It "is available via short link" -TestCases $testCase { - param ( - [string] $XamarinMacVersion, - [string] $MacVersionsPath, - [string] $VersionFolderPath - ) - - $shortSymlink = Get-ShortSymlink $XamarinMacVersion # only 'major.minor' - $shortSymlinkFolderPath = Join-Path $MacVersionsPath $shortSymlink - $shortVersionPath = Join-Path $shortSymlinkFolderPath "VERSION" - $fullVersionPath = Join-Path $VersionFolderPath "VERSION" - - Validate-IdenticalFileContent -File1 $shortVersionPath -File2 $fullVersionPath - } - } - } -} - -Describe "Xamarin.Android" -Skip:($os.IsVentura -or $os.IsSonoma) { - $XAMARIN_ANDROID_VERSIONS | ForEach-Object { - Context "$_" { - $XAMARIN_ANDROID_VERSIONS_PATH = "/Library/Frameworks/Xamarin.Android.framework/Versions" - $versionFolderPath = Join-Path $XAMARIN_ANDROID_VERSIONS_PATH $_ - $testCase = @{ XamarinAndroidVersion = $_; VersionFolderPath = $versionFolderPath; AndroidVersionsPath = $XAMARIN_ANDROID_VERSIONS_PATH } - - It "is installed" -TestCases $testCase { - param ( [string] $VersionFolderPath ) - - $xamarinLibPath = Join-Path $VersionFolderPath "lib" - $xamarinLibPath | Should -Exist - } - - It "is available via short link" -TestCases $testCase { - param ( - [string] $XamarinAndroidVersion, - [string] $AndroidVersionsPath, - [string] $VersionFolderPath - ) - - $shortSymlink = Get-ShortSymlink $XamarinAndroidVersion # only 'major.minor' - $shortSymlinkFolderPath = Join-Path $AndroidVersionsPath $shortSymlink - $shortVersionPath = Join-Path $shortSymlinkFolderPath "VERSION" - $fullVersionPath = Join-Path $VersionFolderPath "VERSION" - - Validate-IdenticalFileContent -File1 $shortVersionPath -File2 $fullVersionPath - } - - It "has correct symlinks" -TestCases $testCase { - param ( [string] $VersionFolderPath ) - - $xamarinLibPath = Join-Path $VersionFolderPath "lib" - Join-Path $xamarinLibPath "xbuild" | Should -Exist - Join-Path $xamarinLibPath "xbuild-frameworks" | Should -Exist - } - } - } -} - -Describe "Xamarin Bundles" -Skip:($os.IsVentura -or $os.IsSonoma) { - BeforeAll { - $MONO_VERSIONS_PATH = "/Library/Frameworks/Mono.framework/Versions" - $XAMARIN_IOS_VERSIONS_PATH = "/Library/Frameworks/Xamarin.iOS.framework/Versions" - $XAMARIN_MAC_VERSIONS_PATH = "/Library/Frameworks/Xamarin.Mac.framework/Versions" - $XAMARIN_ANDROID_VERSIONS_PATH = "/Library/Frameworks/Xamarin.Android.framework/Versions" - } - - If ($XAMARIN_BUNDLES.Count -eq 0) { return } # Skip this test if there are no bundles - - [array]$XAMARIN_BUNDLES = Get-ToolsetValue "xamarin.bundles" - $XAMARIN_DEFAULT_BUNDLE = Get-ToolsetValue "xamarin.bundle-default" - If ($XAMARIN_DEFAULT_BUNDLE -eq "latest") { $XAMARIN_DEFAULT_BUNDLE = $XAMARIN_BUNDLES[0].symlink } - - $currentBundle = [PSCustomObject] @{ - symlink = "Current" - mono = $XAMARIN_DEFAULT_BUNDLE - ios = $XAMARIN_DEFAULT_BUNDLE - mac = $XAMARIN_DEFAULT_BUNDLE - android = $XAMARIN_DEFAULT_BUNDLE - } - - $latestBundle = [PSCustomObject] @{ - symlink = "Latest" - mono = $XAMARIN_BUNDLES[0].mono - ios = $XAMARIN_BUNDLES[0].ios - mac = $XAMARIN_BUNDLES[0].mac - android = $XAMARIN_BUNDLES[0].android - } - - $bundles = $XAMARIN_BUNDLES + $currentBundle + $latestBundle - $allBundles = $bundles | ForEach-Object { @{BundleSymlink = $_.symlink; BundleMono = $_.mono; BundleIos = $_.ios; BundleMac = $_.mac; BundleAndroid = $_.android } } - - It "Mono symlink <BundleSymlink> exists" -TestCases $allBundles { - param ( [string] $BundleSymlink ) - - (Join-Path $MONO_VERSIONS_PATH $BundleSymlink) | Should -Exist - } - - It "Mono symlink <BundleSymlink> points to the correct version" -TestCases $allBundles { - param ( - [string] $BundleSymlink, - [string] $BundleMono - ) - - if ($BundleMono -eq "4.8") { return } # Skip this test for Mono 4.8 because it doesn't contain VERSION file - $sourceVersionPath = Join-Path $MONO_VERSIONS_PATH $BundleMono "VERSION" - $targetVersionPath = Join-Path $MONO_VERSIONS_PATH $BundleSymlink "VERSION" - - Validate-IdenticalFileContent -File1 $targetVersionPath -File2 $sourceVersionPath - } - - It "iOS symlink <BundleSymlink> exists" -TestCases $allBundles { - param ( [string] $BundleSymlink ) - - (Join-Path $XAMARIN_IOS_VERSIONS_PATH $BundleSymlink) | Should -Exist - } - - It "iOS symlink <BundleSymlink> points to the correct version" -TestCases $allBundles { - param ( - [string] $BundleSymlink, - [string] $BundleIos - ) - - $sourceVersionPath = Join-Path $XAMARIN_IOS_VERSIONS_PATH $BundleIos "VERSION" - $targetVersionPath = Join-Path $XAMARIN_IOS_VERSIONS_PATH $BundleSymlink "VERSION" - - Validate-IdenticalFileContent -File1 $targetVersionPath -File2 $sourceVersionPath - } - - It "Mac symlink <BundleSymlink> exists" -TestCases $allBundles { - param ( [string] $BundleSymlink ) - - (Join-Path $XAMARIN_MAC_VERSIONS_PATH $BundleSymlink) | Should -Exist - } - - It "Mac symlink <BundleSymlink> points to the correct version" -TestCases $allBundles { - param ( - [string] $BundleSymlink, - [string] $BundleMac - ) - - $sourceVersionPath = Join-Path $XAMARIN_MAC_VERSIONS_PATH $BundleMac "VERSION" - $targetVersionPath = Join-Path $XAMARIN_MAC_VERSIONS_PATH $BundleSymlink "VERSION" - - Validate-IdenticalFileContent -File1 $targetVersionPath -File2 $sourceVersionPath - } - - It "Xamarin.Android symlink <BundleSymlink> exists" -TestCases $allBundles { - param ( [string] $BundleSymlink ) - - (Join-Path $XAMARIN_ANDROID_VERSIONS_PATH $BundleSymlink) | Should -Exist - } - - It "Android symlink <BundleSymlink> points to the correct version" -TestCases $allBundles { - param ( - [string] $BundleSymlink, - [string] $BundleAndroid - ) - - $sourceVersionPath = Join-Path $XAMARIN_ANDROID_VERSIONS_PATH $BundleAndroid "VERSION" - $targetVersionPath = Join-Path $XAMARIN_ANDROID_VERSIONS_PATH $BundleSymlink "VERSION" - - Validate-IdenticalFileContent -File1 $targetVersionPath -File2 $sourceVersionPath - } -} - -Describe "Nuget" -Skip:($os.IsVentura -or $os.IsSonoma) { - It "Nuget config contains nuget.org feed" { - Get-Content $env:HOME/.config/NuGet/NuGet.Config | Out-String | Should -Match "nuget.org" - } -} +Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" +Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1" -DisableNameChecking + +$os = Get-OSVersion +if ($os.IsVentura -or $os.IsSonoma) { + $MONO_VERSIONS = @(Get-ToolsetValue "mono.framework.version") + $XAMARIN_IOS_VERSIONS = @() + $XAMARIN_MAC_VERSIONS = @() + $XAMARIN_ANDROID_VERSIONS = @() +} elseif ($os.IsBigSur -or $os.IsMonterey) { + $MONO_VERSIONS = Get-ToolsetValue "xamarin.mono-versions" + $XAMARIN_IOS_VERSIONS = Get-ToolsetValue "xamarin.ios-versions" + $XAMARIN_MAC_VERSIONS = Get-ToolsetValue "xamarin.mac-versions" + $XAMARIN_ANDROID_VERSIONS = Get-ToolsetValue "xamarin.android-versions" +} + +BeforeAll { + function Get-ShortSymlink { + param ( + [string] $Version + ) + + $versionParts = $Version.Split(".") + return [String]::Join(".", $versionParts[0..1]) + } +} + +Describe "Mono" { + $MONO_VERSIONS | ForEach-Object { + Context "$_" { + $MONO_VERSIONS_PATH = "/Library/Frameworks/Mono.framework/Versions" + $versionFolderPath = Join-Path $MONO_VERSIONS_PATH ([System.Version]::Parse($_).ToString(3)) + $testCase = @{ MonoVersion = $_; VersionFolderPath = $versionFolderPath; MonoVersionsPath = $MONO_VERSIONS_PATH } + + It "is installed" -TestCases $testCase { + param ( [string] $VersionFolderPath ) + + $monoBinPath = Join-Path $VersionFolderPath "bin" "mono" + $VersionFolderPath | Should -Exist + $monoBinPath | Should -Exist + } + + It "is available via short link" -TestCases $testCase { + param ( + [string] $MonoVersion, + [string] $MonoVersionsPath, + [string] $VersionFolderPath + ) + + $shortSymlink = Get-ShortSymlink $MonoVersion # only 'major.minor' + $shortSymlinkFolderPath = Join-Path $MonoVersionsPath $shortSymlink + if ($shortSymlink -eq "4.8") { return } # Skip this test for Mono 4.8 because it doesn't contain VERSION file + $shortVersionPath = Join-Path $shortSymlinkFolderPath "VERSION" + $fullVersionPath = Join-Path $VersionFolderPath "VERSION" + + Validate-IdenticalFileContent -File1 $shortVersionPath -File2 $fullVersionPath + } + + It "NUnit console is installed" -TestCases $testCase { + param ( [string] $VersionFolderPath ) + + $nunitPath = Join-Path $VersionFolderPath "Commands" "nunit3-console" + $nunitPath | Should -Exist + } + + It "Nuget is installed" -TestCases $testCase { + param ( [string] $VersionFolderPath ) + + $nugetBinaryPath = Join-Path $VersionFolderPath "lib" "mono" "nuget" "nuget.exe" + $nugetBinaryWrapperPath = Join-Path $VersionFolderPath "bin" "nuget" + $nugetCommandPath = Join-Path $VersionFolderPath "Commands" "nuget" + + $nugetBinaryPath | Should -Exist + $nugetCommandPath | Should -Exist + $nugetBinaryWrapperPath | Should -Exist + } + + It "Nuget is valid" -TestCases $testCase { + param ( [string] $VersionFolderPath ) + + $nugetBinaryWrapperPath = Join-Path $VersionFolderPath "bin" "nuget" + "$nugetBinaryWrapperPath" | Should -ReturnZeroExitCode + } + } + } + + It "MSBuild is available" { + "msbuild -version" | Should -ReturnZeroExitCode + } +} + +Describe "Xamarin.iOS" -Skip:($os.IsVentura -or $os.IsSonoma) { + $XAMARIN_IOS_VERSIONS | ForEach-Object { + Context "$_" { + $XAMARIN_IOS_VERSIONS_PATH = "/Library/Frameworks/Xamarin.iOS.framework/Versions" + $versionFolderPath = Join-Path $XAMARIN_IOS_VERSIONS_PATH $_ + $testCase = @{ XamarinIosVersion = $_; VersionFolderPath = $versionFolderPath; IosVersionsPath = $XAMARIN_IOS_VERSIONS_PATH } + + It "is installed" -TestCases $testCase { + param ( [string] $VersionFolderPath ) + + $xamarinBinPath = Join-Path $VersionFolderPath "bin" + $VersionFolderPath | Should -Exist + $xamarinBinPath | Should -Exist + } + + It "is available via short link" -TestCases $testCase { + param ( + [string] $XamarinIosVersion, + [string] $IosVersionsPath, + [string] $VersionFolderPath + ) + + $shortSymlink = Get-ShortSymlink $XamarinIosVersion # only 'major.minor' + $shortSymlinkFolderPath = Join-Path $IosVersionsPath $shortSymlink + $shortVersionPath = Join-Path $shortSymlinkFolderPath "VERSION" + $fullVersionPath = Join-Path $VersionFolderPath "VERSION" + + Validate-IdenticalFileContent -File1 $shortVersionPath -File2 $fullVersionPath + } + } + } +} + +Describe "Xamarin.Mac" -Skip:($os.IsVentura -or $os.IsSonoma) { + $XAMARIN_MAC_VERSIONS | ForEach-Object { + Context "$_" { + $XAMARIN_MAC_VERSIONS_PATH = "/Library/Frameworks/Xamarin.Mac.framework/Versions" + $versionFolderPath = Join-Path $XAMARIN_MAC_VERSIONS_PATH $_ + $testCase = @{ XamarinMacVersion = $_; VersionFolderPath = $versionFolderPath; MacVersionsPath = $XAMARIN_MAC_VERSIONS_PATH } + + It "is installed" -TestCases $testCase { + param ( [string] $VersionFolderPath ) + + $xamarinBinPath = Join-Path $VersionFolderPath "bin" + $VersionFolderPath | Should -Exist + $xamarinBinPath | Should -Exist + } + + It "is available via short link" -TestCases $testCase { + param ( + [string] $XamarinMacVersion, + [string] $MacVersionsPath, + [string] $VersionFolderPath + ) + + $shortSymlink = Get-ShortSymlink $XamarinMacVersion # only 'major.minor' + $shortSymlinkFolderPath = Join-Path $MacVersionsPath $shortSymlink + $shortVersionPath = Join-Path $shortSymlinkFolderPath "VERSION" + $fullVersionPath = Join-Path $VersionFolderPath "VERSION" + + Validate-IdenticalFileContent -File1 $shortVersionPath -File2 $fullVersionPath + } + } + } +} + +Describe "Xamarin.Android" -Skip:($os.IsVentura -or $os.IsSonoma) { + $XAMARIN_ANDROID_VERSIONS | ForEach-Object { + Context "$_" { + $XAMARIN_ANDROID_VERSIONS_PATH = "/Library/Frameworks/Xamarin.Android.framework/Versions" + $versionFolderPath = Join-Path $XAMARIN_ANDROID_VERSIONS_PATH $_ + $testCase = @{ XamarinAndroidVersion = $_; VersionFolderPath = $versionFolderPath; AndroidVersionsPath = $XAMARIN_ANDROID_VERSIONS_PATH } + + It "is installed" -TestCases $testCase { + param ( [string] $VersionFolderPath ) + + $xamarinLibPath = Join-Path $VersionFolderPath "lib" + $xamarinLibPath | Should -Exist + } + + It "is available via short link" -TestCases $testCase { + param ( + [string] $XamarinAndroidVersion, + [string] $AndroidVersionsPath, + [string] $VersionFolderPath + ) + + $shortSymlink = Get-ShortSymlink $XamarinAndroidVersion # only 'major.minor' + $shortSymlinkFolderPath = Join-Path $AndroidVersionsPath $shortSymlink + $shortVersionPath = Join-Path $shortSymlinkFolderPath "VERSION" + $fullVersionPath = Join-Path $VersionFolderPath "VERSION" + + Validate-IdenticalFileContent -File1 $shortVersionPath -File2 $fullVersionPath + } + + It "has correct symlinks" -TestCases $testCase { + param ( [string] $VersionFolderPath ) + + $xamarinLibPath = Join-Path $VersionFolderPath "lib" + Join-Path $xamarinLibPath "xbuild" | Should -Exist + Join-Path $xamarinLibPath "xbuild-frameworks" | Should -Exist + } + } + } +} + +Describe "Xamarin Bundles" -Skip:($os.IsVentura -or $os.IsSonoma) { + BeforeAll { + $MONO_VERSIONS_PATH = "/Library/Frameworks/Mono.framework/Versions" + $XAMARIN_IOS_VERSIONS_PATH = "/Library/Frameworks/Xamarin.iOS.framework/Versions" + $XAMARIN_MAC_VERSIONS_PATH = "/Library/Frameworks/Xamarin.Mac.framework/Versions" + $XAMARIN_ANDROID_VERSIONS_PATH = "/Library/Frameworks/Xamarin.Android.framework/Versions" + } + + If ($XAMARIN_BUNDLES.Count -eq 0) { return } # Skip this test if there are no bundles + + [array]$XAMARIN_BUNDLES = Get-ToolsetValue "xamarin.bundles" + $XAMARIN_DEFAULT_BUNDLE = Get-ToolsetValue "xamarin.bundle-default" + If ($XAMARIN_DEFAULT_BUNDLE -eq "latest") { $XAMARIN_DEFAULT_BUNDLE = $XAMARIN_BUNDLES[0].symlink } + + $currentBundle = [PSCustomObject] @{ + symlink = "Current" + mono = $XAMARIN_DEFAULT_BUNDLE + ios = $XAMARIN_DEFAULT_BUNDLE + mac = $XAMARIN_DEFAULT_BUNDLE + android = $XAMARIN_DEFAULT_BUNDLE + } + + $latestBundle = [PSCustomObject] @{ + symlink = "Latest" + mono = $XAMARIN_BUNDLES[0].mono + ios = $XAMARIN_BUNDLES[0].ios + mac = $XAMARIN_BUNDLES[0].mac + android = $XAMARIN_BUNDLES[0].android + } + + $bundles = $XAMARIN_BUNDLES + $currentBundle + $latestBundle + $allBundles = $bundles | ForEach-Object { @{BundleSymlink = $_.symlink; BundleMono = $_.mono; BundleIos = $_.ios; BundleMac = $_.mac; BundleAndroid = $_.android } } + + It "Mono symlink <BundleSymlink> exists" -TestCases $allBundles { + param ( [string] $BundleSymlink ) + + (Join-Path $MONO_VERSIONS_PATH $BundleSymlink) | Should -Exist + } + + It "Mono symlink <BundleSymlink> points to the correct version" -TestCases $allBundles { + param ( + [string] $BundleSymlink, + [string] $BundleMono + ) + + if ($BundleMono -eq "4.8") { return } # Skip this test for Mono 4.8 because it doesn't contain VERSION file + $sourceVersionPath = Join-Path $MONO_VERSIONS_PATH $BundleMono "VERSION" + $targetVersionPath = Join-Path $MONO_VERSIONS_PATH $BundleSymlink "VERSION" + + Validate-IdenticalFileContent -File1 $targetVersionPath -File2 $sourceVersionPath + } + + It "iOS symlink <BundleSymlink> exists" -TestCases $allBundles { + param ( [string] $BundleSymlink ) + + (Join-Path $XAMARIN_IOS_VERSIONS_PATH $BundleSymlink) | Should -Exist + } + + It "iOS symlink <BundleSymlink> points to the correct version" -TestCases $allBundles { + param ( + [string] $BundleSymlink, + [string] $BundleIos + ) + + $sourceVersionPath = Join-Path $XAMARIN_IOS_VERSIONS_PATH $BundleIos "VERSION" + $targetVersionPath = Join-Path $XAMARIN_IOS_VERSIONS_PATH $BundleSymlink "VERSION" + + Validate-IdenticalFileContent -File1 $targetVersionPath -File2 $sourceVersionPath + } + + It "Mac symlink <BundleSymlink> exists" -TestCases $allBundles { + param ( [string] $BundleSymlink ) + + (Join-Path $XAMARIN_MAC_VERSIONS_PATH $BundleSymlink) | Should -Exist + } + + It "Mac symlink <BundleSymlink> points to the correct version" -TestCases $allBundles { + param ( + [string] $BundleSymlink, + [string] $BundleMac + ) + + $sourceVersionPath = Join-Path $XAMARIN_MAC_VERSIONS_PATH $BundleMac "VERSION" + $targetVersionPath = Join-Path $XAMARIN_MAC_VERSIONS_PATH $BundleSymlink "VERSION" + + Validate-IdenticalFileContent -File1 $targetVersionPath -File2 $sourceVersionPath + } + + It "Xamarin.Android symlink <BundleSymlink> exists" -TestCases $allBundles { + param ( [string] $BundleSymlink ) + + (Join-Path $XAMARIN_ANDROID_VERSIONS_PATH $BundleSymlink) | Should -Exist + } + + It "Android symlink <BundleSymlink> points to the correct version" -TestCases $allBundles { + param ( + [string] $BundleSymlink, + [string] $BundleAndroid + ) + + $sourceVersionPath = Join-Path $XAMARIN_ANDROID_VERSIONS_PATH $BundleAndroid "VERSION" + $targetVersionPath = Join-Path $XAMARIN_ANDROID_VERSIONS_PATH $BundleSymlink "VERSION" + + Validate-IdenticalFileContent -File1 $targetVersionPath -File2 $sourceVersionPath + } +} + +Describe "Nuget" -Skip:($os.IsVentura -or $os.IsSonoma) { + It "Nuget config contains nuget.org feed" { + Get-Content $env:HOME/.config/NuGet/NuGet.Config | Out-String | Should -Match "nuget.org" + } +} diff --git a/images/macos/tests/Xcode.Tests.ps1 b/images/macos/scripts/tests/Xcode.Tests.ps1 similarity index 97% rename from images/macos/tests/Xcode.Tests.ps1 rename to images/macos/scripts/tests/Xcode.Tests.ps1 index 5eb49fdb5459..6909fdcbf238 100644 --- a/images/macos/tests/Xcode.Tests.ps1 +++ b/images/macos/scripts/tests/Xcode.Tests.ps1 @@ -1,136 +1,136 @@ -Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" -Import-Module "$PSScriptRoot/../helpers/Xcode.Helpers.psm1" -Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1" -DisableNameChecking - -$ARCH = Get-Architecture -$xcodeVersions = Get-ToolsetValue "xcode.$ARCH.versions" -$defaultXcode = Get-ToolsetValue "xcode.default" -$latestXcodeVersion = $xcodeVersions | Select-Object -First 1 -$os = Get-OSVersion - -Describe "Xcode" { - $testCases = $xcodeVersions | ForEach-Object { @{ XcodeVersion = $_.link; LatestXcodeVersion = $xcodeVersions[0].link; Symlinks = $_.symlinks } } - - Context "Versions" { - It "<XcodeVersion>" -TestCases $testCases { - $xcodebuildPath = Get-XcodeToolPath -Version $XcodeVersion -ToolName "xcodebuild" - "$xcodebuildPath -version" | Should -ReturnZeroExitCode - } - } - - Context "Default" { - $defaultXcodeTestCase = @{ DefaultXcode = $defaultXcode } - It "Default Xcode is <DefaultXcode>" -TestCases $defaultXcodeTestCase { - "xcodebuild -version" | Should -ReturnZeroExitCode - (Get-CommandResult "xcodebuild -version").Output | Should -BeLike "Xcode ${DefaultXcode}*" - } - - It "Xcode.app points to default Xcode" -TestCases $defaultXcodeTestCase { - $xcodeApp = "/Applications/Xcode.app" - $expectedTarget = Get-XcodeRootPath -Version $DefaultXcode - $xcodeApp | Should -Exist - $expectedTarget | Should -Exist - (Get-Item $xcodeApp).Target | Should -Be $expectedTarget - } - } - - Context "Additional tools" { - It "Xcode <XcodeVersion> tools are installed" -TestCases $testCases { - $TOOLS_NOT_INSTALLED_EXIT_CODE = 69 - $xcodebuildPath = Get-XcodeToolPath -Version $XcodeVersion -ToolName "xcodebuild" - $result = Get-CommandResult "$xcodebuildPath -checkFirstLaunchStatus" - - if ($XcodeVersion -ne $LatestXcodeVersion) { - $result.ExitCode | Should -Not -Be $TOOLS_NOT_INSTALLED_EXIT_CODE - } else { - $result.ExitCode | Should -BeIn (0, $TOOLS_NOT_INSTALLED_EXIT_CODE) - } - } - } - - Context "Symlinks" { - It "Xcode <XcodeVersion> has correct symlinks" -TestCases $testCases { - $sourcePath = Get-XcodeRootPath -Version $XcodeVersion - $Symlinks | Where-Object { $_ } | ForEach-Object { - $targetPath = Get-XcodeRootPath -Version $_ - $targetPath | Should -Exist - (Get-Item $targetPath).Target | Should -Be $sourcePath - } - } - } - - It "/Applications/Xcode* symlinks are valid" { - $symlinks = Get-ChildItem "/Applications" -Filter "Xcode*" | Where-Object { $_.LinkType } - - $symlinks.Target | ForEach-Object { - $_ | Should -Exist - } - } -} - -Describe "XCODE_DEVELOPER_DIR variables" { - $exactVersionsList = $xcodeVersions.link | Where-Object { Test-XcodeStableRelease -Version $_ } | ForEach-Object { - $xcodeRootPath = Get-XcodeRootPath -Version $_ - $xcodeVersionInfo = Get-XcodeVersionInfo -XcodeRootPath $xcodeRootPath - return @{ - RootPath = $xcodeRootPath - Version = [SemVer]::Parse($xcodeVersionInfo.Version) - } - } | Sort-Object -Property Version -Descending - $majorVersions = $exactVersionsList.Version.Major | Select-Object -Unique - $testCases = $majorVersions | ForEach-Object { @{ MajorVersion = $_; VersionsList = $exactVersionsList } } - - It "XCODE_<MajorVersion>_DEVELOPER_DIR" -TestCases $testCases { - $variableName = "XCODE_${MajorVersion}_DEVELOPER_DIR" - $actualPath = Get-EnvironmentVariable $variableName - $expectedVersion = $VersionsList | Where-Object { $_.Version.Major -eq $MajorVersion } | Select-Object -First 1 - $expectedPath = "$($expectedVersion.RootPath)/Contents/Developer" - $actualPath | Should -Exist - $actualPath | Should -Be $expectedPath - } -} - -Describe "Xcode simulators" { - $xcodeVersions.link | Where-Object { Test-XcodeStableRelease -Version $_ } | ForEach-Object { - Context "$_" { - $testCase = @{ XcodeVersion = $_ } - It "No duplicates in devices" -TestCases $testCase { - Switch-Xcode -Version $XcodeVersion - [array]$devicesList = @(Get-XcodeDevicesList | Where-Object { $_ }) - Write-Host "Devices for $XcodeVersion" - Write-Host ($devicesList -join "`n") - Validate-ArrayWithoutDuplicates $devicesList -Because "Found duplicate device simulators" - } - -# It "No duplicates in pairs" -TestCases $testCase { -# Switch-Xcode -Version $XcodeVersion -# [array]$pairsList = @(Get-XcodePairsList | Where-Object { $_ }) -# Write-Host "Pairs for $XcodeVersion" -# Write-Host ($pairsList -join "`n") -# Validate-ArrayWithoutDuplicates $pairsList -Because "Found duplicate pairs simulators" -# } - } - } - - AfterEach { - $defaultXcode = Get-ToolsetValue "xcode.default" - Switch-Xcode -Version $defaultXcode - } -} - -Describe "Xcode Simulators Naming" -Skip:(-not $os.IsMonterey) { - $testCases = Get-BrokenXcodeSimulatorsList - It "Simulator '<SimulatorName> [<RuntimeId>]'" -TestCases $testCases { - $simctlPath = Get-XcodeToolPath -Version $XcodeVersion -ToolName "simctl" - [string]$rawDevicesInfo = Invoke-Expression "$simctlPath list devices --json" - $jsonDevicesInfo = ($rawDevicesInfo | ConvertFrom-Json).devices - - $foundSimulators = $jsonDevicesInfo.$RuntimeId | Where-Object { $_.deviceTypeIdentifier -eq $DeviceId } - $foundSimulators | Should -HaveCount 1 - $foundSimulators[0].name | Should -Be $SimulatorName - - $foundSimulators = $jsonDevicesInfo.$RuntimeId | Where-Object { $_.name -eq $SimulatorName } - $foundSimulators | Should -HaveCount 1 - $foundSimulators[0].deviceTypeIdentifier | Should -Be $DeviceId - } +Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" +Import-Module "$PSScriptRoot/../helpers/Xcode.Helpers.psm1" +Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1" -DisableNameChecking + +$ARCH = Get-Architecture +$xcodeVersions = Get-ToolsetValue "xcode.$ARCH.versions" +$defaultXcode = Get-ToolsetValue "xcode.default" +$latestXcodeVersion = $xcodeVersions | Select-Object -First 1 +$os = Get-OSVersion + +Describe "Xcode" { + $testCases = $xcodeVersions | ForEach-Object { @{ XcodeVersion = $_.link; LatestXcodeVersion = $xcodeVersions[0].link; Symlinks = $_.symlinks } } + + Context "Versions" { + It "<XcodeVersion>" -TestCases $testCases { + $xcodebuildPath = Get-XcodeToolPath -Version $XcodeVersion -ToolName "xcodebuild" + "$xcodebuildPath -version" | Should -ReturnZeroExitCode + } + } + + Context "Default" { + $defaultXcodeTestCase = @{ DefaultXcode = $defaultXcode } + It "Default Xcode is <DefaultXcode>" -TestCases $defaultXcodeTestCase { + "xcodebuild -version" | Should -ReturnZeroExitCode + (Get-CommandResult "xcodebuild -version").Output | Should -BeLike "Xcode ${DefaultXcode}*" + } + + It "Xcode.app points to default Xcode" -TestCases $defaultXcodeTestCase { + $xcodeApp = "/Applications/Xcode.app" + $expectedTarget = Get-XcodeRootPath -Version $DefaultXcode + $xcodeApp | Should -Exist + $expectedTarget | Should -Exist + (Get-Item $xcodeApp).Target | Should -Be $expectedTarget + } + } + + Context "Additional tools" { + It "Xcode <XcodeVersion> tools are installed" -TestCases $testCases { + $TOOLS_NOT_INSTALLED_EXIT_CODE = 69 + $xcodebuildPath = Get-XcodeToolPath -Version $XcodeVersion -ToolName "xcodebuild" + $result = Get-CommandResult "$xcodebuildPath -checkFirstLaunchStatus" + + if ($XcodeVersion -ne $LatestXcodeVersion) { + $result.ExitCode | Should -Not -Be $TOOLS_NOT_INSTALLED_EXIT_CODE + } else { + $result.ExitCode | Should -BeIn (0, $TOOLS_NOT_INSTALLED_EXIT_CODE) + } + } + } + + Context "Symlinks" { + It "Xcode <XcodeVersion> has correct symlinks" -TestCases $testCases { + $sourcePath = Get-XcodeRootPath -Version $XcodeVersion + $Symlinks | Where-Object { $_ } | ForEach-Object { + $targetPath = Get-XcodeRootPath -Version $_ + $targetPath | Should -Exist + (Get-Item $targetPath).Target | Should -Be $sourcePath + } + } + } + + It "/Applications/Xcode* symlinks are valid" { + $symlinks = Get-ChildItem "/Applications" -Filter "Xcode*" | Where-Object { $_.LinkType } + + $symlinks.Target | ForEach-Object { + $_ | Should -Exist + } + } +} + +Describe "XCODE_DEVELOPER_DIR variables" { + $exactVersionsList = $xcodeVersions.link | Where-Object { Test-XcodeStableRelease -Version $_ } | ForEach-Object { + $xcodeRootPath = Get-XcodeRootPath -Version $_ + $xcodeVersionInfo = Get-XcodeVersionInfo -XcodeRootPath $xcodeRootPath + return @{ + RootPath = $xcodeRootPath + Version = [SemVer]::Parse($xcodeVersionInfo.Version) + } + } | Sort-Object -Property Version -Descending + $majorVersions = $exactVersionsList.Version.Major | Select-Object -Unique + $testCases = $majorVersions | ForEach-Object { @{ MajorVersion = $_; VersionsList = $exactVersionsList } } + + It "XCODE_<MajorVersion>_DEVELOPER_DIR" -TestCases $testCases { + $variableName = "XCODE_${MajorVersion}_DEVELOPER_DIR" + $actualPath = Get-EnvironmentVariable $variableName + $expectedVersion = $VersionsList | Where-Object { $_.Version.Major -eq $MajorVersion } | Select-Object -First 1 + $expectedPath = "$($expectedVersion.RootPath)/Contents/Developer" + $actualPath | Should -Exist + $actualPath | Should -Be $expectedPath + } +} + +Describe "Xcode simulators" { + $xcodeVersions.link | Where-Object { Test-XcodeStableRelease -Version $_ } | ForEach-Object { + Context "$_" { + $testCase = @{ XcodeVersion = $_ } + It "No duplicates in devices" -TestCases $testCase { + Switch-Xcode -Version $XcodeVersion + [array]$devicesList = @(Get-XcodeDevicesList | Where-Object { $_ }) + Write-Host "Devices for $XcodeVersion" + Write-Host ($devicesList -join "`n") + Validate-ArrayWithoutDuplicates $devicesList -Because "Found duplicate device simulators" + } + +# It "No duplicates in pairs" -TestCases $testCase { +# Switch-Xcode -Version $XcodeVersion +# [array]$pairsList = @(Get-XcodePairsList | Where-Object { $_ }) +# Write-Host "Pairs for $XcodeVersion" +# Write-Host ($pairsList -join "`n") +# Validate-ArrayWithoutDuplicates $pairsList -Because "Found duplicate pairs simulators" +# } + } + } + + AfterEach { + $defaultXcode = Get-ToolsetValue "xcode.default" + Switch-Xcode -Version $defaultXcode + } +} + +Describe "Xcode Simulators Naming" -Skip:(-not $os.IsMonterey) { + $testCases = Get-BrokenXcodeSimulatorsList + It "Simulator '<SimulatorName> [<RuntimeId>]'" -TestCases $testCases { + $simctlPath = Get-XcodeToolPath -Version $XcodeVersion -ToolName "simctl" + [string]$rawDevicesInfo = Invoke-Expression "$simctlPath list devices --json" + $jsonDevicesInfo = ($rawDevicesInfo | ConvertFrom-Json).devices + + $foundSimulators = $jsonDevicesInfo.$RuntimeId | Where-Object { $_.deviceTypeIdentifier -eq $DeviceId } + $foundSimulators | Should -HaveCount 1 + $foundSimulators[0].name | Should -Be $SimulatorName + + $foundSimulators = $jsonDevicesInfo.$RuntimeId | Where-Object { $_.name -eq $SimulatorName } + $foundSimulators | Should -HaveCount 1 + $foundSimulators[0].deviceTypeIdentifier | Should -Be $DeviceId + } } \ No newline at end of file diff --git a/images/macos/templates/macOS-11.json b/images/macos/templates/macOS-11.json index 814580fbfb68..4e9804358bff 100644 --- a/images/macos/templates/macOS-11.json +++ b/images/macos/templates/macOS-11.json @@ -45,52 +45,37 @@ }, { "type": "file", - "source": "./provision/assets", - "destination": "~/image-generation/" - }, - { - "type": "file", - "source": "./tests", - "destination": "~/image-generation/" - }, - { - "type": "file", - "source": "./software-report", + "sources": [ + "./assets/xamarin-selector", + "./scripts/tests", + "./scripts/docs-gen", + "./scripts/helpers" + ], "destination": "~/image-generation/" }, { "type": "file", "source": "../../helpers/software-report-base", - "destination": "~/image-generation/software-report/" + "destination": "~/image-generation/docs-gen/" }, { "type": "file", - "source": "./helpers", - "destination": "~/image-generation/" - }, - { - "type": "file", - "source": "./provision/configuration/add-certificate.swift", + "source": "./assets/add-certificate.swift", "destination": "~/image-generation/add-certificate.swift" }, { "type": "file", - "source": "./provision/configuration/environment/bashrc", + "source": "./assets/bashrc", "destination": "~/.bashrc" }, { "type": "file", - "source": "./provision/configuration/environment/bashprofile", + "source": "./assets/bashprofile", "destination": "~/.bash_profile" }, { "type": "file", - "source": "./provision/utils", - "destination": "~/" - }, - { - "type": "file", - "source": "./provision/bootstrap-provisioner", + "source": "./assets/bootstrap-provisioner", "destination": "~/bootstrap" }, { @@ -98,26 +83,39 @@ "source": "./toolsets/toolset-11.json", "destination": "~/image-generation/toolset.json" }, + { + "type": "shell", + "inline": [ + "mv ~/image-generation/docs-gen ~/image-generation/software-report", + "mv ~/image-generation/xamarin-selector ~/image-generation/assets", + "mkdir ~/utils", + "mv ~/image-generation/helpers/confirm-identified-developers.scpt ~/utils", + "mv ~/image-generation/helpers/invoke-tests.sh ~/utils", + "mv ~/image-generation/helpers/utils.sh ~/utils", + "mv ~/image-generation/helpers/xamarin-utils.sh ~/utils" + ], + "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" + }, { "type": "shell", "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}", "scripts": [ - "./provision/core/xcode-clt.sh", - "./provision/core/homebrew.sh" + "./scripts/build/xcode-clt.sh", + "./scripts/build/homebrew.sh" ] }, { "type": "shell", "execute_command": "chmod +x {{ .Path }}; sudo {{ .Vars }} {{ .Path }}", "scripts": [ - "./provision/core/xcode-clt.sh", - "./provision/configuration/add-network-interface-detection.sh", - "./provision/configuration/autologin.sh", - "./provision/configuration/disable-auto-updates.sh", - "./provision/configuration/screensaver-off.sh", - "./provision/configuration/ntpconf.sh", - "./provision/configuration/max-files.sh", - "./provision/configuration/shell-change.sh" + "./scripts/build/xcode-clt.sh", + "./scripts/build/add-network-interface-detection.sh", + "./scripts/build/autologin.sh", + "./scripts/build/disable-auto-updates.sh", + "./scripts/build/screensaver-off.sh", + "./scripts/build/ntpconf.sh", + "./scripts/build/max-files.sh", + "./scripts/build/shell-change.sh" ], "environment_vars": [ "PASSWORD={{user `vm_password`}}", @@ -128,9 +126,9 @@ "type": "shell", "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}", "scripts": [ - "./provision/configuration/preimagedata.sh", - "./provision/configuration/configure-ssh.sh", - "./provision/configuration/configure-machine.sh" + "./scripts/build/preimagedata.sh", + "./scripts/build/configure-ssh.sh", + "./scripts/build/configure-machine.sh" ], "environment_vars": [ "IMAGE_VERSION={{user `build_id`}}", @@ -140,7 +138,7 @@ { "type": "shell", "execute_command": "chmod +x {{ .Path }}; sudo {{ .Vars }} {{ .Path }}", - "script": "./provision/core/reboot.sh", + "script": "./scripts/build/reboot.sh", "expect_disconnect": true }, { @@ -148,17 +146,17 @@ "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}", "pause_before": "30s", "scripts": [ - "./provision/core/open_windows_check.sh", - "./provision/core/powershell.sh", - "./provision/core/dotnet.sh", - "./provision/core/python.sh", - "./provision/core/azcopy.sh", - "./provision/core/openssl.sh", - "./provision/core/ruby.sh", - "./provision/core/rubygem.sh", - "./provision/core/git.sh", - "./provision/core/mongodb.sh", - "./provision/core/node.sh" + "./scripts/build/open_windows_check.sh", + "./scripts/build/powershell.sh", + "./scripts/build/dotnet.sh", + "./scripts/build/python.sh", + "./scripts/build/azcopy.sh", + "./scripts/build/openssl.sh", + "./scripts/build/ruby.sh", + "./scripts/build/rubygem.sh", + "./scripts/build/git.sh", + "./scripts/build/mongodb.sh", + "./scripts/build/node.sh" ], "environment_vars": [ "API_PAT={{user `github_api_pat`}}" @@ -167,7 +165,7 @@ { "type": "shell", "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} pwsh -f {{ .Path }}", - "script": "./provision/core/xcode.ps1", + "script": "./scripts/build/xcode.ps1", "environment_vars": [ "XCODE_INSTALL_STORAGE_URL={{user `xcode_install_storage_url`}}", "XCODE_INSTALL_SAS={{user `xcode_install_sas`}}" @@ -176,43 +174,43 @@ { "type": "shell", "execute_command": "chmod +x {{ .Path }}; sudo {{ .Vars }} {{ .Path }}", - "script": "./provision/core/reboot.sh", + "script": "./scripts/build/reboot.sh", "expect_disconnect": true }, { "type": "shell", "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}", "scripts": [ - "./provision/core/action-archive-cache.sh", - "./provision/core/commonutils.sh", - "./provision/core/llvm.sh", - "./provision/core/golang.sh", - "./provision/core/swiftlint.sh", - "./provision/core/openjdk.sh", - "./provision/core/php.sh", - "./provision/core/aws.sh", - "./provision/core/rust.sh", - "./provision/core/gcc.sh", - "./provision/core/haskell.sh", - "./provision/core/cocoapods.sh", - "./provision/core/android-toolsets.sh", - "./provision/core/xamarin.sh", - "./provision/core/vsmac.sh", - "./provision/core/nvm.sh", - "./provision/core/apache.sh", - "./provision/core/nginx.sh", - "./provision/core/postgresql.sh", - "./provision/core/audiodevice.sh", - "./provision/core/vcpkg.sh", - "./provision/core/miniconda.sh", - "./provision/core/safari.sh", - "./provision/core/chrome.sh", - "./provision/core/edge.sh", - "./provision/core/firefox.sh", - "./provision/core/pypy.sh", - "./provision/core/pipx-packages.sh", - "./provision/core/bicep.sh", - "./provision/core/codeql-bundle.sh" + "./scripts/build/action-archive-cache.sh", + "./scripts/build/commonutils.sh", + "./scripts/build/llvm.sh", + "./scripts/build/golang.sh", + "./scripts/build/swiftlint.sh", + "./scripts/build/openjdk.sh", + "./scripts/build/php.sh", + "./scripts/build/aws.sh", + "./scripts/build/rust.sh", + "./scripts/build/gcc.sh", + "./scripts/build/haskell.sh", + "./scripts/build/cocoapods.sh", + "./scripts/build/android-toolsets.sh", + "./scripts/build/xamarin.sh", + "./scripts/build/vsmac.sh", + "./scripts/build/nvm.sh", + "./scripts/build/apache.sh", + "./scripts/build/nginx.sh", + "./scripts/build/postgresql.sh", + "./scripts/build/audiodevice.sh", + "./scripts/build/vcpkg.sh", + "./scripts/build/miniconda.sh", + "./scripts/build/safari.sh", + "./scripts/build/chrome.sh", + "./scripts/build/edge.sh", + "./scripts/build/firefox.sh", + "./scripts/build/pypy.sh", + "./scripts/build/pipx-packages.sh", + "./scripts/build/bicep.sh", + "./scripts/build/codeql-bundle.sh" ], "environment_vars": [ "API_PAT={{user `github_api_pat`}}" @@ -222,15 +220,15 @@ "type": "shell", "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} pwsh -f {{ .Path }}", "scripts": [ - "./provision/core/toolset.ps1", - "./provision/core/configure-toolset.ps1" + "./scripts/build/toolset.ps1", + "./scripts/build/configure-toolset.ps1" ] }, { "type": "shell", "execute_command": "ruby {{ .Path }}", "scripts": [ - "./provision/core/delete-duplicate-sims.rb" + "./scripts/build/delete-duplicate-sims.rb" ] }, { @@ -250,8 +248,8 @@ "type": "shell", "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}", "scripts": [ - "./provision/configuration/configure-hostname.sh", - "./provision/configuration/finalize-vm.sh" + "./scripts/build/configure-hostname.sh", + "./scripts/build/finalize-vm.sh" ] } ] diff --git a/images/macos/templates/macOS-12.anka.pkr.hcl b/images/macos/templates/macOS-12.anka.pkr.hcl index 5c1755b007fe..1850c957c214 100644 --- a/images/macos/templates/macOS-12.anka.pkr.hcl +++ b/images/macos/templates/macOS-12.anka.pkr.hcl @@ -80,31 +80,27 @@ build { provisioner "file" { destination = "image-generation/" sources = [ - "./provision/assets", - "./tests", - "./software-report", - "./helpers" + "./assets/xamarin-selector", + "./scripts/tests", + "./scripts/docs-gen", + "./scripts/helpers" ] } provisioner "file" { - destination = "image-generation/software-report/" + destination = "image-generation/docs-gen/" source = "../../helpers/software-report-base" } provisioner "file" { destination = "image-generation/add-certificate.swift" - source = "./provision/configuration/add-certificate.swift" + source = "./assets/add-certificate.swift" } provisioner "file" { destination = ".bashrc" - source = "./provision/configuration/environment/bashrc" + source = "./assets/bashrc" } provisioner "file" { destination = ".bash_profile" - source = "./provision/configuration/environment/bashprofile" - } - provisioner "file" { - destination = "./" - source = "./provision/utils" + source = "./assets/bashprofile" } provisioner "shell" { inline = [ @@ -113,29 +109,41 @@ build { } provisioner "file" { destination = "bootstrap" - source = "./provision/bootstrap-provisioner/" + source = "./assets/bootstrap-provisioner/" } provisioner "file" { destination = "image-generation/toolset.json" source = "./toolsets/toolset-12.json" } + provisioner "shell" { + execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" + inline = [ + "mv ~/image-generation/docs-gen ~/image-generation/software-report", + "mv ~/image-generation/xamarin-selector ~/image-generation/assets", + "mkdir ~/utils", + "mv ~/image-generation/helpers/confirm-identified-developers.scpt ~/utils", + "mv ~/image-generation/helpers/invoke-tests.sh ~/utils", + "mv ~/image-generation/helpers/utils.sh ~/utils", + "mv ~/image-generation/helpers/xamarin-utils.sh ~/utils" + ] + } provisioner "shell" { scripts = [ - "./provision/core/xcode-clt.sh", - "./provision/core/homebrew.sh" + "./scripts/build/xcode-clt.sh", + "./scripts/build/homebrew.sh" ] execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" } provisioner "shell" { scripts = [ - "./provision/configuration/configure-tccdb-macos.sh", - "./provision/configuration/add-network-interface-detection.sh", - "./provision/configuration/autologin.sh", - "./provision/configuration/disable-auto-updates.sh", - "./provision/configuration/screensaver-off.sh", - "./provision/configuration/ntpconf.sh", - "./provision/configuration/max-files.sh", - "./provision/configuration/shell-change.sh" + "./scripts/build/configure-tccdb-macos.sh", + "./scripts/build/add-network-interface-detection.sh", + "./scripts/build/autologin.sh", + "./scripts/build/disable-auto-updates.sh", + "./scripts/build/screensaver-off.sh", + "./scripts/build/ntpconf.sh", + "./scripts/build/max-files.sh", + "./scripts/build/shell-change.sh" ] environment_vars = [ "PASSWORD=${var.vm_password}", @@ -145,9 +153,9 @@ build { } provisioner "shell" { scripts = [ - "./provision/configuration/preimagedata.sh", - "./provision/configuration/configure-ssh.sh", - "./provision/configuration/configure-machine.sh" + "./scripts/build/preimagedata.sh", + "./scripts/build/configure-ssh.sh", + "./scripts/build/configure-machine.sh" ] environment_vars = [ "IMAGE_VERSION=${var.build_id}", @@ -157,25 +165,25 @@ build { execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" } provisioner "shell" { - script = "./provision/core/reboot.sh" + script = "./scripts/build/reboot.sh" execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}" expect_disconnect = true } provisioner "shell" { pause_before = "30s" scripts = [ - "./provision/core/open_windows_check.sh", - "./provision/core/powershell.sh", - "./provision/core/dotnet.sh", - "./provision/core/python.sh", - "./provision/core/azcopy.sh", - "./provision/core/openssl.sh", - "./provision/core/ruby.sh", - "./provision/core/rubygem.sh", - "./provision/core/git.sh", - "./provision/core/mongodb.sh", - "./provision/core/node.sh", - "./provision/core/commonutils.sh" + "./scripts/build/open_windows_check.sh", + "./scripts/build/powershell.sh", + "./scripts/build/dotnet.sh", + "./scripts/build/python.sh", + "./scripts/build/azcopy.sh", + "./scripts/build/openssl.sh", + "./scripts/build/ruby.sh", + "./scripts/build/rubygem.sh", + "./scripts/build/git.sh", + "./scripts/build/mongodb.sh", + "./scripts/build/node.sh", + "./scripts/build/commonutils.sh" ] environment_vars = [ "API_PAT=${var.github_api_pat}", @@ -184,7 +192,7 @@ build { execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" } provisioner "shell" { - script = "./provision/core/xcode.ps1" + script = "./scripts/build/xcode.ps1" environment_vars = [ "XCODE_INSTALL_STORAGE_URL=${var.xcode_install_storage_url}", "XCODE_INSTALL_SAS=${var.xcode_install_sas}" @@ -192,41 +200,41 @@ build { execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} pwsh -f {{ .Path }}" } provisioner "shell" { - script = "./provision/core/reboot.sh" + script = "./scripts/build/reboot.sh" execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}" expect_disconnect = true } provisioner "shell" { scripts = [ - "./provision/core/action-archive-cache.sh", - "./provision/core/llvm.sh", - "./provision/core/golang.sh", - "./provision/core/swiftlint.sh", - "./provision/core/openjdk.sh", - "./provision/core/php.sh", - "./provision/core/aws.sh", - "./provision/core/rust.sh", - "./provision/core/gcc.sh", - "./provision/core/haskell.sh", - "./provision/core/cocoapods.sh", - "./provision/core/android-toolsets.sh", - "./provision/core/xamarin.sh", - "./provision/core/vsmac.sh", - "./provision/core/nvm.sh", - "./provision/core/apache.sh", - "./provision/core/nginx.sh", - "./provision/core/postgresql.sh", - "./provision/core/audiodevice.sh", - "./provision/core/vcpkg.sh", - "./provision/core/miniconda.sh", - "./provision/core/safari.sh", - "./provision/core/chrome.sh", - "./provision/core/edge.sh", - "./provision/core/firefox.sh", - "./provision/core/pypy.sh", - "./provision/core/pipx-packages.sh", - "./provision/core/bicep.sh", - "./provision/core/codeql-bundle.sh" + "./scripts/build/action-archive-cache.sh", + "./scripts/build/llvm.sh", + "./scripts/build/golang.sh", + "./scripts/build/swiftlint.sh", + "./scripts/build/openjdk.sh", + "./scripts/build/php.sh", + "./scripts/build/aws.sh", + "./scripts/build/rust.sh", + "./scripts/build/gcc.sh", + "./scripts/build/haskell.sh", + "./scripts/build/cocoapods.sh", + "./scripts/build/android-toolsets.sh", + "./scripts/build/xamarin.sh", + "./scripts/build/vsmac.sh", + "./scripts/build/nvm.sh", + "./scripts/build/apache.sh", + "./scripts/build/nginx.sh", + "./scripts/build/postgresql.sh", + "./scripts/build/audiodevice.sh", + "./scripts/build/vcpkg.sh", + "./scripts/build/miniconda.sh", + "./scripts/build/safari.sh", + "./scripts/build/chrome.sh", + "./scripts/build/edge.sh", + "./scripts/build/firefox.sh", + "./scripts/build/pypy.sh", + "./scripts/build/pipx-packages.sh", + "./scripts/build/bicep.sh", + "./scripts/build/codeql-bundle.sh" ] environment_vars = [ "API_PAT=${var.github_api_pat}" @@ -235,17 +243,17 @@ build { } provisioner "shell" { scripts = [ - "./provision/core/toolset.ps1", - "./provision/core/configure-toolset.ps1" + "./scripts/build/toolset.ps1", + "./scripts/build/configure-toolset.ps1" ] execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} pwsh -f {{ .Path }}" } provisioner "shell" { - script = "./provision/core/delete-duplicate-sims.rb" + script = "./scripts/build/delete-duplicate-sims.rb" execute_command = "source $HOME/.bash_profile; ruby {{ .Path }}" } provisioner "shell" { - script = "./provision/core/fix-xcode-simulators.ps1" + script = "./scripts/build/fix-xcode-simulators.ps1" execute_command = "chmod +x {{ .Path }}; {{ .Vars }} pwsh -f {{ .Path }}" } provisioner "shell" { @@ -262,8 +270,8 @@ build { } provisioner "shell" { scripts = [ - "./provision/configuration/configure-hostname.sh", - "./provision/configuration/finalize-vm.sh" + "./scripts/build/configure-hostname.sh", + "./scripts/build/finalize-vm.sh" ] execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" } diff --git a/images/macos/templates/macOS-12.json b/images/macos/templates/macOS-12.json index 587d4d6db2f5..ed9119b81306 100644 --- a/images/macos/templates/macOS-12.json +++ b/images/macos/templates/macOS-12.json @@ -45,52 +45,37 @@ }, { "type": "file", - "source": "./provision/assets", - "destination": "~/image-generation/" - }, - { - "type": "file", - "source": "./tests", - "destination": "~/image-generation/" - }, - { - "type": "file", - "source": "./software-report", + "sources": [ + "./assets/xamarin-selector", + "./scripts/tests", + "./scripts/docs-gen", + "./scripts/helpers" + ], "destination": "~/image-generation/" }, { "type": "file", "source": "../../helpers/software-report-base", - "destination": "~/image-generation/software-report/" + "destination": "~/image-generation/docs-gen/" }, { "type": "file", - "source": "./helpers", - "destination": "~/image-generation/" - }, - { - "type": "file", - "source": "./provision/configuration/add-certificate.swift", + "source": "./assets/add-certificate.swift", "destination": "~/image-generation/add-certificate.swift" }, { "type": "file", - "source": "./provision/configuration/environment/bashrc", + "source": "./assets/bashrc", "destination": "~/.bashrc" }, { "type": "file", - "source": "./provision/configuration/environment/bashprofile", + "source": "./assets/bashprofile", "destination": "~/.bash_profile" }, { "type": "file", - "source": "./provision/utils", - "destination": "~/" - }, - { - "type": "file", - "source": "./provision/bootstrap-provisioner", + "source": "./assets/bootstrap-provisioner", "destination": "~/bootstrap" }, { @@ -98,25 +83,38 @@ "source": "./toolsets/toolset-12.json", "destination": "~/image-generation/toolset.json" }, + { + "type": "shell", + "inline": [ + "mv ~/image-generation/docs-gen ~/image-generation/software-report", + "mv ~/image-generation/xamarin-selector ~/image-generation/assets", + "mkdir ~/utils", + "mv ~/image-generation/helpers/confirm-identified-developers.scpt ~/utils", + "mv ~/image-generation/helpers/invoke-tests.sh ~/utils", + "mv ~/image-generation/helpers/utils.sh ~/utils", + "mv ~/image-generation/helpers/xamarin-utils.sh ~/utils" + ], + "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" + }, { "type": "shell", "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}", "scripts": [ - "./provision/core/xcode-clt.sh", - "./provision/core/homebrew.sh" + "./scripts/build/xcode-clt.sh", + "./scripts/build/homebrew.sh" ] }, { "type": "shell", "execute_command": "chmod +x {{ .Path }}; sudo {{ .Vars }} {{ .Path }}", "scripts": [ - "./provision/configuration/add-network-interface-detection.sh", - "./provision/configuration/autologin.sh", - "./provision/configuration/disable-auto-updates.sh", - "./provision/configuration/screensaver-off.sh", - "./provision/configuration/ntpconf.sh", - "./provision/configuration/max-files.sh", - "./provision/configuration/shell-change.sh" + "./scripts/build/add-network-interface-detection.sh", + "./scripts/build/autologin.sh", + "./scripts/build/disable-auto-updates.sh", + "./scripts/build/screensaver-off.sh", + "./scripts/build/ntpconf.sh", + "./scripts/build/max-files.sh", + "./scripts/build/shell-change.sh" ], "environment_vars": [ "PASSWORD={{user `vm_password`}}", @@ -127,9 +125,9 @@ "type": "shell", "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}", "scripts": [ - "./provision/configuration/preimagedata.sh", - "./provision/configuration/configure-ssh.sh", - "./provision/configuration/configure-machine.sh" + "./scripts/build/preimagedata.sh", + "./scripts/build/configure-ssh.sh", + "./scripts/build/configure-machine.sh" ], "environment_vars": [ "IMAGE_VERSION={{user `build_id`}}", @@ -140,7 +138,7 @@ { "type": "shell", "execute_command": "chmod +x {{ .Path }}; sudo {{ .Vars }} {{ .Path }}", - "script": "./provision/core/reboot.sh", + "script": "./scripts/build/reboot.sh", "expect_disconnect": true }, { @@ -148,18 +146,18 @@ "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}", "pause_before": "30s", "scripts": [ - "./provision/core/open_windows_check.sh", - "./provision/core/powershell.sh", - "./provision/core/dotnet.sh", - "./provision/core/python.sh", - "./provision/core/azcopy.sh", - "./provision/core/openssl.sh", - "./provision/core/ruby.sh", - "./provision/core/rubygem.sh", - "./provision/core/git.sh", - "./provision/core/mongodb.sh", - "./provision/core/node.sh", - "./provision/core/commonutils.sh" + "./scripts/build/open_windows_check.sh", + "./scripts/build/powershell.sh", + "./scripts/build/dotnet.sh", + "./scripts/build/python.sh", + "./scripts/build/azcopy.sh", + "./scripts/build/openssl.sh", + "./scripts/build/ruby.sh", + "./scripts/build/rubygem.sh", + "./scripts/build/git.sh", + "./scripts/build/mongodb.sh", + "./scripts/build/node.sh", + "./scripts/build/commonutils.sh" ], "environment_vars": [ "API_PAT={{user `github_api_pat`}}", @@ -169,7 +167,7 @@ { "type": "shell", "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} pwsh -f {{ .Path }}", - "script": "./provision/core/xcode.ps1", + "script": "./scripts/build/xcode.ps1", "environment_vars": [ "XCODE_INSTALL_STORAGE_URL={{user `xcode_install_storage_url`}}", "XCODE_INSTALL_SAS={{user `xcode_install_sas`}}" @@ -178,42 +176,42 @@ { "type": "shell", "execute_command": "chmod +x {{ .Path }}; sudo {{ .Vars }} {{ .Path }}", - "script": "./provision/core/reboot.sh", + "script": "./scripts/build/reboot.sh", "expect_disconnect": true }, { "type": "shell", "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}", "scripts": [ - "./provision/core/action-archive-cache.sh", - "./provision/core/llvm.sh", - "./provision/core/golang.sh", - "./provision/core/swiftlint.sh", - "./provision/core/openjdk.sh", - "./provision/core/php.sh", - "./provision/core/aws.sh", - "./provision/core/rust.sh", - "./provision/core/gcc.sh", - "./provision/core/haskell.sh", - "./provision/core/cocoapods.sh", - "./provision/core/android-toolsets.sh", - "./provision/core/xamarin.sh", - "./provision/core/vsmac.sh", - "./provision/core/nvm.sh", - "./provision/core/apache.sh", - "./provision/core/nginx.sh", - "./provision/core/postgresql.sh", - "./provision/core/audiodevice.sh", - "./provision/core/vcpkg.sh", - "./provision/core/miniconda.sh", - "./provision/core/safari.sh", - "./provision/core/chrome.sh", - "./provision/core/edge.sh", - "./provision/core/firefox.sh", - "./provision/core/pypy.sh", - "./provision/core/pipx-packages.sh", - "./provision/core/bicep.sh", - "./provision/core/codeql-bundle.sh" + "./scripts/build/action-archive-cache.sh", + "./scripts/build/llvm.sh", + "./scripts/build/golang.sh", + "./scripts/build/swiftlint.sh", + "./scripts/build/openjdk.sh", + "./scripts/build/php.sh", + "./scripts/build/aws.sh", + "./scripts/build/rust.sh", + "./scripts/build/gcc.sh", + "./scripts/build/haskell.sh", + "./scripts/build/cocoapods.sh", + "./scripts/build/android-toolsets.sh", + "./scripts/build/xamarin.sh", + "./scripts/build/vsmac.sh", + "./scripts/build/nvm.sh", + "./scripts/build/apache.sh", + "./scripts/build/nginx.sh", + "./scripts/build/postgresql.sh", + "./scripts/build/audiodevice.sh", + "./scripts/build/vcpkg.sh", + "./scripts/build/miniconda.sh", + "./scripts/build/safari.sh", + "./scripts/build/chrome.sh", + "./scripts/build/edge.sh", + "./scripts/build/firefox.sh", + "./scripts/build/pypy.sh", + "./scripts/build/pipx-packages.sh", + "./scripts/build/bicep.sh", + "./scripts/build/codeql-bundle.sh" ], "environment_vars": [ "API_PAT={{user `github_api_pat`}}" @@ -223,21 +221,21 @@ "type": "shell", "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} pwsh -f {{ .Path }}", "scripts": [ - "./provision/core/toolset.ps1", - "./provision/core/configure-toolset.ps1" + "./scripts/build/toolset.ps1", + "./scripts/build/configure-toolset.ps1" ] }, { "type": "shell", "execute_command": "ruby {{ .Path }}", "scripts": [ - "./provision/core/delete-duplicate-sims.rb" + "./scripts/build/delete-duplicate-sims.rb" ] }, { "type": "shell", "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} pwsh -f {{ .Path }}", - "script": "./provision/core/fix-xcode-simulators.ps1" + "script": "./scripts/build/fix-xcode-simulators.ps1" }, { "type": "shell", @@ -256,8 +254,8 @@ "type": "shell", "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}", "scripts": [ - "./provision/configuration/configure-hostname.sh", - "./provision/configuration/finalize-vm.sh" + "./scripts/build/configure-hostname.sh", + "./scripts/build/finalize-vm.sh" ] } ] diff --git a/images/macos/templates/macOS-13.anka.pkr.hcl b/images/macos/templates/macOS-13.anka.pkr.hcl index 7756bba84c5e..3f8acc39f0f4 100644 --- a/images/macos/templates/macOS-13.anka.pkr.hcl +++ b/images/macos/templates/macOS-13.anka.pkr.hcl @@ -80,31 +80,27 @@ build { provisioner "file" { destination = "image-generation/" sources = [ - "./provision/assets", - "./tests", - "./software-report", - "./helpers" + "./assets/xamarin-selector", + "./scripts/tests", + "./scripts/docs-gen", + "./scripts/helpers" ] } provisioner "file" { - destination = "image-generation/software-report/" + destination = "image-generation/docs-gen/" source = "../../helpers/software-report-base" } provisioner "file" { destination = "image-generation/add-certificate.swift" - source = "./provision/configuration/add-certificate.swift" + source = "./assets/add-certificate.swift" } provisioner "file" { destination = ".bashrc" - source = "./provision/configuration/environment/bashrc" + source = "./assets/bashrc" } provisioner "file" { destination = ".bash_profile" - source = "./provision/configuration/environment/bashprofile" - } - provisioner "file" { - destination = "./" - source = "./provision/utils" + source = "./assets/bashprofile" } provisioner "shell" { inline = [ @@ -113,25 +109,37 @@ build { } provisioner "file" { destination = "bootstrap" - source = "./provision/bootstrap-provisioner/" + source = "./assets/bootstrap-provisioner/" } provisioner "file" { destination = "image-generation/toolset.json" source = "./toolsets/toolset-13.json" } + provisioner "shell" { + execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" + inline = [ + "mv ~/image-generation/docs-gen ~/image-generation/software-report", + "mv ~/image-generation/xamarin-selector ~/image-generation/assets", + "mkdir ~/utils", + "mv ~/image-generation/helpers/confirm-identified-developers.scpt ~/utils", + "mv ~/image-generation/helpers/invoke-tests.sh ~/utils", + "mv ~/image-generation/helpers/utils.sh ~/utils", + "mv ~/image-generation/helpers/xamarin-utils.sh ~/utils" + ] + } provisioner "shell" { scripts = [ - "./provision/core/xcode-clt.sh", - "./provision/core/homebrew.sh" + "./scripts/build/xcode-clt.sh", + "./scripts/build/homebrew.sh" ] execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" } provisioner "shell" { scripts = [ - "./provision/configuration/configure-tccdb-macos.sh", - "./provision/configuration/disable-auto-updates.sh", - "./provision/configuration/ntpconf.sh", - "./provision/configuration/shell-change.sh" + "./scripts/build/configure-tccdb-macos.sh", + "./scripts/build/disable-auto-updates.sh", + "./scripts/build/ntpconf.sh", + "./scripts/build/shell-change.sh" ] environment_vars = [ "PASSWORD=${var.vm_password}", @@ -141,9 +149,9 @@ build { } provisioner "shell" { scripts = [ - "./provision/configuration/preimagedata.sh", - "./provision/configuration/configure-ssh.sh", - "./provision/configuration/configure-machine.sh" + "./scripts/build/preimagedata.sh", + "./scripts/build/configure-ssh.sh", + "./scripts/build/configure-machine.sh" ] environment_vars = [ "IMAGE_VERSION=${var.build_id}", @@ -153,25 +161,25 @@ build { execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" } provisioner "shell" { - script = "./provision/core/reboot.sh" + script = "./scripts/build/reboot.sh" execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}" expect_disconnect = true } provisioner "shell" { pause_before = "30s" scripts = [ - "./provision/core/open_windows_check.sh", - "./provision/core/powershell.sh", - "./provision/core/mono.sh", - "./provision/core/dotnet.sh", - "./provision/core/python.sh", - "./provision/core/azcopy.sh", - "./provision/core/openssl.sh", - "./provision/core/ruby.sh", - "./provision/core/rubygem.sh", - "./provision/core/git.sh", - "./provision/core/node.sh", - "./provision/core/commonutils.sh" + "./scripts/build/open_windows_check.sh", + "./scripts/build/powershell.sh", + "./scripts/build/mono.sh", + "./scripts/build/dotnet.sh", + "./scripts/build/python.sh", + "./scripts/build/azcopy.sh", + "./scripts/build/openssl.sh", + "./scripts/build/ruby.sh", + "./scripts/build/rubygem.sh", + "./scripts/build/git.sh", + "./scripts/build/node.sh", + "./scripts/build/commonutils.sh" ] environment_vars = [ "API_PAT=${var.github_api_pat}", @@ -180,7 +188,7 @@ build { execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" } provisioner "shell" { - script = "./provision/core/xcode.ps1" + script = "./scripts/build/xcode.ps1" environment_vars = [ "XCODE_INSTALL_STORAGE_URL=${var.xcode_install_storage_url}", "XCODE_INSTALL_SAS=${var.xcode_install_sas}" @@ -188,31 +196,31 @@ build { execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} pwsh -f {{ .Path }}" } provisioner "shell" { - script = "./provision/core/reboot.sh" + script = "./scripts/build/reboot.sh" execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}" expect_disconnect = true } provisioner "shell" { scripts = [ - "./provision/core/action-archive-cache.sh", - "./provision/core/llvm.sh", - "./provision/core/swiftlint.sh", - "./provision/core/openjdk.sh", - "./provision/core/php.sh", - "./provision/core/aws.sh", - "./provision/core/rust.sh", - "./provision/core/gcc.sh", - "./provision/core/cocoapods.sh", - "./provision/core/android-toolsets.sh", - "./provision/core/apache.sh", - "./provision/core/vcpkg.sh", - "./provision/core/safari.sh", - "./provision/core/chrome.sh", - "./provision/core/edge.sh", - "./provision/core/firefox.sh", - "./provision/core/pypy.sh", - "./provision/core/bicep.sh", - "./provision/core/codeql-bundle.sh" + "./scripts/build/action-archive-cache.sh", + "./scripts/build/llvm.sh", + "./scripts/build/swiftlint.sh", + "./scripts/build/openjdk.sh", + "./scripts/build/php.sh", + "./scripts/build/aws.sh", + "./scripts/build/rust.sh", + "./scripts/build/gcc.sh", + "./scripts/build/cocoapods.sh", + "./scripts/build/android-toolsets.sh", + "./scripts/build/apache.sh", + "./scripts/build/vcpkg.sh", + "./scripts/build/safari.sh", + "./scripts/build/chrome.sh", + "./scripts/build/edge.sh", + "./scripts/build/firefox.sh", + "./scripts/build/pypy.sh", + "./scripts/build/bicep.sh", + "./scripts/build/codeql-bundle.sh" ] environment_vars = [ "API_PAT=${var.github_api_pat}" @@ -221,13 +229,13 @@ build { } provisioner "shell" { scripts = [ - "./provision/core/toolset.ps1", - "./provision/core/configure-toolset.ps1" + "./scripts/build/toolset.ps1", + "./scripts/build/configure-toolset.ps1" ] execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} pwsh -f {{ .Path }}" } provisioner "shell" { - script = "./provision/core/delete-duplicate-sims.rb" + script = "./scripts/build/delete-duplicate-sims.rb" execute_command = "source $HOME/.bash_profile; ruby {{ .Path }}" } provisioner "shell" { @@ -244,9 +252,9 @@ build { } provisioner "shell" { scripts = [ - "./provision/configuration/configure-hostname.sh", - "./provision/configuration/cleanup-brew.sh", - "./provision/configuration/finalize-vm.sh" + "./scripts/build/configure-hostname.sh", + "./scripts/build/cleanup-brew.sh", + "./scripts/build/finalize-vm.sh" ] execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" } diff --git a/images/macos/templates/macOS-13.arm64.anka.pkr.hcl b/images/macos/templates/macOS-13.arm64.anka.pkr.hcl index 4e273277c281..17ae11ec745f 100644 --- a/images/macos/templates/macOS-13.arm64.anka.pkr.hcl +++ b/images/macos/templates/macOS-13.arm64.anka.pkr.hcl @@ -81,31 +81,27 @@ build { provisioner "file" { destination = "image-generation/" sources = [ - "./provision/assets", - "./tests", - "./software-report", - "./helpers" + "./assets/xamarin-selector", + "./scripts/tests", + "./scripts/docs-gen", + "./scripts/helpers" ] } provisioner "file" { - destination = "image-generation/software-report/" + destination = "image-generation/docs-gen/" source = "../../helpers/software-report-base" } provisioner "file" { destination = "image-generation/add-certificate.swift" - source = "./provision/configuration/add-certificate.swift" + source = "./assets/add-certificate.swift" } provisioner "file" { destination = ".bashrc" - source = "./provision/configuration/environment/bashrc" + source = "./assets/bashrc" } provisioner "file" { destination = ".bash_profile" - source = "./provision/configuration/environment/bashprofile" - } - provisioner "file" { - destination = "./" - source = "./provision/utils" + source = "./assets/bashprofile" } provisioner "shell" { inline = [ @@ -114,26 +110,38 @@ build { } provisioner "file" { destination = "bootstrap" - source = "./provision/bootstrap-provisioner/" + source = "./assets/bootstrap-provisioner/" } provisioner "file" { destination = "image-generation/toolset.json" source = "./toolsets/toolset-13.json" } + provisioner "shell" { + execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" + inline = [ + "mv ~/image-generation/docs-gen ~/image-generation/software-report", + "mv ~/image-generation/xamarin-selector ~/image-generation/assets", + "mkdir ~/utils", + "mv ~/image-generation/helpers/confirm-identified-developers.scpt ~/utils", + "mv ~/image-generation/helpers/invoke-tests.sh ~/utils", + "mv ~/image-generation/helpers/utils.sh ~/utils", + "mv ~/image-generation/helpers/xamarin-utils.sh ~/utils" + ] + } provisioner "shell" { scripts = [ - "./provision/core/xcode-clt.sh", - "./provision/core/homebrew.sh", - "./provision/core/rosetta.sh" + "./scripts/build/xcode-clt.sh", + "./scripts/build/homebrew.sh", + "./scripts/build/rosetta.sh" ] execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" } provisioner "shell" { scripts = [ - "./provision/configuration/configure-tccdb-macos.sh", - "./provision/configuration/disable-auto-updates.sh", - "./provision/configuration/ntpconf.sh", - "./provision/configuration/shell-change.sh" + "./scripts/build/configure-tccdb-macos.sh", + "./scripts/build/disable-auto-updates.sh", + "./scripts/build/ntpconf.sh", + "./scripts/build/shell-change.sh" ] environment_vars = [ "PASSWORD=${var.vm_password}", @@ -143,9 +151,9 @@ build { } provisioner "shell" { scripts = [ - "./provision/configuration/preimagedata.sh", - "./provision/configuration/configure-ssh.sh", - "./provision/configuration/configure-machine.sh" + "./scripts/build/preimagedata.sh", + "./scripts/build/configure-ssh.sh", + "./scripts/build/configure-machine.sh" ] environment_vars = [ "IMAGE_VERSION=${var.build_id}", @@ -155,24 +163,24 @@ build { execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" } provisioner "shell" { - script = "./provision/core/reboot.sh" + script = "./scripts/build/reboot.sh" execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}" expect_disconnect = true } provisioner "shell" { pause_before = "30s" scripts = [ - "./provision/core/open_windows_check.sh", - "./provision/core/powershell.sh", - "./provision/core/mono.sh", - "./provision/core/dotnet.sh", - "./provision/core/azcopy.sh", - "./provision/core/openssl.sh", - "./provision/core/ruby.sh", - "./provision/core/rubygem.sh", - "./provision/core/git.sh", - "./provision/core/node.sh", - "./provision/core/commonutils.sh" + "./scripts/build/open_windows_check.sh", + "./scripts/build/powershell.sh", + "./scripts/build/mono.sh", + "./scripts/build/dotnet.sh", + "./scripts/build/azcopy.sh", + "./scripts/build/openssl.sh", + "./scripts/build/ruby.sh", + "./scripts/build/rubygem.sh", + "./scripts/build/git.sh", + "./scripts/build/node.sh", + "./scripts/build/commonutils.sh" ] environment_vars = [ "API_PAT=${var.github_api_pat}", @@ -181,7 +189,7 @@ build { execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" } provisioner "shell" { - script = "./provision/core/xcode.ps1" + script = "./scripts/build/xcode.ps1" environment_vars = [ "XCODE_INSTALL_STORAGE_URL=${var.xcode_install_storage_url}", "XCODE_INSTALL_SAS=${var.xcode_install_sas}" @@ -189,24 +197,24 @@ build { execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} pwsh -f {{ .Path }}" } provisioner "shell" { - script = "./provision/core/reboot.sh" + script = "./scripts/build/reboot.sh" execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}" expect_disconnect = true } provisioner "shell" { scripts = [ - "./provision/core/action-archive-cache.sh", - "./provision/core/llvm.sh", - "./provision/core/openjdk.sh", - "./provision/core/aws.sh", - "./provision/core/rust.sh", - "./provision/core/gcc.sh", - "./provision/core/cocoapods.sh", - "./provision/core/android-toolsets.sh", - "./provision/core/safari.sh", - "./provision/core/chrome.sh", - "./provision/core/bicep.sh", - "./provision/core/codeql-bundle.sh" + "./scripts/build/action-archive-cache.sh", + "./scripts/build/llvm.sh", + "./scripts/build/openjdk.sh", + "./scripts/build/aws.sh", + "./scripts/build/rust.sh", + "./scripts/build/gcc.sh", + "./scripts/build/cocoapods.sh", + "./scripts/build/android-toolsets.sh", + "./scripts/build/safari.sh", + "./scripts/build/chrome.sh", + "./scripts/build/bicep.sh", + "./scripts/build/codeql-bundle.sh" ] environment_vars = [ "API_PAT=${var.github_api_pat}" @@ -215,13 +223,13 @@ build { } provisioner "shell" { scripts = [ - "./provision/core/toolset.ps1", - "./provision/core/configure-toolset.ps1" + "./scripts/build/toolset.ps1", + "./scripts/build/configure-toolset.ps1" ] execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} pwsh -f {{ .Path }}" } provisioner "shell" { - script = "./provision/core/delete-duplicate-sims.rb" + script = "./scripts/build/delete-duplicate-sims.rb" execute_command = "source $HOME/.bash_profile; ruby {{ .Path }}" } provisioner "shell" { @@ -238,7 +246,7 @@ build { } provisioner "shell" { scripts = [ - "./provision/configuration/configure-hostname.sh" + "./scripts/build/configure-hostname.sh" ] execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" } diff --git a/images/macos/templates/macOS-14.anka.pkr.hcl b/images/macos/templates/macOS-14.anka.pkr.hcl index 8699a6f51d3f..907d881506df 100644 --- a/images/macos/templates/macOS-14.anka.pkr.hcl +++ b/images/macos/templates/macOS-14.anka.pkr.hcl @@ -80,31 +80,27 @@ build { provisioner "file" { destination = "image-generation/" sources = [ - "./provision/assets", - "./tests", - "./software-report", - "./helpers" + "./assets/xamarin-selector", + "./scripts/tests", + "./scripts/docs-gen", + "./scripts/helpers" ] } provisioner "file" { - destination = "image-generation/software-report/" + destination = "image-generation/docs-gen/" source = "../../helpers/software-report-base" } provisioner "file" { destination = "image-generation/add-certificate.swift" - source = "./provision/configuration/add-certificate.swift" + source = "./assets/add-certificate.swift" } provisioner "file" { destination = ".bashrc" - source = "./provision/configuration/environment/bashrc" + source = "./assets/bashrc" } provisioner "file" { destination = ".bash_profile" - source = "./provision/configuration/environment/bashprofile" - } - provisioner "file" { - destination = "./" - source = "./provision/utils" + source = "./assets/bashprofile" } provisioner "shell" { inline = [ @@ -113,25 +109,37 @@ build { } provisioner "file" { destination = "bootstrap" - source = "./provision/bootstrap-provisioner/" + source = "./assets/bootstrap-provisioner/" } provisioner "file" { destination = "image-generation/toolset.json" source = "./toolsets/toolset-14.json" } + provisioner "shell" { + execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" + inline = [ + "mv ~/image-generation/docs-gen ~/image-generation/software-report", + "mv ~/image-generation/xamarin-selector ~/image-generation/assets", + "mkdir ~/utils", + "mv ~/image-generation/helpers/confirm-identified-developers.scpt ~/utils", + "mv ~/image-generation/helpers/invoke-tests.sh ~/utils", + "mv ~/image-generation/helpers/utils.sh ~/utils", + "mv ~/image-generation/helpers/xamarin-utils.sh ~/utils" + ] + } provisioner "shell" { scripts = [ - "./provision/core/xcode-clt.sh", - "./provision/core/homebrew.sh" + "./scripts/build/xcode-clt.sh", + "./scripts/build/homebrew.sh" ] execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" } provisioner "shell" { scripts = [ - "./provision/configuration/configure-tccdb-macos.sh", - "./provision/configuration/disable-auto-updates.sh", - "./provision/configuration/ntpconf.sh", - "./provision/configuration/shell-change.sh" + "./scripts/build/configure-tccdb-macos.sh", + "./scripts/build/disable-auto-updates.sh", + "./scripts/build/ntpconf.sh", + "./scripts/build/shell-change.sh" ] environment_vars = [ "PASSWORD=${var.vm_password}", @@ -141,9 +149,9 @@ build { } provisioner "shell" { scripts = [ - "./provision/configuration/preimagedata.sh", - "./provision/configuration/configure-ssh.sh", - "./provision/configuration/configure-machine.sh" + "./scripts/build/preimagedata.sh", + "./scripts/build/configure-ssh.sh", + "./scripts/build/configure-machine.sh" ] environment_vars = [ "IMAGE_VERSION=${var.build_id}", @@ -153,25 +161,25 @@ build { execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" } provisioner "shell" { - script = "./provision/core/reboot.sh" + script = "./scripts/build/reboot.sh" execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}" expect_disconnect = true } provisioner "shell" { pause_before = "30s" scripts = [ - "./provision/core/open_windows_check.sh", - "./provision/core/powershell.sh", - "./provision/core/mono.sh", - "./provision/core/dotnet.sh", - "./provision/core/python.sh", - "./provision/core/azcopy.sh", - "./provision/core/openssl.sh", - "./provision/core/ruby.sh", - "./provision/core/rubygem.sh", - "./provision/core/git.sh", - "./provision/core/node.sh", - "./provision/core/commonutils.sh" + "./scripts/build/open_windows_check.sh", + "./scripts/build/powershell.sh", + "./scripts/build/mono.sh", + "./scripts/build/dotnet.sh", + "./scripts/build/python.sh", + "./scripts/build/azcopy.sh", + "./scripts/build/openssl.sh", + "./scripts/build/ruby.sh", + "./scripts/build/rubygem.sh", + "./scripts/build/git.sh", + "./scripts/build/node.sh", + "./scripts/build/commonutils.sh" ] environment_vars = [ "API_PAT=${var.github_api_pat}", @@ -180,7 +188,7 @@ build { execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" } provisioner "shell" { - script = "./provision/core/xcode.ps1" + script = "./scripts/build/xcode.ps1" environment_vars = [ "XCODE_INSTALL_STORAGE_URL=${var.xcode_install_storage_url}", "XCODE_INSTALL_SAS=${var.xcode_install_sas}" @@ -188,31 +196,31 @@ build { execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} pwsh -f {{ .Path }}" } provisioner "shell" { - script = "./provision/core/reboot.sh" + script = "./scripts/build/reboot.sh" execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}" expect_disconnect = true } provisioner "shell" { scripts = [ - "./provision/core/action-archive-cache.sh", - "./provision/core/llvm.sh", - "./provision/core/swiftlint.sh", - "./provision/core/openjdk.sh", - "./provision/core/php.sh", - "./provision/core/aws.sh", - "./provision/core/rust.sh", - "./provision/core/gcc.sh", - "./provision/core/cocoapods.sh", - "./provision/core/android-toolsets.sh", - "./provision/core/apache.sh", - "./provision/core/vcpkg.sh", - "./provision/core/safari.sh", - "./provision/core/chrome.sh", - "./provision/core/edge.sh", - "./provision/core/firefox.sh", - "./provision/core/pypy.sh", - "./provision/core/bicep.sh", - "./provision/core/codeql-bundle.sh" + "./scripts/build/action-archive-cache.sh", + "./scripts/build/llvm.sh", + "./scripts/build/swiftlint.sh", + "./scripts/build/openjdk.sh", + "./scripts/build/php.sh", + "./scripts/build/aws.sh", + "./scripts/build/rust.sh", + "./scripts/build/gcc.sh", + "./scripts/build/cocoapods.sh", + "./scripts/build/android-toolsets.sh", + "./scripts/build/apache.sh", + "./scripts/build/vcpkg.sh", + "./scripts/build/safari.sh", + "./scripts/build/chrome.sh", + "./scripts/build/edge.sh", + "./scripts/build/firefox.sh", + "./scripts/build/pypy.sh", + "./scripts/build/bicep.sh", + "./scripts/build/codeql-bundle.sh" ] environment_vars = [ "API_PAT=${var.github_api_pat}" @@ -220,7 +228,7 @@ build { execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" } provisioner "shell" { - script = "./provision/core/delete-duplicate-sims.rb" + script = "./scripts/build/delete-duplicate-sims.rb" execute_command = "source $HOME/.bash_profile; ruby {{ .Path }}" } provisioner "shell" { @@ -236,9 +244,9 @@ build { } provisioner "shell" { scripts = [ - "./provision/configuration/configure-hostname.sh", - "./provision/configuration/cleanup-brew.sh", - "./provision/configuration/finalize-vm.sh" + "./scripts/build/configure-hostname.sh", + "./scripts/build/cleanup-brew.sh", + "./scripts/build/finalize-vm.sh" ] execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" } diff --git a/images/macos/templates/macOS-14.arm64.anka.pkr.hcl b/images/macos/templates/macOS-14.arm64.anka.pkr.hcl index abb617c32180..0ca8115205a8 100644 --- a/images/macos/templates/macOS-14.arm64.anka.pkr.hcl +++ b/images/macos/templates/macOS-14.arm64.anka.pkr.hcl @@ -81,31 +81,27 @@ build { provisioner "file" { destination = "image-generation/" sources = [ - "./provision/assets", - "./tests", - "./software-report", - "./helpers" + "./assets/xamarin-selector", + "./scripts/tests", + "./scripts/docs-gen", + "./scripts/helpers" ] } provisioner "file" { - destination = "image-generation/software-report/" + destination = "image-generation/docs-gen/" source = "../../helpers/software-report-base" } provisioner "file" { destination = "image-generation/add-certificate.swift" - source = "./provision/configuration/add-certificate.swift" + source = "./assets/add-certificate.swift" } provisioner "file" { destination = ".bashrc" - source = "./provision/configuration/environment/bashrc" + source = "./assets/bashrc" } provisioner "file" { destination = ".bash_profile" - source = "./provision/configuration/environment/bashprofile" - } - provisioner "file" { - destination = "./" - source = "./provision/utils" + source = "./assets/bashprofile" } provisioner "shell" { inline = [ @@ -114,26 +110,38 @@ build { } provisioner "file" { destination = "bootstrap" - source = "./provision/bootstrap-provisioner/" + source = "./assets/bootstrap-provisioner/" } provisioner "file" { destination = "image-generation/toolset.json" source = "./toolsets/toolset-14.json" } + provisioner "shell" { + execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" + inline = [ + "mv ~/image-generation/docs-gen ~/image-generation/software-report", + "mv ~/image-generation/xamarin-selector ~/image-generation/assets", + "mkdir ~/utils", + "mv ~/image-generation/helpers/confirm-identified-developers.scpt ~/utils", + "mv ~/image-generation/helpers/invoke-tests.sh ~/utils", + "mv ~/image-generation/helpers/utils.sh ~/utils", + "mv ~/image-generation/helpers/xamarin-utils.sh ~/utils" + ] + } provisioner "shell" { scripts = [ - "./provision/core/xcode-clt.sh", - "./provision/core/homebrew.sh", - "./provision/core/rosetta.sh" + "./scripts/build/xcode-clt.sh", + "./scripts/build/homebrew.sh", + "./scripts/build/rosetta.sh" ] execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" } provisioner "shell" { scripts = [ - "./provision/configuration/configure-tccdb-macos.sh", - "./provision/configuration/disable-auto-updates.sh", - "./provision/configuration/ntpconf.sh", - "./provision/configuration/shell-change.sh" + "./scripts/build/configure-tccdb-macos.sh", + "./scripts/build/disable-auto-updates.sh", + "./scripts/build/ntpconf.sh", + "./scripts/build/shell-change.sh" ] environment_vars = [ "PASSWORD=${var.vm_password}", @@ -143,9 +151,9 @@ build { } provisioner "shell" { scripts = [ - "./provision/configuration/preimagedata.sh", - "./provision/configuration/configure-ssh.sh", - "./provision/configuration/configure-machine.sh" + "./scripts/build/preimagedata.sh", + "./scripts/build/configure-ssh.sh", + "./scripts/build/configure-machine.sh" ] environment_vars = [ "IMAGE_VERSION=${var.build_id}", @@ -155,24 +163,24 @@ build { execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" } provisioner "shell" { - script = "./provision/core/reboot.sh" + script = "./scripts/build/reboot.sh" execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}" expect_disconnect = true } provisioner "shell" { pause_before = "30s" scripts = [ - "./provision/core/open_windows_check.sh", - "./provision/core/powershell.sh", - "./provision/core/mono.sh", - "./provision/core/dotnet.sh", - "./provision/core/azcopy.sh", - "./provision/core/openssl.sh", - "./provision/core/ruby.sh", - "./provision/core/rubygem.sh", - "./provision/core/git.sh", - "./provision/core/node.sh", - "./provision/core/commonutils.sh" + "./scripts/build/open_windows_check.sh", + "./scripts/build/powershell.sh", + "./scripts/build/mono.sh", + "./scripts/build/dotnet.sh", + "./scripts/build/azcopy.sh", + "./scripts/build/openssl.sh", + "./scripts/build/ruby.sh", + "./scripts/build/rubygem.sh", + "./scripts/build/git.sh", + "./scripts/build/node.sh", + "./scripts/build/commonutils.sh" ] environment_vars = [ "API_PAT=${var.github_api_pat}", @@ -181,7 +189,7 @@ build { execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" } provisioner "shell" { - script = "./provision/core/xcode.ps1" + script = "./scripts/build/xcode.ps1" environment_vars = [ "XCODE_INSTALL_STORAGE_URL=${var.xcode_install_storage_url}", "XCODE_INSTALL_SAS=${var.xcode_install_sas}" @@ -189,24 +197,24 @@ build { execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} pwsh -f {{ .Path }}" } provisioner "shell" { - script = "./provision/core/reboot.sh" + script = "./scripts/build/reboot.sh" execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}" expect_disconnect = true } provisioner "shell" { scripts = [ - "./provision/core/action-archive-cache.sh", - "./provision/core/llvm.sh", - "./provision/core/openjdk.sh", - "./provision/core/aws.sh", - "./provision/core/rust.sh", - "./provision/core/gcc.sh", - "./provision/core/cocoapods.sh", - "./provision/core/android-toolsets.sh", - "./provision/core/safari.sh", - "./provision/core/chrome.sh", - "./provision/core/bicep.sh", - "./provision/core/codeql-bundle.sh" + "./scripts/build/action-archive-cache.sh", + "./scripts/build/llvm.sh", + "./scripts/build/openjdk.sh", + "./scripts/build/aws.sh", + "./scripts/build/rust.sh", + "./scripts/build/gcc.sh", + "./scripts/build/cocoapods.sh", + "./scripts/build/android-toolsets.sh", + "./scripts/build/safari.sh", + "./scripts/build/chrome.sh", + "./scripts/build/bicep.sh", + "./scripts/build/codeql-bundle.sh" ] environment_vars = [ "API_PAT=${var.github_api_pat}" @@ -214,7 +222,7 @@ build { execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" } provisioner "shell" { - script = "./provision/core/delete-duplicate-sims.rb" + script = "./scripts/build/delete-duplicate-sims.rb" execute_command = "source $HOME/.bash_profile; ruby {{ .Path }}" } provisioner "shell" { @@ -230,7 +238,7 @@ build { } provisioner "shell" { scripts = [ - "./provision/configuration/configure-hostname.sh" + "./scripts/build/configure-hostname.sh" ] execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" } From f9ce4b9de34b2a780d5fa8c231c3ef4936742119 Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Wed, 15 Nov 2023 13:55:37 +0100 Subject: [PATCH 2440/3485] Update artifact path for nightly CI (#8810) --- images.CI/linux-and-win/azure-pipelines/image-generation.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images.CI/linux-and-win/azure-pipelines/image-generation.yml b/images.CI/linux-and-win/azure-pipelines/image-generation.yml index c879b372b881..4815ff241344 100644 --- a/images.CI/linux-and-win/azure-pipelines/image-generation.yml +++ b/images.CI/linux-and-win/azure-pipelines/image-generation.yml @@ -114,9 +114,9 @@ jobs: targetType: 'inline' script: | $ImageType = "${{ parameters.image_type }}" - $rootDirectoryName = if ($ImageType.StartsWith("ubuntu")) { "linux" } else { "windows" } + $rootDirectoryName = if ($ImageType.StartsWith("ubuntu")) { "ubuntu" } else { "windows" } $rootDirectoryPath = Join-Path "images" $rootDirectoryName | Resolve-Path - + $readmePath = Join-Path $rootDirectoryPath "${{ parameters.image_readme_name }}" $softwareReportPath = Join-Path $rootDirectoryPath "software-report.json" From 820f3ffd4266e371bbb20e7aac421eb92f05e9c1 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Wed, 15 Nov 2023 14:17:10 +0100 Subject: [PATCH 2441/3485] [Ubuntu] Add dotnet 8 (#8807) --- images/ubuntu/toolsets/toolset-2004.json | 6 ++++-- images/ubuntu/toolsets/toolset-2204.json | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/images/ubuntu/toolsets/toolset-2004.json b/images/ubuntu/toolsets/toolset-2004.json index 5bf9da70db22..e57a7fcd9f7a 100644 --- a/images/ubuntu/toolsets/toolset-2004.json +++ b/images/ubuntu/toolsets/toolset-2004.json @@ -258,11 +258,13 @@ "dotnet": { "aptPackages": [ "dotnet-sdk-6.0", - "dotnet-sdk-7.0" + "dotnet-sdk-7.0", + "dotnet-sdk-8.0" ], "versions": [ "6.0", - "7.0" + "7.0", + "8.0" ], "tools": [ { "name": "nbgv", "test": "nbgv --version", "getversion" : "nbgv --version" } diff --git a/images/ubuntu/toolsets/toolset-2204.json b/images/ubuntu/toolsets/toolset-2204.json index f0817d329435..9648bcbed31c 100644 --- a/images/ubuntu/toolsets/toolset-2204.json +++ b/images/ubuntu/toolsets/toolset-2204.json @@ -247,11 +247,13 @@ "dotnet": { "aptPackages": [ "dotnet-sdk-6.0", - "dotnet-sdk-7.0" + "dotnet-sdk-7.0", + "dotnet-sdk-8.0" ], "versions": [ "6.0", - "7.0" + "7.0", + "8.0" ], "tools": [ { "name": "nbgv", "test": "nbgv --version", "getversion" : "nbgv --version" } From 562b6b9e90dfd8d81b8b174a0f095be92f18f09c Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Wed, 15 Nov 2023 18:26:17 +0100 Subject: [PATCH 2442/3485] [MacOS] Add dotnet 8 (#8806) --- images/macos/toolsets/toolset-11.json | 3 ++- images/macos/toolsets/toolset-12.json | 3 ++- images/macos/toolsets/toolset-13.json | 6 ++++-- images/macos/toolsets/toolset-14.json | 6 ++++-- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index 1f6b593c493f..cc587fa4a487 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -322,7 +322,8 @@ "x64": { "versions": [ "6.0", - "7.0" + "7.0", + "8.0" ] } } diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index b5f3d8f7f6ad..487645501068 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -309,7 +309,8 @@ "x64": { "versions": [ "6.0", - "7.0" + "7.0", + "8.0" ] } } diff --git a/images/macos/toolsets/toolset-13.json b/images/macos/toolsets/toolset-13.json index cceb73e1d081..82fad8291390 100644 --- a/images/macos/toolsets/toolset-13.json +++ b/images/macos/toolsets/toolset-13.json @@ -91,12 +91,14 @@ "arch":{ "x64": { "versions": [ - "7.0" + "7.0", + "8.0" ] }, "arm64": { "versions": [ - "7.0" + "7.0", + "8.0" ] } } diff --git a/images/macos/toolsets/toolset-14.json b/images/macos/toolsets/toolset-14.json index 7ef04cd6fa53..a45ccf5c344c 100644 --- a/images/macos/toolsets/toolset-14.json +++ b/images/macos/toolsets/toolset-14.json @@ -87,12 +87,14 @@ "arch":{ "x64": { "versions": [ - "7.0" + "7.0", + "8.0" ] }, "arm64": { "versions": [ - "7.0" + "7.0", + "8.0" ] } } From 3186c675da7fb80dfbd4e38598f03814c5f915dc Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Wed, 15 Nov 2023 18:36:30 +0100 Subject: [PATCH 2443/3485] [Windows] Update Windows Driver Kit version (#8792) --- images/windows/scripts/build/Install-WDK.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/windows/scripts/build/Install-WDK.ps1 b/images/windows/scripts/build/Install-WDK.ps1 index 345bbe541e5f..bd7114a633a2 100644 --- a/images/windows/scripts/build/Install-WDK.ps1 +++ b/images/windows/scripts/build/Install-WDK.ps1 @@ -6,9 +6,9 @@ # Requires Windows SDK with the same version number as the WDK if (Test-IsWin22) { # SDK available through Visual Studio - $wdkUrl = "https://go.microsoft.com/fwlink/?linkid=2196230" + $wdkUrl = "https://go.microsoft.com/fwlink/?linkid=2249371" $FilePath = "C:\Program Files (x86)\Windows Kits\10\Vsix\VS2022\*\WDK.vsix" - $wdkSignatureThumbprint = "DE2396BCEB7E3CD13BF3D370424A560F97CABDE7" + $wdkSignatureThumbprint = "7C94971221A799907BB45665663BBFD587BAC9F8" } elseif (Test-IsWin19) { $winSdkUrl = "https://go.microsoft.com/fwlink/?linkid=2173743" $wdkUrl = "https://go.microsoft.com/fwlink/?linkid=2166289" From f2a3cad69ab1fb682e7c9e1fc167f435388612b7 Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Wed, 15 Nov 2023 19:58:19 +0100 Subject: [PATCH 2444/3485] [ubuntu] Fix template names in GenerateResourcesAndImage.ps1 (#8815) --- helpers/GenerateResourcesAndImage.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/helpers/GenerateResourcesAndImage.ps1 b/helpers/GenerateResourcesAndImage.ps1 index 4d6be9f72ef3..8085567651c4 100644 --- a/helpers/GenerateResourcesAndImage.ps1 +++ b/helpers/GenerateResourcesAndImage.ps1 @@ -24,10 +24,10 @@ Function Get-PackerTemplatePath { $relativeTemplatePath = Join-Path "windows" "templates" "windows-2022.json" } ([ImageType]::Ubuntu2004) { - $relativeTemplatePath = Join-Path "ubuntu" "templates" "ubuntu-2004.json" + $relativeTemplatePath = Join-Path "ubuntu" "templates" "ubuntu-20.04.json" } ([ImageType]::Ubuntu2204) { - $relativeTemplatePath = Join-Path "ubuntu" "templates" "ubuntu-2204.pkr.hcl" + $relativeTemplatePath = Join-Path "ubuntu" "templates" "ubuntu-22.04.pkr.hcl" } ([ImageType]::UbuntuMinimal) { $relativeTemplatePath = Join-Path "ubuntu" "templates" "ubuntu-minimal.pkr.hcl" From f78a7baa80d6bef73f167601f4879496b55107cc Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Wed, 15 Nov 2023 22:21:38 +0100 Subject: [PATCH 2445/3485] [Ubuntu] Fix software report download directory (#8814) --- images/ubuntu/templates/ubuntu-20.04.json | 4 ++-- images/ubuntu/templates/ubuntu-22.04.pkr.hcl | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/images/ubuntu/templates/ubuntu-20.04.json b/images/ubuntu/templates/ubuntu-20.04.json index 2b5eda994334..2d00e0765983 100644 --- a/images/ubuntu/templates/ubuntu-20.04.json +++ b/images/ubuntu/templates/ubuntu-20.04.json @@ -350,13 +350,13 @@ { "type": "file", "source": "{{user `image_folder`}}/software-report.md", - "destination": "{{template_dir}}/Ubuntu2004-Readme.md", + "destination": "{{template_dir}}/../Ubuntu2004-Readme.md", "direction": "download" }, { "type": "file", "source": "{{user `image_folder`}}/software-report.json", - "destination": "{{template_dir}}/software-report.json", + "destination": "{{template_dir}}/../software-report.json", "direction": "download" }, { diff --git a/images/ubuntu/templates/ubuntu-22.04.pkr.hcl b/images/ubuntu/templates/ubuntu-22.04.pkr.hcl index 7269557755f4..ecf121d30853 100644 --- a/images/ubuntu/templates/ubuntu-22.04.pkr.hcl +++ b/images/ubuntu/templates/ubuntu-22.04.pkr.hcl @@ -390,13 +390,13 @@ build { } provisioner "file" { - destination = "${path.root}/Ubuntu2204-Readme.md" + destination = "${path.root}/../Ubuntu2204-Readme.md" direction = "download" source = "${var.image_folder}/software-report.md" } provisioner "file" { - destination = "${path.root}/software-report.json" + destination = "${path.root}/../software-report.json" direction = "download" source = "${var.image_folder}/software-report.json" } From 0263bdd53e651fade269b4ab852b2807c686f510 Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Thu, 16 Nov 2023 11:20:11 +0100 Subject: [PATCH 2446/3485] [Windows] Rename image build scripts (#8808) --- ...tialize-VM.ps1 => Configure-BaseImage.ps1} | 8 +-- ...erMode.ps1 => Configure-DeveloperMode.ps1} | 2 +- ...Debugger.ps1 => Configure-Diagnostics.ps1} | 7 ++- ....ps1 => Configure-DotnetSecureChannel.ps1} | 8 +-- ...geData.ps1 => Configure-ImageDataFile.ps1} | 12 ++--- .../{Finalize-VM.ps1 => Configure-System.ps1} | 46 ++++++++--------- .../build/Configure-SystemEnvironment.ps1 | 9 ++++ .../{Warmup-User.ps1 => Configure-User.ps1} | 4 +- ...irus.ps1 => Configure-WindowsDefender.ps1} | 5 ++ .../{Install-AWS.ps1 => Install-AWSTools.ps1} | 6 +-- ...hiveCache.ps1 => Install-ActionsCache.ps1} | 8 ++- .../scripts/build/Install-AzureCli.ps1 | 2 +- ...stall-Choco.ps1 => Install-Chocolatey.ps1} | 5 ++ .../build/Install-ChocolateyPackages.ps1 | 12 +++++ .../windows/scripts/build/Install-Chrome.ps1 | 2 +- .../scripts/build/Install-CommonUtils.ps1 | 8 --- ...-Compose.ps1 => Install-DockerCompose.ps1} | 0 ...-WinCred.ps1 => Install-DockerWinCred.ps1} | 0 .../scripts/build/Install-DotnetSDK.ps1 | 2 +- ...nstall-Edge.ps1 => Install-EdgeDriver.ps1} | 7 ++- .../windows/scripts/build/Install-Firefox.ps1 | 2 +- ...{Run-NGen.ps1 => Install-NativeImages.ps1} | 7 ++- ...Install-NodeLts.ps1 => Install-NodeJS.ps1} | 2 +- images/windows/scripts/build/Install-Pipx.ps1 | 28 +++++++++-- .../scripts/build/Install-PipxPackages.ps1 | 12 ----- .../build/Install-PowerShellModules.ps1 | 5 ++ ...es.ps1 => Install-PowershellAzModules.ps1} | 21 +++----- images/windows/scripts/build/Install-PyPy.ps1 | 2 +- images/windows/scripts/build/Install-Ruby.ps1 | 47 ++++++----------- .../scripts/build/Install-SQLOLEDBDriver.ps1 | 2 +- ...tall-Vsix.ps1 => Install-VSExtensions.ps1} | 4 +- ...nstall-VS.ps1 => Install-VisualStudio.ps1} | 17 +++---- ... => Install-WindowsUpdatesAfterReboot.ps1} | 4 +- images/windows/scripts/build/Install-Zstd.ps1 | 2 +- ...erator.ps1 => Generate-SoftwareReport.ps1} | 0 .../windows/scripts/helpers/ImageHelpers.psm1 | 7 +-- .../TestsHelpers.ps1 => tests/Helpers.psm1} | 29 +++++++---- images/windows/templates/windows-2019.json | 50 ++++++++++--------- images/windows/templates/windows-2022.json | 50 ++++++++++--------- 39 files changed, 234 insertions(+), 210 deletions(-) rename images/windows/scripts/build/{Initialize-VM.ps1 => Configure-BaseImage.ps1} (95%) rename images/windows/scripts/build/{Enable-DeveloperMode.ps1 => Configure-DeveloperMode.ps1} (94%) rename images/windows/scripts/build/{Disable-JITDebugger.ps1 => Configure-Diagnostics.ps1} (80%) rename images/windows/scripts/build/{Update-DotnetTLS.ps1 => Configure-DotnetSecureChannel.ps1} (77%) rename images/windows/scripts/build/{Update-ImageData.ps1 => Configure-ImageDataFile.ps1} (85%) rename images/windows/scripts/build/{Finalize-VM.ps1 => Configure-System.ps1} (90%) create mode 100644 images/windows/scripts/build/Configure-SystemEnvironment.ps1 rename images/windows/scripts/build/{Warmup-User.ps1 => Configure-User.ps1} (94%) rename images/windows/scripts/build/{Configure-Antivirus.ps1 => Configure-WindowsDefender.ps1} (85%) rename images/windows/scripts/build/{Install-AWS.ps1 => Install-AWSTools.ps1} (87%) rename images/windows/scripts/build/{Install-ActionArchiveCache.ps1 => Install-ActionsCache.ps1} (77%) rename images/windows/scripts/build/{Install-Choco.ps1 => Install-Chocolatey.ps1} (84%) create mode 100644 images/windows/scripts/build/Install-ChocolateyPackages.ps1 delete mode 100644 images/windows/scripts/build/Install-CommonUtils.ps1 rename images/windows/scripts/build/{Install-Docker-Compose.ps1 => Install-DockerCompose.ps1} (100%) rename images/windows/scripts/build/{Install-Docker-WinCred.ps1 => Install-DockerWinCred.ps1} (100%) rename images/windows/scripts/build/{Install-Edge.ps1 => Install-EdgeDriver.ps1} (94%) rename images/windows/scripts/build/{Run-NGen.ps1 => Install-NativeImages.ps1} (62%) rename images/windows/scripts/build/{Install-NodeLts.ps1 => Install-NodeJS.ps1} (97%) delete mode 100644 images/windows/scripts/build/Install-PipxPackages.ps1 rename images/windows/scripts/build/{Install-AzureModules.ps1 => Install-PowershellAzModules.ps1} (81%) rename images/windows/scripts/build/{Install-Vsix.ps1 => Install-VSExtensions.ps1} (92%) rename images/windows/scripts/build/{Install-VS.ps1 => Install-VisualStudio.ps1} (83%) rename images/windows/scripts/build/{Wait-WindowsUpdatesForInstall.ps1 => Install-WindowsUpdatesAfterReboot.ps1} (80%) rename images/windows/scripts/docs-gen/{SoftwareReport.Generator.ps1 => Generate-SoftwareReport.ps1} (100%) rename images/windows/scripts/{helpers/TestsHelpers.ps1 => tests/Helpers.psm1} (94%) diff --git a/images/windows/scripts/build/Initialize-VM.ps1 b/images/windows/scripts/build/Configure-BaseImage.ps1 similarity index 95% rename from images/windows/scripts/build/Initialize-VM.ps1 rename to images/windows/scripts/build/Configure-BaseImage.ps1 index b3d18a605e6b..514e55edb96c 100644 --- a/images/windows/scripts/build/Initialize-VM.ps1 +++ b/images/windows/scripts/build/Configure-BaseImage.ps1 @@ -1,6 +1,6 @@ ################################################################################ -## File: Initialize-VM.ps1 -## Desc: VM initialization script, machine level configuration +## File: Configure-BaseImage.ps1 +## Desc: Prepare the base image for software installation ################################################################################ function Disable-InternetExplorerESC { @@ -11,7 +11,7 @@ function Disable-InternetExplorerESC { $ieProcess = Get-Process -Name Explorer -ErrorAction SilentlyContinue - if ($ieProcess){ + if ($ieProcess) { Stop-Process -Name Explorer -Force -ErrorAction Continue } @@ -65,7 +65,7 @@ Write-Host "Disable IE ESC" Disable-InternetExplorerESC Write-Host "Setting local execution policy" -Set-ExecutionPolicy -ExecutionPolicy Unrestricted -Scope LocalMachine -ErrorAction Continue | Out-Null +Set-ExecutionPolicy -ExecutionPolicy Unrestricted -Scope LocalMachine -ErrorAction Continue | Out-Null Get-ExecutionPolicy -List Write-Host "Enable long path behavior" diff --git a/images/windows/scripts/build/Enable-DeveloperMode.ps1 b/images/windows/scripts/build/Configure-DeveloperMode.ps1 similarity index 94% rename from images/windows/scripts/build/Enable-DeveloperMode.ps1 rename to images/windows/scripts/build/Configure-DeveloperMode.ps1 index cd3e7294e362..28e6aa4f9225 100644 --- a/images/windows/scripts/build/Enable-DeveloperMode.ps1 +++ b/images/windows/scripts/build/Configure-DeveloperMode.ps1 @@ -1,5 +1,5 @@ ################################################################################ -## File: Enable-DeveloperMode.ps1 +## File: Configure-DeveloperMode.ps1 ## Desc: Enables Developer Mode by toggling registry setting. Developer Mode is required to enable certain tools (e.g. WinAppDriver). ################################################################################ diff --git a/images/windows/scripts/build/Disable-JITDebugger.ps1 b/images/windows/scripts/build/Configure-Diagnostics.ps1 similarity index 80% rename from images/windows/scripts/build/Disable-JITDebugger.ps1 rename to images/windows/scripts/build/Configure-Diagnostics.ps1 index b500a2946865..06677cd74921 100644 --- a/images/windows/scripts/build/Disable-JITDebugger.ps1 +++ b/images/windows/scripts/build/Configure-Diagnostics.ps1 @@ -1,3 +1,8 @@ +################################################################################ +## File: Configure-Diagnostics.ps1 +## Desc: Disables Just-In-Time Debugger and Windows Error Reporting +################################################################################ + Write-Host "Disable Just-In-Time Debugger" # Turn off Application Error Debugger @@ -13,4 +18,4 @@ New-ItemProperty -Path "HKLM:\SOFTWARE\Microsoft\Windows\Windows Error Reporting # Send all reports to the user's queue New-ItemProperty -Path "HKLM:\SOFTWARE\Microsoft\Windows\Windows Error Reporting" -Name ForceQueue -Value 1 -Type DWORD -Force # Default consent choice 1 - Always ask (default) -New-ItemProperty -Path "HKLM:\SOFTWARE\Microsoft\Windows\Windows Error Reporting\Consent" -Name DefaultConsent -Value 1 -Type DWORD -Force \ No newline at end of file +New-ItemProperty -Path "HKLM:\SOFTWARE\Microsoft\Windows\Windows Error Reporting\Consent" -Name DefaultConsent -Value 1 -Type DWORD -Force diff --git a/images/windows/scripts/build/Update-DotnetTLS.ps1 b/images/windows/scripts/build/Configure-DotnetSecureChannel.ps1 similarity index 77% rename from images/windows/scripts/build/Update-DotnetTLS.ps1 rename to images/windows/scripts/build/Configure-DotnetSecureChannel.ps1 index a00477d54afe..54732fed3042 100644 --- a/images/windows/scripts/build/Update-DotnetTLS.ps1 +++ b/images/windows/scripts/build/Configure-DotnetSecureChannel.ps1 @@ -1,16 +1,16 @@ ################################################################################ -## File: Update-DotnetTLS.ps1 -## Desc: Update DotNetFramework security protocol to TLS 1.2 +## File: Configure-DotnetSecureChannel.ps1 +## Desc: Configure .NET to use TLS 1.2 ################################################################################ $registryPath = "HKLM:\SOFTWARE\Microsoft\.NETFramework\v4.0.30319" $name = "SchUseStrongCrypto" $value = "1" -if(Test-Path $registryPath){ +if (Test-Path $registryPath) { Set-ItemProperty -Path $registryPath -Name $name -Value $value -Type DWORD } $registryPath = "HKLM:\SOFTWARE\Wow6432Node\Microsoft\.NETFramework\v4.0.30319" -if(Test-Path $registryPath){ +if (Test-Path $registryPath) { Set-ItemProperty -Path $registryPath -Name $name -Value $value -Type DWORD } diff --git a/images/windows/scripts/build/Update-ImageData.ps1 b/images/windows/scripts/build/Configure-ImageDataFile.ps1 similarity index 85% rename from images/windows/scripts/build/Update-ImageData.ps1 rename to images/windows/scripts/build/Configure-ImageDataFile.ps1 index fa5abbd9477f..d4ef6b06779d 100644 --- a/images/windows/scripts/build/Update-ImageData.ps1 +++ b/images/windows/scripts/build/Configure-ImageDataFile.ps1 @@ -1,3 +1,8 @@ +################################################################################ +## File: Configure-ImageDataFile.ps1 +## Desc: Creates a JSON file with information about the image +################################################################################ + $os = Get-CimInstance -ClassName Win32_OperatingSystem $caption = $os.Caption $osName = $caption.Substring(0, $caption.LastIndexOf(" ")) @@ -36,10 +41,3 @@ $json = @" "@ $json | Out-File -FilePath $imageDataFile - - -# Set static env vars -setx ImageVersion $env:IMAGE_VERSION /m -setx ImageOS $env:IMAGE_OS /m -setx AGENT_TOOLSDIRECTORY $env:AGENT_TOOLSDIRECTORY /m -setx ACTIONS_RUNNER_ACTION_ARCHIVE_CACHE $env:ACTIONS_RUNNER_ACTION_ARCHIVE_CACHE /m diff --git a/images/windows/scripts/build/Finalize-VM.ps1 b/images/windows/scripts/build/Configure-System.ps1 similarity index 90% rename from images/windows/scripts/build/Finalize-VM.ps1 rename to images/windows/scripts/build/Configure-System.ps1 index 8e64259e5412..853db47eaf6c 100644 --- a/images/windows/scripts/build/Finalize-VM.ps1 +++ b/images/windows/scripts/build/Configure-System.ps1 @@ -1,6 +1,6 @@ ################################################################################ -## File: Finalize-VM.ps1 -## Desc: Clean up temp folders after installs to save space +## File: Configure-System.ps1 +## Desc: Applies various configuration settings to the final image ################################################################################ Write-Host "Cleanup WinSxS" @@ -46,24 +46,24 @@ cmd /c "icacls $env:SystemRoot\Temp /grant Users:f /t /c /q 2>&1" | Out-Null # Registry settings $registrySettings = @( - @{Path = "HKLM:\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU"; Name = "AUOptions"; Value = 1; PropertyType = "DWORD"} - @{Path = "HKLM:\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU"; Name = "NoAutoUpdate"; Value = 1; PropertyType = "DWORD"} - @{Path = "HKLM:\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate"; Name = "DoNotConnectToWindowsUpdateInternetLocations"; Value = 1; PropertyType = "DWORD"} - @{Path = "HKLM:\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate"; Name = "DisableWindowsUpdateAccess"; Value = 1; PropertyType = "DWORD"} - @{Path = "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Device Metadata"; Name = "PreventDeviceMetadataFromNetwork"; Value = 1; PropertyType = "DWORD"} - @{Path = "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\DataCollection"; Name = "AllowTelemetry"; Value = 0; PropertyType = "DWORD"} - @{Path = "HKLM:\SOFTWARE\Policies\Microsoft\SQMClient\Windows"; Name = "CEIPEnable"; Value = 0; PropertyType = "DWORD"} - @{Path = "HKLM:\SOFTWARE\Policies\Microsoft\Windows\AppCompat"; Name = "AITEnable"; Value = 0; PropertyType = "DWORD"} - @{Path = "HKLM:\SOFTWARE\Policies\Microsoft\Windows\AppCompat"; Name = "DisableUAR"; Value = 1; PropertyType = "DWORD"} - @{Path = "HKLM:\Software\Policies\Microsoft\Windows\DataCollection"; Name = "AllowTelemetry"; Value = 0; PropertyType = "DWORD"} - @{Path = "HKLM:\SOFTWARE\Wow6432Node\Policies\Microsoft\Windows\DataCollection"; Name = "AllowTelemetry"; Value = 0; PropertyType = "DWORD"} - @{Path = "HKLM:\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Schedule\Maintenance"; Name = "MaintenanceDisabled"; Value = 1; PropertyType = "DWORD"} - @{Path = "HKLM:\SOFTWARE\Policies\Microsoft\MRT"; Name = "DontOfferThroughWUAU"; Value = 1; PropertyType = "DWORD"} - @{Path = "HKLM:\SOFTWARE\Policies\Microsoft\MRT"; Name = "DontReportInfectionInformation"; Value = 1; PropertyType = "DWORD"} - @{Path = "HKLM:\SOFTWARE\Policies\Microsoft\Windows\Windows Search"; Name = "AllowCortana"; Value = 0; PropertyType = "DWORD"} - @{Path = "HKLM:\SYSTEM\CurrentControlSet\Control"; Name = "ServicesPipeTimeout"; Value = 120000; PropertyType = "DWORD"} - @{Path = "HKLM:\SYSTEM\CurrentControlSet\Control\WMI\AutoLogger\AutoLogger-Diagtrack-Listener"; Name = "Start"; Value = 0; PropertyType = "DWORD"} - @{Path = "HKLM:\SYSTEM\CurrentControlSet\Control\WMI\AutoLogger\SQMLogger"; Name = "Start"; Value = 0; PropertyType = "DWORD"} + @{Path = "HKLM:\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU"; Name = "AUOptions"; Value = 1; PropertyType = "DWORD" } + @{Path = "HKLM:\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU"; Name = "NoAutoUpdate"; Value = 1; PropertyType = "DWORD" } + @{Path = "HKLM:\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate"; Name = "DoNotConnectToWindowsUpdateInternetLocations"; Value = 1; PropertyType = "DWORD" } + @{Path = "HKLM:\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate"; Name = "DisableWindowsUpdateAccess"; Value = 1; PropertyType = "DWORD" } + @{Path = "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Device Metadata"; Name = "PreventDeviceMetadataFromNetwork"; Value = 1; PropertyType = "DWORD" } + @{Path = "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\DataCollection"; Name = "AllowTelemetry"; Value = 0; PropertyType = "DWORD" } + @{Path = "HKLM:\SOFTWARE\Policies\Microsoft\SQMClient\Windows"; Name = "CEIPEnable"; Value = 0; PropertyType = "DWORD" } + @{Path = "HKLM:\SOFTWARE\Policies\Microsoft\Windows\AppCompat"; Name = "AITEnable"; Value = 0; PropertyType = "DWORD" } + @{Path = "HKLM:\SOFTWARE\Policies\Microsoft\Windows\AppCompat"; Name = "DisableUAR"; Value = 1; PropertyType = "DWORD" } + @{Path = "HKLM:\Software\Policies\Microsoft\Windows\DataCollection"; Name = "AllowTelemetry"; Value = 0; PropertyType = "DWORD" } + @{Path = "HKLM:\SOFTWARE\Wow6432Node\Policies\Microsoft\Windows\DataCollection"; Name = "AllowTelemetry"; Value = 0; PropertyType = "DWORD" } + @{Path = "HKLM:\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Schedule\Maintenance"; Name = "MaintenanceDisabled"; Value = 1; PropertyType = "DWORD" } + @{Path = "HKLM:\SOFTWARE\Policies\Microsoft\MRT"; Name = "DontOfferThroughWUAU"; Value = 1; PropertyType = "DWORD" } + @{Path = "HKLM:\SOFTWARE\Policies\Microsoft\MRT"; Name = "DontReportInfectionInformation"; Value = 1; PropertyType = "DWORD" } + @{Path = "HKLM:\SOFTWARE\Policies\Microsoft\Windows\Windows Search"; Name = "AllowCortana"; Value = 0; PropertyType = "DWORD" } + @{Path = "HKLM:\SYSTEM\CurrentControlSet\Control"; Name = "ServicesPipeTimeout"; Value = 120000; PropertyType = "DWORD" } + @{Path = "HKLM:\SYSTEM\CurrentControlSet\Control\WMI\AutoLogger\AutoLogger-Diagtrack-Listener"; Name = "Start"; Value = 0; PropertyType = "DWORD" } + @{Path = "HKLM:\SYSTEM\CurrentControlSet\Control\WMI\AutoLogger\SQMLogger"; Name = "Start"; Value = 0; PropertyType = "DWORD" } ) $registrySettings | ForEach-Object { @@ -139,9 +139,9 @@ $allTasksInTaskPath | ForEach-Object { } | Out-Null $disableTaskNames = @( - @{TaskPath = "\Microsoft\Windows\.NET Framework\"; TaskName = ".NET Framework NGEN v4.0.30319"} - @{TaskPath = "\Microsoft\Windows\.NET Framework\"; TaskName = ".NET Framework NGEN v4.0.30319 64"} - @{TaskPath = "\Microsoft\Windows\AppID\"; TaskName = "SmartScreenSpecific"} + @{TaskPath = "\Microsoft\Windows\.NET Framework\"; TaskName = ".NET Framework NGEN v4.0.30319" } + @{TaskPath = "\Microsoft\Windows\.NET Framework\"; TaskName = ".NET Framework NGEN v4.0.30319 64" } + @{TaskPath = "\Microsoft\Windows\AppID\"; TaskName = "SmartScreenSpecific" } ) $disableTaskNames | ForEach-Object { diff --git a/images/windows/scripts/build/Configure-SystemEnvironment.ps1 b/images/windows/scripts/build/Configure-SystemEnvironment.ps1 new file mode 100644 index 000000000000..f3745ae4000c --- /dev/null +++ b/images/windows/scripts/build/Configure-SystemEnvironment.ps1 @@ -0,0 +1,9 @@ +################################################################################ +## File: Configure-SystemEnvironment.ps1 +## Desc: Configures system environment variables +################################################################################ + +setx ImageVersion $env:IMAGE_VERSION /m +setx ImageOS $env:IMAGE_OS /m +setx AGENT_TOOLSDIRECTORY $env:AGENT_TOOLSDIRECTORY /m +setx ACTIONS_RUNNER_ACTION_ARCHIVE_CACHE $env:ACTIONS_RUNNER_ACTION_ARCHIVE_CACHE /m diff --git a/images/windows/scripts/build/Warmup-User.ps1 b/images/windows/scripts/build/Configure-User.ps1 similarity index 94% rename from images/windows/scripts/build/Warmup-User.ps1 rename to images/windows/scripts/build/Configure-User.ps1 index 4cb9808e66fb..967ea492366a 100644 --- a/images/windows/scripts/build/Warmup-User.ps1 +++ b/images/windows/scripts/build/Configure-User.ps1 @@ -1,5 +1,5 @@ ################################################################################ -## File: Warmup-User.ps1 +## File: Configure-User.ps1 ## Desc: Performs user part of warm up and moves data to C:\Users\Default ################################################################################ @@ -31,4 +31,4 @@ New-ItemProperty -Path $RegistryKeyPath -Name CacheType -PropertyType DWORD -Val reg.exe copy HKCU\Software\TortoiseSVN HKLM\DEFAULT\Software\TortoiseSVN /s reg.exe unload HKLM\DEFAULT -Write-Host "Warmup-User.ps1 - completed" +Write-Host "Configure-User.ps1 - completed" diff --git a/images/windows/scripts/build/Configure-Antivirus.ps1 b/images/windows/scripts/build/Configure-WindowsDefender.ps1 similarity index 85% rename from images/windows/scripts/build/Configure-Antivirus.ps1 rename to images/windows/scripts/build/Configure-WindowsDefender.ps1 index d4aed1985cc5..c84d47eb5a0f 100644 --- a/images/windows/scripts/build/Configure-Antivirus.ps1 +++ b/images/windows/scripts/build/Configure-WindowsDefender.ps1 @@ -1,3 +1,8 @@ +################################################################################ +## File: Configure-WindowsDefender.ps1 +## Desc: Disables Windows Defender +################################################################################ + Write-Host "Disable Windows Defender..." $avPreference = @( @{DisableArchiveScanning = $true} diff --git a/images/windows/scripts/build/Install-AWS.ps1 b/images/windows/scripts/build/Install-AWSTools.ps1 similarity index 87% rename from images/windows/scripts/build/Install-AWS.ps1 rename to images/windows/scripts/build/Install-AWSTools.ps1 index 347525439735..5fdd8f949487 100644 --- a/images/windows/scripts/build/Install-AWS.ps1 +++ b/images/windows/scripts/build/Install-AWSTools.ps1 @@ -1,6 +1,6 @@ ################################################################################ -## File: Install-AWS.ps1 -## Desc: Install AWS tools(AWS CLI, Session Manager Plugin for the AWS CLI, AWS SAM CLI) +## File: Install-AWSTools.ps1 +## Desc: Install AWS tools: CLI, Session Manager Plugin, AWS SAM CLI ## Supply chain security: AWS CLI - managed by package manager, Session Manager Plugin for the AWS CLI - missing, AWS SAM CLI - checksum validation ################################################################################ @@ -11,7 +11,7 @@ Choco-Install -PackageName awscli $sessionManagerName = "SessionManagerPluginSetup.exe" $sessionManagerUrl = "https://s3.amazonaws.com/session-manager-downloads/plugin/latest/windows/$sessionManagerName" $sessionManagerSignatureThumbprint = "FF457E5732E98A9F156E657F8CC7C4432507C3BB" -Install-Binary -Url $sessionManagerUrl -Name $sessionManagerName -ArgumentList ("/silent", "/install") -ExpectedSignature $sessionManagerSignatureThumbprint +Install-Binary -Url $sessionManagerUrl -Name $sessionManagerName -ArgumentList ("/silent", "/install") -ExpectedSignature $sessionManagerSignatureThumbprint $env:Path = $env:Path + ";$env:ProgramFiles\Amazon\SessionManagerPlugin\bin" # Install AWS SAM CLI diff --git a/images/windows/scripts/build/Install-ActionArchiveCache.ps1 b/images/windows/scripts/build/Install-ActionsCache.ps1 similarity index 77% rename from images/windows/scripts/build/Install-ActionArchiveCache.ps1 rename to images/windows/scripts/build/Install-ActionsCache.ps1 index 4f4bc00b55b8..05c41a5ff06c 100644 --- a/images/windows/scripts/build/Install-ActionArchiveCache.ps1 +++ b/images/windows/scripts/build/Install-ActionsCache.ps1 @@ -1,12 +1,10 @@ ################################################################################ -## File: Install-ActionArchiveCache.ps1 -## Desc: Download latest release from https://github.com/actions/action-versions -## and un-zip to C:\actionarchivecache +## File: Install-ActionsCache.ps1 +## Desc: Downloads latest release from https://github.com/actions/action-versions ## Maintainer: #actions-runtime and @TingluoHuang ################################################################################ -if (-not (Test-Path $env:ACTIONS_RUNNER_ACTION_ARCHIVE_CACHE)) -{ +if (-not (Test-Path $env:ACTIONS_RUNNER_ACTION_ARCHIVE_CACHE)) { Write-Host "Creating action archive cache folder" New-Item -ItemType Directory -Path $env:ACTIONS_RUNNER_ACTION_ARCHIVE_CACHE | Out-Null } diff --git a/images/windows/scripts/build/Install-AzureCli.ps1 b/images/windows/scripts/build/Install-AzureCli.ps1 index fe5c5ca3338f..a4ff45e08201 100644 --- a/images/windows/scripts/build/Install-AzureCli.ps1 +++ b/images/windows/scripts/build/Install-AzureCli.ps1 @@ -1,6 +1,6 @@ ################################################################################ ## File: Install-AzureCli.ps1 -## Desc: Install Azure CLI +## Desc: Install and warm-up Azure CLI ################################################################################ Write-Host 'Install the latest Azure CLI release' diff --git a/images/windows/scripts/build/Install-Choco.ps1 b/images/windows/scripts/build/Install-Chocolatey.ps1 similarity index 84% rename from images/windows/scripts/build/Install-Choco.ps1 rename to images/windows/scripts/build/Install-Chocolatey.ps1 index 889c350d3086..afd481b8aea5 100644 --- a/images/windows/scripts/build/Install-Choco.ps1 +++ b/images/windows/scripts/build/Install-Chocolatey.ps1 @@ -1,3 +1,8 @@ +################################################################################ +## File: Install-Chocolatey.ps1 +## Desc: Install Chocolatey package manager +################################################################################ + Write-Host "Set TLS1.2" [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor "Tls12" diff --git a/images/windows/scripts/build/Install-ChocolateyPackages.ps1 b/images/windows/scripts/build/Install-ChocolateyPackages.ps1 new file mode 100644 index 000000000000..3d2fbdc5613f --- /dev/null +++ b/images/windows/scripts/build/Install-ChocolateyPackages.ps1 @@ -0,0 +1,12 @@ +################################################################################ +## File: Install-ChocolateyPackages.ps1 +## Desc: Install common Chocolatey packages +################################################################################ + +$commonPackages = (Get-ToolsetContent).choco.common_packages + +foreach ($package in $commonPackages) { + Choco-Install -PackageName $package.name -ArgumentList $package.args +} + +Invoke-PesterTests -TestFile "ChocoPackages" diff --git a/images/windows/scripts/build/Install-Chrome.ps1 b/images/windows/scripts/build/Install-Chrome.ps1 index 6ae1473e33aa..7ef3649199e5 100644 --- a/images/windows/scripts/build/Install-Chrome.ps1 +++ b/images/windows/scripts/build/Install-Chrome.ps1 @@ -1,6 +1,6 @@ ################################################################################ ## File: Install-Chrome.ps1 -## Desc: Install Google Chrome +## Desc: Install Google Chrome browser and Chrome WebDriver ################################################################################ # Download and install latest Chrome browser diff --git a/images/windows/scripts/build/Install-CommonUtils.ps1 b/images/windows/scripts/build/Install-CommonUtils.ps1 deleted file mode 100644 index 815d04f3ebdf..000000000000 --- a/images/windows/scripts/build/Install-CommonUtils.ps1 +++ /dev/null @@ -1,8 +0,0 @@ -$commonPackages = (Get-ToolsetContent).choco.common_packages - -foreach ($package in $commonPackages) -{ - Choco-Install -PackageName $package.name -ArgumentList $package.args -} - -Invoke-PesterTests -TestFile "ChocoPackages" \ No newline at end of file diff --git a/images/windows/scripts/build/Install-Docker-Compose.ps1 b/images/windows/scripts/build/Install-DockerCompose.ps1 similarity index 100% rename from images/windows/scripts/build/Install-Docker-Compose.ps1 rename to images/windows/scripts/build/Install-DockerCompose.ps1 diff --git a/images/windows/scripts/build/Install-Docker-WinCred.ps1 b/images/windows/scripts/build/Install-DockerWinCred.ps1 similarity index 100% rename from images/windows/scripts/build/Install-Docker-WinCred.ps1 rename to images/windows/scripts/build/Install-DockerWinCred.ps1 diff --git a/images/windows/scripts/build/Install-DotnetSDK.ps1 b/images/windows/scripts/build/Install-DotnetSDK.ps1 index b1afdff46f87..b1f7abeaa4ca 100644 --- a/images/windows/scripts/build/Install-DotnetSDK.ps1 +++ b/images/windows/scripts/build/Install-DotnetSDK.ps1 @@ -1,7 +1,7 @@ ################################################################################ ## File: Install-DotnetSDK.ps1 ## Desc: Install all released versions of the dotnet sdk and populate package -## cache. Should run after VS and Node +## cache. Should run after VS and Node ## Supply chain security: checksum validation ################################################################################ diff --git a/images/windows/scripts/build/Install-Edge.ps1 b/images/windows/scripts/build/Install-EdgeDriver.ps1 similarity index 94% rename from images/windows/scripts/build/Install-Edge.ps1 rename to images/windows/scripts/build/Install-EdgeDriver.ps1 index 57ba8940e560..ff6af450d763 100644 --- a/images/windows/scripts/build/Install-Edge.ps1 +++ b/images/windows/scripts/build/Install-EdgeDriver.ps1 @@ -1,6 +1,6 @@ ################################################################################ -## File: Install-Edge.ps1 -## Desc: Configure Edge browser and install Edge WebDriver +## File: Install-EdgeDriver.ps1 +## Desc: Install Edge WebDriver and configure Microsoft Edge ################################################################################ # Disable Edge auto-updates @@ -9,8 +9,7 @@ Rename-Item -Path "C:\Program Files (x86)\Microsoft\EdgeUpdate\MicrosoftEdgeUpda # Install Microsoft Edge WebDriver Write-Host "Install Edge WebDriver..." $EdgeDriverPath = "$($env:SystemDrive)\SeleniumWebDrivers\EdgeDriver" -if (-not (Test-Path -Path $EdgeDriverPath)) -{ +if (-not (Test-Path -Path $EdgeDriverPath)) { New-Item -Path $EdgeDriverPath -ItemType Directory -Force } diff --git a/images/windows/scripts/build/Install-Firefox.ps1 b/images/windows/scripts/build/Install-Firefox.ps1 index a100b239e751..ea23326783e5 100644 --- a/images/windows/scripts/build/Install-Firefox.ps1 +++ b/images/windows/scripts/build/Install-Firefox.ps1 @@ -1,6 +1,6 @@ ################################################################################ ## File: Install-Firefox.ps1 -## Desc: Install Mozilla Firefox +## Desc: Install Mozilla Firefox browser and Gecko WebDriver ## Supply chain security: Firefox browser - checksum validation ################################################################################ diff --git a/images/windows/scripts/build/Run-NGen.ps1 b/images/windows/scripts/build/Install-NativeImages.ps1 similarity index 62% rename from images/windows/scripts/build/Run-NGen.ps1 rename to images/windows/scripts/build/Install-NativeImages.ps1 index 4ecddd3cab04..7a11c4953e1d 100644 --- a/images/windows/scripts/build/Run-NGen.ps1 +++ b/images/windows/scripts/build/Install-NativeImages.ps1 @@ -1,6 +1,11 @@ +################################################################################ +## File: Install-NativeImages.ps1 +## Desc: Generate and install native images for .NET assemblies +################################################################################ + Write-Host "NGen: Microsoft.PowerShell.Utility.Activities" $null = & $env:SystemRoot\Microsoft.NET\Framework64\v4.0.30319\ngen.exe install "Microsoft.PowerShell.Utility.Activities, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" Write-Host "NGen: Framework64" $null = & $env:SystemRoot\Microsoft.NET\Framework64\v4.0.30319\ngen.exe update Write-Host "NGen: Framework" -$null = & $env:SystemRoot\Microsoft.NET\Framework\v4.0.30319\ngen.exe update \ No newline at end of file +$null = & $env:SystemRoot\Microsoft.NET\Framework\v4.0.30319\ngen.exe update diff --git a/images/windows/scripts/build/Install-NodeLts.ps1 b/images/windows/scripts/build/Install-NodeJS.ps1 similarity index 97% rename from images/windows/scripts/build/Install-NodeLts.ps1 rename to images/windows/scripts/build/Install-NodeJS.ps1 index 18ba83b7d00e..37840ad31a43 100644 --- a/images/windows/scripts/build/Install-NodeLts.ps1 +++ b/images/windows/scripts/build/Install-NodeJS.ps1 @@ -1,5 +1,5 @@ ################################################################################ -## File: Install-NodeLts.ps1 +## File: Install-NodeJS.ps1 ## Desc: Install nodejs-lts and other common node tools. ## Must run after python is configured ################################################################################ diff --git a/images/windows/scripts/build/Install-Pipx.ps1 b/images/windows/scripts/build/Install-Pipx.ps1 index b3e85f4f2b84..e4babf9901c1 100644 --- a/images/windows/scripts/build/Install-Pipx.ps1 +++ b/images/windows/scripts/build/Install-Pipx.ps1 @@ -1,14 +1,32 @@ -# Set custom directorys for pipx +################################################################################ +## File: Install-Pipx.ps1 +## Desc: Install pipx and pipx packages +################################################################################ + +Write-Host "Installing pipx..." $env:PIPX_BIN_DIR = "${env:ProgramFiles(x86)}\pipx_bin" $env:PIPX_HOME = "${env:ProgramFiles(x86)}\pipx" -# Install pipx pip install pipx -# Set environment variables Add-MachinePathItem "${env:PIPX_BIN_DIR}" Set-SystemVariable -SystemVariable PIPX_BIN_DIR -Value $env:PIPX_BIN_DIR Set-SystemVariable -SystemVariable PIPX_HOME -Value $env:PIPX_HOME -# Test pipx -Invoke-PesterTests -TestFile "Tools" -TestName "Pipx" \ No newline at end of file +Invoke-PesterTests -TestFile "Tools" -TestName "Pipx" + +Write-Host "Installing pipx packages..." + +$pipxToolset = (Get-ToolsetContent).pipx +foreach ($tool in $pipxToolset) { + if ($tool.python) { + $pythonPath = (Get-Item -Path "${env:AGENT_TOOLSDIRECTORY}\Python\${tool.python}.*\x64\python-${tool.python}*").FullName + Write-Host "Install ${tool.package} into python ${tool.python}" + pipx install $tool.package --python $pythonPath + } else { + Write-Host "Install ${tool.package} into default python" + pipx install $tool.package + } +} + +Invoke-PesterTests -TestFile "PipxPackages" diff --git a/images/windows/scripts/build/Install-PipxPackages.ps1 b/images/windows/scripts/build/Install-PipxPackages.ps1 deleted file mode 100644 index c4a48ec93ac4..000000000000 --- a/images/windows/scripts/build/Install-PipxPackages.ps1 +++ /dev/null @@ -1,12 +0,0 @@ -$pipxToolset = (Get-ToolsetContent).pipx -foreach($tool in $pipxToolset) { - if ($tool.python) { - $pythonPath = (Get-Item -Path "${env:AGENT_TOOLSDIRECTORY}\Python\${tool.python}.*\x64\python-${tool.python}*").FullName - Write-Host "Install ${tool.package} into python ${tool.python}" - pipx install $tool.package --python $pythonPath - } else { - Write-Host "Install ${tool.package} into default python" - pipx install $tool.package - } -} -Invoke-PesterTests -TestFile "PipxPackages" \ No newline at end of file diff --git a/images/windows/scripts/build/Install-PowerShellModules.ps1 b/images/windows/scripts/build/Install-PowerShellModules.ps1 index ec8b45e1c848..130c63db6cfc 100644 --- a/images/windows/scripts/build/Install-PowerShellModules.ps1 +++ b/images/windows/scripts/build/Install-PowerShellModules.ps1 @@ -1,3 +1,8 @@ +################################################################################ +## File: Install-PowershellModules.ps1 +## Desc: Install common PowerShell modules +################################################################################ + # Set TLS1.2 [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor "Tls12" diff --git a/images/windows/scripts/build/Install-AzureModules.ps1 b/images/windows/scripts/build/Install-PowershellAzModules.ps1 similarity index 81% rename from images/windows/scripts/build/Install-AzureModules.ps1 rename to images/windows/scripts/build/Install-PowershellAzModules.ps1 index 183fcb7d3697..d297cddf1293 100644 --- a/images/windows/scripts/build/Install-AzureModules.ps1 +++ b/images/windows/scripts/build/Install-PowershellAzModules.ps1 @@ -1,13 +1,12 @@ ################################################################################ -## File: Install-AzureModules.ps1 -## Desc: PowerShell modules used by AzureFileCopy@4, AzureFileCopy@5, AzurePowerShell@4, AzurePowerShell@5 tasks +## File: Install-PowershellAzModules.ps1 +## Desc: Install PowerShell modules used by AzureFileCopy@4, AzureFileCopy@5, AzurePowerShell@4, AzurePowerShell@5 tasks ## Supply chain security: package manager ################################################################################ # The correct Modules need to be saved in C:\Modules $installPSModulePath = "C:\\Modules" -if (-not (Test-Path -LiteralPath $installPSModulePath)) -{ +if (-not (Test-Path -LiteralPath $installPSModulePath)) { Write-Host "Creating ${installPSModulePath} folder to store PowerShell Azure modules..." $null = New-Item -Path $installPSModulePath -ItemType Directory } @@ -17,28 +16,24 @@ $modules = (Get-ToolsetContent).azureModules $psModuleMachinePath = "" -foreach ($module in $modules) -{ +foreach ($module in $modules) { $moduleName = $module.name Write-Host "Installing ${moduleName} to the ${installPSModulePath} path..." - foreach ($version in $module.versions) - { + foreach ($version in $module.versions) { $modulePath = Join-Path -Path $installPSModulePath -ChildPath "${moduleName}_${version}" Write-Host " - $version [$modulePath]" Save-Module -Path $modulePath -Name $moduleName -RequiredVersion $version -Force -ErrorAction Stop } - foreach ($version in $module.zip_versions) - { + foreach ($version in $module.zip_versions) { $modulePath = Join-Path -Path $installPSModulePath -ChildPath "${moduleName}_${version}" Save-Module -Path $modulePath -Name $moduleName -RequiredVersion $version -Force -ErrorAction Stop Compress-Archive -Path $modulePath -DestinationPath "${modulePath}.zip" Remove-Item $modulePath -Recurse -Force } # Append default tool version to machine path - if ($null -ne $module.default) - { + if ($null -ne $module.default) { $defaultVersion = $module.default Write-Host "Use ${moduleName} ${defaultVersion} as default version..." @@ -50,4 +45,4 @@ foreach ($module in $modules) $psModuleMachinePath += $env:PSModulePath [Environment]::SetEnvironmentVariable("PSModulePath", $psModuleMachinePath, "Machine") -Invoke-PesterTests -TestFile "PowerShellAzModules" -TestName "AzureModules" \ No newline at end of file +Invoke-PesterTests -TestFile "PowerShellAzModules" -TestName "AzureModules" diff --git a/images/windows/scripts/build/Install-PyPy.ps1 b/images/windows/scripts/build/Install-PyPy.ps1 index 69e3c32c6e5b..8fdf513e41ac 100644 --- a/images/windows/scripts/build/Install-PyPy.ps1 +++ b/images/windows/scripts/build/Install-PyPy.ps1 @@ -1,9 +1,9 @@ ################################################################################ ## File: Install-PyPy.ps1 -## Team: CI-Build ## Desc: Install PyPy ## Supply chain security: checksum validation ################################################################################ + function Install-PyPy { param( diff --git a/images/windows/scripts/build/Install-Ruby.ps1 b/images/windows/scripts/build/Install-Ruby.ps1 index 41f52c5841f0..5396edf667ce 100644 --- a/images/windows/scripts/build/Install-Ruby.ps1 +++ b/images/windows/scripts/build/Install-Ruby.ps1 @@ -1,10 +1,9 @@ ################################################################################ ## File: Install-Ruby.ps1 -## Desc: Install rubyinstaller2 +## Desc: Install Ruby using the RubyInstaller2 package and set the default Ruby version ################################################################################ -function Get-RubyVersions -{ +function Get-RubyVersions { param ( [System.String] $Arch = "x64", [System.String] $Extension = "7z", @@ -12,24 +11,20 @@ function Get-RubyVersions ) $uri = "https://api.github.com/repos/oneclick/rubyinstaller2/releases?per_page=$ReleasesAmount" - try - { + try { $versionLists = @{} $assets = (Invoke-RestMethod -Uri $uri).Where{ -not $_.prerelease }.assets $7zArchives = $assets.Where{ $_.name.EndsWith("$Arch.$Extension") } $majorMinorGroups = $7zArchives | Group-Object { $_.name.Replace("rubyinstaller-", "").Substring(0, 3) } - foreach($majorMinorGroup in $majorMinorGroups) - { + foreach ($majorMinorGroup in $majorMinorGroups) { $group = $majorMinorGroup.Group - $sortVersions = $group | Sort-Object {[Version]$_.name.Replace("rubyinstaller-", "").Replace("-$Arch.$Extension","").Replace("-",".")} + $sortVersions = $group | Sort-Object { [Version]$_.name.Replace("rubyinstaller-", "").Replace("-$Arch.$Extension", "").Replace("-", ".") } $latestVersion = $sortVersions | Select-Object -Last 1 $versionLists[$majorMinorGroup.Name] = $latestVersion.browser_download_url } return $versionLists - } - catch - { + } catch { Write-Host "Unable to send request to the '$uri'. Error: '$_'" exit 1 } @@ -37,8 +32,7 @@ function Get-RubyVersions # Most of this logic is from # https://github.com/ruby/setup-ruby/blob/master/windows.js -function Install-Ruby -{ +function Install-Ruby { param( [String]$PackagePath, [String]$Architecture = "x64" @@ -46,8 +40,7 @@ function Install-Ruby # Create Ruby toolcache folder $rubyToolcachePath = Join-Path -Path $env:AGENT_TOOLSDIRECTORY -ChildPath "Ruby" - if (-not (Test-Path $rubyToolcachePath)) - { + if (-not (Test-Path $rubyToolcachePath)) { Write-Host "Creating Ruby toolcache folder" New-Item -ItemType Directory -Path $rubyToolcachePath | Out-Null } @@ -60,8 +53,7 @@ function Install-Ruby # Get Ruby version from binaries $rubyVersion = & "$tempFolder\bin\ruby.exe" -e "print RUBY_VERSION" - if ($rubyVersion) - { + if ($rubyVersion) { Write-Host "Installing Ruby $rubyVersion" $rubyVersionPath = Join-Path -Path $rubyToolcachePath -ChildPath $rubyVersion $rubyArchPath = Join-Path -Path $rubyVersionPath -ChildPath $Architecture @@ -79,18 +71,15 @@ function Install-Ruby Write-Host "Creating complete file" New-Item -ItemType File -Path $rubyVersionPath -Name "$Architecture.complete" | Out-Null - } - else - { + } else { Write-Host "Ruby application is not found. Failed to expand '$PackagePath' archive" exit 1 } } -function Set-DefaultRubyVersion -{ +function Set-DefaultRubyVersion { param( - [Parameter(Mandatory=$true)] + [Parameter(Mandatory = $true)] [System.Version] $Version, [System.String] $Arch = "x64" ) @@ -110,21 +99,17 @@ $rubyToolVersions = $rubyTools.versions $rubyLatestMajorVersions = Get-RubyVersions Write-Host "Starting installation Ruby..." -foreach($rubyVersion in $rubyToolVersions) -{ +foreach ($rubyVersion in $rubyToolVersions) { Write-Host "Starting Ruby $rubyVersion installation" # Get url for the latest major Ruby version $url = $rubyLatestMajorVersions[$rubyVersion] - if ($url) - { + if ($url) { $tempRubyPackagePath = Start-DownloadWithRetry -Url $url Install-Ruby -PackagePath $tempRubyPackagePath - } - else - { + } else { Write-Host "Url not found for the '$rubyVersion' version" exit 1 } } -Set-DefaultRubyVersion -Version $rubyTools.default -Arch $rubyTools.arch \ No newline at end of file +Set-DefaultRubyVersion -Version $rubyTools.default -Arch $rubyTools.arch diff --git a/images/windows/scripts/build/Install-SQLOLEDBDriver.ps1 b/images/windows/scripts/build/Install-SQLOLEDBDriver.ps1 index 503363b05b1d..207c728c4429 100644 --- a/images/windows/scripts/build/Install-SQLOLEDBDriver.ps1 +++ b/images/windows/scripts/build/Install-SQLOLEDBDriver.ps1 @@ -1,6 +1,6 @@ ################################################################################ ## File: Install-SQLOLEDBDriver.ps1 -## Desc: Install SQL OLEDB Driver +## Desc: Install OLE DB Driver for SQL Server ################################################################################ $binaryDownloadPath = Start-DownloadWithRetry "https://go.microsoft.com/fwlink/?linkid=2242656" "msoledbsql.msi" diff --git a/images/windows/scripts/build/Install-Vsix.ps1 b/images/windows/scripts/build/Install-VSExtensions.ps1 similarity index 92% rename from images/windows/scripts/build/Install-Vsix.ps1 rename to images/windows/scripts/build/Install-VSExtensions.ps1 index cf132ea8909a..0b18a7da8019 100644 --- a/images/windows/scripts/build/Install-Vsix.ps1 +++ b/images/windows/scripts/build/Install-VSExtensions.ps1 @@ -1,5 +1,5 @@ ################################################################################### -## File: Install-Vsix.ps1 +## File: Install-VSExtensions.ps1 ## Desc: Install the Visual Studio Extensions from toolset.json ################################################################################### @@ -21,4 +21,4 @@ $vsixPackagesList | ForEach-Object { } } -Invoke-PesterTests -TestFile "Vsix" \ No newline at end of file +Invoke-PesterTests -TestFile "Vsix" diff --git a/images/windows/scripts/build/Install-VS.ps1 b/images/windows/scripts/build/Install-VisualStudio.ps1 similarity index 83% rename from images/windows/scripts/build/Install-VS.ps1 rename to images/windows/scripts/build/Install-VisualStudio.ps1 index b9865294ec22..8b0fbb7915c5 100644 --- a/images/windows/scripts/build/Install-VS.ps1 +++ b/images/windows/scripts/build/Install-VisualStudio.ps1 @@ -1,5 +1,5 @@ ################################################################################ -## File: Install-VS.ps1 +## File: Install-VisualStudio.ps1 ## Desc: Install Visual Studio ################################################################################ @@ -19,8 +19,7 @@ Install-VisualStudio ` $vsProgramData = Get-Item -Path "C:\ProgramData\Microsoft\VisualStudio\Packages\_Instances" $instanceFolders = Get-ChildItem -Path $vsProgramData.FullName -if ($instanceFolders -is [array]) -{ +if ($instanceFolders -is [array]) { Write-Host "More than one instance installed" exit 1 } @@ -32,14 +31,14 @@ Set-Content -Path "$vsInstallRoot\Common7\IDE\Extensions\MachineState.json" -Val if (Test-IsWin19) { - # Install Windows 10 SDK version 10.0.14393.795 + # Install Windows 10 SDK version 10.0.14393.795 $sdkSignatureThumbprint = "C91545B333C52C4465DE8B90A3FAF4E1D9C58DFA" - $sdkUrl = "https://go.microsoft.com/fwlink/p/?LinkId=838916" - $sdkFileName = "sdksetup14393.exe" - $argumentList = ("/q", "/norestart", "/ceip off", "/features OptionId.WindowsSoftwareDevelopmentKit") - Install-Binary -Url $sdkUrl -Name $sdkFileName -ArgumentList $argumentList -ExpectedSignature $sdkSignatureThumbprint + $sdkUrl = "https://go.microsoft.com/fwlink/p/?LinkId=838916" + $sdkFileName = "sdksetup14393.exe" + $argumentList = ("/q", "/norestart", "/ceip off", "/features OptionId.WindowsSoftwareDevelopmentKit") + Install-Binary -Url $sdkUrl -Name $sdkFileName -ArgumentList $argumentList -ExpectedSignature $sdkSignatureThumbprint - # Install Windows 11 SDK version 10.0.22621.0 + # Install Windows 11 SDK version 10.0.22621.0 $sdkSignatureThumbprint = "E4C5C5FCDB68B930EE4E19BC25D431EF6D864C51" $sdkUrl = "https://go.microsoft.com/fwlink/p/?linkid=2196241" $sdkFileName = "sdksetup22621.exe" diff --git a/images/windows/scripts/build/Wait-WindowsUpdatesForInstall.ps1 b/images/windows/scripts/build/Install-WindowsUpdatesAfterReboot.ps1 similarity index 80% rename from images/windows/scripts/build/Wait-WindowsUpdatesForInstall.ps1 rename to images/windows/scripts/build/Install-WindowsUpdatesAfterReboot.ps1 index 912f884c9696..4d782299b231 100644 --- a/images/windows/scripts/build/Wait-WindowsUpdatesForInstall.ps1 +++ b/images/windows/scripts/build/Install-WindowsUpdatesAfterReboot.ps1 @@ -1,6 +1,6 @@ ################################################################################ -## File: Wait-WindowsUpdatesForInstall.ps1 -## Desc: Wait for installation windows updates to complete +## File: Install-WindowsUpdatesAfterReboot.ps1 +## Desc: Waits for Windows Updates to finish installing after reboot ################################################################################ Invoke-SBWithRetry -RetryCount 10 -RetryIntervalSeconds 120 -Command { diff --git a/images/windows/scripts/build/Install-Zstd.ps1 b/images/windows/scripts/build/Install-Zstd.ps1 index 0dd403c02dc2..d0481ef556ce 100644 --- a/images/windows/scripts/build/Install-Zstd.ps1 +++ b/images/windows/scripts/build/Install-Zstd.ps1 @@ -1,5 +1,5 @@ ################################################################################ -## File: Install-zstd.ps1 +## File: Install-Zstd.ps1 ## Desc: Install zstd ################################################################################ diff --git a/images/windows/scripts/docs-gen/SoftwareReport.Generator.ps1 b/images/windows/scripts/docs-gen/Generate-SoftwareReport.ps1 similarity index 100% rename from images/windows/scripts/docs-gen/SoftwareReport.Generator.ps1 rename to images/windows/scripts/docs-gen/Generate-SoftwareReport.ps1 diff --git a/images/windows/scripts/helpers/ImageHelpers.psm1 b/images/windows/scripts/helpers/ImageHelpers.psm1 index 76c31bb1fb93..ec7959cc7e51 100644 --- a/images/windows/scripts/helpers/ImageHelpers.psm1 +++ b/images/windows/scripts/helpers/ImageHelpers.psm1 @@ -4,7 +4,6 @@ param() . $PSScriptRoot\PathHelpers.ps1 . $PSScriptRoot\InstallHelpers.ps1 . $PSScriptRoot\ChocoHelpers.ps1 -. $PSScriptRoot\TestsHelpers.ps1 . $PSScriptRoot\VisualStudioHelpers.ps1 Export-ModuleMember -Function @( @@ -26,6 +25,7 @@ Export-ModuleMember -Function @( 'Install-VisualStudio' 'Get-ToolsetContent' 'Get-ToolsetToolFullPath' + 'Get-ToolcacheToolDirectory' 'Stop-SvcWithErrHandling' 'Set-SvcWithErrHandling' 'Start-DownloadWithRetry' @@ -40,10 +40,6 @@ Export-ModuleMember -Function @( 'Get-LatestChocoPackageVersion' 'Get-GitHubPackageDownloadUrl' 'Extract-7Zip' - 'Get-CommandResult' - 'Get-WhichTool' - 'Get-EnvironmentVariable' - 'Invoke-PesterTests' 'Invoke-SBWithRetry' 'Get-VsCatalogJsonPath' 'Install-AndroidSDKPackages' @@ -54,7 +50,6 @@ Export-ModuleMember -Function @( 'Get-VisualStudioComponents' 'Get-WindowsUpdatesHistory' 'New-ItemPath' - 'Get-ModuleVersionAsJob' 'Use-ChecksumComparison' 'Get-HashFromGitHubReleaseBody' 'Test-FileSignature' diff --git a/images/windows/scripts/helpers/TestsHelpers.ps1 b/images/windows/scripts/tests/Helpers.psm1 similarity index 94% rename from images/windows/scripts/helpers/TestsHelpers.ps1 rename to images/windows/scripts/tests/Helpers.psm1 index f22cd9c223ea..420d86a025e2 100644 --- a/images/windows/scripts/helpers/TestsHelpers.ps1 +++ b/images/windows/scripts/tests/Helpers.psm1 @@ -1,3 +1,6 @@ +[CmdletBinding()] +param() + function Get-CommandResult { Param ( [Parameter(Mandatory)][string] $Command @@ -7,7 +10,7 @@ function Get-CommandResult { $exitCode = $LASTEXITCODE return @{ - Output = $output + Output = $output ExitCode = $exitCode } } @@ -87,8 +90,7 @@ function ShouldReturnZeroExitCode { [bool]$succeeded = $result.ExitCode -eq 0 if ($Negate) { $succeeded = -not $succeeded } - if (-not $succeeded) - { + if (-not $succeeded) { $commandOutputIndent = " " * 4 $commandOutput = ($result.Output | ForEach-Object { "${commandOutputIndent}${_}" }) -join "`n" $failureMessage = "Command '${ActualValue}' has finished with exit code ${actualExitCode}`n${commandOutput}" @@ -111,22 +113,19 @@ function ShouldReturnZeroExitCodeWithParam { $delimiterCharacter = "" - while ($delimiterCharacter.Length -le 2) - { + while ($delimiterCharacter.Length -le 2) { $callParameterWithDelimiter = $delimiterCharacter + $CallParameter $commandToCheck = "$ActualValue $callParameterWithDelimiter" [bool]$succeeded = (ShouldReturnZeroExitCode -ActualValue $commandToCheck).Succeeded - if ($succeeded) - { + if ($succeeded) { break } $delimiterCharacter += '-' } if ($Negate) { $succeeded = -not $succeeded } - if (-not $succeeded) - { + if (-not $succeeded) { $failureMessage = "Tool '$ActualValue' has not returned 0 exit code for any of these flags: '$CallParameter' or '-$CallParameter' or '--$CallParameter'" } @@ -156,8 +155,7 @@ function ShouldMatchCommandOutput { if (-not $succeeded) { if ($Negate) { $failureMessage = "Expected regular expression '$RegularExpression' for '$ActualValue' command to not match '$output', but it did match." - } - else { + } else { $failureMessage = "Expected regular expression '$RegularExpression' for '$ActualValue' command to match '$output', but it did not match." } } @@ -198,3 +196,12 @@ Function Get-ModuleVersionAsJob { $testJob | Wait-Job | Receive-Job | Out-File -FilePath "${env:TEMP}\module-version.txt" Remove-Job $testJob } + + +Export-ModuleMember -Function @( + 'Get-CommandResult' + 'Get-WhichTool' + 'Get-EnvironmentVariable' + 'Invoke-PesterTests' + 'Get-ModuleVersionAsJob' +) diff --git a/images/windows/templates/windows-2019.json b/images/windows/templates/windows-2019.json index ce5566b0c090..7dcd0335e687 100644 --- a/images/windows/templates/windows-2019.json +++ b/images/windows/templates/windows-2019.json @@ -92,6 +92,8 @@ "Remove-Item -Recurse '{{user `image_folder`}}\\assets'", "Move-Item '{{user `image_folder`}}\\scripts\\docs-gen' '{{user `image_folder`}}\\SoftwareReport'", "Move-Item '{{user `image_folder`}}\\scripts\\helpers' '{{user `helper_script_folder`}}\\ImageHelpers'", + "New-Item -Type Directory -Path '{{user `helper_script_folder`}}\\TestsHelpers\\'", + "Move-Item '{{user `image_folder`}}\\scripts\\tests\\Helpers.psm1' '{{user `helper_script_folder`}}\\TestsHelpers\\TestsHelpers.psm1'", "Move-Item '{{user `image_folder`}}\\scripts\\tests' '{{user `image_folder`}}\\tests'", "Remove-Item -Recurse '{{user `image_folder`}}\\scripts'", "Move-Item '{{user `image_folder`}}\\toolsets\\toolset-2019.json' '{{user `image_folder`}}\\toolset.json'", @@ -147,14 +149,15 @@ "IMAGEDATA_FILE={{user `imagedata_file`}}" ], "scripts": [ - "{{ template_dir }}/../scripts/build/Configure-Antivirus.ps1", + "{{ template_dir }}/../scripts/build/Configure-WindowsDefender.ps1", "{{ template_dir }}/../scripts/build/Configure-PowerShell.ps1", - "{{ template_dir }}/../scripts/build/Install-PowerShellModules.ps1", + "{{ template_dir }}/../scripts/build/Install-PowershellModules.ps1", "{{ template_dir }}/../scripts/build/Install-WindowsFeatures.ps1", - "{{ template_dir }}/../scripts/build/Install-Choco.ps1", - "{{ template_dir }}/../scripts/build/Initialize-VM.ps1", - "{{ template_dir }}/../scripts/build/Update-ImageData.ps1", - "{{ template_dir }}/../scripts/build/Update-DotnetTLS.ps1" + "{{ template_dir }}/../scripts/build/Install-Chocolatey.ps1", + "{{ template_dir }}/../scripts/build/Configure-BaseImage.ps1", + "{{ template_dir }}/../scripts/build/Configure-ImageDataFile.ps1", + "{{ template_dir }}/../scripts/build/Configure-SystemEnvironment.ps1", + "{{ template_dir }}/../scripts/build/Configure-DotnetSecureChannel.ps1" ], "execution_policy": "unrestricted" }, @@ -167,8 +170,8 @@ "scripts": [ "{{ template_dir }}/../scripts/build/Install-VCRedist.ps1", "{{ template_dir }}/../scripts/build/Install-Docker.ps1", - "{{ template_dir }}/../scripts/build/Install-Docker-WinCred.ps1", - "{{ template_dir }}/../scripts/build/Install-Docker-Compose.ps1", + "{{ template_dir }}/../scripts/build/Install-DockerWinCred.ps1", + "{{ template_dir }}/../scripts/build/Install-DockerCompose.ps1", "{{ template_dir }}/../scripts/build/Install-PowershellCore.ps1", "{{ template_dir }}/../scripts/build/Install-WebPlatformInstaller.ps1", "{{ template_dir }}/../scripts/build/Install-Runner.ps1" @@ -185,7 +188,7 @@ 3010 ], "scripts": [ - "{{ template_dir }}/../scripts/build/Install-VS.ps1", + "{{ template_dir }}/../scripts/build/Install-VisualStudio.ps1", "{{ template_dir }}/../scripts/build/Install-KubernetesTools.ps1", "{{ template_dir }}/../scripts/build/Install-NET48-devpack.ps1" ], @@ -197,10 +200,10 @@ "scripts": [ "{{ template_dir }}/../scripts/build/Install-Wix.ps1", "{{ template_dir }}/../scripts/build/Install-WDK.ps1", - "{{ template_dir }}/../scripts/build/Install-Vsix.ps1", + "{{ template_dir }}/../scripts/build/Install-VSExtensions.ps1", "{{ template_dir }}/../scripts/build/Install-AzureCli.ps1", "{{ template_dir }}/../scripts/build/Install-AzureDevOpsCli.ps1", - "{{ template_dir }}/../scripts/build/Install-CommonUtils.ps1", + "{{ template_dir }}/../scripts/build/Install-ChocolateyPackages.ps1", "{{ template_dir }}/../scripts/build/Install-JavaTools.ps1", "{{ template_dir }}/../scripts/build/Install-Kotlin.ps1", "{{ template_dir }}/../scripts/build/Install-OpenSSL.ps1" @@ -226,23 +229,22 @@ { "type": "powershell", "scripts": [ - "{{ template_dir }}/../scripts/build/Install-ActionArchiveCache.ps1", + "{{ template_dir }}/../scripts/build/Install-ActionsCache.ps1", "{{ template_dir }}/../scripts/build/Install-Ruby.ps1", "{{ template_dir }}/../scripts/build/Install-PyPy.ps1", "{{ template_dir }}/../scripts/build/Install-Toolset.ps1", "{{ template_dir }}/../scripts/build/Configure-Toolset.ps1", - "{{ template_dir }}/../scripts/build/Install-NodeLts.ps1", + "{{ template_dir }}/../scripts/build/Install-NodeJS.ps1", "{{ template_dir }}/../scripts/build/Install-AndroidSDK.ps1", - "{{ template_dir }}/../scripts/build/Install-AzureModules.ps1", + "{{ template_dir }}/../scripts/build/Install-PowershellAzModules.ps1", "{{ template_dir }}/../scripts/build/Install-Pipx.ps1", - "{{ template_dir }}/../scripts/build/Install-PipxPackages.ps1", "{{ template_dir }}/../scripts/build/Install-Git.ps1", "{{ template_dir }}/../scripts/build/Install-GitHub-CLI.ps1", "{{ template_dir }}/../scripts/build/Install-PHP.ps1", "{{ template_dir }}/../scripts/build/Install-Rust.ps1", "{{ template_dir }}/../scripts/build/Install-Sbt.ps1", "{{ template_dir }}/../scripts/build/Install-Chrome.ps1", - "{{ template_dir }}/../scripts/build/Install-Edge.ps1", + "{{ template_dir }}/../scripts/build/Install-EdgeDriver.ps1", "{{ template_dir }}/../scripts/build/Install-Firefox.ps1", "{{ template_dir }}/../scripts/build/Install-Selenium.ps1", "{{ template_dir }}/../scripts/build/Install-IEWebDriver.ps1", @@ -251,7 +253,7 @@ "{{ template_dir }}/../scripts/build/Install-Msys2.ps1", "{{ template_dir }}/../scripts/build/Install-WinAppDriver.ps1", "{{ template_dir }}/../scripts/build/Install-R.ps1", - "{{ template_dir }}/../scripts/build/Install-AWS.ps1", + "{{ template_dir }}/../scripts/build/Install-AWSTools.ps1", "{{ template_dir }}/../scripts/build/Install-DACFx.ps1", "{{ template_dir }}/../scripts/build/Install-MysqlCli.ps1", "{{ template_dir }}/../scripts/build/Install-SQLPowerShellTools.ps1", @@ -275,11 +277,11 @@ "{{ template_dir }}/../scripts/build/Install-GoogleCloudCLI.ps1", "{{ template_dir }}/../scripts/build/Install-CodeQLBundle.ps1", "{{ template_dir }}/../scripts/build/Install-BizTalkBuildComponent.ps1", - "{{ template_dir }}/../scripts/build/Disable-JITDebugger.ps1", + "{{ template_dir }}/../scripts/build/Configure-Diagnostics.ps1", "{{ template_dir }}/../scripts/build/Configure-DynamicPort.ps1", "{{ template_dir }}/../scripts/build/Configure-GDIProcessHandleQuota.ps1", "{{ template_dir }}/../scripts/build/Configure-Shell.ps1", - "{{ template_dir }}/../scripts/build/Enable-DeveloperMode.ps1", + "{{ template_dir }}/../scripts/build/Configure-DeveloperMode.ps1", "{{ template_dir }}/../scripts/build/Install-LLVM.ps1" ] }, @@ -301,7 +303,7 @@ "type": "powershell", "pause_before": "2m", "scripts": [ - "{{ template_dir }}/../scripts/build/Wait-WindowsUpdatesForInstall.ps1", + "{{ template_dir }}/../scripts/build/Install-WindowsUpdatesAfterReboot.ps1", "{{ template_dir }}/../scripts/tests/RunAll-Tests.ps1" ] }, @@ -314,7 +316,7 @@ { "type": "powershell", "inline": [ - "pwsh -File '{{user `image_folder`}}\\SoftwareReport\\SoftwareReport.Generator.ps1'" + "pwsh -File '{{user `image_folder`}}\\SoftwareReport\\Generate-SoftwareReport.ps1'" ], "environment_vars": [ "IMAGE_VERSION={{user `image_version`}}" @@ -343,9 +345,9 @@ "type": "powershell", "skip_clean": true, "scripts": [ - "{{ template_dir }}/../scripts/build/Run-NGen.ps1", - "{{ template_dir }}/../scripts/build/Finalize-VM.ps1", - "{{ template_dir }}/../scripts/build/Warmup-User.ps1" + "{{ template_dir }}/../scripts/build/Install-NativeImages.ps1", + "{{ template_dir }}/../scripts/build/Configure-System.ps1", + "{{ template_dir }}/../scripts/build/Configure-User.ps1" ], "environment_vars": [ "INSTALL_USER={{user `install_user`}}" diff --git a/images/windows/templates/windows-2022.json b/images/windows/templates/windows-2022.json index bfa4de3d3651..871d6aac95b0 100644 --- a/images/windows/templates/windows-2022.json +++ b/images/windows/templates/windows-2022.json @@ -92,6 +92,8 @@ "Remove-Item -Recurse '{{user `image_folder`}}\\assets'", "Move-Item '{{user `image_folder`}}\\scripts\\docs-gen' '{{user `image_folder`}}\\SoftwareReport'", "Move-Item '{{user `image_folder`}}\\scripts\\helpers' '{{user `helper_script_folder`}}\\ImageHelpers'", + "New-Item -Type Directory -Path '{{user `helper_script_folder`}}\\TestsHelpers\\'", + "Move-Item '{{user `image_folder`}}\\scripts\\tests\\Helpers.psm1' '{{user `helper_script_folder`}}\\TestsHelpers\\TestsHelpers.psm1'", "Move-Item '{{user `image_folder`}}\\scripts\\tests' '{{user `image_folder`}}\\tests'", "Remove-Item -Recurse '{{user `image_folder`}}\\scripts'", "Move-Item '{{user `image_folder`}}\\toolsets\\toolset-2022.json' '{{user `image_folder`}}\\toolset.json'", @@ -131,14 +133,15 @@ "IMAGEDATA_FILE={{user `imagedata_file`}}" ], "scripts": [ - "{{ template_dir }}/../scripts/build/Configure-Antivirus.ps1", + "{{ template_dir }}/../scripts/build/Configure-WindowsDefender.ps1", "{{ template_dir }}/../scripts/build/Configure-PowerShell.ps1", - "{{ template_dir }}/../scripts/build/Install-PowerShellModules.ps1", + "{{ template_dir }}/../scripts/build/Install-PowershellModules.ps1", "{{ template_dir }}/../scripts/build/Install-WindowsFeatures.ps1", - "{{ template_dir }}/../scripts/build/Install-Choco.ps1", - "{{ template_dir }}/../scripts/build/Initialize-VM.ps1", - "{{ template_dir }}/../scripts/build/Update-ImageData.ps1", - "{{ template_dir }}/../scripts/build/Update-DotnetTLS.ps1" + "{{ template_dir }}/../scripts/build/Install-Chocolatey.ps1", + "{{ template_dir }}/../scripts/build/Configure-BaseImage.ps1", + "{{ template_dir }}/../scripts/build/Configure-ImageDataFile.ps1", + "{{ template_dir }}/../scripts/build/Configure-SystemEnvironment.ps1", + "{{ template_dir }}/../scripts/build/Configure-DotnetSecureChannel.ps1" ], "execution_policy": "unrestricted" }, @@ -152,8 +155,8 @@ "type": "powershell", "scripts": [ "{{ template_dir }}/../scripts/build/Install-Docker.ps1", - "{{ template_dir }}/../scripts/build/Install-Docker-WinCred.ps1", - "{{ template_dir }}/../scripts/build/Install-Docker-Compose.ps1", + "{{ template_dir }}/../scripts/build/Install-DockerWinCred.ps1", + "{{ template_dir }}/../scripts/build/Install-DockerCompose.ps1", "{{ template_dir }}/../scripts/build/Install-PowershellCore.ps1", "{{ template_dir }}/../scripts/build/Install-WebPlatformInstaller.ps1", "{{ template_dir }}/../scripts/build/Install-Runner.ps1" @@ -170,7 +173,7 @@ 3010 ], "scripts": [ - "{{ template_dir }}/../scripts/build/Install-VS.ps1", + "{{ template_dir }}/../scripts/build/Install-VisualStudio.ps1", "{{ template_dir }}/../scripts/build/Install-KubernetesTools.ps1" ], "elevated_user": "{{user `install_user`}}", @@ -187,10 +190,10 @@ "scripts": [ "{{ template_dir }}/../scripts/build/Install-Wix.ps1", "{{ template_dir }}/../scripts/build/Install-WDK.ps1", - "{{ template_dir }}/../scripts/build/Install-Vsix.ps1", + "{{ template_dir }}/../scripts/build/Install-VSExtensions.ps1", "{{ template_dir }}/../scripts/build/Install-AzureCli.ps1", "{{ template_dir }}/../scripts/build/Install-AzureDevOpsCli.ps1", - "{{ template_dir }}/../scripts/build/Install-CommonUtils.ps1", + "{{ template_dir }}/../scripts/build/Install-ChocolateyPackages.ps1", "{{ template_dir }}/../scripts/build/Install-JavaTools.ps1", "{{ template_dir }}/../scripts/build/Install-Kotlin.ps1", "{{ template_dir }}/../scripts/build/Install-OpenSSL.ps1" @@ -216,23 +219,22 @@ { "type": "powershell", "scripts": [ - "{{ template_dir }}/../scripts/build/Install-ActionArchiveCache.ps1", + "{{ template_dir }}/../scripts/build/Install-ActionsCache.ps1", "{{ template_dir }}/../scripts/build/Install-Ruby.ps1", "{{ template_dir }}/../scripts/build/Install-PyPy.ps1", "{{ template_dir }}/../scripts/build/Install-Toolset.ps1", "{{ template_dir }}/../scripts/build/Configure-Toolset.ps1", - "{{ template_dir }}/../scripts/build/Install-NodeLts.ps1", + "{{ template_dir }}/../scripts/build/Install-NodeJS.ps1", "{{ template_dir }}/../scripts/build/Install-AndroidSDK.ps1", - "{{ template_dir }}/../scripts/build/Install-AzureModules.ps1", + "{{ template_dir }}/../scripts/build/Install-PowershellAzModules.ps1", "{{ template_dir }}/../scripts/build/Install-Pipx.ps1", - "{{ template_dir }}/../scripts/build/Install-PipxPackages.ps1", "{{ template_dir }}/../scripts/build/Install-Git.ps1", "{{ template_dir }}/../scripts/build/Install-GitHub-CLI.ps1", "{{ template_dir }}/../scripts/build/Install-PHP.ps1", "{{ template_dir }}/../scripts/build/Install-Rust.ps1", "{{ template_dir }}/../scripts/build/Install-Sbt.ps1", "{{ template_dir }}/../scripts/build/Install-Chrome.ps1", - "{{ template_dir }}/../scripts/build/Install-Edge.ps1", + "{{ template_dir }}/../scripts/build/Install-EdgeDriver.ps1", "{{ template_dir }}/../scripts/build/Install-Firefox.ps1", "{{ template_dir }}/../scripts/build/Install-Selenium.ps1", "{{ template_dir }}/../scripts/build/Install-IEWebDriver.ps1", @@ -241,7 +243,7 @@ "{{ template_dir }}/../scripts/build/Install-Msys2.ps1", "{{ template_dir }}/../scripts/build/Install-WinAppDriver.ps1", "{{ template_dir }}/../scripts/build/Install-R.ps1", - "{{ template_dir }}/../scripts/build/Install-AWS.ps1", + "{{ template_dir }}/../scripts/build/Install-AWSTools.ps1", "{{ template_dir }}/../scripts/build/Install-DACFx.ps1", "{{ template_dir }}/../scripts/build/Install-MysqlCli.ps1", "{{ template_dir }}/../scripts/build/Install-SQLPowerShellTools.ps1", @@ -262,7 +264,7 @@ "{{ template_dir }}/../scripts/build/Install-RootCA.ps1", "{{ template_dir }}/../scripts/build/Install-MongoDB.ps1", "{{ template_dir }}/../scripts/build/Install-CodeQLBundle.ps1", - "{{ template_dir }}/../scripts/build/Disable-JITDebugger.ps1" + "{{ template_dir }}/../scripts/build/Configure-Diagnostics.ps1" ] }, { @@ -272,7 +274,7 @@ "{{ template_dir }}/../scripts/build/Configure-DynamicPort.ps1", "{{ template_dir }}/../scripts/build/Configure-GDIProcessHandleQuota.ps1", "{{ template_dir }}/../scripts/build/Configure-Shell.ps1", - "{{ template_dir }}/../scripts/build/Enable-DeveloperMode.ps1", + "{{ template_dir }}/../scripts/build/Configure-DeveloperMode.ps1", "{{ template_dir }}/../scripts/build/Install-LLVM.ps1" ], "elevated_user": "{{user `install_user`}}", @@ -288,7 +290,7 @@ "type": "powershell", "pause_before": "2m", "scripts": [ - "{{ template_dir }}/../scripts/build/Wait-WindowsUpdatesForInstall.ps1", + "{{ template_dir }}/../scripts/build/Install-WindowsUpdatesAfterReboot.ps1", "{{ template_dir }}/../scripts/tests/RunAll-Tests.ps1" ] }, @@ -301,7 +303,7 @@ { "type": "powershell", "inline": [ - "pwsh -File '{{user `image_folder`}}\\SoftwareReport\\SoftwareReport.Generator.ps1'" + "pwsh -File '{{user `image_folder`}}\\SoftwareReport\\Generate-SoftwareReport.ps1'" ], "environment_vars": [ "IMAGE_VERSION={{user `image_version`}}" @@ -330,9 +332,9 @@ "type": "powershell", "skip_clean": true, "scripts": [ - "{{ template_dir }}/../scripts/build/Run-NGen.ps1", - "{{ template_dir }}/../scripts/build/Finalize-VM.ps1", - "{{ template_dir }}/../scripts/build/Warmup-User.ps1" + "{{ template_dir }}/../scripts/build/Install-NativeImages.ps1", + "{{ template_dir }}/../scripts/build/Configure-System.ps1", + "{{ template_dir }}/../scripts/build/Configure-User.ps1" ], "environment_vars": [ "INSTALL_USER={{user `install_user`}}" From cd2cabc7ab676a9c4603ffd680963ddfc5220270 Mon Sep 17 00:00:00 2001 From: sergei-pyshnoi <121864472+sergei-pyshnoi@users.noreply.github.com> Date: Thu, 16 Nov 2023 15:00:56 +0100 Subject: [PATCH 2447/3485] [Ubuntu] Add findutils to images (#8823) --- images/ubuntu/scripts/tests/Apt.Tests.ps1 | 6 +++++- images/ubuntu/toolsets/toolset-2004.json | 1 + images/ubuntu/toolsets/toolset-2204.json | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/images/ubuntu/scripts/tests/Apt.Tests.ps1 b/images/ubuntu/scripts/tests/Apt.Tests.ps1 index 57b223bcc7f3..18b48063d667 100644 --- a/images/ubuntu/scripts/tests/Apt.Tests.ps1 +++ b/images/ubuntu/scripts/tests/Apt.Tests.ps1 @@ -54,6 +54,10 @@ Describe "Apt" { $toolName = "hg" } + if ($toolName -eq "findutils") + { + $toolName = "find" + } (Get-Command -Name $toolName).CommandType | Should -BeExactly "Application" } -} \ No newline at end of file +} diff --git a/images/ubuntu/toolsets/toolset-2004.json b/images/ubuntu/toolsets/toolset-2004.json index e57a7fcd9f7a..b326f51684fe 100644 --- a/images/ubuntu/toolsets/toolset-2004.json +++ b/images/ubuntu/toolsets/toolset-2004.json @@ -191,6 +191,7 @@ "brotli", "coreutils", "file", + "findutils", "flex", "ftp", "haveged", diff --git a/images/ubuntu/toolsets/toolset-2204.json b/images/ubuntu/toolsets/toolset-2204.json index 9648bcbed31c..36b8b349e2b1 100644 --- a/images/ubuntu/toolsets/toolset-2204.json +++ b/images/ubuntu/toolsets/toolset-2204.json @@ -181,6 +181,7 @@ "brotli", "coreutils", "file", + "findutils", "flex", "ftp", "haveged", From 164eb6cdc2e440c41c6debbf0ba044fa97e3e4b7 Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Fri, 17 Nov 2023 11:36:37 +0100 Subject: [PATCH 2448/3485] [Ubuntu] Pin SHA256 for PhantomJS and libssl1.1 (#8799) --- images/ubuntu/scripts/build/phantomjs.sh | 10 ++++++---- images/ubuntu/scripts/build/sqlpackage.sh | 2 ++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/images/ubuntu/scripts/build/phantomjs.sh b/images/ubuntu/scripts/build/phantomjs.sh index 0708810f2b4c..1be03c836a7e 100644 --- a/images/ubuntu/scripts/build/phantomjs.sh +++ b/images/ubuntu/scripts/build/phantomjs.sh @@ -9,9 +9,11 @@ source $HELPER_SCRIPTS/install.sh # Install PhantomJS apt-get install -y chrpath libssl-dev libxft-dev libfreetype6 libfreetype6-dev libfontconfig1 libfontconfig1-dev -PHANTOM_JS=phantomjs-2.1.1-linux-x86_64 -download_with_retries https://bitbucket.org/ariya/phantomjs/downloads/$PHANTOM_JS.tar.bz2 "/tmp" -tar xjf /tmp/$PHANTOM_JS.tar.bz2 -C /usr/local/share -ln -sf /usr/local/share/$PHANTOM_JS/bin/phantomjs /usr/local/bin +phantom_js=phantomjs-2.1.1-linux-x86_64 +download_with_retries https://bitbucket.org/ariya/phantomjs/downloads/$phantom_js.tar.bz2 "/tmp" +phantom_js_hash="86dd9a4bf4aee45f1a84c9f61cf1947c1d6dce9b9e8d2a907105da7852460d2f" +use_checksum_comparison "/tmp/${phantom_js}.tar.bz2" "${phantom_js_hash}" +tar xjf /tmp/$phantom_js.tar.bz2 -C /usr/local/share +ln -sf /usr/local/share/$phantom_js/bin/phantomjs /usr/local/bin invoke_tests "Tools" "Phantomjs" diff --git a/images/ubuntu/scripts/build/sqlpackage.sh b/images/ubuntu/scripts/build/sqlpackage.sh index c78f2169ba3e..d0f9c27b2e7e 100644 --- a/images/ubuntu/scripts/build/sqlpackage.sh +++ b/images/ubuntu/scripts/build/sqlpackage.sh @@ -11,6 +11,8 @@ source $HELPER_SCRIPTS/os.sh # Install libssl1.1 dependency if isUbuntu22; then download_with_retries "http://security.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.1f-1ubuntu2.20_amd64.deb" "/tmp" + libssl_hash="0b3251aee55db6e20d02f4b9a2b703c9874a85ab6a20b12f4870f52f91633d37" + use_checksum_comparison "/tmp/libssl1.1_1.1.1f-1ubuntu2.20_amd64.deb" "${libssl_hash}" dpkg -i /tmp/libssl1.1_1.1.1f-1ubuntu2.20_amd64.deb fi From 3bbc0dc753c336e98d80dc62539252fb3ead80f1 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Fri, 17 Nov 2023 13:26:45 +0100 Subject: [PATCH 2449/3485] [packer] fix install-powershell script name (#8834) --- images/windows/templates/windows-2019.json | 2 +- images/windows/templates/windows-2022.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/images/windows/templates/windows-2019.json b/images/windows/templates/windows-2019.json index 7dcd0335e687..8c6bd3192fdf 100644 --- a/images/windows/templates/windows-2019.json +++ b/images/windows/templates/windows-2019.json @@ -151,7 +151,7 @@ "scripts": [ "{{ template_dir }}/../scripts/build/Configure-WindowsDefender.ps1", "{{ template_dir }}/../scripts/build/Configure-PowerShell.ps1", - "{{ template_dir }}/../scripts/build/Install-PowershellModules.ps1", + "{{ template_dir }}/../scripts/build/Install-PowerShellModules.ps1", "{{ template_dir }}/../scripts/build/Install-WindowsFeatures.ps1", "{{ template_dir }}/../scripts/build/Install-Chocolatey.ps1", "{{ template_dir }}/../scripts/build/Configure-BaseImage.ps1", diff --git a/images/windows/templates/windows-2022.json b/images/windows/templates/windows-2022.json index 871d6aac95b0..fd9ed2057dc5 100644 --- a/images/windows/templates/windows-2022.json +++ b/images/windows/templates/windows-2022.json @@ -135,7 +135,7 @@ "scripts": [ "{{ template_dir }}/../scripts/build/Configure-WindowsDefender.ps1", "{{ template_dir }}/../scripts/build/Configure-PowerShell.ps1", - "{{ template_dir }}/../scripts/build/Install-PowershellModules.ps1", + "{{ template_dir }}/../scripts/build/Install-PowerShellModules.ps1", "{{ template_dir }}/../scripts/build/Install-WindowsFeatures.ps1", "{{ template_dir }}/../scripts/build/Install-Chocolatey.ps1", "{{ template_dir }}/../scripts/build/Configure-BaseImage.ps1", From 045a0de8e2a05b4d41fbc27ea58e3cd84203a060 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Fri, 17 Nov 2023 13:30:03 +0100 Subject: [PATCH 2450/3485] [macOS] Exclude "Stack" from software report (#8822) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Alexey Ayupov <“alexey.ayupov@akvelon.com”> --- images/macos/scripts/docs-gen/SoftwareReport.Generator.ps1 | 2 -- 1 file changed, 2 deletions(-) diff --git a/images/macos/scripts/docs-gen/SoftwareReport.Generator.ps1 b/images/macos/scripts/docs-gen/SoftwareReport.Generator.ps1 index 321d7d1c8dd8..b6825864b3db 100644 --- a/images/macos/scripts/docs-gen/SoftwareReport.Generator.ps1 +++ b/images/macos/scripts/docs-gen/SoftwareReport.Generator.ps1 @@ -179,8 +179,6 @@ if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) { $tools.AddToolVersion("GHC", $(Get-GHCVersion)) $tools.AddToolVersion("GHCup", $(Get-GHCupVersion)) $tools.AddToolVersion("Jazzy", $(Get-JazzyVersion)) -} -if ((-not $os.IsVenturaArm64) -and (-not $os.IsSonomaArm64)) { $tools.AddToolVersion("Stack", $(Get-StackVersion)) } $tools.AddToolVersion("SwiftFormat", $(Get-SwiftFormatVersion)) From 07e8da79f83fca67b192c1f5ee75994b96131657 Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Fri, 17 Nov 2023 13:52:52 +0100 Subject: [PATCH 2451/3485] [Windows] Use common approach to set machine vars (#8830) --- .../build/Configure-SystemEnvironment.ps1 | 14 ++++++--- .../scripts/build/Configure-Toolset.ps1 | 13 ++++----- .../scripts/build/Install-AndroidSDK.ps1 | 12 ++++---- .../windows/scripts/build/Install-Chrome.ps1 | 2 +- .../scripts/build/Install-DotnetSDK.ps1 | 6 ++-- .../scripts/build/Install-EdgeDriver.ps1 | 2 +- .../windows/scripts/build/Install-Firefox.ps1 | 2 +- .../windows/scripts/build/Install-Haskell.ps1 | 6 ++-- .../scripts/build/Install-IEWebDriver.ps1 | 2 +- .../scripts/build/Install-JavaTools.ps1 | 12 ++++---- .../scripts/build/Install-Miniconda.ps1 | 2 +- .../windows/scripts/build/Install-NodeJS.ps1 | 2 +- images/windows/scripts/build/Install-PHP.ps1 | 2 +- images/windows/scripts/build/Install-Pipx.ps1 | 4 +-- .../scripts/build/Install-PostgreSQL.ps1 | 29 +++++++++---------- .../scripts/build/Install-Selenium.ps1 | 2 +- .../windows/scripts/build/Install-Vcpkg.ps1 | 2 +- .../windows/scripts/helpers/ImageHelpers.psm1 | 1 - .../windows/scripts/helpers/PathHelpers.ps1 | 12 +------- .../helpers/test/PathHelpers.Tests.ps1 | 7 ----- 20 files changed, 59 insertions(+), 75 deletions(-) diff --git a/images/windows/scripts/build/Configure-SystemEnvironment.ps1 b/images/windows/scripts/build/Configure-SystemEnvironment.ps1 index f3745ae4000c..aa280c352eb3 100644 --- a/images/windows/scripts/build/Configure-SystemEnvironment.ps1 +++ b/images/windows/scripts/build/Configure-SystemEnvironment.ps1 @@ -3,7 +3,13 @@ ## Desc: Configures system environment variables ################################################################################ -setx ImageVersion $env:IMAGE_VERSION /m -setx ImageOS $env:IMAGE_OS /m -setx AGENT_TOOLSDIRECTORY $env:AGENT_TOOLSDIRECTORY /m -setx ACTIONS_RUNNER_ACTION_ARCHIVE_CACHE $env:ACTIONS_RUNNER_ACTION_ARCHIVE_CACHE /m +$variables = @{ + "ImageVersion" = $env:IMAGE_VERSION + "ImageOS" = $env:IMAGE_OS + "AGENT_TOOLSDIRECTORY" = $env:AGENT_TOOLSDIRECTORY + "ACTIONS_RUNNER_ACTION_ARCHIVE_CACHE" = $env:ACTIONS_RUNNER_ACTION_ARCHIVE_CACHE +} + +$variables.GetEnumerator() | ForEach-Object { + [Environment]::SetEnvironmentVariable($_.Key, $_.Value, "Machine") +} diff --git a/images/windows/scripts/build/Configure-Toolset.ps1 b/images/windows/scripts/build/Configure-Toolset.ps1 index c2e9e776f1fc..119e72325149 100644 --- a/images/windows/scripts/build/Configure-Toolset.ps1 +++ b/images/windows/scripts/build/Configure-Toolset.ps1 @@ -23,7 +23,7 @@ Function Set-DefaultVariables if (-not ([string]::IsNullOrEmpty($EnvVars.defaultVariable))) { - setx $toolEnvVars.defaultVariable $ToolVersionPath /M | Out-Null + [Environment]::SetEnvironmentVariable($toolEnvVars.defaultVariable, $ToolVersionPath, "Machine") } } @@ -48,20 +48,17 @@ $tools = Get-ToolsetContent | Select-Object -ExpandProperty toolcache ` | Where-Object { $toolsToConfigure -contains $_.name } Write-Host "Configure toolset tools environment..." -foreach ($tool in $tools) -{ +foreach ($tool in $tools) { $toolEnvVars = $toolsEnvironmentVariables[$tool.name] - if (-not ([string]::IsNullOrEmpty($toolEnvVars.variableTemplate))) - { - foreach ($version in $tool.versions) - { + if (-not ([string]::IsNullOrEmpty($toolEnvVars.variableTemplate))) { + foreach ($version in $tool.versions) { Write-Host "Set $($tool.name) $version environment variable..." $foundVersionArchPath = Get-ToolsetToolFullPath -Name $tool.name -Version $version -Arch $tool.arch $envName = $toolEnvVars.variableTemplate -f $version.Split(".") - setx $envName $foundVersionArchPath /M | Out-Null + [Environment]::SetEnvironmentVariable($envName, $foundVersionArchPath, "Machine") } } diff --git a/images/windows/scripts/build/Install-AndroidSDK.ps1 b/images/windows/scripts/build/Install-AndroidSDK.ps1 index ed7b859d665a..83580d9a0ee0 100644 --- a/images/windows/scripts/build/Install-AndroidSDK.ps1 +++ b/images/windows/scripts/build/Install-AndroidSDK.ps1 @@ -120,16 +120,16 @@ $ndkDefaultVersion = ($androidNDKs | Where-Object { $_ -match "ndk;$ndkDefaultMa $ndkRoot = "$sdkRoot\ndk\$ndkDefaultVersion" # Create env variables -setx ANDROID_HOME $sdkRoot /M -setx ANDROID_SDK_ROOT $sdkRoot /M +[Environment]::SetEnvironmentVariable("ANDROID_HOME", $sdkRoot, "Machine") +[Environment]::SetEnvironmentVariable("ANDROID_SDK_ROOT", $sdkRoot, "Machine") # ANDROID_NDK, ANDROID_NDK_HOME, and ANDROID_NDK_ROOT variables should be set as many customer builds depend on them https://github.com/actions/runner-images/issues/5879 -setx ANDROID_NDK $ndkRoot /M -setx ANDROID_NDK_HOME $ndkRoot /M -setx ANDROID_NDK_ROOT $ndkRoot /M +[Environment]::SetEnvironmentVariable("ANDROID_NDK", $ndkRoot, "Machine") +[Environment]::SetEnvironmentVariable("ANDROID_NDK_HOME", $ndkRoot, "Machine") +[Environment]::SetEnvironmentVariable("ANDROID_NDK_ROOT", $ndkRoot, "Machine") $ndkLatestPath = "$sdkRoot\ndk\$ndkLatestVersion" if (Test-Path $ndkLatestPath) { - setx ANDROID_NDK_LATEST_HOME $ndkLatestPath /M + [Environment]::SetEnvironmentVariable("ANDROID_NDK_LATEST_HOME", $ndkLatestPath, "Machine") } else { Write-Host "Latest NDK $ndkLatestVersion is not installed at path $ndkLatestPath" exit 1 diff --git a/images/windows/scripts/build/Install-Chrome.ps1 b/images/windows/scripts/build/Install-Chrome.ps1 index 7ef3649199e5..2a2341f3c697 100644 --- a/images/windows/scripts/build/Install-Chrome.ps1 +++ b/images/windows/scripts/build/Install-Chrome.ps1 @@ -78,7 +78,7 @@ Write-Host "Expand Chrome WebDriver archive (without using directory names)..." Extract-7Zip -Path $ChromeDriverArchPath -DestinationPath $ChromeDriverPath -ExtractMethod "e" Write-Host "Setting the environment variables..." -setx ChromeWebDriver "$ChromeDriverPath" /M +[Environment]::SetEnvironmentVariable("ChromeWebDriver", $ChromeDriverPath, "Machine") $regEnvKey = 'HKLM:\SYSTEM\CurrentControlSet\Control\Session Manager\Environment\' $PathValue = Get-ItemPropertyValue -Path $regEnvKey -Name 'Path' diff --git a/images/windows/scripts/build/Install-DotnetSDK.ps1 b/images/windows/scripts/build/Install-DotnetSDK.ps1 index b1f7abeaa4ca..f47fbe370713 100644 --- a/images/windows/scripts/build/Install-DotnetSDK.ps1 +++ b/images/windows/scripts/build/Install-DotnetSDK.ps1 @@ -6,9 +6,9 @@ ################################################################################ # Set environment variables -Set-SystemVariable -SystemVariable DOTNET_MULTILEVEL_LOOKUP -Value "0" -Set-SystemVariable -SystemVariable DOTNET_NOLOGO -Value "1" -Set-SystemVariable -SystemVariable DOTNET_SKIP_FIRST_TIME_EXPERIENCE -Value "1" +[System.Environment]::SetEnvironmentVariable("DOTNET_MULTILEVEL_LOOKUP", "0", "Machine") +[System.Environment]::SetEnvironmentVariable("DOTNET_NOLOGO", "1", "Machine") +[System.Environment]::SetEnvironmentVariable("DOTNET_SKIP_FIRST_TIME_EXPERIENCE", "1", "Machine") [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor "Tls12" diff --git a/images/windows/scripts/build/Install-EdgeDriver.ps1 b/images/windows/scripts/build/Install-EdgeDriver.ps1 index ff6af450d763..6aa74c0b287b 100644 --- a/images/windows/scripts/build/Install-EdgeDriver.ps1 +++ b/images/windows/scripts/build/Install-EdgeDriver.ps1 @@ -38,7 +38,7 @@ $EdgeDriverSignatureThumbprint = ("7C94971221A799907BB45665663BBFD587BAC9F8", "7 Test-FileSignature -FilePath "$EdgeDriverPath\msedgedriver.exe" -ExpectedThumbprint $EdgeDriverSignatureThumbprint Write-Host "Setting the environment variables..." -setx EdgeWebDriver "$EdgeDriverPath" /M +[Environment]::SetEnvironmentVariable("EdgeWebDriver", $EdgeDriverPath, "Machine") $regEnvKey = 'HKLM:\SYSTEM\CurrentControlSet\Control\Session Manager\Environment\' $PathValue = Get-ItemPropertyValue -Path $regEnvKey -Name 'Path' diff --git a/images/windows/scripts/build/Install-Firefox.ps1 b/images/windows/scripts/build/Install-Firefox.ps1 index ea23326783e5..11a7d6f4f400 100644 --- a/images/windows/scripts/build/Install-Firefox.ps1 +++ b/images/windows/scripts/build/Install-Firefox.ps1 @@ -58,6 +58,6 @@ Test-FileSignature -FilePath "$GeckoDriverPath/geckodriver.exe" -ExpectedThumbpr Write-Host "Setting the environment variables..." Add-MachinePathItem -PathItem $GeckoDriverPath -setx GeckoWebDriver "$GeckoDriverPath" /M +[Environment]::SetEnvironmentVariable("GeckoWebDriver", $GeckoDriverPath, "Machine") Invoke-PesterTests -TestFile "Browsers" -TestName "Firefox" diff --git a/images/windows/scripts/build/Install-Haskell.ps1 b/images/windows/scripts/build/Install-Haskell.ps1 index 07317ddd9f6d..8fee875bc29f 100644 --- a/images/windows/scripts/build/Install-Haskell.ps1 +++ b/images/windows/scripts/build/Install-Haskell.ps1 @@ -23,9 +23,9 @@ New-Item -Path "$ghcupPrefix\ghcup" -ItemType 'directory' -ErrorAction SilentlyC New-Item -Path "$ghcupPrefix\ghcup\bin" -ItemType 'directory' -ErrorAction SilentlyContinue | Out-Null Start-DownloadWithRetry -Url $ghcupDownloadURL -Name "ghcup.exe" -DownloadPath "$ghcupPrefix\ghcup\bin" -Set-SystemVariable "GHCUP_INSTALL_BASE_PREFIX" $ghcupPrefix -Set-SystemVariable "GHCUP_MSYS2" $msysPath -Set-SystemVariable "CABAL_DIR" $cabalDir +[System.Environment]::SetEnvironmentVariable("GHCUP_INSTALL_BASE_PREFIX", $ghcupPrefix, "Machine") +[System.Environment]::SetEnvironmentVariable("GHCUP_MSYS2", $msysPath, "Machine") +[System.Environment]::SetEnvironmentVariable("CABAL_DIR", $cabalDir, "Machine") Add-MachinePathItem "$ghcupPrefix\ghcup\bin" Add-MachinePathItem "$cabalDir\bin" diff --git a/images/windows/scripts/build/Install-IEWebDriver.ps1 b/images/windows/scripts/build/Install-IEWebDriver.ps1 index e7d34f632c4b..dac9756e9641 100644 --- a/images/windows/scripts/build/Install-IEWebDriver.ps1 +++ b/images/windows/scripts/build/Install-IEWebDriver.ps1 @@ -33,6 +33,6 @@ Write-Host "Get the IEDriver version..." (Get-Item "$ieDriverPath\IEDriverServer.exe").VersionInfo.FileVersion | Out-File -FilePath "$ieDriverPath\versioninfo.txt" Write-Host "Setting the IEWebDriver environment variables" -setx IEWebDriver $ieDriverPath /M +[Environment]::SetEnvironmentVariable("IEWebDriver", $ieDriverPath, "Machine") Invoke-PesterTests -TestFile "Browsers" -TestName "Internet Explorer" diff --git a/images/windows/scripts/build/Install-JavaTools.ps1 b/images/windows/scripts/build/Install-JavaTools.ps1 index d56d503584c8..9696fd9f53b5 100644 --- a/images/windows/scripts/build/Install-JavaTools.ps1 +++ b/images/windows/scripts/build/Install-JavaTools.ps1 @@ -20,7 +20,7 @@ function Set-JavaPath { } Write-Host "Set 'JAVA_HOME_${Version}_X64' environmental variable as $javaPath" - setx JAVA_HOME_${Version}_X64 $javaPath /M + [Environment]::SetEnvironmentVariable("JAVA_HOME_${Version}_X64", $javaPath, "Machine") if ($Default) { # Clean up any other Java folders from PATH to make sure that they won't conflict with each other @@ -42,7 +42,7 @@ function Set-JavaPath { Set-MachinePath -NewPath $newPath Write-Host "Set JAVA_HOME environmental variable as $javaPath" - setx JAVA_HOME $javaPath /M + [Environment]::SetEnvironmentVariable("JAVA_HOME", $javaPath, "Machine") } } @@ -129,9 +129,9 @@ $maven_opts = '-Xms256m' $m2_repo = 'C:\ProgramData\m2' New-Item -Path $m2_repo -ItemType Directory -Force | Out-Null -setx M2 $m2 /M -setx M2_REPO $m2_repo /M -setx MAVEN_OPTS $maven_opts /M +[Environment]::SetEnvironmentVariable("M2", $m2, "Machine") +[Environment]::SetEnvironmentVariable("M2_REPO", $m2_repo, "Machine") +[Environment]::SetEnvironmentVariable("MAVEN_OPTS", $maven_opts, "Machine") # Download cobertura jars $uri = 'https://repo1.maven.org/maven2/net/sourceforge/cobertura/cobertura/2.1.1/cobertura-2.1.1-bin.zip' @@ -143,6 +143,6 @@ $fileHash = (Get-FileHash -Path $archivePath -Algorithm SHA256).Hash Use-ChecksumComparison $fileHash $sha256sum Extract-7Zip -Path $archivePath -DestinationPath "C:\" -setx COBERTURA_HOME $coberturaPath /M +[Environment]::SetEnvironmentVariable("COBERTURA_HOME", $coberturaPath, "Machine") Invoke-PesterTests -TestFile "Java" diff --git a/images/windows/scripts/build/Install-Miniconda.ps1 b/images/windows/scripts/build/Install-Miniconda.ps1 index 746723e5c5a5..e81eeeaab4ec 100644 --- a/images/windows/scripts/build/Install-Miniconda.ps1 +++ b/images/windows/scripts/build/Install-Miniconda.ps1 @@ -12,7 +12,7 @@ $InstallerUrl = "https://repo.anaconda.com/miniconda/${InstallerName}" $ArgumentList = ("/S", "/AddToPath=0", "/RegisterPython=0", "/D=$CondaDestination") Install-Binary -Url $InstallerUrl -Name $InstallerName -ArgumentList $ArgumentList -Set-SystemVariable -SystemVariable "CONDA" -Value $CondaDestination +[System.Environment]::SetEnvironmentVariable("CONDA", $CondaDestination, "Machine") #region Supply chain security $localFileHash = (Get-FileHash -Path (Join-Path ${env:TEMP} $installerName) -Algorithm SHA256).Hash diff --git a/images/windows/scripts/build/Install-NodeJS.ps1 b/images/windows/scripts/build/Install-NodeJS.ps1 index 37840ad31a43..5487ff9ce3a7 100644 --- a/images/windows/scripts/build/Install-NodeJS.ps1 +++ b/images/windows/scripts/build/Install-NodeJS.ps1 @@ -18,7 +18,7 @@ Choco-Install -PackageName nodejs -ArgumentList "--version=$versionToInstall" Add-MachinePathItem $PrefixPath $env:Path = Get-MachinePath -setx npm_config_prefix $PrefixPath /M +[Environment]::SetEnvironmentVariable("npm_config_prefix", $PrefixPath, "Machine") $env:npm_config_prefix = $PrefixPath npm config set cache $CachePath --global diff --git a/images/windows/scripts/build/Install-PHP.ps1 b/images/windows/scripts/build/Install-PHP.ps1 index 40b1bcc0895e..c8b5ffea1cff 100644 --- a/images/windows/scripts/build/Install-PHP.ps1 +++ b/images/windows/scripts/build/Install-PHP.ps1 @@ -16,7 +16,7 @@ Choco-Install -PackageName composer -ArgumentList "--ia", "/DEV=$installDir /PHP ((Get-Content -path $installDir\php.ini -Raw) -replace ';extension=curl','extension=curl' -replace ';extension=mbstring','extension=mbstring' -replace ';extension_dir = "ext"','extension_dir = "ext"' -replace ';extension=openssl','extension=openssl') | Set-Content -Path $installDir\php.ini # Set the PHPROOT environment variable. -setx PHPROOT $installDir /M +[Environment]::SetEnvironmentVariable("PHPROOT", $installDir, "Machine") # Invoke Pester Tests Invoke-PesterTests -TestFile "PHP" diff --git a/images/windows/scripts/build/Install-Pipx.ps1 b/images/windows/scripts/build/Install-Pipx.ps1 index e4babf9901c1..fb86d71665e6 100644 --- a/images/windows/scripts/build/Install-Pipx.ps1 +++ b/images/windows/scripts/build/Install-Pipx.ps1 @@ -10,8 +10,8 @@ $env:PIPX_HOME = "${env:ProgramFiles(x86)}\pipx" pip install pipx Add-MachinePathItem "${env:PIPX_BIN_DIR}" -Set-SystemVariable -SystemVariable PIPX_BIN_DIR -Value $env:PIPX_BIN_DIR -Set-SystemVariable -SystemVariable PIPX_HOME -Value $env:PIPX_HOME +[System.Environment]::SetEnvironmentVariable("PIPX_BIN_DIR", $env:PIPX_BIN_DIR, "Machine") +[System.Environment]::SetEnvironmentVariable("PIPX_HOME", $env:PIPX_HOME, "Machine") Invoke-PesterTests -TestFile "Tools" -TestName "Pipx" diff --git a/images/windows/scripts/build/Install-PostgreSQL.ps1 b/images/windows/scripts/build/Install-PostgreSQL.ps1 index 40fd2e00f27d..f4d72d9c7690 100644 --- a/images/windows/scripts/build/Install-PostgreSQL.ps1 +++ b/images/windows/scripts/build/Install-PostgreSQL.ps1 @@ -3,22 +3,22 @@ $pgUser = "postgres" $pgPwd = "root" # Prepare environment variable for validation -Set-SystemVariable -SystemVariable PGUSER -Value $pgUser -Set-SystemVariable -SystemVariable PGPASSWORD -Value $pgPwd +[System.Environment]::SetEnvironmentVariable("PGUSER", $pgUser, "Machine") +[System.Environment]::SetEnvironmentVariable("PGPASSWORD", $pgPwd, "Machine") # Define latest available version to install based on version specified in the toolset $toolsetVersion = (Get-ToolsetContent).postgresql.version -$getPostgreReleases = Invoke-WebRequest -Uri "https://git.postgresql.org/gitweb/?p=postgresql.git;a=tags" -UseBasicParsing +$getPostgreReleases = Invoke-WebRequest -Uri "https://git.postgresql.org/gitweb/?p=postgresql.git;a=tags" -UseBasicParsing # Getting all links matched to the pattern (e.g.a=log;h=refs/tags/REL_14) -$TargetReleases = $getPostgreReleases.Links.href | Where-Object {$_ -match "a=log;h=refs/tags/REL_$toolsetVersion"} +$TargetReleases = $getPostgreReleases.Links.href | Where-Object { $_ -match "a=log;h=refs/tags/REL_$toolsetVersion" } [Int32]$OutNumber = $null $MinorVersions = @() foreach ($release in $TargetReleases) { - $version = $release.split('/')[-1] - # Checking if the latest symbol of the release version is actually a number. If yes, add to $MinorVersions array - if ([Int32]::TryParse($($version.Split('_')[-1]),[ref]$OutNumber)){ - $MinorVersions += $OutNumber - } + $version = $release.split('/')[-1] + # Checking if the latest symbol of the release version is actually a number. If yes, add to $MinorVersions array + if ([Int32]::TryParse($($version.Split('_')[-1]), [ref]$OutNumber)) { + $MinorVersions += $OutNumber + } } # Sorting and getting the last one $TargetMinorVersions = ($MinorVersions | Sort-Object)[-1] @@ -47,7 +47,7 @@ do { # Return the previous value of ErrorAction and invoke Install-Binary function $ErrorActionPreference = $ErrorActionOldValue $InstallerName = $InstallerUrl.Split('/')[-1] -$ArgumentList = ("--install_runtimes 0","--superpassword root","--enable_acledit 1","--unattendedmodeui none","--mode unattended") +$ArgumentList = ("--install_runtimes 0", "--superpassword root", "--enable_acledit 1", "--unattendedmodeui none", "--mode unattended") Install-Binary -Url $InstallerUrl -Name $InstallerName -ArgumentList $ArgumentList -ExpectedSignature (Get-ToolsetContent).postgresql.signature # Get Path to pg_ctl.exe @@ -63,16 +63,15 @@ $pgReadyPath = Join-Path $pgBin "pg_isready.exe" $pgReady = Start-Process -FilePath $pgReadyPath -Wait -PassThru $exitCode = $pgReady.ExitCode -if ($exitCode -ne 0) -{ +if ($exitCode -ne 0) { Write-Host -Object "PostgreSQL is not ready. Exitcode: $exitCode" exit $exitCode } # Added PostgreSQL environment variable -Set-SystemVariable -SystemVariable PGBIN -Value $pgBin -Set-SystemVariable -SystemVariable PGROOT -Value $pgRoot -Set-SystemVariable -SystemVariable PGDATA -Value $pgData +[System.Environment]::SetEnvironmentVariable("PGBIN", $pgBin, "Machine") +[System.Environment]::SetEnvironmentVariable("PGROOT", $pgRoot, "Machine") +[System.Environment]::SetEnvironmentVariable("PGDATA", $pgData, "Machine") # Stop and disable PostgreSQL service $pgService = Get-Service -Name postgresql* diff --git a/images/windows/scripts/build/Install-Selenium.ps1 b/images/windows/scripts/build/Install-Selenium.ps1 index 7a1043f660ba..2c321c8a207c 100644 --- a/images/windows/scripts/build/Install-Selenium.ps1 +++ b/images/windows/scripts/build/Install-Selenium.ps1 @@ -27,6 +27,6 @@ New-Item -Path $seleniumDirectory -Name "$seleniumBinaryName-$seleniumFullVersio # Add SELENIUM_JAR_PATH environment variable $seleniumBinPath = Join-Path $seleniumDirectory $seleniumFileName -setx "SELENIUM_JAR_PATH" "$($seleniumBinPath)" /M +[Environment]::SetEnvironmentVariable("SELENIUM_JAR_PATH", $seleniumBinPath, "Machine") Invoke-PesterTests -TestFile "Browsers" -TestName "Selenium" diff --git a/images/windows/scripts/build/Install-Vcpkg.ps1 b/images/windows/scripts/build/Install-Vcpkg.ps1 index 76e7d24f577c..ef93073ac27d 100644 --- a/images/windows/scripts/build/Install-Vcpkg.ps1 +++ b/images/windows/scripts/build/Install-Vcpkg.ps1 @@ -16,6 +16,6 @@ Invoke-Expression "$InstallDir\$VcpkgExecPath integrate install" # Add vcpkg to system environment Add-MachinePathItem $InstallDir $env:Path = Get-MachinePath -setx VCPKG_INSTALLATION_ROOT $InstallDir /M +[Environment]::SetEnvironmentVariable("VCPKG_INSTALLATION_ROOT", $InstallDir, "Machine") Invoke-PesterTests -TestFile "Tools" -TestName "Vcpkg" diff --git a/images/windows/scripts/helpers/ImageHelpers.psm1 b/images/windows/scripts/helpers/ImageHelpers.psm1 index ec7959cc7e51..e7136d319f95 100644 --- a/images/windows/scripts/helpers/ImageHelpers.psm1 +++ b/images/windows/scripts/helpers/ImageHelpers.psm1 @@ -19,7 +19,6 @@ Export-ModuleMember -Function @( 'Add-DefaultItem' 'Get-SystemVariable' 'Get-DefaultVariable' - 'Set-SystemVariable' 'Set-DefaultVariable' 'Install-Binary' 'Install-VisualStudio' diff --git a/images/windows/scripts/helpers/PathHelpers.ps1 b/images/windows/scripts/helpers/PathHelpers.ps1 index df7ce10ed93e..ca3a004ac76d 100644 --- a/images/windows/scripts/helpers/PathHelpers.ps1 +++ b/images/windows/scripts/helpers/PathHelpers.ps1 @@ -54,16 +54,6 @@ function Get-DefaultVariable { [System.GC]::Collect() } -function Set-SystemVariable { - param( - [string]$SystemVariable, - [string]$Value - ) - - [System.Environment]::SetEnvironmentVariable($SystemVariable, $Value, "Machine") - Get-SystemVariable $SystemVariable -} - function Set-DefaultVariable { param( [string]$DefaultVariable, @@ -93,7 +83,7 @@ function Set-MachinePath { [string]$NewPath ) - Set-SystemVariable PATH $NewPath + [System.Environment]::SetEnvironmentVariable("PATH", $NewPath, "Machine") } function Set-DefaultPath { diff --git a/images/windows/scripts/helpers/test/PathHelpers.Tests.ps1 b/images/windows/scripts/helpers/test/PathHelpers.Tests.ps1 index bbde2e226f03..bdbbb2aa0d68 100644 --- a/images/windows/scripts/helpers/test/PathHelpers.Tests.ps1 +++ b/images/windows/scripts/helpers/test/PathHelpers.Tests.ps1 @@ -25,10 +25,3 @@ Describe "Add-MachinePathItem Tests"{ Add-MachinePathItem -PathItem 'C:\baz' | Should Be 'C:\baz;C:\foo;C:\bar' } } - -Describe 'Set-SystemVariable Tests' { - Mock Set-ItemProperty {return} - It 'Set-SystemVariable should return new path' { - Set-SystemVariable -SystemVariable "NewPathVar" -Value "C:\baz" | Should Be "C:\baz" - } -} From 50ae10289a1d019551858f6a174f78d2e212bed4 Mon Sep 17 00:00:00 2001 From: sergei-pyshnoi <121864472+sergei-pyshnoi@users.noreply.github.com> Date: Fri, 17 Nov 2023 16:31:49 +0100 Subject: [PATCH 2452/3485] [Ubuntu] Pin sha256 for docker-compose and Alibaba Cloud CLI (#8790) * pin sha256 for docker-compose and Alibaba Cloud CLI * fix syntax in condition --- images/ubuntu/scripts/build/aliyun-cli.sh | 8 ++++++-- images/ubuntu/scripts/build/docker-compose.sh | 2 +- images/ubuntu/toolsets/toolset-2004.json | 3 ++- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/images/ubuntu/scripts/build/aliyun-cli.sh b/images/ubuntu/scripts/build/aliyun-cli.sh index d5495085d99c..33a8bf084ab1 100644 --- a/images/ubuntu/scripts/build/aliyun-cli.sh +++ b/images/ubuntu/scripts/build/aliyun-cli.sh @@ -14,7 +14,6 @@ source $HELPER_SCRIPTS/install.sh if isUbuntu20; then toolset_version=$(get_toolset_value '.aliyunCli.version') download_url="https://github.com/aliyun/aliyun-cli/releases/download/v$toolset_version/aliyun-cli-linux-$toolset_version-amd64.tgz" - hash_url="https://github.com/aliyun/aliyun-cli/releases/download/v$toolset_version/SHASUMS256.txt" else download_url=$(get_github_package_download_url "aliyun/aliyun-cli" "contains(\"aliyun-cli-linux\") and endswith(\"amd64.tgz\")") hash_url="https://github.com/aliyun/aliyun-cli/releases/latest/download/SHASUMS256.txt" @@ -24,7 +23,12 @@ package_name="aliyun-cli-linux-amd64.tgz" download_with_retries "$download_url" "/tmp" "$package_name" # Supply chain security - Alibaba Cloud CLI -external_hash=$(get_hash_from_remote_file "$hash_url" "aliyun-cli-linux" "amd64.tgz") +if isUbuntu20; then + external_hash=$(get_toolset_value '.aliyunCli.sha256') +else + external_hash=$(get_hash_from_remote_file "$hash_url" "aliyun-cli-linux" "amd64.tgz") +fi + use_checksum_comparison "/tmp/$package_name" "$external_hash" tar xzf "/tmp/$package_name" diff --git a/images/ubuntu/scripts/build/docker-compose.sh b/images/ubuntu/scripts/build/docker-compose.sh index a7383baa983e..8720c3f28da1 100644 --- a/images/ubuntu/scripts/build/docker-compose.sh +++ b/images/ubuntu/scripts/build/docker-compose.sh @@ -13,7 +13,7 @@ URL="https://github.com/docker/compose/releases/download/1.29.2/docker-compose-L curl -fsSL "${URL}" -o /tmp/docker-compose-v1 # Supply chain security - Docker Compose v1 -external_hash=$(get_hash_from_remote_file "${URL}.sha256" "compose-Linux-x86_64") +external_hash="f3f10cf3dbb8107e9ba2ea5f23c1d2159ff7321d16f0a23051d68d8e2547b323" use_checksum_comparison "/tmp/docker-compose-v1" "${external_hash}" install /tmp/docker-compose-v1 /usr/local/bin/docker-compose diff --git a/images/ubuntu/toolsets/toolset-2004.json b/images/ubuntu/toolsets/toolset-2004.json index b326f51684fe..316441426499 100644 --- a/images/ubuntu/toolsets/toolset-2004.json +++ b/images/ubuntu/toolsets/toolset-2004.json @@ -369,6 +369,7 @@ "version": "7.2" }, "aliyunCli": { - "version": "3.0.174" + "version": "3.0.174", + "sha256": "0c51028a7a32fc02c8de855f73e273556f957115eb5624565738f9b9f83a50ba" } } From 436da67f4bd24acde9d9119870203f9dbbcf3bbe Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Fri, 17 Nov 2023 22:21:45 +0100 Subject: [PATCH 2453/3485] [macos] change provisioner script rights (#8840) --- images/macos/assets/bootstrap-provisioner/change_password | 0 images/macos/assets/bootstrap-provisioner/kcpassword.py | 0 2 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 images/macos/assets/bootstrap-provisioner/change_password mode change 100644 => 100755 images/macos/assets/bootstrap-provisioner/kcpassword.py diff --git a/images/macos/assets/bootstrap-provisioner/change_password b/images/macos/assets/bootstrap-provisioner/change_password old mode 100644 new mode 100755 diff --git a/images/macos/assets/bootstrap-provisioner/kcpassword.py b/images/macos/assets/bootstrap-provisioner/kcpassword.py old mode 100644 new mode 100755 From 8bb825ba131f48691fd1adb189d6893819c49114 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 20 Nov 2023 12:48:32 +0000 Subject: [PATCH 2454/3485] Updating readme file for ubuntu20 version 20231115.8.1 (#8820) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2004-Readme.md | 119 +++++++++++++++-------------- 1 file changed, 63 insertions(+), 56 deletions(-) diff --git a/images/ubuntu/Ubuntu2004-Readme.md b/images/ubuntu/Ubuntu2004-Readme.md index 34761f96a9da..26d4fc1edac2 100644 --- a/images/ubuntu/Ubuntu2004-Readme.md +++ b/images/ubuntu/Ubuntu2004-Readme.md @@ -1,7 +1,14 @@ +| Announcements | +|-| +| [[all OSs] Nodejs 14.x will be removed from the images on November, 26](https://github.com/actions/runner-images/issues/8779) | +| [[Ubuntu] Ubuntu:16.04 & Ubuntu:18.04 docker images will be removed from runners on November, 19](https://github.com/actions/runner-images/issues/8776) | +| [Major Refactoring of GitHub Actions Runner Images Repository](https://github.com/actions/runner-images/issues/8706) | +| [[All OS] Android NDK r23 will be removed from images on November 13](https://github.com/actions/runner-images/issues/8383) | +*** # Ubuntu 20.04 - OS Version: 20.04.6 LTS -- Kernel Version: 5.15.0-1050-azure -- Image Version: 20231030.2.0 +- Kernel Version: 5.15.0-1051-azure +- Image Version: 20231115.8.0 - Systemd version: 245.4-4ubuntu3.22 ## Installed Software @@ -16,8 +23,8 @@ - Erlang rebar3 3.22.1 - GNU C++: 9.4.0, 10.5.0 - GNU Fortran: 9.4.0, 10.5.0 -- Julia 1.9.3 -- Kotlin 1.9.10-release-459 +- Julia 1.9.4 +- Kotlin 1.9.255-SNAPSHOT - Mono 6.12.0.200 - MSBuild 16.10.1.31701 (Mono 6.12.0.200) - Node.js 18.18.2 @@ -29,7 +36,7 @@ ### Package Management - cpan 1.64 - Helm 3.13.1 -- Homebrew 4.1.17 +- Homebrew 4.1.20 - Miniconda 23.9.0 - Npm 9.8.1 - NuGet 6.6.1.2 @@ -37,8 +44,8 @@ - Pip3 20.0.2 - Pipx 1.2.1 - RubyGems 3.1.2 -- Vcpkg (build from commit 06c79a9af) -- Yarn 1.22.19 +- Vcpkg (build from commit 2b14b606c) +- Yarn 1.22.21 #### Environment variables | Name | Value | @@ -57,77 +64,77 @@ to accomplish this. ### Project Management - Ant 1.10.7 - Gradle 8.4 -- Lerna 7.4.1 +- Lerna 7.4.2 - Maven 3.8.8 - Sbt 1.9.7 ### Tools - Ansible 2.13.13 - apt-fast 1.9.12 -- AzCopy 10.21.1 - available by `azcopy` and `azcopy10` aliases +- AzCopy 10.21.2 - available by `azcopy` and `azcopy10` aliases - Bazel 6.4.0 - Bazelisk 1.18.0 -- Bicep 0.22.6 +- Bicep 0.23.1 - Buildah 1.22.3 -- CMake 3.27.7 -- CodeQL Action Bundle 2.15.1 +- CMake 3.27.8 +- CodeQL Action Bundle 2.15.2 - Docker Amazon ECR Credential Helper 0.7.1 - Docker Compose v1 1.29.2 - Docker Compose v2 2.23.0 - Docker-Buildx 0.11.2 - Docker Client 24.0.7 - Docker Server 24.0.7 -- Fastlane 2.216.0 +- Fastlane 2.217.0 - Git 2.42.0 - Git LFS 3.4.0 - Git-ftp 1.6.0 - Haveged 1.9.1 -- Heroku 8.7.0 +- Heroku 8.7.1 - HHVM (HipHop VM) 4.172.1 - jq 1.6 - Kind 0.20.0 -- Kubectl 1.28.3 +- Kubectl 1.28.4 - Kustomize 5.2.1 - Leiningen 2.10.0 - MediaInfo 19.09 - Mercurial 5.3.1 -- Minikube 1.31.2 +- Minikube 1.32.0 - n 9.2.0 - Newman 6.0.0 - nvm 0.39.5 - OpenSSL 1.1.1f-1ubuntu2.20 - Packer 1.9.4 -- Parcel 2.10.1 +- Parcel 2.10.3 - PhantomJS 2.1.1 2.1.1 - Podman 3.4.2 -- Pulumi 3.91.1 -- R 4.3.1 +- Pulumi 3.94.0 +- R 4.3.2 - Skopeo 1.5.0 - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 -- Terraform 1.6.2 -- yamllint 1.32.0 +- Terraform 1.6.4 +- yamllint 1.33.0 - yq 4.35.2 - zstd 1.5.5 ### CLI Tools - Alibaba Cloud CLI 3.0.174 -- AWS CLI 2.13.30 +- AWS CLI 2.13.36 - AWS CLI Session Manager Plugin 1.2.497.0 -- AWS SAM CLI 1.99.0 -- Azure CLI 2.53.1 +- AWS SAM CLI 1.102.0 +- Azure CLI 2.54.0 - Azure CLI (azure-devops) 0.26.0 -- GitHub CLI 2.37.0 -- Google Cloud CLI 452.0.1 -- Netlify CLI 16.9.3 -- OpenShift CLI 4.13.18 +- GitHub CLI 2.39.1 +- Google Cloud CLI 455.0.0 +- Netlify CLI 17.3.2 +- OpenShift CLI 4.14.2 - ORAS CLI 1.1.0 -- Vercel CLI 32.5.0 +- Vercel CLI 32.5.4 ### Java | Version | Environment Variable | | ------------------- | -------------------- | -| 8.0.382+5 | JAVA_HOME_8_X64 | +| 8.0.392+8 | JAVA_HOME_8_X64 | | 11.0.21+9 (default) | JAVA_HOME_11_X64 | | 17.0.9+9 | JAVA_HOME_17_X64 | | 21.0.1+12 | JAVA_HOME_21_X64 | @@ -141,9 +148,9 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ``` ### Haskell Tools -- Cabal 3.10.1.0 +- Cabal 3.10.2.0 - GHC 9.8.1 -- GHCup 0.1.19.4 +- GHCup 0.1.20.0 - Stack 2.13.1 ### Rust Tools @@ -153,21 +160,21 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustup 1.26.0 #### Packages -- Bindgen 0.68.1 +- Bindgen 0.69.1 - Cargo audit 0.18.3 - Cargo clippy 0.1.73 -- Cargo outdated 0.13.1 +- Cargo outdated 0.14.0 - Cbindgen 0.26.0 - Rustfmt 1.6.0 ### Browsers and Drivers -- Google Chrome 118.0.5993.117 -- ChromeDriver 118.0.5993.70 -- Chromium 118.0.5993.0 -- Microsoft Edge 118.0.2088.76 -- Microsoft Edge WebDriver 118.0.2088.76 -- Selenium server 4.14.0 -- Mozilla Firefox 119.0 +- Google Chrome 119.0.6045.159 +- ChromeDriver 119.0.6045.105 +- Chromium 119.0.6045.0 +- Microsoft Edge 119.0.2151.58 +- Microsoft Edge WebDriver 119.0.2151.58 +- Selenium server 4.15.0 +- Mozilla Firefox 120.0 - Geckodriver 0.33.0 #### Environment variables @@ -179,7 +186,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | ### .NET Tools -- .NET Core SDK: 6.0.416, 7.0.113, 7.0.203, 7.0.310, 7.0.403 +- .NET Core SDK: 6.0.417, 7.0.114, 7.0.203, 7.0.311, 7.0.404, 8.0.100 - nbgv 3.6.133+2d32d93cb1 ### Databases @@ -187,7 +194,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - sqlite3 3.31.1 #### PostgreSQL -- PostgreSQL 14.9 +- PostgreSQL 14.10 ``` User: postgres PostgreSQL service is disabled by default. @@ -195,7 +202,7 @@ Use the following command as a part of your job to start the service: 'sudo syst ``` #### MySQL -- MySQL 8.0.34-0ubuntu0.20.04.1 +- MySQL 8.0.35-0ubuntu0.20.04.1 ``` User: root Password: root @@ -211,8 +218,8 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Go - 1.19.13 -- 1.20.10 -- 1.21.3 +- 1.20.11 +- 1.21.4 #### Node.js - 14.21.3 @@ -250,7 +257,7 @@ Use the following command as a part of your job to start the service: 'sudo syst - Az: 9.3.0 - Az (Cached): 3.1.0.zip, 4.4.0.zip, 5.9.0.zip, 6.6.0.zip, 7.5.0.zip - MarkdownPS: 1.9 -- Microsoft.Graph: 2.8.0 +- Microsoft.Graph: 2.9.0 - Pester: 5.5.0 - PSScriptAnalyzer: 1.21.0 @@ -274,8 +281,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | CMake | 3.10.2<br>3.18.1<br>3.22.1 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 23.2.8568313<br>24.0.8215888<br>25.2.9519653 (default)<br>26.1.10909125 | -| SDK Patch Applier v4 | 1 | +| NDK | 24.0.8215888<br>25.2.9519653 (default)<br>26.1.10909125 | #### Environment variables | Name | Value | @@ -293,20 +299,20 @@ Use the following command as a part of your job to start the service: 'sudo syst | alpine:3.16 | sha256:a8cbb8c69ee71561f4b69c066bad07f7e510caaa523da26fbfc606b10bd7934b | 2023-08-07 | | alpine:3.17 | sha256:f71a5f071694a785e064f05fed657bf8277f1b2113a8ed70c90ad486d6ee54dc | 2023-08-07 | | alpine:3.18 | sha256:eece025e432126ce23f223450a0326fbebde39cdf496a85d8c016293fc851978 | 2023-09-28 | -| buildpack-deps:bullseye | sha256:e5587c367e13ef9c01dede7c4085056a65e24caa7257a53c303c6c074fe6034e | 2023-10-12 | -| buildpack-deps:buster | sha256:82e25c1dea159632964a4c576380aa6ae9fd1d28c42b1f967d5474167ee4f6a1 | 2023-10-12 | +| buildpack-deps:bullseye | sha256:91d0d87bdeb73250aa8b9bc1739ab59e0df4e365dd7e459d1d453d46befd93c3 | 2023-11-01 | +| buildpack-deps:buster | sha256:994c0590e60c01834f0b716a12087fa53cdc8751260c9924a698e38e9548e12a | 2023-11-01 | | buildpack-deps:stretch | sha256:78e995165a5788c2f55aed6e548d8f6c1534830d4310c870408fccb2da8c5b2e | 2022-06-23 | -| debian:10 | sha256:853b9ec779e55f670cbdcb5e15bfb778b5be2c5c61fc8c655638b7a977d273c6 | 2023-10-11 | -| debian:11 | sha256:c141beaa9e0767774221cc82efe3a6712a1cc4f75d2699334dfd9a28a6f7357b | 2023-10-11 | +| debian:10 | sha256:53cf4f4dbe6f827072bde99045671754cca8174d0464d829c194a26e7ba2c134 | 2023-11-01 | +| debian:11 | sha256:a4aa0519fbd45786048bbc4daa7092fec803d22463f1cb6c4e7762dcb6a10cf0 | 2023-11-01 | | debian:9 | sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be | 2022-06-23 | | moby/buildkit:latest | sha256:d4187a7326f20d04fafd075f80ccc5d3f8cfd4f665c6e03d158a78e4f64bf3db | 2023-10-19 | | node:14 | sha256:a158d3b9b4e3fa813fa6c8c590b8f0a860e015ad4e59bbce5744d2f6fd8461aa | 2023-04-12 | | node:14-alpine | sha256:434215b487a329c9e867202ff89e704d3a75e554822e07f3e0c0f9e606121b33 | 2023-03-29 | | node:16 | sha256:f77a1aef2da8d83e45ec990f45df50f1a286c5fe8bbfb8c6e4246c6389705c0b | 2023-09-07 | | node:16-alpine | sha256:a1f9d027912b58a7c75be7716c97cfbc6d3099f3a97ed84aa490be9dee20e787 | 2023-08-10 | -| node:18 | sha256:a6385a6bb2fdcb7c48fc871e35e32af8daaa82c518900be49b76d10c005864c2 | 2023-10-18 | +| node:18 | sha256:7ce8b205d15e30fd395e5fa4000bcdf595fcff3f434fe75822e54e82a5f5cf82 | 2023-11-01 | | node:18-alpine | sha256:435dcad253bb5b7f347ebc69c8cc52de7c912eb7241098b920f2fc2d7843183d | 2023-10-18 | -| node:20 | sha256:62efd17e997bc843aefa4c003ed84f43dfac83fa6228c57c898482e50a02e45c | 2023-10-25 | +| node:20 | sha256:5f21943fe97b24ae1740da6d7b9c56ac43fe3495acb47c1b232b0a352b02a25c | 2023-11-01 | | node:20-alpine | sha256:8e015de364a2eb2ed7c52a558e9f716dcb615560ffd132234087c10ccc1f2c63 | 2023-10-25 | | ubuntu:16.04 | sha256:1f1a2d56de1d604801a9671f301190704c25d604a416f59e03c04f5c6ffee0d6 | 2021-08-31 | | ubuntu:18.04 | sha256:152dc042452c496007f07ca9127571cb9c29697f42acbfad72324b2bb2e43c98 | 2023-05-30 | @@ -349,7 +355,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | libcurl4 | 7.68.0-1ubuntu2.20 | | libgbm-dev | 21.2.6-0ubuntu0.1\~20.04.2 | | libgconf-2-4 | 3.2.6-6ubuntu1 | -| libgsl-dev | 2.5+dfsg-6build1 | +| libgsl-dev | 2.5+dfsg-6+deb10u1build0.20.04.1 | | libgtk-3-0 | 3.24.20-0ubuntu1.1 | | libmagic-dev | 1:5.38-4 | | libmagickcore-dev | 8:6.9.10.23+dfsg-2.1ubuntu11.9 | @@ -402,3 +408,4 @@ Use the following command as a part of your job to start the service: 'sudo syst | xz-utils | 5.2.4-1ubuntu1.1 | | zip | 3.0-11build1 | | zsync | 0.6.2-3ubuntu1 | + From 9c8a4aea907900d243fba55a5aa09f7137ad2b0b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 20 Nov 2023 13:07:42 +0000 Subject: [PATCH 2455/3485] Updating readme file for ubuntu22 version 20231115.7.1 (#8819) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2204-Readme.md | 123 +++++++++++++++-------------- 1 file changed, 65 insertions(+), 58 deletions(-) diff --git a/images/ubuntu/Ubuntu2204-Readme.md b/images/ubuntu/Ubuntu2204-Readme.md index 952a806ead68..0f957131f79a 100644 --- a/images/ubuntu/Ubuntu2204-Readme.md +++ b/images/ubuntu/Ubuntu2204-Readme.md @@ -1,7 +1,14 @@ +| Announcements | +|-| +| [[all OSs] Nodejs 14.x will be removed from the images on November, 26](https://github.com/actions/runner-images/issues/8779) | +| [[Ubuntu] Ubuntu:16.04 & Ubuntu:18.04 docker images will be removed from runners on November, 19](https://github.com/actions/runner-images/issues/8776) | +| [Major Refactoring of GitHub Actions Runner Images Repository](https://github.com/actions/runner-images/issues/8706) | +| [[All OS] Android NDK r23 will be removed from images on November 13](https://github.com/actions/runner-images/issues/8383) | +*** # Ubuntu 22.04 - OS Version: 22.04.3 LTS -- Kernel Version: 6.2.0-1015-azure -- Image Version: 20231030.2.0 +- Kernel Version: 6.2.0-1016-azure +- Image Version: 20231115.7.0 - Systemd version: 249.11-0ubuntu3.11 ## Installed Software @@ -13,9 +20,9 @@ - Clang-tidy: 13.0.1, 14.0.0, 15.0.7 - Dash 0.5.11+git20210903+057cd650a4ed-3build1 - GNU C++: 9.5.0, 10.5.0, 11.4.0, 12.3.0, 13.1.0 -- GNU Fortran: 9.5.0, 10.5.0, 11.4.0, 12.3.0 -- Julia 1.9.3 -- Kotlin 1.9.10-release-459 +- GNU Fortran: 9.5.0, 10.5.0, 11.4.0, 12.3.0, 13.1.0 +- Julia 1.9.4 +- Kotlin 1.9.255-SNAPSHOT - Mono 6.12.0.200 - MSBuild 16.10.1.31701 (Mono 6.12.0.200) - Node.js 18.18.2 @@ -27,7 +34,7 @@ ### Package Management - cpan 1.64 - Helm 3.13.1 -- Homebrew 4.1.17 +- Homebrew 4.1.20 - Miniconda 23.9.0 - Npm 9.8.1 - NuGet 6.6.1.2 @@ -35,8 +42,8 @@ - Pip3 22.0.2 - Pipx 1.2.1 - RubyGems 3.3.5 -- Vcpkg (build from commit 06c79a9af) -- Yarn 1.22.19 +- Vcpkg (build from commit 2b14b606c) +- Yarn 1.22.21 #### Environment variables | Name | Value | @@ -53,74 +60,74 @@ to accomplish this. ``` ### Project Management -- Lerna 7.4.1 +- Lerna 7.4.2 - Maven 3.8.8 ### Tools -- Ansible 2.15.5 +- Ansible 2.15.6 - apt-fast 1.9.12 -- AzCopy 10.21.1 - available by `azcopy` and `azcopy10` aliases +- AzCopy 10.21.2 - available by `azcopy` and `azcopy10` aliases - Bazel 6.4.0 - Bazelisk 1.18.0 -- Bicep 0.22.6 +- Bicep 0.23.1 - Buildah 1.23.1 -- CMake 3.27.7 -- CodeQL Action Bundle 2.15.1 +- CMake 3.27.8 +- CodeQL Action Bundle 2.15.2 - Docker Amazon ECR Credential Helper 0.7.1 - Docker Compose v1 1.29.2 - Docker Compose v2 2.23.0 - Docker-Buildx 0.11.2 - Docker Client 24.0.7 - Docker Server 24.0.7 -- Fastlane 2.216.0 +- Fastlane 2.217.0 - Git 2.42.0 - Git LFS 3.4.0 - Git-ftp 1.6.0 - Haveged 1.9.14 -- Heroku 8.7.0 +- Heroku 8.7.1 - jq 1.6 - Kind 0.20.0 -- Kubectl 1.28.3 +- Kubectl 1.28.4 - Kustomize 5.2.1 - Leiningen 2.10.0 - MediaInfo 21.09 - Mercurial 6.1.1 -- Minikube 1.31.2 +- Minikube 1.32.0 - n 9.2.0 - Newman 6.0.0 - nvm 0.39.5 - OpenSSL 3.0.2-0ubuntu1.12 - Packer 1.9.4 -- Parcel 2.10.1 +- Parcel 2.10.3 - Podman 3.4.4 -- Pulumi 3.91.1 -- R 4.3.1 +- Pulumi 3.94.0 +- R 4.3.2 - Skopeo 1.4.1 - Sphinx Open Source Search Server 2.2.11 - SVN 1.14.1 -- Terraform 1.6.2 -- yamllint 1.32.0 +- Terraform 1.6.4 +- yamllint 1.33.0 - yq 4.35.2 - zstd 1.5.5 ### CLI Tools -- Alibaba Cloud CLI 3.0.184 -- AWS CLI 2.13.30 +- Alibaba Cloud CLI 3.0.187 +- AWS CLI 2.13.36 - AWS CLI Session Manager Plugin 1.2.497.0 -- AWS SAM CLI 1.99.0 -- Azure CLI 2.53.1 +- AWS SAM CLI 1.102.0 +- Azure CLI 2.54.0 - Azure CLI (azure-devops) 0.26.0 -- GitHub CLI 2.37.0 -- Google Cloud CLI 452.0.1 -- Netlify CLI 16.9.3 -- OpenShift CLI 4.13.18 +- GitHub CLI 2.39.1 +- Google Cloud CLI 455.0.0 +- Netlify CLI 17.3.2 +- OpenShift CLI 4.14.2 - ORAS CLI 1.1.0 -- Vercel CLI 32.5.0 +- Vercel CLI 32.5.4 ### Java | Version | Environment Variable | | ------------------- | -------------------- | -| 8.0.382+5 | JAVA_HOME_8_X64 | +| 8.0.392+8 | JAVA_HOME_8_X64 | | 11.0.21+9 (default) | JAVA_HOME_11_X64 | | 17.0.9+9 | JAVA_HOME_17_X64 | | 21.0.1+12 | JAVA_HOME_21_X64 | @@ -134,9 +141,9 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ``` ### Haskell Tools -- Cabal 3.10.1.0 +- Cabal 3.10.2.0 - GHC 9.8.1 -- GHCup 0.1.19.4 +- GHCup 0.1.20.0 - Stack 2.13.1 ### Rust Tools @@ -146,21 +153,21 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustup 1.26.0 #### Packages -- Bindgen 0.68.1 +- Bindgen 0.69.1 - Cargo audit 0.18.3 - Cargo clippy 0.1.73 -- Cargo outdated 0.13.1 +- Cargo outdated 0.14.0 - Cbindgen 0.26.0 - Rustfmt 1.6.0 ### Browsers and Drivers -- Google Chrome 118.0.5993.117 -- ChromeDriver 118.0.5993.70 -- Chromium 118.0.5993.0 -- Microsoft Edge 118.0.2088.76 -- Microsoft Edge WebDriver 118.0.2088.76 -- Selenium server 4.14.0 -- Mozilla Firefox 119.0 +- Google Chrome 119.0.6045.159 +- ChromeDriver 119.0.6045.105 +- Chromium 119.0.6045.0 +- Microsoft Edge 119.0.2151.58 +- Microsoft Edge WebDriver 119.0.2151.58 +- Selenium server 4.15.0 +- Mozilla Firefox 120.0 - Geckodriver 0.33.0 #### Environment variables @@ -172,14 +179,14 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | ### .NET Tools -- .NET Core SDK: 6.0.416, 7.0.113, 7.0.203, 7.0.310, 7.0.403 +- .NET Core SDK: 6.0.417, 7.0.114, 7.0.203, 7.0.311, 7.0.404, 8.0.100 - nbgv 3.6.133+2d32d93cb1 ### Databases - sqlite3 3.37.2 #### PostgreSQL -- PostgreSQL 14.9 +- PostgreSQL 14.10 ``` User: postgres PostgreSQL service is disabled by default. @@ -187,7 +194,7 @@ Use the following command as a part of your job to start the service: 'sudo syst ``` #### MySQL -- MySQL 8.0.34-0ubuntu0.22.04.1 +- MySQL 8.0.35-0ubuntu0.22.04.1 ``` User: root Password: root @@ -203,8 +210,8 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Go - 1.19.13 -- 1.20.10 -- 1.21.3 +- 1.20.11 +- 1.21.4 #### Node.js - 14.21.3 @@ -235,7 +242,7 @@ Use the following command as a part of your job to start the service: 'sudo syst #### PowerShell Modules - Az: 9.3.0 - MarkdownPS: 1.9 -- Microsoft.Graph: 2.8.0 +- Microsoft.Graph: 2.9.0 - Pester: 5.5.0 - PSScriptAnalyzer: 1.21.0 @@ -258,8 +265,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | CMake | 3.10.2<br>3.18.1<br>3.22.1 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 23.2.8568313<br>24.0.8215888<br>25.2.9519653 (default)<br>26.1.10909125 | -| SDK Patch Applier v4 | 1 | +| NDK | 24.0.8215888<br>25.2.9519653 (default)<br>26.1.10909125 | #### Environment variables | Name | Value | @@ -277,18 +283,18 @@ Use the following command as a part of your job to start the service: 'sudo syst | alpine:3.16 | sha256:a8cbb8c69ee71561f4b69c066bad07f7e510caaa523da26fbfc606b10bd7934b | 2023-08-07 | | alpine:3.17 | sha256:f71a5f071694a785e064f05fed657bf8277f1b2113a8ed70c90ad486d6ee54dc | 2023-08-07 | | alpine:3.18 | sha256:eece025e432126ce23f223450a0326fbebde39cdf496a85d8c016293fc851978 | 2023-09-28 | -| buildpack-deps:bullseye | sha256:e5587c367e13ef9c01dede7c4085056a65e24caa7257a53c303c6c074fe6034e | 2023-10-12 | -| buildpack-deps:buster | sha256:82e25c1dea159632964a4c576380aa6ae9fd1d28c42b1f967d5474167ee4f6a1 | 2023-10-12 | -| debian:10 | sha256:853b9ec779e55f670cbdcb5e15bfb778b5be2c5c61fc8c655638b7a977d273c6 | 2023-10-11 | -| debian:11 | sha256:c141beaa9e0767774221cc82efe3a6712a1cc4f75d2699334dfd9a28a6f7357b | 2023-10-11 | +| buildpack-deps:bullseye | sha256:91d0d87bdeb73250aa8b9bc1739ab59e0df4e365dd7e459d1d453d46befd93c3 | 2023-11-01 | +| buildpack-deps:buster | sha256:994c0590e60c01834f0b716a12087fa53cdc8751260c9924a698e38e9548e12a | 2023-11-01 | +| debian:10 | sha256:53cf4f4dbe6f827072bde99045671754cca8174d0464d829c194a26e7ba2c134 | 2023-11-01 | +| debian:11 | sha256:a4aa0519fbd45786048bbc4daa7092fec803d22463f1cb6c4e7762dcb6a10cf0 | 2023-11-01 | | moby/buildkit:latest | sha256:d4187a7326f20d04fafd075f80ccc5d3f8cfd4f665c6e03d158a78e4f64bf3db | 2023-10-19 | | node:14 | sha256:a158d3b9b4e3fa813fa6c8c590b8f0a860e015ad4e59bbce5744d2f6fd8461aa | 2023-04-12 | | node:14-alpine | sha256:434215b487a329c9e867202ff89e704d3a75e554822e07f3e0c0f9e606121b33 | 2023-03-29 | | node:16 | sha256:f77a1aef2da8d83e45ec990f45df50f1a286c5fe8bbfb8c6e4246c6389705c0b | 2023-09-07 | | node:16-alpine | sha256:a1f9d027912b58a7c75be7716c97cfbc6d3099f3a97ed84aa490be9dee20e787 | 2023-08-10 | -| node:18 | sha256:a6385a6bb2fdcb7c48fc871e35e32af8daaa82c518900be49b76d10c005864c2 | 2023-10-18 | +| node:18 | sha256:7ce8b205d15e30fd395e5fa4000bcdf595fcff3f434fe75822e54e82a5f5cf82 | 2023-11-01 | | node:18-alpine | sha256:435dcad253bb5b7f347ebc69c8cc52de7c912eb7241098b920f2fc2d7843183d | 2023-10-18 | -| node:20 | sha256:62efd17e997bc843aefa4c003ed84f43dfac83fa6228c57c898482e50a02e45c | 2023-10-25 | +| node:20 | sha256:5f21943fe97b24ae1740da6d7b9c56ac43fe3495acb47c1b232b0a352b02a25c | 2023-11-01 | | node:20-alpine | sha256:8e015de364a2eb2ed7c52a558e9f716dcb615560ffd132234087c10ccc1f2c63 | 2023-10-25 | | ubuntu:18.04 | sha256:152dc042452c496007f07ca9127571cb9c29697f42acbfad72324b2bb2e43c98 | 2023-05-30 | | ubuntu:20.04 | sha256:ed4a42283d9943135ed87d4ee34e542f7f5ad9ecf2f244870e23122f703f91c2 | 2023-10-03 | @@ -386,3 +392,4 @@ Use the following command as a part of your job to start the service: 'sudo syst | xz-utils | 5.2.5-2ubuntu1 | | zip | 3.0-12build2 | | zsync | 0.6.2-3ubuntu1 | + From d5c955dfc7fa7eb1df798119781c606993cfc7a4 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 20 Nov 2023 13:36:45 +0000 Subject: [PATCH 2456/3485] Updating readme file for macos-13-arm64 version 20231115.2 (#8824) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-13-arm64-Readme.md | 100 +++++++++++++++++--------- 1 file changed, 66 insertions(+), 34 deletions(-) diff --git a/images/macos/macos-13-arm64-Readme.md b/images/macos/macos-13-arm64-Readme.md index 2c5a84f56bc3..6508084feb3f 100644 --- a/images/macos/macos-13-arm64-Readme.md +++ b/images/macos/macos-13-arm64-Readme.md @@ -1,12 +1,18 @@ +| Announcements | +|-| +| [[all OSs] Nodejs 14.x will be removed from the images on November, 26](https://github.com/actions/runner-images/issues/8779) | +| [Major Refactoring of GitHub Actions Runner Images Repository](https://github.com/actions/runner-images/issues/8706) | +| [[All OS] Android NDK r23 will be removed from images on November 13](https://github.com/actions/runner-images/issues/8383) | +*** # macOS 13 -- OS Version: macOS 13.6 (22G120) +- OS Version: macOS 13.6.1 (22G313) - Kernel Version: Darwin 22.6.0 -- Image Version: 20231024.2 +- Image Version: 20231115.2 ## Installed Software ### Language and Runtime -- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.403 +- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.404, 8.0.100 - Bash 3.2.57(1)-release - Clang/LLVM 14.0.3 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` @@ -16,22 +22,22 @@ - GNU Fortran 11 (Homebrew GCC 11.4.0) - available by `gfortran-11` alias - GNU Fortran 12 (Homebrew GCC 12.3.0) - available by `gfortran-12` alias - GNU Fortran 13 (Homebrew GCC 13.2.0) - available by `gfortran-13` alias -- Julia 1.9.3 -- Kotlin 1.9.10-release-459 +- Julia 1.9.4 +- Kotlin 1.9.255-SNAPSHOT - Mono 6.12.0.188 - Node.js 18.18.2 - Perl 5.38.0 -- R 4.3.1 +- R 4.3.2 - Ruby 3.0.6p216 ### Package Management -- Bundler 2.4.21 +- Bundler 2.4.22 - Carthage 0.39.1 -- CocoaPods 1.13.0 -- Homebrew 4.1.17 +- CocoaPods 1.14.2 +- Homebrew 4.1.20 - NPM 9.8.1 - NuGet 6.3.1.1 -- RubyGems 3.4.21 +- RubyGems 3.4.22 - Yarn 1.22.19 ### Project Management @@ -41,15 +47,15 @@ ### Utilities - 7-Zip 17.05 -- aria2 1.36.0 -- azcopy 10.21.0 +- aria2 1.37.0 +- azcopy 10.21.2 - bazel 6.4.0 - bazelisk 1.18.0 - bsdtar 3.5.3 - available by 'tar' alias - Curl 8.1.2 -- Git 2.42.0 +- Git 2.42.1 - Git LFS 3.4.0 -- GitHub CLI 2.37.0 +- GitHub CLI 2.39.1 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.21.4 - gpg (GnuPG) 2.4.3 @@ -61,24 +67,27 @@ - zstd 1.5.5 ### Tools -- Azure CLI 2.53.1 +- AWS CLI 2.13.36 +- AWS SAM CLI 1.102.0 +- AWS Session Manager CLI 1.2.497.0 +- Azure CLI 2.54.0 - Azure CLI (azure-devops) 0.26.0 -- Bicep CLI 0.22.6 +- Bicep CLI 0.23.1 - Cmake 3.27.7 -- CodeQL Action Bundle 2.15.1 -- Fastlane 2.216.0 -- SwiftFormat 0.52.8 +- CodeQL Action Bundle 2.15.2 +- Fastlane 2.217.0 +- SwiftFormat 0.52.9 - Xcode Command Line Tools 15.0.0.0.1.1694021235 ### Linters ### Browsers -- Safari 17.0 (18616.1.27.111.22) -- SafariDriver 17.0 (18616.1.27.111.22) -- Google Chrome 118.0.5993.117 -- Google Chrome for Testing 118.0.5993.70 -- ChromeDriver 118.0.5993.70 -- Selenium server 4.14.1 +- Safari 17.1 (18616.2.9.11.10) +- SafariDriver 17.1 (18616.2.9.11.10) +- Google Chrome 119.0.6045.159 +- Google Chrome for Testing 119.0.6045.105 +- ChromeDriver 119.0.6045.105 +- Selenium server 4.15.0 #### Environment variables | Name | Value | @@ -92,7 +101,7 @@ | ------------------ | -------------------- | | 11.0.21+9 | JAVA_HOME_11_arm64 | | 17.0.9+9 (default) | JAVA_HOME_17_arm64 | -| 21.0.1+12.0.LTS | JAVA_HOME_21_arm64 | +| 21.0.1+12.0 | JAVA_HOME_21_arm64 | ### Cached Tools @@ -102,11 +111,13 @@ #### Node.js - 16.20.1 -- 18.16.1 +- 18.18.2 +- 20.9.0 #### Go - 1.19.13 -- 1.20.8 +- 1.20.11 +- 1.21.4 ### Rust Tools - Cargo 1.73.0 @@ -115,18 +126,14 @@ - Rustup 1.26.0 #### Packages -- Bindgen 0.68.1 -- Cargo-audit 0.18.3 -- Cargo-outdated 0.13.1 -- Cbindgen 0.26.0 - Clippy 0.1.73 - Rustfmt 1.6.0-stable ### PowerShell Tools -- PowerShell 7.2.15 +- PowerShell 7.2.16 #### PowerShell Modules -- Az: 10.4.1 +- Az: 11.0.0 - Pester: 5.5.0 - PSScriptAnalyzer: 1.21.0 @@ -189,3 +196,28 @@ | watchOS 9.1 | 14.1<br>14.2<br>14.3.1<br>15.0.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | | watchOS 9.4 | 14.1<br>14.2<br>14.3.1<br>15.0.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | | watchOS 10.0 | 14.1<br>14.2<br>14.3.1<br>15.0.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | + +### Android +| Package Name | Version | +| -------------------------- | ------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 11.0 | +| Android Emulator | 32.1.15 | +| Android SDK Build-tools | 34.0.0<br>33.0.2 | +| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34 (rev 2)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | +| Android SDK Platform-Tools | 34.0.5 | +| Android Support Repository | 47.0.0 | +| CMake | 3.22.1 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 24.0.8215888<br>25.2.9519653<br>26.1.10909125 (default) | + +#### Environment variables +| Name | Value | +| ----------------------- | --------------------------------------------------- | +| ANDROID_HOME | /Users/runner/Library/Android/sdk | +| ANDROID_NDK | /Users/runner/Library/Android/sdk/ndk/26.1.10909125 | +| ANDROID_NDK_HOME | /Users/runner/Library/Android/sdk/ndk/26.1.10909125 | +| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/26.1.10909125 | +| ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk/26.1.10909125 | +| ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | + From b3ddd57d493bcde6146dc262cd2b492d6dbf1825 Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Mon, 20 Nov 2023 14:47:33 +0100 Subject: [PATCH 2457/3485] [macOS] Add xcodes and xcbeautify to macOS images (#8835) --- .../macos/scripts/docs-gen/SoftwareReport.Common.psm1 | 10 ++++++++++ .../scripts/docs-gen/SoftwareReport.Generator.ps1 | 6 ++++++ images/macos/toolsets/toolset-12.json | 4 +++- images/macos/toolsets/toolset-13.json | 4 +++- images/macos/toolsets/toolset-14.json | 4 +++- 5 files changed, 25 insertions(+), 3 deletions(-) diff --git a/images/macos/scripts/docs-gen/SoftwareReport.Common.psm1 b/images/macos/scripts/docs-gen/SoftwareReport.Common.psm1 index 29d2e9db7005..79e268399b13 100644 --- a/images/macos/scripts/docs-gen/SoftwareReport.Common.psm1 +++ b/images/macos/scripts/docs-gen/SoftwareReport.Common.psm1 @@ -626,3 +626,13 @@ function Get-PKGConfigVersion { $pkgconfigVersion = Run-Command "pkg-config --version" return $pkgconfigVersion } + +function Get-XcbeautifyVersion { + $XcbeautifyVersion = Run-Command "xcbeautify --version" + return $XcbeautifyVersion +} + +function Get-XcodesVersion { + $XcodesVersion = Run-Command "xcodes version" + return $XcodesVersion +} diff --git a/images/macos/scripts/docs-gen/SoftwareReport.Generator.ps1 b/images/macos/scripts/docs-gen/SoftwareReport.Generator.ps1 index b6825864b3db..3872575fa33d 100644 --- a/images/macos/scripts/docs-gen/SoftwareReport.Generator.ps1 +++ b/images/macos/scripts/docs-gen/SoftwareReport.Generator.ps1 @@ -185,7 +185,13 @@ $tools.AddToolVersion("SwiftFormat", $(Get-SwiftFormatVersion)) if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) { $tools.AddToolVersion("Swig", $(Get-SwigVersion)) } +if (-not $os.IsBigSur) { + $tools.AddToolVersion("Xcbeautify", $(Get-XcbeautifyVersion)) +} $tools.AddToolVersion("Xcode Command Line Tools", $(Get-XcodeCommandLineToolsVersion)) +if (-not $os.IsBigSur) { + $tools.AddToolVersion("Xcodes", $(Get-XcodesVersion)) +} # Linters $linters = $installedSoftware.AddHeader("Linters") diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index 487645501068..b1cf785cb77a 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -206,7 +206,9 @@ "r", "yq", "imagemagick", - "unxip" + "unxip", + "xcbeautify", + "xcodes" ], "cask_packages": [ "julia", diff --git a/images/macos/toolsets/toolset-13.json b/images/macos/toolsets/toolset-13.json index 82fad8291390..bf3c2c591ad0 100644 --- a/images/macos/toolsets/toolset-13.json +++ b/images/macos/toolsets/toolset-13.json @@ -74,7 +74,9 @@ "gmp", "r", "yq", - "unxip" + "unxip", + "xcbeautify", + "xcodes" ], "cask_packages": [ "julia" diff --git a/images/macos/toolsets/toolset-14.json b/images/macos/toolsets/toolset-14.json index a45ccf5c344c..81b5b0dcb0ef 100644 --- a/images/macos/toolsets/toolset-14.json +++ b/images/macos/toolsets/toolset-14.json @@ -70,7 +70,9 @@ "gmp", "r", "yq", - "unxip" + "unxip", + "xcbeautify", + "xcodes" ], "cask_packages": [ "julia" From 3275edff484bffe7c50915d76ec904c453f1515a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 20 Nov 2023 13:56:28 +0000 Subject: [PATCH 2458/3485] Windows Server 2019 (20231115) Image Update (#8825) * Updating readme file for win19 version 20231115.10.1 * Update Windows2019-Readme.md --------- Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/windows/Windows2019-Readme.md | 110 ++++++++++++++------------- 1 file changed, 58 insertions(+), 52 deletions(-) diff --git a/images/windows/Windows2019-Readme.md b/images/windows/Windows2019-Readme.md index 38ea4d6bf19e..a8e2c856c6a2 100644 --- a/images/windows/Windows2019-Readme.md +++ b/images/windows/Windows2019-Readme.md @@ -1,6 +1,12 @@ +| Announcements | +|-| +| [[all OSs] Nodejs 14.x will be removed from the images on November, 26](https://github.com/actions/runner-images/issues/8779) | +| [Major Refactoring of GitHub Actions Runner Images Repository](https://github.com/actions/runner-images/issues/8706) | +| [[All OS] Android NDK r23 will be removed from images on November 13](https://github.com/actions/runner-images/issues/8383) | +*** # Windows Server 2019 -- OS Version: 10.0.17763 Build 4974 -- Image Version: 20231029.1.0 +- OS Version: 10.0.17763 Build 5122 +- Image Version: 20231115.10.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -9,9 +15,9 @@ ### Language and Runtime - Bash 5.2.15(1)-release -- Go 1.20.10 +- Go 1.20.11 - Julia 1.9.3 -- Kotlin 1.9.10 +- Kotlin 1.9.20 - LLVM 16.0.6 - Node 18.18.2 - Perl 5.32.1 @@ -22,15 +28,15 @@ ### Package Management - Chocolatey 2.2.2 - Composer 2.6.5 -- Helm 3.13.0 +- Helm 3.13.1 - Miniconda 23.9.0 (pre-installed on the image but not added to PATH) - NPM 9.8.1 - NuGet 6.7.0.127 - pip 23.3.1 (python 3.7) - Pipx 1.2.1 - RubyGems 2.7.6.3 -- Vcpkg (build from commit 06c79a9af) -- Yarn 1.22.19 +- Vcpkg (build from commit 67e861818) +- Yarn 1.22.21 #### Environment variables | Name | Value | @@ -50,10 +56,10 @@ - azcopy 10.21.1 - Bazel 6.4.0 - Bazelisk 1.18.0 -- Bicep 0.22.6 -- Cabal 3.10.1.0 +- Bicep 0.23.1 +- Cabal 3.10.2.0 - CMake 3.27.7 -- CodeQL Action Bundle 2.15.1 +- CodeQL Action Bundle 2.15.2 - Docker 24.0.7 - Docker Compose v1 1.29.2 - Docker Compose v2 2.23.0 @@ -61,7 +67,7 @@ - ghc 9.8.1 - Git 2.42.0.windows.2 - Git LFS 3.4.0 -- Google Cloud CLI 452.0.1 +- Google Cloud CLI 455.0.0 - ImageMagick 7.1.1-21 - InnoSetup 6.2.2 - jq 1.7-dirty @@ -75,9 +81,9 @@ - NSIS 3.08 - OpenSSL 1.1.1w - Packer 1.9.4 -- Parcel 2.10.1 -- Pulumi 3.91.1 -- R 4.3.1 +- Parcel 2.10.3 +- Pulumi 3.94.0 +- R 4.3.2 - Service Fabric SDK 9.1.1436.9590 - Stack 2.13.1 - Subversion (SVN) 1.14.2 @@ -89,14 +95,14 @@ - zstd 1.5.5 ### CLI Tools -- Alibaba Cloud CLI 3.0.184 -- AWS CLI 2.13.30 -- AWS SAM CLI 1.99.0 +- Alibaba Cloud CLI 3.0.187 +- AWS CLI 2.13.35 +- AWS SAM CLI 1.102.0 - AWS Session Manager CLI 1.2.497.0 -- Azure CLI 2.53.1 +- Azure CLI 2.54.0 - Azure DevOps CLI extension 0.26.0 - Cloud Foundry CLI 6.53.0 -- GitHub CLI 2.37.0 +- GitHub CLI 2.39.1 ### Rust Tools - Cargo 1.73.0 @@ -105,22 +111,22 @@ - Rustup 1.26.0 #### Packages -- bindgen 0.68.1 +- bindgen 0.69.1 - cargo-audit 0.18.3 -- cargo-outdated 0.13.1 +- cargo-outdated 0.14.0 - cbindgen 0.26.0 - Clippy 0.1.73 - Rustfmt 1.6.0 ### Browsers and Drivers -- Google Chrome 118.0.5993.118 -- Chrome Driver 118.0.5993.70 -- Microsoft Edge 118.0.2088.76 -- Microsoft Edge Driver 118.0.2088.76 -- Mozilla Firefox 119.0 +- Google Chrome 119.0.6045.160 +- Chrome Driver 119.0.6045.105 +- Microsoft Edge 119.0.2151.58 +- Microsoft Edge Driver 119.0.2151.58 +- Mozilla Firefox 119.0.1 - Gecko Driver 0.33.0 - IE Driver 4.14.0.0 -- Selenium server 4.14.0 +- Selenium server 4.15.0 #### Environment variables | Name | Value | @@ -162,8 +168,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Go - 1.19.13 -- 1.20.10 -- 1.21.3 +- 1.20.11 +- 1.21.4 #### Node.js - 14.21.3 @@ -200,7 +206,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Property | Value | | -------------------- | ------------------------------------------------------------------------------------------------------------------------------------ | | ServiceName | postgresql-x64-14 | -| Version | 14.9 | +| Version | 14.10 | | ServiceStatus | Stopped | | ServiceStartType | Disabled | | EnvironmentVariables | PGBIN=C:\Program Files\PostgreSQL\14\bin <br> PGDATA=C:\Program Files\PostgreSQL\14\data <br> PGROOT=C:\Program Files\PostgreSQL\14 | @@ -211,7 +217,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### MongoDB | Version | ServiceName | ServiceStatus | ServiceStartType | | -------- | ----------- | ------------- | ---------------- | -| 5.0.21.0 | MongoDB | Stopped | Disabled | +| 5.0.22.0 | MongoDB | Stopped | Disabled | ### Database tools - Azure CosmosDb Emulator 2.14.12.0 @@ -229,12 +235,12 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Visual Studio Enterprise 2019 | Name | Version | Path | | ----------------------------- | --------------- | -------------------------------------------------------------- | -| Visual Studio Enterprise 2019 | 16.11.34114.132 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | +| Visual Studio Enterprise 2019 | 16.11.34301.259 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | #### Workloads, components and extensions | Package | Version | | ------------------------------------------------------------------------- | --------------- | -| Component.Android.NDK.R16B | 16.11.34114.51 | +| Component.Android.NDK.R16B | 16.11.34231.236 | | Component.Android.SDK25.Private | 16.0.28625.61 | | Component.Android.SDK30 | 16.10.31205.252 | | Component.Ant | 1.9.3.8 | @@ -473,12 +479,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 Debug Runtime | x64 | 14.29.30139 | -| Microsoft Visual C++ 2019 Debug Runtime | x86 | 14.29.30139 | -| Microsoft Visual C++ 2022 Additional Runtime | x64 | 14.36.32532 | -| Microsoft Visual C++ 2022 Minimum Runtime | x64 | 14.36.32532 | -| Microsoft Visual C++ 2022 Additional Runtime | x86 | 14.36.32532 | -| Microsoft Visual C++ 2022 Minimum Runtime | x86 | 14.36.32532 | +| Microsoft Visual C++ 2019 Debug Runtime | x64 | 14.29.30153 | +| Microsoft Visual C++ 2019 Debug Runtime | x86 | 14.29.30153 | +| Microsoft Visual C++ 2022 Additional Runtime | x64 | 14.38.33130 | +| Microsoft Visual C++ 2022 Minimum Runtime | x64 | 14.38.33130 | +| Microsoft Visual C++ 2022 Additional Runtime | x86 | 14.38.33130 | +| Microsoft Visual C++ 2022 Minimum Runtime | x86 | 14.38.33130 | #### Installed Windows SDKs - 10.0.14393.0 @@ -492,11 +498,11 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 10.0.22621.0 ### .NET Core Tools -- .NET Core SDK: 6.0.124, 6.0.203, 6.0.319, 6.0.416 +- .NET Core SDK: 6.0.125, 6.0.203, 6.0.320, 6.0.417, 7.0.114, 7.0.203, 7.0.311, 7.0.404 - .NET Framework: 4.7.2, 4.8 -- Microsoft.AspNetCore.App: 6.0.5, 6.0.24 -- Microsoft.NETCore.App: 6.0.5, 6.0.24 -- Microsoft.WindowsDesktop.App: 6.0.5, 6.0.24 +- Microsoft.AspNetCore.App: 6.0.5, 6.0.25, 7.0.5, 7.0.14 +- Microsoft.NETCore.App: 6.0.5, 6.0.25, 7.0.5, 7.0.14 +- Microsoft.WindowsDesktop.App: 6.0.5, 6.0.25, 7.0.5, 7.0.14 - nbgv 3.6.133+2d32d93cb1 ### PowerShell Tools @@ -509,10 +515,10 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Az (Cached): 1.0.0.zip, 1.6.0.zip, 2.3.2.zip, 2.6.0.zip, 3.1.0.zip, 3.5.0.zip, 3.8.0.zip, 4.3.0.zip, 4.4.0.zip, 4.7.0.zip, 5.5.0.zip, 5.9.0.zip, 6.6.0.zip, 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.440 +- AWSPowershell: 4.1.453 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 -- Microsoft.Graph: 2.8.0 +- Microsoft.Graph: 2.9.0 - Pester: 3.4.0, 5.5.0 - PowerShellGet: 1.0.0.1, 2.2.5 - PSScriptAnalyzer: 1.21.0 @@ -538,8 +544,7 @@ All other versions are saved but not installed. | Google APIs | addon-google_apis-google-21<br>addon-google_apis-google-22<br>addon-google_apis-google-23<br>addon-google_apis-google-24 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 23.2.8568313<br>24.0.8215888<br>25.2.9519653<br>26.1.10909125 | -| SDK Patch Applier v4 | 1 | +| NDK | 24.0.8215888<br>25.2.9519653<br>26.1.10909125 | #### Environment variables | Name | Value | @@ -554,8 +559,9 @@ All other versions are saved but not installed. ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:ff2952603dbf90761b5b8af0f9bdd3d1cdd123a43d2cd54b09c871e18864aa6e | 2023-10-10 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:2173a3e2b0c4d9f77bb32846c36c0e9fe27813fe2f19ad868fb5f891486bbc7e | 2023-10-10 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:9d2262cd7ac6f4dd4964086e353ba9253be48b5709f850564f877b8dea9614ec | 2023-10-10 | -| mcr.microsoft.com/windows/nanoserver:1809 | sha256:bed3cb2d55f44371fdeebdabf97e8679347748c16dec0d2c351e25fb0b7bbb32 | 2023-10-02 | -| mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:b3b5f1d43d7004541aae6f0c2ead0c70d943c85653f0e37861c73eaa9d687c42 | 2023-10-02 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:551a34fca19fcaf95eda0940b9fdb6bc4e5f6db4e95843de7748ab8a940bb436 | 2023-11-14 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:56853d8287c49f7544a119f5ab03b6348662d80f6bae68eb50b36e009ef4469a | 2023-11-14 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:3ff7fe9ba749cc5a60297511a40b428bb0694561f9de53cfeb06add0951e2766 | 2023-11-14 | +| mcr.microsoft.com/windows/nanoserver:1809 | sha256:9886d51a1214934b69236ad05b480cecea4953ba5e88bc306e967744a413d588 | 2023-11-09 | +| mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:4fe58f25a157ea749c7b770acebfdbd70c3cb2088c446943e90fe89ea059558b | 2023-11-09 | + From 3977803d812a3f9838c1aa3ef658bc0afd3e485b Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Mon, 20 Nov 2023 17:01:34 +0100 Subject: [PATCH 2459/3485] [Windows] Fix signature for MS Edge webdriver (#8844) --- images/windows/scripts/build/Install-EdgeDriver.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/windows/scripts/build/Install-EdgeDriver.ps1 b/images/windows/scripts/build/Install-EdgeDriver.ps1 index 6aa74c0b287b..cae78844db93 100644 --- a/images/windows/scripts/build/Install-EdgeDriver.ps1 +++ b/images/windows/scripts/build/Install-EdgeDriver.ps1 @@ -34,7 +34,7 @@ Write-Host "Expand Microsoft Edge WebDriver archive..." Extract-7Zip -Path $EdgeDriverArchPath -DestinationPath $EdgeDriverPath #Validate the EdgeDriver signature -$EdgeDriverSignatureThumbprint = ("7C94971221A799907BB45665663BBFD587BAC9F8", "70E52D50651BB9E8DC08DE566C4DD5713833B038") +$EdgeDriverSignatureThumbprint = "CB9C4FBEA1D87D2D468AC5A9CAAB0163F6AD8401" Test-FileSignature -FilePath "$EdgeDriverPath\msedgedriver.exe" -ExpectedThumbprint $EdgeDriverSignatureThumbprint Write-Host "Setting the environment variables..." From 50625a842ad09f741de40651332bdc6064c7f0a9 Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Mon, 20 Nov 2023 18:18:40 +0100 Subject: [PATCH 2460/3485] Fix SBOM workflow logic (#8848) * Fix SBOM workflow logic * Revert SYFT pinning for Windows --- .github/workflows/create_sbom_report.yml | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/.github/workflows/create_sbom_report.yml b/.github/workflows/create_sbom_report.yml index a44c3b1e02b8..1f4896515460 100644 --- a/.github/workflows/create_sbom_report.yml +++ b/.github/workflows/create_sbom_report.yml @@ -15,7 +15,7 @@ defaults: shell: pwsh jobs: #Checking image version on available runner - version-check: + building-sbom: runs-on: ${{ github.event.client_payload.agentSpec }} steps: - name: Available image version check for ${{ github.event.client_payload.ReleaseBranchName }} @@ -26,15 +26,9 @@ jobs: if ("$imageMajorVersion.$imageMinorVersion" -ne '${{ github.event.client_payload.imageVersion }}') { throw "Current runner $imageMajorVersion.$imageMinorVersion image version doesn't match ${{ github.event.client_payload.imageVersion }}." } - #Install and run SYFT, compress SBOM, upload it to release assets - create-sbom: - needs: version-check - runs-on: ${{ github.event.client_payload.agentSpec }} - steps: - #Installation section - name: Install SYFT tool on Windows if: ${{ runner.os == 'Windows' }} - run: curl -sSfL https://raw.githubusercontent.com/anchore/syft/main/install.sh | sh -s -- -b D:/syft v0.84.1 + run: curl -sSfL https://raw.githubusercontent.com/anchore/syft/main/install.sh | sh -s -- -b D:/syft - name: Install SYFT tool on Ubuntu or macOS if: ${{ runner.os != 'Windows' }} run: curl -sSfL https://raw.githubusercontent.com/anchore/syft/main/install.sh | sh -s -- -b /usr/local/bin @@ -68,4 +62,4 @@ jobs: upload_url: "https://uploads.github.com/repos/actions/runner-images/releases/${{ github.event.client_payload.ReleaseID }}/assets{?name,label}" asset_path: ./sbom.json.zip asset_name: sbom.${{ github.event.client_payload.agentSpec }}.json.zip - asset_content_type: application/zip \ No newline at end of file + asset_content_type: application/zip From 66991d2b2c13c60c3c9326aec9147798db173895 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 21 Nov 2023 09:27:15 +0000 Subject: [PATCH 2461/3485] Windows Server 2022 (20231115) Image Update (#8826) * Updating readme file for win22 version 20231115.2.1 * Update Windows2022-Readme.md --------- Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/windows/Windows2022-Readme.md | 673 ++++++++++++++------------- 1 file changed, 346 insertions(+), 327 deletions(-) diff --git a/images/windows/Windows2022-Readme.md b/images/windows/Windows2022-Readme.md index 57157d5ce3bb..093f42d4dce2 100644 --- a/images/windows/Windows2022-Readme.md +++ b/images/windows/Windows2022-Readme.md @@ -1,6 +1,12 @@ +| Announcements | +|-| +| [[all OSs] Nodejs 14.x will be removed from the images on November, 26](https://github.com/actions/runner-images/issues/8779) | +| [Major Refactoring of GitHub Actions Runner Images Repository](https://github.com/actions/runner-images/issues/8706) | +| [[All OS] Android NDK r23 will be removed from images on November 13](https://github.com/actions/runner-images/issues/8383) | +*** # Windows Server 2022 -- OS Version: 10.0.20348 Build 2031 -- Image Version: 20231029.1.0 +- OS Version: 10.0.20348 Build 2113 +- Image Version: 20231115.2.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -9,9 +15,9 @@ ### Language and Runtime - Bash 5.2.15(1)-release -- Go 1.20.10 +- Go 1.20.11 - Julia 1.9.3 -- Kotlin 1.9.10 +- Kotlin 1.9.20 - LLVM 16.0.6 - Node 18.18.2 - Perl 5.32.1 @@ -22,15 +28,15 @@ ### Package Management - Chocolatey 2.2.2 - Composer 2.6.5 -- Helm 3.13.0 +- Helm 3.13.1 - Miniconda 23.9.0 (pre-installed on the image but not added to PATH) - NPM 9.8.1 - NuGet 6.7.0.127 - pip 23.3.1 (python 3.9) - Pipx 1.2.1 - RubyGems 3.2.33 -- Vcpkg (build from commit 06c79a9af) -- Yarn 1.22.19 +- Vcpkg (build from commit 2b14b606c) +- Yarn 1.22.21 #### Environment variables | Name | Value | @@ -50,10 +56,10 @@ - azcopy 10.21.1 - Bazel 6.4.0 - Bazelisk 1.18.0 -- Bicep 0.22.6 -- Cabal 3.10.1.0 +- Bicep 0.23.1 +- Cabal 3.10.2.0 - CMake 3.27.7 -- CodeQL Action Bundle 2.15.1 +- CodeQL Action Bundle 2.15.2 - Docker 24.0.7 - Docker Compose v1 1.29.2 - Docker Compose v2 2.23.0 @@ -74,8 +80,8 @@ - NSIS 3.08 - OpenSSL 1.1.1w - Packer 1.9.4 -- Pulumi 3.91.1 -- R 4.3.1 +- Pulumi 3.93.0 +- R 4.3.2 - Service Fabric SDK 9.1.1436.9590 - Stack 2.13.1 - Subversion (SVN) 1.14.2 @@ -83,17 +89,17 @@ - VSWhere 3.1.7 - WinAppDriver 1.2.2009.02003 - WiX Toolset 3.11.2.4516 -- yamllint 1.32.0 +- yamllint 1.33.0 - zstd 1.5.5 ### CLI Tools -- Alibaba Cloud CLI 3.0.184 -- AWS CLI 2.13.30 -- AWS SAM CLI 1.99.0 +- Alibaba Cloud CLI 3.0.187 +- AWS CLI 2.13.34 +- AWS SAM CLI 1.102.0 - AWS Session Manager CLI 1.2.497.0 -- Azure CLI 2.53.1 +- Azure CLI 2.54.0 - Azure DevOps CLI extension 0.26.0 -- GitHub CLI 2.37.0 +- GitHub CLI 2.39.1 ### Rust Tools - Cargo 1.73.0 @@ -102,22 +108,22 @@ - Rustup 1.26.0 #### Packages -- bindgen 0.68.1 +- bindgen 0.69.1 - cargo-audit 0.18.3 -- cargo-outdated 0.13.1 +- cargo-outdated 0.14.0 - cbindgen 0.26.0 - Clippy 0.1.73 - Rustfmt 1.6.0 ### Browsers and Drivers -- Google Chrome 118.0.5993.118 -- Chrome Driver 118.0.5993.70 -- Microsoft Edge 118.0.2088.76 -- Microsoft Edge Driver 118.0.2088.76 -- Mozilla Firefox 119.0 +- Google Chrome 119.0.6045.160 +- Chrome Driver 119.0.6045.105 +- Microsoft Edge 119.0.2151.58 +- Microsoft Edge Driver 119.0.2151.58 +- Mozilla Firefox 119.0.1 - Gecko Driver 0.33.0 - IE Driver 4.14.0.0 -- Selenium server 4.14.0 +- Selenium server 4.15.0 #### Environment variables | Name | Value | @@ -156,8 +162,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Go - 1.19.13 -- 1.20.10 -- 1.21.3 +- 1.20.11 +- 1.21.4 #### Node.js - 14.21.3 @@ -191,7 +197,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Property | Value | | -------------------- | ------------------------------------------------------------------------------------------------------------------------------------ | | ServiceName | postgresql-x64-14 | -| Version | 14.9 | +| Version | 14.10 | | ServiceStatus | Stopped | | ServiceStartType | Disabled | | EnvironmentVariables | PGBIN=C:\Program Files\PostgreSQL\14\bin <br> PGDATA=C:\Program Files\PostgreSQL\14\data <br> PGROOT=C:\Program Files\PostgreSQL\14 | @@ -202,7 +208,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### MongoDB | Version | ServiceName | ServiceStatus | ServiceStartType | | -------- | ----------- | ------------- | ---------------- | -| 5.0.21.0 | MongoDB | Stopped | Disabled | +| 5.0.22.0 | MongoDB | Stopped | Disabled | ### Database tools - Azure CosmosDb Emulator 2.14.12.0 @@ -218,299 +224,312 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Nginx | 1.25.3 | C:\tools\nginx-1.25.3\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2022 -| Name | Version | Path | -| ----------------------------- | ------------- | -------------------------------------------------------- | -| Visual Studio Enterprise 2022 | 17.7.34221.43 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | +| Name | Version | Path | +| ----------------------------- | -------------- | -------------------------------------------------------- | +| Visual Studio Enterprise 2022 | 17.8.34309.116 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | #### Workloads, components and extensions | Package | Version | | ------------------------------------------------------------------------- | --------------- | -| android | 33.0.68.0 | -| Component.Android.Emulator.MDD | 17.7.33905.399 | -| Component.Android.NDK.R23C | 17.7.33905.399 | -| Component.Android.SDK.MAUI | 17.7.33905.399 | -| Component.CPython39.x64 | 3.9.13 | -| Component.Dotfuscator | 17.7.33905.399 | -| Component.HAXM.Private | 17.7.33905.399 | -| Component.Linux.CMake | 17.7.33905.399 | -| Component.Linux.RemoteFileExplorer | 17.7.33905.399 | -| Component.MDD.Android | 17.7.33905.399 | -| Component.MDD.Linux | 17.7.33905.399 | -| Component.MDD.Linux.GCC.arm | 17.7.33905.399 | -| Component.Microsoft.VisualStudio.LiveShare.2022 | 1.0.5875 | -| Component.Microsoft.VisualStudio.RazorExtension | 17.7.33905.399 | +| android | 34.0.43.0 | +| Component.Android.Emulator.MDD | 17.8.34129.139 | +| Component.Android.NDK.R23C | 17.8.34129.139 | +| Component.Android.SDK.MAUI | 17.8.34129.139 | +| Component.Dotfuscator | 17.8.34129.139 | +| Component.HAXM.Private | 17.8.34129.139 | +| Component.Linux.CMake | 17.8.34129.139 | +| Component.Linux.RemoteFileExplorer | 17.8.34129.139 | +| Component.MDD.Android | 17.8.34129.139 | +| Component.MDD.Linux | 17.8.34129.139 | +| Component.MDD.Linux.GCC.arm | 17.8.34129.139 | +| Component.Microsoft.VisualStudio.LiveShare.2022 | 1.0.5886 | +| Component.Microsoft.VisualStudio.RazorExtension | 17.8.34129.139 | | Component.Microsoft.VisualStudio.Tools.Applications.amd64 | 17.0.33617.0 | -| Component.Microsoft.VisualStudio.Web.AzureFunctions | 17.7.33905.399 | -| Component.Microsoft.Web.LibraryManager | 17.7.33905.399 | -| Component.Microsoft.WebTools.BrowserLink.WebLivePreview | 17.7.70.21405 | +| Component.Microsoft.VisualStudio.Web.AzureFunctions | 17.8.34129.139 | +| Component.Microsoft.Web.LibraryManager | 17.8.34129.139 | +| Component.Microsoft.WebTools.BrowserLink.WebLivePreview | 17.8.18.11108 | | Component.Microsoft.Windows.DriverKit | 10.0.22621.0 | -| Component.OpenJDK | 17.7.33905.399 | -| Component.UnityEngine.x64 | 17.7.33905.399 | -| Component.Unreal | 17.7.33905.399 | -| Component.Unreal.Android | 17.7.33905.399 | -| Component.Unreal.Ide | 17.7.33913.275 | +| Component.OpenJDK | 17.8.34129.139 | +| Component.UnityEngine.x64 | 17.8.34129.139 | +| Component.Unreal | 17.8.34129.139 | +| Component.Unreal.Android | 17.8.34129.139 | +| Component.Unreal.Ide | 17.8.34129.139 | | Component.VSInstallerProjects2022 | 2.0.1 | | Component.WixToolset.VisualStudioExtension.Dev17 | 1.0.0.22 | | Component.WixToolset.VisualStudioExtension.Schemas3 | 1.0.0.22 | -| Component.Xamarin | 17.7.33905.399 | -| Component.Xamarin.RemotedSimulator | 17.7.33905.399 | -| ios | 16.4.7107.0 | -| maccatalyst | 16.4.7107.0 | -| maui.android | 7.0.96.0 | -| maui.blazor | 7.0.96.0 | -| maui.core | 7.0.96.0 | -| maui.ios | 7.0.96.0 | -| maui.maccatalyst | 7.0.96.0 | -| maui.windows | 7.0.96.0 | -| Microsoft.Component.Azure.DataLake.Tools | 17.7.33905.399 | -| Microsoft.Component.ClickOnce | 17.7.33905.399 | -| Microsoft.Component.CodeAnalysis.SDK | 17.7.33905.399 | -| Microsoft.Component.MSBuild | 17.7.33905.399 | -| Microsoft.Component.NetFX.Native | 17.7.33913.275 | -| Microsoft.Component.PythonTools | 17.7.33905.399 | -| Microsoft.Component.PythonTools.Web | 17.7.33905.399 | -| Microsoft.Component.VC.Runtime.UCRTSDK | 17.7.33905.399 | -| Microsoft.ComponentGroup.Blend | 17.7.33905.399 | -| Microsoft.ComponentGroup.ClickOnce.Publish | 17.7.33905.399 | -| Microsoft.Net.Component.4.5.2.TargetingPack | 17.7.33905.399 | -| Microsoft.Net.Component.4.6.2.TargetingPack | 17.7.33905.399 | -| Microsoft.Net.Component.4.6.TargetingPack | 17.7.33905.399 | -| Microsoft.Net.Component.4.7.1.TargetingPack | 17.7.33905.399 | -| Microsoft.Net.Component.4.7.2.TargetingPack | 17.7.33905.399 | -| Microsoft.Net.Component.4.7.TargetingPack | 17.7.33905.399 | -| Microsoft.Net.Component.4.8.1.SDK | 17.7.33905.399 | -| Microsoft.Net.Component.4.8.1.TargetingPack | 17.7.33905.399 | -| Microsoft.Net.Component.4.8.SDK | 17.7.33905.399 | -| Microsoft.Net.Component.4.8.TargetingPack | 17.7.33905.399 | -| Microsoft.Net.ComponentGroup.4.8.DeveloperTools | 17.7.33905.399 | -| Microsoft.Net.ComponentGroup.DevelopmentPrerequisites | 17.7.33905.399 | -| Microsoft.Net.ComponentGroup.TargetingPacks.Common | 17.7.33905.399 | -| microsoft.net.runtime.android | 7.0.1223.47720 | -| microsoft.net.runtime.android.aot | 7.0.1223.47720 | -| microsoft.net.runtime.android.aot.net6 | 7.0.1223.47720 | -| microsoft.net.runtime.android.net6 | 7.0.1223.47720 | -| microsoft.net.runtime.ios | 7.0.1223.47720 | -| microsoft.net.runtime.ios.net6 | 7.0.1223.47720 | -| microsoft.net.runtime.maccatalyst | 7.0.1223.47720 | -| microsoft.net.runtime.maccatalyst.net6 | 7.0.1223.47720 | -| microsoft.net.runtime.mono.tooling | 7.0.1223.47720 | -| microsoft.net.runtime.mono.tooling.net6 | 7.0.1223.47720 | -| microsoft.net.sdk.emscripten.net7 | 7.0.8.43102 | -| Microsoft.NetCore.Component.DevelopmentTools | 17.7.33905.399 | -| Microsoft.NetCore.Component.Runtime.6.0 | 17.7.34221.43 | -| Microsoft.NetCore.Component.Runtime.7.0 | 17.7.34221.43 | -| Microsoft.NetCore.Component.SDK | 17.7.34221.43 | -| Microsoft.NetCore.Component.Web | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.AppInsights.Tools | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.AspNet | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.AspNet45 | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.Azure.AuthoringTools | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.Azure.ClientLibs | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.Azure.Compute.Emulator | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.Azure.Powershell | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.Azure.ResourceManager.Tools | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.Azure.ServiceFabric.Tools | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.Azure.Waverton | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.Azure.Waverton.BuildTools | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.ClassDesigner | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.CodeMap | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.Common.Azure.Tools | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.CoreEditor | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.CppBuildInsights | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.Debugger.JustInTime | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.Debugger.Snapshot | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.DiagnosticTools | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.DockerTools | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.DotNetModelBuilder | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.DslTools | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.Embedded | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.EntityFramework | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.FSharp | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.FSharp.Desktop | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.FSharp.WebTemplates | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.GraphDocument | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.Graphics | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.Graphics.Tools | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.HLSL | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.IISExpress | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.IntelliCode | 17.7.34024.25 | -| Microsoft.VisualStudio.Component.IntelliTrace.FrontEnd | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.JavaScript.Diagnostics | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.JavaScript.TypeScript | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.LinqToSql | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.LiveUnitTesting | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.ManagedDesktop.Core | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.ManagedDesktop.Prerequisites | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.Merq | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.MonoDebugger | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.MSODBC.SQL | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.MSSQL.CMDLnUtils | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.Node.Tools | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.NuGet | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.NuGet.BuildTools | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.PortableLibrary | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.Roslyn.Compiler | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.Roslyn.LanguageServices | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.SecurityIssueAnalysis | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.Sharepoint.Tools | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.SQL.CLR | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.SQL.DataSources | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.SQL.LocalDB.Runtime | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.SQL.SSDT | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.TeamOffice | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.TestTools.CodedUITest | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.TestTools.WebLoadTest | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.TextTemplating | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.TypeScript.TSServer | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.Unity | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.UWP.VC.ARM64 | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.UWP.VC.ARM64EC | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM.Spectre | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM64 | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM64.Spectre | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM.Spectre | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM64 | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM64.Spectre | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.Spectre | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.ARM | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.ARM.Spectre | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.ARM64 | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.ARM64.Spectre | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.Spectre | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64 | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64.Spectre | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.14.37.17.7.ARM | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.14.37.17.7.ARM.Spectre | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.14.37.17.7.ARM64 | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.14.37.17.7.ARM64.Spectre | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.14.37.17.7.ATL | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.14.37.17.7.ATL.ARM | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.14.37.17.7.ATL.ARM.Spectre | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.14.37.17.7.ATL.ARM64 | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.14.37.17.7.ATL.ARM64.Spectre | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.14.37.17.7.ATL.Spectre | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.14.37.17.7.MFC | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.14.37.17.7.MFC.ARM | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.14.37.17.7.MFC.ARM.Spectre | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.14.37.17.7.MFC.ARM64 | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.14.37.17.7.MFC.ARM64.Spectre | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.14.37.17.7.MFC.Spectre | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.14.37.17.7.x86.x64 | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.14.37.17.7.x86.x64.Spectre | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.ASAN | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.ATL | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.ATL.ARM | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.ATL.ARM.Spectre | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.ATL.ARM64 | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.ATL.ARM64.Spectre | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.ATL.Spectre | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.ATLMFC | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.ATLMFC.Spectre | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.CLI.Support | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.CMake.Project | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.CoreIde | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.DiagnosticTools | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.Llvm.Clang | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.Llvm.ClangToolset | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.MFC.ARM | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.MFC.ARM.Spectre | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.MFC.ARM64 | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.MFC.ARM64.Spectre | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.Modules.x86.x64 | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.Redist.14.Latest | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.Redist.MSM | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.Runtimes.ARM.Spectre | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.Runtimes.ARM64.Spectre | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.Runtimes.ARM64EC.Spectre | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.Runtimes.x86.x64.Spectre | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.TestAdapterForBoostTest | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.TestAdapterForGoogleTest | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.Tools.ARM | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.Tools.ARM64 | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.Tools.ARM64EC | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.Tools.x86.x64 | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.v141.ARM | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.v141.ARM.Spectre | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.v141.ARM64 | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.v141.ARM64.Spectre | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.v141.ATL | 17.7.33913.275 | -| Microsoft.VisualStudio.Component.VC.v141.ATL.Spectre | 17.7.33913.275 | -| Microsoft.VisualStudio.Component.VC.v141.MFC | 17.7.33913.275 | -| Microsoft.VisualStudio.Component.VC.v141.MFC.Spectre | 17.7.33913.275 | -| Microsoft.VisualStudio.Component.VC.v141.x86.x64 | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VC.v141.x86.x64.Spectre | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.Vcpkg | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.VSSDK | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.Wcf.Tooling | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.Web | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.WebDeploy | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.Windows10SDK | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.Windows10SDK.19041 | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.Windows10SDK.20348 | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.Windows11SDK.22000 | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.Windows11SDK.22621 | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.Windows11Sdk.WindowsPerformanceToolkit | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.Workflow | 17.7.33905.399 | -| Microsoft.VisualStudio.Component.WslDebugging | 17.7.33905.399 | -| Microsoft.VisualStudio.ComponentGroup.ArchitectureTools.Native | 17.7.33905.399 | -| Microsoft.VisualStudio.ComponentGroup.Azure.CloudServices | 17.7.33905.399 | -| Microsoft.VisualStudio.ComponentGroup.Azure.Prerequisites | 17.7.33905.399 | -| Microsoft.VisualStudio.ComponentGroup.Azure.ResourceManager.Tools | 17.7.33905.399 | -| Microsoft.VisualStudio.ComponentGroup.AzureFunctions | 17.7.33905.399 | -| Microsoft.VisualStudio.ComponentGroup.Maui.All | 17.7.33905.399 | -| Microsoft.VisualStudio.ComponentGroup.Maui.Android | 17.7.33905.399 | -| Microsoft.VisualStudio.ComponentGroup.Maui.Blazor | 17.7.33905.399 | -| Microsoft.VisualStudio.ComponentGroup.Maui.iOS | 17.7.33905.399 | -| Microsoft.VisualStudio.ComponentGroup.Maui.MacCatalyst | 17.7.33905.399 | -| Microsoft.VisualStudio.ComponentGroup.Maui.Shared | 17.7.33905.399 | -| Microsoft.VisualStudio.ComponentGroup.Maui.Windows | 17.7.33905.399 | -| Microsoft.VisualStudio.ComponentGroup.MSIX.Packaging | 17.7.33905.399 | -| Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core | 17.7.33905.399 | -| Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Llvm.Clang | 17.7.33905.399 | -| Microsoft.VisualStudio.ComponentGroup.UWP.NetCoreAndStandard | 17.7.33905.399 | -| Microsoft.VisualStudio.ComponentGroup.UWP.Support | 17.7.34002.345 | -| Microsoft.VisualStudio.ComponentGroup.UWP.VC.v142 | 17.7.33905.399 | -| Microsoft.VisualStudio.ComponentGroup.UWP.Xamarin | 17.7.33905.399 | -| Microsoft.VisualStudio.ComponentGroup.VC.Tools.142.x86.x64 | 17.7.33905.399 | -| Microsoft.VisualStudio.ComponentGroup.VisualStudioExtension.Prerequisites | 17.7.33905.399 | -| Microsoft.VisualStudio.ComponentGroup.Web | 17.7.33905.399 | -| Microsoft.VisualStudio.ComponentGroup.Web.CloudTools | 17.7.33905.399 | -| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions | 17.7.33905.399 | -| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.CMake | 17.7.33905.399 | -| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.TemplateEngine | 17.7.33905.399 | -| Microsoft.VisualStudio.Workload.Azure | 17.7.33905.399 | -| Microsoft.VisualStudio.Workload.CoreEditor | 17.7.33905.399 | -| Microsoft.VisualStudio.Workload.Data | 17.7.33905.399 | -| Microsoft.VisualStudio.Workload.DataScience | 17.7.33905.399 | -| Microsoft.VisualStudio.Workload.ManagedDesktop | 17.7.34002.345 | -| Microsoft.VisualStudio.Workload.ManagedGame | 17.7.33905.399 | -| Microsoft.VisualStudio.Workload.NativeCrossPlat | 17.7.33905.399 | -| Microsoft.VisualStudio.Workload.NativeDesktop | 17.7.33905.399 | -| Microsoft.VisualStudio.Workload.NativeGame | 17.7.33905.399 | -| Microsoft.VisualStudio.Workload.NativeMobile | 17.7.33905.399 | -| Microsoft.VisualStudio.Workload.NetCrossPlat | 17.7.34009.333 | -| Microsoft.VisualStudio.Workload.NetWeb | 17.7.34002.345 | -| Microsoft.VisualStudio.Workload.Node | 17.7.33905.399 | -| Microsoft.VisualStudio.Workload.Office | 17.7.33905.399 | -| Microsoft.VisualStudio.Workload.Python | 17.7.33905.399 | -| Microsoft.VisualStudio.Workload.Universal | 17.7.33905.399 | -| Microsoft.VisualStudio.Workload.VisualStudioExtension | 17.7.33905.399 | -| runtimes.ios | 7.0.1223.47720 | -| runtimes.ios.net6 | 7.0.1223.47720 | -| runtimes.maccatalyst | 7.0.1223.47720 | -| runtimes.maccatalyst.net6 | 7.0.1223.47720 | -| wasm.tools | 7.0.1223.47720 | +| Component.Xamarin | 17.8.34129.139 | +| Component.Xamarin.RemotedSimulator | 17.8.34129.139 | +| ios | 17.0.8478.0 | +| maccatalyst | 17.0.8478.0 | +| maui.blazor | 8.0.3.0 | +| maui.core | 8.0.3.0 | +| maui.windows | 8.0.3.0 | +| Microsoft.Component.Azure.DataLake.Tools | 17.8.34129.139 | +| Microsoft.Component.ClickOnce | 17.8.34129.139 | +| Microsoft.Component.CodeAnalysis.SDK | 17.8.34129.139 | +| Microsoft.Component.MSBuild | 17.8.34129.139 | +| Microsoft.Component.NetFX.Native | 17.8.34129.139 | +| Microsoft.Component.PythonTools | 17.8.34129.139 | +| Microsoft.Component.PythonTools.Web | 17.8.34129.139 | +| Microsoft.Component.VC.Runtime.UCRTSDK | 17.8.34129.139 | +| Microsoft.ComponentGroup.Blend | 17.8.34129.139 | +| Microsoft.ComponentGroup.ClickOnce.Publish | 17.8.34129.139 | +| Microsoft.Net.Component.4.5.2.TargetingPack | 17.8.34129.139 | +| Microsoft.Net.Component.4.6.2.TargetingPack | 17.8.34129.139 | +| Microsoft.Net.Component.4.6.TargetingPack | 17.8.34129.139 | +| Microsoft.Net.Component.4.7.1.TargetingPack | 17.8.34129.139 | +| Microsoft.Net.Component.4.7.2.TargetingPack | 17.8.34129.139 | +| Microsoft.Net.Component.4.7.TargetingPack | 17.8.34129.139 | +| Microsoft.Net.Component.4.8.1.SDK | 17.8.34129.139 | +| Microsoft.Net.Component.4.8.1.TargetingPack | 17.8.34129.139 | +| Microsoft.Net.Component.4.8.SDK | 17.8.34129.139 | +| Microsoft.Net.Component.4.8.TargetingPack | 17.8.34129.139 | +| Microsoft.Net.ComponentGroup.4.8.DeveloperTools | 17.8.34129.139 | +| Microsoft.Net.ComponentGroup.DevelopmentPrerequisites | 17.8.34129.139 | +| Microsoft.Net.ComponentGroup.TargetingPacks.Common | 17.8.34129.139 | +| microsoft.net.runtime.android | 8.0.23.53103 | +| microsoft.net.runtime.android.aot | 8.0.23.53103 | +| microsoft.net.runtime.android.aot.net7 | 8.0.23.53103 | +| microsoft.net.runtime.android.net7 | 8.0.23.53103 | +| microsoft.net.runtime.ios | 8.0.23.53103 | +| microsoft.net.runtime.ios.net7 | 8.0.23.53103 | +| microsoft.net.runtime.maccatalyst | 8.0.23.53103 | +| microsoft.net.runtime.maccatalyst.net7 | 8.0.23.53103 | +| microsoft.net.runtime.mono.tooling | 8.0.23.53103 | +| microsoft.net.runtime.mono.tooling.net7 | 8.0.23.53103 | +| microsoft.net.sdk.emscripten | 8.0.9.3002 | +| Microsoft.NetCore.Component.DevelopmentTools | 17.8.34129.139 | +| Microsoft.NetCore.Component.Runtime.8.0 | 17.8.34308.169 | +| Microsoft.NetCore.Component.SDK | 17.8.34308.169 | +| Microsoft.NetCore.Component.Web | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.AppInsights.Tools | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.AspNet | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.AspNet45 | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.Azure.AuthoringTools | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.Azure.ClientLibs | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.Azure.Compute.Emulator | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.Azure.Powershell | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.Azure.ResourceManager.Tools | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.Azure.ServiceFabric.Tools | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.Azure.Waverton | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.Azure.Waverton.BuildTools | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.ClassDesigner | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.CodeMap | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.Common.Azure.Tools | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.CoreEditor | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.CppBuildInsights | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.Debugger.JustInTime | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.Debugger.Snapshot | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.DiagnosticTools | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.DockerTools | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.DotNetModelBuilder | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.DslTools | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.Embedded | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.EntityFramework | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.FSharp | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.FSharp.Desktop | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.FSharp.WebTemplates | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.GraphDocument | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.Graphics | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.Graphics.Tools | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.HLSL | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.IISExpress | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.IntelliCode | 17.8.34219.23 | +| Microsoft.VisualStudio.Component.IntelliTrace.FrontEnd | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.JavaScript.Diagnostics | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.JavaScript.TypeScript | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.LinqToSql | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.LiveUnitTesting | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.ManagedDesktop.Core | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.ManagedDesktop.Prerequisites | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.Merq | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.MonoDebugger | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.MSODBC.SQL | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.MSSQL.CMDLnUtils | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.Node.Tools | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.NuGet | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.NuGet.BuildTools | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.PortableLibrary | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.Roslyn.Compiler | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.Roslyn.LanguageServices | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.SecurityIssueAnalysis | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.Sharepoint.Tools | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.SQL.CLR | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.SQL.DataSources | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.SQL.LocalDB.Runtime | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.SQL.SSDT | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.TeamOffice | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.TestTools.CodedUITest | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.TestTools.WebLoadTest | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.TextTemplating | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.TypeScript.TSServer | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.Unity | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.UWP.VC.ARM64 | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.UWP.VC.ARM64EC | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM.Spectre | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM64 | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM64.Spectre | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM.Spectre | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM64 | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM64.Spectre | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.Spectre | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.ARM | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.ARM.Spectre | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.ARM64 | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.ARM64.Spectre | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.Spectre | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64 | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64.Spectre | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.VC.14.37.17.7.ARM | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.VC.14.37.17.7.ARM.Spectre | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.VC.14.37.17.7.ARM64 | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.VC.14.37.17.7.ARM64.Spectre | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.VC.14.37.17.7.ATL | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.VC.14.37.17.7.ATL.ARM | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.VC.14.37.17.7.ATL.ARM.Spectre | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.VC.14.37.17.7.ATL.ARM64 | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.VC.14.37.17.7.ATL.ARM64.Spectre | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.VC.14.37.17.7.ATL.Spectre | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.VC.14.37.17.7.MFC | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.VC.14.37.17.7.MFC.ARM | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.VC.14.37.17.7.MFC.ARM.Spectre | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.VC.14.37.17.7.MFC.ARM64 | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.VC.14.37.17.7.MFC.ARM64.Spectre | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.VC.14.37.17.7.MFC.Spectre | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.VC.14.37.17.7.x86.x64 | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.VC.14.37.17.7.x86.x64.Spectre | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.VC.14.38.17.8.ARM | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.VC.14.38.17.8.ARM.Spectre | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.VC.14.38.17.8.ARM64 | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.VC.14.38.17.8.ARM64.Spectre | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.VC.14.38.17.8.ATL | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.VC.14.38.17.8.ATL.ARM | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.VC.14.38.17.8.ATL.ARM.Spectre | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.VC.14.38.17.8.ATL.ARM64 | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.VC.14.38.17.8.ATL.ARM64.Spectre | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.VC.14.38.17.8.ATL.Spectre | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.VC.14.38.17.8.MFC | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.VC.14.38.17.8.MFC.ARM | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.VC.14.38.17.8.MFC.ARM.Spectre | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.VC.14.38.17.8.MFC.ARM64 | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.VC.14.38.17.8.MFC.ARM64.Spectre | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.VC.14.38.17.8.MFC.Spectre | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.VC.14.38.17.8.x86.x64 | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.VC.14.38.17.8.x86.x64.Spectre | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.VC.ASAN | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.VC.ATL | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.VC.ATL.ARM | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.VC.ATL.ARM.Spectre | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.VC.ATL.ARM64 | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.VC.ATL.ARM64.Spectre | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.VC.ATL.Spectre | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.VC.ATLMFC | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.VC.ATLMFC.Spectre | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.VC.CLI.Support | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.VC.CMake.Project | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.VC.CoreIde | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.VC.DiagnosticTools | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.VC.Llvm.Clang | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.VC.Llvm.ClangToolset | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.VC.MFC.ARM | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.VC.MFC.ARM.Spectre | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.VC.MFC.ARM64 | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.VC.MFC.ARM64.Spectre | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.VC.Modules.x86.x64 | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.VC.Redist.14.Latest | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.VC.Redist.MSM | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.VC.Runtimes.ARM.Spectre | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.VC.Runtimes.ARM64.Spectre | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.VC.Runtimes.ARM64EC.Spectre | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.VC.Runtimes.x86.x64.Spectre | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.VC.TestAdapterForBoostTest | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.VC.TestAdapterForGoogleTest | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.VC.Tools.ARM | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.VC.Tools.ARM64 | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.VC.Tools.ARM64EC | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.VC.Tools.x86.x64 | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.VC.v141.ARM | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.VC.v141.ARM.Spectre | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.VC.v141.ARM64 | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.VC.v141.ARM64.Spectre | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.VC.v141.ATL | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.VC.v141.ATL.Spectre | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.VC.v141.MFC | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.VC.v141.MFC.Spectre | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.VC.v141.x86.x64 | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.VC.v141.x86.x64.Spectre | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.Vcpkg | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.VSSDK | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.Wcf.Tooling | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.Web | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.WebDeploy | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.Windows10SDK | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.Windows10SDK.19041 | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.Windows10SDK.20348 | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.Windows11SDK.22000 | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.Windows11SDK.22621 | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.Windows11Sdk.WindowsPerformanceToolkit | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.Workflow | 17.8.34129.139 | +| Microsoft.VisualStudio.Component.WslDebugging | 17.8.34129.139 | +| Microsoft.VisualStudio.ComponentGroup.ArchitectureTools.Native | 17.8.34129.139 | +| Microsoft.VisualStudio.ComponentGroup.Azure.CloudServices | 17.8.34129.139 | +| Microsoft.VisualStudio.ComponentGroup.Azure.Prerequisites | 17.8.34129.139 | +| Microsoft.VisualStudio.ComponentGroup.Azure.ResourceManager.Tools | 17.8.34129.139 | +| Microsoft.VisualStudio.ComponentGroup.AzureFunctions | 17.8.34129.139 | +| Microsoft.VisualStudio.ComponentGroup.Maui.All | 17.8.34129.139 | +| Microsoft.VisualStudio.ComponentGroup.Maui.Android | 17.8.34129.139 | +| Microsoft.VisualStudio.ComponentGroup.Maui.Blazor | 17.8.34129.139 | +| Microsoft.VisualStudio.ComponentGroup.Maui.iOS | 17.8.34129.139 | +| Microsoft.VisualStudio.ComponentGroup.Maui.MacCatalyst | 17.8.34129.139 | +| Microsoft.VisualStudio.ComponentGroup.Maui.Shared | 17.8.34129.139 | +| Microsoft.VisualStudio.ComponentGroup.Maui.Windows | 17.8.34129.139 | +| Microsoft.VisualStudio.ComponentGroup.MSIX.Packaging | 17.8.34129.139 | +| Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core | 17.8.34129.139 | +| Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Llvm.Clang | 17.8.34129.139 | +| Microsoft.VisualStudio.ComponentGroup.UWP.NetCoreAndStandard | 17.8.34129.139 | +| Microsoft.VisualStudio.ComponentGroup.UWP.Support | 17.8.34129.139 | +| Microsoft.VisualStudio.ComponentGroup.UWP.VC.v142 | 17.8.34129.139 | +| Microsoft.VisualStudio.ComponentGroup.UWP.Xamarin | 17.8.34129.139 | +| Microsoft.VisualStudio.ComponentGroup.VC.Tools.142.x86.x64 | 17.8.34129.139 | +| Microsoft.VisualStudio.ComponentGroup.VisualStudioExtension.Prerequisites | 17.8.34129.139 | +| Microsoft.VisualStudio.ComponentGroup.Web | 17.8.34129.139 | +| Microsoft.VisualStudio.ComponentGroup.Web.CloudTools | 17.8.34129.139 | +| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions | 17.8.34129.139 | +| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.CMake | 17.8.34129.139 | +| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.TemplateEngine | 17.8.34129.139 | +| Microsoft.VisualStudio.Workload.Azure | 17.8.34129.139 | +| Microsoft.VisualStudio.Workload.CoreEditor | 17.8.34129.139 | +| Microsoft.VisualStudio.Workload.Data | 17.8.34129.139 | +| Microsoft.VisualStudio.Workload.DataScience | 17.8.34129.139 | +| Microsoft.VisualStudio.Workload.ManagedDesktop | 17.8.34129.139 | +| Microsoft.VisualStudio.Workload.ManagedGame | 17.8.34129.139 | +| Microsoft.VisualStudio.Workload.NativeCrossPlat | 17.8.34219.23 | +| Microsoft.VisualStudio.Workload.NativeDesktop | 17.8.34129.139 | +| Microsoft.VisualStudio.Workload.NativeGame | 17.8.34129.139 | +| Microsoft.VisualStudio.Workload.NativeMobile | 17.8.34129.139 | +| Microsoft.VisualStudio.Workload.NetCrossPlat | 17.8.34129.139 | +| Microsoft.VisualStudio.Workload.NetWeb | 17.8.34129.139 | +| Microsoft.VisualStudio.Workload.Node | 17.8.34129.139 | +| Microsoft.VisualStudio.Workload.Office | 17.8.34129.139 | +| Microsoft.VisualStudio.Workload.Python | 17.8.34129.139 | +| Microsoft.VisualStudio.Workload.Universal | 17.8.34129.139 | +| Microsoft.VisualStudio.Workload.VisualStudioExtension | 17.8.34129.139 | +| runtimes.ios | 8.0.23.53103 | +| runtimes.ios.net7 | 8.0.23.53103 | +| runtimes.maccatalyst | 8.0.23.53103 | +| runtimes.maccatalyst.net7 | 8.0.23.53103 | +| wasm.tools | 8.0.23.53103 | | ProBITools.MicrosoftAnalysisServicesModelingProjects2022 | 3.0.4 | | ProBITools.MicrosoftReportProjectsforVisualStudio2022 | 3.0.1 | | SSIS.MicrosoftDataToolsIntegrationServices | 1.2 | | VisualStudioClient.MicrosoftVisualStudio2022InstallerProjects | 2.0.1 | | Windows Driver Kit | 10.1.22621.382 | | Windows Driver Kit Visual Studio Extension | 10.0.22621.0 | -| Windows Software Development Kit | 10.1.22621.1778 | +| Windows Software Development Kit | 10.1.22621.2428 | | WixToolset.WixToolsetVisualStudio2022Extension | 1.0.0.22 | #### Microsoft Visual C++ @@ -518,12 +537,12 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | -------------------------------------------- | ------------ | ----------- | | Microsoft Visual C++ 2013 Additional Runtime | x64 | 12.0.40660 | | Microsoft Visual C++ 2013 Minimum Runtime | x64 | 12.0.40660 | -| Microsoft Visual C++ 2022 Additional Runtime | x64 | 14.36.32532 | -| Microsoft Visual C++ 2022 Debug Runtime | x64 | 14.36.32532 | -| Microsoft Visual C++ 2022 Minimum Runtime | x64 | 14.36.32532 | -| Microsoft Visual C++ 2022 Additional Runtime | x86 | 14.36.32532 | -| Microsoft Visual C++ 2022 Debug Runtime | x86 | 14.36.32532 | -| Microsoft Visual C++ 2022 Minimum Runtime | x86 | 14.36.32532 | +| Microsoft Visual C++ 2022 Additional Runtime | x64 | 14.38.33130 | +| Microsoft Visual C++ 2022 Debug Runtime | x64 | 14.38.33130 | +| Microsoft Visual C++ 2022 Minimum Runtime | x64 | 14.38.33130 | +| Microsoft Visual C++ 2022 Additional Runtime | x86 | 14.38.33130 | +| Microsoft Visual C++ 2022 Debug Runtime | x86 | 14.38.33130 | +| Microsoft Visual C++ 2022 Minimum Runtime | x86 | 14.38.33130 | #### Installed Windows SDKs - 10.0.17763.0 @@ -533,11 +552,11 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 10.0.22621.0 ### .NET Core Tools -- .NET Core SDK: 6.0.124, 6.0.203, 6.0.319, 6.0.416, 7.0.403 +- .NET Core SDK: 6.0.125, 6.0.203, 6.0.320, 6.0.417, 7.0.114, 7.0.203, 7.0.311, 7.0.404, 8.0.100 - .NET Framework: 4.8, 4.8.1 -- Microsoft.AspNetCore.App: 6.0.5, 6.0.23, 6.0.24, 7.0.13 -- Microsoft.NETCore.App: 6.0.5, 6.0.23, 6.0.24, 7.0.13 -- Microsoft.WindowsDesktop.App: 6.0.5, 6.0.24, 7.0.13 +- Microsoft.AspNetCore.App: 6.0.5, 6.0.25, 7.0.5, 7.0.14, 8.0.0 +- Microsoft.NETCore.App: 6.0.5, 6.0.25, 7.0.5, 7.0.14, 8.0.0 +- Microsoft.WindowsDesktop.App: 6.0.5, 6.0.25, 7.0.5, 7.0.14, 8.0.0 - nbgv 3.6.133+2d32d93cb1 ### PowerShell Tools @@ -550,10 +569,10 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Az (Cached): 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.440 +- AWSPowershell: 4.1.453 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 -- Microsoft.Graph: 2.8.0 +- Microsoft.Graph: 2.9.0 - Pester: 3.4.0, 5.5.0 - PowerShellGet: 1.0.0.1, 2.2.5 - PSScriptAnalyzer: 1.21.0 @@ -578,8 +597,7 @@ All other versions are saved but not installed. | CMake | 3.18.1<br>3.22.1 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 23.2.8568313<br>24.0.8215888<br>25.2.9519653<br>26.1.10909125 | -| SDK Patch Applier v4 | 1 | +| NDK | 24.0.8215888<br>25.2.9519653<br>26.1.10909125 | #### Environment variables | Name | Value | @@ -594,8 +612,9 @@ All other versions are saved but not installed. ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2022 | sha256:019daa2ef10618362e2c8cb79408b048d604813aaf39f5c3e248b4c1132e92fd | 2023-10-10 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2022 | sha256:8786c438d878b03be3abd125665d51ff9bb9c6429ea0802978f07b60dd910745 | 2023-10-10 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:180b44ab71dfd238ab4428baf047fee08663de4c317de0bce0887f12e4c7734c | 2023-10-10 | -| mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:0e6791612f9448aa2e6713d95ffabdefa26122b58a0b341aace6b5a2d65aee8c | 2023-10-06 | -| mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:40525c24f8e0a1cd4feca7330cf0bcdf125c0f7f2158852f4701dbe7ded2dd7f | 2023-10-06 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2022 | sha256:c06059416579f6019d3767bc8adc15b8f196f528bddaeb79272120243d874f17 | 2023-11-14 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2022 | sha256:affaf23c364af4050c11c229b946f6f033c26551a67b5d3a16134a396f75b8e5 | 2023-11-14 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:40e1acbcf70a5d9c5fd5fad045eca44da5c2ce090a1d4bae3f9aba3a089f0452 | 2023-11-14 | +| mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:585a8381ae8ba03cd58c18917d17a6b3a0bdc1f80f294e33cee2eaab06be96ce | 2023-11-09 | +| mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:308ef3f8ee3e9c9a1bdec460009c1e6394b329db13eb3149461f8841be5b538a | 2023-11-09 | + From d7c36f22573ba12f501ba05e315af7dd9cd4fab9 Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Tue, 21 Nov 2023 10:38:18 +0100 Subject: [PATCH 2462/3485] Fix issue where GetPackerTemplatePath fails in PS5 (#8852) --- helpers/GenerateResourcesAndImage.ps1 | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/helpers/GenerateResourcesAndImage.ps1 b/helpers/GenerateResourcesAndImage.ps1 index 8085567651c4..d7e65ae5fa43 100644 --- a/helpers/GenerateResourcesAndImage.ps1 +++ b/helpers/GenerateResourcesAndImage.ps1 @@ -17,20 +17,21 @@ Function Get-PackerTemplatePath { ) switch ($ImageType) { + # Note: Double Join-Path is required to support PowerShell 5.1 ([ImageType]::Windows2019) { - $relativeTemplatePath = Join-Path "windows" "templates" "windows-2019.json" + $relativeTemplatePath = Join-Path (Join-Path "windows" "templates") "windows-2019.json" } ([ImageType]::Windows2022) { - $relativeTemplatePath = Join-Path "windows" "templates" "windows-2022.json" + $relativeTemplatePath = Join-Path (Join-Path "windows" "templates") "windows-2022.json" } ([ImageType]::Ubuntu2004) { - $relativeTemplatePath = Join-Path "ubuntu" "templates" "ubuntu-20.04.json" + $relativeTemplatePath = Join-Path (Join-Path "ubuntu" "templates") "ubuntu-20.04.json" } ([ImageType]::Ubuntu2204) { - $relativeTemplatePath = Join-Path "ubuntu" "templates" "ubuntu-22.04.pkr.hcl" + $relativeTemplatePath = Join-Path (Join-Path "ubuntu" "templates") "ubuntu-22.04.pkr.hcl" } ([ImageType]::UbuntuMinimal) { - $relativeTemplatePath = Join-Path "ubuntu" "templates" "ubuntu-minimal.pkr.hcl" + $relativeTemplatePath = Join-Path (Join-Path "ubuntu" "templates") "ubuntu-minimal.pkr.hcl" } default { throw "Unknown type of image" } } From 3875f479acef1d34c082fbffaceb3cca288a0c40 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 21 Nov 2023 12:07:00 +0000 Subject: [PATCH 2463/3485] Updating readme file for macOS-12 version 20231115.2 (#8833) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-12-Readme.md | 99 +++++++++++++++++---------------- 1 file changed, 52 insertions(+), 47 deletions(-) diff --git a/images/macos/macos-12-Readme.md b/images/macos/macos-12-Readme.md index 57f5bd978902..9bf21698b9d1 100644 --- a/images/macos/macos-12-Readme.md +++ b/images/macos/macos-12-Readme.md @@ -1,12 +1,18 @@ +| Announcements | +|-| +| [[all OSs] Nodejs 14.x will be removed from the images on November, 26](https://github.com/actions/runner-images/issues/8779) | +| [Major Refactoring of GitHub Actions Runner Images Repository](https://github.com/actions/runner-images/issues/8706) | +| [[All OS] Android NDK r23 will be removed from images on November 13](https://github.com/actions/runner-images/issues/8383) | +*** # macOS 12 -- OS Version: macOS 12.7 (21G816) +- OS Version: macOS 12.7.1 (21G920) - Kernel Version: Darwin 21.6.0 -- Image Version: 20231029.1 +- Image Version: 20231115.2 ## Installed Software ### Language and Runtime -- .NET Core SDK: 6.0.416, 7.0.102, 7.0.202, 7.0.306, 7.0.403 +- .NET Core SDK: 6.0.417, 7.0.102, 7.0.202, 7.0.306, 7.0.404, 8.0.100 - Bash 3.2.57(1)-release - Clang/LLVM 14.0.0 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` @@ -16,9 +22,9 @@ - GNU Fortran 11 (Homebrew GCC 11.4.0) - available by `gfortran-11` alias - GNU Fortran 12 (Homebrew GCC 12.3.0) - available by `gfortran-12` alias - GNU Fortran 13 (Homebrew GCC 13.2.0) - available by `gfortran-13` alias -- Julia 1.9.3 -- Kotlin 1.9.10-release-459 -- Go 1.20.10 +- Julia 1.9.4 +- Kotlin 1.9.255-SNAPSHOT +- Go 1.20.11 - Mono 6.12.0.188 - Node.js 18.18.2 - MSBuild 16.10.1.51301 (Mono 6.12.0.188) @@ -28,23 +34,23 @@ - PHP 8.2.12 - Python 2.7.18 - Python3 3.12.0 -- R 4.3.1 +- R 4.3.2 - Ruby 3.0.6p216 ### Package Management -- Bundler 2.4.21 +- Bundler 2.4.22 - Carthage 0.39.1 - CocoaPods 1.14.2 - Composer 2.6.5 -- Homebrew 4.1.17 +- Homebrew 4.1.20 - Miniconda 23.9.0 - NPM 9.8.1 - NuGet 6.3.1.1 - Pip 20.3.4 (python 2.7) - Pip3 23.3.1 (python 3.12) - Pipx 1.2.1 -- RubyGems 3.4.21 -- Vcpkg 2023 (build from commit 06c79a9af) +- RubyGems 3.4.22 +- Vcpkg 2023 (build from commit 2b14b606c) - Yarn 1.22.19 #### Environment variables @@ -61,15 +67,15 @@ ### Utilities - 7-Zip 17.05 -- aria2 1.36.0 -- azcopy 10.21.1 +- aria2 1.37.0 +- azcopy 10.21.2 - bazel 6.4.0 - bazelisk 1.18.0 - bsdtar 3.5.1 - available by 'tar' alias - Curl 8.4.0 -- Git 2.42.0 +- Git 2.42.1 - Git LFS 3.4.0 -- GitHub CLI 2.37.0 +- GitHub CLI 2.39.1 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.21.4 - gpg (GnuPG) 2.4.3 @@ -80,52 +86,52 @@ - OpenSSL 1.1.1w 11 Sep 2023 - Packer 1.9.4 - pkg-config 0.29.2 -- PostgreSQL 14.9 (Homebrew) -- psql (PostgreSQL) 14.9 (Homebrew) +- PostgreSQL 14.10 (Homebrew) +- psql (PostgreSQL) 14.10 (Homebrew) - Sox 14.4.2 - Subversion (SVN) 1.14.2 - Switchaudio-osx 1.2.2 - Vagrant 2.4.0 -- VirtualBox 7.0.12r159484 +- VirtualBox 6.1.38r153438 - yq 4.35.2 - zstd 1.5.5 ### Tools - App Center CLI 2.14.0 -- AWS CLI 2.13.30 -- AWS SAM CLI 1.99.0 +- AWS CLI 2.13.35 +- AWS SAM CLI 1.102.0 - AWS Session Manager CLI 1.2.497.0 -- Azure CLI 2.53.1 +- Azure CLI 2.54.0 - Azure CLI (azure-devops) 0.26.0 -- Bicep CLI 0.22.6 +- Bicep CLI 0.23.1 - Cabal 3.6.2.0 - Cmake 3.27.7 -- CodeQL Action Bundle 2.15.1 -- Colima 0.5.6 -- Fastlane 2.216.0 +- CodeQL Action Bundle 2.15.2 +- Colima 0.6.2 +- Fastlane 2.217.0 - GHC 9.8.1 -- GHCup 0.1.19.4 +- GHCup 0.1.20.0 - Jazzy 0.14.4 - Stack 2.13.1 -- SwiftFormat 0.52.8 +- SwiftFormat 0.52.9 - Swig 4.1.1 - Xcode Command Line Tools 14.2.0.0.1.1668646533 ### Linters - SwiftLint 0.53.0 -- Yamllint 1.32.0 +- Yamllint 1.33.0 ### Browsers -- Safari 17.0 (17616.1.27.111.22) -- SafariDriver 17.0 (17616.1.27.111.22) -- Google Chrome 118.0.5993.117 -- Google Chrome for Testing 118.0.5993.70 -- ChromeDriver 118.0.5993.70 -- Microsoft Edge 118.0.2088.76 -- Microsoft Edge WebDriver 118.0.2088.76 -- Mozilla Firefox 119.0 +- Safari 17.1 (17616.2.9.11.9) +- SafariDriver 17.1 (17616.2.9.11.9) +- Google Chrome 119.0.6045.159 +- Google Chrome for Testing 119.0.6045.105 +- ChromeDriver 119.0.6045.105 +- Microsoft Edge 119.0.2151.58 +- Microsoft Edge WebDriver 119.0.2151.58 +- Mozilla Firefox 119.0.1 - geckodriver 0.33.0 -- Selenium server 4.14.1 +- Selenium server 4.15.0 #### Environment variables | Name | Value | @@ -140,7 +146,7 @@ | 8.0.392+8 (default) | JAVA_HOME_8_X64 | | 11.0.21+9 | JAVA_HOME_11_X64 | | 17.0.9+9 | JAVA_HOME_17_X64 | -| 21.0.1+12.0.LTS | JAVA_HOME_21_X64 | +| 21.0.1+12.0 | JAVA_HOME_21_X64 | ### Cached Tools @@ -172,8 +178,8 @@ #### Go - 1.19.13 -- 1.20.10 -- 1.21.3 +- 1.20.11 +- 1.21.4 ### Rust Tools - Cargo 1.73.0 @@ -182,9 +188,9 @@ - Rustup 1.26.0 #### Packages -- Bindgen 0.68.1 +- Bindgen 0.69.1 - Cargo-audit 0.18.3 -- Cargo-outdated 0.13.1 +- Cargo-outdated 0.14.0 - Cbindgen 0.26.0 - Clippy 0.1.73 - Rustfmt 1.6.0-stable @@ -193,7 +199,7 @@ - PowerShell 7.2.16 #### PowerShell Modules -- Az: 10.4.1 +- Az: 11.0.0 - MarkdownPS: 1.9 - Pester: 5.5.0 - PSScriptAnalyzer: 1.21.0 @@ -210,7 +216,7 @@ | Version | Build | Path | | -------------- | ---------- | ------------------------------------ | | 2019 | 8.10.25.2 | /Applications/Visual Studio 2019.app | -| 2022 (default) | 17.6.6.408 | /Applications/Visual Studio.app | +| 2022 (default) | 17.6.7.417 | /Applications/Visual Studio.app | ##### Notes ``` @@ -337,8 +343,7 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" | CMake | 3.18.1<br>3.22.1 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 23.2.8568313<br>24.0.8215888<br>25.2.9519653 (default)<br>26.1.10909125 | -| SDK Patch Applier v4 | 1 | +| NDK | 24.0.8215888<br>25.2.9519653 (default)<br>26.1.10909125 | #### Environment variables | Name | Value | @@ -359,7 +364,7 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" #### Environment variables | Name | Value | | ----------------- | ----------------------------------------------------------------------------------------- | -| PARALLELS_DMG_URL | https://download.parallels.com/desktop/v19/19.1.0-54729/ParallelsDesktop-19.1.0-54729.dmg | +| PARALLELS_DMG_URL | https://download.parallels.com/desktop/v19/19.1.1-54734/ParallelsDesktop-19.1.1-54734.dmg | ##### Notes ``` From 092513ca05a469b53224591df6ecfa45c25dda03 Mon Sep 17 00:00:00 2001 From: sergei-pyshnoi <121864472+sergei-pyshnoi@users.noreply.github.com> Date: Tue, 21 Nov 2023 19:08:21 +0100 Subject: [PATCH 2464/3485] [Ubuntu] remove ubuntu 16 and 18 images (#8857) --- images/ubuntu/toolsets/toolset-2004.json | 2 -- images/ubuntu/toolsets/toolset-2204.json | 1 - 2 files changed, 3 deletions(-) diff --git a/images/ubuntu/toolsets/toolset-2004.json b/images/ubuntu/toolsets/toolset-2004.json index 316441426499..1f754b3ce52e 100644 --- a/images/ubuntu/toolsets/toolset-2004.json +++ b/images/ubuntu/toolsets/toolset-2004.json @@ -241,8 +241,6 @@ "node:16-alpine", "node:18-alpine", "node:20-alpine", - "ubuntu:16.04", - "ubuntu:18.04", "ubuntu:20.04" ] }, diff --git a/images/ubuntu/toolsets/toolset-2204.json b/images/ubuntu/toolsets/toolset-2204.json index 36b8b349e2b1..447c68db76f9 100644 --- a/images/ubuntu/toolsets/toolset-2204.json +++ b/images/ubuntu/toolsets/toolset-2204.json @@ -230,7 +230,6 @@ "node:16-alpine", "node:18-alpine", "node:20-alpine", - "ubuntu:18.04", "ubuntu:20.04", "ubuntu:22.04" ] From eb6e81b8f215094cebc12162e4d55de8368d54cb Mon Sep 17 00:00:00 2001 From: sergei-pyshnoi <121864472+sergei-pyshnoi@users.noreply.github.com> Date: Tue, 21 Nov 2023 19:59:14 +0100 Subject: [PATCH 2465/3485] remove node14 from ubuntu (#8861) --- images/ubuntu/toolsets/toolset-2004.json | 3 --- images/ubuntu/toolsets/toolset-2204.json | 3 --- 2 files changed, 6 deletions(-) diff --git a/images/ubuntu/toolsets/toolset-2004.json b/images/ubuntu/toolsets/toolset-2004.json index 1f754b3ce52e..6200b701efea 100644 --- a/images/ubuntu/toolsets/toolset-2004.json +++ b/images/ubuntu/toolsets/toolset-2004.json @@ -34,7 +34,6 @@ "platform" : "linux", "arch": "x64", "versions": [ - "14.*", "16.*", "18.*", "20.*" @@ -233,11 +232,9 @@ "debian:10", "debian:11", "moby/buildkit:latest", - "node:14", "node:16", "node:18", "node:20", - "node:14-alpine", "node:16-alpine", "node:18-alpine", "node:20-alpine", diff --git a/images/ubuntu/toolsets/toolset-2204.json b/images/ubuntu/toolsets/toolset-2204.json index 447c68db76f9..d6c699437876 100644 --- a/images/ubuntu/toolsets/toolset-2204.json +++ b/images/ubuntu/toolsets/toolset-2204.json @@ -32,7 +32,6 @@ "platform" : "linux", "arch": "x64", "versions": [ - "14.*", "16.*", "18.*", "20.*" @@ -222,11 +221,9 @@ "debian:10", "debian:11", "moby/buildkit:latest", - "node:14", "node:16", "node:18", "node:20", - "node:14-alpine", "node:16-alpine", "node:18-alpine", "node:20-alpine", From a8f17e0207c7317bb0c983f4eab35eaf5c4245f6 Mon Sep 17 00:00:00 2001 From: Jesse Houwing <jesse.houwing@gmail.com> Date: Tue, 21 Nov 2023 20:16:32 +0100 Subject: [PATCH 2466/3485] Cleans telemetry and logs from (#8801) Running the cleanup post-tests and software inventory, as these generate more logs and more telemetry --- images/windows/scripts/build/Configure-System.ps1 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/images/windows/scripts/build/Configure-System.ps1 b/images/windows/scripts/build/Configure-System.ps1 index 853db47eaf6c..481d52b34203 100644 --- a/images/windows/scripts/build/Configure-System.ps1 +++ b/images/windows/scripts/build/Configure-System.ps1 @@ -20,7 +20,10 @@ Write-Host "Clean up various directories" "$env:SystemRoot\winsxs\manifestcache", "$env:SystemRoot\Temp", "$env:SystemDrive\Users\$env:INSTALL_USER\AppData\Local\Temp", - "$env:TEMP" + "$env:TEMP", + "$env:AZURE_CONFIG_DIR\logs", + "$env:AZURE_CONFIG_DIR\commands", + "$env:AZURE_CONFIG_DIR\telemetry" ) | ForEach-Object { if (Test-Path $_) { Write-Host "Removing $_" From b6046999b6d2941f85709d06924af6f1170071bf Mon Sep 17 00:00:00 2001 From: sergei-pyshnoi <121864472+sergei-pyshnoi@users.noreply.github.com> Date: Wed, 22 Nov 2023 00:34:40 +0100 Subject: [PATCH 2467/3485] remove node14 from windows (#8862) --- images/windows/toolsets/toolset-2019.json | 1 - images/windows/toolsets/toolset-2022.json | 1 - 2 files changed, 2 deletions(-) diff --git a/images/windows/toolsets/toolset-2019.json b/images/windows/toolsets/toolset-2019.json index fdc24fbc5025..d4640fb27d24 100644 --- a/images/windows/toolsets/toolset-2019.json +++ b/images/windows/toolsets/toolset-2019.json @@ -61,7 +61,6 @@ "arch": "x64", "platform" : "win32", "versions": [ - "14.*", "16.*", "18.*", "20.*" diff --git a/images/windows/toolsets/toolset-2022.json b/images/windows/toolsets/toolset-2022.json index aee512f7d824..64bf6f1790c8 100644 --- a/images/windows/toolsets/toolset-2022.json +++ b/images/windows/toolsets/toolset-2022.json @@ -58,7 +58,6 @@ "arch": "x64", "platform" : "win32", "versions": [ - "14.*", "16.*", "18.*", "20.*" From 222b7984831467112c70d48569d83f1d8be69b7c Mon Sep 17 00:00:00 2001 From: sergei-pyshnoi <121864472+sergei-pyshnoi@users.noreply.github.com> Date: Wed, 22 Nov 2023 00:56:17 +0100 Subject: [PATCH 2468/3485] remove node14 from macos (#8860) --- images/macos/toolsets/toolset-11.json | 2 -- images/macos/toolsets/toolset-12.json | 2 -- 2 files changed, 4 deletions(-) diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index cc587fa4a487..094f225aa6c1 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -273,7 +273,6 @@ "arch": { "x64": { "versions": [ - "14.*", "16.*", "18.*", "20.*" @@ -346,7 +345,6 @@ "node": { "default": "18", "nvm_versions": [ - "14", "16", "18", "20" diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index b1cf785cb77a..797bbb720548 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -264,7 +264,6 @@ "arch": { "x64": { "versions": [ - "14.*", "16.*", "18.*", "20.*" @@ -334,7 +333,6 @@ "node": { "default": "18", "nvm_versions": [ - "14", "16", "18", "20" From 46f21c4413e8984f497574f0b0d4e7e78eaaf6e9 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 22 Nov 2023 14:11:08 +0000 Subject: [PATCH 2469/3485] Updating readme file for macOS-11 version 20231117.2 (#8854) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-11-Readme.md | 111 +++++++++++++++++--------------- 1 file changed, 58 insertions(+), 53 deletions(-) diff --git a/images/macos/macos-11-Readme.md b/images/macos/macos-11-Readme.md index 9ab11bcb618a..5a78d6f73c0d 100644 --- a/images/macos/macos-11-Readme.md +++ b/images/macos/macos-11-Readme.md @@ -1,12 +1,18 @@ +| Announcements | +|-| +| [[all OSs] Nodejs 14.x will be removed from the images on November, 26](https://github.com/actions/runner-images/issues/8779) | +| [Major Refactoring of GitHub Actions Runner Images Repository](https://github.com/actions/runner-images/issues/8706) | +| [[All OS] Android NDK r23 will be removed from images on November 13](https://github.com/actions/runner-images/issues/8383) | +*** # macOS 11 - OS Version: macOS 11.7.10 (20G1427) - Kernel Version: Darwin 20.6.0 -- Image Version: 20231030.1 +- Image Version: 20231117.2 ## Installed Software ### Language and Runtime -- .NET Core SDK: 6.0.416, 7.0.102, 7.0.202, 7.0.306, 7.0.403 +- .NET Core SDK: 6.0.417, 7.0.102, 7.0.202, 7.0.306, 7.0.404, 8.0.100 - Bash 3.2.57(1)-release - Clang/LLVM 13.0.0 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` @@ -16,9 +22,9 @@ - GNU Fortran 10 (Homebrew GCC 10.5.0) - available by `gfortran-10` alias - GNU Fortran 11 (Homebrew GCC 11.4.0) - available by `gfortran-11` alias - GNU Fortran 12 (Homebrew GCC 12.3.0) - available by `gfortran-12` alias -- Julia 1.9.3 -- Kotlin 1.9.10-release-459 -- Go 1.20.10 +- Julia 1.9.4 +- Kotlin 1.9.255-SNAPSHOT +- Go 1.20.11 - Mono 6.12.0.188 - Node.js 18.18.2 - MSBuild 16.10.1.51301 (Mono 6.12.0.188) @@ -28,23 +34,23 @@ - PHP 8.2.12 - Python 2.7.18 - Python3 3.12.0 -- R 4.3.1 +- R 4.3.2 - Ruby 2.7.8p225 ### Package Management -- Bundler 2.4.21 +- Bundler 2.4.22 - Carthage 0.39.1 - CocoaPods 1.14.2 - Composer 2.6.5 -- Homebrew 4.1.17 -- Miniconda 23.9.0 +- Homebrew 4.1.20 +- Miniconda 23.10.0 - NPM 9.8.1 - NuGet 6.3.1.1 - Pip 20.3.4 (python 2.7) - Pip3 23.3.1 (python 3.12) - Pipx 1.2.1 -- RubyGems 3.4.21 -- Vcpkg 2023 (build from commit 3715d743a) +- RubyGems 3.4.22 +- Vcpkg 2023 (build from commit 0c20b2a97) - Yarn 1.22.19 #### Environment variables @@ -61,19 +67,19 @@ ### Utilities - 7-Zip 17.05 -- aria2 1.36.0 -- azcopy 10.21.1 +- aria2 1.37.0 +- azcopy 10.21.2 - bazel 6.4.0 -- bazelisk 1.18.0 +- bazelisk 1.19.0 - bsdtar 3.3.2 - available by 'tar' alias - Curl 8.4.0 -- Git 2.42.0 +- Git 2.42.1 - Git LFS 3.4.0 -- GitHub CLI 2.37.0 +- GitHub CLI 2.39.1 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.21.4 - gpg (GnuPG) 2.4.3 -- helm v3.13.1+g3547a4b +- helm v3.13.2+g2a2fb3b - ImageMagick 7.1.1-21 - jq 1.7 - mongo 5.0.21 @@ -82,8 +88,8 @@ - OpenSSL 1.1.1w 11 Sep 2023 - Packer 1.9.4 - pkg-config 0.29.2 -- PostgreSQL 14.9 (Homebrew) -- psql (PostgreSQL) 14.9 (Homebrew) +- PostgreSQL 14.10 (Homebrew) +- psql (PostgreSQL) 14.10 (Homebrew) - Sox 14.4.2 - Subversion (SVN) 1.14.2 - Switchaudio-osx 1.2.2 @@ -91,41 +97,41 @@ - zstd 1.5.5 ### Tools -- Aliyun CLI 3.0.184 +- Aliyun CLI 3.0.188 - App Center CLI 2.14.0 -- AWS CLI 2.13.30 -- AWS SAM CLI 1.99.0 +- AWS CLI 2.13.37 +- AWS SAM CLI 1.103.0 - AWS Session Manager CLI 1.2.497.0 -- Azure CLI 2.53.1 +- Azure CLI 2.54.0 - Azure CLI (azure-devops) 0.26.0 -- Bicep CLI 0.22.6 -- Cabal 3.10.1.0 -- Cmake 3.27.7 -- CodeQL Action Bundle 2.15.1 -- Fastlane 2.216.0 -- GHC 9.6.2 -- GHCup 0.1.19.4 +- Bicep CLI 0.23.1 +- Cabal 3.6.2.0 +- Cmake 3.27.8 +- CodeQL Action Bundle 2.15.2 +- Fastlane 2.217.0 +- GHC 9.8.1 +- GHCup 0.1.20.0 - Jazzy 0.14.4 - Stack 2.13.1 -- SwiftFormat 0.52.8 +- SwiftFormat 0.52.10 - Swig 4.1.1 - Xcode Command Line Tools 13.2.0.0.1.1638488800 ### Linters - SwiftLint 0.48.0 -- Yamllint 1.32.0 +- Yamllint 1.33.0 ### Browsers - Safari 16.6.1 (16615.3.12.11.5) - SafariDriver 16.6.1 (16615.3.12.11.5) -- Google Chrome 118.0.5993.117 -- Google Chrome for Testing 118.0.5993.70 -- ChromeDriver 118.0.5993.70 -- Microsoft Edge 118.0.2088.76 -- Microsoft Edge WebDriver 118.0.2088.76 -- Mozilla Firefox 119.0 +- Google Chrome 119.0.6045.159 +- Google Chrome for Testing 119.0.6045.105 +- ChromeDriver 119.0.6045.105 +- Microsoft Edge 119.0.2151.72 +- Microsoft Edge WebDriver 119.0.2151.72 +- Mozilla Firefox 119.0.1 - geckodriver 0.33.0 -- Selenium server 4.14.1 +- Selenium server 4.15.0 #### Environment variables | Name | Value | @@ -140,7 +146,7 @@ | 8.0.392+8 (default) | JAVA_HOME_8_X64 | | 11.0.21+9 | JAVA_HOME_11_X64 | | 17.0.9+9 | JAVA_HOME_17_X64 | -| 21.0.1+12.0.LTS | JAVA_HOME_21_X64 | +| 21.0.1+12.0 | JAVA_HOME_21_X64 | ### Cached Tools @@ -174,28 +180,28 @@ #### Go - 1.19.13 -- 1.20.10 -- 1.21.3 +- 1.20.11 +- 1.21.4 ### Rust Tools -- Cargo 1.73.0 -- Rust 1.73.0 -- Rustdoc 1.73.0 +- Cargo 1.74.0 +- Rust 1.74.0 +- Rustdoc 1.74.0 - Rustup 1.26.0 #### Packages -- Bindgen 0.68.1 +- Bindgen 0.69.1 - Cargo-audit 0.18.3 -- Cargo-outdated 0.13.1 +- Cargo-outdated 0.14.0 - Cbindgen 0.26.0 -- Clippy 0.1.73 +- Clippy 0.1.74 - Rustfmt 1.6.0-stable ### PowerShell Tools -- PowerShell 7.2.16 +- PowerShell 7.2.17 #### PowerShell Modules -- Az: 10.4.1 +- Az: 11.0.0 - MarkdownPS: 1.9 - Pester: 5.5.0 - PSScriptAnalyzer: 1.21.0 @@ -212,7 +218,7 @@ | Version | Build | Path | | -------------- | ---------- | ------------------------------------ | | 2019 | 8.10.25.2 | /Applications/Visual Studio 2019.app | -| 2022 (default) | 17.6.6.408 | /Applications/Visual Studio.app | +| 2022 (default) | 17.6.7.417 | /Applications/Visual Studio.app | ##### Notes ``` @@ -336,8 +342,7 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" | CMake | 3.10.2<br>3.18.1<br>3.22.1 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 23.2.8568313<br>24.0.8215888<br>25.2.9519653 (default)<br>26.1.10909125 | -| SDK Patch Applier v4 | 1 | +| NDK | 24.0.8215888<br>25.2.9519653 (default)<br>26.1.10909125 | #### Environment variables | Name | Value | From d3e630f774fa319787c3f27e2626d4157b0c1d83 Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Wed, 22 Nov 2023 15:14:08 +0100 Subject: [PATCH 2470/3485] [Windows] Implement installation helpers refactoring (#8865) * [Windows] Refactor base Installer helper functions * Fix helper name * Fix name gen logic and improve error handling * Fix hash checking logic * Fix Install-VsixExtension invocation * Fix variable name in Install-OpenSSL.ps1 * Fix type for git downloadUrl --- .../scripts/build/Install-AWSTools.ps1 | 21 +-- .../windows/scripts/build/Install-Apache.ps1 | 2 +- .../scripts/build/Install-AzureCli.ps1 | 6 +- .../build/Install-AzureCosmosDbEmulator.ps1 | 8 +- .../windows/scripts/build/Install-Bazel.ps1 | 4 +- .../build/Install-BizTalkBuildComponent.ps1 | 87 ++------- .../build/Install-ChocolateyPackages.ps1 | 2 +- .../windows/scripts/build/Install-Chrome.ps1 | 7 +- .../windows/scripts/build/Install-DACFx.ps1 | 8 +- .../scripts/build/Install-DockerCompose.ps1 | 4 +- .../windows/scripts/build/Install-Firefox.ps1 | 18 +- images/windows/scripts/build/Install-Git.ps1 | 39 ++-- .../scripts/build/Install-GitHub-CLI.ps1 | 10 +- .../scripts/build/Install-GoogleCloudCLI.ps1 | 9 +- .../scripts/build/Install-JavaTools.ps1 | 8 +- .../scripts/build/Install-KubernetesTools.ps1 | 6 +- images/windows/scripts/build/Install-LLVM.ps1 | 4 +- .../scripts/build/Install-Mercurial.ps1 | 4 +- .../scripts/build/Install-Miniconda.ps1 | 22 +-- .../windows/scripts/build/Install-MongoDB.ps1 | 10 +- .../scripts/build/Install-MysqlCli.ps1 | 18 +- .../scripts/build/Install-NET48-devpack.ps1 | 10 +- .../windows/scripts/build/Install-NET48.ps1 | 10 +- images/windows/scripts/build/Install-NSIS.ps1 | 2 +- .../windows/scripts/build/Install-Nginx.ps1 | 2 +- .../windows/scripts/build/Install-NodeJS.ps1 | 4 +- .../windows/scripts/build/Install-OpenSSL.ps1 | 42 ++--- images/windows/scripts/build/Install-PHP.ps1 | 6 +- .../scripts/build/Install-PostgreSQL.ps1 | 9 +- .../scripts/build/Install-PowershellCore.ps1 | 43 +---- images/windows/scripts/build/Install-R.ps1 | 6 +- .../scripts/build/Install-SQLOLEDBDriver.ps1 | 8 +- .../build/Install-SQLPowerShellTools.ps1 | 22 +-- images/windows/scripts/build/Install-Sbt.ps1 | 2 +- .../build/Install-ServiceFabricSDK.ps1 | 19 +- .../scripts/build/Install-VCRedist.ps1 | 18 +- .../scripts/build/Install-VSExtensions.ps1 | 5 +- .../scripts/build/Install-VisualStudio.ps1 | 28 ++- images/windows/scripts/build/Install-WDK.ps1 | 40 ++-- .../build/Install-WebPlatformInstaller.ps1 | 8 +- .../scripts/build/Install-WinAppDriver.ps1 | 13 +- images/windows/scripts/build/Install-Wix.ps1 | 2 +- .../windows/scripts/helpers/ChocoHelpers.ps1 | 31 +--- .../windows/scripts/helpers/ImageHelpers.psm1 | 4 +- .../scripts/helpers/InstallHelpers.ps1 | 175 +++++++++++------- .../scripts/helpers/VisualStudioHelpers.ps1 | 9 +- 46 files changed, 357 insertions(+), 458 deletions(-) diff --git a/images/windows/scripts/build/Install-AWSTools.ps1 b/images/windows/scripts/build/Install-AWSTools.ps1 index 5fdd8f949487..ff9cdab3b17f 100644 --- a/images/windows/scripts/build/Install-AWSTools.ps1 +++ b/images/windows/scripts/build/Install-AWSTools.ps1 @@ -5,26 +5,21 @@ ################################################################################ # Install AWS CLI -Choco-Install -PackageName awscli +Install-ChocoPackage awscli # Install Session Manager Plugin for the AWS CLI -$sessionManagerName = "SessionManagerPluginSetup.exe" -$sessionManagerUrl = "https://s3.amazonaws.com/session-manager-downloads/plugin/latest/windows/$sessionManagerName" -$sessionManagerSignatureThumbprint = "FF457E5732E98A9F156E657F8CC7C4432507C3BB" -Install-Binary -Url $sessionManagerUrl -Name $sessionManagerName -ArgumentList ("/silent", "/install") -ExpectedSignature $sessionManagerSignatureThumbprint +Install-Binary ` + -Url "https://s3.amazonaws.com/session-manager-downloads/plugin/latest/windows/SessionManagerPluginSetup.exe" ` + -InstallArgs ("/silent", "/install") ` + -ExpectedSignature "FF457E5732E98A9F156E657F8CC7C4432507C3BB" $env:Path = $env:Path + ";$env:ProgramFiles\Amazon\SessionManagerPlugin\bin" # Install AWS SAM CLI $packageName = "AWS_SAM_CLI_64_PY3.msi" $packageUrl = "https://github.com/awslabs/aws-sam-cli/releases/latest/download/$packageName" -$packagePath = Start-DownloadWithRetry -Url $packageUrl -Name $packageName - -#region Supply chain security - AWS SAM CLI -$fileHash = (Get-FileHash -Path $packagePath -Algorithm SHA256).Hash $externalHash = Get-HashFromGitHubReleaseBody -RepoOwner "awslabs" -RepoName "aws-sam-cli" -FileName $packageName -Use-ChecksumComparison $fileHash $externalHash -#endregion - -Install-Binary -FilePath $packagePath +Install-Binary ` + -Url $packageUrl ` + -ExpectedSHA256Sum $externalHash Invoke-PesterTests -TestFile "CLI.Tools" -TestName "AWS" diff --git a/images/windows/scripts/build/Install-Apache.ps1 b/images/windows/scripts/build/Install-Apache.ps1 index 0bcc7a5eec25..e2d37dcc0667 100644 --- a/images/windows/scripts/build/Install-Apache.ps1 +++ b/images/windows/scripts/build/Install-Apache.ps1 @@ -8,7 +8,7 @@ Stop-Service -Name w3svc | Out-Null # Install latest apache in chocolatey $installDir = "C:\tools" -Choco-Install -PackageName apache-httpd -ArgumentList "--force", "--params", "/installLocation:$installDir /port:80" +Install-ChocoPackage apache-httpd -ArgumentList "--force", "--params", "/installLocation:$installDir /port:80" # Stop and disable Apache service Stop-Service -Name Apache diff --git a/images/windows/scripts/build/Install-AzureCli.ps1 b/images/windows/scripts/build/Install-AzureCli.ps1 index a4ff45e08201..1a1c2f19664b 100644 --- a/images/windows/scripts/build/Install-AzureCli.ps1 +++ b/images/windows/scripts/build/Install-AzureCli.ps1 @@ -11,9 +11,9 @@ $azureCliConfigPath = 'C:\azureCli' # make variable to be available in the current session ${env:AZURE_CONFIG_DIR} = $azureCliConfigPath -$azCliUrl = 'https://aka.ms/installazurecliwindowsx64' -$azCliSignatureThumbprint = "72105B6D5F370B62FD5C82F1512F7AD7DEE5F2C0" -Install-Binary -Url $azCliUrl -Name 'azure-cli.msi' -ExpectedSignature $azCliSignatureThumbprint +Install-Binary -Type MSI ` + -Url 'https://aka.ms/installazurecliwindowsx64' ` + -ExpectedSignature '72105B6D5F370B62FD5C82F1512F7AD7DEE5F2C0' $azureCliExtensionPath = Join-Path $Env:CommonProgramFiles 'AzureCliExtensionDirectory' $null = New-Item -ItemType 'Directory' -Path $azureCliExtensionPath diff --git a/images/windows/scripts/build/Install-AzureCosmosDbEmulator.ps1 b/images/windows/scripts/build/Install-AzureCosmosDbEmulator.ps1 index 697eaf853b87..32c1e9f2724a 100644 --- a/images/windows/scripts/build/Install-AzureCosmosDbEmulator.ps1 +++ b/images/windows/scripts/build/Install-AzureCosmosDbEmulator.ps1 @@ -3,10 +3,8 @@ ## Desc: Install Azure CosmosDb Emulator #################################################################################### -$InstallerName = "AzureCosmosDBEmulator.msi" -$InstallerUrl = "https://aka.ms/cosmosdb-emulator" -$SignatureThumbprint = "F372C27F6E052A6BE8BAB3112B465C692196CD6F" - -Install-Binary -Url $InstallerUrl -Name $InstallerName -ExpectedSignature $SignatureThumbprint +Install-Binary -Type MSI ` + -Url "https://aka.ms/cosmosdb-emulator" ` + -ExpectedSignature "F372C27F6E052A6BE8BAB3112B465C692196CD6F" Invoke-PesterTests -TestFile "Tools" -TestName "Azure Cosmos DB Emulator" diff --git a/images/windows/scripts/build/Install-Bazel.ps1 b/images/windows/scripts/build/Install-Bazel.ps1 index 61dd94ee632d..bc3a4e011278 100644 --- a/images/windows/scripts/build/Install-Bazel.ps1 +++ b/images/windows/scripts/build/Install-Bazel.ps1 @@ -3,8 +3,8 @@ ## Desc: Install Bazel and Bazelisk (A user-friendly launcher for Bazel) ################################################################################ -Choco-Install -PackageName bazel +Install-ChocoPackage bazel npm install -g @bazel/bazelisk -Invoke-PesterTests -TestFile "Tools" -TestName "Bazel" \ No newline at end of file +Invoke-PesterTests -TestFile "Tools" -TestName "Bazel" diff --git a/images/windows/scripts/build/Install-BizTalkBuildComponent.ps1 b/images/windows/scripts/build/Install-BizTalkBuildComponent.ps1 index 2dd4cbbf0ac7..f1d7537acdfb 100644 --- a/images/windows/scripts/build/Install-BizTalkBuildComponent.ps1 +++ b/images/windows/scripts/build/Install-BizTalkBuildComponent.ps1 @@ -3,86 +3,29 @@ ## Desc: Install BizTalk Project Build Component ################################################################################ -function Install-Msi -{ - <# - .SYNOPSIS - A helper function to install executables. - - .DESCRIPTION - install .exe or .msi binaries from specified Path. - - .PARAMETER MsiPath - Msi or exe path. Required parameter. - - .PARAMETER LogPath - The log file path where installation will write log to. Required parameter. - - .EXAMPLE - Install-Msi -MsiPath "c:\temp\abc.msi" -LogPath "c:\abc.log" - #> - - Param - ( - [Parameter(Mandatory)] - [String] $MsiPath, - [Parameter(Mandatory)] - [String] $LogPath - ) - - try - { - $filePath = "msiexec.exe" - - Write-Host "Starting Install $MsiPath..." - $ArgumentList = ('/i', $MsiPath, '/QN', '/norestart', "/l*v",$LogPath) - $process = Start-Process -FilePath $filePath -ArgumentList $ArgumentList -Wait -PassThru -Verb runAs - - $exitCode = $process.ExitCode - if ($exitCode -eq 0 -or $exitCode -eq 3010) - { - Write-Host "Installation for $MsiPath is successful." - } - else - { - Write-Host "Non zero exit code returned by $MsiPath installation process: $exitCode" - Get-Content $LogPath | Write-Host - exit $exitCode - } - } - catch - { - Write-Host "Failed to install $MsiPath : $($_.Exception.Message)" - exit 1 - } -} - -$bizTalkBuildComponentUri = "https://aka.ms/BuildComponentSetup.EN" +$BuildComponentUri = "https://aka.ms/BuildComponentSetup.EN" +$BuildComponentSignatureThumbprint = "8740DF4ACB749640AD318E4BE842F72EC651AD80" -# Download -Write-Host "BizTalk Project Build Component download..." -$setupZipFile = Start-DownloadWithRetry -Url $bizTalkBuildComponentUri -Name "BuildComponentSetup.EN.zip" +Write-Host "Downloading BizTalk Project Build Component archive..." +$setupZipFile = Start-DownloadWithRetry -Url $BuildComponentUri -Name "BuildComponentSetup.EN.zip" -# Unzip -$setupPath = "C:\BizTalkBuildComponent" +$setupPath = Join-Path $env:TEMP "BizTalkBuildComponent" if (-not (Test-Path -Path $setupPath)) { $null = New-Item -Path $setupPath -ItemType Directory -Force } - -Write-Host "Unzip $setupZipFile to $setupPath..." Extract-7Zip -Path $setupZipFile -DestinationPath $setupPath -Remove-Item $setupZipFile - -# Verify signature -$BuildComponentSignatureThumbprint = "8740DF4ACB749640AD318E4BE842F72EC651AD80" -Test-FileSignature -FilePath "$setupPath\Bootstrap.msi" -ExpectedThumbprint $BuildComponentSignatureThumbprint -Test-FileSignature -FilePath "$setupPath\BuildComponentSetup.msi" -ExpectedThumbprint $BuildComponentSignatureThumbprint -# Install -Install-Msi -MsiPath "$setupPath\Bootstrap.msi" -LogPath "$setupPath\bootstrap.log" -Install-Msi -MsiPath "$setupPath\BuildComponentSetup.msi" -LogPath "$setupPath\buildComponentSetup.log" +Write-Host "Installing BizTalk Project Build Component..." +Install-Binary ` + -LocalPath "$setupPath\Bootstrap.msi" ` + -ExtraInstallArgs ("/l*v", "$setupPath\bootstrap.log") ` + -ExpectedSignature $BuildComponentSignatureThumbprint +Install-Binary ` + -LocalPath "$setupPath\BuildComponentSetup.msi" ` + -ExtraInstallArgs ("/l*v", "$setupPath\buildComponentSetup.log") ` + -ExpectedSignature $BuildComponentSignatureThumbprint +Remove-Item $setupZipFile Remove-Item $setupPath -Recurse -Force -# Test Invoke-PesterTests -TestFile "BizTalk" -TestName "BizTalk Build Component Setup" diff --git a/images/windows/scripts/build/Install-ChocolateyPackages.ps1 b/images/windows/scripts/build/Install-ChocolateyPackages.ps1 index 3d2fbdc5613f..826e77ff9d04 100644 --- a/images/windows/scripts/build/Install-ChocolateyPackages.ps1 +++ b/images/windows/scripts/build/Install-ChocolateyPackages.ps1 @@ -6,7 +6,7 @@ $commonPackages = (Get-ToolsetContent).choco.common_packages foreach ($package in $commonPackages) { - Choco-Install -PackageName $package.name -ArgumentList $package.args + Install-ChocoPackage $package.name -ArgumentList $package.args } Invoke-PesterTests -TestFile "ChocoPackages" diff --git a/images/windows/scripts/build/Install-Chrome.ps1 b/images/windows/scripts/build/Install-Chrome.ps1 index 2a2341f3c697..43b6a0f05006 100644 --- a/images/windows/scripts/build/Install-Chrome.ps1 +++ b/images/windows/scripts/build/Install-Chrome.ps1 @@ -4,10 +4,9 @@ ################################################################################ # Download and install latest Chrome browser -$ChromeSignatureThumbprint = "2673EA6CC23BEFFDA49AC715B121544098A1284C" -$ChromeInstallerFile = "googlechromestandaloneenterprise64.msi" -$ChromeInstallerUrl = "https://dl.google.com/tag/s/dl/chrome/install/${ChromeInstallerFile}" -Install-Binary -Url $ChromeInstallerUrl -Name $ChromeInstallerFile -ArgumentList @() -ExpectedSignature $ChromeSignatureThumbprint +Install-Binary ` + -Url 'https://dl.google.com/tag/s/dl/chrome/install/googlechromestandaloneenterprise64.msi' ` + -ExpectedSignature '2673EA6CC23BEFFDA49AC715B121544098A1284C' # Prepare firewall rules Write-Host "Adding the firewall rule for Google update blocking..." diff --git a/images/windows/scripts/build/Install-DACFx.ps1 b/images/windows/scripts/build/Install-DACFx.ps1 index 087ae63362da..bff35dde9373 100644 --- a/images/windows/scripts/build/Install-DACFx.ps1 +++ b/images/windows/scripts/build/Install-DACFx.ps1 @@ -3,10 +3,8 @@ ## Desc: Install SQL Server® Data-Tier Application Framework (DacFx) for Windows #################################################################################### -$InstallerName = "DacFramework.msi" -$InstallerUrl = "https://aka.ms/dacfx-msi" -$SignatureThumbprint = "72105B6D5F370B62FD5C82F1512F7AD7DEE5F2C0" - -Install-Binary -Url $InstallerUrl -Name $InstallerName -ExpectedSignature $SignatureThumbprint +Install-Binary -Type MSI ` + -Url 'https://aka.ms/dacfx-msi' ` + -ExpectedSignature '72105B6D5F370B62FD5C82F1512F7AD7DEE5F2C0' Invoke-PesterTests -TestFile "Tools" -TestName "DACFx" diff --git a/images/windows/scripts/build/Install-DockerCompose.ps1 b/images/windows/scripts/build/Install-DockerCompose.ps1 index 3cbbd3a15859..915aed715a71 100644 --- a/images/windows/scripts/build/Install-DockerCompose.ps1 +++ b/images/windows/scripts/build/Install-DockerCompose.ps1 @@ -5,8 +5,8 @@ ################################################################################ Write-Host "Install-Package Docker-Compose v1" -$versionToInstall = Get-LatestChocoPackageVersion -TargetVersion "1.29" -PackageName "docker-compose" -Choco-Install -PackageName docker-compose -ArgumentList "--version=$versionToInstall" +$versionToInstall = Resolve-ChocoPackageVersion -PackageName "docker-compose" -TargetVersion "1.29" +Install-ChocoPackage docker-compose -ArgumentList "--version=$versionToInstall" Write-Host "Install-Package Docker-Compose v2" $dockerComposev2Url = "https://github.com/docker/compose/releases/latest/download/docker-compose-windows-x86_64.exe" diff --git a/images/windows/scripts/build/Install-Firefox.ps1 b/images/windows/scripts/build/Install-Firefox.ps1 index 11a7d6f4f400..0a66f0d7cee5 100644 --- a/images/windows/scripts/build/Install-Firefox.ps1 +++ b/images/windows/scripts/build/Install-Firefox.ps1 @@ -5,19 +5,18 @@ ################################################################################ # Install and configure Firefox browser -Write-Host "Install latest Firefox browser..." +Write-Host "Get the latest Firefox version..." $VersionsManifest = Invoke-RestMethod "https://product-details.mozilla.org/1.0/firefox_versions.json" -$InstallerUrl = "https://download.mozilla.org/?product=firefox-$($VersionsManifest.LATEST_FIREFOX_VERSION)&os=win64&lang=en-US" -$packagePath = Start-DownloadWithRetry -Url $InstallerUrl -Name "FirefoxSetup.exe" -#region Supply chain security - Stack -$fileHash = (Get-FileHash -Path $packagePath -Algorithm SHA256).Hash +Write-Host "Install Firefox browser..." +$installerUrl = "https://download.mozilla.org/?product=firefox-$($VersionsManifest.LATEST_FIREFOX_VERSION)&os=win64&lang=en-US" $hashUrl = "https://archive.mozilla.org/pub/firefox/releases/$($VersionsManifest.LATEST_FIREFOX_VERSION)/SHA256SUMS" $externalHash = (Invoke-RestMethod -Uri $hashURL).ToString().Split("`n").Where({ $_ -ilike "*win64/en-US/Firefox Setup*exe*" }).Split(' ')[0] -Use-ChecksumComparison $fileHash $externalHash -#endregion -Install-Binary -FilePath $packagePath -ArgumentList "/silent", "/install" +Install-Binary -Type EXE ` + -Url $installerUrl ` + -InstallArgs @("/silent", "/install") ` + -ExpectedSHA256Sum $externalHash Write-Host "Disable autoupdate..." $FirefoxDirectoryPath = Join-Path $env:ProgramFiles "Mozilla Firefox" @@ -32,8 +31,7 @@ pref("general.config.filename", "mozilla.cfg");' -ItemType file -force # Download and install Gecko WebDriver Write-Host "Install Gecko WebDriver..." $GeckoDriverPath = "$($env:SystemDrive)\SeleniumWebDrivers\GeckoDriver" -if (-not (Test-Path -Path $GeckoDriverPath)) -{ +if (-not (Test-Path -Path $GeckoDriverPath)) { New-Item -Path $GeckoDriverPath -ItemType Directory -Force } diff --git a/images/windows/scripts/build/Install-Git.ps1 b/images/windows/scripts/build/Install-Git.ps1 index 8219f6dec071..f7aaa256cdfb 100644 --- a/images/windows/scripts/build/Install-Git.ps1 +++ b/images/windows/scripts/build/Install-Git.ps1 @@ -8,28 +8,25 @@ Import-Module "$env:ChocolateyInstall\helpers\chocolateyProfile.psm1" # Install the latest version of Git for Windows $repoURL = "https://api.github.com/repos/git-for-windows/git/releases/latest" $gitReleases = Invoke-RestMethod $repoURL -[string]$downloadUrl = $gitReleases.assets.browser_download_url -match "Git-.+-64-bit.exe" -$installerFile = Split-Path $downloadUrl -Leaf -$packagePath = Start-DownloadWithRetry -Url $downloadUrl -Name $installerFile +$downloadUrl = $gitReleases.assets.browser_download_url -match "Git-.+-64-bit.exe" | Select-Object -First 1 -#region Supply chain security - Git -$fileHash = (Get-FileHash -Path $packagePath -Algorithm SHA256).Hash +$installerFile = Split-Path $downloadUrl -Leaf $externalHash = Get-HashFromGitHubReleaseBody -Url $RepoURL -FileName $installerFile -Use-ChecksumComparison $fileHash $externalHash -#endregion - -Install-Binary -FilePath $packagePath ` - -ArgumentList ( - "/VERYSILENT", ` - "/NORESTART", ` - "/NOCANCEL", ` - "/SP-", ` - "/CLOSEAPPLICATIONS", ` - "/RESTARTAPPLICATIONS", ` - "/o:PathOption=CmdTools", ` - "/o:BashTerminalOption=ConHost", ` - "/o:EnableSymlinks=Enabled", ` - "/COMPONENTS=gitlfs") + +Install-Binary ` + -Url $downloadUrl ` + -InstallArgs @(` + "/VERYSILENT", ` + "/NORESTART", ` + "/NOCANCEL", ` + "/SP-", ` + "/CLOSEAPPLICATIONS", ` + "/RESTARTAPPLICATIONS", ` + "/o:PathOption=CmdTools", ` + "/o:BashTerminalOption=ConHost", ` + "/o:EnableSymlinks=Enabled", ` + "/COMPONENTS=gitlfs") ` + -ExpectedSHA256Sum $externalHash Update-SessionEnvironment @@ -42,7 +39,7 @@ git config --system --add safe.directory "*" Add-MachinePathItem "C:\Program Files\Git\bin" # Add well-known SSH host keys to ssh_known_hosts -ssh-keyscan -t rsa,ecdsa,ed25519 github.com >> "C:\Program Files\Git\etc\ssh\ssh_known_hosts" +ssh-keyscan -t rsa, ecdsa, ed25519 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" Invoke-PesterTests -TestFile "Git" diff --git a/images/windows/scripts/build/Install-GitHub-CLI.ps1 b/images/windows/scripts/build/Install-GitHub-CLI.ps1 index cf8278ac8125..d34412e35535 100644 --- a/images/windows/scripts/build/Install-GitHub-CLI.ps1 +++ b/images/windows/scripts/build/Install-GitHub-CLI.ps1 @@ -7,19 +7,15 @@ Write-Host "Get the latest gh version..." $repoUrl = "https://api.github.com/repos/cli/cli/releases/latest" -$installerFile = "gh_windows_amd64.msi" $assets = (Invoke-RestMethod -Uri $repoUrl).assets $downloadUrl = ($assets.browser_download_url -match "windows_amd64.msi") | Select-Object -First 1 -$packagePath = Start-DownloadWithRetry -Url $downloadUrl -Name $installerFile -#region Supply chain security - GitHub CLI -$fileHash = (Get-FileHash -Path $packagePath -Algorithm SHA256).Hash $hashUrl = ($assets.browser_download_url -match "checksums.txt") | Select-Object -First 1 $externalHash = (Invoke-RestMethod -Uri $hashURL).ToString().Split("`n").Where({ $_ -ilike "*windows_amd64.msi*" }).Split(' ')[0] -Use-ChecksumComparison $fileHash $externalHash -#endregion -Install-Binary -FilePath $packagePath +Install-Binary ` + -Url $downloadUrl ` + -ExpectedSHA256Sum $externalHash Add-MachinePathItem "C:\Program Files (x86)\GitHub CLI" diff --git a/images/windows/scripts/build/Install-GoogleCloudCLI.ps1 b/images/windows/scripts/build/Install-GoogleCloudCLI.ps1 index 8b793b3b762f..a26481db425b 100644 --- a/images/windows/scripts/build/Install-GoogleCloudCLI.ps1 +++ b/images/windows/scripts/build/Install-GoogleCloudCLI.ps1 @@ -4,10 +4,9 @@ ################################################################################ # https://cloud.google.com/sdk/docs/downloads-interactive -$googleCloudCLIInstaller = "https://dl.google.com/dl/cloudsdk/channels/rapid/GoogleCloudSDKInstaller.exe" -$argumentList = @("/S", "/allusers", "/noreporting") -$googleCloudCLISignatureThumbprint = "2673EA6CC23BEFFDA49AC715B121544098A1284C" - -Install-Binary -Url $googleCloudCLIInstaller -Name "GoogleCloudSDKInstaller.exe" -ArgumentList $argumentList -ExpectedSignature $googleCloudCLISignatureThumbprint +Install-Binary ` + -Url 'https://dl.google.com/dl/cloudsdk/channels/rapid/GoogleCloudSDKInstaller.exe' ` + -InstallArgs @("/S", "/allusers", "/noreporting") ` + -ExpectedSignature '2673EA6CC23BEFFDA49AC715B121544098A1284C' Invoke-PesterTests -TestFile "Tools" -TestName "GoogleCloudCLI" diff --git a/images/windows/scripts/build/Install-JavaTools.ps1 b/images/windows/scripts/build/Install-JavaTools.ps1 index 9696fd9f53b5..084d23d97e65 100644 --- a/images/windows/scripts/build/Install-JavaTools.ps1 +++ b/images/windows/scripts/build/Install-JavaTools.ps1 @@ -114,13 +114,13 @@ foreach ($jdkVersionToInstall in $jdkVersionsToInstall) { # Install Java tools # Force chocolatey to ignore dependencies on Ant and Maven or else they will download the Oracle JDK -Choco-Install -PackageName ant -ArgumentList "-i" +Install-ChocoPackage ant -ArgumentList "--ignore-dependencies" # Maven 3.9.x has multiple compatibilities problems $toolsetMavenVersion = (Get-ToolsetContent).maven.version -$versionToInstall = Get-LatestChocoPackageVersion -TargetVersion $toolsetMavenVersion -PackageName "maven" +$versionToInstall = Resolve-ChocoPackageVersion -PackageName "maven" -TargetVersion $toolsetMavenVersion -Choco-Install -PackageName maven -ArgumentList "--version=$versionToInstall" -Choco-Install -PackageName gradle +Install-ChocoPackage maven -ArgumentList "--version=$versionToInstall" +Install-ChocoPackage gradle # Add maven env variables to Machine [string]$m2 = (Get-MachinePath).Split(";") -match "maven" diff --git a/images/windows/scripts/build/Install-KubernetesTools.ps1 b/images/windows/scripts/build/Install-KubernetesTools.ps1 index eb44761fd5b7..5126ba52c47e 100644 --- a/images/windows/scripts/build/Install-KubernetesTools.ps1 +++ b/images/windows/scripts/build/Install-KubernetesTools.ps1 @@ -23,12 +23,12 @@ Use-ChecksumComparison $fileHash $externalHash Add-MachinePathItem $destFilePath Write-Host "Install Kubectl" -Choco-Install -PackageName kubernetes-cli +Install-ChocoPackage kubernetes-cli Write-Host "Install Helm" -Choco-Install -PackageName kubernetes-helm +Install-ChocoPackage kubernetes-helm Write-Host "Install Minikube" -Choco-Install -PackageName minikube +Install-ChocoPackage minikube Invoke-PesterTests -TestFile "Tools" -TestName "KubernetesTools" diff --git a/images/windows/scripts/build/Install-LLVM.ps1 b/images/windows/scripts/build/Install-LLVM.ps1 index f039a9421ef4..41b8aef95184 100644 --- a/images/windows/scripts/build/Install-LLVM.ps1 +++ b/images/windows/scripts/build/Install-LLVM.ps1 @@ -4,7 +4,7 @@ ################################################################################ $llvmVersion = (Get-ToolsetContent).llvm.version -$latestChocoVersion = Get-LatestChocoPackageVersion -TargetVersion $llvmVersion -PackageName "llvm" -Choco-Install -PackageName llvm -ArgumentList '--version', $latestChocoVersion +$latestChocoVersion = Resolve-ChocoPackageVersion -PackageName "llvm" -TargetVersion $llvmVersion +Install-ChocoPackage llvm -ArgumentList '--version', $latestChocoVersion Invoke-PesterTests -TestFile "LLVM" diff --git a/images/windows/scripts/build/Install-Mercurial.ps1 b/images/windows/scripts/build/Install-Mercurial.ps1 index bcbab65cd416..96ba27ee6a86 100644 --- a/images/windows/scripts/build/Install-Mercurial.ps1 +++ b/images/windows/scripts/build/Install-Mercurial.ps1 @@ -3,10 +3,10 @@ ## Desc: Install Mercurial ################################################################################ -Choco-Install -PackageName hg -ArgumentList "--version", "5.0.0" +Install-ChocoPackage hg -ArgumentList "--version", "5.0.0" $hgPath = "${env:ProgramFiles}\Mercurial\" Add-MachinePathItem $hgPath $env:Path = Get-MachinePath -Invoke-PesterTests -TestFile "Tools" -TestName "Mercurial" \ No newline at end of file +Invoke-PesterTests -TestFile "Tools" -TestName "Mercurial" diff --git a/images/windows/scripts/build/Install-Miniconda.ps1 b/images/windows/scripts/build/Install-Miniconda.ps1 index e81eeeaab4ec..c628675ccb36 100644 --- a/images/windows/scripts/build/Install-Miniconda.ps1 +++ b/images/windows/scripts/build/Install-Miniconda.ps1 @@ -5,28 +5,28 @@ ################################################################################ $CondaDestination = "C:\Miniconda" - -# Install the latest Miniconda $InstallerName = "Miniconda3-latest-Windows-x86_64.exe" -$InstallerUrl = "https://repo.anaconda.com/miniconda/${InstallerName}" -$ArgumentList = ("/S", "/AddToPath=0", "/RegisterPython=0", "/D=$CondaDestination") - -Install-Binary -Url $InstallerUrl -Name $InstallerName -ArgumentList $ArgumentList -[System.Environment]::SetEnvironmentVariable("CONDA", $CondaDestination, "Machine") #region Supply chain security -$localFileHash = (Get-FileHash -Path (Join-Path ${env:TEMP} $installerName) -Algorithm SHA256).Hash $distributorFileHash = $null - $checksums = (Invoke-RestMethod -Uri 'https://repo.anaconda.com/miniconda/' | ConvertFrom-HTML).SelectNodes('//html/body/table/tr') -ForEach($node in $checksums) { +foreach ($node in $checksums) { if ($node.ChildNodes[1].InnerText -eq $InstallerName) { $distributorFileHash = $node.ChildNodes[7].InnerText } } -Use-ChecksumComparison -LocalFileHash $localFileHash -DistributorFileHash $distributorFileHash +if ($null -eq $distributorFileHash) { + throw "Unable to find checksum for $InstallerName in https://repo.anaconda.com/miniconda/" +} #endregion +Install-Binary ` + -Url "https://repo.anaconda.com/miniconda/${InstallerName}" ` + -InstallArgs @("/S", "/AddToPath=0", "/RegisterPython=0", "/D=$CondaDestination") ` + -ExpectedSHA256Sum $distributorFileHash + +[System.Environment]::SetEnvironmentVariable("CONDA", $CondaDestination, "Machine") + Invoke-PesterTests -TestFile "Miniconda" diff --git a/images/windows/scripts/build/Install-MongoDB.ps1 b/images/windows/scripts/build/Install-MongoDB.ps1 index 82b1a36d4f6f..35cfd76f9cbc 100644 --- a/images/windows/scripts/build/Install-MongoDB.ps1 +++ b/images/windows/scripts/build/Install-MongoDB.ps1 @@ -20,12 +20,10 @@ foreach ($release in $TargetReleases) { $LatestVersion = $MinorVersions[0] -$installDir = "c:\PROGRA~1\MongoDB" -$binaryName = "mongodb-windows-x86_64-$LatestVersion-signed.msi" -$downloadURL = "https://fastdl.mongodb.org/windows/$BinaryName" -$installArg = "INSTALLLOCATION=$installDir ADDLOCAL=all" -Install-Binary -Url $downloadURL -Name $binaryName -ArgumentList ("/q","/i","${env:Temp}\$binaryName", $installArg) -ExpectedSignature (Get-ToolsetContent).mongodb.signature - +Install-Binary ` + -Url "https://fastdl.mongodb.org/windows/mongodb-windows-x86_64-$LatestVersion-signed.msi" ` + -ExtraInstallArgs @('TARGETDIR=C:\PROGRA~1\MongoDB ADDLOCAL=ALL') ` + -ExpectedSignature (Get-ToolsetContent).mongodb.signature # Add mongodb to the PATH $mongodbService = "mongodb" diff --git a/images/windows/scripts/build/Install-MysqlCli.ps1 b/images/windows/scripts/build/Install-MysqlCli.ps1 index a05b56cd3fce..7ca934dca58f 100644 --- a/images/windows/scripts/build/Install-MysqlCli.ps1 +++ b/images/windows/scripts/build/Install-MysqlCli.ps1 @@ -4,26 +4,26 @@ ################################################################################ # Installing visual c++ redistibutable package. -$InstallerName = "vcredist_x64.exe" -$InstallerURI = "https://download.microsoft.com/download/0/5/6/056dcda9-d667-4e27-8001-8a0c6971d6b1/${InstallerName}" -$ArgumentList = ("/install", "/quiet", "/norestart") -$InstallerSignatureThumbrint = "3BDA323E552DB1FDE5F4FBEE75D6D5B2B187EEDC" - -Install-Binary -Url $InstallerURI -Name $InstallerName -ArgumentList $ArgumentList -ExpectedSignature $InstallerSignatureThumbrint +Install-Binary ` + -Url 'https://download.microsoft.com/download/0/5/6/056dcda9-d667-4e27-8001-8a0c6971d6b1/vcredist_x64.exe' ` + -InstallArgs @("/install", "/quiet", "/norestart") ` + -ExpectedSignature '3BDA323E552DB1FDE5F4FBEE75D6D5B2B187EEDC' # Downloading mysql [version]$MysqlVersion = (Get-ToolsetContent).mysql.version $MysqlVersionMajorMinor = $MysqlVersion.ToString(2) if ($MysqlVersion.Build -lt 0) { - $MysqlVersion = (Invoke-RestMethod -Uri "https://dev.mysql.com/downloads/mysql/${MysqlVersionMajorMinor}.html" -Headers @{ 'User-Agent'='curl/8.4.0' } | - Select-String -Pattern "${MysqlVersionMajorMinor}\.\d+").Matches.Value + $MysqlVersion = (Invoke-RestMethod -Uri "https://dev.mysql.com/downloads/mysql/${MysqlVersionMajorMinor}.html" -Headers @{ 'User-Agent' = 'curl/8.4.0' } | + Select-String -Pattern "${MysqlVersionMajorMinor}\.\d+").Matches.Value } $MysqlVersionFull = $MysqlVersion.ToString() $MysqlVersionUrl = "https://cdn.mysql.com/Downloads/MySQL-${MysqlVersionMajorMinor}/mysql-${MysqlVersionFull}-winx64.msi" -Install-Binary -Url $MysqlVersionUrl -Name "mysql-${MysqlVersionFull}-winx64.msi" -ExpectedSignature (Get-ToolsetContent).mysql.signature +Install-Binary ` + -Url $MysqlVersionUrl ` + -ExpectedSignature (Get-ToolsetContent).mysql.signature # Adding mysql in system environment path $MysqlPath = $(Get-ChildItem -Path "C:\PROGRA~1\MySQL" -Directory)[0].FullName diff --git a/images/windows/scripts/build/Install-NET48-devpack.ps1 b/images/windows/scripts/build/Install-NET48-devpack.ps1 index 348924908a22..d1593161582e 100644 --- a/images/windows/scripts/build/Install-NET48-devpack.ps1 +++ b/images/windows/scripts/build/Install-NET48-devpack.ps1 @@ -4,11 +4,9 @@ ################################################################################ # .NET 4.8 Dev pack -$InstallerName = "ndp48-devpack-enu.exe" -$InstallerUrl = "https://download.visualstudio.microsoft.com/download/pr/014120d7-d689-4305-befd-3cb711108212/0307177e14752e359fde5423ab583e43/${InstallerName}" -$InstallerSignatureThumbprint = "C82273A065EC470FB1EBDE846A91E6FFB29E9C12" -$ArgumentList = ("Setup", "/passive", "/norestart") - -Install-Binary -Url $InstallerUrl -Name $InstallerName -ArgumentList $ArgumentList -ExpectedSignature $InstallerSignatureThumbprint +Install-Binary ` + -Url 'https://download.visualstudio.microsoft.com/download/pr/014120d7-d689-4305-befd-3cb711108212/0307177e14752e359fde5423ab583e43/ndp48-devpack-enu.exe' ` + -InstallArgs @("Setup", "/passive", "/norestart") ` + -ExpectedSignature 'C82273A065EC470FB1EBDE846A91E6FFB29E9C12' Invoke-PesterTests -TestFile "Tools" -TestName "NET48" diff --git a/images/windows/scripts/build/Install-NET48.ps1 b/images/windows/scripts/build/Install-NET48.ps1 index 271b11cd50d4..c9776cd2657f 100644 --- a/images/windows/scripts/build/Install-NET48.ps1 +++ b/images/windows/scripts/build/Install-NET48.ps1 @@ -4,9 +4,7 @@ ################################################################################ # .NET 4.8 Dev pack -$InstallerName = "ndp48-x86-x64-allos-enu.exe" -$InstallerUrl = "https://download.visualstudio.microsoft.com/download/pr/2d6bb6b2-226a-4baa-bdec-798822606ff1/8494001c276a4b96804cde7829c04d7f/${InstallerName}" -$InstallerSignatureThumbprint = "ABDCA79AF9DD48A0EA702AD45260B3C03093FB4B" -$ArgumentList = ("Setup", "/passive", "/norestart") - -Install-Binary -Url $InstallerUrl -Name $InstallerName -ArgumentList $ArgumentList -ExpectedSignature $InstallerSignatureThumbprint +Install-Binary ` + -Url 'https://download.visualstudio.microsoft.com/download/pr/2d6bb6b2-226a-4baa-bdec-798822606ff1/8494001c276a4b96804cde7829c04d7f/ndp48-x86-x64-allos-enu.exe' ` + -InstallArgs @("Setup", "/passive", "/norestart") ` + -ExpectedSignature 'ABDCA79AF9DD48A0EA702AD45260B3C03093FB4B' diff --git a/images/windows/scripts/build/Install-NSIS.ps1 b/images/windows/scripts/build/Install-NSIS.ps1 index 7995c39e1ab3..423eae9da0b2 100644 --- a/images/windows/scripts/build/Install-NSIS.ps1 +++ b/images/windows/scripts/build/Install-NSIS.ps1 @@ -6,7 +6,7 @@ $NsisVersion = (Get-ToolsetContent).nsis.version -Choco-Install -PackageName nsis -ArgumentList "--version", "$NsisVersion" +Install-ChocoPackage nsis -ArgumentList "--version", "$NsisVersion" $NsisPath = "${env:ProgramFiles(x86)}\NSIS\" Add-MachinePathItem $NsisPath diff --git a/images/windows/scripts/build/Install-Nginx.ps1 b/images/windows/scripts/build/Install-Nginx.ps1 index b0889305aadc..5d2dd0d2888c 100644 --- a/images/windows/scripts/build/Install-Nginx.ps1 +++ b/images/windows/scripts/build/Install-Nginx.ps1 @@ -8,7 +8,7 @@ Stop-Service -Name w3svc | Out-Null # Install latest nginx in chocolatey $installDir = "C:\tools" -Choco-Install -PackageName nginx -ArgumentList "--force", "--params", "/installLocation:$installDir /port:80" +Install-ChocoPackage nginx -ArgumentList "--force", "--params", "/installLocation:$installDir /port:80" # Stop and disable Nginx service Stop-Service -Name nginx diff --git a/images/windows/scripts/build/Install-NodeJS.ps1 b/images/windows/scripts/build/Install-NodeJS.ps1 index 5487ff9ce3a7..0f0d00a54463 100644 --- a/images/windows/scripts/build/Install-NodeJS.ps1 +++ b/images/windows/scripts/build/Install-NodeJS.ps1 @@ -11,9 +11,9 @@ New-Item -Path $PrefixPath -Force -ItemType Directory New-Item -Path $CachePath -Force -ItemType Directory $defaultVersion = (Get-ToolsetContent).node.default -$versionToInstall = Get-LatestChocoPackageVersion -TargetVersion $defaultVersion -PackageName "nodejs" +$versionToInstall = Resolve-ChocoPackageVersion -PackageName "nodejs" -TargetVersion $defaultVersion -Choco-Install -PackageName nodejs -ArgumentList "--version=$versionToInstall" +Install-ChocoPackage nodejs -ArgumentList "--version=$versionToInstall" Add-MachinePathItem $PrefixPath $env:Path = Get-MachinePath diff --git a/images/windows/scripts/build/Install-OpenSSL.ps1 b/images/windows/scripts/build/Install-OpenSSL.ps1 index 47441808a845..06f5e1840b71 100644 --- a/images/windows/scripts/build/Install-OpenSSL.ps1 +++ b/images/windows/scripts/build/Install-OpenSSL.ps1 @@ -7,7 +7,7 @@ $arch = 'INTEL' $bits = '64' $light = $false -$installer = "exe" +$installerType = "exe" $version = (Get-ToolsetContent).openssl.version $installDir = "$Env:ProgramFiles\OpenSSL" @@ -15,35 +15,27 @@ $installDir = "$Env:ProgramFiles\OpenSSL" $jsonUrl = 'https://raw.githubusercontent.com/slproweb/opensslhashes/master/win32_openssl_hashes.json' $installersAvailable = (Invoke-RestMethod $jsonUrl).files +$installerNames = $installersAvailable | Get-Member -MemberType NoteProperty | Select-Object -ExpandProperty Name -$distributor_file_hash = $null $installerUrl = $null -$installerName = $null - -$installersAvailable | Get-Member -MemberType NoteProperty | ForEach-Object { - $key = $_.Name - if(($installersAvailable.$key.light -eq $light) -and ($installersAvailable.$key.arch -eq $arch) -and ($installersAvailable.$key.bits -eq $bits) -and ($installersAvailable.$key.installer -eq $installer) -and ($installersAvailable.$key.basever -eq $version)) { - $installerUrl = $installersAvailable.$key.url - $installerName = $key - $distributor_file_hash = $installersAvailable.$key.sha512 - } +$installerHash = $null + +foreach ($key in $installerNames) { + $installer = $installersAvailable.$key + if (($installer.light -eq $light) -and ($installer.arch -eq $arch) -and ($installer.bits -eq $bits) -and ($installer.installer -eq $installerType) -and ($installer.basever -eq $version)) { + $installerUrl = $installer.url + $installerHash = $installer.sha512 + } } -# Invoke installation - -$installerArgs = '/silent', '/sp-', '/suppressmsgboxes', "/DIR=`"$installDir`"" -Install-Binary -Url "$installerUrl" -Name "$installerName" -ArgumentList $installerArgs - -#region Supply chain security -Write-Verbose "Performing checksum verification" -$local_file_hash = (Get-FileHash -Path (Join-Path ${env:TEMP} $installerName) -Algorithm SHA512).Hash - -if ($local_file_hash -ne $distributor_file_hash) { - Write-Host "hash must be equal to: ${distributor_file_hash}" - Write-Host "actual hash is: ${local_file_hash}" - throw 'Checksum verification failed, please rerun install' +if ($null -eq $installerUrl) { + throw "Installer not found for version $version" } -#endregion + +Install-Binary ` + -Url $installerUrl ` + -InstallArgs @('/silent', '/sp-', '/suppressmsgboxes', "/DIR=`"$installDir`"") ` + -ExpectedSHA512Sum $installerHash # Update PATH Add-MachinePathItem "$installDir\bin" diff --git a/images/windows/scripts/build/Install-PHP.ps1 b/images/windows/scripts/build/Install-PHP.ps1 index c8b5ffea1cff..f4198aa24306 100644 --- a/images/windows/scripts/build/Install-PHP.ps1 +++ b/images/windows/scripts/build/Install-PHP.ps1 @@ -6,11 +6,11 @@ # Install latest PHP in chocolatey $installDir = "c:\tools\php" $phpMajorMinor = (Get-ToolsetContent).php.version -$phpVersionToInstall = Get-LatestChocoPackageVersion -TargetVersion $phpMajorMinor -PackageName "php" -Choco-Install -PackageName php -ArgumentList "--params", "/InstallDir:$installDir", "--version=$phpVersionToInstall" +$phpVersionToInstall = Resolve-ChocoPackageVersion -PackageName "php" -TargetVersion $phpMajorMinor +Install-ChocoPackage php -ArgumentList "--params", "/InstallDir:$installDir", "--version=$phpVersionToInstall" # Install latest Composer in chocolatey -Choco-Install -PackageName composer -ArgumentList "--ia", "/DEV=$installDir /PHP=$installDir" +Install-ChocoPackage composer -ArgumentList "--install-args", "/DEV=$installDir /PHP=$installDir" # update path to extensions and enable curl and mbstring extensions, and enable php openssl extensions. ((Get-Content -path $installDir\php.ini -Raw) -replace ';extension=curl','extension=curl' -replace ';extension=mbstring','extension=mbstring' -replace ';extension_dir = "ext"','extension_dir = "ext"' -replace ';extension=openssl','extension=openssl') | Set-Content -Path $installDir\php.ini diff --git a/images/windows/scripts/build/Install-PostgreSQL.ps1 b/images/windows/scripts/build/Install-PostgreSQL.ps1 index f4d72d9c7690..c6803662327b 100644 --- a/images/windows/scripts/build/Install-PostgreSQL.ps1 +++ b/images/windows/scripts/build/Install-PostgreSQL.ps1 @@ -44,11 +44,14 @@ do { $increment-- } } while (!$response) + # Return the previous value of ErrorAction and invoke Install-Binary function $ErrorActionPreference = $ErrorActionOldValue -$InstallerName = $InstallerUrl.Split('/')[-1] -$ArgumentList = ("--install_runtimes 0", "--superpassword root", "--enable_acledit 1", "--unattendedmodeui none", "--mode unattended") -Install-Binary -Url $InstallerUrl -Name $InstallerName -ArgumentList $ArgumentList -ExpectedSignature (Get-ToolsetContent).postgresql.signature +$InstallerArgs = @("--install_runtimes 0", "--superpassword root", "--enable_acledit 1", "--unattendedmodeui none", "--mode unattended") +Install-Binary ` + -Url $InstallerUrl ` + -InstallArgs $InstallerArgs ` + -ExpectedSignature (Get-ToolsetContent).postgresql.signature # Get Path to pg_ctl.exe $pgPath = (Get-CimInstance Win32_Service -Filter "Name LIKE 'postgresql-%'").PathName diff --git a/images/windows/scripts/build/Install-PowershellCore.ps1 b/images/windows/scripts/build/Install-PowershellCore.ps1 index 6f36959f9631..e168a998fba1 100644 --- a/images/windows/scripts/build/Install-PowershellCore.ps1 +++ b/images/windows/scripts/build/Install-PowershellCore.ps1 @@ -6,20 +6,6 @@ $ErrorActionPreference = "Stop" -#region functions -Function Get-PowerShellCoreHash -{ - Param ( - [Parameter(Mandatory = $True)] - [string] $Release -) - - $hashURL = "https://github.com/PowerShell/PowerShell/releases/download/v${Release}/hashes.sha256" - (Invoke-RestMethod -Uri $hashURL).ToString().Split("`n").Where({ $_ -ilike "*PowerShell-${Release}-win-x64.msi*" }).Split(' ')[0] - -} -#endregion - $tempDir = Join-Path ([System.IO.Path]::GetTempPath()) ([System.IO.Path]::GetRandomFileName()) $null = New-Item -ItemType Directory -Path $tempDir -Force -ErrorAction SilentlyContinue try { @@ -28,33 +14,12 @@ try { $metadata = Invoke-RestMethod https://raw.githubusercontent.com/PowerShell/PowerShell/master/tools/metadata.json $release = $metadata.LTSReleaseTag[0] -replace '^v' - $packageName = "PowerShell-${release}-win-x64.msi" - - $downloadURL = "https://github.com/PowerShell/PowerShell/releases/download/v${release}/${packageName}" - Write-Verbose "About to download package from '$downloadURL'" -Verbose - - $packagePath = Join-Path -Path $tempDir -ChildPath $packageName - Invoke-WebRequest -Uri $downloadURL -OutFile $packagePath - - #region Supply chain security - Write-Verbose "Performing checksum verification" - - $distributor_file_hash = Get-PowerShellCoreHash -Release $release - $local_file_hash = (Get-FileHash -Path $packagePath -Algorithm SHA256).Hash + $downloadUrl = "https://github.com/PowerShell/PowerShell/releases/download/v${release}/PowerShell-${release}-win-x64.msi" - if ($local_file_hash -ne $distributor_file_hash) { - Write-Host "hash must be equal to: ${distributor_file_hash}" - Write-Host "actual hash is: ${local_file_hash}" - throw 'Checksum verification failed, please rerun install' - } - #endregion + $hashUrl = "https://github.com/PowerShell/PowerShell/releases/download/v${release}/hashes.sha256" + $expectedSHA256Sum = (Invoke-RestMethod -Uri $hashURL).ToString().Split("`n").Where({ $_ -ilike "*PowerShell-${Release}-win-x64.msi*" }).Split(' ')[0] - Write-Verbose "Performing quiet install" - $ArgumentList=@("/i", $packagePath, "/quiet") - $process = Start-Process msiexec -ArgumentList $ArgumentList -Wait -PassThru - if ($process.exitcode -ne 0) { - throw "Quiet install failed, please rerun install without -Quiet switch or ensure you have administrator rights" - } + Install-Binary -Url $downloadUrl -ExpectedSHA256Sum $expectedSHA256Sum } finally { # Restore original value [Net.ServicePointManager]::SecurityProtocol = $originalValue diff --git a/images/windows/scripts/build/Install-R.ps1 b/images/windows/scripts/build/Install-R.ps1 index a6f238e7f6b5..96743d72569c 100644 --- a/images/windows/scripts/build/Install-R.ps1 +++ b/images/windows/scripts/build/Install-R.ps1 @@ -3,9 +3,9 @@ ## Desc: Install R for Windows ################################################################################ -Choco-Install R.Project -Choco-Install rtools +Install-ChocoPackage R.Project +Install-ChocoPackage rtools $rscriptPath = Resolve-Path "C:\Program Files\R\*\bin\x64" Add-MachinePathItem $rscriptPath -Invoke-PesterTests -TestFile "Tools" -TestName "R" \ No newline at end of file +Invoke-PesterTests -TestFile "Tools" -TestName "R" diff --git a/images/windows/scripts/build/Install-SQLOLEDBDriver.ps1 b/images/windows/scripts/build/Install-SQLOLEDBDriver.ps1 index 207c728c4429..82fefc5e3a0b 100644 --- a/images/windows/scripts/build/Install-SQLOLEDBDriver.ps1 +++ b/images/windows/scripts/build/Install-SQLOLEDBDriver.ps1 @@ -3,7 +3,7 @@ ## Desc: Install OLE DB Driver for SQL Server ################################################################################ -$binaryDownloadPath = Start-DownloadWithRetry "https://go.microsoft.com/fwlink/?linkid=2242656" "msoledbsql.msi" -$binarySignatureThumbprint = "6E78B3DCE2998F6C2457C3E54DA90A01034916AE" -$ArgumentList = ("/i", "$binaryDownloadPath", "ADDLOCAL=ALL", "IACCEPTMSOLEDBSQLLICENSETERMS=YES", "/qn") -Install-Binary -FilePath $binaryDownloadPath -ArgumentList $ArgumentList -ExpectedSignature $binarySignatureThumbprint +Install-Binary -Type MSI ` + -Url "https://go.microsoft.com/fwlink/?linkid=2242656" ` + -ExtraInstallArgs @("ADDLOCAL=ALL", "IACCEPTMSOLEDBSQLLICENSETERMS=YES") ` + -ExpectedSignature '6E78B3DCE2998F6C2457C3E54DA90A01034916AE' diff --git a/images/windows/scripts/build/Install-SQLPowerShellTools.ps1 b/images/windows/scripts/build/Install-SQLPowerShellTools.ps1 index 1be0946a708a..a12c86ffe00e 100644 --- a/images/windows/scripts/build/Install-SQLPowerShellTools.ps1 +++ b/images/windows/scripts/build/Install-SQLPowerShellTools.ps1 @@ -3,18 +3,18 @@ ## Desc: Install SQL PowerShell tool ################################################################################ -$BaseUrl = "https://download.microsoft.com/download/B/1/7/B1783FE9-717B-4F78-A39A-A2E27E3D679D/ENU/x64" -$SignatureThumbrint = "9ACA9419E53D3C9E56396DD2335FF683A8B0B8F3" +$baseUrl = "https://download.microsoft.com/download/B/1/7/B1783FE9-717B-4F78-A39A-A2E27E3D679D/ENU/x64" +$signatureThumbrint = "9ACA9419E53D3C9E56396DD2335FF683A8B0B8F3" # install required MSIs -$SQLSysClrTypesName = "SQLSysClrTypes.msi" -$SQLSysClrTypesUrl = "${BaseUrl}/${SQLSysClrTypesName}" -Install-Binary -Url $SQLSysClrTypesUrl -Name $SQLSysClrTypesName -ExpectedSignature $SignatureThumbrint +Install-Binary ` + -Url "${baseUrl}/SQLSysClrTypes.msi" ` + -ExpectedSignature $signatureThumbrint -$SharedManagementObjectsName = "SharedManagementObjects.msi" -$SharedManagementObjectsUrl = "${BaseUrl}/${SharedManagementObjectsName}" -Install-Binary -Url $SharedManagementObjectsUrl -Name $SharedManagementObjectsName -ExpectedSignature $SignatureThumbrint +Install-Binary ` + -Url "${baseUrl}/SharedManagementObjects.msi" ` + -ExpectedSignature $signatureThumbrint -$PowerShellToolsName = "PowerShellTools.msi" -$PowerShellToolsUrl = "${BaseUrl}/${PowerShellToolsName}" -Install-Binary -Url $PowerShellToolsUrl -Name $PowerShellToolsName -ExpectedSignature $SignatureThumbrint +Install-Binary ` + -Url "${baseUrl}/PowerShellTools.msi" ` + -ExpectedSignature $signatureThumbrint diff --git a/images/windows/scripts/build/Install-Sbt.ps1 b/images/windows/scripts/build/Install-Sbt.ps1 index cfc37f5b8c0e..184380527fcd 100644 --- a/images/windows/scripts/build/Install-Sbt.ps1 +++ b/images/windows/scripts/build/Install-Sbt.ps1 @@ -5,7 +5,7 @@ # Install the latest version of sbt. # See https://chocolatey.org/packages/sbt -Choco-Install -PackageName sbt +Install-ChocoPackage sbt $env:SBT_HOME="${env:ProgramFiles(x86)}\sbt" diff --git a/images/windows/scripts/build/Install-ServiceFabricSDK.ps1 b/images/windows/scripts/build/Install-ServiceFabricSDK.ps1 index abd3a0e99c6d..18cb6461d46a 100644 --- a/images/windows/scripts/build/Install-ServiceFabricSDK.ps1 +++ b/images/windows/scripts/build/Install-ServiceFabricSDK.ps1 @@ -8,18 +8,19 @@ New-Item -Path 'C:\Windows\Installer' -ItemType Directory -Force # Get Service Fabric components versions -$serviceFabricRuntimeVersion = (Get-ToolsetContent).serviceFabric.runtime.version -$serviceFabricSDKVersion = (Get-ToolsetContent).serviceFabric.sdk.version +$runtimeVersion = (Get-ToolsetContent).serviceFabric.runtime.version +$sdkVersion = (Get-ToolsetContent).serviceFabric.sdk.version +$urlBase = "https://download.microsoft.com/download/b/8/a/b8a2fb98-0ec1-41e5-be98-9d8b5abf7856" # Install Service Fabric Runtime for Windows -$InstallerName = "MicrosoftServiceFabric.${serviceFabricRuntimeVersion}.exe" -$InstallerUrl = "https://download.microsoft.com/download/b/8/a/b8a2fb98-0ec1-41e5-be98-9d8b5abf7856/${InstallerName}" -$ArgumentList = ("/accepteula ","/quiet","/force") -Install-Binary -Url $InstallerUrl -Name $InstallerName -ArgumentList $ArgumentList -ExpectedSignature (Get-ToolsetContent).serviceFabric.runtime.signature +Install-Binary ` + -Url "${urlBase}/MicrosoftServiceFabric.${runtimeVersion}.exe" ` + -InstallArgs @("/accepteula ", "/quiet", "/force") ` + -ExpectedSignature (Get-ToolsetContent).serviceFabric.runtime.signature # Install Service Fabric SDK -$InstallerName = "MicrosoftServiceFabricSDK.${serviceFabricSDKVersion}.msi" -$InstallerUrl = "https://download.microsoft.com/download/b/8/a/b8a2fb98-0ec1-41e5-be98-9d8b5abf7856/${InstallerName}" -Install-Binary -Url $InstallerUrl -Name $InstallerName -ExpectedSignature (Get-ToolsetContent).serviceFabric.sdk.signature +Install-Binary ` + -Url "${urlBase}/MicrosoftServiceFabricSDK.${sdkVersion}.msi" ` + -ExpectedSignature (Get-ToolsetContent).serviceFabric.sdk.signature Invoke-PesterTests -TestFile "Tools" -TestName "ServiceFabricSDK" diff --git a/images/windows/scripts/build/Install-VCRedist.ps1 b/images/windows/scripts/build/Install-VCRedist.ps1 index 46646fb09d61..fea415cf724b 100644 --- a/images/windows/scripts/build/Install-VCRedist.ps1 +++ b/images/windows/scripts/build/Install-VCRedist.ps1 @@ -3,14 +3,18 @@ ## Desc: Install Visual C++ Redistributable ################################################################################ -$vc2010x86Name = "vcredist_x86.exe" -$vc2010x86URI = "https://download.microsoft.com/download/1/6/5/165255E7-1014-4D0A-B094-B6A430A6BFFC/${vc2010x86Name}" -$vc2010x64Name = "vcredist_x64.exe" -$vc2010x64URI = "https://download.microsoft.com/download/1/6/5/165255E7-1014-4D0A-B094-B6A430A6BFFC/${Vc2010x64Name}" +$baseUrl = "https://download.microsoft.com/download/1/6/5/165255E7-1014-4D0A-B094-B6A430A6BFFC" $argumentList = ("/install", "/quiet", "/norestart") -$vcSignatureThumbprint = "ABDCA79AF9DD48A0EA702AD45260B3C03093FB4B" +$signatureThumbrint = "ABDCA79AF9DD48A0EA702AD45260B3C03093FB4B" -Install-Binary -Url $vc2010x86URI -Name $vc2010x86Name -ArgumentList $argumentList -ExpectedSignature $vcSignatureThumbprint -Install-Binary -Url $vc2010x64URI -Name $vc2010x64Name -ArgumentList $argumentList -ExpectedSignature $vcSignatureThumbprint +Install-Binary ` + -Url "${baseUrl}/vcredist_x86.exe" ` + -InstallArgs $argumentList ` + -ExpectedSignature $signatureThumbrint + +Install-Binary ` + -Url "${baseUrl}/vcredist_x64.exe" ` + -InstallArgs $argumentList ` + -ExpectedSignature $signatureThumbrint Invoke-PesterTests -TestFile "Tools" -TestName "VCRedist" diff --git a/images/windows/scripts/build/Install-VSExtensions.ps1 b/images/windows/scripts/build/Install-VSExtensions.ps1 index 0b18a7da8019..b4fad504ea9e 100644 --- a/images/windows/scripts/build/Install-VSExtensions.ps1 +++ b/images/windows/scripts/build/Install-VSExtensions.ps1 @@ -16,8 +16,9 @@ $vsixPackagesList | ForEach-Object { if ($vsixPackage.FileName.EndsWith(".vsix")) { Install-VsixExtension -Url $vsixPackage.DownloadUri -Name $vsixPackage.FileName } else { - $argumentList = ('/install', '/quiet', '/norestart') - Install-Binary -Url $vsixPackage.DownloadUri -Name $vsixPackage.FileName -ArgumentList $argumentList + Install-Binary ` + -Url $vsixPackage.DownloadUri ` + -InstallArgs @('/install', '/quiet', '/norestart') } } diff --git a/images/windows/scripts/build/Install-VisualStudio.ps1 b/images/windows/scripts/build/Install-VisualStudio.ps1 index 8b0fbb7915c5..148e6f84de95 100644 --- a/images/windows/scripts/build/Install-VisualStudio.ps1 +++ b/images/windows/scripts/build/Install-VisualStudio.ps1 @@ -30,29 +30,25 @@ $newContent = '{"Extensions":[{"Key":"1e906ff5-9da8-4091-a299-5c253c55fdc9","Val Set-Content -Path "$vsInstallRoot\Common7\IDE\Extensions\MachineState.json" -Value $newContent if (Test-IsWin19) { - # Install Windows 10 SDK version 10.0.14393.795 - $sdkSignatureThumbprint = "C91545B333C52C4465DE8B90A3FAF4E1D9C58DFA" - $sdkUrl = "https://go.microsoft.com/fwlink/p/?LinkId=838916" - $sdkFileName = "sdksetup14393.exe" - $argumentList = ("/q", "/norestart", "/ceip off", "/features OptionId.WindowsSoftwareDevelopmentKit") - Install-Binary -Url $sdkUrl -Name $sdkFileName -ArgumentList $argumentList -ExpectedSignature $sdkSignatureThumbprint + Install-Binary -Type EXE ` + -Url 'https://go.microsoft.com/fwlink/p/?LinkId=838916' ` + -InstallArgs @("/q", "/norestart", "/ceip off", "/features OptionId.WindowsSoftwareDevelopmentKit") ` + -ExpectedSignature 'C91545B333C52C4465DE8B90A3FAF4E1D9C58DFA' # Install Windows 11 SDK version 10.0.22621.0 - $sdkSignatureThumbprint = "E4C5C5FCDB68B930EE4E19BC25D431EF6D864C51" - $sdkUrl = "https://go.microsoft.com/fwlink/p/?linkid=2196241" - $sdkFileName = "sdksetup22621.exe" - $argumentList = ("/q", "/norestart", "/ceip off", "/features OptionId.UWPManaged OptionId.UWPCPP OptionId.UWPLocalized OptionId.DesktopCPPx86 OptionId.DesktopCPPx64 OptionId.DesktopCPParm64") - Install-Binary -Url $sdkUrl -Name $sdkFileName -ArgumentList $argumentList -ExpectedSignature $sdkSignatureThumbprint + Install-Binary -Type EXE ` + -Url 'https://go.microsoft.com/fwlink/p/?linkid=2196241' ` + -InstallArgs @("/q", "/norestart", "/ceip off", "/features OptionId.UWPManaged OptionId.UWPCPP OptionId.UWPLocalized OptionId.DesktopCPPx86 OptionId.DesktopCPPx64 OptionId.DesktopCPParm64") ` + -ExpectedSignature 'E4C5C5FCDB68B930EE4E19BC25D431EF6D864C51' } if (Test-IsWin22) { # Install Windows 10 SDK version 10.0.17763 - $sdkSignatureThumbprint = "7535269B94C1FEA4A5EF6D808E371DA242F27936" - $sdkUrl = "https://go.microsoft.com/fwlink/p/?LinkID=2033908" - $sdkFileName = "sdksetup17763.exe" - $argumentList = ("/q", "/norestart", "/ceip off", "/features OptionId.UWPManaged OptionId.UWPCPP OptionId.UWPLocalized OptionId.DesktopCPPx86 OptionId.DesktopCPPx64 OptionId.DesktopCPParm64") - Install-Binary -Url $sdkUrl -Name $sdkFileName -ArgumentList $argumentList -ExpectedSignature $sdkSignatureThumbprint + Install-Binary -Type EXE ` + -Url 'https://go.microsoft.com/fwlink/p/?LinkID=2033908' ` + -InstallArgs @("/q", "/norestart", "/ceip off", "/features OptionId.UWPManaged OptionId.UWPCPP OptionId.UWPLocalized OptionId.DesktopCPPx86 OptionId.DesktopCPPx64 OptionId.DesktopCPParm64") ` + -ExpectedSignature '7535269B94C1FEA4A5EF6D808E371DA242F27936' } Invoke-PesterTests -TestFile "VisualStudio" diff --git a/images/windows/scripts/build/Install-WDK.ps1 b/images/windows/scripts/build/Install-WDK.ps1 index bd7114a633a2..1b40646a2645 100644 --- a/images/windows/scripts/build/Install-WDK.ps1 +++ b/images/windows/scripts/build/Install-WDK.ps1 @@ -4,33 +4,33 @@ ################################################################################ # Requires Windows SDK with the same version number as the WDK -if (Test-IsWin22) { - # SDK available through Visual Studio - $wdkUrl = "https://go.microsoft.com/fwlink/?linkid=2249371" - $FilePath = "C:\Program Files (x86)\Windows Kits\10\Vsix\VS2022\*\WDK.vsix" - $wdkSignatureThumbprint = "7C94971221A799907BB45665663BBFD587BAC9F8" -} elseif (Test-IsWin19) { - $winSdkUrl = "https://go.microsoft.com/fwlink/?linkid=2173743" +if (Test-IsWin19) { + # Install all features without showing the GUI using winsdksetup.exe + Install-Binary -Type EXE ` + -Url 'https://go.microsoft.com/fwlink/?linkid=2173743' ` + -InstallArgs @("/features", "+", "/quiet") ` + -ExpectedSignature '44796EB5BD439B4BFB078E1DC2F8345AE313CBB1' + $wdkUrl = "https://go.microsoft.com/fwlink/?linkid=2166289" - $FilePath = "C:\Program Files (x86)\Windows Kits\10\Vsix\VS2019\WDK.vsix" $wdkSignatureThumbprint = "914A09C2E02C696AF394048BCB8D95449BCD5B9E" - $winSdkSignatureThumbprint = "44796EB5BD439B4BFB078E1DC2F8345AE313CBB1" + $wdkExtensionPath = "C:\Program Files (x86)\Windows Kits\10\Vsix\VS2019\WDK.vsix" +} elseif (Test-IsWin22) { + # SDK is available through Visual Studio + $wdkUrl = "https://go.microsoft.com/fwlink/?linkid=2249371" + $wdkSignatureThumbprint = "7C94971221A799907BB45665663BBFD587BAC9F8" + $wdkExtensionPath = "C:\Program Files (x86)\Windows Kits\10\Vsix\VS2022\*\WDK.vsix" } else { throw "Invalid version of Visual Studio is found. Either 2019 or 2022 are required" } -$argumentList = ("/features", "+", "/quiet") - -if (Test-IsWin19) { - # `winsdksetup.exe /features + /quiet` installs all features without showing the GUI - Install-Binary -Url $winSdkUrl -Name "winsdksetup.exe" -ArgumentList $argumentList -ExpectedSignature $winSdkSignatureThumbprint -} - -# `wdksetup.exe /features + /quiet` installs all features without showing the GUI -Install-Binary -Url $wdkUrl -Name "wdksetup.exe" -ArgumentList $argumentList -ExpectedSignature $wdkSignatureThumbprint +# Install all features without showing the GUI using wdksetup.exe +Install-Binary -Type EXE ` + -Url $wdkUrl ` + -InstallArgs @("/features", "+", "/quiet") ` + -ExpectedSignature $wdkSignatureThumbprint # Need to install the VSIX to get the build targets when running VSBuild -$FilePath = Resolve-Path -Path $FilePath -Install-VsixExtension -FilePath $FilePath -Name "WDK.vsix" -InstallOnly +$wdkExtensionPath = Resolve-Path -Path $wdkExtensionPath +Install-VsixExtension -FilePath $wdkExtensionPath -Name "WDK.vsix" -InstallOnly Invoke-PesterTests -TestFile "WDK" diff --git a/images/windows/scripts/build/Install-WebPlatformInstaller.ps1 b/images/windows/scripts/build/Install-WebPlatformInstaller.ps1 index c83dd458ec1c..7fc802644cdf 100644 --- a/images/windows/scripts/build/Install-WebPlatformInstaller.ps1 +++ b/images/windows/scripts/build/Install-WebPlatformInstaller.ps1 @@ -3,10 +3,8 @@ ## Desc: Install WebPlatformInstaller ################################################################################ -# Download and install WebPlatformInstaller -$webPlatformInstallerFile = "WebPlatformInstaller_x64_en-US.msi" -$webPlatformInstallerUrl = "http://go.microsoft.com/fwlink/?LinkId=287166" -$webPlatformInstallerSignatureThumbprint = "C3A3D43788E7ABCD287CB4F5B6583043774F99D2" -Install-Binary -Url $webPlatformInstallerUrl -Name $webPlatformInstallerFile -ExpectedSignature $webPlatformInstallerSignatureThumbprint +Install-Binary -Type MSI ` + -Url 'http://go.microsoft.com/fwlink/?LinkId=287166' ` + -ExpectedSignature 'C3A3D43788E7ABCD287CB4F5B6583043774F99D2' Invoke-PesterTests -TestFile "Tools" -TestName "WebPlatformInstaller" diff --git a/images/windows/scripts/build/Install-WinAppDriver.ps1 b/images/windows/scripts/build/Install-WinAppDriver.ps1 index cdd34079e8d8..192b7004f3c6 100644 --- a/images/windows/scripts/build/Install-WinAppDriver.ps1 +++ b/images/windows/scripts/build/Install-WinAppDriver.ps1 @@ -3,12 +3,13 @@ ## Desc: Install Windows Application Driver (WinAppDriver) #################################################################################### -$LatestReleaseUrl = 'https://api.github.com/repos/microsoft/WinAppDriver/releases/latest' -$InstallerUrl = (Invoke-RestMethod -Uri $LatestReleaseUrl).assets.browser_download_url -$InstallerName = "WindowsApplicationDriver.msi" -$InstallerSignatureThumbprint = "2485A7AFA98E178CB8F30C9838346B514AEA4769" - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 -Install-Binary -Url $InstallerUrl -Name $InstallerName -ExpectedSignature $InstallerSignatureThumbprint + +$latestReleaseUrl = 'https://api.github.com/repos/microsoft/WinAppDriver/releases/latest' +$installerUrl = (Invoke-RestMethod -Uri $latestReleaseUrl).assets.browser_download_url + +Install-Binary ` + -Url $installerUrl ` + -ExpectedSignature '2485A7AFA98E178CB8F30C9838346B514AEA4769' Invoke-PesterTests -TestFile "WinAppDriver" -TestName "WinAppDriver" diff --git a/images/windows/scripts/build/Install-Wix.ps1 b/images/windows/scripts/build/Install-Wix.ps1 index c5865af80924..0fd90bf329df 100644 --- a/images/windows/scripts/build/Install-Wix.ps1 +++ b/images/windows/scripts/build/Install-Wix.ps1 @@ -3,6 +3,6 @@ ## Desc: Install WIX. ################################################################################ -Choco-Install -PackageName wixtoolset -ArgumentList "--force" +Install-ChocoPackage wixtoolset -ArgumentList "--force" Invoke-PesterTests -TestFile "Wix" diff --git a/images/windows/scripts/helpers/ChocoHelpers.ps1 b/images/windows/scripts/helpers/ChocoHelpers.ps1 index 46247620cf43..a4fe9e4214ef 100644 --- a/images/windows/scripts/helpers/ChocoHelpers.ps1 +++ b/images/windows/scripts/helpers/ChocoHelpers.ps1 @@ -1,4 +1,4 @@ -function Choco-Install { +function Install-ChocoPackage { [CmdletBinding()] param( [Parameter(Mandatory)] @@ -9,8 +9,7 @@ function Choco-Install { process { $count = 1 - while($true) - { + while ($true) { Write-Host "Running [#$count]: choco install $packageName -y $argumentList" choco install $packageName -y @argumentList --no-progress @@ -18,8 +17,7 @@ function Choco-Install { if ($pkg) { Write-Host "Package installed: $pkg" break - } - else { + } else { $count++ if ($count -ge $retryCount) { Write-Host "Could not install $packageName after $count attempts" @@ -31,20 +29,7 @@ function Choco-Install { } } -function Send-RequestToChocolateyPackages { - param( - [Parameter(Mandatory)] - [string] $FilterQuery, - [string] $Url = "https://community.chocolatey.org/api", - [int] $ApiVersion = 2 - ) - - $response = Invoke-RestMethod "$Url/v$ApiVersion/Packages()?$filterQuery" - - return $response -} - -function Get-LatestChocoPackageVersion { +function Resolve-ChocoPackageVersion { param( [Parameter(Mandatory)] [string] $PackageName, @@ -56,10 +41,10 @@ function Get-LatestChocoPackageVersion { [int]$versionNumbers[-1] += 1 $incrementedVersion = $versionNumbers -join "." $filterQuery = "`$filter=(Id eq '$PackageName') and (IsPrerelease eq false) and (Version ge '$TargetVersion') and (Version lt '$incrementedVersion')" - $latestVersion = (Send-RequestToChocolateyPackages -FilterQuery $filterQuery).properties.Version | - Where-Object {$_ -Like "$TargetVersion.*" -or $_ -eq $TargetVersion} | - Sort-Object {[version]$_} | + $latestVersion = (Invoke-RestMethod "https://community.chocolatey.org/api/v2/Packages()?$filterQuery").properties.Version | + Where-Object { $_ -Like "$TargetVersion.*" -or $_ -eq $TargetVersion } | + Sort-Object { [version]$_ } | Select-Object -Last 1 return $latestVersion -} \ No newline at end of file +} diff --git a/images/windows/scripts/helpers/ImageHelpers.psm1 b/images/windows/scripts/helpers/ImageHelpers.psm1 index e7136d319f95..4435792f96a2 100644 --- a/images/windows/scripts/helpers/ImageHelpers.psm1 +++ b/images/windows/scripts/helpers/ImageHelpers.psm1 @@ -34,9 +34,9 @@ Export-ModuleMember -Function @( 'Get-WinVersion' 'Test-IsWin22' 'Test-IsWin19' - 'Choco-Install' + 'Install-ChocoPackage' 'Send-RequestToCocolateyPackages' - 'Get-LatestChocoPackageVersion' + 'Resolve-ChocoPackageVersion' 'Get-GitHubPackageDownloadUrl' 'Extract-7Zip' 'Invoke-SBWithRetry' diff --git a/images/windows/scripts/helpers/InstallHelpers.ps1 b/images/windows/scripts/helpers/InstallHelpers.ps1 index ad466aaab024..bf06e17e41a7 100644 --- a/images/windows/scripts/helpers/InstallHelpers.ps1 +++ b/images/windows/scripts/helpers/InstallHelpers.ps1 @@ -1,94 +1,132 @@ -function Install-Binary -{ +function Install-Binary { <# .SYNOPSIS - A helper function to install executables. + A function to install binaries from either a URL or a local path. .DESCRIPTION - Download and install .exe or .msi binaries from specified URL. + This function downloads and installs .exe or .msi binaries from a specified URL or a local path. It also supports checking the binary's signature and SHA256/SHA512 sum before installation. .PARAMETER Url - The URL from which the binary will be downloaded. Required parameter. + The URL from which the binary will be downloaded. This parameter is required if LocalPath is not specified. - .PARAMETER Name - The Name with which binary will be downloaded. Required parameter. + .PARAMETER LocalPath + The local path of the binary to be installed. This parameter is required if Url is not specified. + + .PARAMETER Type + The type of the binary to be installed. Valid values are "MSI" and "EXE". If not specified, the type is inferred from the file extension. + + .PARAMETER InstallArgs + The list of arguments that will be passed to the installer. Cannot be used together with ExtraInstallArgs. + + .PARAMETER ExtraInstallArgs + Additional arguments that will be passed to the installer. Cannot be used together with InstallArgs. + + .PARAMETER ExpectedSignature + The expected signature of the binary. If specified, the binary's signature is checked before installation. + + .PARAMETER ExpectedSHA256Sum + The expected SHA256 sum of the binary. If specified, the binary's SHA256 sum is checked before installation. - .PARAMETER ArgumentList - The list of arguments that will be passed to the installer. Required for .exe binaries. + .PARAMETER ExpectedSHA512Sum + The expected SHA512 sum of the binary. If specified, the binary's SHA512 sum is checked before installation. .EXAMPLE - Install-Binary -Url "https://go.microsoft.com/fwlink/p/?linkid=2083338" -Name "winsdksetup.exe" -ArgumentList ("/features", "+", "/quiet") -ExpectedSignature "XXXXXXXXXXXXXXXXXXXXXXXXXX" + Install-Binary -Url "https://go.microsoft.com/fwlink/p/?linkid=2083338" -Type EXE -InstallArgs ("/features", "+", "/quiet") -ExpectedSignature "A5C7D5B7C838D5F89DDBEDB85B2C566B4CDA881F" #> Param ( - [Parameter(Mandatory, ParameterSetName="Url")] + [Parameter(Mandatory, ParameterSetName = "Url")] [String] $Url, - [Parameter(Mandatory, ParameterSetName="Url")] - [String] $Name, - [Parameter(Mandatory, ParameterSetName="LocalPath")] - [String] $FilePath, - [String[]] $ArgumentList, - [String[]] $ExpectedSignature + [Parameter(Mandatory, ParameterSetName = "LocalPath")] + [String] $LocalPath, + [ValidateSet("MSI", "EXE")] + [String] $Type, + [String[]] $InstallArgs, + [String[]] $ExtraInstallArgs, + [String[]] $ExpectedSignature, + [String] $ExpectedSHA256Sum, + [String] $ExpectedSHA512Sum ) - if ($PSCmdlet.ParameterSetName -eq "LocalPath") - { - $name = Split-Path -Path $FilePath -Leaf - } - else - { - Write-Host "Downloading $Name..." - $filePath = Start-DownloadWithRetry -Url $Url -Name $Name + if ($PSCmdlet.ParameterSetName -eq "LocalPath") { + if (-not (Test-Path -Path $LocalPath)) { + throw "LocalPath parameter is specified, but the file does not exist." + } + if (-not $Type) { + $Type = ([System.IO.Path]::GetExtension($LocalPath)).Replace(".", "").ToUpper() + if ($Type -ne "MSI" -and $Type -ne "EXE") { + throw "LocalPath parameter is specified, but the file extension is not .msi or .exe. Please specify the Type parameter." + } + } + $filePath = $LocalPath + } else { + if (-not $Type) { + $Type = ([System.IO.Path]::GetExtension($Url)).Replace(".", "").ToUpper() + if ($Type -ne "MSI" -and $Type -ne "EXE") { + throw "Cannot determine the file type from the URL. Please specify the Type parameter." + } + } + $fileName = [System.IO.Path]::GetFileNameWithoutExtension([System.IO.Path]::GetRandomFileName()) + ".$Type".ToLower() + $filePath = Start-DownloadWithRetry -Url $Url -Name $fileName } - if ($PSBoundParameters.ContainsKey('ExpectedSignature')) - { - if ($ExpectedSignature) - { + if ($PSBoundParameters.ContainsKey('ExpectedSignature')) { + if ($ExpectedSignature) { Test-FileSignature -FilePath $filePath -ExpectedThumbprint $ExpectedSignature - } - else - { + } else { throw "ExpectedSignature parameter is specified, but no signature is provided." } } + + if ($ExpectedSHA256Sum) { + $fileHash = (Get-FileHash -Path $filePath -Algorithm SHA256).Hash + Use-ChecksumComparison $fileHash $ExpectedSHA256Sum + } + + if ($ExpectedSHA512Sum) { + $fileHash = (Get-FileHash -Path $filePath -Algorithm SHA512).Hash + Use-ChecksumComparison $fileHash $ExpectedSHA512Sum + } + + if ($ExtraInstallArgs -and $InstallArgs) { + throw "InstallArgs and ExtraInstallArgs parameters cannot be used together." + } - # MSI binaries should be installed via msiexec.exe - $fileExtension = ([System.IO.Path]::GetExtension($Name)).Replace(".", "") - if ($fileExtension -eq "msi") - { - if (-not $ArgumentList) - { - $ArgumentList = ('/i', $filePath, '/QN', '/norestart') + if ($Type -eq "MSI") { + # MSI binaries should be installed via msiexec.exe + if ($ExtraInstallArgs) { + $InstallArgs = @('/i', $filePath, '/qn', '/norestart') + $ExtraInstallArgs + } elseif (-not $InstallArgs) { + Write-Host "No arguments provided for MSI binary. Using default arguments: /i, /qn, /norestart" + $InstallArgs = @('/i', $filePath, '/qn', '/norestart') } $filePath = "msiexec.exe" + } else { + # EXE binaries should be started directly + if ($ExtraInstallArgs) { + $InstallArgs = $ExtraInstallArgs + } } - try - { - $installStartTime = Get-Date - Write-Host "Starting Install $Name..." - $process = Start-Process -FilePath $filePath -ArgumentList $ArgumentList -Wait -PassThru + $installStartTime = Get-Date + Write-Host "Starting Install $Name..." + try { + $process = Start-Process -FilePath $filePath -ArgumentList $InstallArgs -Wait -PassThru $exitCode = $process.ExitCode $installCompleteTime = [math]::Round(($(Get-Date) - $installStartTime).TotalSeconds, 2) - if ($exitCode -eq 0 -or $exitCode -eq 3010) - { + if ($exitCode -eq 0) { Write-Host "Installation successful in $installCompleteTime seconds" - } - else - { - Write-Host "Non zero exit code returned by the installation process: $exitCode" - Write-Host "Total time elapsed: $installCompleteTime seconds" + } elseif ($exitCode -eq 3010) { + Write-Host "Installation successful in $installCompleteTime seconds. Reboot is required." + } else { + Write-Host "Installation process returned unexpected exit code: $exitCode" + Write-Host "Time elapsed: $installCompleteTime seconds" exit $exitCode } - } - catch - { + } catch { $installCompleteTime = [math]::Round(($(Get-Date) - $installStartTime).TotalSeconds, 2) - Write-Host "Failed to install the $fileExtension ${Name}: $($_.Exception.Message)" - Write-Host "Installation failed after $installCompleteTime seconds" - exit 1 + Write-Host "Installation failed in $installCompleteTime seconds" } } @@ -171,8 +209,7 @@ function Set-SvcWithErrHandling { } } -function Start-DownloadWithRetry -{ +function Start-DownloadWithRetry { Param ( [Parameter(Mandatory)] @@ -190,26 +227,20 @@ function Start-DownloadWithRetry $downloadStartTime = Get-Date # Default retry logic for the package. - while ($Retries -gt 0) - { - try - { + Write-Host "Downloading package from: $Url to path $filePath." + while ($Retries -gt 0) { + try { $downloadAttemptStartTime = Get-Date - Write-Host "Downloading package from: $Url to path $filePath ." (New-Object System.Net.WebClient).DownloadFile($Url, $filePath) break - } - catch - { + } catch { $failTime = [math]::Round(($(Get-Date) - $downloadStartTime).TotalSeconds, 2) $attemptTime = [math]::Round(($(Get-Date) - $downloadAttemptStartTime).TotalSeconds, 2) - Write-Host "There is an error encounterd after $attemptTime seconds during package downloading:`n $_" + Write-Host "There is an error encounterd after $attemptTime seconds during package downloading:`n$($_.Exception.ToString())" $Retries-- - if ($Retries -eq 0) - { - Write-Host "File can't be downloaded. Please try later or check that file exists by url: $Url" - Write-Host "Total time elapsed $failTime" + if ($Retries -eq 0) { + Write-Host "Package download failed after $failTime seconds" exit 1 } diff --git a/images/windows/scripts/helpers/VisualStudioHelpers.ps1 b/images/windows/scripts/helpers/VisualStudioHelpers.ps1 index e02c52fadcad..fe613ceaa353 100644 --- a/images/windows/scripts/helpers/VisualStudioHelpers.ps1 +++ b/images/windows/scripts/helpers/VisualStudioHelpers.ps1 @@ -66,14 +66,19 @@ Function Install-VisualStudio { $responseDataPath = "$env:TEMP\vs_install_response.json" $responseData | ConvertTo-Json | Out-File -FilePath $responseDataPath + $installStartTime = Get-Date Write-Host "Starting Install ..." $bootstrapperArgumentList = ('/c', $bootstrapperFilePath, '--in', $responseDataPath, $ExtraArgs, '--quiet', '--norestart', '--wait', '--nocache' ) Write-Host "Bootstrapper arguments: $bootstrapperArgumentList" $process = Start-Process -FilePath cmd.exe -ArgumentList $bootstrapperArgumentList -Wait -PassThru $exitCode = $process.ExitCode - if ($exitCode -eq 0 -or $exitCode -eq 3010) { - Write-Host "Installation successful" + $installCompleteTime = [math]::Round(($(Get-Date) - $installStartTime).TotalSeconds, 2) + if ($exitCode -eq 0) { + Write-Host "Installation successful in $installCompleteTime seconds" + return $exitCode + } elseif ($exitCode -eq 3010) { + Write-Host "Installation successful in $installCompleteTime seconds. Reboot is required." return $exitCode } else { Write-Host "Non zero exit code returned by the installation process : $exitCode" From 410fd620be785e49bb9e31b27b6d2965a9e7f016 Mon Sep 17 00:00:00 2001 From: Jesse Houwing <jesse.houwing@gmail.com> Date: Wed, 22 Nov 2023 16:44:30 +0100 Subject: [PATCH 2471/3485] Uses the correct env var on windows (#8800) Based on the changes made to speed up az on ubuntu, we found that this is the correct env var to use. --- images/windows/scripts/build/Install-AzureDevOpsCli.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/windows/scripts/build/Install-AzureDevOpsCli.ps1 b/images/windows/scripts/build/Install-AzureDevOpsCli.ps1 index cc2a11dcdc7e..8227a3fc8ac0 100644 --- a/images/windows/scripts/build/Install-AzureDevOpsCli.ps1 +++ b/images/windows/scripts/build/Install-AzureDevOpsCli.ps1 @@ -5,9 +5,9 @@ $azureDevOpsCliConfigPath = 'C:\azureDevOpsCli' # Store azure-devops-cli cache outside of the provisioning user's profile -[Environment]::SetEnvironmentVariable('AZURE_DEVOPS_EXT_CONFIG_DIR', $azureDevOpsCliConfigPath, [System.EnvironmentVariableTarget]::Machine) +[Environment]::SetEnvironmentVariable('AZ_DEVOPS_GLOBAL_CONFIG_DIR', $azureDevOpsCliConfigPath, [System.EnvironmentVariableTarget]::Machine) # make variable to be available in the current session -${env:AZURE_DEVOPS_EXT_CONFIG_DIR} = $azureDevOpsCliConfigPath +${env:AZ_DEVOPS_GLOBAL_CONFIG_DIR} = $azureDevOpsCliConfigPath $azureDevOpsCliCachePath = Join-Path $azureDevOpsCliConfigPath 'cache' $null = New-Item -ItemType 'Directory' -Path $azureDevOpsCliCachePath From 1bd9214f41fdc2aa56e86e0b4043e4364fa51497 Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Wed, 22 Nov 2023 21:49:23 +0100 Subject: [PATCH 2472/3485] [ubuntu] Rename build scripts (#8866) * [ubuntu] Rename build scripts * [ubuntu] Change reboot to inline shell * [ubuntu] Move disk space validation to pester tests * [ubuntu] Rename helper and tests files * [ubuntu] Changes to cleanup, post-deployment and r scripts --- CONTRIBUTING.md | 8 +- images.CI/linux-and-win/build-image.ps1 | 1 - .../scripts/build/Configure-Toolset.ps1 | 2 +- ...es.ps1 => Install-PowerShellAzModules.ps1} | 7 +- .../build/Install-PowerShellModules.ps1 | 7 +- .../ubuntu/scripts/build/apt-mock-remove.sh | 7 - images/ubuntu/scripts/build/cleanup.sh | 13 +- .../scripts/build/complete-snap-setup.sh | 12 -- .../{apt-mock.sh => configure-apt-mock.sh} | 7 +- ...tu-archive.sh => configure-apt-sources.sh} | 6 +- .../build/{apt.sh => configure-apt.sh} | 4 + .../{dpkg-config.sh => configure-dpkg.sh} | 4 + .../scripts/build/configure-environment.sh | 4 + ...reimagedata.sh => configure-image-data.sh} | 4 + .../build/{limits.sh => configure-limits.sh} | 4 + .../build/{snap.sh => configure-snap.sh} | 11 + ...post-deployment.sh => configure-system.sh} | 6 +- images/ubuntu/scripts/build/example.sh | 23 --- ...hive-cache.sh => install-actions-cache.sh} | 5 +- .../{aliyun-cli.sh => install-aliyun-cli.sh} | 4 +- .../{android.sh => install-android-sdk.sh} | 4 +- .../build/{apache.sh => install-apache.sh} | 4 +- .../{apt-common.sh => install-apt-common.sh} | 6 +- .../{apt-vital.sh => install-apt-vital.sh} | 4 +- .../build/{aws.sh => install-aws-tools.sh} | 4 +- .../build/{azcopy.sh => install-azcopy.sh} | 6 +- .../{azure-cli.sh => install-azure-cli.sh} | 4 +- ...ops-cli.sh => install-azure-devops-cli.sh} | 6 +- .../build/{bazel.sh => install-bazel.sh} | 4 +- .../build/{bicep.sh => install-bicep.sh} | 6 +- .../build/{clang.sh => install-clang.sh} | 4 +- .../build/{cmake.sh => install-cmake.sh} | 4 +- ...eql-bundle.sh => install-codeql-bundle.sh} | 4 +- ...ntainers.sh => install-container-tools.sh} | 4 +- ...r-compose.sh => install-docker-compose.sh} | 4 +- .../build/{docker.sh => install-docker.sh} | 4 +- ...tcore-sdk.sh => install-dotnetcore-sdk.sh} | 4 +- .../build/{erlang.sh => install-erlang.sh} | 4 +- .../build/{firefox.sh => install-firefox.sh} | 4 +- .../{gcc.sh => install-gcc-compilers.sh} | 6 +- .../{gfortran.sh => install-gfortran.sh} | 6 +- .../build/{git-lfs.sh => install-git-lfs.sh} | 4 +- .../scripts/build/{git.sh => install-git.sh} | 4 +- .../{github-cli.sh => install-github-cli.sh} | 4 +- ...gle-chrome.sh => install-google-chrome.sh} | 6 +- ...oud-cli.sh => install-google-cloud-cli.sh} | 4 +- .../build/{haskell.sh => install-haskell.sh} | 4 +- .../build/{heroku.sh => install-heroku.sh} | 4 +- .../build/{hhvm.sh => install-hhvm.sh} | 4 +- .../{homebrew.sh => install-homebrew.sh} | 4 +- .../{java-tools.sh => install-java-tools.sh} | 4 +- .../build/{julia.sh => install-julia.sh} | 4 +- .../build/{kotlin.sh => install-kotlin.sh} | 4 +- ...s-tools.sh => install-kubernetes-tools.sh} | 2 +- .../{leiningen.sh => install-leiningen.sh} | 6 +- ...soft-edge.sh => install-microsoft-edge.sh} | 4 +- .../{miniconda.sh => install-miniconda.sh} | 6 +- .../build/{mongodb.sh => install-mongodb.sh} | 4 +- .../build/{mono.sh => install-mono.sh} | 4 +- .../build/{repos.sh => install-ms-repos.sh} | 4 +- ...ql-cmd-tools.sh => install-mssql-tools.sh} | 4 +- .../build/{mysql.sh => install-mysql.sh} | 4 +- .../build/{nginx.sh => install-nginx.sh} | 4 +- .../build/{nodejs.sh => install-nodejs.sh} | 4 +- .../scripts/build/{nvm.sh => install-nvm.sh} | 4 +- .../build/{oc.sh => install-oc-cli.sh} | 6 +- .../{oras-cli.sh => install-oras-cli.sh} | 4 +- .../build/{packer.sh => install-packer.sh} | 6 +- .../{phantomjs.sh => install-phantomjs.sh} | 4 +- .../scripts/build/{php.sh => install-php.sh} | 4 +- ...x-packages.sh => install-pipx-packages.sh} | 4 +- .../{postgresql.sh => install-postgresql.sh} | 4 +- ...owershellcore.sh => install-powershell.sh} | 4 +- .../build/{pulumi.sh => install-pulumi.sh} | 4 +- .../build/{pypy.sh => install-pypy.sh} | 4 +- .../build/{python.sh => install-python.sh} | 4 +- .../scripts/build/{r.sh => install-rlang.sh} | 6 +- .../build/{ruby.sh => install-ruby.sh} | 6 +- ...r-package.sh => install-runner-package.sh} | 4 +- .../build/{rust.sh => install-rust.sh} | 4 +- .../scripts/build/{sbt.sh => install-sbt.sh} | 6 +- .../{selenium.sh => install-selenium.sh} | 6 +- .../{sqlpackage.sh => install-sqlpackage.sh} | 2 +- .../build/{swift.sh => install-swift.sh} | 4 +- .../{terraform.sh => install-terraform.sh} | 6 +- .../build/{vcpkg.sh => install-vcpkg.sh} | 6 +- .../scripts/build/{yq.sh => install-yq.sh} | 4 +- .../build/{zstd.sh => install-zstd.sh} | 4 +- images/ubuntu/scripts/build/reboot.sh | 8 - images/ubuntu/scripts/build/sphinx.sh | 11 - .../scripts/build/validate-disk-space.sh | 20 -- ...erator.ps1 => Generate-SoftwareReport.ps1} | 2 +- .../SoftwareReport.Helpers.psm1 | 0 images/ubuntu/scripts/helpers/invoke-tests.sh | 2 +- images/ubuntu/scripts/helpers/os.sh | 6 +- .../Tests.Helpers.psm1 => tests/Helpers.psm1} | 0 images/ubuntu/scripts/tests/RunAll-Tests.ps1 | 4 +- images/ubuntu/scripts/tests/System.Tests.ps1 | 6 + images/ubuntu/templates/ubuntu-20.04.json | 190 +++++++++--------- images/ubuntu/templates/ubuntu-22.04.pkr.hcl | 172 ++++++++-------- .../ubuntu/templates/ubuntu-minimal.pkr.hcl | 43 ++-- 101 files changed, 422 insertions(+), 483 deletions(-) rename images/ubuntu/scripts/build/{Install-AzureModules.ps1 => Install-PowerShellAzModules.ps1} (80%) delete mode 100644 images/ubuntu/scripts/build/apt-mock-remove.sh delete mode 100644 images/ubuntu/scripts/build/complete-snap-setup.sh rename images/ubuntu/scripts/build/{apt-mock.sh => configure-apt-mock.sh} (76%) rename images/ubuntu/scripts/build/{apt-ubuntu-archive.sh => configure-apt-sources.sh} (80%) rename images/ubuntu/scripts/build/{apt.sh => configure-apt.sh} (86%) rename images/ubuntu/scripts/build/{dpkg-config.sh => configure-dpkg.sh} (81%) rename images/ubuntu/scripts/build/{preimagedata.sh => configure-image-data.sh} (78%) rename images/ubuntu/scripts/build/{limits.sh => configure-limits.sh} (72%) rename images/ubuntu/scripts/build/{snap.sh => configure-snap.sh} (55%) rename images/ubuntu/scripts/build/{post-deployment.sh => configure-system.sh} (86%) delete mode 100644 images/ubuntu/scripts/build/example.sh rename images/ubuntu/scripts/build/{action-archive-cache.sh => install-actions-cache.sh} (91%) rename images/ubuntu/scripts/build/{aliyun-cli.sh => install-aliyun-cli.sh} (95%) rename images/ubuntu/scripts/build/{android.sh => install-android-sdk.sh} (98%) rename images/ubuntu/scripts/build/{apache.sh => install-apache.sh} (85%) rename images/ubuntu/scripts/build/{apt-common.sh => install-apt-common.sh} (79%) rename images/ubuntu/scripts/build/{apt-vital.sh => install-apt-vital.sh} (80%) rename images/ubuntu/scripts/build/{aws.sh => install-aws-tools.sh} (91%) rename images/ubuntu/scripts/build/{azcopy.sh => install-azcopy.sh} (86%) rename images/ubuntu/scripts/build/{azure-cli.sh => install-azure-cli.sh} (90%) rename images/ubuntu/scripts/build/{azure-devops-cli.sh => install-azure-devops-cli.sh} (79%) rename images/ubuntu/scripts/build/{bazel.sh => install-bazel.sh} (79%) rename images/ubuntu/scripts/build/{bicep.sh => install-bicep.sh} (84%) rename images/ubuntu/scripts/build/{clang.sh => install-clang.sh} (95%) rename images/ubuntu/scripts/build/{cmake.sh => install-cmake.sh} (95%) rename images/ubuntu/scripts/build/{codeql-bundle.sh => install-codeql-bundle.sh} (94%) rename images/ubuntu/scripts/build/{containers.sh => install-container-tools.sh} (92%) rename images/ubuntu/scripts/build/{docker-compose.sh => install-docker-compose.sh} (91%) rename images/ubuntu/scripts/build/{docker.sh => install-docker.sh} (98%) rename images/ubuntu/scripts/build/{dotnetcore-sdk.sh => install-dotnetcore-sdk.sh} (98%) rename images/ubuntu/scripts/build/{erlang.sh => install-erlang.sh} (93%) rename images/ubuntu/scripts/build/{firefox.sh => install-firefox.sh} (97%) rename images/ubuntu/scripts/build/{gcc.sh => install-gcc-compilers.sh} (85%) rename images/ubuntu/scripts/build/{gfortran.sh => install-gfortran.sh} (85%) rename images/ubuntu/scripts/build/{git-lfs.sh => install-git-lfs.sh} (91%) rename images/ubuntu/scripts/build/{git.sh => install-git.sh} (94%) rename images/ubuntu/scripts/build/{github-cli.sh => install-github-cli.sh} (93%) rename images/ubuntu/scripts/build/{google-chrome.sh => install-google-chrome.sh} (96%) rename images/ubuntu/scripts/build/{google-cloud-cli.sh => install-google-cloud-cli.sh} (91%) rename images/ubuntu/scripts/build/{haskell.sh => install-haskell.sh} (95%) rename images/ubuntu/scripts/build/{heroku.sh => install-heroku.sh} (81%) rename images/ubuntu/scripts/build/{hhvm.sh => install-hhvm.sh} (88%) rename images/ubuntu/scripts/build/{homebrew.sh => install-homebrew.sh} (94%) rename images/ubuntu/scripts/build/{java-tools.sh => install-java-tools.sh} (98%) rename images/ubuntu/scripts/build/{julia.sh => install-julia.sh} (93%) rename images/ubuntu/scripts/build/{kotlin.sh => install-kotlin.sh} (94%) rename images/ubuntu/scripts/build/{kubernetes-tools.sh => install-kubernetes-tools.sh} (98%) rename images/ubuntu/scripts/build/{leiningen.sh => install-leiningen.sh} (85%) rename images/ubuntu/scripts/build/{microsoft-edge.sh => install-microsoft-edge.sh} (95%) rename images/ubuntu/scripts/build/{miniconda.sh => install-miniconda.sh} (85%) rename images/ubuntu/scripts/build/{mongodb.sh => install-mongodb.sh} (93%) rename images/ubuntu/scripts/build/{mono.sh => install-mono.sh} (96%) rename images/ubuntu/scripts/build/{repos.sh => install-ms-repos.sh} (83%) rename images/ubuntu/scripts/build/{mssql-cmd-tools.sh => install-mssql-tools.sh} (85%) rename images/ubuntu/scripts/build/{mysql.sh => install-mysql.sh} (93%) rename images/ubuntu/scripts/build/{nginx.sh => install-nginx.sh} (87%) rename images/ubuntu/scripts/build/{nodejs.sh => install-nodejs.sh} (90%) rename images/ubuntu/scripts/build/{nvm.sh => install-nvm.sh} (93%) rename images/ubuntu/scripts/build/{oc.sh => install-oc-cli.sh} (84%) rename images/ubuntu/scripts/build/{oras-cli.sh => install-oras-cli.sh} (93%) rename images/ubuntu/scripts/build/{packer.sh => install-packer.sh} (86%) rename images/ubuntu/scripts/build/{phantomjs.sh => install-phantomjs.sh} (93%) rename images/ubuntu/scripts/build/{php.sh => install-php.sh} (98%) rename images/ubuntu/scripts/build/{pipx-packages.sh => install-pipx-packages.sh} (93%) rename images/ubuntu/scripts/build/{postgresql.sh => install-postgresql.sh} (94%) rename images/ubuntu/scripts/build/{powershellcore.sh => install-powershell.sh} (82%) rename images/ubuntu/scripts/build/{pulumi.sh => install-pulumi.sh} (94%) rename images/ubuntu/scripts/build/{pypy.sh => install-pypy.sh} (98%) rename images/ubuntu/scripts/build/{python.sh => install-python.sh} (94%) rename images/ubuntu/scripts/build/{r.sh => install-rlang.sh} (90%) rename images/ubuntu/scripts/build/{ruby.sh => install-ruby.sh} (94%) rename images/ubuntu/scripts/build/{runner-package.sh => install-runner-package.sh} (87%) rename images/ubuntu/scripts/build/{rust.sh => install-rust.sh} (94%) rename images/ubuntu/scripts/build/{sbt.sh => install-sbt.sh} (85%) rename images/ubuntu/scripts/build/{selenium.sh => install-selenium.sh} (90%) rename images/ubuntu/scripts/build/{sqlpackage.sh => install-sqlpackage.sh} (97%) rename images/ubuntu/scripts/build/{swift.sh => install-swift.sh} (97%) rename images/ubuntu/scripts/build/{terraform.sh => install-terraform.sh} (85%) rename images/ubuntu/scripts/build/{vcpkg.sh => install-vcpkg.sh} (90%) rename images/ubuntu/scripts/build/{yq.sh => install-yq.sh} (93%) rename images/ubuntu/scripts/build/{zstd.sh => install-zstd.sh} (96%) delete mode 100644 images/ubuntu/scripts/build/reboot.sh delete mode 100644 images/ubuntu/scripts/build/sphinx.sh delete mode 100644 images/ubuntu/scripts/build/validate-disk-space.sh rename images/ubuntu/scripts/docs-gen/{SoftwareReport.Generator.ps1 => Generate-SoftwareReport.ps1} (99%) rename images/ubuntu/scripts/{helpers => docs-gen}/SoftwareReport.Helpers.psm1 (100%) rename images/ubuntu/scripts/{helpers/Tests.Helpers.psm1 => tests/Helpers.psm1} (100%) create mode 100644 images/ubuntu/scripts/tests/System.Tests.ps1 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 9e430481f96b..b730b9955445 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -40,10 +40,10 @@ Here are a few things you can do that will increase the likelihood of your pull ### Windows -- Add a script that will install the tool and put the script in the `scripts/build` folder. +- Add a script that will install the tool and put the script in the `scripts/build` folder. There are a bunch of helper functions that could simplify your code: `Choco-Install`, `Install-Binary`, `Install-VsixExtension`, `Start-DownloadWithRetry`, `Test-IsWin19`, `Test-IsWin22` (find the full list of helpers in [ImageHelpers.psm1](images/windows/scripts/helpers/ImageHelpers.psm1)). -- Add a script that will validate the tool installation and put the script in the `scripts/tests` folder. -We use [Pester v5](https://github.com/pester/pester) for validation scripts. If the tests for the tool are complex enough, create a separate `*.Tests.ps1`. Otherwise, use `Tools.Tests.ps1` for simple tests. +- Add a script that will validate the tool installation and put the script in the `scripts/tests` folder. +We use [Pester v5](https://github.com/pester/pester) for validation scripts. If the tests for the tool are complex enough, create a separate `*.Tests.ps1`. Otherwise, use `Tools.Tests.ps1` for simple tests. Add `Invoke-PesterTests -TestFile <testFileName> [-TestName <describeName>]` at the end of the installation script to make sure that your tests will be run. - Add changes to the software report generator `images/windows/scripts/docs-gen/SoftwareReport.Generator.ps1`. The software report generator is used to generate an image's README file, e.g. [Windows2019-Readme.md](images/windows/Windows2019-Readme.md) and uses [MarkdownPS](https://github.com/Sarafian/MarkdownPS). @@ -53,7 +53,7 @@ Add `Invoke-PesterTests -TestFile <testFileName> [-TestName <describeName>]` at Use existing scripts such as [github-cli.sh](images/ubuntu/scripts/build/github-cli.sh) as a starting point. - Use [helpers](images/ubuntu/scripts/helpers/install.sh) to simplify installation process. - Validation part should `exit 1` if any issue with installation. -- Add changes to the software report generator `images/ubuntu/scripts/docs-gen/SoftwareReport.Generator.ps1`. The software report generator is used to generate an image's README file, e.g. [Ubuntu2004-Readme.md](images/ubuntu/Ubuntu2004-README.md) and it uses [MarkdownPS](https://github.com/Sarafian/MarkdownPS). +- Add changes to the software report generator `images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1`. The software report generator is used to generate an image's README file, e.g. [Ubuntu2004-Readme.md](images/ubuntu/Ubuntu2004-README.md) and it uses [MarkdownPS](https://github.com/Sarafian/MarkdownPS). ### macOS diff --git a/images.CI/linux-and-win/build-image.ps1 b/images.CI/linux-and-win/build-image.ps1 index 47b6cd67dc05..e44b9872da60 100644 --- a/images.CI/linux-and-win/build-image.ps1 +++ b/images.CI/linux-and-win/build-image.ps1 @@ -50,7 +50,6 @@ packer build -var "client_id=$ClientId" ` -var "virtual_network_name=$VirtualNetworkName" ` -var "virtual_network_resource_group_name=$VirtualNetworkRG" ` -var "virtual_network_subnet_name=$VirtualNetworkSubnet" ` - -var "run_validation_diskspace=$env:RUN_VALIDATION_FLAG" ` -color=false ` $TemplatePath ` | Where-Object { diff --git a/images/ubuntu/scripts/build/Configure-Toolset.ps1 b/images/ubuntu/scripts/build/Configure-Toolset.ps1 index c35866bf30ac..657915f3b33b 100644 --- a/images/ubuntu/scripts/build/Configure-Toolset.ps1 +++ b/images/ubuntu/scripts/build/Configure-Toolset.ps1 @@ -4,7 +4,7 @@ ## Desc: Configure toolset ################################################################################ -Import-Module "$env:HELPER_SCRIPTS/Tests.Helpers.psm1" -DisableNameChecking +Import-Module "$env:HELPER_SCRIPTS/../tests/Helpers.psm1" -DisableNameChecking function Get-ToolsetToolFullPath { diff --git a/images/ubuntu/scripts/build/Install-AzureModules.ps1 b/images/ubuntu/scripts/build/Install-PowerShellAzModules.ps1 similarity index 80% rename from images/ubuntu/scripts/build/Install-AzureModules.ps1 rename to images/ubuntu/scripts/build/Install-PowerShellAzModules.ps1 index e30c26f06096..081c8c45b95a 100644 --- a/images/ubuntu/scripts/build/Install-AzureModules.ps1 +++ b/images/ubuntu/scripts/build/Install-PowerShellAzModules.ps1 @@ -1,7 +1,12 @@ +################################################################################ +## File: Install-PowerShellAzModules.ps1 +## Desc: Install Az modules for PowerShell +################################################################################ + $ErrorActionPreference = "Stop" $ProgressPreference = "SilentlyContinue" -Import-Module "$env:HELPER_SCRIPTS/Tests.Helpers.psm1" -DisableNameChecking +Import-Module "$env:HELPER_SCRIPTS/../tests/Helpers.psm1" -DisableNameChecking # Get modules content from toolset $modules = (Get-ToolsetContent).azureModules diff --git a/images/ubuntu/scripts/build/Install-PowerShellModules.ps1 b/images/ubuntu/scripts/build/Install-PowerShellModules.ps1 index 8a41d7ed5c3a..82e09f3840c9 100644 --- a/images/ubuntu/scripts/build/Install-PowerShellModules.ps1 +++ b/images/ubuntu/scripts/build/Install-PowerShellModules.ps1 @@ -1,7 +1,12 @@ +################################################################################ +## File: Install-PowerShellModules.ps1 +## Desc: Install modules for PowerShell +################################################################################ + $ErrorActionPreference = "Stop" $ProgressPreference = "SilentlyContinue" -Import-Module "$env:HELPER_SCRIPTS/Tests.Helpers.psm1" -DisableNameChecking +Import-Module "$env:HELPER_SCRIPTS/../tests/Helpers.psm1" -DisableNameChecking # Specifies the installation policy Set-PSRepository -InstallationPolicy Trusted -Name PSGallery diff --git a/images/ubuntu/scripts/build/apt-mock-remove.sh b/images/ubuntu/scripts/build/apt-mock-remove.sh deleted file mode 100644 index 12cab6d2905a..000000000000 --- a/images/ubuntu/scripts/build/apt-mock-remove.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -e - -prefix=/usr/local/bin - -for tool in apt apt-get apt-fast apt-key;do - sudo rm -f $prefix/$tool -done diff --git a/images/ubuntu/scripts/build/cleanup.sh b/images/ubuntu/scripts/build/cleanup.sh index 8120144f9e7c..c6cf5e5df882 100644 --- a/images/ubuntu/scripts/build/cleanup.sh +++ b/images/ubuntu/scripts/build/cleanup.sh @@ -1,4 +1,8 @@ #!/bin/bash -e +################################################################################ +## File: cleanup.sh +## Desc: Perform cleanup +################################################################################ # before cleanup before=$(df / -Pm | awk 'NR==2{print $4}') @@ -31,4 +35,11 @@ after=$(df / -Pm | awk 'NR==2{print $4}') echo "Delta : $(($after-$before)) MB" # delete symlink for tests running -rm -f /usr/local/bin/invoke_tests \ No newline at end of file +rm -f /usr/local/bin/invoke_tests + +# remove apt mock +prefix=/usr/local/bin + +for tool in apt apt-get apt-fast apt-key;do + sudo rm -f $prefix/$tool +done diff --git a/images/ubuntu/scripts/build/complete-snap-setup.sh b/images/ubuntu/scripts/build/complete-snap-setup.sh deleted file mode 100644 index 09cd8edd53ea..000000000000 --- a/images/ubuntu/scripts/build/complete-snap-setup.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash -e -################################################################################ -## File: snap-environment.sh -## Desc: Update /etc/environment to include /snap/bin in PATH -## because /etc/profile.d is ignored by `--norc` shell launch option -################################################################################ - -# Source the helpers -source $HELPER_SCRIPTS/etc-environment.sh - -# Update /etc/environemnt -prependEtcEnvironmentPath "/snap/bin" diff --git a/images/ubuntu/scripts/build/apt-mock.sh b/images/ubuntu/scripts/build/configure-apt-mock.sh similarity index 76% rename from images/ubuntu/scripts/build/apt-mock.sh rename to images/ubuntu/scripts/build/configure-apt-mock.sh index 08a14a1209fb..18af3ca002cc 100644 --- a/images/ubuntu/scripts/build/apt-mock.sh +++ b/images/ubuntu/scripts/build/configure-apt-mock.sh @@ -1,6 +1,9 @@ #!/bin/bash -e - -# A temporary workaround for https://github.com/Azure/azure-linux-extensions/issues/1238 +################################################################################ +## File: configure-apt-mock.sh +## Desc: A temporary workaround for https://github.com/Azure/azure-linux-extensions/issues/1238. +## Cleaned up during configure-cleanup.sh. +################################################################################ prefix=/usr/local/bin diff --git a/images/ubuntu/scripts/build/apt-ubuntu-archive.sh b/images/ubuntu/scripts/build/configure-apt-sources.sh similarity index 80% rename from images/ubuntu/scripts/build/apt-ubuntu-archive.sh rename to images/ubuntu/scripts/build/configure-apt-sources.sh index db4445228f99..6b2ec4c91891 100644 --- a/images/ubuntu/scripts/build/apt-ubuntu-archive.sh +++ b/images/ubuntu/scripts/build/configure-apt-sources.sh @@ -1,7 +1,7 @@ #!/bin/bash -e ################################################################################ -## File: apt-ubuntu-archive.sh -## Desc: Script for configuring apt sources. https://manpages.ubuntu.com/manpages/jammy/en/man1/apt-transport-mirror.1.html +## File: configure-apt-sources.sh +## Desc: Configure apt sources with failover from Azure to Ubuntu archives. ################################################################################ touch /etc/apt/apt-mirrors.txt @@ -12,4 +12,4 @@ printf "http://security.ubuntu.com/ubuntu/\tpriority:3\n" | tee -a /etc/apt/apt- sed -i 's/http:\/\/azure.archive.ubuntu.com\/ubuntu\//mirror+file:\/etc\/apt\/apt-mirrors.txt/' /etc/apt/sources.list -cp -f /etc/apt/sources.list /etc/cloud/templates/sources.list.ubuntu.tmpl \ No newline at end of file +cp -f /etc/apt/sources.list /etc/cloud/templates/sources.list.ubuntu.tmpl diff --git a/images/ubuntu/scripts/build/apt.sh b/images/ubuntu/scripts/build/configure-apt.sh similarity index 86% rename from images/ubuntu/scripts/build/apt.sh rename to images/ubuntu/scripts/build/configure-apt.sh index 725757498869..f4bb76ae98bb 100644 --- a/images/ubuntu/scripts/build/apt.sh +++ b/images/ubuntu/scripts/build/configure-apt.sh @@ -1,4 +1,8 @@ #!/bin/bash -e +################################################################################ +## File: configure-apt.sh +## Desc: Configure apt, install jq and apt-fast packages. +################################################################################ # Stop and disable apt-daily upgrade services; systemctl stop apt-daily.timer diff --git a/images/ubuntu/scripts/build/dpkg-config.sh b/images/ubuntu/scripts/build/configure-dpkg.sh similarity index 81% rename from images/ubuntu/scripts/build/dpkg-config.sh rename to images/ubuntu/scripts/build/configure-dpkg.sh index d8523b345214..9ebfdfbe9481 100644 --- a/images/ubuntu/scripts/build/dpkg-config.sh +++ b/images/ubuntu/scripts/build/configure-dpkg.sh @@ -1,4 +1,8 @@ #!/bin/bash -e +################################################################################ +## File: configure-dpkg.sh +## Desc: Configure dpkg +################################################################################ # This is the anti-frontend. It never interacts with you at all, # and makes the default answers be used for all questions. It diff --git a/images/ubuntu/scripts/build/configure-environment.sh b/images/ubuntu/scripts/build/configure-environment.sh index f7973d54d23e..1725f35ba2cc 100644 --- a/images/ubuntu/scripts/build/configure-environment.sh +++ b/images/ubuntu/scripts/build/configure-environment.sh @@ -1,4 +1,8 @@ #!/bin/bash -e +################################################################################ +## File: configure-environment.sh +## Desc: Configure system and environment +################################################################################ # Source the helpers for use with the script source $HELPER_SCRIPTS/os.sh diff --git a/images/ubuntu/scripts/build/preimagedata.sh b/images/ubuntu/scripts/build/configure-image-data.sh similarity index 78% rename from images/ubuntu/scripts/build/preimagedata.sh rename to images/ubuntu/scripts/build/configure-image-data.sh index cc932532b142..fb873d1d8e26 100644 --- a/images/ubuntu/scripts/build/preimagedata.sh +++ b/images/ubuntu/scripts/build/configure-image-data.sh @@ -1,4 +1,8 @@ #!/bin/bash -e +################################################################################ +## File: configure-image-data.sh +## Desc: Create a file with image data and documentation links +################################################################################ imagedata_file=$IMAGEDATA_FILE image_version=$IMAGE_VERSION diff --git a/images/ubuntu/scripts/build/limits.sh b/images/ubuntu/scripts/build/configure-limits.sh similarity index 72% rename from images/ubuntu/scripts/build/limits.sh rename to images/ubuntu/scripts/build/configure-limits.sh index c064f3a5ca91..e6cb0fe69b80 100644 --- a/images/ubuntu/scripts/build/limits.sh +++ b/images/ubuntu/scripts/build/configure-limits.sh @@ -1,4 +1,8 @@ #!/bin/bash -e +################################################################################ +## File: configure-limits.sh +## Desc: Configure limits +################################################################################ echo 'session required pam_limits.so' >> /etc/pam.d/common-session echo 'session required pam_limits.so' >> /etc/pam.d/common-session-noninteractive diff --git a/images/ubuntu/scripts/build/snap.sh b/images/ubuntu/scripts/build/configure-snap.sh similarity index 55% rename from images/ubuntu/scripts/build/snap.sh rename to images/ubuntu/scripts/build/configure-snap.sh index 6d38c2e051ba..aa0de806494d 100644 --- a/images/ubuntu/scripts/build/snap.sh +++ b/images/ubuntu/scripts/build/configure-snap.sh @@ -1,4 +1,15 @@ #!/bin/bash -e +################################################################################ +## File: configure-snap.sh +## Desc: Configure snap +################################################################################ + +source $HELPER_SCRIPTS/etc-environment.sh + +# Update /etc/environment to include /snap/bin in PATH +# because /etc/profile.d is ignored by `--norc` shell launch option + +prependEtcEnvironmentPath "/snap/bin" # Put snapd auto refresh on hold # as it may generate too much traffic on Canonical's snap server diff --git a/images/ubuntu/scripts/build/post-deployment.sh b/images/ubuntu/scripts/build/configure-system.sh similarity index 86% rename from images/ubuntu/scripts/build/post-deployment.sh rename to images/ubuntu/scripts/build/configure-system.sh index 255c24419377..2b36e1edc6aa 100644 --- a/images/ubuntu/scripts/build/post-deployment.sh +++ b/images/ubuntu/scripts/build/configure-system.sh @@ -1,7 +1,7 @@ #!/bin/bash -e ################################################################################ -## File: post-deployment.sh -## Desc: Post deployment actions +## File: configure-system.sh +## Desc: Post deployment system configuration actions ################################################################################ mv -f /imagegeneration/post-generation /opt @@ -20,7 +20,7 @@ ENVPATH=${ENVPATH%"\""} echo "PATH=$ENVPATH" | sudo tee -a /etc/environment echo "Updated /etc/environment: $(cat /etc/environment)" -# Clean yarn and npm cache +# Сlean yarn and npm cache if yarn --version > /dev/null then yarn cache clean diff --git a/images/ubuntu/scripts/build/example.sh b/images/ubuntu/scripts/build/example.sh deleted file mode 100644 index 58e71b06e69f..000000000000 --- a/images/ubuntu/scripts/build/example.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash -e -################################################################################ -## File: example.sh -## Desc: This is an example script that can be copied to add a new software -## installer to the image -################################################################################ - -# Test to see if the software in question is already installed, if not install it -echo "Checking to see if the installer script has already been run" -if [ -z $EXAMPLE_VAR ]; then - $EXAMPLE_VAR=1.0.0 -else - echo "Example variable already set to $EXAMPLE_VAR" -fi - -# Run tests to determine that the software installed as expected -echo "Testing to make sure that script performed as expected, and basic scenarios work" -if [ -z $EXAMPLE_VAR ]; then - echo "EXAMPLE_VAR variable was not set as expected" - exit 1 -else - echo "EXAMPLE_VAR was set properly" -fi diff --git a/images/ubuntu/scripts/build/action-archive-cache.sh b/images/ubuntu/scripts/build/install-actions-cache.sh similarity index 91% rename from images/ubuntu/scripts/build/action-archive-cache.sh rename to images/ubuntu/scripts/build/install-actions-cache.sh index c54c7d06c614..1aa6f538ddb9 100644 --- a/images/ubuntu/scripts/build/action-archive-cache.sh +++ b/images/ubuntu/scripts/build/install-actions-cache.sh @@ -1,8 +1,7 @@ #!/bin/bash -e ################################################################################ -## File: action-archive-cache.sh -## Desc: Download latest release from https://github.com/actions/action-verions -## and un-tar to /opt/actionarchivecache +## File: install-actions-cache.sh +## Desc: Download latest release from https://github.com/actions/action-versions ## Maintainer: #actions-runtime and @TingluoHuang ################################################################################ diff --git a/images/ubuntu/scripts/build/aliyun-cli.sh b/images/ubuntu/scripts/build/install-aliyun-cli.sh similarity index 95% rename from images/ubuntu/scripts/build/aliyun-cli.sh rename to images/ubuntu/scripts/build/install-aliyun-cli.sh index 33a8bf084ab1..95bcc2f48ce0 100644 --- a/images/ubuntu/scripts/build/aliyun-cli.sh +++ b/images/ubuntu/scripts/build/install-aliyun-cli.sh @@ -1,7 +1,7 @@ #!/bin/bash -e ################################################################################ -## File: aliyun-cli.sh -## Desc: Installs Alibaba Cloud CLI +## File: install-aliyun-cli.sh +## Desc: Install Alibaba Cloud CLI ## Supply chain security: Alibaba Cloud CLI - checksum validation ################################################################################ diff --git a/images/ubuntu/scripts/build/android.sh b/images/ubuntu/scripts/build/install-android-sdk.sh similarity index 98% rename from images/ubuntu/scripts/build/android.sh rename to images/ubuntu/scripts/build/install-android-sdk.sh index a8358f96b861..6a94a7a82769 100644 --- a/images/ubuntu/scripts/build/android.sh +++ b/images/ubuntu/scripts/build/install-android-sdk.sh @@ -1,7 +1,7 @@ #!/bin/bash -e ################################################################################ -## File: android.sh -## Desc: Installs Android SDK +## File: install-android-sdk.sh +## Desc: Install Android SDK and tools ################################################################################ # Source the helpers for use with the script diff --git a/images/ubuntu/scripts/build/apache.sh b/images/ubuntu/scripts/build/install-apache.sh similarity index 85% rename from images/ubuntu/scripts/build/apache.sh rename to images/ubuntu/scripts/build/install-apache.sh index fef2e555ff14..439fb40974dd 100644 --- a/images/ubuntu/scripts/build/apache.sh +++ b/images/ubuntu/scripts/build/install-apache.sh @@ -1,7 +1,7 @@ #!/bin/bash -e ################################################################################ -## File: apache.sh -## Desc: Installs Apache HTTP Server +## File: install-apache.sh +## Desc: Install Apache HTTP Server ################################################################################ # Install Apache diff --git a/images/ubuntu/scripts/build/apt-common.sh b/images/ubuntu/scripts/build/install-apt-common.sh similarity index 79% rename from images/ubuntu/scripts/build/apt-common.sh rename to images/ubuntu/scripts/build/install-apt-common.sh index 6fa1063b1145..7a63390dec54 100644 --- a/images/ubuntu/scripts/build/apt-common.sh +++ b/images/ubuntu/scripts/build/install-apt-common.sh @@ -1,7 +1,7 @@ #!/bin/bash -e ################################################################################ -## File: apt-common.sh -## Desc: Installs basic command line utilities and dev packages +## File: install-apt-common.sh +## Desc: Install basic command line utilities and dev packages ################################################################################ source $HELPER_SCRIPTS/install.sh @@ -12,4 +12,4 @@ for package in $common_packages $cmd_packages; do apt-get install -y --no-install-recommends $package done -invoke_tests "Apt" \ No newline at end of file +invoke_tests "Apt" diff --git a/images/ubuntu/scripts/build/apt-vital.sh b/images/ubuntu/scripts/build/install-apt-vital.sh similarity index 80% rename from images/ubuntu/scripts/build/apt-vital.sh rename to images/ubuntu/scripts/build/install-apt-vital.sh index f2aca618e00d..69c18beac54f 100644 --- a/images/ubuntu/scripts/build/apt-vital.sh +++ b/images/ubuntu/scripts/build/install-apt-vital.sh @@ -1,7 +1,7 @@ #!/bin/bash -e ################################################################################ -## File: apt-vital.sh -## Desc: Installs vital command line utilities +## File: install-apt-vital.sh +## Desc: Install vital command line utilities ################################################################################ source $HELPER_SCRIPTS/install.sh diff --git a/images/ubuntu/scripts/build/aws.sh b/images/ubuntu/scripts/build/install-aws-tools.sh similarity index 91% rename from images/ubuntu/scripts/build/aws.sh rename to images/ubuntu/scripts/build/install-aws-tools.sh index 7cb8d67cb400..d5ee0576df53 100644 --- a/images/ubuntu/scripts/build/aws.sh +++ b/images/ubuntu/scripts/build/install-aws-tools.sh @@ -1,7 +1,7 @@ #!/bin/bash -e ################################################################################ -## File: aws.sh -## Desc: Installs the AWS CLI, Session Manager plugin for the AWS CLI, and AWS SAM CLI +## File: install-aws-tools.sh +## Desc: Install the AWS CLI, Session Manager plugin for the AWS CLI, and AWS SAM CLI ## Supply chain security: AWS SAM CLI - checksum validation ################################################################################ diff --git a/images/ubuntu/scripts/build/azcopy.sh b/images/ubuntu/scripts/build/install-azcopy.sh similarity index 86% rename from images/ubuntu/scripts/build/azcopy.sh rename to images/ubuntu/scripts/build/install-azcopy.sh index e8fc5fe4b883..f06df251d065 100644 --- a/images/ubuntu/scripts/build/azcopy.sh +++ b/images/ubuntu/scripts/build/install-azcopy.sh @@ -1,7 +1,7 @@ #!/bin/bash -e ################################################################################ -## File: azcopy.sh -## Desc: Installs AzCopy +## File: install-azcopy.sh +## Desc: Install AzCopy ################################################################################ source $HELPER_SCRIPTS/install.sh @@ -14,4 +14,4 @@ chmod +x /usr/local/bin/azcopy # Create azcopy 10 alias for backward compatibility ln -sf /usr/local/bin/azcopy /usr/local/bin/azcopy10 -invoke_tests "Tools" "azcopy" \ No newline at end of file +invoke_tests "Tools" "azcopy" diff --git a/images/ubuntu/scripts/build/azure-cli.sh b/images/ubuntu/scripts/build/install-azure-cli.sh similarity index 90% rename from images/ubuntu/scripts/build/azure-cli.sh rename to images/ubuntu/scripts/build/install-azure-cli.sh index bca11b8b34f7..eef93fe18212 100644 --- a/images/ubuntu/scripts/build/azure-cli.sh +++ b/images/ubuntu/scripts/build/install-azure-cli.sh @@ -1,7 +1,7 @@ #!/bin/bash -e ################################################################################ -## File: azure-cli.sh -## Desc: Installed Azure CLI (az) +## File: install-azure-cli.sh +## Desc: Install Azure CLI (az) ################################################################################ # Install Azure CLI (instructions taken from https://docs.microsoft.com/en-us/cli/azure/install-azure-cli) diff --git a/images/ubuntu/scripts/build/azure-devops-cli.sh b/images/ubuntu/scripts/build/install-azure-devops-cli.sh similarity index 79% rename from images/ubuntu/scripts/build/azure-devops-cli.sh rename to images/ubuntu/scripts/build/install-azure-devops-cli.sh index b7a3f5295a46..969497ea2a98 100644 --- a/images/ubuntu/scripts/build/azure-devops-cli.sh +++ b/images/ubuntu/scripts/build/install-azure-devops-cli.sh @@ -1,7 +1,7 @@ #!/bin/bash -e ################################################################################ -## File: azure-devops-cli.sh -## Desc: Installed Azure DevOps CLI (az devops) +## File: install-azure-devops-cli.sh +## Desc: Install Azure DevOps CLI (az devops) ################################################################################ # AZURE_EXTENSION_DIR shell variable defines where modules are installed @@ -12,4 +12,4 @@ echo "AZURE_EXTENSION_DIR=$AZURE_EXTENSION_DIR" | tee -a /etc/environment # install azure devops Cli extension az extension add -n azure-devops -invoke_tests "CLI.Tools" "Azure DevOps CLI" \ No newline at end of file +invoke_tests "CLI.Tools" "Azure DevOps CLI" diff --git a/images/ubuntu/scripts/build/bazel.sh b/images/ubuntu/scripts/build/install-bazel.sh similarity index 79% rename from images/ubuntu/scripts/build/bazel.sh rename to images/ubuntu/scripts/build/install-bazel.sh index 4596b9122105..46d13998d22f 100644 --- a/images/ubuntu/scripts/build/bazel.sh +++ b/images/ubuntu/scripts/build/install-bazel.sh @@ -1,7 +1,7 @@ #!/bin/bash -e ################################################################################ -## File: bazel.sh -## Desc: Installs Bazel and Bazelisk (A user-friendly launcher for Bazel) +## File: install-bazel.sh +## Desc: Install Bazel and Bazelisk (A user-friendly launcher for Bazel) ################################################################################ source $HELPER_SCRIPTS/install.sh diff --git a/images/ubuntu/scripts/build/bicep.sh b/images/ubuntu/scripts/build/install-bicep.sh similarity index 84% rename from images/ubuntu/scripts/build/bicep.sh rename to images/ubuntu/scripts/build/install-bicep.sh index 20c0482c2048..a568ba73d926 100644 --- a/images/ubuntu/scripts/build/bicep.sh +++ b/images/ubuntu/scripts/build/install-bicep.sh @@ -1,7 +1,7 @@ #!/bin/bash -e ################################################################################ -## File: bicep.sh -## Desc: Installs bicep cli +## File: install-bicep.sh +## Desc: Install bicep cli ################################################################################ source $HELPER_SCRIPTS/install.sh @@ -13,4 +13,4 @@ chmod +x ./bicep.bin # Add bicep to PATH (requires admin) sudo mv ./bicep.bin /usr/local/bin/bicep -invoke_tests "Tools" "Bicep" \ No newline at end of file +invoke_tests "Tools" "Bicep" diff --git a/images/ubuntu/scripts/build/clang.sh b/images/ubuntu/scripts/build/install-clang.sh similarity index 95% rename from images/ubuntu/scripts/build/clang.sh rename to images/ubuntu/scripts/build/install-clang.sh index 1c97364fdc3f..02dbe1190942 100644 --- a/images/ubuntu/scripts/build/clang.sh +++ b/images/ubuntu/scripts/build/install-clang.sh @@ -1,7 +1,7 @@ #!/bin/bash -e ################################################################################ -## File: clang.sh -## Desc: Installs Clang compiler +## File: install-clang.sh +## Desc: Install Clang compiler ################################################################################ # Source the helpers for use with the script diff --git a/images/ubuntu/scripts/build/cmake.sh b/images/ubuntu/scripts/build/install-cmake.sh similarity index 95% rename from images/ubuntu/scripts/build/cmake.sh rename to images/ubuntu/scripts/build/install-cmake.sh index 588f9295b16d..fed29cba89c7 100644 --- a/images/ubuntu/scripts/build/cmake.sh +++ b/images/ubuntu/scripts/build/install-cmake.sh @@ -1,7 +1,7 @@ #!/bin/bash -e ################################################################################ -## File: cmake.sh -## Desc: Installs CMake +## File: install-cmake.sh +## Desc: Install CMake ## Supply chain security: CMake - checksum validation ################################################################################ diff --git a/images/ubuntu/scripts/build/codeql-bundle.sh b/images/ubuntu/scripts/build/install-codeql-bundle.sh similarity index 94% rename from images/ubuntu/scripts/build/codeql-bundle.sh rename to images/ubuntu/scripts/build/install-codeql-bundle.sh index 3b62955c6085..9cc01bed8869 100644 --- a/images/ubuntu/scripts/build/codeql-bundle.sh +++ b/images/ubuntu/scripts/build/install-codeql-bundle.sh @@ -1,7 +1,7 @@ #!/bin/bash -e ################################################################################ -## File: codeql-bundle.sh -## Desc: Install the CodeQL CLI Bundle to the toolcache. +## File: install-codeql-bundle.sh +## Desc: Install CodeQL CLI Bundle to the toolcache. ################################################################################ source $HELPER_SCRIPTS/install.sh diff --git a/images/ubuntu/scripts/build/containers.sh b/images/ubuntu/scripts/build/install-container-tools.sh similarity index 92% rename from images/ubuntu/scripts/build/containers.sh rename to images/ubuntu/scripts/build/install-container-tools.sh index 38a9d89ab591..be659b6fbdf9 100644 --- a/images/ubuntu/scripts/build/containers.sh +++ b/images/ubuntu/scripts/build/install-container-tools.sh @@ -1,7 +1,7 @@ #!/bin/bash -e ################################################################################ -## File: containers.sh -## Desc: Installs container tools: podman, buildah and skopeo onto the image +## File: install-container-tools.sh +## Desc: Install container tools: podman, buildah and skopeo onto the image ################################################################################ source $HELPER_SCRIPTS/os.sh diff --git a/images/ubuntu/scripts/build/docker-compose.sh b/images/ubuntu/scripts/build/install-docker-compose.sh similarity index 91% rename from images/ubuntu/scripts/build/docker-compose.sh rename to images/ubuntu/scripts/build/install-docker-compose.sh index 8720c3f28da1..3cd844adb2f2 100644 --- a/images/ubuntu/scripts/build/docker-compose.sh +++ b/images/ubuntu/scripts/build/install-docker-compose.sh @@ -1,7 +1,7 @@ #!/bin/bash -e ################################################################################ -## File: docker-compose.sh -## Desc: Installs Docker Compose v1 +## File: install-docker-compose.sh +## Desc: Install Docker Compose v1 ## Supply chain security: Docker Compose v1 - checksum validation ################################################################################ diff --git a/images/ubuntu/scripts/build/docker.sh b/images/ubuntu/scripts/build/install-docker.sh similarity index 98% rename from images/ubuntu/scripts/build/docker.sh rename to images/ubuntu/scripts/build/install-docker.sh index a11fbd193257..817cc2476904 100644 --- a/images/ubuntu/scripts/build/docker.sh +++ b/images/ubuntu/scripts/build/install-docker.sh @@ -1,7 +1,7 @@ #!/bin/bash -e ################################################################################ -## File: docker.sh -## Desc: Installs docker onto the image +## File: install-docker.sh +## Desc: Install docker onto the image ## Supply chain security: Docker Compose v2, amazon-ecr-credential-helper - checksum validation ################################################################################ diff --git a/images/ubuntu/scripts/build/dotnetcore-sdk.sh b/images/ubuntu/scripts/build/install-dotnetcore-sdk.sh similarity index 98% rename from images/ubuntu/scripts/build/dotnetcore-sdk.sh rename to images/ubuntu/scripts/build/install-dotnetcore-sdk.sh index bc9cbd8e8be8..30f38d9b3b4e 100644 --- a/images/ubuntu/scripts/build/dotnetcore-sdk.sh +++ b/images/ubuntu/scripts/build/install-dotnetcore-sdk.sh @@ -1,7 +1,7 @@ #!/bin/bash -e ################################################################################ -## File: dotnetcore-sdk.sh -## Desc: Installs .NET Core SDK +## File: install-dotnetcore-sdk.sh +## Desc: Install .NET Core SDK ################################################################################ source $HELPER_SCRIPTS/etc-environment.sh diff --git a/images/ubuntu/scripts/build/erlang.sh b/images/ubuntu/scripts/build/install-erlang.sh similarity index 93% rename from images/ubuntu/scripts/build/erlang.sh rename to images/ubuntu/scripts/build/install-erlang.sh index 229760f1f422..a0e730f8f0b8 100644 --- a/images/ubuntu/scripts/build/erlang.sh +++ b/images/ubuntu/scripts/build/install-erlang.sh @@ -1,7 +1,7 @@ #!/bin/bash -e ################################################################################ -## File: erlang.sh -## Desc: Installs erlang +## File: install-erlang.sh +## Desc: Install erlang and rebar3 ################################################################################ # Source the helpers for use with the script diff --git a/images/ubuntu/scripts/build/firefox.sh b/images/ubuntu/scripts/build/install-firefox.sh similarity index 97% rename from images/ubuntu/scripts/build/firefox.sh rename to images/ubuntu/scripts/build/install-firefox.sh index 5ac72a816ea9..18b550467e10 100644 --- a/images/ubuntu/scripts/build/firefox.sh +++ b/images/ubuntu/scripts/build/install-firefox.sh @@ -1,7 +1,7 @@ #!/bin/bash -e ################################################################################ -## File: firefox.sh -## Desc: Installs Firefox +## File: install-firefox.sh +## Desc: Install Firefox ################################################################################ # Source the helpers for use with the script diff --git a/images/ubuntu/scripts/build/gcc.sh b/images/ubuntu/scripts/build/install-gcc-compilers.sh similarity index 85% rename from images/ubuntu/scripts/build/gcc.sh rename to images/ubuntu/scripts/build/install-gcc-compilers.sh index 24f1a7cd126e..cdefcfdbc7de 100644 --- a/images/ubuntu/scripts/build/gcc.sh +++ b/images/ubuntu/scripts/build/install-gcc-compilers.sh @@ -1,7 +1,7 @@ #!/bin/bash -e ################################################################################ -## File: gcc.sh -## Desc: Installs GNU C++ +## File: install-gcc-compilers.sh +## Desc: Install GNU C++ compilers ################################################################################ # Source the helpers for use with the script @@ -25,4 +25,4 @@ for version in ${versions[*]}; do InstallGcc $version done -invoke_tests "Tools" "gcc" \ No newline at end of file +invoke_tests "Tools" "gcc" diff --git a/images/ubuntu/scripts/build/gfortran.sh b/images/ubuntu/scripts/build/install-gfortran.sh similarity index 85% rename from images/ubuntu/scripts/build/gfortran.sh rename to images/ubuntu/scripts/build/install-gfortran.sh index 6b4ae3f635af..c0dcdcc15415 100644 --- a/images/ubuntu/scripts/build/gfortran.sh +++ b/images/ubuntu/scripts/build/install-gfortran.sh @@ -1,7 +1,7 @@ #!/bin/bash -e ################################################################################ -## File: gfortran.sh -## Desc: Installs GNU Fortran +## File: install-gfortran.sh +## Desc: Install GNU Fortran ################################################################################ source $HELPER_SCRIPTS/install.sh source $HELPER_SCRIPTS/os.sh @@ -24,4 +24,4 @@ do InstallFortran $version done -invoke_tests "Tools" "gfortran" \ No newline at end of file +invoke_tests "Tools" "gfortran" diff --git a/images/ubuntu/scripts/build/git-lfs.sh b/images/ubuntu/scripts/build/install-git-lfs.sh similarity index 91% rename from images/ubuntu/scripts/build/git-lfs.sh rename to images/ubuntu/scripts/build/install-git-lfs.sh index a379a7c0fa5e..26209746481b 100644 --- a/images/ubuntu/scripts/build/git-lfs.sh +++ b/images/ubuntu/scripts/build/install-git-lfs.sh @@ -1,7 +1,7 @@ #!/bin/bash -e ################################################################################ -## File: git-lfs.sh -## Desc: Installs Git-lfs +## File: install-git-lfs.sh +## Desc: Install Git-lfs ################################################################################ # Source the helpers for use with the script diff --git a/images/ubuntu/scripts/build/git.sh b/images/ubuntu/scripts/build/install-git.sh similarity index 94% rename from images/ubuntu/scripts/build/git.sh rename to images/ubuntu/scripts/build/install-git.sh index 9e7e8c477a22..385df085559f 100644 --- a/images/ubuntu/scripts/build/git.sh +++ b/images/ubuntu/scripts/build/install-git.sh @@ -1,7 +1,7 @@ #!/bin/bash -e ################################################################################ -## File: git.sh -## Desc: Installs Git +## File: install-git.sh +## Desc: Install Git and Git-FTP ################################################################################ # Source the helpers for use with the script diff --git a/images/ubuntu/scripts/build/github-cli.sh b/images/ubuntu/scripts/build/install-github-cli.sh similarity index 93% rename from images/ubuntu/scripts/build/github-cli.sh rename to images/ubuntu/scripts/build/install-github-cli.sh index 303cafa61fba..65e3cddcc712 100644 --- a/images/ubuntu/scripts/build/github-cli.sh +++ b/images/ubuntu/scripts/build/install-github-cli.sh @@ -1,7 +1,7 @@ #!/bin/bash -e ################################################################################ -## File: github-cli.sh -## Desc: Installs GitHub CLI +## File: install-github-cli.sh +## Desc: Install GitHub CLI ## Must be run as non-root user after homebrew ## Supply chain security: GitHub CLI - checksum validation ################################################################################ diff --git a/images/ubuntu/scripts/build/google-chrome.sh b/images/ubuntu/scripts/build/install-google-chrome.sh similarity index 96% rename from images/ubuntu/scripts/build/google-chrome.sh rename to images/ubuntu/scripts/build/install-google-chrome.sh index fabb42195a21..059a33c8c718 100644 --- a/images/ubuntu/scripts/build/google-chrome.sh +++ b/images/ubuntu/scripts/build/install-google-chrome.sh @@ -1,7 +1,7 @@ #!/bin/bash -e ################################################################################ -## File: google-chrome.sh -## Desc: Installs google-chrome, chromedriver and chromium +## File: install-google-chrome.sh +## Desc: Install google-chrome, chromedriver and chromium ################################################################################ # Source the helpers for use with the script @@ -83,4 +83,4 @@ ln -s $CHROMIUM_BIN /usr/bin/chromium ln -s $CHROMIUM_BIN /usr/bin/chromium-browser invoke_tests "Browsers" "Chrome" -invoke_tests "Browsers" "Chromium" \ No newline at end of file +invoke_tests "Browsers" "Chromium" diff --git a/images/ubuntu/scripts/build/google-cloud-cli.sh b/images/ubuntu/scripts/build/install-google-cloud-cli.sh similarity index 91% rename from images/ubuntu/scripts/build/google-cloud-cli.sh rename to images/ubuntu/scripts/build/install-google-cloud-cli.sh index 88708155f74f..cd6fd2d886ff 100644 --- a/images/ubuntu/scripts/build/google-cloud-cli.sh +++ b/images/ubuntu/scripts/build/install-google-cloud-cli.sh @@ -1,7 +1,7 @@ #!/bin/bash -e ################################################################################ -## File: google-cloud-cli.sh -## Desc: Installs the Google Cloud CLI +## File: install-google-cloud-cli.sh +## Desc: Install the Google Cloud CLI ################################################################################ REPO_URL="https://packages.cloud.google.com/apt" diff --git a/images/ubuntu/scripts/build/haskell.sh b/images/ubuntu/scripts/build/install-haskell.sh similarity index 95% rename from images/ubuntu/scripts/build/haskell.sh rename to images/ubuntu/scripts/build/install-haskell.sh index 4a7f6347821b..3e2796544af9 100644 --- a/images/ubuntu/scripts/build/haskell.sh +++ b/images/ubuntu/scripts/build/install-haskell.sh @@ -1,7 +1,7 @@ #!/bin/bash -e ################################################################################ -## File: haskell.sh -## Desc: Installs Haskell +## File: install-haskell.sh +## Desc: Install Haskell, GHCup, Cabal and Stack ################################################################################ # Source the helpers for use with the script diff --git a/images/ubuntu/scripts/build/heroku.sh b/images/ubuntu/scripts/build/install-heroku.sh similarity index 81% rename from images/ubuntu/scripts/build/heroku.sh rename to images/ubuntu/scripts/build/install-heroku.sh index 5c81325f3a78..b432729ead77 100644 --- a/images/ubuntu/scripts/build/heroku.sh +++ b/images/ubuntu/scripts/build/install-heroku.sh @@ -1,7 +1,7 @@ #!/bin/bash -e ################################################################################ -## File: heroku.sh -## Desc: This script installs Heroku CLI. Based on instructions found here: https://devcenter.heroku.com/articles/heroku-cli +## File: install-heroku.sh +## Desc: Install Heroku CLI. Based on instructions found here: https://devcenter.heroku.com/articles/heroku-cli ################################################################################ ## Install Heroku CLI diff --git a/images/ubuntu/scripts/build/hhvm.sh b/images/ubuntu/scripts/build/install-hhvm.sh similarity index 88% rename from images/ubuntu/scripts/build/hhvm.sh rename to images/ubuntu/scripts/build/install-hhvm.sh index 988233102e4d..49591a51c12e 100644 --- a/images/ubuntu/scripts/build/hhvm.sh +++ b/images/ubuntu/scripts/build/install-hhvm.sh @@ -1,7 +1,7 @@ #!/bin/bash -e ################################################################################ -## File: hhvm.sh -## Desc: Installs hhvm +## File: install-hhvm.sh +## Desc: Install HHVM ################################################################################ apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xB4112585D386EB94 diff --git a/images/ubuntu/scripts/build/homebrew.sh b/images/ubuntu/scripts/build/install-homebrew.sh similarity index 94% rename from images/ubuntu/scripts/build/homebrew.sh rename to images/ubuntu/scripts/build/install-homebrew.sh index d13372141004..8f94e469cbaf 100644 --- a/images/ubuntu/scripts/build/homebrew.sh +++ b/images/ubuntu/scripts/build/install-homebrew.sh @@ -1,7 +1,7 @@ #!/bin/bash -e ################################################################################ -## File: homebrew.sh -## Desc: Installs the Homebrew on Linux +## File: install-homebrew.sh +## Desc: Install Homebrew on Linux ## Caveat: Brew MUST NOT be used to install any tool during the image build to avoid dependencies, which may come along with the tool ################################################################################ diff --git a/images/ubuntu/scripts/build/java-tools.sh b/images/ubuntu/scripts/build/install-java-tools.sh similarity index 98% rename from images/ubuntu/scripts/build/java-tools.sh rename to images/ubuntu/scripts/build/install-java-tools.sh index cc15bbe39d3c..faa9451ee068 100644 --- a/images/ubuntu/scripts/build/java-tools.sh +++ b/images/ubuntu/scripts/build/install-java-tools.sh @@ -1,7 +1,7 @@ #!/bin/bash -e ################################################################################ -## File: java-tools.sh -## Desc: Installs Java and related tooling (Ant, Gradle, Maven) +## File: install-java-tools.sh +## Desc: Install Java and related tooling (Ant, Gradle, Maven) ################################################################################ source $HELPER_SCRIPTS/install.sh diff --git a/images/ubuntu/scripts/build/julia.sh b/images/ubuntu/scripts/build/install-julia.sh similarity index 93% rename from images/ubuntu/scripts/build/julia.sh rename to images/ubuntu/scripts/build/install-julia.sh index 715a5ea36af2..4c491d2cdcd1 100644 --- a/images/ubuntu/scripts/build/julia.sh +++ b/images/ubuntu/scripts/build/install-julia.sh @@ -1,7 +1,7 @@ #!/bin/bash -e ################################################################################ -## File: julia.sh -## Desc: Installs Julia, and adds Julia to the path +## File: install-julia.sh +## Desc: Install Julia and add to the path ################################################################################ # Source the helpers for use with the script diff --git a/images/ubuntu/scripts/build/kotlin.sh b/images/ubuntu/scripts/build/install-kotlin.sh similarity index 94% rename from images/ubuntu/scripts/build/kotlin.sh rename to images/ubuntu/scripts/build/install-kotlin.sh index 9275875025e0..1995a66e1a7e 100644 --- a/images/ubuntu/scripts/build/kotlin.sh +++ b/images/ubuntu/scripts/build/install-kotlin.sh @@ -1,7 +1,7 @@ #!/bin/bash -e ################################################################################ -## File: kotlin.sh -## Desc: Installs Kotlin +## File: install-kotlin.sh +## Desc: Install Kotlin ## Supply chain security: Kotlin - checksum validation ################################################################################ diff --git a/images/ubuntu/scripts/build/kubernetes-tools.sh b/images/ubuntu/scripts/build/install-kubernetes-tools.sh similarity index 98% rename from images/ubuntu/scripts/build/kubernetes-tools.sh rename to images/ubuntu/scripts/build/install-kubernetes-tools.sh index 12935cc32eb5..0806c981492d 100644 --- a/images/ubuntu/scripts/build/kubernetes-tools.sh +++ b/images/ubuntu/scripts/build/install-kubernetes-tools.sh @@ -1,6 +1,6 @@ #!/bin/bash -e ################################################################################ -## File: kubernetes-tools.sh +## File: install-kubernetes-tools.sh ## Desc: Installs kubectl, helm, kustomize ## Supply chain security: KIND, minikube - checksum validation ################################################################################ diff --git a/images/ubuntu/scripts/build/leiningen.sh b/images/ubuntu/scripts/build/install-leiningen.sh similarity index 85% rename from images/ubuntu/scripts/build/leiningen.sh rename to images/ubuntu/scripts/build/install-leiningen.sh index 2197b02efa03..69845f9e5d8a 100644 --- a/images/ubuntu/scripts/build/leiningen.sh +++ b/images/ubuntu/scripts/build/install-leiningen.sh @@ -1,7 +1,7 @@ #!/bin/bash -e ################################################################################ -## File: leiningen.sh -## Desc: Installs Leiningen +## File: install-leiningen.sh +## Desc: Install Leiningen ################################################################################ LEIN_BIN=/usr/local/bin/lein @@ -16,4 +16,4 @@ LEIN_JAR=$(find $LEIN_HOME -name "leiningen-*-standalone.jar") echo "LEIN_JAR=$LEIN_JAR" | tee -a /etc/environment echo "LEIN_HOME=$LEIN_HOME" | tee -a /etc/environment -invoke_tests "Tools" "Leiningen" \ No newline at end of file +invoke_tests "Tools" "Leiningen" diff --git a/images/ubuntu/scripts/build/microsoft-edge.sh b/images/ubuntu/scripts/build/install-microsoft-edge.sh similarity index 95% rename from images/ubuntu/scripts/build/microsoft-edge.sh rename to images/ubuntu/scripts/build/install-microsoft-edge.sh index 5cf105cb235b..c8c42cd2442c 100644 --- a/images/ubuntu/scripts/build/microsoft-edge.sh +++ b/images/ubuntu/scripts/build/install-microsoft-edge.sh @@ -1,7 +1,7 @@ #!/bin/bash -e ################################################################################ -## File: microsoft-edge.sh -## Desc: Installs Microsoft Edge +## File: install-microsoft-edge.sh +## Desc: Install Microsoft Edge and WebDriver ################################################################################ source $HELPER_SCRIPTS/install.sh diff --git a/images/ubuntu/scripts/build/miniconda.sh b/images/ubuntu/scripts/build/install-miniconda.sh similarity index 85% rename from images/ubuntu/scripts/build/miniconda.sh rename to images/ubuntu/scripts/build/install-miniconda.sh index 8a68c802c7df..9e6daf856458 100644 --- a/images/ubuntu/scripts/build/miniconda.sh +++ b/images/ubuntu/scripts/build/install-miniconda.sh @@ -1,7 +1,7 @@ #!/bin/bash -e ################################################################################ -## File: miniconda.sh -## Desc: Installs miniconda +## File: install-miniconda.sh +## Desc: Install miniconda ################################################################################ # Install Miniconda @@ -15,4 +15,4 @@ echo "CONDA=$CONDA" | tee -a /etc/environment ln -s $CONDA/bin/conda /usr/bin/conda -invoke_tests "Tools" "Conda" \ No newline at end of file +invoke_tests "Tools" "Conda" diff --git a/images/ubuntu/scripts/build/mongodb.sh b/images/ubuntu/scripts/build/install-mongodb.sh similarity index 93% rename from images/ubuntu/scripts/build/mongodb.sh rename to images/ubuntu/scripts/build/install-mongodb.sh index 783480038f67..063d7b315e97 100644 --- a/images/ubuntu/scripts/build/mongodb.sh +++ b/images/ubuntu/scripts/build/install-mongodb.sh @@ -1,7 +1,7 @@ #!/bin/bash -e ################################################################################ -## File: mongodb.sh -## Desc: Installs Mongo DB +## File: install-mongodb.sh +## Desc: Install Mongo DB ################################################################################ # Source the helpers diff --git a/images/ubuntu/scripts/build/mono.sh b/images/ubuntu/scripts/build/install-mono.sh similarity index 96% rename from images/ubuntu/scripts/build/mono.sh rename to images/ubuntu/scripts/build/install-mono.sh index 4819765d6e71..ebeb0a750713 100644 --- a/images/ubuntu/scripts/build/mono.sh +++ b/images/ubuntu/scripts/build/install-mono.sh @@ -1,7 +1,7 @@ #!/bin/bash -e ################################################################################ -## File: mono.sh -## Desc: Installs Mono +## File: install-mono.sh +## Desc: Install Mono ################################################################################ source $HELPER_SCRIPTS/os.sh diff --git a/images/ubuntu/scripts/build/repos.sh b/images/ubuntu/scripts/build/install-ms-repos.sh similarity index 83% rename from images/ubuntu/scripts/build/repos.sh rename to images/ubuntu/scripts/build/install-ms-repos.sh index 0a2a08138c57..26eb8f475852 100644 --- a/images/ubuntu/scripts/build/repos.sh +++ b/images/ubuntu/scripts/build/install-ms-repos.sh @@ -1,7 +1,7 @@ #!/bin/bash -e ################################################################################ -## File: repos.sh -## Desc: Installs official Microsoft package repos for the distribution +## File: install-ms-repos.sh +## Desc: Install official Microsoft package repos for the distribution ################################################################################ LSB_RELEASE=$(lsb_release -rs) diff --git a/images/ubuntu/scripts/build/mssql-cmd-tools.sh b/images/ubuntu/scripts/build/install-mssql-tools.sh similarity index 85% rename from images/ubuntu/scripts/build/mssql-cmd-tools.sh rename to images/ubuntu/scripts/build/install-mssql-tools.sh index 092023e9ce52..20d994738312 100644 --- a/images/ubuntu/scripts/build/mssql-cmd-tools.sh +++ b/images/ubuntu/scripts/build/install-mssql-tools.sh @@ -1,6 +1,6 @@ #!/bin/bash -e ################################################################################ -## File: mssql-cmd-tools.sh +## File: install-mssql-tools.sh ## Desc: Install MS SQL Server client tools (https://docs.microsoft.com/en-us/sql/linux/sql-server-linux-setup-tools?view=sql-server-2017) ################################################################################ @@ -11,4 +11,4 @@ apt-get install -y mssql-tools unixodbc-dev apt-get -f install ln -s /opt/mssql-tools/bin/* /usr/local/bin/ -invoke_tests "Tools" "MSSQLCommandLineTools" \ No newline at end of file +invoke_tests "Tools" "MSSQLCommandLineTools" diff --git a/images/ubuntu/scripts/build/mysql.sh b/images/ubuntu/scripts/build/install-mysql.sh similarity index 93% rename from images/ubuntu/scripts/build/mysql.sh rename to images/ubuntu/scripts/build/install-mysql.sh index 5e650d7e4e19..9ff05155958a 100644 --- a/images/ubuntu/scripts/build/mysql.sh +++ b/images/ubuntu/scripts/build/install-mysql.sh @@ -1,7 +1,7 @@ #!/bin/bash -e ################################################################################ -## File: mysql.sh -## Desc: Installs MySQL Client +## File: install-mysql.sh +## Desc: Install MySQL Client ################################################################################ source $HELPER_SCRIPTS/os.sh diff --git a/images/ubuntu/scripts/build/nginx.sh b/images/ubuntu/scripts/build/install-nginx.sh similarity index 87% rename from images/ubuntu/scripts/build/nginx.sh rename to images/ubuntu/scripts/build/install-nginx.sh index 48b33756ced0..6bb6137af371 100644 --- a/images/ubuntu/scripts/build/nginx.sh +++ b/images/ubuntu/scripts/build/install-nginx.sh @@ -1,7 +1,7 @@ #!/bin/bash -e ################################################################################ -## File: nginx.sh -## Desc: Installs Nginx +## File: install-nginx.sh +## Desc: Install Nginx ################################################################################ # Install Nginx diff --git a/images/ubuntu/scripts/build/nodejs.sh b/images/ubuntu/scripts/build/install-nodejs.sh similarity index 90% rename from images/ubuntu/scripts/build/nodejs.sh rename to images/ubuntu/scripts/build/install-nodejs.sh index 46ef75b8c710..dd96adc85d6f 100644 --- a/images/ubuntu/scripts/build/nodejs.sh +++ b/images/ubuntu/scripts/build/install-nodejs.sh @@ -1,7 +1,7 @@ #!/bin/bash -e ################################################################################ -## File: nodejs.sh -## Desc: Installs Node.js LTS and related tooling (Gulp, Grunt) +## File: install-nodejs.sh +## Desc: Install Node.js LTS and related tooling (Gulp, Grunt) ################################################################################ # Source the helpers for use with the script diff --git a/images/ubuntu/scripts/build/nvm.sh b/images/ubuntu/scripts/build/install-nvm.sh similarity index 93% rename from images/ubuntu/scripts/build/nvm.sh rename to images/ubuntu/scripts/build/install-nvm.sh index 71ae4b8d65ea..1857ac31d1b0 100644 --- a/images/ubuntu/scripts/build/nvm.sh +++ b/images/ubuntu/scripts/build/install-nvm.sh @@ -1,7 +1,7 @@ #!/bin/bash -e ################################################################################ -## File: nvm.sh -## Desc: Installs Nvm +## File: install-nvm.sh +## Desc: Install Nvm ################################################################################ export NVM_DIR="/etc/skel/.nvm" diff --git a/images/ubuntu/scripts/build/oc.sh b/images/ubuntu/scripts/build/install-oc-cli.sh similarity index 84% rename from images/ubuntu/scripts/build/oc.sh rename to images/ubuntu/scripts/build/install-oc-cli.sh index 27edfa94d317..36ec84794df4 100644 --- a/images/ubuntu/scripts/build/oc.sh +++ b/images/ubuntu/scripts/build/install-oc-cli.sh @@ -1,7 +1,7 @@ #!/bin/bash -e ################################################################################ -## File: oc.sh -## Desc: Installs the OC CLI +## File: install-oc-cli.sh +## Desc: Install the OC CLI ################################################################################ source $HELPER_SCRIPTS/install.sh @@ -12,4 +12,4 @@ PACKAGE_TAR_NAME="oc.tar.gz" download_with_retries $DOWNLOAD_URL "/tmp" $PACKAGE_TAR_NAME tar xzf "/tmp/$PACKAGE_TAR_NAME" -C "/usr/local/bin" oc -invoke_tests "CLI.Tools" "OC CLI" \ No newline at end of file +invoke_tests "CLI.Tools" "OC CLI" diff --git a/images/ubuntu/scripts/build/oras-cli.sh b/images/ubuntu/scripts/build/install-oras-cli.sh similarity index 93% rename from images/ubuntu/scripts/build/oras-cli.sh rename to images/ubuntu/scripts/build/install-oras-cli.sh index 294e3b9c5a84..f8481a91dd65 100644 --- a/images/ubuntu/scripts/build/oras-cli.sh +++ b/images/ubuntu/scripts/build/install-oras-cli.sh @@ -1,7 +1,7 @@ #!/bin/bash -e ################################################################################ -## File: oras-cli.sh -## Desc: Installs ORAS CLI +## File: install-oras-cli.sh +## Desc: Install ORAS CLI ## Supply chain security: ORAS CLI - checksum validation ################################################################################ diff --git a/images/ubuntu/scripts/build/packer.sh b/images/ubuntu/scripts/build/install-packer.sh similarity index 86% rename from images/ubuntu/scripts/build/packer.sh rename to images/ubuntu/scripts/build/install-packer.sh index 2433963cf979..cdcdc5673cb6 100644 --- a/images/ubuntu/scripts/build/packer.sh +++ b/images/ubuntu/scripts/build/install-packer.sh @@ -1,7 +1,7 @@ #!/bin/bash -e ################################################################################ -## File: packer.sh -## Desc: Installs packer +## File: install-packer.sh +## Desc: Install packer ################################################################################ source $HELPER_SCRIPTS/install.sh @@ -13,4 +13,4 @@ download_with_retries "${URL}" "/tmp" "${ZIP_NAME}" unzip -qq "/tmp/${ZIP_NAME}" -d /usr/local/bin rm -f "/tmp/${ZIP_NAME}" -invoke_tests "Tools" "Packer" \ No newline at end of file +invoke_tests "Tools" "Packer" diff --git a/images/ubuntu/scripts/build/phantomjs.sh b/images/ubuntu/scripts/build/install-phantomjs.sh similarity index 93% rename from images/ubuntu/scripts/build/phantomjs.sh rename to images/ubuntu/scripts/build/install-phantomjs.sh index 1be03c836a7e..721cd685476e 100644 --- a/images/ubuntu/scripts/build/phantomjs.sh +++ b/images/ubuntu/scripts/build/install-phantomjs.sh @@ -1,7 +1,7 @@ #!/bin/bash -e ################################################################################ -## File: phantomjs.sh -## Desc: Installs PhantomJS +## File: install-phantomjs.sh +## Desc: Install PhantomJS ################################################################################ # Source the helpers for use with the script diff --git a/images/ubuntu/scripts/build/php.sh b/images/ubuntu/scripts/build/install-php.sh similarity index 98% rename from images/ubuntu/scripts/build/php.sh rename to images/ubuntu/scripts/build/install-php.sh index 68e15410969e..3f8ce40ddd45 100644 --- a/images/ubuntu/scripts/build/php.sh +++ b/images/ubuntu/scripts/build/install-php.sh @@ -1,7 +1,7 @@ #!/bin/bash -e ################################################################################ -## File: php.sh -## Desc: Installs php +## File: install-php.sh +## Desc: Install php ################################################################################ # Source the helpers for use with the script diff --git a/images/ubuntu/scripts/build/pipx-packages.sh b/images/ubuntu/scripts/build/install-pipx-packages.sh similarity index 93% rename from images/ubuntu/scripts/build/pipx-packages.sh rename to images/ubuntu/scripts/build/install-pipx-packages.sh index c5aeace65d36..14262d128863 100644 --- a/images/ubuntu/scripts/build/pipx-packages.sh +++ b/images/ubuntu/scripts/build/install-pipx-packages.sh @@ -1,6 +1,6 @@ #!/bin/bash -e ################################################################################ -## File: pipx-packages.sh +## File: install-pipx-packages.sh ## Desc: Install tools via pipx ################################################################################ source $HELPER_SCRIPTS/install.sh @@ -28,4 +28,4 @@ for package in $pipx_packages; do done -invoke_tests "Common" "PipxPackages" \ No newline at end of file +invoke_tests "Common" "PipxPackages" diff --git a/images/ubuntu/scripts/build/postgresql.sh b/images/ubuntu/scripts/build/install-postgresql.sh similarity index 94% rename from images/ubuntu/scripts/build/postgresql.sh rename to images/ubuntu/scripts/build/install-postgresql.sh index 845adffc6278..f7e16c31764b 100644 --- a/images/ubuntu/scripts/build/postgresql.sh +++ b/images/ubuntu/scripts/build/install-postgresql.sh @@ -1,7 +1,7 @@ #!/bin/bash -e ################################################################################ -## File: postgresql.sh -## Desc: Installs PostgreSQL +## File: install-postgresql.sh +## Desc: Install PostgreSQL ################################################################################ # Source the helpers diff --git a/images/ubuntu/scripts/build/powershellcore.sh b/images/ubuntu/scripts/build/install-powershell.sh similarity index 82% rename from images/ubuntu/scripts/build/powershellcore.sh rename to images/ubuntu/scripts/build/install-powershell.sh index 4b4f206c0fa0..b2a0069bcbaf 100644 --- a/images/ubuntu/scripts/build/powershellcore.sh +++ b/images/ubuntu/scripts/build/install-powershell.sh @@ -1,7 +1,7 @@ #!/bin/bash -e ################################################################################ -## File: powershellcore.sh -## Desc: Installs powershellcore +## File: install-powershell.sh +## Desc: Install PowerShell Core ################################################################################ source $HELPER_SCRIPTS/install.sh diff --git a/images/ubuntu/scripts/build/pulumi.sh b/images/ubuntu/scripts/build/install-pulumi.sh similarity index 94% rename from images/ubuntu/scripts/build/pulumi.sh rename to images/ubuntu/scripts/build/install-pulumi.sh index 769d3282ded5..19fce9a49068 100644 --- a/images/ubuntu/scripts/build/pulumi.sh +++ b/images/ubuntu/scripts/build/install-pulumi.sh @@ -1,7 +1,7 @@ #!/bin/bash -e ################################################################################ -## File: pulumi.sh -## Desc: Installs Pulumi +## File: install-pulumi.sh +## Desc: Install Pulumi ## Supply chain security: Pulumi - checksum validation ################################################################################ diff --git a/images/ubuntu/scripts/build/pypy.sh b/images/ubuntu/scripts/build/install-pypy.sh similarity index 98% rename from images/ubuntu/scripts/build/pypy.sh rename to images/ubuntu/scripts/build/install-pypy.sh index 5c8e373cbcb7..e4797c0e2d1c 100644 --- a/images/ubuntu/scripts/build/pypy.sh +++ b/images/ubuntu/scripts/build/install-pypy.sh @@ -1,7 +1,7 @@ #!/bin/bash -e ################################################################################ -## File: pypy.sh -## Desc: Installs PyPy +## File: install-pypy.sh +## Desc: Install PyPy ################################################################################ source $HELPER_SCRIPTS/install.sh diff --git a/images/ubuntu/scripts/build/python.sh b/images/ubuntu/scripts/build/install-python.sh similarity index 94% rename from images/ubuntu/scripts/build/python.sh rename to images/ubuntu/scripts/build/install-python.sh index bd2daed575af..70321af93d29 100644 --- a/images/ubuntu/scripts/build/python.sh +++ b/images/ubuntu/scripts/build/install-python.sh @@ -1,7 +1,7 @@ #!/bin/bash -e ################################################################################ -## File: python.sh -## Desc: Installs Python 2/3 +## File: install-python.sh +## Desc: Install Python 3 ################################################################################ set -e diff --git a/images/ubuntu/scripts/build/r.sh b/images/ubuntu/scripts/build/install-rlang.sh similarity index 90% rename from images/ubuntu/scripts/build/r.sh rename to images/ubuntu/scripts/build/install-rlang.sh index 79ede293452f..a463b0d6681a 100644 --- a/images/ubuntu/scripts/build/r.sh +++ b/images/ubuntu/scripts/build/install-rlang.sh @@ -1,7 +1,7 @@ #!/bin/bash -e ################################################################################ -## File: r.sh -## Desc: Installs R +## File: install-rlang.sh +## Desc: Install R ################################################################################ # Source the helpers for use with the script @@ -19,4 +19,4 @@ apt-get install r-base rm /etc/apt/sources.list.d/rlang.list rm /usr/share/keyrings/rlang.gpg -invoke_tests "Tools" "R" \ No newline at end of file +invoke_tests "Tools" "R" diff --git a/images/ubuntu/scripts/build/ruby.sh b/images/ubuntu/scripts/build/install-ruby.sh similarity index 94% rename from images/ubuntu/scripts/build/ruby.sh rename to images/ubuntu/scripts/build/install-ruby.sh index 5c25fe69c975..de5de806191a 100644 --- a/images/ubuntu/scripts/build/ruby.sh +++ b/images/ubuntu/scripts/build/install-ruby.sh @@ -1,7 +1,7 @@ #!/bin/bash -e ################################################################################ -## File: ruby.sh -## Desc: Installs Ruby requirements and ruby gems +## File: install-ruby.sh +## Desc: Install Ruby requirements and ruby gems ################################################################################ source $HELPER_SCRIPTS/os.sh @@ -54,4 +54,4 @@ for TOOLSET_VERSION in ${TOOLSET_VERSIONS[@]}; do fi done -invoke_tests "Tools" "Ruby" \ No newline at end of file +invoke_tests "Tools" "Ruby" diff --git a/images/ubuntu/scripts/build/runner-package.sh b/images/ubuntu/scripts/build/install-runner-package.sh similarity index 87% rename from images/ubuntu/scripts/build/runner-package.sh rename to images/ubuntu/scripts/build/install-runner-package.sh index 1e8b063ebd1e..569a4a61cc7e 100644 --- a/images/ubuntu/scripts/build/runner-package.sh +++ b/images/ubuntu/scripts/build/install-runner-package.sh @@ -1,7 +1,7 @@ #!/bin/bash -e ################################################################################ -## File: runner-package.sh -## Desc: Downloads and Installs runner package +## File: install-runner-package.sh +## Desc: Download and Install runner package ################################################################################ # Source the helpers for use with the script diff --git a/images/ubuntu/scripts/build/rust.sh b/images/ubuntu/scripts/build/install-rust.sh similarity index 94% rename from images/ubuntu/scripts/build/rust.sh rename to images/ubuntu/scripts/build/install-rust.sh index adec5a65a66f..b046b75f5565 100644 --- a/images/ubuntu/scripts/build/rust.sh +++ b/images/ubuntu/scripts/build/install-rust.sh @@ -1,7 +1,7 @@ #!/bin/bash -e ################################################################################ -## File: rust.sh -## Desc: Installs Rust +## File: install-rust.sh +## Desc: Install Rust ################################################################################ # Source the helpers for use with the script diff --git a/images/ubuntu/scripts/build/sbt.sh b/images/ubuntu/scripts/build/install-sbt.sh similarity index 85% rename from images/ubuntu/scripts/build/sbt.sh rename to images/ubuntu/scripts/build/install-sbt.sh index 39734d532fc5..ff90abced25b 100644 --- a/images/ubuntu/scripts/build/sbt.sh +++ b/images/ubuntu/scripts/build/install-sbt.sh @@ -1,7 +1,7 @@ #!/bin/bash -e ################################################################################ -## File: sbt.sh -## Desc: Installs sbt +## File: install-sbt.sh +## Desc: Install sbt ################################################################################ source $HELPER_SCRIPTS/install.sh @@ -12,4 +12,4 @@ download_with_retries "$downloadUrl" "/tmp" "sbt.tgz" tar zxf /tmp/sbt.tgz -C /usr/share ln -s /usr/share/sbt/bin/sbt /usr/bin/sbt -invoke_tests "Tools" "Sbt" \ No newline at end of file +invoke_tests "Tools" "Sbt" diff --git a/images/ubuntu/scripts/build/selenium.sh b/images/ubuntu/scripts/build/install-selenium.sh similarity index 90% rename from images/ubuntu/scripts/build/selenium.sh rename to images/ubuntu/scripts/build/install-selenium.sh index 494c19ce150c..b974ef145971 100644 --- a/images/ubuntu/scripts/build/selenium.sh +++ b/images/ubuntu/scripts/build/install-selenium.sh @@ -1,7 +1,7 @@ #!/bin/bash -e ################################################################################ -## File: selenium.sh -## Desc: Installs selenium server +## File: install-selenium.sh +## Desc: Install selenium server ################################################################################ # Source the helpers for use with the script @@ -15,7 +15,7 @@ SELENIUM_JAR_NAME="$SELENIUM_BINARY_NAME.jar" SELENIUM_DOWNLOAD_URL=$(get_github_package_download_url "SeleniumHQ/selenium" "contains(\"${SELENIUM_BINARY_NAME}-${SELENIUM_MAJOR_VERSION}\") and endswith(\".jar\")") download_with_retries $SELENIUM_DOWNLOAD_URL $SELENIUM_JAR_PATH $SELENIUM_JAR_NAME -# Create an epmty file to retrive selenium version +# Create an epmty file to retrive selenium version SELENIUM_FULL_VERSION=$(echo $SELENIUM_DOWNLOAD_URL | awk -F"${SELENIUM_BINARY_NAME}-|.jar" '{print $2}') touch "$SELENIUM_JAR_PATH/$SELENIUM_BINARY_NAME-$SELENIUM_FULL_VERSION" diff --git a/images/ubuntu/scripts/build/sqlpackage.sh b/images/ubuntu/scripts/build/install-sqlpackage.sh similarity index 97% rename from images/ubuntu/scripts/build/sqlpackage.sh rename to images/ubuntu/scripts/build/install-sqlpackage.sh index d0f9c27b2e7e..7623bd95c903 100644 --- a/images/ubuntu/scripts/build/sqlpackage.sh +++ b/images/ubuntu/scripts/build/install-sqlpackage.sh @@ -1,6 +1,6 @@ #!/bin/bash -e ################################################################################ -## File: sqlpackage.sh +## File: install-sqlpackage.sh ## Desc: Install SqlPackage CLI to DacFx (https://docs.microsoft.com/sql/tools/sqlpackage/sqlpackage-download#get-sqlpackage-net-core-for-linux) ################################################################################ diff --git a/images/ubuntu/scripts/build/swift.sh b/images/ubuntu/scripts/build/install-swift.sh similarity index 97% rename from images/ubuntu/scripts/build/swift.sh rename to images/ubuntu/scripts/build/install-swift.sh index 97bcc76a543f..68d5dc19d082 100644 --- a/images/ubuntu/scripts/build/swift.sh +++ b/images/ubuntu/scripts/build/install-swift.sh @@ -1,7 +1,7 @@ #!/bin/bash -e ################################################################################ -## File: swift.sh -## Desc: Installs Swift +## File: install-swift.sh +## Desc: Install Swift ################################################################################ # Source the helpers for use with the script diff --git a/images/ubuntu/scripts/build/terraform.sh b/images/ubuntu/scripts/build/install-terraform.sh similarity index 85% rename from images/ubuntu/scripts/build/terraform.sh rename to images/ubuntu/scripts/build/install-terraform.sh index 0e8f5553713b..c2da2d631edc 100644 --- a/images/ubuntu/scripts/build/terraform.sh +++ b/images/ubuntu/scripts/build/install-terraform.sh @@ -1,7 +1,7 @@ #!/bin/bash -e ################################################################################ -## File: terraform.sh -## Desc: Installs terraform +## File: install-terraform.sh +## Desc: Install terraform ################################################################################ source $HELPER_SCRIPTS/install.sh @@ -13,4 +13,4 @@ download_with_retries "${URL}" "/tmp" "${ZIP_NAME}" unzip -qq "/tmp/${ZIP_NAME}" -d /usr/local/bin rm -f "/tmp/${ZIP_NAME}" -invoke_tests "Tools" "Terraform" \ No newline at end of file +invoke_tests "Tools" "Terraform" diff --git a/images/ubuntu/scripts/build/vcpkg.sh b/images/ubuntu/scripts/build/install-vcpkg.sh similarity index 90% rename from images/ubuntu/scripts/build/vcpkg.sh rename to images/ubuntu/scripts/build/install-vcpkg.sh index cfc4448db170..b45447402af7 100644 --- a/images/ubuntu/scripts/build/vcpkg.sh +++ b/images/ubuntu/scripts/build/install-vcpkg.sh @@ -1,7 +1,7 @@ #!/bin/bash -e ################################################################################ -## File: vcpkg.sh -## Desc: Installs vcpkg +## File: install-vcpkg.sh +## Desc: Install vcpkg ################################################################################ # Set env variable for vcpkg @@ -24,4 +24,4 @@ ln -sf $VCPKG_INSTALLATION_ROOT/vcpkg /usr/local/bin rm -rf /root/.vcpkg $HOME/.vcpkg -invoke_tests "Tools" "Vcpkg" \ No newline at end of file +invoke_tests "Tools" "Vcpkg" diff --git a/images/ubuntu/scripts/build/yq.sh b/images/ubuntu/scripts/build/install-yq.sh similarity index 93% rename from images/ubuntu/scripts/build/yq.sh rename to images/ubuntu/scripts/build/install-yq.sh index fa1192c2e101..677a84cb42a6 100644 --- a/images/ubuntu/scripts/build/yq.sh +++ b/images/ubuntu/scripts/build/install-yq.sh @@ -1,7 +1,7 @@ #!/bin/bash -e ################################################################################ -## File: yq.sh -## Desc: Installs YQ +## File: install-yq.sh +## Desc: Install YQ ## Supply chain security: YQ - checksum validation ################################################################################ diff --git a/images/ubuntu/scripts/build/zstd.sh b/images/ubuntu/scripts/build/install-zstd.sh similarity index 96% rename from images/ubuntu/scripts/build/zstd.sh rename to images/ubuntu/scripts/build/install-zstd.sh index ebd8df860dae..9c3b6c593265 100644 --- a/images/ubuntu/scripts/build/zstd.sh +++ b/images/ubuntu/scripts/build/install-zstd.sh @@ -1,7 +1,7 @@ #!/bin/bash -e ################################################################################ -## File: zstd.sh -## Desc: Installs zstd +## File: install-zstd.sh +## Desc: Install zstd ## Supply chain security: zstd - checksum validation ################################################################################ diff --git a/images/ubuntu/scripts/build/reboot.sh b/images/ubuntu/scripts/build/reboot.sh deleted file mode 100644 index d1bdf7eeb7b7..000000000000 --- a/images/ubuntu/scripts/build/reboot.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -e -################################################################################ -## File: reboot.sh -## Desc: Reboot VM -################################################################################ - -echo "Reboot VM" -sudo reboot diff --git a/images/ubuntu/scripts/build/sphinx.sh b/images/ubuntu/scripts/build/sphinx.sh deleted file mode 100644 index d81d9303fd87..000000000000 --- a/images/ubuntu/scripts/build/sphinx.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash -e -################################################################################ -## File: sphinx.sh -## Desc: Installs Sphinx -################################################################################ - - -# Install Sphinx -apt-get install -y sphinxsearch - -invoke_tests "Tools" "Sphinx" \ No newline at end of file diff --git a/images/ubuntu/scripts/build/validate-disk-space.sh b/images/ubuntu/scripts/build/validate-disk-space.sh deleted file mode 100644 index 94962630b06e..000000000000 --- a/images/ubuntu/scripts/build/validate-disk-space.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash -e -################################################################################ -## File: validate-disk-space.sh -## Desc: Validate free disk space -################################################################################ - -availableSpaceMB=$(df / -hm | sed 1d | awk '{ print $4}') -minimumFreeSpaceMB=15000 - -echo "Available disk space: $availableSpaceMB MB" - -if [ $RUN_VALIDATION != "true" ]; then - echo "Skipping validation disk space..." - exit 0 -fi - -if [ $availableSpaceMB -le $minimumFreeSpaceMB ]; then - echo "Not enough disk space on the image (minimum available space: $minimumFreeSpaceMB MB)" - exit 1 -fi diff --git a/images/ubuntu/scripts/docs-gen/SoftwareReport.Generator.ps1 b/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 similarity index 99% rename from images/ubuntu/scripts/docs-gen/SoftwareReport.Generator.ps1 rename to images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 index 0aef771b6c04..d3a7b64f421e 100644 --- a/images/ubuntu/scripts/docs-gen/SoftwareReport.Generator.ps1 +++ b/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 @@ -15,7 +15,7 @@ Import-Module (Join-Path $PSScriptRoot "SoftwareReport.Browsers.psm1") -DisableN Import-Module (Join-Path $PSScriptRoot "SoftwareReport.CachedTools.psm1") -DisableNameChecking Import-Module (Join-Path $PSScriptRoot "SoftwareReport.Common.psm1") -DisableNameChecking Import-Module (Join-Path $PSScriptRoot "SoftwareReport.Databases.psm1") -DisableNameChecking -Import-Module "$PSScriptRoot/../helpers/SoftwareReport.Helpers.psm1" -DisableNameChecking +Import-Module (Join-Path $PSScriptRoot "SoftwareReport.Helpers.psm1") -DisableNameChecking Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" -DisableNameChecking Import-Module (Join-Path $PSScriptRoot "SoftwareReport.Java.psm1") -DisableNameChecking Import-Module (Join-Path $PSScriptRoot "SoftwareReport.Rust.psm1") -DisableNameChecking diff --git a/images/ubuntu/scripts/helpers/SoftwareReport.Helpers.psm1 b/images/ubuntu/scripts/docs-gen/SoftwareReport.Helpers.psm1 similarity index 100% rename from images/ubuntu/scripts/helpers/SoftwareReport.Helpers.psm1 rename to images/ubuntu/scripts/docs-gen/SoftwareReport.Helpers.psm1 diff --git a/images/ubuntu/scripts/helpers/invoke-tests.sh b/images/ubuntu/scripts/helpers/invoke-tests.sh index 8aac32ebb2c7..7bef3c4d9494 100644 --- a/images/ubuntu/scripts/helpers/invoke-tests.sh +++ b/images/ubuntu/scripts/helpers/invoke-tests.sh @@ -4,5 +4,5 @@ ## Desc: Helper function for invoking tests ################################################################################ -pwsh -Command "Import-Module '$HELPER_SCRIPTS/Tests.Helpers.psm1' -DisableNameChecking +pwsh -Command "Import-Module '$HELPER_SCRIPTS/../tests/Helpers.psm1' -DisableNameChecking Invoke-PesterTests -TestFile \"$1\" -TestName \"$2\"" diff --git a/images/ubuntu/scripts/helpers/os.sh b/images/ubuntu/scripts/helpers/os.sh index 26827fae9062..894ee025a8d5 100644 --- a/images/ubuntu/scripts/helpers/os.sh +++ b/images/ubuntu/scripts/helpers/os.sh @@ -1,7 +1,7 @@ #!/bin/bash -e ################################################################################ -## File: install-helpers.sh -## Desc: Helper functions for installing tools +## File: os.sh +## Desc: Helper functions for OS releases ################################################################################ function isUbuntu20 @@ -17,4 +17,4 @@ function isUbuntu22 function getOSVersionLabel { lsb_release -cs -} \ No newline at end of file +} diff --git a/images/ubuntu/scripts/helpers/Tests.Helpers.psm1 b/images/ubuntu/scripts/tests/Helpers.psm1 similarity index 100% rename from images/ubuntu/scripts/helpers/Tests.Helpers.psm1 rename to images/ubuntu/scripts/tests/Helpers.psm1 diff --git a/images/ubuntu/scripts/tests/RunAll-Tests.ps1 b/images/ubuntu/scripts/tests/RunAll-Tests.ps1 index 015491cd2c79..7ac546087c47 100644 --- a/images/ubuntu/scripts/tests/RunAll-Tests.ps1 +++ b/images/ubuntu/scripts/tests/RunAll-Tests.ps1 @@ -1,3 +1,3 @@ -Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1" -DisableNameChecking +Import-Module "$PSScriptRoot/Helpers.psm1" -DisableNameChecking -Invoke-PesterTests "*" \ No newline at end of file +Invoke-PesterTests "*" diff --git a/images/ubuntu/scripts/tests/System.Tests.ps1 b/images/ubuntu/scripts/tests/System.Tests.ps1 new file mode 100644 index 000000000000..333db232d692 --- /dev/null +++ b/images/ubuntu/scripts/tests/System.Tests.ps1 @@ -0,0 +1,6 @@ +Describe "Disk free space" { + It "Image has more than 15GB free space" { + $freeSpace = (Get-PSDrive "/").Free + $freeSpace | Should -BeGreaterOrEqual 15GB + } +} diff --git a/images/ubuntu/templates/ubuntu-20.04.json b/images/ubuntu/templates/ubuntu-20.04.json index 2d00e0765983..e1d36d398b74 100644 --- a/images/ubuntu/templates/ubuntu-20.04.json +++ b/images/ubuntu/templates/ubuntu-20.04.json @@ -22,7 +22,6 @@ "managed_image_name": "packer-ubuntu20-dev", "image_version": "dev", "image_os": "ubuntu20", - "run_validation_diskspace": "false", "dockerhub_login": "{{env `DOCKERHUB_LOGIN`}}", "dockerhub_password": "{{env `DOCKERHUB_PASSWORD`}}" }, @@ -66,15 +65,15 @@ }, { "type": "shell", - "script": "{{template_dir}}/../scripts/build/apt-mock.sh", + "script": "{{template_dir}}/../scripts/build/configure-apt-mock.sh", "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" }, { "type": "shell", "scripts": [ - "{{template_dir}}/../scripts/build/repos.sh", - "{{template_dir}}/../scripts/build/apt-ubuntu-archive.sh", - "{{template_dir}}/../scripts/build/apt.sh" + "{{template_dir}}/../scripts/build/install-ms-repos.sh", + "{{template_dir}}/../scripts/build/configure-apt-sources.sh", + "{{template_dir}}/../scripts/build/configure-apt.sh" ], "environment_vars": [ "DEBIAN_FRONTEND=noninteractive" @@ -83,7 +82,7 @@ }, { "type": "shell", - "script": "{{template_dir}}/../scripts/build/limits.sh", + "script": "{{template_dir}}/../scripts/build/configure-limits.sh", "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" }, { @@ -126,7 +125,7 @@ { "type": "shell", "scripts": [ - "{{template_dir}}/../scripts/build/preimagedata.sh" + "{{template_dir}}/../scripts/build/configure-image-data.sh" ], "environment_vars": [ "IMAGE_VERSION={{user `image_version`}}", @@ -149,7 +148,7 @@ { "type": "shell", "scripts": [ - "{{template_dir}}/../scripts/build/apt-vital.sh" + "{{template_dir}}/../scripts/build/install-apt-vital.sh" ], "environment_vars": [ "HELPER_SCRIPTS={{user `helper_script_folder`}}", @@ -161,8 +160,7 @@ { "type": "shell", "scripts": [ - "{{template_dir}}/../scripts/build/complete-snap-setup.sh", - "{{template_dir}}/../scripts/build/powershellcore.sh" + "{{template_dir}}/../scripts/build/install-powershell.sh" ], "environment_vars": [ "HELPER_SCRIPTS={{user `helper_script_folder`}}" @@ -173,7 +171,7 @@ "type": "shell", "scripts": [ "{{template_dir}}/../scripts/build/Install-PowerShellModules.ps1", - "{{template_dir}}/../scripts/build/Install-AzureModules.ps1" + "{{template_dir}}/../scripts/build/Install-PowerShellAzModules.ps1" ], "environment_vars": [ "HELPER_SCRIPTS={{user `helper_script_folder`}}", @@ -184,70 +182,70 @@ { "type": "shell", "scripts": [ - "{{template_dir}}/../scripts/build/action-archive-cache.sh", - "{{template_dir}}/../scripts/build/runner-package.sh", - "{{template_dir}}/../scripts/build/apt-common.sh", - "{{template_dir}}/../scripts/build/azcopy.sh", - "{{template_dir}}/../scripts/build/azure-cli.sh", - "{{template_dir}}/../scripts/build/azure-devops-cli.sh", - "{{template_dir}}/../scripts/build/bicep.sh", - "{{template_dir}}/../scripts/build/aliyun-cli.sh", - "{{template_dir}}/../scripts/build/apache.sh", - "{{template_dir}}/../scripts/build/aws.sh", - "{{template_dir}}/../scripts/build/clang.sh", - "{{template_dir}}/../scripts/build/swift.sh", - "{{template_dir}}/../scripts/build/cmake.sh", - "{{template_dir}}/../scripts/build/codeql-bundle.sh", - "{{template_dir}}/../scripts/build/containers.sh", - "{{template_dir}}/../scripts/build/dotnetcore-sdk.sh", - "{{template_dir}}/../scripts/build/erlang.sh", - "{{template_dir}}/../scripts/build/firefox.sh", - "{{template_dir}}/../scripts/build/microsoft-edge.sh", - "{{template_dir}}/../scripts/build/gcc.sh", - "{{template_dir}}/../scripts/build/gfortran.sh", - "{{template_dir}}/../scripts/build/git.sh", - "{{template_dir}}/../scripts/build/git-lfs.sh", - "{{template_dir}}/../scripts/build/github-cli.sh", - "{{template_dir}}/../scripts/build/google-chrome.sh", - "{{template_dir}}/../scripts/build/google-cloud-cli.sh", - "{{template_dir}}/../scripts/build/haskell.sh", - "{{template_dir}}/../scripts/build/heroku.sh", - "{{template_dir}}/../scripts/build/hhvm.sh", - "{{template_dir}}/../scripts/build/java-tools.sh", - "{{template_dir}}/../scripts/build/kubernetes-tools.sh", - "{{template_dir}}/../scripts/build/oc.sh", - "{{template_dir}}/../scripts/build/leiningen.sh", - "{{template_dir}}/../scripts/build/miniconda.sh", - "{{template_dir}}/../scripts/build/mono.sh", - "{{template_dir}}/../scripts/build/kotlin.sh", - "{{template_dir}}/../scripts/build/mysql.sh", - "{{template_dir}}/../scripts/build/mssql-cmd-tools.sh", - "{{template_dir}}/../scripts/build/sqlpackage.sh", - "{{template_dir}}/../scripts/build/nginx.sh", - "{{template_dir}}/../scripts/build/nvm.sh", - "{{template_dir}}/../scripts/build/nodejs.sh", - "{{template_dir}}/../scripts/build/bazel.sh", - "{{template_dir}}/../scripts/build/oras-cli.sh", - "{{template_dir}}/../scripts/build/phantomjs.sh", - "{{template_dir}}/../scripts/build/php.sh", - "{{template_dir}}/../scripts/build/postgresql.sh", - "{{template_dir}}/../scripts/build/pulumi.sh", - "{{template_dir}}/../scripts/build/ruby.sh", - "{{template_dir}}/../scripts/build/r.sh", - "{{template_dir}}/../scripts/build/rust.sh", - "{{template_dir}}/../scripts/build/julia.sh", - "{{template_dir}}/../scripts/build/sbt.sh", - "{{template_dir}}/../scripts/build/selenium.sh", - "{{template_dir}}/../scripts/build/terraform.sh", - "{{template_dir}}/../scripts/build/packer.sh", - "{{template_dir}}/../scripts/build/vcpkg.sh", - "{{template_dir}}/../scripts/build/dpkg-config.sh", - "{{template_dir}}/../scripts/build/mongodb.sh", - "{{template_dir}}/../scripts/build/yq.sh", - "{{template_dir}}/../scripts/build/android.sh", - "{{template_dir}}/../scripts/build/pypy.sh", - "{{template_dir}}/../scripts/build/python.sh", - "{{template_dir}}/../scripts/build/zstd.sh" + "{{template_dir}}/../scripts/build/install-actions-cache.sh", + "{{template_dir}}/../scripts/build/install-runner-package.sh", + "{{template_dir}}/../scripts/build/install-apt-common.sh", + "{{template_dir}}/../scripts/build/install-azcopy.sh", + "{{template_dir}}/../scripts/build/install-azure-cli.sh", + "{{template_dir}}/../scripts/build/install-azure-devops-cli.sh", + "{{template_dir}}/../scripts/build/install-bicep.sh", + "{{template_dir}}/../scripts/build/install-aliyun-cli.sh", + "{{template_dir}}/../scripts/build/install-apache.sh", + "{{template_dir}}/../scripts/build/install-aws-tools.sh", + "{{template_dir}}/../scripts/build/install-clang.sh", + "{{template_dir}}/../scripts/build/install-swift.sh", + "{{template_dir}}/../scripts/build/install-cmake.sh", + "{{template_dir}}/../scripts/build/install-codeql-bundle.sh", + "{{template_dir}}/../scripts/build/install-container-tools.sh", + "{{template_dir}}/../scripts/build/install-dotnetcore-sdk.sh", + "{{template_dir}}/../scripts/build/install-erlang.sh", + "{{template_dir}}/../scripts/build/install-firefox.sh", + "{{template_dir}}/../scripts/build/install-microsoft-edge.sh", + "{{template_dir}}/../scripts/build/install-gcc-compilers.sh", + "{{template_dir}}/../scripts/build/install-gfortran.sh", + "{{template_dir}}/../scripts/build/install-git.sh", + "{{template_dir}}/../scripts/build/install-git-lfs.sh", + "{{template_dir}}/../scripts/build/install-github-cli.sh", + "{{template_dir}}/../scripts/build/install-google-chrome.sh", + "{{template_dir}}/../scripts/build/install-google-cloud-cli.sh", + "{{template_dir}}/../scripts/build/install-haskell.sh", + "{{template_dir}}/../scripts/build/install-heroku.sh", + "{{template_dir}}/../scripts/build/install-hhvm.sh", + "{{template_dir}}/../scripts/build/install-java-tools.sh", + "{{template_dir}}/../scripts/build/install-kubernetes-tools.sh", + "{{template_dir}}/../scripts/build/install-oc-cli.sh", + "{{template_dir}}/../scripts/build/install-leiningen.sh", + "{{template_dir}}/../scripts/build/install-miniconda.sh", + "{{template_dir}}/../scripts/build/install-mono.sh", + "{{template_dir}}/../scripts/build/install-kotlin.sh", + "{{template_dir}}/../scripts/build/install-mysql.sh", + "{{template_dir}}/../scripts/build/install-mssql-tools.sh", + "{{template_dir}}/../scripts/build/install-sqlpackage.sh", + "{{template_dir}}/../scripts/build/install-nginx.sh", + "{{template_dir}}/../scripts/build/install-nvm.sh", + "{{template_dir}}/../scripts/build/install-nodejs.sh", + "{{template_dir}}/../scripts/build/install-bazel.sh", + "{{template_dir}}/../scripts/build/install-oras-cli.sh", + "{{template_dir}}/../scripts/build/install-phantomjs.sh", + "{{template_dir}}/../scripts/build/install-php.sh", + "{{template_dir}}/../scripts/build/install-postgresql.sh", + "{{template_dir}}/../scripts/build/install-pulumi.sh", + "{{template_dir}}/../scripts/build/install-ruby.sh", + "{{template_dir}}/../scripts/build/install-rlang.sh", + "{{template_dir}}/../scripts/build/install-rust.sh", + "{{template_dir}}/../scripts/build/install-julia.sh", + "{{template_dir}}/../scripts/build/install-sbt.sh", + "{{template_dir}}/../scripts/build/install-selenium.sh", + "{{template_dir}}/../scripts/build/install-terraform.sh", + "{{template_dir}}/../scripts/build/install-packer.sh", + "{{template_dir}}/../scripts/build/install-vcpkg.sh", + "{{template_dir}}/../scripts/build/configure-dpkg.sh", + "{{template_dir}}/../scripts/build/install-mongodb.sh", + "{{template_dir}}/../scripts/build/install-yq.sh", + "{{template_dir}}/../scripts/build/install-android-sdk.sh", + "{{template_dir}}/../scripts/build/install-pypy.sh", + "{{template_dir}}/../scripts/build/install-python.sh", + "{{template_dir}}/../scripts/build/install-zstd.sh" ], "environment_vars": [ "HELPER_SCRIPTS={{user `helper_script_folder`}}", @@ -259,8 +257,8 @@ { "type": "shell", "scripts": [ - "{{template_dir}}/../scripts/build/docker-compose.sh", - "{{template_dir}}/../scripts/build/docker.sh" + "{{template_dir}}/../scripts/build/install-docker-compose.sh", + "{{template_dir}}/../scripts/build/install-docker.sh" ], "environment_vars": [ "HELPER_SCRIPTS={{user `helper_script_folder`}}", @@ -285,7 +283,7 @@ { "type": "shell", "scripts": [ - "{{template_dir}}/../scripts/build/pipx-packages.sh" + "{{template_dir}}/../scripts/build/install-pipx-packages.sh" ], "environment_vars": [ "HELPER_SCRIPTS={{user `helper_script_folder`}}", @@ -296,7 +294,7 @@ { "type": "shell", "scripts": [ - "{{template_dir}}/../scripts/build/homebrew.sh" + "{{template_dir}}/../scripts/build/install-homebrew.sh" ], "environment_vars": [ "HELPER_SCRIPTS={{user `helper_script_folder`}}", @@ -307,16 +305,22 @@ }, { "type": "shell", - "script": "{{template_dir}}/../scripts/build/snap.sh", + "scripts": [ + "{{template_dir}}/../scripts/build/configure-snap.sh" + ], + "environment_vars": [ + "HELPER_SCRIPTS={{user `helper_script_folder`}}" + ], "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" }, { "type": "shell", "expect_disconnect": true, - "scripts": [ - "{{template_dir}}/../scripts/build/reboot.sh" + "inline": [ + "echo 'Reboot VM'", + "sudo reboot" ], - "execute_command": "/bin/sh -c '{{ .Vars }} {{ .Path }}'" + "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" }, { "type": "shell", @@ -327,18 +331,13 @@ ], "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" }, - { - "type": "shell", - "script": "{{template_dir}}/../scripts/build/apt-mock-remove.sh", - "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" - }, { "type": "shell", "max_retries": 3, "start_retry_timeout": "2m", "inline": [ - "pwsh -Command Write-Host Running SoftwareReport.Generator.ps1 script", - "pwsh -File {{user `image_folder`}}/SoftwareReport/SoftwareReport.Generator.ps1 -OutputDirectory {{user `image_folder`}}", + "pwsh -Command Write-Host Running Generate-SoftwareReport.ps1 script", + "pwsh -File {{user `image_folder`}}/SoftwareReport/Generate-SoftwareReport.ps1 -OutputDirectory {{user `image_folder`}}", "pwsh -Command Write-Host Running RunAll-Tests.ps1 script", "pwsh -File {{user `image_folder`}}/tests/RunAll-Tests.ps1 -OutputDirectory {{user `image_folder`}}" ], @@ -362,7 +361,7 @@ { "type": "shell", "scripts":[ - "{{template_dir}}/../scripts/build/post-deployment.sh" + "{{template_dir}}/../scripts/build/configure-system.sh" ], "environment_vars":[ "HELPER_SCRIPT_FOLDER={{user `helper_script_folder`}}", @@ -371,15 +370,6 @@ ], "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" }, - { - "type": "shell", - "scripts":[ - "{{template_dir}}/../scripts/build/validate-disk-space.sh" - ], - "environment_vars": [ - "RUN_VALIDATION={{user `run_validation_diskspace`}}" - ] - }, { "type": "file", "source": "{{template_dir}}/../assets/ubuntu2004.conf", diff --git a/images/ubuntu/templates/ubuntu-22.04.pkr.hcl b/images/ubuntu/templates/ubuntu-22.04.pkr.hcl index ecf121d30853..45aa217f5377 100644 --- a/images/ubuntu/templates/ubuntu-22.04.pkr.hcl +++ b/images/ubuntu/templates/ubuntu-22.04.pkr.hcl @@ -103,11 +103,6 @@ variable "managed_image_resource_group_name" { default = "${env("ARM_RESOURCE_GROUP")}" } -variable "run_validation_diskspace" { - type = bool - default = false -} - variable "subscription_id" { type = string default = "${env("ARM_SUBSCRIPTION_ID")}" @@ -185,22 +180,22 @@ build { provisioner "shell" { execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" - script = "${path.root}/../scripts/build/apt-mock.sh" + script = "${path.root}/../scripts/build/configure-apt-mock.sh" } provisioner "shell" { environment_vars = ["DEBIAN_FRONTEND=noninteractive"] execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" scripts = [ - "${path.root}/../scripts/build/repos.sh", - "${path.root}/../scripts/build/apt-ubuntu-archive.sh", - "${path.root}/../scripts/build/apt.sh" + "${path.root}/../scripts/build/install-ms-repos.sh", + "${path.root}/../scripts/build/configure-apt-sources.sh", + "${path.root}/../scripts/build/configure-apt.sh" ] } provisioner "shell" { execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" - script = "${path.root}/../scripts/build/limits.sh" + script = "${path.root}/../scripts/build/configure-limits.sh" } provisioner "file" { @@ -243,7 +238,7 @@ build { provisioner "shell" { environment_vars = ["IMAGE_VERSION=${var.image_version}", "IMAGEDATA_FILE=${var.imagedata_file}"] execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" - scripts = ["${path.root}/../scripts/build/preimagedata.sh"] + scripts = ["${path.root}/../scripts/build/configure-image-data.sh"] } provisioner "shell" { @@ -255,92 +250,92 @@ build { provisioner "shell" { environment_vars = ["DEBIAN_FRONTEND=noninteractive", "HELPER_SCRIPTS=${var.helper_script_folder}", "INSTALLER_SCRIPT_FOLDER=${var.installer_script_folder}"] execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" - scripts = ["${path.root}/../scripts/build/apt-vital.sh"] + scripts = ["${path.root}/../scripts/build/install-apt-vital.sh"] } provisioner "shell" { environment_vars = ["HELPER_SCRIPTS=${var.helper_script_folder}"] execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" - scripts = ["${path.root}/../scripts/build/complete-snap-setup.sh", "${path.root}/../scripts/build/powershellcore.sh"] + scripts = ["${path.root}/../scripts/build/install-powershell.sh"] } provisioner "shell" { environment_vars = ["HELPER_SCRIPTS=${var.helper_script_folder}", "INSTALLER_SCRIPT_FOLDER=${var.installer_script_folder}"] execute_command = "sudo sh -c '{{ .Vars }} pwsh -f {{ .Path }}'" - scripts = ["${path.root}/../scripts/build/Install-PowerShellModules.ps1", "${path.root}/../scripts/build/Install-AzureModules.ps1"] + scripts = ["${path.root}/../scripts/build/Install-PowerShellModules.ps1", "${path.root}/../scripts/build/Install-PowerShellAzModules.ps1"] } provisioner "shell" { environment_vars = ["HELPER_SCRIPTS=${var.helper_script_folder}", "INSTALLER_SCRIPT_FOLDER=${var.installer_script_folder}", "DEBIAN_FRONTEND=noninteractive"] execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" scripts = [ - "${path.root}/../scripts/build/action-archive-cache.sh", - "${path.root}/../scripts/build/runner-package.sh", - "${path.root}/../scripts/build/apt-common.sh", - "${path.root}/../scripts/build/azcopy.sh", - "${path.root}/../scripts/build/azure-cli.sh", - "${path.root}/../scripts/build/azure-devops-cli.sh", - "${path.root}/../scripts/build/bicep.sh", - "${path.root}/../scripts/build/aliyun-cli.sh", - "${path.root}/../scripts/build/apache.sh", - "${path.root}/../scripts/build/aws.sh", - "${path.root}/../scripts/build/clang.sh", - "${path.root}/../scripts/build/swift.sh", - "${path.root}/../scripts/build/cmake.sh", - "${path.root}/../scripts/build/codeql-bundle.sh", - "${path.root}/../scripts/build/containers.sh", - "${path.root}/../scripts/build/dotnetcore-sdk.sh", - "${path.root}/../scripts/build/firefox.sh", - "${path.root}/../scripts/build/microsoft-edge.sh", - "${path.root}/../scripts/build/gcc.sh", - "${path.root}/../scripts/build/gfortran.sh", - "${path.root}/../scripts/build/git.sh", - "${path.root}/../scripts/build/git-lfs.sh", - "${path.root}/../scripts/build/github-cli.sh", - "${path.root}/../scripts/build/google-chrome.sh", - "${path.root}/../scripts/build/google-cloud-cli.sh", - "${path.root}/../scripts/build/haskell.sh", - "${path.root}/../scripts/build/heroku.sh", - "${path.root}/../scripts/build/java-tools.sh", - "${path.root}/../scripts/build/kubernetes-tools.sh", - "${path.root}/../scripts/build/oc.sh", - "${path.root}/../scripts/build/leiningen.sh", - "${path.root}/../scripts/build/miniconda.sh", - "${path.root}/../scripts/build/mono.sh", - "${path.root}/../scripts/build/kotlin.sh", - "${path.root}/../scripts/build/mysql.sh", - "${path.root}/../scripts/build/mssql-cmd-tools.sh", - "${path.root}/../scripts/build/sqlpackage.sh", - "${path.root}/../scripts/build/nginx.sh", - "${path.root}/../scripts/build/nvm.sh", - "${path.root}/../scripts/build/nodejs.sh", - "${path.root}/../scripts/build/bazel.sh", - "${path.root}/../scripts/build/oras-cli.sh", - "${path.root}/../scripts/build/php.sh", - "${path.root}/../scripts/build/postgresql.sh", - "${path.root}/../scripts/build/pulumi.sh", - "${path.root}/../scripts/build/ruby.sh", - "${path.root}/../scripts/build/r.sh", - "${path.root}/../scripts/build/rust.sh", - "${path.root}/../scripts/build/julia.sh", - "${path.root}/../scripts/build/sbt.sh", - "${path.root}/../scripts/build/selenium.sh", - "${path.root}/../scripts/build/terraform.sh", - "${path.root}/../scripts/build/packer.sh", - "${path.root}/../scripts/build/vcpkg.sh", - "${path.root}/../scripts/build/dpkg-config.sh", - "${path.root}/../scripts/build/yq.sh", - "${path.root}/../scripts/build/android.sh", - "${path.root}/../scripts/build/pypy.sh", - "${path.root}/../scripts/build/python.sh", - "${path.root}/../scripts/build/zstd.sh" + "${path.root}/../scripts/build/install-actions-cache.sh", + "${path.root}/../scripts/build/install-runner-package.sh", + "${path.root}/../scripts/build/install-apt-common.sh", + "${path.root}/../scripts/build/install-azcopy.sh", + "${path.root}/../scripts/build/install-azure-cli.sh", + "${path.root}/../scripts/build/install-azure-devops-cli.sh", + "${path.root}/../scripts/build/install-bicep.sh", + "${path.root}/../scripts/build/install-aliyun-cli.sh", + "${path.root}/../scripts/build/install-apache.sh", + "${path.root}/../scripts/build/install-aws-tools.sh", + "${path.root}/../scripts/build/install-clang.sh", + "${path.root}/../scripts/build/install-swift.sh", + "${path.root}/../scripts/build/install-cmake.sh", + "${path.root}/../scripts/build/install-codeql-bundle.sh", + "${path.root}/../scripts/build/install-container-tools.sh", + "${path.root}/../scripts/build/install-dotnetcore-sdk.sh", + "${path.root}/../scripts/build/install-firefox.sh", + "${path.root}/../scripts/build/install-microsoft-edge.sh", + "${path.root}/../scripts/build/install-gcc-compilers.sh", + "${path.root}/../scripts/build/install-gfortran.sh", + "${path.root}/../scripts/build/install-git.sh", + "${path.root}/../scripts/build/install-git-lfs.sh", + "${path.root}/../scripts/build/install-github-cli.sh", + "${path.root}/../scripts/build/install-google-chrome.sh", + "${path.root}/../scripts/build/install-google-cloud-cli.sh", + "${path.root}/../scripts/build/install-haskell.sh", + "${path.root}/../scripts/build/install-heroku.sh", + "${path.root}/../scripts/build/install-java-tools.sh", + "${path.root}/../scripts/build/install-kubernetes-tools.sh", + "${path.root}/../scripts/build/install-oc-cli.sh", + "${path.root}/../scripts/build/install-leiningen.sh", + "${path.root}/../scripts/build/install-miniconda.sh", + "${path.root}/../scripts/build/install-mono.sh", + "${path.root}/../scripts/build/install-kotlin.sh", + "${path.root}/../scripts/build/install-mysql.sh", + "${path.root}/../scripts/build/install-mssql-tools.sh", + "${path.root}/../scripts/build/install-sqlpackage.sh", + "${path.root}/../scripts/build/install-nginx.sh", + "${path.root}/../scripts/build/install-nvm.sh", + "${path.root}/../scripts/build/install-nodejs.sh", + "${path.root}/../scripts/build/install-bazel.sh", + "${path.root}/../scripts/build/install-oras-cli.sh", + "${path.root}/../scripts/build/install-php.sh", + "${path.root}/../scripts/build/install-postgresql.sh", + "${path.root}/../scripts/build/install-pulumi.sh", + "${path.root}/../scripts/build/install-ruby.sh", + "${path.root}/../scripts/build/install-rlang.sh", + "${path.root}/../scripts/build/install-rust.sh", + "${path.root}/../scripts/build/install-julia.sh", + "${path.root}/../scripts/build/install-sbt.sh", + "${path.root}/../scripts/build/install-selenium.sh", + "${path.root}/../scripts/build/install-terraform.sh", + "${path.root}/../scripts/build/install-packer.sh", + "${path.root}/../scripts/build/install-vcpkg.sh", + "${path.root}/../scripts/build/configure-dpkg.sh", + "${path.root}/../scripts/build/install-yq.sh", + "${path.root}/../scripts/build/install-android-sdk.sh", + "${path.root}/../scripts/build/install-pypy.sh", + "${path.root}/../scripts/build/install-python.sh", + "${path.root}/../scripts/build/install-zstd.sh" ] } provisioner "shell" { environment_vars = ["HELPER_SCRIPTS=${var.helper_script_folder}", "INSTALLER_SCRIPT_FOLDER=${var.installer_script_folder}", "DOCKERHUB_LOGIN=${var.dockerhub_login}", "DOCKERHUB_PASSWORD=${var.dockerhub_password}"] execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" - scripts = ["${path.root}/../scripts/build/docker-compose.sh", "${path.root}/../scripts/build/docker.sh"] + scripts = ["${path.root}/../scripts/build/install-docker-compose.sh", "${path.root}/../scripts/build/install-docker.sh"] } provisioner "shell" { @@ -352,24 +347,25 @@ build { provisioner "shell" { environment_vars = ["HELPER_SCRIPTS=${var.helper_script_folder}", "INSTALLER_SCRIPT_FOLDER=${var.installer_script_folder}"] execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" - scripts = ["${path.root}/../scripts/build/pipx-packages.sh"] + scripts = ["${path.root}/../scripts/build/install-pipx-packages.sh"] } provisioner "shell" { environment_vars = ["HELPER_SCRIPTS=${var.helper_script_folder}", "DEBIAN_FRONTEND=noninteractive", "INSTALLER_SCRIPT_FOLDER=${var.installer_script_folder}"] execute_command = "/bin/sh -c '{{ .Vars }} {{ .Path }}'" - scripts = ["${path.root}/../scripts/build/homebrew.sh"] + scripts = ["${path.root}/../scripts/build/install-homebrew.sh"] } provisioner "shell" { - execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" - script = "${path.root}/../scripts/build/snap.sh" + environment_vars = ["HELPER_SCRIPTS=${var.helper_script_folder}"] + execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" + scripts = ["${path.root}/../scripts/build/configure-snap.sh"] } provisioner "shell" { - execute_command = "/bin/sh -c '{{ .Vars }} {{ .Path }}'" + execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" expect_disconnect = true - scripts = ["${path.root}/../scripts/build/reboot.sh"] + inline = ["echo 'Reboot VM'", "sudo reboot"] } provisioner "shell" { @@ -379,14 +375,9 @@ build { start_retry_timeout = "10m" } - provisioner "shell" { - execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" - script = "${path.root}/../scripts/build/apt-mock-remove.sh" - } - provisioner "shell" { environment_vars = ["IMAGE_VERSION=${var.image_version}", "INSTALLER_SCRIPT_FOLDER=${var.installer_script_folder}"] - inline = ["pwsh -File ${var.image_folder}/SoftwareReport/SoftwareReport.Generator.ps1 -OutputDirectory ${var.image_folder}", "pwsh -File ${var.image_folder}/tests/RunAll-Tests.ps1 -OutputDirectory ${var.image_folder}"] + inline = ["pwsh -File ${var.image_folder}/SoftwareReport/Generate-SoftwareReport.ps1 -OutputDirectory ${var.image_folder}", "pwsh -File ${var.image_folder}/tests/RunAll-Tests.ps1 -OutputDirectory ${var.image_folder}"] } provisioner "file" { @@ -404,12 +395,7 @@ build { provisioner "shell" { environment_vars = ["HELPER_SCRIPT_FOLDER=${var.helper_script_folder}", "INSTALLER_SCRIPT_FOLDER=${var.installer_script_folder}", "IMAGE_FOLDER=${var.image_folder}"] execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" - scripts = ["${path.root}/../scripts/build/post-deployment.sh"] - } - - provisioner "shell" { - environment_vars = ["RUN_VALIDATION=${var.run_validation_diskspace}"] - scripts = ["${path.root}/../scripts/build/validate-disk-space.sh"] + scripts = ["${path.root}/../scripts/build/configure-system.sh"] } provisioner "file" { diff --git a/images/ubuntu/templates/ubuntu-minimal.pkr.hcl b/images/ubuntu/templates/ubuntu-minimal.pkr.hcl index 9ccc6202403d..8eeaa7335127 100644 --- a/images/ubuntu/templates/ubuntu-minimal.pkr.hcl +++ b/images/ubuntu/templates/ubuntu-minimal.pkr.hcl @@ -77,11 +77,6 @@ variable "managed_image_resource_group_name" { default = "${env("ARM_RESOURCE_GROUP")}" } -variable "run_validation_diskspace" { - type = bool - default = false -} - variable "subscription_id" { type = string default = "${env("ARM_SUBSCRIPTION_ID")}" @@ -174,7 +169,7 @@ build { // Add apt wrapper to implement retries provisioner "shell" { execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" - script = "${path.root}/../scripts/build/apt-mock.sh" + script = "${path.root}/../scripts/build/configure-apt-mock.sh" } // Install MS package repos, Configure apt @@ -182,15 +177,15 @@ build { environment_vars = ["DEBIAN_FRONTEND=noninteractive"] execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" scripts = [ - "${path.root}/../scripts/build/repos.sh", - "${path.root}/../scripts/build/apt.sh" + "${path.root}/../scripts/build/install-ms-repos.sh", + "${path.root}/../scripts/build/configure-apt.sh" ] } // Configure limits provisioner "shell" { execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" - script = "${path.root}/../scripts/build/limits.sh" + script = "${path.root}/../scripts/build/configure-limits.sh" } provisioner "file" { @@ -225,7 +220,7 @@ build { provisioner "shell" { environment_vars = ["IMAGE_VERSION=${var.image_version}", "IMAGEDATA_FILE=${local.imagedata_file}"] execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" - scripts = ["${path.root}/../scripts/build/preimagedata.sh"] + scripts = ["${path.root}/../scripts/build/configure-image-data.sh"] } // Create /etc/environment, configure waagent etc. @@ -238,13 +233,13 @@ build { provisioner "shell" { environment_vars = ["DEBIAN_FRONTEND=noninteractive", "HELPER_SCRIPTS=${local.helper_script_folder}", "INSTALLER_SCRIPT_FOLDER=${local.installer_script_folder}"] execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" - scripts = ["${path.root}/../scripts/build/apt-vital.sh"] + scripts = ["${path.root}/../scripts/build/install-apt-vital.sh"] } provisioner "shell" { environment_vars = ["DEBIAN_FRONTEND=noninteractive", "HELPER_SCRIPTS=${local.helper_script_folder}"] execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" - scripts = ["${path.root}/../scripts/build/powershellcore.sh"] + scripts = ["${path.root}/../scripts/build/install-powershell.sh"] } provisioner "shell" { @@ -257,17 +252,17 @@ build { environment_vars = ["DEBIAN_FRONTEND=noninteractive", "HELPER_SCRIPTS=${local.helper_script_folder}", "INSTALLER_SCRIPT_FOLDER=${local.installer_script_folder}"] execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" scripts = [ - "${path.root}/../scripts/build/git.sh", - "${path.root}/../scripts/build/git-lfs.sh", - "${path.root}/../scripts/build/github-cli.sh", - "${path.root}/../scripts/build/zstd.sh" + "${path.root}/../scripts/build/install-git.sh", + "${path.root}/../scripts/build/install-git-lfs.sh", + "${path.root}/../scripts/build/install-github-cli.sh", + "${path.root}/../scripts/build/install-zstd.sh" ] } provisioner "shell" { - execute_command = "/bin/sh -c '{{ .Vars }} {{ .Path }}'" + execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" expect_disconnect = true - scripts = ["${path.root}/../scripts/build/reboot.sh"] + inline = ["echo 'Reboot VM'", "sudo reboot"] } provisioner "shell" { @@ -277,20 +272,10 @@ build { start_retry_timeout = "10m" } - provisioner "shell" { - execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" - script = "${path.root}/../scripts/build/apt-mock-remove.sh" - } - provisioner "shell" { environment_vars = ["HELPER_SCRIPT_FOLDER=${local.helper_script_folder}", "INSTALLER_SCRIPT_FOLDER=${local.installer_script_folder}", "IMAGE_FOLDER=${local.image_folder}"] execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" - scripts = ["${path.root}/../scripts/build/post-deployment.sh"] - } - - provisioner "shell" { - environment_vars = ["RUN_VALIDATION=${var.run_validation_diskspace}"] - scripts = ["${path.root}/../scripts/build/validate-disk-space.sh"] + scripts = ["${path.root}/../scripts/build/configure-system.sh"] } provisioner "shell" { From 1254bc94a5b09f3a5be861a2a487c2d860e8d2f5 Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Thu, 23 Nov 2023 11:58:34 +0100 Subject: [PATCH 2473/3485] [Windows] Split VSIX installation helper into two (#8872) --- .../scripts/build/Install-VSExtensions.ps1 | 2 +- images/windows/scripts/build/Install-WDK.ps1 | 3 +- .../windows/scripts/helpers/ImageHelpers.psm1 | 3 +- .../scripts/helpers/InstallHelpers.ps1 | 95 ++++++++----------- 4 files changed, 46 insertions(+), 57 deletions(-) diff --git a/images/windows/scripts/build/Install-VSExtensions.ps1 b/images/windows/scripts/build/Install-VSExtensions.ps1 index b4fad504ea9e..f33e9678c4d4 100644 --- a/images/windows/scripts/build/Install-VSExtensions.ps1 +++ b/images/windows/scripts/build/Install-VSExtensions.ps1 @@ -14,7 +14,7 @@ $vsixPackagesList | ForEach-Object { # Retrieve cdn endpoint to avoid HTTP error 429 https://github.com/actions/runner-images/issues/3074 $vsixPackage = Get-VsixExtenstionFromMarketplace -ExtensionMarketPlaceName $_ if ($vsixPackage.FileName.EndsWith(".vsix")) { - Install-VsixExtension -Url $vsixPackage.DownloadUri -Name $vsixPackage.FileName + Install-VSIXFromUrl $vsixPackage.DownloadUri } else { Install-Binary ` -Url $vsixPackage.DownloadUri ` diff --git a/images/windows/scripts/build/Install-WDK.ps1 b/images/windows/scripts/build/Install-WDK.ps1 index 1b40646a2645..a8cc89b730fc 100644 --- a/images/windows/scripts/build/Install-WDK.ps1 +++ b/images/windows/scripts/build/Install-WDK.ps1 @@ -30,7 +30,6 @@ Install-Binary -Type EXE ` -ExpectedSignature $wdkSignatureThumbprint # Need to install the VSIX to get the build targets when running VSBuild -$wdkExtensionPath = Resolve-Path -Path $wdkExtensionPath -Install-VsixExtension -FilePath $wdkExtensionPath -Name "WDK.vsix" -InstallOnly +Install-VSIXFromFile (Resolve-Path -Path $wdkExtensionPath) Invoke-PesterTests -TestFile "WDK" diff --git a/images/windows/scripts/helpers/ImageHelpers.psm1 b/images/windows/scripts/helpers/ImageHelpers.psm1 index 4435792f96a2..cf4721933f98 100644 --- a/images/windows/scripts/helpers/ImageHelpers.psm1 +++ b/images/windows/scripts/helpers/ImageHelpers.psm1 @@ -29,7 +29,8 @@ Export-ModuleMember -Function @( 'Set-SvcWithErrHandling' 'Start-DownloadWithRetry' 'Get-VsixExtenstionFromMarketplace' - 'Install-VsixExtension' + 'Install-VSIXFromFile' + 'Install-VSIXFromUrl' 'Get-VSExtensionVersion' 'Get-WinVersion' 'Test-IsWin22' diff --git a/images/windows/scripts/helpers/InstallHelpers.ps1 b/images/windows/scripts/helpers/InstallHelpers.ps1 index bf06e17e41a7..0713ed3a64ac 100644 --- a/images/windows/scripts/helpers/InstallHelpers.ps1 +++ b/images/windows/scripts/helpers/InstallHelpers.ps1 @@ -297,74 +297,63 @@ function Get-VsixExtenstionFromMarketplace { } } -function Install-VsixExtension -{ +function Install-VSIXFromFile { Param ( - [string] $Url, [Parameter(Mandatory = $true)] - [string] $Name, [string] $FilePath, - [int] $Retries = 20, - [switch] $InstallOnly + [int] $Retries = 20 ) - if (-not $InstallOnly) - { - $FilePath = Start-DownloadWithRetry -Url $Url -Name $Name - } - - $argumentList = ('/quiet', "`"$FilePath`"") - - do - { - Write-Host "Starting Install $Name..." - try - { - $installPath = ${env:ProgramFiles(x86)} - - # There are 2 types of packages at the moment - exe and vsix - if ($Name -match "vsix") - { - $process = Start-Process -FilePath "${installPath}\Microsoft Visual Studio\Installer\resources\app\ServiceHub\Services\Microsoft.VisualStudio.Setup.Service\VSIXInstaller.exe" -ArgumentList $argumentList -Wait -PassThru - } - else - { - $process = Start-Process -FilePath ${env:Temp}\$Name /Q -Wait -PassThru - } - } - catch - { - Write-Host "There is an error during $Name installation" + Write-Host "Installing VSIX from $FilePath..." + while ($True) { + $installerPath = "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\resources\app\ServiceHub\Services\Microsoft.VisualStudio.Setup.Service\VSIXInstaller.exe" + try { + $process = Start-Process ` + -FilePath $installerPath ` + -ArgumentList @('/quiet', "`"$FilePath`"") ` + -Wait -PassThru + } catch { + Write-Host "Failed to start VSIXInstaller.exe with error:" $_ exit 1 } $exitCode = $process.ExitCode - if ($exitCode -eq 0 -or $exitCode -eq 1001) # 1001 means the extension is already installed - { - Write-Host "$Name installed successfully" - } - else - { - Write-Host "Unsuccessful exit code returned by the installation process: $exitCode." - $Retries-- - if ($Retries -eq 0) { - Write-Host "The $Name couldn't be installed after 20 attempts." - exit 1 - } else { - Write-Host "Waiting 10 seconds before retrying. Retries left: $Retries" - Start-Sleep -Seconds 10 - } + if ($exitCode -eq 0) { + Write-Host "VSIX installed successfully." + break + } elseif ($exitCode -eq 1001) { + Write-Host "VSIX is already installed." + break } - } until ($exitCode -eq 0 -or $exitCode -eq 1001 -or $Retries -eq 0 ) - #Cleanup downloaded installation files - if (-not $InstallOnly) - { - Remove-Item -Force -Confirm:$false $FilePath + Write-Host "VSIX installation failed with exit code $exitCode." + + $Retries-- + if ($Retries -eq 0) { + Write-Host "VSIX installation failed after $Retries retries." + exit 1 } + + Write-Host "Waiting 10 seconds before retrying. Retries left: $Retries" + Start-Sleep -Seconds 10 + } +} + +function Install-VSIXFromUrl { + Param + ( + [Parameter(Mandatory = $true)] + [string] $Url, + [int] $Retries = 20 + ) + + $name = [System.IO.Path]::GetFileNameWithoutExtension([System.IO.Path]::GetRandomFileName()) + ".vsix" + $filePath = Start-DownloadWithRetry -Url $Url -Name $Name + Install-VSIXFromFile -FilePath $filePath -Retries $Retries + Remove-Item -Force -Confirm:$false $filePath } function Get-VSExtensionVersion From 64d5d2c1f4f1bb6ba981411618e31506a7908417 Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Thu, 23 Nov 2023 11:59:08 +0100 Subject: [PATCH 2474/3485] [Windows] Rename ToolCache path helpers (#8874) --- .../scripts/build/Configure-Toolset.ps1 | 7 +-- .../windows/scripts/helpers/ImageHelpers.psm1 | 4 +- .../scripts/helpers/InstallHelpers.ps1 | 57 ++++++++++++++----- .../windows/scripts/tests/Toolset.Tests.ps1 | 8 +-- 4 files changed, 52 insertions(+), 24 deletions(-) diff --git a/images/windows/scripts/build/Configure-Toolset.ps1 b/images/windows/scripts/build/Configure-Toolset.ps1 index 119e72325149..6babc0b81da7 100644 --- a/images/windows/scripts/build/Configure-Toolset.ps1 +++ b/images/windows/scripts/build/Configure-Toolset.ps1 @@ -55,18 +55,17 @@ foreach ($tool in $tools) { foreach ($version in $tool.versions) { Write-Host "Set $($tool.name) $version environment variable..." - $foundVersionArchPath = Get-ToolsetToolFullPath -Name $tool.name -Version $version -Arch $tool.arch + $foundVersionArchPath = Get-TCToolVersionPath -Name $tool.name -Version $version -Arch $tool.arch $envName = $toolEnvVars.variableTemplate -f $version.Split(".") [Environment]::SetEnvironmentVariable($envName, $foundVersionArchPath, "Machine") } } - if (-not ([string]::IsNullOrEmpty($tool.default))) - { + if (-not ([string]::IsNullOrEmpty($tool.default))) { Write-Host "Use $($tool.name) $($tool.default) as a system $($tool.name)..." - $toolVersionPath = Get-ToolsetToolFullPath -Name $tool.name -Version $tool.default -Arch $tool.arch + $toolVersionPath = Get-TCToolVersionPath -Name $tool.name -Version $tool.default -Arch $tool.arch Set-DefaultVariables -ToolVersionPath $toolVersionPath -EnvVars $toolEnvVars } diff --git a/images/windows/scripts/helpers/ImageHelpers.psm1 b/images/windows/scripts/helpers/ImageHelpers.psm1 index cf4721933f98..bf7672821e10 100644 --- a/images/windows/scripts/helpers/ImageHelpers.psm1 +++ b/images/windows/scripts/helpers/ImageHelpers.psm1 @@ -23,8 +23,8 @@ Export-ModuleMember -Function @( 'Install-Binary' 'Install-VisualStudio' 'Get-ToolsetContent' - 'Get-ToolsetToolFullPath' - 'Get-ToolcacheToolDirectory' + 'Get-TCToolVersionPath' + 'Get-TCToolPath' 'Stop-SvcWithErrHandling' 'Set-SvcWithErrHandling' 'Start-DownloadWithRetry' diff --git a/images/windows/scripts/helpers/InstallHelpers.ps1 b/images/windows/scripts/helpers/InstallHelpers.ps1 index 0713ed3a64ac..272fec6aa693 100644 --- a/images/windows/scripts/helpers/InstallHelpers.ps1 +++ b/images/windows/scripts/helpers/InstallHelpers.ps1 @@ -393,38 +393,67 @@ function Get-ToolsetContent ConvertFrom-Json -InputObject $toolsetJson } -function Get-ToolcacheToolDirectory { - Param ([string] $ToolName) +function Get-TCToolPath { + <# + .SYNOPSIS + This function returns the full path of a tool in the tool cache. + + .DESCRIPTION + The Get-TCToolPath function takes a tool name as a parameter and returns the full path of the tool in the tool cache. + It uses the AGENT_TOOLSDIRECTORY environment variable to determine the root path of the tool cache. + + .PARAMETER ToolName + The name of the tool for which the path is to be returned. + + .EXAMPLE + Get-TCToolPath -ToolName "Tool1" + + This command returns the full path of "Tool1" in the tool cache. + + #> + Param + ( + [string] $ToolName + ) + $toolcacheRootPath = Resolve-Path $env:AGENT_TOOLSDIRECTORY return Join-Path $toolcacheRootPath $ToolName } -function Get-ToolsetToolFullPath -{ +function Get-TCToolVersionPath { <# + .SYNOPSIS + This function returns the full path of a specific version of a tool in the tool cache. + .DESCRIPTION - Function that return full path to specified toolset tool. + The Get-TCToolVersionPath function takes a tool name, version, and architecture as parameters and returns the full path of the specified version of the tool in the tool cache. + It uses the Get-TCToolPath function to get the root path of the tool. .PARAMETER Name - The name of required tool. + The name of the tool for which the path is to be returned. .PARAMETER Version - The version of required tool. + The version of the tool for which the path is to be returned. If the version number is less than 3 parts, a wildcard is added. .PARAMETER Arch - The architecture of required tool. - #> + The architecture of the tool for which the path is to be returned. Defaults to "x64". + + .EXAMPLE + Get-TCToolVersionPath -Name "Tool1" -Version "1.0" -Arch "x86" + This command returns the full path of version "1.0" of "Tool1" for "x86" architecture in the tool cache. + + #> Param ( - [Parameter(Mandatory=$true)] + [Parameter(Mandatory = $true)] [string] $Name, - [Parameter(Mandatory=$true)] + [Parameter(Mandatory = $true)] [string] $Version, [string] $Arch = "x64" ) - $toolPath = Get-ToolcacheToolDirectory -ToolName $Name + $toolPath = Get-TCToolPath -ToolName $Name # Add wildcard if missing if ($Version.Split(".").Length -lt 3) { @@ -435,8 +464,8 @@ function Get-ToolsetToolFullPath # Take latest installed version in case if toolset version contains wildcards $foundVersion = Get-Item $versionPath ` - | Sort-Object -Property {[version]$_.name} -Descending ` - | Select-Object -First 1 + | Sort-Object -Property { [version]$_.name } -Descending ` + | Select-Object -First 1 if (-not $foundVersion) { return $null diff --git a/images/windows/scripts/tests/Toolset.Tests.ps1 b/images/windows/scripts/tests/Toolset.Tests.ps1 index 70acfc163a90..7f2e698ebf9e 100644 --- a/images/windows/scripts/tests/Toolset.Tests.ps1 +++ b/images/windows/scripts/tests/Toolset.Tests.ps1 @@ -35,7 +35,7 @@ function Test-Binaries { @{ Name = $Name; Version = $Version; Arch = $Arch; Binary = $_.Binary; Arguments = $_.Arguments } } It "<Binary> <Arguments>" -TestCases $testCases { - $binaryFullPath = Join-Path (Get-ToolsetToolFullPath -Name $Name -Version $Version -Arch $Arch) $Binary + $binaryFullPath = Join-Path (Get-TCToolVersionPath -Name $Name -Version $Version -Arch $Arch) $Binary "$binaryFullPath $Arguments" | Should -ReturnZeroExitCode } } @@ -56,7 +56,7 @@ function Test-DefaultVersion { It "default version is located in tool-cache" -TestCases $testCase { $binaryFullPath = Get-WhichTool $Binary - $toolcacheDirectory = Get-ToolcacheToolDirectory -ToolName $Name + $toolcacheDirectory = Get-TCToolPath -ToolName $Name $binaryFullPath | Should -Match ([Regex]::Escape($toolcacheDirectory)) } } @@ -70,7 +70,7 @@ foreach ($tool in $tools) { Context "$version" { $toolInfo = @{ Name = $tool.name; Version = $version; Arch = $tool.arch } It "tool-cache directory exists" -TestCases $toolInfo { - $toolFullPath = Get-ToolsetToolFullPath -Name $Name -Version $Version -Arch $Arch + $toolFullPath = Get-TCToolVersionPath -Name $Name -Version $Version -Arch $Arch $toolFullPath | Should -Exist } @@ -86,4 +86,4 @@ foreach ($tool in $tools) { } } } -} \ No newline at end of file +} From 6efbc46fc75af52af81f0d28fc096bd1641c995b Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Thu, 23 Nov 2023 11:59:49 +0100 Subject: [PATCH 2475/3485] [Windows] Update helper name to Expand-7ZipArchive (#8875) * [Windows] Update helper name to Expand-7ZipArchive * Fix typo --- images/windows/scripts/build/Install-ActionsCache.ps1 | 2 +- images/windows/scripts/build/Install-AliyunCli.ps1 | 2 +- images/windows/scripts/build/Install-AndroidSDK.ps1 | 4 ++-- .../scripts/build/Install-BizTalkBuildComponent.ps1 | 2 +- images/windows/scripts/build/Install-Chrome.ps1 | 2 +- images/windows/scripts/build/Install-CloudFoundryCli.ps1 | 2 +- images/windows/scripts/build/Install-CodeQLBundle.ps1 | 4 ++-- images/windows/scripts/build/Install-EdgeDriver.ps1 | 2 +- images/windows/scripts/build/Install-Firefox.ps1 | 2 +- images/windows/scripts/build/Install-IEWebDriver.ps1 | 2 +- images/windows/scripts/build/Install-JavaTools.ps1 | 4 ++-- images/windows/scripts/build/Install-Kotlin.ps1 | 2 +- images/windows/scripts/build/Install-Mingw64.ps1 | 4 ++-- images/windows/scripts/build/Install-PyPy.ps1 | 2 +- images/windows/scripts/build/Install-Ruby.ps1 | 2 +- images/windows/scripts/build/Install-Stack.ps1 | 2 +- images/windows/scripts/build/Install-Toolset.ps1 | 8 ++++---- images/windows/scripts/build/Install-Zstd.ps1 | 4 ++-- images/windows/scripts/helpers/ImageHelpers.psm1 | 2 +- images/windows/scripts/helpers/InstallHelpers.ps1 | 2 +- 20 files changed, 28 insertions(+), 28 deletions(-) diff --git a/images/windows/scripts/build/Install-ActionsCache.ps1 b/images/windows/scripts/build/Install-ActionsCache.ps1 index 05c41a5ff06c..3680f58e98f6 100644 --- a/images/windows/scripts/build/Install-ActionsCache.ps1 +++ b/images/windows/scripts/build/Install-ActionsCache.ps1 @@ -14,6 +14,6 @@ Write-Host "Download Latest action-versions archive from $downloadUrl" $actionVersionsArchivePath = Start-DownloadWithRetry -Url $downloadUrl -Name "action-versions.zip" Write-Host "Expand action-versions archive" -Extract-7Zip -Path $actionVersionsArchivePath -DestinationPath $env:ACTIONS_RUNNER_ACTION_ARCHIVE_CACHE +Expand-7ZipArchive -Path $actionVersionsArchivePath -DestinationPath $env:ACTIONS_RUNNER_ACTION_ARCHIVE_CACHE Invoke-PesterTests -TestFile "ActionArchiveCache" diff --git a/images/windows/scripts/build/Install-AliyunCli.ps1 b/images/windows/scripts/build/Install-AliyunCli.ps1 index 97f7c3711b3e..a3967fba173f 100644 --- a/images/windows/scripts/build/Install-AliyunCli.ps1 +++ b/images/windows/scripts/build/Install-AliyunCli.ps1 @@ -21,7 +21,7 @@ Use-ChecksumComparison $fileHash $externalHash Write-Host "Expand aliyun-cli archive" $aliyunPath = "C:\aliyun-cli" New-Item -Path $aliyunPath -ItemType Directory -Force -Extract-7Zip -Path $packagePath -DestinationPath $aliyunPath +Expand-7ZipArchive -Path $packagePath -DestinationPath $aliyunPath # Add aliyun-cli to path Add-MachinePathItem $aliyunPath diff --git a/images/windows/scripts/build/Install-AndroidSDK.ps1 b/images/windows/scripts/build/Install-AndroidSDK.ps1 index 83580d9a0ee0..626cb43b96e6 100644 --- a/images/windows/scripts/build/Install-AndroidSDK.ps1 +++ b/images/windows/scripts/build/Install-AndroidSDK.ps1 @@ -19,7 +19,7 @@ Use-ChecksumComparison -LocalFileHash $localFileHash -DistributorFileHash $andro $sdkInstallRoot = "C:\Program Files (x86)\Android\android-sdk" $sdkRoot = "C:\Android\android-sdk" -Extract-7Zip -Path $cmdlineToolsArchPath -DestinationPath "${sdkInstallRoot}\cmdline-tools" +Expand-7ZipArchive -Path $cmdlineToolsArchPath -DestinationPath "${sdkInstallRoot}\cmdline-tools" # cmdline tools should be installed in ${sdkInstallRoot}\cmdline-tools\latest\bin, but archive contains ${sdkInstallRoot}\cmdline-tools\bin # we need to create the proper folder structure @@ -46,7 +46,7 @@ $sdkManager = "$sdkRoot\cmdline-tools\latest\bin\sdkmanager.bat" $licenseContentBase64 = "UEsDBBQAAAAAAKNK11IAAAAAAAAAAAAAAAAJAAAAbGljZW5zZXMvUEsDBAoAAAAAAJ1K11K7n0IrKgAAACoAAAAhAAAAbGljZW5zZXMvYW5kcm9pZC1nb29nbGV0di1saWNlbnNlDQo2MDEwODViOTRjZDc3ZjBiNTRmZjg2NDA2OTU3MDk5ZWJlNzljNGQ2UEsDBAoAAAAAAKBK11LzQumJKgAAACoAAAAkAAAAbGljZW5zZXMvYW5kcm9pZC1zZGstYXJtLWRidC1saWNlbnNlDQo4NTlmMzE3Njk2ZjY3ZWYzZDdmMzBhNTBhNTU2MGU3ODM0YjQzOTAzUEsDBAoAAAAAAKFK11IKSOJFKgAAACoAAAAcAAAAbGljZW5zZXMvYW5kcm9pZC1zZGstbGljZW5zZQ0KMjQzMzNmOGE2M2I2ODI1ZWE5YzU1MTRmODNjMjgyOWIwMDRkMWZlZVBLAwQKAAAAAACiStdSec1a4SoAAAAqAAAAJAAAAGxpY2Vuc2VzL2FuZHJvaWQtc2RrLXByZXZpZXctbGljZW5zZQ0KODQ4MzFiOTQwOTY0NmE5MThlMzA1NzNiYWI0YzljOTEzNDZkOGFiZFBLAwQKAAAAAACiStdSk6vQKCoAAAAqAAAAGwAAAGxpY2Vuc2VzL2dvb2dsZS1nZGstbGljZW5zZQ0KMzNiNmEyYjY0NjA3ZjExYjc1OWYzMjBlZjlkZmY0YWU1YzQ3ZDk3YVBLAwQKAAAAAACiStdSrE3jESoAAAAqAAAAJAAAAGxpY2Vuc2VzL2ludGVsLWFuZHJvaWQtZXh0cmEtbGljZW5zZQ0KZDk3NWY3NTE2OThhNzdiNjYyZjEyNTRkZGJlZWQzOTAxZTk3NmY1YVBLAwQKAAAAAACjStdSkb1vWioAAAAqAAAAJgAAAGxpY2Vuc2VzL21pcHMtYW5kcm9pZC1zeXNpbWFnZS1saWNlbnNlDQplOWFjYWI1YjVmYmI1NjBhNzJjZmFlY2NlODk0Njg5NmZmNmFhYjlkUEsBAj8AFAAAAAAAo0rXUgAAAAAAAAAAAAAAAAkAJAAAAAAAAAAQAAAAAAAAAGxpY2Vuc2VzLwoAIAAAAAAAAQAYACIHOBcRaNcBIgc4FxFo1wHBTVQTEWjXAVBLAQI/AAoAAAAAAJ1K11K7n0IrKgAAACoAAAAhACQAAAAAAAAAIAAAACcAAABsaWNlbnNlcy9hbmRyb2lkLWdvb2dsZXR2LWxpY2Vuc2UKACAAAAAAAAEAGACUEFUTEWjXAZQQVRMRaNcB6XRUExFo1wFQSwECPwAKAAAAAACgStdS80LpiSoAAAAqAAAAJAAkAAAAAAAAACAAAACQAAAAbGljZW5zZXMvYW5kcm9pZC1zZGstYXJtLWRidC1saWNlbnNlCgAgAAAAAAABABgAsEM0FBFo1wGwQzQUEWjXAXb1MxQRaNcBUEsBAj8ACgAAAAAAoUrXUgpI4kUqAAAAKgAAABwAJAAAAAAAAAAgAAAA/AAAAGxpY2Vuc2VzL2FuZHJvaWQtc2RrLWxpY2Vuc2UKACAAAAAAAAEAGAAsMGUVEWjXASwwZRURaNcB5whlFRFo1wFQSwECPwAKAAAAAACiStdSec1a4SoAAAAqAAAAJAAkAAAAAAAAACAAAABgAQAAbGljZW5zZXMvYW5kcm9pZC1zZGstcHJldmlldy1saWNlbnNlCgAgAAAAAAABABgA7s3WFRFo1wHuzdYVEWjXAfGm1hURaNcBUEsBAj8ACgAAAAAAokrXUpOr0CgqAAAAKgAAABsAJAAAAAAAAAAgAAAAzAEAAGxpY2Vuc2VzL2dvb2dsZS1nZGstbGljZW5zZQoAIAAAAAAAAQAYAGRDRxYRaNcBZENHFhFo1wFfHEcWEWjXAVBLAQI/AAoAAAAAAKJK11KsTeMRKgAAACoAAAAkACQAAAAAAAAAIAAAAC8CAABsaWNlbnNlcy9pbnRlbC1hbmRyb2lkLWV4dHJhLWxpY2Vuc2UKACAAAAAAAAEAGADGsq0WEWjXAcayrRYRaNcBxrKtFhFo1wFQSwECPwAKAAAAAACjStdSkb1vWioAAAAqAAAAJgAkAAAAAAAAACAAAACbAgAAbGljZW5zZXMvbWlwcy1hbmRyb2lkLXN5c2ltYWdlLWxpY2Vuc2UKACAAAAAAAAEAGAA4LjgXEWjXATguOBcRaNcBIgc4FxFo1wFQSwUGAAAAAAgACACDAwAACQMAAAAA" $licenseContent = [System.Convert]::FromBase64String($licenseContentBase64) Set-Content -Path "$sdkInstallRoot\android-sdk-licenses.zip" -Value $licenseContent -Encoding Byte -Extract-7Zip -Path "$sdkInstallRoot\android-sdk-licenses.zip" -DestinationPath $sdkInstallRoot +Expand-7ZipArchive -Path "$sdkInstallRoot\android-sdk-licenses.zip" -DestinationPath $sdkInstallRoot # install platform-tools $platformToolsPath = Join-Path -Path $sdkInstallRoot -ChildPath "platform-tools" diff --git a/images/windows/scripts/build/Install-BizTalkBuildComponent.ps1 b/images/windows/scripts/build/Install-BizTalkBuildComponent.ps1 index f1d7537acdfb..ea48c2a33e95 100644 --- a/images/windows/scripts/build/Install-BizTalkBuildComponent.ps1 +++ b/images/windows/scripts/build/Install-BizTalkBuildComponent.ps1 @@ -13,7 +13,7 @@ $setupPath = Join-Path $env:TEMP "BizTalkBuildComponent" if (-not (Test-Path -Path $setupPath)) { $null = New-Item -Path $setupPath -ItemType Directory -Force } -Extract-7Zip -Path $setupZipFile -DestinationPath $setupPath +Expand-7ZipArchive -Path $setupZipFile -DestinationPath $setupPath Write-Host "Installing BizTalk Project Build Component..." Install-Binary ` diff --git a/images/windows/scripts/build/Install-Chrome.ps1 b/images/windows/scripts/build/Install-Chrome.ps1 index 43b6a0f05006..05d1ce3ee4de 100644 --- a/images/windows/scripts/build/Install-Chrome.ps1 +++ b/images/windows/scripts/build/Install-Chrome.ps1 @@ -74,7 +74,7 @@ Write-Host "Download Chrome WebDriver from $ChromeDriverZipDownloadUrl..." $ChromeDriverArchPath = Start-DownloadWithRetry -Url $ChromeDriverZipDownloadUrl Write-Host "Expand Chrome WebDriver archive (without using directory names)..." -Extract-7Zip -Path $ChromeDriverArchPath -DestinationPath $ChromeDriverPath -ExtractMethod "e" +Expand-7ZipArchive -Path $ChromeDriverArchPath -DestinationPath $ChromeDriverPath -ExtractMethod "e" Write-Host "Setting the environment variables..." [Environment]::SetEnvironmentVariable("ChromeWebDriver", $ChromeDriverPath, "Machine") diff --git a/images/windows/scripts/build/Install-CloudFoundryCli.ps1 b/images/windows/scripts/build/Install-CloudFoundryCli.ps1 index 8b4416b17af3..8a806cd26ddc 100644 --- a/images/windows/scripts/build/Install-CloudFoundryCli.ps1 +++ b/images/windows/scripts/build/Install-CloudFoundryCli.ps1 @@ -15,7 +15,7 @@ New-Item -Path $CloudFoundryCliPath -ItemType Directory -Force # Extract the zip archive Write-Host "Extracting cf cli..." -Extract-7Zip -Path $CloudFoundryArchPath -DestinationPath $CloudFoundryCliPath +Expand-7ZipArchive -Path $CloudFoundryArchPath -DestinationPath $CloudFoundryCliPath # Add cf to path Add-MachinePathItem $CloudFoundryCliPath diff --git a/images/windows/scripts/build/Install-CodeQLBundle.ps1 b/images/windows/scripts/build/Install-CodeQLBundle.ps1 index b21977a20de3..381496a501ae 100644 --- a/images/windows/scripts/build/Install-CodeQLBundle.ps1 +++ b/images/windows/scripts/build/Install-CodeQLBundle.ps1 @@ -18,9 +18,9 @@ $CodeQLToolcachePath = Join-Path $Env:AGENT_TOOLSDIRECTORY -ChildPath "CodeQL" | New-Item -Path $CodeQLToolcachePath -ItemType Directory -Force | Out-Null Write-Host "Unpacking the downloaded CodeQL bundle archive..." -Extract-7Zip -Path $CodeQLBundlePath -DestinationPath $DownloadDirectoryPath +Expand-7ZipArchive -Path $CodeQLBundlePath -DestinationPath $DownloadDirectoryPath $UnGzipedCodeQLBundlePath = Join-Path $DownloadDirectoryPath "codeql-bundle.tar" -Extract-7Zip -Path $UnGzipedCodeQLBundlePath -DestinationPath $CodeQLToolcachePath +Expand-7ZipArchive -Path $UnGzipedCodeQLBundlePath -DestinationPath $CodeQLToolcachePath Write-Host "CodeQL bundle at $($CodeQLToolcachePath) contains the following directories:" Get-ChildItem -Path $CodeQLToolcachePath -Depth 2 diff --git a/images/windows/scripts/build/Install-EdgeDriver.ps1 b/images/windows/scripts/build/Install-EdgeDriver.ps1 index cae78844db93..5eacdf463632 100644 --- a/images/windows/scripts/build/Install-EdgeDriver.ps1 +++ b/images/windows/scripts/build/Install-EdgeDriver.ps1 @@ -31,7 +31,7 @@ $EdgeDriverDownloadUrl = "https://msedgedriver.azureedge.net/${EdgeDriverLatestV $EdgeDriverArchPath = Start-DownloadWithRetry -Url $EdgeDriverDownloadUrl -Name $EdgeDriverArchName Write-Host "Expand Microsoft Edge WebDriver archive..." -Extract-7Zip -Path $EdgeDriverArchPath -DestinationPath $EdgeDriverPath +Expand-7ZipArchive -Path $EdgeDriverArchPath -DestinationPath $EdgeDriverPath #Validate the EdgeDriver signature $EdgeDriverSignatureThumbprint = "CB9C4FBEA1D87D2D468AC5A9CAAB0163F6AD8401" diff --git a/images/windows/scripts/build/Install-Firefox.ps1 b/images/windows/scripts/build/Install-Firefox.ps1 index 0a66f0d7cee5..d4fbe0bdf6a7 100644 --- a/images/windows/scripts/build/Install-Firefox.ps1 +++ b/images/windows/scripts/build/Install-Firefox.ps1 @@ -48,7 +48,7 @@ $GeckoDriverDownloadUrl = $GeckoDriverWindowsAsset.browser_download_url $GeckoDriverArchPath = Start-DownloadWithRetry -Url $GeckoDriverDownloadUrl -Name $GeckoDriverArchName Write-Host "Expand Gecko WebDriver archive..." -Extract-7Zip -Path $GeckoDriverArchPath -DestinationPath $GeckoDriverPath +Expand-7ZipArchive -Path $GeckoDriverArchPath -DestinationPath $GeckoDriverPath # Validate Gecko WebDriver signature $GeckoDriverSignatureThumbprint = "1326B39C3D5D2CA012F66FB439026F7B59CB1974" diff --git a/images/windows/scripts/build/Install-IEWebDriver.ps1 b/images/windows/scripts/build/Install-IEWebDriver.ps1 index dac9756e9641..e40f1e8ee706 100644 --- a/images/windows/scripts/build/Install-IEWebDriver.ps1 +++ b/images/windows/scripts/build/Install-IEWebDriver.ps1 @@ -26,7 +26,7 @@ if (-not (Test-Path -Path $ieDriverPath)) { $null = New-Item -Path $ieDriverPath -ItemType Directory -Force } -Extract-7Zip -Path $driverZipFile -DestinationPath $ieDriverPath +Expand-7ZipArchive -Path $driverZipFile -DestinationPath $ieDriverPath Remove-Item $driverZipFile Write-Host "Get the IEDriver version..." diff --git a/images/windows/scripts/build/Install-JavaTools.ps1 b/images/windows/scripts/build/Install-JavaTools.ps1 index 084d23d97e65..a20e3ee4063a 100644 --- a/images/windows/scripts/build/Install-JavaTools.ps1 +++ b/images/windows/scripts/build/Install-JavaTools.ps1 @@ -89,7 +89,7 @@ function Install-JavaJDK { New-Item -ItemType Directory -Path $javaVersionPath -Force | Out-Null # Complete the installation by extracting Java binaries to toolcache and creating the complete file - Extract-7Zip -Path $archivePath -DestinationPath $javaVersionPath + Expand-7ZipArchive -Path $archivePath -DestinationPath $javaVersionPath Invoke-SBWithRetry -Command { Get-ChildItem -Path $javaVersionPath | Rename-Item -NewName $javaArchPath -ErrorAction Stop } @@ -141,7 +141,7 @@ $coberturaPath = "C:\cobertura-2.1.1" $archivePath = Start-DownloadWithRetry -Url $uri -Name "cobertura.zip" $fileHash = (Get-FileHash -Path $archivePath -Algorithm SHA256).Hash Use-ChecksumComparison $fileHash $sha256sum -Extract-7Zip -Path $archivePath -DestinationPath "C:\" +Expand-7ZipArchive -Path $archivePath -DestinationPath "C:\" [Environment]::SetEnvironmentVariable("COBERTURA_HOME", $coberturaPath, "Machine") diff --git a/images/windows/scripts/build/Install-Kotlin.ps1 b/images/windows/scripts/build/Install-Kotlin.ps1 index 6558680dc4ee..548ce941a260 100644 --- a/images/windows/scripts/build/Install-Kotlin.ps1 +++ b/images/windows/scripts/build/Install-Kotlin.ps1 @@ -19,7 +19,7 @@ Use-ChecksumComparison $fileHash $externalHash Write-Host "Expand Kotlin archive" $kotlinPath = "C:\tools" -Extract-7Zip -Path $kotlinInstallerPath -DestinationPath $kotlinPath +Expand-7ZipArchive -Path $kotlinInstallerPath -DestinationPath $kotlinPath # Add to PATH Add-MachinePathItem "$kotlinPath\kotlinc\bin" diff --git a/images/windows/scripts/build/Install-Mingw64.ps1 b/images/windows/scripts/build/Install-Mingw64.ps1 index f1bd5f685730..4c55d1a74e15 100644 --- a/images/windows/scripts/build/Install-Mingw64.ps1 +++ b/images/windows/scripts/build/Install-Mingw64.ps1 @@ -23,7 +23,7 @@ if (Test-IsWin19) { if ($hash.Hash -ne $sha256sum) { throw "Checksum verification failed for $packagePath" } - Extract-7Zip -Path $packagePath -DestinationPath "C:\" + Expand-7ZipArchive -Path $packagePath -DestinationPath "C:\" # Make a copy of mingw-make.exe to make.exe, which is a more discoverable name # and so the same command line can be used on Windows as on macOS and Linux @@ -58,7 +58,7 @@ if (Test-IsWin19) { -UrlFilter "*$arch-{Version}-release-$threads-$exceptions-$runtime-*.7z" $packagePath = Start-DownloadWithRetry -Url $url -Name "$_.7z" - Extract-7Zip -Path $packagePath -DestinationPath "C:\" + Expand-7ZipArchive -Path $packagePath -DestinationPath "C:\" # Make a copy of mingw-make.exe to make.exe, which is a more discoverable name # and so the same command line can be used on Windows as on macOS and Linux diff --git a/images/windows/scripts/build/Install-PyPy.ps1 b/images/windows/scripts/build/Install-PyPy.ps1 index 8fdf513e41ac..1fb8d0360b28 100644 --- a/images/windows/scripts/build/Install-PyPy.ps1 +++ b/images/windows/scripts/build/Install-PyPy.ps1 @@ -21,7 +21,7 @@ function Install-PyPy # Expand archive with binaries $packageName = [IO.Path]::GetFileNameWithoutExtension((Split-Path -Path $packagePath -Leaf)) $tempFolder = Join-Path -Path $pypyToolcachePath -ChildPath $packageName - Extract-7Zip -Path $packagePath -DestinationPath $pypyToolcachePath + Expand-7ZipArchive -Path $packagePath -DestinationPath $pypyToolcachePath # Get Python version from binaries $pypyApp = Get-ChildItem -Path "$tempFolder\pypy*.exe" | Where-Object Name -match "pypy(\d+)?.exe" | Select-Object -First 1 diff --git a/images/windows/scripts/build/Install-Ruby.ps1 b/images/windows/scripts/build/Install-Ruby.ps1 index 5396edf667ce..a0869d9599de 100644 --- a/images/windows/scripts/build/Install-Ruby.ps1 +++ b/images/windows/scripts/build/Install-Ruby.ps1 @@ -48,7 +48,7 @@ function Install-Ruby { # Expand archive with binaries $packageName = [IO.Path]::GetFileNameWithoutExtension((Split-Path -Path $PackagePath -Leaf)) $tempFolder = Join-Path -Path $rubyToolcachePath -ChildPath $packageName - Extract-7Zip -Path $PackagePath -DestinationPath $rubyToolcachePath + Expand-7ZipArchive -Path $PackagePath -DestinationPath $rubyToolcachePath # Get Ruby version from binaries $rubyVersion = & "$tempFolder\bin\ruby.exe" -e "print RUBY_VERSION" diff --git a/images/windows/scripts/build/Install-Stack.ps1 b/images/windows/scripts/build/Install-Stack.ps1 index 95cb35a284ba..98c84ac07522 100644 --- a/images/windows/scripts/build/Install-Stack.ps1 +++ b/images/windows/scripts/build/Install-Stack.ps1 @@ -23,7 +23,7 @@ Use-ChecksumComparison $fileHash $externalHash #endregion Write-Host "Expand stack archive" -Extract-7Zip -Path $StackArchivePath -DestinationPath $DestinationPath +Expand-7ZipArchive -Path $StackArchivePath -DestinationPath $DestinationPath New-Item -Name "x64.complete" -Path $StackToolcachePath diff --git a/images/windows/scripts/build/Install-Toolset.ps1 b/images/windows/scripts/build/Install-Toolset.ps1 index be13e850af7d..09c2bac85dcc 100644 --- a/images/windows/scripts/build/Install-Toolset.ps1 +++ b/images/windows/scripts/build/Install-Toolset.ps1 @@ -19,10 +19,10 @@ Function Install-Asset { Write-Host "Extract $($ReleaseAsset.filename) content..." if ($assetArchivePath.EndsWith(".tar.gz")) { $assetTarPath = $assetArchivePath.TrimEnd(".tar.gz") - Extract-7Zip -Path $assetArchivePath -DestinationPath $assetTarPath - Extract-7Zip -Path $assetTarPath -DestinationPath $assetFolderPath + Expand-7ZipArchive -Path $assetArchivePath -DestinationPath $assetTarPath + Expand-7ZipArchive -Path $assetTarPath -DestinationPath $assetFolderPath } else { - Extract-7Zip -Path $assetArchivePath -DestinationPath $assetFolderPath + Expand-7ZipArchive -Path $assetArchivePath -DestinationPath $assetFolderPath } Write-Host "Invoke installation script..." @@ -55,4 +55,4 @@ foreach ($tool in $tools) { exit 1 } } -} \ No newline at end of file +} diff --git a/images/windows/scripts/build/Install-Zstd.ps1 b/images/windows/scripts/build/Install-Zstd.ps1 index d0481ef556ce..97d44b56d701 100644 --- a/images/windows/scripts/build/Install-Zstd.ps1 +++ b/images/windows/scripts/build/Install-Zstd.ps1 @@ -14,12 +14,12 @@ $zstdParentName = [IO.Path]::GetFileNameWithoutExtension($zstdLatest) $filesInArchive = 7z l $zstdArchivePath | Out-String if ($filesInArchive.Contains($zstdParentName)) { - Extract-7Zip -Path $zstdArchivePath -DestinationPath $toolPath + Expand-7ZipArchive -Path $zstdArchivePath -DestinationPath $toolPath Invoke-SBWithRetry -Command { Move-Item -Path "${zstdPath}*" -Destination $zstdPath -ErrorAction Stop } } else { - Extract-7Zip -Path $zstdArchivePath -DestinationPath $zstdPath + Expand-7ZipArchive -Path $zstdArchivePath -DestinationPath $zstdPath } # Add zstd-win64 to PATH diff --git a/images/windows/scripts/helpers/ImageHelpers.psm1 b/images/windows/scripts/helpers/ImageHelpers.psm1 index bf7672821e10..750ccf51ed65 100644 --- a/images/windows/scripts/helpers/ImageHelpers.psm1 +++ b/images/windows/scripts/helpers/ImageHelpers.psm1 @@ -39,7 +39,7 @@ Export-ModuleMember -Function @( 'Send-RequestToCocolateyPackages' 'Resolve-ChocoPackageVersion' 'Get-GitHubPackageDownloadUrl' - 'Extract-7Zip' + 'Expand-7ZipArchive' 'Invoke-SBWithRetry' 'Get-VsCatalogJsonPath' 'Install-AndroidSDKPackages' diff --git a/images/windows/scripts/helpers/InstallHelpers.ps1 b/images/windows/scripts/helpers/InstallHelpers.ps1 index 272fec6aa693..f28045640537 100644 --- a/images/windows/scripts/helpers/InstallHelpers.ps1 +++ b/images/windows/scripts/helpers/InstallHelpers.ps1 @@ -489,7 +489,7 @@ function Test-IsWin19 (Get-WinVersion) -match "2019" } -function Extract-7Zip { +function Expand-7ZipArchive { Param ( [Parameter(Mandatory=$true)] From 79c347765abbe4c774e6e0800e05b5474a0552fe Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Thu, 23 Nov 2023 18:08:20 +0100 Subject: [PATCH 2476/3485] [Windows] Unify services handling (#8871) * [Windows] Unify services handling * Fix Set-Service usage --- .../scripts/build/Configure-System.ps1 | 8 +- .../windows/scripts/build/Install-Apache.ps1 | 6 +- .../windows/scripts/build/Install-Chrome.ps1 | 7 +- .../windows/scripts/build/Install-MongoDB.ps1 | 11 ++- .../windows/scripts/build/Install-Nginx.ps1 | 6 +- .../scripts/build/Install-PostgreSQL.ps1 | 4 +- .../windows/scripts/helpers/ImageHelpers.psm1 | 2 - .../scripts/helpers/InstallHelpers.ps1 | 79 ------------------- 8 files changed, 21 insertions(+), 102 deletions(-) diff --git a/images/windows/scripts/build/Configure-System.ps1 b/images/windows/scripts/build/Configure-System.ps1 index 481d52b34203..08d09f143a20 100644 --- a/images/windows/scripts/build/Configure-System.ps1 +++ b/images/windows/scripts/build/Configure-System.ps1 @@ -105,10 +105,10 @@ $servicesToDisable = @( 'gupdate' 'gupdatem' 'StorSvc' -) - -$servicesToDisable | Stop-SvcWithErrHandling -$servicesToDisable | Set-SvcWithErrHandling -Arguments @{StartupType = "Disabled"} +) | Get-Service -ErrorAction SilentlyContinue +Stop-Service $servicesToDisable +$servicesToDisable.WaitForStatus('Stopped', "00:01:00") +$servicesToDisable | Set-Service -StartupType Disabled # Disable scheduled tasks $allTasksInTaskPath = @( diff --git a/images/windows/scripts/build/Install-Apache.ps1 b/images/windows/scripts/build/Install-Apache.ps1 index e2d37dcc0667..d5e85a6bc27e 100644 --- a/images/windows/scripts/build/Install-Apache.ps1 +++ b/images/windows/scripts/build/Install-Apache.ps1 @@ -4,7 +4,7 @@ ################################################################################ # Stop w3svc service -Stop-Service -Name w3svc | Out-Null +Stop-Service -Name w3svc # Install latest apache in chocolatey $installDir = "C:\tools" @@ -12,10 +12,10 @@ Install-ChocoPackage apache-httpd -ArgumentList "--force", "--params", "/install # Stop and disable Apache service Stop-Service -Name Apache -Set-Service Apache -StartupType Disabled +Set-Service -Name Apache -StartupType Disabled # Start w3svc service -Start-Service -Name w3svc | Out-Null +Start-Service -Name w3svc # Invoke Pester Tests Invoke-PesterTests -TestFile "Apache" diff --git a/images/windows/scripts/build/Install-Chrome.ps1 b/images/windows/scripts/build/Install-Chrome.ps1 index 05d1ce3ee4de..e07920ffb59d 100644 --- a/images/windows/scripts/build/Install-Chrome.ps1 +++ b/images/windows/scripts/build/Install-Chrome.ps1 @@ -12,9 +12,10 @@ Install-Binary ` Write-Host "Adding the firewall rule for Google update blocking..." New-NetFirewallRule -DisplayName "BlockGoogleUpdate" -Direction Outbound -Action Block -Program "C:\Program Files (x86)\Google\Update\GoogleUpdate.exe" -$GoogleSvcs = ('gupdate','gupdatem') -$GoogleSvcs | Stop-SvcWithErrHandling -StopOnError -$GoogleSvcs | Set-SvcWithErrHandling -Arguments @{StartupType = "Disabled"} +$googleServices = @('gupdate', 'gupdatem') | Get-Service +Stop-Service $googleServices +$googleServices.WaitForStatus('Stopped', "00:01:00") +$googleServices | Set-Service -StartupType Disabled $regGoogleUpdatePath = "HKLM:\SOFTWARE\Policies\Google\Update" $regGoogleUpdateChrome = "HKLM:\SOFTWARE\Policies\Google\Chrome" diff --git a/images/windows/scripts/build/Install-MongoDB.ps1 b/images/windows/scripts/build/Install-MongoDB.ps1 index 35cfd76f9cbc..da080a58b238 100644 --- a/images/windows/scripts/build/Install-MongoDB.ps1 +++ b/images/windows/scripts/build/Install-MongoDB.ps1 @@ -26,17 +26,16 @@ Install-Binary ` -ExpectedSignature (Get-ToolsetContent).mongodb.signature # Add mongodb to the PATH -$mongodbService = "mongodb" -$mongoPath = (Get-CimInstance Win32_Service -Filter "Name LIKE '$mongodbService'").PathName +$mongoPath = (Get-CimInstance Win32_Service -Filter "Name LIKE 'mongodb'").PathName $mongoBin = Split-Path -Path $mongoPath.split('"')[1] Add-MachinePathItem "$mongoBin" # Wait for mongodb service running -$svc = Get-Service $mongodbService -$svc.WaitForStatus('Running','00:01:00') +$mongodbService = Get-Service "mongodb" +$mongodbService.WaitForStatus('Running', '00:01:00') # Stop and disable mongodb service -Stop-Service -Name $mongodbService -Set-Service $mongodbService -StartupType Disabled +Stop-Service $mongodbService +$mongodbService | Set-Service -StartupType Disabled Invoke-PesterTests -TestFile "Databases" -TestName "MongoDB" diff --git a/images/windows/scripts/build/Install-Nginx.ps1 b/images/windows/scripts/build/Install-Nginx.ps1 index 5d2dd0d2888c..4b6f1bd503d3 100644 --- a/images/windows/scripts/build/Install-Nginx.ps1 +++ b/images/windows/scripts/build/Install-Nginx.ps1 @@ -4,7 +4,7 @@ ################################################################################ # Stop w3svc service -Stop-Service -Name w3svc | Out-Null +Stop-Service -Name w3svc # Install latest nginx in chocolatey $installDir = "C:\tools" @@ -12,10 +12,10 @@ Install-ChocoPackage nginx -ArgumentList "--force", "--params", "/installLocatio # Stop and disable Nginx service Stop-Service -Name nginx -Set-Service nginx -StartupType Disabled +Set-Service -Name nginx -StartupType Disabled # Start w3svc service -Start-Service -Name w3svc | Out-Null +Start-Service -Name w3svc # Invoke Pester Tests Invoke-PesterTests -TestFile "Nginx" diff --git a/images/windows/scripts/build/Install-PostgreSQL.ps1 b/images/windows/scripts/build/Install-PostgreSQL.ps1 index c6803662327b..94ca97036764 100644 --- a/images/windows/scripts/build/Install-PostgreSQL.ps1 +++ b/images/windows/scripts/build/Install-PostgreSQL.ps1 @@ -78,7 +78,7 @@ if ($exitCode -ne 0) { # Stop and disable PostgreSQL service $pgService = Get-Service -Name postgresql* -Stop-Service -InputObject $pgService -Set-Service -InputObject $pgService -StartupType Disabled +Stop-Service $pgService +$pgService | Set-Service -StartupType Disabled Invoke-PesterTests -TestFile "Databases" -TestName "PostgreSQL" diff --git a/images/windows/scripts/helpers/ImageHelpers.psm1 b/images/windows/scripts/helpers/ImageHelpers.psm1 index 750ccf51ed65..1db9f5b5a36c 100644 --- a/images/windows/scripts/helpers/ImageHelpers.psm1 +++ b/images/windows/scripts/helpers/ImageHelpers.psm1 @@ -25,8 +25,6 @@ Export-ModuleMember -Function @( 'Get-ToolsetContent' 'Get-TCToolVersionPath' 'Get-TCToolPath' - 'Stop-SvcWithErrHandling' - 'Set-SvcWithErrHandling' 'Start-DownloadWithRetry' 'Get-VsixExtenstionFromMarketplace' 'Install-VSIXFromFile' diff --git a/images/windows/scripts/helpers/InstallHelpers.ps1 b/images/windows/scripts/helpers/InstallHelpers.ps1 index f28045640537..24db81e8521b 100644 --- a/images/windows/scripts/helpers/InstallHelpers.ps1 +++ b/images/windows/scripts/helpers/InstallHelpers.ps1 @@ -130,85 +130,6 @@ function Install-Binary { } } -function Stop-SvcWithErrHandling { - <# - .DESCRIPTION - Function for stopping the Windows Service with error handling - - .PARAMETER ServiceName - The name of stopping service - - .PARAMETER StopOnError - Switch for stopping the script and exit from PowerShell if one service is absent - #> - Param ( - [Parameter(Mandatory, ValueFromPipeLine = $true)] - [string] $ServiceName, - [switch] $StopOnError - ) - - Process { - $service = Get-Service $ServiceName -ErrorAction SilentlyContinue - if (-not $service) { - Write-Warning "[!] Service [$ServiceName] is not found" - if ($StopOnError) { - exit 1 - } - } else { - Write-Host "Try to stop service [$ServiceName]" - try { - Stop-Service -Name $ServiceName -Force - $service.WaitForStatus("Stopped", "00:01:00") - Write-Host "Service [$ServiceName] has been stopped successfuly" - } catch { - Write-Error "[!] Failed to stop service [$ServiceName] with error:" - $_ | Out-String | Write-Error - } - } - } -} - -function Set-SvcWithErrHandling { - <# - .DESCRIPTION - Function for setting the Windows Service parameter with error handling - - .PARAMETER ServiceName - The name of stopping service - - .PARAMETER Arguments - Hashtable for service arguments - - .PARAMETER StopOnError - Switch for stopping the script and exit from PowerShell if one service is absent - #> - - Param ( - [Parameter(Mandatory, ValueFromPipeLine = $true)] - [string] $ServiceName, - [Parameter(Mandatory)] - [hashtable] $Arguments, - [switch] $StopOnError - ) - - Process { - $service = Get-Service $ServiceName -ErrorAction SilentlyContinue - if (-not $service) { - Write-Warning "[!] Service [$ServiceName] is not found" - if ($StopOnError) { - exit 1 - } - } else { - try { - Set-Service $serviceName @Arguments - } catch { - Write-Error "[!] Failed to set service [$ServiceName] arguments with error:" - $_ | Out-String | Write-Error - } - } - } -} - function Start-DownloadWithRetry { Param ( From 9492109c6270092b6f7ccd990ae468ff546935af Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Mon, 27 Nov 2023 11:37:49 +0100 Subject: [PATCH 2477/3485] [Windows] Refactor test helpers (#8889) --- .../windows/scripts/tests/Haskell.Tests.ps1 | 4 +- images/windows/scripts/tests/Helpers.psm1 | 147 ++++++++++-------- images/windows/scripts/tests/Java.Tests.ps1 | 8 +- images/windows/scripts/tests/MSYS2.Tests.ps1 | 10 +- .../windows/scripts/tests/Toolset.Tests.ps1 | 8 +- 5 files changed, 96 insertions(+), 81 deletions(-) diff --git a/images/windows/scripts/tests/Haskell.Tests.ps1 b/images/windows/scripts/tests/Haskell.Tests.ps1 index 6b4b9b5e4c0e..8381ff603188 100644 --- a/images/windows/scripts/tests/Haskell.Tests.ps1 +++ b/images/windows/scripts/tests/Haskell.Tests.ps1 @@ -33,11 +33,11 @@ Describe "Haskell" { } It "GHC <ghcVersion> is installed" -TestCases $ghcTestCases { - "$binGhcPath --version" | Should -MatchCommandOutput $ghcShortVersion + "$binGhcPath --version" | Should -OutputTextMatchingRegex $ghcShortVersion } It "GHC <defaultGhcVersion> is the default version and should be the latest installed" -TestCases $ghcDefaultCases { - "ghc --version" | Should -MatchCommandOutput $defaultGhcShortVersion + "ghc --version" | Should -OutputTextMatchingRegex $defaultGhcShortVersion } It "Cabal is installed" { diff --git a/images/windows/scripts/tests/Helpers.psm1 b/images/windows/scripts/tests/Helpers.psm1 index 420d86a025e2..0ec1e6ad876d 100644 --- a/images/windows/scripts/tests/Helpers.psm1 +++ b/images/windows/scripts/tests/Helpers.psm1 @@ -1,25 +1,6 @@ [CmdletBinding()] param() -function Get-CommandResult { - Param ( - [Parameter(Mandatory)][string] $Command - ) - # CMD trick to suppress and show error output because some commands write to stderr (for example, "python --version") - [string[]]$output = & $env:comspec /c "$Command 2>&1" - $exitCode = $LASTEXITCODE - - return @{ - Output = $output - ExitCode = $exitCode - } -} - -# Gets path to the tool, analogue of 'which tool' -function Get-WhichTool($tool) { - return (Get-Command $tool).Path -} - # Gets value of environment variable by the name function Get-EnvironmentVariable($variable) { return [System.Environment]::GetEnvironmentVariable($variable, "Machine") @@ -37,8 +18,34 @@ function Update-Environment { $env:PATH = [Environment]::GetEnvironmentVariable("PATH", "Machine") } -# Run Pester tests for specific tool function Invoke-PesterTests { + <# + .SYNOPSIS + Runs Pester tests based on the provided test file and test name. + + .DESCRIPTION + The Invoke-PesterTests function runs Pester tests based on the provided test file and test name. + It supports filtering tests by name and generating test result output. + + .PARAMETER TestFile + The name of the test file to run. This should be the base name of the test file without the extension. + + .PARAMETER TestName + The name of the specific test to run. If provided, only the test with the matching name will be executed. + + .EXAMPLE + Invoke-PesterTests -TestFile "MyTests" -TestName "Test1" + Runs the test named "Test1" from the test file "MyTests.Tests.ps1". + + .EXAMPLE + Invoke-PesterTests -TestFile "*" -TestName "Test2" + Runs all tests from all test files and generates the test result output. + + .NOTES + This function requires the Pester module to be installed. + + #> + Param( [Parameter(Mandatory)][string] $TestFile, [string] $TestName @@ -77,23 +84,47 @@ function Invoke-PesterTests { } } -# Pester Assert to check exit code of command function ShouldReturnZeroExitCode { + <# + .SYNOPSIS + Implements a custom Should-operator for the Pester framework. + + .DESCRIPTION + This function is used to check if a command has returned a zero exit code. + It can be used by registering it using the Add-ShouldOperator function in Pester. + + .PARAMETER ActualValue + The actual value to be checked. + + .PARAMETER Negate + A switch parameter that, when specified, negates the result of the check. + + .PARAMETER Because + An optional string that provides additional context or explanation for the check. + + .NOTES + This function is designed to be used with the Pester framework. + + .LINK + https://pester.dev/docs/assertions/custom-assertions + #> + Param( - [String] $ActualValue, + [string] $ActualValue, [switch] $Negate, [string] $Because ) - $result = Get-CommandResult $ActualValue + $outputLines = (& $env:comspec /c "$ActualValue 2>&1") -as [string[]] + $exitCode = $LASTEXITCODE - [bool]$succeeded = $result.ExitCode -eq 0 + [bool] $succeeded = $exitCode -eq 0 if ($Negate) { $succeeded = -not $succeeded } if (-not $succeeded) { $commandOutputIndent = " " * 4 - $commandOutput = ($result.Output | ForEach-Object { "${commandOutputIndent}${_}" }) -join "`n" - $failureMessage = "Command '${ActualValue}' has finished with exit code ${actualExitCode}`n${commandOutput}" + $commandOutput = ($outputLines | ForEach-Object { "${commandOutputIndent}${_}" }) -join "`n" + $failureMessage = "Command '${ActualValue}' has finished with exit code ${exitCode} and output:`n${commandOutput}" } return [PSCustomObject] @{ @@ -102,53 +133,41 @@ function ShouldReturnZeroExitCode { } } -# Pester Assert to check exit code of command with given parameter, the assertion performed up to 3 checks (without '-', with 1 and 2 '-') until succeeded -function ShouldReturnZeroExitCodeWithParam { - param ( - [Parameter(Mandatory)] [string] $ActualValue, - [switch] $Negate, - [string] $CallParameter = "version", - [string] $CallerSessionState - ) +function ShouldOutputTextMatchingRegex { + <# + .SYNOPSIS + Implements a custom Should-operator for the Pester framework. - $delimiterCharacter = "" + .DESCRIPTION + This function is used to check if a command outputs text that matches a regular expression. + It can be used by registering it using the Add-ShouldOperator function in Pester. - while ($delimiterCharacter.Length -le 2) { - $callParameterWithDelimiter = $delimiterCharacter + $CallParameter - $commandToCheck = "$ActualValue $callParameterWithDelimiter" - [bool]$succeeded = (ShouldReturnZeroExitCode -ActualValue $commandToCheck).Succeeded - - if ($succeeded) { - break - } - $delimiterCharacter += '-' - } - if ($Negate) { $succeeded = -not $succeeded } + .PARAMETER ActualValue + The actual value to be checked. - if (-not $succeeded) { - $failureMessage = "Tool '$ActualValue' has not returned 0 exit code for any of these flags: '$CallParameter' or '-$CallParameter' or '--$CallParameter'" - } + .PARAMETER Negate + A switch parameter that, when specified, negates the result of the check. - return [PSCustomObject] @{ - Succeeded = $succeeded - FailureMessage = $failureMessage - } -} + .PARAMETER Because + An optional string that provides additional context or explanation for the check. + + .NOTES + This function is designed to be used with the Pester framework. + + .LINK + https://pester.dev/docs/assertions/custom-assertions + #> -# Pester Assert to match output of command -function ShouldMatchCommandOutput { Param( [String] $ActualValue, [String] $RegularExpression, [switch] $Negate ) - $output = (Get-CommandResult $ActualValue).Output | Out-String + [string] $output = (& $env:comspec /c "$ActualValue 2>&1") [bool] $succeeded = $output -cmatch $RegularExpression - if ($Negate) { - $succeeded = -not $succeeded - } + if ($Negate) { $succeeded = -not $succeeded } $failureMessage = '' @@ -168,11 +187,10 @@ function ShouldMatchCommandOutput { If (Get-Command -Name Add-ShouldOperator -ErrorAction SilentlyContinue) { Add-ShouldOperator -Name ReturnZeroExitCode -InternalName ShouldReturnZeroExitCode -Test ${function:ShouldReturnZeroExitCode} - Add-ShouldOperator -Name ReturnZeroExitCodeWithParam -InternalName ShouldReturnZeroExitCodeWithParam -Test ${function:ShouldReturnZeroExitCodeWithParam} - Add-ShouldOperator -Name MatchCommandOutput -InternalName ShouldMatchCommandOutput -Test ${function:ShouldMatchCommandOutput} + Add-ShouldOperator -Name OutputTextMatchingRegex -InternalName ShouldOutputTextMatchingRegex -Test ${function:ShouldOutputTextMatchingRegex} } -Function Get-ModuleVersionAsJob { +function Get-ModuleVersionAsJob { Param ( [Parameter(Mandatory)] [String] $modulePath, @@ -197,10 +215,7 @@ Function Get-ModuleVersionAsJob { Remove-Job $testJob } - Export-ModuleMember -Function @( - 'Get-CommandResult' - 'Get-WhichTool' 'Get-EnvironmentVariable' 'Invoke-PesterTests' 'Get-ModuleVersionAsJob' diff --git a/images/windows/scripts/tests/Java.Tests.ps1 b/images/windows/scripts/tests/Java.Tests.ps1 index 9a44486aa877..8245cf837ea3 100644 --- a/images/windows/scripts/tests/Java.Tests.ps1 +++ b/images/windows/scripts/tests/Java.Tests.ps1 @@ -28,13 +28,13 @@ Describe "Java" { $javaVariableValue | Should -Not -BeNullOrEmpty $javaPath = Join-Path $javaVariableValue "bin\java" - $result = Get-CommandResult "`"$javaPath`" -version" - $result.ExitCode | Should -Be 0 - if ($Version -eq 8) { $Version = "1.${Version}" } $outputPattern = "openjdk version `"${Version}" - $result.Output[0] | Should -Match $outputPattern + + $outputLines = (& $env:comspec /c "`"$javaPath`" -version 2>&1") -as [string[]] + $LASTEXITCODE | Should -Be 0 + $outputLines[0] | Should -Match $outputPattern } } diff --git a/images/windows/scripts/tests/MSYS2.Tests.ps1 b/images/windows/scripts/tests/MSYS2.Tests.ps1 index da2444fdfb44..8cca75ef60f0 100644 --- a/images/windows/scripts/tests/MSYS2.Tests.ps1 +++ b/images/windows/scripts/tests/MSYS2.Tests.ps1 @@ -28,7 +28,7 @@ Describe "MSYS2 packages" { } It "<ToolName> is avaialable" -TestCases $TestCases { - "$ToolName" | Should -ReturnZeroExitCodeWithParam + "$ToolName --version" | Should -ReturnZeroExitCode } AfterEach { @@ -43,11 +43,11 @@ foreach ($mingwType in $mingwTypes) { $execDir = Join-Path "C:\msys64" $mingwType.exec_dir | Join-Path -ChildPath "bin" foreach ($tool in $tools) { - Context "$($tool.name) package"{ + Context "$($tool.name) package" { $executables = $tool.executables | ForEach-Object { @{ ExecName = $_ - ExecDir = $execDir + ExecDir = $execDir } } @@ -60,7 +60,7 @@ foreach ($mingwType in $mingwTypes) { } It "<ExecName> is available" -TestCases $executables { - "$ExecName" | Should -ReturnZeroExitCodeWithParam + "$ExecName --version" | Should -ReturnZeroExitCode } AfterEach { @@ -69,4 +69,4 @@ foreach ($mingwType in $mingwTypes) { } } } -} \ No newline at end of file +} diff --git a/images/windows/scripts/tests/Toolset.Tests.ps1 b/images/windows/scripts/tests/Toolset.Tests.ps1 index 7f2e698ebf9e..a8828bb63749 100644 --- a/images/windows/scripts/tests/Toolset.Tests.ps1 +++ b/images/windows/scripts/tests/Toolset.Tests.ps1 @@ -49,13 +49,13 @@ function Test-DefaultVersion { $binaryName = [IO.Path]::GetFileNameWithoutExtension($ToolExecs[0].Binary) $testCase = @{ Binary = $binaryName; Arguments = $ToolExecs[0].Arguments; ExpectedVersion = $ExpectedVersion } It "<ExpectedVersion> is default version" -TestCases $testCase { - $commandResult = Get-CommandResult "$Binary $Arguments" - $commandResult.ExitCode | Should -Be 0 - $commandResult.Output | Should -Match $ExpectedVersion + $outputLines = (& $env:comspec /c "$Binary $Arguments 2>&1") -as [string[]] + $LASTEXITCODE | Should -Be 0 + $outputLines | Should -Match $ExpectedVersion } It "default version is located in tool-cache" -TestCases $testCase { - $binaryFullPath = Get-WhichTool $Binary + $binaryFullPath = (Get-Command $Binary).Path $toolcacheDirectory = Get-TCToolPath -ToolName $Name $binaryFullPath | Should -Match ([Regex]::Escape($toolcacheDirectory)) } From 12066050d06a25f284b44077cd4f4a4033cf4750 Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Mon, 27 Nov 2023 12:28:21 +0100 Subject: [PATCH 2478/3485] [Windows] Refactor script installing Android SDK and packages (#8877) --- .../scripts/build/Install-AndroidSDK.ps1 | 179 ++++++++++------- .../docs-gen/SoftwareReport.Android.psm1 | 15 +- .../windows/scripts/helpers/ImageHelpers.psm1 | 6 +- .../scripts/helpers/InstallHelpers.ps1 | 186 +++++++++++++----- .../windows/scripts/tests/Android.Tests.ps1 | 53 ++--- images/windows/toolsets/toolset-2019.json | 4 +- images/windows/toolsets/toolset-2022.json | 4 +- 7 files changed, 269 insertions(+), 178 deletions(-) diff --git a/images/windows/scripts/build/Install-AndroidSDK.ps1 b/images/windows/scripts/build/Install-AndroidSDK.ps1 index 626cb43b96e6..5233e92b1b5f 100644 --- a/images/windows/scripts/build/Install-AndroidSDK.ps1 +++ b/images/windows/scripts/build/Install-AndroidSDK.ps1 @@ -4,6 +4,58 @@ ## Supply chain security: checksum validation ################################################################################ +# Actual Android SDK installation directory +$SDKInstallRoot = "C:\Program Files (x86)\Android\android-sdk" + +# Hardlink to the Android SDK installation directory with no spaces in the path. +# ANDROID_NDK* env vars should not contain spaces, otherwise ndk-build.cmd gives an error +# https://github.com/actions/runner-images/issues/1122 +$SDKRootPath = "C:\Android\android-sdk" + +#region functions +function Install-AndroidSDKPackages { + <# + .SYNOPSIS + This function installs the specified Android SDK packages. + + .DESCRIPTION + The Install-AndroidSDKPackages function takes an array of package names as a parameter and installs each of them using the sdkmanager.bat script. + + .PARAMETER Packages + An array of package names in the format of SDK-style paths to be installed. + + .EXAMPLE + Install-AndroidSDKPackages -Packages "platforms;android-29", "build-tools;29.0.2" + + This command installs the Android SDK Platform 29 and Build-Tools 29.0.2. + + #> + Param + ( + [Parameter(Mandatory = $true)] + [AllowEmptyCollection()] + [AllowNull()] + [string[]]$Packages + ) + + # The sdkmanager.bat script is used to install Android SDK packages. + $SDKManager = "$SDKRootPath\cmdline-tools\latest\bin\sdkmanager.bat" + + $errors = @() + + foreach ($package in $Packages) { + & $SDKManager --install "$package" --sdk_root=$SDKRootPath + if ($LASTEXITCODE -ne 0) { + $errors += "Failed to install package $package with exit code $LASTEXITCODE" + } + } + + if ($errors.Count -gt 0) { + throw $errors + } +} +#endregion + # get packages to install from the toolset $androidToolset = (Get-ToolsetContent).android # Newer version(s) require Java 11 by default @@ -17,21 +69,17 @@ $localFileHash = (Get-FileHash -Path $cmdlineToolsArchPath -Algorithm SHA256).Ha Use-ChecksumComparison -LocalFileHash $localFileHash -DistributorFileHash $androidToolset.hash #endregion -$sdkInstallRoot = "C:\Program Files (x86)\Android\android-sdk" -$sdkRoot = "C:\Android\android-sdk" -Expand-7ZipArchive -Path $cmdlineToolsArchPath -DestinationPath "${sdkInstallRoot}\cmdline-tools" +Expand-7ZipArchive -Path $cmdlineToolsArchPath -DestinationPath "${SDKInstallRoot}\cmdline-tools" -# cmdline tools should be installed in ${sdkInstallRoot}\cmdline-tools\latest\bin, but archive contains ${sdkInstallRoot}\cmdline-tools\bin +# cmdline tools should be installed in ${SDKInstallRoot}\cmdline-tools\latest\bin, but archive contains ${SDKInstallRoot}\cmdline-tools\bin # we need to create the proper folder structure Invoke-SBWithRetry -Command { - Rename-Item "${sdkInstallRoot}\cmdline-tools\cmdline-tools" "latest" -ErrorAction Stop + Rename-Item "${SDKInstallRoot}\cmdline-tools\cmdline-tools" "latest" -ErrorAction Stop } -# ANDROID_NDK_PATH/HOME should not contain spaces. Otherwise, the script ndk-build.cmd gives an error https://github.com/actions/runner-images/issues/1122 -# create "C:\Android" directory and a hardlink inside pointed to sdk in Program Files -New-Item -Path "C:\Android" -ItemType Directory -New-Item -Path "$sdkRoot" -ItemType SymbolicLink -Value "$sdkInstallRoot" -$sdkManager = "$sdkRoot\cmdline-tools\latest\bin\sdkmanager.bat" +# Create hardlink at $SDKRootPath pointing to SDK installation directory in Program Files +New-Item -Path (Split-Path $SDKRootPath -Parent) -ItemType Directory -Force +New-Item -Path "$SDKRootPath" -ItemType SymbolicLink -Value "$SDKInstallRoot" # Install the standard Android SDK licenses. Currently, there isn't a better way to do this, # so we are base64-encoded a zip of the licenses directory from another installation. @@ -42,92 +90,73 @@ $sdkManager = "$sdkRoot\cmdline-tools\latest\bin\sdkmanager.bat" # $base64Content = [Convert]::ToBase64String([IO.File]::ReadAllBytes($LicensesZipFileName)) # echo $base64Content # Another possible solution that works in powershell core: -# Write-Ouptut "y" | $sdkManager <packagename> +# Write-Ouptut "y" | $sdkmanager.bat <packagename> $licenseContentBase64 = "UEsDBBQAAAAAAKNK11IAAAAAAAAAAAAAAAAJAAAAbGljZW5zZXMvUEsDBAoAAAAAAJ1K11K7n0IrKgAAACoAAAAhAAAAbGljZW5zZXMvYW5kcm9pZC1nb29nbGV0di1saWNlbnNlDQo2MDEwODViOTRjZDc3ZjBiNTRmZjg2NDA2OTU3MDk5ZWJlNzljNGQ2UEsDBAoAAAAAAKBK11LzQumJKgAAACoAAAAkAAAAbGljZW5zZXMvYW5kcm9pZC1zZGstYXJtLWRidC1saWNlbnNlDQo4NTlmMzE3Njk2ZjY3ZWYzZDdmMzBhNTBhNTU2MGU3ODM0YjQzOTAzUEsDBAoAAAAAAKFK11IKSOJFKgAAACoAAAAcAAAAbGljZW5zZXMvYW5kcm9pZC1zZGstbGljZW5zZQ0KMjQzMzNmOGE2M2I2ODI1ZWE5YzU1MTRmODNjMjgyOWIwMDRkMWZlZVBLAwQKAAAAAACiStdSec1a4SoAAAAqAAAAJAAAAGxpY2Vuc2VzL2FuZHJvaWQtc2RrLXByZXZpZXctbGljZW5zZQ0KODQ4MzFiOTQwOTY0NmE5MThlMzA1NzNiYWI0YzljOTEzNDZkOGFiZFBLAwQKAAAAAACiStdSk6vQKCoAAAAqAAAAGwAAAGxpY2Vuc2VzL2dvb2dsZS1nZGstbGljZW5zZQ0KMzNiNmEyYjY0NjA3ZjExYjc1OWYzMjBlZjlkZmY0YWU1YzQ3ZDk3YVBLAwQKAAAAAACiStdSrE3jESoAAAAqAAAAJAAAAGxpY2Vuc2VzL2ludGVsLWFuZHJvaWQtZXh0cmEtbGljZW5zZQ0KZDk3NWY3NTE2OThhNzdiNjYyZjEyNTRkZGJlZWQzOTAxZTk3NmY1YVBLAwQKAAAAAACjStdSkb1vWioAAAAqAAAAJgAAAGxpY2Vuc2VzL21pcHMtYW5kcm9pZC1zeXNpbWFnZS1saWNlbnNlDQplOWFjYWI1YjVmYmI1NjBhNzJjZmFlY2NlODk0Njg5NmZmNmFhYjlkUEsBAj8AFAAAAAAAo0rXUgAAAAAAAAAAAAAAAAkAJAAAAAAAAAAQAAAAAAAAAGxpY2Vuc2VzLwoAIAAAAAAAAQAYACIHOBcRaNcBIgc4FxFo1wHBTVQTEWjXAVBLAQI/AAoAAAAAAJ1K11K7n0IrKgAAACoAAAAhACQAAAAAAAAAIAAAACcAAABsaWNlbnNlcy9hbmRyb2lkLWdvb2dsZXR2LWxpY2Vuc2UKACAAAAAAAAEAGACUEFUTEWjXAZQQVRMRaNcB6XRUExFo1wFQSwECPwAKAAAAAACgStdS80LpiSoAAAAqAAAAJAAkAAAAAAAAACAAAACQAAAAbGljZW5zZXMvYW5kcm9pZC1zZGstYXJtLWRidC1saWNlbnNlCgAgAAAAAAABABgAsEM0FBFo1wGwQzQUEWjXAXb1MxQRaNcBUEsBAj8ACgAAAAAAoUrXUgpI4kUqAAAAKgAAABwAJAAAAAAAAAAgAAAA/AAAAGxpY2Vuc2VzL2FuZHJvaWQtc2RrLWxpY2Vuc2UKACAAAAAAAAEAGAAsMGUVEWjXASwwZRURaNcB5whlFRFo1wFQSwECPwAKAAAAAACiStdSec1a4SoAAAAqAAAAJAAkAAAAAAAAACAAAABgAQAAbGljZW5zZXMvYW5kcm9pZC1zZGstcHJldmlldy1saWNlbnNlCgAgAAAAAAABABgA7s3WFRFo1wHuzdYVEWjXAfGm1hURaNcBUEsBAj8ACgAAAAAAokrXUpOr0CgqAAAAKgAAABsAJAAAAAAAAAAgAAAAzAEAAGxpY2Vuc2VzL2dvb2dsZS1nZGstbGljZW5zZQoAIAAAAAAAAQAYAGRDRxYRaNcBZENHFhFo1wFfHEcWEWjXAVBLAQI/AAoAAAAAAKJK11KsTeMRKgAAACoAAAAkACQAAAAAAAAAIAAAAC8CAABsaWNlbnNlcy9pbnRlbC1hbmRyb2lkLWV4dHJhLWxpY2Vuc2UKACAAAAAAAAEAGADGsq0WEWjXAcayrRYRaNcBxrKtFhFo1wFQSwECPwAKAAAAAACjStdSkb1vWioAAAAqAAAAJgAkAAAAAAAAACAAAACbAgAAbGljZW5zZXMvbWlwcy1hbmRyb2lkLXN5c2ltYWdlLWxpY2Vuc2UKACAAAAAAAAEAGAA4LjgXEWjXATguOBcRaNcBIgc4FxFo1wFQSwUGAAAAAAgACACDAwAACQMAAAAA" $licenseContent = [System.Convert]::FromBase64String($licenseContentBase64) -Set-Content -Path "$sdkInstallRoot\android-sdk-licenses.zip" -Value $licenseContent -Encoding Byte -Expand-7ZipArchive -Path "$sdkInstallRoot\android-sdk-licenses.zip" -DestinationPath $sdkInstallRoot - -# install platform-tools -$platformToolsPath = Join-Path -Path $sdkInstallRoot -ChildPath "platform-tools" -# Remove outdated platform-tools that was brought by Visual Studio Android package -if (Test-Path $platformToolsPath) -{ +Set-Content -Path "$SDKInstallRoot\android-sdk-licenses.zip" -Value $licenseContent -Encoding Byte +Expand-7ZipArchive -Path "$SDKInstallRoot\android-sdk-licenses.zip" -DestinationPath $SDKInstallRoot + +# Install platform-tools +$platformToolsPath = Join-Path -Path $SDKInstallRoot -ChildPath "platform-tools" +if (Test-Path $platformToolsPath) { Write-Host "Removing previous platform-tools installation from Visual Studio component" Remove-Item $platformToolsPath -Recurse -Force } - -Install-AndroidSDKPackages -AndroidSDKManagerPath $sdkManager ` - -AndroidSDKRootPath $sdkRoot ` - -AndroidPackages "platform-tools" - -# get packages info -$androidPackages = Get-AndroidPackages -AndroidSDKManagerPath $sdkManager - -# platforms -[int]$platformMinVersion = $androidToolset.platform_min_version -$platformList = Get-AndroidPackagesByVersion -AndroidPackages $androidPackages ` - -PrefixPackageName "platforms;" ` - -MinimumVersion $platformMinVersion ` - -Delimiter "-" ` - -Index 1 - -# build-tools -[version]$buildToolsMinVersion = $androidToolset.build_tools_min_version -$buildToolsList = Get-AndroidPackagesByVersion -AndroidPackages $androidPackages ` - -PrefixPackageName "build-tools;" ` - -MinimumVersion $buildToolsMinVersion ` - -Delimiter ";" ` - -Index 1 - -Install-AndroidSDKPackages -AndroidSDKManagerPath $sdkManager ` - -AndroidSDKRootPath $sdkRoot ` - -AndroidPackages $platformList - -Install-AndroidSDKPackages -AndroidSDKManagerPath $sdkManager ` - -AndroidSDKRootPath $sdkRoot ` - -AndroidPackages $buildToolsList - -Install-AndroidSDKPackages -AndroidSDKManagerPath $sdkManager ` - -AndroidSDKRootPath $sdkRoot ` - -AndroidPackages $androidToolset.extra_list ` - -PrefixPackageName "extras;" - -Install-AndroidSDKPackages -AndroidSDKManagerPath $sdkManager ` - -AndroidSDKRootPath $sdkRoot ` - -AndroidPackages $androidToolset.addon_list ` - -PrefixPackageName "add-ons;" - -Install-AndroidSDKPackages -AndroidSDKManagerPath $sdkManager ` - -AndroidSDKRootPath $sdkRoot ` - -AndroidPackages $androidToolset.additional_tools - -# NDKs +Install-AndroidSDKPackages "platform-tools" + +# Get Android SDK packages list +$androidPackages = Get-AndroidPackages -SDKRootPath $SDKRootPath + +# Install Android platform versions +# that are greater than or equal to the minimum version +Write-Host "Installing Android SDK packages for platforms..." +$platformList = Get-AndroidPlatformPackages ` + -SDKRootPath $SDKRootPath ` + -minVersion $androidToolset.platform_min_version +Install-AndroidSDKPackages $platformList + +# Install Android build-tools versions +# that are greater than or equal to the minimum version +Write-Host "Installing Android SDK packages for build tools..." +$buildToolsList = Get-AndroidBuildToolPackages ` + -SDKRootPath $SDKRootPath ` + -minVersion $androidToolset.build_tools_min_version +Install-AndroidSDKPackages $buildToolsList + +# Install extras, add-ons and additional tools +Write-Host "Installing Android SDK extras, add-ons and additional tools..." +Install-AndroidSDKPackages ($androidToolset.extras | ForEach-Object { "extras;$_" }) +Install-AndroidSDKPackages ($androidToolset.addons | ForEach-Object { "add-ons;$_" }) +Install-AndroidSDKPackages ($androidToolset.additional_tools) + +# Install NDKs $ndkMajorVersions = $androidToolset.ndk.versions $ndkDefaultMajorVersion = $androidToolset.ndk.default $ndkLatestMajorVersion = $ndkMajorVersions | Select-Object -Last 1 -$androidNDKs = $ndkMajorVersions | Foreach-Object { - Get-AndroidPackagesByName -AndroidPackages $androidPackages -PrefixPackageName "ndk;$_" | Sort-Object -Unique | Select-Object -Last 1 +$androidNDKs = @() +foreach ($version in $ndkMajorVersions) { + $packageNamePrefix = "ndk;$version" + $package = $androidPackages | Where-Object { $_.StartsWith($packageNamePrefix) } | Sort-Object -Unique | Select-Object -Last 1 + $androidNDKs += $package } -Install-AndroidSDKPackages -AndroidSDKManagerPath $sdkManager ` - -AndroidSDKRootPath $sdkRoot ` - -AndroidPackages $androidNDKs +Write-Host "Installing Android SDK packages for NDKs..." +Install-AndroidSDKPackages $androidNDKs $ndkLatestVersion = ($androidNDKs | Where-Object { $_ -match "ndk;$ndkLatestMajorVersion" }).Split(';')[1] $ndkDefaultVersion = ($androidNDKs | Where-Object { $_ -match "ndk;$ndkDefaultMajorVersion" }).Split(';')[1] -$ndkRoot = "$sdkRoot\ndk\$ndkDefaultVersion" +$ndkRoot = "$SDKRootPath\ndk\$ndkDefaultVersion" # Create env variables -[Environment]::SetEnvironmentVariable("ANDROID_HOME", $sdkRoot, "Machine") -[Environment]::SetEnvironmentVariable("ANDROID_SDK_ROOT", $sdkRoot, "Machine") +[Environment]::SetEnvironmentVariable("ANDROID_HOME", $SDKRootPath, "Machine") +[Environment]::SetEnvironmentVariable("ANDROID_SDK_ROOT", $SDKRootPath, "Machine") # ANDROID_NDK, ANDROID_NDK_HOME, and ANDROID_NDK_ROOT variables should be set as many customer builds depend on them https://github.com/actions/runner-images/issues/5879 [Environment]::SetEnvironmentVariable("ANDROID_NDK", $ndkRoot, "Machine") [Environment]::SetEnvironmentVariable("ANDROID_NDK_HOME", $ndkRoot, "Machine") [Environment]::SetEnvironmentVariable("ANDROID_NDK_ROOT", $ndkRoot, "Machine") -$ndkLatestPath = "$sdkRoot\ndk\$ndkLatestVersion" +$ndkLatestPath = "$SDKRootPath\ndk\$ndkLatestVersion" if (Test-Path $ndkLatestPath) { [Environment]::SetEnvironmentVariable("ANDROID_NDK_LATEST_HOME", $ndkLatestPath, "Machine") } else { diff --git a/images/windows/scripts/docs-gen/SoftwareReport.Android.psm1 b/images/windows/scripts/docs-gen/SoftwareReport.Android.psm1 index ac614dd07e4a..ad46586efdc9 100644 --- a/images/windows/scripts/docs-gen/SoftwareReport.Android.psm1 +++ b/images/windows/scripts/docs-gen/SoftwareReport.Android.psm1 @@ -15,17 +15,6 @@ function Get-AndroidSDKRoot { return "Location $path" } -function Get-AndroidSDKManagerPath { - return Join-Path $env:ANDROID_HOME "cmdline-tools\latest\bin\sdkmanager.bat" -} - -function Get-AndroidInstalledPackages { - $androidSDKManagerPath = Get-AndroidSDKManagerPath - $androidSDKManagerList = cmd /c "$androidSDKManagerPath --list_installed 2>&1" - $androidSDKManagerList = $androidSDKManagerList -notmatch "Warning" - return $androidSDKManagerList -} - function Build-AndroidTable { $packageInfo = Get-AndroidInstalledPackages return @( @@ -84,7 +73,7 @@ function Build-AndroidTable { ) | Where-Object { $_.Version } | ForEach-Object { [PSCustomObject] @{ "Package Name" = $_.Package - "Version" = $_.Version + "Version" = $_.Version } } } @@ -121,7 +110,7 @@ function Get-AndroidPlatformVersions { } function Get-AndroidCommandLineToolsVersion { - $commandLineTools = Get-AndroidSDKManagerPath + $commandLineTools = (Join-Path $env:ANDROID_HOME "cmdline-tools\latest\bin\sdkmanager.bat") (cmd /c "$commandLineTools --version 2>NUL" | Out-String).Trim() -match "(?<version>^(\d+\.){1,}\d+$)" | Out-Null $commandLineToolsVersion = $Matches.Version return $commandLineToolsVersion diff --git a/images/windows/scripts/helpers/ImageHelpers.psm1 b/images/windows/scripts/helpers/ImageHelpers.psm1 index 1db9f5b5a36c..e83f530a7795 100644 --- a/images/windows/scripts/helpers/ImageHelpers.psm1 +++ b/images/windows/scripts/helpers/ImageHelpers.psm1 @@ -40,10 +40,10 @@ Export-ModuleMember -Function @( 'Expand-7ZipArchive' 'Invoke-SBWithRetry' 'Get-VsCatalogJsonPath' - 'Install-AndroidSDKPackages' 'Get-AndroidPackages' - 'Get-AndroidPackagesByName' - 'Get-AndroidPackagesByVersion' + 'Get-AndroidPlatformPackages' + 'Get-AndroidBuildToolPackages' + 'Get-AndroidInstalledPackages' 'Get-VisualStudioInstance' 'Get-VisualStudioComponents' 'Get-WindowsUpdatesHistory' diff --git a/images/windows/scripts/helpers/InstallHelpers.ps1 b/images/windows/scripts/helpers/InstallHelpers.ps1 index 24db81e8521b..354b22115c39 100644 --- a/images/windows/scripts/helpers/InstallHelpers.ps1 +++ b/images/windows/scripts/helpers/InstallHelpers.ps1 @@ -431,70 +431,168 @@ function Expand-7ZipArchive { } } -function Install-AndroidSDKPackages { +function Get-AndroidPackages { + <# + .SYNOPSIS + This function returns a list of available Android packages. + + .DESCRIPTION + The Get-AndroidPackages function checks if a list of packages is already available in a file. + If not, it uses the sdkmanager.bat script to generate a list of available packages and saves it to a file. + It then returns the content of this file. + + .PARAMETER SDKRootPath + The root path of the Android SDK installation. + If not specified, the function uses the ANDROID_HOME environment variable. + + .EXAMPLE + Get-AndroidPackages -SDKRootPath "C:\Android\SDK" + + This command returns a list of available Android packages for the specified SDK root path. + + .NOTES + This function requires the Android SDK to be installed and the sdkmanager.bat script to be accessible. + + #> Param ( - [Parameter(Mandatory=$true)] - [string]$AndroidSDKManagerPath, - [Parameter(Mandatory=$true)] - [string]$AndroidSDKRootPath, - [Parameter(Mandatory=$true)] - [AllowEmptyCollection()] - [string[]]$AndroidPackages, - [string] $PrefixPackageName + [string]$SDKRootPath ) + + if (-not $SDKRootPath) { + $SDKRootPath = $env:ANDROID_HOME + } - foreach ($package in $AndroidPackages) { - & $AndroidSDKManagerPath --sdk_root=$AndroidSDKRootPath "$PrefixPackageName$package" + $packagesListFile = "$SDKRootPath\packages-list.txt" + $sdkManager = "$SDKRootPath\cmdline-tools\latest\bin\sdkmanager.bat" + + if (-Not (Test-Path -Path $packagesListFile -PathType Leaf)) { + (cmd /c "$sdkManager --list --verbose 2>&1") | + Where-Object { $_ -Match "^[^\s]" } | + Where-Object { $_ -NotMatch "^(Loading |Info: Parsing |---|\[=+|Installed |Available )" } | + Where-Object { $_ -NotMatch "^[^;]*$" } | + Out-File -FilePath $packagesListFile } + + return Get-Content $packagesListFile } -function Get-AndroidPackages { +function Get-AndroidPlatformPackages { + <# + .SYNOPSIS + This function returns a list of available Android platform packages. + + .DESCRIPTION + The Get-AndroidPlatformPackages function uses the Get-AndroidPackages function to get a list of available packages + and filters it to return only platform packages. + + .PARAMETER SDKRootPath + The root path of the Android SDK installation. + If not specified, the function uses the ANDROID_HOME environment variable. + + .PARAMETER minimumVersion + The minimum version of the platform packages to include in the result. Default is 0. + + .EXAMPLE + Get-AndroidPlatformPackages -SDKRootPath "C:\Android\SDK" -minimumVersion 29 + + This command returns a list of available Android platform packages for the specified SDK root path with a minimum version of 29. + + .NOTES + This function requires the Android SDK to be installed and the sdkmanager.bat script to be accessible. + + #> Param ( - [Parameter(Mandatory=$true)] - [string]$AndroidSDKManagerPath + [string]$SDKRootPath, + [Alias("minVersion")] + [int]$minimumVersion = 0 ) - - $packagesListFile = "C:\Android\android-sdk\packages-list.txt" - - if (-Not (Test-Path -Path $packagesListFile -PathType Leaf)) { - (cmd /c "$AndroidSDKManagerPath --list --verbose 2>&1") | - Where-Object { $_ -Match "^[^\s]" } | - Where-Object { $_ -NotMatch "^(Loading |Info: Parsing |---|\[=+|Installed |Available )" } | - Where-Object { $_ -NotMatch "^[^;]*$" } | - Out-File -FilePath $packagesListFile + + if (-not $SDKRootPath) { + $SDKRootPath = $env:ANDROID_HOME } - return Get-Content $packagesListFile + return (Get-AndroidPackages -SDKRootPath $SDKRootPath) ` + | Where-Object { "$_".StartsWith("platforms;") } ` + | Where-Object { ($_.Split("-")[1] -as [int]) -ge $minimumVersion } ` + | Sort-Object -Unique } -function Get-AndroidPackagesByName { - Param ( - [Parameter(Mandatory=$true)] - [string[]]$AndroidPackages, - [Parameter(Mandatory=$true)] - [string]$PrefixPackageName +function Get-AndroidBuildToolPackages { + <# + .SYNOPSIS + This function returns a list of available Android build tool packages. + + .DESCRIPTION + The Get-AndroidBuildToolPackages function uses the Get-AndroidPackages function to get a list of available packages + and filters it to return only build tool packages. + + .PARAMETER SDKRootPath + The root path of the Android SDK installation. + If not specified, the function uses the ANDROID_HOME environment variable. + + .PARAMETER minimumVersion + The minimum version of the build tool packages to include in the result. Default is 0.0.0. + + .EXAMPLE + Get-AndroidBuildToolPackages -SDKRootPath "C:\Android\SDK" -minimumVersion "30.0.2" + + This command returns a list of available Android build tool packages for the specified SDK root path with a minimum version of 30.0.2. + + .NOTES + This function requires the Android SDK to be installed and the sdkmanager.bat script to be accessible. + + #> + Param + ( + [string]$SDKRootPath, + [Alias("minVersion")] + [version]$minimumVersion = "0.0.0" ) + + if (-not $SDKRootPath) { + $SDKRootPath = $env:ANDROID_HOME + } - return $AndroidPackages | Where-Object { "$_".StartsWith($PrefixPackageName) } + return (Get-AndroidPackages -SDKRootPath $SDKRootPath) ` + | Where-Object { "$_".StartsWith("build-tools;") } ` + | Where-Object { ($_.Split(";")[1] -as [version]) -ge $minimumVersion } ` + | Sort-Object -Unique } -function Get-AndroidPackagesByVersion { - Param ( - [Parameter(Mandatory=$true)] - [string[]]$AndroidPackages, - [Parameter(Mandatory=$true)] - [string]$PrefixPackageName, - [object]$MinimumVersion, - [char]$Delimiter, - [int]$Index = 0 +function Get-AndroidInstalledPackages { + <# + .SYNOPSIS + Retrieves a list of installed Android packages. + + .DESCRIPTION + This function retrieves a list of installed Android packages using the specified SDK root path. + + .PARAMETER SDKRootPath + The root path of the Android SDK. + If not specified, the function uses the ANDROID_HOME environment variable. + + .EXAMPLE + Get-AndroidInstalledPackages -SDKRootPath "C:\Android\SDK" + Retrieves a list of installed Android packages using the specified SDK root path. + + .NOTES + This function requires the Android SDK to be installed and the SDK root path to be provided. + #> + + Param + ( + [string]$SDKRootPath ) + + if (-not $SDKRootPath) { + $SDKRootPath = $env:ANDROID_HOME + } + + $sdkManager = "$SDKRootPath\cmdline-tools\latest\bin\sdkmanager.bat" - $Type = $MinimumVersion.GetType() - $packagesByName = Get-AndroidPackagesByName -AndroidPackages $AndroidPackages -PrefixPackageName $PrefixPackageName - $packagesByVersion = $packagesByName | Where-Object { ($_.Split($Delimiter)[$Index] -as $Type) -ge $MinimumVersion } - return $packagesByVersion | Sort-Object -Unique + return (cmd /c "$sdkManager --list_installed 2>&1") -notmatch "Warning" } function Get-WindowsUpdatesHistory { diff --git a/images/windows/scripts/tests/Android.Tests.ps1 b/images/windows/scripts/tests/Android.Tests.ps1 index b05668ce5951..3ed9da8b75e8 100644 --- a/images/windows/scripts/tests/Android.Tests.ps1 +++ b/images/windows/scripts/tests/Android.Tests.ps1 @@ -1,56 +1,31 @@ -Import-Module (Join-Path $PSScriptRoot "..\SoftwareReport\SoftwareReport.Android.psm1") -DisableNameChecking - Describe "Android SDK" { $androidToolset = (Get-ToolsetContent).android - $androidPackages = Get-AndroidPackages -AndroidSDKManagerPath (Get-AndroidSDKManagerPath) $androidInstalledPackages = Get-AndroidInstalledPackages - $ndkDefaultMajorVersion = $androidToolset.ndk.default - $ndkDefaultFullVersion = Get-ChildItem "$env:ANDROID_HOME/ndk/$ndkDefaultMajorVersion.*" -Name | Select-Object -Last 1 - $ndkVersions = $androidToolset.ndk.versions - $ndkPackagesTestCases = $ndkVersions | ForEach-Object { - @{ ndkPackage = $_; installedPackages = $androidInstalledPackages } + $platformList = Get-AndroidPlatformPackages -minVersion $androidToolset.platform_min_version + $platformTestCases = $platformList | ForEach-Object { + @{ platformVersion = $_; installedPackages = $androidInstalledPackages } } - $platformTestCases = @() - [int]$platformMinVersion = $androidToolset.platform_min_version - $platformList = Get-AndroidPackagesByVersion -AndroidPackages $androidPackages ` - -PrefixPackageName "platforms;" ` - -MinimumVersion $platformMinVersion ` - -Delimiter "-" ` - -Index 1 - - $platformList | ForEach-Object { - $platformTestCases += @{ platformVersion = $_; installedPackages = $androidInstalledPackages } + $buildToolsList = Get-AndroidBuildToolPackages -minVersion $androidToolset.build_tools_min_version + $buildToolsTestCases = $buildToolsList | ForEach-Object { + @{ buildToolsVersion = $_; installedPackages = $androidInstalledPackages } } - $buildToolsTestCases = @() - [version]$buildToolsMinVersion = $androidToolset.build_tools_min_version - $buildToolsList = Get-AndroidPackagesByVersion -AndroidPackages $androidPackages ` - -PrefixPackageName "build-tools;" ` - -MinimumVersion $buildToolsMinVersion ` - -Delimiter ";" ` - -Index 1 - $buildToolsList | ForEach-Object { - $buildToolsTestCases += @{ buildToolsVersion = $_; installedPackages = $androidInstalledPackages } + $extraPackagesTestCases = $androidToolset.extra_list | ForEach-Object { + @{ extraPackage = $_; installedPackages = $androidInstalledPackages } } - $extraPackagesTestCases = @() - $extraPackageList = $androidToolset.extra_list - $extraPackageList | ForEach-Object { - $extraPackagesTestCases += @{ extraPackage = $_; installedPackages = $androidInstalledPackages } + $addonsTestCases = $androidToolset.addon_list | ForEach-Object { + @{ addonPackage = $_; installedPackages = $androidInstalledPackages } } - $addonsTestCases = @() - $addonsPackageList = $androidToolset.addon_list - $addonsPackageList | ForEach-Object { - $addonsTestCases += @{ addonPackage = $_; installedPackages = $androidInstalledPackages } + $additionalToolsTestCases = $androidToolset.additional_tools | ForEach-Object { + @{ additionalToolVersion = $_; installedPackages = $androidInstalledPackages } } - $additionalToolsTestCases = @() - $additionalToolsList = $androidToolset.additional_tools - $additionalToolsList | ForEach-Object { - $additionalToolsTestCases += @{ additionalToolVersion = $_; installedPackages = $androidInstalledPackages } + $ndkPackagesTestCases = $androidToolset.ndk.versions | ForEach-Object { + @{ ndkPackage = $_; installedPackages = $androidInstalledPackages } } Context "SDKManagers" { diff --git a/images/windows/toolsets/toolset-2019.json b/images/windows/toolsets/toolset-2019.json index d4640fb27d24..0b9381a5cda2 100644 --- a/images/windows/toolsets/toolset-2019.json +++ b/images/windows/toolsets/toolset-2019.json @@ -151,7 +151,7 @@ "hash": "8A90E6A3DEB2FA13229B2E335EFD07687DCC8A55A3C544DA9F40B41404993E7D", "platform_min_version": "19", "build_tools_min_version": "19.1.0", - "extra_list": [ + "extras": [ "android;m2repository", "google;m2repository", "google;google_play_services", @@ -160,7 +160,7 @@ "m2repository;com;android;support;constraint;constraint-layout;1.0.2", "m2repository;com;android;support;constraint;constraint-layout;1.0.1" ], - "addon_list": [ + "addons": [ "addon-google_apis-google-24", "addon-google_apis-google-23", "addon-google_apis-google-22", diff --git a/images/windows/toolsets/toolset-2022.json b/images/windows/toolsets/toolset-2022.json index 64bf6f1790c8..9dac7d5526bf 100644 --- a/images/windows/toolsets/toolset-2022.json +++ b/images/windows/toolsets/toolset-2022.json @@ -135,12 +135,12 @@ "hash": "8A90E6A3DEB2FA13229B2E335EFD07687DCC8A55A3C544DA9F40B41404993E7D", "platform_min_version": "27", "build_tools_min_version": "27.0.0", - "extra_list": [ + "extras": [ "android;m2repository", "google;m2repository", "google;google_play_services" ], - "addon_list": [], + "addons": [], "additional_tools": [ "cmake;3.18.1", "cmake;3.22.1" From e1e621e78c354c285d3064e9215677bdfd8643eb Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Mon, 27 Nov 2023 12:29:42 +0100 Subject: [PATCH 2479/3485] [Windows] Update helper function that returns Windows Update states (#8878) --- .../scripts/build/Install-WindowsUpdates.ps1 | 12 ++--- .../Install-WindowsUpdatesAfterReboot.ps1 | 4 +- .../windows/scripts/helpers/ImageHelpers.psm1 | 2 +- .../scripts/helpers/InstallHelpers.ps1 | 48 +++++++++++++------ .../scripts/tests/WindowsFeatures.Tests.ps1 | 12 ++--- 5 files changed, 49 insertions(+), 29 deletions(-) diff --git a/images/windows/scripts/build/Install-WindowsUpdates.ps1 b/images/windows/scripts/build/Install-WindowsUpdates.ps1 index c6828719f40a..b9da01836a83 100644 --- a/images/windows/scripts/build/Install-WindowsUpdates.ps1 +++ b/images/windows/scripts/build/Install-WindowsUpdates.ps1 @@ -21,14 +21,14 @@ function Install-WindowsUpdates { Write-Host "Installing windows updates" Get-WindowsUpdate -MicrosoftUpdate -NotKBArticleID "KB5001148" -AcceptAll -Install -IgnoreUserInput -IgnoreReboot | Out-Host - Write-Host "Validating windows updates installation and skip Microsoft Defender Antivirus" - # Azure service can automatic updates AV engine(Microsoft.Azure.Security.AntimalwareSignature.AntimalwareConfiguration) + Write-Host "Validating windows updates installation" # Get-WUHistory doesn't support Windows Server 2022 - $wuHistory = Get-WindowsUpdatesHistory | Where-Object { $_.Status -in ("Successful", "InProgress") } - $wuFail = $updates[0] | Where-Object Title -notmatch "Microsoft Defender Antivirus" | Where-Object { -not ($wuHistory.Title -match $_.KB) } + $notFailedUpdateNames = Get-WindowsUpdateStates | Where-Object { $_.State -in ("Installed", "Running") } | Select-Object -ExpandProperty Title + # We ignore Microsoft Defender Antivirus updates; Azure service updates AV automatically + $failedUpdates = $updates[0] | Where-Object Title -notmatch "Microsoft Defender Antivirus" | Where-Object { -not ($notFailedUpdateNames -match $_.KB) } - if ( $wuFail ) { - Write-Host "Windows updates failed to install: $($wuFail.KB)" + if ( $failedUpdates ) { + Write-Host "Windows updates failed to install: $($failedUpdates.KB)" exit 1 } } diff --git a/images/windows/scripts/build/Install-WindowsUpdatesAfterReboot.ps1 b/images/windows/scripts/build/Install-WindowsUpdatesAfterReboot.ps1 index 4d782299b231..401a45ed0324 100644 --- a/images/windows/scripts/build/Install-WindowsUpdatesAfterReboot.ps1 +++ b/images/windows/scripts/build/Install-WindowsUpdatesAfterReboot.ps1 @@ -4,9 +4,9 @@ ################################################################################ Invoke-SBWithRetry -RetryCount 10 -RetryIntervalSeconds 120 -Command { - $inProgress = Get-WindowsUpdatesHistory | Where-Object Status -eq "InProgress" | Where-Object Title -notmatch "Microsoft Defender Antivirus" + $inProgress = Get-WindowsUpdateStates | Where-Object State -eq "Running" | Where-Object Title -notmatch "Microsoft Defender Antivirus" if ( $inProgress ) { $title = $inProgress.Title -join "`n" - throw "InProgress: $title" + throw "Windows updates are still installing: $title" } } diff --git a/images/windows/scripts/helpers/ImageHelpers.psm1 b/images/windows/scripts/helpers/ImageHelpers.psm1 index e83f530a7795..dfbcd8eb2fae 100644 --- a/images/windows/scripts/helpers/ImageHelpers.psm1 +++ b/images/windows/scripts/helpers/ImageHelpers.psm1 @@ -46,7 +46,7 @@ Export-ModuleMember -Function @( 'Get-AndroidInstalledPackages' 'Get-VisualStudioInstance' 'Get-VisualStudioComponents' - 'Get-WindowsUpdatesHistory' + 'Get-WindowsUpdateStates' 'New-ItemPath' 'Use-ChecksumComparison' 'Get-HashFromGitHubReleaseBody' diff --git a/images/windows/scripts/helpers/InstallHelpers.ps1 b/images/windows/scripts/helpers/InstallHelpers.ps1 index 354b22115c39..b1daaee012a9 100644 --- a/images/windows/scripts/helpers/InstallHelpers.ps1 +++ b/images/windows/scripts/helpers/InstallHelpers.ps1 @@ -595,14 +595,33 @@ function Get-AndroidInstalledPackages { return (cmd /c "$sdkManager --list_installed 2>&1") -notmatch "Warning" } -function Get-WindowsUpdatesHistory { - $allEvents = @{} - # 19 - Installation Successful: Windows successfully installed the following update - # 20 - Installation Failure: Windows failed to install the following update with error - # 43 - Installation Started: Windows has started installing the following update +function Get-WindowsUpdateStates { + <# + .SYNOPSIS + Retrieves the status of Windows updates. + + .DESCRIPTION + The Get-WindowsUpdateStates function checks the Windows Event Log for specific event IDs related to Windows updates and returns a custom PowerShell object with the state and title of each update. + + .PARAMETER None + This function does not take any parameters. + + .OUTPUTS + PSCustomObject. This function returns a collection of custom PowerShell objects. Each object has two properties: + - State: A string that represents the state of the update. Possible values are "Installed", "Failed", and "Running". + - Title: A string that represents the title of the update. + + .NOTES + Event IDs used: + - 19: Installation Successful: Windows successfully installed the following update + - 20: Installation Failure: Windows failed to install the following update with error + - 43: Installation Started: Windows has started installing the following update + #> + + $completedUpdates = @{} $filter = @{ - LogName = "System" - Id = 19, 20, 43 + LogName = "System" + Id = 19, 20, 43 ProviderName = "Microsoft-Windows-WindowsUpdateClient" } $events = Get-WinEvent -FilterHashtable $filter -ErrorAction SilentlyContinue | Sort-Object Id @@ -610,30 +629,31 @@ function Get-WindowsUpdatesHistory { foreach ( $event in $events ) { switch ( $event.Id ) { 19 { - $status = "Successful" + $state = "Installed" $title = $event.Properties[0].Value - $allEvents[$title] = "" + $completedUpdates[$title] = "" break } 20 { - $status = "Failure" + $state = "Failed" $title = $event.Properties[1].Value - $allEvents[$title] = "" + $completedUpdates[$title] = "" break } 43 { - $status = "InProgress" + $state = "Running" $title = $event.Properties[0].Value break } } - if ( $status -eq "InProgress" -and $allEvents.ContainsKey($title) ) { + # Skip update started event if it was already completed + if ( $state -eq "Running" -and $completedUpdates.ContainsKey($title) ) { continue } [PSCustomObject]@{ - Status = $status + State = $state Title = $title } } diff --git a/images/windows/scripts/tests/WindowsFeatures.Tests.ps1 b/images/windows/scripts/tests/WindowsFeatures.Tests.ps1 index a170e6cd720d..802dc6f7fa34 100644 --- a/images/windows/scripts/tests/WindowsFeatures.Tests.ps1 +++ b/images/windows/scripts/tests/WindowsFeatures.Tests.ps1 @@ -62,19 +62,19 @@ Describe "Windows Updates" { "$env:windir\WindowsUpdateDone.txt" | Should -Exist } - $testCases = Get-WindowsUpdatesHistory | Sort-Object Title | ForEach-Object { + $testCases = Get-WindowsUpdateStates | Sort-Object Title | ForEach-Object { @{ - Title = $_.Title - Status = $_.Status + Title = $_.Title + State = $_.State } } It "<Title>" -TestCases $testCases { - $expect = "Successful" + $expect = "Installed" if ( $Title -match "Microsoft Defender Antivirus" ) { - $expect = "Successful", "Failure", "InProgress" + $expect = "Installed", "Failed", "Running" } - $Status | Should -BeIn $expect + $State | Should -BeIn $expect } } From 5e82420a7473789084d36d81f52c53277c2c7adc Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Tue, 28 Nov 2023 02:25:03 +0100 Subject: [PATCH 2480/3485] [macOS] Rename build scripts (#8887) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Alexey Ayupov <“alexey.ayupov@akvelon.com”> --- ...gure-toolset.ps1 => Configure-Toolset.ps1} | 0 .../{toolset.ps1 => Install-Toolset.ps1} | 7 +- .../build/{xcode.ps1 => Install-Xcode.ps1} | 5 + ...ulators.ps1 => Update-XcodeSimulators.ps1} | 7 +- images/macos/scripts/build/apache.sh | 8 -- images/macos/scripts/build/bicep.sh | 9 -- images/macos/scripts/build/cleanup-brew.sh | 7 - ...o-updates.sh => configure-auto-updates.sh} | 7 +- .../{autologin.sh => configure-autologin.sh} | 11 +- .../macos/scripts/build/configure-hostname.sh | 8 +- .../macos/scripts/build/configure-machine.sh | 4 + ...s.sh => configure-max-files-limitation.sh} | 5 +- ... configure-network-interface-detection.sh} | 14 +- .../{ntpconf.sh => configure-ntpconf.sh} | 4 + ...imagedata.sh => configure-preimagedata.sh} | 4 + ...nsaver-off.sh => configure-screensaver.sh} | 4 + .../{shell-change.sh => configure-shell.sh} | 6 +- images/macos/scripts/build/configure-ssh.sh | 4 + .../{finalize-vm.sh => configure-system.sh} | 4 + .../scripts/build/configure-tccdb-macos.sh | 6 +- ..._windows_check.sh => configure-windows.sh} | 4 + ...-sims.rb => configure-xcode-simulators.rb} | 59 ++++---- ...ymlinks.sh => configure-xcode-symlinks.sh} | 13 +- ...{xcode-postbuild.sh => configure-xcode.sh} | 4 + ...hive-cache.sh => install-actions-cache.sh} | 6 +- ...oid-toolsets.sh => install-android-sdk.sh} | 5 + images/macos/scripts/build/install-apache.sh | 12 ++ ...{audiodevice.sh => install-audiodevice.sh} | 5 + .../build/{aws.sh => install-aws-tools.sh} | 5 + .../build/{azcopy.sh => install-azcopy.sh} | 5 + images/macos/scripts/build/install-bicep.sh | 13 ++ .../build/{chrome.sh => install-chrome.sh} | 5 + .../{cocoapods.sh => install-cocoapods.sh} | 4 + ...eql-bundle.sh => install-codeql-bundle.sh} | 5 + ...commonutils.sh => install-common-utils.sh} | 5 + .../build/{dotnet.sh => install-dotnet.sh} | 10 +- .../build/{edge.sh => install-edge.sh} | 5 + .../build/{firefox.sh => install-firefox.sh} | 5 + .../scripts/build/{gcc.sh => install-gcc.sh} | 5 + .../scripts/build/{git.sh => install-git.sh} | 5 + .../build/{golang.sh => install-golang.sh} | 7 +- .../build/{haskell.sh => install-haskell.sh} | 4 + .../{homebrew.sh => install-homebrew.sh} | 6 +- images/macos/scripts/build/install-llvm.sh | 13 ++ .../{miniconda.sh => install-miniconda.sh} | 4 + .../build/{mongodb.sh => install-mongodb.sh} | 5 + .../build/{mono.sh => install-mono.sh} | 5 +- images/macos/scripts/build/install-nginx.sh | 12 ++ .../build/{node.sh => install-node.sh} | 5 + .../scripts/build/{nvm.sh => install-nvm.sh} | 9 +- .../build/{openjdk.sh => install-openjdk.sh} | 5 + .../build/{openssl.sh => install-openssl.sh} | 5 + .../scripts/build/{php.sh => install-php.sh} | 5 + ...x-packages.sh => install-pipx-packages.sh} | 5 + .../{postgresql.sh => install-postgresql.sh} | 5 + .../{powershell.sh => install-powershell.sh} | 5 + .../build/{pypy.sh => install-pypy.sh} | 4 +- .../build/{python.sh => install-python.sh} | 5 + images/macos/scripts/build/install-rosetta.sh | 8 ++ .../build/{ruby.sh => install-ruby.sh} | 6 + .../build/{rubygem.sh => install-rubygems.sh} | 5 + .../build/{rust.sh => install-rust.sh} | 5 + .../build/{safari.sh => install-safari.sh} | 6 +- .../{swiftlint.sh => install-swiftlint.sh} | 5 + .../build/{vcpkg.sh => install-vcpkg.sh} | 5 + .../{vsmac.sh => install-visualstudio.sh} | 5 + .../build/{xamarin.sh => install-xamarin.sh} | 5 + .../{xcode-clt.sh => install-xcode-clt.sh} | 7 +- ...de-sims.sh => install-xcode-simulators.sh} | 4 + images/macos/scripts/build/llvm.sh | 8 -- images/macos/scripts/build/nginx.sh | 8 -- images/macos/scripts/build/reboot.sh | 3 - images/macos/scripts/build/rosetta.sh | 4 - ...erator.ps1 => Generate-SoftwareReport.ps1} | 2 +- .../docs-gen/SoftwareReport.Android.psm1 | 2 +- .../SoftwareReport.Helpers.psm1 | 0 images/macos/scripts/helpers/invoke-tests.sh | 2 +- images/macos/scripts/tests/Android.Tests.ps1 | 2 +- images/macos/scripts/tests/Common.Tests.ps1 | 2 +- .../Tests.Helpers.psm1 => tests/Helpers.psm1} | 4 +- images/macos/scripts/tests/Java.Tests.ps1 | 2 +- images/macos/scripts/tests/LLVM.Tests.ps1 | 4 +- images/macos/scripts/tests/Linters.Tests.ps1 | 2 +- images/macos/scripts/tests/Node.Tests.ps1 | 2 +- .../macos/scripts/tests/Powershell.Tests.ps1 | 4 +- images/macos/scripts/tests/Python.Tests.ps1 | 2 +- .../macos/scripts/tests/Ruby.arm64.Tests.ps1 | 2 +- images/macos/scripts/tests/Ruby.x64.Tests.ps1 | 2 +- images/macos/scripts/tests/RunAll-Tests.ps1 | 4 +- .../macos/scripts/tests/Toolcache.Tests.ps1 | 2 +- images/macos/scripts/tests/Toolset.Tests.ps1 | 4 +- images/macos/scripts/tests/Xamarin.Tests.ps1 | 2 +- images/macos/scripts/tests/Xcode.Tests.ps1 | 4 +- images/macos/templates/macOS-11.json | 130 +++++++++--------- images/macos/templates/macOS-12.anka.pkr.hcl | 124 ++++++++--------- images/macos/templates/macOS-12.json | 130 +++++++++--------- images/macos/templates/macOS-13.anka.pkr.hcl | 100 +++++++------- .../templates/macOS-13.arm64.anka.pkr.hcl | 78 +++++------ images/macos/templates/macOS-14.anka.pkr.hcl | 96 ++++++------- .../templates/macOS-14.arm64.anka.pkr.hcl | 74 +++++----- 100 files changed, 764 insertions(+), 515 deletions(-) rename images/macos/scripts/build/{configure-toolset.ps1 => Configure-Toolset.ps1} (100%) rename images/macos/scripts/build/{toolset.ps1 => Install-Toolset.ps1} (94%) rename images/macos/scripts/build/{xcode.ps1 => Install-Xcode.ps1} (91%) rename images/macos/scripts/build/{fix-xcode-simulators.ps1 => Update-XcodeSimulators.ps1} (89%) delete mode 100644 images/macos/scripts/build/apache.sh delete mode 100644 images/macos/scripts/build/bicep.sh delete mode 100644 images/macos/scripts/build/cleanup-brew.sh rename images/macos/scripts/build/{disable-auto-updates.sh => configure-auto-updates.sh} (56%) rename images/macos/scripts/build/{autologin.sh => configure-autologin.sh} (75%) rename images/macos/scripts/build/{max-files.sh => configure-max-files-limitation.sh} (82%) rename images/macos/scripts/build/{add-network-interface-detection.sh => configure-network-interface-detection.sh} (79%) rename images/macos/scripts/build/{ntpconf.sh => configure-ntpconf.sh} (58%) rename images/macos/scripts/build/{preimagedata.sh => configure-preimagedata.sh} (85%) rename images/macos/scripts/build/{screensaver-off.sh => configure-screensaver.sh} (87%) rename images/macos/scripts/build/{shell-change.sh => configure-shell.sh} (59%) rename images/macos/scripts/build/{finalize-vm.sh => configure-system.sh} (83%) rename images/macos/scripts/build/{open_windows_check.sh => configure-windows.sh} (81%) rename images/macos/scripts/build/{delete-duplicate-sims.rb => configure-xcode-simulators.rb} (79%) rename images/macos/scripts/build/{build-xcode-symlinks.sh => configure-xcode-symlinks.sh} (64%) rename images/macos/scripts/build/{xcode-postbuild.sh => configure-xcode.sh} (83%) rename images/macos/scripts/build/{action-archive-cache.sh => install-actions-cache.sh} (87%) rename images/macos/scripts/build/{android-toolsets.sh => install-android-sdk.sh} (95%) create mode 100644 images/macos/scripts/build/install-apache.sh rename images/macos/scripts/build/{audiodevice.sh => install-audiodevice.sh} (72%) rename images/macos/scripts/build/{aws.sh => install-aws-tools.sh} (59%) rename images/macos/scripts/build/{azcopy.sh => install-azcopy.sh} (72%) create mode 100644 images/macos/scripts/build/install-bicep.sh rename images/macos/scripts/build/{chrome.sh => install-chrome.sh} (91%) rename images/macos/scripts/build/{cocoapods.sh => install-cocoapods.sh} (52%) rename images/macos/scripts/build/{codeql-bundle.sh => install-codeql-bundle.sh} (85%) rename images/macos/scripts/build/{commonutils.sh => install-common-utils.sh} (93%) rename images/macos/scripts/build/{dotnet.sh => install-dotnet.sh} (91%) rename images/macos/scripts/build/{edge.sh => install-edge.sh} (91%) rename images/macos/scripts/build/{firefox.sh => install-firefox.sh} (61%) rename images/macos/scripts/build/{gcc.sh => install-gcc.sh} (65%) rename images/macos/scripts/build/{git.sh => install-git.sh} (82%) rename images/macos/scripts/build/{golang.sh => install-golang.sh} (60%) rename images/macos/scripts/build/{haskell.sh => install-haskell.sh} (81%) rename images/macos/scripts/build/{homebrew.sh => install-homebrew.sh} (82%) create mode 100644 images/macos/scripts/build/install-llvm.sh rename images/macos/scripts/build/{miniconda.sh => install-miniconda.sh} (72%) rename images/macos/scripts/build/{mongodb.sh => install-mongodb.sh} (72%) rename images/macos/scripts/build/{mono.sh => install-mono.sh} (97%) create mode 100644 images/macos/scripts/build/install-nginx.sh rename images/macos/scripts/build/{node.sh => install-node.sh} (74%) rename images/macos/scripts/build/{nvm.sh => install-nvm.sh} (90%) rename images/macos/scripts/build/{openjdk.sh => install-openjdk.sh} (94%) rename images/macos/scripts/build/{openssl.sh => install-openssl.sh} (72%) rename images/macos/scripts/build/{php.sh => install-php.sh} (53%) rename images/macos/scripts/build/{pipx-packages.sh => install-pipx-packages.sh} (74%) rename images/macos/scripts/build/{postgresql.sh => install-postgresql.sh} (80%) rename images/macos/scripts/build/{powershell.sh => install-powershell.sh} (90%) rename images/macos/scripts/build/{pypy.sh => install-pypy.sh} (98%) rename images/macos/scripts/build/{python.sh => install-python.sh} (86%) create mode 100644 images/macos/scripts/build/install-rosetta.sh rename images/macos/scripts/build/{ruby.sh => install-ruby.sh} (91%) rename images/macos/scripts/build/{rubygem.sh => install-rubygems.sh} (68%) rename images/macos/scripts/build/{rust.sh => install-rust.sh} (72%) rename images/macos/scripts/build/{safari.sh => install-safari.sh} (73%) rename images/macos/scripts/build/{swiftlint.sh => install-swiftlint.sh} (73%) rename images/macos/scripts/build/{vcpkg.sh => install-vcpkg.sh} (75%) rename images/macos/scripts/build/{vsmac.sh => install-visualstudio.sh} (88%) rename images/macos/scripts/build/{xamarin.sh => install-xamarin.sh} (93%) rename images/macos/scripts/build/{xcode-clt.sh => install-xcode-clt.sh} (86%) rename images/macos/scripts/build/{xcode-sims.sh => install-xcode-simulators.sh} (64%) delete mode 100644 images/macos/scripts/build/llvm.sh delete mode 100644 images/macos/scripts/build/nginx.sh delete mode 100644 images/macos/scripts/build/reboot.sh delete mode 100644 images/macos/scripts/build/rosetta.sh rename images/macos/scripts/docs-gen/{SoftwareReport.Generator.ps1 => Generate-SoftwareReport.ps1} (99%) rename images/macos/scripts/{helpers => docs-gen}/SoftwareReport.Helpers.psm1 (100%) rename images/macos/scripts/{helpers/Tests.Helpers.psm1 => tests/Helpers.psm1} (98%) diff --git a/images/macos/scripts/build/configure-toolset.ps1 b/images/macos/scripts/build/Configure-Toolset.ps1 similarity index 100% rename from images/macos/scripts/build/configure-toolset.ps1 rename to images/macos/scripts/build/Configure-Toolset.ps1 diff --git a/images/macos/scripts/build/toolset.ps1 b/images/macos/scripts/build/Install-Toolset.ps1 similarity index 94% rename from images/macos/scripts/build/toolset.ps1 rename to images/macos/scripts/build/Install-Toolset.ps1 index 5648623bb832..e89da38e06cb 100644 --- a/images/macos/scripts/build/toolset.ps1 +++ b/images/macos/scripts/build/Install-Toolset.ps1 @@ -1,9 +1,10 @@ ################################################################################ -## File: toolset.ps1 +## File: Install-Toolset.ps1 ## Team: CI-Build ## Desc: Install toolset ################################################################################ -Import-Module "~/image-generation/helpers/Tests.Helpers.psm1" + +Import-Module "~/image-generation/tests/Helpers.psm1" Import-Module "~/image-generation/helpers/Common.Helpers.psm1" Function Install-Asset { @@ -55,4 +56,4 @@ foreach ($tool in $tools) { } } -Invoke-PesterTests "Toolcache" \ No newline at end of file +Invoke-PesterTests "Toolcache" diff --git a/images/macos/scripts/build/xcode.ps1 b/images/macos/scripts/build/Install-Xcode.ps1 similarity index 91% rename from images/macos/scripts/build/xcode.ps1 rename to images/macos/scripts/build/Install-Xcode.ps1 index 9f6c07c72d91..eec15f51a2b4 100644 --- a/images/macos/scripts/build/xcode.ps1 +++ b/images/macos/scripts/build/Install-Xcode.ps1 @@ -1,3 +1,8 @@ +################################################################################ +## File: Install-Xcode.ps1 +## Desc: Install Xcode +################################################################################ + $ErrorActionPreference = "Stop" Import-Module "$env:HOME/image-generation/helpers/Common.Helpers.psm1" diff --git a/images/macos/scripts/build/fix-xcode-simulators.ps1 b/images/macos/scripts/build/Update-XcodeSimulators.ps1 similarity index 89% rename from images/macos/scripts/build/fix-xcode-simulators.ps1 rename to images/macos/scripts/build/Update-XcodeSimulators.ps1 index 98b1061e0328..7c083d8e4506 100644 --- a/images/macos/scripts/build/fix-xcode-simulators.ps1 +++ b/images/macos/scripts/build/Update-XcodeSimulators.ps1 @@ -1,3 +1,8 @@ +################################################################################ +## File: Update-XcodeSimulators.ps1 +## Desc: Check available Xcode simulators and create missing ones +################################################################################ + $ErrorActionPreference = "Stop" Import-Module "$env:HOME/image-generation/helpers/Xcode.Helpers.psm1" -DisableNameChecking @@ -48,4 +53,4 @@ Get-XcodeInfoList | Out-Null Write-Host "Validating and fixing Xcode simulators..." Get-BrokenXcodeSimulatorsList | ForEach-Object { Ensure-SimulatorInstalled -RuntimeId $_.RuntimeId -DeviceId $_.DeviceId -SimulatorName $_.SimulatorName -XcodeVersion $_.XcodeVersion -} \ No newline at end of file +} diff --git a/images/macos/scripts/build/apache.sh b/images/macos/scripts/build/apache.sh deleted file mode 100644 index 8fa375f99c7f..000000000000 --- a/images/macos/scripts/build/apache.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -e -o pipefail - -source ~/utils/utils.sh - -brew_smart_install httpd -sudo sed -Ei '' 's/Listen .*/Listen 80/' $(brew --prefix)/etc/httpd/httpd.conf - -invoke_tests "WebServers" "Apache" diff --git a/images/macos/scripts/build/bicep.sh b/images/macos/scripts/build/bicep.sh deleted file mode 100644 index 87ca8ee9ea17..000000000000 --- a/images/macos/scripts/build/bicep.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash -e -o pipefail - -source ~/utils/utils.sh - -echo Installing bicep cli... -brew tap azure/bicep -brew_smart_install bicep - -invoke_tests "Common" "Bicep" diff --git a/images/macos/scripts/build/cleanup-brew.sh b/images/macos/scripts/build/cleanup-brew.sh deleted file mode 100644 index 99d596b14853..000000000000 --- a/images/macos/scripts/build/cleanup-brew.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -e -o pipefail -########################################################################### -# The script removes local Homebrew cache -# -########################################################################### - -rm -rf "$(brew --cache)" diff --git a/images/macos/scripts/build/disable-auto-updates.sh b/images/macos/scripts/build/configure-auto-updates.sh similarity index 56% rename from images/macos/scripts/build/disable-auto-updates.sh rename to images/macos/scripts/build/configure-auto-updates.sh index 050f7d9a93c1..c11525b5e1c4 100644 --- a/images/macos/scripts/build/disable-auto-updates.sh +++ b/images/macos/scripts/build/configure-auto-updates.sh @@ -1,8 +1,11 @@ #!/bin/bash -e -o pipefail +################################################################################ +## File: configure-auto-updates.sh +## Desc: Disabling automatic updates +################################################################################ -# Disabling automatic updates sudo softwareupdate --schedule off defaults write com.apple.SoftwareUpdate AutomaticDownload -int 0 defaults write com.apple.SoftwareUpdate CriticalUpdateInstall -int 0 defaults write com.apple.commerce AutoUpdate -bool false -defaults write com.apple.SoftwareUpdate AutomaticCheckEnabled -bool false \ No newline at end of file +defaults write com.apple.SoftwareUpdate AutomaticCheckEnabled -bool false diff --git a/images/macos/scripts/build/autologin.sh b/images/macos/scripts/build/configure-autologin.sh similarity index 75% rename from images/macos/scripts/build/autologin.sh rename to images/macos/scripts/build/configure-autologin.sh index 2e962490cec3..f281237e4109 100644 --- a/images/macos/scripts/build/autologin.sh +++ b/images/macos/scripts/build/configure-autologin.sh @@ -1,7 +1,10 @@ #!/bin/bash -e -o pipefail - -# This script was taken from https://github.com/timsutton/osx-vm-templates/blob/master/scripts/autologin.sh -# Distributed by MIT license, license can be found at the bottom of this script +################################################################################ +## File: configure-autologin.sh +## Desc: add a Daemon to re-detect the attached network interfaces after vm is booted. +## Maintainer: @timsutton +## script was taken from https://github.com/timsutton/osx-vm-templates/blob/master/scripts/autologin.sh +################################################################################ echo "Enabling automatic GUI login for the '$USERNAME' user.." @@ -15,4 +18,4 @@ Copyright (c) 2013-2017 Timothy Sutton Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -' \ No newline at end of file +' diff --git a/images/macos/scripts/build/configure-hostname.sh b/images/macos/scripts/build/configure-hostname.sh index fef3bb2e2fda..40c9f51e46ef 100644 --- a/images/macos/scripts/build/configure-hostname.sh +++ b/images/macos/scripts/build/configure-hostname.sh @@ -1,6 +1,10 @@ #!/bin/bash -e -o pipefail +################################################################################ +## File: configure-hostname.sh +## Desc: Change the hostname at startup to prevent duplicates +## Hostname and Computername should contain .local in name to avoid name resolution issues +################################################################################ -# Add script for changing hostname to run on startup to prevent duplicate hostnames across the environment. Hostname and Computername should contain .local in name to avoid name resolution issues tee -a /usr/local/bin/change_hostname.sh > /dev/null <<\EOF #!/bin/bash -e -o pipefail @@ -25,4 +29,4 @@ sudo tee -a /Library/LaunchDaemons/change_hostname.plist > /dev/null <<\EOF <true/> </dict> </plist> -EOF \ No newline at end of file +EOF diff --git a/images/macos/scripts/build/configure-machine.sh b/images/macos/scripts/build/configure-machine.sh index 32beba10ee3c..e8eda5c4719a 100644 --- a/images/macos/scripts/build/configure-machine.sh +++ b/images/macos/scripts/build/configure-machine.sh @@ -1,4 +1,8 @@ #!/bin/bash -e -o pipefail +################################################################################ +## File: configure-machine.sh +## Desc: Configure guest OS settings +################################################################################ source ~/utils/utils.sh diff --git a/images/macos/scripts/build/max-files.sh b/images/macos/scripts/build/configure-max-files-limitation.sh similarity index 82% rename from images/macos/scripts/build/max-files.sh rename to images/macos/scripts/build/configure-max-files-limitation.sh index a18d7033a3e0..de9d13f0cc34 100644 --- a/images/macos/scripts/build/max-files.sh +++ b/images/macos/scripts/build/configure-max-files-limitation.sh @@ -1,4 +1,8 @@ #!/bin/bash -e -o pipefail +################################################################################ +## File: configure-max-files-limitation.sh +## Desc: Configure max files limitation +################################################################################ Launch_Daemons="/Library/LaunchDaemons" @@ -39,4 +43,3 @@ chmod 0644 "${Launch_Daemons}/limit.maxfiles.plist" echo "Done, limit.maxfiles has been updated" - diff --git a/images/macos/scripts/build/add-network-interface-detection.sh b/images/macos/scripts/build/configure-network-interface-detection.sh similarity index 79% rename from images/macos/scripts/build/add-network-interface-detection.sh rename to images/macos/scripts/build/configure-network-interface-detection.sh index ca9192bf4e98..c60cd636f3cc 100644 --- a/images/macos/scripts/build/add-network-interface-detection.sh +++ b/images/macos/scripts/build/configure-network-interface-detection.sh @@ -1,11 +1,11 @@ #!/bin/bash -e -o pipefail +################################################################################ +## File: configure-network-interface-detection.sh +## Desc: add a Daemon to re-detect the attached network interfaces after vm is booted. +## Maintainer: @timsutton +## script was taken from https://github.com/timsutton/osx-vm-templates/blob/master/scripts/add-network-interface-detection.sh +################################################################################ -# This script was taken from https://github.com/timsutton/osx-vm-templates/blob/master/scripts/add-network-interface-detection.sh -# Distributed by MIT license, license can be found at the bottom of this script - -# This script adds a Mac OS Launch Daemon, which runs every time the -# machine is booted. The daemon will re-detect the attached network -# interfaces. If this is not done, network devices may not work. PLIST=/Library/LaunchDaemons/sonoma.detectnewhardware.plist cat <<EOF > "${PLIST}" <?xml version="1.0" encoding="UTF-8"?> @@ -37,4 +37,4 @@ Copyright (c) 2013-2017 Timothy Sutton Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -' \ No newline at end of file +' diff --git a/images/macos/scripts/build/ntpconf.sh b/images/macos/scripts/build/configure-ntpconf.sh similarity index 58% rename from images/macos/scripts/build/ntpconf.sh rename to images/macos/scripts/build/configure-ntpconf.sh index b4f681280294..cdb6f3d14d49 100644 --- a/images/macos/scripts/build/ntpconf.sh +++ b/images/macos/scripts/build/configure-ntpconf.sh @@ -1,4 +1,8 @@ #!/bin/bash -e -o pipefail +################################################################################ +## File: configure-ntpconf.sh +## Desc: Configure NTP servers and set the timezone to UTC +################################################################################ echo Additional NTP servers adding into /etc/ntp.conf file... cat > /etc/ntp.conf << EOF diff --git a/images/macos/scripts/build/preimagedata.sh b/images/macos/scripts/build/configure-preimagedata.sh similarity index 85% rename from images/macos/scripts/build/preimagedata.sh rename to images/macos/scripts/build/configure-preimagedata.sh index 4f8e284b5518..ddd5d8f5ebff 100644 --- a/images/macos/scripts/build/preimagedata.sh +++ b/images/macos/scripts/build/configure-preimagedata.sh @@ -1,4 +1,8 @@ #!/bin/bash -e -o pipefail +################################################################################ +## File: configure-preimagedata.sh +## Desc: Configure data used in the image +################################################################################ source ~/utils/utils.sh diff --git a/images/macos/scripts/build/screensaver-off.sh b/images/macos/scripts/build/configure-screensaver.sh similarity index 87% rename from images/macos/scripts/build/screensaver-off.sh rename to images/macos/scripts/build/configure-screensaver.sh index 6844792e593d..6b4900cc9e86 100644 --- a/images/macos/scripts/build/screensaver-off.sh +++ b/images/macos/scripts/build/configure-screensaver.sh @@ -1,4 +1,8 @@ #!/bin/bash -e -o pipefail +################################################################################ +## File: configure-screensaver.sh +## Desc: Configure screensaver +################################################################################ # set screensaver idleTime to 0, to prevent turning screensaver on macUUID=`ioreg -rd1 -c IOPlatformExpertDevice | grep -i "UUID" | cut -c27-62` diff --git a/images/macos/scripts/build/shell-change.sh b/images/macos/scripts/build/configure-shell.sh similarity index 59% rename from images/macos/scripts/build/shell-change.sh rename to images/macos/scripts/build/configure-shell.sh index 8632a68ee7f0..ec12cbeb74c5 100644 --- a/images/macos/scripts/build/shell-change.sh +++ b/images/macos/scripts/build/configure-shell.sh @@ -1,4 +1,8 @@ #!/bin/bash -e -o pipefail +################################################################################ +## File: configure-shell.sh +## Desc: Configure shell to use bash +################################################################################ source ~/utils/utils.sh arch=$(get_arch) @@ -11,4 +15,4 @@ sudo chsh -s /bin/bash root if [[ $arch == "arm64" ]]; then echo "Adding Homebrew environment to bash" /opt/homebrew/bin/brew shellenv >> ~/.bashrc -fi \ No newline at end of file +fi diff --git a/images/macos/scripts/build/configure-ssh.sh b/images/macos/scripts/build/configure-ssh.sh index 0e448d85f966..aea34c741e89 100644 --- a/images/macos/scripts/build/configure-ssh.sh +++ b/images/macos/scripts/build/configure-ssh.sh @@ -1,4 +1,8 @@ #!/bin/bash -e -o pipefail +################################################################################ +## File: configure-ssh.sh +## Desc: Configure ssh +################################################################################ [[ ! -d ~/.ssh ]] && mkdir ~/.ssh 2>/dev/null chmod 777 ~/.ssh diff --git a/images/macos/scripts/build/finalize-vm.sh b/images/macos/scripts/build/configure-system.sh similarity index 83% rename from images/macos/scripts/build/finalize-vm.sh rename to images/macos/scripts/build/configure-system.sh index a49ca9192e0e..32d64367b5d1 100644 --- a/images/macos/scripts/build/finalize-vm.sh +++ b/images/macos/scripts/build/configure-system.sh @@ -1,4 +1,8 @@ #!/bin/bash -e -o pipefail +################################################################################ +## File: configure-system.sh +## Desc: Post deployment system configuration actions +################################################################################ source ~/utils/utils.sh diff --git a/images/macos/scripts/build/configure-tccdb-macos.sh b/images/macos/scripts/build/configure-tccdb-macos.sh index 1d863b42ec2d..dd2c9bb20cd9 100644 --- a/images/macos/scripts/build/configure-tccdb-macos.sh +++ b/images/macos/scripts/build/configure-tccdb-macos.sh @@ -1,6 +1,8 @@ #!/bin/bash -e -o pipefail - -# This script adds permissions, which are required for some installed tools to work properly, to the TCC.db +################################################################################ +## File: configure-tccdb-macos.sh +## Desc: Configure permissions to the TCC.db +################################################################################ source ~/utils/utils.sh diff --git a/images/macos/scripts/build/open_windows_check.sh b/images/macos/scripts/build/configure-windows.sh similarity index 81% rename from images/macos/scripts/build/open_windows_check.sh rename to images/macos/scripts/build/configure-windows.sh index dab538ed072b..02da5fadb6f4 100644 --- a/images/macos/scripts/build/open_windows_check.sh +++ b/images/macos/scripts/build/configure-windows.sh @@ -1,4 +1,8 @@ #!/bin/bash -e -o pipefail +################################################################################ +## File: configure-windows.sh +## Desc: Close open windows +################################################################################ source ~/utils/utils.sh diff --git a/images/macos/scripts/build/delete-duplicate-sims.rb b/images/macos/scripts/build/configure-xcode-simulators.rb similarity index 79% rename from images/macos/scripts/build/delete-duplicate-sims.rb rename to images/macos/scripts/build/configure-xcode-simulators.rb index d7ee50a13dcd..a585acc551b6 100644 --- a/images/macos/scripts/build/delete-duplicate-sims.rb +++ b/images/macos/scripts/build/configure-xcode-simulators.rb @@ -1,51 +1,40 @@ #!/usr/bin/env ruby - -# What is this for? -# This script fixes an issue appeared for some Xcode users where it would show long identifiers -# in the list of simulators instead of usual short names. This is caused by duplicate simulators -# being sometimes created after switching between Xcode versions, with the same -# device type + runtime pair occurring more than once in your list of available simulators. -# Instead of showing the same simulator name twice, Xcode defaults to simulator identifiers. -# -# What it does? -# The script queries Xcode's `simctl` utility for all simulators you have, finds duplicate type + runtime pairs, -# and offers you to delete them. After that, Xcode should return to displaying the list of simulators normally. -# When searching for duplicates, the script sorts simulators by their creation time to make sure it deletes -# the copy that was created more recently. -# -# License -# This script was taken from https://gist.github.com/vlas-voloshin/f9982128200345cd3fb7 and some modifications made -# Distributed by MIT license, license can be found at the bottom of this script +################################################################################ +## File: configure-xcode-simulators.rb +## Desc: List all simulators, find duplicate type and delete them. +## Maintainer: @vlas-voloshin +## script was taken from https://gist.github.com/vlas-voloshin/f9982128200345cd3fb7 +################################################################################ class SimDevice - + attr_accessor :runtime attr_accessor :name attr_accessor :identifier attr_accessor :timestamp - + def initialize(runtime, name, identifier, timestamp) @runtime = runtime @name = name @identifier = identifier @timestamp = timestamp end - + def to_s return "#{@name} - #{@runtime} (#{@identifier}) [#{@timestamp}]" end - + def equivalent_to_device(device) return @runtime == device.runtime && @name == device.name end - + end - + # Executes a shell command and returns the result from stdout def execute_simctl_command(command) return %x[xcrun simctl #{command}] end - + # Retrieves the creation date/time of simulator with specified identifier def simulator_creation_date(identifier) directory = Dir.home() + "/Library/Developer/CoreSimulator/Devices/" + identifier @@ -60,14 +49,14 @@ def simulator_creation_date(identifier) return Time.now end end - + # Deletes specified simulator def delete_device(device) execute_simctl_command("delete #{device.identifier}") end - + puts("Searching for simulators...") - + # Retrieve the list of existing simulators devices = [] runtime = "" @@ -87,10 +76,10 @@ def delete_device(device) devices.push(device) end end - + # Sort the simulators by their creation timestamp, ascending devices = devices.sort { |a, b| a.timestamp <=> b.timestamp } - + duplicates = {} # Enumerate all devices except for the last one for i in 0..devices.count-2 @@ -106,12 +95,12 @@ def delete_device(device) end end end - + if duplicates.count == 0 puts("You don't have duplicate simulators!") exit() end - + puts("Looks like you have #{duplicates.count} duplicate simulator#{duplicates.count > 1 ? "s" : ""}:") duplicates.each_pair do |duplicate, original| puts @@ -120,14 +109,14 @@ def delete_device(device) puts("#{original}") end puts - + puts("Each duplicate was determined as the one created later than the 'original'.") - + puts("Deleting...") duplicates.each_key do |duplicate| delete_device(duplicate) end - + puts("Done!") =begin @@ -152,4 +141,4 @@ def delete_device(device) LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -=end \ No newline at end of file +=end diff --git a/images/macos/scripts/build/build-xcode-symlinks.sh b/images/macos/scripts/build/configure-xcode-symlinks.sh similarity index 64% rename from images/macos/scripts/build/build-xcode-symlinks.sh rename to images/macos/scripts/build/configure-xcode-symlinks.sh index 60070938710a..1fbfe7ed86aa 100644 --- a/images/macos/scripts/build/build-xcode-symlinks.sh +++ b/images/macos/scripts/build/configure-xcode-symlinks.sh @@ -1,13 +1,12 @@ #!/bin/bash -e -o pipefail +################################################################################ +## File: configure-xcode-symlinks.sh +## Desc: Link the existing Xcodes into the correct location for provisionator. +## This is maintained for backwards compatibility only. Do not add new xcodes here. +################################################################################ source ~/utils/utils.sh -# Link the existing Xcodes into the correct location for provisionator. - -# These symlinks are necessary for Xamarin team to make sure that xamarin-provisionator can find them. - -# Old style provisionator directories. This is maintained for -# backwards compatibility only. Do not add new xcodes here. ln -sf /Applications/Xcode_8.app /Applications/Xcode8.app ln -sf /Applications/Xcode_8.1.app /Applications/Xcode81.app ln -sf /Applications/Xcode_9.app /Applications/Xcode9.app @@ -17,4 +16,4 @@ ln -sf /Applications/Xcode_9.3.app /Applications/Xcode93.app ln -sf /Applications/Xcode_9.3.app /Applications/Xcode_9.3_beta.app ln -sf /Applications/Xcode_9.4.app /Applications/Xcode_9.4-beta.app ln -sf /Applications/Xcode_9.4.app /Applications/Xcode_9.4_beta.app -ln -sf /Applications/Xcode_9.4.app /Applications/Xcode_9.4_beta_2.app \ No newline at end of file +ln -sf /Applications/Xcode_9.4.app /Applications/Xcode_9.4_beta_2.app diff --git a/images/macos/scripts/build/xcode-postbuild.sh b/images/macos/scripts/build/configure-xcode.sh similarity index 83% rename from images/macos/scripts/build/xcode-postbuild.sh rename to images/macos/scripts/build/configure-xcode.sh index 1a82545b671d..23b054f6fe29 100644 --- a/images/macos/scripts/build/xcode-postbuild.sh +++ b/images/macos/scripts/build/configure-xcode.sh @@ -1,4 +1,8 @@ #!/bin/bash -e -o pipefail +################################################################################ +## File: configure-xcode.sh +## Desc: Configure Xcode after installation +################################################################################ source ~/utils/utils.sh XCODE_LIST=($(get_toolset_value '.xcode.versions | reverse | .[].link')) diff --git a/images/macos/scripts/build/action-archive-cache.sh b/images/macos/scripts/build/install-actions-cache.sh similarity index 87% rename from images/macos/scripts/build/action-archive-cache.sh rename to images/macos/scripts/build/install-actions-cache.sh index 99ad6a0c650b..4e6a73366917 100644 --- a/images/macos/scripts/build/action-archive-cache.sh +++ b/images/macos/scripts/build/install-actions-cache.sh @@ -1,9 +1,7 @@ #!/bin/bash -e -o pipefail - ################################################################################ -## File: action-archive-cache.sh -## Desc: Download latest release from https://github.com/actions/action-verions -## and un-tar to $HOME/actionarchivecache +## File: install-actions-cache.sh +## Desc: Download latest release from https://github.com/actions/action-versions ## Maintainer: #actions-runtime and @TingluoHuang ################################################################################ diff --git a/images/macos/scripts/build/android-toolsets.sh b/images/macos/scripts/build/install-android-sdk.sh similarity index 95% rename from images/macos/scripts/build/android-toolsets.sh rename to images/macos/scripts/build/install-android-sdk.sh index 0589a5a438f4..c765ca647d84 100644 --- a/images/macos/scripts/build/android-toolsets.sh +++ b/images/macos/scripts/build/install-android-sdk.sh @@ -1,4 +1,9 @@ #!/bin/bash -e -o pipefail +################################################################################ +## File: install-android-sdk.sh +## Desc: Install Android SDK, NDK and tools +################################################################################ + source ~/utils/utils.sh function filter_components_by_version { diff --git a/images/macos/scripts/build/install-apache.sh b/images/macos/scripts/build/install-apache.sh new file mode 100644 index 000000000000..b87345eea73c --- /dev/null +++ b/images/macos/scripts/build/install-apache.sh @@ -0,0 +1,12 @@ +#!/bin/bash -e -o pipefail +################################################################################ +## File: install-apache.sh +## Desc: Install Apache HTTP Server +################################################################################ + +source ~/utils/utils.sh + +brew_smart_install httpd +sudo sed -Ei '' 's/Listen .*/Listen 80/' $(brew --prefix)/etc/httpd/httpd.conf + +invoke_tests "WebServers" "Apache" diff --git a/images/macos/scripts/build/audiodevice.sh b/images/macos/scripts/build/install-audiodevice.sh similarity index 72% rename from images/macos/scripts/build/audiodevice.sh rename to images/macos/scripts/build/install-audiodevice.sh index d021dbb96397..e600de552479 100644 --- a/images/macos/scripts/build/audiodevice.sh +++ b/images/macos/scripts/build/install-audiodevice.sh @@ -1,4 +1,9 @@ #!/bin/bash -e -o pipefail +################################################################################ +## File: install-audiodevice.sh +## Desc: Install audio device +################################################################################ + source ~/utils/utils.sh echo "install switchaudio-osx" diff --git a/images/macos/scripts/build/aws.sh b/images/macos/scripts/build/install-aws-tools.sh similarity index 59% rename from images/macos/scripts/build/aws.sh rename to images/macos/scripts/build/install-aws-tools.sh index 8b93dae50974..98a13dcc4155 100644 --- a/images/macos/scripts/build/aws.sh +++ b/images/macos/scripts/build/install-aws-tools.sh @@ -1,4 +1,9 @@ #!/bin/bash -e -o pipefail +################################################################################ +## File: install-aws-tools.sh +## Desc: Install the AWS CLI, Session Manager plugin for the AWS CLI, and AWS SAM CLI +################################################################################ + source ~/utils/utils.sh echo Installing aws... diff --git a/images/macos/scripts/build/azcopy.sh b/images/macos/scripts/build/install-azcopy.sh similarity index 72% rename from images/macos/scripts/build/azcopy.sh rename to images/macos/scripts/build/install-azcopy.sh index 5d540a7d03c8..5cef5d4158df 100644 --- a/images/macos/scripts/build/azcopy.sh +++ b/images/macos/scripts/build/install-azcopy.sh @@ -1,4 +1,9 @@ #!/bin/bash -e -o pipefail +################################################################################ +## File: install-azcopy.sh +## Desc: Install AzCopy +################################################################################ + source ~/utils/utils.sh arch=$(get_arch) diff --git a/images/macos/scripts/build/install-bicep.sh b/images/macos/scripts/build/install-bicep.sh new file mode 100644 index 000000000000..fbae13e59594 --- /dev/null +++ b/images/macos/scripts/build/install-bicep.sh @@ -0,0 +1,13 @@ +#!/bin/bash -e -o pipefail +################################################################################ +## File: install-bicep.sh +## Desc: Install bicep cli +################################################################################ + +source ~/utils/utils.sh + +echo Installing bicep cli... +brew tap azure/bicep +brew_smart_install bicep + +invoke_tests "Common" "Bicep" diff --git a/images/macos/scripts/build/chrome.sh b/images/macos/scripts/build/install-chrome.sh similarity index 91% rename from images/macos/scripts/build/chrome.sh rename to images/macos/scripts/build/install-chrome.sh index 53cae0a204fa..c5fc50f93548 100644 --- a/images/macos/scripts/build/chrome.sh +++ b/images/macos/scripts/build/install-chrome.sh @@ -1,4 +1,9 @@ #!/bin/bash -e -o pipefail +################################################################################ +## File: install-chrome.sh +## Desc: Install chrome and chrome for testing browsers +################################################################################ + source ~/utils/utils.sh arch=$(get_arch) diff --git a/images/macos/scripts/build/cocoapods.sh b/images/macos/scripts/build/install-cocoapods.sh similarity index 52% rename from images/macos/scripts/build/cocoapods.sh rename to images/macos/scripts/build/install-cocoapods.sh index 15d2a22a1988..de1277446e22 100644 --- a/images/macos/scripts/build/cocoapods.sh +++ b/images/macos/scripts/build/install-cocoapods.sh @@ -1,4 +1,8 @@ #!/bin/bash -e -o pipefail +################################################################################ +## File: install-cocoapods.sh +## Desc: Install Cocoapods +################################################################################ # Setup the Cocoapods echo "Installing Cocoapods..." diff --git a/images/macos/scripts/build/codeql-bundle.sh b/images/macos/scripts/build/install-codeql-bundle.sh similarity index 85% rename from images/macos/scripts/build/codeql-bundle.sh rename to images/macos/scripts/build/install-codeql-bundle.sh index 12044bdd8cbb..8f07f72fdf68 100644 --- a/images/macos/scripts/build/codeql-bundle.sh +++ b/images/macos/scripts/build/install-codeql-bundle.sh @@ -1,4 +1,9 @@ #!/bin/bash -e -o pipefail +################################################################################ +## File: install-codeql-bundle.sh +## Desc: Install CodeQL bundle +################################################################################ + source ~/utils/utils.sh # Retrieve the CLI version of the latest CodeQL bundle. diff --git a/images/macos/scripts/build/commonutils.sh b/images/macos/scripts/build/install-common-utils.sh similarity index 93% rename from images/macos/scripts/build/commonutils.sh rename to images/macos/scripts/build/install-common-utils.sh index a22195aad93f..39a8acccd292 100644 --- a/images/macos/scripts/build/commonutils.sh +++ b/images/macos/scripts/build/install-common-utils.sh @@ -1,4 +1,9 @@ #!/bin/bash -e -o pipefail +################################################################################ +## File: install-common-utils.sh +## Desc: Install utils listed in toolset file +################################################################################ + source ~/utils/utils.sh # Download and install YQ in cases when it is not available in the formulae as for macOS 11: https://formulae.brew.sh/formula/yq diff --git a/images/macos/scripts/build/dotnet.sh b/images/macos/scripts/build/install-dotnet.sh similarity index 91% rename from images/macos/scripts/build/dotnet.sh rename to images/macos/scripts/build/install-dotnet.sh index f9fea2371d7c..4ff20b764a5b 100644 --- a/images/macos/scripts/build/dotnet.sh +++ b/images/macos/scripts/build/install-dotnet.sh @@ -1,11 +1,9 @@ #!/bin/bash -e -o pipefail +################################################################################ +## File: install-dotnet.sh +## Desc: Install dotnet +################################################################################ -########################################################################### -# The main idea of this script is to automate dotnet installs -# Based on: -# https://docs.microsoft.com/en-us/dotnet/core/tools/dotnet-install-script -# -########################################################################### source ~/utils/utils.sh export DOTNET_CLI_TELEMETRY_OPTOUT=1 diff --git a/images/macos/scripts/build/edge.sh b/images/macos/scripts/build/install-edge.sh similarity index 91% rename from images/macos/scripts/build/edge.sh rename to images/macos/scripts/build/install-edge.sh index 122add096eea..d13f5b82f674 100644 --- a/images/macos/scripts/build/edge.sh +++ b/images/macos/scripts/build/install-edge.sh @@ -1,4 +1,9 @@ #!/bin/bash -e -o pipefail +################################################################################ +## File: install-edge.sh +## Desc: Install edge browser +################################################################################ + source ~/utils/utils.sh echo "Installing Microsoft Edge..." diff --git a/images/macos/scripts/build/firefox.sh b/images/macos/scripts/build/install-firefox.sh similarity index 61% rename from images/macos/scripts/build/firefox.sh rename to images/macos/scripts/build/install-firefox.sh index f2527c349bf0..75c4f6ccbb05 100644 --- a/images/macos/scripts/build/firefox.sh +++ b/images/macos/scripts/build/install-firefox.sh @@ -1,4 +1,9 @@ #!/bin/bash -e -o pipefail +################################################################################ +## File: install-firefox.sh +## Desc: Install firefox browser +################################################################################ + source ~/utils/utils.sh echo "Installing Firefox..." diff --git a/images/macos/scripts/build/gcc.sh b/images/macos/scripts/build/install-gcc.sh similarity index 65% rename from images/macos/scripts/build/gcc.sh rename to images/macos/scripts/build/install-gcc.sh index a7fa06fd0235..07155b60743e 100644 --- a/images/macos/scripts/build/gcc.sh +++ b/images/macos/scripts/build/install-gcc.sh @@ -1,4 +1,9 @@ #!/bin/bash -e -o pipefail +################################################################################ +## File: install-gcc.sh +## Desc: Install GCC +################################################################################ + source ~/utils/utils.sh gccVersions=$(get_toolset_value '.gcc.versions | .[]') diff --git a/images/macos/scripts/build/git.sh b/images/macos/scripts/build/install-git.sh similarity index 82% rename from images/macos/scripts/build/git.sh rename to images/macos/scripts/build/install-git.sh index 5721d6275b16..fedc7d6800de 100644 --- a/images/macos/scripts/build/git.sh +++ b/images/macos/scripts/build/install-git.sh @@ -1,4 +1,9 @@ #!/bin/bash -e -o pipefail +################################################################################ +## File: install-git.sh +## Desc: Install Git and Git LFS +################################################################################ + source ~/utils/utils.sh echo Installing Git... diff --git a/images/macos/scripts/build/golang.sh b/images/macos/scripts/build/install-golang.sh similarity index 60% rename from images/macos/scripts/build/golang.sh rename to images/macos/scripts/build/install-golang.sh index 3c37431fad9f..21d00d62ddea 100644 --- a/images/macos/scripts/build/golang.sh +++ b/images/macos/scripts/build/install-golang.sh @@ -1,4 +1,9 @@ #!/bin/bash -e -o pipefail +################################################################################ +## File: install-golang.sh +## Desc: Install Go +################################################################################ + source ~/utils/utils.sh DEFAULT_GO_VERSION=$(get_toolset_value '.go.default') @@ -8,4 +13,4 @@ brew_smart_install "go@${DEFAULT_GO_VERSION}" # Create symlinks to preserve backward compatibility. Symlinks are not created when non-latest go is being installed ln -sf $(brew --prefix go@${DEFAULT_GO_VERSION})/bin/* /usr/local/bin/ -invoke_tests "Common" "Go" \ No newline at end of file +invoke_tests "Common" "Go" diff --git a/images/macos/scripts/build/haskell.sh b/images/macos/scripts/build/install-haskell.sh similarity index 81% rename from images/macos/scripts/build/haskell.sh rename to images/macos/scripts/build/install-haskell.sh index 9856dc7dbe86..982db587742f 100644 --- a/images/macos/scripts/build/haskell.sh +++ b/images/macos/scripts/build/install-haskell.sh @@ -1,4 +1,8 @@ #!/bin/bash -e -o pipefail +################################################################################ +## File: install-haskell.sh +## Desc: Install Haskell +################################################################################ source ~/utils/utils.sh diff --git a/images/macos/scripts/build/homebrew.sh b/images/macos/scripts/build/install-homebrew.sh similarity index 82% rename from images/macos/scripts/build/homebrew.sh rename to images/macos/scripts/build/install-homebrew.sh index dea00c931646..b822c6ff1af4 100644 --- a/images/macos/scripts/build/homebrew.sh +++ b/images/macos/scripts/build/install-homebrew.sh @@ -1,4 +1,8 @@ #!/bin/bash -e -o pipefail +################################################################################ +## File: install-homebrew.sh +## Desc: Install Homebrew +################################################################################ source ~/utils/utils.sh @@ -36,4 +40,4 @@ echo "Installing wget..." brew_smart_install "wget" # init brew bundle feature -brew tap Homebrew/bundle \ No newline at end of file +brew tap Homebrew/bundle diff --git a/images/macos/scripts/build/install-llvm.sh b/images/macos/scripts/build/install-llvm.sh new file mode 100644 index 000000000000..3ba7bffae64c --- /dev/null +++ b/images/macos/scripts/build/install-llvm.sh @@ -0,0 +1,13 @@ +#!/bin/bash -e -o pipefail +################################################################################ +## File: install-llvm.sh +## Desc: Install LLVM +################################################################################ + +source ~/utils/utils.sh + +llvmVersion=$(get_toolset_value '.llvm.version') + +brew_smart_install "llvm@${llvmVersion}" + +invoke_tests "LLVM" diff --git a/images/macos/scripts/build/miniconda.sh b/images/macos/scripts/build/install-miniconda.sh similarity index 72% rename from images/macos/scripts/build/miniconda.sh rename to images/macos/scripts/build/install-miniconda.sh index 7a781b7cf1ae..a50008f3572a 100644 --- a/images/macos/scripts/build/miniconda.sh +++ b/images/macos/scripts/build/install-miniconda.sh @@ -1,4 +1,8 @@ #!/bin/bash -e -o pipefail +################################################################################ +## File: install-miniconda.sh +## Desc: Install Miniconda +################################################################################ source ~/utils/utils.sh diff --git a/images/macos/scripts/build/mongodb.sh b/images/macos/scripts/build/install-mongodb.sh similarity index 72% rename from images/macos/scripts/build/mongodb.sh rename to images/macos/scripts/build/install-mongodb.sh index 0b6b32a944c8..092d71535fac 100644 --- a/images/macos/scripts/build/mongodb.sh +++ b/images/macos/scripts/build/install-mongodb.sh @@ -1,4 +1,9 @@ #!/bin/bash -e -o pipefail +################################################################################ +## File: install-mongodb.sh +## Desc: Install MongoDB +################################################################################ + source ~/utils/utils.sh # MongoDB object-value database diff --git a/images/macos/scripts/build/mono.sh b/images/macos/scripts/build/install-mono.sh similarity index 97% rename from images/macos/scripts/build/mono.sh rename to images/macos/scripts/build/install-mono.sh index f4052a252ca4..c4af70a36787 100644 --- a/images/macos/scripts/build/mono.sh +++ b/images/macos/scripts/build/install-mono.sh @@ -1,8 +1,7 @@ #!/bin/bash -e -o pipefail - ################################################################################ -## File: mono.sh -## Desc: Installs Mono Framework +## File: install-mono.sh +## Desc: Install Mono Framework ################################################################################ # Source utility functions diff --git a/images/macos/scripts/build/install-nginx.sh b/images/macos/scripts/build/install-nginx.sh new file mode 100644 index 000000000000..0816b7ebb308 --- /dev/null +++ b/images/macos/scripts/build/install-nginx.sh @@ -0,0 +1,12 @@ +#!/bin/bash -e -o pipefail +################################################################################ +## File: install-nginx.sh +## Desc: Install Nginx +################################################################################ + +source ~/utils/utils.sh + +brew_smart_install nginx +sudo sed -Ei '' 's/listen.*/listen 80;/' $(brew --prefix)/etc/nginx/nginx.conf + +invoke_tests "WebServers" "Nginx" diff --git a/images/macos/scripts/build/node.sh b/images/macos/scripts/build/install-node.sh similarity index 74% rename from images/macos/scripts/build/node.sh rename to images/macos/scripts/build/install-node.sh index c4e3d8b904e3..d4ed820ef49f 100644 --- a/images/macos/scripts/build/node.sh +++ b/images/macos/scripts/build/install-node.sh @@ -1,4 +1,9 @@ #!/bin/bash -e -o pipefail +################################################################################ +## File: install-node.sh +## Desc: Install Node.js +################################################################################ + source ~/utils/utils.sh defaultVersion=$(get_toolset_value '.node.default') diff --git a/images/macos/scripts/build/nvm.sh b/images/macos/scripts/build/install-nvm.sh similarity index 90% rename from images/macos/scripts/build/nvm.sh rename to images/macos/scripts/build/install-nvm.sh index 7eaa2fcd1a0a..59cafdaa398e 100644 --- a/images/macos/scripts/build/nvm.sh +++ b/images/macos/scripts/build/install-nvm.sh @@ -1,8 +1,9 @@ #!/bin/bash -e -o pipefail -########################################################################### -# The script installs node version manager with node versions 10,12 and 14 -# -########################################################################### +################################################################################ +## File: install-nvm.sh +## Desc: Install node version manager +################################################################################ + source ~/utils/utils.sh [ -n "$API_PAT" ] && authString=(-H "Authorization: token ${API_PAT}") diff --git a/images/macos/scripts/build/openjdk.sh b/images/macos/scripts/build/install-openjdk.sh similarity index 94% rename from images/macos/scripts/build/openjdk.sh rename to images/macos/scripts/build/install-openjdk.sh index 496abd0780cf..b5787786685b 100644 --- a/images/macos/scripts/build/openjdk.sh +++ b/images/macos/scripts/build/install-openjdk.sh @@ -1,4 +1,9 @@ #!/bin/bash -e -o pipefail +################################################################################ +## File: install-openjdk.sh +## Desc: Install openjdk +################################################################################ + source ~/utils/utils.sh createEnvironmentVariable() { diff --git a/images/macos/scripts/build/openssl.sh b/images/macos/scripts/build/install-openssl.sh similarity index 72% rename from images/macos/scripts/build/openssl.sh rename to images/macos/scripts/build/install-openssl.sh index 80f023699c6b..aa55b74fa920 100644 --- a/images/macos/scripts/build/openssl.sh +++ b/images/macos/scripts/build/install-openssl.sh @@ -1,4 +1,9 @@ #!/bin/bash -e -o pipefail +################################################################################ +## File: install-openssl.sh +## Desc: Install openssl +################################################################################ + source ~/utils/utils.sh echo "Install openssl@1.1" diff --git a/images/macos/scripts/build/php.sh b/images/macos/scripts/build/install-php.sh similarity index 53% rename from images/macos/scripts/build/php.sh rename to images/macos/scripts/build/install-php.sh index bc68692b3727..757f8f500d1c 100644 --- a/images/macos/scripts/build/php.sh +++ b/images/macos/scripts/build/install-php.sh @@ -1,4 +1,9 @@ #!/bin/bash -e -o pipefail +################################################################################ +## File: install-php.sh +## Desc: Install PHP +################################################################################ + source ~/utils/utils.sh echo Installing PHP diff --git a/images/macos/scripts/build/pipx-packages.sh b/images/macos/scripts/build/install-pipx-packages.sh similarity index 74% rename from images/macos/scripts/build/pipx-packages.sh rename to images/macos/scripts/build/install-pipx-packages.sh index 38446d3c5066..19efeee7b0bf 100644 --- a/images/macos/scripts/build/pipx-packages.sh +++ b/images/macos/scripts/build/install-pipx-packages.sh @@ -1,4 +1,9 @@ #!/bin/bash -e -o pipefail +################################################################################ +## File: install-pipx-packages.sh +## Desc: Install Pipx Packages +################################################################################ + source ~/utils/utils.sh export PATH="$PATH:/opt/pipx_bin" diff --git a/images/macos/scripts/build/postgresql.sh b/images/macos/scripts/build/install-postgresql.sh similarity index 80% rename from images/macos/scripts/build/postgresql.sh rename to images/macos/scripts/build/install-postgresql.sh index 4d881486af49..5f62cc45b42f 100644 --- a/images/macos/scripts/build/postgresql.sh +++ b/images/macos/scripts/build/install-postgresql.sh @@ -1,4 +1,9 @@ #!/bin/bash -e -o pipefail +################################################################################ +## File: install-postgresql.sh +## Desc: Install PostgreSQL +################################################################################ + source ~/utils/utils.sh # Fetch PostgreSQL version to install from the toolset diff --git a/images/macos/scripts/build/powershell.sh b/images/macos/scripts/build/install-powershell.sh similarity index 90% rename from images/macos/scripts/build/powershell.sh rename to images/macos/scripts/build/install-powershell.sh index 428345e50253..33adb016c522 100644 --- a/images/macos/scripts/build/powershell.sh +++ b/images/macos/scripts/build/install-powershell.sh @@ -1,4 +1,9 @@ #!/bin/bash -e -o pipefail +################################################################################ +## File: install-powershell.sh +## Desc: Install PowerShell +################################################################################ + source ~/utils/utils.sh echo Installing PowerShell... diff --git a/images/macos/scripts/build/pypy.sh b/images/macos/scripts/build/install-pypy.sh similarity index 98% rename from images/macos/scripts/build/pypy.sh rename to images/macos/scripts/build/install-pypy.sh index 6e12ed9cf29c..39464414c441 100644 --- a/images/macos/scripts/build/pypy.sh +++ b/images/macos/scripts/build/install-pypy.sh @@ -1,7 +1,7 @@ #!/bin/bash -e -o pipefail ################################################################################ -## File: pypy.sh -## Desc: Installs PyPy +## File: install-pypy.sh +## Desc: Install PyPy ################################################################################ source ~/utils/utils.sh diff --git a/images/macos/scripts/build/python.sh b/images/macos/scripts/build/install-python.sh similarity index 86% rename from images/macos/scripts/build/python.sh rename to images/macos/scripts/build/install-python.sh index be801340bed2..dd55c82042cb 100644 --- a/images/macos/scripts/build/python.sh +++ b/images/macos/scripts/build/install-python.sh @@ -1,4 +1,9 @@ #!/bin/bash -e -o pipefail +################################################################################ +## File: install-python.sh +## Desc: Install Python +################################################################################ + source ~/utils/utils.sh echo "Installing Python Tooling" diff --git a/images/macos/scripts/build/install-rosetta.sh b/images/macos/scripts/build/install-rosetta.sh new file mode 100644 index 000000000000..af3a438c520b --- /dev/null +++ b/images/macos/scripts/build/install-rosetta.sh @@ -0,0 +1,8 @@ +#!/bin/bash -e -o pipefail +################################################################################ +## File: install-rosetta.sh +## Desc: Install Rosetta +################################################################################ + +echo 'Installing Rosetta' +/usr/sbin/softwareupdate --install-rosetta --agree-to-license diff --git a/images/macos/scripts/build/ruby.sh b/images/macos/scripts/build/install-ruby.sh similarity index 91% rename from images/macos/scripts/build/ruby.sh rename to images/macos/scripts/build/install-ruby.sh index b139b712bd7a..234312ee013c 100644 --- a/images/macos/scripts/build/ruby.sh +++ b/images/macos/scripts/build/install-ruby.sh @@ -1,4 +1,9 @@ #!/bin/bash -e -o pipefail +################################################################################ +## File: install-ruby.sh +## Desc: Install Ruby +################################################################################ + source ~/utils/utils.sh arch=$(get_arch) @@ -52,4 +57,5 @@ if ! is_Arm64; then fi done fi + invoke_tests "Ruby.$arch" diff --git a/images/macos/scripts/build/rubygem.sh b/images/macos/scripts/build/install-rubygems.sh similarity index 68% rename from images/macos/scripts/build/rubygem.sh rename to images/macos/scripts/build/install-rubygems.sh index 9b9b4cb63953..15a20616b71b 100644 --- a/images/macos/scripts/build/rubygem.sh +++ b/images/macos/scripts/build/install-rubygems.sh @@ -1,4 +1,9 @@ #!/bin/bash -e -o pipefail +################################################################################ +## File: install-rubygems.sh +## Desc: Install RubyGems +################################################################################ + source ~/utils/utils.sh echo Updating RubyGems... diff --git a/images/macos/scripts/build/rust.sh b/images/macos/scripts/build/install-rust.sh similarity index 72% rename from images/macos/scripts/build/rust.sh rename to images/macos/scripts/build/install-rust.sh index d2cc3b646e39..a1fa98403423 100644 --- a/images/macos/scripts/build/rust.sh +++ b/images/macos/scripts/build/install-rust.sh @@ -1,4 +1,9 @@ #!/bin/bash -e -o pipefail +################################################################################ +## File: install-rust.sh +## Desc: Install Rust +################################################################################ + source ~/utils/utils.sh echo Installing Rustup... diff --git a/images/macos/scripts/build/safari.sh b/images/macos/scripts/build/install-safari.sh similarity index 73% rename from images/macos/scripts/build/safari.sh rename to images/macos/scripts/build/install-safari.sh index 8001c39eeb6a..bd4f54e7c74d 100644 --- a/images/macos/scripts/build/safari.sh +++ b/images/macos/scripts/build/install-safari.sh @@ -1,4 +1,8 @@ #!/bin/bash -e -o pipefail +################################################################################ +## File: install-safari.sh +## Desc: Install Safari browser +################################################################################ echo "Enabling safari driver..." # https://developer.apple.com/documentation/webkit/testing_with_webdriver_in_safari @@ -13,4 +17,4 @@ safari_plist="$HOME/Library/WebDriver/com.apple.Safari.plist" /usr/libexec/PlistBuddy -c 'delete AllowRemoteAutomation' $safari_plist || true /usr/libexec/PlistBuddy -c 'add AllowRemoteAutomation bool true' $safari_plist -invoke_tests "Browsers" "Safari" \ No newline at end of file +invoke_tests "Browsers" "Safari" diff --git a/images/macos/scripts/build/swiftlint.sh b/images/macos/scripts/build/install-swiftlint.sh similarity index 73% rename from images/macos/scripts/build/swiftlint.sh rename to images/macos/scripts/build/install-swiftlint.sh index d01b730830b2..5a3222e97288 100644 --- a/images/macos/scripts/build/swiftlint.sh +++ b/images/macos/scripts/build/install-swiftlint.sh @@ -1,4 +1,9 @@ #!/bin/bash -e -o pipefail +################################################################################ +## File: install-swiftlint.sh +## Desc: Install SwiftLint +################################################################################ + source ~/utils/utils.sh echo Installing Swiftlint... diff --git a/images/macos/scripts/build/vcpkg.sh b/images/macos/scripts/build/install-vcpkg.sh similarity index 75% rename from images/macos/scripts/build/vcpkg.sh rename to images/macos/scripts/build/install-vcpkg.sh index 7ba161725f5d..13acc0f167eb 100644 --- a/images/macos/scripts/build/vcpkg.sh +++ b/images/macos/scripts/build/install-vcpkg.sh @@ -1,4 +1,9 @@ #!/bin/bash -e -o pipefail +################################################################################ +## File: install-vcpkg.sh +## Desc: Install vcpkg +################################################################################ + source ~/utils/utils.sh # Set env variable for vcpkg diff --git a/images/macos/scripts/build/vsmac.sh b/images/macos/scripts/build/install-visualstudio.sh similarity index 88% rename from images/macos/scripts/build/vsmac.sh rename to images/macos/scripts/build/install-visualstudio.sh index 7e4cbc4ee777..34aa585c46b6 100644 --- a/images/macos/scripts/build/vsmac.sh +++ b/images/macos/scripts/build/install-visualstudio.sh @@ -1,4 +1,9 @@ #!/bin/bash -e -o pipefail +################################################################################ +## File: install-visualstudio.sh +## Desc: Install Visual Studio +################################################################################ + source ~/utils/utils.sh source ~/utils/xamarin-utils.sh diff --git a/images/macos/scripts/build/xamarin.sh b/images/macos/scripts/build/install-xamarin.sh similarity index 93% rename from images/macos/scripts/build/xamarin.sh rename to images/macos/scripts/build/install-xamarin.sh index febdf5fdb701..3f9e7fcc3b60 100644 --- a/images/macos/scripts/build/xamarin.sh +++ b/images/macos/scripts/build/install-xamarin.sh @@ -1,4 +1,9 @@ #!/bin/bash -e -o pipefail +################################################################################ +## File: install-xamarin.sh +## Desc: Install Xamarin +################################################################################ + source ~/utils/utils.sh source ~/utils/xamarin-utils.sh diff --git a/images/macos/scripts/build/xcode-clt.sh b/images/macos/scripts/build/install-xcode-clt.sh similarity index 86% rename from images/macos/scripts/build/xcode-clt.sh rename to images/macos/scripts/build/install-xcode-clt.sh index aecba8e83951..13c17a5e6b79 100644 --- a/images/macos/scripts/build/xcode-clt.sh +++ b/images/macos/scripts/build/install-xcode-clt.sh @@ -1,4 +1,9 @@ #!/bin/bash -e -o pipefail +################################################################################ +## File: install-xcode-clt.sh +## Desc: Install Xcode Command Line Tools +################################################################################ + source ~/utils/utils.sh is_clt_installed() { @@ -43,4 +48,4 @@ while ! is_clt_installed; do ((retries--)) echo "Wait $sleepInterval seconds before the next check for installed Command Line Tools" sleep $sleepInterval -done \ No newline at end of file +done diff --git a/images/macos/scripts/build/xcode-sims.sh b/images/macos/scripts/build/install-xcode-simulators.sh similarity index 64% rename from images/macos/scripts/build/xcode-sims.sh rename to images/macos/scripts/build/install-xcode-simulators.sh index 8dff14a5e7bf..3ff94dacb13e 100644 --- a/images/macos/scripts/build/xcode-sims.sh +++ b/images/macos/scripts/build/install-xcode-simulators.sh @@ -1,4 +1,8 @@ #!/bin/bash -e -o pipefail +################################################################################ +## File: install-xcode-simulators.sh +## Desc: Install Xcode simulators +################################################################################ source ~/utils/utils.sh diff --git a/images/macos/scripts/build/llvm.sh b/images/macos/scripts/build/llvm.sh deleted file mode 100644 index ff1aa683ff2c..000000000000 --- a/images/macos/scripts/build/llvm.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -e -o pipefail -source ~/utils/utils.sh - -llvmVersion=$(get_toolset_value '.llvm.version') - -brew_smart_install "llvm@${llvmVersion}" - -invoke_tests "LLVM" \ No newline at end of file diff --git a/images/macos/scripts/build/nginx.sh b/images/macos/scripts/build/nginx.sh deleted file mode 100644 index f9c1e4c7f808..000000000000 --- a/images/macos/scripts/build/nginx.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -e -o pipefail - -source ~/utils/utils.sh - -brew_smart_install nginx -sudo sed -Ei '' 's/listen.*/listen 80;/' $(brew --prefix)/etc/nginx/nginx.conf - -invoke_tests "WebServers" "Nginx" diff --git a/images/macos/scripts/build/reboot.sh b/images/macos/scripts/build/reboot.sh deleted file mode 100644 index e0a2dfb804b6..000000000000 --- a/images/macos/scripts/build/reboot.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -e -o pipefail - -shutdown -r now \ No newline at end of file diff --git a/images/macos/scripts/build/rosetta.sh b/images/macos/scripts/build/rosetta.sh deleted file mode 100644 index ee0617fde352..000000000000 --- a/images/macos/scripts/build/rosetta.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -e -o pipefail - -echo 'Installing Rosetta' -/usr/sbin/softwareupdate --install-rosetta --agree-to-license diff --git a/images/macos/scripts/docs-gen/SoftwareReport.Generator.ps1 b/images/macos/scripts/docs-gen/Generate-SoftwareReport.ps1 similarity index 99% rename from images/macos/scripts/docs-gen/SoftwareReport.Generator.ps1 rename to images/macos/scripts/docs-gen/Generate-SoftwareReport.ps1 index 3872575fa33d..2419f45baa11 100644 --- a/images/macos/scripts/docs-gen/SoftwareReport.Generator.ps1 +++ b/images/macos/scripts/docs-gen/Generate-SoftwareReport.ps1 @@ -17,7 +17,7 @@ Import-Module "$PSScriptRoot/SoftwareReport.Xamarin.psm1" -DisableNameChecking Import-Module "$PSScriptRoot/SoftwareReport.Toolcache.psm1" -DisableNameChecking Import-Module "$PSScriptRoot/SoftwareReport.Browsers.psm1" -DisableNameChecking Import-Module "$PSScriptRoot/SoftwareReport.WebServers.psm1" -DisableNameChecking -Import-Module "$PSScriptRoot/../helpers/SoftwareReport.Helpers.psm1" +Import-Module "$PSScriptRoot/SoftwareReport.Helpers.psm1" -DisableNameChecking Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" Import-Module "$PSScriptRoot/../helpers/Xcode.Helpers.psm1" diff --git a/images/macos/scripts/docs-gen/SoftwareReport.Android.psm1 b/images/macos/scripts/docs-gen/SoftwareReport.Android.psm1 index 08f4b0746ca8..22cf4a5c96b0 100644 --- a/images/macos/scripts/docs-gen/SoftwareReport.Android.psm1 +++ b/images/macos/scripts/docs-gen/SoftwareReport.Android.psm1 @@ -1,4 +1,4 @@ -Import-Module "$PSScriptRoot/../helpers/SoftwareReport.Helpers.psm1" -DisableNameChecking +Import-Module "$PSScriptRoot/SoftwareReport.Helpers.psm1" -DisableNameChecking Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" function Split-TableRowByColumns { diff --git a/images/macos/scripts/helpers/SoftwareReport.Helpers.psm1 b/images/macos/scripts/docs-gen/SoftwareReport.Helpers.psm1 similarity index 100% rename from images/macos/scripts/helpers/SoftwareReport.Helpers.psm1 rename to images/macos/scripts/docs-gen/SoftwareReport.Helpers.psm1 diff --git a/images/macos/scripts/helpers/invoke-tests.sh b/images/macos/scripts/helpers/invoke-tests.sh index c71d040311de..232d3c0aaffa 100644 --- a/images/macos/scripts/helpers/invoke-tests.sh +++ b/images/macos/scripts/helpers/invoke-tests.sh @@ -1,5 +1,5 @@ #!/bin/bash -e -o pipefail source $HOME/.bashrc -pwsh -Command "Import-Module '$HOME/image-generation/helpers/Tests.Helpers.psm1' -DisableNameChecking +pwsh -Command "Import-Module '$HOME/image-generation/tests/Helpers.psm1' -DisableNameChecking Invoke-PesterTests -TestFile \"$1\" -TestName \"$2\"" diff --git a/images/macos/scripts/tests/Android.Tests.ps1 b/images/macos/scripts/tests/Android.Tests.ps1 index fe247262f021..335fb7e0eb78 100644 --- a/images/macos/scripts/tests/Android.Tests.ps1 +++ b/images/macos/scripts/tests/Android.Tests.ps1 @@ -1,5 +1,5 @@ Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" -Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1" -DisableNameChecking +Import-Module "$PSScriptRoot/Helpers.psm1" -DisableNameChecking Import-Module "$PSScriptRoot/../software-report/SoftwareReport.Android.psm1" -DisableNameChecking $os = Get-OSVersion diff --git a/images/macos/scripts/tests/Common.Tests.ps1 b/images/macos/scripts/tests/Common.Tests.ps1 index c7c812aa6b44..de8f6aef9574 100644 --- a/images/macos/scripts/tests/Common.Tests.ps1 +++ b/images/macos/scripts/tests/Common.Tests.ps1 @@ -1,5 +1,5 @@ Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" -Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1" -DisableNameChecking +Import-Module "$PSScriptRoot/Helpers.psm1" -DisableNameChecking $os = Get-OSVersion diff --git a/images/macos/scripts/helpers/Tests.Helpers.psm1 b/images/macos/scripts/tests/Helpers.psm1 similarity index 98% rename from images/macos/scripts/helpers/Tests.Helpers.psm1 rename to images/macos/scripts/tests/Helpers.psm1 index 528a0857e685..5f6fa593c8fc 100644 --- a/images/macos/scripts/helpers/Tests.Helpers.psm1 +++ b/images/macos/scripts/tests/Helpers.psm1 @@ -1,4 +1,4 @@ -Import-Module "$PSScriptRoot/Common.Helpers.psm1" +Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" # Validates that tool is installed and in PATH function Validate-ToolExist($tool) { @@ -149,4 +149,4 @@ function Invoke-PesterTests { $results throw "Test run has failed" } -} \ No newline at end of file +} diff --git a/images/macos/scripts/tests/Java.Tests.ps1 b/images/macos/scripts/tests/Java.Tests.ps1 index 65238c1d1e4e..fb2e948f9f55 100644 --- a/images/macos/scripts/tests/Java.Tests.ps1 +++ b/images/macos/scripts/tests/Java.Tests.ps1 @@ -1,5 +1,5 @@ Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" -Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1" -DisableNameChecking +Import-Module "$PSScriptRoot/Helpers.psm1" -DisableNameChecking $os = Get-OSVersion $arch = Get-Architecture diff --git a/images/macos/scripts/tests/LLVM.Tests.ps1 b/images/macos/scripts/tests/LLVM.Tests.ps1 index af5b63535810..964718e78e7e 100644 --- a/images/macos/scripts/tests/LLVM.Tests.ps1 +++ b/images/macos/scripts/tests/LLVM.Tests.ps1 @@ -1,3 +1,5 @@ +Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" + Describe "Clang/LLVM" { BeforeAll { $toolsetVersion = Get-ToolsetValue 'llvm.version' @@ -7,4 +9,4 @@ Describe "Clang/LLVM" { $clangVersion = & "$(brew --prefix llvm@$toolsetVersion)/bin/clang" --version $clangVersion[0] | Should -BeLike "*${toolsetVersion}*" } -} \ No newline at end of file +} diff --git a/images/macos/scripts/tests/Linters.Tests.ps1 b/images/macos/scripts/tests/Linters.Tests.ps1 index 38fcfda5c18f..987abc9882bd 100644 --- a/images/macos/scripts/tests/Linters.Tests.ps1 +++ b/images/macos/scripts/tests/Linters.Tests.ps1 @@ -1,4 +1,4 @@ -Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1" -DisableNameChecking +Import-Module "$PSScriptRoot/Helpers.psm1" -DisableNameChecking $os = Get-OSVersion diff --git a/images/macos/scripts/tests/Node.Tests.ps1 b/images/macos/scripts/tests/Node.Tests.ps1 index 28a81f63949d..7e3757fae345 100644 --- a/images/macos/scripts/tests/Node.Tests.ps1 +++ b/images/macos/scripts/tests/Node.Tests.ps1 @@ -1,5 +1,5 @@ Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" -Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1" -DisableNameChecking +Import-Module "$PSScriptRoot/Helpers.psm1" -DisableNameChecking $os = Get-OSVersion diff --git a/images/macos/scripts/tests/Powershell.Tests.ps1 b/images/macos/scripts/tests/Powershell.Tests.ps1 index 939957472e74..fa4c6e2a5902 100644 --- a/images/macos/scripts/tests/Powershell.Tests.ps1 +++ b/images/macos/scripts/tests/Powershell.Tests.ps1 @@ -1,5 +1,5 @@ Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" -Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1" -DisableNameChecking +Import-Module "$PSScriptRoot/Helpers.psm1" -DisableNameChecking Describe "Powershell" { Context "Powershell is installed" { @@ -40,4 +40,4 @@ Describe "Powershell" { } } } -} \ No newline at end of file +} diff --git a/images/macos/scripts/tests/Python.Tests.ps1 b/images/macos/scripts/tests/Python.Tests.ps1 index 6126ee9f2aea..84e85a08ed72 100644 --- a/images/macos/scripts/tests/Python.Tests.ps1 +++ b/images/macos/scripts/tests/Python.Tests.ps1 @@ -1,5 +1,5 @@ Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" -Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1" -DisableNameChecking +Import-Module "$PSScriptRoot/Helpers.psm1" -DisableNameChecking $os = Get-OSVersion diff --git a/images/macos/scripts/tests/Ruby.arm64.Tests.ps1 b/images/macos/scripts/tests/Ruby.arm64.Tests.ps1 index cb0dacf9ef4f..64873954e732 100644 --- a/images/macos/scripts/tests/Ruby.arm64.Tests.ps1 +++ b/images/macos/scripts/tests/Ruby.arm64.Tests.ps1 @@ -1,5 +1,5 @@ Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" -Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1" -DisableNameChecking +Import-Module "$PSScriptRoot/Helpers.psm1" -DisableNameChecking $os = Get-OSVersion diff --git a/images/macos/scripts/tests/Ruby.x64.Tests.ps1 b/images/macos/scripts/tests/Ruby.x64.Tests.ps1 index 97dc24cacd9f..ded146dd4563 100644 --- a/images/macos/scripts/tests/Ruby.x64.Tests.ps1 +++ b/images/macos/scripts/tests/Ruby.x64.Tests.ps1 @@ -1,5 +1,5 @@ Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" -Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1" -DisableNameChecking +Import-Module "$PSScriptRoot/Helpers.psm1" -DisableNameChecking $os = Get-OSVersion diff --git a/images/macos/scripts/tests/RunAll-Tests.ps1 b/images/macos/scripts/tests/RunAll-Tests.ps1 index 015491cd2c79..7ac546087c47 100644 --- a/images/macos/scripts/tests/RunAll-Tests.ps1 +++ b/images/macos/scripts/tests/RunAll-Tests.ps1 @@ -1,3 +1,3 @@ -Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1" -DisableNameChecking +Import-Module "$PSScriptRoot/Helpers.psm1" -DisableNameChecking -Invoke-PesterTests "*" \ No newline at end of file +Invoke-PesterTests "*" diff --git a/images/macos/scripts/tests/Toolcache.Tests.ps1 b/images/macos/scripts/tests/Toolcache.Tests.ps1 index d71ca1a8614a..e2b1a722632e 100644 --- a/images/macos/scripts/tests/Toolcache.Tests.ps1 +++ b/images/macos/scripts/tests/Toolcache.Tests.ps1 @@ -1,5 +1,5 @@ Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" -Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1" -DisableNameChecking +Import-Module "$PSScriptRoot/Helpers.psm1" -DisableNameChecking $arch = Get-Architecture $os = Get-OSVersion diff --git a/images/macos/scripts/tests/Toolset.Tests.ps1 b/images/macos/scripts/tests/Toolset.Tests.ps1 index 098d15629e92..5baef204467a 100644 --- a/images/macos/scripts/tests/Toolset.Tests.ps1 +++ b/images/macos/scripts/tests/Toolset.Tests.ps1 @@ -1,4 +1,4 @@ -Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1" +Import-Module "$PSScriptRoot/Helpers.psm1" $toolsets = Get-ChildItem -Path $PSScriptRoot -Filter "toolset-*.json" @@ -141,4 +141,4 @@ $toolsets | ForEach-Object { } } -} \ No newline at end of file +} diff --git a/images/macos/scripts/tests/Xamarin.Tests.ps1 b/images/macos/scripts/tests/Xamarin.Tests.ps1 index 8eb12ba35374..501ade256e11 100644 --- a/images/macos/scripts/tests/Xamarin.Tests.ps1 +++ b/images/macos/scripts/tests/Xamarin.Tests.ps1 @@ -1,5 +1,5 @@ Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" -Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1" -DisableNameChecking +Import-Module "$PSScriptRoot/Helpers.psm1" -DisableNameChecking $os = Get-OSVersion if ($os.IsVentura -or $os.IsSonoma) { diff --git a/images/macos/scripts/tests/Xcode.Tests.ps1 b/images/macos/scripts/tests/Xcode.Tests.ps1 index 6909fdcbf238..6ef32baac69b 100644 --- a/images/macos/scripts/tests/Xcode.Tests.ps1 +++ b/images/macos/scripts/tests/Xcode.Tests.ps1 @@ -1,6 +1,6 @@ Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" Import-Module "$PSScriptRoot/../helpers/Xcode.Helpers.psm1" -Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1" -DisableNameChecking +Import-Module "$PSScriptRoot/Helpers.psm1" -DisableNameChecking $ARCH = Get-Architecture $xcodeVersions = Get-ToolsetValue "xcode.$ARCH.versions" @@ -133,4 +133,4 @@ Describe "Xcode Simulators Naming" -Skip:(-not $os.IsMonterey) { $foundSimulators | Should -HaveCount 1 $foundSimulators[0].deviceTypeIdentifier | Should -Be $DeviceId } -} \ No newline at end of file +} diff --git a/images/macos/templates/macOS-11.json b/images/macos/templates/macOS-11.json index 4e9804358bff..ded01dd95121 100644 --- a/images/macos/templates/macOS-11.json +++ b/images/macos/templates/macOS-11.json @@ -100,22 +100,22 @@ "type": "shell", "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}", "scripts": [ - "./scripts/build/xcode-clt.sh", - "./scripts/build/homebrew.sh" + "./scripts/build/install-xcode-clt.sh", + "./scripts/build/install-homebrew.sh" ] }, { "type": "shell", "execute_command": "chmod +x {{ .Path }}; sudo {{ .Vars }} {{ .Path }}", "scripts": [ - "./scripts/build/xcode-clt.sh", - "./scripts/build/add-network-interface-detection.sh", - "./scripts/build/autologin.sh", - "./scripts/build/disable-auto-updates.sh", - "./scripts/build/screensaver-off.sh", - "./scripts/build/ntpconf.sh", - "./scripts/build/max-files.sh", - "./scripts/build/shell-change.sh" + "./scripts/build/install-xcode-clt.sh", + "./scripts/build/configure-network-interface-detection.sh", + "./scripts/build/configure-autologin.sh", + "./scripts/build/configure-auto-updates.sh", + "./scripts/build/configure-screensaver.sh", + "./scripts/build/configure-ntpconf.sh", + "./scripts/build/configure-max-files-limitation.sh", + "./scripts/build/configure-shell.sh" ], "environment_vars": [ "PASSWORD={{user `vm_password`}}", @@ -126,7 +126,7 @@ "type": "shell", "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}", "scripts": [ - "./scripts/build/preimagedata.sh", + "./scripts/build/configure-preimagedata.sh", "./scripts/build/configure-ssh.sh", "./scripts/build/configure-machine.sh" ], @@ -137,8 +137,11 @@ }, { "type": "shell", - "execute_command": "chmod +x {{ .Path }}; sudo {{ .Vars }} {{ .Path }}", - "script": "./scripts/build/reboot.sh", + "execute_command": "sudo {{ .Vars }} {{ .Path }}", + "inline": [ + "echo 'Reboot VM'", + "shutdown -r now" + ], "expect_disconnect": true }, { @@ -146,17 +149,17 @@ "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}", "pause_before": "30s", "scripts": [ - "./scripts/build/open_windows_check.sh", - "./scripts/build/powershell.sh", - "./scripts/build/dotnet.sh", - "./scripts/build/python.sh", - "./scripts/build/azcopy.sh", - "./scripts/build/openssl.sh", - "./scripts/build/ruby.sh", - "./scripts/build/rubygem.sh", - "./scripts/build/git.sh", - "./scripts/build/mongodb.sh", - "./scripts/build/node.sh" + "./scripts/build/configure-windows.sh", + "./scripts/build/install-powershell.sh", + "./scripts/build/install-dotnet.sh", + "./scripts/build/install-python.sh", + "./scripts/build/install-azcopy.sh", + "./scripts/build/install-openssl.sh", + "./scripts/build/install-ruby.sh", + "./scripts/build/install-rubygems.sh", + "./scripts/build/install-git.sh", + "./scripts/build/install-mongodb.sh", + "./scripts/build/install-node.sh" ], "environment_vars": [ "API_PAT={{user `github_api_pat`}}" @@ -165,7 +168,7 @@ { "type": "shell", "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} pwsh -f {{ .Path }}", - "script": "./scripts/build/xcode.ps1", + "script": "./scripts/build/Install-Xcode.ps1", "environment_vars": [ "XCODE_INSTALL_STORAGE_URL={{user `xcode_install_storage_url`}}", "XCODE_INSTALL_SAS={{user `xcode_install_sas`}}" @@ -173,44 +176,47 @@ }, { "type": "shell", - "execute_command": "chmod +x {{ .Path }}; sudo {{ .Vars }} {{ .Path }}", - "script": "./scripts/build/reboot.sh", + "execute_command": "sudo {{ .Vars }} {{ .Path }}", + "inline": [ + "echo 'Reboot VM'", + "shutdown -r now" + ], "expect_disconnect": true }, { "type": "shell", "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}", "scripts": [ - "./scripts/build/action-archive-cache.sh", - "./scripts/build/commonutils.sh", - "./scripts/build/llvm.sh", - "./scripts/build/golang.sh", - "./scripts/build/swiftlint.sh", - "./scripts/build/openjdk.sh", - "./scripts/build/php.sh", - "./scripts/build/aws.sh", - "./scripts/build/rust.sh", - "./scripts/build/gcc.sh", - "./scripts/build/haskell.sh", - "./scripts/build/cocoapods.sh", - "./scripts/build/android-toolsets.sh", - "./scripts/build/xamarin.sh", - "./scripts/build/vsmac.sh", - "./scripts/build/nvm.sh", - "./scripts/build/apache.sh", - "./scripts/build/nginx.sh", - "./scripts/build/postgresql.sh", - "./scripts/build/audiodevice.sh", - "./scripts/build/vcpkg.sh", - "./scripts/build/miniconda.sh", - "./scripts/build/safari.sh", - "./scripts/build/chrome.sh", - "./scripts/build/edge.sh", - "./scripts/build/firefox.sh", - "./scripts/build/pypy.sh", - "./scripts/build/pipx-packages.sh", - "./scripts/build/bicep.sh", - "./scripts/build/codeql-bundle.sh" + "./scripts/build/install-actions-cache.sh", + "./scripts/build/install-common-utils.sh", + "./scripts/build/install-llvm.sh", + "./scripts/build/install-golang.sh", + "./scripts/build/install-swiftlint.sh", + "./scripts/build/install-openjdk.sh", + "./scripts/build/install-php.sh", + "./scripts/build/install-aws-tools.sh", + "./scripts/build/install-rust.sh", + "./scripts/build/install-gcc.sh", + "./scripts/build/install-haskell.sh", + "./scripts/build/install-cocoapods.sh", + "./scripts/build/install-android-sdk.sh", + "./scripts/build/install-xamarin.sh", + "./scripts/build/install-visualstudio.sh", + "./scripts/build/install-nvm.sh", + "./scripts/build/install-apache.sh", + "./scripts/build/install-nginx.sh", + "./scripts/build/install-postgresql.sh", + "./scripts/build/install-audiodevice.sh", + "./scripts/build/install-vcpkg.sh", + "./scripts/build/install-miniconda.sh", + "./scripts/build/install-safari.sh", + "./scripts/build/install-chrome.sh", + "./scripts/build/install-edge.sh", + "./scripts/build/install-firefox.sh", + "./scripts/build/install-pypy.sh", + "./scripts/build/install-pipx-packages.sh", + "./scripts/build/install-bicep.sh", + "./scripts/build/install-codeql-bundle.sh" ], "environment_vars": [ "API_PAT={{user `github_api_pat`}}" @@ -220,21 +226,21 @@ "type": "shell", "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} pwsh -f {{ .Path }}", "scripts": [ - "./scripts/build/toolset.ps1", - "./scripts/build/configure-toolset.ps1" + "./scripts/build/Install-Toolset.ps1", + "./scripts/build/Configure-Toolset.ps1" ] }, { "type": "shell", "execute_command": "ruby {{ .Path }}", "scripts": [ - "./scripts/build/delete-duplicate-sims.rb" + "./scripts/build/configure-xcode-simulators.rb" ] }, { "type": "shell", "inline": [ - "pwsh -File \"$HOME/image-generation/software-report/SoftwareReport.Generator.ps1\" -OutputDirectory \"$HOME/image-generation/output/software-report\" -ImageName {{user `build_id`}}", + "pwsh -File \"$HOME/image-generation/software-report/Generate-SoftwareReport.ps1\" -OutputDirectory \"$HOME/image-generation/output/software-report\" -ImageName {{user `build_id`}}", "pwsh -File \"$HOME/image-generation/tests/RunAll-Tests.ps1\"" ] }, @@ -249,7 +255,7 @@ "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}", "scripts": [ "./scripts/build/configure-hostname.sh", - "./scripts/build/finalize-vm.sh" + "./scripts/build/configure-system.sh" ] } ] diff --git a/images/macos/templates/macOS-12.anka.pkr.hcl b/images/macos/templates/macOS-12.anka.pkr.hcl index 1850c957c214..2e852325c673 100644 --- a/images/macos/templates/macOS-12.anka.pkr.hcl +++ b/images/macos/templates/macOS-12.anka.pkr.hcl @@ -129,21 +129,21 @@ build { } provisioner "shell" { scripts = [ - "./scripts/build/xcode-clt.sh", - "./scripts/build/homebrew.sh" + "./scripts/build/install-xcode-clt.sh", + "./scripts/build/install-homebrew.sh" ] execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" } provisioner "shell" { scripts = [ "./scripts/build/configure-tccdb-macos.sh", - "./scripts/build/add-network-interface-detection.sh", - "./scripts/build/autologin.sh", - "./scripts/build/disable-auto-updates.sh", - "./scripts/build/screensaver-off.sh", - "./scripts/build/ntpconf.sh", - "./scripts/build/max-files.sh", - "./scripts/build/shell-change.sh" + "./scripts/build/configure-network-interface-detection.sh", + "./scripts/build/configure-autologin.sh", + "./scripts/build/configure-auto-updates.sh", + "./scripts/build/configure-screensaver.sh", + "./scripts/build/configure-ntpconf.sh", + "./scripts/build/configure-max-files-limitation.sh", + "./scripts/build/configure-shell.sh" ] environment_vars = [ "PASSWORD=${var.vm_password}", @@ -153,7 +153,7 @@ build { } provisioner "shell" { scripts = [ - "./scripts/build/preimagedata.sh", + "./scripts/build/configure-preimagedata.sh", "./scripts/build/configure-ssh.sh", "./scripts/build/configure-machine.sh" ] @@ -165,25 +165,25 @@ build { execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" } provisioner "shell" { - script = "./scripts/build/reboot.sh" - execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}" + execute_command = "source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}" expect_disconnect = true + inline = ["echo 'Reboot VM'", "shutdown -r now"] } provisioner "shell" { pause_before = "30s" scripts = [ - "./scripts/build/open_windows_check.sh", - "./scripts/build/powershell.sh", - "./scripts/build/dotnet.sh", - "./scripts/build/python.sh", - "./scripts/build/azcopy.sh", - "./scripts/build/openssl.sh", - "./scripts/build/ruby.sh", - "./scripts/build/rubygem.sh", - "./scripts/build/git.sh", - "./scripts/build/mongodb.sh", - "./scripts/build/node.sh", - "./scripts/build/commonutils.sh" + "./scripts/build/configure-windows.sh", + "./scripts/build/install-powershell.sh", + "./scripts/build/install-dotnet.sh", + "./scripts/build/install-python.sh", + "./scripts/build/install-azcopy.sh", + "./scripts/build/install-openssl.sh", + "./scripts/build/install-ruby.sh", + "./scripts/build/install-rubygems.sh", + "./scripts/build/install-git.sh", + "./scripts/build/install-mongodb.sh", + "./scripts/build/install-node.sh", + "./scripts/build/install-common-utils.sh" ] environment_vars = [ "API_PAT=${var.github_api_pat}", @@ -192,7 +192,7 @@ build { execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" } provisioner "shell" { - script = "./scripts/build/xcode.ps1" + script = "./scripts/build/Install-Xcode.ps1" environment_vars = [ "XCODE_INSTALL_STORAGE_URL=${var.xcode_install_storage_url}", "XCODE_INSTALL_SAS=${var.xcode_install_sas}" @@ -200,41 +200,41 @@ build { execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} pwsh -f {{ .Path }}" } provisioner "shell" { - script = "./scripts/build/reboot.sh" - execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}" + execute_command = "source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}" expect_disconnect = true + inline = ["echo 'Reboot VM'", "shutdown -r now"] } provisioner "shell" { scripts = [ - "./scripts/build/action-archive-cache.sh", - "./scripts/build/llvm.sh", - "./scripts/build/golang.sh", - "./scripts/build/swiftlint.sh", - "./scripts/build/openjdk.sh", - "./scripts/build/php.sh", - "./scripts/build/aws.sh", - "./scripts/build/rust.sh", - "./scripts/build/gcc.sh", - "./scripts/build/haskell.sh", - "./scripts/build/cocoapods.sh", - "./scripts/build/android-toolsets.sh", - "./scripts/build/xamarin.sh", - "./scripts/build/vsmac.sh", - "./scripts/build/nvm.sh", - "./scripts/build/apache.sh", - "./scripts/build/nginx.sh", - "./scripts/build/postgresql.sh", - "./scripts/build/audiodevice.sh", - "./scripts/build/vcpkg.sh", - "./scripts/build/miniconda.sh", - "./scripts/build/safari.sh", - "./scripts/build/chrome.sh", - "./scripts/build/edge.sh", - "./scripts/build/firefox.sh", - "./scripts/build/pypy.sh", - "./scripts/build/pipx-packages.sh", - "./scripts/build/bicep.sh", - "./scripts/build/codeql-bundle.sh" + "./scripts/build/install-actions-cache.sh", + "./scripts/build/install-llvm.sh", + "./scripts/build/install-golang.sh", + "./scripts/build/install-swiftlint.sh", + "./scripts/build/install-openjdk.sh", + "./scripts/build/install-php.sh", + "./scripts/build/install-aws-tools.sh", + "./scripts/build/install-rust.sh", + "./scripts/build/install-gcc.sh", + "./scripts/build/install-haskell.sh", + "./scripts/build/install-cocoapods.sh", + "./scripts/build/install-android-sdk.sh", + "./scripts/build/install-xamarin.sh", + "./scripts/build/install-visualstudio.sh", + "./scripts/build/install-nvm.sh", + "./scripts/build/install-apache.sh", + "./scripts/build/install-nginx.sh", + "./scripts/build/install-postgresql.sh", + "./scripts/build/install-audiodevice.sh", + "./scripts/build/install-vcpkg.sh", + "./scripts/build/install-miniconda.sh", + "./scripts/build/install-safari.sh", + "./scripts/build/install-chrome.sh", + "./scripts/build/install-edge.sh", + "./scripts/build/install-firefox.sh", + "./scripts/build/install-pypy.sh", + "./scripts/build/install-pipx-packages.sh", + "./scripts/build/install-bicep.sh", + "./scripts/build/install-codeql-bundle.sh" ] environment_vars = [ "API_PAT=${var.github_api_pat}" @@ -243,22 +243,22 @@ build { } provisioner "shell" { scripts = [ - "./scripts/build/toolset.ps1", - "./scripts/build/configure-toolset.ps1" + "./scripts/build/Install-Toolset.ps1", + "./scripts/build/Configure-Toolset.ps1" ] execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} pwsh -f {{ .Path }}" } provisioner "shell" { - script = "./scripts/build/delete-duplicate-sims.rb" + script = "./scripts/build/configure-xcode-simulators.rb" execute_command = "source $HOME/.bash_profile; ruby {{ .Path }}" } provisioner "shell" { - script = "./scripts/build/fix-xcode-simulators.ps1" + script = "./scripts/build/Update-XcodeSimulators.ps1" execute_command = "chmod +x {{ .Path }}; {{ .Vars }} pwsh -f {{ .Path }}" } provisioner "shell" { inline = [ - "pwsh -File \"$HOME/image-generation/software-report/SoftwareReport.Generator.ps1\" -OutputDirectory \"$HOME/image-generation/output/software-report\" -ImageName ${var.build_id}", + "pwsh -File \"$HOME/image-generation/software-report/Generate-SoftwareReport.ps1\" -OutputDirectory \"$HOME/image-generation/output/software-report\" -ImageName ${var.build_id}", "pwsh -File \"$HOME/image-generation/tests/RunAll-Tests.ps1\"" ] execute_command = "source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" @@ -271,7 +271,7 @@ build { provisioner "shell" { scripts = [ "./scripts/build/configure-hostname.sh", - "./scripts/build/finalize-vm.sh" + "./scripts/build/configure-system.sh" ] execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" } diff --git a/images/macos/templates/macOS-12.json b/images/macos/templates/macOS-12.json index ed9119b81306..7ca2da135a12 100644 --- a/images/macos/templates/macOS-12.json +++ b/images/macos/templates/macOS-12.json @@ -100,21 +100,21 @@ "type": "shell", "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}", "scripts": [ - "./scripts/build/xcode-clt.sh", - "./scripts/build/homebrew.sh" + "./scripts/build/install-xcode-clt.sh", + "./scripts/build/install-homebrew.sh" ] }, { "type": "shell", "execute_command": "chmod +x {{ .Path }}; sudo {{ .Vars }} {{ .Path }}", "scripts": [ - "./scripts/build/add-network-interface-detection.sh", - "./scripts/build/autologin.sh", - "./scripts/build/disable-auto-updates.sh", - "./scripts/build/screensaver-off.sh", - "./scripts/build/ntpconf.sh", - "./scripts/build/max-files.sh", - "./scripts/build/shell-change.sh" + "./scripts/build/configure-network-interface-detection.sh", + "./scripts/build/configure-autologin.sh", + "./scripts/build/configure-auto-updates.sh", + "./scripts/build/configure-screensaver.sh", + "./scripts/build/configure-ntpconf.sh", + "./scripts/build/configure-max-files-limitation.sh", + "./scripts/build/configure-shell.sh" ], "environment_vars": [ "PASSWORD={{user `vm_password`}}", @@ -125,7 +125,7 @@ "type": "shell", "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}", "scripts": [ - "./scripts/build/preimagedata.sh", + "./scripts/build/configure-preimagedata.sh", "./scripts/build/configure-ssh.sh", "./scripts/build/configure-machine.sh" ], @@ -137,8 +137,11 @@ }, { "type": "shell", - "execute_command": "chmod +x {{ .Path }}; sudo {{ .Vars }} {{ .Path }}", - "script": "./scripts/build/reboot.sh", + "execute_command": "sudo {{ .Vars }} {{ .Path }}", + "inline": [ + "echo 'Reboot VM'", + "shutdown -r now" + ], "expect_disconnect": true }, { @@ -146,18 +149,18 @@ "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}", "pause_before": "30s", "scripts": [ - "./scripts/build/open_windows_check.sh", - "./scripts/build/powershell.sh", - "./scripts/build/dotnet.sh", - "./scripts/build/python.sh", - "./scripts/build/azcopy.sh", - "./scripts/build/openssl.sh", - "./scripts/build/ruby.sh", - "./scripts/build/rubygem.sh", - "./scripts/build/git.sh", - "./scripts/build/mongodb.sh", - "./scripts/build/node.sh", - "./scripts/build/commonutils.sh" + "./scripts/build/configure-windows.sh", + "./scripts/build/install-powershell.sh", + "./scripts/build/install-dotnet.sh", + "./scripts/build/install-python.sh", + "./scripts/build/install-azcopy.sh", + "./scripts/build/install-openssl.sh", + "./scripts/build/install-ruby.sh", + "./scripts/build/install-rubygems.sh", + "./scripts/build/install-git.sh", + "./scripts/build/install-mongodb.sh", + "./scripts/build/install-node.sh", + "./scripts/build/install-common-utils.sh" ], "environment_vars": [ "API_PAT={{user `github_api_pat`}}", @@ -167,7 +170,7 @@ { "type": "shell", "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} pwsh -f {{ .Path }}", - "script": "./scripts/build/xcode.ps1", + "script": "./scripts/build/Install-Xcode.ps1", "environment_vars": [ "XCODE_INSTALL_STORAGE_URL={{user `xcode_install_storage_url`}}", "XCODE_INSTALL_SAS={{user `xcode_install_sas`}}" @@ -175,43 +178,46 @@ }, { "type": "shell", - "execute_command": "chmod +x {{ .Path }}; sudo {{ .Vars }} {{ .Path }}", - "script": "./scripts/build/reboot.sh", + "execute_command": "sudo {{ .Vars }} {{ .Path }}", + "inline": [ + "echo 'Reboot VM'", + "shutdown -r now" + ], "expect_disconnect": true }, { "type": "shell", "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}", "scripts": [ - "./scripts/build/action-archive-cache.sh", - "./scripts/build/llvm.sh", - "./scripts/build/golang.sh", - "./scripts/build/swiftlint.sh", - "./scripts/build/openjdk.sh", - "./scripts/build/php.sh", - "./scripts/build/aws.sh", - "./scripts/build/rust.sh", - "./scripts/build/gcc.sh", - "./scripts/build/haskell.sh", - "./scripts/build/cocoapods.sh", - "./scripts/build/android-toolsets.sh", - "./scripts/build/xamarin.sh", - "./scripts/build/vsmac.sh", - "./scripts/build/nvm.sh", - "./scripts/build/apache.sh", - "./scripts/build/nginx.sh", - "./scripts/build/postgresql.sh", - "./scripts/build/audiodevice.sh", - "./scripts/build/vcpkg.sh", - "./scripts/build/miniconda.sh", - "./scripts/build/safari.sh", - "./scripts/build/chrome.sh", - "./scripts/build/edge.sh", - "./scripts/build/firefox.sh", - "./scripts/build/pypy.sh", - "./scripts/build/pipx-packages.sh", - "./scripts/build/bicep.sh", - "./scripts/build/codeql-bundle.sh" + "./scripts/build/install-actions-cache.sh", + "./scripts/build/install-llvm.sh", + "./scripts/build/install-golang.sh", + "./scripts/build/install-swiftlint.sh", + "./scripts/build/install-openjdk.sh", + "./scripts/build/install-php.sh", + "./scripts/build/install-aws-tools.sh", + "./scripts/build/install-rust.sh", + "./scripts/build/install-gcc.sh", + "./scripts/build/install-haskell.sh", + "./scripts/build/install-cocoapods.sh", + "./scripts/build/install-android-sdk.sh", + "./scripts/build/install-xamarin.sh", + "./scripts/build/install-visualstudio.sh", + "./scripts/build/install-nvm.sh", + "./scripts/build/install-apache.sh", + "./scripts/build/install-nginx.sh", + "./scripts/build/install-postgresql.sh", + "./scripts/build/install-audiodevice.sh", + "./scripts/build/install-vcpkg.sh", + "./scripts/build/install-miniconda.sh", + "./scripts/build/install-safari.sh", + "./scripts/build/install-chrome.sh", + "./scripts/build/install-edge.sh", + "./scripts/build/install-firefox.sh", + "./scripts/build/install-pypy.sh", + "./scripts/build/install-pipx-packages.sh", + "./scripts/build/install-bicep.sh", + "./scripts/build/install-codeql-bundle.sh" ], "environment_vars": [ "API_PAT={{user `github_api_pat`}}" @@ -221,26 +227,26 @@ "type": "shell", "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} pwsh -f {{ .Path }}", "scripts": [ - "./scripts/build/toolset.ps1", - "./scripts/build/configure-toolset.ps1" + "./scripts/build/Install-Toolset.ps1", + "./scripts/build/Configure-Toolset.ps1" ] }, { "type": "shell", "execute_command": "ruby {{ .Path }}", "scripts": [ - "./scripts/build/delete-duplicate-sims.rb" + "./scripts/build/configure-xcode-simulators.rb" ] }, { "type": "shell", "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} pwsh -f {{ .Path }}", - "script": "./scripts/build/fix-xcode-simulators.ps1" + "script": "./scripts/build/Update-XcodeSimulators.ps1" }, { "type": "shell", "inline": [ - "pwsh -File \"$HOME/image-generation/software-report/SoftwareReport.Generator.ps1\" -OutputDirectory \"$HOME/image-generation/output/software-report\" -ImageName {{user `build_id`}}", + "pwsh -File \"$HOME/image-generation/software-report/Generate-SoftwareReport.ps1\" -OutputDirectory \"$HOME/image-generation/output/software-report\" -ImageName {{user `build_id`}}", "pwsh -File \"$HOME/image-generation/tests/RunAll-Tests.ps1\"" ] }, @@ -255,7 +261,7 @@ "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}", "scripts": [ "./scripts/build/configure-hostname.sh", - "./scripts/build/finalize-vm.sh" + "./scripts/build/configure-system.sh" ] } ] diff --git a/images/macos/templates/macOS-13.anka.pkr.hcl b/images/macos/templates/macOS-13.anka.pkr.hcl index 3f8acc39f0f4..5600b2ef3507 100644 --- a/images/macos/templates/macOS-13.anka.pkr.hcl +++ b/images/macos/templates/macOS-13.anka.pkr.hcl @@ -129,17 +129,17 @@ build { } provisioner "shell" { scripts = [ - "./scripts/build/xcode-clt.sh", - "./scripts/build/homebrew.sh" + "./scripts/build/install-xcode-clt.sh", + "./scripts/build/install-homebrew.sh" ] execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" } provisioner "shell" { scripts = [ "./scripts/build/configure-tccdb-macos.sh", - "./scripts/build/disable-auto-updates.sh", - "./scripts/build/ntpconf.sh", - "./scripts/build/shell-change.sh" + "./scripts/build/configure-auto-updates.sh", + "./scripts/build/configure-ntpconf.sh", + "./scripts/build/configure-shell.sh" ] environment_vars = [ "PASSWORD=${var.vm_password}", @@ -149,7 +149,7 @@ build { } provisioner "shell" { scripts = [ - "./scripts/build/preimagedata.sh", + "./scripts/build/configure-preimagedata.sh", "./scripts/build/configure-ssh.sh", "./scripts/build/configure-machine.sh" ] @@ -161,25 +161,25 @@ build { execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" } provisioner "shell" { - script = "./scripts/build/reboot.sh" - execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}" + execute_command = "source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}" expect_disconnect = true + inline = ["echo 'Reboot VM'", "shutdown -r now"] } provisioner "shell" { pause_before = "30s" scripts = [ - "./scripts/build/open_windows_check.sh", - "./scripts/build/powershell.sh", - "./scripts/build/mono.sh", - "./scripts/build/dotnet.sh", - "./scripts/build/python.sh", - "./scripts/build/azcopy.sh", - "./scripts/build/openssl.sh", - "./scripts/build/ruby.sh", - "./scripts/build/rubygem.sh", - "./scripts/build/git.sh", - "./scripts/build/node.sh", - "./scripts/build/commonutils.sh" + "./scripts/build/configure-windows.sh", + "./scripts/build/install-powershell.sh", + "./scripts/build/install-mono.sh", + "./scripts/build/install-dotnet.sh", + "./scripts/build/install-python.sh", + "./scripts/build/install-azcopy.sh", + "./scripts/build/install-openssl.sh", + "./scripts/build/install-ruby.sh", + "./scripts/build/install-rubygems.sh", + "./scripts/build/install-git.sh", + "./scripts/build/install-node.sh", + "./scripts/build/install-common-utils.sh" ] environment_vars = [ "API_PAT=${var.github_api_pat}", @@ -188,7 +188,7 @@ build { execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" } provisioner "shell" { - script = "./scripts/build/xcode.ps1" + script = "./scripts/build/Install-Xcode.ps1" environment_vars = [ "XCODE_INSTALL_STORAGE_URL=${var.xcode_install_storage_url}", "XCODE_INSTALL_SAS=${var.xcode_install_sas}" @@ -196,31 +196,31 @@ build { execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} pwsh -f {{ .Path }}" } provisioner "shell" { - script = "./scripts/build/reboot.sh" - execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}" + execute_command = "source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}" expect_disconnect = true + inline = ["echo 'Reboot VM'", "shutdown -r now"] } provisioner "shell" { scripts = [ - "./scripts/build/action-archive-cache.sh", - "./scripts/build/llvm.sh", - "./scripts/build/swiftlint.sh", - "./scripts/build/openjdk.sh", - "./scripts/build/php.sh", - "./scripts/build/aws.sh", - "./scripts/build/rust.sh", - "./scripts/build/gcc.sh", - "./scripts/build/cocoapods.sh", - "./scripts/build/android-toolsets.sh", - "./scripts/build/apache.sh", - "./scripts/build/vcpkg.sh", - "./scripts/build/safari.sh", - "./scripts/build/chrome.sh", - "./scripts/build/edge.sh", - "./scripts/build/firefox.sh", - "./scripts/build/pypy.sh", - "./scripts/build/bicep.sh", - "./scripts/build/codeql-bundle.sh" + "./scripts/build/install-actions-cache.sh", + "./scripts/build/install-llvm.sh", + "./scripts/build/install-swiftlint.sh", + "./scripts/build/install-openjdk.sh", + "./scripts/build/install-php.sh", + "./scripts/build/install-aws-tools.sh", + "./scripts/build/install-rust.sh", + "./scripts/build/install-gcc.sh", + "./scripts/build/install-cocoapods.sh", + "./scripts/build/install-android-sdk.sh", + "./scripts/build/install-apache.sh", + "./scripts/build/install-vcpkg.sh", + "./scripts/build/install-safari.sh", + "./scripts/build/install-chrome.sh", + "./scripts/build/install-edge.sh", + "./scripts/build/install-firefox.sh", + "./scripts/build/install-pypy.sh", + "./scripts/build/install-bicep.sh", + "./scripts/build/install-codeql-bundle.sh" ] environment_vars = [ "API_PAT=${var.github_api_pat}" @@ -229,18 +229,18 @@ build { } provisioner "shell" { scripts = [ - "./scripts/build/toolset.ps1", - "./scripts/build/configure-toolset.ps1" + "./scripts/build/Install-Toolset.ps1", + "./scripts/build/Configure-Toolset.ps1" ] execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} pwsh -f {{ .Path }}" } provisioner "shell" { - script = "./scripts/build/delete-duplicate-sims.rb" + script = "./scripts/build/configure-xcode-simulators.rb" execute_command = "source $HOME/.bash_profile; ruby {{ .Path }}" } provisioner "shell" { inline = [ - "pwsh -File \"$HOME/image-generation/software-report/SoftwareReport.Generator.ps1\" -OutputDirectory \"$HOME/image-generation/output/software-report\" -ImageName ${var.build_id}", + "pwsh -File \"$HOME/image-generation/software-report/Generate-SoftwareReport.ps1\" -OutputDirectory \"$HOME/image-generation/output/software-report\" -ImageName ${var.build_id}", "pwsh -File \"$HOME/image-generation/tests/RunAll-Tests.ps1\"" ] execute_command = "source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" @@ -250,11 +250,15 @@ build { direction = "download" source = "./image-generation/output/" } + provisioner "shell" { + inline = [ + "rm -rf \"$(brew --cache)\"" + ] + } provisioner "shell" { scripts = [ "./scripts/build/configure-hostname.sh", - "./scripts/build/cleanup-brew.sh", - "./scripts/build/finalize-vm.sh" + "./scripts/build/configure-system.sh" ] execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" } diff --git a/images/macos/templates/macOS-13.arm64.anka.pkr.hcl b/images/macos/templates/macOS-13.arm64.anka.pkr.hcl index 17ae11ec745f..1ab3ffc0cd7b 100644 --- a/images/macos/templates/macOS-13.arm64.anka.pkr.hcl +++ b/images/macos/templates/macOS-13.arm64.anka.pkr.hcl @@ -130,18 +130,18 @@ build { } provisioner "shell" { scripts = [ - "./scripts/build/xcode-clt.sh", - "./scripts/build/homebrew.sh", - "./scripts/build/rosetta.sh" + "./scripts/build/install-xcode-clt.sh", + "./scripts/build/install-homebrew.sh", + "./scripts/build/install-rosetta.sh" ] execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" } provisioner "shell" { scripts = [ "./scripts/build/configure-tccdb-macos.sh", - "./scripts/build/disable-auto-updates.sh", - "./scripts/build/ntpconf.sh", - "./scripts/build/shell-change.sh" + "./scripts/build/configure-auto-updates.sh", + "./scripts/build/configure-ntpconf.sh", + "./scripts/build/configure-shell.sh" ] environment_vars = [ "PASSWORD=${var.vm_password}", @@ -151,7 +151,7 @@ build { } provisioner "shell" { scripts = [ - "./scripts/build/preimagedata.sh", + "./scripts/build/configure-preimagedata.sh", "./scripts/build/configure-ssh.sh", "./scripts/build/configure-machine.sh" ] @@ -163,24 +163,24 @@ build { execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" } provisioner "shell" { - script = "./scripts/build/reboot.sh" - execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}" + execute_command = "source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}" expect_disconnect = true + inline = ["echo 'Reboot VM'", "shutdown -r now"] } provisioner "shell" { pause_before = "30s" scripts = [ - "./scripts/build/open_windows_check.sh", - "./scripts/build/powershell.sh", - "./scripts/build/mono.sh", - "./scripts/build/dotnet.sh", - "./scripts/build/azcopy.sh", - "./scripts/build/openssl.sh", - "./scripts/build/ruby.sh", - "./scripts/build/rubygem.sh", - "./scripts/build/git.sh", - "./scripts/build/node.sh", - "./scripts/build/commonutils.sh" + "./scripts/build/configure-windows.sh", + "./scripts/build/install-powershell.sh", + "./scripts/build/install-mono.sh", + "./scripts/build/install-dotnet.sh", + "./scripts/build/install-azcopy.sh", + "./scripts/build/install-openssl.sh", + "./scripts/build/install-ruby.sh", + "./scripts/build/install-rubygems.sh", + "./scripts/build/install-git.sh", + "./scripts/build/install-node.sh", + "./scripts/build/install-common-utils.sh" ] environment_vars = [ "API_PAT=${var.github_api_pat}", @@ -189,7 +189,7 @@ build { execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" } provisioner "shell" { - script = "./scripts/build/xcode.ps1" + script = "./scripts/build/Install-Xcode.ps1" environment_vars = [ "XCODE_INSTALL_STORAGE_URL=${var.xcode_install_storage_url}", "XCODE_INSTALL_SAS=${var.xcode_install_sas}" @@ -197,24 +197,24 @@ build { execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} pwsh -f {{ .Path }}" } provisioner "shell" { - script = "./scripts/build/reboot.sh" - execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}" + execute_command = "source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}" expect_disconnect = true + inline = ["echo 'Reboot VM'", "shutdown -r now"] } provisioner "shell" { scripts = [ - "./scripts/build/action-archive-cache.sh", - "./scripts/build/llvm.sh", - "./scripts/build/openjdk.sh", - "./scripts/build/aws.sh", - "./scripts/build/rust.sh", - "./scripts/build/gcc.sh", - "./scripts/build/cocoapods.sh", - "./scripts/build/android-toolsets.sh", - "./scripts/build/safari.sh", - "./scripts/build/chrome.sh", - "./scripts/build/bicep.sh", - "./scripts/build/codeql-bundle.sh" + "./scripts/build/install-actions-cache.sh", + "./scripts/build/install-llvm.sh", + "./scripts/build/install-openjdk.sh", + "./scripts/build/install-aws-tools.sh", + "./scripts/build/install-rust.sh", + "./scripts/build/install-gcc.sh", + "./scripts/build/install-cocoapods.sh", + "./scripts/build/install-android-sdk.sh", + "./scripts/build/install-safari.sh", + "./scripts/build/install-chrome.sh", + "./scripts/build/install-bicep.sh", + "./scripts/build/install-codeql-bundle.sh" ] environment_vars = [ "API_PAT=${var.github_api_pat}" @@ -223,18 +223,18 @@ build { } provisioner "shell" { scripts = [ - "./scripts/build/toolset.ps1", - "./scripts/build/configure-toolset.ps1" + "./scripts/build/Install-Toolset.ps1", + "./scripts/build/Configure-Toolset.ps1" ] execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} pwsh -f {{ .Path }}" } provisioner "shell" { - script = "./scripts/build/delete-duplicate-sims.rb" + script = "./scripts/build/configure-xcode-simulators.rb" execute_command = "source $HOME/.bash_profile; ruby {{ .Path }}" } provisioner "shell" { inline = [ - "pwsh -File \"$HOME/image-generation/software-report/SoftwareReport.Generator.ps1\" -OutputDirectory \"$HOME/image-generation/output/software-report\" -ImageName ${var.build_id}", + "pwsh -File \"$HOME/image-generation/software-report/Generate-SoftwareReport.ps1\" -OutputDirectory \"$HOME/image-generation/output/software-report\" -ImageName ${var.build_id}", "pwsh -File \"$HOME/image-generation/tests/RunAll-Tests.ps1\"" ] execute_command = "source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" diff --git a/images/macos/templates/macOS-14.anka.pkr.hcl b/images/macos/templates/macOS-14.anka.pkr.hcl index 907d881506df..edcfbdc3a8e1 100644 --- a/images/macos/templates/macOS-14.anka.pkr.hcl +++ b/images/macos/templates/macOS-14.anka.pkr.hcl @@ -129,17 +129,17 @@ build { } provisioner "shell" { scripts = [ - "./scripts/build/xcode-clt.sh", - "./scripts/build/homebrew.sh" + "./scripts/build/install-xcode-clt.sh", + "./scripts/build/install-homebrew.sh" ] execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" } provisioner "shell" { scripts = [ "./scripts/build/configure-tccdb-macos.sh", - "./scripts/build/disable-auto-updates.sh", - "./scripts/build/ntpconf.sh", - "./scripts/build/shell-change.sh" + "./scripts/build/configure-auto-updates.sh", + "./scripts/build/configure-ntpconf.sh", + "./scripts/build/configure-shell.sh" ] environment_vars = [ "PASSWORD=${var.vm_password}", @@ -149,7 +149,7 @@ build { } provisioner "shell" { scripts = [ - "./scripts/build/preimagedata.sh", + "./scripts/build/configure-preimagedata.sh", "./scripts/build/configure-ssh.sh", "./scripts/build/configure-machine.sh" ] @@ -161,25 +161,25 @@ build { execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" } provisioner "shell" { - script = "./scripts/build/reboot.sh" - execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}" + execute_command = "source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}" expect_disconnect = true + inline = ["echo 'Reboot VM'", "shutdown -r now"] } provisioner "shell" { pause_before = "30s" scripts = [ - "./scripts/build/open_windows_check.sh", - "./scripts/build/powershell.sh", - "./scripts/build/mono.sh", - "./scripts/build/dotnet.sh", - "./scripts/build/python.sh", - "./scripts/build/azcopy.sh", - "./scripts/build/openssl.sh", - "./scripts/build/ruby.sh", - "./scripts/build/rubygem.sh", - "./scripts/build/git.sh", - "./scripts/build/node.sh", - "./scripts/build/commonutils.sh" + "./scripts/build/configure-windows.sh", + "./scripts/build/install-powershell.sh", + "./scripts/build/install-mono.sh", + "./scripts/build/install-dotnet.sh", + "./scripts/build/install-python.sh", + "./scripts/build/install-azcopy.sh", + "./scripts/build/install-openssl.sh", + "./scripts/build/install-ruby.sh", + "./scripts/build/install-rubygems.sh", + "./scripts/build/install-git.sh", + "./scripts/build/install-node.sh", + "./scripts/build/install-common-utils.sh" ] environment_vars = [ "API_PAT=${var.github_api_pat}", @@ -188,7 +188,7 @@ build { execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" } provisioner "shell" { - script = "./scripts/build/xcode.ps1" + script = "./scripts/build/Install-Xcode.ps1" environment_vars = [ "XCODE_INSTALL_STORAGE_URL=${var.xcode_install_storage_url}", "XCODE_INSTALL_SAS=${var.xcode_install_sas}" @@ -196,31 +196,31 @@ build { execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} pwsh -f {{ .Path }}" } provisioner "shell" { - script = "./scripts/build/reboot.sh" - execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}" + execute_command = "source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}" expect_disconnect = true + inline = ["echo 'Reboot VM'", "shutdown -r now"] } provisioner "shell" { scripts = [ - "./scripts/build/action-archive-cache.sh", - "./scripts/build/llvm.sh", - "./scripts/build/swiftlint.sh", - "./scripts/build/openjdk.sh", - "./scripts/build/php.sh", - "./scripts/build/aws.sh", - "./scripts/build/rust.sh", - "./scripts/build/gcc.sh", - "./scripts/build/cocoapods.sh", - "./scripts/build/android-toolsets.sh", - "./scripts/build/apache.sh", - "./scripts/build/vcpkg.sh", - "./scripts/build/safari.sh", - "./scripts/build/chrome.sh", - "./scripts/build/edge.sh", - "./scripts/build/firefox.sh", - "./scripts/build/pypy.sh", - "./scripts/build/bicep.sh", - "./scripts/build/codeql-bundle.sh" + "./scripts/build/install-actions-cache.sh", + "./scripts/build/install-llvm.sh", + "./scripts/build/install-swiftlint.sh", + "./scripts/build/install-openjdk.sh", + "./scripts/build/install-php.sh", + "./scripts/build/install-aws-tools.sh", + "./scripts/build/install-rust.sh", + "./scripts/build/install-gcc.sh", + "./scripts/build/install-cocoapods.sh", + "./scripts/build/install-android-sdk.sh", + "./scripts/build/install-apache.sh", + "./scripts/build/install-vcpkg.sh", + "./scripts/build/install-safari.sh", + "./scripts/build/install-chrome.sh", + "./scripts/build/install-edge.sh", + "./scripts/build/install-firefox.sh", + "./scripts/build/install-pypy.sh", + "./scripts/build/install-bicep.sh", + "./scripts/build/install-codeql-bundle.sh" ] environment_vars = [ "API_PAT=${var.github_api_pat}" @@ -228,12 +228,12 @@ build { execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" } provisioner "shell" { - script = "./scripts/build/delete-duplicate-sims.rb" + script = "./scripts/build/configure-xcode-simulators.rb" execute_command = "source $HOME/.bash_profile; ruby {{ .Path }}" } provisioner "shell" { inline = [ - "pwsh -File \"$HOME/image-generation/software-report/SoftwareReport.Generator.ps1\" -OutputDirectory \"$HOME/image-generation/output/software-report\" -ImageName ${var.build_id}" + "pwsh -File \"$HOME/image-generation/software-report/Generate-SoftwareReport.ps1\" -OutputDirectory \"$HOME/image-generation/output/software-report\" -ImageName ${var.build_id}" ] execute_command = "source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" } @@ -242,11 +242,15 @@ build { direction = "download" source = "./image-generation/output/" } + provisioner "shell" { + inline = [ + "rm -rf \"$(brew --cache)\"" + ] + } provisioner "shell" { scripts = [ "./scripts/build/configure-hostname.sh", - "./scripts/build/cleanup-brew.sh", - "./scripts/build/finalize-vm.sh" + "./scripts/build/configure-system.sh" ] execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" } diff --git a/images/macos/templates/macOS-14.arm64.anka.pkr.hcl b/images/macos/templates/macOS-14.arm64.anka.pkr.hcl index 0ca8115205a8..0259f04e738d 100644 --- a/images/macos/templates/macOS-14.arm64.anka.pkr.hcl +++ b/images/macos/templates/macOS-14.arm64.anka.pkr.hcl @@ -130,18 +130,18 @@ build { } provisioner "shell" { scripts = [ - "./scripts/build/xcode-clt.sh", - "./scripts/build/homebrew.sh", - "./scripts/build/rosetta.sh" + "./scripts/build/install-xcode-clt.sh", + "./scripts/build/install-homebrew.sh", + "./scripts/build/install-rosetta.sh" ] execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" } provisioner "shell" { scripts = [ "./scripts/build/configure-tccdb-macos.sh", - "./scripts/build/disable-auto-updates.sh", - "./scripts/build/ntpconf.sh", - "./scripts/build/shell-change.sh" + "./scripts/build/configure-auto-updates.sh", + "./scripts/build/configure-ntpconf.sh", + "./scripts/build/configure-shell.sh" ] environment_vars = [ "PASSWORD=${var.vm_password}", @@ -151,7 +151,7 @@ build { } provisioner "shell" { scripts = [ - "./scripts/build/preimagedata.sh", + "./scripts/build/configure-preimagedata.sh", "./scripts/build/configure-ssh.sh", "./scripts/build/configure-machine.sh" ] @@ -163,24 +163,24 @@ build { execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" } provisioner "shell" { - script = "./scripts/build/reboot.sh" - execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}" + execute_command = "source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}" expect_disconnect = true + inline = ["echo 'Reboot VM'", "shutdown -r now"] } provisioner "shell" { pause_before = "30s" scripts = [ - "./scripts/build/open_windows_check.sh", - "./scripts/build/powershell.sh", - "./scripts/build/mono.sh", - "./scripts/build/dotnet.sh", - "./scripts/build/azcopy.sh", - "./scripts/build/openssl.sh", - "./scripts/build/ruby.sh", - "./scripts/build/rubygem.sh", - "./scripts/build/git.sh", - "./scripts/build/node.sh", - "./scripts/build/commonutils.sh" + "./scripts/build/configure-windows.sh", + "./scripts/build/install-powershell.sh", + "./scripts/build/install-mono.sh", + "./scripts/build/install-dotnet.sh", + "./scripts/build/install-azcopy.sh", + "./scripts/build/install-openssl.sh", + "./scripts/build/install-ruby.sh", + "./scripts/build/install-rubygems.sh", + "./scripts/build/install-git.sh", + "./scripts/build/install-node.sh", + "./scripts/build/install-common-utils.sh" ] environment_vars = [ "API_PAT=${var.github_api_pat}", @@ -189,7 +189,7 @@ build { execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" } provisioner "shell" { - script = "./scripts/build/xcode.ps1" + script = "./scripts/build/Install-Xcode.ps1" environment_vars = [ "XCODE_INSTALL_STORAGE_URL=${var.xcode_install_storage_url}", "XCODE_INSTALL_SAS=${var.xcode_install_sas}" @@ -197,24 +197,24 @@ build { execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} pwsh -f {{ .Path }}" } provisioner "shell" { - script = "./scripts/build/reboot.sh" - execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}" + execute_command = "source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}" expect_disconnect = true + inline = ["echo 'Reboot VM'", "shutdown -r now"] } provisioner "shell" { scripts = [ - "./scripts/build/action-archive-cache.sh", - "./scripts/build/llvm.sh", - "./scripts/build/openjdk.sh", - "./scripts/build/aws.sh", - "./scripts/build/rust.sh", - "./scripts/build/gcc.sh", - "./scripts/build/cocoapods.sh", - "./scripts/build/android-toolsets.sh", - "./scripts/build/safari.sh", - "./scripts/build/chrome.sh", - "./scripts/build/bicep.sh", - "./scripts/build/codeql-bundle.sh" + "./scripts/build/install-actions-cache.sh", + "./scripts/build/install-llvm.sh", + "./scripts/build/install-openjdk.sh", + "./scripts/build/install-aws-tools.sh", + "./scripts/build/install-rust.sh", + "./scripts/build/install-gcc.sh", + "./scripts/build/install-cocoapods.sh", + "./scripts/build/install-android-sdk.sh", + "./scripts/build/install-safari.sh", + "./scripts/build/install-chrome.sh", + "./scripts/build/install-bicep.sh", + "./scripts/build/install-codeql-bundle.sh" ] environment_vars = [ "API_PAT=${var.github_api_pat}" @@ -222,12 +222,12 @@ build { execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" } provisioner "shell" { - script = "./scripts/build/delete-duplicate-sims.rb" + script = "./scripts/build/configure-xcode-simulators.rb" execute_command = "source $HOME/.bash_profile; ruby {{ .Path }}" } provisioner "shell" { inline = [ - "pwsh -File \"$HOME/image-generation/software-report/SoftwareReport.Generator.ps1\" -OutputDirectory \"$HOME/image-generation/output/software-report\" -ImageName ${var.build_id}" + "pwsh -File \"$HOME/image-generation/software-report/Generate-SoftwareReport.ps1\" -OutputDirectory \"$HOME/image-generation/output/software-report\" -ImageName ${var.build_id}" ] execute_command = "source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" } From 408bab693967102ffb2bf78a2bd3ce21c32115d3 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Tue, 28 Nov 2023 02:25:42 +0100 Subject: [PATCH 2481/3485] [macOS] Update PHP version to 8.3 (#8895) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Alexey Ayupov <“alexey.ayupov@akvelon.com”> --- images/macos/toolsets/toolset-11.json | 2 +- images/macos/toolsets/toolset-12.json | 2 +- images/macos/toolsets/toolset-13.json | 2 +- images/macos/toolsets/toolset-14.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index 094f225aa6c1..c292e6fe9f9b 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -354,7 +354,7 @@ "version": "15" }, "php": { - "version": "8.2" + "version": "8.3" }, "mongodb": { "version": "5.0" diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index 797bbb720548..01fa8c30c8b5 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -342,7 +342,7 @@ "version": "15" }, "php": { - "version": "8.2" + "version": "8.3" }, "mongodb": { "version": "5.0" diff --git a/images/macos/toolsets/toolset-13.json b/images/macos/toolsets/toolset-13.json index bf3c2c591ad0..3258b3dadc1c 100644 --- a/images/macos/toolsets/toolset-13.json +++ b/images/macos/toolsets/toolset-13.json @@ -218,7 +218,7 @@ "version": "15" }, "php": { - "version": "8.2" + "version": "8.3" }, "mono": { "framework":{ diff --git a/images/macos/toolsets/toolset-14.json b/images/macos/toolsets/toolset-14.json index 81b5b0dcb0ef..d9ea4f71f0dd 100644 --- a/images/macos/toolsets/toolset-14.json +++ b/images/macos/toolsets/toolset-14.json @@ -120,7 +120,7 @@ "version": "15" }, "php": { - "version": "8.2" + "version": "8.3" }, "mono": { "framework":{ From c0ce57ffc8377b1d25084ab3e04416140809db55 Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Tue, 28 Nov 2023 02:26:12 +0100 Subject: [PATCH 2482/3485] Update report generator name in CONTRIBUTING.md (#8893) --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index b730b9955445..cc728e1ea67c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -45,7 +45,7 @@ There are a bunch of helper functions that could simplify your code: `Choco-Inst - Add a script that will validate the tool installation and put the script in the `scripts/tests` folder. We use [Pester v5](https://github.com/pester/pester) for validation scripts. If the tests for the tool are complex enough, create a separate `*.Tests.ps1`. Otherwise, use `Tools.Tests.ps1` for simple tests. Add `Invoke-PesterTests -TestFile <testFileName> [-TestName <describeName>]` at the end of the installation script to make sure that your tests will be run. -- Add changes to the software report generator `images/windows/scripts/docs-gen/SoftwareReport.Generator.ps1`. The software report generator is used to generate an image's README file, e.g. [Windows2019-Readme.md](images/windows/Windows2019-Readme.md) and uses [MarkdownPS](https://github.com/Sarafian/MarkdownPS). +- Add changes to the software report generator `images/windows/scripts/docs-gen/Generate-SoftwareReport.ps1`. The software report generator is used to generate an image's README file, e.g. [Windows2019-Readme.md](images/windows/Windows2019-Readme.md) and uses [MarkdownPS](https://github.com/Sarafian/MarkdownPS). ### Ubuntu From e8f9c10965e1e2e3e387337c069968de7ffc2ba0 Mon Sep 17 00:00:00 2001 From: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com> Date: Tue, 28 Nov 2023 09:38:00 +0100 Subject: [PATCH 2483/3485] [windows] update NSIS to 3.09 (#8901) --- images/windows/toolsets/toolset-2019.json | 2 +- images/windows/toolsets/toolset-2022.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/images/windows/toolsets/toolset-2019.json b/images/windows/toolsets/toolset-2019.json index 0b9381a5cda2..143fcab69f9f 100644 --- a/images/windows/toolsets/toolset-2019.json +++ b/images/windows/toolsets/toolset-2019.json @@ -475,7 +475,7 @@ "signature": "F2D7C28591847BB2CB2B1C2A0C59459FDC728A38" }, "nsis": { - "version": "3.08" + "version": "3.09" }, "php": { "version": "8.2" diff --git a/images/windows/toolsets/toolset-2022.json b/images/windows/toolsets/toolset-2022.json index 9dac7d5526bf..694e72d33e53 100644 --- a/images/windows/toolsets/toolset-2022.json +++ b/images/windows/toolsets/toolset-2022.json @@ -415,7 +415,7 @@ "signature": "F2D7C28591847BB2CB2B1C2A0C59459FDC728A38" }, "nsis": { - "version": "3.08" + "version": "3.09" }, "llvm": { "version": "16" From da1c04b81a872a4d38b4867375f2b19c522b929c Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Tue, 28 Nov 2023 15:08:03 +0100 Subject: [PATCH 2484/3485] [Windows] Reimplement function resolving GH asset (#8899) * [Windows] Reimplement function resolving GH asset * Fix tests and software report * Fix selenium-server version check --- .../scripts/build/Install-ActionsCache.ps1 | 6 +- .../scripts/build/Install-IEWebDriver.ps1 | 11 +- .../windows/scripts/build/Install-Kotlin.ps1 | 8 +- .../windows/scripts/build/Install-Mingw64.ps1 | 10 +- .../scripts/build/Install-Selenium.ps1 | 15 ++- .../docs-gen/SoftwareReport.Browsers.psm1 | 4 +- .../windows/scripts/helpers/ImageHelpers.psm1 | 2 +- .../scripts/helpers/InstallHelpers.ps1 | 101 ++++++++++++------ .../windows/scripts/tests/Browsers.Tests.ps1 | 5 +- images/windows/toolsets/toolset-2019.json | 6 +- images/windows/toolsets/toolset-2022.json | 6 +- 11 files changed, 100 insertions(+), 74 deletions(-) diff --git a/images/windows/scripts/build/Install-ActionsCache.ps1 b/images/windows/scripts/build/Install-ActionsCache.ps1 index 3680f58e98f6..95d5665ffb56 100644 --- a/images/windows/scripts/build/Install-ActionsCache.ps1 +++ b/images/windows/scripts/build/Install-ActionsCache.ps1 @@ -9,7 +9,11 @@ if (-not (Test-Path $env:ACTIONS_RUNNER_ACTION_ARCHIVE_CACHE)) { New-Item -ItemType Directory -Path $env:ACTIONS_RUNNER_ACTION_ARCHIVE_CACHE | Out-Null } -$downloadUrl = Get-GitHubPackageDownloadUrl -RepoOwner "actions" -RepoName "action-versions" -Version "latest" -UrlFilter "*/v{Version}/action-versions.zip" +$downloadUrl = Resolve-GithubReleaseAssetUrl ` + -Repo "actions/action-versions" ` + -Version "latest" ` + -Asset "action-versions.zip" + Write-Host "Download Latest action-versions archive from $downloadUrl" $actionVersionsArchivePath = Start-DownloadWithRetry -Url $downloadUrl -Name "action-versions.zip" diff --git a/images/windows/scripts/build/Install-IEWebDriver.ps1 b/images/windows/scripts/build/Install-IEWebDriver.ps1 index e40f1e8ee706..79c0c6cdde39 100644 --- a/images/windows/scripts/build/Install-IEWebDriver.ps1 +++ b/images/windows/scripts/build/Install-IEWebDriver.ps1 @@ -4,13 +4,10 @@ ################################################################################ $seleniumMajorVersion = (Get-ToolsetContent).selenium.version -$ieDriverUrl = Get-GitHubPackageDownloadUrl ` - -RepoOwner "SeleniumHQ" ` - -RepoName "selenium" ` - -BinaryName "IEDriverServer_x64" ` - -Version $seleniumMajorVersion ` - -UrlFilter "*{BinaryName}_{Version}.zip" ` - -LatestReleaseOnly $false +$ieDriverUrl = Resolve-GithubReleaseAssetUrl ` + -Repo "SeleniumHQ/selenium" ` + -Version "$seleniumMajorVersion.*" ` + -Asset "IEDriverServer_x64_*.zip" # Download IE selenium driver try { diff --git a/images/windows/scripts/build/Install-Kotlin.ps1 b/images/windows/scripts/build/Install-Kotlin.ps1 index 548ce941a260..daeba32469d1 100644 --- a/images/windows/scripts/build/Install-Kotlin.ps1 +++ b/images/windows/scripts/build/Install-Kotlin.ps1 @@ -6,10 +6,12 @@ # Install Kotlin $kotlinVersion = (Get-ToolsetContent).kotlin.version -$kotlinBinaryName = (Get-ToolsetContent).kotlin.binary_name -$kotlinDownloadUrl = Get-GitHubPackageDownloadUrl -RepoOwner "JetBrains" -RepoName "kotlin" -BinaryName $kotlinBinaryName -Version $kotlinVersion -UrlFilter "*{BinaryName}-{Version}.zip" -$kotlinInstallerPath = Start-DownloadWithRetry -Url $kotlinDownloadUrl -Name "$kotlinBinaryName.zip" +$kotlinDownloadUrl = Resolve-GithubReleaseAssetUrl ` + -Repo "JetBrains/kotlin" ` + -Version $kotlinVersion ` + -Asset "kotlin-compiler-*.zip" +$kotlinInstallerPath = Start-DownloadWithRetry -Url $kotlinDownloadUrl -Name "kotlin-compiler.zip" #region Supply chain security $fileHash = (Get-FileHash -Path $kotlinInstallerPath -Algorithm SHA256).Hash diff --git a/images/windows/scripts/build/Install-Mingw64.ps1 b/images/windows/scripts/build/Install-Mingw64.ps1 index 4c55d1a74e15..27ec4f91b178 100644 --- a/images/windows/scripts/build/Install-Mingw64.ps1 +++ b/images/windows/scripts/build/Install-Mingw64.ps1 @@ -50,12 +50,10 @@ if (Test-IsWin19) { throw "Unknown architecture $_" } - $url = Get-GitHubPackageDownloadUrl ` - -RepoOwner "niXman" ` - -RepoName "mingw-builds-binaries" ` - -BinaryName "" ` - -Version $version ` - -UrlFilter "*$arch-{Version}-release-$threads-$exceptions-$runtime-*.7z" + $url = Resolve-GithubReleaseAssetUrl ` + -Repo "niXman/mingw-builds-binaries" ` + -Version "$version" ` + -Asset "$arch-*-release-$threads-$exceptions-$runtime-*.7z" $packagePath = Start-DownloadWithRetry -Url $url -Name "$_.7z" Expand-7ZipArchive -Path $packagePath -DestinationPath "C:\" diff --git a/images/windows/scripts/build/Install-Selenium.ps1 b/images/windows/scripts/build/Install-Selenium.ps1 index 2c321c8a207c..dad6a4ac251c 100644 --- a/images/windows/scripts/build/Install-Selenium.ps1 +++ b/images/windows/scripts/build/Install-Selenium.ps1 @@ -9,21 +9,18 @@ New-Item -ItemType directory -Path $seleniumDirectory # Download Selenium $seleniumMajorVersion = (Get-ToolsetContent).selenium.version -$seleniumBinaryName = (Get-ToolsetContent).selenium.binary_name -$seleniumFileName = "$seleniumBinaryName.jar" +$seleniumFileName = "selenium-server.jar" -$seleniumDownloadUrl = Get-GitHubPackageDownloadUrl ` - -RepoOwner "SeleniumHQ" ` - -RepoName "selenium" ` - -BinaryName "$seleniumBinaryName" ` - -Version $seleniumMajorVersion ` - -UrlFilter "*{BinaryName}-{Version}.jar" +$seleniumDownloadUrl = Resolve-GithubReleaseAssetUrl ` + -Repo "SeleniumHQ/selenium" ` + -Version "$seleniumMajorVersion.*" ` + -Asset "selenium-server-*.jar" Start-DownloadWithRetry -Url $seleniumDownloadUrl -Name $seleniumFileName -DownloadPath $seleniumDirectory # Create an empty file to retrive Selenium version $seleniumFullVersion = $seleniumDownloadUrl.Split("-")[1].Split("/")[0] -New-Item -Path $seleniumDirectory -Name "$seleniumBinaryName-$seleniumFullVersion" +New-Item -Path $seleniumDirectory -Name "selenium-server-$seleniumFullVersion" # Add SELENIUM_JAR_PATH environment variable $seleniumBinPath = Join-Path $seleniumDirectory $seleniumFileName diff --git a/images/windows/scripts/docs-gen/SoftwareReport.Browsers.psm1 b/images/windows/scripts/docs-gen/SoftwareReport.Browsers.psm1 index 19dd7cee3e88..43b0ec847219 100644 --- a/images/windows/scripts/docs-gen/SoftwareReport.Browsers.psm1 +++ b/images/windows/scripts/docs-gen/SoftwareReport.Browsers.psm1 @@ -63,12 +63,12 @@ function Get-SeleniumWebDriverVersion { $driverName = $webDrivers.$Driver.Name $driverPath = $webDrivers.$Driver.Path $versionFileName = "versioninfo.txt"; - $webDriverVersion = Get-Content -Path "$driverPath\$versionFileName" + $webDriverVersion = Get-Content -Path "$driverPath\$versionFileName" return [ToolVersionNode]::new($driverName, $webDriverVersion) } function Get-SeleniumVersion { - $seleniumBinaryName = (Get-ToolsetContent).selenium.binary_name + $seleniumBinaryName = "selenium-server" $fullSeleniumVersion = (Get-ChildItem "C:\selenium\${seleniumBinaryName}-*").Name -replace "${seleniumBinaryName}-" return [ToolVersionNode]::new("Selenium server", $fullSeleniumVersion) } diff --git a/images/windows/scripts/helpers/ImageHelpers.psm1 b/images/windows/scripts/helpers/ImageHelpers.psm1 index dfbcd8eb2fae..38c2ac59654f 100644 --- a/images/windows/scripts/helpers/ImageHelpers.psm1 +++ b/images/windows/scripts/helpers/ImageHelpers.psm1 @@ -36,7 +36,7 @@ Export-ModuleMember -Function @( 'Install-ChocoPackage' 'Send-RequestToCocolateyPackages' 'Resolve-ChocoPackageVersion' - 'Get-GitHubPackageDownloadUrl' + 'Resolve-GithubReleaseAssetUrl' 'Expand-7ZipArchive' 'Invoke-SBWithRetry' 'Get-VsCatalogJsonPath' diff --git a/images/windows/scripts/helpers/InstallHelpers.ps1 b/images/windows/scripts/helpers/InstallHelpers.ps1 index b1daaee012a9..df88bdd07bf1 100644 --- a/images/windows/scripts/helpers/InstallHelpers.ps1 +++ b/images/windows/scripts/helpers/InstallHelpers.ps1 @@ -685,55 +685,88 @@ function Invoke-SBWithRetry { } } -function Get-GitHubPackageDownloadUrl { +function Resolve-GithubReleaseAssetUrl { param ( - [string]$RepoOwner, - [string]$RepoName, - [string]$BinaryName, - [string]$Version, - [string]$UrlFilter, - [boolean]$IsPrerelease = $false, - [boolean]$LatestReleaseOnly = $true, - [int]$SearchInCount = 100 + [Parameter(Mandatory = $true)] + [Alias("Repo")] + [string] $Repository, + [Parameter(Mandatory = $true)] + [Alias("Pattern", "File", "Asset")] + [string] $UrlMatchPattern, + [switch] $AllowPrerelease, + [string] $Version = "*" ) - if ($Version -eq "latest") { - $Version = "*" + # Add wildcard to the beginning of the pattern if it's not there + if ($UrlMatchPattern.Substring(0, 2) -ne "*/") { + $UrlMatchPattern = "*/$UrlMatchPattern" } - $json = Invoke-RestMethod -Uri "https://api.github.com/repos/${RepoOwner}/${RepoName}/releases?per_page=${SearchInCount}" - $tags = $json.Where{ $_.prerelease -eq $IsPrerelease -and $_.assets }.tag_name - $availableVersions = $tags | - Select-String -Pattern "\d+.\d+.\d+" | - ForEach-Object { $_.Matches.Value } | - Where-Object { $_ -like "$Version.*" -or $_ -eq $Version } | - Sort-Object -Descending { [version]$_ } + $releases = @() + $page = 1 + $pageSize = 100 + do { + $releasesPage = Invoke-RestMethod -Uri "https://api.github.com/repos/${Repository}/releases?per_page=${pageSize}&page=${page}" + $releases += $releasesPage + $page++ + } while ($releasesPage.Count -eq $pageSize) + Write-Debug "Found $($releases.Count) releases for ${Repository}" + + if (-not $releases) { + throw "Failed to get releases from ${Repository}" + } + + $releases = $releases.Where{ $_.assets } + if (-not $AllowPrerelease) { + $releases = $releases.Where{ $_.prerelease -eq $false } + } + Write-Debug "Found $($releases.Count) releases with assets for ${Repository}" - if (-not $availableVersions) { - throw "Failed to get available versions from ${RepoOwner}/${RepoName} releases" + # Parse version from tag name and put it to parameter Version + foreach ($release in $releases) { + $release | Add-Member -MemberType NoteProperty -Name version -Value ( + $release.tag_name | Select-String -Pattern "\d+.\d+.\d+" | ForEach-Object { $_.Matches.Value } + ) } - if ($LatestReleaseOnly) { - $latestVersion = $availableVersions | Select-Object -First 1 - $urlFilterReplaced = $UrlFilter -replace "{BinaryName}", $BinaryName -replace "{Version}", $latestVersion - $downloadUrl = $json.assets.browser_download_url -like $urlFilterReplaced + # Sort releases by version + $releases = $releases | Sort-Object -Descending { [version]$_.version } + + # Select releases matching version + if ($Version -eq "latest") { + $matchingReleases = $releases | Select-Object -First 1 + } elseif ($Version.Contains("*")) { + $matchingReleases = $releases | Where-Object { $_.version -like "$Version" } } else { - foreach ($version in $availableVersions) { - $urlFilterReplaced = $UrlFilter -replace "{BinaryName}", $BinaryName -replace "{Version}", $version - $downloadUrl = $json.assets.browser_download_url -like $urlFilterReplaced + $matchingReleases = $releases | Where-Object { $_.version -eq "$Version" } + } - if ($downloadUrl) { - Write-Host "Found download url for ${RepoOwner}/${RepoName} ${BinaryName} ${version}" - break - } + if (-not $matchingReleases) { + throw "Failed to get releases from ${Repository} matching version `"${Version}`".`nAvailable versions: $($availableVersions -join ", ")" + } + Write-Debug "Found $($matchingReleases.Count) releases matching version ${Version} for ${Repository}" + + # Loop over releases until we find a download url matching the pattern + foreach ($release in $matchingReleases) { + $matchedVersion = $release.version + $matchedUrl = $release.assets.browser_download_url -like $UrlMatchPattern + if ($matchedUrl) { + break } } - if (-not $downloadUrl) { - throw "Failed to get download url for ${RepoOwner}/${RepoName} ${BinaryName}" + if (-not $matchedUrl) { + Write-Debug "Found no download urls matching pattern ${UrlMatchPattern}" + Write-Debug "Available download urls:`n$($matchingReleases.assets.browser_download_url -join "`n")" + throw "No assets found in ${Repository} matching version `"${Version}`" and pattern `"${UrlMatchPattern}`"" + } elseif ($matchedUrl.Count -gt 1) { + Write-Debug "Found multiple download urls matching pattern ${UrlMatchPattern}:`n$($matchedUrl -join "`n")" + throw "Multiple download urls found in ${Repository} version `"${matchedVersion}`" matching pattern `"${UrlMatchPattern}`":`n$($matchedUrl -join "`n")" } - return $downloadUrl + Write-Host "Found download url for ${Repository} version ${matchedVersion}: ${matchedUrl}" + + return ($matchedUrl -as [string]) } function Use-ChecksumComparison { diff --git a/images/windows/scripts/tests/Browsers.Tests.ps1 b/images/windows/scripts/tests/Browsers.Tests.ps1 index 24b65803b8a4..b92d20083a3e 100644 --- a/images/windows/scripts/tests/Browsers.Tests.ps1 +++ b/images/windows/scripts/tests/Browsers.Tests.ps1 @@ -146,8 +146,7 @@ Describe "Internet Explorer" { Describe "Selenium" { BeforeAll { - $seleniumBinaryName = (Get-ToolsetContent).selenium.binary_name - $seleniumBinPath = Join-Path "C:\selenium\" "$seleniumBinaryName.jar" + $seleniumBinPath = "C:\selenium\selenium-server.jar" } It "Selenium server is installed" { @@ -157,4 +156,4 @@ Describe "Selenium" { It "SELENIUM_JAR_PATH environment variable exists" { Get-EnvironmentVariable "SELENIUM_JAR_PATH" | Should -BeExactly "$seleniumBinPath" } -} \ No newline at end of file +} diff --git a/images/windows/toolsets/toolset-2019.json b/images/windows/toolsets/toolset-2019.json index 143fcab69f9f..ad0b81a89649 100644 --- a/images/windows/toolsets/toolset-2019.json +++ b/images/windows/toolsets/toolset-2019.json @@ -392,8 +392,7 @@ } ], "selenium": { - "version": "4", - "binary_name": "selenium-server" + "version": "4" }, "npm": { "global_packages": [ @@ -488,8 +487,7 @@ "signature": "698BA51AA27CC31282AACA5055E4B9190BC6C0E9" }, "kotlin": { - "version": "latest", - "binary_name": "kotlin-compiler" + "version": "latest" }, "openssl": { "version": "1.1.1" diff --git a/images/windows/toolsets/toolset-2022.json b/images/windows/toolsets/toolset-2022.json index 694e72d33e53..5c0f6abdb81d 100644 --- a/images/windows/toolsets/toolset-2022.json +++ b/images/windows/toolsets/toolset-2022.json @@ -339,8 +339,7 @@ } ], "selenium": { - "version": "4", - "binary_name": "selenium-server" + "version": "4" }, "npm": { "global_packages": [ @@ -428,8 +427,7 @@ "signature": "698BA51AA27CC31282AACA5055E4B9190BC6C0E9" }, "kotlin": { - "version": "latest", - "binary_name": "kotlin-compiler" + "version": "latest" }, "openssl": { "version": "1.1.1" From 435ba67550b29b6d2ad44cc3a2bc8d6523df21de Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Tue, 28 Nov 2023 15:19:44 +0100 Subject: [PATCH 2485/3485] [ubuntu] Unify approach to /etc/environment (#8904) * [ubuntu] Unify approach to /etc/environment * [ubuntu] fix typo in XDG_CONFIG_HOME name --- images/ubuntu/scripts/build/configure-dpkg.sh | 5 ++- .../scripts/build/configure-environment.sh | 11 ++++--- .../ubuntu/scripts/build/configure-system.sh | 5 ++- .../scripts/build/install-actions-cache.sh | 2 +- .../scripts/build/install-android-sdk.sh | 12 +++---- .../scripts/build/install-azure-devops-cli.sh | 5 ++- .../ubuntu/scripts/build/install-firefox.sh | 5 ++- .../scripts/build/install-google-chrome.sh | 5 +-- .../scripts/build/install-java-tools.sh | 11 ++++--- .../ubuntu/scripts/build/install-leiningen.sh | 7 +++-- .../scripts/build/install-microsoft-edge.sh | 4 ++- .../ubuntu/scripts/build/install-miniconda.sh | 5 ++- images/ubuntu/scripts/build/install-nvm.sh | 5 ++- .../ubuntu/scripts/build/install-selenium.sh | 3 +- images/ubuntu/scripts/build/install-swift.sh | 3 +- images/ubuntu/scripts/build/install-vcpkg.sh | 5 ++- .../ubuntu/scripts/helpers/etc-environment.sh | 31 +++++++++++-------- 17 files changed, 78 insertions(+), 46 deletions(-) diff --git a/images/ubuntu/scripts/build/configure-dpkg.sh b/images/ubuntu/scripts/build/configure-dpkg.sh index 9ebfdfbe9481..7f9f19e2f6ab 100644 --- a/images/ubuntu/scripts/build/configure-dpkg.sh +++ b/images/ubuntu/scripts/build/configure-dpkg.sh @@ -4,6 +4,9 @@ ## Desc: Configure dpkg ################################################################################ +# Source the helpers for use with the script +source $HELPER_SCRIPTS/etc-environment.sh + # This is the anti-frontend. It never interacts with you at all, # and makes the default answers be used for all questions. It # might mail error messages to root, but that's it; otherwise it @@ -11,7 +14,7 @@ # automatic installs. If you are using this front-end, and require # non-default answers to questions, you will need to preseed the # debconf database -echo 'DEBIAN_FRONTEND=noninteractive' | tee -a /etc/environment +setEtcEnvironmentVariable "DEBIAN_FRONTEND" "noninteractive" # dpkg can be instructed not to ask for confirmation # when replacing a configuration file (with the --force-confdef --force-confold options) diff --git a/images/ubuntu/scripts/build/configure-environment.sh b/images/ubuntu/scripts/build/configure-environment.sh index 1725f35ba2cc..fe2a5d3d4a89 100644 --- a/images/ubuntu/scripts/build/configure-environment.sh +++ b/images/ubuntu/scripts/build/configure-environment.sh @@ -6,17 +6,18 @@ # Source the helpers for use with the script source $HELPER_SCRIPTS/os.sh +source $HELPER_SCRIPTS/etc-environment.sh # Set ImageVersion and ImageOS env variables -echo ImageVersion=$IMAGE_VERSION | tee -a /etc/environment -echo ImageOS=$IMAGE_OS | tee -a /etc/environment +setEtcEnvironmentVariable "ImageVersion" "${IMAGE_VERSION}" +setEtcEnvironmentVariable "ImageOS" "${IMAGE_OS}" # Set the ACCEPT_EULA variable to Y value to confirm your acceptance of the End-User Licensing Agreement -echo ACCEPT_EULA=Y | tee -a /etc/environment +setEtcEnvironmentVariable "ACCEPT_EULA" "Y" # This directory is supposed to be created in $HOME and owned by user(https://github.com/actions/runner-images/issues/491) mkdir -p /etc/skel/.config/configstore -echo 'XDG_CONFIG_HOME=$HOME/.config' | tee -a /etc/environment +setEtcEnvironmentVariable "XDG_CONFIG_HOME" '$HOME/.config' # Change waagent entries to use /mnt for swapfile sed -i 's/ResourceDisk.Format=n/ResourceDisk.Format=y/g' /etc/waagent.conf @@ -29,7 +30,7 @@ sed -i 's/::1 ip6-localhost ip6-loopback/::1 localhost ip6-localhost ip6-loo # Prepare directory and env variable for toolcache AGENT_TOOLSDIRECTORY=/opt/hostedtoolcache mkdir $AGENT_TOOLSDIRECTORY -echo "AGENT_TOOLSDIRECTORY=$AGENT_TOOLSDIRECTORY" | tee -a /etc/environment +setEtcEnvironmentVariable "AGENT_TOOLSDIRECTORY" "${AGENT_TOOLSDIRECTORY}" chmod -R 777 $AGENT_TOOLSDIRECTORY # https://www.elastic.co/guide/en/elasticsearch/reference/current/vm-max-map-count.html diff --git a/images/ubuntu/scripts/build/configure-system.sh b/images/ubuntu/scripts/build/configure-system.sh index 2b36e1edc6aa..997ab8583dfe 100644 --- a/images/ubuntu/scripts/build/configure-system.sh +++ b/images/ubuntu/scripts/build/configure-system.sh @@ -4,6 +4,9 @@ ## Desc: Post deployment system configuration actions ################################################################################ +# Source the helpers for use with the script +source $HELPER_SCRIPT_FOLDER/etc-environment.sh + mv -f /imagegeneration/post-generation /opt echo "chmod -R 777 /opt" @@ -17,7 +20,7 @@ chmod 755 $IMAGE_FOLDER ENVPATH=$(grep 'PATH=' /etc/environment | head -n 1 | sed -z 's/^PATH=*//') ENVPATH=${ENVPATH#"\""} ENVPATH=${ENVPATH%"\""} -echo "PATH=$ENVPATH" | sudo tee -a /etc/environment +addEtcEnvironmentVariable "PATH" "${ENVPATH}" echo "Updated /etc/environment: $(cat /etc/environment)" # Сlean yarn and npm cache diff --git a/images/ubuntu/scripts/build/install-actions-cache.sh b/images/ubuntu/scripts/build/install-actions-cache.sh index 1aa6f538ddb9..59312ba6c563 100644 --- a/images/ubuntu/scripts/build/install-actions-cache.sh +++ b/images/ubuntu/scripts/build/install-actions-cache.sh @@ -14,7 +14,7 @@ ACTION_ARCHIVE_CACHE_DIR=/opt/actionarchivecache mkdir -p $ACTION_ARCHIVE_CACHE_DIR chmod -R 777 $ACTION_ARCHIVE_CACHE_DIR echo "Setting up ACTIONS_RUNNER_ACTION_ARCHIVE_CACHE variable to ${ACTION_ARCHIVE_CACHE_DIR}" -addEtcEnvironmentVariable ACTIONS_RUNNER_ACTION_ARCHIVE_CACHE ${ACTION_ARCHIVE_CACHE_DIR} +setEtcEnvironmentVariable "ACTIONS_RUNNER_ACTION_ARCHIVE_CACHE" "${ACTION_ARCHIVE_CACHE_DIR}" # Download latest release from github.com/actions/action-versions and untar to /opt/actionarchivecache downloadUrl=$(get_github_package_download_url "actions/action-versions" "contains(\"action-versions.tar.gz\")") diff --git a/images/ubuntu/scripts/build/install-android-sdk.sh b/images/ubuntu/scripts/build/install-android-sdk.sh index 6a94a7a82769..7521222e2aed 100644 --- a/images/ubuntu/scripts/build/install-android-sdk.sh +++ b/images/ubuntu/scripts/build/install-android-sdk.sh @@ -35,10 +35,10 @@ function get_full_ndk_version { ANDROID_ROOT=/usr/local/lib/android ANDROID_SDK_ROOT=${ANDROID_ROOT}/sdk SDKMANAGER=${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager -echo "ANDROID_SDK_ROOT=${ANDROID_SDK_ROOT}" | tee -a /etc/environment +setEtcEnvironmentVariable "ANDROID_SDK_ROOT" "${ANDROID_SDK_ROOT}" # ANDROID_HOME is deprecated, but older versions of Gradle rely on it -echo "ANDROID_HOME=${ANDROID_SDK_ROOT}" | tee -a /etc/environment +setEtcEnvironmentVariable "ANDROID_HOME" "${ANDROID_SDK_ROOT}" # Create android sdk directory mkdir -p ${ANDROID_SDK_ROOT} @@ -100,10 +100,10 @@ ndkDefaultFullVersion=$(get_full_ndk_version $ANDROID_NDK_MAJOR_DEFAULT) ndkLatestFullVersion=$(get_full_ndk_version $ANDROID_NDK_MAJOR_LATEST) ANDROID_NDK="$ANDROID_SDK_ROOT/ndk/$ndkDefaultFullVersion" # ANDROID_NDK, ANDROID_NDK_HOME, and ANDROID_NDK_ROOT variables should be set as many customer builds depend on them https://github.com/actions/runner-images/issues/5879 -echo "ANDROID_NDK=${ANDROID_NDK}" | tee -a /etc/environment -echo "ANDROID_NDK_HOME=${ANDROID_NDK}" | tee -a /etc/environment -echo "ANDROID_NDK_ROOT=${ANDROID_NDK}" | tee -a /etc/environment -echo "ANDROID_NDK_LATEST_HOME=$ANDROID_SDK_ROOT/ndk/$ndkLatestFullVersion" | tee -a /etc/environment +setEtcEnvironmentVariable "ANDROID_NDK" "${ANDROID_NDK}" +setEtcEnvironmentVariable "ANDROID_NDK_HOME" "${ANDROID_NDK}" +setEtcEnvironmentVariable "ANDROID_NDK_ROOT" "${ANDROID_NDK}" +setEtcEnvironmentVariable "ANDROID_NDK_LATEST_HOME" "${ANDROID_SDK_ROOT}/ndk/${ndkLatestFullVersion}" availablePlatforms=($($SDKMANAGER --list | sed -n '/Available Packages:/,/^$/p' | grep "platforms;android-[0-9]" | cut -d"|" -f 1)) allBuildTools=($($SDKMANAGER --list | grep "build-tools;" | cut -d"|" -f 1 | sort -u)) diff --git a/images/ubuntu/scripts/build/install-azure-devops-cli.sh b/images/ubuntu/scripts/build/install-azure-devops-cli.sh index 969497ea2a98..b1da23f4ec8f 100644 --- a/images/ubuntu/scripts/build/install-azure-devops-cli.sh +++ b/images/ubuntu/scripts/build/install-azure-devops-cli.sh @@ -4,10 +4,13 @@ ## Desc: Install Azure DevOps CLI (az devops) ################################################################################ +# Source the helpers for use with the script +source $HELPER_SCRIPTS/etc-environment.sh + # AZURE_EXTENSION_DIR shell variable defines where modules are installed # https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview export AZURE_EXTENSION_DIR=/opt/az/azcliextensions -echo "AZURE_EXTENSION_DIR=$AZURE_EXTENSION_DIR" | tee -a /etc/environment +setEtcEnvironmentVariable "AZURE_EXTENSION_DIR" "${AZURE_EXTENSION_DIR}" # install azure devops Cli extension az extension add -n azure-devops diff --git a/images/ubuntu/scripts/build/install-firefox.sh b/images/ubuntu/scripts/build/install-firefox.sh index 18b550467e10..628abde2e293 100644 --- a/images/ubuntu/scripts/build/install-firefox.sh +++ b/images/ubuntu/scripts/build/install-firefox.sh @@ -5,10 +5,9 @@ ################################################################################ # Source the helpers for use with the script -# shellcheck source=../helpers/install.sh source "$HELPER_SCRIPTS/install.sh" -# shellcheck source=../helpers/os.sh source "$HELPER_SCRIPTS/os.sh" +source $HELPER_SCRIPTS/etc-environment.sh # Mozillateam PPA is added manually because sometimes # lanuchad portal sends empty answer when trying to add it automatically @@ -45,6 +44,6 @@ tar -xzf /tmp/geckodriver.tar.gz -C $GECKODRIVER_DIR chmod +x $GECKODRIVER_BIN ln -s "$GECKODRIVER_BIN" /usr/bin/ -echo "GECKOWEBDRIVER=$GECKODRIVER_DIR" | tee -a /etc/environment +setEtcEnvironmentVariable "GECKOWEBDRIVER" "${GECKODRIVER_DIR}" invoke_tests "Browsers" "Firefox" diff --git a/images/ubuntu/scripts/build/install-google-chrome.sh b/images/ubuntu/scripts/build/install-google-chrome.sh index 059a33c8c718..4608bc6b7145 100644 --- a/images/ubuntu/scripts/build/install-google-chrome.sh +++ b/images/ubuntu/scripts/build/install-google-chrome.sh @@ -6,6 +6,7 @@ # Source the helpers for use with the script source $HELPER_SCRIPTS/install.sh +source $HELPER_SCRIPTS/etc-environment.sh function GetChromiumRevision { CHROME_REVISION=$1 @@ -36,7 +37,7 @@ CHROME_DEB_URL="https://dl.google.com/linux/direct/google-chrome-stable_current_ CHROME_DEB_NAME="google-chrome-stable_current_amd64.deb" download_with_retries $CHROME_DEB_URL "/tmp" "${CHROME_DEB_NAME}" apt install "/tmp/${CHROME_DEB_NAME}" -f -echo "CHROME_BIN=/usr/bin/google-chrome" | tee -a /etc/environment +setEtcEnvironmentVariable "CHROME_BIN" "/usr/bin/google-chrome" # Remove Google Chrome repo rm -f /etc/cron.daily/google-chrome /etc/apt/sources.list.d/google-chrome.list /etc/apt/sources.list.d/google-chrome.list.save @@ -64,7 +65,7 @@ unzip -qq /tmp/$CHROMEDRIVER_ARCHIVE -d /usr/local/share chmod +x $CHROMEDRIVER_BIN ln -s "$CHROMEDRIVER_BIN" /usr/bin/ -echo "CHROMEWEBDRIVER=$CHROMEDRIVER_DIR" | tee -a /etc/environment +setEtcEnvironmentVariable "CHROMEWEBDRIVER" "${CHROMEDRIVER_DIR}" # Download and unpack Chromium CHROME_REVISION=$(echo "${CHROME_VERSIONS_JSON}" | jq -r '.builds["'"$CHROME_VERSION"'"].revision') diff --git a/images/ubuntu/scripts/build/install-java-tools.sh b/images/ubuntu/scripts/build/install-java-tools.sh index faa9451ee068..65360fd7cf9d 100644 --- a/images/ubuntu/scripts/build/install-java-tools.sh +++ b/images/ubuntu/scripts/build/install-java-tools.sh @@ -16,13 +16,13 @@ createJavaEnvironmentalVariable() { if [[ ${DEFAULT} == "True" ]]; then echo "Setting up JAVA_HOME variable to ${INSTALL_PATH_PATTERN}" - addEtcEnvironmentVariable JAVA_HOME ${INSTALL_PATH_PATTERN} + setEtcEnvironmentVariable "JAVA_HOME" "${INSTALL_PATH_PATTERN}" echo "Setting up default symlink" update-java-alternatives -s ${INSTALL_PATH_PATTERN} fi echo "Setting up JAVA_HOME_${JAVA_VERSION}_X64 variable to ${INSTALL_PATH_PATTERN}" - addEtcEnvironmentVariable JAVA_HOME_${JAVA_VERSION}_X64 ${INSTALL_PATH_PATTERN} + setEtcEnvironmentVariable "JAVA_HOME_${JAVA_VERSION}_X64" "${INSTALL_PATH_PATTERN}" } enableRepositories() { @@ -56,7 +56,7 @@ installOpenJDK() { # When version string is too short, add extra ".0" to make it valid semver [[ ${fullJavaVersion} =~ ^[0-9]+- ]] && fullJavaVersion=$(echo $fullJavaVersion | sed -E 's/-/.0-/') [[ ${fullJavaVersion} =~ ^[0-9]+\.[0-9]+- ]] && fullJavaVersion=$(echo $fullJavaVersion | sed -E 's/-/.0-/') - + javaToolcacheVersionPath="${JAVA_TOOLCACHE_PATH}/${fullJavaVersion}" echo "Java ${JAVA_VERSION} Toolcache Version Path: ${javaToolcacheVersionPath}" mkdir -p "${javaToolcacheVersionPath}" @@ -93,7 +93,7 @@ done # Install Ant apt-get install -y --no-install-recommends ant ant-optional -echo "ANT_HOME=/usr/share/ant" | tee -a /etc/environment +setEtcEnvironmentVariable "ANT_HOME" "/usr/share/ant" # Install Maven mavenVersion=$(get_toolset_value '.java.maven') @@ -113,7 +113,8 @@ echo "gradleVersion=${gradleLatestVersion}" download_with_retries ${gradleDownloadUrl} "/tmp" "gradleLatest.zip" unzip -qq -d /usr/share /tmp/gradleLatest.zip ln -s /usr/share/gradle-"${gradleLatestVersion}"/bin/gradle /usr/bin/gradle -echo "GRADLE_HOME=$(find /usr/share -depth -maxdepth 1 -name "gradle*")" | tee -a /etc/environment +gradle_home_dir=$(find /usr/share -depth -maxdepth 1 -name "gradle*") +setEtcEnvironmentVariable "GRADLE_HOME" "${gradle_home_dir}" # Delete java repositories and keys rm -f /etc/apt/sources.list.d/adoptium.list diff --git a/images/ubuntu/scripts/build/install-leiningen.sh b/images/ubuntu/scripts/build/install-leiningen.sh index 69845f9e5d8a..400385958cfa 100644 --- a/images/ubuntu/scripts/build/install-leiningen.sh +++ b/images/ubuntu/scripts/build/install-leiningen.sh @@ -4,6 +4,9 @@ ## Desc: Install Leiningen ################################################################################ +# Source the helpers for use with the script +source $HELPER_SCRIPTS/etc-environment.sh + LEIN_BIN=/usr/local/bin/lein curl -fsSL https://raw.githubusercontent.com/technomancy/leiningen/stable/bin/lein > $LEIN_BIN chmod 0755 $LEIN_BIN @@ -13,7 +16,7 @@ export LEIN_HOME=/usr/local/lib/lein lein LEIN_JAR=$(find $LEIN_HOME -name "leiningen-*-standalone.jar") -echo "LEIN_JAR=$LEIN_JAR" | tee -a /etc/environment -echo "LEIN_HOME=$LEIN_HOME" | tee -a /etc/environment +setEtcEnvironmentVariable "LEIN_JAR" "${LEIN_JAR}" +setEtcEnvironmentVariable "LEIN_HOME" "${LEIN_HOME}" invoke_tests "Tools" "Leiningen" diff --git a/images/ubuntu/scripts/build/install-microsoft-edge.sh b/images/ubuntu/scripts/build/install-microsoft-edge.sh index c8c42cd2442c..2103102b7ca3 100644 --- a/images/ubuntu/scripts/build/install-microsoft-edge.sh +++ b/images/ubuntu/scripts/build/install-microsoft-edge.sh @@ -4,7 +4,9 @@ ## Desc: Install Microsoft Edge and WebDriver ################################################################################ +# Source the helpers for use with the script source $HELPER_SCRIPTS/install.sh +source $HELPER_SCRIPTS/etc-environment.sh REPO_URL="https://packages.microsoft.com/repos/edge" gpg_key="/usr/share/keyrings/microsoft-edge.gpg" @@ -44,6 +46,6 @@ unzip -qq /tmp/edgedriver_linux64.zip -d $EDGEDRIVER_DIR chmod +x $EDGEDRIVER_BIN ln -s $EDGEDRIVER_BIN /usr/bin -echo "EDGEWEBDRIVER=$EDGEDRIVER_DIR" | tee -a /etc/environment +setEtcEnvironmentVariable "EDGEWEBDRIVER" "${EDGEDRIVER_DIR}" invoke_tests "Browsers" "Edge" diff --git a/images/ubuntu/scripts/build/install-miniconda.sh b/images/ubuntu/scripts/build/install-miniconda.sh index 9e6daf856458..805a9325c340 100644 --- a/images/ubuntu/scripts/build/install-miniconda.sh +++ b/images/ubuntu/scripts/build/install-miniconda.sh @@ -4,6 +4,9 @@ ## Desc: Install miniconda ################################################################################ +# Source the helpers for use with the script +source $HELPER_SCRIPTS/etc-environment.sh + # Install Miniconda curl -fsSL https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh -o miniconda.sh \ && chmod +x miniconda.sh \ @@ -11,7 +14,7 @@ curl -fsSL https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh && rm miniconda.sh CONDA=/usr/share/miniconda -echo "CONDA=$CONDA" | tee -a /etc/environment +setEtcEnvironmentVariable "CONDA" "${CONDA}" ln -s $CONDA/bin/conda /usr/bin/conda diff --git a/images/ubuntu/scripts/build/install-nvm.sh b/images/ubuntu/scripts/build/install-nvm.sh index 1857ac31d1b0..91848911d2ad 100644 --- a/images/ubuntu/scripts/build/install-nvm.sh +++ b/images/ubuntu/scripts/build/install-nvm.sh @@ -4,11 +4,14 @@ ## Desc: Install Nvm ################################################################################ +# Source the helpers for use with the script +source $HELPER_SCRIPTS/etc-environment.sh + export NVM_DIR="/etc/skel/.nvm" mkdir $NVM_DIR VERSION=$(curl -fsSL https://api.github.com/repos/nvm-sh/nvm/releases/latest | jq -r '.tag_name') curl -fsSL https://raw.githubusercontent.com/nvm-sh/nvm/$VERSION/install.sh | bash -echo 'NVM_DIR=$HOME/.nvm' | tee -a /etc/environment +setEtcEnvironmentVariable "NVM_DIR" '$HOME/.nvm' echo '[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm' | tee -a /etc/skel/.bash_profile [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" diff --git a/images/ubuntu/scripts/build/install-selenium.sh b/images/ubuntu/scripts/build/install-selenium.sh index b974ef145971..c24473378a5d 100644 --- a/images/ubuntu/scripts/build/install-selenium.sh +++ b/images/ubuntu/scripts/build/install-selenium.sh @@ -6,6 +6,7 @@ # Source the helpers for use with the script source $HELPER_SCRIPTS/install.sh +source $HELPER_SCRIPTS/etc-environment.sh # Download Selenium server SELENIUM_MAJOR_VERSION=$(get_toolset_value '.selenium.version') @@ -20,6 +21,6 @@ SELENIUM_FULL_VERSION=$(echo $SELENIUM_DOWNLOAD_URL | awk -F"${SELENIUM_BINARY_N touch "$SELENIUM_JAR_PATH/$SELENIUM_BINARY_NAME-$SELENIUM_FULL_VERSION" # Add SELENIUM_JAR_PATH environment variable -echo "SELENIUM_JAR_PATH=$SELENIUM_JAR_PATH/$SELENIUM_JAR_NAME" | tee -a /etc/environment +setEtcEnvironmentVariable "SELENIUM_JAR_PATH" "${SELENIUM_JAR_PATH}/${SELENIUM_JAR_NAME}" invoke_tests "Tools" "Selenium" diff --git a/images/ubuntu/scripts/build/install-swift.sh b/images/ubuntu/scripts/build/install-swift.sh index 68d5dc19d082..ca2f6e3f41b1 100644 --- a/images/ubuntu/scripts/build/install-swift.sh +++ b/images/ubuntu/scripts/build/install-swift.sh @@ -6,6 +6,7 @@ # Source the helpers for use with the script source $HELPER_SCRIPTS/install.sh +source $HELPER_SCRIPTS/etc-environment.sh # Install image_label="$(lsb_release -rs)" @@ -41,6 +42,6 @@ ln -s "$SWIFT_BIN_ROOT/swift" /usr/local/bin/swift ln -s "$SWIFT_BIN_ROOT/swiftc" /usr/local/bin/swiftc ln -s "$SWIFT_LIB_ROOT/libsourcekitdInProc.so" /usr/local/lib/libsourcekitdInProc.so -echo "SWIFT_PATH=$SWIFT_BIN_ROOT" | tee -a /etc/environment +setEtcEnvironmentVariable "SWIFT_PATH" "${SWIFT_BIN_ROOT}" invoke_tests "Common" "Swift" diff --git a/images/ubuntu/scripts/build/install-vcpkg.sh b/images/ubuntu/scripts/build/install-vcpkg.sh index b45447402af7..8d407cad5aba 100644 --- a/images/ubuntu/scripts/build/install-vcpkg.sh +++ b/images/ubuntu/scripts/build/install-vcpkg.sh @@ -4,9 +4,12 @@ ## Desc: Install vcpkg ################################################################################ +# Source the helpers for use with the script +source $HELPER_SCRIPTS/etc-environment.sh + # Set env variable for vcpkg VCPKG_INSTALLATION_ROOT=/usr/local/share/vcpkg -echo "VCPKG_INSTALLATION_ROOT=${VCPKG_INSTALLATION_ROOT}" | tee -a /etc/environment +setEtcEnvironmentVariable "VCPKG_INSTALLATION_ROOT" "${VCPKG_INSTALLATION_ROOT}" # Install vcpkg git clone https://github.com/Microsoft/vcpkg $VCPKG_INSTALLATION_ROOT diff --git a/images/ubuntu/scripts/helpers/etc-environment.sh b/images/ubuntu/scripts/helpers/etc-environment.sh index cefe0acd6bf9..7ec5907dce1e 100644 --- a/images/ubuntu/scripts/helpers/etc-environment.sh +++ b/images/ubuntu/scripts/helpers/etc-environment.sh @@ -8,20 +8,21 @@ # values containg slashes (i.e. directory path) # The values containing '%' will break the functions -function getEtcEnvironmentVariable { +getEtcEnvironmentVariable () { variable_name="$1" + # remove `variable_name=` and possible quotes from the line - grep "^${variable_name}=" /etc/environment |sed -E "s%^${variable_name}=\"?([^\"]+)\"?.*$%\1%" + grep "^${variable_name}=" /etc/environment | sed -E "s%^${variable_name}=\"?([^\"]+)\"?.*$%\1%" } -function addEtcEnvironmentVariable { +addEtcEnvironmentVariable () { variable_name="$1" variable_value="$2" - echo "$variable_name=$variable_value" | sudo tee -a /etc/environment + echo "${variable_name}=${variable_value}" | sudo tee -a /etc/environment } -function replaceEtcEnvironmentVariable { +replaceEtcEnvironmentVariable () { variable_name="$1" variable_value="$2" @@ -29,40 +30,45 @@ function replaceEtcEnvironmentVariable { sudo sed -i -e "s%^${variable_name}=.*$%${variable_name}=\"${variable_value}\"%" /etc/environment } -function setEtcEnvironmentVariable { +setEtcEnvironmentVariable () { variable_name="$1" variable_value="$2" - if grep "$variable_name" /etc/environment > /dev/null; then + if grep "^${variable_name}=" /etc/environment > /dev/null + then replaceEtcEnvironmentVariable $variable_name $variable_value else addEtcEnvironmentVariable $variable_name $variable_value fi } -function prependEtcEnvironmentVariable { +prependEtcEnvironmentVariable () { variable_name="$1" element="$2" + # TODO: handle the case if the variable does not exist existing_value=$(getEtcEnvironmentVariable "${variable_name}") setEtcEnvironmentVariable "${variable_name}" "${element}:${existing_value}" } -function appendEtcEnvironmentVariable { +appendEtcEnvironmentVariable () { variable_name="$1" element="$2" + # TODO: handle the case if the variable does not exist existing_value=$(getEtcEnvironmentVariable "${variable_name}") setEtcEnvironmentVariable "${variable_name}" "${existing_value}:${element}" } -function prependEtcEnvironmentPath { +prependEtcEnvironmentPath () { element="$1" + prependEtcEnvironmentVariable PATH "${element}" } -function appendEtcEnvironmentPath { +appendEtcEnvironmentPath () { element="$1" + appendEtcEnvironmentVariable PATH "${element}" } @@ -75,11 +81,10 @@ function appendEtcEnvironmentPath { # TODO: there might be the others variables to be processed in the same way as "PATH" variable # ie MANPATH, INFOPATH, LD_*, etc. In the current implementation the values from /etc/evironments # replace the values of the current environment -function reloadEtcEnvironment { +reloadEtcEnvironment () { # add `export ` to every variable of /etc/environemnt except PATH and eval the result shell script eval $(grep -v '^PATH=' /etc/environment | sed -e 's%^%export %') # handle PATH specially etc_path=$(getEtcEnvironmentVariable PATH) export PATH="$PATH:$etc_path" } - From d2cbbb901baccd64e4ec8e8a13b8da5470259ad9 Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Tue, 28 Nov 2023 15:22:35 +0100 Subject: [PATCH 2486/3485] [ubuntu] Change echo to printf for escape sequences (#8905) --- images/ubuntu/scripts/build/install-container-tools.sh | 2 +- images/ubuntu/scripts/helpers/install.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/images/ubuntu/scripts/build/install-container-tools.sh b/images/ubuntu/scripts/build/install-container-tools.sh index be659b6fbdf9..d10bbf15b7b8 100644 --- a/images/ubuntu/scripts/build/install-container-tools.sh +++ b/images/ubuntu/scripts/build/install-container-tools.sh @@ -29,7 +29,7 @@ fi apt-get update apt-get -y install ${install_packages[@]} mkdir -p /etc/containers -echo -e "[registries.search]\nregistries = ['docker.io', 'quay.io']" | tee /etc/containers/registries.conf +printf "[registries.search]\nregistries = ['docker.io', 'quay.io']\n" | tee /etc/containers/registries.conf if isUbuntu20; then # Remove source repo diff --git a/images/ubuntu/scripts/helpers/install.sh b/images/ubuntu/scripts/helpers/install.sh index e6b793bac50a..ee918f2b63ac 100644 --- a/images/ubuntu/scripts/helpers/install.sh +++ b/images/ubuntu/scripts/helpers/install.sh @@ -60,7 +60,7 @@ IsPackageInstalled() { } verlte() { - sortedVersion=$(echo -e "$1\n$2" | sort -V | head -n1) + sortedVersion=$(printf "$1\n$2\n" | sort -V | head -n1) [ "$1" = "$sortedVersion" ] } From c73276d3f6f97177d6c9000fd37a1107cc47c0b6 Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Wed, 29 Nov 2023 12:58:37 +0100 Subject: [PATCH 2487/3485] [Windows] Rename the Invoke-SBWithRetry function (#8880) --- .../scripts/build/Install-AndroidSDK.ps1 | 2 +- .../scripts/build/Install-JavaTools.ps1 | 2 +- images/windows/scripts/build/Install-PyPy.ps1 | 2 +- images/windows/scripts/build/Install-Ruby.ps1 | 2 +- .../windows/scripts/build/Install-Toolset.ps1 | 14 ++-- .../scripts/build/Install-VSExtensions.ps1 | 1 + .../Install-WindowsUpdatesAfterReboot.ps1 | 2 +- images/windows/scripts/build/Install-Zstd.ps1 | 2 +- .../windows/scripts/helpers/ImageHelpers.psm1 | 2 +- .../scripts/helpers/InstallHelpers.ps1 | 84 +++++++++++-------- images/windows/scripts/tests/Tools.Tests.ps1 | 8 +- 11 files changed, 73 insertions(+), 48 deletions(-) diff --git a/images/windows/scripts/build/Install-AndroidSDK.ps1 b/images/windows/scripts/build/Install-AndroidSDK.ps1 index 5233e92b1b5f..834e9f052db4 100644 --- a/images/windows/scripts/build/Install-AndroidSDK.ps1 +++ b/images/windows/scripts/build/Install-AndroidSDK.ps1 @@ -73,7 +73,7 @@ Expand-7ZipArchive -Path $cmdlineToolsArchPath -DestinationPath "${SDKInstallRoo # cmdline tools should be installed in ${SDKInstallRoot}\cmdline-tools\latest\bin, but archive contains ${SDKInstallRoot}\cmdline-tools\bin # we need to create the proper folder structure -Invoke-SBWithRetry -Command { +Invoke-ScriptBlockWithRetry -Command { Rename-Item "${SDKInstallRoot}\cmdline-tools\cmdline-tools" "latest" -ErrorAction Stop } diff --git a/images/windows/scripts/build/Install-JavaTools.ps1 b/images/windows/scripts/build/Install-JavaTools.ps1 index a20e3ee4063a..efbb8a8977be 100644 --- a/images/windows/scripts/build/Install-JavaTools.ps1 +++ b/images/windows/scripts/build/Install-JavaTools.ps1 @@ -90,7 +90,7 @@ function Install-JavaJDK { # Complete the installation by extracting Java binaries to toolcache and creating the complete file Expand-7ZipArchive -Path $archivePath -DestinationPath $javaVersionPath - Invoke-SBWithRetry -Command { + Invoke-ScriptBlockWithRetry -Command { Get-ChildItem -Path $javaVersionPath | Rename-Item -NewName $javaArchPath -ErrorAction Stop } New-Item -ItemType File -Path $javaVersionPath -Name "$Architecture.complete" | Out-Null diff --git a/images/windows/scripts/build/Install-PyPy.ps1 b/images/windows/scripts/build/Install-PyPy.ps1 index 1fb8d0360b28..33a6c7b39b21 100644 --- a/images/windows/scripts/build/Install-PyPy.ps1 +++ b/images/windows/scripts/build/Install-PyPy.ps1 @@ -41,7 +41,7 @@ function Install-PyPy New-Item -ItemType Directory -Path $pypyVersionPath -Force | Out-Null Write-Host "Move PyPy '${pythonVersion}' files to '${pypyArchPath}'" - Invoke-SBWithRetry -Command { + Invoke-ScriptBlockWithRetry -Command { Move-Item -Path $tempFolder -Destination $pypyArchPath -ErrorAction Stop | Out-Null } diff --git a/images/windows/scripts/build/Install-Ruby.ps1 b/images/windows/scripts/build/Install-Ruby.ps1 index a0869d9599de..b3036cc07a26 100644 --- a/images/windows/scripts/build/Install-Ruby.ps1 +++ b/images/windows/scripts/build/Install-Ruby.ps1 @@ -62,7 +62,7 @@ function Install-Ruby { New-Item -ItemType Directory -Path $rubyVersionPath -Force | Out-Null Write-Host "Moving Ruby '${rubyVersion}' files to '${rubyArchPath}'" - Invoke-SBWithRetry -Command { + Invoke-ScriptBlockWithRetry -Command { Move-Item -Path $tempFolder -Destination $rubyArchPath -ErrorAction Stop | Out-Null } diff --git a/images/windows/scripts/build/Install-Toolset.ps1 b/images/windows/scripts/build/Install-Toolset.ps1 index 09c2bac85dcc..e032464b6166 100644 --- a/images/windows/scripts/build/Install-Toolset.ps1 +++ b/images/windows/scripts/build/Install-Toolset.ps1 @@ -38,14 +38,18 @@ $tools = Get-ToolsetContent | Select-Object -ExpandProperty toolcache | Where-Ob foreach ($tool in $tools) { # Get versions manifest for current tool - $assets = Invoke-SBWithRetry -Command { Invoke-RestMethod $tool.url } + # Invoke-RestMethod doesn't support retry in PowerShell 5.1 + $assets = Invoke-ScriptBlockWithRetry -Command { + Invoke-RestMethod $tool.url + } # Get github release asset for each version foreach ($toolVersion in $tool.versions) { - $asset = $assets | Where-Object version -like $toolVersion ` - | Select-Object -ExpandProperty files ` - | Where-Object { ($_.platform -eq $tool.platform) -and ($_.arch -eq $tool.arch) -and ($_.toolset -eq $tool.toolset) } ` - | Select-Object -First 1 + $asset = $assets ` + | Where-Object version -like $toolVersion ` + | Select-Object -ExpandProperty files ` + | Where-Object { ($_.platform -eq $tool.platform) -and ($_.arch -eq $tool.arch) -and ($_.toolset -eq $tool.toolset) } ` + | Select-Object -First 1 Write-Host "Installing $($tool.name) $toolVersion $($tool.arch)..." if ($null -ne $asset) { diff --git a/images/windows/scripts/build/Install-VSExtensions.ps1 b/images/windows/scripts/build/Install-VSExtensions.ps1 index f33e9678c4d4..a866876fffea 100644 --- a/images/windows/scripts/build/Install-VSExtensions.ps1 +++ b/images/windows/scripts/build/Install-VSExtensions.ps1 @@ -13,6 +13,7 @@ if (-not $vsixPackagesList) { $vsixPackagesList | ForEach-Object { # Retrieve cdn endpoint to avoid HTTP error 429 https://github.com/actions/runner-images/issues/3074 $vsixPackage = Get-VsixExtenstionFromMarketplace -ExtensionMarketPlaceName $_ + Write-Host "Installing $vsixPackage" if ($vsixPackage.FileName.EndsWith(".vsix")) { Install-VSIXFromUrl $vsixPackage.DownloadUri } else { diff --git a/images/windows/scripts/build/Install-WindowsUpdatesAfterReboot.ps1 b/images/windows/scripts/build/Install-WindowsUpdatesAfterReboot.ps1 index 401a45ed0324..ef9b562bf191 100644 --- a/images/windows/scripts/build/Install-WindowsUpdatesAfterReboot.ps1 +++ b/images/windows/scripts/build/Install-WindowsUpdatesAfterReboot.ps1 @@ -3,7 +3,7 @@ ## Desc: Waits for Windows Updates to finish installing after reboot ################################################################################ -Invoke-SBWithRetry -RetryCount 10 -RetryIntervalSeconds 120 -Command { +Invoke-ScriptBlockWithRetry -RetryCount 10 -RetryIntervalSeconds 120 -Command { $inProgress = Get-WindowsUpdateStates | Where-Object State -eq "Running" | Where-Object Title -notmatch "Microsoft Defender Antivirus" if ( $inProgress ) { $title = $inProgress.Title -join "`n" diff --git a/images/windows/scripts/build/Install-Zstd.ps1 b/images/windows/scripts/build/Install-Zstd.ps1 index 97d44b56d701..224f2cf5fd57 100644 --- a/images/windows/scripts/build/Install-Zstd.ps1 +++ b/images/windows/scripts/build/Install-Zstd.ps1 @@ -15,7 +15,7 @@ $filesInArchive = 7z l $zstdArchivePath | Out-String if ($filesInArchive.Contains($zstdParentName)) { Expand-7ZipArchive -Path $zstdArchivePath -DestinationPath $toolPath - Invoke-SBWithRetry -Command { + Invoke-ScriptBlockWithRetry -Command { Move-Item -Path "${zstdPath}*" -Destination $zstdPath -ErrorAction Stop } } else { diff --git a/images/windows/scripts/helpers/ImageHelpers.psm1 b/images/windows/scripts/helpers/ImageHelpers.psm1 index 38c2ac59654f..d8d04b9aca73 100644 --- a/images/windows/scripts/helpers/ImageHelpers.psm1 +++ b/images/windows/scripts/helpers/ImageHelpers.psm1 @@ -38,7 +38,7 @@ Export-ModuleMember -Function @( 'Resolve-ChocoPackageVersion' 'Resolve-GithubReleaseAssetUrl' 'Expand-7ZipArchive' - 'Invoke-SBWithRetry' + 'Invoke-ScriptBlockWithRetry' 'Get-VsCatalogJsonPath' 'Get-AndroidPackages' 'Get-AndroidPlatformPackages' diff --git a/images/windows/scripts/helpers/InstallHelpers.ps1 b/images/windows/scripts/helpers/InstallHelpers.ps1 index df88bdd07bf1..036866c2743d 100644 --- a/images/windows/scripts/helpers/InstallHelpers.ps1 +++ b/images/windows/scripts/helpers/InstallHelpers.ps1 @@ -182,8 +182,10 @@ function Get-VsixExtenstionFromMarketplace { [string] $MarketplaceUri = "https://marketplace.visualstudio.com/items?itemName=" ) - $extensionUri = $MarketplaceUri + $ExtensionMarketPlaceName - $request = Invoke-SBWithRetry -Command { Invoke-WebRequest -Uri $extensionUri -UseBasicParsing } -RetryCount 20 -RetryIntervalSeconds 30 + # Invoke-WebRequest doesn't support retry in PowerShell 5.1 + $request = Invoke-ScriptBlockWithRetry -RetryCount 20 -RetryIntervalSeconds 30 -Command { + Invoke-WebRequest -Uri "${MarketplaceUri}${ExtensionMarketPlaceName}" -UseBasicParsing + } $request -match 'UniqueIdentifierValue":"(?<extensionname>[^"]*)' | Out-Null $extensionName = $Matches.extensionname $request -match 'VsixId":"(?<vsixid>[^"]*)' | Out-Null @@ -212,9 +214,9 @@ function Get-VsixExtenstionFromMarketplace { return [PSCustomObject] @{ "ExtensionName" = $extensionName - "VsixId" = $vsixId - "FileName" = $fileName - "DownloadUri" = $downloadUri + "VsixId" = $vsixId + "FileName" = $fileName + "DownloadUri" = $downloadUri } } @@ -277,17 +279,15 @@ function Install-VSIXFromUrl { Remove-Item -Force -Confirm:$false $filePath } -function Get-VSExtensionVersion -{ +function Get-VSExtensionVersion { Param ( - [Parameter(Mandatory=$true)] + [Parameter(Mandatory = $true)] [string] $packageName ) $instanceFolders = Get-ChildItem -Path "C:\ProgramData\Microsoft\VisualStudio\Packages\_Instances" - if ($instanceFolders -is [array]) - { + if ($instanceFolders -is [array]) { Write-Host ($instanceFolders | Out-String) Write-Host ($instanceFolders | Get-ChildItem | Out-String) Write-Host "More than one instance installed" @@ -298,8 +298,7 @@ function Get-VSExtensionVersion $state = $stateContent | ConvertFrom-Json $packageVersion = ($state.packages | Where-Object { $_.id -eq $packageName }).version - if (-not $packageVersion) - { + if (-not $packageVersion) { Write-Host "Installed package $packageName for Visual Studio was not found" exit 1 } @@ -307,8 +306,7 @@ function Get-VSExtensionVersion return $packageVersion } -function Get-ToolsetContent -{ +function Get-ToolsetContent { $toolsetPath = Join-Path "C:\\image" "toolset.json" $toolsetJson = Get-Content -Path $toolsetPath -Raw ConvertFrom-Json -InputObject $toolsetJson @@ -395,27 +393,24 @@ function Get-TCToolVersionPath { return Join-Path $foundVersion $Arch } -function Get-WinVersion -{ +function Get-WinVersion { (Get-CimInstance -ClassName Win32_OperatingSystem).Caption } -function Test-IsWin22 -{ +function Test-IsWin22 { (Get-WinVersion) -match "2022" } -function Test-IsWin19 -{ +function Test-IsWin19 { (Get-WinVersion) -match "2019" } function Expand-7ZipArchive { Param ( - [Parameter(Mandatory=$true)] + [Parameter(Mandatory = $true)] [string]$Path, - [Parameter(Mandatory=$true)] + [Parameter(Mandatory = $true)] [string]$DestinationPath, [ValidateSet("x", "e")] [char]$ExtractMethod = "x" @@ -424,8 +419,7 @@ function Expand-7ZipArchive { Write-Host "Expand archive '$PATH' to '$DestinationPath' directory" 7z.exe $ExtractMethod "$Path" -o"$DestinationPath" -y | Out-Null - if ($LASTEXITCODE -ne 0) - { + if ($LASTEXITCODE -ne 0) { Write-Host "There is an error during expanding '$Path' to '$DestinationPath' directory" exit 1 } @@ -659,7 +653,29 @@ function Get-WindowsUpdateStates { } } -function Invoke-SBWithRetry { +function Invoke-ScriptBlockWithRetry { + <# + .SYNOPSIS + Executes a script block with retry logic. + + .DESCRIPTION + The Invoke-ScriptBlockWithRetry function executes a specified script block with retry logic. It allows you to specify the number of retries and the interval between retries. + + .PARAMETER Command + The script block to be executed. + + .PARAMETER RetryCount + The number of times to retry executing the script block. The default value is 10. + + .PARAMETER RetryIntervalSeconds + The interval in seconds between each retry. The default value is 5. + + .EXAMPLE + Invoke-ScriptBlockWithRetry -Command { Get-Process } -RetryCount 3 -RetryIntervalSeconds 10 + This example executes the script block { Get-Process } with 3 retries and a 10-second interval between each retry. + + #> + param ( [scriptblock] $Command, [int] $RetryCount = 10, @@ -670,8 +686,7 @@ function Invoke-SBWithRetry { try { & $Command return - } - catch { + } catch { Write-Host "There is an error encountered:`n $_" $RetryCount-- @@ -771,9 +786,9 @@ function Resolve-GithubReleaseAssetUrl { function Use-ChecksumComparison { param ( - [Parameter(Mandatory=$true)] + [Parameter(Mandatory = $true)] [string]$LocalFileHash, - [Parameter(Mandatory=$true)] + [Parameter(Mandatory = $true)] [string]$DistributorFileHash ) @@ -790,7 +805,7 @@ function Get-HashFromGitHubReleaseBody { param ( [string]$RepoOwner, [string]$RepoName, - [Parameter(Mandatory=$true)] + [Parameter(Mandatory = $true)] [string]$FileName, [string]$Url, [string]$Version = "latest", @@ -815,7 +830,7 @@ function Get-HashFromGitHubReleaseBody { $releaseUrl = "https://api.github.com/repos/${RepoOwner}/${RepoName}/releases/tag/$tag" } } - $body = (Invoke-RestMethod -Uri $releaseUrl).body -replace('`', "") -join "`n" + $body = (Invoke-RestMethod -Uri $releaseUrl).body -replace ('`', "") -join "`n" $matchingLine = $body.Split("`n") | Where-Object { $_ -like "*$FileName*" } if ([string]::IsNullOrEmpty($matchingLine)) { throw "File name '$FileName' not found in release body." @@ -828,9 +843,9 @@ function Get-HashFromGitHubReleaseBody { } function Test-FileSignature { param( - [Parameter(Mandatory=$true)] + [Parameter(Mandatory = $true)] [string]$FilePath, - [Parameter(Mandatory=$true)] + [Parameter(Mandatory = $true)] [string[]]$ExpectedThumbprint ) @@ -850,8 +865,7 @@ function Test-FileSignature { if ($signatureMatched) { Write-Output "Signature for $FilePath is valid" - } - else { + } else { throw "Signature thumbprint do not match expected." } } diff --git a/images/windows/scripts/tests/Tools.Tests.ps1 b/images/windows/scripts/tests/Tools.Tests.ps1 index be8864d8b1ad..4c8690fce777 100644 --- a/images/windows/scripts/tests/Tools.Tests.ps1 +++ b/images/windows/scripts/tests/Tools.Tests.ps1 @@ -141,7 +141,13 @@ Describe "Sbt" { Describe "ServiceFabricSDK" { It "PowerShell Module" { - Get-Module -Name ServiceFabric -ListAvailable | Should -Not -BeNullOrEmpty + # Ignore PowerShell version check if running in PowerShell Core + # https://github.com/microsoft/service-fabric/issues/1343 + if ($PSVersionTable.PSEdition -eq 'Core') { + Get-Module -Name ServiceFabric -SkipEditionCheck -ListAvailable | Should -Not -BeNullOrEmpty + } else { + Get-Module -Name ServiceFabric -ListAvailable | Should -Not -BeNullOrEmpty + } } It "ServiceFabricSDK version" { From bfe32a2b12eb0d3a3a7d2c8b03d3ac03fb495ba5 Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Wed, 29 Nov 2023 13:00:16 +0100 Subject: [PATCH 2488/3485] [Windows] Refactor PATH helpers (#8885) --- .../scripts/build/Configure-System.ps1 | 37 +++- images/windows/scripts/build/Install-Git.ps1 | 3 +- .../windows/scripts/build/Install-Haskell.ps1 | 4 +- .../scripts/build/Install-JavaTools.ps1 | 9 +- .../scripts/build/Install-Mercurial.ps1 | 5 +- images/windows/scripts/build/Install-NSIS.ps1 | 5 +- .../windows/scripts/build/Install-NodeJS.ps1 | 2 +- .../windows/scripts/build/Install-OpenSSL.ps1 | 2 +- .../windows/scripts/build/Install-Vcpkg.ps1 | 2 +- .../windows/scripts/helpers/ImageHelpers.psm1 | 15 +- .../scripts/helpers/InstallHelpers.ps1 | 36 ++++ .../windows/scripts/helpers/PathHelpers.ps1 | 195 ++++++++---------- .../helpers/test/PathHelpers.Tests.ps1 | 27 --- images/windows/scripts/tests/Helpers.psm1 | 12 -- 14 files changed, 171 insertions(+), 183 deletions(-) delete mode 100644 images/windows/scripts/helpers/test/PathHelpers.Tests.ps1 diff --git a/images/windows/scripts/build/Configure-System.ps1 b/images/windows/scripts/build/Configure-System.ps1 index 08d09f143a20..8553ba68a279 100644 --- a/images/windows/scripts/build/Configure-System.ps1 +++ b/images/windows/scripts/build/Configure-System.ps1 @@ -6,11 +6,30 @@ Write-Host "Cleanup WinSxS" Dism.exe /online /Cleanup-Image /StartComponentCleanup /ResetBase -# Sets the default install version to v1 for new distributions +# Set default version to 1 for WSL (aka LXSS - Linux Subsystem) +# The value should be set in the default user registry hive # https://github.com/actions/runner-images/issues/5760 if (Test-IsWin22) { - Write-Host "Sets the default install version to v1 for new distributions" - Add-DefaultItem -DefaultVariable "DefaultVersion" -Value 1 -Name "DEFAULT\Software\Microsoft\Windows\CurrentVersion\Lxss" -Kind "DWord" + Write-Host "Setting WSL default version to 1" + + Mount-RegistryHive ` + -FileName "C:\Users\Default\NTUSER.DAT" ` + -SubKey "HKLM\DEFAULT" + + # Create the key if it doesn't exist + $keyPath = "DEFAULT\Software\Microsoft\Windows\CurrentVersion\Lxss" + if (-not (Test-Path $keyPath)) { + Write-Host "Creating $keyPath key" + New-Item -Path (Join-Path "HKLM:\" $keyPath) -Force | Out-Null + } + + # Set the DefaultVersion value to 1 + $key = [Microsoft.Win32.Registry]::LocalMachine.OpenSubKey($keyPath, $true) + $key.SetValue("DefaultVersion", "1", "DWord") + $key.Handle.Close() + [System.GC]::Collect() + + Dismount-RegistryHive "HKLM\DEFAULT" } Write-Host "Clean up various directories" @@ -70,9 +89,11 @@ $registrySettings = @( ) $registrySettings | ForEach-Object { - $regPath = $PSItem.Path - New-ItemPath -Path $regPath - New-ItemProperty @PSItem -Force -ErrorAction Ignore + $regPath = $_.Path + if (-not (Test-Path $regPath)) { + New-Item -Path $regPath -Force -ErrorAction Ignore | Out-Null + } + New-ItemProperty @_ -Force -ErrorAction Ignore } | Out-Null # Disable Template Services / User Services added by Desktop Experience @@ -86,7 +107,9 @@ $regUserServicesToDisables = @( $regUserServicesToDisables | ForEach-Object { $regPath = $_ - New-ItemPath -Path $regPath + if (-not (Test-Path $regPath)) { + New-Item -Path $regPath -Force -ErrorAction Ignore | Out-Null + } New-ItemProperty -Path $regPath -Name "Start" -Value 4 -PropertyType DWORD -Force -ErrorAction Ignore New-ItemProperty -Path $regPath -Name "UserServiceFlags" -Value 0 -PropertyType DWORD -Force -ErrorAction Ignore } | Out-Null diff --git a/images/windows/scripts/build/Install-Git.ps1 b/images/windows/scripts/build/Install-Git.ps1 index f7aaa256cdfb..cc97e54fe806 100644 --- a/images/windows/scripts/build/Install-Git.ps1 +++ b/images/windows/scripts/build/Install-Git.ps1 @@ -3,7 +3,6 @@ ## Desc: Install Git for Windows ## Supply chain security: Git - checksum validation, Hub CLI - managed by package manager ################################################################################ -Import-Module "$env:ChocolateyInstall\helpers\chocolateyProfile.psm1" # Install the latest version of Git for Windows $repoURL = "https://api.github.com/repos/git-for-windows/git/releases/latest" @@ -28,7 +27,7 @@ Install-Binary ` "/COMPONENTS=gitlfs") ` -ExpectedSHA256Sum $externalHash -Update-SessionEnvironment +Update-Environment git config --system --add safe.directory "*" diff --git a/images/windows/scripts/build/Install-Haskell.ps1 b/images/windows/scripts/build/Install-Haskell.ps1 index 8fee875bc29f..00264461671e 100644 --- a/images/windows/scripts/build/Install-Haskell.ps1 +++ b/images/windows/scripts/build/Install-Haskell.ps1 @@ -2,7 +2,6 @@ ## File: Install-Haskell.ps1 ## Desc: Install Haskell for Windows ################################################################################ -Import-Module "$env:ChocolateyInstall\helpers\chocolateyProfile.psm1" # install minimal ghcup, utilizing pre-installed msys2 at C:\msys64 Write-Host 'Installing ghcup...' @@ -28,8 +27,7 @@ Start-DownloadWithRetry -Url $ghcupDownloadURL -Name "ghcup.exe" -DownloadPath " [System.Environment]::SetEnvironmentVariable("CABAL_DIR", $cabalDir, "Machine") Add-MachinePathItem "$ghcupPrefix\ghcup\bin" Add-MachinePathItem "$cabalDir\bin" - -Update-SessionEnvironment +Update-Environment # Get 3 latest versions of GHC $Versions = ghcup list -t ghc -r | Where-Object {$_ -notlike "prerelease"} diff --git a/images/windows/scripts/build/Install-JavaTools.ps1 b/images/windows/scripts/build/Install-JavaTools.ps1 index efbb8a8977be..1b9e34d70c8e 100644 --- a/images/windows/scripts/build/Install-JavaTools.ps1 +++ b/images/windows/scripts/build/Install-JavaTools.ps1 @@ -24,7 +24,7 @@ function Set-JavaPath { if ($Default) { # Clean up any other Java folders from PATH to make sure that they won't conflict with each other - $currentPath = Get-MachinePath + $currentPath = [System.Environment]::GetEnvironmentVariable("PATH", "Machine") $pathSegments = $currentPath.Split(';') $newPathSegments = @() @@ -39,7 +39,7 @@ function Set-JavaPath { $newPath = $javaPath + '\bin;' + $newPath Write-Host "Add $javaPath\bin to PATH" - Set-MachinePath -NewPath $newPath + [System.Environment]::SetEnvironmentVariable("PATH", $newPath, "Machine") Write-Host "Set JAVA_HOME environmental variable as $javaPath" [Environment]::SetEnvironmentVariable("JAVA_HOME", $javaPath, "Machine") @@ -123,15 +123,14 @@ Install-ChocoPackage maven -ArgumentList "--version=$versionToInstall" Install-ChocoPackage gradle # Add maven env variables to Machine -[string]$m2 = (Get-MachinePath).Split(";") -match "maven" -$maven_opts = '-Xms256m' +[string]$m2 = ([Environment]::GetEnvironmentVariable("PATH", "Machine")).Split(";") -match "maven" $m2_repo = 'C:\ProgramData\m2' New-Item -Path $m2_repo -ItemType Directory -Force | Out-Null [Environment]::SetEnvironmentVariable("M2", $m2, "Machine") [Environment]::SetEnvironmentVariable("M2_REPO", $m2_repo, "Machine") -[Environment]::SetEnvironmentVariable("MAVEN_OPTS", $maven_opts, "Machine") +[Environment]::SetEnvironmentVariable("MAVEN_OPTS", "-Xms256m", "Machine") # Download cobertura jars $uri = 'https://repo1.maven.org/maven2/net/sourceforge/cobertura/cobertura/2.1.1/cobertura-2.1.1-bin.zip' diff --git a/images/windows/scripts/build/Install-Mercurial.ps1 b/images/windows/scripts/build/Install-Mercurial.ps1 index 96ba27ee6a86..8ab9382cf856 100644 --- a/images/windows/scripts/build/Install-Mercurial.ps1 +++ b/images/windows/scripts/build/Install-Mercurial.ps1 @@ -5,8 +5,7 @@ Install-ChocoPackage hg -ArgumentList "--version", "5.0.0" -$hgPath = "${env:ProgramFiles}\Mercurial\" -Add-MachinePathItem $hgPath -$env:Path = Get-MachinePath +Add-MachinePathItem "${env:ProgramFiles}\Mercurial\" +Update-Environment Invoke-PesterTests -TestFile "Tools" -TestName "Mercurial" diff --git a/images/windows/scripts/build/Install-NSIS.ps1 b/images/windows/scripts/build/Install-NSIS.ps1 index 423eae9da0b2..745c0004288b 100644 --- a/images/windows/scripts/build/Install-NSIS.ps1 +++ b/images/windows/scripts/build/Install-NSIS.ps1 @@ -8,8 +8,7 @@ $NsisVersion = (Get-ToolsetContent).nsis.version Install-ChocoPackage nsis -ArgumentList "--version", "$NsisVersion" -$NsisPath = "${env:ProgramFiles(x86)}\NSIS\" -Add-MachinePathItem $NsisPath -$env:Path = Get-MachinePath +Add-MachinePathItem "${env:ProgramFiles(x86)}\NSIS\" +Update-Environment Invoke-PesterTests -TestFile "Tools" -TestName "NSIS" diff --git a/images/windows/scripts/build/Install-NodeJS.ps1 b/images/windows/scripts/build/Install-NodeJS.ps1 index 0f0d00a54463..f32b425ec740 100644 --- a/images/windows/scripts/build/Install-NodeJS.ps1 +++ b/images/windows/scripts/build/Install-NodeJS.ps1 @@ -16,7 +16,7 @@ $versionToInstall = Resolve-ChocoPackageVersion -PackageName "nodejs" -TargetVer Install-ChocoPackage nodejs -ArgumentList "--version=$versionToInstall" Add-MachinePathItem $PrefixPath -$env:Path = Get-MachinePath +Update-Environment [Environment]::SetEnvironmentVariable("npm_config_prefix", $PrefixPath, "Machine") $env:npm_config_prefix = $PrefixPath diff --git a/images/windows/scripts/build/Install-OpenSSL.ps1 b/images/windows/scripts/build/Install-OpenSSL.ps1 index 06f5e1840b71..c229b3754a63 100644 --- a/images/windows/scripts/build/Install-OpenSSL.ps1 +++ b/images/windows/scripts/build/Install-OpenSSL.ps1 @@ -39,6 +39,6 @@ Install-Binary ` # Update PATH Add-MachinePathItem "$installDir\bin" -$env:Path = Get-MachinePath +Update-Environment Invoke-PesterTests -TestFile "Tools" -TestName "OpenSSL" diff --git a/images/windows/scripts/build/Install-Vcpkg.ps1 b/images/windows/scripts/build/Install-Vcpkg.ps1 index ef93073ac27d..0c138a3bdc65 100644 --- a/images/windows/scripts/build/Install-Vcpkg.ps1 +++ b/images/windows/scripts/build/Install-Vcpkg.ps1 @@ -15,7 +15,7 @@ Invoke-Expression "$InstallDir\$VcpkgExecPath integrate install" # Add vcpkg to system environment Add-MachinePathItem $InstallDir -$env:Path = Get-MachinePath [Environment]::SetEnvironmentVariable("VCPKG_INSTALLATION_ROOT", $InstallDir, "Machine") +Update-Environment Invoke-PesterTests -TestFile "Tools" -TestName "Vcpkg" diff --git a/images/windows/scripts/helpers/ImageHelpers.psm1 b/images/windows/scripts/helpers/ImageHelpers.psm1 index d8d04b9aca73..c3bee64fa9a4 100644 --- a/images/windows/scripts/helpers/ImageHelpers.psm1 +++ b/images/windows/scripts/helpers/ImageHelpers.psm1 @@ -7,19 +7,10 @@ param() . $PSScriptRoot\VisualStudioHelpers.ps1 Export-ModuleMember -Function @( - 'Connect-Hive' - 'Disconnect-Hive' - 'Test-MachinePath' - 'Get-MachinePath' - 'Get-DefaultPath' - 'Set-MachinePath' - 'Set-DefaultPath' + 'Mount-RegistryHive' + 'Dismount-RegistryHive' 'Add-MachinePathItem' 'Add-DefaultPathItem' - 'Add-DefaultItem' - 'Get-SystemVariable' - 'Get-DefaultVariable' - 'Set-DefaultVariable' 'Install-Binary' 'Install-VisualStudio' 'Get-ToolsetContent' @@ -47,8 +38,8 @@ Export-ModuleMember -Function @( 'Get-VisualStudioInstance' 'Get-VisualStudioComponents' 'Get-WindowsUpdateStates' - 'New-ItemPath' 'Use-ChecksumComparison' 'Get-HashFromGitHubReleaseBody' 'Test-FileSignature' + 'Update-Environment' ) diff --git a/images/windows/scripts/helpers/InstallHelpers.ps1 b/images/windows/scripts/helpers/InstallHelpers.ps1 index 036866c2743d..a658d0bd3605 100644 --- a/images/windows/scripts/helpers/InstallHelpers.ps1 +++ b/images/windows/scripts/helpers/InstallHelpers.ps1 @@ -869,3 +869,39 @@ function Test-FileSignature { throw "Signature thumbprint do not match expected." } } + +function Update-Environment { + <# + .SYNOPSIS + Updates the environment variables by reading values from the registry. + + .DESCRIPTION + This function updates current environment by reading values from the registry. + It is useful when you need to update the environment variables without restarting the current session. + + .NOTES + The function requires administrative privileges to modify the system registry. + #> + + $locations = @( + 'HKLM:\SYSTEM\CurrentControlSet\Control\Session Manager\Environment', + 'HKCU:\Environment' + ) + + # Update PATH variable + $pathItems = $locations | ForEach-Object { + (Get-Item $_).GetValue('PATH').Split(';') + } | Select-Object -Unique + $Env:PATH = $pathItems -join ';' + + # Update other variables + $locations | ForEach-Object { + $key = Get-Item $_ + foreach ($name in $key.GetValueNames()) { + $value = $key.GetValue($name) + if (-not ($name -ieq 'PATH')) { + Set-Item -Path Env:$name -Value $value + } + } + } +} diff --git a/images/windows/scripts/helpers/PathHelpers.ps1 b/images/windows/scripts/helpers/PathHelpers.ps1 index ca3a004ac76d..192c8b978187 100644 --- a/images/windows/scripts/helpers/PathHelpers.ps1 +++ b/images/windows/scripts/helpers/PathHelpers.ps1 @@ -1,28 +1,62 @@ -function Connect-Hive { + +function Mount-RegistryHive { + <# + .SYNOPSIS + Mounts a registry hive from a file. + + .DESCRIPTION + The Mount-RegistryHive function loads a registry hive from a specified file into a specified subkey. + + .PARAMETER FileName + The path to the file from which to load the registry hive. + + .PARAMETER SubKey + The registry subkey into which to load the hive. + + .EXAMPLE + Mount-RegistryHive -FileName "C:\Path\To\HiveFile.hiv" -SubKey "HKLM\SubKey" + #> param( - [string]$FileName = "C:\Users\Default\NTUSER.DAT", - [string]$SubKey = "HKLM\DEFAULT" + [Parameter(Mandatory = $true)] + [string]$FileName, + [Parameter(Mandatory = $true)] + [string]$SubKey ) Write-Host "Loading the file $FileName to the Key $SubKey" - if (Test-Path $SubKey.Replace("\",":")) { + if (Test-Path $SubKey.Replace("\", ":")) { + Write-Warning "The key $SubKey is already loaded" return } $result = reg load $SubKey $FileName *>&1 if ($LASTEXITCODE -ne 0) { - Write-Host "Failed to load hive: $result" + Write-Error "Failed to load file $FileName to the key ${SubKey}: $result" exit 1 } } -function Disconnect-Hive { +function Dismount-RegistryHive { + <# + .SYNOPSIS + Dismounts a registry hive. + + .DESCRIPTION + The Dismount-RegistryHive function unloads a registry hive from a specified subkey. + + .PARAMETER SubKey + The registry subkey from which to unload the hive. + + .EXAMPLE + Dismount-RegistryHive -SubKey "HKLM\SubKey" + #> param( - [string]$SubKey = "HKLM\DEFAULT" + [Parameter(Mandatory = $true)] + [string]$SubKey ) Write-Host "Unloading the hive $SubKey" - if (-not (Test-Path $SubKey.Replace("\",":"))) { + if (-not (Test-Path $SubKey.Replace("\", ":"))) { return } @@ -33,123 +67,72 @@ function Disconnect-Hive { } } -function Get-SystemVariable { - param( - [string]$SystemVariable - ) - - [System.Environment]::GetEnvironmentVariable($SystemVariable, "Machine") -} - -function Get-DefaultVariable { - param( - [string]$DefaultVariable, - [string]$Name = "DEFAULT\Environment", - [bool]$Writable = $false - ) - - $key = [Microsoft.Win32.Registry]::LocalMachine.OpenSubKey($Name, $Writable) - $key.GetValue($DefaultVariable, "", "DoNotExpandEnvironmentNames") - $key.Handle.Close() - [System.GC]::Collect() -} - -function Set-DefaultVariable { - param( - [string]$DefaultVariable, - [string]$Value, - [string]$Name = "DEFAULT\Environment", - [string]$Kind = "ExpandString", - [bool]$Writable = $true - ) +function Add-MachinePathItem { + <# + .SYNOPSIS + Adds a new item to the machine-level PATH environment variable. - $key = [Microsoft.Win32.Registry]::LocalMachine.OpenSubKey($Name, $Writable) - $key.SetValue($DefaultVariable, $Value, $Kind) - Get-DefaultVariable -DefaultVariable $DefaultVariable -Name $Name - $key.Handle.Close() - [System.GC]::Collect() -} + .DESCRIPTION + The Add-MachinePathItem function adds a new item to the machine-level PATH environment variable. + It takes a string parameter, $PathItem, which represents the new item to be added to the PATH. -function Get-MachinePath { - Get-SystemVariable PATH -} + .PARAMETER PathItem + Specifies the new item to be added to the machine-level PATH environment variable. -function Get-DefaultPath { - Get-DefaultVariable Path -} + .EXAMPLE + Add-MachinePathItem -PathItem "C:\Program Files\MyApp" -function Set-MachinePath { - param( - [string]$NewPath - ) - - [System.Environment]::SetEnvironmentVariable("PATH", $NewPath, "Machine") -} + This example adds "C:\Program Files\MyApp" to the machine-level PATH environment variable. + #> -function Set-DefaultPath { param( - [string]$NewPath + [Parameter(Mandatory = $true)] + [string]$PathItem ) - Set-DefaultVariable PATH $NewPath + $currentPath = [System.Environment]::GetEnvironmentVariable("PATH", "Machine") + $newPath = $PathItem + ';' + $currentPath + [System.Environment]::SetEnvironmentVariable("PATH", $newPath, "Machine") } -function Test-MachinePath { - param( - [string]$PathItem - ) +function Add-DefaultPathItem { + <# + .SYNOPSIS + Adds a path item to the default user profile path. - $pathItems = (Get-MachinePath).Split(';') - $pathItems.Contains($PathItem) -} + .DESCRIPTION + This function adds a specified path item to the default user profile path. + It mounts the NTUSER.DAT file of the default user to the registry, + retrieves the current value of the "Path" environment variable, + appends the new path item to it, and updates the registry with the modified value. -function Add-MachinePathItem { - param( - [string]$PathItem - ) + .PARAMETER PathItem + The path item to be added to the default user profile path. - $currentPath = Get-MachinePath - $newPath = $PathItem + ';' + $currentPath - Set-MachinePath -NewPath $newPath -} + .EXAMPLE + Add-DefaultPathItem -PathItem "C:\Program Files\MyApp" -function Add-DefaultPathItem { - param( - [string]$PathItem - ) + This example adds "C:\Program Files\MyApp" to the default user profile path. - Connect-Hive - $currentPath = Get-DefaultPath - $newPath = $PathItem + ';' + $currentPath - Set-DefaultPath -NewPath $newPath - Disconnect-Hive -} + .NOTES + This function requires administrative privileges to modify the Windows registry. + #> -function Add-DefaultItem { param( - [string]$DefaultVariable, - [string]$Value, - [string]$Name = "DEFAULT\Environment", - [string]$Kind = "ExpandString", - [bool]$Writable = $true + [Parameter(Mandatory = $true)] + [string]$PathItem ) - Connect-Hive - $regPath = Join-Path "HKLM:\" $Name - if (-not (Test-Path $Name)) { - Write-Host "Creating $regPath key" - New-Item -Path $regPath -Force | Out-Null - } - Set-DefaultVariable -DefaultVariable $DefaultVariable -Value $Value -Name $Name -Kind $Kind -Writable $Writable - Disconnect-Hive -} + Mount-RegistryHive ` + -FileName "C:\Users\Default\NTUSER.DAT" ` + -SubKey "HKLM\DEFAULT" -function New-ItemPath { - param ( - [string]$Path - ) + $key = [Microsoft.Win32.Registry]::LocalMachine.OpenSubKey("DEFAULT\Environment", $true) + $currentValue = $key.GetValue("Path", "", "DoNotExpandEnvironmentNames") + $updatedValue = $PathItem + ';' + $currentValue + $key.SetValue("Path", $updatedValue, "ExpandString") + $key.Handle.Close() + [System.GC]::Collect() - if (-not (Test-Path $Path)) { - New-Item -Path $Path -Force -ErrorAction Ignore | Out-Null - } + Dismount-RegistryHive "HKLM\DEFAULT" } diff --git a/images/windows/scripts/helpers/test/PathHelpers.Tests.ps1 b/images/windows/scripts/helpers/test/PathHelpers.Tests.ps1 deleted file mode 100644 index bdbbb2aa0d68..000000000000 --- a/images/windows/scripts/helpers/test/PathHelpers.Tests.ps1 +++ /dev/null @@ -1,27 +0,0 @@ -. $PSScriptRoot\..\PathHelpers.ps1 - -Describe 'Test-MachinePath Tests' { - Mock Get-MachinePath {return "C:\foo;C:\bar"} - It 'Path contains item' { - Test-MachinePath -PathItem "C:\foo" | Should Be $true - } - It 'Path does not containe item' { - Test-MachinePath -PathItem "C:\baz" | Should Be $false - } -} - -Describe 'Set-MachinePath Tests' { - Mock Get-MachinePath {return "C:\foo;C:\bar"} - Mock Set-ItemProperty {return} - It 'Set-MachinePath should return new path' { - Set-MachinePath -NewPath "C:\baz" | Should Be "C:\baz" - } -} - -Describe "Add-MachinePathItem Tests"{ - Mock Get-MachinePath {return "C:\foo;C:\bar"} - Mock Set-ItemProperty {return} - It 'Add-MachinePathItem should return complete path' { - Add-MachinePathItem -PathItem 'C:\baz' | Should Be 'C:\baz;C:\foo;C:\bar' - } -} diff --git a/images/windows/scripts/tests/Helpers.psm1 b/images/windows/scripts/tests/Helpers.psm1 index 0ec1e6ad876d..0f00198d85d5 100644 --- a/images/windows/scripts/tests/Helpers.psm1 +++ b/images/windows/scripts/tests/Helpers.psm1 @@ -6,18 +6,6 @@ function Get-EnvironmentVariable($variable) { return [System.Environment]::GetEnvironmentVariable($variable, "Machine") } -# Update environment variables without reboot -function Update-Environment { - $variables = [Environment]::GetEnvironmentVariables("Machine") - $variables.Keys | ForEach-Object { - $key = $_ - $value = $variables[$key] - Set-Item -Path "env:$key" -Value $value - } - # We need to refresh PATH the latest one because it could include other variables "%M2_HOME%/bin" - $env:PATH = [Environment]::GetEnvironmentVariable("PATH", "Machine") -} - function Invoke-PesterTests { <# .SYNOPSIS From 7dba8776df7cf9175f5fe791f692eafcfc3f80cd Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Wed, 29 Nov 2023 13:02:29 +0100 Subject: [PATCH 2489/3485] [Windows] Rename and refactor downloading function (#8906) --- .../scripts/build/Install-ActionsCache.ps1 | 2 +- .../scripts/build/Install-AliyunCli.ps1 | 2 +- .../scripts/build/Install-AndroidSDK.ps1 | 2 +- .../build/Install-BizTalkBuildComponent.ps1 | 7 +- .../scripts/build/Install-Chocolatey.ps1 | 2 +- .../windows/scripts/build/Install-Chrome.ps1 | 2 +- .../scripts/build/Install-CloudFoundryCli.ps1 | 3 +- .../scripts/build/Install-CodeQLBundle.ps1 | 2 +- .../windows/scripts/build/Install-Docker.ps1 | 4 +- .../scripts/build/Install-DockerCompose.ps1 | 2 +- .../scripts/build/Install-DockerWinCred.ps1 | 2 +- .../scripts/build/Install-DotnetSDK.ps1 | 32 ++++----- .../scripts/build/Install-EdgeDriver.ps1 | 43 +++++------- .../windows/scripts/build/Install-Firefox.ps1 | 4 +- .../windows/scripts/build/Install-Haskell.ps1 | 2 +- .../scripts/build/Install-IEWebDriver.ps1 | 9 +-- .../scripts/build/Install-JavaTools.ps1 | 4 +- .../windows/scripts/build/Install-Kotlin.ps1 | 6 +- .../scripts/build/Install-KubernetesTools.ps1 | 2 +- .../windows/scripts/build/Install-Mingw64.ps1 | 4 +- .../windows/scripts/build/Install-Msys2.ps1 | 2 +- images/windows/scripts/build/Install-PyPy.ps1 | 2 +- images/windows/scripts/build/Install-Ruby.ps1 | 2 +- .../windows/scripts/build/Install-Runner.ps1 | 3 +- images/windows/scripts/build/Install-Rust.ps1 | 2 +- .../scripts/build/Install-Selenium.ps1 | 5 +- .../windows/scripts/build/Install-Stack.ps1 | 2 +- .../windows/scripts/build/Install-Toolset.ps1 | 2 +- images/windows/scripts/build/Install-Zstd.ps1 | 2 +- .../windows/scripts/helpers/ImageHelpers.psm1 | 2 +- .../scripts/helpers/InstallHelpers.ps1 | 69 ++++++++++--------- .../scripts/helpers/VisualStudioHelpers.ps1 | 6 +- 32 files changed, 105 insertions(+), 130 deletions(-) diff --git a/images/windows/scripts/build/Install-ActionsCache.ps1 b/images/windows/scripts/build/Install-ActionsCache.ps1 index 95d5665ffb56..70f50588407c 100644 --- a/images/windows/scripts/build/Install-ActionsCache.ps1 +++ b/images/windows/scripts/build/Install-ActionsCache.ps1 @@ -15,7 +15,7 @@ $downloadUrl = Resolve-GithubReleaseAssetUrl ` -Asset "action-versions.zip" Write-Host "Download Latest action-versions archive from $downloadUrl" -$actionVersionsArchivePath = Start-DownloadWithRetry -Url $downloadUrl -Name "action-versions.zip" +$actionVersionsArchivePath = Invoke-DownloadWithRetry $downloadUrl Write-Host "Expand action-versions archive" Expand-7ZipArchive -Path $actionVersionsArchivePath -DestinationPath $env:ACTIONS_RUNNER_ACTION_ARCHIVE_CACHE diff --git a/images/windows/scripts/build/Install-AliyunCli.ps1 b/images/windows/scripts/build/Install-AliyunCli.ps1 index a3967fba173f..29463fdd9b98 100644 --- a/images/windows/scripts/build/Install-AliyunCli.ps1 +++ b/images/windows/scripts/build/Install-AliyunCli.ps1 @@ -9,7 +9,7 @@ $repoUrl = "https://api.github.com/repos/aliyun/aliyun-cli/releases/latest" $installerFileName = "aliyun-cli-windows" $assets = (Invoke-RestMethod -Uri $repoUrl).assets $downloadUrl = ($assets.browser_download_url -ilike "*aliyun-cli-windows-*-amd64.zip*") | Select-Object -First 1 -$packagePath = Start-DownloadWithRetry -Url $downloadUrl -Name "$installerFileName.zip" +$packagePath = Invoke-DownloadWithRetry $downloadUrl #region Supply chain security - Alibaba Cloud CLI $fileHash = (Get-FileHash -Path $packagePath -Algorithm SHA256).Hash diff --git a/images/windows/scripts/build/Install-AndroidSDK.ps1 b/images/windows/scripts/build/Install-AndroidSDK.ps1 index 834e9f052db4..32eb14287703 100644 --- a/images/windows/scripts/build/Install-AndroidSDK.ps1 +++ b/images/windows/scripts/build/Install-AndroidSDK.ps1 @@ -61,7 +61,7 @@ $androidToolset = (Get-ToolsetContent).android # Newer version(s) require Java 11 by default # See https://github.com/actions/runner-images/issues/6960 $cmdlineToolsUrl = $androidToolset.commandline_tools_url -$cmdlineToolsArchPath = Start-DownloadWithRetry -Url $cmdlineToolsUrl -Name "cmdline-tools.zip" +$cmdlineToolsArchPath = Invoke-DownloadWithRetry $cmdlineToolsUrl #region Supply chain security $localFileHash = (Get-FileHash -Path $cmdlineToolsArchPath -Algorithm SHA256).Hash diff --git a/images/windows/scripts/build/Install-BizTalkBuildComponent.ps1 b/images/windows/scripts/build/Install-BizTalkBuildComponent.ps1 index ea48c2a33e95..8bfc6b13d4fd 100644 --- a/images/windows/scripts/build/Install-BizTalkBuildComponent.ps1 +++ b/images/windows/scripts/build/Install-BizTalkBuildComponent.ps1 @@ -7,13 +7,13 @@ $BuildComponentUri = "https://aka.ms/BuildComponentSetup.EN" $BuildComponentSignatureThumbprint = "8740DF4ACB749640AD318E4BE842F72EC651AD80" Write-Host "Downloading BizTalk Project Build Component archive..." -$setupZipFile = Start-DownloadWithRetry -Url $BuildComponentUri -Name "BuildComponentSetup.EN.zip" +$zipFile = Invoke-DownloadWithRetry $BuildComponentUri $setupPath = Join-Path $env:TEMP "BizTalkBuildComponent" if (-not (Test-Path -Path $setupPath)) { $null = New-Item -Path $setupPath -ItemType Directory -Force } -Expand-7ZipArchive -Path $setupZipFile -DestinationPath $setupPath +Expand-7ZipArchive -Path $zipFile -DestinationPath $setupPath Write-Host "Installing BizTalk Project Build Component..." Install-Binary ` @@ -25,7 +25,4 @@ Install-Binary ` -ExtraInstallArgs ("/l*v", "$setupPath\buildComponentSetup.log") ` -ExpectedSignature $BuildComponentSignatureThumbprint -Remove-Item $setupZipFile -Remove-Item $setupPath -Recurse -Force - Invoke-PesterTests -TestFile "BizTalk" -TestName "BizTalk Build Component Setup" diff --git a/images/windows/scripts/build/Install-Chocolatey.ps1 b/images/windows/scripts/build/Install-Chocolatey.ps1 index afd481b8aea5..c3b2feffc268 100644 --- a/images/windows/scripts/build/Install-Chocolatey.ps1 +++ b/images/windows/scripts/build/Install-Chocolatey.ps1 @@ -24,7 +24,7 @@ if ($userPath) { # Verify and run choco installer $signatureThumbprint = "83AC7D88C66CB8680BCE802E0F0F5C179722764B" -$InstallScriptPath = Start-DownloadWithRetry -Url 'https://chocolatey.org/install.ps1' +$InstallScriptPath = Invoke-DownloadWithRetry 'https://chocolatey.org/install.ps1' Test-FileSignature -FilePath $InstallScriptPath -ExpectedThumbprint $signatureThumbprint Invoke-Expression $InstallScriptPath diff --git a/images/windows/scripts/build/Install-Chrome.ps1 b/images/windows/scripts/build/Install-Chrome.ps1 index e07920ffb59d..52cd2a5ea775 100644 --- a/images/windows/scripts/build/Install-Chrome.ps1 +++ b/images/windows/scripts/build/Install-Chrome.ps1 @@ -72,7 +72,7 @@ Write-Host "Chrome WebDriver version to install is $($ChromeDriverVersion.versio $ChromeDriverZipDownloadUrl = ($ChromeDriverVersion.downloads.chromedriver | Where-Object platform -eq "win64").url Write-Host "Download Chrome WebDriver from $ChromeDriverZipDownloadUrl..." -$ChromeDriverArchPath = Start-DownloadWithRetry -Url $ChromeDriverZipDownloadUrl +$ChromeDriverArchPath = Invoke-DownloadWithRetry $ChromeDriverZipDownloadUrl Write-Host "Expand Chrome WebDriver archive (without using directory names)..." Expand-7ZipArchive -Path $ChromeDriverArchPath -DestinationPath $ChromeDriverPath -ExtractMethod "e" diff --git a/images/windows/scripts/build/Install-CloudFoundryCli.ps1 b/images/windows/scripts/build/Install-CloudFoundryCli.ps1 index 8a806cd26ddc..f989a63bb5c3 100644 --- a/images/windows/scripts/build/Install-CloudFoundryCli.ps1 +++ b/images/windows/scripts/build/Install-CloudFoundryCli.ps1 @@ -4,10 +4,9 @@ ################################################################################ # Download the latest cf cli exe -$CloudFoundryCliName = "cf-cli.zip" $CloudFoundryCliUrl = "https://packages.cloudfoundry.org/stable?release=windows64-exe&source=github" -$CloudFoundryArchPath = Start-DownloadWithRetry -Url $CloudFoundryCliUrl -Name $CloudFoundryCliName +$CloudFoundryArchPath = Invoke-DownloadWithRetry $CloudFoundryCliUrl # Create directory for cf cli $CloudFoundryCliPath = "C:\cf-cli" diff --git a/images/windows/scripts/build/Install-CodeQLBundle.ps1 b/images/windows/scripts/build/Install-CodeQLBundle.ps1 index 381496a501ae..5a29fb7dd567 100644 --- a/images/windows/scripts/build/Install-CodeQLBundle.ps1 +++ b/images/windows/scripts/build/Install-CodeQLBundle.ps1 @@ -11,7 +11,7 @@ $TagName = "codeql-bundle-v" + $CliVersion Write-Host "Downloading CodeQL bundle $($CliVersion)..." # Note that this is the all-platforms CodeQL bundle, to support scenarios where customers run # different operating systems within containers. -$CodeQLBundlePath = Start-DownloadWithRetry -Url "https://github.com/github/codeql-action/releases/download/$($TagName)/codeql-bundle.tar.gz" -Name "codeql-bundle.tar.gz" +$CodeQLBundlePath = Invoke-DownloadWithRetry "https://github.com/github/codeql-action/releases/download/$($TagName)/codeql-bundle.tar.gz" $DownloadDirectoryPath = (Get-Item $CodeQLBundlePath).Directory.FullName $CodeQLToolcachePath = Join-Path $Env:AGENT_TOOLSDIRECTORY -ChildPath "CodeQL" | Join-Path -ChildPath $CliVersion | Join-Path -ChildPath "x64" diff --git a/images/windows/scripts/build/Install-Docker.ps1 b/images/windows/scripts/build/Install-Docker.ps1 index 5b2c9e734ab8..fb6ad34b8723 100644 --- a/images/windows/scripts/build/Install-Docker.ps1 +++ b/images/windows/scripts/build/Install-Docker.ps1 @@ -21,14 +21,14 @@ if (-not $mobyRelease) { $mobyReleaseUrl = $dockerceUrl + $mobyRelease Write-Host "Install Moby $mobyRelease..." -$mobyArchivePath = Start-DownloadWithRetry -Url $mobyReleaseUrl -Name $mobyRelease +$mobyArchivePath = Invoke-DownloadWithRetry $mobyReleaseUrl Expand-Archive -Path $mobyArchivePath -DestinationPath $env:TEMP $dockerPath = "$env:TEMP\docker\docker.exe" $dockerdPath = "$env:TEMP\docker\dockerd.exe" Write-Host "Install Docker CE" $instScriptUrl = "https://raw.githubusercontent.com/microsoft/Windows-Containers/Main/helpful_tools/Install-DockerCE/install-docker-ce.ps1" -$instScriptPath = Start-DownloadWithRetry -Url $instScriptUrl -Name "install-docker-ce.ps1" +$instScriptPath = Invoke-DownloadWithRetry $instScriptUrl & $instScriptPath -DockerPath $dockerPath -DockerDPath $dockerdPath if ($LastExitCode -ne 0) { Write-Host "Docker installation failed with exit code $LastExitCode" diff --git a/images/windows/scripts/build/Install-DockerCompose.ps1 b/images/windows/scripts/build/Install-DockerCompose.ps1 index 915aed715a71..ff982f32a9dd 100644 --- a/images/windows/scripts/build/Install-DockerCompose.ps1 +++ b/images/windows/scripts/build/Install-DockerCompose.ps1 @@ -12,6 +12,6 @@ Write-Host "Install-Package Docker-Compose v2" $dockerComposev2Url = "https://github.com/docker/compose/releases/latest/download/docker-compose-windows-x86_64.exe" $cliPluginsDir = "C:\ProgramData\docker\cli-plugins" New-Item -Path $cliPluginsDir -ItemType Directory -Start-DownloadWithRetry -Url $dockerComposev2Url -Name docker-compose.exe -DownloadPath $cliPluginsDir +Invoke-DownloadWithRetry -Url $dockerComposev2Url -Path "$cliPluginsDir\docker-compose.exe" Invoke-PesterTests -TestFile "Docker" -TestName "DockerCompose" diff --git a/images/windows/scripts/build/Install-DockerWinCred.ps1 b/images/windows/scripts/build/Install-DockerWinCred.ps1 index a1d764becc4e..127d4e488154 100644 --- a/images/windows/scripts/build/Install-DockerWinCred.ps1 +++ b/images/windows/scripts/build/Install-DockerWinCred.ps1 @@ -19,7 +19,7 @@ function Get-DockerWincredHash { Write-Host "Install docker-wincred" $dockerCredLatestRelease = Invoke-RestMethod -Uri "https://api.github.com/repos/docker/docker-credential-helpers/releases/latest" $dockerCredDownloadUrl = $dockerCredLatestRelease.assets.browser_download_url -match "docker-credential-wincred-.+\.exe" | Select-Object -First 1 -Start-DownloadWithRetry -Url $dockerCredDownloadUrl -DownloadPath "C:\Windows\System32" -Name "docker-credential-wincred.exe" +Invoke-DownloadWithRetry -Url $dockerCredDownloadUrl -Path "C:\Windows\System32\docker-credential-wincred.exe" #region Supply chain security $distributor_file_hash = Get-DockerWincredHash -Release $dockerCredLatestRelease.name diff --git a/images/windows/scripts/build/Install-DotnetSDK.ps1 b/images/windows/scripts/build/Install-DotnetSDK.ps1 index f47fbe370713..3eb9461bd780 100644 --- a/images/windows/scripts/build/Install-DotnetSDK.ps1 +++ b/images/windows/scripts/build/Install-DotnetSDK.ps1 @@ -16,22 +16,21 @@ function Get-SDKVersionsToInstall ( $DotnetVersion ) { - $releaseJson = "https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/${DotnetVersion}/releases.json" - $releasesJsonPath = Start-DownloadWithRetry -Url $releaseJson -Name "releases-${DotnetVersion}.json" - $currentReleases = Get-Content -Path $releasesJsonPath | ConvertFrom-Json + $metadataJsonUri = "https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/${DotnetVersion}/releases.json" + $currentReleases = Invoke-DownloadWithRetry $metadataJsonUri | Get-Item | Get-Content | ConvertFrom-Json # filtering out the preview/rc releases $currentReleases = $currentReleases.'releases' | Where-Object { !$_.'release-version'.Contains('-') } $sdks = @() - ForEach ($release in $currentReleases) - { + ForEach ($release in $currentReleases) { $sdks += $release.'sdk' $sdks += $release.'sdks' } - return $sdks.version | Sort-Object { [Version] $_ } -Unique ` - | Group-Object { $_.Substring(0, $_.LastIndexOf('.') + 2) } ` - | Foreach-Object { $_.Group[-1] } + return $sdks.version ` + | Sort-Object { [Version] $_ } -Unique ` + | Group-Object { $_.Substring(0, $_.LastIndexOf('.') + 2) } ` + | Foreach-Object { $_.Group[-1] } } function Invoke-Warmup ( @@ -55,23 +54,19 @@ function InstallSDKVersion ( $SdkVersion, $dotnetVersion, $Warmup -) -{ - if (!(Test-Path -Path "C:\Program Files\dotnet\sdk\$sdkVersion")) - { +) { + if (!(Test-Path -Path "C:\Program Files\dotnet\sdk\$sdkVersion")) { Write-Host "Installing dotnet $sdkVersion" $ZipPath = [System.IO.Path]::combine([System.IO.Path]::GetTempPath(), [System.IO.Path]::GetRandomFileName()) .\dotnet-install.ps1 -Version $sdkVersion -InstallDir $(Join-Path -Path $env:ProgramFiles -ChildPath 'dotnet') -ZipPath $ZipPath -KeepZip #region Supply chain security - $distributorFileHash = (Invoke-RestMethod -Uri "https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/$dotnetVersion/releases.json").releases.sdks.Where({$_.version -eq $SdkVersion}).files.Where({ $_.name -eq 'dotnet-sdk-win-x64.zip'}).hash + $distributorFileHash = (Invoke-RestMethod -Uri "https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/$dotnetVersion/releases.json").releases.sdks.Where({ $_.version -eq $SdkVersion }).files.Where({ $_.name -eq 'dotnet-sdk-win-x64.zip' }).hash $localFileHash = (Get-FileHash -Path $ZipPath -Algorithm 'SHA512').Hash Use-ChecksumComparison -LocalFileHash $localFileHash -DistributorFileHash $distributorFileHash #endregion - } - else - { + } else { Write-Host "Sdk version $sdkVersion already installed" } @@ -80,8 +75,7 @@ function InstallSDKVersion ( } } -function InstallAllValidSdks() -{ +function InstallAllValidSdks() { # Consider all channels except preview/eol channels. # Sort the channels in ascending order $dotnetToolset = (Get-ToolsetContent).dotnet @@ -91,7 +85,7 @@ function InstallAllValidSdks() # Download installation script. $installationName = "dotnet-install.ps1" $installationUrl = "https://dot.net/v1/${installationName}" - Start-DownloadWithRetry -Url $installationUrl -Name $installationName -DownloadPath ".\" + Invoke-DownloadWithRetry -Url $installationUrl -Path ".\$installationName" ForEach ($dotnetVersion in $dotnetVersions) { diff --git a/images/windows/scripts/build/Install-EdgeDriver.ps1 b/images/windows/scripts/build/Install-EdgeDriver.ps1 index 5eacdf463632..a4a4223c02f5 100644 --- a/images/windows/scripts/build/Install-EdgeDriver.ps1 +++ b/images/windows/scripts/build/Install-EdgeDriver.ps1 @@ -6,43 +6,32 @@ # Disable Edge auto-updates Rename-Item -Path "C:\Program Files (x86)\Microsoft\EdgeUpdate\MicrosoftEdgeUpdate.exe" -NewName "Disabled_MicrosoftEdgeUpdate.exe" -ErrorAction Stop -# Install Microsoft Edge WebDriver -Write-Host "Install Edge WebDriver..." -$EdgeDriverPath = "$($env:SystemDrive)\SeleniumWebDrivers\EdgeDriver" -if (-not (Test-Path -Path $EdgeDriverPath)) { - New-Item -Path $EdgeDriverPath -ItemType Directory -Force -} - Write-Host "Get the Microsoft Edge WebDriver version..." -$RegistryPath = "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths" -$EdgePath = (Get-ItemProperty "$RegistryPath\msedge.exe").'(default)' -[version]$EdgeVersion = [System.Diagnostics.FileVersionInfo]::GetVersionInfo($EdgePath).ProductVersion -$EdgeDriverVersionUrl = "https://msedgedriver.azureedge.net/LATEST_RELEASE_$($EdgeVersion.Major)_WINDOWS" - -$EdgeDriverVersionFile = Start-DownloadWithRetry -Url $EdgeDriverVersionUrl -Name "versioninfo.txt" -DownloadPath $EdgeDriverPath - -Write-Host "Download Microsoft Edge WebDriver..." -$EdgeDriverLatestVersion = Get-Content -Path $EdgeDriverVersionFile -$EdgeDriverArchName = "edgedriver_win64.zip" +$edgeBinaryPath = (Get-ItemProperty "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\msedge.exe").'(default)' +[version] $edgeVersion = [System.Diagnostics.FileVersionInfo]::GetVersionInfo($edgeBinaryPath).ProductVersion +$edgeDriverPath = "$($env:SystemDrive)\SeleniumWebDrivers\EdgeDriver" +if (-not (Test-Path -Path $edgeDriverPath)) { + New-Item -Path $edgeDriverPath -ItemType Directory -Force +} -$EdgeDriverDownloadUrl = "https://msedgedriver.azureedge.net/${EdgeDriverLatestVersion}/${EdgeDriverArchName}" +$versionInfoUrl = "https://msedgedriver.azureedge.net/LATEST_RELEASE_$($edgeVersion.Major)_WINDOWS" +$versionInfoFile = Invoke-DownloadWithRetry -Url $versionInfoUrl -Path "$edgeDriverPath\versioninfo.txt" +$latestVersion = Get-Content -Path $versionInfoFile -$EdgeDriverArchPath = Start-DownloadWithRetry -Url $EdgeDriverDownloadUrl -Name $EdgeDriverArchName +Write-Host "Download Microsoft Edge WebDriver..." +$downloadUrl = "https://msedgedriver.azureedge.net/$latestVersion/edgedriver_win64.zip" +$archivePath = Invoke-DownloadWithRetry $downloadUrl Write-Host "Expand Microsoft Edge WebDriver archive..." -Expand-7ZipArchive -Path $EdgeDriverArchPath -DestinationPath $EdgeDriverPath +Expand-7ZipArchive -Path $archivePath -DestinationPath $edgeDriverPath #Validate the EdgeDriver signature -$EdgeDriverSignatureThumbprint = "CB9C4FBEA1D87D2D468AC5A9CAAB0163F6AD8401" -Test-FileSignature -FilePath "$EdgeDriverPath\msedgedriver.exe" -ExpectedThumbprint $EdgeDriverSignatureThumbprint +$signatureThumbprint = "CB9C4FBEA1D87D2D468AC5A9CAAB0163F6AD8401" +Test-FileSignature -FilePath "$edgeDriverPath\msedgedriver.exe" -ExpectedThumbprint $signatureThumbprint Write-Host "Setting the environment variables..." [Environment]::SetEnvironmentVariable("EdgeWebDriver", $EdgeDriverPath, "Machine") - -$regEnvKey = 'HKLM:\SYSTEM\CurrentControlSet\Control\Session Manager\Environment\' -$PathValue = Get-ItemPropertyValue -Path $regEnvKey -Name 'Path' -$PathValue += ";$EdgeDriverPath\" -Set-ItemProperty -Path $regEnvKey -Name 'Path' -Value $PathValue +Add-MachinePathItem "$edgeDriverPath\" Invoke-PesterTests -TestFile "Browsers" -TestName "Edge" diff --git a/images/windows/scripts/build/Install-Firefox.ps1 b/images/windows/scripts/build/Install-Firefox.ps1 index d4fbe0bdf6a7..66e6d443c3d0 100644 --- a/images/windows/scripts/build/Install-Firefox.ps1 +++ b/images/windows/scripts/build/Install-Firefox.ps1 @@ -42,10 +42,8 @@ $GeckoDriverVersion = $GeckoDriverJson.tag_name $GeckoDriverVersion.Substring(1) | Out-File -FilePath "$GeckoDriverPath\versioninfo.txt" -Force; Write-Host "Download Gecko WebDriver WebDriver..." -$GeckoDriverArchName = $GeckoDriverWindowsAsset.name $GeckoDriverDownloadUrl = $GeckoDriverWindowsAsset.browser_download_url - -$GeckoDriverArchPath = Start-DownloadWithRetry -Url $GeckoDriverDownloadUrl -Name $GeckoDriverArchName +$GeckoDriverArchPath = Invoke-DownloadWithRetry $GeckoDriverDownloadUrl Write-Host "Expand Gecko WebDriver archive..." Expand-7ZipArchive -Path $GeckoDriverArchPath -DestinationPath $GeckoDriverPath diff --git a/images/windows/scripts/build/Install-Haskell.ps1 b/images/windows/scripts/build/Install-Haskell.ps1 index 00264461671e..ba0219be5346 100644 --- a/images/windows/scripts/build/Install-Haskell.ps1 +++ b/images/windows/scripts/build/Install-Haskell.ps1 @@ -20,7 +20,7 @@ $ghcupDownloadURL = "https://downloads.haskell.org/~ghcup/x86_64-mingw64-ghcup.e New-Item -Path "$ghcupPrefix\ghcup" -ItemType 'directory' -ErrorAction SilentlyContinue | Out-Null New-Item -Path "$ghcupPrefix\ghcup\bin" -ItemType 'directory' -ErrorAction SilentlyContinue | Out-Null -Start-DownloadWithRetry -Url $ghcupDownloadURL -Name "ghcup.exe" -DownloadPath "$ghcupPrefix\ghcup\bin" +Invoke-DownloadWithRetry -Url $ghcupDownloadURL -Path "$ghcupPrefix\ghcup\bin\ghcup.exe" [System.Environment]::SetEnvironmentVariable("GHCUP_INSTALL_BASE_PREFIX", $ghcupPrefix, "Machine") [System.Environment]::SetEnvironmentVariable("GHCUP_MSYS2", $msysPath, "Machine") diff --git a/images/windows/scripts/build/Install-IEWebDriver.ps1 b/images/windows/scripts/build/Install-IEWebDriver.ps1 index 79c0c6cdde39..32dd00ccd5d8 100644 --- a/images/windows/scripts/build/Install-IEWebDriver.ps1 +++ b/images/windows/scripts/build/Install-IEWebDriver.ps1 @@ -10,13 +10,8 @@ $ieDriverUrl = Resolve-GithubReleaseAssetUrl ` -Asset "IEDriverServer_x64_*.zip" # Download IE selenium driver -try { - Write-Host "Selenium IEDriverServer download and install..." - $driverZipFile = Start-DownloadWithRetry -Url $ieDriverUrl -Name "SeleniumWebDrivers.zip" -} catch { - Write-Error "[!] Failed to download $ieDriverUrl" - exit 1 -} +Write-Host "Selenium IEDriverServer download and install..." +$driverZipFile = Invoke-DownloadWithRetry $ieDriverUrl $ieDriverPath = "C:\SeleniumWebDrivers\IEDriver" if (-not (Test-Path -Path $ieDriverPath)) { diff --git a/images/windows/scripts/build/Install-JavaTools.ps1 b/images/windows/scripts/build/Install-JavaTools.ps1 index 1b9e34d70c8e..5769f38fffee 100644 --- a/images/windows/scripts/build/Install-JavaTools.ps1 +++ b/images/windows/scripts/build/Install-JavaTools.ps1 @@ -63,7 +63,7 @@ function Install-JavaJDK { # Download and extract java binaries to temporary folder $downloadUrl = $asset.binary.package.link - $archivePath = Start-DownloadWithRetry -Url $downloadUrl -Name $([IO.Path]::GetFileName($downloadUrl)) + $archivePath = Invoke-DownloadWithRetry $downloadUrl #region Supply chain security - JDK $fileHash = (Get-FileHash -Path $archivePath -Algorithm SHA256).Hash @@ -137,7 +137,7 @@ $uri = 'https://repo1.maven.org/maven2/net/sourceforge/cobertura/cobertura/2.1.1 $sha256sum = '79479DDE416B082F38ECD1F2F7C6DEBD4D0C2249AF80FD046D1CE05D628F2EC6' $coberturaPath = "C:\cobertura-2.1.1" -$archivePath = Start-DownloadWithRetry -Url $uri -Name "cobertura.zip" +$archivePath = Invoke-DownloadWithRetry $uri $fileHash = (Get-FileHash -Path $archivePath -Algorithm SHA256).Hash Use-ChecksumComparison $fileHash $sha256sum Expand-7ZipArchive -Path $archivePath -DestinationPath "C:\" diff --git a/images/windows/scripts/build/Install-Kotlin.ps1 b/images/windows/scripts/build/Install-Kotlin.ps1 index daeba32469d1..9d848abfabc0 100644 --- a/images/windows/scripts/build/Install-Kotlin.ps1 +++ b/images/windows/scripts/build/Install-Kotlin.ps1 @@ -11,17 +11,17 @@ $kotlinDownloadUrl = Resolve-GithubReleaseAssetUrl ` -Repo "JetBrains/kotlin" ` -Version $kotlinVersion ` -Asset "kotlin-compiler-*.zip" -$kotlinInstallerPath = Start-DownloadWithRetry -Url $kotlinDownloadUrl -Name "kotlin-compiler.zip" +$kotlinArchivePath = Invoke-DownloadWithRetry $kotlinDownloadUrl #region Supply chain security -$fileHash = (Get-FileHash -Path $kotlinInstallerPath -Algorithm SHA256).Hash +$fileHash = (Get-FileHash -Path $kotlinArchivePath -Algorithm SHA256).Hash $externalHash = Get-HashFromGitHubReleaseBody -RepoOwner "JetBrains" -RepoName "kotlin" -FileName "$kotlinBinaryName-*.zip" -Version $kotlinVersion -WordNumber 2 Use-ChecksumComparison $fileHash $externalHash #endregion Write-Host "Expand Kotlin archive" $kotlinPath = "C:\tools" -Expand-7ZipArchive -Path $kotlinInstallerPath -DestinationPath $kotlinPath +Expand-7ZipArchive -Path $kotlinArchivePath -DestinationPath $kotlinPath # Add to PATH Add-MachinePathItem "$kotlinPath\kotlinc\bin" diff --git a/images/windows/scripts/build/Install-KubernetesTools.ps1 b/images/windows/scripts/build/Install-KubernetesTools.ps1 index 5126ba52c47e..1e82244dc30e 100644 --- a/images/windows/scripts/build/Install-KubernetesTools.ps1 +++ b/images/windows/scripts/build/Install-KubernetesTools.ps1 @@ -11,7 +11,7 @@ $assets = (Invoke-RestMethod -Uri $repoUrl).assets [System.String] $kindDownloadLink = $assets.browser_download_url -match "kind-windows-amd64$" $destFilePath = "C:\ProgramData\kind" $null = New-Item -Path $destFilePath -ItemType Directory -Force -$packagePath = Start-DownloadWithRetry -Url $kindDownloadLink -Name "kind.exe" -DownloadPath $destFilePath +$packagePath = Invoke-DownloadWithRetry -Url $kindDownloadLink -Path "$destFilePath\kind.exe" #region Supply chain security - Kind $fileHash = (Get-FileHash -Path $packagePath -Algorithm SHA256).Hash diff --git a/images/windows/scripts/build/Install-Mingw64.ps1 b/images/windows/scripts/build/Install-Mingw64.ps1 index 27ec4f91b178..cbb9b29d3ded 100644 --- a/images/windows/scripts/build/Install-Mingw64.ps1 +++ b/images/windows/scripts/build/Install-Mingw64.ps1 @@ -18,7 +18,7 @@ if (Test-IsWin19) { throw "Unknown architecture $_" } - $packagePath = Start-DownloadWithRetry -Url $url -Name "$_.7z" + $packagePath = Invoke-DownloadWithRetry $url $hash = Get-FileHash -Path $packagePath -Algorithm SHA256 if ($hash.Hash -ne $sha256sum) { throw "Checksum verification failed for $packagePath" @@ -55,7 +55,7 @@ if (Test-IsWin19) { -Version "$version" ` -Asset "$arch-*-release-$threads-$exceptions-$runtime-*.7z" - $packagePath = Start-DownloadWithRetry -Url $url -Name "$_.7z" + $packagePath = Invoke-DownloadWithRetry $url Expand-7ZipArchive -Path $packagePath -DestinationPath "C:\" # Make a copy of mingw-make.exe to make.exe, which is a more discoverable name diff --git a/images/windows/scripts/build/Install-Msys2.ps1 b/images/windows/scripts/build/Install-Msys2.ps1 index 09aca9a12a79..09ba95a101fb 100644 --- a/images/windows/scripts/build/Install-Msys2.ps1 +++ b/images/windows/scripts/build/Install-Msys2.ps1 @@ -17,7 +17,7 @@ function Install-Msys2 { # Download the latest msys2 x86_64, filename includes release date Write-Host "Starting msys2 download using $($msys2Uri.split('/')[-1])" - $msys2File = Start-DownloadWithRetry -Url $msys2Uri + $msys2File = Invoke-DownloadWithRetry $msys2Uri Write-Host "Finished download" #region Supply chain security - Kind diff --git a/images/windows/scripts/build/Install-PyPy.ps1 b/images/windows/scripts/build/Install-PyPy.ps1 index 33a6c7b39b21..9fb92b718292 100644 --- a/images/windows/scripts/build/Install-PyPy.ps1 +++ b/images/windows/scripts/build/Install-PyPy.ps1 @@ -99,7 +99,7 @@ foreach($toolsetVersion in $toolsetVersions.versions) { $filename = $latestMajorPyPyVersion.filename Write-Host "Found PyPy '$filename' package" - $tempPyPyPackagePath = Start-DownloadWithRetry -Url $latestMajorPyPyVersion.download_url -Name $filename + $tempPyPyPackagePath = Invoke-DownloadWithRetry $latestMajorPyPyVersion.download_url #region Supply chain security $localFileHash = (Get-FileHash -Path $tempPyPyPackagePath -Algorithm SHA256).Hash diff --git a/images/windows/scripts/build/Install-Ruby.ps1 b/images/windows/scripts/build/Install-Ruby.ps1 index b3036cc07a26..dc49875fc839 100644 --- a/images/windows/scripts/build/Install-Ruby.ps1 +++ b/images/windows/scripts/build/Install-Ruby.ps1 @@ -104,7 +104,7 @@ foreach ($rubyVersion in $rubyToolVersions) { # Get url for the latest major Ruby version $url = $rubyLatestMajorVersions[$rubyVersion] if ($url) { - $tempRubyPackagePath = Start-DownloadWithRetry -Url $url + $tempRubyPackagePath = Invoke-DownloadWithRetry $url Install-Ruby -PackagePath $tempRubyPackagePath } else { Write-Host "Url not found for the '$rubyVersion' version" diff --git a/images/windows/scripts/build/Install-Runner.ps1 b/images/windows/scripts/build/Install-Runner.ps1 index 559875a1192e..e3f42cdfc071 100644 --- a/images/windows/scripts/build/Install-Runner.ps1 +++ b/images/windows/scripts/build/Install-Runner.ps1 @@ -8,7 +8,8 @@ Write-Host "Download latest Runner for GitHub Actions" $release = Invoke-RestMethod -Uri "https://api.github.com/repos/actions/runner/releases/latest" $version = $release.tag_name.Trim("v") $downloadUrl = ($release.assets.browser_download_url -ilike "*actions-runner-win-x64-${version}.zip*") | Select-Object -First 1 +$fileName = [System.IO.Path]::GetFileName($downloadUrl) New-Item -Path "C:\ProgramData\runner" -ItemType Directory -$packagePath = Start-DownloadWithRetry -Url $downloadUrl -DownloadPath "C:\ProgramData\runner" +Invoke-DownloadWithRetry -Url $downloadUrl -Path "C:\ProgramData\runner\$fileName" Invoke-PesterTests -TestFile "RunnerCache" diff --git a/images/windows/scripts/build/Install-Rust.ps1 b/images/windows/scripts/build/Install-Rust.ps1 index 5778fd37a914..032915af58c9 100644 --- a/images/windows/scripts/build/Install-Rust.ps1 +++ b/images/windows/scripts/build/Install-Rust.ps1 @@ -10,7 +10,7 @@ $env:CARGO_HOME = "C:\Users\Default\.cargo" # Download the latest rustup-init.exe for Windows x64 # See https://rustup.rs/# -$rustupPath = Start-DownloadWithRetry -Url "https://static.rust-lang.org/rustup/dist/x86_64-pc-windows-msvc/rustup-init.exe" -Name "rustup-init.exe" +$rustupPath = Invoke-DownloadWithRetry "https://static.rust-lang.org/rustup/dist/x86_64-pc-windows-msvc/rustup-init.exe" #region Supply chain security $localFileHash = (Get-FileHash -Path (Join-Path ${env:TEMP} 'rustup-init.exe') -Algorithm SHA256).Hash diff --git a/images/windows/scripts/build/Install-Selenium.ps1 b/images/windows/scripts/build/Install-Selenium.ps1 index dad6a4ac251c..619cb8ffb593 100644 --- a/images/windows/scripts/build/Install-Selenium.ps1 +++ b/images/windows/scripts/build/Install-Selenium.ps1 @@ -9,21 +9,20 @@ New-Item -ItemType directory -Path $seleniumDirectory # Download Selenium $seleniumMajorVersion = (Get-ToolsetContent).selenium.version -$seleniumFileName = "selenium-server.jar" $seleniumDownloadUrl = Resolve-GithubReleaseAssetUrl ` -Repo "SeleniumHQ/selenium" ` -Version "$seleniumMajorVersion.*" ` -Asset "selenium-server-*.jar" -Start-DownloadWithRetry -Url $seleniumDownloadUrl -Name $seleniumFileName -DownloadPath $seleniumDirectory +$seleniumBinPath = Join-Path $seleniumDirectory "selenium-server.jar" +Invoke-DownloadWithRetry -Url $seleniumDownloadUrl -Path $seleniumBinPath # Create an empty file to retrive Selenium version $seleniumFullVersion = $seleniumDownloadUrl.Split("-")[1].Split("/")[0] New-Item -Path $seleniumDirectory -Name "selenium-server-$seleniumFullVersion" # Add SELENIUM_JAR_PATH environment variable -$seleniumBinPath = Join-Path $seleniumDirectory $seleniumFileName [Environment]::SetEnvironmentVariable("SELENIUM_JAR_PATH", $seleniumBinPath, "Machine") Invoke-PesterTests -TestFile "Browsers" -TestName "Selenium" diff --git a/images/windows/scripts/build/Install-Stack.ps1 b/images/windows/scripts/build/Install-Stack.ps1 index 98c84ac07522..85e1a199437a 100644 --- a/images/windows/scripts/build/Install-Stack.ps1 +++ b/images/windows/scripts/build/Install-Stack.ps1 @@ -13,7 +13,7 @@ $DownloadUrl = $StackReleasesJson.assets | Where-Object { $_.name.EndsWith($Down Write-Host "Download stack archive" $StackToolcachePath = Join-Path $Env:AGENT_TOOLSDIRECTORY "stack\$Version" $DestinationPath = Join-Path $StackToolcachePath "x64" -$StackArchivePath = Start-DownloadWithRetry -Url $DownloadUrl +$StackArchivePath = Invoke-DownloadWithRetry $DownloadUrl #region Supply chain security - Stack $fileHash = (Get-FileHash -Path $StackArchivePath -Algorithm SHA256).Hash diff --git a/images/windows/scripts/build/Install-Toolset.ps1 b/images/windows/scripts/build/Install-Toolset.ps1 index e032464b6166..19c1f8b4f3cc 100644 --- a/images/windows/scripts/build/Install-Toolset.ps1 +++ b/images/windows/scripts/build/Install-Toolset.ps1 @@ -14,7 +14,7 @@ Function Install-Asset { $releaseAssetName = [System.IO.Path]::GetFileNameWithoutExtension($ReleaseAsset.filename) $assetFolderPath = Join-Path $env:TEMP $releaseAssetName - $assetArchivePath = Start-DownloadWithRetry -Url $ReleaseAsset.download_url -Name $ReleaseAsset.filename + $assetArchivePath = Invoke-DownloadWithRetry $ReleaseAsset.download_url Write-Host "Extract $($ReleaseAsset.filename) content..." if ($assetArchivePath.EndsWith(".tar.gz")) { diff --git a/images/windows/scripts/build/Install-Zstd.ps1 b/images/windows/scripts/build/Install-Zstd.ps1 index 224f2cf5fd57..2e8ce0174e1e 100644 --- a/images/windows/scripts/build/Install-Zstd.ps1 +++ b/images/windows/scripts/build/Install-Zstd.ps1 @@ -6,7 +6,7 @@ $url = "https://api.github.com/repos/facebook/zstd/releases/latest" # Explicitly set type to string since match returns array by default [System.String] $zstdLatest = (Invoke-RestMethod -Uri $url).assets.browser_download_url -match "zstd-.+-win64.zip$" -$zstdArchivePath = Start-DownloadWithRetry -Url $zstdLatest -Name "zstd-win64.zip" +$zstdArchivePath = Invoke-DownloadWithRetry $zstdLatest $toolPath = "C:\tools" $zstdPath = Join-Path $toolPath zstd diff --git a/images/windows/scripts/helpers/ImageHelpers.psm1 b/images/windows/scripts/helpers/ImageHelpers.psm1 index c3bee64fa9a4..fbc2ae04197c 100644 --- a/images/windows/scripts/helpers/ImageHelpers.psm1 +++ b/images/windows/scripts/helpers/ImageHelpers.psm1 @@ -16,7 +16,7 @@ Export-ModuleMember -Function @( 'Get-ToolsetContent' 'Get-TCToolVersionPath' 'Get-TCToolPath' - 'Start-DownloadWithRetry' + 'Invoke-DownloadWithRetry' 'Get-VsixExtenstionFromMarketplace' 'Install-VSIXFromFile' 'Install-VSIXFromUrl' diff --git a/images/windows/scripts/helpers/InstallHelpers.ps1 b/images/windows/scripts/helpers/InstallHelpers.ps1 index a658d0bd3605..c6c05f5b128f 100644 --- a/images/windows/scripts/helpers/InstallHelpers.ps1 +++ b/images/windows/scripts/helpers/InstallHelpers.ps1 @@ -66,9 +66,11 @@ function Install-Binary { if ($Type -ne "MSI" -and $Type -ne "EXE") { throw "Cannot determine the file type from the URL. Please specify the Type parameter." } + $fileName = [System.IO.Path]::GetFileName($Url) + } else { + $fileName = [System.IO.Path]::GetFileNameWithoutExtension([System.IO.Path]::GetRandomFileName()) + ".$Type".ToLower() } - $fileName = [System.IO.Path]::GetFileNameWithoutExtension([System.IO.Path]::GetRandomFileName()) + ".$Type".ToLower() - $filePath = Start-DownloadWithRetry -Url $Url -Name $fileName + $filePath = Invoke-DownloadWithRetry -Url $Url -Path "${env:Temp}\$fileName" } if ($PSBoundParameters.ContainsKey('ExpectedSignature')) { @@ -130,49 +132,53 @@ function Install-Binary { } } -function Start-DownloadWithRetry { +function Invoke-DownloadWithRetry { Param ( [Parameter(Mandatory)] [string] $Url, - [string] $Name, - [string] $DownloadPath = "${env:Temp}", - [int] $Retries = 20 + [Alias("Destination")] + [string] $Path ) - if ([String]::IsNullOrEmpty($Name)) { - $Name = [IO.Path]::GetFileName($Url) + if (-not $Path) { + $invalidChars = [IO.Path]::GetInvalidFileNameChars() -join '' + $re = "[{0}]" -f [RegEx]::Escape($invalidChars) + $fileName = [IO.Path]::GetFileName($Url) -replace $re + + if ([String]::IsNullOrEmpty($fileName)) { + $fileName = [System.IO.Path]::GetRandomFileName() + } + $Path = Join-Path -Path "${env:Temp}" -ChildPath $fileName } - $filePath = Join-Path -Path $DownloadPath -ChildPath $Name - $downloadStartTime = Get-Date + Write-Host "Downloading package from $Url to $Path..." - # Default retry logic for the package. - Write-Host "Downloading package from: $Url to path $filePath." - while ($Retries -gt 0) { + $interval = 30 + $downloadStartTime = Get-Date + for ($retries = 20; $retries -gt 0; $retries--) { try { - $downloadAttemptStartTime = Get-Date - (New-Object System.Net.WebClient).DownloadFile($Url, $filePath) + $attemptStartTime = Get-Date + (New-Object System.Net.WebClient).DownloadFile($Url, $Path) + $attemptSeconds = [math]::Round(($(Get-Date) - $attemptStartTime).TotalSeconds, 2) + Write-Host "Package downloaded in $attemptSeconds seconds" break } catch { - $failTime = [math]::Round(($(Get-Date) - $downloadStartTime).TotalSeconds, 2) - $attemptTime = [math]::Round(($(Get-Date) - $downloadAttemptStartTime).TotalSeconds, 2) - Write-Host "There is an error encounterd after $attemptTime seconds during package downloading:`n$($_.Exception.ToString())" - $Retries-- - - if ($Retries -eq 0) { - Write-Host "Package download failed after $failTime seconds" - exit 1 - } - - Write-Host "Waiting 30 seconds before retrying. Retries left: $Retries" - Start-Sleep -Seconds 30 + $attemptSeconds = [math]::Round(($(Get-Date) - $attemptStartTime).TotalSeconds, 2) + Write-Warning "Package download failed in $attemptSeconds seconds" + Write-Warning $_.Exception.Message + } + + if ($retries -eq 0) { + $totalSeconds = [math]::Round(($(Get-Date) - $downloadStartTime).TotalSeconds, 2) + throw "Package download failed after $totalSeconds seconds" } + + Write-Warning "Waiting $interval seconds before retrying (retries left: $retries)..." + Start-Sleep -Seconds $interval } - $downloadCompleteTime = [math]::Round(($(Get-Date) - $downloadStartTime).TotalSeconds, 2) - Write-Host "Package downloaded successfully in $downloadCompleteTime seconds" - return $filePath + return $Path } function Get-VsixExtenstionFromMarketplace { @@ -273,8 +279,7 @@ function Install-VSIXFromUrl { [int] $Retries = 20 ) - $name = [System.IO.Path]::GetFileNameWithoutExtension([System.IO.Path]::GetRandomFileName()) + ".vsix" - $filePath = Start-DownloadWithRetry -Url $Url -Name $Name + $filePath = Invoke-DownloadWithRetry $Url Install-VSIXFromFile -FilePath $filePath -Retries $Retries Remove-Item -Force -Confirm:$false $filePath } diff --git a/images/windows/scripts/helpers/VisualStudioHelpers.ps1 b/images/windows/scripts/helpers/VisualStudioHelpers.ps1 index fe613ceaa353..33fd7ffbbce3 100644 --- a/images/windows/scripts/helpers/VisualStudioHelpers.ps1 +++ b/images/windows/scripts/helpers/VisualStudioHelpers.ps1 @@ -38,8 +38,7 @@ Function Install-VisualStudio { $productId = "Microsoft.VisualStudio.Product.${Edition}" Write-Host "Downloading Bootstrapper ..." - $BootstrapperName = [IO.Path]::GetFileName($BootstrapperUrl) - $bootstrapperFilePath = Start-DownloadWithRetry -Url $BootstrapperUrl -Name $BootstrapperName + $bootstrapperFilePath = Invoke-DownloadWithRetry $BootstrapperUrl # Verify that the bootstrapper is signed by Microsoft Test-FileSignature -FilePath $bootstrapperFilePath -ExpectedThumbprint $SignatureThumbprint @@ -85,8 +84,7 @@ Function Install-VisualStudio { # Try to download tool to collect logs $collectExeUrl = "https://aka.ms/vscollect.exe" - $collectExeName = [IO.Path]::GetFileName($collectExeUrl) - $collectExePath = Start-DownloadWithRetry -Url $collectExeUrl -Name $collectExeName + $collectExePath = Invoke-DownloadWithRetry -Url $collectExeUrl # Collect installation logs using the collect.exe tool and check if it is successful & "$collectExePath" From abb81511d421c585e7ddfcdd33779a2ad7610ba7 Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Wed, 29 Nov 2023 20:25:29 +0100 Subject: [PATCH 2490/3485] [Ubuntu] Rewrite function download_with_retry (#8912) * [Ubuntu] Rewrite function download_with_retry * Fix loop exit condition --- .../scripts/build/install-actions-cache.sh | 5 +- .../scripts/build/install-aliyun-cli.sh | 7 +- .../scripts/build/install-android-sdk.sh | 14 ++-- .../ubuntu/scripts/build/install-aws-tools.sh | 18 ++--- images/ubuntu/scripts/build/install-azcopy.sh | 7 +- images/ubuntu/scripts/build/install-bicep.sh | 6 +- .../scripts/build/install-codeql-bundle.sh | 3 +- images/ubuntu/scripts/build/install-docker.sh | 9 ++- .../scripts/build/install-dotnetcore-sdk.sh | 8 +-- images/ubuntu/scripts/build/install-erlang.sh | 4 +- .../ubuntu/scripts/build/install-firefox.sh | 6 +- .../scripts/build/install-github-cli.sh | 10 +-- .../scripts/build/install-google-chrome.sh | 15 ++--- .../scripts/build/install-java-tools.sh | 8 +-- images/ubuntu/scripts/build/install-julia.sh | 7 +- images/ubuntu/scripts/build/install-kotlin.sh | 7 +- .../scripts/build/install-microsoft-edge.sh | 4 +- images/ubuntu/scripts/build/install-oc-cli.sh | 7 +- .../ubuntu/scripts/build/install-oras-cli.sh | 11 +-- images/ubuntu/scripts/build/install-packer.sh | 8 +-- .../ubuntu/scripts/build/install-phantomjs.sh | 21 ++++-- images/ubuntu/scripts/build/install-pulumi.sh | 10 +-- images/ubuntu/scripts/build/install-pypy.sh | 14 ++-- images/ubuntu/scripts/build/install-ruby.sh | 4 +- .../scripts/build/install-runner-package.sh | 13 ++-- images/ubuntu/scripts/build/install-sbt.sh | 6 +- .../ubuntu/scripts/build/install-selenium.sh | 16 ++--- .../scripts/build/install-sqlpackage.sh | 12 ++-- images/ubuntu/scripts/build/install-swift.sh | 30 ++++----- .../ubuntu/scripts/build/install-terraform.sh | 8 +-- images/ubuntu/scripts/build/install-yq.sh | 18 ++--- images/ubuntu/scripts/build/install-zstd.sh | 32 ++++++--- .../docs-gen/SoftwareReport.Browsers.psm1 | 3 +- images/ubuntu/scripts/helpers/install.sh | 67 +++++++++---------- images/ubuntu/scripts/tests/Tools.Tests.ps1 | 3 +- images/ubuntu/toolsets/toolset-2004.json | 3 +- images/ubuntu/toolsets/toolset-2204.json | 3 +- 37 files changed, 204 insertions(+), 223 deletions(-) diff --git a/images/ubuntu/scripts/build/install-actions-cache.sh b/images/ubuntu/scripts/build/install-actions-cache.sh index 59312ba6c563..416dab22a5c4 100644 --- a/images/ubuntu/scripts/build/install-actions-cache.sh +++ b/images/ubuntu/scripts/build/install-actions-cache.sh @@ -18,8 +18,7 @@ setEtcEnvironmentVariable "ACTIONS_RUNNER_ACTION_ARCHIVE_CACHE" "${ACTION_ARCHIV # Download latest release from github.com/actions/action-versions and untar to /opt/actionarchivecache downloadUrl=$(get_github_package_download_url "actions/action-versions" "contains(\"action-versions.tar.gz\")") -echo "Downloading action-versions $downloadUrl" -download_with_retries "$downloadUrl" "/tmp" action-versions.tar.gz -tar -xzf /tmp/action-versions.tar.gz -C $ACTION_ARCHIVE_CACHE_DIR +archive_path=$(download_with_retry "$downloadUrl") +tar -xzf "$archive_path" -C $ACTION_ARCHIVE_CACHE_DIR invoke_tests "ActionArchiveCache" diff --git a/images/ubuntu/scripts/build/install-aliyun-cli.sh b/images/ubuntu/scripts/build/install-aliyun-cli.sh index 95bcc2f48ce0..d3d8813bf199 100644 --- a/images/ubuntu/scripts/build/install-aliyun-cli.sh +++ b/images/ubuntu/scripts/build/install-aliyun-cli.sh @@ -19,8 +19,7 @@ else hash_url="https://github.com/aliyun/aliyun-cli/releases/latest/download/SHASUMS256.txt" fi -package_name="aliyun-cli-linux-amd64.tgz" -download_with_retries "$download_url" "/tmp" "$package_name" +archive_path=$(download_with_retry "$download_url") # Supply chain security - Alibaba Cloud CLI if isUbuntu20; then @@ -29,9 +28,9 @@ else external_hash=$(get_hash_from_remote_file "$hash_url" "aliyun-cli-linux" "amd64.tgz") fi -use_checksum_comparison "/tmp/$package_name" "$external_hash" +use_checksum_comparison "$archive_path" "$external_hash" -tar xzf "/tmp/$package_name" +tar xzf "$archive_path" mv aliyun /usr/local/bin invoke_tests "CLI.Tools" "Aliyun CLI" diff --git a/images/ubuntu/scripts/build/install-android-sdk.sh b/images/ubuntu/scripts/build/install-android-sdk.sh index 7521222e2aed..3b614eed7be0 100644 --- a/images/ubuntu/scripts/build/install-android-sdk.sh +++ b/images/ubuntu/scripts/build/install-android-sdk.sh @@ -43,18 +43,16 @@ setEtcEnvironmentVariable "ANDROID_HOME" "${ANDROID_SDK_ROOT}" # Create android sdk directory mkdir -p ${ANDROID_SDK_ROOT} -cmdlineTools="android-cmdline-tools.zip" - # Download the latest command line tools so that we can accept all of the licenses. # See https://developer.android.com/studio/#command-tools cmdlineToolsVersion=$(get_toolset_value '.android."cmdline-tools"') if [[ $cmdlineToolsVersion == "latest" ]]; then - repositoryXmlUrl="https://dl.google.com/android/repository/repository2-1.xml" - download_with_retries $repositoryXmlUrl "/tmp" "repository2-1.xml" + repository_xml_url="https://dl.google.com/android/repository/repository2-1.xml" + repository_xml_file=$(download_with_retry "$repository_xml_url") cmdlineToolsVersion=$( yq -p=xml \ '.sdk-repository.remotePackage[] | select(."+@path" == "cmdline-tools;latest" and .channelRef."+@ref" == "channel-0").archives.archive[].complete.url | select(contains("commandlinetools-linux"))' \ - /tmp/repository2-1.xml + "${repository_xml_file}" ) if [[ -z $cmdlineToolsVersion ]]; then @@ -63,12 +61,10 @@ if [[ $cmdlineToolsVersion == "latest" ]]; then fi fi -download_with_retries "https://dl.google.com/android/repository/${cmdlineToolsVersion}" "." $cmdlineTools - -unzip -qq $cmdlineTools -d ${ANDROID_SDK_ROOT}/cmdline-tools +archive_path=$(download_with_retry "https://dl.google.com/android/repository/${cmdlineToolsVersion}") +unzip -qq "$archive_path" -d ${ANDROID_SDK_ROOT}/cmdline-tools # Command line tools need to be placed in ${ANDROID_SDK_ROOT}/sdk/cmdline-tools/latest to determine SDK root mv ${ANDROID_SDK_ROOT}/cmdline-tools/cmdline-tools ${ANDROID_SDK_ROOT}/cmdline-tools/latest -rm -f $cmdlineTools # Check sdk manager installation ${SDKMANAGER} --list 1>/dev/null diff --git a/images/ubuntu/scripts/build/install-aws-tools.sh b/images/ubuntu/scripts/build/install-aws-tools.sh index d5ee0576df53..be2980538ffe 100644 --- a/images/ubuntu/scripts/build/install-aws-tools.sh +++ b/images/ubuntu/scripts/build/install-aws-tools.sh @@ -9,23 +9,23 @@ source $HELPER_SCRIPTS/os.sh source $HELPER_SCRIPTS/install.sh -download_with_retries "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" "/tmp" "awscliv2.zip" -unzip -qq /tmp/awscliv2.zip -d /tmp +awscliv2_archive_path=$(download_with_retry "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip") +unzip -qq "$awscliv2_archive_path" -d /tmp /tmp/aws/install -i /usr/local/aws-cli -b /usr/local/bin -download_with_retries "https://s3.amazonaws.com/session-manager-downloads/plugin/latest/ubuntu_64bit/session-manager-plugin.deb" "/tmp" "session-manager-plugin.deb" -apt install /tmp/session-manager-plugin.deb +smplugin_deb_path=$(download_with_retry "https://s3.amazonaws.com/session-manager-downloads/plugin/latest/ubuntu_64bit/session-manager-plugin.deb") +apt install "$smplugin_deb_path" # Download the latest aws sam cli release -aws_sam_cli_zip_name="aws-sam-cli-linux-x86_64.zip" -download_with_retries "https://github.com/aws/aws-sam-cli/releases/latest/download/${aws_sam_cli_zip_name}" "/tmp" $aws_sam_cli_zip_name +aws_sam_cli_archive_name="aws-sam-cli-linux-x86_64.zip" +aws_sam_cli_archive_path=$(download_with_retry "https://github.com/aws/aws-sam-cli/releases/latest/download/${aws_sam_cli_archive_name}") # Supply chain security - AWS SAM CLI -aws_sam_cli_hash=$(get_github_package_hash "aws" "aws-sam-cli" "${aws_sam_cli_zip_name}.. ") -use_checksum_comparison "/tmp/${aws_sam_cli_zip_name}" "$aws_sam_cli_hash" +aws_sam_cli_hash=$(get_github_package_hash "aws" "aws-sam-cli" "${aws_sam_cli_archive_name}.. ") +use_checksum_comparison "$aws_sam_cli_archive_path" "$aws_sam_cli_hash" # Install the latest aws sam cli release -unzip /tmp/${aws_sam_cli_zip_name} -d /tmp +unzip "$aws_sam_cli_archive_path" -d /tmp /tmp/install invoke_tests "CLI.Tools" "AWS" diff --git a/images/ubuntu/scripts/build/install-azcopy.sh b/images/ubuntu/scripts/build/install-azcopy.sh index f06df251d065..a93d663d166c 100644 --- a/images/ubuntu/scripts/build/install-azcopy.sh +++ b/images/ubuntu/scripts/build/install-azcopy.sh @@ -7,10 +7,9 @@ source $HELPER_SCRIPTS/install.sh # Install AzCopy10 -download_with_retries "https://aka.ms/downloadazcopy-v10-linux" "/tmp" "azcopy.tar.gz" -tar xzf /tmp/azcopy.tar.gz --strip-components=1 -C /tmp -mv /tmp/azcopy /usr/local/bin/azcopy -chmod +x /usr/local/bin/azcopy +archive_path=$(download_with_retry "https://aka.ms/downloadazcopy-v10-linux") +tar xzf "$archive_path" --strip-components=1 -C /tmp +install /tmp/azcopy /usr/local/bin/azcopy # Create azcopy 10 alias for backward compatibility ln -sf /usr/local/bin/azcopy /usr/local/bin/azcopy10 diff --git a/images/ubuntu/scripts/build/install-bicep.sh b/images/ubuntu/scripts/build/install-bicep.sh index a568ba73d926..840b95310d12 100644 --- a/images/ubuntu/scripts/build/install-bicep.sh +++ b/images/ubuntu/scripts/build/install-bicep.sh @@ -7,10 +7,8 @@ source $HELPER_SCRIPTS/install.sh # Install Bicep CLI -download_with_retries "https://github.com/Azure/bicep/releases/latest/download/bicep-linux-x64" "." "bicep.bin" +bicep_binary_path=$(download_with_retry "https://github.com/Azure/bicep/releases/latest/download/bicep-linux-x64") # Mark it as executable -chmod +x ./bicep.bin -# Add bicep to PATH (requires admin) -sudo mv ./bicep.bin /usr/local/bin/bicep +install "$bicep_binary_path" /usr/local/bin/bicep invoke_tests "Tools" "Bicep" diff --git a/images/ubuntu/scripts/build/install-codeql-bundle.sh b/images/ubuntu/scripts/build/install-codeql-bundle.sh index 9cc01bed8869..c9dd18120313 100644 --- a/images/ubuntu/scripts/build/install-codeql-bundle.sh +++ b/images/ubuntu/scripts/build/install-codeql-bundle.sh @@ -14,8 +14,7 @@ bundle_tag_name="codeql-bundle-v$bundle_version" echo "Downloading CodeQL bundle $bundle_version..." # Note that this is the all-platforms CodeQL bundle, to support scenarios where customers run # different operating systems within containers. -download_with_retries "https://github.com/github/codeql-action/releases/download/$bundle_tag_name/codeql-bundle.tar.gz" "/tmp" "codeql-bundle.tar.gz" -codeql_archive="/tmp/codeql-bundle.tar.gz" +codeql_archive=$(download_with_retry "https://github.com/github/codeql-action/releases/download/$bundle_tag_name/codeql-bundle.tar.gz") codeql_toolcache_path="$AGENT_TOOLSDIRECTORY/CodeQL/$bundle_version/x64" mkdir -p "$codeql_toolcache_path" diff --git a/images/ubuntu/scripts/build/install-docker.sh b/images/ubuntu/scripts/build/install-docker.sh index 817cc2476904..bbf77048f6ab 100644 --- a/images/ubuntu/scripts/build/install-docker.sh +++ b/images/ubuntu/scripts/build/install-docker.sh @@ -64,15 +64,14 @@ else fi # Download amazon-ecr-credential-helper -aws_helper="docker-credential-ecr-login" aws_latest_release_url="https://api.github.com/repos/awslabs/amazon-ecr-credential-helper/releases/latest" aws_helper_url=$(curl "${authString[@]}" -fsSL "${aws_latest_release_url}" | jq -r '.body' | awk -F'[()]' '/linux-amd64/ {print $2}') -download_with_retries "${aws_helper_url}" "/tmp" "${aws_helper}" +aws_helper_binary_path=$(download_with_retry "$aws_helper_url") # Supply chain security - amazon-ecr-credential-helper -aws_helper_external_hash=$(get_hash_from_remote_file "${aws_helper_url}.sha256" "${aws_helper}") -use_checksum_comparison "/tmp/${aws_helper}" "${aws_helper_external_hash}" +aws_helper_external_hash=$(get_hash_from_remote_file "${aws_helper_url}.sha256" "docker-credential-ecr-login") +use_checksum_comparison "$aws_helper_binary_path" "$aws_helper_external_hash" # Install amazon-ecr-credential-helper -install "/tmp/${aws_helper}" "/usr/bin/${aws_helper}" +install "$aws_helper_binary_path" "/usr/bin/docker-credential-ecr-login" # Cleanup custom repositories rm $gpg_key diff --git a/images/ubuntu/scripts/build/install-dotnetcore-sdk.sh b/images/ubuntu/scripts/build/install-dotnetcore-sdk.sh index 30f38d9b3b4e..3eef7af1a124 100644 --- a/images/ubuntu/scripts/build/install-dotnetcore-sdk.sh +++ b/images/ubuntu/scripts/build/install-dotnetcore-sdk.sh @@ -47,15 +47,13 @@ apt-get update sdks=() for version in ${DOTNET_VERSIONS[@]}; do release_url="https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/${version}/releases.json" - download_with_retries "${release_url}" "." "${version}.json" - releases=$(cat "./${version}.json") + releases=$(cat "$(download_with_retry "$release_url")") if [[ $version == "6.0" ]]; then sdks=("${sdks[@]}" $(echo "${releases}" | jq -r 'first(.releases[].sdks[]?.version | select(contains("preview") or contains("rc") | not))')) else sdks=("${sdks[@]}" $(echo "${releases}" | jq -r '.releases[].sdk.version | select(contains("preview") or contains("rc") | not)')) sdks=("${sdks[@]}" $(echo "${releases}" | jq -r '.releases[].sdks[]?.version | select(contains("preview") or contains("rc") | not)')) fi - rm ./${version}.json done sortedSdks=$(echo ${sdks[@]} | tr ' ' '\n' | sort -r | uniq -w 5) @@ -73,12 +71,12 @@ extract_dotnet_sdk() { } # Download/install additional SDKs in parallel -export -f download_with_retries +export -f download_with_retry export -f extract_dotnet_sdk parallel --jobs 0 --halt soon,fail=1 \ 'url="https://dotnetcli.blob.core.windows.net/dotnet/Sdk/{}/dotnet-sdk-{}-linux-x64.tar.gz"; \ - download_with_retries $url' ::: "${sortedSdks[@]}" + download_with_retry $url' ::: "${sortedSdks[@]}" find . -name "*.tar.gz" | parallel --halt soon,fail=1 'extract_dotnet_sdk {}' diff --git a/images/ubuntu/scripts/build/install-erlang.sh b/images/ubuntu/scripts/build/install-erlang.sh index a0e730f8f0b8..e78439caef46 100644 --- a/images/ubuntu/scripts/build/install-erlang.sh +++ b/images/ubuntu/scripts/build/install-erlang.sh @@ -19,8 +19,8 @@ apt-get install --no-install-recommends esl-erlang # Install rebar3 rebar3_url="https://github.com/erlang/rebar3/releases/latest/download/rebar3" -download_with_retries $rebar3_url "/usr/local/bin" "rebar3" -chmod +x /usr/local/bin/rebar3 +rebar3_binary_path=$(download_with_retry "$rebar3_url") +install "$rebar3_binary_path" /usr/local/bin/rebar3 # Clean up source list rm $source_list diff --git a/images/ubuntu/scripts/build/install-firefox.sh b/images/ubuntu/scripts/build/install-firefox.sh index 628abde2e293..53714ca1c99d 100644 --- a/images/ubuntu/scripts/build/install-firefox.sh +++ b/images/ubuntu/scripts/build/install-firefox.sh @@ -33,14 +33,14 @@ echo "mozillateam $repo_url" >> $HELPER_SCRIPTS/apt-sources.txt echo 'pref("intl.locale.requested","en_US");' >> "/usr/lib/firefox/browser/defaults/preferences/syspref.js" # Download and unpack latest release of geckodriver -downloadUrl=$(get_github_package_download_url "mozilla/geckodriver" "test(\"linux64.tar.gz$\")") -download_with_retries "$downloadUrl" "/tmp" geckodriver.tar.gz +download_url=$(get_github_package_download_url "mozilla/geckodriver" "test(\"linux64.tar.gz$\")") +driver_archive_path=$(download_with_retry "$download_url") GECKODRIVER_DIR="/usr/local/share/gecko_driver" GECKODRIVER_BIN="$GECKODRIVER_DIR/geckodriver" mkdir -p $GECKODRIVER_DIR -tar -xzf /tmp/geckodriver.tar.gz -C $GECKODRIVER_DIR +tar -xzf "$driver_archive_path" -C $GECKODRIVER_DIR chmod +x $GECKODRIVER_BIN ln -s "$GECKODRIVER_BIN" /usr/bin/ diff --git a/images/ubuntu/scripts/build/install-github-cli.sh b/images/ubuntu/scripts/build/install-github-cli.sh index 65e3cddcc712..6e43aed4af75 100644 --- a/images/ubuntu/scripts/build/install-github-cli.sh +++ b/images/ubuntu/scripts/build/install-github-cli.sh @@ -10,13 +10,13 @@ source $HELPER_SCRIPTS/install.sh # Download GitHub CLI -URL=$(get_github_package_download_url "cli/cli" "contains(\"linux\") and contains(\"amd64\") and contains(\".deb\")") -download_with_retries "${URL}" "/tmp" "gh_cli_linux_amd64.deb" +gh_cli_url=$(get_github_package_download_url "cli/cli" "contains(\"linux\") and contains(\"amd64\") and contains(\".deb\")") +gh_cli_deb_path=$(download_with_retry "$gh_cli_url") # Supply chain security - GitHub CLI hash_url=$(get_github_package_download_url "cli/cli" "contains(\"checksums.txt\")") -external_hash=$(get_hash_from_remote_file "${hash_url}" "linux_amd64.deb") -use_checksum_comparison "/tmp/gh_cli_linux_amd64.deb" "${external_hash}" +external_hash=$(get_hash_from_remote_file "$hash_url" "linux_amd64.deb") +use_checksum_comparison "$gh_cli_deb_path" "$external_hash" # Install GitHub CLI -apt install /tmp/gh_cli_linux_amd64.deb +apt install "$gh_cli_deb_path" invoke_tests "CLI.Tools" "GitHub CLI" diff --git a/images/ubuntu/scripts/build/install-google-chrome.sh b/images/ubuntu/scripts/build/install-google-chrome.sh index 4608bc6b7145..88b9202081da 100644 --- a/images/ubuntu/scripts/build/install-google-chrome.sh +++ b/images/ubuntu/scripts/build/install-google-chrome.sh @@ -34,9 +34,8 @@ function GetChromiumRevision { # Download and install Google Chrome CHROME_DEB_URL="https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb" -CHROME_DEB_NAME="google-chrome-stable_current_amd64.deb" -download_with_retries $CHROME_DEB_URL "/tmp" "${CHROME_DEB_NAME}" -apt install "/tmp/${CHROME_DEB_NAME}" -f +CHROME_DEB_PATH=$(download_with_retry "$CHROME_DEB_URL") +apt install "$CHROME_DEB_PATH" -f setEtcEnvironmentVariable "CHROME_BIN" "/usr/bin/google-chrome" # Remove Google Chrome repo @@ -55,13 +54,12 @@ CHROME_VERSIONS_JSON=$(curl -fsSL "${CHROME_VERSIONS_URL}") # Download and unpack the latest release of chromedriver CHROMEDRIVER_VERSION=$(echo "${CHROME_VERSIONS_JSON}" | jq -r '.builds["'"$CHROME_VERSION"'"].version') CHROMEDRIVER_URL=$(echo "${CHROME_VERSIONS_JSON}" | jq -r '.builds["'"$CHROME_VERSION"'"].downloads.chromedriver[] | select(.platform=="'"${CHROME_PLATFORM}"'").url') -CHROMEDRIVER_ARCHIVE="chromedriver_linux64.zip" CHROMEDRIVER_DIR="/usr/local/share/chromedriver-linux64" CHROMEDRIVER_BIN="$CHROMEDRIVER_DIR/chromedriver" echo "Installing chromedriver version $CHROMEDRIVER_VERSION" -download_with_retries $CHROMEDRIVER_URL "/tmp" $CHROMEDRIVER_ARCHIVE -unzip -qq /tmp/$CHROMEDRIVER_ARCHIVE -d /usr/local/share +driver_archive_path=$(download_with_retry "$CHROMEDRIVER_URL") +unzip -qq "$driver_archive_path" -d /usr/local/share chmod +x $CHROMEDRIVER_BIN ln -s "$CHROMEDRIVER_BIN" /usr/bin/ @@ -71,14 +69,13 @@ setEtcEnvironmentVariable "CHROMEWEBDRIVER" "${CHROMEDRIVER_DIR}" CHROME_REVISION=$(echo "${CHROME_VERSIONS_JSON}" | jq -r '.builds["'"$CHROME_VERSION"'"].revision') CHROMIUM_REVISION=$(GetChromiumRevision $CHROME_REVISION) CHROMIUM_URL="https://www.googleapis.com/download/storage/v1/b/chromium-browser-snapshots/o/Linux_x64%2F${CHROMIUM_REVISION}%2Fchrome-linux.zip?alt=media" -CHROMIUM_ARCHIVE="${CHROMIUM_REVISION}-chromium-linux.zip" CHROMIUM_DIR="/usr/local/share/chromium" CHROMIUM_BIN="${CHROMIUM_DIR}/chrome-linux/chrome" echo "Installing chromium revision $CHROMIUM_REVISION" -download_with_retries $CHROMIUM_URL "/tmp" $CHROMIUM_ARCHIVE +CHROMIUM_ARCHIVE_PATH=$(download_with_retry "$CHROMIUM_URL") mkdir $CHROMIUM_DIR -unzip -qq /tmp/$CHROMIUM_ARCHIVE -d $CHROMIUM_DIR +unzip -qq "$CHROMIUM_ARCHIVE_PATH" -d $CHROMIUM_DIR ln -s $CHROMIUM_BIN /usr/bin/chromium ln -s $CHROMIUM_BIN /usr/bin/chromium-browser diff --git a/images/ubuntu/scripts/build/install-java-tools.sh b/images/ubuntu/scripts/build/install-java-tools.sh index 65360fd7cf9d..bee2b5fd0320 100644 --- a/images/ubuntu/scripts/build/install-java-tools.sh +++ b/images/ubuntu/scripts/build/install-java-tools.sh @@ -98,8 +98,8 @@ setEtcEnvironmentVariable "ANT_HOME" "/usr/share/ant" # Install Maven mavenVersion=$(get_toolset_value '.java.maven') mavenDownloadUrl="https://dlcdn.apache.org/maven/maven-3/${mavenVersion}/binaries/apache-maven-${mavenVersion}-bin.zip" -download_with_retries ${mavenDownloadUrl} "/tmp" "maven.zip" -unzip -qq -d /usr/share /tmp/maven.zip +maven_archive_path=$(download_with_retry "$mavenDownloadUrl") +unzip -qq -d /usr/share "$maven_archive_path" ln -s /usr/share/apache-maven-${mavenVersion}/bin/mvn /usr/bin/mvn # Install Gradle @@ -110,8 +110,8 @@ gradleLatestVersion=$(echo ${gradleJson} | jq -r '.[] | select(.version | contai gradleDownloadUrl=$(echo ${gradleJson} | jq -r ".[] | select(.version==\"$gradleLatestVersion\") | .downloadUrl") echo "gradleUrl=${gradleDownloadUrl}" echo "gradleVersion=${gradleLatestVersion}" -download_with_retries ${gradleDownloadUrl} "/tmp" "gradleLatest.zip" -unzip -qq -d /usr/share /tmp/gradleLatest.zip +gradle_archive_path=$(download_with_retry "$gradleDownloadUrl") +unzip -qq -d /usr/share "$gradle_archive_path" ln -s /usr/share/gradle-"${gradleLatestVersion}"/bin/gradle /usr/bin/gradle gradle_home_dir=$(find /usr/share -depth -maxdepth 1 -name "gradle*") setEtcEnvironmentVariable "GRADLE_HOME" "${gradle_home_dir}" diff --git a/images/ubuntu/scripts/build/install-julia.sh b/images/ubuntu/scripts/build/install-julia.sh index 4c491d2cdcd1..46c4aaf22cdf 100644 --- a/images/ubuntu/scripts/build/install-julia.sh +++ b/images/ubuntu/scripts/build/install-julia.sh @@ -13,15 +13,12 @@ julia_version=$(echo $json | jq -r '.[].files[] | select(.triplet=="x86_64-linux # download julia archive julia_tar_url=$(echo $json | jq -r ".[].files[].url | select(endswith(\"julia-${julia_version}-linux-x86_64.tar.gz\"))") -julia_tar_name="julia-${julia_version}-linux-x86_64.tar.gz" -download_with_retries $julia_tar_url "/tmp" "${julia_tar_name}" +julia_archive_path=$(download_with_retry "$julia_tar_url") # extract files and make symlink -julia_tar_tmp="/tmp/${julia_tar_name}" julia_installation_path="/usr/local/julia${julia_version}" mkdir -p "${julia_installation_path}" -tar -C "${julia_installation_path}" -xzf "${julia_tar_tmp}" --strip-components=1 +tar -C "${julia_installation_path}" -xzf "$julia_archive_path" --strip-components=1 ln -s "${julia_installation_path}/bin/julia" /usr/bin/julia -rm "${julia_tar_tmp}" invoke_tests "Tools" "Julia" diff --git a/images/ubuntu/scripts/build/install-kotlin.sh b/images/ubuntu/scripts/build/install-kotlin.sh index 1995a66e1a7e..a8c2bd27325e 100644 --- a/images/ubuntu/scripts/build/install-kotlin.sh +++ b/images/ubuntu/scripts/build/install-kotlin.sh @@ -8,15 +8,14 @@ source $HELPER_SCRIPTS/install.sh KOTLIN_ROOT="/usr/share" -kotlin_zip_name="kotlin-compiler.zip" download_url=$(get_github_package_download_url "JetBrains/kotlin" "contains(\"kotlin-compiler\")") -download_with_retries "$download_url" "/tmp" "$kotlin_zip_name" +archive_path=$(download_with_retry "$download_url") # Supply chain security - Kotlin kotlin_hash=$(get_github_package_hash "JetBrains" "kotlin" "kotlin-compiler-.*\.zip" "" "latest" "false" "|" 3) -use_checksum_comparison "/tmp/${kotlin_zip_name}" "$kotlin_hash" +use_checksum_comparison "$archive_path" "$kotlin_hash" -unzip -qq /tmp/${kotlin_zip_name} -d $KOTLIN_ROOT +unzip -qq "$archive_path" -d $KOTLIN_ROOT rm $KOTLIN_ROOT/kotlinc/bin/*.bat ln -sf $KOTLIN_ROOT/kotlinc/bin/* /usr/bin diff --git a/images/ubuntu/scripts/build/install-microsoft-edge.sh b/images/ubuntu/scripts/build/install-microsoft-edge.sh index 2103102b7ca3..a52f4cb27400 100644 --- a/images/ubuntu/scripts/build/install-microsoft-edge.sh +++ b/images/ubuntu/scripts/build/install-microsoft-edge.sh @@ -40,9 +40,9 @@ EDGE_DRIVER_VERSION_URL="https://msedgedriver.azureedge.net/LATEST_RELEASE_${EDG EDGE_DRIVER_LATEST_VERSION=$(curl -fsSL "$EDGE_DRIVER_VERSION_URL" | iconv -f utf-16 -t utf-8 | tr -d '\r') EDGEDRIVER_URL="https://msedgedriver.azureedge.net/${EDGE_DRIVER_LATEST_VERSION}/edgedriver_linux64.zip" -download_with_retries $EDGEDRIVER_URL "/tmp" "edgedriver_linux64.zip" +EDGEDRIVER_ARCHIVE_PATH=$(download_with_retry "$EDGEDRIVER_URL") -unzip -qq /tmp/edgedriver_linux64.zip -d $EDGEDRIVER_DIR +unzip -qq "$EDGEDRIVER_ARCHIVE_PATH" -d "$EDGEDRIVER_DIR" chmod +x $EDGEDRIVER_BIN ln -s $EDGEDRIVER_BIN /usr/bin diff --git a/images/ubuntu/scripts/build/install-oc-cli.sh b/images/ubuntu/scripts/build/install-oc-cli.sh index 36ec84794df4..f1094ff6a35c 100644 --- a/images/ubuntu/scripts/build/install-oc-cli.sh +++ b/images/ubuntu/scripts/build/install-oc-cli.sh @@ -7,9 +7,8 @@ source $HELPER_SCRIPTS/install.sh # Install the oc CLI -DOWNLOAD_URL="https://mirror.openshift.com/pub/openshift-v4/clients/ocp/latest/openshift-client-linux.tar.gz" -PACKAGE_TAR_NAME="oc.tar.gz" -download_with_retries $DOWNLOAD_URL "/tmp" $PACKAGE_TAR_NAME -tar xzf "/tmp/$PACKAGE_TAR_NAME" -C "/usr/local/bin" oc +download_url="https://mirror.openshift.com/pub/openshift-v4/clients/ocp/latest/openshift-client-linux.tar.gz" +archive_path=$(download_with_retry "$download_url") +tar xzf "$archive_path" -C "/usr/local/bin" oc invoke_tests "CLI.Tools" "OC CLI" diff --git a/images/ubuntu/scripts/build/install-oras-cli.sh b/images/ubuntu/scripts/build/install-oras-cli.sh index f8481a91dd65..352a94b7347d 100644 --- a/images/ubuntu/scripts/build/install-oras-cli.sh +++ b/images/ubuntu/scripts/build/install-oras-cli.sh @@ -8,16 +8,17 @@ source $HELPER_SCRIPTS/install.sh # Determine latest ORAS CLI version -URL=$(get_github_package_download_url "oras-project/oras" "endswith(\"linux_amd64.tar.gz\")") -archive_name=$(basename "${URL}") +download_url=$(get_github_package_download_url "oras-project/oras" "endswith(\"linux_amd64.tar.gz\")") # Download ORAS CLI -download_with_retries "${URL}" "/tmp" "${archive_name}" +archive_path=$(download_with_retry "$download_url") + # Supply chain security - ORAS CLI hash_url=$(get_github_package_download_url "oras-project/oras" "contains(\"checksums.txt\")") external_hash=$(get_hash_from_remote_file "${hash_url}" "linux_amd64.tar.gz") -use_checksum_comparison "/tmp/${archive_name}" "${external_hash}" +use_checksum_comparison "$archive_path" "${external_hash}" + # Unzip ORAS CLI -tar xzf "/tmp/${archive_name}" -C /usr/local/bin oras +tar xzf "$archive_path" -C /usr/local/bin oras invoke_tests "CLI.Tools" "Oras CLI" diff --git a/images/ubuntu/scripts/build/install-packer.sh b/images/ubuntu/scripts/build/install-packer.sh index cdcdc5673cb6..5fb0bd8b50e8 100644 --- a/images/ubuntu/scripts/build/install-packer.sh +++ b/images/ubuntu/scripts/build/install-packer.sh @@ -7,10 +7,8 @@ source $HELPER_SCRIPTS/install.sh # Install Packer -URL=$(curl -fsSL https://api.releases.hashicorp.com/v1/releases/packer/latest | jq -r '.builds[] | select((.arch=="amd64") and (.os=="linux")).url') -ZIP_NAME="packer_linux_amd64.zip" -download_with_retries "${URL}" "/tmp" "${ZIP_NAME}" -unzip -qq "/tmp/${ZIP_NAME}" -d /usr/local/bin -rm -f "/tmp/${ZIP_NAME}" +download_url=$(curl -fsSL https://api.releases.hashicorp.com/v1/releases/packer/latest | jq -r '.builds[] | select((.arch=="amd64") and (.os=="linux")).url') +archive_path=$(download_with_retry "$download_url") +unzip -qq "$archive_path" -d /usr/local/bin invoke_tests "Tools" "Packer" diff --git a/images/ubuntu/scripts/build/install-phantomjs.sh b/images/ubuntu/scripts/build/install-phantomjs.sh index 721cd685476e..2ed14a04800d 100644 --- a/images/ubuntu/scripts/build/install-phantomjs.sh +++ b/images/ubuntu/scripts/build/install-phantomjs.sh @@ -7,13 +7,20 @@ # Source the helpers for use with the script source $HELPER_SCRIPTS/install.sh -# Install PhantomJS +# Install required dependencies apt-get install -y chrpath libssl-dev libxft-dev libfreetype6 libfreetype6-dev libfontconfig1 libfontconfig1-dev -phantom_js=phantomjs-2.1.1-linux-x86_64 -download_with_retries https://bitbucket.org/ariya/phantomjs/downloads/$phantom_js.tar.bz2 "/tmp" -phantom_js_hash="86dd9a4bf4aee45f1a84c9f61cf1947c1d6dce9b9e8d2a907105da7852460d2f" -use_checksum_comparison "/tmp/${phantom_js}.tar.bz2" "${phantom_js_hash}" -tar xjf /tmp/$phantom_js.tar.bz2 -C /usr/local/share -ln -sf /usr/local/share/$phantom_js/bin/phantomjs /usr/local/bin + +# Define the version and hash of PhantomJS to be installed +dir_name=phantomjs-2.1.1-linux-x86_64 +archive_hash="86dd9a4bf4aee45f1a84c9f61cf1947c1d6dce9b9e8d2a907105da7852460d2f" + +# Download the archive and verify its integrity using checksum comparison +download_url="https://bitbucket.org/ariya/phantomjs/downloads/$dir_name.tar.bz2" +archive_path=$(download_with_retry "$download_url") +use_checksum_comparison "$archive_path" "$archive_hash" + +# Extract the archive and create a symbolic link to the executable +tar xjf "$archive_path" -C /usr/local/share +ln -sf /usr/local/share/$dir_name/bin/phantomjs /usr/local/bin invoke_tests "Tools" "Phantomjs" diff --git a/images/ubuntu/scripts/build/install-pulumi.sh b/images/ubuntu/scripts/build/install-pulumi.sh index 19fce9a49068..33d4d9533aac 100644 --- a/images/ubuntu/scripts/build/install-pulumi.sh +++ b/images/ubuntu/scripts/build/install-pulumi.sh @@ -10,12 +10,14 @@ source $HELPER_SCRIPTS/install.sh # Dowload Pulumi version=$(curl -fsSL "https://www.pulumi.com/latest-version") -URL="https://get.pulumi.com/releases/sdk/pulumi-v${version}-linux-x64.tar.gz" -download_with_retries "${URL}" "/tmp" "pulumi-v${version}.tar.gz" +download_url="https://get.pulumi.com/releases/sdk/pulumi-v${version}-linux-x64.tar.gz" +archive_path=$(download_with_retry "$download_url") + # Supply chain security - Pulumi external_hash=$(get_hash_from_remote_file "https://github.com/pulumi/pulumi/releases/download/v${version}/SHA512SUMS" "linux-x64.tar.gz") -use_checksum_comparison "/tmp/pulumi-v${version}.tar.gz" "${external_hash}" "512" +use_checksum_comparison "$archive_path" "$external_hash" "512" + # Unzipping Pulumi -tar --strip=1 -xf "/tmp/pulumi-v${version}.tar.gz" -C /usr/local/bin +tar --strip=1 -xf "$archive_path" -C /usr/local/bin invoke_tests "Tools" "Pulumi" diff --git a/images/ubuntu/scripts/build/install-pypy.sh b/images/ubuntu/scripts/build/install-pypy.sh index e4797c0e2d1c..51f09cbc5c05 100644 --- a/images/ubuntu/scripts/build/install-pypy.sh +++ b/images/ubuntu/scripts/build/install-pypy.sh @@ -12,16 +12,16 @@ function InstallPyPy { PACKAGE_URL=$1 - PACKAGE_TAR_NAME=$(echo $PACKAGE_URL | awk -F/ '{print $NF}') - echo "Downloading tar archive '$PACKAGE_TAR_NAME'" - PACKAGE_TAR_TEMP_PATH="/tmp/$PACKAGE_TAR_NAME" - download_with_retries $PACKAGE_URL "/tmp" $PACKAGE_TAR_NAME + PACKAGE_TAR_NAME=$(echo "$PACKAGE_URL" | awk -F/ '{print $NF}') + PACKAGE_NAME=${PACKAGE_TAR_NAME/.tar.bz2/} + + echo "Downloading tar archive '$PACKAGE_NAME'" + PACKAGE_TAR_TEMP_PATH=$(download_with_retry $PACKAGE_URL) - echo "Expand '$PACKAGE_TAR_NAME' to the /tmp folder" - tar xf $PACKAGE_TAR_TEMP_PATH -C /tmp + echo "Expand '$PACKAGE_NAME' to the /tmp folder" + tar xf "$PACKAGE_TAR_TEMP_PATH" -C /tmp # Get Python version - PACKAGE_NAME=${PACKAGE_TAR_NAME/.tar.bz2/} MAJOR_VERSION=$(echo ${PACKAGE_NAME/pypy/} | cut -d. -f1) PYTHON_MAJOR="python$MAJOR_VERSION" diff --git a/images/ubuntu/scripts/build/install-ruby.sh b/images/ubuntu/scripts/build/install-ruby.sh index de5de806191a..5241a73c4cde 100644 --- a/images/ubuntu/scripts/build/install-ruby.sh +++ b/images/ubuntu/scripts/build/install-ruby.sh @@ -42,10 +42,10 @@ for TOOLSET_VERSION in ${TOOLSET_VERSIONS[@]}; do echo "Downloading tar archive $PACKAGE_TAR_NAME" DOWNLOAD_URL="https://github.com/ruby/ruby-builder/releases/download/toolcache/${PACKAGE_TAR_NAME}" - download_with_retries $DOWNLOAD_URL "/tmp" $PACKAGE_TAR_NAME + PACKAGE_ARCHIVE_PATH=$(download_with_retry "$DOWNLOAD_URL") echo "Expand '$PACKAGE_TAR_NAME' to the '$RUBY_VERSION_PATH' folder" - tar xf "/tmp/$PACKAGE_TAR_NAME" -C $RUBY_VERSION_PATH + tar xf "$PACKAGE_ARCHIVE_PATH" -C $RUBY_VERSION_PATH COMPLETE_FILE_PATH="$RUBY_VERSION_PATH/x64.complete" if [ ! -f $COMPLETE_FILE_PATH ]; then diff --git a/images/ubuntu/scripts/build/install-runner-package.sh b/images/ubuntu/scripts/build/install-runner-package.sh index 569a4a61cc7e..967c0466e4be 100644 --- a/images/ubuntu/scripts/build/install-runner-package.sh +++ b/images/ubuntu/scripts/build/install-runner-package.sh @@ -7,12 +7,9 @@ # Source the helpers for use with the script source $HELPER_SCRIPTS/install.sh -DOWNLOAD_URL=$(get_github_package_download_url "actions/runner" 'test("actions-runner-linux-x64-[0-9]+\\.[0-9]{3}\\.[0-9]+\\.tar\\.gz")') +download_url=$(get_github_package_download_url "actions/runner" 'test("actions-runner-linux-x64-[0-9]+\\.[0-9]{3}\\.[0-9]+\\.tar\\.gz")') +archive_name="${download_url##*/}" +archive_path=$(download_with_retry "$download_url") -FILE_NAME="${DOWNLOAD_URL##*/}" - -sudo mkdir -p /opt/runner-cache - -download_with_retries "${DOWNLOAD_URL}" "/tmp" "${FILE_NAME}" - -sudo mv /tmp/$FILE_NAME /opt/runner-cache/$FILE_NAME +mkdir -p /opt/runner-cache +mv "$archive_path" "/opt/runner-cache/$archive_name" diff --git a/images/ubuntu/scripts/build/install-sbt.sh b/images/ubuntu/scripts/build/install-sbt.sh index ff90abced25b..ae7610f2d8dd 100644 --- a/images/ubuntu/scripts/build/install-sbt.sh +++ b/images/ubuntu/scripts/build/install-sbt.sh @@ -7,9 +7,9 @@ source $HELPER_SCRIPTS/install.sh # Install latest sbt release -downloadUrl=$(get_github_package_download_url "sbt/sbt" "endswith(\".tgz\")") -download_with_retries "$downloadUrl" "/tmp" "sbt.tgz" -tar zxf /tmp/sbt.tgz -C /usr/share +download_url=$(get_github_package_download_url "sbt/sbt" "endswith(\".tgz\")") +archive_path=$(download_with_retry "$download_url") +tar zxf "$archive_path" -C /usr/share ln -s /usr/share/sbt/bin/sbt /usr/bin/sbt invoke_tests "Tools" "Sbt" diff --git a/images/ubuntu/scripts/build/install-selenium.sh b/images/ubuntu/scripts/build/install-selenium.sh index c24473378a5d..0cbc90408bf6 100644 --- a/images/ubuntu/scripts/build/install-selenium.sh +++ b/images/ubuntu/scripts/build/install-selenium.sh @@ -8,19 +8,17 @@ source $HELPER_SCRIPTS/install.sh source $HELPER_SCRIPTS/etc-environment.sh -# Download Selenium server SELENIUM_MAJOR_VERSION=$(get_toolset_value '.selenium.version') -SELENIUM_BINARY_NAME=$(get_toolset_value '.selenium.binary_name') -SELENIUM_JAR_PATH="/usr/share/java" -SELENIUM_JAR_NAME="$SELENIUM_BINARY_NAME.jar" -SELENIUM_DOWNLOAD_URL=$(get_github_package_download_url "SeleniumHQ/selenium" "contains(\"${SELENIUM_BINARY_NAME}-${SELENIUM_MAJOR_VERSION}\") and endswith(\".jar\")") -download_with_retries $SELENIUM_DOWNLOAD_URL $SELENIUM_JAR_PATH $SELENIUM_JAR_NAME + +# Download Selenium server +SELENIUM_DOWNLOAD_URL=$(get_github_package_download_url "SeleniumHQ/selenium" "contains(\"selenium-server-${SELENIUM_MAJOR_VERSION}\") and endswith(\".jar\")") +SELENIUM_JAR_PATH=$(download_with_retry "$SELENIUM_DOWNLOAD_URL" "/usr/share/java/selenium-server.jar") # Create an epmty file to retrive selenium version -SELENIUM_FULL_VERSION=$(echo $SELENIUM_DOWNLOAD_URL | awk -F"${SELENIUM_BINARY_NAME}-|.jar" '{print $2}') -touch "$SELENIUM_JAR_PATH/$SELENIUM_BINARY_NAME-$SELENIUM_FULL_VERSION" +SELENIUM_FULL_VERSION=$(echo $SELENIUM_DOWNLOAD_URL | awk -F"selenium-server-|.jar" '{print $2}') +touch "/usr/share/java/selenium-server-$SELENIUM_FULL_VERSION" # Add SELENIUM_JAR_PATH environment variable -setEtcEnvironmentVariable "SELENIUM_JAR_PATH" "${SELENIUM_JAR_PATH}/${SELENIUM_JAR_NAME}" +setEtcEnvironmentVariable "SELENIUM_JAR_PATH" "$SELENIUM_JAR_PATH" invoke_tests "Tools" "Selenium" diff --git a/images/ubuntu/scripts/build/install-sqlpackage.sh b/images/ubuntu/scripts/build/install-sqlpackage.sh index 7623bd95c903..537d1b29bc0c 100644 --- a/images/ubuntu/scripts/build/install-sqlpackage.sh +++ b/images/ubuntu/scripts/build/install-sqlpackage.sh @@ -10,17 +10,15 @@ source $HELPER_SCRIPTS/os.sh # Install libssl1.1 dependency if isUbuntu22; then - download_with_retries "http://security.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.1f-1ubuntu2.20_amd64.deb" "/tmp" + libssl_deb_path=$(download_with_retry "http://security.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.1f-1ubuntu2.20_amd64.deb") libssl_hash="0b3251aee55db6e20d02f4b9a2b703c9874a85ab6a20b12f4870f52f91633d37" - use_checksum_comparison "/tmp/libssl1.1_1.1.1f-1ubuntu2.20_amd64.deb" "${libssl_hash}" - dpkg -i /tmp/libssl1.1_1.1.1f-1ubuntu2.20_amd64.deb + use_checksum_comparison "$libssl_deb_path" "$libssl_hash" + dpkg -i "$libssl_deb_path" fi # Install SqlPackage -download_with_retries "https://aka.ms/sqlpackage-linux" "." "sqlpackage.zip" - -unzip -qq sqlpackage.zip -d /usr/local/sqlpackage -rm -f sqlpackage.zip +archive_path=$(download_with_retry "https://aka.ms/sqlpackage-linux") +unzip -qq "$archive_path" -d /usr/local/sqlpackage chmod +x /usr/local/sqlpackage/sqlpackage ln -sf /usr/local/sqlpackage/sqlpackage /usr/local/bin diff --git a/images/ubuntu/scripts/build/install-swift.sh b/images/ubuntu/scripts/build/install-swift.sh index ca2f6e3f41b1..64fc6637f237 100644 --- a/images/ubuntu/scripts/build/install-swift.sh +++ b/images/ubuntu/scripts/build/install-swift.sh @@ -9,33 +9,33 @@ source $HELPER_SCRIPTS/install.sh source $HELPER_SCRIPTS/etc-environment.sh # Install -image_label="$(lsb_release -rs)" +image_label="ubuntu$(lsb_release -rs)" swift_version=$(curl -fsSL "https://api.github.com/repos/apple/swift/releases/latest" | jq -r '.tag_name | match("[0-9.]+").string') +swift_release_name="swift-${swift_version}-RELEASE-${image_label}" -swift_tar_name="swift-$swift_version-RELEASE-ubuntu$image_label.tar.gz" -swift_tar_url="https://swift.org/builds/swift-$swift_version-release/ubuntu${image_label//./}/swift-$swift_version-RELEASE/$swift_tar_name" -download_with_retries $swift_tar_url "/tmp" "$swift_tar_name" +archive_url="https://swift.org/builds/swift-${swift_version}-release/${image_label//./}/swift-${swift_version}-RELEASE/${swift_release_name}.tar.gz" +archive_path=$(download_with_retry "$archive_url") # Verifing pgp signature using official swift pgp key. Referring to https://www.swift.org/install/linux/#Installation-via-Tarball -# Download swift pgp key -download_with_retries "https://swift.org/keys/all-keys.asc" "/tmp" "all-keys.asc" -# Import swift pgp key -gpg --no-default-keyring --keyring swift --import /tmp/all-keys.asc -# Download signature file -download_with_retries "$swift_tar_url.sig" "/tmp" "$swift_tar_name.sig" -# Verify signature -gpg --no-default-keyring --keyring swift --verify "/tmp/$swift_tar_name.sig" "/tmp/$swift_tar_name" +# Download and import swift pgp key +pgp_key_path=$(download_with_retry "https://swift.org/keys/all-keys.asc") +gpg --no-default-keyring --keyring swift --import "$pgp_key_path" + +# Download and verify signature +signature_path=$(download_with_retry "${archive_url}.sig") +gpg --no-default-keyring --keyring swift --verify "$signature_path" "$archive_path" + # Remove swift pgp public key with temporary keyring rm ~/.gnupg/swift - -tar xzf /tmp/$swift_tar_name +# Extract and install swift +tar xzf "$archive_path" -C /tmp SWIFT_INSTALL_ROOT="/usr/share/swift" SWIFT_BIN_ROOT="$SWIFT_INSTALL_ROOT/usr/bin" SWIFT_LIB_ROOT="$SWIFT_INSTALL_ROOT/usr/lib" -mv swift-$swift_version-RELEASE-ubuntu$image_label $SWIFT_INSTALL_ROOT +mv "/tmp/${swift_release_name}" $SWIFT_INSTALL_ROOT mkdir -p /usr/local/lib ln -s "$SWIFT_BIN_ROOT/swift" /usr/local/bin/swift diff --git a/images/ubuntu/scripts/build/install-terraform.sh b/images/ubuntu/scripts/build/install-terraform.sh index c2da2d631edc..7392eb839e51 100644 --- a/images/ubuntu/scripts/build/install-terraform.sh +++ b/images/ubuntu/scripts/build/install-terraform.sh @@ -7,10 +7,8 @@ source $HELPER_SCRIPTS/install.sh # Install Terraform -URL=$(curl -fsSL https://api.releases.hashicorp.com/v1/releases/terraform/latest | jq -r '.builds[] | select((.arch=="amd64") and (.os=="linux")).url') -ZIP_NAME="terraform_linux_amd64.zip" -download_with_retries "${URL}" "/tmp" "${ZIP_NAME}" -unzip -qq "/tmp/${ZIP_NAME}" -d /usr/local/bin -rm -f "/tmp/${ZIP_NAME}" +download_url=$(curl -fsSL https://api.releases.hashicorp.com/v1/releases/terraform/latest | jq -r '.builds[] | select((.arch=="amd64") and (.os=="linux")).url') +archive_path=$(download_with_retry "${download_url}") +unzip -qq "$archive_path" -d /usr/local/bin invoke_tests "Tools" "Terraform" diff --git a/images/ubuntu/scripts/build/install-yq.sh b/images/ubuntu/scripts/build/install-yq.sh index 677a84cb42a6..f4f26dce8524 100644 --- a/images/ubuntu/scripts/build/install-yq.sh +++ b/images/ubuntu/scripts/build/install-yq.sh @@ -1,20 +1,22 @@ #!/bin/bash -e ################################################################################ ## File: install-yq.sh -## Desc: Install YQ -## Supply chain security: YQ - checksum validation +## Desc: Install yq - a command-line YAML, JSON and XML processor +## Supply chain security: yq - checksum validation ################################################################################ # Source the helpers for use with the script source $HELPER_SCRIPTS/install.sh -# Download YQ +# Download yq base_url="https://github.com/mikefarah/yq/releases/latest/download" -download_with_retries "${base_url}/yq_linux_amd64" "/tmp" "yq" -# Supply chain security - YQ +binary_path=$(download_with_retry "${base_url}/yq_linux_amd64") + +# Supply chain security - yq external_hash=$(get_hash_from_remote_file "${base_url}/checksums" "yq_linux_amd64 " "" " " "19") -use_checksum_comparison "/tmp/yq" "${external_hash}" -# Install YQ -sudo install /tmp/yq /usr/bin/yq +use_checksum_comparison "$binary_path" "$external_hash" + +# Install yq +sudo install "$binary_path" /usr/bin/yq invoke_tests "Tools" "yq" diff --git a/images/ubuntu/scripts/build/install-zstd.sh b/images/ubuntu/scripts/build/install-zstd.sh index 9c3b6c593265..5f4db375f9fd 100644 --- a/images/ubuntu/scripts/build/install-zstd.sh +++ b/images/ubuntu/scripts/build/install-zstd.sh @@ -10,19 +10,29 @@ source $HELPER_SCRIPTS/install.sh # Download zstd release_tag=$(curl -fsSL https://api.github.com/repos/facebook/zstd/releases/latest | jq -r '.tag_name') -zstd_tar_name=zstd-${release_tag//v}.tar.gz -URL=https://github.com/facebook/zstd/releases/download/${release_tag}/${zstd_tar_name} -download_with_retries "${URL}" "/tmp" "${zstd_tar_name}" +release_name="zstd-${release_tag//v}" +download_url="https://github.com/facebook/zstd/releases/download/${release_tag}/${release_name}.tar.gz" +archive_path=$(download_with_retry "${download_url}") + # Supply chain security - zstd -external_hash=$(get_hash_from_remote_file "${URL}.sha256" "${zstd_tar_name}") -use_checksum_comparison "/tmp/${zstd_tar_name}" "${external_hash}" +external_hash=$(get_hash_from_remote_file "${download_url}.sha256" "${release_name}.tar.gz") +use_checksum_comparison "$archive_path" "$external_hash" + # Install zstd apt-get install -y liblz4-dev -tar xzf /tmp/$zstd_tar_name -C /tmp -make -C /tmp/zstd-${release_tag//v}/contrib/pzstd all -make -C /tmp/zstd-${release_tag//v} zstd-release -for copyprocess in zstd zstdless zstdgrep; do cp /tmp/zstd-${release_tag//v}/programs/$copyprocess /usr/local/bin/; done -cp /tmp/zstd-${release_tag//v}/contrib/pzstd/pzstd /usr/local/bin/ -for symlink in zstdcat zstdmt unzstd; do ln -sf /usr/local/bin/zstd /usr/local/bin/$symlink; done +tar xzf "$archive_path" -C /tmp + +make -C "/tmp/${release_name}/contrib/pzstd" all +make -C "/tmp/${release_name}" zstd-release + +for copyprocess in zstd zstdless zstdgrep; do + cp "/tmp/${release_name}/programs/${copyprocess}" /usr/local/bin/ +done + +cp "/tmp/${release_name}/contrib/pzstd/pzstd" /usr/local/bin/ + +for symlink in zstdcat zstdmt unzstd; do + ln -sf /usr/local/bin/zstd /usr/local/bin/${symlink} +done invoke_tests "Tools" "Zstd" diff --git a/images/ubuntu/scripts/docs-gen/SoftwareReport.Browsers.psm1 b/images/ubuntu/scripts/docs-gen/SoftwareReport.Browsers.psm1 index e3fa61e342b4..9ae8496344bf 100644 --- a/images/ubuntu/scripts/docs-gen/SoftwareReport.Browsers.psm1 +++ b/images/ubuntu/scripts/docs-gen/SoftwareReport.Browsers.psm1 @@ -34,8 +34,7 @@ function Get-EdgeDriverVersion { } function Get-SeleniumVersion { - $seleniumBinaryName = Get-ToolsetValue "selenium.binary_name" - $fullSeleniumVersion = (Get-ChildItem "/usr/share/java/${seleniumBinaryName}-*").Name -replace "${seleniumBinaryName}-" + $fullSeleniumVersion = (Get-ChildItem "/usr/share/java/selenium-server-*").Name -replace "selenium-server-" return $fullSeleniumVersion } diff --git a/images/ubuntu/scripts/helpers/install.sh b/images/ubuntu/scripts/helpers/install.sh index ee918f2b63ac..0f803f04bd45 100644 --- a/images/ubuntu/scripts/helpers/install.sh +++ b/images/ubuntu/scripts/helpers/install.sh @@ -4,50 +4,45 @@ ## Desc: Helper functions for installing tools ################################################################################ -download_with_retries() { -# Due to restrictions of bash functions, positional arguments are used here. -# In case if you using latest argument NAME, you should also set value to all previous parameters. -# Example: download_with_retries $ANDROID_SDK_URL "." "android_sdk.zip" - local URL="$1" - local DEST="${2:-.}" - local NAME="${3:-${URL##*/}}" - local COMPRESSED="$4" - - if [[ $COMPRESSED == "compressed" ]]; then - local COMMAND="curl $URL -4 -sL --compressed -o '$DEST/$NAME' -w '%{http_code}'" - else - local COMMAND="curl $URL -4 -sL -o '$DEST/$NAME' -w '%{http_code}'" - fi +download_with_retry() { + url=$1 + download_path=$2 - # Save current errexit state and disable it to prevent unexpected exit on error - if echo $SHELLOPTS | grep '\(^\|:\)errexit\(:\|$\)' > /dev/null; - then - local ERR_EXIT_ENABLED=true - else - local ERR_EXIT_ENABLED=false + if [ -z "$download_path" ]; then + download_path="/tmp/$(basename "$url")" fi - set +e - echo "Downloading '$URL' to '${DEST}/${NAME}'..." - retries=20 + echo "Downloading package from $url to $download_path..." >&2 + interval=30 - while [ $retries -gt 0 ]; do - ((retries--)) - test "$ERR_EXIT_ENABLED" = true && set +e - http_code=$(eval $COMMAND) - exit_code=$? - test "$ERR_EXIT_ENABLED" = true && set -e - if [ $http_code -eq 200 ] && [ $exit_code -eq 0 ]; then - echo "Download completed" - return 0 + download_start_time=$(date +%s) + + for ((retries=20; retries>0; retries--)); do + attempt_start_time=$(date +%s) + if http_code=$(curl -4sSLo "$download_path" "$url" -w '%{http_code}'); then + attempt_seconds=$(($(date +%s) - attempt_start_time)) + if [ "$http_code" -eq 200 ]; then + echo "Package downloaded in $attempt_seconds seconds" >&2 + break + else + echo "Received HTTP status code $http_code after $attempt_seconds seconds" >&2 + fi else - echo "Error — Either HTTP response code for '$URL' is wrong - '$http_code' or exit code is not 0 - '$exit_code'. Waiting $interval seconds before the next attempt, $retries attempts left" - sleep $interval + attempt_seconds=$(($(date +%s) - attempt_start_time)) + echo "Package download failed in $attempt_seconds seconds" >&2 + fi + + if [ "$retries" -le 1 ]; then + total_seconds=$(($(date +%s) - download_start_time)) + echo "Package download failed after $total_seconds seconds" >&2 + exit 1 fi + + echo "Waiting $interval seconds before retrying (retries left: $retries)..." >&2 + sleep $interval done - echo "Could not download $URL" - return 1 + echo "$download_path" } ## Use dpkg to figure out if a package has already been installed diff --git a/images/ubuntu/scripts/tests/Tools.Tests.ps1 b/images/ubuntu/scripts/tests/Tools.Tests.ps1 index e420314ef76b..34662055f7f7 100644 --- a/images/ubuntu/scripts/tests/Tools.Tests.ps1 +++ b/images/ubuntu/scripts/tests/Tools.Tests.ps1 @@ -208,8 +208,7 @@ Describe "Sbt" { Describe "Selenium" { It "Selenium is installed" { - $seleniumBinaryName = (Get-ToolsetContent).selenium.binary_name - $seleniumPath = Join-Path "/usr/share/java" "$seleniumBinaryName.jar" + $seleniumPath = Join-Path "/usr/share/java" "selenium-server.jar" $seleniumPath | Should -Exist } } diff --git a/images/ubuntu/toolsets/toolset-2004.json b/images/ubuntu/toolsets/toolset-2004.json index 6200b701efea..9b026e410a01 100644 --- a/images/ubuntu/toolsets/toolset-2004.json +++ b/images/ubuntu/toolsets/toolset-2004.json @@ -298,8 +298,7 @@ {"name": "fastlane"} ], "selenium": { - "version": "4", - "binary_name": "selenium-server" + "version": "4" }, "node": { "default": "18" diff --git a/images/ubuntu/toolsets/toolset-2204.json b/images/ubuntu/toolsets/toolset-2204.json index d6c699437876..b4213e10eb43 100644 --- a/images/ubuntu/toolsets/toolset-2204.json +++ b/images/ubuntu/toolsets/toolset-2204.json @@ -289,8 +289,7 @@ {"name": "fastlane"} ], "selenium": { - "version": "4", - "binary_name": "selenium-server" + "version": "4" }, "node": { "default": "18" From 92e22bd8c64ec15b0814870dc6a597a93d4a975d Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Thu, 30 Nov 2023 09:22:14 +0100 Subject: [PATCH 2491/3485] [Windows] Refactor helpers that verify hashsum and signature (#8886) --- .../scripts/build/Install-AliyunCli.ps1 | 3 +- .../scripts/build/Install-AndroidSDK.ps1 | 8 +- .../scripts/build/Install-Chocolatey.ps1 | 2 +- .../scripts/build/Install-CloudFoundryCli.ps1 | 2 +- .../scripts/build/Install-DotnetSDK.ps1 | 24 +-- .../scripts/build/Install-EdgeDriver.ps1 | 2 +- .../windows/scripts/build/Install-Firefox.ps1 | 2 +- .../scripts/build/Install-JavaTools.ps1 | 12 +- .../windows/scripts/build/Install-Kotlin.ps1 | 3 +- .../scripts/build/Install-KubernetesTools.ps1 | 3 +- .../windows/scripts/build/Install-Msys2.ps1 | 3 +- images/windows/scripts/build/Install-PyPy.ps1 | 13 +- images/windows/scripts/build/Install-Rust.ps1 | 4 +- .../windows/scripts/build/Install-Stack.ps1 | 3 +- .../windows/scripts/helpers/ImageHelpers.psm1 | 2 +- .../scripts/helpers/InstallHelpers.ps1 | 166 +++++++++++++----- .../scripts/helpers/VisualStudioHelpers.ps1 | 2 +- 17 files changed, 148 insertions(+), 106 deletions(-) diff --git a/images/windows/scripts/build/Install-AliyunCli.ps1 b/images/windows/scripts/build/Install-AliyunCli.ps1 index 29463fdd9b98..d4d5c13cb020 100644 --- a/images/windows/scripts/build/Install-AliyunCli.ps1 +++ b/images/windows/scripts/build/Install-AliyunCli.ps1 @@ -12,10 +12,9 @@ $downloadUrl = ($assets.browser_download_url -ilike "*aliyun-cli-windows-*-amd64 $packagePath = Invoke-DownloadWithRetry $downloadUrl #region Supply chain security - Alibaba Cloud CLI -$fileHash = (Get-FileHash -Path $packagePath -Algorithm SHA256).Hash $hashUrl = ($assets.browser_download_url -ilike "*SHASUMS256.txt*") | Select-Object -First 1 $externalHash = (Invoke-RestMethod -Uri $hashURL).ToString().Split("`n").Where({ $_ -ilike "*$installerFileName*" }).Split(' ')[0] -Use-ChecksumComparison $fileHash $externalHash +Test-FileChecksum $packagePath -ExpectedSHA256Sum $externalHash #endregion Write-Host "Expand aliyun-cli archive" diff --git a/images/windows/scripts/build/Install-AndroidSDK.ps1 b/images/windows/scripts/build/Install-AndroidSDK.ps1 index 32eb14287703..e5da5c85d305 100644 --- a/images/windows/scripts/build/Install-AndroidSDK.ps1 +++ b/images/windows/scripts/build/Install-AndroidSDK.ps1 @@ -35,7 +35,7 @@ function Install-AndroidSDKPackages { [Parameter(Mandatory = $true)] [AllowEmptyCollection()] [AllowNull()] - [string[]]$Packages + [string[]] $Packages ) # The sdkmanager.bat script is used to install Android SDK packages. @@ -63,11 +63,7 @@ $androidToolset = (Get-ToolsetContent).android $cmdlineToolsUrl = $androidToolset.commandline_tools_url $cmdlineToolsArchPath = Invoke-DownloadWithRetry $cmdlineToolsUrl -#region Supply chain security -$localFileHash = (Get-FileHash -Path $cmdlineToolsArchPath -Algorithm SHA256).Hash - -Use-ChecksumComparison -LocalFileHash $localFileHash -DistributorFileHash $androidToolset.hash -#endregion +Test-FileChecksum $cmdlineToolsArchPath -ExpectedSHA256Sum $androidToolset.hash Expand-7ZipArchive -Path $cmdlineToolsArchPath -DestinationPath "${SDKInstallRoot}\cmdline-tools" diff --git a/images/windows/scripts/build/Install-Chocolatey.ps1 b/images/windows/scripts/build/Install-Chocolatey.ps1 index c3b2feffc268..2f9a4b873037 100644 --- a/images/windows/scripts/build/Install-Chocolatey.ps1 +++ b/images/windows/scripts/build/Install-Chocolatey.ps1 @@ -25,7 +25,7 @@ if ($userPath) { # Verify and run choco installer $signatureThumbprint = "83AC7D88C66CB8680BCE802E0F0F5C179722764B" $InstallScriptPath = Invoke-DownloadWithRetry 'https://chocolatey.org/install.ps1' -Test-FileSignature -FilePath $InstallScriptPath -ExpectedThumbprint $signatureThumbprint +Test-FileSignature -Path $InstallScriptPath -ExpectedThumbprint $signatureThumbprint Invoke-Expression $InstallScriptPath # Turn off confirmation diff --git a/images/windows/scripts/build/Install-CloudFoundryCli.ps1 b/images/windows/scripts/build/Install-CloudFoundryCli.ps1 index f989a63bb5c3..5df9c8a4109a 100644 --- a/images/windows/scripts/build/Install-CloudFoundryCli.ps1 +++ b/images/windows/scripts/build/Install-CloudFoundryCli.ps1 @@ -21,6 +21,6 @@ Add-MachinePathItem $CloudFoundryCliPath # Validate cf signature $CloudFoundrySignatureThumbprint = "4C69EDD13930ED01B83DD1D17B09C434DC1F2177" -Test-FileSignature -FilePath "$CloudFoundryCliPath\cf.exe" -ExpectedThumbprint $CloudFoundrySignatureThumbprint +Test-FileSignature -Path "$CloudFoundryCliPath\cf.exe" -ExpectedThumbprint $CloudFoundrySignatureThumbprint Invoke-PesterTests -TestFile "CLI.Tools" -TestName "CloudFoundry CLI" diff --git a/images/windows/scripts/build/Install-DotnetSDK.ps1 b/images/windows/scripts/build/Install-DotnetSDK.ps1 index 3eb9461bd780..d4198c92b9d3 100644 --- a/images/windows/scripts/build/Install-DotnetSDK.ps1 +++ b/images/windows/scripts/build/Install-DotnetSDK.ps1 @@ -22,7 +22,7 @@ function Get-SDKVersionsToInstall ( $currentReleases = $currentReleases.'releases' | Where-Object { !$_.'release-version'.Contains('-') } $sdks = @() - ForEach ($release in $currentReleases) { + foreach ($release in $currentReleases) { $sdks += $release.'sdk' $sdks += $release.'sdks' } @@ -30,7 +30,7 @@ function Get-SDKVersionsToInstall ( return $sdks.version ` | Sort-Object { [Version] $_ } -Unique ` | Group-Object { $_.Substring(0, $_.LastIndexOf('.') + 2) } ` - | Foreach-Object { $_.Group[-1] } + | ForEach-Object { $_.Group[-1] } } function Invoke-Warmup ( @@ -62,9 +62,7 @@ function InstallSDKVersion ( #region Supply chain security $distributorFileHash = (Invoke-RestMethod -Uri "https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/$dotnetVersion/releases.json").releases.sdks.Where({ $_.version -eq $SdkVersion }).files.Where({ $_.name -eq 'dotnet-sdk-win-x64.zip' }).hash - $localFileHash = (Get-FileHash -Path $ZipPath -Algorithm 'SHA512').Hash - - Use-ChecksumComparison -LocalFileHash $localFileHash -DistributorFileHash $distributorFileHash + Test-FileChecksum $ZipPath -ExpectedSHA512Sum $distributorFileHash #endregion } else { Write-Host "Sdk version $sdkVersion already installed" @@ -87,29 +85,23 @@ function InstallAllValidSdks() { $installationUrl = "https://dot.net/v1/${installationName}" Invoke-DownloadWithRetry -Url $installationUrl -Path ".\$installationName" - ForEach ($dotnetVersion in $dotnetVersions) - { + foreach ($dotnetVersion in $dotnetVersions) { $sdkVersionsToInstall = Get-SDKVersionsToInstall -DotnetVersion $dotnetVersion - - ForEach ($sdkVersion in $sdkVersionsToInstall) - { + foreach ($sdkVersion in $sdkVersionsToInstall) { InstallSDKVersion -SdkVersion $sdkVersion -DotnetVersion $dotnetVersion -Warmup $warmup } } } -function InstallTools() -{ +function InstallTools() { $dotnetTools = (Get-ToolsetContent).dotnet.tools - ForEach ($dotnetTool in $dotnetTools) - { + foreach ($dotnetTool in $dotnetTools) { dotnet tool install $($dotnetTool.name) --tool-path "C:\Users\Default\.dotnet\tools" --add-source https://api.nuget.org/v3/index.json | Out-Null } } -function RunPostInstallationSteps() -{ +function RunPostInstallationSteps() { # Add dotnet to PATH Add-MachinePathItem "C:\Program Files\dotnet" diff --git a/images/windows/scripts/build/Install-EdgeDriver.ps1 b/images/windows/scripts/build/Install-EdgeDriver.ps1 index a4a4223c02f5..a8c54c35412f 100644 --- a/images/windows/scripts/build/Install-EdgeDriver.ps1 +++ b/images/windows/scripts/build/Install-EdgeDriver.ps1 @@ -28,7 +28,7 @@ Expand-7ZipArchive -Path $archivePath -DestinationPath $edgeDriverPath #Validate the EdgeDriver signature $signatureThumbprint = "CB9C4FBEA1D87D2D468AC5A9CAAB0163F6AD8401" -Test-FileSignature -FilePath "$edgeDriverPath\msedgedriver.exe" -ExpectedThumbprint $signatureThumbprint +Test-FileSignature -Path "$edgeDriverPath\msedgedriver.exe" -ExpectedThumbprint $signatureThumbprint Write-Host "Setting the environment variables..." [Environment]::SetEnvironmentVariable("EdgeWebDriver", $EdgeDriverPath, "Machine") diff --git a/images/windows/scripts/build/Install-Firefox.ps1 b/images/windows/scripts/build/Install-Firefox.ps1 index 66e6d443c3d0..b9c84777491e 100644 --- a/images/windows/scripts/build/Install-Firefox.ps1 +++ b/images/windows/scripts/build/Install-Firefox.ps1 @@ -50,7 +50,7 @@ Expand-7ZipArchive -Path $GeckoDriverArchPath -DestinationPath $GeckoDriverPath # Validate Gecko WebDriver signature $GeckoDriverSignatureThumbprint = "1326B39C3D5D2CA012F66FB439026F7B59CB1974" -Test-FileSignature -FilePath "$GeckoDriverPath/geckodriver.exe" -ExpectedThumbprint $GeckoDriverSignatureThumbprint +Test-FileSignature -Path "$GeckoDriverPath/geckodriver.exe" -ExpectedThumbprint $GeckoDriverSignatureThumbprint Write-Host "Setting the environment variables..." Add-MachinePathItem -PathItem $GeckoDriverPath diff --git a/images/windows/scripts/build/Install-JavaTools.ps1 b/images/windows/scripts/build/Install-JavaTools.ps1 index 5769f38fffee..1a9572876940 100644 --- a/images/windows/scripts/build/Install-JavaTools.ps1 +++ b/images/windows/scripts/build/Install-JavaTools.ps1 @@ -64,12 +64,7 @@ function Install-JavaJDK { # Download and extract java binaries to temporary folder $downloadUrl = $asset.binary.package.link $archivePath = Invoke-DownloadWithRetry $downloadUrl - - #region Supply chain security - JDK - $fileHash = (Get-FileHash -Path $archivePath -Algorithm SHA256).Hash - $externalHash = $asset.binary.package.checksum - Use-ChecksumComparison $fileHash $externalHash - #endregion + Test-FileChecksum $archivePath -ExpectedSHA256Sum $asset.binary.package.checksum # We have to replace '+' sign in the version to '-' due to the issue with incorrect path in Android builds https://github.com/actions/runner-images/issues/3014 $fullJavaVersion = $asset.version.semver -replace '\+', '-' @@ -123,7 +118,7 @@ Install-ChocoPackage maven -ArgumentList "--version=$versionToInstall" Install-ChocoPackage gradle # Add maven env variables to Machine -[string]$m2 = ([Environment]::GetEnvironmentVariable("PATH", "Machine")).Split(";") -match "maven" +[string] $m2 = ([Environment]::GetEnvironmentVariable("PATH", "Machine")).Split(";") -match "maven" $m2_repo = 'C:\ProgramData\m2' New-Item -Path $m2_repo -ItemType Directory -Force | Out-Null @@ -138,8 +133,7 @@ $sha256sum = '79479DDE416B082F38ECD1F2F7C6DEBD4D0C2249AF80FD046D1CE05D628F2EC6' $coberturaPath = "C:\cobertura-2.1.1" $archivePath = Invoke-DownloadWithRetry $uri -$fileHash = (Get-FileHash -Path $archivePath -Algorithm SHA256).Hash -Use-ChecksumComparison $fileHash $sha256sum +Test-FileChecksum $archivePath -ExpectedSHA256Sum $sha256sum Expand-7ZipArchive -Path $archivePath -DestinationPath "C:\" [Environment]::SetEnvironmentVariable("COBERTURA_HOME", $coberturaPath, "Machine") diff --git a/images/windows/scripts/build/Install-Kotlin.ps1 b/images/windows/scripts/build/Install-Kotlin.ps1 index 9d848abfabc0..71fe905102c4 100644 --- a/images/windows/scripts/build/Install-Kotlin.ps1 +++ b/images/windows/scripts/build/Install-Kotlin.ps1 @@ -14,9 +14,8 @@ $kotlinDownloadUrl = Resolve-GithubReleaseAssetUrl ` $kotlinArchivePath = Invoke-DownloadWithRetry $kotlinDownloadUrl #region Supply chain security -$fileHash = (Get-FileHash -Path $kotlinArchivePath -Algorithm SHA256).Hash $externalHash = Get-HashFromGitHubReleaseBody -RepoOwner "JetBrains" -RepoName "kotlin" -FileName "$kotlinBinaryName-*.zip" -Version $kotlinVersion -WordNumber 2 -Use-ChecksumComparison $fileHash $externalHash +Test-FileChecksum $kotlinArchivePath -ExpectedSHA256Sum $externalHash #endregion Write-Host "Expand Kotlin archive" diff --git a/images/windows/scripts/build/Install-KubernetesTools.ps1 b/images/windows/scripts/build/Install-KubernetesTools.ps1 index 1e82244dc30e..529957f7adac 100644 --- a/images/windows/scripts/build/Install-KubernetesTools.ps1 +++ b/images/windows/scripts/build/Install-KubernetesTools.ps1 @@ -14,10 +14,9 @@ $null = New-Item -Path $destFilePath -ItemType Directory -Force $packagePath = Invoke-DownloadWithRetry -Url $kindDownloadLink -Path "$destFilePath\kind.exe" #region Supply chain security - Kind -$fileHash = (Get-FileHash -Path $packagePath -Algorithm SHA256).Hash $hashUrl = ($assets.browser_download_url -match "kind-windows-amd64.sha256sum") | Select-Object -First 1 $externalHash = (Invoke-RestMethod -Uri $hashURL).ToString().Split("`n").Where({ $_ -ilike "*kind-windows-amd64*" }).Split(' ')[0] -Use-ChecksumComparison $fileHash $externalHash +Test-FileChecksum $packagePath -ExpectedSHA256Sum $externalHash #endregion Add-MachinePathItem $destFilePath diff --git a/images/windows/scripts/build/Install-Msys2.ps1 b/images/windows/scripts/build/Install-Msys2.ps1 index 09ba95a101fb..45e0793f13af 100644 --- a/images/windows/scripts/build/Install-Msys2.ps1 +++ b/images/windows/scripts/build/Install-Msys2.ps1 @@ -21,10 +21,9 @@ function Install-Msys2 { Write-Host "Finished download" #region Supply chain security - Kind - $fileHash = (Get-FileHash -Path $msys2File -Algorithm SHA256).Hash $hashUrl = ($assets.browser_download_url -match "msys2-checksums.txt") | Select-Object -First 1 $externalHash = (Invoke-RestMethod -Uri $hashURL).ToString().Split("`n").Where({ $_ -ilike "*msys2-x86_64*" }).Split(' ')[0] - Use-ChecksumComparison $fileHash $externalHash + Test-FileChecksum $msys2File -ExpectedSHA256Sum $externalHash #endregion # extract tar.xz to C:\ diff --git a/images/windows/scripts/build/Install-PyPy.ps1 b/images/windows/scripts/build/Install-PyPy.ps1 index 9fb92b718292..d0ae9fb2a916 100644 --- a/images/windows/scripts/build/Install-PyPy.ps1 +++ b/images/windows/scripts/build/Install-PyPy.ps1 @@ -7,8 +7,8 @@ function Install-PyPy { param( - [String]$PackagePath, - [String]$Architecture + [String] $PackagePath, + [String] $Architecture ) # Create PyPy toolcache folder @@ -102,16 +102,13 @@ foreach($toolsetVersion in $toolsetVersions.versions) $tempPyPyPackagePath = Invoke-DownloadWithRetry $latestMajorPyPyVersion.download_url #region Supply chain security - $localFileHash = (Get-FileHash -Path $tempPyPyPackagePath -Algorithm SHA256).Hash $distributorFileHash = $null - - ForEach($node in $checksums) { - if($node.InnerText -ilike "*${filename}*") { + foreach ($node in $checksums) { + if ($node.InnerText -ilike "*${filename}*") { $distributorFileHash = $node.InnerText.ToString().Split("`n").Where({ $_ -ilike "*${filename}*" }).Split(' ')[0] } } - - Use-ChecksumComparison -LocalFileHash $localFileHash -DistributorFileHash $distributorFileHash + Test-FileChecksum $tempPyPyPackagePath -ExpectedSHA256Sum $distributorFileHash #endregion Install-PyPy -PackagePath $tempPyPyPackagePath -Architecture $toolsetVersions.arch diff --git a/images/windows/scripts/build/Install-Rust.ps1 b/images/windows/scripts/build/Install-Rust.ps1 index 032915af58c9..e8d19f4061bd 100644 --- a/images/windows/scripts/build/Install-Rust.ps1 +++ b/images/windows/scripts/build/Install-Rust.ps1 @@ -13,10 +13,8 @@ $env:CARGO_HOME = "C:\Users\Default\.cargo" $rustupPath = Invoke-DownloadWithRetry "https://static.rust-lang.org/rustup/dist/x86_64-pc-windows-msvc/rustup-init.exe" #region Supply chain security -$localFileHash = (Get-FileHash -Path (Join-Path ${env:TEMP} 'rustup-init.exe') -Algorithm SHA256).Hash $distributorFileHash = (Invoke-RestMethod -Uri 'https://static.rust-lang.org/rustup/dist/x86_64-pc-windows-msvc/rustup-init.exe.sha256').Trim() - -Use-ChecksumComparison -LocalFileHash $localFileHash -DistributorFileHash $distributorFileHash +Test-FileChecksum (Join-Path ${env:TEMP} 'rustup-init.exe') -ExpectedSHA256Sum $distributorFileHash #endregion # Install Rust by running rustup-init.exe (disabling the confirmation prompt with -y) diff --git a/images/windows/scripts/build/Install-Stack.ps1 b/images/windows/scripts/build/Install-Stack.ps1 index 85e1a199437a..5c5180407f52 100644 --- a/images/windows/scripts/build/Install-Stack.ps1 +++ b/images/windows/scripts/build/Install-Stack.ps1 @@ -16,10 +16,9 @@ $DestinationPath = Join-Path $StackToolcachePath "x64" $StackArchivePath = Invoke-DownloadWithRetry $DownloadUrl #region Supply chain security - Stack -$fileHash = (Get-FileHash -Path $StackArchivePath -Algorithm SHA256).Hash $hashUrl = $StackReleasesJson.assets | Where-Object { $_.name.EndsWith("$DownloadFilePattern.sha256") } | Select-Object -ExpandProperty "browser_download_url" -First 1 $externalHash = (Invoke-RestMethod -Uri $hashURL).ToString().Split("`n").Where({ $_ -ilike "*$DownloadFilePattern*" }).Split(' ')[0] -Use-ChecksumComparison $fileHash $externalHash +Test-FileChecksum $StackArchivePath -ExpectedSHA256Sum $externalHash #endregion Write-Host "Expand stack archive" diff --git a/images/windows/scripts/helpers/ImageHelpers.psm1 b/images/windows/scripts/helpers/ImageHelpers.psm1 index fbc2ae04197c..ed65b201a258 100644 --- a/images/windows/scripts/helpers/ImageHelpers.psm1 +++ b/images/windows/scripts/helpers/ImageHelpers.psm1 @@ -38,8 +38,8 @@ Export-ModuleMember -Function @( 'Get-VisualStudioInstance' 'Get-VisualStudioComponents' 'Get-WindowsUpdateStates' - 'Use-ChecksumComparison' 'Get-HashFromGitHubReleaseBody' + 'Test-FileChecksum' 'Test-FileSignature' 'Update-Environment' ) diff --git a/images/windows/scripts/helpers/InstallHelpers.ps1 b/images/windows/scripts/helpers/InstallHelpers.ps1 index c6c05f5b128f..5a5bef1e895e 100644 --- a/images/windows/scripts/helpers/InstallHelpers.ps1 +++ b/images/windows/scripts/helpers/InstallHelpers.ps1 @@ -75,20 +75,18 @@ function Install-Binary { if ($PSBoundParameters.ContainsKey('ExpectedSignature')) { if ($ExpectedSignature) { - Test-FileSignature -FilePath $filePath -ExpectedThumbprint $ExpectedSignature + Test-FileSignature -Path $filePath -ExpectedThumbprint $ExpectedSignature } else { throw "ExpectedSignature parameter is specified, but no signature is provided." } } if ($ExpectedSHA256Sum) { - $fileHash = (Get-FileHash -Path $filePath -Algorithm SHA256).Hash - Use-ChecksumComparison $fileHash $ExpectedSHA256Sum + Test-FileChecksum $filePath -ExpectedSHA256Sum $ExpectedSHA256Sum } if ($ExpectedSHA512Sum) { - $fileHash = (Get-FileHash -Path $filePath -Algorithm SHA512).Hash - Use-ChecksumComparison $fileHash $ExpectedSHA512Sum + Test-FileChecksum $filePath -ExpectedSHA512Sum $ExpectedSHA512Sum } if ($ExtraInstallArgs -and $InstallArgs) { @@ -388,7 +386,7 @@ function Get-TCToolVersionPath { # Take latest installed version in case if toolset version contains wildcards $foundVersion = Get-Item $versionPath ` - | Sort-Object -Property { [version]$_.name } -Descending ` + | Sort-Object -Property { [version] $_.name } -Descending ` | Select-Object -First 1 if (-not $foundVersion) { @@ -414,11 +412,11 @@ function Expand-7ZipArchive { Param ( [Parameter(Mandatory = $true)] - [string]$Path, + [string] $Path, [Parameter(Mandatory = $true)] - [string]$DestinationPath, + [string] $DestinationPath, [ValidateSet("x", "e")] - [char]$ExtractMethod = "x" + [char] $ExtractMethod = "x" ) Write-Host "Expand archive '$PATH' to '$DestinationPath' directory" @@ -455,7 +453,7 @@ function Get-AndroidPackages { #> Param ( - [string]$SDKRootPath + [string] $SDKRootPath ) if (-not $SDKRootPath) { @@ -503,9 +501,9 @@ function Get-AndroidPlatformPackages { #> Param ( - [string]$SDKRootPath, + [string] $SDKRootPath, [Alias("minVersion")] - [int]$minimumVersion = 0 + [int] $minimumVersion = 0 ) if (-not $SDKRootPath) { @@ -545,9 +543,9 @@ function Get-AndroidBuildToolPackages { #> Param ( - [string]$SDKRootPath, + [string] $SDKRootPath, [Alias("minVersion")] - [version]$minimumVersion = "0.0.0" + [version] $minimumVersion = "0.0.0" ) if (-not $SDKRootPath) { @@ -582,7 +580,7 @@ function Get-AndroidInstalledPackages { Param ( - [string]$SDKRootPath + [string] $SDKRootPath ) if (-not $SDKRootPath) { @@ -750,7 +748,7 @@ function Resolve-GithubReleaseAssetUrl { } # Sort releases by version - $releases = $releases | Sort-Object -Descending { [version]$_.version } + $releases = $releases | Sort-Object -Descending { [version] $_.version } # Select releases matching version if ($Version -eq "latest") { @@ -789,35 +787,18 @@ function Resolve-GithubReleaseAssetUrl { return ($matchedUrl -as [string]) } -function Use-ChecksumComparison { - param ( - [Parameter(Mandatory = $true)] - [string]$LocalFileHash, - [Parameter(Mandatory = $true)] - [string]$DistributorFileHash - ) - - Write-Verbose "Performing checksum verification" - - if ($LocalFileHash -ne $DistributorFileHash) { - throw "Checksum verification failed. Expected hash: $DistributorFileHash; Actual hash: $LocalFileHash." - } else { - Write-Verbose "Checksum verification passed" - } -} - function Get-HashFromGitHubReleaseBody { param ( - [string]$RepoOwner, - [string]$RepoName, + [string] $RepoOwner, + [string] $RepoName, [Parameter(Mandatory = $true)] - [string]$FileName, - [string]$Url, - [string]$Version = "latest", - [boolean]$IsPrerelease = $false, - [int]$SearchInCount = 100, - [string]$Delimiter = '|', - [int]$WordNumber = 1 + [string] $FileName, + [string] $Url, + [string] $Version = "latest", + [boolean] $IsPrerelease = $false, + [int] $SearchInCount = 100, + [string] $Delimiter = '|', + [int] $WordNumber = 1 ) if ($Url) { @@ -846,15 +827,104 @@ function Get-HashFromGitHubReleaseBody { } return $result } + +function Test-FileChecksum { + <# + .SYNOPSIS + Verifies the checksum of a file. + + .DESCRIPTION + The Test-FileChecksum function verifies the SHA256 or SHA512 checksum of a file against an expected value. + If the checksum does not match the expected value, the function throws an error. + + .PARAMETER Path + The path to the file for which to verify the checksum. + + .PARAMETER ExpectedSHA256Sum + The expected SHA256 checksum. If this parameter is provided, the function will calculate the SHA256 checksum of the file and compare it to this value. + + .PARAMETER ExpectedSHA512Sum + The expected SHA512 checksum. If this parameter is provided, the function will calculate the SHA512 checksum of the file and compare it to this value. + + .EXAMPLE + Test-FileChecksum -Path "C:\temp\file.txt" -ExpectedSHA256Sum "ABC123" + + Verifies that the SHA256 checksum of the file at C:\temp\file.txt is ABC123. + + .EXAMPLE + Test-FileChecksum -Path "C:\temp\file.txt" -ExpectedSHA512Sum "DEF456" + + Verifies that the SHA512 checksum of the file at C:\temp\file.txt is DEF456. + + #> + + param ( + [Parameter(Mandatory = $true, Position = 0)] + [string] $Path, + [Parameter(Mandatory = $false)] + [String] $ExpectedSHA256Sum, + [Parameter(Mandatory = $false)] + [String] $ExpectedSHA512Sum + ) + + Write-Verbose "Performing checksum verification" + + if ($ExpectedSHA256Sum -and $ExpectedSHA512Sum) { + throw "Only one of the ExpectedSHA256Sum and ExpectedSHA512Sum parameters can be provided" + } + + if (-not (Test-Path $Path)) { + throw "File not found: $Path" + } + + if ($ExpectedSHA256Sum) { + $fileHash = (Get-FileHash -Path $Path -Algorithm SHA256).Hash + $expectedHash = $ExpectedSHA256Sum + } + + if ($ExpectedSHA512Sum) { + $fileHash = (Get-FileHash -Path $Path -Algorithm SHA512).Hash + $expectedHash = $ExpectedSHA512Sum + } + + if ($fileHash -ne $expectedHash) { + throw "Checksum verification failed: expected $expectedHash, got $fileHash" + } else { + Write-Verbose "Checksum verification passed" + } +} + function Test-FileSignature { + <# + .SYNOPSIS + Tests the file signature of a given file. + + .DESCRIPTION + The Test-FileSignature function checks the signature of a file against the expected thumbprints. + It uses the Get-AuthenticodeSignature cmdlet to retrieve the signature information of the file. + If the signature status is not valid or the thumbprint does not match the expected thumbprints, an exception is thrown. + + .PARAMETER Path + Specifies the path of the file to test. + + .PARAMETER ExpectedThumbprint + Specifies the expected thumbprints to match against the file's signature. + + .EXAMPLE + Test-FileSignature -Path "C:\Path\To\File.exe" -ExpectedThumbprint "A1B2C3D4E5F6G7H8I9J0K1L2M3N4O5P6Q7R8S9T0" + + This example tests the signature of the file "C:\Path\To\File.exe" against the expected thumbprint "A1B2C3D4E5F6G7H8I9J0K1L2M3N4O5P6Q7R8S9T0". + + #> + param( + [Parameter(Mandatory = $true, Position = 0)] + [string] $Path, [Parameter(Mandatory = $true)] - [string]$FilePath, - [Parameter(Mandatory = $true)] - [string[]]$ExpectedThumbprint + [string[]] $ExpectedThumbprint ) - $signature = Get-AuthenticodeSignature $FilePath + $signature = Get-AuthenticodeSignature $Path if ($signature.Status -ne "Valid") { throw "Signature status is not valid. Status: $($signature.Status)" @@ -862,14 +932,14 @@ function Test-FileSignature { foreach ($thumbprint in $ExpectedThumbprint) { if ($signature.SignerCertificate.Thumbprint.Contains($thumbprint)) { - Write-Output "Signature for $FilePath is valid" + Write-Output "Signature for $Path is valid" $signatureMatched = $true return } } if ($signatureMatched) { - Write-Output "Signature for $FilePath is valid" + Write-Output "Signature for $Path is valid" } else { throw "Signature thumbprint do not match expected." } diff --git a/images/windows/scripts/helpers/VisualStudioHelpers.ps1 b/images/windows/scripts/helpers/VisualStudioHelpers.ps1 index 33fd7ffbbce3..a75baac49d94 100644 --- a/images/windows/scripts/helpers/VisualStudioHelpers.ps1 +++ b/images/windows/scripts/helpers/VisualStudioHelpers.ps1 @@ -41,7 +41,7 @@ Function Install-VisualStudio { $bootstrapperFilePath = Invoke-DownloadWithRetry $BootstrapperUrl # Verify that the bootstrapper is signed by Microsoft - Test-FileSignature -FilePath $bootstrapperFilePath -ExpectedThumbprint $SignatureThumbprint + Test-FileSignature -Path $bootstrapperFilePath -ExpectedThumbprint $SignatureThumbprint try { Write-Host "Enable short name support on Windows needed for Xamarin Android AOT, defaults appear to have been changed in Azure VMs" From 0c03739e5029bba032800b69036160ecd1b6dea8 Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Thu, 30 Nov 2023 10:23:27 +0100 Subject: [PATCH 2492/3485] [ubuntu] Refactor Common.Helpers (#8910) * [ubuntu] Refactor Common.Helpers * Move Get-AndroidPackages function from BeforeAll * Fix ParameterBinding --- .../docs-gen/SoftwareReport.Common.psm1 | 2 +- .../docs-gen/SoftwareReport.Helpers.psm1 | 13 ++ .../scripts/helpers/Common.Helpers.psm1 | 84 +++++++------ images/ubuntu/scripts/tests/Android.Tests.ps1 | 114 ++++++++++++++---- images/ubuntu/scripts/tests/Java.Tests.ps1 | 8 +- 5 files changed, 156 insertions(+), 65 deletions(-) diff --git a/images/ubuntu/scripts/docs-gen/SoftwareReport.Common.psm1 b/images/ubuntu/scripts/docs-gen/SoftwareReport.Common.psm1 index b22769f363b9..1d512df85677 100644 --- a/images/ubuntu/scripts/docs-gen/SoftwareReport.Common.psm1 +++ b/images/ubuntu/scripts/docs-gen/SoftwareReport.Common.psm1 @@ -135,7 +135,7 @@ function Get-HomebrewVersion { } function Get-CpanVersion { - $result = Get-CommandResult "cpan --version" -ExpectExitCode @(25, 255) + $result = Get-CommandResult "cpan --version" -ExpectedExitCode @(25, 255) $result.Output -match "version (?<version>\d+\.\d+) " | Out-Null return $Matches.version } diff --git a/images/ubuntu/scripts/docs-gen/SoftwareReport.Helpers.psm1 b/images/ubuntu/scripts/docs-gen/SoftwareReport.Helpers.psm1 index 1243cc74c96a..1f1ebf810614 100644 --- a/images/ubuntu/scripts/docs-gen/SoftwareReport.Helpers.psm1 +++ b/images/ubuntu/scripts/docs-gen/SoftwareReport.Helpers.psm1 @@ -39,3 +39,16 @@ function Get-AptSourceRepository { $sourceUrl = Get-Content "$PSScriptRoot/../helpers/apt-sources.txt" | Select-String -Pattern $PackageName | Take-OutputPart -Part (1..3) return $sourceUrl } + +function Get-OSVersionShort { + $(Get-OSVersionFull) | Take-OutputPart -Delimiter '.' -Part 0,1 +} + +function Get-OSVersionFull { + lsb_release -ds | Take-OutputPart -Part 1, 2 +} + +function Get-KernelVersion { + $kernelVersion = uname -r + return $kernelVersion +} diff --git a/images/ubuntu/scripts/helpers/Common.Helpers.psm1 b/images/ubuntu/scripts/helpers/Common.Helpers.psm1 index 5f0b3e068504..7faeb3739e37 100644 --- a/images/ubuntu/scripts/helpers/Common.Helpers.psm1 +++ b/images/ubuntu/scripts/helpers/Common.Helpers.psm1 @@ -1,8 +1,33 @@ function Get-CommandResult { + <# + .SYNOPSIS + Runs a command in bash and returns the output and exit code. + + .DESCRIPTION + Function runs a provided command in bash and returns the output and exit code as hashtable. + + .PARAMETER Command + The command to run. + + .PARAMETER ExpectedExitCode + The expected exit code. If the actual exit code does not match, an exception is thrown. + + .PARAMETER Multiline + If true, the output is returned as an array of strings. Otherwise, the output is returned as a single string. + + .PARAMETER ValidateExitCode + If true, the actual exit code is compared to the expected exit code. + + .EXAMPLE + $result = Get-CommandResult "ls -la" + + This command runs "ls -la" in bash and returns the output and exit code as hashtable. + + #> param ( [Parameter(Mandatory=$true)] [string] $Command, - [int[]] $ExpectExitCode = 0, + [int[]] $ExpectedExitCode = 0, [switch] $Multiline, [bool] $ValidateExitCode = $true ) @@ -12,7 +37,7 @@ function Get-CommandResult { $exitCode = $LASTEXITCODE if ($ValidateExitCode) { - if ($ExpectExitCode -notcontains $exitCode) { + if ($ExpectedExitCode -notcontains $exitCode) { try { throw "StdOut: '$stdout' ExitCode: '$exitCode'" } catch { @@ -24,24 +49,11 @@ function Get-CommandResult { } return @{ - Output = If ($Multiline -eq $true) { $stdout } else { [string]$stdout } + Output = If ($Multiline -eq $true) { $stdout } else { [string] $stdout } ExitCode = $exitCode } } -function Get-OSVersionShort { - $(Get-OSVersionFull) | Take-OutputPart -Delimiter '.' -Part 0,1 -} - -function Get-OSVersionFull { - lsb_release -ds | Take-OutputPart -Part 1, 2 -} - -function Get-KernelVersion { - $kernelVersion = uname -r - return $kernelVersion -} - function Test-IsUbuntu20 { return (lsb_release -rs) -eq "20.04" } @@ -56,6 +68,23 @@ function Get-ToolsetContent { } function Get-ToolsetValue { + <# + .SYNOPSIS + This function retrieves the value of a specific toolset. + + .DESCRIPTION + The Get-ToolsetValue is used to retrieve the value of a specific toolset. + The toolset is a collection of tools or settings in json format. + + .PARAMETER KeyPath + The path to the toolset value in json notation. + + .EXAMPLE + Get-ToolsetValue -Toolset "tool.arch.versions" + + This command returns the value of the nodes named "tool", "arch" and "versions" as PSCustomObject. + + #> param ( [Parameter(Mandatory = $true)] [string] $KeyPath @@ -64,30 +93,9 @@ function Get-ToolsetValue { $jsonNode = Get-ToolsetContent $pathParts = $KeyPath.Split(".") - # try to walk through all arguments consequentially to resolve specific json node + # walk through all arguments consequentially to resolve specific json node $pathParts | ForEach-Object { $jsonNode = $jsonNode.$_ } return $jsonNode } - -function Get-AndroidPackages { - $packagesListFile = "/usr/local/lib/android/sdk/packages-list.txt" - - if (-Not (Test-Path -Path $packagesListFile -PathType Leaf)) { - (/usr/local/lib/android/sdk/cmdline-tools/latest/bin/sdkmanager --list --verbose 2>&1) | - Where-Object { $_ -Match "^[^\s]" } | - Where-Object { $_ -NotMatch "^(Loading |Info: Parsing |---|\[=+|Installed |Available )" } | - Where-Object { $_ -NotMatch "^[^;]*$" } | - Out-File -FilePath $packagesListFile - - Write-Host Android packages list: - Get-Content $packagesListFile - } - - return Get-Content $packagesListFile -} - -function Get-EnvironmentVariable($variable) { - return [System.Environment]::GetEnvironmentVariable($variable) -} \ No newline at end of file diff --git a/images/ubuntu/scripts/tests/Android.Tests.ps1 b/images/ubuntu/scripts/tests/Android.Tests.ps1 index 0ed6847e5a6d..f841bd3a6ed2 100644 --- a/images/ubuntu/scripts/tests/Android.Tests.ps1 +++ b/images/ubuntu/scripts/tests/Android.Tests.ps1 @@ -1,16 +1,102 @@ Describe "Android" { + BeforeAll { + function Test-AndroidPackage { + <# + .SYNOPSIS + This function tests existance of an Android package. + + .DESCRIPTION + The Test-AndroidPackage function is used to test an existance of Android package in ANDROID_HOME path. + + .PARAMETER PackageName + The name of the Android package to test. + + .EXAMPLE + Test-AndroidPackage + + This command tests the Android package. + + #> + param ( + [Parameter(Mandatory=$true)] + [string] $PackageName + ) + + # Convert 'cmake;3.6.4111459' -> 'cmake/3.6.4111459' + $PackageName = $PackageName.Replace(";", "/") + $targetPath = Join-Path $env:ANDROID_HOME $PackageName + $targetPath | Should -Exist + } + } + + function Get-AndroidPackages { + <# + .SYNOPSIS + This function returns a list of available Android packages. + + .DESCRIPTION + The Get-AndroidPackages function checks if a list of packages is already available in a file. + If not, it uses the sdkmanager to generate a list of available packages and saves it to a file. + It then returns the content of this file. + + .PARAMETER SDKRootPath + The root path of the Android SDK installation. + If not specified, the function uses the ANDROID_HOME environment variable. + + .EXAMPLE + Get-AndroidPackages -SDKRootPath "/usr/local/lib/android/sdk" + + This command returns a list of available Android packages for the specified SDK root path. + + .NOTES + This function requires the Android SDK to be installed. + #> + param ( + [Parameter(Mandatory=$false)] + [string] $SDKRootPath + ) + + if (-not $SDKRootPath) { + $SDKRootPath = $env:ANDROID_HOME + } + + $packagesListFile = "$SDKRootPath/packages-list.txt" + + if (-not (Test-Path -Path $packagesListFile -PathType Leaf)) { + (/usr/local/lib/android/sdk/cmdline-tools/latest/bin/sdkmanager --list --verbose 2>&1) | + Where-Object { $_ -Match "^[^\s]" } | + Where-Object { $_ -NotMatch "^(Loading |Info: Parsing |---|\[=+|Installed |Available )" } | + Where-Object { $_ -NotMatch "^[^;]*$" } | + Out-File -FilePath $packagesListFile + + Write-Host "Android packages list:" + Get-Content $packagesListFile + } + + return Get-Content $packagesListFile + } + $androidSdkManagerPackages = Get-AndroidPackages [int]$platformMinVersion = Get-ToolsetValue "android.platform_min_version" [version]$buildToolsMinVersion = Get-ToolsetValue "android.build_tools_min_version" [array]$ndkVersions = Get-ToolsetValue "android.ndk.versions" - $ndkFullVersions = $ndkVersions | ForEach-Object { (Get-ChildItem "/usr/local/lib/android/sdk/ndk/${_}.*" | Select-Object -Last 1).Name } | ForEach-Object { "ndk/${_}" } + $ndkFullVersions = $ndkVersions | + ForEach-Object { (Get-ChildItem "/usr/local/lib/android/sdk/ndk/${_}.*" | + Select-Object -Last 1).Name } | ForEach-Object { "ndk/${_}" } # Platforms starting with a letter are the preview versions, which is not installed on the image - $platformVersionsList = ($androidSdkManagerPackages | Where-Object { "$_".StartsWith("platforms;") }) -replace 'platforms;android-', '' | Where-Object { $_ -match "^\d" } | Sort-Object -Unique - $platformsInstalled = $platformVersionsList | Where-Object { [int]($_.Split("-")[0]) -ge $platformMinVersion } | ForEach-Object { "platforms/android-${_}" } + $platformVersionsList = ($androidSdkManagerPackages | + Where-Object { "$_".StartsWith("platforms;") }) -replace 'platforms;android-', '' | + Where-Object { $_ -match "^\d" } | Sort-Object -Unique + $platformsInstalled = $platformVersionsList | + Where-Object { [int]($_.Split("-")[0]) -ge $platformMinVersion } | + ForEach-Object { "platforms/android-${_}" } $buildToolsList = ($androidSdkManagerPackages | Where-Object { "$_".StartsWith("build-tools;") }) -replace 'build-tools;', '' - $buildTools = $buildToolsList | Where-Object { $_ -match "\d+(\.\d+){2,}$"} | Where-Object { [version]$_ -ge $buildToolsMinVersion } | Sort-Object -Unique | - ForEach-Object { "build-tools/${_}" } + $buildTools = $buildToolsList | + Where-Object { $_ -match "\d+(\.\d+){2,}$"} | + Where-Object { [version]$_ -ge $buildToolsMinVersion } | + Sort-Object -Unique | + ForEach-Object { "build-tools/${_}" } $androidPackages = @( $platformsInstalled, @@ -23,22 +109,6 @@ Describe "Android" { $androidPackages = $androidPackages | ForEach-Object { $_ } - BeforeAll { - function Validate-AndroidPackage { - param ( - [Parameter(Mandatory=$true)] - [string]$PackageName - ) - - # Convert 'm2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta1' -> - # 'm2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-beta1' - # 'cmake;3.6.4111459' -> 'cmake/3.6.4111459' - $PackageName = $PackageName.Replace(";", "/") - $targetPath = Join-Path $env:ANDROID_HOME $PackageName - $targetPath | Should -Exist - } - } - Context "SDKManagers" { $testCases = @( @{ @@ -61,7 +131,7 @@ Describe "Android" { It "<PackageName>" -TestCases $testCases { param ([string] $PackageName) - Validate-AndroidPackage $PackageName + Test-AndroidPackage $PackageName } } } diff --git a/images/ubuntu/scripts/tests/Java.Tests.ps1 b/images/ubuntu/scripts/tests/Java.Tests.ps1 index 7a5c2eb678d3..a295377cbaa3 100644 --- a/images/ubuntu/scripts/tests/Java.Tests.ps1 +++ b/images/ubuntu/scripts/tests/Java.Tests.ps1 @@ -8,8 +8,8 @@ Describe "Java" { [array]$testCases = $jdkVersions | ForEach-Object { @{Version = $_ } } It "Java <DefaultJavaVersion> is default" -TestCases @{ DefaultJavaVersion = $defaultVersion } { - $actualJavaPath = Get-EnvironmentVariable "JAVA_HOME" - $expectedJavaPath = Get-EnvironmentVariable "JAVA_HOME_${DefaultJavaVersion}_X64" + $actualJavaPath = [System.Environment]::GetEnvironmentVariable("JAVA_HOME") + $expectedJavaPath = [System.Environment]::GetEnvironmentVariable("JAVA_HOME_${DefaultJavaVersion}_X64") $actualJavaPath | Should -Not -BeNullOrEmpty $expectedJavaPath | Should -Not -BeNullOrEmpty @@ -28,7 +28,7 @@ Describe "Java" { It "Gradle" { "gradle -version" | Should -ReturnZeroExitCode - $gradleVariableValue = Get-EnvironmentVariable "GRADLE_HOME" + $gradleVariableValue = [System.Environment]::GetEnvironmentVariable("GRADLE_HOME") $gradleVariableValue | Should -BeLike "/usr/share/gradle-*" $gradlePath = Join-Path $env:GRADLE_HOME "bin/gradle" @@ -36,7 +36,7 @@ Describe "Java" { } It "Java <Version>" -TestCases $testCases { - $javaVariableValue = Get-EnvironmentVariable "JAVA_HOME_${Version}_X64" + $javaVariableValue = [System.Environment]::GetEnvironmentVariable("JAVA_HOME_${Version}_X64") $javaVariableValue | Should -Not -BeNullOrEmpty $javaPath = Join-Path $javaVariableValue "bin/java" From bf202afb1e9165f015d61c603af273de35e50067 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 30 Nov 2023 10:44:49 +0000 Subject: [PATCH 2493/3485] Updating readme file for ubuntu22 version 20231126.1.1 (#8897) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2204-Readme.md | 79 ++++++++++++++---------------- 1 file changed, 38 insertions(+), 41 deletions(-) diff --git a/images/ubuntu/Ubuntu2204-Readme.md b/images/ubuntu/Ubuntu2204-Readme.md index 0f957131f79a..748750523db6 100644 --- a/images/ubuntu/Ubuntu2204-Readme.md +++ b/images/ubuntu/Ubuntu2204-Readme.md @@ -1,14 +1,14 @@ | Announcements | |-| | [[all OSs] Nodejs 14.x will be removed from the images on November, 26](https://github.com/actions/runner-images/issues/8779) | -| [[Ubuntu] Ubuntu:16.04 & Ubuntu:18.04 docker images will be removed from runners on November, 19](https://github.com/actions/runner-images/issues/8776) | +| [[Ubuntu] Ubuntu:16.04 & Ubuntu:18.04 docker images will be removed from runners on November, 26](https://github.com/actions/runner-images/issues/8776) | | [Major Refactoring of GitHub Actions Runner Images Repository](https://github.com/actions/runner-images/issues/8706) | | [[All OS] Android NDK r23 will be removed from images on November 13](https://github.com/actions/runner-images/issues/8383) | *** # Ubuntu 22.04 - OS Version: 22.04.3 LTS - Kernel Version: 6.2.0-1016-azure -- Image Version: 20231115.7.0 +- Image Version: 20231126.1.0 - Systemd version: 249.11-0ubuntu3.11 ## Installed Software @@ -22,7 +22,7 @@ - GNU C++: 9.5.0, 10.5.0, 11.4.0, 12.3.0, 13.1.0 - GNU Fortran: 9.5.0, 10.5.0, 11.4.0, 12.3.0, 13.1.0 - Julia 1.9.4 -- Kotlin 1.9.255-SNAPSHOT +- Kotlin 1.9.21-release-633 - Mono 6.12.0.200 - MSBuild 16.10.1.31701 (Mono 6.12.0.200) - Node.js 18.18.2 @@ -34,15 +34,15 @@ ### Package Management - cpan 1.64 - Helm 3.13.1 -- Homebrew 4.1.20 -- Miniconda 23.9.0 +- Homebrew 4.1.21 +- Miniconda 23.10.0 - Npm 9.8.1 - NuGet 6.6.1.2 - Pip 22.0.2 - Pip3 22.0.2 - Pipx 1.2.1 - RubyGems 3.3.5 -- Vcpkg (build from commit 2b14b606c) +- Vcpkg (build from commit cd5e746ec) - Yarn 1.22.21 #### Environment variables @@ -60,27 +60,27 @@ to accomplish this. ``` ### Project Management -- Lerna 7.4.2 +- Lerna 8.0.0 - Maven 3.8.8 ### Tools -- Ansible 2.15.6 +- Ansible 2.16.0 - apt-fast 1.9.12 - AzCopy 10.21.2 - available by `azcopy` and `azcopy10` aliases - Bazel 6.4.0 -- Bazelisk 1.18.0 +- Bazelisk 1.19.0 - Bicep 0.23.1 - Buildah 1.23.1 - CMake 3.27.8 -- CodeQL Action Bundle 2.15.2 +- CodeQL Action Bundle 2.15.3 - Docker Amazon ECR Credential Helper 0.7.1 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.23.0 +- Docker Compose v2 2.23.3 - Docker-Buildx 0.11.2 - Docker Client 24.0.7 - Docker Server 24.0.7 - Fastlane 2.217.0 -- Git 2.42.0 +- Git 2.43.0 - Git LFS 3.4.0 - Git-ftp 1.6.0 - Haveged 1.9.14 @@ -100,29 +100,29 @@ to accomplish this. - Packer 1.9.4 - Parcel 2.10.3 - Podman 3.4.4 -- Pulumi 3.94.0 +- Pulumi 3.94.2 - R 4.3.2 - Skopeo 1.4.1 - Sphinx Open Source Search Server 2.2.11 - SVN 1.14.1 - Terraform 1.6.4 - yamllint 1.33.0 -- yq 4.35.2 +- yq 4.40.3 - zstd 1.5.5 ### CLI Tools -- Alibaba Cloud CLI 3.0.187 -- AWS CLI 2.13.36 +- Alibaba Cloud CLI 3.0.188 +- AWS CLI 2.13.38 - AWS CLI Session Manager Plugin 1.2.497.0 -- AWS SAM CLI 1.102.0 +- AWS SAM CLI 1.103.0 - Azure CLI 2.54.0 - Azure CLI (azure-devops) 0.26.0 - GitHub CLI 2.39.1 - Google Cloud CLI 455.0.0 -- Netlify CLI 17.3.2 -- OpenShift CLI 4.14.2 +- Netlify CLI 17.7.0 +- OpenShift CLI 4.14.3 - ORAS CLI 1.1.0 -- Vercel CLI 32.5.4 +- Vercel CLI 32.5.6 ### Java | Version | Environment Variable | @@ -147,15 +147,15 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Stack 2.13.1 ### Rust Tools -- Cargo 1.73.0 -- Rust 1.73.0 -- Rustdoc 1.73.0 +- Cargo 1.74.0 +- Rust 1.74.0 +- Rustdoc 1.74.0 - Rustup 1.26.0 #### Packages - Bindgen 0.69.1 - Cargo audit 0.18.3 -- Cargo clippy 0.1.73 +- Cargo clippy 0.1.74 - Cargo outdated 0.14.0 - Cbindgen 0.26.0 - Rustfmt 1.6.0 @@ -164,8 +164,8 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Google Chrome 119.0.6045.159 - ChromeDriver 119.0.6045.105 - Chromium 119.0.6045.0 -- Microsoft Edge 119.0.2151.58 -- Microsoft Edge WebDriver 119.0.2151.58 +- Microsoft Edge 119.0.2151.72 +- Microsoft Edge WebDriver 119.0.2151.72 - Selenium server 4.15.0 - Mozilla Firefox 120.0 - Geckodriver 0.33.0 @@ -214,10 +214,9 @@ Use the following command as a part of your job to start the service: 'sudo syst - 1.21.4 #### Node.js -- 14.21.3 - 16.20.2 - 18.18.2 -- 20.9.0 +- 20.10.0 #### Python - 3.7.17 @@ -237,12 +236,12 @@ Use the following command as a part of your job to start the service: 'sudo syst - 3.1.4 ### PowerShell Tools -- PowerShell 7.2.16 +- PowerShell 7.2.17 #### PowerShell Modules - Az: 9.3.0 - MarkdownPS: 1.9 -- Microsoft.Graph: 2.9.0 +- Microsoft.Graph: 2.10.0 - Pester: 5.5.0 - PSScriptAnalyzer: 1.21.0 @@ -283,20 +282,17 @@ Use the following command as a part of your job to start the service: 'sudo syst | alpine:3.16 | sha256:a8cbb8c69ee71561f4b69c066bad07f7e510caaa523da26fbfc606b10bd7934b | 2023-08-07 | | alpine:3.17 | sha256:f71a5f071694a785e064f05fed657bf8277f1b2113a8ed70c90ad486d6ee54dc | 2023-08-07 | | alpine:3.18 | sha256:eece025e432126ce23f223450a0326fbebde39cdf496a85d8c016293fc851978 | 2023-09-28 | -| buildpack-deps:bullseye | sha256:91d0d87bdeb73250aa8b9bc1739ab59e0df4e365dd7e459d1d453d46befd93c3 | 2023-11-01 | -| buildpack-deps:buster | sha256:994c0590e60c01834f0b716a12087fa53cdc8751260c9924a698e38e9548e12a | 2023-11-01 | -| debian:10 | sha256:53cf4f4dbe6f827072bde99045671754cca8174d0464d829c194a26e7ba2c134 | 2023-11-01 | -| debian:11 | sha256:a4aa0519fbd45786048bbc4daa7092fec803d22463f1cb6c4e7762dcb6a10cf0 | 2023-11-01 | +| buildpack-deps:bullseye | sha256:257cbe4fba66709d5a536dd5ac13b22411d469eaf61f421f5c2b871f2290e25c | 2023-11-21 | +| buildpack-deps:buster | sha256:77c7243f791521c7bf816e786ef46956eabb0c8e73c8479141ba5e92c05497a7 | 2023-11-21 | +| debian:10 | sha256:46ca02d33c65ab188d6e56f26c323bf1aa9a99074f2f54176fdc3884304f58b8 | 2023-11-21 | +| debian:11 | sha256:ab2b95aa8d7d6d54866b92c322cf0693933c1ae8038652f24ddfda1d1763a45a | 2023-11-21 | | moby/buildkit:latest | sha256:d4187a7326f20d04fafd075f80ccc5d3f8cfd4f665c6e03d158a78e4f64bf3db | 2023-10-19 | -| node:14 | sha256:a158d3b9b4e3fa813fa6c8c590b8f0a860e015ad4e59bbce5744d2f6fd8461aa | 2023-04-12 | -| node:14-alpine | sha256:434215b487a329c9e867202ff89e704d3a75e554822e07f3e0c0f9e606121b33 | 2023-03-29 | | node:16 | sha256:f77a1aef2da8d83e45ec990f45df50f1a286c5fe8bbfb8c6e4246c6389705c0b | 2023-09-07 | | node:16-alpine | sha256:a1f9d027912b58a7c75be7716c97cfbc6d3099f3a97ed84aa490be9dee20e787 | 2023-08-10 | -| node:18 | sha256:7ce8b205d15e30fd395e5fa4000bcdf595fcff3f434fe75822e54e82a5f5cf82 | 2023-11-01 | -| node:18-alpine | sha256:435dcad253bb5b7f347ebc69c8cc52de7c912eb7241098b920f2fc2d7843183d | 2023-10-18 | -| node:20 | sha256:5f21943fe97b24ae1740da6d7b9c56ac43fe3495acb47c1b232b0a352b02a25c | 2023-11-01 | -| node:20-alpine | sha256:8e015de364a2eb2ed7c52a558e9f716dcb615560ffd132234087c10ccc1f2c63 | 2023-10-25 | -| ubuntu:18.04 | sha256:152dc042452c496007f07ca9127571cb9c29697f42acbfad72324b2bb2e43c98 | 2023-05-30 | +| node:18 | sha256:a17842484dd30af97540e5416c9a62943c709583977ba41481d601ecffb7f31b | 2023-11-22 | +| node:18-alpine | sha256:3428c2de886bf4378657da6fe86e105573a609c94df1f7d6a70e57d2b51de21f | 2023-11-16 | +| node:20 | sha256:445acd9b2ef7e9de665424053bf95652e0b8995ef36500557d48faf29300170a | 2023-11-23 | +| node:20-alpine | sha256:b1789b7be6aa16afd642eaaaccdeeeb33bd8f08e69b3d27d931aa9665b731f01 | 2023-11-23 | | ubuntu:20.04 | sha256:ed4a42283d9943135ed87d4ee34e542f7f5ad9ecf2f244870e23122f703f91c2 | 2023-10-03 | | ubuntu:22.04 | sha256:2b7412e6465c3c7fc5bb21d3e6f1917c167358449fecac8176c6e496e5c1f05f | 2023-10-05 | @@ -319,6 +315,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | dpkg-dev | 1.21.1ubuntu2.2 | | fakeroot | 1.28-1ubuntu1 | | file | 1:5.41-3ubuntu0.1 | +| findutils | 4.8.0-1ubuntu3 | | flex | 2.6.4-8build2 | | fonts-noto-color-emoji | 2.038-0ubuntu1 | | ftp | 20210827-4build1 | From 5f5ab1924605f6a02a965aa228d9073c905d0a41 Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Thu, 30 Nov 2023 13:39:32 +0100 Subject: [PATCH 2494/3485] [Mac OS] Rewrite function download_with_retry (#8914) * [Mac OS] Rewrite function download_with_retry * Update powershell function DownloadWithRetry --- .../macos/scripts/build/Install-Toolset.ps1 | 10 ++- .../scripts/build/install-actions-cache.sh | 8 +-- .../scripts/build/install-android-sdk.sh | 30 ++++----- .../macos/scripts/build/install-aws-tools.sh | 5 +- images/macos/scripts/build/install-azcopy.sh | 15 ++--- images/macos/scripts/build/install-chrome.sh | 13 ++-- .../scripts/build/install-codeql-bundle.sh | 9 ++- .../scripts/build/install-common-utils.sh | 12 ++-- images/macos/scripts/build/install-dotnet.sh | 14 ++-- images/macos/scripts/build/install-edge.sh | 22 +++--- .../macos/scripts/build/install-homebrew.sh | 4 +- .../macos/scripts/build/install-miniconda.sh | 7 +- images/macos/scripts/build/install-mono.sh | 27 +++----- images/macos/scripts/build/install-node.sh | 4 +- images/macos/scripts/build/install-nvm.sh | 29 ++++---- images/macos/scripts/build/install-openjdk.sh | 14 ++-- .../macos/scripts/build/install-powershell.sh | 13 ++-- images/macos/scripts/build/install-pypy.sh | 14 ++-- images/macos/scripts/build/install-python.sh | 10 +-- images/macos/scripts/build/install-ruby.sh | 5 +- .../scripts/build/install-visualstudio.sh | 12 ++-- .../macos/scripts/helpers/Common.Helpers.psm1 | 62 +++++++++-------- .../scripts/helpers/Xcode.Installer.psm1 | 3 +- images/macos/scripts/helpers/utils.sh | 67 +++++++++---------- images/macos/scripts/helpers/xamarin-utils.sh | 66 ++++++------------ 25 files changed, 203 insertions(+), 272 deletions(-) diff --git a/images/macos/scripts/build/Install-Toolset.ps1 b/images/macos/scripts/build/Install-Toolset.ps1 index e89da38e06cb..d5a278574951 100644 --- a/images/macos/scripts/build/Install-Toolset.ps1 +++ b/images/macos/scripts/build/Install-Toolset.ps1 @@ -13,14 +13,12 @@ Function Install-Asset { [object] $ReleaseAsset ) - $assetFolderPath = Join-Path "/tmp" "$($ReleaseAsset.filename)-temp-dir" - New-Item -ItemType Directory -Path $assetFolderPath | Out-Null - $assetArchivePath = Join-Path $assetFolderPath $ReleaseAsset.filename - - Write-Host "Download $($ReleaseAsset.filename) archive to the $assetFolderPath folder..." - Start-DownloadWithRetry -Url $ReleaseAsset.download_url -DownloadPath $assetFolderPath + Write-Host "Download $($ReleaseAsset.filename) archive..." + $assetArchivePath = Invoke-DownloadWithRetry $ReleaseAsset.download_url Write-Host "Extract $($ReleaseAsset.filename) content..." + $assetFolderPath = Join-Path "/tmp" "$($ReleaseAsset.filename)-temp-dir" + New-Item -ItemType Directory -Path $assetFolderPath | Out-Null tar -xzf $assetArchivePath -C $assetFolderPath Write-Host "Invoke installation script..." diff --git a/images/macos/scripts/build/install-actions-cache.sh b/images/macos/scripts/build/install-actions-cache.sh index 4e6a73366917..02a4c39dc0db 100644 --- a/images/macos/scripts/build/install-actions-cache.sh +++ b/images/macos/scripts/build/install-actions-cache.sh @@ -12,9 +12,9 @@ if [ ! -d $ACTIONS_RUNNER_ACTION_ARCHIVE_CACHE ]; then mkdir -p $ACTIONS_RUNNER_ACTION_ARCHIVE_CACHE fi -downloadUrl=$(get_github_package_download_url "actions/action-versions" "contains(\"action-versions.tar.gz\")" "latest") -echo "Downloading action-versions $downloadUrl" -download_with_retries "$downloadUrl" "/tmp" action-versions.tar.gz -tar -xzf /tmp/action-versions.tar.gz -C $ACTIONS_RUNNER_ACTION_ARCHIVE_CACHE +download_url=$(get_github_package_download_url "actions/action-versions" "contains(\"action-versions.tar.gz\")" "latest") +echo "Downloading action-versions $download_url" +archive_path=$(download_with_retry "$download_url") +tar -xzf "$archive_path" -C "$ACTIONS_RUNNER_ACTION_ARCHIVE_CACHE" invoke_tests "ActionArchiveCache" diff --git a/images/macos/scripts/build/install-android-sdk.sh b/images/macos/scripts/build/install-android-sdk.sh index c765ca647d84..179338748a80 100644 --- a/images/macos/scripts/build/install-android-sdk.sh +++ b/images/macos/scripts/build/install-android-sdk.sh @@ -43,19 +43,18 @@ ANDROID_NDK_MAJOR_LATEST=$(get_toolset_value '.android.ndk."versions"[-1]') # Newer version(s) require Java 11 by default # See https://github.com/actions/runner-images/issues/6960 ANDROID_HOME=$HOME/Library/Android/sdk -ANDROID_OSX_SDK_FILE=tools-macosx.zip # Download the latest command line tools so that we can accept all of the licenses. # See https://developer.android.com/studio/#command-tools cmdlineToolsVersion=$(get_toolset_value '.android."cmdline-tools"') if [[ $cmdlineToolsVersion == "latest" ]]; then - repositoryXmlUrl="https://dl.google.com/android/repository/repository2-1.xml" - download_with_retries $repositoryXmlUrl "/tmp" "repository2-1.xml" + repository_xml_url="https://dl.google.com/android/repository/repository2-1.xml" + repository_xml_path=$(download_with_retry $repository_xml_url) cmdlineToolsVersion=$( yq -p=xml \ '.sdk-repository.remotePackage[] | select(."+@path" == "cmdline-tools;latest" and .channelRef."+@ref" == "channel-0").archives.archive[].complete.url | select(contains("commandlinetools-mac"))' \ - /tmp/repository2-1.xml + "$repository_xml_path" ) if [[ -z $cmdlineToolsVersion ]]; then @@ -65,16 +64,15 @@ if [[ $cmdlineToolsVersion == "latest" ]]; then fi echo "Downloading android command line tools..." -download_with_retries "https://dl.google.com/android/repository/${cmdlineToolsVersion}" /tmp $ANDROID_OSX_SDK_FILE +archive_path=$(download_with_retry "https://dl.google.com/android/repository/${cmdlineToolsVersion}") echo "Uncompressing android command line tools..." -mkdir -p $HOME/Library/Android/sdk -unzip -q /tmp/$ANDROID_OSX_SDK_FILE -d $HOME/Library/Android/sdk/cmdline-tools -# Command line tools need to be placed in $HOME/Library/Android/sdk/cmdline-tools/latest to function properly -mv $HOME/Library/Android/sdk/cmdline-tools/cmdline-tools $HOME/Library/Android/sdk/cmdline-tools/latest -rm -f /tmp/$ANDROID_OSX_SDK_FILE +mkdir -p "$ANDROID_HOME" +unzip -q "$archive_path" -d "$ANDROID_HOME/cmdline-tools" +# Command line tools need to be placed in $ANDROID_HOME/cmdline-tools/latest to function properly +mv "$ANDROID_HOME/cmdline-tools/cmdline-tools" "$ANDROID_HOME/cmdline-tools/latest" -echo ANDROID_HOME is $ANDROID_HOME +echo ANDROID_HOME is "$ANDROID_HOME" export PATH=$PATH:$ANDROID_HOME/cmdline-tools/latest:$ANDROID_HOME/cmdline-tools/latest/bin SDKMANAGER=$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager @@ -127,12 +125,10 @@ do done # Download SDK tools to preserve backward compatibility -sdkTools="android-sdk-tools.zip" -sdkToolsVersion=$(get_toolset_value '.android."sdk-tools"') -if [ "$sdkToolsVersion" != "null" ]; then - download_with_retries "https://dl.google.com/android/repository/${sdkToolsVersion}" "." $sdkTools - unzip -o -qq $sdkTools -d ${ANDROID_SDK_ROOT} - rm -f $sdkTools +sdk_tools_version=$(get_toolset_value '.android."sdk-tools"') +if [ "$sdk_tools_version" != "null" ]; then + sdk_tools_archive_path=$(download_with_retry "https://dl.google.com/android/repository/${sdk_tools_version}") + unzip -o -qq "$sdk_tools_archive_path" -d "${ANDROID_SDK_ROOT}" fi invoke_tests "Android" diff --git a/images/macos/scripts/build/install-aws-tools.sh b/images/macos/scripts/build/install-aws-tools.sh index 98a13dcc4155..113881bab568 100644 --- a/images/macos/scripts/build/install-aws-tools.sh +++ b/images/macos/scripts/build/install-aws-tools.sh @@ -7,9 +7,8 @@ source ~/utils/utils.sh echo Installing aws... -AWS_CLI_URL="https://awscli.amazonaws.com/AWSCLIV2.pkg" -download_with_retries $AWS_CLI_URL "/tmp" -sudo installer -pkg /tmp/AWSCLIV2.pkg -target / +awscliv2_pkg_path=$(download_with_retry "https://awscli.amazonaws.com/AWSCLIV2.pkg") +sudo installer -pkg "$awscliv2_pkg_path" -target / echo Installing aws sam cli... brew tap aws/tap diff --git a/images/macos/scripts/build/install-azcopy.sh b/images/macos/scripts/build/install-azcopy.sh index 5cef5d4158df..0cd670c0743a 100644 --- a/images/macos/scripts/build/install-azcopy.sh +++ b/images/macos/scripts/build/install-azcopy.sh @@ -8,19 +8,14 @@ source ~/utils/utils.sh arch=$(get_arch) # Check MacOS architecture and if ARM install using brew -if [ $arch == "arm64" ]; then +if [ "$arch" == "arm64" ]; then brew_smart_install azcopy else - AZCOPY_DOWNLOAD_URL="https://aka.ms/downloadazcopy-v10-mac" - - download_with_retries $AZCOPY_DOWNLOAD_URL "/tmp" "azcopy.zip" - unzip /tmp/azcopy.zip -d azcopy - AZCOPY_EXTRACTED=$(echo azcopy/azcopy*) - cp "$AZCOPY_EXTRACTED/azcopy" "/usr/local/bin/azcopy" + archive_path=$(download_with_retry "https://aka.ms/downloadazcopy-v10-mac") + unzip -qq "$archive_path" -d /tmp/azcopy + extract_path=$(echo /tmp/azcopy/azcopy*) + cp "$extract_path/azcopy" "/usr/local/bin/azcopy" chmod +x "/usr/local/bin/azcopy" - - echo "Done, cleaning up" - rm -rf azcopy* fi invoke_tests "Common" "AzCopy" diff --git a/images/macos/scripts/build/install-chrome.sh b/images/macos/scripts/build/install-chrome.sh index c5fc50f93548..22dfe417802c 100644 --- a/images/macos/scripts/build/install-chrome.sh +++ b/images/macos/scripts/build/install-chrome.sh @@ -19,20 +19,18 @@ echo "Google Chrome version is $FULL_CHROME_VERSION" # Get Google Chrome versions information CHROME_PLATFORM="mac-$arch" CHROME_VERSIONS_URL="https://googlechromelabs.github.io/chrome-for-testing/latest-patch-versions-per-build-with-downloads.json" -download_with_retries "$CHROME_VERSIONS_URL" "/tmp" "latest-patch-versions-per-build-with-downloads.json" -CHROME_VERSIONS_JSON=$(cat /tmp/latest-patch-versions-per-build-with-downloads.json) +CHROME_VERSIONS_JSON="$(cat "$(download_with_retry "$CHROME_VERSIONS_URL")")" # Download and unpack the latest release of Chrome Driver CHROMEDRIVER_VERSION=$(echo "${CHROME_VERSIONS_JSON}" | jq -r '.builds["'"$CHROME_VERSION"'"].version') echo "Installing Chrome Driver version $CHROMEDRIVER_VERSION" CHROMEDRIVER_URL=$(echo "${CHROME_VERSIONS_JSON}" | jq -r '.builds["'"$CHROME_VERSION"'"].downloads.chromedriver[] | select(.platform=="'"${CHROME_PLATFORM}"'").url') -CHROMEDRIVER_ARCHIVE="chromedriver-${CHROME_PLATFORM}.zip" CHROMEDRIVER_DIR="/usr/local/share/chromedriver-${CHROME_PLATFORM}" CHROMEDRIVER_BIN="$CHROMEDRIVER_DIR/chromedriver" -download_with_retries "$CHROMEDRIVER_URL" "/tmp" "$CHROMEDRIVER_ARCHIVE" -unzip -qq /tmp/$CHROMEDRIVER_ARCHIVE -d /tmp/ +CHROMEDRIVER_ARCHIVE_PATH=$(download_with_retry "$CHROMEDRIVER_URL") +unzip -qq "$CHROMEDRIVER_ARCHIVE_PATH" -d /tmp/ sudo mv "/tmp/chromedriver-${CHROME_PLATFORM}" "$CHROMEDRIVER_DIR" ln -s "$CHROMEDRIVER_BIN" /usr/local/bin/chromedriver echo "export CHROMEWEBDRIVER=$CHROMEDRIVER_DIR" >> "${HOME}/.bashrc" @@ -42,11 +40,10 @@ CHROME_FOR_TESTING_VERSION=$(echo "${CHROME_VERSIONS_JSON}" | jq -r '.builds["'" echo "Installing Google Chrome for Testing version $CHROME_FOR_TESTING_VERSION" CHROME_FOR_TESTING_URL=$(echo "${CHROME_VERSIONS_JSON}" | jq -r '.builds["'"$CHROME_VERSION"'"].downloads.chrome[] | select(.platform=="'"${CHROME_PLATFORM}"'").url') -CHROME_FOR_TESTING_ARCHIVE="chrome-${CHROME_PLATFORM}.zip" CHROME_FOR_TESTING_APP="Google Chrome for Testing.app" -download_with_retries $CHROME_FOR_TESTING_URL "/tmp" $CHROME_FOR_TESTING_ARCHIVE -unzip -qq /tmp/$CHROME_FOR_TESTING_ARCHIVE -d /tmp/ +CHROME_FOR_TESTING_ARCHIVE_PATH=$(download_with_retry "$CHROME_FOR_TESTING_URL") +unzip -qq "$CHROME_FOR_TESTING_ARCHIVE_PATH" -d /tmp/ mv "/tmp/chrome-${CHROME_PLATFORM}/${CHROME_FOR_TESTING_APP}" "/Applications/${CHROME_FOR_TESTING_APP}" echo "Installing Selenium" diff --git a/images/macos/scripts/build/install-codeql-bundle.sh b/images/macos/scripts/build/install-codeql-bundle.sh index 8f07f72fdf68..68fed26346a2 100644 --- a/images/macos/scripts/build/install-codeql-bundle.sh +++ b/images/macos/scripts/build/install-codeql-bundle.sh @@ -7,21 +7,20 @@ source ~/utils/utils.sh # Retrieve the CLI version of the latest CodeQL bundle. -download_with_retries https://raw.githubusercontent.com/github/codeql-action/v2/src/defaults.json "/tmp" "codeql-defaults.json" -bundle_version="$(jq -r '.cliVersion' /tmp/codeql-defaults.json)" +defaults_json_path=$(download_with_retry https://raw.githubusercontent.com/github/codeql-action/v2/src/defaults.json) +bundle_version="$(jq -r '.cliVersion' "$defaults_json_path")" bundle_tag_name="codeql-bundle-v$bundle_version" echo "Downloading CodeQL bundle $bundle_version..." # Note that this is the all-platforms CodeQL bundle, to support scenarios where customers run # different operating systems within containers. -download_with_retries "https://github.com/github/codeql-action/releases/download/$bundle_tag_name/codeql-bundle.tar.gz" "/tmp" "codeql-bundle.tar.gz" -codeql_archive="/tmp/codeql-bundle.tar.gz" +archive_path=$(download_with_retry "https://github.com/github/codeql-action/releases/download/$bundle_tag_name/codeql-bundle.tar.gz") codeql_toolcache_path="$AGENT_TOOLSDIRECTORY/CodeQL/$bundle_version/x64" mkdir -p "$codeql_toolcache_path" echo "Unpacking the downloaded CodeQL bundle archive..." -tar -xzf "$codeql_archive" -C "$codeql_toolcache_path" +tar -xzf "$archive_path" -C "$codeql_toolcache_path" # Touch a file to indicate to the CodeQL Action that this bundle shipped with the toolcache. This is # to support overriding the CodeQL version specified in defaults.json on GitHub Enterprise. diff --git a/images/macos/scripts/build/install-common-utils.sh b/images/macos/scripts/build/install-common-utils.sh index 39a8acccd292..253a2b60d607 100644 --- a/images/macos/scripts/build/install-common-utils.sh +++ b/images/macos/scripts/build/install-common-utils.sh @@ -8,8 +8,8 @@ source ~/utils/utils.sh # Download and install YQ in cases when it is not available in the formulae as for macOS 11: https://formulae.brew.sh/formula/yq if is_BigSur; then - download_with_retries "https://github.com/mikefarah/yq/releases/latest/download/yq_darwin_amd64" "/tmp" "yq" - sudo install /tmp/yq /usr/local/bin/yq + binary_path=$(download_with_retry "https://github.com/mikefarah/yq/releases/latest/download/yq_darwin_amd64") + sudo install "$binary_path" /usr/local/bin/yq fi # Monterey needs future review: @@ -27,12 +27,10 @@ for package in $cask_packages; do if is_Monterey && [[ $package == "virtualbox" ]]; then # Do not update VirtualBox on macOS 12 due to the issue with VMs in gurumediation state which blocks Vagrant on macOS: https://github.com/actions/runner-images/issues/8730 # macOS host: Dropped all kernel extensions. VirtualBox relies fully on the hypervisor and vmnet frameworks provided by Apple now. - vbcask_url="https://raw.githubusercontent.com/Homebrew/homebrew-cask/aa3c55951fc9d687acce43e5c0338f42c1ddff7b/Casks/virtualbox.rb" - download_with_retries $vbcask_url - brew install ./virtualbox.rb - rm ./virtualbox.rb + virtualbox_cask_path=$(download_with_retry "https://raw.githubusercontent.com/Homebrew/homebrew-cask/aa3c55951fc9d687acce43e5c0338f42c1ddff7b/Casks/virtualbox.rb") + brew install "$virtualbox_cask_path" else - brew install --cask $package + brew install --cask "$package" fi done diff --git a/images/macos/scripts/build/install-dotnet.sh b/images/macos/scripts/build/install-dotnet.sh index 4ff20b764a5b..f7fc1039d676 100644 --- a/images/macos/scripts/build/install-dotnet.sh +++ b/images/macos/scripts/build/install-dotnet.sh @@ -12,8 +12,8 @@ arch=$(get_arch) # Download installer from dot.net and keep it locally DOTNET_INSTALL_SCRIPT="https://dot.net/v1/dotnet-install.sh" -download_with_retries $DOTNET_INSTALL_SCRIPT . -chmod +x ./dotnet-install.sh +install_script_path=$(download_with_retry $DOTNET_INSTALL_SCRIPT) +chmod +x "$install_script_path" ARGS_LIST=() echo "Parsing dotnet SDK (except rc and preview versions) from .json..." @@ -22,15 +22,15 @@ DOTNET_VERSIONS=($(get_toolset_value ".dotnet.arch[\"$arch\"].versions | .[]")) for DOTNET_VERSION in "${DOTNET_VERSIONS[@]}"; do RELEASE_URL="https://raw.githubusercontent.com/dotnet/core/main/release-notes/${DOTNET_VERSION}/releases.json" - download_with_retries "$RELEASE_URL" "/tmp" "dotnet_${DOTNET_VERSION}.json" + releases_json_file=$(download_with_retry "$RELEASE_URL") if [[ $DOTNET_VERSION == "6.0" ]]; then ARGS_LIST+=( - $(cat /tmp/dotnet_${DOTNET_VERSION}.json | jq -r 'first(.releases[].sdks[]?.version | select(contains("preview") or contains("rc") | not))') + $(cat "$releases_json_file" | jq -r 'first(.releases[].sdks[]?.version | select(contains("preview") or contains("rc") | not))') ) else ARGS_LIST+=( - $(cat /tmp/dotnet_${DOTNET_VERSION}.json | \ + $(cat "$releases_json_file" | \ jq -r '.releases[].sdk."version"' | grep -v -E '\-(preview|rc)\d*' | \ sort -r | rev | uniq -s 2 | rev) ) @@ -38,11 +38,9 @@ for DOTNET_VERSION in "${DOTNET_VERSIONS[@]}"; do done for ARGS in "${ARGS_LIST[@]}"; do - ./dotnet-install.sh --version $ARGS -NoPath --arch $arch + "$install_script_path" --version $ARGS -NoPath --arch $arch done -rm ./dotnet-install.sh - # dotnet installer doesn't create symlink to executable in /user/local/bin # Moreover at that moment /user/local/bin doesn't exist (though already added to $PATH) ln -s ~/.dotnet/dotnet /usr/local/bin/dotnet diff --git a/images/macos/scripts/build/install-edge.sh b/images/macos/scripts/build/install-edge.sh index d13f5b82f674..94f0b7777cc7 100644 --- a/images/macos/scripts/build/install-edge.sh +++ b/images/macos/scripts/build/install-edge.sh @@ -17,29 +17,23 @@ echo "Version of Microsoft Edge: ${EDGE_VERSION}" echo "Installing Microsoft Edge WebDriver..." -EDGE_DRIVER_VERSION_URL="https://msedgedriver.azureedge.net/LATEST_RELEASE_${EDGE_VERSION_MAJOR}_MACOS" -download_with_retries "$EDGE_DRIVER_VERSION_URL" "/tmp" "edge-version" -EDGE_DRIVER_LATEST_VERSION=$(cat /tmp/edge-version | iconv -f utf-16 -t utf-8 | tr -d '\r') +EDGE_DRIVER_VERSION_FILE_PATH=$(download_with_retry "https://msedgedriver.azureedge.net/LATEST_RELEASE_${EDGE_VERSION_MAJOR}_MACOS") +EDGE_DRIVER_LATEST_VERSION=$(iconv -f utf-16 -t utf-8 "$EDGE_DRIVER_VERSION_FILE_PATH" | tr -d '\r') EDGE_DRIVER_URL="https://msedgedriver.azureedge.net/${EDGE_DRIVER_LATEST_VERSION}/edgedriver_mac64.zip" echo "Compatible version of WebDriver: ${EDGE_DRIVER_LATEST_VERSION}" -pushd "/tmp" > /dev/null -download_with_retries $EDGE_DRIVER_URL "." "edgedriver.zip" +EDGE_DRIVER_ARCHIVE_PATH=$(download_with_retry "$EDGE_DRIVER_URL") # Move webdriver to the separate directory to be consistent with the docs # https://docs.microsoft.com/en-us/azure/devops/pipelines/test/continuous-test-selenium?view=azure-devops#decide-how-you-will-deploy-and-test-your-app -APPLICATION="/usr/local/bin/msedgedriver" -EDGEDRIVER_DIR="/usr/local/share/edge_driver" -EDGEDRIVER_BIN="$EDGEDRIVER_DIR/msedgedriver" +EDGE_DRIVER_DIR="/usr/local/share/edge_driver" +mkdir -p $EDGE_DRIVER_DIR +unzip -qq "$EDGE_DRIVER_ARCHIVE_PATH" -d "$EDGE_DRIVER_DIR" +ln -s "$EDGE_DRIVER_DIR/msedgedriver" "/usr/local/bin/msedgedriver" -mkdir -p $EDGEDRIVER_DIR - -unzip "edgedriver.zip" -d $EDGEDRIVER_DIR -ln -s "$EDGEDRIVER_BIN" $APPLICATION -echo "export EDGEWEBDRIVER=${EDGEDRIVER_DIR}" >> "${HOME}/.bashrc" -popd > /dev/null +echo "export EDGEWEBDRIVER=${EDGE_DRIVER_DIR}" >> "${HOME}/.bashrc" # Configure Edge Updater to prevent auto update # https://learn.microsoft.com/en-us/deployedge/edge-learnmore-edgeupdater-for-macos diff --git a/images/macos/scripts/build/install-homebrew.sh b/images/macos/scripts/build/install-homebrew.sh index b822c6ff1af4..cb32793d9dd2 100644 --- a/images/macos/scripts/build/install-homebrew.sh +++ b/images/macos/scripts/build/install-homebrew.sh @@ -9,8 +9,8 @@ source ~/utils/utils.sh arch=$(get_arch) echo "Installing Homebrew..." -download_with_retries "https://raw.githubusercontent.com/Homebrew/install/master/install.sh" "/tmp" "homebrew-install.sh" -/bin/bash /tmp/homebrew-install.sh +homebrew_installer_path=$(download_with_retry "https://raw.githubusercontent.com/Homebrew/install/master/install.sh") +/bin/bash "$homebrew_installer_path" if [[ $arch == "arm64" ]]; then /opt/homebrew/bin/brew update diff --git a/images/macos/scripts/build/install-miniconda.sh b/images/macos/scripts/build/install-miniconda.sh index a50008f3572a..2ee589580cb2 100644 --- a/images/macos/scripts/build/install-miniconda.sh +++ b/images/macos/scripts/build/install-miniconda.sh @@ -6,10 +6,9 @@ source ~/utils/utils.sh -download_with_retries "https://repo.anaconda.com/miniconda/Miniconda3-latest-MacOSX-x86_64.sh" "/tmp" "miniconda.sh" - -chmod +x /tmp/miniconda.sh -sudo /tmp/miniconda.sh -b -p /usr/local/miniconda +miniconda_installer_path=$(download_with_retry "https://repo.anaconda.com/miniconda/Miniconda3-latest-MacOSX-x86_64.sh") +chmod +x "$miniconda_installer_path" +sudo "$miniconda_installer_path" -b -p /usr/local/miniconda # Chmod with full permissions recursively to avoid permissions restrictions sudo chmod -R 777 /usr/local/miniconda diff --git a/images/macos/scripts/build/install-mono.sh b/images/macos/scripts/build/install-mono.sh index c4af70a36787..cc4795144ccd 100644 --- a/images/macos/scripts/build/install-mono.sh +++ b/images/macos/scripts/build/install-mono.sh @@ -7,43 +7,38 @@ # Source utility functions source ~/utils/utils.sh -# Create a temporary directory to store downloaded files -TMP_DIR=$(mktemp -d /tmp/visualstudio.XXXX) - # Install Mono Framework MONO_VERSION_FULL=$(get_toolset_value '.mono.framework.version') MONO_VERSION=$(echo "$MONO_VERSION_FULL" | cut -d. -f 1,2,3) MONO_VERSION_SHORT=$(echo $MONO_VERSION_FULL | cut -d. -f 1,2) MONO_PKG_URL="https://download.mono-project.com/archive/${MONO_VERSION}/macos-10-universal/MonoFramework-MDK-${MONO_VERSION_FULL}.macos10.xamarin.universal.pkg" -MONO_PKG_NAME=${MONO_PKG_URL##*/} MONO_VERSIONS_PATH='/Library/Frameworks/Mono.framework/Versions' -download_with_retries "$MONO_PKG_URL" "$TMP_DIR" -echo "Installing $MONO_PKG_NAME..." -sudo installer -pkg "$TMP_DIR/$MONO_PKG_NAME" -target / +MONO_PKG_PATH=$(download_with_retry "$MONO_PKG_URL") +echo "Installing Mono Framework ${MONO_VERSION_FULL}..." +sudo installer -pkg "$MONO_PKG_PATH" -target / # Download and install NUnit console NUNIT_VERSION=$(get_toolset_value '.mono.nunit.version') NUNIT_ARCHIVE_URL="https://github.com/nunit/nunit-console/releases/download/${NUNIT_VERSION}/NUnit.Console-${NUNIT_VERSION}.zip" -NUNIT_ARCHIVE_NAME=${NUNIT_ARCHIVE_URL##*/} NUNIT_PATH="/Library/Developer/nunit" NUNIT_VERSION_PATH="$NUNIT_PATH/$NUNIT_VERSION" -download_with_retries "$NUNIT_ARCHIVE_URL" "$TMP_DIR" -echo "Installing $NUNIT_ARCHIVE_NAME..." +NUNIT_ARCHIVE_PATH=$(download_with_retry "$NUNIT_ARCHIVE_URL") +echo "Installing NUnit ${NUNIT_VERSION}..." sudo mkdir -p "$NUNIT_VERSION_PATH" -sudo unzip -q "$TMP_DIR/$NUNIT_ARCHIVE_NAME" -d "$NUNIT_VERSION_PATH" +sudo unzip -q "$NUNIT_ARCHIVE_PATH" -d "$NUNIT_VERSION_PATH" # Create a wrapper script for nunit3-console echo "Creating nunit3-console wrapper..." -NUNIT3_CONSOLE_WRAPPER=nunit3-console -cat <<EOF > "${TMP_DIR}/${NUNIT3_CONSOLE_WRAPPER}" +NUNIT3_CONSOLE_WRAPPER=$(mktemp) +cat <<EOF > "$NUNIT3_CONSOLE_WRAPPER" #!/bin/bash -e -o pipefail exec ${MONO_VERSIONS_PATH}/${MONO_VERSION}/bin/mono --debug \$MONO_OPTIONS $NUNIT_VERSION_PATH/nunit3-console.exe "\$@" EOF -cat "${TMP_DIR}/${NUNIT3_CONSOLE_WRAPPER}" -sudo chmod +x "${TMP_DIR}/${NUNIT3_CONSOLE_WRAPPER}" -sudo mv "${TMP_DIR}/${NUNIT3_CONSOLE_WRAPPER}" "${MONO_VERSIONS_PATH}/${MONO_VERSION}/Commands/${NUNIT3_CONSOLE_WRAPPER}" +cat "$NUNIT3_CONSOLE_WRAPPER" +sudo chmod +x "$NUNIT3_CONSOLE_WRAPPER" +sudo mv "$NUNIT3_CONSOLE_WRAPPER" "${MONO_VERSIONS_PATH}/${MONO_VERSION}/Commands/nunit3-console" # Create a symlink for the short version of Mono (e.g., 6.12) echo "Creating short symlink '${MONO_VERSION_SHORT}'..." diff --git a/images/macos/scripts/build/install-node.sh b/images/macos/scripts/build/install-node.sh index d4ed820ef49f..60a25d5de79f 100644 --- a/images/macos/scripts/build/install-node.sh +++ b/images/macos/scripts/build/install-node.sh @@ -13,8 +13,8 @@ brew_smart_install "node@$defaultVersion" brew link node@$defaultVersion --force --overwrite echo Installing yarn... -download_with_retries "https://yarnpkg.com/install.sh" "/tmp" "yarn-install.sh" -bash /tmp/yarn-install.sh +yarn_installer_path=$(download_with_retry "https://yarnpkg.com/install.sh") +bash "$yarn_installer_path" if is_BigSur || is_Monterey; then npm_global_packages=$(get_toolset_value '.npm.global_packages[].name') diff --git a/images/macos/scripts/build/install-nvm.sh b/images/macos/scripts/build/install-nvm.sh index 59cafdaa398e..4c2c121d54bf 100644 --- a/images/macos/scripts/build/install-nvm.sh +++ b/images/macos/scripts/build/install-nvm.sh @@ -7,25 +7,22 @@ source ~/utils/utils.sh [ -n "$API_PAT" ] && authString=(-H "Authorization: token ${API_PAT}") -VERSION=$(curl "${authString[@]}" -fsSL https://api.github.com/repos/nvm-sh/nvm/releases/latest | jq -r '.tag_name') -download_with_retries "https://raw.githubusercontent.com/nvm-sh/nvm/$VERSION/install.sh" "/tmp" "nvm-install.sh" -bash /tmp/nvm-install.sh +nvm_version=$(curl "${authString[@]}" -fsSL https://api.github.com/repos/nvm-sh/nvm/releases/latest | jq -r '.tag_name') +nvm_installer_path=$(download_with_retry "https://raw.githubusercontent.com/nvm-sh/nvm/$nvm_version/install.sh") -if [ $? -eq 0 ]; then - . ~/.bashrc - nvm --version - nodeVersions=$(get_toolset_value '.node.nvm_versions[]') - for version in ${nodeVersions[@]} - do - nvm install v${version} - done +if bash "$nvm_installer_path"; then + . ~/.bashrc + nvm --version + for version in $(get_toolset_value '.node.nvm_versions[]'); do + nvm install "v${version}" + done - # set system node as default - nvm alias default system + # set system node as default + nvm alias default system + + echo "Node version manager has been installed successfully" else - echo error + echo "Node version manager installation failed" fi -echo "Node version manager has been installed successfully" - invoke_tests "Node" "nvm" diff --git a/images/macos/scripts/build/install-openjdk.sh b/images/macos/scripts/build/install-openjdk.sh index b5787786685b..6000439f6d65 100644 --- a/images/macos/scripts/build/install-openjdk.sh +++ b/images/macos/scripts/build/install-openjdk.sh @@ -34,16 +34,16 @@ installOpenJDK() { local JAVA_VERSION=$1 # Get link for Java binaries and Java version - download_with_retries "https://api.adoptium.net/v3/assets/latest/${JAVA_VERSION}/hotspot" "/tmp" "openjdk-hotspot.json" + hotspot_json_path=$(download_with_retry "https://api.adoptium.net/v3/assets/latest/${JAVA_VERSION}/hotspot") if [[ $arch == "arm64" ]]; then - asset=$(jq -r '.[] | select(.binary.os=="mac" and .binary.image_type=="jdk" and .binary.architecture=="aarch64")' /tmp/openjdk-hotspot.json) + asset=$(jq -r '.[] | select(.binary.os=="mac" and .binary.image_type=="jdk" and .binary.architecture=="aarch64")' "$hotspot_json_path") else - asset=$(jq -r '.[] | select(.binary.os=="mac" and .binary.image_type=="jdk" and .binary.architecture=="x64")' /tmp/openjdk-hotspot.json) + asset=$(jq -r '.[] | select(.binary.os=="mac" and .binary.image_type=="jdk" and .binary.architecture=="x64")' "$hotspot_json_path") fi - archivePath=$(echo ${asset} | jq -r '.binary.package.link') - fullVersion=$(echo ${asset} | jq -r '.version.semver' | tr '+' '-') + archive_url=$(echo "$asset" | jq -r '.binary.package.link') + fullVersion=$(echo "$asset" | jq -r '.version.semver' | tr '+' '-') # Remove 'LTS' suffix from the version if present fullVersion="${fullVersion//.LTS/}" @@ -58,12 +58,12 @@ installOpenJDK() { fi # Download and extract Java binaries - download_with_retries ${archivePath} /tmp OpenJDK-${fullVersion}.tar.gz + archive_path=$(download_with_retry "$archive_url") echo "Creating ${javaToolcacheVersionArchPath} directory" mkdir -p ${javaToolcacheVersionArchPath} - tar -xf /tmp/OpenJDK-${fullVersion}.tar.gz -C ${javaToolcacheVersionArchPath} --strip-components=1 + tar -xf "$archive_path" -C ${javaToolcacheVersionArchPath} --strip-components=1 # Create complete file if [[ $arch == "arm64" ]]; then diff --git a/images/macos/scripts/build/install-powershell.sh b/images/macos/scripts/build/install-powershell.sh index 33adb016c522..3a0a1bbd9b9a 100644 --- a/images/macos/scripts/build/install-powershell.sh +++ b/images/macos/scripts/build/install-powershell.sh @@ -9,16 +9,15 @@ source ~/utils/utils.sh echo Installing PowerShell... arch=$(get_arch) -download_with_retries "https://raw.githubusercontent.com/PowerShell/PowerShell/master/tools/metadata.json" "/tmp" "powershell-metadata.json" -psver=$(cat /tmp/powershell-metadata.json | jq -r '.LTSReleaseTag[0]') -psDownloadUrl=$(get_github_package_download_url "PowerShell/PowerShell" "contains(\"osx-$arch.pkg\")" "$psver" "$API_PAT") -download_with_retries $psDownloadUrl "/tmp" "powershell.pkg" +metadata_json_path=$(download_with_retry "https://raw.githubusercontent.com/PowerShell/PowerShell/master/tools/metadata.json") +version=$(jq -r '.LTSReleaseTag[0]' "$metadata_json_path") +download_url=$(get_github_package_download_url "PowerShell/PowerShell" "contains(\"osx-$arch.pkg\")" "$version" "$API_PAT") +pkg_path=$(download_with_retry "$download_url") # Work around the issue on macOS Big Sur 11.5 or higher for possible error message ("can't be opened because Apple cannot check it for malicious software") when installing the package -sudo xattr -rd com.apple.quarantine /tmp/powershell.pkg +sudo xattr -rd com.apple.quarantine "$pkg_path" - -sudo installer -pkg /tmp/powershell.pkg -target / +sudo installer -pkg "$pkg_path" -target / # Install PowerShell modules psModules=$(get_toolset_value '.powershellModules[].name') diff --git a/images/macos/scripts/build/install-pypy.sh b/images/macos/scripts/build/install-pypy.sh index 39464414c441..5e1900b579ef 100644 --- a/images/macos/scripts/build/install-pypy.sh +++ b/images/macos/scripts/build/install-pypy.sh @@ -10,13 +10,12 @@ function InstallPyPy { PACKAGE_URL=$1 - PACKAGE_TAR_NAME=$(echo $PACKAGE_URL | awk -F/ '{print $NF}') + PACKAGE_TAR_NAME=$(basename "$PACKAGE_URL") echo "Downloading tar archive '$PACKAGE_TAR_NAME'" - PACKAGE_TAR_TEMP_PATH="/tmp/$PACKAGE_TAR_NAME" - download_with_retries $PACKAGE_URL "/tmp" "$PACKAGE_TAR_NAME" + archive_path=$(download_with_retry "$PACKAGE_URL") echo "Expand '$PACKAGE_TAR_NAME' to the /tmp folder" - tar xf $PACKAGE_TAR_TEMP_PATH -C /tmp + tar xf "$archive_path" -C /tmp # Get Python version PACKAGE_NAME=${PACKAGE_TAR_NAME/.tar.bz2/} @@ -70,17 +69,14 @@ function InstallPyPy echo "Create complete file" touch $PYPY_TOOLCACHE_VERSION_PATH/x64.complete - - echo "Remove '$PACKAGE_TAR_TEMP_PATH'" - rm -f $PACKAGE_TAR_TEMP_PATH } arch=$(get_arch) -download_with_retries "https://downloads.python.org/pypy/versions.json" "/tmp" "pypy-versions.json" +versions_json_path=$(download_with_retry "https://downloads.python.org/pypy/versions.json") toolsetVersions=$(get_toolset_value '.toolcache[] | select(.name | contains("PyPy")) | .arch.'$arch'.versions[]') for toolsetVersion in $toolsetVersions; do - latestMajorPyPyVersion=$(cat /tmp/pypy-versions.json | + latestMajorPyPyVersion=$(cat "$versions_json_path" | jq -r --arg toolsetVersion $toolsetVersion '.[] | select((.python_version | startswith($toolsetVersion)) and .stable == true).files[] | select(.platform == "darwin").download_url' | head -1) diff --git a/images/macos/scripts/build/install-python.sh b/images/macos/scripts/build/install-python.sh index dd55c82042cb..978a19340fa7 100644 --- a/images/macos/scripts/build/install-python.sh +++ b/images/macos/scripts/build/install-python.sh @@ -10,19 +10,19 @@ echo "Installing Python Tooling" if is_Monterey || is_BigSur; then echo "Install latest Python 2" - Python2Url="https://www.python.org/ftp/python/2.7.18/python-2.7.18-macosx10.9.pkg" - download_with_retries $Python2Url "/tmp" "python2.pkg" + python2_pkg=$(download_with_retry "https://www.python.org/ftp/python/2.7.18/python-2.7.18-macosx10.9.pkg") - sudo installer -showChoiceChangesXML -pkg /tmp/python2.pkg -target / > /tmp/python2_choices.xml + choice_changes_xml=$(mktemp /tmp/python2_choice_changes.xml.XXXXXX) + sudo installer -showChoiceChangesXML -pkg "$python2_pkg" -target / | tee "$choice_changes_xml" > /dev/null # To avoid symlink conflicts, remove tools installation in /usr/local/bin using installer choices - xmllint --shell /tmp/python2_choices.xml <<EOF + xmllint --shell "$choice_changes_xml" <<EOF cd //array/dict[string[text()='org.python.Python.PythonUnixTools-2.7']]/integer set 0 save EOF - sudo installer -applyChoiceChangesXML /tmp/python2_choices.xml -pkg /tmp/python2.pkg -target / + sudo installer -applyChoiceChangesXML "$choice_changes_xml" -pkg "$python2_pkg" -target / pip install --upgrade pip diff --git a/images/macos/scripts/build/install-ruby.sh b/images/macos/scripts/build/install-ruby.sh index 234312ee013c..13989a62e0cd 100644 --- a/images/macos/scripts/build/install-ruby.sh +++ b/images/macos/scripts/build/install-ruby.sh @@ -45,11 +45,10 @@ if ! is_Arm64; then mkdir -p $RUBY_VERSION_PATH echo "Downloading tar archive $PACKAGE_TAR_NAME" - DOWNLOAD_URL="https://github.com/ruby/ruby-builder/releases/download/toolcache/${PACKAGE_TAR_NAME}" - download_with_retries $DOWNLOAD_URL "/tmp" $PACKAGE_TAR_NAME + ARCHIVE_PATH=$(download_with_retry "https://github.com/ruby/ruby-builder/releases/download/toolcache/${PACKAGE_TAR_NAME}") echo "Expand '$PACKAGE_TAR_NAME' to the '$RUBY_VERSION_PATH' folder" - tar xf "/tmp/$PACKAGE_TAR_NAME" -C $RUBY_VERSION_PATH + tar xf "$ARCHIVE_PATH" -C $RUBY_VERSION_PATH COMPLETE_FILE_PATH="$RUBY_VERSION_PATH/x64.complete" if [ ! -f $COMPLETE_FILE_PATH ]; then echo "Create complete file" diff --git a/images/macos/scripts/build/install-visualstudio.sh b/images/macos/scripts/build/install-visualstudio.sh index 34aa585c46b6..805a0c542e9a 100644 --- a/images/macos/scripts/build/install-visualstudio.sh +++ b/images/macos/scripts/build/install-visualstudio.sh @@ -21,18 +21,16 @@ install_vsmac() { fi echo "Installing Visual Studio ${VSMAC_VERSION} for Mac" - TMPMOUNT=`/usr/bin/mktemp -d /tmp/visualstudio.XXXX` - TMPMOUNT_DOWNLOADS="$TMPMOUNT/downloads" - mkdir $TMPMOUNT_DOWNLOADS + TMPMOUNT=$(/usr/bin/mktemp -d /tmp/visualstudio.XXXX) + mkdir -p "$TMPMOUNT/downloads" - download_with_retries $VSMAC_DOWNLOAD_URL $TMPMOUNT_DOWNLOADS + VSMAC_INSTALLER=$(download_with_retry "$VSMAC_DOWNLOAD_URL" "$TMPMOUNT/downloads/${VSMAC_DOWNLOAD_URL##*/}") echo "Mounting Visual Studio..." - VISUAL_STUDIO_NAME=${VSMAC_DOWNLOAD_URL##*/} - hdiutil attach "$TMPMOUNT_DOWNLOADS/$VISUAL_STUDIO_NAME" -mountpoint "$TMPMOUNT" + hdiutil attach "$VSMAC_INSTALLER" -mountpoint "$TMPMOUNT" echo "Moving Visual Studio to /Applications/..." - pushd $TMPMOUNT + pushd "$TMPMOUNT" tar cf - "./Visual Studio.app" | tar xf - -C /Applications/ if [ $VSMAC_VERSION != $VSMAC_DEFAULT ]; then diff --git a/images/macos/scripts/helpers/Common.Helpers.psm1 b/images/macos/scripts/helpers/Common.Helpers.psm1 index 68a0e343fa66..627836f4afe1 100644 --- a/images/macos/scripts/helpers/Common.Helpers.psm1 +++ b/images/macos/scripts/helpers/Common.Helpers.psm1 @@ -125,49 +125,53 @@ function Invoke-ValidateCommand { } } -function Start-DownloadWithRetry { +function Invoke-DownloadWithRetry { Param ( [Parameter(Mandatory)] [string] $Url, - [string] $Name, - [string] $DownloadPath = "${env:Temp}", - [int] $Retries = 20, - [int] $Interval = 30 + [Alias("Destination")] + [string] $Path ) - if ([String]::IsNullOrEmpty($Name)) { - $Name = [IO.Path]::GetFileName($Url) + if (-not $Path) { + $invalidChars = [IO.Path]::GetInvalidFileNameChars() -join '' + $re = "[{0}]" -f [RegEx]::Escape($invalidChars) + $fileName = [IO.Path]::GetFileName($Url) -replace $re + + if ([String]::IsNullOrEmpty($fileName)) { + $fileName = [System.IO.Path]::GetRandomFileName() + } + $Path = Join-Path -Path "/tmp" -ChildPath $fileName } - $filePath = Join-Path -Path $DownloadPath -ChildPath $Name + Write-Host "Downloading package from $Url to $Path..." - #Default retry logic for the package. - while ($Retries -gt 0) - { - try - { - Write-Host "Downloading package from: $Url to path $filePath ." - (New-Object System.Net.WebClient).DownloadFile($Url, $filePath) + $interval = 30 + $downloadStartTime = Get-Date + for ($retries = 20; $retries -gt 0; $retries--) { + try { + $attemptStartTime = Get-Date + (New-Object System.Net.WebClient).DownloadFile($Url, $Path) + $attemptSeconds = [math]::Round(($(Get-Date) - $attemptStartTime).TotalSeconds, 2) + Write-Host "Package downloaded in $attemptSeconds seconds" break + } catch { + $attemptSeconds = [math]::Round(($(Get-Date) - $attemptStartTime).TotalSeconds, 2) + Write-Warning "Package download failed in $attemptSeconds seconds" + Write-Warning $_.Exception.Message } - catch - { - Write-Host "There is an error during package downloading:`n $_" - $Retries-- - - if ($Retries -eq 0) - { - Write-Host "File can't be downloaded. Please try later or check that file exists by url: $Url" - exit 1 - } - - Write-Host "Waiting $Interval seconds before retrying. Retries left: $Retries" - Start-Sleep -Seconds $Interval + + if ($retries -eq 0) { + $totalSeconds = [math]::Round(($(Get-Date) - $downloadStartTime).TotalSeconds, 2) + throw "Package download failed after $totalSeconds seconds" } + + Write-Warning "Waiting $interval seconds before retrying (retries left: $retries)..." + Start-Sleep -Seconds $interval } - return $filePath + return $Path } function Add-EnvironmentVariable { diff --git a/images/macos/scripts/helpers/Xcode.Installer.psm1 b/images/macos/scripts/helpers/Xcode.Installer.psm1 index 86e65734a07e..2413538c9aad 100644 --- a/images/macos/scripts/helpers/Xcode.Installer.psm1 +++ b/images/macos/scripts/helpers/Xcode.Installer.psm1 @@ -32,9 +32,8 @@ function Invoke-DownloadXcodeArchive { $xcodeFileName = 'Xcode-{0}.xip' -f $Version $xcodeUri = '{0}{1}?{2}'-f ${env:XCODE_INSTALL_STORAGE_URL}, $xcodeFileName, ${env:XCODE_INSTALL_SAS} - Start-DownloadWithRetry -Url $xcodeUri -DownloadPath $tempXipDirectory.FullName -Name $xcodeFileName + Invoke-DownloadWithRetry -Url $xcodeUri -Path (Join-Path $tempXipDirectory.FullName $xcodeFileName) | Out-Null return $tempXipDirectory - } function Resolve-ExactXcodeVersion { diff --git a/images/macos/scripts/helpers/utils.sh b/images/macos/scripts/helpers/utils.sh index cdf79adaadee..cb644b41c509 100644 --- a/images/macos/scripts/helpers/utils.sh +++ b/images/macos/scripts/helpers/utils.sh @@ -1,49 +1,44 @@ #!/bin/bash -e -o pipefail -download_with_retries() { -# Due to restrictions of bash functions, positional arguments are used here. -# In case if you using latest argument NAME, you should also set value to all previous parameters. -# Example: download_with_retries $ANDROID_SDK_URL "." "android_sdk.zip" - local URL="$1" - local DEST="${2:-.}" - local NAME="${3:-${URL##*/}}" - local COMPRESSED="$4" - - if [[ $COMPRESSED == "compressed" ]]; then - local COMMAND="curl $URL -4 -sL --compressed -o '$DEST/$NAME' -w '%{http_code}'" - else - local COMMAND="curl $URL -4 -sL -o '$DEST/$NAME' -w '%{http_code}'" - fi +download_with_retry() { + url=$1 + download_path=$2 - # Save current errexit state and disable it to prevent unexpected exit on error - if echo $SHELLOPTS | grep '\(^\|:\)errexit\(:\|$\)' > /dev/null; - then - local ERR_EXIT_ENABLED=true - else - local ERR_EXIT_ENABLED=false + if [ -z "$download_path" ]; then + download_path="/tmp/$(basename "$url")" fi - set +e - echo "Downloading '$URL' to '${DEST}/${NAME}'..." - retries=20 + echo "Downloading package from $url to $download_path..." >&2 + interval=30 - while [ $retries -gt 0 ]; do - ((retries--)) - test "$ERR_EXIT_ENABLED" = true && set +e - http_code=$(eval $COMMAND) - exit_code=$? - test "$ERR_EXIT_ENABLED" = true && set -e - if [ $http_code -eq 200 ] && [ $exit_code -eq 0 ]; then - echo "Download completed" - return 0 + download_start_time=$(date +%s) + + for ((retries=20; retries>0; retries--)); do + attempt_start_time=$(date +%s) + if http_code=$(curl -4sSLo "$download_path" "$url" -w '%{http_code}'); then + attempt_seconds=$(($(date +%s) - attempt_start_time)) + if [ "$http_code" -eq 200 ]; then + echo "Package downloaded in $attempt_seconds seconds" >&2 + break + else + echo "Received HTTP status code $http_code after $attempt_seconds seconds" >&2 + fi else - echo "Error — Either HTTP response code for '$URL' is wrong - '$http_code' or exit code is not 0 - '$exit_code'. Waiting $interval seconds before the next attempt, $retries attempts left" - sleep 30 + attempt_seconds=$(($(date +%s) - attempt_start_time)) + echo "Package download failed in $attempt_seconds seconds" >&2 fi + + if [ $retries -eq 0 ]; then + total_seconds=$(($(date +%s) - download_start_time)) + echo "Package download failed after $total_seconds seconds" >&2 + exit 1 + fi + + echo "Waiting $interval seconds before retrying (retries left: $retries)..." >&2 + sleep $interval done - echo "Could not download $URL" - return 1 + echo "$download_path" } is_Arm64() { diff --git a/images/macos/scripts/helpers/xamarin-utils.sh b/images/macos/scripts/helpers/xamarin-utils.sh index d52c83a1a10e..83ddfb1bcfe9 100644 --- a/images/macos/scripts/helpers/xamarin-utils.sh +++ b/images/macos/scripts/helpers/xamarin-utils.sh @@ -4,15 +4,6 @@ source ~/utils/utils.sh # Xamarin can clean their SDKs while updating to newer versions, # so we should be able to detect it during image generation -downloadAndInstallPKG() { - local PKG_URL=$1 - local PKG_NAME=${PKG_URL##*/} - - download_with_retries $PKG_URL - - echo "Installing $PKG_NAME..." - sudo installer -pkg "$TMPMOUNT/$PKG_NAME" -target / -} buildVSMacDownloadUrl() { echo "https://dl.xamarin.com/VsMac/VisualStudioForMac-${1}.dmg" @@ -41,7 +32,8 @@ installMono() { local MONO_FOLDER_NAME=$(echo $VERSION | cut -d. -f 1,2,3) local SHORT_VERSION=$(echo $VERSION | cut -d. -f 1,2) local PKG_URL=$(buildMonoDownloadUrl $VERSION) - downloadAndInstallPKG $PKG_URL + + sudo installer -pkg "$(download_with_retry "$PKG_URL")" -target / echo "Installing nunit3-console for Mono "$VERSION installNunitConsole $MONO_FOLDER_NAME @@ -59,7 +51,8 @@ installXamarinIOS() { echo "Installing Xamarin.iOS ${VERSION}..." local SHORT_VERSION=$(echo $VERSION | cut -d. -f 1,2) local PKG_URL=$(buildXamariniIOSDownloadUrl $VERSION) - downloadAndInstallPKG $PKG_URL + + sudo installer -pkg "$(download_with_retry "$PKG_URL")" -target / echo "Creating short symlink '${SHORT_VERSION}'" sudo ln -s ${IOS_VERSIONS_PATH}/${VERSION} ${IOS_VERSIONS_PATH}/${SHORT_VERSION} @@ -74,7 +67,8 @@ installXamarinMac() { echo "Installing Xamarin.Mac ${VERSION}..." local SHORT_VERSION=$(echo $VERSION | cut -d. -f 1,2) local PKG_URL=$(buildXamarinMacDownloadUrl $VERSION) - downloadAndInstallPKG $PKG_URL + + sudo installer -pkg "$(download_with_retry "$PKG_URL")" -target / echo "Creating short symlink '${SHORT_VERSION}'" sudo ln -s ${MAC_VERSIONS_PATH}/${VERSION} ${MAC_VERSIONS_PATH}/${SHORT_VERSION} @@ -89,7 +83,8 @@ installXamarinAndroid() { echo "Installing Xamarin.Android ${VERSION}..." local SHORT_VERSION=$(echo $VERSION | cut -d. -f 1,2) local PKG_URL=$(buildXamarinAndroidDownloadUrl $VERSION) - downloadAndInstallPKG $PKG_URL + + sudo installer -pkg "$(download_with_retry "$PKG_URL")" -target / if [ "$VERSION" == "9.4.1.0" ]; then # Fix symlinks for broken Xamarin.Android @@ -159,46 +154,27 @@ fixXamarinAndroidSymlinksInLibDir() { installNunitConsole() { local MONO_VERSION=$1 + local TMP_WRAPPER_PATH=$(mktemp) - cat <<EOF > ${TMPMOUNT}/${NUNIT3_CONSOLE_BIN} + cat <<EOF > "$TMP_WRAPPER_PATH" #!/bin/bash -e -o pipefail exec /Library/Frameworks/Mono.framework/Versions/${MONO_VERSION}/bin/mono --debug \$MONO_OPTIONS $NUNIT3_PATH/nunit3-console.exe "\$@" EOF - sudo chmod +x ${TMPMOUNT}/${NUNIT3_CONSOLE_BIN} - sudo mv ${TMPMOUNT}/${NUNIT3_CONSOLE_BIN} ${MONO_VERSIONS_PATH}/${MONO_VERSION}/Commands/${NUNIT3_CONSOLE_BIN} + sudo chmod +x "$TMP_WRAPPER_PATH" + sudo mv "$TMP_WRAPPER_PATH" "${MONO_VERSIONS_PATH}/${MONO_VERSION}/Commands/nunit3-console" } downloadNUnitConsole() { - echo "Downloading NUnit 3..." - local NUNIT3_LOCATION='https://github.com/nunit/nunit-console/releases/download/3.6.1/NUnit.Console-3.6.1.zip' - local NUNIT_PATH="/Library/Developer/nunit" - NUNIT3_PATH="$NUNIT_PATH/3.6.1" + echo "Downloading NUnit 3..." + local NUNIT3_VERSION='3.6.1' + local NUNIT3_LOCATION="https://github.com/nunit/nunit-console/releases/download/${NUNIT3_VERSION}/NUnit.Console-${NUNIT3_VERSION}.zip" + local NUNIT3_PATH="/Library/Developer/nunit/${NUNIT3_VERSION}" - pushd $TMPMOUNT + NUNIT3_ARCHIVE=$(download_with_retry $NUNIT3_LOCATION) - sudo mkdir -p $NUNIT3_PATH - download_with_retries $NUNIT3_LOCATION "." "nunit3.zip" - - echo "Installing NUnit 3..." - sudo unzip nunit3.zip -d $NUNIT3_PATH - NUNIT3_CONSOLE_BIN=nunit3-console - - popd -} - -installNuget() { - local MONO_VERSION=$1 - local NUGET_VERSION=$2 - local NUGET_URL="https://dist.nuget.org/win-x86-commandline/v${NUGET_VERSION}/nuget.exe" - echo "Installing nuget $NUGET_VERSION for Mono $MONO_VERSION" - cd ${MONO_VERSIONS_PATH}/${MONO_VERSION}/lib/mono/nuget - sudo mv nuget.exe nuget_old.exe - - pushd $TMPMOUNT - download_with_retries $NUGET_URL "." "nuget.exe" - sudo chmod a+x nuget.exe - sudo mv nuget.exe ${MONO_VERSIONS_PATH}/${MONO_VERSION}/lib/mono/nuget - popd + echo "Installing NUnit 3..." + sudo mkdir -p $NUNIT3_PATH + sudo unzip "$NUNIT3_ARCHIVE" -d $NUNIT3_PATH } createUWPShim() { @@ -236,4 +212,4 @@ deleteSymlink() { sudo rm -f ${IOS_VERSIONS_PATH}/${1} sudo rm -f ${MAC_VERSIONS_PATH}/${1} sudo rm -f ${ANDROID_VERSIONS_PATH}/${1} -} \ No newline at end of file +} From 45a5b970b809e08869dcf5f11456001d86952d3f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 30 Nov 2023 12:50:54 +0000 Subject: [PATCH 2495/3485] Windows Server 2019 (20231126) Image Update (#8898) * Updating readme file for win19 version 20231126.1.1 * Update Windows2019-Readme.md --------- Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/windows/Windows2019-Readme.md | 59 ++++++++++++++-------------- 1 file changed, 29 insertions(+), 30 deletions(-) diff --git a/images/windows/Windows2019-Readme.md b/images/windows/Windows2019-Readme.md index a8e2c856c6a2..6448aace465d 100644 --- a/images/windows/Windows2019-Readme.md +++ b/images/windows/Windows2019-Readme.md @@ -6,7 +6,7 @@ *** # Windows Server 2019 - OS Version: 10.0.17763 Build 5122 -- Image Version: 20231115.10.0 +- Image Version: 20231126.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -14,14 +14,14 @@ ## Installed Software ### Language and Runtime -- Bash 5.2.15(1)-release +- Bash 5.2.21(1)-release - Go 1.20.11 -- Julia 1.9.3 -- Kotlin 1.9.20 +- Julia 1.9.4 +- Kotlin 1.9.21 - LLVM 16.0.6 - Node 18.18.2 - Perl 5.32.1 -- PHP 8.2.12 +- PHP 8.2.13 - Python 3.7.9 - Ruby 2.5.9p229 @@ -29,13 +29,13 @@ - Chocolatey 2.2.2 - Composer 2.6.5 - Helm 3.13.1 -- Miniconda 23.9.0 (pre-installed on the image but not added to PATH) +- Miniconda 23.10.0 (pre-installed on the image but not added to PATH) - NPM 9.8.1 -- NuGet 6.7.0.127 +- NuGet 6.8.0.131 - pip 23.3.1 (python 3.7) - Pipx 1.2.1 - RubyGems 2.7.6.3 -- Vcpkg (build from commit 67e861818) +- Vcpkg (build from commit cd5e746ec) - Yarn 1.22.21 #### Environment variables @@ -52,20 +52,20 @@ ### Tools - 7zip 23.01 -- aria2 1.36.0 +- aria2 1.37.0 - azcopy 10.21.1 - Bazel 6.4.0 -- Bazelisk 1.18.0 +- Bazelisk 1.19.0 - Bicep 0.23.1 - Cabal 3.10.2.0 -- CMake 3.27.7 -- CodeQL Action Bundle 2.15.2 +- CMake 3.27.8 +- CodeQL Action Bundle 2.15.3 - Docker 24.0.7 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.23.0 +- Docker Compose v2 2.23.3 - Docker-wincred 0.8.0 - ghc 9.8.1 -- Git 2.42.0.windows.2 +- Git 2.43.0.windows.1 - Git LFS 3.4.0 - Google Cloud CLI 455.0.0 - ImageMagick 7.1.1-21 @@ -82,7 +82,7 @@ - OpenSSL 1.1.1w - Packer 1.9.4 - Parcel 2.10.3 -- Pulumi 3.94.0 +- Pulumi 3.94.2 - R 4.3.2 - Service Fabric SDK 9.1.1436.9590 - Stack 2.13.1 @@ -95,9 +95,9 @@ - zstd 1.5.5 ### CLI Tools -- Alibaba Cloud CLI 3.0.187 -- AWS CLI 2.13.35 -- AWS SAM CLI 1.102.0 +- Alibaba Cloud CLI 3.0.188 +- AWS CLI 2.13.38 +- AWS SAM CLI 1.103.0 - AWS Session Manager CLI 1.2.497.0 - Azure CLI 2.54.0 - Azure DevOps CLI extension 0.26.0 @@ -105,9 +105,9 @@ - GitHub CLI 2.39.1 ### Rust Tools -- Cargo 1.73.0 -- Rust 1.73.0 -- Rustdoc 1.73.0 +- Cargo 1.74.0 +- Rust 1.74.0 +- Rustdoc 1.74.0 - Rustup 1.26.0 #### Packages @@ -115,15 +115,15 @@ - cargo-audit 0.18.3 - cargo-outdated 0.14.0 - cbindgen 0.26.0 -- Clippy 0.1.73 +- Clippy 0.1.74 - Rustfmt 1.6.0 ### Browsers and Drivers - Google Chrome 119.0.6045.160 - Chrome Driver 119.0.6045.105 -- Microsoft Edge 119.0.2151.58 -- Microsoft Edge Driver 119.0.2151.58 -- Mozilla Firefox 119.0.1 +- Microsoft Edge 119.0.2151.72 +- Microsoft Edge Driver 119.0.2151.72 +- Mozilla Firefox 120.0 - Gecko Driver 0.33.0 - IE Driver 4.14.0.0 - Selenium server 4.15.0 @@ -172,10 +172,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 1.21.4 #### Node.js -- 14.21.3 - 16.20.2 - 18.18.2 -- 20.9.0 +- 20.10.0 #### Python - 3.7.9 @@ -506,7 +505,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - nbgv 3.6.133+2d32d93cb1 ### PowerShell Tools -- PowerShell 7.2.16 +- PowerShell 7.2.17 #### Powershell Modules - Az: 9.3.0 @@ -515,10 +514,10 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Az (Cached): 1.0.0.zip, 1.6.0.zip, 2.3.2.zip, 2.6.0.zip, 3.1.0.zip, 3.5.0.zip, 3.8.0.zip, 4.3.0.zip, 4.4.0.zip, 4.7.0.zip, 5.5.0.zip, 5.9.0.zip, 6.6.0.zip, 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.453 +- AWSPowershell: 4.1.459 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 -- Microsoft.Graph: 2.9.0 +- Microsoft.Graph: 2.10.0 - Pester: 3.4.0, 5.5.0 - PowerShellGet: 1.0.0.1, 2.2.5 - PSScriptAnalyzer: 1.21.0 From eb0e4ff100b7cd7bf20cc8fbdae059943a2058c2 Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Thu, 30 Nov 2023 16:53:16 +0100 Subject: [PATCH 2496/3485] [Windows] Move Android and VS helpers to dedicated files (#8903) --- .../scripts/build/Install-VSExtensions.ps1 | 5 +- .../docs-gen/SoftwareReport.VisualStudio.psm1 | 26 +- .../scripts/helpers/AndroidHelpers.ps1 | 163 ++++++++++ .../windows/scripts/helpers/ImageHelpers.psm1 | 8 +- .../scripts/helpers/InstallHelpers.ps1 | 294 ------------------ .../scripts/helpers/VisualStudioHelpers.ps1 | 148 ++++++++- .../scripts/tests/VisualStudio.Tests.ps1 | 5 +- images/windows/scripts/tests/Vsix.Tests.ps1 | 12 +- 8 files changed, 332 insertions(+), 329 deletions(-) create mode 100644 images/windows/scripts/helpers/AndroidHelpers.ps1 diff --git a/images/windows/scripts/build/Install-VSExtensions.ps1 b/images/windows/scripts/build/Install-VSExtensions.ps1 index a866876fffea..3624d80cfca1 100644 --- a/images/windows/scripts/build/Install-VSExtensions.ps1 +++ b/images/windows/scripts/build/Install-VSExtensions.ps1 @@ -11,8 +11,9 @@ if (-not $vsixPackagesList) { } $vsixPackagesList | ForEach-Object { - # Retrieve cdn endpoint to avoid HTTP error 429 https://github.com/actions/runner-images/issues/3074 - $vsixPackage = Get-VsixExtenstionFromMarketplace -ExtensionMarketPlaceName $_ + # Retrieve cdn endpoint to avoid HTTP error 429 + # https://github.com/actions/runner-images/issues/3074 + $vsixPackage = Get-VsixInfoFromMarketplace $_ Write-Host "Installing $vsixPackage" if ($vsixPackage.FileName.EndsWith(".vsix")) { Install-VSIXFromUrl $vsixPackage.DownloadUri diff --git a/images/windows/scripts/docs-gen/SoftwareReport.VisualStudio.psm1 b/images/windows/scripts/docs-gen/SoftwareReport.VisualStudio.psm1 index 9a1bdd8256c5..69bad2f022d6 100644 --- a/images/windows/scripts/docs-gen/SoftwareReport.VisualStudio.psm1 +++ b/images/windows/scripts/docs-gen/SoftwareReport.VisualStudio.psm1 @@ -24,15 +24,13 @@ function Get-VisualStudioExtensions { # Additional vsixs $toolset = Get-ToolsetContent - $vsixUrls = $toolset.visualStudio.vsix - if ($vsixUrls) - { - $vsixs = $vsixUrls | ForEach-Object { - $vsix = Get-VsixExtenstionFromMarketplace -ExtensionMarketPlaceName $_ - - $vsixVersion = ($vsPackages | Where-Object {$_.Id -match $vsix.VsixId -and $_.type -eq 'vsix'}).Version + $vsixPackagesList = $toolset.visualStudio.vsix + if ($vsixPackagesList) { + $vsixs = $vsixPackagesList | ForEach-Object { + $vsixPackage = Get-VsixInfoFromMarketplace $_ + $vsixVersion = ($vsPackages | Where-Object { $_.Id -match $vsixPackage.VsixId -and $_.type -eq 'vsix' }).Version @{ - Package = $vsix.ExtensionName + Package = $vsixPackage.ExtensionName Version = $vsixVersion } } @@ -41,15 +39,15 @@ function Get-VisualStudioExtensions { # SDK $sdkVersion = Get-SDKVersion $sdkPackages = @( - @{Package = 'Windows Software Development Kit'; Version = $sdkVersion} + @{Package = 'Windows Software Development Kit'; Version = $sdkVersion } ) # WDK $wdkVersion = Get-WDKVersion $wdkExtensionVersion = Get-VSExtensionVersion -packageName 'Microsoft.Windows.DriverKit' $wdkPackages = @( - @{Package = 'Windows Driver Kit'; Version = $wdkVersion} - @{Package = 'Windows Driver Kit Visual Studio Extension'; Version = $wdkExtensionVersion} + @{Package = 'Windows Driver Kit'; Version = $wdkVersion } + @{Package = 'Windows Driver Kit Visual Studio Extension'; Version = $wdkExtensionVersion } ) $extensions = @( @@ -60,14 +58,14 @@ function Get-VisualStudioExtensions { ) $extensions | Foreach-Object { - [PSCustomObject]$_ + [PSCustomObject] $_ } | Select-Object Package, Version | Sort-Object Package } function Get-WindowsSDKs { $path = "${env:ProgramFiles(x86)}\Windows Kits\10\Extension SDKs\WindowsDesktop" return [PSCustomObject]@{ - Path = $path + Path = $path Versions = $(Get-ChildItem $path).Name } -} \ No newline at end of file +} diff --git a/images/windows/scripts/helpers/AndroidHelpers.ps1 b/images/windows/scripts/helpers/AndroidHelpers.ps1 new file mode 100644 index 000000000000..8ba7a7b70bb5 --- /dev/null +++ b/images/windows/scripts/helpers/AndroidHelpers.ps1 @@ -0,0 +1,163 @@ +function Get-AndroidPackages { + <# + .SYNOPSIS + This function returns a list of available Android packages. + + .DESCRIPTION + The Get-AndroidPackages function checks if a list of packages is already available in a file. + If not, it uses the sdkmanager.bat script to generate a list of available packages and saves it to a file. + It then returns the content of this file. + + .PARAMETER SDKRootPath + The root path of the Android SDK installation. + If not specified, the function uses the ANDROID_HOME environment variable. + + .EXAMPLE + Get-AndroidPackages -SDKRootPath "C:\Android\SDK" + + This command returns a list of available Android packages for the specified SDK root path. + + .NOTES + This function requires the Android SDK to be installed and the sdkmanager.bat script to be accessible. + + #> + Param + ( + [string] $SDKRootPath + ) + + if (-not $SDKRootPath) { + $SDKRootPath = $env:ANDROID_HOME + } + + $packagesListFile = "$SDKRootPath\packages-list.txt" + $sdkManager = "$SDKRootPath\cmdline-tools\latest\bin\sdkmanager.bat" + + if (-Not (Test-Path -Path $packagesListFile -PathType Leaf)) { + (cmd /c "$sdkManager --list --verbose 2>&1") | + Where-Object { $_ -Match "^[^\s]" } | + Where-Object { $_ -NotMatch "^(Loading |Info: Parsing |---|\[=+|Installed |Available )" } | + Where-Object { $_ -NotMatch "^[^;]*$" } | + Out-File -FilePath $packagesListFile + } + + return Get-Content $packagesListFile +} + +function Get-AndroidPlatformPackages { + <# + .SYNOPSIS + This function returns a list of available Android platform packages. + + .DESCRIPTION + The Get-AndroidPlatformPackages function uses the Get-AndroidPackages function to get a list of available packages + and filters it to return only platform packages. + + .PARAMETER SDKRootPath + The root path of the Android SDK installation. + If not specified, the function uses the ANDROID_HOME environment variable. + + .PARAMETER minimumVersion + The minimum version of the platform packages to include in the result. Default is 0. + + .EXAMPLE + Get-AndroidPlatformPackages -SDKRootPath "C:\Android\SDK" -minimumVersion 29 + + This command returns a list of available Android platform packages for the specified SDK root path with a minimum version of 29. + + .NOTES + This function requires the Android SDK to be installed and the sdkmanager.bat script to be accessible. + + #> + Param + ( + [string] $SDKRootPath, + [Alias("minVersion")] + [int] $minimumVersion = 0 + ) + + if (-not $SDKRootPath) { + $SDKRootPath = $env:ANDROID_HOME + } + + return (Get-AndroidPackages -SDKRootPath $SDKRootPath) ` + | Where-Object { "$_".StartsWith("platforms;") } ` + | Where-Object { ($_.Split("-")[1] -as [int]) -ge $minimumVersion } ` + | Sort-Object -Unique +} + +function Get-AndroidBuildToolPackages { + <# + .SYNOPSIS + This function returns a list of available Android build tool packages. + + .DESCRIPTION + The Get-AndroidBuildToolPackages function uses the Get-AndroidPackages function to get a list of available packages + and filters it to return only build tool packages. + + .PARAMETER SDKRootPath + The root path of the Android SDK installation. + If not specified, the function uses the ANDROID_HOME environment variable. + + .PARAMETER minimumVersion + The minimum version of the build tool packages to include in the result. Default is 0.0.0. + + .EXAMPLE + Get-AndroidBuildToolPackages -SDKRootPath "C:\Android\SDK" -minimumVersion "30.0.2" + + This command returns a list of available Android build tool packages for the specified SDK root path with a minimum version of 30.0.2. + + .NOTES + This function requires the Android SDK to be installed and the sdkmanager.bat script to be accessible. + + #> + Param + ( + [string] $SDKRootPath, + [Alias("minVersion")] + [version] $minimumVersion = "0.0.0" + ) + + if (-not $SDKRootPath) { + $SDKRootPath = $env:ANDROID_HOME + } + + return (Get-AndroidPackages -SDKRootPath $SDKRootPath) ` + | Where-Object { "$_".StartsWith("build-tools;") } ` + | Where-Object { ($_.Split(";")[1] -as [version]) -ge $minimumVersion } ` + | Sort-Object -Unique +} + +function Get-AndroidInstalledPackages { + <# + .SYNOPSIS + Retrieves a list of installed Android packages. + + .DESCRIPTION + This function retrieves a list of installed Android packages using the specified SDK root path. + + .PARAMETER SDKRootPath + The root path of the Android SDK. + If not specified, the function uses the ANDROID_HOME environment variable. + + .EXAMPLE + Get-AndroidInstalledPackages -SDKRootPath "C:\Android\SDK" + Retrieves a list of installed Android packages using the specified SDK root path. + + .NOTES + This function requires the Android SDK to be installed and the SDK root path to be provided. + #> + + Param + ( + [string] $SDKRootPath + ) + + if (-not $SDKRootPath) { + $SDKRootPath = $env:ANDROID_HOME + } + + $sdkManager = "$SDKRootPath\cmdline-tools\latest\bin\sdkmanager.bat" + + return (cmd /c "$sdkManager --list_installed 2>&1") -notmatch "Warning" +} diff --git a/images/windows/scripts/helpers/ImageHelpers.psm1 b/images/windows/scripts/helpers/ImageHelpers.psm1 index ed65b201a258..cad48838add5 100644 --- a/images/windows/scripts/helpers/ImageHelpers.psm1 +++ b/images/windows/scripts/helpers/ImageHelpers.psm1 @@ -1,9 +1,10 @@ [CmdletBinding()] param() -. $PSScriptRoot\PathHelpers.ps1 -. $PSScriptRoot\InstallHelpers.ps1 +. $PSScriptRoot\AndroidHelpers.ps1 . $PSScriptRoot\ChocoHelpers.ps1 +. $PSScriptRoot\InstallHelpers.ps1 +. $PSScriptRoot\PathHelpers.ps1 . $PSScriptRoot\VisualStudioHelpers.ps1 Export-ModuleMember -Function @( @@ -17,7 +18,7 @@ Export-ModuleMember -Function @( 'Get-TCToolVersionPath' 'Get-TCToolPath' 'Invoke-DownloadWithRetry' - 'Get-VsixExtenstionFromMarketplace' + 'Get-VsixInfoFromMarketplace' 'Install-VSIXFromFile' 'Install-VSIXFromUrl' 'Get-VSExtensionVersion' @@ -25,7 +26,6 @@ Export-ModuleMember -Function @( 'Test-IsWin22' 'Test-IsWin19' 'Install-ChocoPackage' - 'Send-RequestToCocolateyPackages' 'Resolve-ChocoPackageVersion' 'Resolve-GithubReleaseAssetUrl' 'Expand-7ZipArchive' diff --git a/images/windows/scripts/helpers/InstallHelpers.ps1 b/images/windows/scripts/helpers/InstallHelpers.ps1 index 5a5bef1e895e..a892e657199b 100644 --- a/images/windows/scripts/helpers/InstallHelpers.ps1 +++ b/images/windows/scripts/helpers/InstallHelpers.ps1 @@ -179,136 +179,6 @@ function Invoke-DownloadWithRetry { return $Path } -function Get-VsixExtenstionFromMarketplace { - Param - ( - [string] $ExtensionMarketPlaceName, - [string] $MarketplaceUri = "https://marketplace.visualstudio.com/items?itemName=" - ) - - # Invoke-WebRequest doesn't support retry in PowerShell 5.1 - $request = Invoke-ScriptBlockWithRetry -RetryCount 20 -RetryIntervalSeconds 30 -Command { - Invoke-WebRequest -Uri "${MarketplaceUri}${ExtensionMarketPlaceName}" -UseBasicParsing - } - $request -match 'UniqueIdentifierValue":"(?<extensionname>[^"]*)' | Out-Null - $extensionName = $Matches.extensionname - $request -match 'VsixId":"(?<vsixid>[^"]*)' | Out-Null - $vsixId = $Matches.vsixid - $request -match 'AssetUri":"(?<uri>[^"]*)' | Out-Null - $assetUri = $Matches.uri - $request -match 'Microsoft\.VisualStudio\.Services\.Payload\.FileName":"(?<filename>[^"]*)' | Out-Null - $fileName = $Matches.filename - $downloadUri = $assetUri + "/" + $fileName - # ProBITools.MicrosoftReportProjectsforVisualStudio2022 has different URL https://github.com/actions/runner-images/issues/5340 - switch ($ExtensionMarketPlaceName) { - "ProBITools.MicrosoftReportProjectsforVisualStudio2022" { - $fileName = "Microsoft.DataTools.ReportingServices.vsix" - $downloadUri = "https://download.microsoft.com/download/b/b/5/bb57be7e-ae72-4fc0-b528-d0ec224997bd/Microsoft.DataTools.ReportingServices.vsix" - } - "ProBITools.MicrosoftAnalysisServicesModelingProjects2022" { - $fileName = "Microsoft.DataTools.AnalysisServices.vsix" - $downloadUri = "https://download.microsoft.com/download/c/8/9/c896a7f2-d0fd-45ac-90e6-ff61f67523cb/Microsoft.DataTools.AnalysisServices.vsix" - } - # Starting from version 4.1 SqlServerIntegrationServicesProjects extension is distributed as exe file - "SSIS.SqlServerIntegrationServicesProjects" { - $fileName = "Microsoft.DataTools.IntegrationServices.exe" - $downloadUri = $assetUri + "/" + $fileName - } - } - - return [PSCustomObject] @{ - "ExtensionName" = $extensionName - "VsixId" = $vsixId - "FileName" = $fileName - "DownloadUri" = $downloadUri - } -} - -function Install-VSIXFromFile { - Param - ( - [Parameter(Mandatory = $true)] - [string] $FilePath, - [int] $Retries = 20 - ) - - Write-Host "Installing VSIX from $FilePath..." - while ($True) { - $installerPath = "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\resources\app\ServiceHub\Services\Microsoft.VisualStudio.Setup.Service\VSIXInstaller.exe" - try { - $process = Start-Process ` - -FilePath $installerPath ` - -ArgumentList @('/quiet', "`"$FilePath`"") ` - -Wait -PassThru - } catch { - Write-Host "Failed to start VSIXInstaller.exe with error:" - $_ - exit 1 - } - - $exitCode = $process.ExitCode - - if ($exitCode -eq 0) { - Write-Host "VSIX installed successfully." - break - } elseif ($exitCode -eq 1001) { - Write-Host "VSIX is already installed." - break - } - - Write-Host "VSIX installation failed with exit code $exitCode." - - $Retries-- - if ($Retries -eq 0) { - Write-Host "VSIX installation failed after $Retries retries." - exit 1 - } - - Write-Host "Waiting 10 seconds before retrying. Retries left: $Retries" - Start-Sleep -Seconds 10 - } -} - -function Install-VSIXFromUrl { - Param - ( - [Parameter(Mandatory = $true)] - [string] $Url, - [int] $Retries = 20 - ) - - $filePath = Invoke-DownloadWithRetry $Url - Install-VSIXFromFile -FilePath $filePath -Retries $Retries - Remove-Item -Force -Confirm:$false $filePath -} - -function Get-VSExtensionVersion { - Param - ( - [Parameter(Mandatory = $true)] - [string] $packageName - ) - - $instanceFolders = Get-ChildItem -Path "C:\ProgramData\Microsoft\VisualStudio\Packages\_Instances" - if ($instanceFolders -is [array]) { - Write-Host ($instanceFolders | Out-String) - Write-Host ($instanceFolders | Get-ChildItem | Out-String) - Write-Host "More than one instance installed" - exit 1 - } - - $stateContent = Get-Content -Path (Join-Path $instanceFolders.FullName '\state.packages.json') - $state = $stateContent | ConvertFrom-Json - $packageVersion = ($state.packages | Where-Object { $_.id -eq $packageName }).version - - if (-not $packageVersion) { - Write-Host "Installed package $packageName for Visual Studio was not found" - exit 1 - } - - return $packageVersion -} - function Get-ToolsetContent { $toolsetPath = Join-Path "C:\\image" "toolset.json" $toolsetJson = Get-Content -Path $toolsetPath -Raw @@ -428,170 +298,6 @@ function Expand-7ZipArchive { } } -function Get-AndroidPackages { - <# - .SYNOPSIS - This function returns a list of available Android packages. - - .DESCRIPTION - The Get-AndroidPackages function checks if a list of packages is already available in a file. - If not, it uses the sdkmanager.bat script to generate a list of available packages and saves it to a file. - It then returns the content of this file. - - .PARAMETER SDKRootPath - The root path of the Android SDK installation. - If not specified, the function uses the ANDROID_HOME environment variable. - - .EXAMPLE - Get-AndroidPackages -SDKRootPath "C:\Android\SDK" - - This command returns a list of available Android packages for the specified SDK root path. - - .NOTES - This function requires the Android SDK to be installed and the sdkmanager.bat script to be accessible. - - #> - Param - ( - [string] $SDKRootPath - ) - - if (-not $SDKRootPath) { - $SDKRootPath = $env:ANDROID_HOME - } - - $packagesListFile = "$SDKRootPath\packages-list.txt" - $sdkManager = "$SDKRootPath\cmdline-tools\latest\bin\sdkmanager.bat" - - if (-Not (Test-Path -Path $packagesListFile -PathType Leaf)) { - (cmd /c "$sdkManager --list --verbose 2>&1") | - Where-Object { $_ -Match "^[^\s]" } | - Where-Object { $_ -NotMatch "^(Loading |Info: Parsing |---|\[=+|Installed |Available )" } | - Where-Object { $_ -NotMatch "^[^;]*$" } | - Out-File -FilePath $packagesListFile - } - - return Get-Content $packagesListFile -} - -function Get-AndroidPlatformPackages { - <# - .SYNOPSIS - This function returns a list of available Android platform packages. - - .DESCRIPTION - The Get-AndroidPlatformPackages function uses the Get-AndroidPackages function to get a list of available packages - and filters it to return only platform packages. - - .PARAMETER SDKRootPath - The root path of the Android SDK installation. - If not specified, the function uses the ANDROID_HOME environment variable. - - .PARAMETER minimumVersion - The minimum version of the platform packages to include in the result. Default is 0. - - .EXAMPLE - Get-AndroidPlatformPackages -SDKRootPath "C:\Android\SDK" -minimumVersion 29 - - This command returns a list of available Android platform packages for the specified SDK root path with a minimum version of 29. - - .NOTES - This function requires the Android SDK to be installed and the sdkmanager.bat script to be accessible. - - #> - Param - ( - [string] $SDKRootPath, - [Alias("minVersion")] - [int] $minimumVersion = 0 - ) - - if (-not $SDKRootPath) { - $SDKRootPath = $env:ANDROID_HOME - } - - return (Get-AndroidPackages -SDKRootPath $SDKRootPath) ` - | Where-Object { "$_".StartsWith("platforms;") } ` - | Where-Object { ($_.Split("-")[1] -as [int]) -ge $minimumVersion } ` - | Sort-Object -Unique -} - -function Get-AndroidBuildToolPackages { - <# - .SYNOPSIS - This function returns a list of available Android build tool packages. - - .DESCRIPTION - The Get-AndroidBuildToolPackages function uses the Get-AndroidPackages function to get a list of available packages - and filters it to return only build tool packages. - - .PARAMETER SDKRootPath - The root path of the Android SDK installation. - If not specified, the function uses the ANDROID_HOME environment variable. - - .PARAMETER minimumVersion - The minimum version of the build tool packages to include in the result. Default is 0.0.0. - - .EXAMPLE - Get-AndroidBuildToolPackages -SDKRootPath "C:\Android\SDK" -minimumVersion "30.0.2" - - This command returns a list of available Android build tool packages for the specified SDK root path with a minimum version of 30.0.2. - - .NOTES - This function requires the Android SDK to be installed and the sdkmanager.bat script to be accessible. - - #> - Param - ( - [string] $SDKRootPath, - [Alias("minVersion")] - [version] $minimumVersion = "0.0.0" - ) - - if (-not $SDKRootPath) { - $SDKRootPath = $env:ANDROID_HOME - } - - return (Get-AndroidPackages -SDKRootPath $SDKRootPath) ` - | Where-Object { "$_".StartsWith("build-tools;") } ` - | Where-Object { ($_.Split(";")[1] -as [version]) -ge $minimumVersion } ` - | Sort-Object -Unique -} - -function Get-AndroidInstalledPackages { - <# - .SYNOPSIS - Retrieves a list of installed Android packages. - - .DESCRIPTION - This function retrieves a list of installed Android packages using the specified SDK root path. - - .PARAMETER SDKRootPath - The root path of the Android SDK. - If not specified, the function uses the ANDROID_HOME environment variable. - - .EXAMPLE - Get-AndroidInstalledPackages -SDKRootPath "C:\Android\SDK" - Retrieves a list of installed Android packages using the specified SDK root path. - - .NOTES - This function requires the Android SDK to be installed and the SDK root path to be provided. - #> - - Param - ( - [string] $SDKRootPath - ) - - if (-not $SDKRootPath) { - $SDKRootPath = $env:ANDROID_HOME - } - - $sdkManager = "$SDKRootPath\cmdline-tools\latest\bin\sdkmanager.bat" - - return (cmd /c "$sdkManager --list_installed 2>&1") -notmatch "Warning" -} - function Get-WindowsUpdateStates { <# .SYNOPSIS diff --git a/images/windows/scripts/helpers/VisualStudioHelpers.ps1 b/images/windows/scripts/helpers/VisualStudioHelpers.ps1 index a75baac49d94..99ef27b4d9c5 100644 --- a/images/windows/scripts/helpers/VisualStudioHelpers.ps1 +++ b/images/windows/scripts/helpers/VisualStudioHelpers.ps1 @@ -116,11 +116,6 @@ Function Install-VisualStudio { } } -function Get-VsCatalogJsonPath { - $instanceFolder = Get-Item "C:\ProgramData\Microsoft\VisualStudio\Packages\_Instances\*" | Select-Object -First 1 - return Join-Path $instanceFolder.FullName "catalog.json" -} - function Get-VisualStudioInstance { # Use -Prerelease and -All flags to make sure that Preview versions of VS are found correctly $vsInstance = Get-VSSetupInstance -Prerelease -All | Where-Object { $_.DisplayName -match "Visual Studio" } | Select-Object -First 1 @@ -129,6 +124,145 @@ function Get-VisualStudioInstance { function Get-VisualStudioComponents { (Get-VisualStudioInstance).Packages | Where-Object type -in 'Component', 'Workload' | - Sort-Object Id, Version | Select-Object @{n = 'Package'; e = {$_.Id}}, Version | - Where-Object { $_.Package -notmatch "[0-9a-fA-F]{8}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{12}" } + Sort-Object Id, Version | Select-Object @{n = 'Package'; e = { $_.Id } }, Version | + Where-Object { $_.Package -notmatch "[0-9a-fA-F]{8}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{12}" } +} + +function Get-VsixInfoFromMarketplace { + Param + ( + [Parameter(Mandatory)] + [Alias("ExtensionMarketPlaceName")] + [string] $Name, + [string] $MarketplaceUri = "https://marketplace.visualstudio.com/items?itemName=" + ) + + # Invoke-WebRequest doesn't support retry in PowerShell 5.1 + $webResponse = Invoke-ScriptBlockWithRetry -RetryCount 20 -RetryIntervalSeconds 30 -Command { + Invoke-WebRequest -Uri "${MarketplaceUri}${Name}" -UseBasicParsing + } + + $webResponse -match 'UniqueIdentifierValue":"(?<extensionname>[^"]*)' | Out-Null + $extensionName = $Matches.extensionname + + $webResponse -match 'VsixId":"(?<vsixid>[^"]*)' | Out-Null + $vsixId = $Matches.vsixid + + $webResponse -match 'AssetUri":"(?<uri>[^"]*)' | Out-Null + $assetUri = $Matches.uri + + $webResponse -match 'Microsoft\.VisualStudio\.Services\.Payload\.FileName":"(?<filename>[^"]*)' | Out-Null + $fileName = $Matches.filename + + switch ($Name) { + # ProBITools.MicrosoftReportProjectsforVisualStudio2022 has different URL + # https://github.com/actions/runner-images/issues/5340 + "ProBITools.MicrosoftReportProjectsforVisualStudio2022" { + $assetUri = "https://download.microsoft.com/download/b/b/5/bb57be7e-ae72-4fc0-b528-d0ec224997bd" + $fileName = "Microsoft.DataTools.ReportingServices.vsix" + } + "ProBITools.MicrosoftAnalysisServicesModelingProjects2022" { + $assetUri = "https://download.microsoft.com/download/c/8/9/c896a7f2-d0fd-45ac-90e6-ff61f67523cb" + $fileName = "Microsoft.DataTools.AnalysisServices.vsix" + } + + # Starting from version 4.1 SqlServerIntegrationServicesProjects extension is distributed as exe file + "SSIS.SqlServerIntegrationServicesProjects" { + $fileName = "Microsoft.DataTools.IntegrationServices.exe" + } + } + + $downloadUri = $assetUri + "/" + $fileName + + return [PSCustomObject] @{ + "ExtensionName" = $extensionName + "VsixId" = $vsixId + "FileName" = $fileName + "DownloadUri" = $downloadUri + } +} + +function Install-VSIXFromFile { + Param + ( + [Parameter(Mandatory = $true)] + [string] $FilePath, + [int] $Retries = 20 + ) + + Write-Host "Installing VSIX from $FilePath..." + while ($True) { + $installerPath = "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\resources\app\ServiceHub\Services\Microsoft.VisualStudio.Setup.Service\VSIXInstaller.exe" + try { + $process = Start-Process ` + -FilePath $installerPath ` + -ArgumentList @('/quiet', "`"$FilePath`"") ` + -Wait -PassThru + } catch { + Write-Host "Failed to start VSIXInstaller.exe with error:" + $_ + exit 1 + } + + $exitCode = $process.ExitCode + + if ($exitCode -eq 0) { + Write-Host "VSIX installed successfully." + break + } elseif ($exitCode -eq 1001) { + Write-Host "VSIX is already installed." + break + } + + Write-Host "VSIX installation failed with exit code $exitCode." + + $Retries-- + if ($Retries -eq 0) { + Write-Host "VSIX installation failed after $Retries retries." + exit 1 + } + + Write-Host "Waiting 10 seconds before retrying. Retries left: $Retries" + Start-Sleep -Seconds 10 + } +} + +function Install-VSIXFromUrl { + Param + ( + [Parameter(Mandatory = $true)] + [string] $Url, + [int] $Retries = 20 + ) + + $filePath = Invoke-DownloadWithRetry $Url + Install-VSIXFromFile -FilePath $filePath -Retries $Retries + Remove-Item -Force -Confirm:$false $filePath +} + +function Get-VSExtensionVersion { + Param + ( + [Parameter(Mandatory = $true)] + [string] $packageName + ) + + $instanceFolders = Get-ChildItem -Path "C:\ProgramData\Microsoft\VisualStudio\Packages\_Instances" + if ($instanceFolders -is [array]) { + Write-Host ($instanceFolders | Out-String) + Write-Host ($instanceFolders | Get-ChildItem | Out-String) + Write-Host "More than one instance installed" + exit 1 + } + + $stateContent = Get-Content -Path (Join-Path $instanceFolders.FullName '\state.packages.json') + $state = $stateContent | ConvertFrom-Json + $packageVersion = ($state.packages | Where-Object { $_.id -eq $packageName }).version + + if (-not $packageVersion) { + Write-Host "Installed package $packageName for Visual Studio was not found" + exit 1 + } + + return $packageVersion } diff --git a/images/windows/scripts/tests/VisualStudio.Tests.ps1 b/images/windows/scripts/tests/VisualStudio.Tests.ps1 index 57266fc2c426..47b34b17a355 100644 --- a/images/windows/scripts/tests/VisualStudio.Tests.ps1 +++ b/images/windows/scripts/tests/VisualStudio.Tests.ps1 @@ -1,7 +1,8 @@ Describe "Visual Studio" { Context "Basic" { It "Catalog.json" { - Get-VsCatalogJsonPath | Should -Exist + $instanceFolder = Get-Item "C:\ProgramData\Microsoft\VisualStudio\Packages\_Instances\*" | Select-Object -First 1 + Join-Path $instanceFolder.FullName "catalog.json" | Should -Exist } It "Devenv.exe" { @@ -34,4 +35,4 @@ Describe "Windows 11 SDK" { It "Verifies 22621 SDK is installed" -Skip:(Test-IsWin22) { "${env:ProgramFiles(x86)}\Windows Kits\10\DesignTime\CommonConfiguration\Neutral\UAP\10.0.22621.0\UAP.props" | Should -Exist } -} \ No newline at end of file +} diff --git a/images/windows/scripts/tests/Vsix.Tests.ps1 b/images/windows/scripts/tests/Vsix.Tests.ps1 index 5c52da613b96..28d6636818d2 100644 --- a/images/windows/scripts/tests/Vsix.Tests.ps1 +++ b/images/windows/scripts/tests/Vsix.Tests.ps1 @@ -1,13 +1,13 @@ Describe "Vsix" { $toolset = Get-ToolsetContent - $requiredVsixs = $toolset.visualStudio.vsix + $requiredVsixPackages = $toolset.visualStudio.vsix $allPackages = (Get-VisualStudioInstance).Packages - $testCases = $requiredVsixs | ForEach-Object { - $vsix = Get-VsixExtenstionFromMarketplace -ExtensionMarketPlaceName $_ + $testCases = $requiredVsixPackages | ForEach-Object { + $vsixPackage = Get-VsixInfoFromMarketplace $_ @{ - VsixName = $vsix.ExtensionName - VsixId = $vsix.VsixId + VsixName = $vsixPackage.ExtensionName + VsixId = $vsixPackage.VsixId AllPackages = $allPackages } } @@ -17,4 +17,4 @@ Describe "Vsix" { $objVsix | Should -Not -BeNullOrEmpty } } -} \ No newline at end of file +} From d86c4900fa6934cb915c12291122e71a885a4f22 Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Thu, 30 Nov 2023 17:12:17 +0100 Subject: [PATCH 2497/3485] [Windows] Update functions that get urls and hashes from Github (#8917) * [Windows] Update function to get hash from github * Remove redundant function and add documentation * Fix aws-sam-cli url --- .../scripts/build/Install-AWSTools.ps1 | 23 +- images/windows/scripts/build/Install-Git.ps1 | 15 +- .../windows/scripts/build/Install-Kotlin.ps1 | 8 +- .../windows/scripts/helpers/ImageHelpers.psm1 | 3 +- .../scripts/helpers/InstallHelpers.ps1 | 304 ++++++++++++++---- 5 files changed, 281 insertions(+), 72 deletions(-) diff --git a/images/windows/scripts/build/Install-AWSTools.ps1 b/images/windows/scripts/build/Install-AWSTools.ps1 index ff9cdab3b17f..a5c66e338637 100644 --- a/images/windows/scripts/build/Install-AWSTools.ps1 +++ b/images/windows/scripts/build/Install-AWSTools.ps1 @@ -9,17 +9,24 @@ Install-ChocoPackage awscli # Install Session Manager Plugin for the AWS CLI Install-Binary ` - -Url "https://s3.amazonaws.com/session-manager-downloads/plugin/latest/windows/SessionManagerPluginSetup.exe" ` - -InstallArgs ("/silent", "/install") ` - -ExpectedSignature "FF457E5732E98A9F156E657F8CC7C4432507C3BB" + -Url "https://s3.amazonaws.com/session-manager-downloads/plugin/latest/windows/SessionManagerPluginSetup.exe" ` + -InstallArgs ("/silent", "/install") ` + -ExpectedSignature "FF457E5732E98A9F156E657F8CC7C4432507C3BB" $env:Path = $env:Path + ";$env:ProgramFiles\Amazon\SessionManagerPlugin\bin" # Install AWS SAM CLI -$packageName = "AWS_SAM_CLI_64_PY3.msi" -$packageUrl = "https://github.com/awslabs/aws-sam-cli/releases/latest/download/$packageName" -$externalHash = Get-HashFromGitHubReleaseBody -RepoOwner "awslabs" -RepoName "aws-sam-cli" -FileName $packageName +$downloadUrl = Resolve-GithubReleaseAssetUrl ` + -Repo "awslabs/aws-sam-cli" ` + -Version "latest" ` + -UrlMatchPattern "AWS_SAM_CLI_64_PY3.msi" +$externalHash = Get-GithubReleaseAssetHash ` + -Repo "awslabs/aws-sam-cli" ` + -Version "latest" ` + -FileName (Split-Path $downloadUrl -Leaf) ` + -HashType "SHA256" + Install-Binary ` - -Url $packageUrl ` - -ExpectedSHA256Sum $externalHash + -Url $downloadUrl ` + -ExpectedSHA256Sum $externalHash Invoke-PesterTests -TestFile "CLI.Tools" -TestName "AWS" diff --git a/images/windows/scripts/build/Install-Git.ps1 b/images/windows/scripts/build/Install-Git.ps1 index cc97e54fe806..0a2c4234a68f 100644 --- a/images/windows/scripts/build/Install-Git.ps1 +++ b/images/windows/scripts/build/Install-Git.ps1 @@ -5,12 +5,17 @@ ################################################################################ # Install the latest version of Git for Windows -$repoURL = "https://api.github.com/repos/git-for-windows/git/releases/latest" -$gitReleases = Invoke-RestMethod $repoURL -$downloadUrl = $gitReleases.assets.browser_download_url -match "Git-.+-64-bit.exe" | Select-Object -First 1 -$installerFile = Split-Path $downloadUrl -Leaf -$externalHash = Get-HashFromGitHubReleaseBody -Url $RepoURL -FileName $installerFile +$downloadUrl = Resolve-GithubReleaseAssetUrl ` + -Repo "git-for-windows/git" ` + -Version "latest" ` + -UrlMatchPattern "Git-*-64-bit.exe" + +$externalHash = Get-GithubReleaseAssetHash ` + -Repo "git-for-windows/git" ` + -Version "latest" ` + -FileName (Split-Path $downloadUrl -Leaf) ` + -HashType "SHA256" Install-Binary ` -Url $downloadUrl ` diff --git a/images/windows/scripts/build/Install-Kotlin.ps1 b/images/windows/scripts/build/Install-Kotlin.ps1 index 71fe905102c4..9ec8554089d3 100644 --- a/images/windows/scripts/build/Install-Kotlin.ps1 +++ b/images/windows/scripts/build/Install-Kotlin.ps1 @@ -9,12 +9,16 @@ $kotlinVersion = (Get-ToolsetContent).kotlin.version $kotlinDownloadUrl = Resolve-GithubReleaseAssetUrl ` -Repo "JetBrains/kotlin" ` - -Version $kotlinVersion ` + -Version "$kotlinVersion" ` -Asset "kotlin-compiler-*.zip" $kotlinArchivePath = Invoke-DownloadWithRetry $kotlinDownloadUrl #region Supply chain security -$externalHash = Get-HashFromGitHubReleaseBody -RepoOwner "JetBrains" -RepoName "kotlin" -FileName "$kotlinBinaryName-*.zip" -Version $kotlinVersion -WordNumber 2 +$externalHash = Get-GithubReleaseAssetHash ` + -Repo "JetBrains/kotlin" ` + -Version "$kotlinVersion" ` + -FileName (Split-Path $kotlinDownloadUrl -Leaf) ` + -HashType "SHA256" Test-FileChecksum $kotlinArchivePath -ExpectedSHA256Sum $externalHash #endregion diff --git a/images/windows/scripts/helpers/ImageHelpers.psm1 b/images/windows/scripts/helpers/ImageHelpers.psm1 index cad48838add5..826d4d989734 100644 --- a/images/windows/scripts/helpers/ImageHelpers.psm1 +++ b/images/windows/scripts/helpers/ImageHelpers.psm1 @@ -22,7 +22,6 @@ Export-ModuleMember -Function @( 'Install-VSIXFromFile' 'Install-VSIXFromUrl' 'Get-VSExtensionVersion' - 'Get-WinVersion' 'Test-IsWin22' 'Test-IsWin19' 'Install-ChocoPackage' @@ -38,7 +37,7 @@ Export-ModuleMember -Function @( 'Get-VisualStudioInstance' 'Get-VisualStudioComponents' 'Get-WindowsUpdateStates' - 'Get-HashFromGitHubReleaseBody' + 'Get-GithubReleaseAssetHash' 'Test-FileChecksum' 'Test-FileSignature' 'Update-Environment' diff --git a/images/windows/scripts/helpers/InstallHelpers.ps1 b/images/windows/scripts/helpers/InstallHelpers.ps1 index a892e657199b..ee859b834f30 100644 --- a/images/windows/scripts/helpers/InstallHelpers.ps1 +++ b/images/windows/scripts/helpers/InstallHelpers.ps1 @@ -266,19 +266,66 @@ function Get-TCToolVersionPath { return Join-Path $foundVersion $Arch } -function Get-WinVersion { - (Get-CimInstance -ClassName Win32_OperatingSystem).Caption -} - function Test-IsWin22 { - (Get-WinVersion) -match "2022" + <# + .SYNOPSIS + Checks if the current Windows operating system is Windows Server 2022. + + .DESCRIPTION + This function uses the Get-CimInstance cmdlet to retrieve information + about the current Windows operating system. It then checks if the Caption + property of the Win32_OperatingSystem class contains the string "2022", + indicating that the operating system is Windows Server 2022. + + .OUTPUTS + Returns $true if the current Windows operating system is Windows Server 2022. + Otherwise, returns $false. + #> + (Get-CimInstance -ClassName Win32_OperatingSystem).Caption -match "2022" } function Test-IsWin19 { - (Get-WinVersion) -match "2019" + <# + .SYNOPSIS + Checks if the current Windows operating system is Windows Server 2019. + + .DESCRIPTION + This function uses the Get-CimInstance cmdlet to retrieve information + about the current Windows operating system. It then checks if the Caption + property of the Win32_OperatingSystem class contains the string "2019", + indicating that the operating system is Windows Server 2019. + + .OUTPUTS + Returns $true if the current Windows operating system is Windows Server 2019. + Otherwise, returns $false. + #> + (Get-CimInstance -ClassName Win32_OperatingSystem).Caption -match "2019" } function Expand-7ZipArchive { + <# + .SYNOPSIS + Extracts files from a 7-Zip archive. + + .DESCRIPTION + This function uses the 7z.exe command-line tool to extract files from an archive. + The archive path, destination path, and extract method are specified as parameters. + + .PARAMETER Path + The path to the archive. + + .PARAMETER DestinationPath + The path to the directory where the files will be extracted. + + .PARAMETER ExtractMethod + The method used to extract the files. + Valid values are "x" (extract with full paths) and "e" (extract without paths). + + .EXAMPLE + Expand-7ZipArchive -Path "C:\archive.7z" -DestinationPath "C:\extracted" -ExtractMethod "x" + + Extracts files from the "C:\archive.7z" archive to the "C:\extracted" directory keeping the full paths. + #> Param ( [Parameter(Mandatory = $true)] @@ -409,32 +456,73 @@ function Invoke-ScriptBlockWithRetry { } } -function Resolve-GithubReleaseAssetUrl { +function Get-GithubReleasesByVersion { + <# + .SYNOPSIS + Retrieves GitHub releases for a specified repository based on version. + + .DESCRIPTION + The function retrieves GitHub releases for a specified repository based on the + version provided. It supports filtering by version, allowing for the retrieval + of specific releases or the latest release. The function utilizes the GitHub REST API + to fetch the releases and caches the results to improve performance and reduce + the number of API calls. + + .PARAMETER Repository + The name of the GitHub repository in the format "owner/repo". + + .PARAMETER Version + The version of the release to retrieve. It can be a specific version number, + "latest" to retrieve the latest release, or a wildcard pattern to match multiple versions. + + .PARAMETER AllowPrerelease + Specifies whether to include prerelease versions in the results. By default, + prerelease versions are excluded. + + .EXAMPLE + Get-GithubReleasesByVersion -Repository "Microsoft/PowerShell" -Version "7.2.0" + + Retrieves the GitHub releases for the "Microsoft/PowerShell" repository with the version "7.2.0". + + .EXAMPLE + Get-GithubReleasesByVersion -Repository "Microsoft/PowerShell" -Version "latest" + + Retrieves the latest GitHub release for the "Microsoft/PowerShell" repository. + + .EXAMPLE + Get-GithubReleasesByVersion -Repository "Microsoft/PowerShell" -Version "7.*" + + Retrieves all GitHub releases for the "Microsoft/PowerShell" repository with versions starting with "7.". + #> + param ( [Parameter(Mandatory = $true)] [Alias("Repo")] [string] $Repository, - [Parameter(Mandatory = $true)] - [Alias("Pattern", "File", "Asset")] - [string] $UrlMatchPattern, - [switch] $AllowPrerelease, - [string] $Version = "*" + [string] $Version = "*", + [switch] $AllowPrerelease ) - # Add wildcard to the beginning of the pattern if it's not there - if ($UrlMatchPattern.Substring(0, 2) -ne "*/") { - $UrlMatchPattern = "*/$UrlMatchPattern" - } + $localCacheFile = Join-Path ${env:TEMP} "github-releases_$($Repository -replace "/", "_").json" - $releases = @() - $page = 1 - $pageSize = 100 - do { - $releasesPage = Invoke-RestMethod -Uri "https://api.github.com/repos/${Repository}/releases?per_page=${pageSize}&page=${page}" - $releases += $releasesPage - $page++ - } while ($releasesPage.Count -eq $pageSize) - Write-Debug "Found $($releases.Count) releases for ${Repository}" + if (Test-Path $localCacheFile) { + $releases = Get-Content $localCacheFile | ConvertFrom-Json + Write-Debug "Found cached releases for ${Repository} in local file" + Write-Debug "Release count: $($releases.Count)" + } else { + $releases = @() + $page = 1 + $pageSize = 100 + do { + $releasesPage = Invoke-RestMethod -Uri "https://api.github.com/repos/${Repository}/releases?per_page=${pageSize}&page=${page}" + $releases += $releasesPage + $page++ + } while ($releasesPage.Count -eq $pageSize) + + Write-Debug "Found $($releases.Count) releases for ${Repository}" + Write-Debug "Caching releases for ${Repository} in local file" + $releases | ConvertTo-Json -Depth 10 | Set-Content $localCacheFile + } if (-not $releases) { throw "Failed to get releases from ${Repository}" @@ -470,6 +558,63 @@ function Resolve-GithubReleaseAssetUrl { } Write-Debug "Found $($matchingReleases.Count) releases matching version ${Version} for ${Repository}" + return $matchingReleases +} + +function Resolve-GithubReleaseAssetUrl { + <# + .SYNOPSIS + Resolves the download URL for a specific asset in a GitHub release. + + .DESCRIPTION + This function retrieves the download URL for a specific asset in a GitHub release. + It takes the repository name, version, and a URL match pattern as input parameters. + It searches for releases that match the specified version and then looks + for a download URL that matches the provided pattern. If a matching URL is found, + it returns the URL. If no matching URL is found, an exception is thrown. + + .PARAMETER Repository + The name of the GitHub repository in the format "owner/repo". + + .PARAMETER Version + The version of the release to retrieve. It can be a specific version number, + "latest" to retrieve the latest release, or a wildcard pattern to match multiple versions. + + .PARAMETER AllowPrerelease + Specifies whether to include prerelease versions in the results. By default, + prerelease versions are excluded. + + .PARAMETER UrlMatchPattern + The pattern to match against the download URLs of the release assets. + Wildcards (*) can be used to match any characters. + + .EXAMPLE + Resolve-GithubReleaseAssetUrl -Repository "myrepo" -Version "1.0" -UrlMatchPattern "*.zip" + Retrieves the download URL for the asset in the "myrepo" repository with version "1.0" and a file extension of ".zip". + + #> + + param ( + [Parameter(Mandatory = $true)] + [Alias("Repo")] + [string] $Repository, + [string] $Version = "*", + [switch] $AllowPrerelease, + [Parameter(Mandatory = $true)] + [Alias("Pattern", "File", "Asset")] + [string] $UrlMatchPattern + ) + + $matchingReleases = Get-GithubReleasesByVersion ` + -Repository $Repository ` + -AllowPrerelease:$AllowPrerelease ` + -Version $Version + + # Add wildcard to the beginning of the pattern if it's not there + if ($UrlMatchPattern.Substring(0, 2) -ne "*/") { + $UrlMatchPattern = "*/$UrlMatchPattern" + } + # Loop over releases until we find a download url matching the pattern foreach ($release in $matchingReleases) { $matchedVersion = $release.version @@ -493,45 +638,94 @@ function Resolve-GithubReleaseAssetUrl { return ($matchedUrl -as [string]) } -function Get-HashFromGitHubReleaseBody { +function Get-GithubReleaseAssetHash { + <# + .SYNOPSIS + Retrieves the hash value of a specific file from a GitHub release body. + + .DESCRIPTION + The Get-GithubReleaseAssetHash function retrieves the hash value (SHA256 or SHA512) + of a specific file from a GitHub release. It searches for the file in the release body + and returns the hash value if found. + + .PARAMETER Repository + The name of the GitHub repository in the format "owner/repo". + + .PARAMETER Version + The version of the release to inspect. It can be a specific version number, + "latest" to retrieve the latest release, or a wildcard pattern to match multiple versions. + + .PARAMETER AllowPrerelease + Specifies whether to include prerelease versions in the results. By default, + prerelease versions are excluded. + + .PARAMETER FileName + The name of the file to retrieve the hash value for. + + .PARAMETER HashType + The type of hash value to retrieve. Valid values are "SHA256" and "SHA512". + + .EXAMPLE + Get-GithubReleaseAssetHash -Repository "MyRepo" -FileName "myfile.txt" -HashType "SHA256" + + Retrieves the SHA256 hash value of "myfile.txt" from the latest release of the "MyRepo" repository. + + .EXAMPLE + Get-GithubReleaseAssetHash -Repository "MyRepo" -Version "1.0" -FileName "myfile.txt" -HashType "SHA512" + + Retrieves the SHA512 hash value of "myfile.txt" from the release version "1.0" of the "MyRepo" repository. + #> + param ( - [string] $RepoOwner, - [string] $RepoName, [Parameter(Mandatory = $true)] + [Alias("Repo")] + [string] $Repository, + [string] $Version = "*", + [switch] $AllowPrerelease, + [Parameter(Mandatory = $true)] + [Alias("File", "Asset")] [string] $FileName, - [string] $Url, - [string] $Version = "latest", - [boolean] $IsPrerelease = $false, - [int] $SearchInCount = 100, - [string] $Delimiter = '|', - [int] $WordNumber = 1 + [Parameter(Mandatory = $true)] + [ValidateSet("SHA256", "SHA512")] + [string] $HashType ) - if ($Url) { - $releaseUrl = $Url - } else { - if ($Version -eq "latest") { - $releaseUrl = "https://api.github.com/repos/${RepoOwner}/${RepoName}/releases/latest" - } else { - $json = Invoke-RestMethod -Uri "https://api.github.com/repos/${RepoOwner}/${RepoName}/releases?per_page=${SearchInCount}" - $tags = $json.Where{ $_.prerelease -eq $IsPrerelease }.tag_name - $tag = $tags -match $Version - if (-not $tag) { - throw "Failed to get a tag name for version $Version." - } - $releaseUrl = "https://api.github.com/repos/${RepoOwner}/${RepoName}/releases/tag/$tag" + $matchingReleases = Get-GithubReleasesByVersion ` + -Repository $Repository ` + -AllowPrerelease:$AllowPrerelease ` + -Version $Version + + foreach ($release in $matchingReleases) { + $matchedVersion = $release.version + $matchedBody = $release.body + $matchedLine = $matchedBody.Split("`n") | Where-Object { $_ -like "*$FileName*" } + if ($matchedLine.Count -gt 1) { + throw "Found multiple lines matching file name '${FileName}' in body of release ${matchedVersion}." + } elseif ($matchedLine.Count -ne 0) { + break } } - $body = (Invoke-RestMethod -Uri $releaseUrl).body -replace ('`', "") -join "`n" - $matchingLine = $body.Split("`n") | Where-Object { $_ -like "*$FileName*" } - if ([string]::IsNullOrEmpty($matchingLine)) { - throw "File name '$FileName' not found in release body." + if (-not $matchedLine) { + throw "File name '${FileName}' not found in release body." } - $result = $matchingLine.Split($Delimiter)[$WordNumber] -replace "[^a-zA-Z0-9]", "" - if ([string]::IsNullOrEmpty($result)) { - throw "Empty result. Check Split method parameters (delimiter and/or word number) for the matching line." + Write-Debug "Found line matching file name '${FileName}' in body of release ${matchedVersion}:`n${matchedLine}" + + if ($HashType -eq "SHA256") { + $pattern = "[A-Fa-f0-9]{64}" + } elseif ($HashType -eq "SHA512") { + $pattern = "[A-Fa-f0-9]{128}" + } else { + throw "Unknown hash type: ${HashType}" } - return $result + + $hash = $matchedLine | Select-String -Pattern $pattern | ForEach-Object { $_.Matches.Value } + + if ([string]::IsNullOrEmpty($hash)) { + throw "Found '${FileName}' in body of release ${matchedVersion}, but failed to get hash from it.`nLine: ${matchedLine}" + } + Write-Host "Found hash for ${FileName} in release ${matchedVersion}: $hash" + + return $hash } function Test-FileChecksum { From d919a375b38e926f967b8a8c5dac855502c3ac02 Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Thu, 30 Nov 2023 17:37:37 +0100 Subject: [PATCH 2498/3485] Add PR_HEAD_REF env variable to ci-cleanup.yml (#8916) * Add PR_HEAD_REF env variable to ci-cleanup.yml * Fix quotes around env var --- .github/workflows/ci-cleanup.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-cleanup.yml b/.github/workflows/ci-cleanup.yml index 3b532e4cc672..8b9a94f8dae7 100644 --- a/.github/workflows/ci-cleanup.yml +++ b/.github/workflows/ci-cleanup.yml @@ -14,6 +14,7 @@ jobs: steps: - env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + PR_HEAD_REF: ${{ github.event.pull_request.head.ref }} shell: pwsh run: | $startDate = Get-Date -UFormat %s @@ -21,13 +22,13 @@ jobs: while ($true) { $continue = $false foreach ($wf in $workflows) { - $skippedCommand = "gh run list --workflow ${wf}.yml --branch ${{ github.event.pull_request.head.ref }} --repo ${{ github.repository }} --status skipped --json databaseId" + $skippedCommand = "gh run list --workflow ${wf}.yml --branch '$env:PR_HEAD_REF' --repo ${{ github.repository }} --status skipped --json databaseId" $skippedIds = Invoke-Expression -Command $skippedCommand | ConvertFrom-Json | ForEach-Object { $_.databaseId } $skippedIds | ForEach-Object { $deleteCommand = "gh run delete --repo ${{ github.repository }} $_" Invoke-Expression -Command $deleteCommand } - $pendingCommand = "gh run list --workflow ${wf}.yml --branch ${{ github.event.pull_request.head.ref }} --repo ${{ github.repository }} --status requested --json databaseId --template '{{ . | len }}'" + $pendingCommand = "gh run list --workflow ${wf}.yml --branch '$env:PR_HEAD_REF' --repo ${{ github.repository }} --status requested --json databaseId --template '{{ . | len }}'" $pending = Invoke-Expression -Command $pendingCommand if ($pending -gt 0) { Write-Host "Pending for ${wf}.yml: $pending run(s)" From ae6af1b8dba89db6b64c1c65780ffef4a3144caf Mon Sep 17 00:00:00 2001 From: Stefano Di Nucci <51917569+Stepness@users.noreply.github.com> Date: Thu, 30 Nov 2023 19:10:31 +0100 Subject: [PATCH 2499/3485] Add support to client secret containing hyphens (#8927) --- helpers/GenerateResourcesAndImage.ps1 | 2 +- images.CI/linux-and-win/cleanup.ps1 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/helpers/GenerateResourcesAndImage.ps1 b/helpers/GenerateResourcesAndImage.ps1 index d7e65ae5fa43..70cc58a37947 100644 --- a/helpers/GenerateResourcesAndImage.ps1 +++ b/helpers/GenerateResourcesAndImage.ps1 @@ -249,7 +249,7 @@ Function GenerateResourcesAndImage { } else { Write-Verbose "AzureClientId was provided, will use service principal login." - az login --service-principal --username $AzureClientId --password $AzureClientSecret --tenant $AzureTenantId --output none + az login --service-principal --username $AzureClientId --password=$AzureClientSecret --tenant $AzureTenantId --output none } az account set --subscription $SubscriptionId if ($LastExitCode -ne 0) { diff --git a/images.CI/linux-and-win/cleanup.ps1 b/images.CI/linux-and-win/cleanup.ps1 index 121aad5ffeac..7feac044f3c3 100644 --- a/images.CI/linux-and-win/cleanup.ps1 +++ b/images.CI/linux-and-win/cleanup.ps1 @@ -6,7 +6,7 @@ param( [Parameter (Mandatory=$true)] [string] $TenantId ) -az login --service-principal --username $ClientId --password $ClientSecret --tenant $TenantId | Out-Null +az login --service-principal --username $ClientId --password=$ClientSecret --tenant $TenantId | Out-Null az account set --subscription $SubscriptionId | Out-Null $groupExist = az group exists --name $TempResourceGroupName From 2549aed0eeb41dacdc3800d7be3b78088b176a88 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 30 Nov 2023 18:12:18 +0000 Subject: [PATCH 2500/3485] Windows Server 2022 (20231126) Image Update (#8894) * Updating readme file for win22 version 20231126.1.1 * Update images/windows/Windows2022-Readme.md Co-authored-by: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> --------- Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Co-authored-by: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/windows/Windows2022-Readme.md | 73 ++++++++++++++-------------- 1 file changed, 36 insertions(+), 37 deletions(-) diff --git a/images/windows/Windows2022-Readme.md b/images/windows/Windows2022-Readme.md index 093f42d4dce2..fa730ab9a8b2 100644 --- a/images/windows/Windows2022-Readme.md +++ b/images/windows/Windows2022-Readme.md @@ -6,7 +6,7 @@ *** # Windows Server 2022 - OS Version: 10.0.20348 Build 2113 -- Image Version: 20231115.2.0 +- Image Version: 20231126.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -14,14 +14,14 @@ ## Installed Software ### Language and Runtime -- Bash 5.2.15(1)-release +- Bash 5.2.21(1)-release - Go 1.20.11 -- Julia 1.9.3 -- Kotlin 1.9.20 +- Julia 1.9.4 +- Kotlin 1.9.21 - LLVM 16.0.6 - Node 18.18.2 - Perl 5.32.1 -- PHP 8.2.12 +- PHP 8.2.13 - Python 3.9.13 - Ruby 3.0.6p216 @@ -29,13 +29,13 @@ - Chocolatey 2.2.2 - Composer 2.6.5 - Helm 3.13.1 -- Miniconda 23.9.0 (pre-installed on the image but not added to PATH) +- Miniconda 23.10.0 (pre-installed on the image but not added to PATH) - NPM 9.8.1 -- NuGet 6.7.0.127 +- NuGet 6.8.0.131 - pip 23.3.1 (python 3.9) - Pipx 1.2.1 - RubyGems 3.2.33 -- Vcpkg (build from commit 2b14b606c) +- Vcpkg (build from commit cd5e746ec) - Yarn 1.22.21 #### Environment variables @@ -52,20 +52,20 @@ ### Tools - 7zip 23.01 -- aria2 1.36.0 +- aria2 1.37.0 - azcopy 10.21.1 - Bazel 6.4.0 -- Bazelisk 1.18.0 +- Bazelisk 1.19.0 - Bicep 0.23.1 - Cabal 3.10.2.0 -- CMake 3.27.7 -- CodeQL Action Bundle 2.15.2 +- CMake 3.27.8 +- CodeQL Action Bundle 2.15.3 - Docker 24.0.7 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.23.0 +- Docker Compose v2 2.23.3 - Docker-wincred 0.8.0 - ghc 9.8.1 -- Git 2.42.0.windows.2 +- Git 2.43.0.windows.1 - Git LFS 3.4.0 - ImageMagick 7.1.1-21 - InnoSetup 6.2.2 @@ -80,7 +80,7 @@ - NSIS 3.08 - OpenSSL 1.1.1w - Packer 1.9.4 -- Pulumi 3.93.0 +- Pulumi 3.94.2 - R 4.3.2 - Service Fabric SDK 9.1.1436.9590 - Stack 2.13.1 @@ -93,18 +93,18 @@ - zstd 1.5.5 ### CLI Tools -- Alibaba Cloud CLI 3.0.187 -- AWS CLI 2.13.34 -- AWS SAM CLI 1.102.0 +- Alibaba Cloud CLI 3.0.188 +- AWS CLI 2.13.38 +- AWS SAM CLI 1.103.0 - AWS Session Manager CLI 1.2.497.0 - Azure CLI 2.54.0 - Azure DevOps CLI extension 0.26.0 - GitHub CLI 2.39.1 ### Rust Tools -- Cargo 1.73.0 -- Rust 1.73.0 -- Rustdoc 1.73.0 +- Cargo 1.74.0 +- Rust 1.74.0 +- Rustdoc 1.74.0 - Rustup 1.26.0 #### Packages @@ -112,15 +112,15 @@ - cargo-audit 0.18.3 - cargo-outdated 0.14.0 - cbindgen 0.26.0 -- Clippy 0.1.73 +- Clippy 0.1.74 - Rustfmt 1.6.0 ### Browsers and Drivers - Google Chrome 119.0.6045.160 - Chrome Driver 119.0.6045.105 -- Microsoft Edge 119.0.2151.58 -- Microsoft Edge Driver 119.0.2151.58 -- Mozilla Firefox 119.0.1 +- Microsoft Edge 119.0.2151.72 +- Microsoft Edge Driver 119.0.2151.72 +- Mozilla Firefox 120.0 - Gecko Driver 0.33.0 - IE Driver 4.14.0.0 - Selenium server 4.15.0 @@ -166,10 +166,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 1.21.4 #### Node.js -- 14.21.3 - 16.20.2 - 18.18.2 -- 20.9.0 +- 20.10.0 #### Python - 3.7.9 @@ -224,9 +223,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Nginx | 1.25.3 | C:\tools\nginx-1.25.3\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2022 -| Name | Version | Path | -| ----------------------------- | -------------- | -------------------------------------------------------- | -| Visual Studio Enterprise 2022 | 17.8.34309.116 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | +| Name | Version | Path | +| ----------------------------- | ------------- | -------------------------------------------------------- | +| Visual Studio Enterprise 2022 | 17.8.34316.72 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | #### Workloads, components and extensions | Package | Version | @@ -508,8 +507,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Workload.ManagedDesktop | 17.8.34129.139 | | Microsoft.VisualStudio.Workload.ManagedGame | 17.8.34129.139 | | Microsoft.VisualStudio.Workload.NativeCrossPlat | 17.8.34219.23 | -| Microsoft.VisualStudio.Workload.NativeDesktop | 17.8.34129.139 | -| Microsoft.VisualStudio.Workload.NativeGame | 17.8.34129.139 | +| Microsoft.VisualStudio.Workload.NativeDesktop | 17.8.34316.72 | +| Microsoft.VisualStudio.Workload.NativeGame | 17.8.34316.72 | | Microsoft.VisualStudio.Workload.NativeMobile | 17.8.34129.139 | | Microsoft.VisualStudio.Workload.NetCrossPlat | 17.8.34129.139 | | Microsoft.VisualStudio.Workload.NetWeb | 17.8.34129.139 | @@ -525,9 +524,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | wasm.tools | 8.0.23.53103 | | ProBITools.MicrosoftAnalysisServicesModelingProjects2022 | 3.0.4 | | ProBITools.MicrosoftReportProjectsforVisualStudio2022 | 3.0.1 | -| SSIS.MicrosoftDataToolsIntegrationServices | 1.2 | +| SSIS.MicrosoftDataToolsIntegrationServices | 1.3.1 | | VisualStudioClient.MicrosoftVisualStudio2022InstallerProjects | 2.0.1 | -| Windows Driver Kit | 10.1.22621.382 | +| Windows Driver Kit | 10.1.22621.2428 | | Windows Driver Kit Visual Studio Extension | 10.0.22621.0 | | Windows Software Development Kit | 10.1.22621.2428 | | WixToolset.WixToolsetVisualStudio2022Extension | 1.0.0.22 | @@ -560,7 +559,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - nbgv 3.6.133+2d32d93cb1 ### PowerShell Tools -- PowerShell 7.2.16 +- PowerShell 7.2.17 #### Powershell Modules - Az: 9.3.0 @@ -569,10 +568,10 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Az (Cached): 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.453 +- AWSPowershell: 4.1.459 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 -- Microsoft.Graph: 2.9.0 +- Microsoft.Graph: 2.10.0 - Pester: 3.4.0, 5.5.0 - PowerShellGet: 1.0.0.1, 2.2.5 - PSScriptAnalyzer: 1.21.0 From 458529a1c671acca1dde41bf02fd2ba70ae148b3 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 30 Nov 2023 22:09:32 +0000 Subject: [PATCH 2501/3485] Updating readme file for ubuntu20 version 20231126.1.1 (#8896) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2004-Readme.md | 78 ++++++++++++++---------------- 1 file changed, 37 insertions(+), 41 deletions(-) diff --git a/images/ubuntu/Ubuntu2004-Readme.md b/images/ubuntu/Ubuntu2004-Readme.md index 26d4fc1edac2..f0b333239811 100644 --- a/images/ubuntu/Ubuntu2004-Readme.md +++ b/images/ubuntu/Ubuntu2004-Readme.md @@ -1,14 +1,14 @@ | Announcements | |-| | [[all OSs] Nodejs 14.x will be removed from the images on November, 26](https://github.com/actions/runner-images/issues/8779) | -| [[Ubuntu] Ubuntu:16.04 & Ubuntu:18.04 docker images will be removed from runners on November, 19](https://github.com/actions/runner-images/issues/8776) | +| [[Ubuntu] Ubuntu:16.04 & Ubuntu:18.04 docker images will be removed from runners on November, 26](https://github.com/actions/runner-images/issues/8776) | | [Major Refactoring of GitHub Actions Runner Images Repository](https://github.com/actions/runner-images/issues/8706) | | [[All OS] Android NDK r23 will be removed from images on November 13](https://github.com/actions/runner-images/issues/8383) | *** # Ubuntu 20.04 - OS Version: 20.04.6 LTS - Kernel Version: 5.15.0-1051-azure -- Image Version: 20231115.8.0 +- Image Version: 20231126.1.0 - Systemd version: 245.4-4ubuntu3.22 ## Installed Software @@ -24,7 +24,7 @@ - GNU C++: 9.4.0, 10.5.0 - GNU Fortran: 9.4.0, 10.5.0 - Julia 1.9.4 -- Kotlin 1.9.255-SNAPSHOT +- Kotlin 1.9.21-release-633 - Mono 6.12.0.200 - MSBuild 16.10.1.31701 (Mono 6.12.0.200) - Node.js 18.18.2 @@ -36,15 +36,15 @@ ### Package Management - cpan 1.64 - Helm 3.13.1 -- Homebrew 4.1.20 -- Miniconda 23.9.0 +- Homebrew 4.1.21 +- Miniconda 23.10.0 - Npm 9.8.1 - NuGet 6.6.1.2 - Pip 20.0.2 - Pip3 20.0.2 - Pipx 1.2.1 - RubyGems 3.1.2 -- Vcpkg (build from commit 2b14b606c) +- Vcpkg (build from commit cd5e746ec) - Yarn 1.22.21 #### Environment variables @@ -64,7 +64,7 @@ to accomplish this. ### Project Management - Ant 1.10.7 - Gradle 8.4 -- Lerna 7.4.2 +- Lerna 8.0.0 - Maven 3.8.8 - Sbt 1.9.7 @@ -73,19 +73,19 @@ to accomplish this. - apt-fast 1.9.12 - AzCopy 10.21.2 - available by `azcopy` and `azcopy10` aliases - Bazel 6.4.0 -- Bazelisk 1.18.0 +- Bazelisk 1.19.0 - Bicep 0.23.1 - Buildah 1.22.3 - CMake 3.27.8 -- CodeQL Action Bundle 2.15.2 +- CodeQL Action Bundle 2.15.3 - Docker Amazon ECR Credential Helper 0.7.1 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.23.0 +- Docker Compose v2 2.23.3 - Docker-Buildx 0.11.2 - Docker Client 24.0.7 - Docker Server 24.0.7 - Fastlane 2.217.0 -- Git 2.42.0 +- Git 2.43.0 - Git LFS 3.4.0 - Git-ftp 1.6.0 - Haveged 1.9.1 @@ -107,29 +107,29 @@ to accomplish this. - Parcel 2.10.3 - PhantomJS 2.1.1 2.1.1 - Podman 3.4.2 -- Pulumi 3.94.0 +- Pulumi 3.94.2 - R 4.3.2 - Skopeo 1.5.0 - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 - Terraform 1.6.4 - yamllint 1.33.0 -- yq 4.35.2 +- yq 4.40.3 - zstd 1.5.5 ### CLI Tools - Alibaba Cloud CLI 3.0.174 -- AWS CLI 2.13.36 +- AWS CLI 2.13.38 - AWS CLI Session Manager Plugin 1.2.497.0 -- AWS SAM CLI 1.102.0 +- AWS SAM CLI 1.103.0 - Azure CLI 2.54.0 - Azure CLI (azure-devops) 0.26.0 - GitHub CLI 2.39.1 - Google Cloud CLI 455.0.0 -- Netlify CLI 17.3.2 -- OpenShift CLI 4.14.2 +- Netlify CLI 17.7.0 +- OpenShift CLI 4.14.3 - ORAS CLI 1.1.0 -- Vercel CLI 32.5.4 +- Vercel CLI 32.5.6 ### Java | Version | Environment Variable | @@ -140,7 +140,7 @@ to accomplish this. | 21.0.1+12 | JAVA_HOME_21_X64 | ### PHP Tools -- PHP: 7.4.33, 8.0.30, 8.1.25, 8.2.12 +- PHP: 7.4.33, 8.0.30, 8.1.26, 8.2.13 - Composer 2.6.5 - PHPUnit 8.5.34 ``` @@ -154,15 +154,15 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Stack 2.13.1 ### Rust Tools -- Cargo 1.73.0 -- Rust 1.73.0 -- Rustdoc 1.73.0 +- Cargo 1.74.0 +- Rust 1.74.0 +- Rustdoc 1.74.0 - Rustup 1.26.0 #### Packages - Bindgen 0.69.1 - Cargo audit 0.18.3 -- Cargo clippy 0.1.73 +- Cargo clippy 0.1.74 - Cargo outdated 0.14.0 - Cbindgen 0.26.0 - Rustfmt 1.6.0 @@ -171,8 +171,8 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Google Chrome 119.0.6045.159 - ChromeDriver 119.0.6045.105 - Chromium 119.0.6045.0 -- Microsoft Edge 119.0.2151.58 -- Microsoft Edge WebDriver 119.0.2151.58 +- Microsoft Edge 119.0.2151.72 +- Microsoft Edge WebDriver 119.0.2151.72 - Selenium server 4.15.0 - Mozilla Firefox 120.0 - Geckodriver 0.33.0 @@ -222,10 +222,9 @@ Use the following command as a part of your job to start the service: 'sudo syst - 1.21.4 #### Node.js -- 14.21.3 - 16.20.2 - 18.18.2 -- 20.9.0 +- 20.10.0 #### Python - 3.7.17 @@ -251,13 +250,13 @@ Use the following command as a part of your job to start the service: 'sudo syst - 3.1.4 ### PowerShell Tools -- PowerShell 7.2.16 +- PowerShell 7.2.17 #### PowerShell Modules - Az: 9.3.0 - Az (Cached): 3.1.0.zip, 4.4.0.zip, 5.9.0.zip, 6.6.0.zip, 7.5.0.zip - MarkdownPS: 1.9 -- Microsoft.Graph: 2.9.0 +- Microsoft.Graph: 2.10.0 - Pester: 5.5.0 - PSScriptAnalyzer: 1.21.0 @@ -299,23 +298,19 @@ Use the following command as a part of your job to start the service: 'sudo syst | alpine:3.16 | sha256:a8cbb8c69ee71561f4b69c066bad07f7e510caaa523da26fbfc606b10bd7934b | 2023-08-07 | | alpine:3.17 | sha256:f71a5f071694a785e064f05fed657bf8277f1b2113a8ed70c90ad486d6ee54dc | 2023-08-07 | | alpine:3.18 | sha256:eece025e432126ce23f223450a0326fbebde39cdf496a85d8c016293fc851978 | 2023-09-28 | -| buildpack-deps:bullseye | sha256:91d0d87bdeb73250aa8b9bc1739ab59e0df4e365dd7e459d1d453d46befd93c3 | 2023-11-01 | -| buildpack-deps:buster | sha256:994c0590e60c01834f0b716a12087fa53cdc8751260c9924a698e38e9548e12a | 2023-11-01 | +| buildpack-deps:bullseye | sha256:257cbe4fba66709d5a536dd5ac13b22411d469eaf61f421f5c2b871f2290e25c | 2023-11-21 | +| buildpack-deps:buster | sha256:77c7243f791521c7bf816e786ef46956eabb0c8e73c8479141ba5e92c05497a7 | 2023-11-21 | | buildpack-deps:stretch | sha256:78e995165a5788c2f55aed6e548d8f6c1534830d4310c870408fccb2da8c5b2e | 2022-06-23 | -| debian:10 | sha256:53cf4f4dbe6f827072bde99045671754cca8174d0464d829c194a26e7ba2c134 | 2023-11-01 | -| debian:11 | sha256:a4aa0519fbd45786048bbc4daa7092fec803d22463f1cb6c4e7762dcb6a10cf0 | 2023-11-01 | +| debian:10 | sha256:46ca02d33c65ab188d6e56f26c323bf1aa9a99074f2f54176fdc3884304f58b8 | 2023-11-21 | +| debian:11 | sha256:ab2b95aa8d7d6d54866b92c322cf0693933c1ae8038652f24ddfda1d1763a45a | 2023-11-21 | | debian:9 | sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be | 2022-06-23 | | moby/buildkit:latest | sha256:d4187a7326f20d04fafd075f80ccc5d3f8cfd4f665c6e03d158a78e4f64bf3db | 2023-10-19 | -| node:14 | sha256:a158d3b9b4e3fa813fa6c8c590b8f0a860e015ad4e59bbce5744d2f6fd8461aa | 2023-04-12 | -| node:14-alpine | sha256:434215b487a329c9e867202ff89e704d3a75e554822e07f3e0c0f9e606121b33 | 2023-03-29 | | node:16 | sha256:f77a1aef2da8d83e45ec990f45df50f1a286c5fe8bbfb8c6e4246c6389705c0b | 2023-09-07 | | node:16-alpine | sha256:a1f9d027912b58a7c75be7716c97cfbc6d3099f3a97ed84aa490be9dee20e787 | 2023-08-10 | -| node:18 | sha256:7ce8b205d15e30fd395e5fa4000bcdf595fcff3f434fe75822e54e82a5f5cf82 | 2023-11-01 | -| node:18-alpine | sha256:435dcad253bb5b7f347ebc69c8cc52de7c912eb7241098b920f2fc2d7843183d | 2023-10-18 | -| node:20 | sha256:5f21943fe97b24ae1740da6d7b9c56ac43fe3495acb47c1b232b0a352b02a25c | 2023-11-01 | -| node:20-alpine | sha256:8e015de364a2eb2ed7c52a558e9f716dcb615560ffd132234087c10ccc1f2c63 | 2023-10-25 | -| ubuntu:16.04 | sha256:1f1a2d56de1d604801a9671f301190704c25d604a416f59e03c04f5c6ffee0d6 | 2021-08-31 | -| ubuntu:18.04 | sha256:152dc042452c496007f07ca9127571cb9c29697f42acbfad72324b2bb2e43c98 | 2023-05-30 | +| node:18 | sha256:a17842484dd30af97540e5416c9a62943c709583977ba41481d601ecffb7f31b | 2023-11-22 | +| node:18-alpine | sha256:3428c2de886bf4378657da6fe86e105573a609c94df1f7d6a70e57d2b51de21f | 2023-11-16 | +| node:20 | sha256:445acd9b2ef7e9de665424053bf95652e0b8995ef36500557d48faf29300170a | 2023-11-23 | +| node:20-alpine | sha256:b1789b7be6aa16afd642eaaaccdeeeb33bd8f08e69b3d27d931aa9665b731f01 | 2023-11-23 | | ubuntu:20.04 | sha256:ed4a42283d9943135ed87d4ee34e542f7f5ad9ecf2f244870e23122f703f91c2 | 2023-10-03 | ### Installed apt packages @@ -337,6 +332,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | dpkg-dev | 1.19.7ubuntu3.2 | | fakeroot | 1.24-1 | | file | 1:5.38-4 | +| findutils | 4.7.0-1ubuntu1 | | flex | 2.6.4-6.2 | | fonts-noto-color-emoji | 0\~20200916-1\~ubuntu20.04.1 | | ftp | 0.17-34.1 | From 3a6122bbaf108bc226818008259473f6ed85b368 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Fri, 1 Dec 2023 11:37:51 +0100 Subject: [PATCH 2502/3485] [Ubuntu] add php-8.3 to 20.04 (#8930) --- images/ubuntu/toolsets/toolset-2004.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/images/ubuntu/toolsets/toolset-2004.json b/images/ubuntu/toolsets/toolset-2004.json index 9b026e410a01..e1b5664fe7de 100644 --- a/images/ubuntu/toolsets/toolset-2004.json +++ b/images/ubuntu/toolsets/toolset-2004.json @@ -291,7 +291,8 @@ "7.4", "8.0", "8.1", - "8.2" + "8.2", + "8.3" ] }, "rubygems": [ From ed911223ab0c5ac0172220bf72399357e05b3a25 Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Fri, 1 Dec 2023 14:42:07 +0100 Subject: [PATCH 2503/3485] Remove ci-cleanup.yml (#8939) --- .github/workflows/ci-cleanup.yml | 49 -------------------------------- 1 file changed, 49 deletions(-) delete mode 100644 .github/workflows/ci-cleanup.yml diff --git a/.github/workflows/ci-cleanup.yml b/.github/workflows/ci-cleanup.yml deleted file mode 100644 index 8b9a94f8dae7..000000000000 --- a/.github/workflows/ci-cleanup.yml +++ /dev/null @@ -1,49 +0,0 @@ -run-name: Cleanup ${{ github.head_ref }} -on: - pull_request_target: - types: labeled - paths: - - 'images/**' - -jobs: - clean_ci: - name: Clean CI runs - runs-on: ubuntu-latest - permissions: - actions: write - steps: - - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - PR_HEAD_REF: ${{ github.event.pull_request.head.ref }} - shell: pwsh - run: | - $startDate = Get-Date -UFormat %s - $workflows = @("macos11", "macos12", "ubuntu2004", "ubuntu2204", "windows2019", "windows2022") - while ($true) { - $continue = $false - foreach ($wf in $workflows) { - $skippedCommand = "gh run list --workflow ${wf}.yml --branch '$env:PR_HEAD_REF' --repo ${{ github.repository }} --status skipped --json databaseId" - $skippedIds = Invoke-Expression -Command $skippedCommand | ConvertFrom-Json | ForEach-Object { $_.databaseId } - $skippedIds | ForEach-Object { - $deleteCommand = "gh run delete --repo ${{ github.repository }} $_" - Invoke-Expression -Command $deleteCommand - } - $pendingCommand = "gh run list --workflow ${wf}.yml --branch '$env:PR_HEAD_REF' --repo ${{ github.repository }} --status requested --json databaseId --template '{{ . | len }}'" - $pending = Invoke-Expression -Command $pendingCommand - if ($pending -gt 0) { - Write-Host "Pending for ${wf}.yml: $pending run(s)" - $continue = $true - } - } - if ($continue -eq $false) { - Write-Host "All done, exiting" - break - } - $curDate = Get-Date -UFormat %s - if (($curDate - $startDate) -gt 60) { - Write-Host "Reached timeout, exiting" - break - } - Write-Host "Waiting 5 seconds..." - Start-Sleep -Seconds 5 - } From 5ed26150179d5ccb6476e822748f284ef4a6ae7f Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Mon, 4 Dec 2023 10:50:53 +0100 Subject: [PATCH 2504/3485] [Windows] Cleanup various scripts (#8942) * Use Resolve-GithubReleaseAssetUrl more widely * Add the Get-ChecksumFromUrl function * Sort exported functions and add docs * Remove alias and fix typo * Fix kind checksum url and syntax * Fix checksums url for gh cli and msys2 * [Windows] Cleanup various scripts * Add spaces after type specifications * Rename the Take-Part function --- CONTRIBUTING.md | 2 +- .../scripts/build/Configure-PowerShell.ps1 | 2 +- .../scripts/build/Install-AWSTools.ps1 | 2 +- .../scripts/build/Install-AliyunCli.ps1 | 14 +- .../scripts/build/Install-AzureCli.ps1 | 18 +-- .../scripts/build/Install-AzureDevOpsCli.ps1 | 26 ++- .../windows/scripts/build/Install-Bazel.ps1 | 3 + .../scripts/build/Install-Chocolatey.ps1 | 14 +- .../windows/scripts/build/Install-Chrome.ps1 | 17 +- .../windows/scripts/build/Install-Docker.ps1 | 12 +- .../scripts/build/Install-DockerWinCred.ps1 | 33 ++-- .../scripts/build/Install-DotnetSDK.ps1 | 149 +++++++++--------- .../windows/scripts/build/Install-Firefox.ps1 | 16 +- images/windows/scripts/build/Install-Git.ps1 | 4 +- .../scripts/build/Install-GitHub-CLI.ps1 | 20 ++- .../windows/scripts/build/Install-Haskell.ps1 | 11 +- .../scripts/build/Install-IEWebDriver.ps1 | 2 +- .../scripts/build/Install-JavaTools.ps1 | 12 +- .../windows/scripts/build/Install-Kotlin.ps1 | 2 +- .../scripts/build/Install-KubernetesTools.ps1 | 22 +-- .../windows/scripts/build/Install-Mingw64.ps1 | 102 ++++++------ .../scripts/build/Install-Miniconda.ps1 | 2 +- .../windows/scripts/build/Install-MongoDB.ps1 | 16 +- .../windows/scripts/build/Install-Msys2.ps1 | 30 ++-- .../scripts/build/Install-MysqlCli.ps1 | 8 +- images/windows/scripts/build/Install-Pipx.ps1 | 4 +- .../scripts/build/Install-PostgreSQL.ps1 | 14 +- .../build/Install-PowerShellModules.ps1 | 14 +- .../scripts/build/Install-PowershellCore.ps1 | 11 +- .../windows/scripts/build/Install-RootCA.ps1 | 34 ++-- images/windows/scripts/build/Install-Ruby.ps1 | 94 ++++------- .../windows/scripts/build/Install-Runner.ps1 | 9 +- images/windows/scripts/build/Install-Rust.ps1 | 2 +- .../build/Install-SQLPowerShellTools.ps1 | 12 +- .../build/Install-ServiceFabricSDK.ps1 | 10 +- .../windows/scripts/build/Install-Stack.ps1 | 20 ++- .../windows/scripts/build/Install-Toolset.ps1 | 11 +- .../scripts/build/Install-VCRedist.ps1 | 12 +- .../scripts/build/Install-VisualStudio.ps1 | 17 +- .../build/Install-WebPlatformInstaller.ps1 | 4 +- .../scripts/build/Install-WinAppDriver.ps1 | 11 +- .../scripts/build/Install-WindowsFeatures.ps1 | 5 + .../scripts/build/Install-WindowsUpdates.ps1 | 3 +- images/windows/scripts/build/Install-Zstd.ps1 | 13 +- .../docs-gen/SoftwareReport.CachedTools.psm1 | 10 +- .../docs-gen/SoftwareReport.Common.psm1 | 87 +++++----- .../docs-gen/SoftwareReport.Helpers.psm1 | 4 +- .../scripts/docs-gen/SoftwareReport.Java.psm1 | 4 +- .../docs-gen/SoftwareReport.Tools.psm1 | 4 +- .../windows/scripts/helpers/ChocoHelpers.ps1 | 44 +++++- .../windows/scripts/helpers/ImageHelpers.psm1 | 64 +++++--- .../scripts/helpers/InstallHelpers.ps1 | 132 ++++++++++++++-- .../windows/scripts/helpers/PathHelpers.ps1 | 15 +- .../scripts/helpers/VisualStudioHelpers.ps1 | 107 ++++++++++++- .../windows/scripts/tests/Haskell.Tests.ps1 | 8 +- images/windows/scripts/tests/Java.Tests.ps1 | 2 +- 56 files changed, 761 insertions(+), 559 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index cc728e1ea67c..db907e4eaa31 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -41,7 +41,7 @@ Here are a few things you can do that will increase the likelihood of your pull ### Windows - Add a script that will install the tool and put the script in the `scripts/build` folder. -There are a bunch of helper functions that could simplify your code: `Choco-Install`, `Install-Binary`, `Install-VsixExtension`, `Start-DownloadWithRetry`, `Test-IsWin19`, `Test-IsWin22` (find the full list of helpers in [ImageHelpers.psm1](images/windows/scripts/helpers/ImageHelpers.psm1)). +There are a bunch of helper functions that could simplify your code: `Install-ChocoPackage`, `Install-Binary`, `Install-VSIXFromFile`, `Install-VSIXFromUrl`, `Invoke-DownloadWithRetry`, `Test-IsWin19`, `Test-IsWin22` (find the full list of helpers in [ImageHelpers.psm1](images/windows/scripts/helpers/ImageHelpers.psm1)). - Add a script that will validate the tool installation and put the script in the `scripts/tests` folder. We use [Pester v5](https://github.com/pester/pester) for validation scripts. If the tests for the tool are complex enough, create a separate `*.Tests.ps1`. Otherwise, use `Tools.Tests.ps1` for simple tests. Add `Invoke-PesterTests -TestFile <testFileName> [-TestName <describeName>]` at the end of the installation script to make sure that your tests will be run. diff --git a/images/windows/scripts/build/Configure-PowerShell.ps1 b/images/windows/scripts/build/Configure-PowerShell.ps1 index 32fdb0310051..722a1ea89740 100644 --- a/images/windows/scripts/build/Configure-PowerShell.ps1 +++ b/images/windows/scripts/build/Configure-PowerShell.ps1 @@ -13,7 +13,7 @@ Set-PSRepository -InstallationPolicy Trusted -Name PSGallery Write-Host 'Warmup PSModuleAnalysisCachePath (speedup first powershell invocation by 20s)' $PSModuleAnalysisCachePath = 'C:\PSModuleAnalysisCachePath\ModuleAnalysisCache' -[Environment]::SetEnvironmentVariable('PSModuleAnalysisCachePath', $PSModuleAnalysisCachePath, [System.EnvironmentVariableTarget]::Machine) +[Environment]::SetEnvironmentVariable('PSModuleAnalysisCachePath', $PSModuleAnalysisCachePath, "Machine") # make variable to be available in the current session ${env:PSModuleAnalysisCachePath} = $PSModuleAnalysisCachePath diff --git a/images/windows/scripts/build/Install-AWSTools.ps1 b/images/windows/scripts/build/Install-AWSTools.ps1 index a5c66e338637..e719532e56dc 100644 --- a/images/windows/scripts/build/Install-AWSTools.ps1 +++ b/images/windows/scripts/build/Install-AWSTools.ps1 @@ -19,7 +19,7 @@ $downloadUrl = Resolve-GithubReleaseAssetUrl ` -Repo "awslabs/aws-sam-cli" ` -Version "latest" ` -UrlMatchPattern "AWS_SAM_CLI_64_PY3.msi" -$externalHash = Get-GithubReleaseAssetHash ` +$externalHash = Get-ChecksumFromGithubRelease ` -Repo "awslabs/aws-sam-cli" ` -Version "latest" ` -FileName (Split-Path $downloadUrl -Leaf) ` diff --git a/images/windows/scripts/build/Install-AliyunCli.ps1 b/images/windows/scripts/build/Install-AliyunCli.ps1 index d4d5c13cb020..a922c72303d5 100644 --- a/images/windows/scripts/build/Install-AliyunCli.ps1 +++ b/images/windows/scripts/build/Install-AliyunCli.ps1 @@ -5,15 +5,17 @@ ################################################################################ Write-Host "Download Latest aliyun-cli archive" -$repoUrl = "https://api.github.com/repos/aliyun/aliyun-cli/releases/latest" -$installerFileName = "aliyun-cli-windows" -$assets = (Invoke-RestMethod -Uri $repoUrl).assets -$downloadUrl = ($assets.browser_download_url -ilike "*aliyun-cli-windows-*-amd64.zip*") | Select-Object -First 1 +$downloadUrl = Resolve-GithubReleaseAssetUrl ` + -Repo "aliyun/aliyun-cli" ` + -Version "latest" ` + -UrlMatchPattern "aliyun-cli-windows-*-amd64.zip" $packagePath = Invoke-DownloadWithRetry $downloadUrl #region Supply chain security - Alibaba Cloud CLI -$hashUrl = ($assets.browser_download_url -ilike "*SHASUMS256.txt*") | Select-Object -First 1 -$externalHash = (Invoke-RestMethod -Uri $hashURL).ToString().Split("`n").Where({ $_ -ilike "*$installerFileName*" }).Split(' ')[0] +$packageName = Split-Path $downloadUrl -Leaf +$externalHash = Get-ChecksumFromUrl -Type "SHA256" ` + -Url ($downloadUrl -replace $packageName, "SHASUMS256.txt") ` + -FileName $packageName Test-FileChecksum $packagePath -ExpectedSHA256Sum $externalHash #endregion diff --git a/images/windows/scripts/build/Install-AzureCli.ps1 b/images/windows/scripts/build/Install-AzureCli.ps1 index 1a1c2f19664b..6bf7611cfa24 100644 --- a/images/windows/scripts/build/Install-AzureCli.ps1 +++ b/images/windows/scripts/build/Install-AzureCli.ps1 @@ -7,26 +7,20 @@ Write-Host 'Install the latest Azure CLI release' $azureCliConfigPath = 'C:\azureCli' # Store azure-cli cache outside of the provisioning user's profile -[Environment]::SetEnvironmentVariable('AZURE_CONFIG_DIR', $azureCliConfigPath, [System.EnvironmentVariableTarget]::Machine) -# make variable to be available in the current session -${env:AZURE_CONFIG_DIR} = $azureCliConfigPath +[Environment]::SetEnvironmentVariable('AZURE_CONFIG_DIR', $azureCliConfigPath, "Machine") + +$azureCliExtensionPath = Join-Path $Env:CommonProgramFiles 'AzureCliExtensionDirectory' +New-Item -ItemType 'Directory' -Path $azureCliExtensionPath | Out-Null +[Environment]::SetEnvironmentVariable('AZURE_EXTENSION_DIR', $azureCliExtensionPath, "Machine") Install-Binary -Type MSI ` -Url 'https://aka.ms/installazurecliwindowsx64' ` -ExpectedSignature '72105B6D5F370B62FD5C82F1512F7AD7DEE5F2C0' -$azureCliExtensionPath = Join-Path $Env:CommonProgramFiles 'AzureCliExtensionDirectory' -$null = New-Item -ItemType 'Directory' -Path $azureCliExtensionPath - -[Environment]::SetEnvironmentVariable('AZURE_EXTENSION_DIR', $azureCliExtensionPath, [System.EnvironmentVariableTarget]::Machine) -# make variable to be available in the current session -${env:AZURE_EXTENSION_DIR} = $azureCliExtensionPath +Update-Environment # Warm-up Azure CLI - Write-Host "Warmup 'az'" - -$env:PATH = [Environment]::GetEnvironmentVariable('PATH', 'Machine') az --help | Out-Null if ($LASTEXITCODE -ne 0) { throw "Command 'az --help' failed" diff --git a/images/windows/scripts/build/Install-AzureDevOpsCli.ps1 b/images/windows/scripts/build/Install-AzureDevOpsCli.ps1 index 8227a3fc8ac0..f911ba6e7746 100644 --- a/images/windows/scripts/build/Install-AzureDevOpsCli.ps1 +++ b/images/windows/scripts/build/Install-AzureDevOpsCli.ps1 @@ -5,34 +5,26 @@ $azureDevOpsCliConfigPath = 'C:\azureDevOpsCli' # Store azure-devops-cli cache outside of the provisioning user's profile -[Environment]::SetEnvironmentVariable('AZ_DEVOPS_GLOBAL_CONFIG_DIR', $azureDevOpsCliConfigPath, [System.EnvironmentVariableTarget]::Machine) -# make variable to be available in the current session -${env:AZ_DEVOPS_GLOBAL_CONFIG_DIR} = $azureDevOpsCliConfigPath +[Environment]::SetEnvironmentVariable('AZ_DEVOPS_GLOBAL_CONFIG_DIR', $azureDevOpsCliConfigPath, "Machine") $azureDevOpsCliCachePath = Join-Path $azureDevOpsCliConfigPath 'cache' -$null = New-Item -ItemType 'Directory' -Path $azureDevOpsCliCachePath +New-Item -ItemType 'Directory' -Path $azureDevOpsCliCachePath | Out-Null +[Environment]::SetEnvironmentVariable('AZURE_DEVOPS_CACHE_DIR', $azureDevOpsCliCachePath, "Machine") -[Environment]::SetEnvironmentVariable('AZURE_DEVOPS_CACHE_DIR', $azureDevOpsCliCachePath, [System.EnvironmentVariableTarget]::Machine) -# make variable to be available in the current session -${env:AZURE_DEVOPS_CACHE_DIR} = $azureDevOpsCliCachePath +Update-Environment az extension add -n azure-devops -if ($LASTEXITCODE -ne 0) -{ +if ($LASTEXITCODE -ne 0) { throw "Command 'az extension add -n azure-devops' failed" } # Warm-up Azure DevOps CLI - Write-Host "Warmup 'az-devops'" @('devops', 'pipelines', 'boards', 'repos', 'artifacts') | ForEach-Object { - - az $_ --help - if ($LASTEXITCODE -ne 0) - { - throw "Command 'az $_ --help' failed" - } - + az $_ --help + if ($LASTEXITCODE -ne 0) { + throw "Command 'az $_ --help' failed" + } } # calling az devops login to force it to install `keyring`. Login will actually fail, redirecting error to null diff --git a/images/windows/scripts/build/Install-Bazel.ps1 b/images/windows/scripts/build/Install-Bazel.ps1 index bc3a4e011278..ad922de69f0a 100644 --- a/images/windows/scripts/build/Install-Bazel.ps1 +++ b/images/windows/scripts/build/Install-Bazel.ps1 @@ -6,5 +6,8 @@ Install-ChocoPackage bazel npm install -g @bazel/bazelisk +if ($LASTEXITCODE -ne 0) { + throw "Command 'npm install -g @bazel/bazelisk' failed" +} Invoke-PesterTests -TestFile "Tools" -TestName "Bazel" diff --git a/images/windows/scripts/build/Install-Chocolatey.ps1 b/images/windows/scripts/build/Install-Chocolatey.ps1 index 2f9a4b873037..742fa3a00b97 100644 --- a/images/windows/scripts/build/Install-Chocolatey.ps1 +++ b/images/windows/scripts/build/Install-Chocolatey.ps1 @@ -7,20 +7,10 @@ Write-Host "Set TLS1.2" [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor "Tls12" Write-Host "Install chocolatey" -$chocoExePath = 'C:\ProgramData\Chocolatey\bin' # Add to system PATH -$systemPath = [Environment]::GetEnvironmentVariable('Path', [System.EnvironmentVariableTarget]::Machine) -$systemPath += ';' + $chocoExePath -[Environment]::SetEnvironmentVariable("PATH", $systemPath, [System.EnvironmentVariableTarget]::Machine) - -# Update local process' path -$userPath = [Environment]::GetEnvironmentVariable('Path', [System.EnvironmentVariableTarget]::User) -if ($userPath) { - $env:Path = $systemPath + ";" + $userPath -} else { - $env:Path = $systemPath -} +Add-MachinePathItem 'C:\ProgramData\Chocolatey\bin' +Update-Environment # Verify and run choco installer $signatureThumbprint = "83AC7D88C66CB8680BCE802E0F0F5C179722764B" diff --git a/images/windows/scripts/build/Install-Chrome.ps1 b/images/windows/scripts/build/Install-Chrome.ps1 index 52cd2a5ea775..25687abe8a18 100644 --- a/images/windows/scripts/build/Install-Chrome.ps1 +++ b/images/windows/scripts/build/Install-Chrome.ps1 @@ -33,8 +33,7 @@ $regGoogleParameters = @( $regGoogleParameters | ForEach-Object { $Arguments = $_ - if (-not ($Arguments.Path)) - { + if (-not ($Arguments.Path)) { $Arguments.Add("Path", $regGoogleUpdatePath) } $Arguments.Add("Force", $true) @@ -44,15 +43,14 @@ $regGoogleParameters | ForEach-Object { # Install Chrome WebDriver Write-Host "Install Chrome WebDriver..." $ChromeDriverPath = "$($env:SystemDrive)\SeleniumWebDrivers\ChromeDriver" -if (-not (Test-Path -Path $ChromeDriverPath)) -{ +if (-not (Test-Path -Path $ChromeDriverPath)) { New-Item -Path $ChromeDriverPath -ItemType Directory -Force } Write-Host "Get the Chrome WebDriver download URL..." $RegistryPath = "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths" $ChromePath = (Get-ItemProperty "$RegistryPath\chrome.exe").'(default)' -[version]$ChromeVersion = [System.Diagnostics.FileVersionInfo]::GetVersionInfo($ChromePath).ProductVersion +[version] $ChromeVersion = [System.Diagnostics.FileVersionInfo]::GetVersionInfo($ChromePath).ProductVersion $ChromeBuild = "$($ChromeVersion.Major).$($ChromeVersion.Minor).$($ChromeVersion.Build)" $ChromeDriverVersionsUrl = "https://googlechromelabs.github.io/chrome-for-testing/latest-patch-versions-per-build-with-downloads.json" @@ -63,7 +61,7 @@ $ChromeDriverVersion = $ChromeDriverVersions.builds.$ChromeBuild if (-not ($ChromeDriverVersion)) { $availableVersions = $ChromeDriverVersions.builds | Get-Member | Select-Object -ExpandProperty Name Write-Host "Available chromedriver builds are $availableVersions" - Throw "Can't determine chromedriver version that matches chrome build $ChromeBuild" + throw "Can't determine chromedriver version that matches chrome build $ChromeBuild" } $ChromeDriverVersion.version | Out-File -FilePath "$ChromeDriverPath\versioninfo.txt" -Force; @@ -79,10 +77,7 @@ Expand-7ZipArchive -Path $ChromeDriverArchPath -DestinationPath $ChromeDriverPat Write-Host "Setting the environment variables..." [Environment]::SetEnvironmentVariable("ChromeWebDriver", $ChromeDriverPath, "Machine") - -$regEnvKey = 'HKLM:\SYSTEM\CurrentControlSet\Control\Session Manager\Environment\' -$PathValue = Get-ItemPropertyValue -Path $regEnvKey -Name 'Path' -$PathValue += ";$ChromeDriverPath\" -Set-ItemProperty -Path $regEnvKey -Name 'Path' -Value $PathValue +Add-MachinePathItem $ChromeDriverPath +Update-Environment Invoke-PesterTests -TestFile "Browsers" -TestName "Chrome" diff --git a/images/windows/scripts/build/Install-Docker.ps1 b/images/windows/scripts/build/Install-Docker.ps1 index fb6ad34b8723..cc353a1b76be 100644 --- a/images/windows/scripts/build/Install-Docker.ps1 +++ b/images/windows/scripts/build/Install-Docker.ps1 @@ -6,15 +6,16 @@ ################################################################################ Write-Host "Get latest Moby release" -$mobyLatestReleaseVersion = (Invoke-RestMethod -Uri "https://api.github.com/repos/moby/moby/releases/latest").tag_name.Trim("v") +$mobyLatestVersion = (Get-GithubReleasesByVersion -Repo "moby/moby" -Version "latest").version + $dockerceUrl = "https://download.docker.com/win/static/stable/x86_64/" $dockerceBinaries = Invoke-WebRequest -Uri $dockerceUrl -UseBasicParsing -Write-Host "Check Moby version $mobyLatestReleaseVersion" -$mobyRelease = $dockerceBinaries.Links.href -match "${mobyLatestReleaseVersion}\.zip" | Select-Object -Last 1 +Write-Host "Check Moby version $mobyLatestVersion" +$mobyRelease = $dockerceBinaries.Links.href -match "${mobyLatestVersion}\.zip" | Select-Object -Last 1 if (-not $mobyRelease) { Write-Host "Release not found for $mobyLatestRelease version" - $versions = [regex]::Matches($dockerceBinaries.Links.href, "docker-(\d+\.\d+\.\d+)\.zip") | Sort-Object { [version]$_.Groups[1].Value } + $versions = [regex]::Matches($dockerceBinaries.Links.href, "docker-(\d+\.\d+\.\d+)\.zip") | Sort-Object { [version] $_.Groups[1].Value } $mobyRelease = $versions | Select-Object -ExpandProperty Value -Last 1 Write-Host "Found $mobyRelease" } @@ -47,8 +48,7 @@ foreach ($dockerImage in $dockerImages) { docker pull $dockerImage if (!$?) { - Write-Host "Docker pull failed with a non-zero exit code" - exit 1 + throw "Docker pull failed with a non-zero exit code ($LastExitCode)" } } diff --git a/images/windows/scripts/build/Install-DockerWinCred.ps1 b/images/windows/scripts/build/Install-DockerWinCred.ps1 index 127d4e488154..e4d8dd6eb80e 100644 --- a/images/windows/scripts/build/Install-DockerWinCred.ps1 +++ b/images/windows/scripts/build/Install-DockerWinCred.ps1 @@ -4,32 +4,19 @@ ## Supply chain security: checksum validation ################################################################################ -#region functions -function Get-DockerWincredHash { - Param ( - [Parameter(Mandatory = $True)] - [string] $Release - ) - - $hashURL = "https://github.com/docker/docker-credential-helpers/releases/download/${Release}/checksums.txt" - (Invoke-RestMethod -Uri $hashURL).ToString().Split("`n").Where({ $_ -ilike "*docker-credential-wincred-${Release}.windows-amd64.exe*" }).Split(' ')[0] -} -#endregion - Write-Host "Install docker-wincred" -$dockerCredLatestRelease = Invoke-RestMethod -Uri "https://api.github.com/repos/docker/docker-credential-helpers/releases/latest" -$dockerCredDownloadUrl = $dockerCredLatestRelease.assets.browser_download_url -match "docker-credential-wincred-.+\.exe" | Select-Object -First 1 -Invoke-DownloadWithRetry -Url $dockerCredDownloadUrl -Path "C:\Windows\System32\docker-credential-wincred.exe" +$downloadUrl = Resolve-GithubReleaseAssetUrl ` + -Repo "docker/docker-credential-helpers" ` + -Version "latest" ` + -UrlMatchPattern "docker-credential-wincred-*amd64.exe" +$binaryPath = Invoke-DownloadWithRetry -Url $downloadUrl -Path "C:\Windows\System32\docker-credential-wincred.exe" #region Supply chain security -$distributor_file_hash = Get-DockerWincredHash -Release $dockerCredLatestRelease.name -$local_file_hash = (Get-FileHash -Path 'C:\Windows\System32\docker-credential-wincred.exe' -Algorithm SHA256).Hash - -if ($local_file_hash -ne $distributor_file_hash) { - Write-Host "hash must be equal to: ${distributor_file_hash}" - Write-Host "actual hash is: ${local_file_hash}" - throw 'Checksum verification failed, please rerun install' -} +$binaryName = Split-Path $downloadUrl -Leaf +$externalHash = Get-ChecksumFromUrl -Type "SHA256" ` + -Url ($downloadUrl -replace $binaryName, "checksums.txt") ` + -FileName $binaryName +Test-FileChecksum -Path $binaryPath -ExpectedSHA256Sum $externalHash #endregion Invoke-PesterTests -TestFile "Docker" -TestName "DockerWinCred" diff --git a/images/windows/scripts/build/Install-DotnetSDK.ps1 b/images/windows/scripts/build/Install-DotnetSDK.ps1 index d4198c92b9d3..1cc9645e3131 100644 --- a/images/windows/scripts/build/Install-DotnetSDK.ps1 +++ b/images/windows/scripts/build/Install-DotnetSDK.ps1 @@ -6,36 +6,40 @@ ################################################################################ # Set environment variables -[System.Environment]::SetEnvironmentVariable("DOTNET_MULTILEVEL_LOOKUP", "0", "Machine") -[System.Environment]::SetEnvironmentVariable("DOTNET_NOLOGO", "1", "Machine") -[System.Environment]::SetEnvironmentVariable("DOTNET_SKIP_FIRST_TIME_EXPERIENCE", "1", "Machine") +[Environment]::SetEnvironmentVariable("DOTNET_MULTILEVEL_LOOKUP", "0", "Machine") +[Environment]::SetEnvironmentVariable("DOTNET_NOLOGO", "1", "Machine") +[Environment]::SetEnvironmentVariable("DOTNET_SKIP_FIRST_TIME_EXPERIENCE", "1", "Machine") [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor "Tls12" #region "Functions" -function Get-SDKVersionsToInstall ( - $DotnetVersion -) { - $metadataJsonUri = "https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/${DotnetVersion}/releases.json" - $currentReleases = Invoke-DownloadWithRetry $metadataJsonUri | Get-Item | Get-Content | ConvertFrom-Json +function Get-SDKVersionsToInstall { + param ( + [Parameter(Mandatory)] + [string] $DotnetVersion + ) + $releasesJsonUri = "https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/${DotnetVersion}/releases.json" + $releasesData = (Invoke-DownloadWithRetry $releasesJsonUri) | Get-Item | Get-Content | ConvertFrom-Json # filtering out the preview/rc releases - $currentReleases = $currentReleases.'releases' | Where-Object { !$_.'release-version'.Contains('-') } + $releases = $releasesData.'releases' | Where-Object { !$_.'release-version'.Contains('-') } $sdks = @() - foreach ($release in $currentReleases) { + foreach ($release in $releases) { $sdks += $release.'sdk' $sdks += $release.'sdks' } return $sdks.version ` - | Sort-Object { [Version] $_ } -Unique ` - | Group-Object { $_.Substring(0, $_.LastIndexOf('.') + 2) } ` - | ForEach-Object { $_.Group[-1] } + | Sort-Object { [Version] $_ } -Unique ` + | Group-Object { $_.Substring(0, $_.LastIndexOf('.') + 2) } ` + | ForEach-Object { $_.Group[-1] } } -function Invoke-Warmup ( - $SdkVersion -) { +function Invoke-DotnetWarmup { + param ( + [Parameter(Mandatory)] + [string] $SDKVersion + ) # warm up dotnet for first time experience $projectTypes = @('console', 'mstest', 'web', 'mvc', 'webapi') $projectTypes | ForEach-Object { @@ -43,85 +47,76 @@ function Invoke-Warmup ( $projectPath = Join-Path -Path C:\temp -ChildPath $template New-Item -Path $projectPath -Force -ItemType Directory Push-Location -Path $projectPath - & $env:ProgramFiles\dotnet\dotnet.exe new globaljson --sdk-version "$sdkVersion" + & $env:ProgramFiles\dotnet\dotnet.exe new globaljson --sdk-version "$SDKVersion" & $env:ProgramFiles\dotnet\dotnet.exe new $template Pop-Location Remove-Item $projectPath -Force -Recurse } } -function InstallSDKVersion ( - $SdkVersion, - $dotnetVersion, - $Warmup -) { - if (!(Test-Path -Path "C:\Program Files\dotnet\sdk\$sdkVersion")) { - Write-Host "Installing dotnet $sdkVersion" - $ZipPath = [System.IO.Path]::combine([System.IO.Path]::GetTempPath(), [System.IO.Path]::GetRandomFileName()) - .\dotnet-install.ps1 -Version $sdkVersion -InstallDir $(Join-Path -Path $env:ProgramFiles -ChildPath 'dotnet') -ZipPath $ZipPath -KeepZip - - #region Supply chain security - $distributorFileHash = (Invoke-RestMethod -Uri "https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/$dotnetVersion/releases.json").releases.sdks.Where({ $_.version -eq $SdkVersion }).files.Where({ $_.name -eq 'dotnet-sdk-win-x64.zip' }).hash - Test-FileChecksum $ZipPath -ExpectedSHA512Sum $distributorFileHash - #endregion - } else { - Write-Host "Sdk version $sdkVersion already installed" +function Install-DotnetSDK { + param ( + [Parameter(Mandatory)] + [string] $InstallScriptPath, + [Parameter(Mandatory)] + [Alias('Version')] + [string] $SDKVersion, + [Parameter(Mandatory)] + [string] $DotnetVersion + ) + + if (Test-Path -Path "C:\Program Files\dotnet\sdk\$SDKVersion") { + Write-Host "Sdk version $SDKVersion already installed" + return } - if ($Warmup) { - Invoke-Warmup -SdkVersion $SdkVersion - } -} + Write-Host "Installing dotnet $SDKVersion" + $zipPath = Join-Path ([IO.Path]::GetTempPath()) ([IO.Path]::GetRandomFileName()) + & $InstallScriptPath -Version $SDKVersion -InstallDir $(Join-Path -Path $env:ProgramFiles -ChildPath 'dotnet') -ZipPath $zipPath -KeepZip -function InstallAllValidSdks() { - # Consider all channels except preview/eol channels. - # Sort the channels in ascending order - $dotnetToolset = (Get-ToolsetContent).dotnet - $dotnetVersions = $dotnetToolset.versions - $warmup = $dotnetToolset.warmup - - # Download installation script. - $installationName = "dotnet-install.ps1" - $installationUrl = "https://dot.net/v1/${installationName}" - Invoke-DownloadWithRetry -Url $installationUrl -Path ".\$installationName" - - foreach ($dotnetVersion in $dotnetVersions) { - $sdkVersionsToInstall = Get-SDKVersionsToInstall -DotnetVersion $dotnetVersion - foreach ($sdkVersion in $sdkVersionsToInstall) { - InstallSDKVersion -SdkVersion $sdkVersion -DotnetVersion $dotnetVersion -Warmup $warmup - } - } + #region Supply chain security + $releasesJsonUri = "https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/${DotnetVersion}/releases.json" + $releasesData = (Invoke-DownloadWithRetry $releasesJsonUri) | Get-Item | Get-Content | ConvertFrom-Json + $distributorFileHash = $releasesData.releases.sdks.Where({ $_.version -eq $SDKVersion }).files.Where({ $_.name -eq 'dotnet-sdk-win-x64.zip' }).hash + Test-FileChecksum $zipPath -ExpectedSHA512Sum $distributorFileHash + #endregion } +#endregion + +$dotnetToolset = (Get-ToolsetContent).dotnet -function InstallTools() { - $dotnetTools = (Get-ToolsetContent).dotnet.tools +# Download installation script. +$installScriptPath = Invoke-DownloadWithRetry -Url "https://dot.net/v1/dotnet-install.ps1" - foreach ($dotnetTool in $dotnetTools) { - dotnet tool install $($dotnetTool.name) --tool-path "C:\Users\Default\.dotnet\tools" --add-source https://api.nuget.org/v3/index.json | Out-Null +# Install and warm up dotnet +foreach ($dotnetVersion in $dotnetToolset.versions) { + $sdkVersionsToInstall = Get-SDKVersionsToInstall -DotnetVersion $dotnetVersion + foreach ($sdkVersion in $sdkVersionsToInstall) { + Install-DotnetSDK -InstallScriptPath $installScriptPath -SDKVersion $sdkVersion -DotnetVersion $dotnetVersion + if ($dotnetToolset.warmup) { + Invoke-DotnetWarmup -SDKVersion $sdkVersion + } } } -function RunPostInstallationSteps() { - # Add dotnet to PATH - Add-MachinePathItem "C:\Program Files\dotnet" +# Add dotnet to PATH +Add-MachinePathItem "C:\Program Files\dotnet" - # Remove NuGet Folder - $nugetPath = "$env:APPDATA\NuGet" - if (Test-Path $nugetPath) { - Remove-Item -Path $nugetPath -Force -Recurse - } +# Remove NuGet Folder +$nugetPath = "$env:APPDATA\NuGet" +if (Test-Path $nugetPath) { + Remove-Item -Path $nugetPath -Force -Recurse +} - # Generate and copy new NuGet.Config config - dotnet nuget list source | Out-Null - Copy-Item -Path $nugetPath -Destination C:\Users\Default\AppData\Roaming -Force -Recurse +# Generate and copy new NuGet.Config config +dotnet nuget list source | Out-Null +Copy-Item -Path $nugetPath -Destination C:\Users\Default\AppData\Roaming -Force -Recurse - # Add %USERPROFILE%\.dotnet\tools to USER PATH - Add-DefaultPathItem "%USERPROFILE%\.dotnet\tools" +# Install dotnet tools +Write-Host "Installing dotnet tools" +Add-DefaultPathItem "%USERPROFILE%\.dotnet\tools" +foreach ($dotnetTool in $dotnetToolset.tools) { + dotnet tool install $($dotnetTool.name) --tool-path "C:\Users\Default\.dotnet\tools" --add-source https://api.nuget.org/v3/index.json | Out-Null } -#endregion - -InstallAllValidSdks -RunPostInstallationSteps -InstallTools Invoke-PesterTests -TestFile "DotnetSDK" diff --git a/images/windows/scripts/build/Install-Firefox.ps1 b/images/windows/scripts/build/Install-Firefox.ps1 index b9c84777491e..eca81779f983 100644 --- a/images/windows/scripts/build/Install-Firefox.ps1 +++ b/images/windows/scripts/build/Install-Firefox.ps1 @@ -11,7 +11,10 @@ $VersionsManifest = Invoke-RestMethod "https://product-details.mozilla.org/1.0/f Write-Host "Install Firefox browser..." $installerUrl = "https://download.mozilla.org/?product=firefox-$($VersionsManifest.LATEST_FIREFOX_VERSION)&os=win64&lang=en-US" $hashUrl = "https://archive.mozilla.org/pub/firefox/releases/$($VersionsManifest.LATEST_FIREFOX_VERSION)/SHA256SUMS" -$externalHash = (Invoke-RestMethod -Uri $hashURL).ToString().Split("`n").Where({ $_ -ilike "*win64/en-US/Firefox Setup*exe*" }).Split(' ')[0] + +$externalHash = Get-ChecksumFromUrl -Type "SHA256" ` + -Url $hashUrl ` + -FileName "win64/en-US/Firefox Setup*exe" Install-Binary -Type EXE ` -Url $installerUrl ` @@ -36,13 +39,14 @@ if (-not (Test-Path -Path $GeckoDriverPath)) { } Write-Host "Get the Gecko WebDriver version..." -$GeckoDriverJson = Invoke-RestMethod "https://api.github.com/repos/mozilla/geckodriver/releases/latest" -$GeckoDriverWindowsAsset = $GeckoDriverJson.assets | Where-Object { $_.name -Match "win64" } | Select-Object -First 1 -$GeckoDriverVersion = $GeckoDriverJson.tag_name -$GeckoDriverVersion.Substring(1) | Out-File -FilePath "$GeckoDriverPath\versioninfo.txt" -Force; +$GeckoDriverVersion = (Get-GithubReleasesByVersion -Repo "mozilla/geckodriver" -Version "latest").version +$GeckoDriverVersion | Out-File -FilePath "$GeckoDriverPath\versioninfo.txt" -Force Write-Host "Download Gecko WebDriver WebDriver..." -$GeckoDriverDownloadUrl = $GeckoDriverWindowsAsset.browser_download_url +$GeckoDriverDownloadUrl = Resolve-GithubReleaseAssetUrl ` + -Repo "mozilla/geckodriver" ` + -Version $GeckoDriverVersion ` + -UrlMatchPattern "geckodriver-*-win64.zip" $GeckoDriverArchPath = Invoke-DownloadWithRetry $GeckoDriverDownloadUrl Write-Host "Expand Gecko WebDriver archive..." diff --git a/images/windows/scripts/build/Install-Git.ps1 b/images/windows/scripts/build/Install-Git.ps1 index 0a2c4234a68f..1d21869461ac 100644 --- a/images/windows/scripts/build/Install-Git.ps1 +++ b/images/windows/scripts/build/Install-Git.ps1 @@ -11,7 +11,7 @@ $downloadUrl = Resolve-GithubReleaseAssetUrl ` -Version "latest" ` -UrlMatchPattern "Git-*-64-bit.exe" -$externalHash = Get-GithubReleaseAssetHash ` +$externalHash = Get-ChecksumFromGithubRelease ` -Repo "git-for-windows/git" ` -Version "latest" ` -FileName (Split-Path $downloadUrl -Leaf) ` @@ -37,7 +37,7 @@ Update-Environment git config --system --add safe.directory "*" # Disable GCM machine-wide -[Environment]::SetEnvironmentVariable("GCM_INTERACTIVE", "Never", [System.EnvironmentVariableTarget]::Machine) +[Environment]::SetEnvironmentVariable("GCM_INTERACTIVE", "Never", "Machine") # Add to PATH Add-MachinePathItem "C:\Program Files\Git\bin" diff --git a/images/windows/scripts/build/Install-GitHub-CLI.ps1 b/images/windows/scripts/build/Install-GitHub-CLI.ps1 index d34412e35535..0d1d80fd587b 100644 --- a/images/windows/scripts/build/Install-GitHub-CLI.ps1 +++ b/images/windows/scripts/build/Install-GitHub-CLI.ps1 @@ -6,16 +6,22 @@ Write-Host "Get the latest gh version..." -$repoUrl = "https://api.github.com/repos/cli/cli/releases/latest" -$assets = (Invoke-RestMethod -Uri $repoUrl).assets -$downloadUrl = ($assets.browser_download_url -match "windows_amd64.msi") | Select-Object -First 1 +$downloadUrl = Resolve-GithubReleaseAssetUrl ` + -Repo "cli/cli" ` + -Version "latest" ` + -UrlMatchPattern "gh_*_windows_amd64.msi" -$hashUrl = ($assets.browser_download_url -match "checksums.txt") | Select-Object -First 1 -$externalHash = (Invoke-RestMethod -Uri $hashURL).ToString().Split("`n").Where({ $_ -ilike "*windows_amd64.msi*" }).Split(' ')[0] +$checksumsUrl = Resolve-GithubReleaseAssetUrl ` + -Repo "cli/cli" ` + -Version "latest" ` + -UrlMatchPattern "gh_*_checksums.txt" +$externalHash = Get-ChecksumFromUrl -Type "SHA256" ` + -Url $checksumsUrl ` + -FileName (Split-Path $downloadUrl -Leaf) Install-Binary ` - -Url $downloadUrl ` - -ExpectedSHA256Sum $externalHash + -Url $downloadUrl ` + -ExpectedSHA256Sum $externalHash Add-MachinePathItem "C:\Program Files (x86)\GitHub CLI" diff --git a/images/windows/scripts/build/Install-Haskell.ps1 b/images/windows/scripts/build/Install-Haskell.ps1 index ba0219be5346..583c89ebf6fd 100644 --- a/images/windows/scripts/build/Install-Haskell.ps1 +++ b/images/windows/scripts/build/Install-Haskell.ps1 @@ -22,9 +22,9 @@ New-Item -Path "$ghcupPrefix\ghcup" -ItemType 'directory' -ErrorAction SilentlyC New-Item -Path "$ghcupPrefix\ghcup\bin" -ItemType 'directory' -ErrorAction SilentlyContinue | Out-Null Invoke-DownloadWithRetry -Url $ghcupDownloadURL -Path "$ghcupPrefix\ghcup\bin\ghcup.exe" -[System.Environment]::SetEnvironmentVariable("GHCUP_INSTALL_BASE_PREFIX", $ghcupPrefix, "Machine") -[System.Environment]::SetEnvironmentVariable("GHCUP_MSYS2", $msysPath, "Machine") -[System.Environment]::SetEnvironmentVariable("CABAL_DIR", $cabalDir, "Machine") +[Environment]::SetEnvironmentVariable("GHCUP_INSTALL_BASE_PREFIX", $ghcupPrefix, "Machine") +[Environment]::SetEnvironmentVariable("GHCUP_MSYS2", $msysPath, "Machine") +[Environment]::SetEnvironmentVariable("CABAL_DIR", $cabalDir, "Machine") Add-MachinePathItem "$ghcupPrefix\ghcup\bin" Add-MachinePathItem "$cabalDir\bin" Update-Environment @@ -32,12 +32,11 @@ Update-Environment # Get 3 latest versions of GHC $Versions = ghcup list -t ghc -r | Where-Object {$_ -notlike "prerelease"} $VersionsOutput = [Version[]]($Versions | ForEach-Object{ $_.Split(' ')[1]; }) -$LatestMajorMinor = $VersionsOutput | Group-Object { $_.ToString(2) } | Sort-Object { [Version]$_.Name } | Select-Object -last 3 +$LatestMajorMinor = $VersionsOutput | Group-Object { $_.ToString(2) } | Sort-Object { [Version] $_.Name } | Select-Object -last 3 $VersionsList = $LatestMajorMinor | ForEach-Object { $_.Group | Select-Object -Last 1 } | Sort-Object # The latest version will be installed as a default -ForEach ($version in $VersionsList) -{ +foreach ($version in $VersionsList) { Write-Host "Installing ghc $version..." ghcup install ghc $version ghcup set ghc $version diff --git a/images/windows/scripts/build/Install-IEWebDriver.ps1 b/images/windows/scripts/build/Install-IEWebDriver.ps1 index 32dd00ccd5d8..1008f499ded8 100644 --- a/images/windows/scripts/build/Install-IEWebDriver.ps1 +++ b/images/windows/scripts/build/Install-IEWebDriver.ps1 @@ -15,7 +15,7 @@ $driverZipFile = Invoke-DownloadWithRetry $ieDriverUrl $ieDriverPath = "C:\SeleniumWebDrivers\IEDriver" if (-not (Test-Path -Path $ieDriverPath)) { - $null = New-Item -Path $ieDriverPath -ItemType Directory -Force + New-Item -Path $ieDriverPath -ItemType Directory -Force | Out-Null } Expand-7ZipArchive -Path $driverZipFile -DestinationPath $ieDriverPath diff --git a/images/windows/scripts/build/Install-JavaTools.ps1 b/images/windows/scripts/build/Install-JavaTools.ps1 index 1a9572876940..655e6ad072ca 100644 --- a/images/windows/scripts/build/Install-JavaTools.ps1 +++ b/images/windows/scripts/build/Install-JavaTools.ps1 @@ -39,7 +39,7 @@ function Set-JavaPath { $newPath = $javaPath + '\bin;' + $newPath Write-Host "Add $javaPath\bin to PATH" - [System.Environment]::SetEnvironmentVariable("PATH", $newPath, "Machine") + [Environment]::SetEnvironmentVariable("PATH", $newPath, "Machine") Write-Host "Set JAVA_HOME environmental variable as $javaPath" [Environment]::SetEnvironmentVariable("JAVA_HOME", $javaPath, "Machine") @@ -118,13 +118,13 @@ Install-ChocoPackage maven -ArgumentList "--version=$versionToInstall" Install-ChocoPackage gradle # Add maven env variables to Machine -[string] $m2 = ([Environment]::GetEnvironmentVariable("PATH", "Machine")).Split(";") -match "maven" +[string] $m2Path = ([Environment]::GetEnvironmentVariable("PATH", "Machine")).Split(";") -match "maven" -$m2_repo = 'C:\ProgramData\m2' -New-Item -Path $m2_repo -ItemType Directory -Force | Out-Null +$m2RepoPath = 'C:\ProgramData\m2' +New-Item -Path $m2RepoPath -ItemType Directory -Force | Out-Null -[Environment]::SetEnvironmentVariable("M2", $m2, "Machine") -[Environment]::SetEnvironmentVariable("M2_REPO", $m2_repo, "Machine") +[Environment]::SetEnvironmentVariable("M2", $m2Path, "Machine") +[Environment]::SetEnvironmentVariable("M2_REPO", $m2RepoPath, "Machine") [Environment]::SetEnvironmentVariable("MAVEN_OPTS", "-Xms256m", "Machine") # Download cobertura jars diff --git a/images/windows/scripts/build/Install-Kotlin.ps1 b/images/windows/scripts/build/Install-Kotlin.ps1 index 9ec8554089d3..09189134095a 100644 --- a/images/windows/scripts/build/Install-Kotlin.ps1 +++ b/images/windows/scripts/build/Install-Kotlin.ps1 @@ -14,7 +14,7 @@ $kotlinDownloadUrl = Resolve-GithubReleaseAssetUrl ` $kotlinArchivePath = Invoke-DownloadWithRetry $kotlinDownloadUrl #region Supply chain security -$externalHash = Get-GithubReleaseAssetHash ` +$externalHash = Get-ChecksumFromGithubRelease ` -Repo "JetBrains/kotlin" ` -Version "$kotlinVersion" ` -FileName (Split-Path $kotlinDownloadUrl -Leaf) ` diff --git a/images/windows/scripts/build/Install-KubernetesTools.ps1 b/images/windows/scripts/build/Install-KubernetesTools.ps1 index 529957f7adac..59c408706ba3 100644 --- a/images/windows/scripts/build/Install-KubernetesTools.ps1 +++ b/images/windows/scripts/build/Install-KubernetesTools.ps1 @@ -6,20 +6,24 @@ Write-Host "Install Kind" # Choco installation can't be used because it depends on docker-desktop -$repoUrl = 'https://api.github.com/repos/kubernetes-sigs/kind/releases/latest' -$assets = (Invoke-RestMethod -Uri $repoUrl).assets -[System.String] $kindDownloadLink = $assets.browser_download_url -match "kind-windows-amd64$" -$destFilePath = "C:\ProgramData\kind" -$null = New-Item -Path $destFilePath -ItemType Directory -Force -$packagePath = Invoke-DownloadWithRetry -Url $kindDownloadLink -Path "$destFilePath\kind.exe" + +$targetDir = "C:\ProgramData\kind" +New-Item -Path $targetDir -ItemType Directory -Force | Out-Null + +$downloadUrl = Resolve-GithubReleaseAssetUrl ` + -Repo "kubernetes-sigs/kind" ` + -Version "latest" ` + -UrlMatchPattern "kind-windows-amd64" +$packagePath = Invoke-DownloadWithRetry -Url $downloadUrl -Path "$targetDir\kind.exe" #region Supply chain security - Kind -$hashUrl = ($assets.browser_download_url -match "kind-windows-amd64.sha256sum") | Select-Object -First 1 -$externalHash = (Invoke-RestMethod -Uri $hashURL).ToString().Split("`n").Where({ $_ -ilike "*kind-windows-amd64*" }).Split(' ')[0] +$externalHash = Get-ChecksumFromUrl -Type "SHA256" ` + -Url "$downloadUrl.sha256sum" ` + -FileName (Split-Path $downloadUrl -Leaf) Test-FileChecksum $packagePath -ExpectedSHA256Sum $externalHash #endregion -Add-MachinePathItem $destFilePath +Add-MachinePathItem $targetDir Write-Host "Install Kubectl" Install-ChocoPackage kubernetes-cli diff --git a/images/windows/scripts/build/Install-Mingw64.ps1 b/images/windows/scripts/build/Install-Mingw64.ps1 index cbb9b29d3ded..2d5279b098cc 100644 --- a/images/windows/scripts/build/Install-Mingw64.ps1 +++ b/images/windows/scripts/build/Install-Mingw64.ps1 @@ -4,67 +4,67 @@ ################################################################################ if (Test-IsWin19) { - # If Windows 2019, install version 8.1.0 form sourceforge - $baseUrl = "https://sourceforge.net/projects/mingw-w64/files" + # If Windows 2019, install version 8.1.0 form sourceforge + $baseUrl = "https://sourceforge.net/projects/mingw-w64/files" - $("mingw32", "mingw64") | ForEach-Object { - if ($_ -eq "mingw32") { - $url = "$baseUrl/Toolchains%20targetting%20Win32/Personal%20Builds/mingw-builds/8.1.0/threads-posix/dwarf/i686-8.1.0-release-posix-dwarf-rt_v6-rev0.7z/download" - $sha256sum = 'adb84b70094c0225dd30187ff995e311d19424b1eb8f60934c60e4903297f946' - } elseif ($_ -eq "mingw64") { - $url = "$baseUrl/Toolchains%20targetting%20Win64/Personal%20Builds/mingw-builds/8.1.0/threads-posix/seh/x86_64-8.1.0-release-posix-seh-rt_v6-rev0.7z/download" - $sha256sum = '853970527b5de4a55ec8ca4d3fd732c00ae1c69974cc930c82604396d43e79f8' - } else { - throw "Unknown architecture $_" - } + $("mingw32", "mingw64") | ForEach-Object { + if ($_ -eq "mingw32") { + $url = "$baseUrl/Toolchains%20targetting%20Win32/Personal%20Builds/mingw-builds/8.1.0/threads-posix/dwarf/i686-8.1.0-release-posix-dwarf-rt_v6-rev0.7z/download" + $sha256sum = 'adb84b70094c0225dd30187ff995e311d19424b1eb8f60934c60e4903297f946' + } elseif ($_ -eq "mingw64") { + $url = "$baseUrl/Toolchains%20targetting%20Win64/Personal%20Builds/mingw-builds/8.1.0/threads-posix/seh/x86_64-8.1.0-release-posix-seh-rt_v6-rev0.7z/download" + $sha256sum = '853970527b5de4a55ec8ca4d3fd732c00ae1c69974cc930c82604396d43e79f8' + } else { + throw "Unknown architecture $_" + } + + $packagePath = Invoke-DownloadWithRetry $url + Test-FileChecksum -Path $packagePath -ExpectedSHA256Sum $sha256sum + Expand-7ZipArchive -Path $packagePath -DestinationPath "C:\" - $packagePath = Invoke-DownloadWithRetry $url - $hash = Get-FileHash -Path $packagePath -Algorithm SHA256 - if ($hash.Hash -ne $sha256sum) { - throw "Checksum verification failed for $packagePath" + # Make a copy of mingw-make.exe to make.exe, which is a more discoverable name + # and so the same command line can be used on Windows as on macOS and Linux + $path = "C:\$_\bin\mingw32-make.exe" | Get-Item + Copy-Item -Path $path -Destination (Join-Path $path.Directory 'make.exe') } - Expand-7ZipArchive -Path $packagePath -DestinationPath "C:\" + + Add-MachinePathItem "C:\mingw64\bin" - # Make a copy of mingw-make.exe to make.exe, which is a more discoverable name - # and so the same command line can be used on Windows as on macOS and Linux - $path = "C:\$_\bin\mingw32-make.exe" | Get-Item - Copy-Item -Path $path -Destination (Join-Path $path.Directory 'make.exe') - } - - Add-MachinePathItem "C:\mingw64\bin" +} -} else { - $version = (Get-ToolsetContent).mingw.version - $runtime = (Get-ToolsetContent).mingw.runtime +if (Test-IsWin22) { + # If Windows 2022, install version specified in the toolset + $version = (Get-ToolsetContent).mingw.version + $runtime = (Get-ToolsetContent).mingw.runtime - $("mingw32", "mingw64") | ForEach-Object { - if ($_ -eq "mingw32") { - $arch = "i686" - $threads = "posix" - $exceptions = "dwarf" - } elseif ($_ -eq "mingw64") { - $arch = "x86_64" - $threads = "posix" - $exceptions = "seh" - } else { - throw "Unknown architecture $_" - } + $("mingw32", "mingw64") | ForEach-Object { + if ($_ -eq "mingw32") { + $arch = "i686" + $threads = "posix" + $exceptions = "dwarf" + } elseif ($_ -eq "mingw64") { + $arch = "x86_64" + $threads = "posix" + $exceptions = "seh" + } else { + throw "Unknown architecture $_" + } - $url = Resolve-GithubReleaseAssetUrl ` - -Repo "niXman/mingw-builds-binaries" ` - -Version "$version" ` - -Asset "$arch-*-release-$threads-$exceptions-$runtime-*.7z" + $url = Resolve-GithubReleaseAssetUrl ` + -Repo "niXman/mingw-builds-binaries" ` + -Version "$version" ` + -Asset "$arch-*-release-$threads-$exceptions-$runtime-*.7z" - $packagePath = Invoke-DownloadWithRetry $url - Expand-7ZipArchive -Path $packagePath -DestinationPath "C:\" + $packagePath = Invoke-DownloadWithRetry $url + Expand-7ZipArchive -Path $packagePath -DestinationPath "C:\" - # Make a copy of mingw-make.exe to make.exe, which is a more discoverable name - # and so the same command line can be used on Windows as on macOS and Linux - $path = "C:\$_\bin\mingw32-make.exe" | Get-Item - Copy-Item -Path $path -Destination (Join-Path $path.Directory 'make.exe') - } + # Make a copy of mingw-make.exe to make.exe, which is a more discoverable name + # and so the same command line can be used on Windows as on macOS and Linux + $path = "C:\$_\bin\mingw32-make.exe" | Get-Item + Copy-Item -Path $path -Destination (Join-Path $path.Directory 'make.exe') + } - Add-MachinePathItem "C:\mingw64\bin" + Add-MachinePathItem "C:\mingw64\bin" } Invoke-PesterTests -TestFile "Tools" -TestName "Mingw64" diff --git a/images/windows/scripts/build/Install-Miniconda.ps1 b/images/windows/scripts/build/Install-Miniconda.ps1 index c628675ccb36..50382efd3a11 100644 --- a/images/windows/scripts/build/Install-Miniconda.ps1 +++ b/images/windows/scripts/build/Install-Miniconda.ps1 @@ -27,6 +27,6 @@ Install-Binary ` -InstallArgs @("/S", "/AddToPath=0", "/RegisterPython=0", "/D=$CondaDestination") ` -ExpectedSHA256Sum $distributorFileHash -[System.Environment]::SetEnvironmentVariable("CONDA", $CondaDestination, "Machine") +[Environment]::SetEnvironmentVariable("CONDA", $CondaDestination, "Machine") Invoke-PesterTests -TestFile "Miniconda" diff --git a/images/windows/scripts/build/Install-MongoDB.ps1 b/images/windows/scripts/build/Install-MongoDB.ps1 index da080a58b238..e9725715250b 100644 --- a/images/windows/scripts/build/Install-MongoDB.ps1 +++ b/images/windows/scripts/build/Install-MongoDB.ps1 @@ -6,24 +6,24 @@ # Install mongodb package $toolsetVersion = (Get-ToolsetContent).mongodb.version -$getMongoReleases = Invoke-WebRequest -Uri "mongodb.com/docs/manual/release-notes/$toolsetVersion/" -UseBasicParsing +$getMongoReleases = Invoke-WebRequest -Uri "mongodb.com/docs/manual/release-notes/$toolsetVersion/" -UseBasicParsing $TargetReleases = $getMongoReleases.Links.href | Where-Object {$_ -like "#$toolsetVersion*---*"} $MinorVersions = @() foreach ($release in $TargetReleases) { if ($release -notlike "*upcoming*") { - $pattern = '\d+\.\d+\.\d+' - $version = $release | Select-String -Pattern $pattern -AllMatches | ForEach-Object { $_.Matches } | ForEach-Object { $_.Value } - $MinorVersions += $version + $pattern = '\d+\.\d+\.\d+' + $version = $release | Select-String -Pattern $pattern -AllMatches | ForEach-Object { $_.Matches } | ForEach-Object { $_.Value } + $MinorVersions += $version } - } +} $LatestVersion = $MinorVersions[0] Install-Binary ` - -Url "https://fastdl.mongodb.org/windows/mongodb-windows-x86_64-$LatestVersion-signed.msi" ` - -ExtraInstallArgs @('TARGETDIR=C:\PROGRA~1\MongoDB ADDLOCAL=ALL') ` - -ExpectedSignature (Get-ToolsetContent).mongodb.signature + -Url "https://fastdl.mongodb.org/windows/mongodb-windows-x86_64-$LatestVersion-signed.msi" ` + -ExtraInstallArgs @('TARGETDIR=C:\PROGRA~1\MongoDB ADDLOCAL=ALL') ` + -ExpectedSignature (Get-ToolsetContent).mongodb.signature # Add mongodb to the PATH $mongoPath = (Get-CimInstance Win32_Service -Filter "Name LIKE 'mongodb'").PathName diff --git a/images/windows/scripts/build/Install-Msys2.ps1 b/images/windows/scripts/build/Install-Msys2.ps1 index 45e0793f13af..5b167e40d7c6 100644 --- a/images/windows/scripts/build/Install-Msys2.ps1 +++ b/images/windows/scripts/build/Install-Msys2.ps1 @@ -11,25 +11,27 @@ $dash = "-" * 40 $origPath = $env:PATH function Install-Msys2 { - $msys2_release = "https://api.github.com/repos/msys2/msys2-installer/releases/latest" - $assets = (Invoke-RestMethod -Uri $msys2_release).assets - $msys2Uri = ($assets | Where-Object { $_.name -match "^msys2-x86_64" -and $_.name.EndsWith(".exe") }).browser_download_url + # We can't use Resolve-GithubReleaseAssetUrl function here + # because msys2-installer releases don't have a consistent versioning scheme + + $assets = (Invoke-RestMethod -Uri "https://api.github.com/repos/msys2/msys2-installer/releases/latest").assets + $downloadUri = ($assets | Where-Object { $_.name -match "^msys2-x86_64" -and $_.name.EndsWith(".exe") }).browser_download_url + $installerName = Split-Path $downloadUri -Leaf # Download the latest msys2 x86_64, filename includes release date - Write-Host "Starting msys2 download using $($msys2Uri.split('/')[-1])" - $msys2File = Invoke-DownloadWithRetry $msys2Uri - Write-Host "Finished download" - - #region Supply chain security - Kind - $hashUrl = ($assets.browser_download_url -match "msys2-checksums.txt") | Select-Object -First 1 - $externalHash = (Invoke-RestMethod -Uri $hashURL).ToString().Split("`n").Where({ $_ -ilike "*msys2-x86_64*" }).Split(' ')[0] - Test-FileChecksum $msys2File -ExpectedSHA256Sum $externalHash + Write-Host "Download msys2 installer $installerName" + $installerPath = Invoke-DownloadWithRetry $downloadUri + + #region Supply chain security - MSYS2 + $externalHash = Get-ChecksumFromUrl -Type "SHA256" ` + -Url ($downloadUri -replace $installerName, "msys2-checksums.txt") ` + -FileName $installerName + Test-FileChecksum $installerPath -ExpectedSHA256Sum $externalHash #endregion - # extract tar.xz to C:\ Write-Host "Starting msys2 installation" - & $msys2File in --confirm-command --accept-messages --root C:/msys64 - Remove-Item $msys2File + & $installerPath in --confirm-command --accept-messages --root C:/msys64 + Remove-Item $installerPath } function Install-Msys2Packages($Packages) { diff --git a/images/windows/scripts/build/Install-MysqlCli.ps1 b/images/windows/scripts/build/Install-MysqlCli.ps1 index 7ca934dca58f..e04f12399f54 100644 --- a/images/windows/scripts/build/Install-MysqlCli.ps1 +++ b/images/windows/scripts/build/Install-MysqlCli.ps1 @@ -10,12 +10,14 @@ Install-Binary ` -ExpectedSignature '3BDA323E552DB1FDE5F4FBEE75D6D5B2B187EEDC' # Downloading mysql -[version]$MysqlVersion = (Get-ToolsetContent).mysql.version +[version] $MysqlVersion = (Get-ToolsetContent).mysql.version $MysqlVersionMajorMinor = $MysqlVersion.ToString(2) if ($MysqlVersion.Build -lt 0) { - $MysqlVersion = (Invoke-RestMethod -Uri "https://dev.mysql.com/downloads/mysql/${MysqlVersionMajorMinor}.html" -Headers @{ 'User-Agent' = 'curl/8.4.0' } | - Select-String -Pattern "${MysqlVersionMajorMinor}\.\d+").Matches.Value + $downloadsPageUrl = "https://dev.mysql.com/downloads/mysql/${MysqlVersionMajorMinor}.html" + $MysqlVersion = Invoke-RestMethod -Uri $downloadsPageUrl -Headers @{ 'User-Agent' = 'curl/8.4.0' } ` + | Select-String -Pattern "${MysqlVersionMajorMinor}\.\d+" ` + | ForEach-Object { $_.Matches.Value } } $MysqlVersionFull = $MysqlVersion.ToString() diff --git a/images/windows/scripts/build/Install-Pipx.ps1 b/images/windows/scripts/build/Install-Pipx.ps1 index fb86d71665e6..64018fbb9b39 100644 --- a/images/windows/scripts/build/Install-Pipx.ps1 +++ b/images/windows/scripts/build/Install-Pipx.ps1 @@ -10,8 +10,8 @@ $env:PIPX_HOME = "${env:ProgramFiles(x86)}\pipx" pip install pipx Add-MachinePathItem "${env:PIPX_BIN_DIR}" -[System.Environment]::SetEnvironmentVariable("PIPX_BIN_DIR", $env:PIPX_BIN_DIR, "Machine") -[System.Environment]::SetEnvironmentVariable("PIPX_HOME", $env:PIPX_HOME, "Machine") +[Environment]::SetEnvironmentVariable("PIPX_BIN_DIR", $env:PIPX_BIN_DIR, "Machine") +[Environment]::SetEnvironmentVariable("PIPX_HOME", $env:PIPX_HOME, "Machine") Invoke-PesterTests -TestFile "Tools" -TestName "Pipx" diff --git a/images/windows/scripts/build/Install-PostgreSQL.ps1 b/images/windows/scripts/build/Install-PostgreSQL.ps1 index 94ca97036764..e9223fae92af 100644 --- a/images/windows/scripts/build/Install-PostgreSQL.ps1 +++ b/images/windows/scripts/build/Install-PostgreSQL.ps1 @@ -3,20 +3,20 @@ $pgUser = "postgres" $pgPwd = "root" # Prepare environment variable for validation -[System.Environment]::SetEnvironmentVariable("PGUSER", $pgUser, "Machine") -[System.Environment]::SetEnvironmentVariable("PGPASSWORD", $pgPwd, "Machine") +[Environment]::SetEnvironmentVariable("PGUSER", $pgUser, "Machine") +[Environment]::SetEnvironmentVariable("PGPASSWORD", $pgPwd, "Machine") # Define latest available version to install based on version specified in the toolset $toolsetVersion = (Get-ToolsetContent).postgresql.version $getPostgreReleases = Invoke-WebRequest -Uri "https://git.postgresql.org/gitweb/?p=postgresql.git;a=tags" -UseBasicParsing # Getting all links matched to the pattern (e.g.a=log;h=refs/tags/REL_14) $TargetReleases = $getPostgreReleases.Links.href | Where-Object { $_ -match "a=log;h=refs/tags/REL_$toolsetVersion" } -[Int32]$OutNumber = $null +[Int32] $OutNumber = $null $MinorVersions = @() foreach ($release in $TargetReleases) { $version = $release.split('/')[-1] # Checking if the latest symbol of the release version is actually a number. If yes, add to $MinorVersions array - if ([Int32]::TryParse($($version.Split('_')[-1]), [ref]$OutNumber)) { + if ([Int32]::TryParse($($version.Split('_')[-1]), [ref] $OutNumber)) { $MinorVersions += $OutNumber } } @@ -72,9 +72,9 @@ if ($exitCode -ne 0) { } # Added PostgreSQL environment variable -[System.Environment]::SetEnvironmentVariable("PGBIN", $pgBin, "Machine") -[System.Environment]::SetEnvironmentVariable("PGROOT", $pgRoot, "Machine") -[System.Environment]::SetEnvironmentVariable("PGDATA", $pgData, "Machine") +[Environment]::SetEnvironmentVariable("PGBIN", $pgBin, "Machine") +[Environment]::SetEnvironmentVariable("PGROOT", $pgRoot, "Machine") +[Environment]::SetEnvironmentVariable("PGDATA", $pgData, "Machine") # Stop and disable PostgreSQL service $pgService = Get-Service -Name postgresql* diff --git a/images/windows/scripts/build/Install-PowerShellModules.ps1 b/images/windows/scripts/build/Install-PowerShellModules.ps1 index 130c63db6cfc..2017e9869893 100644 --- a/images/windows/scripts/build/Install-PowerShellModules.ps1 +++ b/images/windows/scripts/build/Install-PowerShellModules.ps1 @@ -9,22 +9,18 @@ # Install PowerShell modules $modules = (Get-ToolsetContent).powershellModules -foreach($module in $modules) -{ +foreach ($module in $modules) { $moduleName = $module.name Write-Host "Installing ${moduleName} module" - if ($module.versions) - { - foreach ($version in $module.versions) - { + if ($module.versions) { + foreach ($version in $module.versions) { Write-Host " - $version" Install-Module -Name $moduleName -RequiredVersion $version -Scope AllUsers -SkipPublisherCheck -Force } - continue + } else { + Install-Module -Name $moduleName -Scope AllUsers -SkipPublisherCheck -Force } - - Install-Module -Name $moduleName -Scope AllUsers -SkipPublisherCheck -Force } Import-Module Pester diff --git a/images/windows/scripts/build/Install-PowershellCore.ps1 b/images/windows/scripts/build/Install-PowershellCore.ps1 index e168a998fba1..d56c9bf30b9b 100644 --- a/images/windows/scripts/build/Install-PowershellCore.ps1 +++ b/images/windows/scripts/build/Install-PowershellCore.ps1 @@ -16,10 +16,11 @@ try { $release = $metadata.LTSReleaseTag[0] -replace '^v' $downloadUrl = "https://github.com/PowerShell/PowerShell/releases/download/v${release}/PowerShell-${release}-win-x64.msi" - $hashUrl = "https://github.com/PowerShell/PowerShell/releases/download/v${release}/hashes.sha256" - $expectedSHA256Sum = (Invoke-RestMethod -Uri $hashURL).ToString().Split("`n").Where({ $_ -ilike "*PowerShell-${Release}-win-x64.msi*" }).Split(' ')[0] - - Install-Binary -Url $downloadUrl -ExpectedSHA256Sum $expectedSHA256Sum + $installerName = Split-Path $downloadUrl -Leaf + $externalHash = Get-ChecksumFromUrl -Type "SHA256" ` + -Url ($downloadUrl -replace $installerName, "hashes.sha256") ` + -FileName $installerName + Install-Binary -Url $downloadUrl -ExpectedSHA256Sum $externalHash } finally { # Restore original value [Net.ServicePointManager]::SecurityProtocol = $originalValue @@ -30,6 +31,6 @@ try { # While the update check happens during the first session in a given 24-hour period, for performance reasons, # the notification will only be shown on the start of subsequent sessions. # Also for performance reasons, the check will not start until at least 3 seconds after the session begins. -[System.Environment]::SetEnvironmentVariable("POWERSHELL_UPDATECHECK", "Off", [System.EnvironmentVariableTarget]::Machine) +[Environment]::SetEnvironmentVariable("POWERSHELL_UPDATECHECK", "Off", "Machine") Invoke-PesterTests -TestFile "Tools" -TestName "PowerShell Core" diff --git a/images/windows/scripts/build/Install-RootCA.ps1 b/images/windows/scripts/build/Install-RootCA.ps1 index 5b618b450b0b..d536fe9e8449 100644 --- a/images/windows/scripts/build/Install-RootCA.ps1 +++ b/images/windows/scripts/build/Install-RootCA.ps1 @@ -33,7 +33,7 @@ function Get-CertificatesWithoutPropId { $certs | ForEach-Object -Process { $certHandle = $_.Handle $isPropertySet = [PKI.Cert]::CertGetCertificateContextProperty( - $certHandle, $CERT_NOT_BEFORE_FILETIME_PROP_ID, $null, [ref]$null + $certHandle, $CERT_NOT_BEFORE_FILETIME_PROP_ID, $null, [ref] $null ) if (-not $isPropertySet) { Write-Host "Subject: $($_.Subject)" @@ -43,31 +43,17 @@ function Get-CertificatesWithoutPropId { $certsWithoutPropId } -function Invoke-WithRetry { - <# - .SYNOPSIS - Runs $command block until $BreakCondition or $RetryCount is reached. - #> - - param([ScriptBlock]$Command, [ScriptBlock] $BreakCondition, [int] $RetryCount=5, [int] $Sleep=10) - - $c = 0 - while($c -lt $RetryCount){ - $result = & $Command - if(& $BreakCondition){ - break - } - Start-Sleep $Sleep - $c++ - } - $result -} - function Import-SSTFromWU { # Serialized Certificate Store File $sstFile = "$env:TEMP\roots.sst" # Generate SST from Windows Update - $result = Invoke-WithRetry { certutil.exe -generateSSTFromWU $sstFile } {$LASTEXITCODE -eq 0} + $result = Invoke-ScriptBlockWithRetry -RetryCount 5 -RetryIntervalSeconds 10 -Command { + $r = certutil.exe -generateSSTFromWU $sstFile + if ($LASTEXITCODE -ne 0) { + throw "failed to generate $sstFile sst file`n$o" + } + return $r + } if ($LASTEXITCODE -ne 0) { Write-Host "[Error]: failed to generate $sstFile sst file`n$result" exit $LASTEXITCODE @@ -88,7 +74,9 @@ function Import-SSTFromWU { } function Clear-CertificatesPropId { - param([hashtable]$CertsWithoutPropId) + param( + [hashtable] $CertsWithoutPropId + ) # List installed certificates $certs = Get-ChildItem -Path Cert:\LocalMachine\Root diff --git a/images/windows/scripts/build/Install-Ruby.ps1 b/images/windows/scripts/build/Install-Ruby.ps1 index dc49875fc839..01bd525bb135 100644 --- a/images/windows/scripts/build/Install-Ruby.ps1 +++ b/images/windows/scripts/build/Install-Ruby.ps1 @@ -3,39 +3,12 @@ ## Desc: Install Ruby using the RubyInstaller2 package and set the default Ruby version ################################################################################ -function Get-RubyVersions { - param ( - [System.String] $Arch = "x64", - [System.String] $Extension = "7z", - [System.String] $ReleasesAmount = "50" - ) - - $uri = "https://api.github.com/repos/oneclick/rubyinstaller2/releases?per_page=$ReleasesAmount" - try { - $versionLists = @{} - $assets = (Invoke-RestMethod -Uri $uri).Where{ -not $_.prerelease }.assets - $7zArchives = $assets.Where{ $_.name.EndsWith("$Arch.$Extension") } - $majorMinorGroups = $7zArchives | Group-Object { $_.name.Replace("rubyinstaller-", "").Substring(0, 3) } - foreach ($majorMinorGroup in $majorMinorGroups) { - $group = $majorMinorGroup.Group - $sortVersions = $group | Sort-Object { [Version]$_.name.Replace("rubyinstaller-", "").Replace("-$Arch.$Extension", "").Replace("-", ".") } - $latestVersion = $sortVersions | Select-Object -Last 1 - $versionLists[$majorMinorGroup.Name] = $latestVersion.browser_download_url - - } - return $versionLists - } catch { - Write-Host "Unable to send request to the '$uri'. Error: '$_'" - exit 1 - } -} - # Most of this logic is from # https://github.com/ruby/setup-ruby/blob/master/windows.js function Install-Ruby { param( - [String]$PackagePath, - [String]$Architecture = "x64" + [String] $PackagePath, + [String] $Architecture = "x64" ) # Create Ruby toolcache folder @@ -44,47 +17,46 @@ function Install-Ruby { Write-Host "Creating Ruby toolcache folder" New-Item -ItemType Directory -Path $rubyToolcachePath | Out-Null } - - # Expand archive with binaries + $packageName = [IO.Path]::GetFileNameWithoutExtension((Split-Path -Path $PackagePath -Leaf)) + Write-Host "Expanding Ruby archive $packageName" $tempFolder = Join-Path -Path $rubyToolcachePath -ChildPath $packageName Expand-7ZipArchive -Path $PackagePath -DestinationPath $rubyToolcachePath # Get Ruby version from binaries $rubyVersion = & "$tempFolder\bin\ruby.exe" -e "print RUBY_VERSION" + if (($LASTEXITCODE -ne 0) -or (-not $rubyVersion)) { + throw "Unable to determine Ruby version. Exit code: $LASTEXITCODE, output: '$rubyVersion'" + } + Write-Host "Ruby version is $rubyVersion" - if ($rubyVersion) { - Write-Host "Installing Ruby $rubyVersion" - $rubyVersionPath = Join-Path -Path $rubyToolcachePath -ChildPath $rubyVersion - $rubyArchPath = Join-Path -Path $rubyVersionPath -ChildPath $Architecture + $rubyVersionPath = Join-Path -Path $rubyToolcachePath -ChildPath $rubyVersion + $rubyArchPath = Join-Path -Path $rubyVersionPath -ChildPath $Architecture - Write-Host "Creating Ruby '${rubyVersion}' folder in '${rubyVersionPath}'" - New-Item -ItemType Directory -Path $rubyVersionPath -Force | Out-Null + Write-Host "Creating Ruby '${rubyVersion}' folder in '${rubyVersionPath}'" + New-Item -ItemType Directory -Path $rubyVersionPath -Force | Out-Null - Write-Host "Moving Ruby '${rubyVersion}' files to '${rubyArchPath}'" - Invoke-ScriptBlockWithRetry -Command { - Move-Item -Path $tempFolder -Destination $rubyArchPath -ErrorAction Stop | Out-Null - } + Write-Host "Moving Ruby '${rubyVersion}' files to '${rubyArchPath}'" + Invoke-ScriptBlockWithRetry -Command { + Move-Item -Path $tempFolder -Destination $rubyArchPath -ErrorAction Stop | Out-Null + } - Write-Host "Removing Ruby '${rubyVersion}' documentation '${rubyArchPath}\share\doc' folder" - Remove-Item -Path "${rubyArchPath}\share\doc" -Force -Recurse -ErrorAction Ignore + Write-Host "Removing Ruby '${rubyVersion}' documentation '${rubyArchPath}\share\doc' folder" + Remove-Item -Path "${rubyArchPath}\share\doc" -Force -Recurse -ErrorAction Ignore - Write-Host "Creating complete file" - New-Item -ItemType File -Path $rubyVersionPath -Name "$Architecture.complete" | Out-Null - } else { - Write-Host "Ruby application is not found. Failed to expand '$PackagePath' archive" - exit 1 - } + Write-Host "Creating complete file for Ruby $rubyVersion $Architecture" + New-Item -ItemType File -Path $rubyVersionPath -Name "$Architecture.complete" | Out-Null } function Set-DefaultRubyVersion { param( [Parameter(Mandatory = $true)] - [System.Version] $Version, - [System.String] $Arch = "x64" + [version] $Version, + [Alias("Arch")] + [string] $Architecture = "x64" ) - $rubyPath = Join-Path $env:AGENT_TOOLSDIRECTORY "/Ruby/${Version}*/${Arch}/bin" + $rubyPath = Join-Path $env:AGENT_TOOLSDIRECTORY "/Ruby/${Version}*/${Architecture}/bin" $rubyDir = (Get-Item -Path $rubyPath).FullName Write-Host "Use Ruby ${Version} as a system Ruby" @@ -95,21 +67,15 @@ function Set-DefaultRubyVersion { $rubyTools = (Get-ToolsetContent).toolcache | Where-Object { $_.name -eq "Ruby" } $rubyToolVersions = $rubyTools.versions -# Get Ruby versions from the repo -$rubyLatestMajorVersions = Get-RubyVersions - Write-Host "Starting installation Ruby..." foreach ($rubyVersion in $rubyToolVersions) { Write-Host "Starting Ruby $rubyVersion installation" - # Get url for the latest major Ruby version - $url = $rubyLatestMajorVersions[$rubyVersion] - if ($url) { - $tempRubyPackagePath = Invoke-DownloadWithRetry $url - Install-Ruby -PackagePath $tempRubyPackagePath - } else { - Write-Host "Url not found for the '$rubyVersion' version" - exit 1 - } + $downloadUrl = Resolve-GithubReleaseAssetUrl ` + -Repo "oneclick/rubyinstaller2" ` + -Version "$rubyVersion*" ` + -UrlMatchPattern "*-x64.7z" + $packagePath = Invoke-DownloadWithRetry $downloadUrl + Install-Ruby -PackagePath $packagePath } Set-DefaultRubyVersion -Version $rubyTools.default -Arch $rubyTools.arch diff --git a/images/windows/scripts/build/Install-Runner.ps1 b/images/windows/scripts/build/Install-Runner.ps1 index e3f42cdfc071..dc7a6f7f3d7e 100644 --- a/images/windows/scripts/build/Install-Runner.ps1 +++ b/images/windows/scripts/build/Install-Runner.ps1 @@ -5,10 +5,11 @@ ################################################################################ Write-Host "Download latest Runner for GitHub Actions" -$release = Invoke-RestMethod -Uri "https://api.github.com/repos/actions/runner/releases/latest" -$version = $release.tag_name.Trim("v") -$downloadUrl = ($release.assets.browser_download_url -ilike "*actions-runner-win-x64-${version}.zip*") | Select-Object -First 1 -$fileName = [System.IO.Path]::GetFileName($downloadUrl) +$downloadUrl = Resolve-GithubReleaseAssetUrl ` + -Repo "actions/runner" ` + -Version "latest" ` + -UrlMatchPattern "actions-runner-win-x64-*[0-9.].zip" +$fileName = Split-Path $downloadUrl -Leaf New-Item -Path "C:\ProgramData\runner" -ItemType Directory Invoke-DownloadWithRetry -Url $downloadUrl -Path "C:\ProgramData\runner\$fileName" diff --git a/images/windows/scripts/build/Install-Rust.ps1 b/images/windows/scripts/build/Install-Rust.ps1 index e8d19f4061bd..b254f9a0727e 100644 --- a/images/windows/scripts/build/Install-Rust.ps1 +++ b/images/windows/scripts/build/Install-Rust.ps1 @@ -14,7 +14,7 @@ $rustupPath = Invoke-DownloadWithRetry "https://static.rust-lang.org/rustup/dist #region Supply chain security $distributorFileHash = (Invoke-RestMethod -Uri 'https://static.rust-lang.org/rustup/dist/x86_64-pc-windows-msvc/rustup-init.exe.sha256').Trim() -Test-FileChecksum (Join-Path ${env:TEMP} 'rustup-init.exe') -ExpectedSHA256Sum $distributorFileHash +Test-FileChecksum $rustupPath -ExpectedSHA256Sum $distributorFileHash #endregion # Install Rust by running rustup-init.exe (disabling the confirmation prompt with -y) diff --git a/images/windows/scripts/build/Install-SQLPowerShellTools.ps1 b/images/windows/scripts/build/Install-SQLPowerShellTools.ps1 index a12c86ffe00e..40b407338442 100644 --- a/images/windows/scripts/build/Install-SQLPowerShellTools.ps1 +++ b/images/windows/scripts/build/Install-SQLPowerShellTools.ps1 @@ -8,13 +8,13 @@ $signatureThumbrint = "9ACA9419E53D3C9E56396DD2335FF683A8B0B8F3" # install required MSIs Install-Binary ` - -Url "${baseUrl}/SQLSysClrTypes.msi" ` - -ExpectedSignature $signatureThumbrint + -Url "${baseUrl}/SQLSysClrTypes.msi" ` + -ExpectedSignature $signatureThumbrint Install-Binary ` - -Url "${baseUrl}/SharedManagementObjects.msi" ` - -ExpectedSignature $signatureThumbrint + -Url "${baseUrl}/SharedManagementObjects.msi" ` + -ExpectedSignature $signatureThumbrint Install-Binary ` - -Url "${baseUrl}/PowerShellTools.msi" ` - -ExpectedSignature $signatureThumbrint + -Url "${baseUrl}/PowerShellTools.msi" ` + -ExpectedSignature $signatureThumbrint diff --git a/images/windows/scripts/build/Install-ServiceFabricSDK.ps1 b/images/windows/scripts/build/Install-ServiceFabricSDK.ps1 index 18cb6461d46a..4d623618134f 100644 --- a/images/windows/scripts/build/Install-ServiceFabricSDK.ps1 +++ b/images/windows/scripts/build/Install-ServiceFabricSDK.ps1 @@ -14,13 +14,13 @@ $urlBase = "https://download.microsoft.com/download/b/8/a/b8a2fb98-0ec1-41e5-be9 # Install Service Fabric Runtime for Windows Install-Binary ` - -Url "${urlBase}/MicrosoftServiceFabric.${runtimeVersion}.exe" ` - -InstallArgs @("/accepteula ", "/quiet", "/force") ` - -ExpectedSignature (Get-ToolsetContent).serviceFabric.runtime.signature + -Url "${urlBase}/MicrosoftServiceFabric.${runtimeVersion}.exe" ` + -InstallArgs @("/accepteula ", "/quiet", "/force") ` + -ExpectedSignature (Get-ToolsetContent).serviceFabric.runtime.signature # Install Service Fabric SDK Install-Binary ` - -Url "${urlBase}/MicrosoftServiceFabricSDK.${sdkVersion}.msi" ` - -ExpectedSignature (Get-ToolsetContent).serviceFabric.sdk.signature + -Url "${urlBase}/MicrosoftServiceFabricSDK.${sdkVersion}.msi" ` + -ExpectedSignature (Get-ToolsetContent).serviceFabric.sdk.signature Invoke-PesterTests -TestFile "Tools" -TestName "ServiceFabricSDK" diff --git a/images/windows/scripts/build/Install-Stack.ps1 b/images/windows/scripts/build/Install-Stack.ps1 index 5c5180407f52..3e4ad3fc9e63 100644 --- a/images/windows/scripts/build/Install-Stack.ps1 +++ b/images/windows/scripts/build/Install-Stack.ps1 @@ -5,19 +5,23 @@ ################################################################################ Write-Host "Get the latest Stack version..." -$StackReleasesJson = Invoke-RestMethod "https://api.github.com/repos/commercialhaskell/stack/releases/latest" -$Version = $StackReleasesJson.name.TrimStart("v") -$DownloadFilePattern = "windows-x86_64.zip" -$DownloadUrl = $StackReleasesJson.assets | Where-Object { $_.name.EndsWith($DownloadFilePattern) } | Select-Object -ExpandProperty "browser_download_url" -First 1 + +$version = (Get-GithubReleasesByVersion -Repo "commercialhaskell/stack" -Version "latest" -WithAssetsOnly).version + +$downloadUrl = Resolve-GithubReleaseAssetUrl ` + -Repo "commercialhaskell/stack" ` + -Version $version ` + -UrlMatchPattern "stack-*-windows-x86_64.zip" Write-Host "Download stack archive" -$StackToolcachePath = Join-Path $Env:AGENT_TOOLSDIRECTORY "stack\$Version" +$StackToolcachePath = Join-Path $Env:AGENT_TOOLSDIRECTORY "stack\$version" $DestinationPath = Join-Path $StackToolcachePath "x64" -$StackArchivePath = Invoke-DownloadWithRetry $DownloadUrl +$StackArchivePath = Invoke-DownloadWithRetry $downloadUrl #region Supply chain security - Stack -$hashUrl = $StackReleasesJson.assets | Where-Object { $_.name.EndsWith("$DownloadFilePattern.sha256") } | Select-Object -ExpandProperty "browser_download_url" -First 1 -$externalHash = (Invoke-RestMethod -Uri $hashURL).ToString().Split("`n").Where({ $_ -ilike "*$DownloadFilePattern*" }).Split(' ')[0] +$externalHash = Get-ChecksumFromUrl -Type "SHA256" ` + -Url "$downloadUrl.sha256" ` + -FileName (Split-Path $downloadUrl -Leaf) Test-FileChecksum $StackArchivePath -ExpectedSHA256Sum $externalHash #endregion diff --git a/images/windows/scripts/build/Install-Toolset.ps1 b/images/windows/scripts/build/Install-Toolset.ps1 index 19c1f8b4f3cc..7993b0976e5e 100644 --- a/images/windows/scripts/build/Install-Toolset.ps1 +++ b/images/windows/scripts/build/Install-Toolset.ps1 @@ -51,12 +51,11 @@ foreach ($tool in $tools) { | Where-Object { ($_.platform -eq $tool.platform) -and ($_.arch -eq $tool.arch) -and ($_.toolset -eq $tool.toolset) } ` | Select-Object -First 1 - Write-Host "Installing $($tool.name) $toolVersion $($tool.arch)..." - if ($null -ne $asset) { - Install-Asset -ReleaseAsset $asset - } else { - Write-Host "Asset was not found in versions manifest" - exit 1 + if (-not $asset) { + throw "Asset for $($tool.name) $toolVersion $($tool.arch) not found in versions manifest" } + + Write-Host "Installing $($tool.name) $toolVersion $($tool.arch)..." + Install-Asset -ReleaseAsset $asset } } diff --git a/images/windows/scripts/build/Install-VCRedist.ps1 b/images/windows/scripts/build/Install-VCRedist.ps1 index fea415cf724b..d6aa737ed637 100644 --- a/images/windows/scripts/build/Install-VCRedist.ps1 +++ b/images/windows/scripts/build/Install-VCRedist.ps1 @@ -8,13 +8,13 @@ $argumentList = ("/install", "/quiet", "/norestart") $signatureThumbrint = "ABDCA79AF9DD48A0EA702AD45260B3C03093FB4B" Install-Binary ` - -Url "${baseUrl}/vcredist_x86.exe" ` - -InstallArgs $argumentList ` - -ExpectedSignature $signatureThumbrint + -Url "${baseUrl}/vcredist_x86.exe" ` + -InstallArgs $argumentList ` + -ExpectedSignature $signatureThumbrint Install-Binary ` - -Url "${baseUrl}/vcredist_x64.exe" ` - -InstallArgs $argumentList ` - -ExpectedSignature $signatureThumbrint + -Url "${baseUrl}/vcredist_x64.exe" ` + -InstallArgs $argumentList ` + -ExpectedSignature $signatureThumbrint Invoke-PesterTests -TestFile "Tools" -TestName "VCRedist" diff --git a/images/windows/scripts/build/Install-VisualStudio.ps1 b/images/windows/scripts/build/Install-VisualStudio.ps1 index 148e6f84de95..73b97ddf7172 100644 --- a/images/windows/scripts/build/Install-VisualStudio.ps1 +++ b/images/windows/scripts/build/Install-VisualStudio.ps1 @@ -3,16 +3,16 @@ ## Desc: Install Visual Studio ################################################################################ -$toolset = Get-ToolsetContent +$vsToolset = (Get-ToolsetContent).visualStudio # Install VS Install-VisualStudio ` - -Version $toolset.visualStudio.subversion ` - -Edition $toolset.visualStudio.edition ` - -Channel $toolset.visualStudio.channel ` - -RequiredComponents $toolset.visualStudio.workloads ` + -Version $vsToolset.subversion ` + -Edition $vsToolset.edition ` + -Channel $vsToolset.channel ` + -RequiredComponents $vsToolset.workloads ` -ExtraArgs "--allWorkloads --includeRecommended --remove Component.CPython3.x64" ` - -SignatureThumbprint $toolset.visualStudio.signature + -SignatureThumbprint $vsToolset.signature # Find the version of VS installed for this instance # Only supports a single instance @@ -20,8 +20,7 @@ $vsProgramData = Get-Item -Path "C:\ProgramData\Microsoft\VisualStudio\Packages\ $instanceFolders = Get-ChildItem -Path $vsProgramData.FullName if ($instanceFolders -is [array]) { - Write-Host "More than one instance installed" - exit 1 + throw "More than one instance installed" } # Updating content of MachineState.json file to disable autoupdate of VSIX extensions @@ -35,7 +34,7 @@ if (Test-IsWin19) { -Url 'https://go.microsoft.com/fwlink/p/?LinkId=838916' ` -InstallArgs @("/q", "/norestart", "/ceip off", "/features OptionId.WindowsSoftwareDevelopmentKit") ` -ExpectedSignature 'C91545B333C52C4465DE8B90A3FAF4E1D9C58DFA' - + # Install Windows 11 SDK version 10.0.22621.0 Install-Binary -Type EXE ` -Url 'https://go.microsoft.com/fwlink/p/?linkid=2196241' ` diff --git a/images/windows/scripts/build/Install-WebPlatformInstaller.ps1 b/images/windows/scripts/build/Install-WebPlatformInstaller.ps1 index 7fc802644cdf..5c7c6fb7d43d 100644 --- a/images/windows/scripts/build/Install-WebPlatformInstaller.ps1 +++ b/images/windows/scripts/build/Install-WebPlatformInstaller.ps1 @@ -4,7 +4,7 @@ ################################################################################ Install-Binary -Type MSI ` - -Url 'http://go.microsoft.com/fwlink/?LinkId=287166' ` - -ExpectedSignature 'C3A3D43788E7ABCD287CB4F5B6583043774F99D2' + -Url 'http://go.microsoft.com/fwlink/?LinkId=287166' ` + -ExpectedSignature 'C3A3D43788E7ABCD287CB4F5B6583043774F99D2' Invoke-PesterTests -TestFile "Tools" -TestName "WebPlatformInstaller" diff --git a/images/windows/scripts/build/Install-WinAppDriver.ps1 b/images/windows/scripts/build/Install-WinAppDriver.ps1 index 192b7004f3c6..e4a6a8264b7f 100644 --- a/images/windows/scripts/build/Install-WinAppDriver.ps1 +++ b/images/windows/scripts/build/Install-WinAppDriver.ps1 @@ -4,12 +4,13 @@ #################################################################################### [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 - -$latestReleaseUrl = 'https://api.github.com/repos/microsoft/WinAppDriver/releases/latest' -$installerUrl = (Invoke-RestMethod -Uri $latestReleaseUrl).assets.browser_download_url +$downloadUrl = Resolve-GithubReleaseAssetUrl ` + -Repo "microsoft/WinAppDriver" ` + -Version "latest" ` + -UrlMatchPattern "WindowsApplicationDriver_*.msi" Install-Binary ` - -Url $installerUrl ` - -ExpectedSignature '2485A7AFA98E178CB8F30C9838346B514AEA4769' + -Url $downloadUrl ` + -ExpectedSignature '2485A7AFA98E178CB8F30C9838346B514AEA4769' Invoke-PesterTests -TestFile "WinAppDriver" -TestName "WinAppDriver" diff --git a/images/windows/scripts/build/Install-WindowsFeatures.ps1 b/images/windows/scripts/build/Install-WindowsFeatures.ps1 index b4680242e71d..c85d25bc7a4c 100644 --- a/images/windows/scripts/build/Install-WindowsFeatures.ps1 +++ b/images/windows/scripts/build/Install-WindowsFeatures.ps1 @@ -1,3 +1,8 @@ +#################################################################################### +## File: Install-WindowsFeatures.ps1 +## Desc: Install Windows Features +#################################################################################### + $windowsFeatures = (Get-ToolsetContent).windowsFeatures foreach ($feature in $windowsFeatures) { diff --git a/images/windows/scripts/build/Install-WindowsUpdates.ps1 b/images/windows/scripts/build/Install-WindowsUpdates.ps1 index b9da01836a83..681af89c308d 100644 --- a/images/windows/scripts/build/Install-WindowsUpdates.ps1 +++ b/images/windows/scripts/build/Install-WindowsUpdates.ps1 @@ -28,8 +28,7 @@ function Install-WindowsUpdates { $failedUpdates = $updates[0] | Where-Object Title -notmatch "Microsoft Defender Antivirus" | Where-Object { -not ($notFailedUpdateNames -match $_.KB) } if ( $failedUpdates ) { - Write-Host "Windows updates failed to install: $($failedUpdates.KB)" - exit 1 + throw "Windows updates failed to install: $($failedUpdates.KB)" } } diff --git a/images/windows/scripts/build/Install-Zstd.ps1 b/images/windows/scripts/build/Install-Zstd.ps1 index 2e8ce0174e1e..20ae3fd2fc1e 100644 --- a/images/windows/scripts/build/Install-Zstd.ps1 +++ b/images/windows/scripts/build/Install-Zstd.ps1 @@ -3,17 +3,18 @@ ## Desc: Install zstd ################################################################################ -$url = "https://api.github.com/repos/facebook/zstd/releases/latest" -# Explicitly set type to string since match returns array by default -[System.String] $zstdLatest = (Invoke-RestMethod -Uri $url).assets.browser_download_url -match "zstd-.+-win64.zip$" -$zstdArchivePath = Invoke-DownloadWithRetry $zstdLatest +$downloadUrl = Resolve-GithubReleaseAssetUrl ` + -Repo "facebook/zstd" ` + -Version "latest" ` + -UrlMatchPattern "zstd-*-win64.zip" +$zstdArchivePath = Invoke-DownloadWithRetry $downloadUrl +$zstdName = [IO.Path]::GetFileNameWithoutExtension($zstdArchivePath) $toolPath = "C:\tools" $zstdPath = Join-Path $toolPath zstd -$zstdParentName = [IO.Path]::GetFileNameWithoutExtension($zstdLatest) $filesInArchive = 7z l $zstdArchivePath | Out-String -if ($filesInArchive.Contains($zstdParentName)) { +if ($filesInArchive.Contains($zstdName)) { Expand-7ZipArchive -Path $zstdArchivePath -DestinationPath $toolPath Invoke-ScriptBlockWithRetry -Command { Move-Item -Path "${zstdPath}*" -Destination $zstdPath -ErrorAction Stop diff --git a/images/windows/scripts/docs-gen/SoftwareReport.CachedTools.psm1 b/images/windows/scripts/docs-gen/SoftwareReport.CachedTools.psm1 index d7683773017b..a62ed45257f4 100644 --- a/images/windows/scripts/docs-gen/SoftwareReport.CachedTools.psm1 +++ b/images/windows/scripts/docs-gen/SoftwareReport.CachedTools.psm1 @@ -1,28 +1,28 @@ function Get-ToolcacheGoVersions { $toolcachePath = Join-Path $env:AGENT_TOOLSDIRECTORY "Go" - return Get-ChildItem $toolcachePath -Name | Sort-Object { [Version]$_ } + return Get-ChildItem $toolcachePath -Name | Sort-Object { [Version] $_ } } function Get-ToolcacheNodeVersions { $toolcachePath = Join-Path $env:AGENT_TOOLSDIRECTORY "Node" - return Get-ChildItem $toolcachePath -Name | Sort-Object { [Version]$_ } + return Get-ChildItem $toolcachePath -Name | Sort-Object { [Version] $_ } } function Get-ToolcachePythonVersions { $toolcachePath = Join-Path $env:AGENT_TOOLSDIRECTORY "Python" - return Get-ChildItem $toolcachePath -Name | Sort-Object { [Version]$_ } + return Get-ChildItem $toolcachePath -Name | Sort-Object { [Version] $_ } } function Get-ToolcacheRubyVersions { $toolcachePath = Join-Path $env:AGENT_TOOLSDIRECTORY "Ruby" - return Get-ChildItem $toolcachePath -Name | Sort-Object { [Version]$_ } + return Get-ChildItem $toolcachePath -Name | Sort-Object { [Version] $_ } } function Get-ToolcachePyPyVersions { $toolcachePath = Join-Path $env:AGENT_TOOLSDIRECTORY "PyPy" Get-ChildItem -Path $toolcachePath -Name | Sort-Object { [Version] $_ } | ForEach-Object { $pypyRootPath = Join-Path $toolcachePath $_ "x86" - [string]$pypyVersionOutput = & "$pypyRootPath\python.exe" -c "import sys;print(sys.version)" + [string] $pypyVersionOutput = & "$pypyRootPath\python.exe" -c "import sys;print(sys.version)" $pypyVersionOutput -match "^([\d\.]+) \(.+\) \[PyPy ([\d\.]+\S*) .+]$" | Out-Null return "{0} [PyPy {1}]" -f $Matches[1], $Matches[2] } diff --git a/images/windows/scripts/docs-gen/SoftwareReport.Common.psm1 b/images/windows/scripts/docs-gen/SoftwareReport.Common.psm1 index 32e7b6b75bab..34a956b2a493 100644 --- a/images/windows/scripts/docs-gen/SoftwareReport.Common.psm1 +++ b/images/windows/scripts/docs-gen/SoftwareReport.Common.psm1 @@ -5,7 +5,7 @@ function Initialize-RustEnvironment { } function Get-OSName { - return (Get-CimInstance -ClassName Win32_OperatingSystem).Caption | Take-Part -Part 1,2,3 + return (Get-CimInstance -ClassName Win32_OperatingSystem).Caption | Get-StringPart -Part 1,2,3 } function Get-OSVersion { @@ -26,75 +26,75 @@ function Get-BashVersion { } function Get-RustVersion { - rustc --version | Take-Part -Part 1 + rustc --version | Get-StringPart -Part 1 } function Get-RustupVersion { - cmd /c "rustup --version 2>NUL" | Take-Part -Part 1 + cmd /c "rustup --version 2>NUL" | Get-StringPart -Part 1 } function Get-RustCargoVersion { - cargo --version | Take-Part -Part 1 + cargo --version | Get-StringPart -Part 1 } function Get-RustdocVersion { - rustdoc --version | Take-Part -Part 1 + rustdoc --version | Get-StringPart -Part 1 } function Get-RustfmtVersion { - rustfmt --version | Take-Part -Part 1 | Take-Part -Part 0 -Delimiter ('-') + rustfmt --version | Get-StringPart -Part 1 | Get-StringPart -Part 0 -Delimiter ('-') } function Get-RustClippyVersion { - cargo clippy --version | Take-Part -Part 1 + cargo clippy --version | Get-StringPart -Part 1 } function Get-BindgenVersion { - bindgen --version | Take-Part -Part 1 + bindgen --version | Get-StringPart -Part 1 } function Get-CbindgenVersion { - cbindgen --version | Take-Part -Part 1 + cbindgen --version | Get-StringPart -Part 1 } function Get-CargoAuditVersion { - cargo-audit --version | Take-Part -Part 1 + cargo-audit --version | Get-StringPart -Part 1 } function Get-CargoOutdatedVersion { - cargo outdated --version | Take-Part -Part 1 + cargo outdated --version | Get-StringPart -Part 1 } function Get-PythonVersion { - python --version | Take-Part -Part 1 + python --version | Get-StringPart -Part 1 } function Get-PowershellCoreVersion { - pwsh --version | Take-Part -Part 1 + pwsh --version | Get-StringPart -Part 1 } function Get-RubyVersion { - ruby --version | Take-Part -Part 1 + ruby --version | Get-StringPart -Part 1 } function Get-GoVersion { - go version | Take-Part -Part 2 | Take-Part -Part 1 -Delimiter ('o') + go version | Get-StringPart -Part 2 | Get-StringPart -Part 1 -Delimiter ('o') } function Get-KotlinVersion { - cmd /c "kotlinc -version 2>&1" | Take-Part -Part 2 + cmd /c "kotlinc -version 2>&1" | Get-StringPart -Part 2 } function Get-PHPVersion { - php --version | Out-String | Take-Part -Part 1 + php --version | Out-String | Get-StringPart -Part 1 } function Get-JuliaVersion { - julia --version | Take-Part -Part 2 + julia --version | Get-StringPart -Part 2 } function Get-LLVMVersion { - (clang --version) -match "clang" | Take-Part -Part 2 + (clang --version) -match "clang" | Get-StringPart -Part 2 } function Get-PerlVersion { @@ -104,7 +104,7 @@ function Get-PerlVersion { } function Get-NodeVersion { - node --version | Take-Part -Part 0 -Delimiter ('v') + node --version | Get-StringPart -Part 0 -Delimiter ('v') } function Get-ChocoVersion { @@ -135,7 +135,7 @@ function Get-HelmVersion { } function Get-PipVersion { - (pip --version) -match "pip" | Take-Part -Part 1,4,5 + (pip --version) -match "pip" | Get-StringPart -Part 1, 4, 5 } function Get-CondaVersion { @@ -144,19 +144,19 @@ function Get-CondaVersion { } function Get-ComposerVersion { - composer --version | Take-Part -Part 2 + composer --version | Get-StringPart -Part 2 } function Get-NugetVersion { - (nuget help) -match "Nuget Version" | Take-Part -Part 2 + (nuget help) -match "Nuget Version" | Get-StringPart -Part 2 } function Get-AntVersion { - ant -version | Take-Part -Part 3 + ant -version | Get-StringPart -Part 3 } function Get-MavenVersion { - (mvn -version) -match "Apache Maven" | Take-Part -Part 2 + (mvn -version) -match "Apache Maven" | Get-StringPart -Part 2 } function Get-GradleVersion { @@ -166,16 +166,16 @@ function Get-GradleVersion { } function Get-SbtVersion { - (sbt -version) -match "sbt script" | Take-Part -Part 3 + (sbt -version) -match "sbt script" | Get-StringPart -Part 3 } function Get-DotnetSdks { $sdksRawList = dotnet --list-sdks - $sdkVersions = $sdksRawList | Foreach-Object {$_.Split()[0]} + $sdkVersions = $sdksRawList | Foreach-Object { $_.Split()[0] } $sdkPath = $sdksRawList[0].Split(' ', 2)[1] -replace '\[|]' [PSCustomObject]@{ Versions = $sdkVersions - Path = $sdkPath + Path = $sdkPath } } @@ -185,7 +185,7 @@ function Get-DotnetTools { $toolsList = @() - foreach ($dotnetTool in $dotnetTools) { + foreach ($dotnetTool in $dotnetTools) { $version = Invoke-Expression $dotnetTool.getversion $toolsList += [ToolVersionNode]::new($dotnetTool.name, $version) } @@ -194,21 +194,21 @@ function Get-DotnetTools { function Get-DotnetRuntimes { $runtimesRawList = dotnet --list-runtimes - $runtimesRawList | Group-Object {$_.Split()[0]} | ForEach-Object { + $runtimesRawList | Group-Object { $_.Split()[0] } | ForEach-Object { $runtimeName = $_.Name - $runtimeVersions = $_.Group | Foreach-Object {$_.split()[1]} + $runtimeVersions = $_.Group | Foreach-Object { $_.split()[1] } $runtimePath = $_.Group[0].Split(' ', 3)[2] -replace '\[|]' [PSCustomObject]@{ - "Runtime" = $runtimeName + "Runtime" = $runtimeName "Versions" = $runtimeVersions - "Path" = $runtimePath + "Path" = $runtimePath } } } function Get-DotnetFrameworkVersions { $path = "${env:ProgramFiles(x86)}\Microsoft SDKs\Windows\*\*\NETFX * Tools" - return Get-ChildItem -Path $path -Directory | ForEach-Object { $_.Name | Take-Part -Part 1 } + return Get-ChildItem -Path $path -Directory | ForEach-Object { $_.Name | Get-StringPart -Part 1 } } function Get-PowerShellAzureModules { @@ -276,20 +276,21 @@ function Get-CachedDockerImagesTableData { $parts = $_.Split("|") [PSCustomObject] @{ "Repository:Tag" = $parts[0] - "Digest" = $parts[1] - "Created" = $parts[2].split(' ')[0] + "Digest" = $parts[1] + "Created" = $parts[2].split(' ')[0] } } | Sort-Object -Property "Repository:Tag" } function Get-ShellTarget { - return Get-ChildItem C:\shells -File | Select-Object Name, @{n="Target";e={ - if ($_.Name -eq "msys2bash.cmd") { - "C:\msys64\usr\bin\bash.exe" - } else { - @($_.Target)[0] + return Get-ChildItem C:\shells -File | Select-Object Name, @{n = "Target"; e = { + if ($_.Name -eq "msys2bash.cmd") { + "C:\msys64\usr\bin\bash.exe" + } else { + @($_.Target)[0] + } } - }} | Sort-Object Name + } | Sort-Object Name } function Get-PacmanVersion { @@ -302,7 +303,7 @@ function Get-PacmanVersion { } function Get-YAMLLintVersion { - yamllint --version | Take-Part -Part 1 + yamllint --version | Get-StringPart -Part 1 } function Get-BizTalkVersion { diff --git a/images/windows/scripts/docs-gen/SoftwareReport.Helpers.psm1 b/images/windows/scripts/docs-gen/SoftwareReport.Helpers.psm1 index 7166911e8ce8..c96afe997836 100644 --- a/images/windows/scripts/docs-gen/SoftwareReport.Helpers.psm1 +++ b/images/windows/scripts/docs-gen/SoftwareReport.Helpers.psm1 @@ -17,7 +17,7 @@ function Get-PathWithLink { return "${inputPath}${link}" } -function Take-Part { +function Get-StringPart { param ( [Parameter(ValueFromPipeline)] [string] $toolOutput, @@ -27,4 +27,4 @@ function Take-Part { $parts = $toolOutput.Split($Delimiter, [System.StringSplitOptions]::RemoveEmptyEntries) $selectedParts = $parts[$Part] return [string]::Join($Delimiter, $selectedParts) -} \ No newline at end of file +} diff --git a/images/windows/scripts/docs-gen/SoftwareReport.Java.psm1 b/images/windows/scripts/docs-gen/SoftwareReport.Java.psm1 index d2d8232bbcf4..cd6c077d3e71 100644 --- a/images/windows/scripts/docs-gen/SoftwareReport.Java.psm1 +++ b/images/windows/scripts/docs-gen/SoftwareReport.Java.psm1 @@ -2,7 +2,7 @@ function Get-JavaVersions { $defaultJavaPath = $env:JAVA_HOME $javaVersions = Get-Item env:JAVA_HOME_*_X64 $sortRules = @{ - Expression = { [Int32]$_.Name.Split("_")[2] } + Expression = { [Int32] $_.Name.Split("_")[2] } Descending = $false } @@ -19,4 +19,4 @@ function Get-JavaVersions { "Environment Variable" = $_.Name } } -} \ No newline at end of file +} diff --git a/images/windows/scripts/docs-gen/SoftwareReport.Tools.psm1 b/images/windows/scripts/docs-gen/SoftwareReport.Tools.psm1 index ce997c84f449..2f4b76528ebb 100644 --- a/images/windows/scripts/docs-gen/SoftwareReport.Tools.psm1 +++ b/images/windows/scripts/docs-gen/SoftwareReport.Tools.psm1 @@ -66,12 +66,12 @@ function Get-DockerComposeVersionV2 { } function Get-DockerWincredVersion { - $dockerCredVersion = docker-credential-wincred version | Take-Part -Part 2 | Take-Part -Part 0 -Delimiter "v" + $dockerCredVersion = docker-credential-wincred version | Get-StringPart -Part 2 | Get-StringPart -Part 0 -Delimiter "v" return $dockerCredVersion } function Get-GitVersion { - $gitVersion = git --version | Take-Part -Part -1 + $gitVersion = git --version | Get-StringPart -Part -1 return $gitVersion } diff --git a/images/windows/scripts/helpers/ChocoHelpers.ps1 b/images/windows/scripts/helpers/ChocoHelpers.ps1 index a4fe9e4214ef..479facf1de3c 100644 --- a/images/windows/scripts/helpers/ChocoHelpers.ps1 +++ b/images/windows/scripts/helpers/ChocoHelpers.ps1 @@ -1,4 +1,25 @@ function Install-ChocoPackage { + <# + .SYNOPSIS + A function to install a Chocolatey package with retries. + + .DESCRIPTION + This function attempts to install a specified Chocolatey package. If the + installation fails, it retries a specified number of times. + + .PARAMETER PackageName + The name of the Chocolatey package to install. + + .PARAMETER ArgumentList + An array of arguments to pass to the choco install command. + + .PARAMETER RetryCount + The number of times to retry the installation if it fails. Default is 5. + + .EXAMPLE + Install-ChocoPackage -PackageName "git" -RetryCount 3 + #> + [CmdletBinding()] param( [Parameter(Mandatory)] @@ -30,6 +51,25 @@ function Install-ChocoPackage { } function Resolve-ChocoPackageVersion { + <# + .SYNOPSIS + Resolves the latest version of a Chocolatey package. + + .DESCRIPTION + This function takes a package name and a target version as input and returns the latest + version of the package that is greater than or equal to the target version. + + .PARAMETER PackageName + The name of the Chocolatey package. + + .PARAMETER TargetVersion + The target version of the package. + + .EXAMPLE + Resolve-ChocoPackageVersion -PackageName "example-package" -TargetVersion "1.0.0" + Returns the latest version of the "example-package" that is greater than or equal to "1.0.0". + #> + param( [Parameter(Mandatory)] [string] $PackageName, @@ -38,12 +78,12 @@ function Resolve-ChocoPackageVersion { ) $versionNumbers = $TargetVersion.Split(".") - [int]$versionNumbers[-1] += 1 + [int] $versionNumbers[-1] += 1 $incrementedVersion = $versionNumbers -join "." $filterQuery = "`$filter=(Id eq '$PackageName') and (IsPrerelease eq false) and (Version ge '$TargetVersion') and (Version lt '$incrementedVersion')" $latestVersion = (Invoke-RestMethod "https://community.chocolatey.org/api/v2/Packages()?$filterQuery").properties.Version | Where-Object { $_ -Like "$TargetVersion.*" -or $_ -eq $TargetVersion } | - Sort-Object { [version]$_ } | + Sort-Object { [version] $_ } | Select-Object -Last 1 return $latestVersion diff --git a/images/windows/scripts/helpers/ImageHelpers.psm1 b/images/windows/scripts/helpers/ImageHelpers.psm1 index 826d4d989734..5af1843e8951 100644 --- a/images/windows/scripts/helpers/ImageHelpers.psm1 +++ b/images/windows/scripts/helpers/ImageHelpers.psm1 @@ -2,43 +2,55 @@ param() . $PSScriptRoot\AndroidHelpers.ps1 +Export-ModuleMember -Function @( + 'Get-AndroidPackages' + 'Get-AndroidPlatformPackages' + 'Get-AndroidBuildToolPackages' + 'Get-AndroidInstalledPackages' +) + . $PSScriptRoot\ChocoHelpers.ps1 -. $PSScriptRoot\InstallHelpers.ps1 -. $PSScriptRoot\PathHelpers.ps1 -. $PSScriptRoot\VisualStudioHelpers.ps1 +Export-ModuleMember -Function @( + 'Install-ChocoPackage' + 'Resolve-ChocoPackageVersion' +) +. $PSScriptRoot\InstallHelpers.ps1 Export-ModuleMember -Function @( - 'Mount-RegistryHive' - 'Dismount-RegistryHive' - 'Add-MachinePathItem' - 'Add-DefaultPathItem' 'Install-Binary' - 'Install-VisualStudio' + 'Invoke-DownloadWithRetry' 'Get-ToolsetContent' - 'Get-TCToolVersionPath' 'Get-TCToolPath' - 'Invoke-DownloadWithRetry' - 'Get-VsixInfoFromMarketplace' - 'Install-VSIXFromFile' - 'Install-VSIXFromUrl' - 'Get-VSExtensionVersion' + 'Get-TCToolVersionPath' 'Test-IsWin22' 'Test-IsWin19' - 'Install-ChocoPackage' - 'Resolve-ChocoPackageVersion' - 'Resolve-GithubReleaseAssetUrl' 'Expand-7ZipArchive' - 'Invoke-ScriptBlockWithRetry' - 'Get-VsCatalogJsonPath' - 'Get-AndroidPackages' - 'Get-AndroidPlatformPackages' - 'Get-AndroidBuildToolPackages' - 'Get-AndroidInstalledPackages' - 'Get-VisualStudioInstance' - 'Get-VisualStudioComponents' 'Get-WindowsUpdateStates' - 'Get-GithubReleaseAssetHash' + 'Invoke-ScriptBlockWithRetry' + 'Get-GithubReleasesByVersion' + 'Resolve-GithubReleaseAssetUrl' + 'Get-ChecksumFromGithubRelease' + 'Get-ChecksumFromUrl' 'Test-FileChecksum' 'Test-FileSignature' 'Update-Environment' ) + +. $PSScriptRoot\PathHelpers.ps1 +Export-ModuleMember -Function @( + 'Mount-RegistryHive' + 'Dismount-RegistryHive' + 'Add-MachinePathItem' + 'Add-DefaultPathItem' +) + +. $PSScriptRoot\VisualStudioHelpers.ps1 +Export-ModuleMember -Function @( + 'Install-VisualStudio' + 'Get-VisualStudioInstance' + 'Get-VisualStudioComponents' + 'Get-VsixInfoFromMarketplace' + 'Install-VSIXFromFile' + 'Install-VSIXFromUrl' + 'Get-VSExtensionVersion' +) diff --git a/images/windows/scripts/helpers/InstallHelpers.ps1 b/images/windows/scripts/helpers/InstallHelpers.ps1 index ee859b834f30..5bb8d87a2036 100644 --- a/images/windows/scripts/helpers/InstallHelpers.ps1 +++ b/images/windows/scripts/helpers/InstallHelpers.ps1 @@ -131,6 +131,33 @@ function Install-Binary { } function Invoke-DownloadWithRetry { + <# + .SYNOPSIS + Downloads a file from a given URL with retry functionality. + + .DESCRIPTION + The Invoke-DownloadWithRetry function downloads a file from the specified URL + to the specified path. It includes retry functionality in case the download fails. + + .PARAMETER Url + The URL of the file to download. + + .PARAMETER Path + The path where the downloaded file will be saved. If not provided, a temporary path + will be used. + + .EXAMPLE + Invoke-DownloadWithRetry -Url "https://example.com/file.zip" -Path "C:\Downloads\file.zip" + Downloads the file from the specified URL and saves it to the specified path. + + .EXAMPLE + Invoke-DownloadWithRetry -Url "https://example.com/file.zip" + Downloads the file from the specified URL and saves it to a temporary path. + + .OUTPUTS + The path where the downloaded file is saved. + #> + Param ( [Parameter(Mandatory)] @@ -165,6 +192,11 @@ function Invoke-DownloadWithRetry { $attemptSeconds = [math]::Round(($(Get-Date) - $attemptStartTime).TotalSeconds, 2) Write-Warning "Package download failed in $attemptSeconds seconds" Write-Warning $_.Exception.Message + + if ($_.Exception.InnerException.Response.StatusCode -eq [System.Net.HttpStatusCode]::NotFound) { + Write-Warning "Request returned 404 Not Found. Aborting download." + $retries = 0 + } } if ($retries -eq 0) { @@ -180,6 +212,15 @@ function Invoke-DownloadWithRetry { } function Get-ToolsetContent { + <# + .SYNOPSIS + Retrieves the content of the toolset.json file. + + .DESCRIPTION + This function reads the toolset.json file located at "C:\image\toolset.json" + and returns the content as a PowerShell object. + #> + $toolsetPath = Join-Path "C:\\image" "toolset.json" $toolsetJson = Get-Content -Path $toolsetPath -Raw ConvertFrom-Json -InputObject $toolsetJson @@ -478,6 +519,10 @@ function Get-GithubReleasesByVersion { .PARAMETER AllowPrerelease Specifies whether to include prerelease versions in the results. By default, prerelease versions are excluded. + + .PARAMETER WithAssetsOnly + Specifies whether to exclude releases without assets. By default, releases without + assets are included. .EXAMPLE Get-GithubReleasesByVersion -Repository "Microsoft/PowerShell" -Version "7.2.0" @@ -500,7 +545,8 @@ function Get-GithubReleasesByVersion { [Alias("Repo")] [string] $Repository, [string] $Version = "*", - [switch] $AllowPrerelease + [switch] $AllowPrerelease, + [switch] $WithAssetsOnly ) $localCacheFile = Join-Path ${env:TEMP} "github-releases_$($Repository -replace "/", "_").json" @@ -528,7 +574,9 @@ function Get-GithubReleasesByVersion { throw "Failed to get releases from ${Repository}" } - $releases = $releases.Where{ $_.assets } + if ($WithAssetsOnly) { + $releases = $releases.Where{ $_.assets } + } if (-not $AllowPrerelease) { $releases = $releases.Where{ $_.prerelease -eq $false } } @@ -608,7 +656,8 @@ function Resolve-GithubReleaseAssetUrl { $matchingReleases = Get-GithubReleasesByVersion ` -Repository $Repository ` -AllowPrerelease:$AllowPrerelease ` - -Version $Version + -Version $Version ` + -WithAssetsOnly # Add wildcard to the beginning of the pattern if it's not there if ($UrlMatchPattern.Substring(0, 2) -ne "*/") { @@ -618,7 +667,7 @@ function Resolve-GithubReleaseAssetUrl { # Loop over releases until we find a download url matching the pattern foreach ($release in $matchingReleases) { $matchedVersion = $release.version - $matchedUrl = $release.assets.browser_download_url -like $UrlMatchPattern + $matchedUrl = ([string[]] $release.assets.browser_download_url) -like $UrlMatchPattern if ($matchedUrl) { break } @@ -638,13 +687,13 @@ function Resolve-GithubReleaseAssetUrl { return ($matchedUrl -as [string]) } -function Get-GithubReleaseAssetHash { +function Get-ChecksumFromGithubRelease { <# .SYNOPSIS Retrieves the hash value of a specific file from a GitHub release body. .DESCRIPTION - The Get-GithubReleaseAssetHash function retrieves the hash value (SHA256 or SHA512) + The Get-ChecksumFromGithubRelease function retrieves the hash value (SHA256 or SHA512) of a specific file from a GitHub release. It searches for the file in the release body and returns the hash value if found. @@ -666,12 +715,12 @@ function Get-GithubReleaseAssetHash { The type of hash value to retrieve. Valid values are "SHA256" and "SHA512". .EXAMPLE - Get-GithubReleaseAssetHash -Repository "MyRepo" -FileName "myfile.txt" -HashType "SHA256" + Get-ChecksumFromGithubRelease -Repository "MyRepo" -FileName "myfile.txt" -HashType "SHA256" Retrieves the SHA256 hash value of "myfile.txt" from the latest release of the "MyRepo" repository. .EXAMPLE - Get-GithubReleaseAssetHash -Repository "MyRepo" -Version "1.0" -FileName "myfile.txt" -HashType "SHA512" + Get-ChecksumFromGithubRelease -Repository "MyRepo" -Version "1.0" -FileName "myfile.txt" -HashType "SHA512" Retrieves the SHA512 hash value of "myfile.txt" from the release version "1.0" of the "MyRepo" repository. #> @@ -693,7 +742,8 @@ function Get-GithubReleaseAssetHash { $matchingReleases = Get-GithubReleasesByVersion ` -Repository $Repository ` -AllowPrerelease:$AllowPrerelease ` - -Version $Version + -Version $Version ` + -WithAssetsOnly foreach ($release in $matchingReleases) { $matchedVersion = $release.version @@ -728,6 +778,70 @@ function Get-GithubReleaseAssetHash { return $hash } +function Get-ChecksumFromUrl { + <# + .SYNOPSIS + Retrieves the checksum hash for a file from a given URL. + + .DESCRIPTION + The Get-ChecksumFromUrl function retrieves the checksum hash for a specified file + from a given URL. It supports SHA256 and SHA512 hash types. + + .PARAMETER Url + The URL of the checksum file. + + .PARAMETER FileName + The name of the file to retrieve the checksum hash for. + + .PARAMETER HashType + The type of hash to retrieve. Valid values are "SHA256" and "SHA512". + + .EXAMPLE + Get-ChecksumFromUrl -Url "https://example.com/checksums.txt" -FileName "file.txt" -HashType "SHA256" + Retrieves the SHA256 checksum hash for the file "file.txt" from the URL "https://example.com/checksums.txt". + #> + + param ( + [Parameter(Mandatory = $true)] + [string] $Url, + [Parameter(Mandatory = $true)] + [Alias("File", "Asset")] + [string] $FileName, + [Parameter(Mandatory = $true)] + [ValidateSet("SHA256", "SHA512")] + [Alias("Type")] + [string] $HashType + ) + + $tempFile = Join-Path -Path $env:TEMP -ChildPath ([System.IO.Path]::GetRandomFileName()) + $checksums = (Invoke-DownloadWithRetry -Url $Url -Path $tempFile | Get-Item | Get-Content) -as [string[]] + Remove-Item -Path $tempFile + + $matchedLine = $checksums | Where-Object { $_ -like "*$FileName*" } + if ($matchedLine.Count -gt 1) { + throw "Found multiple lines matching file name '${FileName}' in checksum file." + } elseif ($matchedLine.Count -eq 0) { + throw "File name '${FileName}' not found in checksum file." + } + + if ($HashType -eq "SHA256") { + $pattern = "[A-Fa-f0-9]{64}" + } elseif ($HashType -eq "SHA512") { + $pattern = "[A-Fa-f0-9]{128}" + } else { + throw "Unknown hash type: ${HashType}" + } + Write-Debug "Found line matching file name '${FileName}' in checksum file:`n${matchedLine}" + + $hash = $matchedLine | Select-String -Pattern $pattern | ForEach-Object { $_.Matches.Value } + if ([string]::IsNullOrEmpty($hash)) { + throw "Found '${FileName}' in checksum file, but failed to get hash from it.`nLine: ${matchedLine}" + } + Write-Host "Found hash for ${FileName} in checksum file: $hash" + + return $hash +} + function Test-FileChecksum { <# .SYNOPSIS diff --git a/images/windows/scripts/helpers/PathHelpers.ps1 b/images/windows/scripts/helpers/PathHelpers.ps1 index 192c8b978187..1ddb9bc99bc9 100644 --- a/images/windows/scripts/helpers/PathHelpers.ps1 +++ b/images/windows/scripts/helpers/PathHelpers.ps1 @@ -18,9 +18,9 @@ function Mount-RegistryHive { #> param( [Parameter(Mandatory = $true)] - [string]$FileName, + [string] $FileName, [Parameter(Mandatory = $true)] - [string]$SubKey + [string] $SubKey ) Write-Host "Loading the file $FileName to the Key $SubKey" @@ -31,8 +31,7 @@ function Mount-RegistryHive { $result = reg load $SubKey $FileName *>&1 if ($LASTEXITCODE -ne 0) { - Write-Error "Failed to load file $FileName to the key ${SubKey}: $result" - exit 1 + throw "Failed to load file $FileName to the key ${SubKey}: $result" } } @@ -52,7 +51,7 @@ function Dismount-RegistryHive { #> param( [Parameter(Mandatory = $true)] - [string]$SubKey + [string] $SubKey ) Write-Host "Unloading the hive $SubKey" @@ -87,12 +86,12 @@ function Add-MachinePathItem { param( [Parameter(Mandatory = $true)] - [string]$PathItem + [string] $PathItem ) $currentPath = [System.Environment]::GetEnvironmentVariable("PATH", "Machine") $newPath = $PathItem + ';' + $currentPath - [System.Environment]::SetEnvironmentVariable("PATH", $newPath, "Machine") + [Environment]::SetEnvironmentVariable("PATH", $newPath, "Machine") } function Add-DefaultPathItem { @@ -120,7 +119,7 @@ function Add-DefaultPathItem { param( [Parameter(Mandatory = $true)] - [string]$PathItem + [string] $PathItem ) Mount-RegistryHive ` diff --git a/images/windows/scripts/helpers/VisualStudioHelpers.ps1 b/images/windows/scripts/helpers/VisualStudioHelpers.ps1 index 99ef27b4d9c5..79f60041c250 100644 --- a/images/windows/scripts/helpers/VisualStudioHelpers.ps1 +++ b/images/windows/scripts/helpers/VisualStudioHelpers.ps1 @@ -117,18 +117,65 @@ Function Install-VisualStudio { } function Get-VisualStudioInstance { + <# + .SYNOPSIS + Retrieves the Visual Studio instance. + + .DESCRIPTION + This function retrieves the Visual Studio instance + using the Get-VSSetupInstance cmdlet. + It searches for both regular and preview versions + of Visual Studio and returns the first instance found. + #> + # Use -Prerelease and -All flags to make sure that Preview versions of VS are found correctly $vsInstance = Get-VSSetupInstance -Prerelease -All | Where-Object { $_.DisplayName -match "Visual Studio" } | Select-Object -First 1 $vsInstance | Select-VSSetupInstance -Product * } function Get-VisualStudioComponents { - (Get-VisualStudioInstance).Packages | Where-Object type -in 'Component', 'Workload' | - Sort-Object Id, Version | Select-Object @{n = 'Package'; e = { $_.Id } }, Version | - Where-Object { $_.Package -notmatch "[0-9a-fA-F]{8}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{12}" } + <# + .SYNOPSIS + Retrieves the Visual Studio components. + + .DESCRIPTION + This function retrieves the Visual Studio components + by filtering the packages returned by Get-VisualStudioInstance cmdlet. + It filters the packages based on their type, sorts them by Id and Version, + and excludes packages with GUID-like Ids. + #> + + (Get-VisualStudioInstance).Packages ` + | Where-Object type -in 'Component', 'Workload' ` + | Sort-Object Id, Version ` + | Select-Object @{n = 'Package'; e = { $_.Id } }, Version ` + | Where-Object { $_.Package -notmatch "[0-9a-fA-F]{8}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{12}" } } function Get-VsixInfoFromMarketplace { + <# + .SYNOPSIS + Retrieves information about a Visual Studio extension from the Visual Studio Marketplace. + + .DESCRIPTION + The Get-VsixInfoFromMarketplace function retrieves information + about a Visual Studio extension from the Visual Studio Marketplace. + It takes the name of the extension as input and returns + the extension's name, VsixId, filename, and download URI. + + .PARAMETER Name + The name of the Visual Studio extension. + + .PARAMETER MarketplaceUri + The URI of the Visual Studio Marketplace. + Default value is "https://marketplace.visualstudio.com/items?itemName=". + + .EXAMPLE + Get-VsixInfoFromMarketplace -Name "ProBITools.MicrosoftReportProjectsforVisualStudio2022" + Retrieves information about the "ProBITools.MicrosoftReportProjectsforVisualStudio2022" extension + from the Visual Studio Marketplace. + #> + Param ( [Parameter(Mandatory)] @@ -183,6 +230,25 @@ function Get-VsixInfoFromMarketplace { } function Install-VSIXFromFile { + <# + .SYNOPSIS + Installs a Visual Studio Extension (VSIX) from a file. + + .DESCRIPTION + This function installs a Visual Studio Extension (VSIX) + from the specified file path. It uses the VSIXInstaller.exe + tool provided by Microsoft Visual Studio. + + .PARAMETER FilePath + The path to the VSIX file that needs to be installed. + + .PARAMETER Retries + The number of retries to attempt if the installation fails. Default is 20. + + .EXAMPLE + Install-VSIXFromFile -FilePath "C:\Extensions\MyExtension.vsix" -Retries 10 + Installs the VSIX file located at "C:\Extensions\MyExtension.vsix" with 10 retries in case of failure. + #> Param ( [Parameter(Mandatory = $true)] @@ -228,6 +294,25 @@ function Install-VSIXFromFile { } function Install-VSIXFromUrl { + <# + .SYNOPSIS + Installs a Visual Studio extension (VSIX) from a given URL. + + .DESCRIPTION + This function downloads a Visual Studio extension (VSIX) + from the specified URL and installs it. + + .PARAMETER Url + The URL of the VSIX file to download and install. + + .PARAMETER Retries + The number of retries to attempt if the download fails. Default is 20. + + .EXAMPLE + Install-VSIXFromUrl -Url "https://example.com/extension.vsix" -Retries 10 + Downloads and installs the VSIX file from the specified URL with 10 retries. + #> + Param ( [Parameter(Mandatory = $true)] @@ -241,6 +326,22 @@ function Install-VSIXFromUrl { } function Get-VSExtensionVersion { + <# + .SYNOPSIS + Retrieves the version of a Visual Studio extension package. + + .DESCRIPTION + This function retrieves the version of a specified Visual Studio extension package. + It searches for the package in the installed instances of Visual Studio and + returns the version number. + + .PARAMETER packageName + The name of the extension package. + + .EXAMPLE + Get-VSExtensionVersion -packageName "MyExtensionPackage" + Retrieves the version of the extension package named "MyExtensionPackage" for Visual Studio. + #> Param ( [Parameter(Mandatory = $true)] diff --git a/images/windows/scripts/tests/Haskell.Tests.ps1 b/images/windows/scripts/tests/Haskell.Tests.ps1 index 8381ff603188..513b71ee53d8 100644 --- a/images/windows/scripts/tests/Haskell.Tests.ps1 +++ b/images/windows/scripts/tests/Haskell.Tests.ps1 @@ -1,16 +1,16 @@ Describe "Haskell" { $ghcPackagesPath = "c:\ghcup\ghc" - [array]$ghcVersionList = Get-ChildItem -Path $ghcPackagesPath -Filter "*" | ForEach-Object { $_.Name.Trim() } + [array] $ghcVersionList = Get-ChildItem -Path $ghcPackagesPath -Filter "*" | ForEach-Object { $_.Name.Trim() } $ghcCount = $ghcVersionList.Count - $defaultGhcVersion = $ghcVersionList | Sort-Object {[Version]$_} | Select-Object -Last 1 + $defaultGhcVersion = $ghcVersionList | Sort-Object {[Version] $_} | Select-Object -Last 1 $ghcDefaultCases = @{ defaultGhcVersion = $defaultGhcVersion - defaultGhcShortVersion = ([version]$defaultGhcVersion).ToString(3) + defaultGhcShortVersion = ([version] $defaultGhcVersion).ToString(3) } $ghcTestCases = $ghcVersionList | ForEach-Object { $ghcVersion = $_ - $ghcShortVersion = ([version]$ghcVersion).ToString(3) + $ghcShortVersion = ([version] $ghcVersion).ToString(3) $binGhcPath = Join-Path $ghcPackagesPath "$ghcShortVersion\bin\ghc.exe" @{ ghcVersion = $ghcVersion diff --git a/images/windows/scripts/tests/Java.Tests.ps1 b/images/windows/scripts/tests/Java.Tests.ps1 index 8245cf837ea3..bf40a8d430bd 100644 --- a/images/windows/scripts/tests/Java.Tests.ps1 +++ b/images/windows/scripts/tests/Java.Tests.ps1 @@ -3,7 +3,7 @@ Describe "Java" { $defaultVersion = $toolsetJava.default $jdkVersions = $toolsetJava.versions - [array]$testCases = $jdkVersions | ForEach-Object { @{Version = $_ } } + [array] $testCases = $jdkVersions | ForEach-Object { @{Version = $_ } } It "Java <DefaultJavaVersion> is default" -TestCases @(@{ DefaultJavaVersion = $defaultVersion }) { $actualJavaPath = Get-EnvironmentVariable "JAVA_HOME" From ff1dc02cbc8bc46d5095dc899c3684ee62ad7f3f Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Mon, 4 Dec 2023 12:05:25 +0100 Subject: [PATCH 2505/3485] [ubuntu] Refactor test helpers (#8938) * [ubuntu] Refactor test helpers * [ubuntu] Adjust help comment --- .../ubuntu/scripts/tests/Databases.Tests.ps1 | 2 +- images/ubuntu/scripts/tests/Helpers.psm1 | 91 ++++++++++++++++--- images/ubuntu/scripts/tests/Java.Tests.ps1 | 2 +- images/ubuntu/scripts/tests/Tools.Tests.ps1 | 6 +- 4 files changed, 82 insertions(+), 19 deletions(-) diff --git a/images/ubuntu/scripts/tests/Databases.Tests.ps1 b/images/ubuntu/scripts/tests/Databases.Tests.ps1 index 9145312ba6b8..f39a460762f4 100644 --- a/images/ubuntu/scripts/tests/Databases.Tests.ps1 +++ b/images/ubuntu/scripts/tests/Databases.Tests.ps1 @@ -11,7 +11,7 @@ Describe "MongoDB" -Skip:(Test-IsUbuntu22) { Describe "PostgreSQL" { It "PostgreSQL Service" { "sudo systemctl start postgresql" | Should -ReturnZeroExitCode - "pg_isready" | Should -MatchCommandOutput "/var/run/postgresql:5432 - accepting connections" + "pg_isready" | Should -OutputTextMatchingRegex "/var/run/postgresql:5432 - accepting connections" "sudo systemctl stop postgresql" | Should -ReturnZeroExitCode } diff --git a/images/ubuntu/scripts/tests/Helpers.psm1 b/images/ubuntu/scripts/tests/Helpers.psm1 index 161165c5376f..7236ae33fb19 100644 --- a/images/ubuntu/scripts/tests/Helpers.psm1 +++ b/images/ubuntu/scripts/tests/Helpers.psm1 @@ -1,13 +1,32 @@ Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" -DisableNameChecking -# Validates that tool is installed and in PATH -function Validate-ToolExist($tool) { - Get-Command $tool -ErrorAction SilentlyContinue | Should -BeTrue -} - function Invoke-PesterTests { + <# + .SYNOPSIS + Runs Pester tests based on the provided test file and test name. + + .DESCRIPTION + The Invoke-PesterTests function runs Pester tests based on the provided test file and test name. + + .PARAMETER TestFile + The name of the test file to run. This should be the base name of the test file without the extension. + Using "*" will run all tests from all test files. + + .PARAMETER TestName + The name of the specific test to run. If provided, only the test with the matching name will be executed. + + .EXAMPLE + Invoke-PesterTests -TestFile "MyTests" -TestName "Test1" + Runs the test named "Test1" from the test file "MyTests.Tests.ps1". + + .EXAMPLE + Invoke-PesterTests -TestFile "*" + Runs all tests from all test files + + #> Param( - [Parameter(Mandatory)][string] $TestFile, + [Parameter(Mandatory = $true)] + [string] $TestFile, [string] $TestName ) @@ -17,12 +36,12 @@ function Invoke-PesterTests { } # Check that Pester module is imported - if (!(Get-Module "Pester")) { + if (-not (Get-Module "Pester")) { Import-Module Pester } $configuration = [PesterConfiguration] @{ - Run = @{ Path = $testPath; PassThru = $true } + Run = @{ Path = $testPath; PassThru = $true } Output = @{ Verbosity = "Detailed"; RenderMode = "Plaintext" } } if ($TestName) { @@ -43,6 +62,29 @@ function Invoke-PesterTests { } function ShouldReturnZeroExitCode { + <# + .SYNOPSIS + Implements a custom Should-operator for the Pester framework. + + .DESCRIPTION + This function is used to check if a command has returned a zero exit code. + It can be used by registering it using the Add-ShouldOperator function in Pester. + + .PARAMETER ActualValue + The actual value to be checked. + + .PARAMETER Negate + A switch parameter that, when specified, negates the result of the check. + + .PARAMETER Because + An optional string that provides additional context or explanation for the check. + + .NOTES + This function is designed to be used with the Pester framework. + + .LINK + https://pester.dev/docs/assertions/custom-assertions + #> Param( [string] $ActualValue, [switch] $Negate, @@ -51,7 +93,7 @@ function ShouldReturnZeroExitCode { $result = Get-CommandResult $ActualValue -ValidateExitCode $false - [bool]$succeeded = $result.ExitCode -eq 0 + [bool] $succeeded = $result.ExitCode -eq 0 if ($Negate) { $succeeded = -not $succeeded } if (-not $succeeded) @@ -67,7 +109,30 @@ function ShouldReturnZeroExitCode { } } -function ShouldMatchCommandOutput { +function ShouldOutputTextMatchingRegex { + <# + .SYNOPSIS + Implements a custom Should-operator for the Pester framework. + + .DESCRIPTION + This function is used to check if a command outputs text that matches a regular expression. + It can be used by registering it using the Add-ShouldOperator function in Pester. + + .PARAMETER ActualValue + The actual value to be checked. + + .PARAMETER RegularExpression + The regular expression to be used for the check. + + .PARAMETER Negate + A switch parameter that, when specified, negates the result of the check. + + .NOTES + This function is designed to be used with the Pester framework. + + .LINK + https://pester.dev/docs/assertions/custom-assertions + #> Param( [string] $ActualValue, [string] $RegularExpression, @@ -77,9 +142,7 @@ function ShouldMatchCommandOutput { $output = (Get-CommandResult $ActualValue -ValidateExitCode $false).Output | Out-String [bool] $succeeded = $output -cmatch $RegularExpression - if ($Negate) { - $succeeded = -not $succeeded - } + if ($Negate) { $succeeded = -not $succeeded } $failureMessage = '' @@ -100,5 +163,5 @@ function ShouldMatchCommandOutput { If (Get-Command -Name Add-ShouldOperator -ErrorAction SilentlyContinue) { Add-ShouldOperator -Name ReturnZeroExitCode -InternalName ShouldReturnZeroExitCode -Test ${function:ShouldReturnZeroExitCode} - Add-ShouldOperator -Name MatchCommandOutput -InternalName ShouldMatchCommandOutput -Test ${function:ShouldMatchCommandOutput} + Add-ShouldOperator -Name OutputTextMatchingRegex -InternalName ShouldOutputTextMatchingRegex -Test ${function:ShouldOutputTextMatchingRegex} } diff --git a/images/ubuntu/scripts/tests/Java.Tests.ps1 b/images/ubuntu/scripts/tests/Java.Tests.ps1 index a295377cbaa3..ba63bcfadbe5 100644 --- a/images/ubuntu/scripts/tests/Java.Tests.ps1 +++ b/images/ubuntu/scripts/tests/Java.Tests.ps1 @@ -45,6 +45,6 @@ Describe "Java" { if ($Version -eq 8) { $Version = "1.${Version}" } - "`"$javaPath`" -version" | Should -MatchCommandOutput "openjdk\ version\ `"${Version}(\.[0-9_\.]+)?`"" + "`"$javaPath`" -version" | Should -OutputTextMatchingRegex "openjdk\ version\ `"${Version}(\.[0-9_\.]+)?`"" } } diff --git a/images/ubuntu/scripts/tests/Tools.Tests.ps1 b/images/ubuntu/scripts/tests/Tools.Tests.ps1 index 34662055f7f7..4071e39843ac 100644 --- a/images/ubuntu/scripts/tests/Tools.Tests.ps1 +++ b/images/ubuntu/scripts/tests/Tools.Tests.ps1 @@ -281,7 +281,7 @@ Describe "Kubernetes tools" { } It "kubectl" { - "kubectl version --client=true" | Should -MatchCommandOutput "Client Version: v" + "kubectl version --client=true" | Should -OutputTextMatchingRegex "Client Version: v" } It "helm" { @@ -341,7 +341,7 @@ Describe "Containers" { # https://github.com/actions/runner-images/issues/7753 It "podman networking" -TestCases "podman CNI plugins" { - "podman network create -d bridge test-net && podman network ls" | Should -Not -MatchCommandOutput "Error" + "podman network create -d bridge test-net && podman network ls" | Should -Not -OutputTextMatchingRegex "Error" } } @@ -382,7 +382,7 @@ Describe "Ruby" { if ($gemTestCases) { It "Gem <gemName> is installed" -TestCases $gemTestCases { - "gem list -i '^$gemName$'" | Should -MatchCommandOutput "true" + "gem list -i '^$gemName$'" | Should -OutputTextMatchingRegex "true" } } } From 69db5c6c63cee6e97ea5b7d9e0b7318a28a2094c Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Mon, 4 Dec 2023 12:13:08 +0100 Subject: [PATCH 2506/3485] [macOS] Refactor Common.Helpers (#8924) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [macOS] Refactor Common.Helpers * Update readme file * Remove unnecessary double quotes --------- Co-authored-by: Alexey Ayupov <“alexey.ayupov@akvelon.com”> --- .../macos/scripts/build/Configure-Toolset.ps1 | 17 ++- .../macos/scripts/build/Install-Toolset.ps1 | 4 +- images/macos/scripts/build/Install-Xcode.ps1 | 8 +- .../scripts/build/Update-XcodeSimulators.ps1 | 12 +- .../scripts/build/install-android-sdk.sh | 6 +- images/macos/scripts/build/install-xamarin.sh | 10 +- .../docs-gen/SoftwareReport.Android.psm1 | 9 +- .../docs-gen/SoftwareReport.Browsers.psm1 | 4 +- .../docs-gen/SoftwareReport.Common.psm1 | 8 +- .../docs-gen/SoftwareReport.Helpers.psm1 | 2 +- .../scripts/docs-gen/SoftwareReport.Java.psm1 | 5 +- .../docs-gen/SoftwareReport.Toolcache.psm1 | 2 +- .../docs-gen/SoftwareReport.Xamarin.psm1 | 10 +- .../docs-gen/SoftwareReport.Xcode.psm1 | 2 +- .../macos/scripts/helpers/Common.Helpers.psm1 | 118 ++---------------- .../macos/scripts/helpers/Xcode.Helpers.psm1 | 18 +-- .../scripts/helpers/Xcode.Installer.psm1 | 105 ++++++++++------ images/macos/scripts/tests/Android.Tests.ps1 | 18 +-- .../macos/scripts/tests/BasicTools.Tests.ps1 | 3 +- images/macos/scripts/tests/Browsers.Tests.ps1 | 1 + images/macos/scripts/tests/Common.Tests.ps1 | 8 +- .../macos/scripts/tests/Databases.Tests.ps1 | 4 +- images/macos/scripts/tests/Git.Tests.ps1 | 2 +- images/macos/scripts/tests/Haskell.Tests.ps1 | 1 + images/macos/scripts/tests/Helpers.psm1 | 20 ++- images/macos/scripts/tests/Java.Tests.ps1 | 10 +- images/macos/scripts/tests/LLVM.Tests.ps1 | 2 +- images/macos/scripts/tests/Node.Tests.ps1 | 6 +- images/macos/scripts/tests/OpenSSL.Tests.ps1 | 2 +- images/macos/scripts/tests/PHP.Tests.ps1 | 5 +- .../scripts/tests/PipxPackages.Tests.ps1 | 2 +- .../macos/scripts/tests/Powershell.Tests.ps1 | 6 +- images/macos/scripts/tests/Python.Tests.ps1 | 2 +- .../macos/scripts/tests/Ruby.arm64.Tests.ps1 | 8 +- images/macos/scripts/tests/Ruby.x64.Tests.ps1 | 8 +- images/macos/scripts/tests/RubyGem.Tests.ps1 | 6 +- images/macos/scripts/tests/Rust.Tests.ps1 | 1 + .../macos/scripts/tests/Toolcache.Tests.ps1 | 2 +- images/macos/scripts/tests/Toolset.Tests.ps1 | 43 +++---- images/macos/scripts/tests/Xamarin.Tests.ps1 | 31 ++--- images/macos/scripts/tests/Xcode.Tests.ps1 | 28 ++--- images/macos/toolsets/Readme.md | 48 +++---- images/macos/toolsets/toolset-11.json | 16 +-- images/macos/toolsets/toolset-12.json | 16 +-- images/macos/toolsets/toolset-13.json | 6 +- images/macos/toolsets/toolset-14.json | 6 +- 46 files changed, 292 insertions(+), 359 deletions(-) diff --git a/images/macos/scripts/build/Configure-Toolset.ps1 b/images/macos/scripts/build/Configure-Toolset.ps1 index 8450b820d65c..4580d0247438 100644 --- a/images/macos/scripts/build/Configure-Toolset.ps1 +++ b/images/macos/scripts/build/Configure-Toolset.ps1 @@ -6,8 +6,7 @@ Import-Module "~/image-generation/helpers/Common.Helpers.psm1" -function Get-ToolsetToolFullPath -{ +function Get-ToolsetToolFullPath { param ( [Parameter(Mandatory)] [string] $ToolName, @@ -23,25 +22,23 @@ function Get-ToolsetToolFullPath } $arch = Get-Architecture -$toolcache = Get-ToolsetValue "toolcache" +$toolcache = (Get-ToolsetContent).toolcache -foreach ($tool in $toolcache) -{ +foreach ($tool in $toolcache) { $toolName = $tool.name $toolEnvironment = $tool.arch.$arch.variable_template - if (-not $toolEnvironment) - { + if (-not $toolEnvironment) { continue } - foreach ($toolVersion in $tool.arch.$arch.versions) - { + foreach ($toolVersion in $tool.arch.$arch.versions) { Write-Host "Set $toolName $toolVersion environment variable..." $toolPath = Get-ToolsetToolFullPath -ToolName $toolName -ToolVersion $toolVersion -ToolArchitecture $arch $envName = $toolEnvironment -f $toolVersion.split(".") # Add environment variable name=value - Add-EnvironmentVariable -Name $envName -Value $toolPath + $envVar = "export {0}={1}" -f $envName, $toolPath + Add-Content -Path "${env:HOME}/.bashrc" -Value $envVar } } diff --git a/images/macos/scripts/build/Install-Toolset.ps1 b/images/macos/scripts/build/Install-Toolset.ps1 index d5a278574951..1e81cd27bd39 100644 --- a/images/macos/scripts/build/Install-Toolset.ps1 +++ b/images/macos/scripts/build/Install-Toolset.ps1 @@ -31,11 +31,11 @@ $arch = Get-Architecture # Get toolcache content from toolset $toolsToInstall = @("Python", "Node", "Go") -$tools = Get-ToolsetValue "toolcache" | Where-Object {$toolsToInstall -contains $_.Name} +$tools = (Get-ToolsetContent).toolcache | Where-Object {$toolsToInstall -contains $_.Name} foreach ($tool in $tools) { # Get versions manifest for current tool - $assets = Invoke-RestMethodWithRetry -Url $tool.url + $assets = Invoke-RestMethod $tool.url -MaximumRetryCount 10 -RetryIntervalSec 30 # Get github release asset for each version foreach ($version in $tool.arch.$arch.versions) { diff --git a/images/macos/scripts/build/Install-Xcode.ps1 b/images/macos/scripts/build/Install-Xcode.ps1 index eec15f51a2b4..1e4edfc1f590 100644 --- a/images/macos/scripts/build/Install-Xcode.ps1 +++ b/images/macos/scripts/build/Install-Xcode.ps1 @@ -8,10 +8,10 @@ $ErrorActionPreference = "Stop" Import-Module "$env:HOME/image-generation/helpers/Common.Helpers.psm1" Import-Module "$env:HOME/image-generation/helpers/Xcode.Installer.psm1" -DisableNameChecking -$ARCH = Get-Architecture -[Array]$xcodeVersions = Get-ToolsetValue "xcode.$ARCH.versions" +$arch = Get-Architecture +[Array]$xcodeVersions = (Get-ToolsetContent).xcode.$arch.versions write-host $xcodeVersions -$defaultXcode = Get-ToolsetValue "xcode.default" +$defaultXcode = (Get-ToolsetContent).xcode.default [Array]::Reverse($xcodeVersions) $threadCount = "5" @@ -61,7 +61,7 @@ $xcodeVersions | ForEach-Object { Write-Host "Rebuilding Launch Services database ..." $xcodeVersions | ForEach-Object { - Rebuild-XcodeLaunchServicesDb -Version $_.link + Initialize-XcodeLaunchServicesDb -Version $_.link } Write-Host "Setting default Xcode to $defaultXcode" diff --git a/images/macos/scripts/build/Update-XcodeSimulators.ps1 b/images/macos/scripts/build/Update-XcodeSimulators.ps1 index 7c083d8e4506..7cc42fb55b92 100644 --- a/images/macos/scripts/build/Update-XcodeSimulators.ps1 +++ b/images/macos/scripts/build/Update-XcodeSimulators.ps1 @@ -8,16 +8,16 @@ $ErrorActionPreference = "Stop" Import-Module "$env:HOME/image-generation/helpers/Xcode.Helpers.psm1" -DisableNameChecking Import-Module "$env:HOME/image-generation/software-report/SoftwareReport.Xcode.psm1" -DisableNameChecking -function Ensure-SimulatorInstalled { +function Test-SimulatorInstalled { param( [Parameter(Mandatory)] - [string]$RuntimeId, + [string] $RuntimeId, [Parameter(Mandatory)] - [string]$DeviceId, + [string] $DeviceId, [Parameter(Mandatory)] - [string]$SimulatorName, + [string] $SimulatorName, [Parameter(Mandatory)] - [string]$XcodeVersion + [string] $XcodeVersion ) $simctlPath = Get-XcodeToolPath -Version $XcodeVersion -ToolName "simctl" @@ -52,5 +52,5 @@ Get-XcodeInfoList | Out-Null Write-Host "Validating and fixing Xcode simulators..." Get-BrokenXcodeSimulatorsList | ForEach-Object { - Ensure-SimulatorInstalled -RuntimeId $_.RuntimeId -DeviceId $_.DeviceId -SimulatorName $_.SimulatorName -XcodeVersion $_.XcodeVersion + Test-SimulatorInstalled -RuntimeId $_.RuntimeId -DeviceId $_.DeviceId -SimulatorName $_.SimulatorName -XcodeVersion $_.XcodeVersion } diff --git a/images/macos/scripts/build/install-android-sdk.sh b/images/macos/scripts/build/install-android-sdk.sh index 179338748a80..86eee8a7e097 100644 --- a/images/macos/scripts/build/install-android-sdk.sh +++ b/images/macos/scripts/build/install-android-sdk.sh @@ -33,9 +33,9 @@ components=() ANDROID_PLATFORM=$(get_toolset_value '.android.platform_min_version') ANDROID_BUILD_TOOL=$(get_toolset_value '.android.build_tools_min_version') -ANDROID_EXTRA_LIST=($(get_toolset_value '.android."extra-list"[]')) -ANDROID_ADDON_LIST=($(get_toolset_value '.android."addon-list"[]')) -ANDROID_ADDITIONAL_TOOLS=($(get_toolset_value '.android."additional-tools"[]')) +ANDROID_EXTRA_LIST=($(get_toolset_value '.android."extras"[]')) +ANDROID_ADDON_LIST=($(get_toolset_value '.android."addons"[]')) +ANDROID_ADDITIONAL_TOOLS=($(get_toolset_value '.android."additional_tools"[]')) ANDROID_NDK_MAJOR_VERSIONS=($(get_toolset_value '.android.ndk."versions"[]')) ANDROID_NDK_MAJOR_DEFAULT=$(get_toolset_value '.android.ndk.default') ANDROID_NDK_MAJOR_LATEST=$(get_toolset_value '.android.ndk."versions"[-1]') diff --git a/images/macos/scripts/build/install-xamarin.sh b/images/macos/scripts/build/install-xamarin.sh index 3f9e7fcc3b60..8b956dade91d 100644 --- a/images/macos/scripts/build/install-xamarin.sh +++ b/images/macos/scripts/build/install-xamarin.sh @@ -7,12 +7,12 @@ source ~/utils/utils.sh source ~/utils/xamarin-utils.sh -MONO_VERSIONS=($(get_toolset_value '.xamarin."mono-versions" | reverse | .[]')) -XAMARIN_IOS_VERSIONS=($(get_toolset_value '.xamarin."ios-versions" | reverse | .[]')) -XAMARIN_MAC_VERSIONS=($(get_toolset_value '.xamarin."mac-versions" | reverse | .[]')) -XAMARIN_ANDROID_VERSIONS=($(get_toolset_value '.xamarin."android-versions" | reverse | .[]')) +MONO_VERSIONS=($(get_toolset_value '.xamarin."mono_versions" | reverse | .[]')) +XAMARIN_IOS_VERSIONS=($(get_toolset_value '.xamarin."ios_versions" | reverse | .[]')) +XAMARIN_MAC_VERSIONS=($(get_toolset_value '.xamarin."mac_versions" | reverse | .[]')) +XAMARIN_ANDROID_VERSIONS=($(get_toolset_value '.xamarin."android_versions" | reverse | .[]')) LATEST_SDK_SYMLINK=$(get_toolset_value '.xamarin.bundles[0].symlink') -CURRENT_SDK_SYMLINK=$(get_toolset_value '.xamarin."bundle-default"') +CURRENT_SDK_SYMLINK=$(get_toolset_value '.xamarin."bundle_default"') DEFAULT_XCODE_VERSION=$(get_toolset_value '.xcode.default') if [ "$CURRENT_SDK_SYMLINK" == "latest" ]; then diff --git a/images/macos/scripts/docs-gen/SoftwareReport.Android.psm1 b/images/macos/scripts/docs-gen/SoftwareReport.Android.psm1 index 22cf4a5c96b0..66e68813fbe2 100644 --- a/images/macos/scripts/docs-gen/SoftwareReport.Android.psm1 +++ b/images/macos/scripts/docs-gen/SoftwareReport.Android.psm1 @@ -2,9 +2,10 @@ Import-Module "$PSScriptRoot/SoftwareReport.Helpers.psm1" -DisableNameChecking Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" function Split-TableRowByColumns { - param( + param ( [string] $Row ) + return $Row.Split("|") | ForEach-Object { $_.trim() } } @@ -46,6 +47,7 @@ function Get-AndroidPackages { function Build-AndroidTable { Write-Host "Build-AndroidTable" $packageInfo = Get-AndroidInstalledPackages + return @( @{ "Package" = "Android Command Line Tools" @@ -62,7 +64,7 @@ function Build-AndroidTable { @{ "Package" = "Android SDK Platforms" "Version" = Get-AndroidPlatformVersions -PackageInfo $packageInfo - }, + }, @{ "Package" = "Android SDK Platform-Tools" "Version" = Get-AndroidPackageVersions -PackageInfo $packageInfo -MatchedString "Android SDK Platform-Tools" @@ -111,6 +113,7 @@ function Build-AndroidEnvironmentTable { $androidVersions = Get-Item env:ANDROID_* $shoulddResolveLink = 'ANDROID_NDK', 'ANDROID_NDK_HOME', 'ANDROID_NDK_ROOT', 'ANDROID_NDK_LATEST_HOME' + return $androidVersions | Sort-Object -Property Name | ForEach-Object { [PSCustomObject] @{ "Name" = $_.Name @@ -191,7 +194,7 @@ function Get-AndroidGoogleAPIsVersions { function Get-AndroidNDKVersions { $ndkFolderPath = Join-Path (Get-AndroidSDKRoot) "ndk" $versions += Get-ChildItem -Path $ndkFolderPath -Name - $ndkDefaultVersion = Get-ToolsetValue "android.ndk.default" + $ndkDefaultVersion = (Get-ToolsetContent).android.ndk.default $ndkDefaultFullVersion = Get-ChildItem "$env:ANDROID_HOME/ndk/$ndkDefaultVersion.*" -Name | Select-Object -Last 1 return ($versions | ForEach-Object { diff --git a/images/macos/scripts/docs-gen/SoftwareReport.Browsers.psm1 b/images/macos/scripts/docs-gen/SoftwareReport.Browsers.psm1 index e19865bc08f9..f99a90be4215 100644 --- a/images/macos/scripts/docs-gen/SoftwareReport.Browsers.psm1 +++ b/images/macos/scripts/docs-gen/SoftwareReport.Browsers.psm1 @@ -10,7 +10,7 @@ function Build-BrowserSection { [ToolVersionNode]::new("Google Chrome for Testing", $(Get-ChromeForTestingVersion)) [ToolVersionNode]::new("ChromeDriver", $(Get-ChromeDriverVersion)) ) - + if ((-not $os.IsVenturaArm64) -and (-not $os.IsSonomaArm64)) { $nodes += @( [ToolVersionNode]::new("Microsoft Edge", $(Get-EdgeVersion)) @@ -19,7 +19,7 @@ function Build-BrowserSection { [ToolVersionNode]::new("geckodriver", $(Get-GeckodriverVersion)) ) } - + $nodes += @( [ToolVersionNode]::new("Selenium server", $(Get-SeleniumVersion)) ) diff --git a/images/macos/scripts/docs-gen/SoftwareReport.Common.psm1 b/images/macos/scripts/docs-gen/SoftwareReport.Common.psm1 index 79e268399b13..b61a869b53e4 100644 --- a/images/macos/scripts/docs-gen/SoftwareReport.Common.psm1 +++ b/images/macos/scripts/docs-gen/SoftwareReport.Common.psm1 @@ -1,7 +1,5 @@ Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" -$os = Get-OSVersion - function Get-BashVersion { $version = bash -c 'echo ${BASH_VERSION}' return $version @@ -83,7 +81,7 @@ function Get-VcpkgVersion { } function Get-GccVersions { - $versionList = Get-ToolsetValue -KeyPath gcc.versions + $versionList = (Get-ToolsetContent).gcc.versions $versionList | Foreach-Object { $nameVersion = Run-Command "gcc-${_} --version" | Select-Object -First 1 $version = ($nameVersion -replace "^gcc-${_}").Trim() -replace '\).*$', ')' @@ -92,7 +90,7 @@ function Get-GccVersions { } function Get-FortranVersions { - $versionList = Get-ToolsetValue -KeyPath gcc.versions + $versionList = (Get-ToolsetContent).gcc.versions $versionList | Foreach-Object { $nameVersion = Run-Command "gfortran-${_} --version" | Select-Object -First 1 $version = ($nameVersion -replace "^GNU Fortran").Trim() -replace '\).*$', ')' @@ -106,7 +104,7 @@ function Get-ClangLLVMVersions { $defaultClangOutput = Run-Command "clang --version" | Out-String $defaultClangVersion = $clangVersionRegex.Match($defaultClangOutput).Groups['version'].Value - $homebrewClangPath = '$(brew --prefix llvm@{0})/bin/clang' -f (Get-ToolsetValue 'llvm.version') + $homebrewClangPath = '$(brew --prefix llvm@{0})/bin/clang' -f ((Get-ToolsetContent).llvm.version) $homebrewClangOutput = Run-Command "$homebrewClangPath --version" | Out-String $homebrewClangVersion = $clangVersionRegex.Match($homebrewClangOutput).Groups['version'].Value diff --git a/images/macos/scripts/docs-gen/SoftwareReport.Helpers.psm1 b/images/macos/scripts/docs-gen/SoftwareReport.Helpers.psm1 index 3dfc84963337..cd92f7bf054c 100644 --- a/images/macos/scripts/docs-gen/SoftwareReport.Helpers.psm1 +++ b/images/macos/scripts/docs-gen/SoftwareReport.Helpers.psm1 @@ -47,7 +47,7 @@ function Get-BrewPackageVersion { [string] $CommandName ) - (Get-LinkTarget (Get-Command $CommandName).Source | Out-String) -match "(?<version>(\d+.){2}\d+)" | Out-Null + (Get-LinkTarget (Get-Command $CommandName).Source | Out-String) -match "(?<version>(\d+.){2}\d+)" | Out-Null $packageVersion = $Matches.Version return $packageVersion diff --git a/images/macos/scripts/docs-gen/SoftwareReport.Java.psm1 b/images/macos/scripts/docs-gen/SoftwareReport.Java.psm1 index 46c0a6deff6d..41b591694e77 100644 --- a/images/macos/scripts/docs-gen/SoftwareReport.Java.psm1 +++ b/images/macos/scripts/docs-gen/SoftwareReport.Java.psm1 @@ -1,14 +1,15 @@ function Get-JavaVersions { $defaultJavaPath = (Get-Item env:JAVA_HOME).value - + $os = Get-OSVersion if ($os.IsVenturaArm64 -or $os.IsSonomaArm64) { $javaVersions = Get-Item env:JAVA_HOME_*_arm64 } else { $javaVersions = Get-Item env:JAVA_HOME_*_X64 } + $sortRules = @{ - Expression = { [Int32]$_.Name.Split("_")[2] } + Expression = { [Int32]$_.Name.Split("_")[2] } Descending = $false } diff --git a/images/macos/scripts/docs-gen/SoftwareReport.Toolcache.psm1 b/images/macos/scripts/docs-gen/SoftwareReport.Toolcache.psm1 index a7187eb55489..ad5c41881299 100644 --- a/images/macos/scripts/docs-gen/SoftwareReport.Toolcache.psm1 +++ b/images/macos/scripts/docs-gen/SoftwareReport.Toolcache.psm1 @@ -54,7 +54,7 @@ function Build-ToolcacheSection { } function Get-PowerShellModules { - $modules = (Get-ToolsetValue powershellModules).name + $modules = ((Get-ToolsetContent).powershellModules).name $modules | ForEach-Object { $moduleName = $_ $moduleVersions = Get-Module -Name $moduleName -ListAvailable | Select-Object -ExpandProperty Version | Sort-Object -Unique diff --git a/images/macos/scripts/docs-gen/SoftwareReport.Xamarin.psm1 b/images/macos/scripts/docs-gen/SoftwareReport.Xamarin.psm1 index 1937ae73a808..5275c323a901 100644 --- a/images/macos/scripts/docs-gen/SoftwareReport.Xamarin.psm1 +++ b/images/macos/scripts/docs-gen/SoftwareReport.Xamarin.psm1 @@ -1,8 +1,8 @@ Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" function Build-VSMacTable { - $vsMacVersions = Get-ToolsetValue "xamarin.vsmac.versions" - $defaultVSMacVersion = Get-ToolsetValue "xamarin.vsmac.default" + $vsMacVersions = (Get-ToolsetContent).xamarin.vsmac.versions + $defaultVSMacVersion = (Get-ToolsetContent).xamarin.vsmac.default return $vsMacVersions | ForEach-Object { $isDefault = $_ -eq $defaultVSMacVersion @@ -29,8 +29,8 @@ function Get-NUnitVersion { } function Build-XamarinTable { - $xamarinBundles = Get-ToolsetValue "xamarin.bundles" - $defaultSymlink = Get-ToolsetValue "xamarin.bundle-default" + $xamarinBundles = (Get-ToolsetContent).xamarin.bundles + $defaultSymlink = (Get-ToolsetContent).xamarin.bundle_default if ($defaultSymlink -eq "latest") { $defaultSymlink = $xamarinBundles[0].symlink } @@ -38,7 +38,7 @@ function Build-XamarinTable { return $xamarinBundles | ForEach-Object { $defaultPostfix = ($_.symlink -eq $defaultSymlink ) ? " (default)" : "" [PSCustomObject] @{ - "symlink" = $_.symlink + $defaultPostfix + "symlink" = $_.symlink + $defaultPostfix "Xamarin.Mono" = $_.mono "Xamarin.iOS" = $_.ios "Xamarin.Mac" = $_.mac diff --git a/images/macos/scripts/docs-gen/SoftwareReport.Xcode.psm1 b/images/macos/scripts/docs-gen/SoftwareReport.Xcode.psm1 index b5d0de877d6b..33edda8c1551 100644 --- a/images/macos/scripts/docs-gen/SoftwareReport.Xcode.psm1 +++ b/images/macos/scripts/docs-gen/SoftwareReport.Xcode.psm1 @@ -4,7 +4,7 @@ Import-Module "$PSScriptRoot/../helpers/Xcode.Helpers.psm1" $os = Get-OSVersion function Get-XcodePaths { - $xcodePaths = Get-ChildItemWithoutSymlinks "/Applications" -Filter "Xcode_*.app" + $xcodePaths = Get-ChildItem -Path "/Applications" -Filter "Xcode_*.app" | Where-Object { !$_.LinkType } return $xcodePaths | Select-Object -ExpandProperty Fullname } diff --git a/images/macos/scripts/helpers/Common.Helpers.psm1 b/images/macos/scripts/helpers/Common.Helpers.psm1 index 627836f4afe1..0e8ea1e0cb71 100644 --- a/images/macos/scripts/helpers/Common.Helpers.psm1 +++ b/images/macos/scripts/helpers/Common.Helpers.psm1 @@ -7,6 +7,7 @@ function Get-CommandResult { # Bash trick to suppress and show error output because some commands write to stderr (for example, "python --version") $stdout = & bash -c "$Command 2>&1" $exitCode = $LASTEXITCODE + return @{ Output = If ($Multiline -eq $true) { $stdout } else { [string]$stdout } ExitCode = $exitCode @@ -14,21 +15,16 @@ function Get-CommandResult { } # Gets path to the tool, analogue of 'which tool' -function Get-WhichTool($tool) { +function Get-ToolPath($tool) { return (Get-Command $tool).Path } -# Gets value of environment variable by the name -function Get-EnvironmentVariable($variable) { - return [System.Environment]::GetEnvironmentVariable($variable) -} - # Returns the object with information about current OS # It can be used for OS-specific tests function Get-OSVersion { $osVersion = [Environment]::OSVersion - $osVersionMajorMinor = $osVersion.Version.ToString(2) $processorArchitecture = arch + return [PSCustomObject]@{ Version = $osVersion.Version Platform = $osVersion.Platform @@ -44,85 +40,11 @@ function Get-OSVersion { } } -function Get-ChildItemWithoutSymlinks { - param ( - [Parameter(Mandatory)] - [string] $Path, - [string] $Filter - ) - - $files = Get-ChildItem -Path $Path -Filter $Filter - $files = $files | Where-Object { !$_.LinkType } # cut symlinks - return $files -} - -# Get the value of specific toolset node -# Example, invoke `Get-ToolsetValue "xamarin.bundles"` to get value of `$toolsetJson.xamarin.bundles` -function Get-ToolsetValue { - param ( - [Parameter(Mandatory = $true)] - [string] $KeyPath - ) +# Get the value of the toolset +function Get-ToolsetContent { $toolsetPath = Join-Path $env:HOME "image-generation" "toolset.json" - $jsonNode = Get-Content -Raw $toolsetPath | ConvertFrom-Json - - $pathParts = $KeyPath.Split(".") - # try to walk through all arguments consequentially to resolve specific json node - $pathParts | ForEach-Object { - $jsonNode = $jsonNode.$_ - } - return $jsonNode -} - -function Get-ToolcachePackages { - $toolcachePath = Join-Path $env:HOME "image-generation" "toolcache.json" - return Get-Content -Raw $toolcachePath | ConvertFrom-Json -} - -function Invoke-RestMethodWithRetry { - param ( - [Parameter()] - [string] - $Url - ) - Invoke-RestMethod $Url -MaximumRetryCount 10 -RetryIntervalSec 30 -} - -function Invoke-ValidateCommand { - param( - [Parameter(Mandatory)] - [string]$Command, - [Uint] $Timeout = 0 - ) - - if ($Timeout -eq 0) - { - $output = Invoke-Expression -Command $Command - if ($LASTEXITCODE -ne 0) { - throw "Command '$Command' has finished with exit code $LASTEXITCODE" - } - return $output - } - else - { - $job = $command | Start-Job -ScriptBlock { - $output = Invoke-Expression -Command $input - if ($LASTEXITCODE -ne 0) { - throw 'Command failed' - } - return $output - } - $waitObject = $job | Wait-Job -Timeout $Timeout - if(-not $waitObject) - { - throw "Command '$Command' has timed out" - } - if($waitObject.State -eq 'Failed') - { - throw "Command '$Command' has failed" - } - Receive-Job -Job $job - } + $toolsetJson = Get-Content -Path $toolsetPath -Raw + ConvertFrom-Json -InputObject $toolsetJson } function Invoke-DownloadWithRetry { @@ -161,7 +83,7 @@ function Invoke-DownloadWithRetry { Write-Warning "Package download failed in $attemptSeconds seconds" Write-Warning $_.Exception.Message } - + if ($retries -eq 0) { $totalSeconds = [math]::Round(($(Get-Date) - $downloadStartTime).TotalSeconds, 2) throw "Package download failed after $totalSeconds seconds" @@ -174,37 +96,15 @@ function Invoke-DownloadWithRetry { return $Path } -function Add-EnvironmentVariable { - param - ( - [Parameter(Mandatory)] [string] $Name, - [Parameter(Mandatory)] [string] $Value, - [string] $FilePath = "${env:HOME}/.bashrc" - ) - - $envVar = "export {0}={1}" -f $Name, $Value - Add-Content -Path $FilePath -Value $envVar -} - function isVeertu { return (Test-Path -Path "/Library/Application Support/Veertu") } function Get-Architecture { $arch = arch - if ($arch -ne "arm64") - { + if ($arch -ne "arm64") { $arch = "x64" } return $arch } - -function Test-CommandExists { - param - ( - [Parameter(Mandatory)] [string] $Command - ) - - [boolean] (Get-Command $Command -ErrorAction 'SilentlyContinue') -} diff --git a/images/macos/scripts/helpers/Xcode.Helpers.psm1 b/images/macos/scripts/helpers/Xcode.Helpers.psm1 index e6411ce0ca59..a55d8de15a32 100644 --- a/images/macos/scripts/helpers/Xcode.Helpers.psm1 +++ b/images/macos/scripts/helpers/Xcode.Helpers.psm1 @@ -28,14 +28,15 @@ function Get-XcodeToolPath { } function Get-XcodeVersionInfo { - param( + param ( [Parameter(Mandatory)] - [string]$XcodeRootPath + [string] $XcodeRootPath ) $xcodebuildPath = Get-XcodeToolPath -XcodeRootPath $XcodeRootPath -ToolName "xcodebuild" [string]$output = Invoke-Expression "$xcodebuildPath -version" $versionOutputParts = $output.Split(" ") + return @{ Version = [System.Version]::Parse($versionOutputParts[1]) Build = $versionOutputParts[4] @@ -72,11 +73,12 @@ function Test-XcodeStableRelease { $licenseInfoPlistPath = Join-Path $XcodeRootPath "Contents" "Resources" "LicenseInfo.plist" $releaseType = & defaults read $licenseInfoPlistPath "licenseType" + return -not ($releaseType -match "beta") } function Get-XcodeSimulatorsInfo { - param( + param ( [string] $Filter ) @@ -106,6 +108,7 @@ function Get-XcodeDevicesList { $result += "$runtimeName $deviceName" } } + return $result } @@ -120,12 +123,13 @@ function Get-XcodePairsList { $phoneName = $_.Value.phone.name $result += "$watchName $phoneName" } + return $result } #Helper function for execution of xcversion due to: https://github.com/fastlane/fastlane/issues/18161 function Invoke-XCVersion { - param( + param ( [Parameter(Mandatory)] [string] $Arguments, [Parameter()] @@ -133,7 +137,7 @@ function Invoke-XCVersion { [Parameter()] [int] $PauseDurationSecs = 1 ) - + $Command = "xcversion $Arguments" Write-Host "Execute [$Command]" for ($Attempt=1; $Attempt -le $RetryAttempts; $Attempt++) { @@ -150,7 +154,7 @@ function Invoke-XCVersion { } if ($result.ExitCode -ne 0) { throw "Command [$Command] has finished with non-zero exit code." - } + } } function Get-BrokenXcodeSimulatorsList { @@ -305,4 +309,4 @@ function Get-BrokenXcodeSimulatorsList { XcodeVersion = "14.2" } ) -} \ No newline at end of file +} diff --git a/images/macos/scripts/helpers/Xcode.Installer.psm1 b/images/macos/scripts/helpers/Xcode.Installer.psm1 index 2413538c9aad..9ce10ac625f1 100644 --- a/images/macos/scripts/helpers/Xcode.Installer.psm1 +++ b/images/macos/scripts/helpers/Xcode.Installer.psm1 @@ -2,44 +2,41 @@ Import-Module "$PSScriptRoot/Common.Helpers.psm1" Import-Module "$PSScriptRoot/Xcode.Helpers.psm1" function Install-XcodeVersion { - param( + param ( [Parameter(Mandatory)] - [string]$Version, + [string] $Version, [Parameter(Mandatory)] - [string]$LinkTo + [string] $LinkTo ) $xcodeDownloadDirectory = "$env:HOME/Library/Caches/XcodeInstall" $xcodeTargetPath = Get-XcodeRootPath -Version $LinkTo $xcodeXipDirectory = Invoke-DownloadXcodeArchive -DownloadDirectory $xcodeDownloadDirectory -Version $Version Expand-XcodeXipArchive -DownloadDirectory $xcodeXipDirectory.FullName -TargetPath $xcodeTargetPath - Remove-Item -Path $xcodeXipDirectory -Force -Recurse } function Invoke-DownloadXcodeArchive { - param( + param ( [Parameter(Mandatory)] - [string]$DownloadDirectory, + [string] $DownloadDirectory, [Parameter(Mandatory)] - [string]$Version + [string] $Version ) Write-Host "Downloading Xcode $Version" - $tempXipDirectory = New-Item -Path $DownloadDirectory -Name "Xcode$Version" -ItemType "Directory" - $xcodeFileName = 'Xcode-{0}.xip' -f $Version $xcodeUri = '{0}{1}?{2}'-f ${env:XCODE_INSTALL_STORAGE_URL}, $xcodeFileName, ${env:XCODE_INSTALL_SAS} - Invoke-DownloadWithRetry -Url $xcodeUri -Path (Join-Path $tempXipDirectory.FullName $xcodeFileName) | Out-Null + return $tempXipDirectory } function Resolve-ExactXcodeVersion { - param( + param ( [Parameter(Mandatory)] - [string]$Version + [string] $Version ) # if toolset string contains spaces, consider it as a full name of Xcode @@ -50,6 +47,7 @@ function Resolve-ExactXcodeVersion { $semverVersion = [SemVer]::Parse($Version) $availableVersions = Get-AvailableXcodeVersions $satisfiedVersions = $availableVersions | Where-Object { $semverVersion -eq $_.stableSemver } + return $satisfiedVersions | Select-Object -Last 1 -ExpandProperty rawVersion } @@ -75,18 +73,18 @@ function Get-AvailableXcodeVersions { } function Expand-XcodeXipArchive { - param( + param ( [Parameter(Mandatory)] - [string]$DownloadDirectory, + [string] $DownloadDirectory, [Parameter(Mandatory)] - [string]$TargetPath + [string] $TargetPath ) $xcodeXipPath = Get-ChildItem -Path $DownloadDirectory -Filter "Xcode-*.xip" | Select-Object -First 1 Write-Host "Extracting Xcode from '$xcodeXipPath'" Push-Location $DownloadDirectory - if(Test-CommandExists 'unxip') { + if ([boolean] (Get-Command 'unxip' -ErrorAction 'SilentlyContinue')) { Invoke-ValidateCommand "unxip $xcodeXipPath" } else { Invoke-ValidateCommand "xip -x $xcodeXipPath" @@ -107,9 +105,9 @@ function Expand-XcodeXipArchive { } function Confirm-XcodeIntegrity { - param( + param ( [Parameter(Mandatory)] - [string]$Version + [string] $Version ) $XcodeRootPath = Get-XcodeRootPath -Version $Version @@ -120,13 +118,12 @@ function Confirm-XcodeIntegrity { } function Approve-XcodeLicense { - param( + param ( [Parameter(Mandatory)] - [string]$Version + [string] $Version ) $os = Get-OSVersion - $XcodeRootPath = Get-XcodeRootPath -Version $Version Write-Host "Approving Xcode license for '$XcodeRootPath'..." $xcodeBuildPath = Get-XcodeToolPath -XcodeRootPath $XcodeRootPath -ToolName "xcodebuild" @@ -139,9 +136,9 @@ function Approve-XcodeLicense { } function Install-XcodeAdditionalPackages { - param( + param ( [Parameter(Mandatory)] - [string]$Version + [string] $Version ) Write-Host "Installing additional packages for Xcode $Version..." @@ -153,9 +150,9 @@ function Install-XcodeAdditionalPackages { } function Invoke-XcodeRunFirstLaunch { - param( + param ( [Parameter(Mandatory)] - [string]$Version + [string] $Version ) if ($Version.StartsWith("8") -or $Version.StartsWith("9")) { @@ -168,9 +165,9 @@ function Invoke-XcodeRunFirstLaunch { } function Install-AdditionalSimulatorRuntimes { - param( + param ( [Parameter(Mandatory)] - [string]$Version + [string] $Version ) Write-Host "Installing Simulator Runtimes for Xcode $Version ..." @@ -179,10 +176,10 @@ function Install-AdditionalSimulatorRuntimes { } function Build-XcodeSymlinks { - param( + param ( [Parameter(Mandatory)] - [string]$Version, - [string[]]$Symlinks + [string] $Version, + [string[]] $Symlinks ) $sourcePath = Get-XcodeRootPath -Version $Version @@ -193,10 +190,10 @@ function Build-XcodeSymlinks { } } -function Rebuild-XcodeLaunchServicesDb { - param( +function Initialize-XcodeLaunchServicesDb { + param ( [Parameter(Mandatory)] - [string]$Version + [string] $Version ) $xcodePath = Get-XcodeRootPath -Version $Version @@ -205,9 +202,9 @@ function Rebuild-XcodeLaunchServicesDb { } function Build-ProvisionatorSymlink { - param( + param ( [Parameter(Mandatory)] - [string]$Version + [string] $Version ) $sourcePath = Get-XcodeRootPath -Version $Version @@ -222,9 +219,9 @@ function Build-ProvisionatorSymlink { } function Set-XcodeDeveloperDirEnvironmentVariables { - param( + param ( [Parameter(Mandatory)] - [string[]]$XcodeList + [string[]] $XcodeList ) $exactVersionsList = $XcodeList | Where-Object { Test-XcodeStableRelease -Version $_ } | ForEach-Object { @@ -246,3 +243,37 @@ function Set-XcodeDeveloperDirEnvironmentVariables { "export ${variableName}=${variableValue}" | Out-File "$env:HOME/.bashrc" -Append } } + +function Invoke-ValidateCommand { + param ( + [Parameter(Mandatory)] + [string] $Command, + [Uint] $Timeout = 0 + ) + + if ($Timeout -eq 0) { + $output = Invoke-Expression -Command $Command + if ($LASTEXITCODE -ne 0) { + throw "Command '$Command' has finished with exit code $LASTEXITCODE" + } + return $output + } else { + $job = $command | Start-Job -ScriptBlock { + $output = Invoke-Expression -Command $input + if ($LASTEXITCODE -ne 0) { + throw 'Command failed' + } + return $output + } + $waitObject = $job | Wait-Job -Timeout $Timeout + + if (-not $waitObject) { + throw "Command '$Command' has timed out" + } + + if ($waitObject.State -eq 'Failed') { + throw "Command '$Command' has failed" + } + Receive-Job -Job $job + } +} diff --git a/images/macos/scripts/tests/Android.Tests.ps1 b/images/macos/scripts/tests/Android.Tests.ps1 index 335fb7e0eb78..6f73c9a3ff83 100644 --- a/images/macos/scripts/tests/Android.Tests.ps1 +++ b/images/macos/scripts/tests/Android.Tests.ps1 @@ -6,9 +6,9 @@ $os = Get-OSVersion Describe "Android" { $androidSdkManagerPackages = Get-AndroidPackages - [int]$platformMinVersion = Get-ToolsetValue "android.platform_min_version" - [version]$buildToolsMinVersion = Get-ToolsetValue "android.build_tools_min_version" - [array]$ndkVersions = Get-ToolsetValue "android.ndk.versions" + [int]$platformMinVersion = (Get-ToolsetContent).android.platform_min_version + [version]$buildToolsMinVersion = (Get-ToolsetContent).android.build_tools_min_version + [array]$ndkVersions = (Get-ToolsetContent).android.ndk.versions $ndkFullVersions = $ndkVersions | ForEach-Object { Get-ChildItem "$env:ANDROID_HOME/ndk/${_}.*" -Name | Select-Object -Last 1 } | ForEach-Object { "ndk/${_}" } # Platforms starting with a letter are the preview versions, which is not installed on the image $platformVersionsList = ($androidSdkManagerPackages | Where-Object { "$_".StartsWith("platforms;") }) -replace 'platforms;android-', '' | Where-Object { $_ -match "^\d" } | Sort-Object -Unique @@ -25,9 +25,9 @@ Describe "Android" { $platformsInstalled, $buildTools, $ndkFullVersions, - (Get-ToolsetValue "android.extra-list" | ForEach-Object { "extras/${_}" }), - (Get-ToolsetValue "android.addon-list" | ForEach-Object { "add-ons/${_}" }), - (Get-ToolsetValue "android.additional-tools") + ((Get-ToolsetContent).android.extras | ForEach-Object { "extras/${_}" }), + ((Get-ToolsetContent).android.addons | ForEach-Object { "add-ons/${_}" }), + ((Get-ToolsetContent).android.additional_tools) ) | ForEach-Object { $_ } # Remove empty strings from array to avoid possible issues @@ -36,10 +36,10 @@ Describe "Android" { BeforeAll { $ANDROID_SDK_DIR = Join-Path $env:HOME "Library" "Android" "sdk" - function Validate-AndroidPackage { + function Confirm-AndroidPackage { param ( [Parameter(Mandatory = $true)] - [string]$PackageName + [string] $PackageName ) # Convert 'm2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta1' -> @@ -76,7 +76,7 @@ Describe "Android" { It "<PackageName>" -TestCases $testCases { param ([string] $PackageName) - Validate-AndroidPackage $PackageName + Confirm-AndroidPackage $PackageName } } } diff --git a/images/macos/scripts/tests/BasicTools.Tests.ps1 b/images/macos/scripts/tests/BasicTools.Tests.ps1 index 9b49c75caa7a..9e65f7845486 100644 --- a/images/macos/scripts/tests/BasicTools.Tests.ps1 +++ b/images/macos/scripts/tests/BasicTools.Tests.ps1 @@ -1,4 +1,5 @@ Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" + $os = Get-OSVersion Describe "Azure CLI" { @@ -173,7 +174,7 @@ Describe "Homebrew" { Describe "Kotlin" { $kotlinPackages = @("kapt", "kotlin", "kotlinc", "kotlinc-jvm", "kotlin-dce-js") - It "<toolName> is available" -TestCases ($kotlinPackages | ForEach-Object { @{ toolName = $_ } }) { + It "<toolName> is available" -TestCases ($kotlinPackages | ForEach-Object { @{ toolName = $_ } }) { "$toolName -version" | Should -ReturnZeroExitCode } } diff --git a/images/macos/scripts/tests/Browsers.Tests.ps1 b/images/macos/scripts/tests/Browsers.Tests.ps1 index 61c8baaec235..95545a50f7c9 100644 --- a/images/macos/scripts/tests/Browsers.Tests.ps1 +++ b/images/macos/scripts/tests/Browsers.Tests.ps1 @@ -1,4 +1,5 @@ Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" + $os = Get-OSVersion Describe "Chrome" { diff --git a/images/macos/scripts/tests/Common.Tests.ps1 b/images/macos/scripts/tests/Common.Tests.ps1 index de8f6aef9574..720fdd5c8af2 100644 --- a/images/macos/scripts/tests/Common.Tests.ps1 +++ b/images/macos/scripts/tests/Common.Tests.ps1 @@ -10,7 +10,7 @@ Describe ".NET" { } Describe "GCC" { - $testCases = Get-ToolsetValue -KeyPath gcc.versions | ForEach-Object { @{Version = $_ } } + $testCases = (Get-ToolsetContent).gcc.versions | ForEach-Object { @{Version = $_ } } It "GCC <Version>" -TestCases $testCases { param ( @@ -60,7 +60,7 @@ Describe "AzCopy" { Describe "Miniconda" -Skip:($os.IsVentura -or $os.IsSonoma) { It "Conda" { - Get-EnvironmentVariable "CONDA" | Should -Not -BeNullOrEmpty + [System.Environment]::GetEnvironmentVariable("CONDA") | Should -Not -BeNullOrEmpty $condaBinPath = Join-Path $env:CONDA "bin" "conda" "$condaBinPath --version" | Should -ReturnZeroExitCode } @@ -79,8 +79,8 @@ Describe "CocoaPods" { } Describe "VSMac" -Skip:($os.IsVentura -or $os.IsSonoma) { - $vsMacVersions = Get-ToolsetValue "xamarin.vsmac.versions" - $defaultVSMacVersion = Get-ToolsetValue "xamarin.vsmac.default" + $vsMacVersions = (Get-ToolsetContent).xamarin.vsmac.versions + $defaultVSMacVersion = (Get-ToolsetContent).xamarin.vsmac.default $testCases = $vsMacVersions | ForEach-Object { $vsPath = "/Applications/Visual Studio $_.app" diff --git a/images/macos/scripts/tests/Databases.Tests.ps1 b/images/macos/scripts/tests/Databases.Tests.ps1 index 68c0fd390cb7..0c8a7e7d7ccb 100644 --- a/images/macos/scripts/tests/Databases.Tests.ps1 +++ b/images/macos/scripts/tests/Databases.Tests.ps1 @@ -7,14 +7,14 @@ Describe "MongoDB" -Skip:($os.IsVentura -or $os.IsSonoma) { @{ ToolName = "mongo" } @{ ToolName = "mongod" } ) { - $toolsetVersion = Get-ToolsetValue 'mongodb.version' + $toolsetVersion = (Get-ToolsetContent).mongodb.version (&$ToolName --version)[2].Split('"')[-2] | Should -BeLike "$toolsetVersion*" } } Describe "PostgreSQL" -Skip:($os.IsVentura -or $os.IsSonoma) { It "PostgreSQL version should correspond to the version in the toolset" { - $toolsetVersion = Get-ToolsetValue 'postgresql.version' + $toolsetVersion = (Get-ToolsetContent).postgresql.version # Client version (psql --version).split()[-2] | Should -BeLike "$toolsetVersion*" # Server version diff --git a/images/macos/scripts/tests/Git.Tests.ps1 b/images/macos/scripts/tests/Git.Tests.ps1 index 2a9f731e459c..e88bf6bb53ea 100644 --- a/images/macos/scripts/tests/Git.Tests.ps1 +++ b/images/macos/scripts/tests/Git.Tests.ps1 @@ -1,5 +1,5 @@ Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" -$os = Get-OSVersion + Describe "Git" { It "git is installed" { "git --version" | Should -ReturnZeroExitCode diff --git a/images/macos/scripts/tests/Haskell.Tests.ps1 b/images/macos/scripts/tests/Haskell.Tests.ps1 index dbfc402bd436..bc2b6e507700 100644 --- a/images/macos/scripts/tests/Haskell.Tests.ps1 +++ b/images/macos/scripts/tests/Haskell.Tests.ps1 @@ -1,4 +1,5 @@ Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" + $os = Get-OSVersion Describe "Haskell" -Skip:($os.IsVentura -or $os.IsSonoma) { diff --git a/images/macos/scripts/tests/Helpers.psm1 b/images/macos/scripts/tests/Helpers.psm1 index 5f6fa593c8fc..56d689c2c3c8 100644 --- a/images/macos/scripts/tests/Helpers.psm1 +++ b/images/macos/scripts/tests/Helpers.psm1 @@ -1,11 +1,6 @@ Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" -# Validates that tool is installed and in PATH -function Validate-ToolExist($tool) { - Get-Command $tool -ErrorAction SilentlyContinue | Should -BeTrue -} - -function Validate-ArrayWithoutDuplicates { +function Confirm-ArrayWithoutDuplicates { param ( [AllowEmptyCollection()] [Parameter(Mandatory = $true)] @@ -19,7 +14,7 @@ function Validate-ArrayWithoutDuplicates { } } -function Validate-Url { +function Confirm-UrlAvailability { param ( [Parameter(Mandatory)] [ValidateNotNullOrEmpty()] @@ -37,7 +32,7 @@ function Validate-Url { $result | Should -BeTrue -Because "'$Url' should be available, but it is not" } -function Validate-IdenticalFileContent { +function Confirm-IdenticalFileContent { param ( [Parameter(Mandatory)] [string] $File1, @@ -54,7 +49,7 @@ function Validate-IdenticalFileContent { } function ShouldReturnZeroExitCode { - Param( + Param ( [String] $ActualValue, [switch] $Negate, [string] $Because # This parameter is unused by we need it to match Pester asserts signature @@ -65,8 +60,7 @@ function ShouldReturnZeroExitCode { [bool]$succeeded = $result.ExitCode -eq 0 if ($Negate) { $succeeded = -not $succeeded } - if (-not $succeeded) - { + if (-not $succeeded) { $commandOutputIndent = " " * 4 $commandOutput = ($result.Output | ForEach-Object { "${commandOutputIndent}${_}" }) -join "`n" $failureMessage = "Command '${ActualValue}' has finished with exit code ${actualExitCode}`n${commandOutput}" @@ -79,7 +73,7 @@ function ShouldReturnZeroExitCode { } function ShouldMatchCommandOutput { - Param( + Param ( [String] $ActualValue, [String] $RegularExpression, [switch] $Negate @@ -115,7 +109,7 @@ If (Get-Command -Name Add-ShouldOperator -ErrorAction SilentlyContinue) { } function Invoke-PesterTests { - Param( + Param ( [Parameter(Mandatory)][string] $TestFile, [string] $TestName ) diff --git a/images/macos/scripts/tests/Java.Tests.ps1 b/images/macos/scripts/tests/Java.Tests.ps1 index fb2e948f9f55..148b046d14d4 100644 --- a/images/macos/scripts/tests/Java.Tests.ps1 +++ b/images/macos/scripts/tests/Java.Tests.ps1 @@ -14,7 +14,7 @@ function Get-NativeVersionFormat { Describe "Java" { BeforeAll { - function Validate-JavaVersion { + function Confirm-JavaVersion { param($JavaCommand, $ExpectedVersion) $commandResult = Get-CommandResult $JavaCommand @@ -26,7 +26,7 @@ Describe "Java" { } } - $toolsetJava = Get-ToolsetValue "java" + $toolsetJava = (Get-ToolsetContent).java $defaultVersion = $toolsetJava.$arch.default $jdkVersions = $toolsetJava.$arch.versions @@ -44,14 +44,14 @@ Describe "Java" { } It "Java <Version>" -TestCases $_ { - $envVariablePath = Get-EnvironmentVariable $EnvVariable + $envVariablePath = [System.Environment]::GetEnvironmentVariable($EnvVariable) $javaBinPath = Join-Path $envVariablePath "/bin/java" - Validate-JavaVersion -JavaCommand "$javaBinPath -version" -ExpectedVersion $Version + Confirm-JavaVersion -JavaCommand "$javaBinPath -version" -ExpectedVersion $Version } if ($_.Title -eq "Default") { It "Version is default" -TestCases $_ { - Validate-JavaVersion -JavaCommand "java -version" -ExpectedVersion $Version + Confirm-JavaVersion -JavaCommand "java -version" -ExpectedVersion $Version } } } diff --git a/images/macos/scripts/tests/LLVM.Tests.ps1 b/images/macos/scripts/tests/LLVM.Tests.ps1 index 964718e78e7e..9996b8600e6b 100644 --- a/images/macos/scripts/tests/LLVM.Tests.ps1 +++ b/images/macos/scripts/tests/LLVM.Tests.ps1 @@ -2,7 +2,7 @@ Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" Describe "Clang/LLVM" { BeforeAll { - $toolsetVersion = Get-ToolsetValue 'llvm.version' + $toolsetVersion = (Get-ToolsetContent).llvm.version } It "Clang/LLVM <toolsetVersion> is installed and version is correct" { diff --git a/images/macos/scripts/tests/Node.Tests.ps1 b/images/macos/scripts/tests/Node.Tests.ps1 index 7e3757fae345..aa68e83cb048 100644 --- a/images/macos/scripts/tests/Node.Tests.ps1 +++ b/images/macos/scripts/tests/Node.Tests.ps1 @@ -9,7 +9,7 @@ Describe "Node.js" { } It "Node.js version should correspond to the version in the toolset" { - node --version | Should -BeLike "v$(Get-ToolsetValue 'node.default')*" + node --version | Should -BeLike "v$((Get-ToolsetContent).node.default)*" } It "NPM is installed" { @@ -33,7 +33,7 @@ Describe "nvm" -Skip:($os.IsVentura -or $os.IsSonoma) { } Context "nvm versions" { - [array]$nvmVersions = Get-ToolsetValue 'node.nvm_versions' + [array]$nvmVersions = (Get-ToolsetContent).node.nvm_versions $testCases = $nvmVersions | ForEach-Object { @{NvmVersion = $_} } It "<NvmVersion>" -TestCases $testCases { @@ -47,7 +47,7 @@ Describe "nvm" -Skip:($os.IsVentura -or $os.IsSonoma) { } Describe "Global NPM Packages" { - $globalNpmPackages = Get-ToolsetValue "npm.global_packages" + $globalNpmPackages = (Get-ToolsetContent).npm.global_packages $globalNpmPackagesWithTests = $globalNpmPackages | Where-Object { $_.test } | ForEach-Object { @{ Name = $_.name; Test = $_.test } } It "<Name>" -TestCases $globalNpmPackagesWithTests { diff --git a/images/macos/scripts/tests/OpenSSL.Tests.ps1 b/images/macos/scripts/tests/OpenSSL.Tests.ps1 index 4b74b2603d30..1fb8886a8a1a 100644 --- a/images/macos/scripts/tests/OpenSSL.Tests.ps1 +++ b/images/macos/scripts/tests/OpenSSL.Tests.ps1 @@ -13,7 +13,7 @@ Describe "OpenSSL" { $openSSLpath | Should -Exist } } - + Context "OpenSSL 1.1 is default" { It "Default OpenSSL version is 1.1" { $commandResult = Get-CommandResult "openssl version" diff --git a/images/macos/scripts/tests/PHP.Tests.ps1 b/images/macos/scripts/tests/PHP.Tests.ps1 index fb063da397af..c87b36bb420d 100644 --- a/images/macos/scripts/tests/PHP.Tests.ps1 +++ b/images/macos/scripts/tests/PHP.Tests.ps1 @@ -1,13 +1,14 @@ Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" + $os = Get-OSVersion Describe "PHP" { Context "PHP" -Skip:($os.IsVenturaArm64 -or $os.IsSonomaArm64) { It "PHP Path" { - Get-WhichTool "php" | Should -Not -BeLike "/usr/bin/php*" + Get-ToolPath "php" | Should -Not -BeLike "/usr/bin/php*" } It "PHP version" { - $phpVersionToolset = Get-ToolsetValue 'php.version' + $phpVersionToolset = (Get-ToolsetContent).php.version $phpInstalledVersion = php --version | Out-String | Select-String "${phpVersionToolset}" $phpInstalledVersion | Should -BeLike "PHP ${phpVersionToolset}*" } diff --git a/images/macos/scripts/tests/PipxPackages.Tests.ps1 b/images/macos/scripts/tests/PipxPackages.Tests.ps1 index ec47311f46c9..bb7bdc10ec9b 100644 --- a/images/macos/scripts/tests/PipxPackages.Tests.ps1 +++ b/images/macos/scripts/tests/PipxPackages.Tests.ps1 @@ -4,7 +4,7 @@ Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" $os = Get-OSVersion Describe "PipxPackages" -Skip:($os.IsVentura -or $os.IsSonoma) { - $pipxToolset = Get-ToolsetValue "pipx" + $pipxToolset = (Get-ToolsetContent).pipx $testCases = $pipxToolset | ForEach-Object { @{package = $_.package; cmd = $_.cmd} } It "<package>" -TestCases $testCases { "$cmd" | Should -ReturnZeroExitCode diff --git a/images/macos/scripts/tests/Powershell.Tests.ps1 b/images/macos/scripts/tests/Powershell.Tests.ps1 index fa4c6e2a5902..2892c2400e6e 100644 --- a/images/macos/scripts/tests/Powershell.Tests.ps1 +++ b/images/macos/scripts/tests/Powershell.Tests.ps1 @@ -9,7 +9,7 @@ Describe "Powershell" { } Context "Powershell Modules" { - $modules = Get-ToolsetValue powershellModules + $modules = (Get-ToolsetContent).powershellModules $withoutVersionsModules = $modules | Where-Object {-not $_.versions} | ForEach-Object { @{moduleName = $_.name} } @@ -20,7 +20,7 @@ Describe "Powershell" { @{moduleName = $moduleName; expectedVersion = $_} } } - + It "<moduleName> is installed" -TestCases $withoutVersionsModules { param ( [string] $moduleName @@ -28,7 +28,7 @@ Describe "Powershell" { Get-Module -Name $moduleName -ListAvailable | Should -BeTrue } - + if ($withVersionsModules) { It "<moduleName> with <expectedVersion> is installed" -TestCases $withVersionsModules { param ( diff --git a/images/macos/scripts/tests/Python.Tests.ps1 b/images/macos/scripts/tests/Python.Tests.ps1 index 84e85a08ed72..c60d5708263f 100644 --- a/images/macos/scripts/tests/Python.Tests.ps1 +++ b/images/macos/scripts/tests/Python.Tests.ps1 @@ -9,7 +9,7 @@ Describe "Python3" -Skip:($os.IsVenturaArm64 -or $os.IsSonomaArm64) { } It "Python 3 is installed under /usr/local/bin" { - Get-WhichTool "python3" | Should -BeLike "/usr/local/bin*" + Get-ToolPath "python3" | Should -BeLike "/usr/local/bin*" } It "Pip 3 is available" { diff --git a/images/macos/scripts/tests/Ruby.arm64.Tests.ps1 b/images/macos/scripts/tests/Ruby.arm64.Tests.ps1 index 64873954e732..45cc879f1a99 100644 --- a/images/macos/scripts/tests/Ruby.arm64.Tests.ps1 +++ b/images/macos/scripts/tests/Ruby.arm64.Tests.ps1 @@ -9,14 +9,14 @@ Describe "Ruby" -Skip:(-not $os.IsArm64) { } It "Ruby is installed via HomeBrew" { - Get-WhichTool "ruby" | Should -Not -BeLike "/usr/bin/ruby*" + Get-ToolPath "ruby" | Should -Not -BeLike "/usr/bin/ruby*" } It "Ruby tools are consistent" { $expectedPrefix = "/opt/homebrew" - Get-WhichTool "ruby" | Should -Match "$($expectedPrefix)*" - Get-WhichTool "gem" | Should -Match "$($expectedPrefix)*" - Get-WhichTool "bundler" | Should -Match "$($expectedPrefix)*" + Get-ToolPath "ruby" | Should -Match "$($expectedPrefix)*" + Get-ToolPath "gem" | Should -Match "$($expectedPrefix)*" + Get-ToolPath "bundler" | Should -Match "$($expectedPrefix)*" } It "Ruby gems permissions are valid" { diff --git a/images/macos/scripts/tests/Ruby.x64.Tests.ps1 b/images/macos/scripts/tests/Ruby.x64.Tests.ps1 index ded146dd4563..b458278b3d25 100644 --- a/images/macos/scripts/tests/Ruby.x64.Tests.ps1 +++ b/images/macos/scripts/tests/Ruby.x64.Tests.ps1 @@ -9,14 +9,14 @@ Describe "Ruby" -Skip:($os.IsArm64) { } It "Ruby is installed via HomeBrew" { - Get-WhichTool "ruby" | Should -Not -BeLike "/usr/bin/ruby*" + Get-ToolPath "ruby" | Should -Not -BeLike "/usr/bin/ruby*" } It "Ruby tools are consistent" { $expectedPrefix = "/usr/local" - Get-WhichTool "ruby" | Should -Match "$($expectedPrefix)*" - Get-WhichTool "gem" | Should -Match "$($expectedPrefix)*" - Get-WhichTool "bundler" | Should -Match "$($expectedPrefix)*" + Get-ToolPath "ruby" | Should -Match "$($expectedPrefix)*" + Get-ToolPath "gem" | Should -Match "$($expectedPrefix)*" + Get-ToolPath "bundler" | Should -Match "$($expectedPrefix)*" } It "Ruby gems permissions are valid" { diff --git a/images/macos/scripts/tests/RubyGem.Tests.ps1 b/images/macos/scripts/tests/RubyGem.Tests.ps1 index fb07ce9beaf9..f5ef6f1557fb 100644 --- a/images/macos/scripts/tests/RubyGem.Tests.ps1 +++ b/images/macos/scripts/tests/RubyGem.Tests.ps1 @@ -1,13 +1,13 @@ Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" + $os = Get-OSVersion Describe "RubyGems" { - $gemTestCases = Get-ToolsetValue -KeyPath "ruby.rubygems" | ForEach-Object { + $gemTestCases = (Get-ToolsetContent).ruby.rubygems | ForEach-Object { @{gemName = $_} } - if ($gemTestCases) - { + if ($gemTestCases) { It "Gem <gemName> is installed" -TestCases $gemTestCases { "gem list -i '^$gemName$'" | Should -MatchCommandOutput "true" } diff --git a/images/macos/scripts/tests/Rust.Tests.ps1 b/images/macos/scripts/tests/Rust.Tests.ps1 index 72cb59a6979a..b5c1c53fc507 100644 --- a/images/macos/scripts/tests/Rust.Tests.ps1 +++ b/images/macos/scripts/tests/Rust.Tests.ps1 @@ -1,4 +1,5 @@ Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" + $os = Get-OSVersion Describe "Rust" { diff --git a/images/macos/scripts/tests/Toolcache.Tests.ps1 b/images/macos/scripts/tests/Toolcache.Tests.ps1 index e2b1a722632e..4f57962ec6a8 100644 --- a/images/macos/scripts/tests/Toolcache.Tests.ps1 +++ b/images/macos/scripts/tests/Toolcache.Tests.ps1 @@ -6,7 +6,7 @@ $os = Get-OSVersion Describe "Toolcache" { $toolcacheDirectory = Join-Path $env:HOME "hostedtoolcache" - [array]$packages += Get-ToolsetValue -KeyPath "toolcache" | ForEach-Object { + [array]$packages += (Get-ToolsetContent).toolcache | ForEach-Object { return [PSCustomObject] @{ ToolName = ($_.name).ToLower() Arch = $arch diff --git a/images/macos/scripts/tests/Toolset.Tests.ps1 b/images/macos/scripts/tests/Toolset.Tests.ps1 index 5baef204467a..f2aa3cd7a6fd 100644 --- a/images/macos/scripts/tests/Toolset.Tests.ps1 +++ b/images/macos/scripts/tests/Toolset.Tests.ps1 @@ -39,83 +39,82 @@ $toolsets | ForEach-Object { It "Version '$vsmacVersion' is available and can be downloaded" { $vsmacUrl = Invoke-BashUtilsFunction("buildVSMacDownloadUrl", $vsmacVersion) - Validate-Url $vsmacUrl + Confirm-UrlAvailability $vsmacUrl } } Context "Mono" { - $sdkVersions = $toolset.xamarin."mono-versions" + $sdkVersions = $toolset.xamarin.mono_versions $sdkVersions | ForEach-Object { It "Version '$_' is available and can be downloaded" { $sdkUrl = Invoke-BashUtilsFunction("buildMonoDownloadUrl", $_) - Validate-Url $sdkUrl + Confirm-UrlAvailability $sdkUrl } } It "Version list doesn't contain versions with the same major/minor version" { $versions = $sdkVersions | ForEach-Object { Get-ShortVersion $_ } - Validate-ArrayWithoutDuplicates $versions -Because "It doesn't allow to install more than one version with the same major/minor" + Confirm-ArrayWithoutDuplicates $versions -Because "It doesn't allow to install more than one version with the same major/minor" } } Context "Xamarin.iOS" { - $sdkVersions = $toolset.xamarin."ios-versions" + $sdkVersions = $toolset.xamarin.ios_versions $sdkVersions | ForEach-Object { It "Version '$_' is available and can be downloaded" { $sdkUrl = Invoke-BashUtilsFunction("buildXamariniIOSDownloadUrl", $_) - Validate-Url $sdkUrl + Confirm-UrlAvailability $sdkUrl } } It "Version list doesn't contain versions with the same major/minor version" { $versions = $sdkVersions | ForEach-Object { Get-ShortVersion $_ } - Validate-ArrayWithoutDuplicates $versions -Because "It doesn't allow to install more than one version with the same major/minor" + Confirm-ArrayWithoutDuplicates $versions -Because "It doesn't allow to install more than one version with the same major/minor" } } Context "Xamarin.Mac" { - $sdkVersions = $toolset.xamarin."mac-versions" + $sdkVersions = $toolset.xamarin.mac_versions $sdkVersions | ForEach-Object { It "Version '$_' is available and can be downloaded" { $sdkUrl = Invoke-BashUtilsFunction("buildXamarinMacDownloadUrl", $_) - Validate-Url $sdkUrl + Confirm-UrlAvailability $sdkUrl } } It "Version list doesn't contain versions with the same major/minor version" { $versions = $sdkVersions | ForEach-Object { Get-ShortVersion $_ } - Validate-ArrayWithoutDuplicates $versions -Because "It doesn't allow to install more than one version with the same major/minor" + Confirm-ArrayWithoutDuplicates $versions -Because "It doesn't allow to install more than one version with the same major/minor" } } Context "Xamarin.Android" { - $sdkVersions = $toolset.xamarin."android-versions" + $sdkVersions = $toolset.xamarin.android_versions $sdkVersions | ForEach-Object { It "Version '$_' is available and can be downloaded" { $sdkUrl = Invoke-BashUtilsFunction("buildXamarinAndroidDownloadUrl", $_) - Validate-Url $sdkUrl + Confirm-UrlAvailability $sdkUrl } } It "Version list doesn't contain versions with the same major/minor version" { $versions = $sdkVersions | ForEach-Object { $_.Replace("-", ".") } | ForEach-Object { Get-ShortVersion $_ } - Validate-ArrayWithoutDuplicates $versions -Because "It doesn't allow to install more than one version with the same major/minor" + Confirm-ArrayWithoutDuplicates $versions -Because "It doesn't allow to install more than one version with the same major/minor" } } Context "Xamarin bundles" { - $monoVersions = $toolset.xamarin."mono-versions" | ForEach-Object { Get-ShortVersion $_ } - $iOSVersions = $toolset.xamarin."ios-versions" | ForEach-Object { Get-ShortVersion $_ } - $macVersions = $toolset.xamarin."mac-versions" | ForEach-Object { Get-ShortVersion $_ } + $monoVersions = $toolset.xamarin.mono_versions | ForEach-Object { Get-ShortVersion $_ } + $iOSVersions = $toolset.xamarin.ios_versions | ForEach-Object { Get-ShortVersion $_ } + $macVersions = $toolset.xamarin.mac_versions | ForEach-Object { Get-ShortVersion $_ } # Old Xamarin.Android version looks like "9.0.0-18" that doesn't support by System.Version - $androidVersions = $toolset.xamarin."android-versions" | ForEach-Object { Get-ShortVersion $_.Replace("-", ".") } - - + $androidVersions = $toolset.xamarin.android_versions | ForEach-Object { Get-ShortVersion $_.Replace("-", ".") } $bundles = $toolset.xamarin.bundles + $bundles | ForEach-Object { It "'$($_.symlink)' is valid" { $monoVersions | Should -Contain $_.mono @@ -127,18 +126,16 @@ $toolsets | ForEach-Object { It "Each bundle has unique symlink" { $symlinks = $bundles | ForEach-Object { $_.symlink } - Validate-ArrayWithoutDuplicates $symlinks -Because "Bundle symlinks should be unique" + Confirm-ArrayWithoutDuplicates $symlinks -Because "Bundle symlinks should be unique" } It "Current bundle is valid" { - $currentBundleSymlink = $toolset.xamarin."bundle-default" + $currentBundleSymlink = $toolset.xamarin.bundle_default if ($currentBundleSymlink -ne "latest") { $bundleSymlinks = $bundles | ForEach-Object { $_.symlink } $bundleSymlinks | Should -Contain $currentBundleSymlink -Because "Current bundle should be installed" } - } - } } } diff --git a/images/macos/scripts/tests/Xamarin.Tests.ps1 b/images/macos/scripts/tests/Xamarin.Tests.ps1 index 501ade256e11..7796b4c59ac6 100644 --- a/images/macos/scripts/tests/Xamarin.Tests.ps1 +++ b/images/macos/scripts/tests/Xamarin.Tests.ps1 @@ -2,16 +2,17 @@ Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" Import-Module "$PSScriptRoot/Helpers.psm1" -DisableNameChecking $os = Get-OSVersion + if ($os.IsVentura -or $os.IsSonoma) { - $MONO_VERSIONS = @(Get-ToolsetValue "mono.framework.version") + $MONO_VERSIONS = @((Get-ToolsetContent).mono.framework.version) $XAMARIN_IOS_VERSIONS = @() $XAMARIN_MAC_VERSIONS = @() $XAMARIN_ANDROID_VERSIONS = @() } elseif ($os.IsBigSur -or $os.IsMonterey) { - $MONO_VERSIONS = Get-ToolsetValue "xamarin.mono-versions" - $XAMARIN_IOS_VERSIONS = Get-ToolsetValue "xamarin.ios-versions" - $XAMARIN_MAC_VERSIONS = Get-ToolsetValue "xamarin.mac-versions" - $XAMARIN_ANDROID_VERSIONS = Get-ToolsetValue "xamarin.android-versions" + $MONO_VERSIONS = (Get-ToolsetContent).xamarin.mono_versions + $XAMARIN_IOS_VERSIONS = (Get-ToolsetContent).xamarin.ios_versions + $XAMARIN_MAC_VERSIONS = (Get-ToolsetContent).xamarin.mac_versions + $XAMARIN_ANDROID_VERSIONS = (Get-ToolsetContent).xamarin.android_versions } BeforeAll { @@ -53,7 +54,7 @@ Describe "Mono" { $shortVersionPath = Join-Path $shortSymlinkFolderPath "VERSION" $fullVersionPath = Join-Path $VersionFolderPath "VERSION" - Validate-IdenticalFileContent -File1 $shortVersionPath -File2 $fullVersionPath + Confirm-IdenticalFileContent -File1 $shortVersionPath -File2 $fullVersionPath } It "NUnit console is installed" -TestCases $testCase { @@ -116,7 +117,7 @@ Describe "Xamarin.iOS" -Skip:($os.IsVentura -or $os.IsSonoma) { $shortVersionPath = Join-Path $shortSymlinkFolderPath "VERSION" $fullVersionPath = Join-Path $VersionFolderPath "VERSION" - Validate-IdenticalFileContent -File1 $shortVersionPath -File2 $fullVersionPath + Confirm-IdenticalFileContent -File1 $shortVersionPath -File2 $fullVersionPath } } } @@ -149,7 +150,7 @@ Describe "Xamarin.Mac" -Skip:($os.IsVentura -or $os.IsSonoma) { $shortVersionPath = Join-Path $shortSymlinkFolderPath "VERSION" $fullVersionPath = Join-Path $VersionFolderPath "VERSION" - Validate-IdenticalFileContent -File1 $shortVersionPath -File2 $fullVersionPath + Confirm-IdenticalFileContent -File1 $shortVersionPath -File2 $fullVersionPath } } } @@ -181,7 +182,7 @@ Describe "Xamarin.Android" -Skip:($os.IsVentura -or $os.IsSonoma) { $shortVersionPath = Join-Path $shortSymlinkFolderPath "VERSION" $fullVersionPath = Join-Path $VersionFolderPath "VERSION" - Validate-IdenticalFileContent -File1 $shortVersionPath -File2 $fullVersionPath + Confirm-IdenticalFileContent -File1 $shortVersionPath -File2 $fullVersionPath } It "has correct symlinks" -TestCases $testCase { @@ -205,8 +206,8 @@ Describe "Xamarin Bundles" -Skip:($os.IsVentura -or $os.IsSonoma) { If ($XAMARIN_BUNDLES.Count -eq 0) { return } # Skip this test if there are no bundles - [array]$XAMARIN_BUNDLES = Get-ToolsetValue "xamarin.bundles" - $XAMARIN_DEFAULT_BUNDLE = Get-ToolsetValue "xamarin.bundle-default" + [array]$XAMARIN_BUNDLES = (Get-ToolsetContent).xamarin.bundles + $XAMARIN_DEFAULT_BUNDLE = (Get-ToolsetContent).xamarin.bundle_default If ($XAMARIN_DEFAULT_BUNDLE -eq "latest") { $XAMARIN_DEFAULT_BUNDLE = $XAMARIN_BUNDLES[0].symlink } $currentBundle = [PSCustomObject] @{ @@ -244,7 +245,7 @@ Describe "Xamarin Bundles" -Skip:($os.IsVentura -or $os.IsSonoma) { $sourceVersionPath = Join-Path $MONO_VERSIONS_PATH $BundleMono "VERSION" $targetVersionPath = Join-Path $MONO_VERSIONS_PATH $BundleSymlink "VERSION" - Validate-IdenticalFileContent -File1 $targetVersionPath -File2 $sourceVersionPath + Confirm-IdenticalFileContent -File1 $targetVersionPath -File2 $sourceVersionPath } It "iOS symlink <BundleSymlink> exists" -TestCases $allBundles { @@ -262,7 +263,7 @@ Describe "Xamarin Bundles" -Skip:($os.IsVentura -or $os.IsSonoma) { $sourceVersionPath = Join-Path $XAMARIN_IOS_VERSIONS_PATH $BundleIos "VERSION" $targetVersionPath = Join-Path $XAMARIN_IOS_VERSIONS_PATH $BundleSymlink "VERSION" - Validate-IdenticalFileContent -File1 $targetVersionPath -File2 $sourceVersionPath + Confirm-IdenticalFileContent -File1 $targetVersionPath -File2 $sourceVersionPath } It "Mac symlink <BundleSymlink> exists" -TestCases $allBundles { @@ -280,7 +281,7 @@ Describe "Xamarin Bundles" -Skip:($os.IsVentura -or $os.IsSonoma) { $sourceVersionPath = Join-Path $XAMARIN_MAC_VERSIONS_PATH $BundleMac "VERSION" $targetVersionPath = Join-Path $XAMARIN_MAC_VERSIONS_PATH $BundleSymlink "VERSION" - Validate-IdenticalFileContent -File1 $targetVersionPath -File2 $sourceVersionPath + Confirm-IdenticalFileContent -File1 $targetVersionPath -File2 $sourceVersionPath } It "Xamarin.Android symlink <BundleSymlink> exists" -TestCases $allBundles { @@ -298,7 +299,7 @@ Describe "Xamarin Bundles" -Skip:($os.IsVentura -or $os.IsSonoma) { $sourceVersionPath = Join-Path $XAMARIN_ANDROID_VERSIONS_PATH $BundleAndroid "VERSION" $targetVersionPath = Join-Path $XAMARIN_ANDROID_VERSIONS_PATH $BundleSymlink "VERSION" - Validate-IdenticalFileContent -File1 $targetVersionPath -File2 $sourceVersionPath + Confirm-IdenticalFileContent -File1 $targetVersionPath -File2 $sourceVersionPath } } diff --git a/images/macos/scripts/tests/Xcode.Tests.ps1 b/images/macos/scripts/tests/Xcode.Tests.ps1 index 6ef32baac69b..912fccb7f48b 100644 --- a/images/macos/scripts/tests/Xcode.Tests.ps1 +++ b/images/macos/scripts/tests/Xcode.Tests.ps1 @@ -2,14 +2,20 @@ Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" Import-Module "$PSScriptRoot/../helpers/Xcode.Helpers.psm1" Import-Module "$PSScriptRoot/Helpers.psm1" -DisableNameChecking -$ARCH = Get-Architecture -$xcodeVersions = Get-ToolsetValue "xcode.$ARCH.versions" -$defaultXcode = Get-ToolsetValue "xcode.default" +$arch = Get-Architecture +$xcodeVersions = (Get-ToolsetContent).xcode.${arch}.versions +$defaultXcode = (Get-ToolsetContent).xcode.default $latestXcodeVersion = $xcodeVersions | Select-Object -First 1 $os = Get-OSVersion Describe "Xcode" { - $testCases = $xcodeVersions | ForEach-Object { @{ XcodeVersion = $_.link; LatestXcodeVersion = $xcodeVersions[0].link; Symlinks = $_.symlinks } } + $testCases = $xcodeVersions | ForEach-Object { + @{ + XcodeVersion = $_.link; + LatestXcodeVersion = $xcodeVersions[0].link; + Symlinks = $_.symlinks + } + } Context "Versions" { It "<XcodeVersion>" -TestCases $testCases { @@ -82,7 +88,7 @@ Describe "XCODE_DEVELOPER_DIR variables" { It "XCODE_<MajorVersion>_DEVELOPER_DIR" -TestCases $testCases { $variableName = "XCODE_${MajorVersion}_DEVELOPER_DIR" - $actualPath = Get-EnvironmentVariable $variableName + $actualPath = [System.Environment]::GetEnvironmentVariable($variableName) $expectedVersion = $VersionsList | Where-Object { $_.Version.Major -eq $MajorVersion } | Select-Object -First 1 $expectedPath = "$($expectedVersion.RootPath)/Contents/Developer" $actualPath | Should -Exist @@ -99,21 +105,13 @@ Describe "Xcode simulators" { [array]$devicesList = @(Get-XcodeDevicesList | Where-Object { $_ }) Write-Host "Devices for $XcodeVersion" Write-Host ($devicesList -join "`n") - Validate-ArrayWithoutDuplicates $devicesList -Because "Found duplicate device simulators" + Confirm-ArrayWithoutDuplicates $devicesList -Because "Found duplicate device simulators" } - -# It "No duplicates in pairs" -TestCases $testCase { -# Switch-Xcode -Version $XcodeVersion -# [array]$pairsList = @(Get-XcodePairsList | Where-Object { $_ }) -# Write-Host "Pairs for $XcodeVersion" -# Write-Host ($pairsList -join "`n") -# Validate-ArrayWithoutDuplicates $pairsList -Because "Found duplicate pairs simulators" -# } } } AfterEach { - $defaultXcode = Get-ToolsetValue "xcode.default" + $defaultXcode = (Get-ToolsetContent).xcode.default Switch-Xcode -Version $defaultXcode } } diff --git a/images/macos/toolsets/Readme.md b/images/macos/toolsets/Readme.md index 14453889a92a..1ac8e98c1205 100644 --- a/images/macos/toolsets/Readme.md +++ b/images/macos/toolsets/Readme.md @@ -1,22 +1,26 @@ # Toolset JSON structure + ## Xcode + - `versions` - the array of objects that will present installed Xcode versions - - `link` property points to the place where Xcode will be located on image. `/Applications/Xcode_<link>.app` - - `version` points to Xcode version that will be downloaded and installed - - `symlinks` describes the list of aliases where symlinks will be created to + - `link` property points to the place where Xcode will be located on image. `/Applications/Xcode_<link>.app` + - `version` points to Xcode version that will be downloaded and installed + - `symlinks` describes the list of aliases where symlinks will be created to - `default` - version of Xcode to set as default (should be metched with any `link` in `versions` property) **Example:** `"11.2"` **Note:** + - If `version` is specified with spaces, it is considered as exact Xcode name like `12.1.1 Release Candidate`. - If `version` doesn't contain spaces, the latest version will be resolved with the following priority: - - stable version like `12.1` - - release candidate version like `12.1 Release Candidate N` (the latest N will be chosen) - - GM version like `12.1 GM Seed N` (the latest N will be chosen) - - beta version like `12.1 beta N` (the latest N will be chosen) + - stable version like `12.1` + - release candidate version like `12.1 Release Candidate N` (the latest N will be chosen) + - GM version like `12.1 GM Seed N` (the latest N will be chosen) + - beta version like `12.1 beta N` (the latest N will be chosen) **Example:** -``` + +```json "versions": [ { "link": "12.2", "version": "12.2.0" }, { "link": "11.7", "version": "11.7.0", "symlinks": ["11.7_beta"] } @@ -24,27 +28,26 @@ ``` ## Xamarin + - `vsmac` - version of Visual Studio For Mac to install. **Example:** `"8.3.11.1"` -- `mono-versions` - the array of Mono versions to install. +- `mono_versions` - the array of Mono versions to install. **Example:** `[ "6.4.0.208", "6.0.0.334" ]` -- `ios-versions` - the array of Xamarin iOS versions to install. +- `ios_versions` - the array of Xamarin iOS versions to install. **Example:** `[ "13.6.0.12", "13.4.0.2", "13.2.0.47" ]` -- `mac-versions` - the array of Xamarin iOS versions to install. +- `mac_versions` - the array of Xamarin iOS versions to install. **Example:** `[ "6.6.0.12", "6.4.0.2", "6.2.0.47" ]` -- `android-versions` - the array of Xamarin iOS versions to install. +- `android_versions` - the array of Xamarin iOS versions to install. **Example:** `[ "10.0.6.2", "9.4.1.0" ]` -**Note:** More than one version of SDK with the same major.minor version should not be installed. It applies to `mono-versions`, `ios-versions`, `mac-versions`, `android-versions` fields. +**Note:** More than one version of SDK with the same major.minor version should not be installed. It applies to `mono_versions`, `ios_versions`, `mac_versions`, `android_versions` fields. For example, if Mono `6.4.0.100` is installed and Mono `6.4.1.2` was released recently, we should not install both, just update `6.4.0.100` -> `6.4.1.2`. Only major and minor version changes can break backward compatibility so it is safe. - -<br> -- `bundle-default` - the symlink of the bundle that will be set as default on the image. +- `bundle_default` - the symlink of the bundle that will be set as default on the image. This bundle will be set as `Current`. **Example:** `"5_12_0"` (set bundle with symlink `5_12_0` as default) **Example:** `"latest"` (set latest bundle as default) @@ -59,9 +62,9 @@ The first bundle in the list will be as `Latest`. - `mac` - version of Xamarin.Mac that will be set in this bundle. Only two numbers (`major.minor`) should be specified. - `android` - version of Xamarin.Android that will be set in this bundle. Only two numbers (`major.minor`) should be specified. +**Example:** - **Example:** -``` +```json [ { "symlink": "6_4_2", @@ -81,19 +84,20 @@ The first bundle in the list will be as `Latest`. ``` ## Android + - `platform-list` - the array of android platforms to install. **Example:** `[ "android-29", "android-28", "android-27" ]` - `build-tools` - the array of android build tools to install. **Example:** `[ "29.0.2", "29.0.1", "29.0.0", "28.0.3" ]` -- `extra-list` - the array of android extra items to install. +- `extras` - the array of android extra items to install. **Example:** `[ "google;google_play_services", "intel;Hardware_Accelerated_Execution_Manager" ]` -- `addon-list` - the array of android addons to install. +- `addons` - the array of android addons to install. **Example:** `[ "addon-google_apis-google-24", "addon-google_apis-google-23" ]` +## Toolset JSON validation -# Toolset JSON validation File `Toolset.Tests.ps1` contains PowerShell [Pester](https://github.com/Pester/Pester) tests that validate JSON toolset files. -Type `Invoke-Pester` in the current folder in PowerShell to run tests. \ No newline at end of file +Type `Invoke-Pester` in the current folder in PowerShell to run tests. diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index c292e6fe9f9b..a7b656d94957 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -17,19 +17,19 @@ "default": "2022", "versions": [ "2019", "2022" ] }, - "mono-versions": [ + "mono_versions": [ "6.12.0.188" ], - "ios-versions": [ + "ios_versions": [ "15.8.0.3", "15.6.0.3", "15.4.0.0", "15.2.0.17", "15.0.0.6", "14.20.0.24", "14.16.0.5", "14.14.2.5", "14.10.0.4", "14.8.0.3", "14.6.0.15", "14.4.1.3", "14.2.0.12", "14.0.0.0", "13.20.2.2" ], - "mac-versions": [ + "mac_versions": [ "8.8.0.3", "8.6.0.3", "8.4.0.0", "8.2.0.17", "7.14.0.27", "7.10.0.5", "7.8.2.5", "7.4.0.10", "7.2.0.3", "7.0.0.15", "6.22.1.26", "6.20.2.2" ], - "android-versions": [ + "android_versions": [ "12.2.8.3", "12.1.0.2", "12.0.0.3", "11.3.0.4", "11.2.2.1", "11.1.0.26", "11.0.2.0" ], - "bundle-default": "6_12_12", + "bundle_default": "6_12_12", "bundles": [ { "symlink": "6_12_16", @@ -162,11 +162,11 @@ "cmdline-tools": "commandlinetools-mac-9123335_latest.zip", "platform_min_version": "27", "build_tools_min_version": "27.0.0", - "extra-list": [ + "extras": [ "android;m2repository", "google;m2repository", "google;google_play_services" ], - "addon-list": [], - "additional-tools": [ + "addons": [], + "additional_tools": [ "cmake;3.10.2.4988404", "cmake;3.18.1", "cmake;3.22.1" diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index 01fa8c30c8b5..72e06fc7688b 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -18,19 +18,19 @@ "default": "2022", "versions": [ "2019", "2022" ] }, - "mono-versions": [ + "mono_versions": [ "6.12.0.188" ], - "ios-versions": [ + "ios_versions": [ "16.2.0.5", "16.1.1.27", "16.0.0.72", "15.12.0.2", "15.10.0.5", "15.8.0.3", "15.6.0.3", "15.4.0.0", "15.2.0.17", "15.0.0.6" ], - "mac-versions": [ + "mac_versions": [ "9.1.0.5", "9.0.0.27", "8.12.0.2", "8.10.0.5", "8.8.0.3", "8.6.0.3", "8.4.0.0", "8.2.0.17", "7.14.0.27" ], - "android-versions": [ + "android_versions": [ "13.2.1.2", "13.1.0.1", "13.0.0.0", "12.3.3.3", "12.2.8.3", "12.1.0.2", "12.0.0.3", "11.3.0.4" ], - "bundle-default": "6_12_21", + "bundle_default": "6_12_21", "bundles": [ { "symlink": "6_12_24", @@ -149,11 +149,11 @@ "cmdline-tools": "commandlinetools-mac-9123335_latest.zip", "platform_min_version": "27", "build_tools_min_version": "27.0.0", - "extra-list": [ + "extras": [ "android;m2repository", "google;m2repository", "google;google_play_services" ], - "addon-list": [], - "additional-tools": [ + "addons": [], + "additional_tools": [ "cmake;3.18.1", "cmake;3.22.1" ], diff --git a/images/macos/toolsets/toolset-13.json b/images/macos/toolsets/toolset-13.json index 3258b3dadc1c..ced440632b24 100644 --- a/images/macos/toolsets/toolset-13.json +++ b/images/macos/toolsets/toolset-13.json @@ -33,11 +33,11 @@ "sdk-tools": "sdk-tools-darwin-4333796.zip", "platform_min_version": "33", "build_tools_min_version": "33.0.2", - "extra-list": [ + "extras": [ "android;m2repository", "google;m2repository", "google;google_play_services" ], - "addon-list": [], - "additional-tools": [ + "addons": [], + "additional_tools": [ "cmake;3.22.1" ], "ndk": { diff --git a/images/macos/toolsets/toolset-14.json b/images/macos/toolsets/toolset-14.json index d9ea4f71f0dd..dbe70586d869 100644 --- a/images/macos/toolsets/toolset-14.json +++ b/images/macos/toolsets/toolset-14.json @@ -29,11 +29,11 @@ "sdk-tools": "sdk-tools-darwin-4333796.zip", "platform_min_version": "33", "build_tools_min_version": "33.0.2", - "extra-list": [ + "extras": [ "android;m2repository", "google;m2repository", "google;google_play_services" ], - "addon-list": [], - "additional-tools": [ + "addons": [], + "additional_tools": [ "cmake;3.22.1" ], "ndk": { From e1087645094be8e32e53223f40d8521ac424828a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 5 Dec 2023 12:54:10 +0100 Subject: [PATCH 2507/3485] Updating readme file for macOS-12 version 20231127.1 (#8921) Co-authored-by: Image generation service account <no-reply@microsoft.com> --- images/macos/macos-12-Readme.md | 58 ++++++++++++++++----------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/images/macos/macos-12-Readme.md b/images/macos/macos-12-Readme.md index 9bf21698b9d1..d0ebc5eff949 100644 --- a/images/macos/macos-12-Readme.md +++ b/images/macos/macos-12-Readme.md @@ -2,12 +2,11 @@ |-| | [[all OSs] Nodejs 14.x will be removed from the images on November, 26](https://github.com/actions/runner-images/issues/8779) | | [Major Refactoring of GitHub Actions Runner Images Repository](https://github.com/actions/runner-images/issues/8706) | -| [[All OS] Android NDK r23 will be removed from images on November 13](https://github.com/actions/runner-images/issues/8383) | *** # macOS 12 - OS Version: macOS 12.7.1 (21G920) - Kernel Version: Darwin 21.6.0 -- Image Version: 20231115.2 +- Image Version: 20231127.1 ## Installed Software @@ -23,15 +22,15 @@ - GNU Fortran 12 (Homebrew GCC 12.3.0) - available by `gfortran-12` alias - GNU Fortran 13 (Homebrew GCC 13.2.0) - available by `gfortran-13` alias - Julia 1.9.4 -- Kotlin 1.9.255-SNAPSHOT +- Kotlin 1.9.21-release-633 - Go 1.20.11 - Mono 6.12.0.188 - Node.js 18.18.2 - MSBuild 16.10.1.51301 (Mono 6.12.0.188) - NVM 0.39.5 -- NVM - Cached node versions: 14.21.3, 16.20.2, 18.18.2, 20.9.0 -- Perl 5.38.0 -- PHP 8.2.12 +- NVM - Cached node versions: 16.20.2, 18.18.2, 20.10.0 +- Perl 5.38.1 +- PHP 8.3.0 - Python 2.7.18 - Python3 3.12.0 - R 4.3.2 @@ -40,17 +39,17 @@ ### Package Management - Bundler 2.4.22 - Carthage 0.39.1 -- CocoaPods 1.14.2 +- CocoaPods 1.14.3 - Composer 2.6.5 -- Homebrew 4.1.20 -- Miniconda 23.9.0 +- Homebrew 4.1.22 +- Miniconda 23.10.0 - NPM 9.8.1 - NuGet 6.3.1.1 - Pip 20.3.4 (python 2.7) - Pip3 23.3.1 (python 3.12) - Pipx 1.2.1 - RubyGems 3.4.22 -- Vcpkg 2023 (build from commit 2b14b606c) +- Vcpkg 2023 (build from commit 13c3c0fcc) - Yarn 1.22.19 #### Environment variables @@ -70,10 +69,10 @@ - aria2 1.37.0 - azcopy 10.21.2 - bazel 6.4.0 -- bazelisk 1.18.0 +- bazelisk 1.19.0 - bsdtar 3.5.1 - available by 'tar' alias - Curl 8.4.0 -- Git 2.42.1 +- Git 2.43.0 - Git LFS 3.4.0 - GitHub CLI 2.39.1 - GNU Tar 1.35 - available by 'gtar' alias @@ -93,29 +92,31 @@ - Switchaudio-osx 1.2.2 - Vagrant 2.4.0 - VirtualBox 6.1.38r153438 -- yq 4.35.2 +- yq 4.40.3 - zstd 1.5.5 ### Tools - App Center CLI 2.14.0 -- AWS CLI 2.13.35 -- AWS SAM CLI 1.102.0 +- AWS CLI 2.13.39 +- AWS SAM CLI 1.103.0 - AWS Session Manager CLI 1.2.497.0 - Azure CLI 2.54.0 - Azure CLI (azure-devops) 0.26.0 - Bicep CLI 0.23.1 - Cabal 3.6.2.0 -- Cmake 3.27.7 -- CodeQL Action Bundle 2.15.2 -- Colima 0.6.2 +- Cmake 3.27.8 +- CodeQL Action Bundle 2.15.3 +- Colima 0.6.6 - Fastlane 2.217.0 - GHC 9.8.1 - GHCup 0.1.20.0 - Jazzy 0.14.4 - Stack 2.13.1 -- SwiftFormat 0.52.9 +- SwiftFormat 0.52.10 - Swig 4.1.1 +- Xcbeautify 1.0.1 - Xcode Command Line Tools 14.2.0.0.1.1668646533 +- Xcodes 1.4.1 ### Linters - SwiftLint 0.53.0 @@ -127,9 +128,9 @@ - Google Chrome 119.0.6045.159 - Google Chrome for Testing 119.0.6045.105 - ChromeDriver 119.0.6045.105 -- Microsoft Edge 119.0.2151.58 -- Microsoft Edge WebDriver 119.0.2151.58 -- Mozilla Firefox 119.0.1 +- Microsoft Edge 119.0.2151.72 +- Microsoft Edge WebDriver 119.0.2151.72 +- Mozilla Firefox 120.0 - geckodriver 0.33.0 - Selenium server 4.15.0 @@ -171,10 +172,9 @@ - 3.12.0 #### Node.js -- 14.21.3 - 16.20.2 - 18.18.2 -- 20.9.0 +- 20.10.0 #### Go - 1.19.13 @@ -182,9 +182,9 @@ - 1.21.4 ### Rust Tools -- Cargo 1.73.0 -- Rust 1.73.0 -- Rustdoc 1.73.0 +- Cargo 1.74.0 +- Rust 1.74.0 +- Rustdoc 1.74.0 - Rustup 1.26.0 #### Packages @@ -192,11 +192,11 @@ - Cargo-audit 0.18.3 - Cargo-outdated 0.14.0 - Cbindgen 0.26.0 -- Clippy 0.1.73 +- Clippy 0.1.74 - Rustfmt 1.6.0-stable ### PowerShell Tools -- PowerShell 7.2.16 +- PowerShell 7.2.17 #### PowerShell Modules - Az: 11.0.0 From 3a0da34c4894c3a3013966edfbf528f98ba0d5db Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 6 Dec 2023 10:27:33 +0100 Subject: [PATCH 2508/3485] Updating readme file for macOS-11 version 20231127.1 (#8929) Co-authored-by: Image generation service account <no-reply@microsoft.com> --- images/macos/macos-11-Readme.md | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/images/macos/macos-11-Readme.md b/images/macos/macos-11-Readme.md index 5a78d6f73c0d..b372ca90dae6 100644 --- a/images/macos/macos-11-Readme.md +++ b/images/macos/macos-11-Readme.md @@ -2,12 +2,11 @@ |-| | [[all OSs] Nodejs 14.x will be removed from the images on November, 26](https://github.com/actions/runner-images/issues/8779) | | [Major Refactoring of GitHub Actions Runner Images Repository](https://github.com/actions/runner-images/issues/8706) | -| [[All OS] Android NDK r23 will be removed from images on November 13](https://github.com/actions/runner-images/issues/8383) | *** # macOS 11 - OS Version: macOS 11.7.10 (20G1427) - Kernel Version: Darwin 20.6.0 -- Image Version: 20231117.2 +- Image Version: 20231127.1 ## Installed Software @@ -23,15 +22,15 @@ - GNU Fortran 11 (Homebrew GCC 11.4.0) - available by `gfortran-11` alias - GNU Fortran 12 (Homebrew GCC 12.3.0) - available by `gfortran-12` alias - Julia 1.9.4 -- Kotlin 1.9.255-SNAPSHOT +- Kotlin 1.9.21-release-633 - Go 1.20.11 - Mono 6.12.0.188 - Node.js 18.18.2 - MSBuild 16.10.1.51301 (Mono 6.12.0.188) - NVM 0.39.5 -- NVM - Cached node versions: 14.21.3, 16.20.2, 18.18.2, 20.9.0 -- Perl 5.38.0 -- PHP 8.2.12 +- NVM - Cached node versions: 16.20.2, 18.18.2, 20.10.0 +- Perl 5.38.1 +- PHP 8.3.0 - Python 2.7.18 - Python3 3.12.0 - R 4.3.2 @@ -40,9 +39,9 @@ ### Package Management - Bundler 2.4.22 - Carthage 0.39.1 -- CocoaPods 1.14.2 +- CocoaPods 1.14.3 - Composer 2.6.5 -- Homebrew 4.1.20 +- Homebrew 4.1.22 - Miniconda 23.10.0 - NPM 9.8.1 - NuGet 6.3.1.1 @@ -50,7 +49,7 @@ - Pip3 23.3.1 (python 3.12) - Pipx 1.2.1 - RubyGems 3.4.22 -- Vcpkg 2023 (build from commit 0c20b2a97) +- Vcpkg 2023 (build from commit 2a01db703) - Yarn 1.22.19 #### Environment variables @@ -73,7 +72,7 @@ - bazelisk 1.19.0 - bsdtar 3.3.2 - available by 'tar' alias - Curl 8.4.0 -- Git 2.42.1 +- Git 2.43.0 - Git LFS 3.4.0 - GitHub CLI 2.39.1 - GNU Tar 1.35 - available by 'gtar' alias @@ -93,13 +92,13 @@ - Sox 14.4.2 - Subversion (SVN) 1.14.2 - Switchaudio-osx 1.2.2 -- yq 4.35.2 +- yq 4.40.3 - zstd 1.5.5 ### Tools - Aliyun CLI 3.0.188 - App Center CLI 2.14.0 -- AWS CLI 2.13.37 +- AWS CLI 2.14.0 - AWS SAM CLI 1.103.0 - AWS Session Manager CLI 1.2.497.0 - Azure CLI 2.54.0 @@ -107,7 +106,7 @@ - Bicep CLI 0.23.1 - Cabal 3.6.2.0 - Cmake 3.27.8 -- CodeQL Action Bundle 2.15.2 +- CodeQL Action Bundle 2.15.3 - Fastlane 2.217.0 - GHC 9.8.1 - GHCup 0.1.20.0 @@ -129,7 +128,7 @@ - ChromeDriver 119.0.6045.105 - Microsoft Edge 119.0.2151.72 - Microsoft Edge WebDriver 119.0.2151.72 -- Mozilla Firefox 119.0.1 +- Mozilla Firefox 120.0 - geckodriver 0.33.0 - Selenium server 4.15.0 @@ -173,10 +172,9 @@ - 3.12.0 #### Node.js -- 14.21.3 - 16.20.2 - 18.18.2 -- 20.9.0 +- 20.10.0 #### Go - 1.19.13 From 5bd6a16cab6d74c49a18171eb08841f2e1fea334 Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Wed, 6 Dec 2023 13:53:57 +0100 Subject: [PATCH 2509/3485] Validate and update some documentation (#8959) --- CONTRIBUTING.md | 42 ++--- docs/create-image-and-azure-resources.md | 231 ++++++++++++----------- 2 files changed, 137 insertions(+), 136 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index db907e4eaa31..65ce6647f912 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -6,17 +6,17 @@ Hi there! We're thrilled that you'd like to contribute to this project. Your help is essential for keeping it great. -Contributions to this project are [released](https://help.github.com/articles/github-terms-of-service/#6-contributions-under-repository-license) to the public under the [MIT](LICENSE.md). +Contributions to this project are [released](https://help.github.com/articles/github-terms-of-service/#6-contributions-under-repository-license) to the public under the [MIT](LICENSE.md) license. -Please note that this project is released with a [Contributor Code of Conduct][code-of-conduct]. By participating in this project you agree to abide by its terms. +Please note that this project is released with a [Contributor Code of Conduct][code-of-conduct]. By participating in this project, you agree to abide by its terms. ## Submitting a pull request -1. [Fork][fork] and clone the repository -1. Create a new branch: `git checkout -b my-branch-name` -1. Make your changes, ensure that they include steps to install, validate post-install and update software report (please see [How to add new tool](CONTRIBUTING.md#how-to-add-new-tool) for details). -1. Test your changes by [creating image and deploying a VM](docs/create-image-and-azure-resources.md). -1. Push to your fork and [submit a pull request][pr] +1. [Fork][fork] and clone the repository. +1. Create a new branch: `git checkout -b my-branch-name`. +1. Make your changes, ensuring that they include steps to install, validate post-install, and update the software report (please see [How to add a new tool](CONTRIBUTING.md#how-to-add-a-new-tool) for details). +1. Test your changes by [creating an image and deploying a VM](docs/create-image-and-azure-resources.md). +1. Push to your fork and [submit a pull request][pr]. Here are a few things you can do that will increase the likelihood of your pull request being accepted: @@ -25,18 +25,18 @@ Here are a few things you can do that will increase the likelihood of your pull - Keep your change as focused as possible. If there are multiple changes you would like to make that are not dependent upon each other, consider submitting them as separate pull requests. - Write [good commit messages](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html). - For new tools: - - Make sure that the tool satisfies [Software Guidelines](README.md#software-guidelines). - - Create an issue and get an approval from us to add this tool to the image before creating the pull request. + - Make sure that the tool satisfies the [Software Guidelines](README.md#software-guidelines). + - Create an issue and get approval from us to add this tool to the image before creating the pull request. -## How to add new tool +## How to add a new tool ### General rules -- For every new tool add validation scripts and update software report script to make sure that it is included to documentation -- If the tool is available in other platforms (macOS, Windows, Linux), make sure you include it in as many as possible. -- If installing a few versions of the tool, consider putting the list of versions in the corresponding `toolset.json` file. It will help other customers to configure their builds flexibly. See [toolset-windows-2019.json](images/windows/toolsets/toolset-2019.json) as example. -- Use consistent naming across all files -- Validation scripts should be simple and shouldn't change image content +- For every new tool, add validation scripts and update the software report script to ensure that it is included in the documentation. +- If the tool is available on multiple platforms (macOS, Windows, Linux), make sure you include it on as many as possible. +- If installing multiple versions of the tool, consider putting the list of versions in the corresponding `toolset.json` file. This will help other customers configure their builds flexibly. See [toolset-windows-2019.json](images/windows/toolsets/toolset-2019.json) as an example. +- Use consistent naming across all files. +- Validation scripts should be simple and shouldn't change the image content. ### Windows @@ -44,21 +44,21 @@ Here are a few things you can do that will increase the likelihood of your pull There are a bunch of helper functions that could simplify your code: `Install-ChocoPackage`, `Install-Binary`, `Install-VSIXFromFile`, `Install-VSIXFromUrl`, `Invoke-DownloadWithRetry`, `Test-IsWin19`, `Test-IsWin22` (find the full list of helpers in [ImageHelpers.psm1](images/windows/scripts/helpers/ImageHelpers.psm1)). - Add a script that will validate the tool installation and put the script in the `scripts/tests` folder. We use [Pester v5](https://github.com/pester/pester) for validation scripts. If the tests for the tool are complex enough, create a separate `*.Tests.ps1`. Otherwise, use `Tools.Tests.ps1` for simple tests. -Add `Invoke-PesterTests -TestFile <testFileName> [-TestName <describeName>]` at the end of the installation script to make sure that your tests will be run. +Add `Invoke-PesterTests -TestFile <testFileName> [-TestName <describeName>]` at the end of the installation script to ensure that your tests will be run. - Add changes to the software report generator `images/windows/scripts/docs-gen/Generate-SoftwareReport.ps1`. The software report generator is used to generate an image's README file, e.g. [Windows2019-Readme.md](images/windows/Windows2019-Readme.md) and uses [MarkdownPS](https://github.com/Sarafian/MarkdownPS). ### Ubuntu -- Add script that will install and validate the tool and put the script in the `scripts/build` folder. +- Add a script that will install and validate the tool and put the script in the `scripts/build` folder. Use existing scripts such as [github-cli.sh](images/ubuntu/scripts/build/github-cli.sh) as a starting point. - - Use [helpers](images/ubuntu/scripts/helpers/install.sh) to simplify installation process. - - Validation part should `exit 1` if any issue with installation. + - Use [helpers](images/ubuntu/scripts/helpers/install.sh) to simplify the installation process. + - The validation part should `exit 1` if there is any issue with the installation. - Add changes to the software report generator `images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1`. The software report generator is used to generate an image's README file, e.g. [Ubuntu2004-Readme.md](images/ubuntu/Ubuntu2004-README.md) and it uses [MarkdownPS](https://github.com/Sarafian/MarkdownPS). ### macOS -macOS source lives in this repository and available for everyone. However, macOS image-generation CI doesn't support external contributions yet so we are not able to accept pull-requests for now. -We are in the process of preparing macOS CI to accept contributions. Until then, we appreciate your patience and ask you continue to make tool requests by filing issues. +The macOS source lives in this repository and is available for everyone. However, the macOS image-generation CI doesn't support external contributions yet, so we are not able to accept pull requests for now. +We are in the process of preparing the macOS CI to accept contributions. Until then, we appreciate your patience and ask that you continue to make tool requests by filing issues. ## Resources diff --git a/docs/create-image-and-azure-resources.md b/docs/create-image-and-azure-resources.md index 4414fe8b4bc8..45ab1d4bd0f9 100644 --- a/docs/create-image-and-azure-resources.md +++ b/docs/create-image-and-azure-resources.md @@ -2,24 +2,24 @@ The runner-images project uses [Packer](https://www.packer.io/) to generate disk images for Windows 2019/2022 and Ubuntu 20.04/22.04. -Each image is configured by a JSON or HCL2 Packer template that specifies where to build the image (Azure in this case) +Each image is configured by a JSON or HCL2 Packer template that specifies where to build the image (Azure, in this case), and what steps to run to install software and prepare the disk. -The Packer process initializes a connection to Azure subscription using Azure CLI and creates temporary resources -required for the build process: resource group, network interfaces and virtual machine from the "clean" image specified in the template. +The Packer process initializes a connection to the Azure subscription using Azure CLI and creates temporary resources +required for the build process: a resource group, network interfaces and a virtual machine from the "clean" image specified in the template. -If the VM deployment succeeds, Packer connects it using ssh or WinRM and begins executing installation steps from the template one-by-one. -If any step fails, image generation is aborted and the temporary VM is terminated. -Packer also attempts to cleanup all the temporary resources it created (unless otherwise configured). +If the VM deployment succeeds, Packer connects to it using SSH or WinRM and begins executing installation steps from the template one-by-one. +If any step fails, image generation is aborted, and the temporary VM is terminated. +Packer also attempts to clean up all the temporary resources it created (unless otherwise configured). -After successful completion of all installation steps Packer creates managed image from the temporary VM's disk and deletes the VM. +After successful completion of all installation steps, Packer creates a managed image from the temporary VM's disk and deletes the VM. -- [Build agent preparation](#build-agent-preparation) +- [Build Agent Preparation](#build-agent-preparation) - [Manual image generation](#manual-image-generation) -- [Manual image generation customization](#manual-image-generation-customization) - - [Network security](#network-security) - - [Azure subscription authentication](#azure-subscription-authentication) -- [Generated machine deployment](#generated-machine-deployment) +- [Manual Image Generation Customization](#manual-image-generation-customization) + - [Network Security](#network-security) + - [Azure Subscription Authentication](#azure-subscription-authentication) +- [Generated Machine Deployment](#generated-machine-deployment) - [Automated image generation](#automated-image-generation) - [Required variables](#required-variables) - [Optional variables](#optional-variables) @@ -27,15 +27,15 @@ After successful completion of all installation steps Packer creates managed ima - [Toolset](#toolset) - [Post-generation scripts](#post-generation-scripts) - [Running scripts](#running-scripts) - - [Script details: Ubuntu](#script-details-ubuntu) - - [Script details: Windows](#script-details-windows) + - [Script Details: Ubuntu](#script-details-ubuntu) + - [Script Details: Windows](#script-details-windows) -## Build agent preparation +## Build Agent Preparation -Build agent is a machine where Packer process will be started. -You can use any physical or virtual machine running OS Windows or Linux. -Of course you may also use [Azure VM](https://docs.microsoft.com/en-us/azure/virtual-machines/windows/quick-create-cli). -In any case you will need these software installed: +The build agent is a machine where the Packer process will be started. +You can use any physical or virtual machine running Windows or Linux OS. +Of course, you may also use an [Azure VM](https://docs.microsoft.com/en-us/azure/virtual-machines/windows/quick-create-cli). +In any case, you will need these software installed: - Packer 1.8.2 or higher. @@ -60,11 +60,12 @@ In any case you will need these software installed: In Windows you already have it. For Linux follow instructions [here](https://learn.microsoft.com/en-us/windows-server/administration/linux-package-repository-for-microsoft-software) - to add Microsoft's Linux Software Repository and then install package `powershell`. + to add Microsoft's Linux Software Repository and then install the `powershell` package. + - Azure CLI. - Follow instructions [here](https://docs.microsoft.com/en-us/cli/azure/install-azure-cli). - Or if you use Windows you may run this command in Powershell instead: + Follow the instructions [here](https://docs.microsoft.com/en-us/cli/azure/install-azure-cli). + Or if you use Windows, you may run this command in Powershell instead: ```powershell Invoke-WebRequest -Uri https://aka.ms/installazurecliwindows -OutFile .\AzureCLI.msi @@ -73,72 +74,72 @@ In any case you will need these software installed: ## Manual image generation -This repo bundles script that helps generating images in Azure. -All you need are Azure subscription and build agent configured as described above. -We suggest starting with building UbuntuMinimal image because it includes only basic software and build in less than 30 minutes. +This repository includes a script that assists in generating images in Azure. +All you need is an Azure subscription and a build agent configured as described above. +We suggest starting with building the UbuntuMinimal image because it includes only basic software and builds in less than 30 minutes. -All the commands below should be executed in Powershell. +All the commands below should be executed in PowerShell. -First clone runner-images repository and set current directory to it: +First, clone the runner-images repository and set the current directory to it: ```powershell git clone https://github.com/actions/runner-images.git Set-Location runner-images ``` -Then import [GenerateResourcesAndImage](../helpers/GenerateResourcesAndImage.ps1) script from `helpers` subdirectory: +Then, import the [GenerateResourcesAndImage](../helpers/GenerateResourcesAndImage.ps1) script from the `helpers` subdirectory: ```powershell Import-Module .\helpers\GenerateResourcesAndImage.ps1 ``` -Finally, run `GenerateResourcesAndImage` function setting mandatory arguments: image type and where to create resources: +Finally, run the `GenerateResourcesAndImage` function, setting the mandatory arguments: image type and where to build and store the resulting managed image: -- `SubscriptionId` - your Azure Subscription ID -- `ResourceGroupName` - name of the resource group that will be created within your subscription (e.g. "imagegen-test") -- `AzureLocation` - location where resources will be created (e.g. "East US") -- `ImageType` - what image to build (we suggest choosing "UbuntuMinimal" here, other valid options are "Windows2019", "Windows2022", "Ubuntu2004", "Ubuntu2204") +- `SubscriptionId` - your Azure Subscription ID; +- `ResourceGroupName` - the name of the resource group that will be created within your subscription (e.g., "imagegen-test"); +- `AzureLocation` - the location where resources will be created (e.g., "East US"); +- `ImageType` - the type of image to build (we suggest choosing "UbuntuMinimal" here; other valid options are "Windows2019", "Windows2022", "Ubuntu2004", "Ubuntu2204"). -This function automatically creates all required Azure resources and kicks off packer image generation for the selected image type. +This function automatically creates all required Azure resources and initiates the Packer image generation for the selected image type. -When image is ready you may proceed to [deployment](#generated-machine-deployment) +When the image is ready, you may proceed to [deployment](#generated-machine-deployment). -## Manual image generation customization +## Manual Image Generation Customization -Function `GenerateResourcesAndImage` accepts a bunch of arguments that may help you generating image in your specific environment. +The `GenerateResourcesAndImage` function accepts a number of arguments that may assist you in generating an image in your specific environment. -For example, you may want that all the resources involved in image generation process are tagged. -In this case pass a HashTable of tags as a value for `Tags` parameter. +For example, you may want all the resources involved in the image generation process to be tagged. +In this case, pass a HashTable of tags as a value for the `Tags` parameter. -If you don't want function to authenticate interactively, you should create Service Principal and invoke the function with parameters `AzureClientId`, `AzureClientSecret` and `AzureTenantId`. -You can find more details [in corresponding section below](#azure-subscription-authentication). +If you don't want the function to authenticate interactively, you should create a Service Principal and invoke the function with the parameters `AzureClientId`, `AzureClientSecret` and `AzureTenantId`. +You can find more details in the [corresponding section below](#azure-subscription-authentication). -Use `get-help GenerateResourcesAndImage -Detailed` for the complete list of parameters available. +Use `get-help GenerateResourcesAndImage -Detailed` for the complete list of available parameters. -### Network security +### Network Security -To connect to a temporary virtual machine Packer uses WinRM or SSH. +To connect to a temporary virtual machine, Packer uses WinRM or SSH. -If your build agent is located outside of the Azure subscription where temporary VM is created, the public network interface and public IP address is used. -Make sure that firewalls are configured properly and WinRM (tcp port 5986) and ssh (tcp port 22) connections are allowed both outgoing for build agent and incoming for temporary VM. -Also if you don't want temporary VM to be accessible from everywhere, set `RestrictToAgentIpAddress` parameter value to `$true` -to setup firewall rules allowing access only from your build agent public IP address. +If your build agent is located outside of the Azure subscription where the temporary VM is created, a public network interface and public IP address are used. +Make sure that firewalls are configured properly and that WinRM (TCP port 5986) and SSH (TCP port 22) connections are allowed both outgoing for the build agent and incoming for the temporary VM. +Also, if you don't want the temporary VM to be accessible from everywhere, set the `RestrictToAgentIpAddress` parameter value to `$true` +to set up firewall rules allowing access only from your build agent's public IP address. -If your build agent and temporary VM are in the same subscription you can configure Packer to connect using private virtual network. -To achieve that set proper values for environment variables `VNET_RESOURCE_GROUP`, `VNET_NAME` and `VNET_SUBNET`. +If your build agent and temporary VM are in the same subscription, you can configure Packer to connect using a private virtual network. +To achieve this, set proper values for the environment variables `VNET_RESOURCE_GROUP`, `VNET_NAME` and `VNET_SUBNET`. -### Azure subscription authentication +### Azure Subscription Authentication -Packer uses Service Principal to authenticate in Azure infrastructure. -For more information about Service Principals refer to +Packer uses a Service Principal to authenticate in Azure infrastructure. +For more information about Service Principals, refer to the [Azure documentation](https://docs.microsoft.com/en-us/azure/active-directory/develop/howto-create-service-principal-portal). -Function `GenerateResourcesAndImage` is able to create Service Principle to be used by Packer. -It uses Connect-AzAccount cmdlet that invokes interactive authentication process by default. -If you don't want to use interactive authentication you should create Service Principal with full read-write permissions for selected Azure subscription on your own -and provide proper values for parameters `AzureClientId`, `AzureClientSecret` and `AzureTenantId`. +The `GenerateResourcesAndImage` function is able to create a Service Principal to be used by Packer. +It uses the Connect-AzAccount cmdlet that invokes an interactive authentication process by default. +If you don't want to use interactive authentication, you should create a Service Principal with full read-write permissions for the selected Azure subscription on your own +and provide proper values for the parameters `AzureClientId`, `AzureClientSecret` and `AzureTenantId`. -Here is an example of how to create Service Principle using Az Powershell module: +Here is an example of how to create a Service Principal using the Az PowerShell module: ```powershell $credentials = [Microsoft.Azure.PowerShell.Cmdlets.Resources.MSGraph.Models.ApiV10.MicrosoftGraphPasswordCredential]@{ @@ -160,9 +161,9 @@ Start-Sleep -Seconds 30 } ``` -## Generated machine deployment +## Generated Machine Deployment -After the successful image generation, Virtual Machine can be created from the generated image using [CreateAzureVMFromPackerTemplate](../helpers/CreateAzureVMFromPackerTemplate.ps1) script. +After successful image generation, a Virtual Machine can be created from the generated image using the [CreateAzureVMFromPackerTemplate](../helpers/CreateAzureVMFromPackerTemplate.ps1) script. ```powershell Import-Module .\helpers\CreateAzureVMFromPackerTemplate.ps1 @@ -172,29 +173,29 @@ CreateAzureVMFromPackerTemplate -SubscriptionId {YourSubscriptionId} -ResourceGr Where: -- `SubscriptionId` - The Azure subscription Id where resources will be created. -- `ResourceGroupName` - The Azure resource group name where the Azure virtual machine will be created. -- `ManagedImageName` - The name of the managed image to be used for the virtual machine creation. -- `VirtualMachineName` - The name of the virtual machine to be generated. -- `AdminUserName` - The administrator username for the virtual machine to be created. -- `AdminPassword` - The administrator password for the virtual machine to be created. -- `AzureLocation` - The location where the Azure virtual machine will be provisioned. Example: "eastus" +- `SubscriptionId` - the Azure subscription ID where resources will be created; +- `ResourceGroupName` - the Azure resource group name where the Azure virtual machine will be created; +- `ManagedImageName` - the name of the managed image to be used for the virtual machine creation; +- `VirtualMachineName` - the name of the virtual machine to be generated; +- `AdminUserName` - the administrator username for the virtual machine to be created; +- `AdminPassword` - the administrator password for the virtual machine to be created; +- `AzureLocation` - the location where the Azure virtual machine will be provisioned (e.g., "eastus"). -The function creates an Azure VM and generates network resources in Azure to make the VM accessible. +This function creates an Azure VM and generates network resources in Azure to make the VM accessible. ## Automated image generation -If you want to generate images automatically (e.g. as a part of CI/CD pipeline) -you can use Packer directly. To do that you will need: +If you want to generate images automatically (e.g., as a part of a CI/CD pipeline), +you can use Packer directly. To do this, you will need: -- A build agent configured as described in - [Build agent preparation](#build-agent-preparation) section. -- Azure subscription and Service Principal configured as described in - [Azure subscription authentication](#azure-subscription-authentication) section. -- Resource group created in your Azure subscription where managed image will be stored. -- String to be used as password for the user used to install software (Windows only). +- a build agent configured as described in the + [Build agent preparation](#build-agent-preparation) section; +- an Azure subscription and Service Principal configured as described in the + [Azure subscription authentication](#azure-subscription-authentication) section; +- a resource group created in your Azure subscription where the managed image will be stored; +- a string to be used as a password for the user used to install software (Windows only). -Then you can invoke Packer in you CI/CD pipeline using the following command: +Then, you can invoke Packer in your CI/CD pipeline using the following command: ```powershell packer build -var "subscription_id=$SubscriptionId" ` @@ -210,54 +211,54 @@ packer build -var "subscription_id=$SubscriptionId" ` Where: -- `SubscriptionId` - your Azure Subscription ID -- `ClientId` and `ClientSecret` - Service Principal credentials -- `TenantId` - Azure Tenant ID -- `InstallPassword` - password for the user used to install software (Windows only) -- `Location` - location where resources will be created (e.g. "East US") -- `ImageName` and `ImageResourceGroupName` - name of the resource group where managed image will be stored -- `TemplatePath` - path to the Packer template file (e.g. "images/windows/templates/windows-2022.json") +- `SubscriptionId` - your Azure Subscription ID; +- `ClientId` and `ClientSecret` - Service Principal credentials; +- `TenantId` - Azure Tenant ID; +- `InstallPassword` - password for the user used to install software (Windows only); +- `Location` - location where resources will be created (e.g., "East US"); +- `ImageName` and `ImageResourceGroupName` - name of the resource group where the managed image will be stored; +- `TemplatePath` - path to the Packer template file (e.g., "images/windows/templates/windows-2022.json"). ### Required variables -The following variables are required to be passed to Packer process: +The following variables are required to be passed to the Packer process: | Template var | Env var | Description | ------------ | ------- | ----------- -| `subscription_id` | `ARM_SUBSCRIPTION_ID` | Subscription under which the build will be performed. +| `subscription_id` | `ARM_SUBSCRIPTION_ID` | The subscription under which the build will be performed. | `client_id` | `ARM_CLIENT_ID` | The Active Directory service principal associated with your builder. | `client_secret` | `ARM_CLIENT_SECRET` | The password or secret for your service principal; may be omitted if `client_cert_path` is set. -| `client_cert_path` | `ARM_CLIENT_CERT_PATH` | The location of a PEM file containing a certificate and private key for service principal; may be omitted if `client_secret` is set. -| `location` | `ARM_RESOURCE_LOCATION` | Azure datacenter in which your VM will build. -| `managed_image_resource_group_name` | `ARM_RESOURCE_GROUP` | Resource group under which the final artifact will be stored. +| `client_cert_path` | `ARM_CLIENT_CERT_PATH` | The location of a PEM file containing a certificate and private key for the service principal; may be omitted if `client_secret` is set. +| `location` | `ARM_RESOURCE_LOCATION` | The Azure datacenter in which your VM will be built. +| `managed_image_resource_group_name` | `ARM_RESOURCE_GROUP` | The resource group under which the final artifact will be stored. ### Optional variables The following variables are optional: -- `managed_image_name` - Name of the managed image to create. If not specified, "Runner-Image-{{ImageType}}" will be used. -- `build_resource_group_name` - Specify an existing resource group to run the build in it. By default, a temporary resource group will be created and destroyed as part of the build. If you do not have permission to do so, use build_resource_group_name to specify an existing resource group to run the build in it. -- `object_id` - The object ID for the AAD SP. Will be derived from the oAuth token if empty. -- `tenant_id` - The Active Directory tenant identifier with which your `client_id` and `subscription_id` are associated. If not specified, `tenant_id` will be looked up using `subscription_id`. -- `temp_resource_group_name` - Name assigned to the temporary resource group created during the build. If this value is not set, a random value will be assigned. This resource group is deleted at the end of the build. -- `private_virtual_network_with_public_ip` - This value allows you to set a `virtual_network_name` and obtain a public IP. If this value is not set and `virtual_network_name` is defined Packer is only allowed to be executed from a host on the same subnet / virtual network. -- `virtual_network_name` - Use a pre-existing virtual network for the VM. This option enables private communication with the VM, no public IP address is used or provisioned (unless you set `private_virtual_network_with_public_ip`). -- `virtual_network_resource_group_name` - If `virtual_network_name` is set, this value may also be set. If `virtual_network_name` is set, and this value is not set the builder attempts to determine the resource group containing the virtual network. If the resource group cannot be found, or it cannot be disambiguated, this value should be set. -- `virtual_network_subnet_name` - If `virtual_network_name` is set, this value may also be set. If `virtual_network_name` is set, and this value is not set the builder attempts to determine the subnet to use with the virtual network. If the subnet cannot be found, or it cannot be disambiguated, this value should be set. +- `managed_image_name` - the name of the managed image to create. If not specified, "Runner-Image-{{ImageType}}" will be used; +- `build_resource_group_name` - specify an existing resource group to run the build in; by default, a temporary resource group will be created and destroyed as part of the build; if you do not have permission to do so, use `build_resource_group_name` to specify an existing resource group to run the build in; +- `object_id` - the object ID for the AAD SP; will be derived from the oAuth token if empty; +- `tenant_id` - the Active Directory tenant identifier with which your `client_id` and `subscription_id` are associated; if not specified, `tenant_id` will be looked up using `subscription_id`; +- `temp_resource_group_name` - the name assigned to the temporary resource group created during the build; if this value is not set, a random value will be assigned; this resource group is deleted at the end of the build; +- `private_virtual_network_with_public_ip` - this value allows you to set a `virtual_network_name` and obtain a public IP; if this value is not set and `virtual_network_name` is defined, Packer is only allowed to be executed from a host on the same subnet / virtual network; +- `virtual_network_name` - use a pre-existing virtual network for the VM; this option enables private communication with the VM, no public IP address is used or provisioned (unless you set `private_virtual_network_with_public_ip`); +- `virtual_network_resource_group_name` - if `virtual_network_name` is set, this value may also be set; if `virtual_network_name` is set, and this value is not set, the builder attempts to determine the resource group containing the virtual network; if the resource group cannot be found, or it cannot be disambiguated, this value should be set; +- `virtual_network_subnet_name` - if `virtual_network_name` is set, this value may also be set; if `virtual_network_name` is set, and this value is not set, the builder attempts to determine the subnet to use with the virtual network; if the subnet cannot be found, or it cannot be disambiguated, this value should be set. ## Builder variables The `builders` section contains variables for the `azure-arm` builder used in the project. Most of the builder variables are inherited from the `user variables` section, however, the variables can be overwritten to adjust image-generation performance. -- `vm_size` - Size of the VM used for building. This can be changed when you deploy a VM from your image. -- `image_os` - Type of OS that will be deployed as a temporary VM. -- `image_version` - Specify version of an OS to boot from. +- `vm_size` - the size of the VM used for building; this can be changed when you deploy a VM from your image; +- `image_os` - the type of OS that will be deployed as a temporary VM; +- `image_version` - specify the version of an OS to boot from. -**Detailed Azure builders documentation can be found in [packer documentation](https://www.packer.io/docs/builders/azure).** +**Detailed Azure builders documentation can be found in the [packer documentation](https://www.packer.io/docs/builders/azure).** ## Toolset -Configuration for some installed software is located in `toolset.json` files. These files define the list of Ruby, Python, Go versions, the list of PowerShell modules and VS components that will be installed to image. They can be changed if these tools are not required to reduce image generation time or image size. +The configuration for some installed software is located in `toolset.json` files. These files define the list of Ruby, Python, Go versions, the list of PowerShell modules and VS components that will be installed on the image. They can be changed if these tools are not required, to reduce image generation time or image size. Generated tool versions and details can be found in related projects: @@ -267,9 +268,9 @@ Generated tool versions and details can be found in related projects: ## Post-generation scripts -> :warning: These scripts are intended to run on a VM deployed in Azure +> :warning: These scripts are intended to be run on a VM deployed in Azure -The user, created during the image generation, does not exist in the result image hence some configuration files related to the user's home directory need to be changed as well as the file permissions for some directories. Scripts for that are located in the `post-gen` folder in the repository: +The user, created during the image generation, does not exist in the resulting image. Hence, some configuration files related to the user's home directory need to be changed, as well as the file permissions for some directories. Scripts for that are located in the `post-gen` folder in the repository: - Windows: <https://github.com/actions/runner-images/tree/main/images/windows/assets/post-gen> - Linux: <https://github.com/actions/runner-images/tree/main/images/ubuntu/assets/post-gen> @@ -295,16 +296,16 @@ The scripts are copied to the image during the generation process to the followi Get-ChildItem C:\post-generation -Filter *.ps1 | ForEach-Object { & $_.FullName } ``` -### Script details: Ubuntu +### Script Details: Ubuntu -- **cleanup-logs.sh** - removes all build process logs from the machine -- **environment-variables.sh** - replaces `$HOME` with the default user's home directory for environmental variables related to the default user home directory -- **homebrew-permissions.sh** - Resets homebrew repository directory by running `git reset --hard` to make the working tree clean after chmoding /home and changes the repository directory owner to the current user -- **rust-permissions.sh** - fixes permissions for the Rust folder. Detailed issue explanation is provided in [runner-images/issues/572](https://github.com/actions/runner-images/issues/572). +- **cleanup-logs.sh** - removes all build process logs from the machine; +- **environment-variables.sh** - replaces `$HOME` with the default user's home directory for environment variables related to the default user home directory; +- **homebrew-permissions.sh** - resets the Homebrew repository directory by running `git reset --hard` to make the working tree clean after changing permissions in /home and changes the repository directory owner to the current user; +- **rust-permissions.sh** - fixes permissions for the Rust folder; a detailed issue explanation is provided in [runner-images/issues/572](https://github.com/actions/runner-images/issues/572). -### Script details: Windows +### Script Details: Windows -- **GenerateIISExpressCertificate.ps1** - generates and imports a certificate to run applications with IIS Express through HTTPS -- **InternetExplorerConfiguration** - turns off the Internet Explorer Enhanced Security feature -- **Msys2FirstLaunch.ps1** - initializes bash user profile in MSYS2 -- **VSConfiguration.ps1** - performs initial Visual Studio configuration +- **GenerateIISExpressCertificate.ps1** - generates and imports a certificate to run applications with IIS Express through HTTPS; +- **InternetExplorerConfiguration.ps1** - turns off the Internet Explorer Enhanced Security feature; +- **Msys2FirstLaunch.ps1** - initializes the bash user profile in MSYS2; +- **VSConfiguration.ps1** - performs initial Visual Studio configuration. From b0fc01efc6073ea06610197376bfe5357de722f0 Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Wed, 6 Dec 2023 13:56:10 +0100 Subject: [PATCH 2510/3485] Add deprecation warning to GenerateResourcesAndImage helper (#8958) --- helpers/GenerateResourcesAndImage.ps1 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/helpers/GenerateResourcesAndImage.ps1 b/helpers/GenerateResourcesAndImage.ps1 index 70cc58a37947..b8bab020f730 100644 --- a/helpers/GenerateResourcesAndImage.ps1 +++ b/helpers/GenerateResourcesAndImage.ps1 @@ -97,8 +97,10 @@ Function GenerateResourcesAndImage { This parameter cannot be used in combination with the virtual_network_name packer parameter. .PARAMETER Force Delete the resource group if it exists without user confirmation. + This parameter is deprecated and will be removed in a future release. .PARAMETER ReuseResourceGroup Reuse the resource group if it exists without user confirmation. + This parameter is deprecated and will be removed in a future release. .PARAMETER OnError Specify how packer handles an error during image creation. Options: @@ -146,6 +148,10 @@ Function GenerateResourcesAndImage { [hashtable] $Tags = @{} ) + if ($Force -or $ReuseResourceGroup) { + Write-Warning "The `ReuseResourceGroup` and `Force` parameters are deprecated and will be removed in a future release. The resource group will be reused when it already exists and an error will be thrown when it doesn't. If you want to delete the resource group, please delete it manually." + } + if ($Force -and $ReuseResourceGroup) { throw "Force and ReuseResourceGroup cannot be used together." } From a9bc069a35577ededbd9b235f922e82ed5c6ff1f Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Wed, 6 Dec 2023 13:58:03 +0100 Subject: [PATCH 2511/3485] [ubuntu] Refactor Software Report helpers (#8954) --- .../docs-gen/Generate-SoftwareReport.ps1 | 7 +- .../docs-gen/SoftwareReport.Android.psm1 | 13 ++-- .../docs-gen/SoftwareReport.Browsers.psm1 | 22 +++--- .../docs-gen/SoftwareReport.CachedTools.psm1 | 10 +-- .../docs-gen/SoftwareReport.Common.psm1 | 63 ++++++++------- .../docs-gen/SoftwareReport.Databases.psm1 | 10 +-- .../docs-gen/SoftwareReport.Helpers.psm1 | 41 +++------- .../scripts/docs-gen/SoftwareReport.Java.psm1 | 2 +- .../scripts/docs-gen/SoftwareReport.Rust.psm1 | 20 ++--- .../docs-gen/SoftwareReport.Tools.psm1 | 78 +++++++++---------- .../docs-gen/SoftwareReport.WebServers.psm1 | 30 +++---- 11 files changed, 140 insertions(+), 156 deletions(-) diff --git a/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 b/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 index d3a7b64f421e..758d7c91e4d5 100644 --- a/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 +++ b/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 @@ -2,8 +2,8 @@ using module ./software-report-base/SoftwareReport.psm1 using module ./software-report-base/SoftwareReport.Nodes.psm1 param ( - [Parameter(Mandatory)][string] - $OutputDirectory + [Parameter(Mandatory)] + [string] $OutputDirectory ) $global:ErrorActionPreference = "Stop" @@ -23,7 +23,7 @@ Import-Module (Join-Path $PSScriptRoot "SoftwareReport.Tools.psm1") -DisableName Import-Module (Join-Path $PSScriptRoot "SoftwareReport.WebServers.psm1") -DisableNameChecking # Restore file owner in user profile -Restore-UserOwner +sudo chown -R ${env:USER}: $env:HOME # Software report $softwareReport = [SoftwareReport]::new("Ubuntu $(Get-OSVersionShort)") @@ -164,7 +164,6 @@ $cliTools.AddToolVersion("OpenShift CLI", $(Get-OCCliVersion)) $cliTools.AddToolVersion("ORAS CLI", $(Get-ORASCliVersion)) $cliTools.AddToolVersion("Vercel CLI", $(Get-VerselCliversion)) - $installedSoftware.AddHeader("Java").AddTable($(Get-JavaVersionsTable)) $phpTools = $installedSoftware.AddHeader("PHP Tools") diff --git a/images/ubuntu/scripts/docs-gen/SoftwareReport.Android.psm1 b/images/ubuntu/scripts/docs-gen/SoftwareReport.Android.psm1 index b7ce2b8e15f9..3bfc59bd23cc 100644 --- a/images/ubuntu/scripts/docs-gen/SoftwareReport.Android.psm1 +++ b/images/ubuntu/scripts/docs-gen/SoftwareReport.Android.psm1 @@ -20,7 +20,6 @@ function Get-AndroidInstalledPackages { return $androidSDKManagerList } - function Build-AndroidTable { $packageInfo = Get-AndroidInstalledPackages return @( @@ -79,7 +78,7 @@ function Build-AndroidTable { ) | Where-Object { $_.Version } | ForEach-Object { [PSCustomObject] @{ "Package Name" = $_.Package - "Version" = $_.Version + "Version" = $_.Version } } } @@ -92,7 +91,7 @@ function Get-AndroidPackageVersions { [object] $MatchedString ) - $versions = $packageInfo | Where-Object { $_ -Match $MatchedString } | ForEach-Object { + $versions = $PackageInfo | Where-Object { $_ -Match $MatchedString } | ForEach-Object { $packageInfoParts = Split-TableRowByColumns $_ return $packageInfoParts[1] } @@ -105,7 +104,7 @@ function Get-AndroidPlatformVersions { [object] $PackageInfo ) - $versions = $packageInfo | Where-Object { $_ -Match "Android SDK Platform " } | ForEach-Object { + $versions = $PackageInfo | Where-Object { $_ -Match "Android SDK Platform " } | ForEach-Object { $packageInfoParts = Split-TableRowByColumns $_ $revision = $packageInfoParts[1] $version = $packageInfoParts[0].split(";")[1] @@ -128,7 +127,7 @@ function Get-AndroidBuildToolVersions { [object] $PackageInfo ) - $versions = $packageInfo | Where-Object { $_ -Match "Android SDK Build-Tools" } | ForEach-Object { + $versions = $PackageInfo | Where-Object { $_ -Match "Android SDK Build-Tools" } | ForEach-Object { $packageInfoParts = Split-TableRowByColumns $_ return $packageInfoParts[1] } @@ -146,7 +145,7 @@ function Get-AndroidGoogleAPIsVersions { [object] $PackageInfo ) - $versions = $packageInfo | Where-Object { $_ -Match "Google APIs" } | ForEach-Object { + $versions = $PackageInfo | Where-Object { $_ -Match "Google APIs" } | ForEach-Object { $packageInfoParts = Split-TableRowByColumns $_ return $packageInfoParts[0].split(";")[1] } @@ -171,7 +170,7 @@ function Build-AndroidEnvironmentTable { $shouldResolveLink = 'ANDROID_NDK', 'ANDROID_NDK_HOME', 'ANDROID_NDK_ROOT', 'ANDROID_NDK_LATEST_HOME' return $androidVersions | Sort-Object -Property Name | ForEach-Object { [PSCustomObject] @{ - "Name" = $_.Name + "Name" = $_.Name "Value" = if ($shouldResolveLink.Contains($_.Name )) { Get-PathWithLink($_.Value) } else {$_.Value} } } diff --git a/images/ubuntu/scripts/docs-gen/SoftwareReport.Browsers.psm1 b/images/ubuntu/scripts/docs-gen/SoftwareReport.Browsers.psm1 index 9ae8496344bf..687d6931613b 100644 --- a/images/ubuntu/scripts/docs-gen/SoftwareReport.Browsers.psm1 +++ b/images/ubuntu/scripts/docs-gen/SoftwareReport.Browsers.psm1 @@ -1,35 +1,35 @@ function Get-ChromeVersion { - $googleChromeVersion = google-chrome --version | Take-OutputPart -Part 2 + $googleChromeVersion = google-chrome --version | Get-StringPart -Part 2 return $googleChromeVersion } function Get-ChromeDriverVersion { - $chromeDriverVersion = chromedriver --version | Take-OutputPart -Part 1 + $chromeDriverVersion = chromedriver --version | Get-StringPart -Part 1 return $chromeDriverVersion } function Get-FirefoxVersion { - $firefoxVersion = $(firefox --version) | Take-OutputPart -Part 2 + $firefoxVersion = $(firefox --version) | Get-StringPart -Part 2 return $firefoxVersion } function Get-GeckodriverVersion { - $geckodriverVersion = geckodriver --version | Select-Object -First 1 | Take-OutputPart -Part 1 + $geckodriverVersion = geckodriver --version | Select-Object -First 1 | Get-StringPart -Part 1 return $geckodriverVersion } function Get-ChromiumVersion { - $chromiumVersion = chromium-browser --version | Take-OutputPart -Part 1 + $chromiumVersion = chromium-browser --version | Get-StringPart -Part 1 return $chromiumVersion } function Get-EdgeVersion { - $edgeVersion = (microsoft-edge --version).Trim() | Take-OutputPart -Part 2 + $edgeVersion = (microsoft-edge --version).Trim() | Get-StringPart -Part 2 return $edgeVersion } function Get-EdgeDriverVersion { - $edgeDriverVersion = msedgedriver --version | Take-OutputPart -Part 3 + $edgeDriverVersion = msedgedriver --version | Get-StringPart -Part 3 return $edgeDriverVersion } @@ -41,19 +41,19 @@ function Get-SeleniumVersion { function Build-BrowserWebdriversEnvironmentTable { return @( [PSCustomObject] @{ - "Name" = "CHROMEWEBDRIVER" + "Name" = "CHROMEWEBDRIVER" "Value" = $env:CHROMEWEBDRIVER }, [PSCustomObject] @{ - "Name" = "EDGEWEBDRIVER" + "Name" = "EDGEWEBDRIVER" "Value" = $env:EDGEWEBDRIVER }, [PSCustomObject] @{ - "Name" = "GECKOWEBDRIVER" + "Name" = "GECKOWEBDRIVER" "Value" = $env:GECKOWEBDRIVER }, [PSCustomObject] @{ - "Name" = "SELENIUM_JAR_PATH" + "Name" = "SELENIUM_JAR_PATH" "Value" = $env:SELENIUM_JAR_PATH } ) diff --git a/images/ubuntu/scripts/docs-gen/SoftwareReport.CachedTools.psm1 b/images/ubuntu/scripts/docs-gen/SoftwareReport.CachedTools.psm1 index a6c7433d0e6c..87905aed5437 100644 --- a/images/ubuntu/scripts/docs-gen/SoftwareReport.CachedTools.psm1 +++ b/images/ubuntu/scripts/docs-gen/SoftwareReport.CachedTools.psm1 @@ -1,18 +1,18 @@ function Get-ToolcacheRubyVersions { $toolcachePath = Join-Path $env:AGENT_TOOLSDIRECTORY "Ruby" - return Get-ChildItem $toolcachePath -Name | Sort-Object { [Version]$_ } + return Get-ChildItem $toolcachePath -Name | Sort-Object { [Version] $_ } } function Get-ToolcachePythonVersions { $toolcachePath = Join-Path $env:AGENT_TOOLSDIRECTORY "Python" - return Get-ChildItem $toolcachePath -Name | Sort-Object { [Version]$_ } + return Get-ChildItem $toolcachePath -Name | Sort-Object { [Version] $_ } } function Get-ToolcachePyPyVersions { $toolcachePath = Join-Path $env:AGENT_TOOLSDIRECTORY "PyPy" Get-ChildItem -Path $toolcachePath -Name | Sort-Object { [Version] $_ } | ForEach-Object { $pypyRootPath = Join-Path $toolcachePath $_ "x64" - [string]$pypyVersionOutput = & "$pypyRootPath/bin/python" -c "import sys;print(sys.version)" + [string] $pypyVersionOutput = & "$pypyRootPath/bin/python" -c "import sys;print(sys.version)" $pypyVersionOutput -match "^([\d\.]+) \(.+\) \[PyPy ([\d\.]+\S*) .+]$" | Out-Null return "{0} [PyPy {1}]" -f $Matches[1], $Matches[2] } @@ -20,10 +20,10 @@ function Get-ToolcachePyPyVersions { function Get-ToolcacheNodeVersions { $toolcachePath = Join-Path $env:AGENT_TOOLSDIRECTORY "node" - return Get-ChildItem $toolcachePath -Name | Sort-Object { [Version]$_ } + return Get-ChildItem $toolcachePath -Name | Sort-Object { [Version] $_ } } function Get-ToolcacheGoVersions { $toolcachePath = Join-Path $env:AGENT_TOOLSDIRECTORY "go" - return Get-ChildItem $toolcachePath -Name | Sort-Object { [Version]$_ } + return Get-ChildItem $toolcachePath -Name | Sort-Object { [Version] $_ } } diff --git a/images/ubuntu/scripts/docs-gen/SoftwareReport.Common.psm1 b/images/ubuntu/scripts/docs-gen/SoftwareReport.Common.psm1 index 1d512df85677..e1a78a962158 100644 --- a/images/ubuntu/scripts/docs-gen/SoftwareReport.Common.psm1 +++ b/images/ubuntu/scripts/docs-gen/SoftwareReport.Common.psm1 @@ -10,18 +10,18 @@ function Get-DashVersion { function Get-CPPVersions { $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]$_} + $cppVersions = $result.Output | Where-Object { $_ -match "g\+\+-\d+" } | ForEach-Object { + & $_.Split("/")[0] --version | Select-Object -First 1 | Get-StringPart -Part 3 + } | Sort-Object {[Version] $_} return $cppVersions } function Get-FortranVersions { $result = Get-CommandResult "apt list --installed" -Multiline - $fortranVersions = $result.Output | Where-Object { $_ -match "^gfortran-\d+"} | ForEach-Object { + $fortranVersions = $result.Output | Where-Object { $_ -match "^gfortran-\d+" } | ForEach-Object { $_ -match "now (?<version>\d+\.\d+\.\d+)-" | Out-Null $Matches.version - } | Sort-Object {[Version]$_} + } | Sort-Object {[Version] $_} return $fortranVersions } @@ -34,20 +34,21 @@ function Get-ClangToolVersions { ) $result = Get-CommandResult "apt list --installed" -Multiline - $toolVersions = $result.Output | Where-Object { $_ -match "^${ToolName}-\d+"} | ForEach-Object { + $toolVersions = $result.Output | Where-Object { $_ -match "^${ToolName}-\d+" } | ForEach-Object { $clangCommand = ($_ -Split "/")[0] Invoke-Expression "$clangCommand --version" | Where-Object { $_ -match "${VersionLineMatcher}" } | ForEach-Object { $_ -match "${VersionLineMatcher} (?<version>${VersionPattern}" | Out-Null $Matches.version } - } | Sort-Object {[Version]$_} + } | Sort-Object {[Version] $_} return $toolVersions } function Get-ClangTidyVersions { - return Get-ClangToolVersions -ToolName "clang-tidy" -VersionLineMatcher "LLVM version" -VersionPattern "\d+\.\d+\.\d+)" + $clangVersions = Get-ClangToolVersions -ToolName "clang-tidy" -VersionLineMatcher "LLVM version" -VersionPattern "\d+\.\d+\.\d+)" + return $clangVersions } @@ -64,7 +65,7 @@ function Get-ErlangRebar3Version { } function Get-MonoVersion { - $monoVersion = mono --version | Out-String | Take-OutputPart -Part 4 + $monoVersion = mono --version | Out-String | Get-StringPart -Part 4 return $monoVersion } @@ -75,7 +76,7 @@ function Get-MsbuildVersion { } function Get-NuGetVersion { - $nugetVersion = nuget help | Select-Object -First 1 | Take-OutputPart -Part 2 + $nugetVersion = nuget help | Select-Object -First 1 | Get-StringPart -Part 2 return $nugetVersion } @@ -85,7 +86,8 @@ function Get-NodeVersion { } function Get-OpensslVersion { - return $(dpkg-query -W -f '${Version}' openssl) + $opensslVersion = $(dpkg-query -W -f '${Version}' openssl) + return $opensslVersion } function Get-PerlVersion { @@ -95,31 +97,32 @@ function Get-PerlVersion { function Get-PythonVersion { $result = Get-CommandResult "python --version" - $version = $result.Output | Take-OutputPart -Part 1 + $version = $result.Output | Get-StringPart -Part 1 return $version } function Get-PowershellVersion { - return $(pwsh --version) | Take-OutputPart -Part 1 + $pwshVersion = $(pwsh --version) | Get-StringPart -Part 1 + return $pwshVersion } function Get-RubyVersion { - $rubyVersion = ruby --version | Out-String | Take-OutputPart -Part 1 + $rubyVersion = ruby --version | Out-String | Get-StringPart -Part 1 return $rubyVersion } function Get-SwiftVersion { - $swiftVersion = swift --version | Out-String | Take-OutputPart -Part 2 + $swiftVersion = swift --version | Out-String | Get-StringPart -Part 2 return $swiftVersion } function Get-KotlinVersion { - $kotlinVersion = kotlin -version | Out-String | Take-OutputPart -Part 2 + $kotlinVersion = kotlin -version | Out-String | Get-StringPart -Part 2 return $kotlinVersion } function Get-JuliaVersion { - $juliaVersion = julia --version | Take-OutputPart -Part 2 + $juliaVersion = julia --version | Get-StringPart -Part 2 return $juliaVersion } @@ -147,7 +150,7 @@ function Get-GemVersion { } function Get-MinicondaVersion { - $condaVersion = conda --version | Take-OutputPart -Part 1 + $condaVersion = conda --version | Get-StringPart -Part 1 return $condaVersion } @@ -195,7 +198,7 @@ function Get-AntVersion { } function Get-GradleVersion { - $gradleVersion = (gradle -v) -match "^Gradle \d" | Take-OutputPart -Part 1 + $gradleVersion = (gradle -v) -match "^Gradle \d" | Get-StringPart -Part 1 return $gradleVersion } @@ -213,14 +216,14 @@ function Get-SbtVersion { function Get-PHPVersions { $result = Get-CommandResult "apt list --installed" -Multiline - return $result.Output | Where-Object { $_ -match "^php\d+\.\d+/"} | ForEach-Object { + return $result.Output | Where-Object { $_ -match "^php\d+\.\d+/" } | ForEach-Object { $_ -match "now (\d+:)?(?<version>\d+\.\d+\.\d+)" | Out-Null $Matches.version } } function Get-ComposerVersion { - $composerVersion = (composer --version) -replace " version" | Take-OutputPart -Part 1 + $composerVersion = (composer --version) -replace " version" | Get-StringPart -Part 1 return $composerVersion } @@ -281,7 +284,7 @@ function Get-PowerShellModules { } function Get-DotNetCoreSdkVersions { - $dotNetCoreSdkVersion = dotnet --list-sdks list | ForEach-Object { $_ | Take-OutputPart -Part 0 } + $dotNetCoreSdkVersion = dotnet --list-sdks list | ForEach-Object { $_ | Get-StringPart -Part 0 } return $dotNetCoreSdkVersion } @@ -307,8 +310,8 @@ function Get-CachedDockerImagesTableData { $parts = $_.Split("|") [PSCustomObject] @{ "Repository:Tag" = $parts[0] - "Digest" = $parts[1] - "Created" = $parts[2].split(' ')[0] + "Digest" = $parts[1] + "Created" = $parts[2].split(' ')[0] } } | Sort-Object -Property "Repository:Tag" } @@ -318,10 +321,10 @@ function Get-AptPackages { $output = @() ForEach ($pkg in ($apt.vital_packages + $apt.common_packages + $apt.cmd_packages)) { $version = $(dpkg-query -W -f '${Version}' $pkg) - if ($Null -eq $version) { + if ($null -eq $version) { $version = $(dpkg-query -W -f '${Version}' "$pkg*") } - + $version = $version -replace '~','\~' $output += [PSCustomObject] @{ @@ -341,18 +344,18 @@ function Get-PipxVersion { function Build-PackageManagementEnvironmentTable { return @( [PSCustomObject] @{ - "Name" = "CONDA" + "Name" = "CONDA" "Value" = $env:CONDA }, [PSCustomObject] @{ - "Name" = "VCPKG_INSTALLATION_ROOT" + "Name" = "VCPKG_INSTALLATION_ROOT" "Value" = $env:VCPKG_INSTALLATION_ROOT } ) } function Get-SystemdVersion { - $matches = [regex]::Matches((systemctl --version | head -n 1), "\((.*?)\)") - $result = foreach ($match in $matches) {$match.Groups[1].Value} + $matchCollection = [regex]::Matches((systemctl --version | head -n 1), "\((.*?)\)") + $result = foreach ($match in $matchCollection) {$match.Groups[1].Value} return $result } diff --git a/images/ubuntu/scripts/docs-gen/SoftwareReport.Databases.psm1 b/images/ubuntu/scripts/docs-gen/SoftwareReport.Databases.psm1 index 78b20cddc6dc..9adfa2f9b101 100644 --- a/images/ubuntu/scripts/docs-gen/SoftwareReport.Databases.psm1 +++ b/images/ubuntu/scripts/docs-gen/SoftwareReport.Databases.psm1 @@ -1,25 +1,25 @@ function Get-PostgreSqlVersion { - $postgreSQLVersion = psql --version | Take-OutputPart -Part 2 + $postgreSQLVersion = psql --version | Get-StringPart -Part 2 return $postgreSQLVersion } function Get-MongoDbVersion { - $mongoDBVersion = mongod --version | Select-Object -First 1 | Take-OutputPart -Part 2 -Delimiter "v" + $mongoDBVersion = mongod --version | Select-Object -First 1 | Get-StringPart -Part 2 -Delimiter "v" return $mongoDBVersion } function Get-SqliteVersion { - $sqliteVersion = sqlite3 --version | Take-OutputPart -Part 0 + $sqliteVersion = sqlite3 --version | Get-StringPart -Part 0 return $sqliteVersion } function Get-MySQLVersion { - $mySQLVersion = mysqld --version | Take-OutputPart -Part 2 + $mySQLVersion = mysqld --version | Get-StringPart -Part 2 return $mySQLVersion } function Get-SQLCmdVersion { - $sqlcmdVersion = sqlcmd -? | Select-String -Pattern "Version" | Take-OutputPart -Part 1 + $sqlcmdVersion = sqlcmd -? | Select-String -Pattern "Version" | Get-StringPart -Part 1 return $sqlcmdVersion } diff --git a/images/ubuntu/scripts/docs-gen/SoftwareReport.Helpers.psm1 b/images/ubuntu/scripts/docs-gen/SoftwareReport.Helpers.psm1 index 1f1ebf810614..c74b85610fc9 100644 --- a/images/ubuntu/scripts/docs-gen/SoftwareReport.Helpers.psm1 +++ b/images/ubuntu/scripts/docs-gen/SoftwareReport.Helpers.psm1 @@ -1,51 +1,34 @@ -function Take-OutputPart { +function Get-StringPart { param ( [Parameter(ValueFromPipeline)] - [string] $toolOutput, + [string] $ToolOutput, [string] $Delimiter = " ", [int[]] $Part ) - $parts = $toolOutput.Split($Delimiter, [System.StringSplitOptions]::RemoveEmptyEntries) + + $parts = $ToolOutput.Split($Delimiter, [System.StringSplitOptions]::RemoveEmptyEntries) $selectedParts = $parts[$Part] return [string]::Join($Delimiter, $selectedParts) } -function Restore-UserOwner { - sudo chown -R ${env:USER}: $env:HOME -} - -function Get-LinkTarget { - param ( - [string] $inputPath - ) - $link = Get-Item $inputPath | Select-Object -ExpandProperty Target - if ($link) { - return " -> $link" - } - return "" -} - function Get-PathWithLink { param ( - [string] $inputPath + [string] $InputPath ) - $link = Get-LinkTarget($inputPath) - return "${inputPath}${link}" -} -function Get-AptSourceRepository { - param([String] $PackageName) - - $sourceUrl = Get-Content "$PSScriptRoot/../helpers/apt-sources.txt" | Select-String -Pattern $PackageName | Take-OutputPart -Part (1..3) - return $sourceUrl + $link = Get-Item $InputPath | Select-Object -ExpandProperty Target + if (-not [string]::IsNullOrEmpty($link)) { + return "${InputPath} -> ${link}" + } + return "${InputPath}" } function Get-OSVersionShort { - $(Get-OSVersionFull) | Take-OutputPart -Delimiter '.' -Part 0,1 + $(Get-OSVersionFull) | Get-StringPart -Delimiter '.' -Part 0,1 } function Get-OSVersionFull { - lsb_release -ds | Take-OutputPart -Part 1, 2 + lsb_release -ds | Get-StringPart -Part 1, 2 } function Get-KernelVersion { diff --git a/images/ubuntu/scripts/docs-gen/SoftwareReport.Java.psm1 b/images/ubuntu/scripts/docs-gen/SoftwareReport.Java.psm1 index 4495cc6fac0d..fb653ab310c2 100644 --- a/images/ubuntu/scripts/docs-gen/SoftwareReport.Java.psm1 +++ b/images/ubuntu/scripts/docs-gen/SoftwareReport.Java.psm1 @@ -1,5 +1,5 @@ function Get-JavaVersionsTable { - $javaToolcacheVersions = Get-ChildItem $env:AGENT_TOOLSDIRECTORY/Java*/* -Directory | Sort-Object { [int]$_.Name.Split(".")[0] } + $javaToolcacheVersions = Get-ChildItem $env:AGENT_TOOLSDIRECTORY/Java*/* -Directory | Sort-Object { [int] $_.Name.Split(".")[0] } return $javaToolcacheVersions | ForEach-Object { $majorVersion = $_.Name.split(".")[0] diff --git a/images/ubuntu/scripts/docs-gen/SoftwareReport.Rust.psm1 b/images/ubuntu/scripts/docs-gen/SoftwareReport.Rust.psm1 index a8058ddc5af1..d4c0ca19eb1f 100644 --- a/images/ubuntu/scripts/docs-gen/SoftwareReport.Rust.psm1 +++ b/images/ubuntu/scripts/docs-gen/SoftwareReport.Rust.psm1 @@ -5,51 +5,51 @@ function Initialize-RustEnvironment { } function Get-RustVersion { - $rustVersion = $(rustc --version) | Take-OutputPart -Part 1 + $rustVersion = $(rustc --version) | Get-StringPart -Part 1 return $rustVersion } function Get-BindgenVersion { - $bindgenVersion = $(bindgen --version) | Take-OutputPart -Part 1 + $bindgenVersion = $(bindgen --version) | Get-StringPart -Part 1 return $bindgenVersion } function Get-CargoVersion { - $cargoVersion = $(cargo --version) | Take-OutputPart -Part 1 + $cargoVersion = $(cargo --version) | Get-StringPart -Part 1 return $cargoVersion } function Get-CargoAuditVersion { - $cargoAuditVersion = $(cargo-audit --version) | Take-OutputPart -Part 1 + $cargoAuditVersion = $(cargo-audit --version) | Get-StringPart -Part 1 return $cargoAuditVersion } function Get-CargoOutdatedVersion { - $cargoOutdatedVersion = cargo outdated --version | Take-OutputPart -Part 1 + $cargoOutdatedVersion = cargo outdated --version | Get-StringPart -Part 1 return $cargoOutdatedVersion } function Get-CargoClippyVersion { - $cargoClippyVersion = $(cargo-clippy --version) | Take-OutputPart -Part 1 + $cargoClippyVersion = $(cargo-clippy --version) | Get-StringPart -Part 1 return $cargoClippyVersion } function Get-CbindgenVersion { - $cbindgenVersion = $(cbindgen --version) | Take-OutputPart -Part 1 + $cbindgenVersion = $(cbindgen --version) | Get-StringPart -Part 1 return $cbindgenVersion } function Get-RustupVersion { - $rustupVersion = $(rustup --version) | Take-OutputPart -Part 1 + $rustupVersion = $(rustup --version) | Get-StringPart -Part 1 return $rustupVersion } function Get-RustdocVersion { - $rustdocVersion = $(rustdoc --version) | Take-OutputPart -Part 1 + $rustdocVersion = $(rustdoc --version) | Get-StringPart -Part 1 return $rustdocVersion } function Get-RustfmtVersion { - $rustfmtVersion = $(rustfmt --version) | Take-OutputPart -Part 1 | Take-OutputPart -Part 0 -Delimiter "-" + $rustfmtVersion = $(rustfmt --version) | Get-StringPart -Part 1 | Get-StringPart -Part 0 -Delimiter "-" return $rustfmtVersion } diff --git a/images/ubuntu/scripts/docs-gen/SoftwareReport.Tools.psm1 b/images/ubuntu/scripts/docs-gen/SoftwareReport.Tools.psm1 index fab8249aece3..6ed4470d2b79 100644 --- a/images/ubuntu/scripts/docs-gen/SoftwareReport.Tools.psm1 +++ b/images/ubuntu/scripts/docs-gen/SoftwareReport.Tools.psm1 @@ -10,18 +10,18 @@ function Get-AptFastVersion { } function Get-AzCopyVersion { - $azcopyVersion = azcopy --version | Take-OutputPart -Part 2 + $azcopyVersion = azcopy --version | Get-StringPart -Part 2 return "$azcopyVersion - available by ``azcopy`` and ``azcopy10`` aliases" } function Get-BazelVersion { - $bazelVersion = bazel --version | Select-String "bazel" | Take-OutputPart -Part 1 + $bazelVersion = bazel --version | Select-String "bazel" | Get-StringPart -Part 1 return $bazelVersion } function Get-BazeliskVersion { $result = Get-CommandResult "bazelisk version" -Multiline - $bazeliskVersion = $result.Output | Select-String "Bazelisk version:" | Take-OutputPart -Part 2 | Take-OutputPart -Part 0 -Delimiter "v" + $bazeliskVersion = $result.Output | Select-String "Bazelisk version:" | Get-StringPart -Part 2 | Get-StringPart -Part 0 -Delimiter "v" return $bazeliskVersion } @@ -39,32 +39,32 @@ function Get-CodeQLBundleVersion { } function Get-PodManVersion { - $podmanVersion = podman --version | Take-OutputPart -Part 2 + $podmanVersion = podman --version | Get-StringPart -Part 2 return $podmanVersion } function Get-BuildahVersion { - $buildahVersion = buildah --version | Take-OutputPart -Part 2 + $buildahVersion = buildah --version | Get-StringPart -Part 2 return $buildahVersion } function Get-SkopeoVersion { - $skopeoVersion = skopeo --version | Take-OutputPart -Part 2 + $skopeoVersion = skopeo --version | Get-StringPart -Part 2 return $skopeoVersion } function Get-CMakeVersion { - $cmakeVersion = cmake --version | Select-Object -First 1 | Take-OutputPart -Part 2 + $cmakeVersion = cmake --version | Select-Object -First 1 | Get-StringPart -Part 2 return $cmakeVersion } function Get-DockerComposeV1Version { - $composeVersion = docker-compose -v | Take-OutputPart -Part 2 | Take-OutputPart -Part 0 -Delimiter "," + $composeVersion = docker-compose -v | Get-StringPart -Part 2 | Get-StringPart -Part 0 -Delimiter "," return $composeVersion } function Get-DockerComposeV2Version { - $composeVersion = docker compose version | Take-OutputPart -Part 3 | Take-OutputPart -Part 0 -Delimiter "v" + $composeVersion = docker compose version | Get-StringPart -Part 3 | Get-StringPart -Part 0 -Delimiter "v" return $composeVersion } @@ -79,62 +79,62 @@ function Get-DockerServerVersion { } function Get-DockerBuildxVersion { - $buildxVersion = docker buildx version | Take-OutputPart -Part 1 | Take-OutputPart -Part 0 -Delimiter "v" + $buildxVersion = docker buildx version | Get-StringPart -Part 1 | Get-StringPart -Part 0 -Delimiter "v" return $buildxVersion } function Get-DockerAmazonECRCredHelperVersion { - $ecrVersion = docker-credential-ecr-login -v | Select-String "Version:" | Take-OutputPart -Part 1 + $ecrVersion = docker-credential-ecr-login -v | Select-String "Version:" | Get-StringPart -Part 1 return $ecrVersion } function Get-GitVersion { - $gitVersion = git --version | Take-OutputPart -Part -1 + $gitVersion = git --version | Get-StringPart -Part -1 return $gitVersion } function Get-GitLFSVersion { $result = Get-CommandResult "git-lfs --version" - $gitlfsversion = $result.Output | Take-OutputPart -Part 0 | Take-OutputPart -Part 1 -Delimiter "/" + $gitlfsversion = $result.Output | Get-StringPart -Part 0 | Get-StringPart -Part 1 -Delimiter "/" return $gitlfsversion } function Get-GitFTPVersion { - $gitftpVersion = git-ftp --version | Take-OutputPart -Part 2 + $gitftpVersion = git-ftp --version | Get-StringPart -Part 2 return $gitftpVersion } function Get-GoogleCloudCLIVersion { - return (gcloud --version | Select-Object -First 1) | Take-OutputPart -Part 3 + return (gcloud --version | Select-Object -First 1) | Get-StringPart -Part 3 } function Get-HavegedVersion { - $havegedVersion = dpkg-query --showformat='${Version}' --show haveged | Take-OutputPart -Part 0 -Delimiter "-" + $havegedVersion = dpkg-query --showformat='${Version}' --show haveged | Get-StringPart -Part 0 -Delimiter "-" return $havegedVersion } function Get-HerokuVersion { - $herokuVersion = heroku version | Take-OutputPart -Part 0 | Take-OutputPart -Part 1 -Delimiter "/" + $herokuVersion = heroku version | Get-StringPart -Part 0 | Get-StringPart -Part 1 -Delimiter "/" return $herokuVersion } function Get-HHVMVersion { - $hhvmVersion = hhvm --version | Select-Object -First 1 | Take-OutputPart -Part 2 + $hhvmVersion = hhvm --version | Select-Object -First 1 | Get-StringPart -Part 2 return $hhvmVersion } function Get-SVNVersion { - $svnVersion = svn --version | Select-Object -First 1 | Take-OutputPart -Part 2 + $svnVersion = svn --version | Select-Object -First 1 | Get-StringPart -Part 2 return $svnVersion } function Get-KustomizeVersion { - $kustomizeVersion = kustomize version --short | Take-OutputPart -Part 0 | Take-OutputPart -Part 1 -Delimiter "v" + $kustomizeVersion = kustomize version --short | Get-StringPart -Part 0 | Get-StringPart -Part 1 -Delimiter "v" return $kustomizeVersion } function Get-KindVersion { - $kindVersion = kind version | Take-OutputPart -Part 1 | Take-OutputPart -Part 0 -Delimiter "v" + $kindVersion = kind version | Get-StringPart -Part 1 | Get-StringPart -Part 0 -Delimiter "v" return $kindVersion } @@ -144,21 +144,21 @@ function Get-KubectlVersion { } function Get-MinikubeVersion { - $minikubeVersion = minikube version --short | Take-OutputPart -Part 0 -Delimiter "v" + $minikubeVersion = minikube version --short | Get-StringPart -Part 0 -Delimiter "v" return $minikubeVersion } function Get-HGVersion { - $hgVersion = hg --version | Select-Object -First 1 | Take-OutputPart -Part -1 | Take-OutputPart -Part 0 -Delimiter ")" + $hgVersion = hg --version | Select-Object -First 1 | Get-StringPart -Part -1 | Get-StringPart -Part 0 -Delimiter ")" return $hgVersion } function Get-LeiningenVersion { - return "$(lein -v | Take-OutputPart -Part 1)" + return "$(lein -v | Get-StringPart -Part 1)" } function Get-MediainfoVersion { - $mediainfoVersion = (mediainfo --version | Select-Object -Index 1 | Take-OutputPart -Part 2).Replace('v', '') + $mediainfoVersion = (mediainfo --version | Select-Object -Index 1 | Get-StringPart -Part 2).Replace('v', '') return $mediainfoVersion } @@ -187,11 +187,11 @@ function Get-PhantomJSVersion { } function Get-TerraformVersion { - return (terraform version | Select-String "^Terraform").Line.Replace('v','') | Take-OutputPart -Part 1 + return (terraform version | Select-String "^Terraform").Line.Replace('v','') | Get-StringPart -Part 1 } function Get-JqVersion { - $jqVersion = jq --version | Take-OutputPart -Part 1 -Delimiter "-" + $jqVersion = jq --version | Get-StringPart -Part 1 -Delimiter "-" return $jqVersion } @@ -211,7 +211,7 @@ function Get-AlibabaCloudCliVersion { function Get-AWSCliVersion { $result = Get-CommandResult "aws --version" - $awsVersion = $result.Output | Take-OutputPart -Part 0 | Take-OutputPart -Part 1 -Delimiter "/" + $awsVersion = $result.Output | Get-StringPart -Part 0 | Get-StringPart -Part 1 -Delimiter "/" return $awsVersion } @@ -221,21 +221,21 @@ function Get-AWSCliSessionManagerPluginVersion { } function Get-AWSSAMVersion { - return $(sam --version | Take-OutputPart -Part -1) + return $(sam --version | Get-StringPart -Part -1) } function Get-FastlaneVersion { - $fastlaneVersion = fastlane --version | Select-String "^fastlane [0-9]" | Take-OutputPart -Part 1 + $fastlaneVersion = fastlane --version | Select-String "^fastlane [0-9]" | Get-StringPart -Part 1 return $fastlaneVersion } function Get-GitHubCliVersion { - $ghVersion = gh --version | Select-String "gh version" | Take-OutputPart -Part 2 + $ghVersion = gh --version | Select-String "gh version" | Get-StringPart -Part 2 return $ghVersion } function Get-NetlifyCliVersion { - $netlifyVersion = netlify --version | Take-OutputPart -Part 0 | Take-OutputPart -Part 1 -Delimiter "/" + $netlifyVersion = netlify --version | Get-StringPart -Part 0 | Get-StringPart -Part 1 -Delimiter "/" return $netlifyVersion } @@ -245,7 +245,7 @@ function Get-OCCliVersion { } function Get-ORASCliVersion { - $orasVersion = oras version | Select-String "^Version:" | Take-OutputPart -Part 1 + $orasVersion = oras version | Select-String "^Version:" | Get-StringPart -Part 1 return $orasVersion } @@ -255,30 +255,30 @@ function Get-VerselCliversion { } function Get-PulumiVersion { - $pulumiVersion = pulumi version | Take-OutputPart -Part 0 -Delimiter "v" + $pulumiVersion = pulumi version | Get-StringPart -Part 0 -Delimiter "v" return $pulumiVersion } function Get-RVersion { - $rVersion = (Get-CommandResult "R --version | grep 'R version'").Output | Take-OutputPart -Part 2 + $rVersion = (Get-CommandResult "R --version | grep 'R version'").Output | Get-StringPart -Part 2 return $rVersion } function Get-SphinxVersion { - $sphinxVersion = searchd -h | Select-Object -First 1 | Take-OutputPart -Part 1 | Take-OutputPart -Part 0 -Delimiter "-" + $sphinxVersion = searchd -h | Select-Object -First 1 | Get-StringPart -Part 1 | Get-StringPart -Part 0 -Delimiter "-" return $sphinxVersion } function Get-YamllintVersion { - return $(yamllint --version) | Take-OutputPart -Part 1 + return $(yamllint --version) | Get-StringPart -Part 1 } function Get-ZstdVersion { - $zstdVersion = zstd --version | Take-OutputPart -Part 1 -Delimiter "v" | Take-OutputPart -Part 0 -Delimiter "," + $zstdVersion = zstd --version | Get-StringPart -Part 1 -Delimiter "v" | Get-StringPart -Part 0 -Delimiter "," return "$zstdVersion" } function Get-YqVersion { - $yqVersion = $(yq -V) | Take-OutputPart -Part 3 + $yqVersion = $(yq -V) | Get-StringPart -Part 3 return $yqVersion.TrimStart("v").Trim() } diff --git a/images/ubuntu/scripts/docs-gen/SoftwareReport.WebServers.psm1 b/images/ubuntu/scripts/docs-gen/SoftwareReport.WebServers.psm1 index cf4c89f30dfc..bfb76e0a7b8b 100644 --- a/images/ubuntu/scripts/docs-gen/SoftwareReport.WebServers.psm1 +++ b/images/ubuntu/scripts/docs-gen/SoftwareReport.WebServers.psm1 @@ -1,15 +1,15 @@ function Get-ApacheVersion { $name = "apache2" $port = 80 - $version = bash -c "apache2 -v | grep -Po 'Apache/(\d+.){2}\d+'" | Take-OutputPart -Part 1 -Delimiter "/" - $serviceStatus = systemctl status apache2 | grep "Active:" | Take-OutputPart -Part 1 + $version = bash -c "apache2 -v | grep -Po 'Apache/(\d+.){2}\d+'" | Get-StringPart -Part 1 -Delimiter "/" + $serviceStatus = systemctl status apache2 | grep "Active:" | Get-StringPart -Part 1 $configFile = "/etc/apache2/apache2.conf" return [PsCustomObject]@{ - "Name" = $name - "Version" = $version - "ConfigFile" = $configFile + "Name" = $name + "Version" = $version + "ConfigFile" = $configFile "ServiceStatus" = $serviceStatus - "ListenPort" = $port + "ListenPort" = $port } } @@ -17,14 +17,14 @@ function Get-NginxVersion { $name = "nginx" $port = 80 $version = (dpkg-query --showformat='${Version}' --show nginx).Split('-')[0] - $serviceStatus = systemctl status nginx | grep "Active:" | Take-OutputPart -Part 1 + $serviceStatus = systemctl status nginx | grep "Active:" | Get-StringPart -Part 1 $configFile = "/etc/nginx/nginx.conf" return [PsCustomObject]@{ - "Name" = $name - "Version" = $version - "ConfigFile" = $configFile + "Name" = $name + "Version" = $version + "ConfigFile" = $configFile "ServiceStatus" = $serviceStatus - "ListenPort" = $port + "ListenPort" = $port } } @@ -35,11 +35,11 @@ function Get-Xsp4Version { $serviceStatus = systemctl show -p ActiveState --value mono-xsp4 $configFile = "/etc/default/mono-xsp4" return [PsCustomObject]@{ - "Name" = $name - "Version" = $version - "ConfigFile" = $configFile + "Name" = $name + "Version" = $version + "ConfigFile" = $configFile "ServiceStatus" = $serviceStatus - "ListenPort" = $port + "ListenPort" = $port } } From 0ade9f36d38ee9e3468a133dc1c21451ee221c17 Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Wed, 6 Dec 2023 14:00:26 +0100 Subject: [PATCH 2512/3485] [ubuntu] Refactor Toolset functions (#8948) --- .../docs-gen/SoftwareReport.Android.psm1 | 2 +- .../scripts/helpers/Common.Helpers.psm1 | 35 ++++--------------- images/ubuntu/scripts/helpers/install.sh | 7 ++-- images/ubuntu/scripts/tests/Android.Tests.ps1 | 12 +++---- 4 files changed, 15 insertions(+), 41 deletions(-) diff --git a/images/ubuntu/scripts/docs-gen/SoftwareReport.Android.psm1 b/images/ubuntu/scripts/docs-gen/SoftwareReport.Android.psm1 index 3bfc59bd23cc..d79ac8568673 100644 --- a/images/ubuntu/scripts/docs-gen/SoftwareReport.Android.psm1 +++ b/images/ubuntu/scripts/docs-gen/SoftwareReport.Android.psm1 @@ -155,7 +155,7 @@ function Get-AndroidGoogleAPIsVersions { function Get-AndroidNDKVersions { $ndkFolderPath = Join-Path (Get-AndroidSDKRoot) "ndk" $versions = Get-ChildItem -Path $ndkFolderPath -Name - $ndkDefaultVersion = Get-ToolsetValue "android.ndk.default" + $ndkDefaultVersion = (Get-ToolsetContent).android.ndk.default $ndkDefaultFullVersion = Get-ChildItem "$env:ANDROID_HOME/ndk/$ndkDefaultVersion.*" -Name | Select-Object -Last 1 return ($versions | ForEach-Object { diff --git a/images/ubuntu/scripts/helpers/Common.Helpers.psm1 b/images/ubuntu/scripts/helpers/Common.Helpers.psm1 index 7faeb3739e37..22376cd4fa3a 100644 --- a/images/ubuntu/scripts/helpers/Common.Helpers.psm1 +++ b/images/ubuntu/scripts/helpers/Common.Helpers.psm1 @@ -63,39 +63,16 @@ function Test-IsUbuntu22 { } function Get-ToolsetContent { - $toolset = Join-Path $env:INSTALLER_SCRIPT_FOLDER "toolset.json" - Get-Content $toolset -Raw | ConvertFrom-Json -} - -function Get-ToolsetValue { <# .SYNOPSIS - This function retrieves the value of a specific toolset. + Retrieves the content of the toolset.json file. .DESCRIPTION - The Get-ToolsetValue is used to retrieve the value of a specific toolset. - The toolset is a collection of tools or settings in json format. - - .PARAMETER KeyPath - The path to the toolset value in json notation. - - .EXAMPLE - Get-ToolsetValue -Toolset "tool.arch.versions" - - This command returns the value of the nodes named "tool", "arch" and "versions" as PSCustomObject. - + This function reads the toolset.json in path provided by INSTALLER_SCRIPT_FOLDER + environment variable and returns the content as a PowerShell object. #> - param ( - [Parameter(Mandatory = $true)] - [string] $KeyPath - ) - $jsonNode = Get-ToolsetContent - - $pathParts = $KeyPath.Split(".") - # walk through all arguments consequentially to resolve specific json node - $pathParts | ForEach-Object { - $jsonNode = $jsonNode.$_ - } - return $jsonNode + $toolsetPath = Join-Path $env:INSTALLER_SCRIPT_FOLDER "toolset.json" + $toolsetJson = Get-Content -Path $toolsetPath -Raw + ConvertFrom-Json -InputObject $toolsetJson } diff --git a/images/ubuntu/scripts/helpers/install.sh b/images/ubuntu/scripts/helpers/install.sh index 0f803f04bd45..52288b93b1df 100644 --- a/images/ubuntu/scripts/helpers/install.sh +++ b/images/ubuntu/scripts/helpers/install.sh @@ -59,13 +59,10 @@ verlte() { [ "$1" = "$sortedVersion" ] } -get_toolset_path() { - echo "/imagegeneration/installers/toolset.json" -} - get_toolset_value() { - local toolset_path=$(get_toolset_path) + local toolset_path="/imagegeneration/installers/toolset.json" local query=$1 + echo "$(jq -r "$query" $toolset_path)" } diff --git a/images/ubuntu/scripts/tests/Android.Tests.ps1 b/images/ubuntu/scripts/tests/Android.Tests.ps1 index f841bd3a6ed2..840d6520512f 100644 --- a/images/ubuntu/scripts/tests/Android.Tests.ps1 +++ b/images/ubuntu/scripts/tests/Android.Tests.ps1 @@ -77,9 +77,9 @@ Describe "Android" { } $androidSdkManagerPackages = Get-AndroidPackages - [int]$platformMinVersion = Get-ToolsetValue "android.platform_min_version" - [version]$buildToolsMinVersion = Get-ToolsetValue "android.build_tools_min_version" - [array]$ndkVersions = Get-ToolsetValue "android.ndk.versions" + [int]$platformMinVersion = (Get-ToolsetContent).android.platform_min_version + [version]$buildToolsMinVersion = (Get-ToolsetContent).android.build_tools_min_version + [array]$ndkVersions = (Get-ToolsetContent).android.ndk.versions $ndkFullVersions = $ndkVersions | ForEach-Object { (Get-ChildItem "/usr/local/lib/android/sdk/ndk/${_}.*" | Select-Object -Last 1).Name } | ForEach-Object { "ndk/${_}" } @@ -102,9 +102,9 @@ Describe "Android" { $platformsInstalled, $buildTools, $ndkFullVersions, - (Get-ToolsetValue "android.extra_list" | ForEach-Object { "extras/${_}" }), - (Get-ToolsetValue "android.addon_list" | ForEach-Object { "add-ons/${_}" }), - (Get-ToolsetValue "android.additional_tools" | ForEach-Object { "${_}" }) + ((Get-ToolsetContent).android.extra_list | ForEach-Object { "extras/${_}" }), + ((Get-ToolsetContent).android.addon_list | ForEach-Object { "add-ons/${_}" }), + ((Get-ToolsetContent).android.additional_tools | ForEach-Object { "${_}" }) ) $androidPackages = $androidPackages | ForEach-Object { $_ } From 8437ff39903ee7b348688a24d7a2606883347a59 Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Wed, 6 Dec 2023 14:01:37 +0100 Subject: [PATCH 2513/3485] [ubuntu] Refactor GitHub package download URL function (#8947) * [ubuntu] Refactor Github Package URL function * Fix function and selenium version * Remove beta/release candidate versions --- .../scripts/build/install-actions-cache.sh | 2 +- .../scripts/build/install-aliyun-cli.sh | 2 +- images/ubuntu/scripts/build/install-cmake.sh | 4 +- images/ubuntu/scripts/build/install-docker.sh | 4 +- .../ubuntu/scripts/build/install-firefox.sh | 2 +- .../scripts/build/install-github-cli.sh | 4 +- images/ubuntu/scripts/build/install-kotlin.sh | 2 +- .../scripts/build/install-kubernetes-tools.sh | 2 +- .../ubuntu/scripts/build/install-oras-cli.sh | 4 +- .../scripts/build/install-runner-package.sh | 2 +- images/ubuntu/scripts/build/install-sbt.sh | 2 +- .../ubuntu/scripts/build/install-selenium.sh | 2 +- images/ubuntu/scripts/helpers/install.sh | 45 +++++++++++++------ 13 files changed, 48 insertions(+), 29 deletions(-) diff --git a/images/ubuntu/scripts/build/install-actions-cache.sh b/images/ubuntu/scripts/build/install-actions-cache.sh index 416dab22a5c4..1761c8a0b167 100644 --- a/images/ubuntu/scripts/build/install-actions-cache.sh +++ b/images/ubuntu/scripts/build/install-actions-cache.sh @@ -17,7 +17,7 @@ echo "Setting up ACTIONS_RUNNER_ACTION_ARCHIVE_CACHE variable to ${ACTION_ARCHIV setEtcEnvironmentVariable "ACTIONS_RUNNER_ACTION_ARCHIVE_CACHE" "${ACTION_ARCHIVE_CACHE_DIR}" # Download latest release from github.com/actions/action-versions and untar to /opt/actionarchivecache -downloadUrl=$(get_github_package_download_url "actions/action-versions" "contains(\"action-versions.tar.gz\")") +downloadUrl=$(resolve_github_release_asset_url "actions/action-versions" "contains(\"action-versions.tar.gz\")" "latest") archive_path=$(download_with_retry "$downloadUrl") tar -xzf "$archive_path" -C $ACTION_ARCHIVE_CACHE_DIR diff --git a/images/ubuntu/scripts/build/install-aliyun-cli.sh b/images/ubuntu/scripts/build/install-aliyun-cli.sh index d3d8813bf199..2603ae3d54af 100644 --- a/images/ubuntu/scripts/build/install-aliyun-cli.sh +++ b/images/ubuntu/scripts/build/install-aliyun-cli.sh @@ -15,7 +15,7 @@ if isUbuntu20; then toolset_version=$(get_toolset_value '.aliyunCli.version') download_url="https://github.com/aliyun/aliyun-cli/releases/download/v$toolset_version/aliyun-cli-linux-$toolset_version-amd64.tgz" else - download_url=$(get_github_package_download_url "aliyun/aliyun-cli" "contains(\"aliyun-cli-linux\") and endswith(\"amd64.tgz\")") + download_url=$(resolve_github_release_asset_url "aliyun/aliyun-cli" "contains(\"aliyun-cli-linux\") and endswith(\"amd64.tgz\")" "latest") hash_url="https://github.com/aliyun/aliyun-cli/releases/latest/download/SHASUMS256.txt" fi diff --git a/images/ubuntu/scripts/build/install-cmake.sh b/images/ubuntu/scripts/build/install-cmake.sh index fed29cba89c7..373388bca6f5 100644 --- a/images/ubuntu/scripts/build/install-cmake.sh +++ b/images/ubuntu/scripts/build/install-cmake.sh @@ -14,10 +14,10 @@ if command -v cmake; then echo "cmake is already installed" else # Download script to install CMake - download_url=$(get_github_package_download_url "Kitware/CMake" "endswith(\"inux-x86_64.sh\")") + download_url=$(resolve_github_release_asset_url "Kitware/CMake" "endswith(\"inux-x86_64.sh\")" "latest") curl -fsSL "${download_url}" -o cmakeinstall.sh # Supply chain security - CMake - hash_url=$(get_github_package_download_url "Kitware/CMake" "endswith(\"SHA-256.txt\")") + hash_url=$(resolve_github_release_asset_url "Kitware/CMake" "endswith(\"SHA-256.txt\")" "latest") external_hash=$(get_hash_from_remote_file "$hash_url" "linux-x86_64.sh") use_checksum_comparison "cmakeinstall.sh" "$external_hash" # Install CMake and remove the install script diff --git a/images/ubuntu/scripts/build/install-docker.sh b/images/ubuntu/scripts/build/install-docker.sh index bbf77048f6ab..967dd3567545 100644 --- a/images/ubuntu/scripts/build/install-docker.sh +++ b/images/ubuntu/scripts/build/install-docker.sh @@ -19,10 +19,10 @@ apt-get update apt-get install --no-install-recommends docker-ce docker-ce-cli containerd.io docker-buildx-plugin # Download docker compose v2 from releases -URL=$(get_github_package_download_url "docker/compose" "contains(\"compose-linux-x86_64\")") +URL=$(resolve_github_release_asset_url "docker/compose" "contains(\"compose-linux-x86_64\")" "latest") curl -fsSL "${URL}" -o /tmp/docker-compose # Supply chain security - Docker Compose v2 -compose_hash_url=$(get_github_package_download_url "docker/compose" "contains(\"checksums.txt\")") +compose_hash_url=$(resolve_github_release_asset_url "docker/compose" "contains(\"checksums.txt\")" "latest") compose_external_hash=$(get_hash_from_remote_file "${compose_hash_url}" "compose-linux-x86_64") use_checksum_comparison "/tmp/docker-compose" "${compose_external_hash}" # Install docker compose v2 diff --git a/images/ubuntu/scripts/build/install-firefox.sh b/images/ubuntu/scripts/build/install-firefox.sh index 53714ca1c99d..337d74339502 100644 --- a/images/ubuntu/scripts/build/install-firefox.sh +++ b/images/ubuntu/scripts/build/install-firefox.sh @@ -33,7 +33,7 @@ echo "mozillateam $repo_url" >> $HELPER_SCRIPTS/apt-sources.txt echo 'pref("intl.locale.requested","en_US");' >> "/usr/lib/firefox/browser/defaults/preferences/syspref.js" # Download and unpack latest release of geckodriver -download_url=$(get_github_package_download_url "mozilla/geckodriver" "test(\"linux64.tar.gz$\")") +download_url=$(resolve_github_release_asset_url "mozilla/geckodriver" "test(\"linux64.tar.gz$\")" "latest") driver_archive_path=$(download_with_retry "$download_url") GECKODRIVER_DIR="/usr/local/share/gecko_driver" diff --git a/images/ubuntu/scripts/build/install-github-cli.sh b/images/ubuntu/scripts/build/install-github-cli.sh index 6e43aed4af75..dc14febaa18e 100644 --- a/images/ubuntu/scripts/build/install-github-cli.sh +++ b/images/ubuntu/scripts/build/install-github-cli.sh @@ -10,10 +10,10 @@ source $HELPER_SCRIPTS/install.sh # Download GitHub CLI -gh_cli_url=$(get_github_package_download_url "cli/cli" "contains(\"linux\") and contains(\"amd64\") and contains(\".deb\")") +gh_cli_url=$(resolve_github_release_asset_url "cli/cli" "contains(\"linux\") and contains(\"amd64\") and contains(\".deb\")" "latest") gh_cli_deb_path=$(download_with_retry "$gh_cli_url") # Supply chain security - GitHub CLI -hash_url=$(get_github_package_download_url "cli/cli" "contains(\"checksums.txt\")") +hash_url=$(resolve_github_release_asset_url "cli/cli" "contains(\"checksums.txt\")" "latest") external_hash=$(get_hash_from_remote_file "$hash_url" "linux_amd64.deb") use_checksum_comparison "$gh_cli_deb_path" "$external_hash" # Install GitHub CLI diff --git a/images/ubuntu/scripts/build/install-kotlin.sh b/images/ubuntu/scripts/build/install-kotlin.sh index a8c2bd27325e..3b144443a7c3 100644 --- a/images/ubuntu/scripts/build/install-kotlin.sh +++ b/images/ubuntu/scripts/build/install-kotlin.sh @@ -8,7 +8,7 @@ source $HELPER_SCRIPTS/install.sh KOTLIN_ROOT="/usr/share" -download_url=$(get_github_package_download_url "JetBrains/kotlin" "contains(\"kotlin-compiler\")") +download_url=$(resolve_github_release_asset_url "JetBrains/kotlin" "contains(\"kotlin-compiler\")" "latest") archive_path=$(download_with_retry "$download_url") # Supply chain security - Kotlin diff --git a/images/ubuntu/scripts/build/install-kubernetes-tools.sh b/images/ubuntu/scripts/build/install-kubernetes-tools.sh index 0806c981492d..03383065c908 100644 --- a/images/ubuntu/scripts/build/install-kubernetes-tools.sh +++ b/images/ubuntu/scripts/build/install-kubernetes-tools.sh @@ -9,7 +9,7 @@ source $HELPER_SCRIPTS/install.sh # Download KIND -kind_url=$(get_github_package_download_url "kubernetes-sigs/kind" "contains(\"kind-linux-amd64\")") +kind_url=$(resolve_github_release_asset_url "kubernetes-sigs/kind" "contains(\"kind-linux-amd64\")" "latest") curl -fsSL -o /tmp/kind "${kind_url}" # Supply chain security - KIND kind_external_hash=$(get_hash_from_remote_file "${kind_url}.sha256sum" "kind-linux-amd64") diff --git a/images/ubuntu/scripts/build/install-oras-cli.sh b/images/ubuntu/scripts/build/install-oras-cli.sh index 352a94b7347d..43cfefc933d2 100644 --- a/images/ubuntu/scripts/build/install-oras-cli.sh +++ b/images/ubuntu/scripts/build/install-oras-cli.sh @@ -8,13 +8,13 @@ source $HELPER_SCRIPTS/install.sh # Determine latest ORAS CLI version -download_url=$(get_github_package_download_url "oras-project/oras" "endswith(\"linux_amd64.tar.gz\")") +download_url=$(resolve_github_release_asset_url "oras-project/oras" "endswith(\"linux_amd64.tar.gz\")" "latest") # Download ORAS CLI archive_path=$(download_with_retry "$download_url") # Supply chain security - ORAS CLI -hash_url=$(get_github_package_download_url "oras-project/oras" "contains(\"checksums.txt\")") +hash_url=$(resolve_github_release_asset_url "oras-project/oras" "contains(\"checksums.txt\")" "latest") external_hash=$(get_hash_from_remote_file "${hash_url}" "linux_amd64.tar.gz") use_checksum_comparison "$archive_path" "${external_hash}" diff --git a/images/ubuntu/scripts/build/install-runner-package.sh b/images/ubuntu/scripts/build/install-runner-package.sh index 967c0466e4be..b18fdbc4931a 100644 --- a/images/ubuntu/scripts/build/install-runner-package.sh +++ b/images/ubuntu/scripts/build/install-runner-package.sh @@ -7,7 +7,7 @@ # Source the helpers for use with the script source $HELPER_SCRIPTS/install.sh -download_url=$(get_github_package_download_url "actions/runner" 'test("actions-runner-linux-x64-[0-9]+\\.[0-9]{3}\\.[0-9]+\\.tar\\.gz")') +download_url=$(resolve_github_release_asset_url "actions/runner" 'test("actions-runner-linux-x64-[0-9]+\\.[0-9]{3}\\.[0-9]+\\.tar\\.gz")' "latest") archive_name="${download_url##*/}" archive_path=$(download_with_retry "$download_url") diff --git a/images/ubuntu/scripts/build/install-sbt.sh b/images/ubuntu/scripts/build/install-sbt.sh index ae7610f2d8dd..037b8e512ceb 100644 --- a/images/ubuntu/scripts/build/install-sbt.sh +++ b/images/ubuntu/scripts/build/install-sbt.sh @@ -7,7 +7,7 @@ source $HELPER_SCRIPTS/install.sh # Install latest sbt release -download_url=$(get_github_package_download_url "sbt/sbt" "endswith(\".tgz\")") +download_url=$(resolve_github_release_asset_url "sbt/sbt" "endswith(\".tgz\")" "latest") archive_path=$(download_with_retry "$download_url") tar zxf "$archive_path" -C /usr/share ln -s /usr/share/sbt/bin/sbt /usr/bin/sbt diff --git a/images/ubuntu/scripts/build/install-selenium.sh b/images/ubuntu/scripts/build/install-selenium.sh index 0cbc90408bf6..fa30d5e7dc14 100644 --- a/images/ubuntu/scripts/build/install-selenium.sh +++ b/images/ubuntu/scripts/build/install-selenium.sh @@ -11,7 +11,7 @@ source $HELPER_SCRIPTS/etc-environment.sh SELENIUM_MAJOR_VERSION=$(get_toolset_value '.selenium.version') # Download Selenium server -SELENIUM_DOWNLOAD_URL=$(get_github_package_download_url "SeleniumHQ/selenium" "contains(\"selenium-server-${SELENIUM_MAJOR_VERSION}\") and endswith(\".jar\")") +SELENIUM_DOWNLOAD_URL=$(resolve_github_release_asset_url "SeleniumHQ/selenium" "contains(\"selenium-server-\") and endswith(\".jar\")" "$SELENIUM_MAJOR_VERSION\.*") SELENIUM_JAR_PATH=$(download_with_retry "$SELENIUM_DOWNLOAD_URL" "/usr/share/java/selenium-server.jar") # Create an epmty file to retrive selenium version diff --git a/images/ubuntu/scripts/helpers/install.sh b/images/ubuntu/scripts/helpers/install.sh index 52288b93b1df..2add22aa0542 100644 --- a/images/ubuntu/scripts/helpers/install.sh +++ b/images/ubuntu/scripts/helpers/install.sh @@ -66,26 +66,45 @@ get_toolset_value() { echo "$(jq -r "$query" $toolset_path)" } -get_github_package_download_url() { - local REPO_ORG=$1 - local FILTER=$2 - local VERSION=$3 - local SEARCH_IN_COUNT="100" +resolve_github_release_asset_url() { + local repo=$1 + local filter=$2 + local version=${3:-"*"} + local allow_pre_release=${4:-false} - json=$(curl -fsSL "https://api.github.com/repos/${REPO_ORG}/releases?per_page=${SEARCH_IN_COUNT}") + page_size="100" - if [ -n "$VERSION" ]; then - tagName=$(echo $json | jq -r '.[] | select(.prerelease==false).tag_name' | sort --unique --version-sort | egrep -v ".*-[a-z]|beta" | egrep "\w*${VERSION}" | tail -1) + json=$(curl -fsSL "https://api.github.com/repos/${repo}/releases?per_page=${page_size}") + + if [[ $allow_pre_release == "true" ]]; then + json=$(echo $json | jq -r '.[] | select(.assets | length > 0)') + else + json=$(echo $json | jq -r '.[] | select((.prerelease==false) and (.assets | length > 0))') + fi + + if [[ $version == "latest" ]]; then + tag_name=$(echo $json | jq -r '.tag_name' | sort --unique --version-sort | egrep -v ".*-[a-z]|beta" | tail -n 1) + elif [[ $version == *"*"* ]]; then + tag_name=$(echo $json | jq -r '.tag_name' | sort --unique --version-sort | egrep -v ".*-[a-z]|beta" | egrep "${version}" | tail -n 1) else - tagName=$(echo $json | jq -r '.[] | select((.prerelease==false) and (.assets | length > 0)).tag_name' | sort --unique --version-sort | egrep -v ".*-[a-z]|beta" | tail -1) + tag_names=$(echo $json | jq -r '.tag_name' | sort --unique --version-sort | egrep -v ".*-[a-z]|beta" | egrep "${version}") + + for element in $tag_names; do + semver=$(echo "$element" | awk 'match($0, /[0-9]+\.[0-9]+\.[0-9]+/) {print substr($0, RSTART, RLENGTH)}') + + if [[ $semver == $version ]]; then + tag_name=$element + fi + done fi - downloadUrl=$(echo $json | jq -r ".[] | select(.tag_name==\"${tagName}\").assets[].browser_download_url | select(${FILTER})" | head -n 1) - if [ -z "$downloadUrl" ]; then - echo "Failed to parse a download url for the '${tagName}' tag using '${FILTER}' filter" + download_url=$(echo $json | jq -r ". | select(.tag_name==\"${tag_name}\").assets[].browser_download_url | select(${filter})" | head -n 1) + if [ -z "$download_url" ]; then + echo "Failed to parse a download url for the '${tag_name}' tag using '${filter}' filter" exit 1 fi - echo $downloadUrl + + echo $download_url } get_github_package_hash() { From e11b8781168918b6fe9990f434b2adb2b4bf7abd Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 8 Dec 2023 12:19:08 +0000 Subject: [PATCH 2514/3485] Ubuntu 22.04 (20231205) Image Update (#8966) * Updating readme file for ubuntu22 version 20231205.1.1 * Update images/ubuntu/Ubuntu2204-Readme.md Co-authored-by: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> --------- Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Co-authored-by: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2204-Readme.md | 85 +++++++++++++++--------------- 1 file changed, 42 insertions(+), 43 deletions(-) diff --git a/images/ubuntu/Ubuntu2204-Readme.md b/images/ubuntu/Ubuntu2204-Readme.md index 748750523db6..405f08f9522c 100644 --- a/images/ubuntu/Ubuntu2204-Readme.md +++ b/images/ubuntu/Ubuntu2204-Readme.md @@ -1,14 +1,13 @@ | Announcements | |-| +| [Old versions of Android SDK & tools will be removed from images on January, 8](https://github.com/actions/runner-images/issues/8952) | | [[all OSs] Nodejs 14.x will be removed from the images on November, 26](https://github.com/actions/runner-images/issues/8779) | -| [[Ubuntu] Ubuntu:16.04 & Ubuntu:18.04 docker images will be removed from runners on November, 26](https://github.com/actions/runner-images/issues/8776) | | [Major Refactoring of GitHub Actions Runner Images Repository](https://github.com/actions/runner-images/issues/8706) | -| [[All OS] Android NDK r23 will be removed from images on November 13](https://github.com/actions/runner-images/issues/8383) | *** # Ubuntu 22.04 - OS Version: 22.04.3 LTS -- Kernel Version: 6.2.0-1016-azure -- Image Version: 20231126.1.0 +- Kernel Version: 6.2.0-1018-azure +- Image Version: 20231205.1.0 - Systemd version: 249.11-0ubuntu3.11 ## Installed Software @@ -25,7 +24,7 @@ - Kotlin 1.9.21-release-633 - Mono 6.12.0.200 - MSBuild 16.10.1.31701 (Mono 6.12.0.200) -- Node.js 18.18.2 +- Node.js 18.19.0 - Perl 5.34.0 - Python 3.10.12 - Ruby 3.0.2p107 @@ -34,15 +33,15 @@ ### Package Management - cpan 1.64 - Helm 3.13.1 -- Homebrew 4.1.21 +- Homebrew 4.1.23 - Miniconda 23.10.0 -- Npm 9.8.1 +- Npm 10.2.3 - NuGet 6.6.1.2 - Pip 22.0.2 - Pip3 22.0.2 -- Pipx 1.2.1 +- Pipx 1.3.3 - RubyGems 3.3.5 -- Vcpkg (build from commit cd5e746ec) +- Vcpkg (build from commit 08c4e7104) - Yarn 1.22.21 #### Environment variables @@ -64,14 +63,14 @@ to accomplish this. - Maven 3.8.8 ### Tools -- Ansible 2.16.0 +- Ansible 2.16.1 - apt-fast 1.9.12 -- AzCopy 10.21.2 - available by `azcopy` and `azcopy10` aliases +- AzCopy 10.22.0 - available by `azcopy` and `azcopy10` aliases - Bazel 6.4.0 - Bazelisk 1.19.0 - Bicep 0.23.1 - Buildah 1.23.1 -- CMake 3.27.8 +- CMake 3.27.9 - CodeQL Action Bundle 2.15.3 - Docker Amazon ECR Credential Helper 0.7.1 - Docker Compose v1 1.29.2 @@ -95,34 +94,34 @@ to accomplish this. - Minikube 1.32.0 - n 9.2.0 - Newman 6.0.0 -- nvm 0.39.5 +- nvm 0.39.6 - OpenSSL 3.0.2-0ubuntu1.12 -- Packer 1.9.4 +- Packer v1.10.0 - Parcel 2.10.3 - Podman 3.4.4 -- Pulumi 3.94.2 +- Pulumi 3.95.0 - R 4.3.2 - Skopeo 1.4.1 - Sphinx Open Source Search Server 2.2.11 - SVN 1.14.1 -- Terraform 1.6.4 +- Terraform 1.6.5 - yamllint 1.33.0 -- yq 4.40.3 +- yq 4.40.4 - zstd 1.5.5 ### CLI Tools - Alibaba Cloud CLI 3.0.188 -- AWS CLI 2.13.38 -- AWS CLI Session Manager Plugin 1.2.497.0 +- AWS CLI 2.14.5 +- AWS CLI Session Manager Plugin 1.2.536.0 - AWS SAM CLI 1.103.0 -- Azure CLI 2.54.0 +- Azure CLI 2.55.0 - Azure CLI (azure-devops) 0.26.0 -- GitHub CLI 2.39.1 -- Google Cloud CLI 455.0.0 -- Netlify CLI 17.7.0 -- OpenShift CLI 4.14.3 +- GitHub CLI 2.39.2 +- Google Cloud CLI 456.0.0 +- Netlify CLI 17.9.0 +- OpenShift CLI 4.14.5 - ORAS CLI 1.1.0 -- Vercel CLI 32.5.6 +- Vercel CLI 32.6.1 ### Java | Version | Environment Variable | @@ -135,7 +134,7 @@ to accomplish this. ### PHP Tools - PHP: 8.1.2 - Composer 2.6.5 -- PHPUnit 8.5.34 +- PHPUnit 8.5.36 ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ``` @@ -161,13 +160,13 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.6.0 ### Browsers and Drivers -- Google Chrome 119.0.6045.159 +- Google Chrome 119.0.6045.199 - ChromeDriver 119.0.6045.105 - Chromium 119.0.6045.0 -- Microsoft Edge 119.0.2151.72 -- Microsoft Edge WebDriver 119.0.2151.72 +- Microsoft Edge 119.0.2151.97 +- Microsoft Edge WebDriver 119.0.2151.97 - Selenium server 4.15.0 -- Mozilla Firefox 120.0 +- Mozilla Firefox 120.0.1 - Geckodriver 0.33.0 #### Environment variables @@ -179,7 +178,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | ### .NET Tools -- .NET Core SDK: 6.0.417, 7.0.114, 7.0.203, 7.0.311, 7.0.404, 8.0.100 +- .NET Core SDK: 6.0.417, 7.0.404, 8.0.100 - nbgv 3.6.133+2d32d93cb1 ### Databases @@ -215,7 +214,7 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Node.js - 16.20.2 -- 18.18.2 +- 18.19.0 - 20.10.0 #### Python @@ -223,7 +222,7 @@ Use the following command as a part of your job to start the service: 'sudo syst - 3.8.18 - 3.9.18 - 3.10.13 -- 3.11.6 +- 3.11.7 - 3.12.0 #### PyPy @@ -255,7 +254,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | Package Name | Version | | -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 9.0 | -| Android Emulator | 32.1.15 | +| Android Emulator | 33.1.23 | | Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | | Android SDK Platform-Tools | 34.0.5 | | Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34 (rev 2)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | @@ -279,22 +278,22 @@ Use the following command as a part of your job to start the service: 'sudo syst ### Cached Docker images | Repository:Tag | Digest | Created | | ----------------------- | ------------------------------------------------------------------------ | ---------- | -| alpine:3.16 | sha256:a8cbb8c69ee71561f4b69c066bad07f7e510caaa523da26fbfc606b10bd7934b | 2023-08-07 | -| alpine:3.17 | sha256:f71a5f071694a785e064f05fed657bf8277f1b2113a8ed70c90ad486d6ee54dc | 2023-08-07 | -| alpine:3.18 | sha256:eece025e432126ce23f223450a0326fbebde39cdf496a85d8c016293fc851978 | 2023-09-28 | +| alpine:3.16 | sha256:e4cdb7d47b06ba0a062ad2a97a7d154967c8f83934594d9f2bd3efa89292996b | 2023-11-30 | +| alpine:3.17 | sha256:6e94b5cda2d6fd57d85abf81e81dabaea97a5885f919da676cc19d3551da4061 | 2023-11-30 | +| alpine:3.18 | sha256:34871e7290500828b39e22294660bee86d966bc0017544e848dd9a255cdf59e0 | 2023-11-30 | | buildpack-deps:bullseye | sha256:257cbe4fba66709d5a536dd5ac13b22411d469eaf61f421f5c2b871f2290e25c | 2023-11-21 | | buildpack-deps:buster | sha256:77c7243f791521c7bf816e786ef46956eabb0c8e73c8479141ba5e92c05497a7 | 2023-11-21 | | debian:10 | sha256:46ca02d33c65ab188d6e56f26c323bf1aa9a99074f2f54176fdc3884304f58b8 | 2023-11-21 | | debian:11 | sha256:ab2b95aa8d7d6d54866b92c322cf0693933c1ae8038652f24ddfda1d1763a45a | 2023-11-21 | -| moby/buildkit:latest | sha256:d4187a7326f20d04fafd075f80ccc5d3f8cfd4f665c6e03d158a78e4f64bf3db | 2023-10-19 | +| moby/buildkit:latest | sha256:5a8f30813a104b86e927ff4695a746f74a5bb921c7be1dbcca6d754dfbe04822 | 2023-12-01 | | node:16 | sha256:f77a1aef2da8d83e45ec990f45df50f1a286c5fe8bbfb8c6e4246c6389705c0b | 2023-09-07 | | node:16-alpine | sha256:a1f9d027912b58a7c75be7716c97cfbc6d3099f3a97ed84aa490be9dee20e787 | 2023-08-10 | -| node:18 | sha256:a17842484dd30af97540e5416c9a62943c709583977ba41481d601ecffb7f31b | 2023-11-22 | -| node:18-alpine | sha256:3428c2de886bf4378657da6fe86e105573a609c94df1f7d6a70e57d2b51de21f | 2023-11-16 | +| node:18 | sha256:7a4282663db6f22326c03618eef4320fa3cf70c5c3715546f9779858dc0ed3fd | 2023-12-02 | +| node:18-alpine | sha256:4bdb3f3105718f0742bc8d64bb4e36e8f955ebbee295325e40ae80bc8ef78833 | 2023-12-02 | | node:20 | sha256:445acd9b2ef7e9de665424053bf95652e0b8995ef36500557d48faf29300170a | 2023-11-23 | -| node:20-alpine | sha256:b1789b7be6aa16afd642eaaaccdeeeb33bd8f08e69b3d27d931aa9665b731f01 | 2023-11-23 | -| ubuntu:20.04 | sha256:ed4a42283d9943135ed87d4ee34e542f7f5ad9ecf2f244870e23122f703f91c2 | 2023-10-03 | -| ubuntu:22.04 | sha256:2b7412e6465c3c7fc5bb21d3e6f1917c167358449fecac8176c6e496e5c1f05f | 2023-10-05 | +| node:20-alpine | sha256:32427bc0620132b2d9e79e405a1b27944d992501a20417a7f407427cc4c2b672 | 2023-12-01 | +| ubuntu:20.04 | sha256:f5c3e53367f142fab0b49908550bdcdc4fb619d2f61ec1dfa60d26e0d59ac9e7 | 2023-11-28 | +| ubuntu:22.04 | sha256:8eab65df33a6de2844c9aefd19efe8ddb87b7df5e9185a4ab73af936225685bb | 2023-12-01 | ### Installed apt packages | Name | Version | From 83c87d632c09ac7ea61b150e9df8f794dde85391 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 8 Dec 2023 12:19:21 +0000 Subject: [PATCH 2515/3485] Updating readme file for ubuntu20 version 20231204.1.1 (#8965) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2004-Readme.md | 73 +++++++++++++++--------------- 1 file changed, 36 insertions(+), 37 deletions(-) diff --git a/images/ubuntu/Ubuntu2004-Readme.md b/images/ubuntu/Ubuntu2004-Readme.md index f0b333239811..b4d0afa2cfc4 100644 --- a/images/ubuntu/Ubuntu2004-Readme.md +++ b/images/ubuntu/Ubuntu2004-Readme.md @@ -1,14 +1,13 @@ | Announcements | |-| +| [Old versions of Android SDK & tools will be removed from images on January, 8](https://github.com/actions/runner-images/issues/8952) | | [[all OSs] Nodejs 14.x will be removed from the images on November, 26](https://github.com/actions/runner-images/issues/8779) | -| [[Ubuntu] Ubuntu:16.04 & Ubuntu:18.04 docker images will be removed from runners on November, 26](https://github.com/actions/runner-images/issues/8776) | | [Major Refactoring of GitHub Actions Runner Images Repository](https://github.com/actions/runner-images/issues/8706) | -| [[All OS] Android NDK r23 will be removed from images on November 13](https://github.com/actions/runner-images/issues/8383) | *** # Ubuntu 20.04 - OS Version: 20.04.6 LTS -- Kernel Version: 5.15.0-1051-azure -- Image Version: 20231126.1.0 +- Kernel Version: 5.15.0-1052-azure +- Image Version: 20231204.1.0 - Systemd version: 245.4-4ubuntu3.22 ## Installed Software @@ -27,7 +26,7 @@ - Kotlin 1.9.21-release-633 - Mono 6.12.0.200 - MSBuild 16.10.1.31701 (Mono 6.12.0.200) -- Node.js 18.18.2 +- Node.js 18.19.0 - Perl 5.30.0 - Python 3.8.10 - Ruby 2.7.0p0 @@ -36,15 +35,15 @@ ### Package Management - cpan 1.64 - Helm 3.13.1 -- Homebrew 4.1.21 +- Homebrew 4.1.22 - Miniconda 23.10.0 -- Npm 9.8.1 +- Npm 10.2.3 - NuGet 6.6.1.2 - Pip 20.0.2 - Pip3 20.0.2 -- Pipx 1.2.1 +- Pipx 1.3.3 - RubyGems 3.1.2 -- Vcpkg (build from commit cd5e746ec) +- Vcpkg (build from commit 16ee2ecb3) - Yarn 1.22.21 #### Environment variables @@ -63,7 +62,7 @@ to accomplish this. ### Project Management - Ant 1.10.7 -- Gradle 8.4 +- Gradle 8.5 - Lerna 8.0.0 - Maven 3.8.8 - Sbt 1.9.7 @@ -76,7 +75,7 @@ to accomplish this. - Bazelisk 1.19.0 - Bicep 0.23.1 - Buildah 1.22.3 -- CMake 3.27.8 +- CMake 3.27.9 - CodeQL Action Bundle 2.15.3 - Docker Amazon ECR Credential Helper 0.7.1 - Docker Compose v1 1.29.2 @@ -107,29 +106,29 @@ to accomplish this. - Parcel 2.10.3 - PhantomJS 2.1.1 2.1.1 - Podman 3.4.2 -- Pulumi 3.94.2 +- Pulumi 3.95.0 - R 4.3.2 - Skopeo 1.5.0 - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 -- Terraform 1.6.4 +- Terraform 1.6.5 - yamllint 1.33.0 -- yq 4.40.3 +- yq 4.40.4 - zstd 1.5.5 ### CLI Tools - Alibaba Cloud CLI 3.0.174 -- AWS CLI 2.13.38 +- AWS CLI 2.14.5 - AWS CLI Session Manager Plugin 1.2.497.0 - AWS SAM CLI 1.103.0 - Azure CLI 2.54.0 - Azure CLI (azure-devops) 0.26.0 -- GitHub CLI 2.39.1 +- GitHub CLI 2.39.2 - Google Cloud CLI 455.0.0 -- Netlify CLI 17.7.0 -- OpenShift CLI 4.14.3 +- Netlify CLI 17.9.0 +- OpenShift CLI 4.14.4 - ORAS CLI 1.1.0 -- Vercel CLI 32.5.6 +- Vercel CLI 32.6.1 ### Java | Version | Environment Variable | @@ -140,9 +139,9 @@ to accomplish this. | 21.0.1+12 | JAVA_HOME_21_X64 | ### PHP Tools -- PHP: 7.4.33, 8.0.30, 8.1.26, 8.2.13 +- PHP: 7.4.33, 8.0.30, 8.1.26, 8.2.13, 8.3.0 - Composer 2.6.5 -- PHPUnit 8.5.34 +- PHPUnit 8.5.36 ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ``` @@ -168,13 +167,13 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.6.0 ### Browsers and Drivers -- Google Chrome 119.0.6045.159 +- Google Chrome 119.0.6045.199 - ChromeDriver 119.0.6045.105 - Chromium 119.0.6045.0 -- Microsoft Edge 119.0.2151.72 -- Microsoft Edge WebDriver 119.0.2151.72 +- Microsoft Edge 119.0.2151.97 +- Microsoft Edge WebDriver 119.0.2151.97 - Selenium server 4.15.0 -- Mozilla Firefox 120.0 +- Mozilla Firefox 120.0.1 - Geckodriver 0.33.0 #### Environment variables @@ -186,11 +185,11 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | ### .NET Tools -- .NET Core SDK: 6.0.417, 7.0.114, 7.0.203, 7.0.311, 7.0.404, 8.0.100 +- .NET Core SDK: 6.0.417, 7.0.404, 8.0.100 - nbgv 3.6.133+2d32d93cb1 ### Databases -- MongoDB 5.0.22 +- MongoDB 5.0.23 - sqlite3 3.31.1 #### PostgreSQL @@ -223,7 +222,7 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Node.js - 16.20.2 -- 18.18.2 +- 18.19.0 - 20.10.0 #### Python @@ -271,7 +270,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | Package Name | Version | | -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 9.0 | -| Android Emulator | 32.1.15 | +| Android Emulator | 33.1.23 | | Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | | Android SDK Platform-Tools | 34.0.5 | | Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34 (rev 2)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | @@ -295,23 +294,23 @@ Use the following command as a part of your job to start the service: 'sudo syst ### Cached Docker images | Repository:Tag | Digest | Created | | ----------------------- | ------------------------------------------------------------------------ | ---------- | -| alpine:3.16 | sha256:a8cbb8c69ee71561f4b69c066bad07f7e510caaa523da26fbfc606b10bd7934b | 2023-08-07 | -| alpine:3.17 | sha256:f71a5f071694a785e064f05fed657bf8277f1b2113a8ed70c90ad486d6ee54dc | 2023-08-07 | -| alpine:3.18 | sha256:eece025e432126ce23f223450a0326fbebde39cdf496a85d8c016293fc851978 | 2023-09-28 | +| alpine:3.16 | sha256:e4cdb7d47b06ba0a062ad2a97a7d154967c8f83934594d9f2bd3efa89292996b | 2023-11-30 | +| alpine:3.17 | sha256:6e94b5cda2d6fd57d85abf81e81dabaea97a5885f919da676cc19d3551da4061 | 2023-11-30 | +| alpine:3.18 | sha256:34871e7290500828b39e22294660bee86d966bc0017544e848dd9a255cdf59e0 | 2023-11-30 | | buildpack-deps:bullseye | sha256:257cbe4fba66709d5a536dd5ac13b22411d469eaf61f421f5c2b871f2290e25c | 2023-11-21 | | buildpack-deps:buster | sha256:77c7243f791521c7bf816e786ef46956eabb0c8e73c8479141ba5e92c05497a7 | 2023-11-21 | | buildpack-deps:stretch | sha256:78e995165a5788c2f55aed6e548d8f6c1534830d4310c870408fccb2da8c5b2e | 2022-06-23 | | debian:10 | sha256:46ca02d33c65ab188d6e56f26c323bf1aa9a99074f2f54176fdc3884304f58b8 | 2023-11-21 | | debian:11 | sha256:ab2b95aa8d7d6d54866b92c322cf0693933c1ae8038652f24ddfda1d1763a45a | 2023-11-21 | | debian:9 | sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be | 2022-06-23 | -| moby/buildkit:latest | sha256:d4187a7326f20d04fafd075f80ccc5d3f8cfd4f665c6e03d158a78e4f64bf3db | 2023-10-19 | +| moby/buildkit:latest | sha256:5a8f30813a104b86e927ff4695a746f74a5bb921c7be1dbcca6d754dfbe04822 | 2023-12-01 | | node:16 | sha256:f77a1aef2da8d83e45ec990f45df50f1a286c5fe8bbfb8c6e4246c6389705c0b | 2023-09-07 | | node:16-alpine | sha256:a1f9d027912b58a7c75be7716c97cfbc6d3099f3a97ed84aa490be9dee20e787 | 2023-08-10 | -| node:18 | sha256:a17842484dd30af97540e5416c9a62943c709583977ba41481d601ecffb7f31b | 2023-11-22 | -| node:18-alpine | sha256:3428c2de886bf4378657da6fe86e105573a609c94df1f7d6a70e57d2b51de21f | 2023-11-16 | +| node:18 | sha256:7a4282663db6f22326c03618eef4320fa3cf70c5c3715546f9779858dc0ed3fd | 2023-12-02 | +| node:18-alpine | sha256:4bdb3f3105718f0742bc8d64bb4e36e8f955ebbee295325e40ae80bc8ef78833 | 2023-12-02 | | node:20 | sha256:445acd9b2ef7e9de665424053bf95652e0b8995ef36500557d48faf29300170a | 2023-11-23 | -| node:20-alpine | sha256:b1789b7be6aa16afd642eaaaccdeeeb33bd8f08e69b3d27d931aa9665b731f01 | 2023-11-23 | -| ubuntu:20.04 | sha256:ed4a42283d9943135ed87d4ee34e542f7f5ad9ecf2f244870e23122f703f91c2 | 2023-10-03 | +| node:20-alpine | sha256:32427bc0620132b2d9e79e405a1b27944d992501a20417a7f407427cc4c2b672 | 2023-12-01 | +| ubuntu:20.04 | sha256:f5c3e53367f142fab0b49908550bdcdc4fb619d2f61ec1dfa60d26e0d59ac9e7 | 2023-11-28 | ### Installed apt packages | Name | Version | From 3494b8c8b1dfe4bb27deac0523df3dab9df9ad64 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 8 Dec 2023 14:43:44 +0000 Subject: [PATCH 2516/3485] Windows Server 2019 (20231205) Image Update (#8964) * Updating readme file for win19 version 20231205.1.1 * Update Windows2019-Readme.md --------- Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/windows/Windows2019-Readme.md | 46 ++++++++++++++-------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/images/windows/Windows2019-Readme.md b/images/windows/Windows2019-Readme.md index 6448aace465d..976c6227b10f 100644 --- a/images/windows/Windows2019-Readme.md +++ b/images/windows/Windows2019-Readme.md @@ -1,12 +1,12 @@ | Announcements | |-| +| [Old versions of Android SDK & tools will be removed from images on January, 8](https://github.com/actions/runner-images/issues/8952) | | [[all OSs] Nodejs 14.x will be removed from the images on November, 26](https://github.com/actions/runner-images/issues/8779) | | [Major Refactoring of GitHub Actions Runner Images Repository](https://github.com/actions/runner-images/issues/8706) | -| [[All OS] Android NDK r23 will be removed from images on November 13](https://github.com/actions/runner-images/issues/8383) | *** # Windows Server 2019 - OS Version: 10.0.17763 Build 5122 -- Image Version: 20231126.1.0 +- Image Version: 20231205.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -35,7 +35,7 @@ - pip 23.3.1 (python 3.7) - Pipx 1.2.1 - RubyGems 2.7.6.3 -- Vcpkg (build from commit cd5e746ec) +- Vcpkg (build from commit 08c4e7104) - Yarn 1.22.21 #### Environment variables @@ -46,7 +46,7 @@ ### Project Management - Ant 1.10.14 -- Gradle 8.4 +- Gradle 8.5 - Maven 3.8.7 - sbt 1.9.7 @@ -58,7 +58,7 @@ - Bazelisk 1.19.0 - Bicep 0.23.1 - Cabal 3.10.2.0 -- CMake 3.27.8 +- CMake 3.27.9 - CodeQL Action Bundle 2.15.3 - Docker 24.0.7 - Docker Compose v1 1.29.2 @@ -67,8 +67,8 @@ - ghc 9.8.1 - Git 2.43.0.windows.1 - Git LFS 3.4.0 -- Google Cloud CLI 455.0.0 -- ImageMagick 7.1.1-21 +- Google Cloud CLI 456.0.0 +- ImageMagick 7.1.1-22 - InnoSetup 6.2.2 - jq 1.7-dirty - Kind 0.20.0 @@ -78,11 +78,11 @@ - gdb 8.1 - GNU Binutils 2.30 - Newman 6.0.0 -- NSIS 3.08 +- NSIS 3.09 - OpenSSL 1.1.1w - Packer 1.9.4 - Parcel 2.10.3 -- Pulumi 3.94.2 +- Pulumi 3.95.0 - R 4.3.2 - Service Fabric SDK 9.1.1436.9590 - Stack 2.13.1 @@ -96,13 +96,13 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.188 -- AWS CLI 2.13.38 +- AWS CLI 2.14.5 - AWS SAM CLI 1.103.0 -- AWS Session Manager CLI 1.2.497.0 -- Azure CLI 2.54.0 +- AWS Session Manager CLI 1.2.536.0 +- Azure CLI 2.55.0 - Azure DevOps CLI extension 0.26.0 - Cloud Foundry CLI 6.53.0 -- GitHub CLI 2.39.1 +- GitHub CLI 2.39.2 ### Rust Tools - Cargo 1.74.0 @@ -119,11 +119,11 @@ - Rustfmt 1.6.0 ### Browsers and Drivers -- Google Chrome 119.0.6045.160 -- Chrome Driver 119.0.6045.105 -- Microsoft Edge 119.0.2151.72 -- Microsoft Edge Driver 119.0.2151.72 -- Mozilla Firefox 120.0 +- Google Chrome 120.0.6099.63 +- Chrome Driver 120.0.6099.62 +- Microsoft Edge 119.0.2151.97 +- Microsoft Edge Driver 119.0.2151.97 +- Mozilla Firefox 120.0.1 - Gecko Driver 0.33.0 - IE Driver 4.14.0.0 - Selenium server 4.15.0 @@ -173,7 +173,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Node.js - 16.20.2 -- 18.18.2 +- 18.19.0 - 20.10.0 #### Python @@ -181,7 +181,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 3.8.10 - 3.9.13 - 3.10.11 -- 3.11.6 +- 3.11.7 - 3.12.0 #### PyPy @@ -216,7 +216,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### MongoDB | Version | ServiceName | ServiceStatus | ServiceStartType | | -------- | ----------- | ------------- | ---------------- | -| 5.0.22.0 | MongoDB | Stopped | Disabled | +| 5.0.23.0 | MongoDB | Stopped | Disabled | ### Database tools - Azure CosmosDb Emulator 2.14.12.0 @@ -514,14 +514,14 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Az (Cached): 1.0.0.zip, 1.6.0.zip, 2.3.2.zip, 2.6.0.zip, 3.1.0.zip, 3.5.0.zip, 3.8.0.zip, 4.3.0.zip, 4.4.0.zip, 4.7.0.zip, 5.5.0.zip, 5.9.0.zip, 6.6.0.zip, 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.459 +- AWSPowershell: 4.1.468 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 - Microsoft.Graph: 2.10.0 - Pester: 3.4.0, 5.5.0 - PowerShellGet: 1.0.0.1, 2.2.5 - PSScriptAnalyzer: 1.21.0 -- PSWindowsUpdate: 2.2.0.3 +- PSWindowsUpdate: 2.2.1.3 - SqlServer: 22.1.1 - VSSetup: 2.2.16 ``` From 6130ddb3c3914dd466c71a4606cbf7e2697e0a02 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 8 Dec 2023 14:49:49 +0000 Subject: [PATCH 2517/3485] Windows Server 2022 (20231205) Image Update (#8962) * Updating readme file for win22 version 20231205.1.1 * Update Windows2022-Readme.md --------- Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/windows/Windows2022-Readme.md | 54 ++++++++++++++-------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/images/windows/Windows2022-Readme.md b/images/windows/Windows2022-Readme.md index fa730ab9a8b2..fa24cd5d9007 100644 --- a/images/windows/Windows2022-Readme.md +++ b/images/windows/Windows2022-Readme.md @@ -1,12 +1,12 @@ | Announcements | |-| +| [Old versions of Android SDK & tools will be removed from images on January, 8](https://github.com/actions/runner-images/issues/8952) | | [[all OSs] Nodejs 14.x will be removed from the images on November, 26](https://github.com/actions/runner-images/issues/8779) | | [Major Refactoring of GitHub Actions Runner Images Repository](https://github.com/actions/runner-images/issues/8706) | -| [[All OS] Android NDK r23 will be removed from images on November 13](https://github.com/actions/runner-images/issues/8383) | *** # Windows Server 2022 - OS Version: 10.0.20348 Build 2113 -- Image Version: 20231126.1.0 +- Image Version: 20231205.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -33,9 +33,9 @@ - NPM 9.8.1 - NuGet 6.8.0.131 - pip 23.3.1 (python 3.9) -- Pipx 1.2.1 +- Pipx 1.3.3 - RubyGems 3.2.33 -- Vcpkg (build from commit cd5e746ec) +- Vcpkg (build from commit 08c4e7104) - Yarn 1.22.21 #### Environment variables @@ -46,7 +46,7 @@ ### Project Management - Ant 1.10.14 -- Gradle 8.4 +- Gradle 8.5 - Maven 3.8.7 - sbt 1.9.7 @@ -58,7 +58,7 @@ - Bazelisk 1.19.0 - Bicep 0.23.1 - Cabal 3.10.2.0 -- CMake 3.27.8 +- CMake 3.27.9 - CodeQL Action Bundle 2.15.3 - Docker 24.0.7 - Docker Compose v1 1.29.2 @@ -67,7 +67,7 @@ - ghc 9.8.1 - Git 2.43.0.windows.1 - Git LFS 3.4.0 -- ImageMagick 7.1.1-21 +- ImageMagick 7.1.1-22 - InnoSetup 6.2.2 - jq 1.7-dirty - Kind 0.20.0 @@ -77,10 +77,10 @@ - gdb 11.2 - GNU Binutils 2.39 - Newman 6.0.0 -- NSIS 3.08 +- NSIS 3.09 - OpenSSL 1.1.1w - Packer 1.9.4 -- Pulumi 3.94.2 +- Pulumi 3.95.0 - R 4.3.2 - Service Fabric SDK 9.1.1436.9590 - Stack 2.13.1 @@ -94,12 +94,12 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.188 -- AWS CLI 2.13.38 +- AWS CLI 2.14.5 - AWS SAM CLI 1.103.0 -- AWS Session Manager CLI 1.2.497.0 -- Azure CLI 2.54.0 +- AWS Session Manager CLI 1.2.536.0 +- Azure CLI 2.55.0 - Azure DevOps CLI extension 0.26.0 -- GitHub CLI 2.39.1 +- GitHub CLI 2.39.2 ### Rust Tools - Cargo 1.74.0 @@ -116,11 +116,11 @@ - Rustfmt 1.6.0 ### Browsers and Drivers -- Google Chrome 119.0.6045.160 -- Chrome Driver 119.0.6045.105 -- Microsoft Edge 119.0.2151.72 -- Microsoft Edge Driver 119.0.2151.72 -- Mozilla Firefox 120.0 +- Google Chrome 120.0.6099.63 +- Chrome Driver 120.0.6099.62 +- Microsoft Edge 119.0.2151.97 +- Microsoft Edge Driver 119.0.2151.97 +- Mozilla Firefox 120.0.1 - Gecko Driver 0.33.0 - IE Driver 4.14.0.0 - Selenium server 4.15.0 @@ -167,7 +167,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Node.js - 16.20.2 -- 18.18.2 +- 18.19.0 - 20.10.0 #### Python @@ -175,7 +175,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 3.8.10 - 3.9.13 - 3.10.11 -- 3.11.6 +- 3.11.7 - 3.12.0 #### PyPy @@ -207,7 +207,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### MongoDB | Version | ServiceName | ServiceStatus | ServiceStartType | | -------- | ----------- | ------------- | ---------------- | -| 5.0.22.0 | MongoDB | Stopped | Disabled | +| 5.0.23.0 | MongoDB | Stopped | Disabled | ### Database tools - Azure CosmosDb Emulator 2.14.12.0 @@ -223,9 +223,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Nginx | 1.25.3 | C:\tools\nginx-1.25.3\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2022 -| Name | Version | Path | -| ----------------------------- | ------------- | -------------------------------------------------------- | -| Visual Studio Enterprise 2022 | 17.8.34316.72 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | +| Name | Version | Path | +| ----------------------------- | -------------- | -------------------------------------------------------- | +| Visual Studio Enterprise 2022 | 17.8.34330.188 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | #### Workloads, components and extensions | Package | Version | @@ -524,7 +524,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | wasm.tools | 8.0.23.53103 | | ProBITools.MicrosoftAnalysisServicesModelingProjects2022 | 3.0.4 | | ProBITools.MicrosoftReportProjectsforVisualStudio2022 | 3.0.1 | -| SSIS.MicrosoftDataToolsIntegrationServices | 1.3.1 | +| SSIS.MicrosoftDataToolsIntegrationServices | 1.3.2 | | VisualStudioClient.MicrosoftVisualStudio2022InstallerProjects | 2.0.1 | | Windows Driver Kit | 10.1.22621.2428 | | Windows Driver Kit Visual Studio Extension | 10.0.22621.0 | @@ -568,14 +568,14 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Az (Cached): 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.459 +- AWSPowershell: 4.1.468 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 - Microsoft.Graph: 2.10.0 - Pester: 3.4.0, 5.5.0 - PowerShellGet: 1.0.0.1, 2.2.5 - PSScriptAnalyzer: 1.21.0 -- PSWindowsUpdate: 2.2.0.3 +- PSWindowsUpdate: 2.2.1.3 - SqlServer: 22.1.1 - VSSetup: 2.2.16 ``` From d4f6993ac90e8f7cc2ce00e105a6a8c817bda78b Mon Sep 17 00:00:00 2001 From: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com> Date: Sun, 10 Dec 2023 21:12:26 +0100 Subject: [PATCH 2518/3485] [macos] skip Sonoma updates for Monterey (#8985) --- images.CI/macos/anka/CreateCleanAnkaTemplate.ps1 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/images.CI/macos/anka/CreateCleanAnkaTemplate.ps1 b/images.CI/macos/anka/CreateCleanAnkaTemplate.ps1 index b6e63c2107b8..e32ab920bbbf 100644 --- a/images.CI/macos/anka/CreateCleanAnkaTemplate.ps1 +++ b/images.CI/macos/anka/CreateCleanAnkaTemplate.ps1 @@ -100,14 +100,14 @@ function Invoke-SoftwareUpdate { $command = "sw_vers" $guestMacosVersion = Invoke-SSHPassCommand -HostName $ipAddress -Command $command switch -regex ($guestMacosVersion[1]) { - '12.\d' { $nextOSVersion = 'macOS Ventura' } + '12.\d' { $nextOSVersion = 'macOS Ventura|macOS Sonoma' } '13.\d' { $nextOSVersion = 'macOS Sonoma' } } # Make an array of updates $listOfNewUpdates = $newUpdates.split('*').Trim('') foreach ($newupdate in $listOfNewUpdates) { # Will be True if the value is not Venture, not empty, and contains "Action: restart" words - if ($newupdate.Contains("Action: restart") -and !$newupdate.Contains("$nextOSVersion") -and (-not [String]::IsNullOrEmpty($newupdate))) { + if ($newupdate.Contains("Action: restart") -and !($newupdate -match $nextOSVersion) -and (-not [String]::IsNullOrEmpty($newupdate))) { Write-Host "`t[*] Sleep 120 seconds before the software updates have been installed" Start-Sleep -Seconds 120 @@ -119,7 +119,7 @@ function Invoke-SoftwareUpdate { # Check software updates have been installed $updates = Get-SoftwareUpdate -HostName $ipAddress - if ($updates.Contains("Action: restart") -and !$updates.Contains("$nextOSVersion")) { + if ($updates.Contains("Action: restart") -and !($newupdate -match $nextOSVersion)) { Write-Host "`t[x] Software updates failed to install: " Show-StringWithFormat $updates exit 1 From 4d88245a29da6a6e68e2df7add5eb3cfce98113b Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Mon, 11 Dec 2023 11:58:37 +0100 Subject: [PATCH 2519/3485] [ubuntu] Refactor android sdk build script (#8980) --- .../scripts/build/install-android-sdk.sh | 110 +++++++++--------- images/ubuntu/scripts/helpers/install.sh | 5 - 2 files changed, 56 insertions(+), 59 deletions(-) diff --git a/images/ubuntu/scripts/build/install-android-sdk.sh b/images/ubuntu/scripts/build/install-android-sdk.sh index 3b614eed7be0..772a4aa54366 100644 --- a/images/ubuntu/scripts/build/install-android-sdk.sh +++ b/images/ubuntu/scripts/build/install-android-sdk.sh @@ -9,26 +9,27 @@ source $HELPER_SCRIPTS/os.sh source $HELPER_SCRIPTS/install.sh source $HELPER_SCRIPTS/etc-environment.sh -function filter_components_by_version { - minimumVersion=$1 +add_filtered_instalaltion_components() { + local minimum_version=$1 shift - toolsArr=("$@") - - for item in ${toolsArr[@]} - do - # take the last argument after spliting string by ';'' and '-'' - version=$(echo "${item##*[-;]}") - if verlte $minimumVersion $version - then + local tools_array=("$@") + + for item in ${tools_array[@]}; do + # Take the last argument after spliting string by ';'' and '-'' + item_version=$(echo "${item##*[-;]}") + + # Semver 'comparison'. Add item to components array, if item's version is greater than or equal to minimum version + if [[ "$(printf "${minimum_version}\n${item_version}\n" | sort -V | head -n1)" == "$minimum_version" ]]; then components+=($item) fi done } -function get_full_ndk_version { - majorVersion=$1 - ndkFullVersion=$($SDKMANAGER --list | grep "ndk;${majorVersion}.*" | awk '{gsub("ndk;", ""); print $1}' | sort -V | tail -n1) - echo "$ndkFullVersion" +get_full_ndk_version() { + local major_version=$1 + + ndk_version=$($SDKMANAGER --list | grep "ndk;${major_version}\." | awk '{gsub("ndk;", ""); print $1}' | sort -V | tail -n1) + echo "$ndk_version" } # Set env variable for SDK Root (https://developer.android.com/studio/command-line/variables) @@ -45,78 +46,79 @@ mkdir -p ${ANDROID_SDK_ROOT} # Download the latest command line tools so that we can accept all of the licenses. # See https://developer.android.com/studio/#command-tools -cmdlineToolsVersion=$(get_toolset_value '.android."cmdline-tools"') -if [[ $cmdlineToolsVersion == "latest" ]]; then - repository_xml_url="https://dl.google.com/android/repository/repository2-1.xml" - repository_xml_file=$(download_with_retry "$repository_xml_url") - cmdlineToolsVersion=$( - yq -p=xml \ - '.sdk-repository.remotePackage[] | select(."+@path" == "cmdline-tools;latest" and .channelRef."+@ref" == "channel-0").archives.archive[].complete.url | select(contains("commandlinetools-linux"))' \ - "${repository_xml_file}" +cmdline_tools_package=$(get_toolset_value '.android."cmdline-tools"') +if [[ $cmdline_tools_version == "latest" ]]; then + REPOSITORY_XML_URL="https://dl.google.com/android/repository/repository2-1.xml" + repository_xml_file=$(download_with_retry "$REPOSITORY_XML_URL") + cmdline_tools_package=$( + yq -p=xml \ + '.sdk-repository.remotePackage[] | select(."+@path" == "cmdline-tools;latest" and .channelRef."+@ref" == "channel-0").archives.archive[].complete.url | select(contains("commandlinetools-linux"))' \ + "${repository_xml_file}" ) - if [[ -z $cmdlineToolsVersion ]]; then + if [[ -z $cmdline_tools_package ]]; then echo "Failed to parse latest command-line tools version" exit 1 fi fi -archive_path=$(download_with_retry "https://dl.google.com/android/repository/${cmdlineToolsVersion}") +# Install command line tools +archive_path=$(download_with_retry "https://dl.google.com/android/repository/${cmdline_tools_package}") unzip -qq "$archive_path" -d ${ANDROID_SDK_ROOT}/cmdline-tools # Command line tools need to be placed in ${ANDROID_SDK_ROOT}/sdk/cmdline-tools/latest to determine SDK root mv ${ANDROID_SDK_ROOT}/cmdline-tools/cmdline-tools ${ANDROID_SDK_ROOT}/cmdline-tools/latest # Check sdk manager installation -${SDKMANAGER} --list 1>/dev/null -if [ $? -eq 0 ] -then +if ${SDKMANAGER} --list 1>/dev/null; then echo "Android SDK manager was installed" else echo "Android SDK manager was not installed" exit 1 fi -minimumBuildToolVersion=$(get_toolset_value '.android.build_tools_min_version') -minimumPlatformVersion=$(get_toolset_value '.android.platform_min_version') -extras=$(get_toolset_value '.android.extra_list[]|"extras;" + .') -addons=$(get_toolset_value '.android.addon_list[]|"add-ons;" + .') -additional=$(get_toolset_value '.android.additional_tools[]') -ANDROID_NDK_MAJOR_VERSIONS=($(get_toolset_value '.android.ndk.versions[]')) -ANDROID_NDK_MAJOR_DEFAULT=$(get_toolset_value '.android.ndk.default') - -components=("${extras[@]}" "${addons[@]}" "${additional[@]}") -for ndk_version in "${ANDROID_NDK_MAJOR_VERSIONS[@]}" -do - ndk_full_version=$(get_full_ndk_version $ndk_version) - components+=("ndk;$ndk_full_version") -done +# Get toolset values and prepare environment variables +minimum_build_tool_version=$(get_toolset_value '.android.build_tools_min_version') +minimum_platform_version=$(get_toolset_value '.android.platform_min_version') +android_ndk_major_default=$(get_toolset_value '.android.ndk.default') +android_ndk_major_versions=($(get_toolset_value '.android.ndk.versions[]')) +android_ndk_major_latest=(${android_ndk_major_versions[-1]}) -ANDROID_NDK_MAJOR_LATEST=(${ANDROID_NDK_MAJOR_VERSIONS[-1]}) -ndkDefaultFullVersion=$(get_full_ndk_version $ANDROID_NDK_MAJOR_DEFAULT) -ndkLatestFullVersion=$(get_full_ndk_version $ANDROID_NDK_MAJOR_LATEST) -ANDROID_NDK="$ANDROID_SDK_ROOT/ndk/$ndkDefaultFullVersion" +ndk_default_full_version=$(get_full_ndk_version $android_ndk_major_default) +ndk_latest_full_version=$(get_full_ndk_version $android_ndk_major_latest) +ANDROID_NDK=${ANDROID_SDK_ROOT}/ndk/${ndk_default_full_version} # ANDROID_NDK, ANDROID_NDK_HOME, and ANDROID_NDK_ROOT variables should be set as many customer builds depend on them https://github.com/actions/runner-images/issues/5879 setEtcEnvironmentVariable "ANDROID_NDK" "${ANDROID_NDK}" setEtcEnvironmentVariable "ANDROID_NDK_HOME" "${ANDROID_NDK}" setEtcEnvironmentVariable "ANDROID_NDK_ROOT" "${ANDROID_NDK}" -setEtcEnvironmentVariable "ANDROID_NDK_LATEST_HOME" "${ANDROID_SDK_ROOT}/ndk/${ndkLatestFullVersion}" +setEtcEnvironmentVariable "ANDROID_NDK_LATEST_HOME" "${ANDROID_SDK_ROOT}/ndk/${ndk_latest_full_version}" -availablePlatforms=($($SDKMANAGER --list | sed -n '/Available Packages:/,/^$/p' | grep "platforms;android-[0-9]" | cut -d"|" -f 1)) -allBuildTools=($($SDKMANAGER --list | grep "build-tools;" | cut -d"|" -f 1 | sort -u)) -availableBuildTools=$(echo ${allBuildTools[@]//*rc[0-9]/}) +# Prepare components for installation +extras=$(get_toolset_value '.android.extra_list[] | "extras;" + .') +addons=$(get_toolset_value '.android.addon_list[] | "add-ons;" + .') +additional=$(get_toolset_value '.android.additional_tools[]') +components=("${extras[@]}" "${addons[@]}" "${additional[@]}") + +for ndk_major_version in "${android_ndk_major_versions[@]}"; do + ndk_full_version=$(get_full_ndk_version $ndk_major_version) + components+=("ndk;$ndk_full_version") +done + +available_platforms=($($SDKMANAGER --list | sed -n '/Available Packages:/,/^$/p' | grep "platforms;android-[0-9]" | cut -d"|" -f 1)) +all_build_tools=($($SDKMANAGER --list | grep "build-tools;" | cut -d"|" -f 1 | sort -u)) +available_build_tools=$(echo ${all_build_tools[@]//*rc[0-9]/}) -filter_components_by_version $minimumPlatformVersion "${availablePlatforms[@]}" -filter_components_by_version $minimumBuildToolVersion "${availableBuildTools[@]}" +add_filtered_instalaltion_components $minimum_platform_version "${available_platforms[@]}" +add_filtered_instalaltion_components $minimum_build_tool_version "${available_build_tools[@]}" +# Install components echo "y" | $SDKMANAGER ${components[@]} # Old skdmanager from sdk tools doesn't work with Java > 8, set version 8 explicitly -if isUbuntu20 || isUbuntu22; then - sed -i "2i export JAVA_HOME=${JAVA_HOME_8_X64}" ${ANDROID_SDK_ROOT}/tools/bin/sdkmanager -fi +sed -i "2i export JAVA_HOME=${JAVA_HOME_8_X64}" ${ANDROID_SDK_ROOT}/tools/bin/sdkmanager # Add required permissions chmod -R a+rwx ${ANDROID_SDK_ROOT} reloadEtcEnvironment + invoke_tests "Android" diff --git a/images/ubuntu/scripts/helpers/install.sh b/images/ubuntu/scripts/helpers/install.sh index 2add22aa0542..68df9f68d6a5 100644 --- a/images/ubuntu/scripts/helpers/install.sh +++ b/images/ubuntu/scripts/helpers/install.sh @@ -54,11 +54,6 @@ IsPackageInstalled() { dpkg -S $1 &> /dev/null } -verlte() { - sortedVersion=$(printf "$1\n$2\n" | sort -V | head -n1) - [ "$1" = "$sortedVersion" ] -} - get_toolset_value() { local toolset_path="/imagegeneration/installers/toolset.json" local query=$1 From 62fab6e78a6e042bd49e1e86f4c4c024bc6357ac Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Mon, 11 Dec 2023 11:58:55 +0100 Subject: [PATCH 2520/3485] Update SBOM generation workflow (#8975) --- .github/workflows/create_sbom_report.yml | 31 ++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/.github/workflows/create_sbom_report.yml b/.github/workflows/create_sbom_report.yml index 1f4896515460..180f58d21d97 100644 --- a/.github/workflows/create_sbom_report.yml +++ b/.github/workflows/create_sbom_report.yml @@ -1,4 +1,4 @@ -name: Create and upload a SBOM to release assets +name: Create SBOM for the release # Inherited variables: # github.event.client_payload.agentSpec - Current YAML Label # github.event.client_payload.ReleaseID - Current release ID @@ -14,8 +14,35 @@ defaults: run: shell: pwsh jobs: - #Checking image version on available runner + #Checking current release for SBOM + sbom-check: + outputs: + check_status: ${{ steps.check.outputs.status }} + runs-on: ubuntu-latest + steps: + - name: Check release + id: check + shell: pwsh + run: | + $apiUrl = "https://api.github.com/repos/actions/runner-images/releases/tags/${{ github.event.client_payload.ReleaseBranchName }}" + $response = Invoke-RestMethod -Uri $apiUrl -Method Get -SkipHttpErrorCheck + if ($response.message -ilike "Not Found") { + echo "status=release_not_found" >> $env:GITHUB_OUTPUT + Write-Error "Release for tag ${{ github.event.client_payload.ReleaseBranchName }} wasn't found" + exit 1 + } + foreach ($asset in $response.assets) { + if ($asset.name -like '*sbom*') { + echo "status=sbom_exists" >> $env:GITHUB_OUTPUT + return "Release ${{ github.event.client_payload.ReleaseBranchNamen }} already contains a SBOM" + } + } + Write-Host "Release has been found, SBOM is not attached, starting generation." + echo "status=okay" >> $env:GITHUB_OUTPUT + #Generating SBOM building-sbom: + needs: sbom-check + if: ${{ needs.sbom-check.outputs.check_status == 'okay' }} runs-on: ${{ github.event.client_payload.agentSpec }} steps: - name: Available image version check for ${{ github.event.client_payload.ReleaseBranchName }} From f28573731f6d78d577a81e86909c70726b2641ab Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Mon, 11 Dec 2023 11:59:52 +0100 Subject: [PATCH 2521/3485] [Windows] Update Resolve-GithubReleaseAssetUrl function (#8981) --- .../scripts/build/Install-Selenium.ps1 | 3 ++- .../scripts/helpers/InstallHelpers.ps1 | 22 +++++++++++++++---- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/images/windows/scripts/build/Install-Selenium.ps1 b/images/windows/scripts/build/Install-Selenium.ps1 index 619cb8ffb593..95aad377d252 100644 --- a/images/windows/scripts/build/Install-Selenium.ps1 +++ b/images/windows/scripts/build/Install-Selenium.ps1 @@ -13,7 +13,8 @@ $seleniumMajorVersion = (Get-ToolsetContent).selenium.version $seleniumDownloadUrl = Resolve-GithubReleaseAssetUrl ` -Repo "SeleniumHQ/selenium" ` -Version "$seleniumMajorVersion.*" ` - -Asset "selenium-server-*.jar" + -Asset "selenium-server-*.jar" ` + -AllowMultipleMatches $seleniumBinPath = Join-Path $seleniumDirectory "selenium-server.jar" Invoke-DownloadWithRetry -Url $seleniumDownloadUrl -Path $seleniumBinPath diff --git a/images/windows/scripts/helpers/InstallHelpers.ps1 b/images/windows/scripts/helpers/InstallHelpers.ps1 index 5bb8d87a2036..a2a2341e53e3 100644 --- a/images/windows/scripts/helpers/InstallHelpers.ps1 +++ b/images/windows/scripts/helpers/InstallHelpers.ps1 @@ -636,6 +636,10 @@ function Resolve-GithubReleaseAssetUrl { The pattern to match against the download URLs of the release assets. Wildcards (*) can be used to match any characters. + .PARAMETER AllowMultipleMatches + Specifies whether to choose one of multiple assets matching the pattern or consider this behavior to be erroneous. + By default, multiple matches are not considered normal behavior and result in an error. + .EXAMPLE Resolve-GithubReleaseAssetUrl -Repository "myrepo" -Version "1.0" -UrlMatchPattern "*.zip" Retrieves the download URL for the asset in the "myrepo" repository with version "1.0" and a file extension of ".zip". @@ -650,7 +654,8 @@ function Resolve-GithubReleaseAssetUrl { [switch] $AllowPrerelease, [Parameter(Mandatory = $true)] [Alias("Pattern", "File", "Asset")] - [string] $UrlMatchPattern + [string] $UrlMatchPattern, + [switch] $AllowMultipleMatches = $false ) $matchingReleases = Get-GithubReleasesByVersion ` @@ -677,9 +682,18 @@ function Resolve-GithubReleaseAssetUrl { Write-Debug "Found no download urls matching pattern ${UrlMatchPattern}" Write-Debug "Available download urls:`n$($matchingReleases.assets.browser_download_url -join "`n")" throw "No assets found in ${Repository} matching version `"${Version}`" and pattern `"${UrlMatchPattern}`"" - } elseif ($matchedUrl.Count -gt 1) { - Write-Debug "Found multiple download urls matching pattern ${UrlMatchPattern}:`n$($matchedUrl -join "`n")" - throw "Multiple download urls found in ${Repository} version `"${matchedVersion}`" matching pattern `"${UrlMatchPattern}`":`n$($matchedUrl -join "`n")" + } + # If multiple urls match the pattern, sort them and take the last one + # Will only work with simple number series of no more than nine in a row. + if ($matchedUrl.Count -gt 1) { + if ($AllowMultipleMatches) { + Write-Debug "Found multiple download urls matching pattern ${UrlMatchPattern}:`n$($matchedUrl -join "`n")" + Write-Host "Performing sorting of urls to find the most recent version matching the pattern" + $matchedUrl = $matchedUrl | Sort-Object -Descending + $matchedUrl = $matchedUrl[0] + } else { + throw "Found multiple assets in ${Repository} matching version `"${Version}`" and pattern `"${UrlMatchPattern}`".`nAvailable assets:`n$($matchedUrl -join "`n")" + } } Write-Host "Found download url for ${Repository} version ${matchedVersion}: ${matchedUrl}" From 0e46595f8157a7a18efc5914c751dce51b45676d Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Mon, 11 Dec 2023 12:52:28 +0100 Subject: [PATCH 2522/3485] Update release variable to use ID instead of branch (#8990) --- .github/workflows/create_sbom_report.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/create_sbom_report.yml b/.github/workflows/create_sbom_report.yml index 180f58d21d97..54b34b06d2aa 100644 --- a/.github/workflows/create_sbom_report.yml +++ b/.github/workflows/create_sbom_report.yml @@ -24,17 +24,17 @@ jobs: id: check shell: pwsh run: | - $apiUrl = "https://api.github.com/repos/actions/runner-images/releases/tags/${{ github.event.client_payload.ReleaseBranchName }}" + $apiUrl = "https://api.github.com/repos/actions/runner-images/releases/${{ github.event.client_payload.ReleaseID }}" $response = Invoke-RestMethod -Uri $apiUrl -Method Get -SkipHttpErrorCheck if ($response.message -ilike "Not Found") { echo "status=release_not_found" >> $env:GITHUB_OUTPUT - Write-Error "Release for tag ${{ github.event.client_payload.ReleaseBranchName }} wasn't found" + Write-Error "Release ${{ github.event.client_payload.ReleaseID }} wasn't found" exit 1 } foreach ($asset in $response.assets) { if ($asset.name -like '*sbom*') { echo "status=sbom_exists" >> $env:GITHUB_OUTPUT - return "Release ${{ github.event.client_payload.ReleaseBranchNamen }} already contains a SBOM" + return "Release ${{ github.event.client_payload.ReleaseID }} already contains a SBOM" } } Write-Host "Release has been found, SBOM is not attached, starting generation." From 76d6f0f574463aa5a748dc0bbf3189a41f23ba3f Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Mon, 11 Dec 2023 13:07:50 +0100 Subject: [PATCH 2523/3485] [Ubuntu] Temporary pin the AzCopy version (#8982) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Alexey Ayupov <“alexey.ayupov@akvelon.com”> --- images/ubuntu/scripts/build/install-azcopy.sh | 3 ++- images/ubuntu/scripts/docs-gen/SoftwareReport.Tools.psm1 | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/images/ubuntu/scripts/build/install-azcopy.sh b/images/ubuntu/scripts/build/install-azcopy.sh index a93d663d166c..83132cc46c27 100644 --- a/images/ubuntu/scripts/build/install-azcopy.sh +++ b/images/ubuntu/scripts/build/install-azcopy.sh @@ -7,7 +7,8 @@ source $HELPER_SCRIPTS/install.sh # Install AzCopy10 -archive_path=$(download_with_retry "https://aka.ms/downloadazcopy-v10-linux") +# Temporary pin 10.21.2 version of AzCopy until 10.22.0 is fixed +archive_path=$(download_with_retry "https://azcopyvnext.azureedge.net/releases/release-10.21.2-20231106/azcopy_linux_amd64_10.21.2.tar.gz") tar xzf "$archive_path" --strip-components=1 -C /tmp install /tmp/azcopy /usr/local/bin/azcopy # Create azcopy 10 alias for backward compatibility diff --git a/images/ubuntu/scripts/docs-gen/SoftwareReport.Tools.psm1 b/images/ubuntu/scripts/docs-gen/SoftwareReport.Tools.psm1 index 6ed4470d2b79..7f1dffb65054 100644 --- a/images/ubuntu/scripts/docs-gen/SoftwareReport.Tools.psm1 +++ b/images/ubuntu/scripts/docs-gen/SoftwareReport.Tools.psm1 @@ -10,7 +10,7 @@ function Get-AptFastVersion { } function Get-AzCopyVersion { - $azcopyVersion = azcopy --version | Get-StringPart -Part 2 + $azcopyVersion = [string]$(azcopy --version) | Get-StringPart -Part 2 return "$azcopyVersion - available by ``azcopy`` and ``azcopy10`` aliases" } From 7fe65a2204282518037a835bd0190f9452558d47 Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Mon, 11 Dec 2023 22:23:36 +0100 Subject: [PATCH 2524/3485] [Windows] Apply code style rules to Windows scripts (#8957) * Apply code style rules to Windows scripts * Fix typo * Fix configure-toolset script * Fix parameters in Msys2 installation script * Improve log readability * Remove broken exit code validation --- .../scripts/build/Configure-BaseImage.ps1 | 20 +-- .../scripts/build/Configure-DeveloperMode.ps1 | 8 +- .../scripts/build/Configure-DynamicPort.ps1 | 23 ++- .../build/Configure-GDIProcessHandleQuota.ps1 | 5 + .../scripts/build/Configure-ImageDataFile.ps1 | 14 +- .../scripts/build/Configure-PowerShell.ps1 | 2 +- .../scripts/build/Configure-System.ps1 | 21 ++- .../build/Configure-SystemEnvironment.ps1 | 9 +- .../scripts/build/Configure-Toolset.ps1 | 60 +++---- .../windows/scripts/build/Configure-User.ps1 | 24 ++- .../scripts/build/Install-ActionsCache.ps1 | 10 +- .../scripts/build/Install-AzureCli.ps1 | 8 +- .../build/Install-AzureCosmosDbEmulator.ps1 | 4 +- .../scripts/build/Install-AzureDevOpsCli.ps1 | 10 +- .../windows/scripts/build/Install-Bazel.ps1 | 2 +- .../build/Install-BizTalkBuildComponent.ps1 | 12 +- .../scripts/build/Install-Chocolatey.ps1 | 6 +- .../windows/scripts/build/Install-Chrome.ps1 | 59 ++++--- .../scripts/build/Install-CloudFoundryCli.ps1 | 16 +- .../scripts/build/Install-CodeQLBundle.ps1 | 30 ++-- .../windows/scripts/build/Install-DACFx.ps1 | 4 +- .../scripts/build/Install-DotnetSDK.ps1 | 27 ++- .../windows/scripts/build/Install-Firefox.ps1 | 40 ++--- images/windows/scripts/build/Install-Git.ps1 | 3 + .../windows/scripts/build/Install-Haskell.ps1 | 26 ++- .../scripts/build/Install-Miniconda.ps1 | 14 +- .../windows/scripts/build/Install-MongoDB.ps1 | 17 +- .../windows/scripts/build/Install-Msys2.ps1 | 162 +++++++++++------- .../scripts/build/Install-MysqlCli.ps1 | 28 +-- .../scripts/build/Install-NET48-devpack.ps1 | 6 +- .../windows/scripts/build/Install-NET48.ps1 | 6 +- images/windows/scripts/build/Install-NSIS.ps1 | 4 +- .../scripts/build/Install-NativeImages.ps1 | 23 ++- .../windows/scripts/build/Install-NodeJS.ps1 | 18 +- .../windows/scripts/build/Install-OpenSSL.ps1 | 2 +- images/windows/scripts/build/Install-Pipx.ps1 | 23 ++- .../scripts/build/Install-PostgreSQL.ps1 | 43 +++-- .../build/Install-PowershellAzModules.ps1 | 2 +- .../scripts/build/Install-PowershellCore.ps1 | 2 +- images/windows/scripts/build/Install-PyPy.ps1 | 67 +++----- .../windows/scripts/build/Install-RootCA.ps1 | 14 +- images/windows/scripts/build/Install-Rust.ps1 | 10 ++ .../windows/scripts/build/Install-Stack.ps1 | 14 +- .../windows/scripts/build/Install-Toolset.ps1 | 5 +- .../windows/scripts/build/Install-Vcpkg.ps1 | 6 + .../scripts/build/Install-WindowsFeatures.ps1 | 11 +- .../docs-gen/SoftwareReport.Tools.psm1 | 12 +- .../scripts/helpers/InstallHelpers.ps1 | 2 +- .../windows/scripts/tests/Databases.Tests.ps1 | 20 +-- images/windows/scripts/tests/Tools.Tests.ps1 | 12 +- .../windows/scripts/tests/Toolset.Tests.ps1 | 2 +- .../scripts/tests/WindowsFeatures.Tests.ps1 | 8 +- images/windows/templates/windows-2019.json | 5 +- images/windows/templates/windows-2022.json | 5 +- 54 files changed, 556 insertions(+), 430 deletions(-) diff --git a/images/windows/scripts/build/Configure-BaseImage.ps1 b/images/windows/scripts/build/Configure-BaseImage.ps1 index 514e55edb96c..b1b963eb5a46 100644 --- a/images/windows/scripts/build/Configure-BaseImage.ps1 +++ b/images/windows/scripts/build/Configure-BaseImage.ps1 @@ -4,10 +4,10 @@ ################################################################################ function Disable-InternetExplorerESC { - $AdminKey = "HKLM:\SOFTWARE\Microsoft\Active Setup\Installed Components\{A509B1A7-37EF-4b3f-8CFC-4F3A74704073}" - $UserKey = "HKLM:\SOFTWARE\Microsoft\Active Setup\Installed Components\{A509B1A8-37EF-4b3f-8CFC-4F3A74704073}" - Set-ItemProperty -Path $AdminKey -Name "IsInstalled" -Value 0 -Force - Set-ItemProperty -Path $UserKey -Name "IsInstalled" -Value 0 -Force + $adminKey = "HKLM:\SOFTWARE\Microsoft\Active Setup\Installed Components\{A509B1A7-37EF-4b3f-8CFC-4F3A74704073}" + $userKey = "HKLM:\SOFTWARE\Microsoft\Active Setup\Installed Components\{A509B1A8-37EF-4b3f-8CFC-4F3A74704073}" + Set-ItemProperty -Path $adminKey -Name "IsInstalled" -Value 0 -Force + Set-ItemProperty -Path $userKey -Name "IsInstalled" -Value 0 -Force $ieProcess = Get-Process -Name Explorer -ErrorAction SilentlyContinue @@ -19,9 +19,9 @@ function Disable-InternetExplorerESC { } function Disable-InternetExplorerWelcomeScreen { - $AdminKey = "HKLM:\Software\Policies\Microsoft\Internet Explorer\Main" - New-Item -Path $AdminKey -Value 1 -Force - Set-ItemProperty -Path $AdminKey -Name "DisableFirstRunCustomize" -Value 1 -Force + $adminKey = "HKLM:\Software\Policies\Microsoft\Internet Explorer\Main" + New-Item -Path $adminKey -Value 1 -Force + Set-ItemProperty -Path $adminKey -Name "DisableFirstRunCustomize" -Value 1 -Force Write-Host "Disabled IE Welcome screen" } @@ -31,9 +31,9 @@ function Disable-UserAccessControl { } function Disable-WindowsUpdate { - $AutoUpdatePath = "HKLM:SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU" - If (Test-Path -Path $AutoUpdatePath) { - Set-ItemProperty -Path $AutoUpdatePath -Name NoAutoUpdate -Value 1 + $autoUpdatePath = "HKLM:SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU" + if (Test-Path -Path $autoUpdatePath) { + Set-ItemProperty -Path $autoUpdatePath -Name NoAutoUpdate -Value 1 Write-Host "Disabled Windows Update" } else { Write-Host "Windows Update key does not exist" diff --git a/images/windows/scripts/build/Configure-DeveloperMode.ps1 b/images/windows/scripts/build/Configure-DeveloperMode.ps1 index 28e6aa4f9225..7f0af3c7f67e 100644 --- a/images/windows/scripts/build/Configure-DeveloperMode.ps1 +++ b/images/windows/scripts/build/Configure-DeveloperMode.ps1 @@ -4,10 +4,10 @@ ################################################################################ # Create AppModelUnlock if it doesn't exist, required for enabling Developer Mode -$RegistryKeyPath = "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\AppModelUnlock" -if (-not(Test-Path -Path $RegistryKeyPath)) { - New-Item -Path $RegistryKeyPath -ItemType Directory -Force +$registryKeyPath = "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\AppModelUnlock" +if (-not(Test-Path -Path $registryKeyPath)) { + New-Item -Path $registryKeyPath -ItemType Directory -Force } # Add registry value to enable Developer Mode -New-ItemProperty -Path $RegistryKeyPath -Name AllowDevelopmentWithoutDevLicense -PropertyType DWORD -Value 1 +New-ItemProperty -Path $registryKeyPath -Name AllowDevelopmentWithoutDevLicense -PropertyType DWORD -Value 1 diff --git a/images/windows/scripts/build/Configure-DynamicPort.ps1 b/images/windows/scripts/build/Configure-DynamicPort.ps1 index 39acdda45e8b..55864dc070c5 100644 --- a/images/windows/scripts/build/Configure-DynamicPort.ps1 +++ b/images/windows/scripts/build/Configure-DynamicPort.ps1 @@ -1,3 +1,9 @@ +################################################################################ +## File: Configure-DynamicPort.ps1 +## Desc: Configure dynamic port range for TCP and UDP to start at port 49152 +## and to end at the 65536 (16384 ports) +################################################################################ + # https://support.microsoft.com/en-us/help/929851/the-default-dynamic-port-range-for-tcp-ip-has-changed-in-windows-vista # The new default start port is 49152, and the new default end port is 65535. # Default port configuration was changed during image generation by Visual Studio Enterprise Installer to: @@ -5,10 +11,17 @@ # --------------------------------- # Start Port : 1024 # Number of Ports : 64511 + Write-Host "Set the dynamic port range to start at port 49152 and to end at the 65536 (16384 ports)" -$null = netsh int ipv4 set dynamicport tcp start=49152 num=16384 -$null = netsh int ipv4 set dynamicport udp start=49152 num=16384 -$null = netsh int ipv6 set dynamicport tcp start=49152 num=16384 -$null = netsh int ipv6 set dynamicport udp start=49152 num=16384 +foreach ($ipVersion in @("ipv4", "ipv6")) { + foreach ($protocol in @("tcp", "udp")) { + $command = "netsh int $ipVersion set dynamicport $protocol start=49152 num=16384" + Invoke-Expression $command | Out-Null + if ($LASTEXITCODE -ne 0) { + Write-Host "Failed to set dynamic port range for $ipVersion $protocol" + exit $LASTEXITCODE + } + } +} -Invoke-PesterTests -TestFile "WindowsFeatures" -TestName "DynamicPorts" \ No newline at end of file +Invoke-PesterTests -TestFile "WindowsFeatures" -TestName "DynamicPorts" diff --git a/images/windows/scripts/build/Configure-GDIProcessHandleQuota.ps1 b/images/windows/scripts/build/Configure-GDIProcessHandleQuota.ps1 index 8f1ab0d94abc..7e5cad3dd417 100644 --- a/images/windows/scripts/build/Configure-GDIProcessHandleQuota.ps1 +++ b/images/windows/scripts/build/Configure-GDIProcessHandleQuota.ps1 @@ -1,3 +1,8 @@ +################################################################################ +## File: Configure-GDIProcessHandleQuota.ps1 +## Desc: Set the GDIProcessHandleQuota value to 20000 +################################################################################ + # https://docs.microsoft.com/en-us/windows/win32/sysinfo/gdi-objects # This value can be set to a number between 256 and 65,536 diff --git a/images/windows/scripts/build/Configure-ImageDataFile.ps1 b/images/windows/scripts/build/Configure-ImageDataFile.ps1 index d4ef6b06779d..901ea2a0b30d 100644 --- a/images/windows/scripts/build/Configure-ImageDataFile.ps1 +++ b/images/windows/scripts/build/Configure-ImageDataFile.ps1 @@ -16,15 +16,15 @@ $imageDataFile = $env:IMAGEDATA_FILE $githubUrl = "https://github.com/actions/runner-images/blob" if (Test-IsWin22) { - $imageLabel = "windows-2022" - $softwareUrl = "${githubUrl}/win22/$imageMajorVersion.$imageMinorVersion/images/windows/Windows2022-Readme.md" - $releaseUrl = "https://github.com/actions/runner-images/releases/tag/win22%2F$imageMajorVersion.$imageMinorVersion" + $imageLabel = "windows-2022" + $softwareUrl = "${githubUrl}/win22/$imageMajorVersion.$imageMinorVersion/images/windows/Windows2022-Readme.md" + $releaseUrl = "https://github.com/actions/runner-images/releases/tag/win22%2F$imageMajorVersion.$imageMinorVersion" } elseif (Test-IsWin19) { - $imageLabel = "windows-2019" - $softwareUrl = "${githubUrl}/win19/$imageMajorVersion.$imageMinorVersion/images/windows/Windows2019-Readme.md" - $releaseUrl = "https://github.com/actions/runner-images/releases/tag/win19%2F$imageMajorVersion.$imageMinorVersion" + $imageLabel = "windows-2019" + $softwareUrl = "${githubUrl}/win19/$imageMajorVersion.$imageMinorVersion/images/windows/Windows2019-Readme.md" + $releaseUrl = "https://github.com/actions/runner-images/releases/tag/win19%2F$imageMajorVersion.$imageMinorVersion" } else { - throw "Invalid platform version is found. Either Windows Server 2019 or 2022 are required" + throw "Invalid platform version is found. Either Windows Server 2019 or 2022 are required" } $json = @" diff --git a/images/windows/scripts/build/Configure-PowerShell.ps1 b/images/windows/scripts/build/Configure-PowerShell.ps1 index 722a1ea89740..e8df1831f916 100644 --- a/images/windows/scripts/build/Configure-PowerShell.ps1 +++ b/images/windows/scripts/build/Configure-PowerShell.ps1 @@ -17,7 +17,7 @@ $PSModuleAnalysisCachePath = 'C:\PSModuleAnalysisCachePath\ModuleAnalysisCache' # make variable to be available in the current session ${env:PSModuleAnalysisCachePath} = $PSModuleAnalysisCachePath -$null = New-Item -Path $PSModuleAnalysisCachePath -ItemType 'File' -Force +New-Item -Path $PSModuleAnalysisCachePath -ItemType 'File' -Force | Out-Null #endregion #region User (current user, image generation only) diff --git a/images/windows/scripts/build/Configure-System.ps1 b/images/windows/scripts/build/Configure-System.ps1 index 8553ba68a279..e20b295dce2f 100644 --- a/images/windows/scripts/build/Configure-System.ps1 +++ b/images/windows/scripts/build/Configure-System.ps1 @@ -4,7 +4,10 @@ ################################################################################ Write-Host "Cleanup WinSxS" -Dism.exe /online /Cleanup-Image /StartComponentCleanup /ResetBase +dism.exe /online /Cleanup-Image /StartComponentCleanup /ResetBase +if ($LASTEXITCODE -ne 0) { + throw "Failed to cleanup WinSxS" +} # Set default version to 1 for WSL (aka LXSS - Linux Subsystem) # The value should be set in the default user registry hive @@ -47,7 +50,13 @@ Write-Host "Clean up various directories" if (Test-Path $_) { Write-Host "Removing $_" cmd /c "takeown /d Y /R /f $_ 2>&1" | Out-Null + if ($LASTEXITCODE -ne 0) { + throw "Failed to take ownership of $_" + } cmd /c "icacls $_ /grant:r administrators:f /t /c /q 2>&1" | Out-Null + if ($LASTEXITCODE -ne 0) { + throw "Failed to grant administrators full control of $_" + } Remove-Item $_ -Recurse -Force -ErrorAction SilentlyContinue | Out-Null } } @@ -60,11 +69,21 @@ Remove-Item $profile.AllUsersAllHosts -Force -ErrorAction SilentlyContinue | Out # Clean yarn and npm cache cmd /c "yarn cache clean 2>&1" | Out-Null +if ($LASTEXITCODE -ne 0) { + throw "Failed to clean yarn cache" +} + cmd /c "npm cache clean --force 2>&1" | Out-Null +if ($LASTEXITCODE -ne 0) { + throw "Failed to clean npm cache" +} # allow msi to write to temp folder # see https://github.com/actions/runner-images/issues/1704 cmd /c "icacls $env:SystemRoot\Temp /grant Users:f /t /c /q 2>&1" | Out-Null +if ($LASTEXITCODE -ne 0) { + throw "Failed to grant Users full control of $env:SystemRoot\Temp" +} # Registry settings $registrySettings = @( diff --git a/images/windows/scripts/build/Configure-SystemEnvironment.ps1 b/images/windows/scripts/build/Configure-SystemEnvironment.ps1 index aa280c352eb3..f43a9f08a9ed 100644 --- a/images/windows/scripts/build/Configure-SystemEnvironment.ps1 +++ b/images/windows/scripts/build/Configure-SystemEnvironment.ps1 @@ -4,12 +4,11 @@ ################################################################################ $variables = @{ - "ImageVersion" = $env:IMAGE_VERSION - "ImageOS" = $env:IMAGE_OS - "AGENT_TOOLSDIRECTORY" = $env:AGENT_TOOLSDIRECTORY - "ACTIONS_RUNNER_ACTION_ARCHIVE_CACHE" = $env:ACTIONS_RUNNER_ACTION_ARCHIVE_CACHE + "ImageVersion" = $env:IMAGE_VERSION + "ImageOS" = $env:IMAGE_OS + "AGENT_TOOLSDIRECTORY" = $env:AGENT_TOOLSDIRECTORY } $variables.GetEnumerator() | ForEach-Object { - [Environment]::SetEnvironmentVariable($_.Key, $_.Value, "Machine") + [Environment]::SetEnvironmentVariable($_.Key, $_.Value, "Machine") } diff --git a/images/windows/scripts/build/Configure-Toolset.ps1 b/images/windows/scripts/build/Configure-Toolset.ps1 index 6babc0b81da7..de8da36f0a61 100644 --- a/images/windows/scripts/build/Configure-Toolset.ps1 +++ b/images/windows/scripts/build/Configure-Toolset.ps1 @@ -4,60 +4,37 @@ ## Desc: Configure Toolset ################################################################################ -Function Set-DefaultVariables -{ - param - ( - [Parameter(Mandatory=$true)] - [object] $EnvVars, - [Parameter(Mandatory=$true)] - [string] $ToolVersionPath - ) - - $templates = $EnvVars.pathTemplates - foreach ($template in $templates) - { - $toolSystemPath = $template -f $ToolVersionPath - Add-MachinePathItem -PathItem $toolSystemPath | Out-Null - } - - if (-not ([string]::IsNullOrEmpty($EnvVars.defaultVariable))) - { - [Environment]::SetEnvironmentVariable($toolEnvVars.defaultVariable, $ToolVersionPath, "Machine") - } -} - -# Define executables for cached tools -$toolsEnvironmentVariables = @{ +$toolEnvConfigs = @{ Python = @{ pathTemplates = @( - "{0}", + "{0}" "{0}\Scripts" ) } - go = @{ - pathTemplates = @( + go = @{ + pathTemplates = @( "{0}\bin" ) - variableTemplate = "GOROOT_{0}_{1}_X64" + envVarTemplate = "GOROOT_{0}_{1}_X64" } } -$toolsToConfigure = @("Python", "Go") -$tools = Get-ToolsetContent | Select-Object -ExpandProperty toolcache ` - | Where-Object { $toolsToConfigure -contains $_.name } +$tools = Get-ToolsetContent ` +| Select-Object -ExpandProperty toolcache ` +| Where-Object { $toolEnvConfigs.Keys -contains $_.name } Write-Host "Configure toolset tools environment..." foreach ($tool in $tools) { - $toolEnvVars = $toolsEnvironmentVariables[$tool.name] - - if (-not ([string]::IsNullOrEmpty($toolEnvVars.variableTemplate))) { + $toolEnvConfig = $toolEnvConfigs[$tool.name] + + if (-not ([string]::IsNullOrEmpty($toolEnvConfig.envVarTemplate))) { foreach ($version in $tool.versions) { Write-Host "Set $($tool.name) $version environment variable..." $foundVersionArchPath = Get-TCToolVersionPath -Name $tool.name -Version $version -Arch $tool.arch - $envName = $toolEnvVars.variableTemplate -f $version.Split(".") + $envName = $toolEnvConfig.envVarTemplate -f $version.Split(".") + Write-Host "Set $envName to $foundVersionArchPath" [Environment]::SetEnvironmentVariable($envName, $foundVersionArchPath, "Machine") } } @@ -67,7 +44,16 @@ foreach ($tool in $tools) { $toolVersionPath = Get-TCToolVersionPath -Name $tool.name -Version $tool.default -Arch $tool.arch - Set-DefaultVariables -ToolVersionPath $toolVersionPath -EnvVars $toolEnvVars + foreach ($template in $toolEnvConfig.pathTemplates) { + $toolSystemPath = $template -f $toolVersionPath + Write-Host "Add $toolSystemPath to system PATH..." + Add-MachinePathItem -PathItem $toolSystemPath | Out-Null + } + + if (-not ([string]::IsNullOrEmpty($tool.defaultVariable))) { + Write-Host "Set $($tool.name) $($tool.default) $($tool.defaultVariable) environment variable..." + [Environment]::SetEnvironmentVariable($tool.defaultVariable, $toolVersionPath, "Machine") + } } } diff --git a/images/windows/scripts/build/Configure-User.ps1 b/images/windows/scripts/build/Configure-User.ps1 index 967ea492366a..dd1437ff692a 100644 --- a/images/windows/scripts/build/Configure-User.ps1 +++ b/images/windows/scripts/build/Configure-User.ps1 @@ -9,17 +9,23 @@ # Write-Host "Warmup 'devenv.exe /updateconfiguration'" - $vsInstallRoot = (Get-VisualStudioInstance).InstallationPath -$devEnvPath = "$vsInstallRoot\Common7\IDE\devenv.exe" - -cmd.exe /c "`"$devEnvPath`" /updateconfiguration" +cmd.exe /c "`"$vsInstallRoot\Common7\IDE\devenv.exe`" /updateconfiguration" +if ($LASTEXITCODE -ne 0) { + throw "Failed to warmup 'devenv.exe /updateconfiguration'" +} # we are fine if some file is locked and cannot be copied Copy-Item ${env:USERPROFILE}\AppData\Local\Microsoft\VisualStudio -Destination c:\users\default\AppData\Local\Microsoft\VisualStudio -Recurse -ErrorAction SilentlyContinue -reg.exe load HKLM\DEFAULT c:\users\default\ntuser.dat +Mount-RegistryHive ` + -FileName "C:\Users\Default\NTUSER.DAT" ` + -SubKey "HKLM\DEFAULT" + reg.exe copy HKCU\Software\Microsoft\VisualStudio HKLM\DEFAULT\Software\Microsoft\VisualStudio /s +if ($LASTEXITCODE -ne 0) { + throw "Failed to copy HKCU\Software\Microsoft\VisualStudio to HKLM\DEFAULT\Software\Microsoft\VisualStudio" +} # disable TSVNCache.exe $registryKeyPath = 'HKCU:\Software\TortoiseSVN' @@ -27,8 +33,12 @@ if (-not(Test-Path -Path $registryKeyPath)) { New-Item -Path $registryKeyPath -ItemType Directory -Force } -New-ItemProperty -Path $RegistryKeyPath -Name CacheType -PropertyType DWORD -Value 0 +New-ItemProperty -Path $registryKeyPath -Name CacheType -PropertyType DWORD -Value 0 reg.exe copy HKCU\Software\TortoiseSVN HKLM\DEFAULT\Software\TortoiseSVN /s +if ($LASTEXITCODE -ne 0) { + throw "Failed to copy HKCU\Software\TortoiseSVN to HKLM\DEFAULT\Software\TortoiseSVN" +} + +Dismount-RegistryHive "HKLM\DEFAULT" -reg.exe unload HKLM\DEFAULT Write-Host "Configure-User.ps1 - completed" diff --git a/images/windows/scripts/build/Install-ActionsCache.ps1 b/images/windows/scripts/build/Install-ActionsCache.ps1 index 70f50588407c..118279ed84f7 100644 --- a/images/windows/scripts/build/Install-ActionsCache.ps1 +++ b/images/windows/scripts/build/Install-ActionsCache.ps1 @@ -4,9 +4,11 @@ ## Maintainer: #actions-runtime and @TingluoHuang ################################################################################ -if (-not (Test-Path $env:ACTIONS_RUNNER_ACTION_ARCHIVE_CACHE)) { +$actionArchiveCache = "C:\actionarchivecache\" + +if (-not (Test-Path $actionArchiveCache)) { Write-Host "Creating action archive cache folder" - New-Item -ItemType Directory -Path $env:ACTIONS_RUNNER_ACTION_ARCHIVE_CACHE | Out-Null + New-Item -ItemType Directory -Path $actionArchiveCache | Out-Null } $downloadUrl = Resolve-GithubReleaseAssetUrl ` @@ -18,6 +20,8 @@ Write-Host "Download Latest action-versions archive from $downloadUrl" $actionVersionsArchivePath = Invoke-DownloadWithRetry $downloadUrl Write-Host "Expand action-versions archive" -Expand-7ZipArchive -Path $actionVersionsArchivePath -DestinationPath $env:ACTIONS_RUNNER_ACTION_ARCHIVE_CACHE +Expand-7ZipArchive -Path $actionVersionsArchivePath -DestinationPath $actionArchiveCache + +[Environment]::SetEnvironmentVariable("ACTIONS_RUNNER_ACTION_ARCHIVE_CACHE", $actionArchiveCache, "Machine") Invoke-PesterTests -TestFile "ActionArchiveCache" diff --git a/images/windows/scripts/build/Install-AzureCli.ps1 b/images/windows/scripts/build/Install-AzureCli.ps1 index 6bf7611cfa24..9f516c53328b 100644 --- a/images/windows/scripts/build/Install-AzureCli.ps1 +++ b/images/windows/scripts/build/Install-AzureCli.ps1 @@ -9,13 +9,13 @@ $azureCliConfigPath = 'C:\azureCli' # Store azure-cli cache outside of the provisioning user's profile [Environment]::SetEnvironmentVariable('AZURE_CONFIG_DIR', $azureCliConfigPath, "Machine") -$azureCliExtensionPath = Join-Path $Env:CommonProgramFiles 'AzureCliExtensionDirectory' +$azureCliExtensionPath = Join-Path $env:CommonProgramFiles 'AzureCliExtensionDirectory' New-Item -ItemType 'Directory' -Path $azureCliExtensionPath | Out-Null [Environment]::SetEnvironmentVariable('AZURE_EXTENSION_DIR', $azureCliExtensionPath, "Machine") Install-Binary -Type MSI ` - -Url 'https://aka.ms/installazurecliwindowsx64' ` - -ExpectedSignature '72105B6D5F370B62FD5C82F1512F7AD7DEE5F2C0' + -Url 'https://aka.ms/installazurecliwindowsx64' ` + -ExpectedSignature '72105B6D5F370B62FD5C82F1512F7AD7DEE5F2C0' Update-Environment @@ -23,7 +23,7 @@ Update-Environment Write-Host "Warmup 'az'" az --help | Out-Null if ($LASTEXITCODE -ne 0) { - throw "Command 'az --help' failed" + throw "Command 'az --help' failed" } Invoke-PesterTests -TestFile 'CLI.Tools' -TestName 'Azure CLI' diff --git a/images/windows/scripts/build/Install-AzureCosmosDbEmulator.ps1 b/images/windows/scripts/build/Install-AzureCosmosDbEmulator.ps1 index 32c1e9f2724a..cf48ca62ad87 100644 --- a/images/windows/scripts/build/Install-AzureCosmosDbEmulator.ps1 +++ b/images/windows/scripts/build/Install-AzureCosmosDbEmulator.ps1 @@ -4,7 +4,7 @@ #################################################################################### Install-Binary -Type MSI ` - -Url "https://aka.ms/cosmosdb-emulator" ` - -ExpectedSignature "F372C27F6E052A6BE8BAB3112B465C692196CD6F" + -Url "https://aka.ms/cosmosdb-emulator" ` + -ExpectedSignature "F372C27F6E052A6BE8BAB3112B465C692196CD6F" Invoke-PesterTests -TestFile "Tools" -TestName "Azure Cosmos DB Emulator" diff --git a/images/windows/scripts/build/Install-AzureDevOpsCli.ps1 b/images/windows/scripts/build/Install-AzureDevOpsCli.ps1 index f911ba6e7746..f5cbfa540277 100644 --- a/images/windows/scripts/build/Install-AzureDevOpsCli.ps1 +++ b/images/windows/scripts/build/Install-AzureDevOpsCli.ps1 @@ -15,16 +15,16 @@ Update-Environment az extension add -n azure-devops if ($LASTEXITCODE -ne 0) { - throw "Command 'az extension add -n azure-devops' failed" + throw "Command 'az extension add -n azure-devops' failed" } # Warm-up Azure DevOps CLI Write-Host "Warmup 'az-devops'" @('devops', 'pipelines', 'boards', 'repos', 'artifacts') | ForEach-Object { - az $_ --help - if ($LASTEXITCODE -ne 0) { - throw "Command 'az $_ --help' failed" - } + az $_ --help + if ($LASTEXITCODE -ne 0) { + throw "Command 'az $_ --help' failed" + } } # calling az devops login to force it to install `keyring`. Login will actually fail, redirecting error to null diff --git a/images/windows/scripts/build/Install-Bazel.ps1 b/images/windows/scripts/build/Install-Bazel.ps1 index ad922de69f0a..093690d3853a 100644 --- a/images/windows/scripts/build/Install-Bazel.ps1 +++ b/images/windows/scripts/build/Install-Bazel.ps1 @@ -7,7 +7,7 @@ Install-ChocoPackage bazel npm install -g @bazel/bazelisk if ($LASTEXITCODE -ne 0) { - throw "Command 'npm install -g @bazel/bazelisk' failed" + throw "Command 'npm install -g @bazel/bazelisk' failed" } Invoke-PesterTests -TestFile "Tools" -TestName "Bazel" diff --git a/images/windows/scripts/build/Install-BizTalkBuildComponent.ps1 b/images/windows/scripts/build/Install-BizTalkBuildComponent.ps1 index 8bfc6b13d4fd..a56a663e573e 100644 --- a/images/windows/scripts/build/Install-BizTalkBuildComponent.ps1 +++ b/images/windows/scripts/build/Install-BizTalkBuildComponent.ps1 @@ -3,15 +3,15 @@ ## Desc: Install BizTalk Project Build Component ################################################################################ -$BuildComponentUri = "https://aka.ms/BuildComponentSetup.EN" -$BuildComponentSignatureThumbprint = "8740DF4ACB749640AD318E4BE842F72EC651AD80" +$downloadUrl = "https://aka.ms/BuildComponentSetup.EN" +$signatureThumbprint = "8740DF4ACB749640AD318E4BE842F72EC651AD80" Write-Host "Downloading BizTalk Project Build Component archive..." -$zipFile = Invoke-DownloadWithRetry $BuildComponentUri +$zipFile = Invoke-DownloadWithRetry $downloadUrl $setupPath = Join-Path $env:TEMP "BizTalkBuildComponent" if (-not (Test-Path -Path $setupPath)) { - $null = New-Item -Path $setupPath -ItemType Directory -Force + New-Item -Path $setupPath -ItemType Directory -Force | Out-Null } Expand-7ZipArchive -Path $zipFile -DestinationPath $setupPath @@ -19,10 +19,10 @@ Write-Host "Installing BizTalk Project Build Component..." Install-Binary ` -LocalPath "$setupPath\Bootstrap.msi" ` -ExtraInstallArgs ("/l*v", "$setupPath\bootstrap.log") ` - -ExpectedSignature $BuildComponentSignatureThumbprint + -ExpectedSignature $signatureThumbprint Install-Binary ` -LocalPath "$setupPath\BuildComponentSetup.msi" ` -ExtraInstallArgs ("/l*v", "$setupPath\buildComponentSetup.log") ` - -ExpectedSignature $BuildComponentSignatureThumbprint + -ExpectedSignature $signatureThumbprint Invoke-PesterTests -TestFile "BizTalk" -TestName "BizTalk Build Component Setup" diff --git a/images/windows/scripts/build/Install-Chocolatey.ps1 b/images/windows/scripts/build/Install-Chocolatey.ps1 index 742fa3a00b97..6dc2c6c1569a 100644 --- a/images/windows/scripts/build/Install-Chocolatey.ps1 +++ b/images/windows/scripts/build/Install-Chocolatey.ps1 @@ -14,9 +14,9 @@ Update-Environment # Verify and run choco installer $signatureThumbprint = "83AC7D88C66CB8680BCE802E0F0F5C179722764B" -$InstallScriptPath = Invoke-DownloadWithRetry 'https://chocolatey.org/install.ps1' -Test-FileSignature -Path $InstallScriptPath -ExpectedThumbprint $signatureThumbprint -Invoke-Expression $InstallScriptPath +$installScriptPath = Invoke-DownloadWithRetry 'https://chocolatey.org/install.ps1' +Test-FileSignature -Path $installScriptPath -ExpectedThumbprint $signatureThumbprint +Invoke-Expression $installScriptPath # Turn off confirmation choco feature enable -n allowGlobalConfirmation diff --git a/images/windows/scripts/build/Install-Chrome.ps1 b/images/windows/scripts/build/Install-Chrome.ps1 index 25687abe8a18..ff420791dd81 100644 --- a/images/windows/scripts/build/Install-Chrome.ps1 +++ b/images/windows/scripts/build/Install-Chrome.ps1 @@ -32,52 +32,51 @@ $regGoogleParameters = @( ) $regGoogleParameters | ForEach-Object { - $Arguments = $_ - if (-not ($Arguments.Path)) { - $Arguments.Add("Path", $regGoogleUpdatePath) + $arguments = $_ + if (-not ($arguments.Path)) { + $arguments.Add("Path", $regGoogleUpdatePath) } - $Arguments.Add("Force", $true) - New-ItemProperty @Arguments + $arguments.Add("Force", $true) + New-ItemProperty @arguments } - # Install Chrome WebDriver Write-Host "Install Chrome WebDriver..." -$ChromeDriverPath = "$($env:SystemDrive)\SeleniumWebDrivers\ChromeDriver" -if (-not (Test-Path -Path $ChromeDriverPath)) { - New-Item -Path $ChromeDriverPath -ItemType Directory -Force +$chromeDriverPath = "$($env:SystemDrive)\SeleniumWebDrivers\ChromeDriver" +if (-not (Test-Path -Path $chromeDriverPath)) { + New-Item -Path $chromeDriverPath -ItemType Directory -Force } Write-Host "Get the Chrome WebDriver download URL..." -$RegistryPath = "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths" -$ChromePath = (Get-ItemProperty "$RegistryPath\chrome.exe").'(default)' -[version] $ChromeVersion = [System.Diagnostics.FileVersionInfo]::GetVersionInfo($ChromePath).ProductVersion -$ChromeBuild = "$($ChromeVersion.Major).$($ChromeVersion.Minor).$($ChromeVersion.Build)" -$ChromeDriverVersionsUrl = "https://googlechromelabs.github.io/chrome-for-testing/latest-patch-versions-per-build-with-downloads.json" - -Write-Host "Chrome version is $ChromeVersion" -$ChromeDriverVersions = Invoke-RestMethod -Uri $ChromeDriverVersionsUrl -$ChromeDriverVersion = $ChromeDriverVersions.builds.$ChromeBuild - -if (-not ($ChromeDriverVersion)) { - $availableVersions = $ChromeDriverVersions.builds | Get-Member | Select-Object -ExpandProperty Name +$registryPath = "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths" +$chromePath = (Get-ItemProperty "$registryPath\chrome.exe").'(default)' +[version] $chromeVersion = [System.Diagnostics.FileVersionInfo]::GetVersionInfo($chromePath).ProductVersion +$chromeBuild = "$($chromeVersion.Major).$($chromeVersion.Minor).$($chromeVersion.Build)" +$chromeDriverVersionsUrl = "https://googlechromelabs.github.io/chrome-for-testing/latest-patch-versions-per-build-with-downloads.json" + +Write-Host "Chrome version is $chromeVersion" +$chromeDriverVersions = Invoke-RestMethod -Uri $chromeDriverVersionsUrl +$chromeDriverVersion = $chromeDriverVersions.builds.$chromeBuild + +if (-not ($chromeDriverVersion)) { + $availableVersions = $chromeDriverVersions.builds | Get-Member | Select-Object -ExpandProperty Name Write-Host "Available chromedriver builds are $availableVersions" - throw "Can't determine chromedriver version that matches chrome build $ChromeBuild" + throw "Can't determine chromedriver version that matches chrome build $chromeBuild" } -$ChromeDriverVersion.version | Out-File -FilePath "$ChromeDriverPath\versioninfo.txt" -Force; +$chromeDriverVersion.version | Out-File -FilePath "$chromeDriverPath\versioninfo.txt" -Force; -Write-Host "Chrome WebDriver version to install is $($ChromeDriverVersion.version)" -$ChromeDriverZipDownloadUrl = ($ChromeDriverVersion.downloads.chromedriver | Where-Object platform -eq "win64").url +Write-Host "Chrome WebDriver version to install is $($chromeDriverVersion.version)" +$chromeDriverZipDownloadUrl = ($chromeDriverVersion.downloads.chromedriver | Where-Object platform -eq "win64").url -Write-Host "Download Chrome WebDriver from $ChromeDriverZipDownloadUrl..." -$ChromeDriverArchPath = Invoke-DownloadWithRetry $ChromeDriverZipDownloadUrl +Write-Host "Download Chrome WebDriver from $chromeDriverZipDownloadUrl..." +$chromeDriverArchPath = Invoke-DownloadWithRetry $chromeDriverZipDownloadUrl Write-Host "Expand Chrome WebDriver archive (without using directory names)..." -Expand-7ZipArchive -Path $ChromeDriverArchPath -DestinationPath $ChromeDriverPath -ExtractMethod "e" +Expand-7ZipArchive -Path $chromeDriverArchPath -DestinationPath $chromeDriverPath -ExtractMethod "e" Write-Host "Setting the environment variables..." -[Environment]::SetEnvironmentVariable("ChromeWebDriver", $ChromeDriverPath, "Machine") -Add-MachinePathItem $ChromeDriverPath +[Environment]::SetEnvironmentVariable("ChromeWebDriver", $chromeDriverPath, "Machine") +Add-MachinePathItem $chromeDriverPath Update-Environment Invoke-PesterTests -TestFile "Browsers" -TestName "Chrome" diff --git a/images/windows/scripts/build/Install-CloudFoundryCli.ps1 b/images/windows/scripts/build/Install-CloudFoundryCli.ps1 index 5df9c8a4109a..48b22b8f8c05 100644 --- a/images/windows/scripts/build/Install-CloudFoundryCli.ps1 +++ b/images/windows/scripts/build/Install-CloudFoundryCli.ps1 @@ -4,23 +4,23 @@ ################################################################################ # Download the latest cf cli exe -$CloudFoundryCliUrl = "https://packages.cloudfoundry.org/stable?release=windows64-exe&source=github" +$cloudFoundryCliUrl = "https://packages.cloudfoundry.org/stable?release=windows64-exe&source=github" -$CloudFoundryArchPath = Invoke-DownloadWithRetry $CloudFoundryCliUrl +$cloudFoundryArchPath = Invoke-DownloadWithRetry $cloudFoundryCliUrl # Create directory for cf cli -$CloudFoundryCliPath = "C:\cf-cli" -New-Item -Path $CloudFoundryCliPath -ItemType Directory -Force +$cloudFoundryCliPath = "C:\cf-cli" +New-Item -Path $cloudFoundryCliPath -ItemType Directory -Force # Extract the zip archive Write-Host "Extracting cf cli..." -Expand-7ZipArchive -Path $CloudFoundryArchPath -DestinationPath $CloudFoundryCliPath +Expand-7ZipArchive -Path $cloudFoundryArchPath -DestinationPath $cloudFoundryCliPath # Add cf to path -Add-MachinePathItem $CloudFoundryCliPath +Add-MachinePathItem $cloudFoundryCliPath # Validate cf signature -$CloudFoundrySignatureThumbprint = "4C69EDD13930ED01B83DD1D17B09C434DC1F2177" -Test-FileSignature -Path "$CloudFoundryCliPath\cf.exe" -ExpectedThumbprint $CloudFoundrySignatureThumbprint +$cloudFoundrySignatureThumbprint = "4C69EDD13930ED01B83DD1D17B09C434DC1F2177" +Test-FileSignature -Path "$cloudFoundryCliPath\cf.exe" -ExpectedThumbprint $cloudFoundrySignatureThumbprint Invoke-PesterTests -TestFile "CLI.Tools" -TestName "CloudFoundry CLI" diff --git a/images/windows/scripts/build/Install-CodeQLBundle.ps1 b/images/windows/scripts/build/Install-CodeQLBundle.ps1 index 5a29fb7dd567..5ebcd67f25c1 100644 --- a/images/windows/scripts/build/Install-CodeQLBundle.ps1 +++ b/images/windows/scripts/build/Install-CodeQLBundle.ps1 @@ -4,33 +4,33 @@ ################################################################################ # Retrieve the CLI version of the latest CodeQL bundle. -$Defaults = (Invoke-RestMethod "https://raw.githubusercontent.com/github/codeql-action/v2/src/defaults.json") -$CliVersion = $Defaults.cliVersion -$TagName = "codeql-bundle-v" + $CliVersion +$defaults = (Invoke-RestMethod "https://raw.githubusercontent.com/github/codeql-action/v2/src/defaults.json") +$cliVersion = $defaults.cliVersion +$tagName = "codeql-bundle-v" + $cliVersion -Write-Host "Downloading CodeQL bundle $($CliVersion)..." +Write-Host "Downloading CodeQL bundle $($cliVersion)..." # Note that this is the all-platforms CodeQL bundle, to support scenarios where customers run # different operating systems within containers. -$CodeQLBundlePath = Invoke-DownloadWithRetry "https://github.com/github/codeql-action/releases/download/$($TagName)/codeql-bundle.tar.gz" -$DownloadDirectoryPath = (Get-Item $CodeQLBundlePath).Directory.FullName +$codeQLBundlePath = Invoke-DownloadWithRetry "https://github.com/github/codeql-action/releases/download/$($tagName)/codeql-bundle.tar.gz" +$downloadDirectoryPath = (Get-Item $codeQLBundlePath).Directory.FullName -$CodeQLToolcachePath = Join-Path $Env:AGENT_TOOLSDIRECTORY -ChildPath "CodeQL" | Join-Path -ChildPath $CliVersion | Join-Path -ChildPath "x64" -New-Item -Path $CodeQLToolcachePath -ItemType Directory -Force | Out-Null +$codeQLToolcachePath = Join-Path $env:AGENT_TOOLSDIRECTORY -ChildPath "CodeQL" | Join-Path -ChildPath $cliVersion | Join-Path -ChildPath "x64" +New-Item -Path $codeQLToolcachePath -ItemType Directory -Force | Out-Null Write-Host "Unpacking the downloaded CodeQL bundle archive..." -Expand-7ZipArchive -Path $CodeQLBundlePath -DestinationPath $DownloadDirectoryPath -$UnGzipedCodeQLBundlePath = Join-Path $DownloadDirectoryPath "codeql-bundle.tar" -Expand-7ZipArchive -Path $UnGzipedCodeQLBundlePath -DestinationPath $CodeQLToolcachePath +Expand-7ZipArchive -Path $codeQLBundlePath -DestinationPath $downloadDirectoryPath +$unGzipedCodeQLBundlePath = Join-Path $downloadDirectoryPath "codeql-bundle.tar" +Expand-7ZipArchive -Path $unGzipedCodeQLBundlePath -DestinationPath $codeQLToolcachePath -Write-Host "CodeQL bundle at $($CodeQLToolcachePath) contains the following directories:" -Get-ChildItem -Path $CodeQLToolcachePath -Depth 2 +Write-Host "CodeQL bundle at $($codeQLToolcachePath) contains the following directories:" +Get-ChildItem -Path $codeQLToolcachePath -Depth 2 # Touch a file to indicate to the CodeQL Action that this bundle shipped with the toolcache. This is # to support overriding the CodeQL version specified in defaults.json on GitHub Enterprise. -New-Item -ItemType file (Join-Path $CodeQLToolcachePath -ChildPath "pinned-version") +New-Item -ItemType file (Join-Path $codeQLToolcachePath -ChildPath "pinned-version") # Touch a file to indicate to the toolcache that setting up CodeQL is complete. -New-Item -ItemType file "$CodeQLToolcachePath.complete" +New-Item -ItemType file "$codeQLToolcachePath.complete" # Test that the tools have been extracted successfully. Invoke-PesterTests -TestFile "Tools" -TestName "CodeQL Bundle" diff --git a/images/windows/scripts/build/Install-DACFx.ps1 b/images/windows/scripts/build/Install-DACFx.ps1 index bff35dde9373..2fcb1037ecb9 100644 --- a/images/windows/scripts/build/Install-DACFx.ps1 +++ b/images/windows/scripts/build/Install-DACFx.ps1 @@ -4,7 +4,7 @@ #################################################################################### Install-Binary -Type MSI ` - -Url 'https://aka.ms/dacfx-msi' ` - -ExpectedSignature '72105B6D5F370B62FD5C82F1512F7AD7DEE5F2C0' + -Url 'https://aka.ms/dacfx-msi' ` + -ExpectedSignature '72105B6D5F370B62FD5C82F1512F7AD7DEE5F2C0' Invoke-PesterTests -TestFile "Tools" -TestName "DACFx" diff --git a/images/windows/scripts/build/Install-DotnetSDK.ps1 b/images/windows/scripts/build/Install-DotnetSDK.ps1 index 1cc9645e3131..493720f319ed 100644 --- a/images/windows/scripts/build/Install-DotnetSDK.ps1 +++ b/images/windows/scripts/build/Install-DotnetSDK.ps1 @@ -42,13 +42,18 @@ function Invoke-DotnetWarmup { ) # warm up dotnet for first time experience $projectTypes = @('console', 'mstest', 'web', 'mvc', 'webapi') - $projectTypes | ForEach-Object { - $template = $_ - $projectPath = Join-Path -Path C:\temp -ChildPath $template + foreach ($template in $projectTypes) { + $projectPath = Join-Path -Path "C:\temp" -ChildPath $template New-Item -Path $projectPath -Force -ItemType Directory Push-Location -Path $projectPath - & $env:ProgramFiles\dotnet\dotnet.exe new globaljson --sdk-version "$SDKVersion" - & $env:ProgramFiles\dotnet\dotnet.exe new $template + & "$env:ProgramFiles\dotnet\dotnet.exe" new globaljson --sdk-version "$SDKVersion" + if ($LastExitCode -ne 0) { + throw "Dotnet new globaljson failed with exit code $LastExitCode" + } + & "$env:ProgramFiles\dotnet\dotnet.exe" new $template + if ($LastExitCode -ne 0) { + throw "Dotnet new $template failed with exit code $LastExitCode" + } Pop-Location Remove-Item $projectPath -Force -Recurse } @@ -73,6 +78,8 @@ function Install-DotnetSDK { Write-Host "Installing dotnet $SDKVersion" $zipPath = Join-Path ([IO.Path]::GetTempPath()) ([IO.Path]::GetRandomFileName()) & $InstallScriptPath -Version $SDKVersion -InstallDir $(Join-Path -Path $env:ProgramFiles -ChildPath 'dotnet') -ZipPath $zipPath -KeepZip + # Installer is PowerShell script that doesn't set exit code on failure + # If installation failed, tests will fail anyway #region Supply chain security $releasesJsonUri = "https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/${DotnetVersion}/releases.json" @@ -110,13 +117,19 @@ if (Test-Path $nugetPath) { # Generate and copy new NuGet.Config config dotnet nuget list source | Out-Null -Copy-Item -Path $nugetPath -Destination C:\Users\Default\AppData\Roaming -Force -Recurse +if ($LastExitCode -ne 0) { + throw "Dotnet nuget list source failed with exit code $LastExitCode" +} +Copy-Item -Path $nugetPath -Destination "C:\Users\Default\AppData\Roaming" -Force -Recurse # Install dotnet tools Write-Host "Installing dotnet tools" Add-DefaultPathItem "%USERPROFILE%\.dotnet\tools" foreach ($dotnetTool in $dotnetToolset.tools) { - dotnet tool install $($dotnetTool.name) --tool-path "C:\Users\Default\.dotnet\tools" --add-source https://api.nuget.org/v3/index.json | Out-Null + dotnet tool install $($dotnetTool.name) --tool-path "C:\Users\Default\.dotnet\tools" --add-source "https://api.nuget.org/v3/index.json" | Out-Null + if ($LastExitCode -ne 0) { + throw "Dotnet tool install failed with exit code $LastExitCode" + } } Invoke-PesterTests -TestFile "DotnetSDK" diff --git a/images/windows/scripts/build/Install-Firefox.ps1 b/images/windows/scripts/build/Install-Firefox.ps1 index eca81779f983..29f622869f7a 100644 --- a/images/windows/scripts/build/Install-Firefox.ps1 +++ b/images/windows/scripts/build/Install-Firefox.ps1 @@ -6,11 +6,11 @@ # Install and configure Firefox browser Write-Host "Get the latest Firefox version..." -$VersionsManifest = Invoke-RestMethod "https://product-details.mozilla.org/1.0/firefox_versions.json" +$versionsManifest = Invoke-RestMethod "https://product-details.mozilla.org/1.0/firefox_versions.json" Write-Host "Install Firefox browser..." -$installerUrl = "https://download.mozilla.org/?product=firefox-$($VersionsManifest.LATEST_FIREFOX_VERSION)&os=win64&lang=en-US" -$hashUrl = "https://archive.mozilla.org/pub/firefox/releases/$($VersionsManifest.LATEST_FIREFOX_VERSION)/SHA256SUMS" +$installerUrl = "https://download.mozilla.org/?product=firefox-$($versionsManifest.LATEST_FIREFOX_VERSION)&os=win64&lang=en-US" +$hashUrl = "https://archive.mozilla.org/pub/firefox/releases/$($versionsManifest.LATEST_FIREFOX_VERSION)/SHA256SUMS" $externalHash = Get-ChecksumFromUrl -Type "SHA256" ` -Url $hashUrl ` @@ -22,42 +22,42 @@ Install-Binary -Type EXE ` -ExpectedSHA256Sum $externalHash Write-Host "Disable autoupdate..." -$FirefoxDirectoryPath = Join-Path $env:ProgramFiles "Mozilla Firefox" -New-Item -path $FirefoxDirectoryPath -Name 'mozilla.cfg' -Value '// +$firefoxDirectoryPath = Join-Path $env:ProgramFiles "Mozilla Firefox" +New-Item -path $firefoxDirectoryPath -Name 'mozilla.cfg' -Value '// pref("browser.shell.checkDefaultBrowser", false); pref("app.update.enabled", false);' -ItemType file -force -$FirefoxPreferencesFolder = Join-Path $FirefoxDirectoryPath "defaults\pref" -New-Item -path $FirefoxPreferencesFolder -Name 'local-settings.js' -Value 'pref("general.config.obscure_value", 0); +$firefoxPreferencesFolder = Join-Path $firefoxDirectoryPath "defaults\pref" +New-Item -path $firefoxPreferencesFolder -Name 'local-settings.js' -Value 'pref("general.config.obscure_value", 0); pref("general.config.filename", "mozilla.cfg");' -ItemType file -force # Download and install Gecko WebDriver Write-Host "Install Gecko WebDriver..." -$GeckoDriverPath = "$($env:SystemDrive)\SeleniumWebDrivers\GeckoDriver" -if (-not (Test-Path -Path $GeckoDriverPath)) { - New-Item -Path $GeckoDriverPath -ItemType Directory -Force +$geckoDriverPath = "$($env:SystemDrive)\SeleniumWebDrivers\GeckoDriver" +if (-not (Test-Path -Path $geckoDriverPath)) { + New-Item -Path $geckoDriverPath -ItemType Directory -Force } Write-Host "Get the Gecko WebDriver version..." -$GeckoDriverVersion = (Get-GithubReleasesByVersion -Repo "mozilla/geckodriver" -Version "latest").version -$GeckoDriverVersion | Out-File -FilePath "$GeckoDriverPath\versioninfo.txt" -Force +$geckoDriverVersion = (Get-GithubReleasesByVersion -Repo "mozilla/geckodriver" -Version "latest").version +$geckoDriverVersion | Out-File -FilePath "$geckoDriverPath\versioninfo.txt" -Force Write-Host "Download Gecko WebDriver WebDriver..." -$GeckoDriverDownloadUrl = Resolve-GithubReleaseAssetUrl ` +$geckoDriverDownloadUrl = Resolve-GithubReleaseAssetUrl ` -Repo "mozilla/geckodriver" ` - -Version $GeckoDriverVersion ` + -Version $geckoDriverVersion ` -UrlMatchPattern "geckodriver-*-win64.zip" -$GeckoDriverArchPath = Invoke-DownloadWithRetry $GeckoDriverDownloadUrl +$geckoDriverArchPath = Invoke-DownloadWithRetry $geckoDriverDownloadUrl Write-Host "Expand Gecko WebDriver archive..." -Expand-7ZipArchive -Path $GeckoDriverArchPath -DestinationPath $GeckoDriverPath +Expand-7ZipArchive -Path $geckoDriverArchPath -DestinationPath $geckoDriverPath # Validate Gecko WebDriver signature -$GeckoDriverSignatureThumbprint = "1326B39C3D5D2CA012F66FB439026F7B59CB1974" -Test-FileSignature -Path "$GeckoDriverPath/geckodriver.exe" -ExpectedThumbprint $GeckoDriverSignatureThumbprint +$geckoDriverSignatureThumbprint = "1326B39C3D5D2CA012F66FB439026F7B59CB1974" +Test-FileSignature -Path "$geckoDriverPath/geckodriver.exe" -ExpectedThumbprint $geckoDriverSignatureThumbprint Write-Host "Setting the environment variables..." -Add-MachinePathItem -PathItem $GeckoDriverPath -[Environment]::SetEnvironmentVariable("GeckoWebDriver", $GeckoDriverPath, "Machine") +Add-MachinePathItem -PathItem $geckoDriverPath +[Environment]::SetEnvironmentVariable("GeckoWebDriver", $geckoDriverPath, "Machine") Invoke-PesterTests -TestFile "Browsers" -TestName "Firefox" diff --git a/images/windows/scripts/build/Install-Git.ps1 b/images/windows/scripts/build/Install-Git.ps1 index 1d21869461ac..21648cef4ba4 100644 --- a/images/windows/scripts/build/Install-Git.ps1 +++ b/images/windows/scripts/build/Install-Git.ps1 @@ -35,6 +35,9 @@ Install-Binary ` Update-Environment git config --system --add safe.directory "*" +if ($LASTEXITCODE -ne 0) { + Write-Error "Failed to configure safe.directory for Git with exit code $LASTEXITCODE" +} # Disable GCM machine-wide [Environment]::SetEnvironmentVariable("GCM_INTERACTIVE", "Never", "Machine") diff --git a/images/windows/scripts/build/Install-Haskell.ps1 b/images/windows/scripts/build/Install-Haskell.ps1 index 583c89ebf6fd..c354b40ba2ea 100644 --- a/images/windows/scripts/build/Install-Haskell.ps1 +++ b/images/windows/scripts/build/Install-Haskell.ps1 @@ -30,23 +30,35 @@ Add-MachinePathItem "$cabalDir\bin" Update-Environment # Get 3 latest versions of GHC -$Versions = ghcup list -t ghc -r | Where-Object {$_ -notlike "prerelease"} -$VersionsOutput = [Version[]]($Versions | ForEach-Object{ $_.Split(' ')[1]; }) -$LatestMajorMinor = $VersionsOutput | Group-Object { $_.ToString(2) } | Sort-Object { [Version] $_.Name } | Select-Object -last 3 -$VersionsList = $LatestMajorMinor | ForEach-Object { $_.Group | Select-Object -Last 1 } | Sort-Object +$versions = ghcup list -t ghc -r | Where-Object { $_ -notlike "prerelease" } +$versionsOutput = [version[]]($versions | ForEach-Object { $_.Split(' ')[1]; }) +$latestMajorMinor = $versionsOutput | Group-Object { $_.ToString(2) } | Sort-Object { [Version] $_.Name } | Select-Object -last 3 +$versionsList = $latestMajorMinor | ForEach-Object { $_.Group | Select-Object -Last 1 } | Sort-Object # The latest version will be installed as a default -foreach ($version in $VersionsList) { +foreach ($version in $versionsList) { Write-Host "Installing ghc $version..." ghcup install ghc $version + if ($LastExitCode -ne 0) { + throw "GHC installation failed with exit code $LastExitCode" + } ghcup set ghc $version + if ($LastExitCode -ne 0) { + throw "Setting GHC version failed with exit code $LastExitCode" + } } # Add default version of GHC to path -$DefaultGhcVersion = $VersionsList | Select-Object -Last 1 -ghcup set ghc $DefaultGhcVersion +$defaultGhcVersion = $versionsList | Select-Object -Last 1 +ghcup set ghc $defaultGhcVersion +if ($LastExitCode -ne 0) { + throw "Setting default GHC version failed with exit code $LastExitCode" +} Write-Host 'Installing cabal...' ghcup install cabal latest +if ($LastExitCode -ne 0) { + throw "Cabal installation failed with exit code $LastExitCode" +} Invoke-PesterTests -TestFile 'Haskell' diff --git a/images/windows/scripts/build/Install-Miniconda.ps1 b/images/windows/scripts/build/Install-Miniconda.ps1 index 50382efd3a11..f2fec5316b47 100644 --- a/images/windows/scripts/build/Install-Miniconda.ps1 +++ b/images/windows/scripts/build/Install-Miniconda.ps1 @@ -4,29 +4,29 @@ ## Supply chain security: checksum validation ################################################################################ -$CondaDestination = "C:\Miniconda" -$InstallerName = "Miniconda3-latest-Windows-x86_64.exe" +$condaDestination = "C:\Miniconda" +$installerName = "Miniconda3-latest-Windows-x86_64.exe" #region Supply chain security $distributorFileHash = $null $checksums = (Invoke-RestMethod -Uri 'https://repo.anaconda.com/miniconda/' | ConvertFrom-HTML).SelectNodes('//html/body/table/tr') foreach ($node in $checksums) { - if ($node.ChildNodes[1].InnerText -eq $InstallerName) { + if ($node.ChildNodes[1].InnerText -eq $installerName) { $distributorFileHash = $node.ChildNodes[7].InnerText } } if ($null -eq $distributorFileHash) { - throw "Unable to find checksum for $InstallerName in https://repo.anaconda.com/miniconda/" + throw "Unable to find checksum for $installerName in https://repo.anaconda.com/miniconda/" } #endregion Install-Binary ` - -Url "https://repo.anaconda.com/miniconda/${InstallerName}" ` - -InstallArgs @("/S", "/AddToPath=0", "/RegisterPython=0", "/D=$CondaDestination") ` + -Url "https://repo.anaconda.com/miniconda/${installerName}" ` + -InstallArgs @("/S", "/AddToPath=0", "/RegisterPython=0", "/D=$condaDestination") ` -ExpectedSHA256Sum $distributorFileHash -[Environment]::SetEnvironmentVariable("CONDA", $CondaDestination, "Machine") +[Environment]::SetEnvironmentVariable("CONDA", $condaDestination, "Machine") Invoke-PesterTests -TestFile "Miniconda" diff --git a/images/windows/scripts/build/Install-MongoDB.ps1 b/images/windows/scripts/build/Install-MongoDB.ps1 index e9725715250b..d38b87df82cb 100644 --- a/images/windows/scripts/build/Install-MongoDB.ps1 +++ b/images/windows/scripts/build/Install-MongoDB.ps1 @@ -4,26 +4,27 @@ #################################################################################### # Install mongodb package -$toolsetVersion = (Get-ToolsetContent).mongodb.version +$toolsetContent = Get-ToolsetContent +$toolsetVersion = $toolsetContent.mongodb.version $getMongoReleases = Invoke-WebRequest -Uri "mongodb.com/docs/manual/release-notes/$toolsetVersion/" -UseBasicParsing -$TargetReleases = $getMongoReleases.Links.href | Where-Object {$_ -like "#$toolsetVersion*---*"} +$targetReleases = $getMongoReleases.Links.href | Where-Object { $_ -like "#$toolsetVersion*---*" } -$MinorVersions = @() -foreach ($release in $TargetReleases) { +$minorVersions = @() +foreach ($release in $targetReleases) { if ($release -notlike "*upcoming*") { $pattern = '\d+\.\d+\.\d+' $version = $release | Select-String -Pattern $pattern -AllMatches | ForEach-Object { $_.Matches } | ForEach-Object { $_.Value } - $MinorVersions += $version + $minorVersions += $version } } -$LatestVersion = $MinorVersions[0] +$latestVersion = $minorVersions[0] Install-Binary ` - -Url "https://fastdl.mongodb.org/windows/mongodb-windows-x86_64-$LatestVersion-signed.msi" ` + -Url "https://fastdl.mongodb.org/windows/mongodb-windows-x86_64-$latestVersion-signed.msi" ` -ExtraInstallArgs @('TARGETDIR=C:\PROGRA~1\MongoDB ADDLOCAL=ALL') ` - -ExpectedSignature (Get-ToolsetContent).mongodb.signature + -ExpectedSignature $toolsetContent.mongodb.signature # Add mongodb to the PATH $mongoPath = (Get-CimInstance Win32_Service -Filter "Name LIKE 'mongodb'").PathName diff --git a/images/windows/scripts/build/Install-Msys2.ps1 b/images/windows/scripts/build/Install-Msys2.ps1 index 5b167e40d7c6..8d970031a50a 100644 --- a/images/windows/scripts/build/Install-Msys2.ps1 +++ b/images/windows/scripts/build/Install-Msys2.ps1 @@ -7,75 +7,104 @@ # https://github.com/msys2/MINGW-packages/blob/master/azure-pipelines.yml # https://packages.msys2.org/group/ -$dash = "-" * 40 +$logPrefix = "`n" + ("-" * 40) + "`n---" $origPath = $env:PATH function Install-Msys2 { - # We can't use Resolve-GithubReleaseAssetUrl function here - # because msys2-installer releases don't have a consistent versioning scheme + # We can't use Resolve-GithubReleaseAssetUrl function here + # because msys2-installer releases don't have a consistent versioning scheme - $assets = (Invoke-RestMethod -Uri "https://api.github.com/repos/msys2/msys2-installer/releases/latest").assets - $downloadUri = ($assets | Where-Object { $_.name -match "^msys2-x86_64" -and $_.name.EndsWith(".exe") }).browser_download_url - $installerName = Split-Path $downloadUri -Leaf + $assets = (Invoke-RestMethod -Uri "https://api.github.com/repos/msys2/msys2-installer/releases/latest").assets + $downloadUri = ($assets | Where-Object { $_.name -match "^msys2-x86_64" -and $_.name.EndsWith(".exe") }).browser_download_url + $installerName = Split-Path $downloadUri -Leaf - # Download the latest msys2 x86_64, filename includes release date - Write-Host "Download msys2 installer $installerName" - $installerPath = Invoke-DownloadWithRetry $downloadUri - - #region Supply chain security - MSYS2 - $externalHash = Get-ChecksumFromUrl -Type "SHA256" ` - -Url ($downloadUri -replace $installerName, "msys2-checksums.txt") ` - -FileName $installerName - Test-FileChecksum $installerPath -ExpectedSHA256Sum $externalHash - #endregion - - Write-Host "Starting msys2 installation" - & $installerPath in --confirm-command --accept-messages --root C:/msys64 - Remove-Item $installerPath + # Download the latest msys2 x86_64, filename includes release date + Write-Host "Download msys2 installer $installerName" + $installerPath = Invoke-DownloadWithRetry $downloadUri + + #region Supply chain security - MSYS2 + $externalHash = Get-ChecksumFromUrl -Type "SHA256" ` + -Url ($downloadUri -replace $installerName, "msys2-checksums.txt") ` + -FileName $installerName + Test-FileChecksum $installerPath -ExpectedSHA256Sum $externalHash + #endregion + + Write-Host "Starting msys2 installation" + & $installerPath in --confirm-command --accept-messages --root C:/msys64 + if ($LastExitCode -ne 0) { + throw "MSYS2 installation failed with exit code $LastExitCode" + } + Remove-Item $installerPath } -function Install-Msys2Packages($Packages) { - if (-not $Packages) { - return - } - - Write-Host "`n$dash Install msys2 packages" - pacman.exe -S --noconfirm --needed --noprogressbar $Packages - taskkill /f /fi "MODULES eq msys-2.0.dll" - - Write-Host "`n$dash Remove p7zip/7z package due to conflicts" - pacman.exe -R --noconfirm --noprogressbar p7zip +function Install-Msys2Packages { + param ( + [Parameter(Mandatory = $true)] + [AllowEmptyCollection()] + [string[]]$Packages + ) + + if (-not $Packages) { + return + } + + Write-Host "$logPrefix Install msys2 packages" + pacman.exe -S --noconfirm --needed --noprogressbar $Packages + if ($LastExitCode -ne 0) { + throw "MSYS2 packages installation failed with exit code $LastExitCode" + } + taskkill /f /fi "MODULES eq msys-2.0.dll" + + Write-Host "$logPrefix Remove p7zip/7z package due to conflicts" + pacman.exe -R --noconfirm --noprogressbar p7zip + if ($LastExitCode -ne 0) { + throw "Removal of p7zip/7z package failed with exit code $LastExitCode" + } } -function Install-MingwPackages($Packages) { - if (-not $Packages) { - return - } - - Write-Host "`n$dash Install mingw packages" - $archs = $Packages.arch - - foreach ($arch in $archs) { - Write-Host "Installing $arch packages" - $archPackages = $toolsetContent.mingw | Where-Object { $_.arch -eq $arch } - $runtimePackages = $archPackages.runtime_packages.name | ForEach-Object { "${arch}-$_" } - $additionalPackages = $archPackages.additional_packages | ForEach-Object { "${arch}-$_" } - $packagesToInstall = $runtimePackages + $additionalPackages - Write-Host "The following packages will be installed: $packagesToInstall" - pacman.exe -S --noconfirm --needed --noprogressbar $packagesToInstall - } - - # clean all packages to decrease image size - Write-Host "`n$dash Clean packages" - pacman.exe -Scc --noconfirm - - $pkgs = pacman.exe -Q - - foreach ($arch in $archs) - { - Write-Host "`n$dash Installed $arch packages" - $pkgs | grep ^${arch}- - } +function Install-MingwPackages { + param ( + [Parameter(Mandatory = $true)] + [AllowEmptyCollection()] + [object[]] $Packages + ) + + if (-not $Packages) { + return + } + + Write-Host "$logPrefix Install mingw packages" + $archs = $Packages.arch + + foreach ($arch in $archs) { + Write-Host "Installing $arch packages" + $archPackages = $toolsetContent.mingw | Where-Object { $_.arch -eq $arch } + $runtimePackages = $archPackages.runtime_packages.name | ForEach-Object { "${arch}-$_" } + $additionalPackages = $archPackages.additional_packages | ForEach-Object { "${arch}-$_" } + $packagesToInstall = $runtimePackages + $additionalPackages + Write-Host "The following packages will be installed: $packagesToInstall" + pacman.exe -S --noconfirm --needed --noprogressbar $packagesToInstall + if ($LastExitCode -ne 0) { + throw "Installation of $arch packages failed with exit code $LastExitCode" + } + } + + # clean all packages to decrease image size + Write-Host "$logPrefix Clean packages" + pacman.exe -Scc --noconfirm + if ($LastExitCode -ne 0) { + throw "Cleaning of packages failed with exit code $LastExitCode" + } + + $pkgs = pacman.exe -Q + if ($LastExitCode -ne 0) { + throw "Listing of packages failed with exit code $LastExitCode" + } + + foreach ($arch in $archs) { + Write-Host "$logPrefix Installed $arch packages" + $pkgs | Select-String -Pattern "^${arch}-" + } } Install-Msys2 @@ -83,11 +112,18 @@ Install-Msys2 # Add msys2 bin tools folders to PATH temporary $env:PATH = "C:\msys64\mingw64\bin;C:\msys64\usr\bin;$origPath" -Write-Host "`n$dash pacman --noconfirm -Syyuu" +Write-Host "$logPrefix pacman --noconfirm -Syyuu" pacman.exe -Syyuu --noconfirm +if ($LastExitCode -ne 0) { + throw "Updating of packages failed with exit code $LastExitCode" +} taskkill /f /fi "MODULES eq msys-2.0.dll" -Write-Host "`n$dash pacman --noconfirm -Syuu (2nd pass)" -pacman.exe -Syuu --noconfirm + +Write-Host "$logPrefix pacman --noconfirm -Syuu (2nd pass)" +pacman.exe -Syuu --noconfirm +if ($LastExitCode -ne 0) { + throw "Second pass updating of packages failed with exit code $LastExitCode" +} taskkill /f /fi "MODULES eq msys-2.0.dll" $toolsetContent = (Get-ToolsetContent).MsysPackages diff --git a/images/windows/scripts/build/Install-MysqlCli.ps1 b/images/windows/scripts/build/Install-MysqlCli.ps1 index e04f12399f54..cfe5bddb66df 100644 --- a/images/windows/scripts/build/Install-MysqlCli.ps1 +++ b/images/windows/scripts/build/Install-MysqlCli.ps1 @@ -3,33 +3,33 @@ ## Desc: Install Mysql CLI ################################################################################ -# Installing visual c++ redistibutable package. +# Installing visual c++ redistributable package. Install-Binary ` -Url 'https://download.microsoft.com/download/0/5/6/056dcda9-d667-4e27-8001-8a0c6971d6b1/vcredist_x64.exe' ` -InstallArgs @("/install", "/quiet", "/norestart") ` -ExpectedSignature '3BDA323E552DB1FDE5F4FBEE75D6D5B2B187EEDC' # Downloading mysql -[version] $MysqlVersion = (Get-ToolsetContent).mysql.version -$MysqlVersionMajorMinor = $MysqlVersion.ToString(2) - -if ($MysqlVersion.Build -lt 0) { - $downloadsPageUrl = "https://dev.mysql.com/downloads/mysql/${MysqlVersionMajorMinor}.html" - $MysqlVersion = Invoke-RestMethod -Uri $downloadsPageUrl -Headers @{ 'User-Agent' = 'curl/8.4.0' } ` - | Select-String -Pattern "${MysqlVersionMajorMinor}\.\d+" ` - | ForEach-Object { $_.Matches.Value } +[version] $mysqlVersion = (Get-ToolsetContent).mysql.version +$mysqlVersionMajorMinor = $mysqlVersion.ToString(2) + +if ($mysqlVersion.Build -lt 0) { + $downloadsPageUrl = "https://dev.mysql.com/downloads/mysql/${mysqlVersionMajorMinor}.html" + $mysqlVersion = Invoke-RestMethod -Uri $downloadsPageUrl -Headers @{ 'User-Agent' = 'curl/8.4.0' } ` + | Select-String -Pattern "${mysqlVersionMajorMinor}\.\d+" ` + | ForEach-Object { $_.Matches.Value } } -$MysqlVersionFull = $MysqlVersion.ToString() -$MysqlVersionUrl = "https://cdn.mysql.com/Downloads/MySQL-${MysqlVersionMajorMinor}/mysql-${MysqlVersionFull}-winx64.msi" +$mysqlVersionFull = $mysqlVersion.ToString() +$mysqlVersionUrl = "https://cdn.mysql.com/Downloads/MySQL-${mysqlVersionMajorMinor}/mysql-${mysqlVersionFull}-winx64.msi" Install-Binary ` - -Url $MysqlVersionUrl ` + -Url $mysqlVersionUrl ` -ExpectedSignature (Get-ToolsetContent).mysql.signature # Adding mysql in system environment path -$MysqlPath = $(Get-ChildItem -Path "C:\PROGRA~1\MySQL" -Directory)[0].FullName +$mysqlPath = $(Get-ChildItem -Path "C:\PROGRA~1\MySQL" -Directory)[0].FullName -Add-MachinePathItem "${MysqlPath}\bin" +Add-MachinePathItem "${mysqlPath}\bin" Invoke-PesterTests -TestFile "Databases" -TestName "MySQL" diff --git a/images/windows/scripts/build/Install-NET48-devpack.ps1 b/images/windows/scripts/build/Install-NET48-devpack.ps1 index d1593161582e..b747d2014b60 100644 --- a/images/windows/scripts/build/Install-NET48-devpack.ps1 +++ b/images/windows/scripts/build/Install-NET48-devpack.ps1 @@ -5,8 +5,8 @@ # .NET 4.8 Dev pack Install-Binary ` - -Url 'https://download.visualstudio.microsoft.com/download/pr/014120d7-d689-4305-befd-3cb711108212/0307177e14752e359fde5423ab583e43/ndp48-devpack-enu.exe' ` - -InstallArgs @("Setup", "/passive", "/norestart") ` - -ExpectedSignature 'C82273A065EC470FB1EBDE846A91E6FFB29E9C12' + -Url 'https://download.visualstudio.microsoft.com/download/pr/014120d7-d689-4305-befd-3cb711108212/0307177e14752e359fde5423ab583e43/ndp48-devpack-enu.exe' ` + -InstallArgs @("Setup", "/passive", "/norestart") ` + -ExpectedSignature 'C82273A065EC470FB1EBDE846A91E6FFB29E9C12' Invoke-PesterTests -TestFile "Tools" -TestName "NET48" diff --git a/images/windows/scripts/build/Install-NET48.ps1 b/images/windows/scripts/build/Install-NET48.ps1 index c9776cd2657f..6c0a11e80172 100644 --- a/images/windows/scripts/build/Install-NET48.ps1 +++ b/images/windows/scripts/build/Install-NET48.ps1 @@ -5,6 +5,6 @@ # .NET 4.8 Dev pack Install-Binary ` - -Url 'https://download.visualstudio.microsoft.com/download/pr/2d6bb6b2-226a-4baa-bdec-798822606ff1/8494001c276a4b96804cde7829c04d7f/ndp48-x86-x64-allos-enu.exe' ` - -InstallArgs @("Setup", "/passive", "/norestart") ` - -ExpectedSignature 'ABDCA79AF9DD48A0EA702AD45260B3C03093FB4B' + -Url 'https://download.visualstudio.microsoft.com/download/pr/2d6bb6b2-226a-4baa-bdec-798822606ff1/8494001c276a4b96804cde7829c04d7f/ndp48-x86-x64-allos-enu.exe' ` + -InstallArgs @("Setup", "/passive", "/norestart") ` + -ExpectedSignature 'ABDCA79AF9DD48A0EA702AD45260B3C03093FB4B' diff --git a/images/windows/scripts/build/Install-NSIS.ps1 b/images/windows/scripts/build/Install-NSIS.ps1 index 745c0004288b..bb03ed2f7429 100644 --- a/images/windows/scripts/build/Install-NSIS.ps1 +++ b/images/windows/scripts/build/Install-NSIS.ps1 @@ -4,9 +4,9 @@ ## Supply chain security: NSIS - managed by package manager ################################################################################ -$NsisVersion = (Get-ToolsetContent).nsis.version +$nsisVersion = (Get-ToolsetContent).nsis.version -Install-ChocoPackage nsis -ArgumentList "--version", "$NsisVersion" +Install-ChocoPackage nsis -ArgumentList "--version", "$nsisVersion" Add-MachinePathItem "${env:ProgramFiles(x86)}\NSIS\" Update-Environment diff --git a/images/windows/scripts/build/Install-NativeImages.ps1 b/images/windows/scripts/build/Install-NativeImages.ps1 index 7a11c4953e1d..214a9577a67b 100644 --- a/images/windows/scripts/build/Install-NativeImages.ps1 +++ b/images/windows/scripts/build/Install-NativeImages.ps1 @@ -3,9 +3,20 @@ ## Desc: Generate and install native images for .NET assemblies ################################################################################ -Write-Host "NGen: Microsoft.PowerShell.Utility.Activities" -$null = & $env:SystemRoot\Microsoft.NET\Framework64\v4.0.30319\ngen.exe install "Microsoft.PowerShell.Utility.Activities, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" -Write-Host "NGen: Framework64" -$null = & $env:SystemRoot\Microsoft.NET\Framework64\v4.0.30319\ngen.exe update -Write-Host "NGen: Framework" -$null = & $env:SystemRoot\Microsoft.NET\Framework\v4.0.30319\ngen.exe update +Write-Host "NGen: install Microsoft.PowerShell.Utility.Activities..." +& $env:SystemRoot\Microsoft.NET\Framework64\v4.0.30319\ngen.exe install "Microsoft.PowerShell.Utility.Activities, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" | Out-Null +if ($LASTEXITCODE -ne 0) { + throw "Installation of Microsoft.PowerShell.Utility.Activities failed with exit code $LASTEXITCODE" +} + +Write-Host "NGen: update x64 native images..." +& $env:SystemRoot\Microsoft.NET\Framework64\v4.0.30319\ngen.exe update | Out-Null +if ($LASTEXITCODE -ne 0) { + throw "Update of x64 native images failed with exit code $LASTEXITCODE" +} + +Write-Host "NGen: update x86 native images..." +& $env:SystemRoot\Microsoft.NET\Framework\v4.0.30319\ngen.exe update | Out-Null +if ($LASTEXITCODE -ne 0) { + throw "Update of x86 native images failed with exit code $LASTEXITCODE" +} diff --git a/images/windows/scripts/build/Install-NodeJS.ps1 b/images/windows/scripts/build/Install-NodeJS.ps1 index f32b425ec740..05809a16fb9b 100644 --- a/images/windows/scripts/build/Install-NodeJS.ps1 +++ b/images/windows/scripts/build/Install-NodeJS.ps1 @@ -4,24 +4,24 @@ ## Must run after python is configured ################################################################################ -$PrefixPath = 'C:\npm\prefix' -$CachePath = 'C:\npm\cache' +$prefixPath = 'C:\npm\prefix' +$cachePath = 'C:\npm\cache' -New-Item -Path $PrefixPath -Force -ItemType Directory -New-Item -Path $CachePath -Force -ItemType Directory +New-Item -Path $prefixPath -Force -ItemType Directory +New-Item -Path $cachePath -Force -ItemType Directory $defaultVersion = (Get-ToolsetContent).node.default $versionToInstall = Resolve-ChocoPackageVersion -PackageName "nodejs" -TargetVersion $defaultVersion -Install-ChocoPackage nodejs -ArgumentList "--version=$versionToInstall" +Install-ChocoPackage "nodejs" -ArgumentList "--version=$versionToInstall" -Add-MachinePathItem $PrefixPath +Add-MachinePathItem $prefixPath Update-Environment -[Environment]::SetEnvironmentVariable("npm_config_prefix", $PrefixPath, "Machine") -$env:npm_config_prefix = $PrefixPath +[Environment]::SetEnvironmentVariable("npm_config_prefix", $prefixPath, "Machine") +$env:npm_config_prefix = $prefixPath -npm config set cache $CachePath --global +npm config set cache $cachePath --global npm config set registry https://registry.npmjs.org/ $globalNpmPackages = (Get-ToolsetContent).npm.global_packages diff --git a/images/windows/scripts/build/Install-OpenSSL.ps1 b/images/windows/scripts/build/Install-OpenSSL.ps1 index c229b3754a63..6b60acf8de46 100644 --- a/images/windows/scripts/build/Install-OpenSSL.ps1 +++ b/images/windows/scripts/build/Install-OpenSSL.ps1 @@ -9,7 +9,7 @@ $bits = '64' $light = $false $installerType = "exe" $version = (Get-ToolsetContent).openssl.version -$installDir = "$Env:ProgramFiles\OpenSSL" +$installDir = "$env:ProgramFiles\OpenSSL" # Fetch available installers list $jsonUrl = 'https://raw.githubusercontent.com/slproweb/opensslhashes/master/win32_openssl_hashes.json' diff --git a/images/windows/scripts/build/Install-Pipx.ps1 b/images/windows/scripts/build/Install-Pipx.ps1 index 64018fbb9b39..41e97677124a 100644 --- a/images/windows/scripts/build/Install-Pipx.ps1 +++ b/images/windows/scripts/build/Install-Pipx.ps1 @@ -8,6 +8,9 @@ $env:PIPX_BIN_DIR = "${env:ProgramFiles(x86)}\pipx_bin" $env:PIPX_HOME = "${env:ProgramFiles(x86)}\pipx" pip install pipx +if ($LASTEXITCODE -ne 0) { + throw "pipx installation failed with exit code $LASTEXITCODE" +} Add-MachinePathItem "${env:PIPX_BIN_DIR}" [Environment]::SetEnvironmentVariable("PIPX_BIN_DIR", $env:PIPX_BIN_DIR, "Machine") @@ -19,14 +22,18 @@ Write-Host "Installing pipx packages..." $pipxToolset = (Get-ToolsetContent).pipx foreach ($tool in $pipxToolset) { - if ($tool.python) { - $pythonPath = (Get-Item -Path "${env:AGENT_TOOLSDIRECTORY}\Python\${tool.python}.*\x64\python-${tool.python}*").FullName - Write-Host "Install ${tool.package} into python ${tool.python}" - pipx install $tool.package --python $pythonPath - } else { - Write-Host "Install ${tool.package} into default python" - pipx install $tool.package - } + if ($tool.python) { + $pythonPath = (Get-Item -Path "${env:AGENT_TOOLSDIRECTORY}\Python\${tool.python}.*\x64\python-${tool.python}*").FullName + Write-Host "Install ${tool.package} into python ${tool.python}" + pipx install $tool.package --python $pythonPath + } else { + Write-Host "Install ${tool.package} into default python" + pipx install $tool.package + } + + if ($LASTEXITCODE -ne 0) { + throw "Package ${tool.package} installation failed with exit code $LASTEXITCODE" + } } Invoke-PesterTests -TestFile "PipxPackages" diff --git a/images/windows/scripts/build/Install-PostgreSQL.ps1 b/images/windows/scripts/build/Install-PostgreSQL.ps1 index e9223fae92af..3b7af44d3383 100644 --- a/images/windows/scripts/build/Install-PostgreSQL.ps1 +++ b/images/windows/scripts/build/Install-PostgreSQL.ps1 @@ -1,3 +1,8 @@ +################################################################################ +## File: Install-PostgreSQL.ps1 +## Desc: Install PostgreSQL +################################################################################ + # Define user and password for PostgreSQL database $pgUser = "postgres" $pgPwd = "root" @@ -10,47 +15,47 @@ $pgPwd = "root" $toolsetVersion = (Get-ToolsetContent).postgresql.version $getPostgreReleases = Invoke-WebRequest -Uri "https://git.postgresql.org/gitweb/?p=postgresql.git;a=tags" -UseBasicParsing # Getting all links matched to the pattern (e.g.a=log;h=refs/tags/REL_14) -$TargetReleases = $getPostgreReleases.Links.href | Where-Object { $_ -match "a=log;h=refs/tags/REL_$toolsetVersion" } -[Int32] $OutNumber = $null -$MinorVersions = @() -foreach ($release in $TargetReleases) { +$targetReleases = $getPostgreReleases.Links.href | Where-Object { $_ -match "a=log;h=refs/tags/REL_$toolsetVersion" } +[Int32] $outNumber = $null +$minorVersions = @() +foreach ($release in $targetReleases) { $version = $release.split('/')[-1] - # Checking if the latest symbol of the release version is actually a number. If yes, add to $MinorVersions array - if ([Int32]::TryParse($($version.Split('_')[-1]), [ref] $OutNumber)) { - $MinorVersions += $OutNumber + # Checking if the latest symbol of the release version is actually a number. If yes, add to $minorVersions array + if ([Int32]::TryParse($($version.Split('_')[-1]), [ref] $outNumber)) { + $minorVersions += $outNumber } } # Sorting and getting the last one -$TargetMinorVersions = ($MinorVersions | Sort-Object)[-1] +$targetMinorVersions = ($minorVersions | Sort-Object)[-1] # Install latest PostgreSQL # In order to get rid of error messages (we know we will have them), force ErrorAction to SilentlyContinue -$ErrorActionOldValue = $ErrorActionPreference +$errorActionOldValue = $ErrorActionPreference $ErrorActionPreference = 'SilentlyContinue' # Starting from number 9 and going down, check if the installer is available. If yes, break the loop. -# If an installer with $TargetMinorVersions is not to be found, the $TargetMinorVersions will be decreased by 1 +# If an installer with $targetMinorVersions is not to be found, the $targetMinorVersions will be decreased by 1 $increment = 9 do { - $url = "https://get.enterprisedb.com/postgresql/postgresql-$toolsetVersion.$TargetMinorVersions-$increment-windows-x64.exe" - $checkaccess = [System.Net.WebRequest]::Create($url) + $url = "https://get.enterprisedb.com/postgresql/postgresql-$toolsetVersion.$targetMinorVersions-$increment-windows-x64.exe" + $checkAccess = [System.Net.WebRequest]::Create($url) $response = $null - $response = $checkaccess.GetResponse() + $response = $checkAccess.GetResponse() if ($response) { - $InstallerUrl = $response.ResponseUri.OriginalString + $installerUrl = $response.ResponseUri.OriginalString } elseif (!$response -and ($increment -eq 0)) { $increment = 9 - $TargetMinorVersions-- + $targetMinorVersions-- } else { $increment-- } } while (!$response) # Return the previous value of ErrorAction and invoke Install-Binary function -$ErrorActionPreference = $ErrorActionOldValue -$InstallerArgs = @("--install_runtimes 0", "--superpassword root", "--enable_acledit 1", "--unattendedmodeui none", "--mode unattended") +$ErrorActionPreference = $errorActionOldValue +$installerArgs = @("--install_runtimes 0", "--superpassword root", "--enable_acledit 1", "--unattendedmodeui none", "--mode unattended") Install-Binary ` - -Url $InstallerUrl ` - -InstallArgs $InstallerArgs ` + -Url $installerUrl ` + -InstallArgs $installerArgs ` -ExpectedSignature (Get-ToolsetContent).postgresql.signature # Get Path to pg_ctl.exe diff --git a/images/windows/scripts/build/Install-PowershellAzModules.ps1 b/images/windows/scripts/build/Install-PowershellAzModules.ps1 index d297cddf1293..88da09b53ea4 100644 --- a/images/windows/scripts/build/Install-PowershellAzModules.ps1 +++ b/images/windows/scripts/build/Install-PowershellAzModules.ps1 @@ -8,7 +8,7 @@ $installPSModulePath = "C:\\Modules" if (-not (Test-Path -LiteralPath $installPSModulePath)) { Write-Host "Creating ${installPSModulePath} folder to store PowerShell Azure modules..." - $null = New-Item -Path $installPSModulePath -ItemType Directory + New-Item -Path $installPSModulePath -ItemType Directory | Out-Null } # Get modules content from toolset diff --git a/images/windows/scripts/build/Install-PowershellCore.ps1 b/images/windows/scripts/build/Install-PowershellCore.ps1 index d56c9bf30b9b..d14d0e30e56f 100644 --- a/images/windows/scripts/build/Install-PowershellCore.ps1 +++ b/images/windows/scripts/build/Install-PowershellCore.ps1 @@ -7,7 +7,7 @@ $ErrorActionPreference = "Stop" $tempDir = Join-Path ([System.IO.Path]::GetTempPath()) ([System.IO.Path]::GetRandomFileName()) -$null = New-Item -ItemType Directory -Path $tempDir -Force -ErrorAction SilentlyContinue +New-Item -ItemType Directory -Path $tempDir -Force -ErrorAction SilentlyContinue | Out-Null try { $originalValue = [Net.ServicePointManager]::SecurityProtocol [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12 diff --git a/images/windows/scripts/build/Install-PyPy.ps1 b/images/windows/scripts/build/Install-PyPy.ps1 index d0ae9fb2a916..c1d5d9df6946 100644 --- a/images/windows/scripts/build/Install-PyPy.ps1 +++ b/images/windows/scripts/build/Install-PyPy.ps1 @@ -4,8 +4,7 @@ ## Supply chain security: checksum validation ################################################################################ -function Install-PyPy -{ +function Install-PyPy { param( [String] $PackagePath, [String] $Architecture @@ -31,8 +30,7 @@ function Install-PyPy Write-Host "Put '$pypyFullVersion' to PYPY_VERSION file" New-Item -Path "$tempFolder\PYPY_VERSION" -Value $pypyFullVersion | Out-Null - if ($pythonVersion) - { + if ($pythonVersion) { Write-Host "Installing PyPy $pythonVersion" $pypyVersionPath = Join-Path -Path $pypyToolcachePath -ChildPath $pythonVersion $pypyArchPath = Join-Path -Path $pypyVersionPath -ChildPath $architecture @@ -55,25 +53,19 @@ function Install-PyPy # Create pip.exe if missing $pipPath = Join-Path -Path $pypyArchPath -ChildPath "Scripts/pip.exe" - if (-not (Test-Path $pipPath)) - { + if (-not (Test-Path $pipPath)) { $pip3Path = Join-Path -Path $pypyArchPath -ChildPath "Scripts/pip3.exe" Copy-Item -Path $pip3Path -Destination $pipPath } - if ($LASTEXITCODE -ne 0) - { - Throw "Error happened during PyPy installation" - exit 1 + if ($LASTEXITCODE -ne 0) { + throw "PyPy installation failed with exit code $LASTEXITCODE" } Write-Host "Create complete file" New-Item -ItemType File -Path $pypyVersionPath -Name "$architecture.complete" | Out-Null - } - else - { - Write-Host "PyPy application is not found. Failed to expand '$packagePath' archive" - exit 1 + } else { + throw "PyPy application is not found. Failed to expand '$packagePath' archive" } } @@ -86,36 +78,31 @@ $pypyVersions = Invoke-RestMethod https://downloads.python.org/pypy/versions.jso # required for html parsing $checksums = (Invoke-RestMethod -Uri 'https://www.pypy.org/checksums.html' | ConvertFrom-HTML).SelectNodes('//*[@id="content"]/article/div/pre') -Write-Host "Starting installation PyPy..." -foreach($toolsetVersion in $toolsetVersions.versions) -{ +Write-Host "Start PyPy installation" +foreach ($toolsetVersion in $toolsetVersions.versions) { # Query latest PyPy version $latestMajorPyPyVersion = $pypyVersions | - Where-Object {$_.python_version.StartsWith("$toolsetVersion") -and $_.stable -eq $true} | + Where-Object { $_.python_version.StartsWith("$toolsetVersion") -and $_.stable -eq $true } | Select-Object -ExpandProperty files -First 1 | Where-Object platform -like "win*" - if ($latestMajorPyPyVersion) - { - $filename = $latestMajorPyPyVersion.filename - Write-Host "Found PyPy '$filename' package" - $tempPyPyPackagePath = Invoke-DownloadWithRetry $latestMajorPyPyVersion.download_url - - #region Supply chain security - $distributorFileHash = $null - foreach ($node in $checksums) { - if ($node.InnerText -ilike "*${filename}*") { - $distributorFileHash = $node.InnerText.ToString().Split("`n").Where({ $_ -ilike "*${filename}*" }).Split(' ')[0] - } - } - Test-FileChecksum $tempPyPyPackagePath -ExpectedSHA256Sum $distributorFileHash - #endregion - - Install-PyPy -PackagePath $tempPyPyPackagePath -Architecture $toolsetVersions.arch + if (-not $latestMajorPyPyVersion) { + throw "Failed to query PyPy version '$toolsetVersion'" } - else - { - Write-Host "Failed to query PyPy version '$toolsetVersion'" - exit 1 + + $filename = $latestMajorPyPyVersion.filename + Write-Host "Found PyPy '$filename' package" + $tempPyPyPackagePath = Invoke-DownloadWithRetry $latestMajorPyPyVersion.download_url + + #region Supply chain security + $distributorFileHash = $null + foreach ($node in $checksums) { + if ($node.InnerText -ilike "*${filename}*") { + $distributorFileHash = $node.InnerText.ToString().Split("`n").Where({ $_ -ilike "*${filename}*" }).Split(' ')[0] + } } + Test-FileChecksum $tempPyPyPackagePath -ExpectedSHA256Sum $distributorFileHash + #endregion + + Install-PyPy -PackagePath $tempPyPyPackagePath -Architecture $toolsetVersions.arch } diff --git a/images/windows/scripts/build/Install-RootCA.ps1 b/images/windows/scripts/build/Install-RootCA.ps1 index d536fe9e8449..4bdb6bc08b58 100644 --- a/images/windows/scripts/build/Install-RootCA.ps1 +++ b/images/windows/scripts/build/Install-RootCA.ps1 @@ -1,3 +1,8 @@ +################################################################################ +## File: Install-RootCA.ps1 +## Desc: Install Root CA certificates +################################################################################ + # https://www.sysadmins.lv/blog-en/how-to-retrieve-certificate-purposes-property-with-cryptoapi-and-powershell.aspx # https://www.sysadmins.lv/blog-en/dump-authroot-and-disallowed-certificates-with-powershell.aspx # https://www.sysadmins.lv/blog-en/constraining-extended-key-usages-in-microsoft-windows.aspx @@ -26,7 +31,7 @@ function Add-ExtendedCertType { function Get-CertificatesWithoutPropId { # List installed certificates - $certs = Get-ChildItem -Path Cert:\LocalMachine\Root + $certs = Get-ChildItem -Path "Cert:\LocalMachine\Root" Write-Host "Certificates without CERT_NOT_BEFORE_FILETIME_PROP_ID property" $certsWithoutPropId = @{} @@ -65,12 +70,7 @@ function Import-SSTFromWU { exit $LASTEXITCODE } - try { - Import-Certificate -FilePath $sstFile -CertStoreLocation Cert:\LocalMachine\Root - } catch { - Write-Host "[Error]: failed to import ROOT CA`n$_" - exit 1 - } + Import-Certificate -FilePath $sstFile -CertStoreLocation Cert:\LocalMachine\Root } function Clear-CertificatesPropId { diff --git a/images/windows/scripts/build/Install-Rust.ps1 b/images/windows/scripts/build/Install-Rust.ps1 index b254f9a0727e..f388ca09005f 100644 --- a/images/windows/scripts/build/Install-Rust.ps1 +++ b/images/windows/scripts/build/Install-Rust.ps1 @@ -19,6 +19,9 @@ Test-FileChecksum $rustupPath -ExpectedSHA256Sum $distributorFileHash # Install Rust by running rustup-init.exe (disabling the confirmation prompt with -y) & $rustupPath -y --default-toolchain=stable --profile=minimal +if ($LASTEXITCODE -ne 0) { + throw "Rust installation failed with exit code $LASTEXITCODE" +} # Add %USERPROFILE%\.cargo\bin to USER PATH Add-DefaultPathItem "%USERPROFILE%\.cargo\bin" @@ -33,7 +36,14 @@ rustup target add x86_64-pc-windows-gnu # Install common tools rustup component add rustfmt clippy +if ($LASTEXITCODE -ne 0) { + throw "Rust component installation failed with exit code $LASTEXITCODE" +} + cargo install --locked bindgen-cli cbindgen cargo-audit cargo-outdated +if ($LASTEXITCODE -ne 0) { + throw "Rust tools installation failed with exit code $LASTEXITCODE" +} # Cleanup Cargo crates cache Remove-Item "${env:CARGO_HOME}\registry\*" -Recurse -Force diff --git a/images/windows/scripts/build/Install-Stack.ps1 b/images/windows/scripts/build/Install-Stack.ps1 index 3e4ad3fc9e63..242393781937 100644 --- a/images/windows/scripts/build/Install-Stack.ps1 +++ b/images/windows/scripts/build/Install-Stack.ps1 @@ -14,22 +14,22 @@ $downloadUrl = Resolve-GithubReleaseAssetUrl ` -UrlMatchPattern "stack-*-windows-x86_64.zip" Write-Host "Download stack archive" -$StackToolcachePath = Join-Path $Env:AGENT_TOOLSDIRECTORY "stack\$version" -$DestinationPath = Join-Path $StackToolcachePath "x64" -$StackArchivePath = Invoke-DownloadWithRetry $downloadUrl +$stackToolcachePath = Join-Path $env:AGENT_TOOLSDIRECTORY "stack\$version" +$destinationPath = Join-Path $stackToolcachePath "x64" +$stackArchivePath = Invoke-DownloadWithRetry $downloadUrl #region Supply chain security - Stack $externalHash = Get-ChecksumFromUrl -Type "SHA256" ` -Url "$downloadUrl.sha256" ` -FileName (Split-Path $downloadUrl -Leaf) -Test-FileChecksum $StackArchivePath -ExpectedSHA256Sum $externalHash +Test-FileChecksum $stackArchivePath -ExpectedSHA256Sum $externalHash #endregion Write-Host "Expand stack archive" -Expand-7ZipArchive -Path $StackArchivePath -DestinationPath $DestinationPath +Expand-7ZipArchive -Path $stackArchivePath -DestinationPath $destinationPath -New-Item -Name "x64.complete" -Path $StackToolcachePath +New-Item -Name "x64.complete" -Path $stackToolcachePath -Add-MachinePathItem -PathItem $DestinationPath +Add-MachinePathItem -PathItem $destinationPath Invoke-PesterTests -TestFile "Tools" -TestName "Stack" diff --git a/images/windows/scripts/build/Install-Toolset.ps1 b/images/windows/scripts/build/Install-Toolset.ps1 index 7993b0976e5e..aab98f936b0b 100644 --- a/images/windows/scripts/build/Install-Toolset.ps1 +++ b/images/windows/scripts/build/Install-Toolset.ps1 @@ -32,9 +32,8 @@ Function Install-Asset { } # Get toolcache content from toolset -$ToolsToInstall = @("Python", "Node", "Go") - -$tools = Get-ToolsetContent | Select-Object -ExpandProperty toolcache | Where-Object { $ToolsToInstall -contains $_.Name } +$toolsToInstall = @("Python", "Node", "Go") +$tools = Get-ToolsetContent | Select-Object -ExpandProperty toolcache | Where-Object { $toolsToInstall -contains $_.Name } foreach ($tool in $tools) { # Get versions manifest for current tool diff --git a/images/windows/scripts/build/Install-Vcpkg.ps1 b/images/windows/scripts/build/Install-Vcpkg.ps1 index 0c138a3bdc65..ce72aaf7db85 100644 --- a/images/windows/scripts/build/Install-Vcpkg.ps1 +++ b/images/windows/scripts/build/Install-Vcpkg.ps1 @@ -11,7 +11,13 @@ git clone $Uri $InstallDir -q # Build and integrate vcpkg Invoke-Expression "$InstallDir\bootstrap-vcpkg.bat" +if ($LASTEXITCODE -ne 0) { + throw "vcpkg bootstrap failed with exit code $LASTEXITCODE" +} Invoke-Expression "$InstallDir\$VcpkgExecPath integrate install" +if ($LASTEXITCODE -ne 0) { + throw "vcpkg integration failed with exit code $LASTEXITCODE" +} # Add vcpkg to system environment Add-MachinePathItem $InstallDir diff --git a/images/windows/scripts/build/Install-WindowsFeatures.ps1 b/images/windows/scripts/build/Install-WindowsFeatures.ps1 index c85d25bc7a4c..062d48cba7c3 100644 --- a/images/windows/scripts/build/Install-WindowsFeatures.ps1 +++ b/images/windows/scripts/build/Install-WindowsFeatures.ps1 @@ -13,12 +13,12 @@ foreach ($feature in $windowsFeatures) { $resultSuccess = $? } else { Write-Host "Activating Windows Feature '$($feature.name)'..." - $Arguments = @{ - Name = $feature.name - IncludeAllSubFeature = [System.Convert]::ToBoolean($feature.includeAllSubFeatures) + $arguments = @{ + Name = $feature.name + IncludeAllSubFeature = [System.Convert]::ToBoolean($feature.includeAllSubFeatures) IncludeManagementTools = [System.Convert]::ToBoolean($feature.includeManagementTools) } - $result = Install-WindowsFeature @Arguments + $result = Install-WindowsFeature @arguments $resultSuccess = $result.Success } @@ -33,3 +33,6 @@ foreach ($feature in $windowsFeatures) { # it improves Android emulator launch on Windows Server # https://learn.microsoft.com/en-us/windows-server/virtualization/hyper-v/manage/manage-hyper-v-scheduler-types bcdedit /set hypervisorschedulertype root +if ($LASTEXITCODE -ne 0) { + throw "Failed to set hypervisorschedulertype to root" +} diff --git a/images/windows/scripts/docs-gen/SoftwareReport.Tools.psm1 b/images/windows/scripts/docs-gen/SoftwareReport.Tools.psm1 index 2f4b76528ebb..e179c5d8a1d7 100644 --- a/images/windows/scripts/docs-gen/SoftwareReport.Tools.psm1 +++ b/images/windows/scripts/docs-gen/SoftwareReport.Tools.psm1 @@ -25,7 +25,7 @@ function Get-BazeliskVersion { } function Get-BicepVersion { - (bicep --version | Out-String) -match "bicep cli version (?<version>\d+\.\d+\.\d+)" | Out-Null + (bicep --version | Out-String) -match "bicep cli version (?<version>\d+\.\d+\.\d+)" | Out-Null $bicepVersion = $Matches.Version return $bicepVersion } @@ -37,13 +37,13 @@ function Get-RVersion { } function Get-CMakeVersion { - ($(cmake -version) | Out-String) -match "cmake version (?<version>\d+\.\d+\.\d+)" | Out-Null + ($(cmake -version) | Out-String) -match "cmake version (?<version>\d+\.\d+\.\d+)" | Out-Null $cmakeVersion = $Matches.Version return $cmakeVersion } function Get-CodeQLBundleVersion { - $CodeQLVersionsWildcard = Join-Path $Env:AGENT_TOOLSDIRECTORY -ChildPath "CodeQL" | Join-Path -ChildPath "*" + $CodeQLVersionsWildcard = Join-Path $env:AGENT_TOOLSDIRECTORY -ChildPath "CodeQL" | Join-Path -ChildPath "*" $CodeQLVersionPath = Get-ChildItem $CodeQLVersionsWildcard | Select-Object -First 1 -Expand FullName $CodeQLPath = Join-Path $CodeQLVersionPath -ChildPath "x64" | Join-Path -ChildPath "codeql" | Join-Path -ChildPath "codeql.exe" $CodeQLVersion = & $CodeQLPath version --quiet @@ -92,7 +92,7 @@ function Get-JQVersion { } function Get-KubectlVersion { - $kubectlVersion = (kubectl version --client --output=json | ConvertFrom-Json).clientVersion.gitVersion.Replace('v','') + $kubectlVersion = (kubectl version --client --output=json | ConvertFrom-Json).clientVersion.gitVersion.Replace('v', '') return $kubectlVersion } @@ -138,7 +138,7 @@ function Get-MercurialVersion { } function Get-NSISVersion { - $nsisVersion = &"c:\Program Files (x86)\NSIS\makensis.exe" "/Version" + $nsisVersion = & "c:\Program Files (x86)\NSIS\makensis.exe" "/Version" return $nsisVersion.TrimStart("v") } @@ -234,7 +234,7 @@ function Get-AlibabaCLIVersion { } function Get-CloudFoundryVersion { - $(cf version) -match "(?<version>\d+\.\d+\.\d+)" | Out-Null + $(cf version) -match "(?<version>\d+\.\d+\.\d+)" | Out-Null $cfVersion = $Matches.Version return $cfVersion } diff --git a/images/windows/scripts/helpers/InstallHelpers.ps1 b/images/windows/scripts/helpers/InstallHelpers.ps1 index a2a2341e53e3..0f8611a5cccb 100644 --- a/images/windows/scripts/helpers/InstallHelpers.ps1 +++ b/images/windows/scripts/helpers/InstallHelpers.ps1 @@ -995,7 +995,7 @@ function Update-Environment { $pathItems = $locations | ForEach-Object { (Get-Item $_).GetValue('PATH').Split(';') } | Select-Object -Unique - $Env:PATH = $pathItems -join ';' + $env:PATH = $pathItems -join ';' # Update other variables $locations | ForEach-Object { diff --git a/images/windows/scripts/tests/Databases.Tests.ps1 b/images/windows/scripts/tests/Databases.Tests.ps1 index 66e12105719b..5c10726a9e3a 100644 --- a/images/windows/scripts/tests/Databases.Tests.ps1 +++ b/images/windows/scripts/tests/Databases.Tests.ps1 @@ -5,15 +5,15 @@ Describe "MongoDB" { @{ ToolName = "mongod" } ) { $toolsetVersion = (Get-ToolsetContent).mongodb.version - (&$ToolName --version)[2].Split('"')[-2] | Should -BeLike "$toolsetVersion*" + (& $ToolName --version)[2].Split('"')[-2] | Should -BeLike "$toolsetVersion*" } } Context "Service" { $mongoService = Get-Service -Name mongodb -ErrorAction Ignore $mongoServiceTests = @{ - Name = $mongoService.Name - Status = $mongoService.Status + Name = $mongoService.Name + Status = $mongoService.Status StartType = $mongoService.StartType } @@ -29,9 +29,9 @@ Describe "MongoDB" { Describe "PostgreSQL" { $psqlTests = @( - @{envVar = "PGROOT"; pgPath = Get-EnvironmentVariable "PGROOT"} - @{envVar = "PGBIN"; pgPath = Get-EnvironmentVariable "PGBIN"} - @{envVar = "PGDATA"; pgPath = Get-EnvironmentVariable "PGDATA"} + @{envVar = "PGROOT"; pgPath = Get-EnvironmentVariable "PGROOT" } + @{envVar = "PGBIN"; pgPath = Get-EnvironmentVariable "PGBIN" } + @{envVar = "PGDATA"; pgPath = Get-EnvironmentVariable "PGDATA" } ) Context "Environment variable" { @@ -57,8 +57,8 @@ Describe "PostgreSQL" { Context "Service" { $psqlService = Get-Service -Name postgresql* $psqlServiceTests = @{ - Name = $psqlService.Name - Status = $psqlService.Status + Name = $psqlService.Name + Status = $psqlService.Status StartType = $psqlService.StartType } @@ -75,9 +75,9 @@ Describe "PostgreSQL" { It "PostgreSQL version should correspond to the version in the toolset" { $toolsetVersion = (Get-ToolsetContent).postgresql.version # Client version - (&$Env:PGBIN\psql --version).split()[-1] | Should -BeLike "$toolsetVersion*" + (& $env:PGBIN\psql --version).split()[-1] | Should -BeLike "$toolsetVersion*" # Server version - (&$Env:PGBIN\pg_config --version).split()[-1] | Should -BeLike "$toolsetVersion*" + (& $env:PGBIN\pg_config --version).split()[-1] | Should -BeLike "$toolsetVersion*" } } } diff --git a/images/windows/scripts/tests/Tools.Tests.ps1 b/images/windows/scripts/tests/Tools.Tests.ps1 index 4c8690fce777..a71ff24fd66b 100644 --- a/images/windows/scripts/tests/Tools.Tests.ps1 +++ b/images/windows/scripts/tests/Tools.Tests.ps1 @@ -23,19 +23,19 @@ Describe "Bazel" { Describe "CodeQL Bundle" { It "Single distribution installed" { - $CodeQLVersionsWildcard = Join-Path $Env:AGENT_TOOLSDIRECTORY -ChildPath "CodeQL" | Join-Path -ChildPath "*" + $CodeQLVersionsWildcard = Join-Path $env:AGENT_TOOLSDIRECTORY -ChildPath "CodeQL" | Join-Path -ChildPath "*" $CodeQLVersionPath = Get-ChildItem $CodeQLVersionsWildcard | Should -HaveCount 1 } It "Contains CodeQL executable" { - $CodeQLVersionsWildcard = Join-Path $Env:AGENT_TOOLSDIRECTORY -ChildPath "CodeQL" | Join-Path -ChildPath "*" + $CodeQLVersionsWildcard = Join-Path $env:AGENT_TOOLSDIRECTORY -ChildPath "CodeQL" | Join-Path -ChildPath "*" $CodeQLVersionPath = Get-ChildItem $CodeQLVersionsWildcard | Sort-Object -Descending | Select-Object -First 1 -Expand FullName $CodeQLPath = Join-Path $CodeQLVersionPath -ChildPath "x64" | Join-Path -ChildPath "codeql" | Join-Path -ChildPath "codeql.exe" "$CodeQLPath version --quiet" | Should -ReturnZeroExitCode } It "Contains CodeQL packs" { - $CodeQLVersionsWildcard = Join-Path $Env:AGENT_TOOLSDIRECTORY -ChildPath "CodeQL" | Join-Path -ChildPath "*" + $CodeQLVersionsWildcard = Join-Path $env:AGENT_TOOLSDIRECTORY -ChildPath "CodeQL" | Join-Path -ChildPath "*" $CodeQLVersionPath = Get-ChildItem $CodeQLVersionsWildcard | Sort-Object -Descending | Select-Object -First 1 -Expand FullName $CodeQLPacksPath = Join-Path $CodeQLVersionPath -ChildPath "x64" | Join-Path -ChildPath "codeql" | Join-Path -ChildPath "qlpacks" $CodeQLPacksPath | Should -Exist @@ -119,7 +119,7 @@ Describe "NET48" { Describe "NSIS" { It "NSIS" { - "makensis /VERSION" | Should -ReturnZeroExitCode + "makensis /VERSION" | Should -ReturnZeroExitCode } } @@ -201,9 +201,9 @@ Describe "Pipx" { } Describe "Kotlin" { - $kotlinPackages = @("kapt", "kotlin", "kotlinc", "kotlin-dce-js", "kotlinc-jvm") + $kotlinPackages = @("kapt", "kotlin", "kotlinc", "kotlin-dce-js", "kotlinc-jvm") - It "<toolName> is available" -TestCases ($kotlinPackages | ForEach-Object { @{ toolName = $_ } }) { + It "<toolName> is available" -TestCases ($kotlinPackages | ForEach-Object { @{ toolName = $_ } }) { "$toolName -version" | Should -ReturnZeroExitCode } } diff --git a/images/windows/scripts/tests/Toolset.Tests.ps1 b/images/windows/scripts/tests/Toolset.Tests.ps1 index a8828bb63749..83d4b9a40f46 100644 --- a/images/windows/scripts/tests/Toolset.Tests.ps1 +++ b/images/windows/scripts/tests/Toolset.Tests.ps1 @@ -12,7 +12,7 @@ $toolsExecutables = @{ @{ Binary = "npm"; Arguments = "--version" } ) Go = @( - @{ Binary = "bin\go.exe"; Arguments = "version" } + @{ Binary = "bin\go.exe"; Arguments = "version" } ) Ruby = @( @{ Binary = "bin\ruby.exe"; Arguments = "--version" } diff --git a/images/windows/scripts/tests/WindowsFeatures.Tests.ps1 b/images/windows/scripts/tests/WindowsFeatures.Tests.ps1 index 802dc6f7fa34..633de532f729 100644 --- a/images/windows/scripts/tests/WindowsFeatures.Tests.ps1 +++ b/images/windows/scripts/tests/WindowsFeatures.Tests.ps1 @@ -17,7 +17,7 @@ Describe "WindowsFeatures" { Describe "DiskSpace" { It "The image has enough disk space"{ - $availableSpaceMB = [math]::Round((Get-PSDrive -Name C).Free / 1MB) + $availableSpaceMB = [math]::Round((Get-PSDrive -Name C).Free / 1MB) $minimumFreeSpaceMB = 18 * 1024 $availableSpaceMB | Should -BeGreaterThan $minimumFreeSpaceMB @@ -26,7 +26,7 @@ Describe "DiskSpace" { Describe "DynamicPorts" { It "Test TCP dynamicport start=49152 num=16384" { - $tcpPorts = Get-NetTCPSetting | Where-Object {$_.SettingName -ne "Automatic"} | Where-Object { + $tcpPorts = Get-NetTCPSetting | Where-Object { $_.SettingName -ne "Automatic" } | Where-Object { $_.DynamicPortRangeStartPort -ne 49152 -or $_.DynamicPortRangeNumberOfPorts -ne 16384 } @@ -52,7 +52,7 @@ Describe "GDIProcessHandleQuota" { } Describe "Test Signed Drivers" { - It "bcdedit testsigning should be Yes"{ + It "bcdedit testsigning should be Yes" { "$(bcdedit)" | Should -Match "testsigning\s+Yes" } } @@ -64,7 +64,7 @@ Describe "Windows Updates" { $testCases = Get-WindowsUpdateStates | Sort-Object Title | ForEach-Object { @{ - Title = $_.Title + Title = $_.Title State = $_.State } } diff --git a/images/windows/templates/windows-2019.json b/images/windows/templates/windows-2019.json index 8c6bd3192fdf..d6e74585ea51 100644 --- a/images/windows/templates/windows-2019.json +++ b/images/windows/templates/windows-2019.json @@ -145,7 +145,6 @@ "IMAGE_VERSION={{user `image_version`}}", "IMAGE_OS={{user `image_os`}}", "AGENT_TOOLSDIRECTORY={{user `agent_tools_directory`}}", - "ACTIONS_RUNNER_ACTION_ARCHIVE_CACHE=C:\\actionarchivecache\\", "IMAGEDATA_FILE={{user `imagedata_file`}}" ], "scripts": [ @@ -360,9 +359,9 @@ { "type": "powershell", "inline": [ - "if( Test-Path $Env:SystemRoot\\System32\\Sysprep\\unattend.xml ){ rm $Env:SystemRoot\\System32\\Sysprep\\unattend.xml -Force}", + "if( Test-Path $env:SystemRoot\\System32\\Sysprep\\unattend.xml ){ rm $env:SystemRoot\\System32\\Sysprep\\unattend.xml -Force}", "& $env:SystemRoot\\System32\\Sysprep\\Sysprep.exe /oobe /generalize /quiet /quit", - "while($true) { $imageState = Get-ItemProperty HKLM:\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Setup\\State | Select ImageState; if($imageState.ImageState -ne 'IMAGE_STATE_GENERALIZE_RESEAL_TO_OOBE') { Write-Output $imageState.ImageState; Start-Sleep -s 10 } else { break } }" + "while($true) { $imageState = Get-ItemProperty HKLM:\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Setup\\State | Select ImageState; if($imageState.ImageState -ne 'IMAGE_STATE_GENERALIZE_RESEAL_TO_OOBE') { Write-Output $imageState.ImageState; Start-Sleep -s 10 } else { break } }" ] } ] diff --git a/images/windows/templates/windows-2022.json b/images/windows/templates/windows-2022.json index fd9ed2057dc5..8c303142ca87 100644 --- a/images/windows/templates/windows-2022.json +++ b/images/windows/templates/windows-2022.json @@ -129,7 +129,6 @@ "IMAGE_VERSION={{user `image_version`}}", "IMAGE_OS={{user `image_os`}}", "AGENT_TOOLSDIRECTORY={{user `agent_tools_directory`}}", - "ACTIONS_RUNNER_ACTION_ARCHIVE_CACHE=C:\\actionarchivecache\\", "IMAGEDATA_FILE={{user `imagedata_file`}}" ], "scripts": [ @@ -347,9 +346,9 @@ { "type": "powershell", "inline": [ - "if( Test-Path $Env:SystemRoot\\System32\\Sysprep\\unattend.xml ){ rm $Env:SystemRoot\\System32\\Sysprep\\unattend.xml -Force}", + "if( Test-Path $env:SystemRoot\\System32\\Sysprep\\unattend.xml ){ rm $env:SystemRoot\\System32\\Sysprep\\unattend.xml -Force}", "& $env:SystemRoot\\System32\\Sysprep\\Sysprep.exe /oobe /generalize /mode:vm /quiet /quit", - "while($true) { $imageState = Get-ItemProperty HKLM:\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Setup\\State | Select ImageState; if($imageState.ImageState -ne 'IMAGE_STATE_GENERALIZE_RESEAL_TO_OOBE') { Write-Output $imageState.ImageState; Start-Sleep -s 10 } else { break } }" + "while($true) { $imageState = Get-ItemProperty HKLM:\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Setup\\State | Select ImageState; if($imageState.ImageState -ne 'IMAGE_STATE_GENERALIZE_RESEAL_TO_OOBE') { Write-Output $imageState.ImageState; Start-Sleep -s 10 } else { break } }" ] } ] From 63f2cea1738bf023e600f9560760b966374dbd0c Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Mon, 11 Dec 2023 22:25:06 +0100 Subject: [PATCH 2525/3485] [Ubuntu] Update the Packer version output (#8994) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Update Software Report to support azcopy output * [Ubuntu] Update the Packer version output --------- Co-authored-by: Alexey Ayupov <“alexey.ayupov@akvelon.com”> --- images/ubuntu/scripts/docs-gen/SoftwareReport.Tools.psm1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/ubuntu/scripts/docs-gen/SoftwareReport.Tools.psm1 b/images/ubuntu/scripts/docs-gen/SoftwareReport.Tools.psm1 index 7f1dffb65054..a61b0a8d7aab 100644 --- a/images/ubuntu/scripts/docs-gen/SoftwareReport.Tools.psm1 +++ b/images/ubuntu/scripts/docs-gen/SoftwareReport.Tools.psm1 @@ -177,7 +177,7 @@ function Get-NvmVersion { } function Get-PackerVersion { - $packerVersion = packer --version + $packerVersion = (packer --version | Select-String "^Packer").Line.Replace('v','') | Get-StringPart -Part 1 return $packerVersion } From 126c302e7ab88c7960230ba8ffc6c0f8722b4320 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Mon, 11 Dec 2023 22:26:33 +0100 Subject: [PATCH 2526/3485] [macOS] Temporary pin the AzCopy version (#8979) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Update Software Report to support azcopy output * [macOS] Temporary pin the AzCopy version --------- Co-authored-by: Alexey Ayupov <“alexey.ayupov@akvelon.com”> --- images/macos/scripts/build/install-azcopy.sh | 3 ++- images/macos/scripts/docs-gen/SoftwareReport.Common.psm1 | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/images/macos/scripts/build/install-azcopy.sh b/images/macos/scripts/build/install-azcopy.sh index 0cd670c0743a..1ef682505330 100644 --- a/images/macos/scripts/build/install-azcopy.sh +++ b/images/macos/scripts/build/install-azcopy.sh @@ -11,7 +11,8 @@ arch=$(get_arch) if [ "$arch" == "arm64" ]; then brew_smart_install azcopy else - archive_path=$(download_with_retry "https://aka.ms/downloadazcopy-v10-mac") + # Temporary pin 10.21.2 version of AzCopy until 10.22.0 is fixed + archive_path=$(download_with_retry "https://azcopyvnext.azureedge.net/releases/release-10.21.2-20231106/azcopy_darwin_amd64_10.21.2.zip") unzip -qq "$archive_path" -d /tmp/azcopy extract_path=$(echo /tmp/azcopy/azcopy*) cp "$extract_path/azcopy" "/usr/local/bin/azcopy" diff --git a/images/macos/scripts/docs-gen/SoftwareReport.Common.psm1 b/images/macos/scripts/docs-gen/SoftwareReport.Common.psm1 index b61a869b53e4..41d4b9f74918 100644 --- a/images/macos/scripts/docs-gen/SoftwareReport.Common.psm1 +++ b/images/macos/scripts/docs-gen/SoftwareReport.Common.psm1 @@ -348,7 +348,7 @@ function Get-Aria2Version { } function Get-AzcopyVersion { - $azcopyVersion = Run-Command "azcopy --version" | Take-Part -Part 2 + $azcopyVersion = [string]$(Run-Command "azcopy --version") | Take-Part -Part 2 return $azcopyVersion } From ea64263b418a555ef5d18684e23bb39fc61a13a8 Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Wed, 13 Dec 2023 09:17:44 +0100 Subject: [PATCH 2527/3485] [windows] Change packer templates from json to hcl (#8999) --- docs/create-image-and-azure-resources.md | 2 +- helpers/GenerateResourcesAndImage.ps1 | 21 +- .../azure-pipelines/windows2019.yml | 2 +- .../azure-pipelines/windows2022.yml | 2 +- images.CI/linux-and-win/build-image.ps1 | 8 +- images/windows/templates/windows-2019.json | 368 -------------- images/windows/templates/windows-2019.pkr.hcl | 455 ++++++++++++++++++ images/windows/templates/windows-2022.json | 355 -------------- images/windows/templates/windows-2022.pkr.hcl | 441 +++++++++++++++++ 9 files changed, 919 insertions(+), 735 deletions(-) delete mode 100644 images/windows/templates/windows-2019.json create mode 100644 images/windows/templates/windows-2019.pkr.hcl delete mode 100644 images/windows/templates/windows-2022.json create mode 100644 images/windows/templates/windows-2022.pkr.hcl diff --git a/docs/create-image-and-azure-resources.md b/docs/create-image-and-azure-resources.md index 45ab1d4bd0f9..877f5f0e7d71 100644 --- a/docs/create-image-and-azure-resources.md +++ b/docs/create-image-and-azure-resources.md @@ -217,7 +217,7 @@ Where: - `InstallPassword` - password for the user used to install software (Windows only); - `Location` - location where resources will be created (e.g., "East US"); - `ImageName` and `ImageResourceGroupName` - name of the resource group where the managed image will be stored; -- `TemplatePath` - path to the Packer template file (e.g., "images/windows/templates/windows-2022.json"). +- `TemplatePath` - path to the Packer template file (e.g., "images/windows/templates/windows-2022.pkr.hcl"). ### Required variables diff --git a/helpers/GenerateResourcesAndImage.ps1 b/helpers/GenerateResourcesAndImage.ps1 index b8bab020f730..272b0ce1ddc7 100644 --- a/helpers/GenerateResourcesAndImage.ps1 +++ b/helpers/GenerateResourcesAndImage.ps1 @@ -19,10 +19,10 @@ Function Get-PackerTemplatePath { switch ($ImageType) { # Note: Double Join-Path is required to support PowerShell 5.1 ([ImageType]::Windows2019) { - $relativeTemplatePath = Join-Path (Join-Path "windows" "templates") "windows-2019.json" + $relativeTemplatePath = Join-Path (Join-Path "windows" "templates") "windows-2019.pkr.hcl" } ([ImageType]::Windows2022) { - $relativeTemplatePath = Join-Path (Join-Path "windows" "templates") "windows-2022.json" + $relativeTemplatePath = Join-Path (Join-Path "windows" "templates") "windows-2022.pkr.hcl" } ([ImageType]::Ubuntu2004) { $relativeTemplatePath = Join-Path (Join-Path "ubuntu" "templates") "ubuntu-20.04.json" @@ -155,7 +155,7 @@ Function GenerateResourcesAndImage { if ($Force -and $ReuseResourceGroup) { throw "Force and ReuseResourceGroup cannot be used together." } - + Show-LatestCommit -ErrorAction SilentlyContinue # Validate packer is installed @@ -229,6 +229,13 @@ Function GenerateResourcesAndImage { $InstallPassword = $env:UserName + [System.GUID]::NewGuid().ToString().ToUpper() + Write-Host "Downloading packer plugins..." + & $PackerBinary init $TemplatePath + + if ($LastExitCode -ne 0) { + throw "Packer plugins download failed." + } + Write-Host "Validating packer template..." & $PackerBinary validate ` "-var=client_id=fake" ` @@ -242,7 +249,7 @@ Function GenerateResourcesAndImage { "-var=allowed_inbound_ip_addresses=$($AllowedInboundIpAddresses)" ` "-var=azure_tags=$($TagsJson)" ` $TemplatePath - + if ($LastExitCode -ne 0) { throw "Packer template validation failed." } @@ -290,7 +297,7 @@ Function GenerateResourcesAndImage { # Resource group already exists, ask the user what to do $title = "Resource group '$ResourceGroupName' already exists" $message = "Do you want to delete the resource group and all resources in it?" - + $options = @( [System.Management.Automation.Host.ChoiceDescription]::new("&Yes", "Delete the resource group and all resources in it."), [System.Management.Automation.Host.ChoiceDescription]::new("&No", "Keep the resource group and continue."), @@ -346,7 +353,7 @@ Function GenerateResourcesAndImage { if ($LastExitCode -ne 0) { throw "Failed to create service principal '$ServicePrincipalName'." } - + $ServicePrincipalAppId = $ServicePrincipal.appId $ServicePrincipalPassword = $ServicePrincipal.password $TenantId = $ServicePrincipal.tenant @@ -383,7 +390,7 @@ Function GenerateResourcesAndImage { Write-Error $_ } finally { Write-Verbose "`nCleaning up..." - + # Remove ADServicePrincipal and ADApplication if ($ADCleanupRequired) { Write-Host "Removing ADServicePrincipal..." diff --git a/images.CI/linux-and-win/azure-pipelines/windows2019.yml b/images.CI/linux-and-win/azure-pipelines/windows2019.yml index d81c173e0921..c8bb7f943609 100644 --- a/images.CI/linux-and-win/azure-pipelines/windows2019.yml +++ b/images.CI/linux-and-win/azure-pipelines/windows2019.yml @@ -18,4 +18,4 @@ jobs: parameters: image_type: windows2019 image_readme_name: Windows2019-Readme.md - image_template_name: windows-2019.json + image_template_name: windows-2019.pkr.hcl diff --git a/images.CI/linux-and-win/azure-pipelines/windows2022.yml b/images.CI/linux-and-win/azure-pipelines/windows2022.yml index 07e523563910..b24e1d4879e1 100644 --- a/images.CI/linux-and-win/azure-pipelines/windows2022.yml +++ b/images.CI/linux-and-win/azure-pipelines/windows2022.yml @@ -18,4 +18,4 @@ jobs: parameters: image_type: windows2022 image_readme_name: Windows2022-Readme.md - image_template_name: windows-2022.json + image_template_name: windows-2022.pkr.hcl diff --git a/images.CI/linux-and-win/build-image.ps1 b/images.CI/linux-and-win/build-image.ps1 index e44b9872da60..7abfdfd92d25 100644 --- a/images.CI/linux-and-win/build-image.ps1 +++ b/images.CI/linux-and-win/build-image.ps1 @@ -22,8 +22,6 @@ if (-not (Test-Path $TemplatePath)) $ImageTemplateName = [io.path]::GetFileName($TemplatePath).Split(".")[0] $InstallPassword = [System.GUID]::NewGuid().ToString().ToUpper() -packer validate -syntax-only $TemplatePath - $SensitiveData = @( 'OSType', 'StorageAccountLocation', @@ -37,6 +35,12 @@ $SensitiveData = @( Write-Host "Show Packer Version" packer --version +Write-Host "Download packer plugins" +packer init $TemplatePath + +Write-Host "Validate packer template" +packer validate -syntax-only $TemplatePath + Write-Host "Build $ImageTemplateName VM" packer build -var "client_id=$ClientId" ` -var "client_secret=$ClientSecret" ` diff --git a/images/windows/templates/windows-2019.json b/images/windows/templates/windows-2019.json deleted file mode 100644 index d6e74585ea51..000000000000 --- a/images/windows/templates/windows-2019.json +++ /dev/null @@ -1,368 +0,0 @@ -{ - "variables": { - "client_id": "{{env `ARM_CLIENT_ID`}}", - "client_secret": "{{env `ARM_CLIENT_SECRET`}}", - "client_cert_path": "{{env `ARM_CLIENT_CERT_PATH`}}", - "subscription_id": "{{env `ARM_SUBSCRIPTION_ID`}}", - "tenant_id": "{{env `ARM_TENANT_ID`}}", - "object_id": "{{env `ARM_OBJECT_ID`}}", - "managed_image_resource_group_name": "{{env `ARM_RESOURCE_GROUP`}}", - "managed_image_storage_account_type": "Premium_LRS", - "build_resource_group_name": "{{env `BUILD_RESOURCE_GROUP_NAME`}}", - "temp_resource_group_name": "{{env `TEMP_RESOURCE_GROUP_NAME`}}", - "location": "{{env `ARM_RESOURCE_LOCATION`}}", - "virtual_network_name": "{{env `VNET_NAME`}}", - "virtual_network_resource_group_name": "{{env `VNET_RESOURCE_GROUP`}}", - "virtual_network_subnet_name": "{{env `VNET_SUBNET`}}", - "private_virtual_network_with_public_ip": "{{env `PRIVATE_VIRTUAL_NETWORK_WITH_PUBLIC_IP`}}", - "allowed_inbound_ip_addresses": "{{env `AGENT_IP`}}", - "vm_size": "Standard_F8s_v2", - "image_folder": "C:\\image", - "imagedata_file": "C:\\imagedata.json", - "helper_script_folder": "C:\\Program Files\\WindowsPowerShell\\Modules\\", - "agent_tools_directory": "C:\\hostedtoolcache\\windows", - "install_user": "installer", - "install_password": null, - "managed_image_name": "packer-win19-dev", - "image_version": "dev", - "image_os": "win19" - }, - "sensitive-variables": [ - "install_password", - "client_secret" - ], - "builders": [ - { - "name": "image", - "type": "azure-arm", - "client_id": "{{user `client_id`}}", - "client_secret": "{{user `client_secret`}}", - "client_cert_path": "{{user `client_cert_path`}}", - "subscription_id": "{{user `subscription_id`}}", - "object_id": "{{user `object_id`}}", - "tenant_id": "{{user `tenant_id`}}", - "os_disk_size_gb": "256", - "location": "{{user `location`}}", - "vm_size": "{{user `vm_size`}}", - "managed_image_name": "{{user `managed_image_name`}}", - "managed_image_resource_group_name": "{{user `managed_image_resource_group_name`}}", - "managed_image_storage_account_type": "{{user `managed_image_storage_account_type`}}", - "build_resource_group_name": "{{user `build_resource_group_name`}}", - "temp_resource_group_name": "{{user `temp_resource_group_name`}}", - "virtual_network_name": "{{user `virtual_network_name`}}", - "virtual_network_resource_group_name": "{{user `virtual_network_resource_group_name`}}", - "virtual_network_subnet_name": "{{user `virtual_network_subnet_name`}}", - "private_virtual_network_with_public_ip": "{{user `private_virtual_network_with_public_ip`}}", - "allowed_inbound_ip_addresses": "{{user `allowed_inbound_ip_addresses`}}", - "os_type": "Windows", - "image_publisher": "MicrosoftWindowsServer", - "image_offer": "WindowsServer", - "image_sku": "2019-Datacenter", - "communicator": "winrm", - "winrm_use_ssl": "true", - "winrm_insecure": "true", - "winrm_username": "packer" - } - ], - "provisioners": [ - { - "type": "powershell", - "inline": [ - "New-Item -Path {{user `image_folder`}} -ItemType Directory -Force" - ] - }, - { - "type": "file", - "sources": [ - "{{ template_dir }}/../assets", - "{{ template_dir }}/../scripts", - "{{ template_dir }}/../toolsets" - ], - "destination": "{{user `image_folder`}}\\" - }, - { - "type": "file", - "source": "{{ template_dir }}/../../../helpers/software-report-base", - "destination": "{{user `image_folder`}}\\scripts\\docs-gen\\" - }, - { - "type": "powershell", - "inline": [ - "Move-Item '{{user `image_folder`}}\\assets\\post-gen' 'C:\\post-generation'", - "Remove-Item -Recurse '{{user `image_folder`}}\\assets'", - "Move-Item '{{user `image_folder`}}\\scripts\\docs-gen' '{{user `image_folder`}}\\SoftwareReport'", - "Move-Item '{{user `image_folder`}}\\scripts\\helpers' '{{user `helper_script_folder`}}\\ImageHelpers'", - "New-Item -Type Directory -Path '{{user `helper_script_folder`}}\\TestsHelpers\\'", - "Move-Item '{{user `image_folder`}}\\scripts\\tests\\Helpers.psm1' '{{user `helper_script_folder`}}\\TestsHelpers\\TestsHelpers.psm1'", - "Move-Item '{{user `image_folder`}}\\scripts\\tests' '{{user `image_folder`}}\\tests'", - "Remove-Item -Recurse '{{user `image_folder`}}\\scripts'", - "Move-Item '{{user `image_folder`}}\\toolsets\\toolset-2019.json' '{{user `image_folder`}}\\toolset.json'", - "Remove-Item -Recurse '{{user `image_folder`}}\\toolsets'" - ] - }, - { - "type": "windows-shell", - "inline": [ - "net user {{user `install_user`}} {{user `install_password`}} /add /passwordchg:no /passwordreq:yes /active:yes /Y", - "net localgroup Administrators {{user `install_user`}} /add", - "winrm set winrm/config/service/auth @{Basic=\"true\"}", - "winrm get winrm/config/service/auth" - ] - }, - { - "type": "powershell", - "inline": [ - "if (-not ((net localgroup Administrators) -contains '{{user `install_user`}}')) { exit 1 }" - ] - }, - { - "type": "powershell", - "inline": [ - "bcdedit.exe /set TESTSIGNING ON" - ], - "elevated_user": "{{user `install_user`}}", - "elevated_password": "{{user `install_password`}}" - }, - { - "type": "powershell", - "valid_exit_codes": [ - 0, - 3010 - ], - "scripts": [ - "{{ template_dir }}/../scripts/build/Install-NET48.ps1" - ], - "elevated_user": "{{user `install_user`}}", - "elevated_password": "{{user `install_password`}}" - }, - { - "type": "windows-restart", - "restart_timeout": "10m" - }, - { - "type": "powershell", - "environment_vars": [ - "IMAGE_VERSION={{user `image_version`}}", - "IMAGE_OS={{user `image_os`}}", - "AGENT_TOOLSDIRECTORY={{user `agent_tools_directory`}}", - "IMAGEDATA_FILE={{user `imagedata_file`}}" - ], - "scripts": [ - "{{ template_dir }}/../scripts/build/Configure-WindowsDefender.ps1", - "{{ template_dir }}/../scripts/build/Configure-PowerShell.ps1", - "{{ template_dir }}/../scripts/build/Install-PowerShellModules.ps1", - "{{ template_dir }}/../scripts/build/Install-WindowsFeatures.ps1", - "{{ template_dir }}/../scripts/build/Install-Chocolatey.ps1", - "{{ template_dir }}/../scripts/build/Configure-BaseImage.ps1", - "{{ template_dir }}/../scripts/build/Configure-ImageDataFile.ps1", - "{{ template_dir }}/../scripts/build/Configure-SystemEnvironment.ps1", - "{{ template_dir }}/../scripts/build/Configure-DotnetSecureChannel.ps1" - ], - "execution_policy": "unrestricted" - }, - { - "type": "windows-restart", - "restart_timeout": "30m" - }, - { - "type": "powershell", - "scripts": [ - "{{ template_dir }}/../scripts/build/Install-VCRedist.ps1", - "{{ template_dir }}/../scripts/build/Install-Docker.ps1", - "{{ template_dir }}/../scripts/build/Install-DockerWinCred.ps1", - "{{ template_dir }}/../scripts/build/Install-DockerCompose.ps1", - "{{ template_dir }}/../scripts/build/Install-PowershellCore.ps1", - "{{ template_dir }}/../scripts/build/Install-WebPlatformInstaller.ps1", - "{{ template_dir }}/../scripts/build/Install-Runner.ps1" - ] - }, - { - "type": "windows-restart", - "restart_timeout": "10m" - }, - { - "type": "powershell", - "valid_exit_codes": [ - 0, - 3010 - ], - "scripts": [ - "{{ template_dir }}/../scripts/build/Install-VisualStudio.ps1", - "{{ template_dir }}/../scripts/build/Install-KubernetesTools.ps1", - "{{ template_dir }}/../scripts/build/Install-NET48-devpack.ps1" - ], - "elevated_user": "{{user `install_user`}}", - "elevated_password": "{{user `install_password`}}" - }, - { - "type": "powershell", - "scripts": [ - "{{ template_dir }}/../scripts/build/Install-Wix.ps1", - "{{ template_dir }}/../scripts/build/Install-WDK.ps1", - "{{ template_dir }}/../scripts/build/Install-VSExtensions.ps1", - "{{ template_dir }}/../scripts/build/Install-AzureCli.ps1", - "{{ template_dir }}/../scripts/build/Install-AzureDevOpsCli.ps1", - "{{ template_dir }}/../scripts/build/Install-ChocolateyPackages.ps1", - "{{ template_dir }}/../scripts/build/Install-JavaTools.ps1", - "{{ template_dir }}/../scripts/build/Install-Kotlin.ps1", - "{{ template_dir }}/../scripts/build/Install-OpenSSL.ps1" - ] - }, - { - "type": "powershell", - "scripts": [ - "{{ template_dir }}/../scripts/build/Install-ServiceFabricSDK.ps1" - ], - "execution_policy": "remotesigned" - }, - { - "type": "windows-restart", - "restart_timeout": "10m" - }, - { - "type": "windows-shell", - "inline": [ - "wmic product where \"name like '%%microsoft azure powershell%%'\" call uninstall /nointeractive" - ] - }, - { - "type": "powershell", - "scripts": [ - "{{ template_dir }}/../scripts/build/Install-ActionsCache.ps1", - "{{ template_dir }}/../scripts/build/Install-Ruby.ps1", - "{{ template_dir }}/../scripts/build/Install-PyPy.ps1", - "{{ template_dir }}/../scripts/build/Install-Toolset.ps1", - "{{ template_dir }}/../scripts/build/Configure-Toolset.ps1", - "{{ template_dir }}/../scripts/build/Install-NodeJS.ps1", - "{{ template_dir }}/../scripts/build/Install-AndroidSDK.ps1", - "{{ template_dir }}/../scripts/build/Install-PowershellAzModules.ps1", - "{{ template_dir }}/../scripts/build/Install-Pipx.ps1", - "{{ template_dir }}/../scripts/build/Install-Git.ps1", - "{{ template_dir }}/../scripts/build/Install-GitHub-CLI.ps1", - "{{ template_dir }}/../scripts/build/Install-PHP.ps1", - "{{ template_dir }}/../scripts/build/Install-Rust.ps1", - "{{ template_dir }}/../scripts/build/Install-Sbt.ps1", - "{{ template_dir }}/../scripts/build/Install-Chrome.ps1", - "{{ template_dir }}/../scripts/build/Install-EdgeDriver.ps1", - "{{ template_dir }}/../scripts/build/Install-Firefox.ps1", - "{{ template_dir }}/../scripts/build/Install-Selenium.ps1", - "{{ template_dir }}/../scripts/build/Install-IEWebDriver.ps1", - "{{ template_dir }}/../scripts/build/Install-Apache.ps1", - "{{ template_dir }}/../scripts/build/Install-Nginx.ps1", - "{{ template_dir }}/../scripts/build/Install-Msys2.ps1", - "{{ template_dir }}/../scripts/build/Install-WinAppDriver.ps1", - "{{ template_dir }}/../scripts/build/Install-R.ps1", - "{{ template_dir }}/../scripts/build/Install-AWSTools.ps1", - "{{ template_dir }}/../scripts/build/Install-DACFx.ps1", - "{{ template_dir }}/../scripts/build/Install-MysqlCli.ps1", - "{{ template_dir }}/../scripts/build/Install-SQLPowerShellTools.ps1", - "{{ template_dir }}/../scripts/build/Install-SQLOLEDBDriver.ps1", - "{{ template_dir }}/../scripts/build/Install-DotnetSDK.ps1", - "{{ template_dir }}/../scripts/build/Install-Mingw64.ps1", - "{{ template_dir }}/../scripts/build/Install-Haskell.ps1", - "{{ template_dir }}/../scripts/build/Install-Stack.ps1", - "{{ template_dir }}/../scripts/build/Install-Miniconda.ps1", - "{{ template_dir }}/../scripts/build/Install-AzureCosmosDbEmulator.ps1", - "{{ template_dir }}/../scripts/build/Install-Mercurial.ps1", - "{{ template_dir }}/../scripts/build/Install-Zstd.ps1", - "{{ template_dir }}/../scripts/build/Install-NSIS.ps1", - "{{ template_dir }}/../scripts/build/Install-CloudFoundryCli.ps1", - "{{ template_dir }}/../scripts/build/Install-Vcpkg.ps1", - "{{ template_dir }}/../scripts/build/Install-PostgreSQL.ps1", - "{{ template_dir }}/../scripts/build/Install-Bazel.ps1", - "{{ template_dir }}/../scripts/build/Install-AliyunCli.ps1", - "{{ template_dir }}/../scripts/build/Install-RootCA.ps1", - "{{ template_dir }}/../scripts/build/Install-MongoDB.ps1", - "{{ template_dir }}/../scripts/build/Install-GoogleCloudCLI.ps1", - "{{ template_dir }}/../scripts/build/Install-CodeQLBundle.ps1", - "{{ template_dir }}/../scripts/build/Install-BizTalkBuildComponent.ps1", - "{{ template_dir }}/../scripts/build/Configure-Diagnostics.ps1", - "{{ template_dir }}/../scripts/build/Configure-DynamicPort.ps1", - "{{ template_dir }}/../scripts/build/Configure-GDIProcessHandleQuota.ps1", - "{{ template_dir }}/../scripts/build/Configure-Shell.ps1", - "{{ template_dir }}/../scripts/build/Configure-DeveloperMode.ps1", - "{{ template_dir }}/../scripts/build/Install-LLVM.ps1" - ] - }, - { - "type": "powershell", - "scripts": [ - "{{ template_dir }}/../scripts/build/Install-WindowsUpdates.ps1" - ], - "elevated_user": "{{user `install_user`}}", - "elevated_password": "{{user `install_password`}}" - }, - { - "type": "windows-restart", - "check_registry": true, - "restart_check_command": "powershell -command \"& {if ((-not (Get-Process TiWorker.exe -ErrorAction SilentlyContinue)) -and (-not [System.Environment]::HasShutdownStarted) ) { Write-Output 'Restart complete' }}\"", - "restart_timeout": "30m" - }, - { - "type": "powershell", - "pause_before": "2m", - "scripts": [ - "{{ template_dir }}/../scripts/build/Install-WindowsUpdatesAfterReboot.ps1", - "{{ template_dir }}/../scripts/tests/RunAll-Tests.ps1" - ] - }, - { - "type": "powershell", - "inline": [ - "if (-not (Test-Path {{user `image_folder`}}\\tests\\testResults.xml)) { throw '{{user `image_folder`}}\\tests\\testResults.xml not found' }" - ] - }, - { - "type": "powershell", - "inline": [ - "pwsh -File '{{user `image_folder`}}\\SoftwareReport\\Generate-SoftwareReport.ps1'" - ], - "environment_vars": [ - "IMAGE_VERSION={{user `image_version`}}" - ] - }, - { - "type": "powershell", - "inline": [ - "if (-not (Test-Path C:\\software-report.md)) { throw 'C:\\software-report.md not found' }", - "if (-not (Test-Path C:\\software-report.json)) { throw 'C:\\software-report.json not found' }" - ] - }, - { - "type": "file", - "source": "C:\\software-report.md", - "destination": "{{ template_dir }}/../Windows2019-Readme.md", - "direction": "download" - }, - { - "type": "file", - "source": "C:\\software-report.json", - "destination": "{{ template_dir }}/../software-report.json", - "direction": "download" - }, - { - "type": "powershell", - "skip_clean": true, - "scripts": [ - "{{ template_dir }}/../scripts/build/Install-NativeImages.ps1", - "{{ template_dir }}/../scripts/build/Configure-System.ps1", - "{{ template_dir }}/../scripts/build/Configure-User.ps1" - ], - "environment_vars": [ - "INSTALL_USER={{user `install_user`}}" - ] - }, - { - "type": "windows-restart", - "restart_timeout": "10m" - }, - { - "type": "powershell", - "inline": [ - "if( Test-Path $env:SystemRoot\\System32\\Sysprep\\unattend.xml ){ rm $env:SystemRoot\\System32\\Sysprep\\unattend.xml -Force}", - "& $env:SystemRoot\\System32\\Sysprep\\Sysprep.exe /oobe /generalize /quiet /quit", - "while($true) { $imageState = Get-ItemProperty HKLM:\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Setup\\State | Select ImageState; if($imageState.ImageState -ne 'IMAGE_STATE_GENERALIZE_RESEAL_TO_OOBE') { Write-Output $imageState.ImageState; Start-Sleep -s 10 } else { break } }" - ] - } - ] -} diff --git a/images/windows/templates/windows-2019.pkr.hcl b/images/windows/templates/windows-2019.pkr.hcl new file mode 100644 index 000000000000..7ac73077f2f2 --- /dev/null +++ b/images/windows/templates/windows-2019.pkr.hcl @@ -0,0 +1,455 @@ +packer { + required_plugins { + azure = { + source = "github.com/hashicorp/azure" + version = "~> 2" + } + } +} + +locals { + managed_image_name = var.managed_image_name != "" ? var.managed_image_name : "packer-${var.image_os}-${var.image_version}" +} + +variable "agent_tools_directory" { + type = string + default = "C:\\hostedtoolcache\\windows" +} + +variable "allowed_inbound_ip_addresses" { + type = list(string) + default = [] +} + +variable "azure_tags" { + type = map(string) + default = {} +} + +variable "build_resource_group_name" { + type = string + default = "${env("BUILD_RESOURCE_GROUP_NAME")}" +} + +variable "client_cert_path" { + type = string + default = "${env("ARM_CLIENT_CERT_PATH")}" +} + +variable "client_id" { + type = string + default = "${env("ARM_CLIENT_ID")}" +} + +variable "client_secret" { + type = string + default = "${env("ARM_CLIENT_SECRET")}" + sensitive = true +} + +variable "helper_script_folder" { + type = string + default = "C:\\Program Files\\WindowsPowerShell\\Modules\\" +} + +variable "image_folder" { + type = string + default = "C:\\image" +} + +variable "image_os" { + type = string + default = "win19" +} + +variable "image_version" { + type = string + default = "dev" +} + +variable "imagedata_file" { + type = string + default = "C:\\imagedata.json" +} + +variable "install_password" { + type = string + default = "" + sensitive = true +} + +variable "install_user" { + type = string + default = "installer" +} + +variable "location" { + type = string + default = "${env("ARM_RESOURCE_LOCATION")}" +} + +variable "managed_image_name" { + type = string + default = "" +} + +variable "managed_image_resource_group_name" { + type = string + default = "${env("ARM_RESOURCE_GROUP")}" +} + +variable "managed_image_storage_account_type" { + type = string + default = "Premium_LRS" +} + +variable "object_id" { + type = string + default = "${env("ARM_OBJECT_ID")}" +} + +variable "private_virtual_network_with_public_ip" { + type = bool + default = false +} + +variable "subscription_id" { + type = string + default = "${env("ARM_SUBSCRIPTION_ID")}" +} + +variable "temp_resource_group_name" { + type = string + default = "${env("TEMP_RESOURCE_GROUP_NAME")}" +} + +variable "tenant_id" { + type = string + default = "${env("ARM_TENANT_ID")}" +} + +variable "virtual_network_name" { + type = string + default = "${env("VNET_NAME")}" +} + +variable "virtual_network_resource_group_name" { + type = string + default = "${env("VNET_RESOURCE_GROUP")}" +} + +variable "virtual_network_subnet_name" { + type = string + default = "${env("VNET_SUBNET")}" +} + +variable "vm_size" { + type = string + default = "Standard_F8s_v2" +} + +source "azure-arm" "image" { + allowed_inbound_ip_addresses = "${var.allowed_inbound_ip_addresses}" + build_resource_group_name = "${var.build_resource_group_name}" + client_cert_path = "${var.client_cert_path}" + client_id = "${var.client_id}" + client_secret = "${var.client_secret}" + communicator = "winrm" + image_offer = "WindowsServer" + image_publisher = "MicrosoftWindowsServer" + image_sku = "2019-Datacenter" + location = "${var.location}" + managed_image_name = "${local.managed_image_name}" + managed_image_resource_group_name = "${var.managed_image_resource_group_name}" + managed_image_storage_account_type = "${var.managed_image_storage_account_type}" + object_id = "${var.object_id}" + os_disk_size_gb = "256" + os_type = "Windows" + private_virtual_network_with_public_ip = "${var.private_virtual_network_with_public_ip}" + subscription_id = "${var.subscription_id}" + temp_resource_group_name = "${var.temp_resource_group_name}" + tenant_id = "${var.tenant_id}" + virtual_network_name = "${var.virtual_network_name}" + virtual_network_resource_group_name = "${var.virtual_network_resource_group_name}" + virtual_network_subnet_name = "${var.virtual_network_subnet_name}" + vm_size = "${var.vm_size}" + winrm_insecure = "true" + winrm_use_ssl = "true" + winrm_username = "packer" + + dynamic "azure_tag" { + for_each = var.azure_tags + content { + name = azure_tag.key + value = azure_tag.value + } + } +} + +build { + sources = ["source.azure-arm.image"] + + provisioner "powershell" { + inline = ["New-Item -Path ${var.image_folder} -ItemType Directory -Force"] + } + + provisioner "file" { + destination = "${var.image_folder}\\" + sources = [ + "${path.root}/../assets", + "${path.root}/../scripts", + "${path.root}/../toolsets" + ] + } + + provisioner "file" { + destination = "${var.image_folder}\\scripts\\docs-gen\\" + source = "${path.root}/../../../helpers/software-report-base" + } + + provisioner "powershell" { + inline = [ + "Move-Item '${var.image_folder}\\assets\\post-gen' 'C:\\post-generation'", + "Remove-Item -Recurse '${var.image_folder}\\assets'", + "Move-Item '${var.image_folder}\\scripts\\docs-gen' '${var.image_folder}\\SoftwareReport'", + "Move-Item '${var.image_folder}\\scripts\\helpers' '${var.helper_script_folder}\\ImageHelpers'", + "New-Item -Type Directory -Path '${var.helper_script_folder}\\TestsHelpers\\'", + "Move-Item '${var.image_folder}\\scripts\\tests\\Helpers.psm1' '${var.helper_script_folder}\\TestsHelpers\\TestsHelpers.psm1'", + "Move-Item '${var.image_folder}\\scripts\\tests' '${var.image_folder}\\tests'", + "Remove-Item -Recurse '${var.image_folder}\\scripts'", + "Move-Item '${var.image_folder}\\toolsets\\toolset-2019.json' '${var.image_folder}\\toolset.json'", + "Remove-Item -Recurse '${var.image_folder}\\toolsets'" + ] + } + + provisioner "windows-shell" { + inline = [ + "net user ${var.install_user} ${var.install_password} /add /passwordchg:no /passwordreq:yes /active:yes /Y", + "net localgroup Administrators ${var.install_user} /add", + "winrm set winrm/config/service/auth @{Basic=\"true\"}", + "winrm get winrm/config/service/auth" + ] + } + + provisioner "powershell" { + inline = ["if (-not ((net localgroup Administrators) -contains '${var.install_user}')) { exit 1 }"] + } + + provisioner "powershell" { + elevated_password = "${var.install_password}" + elevated_user = "${var.install_user}" + inline = ["bcdedit.exe /set TESTSIGNING ON"] + } + + provisioner "powershell" { + elevated_password = "${var.install_password}" + elevated_user = "${var.install_user}" + scripts = ["${path.root}/../scripts/build/Install-NET48.ps1"] + valid_exit_codes = [0, 3010] + } + + provisioner "windows-restart" { + restart_timeout = "10m" + } + + provisioner "powershell" { + environment_vars = ["IMAGE_VERSION=${var.image_version}", "IMAGE_OS=${var.image_os}", "AGENT_TOOLSDIRECTORY=${var.agent_tools_directory}", "IMAGEDATA_FILE=${var.imagedata_file}"] + execution_policy = "unrestricted" + scripts = [ + "${path.root}/../scripts/build/Configure-WindowsDefender.ps1", + "${path.root}/../scripts/build/Configure-PowerShell.ps1", + "${path.root}/../scripts/build/Install-PowerShellModules.ps1", + "${path.root}/../scripts/build/Install-WindowsFeatures.ps1", + "${path.root}/../scripts/build/Install-Chocolatey.ps1", + "${path.root}/../scripts/build/Configure-BaseImage.ps1", + "${path.root}/../scripts/build/Configure-ImageDataFile.ps1", + "${path.root}/../scripts/build/Configure-SystemEnvironment.ps1", + "${path.root}/../scripts/build/Configure-DotnetSecureChannel.ps1" + ] + } + + provisioner "windows-restart" { + restart_timeout = "30m" + } + + provisioner "powershell" { + scripts = [ + "${path.root}/../scripts/build/Install-VCRedist.ps1", + "${path.root}/../scripts/build/Install-Docker.ps1", + "${path.root}/../scripts/build/Install-DockerWinCred.ps1", + "${path.root}/../scripts/build/Install-DockerCompose.ps1", + "${path.root}/../scripts/build/Install-PowershellCore.ps1", + "${path.root}/../scripts/build/Install-WebPlatformInstaller.ps1", + "${path.root}/../scripts/build/Install-Runner.ps1" + ] + } + + provisioner "windows-restart" { + restart_timeout = "10m" + } + + provisioner "powershell" { + elevated_password = "${var.install_password}" + elevated_user = "${var.install_user}" + scripts = [ + "${path.root}/../scripts/build/Install-VisualStudio.ps1", + "${path.root}/../scripts/build/Install-KubernetesTools.ps1", + "${path.root}/../scripts/build/Install-NET48-devpack.ps1" + ] + valid_exit_codes = [0, 3010] + } + + provisioner "powershell" { + scripts = [ + "${path.root}/../scripts/build/Install-Wix.ps1", + "${path.root}/../scripts/build/Install-WDK.ps1", + "${path.root}/../scripts/build/Install-VSExtensions.ps1", + "${path.root}/../scripts/build/Install-AzureCli.ps1", + "${path.root}/../scripts/build/Install-AzureDevOpsCli.ps1", + "${path.root}/../scripts/build/Install-ChocolateyPackages.ps1", + "${path.root}/../scripts/build/Install-JavaTools.ps1", + "${path.root}/../scripts/build/Install-Kotlin.ps1", + "${path.root}/../scripts/build/Install-OpenSSL.ps1" + ] + } + + provisioner "powershell" { + execution_policy = "remotesigned" + scripts = ["${path.root}/../scripts/build/Install-ServiceFabricSDK.ps1"] + } + + provisioner "windows-restart" { + restart_timeout = "10m" + } + + provisioner "windows-shell" { + inline = ["wmic product where \"name like '%%microsoft azure powershell%%'\" call uninstall /nointeractive"] + } + + provisioner "powershell" { + scripts = [ + "${path.root}/../scripts/build/Install-ActionsCache.ps1", + "${path.root}/../scripts/build/Install-Ruby.ps1", + "${path.root}/../scripts/build/Install-PyPy.ps1", + "${path.root}/../scripts/build/Install-Toolset.ps1", + "${path.root}/../scripts/build/Configure-Toolset.ps1", + "${path.root}/../scripts/build/Install-NodeJS.ps1", + "${path.root}/../scripts/build/Install-AndroidSDK.ps1", + "${path.root}/../scripts/build/Install-PowershellAzModules.ps1", + "${path.root}/../scripts/build/Install-Pipx.ps1", + "${path.root}/../scripts/build/Install-Git.ps1", + "${path.root}/../scripts/build/Install-GitHub-CLI.ps1", + "${path.root}/../scripts/build/Install-PHP.ps1", + "${path.root}/../scripts/build/Install-Rust.ps1", + "${path.root}/../scripts/build/Install-Sbt.ps1", + "${path.root}/../scripts/build/Install-Chrome.ps1", + "${path.root}/../scripts/build/Install-EdgeDriver.ps1", + "${path.root}/../scripts/build/Install-Firefox.ps1", + "${path.root}/../scripts/build/Install-Selenium.ps1", + "${path.root}/../scripts/build/Install-IEWebDriver.ps1", + "${path.root}/../scripts/build/Install-Apache.ps1", + "${path.root}/../scripts/build/Install-Nginx.ps1", + "${path.root}/../scripts/build/Install-Msys2.ps1", + "${path.root}/../scripts/build/Install-WinAppDriver.ps1", + "${path.root}/../scripts/build/Install-R.ps1", + "${path.root}/../scripts/build/Install-AWSTools.ps1", + "${path.root}/../scripts/build/Install-DACFx.ps1", + "${path.root}/../scripts/build/Install-MysqlCli.ps1", + "${path.root}/../scripts/build/Install-SQLPowerShellTools.ps1", + "${path.root}/../scripts/build/Install-SQLOLEDBDriver.ps1", + "${path.root}/../scripts/build/Install-DotnetSDK.ps1", + "${path.root}/../scripts/build/Install-Mingw64.ps1", + "${path.root}/../scripts/build/Install-Haskell.ps1", + "${path.root}/../scripts/build/Install-Stack.ps1", + "${path.root}/../scripts/build/Install-Miniconda.ps1", + "${path.root}/../scripts/build/Install-AzureCosmosDbEmulator.ps1", + "${path.root}/../scripts/build/Install-Mercurial.ps1", + "${path.root}/../scripts/build/Install-Zstd.ps1", + "${path.root}/../scripts/build/Install-NSIS.ps1", + "${path.root}/../scripts/build/Install-CloudFoundryCli.ps1", + "${path.root}/../scripts/build/Install-Vcpkg.ps1", + "${path.root}/../scripts/build/Install-PostgreSQL.ps1", + "${path.root}/../scripts/build/Install-Bazel.ps1", + "${path.root}/../scripts/build/Install-AliyunCli.ps1", + "${path.root}/../scripts/build/Install-RootCA.ps1", + "${path.root}/../scripts/build/Install-MongoDB.ps1", + "${path.root}/../scripts/build/Install-GoogleCloudCLI.ps1", + "${path.root}/../scripts/build/Install-CodeQLBundle.ps1", + "${path.root}/../scripts/build/Install-BizTalkBuildComponent.ps1", + "${path.root}/../scripts/build/Configure-Diagnostics.ps1", + "${path.root}/../scripts/build/Configure-DynamicPort.ps1", + "${path.root}/../scripts/build/Configure-GDIProcessHandleQuota.ps1", + "${path.root}/../scripts/build/Configure-Shell.ps1", + "${path.root}/../scripts/build/Configure-DeveloperMode.ps1", + "${path.root}/../scripts/build/Install-LLVM.ps1" + ] + } + + provisioner "powershell" { + elevated_password = "${var.install_password}" + elevated_user = "${var.install_user}" + scripts = ["${path.root}/../scripts/build/Install-WindowsUpdates.ps1"] + } + + provisioner "windows-restart" { + check_registry = true + restart_check_command = "powershell -command \"& {if ((-not (Get-Process TiWorker.exe -ErrorAction SilentlyContinue)) -and (-not [System.Environment]::HasShutdownStarted) ) { Write-Output 'Restart complete' }}\"" + restart_timeout = "30m" + } + + provisioner "powershell" { + pause_before = "2m0s" + scripts = [ + "${path.root}/../scripts/build/Install-WindowsUpdatesAfterReboot.ps1", + "${path.root}/../scripts/tests/RunAll-Tests.ps1" + ] + } + + provisioner "powershell" { + inline = ["if (-not (Test-Path ${var.image_folder}\\tests\\testResults.xml)) { throw '${var.image_folder}\\tests\\testResults.xml not found' }"] + } + + provisioner "powershell" { + environment_vars = ["IMAGE_VERSION=${var.image_version}"] + inline = ["pwsh -File '${var.image_folder}\\SoftwareReport\\Generate-SoftwareReport.ps1'"] + } + + provisioner "powershell" { + inline = ["if (-not (Test-Path C:\\software-report.md)) { throw 'C:\\software-report.md not found' }", "if (-not (Test-Path C:\\software-report.json)) { throw 'C:\\software-report.json not found' }"] + } + + provisioner "file" { + destination = "${path.root}/../Windows2019-Readme.md" + direction = "download" + source = "C:\\software-report.md" + } + + provisioner "file" { + destination = "${path.root}/../software-report.json" + direction = "download" + source = "C:\\software-report.json" + } + + provisioner "powershell" { + environment_vars = ["INSTALL_USER=${var.install_user}"] + scripts = [ + "${path.root}/../scripts/build/Install-NativeImages.ps1", + "${path.root}/../scripts/build/Configure-System.ps1", + "${path.root}/../scripts/build/Configure-User.ps1" + ] + skip_clean = true + } + + provisioner "windows-restart" { + restart_timeout = "10m" + } + + provisioner "powershell" { + inline = [ + "if( Test-Path $env:SystemRoot\\System32\\Sysprep\\unattend.xml ){ rm $env:SystemRoot\\System32\\Sysprep\\unattend.xml -Force}", + "& $env:SystemRoot\\System32\\Sysprep\\Sysprep.exe /oobe /generalize /quiet /quit", + "while($true) { $imageState = Get-ItemProperty HKLM:\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Setup\\State | Select ImageState; if($imageState.ImageState -ne 'IMAGE_STATE_GENERALIZE_RESEAL_TO_OOBE') { Write-Output $imageState.ImageState; Start-Sleep -s 10 } else { break } }" + ] + } + +} diff --git a/images/windows/templates/windows-2022.json b/images/windows/templates/windows-2022.json deleted file mode 100644 index 8c303142ca87..000000000000 --- a/images/windows/templates/windows-2022.json +++ /dev/null @@ -1,355 +0,0 @@ -{ - "variables": { - "client_id": "{{env `ARM_CLIENT_ID`}}", - "client_secret": "{{env `ARM_CLIENT_SECRET`}}", - "client_cert_path": "{{env `ARM_CLIENT_CERT_PATH`}}", - "subscription_id": "{{env `ARM_SUBSCRIPTION_ID`}}", - "tenant_id": "{{env `ARM_TENANT_ID`}}", - "object_id": "{{env `ARM_OBJECT_ID`}}", - "managed_image_resource_group_name": "{{env `ARM_RESOURCE_GROUP`}}", - "managed_image_storage_account_type": "Premium_LRS", - "build_resource_group_name": "{{env `BUILD_RESOURCE_GROUP_NAME`}}", - "temp_resource_group_name": "{{env `TEMP_RESOURCE_GROUP_NAME`}}", - "location": "{{env `ARM_RESOURCE_LOCATION`}}", - "virtual_network_name": "{{env `VNET_NAME`}}", - "virtual_network_resource_group_name": "{{env `VNET_RESOURCE_GROUP`}}", - "virtual_network_subnet_name": "{{env `VNET_SUBNET`}}", - "private_virtual_network_with_public_ip": "{{env `PRIVATE_VIRTUAL_NETWORK_WITH_PUBLIC_IP`}}", - "allowed_inbound_ip_addresses": "{{env `AGENT_IP`}}", - "vm_size": "Standard_F8s_v2", - "image_folder": "C:\\image", - "imagedata_file": "C:\\imagedata.json", - "helper_script_folder": "C:\\Program Files\\WindowsPowerShell\\Modules\\", - "agent_tools_directory": "C:\\hostedtoolcache\\windows", - "install_user": "installer", - "install_password": null, - "managed_image_name": "packer-win22-dev", - "image_version": "dev", - "image_os": "win22" - }, - "sensitive-variables": [ - "install_password", - "client_secret" - ], - "builders": [ - { - "name": "image", - "type": "azure-arm", - "client_id": "{{user `client_id`}}", - "client_secret": "{{user `client_secret`}}", - "client_cert_path": "{{user `client_cert_path`}}", - "subscription_id": "{{user `subscription_id`}}", - "object_id": "{{user `object_id`}}", - "tenant_id": "{{user `tenant_id`}}", - "os_disk_size_gb": "256", - "location": "{{user `location`}}", - "vm_size": "{{user `vm_size`}}", - "managed_image_name": "{{user `managed_image_name`}}", - "managed_image_resource_group_name": "{{user `managed_image_resource_group_name`}}", - "managed_image_storage_account_type": "{{user `managed_image_storage_account_type`}}", - "build_resource_group_name": "{{user `build_resource_group_name`}}", - "temp_resource_group_name": "{{user `temp_resource_group_name`}}", - "virtual_network_name": "{{user `virtual_network_name`}}", - "virtual_network_resource_group_name": "{{user `virtual_network_resource_group_name`}}", - "virtual_network_subnet_name": "{{user `virtual_network_subnet_name`}}", - "private_virtual_network_with_public_ip": "{{user `private_virtual_network_with_public_ip`}}", - "allowed_inbound_ip_addresses": "{{user `allowed_inbound_ip_addresses`}}", - "os_type": "Windows", - "image_publisher": "MicrosoftWindowsServer", - "image_offer": "WindowsServer", - "image_sku": "2022-Datacenter", - "communicator": "winrm", - "winrm_use_ssl": "true", - "winrm_insecure": "true", - "winrm_username": "packer" - } - ], - "provisioners": [ - { - "type": "powershell", - "inline": [ - "New-Item -Path {{user `image_folder`}} -ItemType Directory -Force" - ] - }, - { - "type": "file", - "sources": [ - "{{ template_dir }}/../assets", - "{{ template_dir }}/../scripts", - "{{ template_dir }}/../toolsets" - ], - "destination": "{{user `image_folder`}}\\" - }, - { - "type": "file", - "source": "{{ template_dir }}/../../../helpers/software-report-base", - "destination": "{{user `image_folder`}}\\scripts\\docs-gen\\" - }, - { - "type": "powershell", - "inline": [ - "Move-Item '{{user `image_folder`}}\\assets\\post-gen' 'C:\\post-generation'", - "Remove-Item -Recurse '{{user `image_folder`}}\\assets'", - "Move-Item '{{user `image_folder`}}\\scripts\\docs-gen' '{{user `image_folder`}}\\SoftwareReport'", - "Move-Item '{{user `image_folder`}}\\scripts\\helpers' '{{user `helper_script_folder`}}\\ImageHelpers'", - "New-Item -Type Directory -Path '{{user `helper_script_folder`}}\\TestsHelpers\\'", - "Move-Item '{{user `image_folder`}}\\scripts\\tests\\Helpers.psm1' '{{user `helper_script_folder`}}\\TestsHelpers\\TestsHelpers.psm1'", - "Move-Item '{{user `image_folder`}}\\scripts\\tests' '{{user `image_folder`}}\\tests'", - "Remove-Item -Recurse '{{user `image_folder`}}\\scripts'", - "Move-Item '{{user `image_folder`}}\\toolsets\\toolset-2022.json' '{{user `image_folder`}}\\toolset.json'", - "Remove-Item -Recurse '{{user `image_folder`}}\\toolsets'" - ] - }, - { - "type": "windows-shell", - "inline": [ - "net user {{user `install_user`}} {{user `install_password`}} /add /passwordchg:no /passwordreq:yes /active:yes /Y", - "net localgroup Administrators {{user `install_user`}} /add", - "winrm set winrm/config/service/auth @{Basic=\"true\"}", - "winrm get winrm/config/service/auth" - ] - }, - { - "type": "powershell", - "inline": [ - "if (-not ((net localgroup Administrators) -contains '{{user `install_user`}}')) { exit 1 }" - ] - }, - { - "type": "powershell", - "inline": [ - "bcdedit.exe /set TESTSIGNING ON" - ], - "elevated_user": "{{user `install_user`}}", - "elevated_password": "{{user `install_password`}}" - }, - { - "type": "powershell", - "environment_vars": [ - "IMAGE_VERSION={{user `image_version`}}", - "IMAGE_OS={{user `image_os`}}", - "AGENT_TOOLSDIRECTORY={{user `agent_tools_directory`}}", - "IMAGEDATA_FILE={{user `imagedata_file`}}" - ], - "scripts": [ - "{{ template_dir }}/../scripts/build/Configure-WindowsDefender.ps1", - "{{ template_dir }}/../scripts/build/Configure-PowerShell.ps1", - "{{ template_dir }}/../scripts/build/Install-PowerShellModules.ps1", - "{{ template_dir }}/../scripts/build/Install-WindowsFeatures.ps1", - "{{ template_dir }}/../scripts/build/Install-Chocolatey.ps1", - "{{ template_dir }}/../scripts/build/Configure-BaseImage.ps1", - "{{ template_dir }}/../scripts/build/Configure-ImageDataFile.ps1", - "{{ template_dir }}/../scripts/build/Configure-SystemEnvironment.ps1", - "{{ template_dir }}/../scripts/build/Configure-DotnetSecureChannel.ps1" - ], - "execution_policy": "unrestricted" - }, - { - "type": "windows-restart", - "check_registry": true, - "restart_check_command": "powershell -command \"& {while ( (Get-WindowsOptionalFeature -Online -FeatureName Containers -ErrorAction SilentlyContinue).State -ne 'Enabled' ) { Start-Sleep 30; Write-Output 'InProgress' }}\"", - "restart_timeout": "10m" - }, - { - "type": "powershell", - "scripts": [ - "{{ template_dir }}/../scripts/build/Install-Docker.ps1", - "{{ template_dir }}/../scripts/build/Install-DockerWinCred.ps1", - "{{ template_dir }}/../scripts/build/Install-DockerCompose.ps1", - "{{ template_dir }}/../scripts/build/Install-PowershellCore.ps1", - "{{ template_dir }}/../scripts/build/Install-WebPlatformInstaller.ps1", - "{{ template_dir }}/../scripts/build/Install-Runner.ps1" - ] - }, - { - "type": "windows-restart", - "restart_timeout": "30m" - }, - { - "type": "powershell", - "valid_exit_codes": [ - 0, - 3010 - ], - "scripts": [ - "{{ template_dir }}/../scripts/build/Install-VisualStudio.ps1", - "{{ template_dir }}/../scripts/build/Install-KubernetesTools.ps1" - ], - "elevated_user": "{{user `install_user`}}", - "elevated_password": "{{user `install_password`}}" - }, - { - "type": "windows-restart", - "check_registry": true, - "restart_timeout": "10m" - }, - { - "type": "powershell", - "pause_before": "2m", - "scripts": [ - "{{ template_dir }}/../scripts/build/Install-Wix.ps1", - "{{ template_dir }}/../scripts/build/Install-WDK.ps1", - "{{ template_dir }}/../scripts/build/Install-VSExtensions.ps1", - "{{ template_dir }}/../scripts/build/Install-AzureCli.ps1", - "{{ template_dir }}/../scripts/build/Install-AzureDevOpsCli.ps1", - "{{ template_dir }}/../scripts/build/Install-ChocolateyPackages.ps1", - "{{ template_dir }}/../scripts/build/Install-JavaTools.ps1", - "{{ template_dir }}/../scripts/build/Install-Kotlin.ps1", - "{{ template_dir }}/../scripts/build/Install-OpenSSL.ps1" - ] - }, - { - "type": "powershell", - "scripts": [ - "{{ template_dir }}/../scripts/build/Install-ServiceFabricSDK.ps1" - ], - "execution_policy": "remotesigned" - }, - { - "type": "windows-restart", - "restart_timeout": "10m" - }, - { - "type": "windows-shell", - "inline": [ - "wmic product where \"name like '%%microsoft azure powershell%%'\" call uninstall /nointeractive" - ] - }, - { - "type": "powershell", - "scripts": [ - "{{ template_dir }}/../scripts/build/Install-ActionsCache.ps1", - "{{ template_dir }}/../scripts/build/Install-Ruby.ps1", - "{{ template_dir }}/../scripts/build/Install-PyPy.ps1", - "{{ template_dir }}/../scripts/build/Install-Toolset.ps1", - "{{ template_dir }}/../scripts/build/Configure-Toolset.ps1", - "{{ template_dir }}/../scripts/build/Install-NodeJS.ps1", - "{{ template_dir }}/../scripts/build/Install-AndroidSDK.ps1", - "{{ template_dir }}/../scripts/build/Install-PowershellAzModules.ps1", - "{{ template_dir }}/../scripts/build/Install-Pipx.ps1", - "{{ template_dir }}/../scripts/build/Install-Git.ps1", - "{{ template_dir }}/../scripts/build/Install-GitHub-CLI.ps1", - "{{ template_dir }}/../scripts/build/Install-PHP.ps1", - "{{ template_dir }}/../scripts/build/Install-Rust.ps1", - "{{ template_dir }}/../scripts/build/Install-Sbt.ps1", - "{{ template_dir }}/../scripts/build/Install-Chrome.ps1", - "{{ template_dir }}/../scripts/build/Install-EdgeDriver.ps1", - "{{ template_dir }}/../scripts/build/Install-Firefox.ps1", - "{{ template_dir }}/../scripts/build/Install-Selenium.ps1", - "{{ template_dir }}/../scripts/build/Install-IEWebDriver.ps1", - "{{ template_dir }}/../scripts/build/Install-Apache.ps1", - "{{ template_dir }}/../scripts/build/Install-Nginx.ps1", - "{{ template_dir }}/../scripts/build/Install-Msys2.ps1", - "{{ template_dir }}/../scripts/build/Install-WinAppDriver.ps1", - "{{ template_dir }}/../scripts/build/Install-R.ps1", - "{{ template_dir }}/../scripts/build/Install-AWSTools.ps1", - "{{ template_dir }}/../scripts/build/Install-DACFx.ps1", - "{{ template_dir }}/../scripts/build/Install-MysqlCli.ps1", - "{{ template_dir }}/../scripts/build/Install-SQLPowerShellTools.ps1", - "{{ template_dir }}/../scripts/build/Install-SQLOLEDBDriver.ps1", - "{{ template_dir }}/../scripts/build/Install-DotnetSDK.ps1", - "{{ template_dir }}/../scripts/build/Install-Mingw64.ps1", - "{{ template_dir }}/../scripts/build/Install-Haskell.ps1", - "{{ template_dir }}/../scripts/build/Install-Stack.ps1", - "{{ template_dir }}/../scripts/build/Install-Miniconda.ps1", - "{{ template_dir }}/../scripts/build/Install-AzureCosmosDbEmulator.ps1", - "{{ template_dir }}/../scripts/build/Install-Mercurial.ps1", - "{{ template_dir }}/../scripts/build/Install-Zstd.ps1", - "{{ template_dir }}/../scripts/build/Install-NSIS.ps1", - "{{ template_dir }}/../scripts/build/Install-Vcpkg.ps1", - "{{ template_dir }}/../scripts/build/Install-PostgreSQL.ps1", - "{{ template_dir }}/../scripts/build/Install-Bazel.ps1", - "{{ template_dir }}/../scripts/build/Install-AliyunCli.ps1", - "{{ template_dir }}/../scripts/build/Install-RootCA.ps1", - "{{ template_dir }}/../scripts/build/Install-MongoDB.ps1", - "{{ template_dir }}/../scripts/build/Install-CodeQLBundle.ps1", - "{{ template_dir }}/../scripts/build/Configure-Diagnostics.ps1" - ] - }, - { - "type": "powershell", - "scripts": [ - "{{ template_dir }}/../scripts/build/Install-WindowsUpdates.ps1", - "{{ template_dir }}/../scripts/build/Configure-DynamicPort.ps1", - "{{ template_dir }}/../scripts/build/Configure-GDIProcessHandleQuota.ps1", - "{{ template_dir }}/../scripts/build/Configure-Shell.ps1", - "{{ template_dir }}/../scripts/build/Configure-DeveloperMode.ps1", - "{{ template_dir }}/../scripts/build/Install-LLVM.ps1" - ], - "elevated_user": "{{user `install_user`}}", - "elevated_password": "{{user `install_password`}}" - }, - { - "type": "windows-restart", - "check_registry": true, - "restart_check_command": "powershell -command \"& {if ((-not (Get-Process TiWorker.exe -ErrorAction SilentlyContinue)) -and (-not [System.Environment]::HasShutdownStarted) ) { Write-Output 'Restart complete' }}\"", - "restart_timeout": "30m" - }, - { - "type": "powershell", - "pause_before": "2m", - "scripts": [ - "{{ template_dir }}/../scripts/build/Install-WindowsUpdatesAfterReboot.ps1", - "{{ template_dir }}/../scripts/tests/RunAll-Tests.ps1" - ] - }, - { - "type": "powershell", - "inline": [ - "if (-not (Test-Path {{user `image_folder`}}\\tests\\testResults.xml)) { throw '{{user `image_folder`}}\\tests\\testResults.xml not found' }" - ] - }, - { - "type": "powershell", - "inline": [ - "pwsh -File '{{user `image_folder`}}\\SoftwareReport\\Generate-SoftwareReport.ps1'" - ], - "environment_vars": [ - "IMAGE_VERSION={{user `image_version`}}" - ] - }, - { - "type": "powershell", - "inline": [ - "if (-not (Test-Path C:\\software-report.md)) { throw 'C:\\software-report.md not found' }", - "if (-not (Test-Path C:\\software-report.json)) { throw 'C:\\software-report.json not found' }" - ] - }, - { - "type": "file", - "source": "C:\\software-report.md", - "destination": "{{ template_dir }}/../Windows2022-Readme.md", - "direction": "download" - }, - { - "type": "file", - "source": "C:\\software-report.json", - "destination": "{{ template_dir }}/../software-report.json", - "direction": "download" - }, - { - "type": "powershell", - "skip_clean": true, - "scripts": [ - "{{ template_dir }}/../scripts/build/Install-NativeImages.ps1", - "{{ template_dir }}/../scripts/build/Configure-System.ps1", - "{{ template_dir }}/../scripts/build/Configure-User.ps1" - ], - "environment_vars": [ - "INSTALL_USER={{user `install_user`}}" - ] - }, - { - "type": "windows-restart", - "restart_timeout": "10m" - }, - { - "type": "powershell", - "inline": [ - "if( Test-Path $env:SystemRoot\\System32\\Sysprep\\unattend.xml ){ rm $env:SystemRoot\\System32\\Sysprep\\unattend.xml -Force}", - "& $env:SystemRoot\\System32\\Sysprep\\Sysprep.exe /oobe /generalize /mode:vm /quiet /quit", - "while($true) { $imageState = Get-ItemProperty HKLM:\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Setup\\State | Select ImageState; if($imageState.ImageState -ne 'IMAGE_STATE_GENERALIZE_RESEAL_TO_OOBE') { Write-Output $imageState.ImageState; Start-Sleep -s 10 } else { break } }" - ] - } - ] -} diff --git a/images/windows/templates/windows-2022.pkr.hcl b/images/windows/templates/windows-2022.pkr.hcl new file mode 100644 index 000000000000..19411aa1d2e0 --- /dev/null +++ b/images/windows/templates/windows-2022.pkr.hcl @@ -0,0 +1,441 @@ +packer { + required_plugins { + azure = { + source = "github.com/hashicorp/azure" + version = "~> 2" + } + } +} + +locals { + managed_image_name = var.managed_image_name != "" ? var.managed_image_name : "packer-${var.image_os}-${var.image_version}" +} + +variable "agent_tools_directory" { + type = string + default = "C:\\hostedtoolcache\\windows" +} + +variable "allowed_inbound_ip_addresses" { + type = list(string) + default = [] +} + +variable "azure_tags" { + type = map(string) + default = {} +} + +variable "build_resource_group_name" { + type = string + default = "${env("BUILD_RESOURCE_GROUP_NAME")}" +} + +variable "client_cert_path" { + type = string + default = "${env("ARM_CLIENT_CERT_PATH")}" +} + +variable "client_id" { + type = string + default = "${env("ARM_CLIENT_ID")}" +} + +variable "client_secret" { + type = string + default = "${env("ARM_CLIENT_SECRET")}" + sensitive = true +} + +variable "helper_script_folder" { + type = string + default = "C:\\Program Files\\WindowsPowerShell\\Modules\\" +} + +variable "image_folder" { + type = string + default = "C:\\image" +} + +variable "image_os" { + type = string + default = "win22" +} + +variable "image_version" { + type = string + default = "dev" +} + +variable "imagedata_file" { + type = string + default = "C:\\imagedata.json" +} + +variable "install_password" { + type = string + default = "" + sensitive = true +} + +variable "install_user" { + type = string + default = "installer" +} + +variable "location" { + type = string + default = "${env("ARM_RESOURCE_LOCATION")}" +} + +variable "managed_image_name" { + type = string + default = "" +} + +variable "managed_image_resource_group_name" { + type = string + default = "${env("ARM_RESOURCE_GROUP")}" +} + +variable "managed_image_storage_account_type" { + type = string + default = "Premium_LRS" +} + +variable "object_id" { + type = string + default = "${env("ARM_OBJECT_ID")}" +} + +variable "private_virtual_network_with_public_ip" { + type = bool + default = false +} + +variable "subscription_id" { + type = string + default = "${env("ARM_SUBSCRIPTION_ID")}" +} + +variable "temp_resource_group_name" { + type = string + default = "${env("TEMP_RESOURCE_GROUP_NAME")}" +} + +variable "tenant_id" { + type = string + default = "${env("ARM_TENANT_ID")}" +} + +variable "virtual_network_name" { + type = string + default = "${env("VNET_NAME")}" +} + +variable "virtual_network_resource_group_name" { + type = string + default = "${env("VNET_RESOURCE_GROUP")}" +} + +variable "virtual_network_subnet_name" { + type = string + default = "${env("VNET_SUBNET")}" +} + +variable "vm_size" { + type = string + default = "Standard_F8s_v2" +} + +source "azure-arm" "image" { + allowed_inbound_ip_addresses = "${var.allowed_inbound_ip_addresses}" + build_resource_group_name = "${var.build_resource_group_name}" + client_cert_path = "${var.client_cert_path}" + client_id = "${var.client_id}" + client_secret = "${var.client_secret}" + communicator = "winrm" + image_offer = "WindowsServer" + image_publisher = "MicrosoftWindowsServer" + image_sku = "2022-Datacenter" + location = "${var.location}" + managed_image_name = "${local.managed_image_name}" + managed_image_resource_group_name = "${var.managed_image_resource_group_name}" + managed_image_storage_account_type = "${var.managed_image_storage_account_type}" + object_id = "${var.object_id}" + os_disk_size_gb = "256" + os_type = "Windows" + private_virtual_network_with_public_ip = "${var.private_virtual_network_with_public_ip}" + subscription_id = "${var.subscription_id}" + temp_resource_group_name = "${var.temp_resource_group_name}" + tenant_id = "${var.tenant_id}" + virtual_network_name = "${var.virtual_network_name}" + virtual_network_resource_group_name = "${var.virtual_network_resource_group_name}" + virtual_network_subnet_name = "${var.virtual_network_subnet_name}" + vm_size = "${var.vm_size}" + winrm_insecure = "true" + winrm_use_ssl = "true" + winrm_username = "packer" + + dynamic "azure_tag" { + for_each = var.azure_tags + content { + name = azure_tag.key + value = azure_tag.value + } + } +} + +build { + sources = ["source.azure-arm.image"] + + provisioner "powershell" { + inline = ["New-Item -Path ${var.image_folder} -ItemType Directory -Force"] + } + + provisioner "file" { + destination = "${var.image_folder}\\" + sources = [ + "${path.root}/../assets", + "${path.root}/../scripts", + "${path.root}/../toolsets" + ] + } + + provisioner "file" { + destination = "${var.image_folder}\\scripts\\docs-gen\\" + source = "${path.root}/../../../helpers/software-report-base" + } + + provisioner "powershell" { + inline = [ + "Move-Item '${var.image_folder}\\assets\\post-gen' 'C:\\post-generation'", + "Remove-Item -Recurse '${var.image_folder}\\assets'", + "Move-Item '${var.image_folder}\\scripts\\docs-gen' '${var.image_folder}\\SoftwareReport'", + "Move-Item '${var.image_folder}\\scripts\\helpers' '${var.helper_script_folder}\\ImageHelpers'", + "New-Item -Type Directory -Path '${var.helper_script_folder}\\TestsHelpers\\'", + "Move-Item '${var.image_folder}\\scripts\\tests\\Helpers.psm1' '${var.helper_script_folder}\\TestsHelpers\\TestsHelpers.psm1'", + "Move-Item '${var.image_folder}\\scripts\\tests' '${var.image_folder}\\tests'", + "Remove-Item -Recurse '${var.image_folder}\\scripts'", + "Move-Item '${var.image_folder}\\toolsets\\toolset-2022.json' '${var.image_folder}\\toolset.json'", + "Remove-Item -Recurse '${var.image_folder}\\toolsets'" + ] + } + + provisioner "windows-shell" { + inline = [ + "net user ${var.install_user} ${var.install_password} /add /passwordchg:no /passwordreq:yes /active:yes /Y", + "net localgroup Administrators ${var.install_user} /add", + "winrm set winrm/config/service/auth @{Basic=\"true\"}", + "winrm get winrm/config/service/auth" + ] + } + + provisioner "powershell" { + inline = ["if (-not ((net localgroup Administrators) -contains '${var.install_user}')) { exit 1 }"] + } + + provisioner "powershell" { + elevated_password = "${var.install_password}" + elevated_user = "${var.install_user}" + inline = ["bcdedit.exe /set TESTSIGNING ON"] + } + + provisioner "powershell" { + environment_vars = ["IMAGE_VERSION=${var.image_version}", "IMAGE_OS=${var.image_os}", "AGENT_TOOLSDIRECTORY=${var.agent_tools_directory}", "IMAGEDATA_FILE=${var.imagedata_file}"] + execution_policy = "unrestricted" + scripts = [ + "${path.root}/../scripts/build/Configure-WindowsDefender.ps1", + "${path.root}/../scripts/build/Configure-PowerShell.ps1", + "${path.root}/../scripts/build/Install-PowerShellModules.ps1", + "${path.root}/../scripts/build/Install-WindowsFeatures.ps1", + "${path.root}/../scripts/build/Install-Chocolatey.ps1", + "${path.root}/../scripts/build/Configure-BaseImage.ps1", + "${path.root}/../scripts/build/Configure-ImageDataFile.ps1", + "${path.root}/../scripts/build/Configure-SystemEnvironment.ps1", + "${path.root}/../scripts/build/Configure-DotnetSecureChannel.ps1" + ] + } + + provisioner "windows-restart" { + check_registry = true + restart_check_command = "powershell -command \"& {while ( (Get-WindowsOptionalFeature -Online -FeatureName Containers -ErrorAction SilentlyContinue).State -ne 'Enabled' ) { Start-Sleep 30; Write-Output 'InProgress' }}\"" + restart_timeout = "10m" + } + + provisioner "powershell" { + scripts = [ + "${path.root}/../scripts/build/Install-Docker.ps1", + "${path.root}/../scripts/build/Install-DockerWinCred.ps1", + "${path.root}/../scripts/build/Install-DockerCompose.ps1", + "${path.root}/../scripts/build/Install-PowershellCore.ps1", + "${path.root}/../scripts/build/Install-WebPlatformInstaller.ps1", + "${path.root}/../scripts/build/Install-Runner.ps1" + ] + } + + provisioner "windows-restart" { + restart_timeout = "30m" + } + + provisioner "powershell" { + elevated_password = "${var.install_password}" + elevated_user = "${var.install_user}" + scripts = [ + "${path.root}/../scripts/build/Install-VisualStudio.ps1", + "${path.root}/../scripts/build/Install-KubernetesTools.ps1" + ] + valid_exit_codes = [0, 3010] + } + + provisioner "windows-restart" { + check_registry = true + restart_timeout = "10m" + } + + provisioner "powershell" { + pause_before = "2m0s" + scripts = [ + "${path.root}/../scripts/build/Install-Wix.ps1", + "${path.root}/../scripts/build/Install-WDK.ps1", + "${path.root}/../scripts/build/Install-VSExtensions.ps1", + "${path.root}/../scripts/build/Install-AzureCli.ps1", + "${path.root}/../scripts/build/Install-AzureDevOpsCli.ps1", + "${path.root}/../scripts/build/Install-ChocolateyPackages.ps1", + "${path.root}/../scripts/build/Install-JavaTools.ps1", + "${path.root}/../scripts/build/Install-Kotlin.ps1", + "${path.root}/../scripts/build/Install-OpenSSL.ps1" + ] + } + + provisioner "powershell" { + execution_policy = "remotesigned" + scripts = ["${path.root}/../scripts/build/Install-ServiceFabricSDK.ps1"] + } + + provisioner "windows-restart" { + restart_timeout = "10m" + } + + provisioner "windows-shell" { + inline = ["wmic product where \"name like '%%microsoft azure powershell%%'\" call uninstall /nointeractive"] + } + + provisioner "powershell" { + scripts = [ + "${path.root}/../scripts/build/Install-ActionsCache.ps1", + "${path.root}/../scripts/build/Install-Ruby.ps1", + "${path.root}/../scripts/build/Install-PyPy.ps1", + "${path.root}/../scripts/build/Install-Toolset.ps1", + "${path.root}/../scripts/build/Configure-Toolset.ps1", + "${path.root}/../scripts/build/Install-NodeJS.ps1", + "${path.root}/../scripts/build/Install-AndroidSDK.ps1", + "${path.root}/../scripts/build/Install-PowershellAzModules.ps1", + "${path.root}/../scripts/build/Install-Pipx.ps1", + "${path.root}/../scripts/build/Install-Git.ps1", + "${path.root}/../scripts/build/Install-GitHub-CLI.ps1", + "${path.root}/../scripts/build/Install-PHP.ps1", + "${path.root}/../scripts/build/Install-Rust.ps1", + "${path.root}/../scripts/build/Install-Sbt.ps1", + "${path.root}/../scripts/build/Install-Chrome.ps1", + "${path.root}/../scripts/build/Install-EdgeDriver.ps1", + "${path.root}/../scripts/build/Install-Firefox.ps1", + "${path.root}/../scripts/build/Install-Selenium.ps1", + "${path.root}/../scripts/build/Install-IEWebDriver.ps1", + "${path.root}/../scripts/build/Install-Apache.ps1", + "${path.root}/../scripts/build/Install-Nginx.ps1", + "${path.root}/../scripts/build/Install-Msys2.ps1", + "${path.root}/../scripts/build/Install-WinAppDriver.ps1", + "${path.root}/../scripts/build/Install-R.ps1", + "${path.root}/../scripts/build/Install-AWSTools.ps1", + "${path.root}/../scripts/build/Install-DACFx.ps1", + "${path.root}/../scripts/build/Install-MysqlCli.ps1", + "${path.root}/../scripts/build/Install-SQLPowerShellTools.ps1", + "${path.root}/../scripts/build/Install-SQLOLEDBDriver.ps1", + "${path.root}/../scripts/build/Install-DotnetSDK.ps1", + "${path.root}/../scripts/build/Install-Mingw64.ps1", + "${path.root}/../scripts/build/Install-Haskell.ps1", + "${path.root}/../scripts/build/Install-Stack.ps1", + "${path.root}/../scripts/build/Install-Miniconda.ps1", + "${path.root}/../scripts/build/Install-AzureCosmosDbEmulator.ps1", + "${path.root}/../scripts/build/Install-Mercurial.ps1", + "${path.root}/../scripts/build/Install-Zstd.ps1", + "${path.root}/../scripts/build/Install-NSIS.ps1", + "${path.root}/../scripts/build/Install-Vcpkg.ps1", "${path.root}/../scripts/build/Install-PostgreSQL.ps1", "${path.root}/../scripts/build/Install-Bazel.ps1", "${path.root}/../scripts/build/Install-AliyunCli.ps1", "${path.root}/../scripts/build/Install-RootCA.ps1", "${path.root}/../scripts/build/Install-MongoDB.ps1", "${path.root}/../scripts/build/Install-CodeQLBundle.ps1", "${path.root}/../scripts/build/Configure-Diagnostics.ps1"] + } + + provisioner "powershell" { + elevated_password = "${var.install_password}" + elevated_user = "${var.install_user}" + scripts = [ + "${path.root}/../scripts/build/Install-WindowsUpdates.ps1", + "${path.root}/../scripts/build/Configure-DynamicPort.ps1", + "${path.root}/../scripts/build/Configure-GDIProcessHandleQuota.ps1", + "${path.root}/../scripts/build/Configure-Shell.ps1", + "${path.root}/../scripts/build/Configure-DeveloperMode.ps1", + "${path.root}/../scripts/build/Install-LLVM.ps1" + ] + } + + provisioner "windows-restart" { + check_registry = true + restart_check_command = "powershell -command \"& {if ((-not (Get-Process TiWorker.exe -ErrorAction SilentlyContinue)) -and (-not [System.Environment]::HasShutdownStarted) ) { Write-Output 'Restart complete' }}\"" + restart_timeout = "30m" + } + + provisioner "powershell" { + pause_before = "2m0s" + scripts = [ + "${path.root}/../scripts/build/Install-WindowsUpdatesAfterReboot.ps1", + "${path.root}/../scripts/tests/RunAll-Tests.ps1" + ] + } + + provisioner "powershell" { + inline = ["if (-not (Test-Path ${var.image_folder}\\tests\\testResults.xml)) { throw '${var.image_folder}\\tests\\testResults.xml not found' }"] + } + + provisioner "powershell" { + environment_vars = ["IMAGE_VERSION=${var.image_version}"] + inline = ["pwsh -File '${var.image_folder}\\SoftwareReport\\Generate-SoftwareReport.ps1'"] + } + + provisioner "powershell" { + inline = ["if (-not (Test-Path C:\\software-report.md)) { throw 'C:\\software-report.md not found' }", "if (-not (Test-Path C:\\software-report.json)) { throw 'C:\\software-report.json not found' }"] + } + + provisioner "file" { + destination = "${path.root}/../Windows2022-Readme.md" + direction = "download" + source = "C:\\software-report.md" + } + + provisioner "file" { + destination = "${path.root}/../software-report.json" + direction = "download" + source = "C:\\software-report.json" + } + + provisioner "powershell" { + environment_vars = ["INSTALL_USER=${var.install_user}"] + scripts = [ + "${path.root}/../scripts/build/Install-NativeImages.ps1", + "${path.root}/../scripts/build/Configure-System.ps1", + "${path.root}/../scripts/build/Configure-User.ps1" + ] + skip_clean = true + } + + provisioner "windows-restart" { + restart_timeout = "10m" + } + + provisioner "powershell" { + inline = [ + "if( Test-Path $env:SystemRoot\\System32\\Sysprep\\unattend.xml ){ rm $env:SystemRoot\\System32\\Sysprep\\unattend.xml -Force}", + "& $env:SystemRoot\\System32\\Sysprep\\Sysprep.exe /oobe /generalize /mode:vm /quiet /quit", + "while($true) { $imageState = Get-ItemProperty HKLM:\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Setup\\State | Select ImageState; if($imageState.ImageState -ne 'IMAGE_STATE_GENERALIZE_RESEAL_TO_OOBE') { Write-Output $imageState.ImageState; Start-Sleep -s 10 } else { break } }" + ] + } + +} From a5519ebed0d5c6fc2ddb5a5199d4fc9a1cddbc59 Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Wed, 13 Dec 2023 09:19:03 +0100 Subject: [PATCH 2528/3485] [ubuntu] Change packer templates from json to hcl (#8991) * [ubuntu] Change packer tempaltes from json to hcl * Add packer init * Fix variable types for Ubuntu20 template --- helpers/GenerateResourcesAndImage.ps1 | 2 +- .../azure-pipelines/ubuntu2004.yml | 2 +- images/ubuntu/templates/ubuntu-20.04.json | 395 ---------------- images/ubuntu/templates/ubuntu-20.04.pkr.hcl | 432 ++++++++++++++++++ images/ubuntu/templates/ubuntu-22.04.pkr.hcl | 173 +++---- .../ubuntu/templates/ubuntu-minimal.pkr.hcl | 54 ++- 6 files changed, 552 insertions(+), 506 deletions(-) delete mode 100644 images/ubuntu/templates/ubuntu-20.04.json create mode 100644 images/ubuntu/templates/ubuntu-20.04.pkr.hcl diff --git a/helpers/GenerateResourcesAndImage.ps1 b/helpers/GenerateResourcesAndImage.ps1 index 272b0ce1ddc7..650ccac6a758 100644 --- a/helpers/GenerateResourcesAndImage.ps1 +++ b/helpers/GenerateResourcesAndImage.ps1 @@ -25,7 +25,7 @@ Function Get-PackerTemplatePath { $relativeTemplatePath = Join-Path (Join-Path "windows" "templates") "windows-2022.pkr.hcl" } ([ImageType]::Ubuntu2004) { - $relativeTemplatePath = Join-Path (Join-Path "ubuntu" "templates") "ubuntu-20.04.json" + $relativeTemplatePath = Join-Path (Join-Path "ubuntu" "templates") "ubuntu-20.04.pkr.hcl" } ([ImageType]::Ubuntu2204) { $relativeTemplatePath = Join-Path (Join-Path "ubuntu" "templates") "ubuntu-22.04.pkr.hcl" diff --git a/images.CI/linux-and-win/azure-pipelines/ubuntu2004.yml b/images.CI/linux-and-win/azure-pipelines/ubuntu2004.yml index 528e8d0dd341..948e76404a47 100644 --- a/images.CI/linux-and-win/azure-pipelines/ubuntu2004.yml +++ b/images.CI/linux-and-win/azure-pipelines/ubuntu2004.yml @@ -18,4 +18,4 @@ jobs: parameters: image_type: ubuntu2004 image_readme_name: Ubuntu2004-Readme.md - image_template_name: ubuntu-20.04.json + image_template_name: ubuntu-20.04.pkr.hcl diff --git a/images/ubuntu/templates/ubuntu-20.04.json b/images/ubuntu/templates/ubuntu-20.04.json deleted file mode 100644 index e1d36d398b74..000000000000 --- a/images/ubuntu/templates/ubuntu-20.04.json +++ /dev/null @@ -1,395 +0,0 @@ -{ - "variables": { - "client_id": "{{env `ARM_CLIENT_ID`}}", - "client_secret": "{{env `ARM_CLIENT_SECRET`}}", - "client_cert_path": "{{env `ARM_CLIENT_CERT_PATH`}}", - "subscription_id": "{{env `ARM_SUBSCRIPTION_ID`}}", - "tenant_id": "{{env `ARM_TENANT_ID`}}", - "managed_image_resource_group_name": "{{env `ARM_RESOURCE_GROUP`}}", - "build_resource_group_name": "{{env `BUILD_RESOURCE_GROUP_NAME`}}", - "temp_resource_group_name": "{{env `TEMP_RESOURCE_GROUP_NAME`}}", - "location": "{{env `ARM_RESOURCE_LOCATION`}}", - "virtual_network_name": "{{env `VNET_NAME`}}", - "virtual_network_resource_group_name": "{{env `VNET_RESOURCE_GROUP`}}", - "virtual_network_subnet_name": "{{env `VNET_SUBNET`}}", - "private_virtual_network_with_public_ip": "{{env `PRIVATE_VIRTUAL_NETWORK_WITH_PUBLIC_IP`}}", - "allowed_inbound_ip_addresses": "{{env `AGENT_IP`}}", - "image_folder": "/imagegeneration", - "imagedata_file": "/imagegeneration/imagedata.json", - "installer_script_folder": "/imagegeneration/installers", - "helper_script_folder": "/imagegeneration/helpers", - "vm_size": "Standard_D4s_v4", - "managed_image_name": "packer-ubuntu20-dev", - "image_version": "dev", - "image_os": "ubuntu20", - "dockerhub_login": "{{env `DOCKERHUB_LOGIN`}}", - "dockerhub_password": "{{env `DOCKERHUB_PASSWORD`}}" - }, - "sensitive-variables": [ - "client_secret" - ], - "builders": [ - { - "type": "azure-arm", - "client_id": "{{user `client_id`}}", - "client_secret": "{{user `client_secret`}}", - "client_cert_path": "{{user `client_cert_path`}}", - "subscription_id": "{{user `subscription_id`}}", - "tenant_id": "{{user `tenant_id`}}", - "location": "{{user `location`}}", - "vm_size": "{{user `vm_size`}}", - "managed_image_name": "{{user `managed_image_name`}}", - "managed_image_resource_group_name": "{{user `managed_image_resource_group_name`}}", - "build_resource_group_name": "{{user `build_resource_group_name`}}", - "temp_resource_group_name": "{{user `temp_resource_group_name`}}", - "virtual_network_name": "{{user `virtual_network_name`}}", - "virtual_network_resource_group_name": "{{user `virtual_network_resource_group_name`}}", - "virtual_network_subnet_name": "{{user `virtual_network_subnet_name`}}", - "private_virtual_network_with_public_ip": "{{user `private_virtual_network_with_public_ip`}}", - "allowed_inbound_ip_addresses": "{{user `allowed_inbound_ip_addresses`}}", - "os_type": "Linux", - "image_publisher": "canonical", - "image_offer": "0001-com-ubuntu-server-focal", - "image_sku": "20_04-lts", - "os_disk_size_gb": "86" - } - ], - "provisioners": [ - { - "type": "shell", - "inline": [ - "mkdir {{user `image_folder`}}", - "chmod 777 {{user `image_folder`}}" - ], - "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" - }, - { - "type": "shell", - "script": "{{template_dir}}/../scripts/build/configure-apt-mock.sh", - "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" - }, - { - "type": "shell", - "scripts": [ - "{{template_dir}}/../scripts/build/install-ms-repos.sh", - "{{template_dir}}/../scripts/build/configure-apt-sources.sh", - "{{template_dir}}/../scripts/build/configure-apt.sh" - ], - "environment_vars": [ - "DEBIAN_FRONTEND=noninteractive" - ], - "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" - }, - { - "type": "shell", - "script": "{{template_dir}}/../scripts/build/configure-limits.sh", - "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" - }, - { - "type": "file", - "source": "{{template_dir}}/../scripts/helpers", - "destination": "{{user `helper_script_folder`}}" - }, - { - "type": "file", - "source": "{{template_dir}}/../scripts/build", - "destination": "{{user `installer_script_folder`}}" - }, - { - "type": "file", - "sources": [ - "{{template_dir}}/../scripts/tests", - "{{template_dir}}/../scripts/docs-gen", - "{{template_dir}}/../assets/post-gen" - ], - "destination": "{{user `image_folder`}}" - }, - { - "type": "file", - "source": "{{template_dir}}/../../../helpers/software-report-base", - "destination": "{{user `image_folder`}}/docs-gen/" - }, - { - "type": "file", - "source": "{{template_dir}}/../toolsets/toolset-2004.json", - "destination": "{{user `installer_script_folder`}}/toolset.json" - }, - { - "type": "shell", - "inline": [ - "mv {{user `image_folder`}}/docs-gen {{user `image_folder`}}/SoftwareReport", - "mv {{user `image_folder`}}/post-gen {{user `image_folder`}}/post-generation" - ], - "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" - }, - { - "type": "shell", - "scripts": [ - "{{template_dir}}/../scripts/build/configure-image-data.sh" - ], - "environment_vars": [ - "IMAGE_VERSION={{user `image_version`}}", - "IMAGEDATA_FILE={{user `imagedata_file`}}" - ], - "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" - }, - { - "type": "shell", - "scripts": [ - "{{template_dir}}/../scripts/build/configure-environment.sh" - ], - "environment_vars": [ - "IMAGE_VERSION={{user `image_version`}}", - "IMAGE_OS={{user `image_os`}}", - "HELPER_SCRIPTS={{user `helper_script_folder`}}" - ], - "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" - }, - { - "type": "shell", - "scripts": [ - "{{template_dir}}/../scripts/build/install-apt-vital.sh" - ], - "environment_vars": [ - "HELPER_SCRIPTS={{user `helper_script_folder`}}", - "INSTALLER_SCRIPT_FOLDER={{user `installer_script_folder`}}", - "DEBIAN_FRONTEND=noninteractive" - ], - "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" - }, - { - "type": "shell", - "scripts": [ - "{{template_dir}}/../scripts/build/install-powershell.sh" - ], - "environment_vars": [ - "HELPER_SCRIPTS={{user `helper_script_folder`}}" - ], - "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" - }, - { - "type": "shell", - "scripts": [ - "{{template_dir}}/../scripts/build/Install-PowerShellModules.ps1", - "{{template_dir}}/../scripts/build/Install-PowerShellAzModules.ps1" - ], - "environment_vars": [ - "HELPER_SCRIPTS={{user `helper_script_folder`}}", - "INSTALLER_SCRIPT_FOLDER={{user `installer_script_folder`}}" - ], - "execute_command": "sudo sh -c '{{ .Vars }} pwsh -f {{ .Path }}'" - }, - { - "type": "shell", - "scripts": [ - "{{template_dir}}/../scripts/build/install-actions-cache.sh", - "{{template_dir}}/../scripts/build/install-runner-package.sh", - "{{template_dir}}/../scripts/build/install-apt-common.sh", - "{{template_dir}}/../scripts/build/install-azcopy.sh", - "{{template_dir}}/../scripts/build/install-azure-cli.sh", - "{{template_dir}}/../scripts/build/install-azure-devops-cli.sh", - "{{template_dir}}/../scripts/build/install-bicep.sh", - "{{template_dir}}/../scripts/build/install-aliyun-cli.sh", - "{{template_dir}}/../scripts/build/install-apache.sh", - "{{template_dir}}/../scripts/build/install-aws-tools.sh", - "{{template_dir}}/../scripts/build/install-clang.sh", - "{{template_dir}}/../scripts/build/install-swift.sh", - "{{template_dir}}/../scripts/build/install-cmake.sh", - "{{template_dir}}/../scripts/build/install-codeql-bundle.sh", - "{{template_dir}}/../scripts/build/install-container-tools.sh", - "{{template_dir}}/../scripts/build/install-dotnetcore-sdk.sh", - "{{template_dir}}/../scripts/build/install-erlang.sh", - "{{template_dir}}/../scripts/build/install-firefox.sh", - "{{template_dir}}/../scripts/build/install-microsoft-edge.sh", - "{{template_dir}}/../scripts/build/install-gcc-compilers.sh", - "{{template_dir}}/../scripts/build/install-gfortran.sh", - "{{template_dir}}/../scripts/build/install-git.sh", - "{{template_dir}}/../scripts/build/install-git-lfs.sh", - "{{template_dir}}/../scripts/build/install-github-cli.sh", - "{{template_dir}}/../scripts/build/install-google-chrome.sh", - "{{template_dir}}/../scripts/build/install-google-cloud-cli.sh", - "{{template_dir}}/../scripts/build/install-haskell.sh", - "{{template_dir}}/../scripts/build/install-heroku.sh", - "{{template_dir}}/../scripts/build/install-hhvm.sh", - "{{template_dir}}/../scripts/build/install-java-tools.sh", - "{{template_dir}}/../scripts/build/install-kubernetes-tools.sh", - "{{template_dir}}/../scripts/build/install-oc-cli.sh", - "{{template_dir}}/../scripts/build/install-leiningen.sh", - "{{template_dir}}/../scripts/build/install-miniconda.sh", - "{{template_dir}}/../scripts/build/install-mono.sh", - "{{template_dir}}/../scripts/build/install-kotlin.sh", - "{{template_dir}}/../scripts/build/install-mysql.sh", - "{{template_dir}}/../scripts/build/install-mssql-tools.sh", - "{{template_dir}}/../scripts/build/install-sqlpackage.sh", - "{{template_dir}}/../scripts/build/install-nginx.sh", - "{{template_dir}}/../scripts/build/install-nvm.sh", - "{{template_dir}}/../scripts/build/install-nodejs.sh", - "{{template_dir}}/../scripts/build/install-bazel.sh", - "{{template_dir}}/../scripts/build/install-oras-cli.sh", - "{{template_dir}}/../scripts/build/install-phantomjs.sh", - "{{template_dir}}/../scripts/build/install-php.sh", - "{{template_dir}}/../scripts/build/install-postgresql.sh", - "{{template_dir}}/../scripts/build/install-pulumi.sh", - "{{template_dir}}/../scripts/build/install-ruby.sh", - "{{template_dir}}/../scripts/build/install-rlang.sh", - "{{template_dir}}/../scripts/build/install-rust.sh", - "{{template_dir}}/../scripts/build/install-julia.sh", - "{{template_dir}}/../scripts/build/install-sbt.sh", - "{{template_dir}}/../scripts/build/install-selenium.sh", - "{{template_dir}}/../scripts/build/install-terraform.sh", - "{{template_dir}}/../scripts/build/install-packer.sh", - "{{template_dir}}/../scripts/build/install-vcpkg.sh", - "{{template_dir}}/../scripts/build/configure-dpkg.sh", - "{{template_dir}}/../scripts/build/install-mongodb.sh", - "{{template_dir}}/../scripts/build/install-yq.sh", - "{{template_dir}}/../scripts/build/install-android-sdk.sh", - "{{template_dir}}/../scripts/build/install-pypy.sh", - "{{template_dir}}/../scripts/build/install-python.sh", - "{{template_dir}}/../scripts/build/install-zstd.sh" - ], - "environment_vars": [ - "HELPER_SCRIPTS={{user `helper_script_folder`}}", - "INSTALLER_SCRIPT_FOLDER={{user `installer_script_folder`}}", - "DEBIAN_FRONTEND=noninteractive" - ], - "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" - }, - { - "type": "shell", - "scripts": [ - "{{template_dir}}/../scripts/build/install-docker-compose.sh", - "{{template_dir}}/../scripts/build/install-docker.sh" - ], - "environment_vars": [ - "HELPER_SCRIPTS={{user `helper_script_folder`}}", - "INSTALLER_SCRIPT_FOLDER={{user `installer_script_folder`}}", - "DOCKERHUB_LOGIN={{user `dockerhub_login`}}", - "DOCKERHUB_PASSWORD={{user `dockerhub_password`}}" - ], - "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" - }, - { - "type": "shell", - "scripts": [ - "{{template_dir}}/../scripts/build/Install-Toolset.ps1", - "{{template_dir}}/../scripts/build/Configure-Toolset.ps1" - ], - "environment_vars": [ - "HELPER_SCRIPTS={{user `helper_script_folder`}}", - "INSTALLER_SCRIPT_FOLDER={{user `installer_script_folder`}}" - ], - "execute_command": "sudo sh -c '{{ .Vars }} pwsh -f {{ .Path }}'" - }, - { - "type": "shell", - "scripts": [ - "{{template_dir}}/../scripts/build/install-pipx-packages.sh" - ], - "environment_vars": [ - "HELPER_SCRIPTS={{user `helper_script_folder`}}", - "INSTALLER_SCRIPT_FOLDER={{user `installer_script_folder`}}" - ], - "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" - }, - { - "type": "shell", - "scripts": [ - "{{template_dir}}/../scripts/build/install-homebrew.sh" - ], - "environment_vars": [ - "HELPER_SCRIPTS={{user `helper_script_folder`}}", - "DEBIAN_FRONTEND=noninteractive", - "INSTALLER_SCRIPT_FOLDER={{user `installer_script_folder`}}" - ], - "execute_command": "/bin/sh -c '{{ .Vars }} {{ .Path }}'" - }, - { - "type": "shell", - "scripts": [ - "{{template_dir}}/../scripts/build/configure-snap.sh" - ], - "environment_vars": [ - "HELPER_SCRIPTS={{user `helper_script_folder`}}" - ], - "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" - }, - { - "type": "shell", - "expect_disconnect": true, - "inline": [ - "echo 'Reboot VM'", - "sudo reboot" - ], - "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" - }, - { - "type": "shell", - "pause_before": "60s", - "start_retry_timeout": "10m", - "scripts": [ - "{{template_dir}}/../scripts/build/cleanup.sh" - ], - "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" - }, - { - "type": "shell", - "max_retries": 3, - "start_retry_timeout": "2m", - "inline": [ - "pwsh -Command Write-Host Running Generate-SoftwareReport.ps1 script", - "pwsh -File {{user `image_folder`}}/SoftwareReport/Generate-SoftwareReport.ps1 -OutputDirectory {{user `image_folder`}}", - "pwsh -Command Write-Host Running RunAll-Tests.ps1 script", - "pwsh -File {{user `image_folder`}}/tests/RunAll-Tests.ps1 -OutputDirectory {{user `image_folder`}}" - ], - "environment_vars": [ - "IMAGE_VERSION={{user `image_version`}}", - "INSTALLER_SCRIPT_FOLDER={{user `installer_script_folder`}}" - ] - }, - { - "type": "file", - "source": "{{user `image_folder`}}/software-report.md", - "destination": "{{template_dir}}/../Ubuntu2004-Readme.md", - "direction": "download" - }, - { - "type": "file", - "source": "{{user `image_folder`}}/software-report.json", - "destination": "{{template_dir}}/../software-report.json", - "direction": "download" - }, - { - "type": "shell", - "scripts":[ - "{{template_dir}}/../scripts/build/configure-system.sh" - ], - "environment_vars":[ - "HELPER_SCRIPT_FOLDER={{user `helper_script_folder`}}", - "INSTALLER_SCRIPT_FOLDER={{user `installer_script_folder`}}", - "IMAGE_FOLDER={{user `image_folder`}}" - ], - "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" - }, - { - "type": "file", - "source": "{{template_dir}}/../assets/ubuntu2004.conf", - "destination": "/tmp/" - }, - { - "type": "shell", - "inline": [ - "mkdir -p /etc/vsts", - "cp /tmp/ubuntu2004.conf /etc/vsts/machine_instance.conf" - ], - "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" - }, - { - "type": "shell", - "inline": [ - "sleep 30", - "/usr/sbin/waagent -force -deprovision+user && export HISTSIZE=0 && sync" - ], - "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" - } - ] -} diff --git a/images/ubuntu/templates/ubuntu-20.04.pkr.hcl b/images/ubuntu/templates/ubuntu-20.04.pkr.hcl new file mode 100644 index 000000000000..f3a911bf508c --- /dev/null +++ b/images/ubuntu/templates/ubuntu-20.04.pkr.hcl @@ -0,0 +1,432 @@ +packer { + required_plugins { + azure = { + source = "github.com/hashicorp/azure" + version = "~> 2" + } + } +} + +locals { + managed_image_name = var.managed_image_name != "" ? var.managed_image_name : "packer-${var.image_os}-${var.image_version}" +} + +variable "allowed_inbound_ip_addresses" { + type = list(string) + default = [] +} + +variable "azure_tags" { + type = map(string) + default = {} +} + +variable "build_resource_group_name" { + type = string + default = "${env("BUILD_RESOURCE_GROUP_NAME")}" +} + +variable "client_cert_path" { + type = string + default = "${env("ARM_CLIENT_CERT_PATH")}" +} + +variable "client_id" { + type = string + default = "${env("ARM_CLIENT_ID")}" +} + +variable "client_secret" { + type = string + default = "${env("ARM_CLIENT_SECRET")}" + sensitive = true +} + +variable "dockerhub_login" { + type = string + default = "${env("DOCKERHUB_LOGIN")}" +} + +variable "dockerhub_password" { + type = string + default = "${env("DOCKERHUB_PASSWORD")}" +} + +variable "helper_script_folder" { + type = string + default = "/imagegeneration/helpers" +} + +variable "image_folder" { + type = string + default = "/imagegeneration" +} + +variable "image_os" { + type = string + default = "ubuntu20" +} + +variable "image_version" { + type = string + default = "dev" +} + +variable "imagedata_file" { + type = string + default = "/imagegeneration/imagedata.json" +} + +variable "installer_script_folder" { + type = string + default = "/imagegeneration/installers" +} + +variable "install_password" { + type = string + default = "" + sensitive = true +} + +variable "location" { + type = string + default = "${env("ARM_RESOURCE_LOCATION")}" +} + +variable "managed_image_name" { + type = string + default = "" +} + +variable "managed_image_resource_group_name" { + type = string + default = "${env("ARM_RESOURCE_GROUP")}" +} + +variable "private_virtual_network_with_public_ip" { + type = bool + default = false +} + +variable "subscription_id" { + type = string + default = "${env("ARM_SUBSCRIPTION_ID")}" +} + +variable "temp_resource_group_name" { + type = string + default = "${env("TEMP_RESOURCE_GROUP_NAME")}" +} + +variable "tenant_id" { + type = string + default = "${env("ARM_TENANT_ID")}" +} + +variable "virtual_network_name" { + type = string + default = "${env("VNET_NAME")}" +} + +variable "virtual_network_resource_group_name" { + type = string + default = "${env("VNET_RESOURCE_GROUP")}" +} + +variable "virtual_network_subnet_name" { + type = string + default = "${env("VNET_SUBNET")}" +} + +variable "vm_size" { + type = string + default = "Standard_D4s_v4" +} + +source "azure-arm" "build_image" { + allowed_inbound_ip_addresses = "${var.allowed_inbound_ip_addresses}" + build_resource_group_name = "${var.build_resource_group_name}" + client_cert_path = "${var.client_cert_path}" + client_id = "${var.client_id}" + client_secret = "${var.client_secret}" + image_offer = "0001-com-ubuntu-server-focal" + image_publisher = "canonical" + image_sku = "20_04-lts" + location = "${var.location}" + managed_image_name = "${local.managed_image_name}" + managed_image_resource_group_name = "${var.managed_image_resource_group_name}" + os_disk_size_gb = "86" + os_type = "Linux" + private_virtual_network_with_public_ip = "${var.private_virtual_network_with_public_ip}" + subscription_id = "${var.subscription_id}" + temp_resource_group_name = "${var.temp_resource_group_name}" + tenant_id = "${var.tenant_id}" + virtual_network_name = "${var.virtual_network_name}" + virtual_network_resource_group_name = "${var.virtual_network_resource_group_name}" + virtual_network_subnet_name = "${var.virtual_network_subnet_name}" + vm_size = "${var.vm_size}" + + dynamic "azure_tag" { + for_each = var.azure_tags + content { + name = azure_tag.key + value = azure_tag.value + } + } +} + +build { + sources = ["source.azure-arm.build_image"] + + provisioner "shell" { + execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" + inline = ["mkdir ${var.image_folder}", "chmod 777 ${var.image_folder}"] + } + + provisioner "shell" { + execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" + script = "${path.root}/../scripts/build/configure-apt-mock.sh" + } + + provisioner "shell" { + environment_vars = ["DEBIAN_FRONTEND=noninteractive"] + execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" + scripts = [ + "${path.root}/../scripts/build/install-ms-repos.sh", + "${path.root}/../scripts/build/configure-apt-sources.sh", + "${path.root}/../scripts/build/configure-apt.sh" + ] + } + + provisioner "shell" { + execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" + script = "${path.root}/../scripts/build/configure-limits.sh" + } + + provisioner "file" { + destination = "${var.helper_script_folder}" + source = "${path.root}/../scripts/helpers" + } + + provisioner "file" { + destination = "${var.installer_script_folder}" + source = "${path.root}/../scripts/build" + } + + provisioner "file" { + destination = "${var.image_folder}" + sources = [ + "${path.root}/../assets/post-gen", + "${path.root}/../scripts/tests", + "${path.root}/../scripts/docs-gen" + ] + } + + provisioner "file" { + destination = "${var.image_folder}/docs-gen/" + source = "${path.root}/../../../helpers/software-report-base" + } + + provisioner "file" { + destination = "${var.installer_script_folder}/toolset.json" + source = "${path.root}/../toolsets/toolset-2004.json" + } + + provisioner "shell" { + execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" + inline = [ + "mv ${var.image_folder}/docs-gen ${var.image_folder}/SoftwareReport", + "mv ${var.image_folder}/post-gen ${var.image_folder}/post-generation" + ] + } + + provisioner "shell" { + environment_vars = ["IMAGE_VERSION=${var.image_version}", "IMAGEDATA_FILE=${var.imagedata_file}"] + execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" + scripts = ["${path.root}/../scripts/build/configure-image-data.sh"] + } + + provisioner "shell" { + environment_vars = ["IMAGE_VERSION=${var.image_version}", "IMAGE_OS=${var.image_os}", "HELPER_SCRIPTS=${var.helper_script_folder}"] + execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" + scripts = ["${path.root}/../scripts/build/configure-environment.sh"] + } + + provisioner "shell" { + environment_vars = ["DEBIAN_FRONTEND=noninteractive", "HELPER_SCRIPTS=${var.helper_script_folder}", "INSTALLER_SCRIPT_FOLDER=${var.installer_script_folder}"] + execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" + scripts = ["${path.root}/../scripts/build/install-apt-vital.sh"] + } + + provisioner "shell" { + environment_vars = ["HELPER_SCRIPTS=${var.helper_script_folder}"] + execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" + scripts = ["${path.root}/../scripts/build/install-powershell.sh"] + } + + provisioner "shell" { + environment_vars = ["HELPER_SCRIPTS=${var.helper_script_folder}", "INSTALLER_SCRIPT_FOLDER=${var.installer_script_folder}"] + execute_command = "sudo sh -c '{{ .Vars }} pwsh -f {{ .Path }}'" + scripts = ["${path.root}/../scripts/build/Install-PowerShellModules.ps1", "${path.root}/../scripts/build/Install-PowerShellAzModules.ps1"] + } + + provisioner "shell" { + environment_vars = ["HELPER_SCRIPTS=${var.helper_script_folder}", "INSTALLER_SCRIPT_FOLDER=${var.installer_script_folder}", "DEBIAN_FRONTEND=noninteractive"] + execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" + scripts = [ + "${path.root}/../scripts/build/install-actions-cache.sh", + "${path.root}/../scripts/build/install-runner-package.sh", + "${path.root}/../scripts/build/install-apt-common.sh", + "${path.root}/../scripts/build/install-azcopy.sh", + "${path.root}/../scripts/build/install-azure-cli.sh", + "${path.root}/../scripts/build/install-azure-devops-cli.sh", + "${path.root}/../scripts/build/install-bicep.sh", + "${path.root}/../scripts/build/install-aliyun-cli.sh", + "${path.root}/../scripts/build/install-apache.sh", + "${path.root}/../scripts/build/install-aws-tools.sh", + "${path.root}/../scripts/build/install-clang.sh", + "${path.root}/../scripts/build/install-swift.sh", + "${path.root}/../scripts/build/install-cmake.sh", + "${path.root}/../scripts/build/install-codeql-bundle.sh", + "${path.root}/../scripts/build/install-container-tools.sh", + "${path.root}/../scripts/build/install-dotnetcore-sdk.sh", + "${path.root}/../scripts/build/install-erlang.sh", + "${path.root}/../scripts/build/install-firefox.sh", + "${path.root}/../scripts/build/install-microsoft-edge.sh", + "${path.root}/../scripts/build/install-gcc-compilers.sh", + "${path.root}/../scripts/build/install-gfortran.sh", + "${path.root}/../scripts/build/install-git.sh", + "${path.root}/../scripts/build/install-git-lfs.sh", + "${path.root}/../scripts/build/install-github-cli.sh", + "${path.root}/../scripts/build/install-google-chrome.sh", + "${path.root}/../scripts/build/install-google-cloud-cli.sh", + "${path.root}/../scripts/build/install-haskell.sh", + "${path.root}/../scripts/build/install-heroku.sh", + "${path.root}/../scripts/build/install-hhvm.sh", + "${path.root}/../scripts/build/install-java-tools.sh", + "${path.root}/../scripts/build/install-kubernetes-tools.sh", + "${path.root}/../scripts/build/install-oc-cli.sh", + "${path.root}/../scripts/build/install-leiningen.sh", + "${path.root}/../scripts/build/install-miniconda.sh", + "${path.root}/../scripts/build/install-mono.sh", + "${path.root}/../scripts/build/install-kotlin.sh", + "${path.root}/../scripts/build/install-mysql.sh", + "${path.root}/../scripts/build/install-mssql-tools.sh", + "${path.root}/../scripts/build/install-sqlpackage.sh", + "${path.root}/../scripts/build/install-nginx.sh", + "${path.root}/../scripts/build/install-nvm.sh", + "${path.root}/../scripts/build/install-nodejs.sh", + "${path.root}/../scripts/build/install-bazel.sh", + "${path.root}/../scripts/build/install-oras-cli.sh", + "${path.root}/../scripts/build/install-phantomjs.sh", + "${path.root}/../scripts/build/install-php.sh", + "${path.root}/../scripts/build/install-postgresql.sh", + "${path.root}/../scripts/build/install-pulumi.sh", + "${path.root}/../scripts/build/install-ruby.sh", + "${path.root}/../scripts/build/install-rlang.sh", + "${path.root}/../scripts/build/install-rust.sh", + "${path.root}/../scripts/build/install-julia.sh", + "${path.root}/../scripts/build/install-sbt.sh", + "${path.root}/../scripts/build/install-selenium.sh", + "${path.root}/../scripts/build/install-terraform.sh", + "${path.root}/../scripts/build/install-packer.sh", + "${path.root}/../scripts/build/install-vcpkg.sh", + "${path.root}/../scripts/build/configure-dpkg.sh", + "${path.root}/../scripts/build/install-mongodb.sh", + "${path.root}/../scripts/build/install-yq.sh", + "${path.root}/../scripts/build/install-android-sdk.sh", + "${path.root}/../scripts/build/install-pypy.sh", + "${path.root}/../scripts/build/install-python.sh", + "${path.root}/../scripts/build/install-zstd.sh" + ] + } + + provisioner "shell" { + environment_vars = ["HELPER_SCRIPTS=${var.helper_script_folder}", "INSTALLER_SCRIPT_FOLDER=${var.installer_script_folder}", "DOCKERHUB_LOGIN=${var.dockerhub_login}", "DOCKERHUB_PASSWORD=${var.dockerhub_password}"] + execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" + scripts = ["${path.root}/../scripts/build/install-docker-compose.sh", "${path.root}/../scripts/build/install-docker.sh"] + } + + provisioner "shell" { + environment_vars = ["HELPER_SCRIPTS=${var.helper_script_folder}", "INSTALLER_SCRIPT_FOLDER=${var.installer_script_folder}"] + execute_command = "sudo sh -c '{{ .Vars }} pwsh -f {{ .Path }}'" + scripts = ["${path.root}/../scripts/build/Install-Toolset.ps1", "${path.root}/../scripts/build/Configure-Toolset.ps1"] + } + + provisioner "shell" { + environment_vars = ["HELPER_SCRIPTS=${var.helper_script_folder}", "INSTALLER_SCRIPT_FOLDER=${var.installer_script_folder}"] + execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" + scripts = ["${path.root}/../scripts/build/install-pipx-packages.sh"] + } + + provisioner "shell" { + environment_vars = ["HELPER_SCRIPTS=${var.helper_script_folder}", "DEBIAN_FRONTEND=noninteractive", "INSTALLER_SCRIPT_FOLDER=${var.installer_script_folder}"] + execute_command = "/bin/sh -c '{{ .Vars }} {{ .Path }}'" + scripts = ["${path.root}/../scripts/build/install-homebrew.sh"] + } + + provisioner "shell" { + environment_vars = ["HELPER_SCRIPTS=${var.helper_script_folder}"] + execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" + scripts = ["${path.root}/../scripts/build/configure-snap.sh"] + } + + provisioner "shell" { + execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" + expect_disconnect = true + inline = ["echo 'Reboot VM'", "sudo reboot"] + } + + provisioner "shell" { + execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" + pause_before = "1m0s" + scripts = ["${path.root}/../scripts/build/cleanup.sh"] + start_retry_timeout = "10m" + } + + provisioner "shell" { + environment_vars = ["IMAGE_VERSION=${var.image_version}", "INSTALLER_SCRIPT_FOLDER=${var.installer_script_folder}"] + inline = [ + "pwsh -Command Write-Host Running Generate-SoftwareReport.ps1 script", + "pwsh -File ${var.image_folder}/SoftwareReport/Generate-SoftwareReport.ps1 -OutputDirectory ${var.image_folder}", + "pwsh -Command Write-Host Running RunAll-Tests.ps1 script", + "pwsh -File ${var.image_folder}/tests/RunAll-Tests.ps1 -OutputDirectory ${var.image_folder}" + ] + max_retries = "3" + start_retry_timeout = "2m" + } + + provisioner "file" { + destination = "${path.root}/../Ubuntu2004-Readme.md" + direction = "download" + source = "${var.image_folder}/software-report.md" + } + + provisioner "file" { + destination = "${path.root}/../software-report.json" + direction = "download" + source = "${var.image_folder}/software-report.json" + } + + provisioner "shell" { + environment_vars = ["HELPER_SCRIPT_FOLDER=${var.helper_script_folder}", "INSTALLER_SCRIPT_FOLDER=${var.installer_script_folder}", "IMAGE_FOLDER=${var.image_folder}"] + execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" + scripts = ["${path.root}/../scripts/build/configure-system.sh"] + } + + provisioner "file" { + destination = "/tmp/" + source = "${path.root}/../assets/ubuntu2004.conf" + } + + provisioner "shell" { + execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" + inline = ["mkdir -p /etc/vsts", "cp /tmp/ubuntu2004.conf /etc/vsts/machine_instance.conf"] + } + + provisioner "shell" { + execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" + inline = ["sleep 30", "/usr/sbin/waagent -force -deprovision+user && export HISTSIZE=0 && sync"] + } + +} diff --git a/images/ubuntu/templates/ubuntu-22.04.pkr.hcl b/images/ubuntu/templates/ubuntu-22.04.pkr.hcl index 45aa217f5377..25bbd7c2633c 100644 --- a/images/ubuntu/templates/ubuntu-22.04.pkr.hcl +++ b/images/ubuntu/templates/ubuntu-22.04.pkr.hcl @@ -1,3 +1,12 @@ +packer { + required_plugins { + azure = { + source = "github.com/hashicorp/azure" + version = "~> 2" + } + } +} + locals { managed_image_name = var.managed_image_name != "" ? var.managed_image_name : "packer-${var.image_os}-${var.image_version}" } @@ -17,9 +26,9 @@ variable "build_resource_group_name" { default = "${env("BUILD_RESOURCE_GROUP_NAME")}" } -variable "managed_image_name" { +variable "client_cert_path" { type = string - default = "" + default = "${env("ARM_CLIENT_CERT_PATH")}" } variable "client_id" { @@ -33,16 +42,6 @@ variable "client_secret" { sensitive = true } -variable "client_cert_path" { - type = string - default = "${env("ARM_CLIENT_CERT_PATH")}" -} - -variable "commit_url" { - type = string - default = "" -} - variable "dockerhub_login" { type = string default = "${env("DOCKERHUB_LOGIN")}" @@ -84,8 +83,9 @@ variable "installer_script_folder" { } variable "install_password" { - type = string - default = "" + type = string + default = "" + sensitive = true } variable "location" { @@ -93,9 +93,9 @@ variable "location" { default = "${env("ARM_RESOURCE_LOCATION")}" } -variable "private_virtual_network_with_public_ip" { - type = bool - default = false +variable "managed_image_name" { + type = string + default = "" } variable "managed_image_resource_group_name" { @@ -103,6 +103,11 @@ variable "managed_image_resource_group_name" { default = "${env("ARM_RESOURCE_GROUP")}" } +variable "private_virtual_network_with_public_ip" { + type = bool + default = false +} + variable "subscription_id" { type = string default = "${env("ARM_SUBSCRIPTION_ID")}" @@ -141,18 +146,18 @@ variable "vm_size" { source "azure-arm" "build_image" { allowed_inbound_ip_addresses = "${var.allowed_inbound_ip_addresses}" build_resource_group_name = "${var.build_resource_group_name}" + client_cert_path = "${var.client_cert_path}" client_id = "${var.client_id}" client_secret = "${var.client_secret}" - client_cert_path = "${var.client_cert_path}" image_offer = "0001-com-ubuntu-server-jammy" image_publisher = "canonical" image_sku = "22_04-lts" location = "${var.location}" + managed_image_name = "${local.managed_image_name}" + managed_image_resource_group_name = "${var.managed_image_resource_group_name}" os_disk_size_gb = "86" os_type = "Linux" private_virtual_network_with_public_ip = "${var.private_virtual_network_with_public_ip}" - managed_image_name = "${local.managed_image_name}" - managed_image_resource_group_name = "${var.managed_image_resource_group_name}" subscription_id = "${var.subscription_id}" temp_resource_group_name = "${var.temp_resource_group_name}" tenant_id = "${var.tenant_id}" @@ -187,9 +192,9 @@ build { environment_vars = ["DEBIAN_FRONTEND=noninteractive"] execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" scripts = [ - "${path.root}/../scripts/build/install-ms-repos.sh", - "${path.root}/../scripts/build/configure-apt-sources.sh", - "${path.root}/../scripts/build/configure-apt.sh" + "${path.root}/../scripts/build/install-ms-repos.sh", + "${path.root}/../scripts/build/configure-apt-sources.sh", + "${path.root}/../scripts/build/configure-apt.sh" ] } @@ -269,67 +274,67 @@ build { environment_vars = ["HELPER_SCRIPTS=${var.helper_script_folder}", "INSTALLER_SCRIPT_FOLDER=${var.installer_script_folder}", "DEBIAN_FRONTEND=noninteractive"] execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" scripts = [ - "${path.root}/../scripts/build/install-actions-cache.sh", - "${path.root}/../scripts/build/install-runner-package.sh", - "${path.root}/../scripts/build/install-apt-common.sh", - "${path.root}/../scripts/build/install-azcopy.sh", - "${path.root}/../scripts/build/install-azure-cli.sh", - "${path.root}/../scripts/build/install-azure-devops-cli.sh", - "${path.root}/../scripts/build/install-bicep.sh", - "${path.root}/../scripts/build/install-aliyun-cli.sh", - "${path.root}/../scripts/build/install-apache.sh", - "${path.root}/../scripts/build/install-aws-tools.sh", - "${path.root}/../scripts/build/install-clang.sh", - "${path.root}/../scripts/build/install-swift.sh", - "${path.root}/../scripts/build/install-cmake.sh", - "${path.root}/../scripts/build/install-codeql-bundle.sh", - "${path.root}/../scripts/build/install-container-tools.sh", - "${path.root}/../scripts/build/install-dotnetcore-sdk.sh", - "${path.root}/../scripts/build/install-firefox.sh", - "${path.root}/../scripts/build/install-microsoft-edge.sh", - "${path.root}/../scripts/build/install-gcc-compilers.sh", - "${path.root}/../scripts/build/install-gfortran.sh", - "${path.root}/../scripts/build/install-git.sh", - "${path.root}/../scripts/build/install-git-lfs.sh", - "${path.root}/../scripts/build/install-github-cli.sh", - "${path.root}/../scripts/build/install-google-chrome.sh", - "${path.root}/../scripts/build/install-google-cloud-cli.sh", - "${path.root}/../scripts/build/install-haskell.sh", - "${path.root}/../scripts/build/install-heroku.sh", - "${path.root}/../scripts/build/install-java-tools.sh", - "${path.root}/../scripts/build/install-kubernetes-tools.sh", - "${path.root}/../scripts/build/install-oc-cli.sh", - "${path.root}/../scripts/build/install-leiningen.sh", - "${path.root}/../scripts/build/install-miniconda.sh", - "${path.root}/../scripts/build/install-mono.sh", - "${path.root}/../scripts/build/install-kotlin.sh", - "${path.root}/../scripts/build/install-mysql.sh", - "${path.root}/../scripts/build/install-mssql-tools.sh", - "${path.root}/../scripts/build/install-sqlpackage.sh", - "${path.root}/../scripts/build/install-nginx.sh", - "${path.root}/../scripts/build/install-nvm.sh", - "${path.root}/../scripts/build/install-nodejs.sh", - "${path.root}/../scripts/build/install-bazel.sh", - "${path.root}/../scripts/build/install-oras-cli.sh", - "${path.root}/../scripts/build/install-php.sh", - "${path.root}/../scripts/build/install-postgresql.sh", - "${path.root}/../scripts/build/install-pulumi.sh", - "${path.root}/../scripts/build/install-ruby.sh", - "${path.root}/../scripts/build/install-rlang.sh", - "${path.root}/../scripts/build/install-rust.sh", - "${path.root}/../scripts/build/install-julia.sh", - "${path.root}/../scripts/build/install-sbt.sh", - "${path.root}/../scripts/build/install-selenium.sh", - "${path.root}/../scripts/build/install-terraform.sh", - "${path.root}/../scripts/build/install-packer.sh", - "${path.root}/../scripts/build/install-vcpkg.sh", - "${path.root}/../scripts/build/configure-dpkg.sh", - "${path.root}/../scripts/build/install-yq.sh", - "${path.root}/../scripts/build/install-android-sdk.sh", - "${path.root}/../scripts/build/install-pypy.sh", - "${path.root}/../scripts/build/install-python.sh", - "${path.root}/../scripts/build/install-zstd.sh" - ] + "${path.root}/../scripts/build/install-actions-cache.sh", + "${path.root}/../scripts/build/install-runner-package.sh", + "${path.root}/../scripts/build/install-apt-common.sh", + "${path.root}/../scripts/build/install-azcopy.sh", + "${path.root}/../scripts/build/install-azure-cli.sh", + "${path.root}/../scripts/build/install-azure-devops-cli.sh", + "${path.root}/../scripts/build/install-bicep.sh", + "${path.root}/../scripts/build/install-aliyun-cli.sh", + "${path.root}/../scripts/build/install-apache.sh", + "${path.root}/../scripts/build/install-aws-tools.sh", + "${path.root}/../scripts/build/install-clang.sh", + "${path.root}/../scripts/build/install-swift.sh", + "${path.root}/../scripts/build/install-cmake.sh", + "${path.root}/../scripts/build/install-codeql-bundle.sh", + "${path.root}/../scripts/build/install-container-tools.sh", + "${path.root}/../scripts/build/install-dotnetcore-sdk.sh", + "${path.root}/../scripts/build/install-firefox.sh", + "${path.root}/../scripts/build/install-microsoft-edge.sh", + "${path.root}/../scripts/build/install-gcc-compilers.sh", + "${path.root}/../scripts/build/install-gfortran.sh", + "${path.root}/../scripts/build/install-git.sh", + "${path.root}/../scripts/build/install-git-lfs.sh", + "${path.root}/../scripts/build/install-github-cli.sh", + "${path.root}/../scripts/build/install-google-chrome.sh", + "${path.root}/../scripts/build/install-google-cloud-cli.sh", + "${path.root}/../scripts/build/install-haskell.sh", + "${path.root}/../scripts/build/install-heroku.sh", + "${path.root}/../scripts/build/install-java-tools.sh", + "${path.root}/../scripts/build/install-kubernetes-tools.sh", + "${path.root}/../scripts/build/install-oc-cli.sh", + "${path.root}/../scripts/build/install-leiningen.sh", + "${path.root}/../scripts/build/install-miniconda.sh", + "${path.root}/../scripts/build/install-mono.sh", + "${path.root}/../scripts/build/install-kotlin.sh", + "${path.root}/../scripts/build/install-mysql.sh", + "${path.root}/../scripts/build/install-mssql-tools.sh", + "${path.root}/../scripts/build/install-sqlpackage.sh", + "${path.root}/../scripts/build/install-nginx.sh", + "${path.root}/../scripts/build/install-nvm.sh", + "${path.root}/../scripts/build/install-nodejs.sh", + "${path.root}/../scripts/build/install-bazel.sh", + "${path.root}/../scripts/build/install-oras-cli.sh", + "${path.root}/../scripts/build/install-php.sh", + "${path.root}/../scripts/build/install-postgresql.sh", + "${path.root}/../scripts/build/install-pulumi.sh", + "${path.root}/../scripts/build/install-ruby.sh", + "${path.root}/../scripts/build/install-rlang.sh", + "${path.root}/../scripts/build/install-rust.sh", + "${path.root}/../scripts/build/install-julia.sh", + "${path.root}/../scripts/build/install-sbt.sh", + "${path.root}/../scripts/build/install-selenium.sh", + "${path.root}/../scripts/build/install-terraform.sh", + "${path.root}/../scripts/build/install-packer.sh", + "${path.root}/../scripts/build/install-vcpkg.sh", + "${path.root}/../scripts/build/configure-dpkg.sh", + "${path.root}/../scripts/build/install-yq.sh", + "${path.root}/../scripts/build/install-android-sdk.sh", + "${path.root}/../scripts/build/install-pypy.sh", + "${path.root}/../scripts/build/install-python.sh", + "${path.root}/../scripts/build/install-zstd.sh" + ] } provisioner "shell" { diff --git a/images/ubuntu/templates/ubuntu-minimal.pkr.hcl b/images/ubuntu/templates/ubuntu-minimal.pkr.hcl index 8eeaa7335127..b59173707d9c 100644 --- a/images/ubuntu/templates/ubuntu-minimal.pkr.hcl +++ b/images/ubuntu/templates/ubuntu-minimal.pkr.hcl @@ -1,3 +1,12 @@ +packer { + required_plugins { + azure = { + source = "github.com/hashicorp/azure" + version = "~> 2" + } + } +} + locals { image_os = "ubuntu22" @@ -26,9 +35,9 @@ variable "build_resource_group_name" { default = "${env("BUILD_RESOURCE_GROUP_NAME")}" } -variable "managed_image_name" { +variable "client_cert_path" { type = string - default = "" + default = "${env("ARM_CLIENT_CERT_PATH")}" } variable "client_id" { @@ -42,24 +51,15 @@ variable "client_secret" { sensitive = true } -variable "client_cert_path" { - type = string - default = "${env("ARM_CLIENT_CERT_PATH")}" -} - -variable "commit_url" { - type = string - default = "" -} - variable "image_version" { type = string default = "dev" } variable "install_password" { - type = string - default = "" + type = string + default = "" + sensitive = true } variable "location" { @@ -67,9 +67,9 @@ variable "location" { default = "${env("ARM_RESOURCE_LOCATION")}" } -variable "private_virtual_network_with_public_ip" { - type = bool - default = false +variable "managed_image_name" { + type = string + default = "" } variable "managed_image_resource_group_name" { @@ -77,6 +77,11 @@ variable "managed_image_resource_group_name" { default = "${env("ARM_RESOURCE_GROUP")}" } +variable "private_virtual_network_with_public_ip" { + type = bool + default = false +} + variable "subscription_id" { type = string default = "${env("ARM_SUBSCRIPTION_ID")}" @@ -162,8 +167,7 @@ build { // Create folder to store temporary data provisioner "shell" { execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" - inline = ["mkdir ${local.image_folder}", - "chmod 777 ${local.image_folder}"] + inline = ["mkdir ${local.image_folder}", "chmod 777 ${local.image_folder}"] } // Add apt wrapper to implement retries @@ -177,8 +181,8 @@ build { environment_vars = ["DEBIAN_FRONTEND=noninteractive"] execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" scripts = [ - "${path.root}/../scripts/build/install-ms-repos.sh", - "${path.root}/../scripts/build/configure-apt.sh" + "${path.root}/../scripts/build/install-ms-repos.sh", + "${path.root}/../scripts/build/configure-apt.sh" ] } @@ -252,10 +256,10 @@ build { environment_vars = ["DEBIAN_FRONTEND=noninteractive", "HELPER_SCRIPTS=${local.helper_script_folder}", "INSTALLER_SCRIPT_FOLDER=${local.installer_script_folder}"] execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" scripts = [ - "${path.root}/../scripts/build/install-git.sh", - "${path.root}/../scripts/build/install-git-lfs.sh", - "${path.root}/../scripts/build/install-github-cli.sh", - "${path.root}/../scripts/build/install-zstd.sh" + "${path.root}/../scripts/build/install-git.sh", + "${path.root}/../scripts/build/install-git-lfs.sh", + "${path.root}/../scripts/build/install-github-cli.sh", + "${path.root}/../scripts/build/install-zstd.sh" ] } From 3f2b0e2afcb4b22090379b1ead90d184e09b715c Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Thu, 14 Dec 2023 09:19:20 +0100 Subject: [PATCH 2529/3485] Pin Azure plugin version for packer (#9019) --- images/ubuntu/templates/ubuntu-20.04.pkr.hcl | 2 +- images/ubuntu/templates/ubuntu-22.04.pkr.hcl | 2 +- images/ubuntu/templates/ubuntu-minimal.pkr.hcl | 2 +- images/windows/templates/windows-2019.pkr.hcl | 2 +- images/windows/templates/windows-2022.pkr.hcl | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/images/ubuntu/templates/ubuntu-20.04.pkr.hcl b/images/ubuntu/templates/ubuntu-20.04.pkr.hcl index f3a911bf508c..85b3c53856a9 100644 --- a/images/ubuntu/templates/ubuntu-20.04.pkr.hcl +++ b/images/ubuntu/templates/ubuntu-20.04.pkr.hcl @@ -2,7 +2,7 @@ packer { required_plugins { azure = { source = "github.com/hashicorp/azure" - version = "~> 2" + version = "1.4.5" } } } diff --git a/images/ubuntu/templates/ubuntu-22.04.pkr.hcl b/images/ubuntu/templates/ubuntu-22.04.pkr.hcl index 25bbd7c2633c..58c8d7c54f24 100644 --- a/images/ubuntu/templates/ubuntu-22.04.pkr.hcl +++ b/images/ubuntu/templates/ubuntu-22.04.pkr.hcl @@ -2,7 +2,7 @@ packer { required_plugins { azure = { source = "github.com/hashicorp/azure" - version = "~> 2" + version = "1.4.5" } } } diff --git a/images/ubuntu/templates/ubuntu-minimal.pkr.hcl b/images/ubuntu/templates/ubuntu-minimal.pkr.hcl index b59173707d9c..b2c76ac34815 100644 --- a/images/ubuntu/templates/ubuntu-minimal.pkr.hcl +++ b/images/ubuntu/templates/ubuntu-minimal.pkr.hcl @@ -2,7 +2,7 @@ packer { required_plugins { azure = { source = "github.com/hashicorp/azure" - version = "~> 2" + version = "1.4.5" } } } diff --git a/images/windows/templates/windows-2019.pkr.hcl b/images/windows/templates/windows-2019.pkr.hcl index 7ac73077f2f2..3e3fd2426093 100644 --- a/images/windows/templates/windows-2019.pkr.hcl +++ b/images/windows/templates/windows-2019.pkr.hcl @@ -2,7 +2,7 @@ packer { required_plugins { azure = { source = "github.com/hashicorp/azure" - version = "~> 2" + version = "1.4.5" } } } diff --git a/images/windows/templates/windows-2022.pkr.hcl b/images/windows/templates/windows-2022.pkr.hcl index 19411aa1d2e0..ec9e436d7000 100644 --- a/images/windows/templates/windows-2022.pkr.hcl +++ b/images/windows/templates/windows-2022.pkr.hcl @@ -2,7 +2,7 @@ packer { required_plugins { azure = { source = "github.com/hashicorp/azure" - version = "~> 2" + version = "1.4.5" } } } From 9f3cf00bb34ea6d01625ac13b68917ff29728a30 Mon Sep 17 00:00:00 2001 From: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com> Date: Thu, 14 Dec 2023 11:05:36 +0100 Subject: [PATCH 2530/3485] [windows] fix extracting checksum for Miniconda installer (#9025) --- images/windows/scripts/build/Install-Miniconda.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/windows/scripts/build/Install-Miniconda.ps1 b/images/windows/scripts/build/Install-Miniconda.ps1 index f2fec5316b47..91054a9a4419 100644 --- a/images/windows/scripts/build/Install-Miniconda.ps1 +++ b/images/windows/scripts/build/Install-Miniconda.ps1 @@ -9,7 +9,7 @@ $installerName = "Miniconda3-latest-Windows-x86_64.exe" #region Supply chain security $distributorFileHash = $null -$checksums = (Invoke-RestMethod -Uri 'https://repo.anaconda.com/miniconda/' | ConvertFrom-HTML).SelectNodes('//html/body/table/tr') +$checksums = (ConvertFrom-HTML -Uri 'https://repo.anaconda.com/miniconda/').SelectNodes('//html/body/table/tr') foreach ($node in $checksums) { if ($node.ChildNodes[1].InnerText -eq $installerName) { From e6a69f4bd115a0ff14cef9f1342afa3bd4a078e8 Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Thu, 14 Dec 2023 11:06:59 +0100 Subject: [PATCH 2531/3485] [macOS] Update AzCopy installer to install 10.21.2 version (#9003) --- images/macos/scripts/build/install-azcopy.sh | 23 +++++++++++--------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/images/macos/scripts/build/install-azcopy.sh b/images/macos/scripts/build/install-azcopy.sh index 1ef682505330..e0e95d9d964d 100644 --- a/images/macos/scripts/build/install-azcopy.sh +++ b/images/macos/scripts/build/install-azcopy.sh @@ -5,18 +5,21 @@ ################################################################################ source ~/utils/utils.sh -arch=$(get_arch) -# Check MacOS architecture and if ARM install using brew -if [ "$arch" == "arm64" ]; then - brew_smart_install azcopy +if is_Arm64; then + # latest is available by https://aka.ms/downloadazcopy-v10-mac-arm64 + url="https://azcopyvnext.azureedge.net/releases/release-10.21.2-20231106/azcopy_darwin_arm64_10.21.2.zip" else - # Temporary pin 10.21.2 version of AzCopy until 10.22.0 is fixed - archive_path=$(download_with_retry "https://azcopyvnext.azureedge.net/releases/release-10.21.2-20231106/azcopy_darwin_amd64_10.21.2.zip") - unzip -qq "$archive_path" -d /tmp/azcopy - extract_path=$(echo /tmp/azcopy/azcopy*) - cp "$extract_path/azcopy" "/usr/local/bin/azcopy" - chmod +x "/usr/local/bin/azcopy" + # latest is available by https://aka.ms/downloadazcopy-v10-mac + url="https://azcopyvnext.azureedge.net/releases/release-10.21.2-20231106/azcopy_darwin_amd64_10.21.2.zip" fi +# Install AzCopy +archive_path=$(download_with_retry "${url}") +unzip -qq "$archive_path" -d /tmp/azcopy +extract_path=$(echo /tmp/azcopy/azcopy*) +cp "$extract_path/azcopy" "/usr/local/bin/azcopy" +chmod +x "/usr/local/bin/azcopy" + + invoke_tests "Common" "AzCopy" From d631f76f8b612261798233df2976058e3f71e301 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 14 Dec 2023 10:39:44 +0000 Subject: [PATCH 2532/3485] Ubuntu 22.04 (20231211) Image Update (#8993) * Updating readme file for ubuntu22 version 20231211.1.1 * Update Ubuntu2204-Readme.md --------- Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2204-Readme.md | 64 +++++++++++++++--------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/images/ubuntu/Ubuntu2204-Readme.md b/images/ubuntu/Ubuntu2204-Readme.md index 405f08f9522c..f4eddb1bd79e 100644 --- a/images/ubuntu/Ubuntu2204-Readme.md +++ b/images/ubuntu/Ubuntu2204-Readme.md @@ -7,7 +7,7 @@ # Ubuntu 22.04 - OS Version: 22.04.3 LTS - Kernel Version: 6.2.0-1018-azure -- Image Version: 20231205.1.0 +- Image Version: 20231211.1.0 - Systemd version: 249.11-0ubuntu3.11 ## Installed Software @@ -33,7 +33,7 @@ ### Package Management - cpan 1.64 - Helm 3.13.1 -- Homebrew 4.1.23 +- Homebrew 4.1.24 - Miniconda 23.10.0 - Npm 10.2.3 - NuGet 6.6.1.2 @@ -41,7 +41,7 @@ - Pip3 22.0.2 - Pipx 1.3.3 - RubyGems 3.3.5 -- Vcpkg (build from commit 08c4e7104) +- Vcpkg (build from commit 000d1bda1) - Yarn 1.22.21 #### Environment variables @@ -65,12 +65,12 @@ to accomplish this. ### Tools - Ansible 2.16.1 - apt-fast 1.9.12 -- AzCopy 10.22.0 - available by `azcopy` and `azcopy10` aliases +- AzCopy 10.21.2 - available by `azcopy` and `azcopy10` aliases - Bazel 6.4.0 - Bazelisk 1.19.0 - Bicep 0.23.1 - Buildah 1.23.1 -- CMake 3.27.9 +- CMake 3.28.0 - CodeQL Action Bundle 2.15.3 - Docker Amazon ECR Credential Helper 0.7.1 - Docker Compose v1 1.29.2 @@ -87,19 +87,19 @@ to accomplish this. - jq 1.6 - Kind 0.20.0 - Kubectl 1.28.4 -- Kustomize 5.2.1 +- Kustomize 5.3.0 - Leiningen 2.10.0 - MediaInfo 21.09 - Mercurial 6.1.1 - Minikube 1.32.0 - n 9.2.0 - Newman 6.0.0 -- nvm 0.39.6 +- nvm 0.39.7 - OpenSSL 3.0.2-0ubuntu1.12 - Packer v1.10.0 - Parcel 2.10.3 - Podman 3.4.4 -- Pulumi 3.95.0 +- Pulumi 3.96.2 - R 4.3.2 - Skopeo 1.4.1 - Sphinx Open Source Search Server 2.2.11 @@ -110,15 +110,15 @@ to accomplish this. - zstd 1.5.5 ### CLI Tools -- Alibaba Cloud CLI 3.0.188 -- AWS CLI 2.14.5 +- Alibaba Cloud CLI 3.0.189 +- AWS CLI 2.15.0 - AWS CLI Session Manager Plugin 1.2.536.0 -- AWS SAM CLI 1.103.0 +- AWS SAM CLI 1.104.0 - Azure CLI 2.55.0 - Azure CLI (azure-devops) 0.26.0 -- GitHub CLI 2.39.2 +- GitHub CLI 2.40.0 - Google Cloud CLI 456.0.0 -- Netlify CLI 17.9.0 +- Netlify CLI 17.10.1 - OpenShift CLI 4.14.5 - ORAS CLI 1.1.0 - Vercel CLI 32.6.1 @@ -133,7 +133,7 @@ to accomplish this. ### PHP Tools - PHP: 8.1.2 -- Composer 2.6.5 +- Composer 2.6.6 - PHPUnit 8.5.36 ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. @@ -146,9 +146,9 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Stack 2.13.1 ### Rust Tools -- Cargo 1.74.0 -- Rust 1.74.0 -- Rustdoc 1.74.0 +- Cargo 1.74.1 +- Rust 1.74.1 +- Rustdoc 1.74.1 - Rustup 1.26.0 #### Packages @@ -160,12 +160,12 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.6.0 ### Browsers and Drivers -- Google Chrome 119.0.6045.199 -- ChromeDriver 119.0.6045.105 -- Chromium 119.0.6045.0 -- Microsoft Edge 119.0.2151.97 -- Microsoft Edge WebDriver 119.0.2151.97 -- Selenium server 4.15.0 +- Google Chrome 120.0.6099.71 +- ChromeDriver 120.0.6099.71 +- Chromium 120.0.6099.0 +- Microsoft Edge 120.0.2210.61 +- Microsoft Edge WebDriver 120.0.2210.61 +- Selenium server 4.16.0 - Mozilla Firefox 120.0.1 - Geckodriver 0.33.0 @@ -209,8 +209,8 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Go - 1.19.13 -- 1.20.11 -- 1.21.4 +- 1.20.12 +- 1.21.5 #### Node.js - 16.20.2 @@ -223,7 +223,7 @@ Use the following command as a part of your job to start the service: 'sudo syst - 3.9.18 - 3.10.13 - 3.11.7 -- 3.12.0 +- 3.12.1 #### PyPy - 3.7.13 [PyPy 7.3.9] @@ -240,7 +240,7 @@ Use the following command as a part of your job to start the service: 'sudo syst #### PowerShell Modules - Az: 9.3.0 - MarkdownPS: 1.9 -- Microsoft.Graph: 2.10.0 +- Microsoft.Graph: 2.11.0 - Pester: 5.5.0 - PSScriptAnalyzer: 1.21.0 @@ -307,7 +307,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | brotli | 1.0.9-2build6 | | bzip2 | 1.0.8-5build1 | | coreutils | 8.32-4.1ubuntu1 | -| curl | 7.81.0-1ubuntu1.14 | +| curl | 7.81.0-1ubuntu1.15 | | dbus | 1.12.20-2ubuntu4.1 | | dnsutils | 1:9.18.18-0ubuntu0.22.04.1 | | dpkg | 1.21.1ubuntu2.2 | @@ -329,8 +329,8 @@ Use the following command as a part of your job to start the service: 'sudo syst | lib32z1 | 1:1.2.11.dfsg-2ubuntu9.2 | | libc++-dev | 1:14.0-55\~exp2 | | libc++abi-dev | 1:14.0-55\~exp2 | -| libc6-dev | 2.35-0ubuntu3.4 | -| libcurl4 | 7.81.0-1ubuntu1.14 | +| libc6-dev | 2.35-0ubuntu3.5 | +| libcurl4 | 7.81.0-1ubuntu1.15 | | libgbm-dev | 23.0.4-0ubuntu1\~22.04.1 | | libgconf-2-4 | 3.2.6-7ubuntu2 | | libgsl-dev | 2.7.1+dfsg-3 | @@ -346,7 +346,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | libxkbfile-dev | 1:1.1.0-1build3 | | libxss1 | 1:1.2.3-1build2 | | libyaml-dev | 0.2.2-1build2 | -| locales | 2.35-0ubuntu3.4 | +| locales | 2.35-0ubuntu3.5 | | lz4 | 1.9.3-2build2 | | m4 | 1.4.18-5ubuntu2 | | make | 4.3-4.1build1 | @@ -374,7 +374,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | subversion | 1.14.1-3ubuntu0.22.04.1 | | sudo | 1.9.9-1ubuntu2.4 | | swig | 4.0.2-1ubuntu1 | -| tar | 1.34+dfsg-1ubuntu0.1.22.04.1 | +| tar | 1.34+dfsg-1ubuntu0.1.22.04.2 | | telnet | 0.17-44build1 | | texinfo | 6.8-4build1 | | time | 1.9-0.1build2 | From 217976502601c82a11d8dd52599f3d735d1e791e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 14 Dec 2023 12:02:37 +0000 Subject: [PATCH 2533/3485] Windows Server 2019 (20231211) Image Update (#9004) * Updating readme file for win19 version 20231211.1.1 * Update Windows2019-Readme.md --------- Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/windows/Windows2019-Readme.md | 48 ++++++++++++++-------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/images/windows/Windows2019-Readme.md b/images/windows/Windows2019-Readme.md index 976c6227b10f..f7c06d6bd0d8 100644 --- a/images/windows/Windows2019-Readme.md +++ b/images/windows/Windows2019-Readme.md @@ -6,7 +6,7 @@ *** # Windows Server 2019 - OS Version: 10.0.17763 Build 5122 -- Image Version: 20231205.1.0 +- Image Version: 20231211.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -15,7 +15,7 @@ ### Language and Runtime - Bash 5.2.21(1)-release -- Go 1.20.11 +- Go 1.20.12 - Julia 1.9.4 - Kotlin 1.9.21 - LLVM 16.0.6 @@ -27,7 +27,7 @@ ### Package Management - Chocolatey 2.2.2 -- Composer 2.6.5 +- Composer 2.6.6 - Helm 3.13.1 - Miniconda 23.10.0 (pre-installed on the image but not added to PATH) - NPM 9.8.1 @@ -35,7 +35,7 @@ - pip 23.3.1 (python 3.7) - Pipx 1.2.1 - RubyGems 2.7.6.3 -- Vcpkg (build from commit 08c4e7104) +- Vcpkg (build from commit 000d1bda1) - Yarn 1.22.21 #### Environment variables @@ -54,7 +54,7 @@ - 7zip 23.01 - aria2 1.37.0 - azcopy 10.21.1 -- Bazel 6.4.0 +- Bazel 7.0.0 - Bazelisk 1.19.0 - Bicep 0.23.1 - Cabal 3.10.2.0 @@ -68,7 +68,7 @@ - Git 2.43.0.windows.1 - Git LFS 3.4.0 - Google Cloud CLI 456.0.0 -- ImageMagick 7.1.1-22 +- ImageMagick 7.1.1-23 - InnoSetup 6.2.2 - jq 1.7-dirty - Kind 0.20.0 @@ -82,7 +82,7 @@ - OpenSSL 1.1.1w - Packer 1.9.4 - Parcel 2.10.3 -- Pulumi 3.95.0 +- Pulumi 3.96.2 - R 4.3.2 - Service Fabric SDK 9.1.1436.9590 - Stack 2.13.1 @@ -95,19 +95,19 @@ - zstd 1.5.5 ### CLI Tools -- Alibaba Cloud CLI 3.0.188 -- AWS CLI 2.14.5 -- AWS SAM CLI 1.103.0 +- Alibaba Cloud CLI 3.0.189 +- AWS CLI 2.15.0 +- AWS SAM CLI 1.104.0 - AWS Session Manager CLI 1.2.536.0 - Azure CLI 2.55.0 - Azure DevOps CLI extension 0.26.0 - Cloud Foundry CLI 6.53.0 -- GitHub CLI 2.39.2 +- GitHub CLI 2.40.0 ### Rust Tools -- Cargo 1.74.0 -- Rust 1.74.0 -- Rustdoc 1.74.0 +- Cargo 1.74.1 +- Rust 1.74.1 +- Rustdoc 1.74.1 - Rustup 1.26.0 #### Packages @@ -119,14 +119,14 @@ - Rustfmt 1.6.0 ### Browsers and Drivers -- Google Chrome 120.0.6099.63 -- Chrome Driver 120.0.6099.62 -- Microsoft Edge 119.0.2151.97 -- Microsoft Edge Driver 119.0.2151.97 +- Google Chrome 120.0.6099.71 +- Chrome Driver 120.0.6099.71 +- Microsoft Edge 120.0.2210.61 +- Microsoft Edge Driver 120.0.2210.61 - Mozilla Firefox 120.0.1 - Gecko Driver 0.33.0 - IE Driver 4.14.0.0 -- Selenium server 4.15.0 +- Selenium server 4.16.0 #### Environment variables | Name | Value | @@ -168,8 +168,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Go - 1.19.13 -- 1.20.11 -- 1.21.4 +- 1.20.12 +- 1.21.5 #### Node.js - 16.20.2 @@ -182,7 +182,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 3.9.13 - 3.10.11 - 3.11.7 -- 3.12.0 +- 3.12.1 #### PyPy - 2.7.18 [PyPy 7.3.13] @@ -514,10 +514,10 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Az (Cached): 1.0.0.zip, 1.6.0.zip, 2.3.2.zip, 2.6.0.zip, 3.1.0.zip, 3.5.0.zip, 3.8.0.zip, 4.3.0.zip, 4.4.0.zip, 4.7.0.zip, 5.5.0.zip, 5.9.0.zip, 6.6.0.zip, 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.468 +- AWSPowershell: 4.1.472 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 -- Microsoft.Graph: 2.10.0 +- Microsoft.Graph: 2.11.0 - Pester: 3.4.0, 5.5.0 - PowerShellGet: 1.0.0.1, 2.2.5 - PSScriptAnalyzer: 1.21.0 From dbb10c67ba99d3e85b255c0cebaa55e76aad6fae Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Thu, 14 Dec 2023 17:33:34 +0100 Subject: [PATCH 2534/3485] [ubuntu] Refactor pester tests (#9006) * [ubuntu] Refactor pester tests * Fix key name and add BeforeAll * Fix ActionArchiveCache test --- .../tests/ActionArchiveCache.Tests.ps1 | 13 ++-- images/ubuntu/scripts/tests/Android.Tests.ps1 | 36 ++-------- images/ubuntu/scripts/tests/Apt.Tests.ps1 | 66 ++++--------------- .../ubuntu/scripts/tests/CLI.Tools.Tests.ps1 | 1 - images/ubuntu/scripts/tests/Common.Tests.ps1 | 15 ++--- .../ubuntu/scripts/tests/Databases.Tests.ps1 | 2 +- .../ubuntu/scripts/tests/DotnetSDK.Tests.ps1 | 10 ++- images/ubuntu/scripts/tests/Haskell.Tests.ps1 | 4 +- images/ubuntu/scripts/tests/Helpers.psm1 | 6 +- images/ubuntu/scripts/tests/Java.Tests.ps1 | 4 +- images/ubuntu/scripts/tests/Node.Tests.ps1 | 5 -- .../scripts/tests/PowerShellModules.Tests.ps1 | 14 ++-- .../scripts/tests/RunnerCache.Tests.ps1 | 4 +- images/ubuntu/scripts/tests/Tools.Tests.ps1 | 60 +++++------------ images/ubuntu/scripts/tests/Toolset.Tests.ps1 | 9 ++- 15 files changed, 70 insertions(+), 179 deletions(-) diff --git a/images/ubuntu/scripts/tests/ActionArchiveCache.Tests.ps1 b/images/ubuntu/scripts/tests/ActionArchiveCache.Tests.ps1 index 6da1eb9349f2..df4add65e9ae 100644 --- a/images/ubuntu/scripts/tests/ActionArchiveCache.Tests.ps1 +++ b/images/ubuntu/scripts/tests/ActionArchiveCache.Tests.ps1 @@ -1,14 +1,17 @@ Describe "ActionArchiveCache" { + BeforeDiscovery { + $actionArchiveCachePath = "/opt/actionarchivecache" + $tarballTestCases = Get-ChildItem -Path "$actionArchiveCachePath/*.tar.gz" -Recurse | ForEach-Object { @{ ActionTarball = $_.FullName } } + } + Context "Action archive cache directory not empty" { - It "/opt/actionarchivecache not empty" { - (Get-ChildItem -Path "/opt/actionarchivecache/*.tar.gz" -Recurse).Count | Should -BeGreaterThan 0 + It "<ActionArchiveCachepath> not empty" -TestCases @{ ActionArchiveCachepath = $actionArchiveCachePath } { + (Get-ChildItem -Path "$ActionArchiveCachepath/*.tar.gz" -Recurse).Count | Should -BeGreaterThan 0 } } Context "Action tarball not empty" { - $testCases = Get-ChildItem -Path "/opt/actionarchivecache/*.tar.gz" -Recurse | ForEach-Object { @{ ActionTarball = $_.FullName } } - It "<ActionTarball>" -TestCases $testCases { - param ([string] $ActionTarball) + It "<ActionTarball>" -TestCases $tarballTestCases { (Get-Item "$ActionTarball").Length | Should -BeGreaterThan 0 } } diff --git a/images/ubuntu/scripts/tests/Android.Tests.ps1 b/images/ubuntu/scripts/tests/Android.Tests.ps1 index 840d6520512f..aef895716f98 100644 --- a/images/ubuntu/scripts/tests/Android.Tests.ps1 +++ b/images/ubuntu/scripts/tests/Android.Tests.ps1 @@ -1,34 +1,4 @@ Describe "Android" { - BeforeAll { - function Test-AndroidPackage { - <# - .SYNOPSIS - This function tests existance of an Android package. - - .DESCRIPTION - The Test-AndroidPackage function is used to test an existance of Android package in ANDROID_HOME path. - - .PARAMETER PackageName - The name of the Android package to test. - - .EXAMPLE - Test-AndroidPackage - - This command tests the Android package. - - #> - param ( - [Parameter(Mandatory=$true)] - [string] $PackageName - ) - - # Convert 'cmake;3.6.4111459' -> 'cmake/3.6.4111459' - $PackageName = $PackageName.Replace(";", "/") - $targetPath = Join-Path $env:ANDROID_HOME $PackageName - $targetPath | Should -Exist - } - } - function Get-AndroidPackages { <# .SYNOPSIS @@ -130,8 +100,10 @@ Describe "Android" { $testCases = $androidPackages | ForEach-Object { @{ PackageName = $_ } } It "<PackageName>" -TestCases $testCases { - param ([string] $PackageName) - Test-AndroidPackage $PackageName + # Convert 'cmake;3.6.4111459' -> 'cmake/3.6.4111459' + $PackageName = $PackageName.Replace(";", "/") + $targetPath = Join-Path $env:ANDROID_HOME $PackageName + $targetPath | Should -Exist } } } diff --git a/images/ubuntu/scripts/tests/Apt.Tests.ps1 b/images/ubuntu/scripts/tests/Apt.Tests.ps1 index 18b48063d667..d0596137d05c 100644 --- a/images/ubuntu/scripts/tests/Apt.Tests.ps1 +++ b/images/ubuntu/scripts/tests/Apt.Tests.ps1 @@ -1,63 +1,23 @@ Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" -$cmd = (Get-ToolsetContent).apt.cmd_packages + (Get-ToolsetContent).apt.vital_packages - Describe "Apt" { - - $testCases = $cmd | ForEach-Object { - @{ toolName = $_ } - } + $packages = (Get-ToolsetContent).apt.cmd_packages + (Get-ToolsetContent).apt.vital_packages + $testCases = $packages | ForEach-Object { @{ toolName = $_ } } It "<toolName> is available" -TestCases $testCases { - if ($toolName -eq "acl") - { - $toolName = "getfacl" - } - - if ($toolName -eq "aria2") - { - $toolName = "aria2c" - } - - if ($toolName -eq "p7zip-full") - { - $toolName = "p7zip" - } - - if ($toolName -eq "subversion") - { - $toolName = "svn" - } - - if ($toolName -eq "sphinxsearch") - { - $toolName = "searchd" - } - - if ($toolName -eq "binutils") - { - $toolName = "strings" - } - - if ($toolName -eq "coreutils") - { - $toolName = "tr" + switch ($toolName) { + "acl" { $toolName = "getfacl"; break } + "aria2" { $toolName = "aria2c"; break } + "p7zip-full" { $toolName = "p7zip"; break } + "subversion" { $toolName = "svn"; break } + "sphinxsearch" { $toolName = "searchd"; break } + "binutils" { $toolName = "strings"; break } + "coreutils" { $toolName = "tr"; break } + "net-tools" { $toolName = "netstat"; break } + "mercurial" { $toolName = "hg"; break } + "findutils" { $toolName = "find"; break } } - if ($toolName -eq "net-tools") - { - $toolName = "netstat" - } - - if ($toolName -eq "mercurial") - { - $toolName = "hg" - } - - if ($toolName -eq "findutils") - { - $toolName = "find" - } (Get-Command -Name $toolName).CommandType | Should -BeExactly "Application" } } diff --git a/images/ubuntu/scripts/tests/CLI.Tools.Tests.ps1 b/images/ubuntu/scripts/tests/CLI.Tools.Tests.ps1 index 2cd42df7b97b..0951afdfc8d2 100644 --- a/images/ubuntu/scripts/tests/CLI.Tools.Tests.ps1 +++ b/images/ubuntu/scripts/tests/CLI.Tools.Tests.ps1 @@ -1,4 +1,3 @@ - Describe "Azure CLI" { It "Azure CLI" { "az --version" | Should -ReturnZeroExitCode diff --git a/images/ubuntu/scripts/tests/Common.Tests.ps1 b/images/ubuntu/scripts/tests/Common.Tests.ps1 index 593fd1be3279..38eaeb2b98a8 100644 --- a/images/ubuntu/scripts/tests/Common.Tests.ps1 +++ b/images/ubuntu/scripts/tests/Common.Tests.ps1 @@ -1,15 +1,10 @@ Describe "PHP" { - - [array]$testCases = (Get-ToolsetContent).php.versions | ForEach-Object { @{phpVersion = $_} } + $testCases = (Get-ToolsetContent).php.versions | ForEach-Object { @{PhpVersion = $_} } It "php <phpVersion>" -TestCases $testCases { - param ( - [string] $phpVersion - ) - - "php$phpVersion --version" | Should -ReturnZeroExitCode - "php-config$phpVersion --version" | Should -ReturnZeroExitCode - "phpize$phpVersion --version" | Should -ReturnZeroExitCode + "php${PhpVersion} --version" | Should -ReturnZeroExitCode + "php-config${PhpVersion} --version" | Should -ReturnZeroExitCode + "phpize${PhpVersion} --version" | Should -ReturnZeroExitCode } It "PHPUnit" { @@ -44,7 +39,7 @@ Describe "Swift" { } Describe "PipxPackages" { - [array]$testCases = (Get-ToolsetContent).pipx | ForEach-Object { @{package=$_.package; cmd = $_.cmd} } + $testCases = (Get-ToolsetContent).pipx | ForEach-Object { @{package=$_.package; cmd = $_.cmd} } It "<package>" -TestCases $testCases { "$cmd --version" | Should -ReturnZeroExitCode diff --git a/images/ubuntu/scripts/tests/Databases.Tests.ps1 b/images/ubuntu/scripts/tests/Databases.Tests.ps1 index f39a460762f4..6eec8d1bde32 100644 --- a/images/ubuntu/scripts/tests/Databases.Tests.ps1 +++ b/images/ubuntu/scripts/tests/Databases.Tests.ps1 @@ -4,7 +4,7 @@ Describe "MongoDB" -Skip:(Test-IsUbuntu22) { @{ ToolName = "mongod" } ) { $toolsetVersion = (Get-ToolsetContent).mongodb.version - (&$ToolName --version)[2].Split('"')[-2] | Should -BeLike "$toolsetVersion*" + (& $ToolName --version)[2].Split('"')[-2] | Should -BeLike "$toolsetVersion*" } } diff --git a/images/ubuntu/scripts/tests/DotnetSDK.Tests.ps1 b/images/ubuntu/scripts/tests/DotnetSDK.Tests.ps1 index d2d90daddf86..e3d06df401ca 100644 --- a/images/ubuntu/scripts/tests/DotnetSDK.Tests.ps1 +++ b/images/ubuntu/scripts/tests/DotnetSDK.Tests.ps1 @@ -1,13 +1,12 @@ Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" Describe "Dotnet and tools" { - BeforeAll { $env:PATH = "/etc/skel/.dotnet/tools:$($env:PATH)" $dotnetSDKs = dotnet --list-sdks | ConvertTo-Json $dotnetRuntimes = dotnet --list-runtimes | ConvertTo-Json } - + $dotnetVersions = (Get-ToolsetContent).dotnet.versions Context "Default" { @@ -20,11 +19,11 @@ Describe "Dotnet and tools" { Context "Dotnet $version" { $dotnet = @{ dotnetVersion = $version } - It "SDK $version is available" -TestCases $dotnet { + It "SDK <dotnetVersion> is available" -TestCases $dotnet { $dotnetSDKs | Should -Match "$dotnetVersion.[1-9]*" } - It "Runtime $version is available" -TestCases $dotnet { + It "Runtime <dotnetVersion> is available" -TestCases $dotnet { $dotnetRuntimes | Should -Match "$dotnetVersion.[1-9]*" } } @@ -38,5 +37,4 @@ Describe "Dotnet and tools" { "$TestInstance" | Should -ReturnZeroExitCode } } - -} \ No newline at end of file +} diff --git a/images/ubuntu/scripts/tests/Haskell.Tests.ps1 b/images/ubuntu/scripts/tests/Haskell.Tests.ps1 index af05f9839ea2..a620df5c3dbf 100644 --- a/images/ubuntu/scripts/tests/Haskell.Tests.ps1 +++ b/images/ubuntu/scripts/tests/Haskell.Tests.ps1 @@ -5,15 +5,13 @@ Describe "Haskell" { $testCase = @{ GHCVersions = $GHCVersions } It "GHC directory contains two version of GHC" -TestCases $testCase { - param ([object] $GHCVersions) $GHCVersions.Count | Should -Be 2 } $testCases = $GHCVersions | ForEach-Object { @{ GHCPath = "${_}/bin/ghc"} } It "GHC version <GHCPath>" -TestCases $testCases { - param ([string] $GHCPath) - "$GHCPath --version" | Should -ReturnZeroExitCode + "$GHCPath --version" | Should -ReturnZeroExitCode } It "GHCup" { diff --git a/images/ubuntu/scripts/tests/Helpers.psm1 b/images/ubuntu/scripts/tests/Helpers.psm1 index 7236ae33fb19..31ad5270064f 100644 --- a/images/ubuntu/scripts/tests/Helpers.psm1 +++ b/images/ubuntu/scripts/tests/Helpers.psm1 @@ -96,8 +96,7 @@ function ShouldReturnZeroExitCode { [bool] $succeeded = $result.ExitCode -eq 0 if ($Negate) { $succeeded = -not $succeeded } - if (-not $succeeded) - { + if (-not $succeeded) { $commandOutputIndent = " " * 4 $commandOutput = ($result.Output | ForEach-Object { "${commandOutputIndent}${_}" }) -join "`n" $failureMessage = "Command '${ActualValue}' has finished with exit code`n${commandOutput}" @@ -149,8 +148,7 @@ function ShouldOutputTextMatchingRegex { if (-not $succeeded) { if ($Negate) { $failureMessage = "Expected regular expression '$RegularExpression' for '$ActualValue' command to not match '$output', but it did match." - } - else { + } else { $failureMessage = "Expected regular expression '$RegularExpression' for '$ActualValue' command to match '$output', but it did not match." } } diff --git a/images/ubuntu/scripts/tests/Java.Tests.ps1 b/images/ubuntu/scripts/tests/Java.Tests.ps1 index ba63bcfadbe5..dff9cf399a8d 100644 --- a/images/ubuntu/scripts/tests/Java.Tests.ps1 +++ b/images/ubuntu/scripts/tests/Java.Tests.ps1 @@ -5,8 +5,6 @@ Describe "Java" { $defaultVersion = $toolsetJava.default $jdkVersions = $toolsetJava.versions - [array]$testCases = $jdkVersions | ForEach-Object { @{Version = $_ } } - It "Java <DefaultJavaVersion> is default" -TestCases @{ DefaultJavaVersion = $defaultVersion } { $actualJavaPath = [System.Environment]::GetEnvironmentVariable("JAVA_HOME") $expectedJavaPath = [System.Environment]::GetEnvironmentVariable("JAVA_HOME_${DefaultJavaVersion}_X64") @@ -35,6 +33,8 @@ Describe "Java" { "`"$GradlePath`" -version" | Should -ReturnZeroExitCode } + $testCases = $jdkVersions | ForEach-Object { @{Version = $_ } } + It "Java <Version>" -TestCases $testCases { $javaVariableValue = [System.Environment]::GetEnvironmentVariable("JAVA_HOME_${Version}_X64") $javaVariableValue | Should -Not -BeNullOrEmpty diff --git a/images/ubuntu/scripts/tests/Node.Tests.ps1 b/images/ubuntu/scripts/tests/Node.Tests.ps1 index 10d8e35d636b..3ae9761e44d0 100644 --- a/images/ubuntu/scripts/tests/Node.Tests.ps1 +++ b/images/ubuntu/scripts/tests/Node.Tests.ps1 @@ -4,10 +4,6 @@ Describe "Node.js" { $testCases = $binaries + $module_commands | ForEach-Object { @{NodeCommand = $_} } It "<NodeCommand>" -TestCases $testCases { - param ( - [string] $NodeCommand - ) - "$NodeCommand --version" | Should -ReturnZeroExitCode } @@ -15,4 +11,3 @@ Describe "Node.js" { node --version | Should -BeLike "v$((Get-ToolsetContent).node.default).*" } } - diff --git a/images/ubuntu/scripts/tests/PowerShellModules.Tests.ps1 b/images/ubuntu/scripts/tests/PowerShellModules.Tests.ps1 index cd4f4b469adb..9a1079ece264 100644 --- a/images/ubuntu/scripts/tests/PowerShellModules.Tests.ps1 +++ b/images/ubuntu/scripts/tests/PowerShellModules.Tests.ps1 @@ -1,22 +1,22 @@ Describe "PowerShellModules" { $modules = (Get-ToolsetContent).powershellModules - $withoutVersionsModules = $modules | Where-Object {-not $_.versions} | ForEach-Object { + $modulesWithoutVersions = $modules | Where-Object { -not $_.versions } | ForEach-Object { @{moduleName = $_.name} } - $withVersionsModules = $modules | Where-Object {$_.versions} | ForEach-Object { + $modulesWithVersions = $modules | Where-Object { $_.versions } | ForEach-Object { $moduleName = $_.name $_.versions | ForEach-Object { @{moduleName = $moduleName; expectedVersion = $_} } } - It "<moduleName> is installed" -TestCases $withoutVersionsModules { + It "<moduleName> is installed" -TestCases $modulesWithoutVersions { Get-Module -Name $moduleName -ListAvailable | Should -BeTrue } - if ($withVersionsModules) { - It "<moduleName> with <expectedVersion> is installed" -TestCases $withVersionsModules { + if ($modulesWithVersions) { + It "<moduleName> with <expectedVersion> is installed" -TestCases $modulesWithVersions { (Get-Module -Name $moduleName -ListAvailable).Version -contains $expectedVersion | Should -BeTrue } } @@ -33,6 +33,7 @@ Describe "AzureModules" { foreach ($version in $module.versions) { $modulePath = Join-Path -Path $modulesRootPath -ChildPath "${moduleName}_${version}" $moduleInfo = @{ moduleName = $moduleName; modulePath = $modulePath; expectedVersion = $version } + It "<expectedVersion> exists in modules directory" -TestCases $moduleInfo { $testJob = Start-Job -ScriptBlock { param ( @@ -52,6 +53,7 @@ Describe "AzureModules" { if ($module.default) { $moduleInfo = @{ moduleName = $moduleName; moduleDefault = $module.default } + It "<moduleDefault> set as default" -TestCases $moduleInfo { $moduleVersion = (Get-Module -ListAvailable -Name $moduleName).Version.ToString() $moduleVersion | Should -Match $moduleDefault @@ -59,4 +61,4 @@ Describe "AzureModules" { } } } -} \ No newline at end of file +} diff --git a/images/ubuntu/scripts/tests/RunnerCache.Tests.ps1 b/images/ubuntu/scripts/tests/RunnerCache.Tests.ps1 index 76c1a7278432..8c8109ef07f8 100644 --- a/images/ubuntu/scripts/tests/RunnerCache.Tests.ps1 +++ b/images/ubuntu/scripts/tests/RunnerCache.Tests.ps1 @@ -1,7 +1,7 @@ Describe "RunnerCache" { Context "runner cache directory not empty" { - It "/opt/runner-cache not empty" { - (Get-ChildItem -Path "/opt/runner-cache/*.tar.gz" -Recurse).Count | Should -BeGreaterThan 0 + It "<RunnerCachePath> not empty" -TestCases @{ RunnerCachePath = "/opt/runner-cache" } { + (Get-ChildItem -Path "$RunnerCachePath/*.tar.gz" -Recurse).Count | Should -BeGreaterThan 0 } } } diff --git a/images/ubuntu/scripts/tests/Tools.Tests.ps1 b/images/ubuntu/scripts/tests/Tools.Tests.ps1 index 4071e39843ac..3e42763fce76 100644 --- a/images/ubuntu/scripts/tests/Tools.Tests.ps1 +++ b/images/ubuntu/scripts/tests/Tools.Tests.ps1 @@ -63,6 +63,7 @@ Describe "Rust" { } } } + Describe "Docker" { It "docker" { "docker --version" | Should -ReturnZeroExitCode @@ -111,13 +112,9 @@ Describe "Bazel" { } Describe "clang" { - [array]$testCases = (Get-ToolsetContent).clang.Versions | ForEach-Object { @{ClangVersion = $_} } + $testCases = (Get-ToolsetContent).clang.Versions | ForEach-Object { @{ClangVersion = $_} } It "clang <ClangVersion>" -TestCases $testCases { - param ( - [string] $ClangVersion - ) - "clang-$ClangVersion --version" | Should -ReturnZeroExitCode "clang++-$ClangVersion --version" | Should -ReturnZeroExitCode "clang-format-$ClangVersion --version" | Should -ReturnZeroExitCode @@ -136,34 +133,22 @@ Describe "erlang" -Skip:(Test-IsUbuntu22) { $testCases = @("erl -version", "erlc -v", "rebar3 -v") | ForEach-Object { @{ErlangCommand = $_} } It "erlang <ErlangCommand>" -TestCases $testCases { - param ( - [string] $ErlangCommand - ) - "$ErlangCommand" | Should -ReturnZeroExitCode } } Describe "gcc" { - [array]$testCases = (Get-ToolsetContent).gcc.Versions | ForEach-Object { @{GccVersion = $_} } + $testCases = (Get-ToolsetContent).gcc.Versions | ForEach-Object { @{GccVersion = $_} } It "gcc <GccVersion>" -TestCases $testCases { - param ( - [string] $GccVersion - ) - "$GccVersion --version" | Should -ReturnZeroExitCode } } Describe "gfortran" { - [array]$testCases = (Get-ToolsetContent).gfortran.Versions | ForEach-Object { @{GfortranVersion = $_} } + $testCases = (Get-ToolsetContent).gfortran.Versions | ForEach-Object { @{GfortranVersion = $_} } It "gfortran <GfortranVersion>" -TestCases $testCases { - param ( - [string] $GfortranVersion - ) - "$GfortranVersion --version" | Should -ReturnZeroExitCode } } @@ -323,7 +308,7 @@ Describe "Pulumi" { Describe "Phantomjs" -Skip:(Test-IsUbuntu22) { It "phantomjs" { - $env:OPENSSL_CONF="/etc/ssl"; phantomjs --version + $env:OPENSSL_CONF="/etc/ssl" "phantomjs --version" | Should -ReturnZeroExitCode } } @@ -332,16 +317,14 @@ Describe "Containers" { $testCases = @("podman", "buildah", "skopeo") | ForEach-Object { @{ContainerCommand = $_} } It "<ContainerCommand>" -TestCases $testCases { - param ( - [string] $ContainerCommand - ) - "$ContainerCommand -v" | Should -ReturnZeroExitCode } # https://github.com/actions/runner-images/issues/7753 It "podman networking" -TestCases "podman CNI plugins" { - "podman network create -d bridge test-net && podman network ls" | Should -Not -OutputTextMatchingRegex "Error" + "podman network create -d bridge test-net" | Should -ReturnZeroExitCode + "podman network ls" | Should -Not -OutputTextMatchingRegex "Error" + "podman network rm test-net" | Should -ReturnZeroExitCode } } @@ -356,31 +339,20 @@ Describe "Python" { $testCases = @("python", "pip", "python3", "pip3") | ForEach-Object { @{PythonCommand = $_} } It "<PythonCommand>" -TestCases $testCases { - param ( - [string] $PythonCommand - ) - "$PythonCommand --version" | Should -ReturnZeroExitCode - } + } } Describe "Ruby" { $testCases = @("ruby", "gem") | ForEach-Object { @{RubyCommand = $_} } It "<RubyCommand>" -TestCases $testCases { - param ( - [string] $RubyCommand - ) - "$RubyCommand --version" | Should -ReturnZeroExitCode } - $gemTestCases = (Get-ToolsetContent).rubygems | ForEach-Object { - @{gemName = $_.name} - } + $gemTestCases = (Get-ToolsetContent).rubygems | ForEach-Object { @{gemName = $_.name} } - if ($gemTestCases) - { + if ($gemTestCases) { It "Gem <gemName> is installed" -TestCases $gemTestCases { "gem list -i '^$gemName$'" | Should -OutputTextMatchingRegex "true" } @@ -395,22 +367,22 @@ Describe "yq" { Describe "Kotlin" { It "kapt" { - "kapt -version"| Should -ReturnZeroExitCode + "kapt -version" | Should -ReturnZeroExitCode } It "kotlin" { - "kotlin -version"| Should -ReturnZeroExitCode + "kotlin -version" | Should -ReturnZeroExitCode } It "kotlinc" { - "kotlinc -version"| Should -ReturnZeroExitCode + "kotlinc -version" | Should -ReturnZeroExitCode } It "kotlinc-jvm" { - "kotlinc-jvm -version"| Should -ReturnZeroExitCode + "kotlinc-jvm -version" | Should -ReturnZeroExitCode } It "kotlin-dce-js" { - "kotlin-dce-js -version"| Should -ReturnZeroExitCode + "kotlin-dce-js -version" | Should -ReturnZeroExitCode } } diff --git a/images/ubuntu/scripts/tests/Toolset.Tests.ps1 b/images/ubuntu/scripts/tests/Toolset.Tests.ps1 index 2ac3e12bc6d4..488bb42aeb95 100644 --- a/images/ubuntu/scripts/tests/Toolset.Tests.ps1 +++ b/images/ubuntu/scripts/tests/Toolset.Tests.ps1 @@ -28,7 +28,7 @@ Describe "Toolset" { } } - foreach($tool in $tools) { + foreach ($tool in $tools) { $toolName = $tool.Name Context "$toolName" { $toolExecs = $toolsExecutables[$toolName] @@ -45,16 +45,15 @@ Describe "Toolset" { $ExpectedVersionPath | Should -Exist } - $toolExecs = $toolsExecutables[$toolName] $foundVersion = Get-Item $expectedVersionPath ` | Sort-Object -Property {[SemVer]$_.name} -Descending ` | Select-Object -First 1 $foundVersionPath = Join-Path $foundVersion $tool.arch - if($toolExecs) { + if ($toolExecs) { foreach ($executable in $toolExecs["tools"]) { - $executablePath = Join-Path $foundVersionPath $executable - + $executablePath = Join-Path $foundVersionPath $executable + It "Validate $executable" -TestCases @{ExecutablePath = $executablePath} { $ExecutablePath | Should -Exist } From 3945d6e7dc0d8f35b984d4858cd19e2ffa1ed45a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 14 Dec 2023 19:03:34 +0000 Subject: [PATCH 2535/3485] Ubuntu 20.04 (20231211) Image Update (#8992) * Updating readme file for ubuntu20 version 20231211.1.0 * Update Ubuntu2004-Readme.md --------- Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2004-Readme.md | 74 +++++++++++++++--------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/images/ubuntu/Ubuntu2004-Readme.md b/images/ubuntu/Ubuntu2004-Readme.md index b4d0afa2cfc4..32fd384d47ff 100644 --- a/images/ubuntu/Ubuntu2004-Readme.md +++ b/images/ubuntu/Ubuntu2004-Readme.md @@ -6,8 +6,8 @@ *** # Ubuntu 20.04 - OS Version: 20.04.6 LTS -- Kernel Version: 5.15.0-1052-azure -- Image Version: 20231204.1.0 +- Kernel Version: 5.15.0-1053-azure +- Image Version: 20231211.1.0 - Systemd version: 245.4-4ubuntu3.22 ## Installed Software @@ -35,7 +35,7 @@ ### Package Management - cpan 1.64 - Helm 3.13.1 -- Homebrew 4.1.22 +- Homebrew 4.1.24 - Miniconda 23.10.0 - Npm 10.2.3 - NuGet 6.6.1.2 @@ -43,7 +43,7 @@ - Pip3 20.0.2 - Pipx 1.3.3 - RubyGems 3.1.2 -- Vcpkg (build from commit 16ee2ecb3) +- Vcpkg (build from commit 000d1bda1) - Yarn 1.22.21 #### Environment variables @@ -75,7 +75,7 @@ to accomplish this. - Bazelisk 1.19.0 - Bicep 0.23.1 - Buildah 1.22.3 -- CMake 3.27.9 +- CMake 3.28.0 - CodeQL Action Bundle 2.15.3 - Docker Amazon ECR Credential Helper 0.7.1 - Docker Compose v1 1.29.2 @@ -93,20 +93,20 @@ to accomplish this. - jq 1.6 - Kind 0.20.0 - Kubectl 1.28.4 -- Kustomize 5.2.1 +- Kustomize 5.3.0 - Leiningen 2.10.0 - MediaInfo 19.09 - Mercurial 5.3.1 - Minikube 1.32.0 - n 9.2.0 - Newman 6.0.0 -- nvm 0.39.5 +- nvm 0.39.7 - OpenSSL 1.1.1f-1ubuntu2.20 -- Packer 1.9.4 +- Packer v1.10.0 - Parcel 2.10.3 - PhantomJS 2.1.1 2.1.1 - Podman 3.4.2 -- Pulumi 3.95.0 +- Pulumi 3.96.2 - R 4.3.2 - Skopeo 1.5.0 - Sphinx Open Source Search Server 2.2.11 @@ -118,15 +118,15 @@ to accomplish this. ### CLI Tools - Alibaba Cloud CLI 3.0.174 -- AWS CLI 2.14.5 -- AWS CLI Session Manager Plugin 1.2.497.0 -- AWS SAM CLI 1.103.0 -- Azure CLI 2.54.0 +- AWS CLI 2.15.0 +- AWS CLI Session Manager Plugin 1.2.536.0 +- AWS SAM CLI 1.104.0 +- Azure CLI 2.55.0 - Azure CLI (azure-devops) 0.26.0 -- GitHub CLI 2.39.2 -- Google Cloud CLI 455.0.0 -- Netlify CLI 17.9.0 -- OpenShift CLI 4.14.4 +- GitHub CLI 2.40.0 +- Google Cloud CLI 456.0.0 +- Netlify CLI 17.10.1 +- OpenShift CLI 4.14.5 - ORAS CLI 1.1.0 - Vercel CLI 32.6.1 @@ -140,7 +140,7 @@ to accomplish this. ### PHP Tools - PHP: 7.4.33, 8.0.30, 8.1.26, 8.2.13, 8.3.0 -- Composer 2.6.5 +- Composer 2.6.6 - PHPUnit 8.5.36 ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. @@ -153,9 +153,9 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Stack 2.13.1 ### Rust Tools -- Cargo 1.74.0 -- Rust 1.74.0 -- Rustdoc 1.74.0 +- Cargo 1.74.1 +- Rust 1.74.1 +- Rustdoc 1.74.1 - Rustup 1.26.0 #### Packages @@ -167,12 +167,12 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.6.0 ### Browsers and Drivers -- Google Chrome 119.0.6045.199 -- ChromeDriver 119.0.6045.105 -- Chromium 119.0.6045.0 -- Microsoft Edge 119.0.2151.97 -- Microsoft Edge WebDriver 119.0.2151.97 -- Selenium server 4.15.0 +- Google Chrome 120.0.6099.71 +- ChromeDriver 120.0.6099.71 +- Chromium 120.0.6099.0 +- Microsoft Edge 120.0.2210.61 +- Microsoft Edge WebDriver 120.0.2210.61 +- Selenium server 4.16.0 - Mozilla Firefox 120.0.1 - Geckodriver 0.33.0 @@ -217,8 +217,8 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Go - 1.19.13 -- 1.20.11 -- 1.21.4 +- 1.20.12 +- 1.21.5 #### Node.js - 16.20.2 @@ -230,8 +230,8 @@ Use the following command as a part of your job to start the service: 'sudo syst - 3.8.18 - 3.9.18 - 3.10.13 -- 3.11.6 -- 3.12.0 +- 3.11.7 +- 3.12.1 #### PyPy - 2.7.18 [PyPy 7.3.13] @@ -255,7 +255,7 @@ Use the following command as a part of your job to start the service: 'sudo syst - Az: 9.3.0 - Az (Cached): 3.1.0.zip, 4.4.0.zip, 5.9.0.zip, 6.6.0.zip, 7.5.0.zip - MarkdownPS: 1.9 -- Microsoft.Graph: 2.10.0 +- Microsoft.Graph: 2.11.0 - Pester: 5.5.0 - PSScriptAnalyzer: 1.21.0 @@ -324,7 +324,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | brotli | 1.0.7-6ubuntu0.1 | | bzip2 | 1.0.8-2 | | coreutils | 8.30-3ubuntu2 | -| curl | 7.68.0-1ubuntu2.20 | +| curl | 7.68.0-1ubuntu2.21 | | dbus | 1.12.16-2ubuntu2.3 | | dnsutils | 1:9.16.1-0ubuntu2.16 | | dpkg | 1.19.7ubuntu3.2 | @@ -346,8 +346,8 @@ Use the following command as a part of your job to start the service: 'sudo syst | lib32z1 | 1:1.2.11.dfsg-2ubuntu1.5 | | libc++-dev | 1:10.0-50\~exp1 | | libc++abi-dev | 1:10.0-50\~exp1 | -| libc6-dev | 2.31-0ubuntu9.12 | -| libcurl4 | 7.68.0-1ubuntu2.20 | +| libc6-dev | 2.31-0ubuntu9.14 | +| libcurl4 | 7.68.0-1ubuntu2.21 | | libgbm-dev | 21.2.6-0ubuntu0.1\~20.04.2 | | libgconf-2-4 | 3.2.6-6ubuntu1 | | libgsl-dev | 2.5+dfsg-6+deb10u1build0.20.04.1 | @@ -362,7 +362,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | libxkbfile-dev | 1:1.1.0-1 | | libxss1 | 1:1.2.3-1 | | libyaml-dev | 0.2.2-1 | -| locales | 2.31-0ubuntu9.12 | +| locales | 2.31-0ubuntu9.14 | | m4 | 1.4.18-4 | | make | 4.2.1-1.2 | | mediainfo | 19.09-1build1 | @@ -389,7 +389,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | subversion | 1.13.0-3ubuntu0.2 | | sudo | 1.8.31-1ubuntu1.5 | | swig | 4.0.1-5build1 | -| tar | 1.30+dfsg-7ubuntu0.20.04.3 | +| tar | 1.30+dfsg-7ubuntu0.20.04.4 | | telnet | 0.17-41.2build1 | | texinfo | 6.7.0.dfsg.2-5 | | time | 1.7-25.1build1 | From 1921245719e4ea852ab0426f082b36caf1a5cf00 Mon Sep 17 00:00:00 2001 From: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com> Date: Thu, 14 Dec 2023 20:57:47 +0100 Subject: [PATCH 2536/3485] [windows] pin checksum where avaiable (#9005) Related: https://github.com/actions/runner-images-internal/issues/5489 --- images/windows/scripts/build/Install-MysqlCli.ps1 | 3 ++- images/windows/scripts/build/Install-NET48-devpack.ps1 | 3 ++- images/windows/scripts/build/Install-NET48.ps1 | 3 ++- images/windows/scripts/build/Install-ServiceFabricSDK.ps1 | 7 +++++-- images/windows/scripts/build/Install-VCRedist.ps1 | 6 +++--- images/windows/toolsets/toolset-2019.json | 4 ++-- images/windows/toolsets/toolset-2022.json | 4 ++-- 7 files changed, 18 insertions(+), 12 deletions(-) diff --git a/images/windows/scripts/build/Install-MysqlCli.ps1 b/images/windows/scripts/build/Install-MysqlCli.ps1 index cfe5bddb66df..782a7db5f82d 100644 --- a/images/windows/scripts/build/Install-MysqlCli.ps1 +++ b/images/windows/scripts/build/Install-MysqlCli.ps1 @@ -1,13 +1,14 @@ ################################################################################ ## File: Install-MysqlCli.ps1 ## Desc: Install Mysql CLI +## Supply chain security: checksum validation (visual c++ redistributable package) ################################################################################ # Installing visual c++ redistributable package. Install-Binary ` -Url 'https://download.microsoft.com/download/0/5/6/056dcda9-d667-4e27-8001-8a0c6971d6b1/vcredist_x64.exe' ` -InstallArgs @("/install", "/quiet", "/norestart") ` - -ExpectedSignature '3BDA323E552DB1FDE5F4FBEE75D6D5B2B187EEDC' + -ExpectedSHA256Sum '20E2645B7CD5873B1FA3462B99A665AC8D6E14AAE83DED9D875FEA35FFDD7D7E' # Downloading mysql [version] $mysqlVersion = (Get-ToolsetContent).mysql.version diff --git a/images/windows/scripts/build/Install-NET48-devpack.ps1 b/images/windows/scripts/build/Install-NET48-devpack.ps1 index b747d2014b60..676b762cb107 100644 --- a/images/windows/scripts/build/Install-NET48-devpack.ps1 +++ b/images/windows/scripts/build/Install-NET48-devpack.ps1 @@ -1,12 +1,13 @@ ################################################################################ ## File: Install-NET48-devpack.ps1 ## Desc: Install .NET 4.8 devpack +## Supply chain security: checksum validation ################################################################################ # .NET 4.8 Dev pack Install-Binary ` -Url 'https://download.visualstudio.microsoft.com/download/pr/014120d7-d689-4305-befd-3cb711108212/0307177e14752e359fde5423ab583e43/ndp48-devpack-enu.exe' ` -InstallArgs @("Setup", "/passive", "/norestart") ` - -ExpectedSignature 'C82273A065EC470FB1EBDE846A91E6FFB29E9C12' + -ExpectedSHA256Sum '0A7AC4A9B44CED6BB7A0EBF3AD9BA29F60BD4D3BEB2047E19F4D8749DE61F5AC' Invoke-PesterTests -TestFile "Tools" -TestName "NET48" diff --git a/images/windows/scripts/build/Install-NET48.ps1 b/images/windows/scripts/build/Install-NET48.ps1 index 6c0a11e80172..799428a8e66a 100644 --- a/images/windows/scripts/build/Install-NET48.ps1 +++ b/images/windows/scripts/build/Install-NET48.ps1 @@ -1,10 +1,11 @@ ################################################################################ ## File: Install-NET48.ps1 ## Desc: Install .NET 4.8 +## Supply chain security: checksum validation ################################################################################ # .NET 4.8 Dev pack Install-Binary ` -Url 'https://download.visualstudio.microsoft.com/download/pr/2d6bb6b2-226a-4baa-bdec-798822606ff1/8494001c276a4b96804cde7829c04d7f/ndp48-x86-x64-allos-enu.exe' ` -InstallArgs @("Setup", "/passive", "/norestart") ` - -ExpectedSignature 'ABDCA79AF9DD48A0EA702AD45260B3C03093FB4B' + -ExpectedSHA256Sum '68C9986A8DCC0214D909AA1F31BEE9FB5461BB839EDCA996A75B08DDFFC1483F' diff --git a/images/windows/scripts/build/Install-ServiceFabricSDK.ps1 b/images/windows/scripts/build/Install-ServiceFabricSDK.ps1 index 4d623618134f..cc9ae9f2e359 100644 --- a/images/windows/scripts/build/Install-ServiceFabricSDK.ps1 +++ b/images/windows/scripts/build/Install-ServiceFabricSDK.ps1 @@ -2,6 +2,7 @@ ## File: Install-ServiceFabricSDK.ps1 ## Desc: Install webpicmd and then the service fabric sdk ## must be install after Visual Studio +## Supply chain security: checksum validation ################################################################################ # Creating 'Installer' cache folder if it doesn't exist @@ -10,17 +11,19 @@ New-Item -Path 'C:\Windows\Installer' -ItemType Directory -Force # Get Service Fabric components versions $runtimeVersion = (Get-ToolsetContent).serviceFabric.runtime.version $sdkVersion = (Get-ToolsetContent).serviceFabric.sdk.version + $urlBase = "https://download.microsoft.com/download/b/8/a/b8a2fb98-0ec1-41e5-be98-9d8b5abf7856" # Install Service Fabric Runtime for Windows Install-Binary ` -Url "${urlBase}/MicrosoftServiceFabric.${runtimeVersion}.exe" ` -InstallArgs @("/accepteula ", "/quiet", "/force") ` - -ExpectedSignature (Get-ToolsetContent).serviceFabric.runtime.signature + -ExpectedSHA256Sum (Get-ToolsetContent).serviceFabric.runtime.checksum + # Install Service Fabric SDK Install-Binary ` -Url "${urlBase}/MicrosoftServiceFabricSDK.${sdkVersion}.msi" ` - -ExpectedSignature (Get-ToolsetContent).serviceFabric.sdk.signature + -ExpectedSHA256Sum (Get-ToolsetContent).serviceFabric.sdk.checksum Invoke-PesterTests -TestFile "Tools" -TestName "ServiceFabricSDK" diff --git a/images/windows/scripts/build/Install-VCRedist.ps1 b/images/windows/scripts/build/Install-VCRedist.ps1 index d6aa737ed637..af93a7cee775 100644 --- a/images/windows/scripts/build/Install-VCRedist.ps1 +++ b/images/windows/scripts/build/Install-VCRedist.ps1 @@ -1,20 +1,20 @@ ################################################################################ ## File: Install-VCRedist.ps1 ## Desc: Install Visual C++ Redistributable +## Supply chain security: checksum validation ################################################################################ $baseUrl = "https://download.microsoft.com/download/1/6/5/165255E7-1014-4D0A-B094-B6A430A6BFFC" $argumentList = ("/install", "/quiet", "/norestart") -$signatureThumbrint = "ABDCA79AF9DD48A0EA702AD45260B3C03093FB4B" Install-Binary ` -Url "${baseUrl}/vcredist_x86.exe" ` -InstallArgs $argumentList ` - -ExpectedSignature $signatureThumbrint + -ExpectedSHA256Sum '99DCE3C841CC6028560830F7866C9CE2928C98CF3256892EF8E6CF755147B0D8' Install-Binary ` -Url "${baseUrl}/vcredist_x64.exe" ` -InstallArgs $argumentList ` - -ExpectedSignature $signatureThumbrint + -ExpectedSHA256Sum 'F3B7A76D84D23F91957AA18456A14B4E90609E4CE8194C5653384ED38DADA6F3' Invoke-PesterTests -TestFile "Tools" -TestName "VCRedist" diff --git a/images/windows/toolsets/toolset-2019.json b/images/windows/toolsets/toolset-2019.json index ad0b81a89649..5f3dcbdc3357 100644 --- a/images/windows/toolsets/toolset-2019.json +++ b/images/windows/toolsets/toolset-2019.json @@ -412,11 +412,11 @@ "serviceFabric": { "runtime": { "version": "9.1.1436.9590", - "signature": "AFBF0B8B6A18F7E23CCA1DDCD0AC1A55B4035173" + "checksum": "089F9BE6A63AF66C337E507B52082575C8ED330DF765259C6F2F13F900DA96D5" }, "sdk": { "version": "6.1.1436", - "signature": "AFBF0B8B6A18F7E23CCA1DDCD0AC1A55B4035173" + "checksum": "D2A6B58315D08B6E46C2D25E91DFA1163136F70A5FA8CEF9DB147F07EE001AD1" } }, "dotnet": { diff --git a/images/windows/toolsets/toolset-2022.json b/images/windows/toolsets/toolset-2022.json index 5c0f6abdb81d..0312de3aec2b 100644 --- a/images/windows/toolsets/toolset-2022.json +++ b/images/windows/toolsets/toolset-2022.json @@ -353,11 +353,11 @@ "serviceFabric": { "runtime": { "version": "9.1.1436.9590", - "signature": "AFBF0B8B6A18F7E23CCA1DDCD0AC1A55B4035173" + "checksum": "089F9BE6A63AF66C337E507B52082575C8ED330DF765259C6F2F13F900DA96D5" }, "sdk": { "version": "6.1.1436", - "signature": "AFBF0B8B6A18F7E23CCA1DDCD0AC1A55B4035173" + "checksum": "D2A6B58315D08B6E46C2D25E91DFA1163136F70A5FA8CEF9DB147F07EE001AD1" } }, "dotnet": { From cd286f70f7b10ea90ed8c4e46d6ac255ea02091c Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Fri, 15 Dec 2023 00:28:36 +0100 Subject: [PATCH 2537/3485] [Windows] Force Chocolatey to check packages hashes (#9020) --- images/windows/scripts/helpers/ChocoHelpers.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/windows/scripts/helpers/ChocoHelpers.ps1 b/images/windows/scripts/helpers/ChocoHelpers.ps1 index 479facf1de3c..7332d0e131eb 100644 --- a/images/windows/scripts/helpers/ChocoHelpers.ps1 +++ b/images/windows/scripts/helpers/ChocoHelpers.ps1 @@ -32,7 +32,7 @@ function Install-ChocoPackage { $count = 1 while ($true) { Write-Host "Running [#$count]: choco install $packageName -y $argumentList" - choco install $packageName -y @argumentList --no-progress + choco install $packageName -y @argumentList --no-progress --require-checksums $pkg = choco list --localonly $packageName --exact --all --limitoutput if ($pkg) { From eed37c2c66895b95f6e8d47f94c053a924e3f90c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 15 Dec 2023 01:34:17 +0000 Subject: [PATCH 2538/3485] Windows Server 2022 (20231211) Image Update (#9000) * Updating readme file for win22 version 20231211.1.1 * Update Windows2022-Readme.md --------- Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/windows/Windows2022-Readme.md | 46 ++++++++++++++-------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/images/windows/Windows2022-Readme.md b/images/windows/Windows2022-Readme.md index fa24cd5d9007..812c33d0019d 100644 --- a/images/windows/Windows2022-Readme.md +++ b/images/windows/Windows2022-Readme.md @@ -6,7 +6,7 @@ *** # Windows Server 2022 - OS Version: 10.0.20348 Build 2113 -- Image Version: 20231205.1.0 +- Image Version: 20231211.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -15,7 +15,7 @@ ### Language and Runtime - Bash 5.2.21(1)-release -- Go 1.20.11 +- Go 1.20.12 - Julia 1.9.4 - Kotlin 1.9.21 - LLVM 16.0.6 @@ -27,7 +27,7 @@ ### Package Management - Chocolatey 2.2.2 -- Composer 2.6.5 +- Composer 2.6.6 - Helm 3.13.1 - Miniconda 23.10.0 (pre-installed on the image but not added to PATH) - NPM 9.8.1 @@ -35,7 +35,7 @@ - pip 23.3.1 (python 3.9) - Pipx 1.3.3 - RubyGems 3.2.33 -- Vcpkg (build from commit 08c4e7104) +- Vcpkg (build from commit 000d1bda1) - Yarn 1.22.21 #### Environment variables @@ -54,7 +54,7 @@ - 7zip 23.01 - aria2 1.37.0 - azcopy 10.21.1 -- Bazel 6.4.0 +- Bazel 7.0.0 - Bazelisk 1.19.0 - Bicep 0.23.1 - Cabal 3.10.2.0 @@ -80,7 +80,7 @@ - NSIS 3.09 - OpenSSL 1.1.1w - Packer 1.9.4 -- Pulumi 3.95.0 +- Pulumi 3.96.2 - R 4.3.2 - Service Fabric SDK 9.1.1436.9590 - Stack 2.13.1 @@ -93,18 +93,18 @@ - zstd 1.5.5 ### CLI Tools -- Alibaba Cloud CLI 3.0.188 -- AWS CLI 2.14.5 -- AWS SAM CLI 1.103.0 +- Alibaba Cloud CLI 3.0.189 +- AWS CLI 2.15.0 +- AWS SAM CLI 1.104.0 - AWS Session Manager CLI 1.2.536.0 - Azure CLI 2.55.0 - Azure DevOps CLI extension 0.26.0 -- GitHub CLI 2.39.2 +- GitHub CLI 2.40.0 ### Rust Tools -- Cargo 1.74.0 -- Rust 1.74.0 -- Rustdoc 1.74.0 +- Cargo 1.74.1 +- Rust 1.74.1 +- Rustdoc 1.74.1 - Rustup 1.26.0 #### Packages @@ -116,14 +116,14 @@ - Rustfmt 1.6.0 ### Browsers and Drivers -- Google Chrome 120.0.6099.63 -- Chrome Driver 120.0.6099.62 -- Microsoft Edge 119.0.2151.97 -- Microsoft Edge Driver 119.0.2151.97 +- Google Chrome 120.0.6099.71 +- Chrome Driver 120.0.6099.71 +- Microsoft Edge 120.0.2210.61 +- Microsoft Edge Driver 120.0.2210.61 - Mozilla Firefox 120.0.1 - Gecko Driver 0.33.0 - IE Driver 4.14.0.0 -- Selenium server 4.15.0 +- Selenium server 4.16.0 #### Environment variables | Name | Value | @@ -162,8 +162,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Go - 1.19.13 -- 1.20.11 -- 1.21.4 +- 1.20.12 +- 1.21.5 #### Node.js - 16.20.2 @@ -176,7 +176,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 3.9.13 - 3.10.11 - 3.11.7 -- 3.12.0 +- 3.12.1 #### PyPy - 2.7.18 [PyPy 7.3.13] @@ -568,10 +568,10 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Az (Cached): 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.468 +- AWSPowershell: 4.1.472 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 -- Microsoft.Graph: 2.10.0 +- Microsoft.Graph: 2.11.0 - Pester: 3.4.0, 5.5.0 - PowerShellGet: 1.0.0.1, 2.2.5 - PSScriptAnalyzer: 1.21.0 From 62536f12ed3388e010a85f64a9ee3ce4e8353b07 Mon Sep 17 00:00:00 2001 From: sergei-pyshnoi <121864472+sergei-pyshnoi@users.noreply.github.com> Date: Fri, 15 Dec 2023 11:28:17 +0100 Subject: [PATCH 2539/3485] pin sha for macos packages (#9001) --- images/macos/scripts/build/install-mono.sh | 5 +++++ images/macos/scripts/build/install-python.sh | 2 ++ images/macos/scripts/helpers/utils.sh | 22 ++++++++++++++++++++ images/macos/toolsets/toolset-13.json | 6 ++++-- images/macos/toolsets/toolset-14.json | 6 ++++-- 5 files changed, 37 insertions(+), 4 deletions(-) diff --git a/images/macos/scripts/build/install-mono.sh b/images/macos/scripts/build/install-mono.sh index cc4795144ccd..1fa6e29f44b5 100644 --- a/images/macos/scripts/build/install-mono.sh +++ b/images/macos/scripts/build/install-mono.sh @@ -9,22 +9,27 @@ source ~/utils/utils.sh # Install Mono Framework MONO_VERSION_FULL=$(get_toolset_value '.mono.framework.version') +MONO_PKG_SHA256=$(get_toolset_value '.mono.framework.sha256') MONO_VERSION=$(echo "$MONO_VERSION_FULL" | cut -d. -f 1,2,3) MONO_VERSION_SHORT=$(echo $MONO_VERSION_FULL | cut -d. -f 1,2) MONO_PKG_URL="https://download.mono-project.com/archive/${MONO_VERSION}/macos-10-universal/MonoFramework-MDK-${MONO_VERSION_FULL}.macos10.xamarin.universal.pkg" MONO_VERSIONS_PATH='/Library/Frameworks/Mono.framework/Versions' MONO_PKG_PATH=$(download_with_retry "$MONO_PKG_URL") +use_checksum_comparison "$MONO_PKG_PATH" "$MONO_PKG_SHA256" + echo "Installing Mono Framework ${MONO_VERSION_FULL}..." sudo installer -pkg "$MONO_PKG_PATH" -target / # Download and install NUnit console NUNIT_VERSION=$(get_toolset_value '.mono.nunit.version') NUNIT_ARCHIVE_URL="https://github.com/nunit/nunit-console/releases/download/${NUNIT_VERSION}/NUnit.Console-${NUNIT_VERSION}.zip" +NUNIT_ARCHIVE_SHA256=$(get_toolset_value '.mono.nunit.sha256') NUNIT_PATH="/Library/Developer/nunit" NUNIT_VERSION_PATH="$NUNIT_PATH/$NUNIT_VERSION" NUNIT_ARCHIVE_PATH=$(download_with_retry "$NUNIT_ARCHIVE_URL") +use_checksum_comparison "$NUNIT_ARCHIVE_PATH" "$NUNIT_ARCHIVE_SHA256" echo "Installing NUnit ${NUNIT_VERSION}..." sudo mkdir -p "$NUNIT_VERSION_PATH" sudo unzip -q "$NUNIT_ARCHIVE_PATH" -d "$NUNIT_VERSION_PATH" diff --git a/images/macos/scripts/build/install-python.sh b/images/macos/scripts/build/install-python.sh index 978a19340fa7..91269d19f512 100644 --- a/images/macos/scripts/build/install-python.sh +++ b/images/macos/scripts/build/install-python.sh @@ -11,6 +11,8 @@ echo "Installing Python Tooling" if is_Monterey || is_BigSur; then echo "Install latest Python 2" python2_pkg=$(download_with_retry "https://www.python.org/ftp/python/2.7.18/python-2.7.18-macosx10.9.pkg") + python2_pkg_sha256="c570f38b05dd8b112ad21b418cdf51a9816d62f9f44746452739d421be24d50c" + use_checksum_comparison "$python2_pkg" "$python2_pkg_sha256" choice_changes_xml=$(mktemp /tmp/python2_choice_changes.xml.XXXXXX) sudo installer -showChoiceChangesXML -pkg "$python2_pkg" -target / | tee "$choice_changes_xml" > /dev/null diff --git a/images/macos/scripts/helpers/utils.sh b/images/macos/scripts/helpers/utils.sh index cb644b41c509..2954ff0c6ff2 100644 --- a/images/macos/scripts/helpers/utils.sh +++ b/images/macos/scripts/helpers/utils.sh @@ -235,3 +235,25 @@ get_arch() { echo "x64" fi } + +use_checksum_comparison() { + local file_path=$1 + local checksum=$2 + local sha_type=${3:-"256"} + + echo "Performing checksum verification" + + if [[ ! -f "$file_path" ]]; then + echo "File not found: $file_path" + exit 1 + fi + + local_file_hash=$(shasum --algorithm "$sha_type" "$file_path" | awk '{print $1}') + + if [[ "$local_file_hash" != "$checksum" ]]; then + echo "Checksum verification failed. Expected hash: $checksum; Actual hash: $local_file_hash." + exit 1 + else + echo "Checksum verification passed" + fi +} diff --git a/images/macos/toolsets/toolset-13.json b/images/macos/toolsets/toolset-13.json index ced440632b24..8ae38ebe14b8 100644 --- a/images/macos/toolsets/toolset-13.json +++ b/images/macos/toolsets/toolset-13.json @@ -222,10 +222,12 @@ }, "mono": { "framework":{ - "version": "6.12.0.188" + "version": "6.12.0.188", + "sha256": "07cdd4e5e72b562892960b7fc73af470db7a4ffc2f68bb834eb3d0a874bbd12c" }, "nunit": { - "version": "3.15.4" + "version": "3.15.4", + "sha256": "356dab61433b5be76b76fd0e2e979bda56d164f6d85a900e55c3a4a5fffa28de" } } } diff --git a/images/macos/toolsets/toolset-14.json b/images/macos/toolsets/toolset-14.json index dbe70586d869..2158f4fb478d 100644 --- a/images/macos/toolsets/toolset-14.json +++ b/images/macos/toolsets/toolset-14.json @@ -124,10 +124,12 @@ }, "mono": { "framework":{ - "version": "6.12.0.188" + "version": "6.12.0.188", + "sha256": "07cdd4e5e72b562892960b7fc73af470db7a4ffc2f68bb834eb3d0a874bbd12c" }, "nunit": { - "version": "3.15.4" + "version": "3.15.4", + "sha256": "356dab61433b5be76b76fd0e2e979bda56d164f6d85a900e55c3a4a5fffa28de" } } } From 9e49d08492cfcaa2757137b3e7165919c46c1aef Mon Sep 17 00:00:00 2001 From: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com> Date: Fri, 15 Dec 2023 11:28:43 +0100 Subject: [PATCH 2540/3485] [macos] add XCode-15.1 (#9002) --- images/macos/toolsets/toolset-13.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/images/macos/toolsets/toolset-13.json b/images/macos/toolsets/toolset-13.json index 8ae38ebe14b8..c5efecde993b 100644 --- a/images/macos/toolsets/toolset-13.json +++ b/images/macos/toolsets/toolset-13.json @@ -3,6 +3,7 @@ "default": "14.3.1", "x64": { "versions": [ + { "link": "15.1", "version": "15.1.0+15C65", "install_runtimes": "true"}, { "link": "15.0.1", "version": "15.0.1+15A507", "symlinks": ["15.0"], "install_runtimes": "true"}, { "link": "14.3.1", "version": "14.3.1+14E300c","symlinks": ["14.3"], "install_runtimes": "true"}, { "link": "14.2", "version": "14.2.0+14C18", "install_runtimes": "true"}, @@ -11,6 +12,7 @@ }, "arm64":{ "versions": [ + { "link": "15.1", "version": "15.1.0+15C65", "install_runtimes": "true"}, { "link": "15.0.1", "version": "15.0.1+15A507", "symlinks": ["15.0"], "install_runtimes": "true"}, { "link": "14.3.1", "version": "14.3.1+14E300c","symlinks": ["14.3"], "install_runtimes": "true" }, { "link": "14.2", "version": "14.2.0+14C18", "install_runtimes": "true" }, From 5e4039478f36e1269154e9c1cf343f66ee83f605 Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Fri, 15 Dec 2023 12:16:58 +0100 Subject: [PATCH 2541/3485] Fix macOS CI - clean images updates (#9032) --- .../macos/anka/CreateCleanAnkaTemplate.ps1 | 47 ++++++++--------- images.CI/macos/anka/Service.Helpers.psm1 | 50 ++++++------------- 2 files changed, 35 insertions(+), 62 deletions(-) diff --git a/images.CI/macos/anka/CreateCleanAnkaTemplate.ps1 b/images.CI/macos/anka/CreateCleanAnkaTemplate.ps1 index e32ab920bbbf..4221d743b3a2 100644 --- a/images.CI/macos/anka/CreateCleanAnkaTemplate.ps1 +++ b/images.CI/macos/anka/CreateCleanAnkaTemplate.ps1 @@ -89,13 +89,6 @@ function Invoke-SoftwareUpdate { return } - Write-Host "`t[*] Fetching Software Updates ready to install on '$TemplateName' VM:" - Show-StringWithFormat $newUpdates - $listOfNewUpdates = $($($newUpdates.Split("*")).Split("Title") | Where-Object {$_ -match "Label:"}).Replace("Label: ", '') - Write-Host "`t[*] Installing Software Updates on '$TemplateName' VM:" - Install-SoftwareUpdate -HostName $ipAddress -listOfUpdates $listOfNewUpdates -Password $Password | Show-StringWithFormat - - # Check if Action: restart # Define the next macOS version $command = "sw_vers" $guestMacosVersion = Invoke-SSHPassCommand -HostName $ipAddress -Command $command @@ -103,27 +96,26 @@ function Invoke-SoftwareUpdate { '12.\d' { $nextOSVersion = 'macOS Ventura|macOS Sonoma' } '13.\d' { $nextOSVersion = 'macOS Sonoma' } } - # Make an array of updates - $listOfNewUpdates = $newUpdates.split('*').Trim('') + + Write-Host "`t[*] Fetching Software Updates ready to install on '$TemplateName' VM:" + Show-StringWithFormat $newUpdates + $listOfNewUpdates = $($($newUpdates.Split("*")).Split("Title").where({$_ -match "Label:"}).Replace("Label: ", '').where({$_ -notmatch $nextOSVersion})) + Write-Host "`t[*] Installing Software Updates on '$TemplateName' VM:" + Install-SoftwareUpdate -HostName $ipAddress -listOfUpdates $listOfNewUpdates -Password $Password | Show-StringWithFormat + Write-Host "`t[*] Sleep 60 seconds before the software updates have been installed" + Start-Sleep -Seconds 60 + Write-Host "`t[*] Waiting for loginwindow process" + Wait-LoginWindow -HostName $ipAddress | Show-StringWithFormat + # Re-enable AutoLogon after installing a new security software update + Invoke-EnableAutoLogon + foreach ($newupdate in $listOfNewUpdates) { - # Will be True if the value is not Venture, not empty, and contains "Action: restart" words - if ($newupdate.Contains("Action: restart") -and !($newupdate -match $nextOSVersion) -and (-not [String]::IsNullOrEmpty($newupdate))) { - Write-Host "`t[*] Sleep 120 seconds before the software updates have been installed" - Start-Sleep -Seconds 120 - - Write-Host "`t[*] Waiting for loginwindow process" - Wait-LoginWindow -HostName $ipAddress | Show-StringWithFormat - - # Re-enable AutoLogon after installing a new security software update - Invoke-EnableAutoLogon - - # Check software updates have been installed - $updates = Get-SoftwareUpdate -HostName $ipAddress - if ($updates.Contains("Action: restart") -and !($newupdate -match $nextOSVersion)) { - Write-Host "`t[x] Software updates failed to install: " - Show-StringWithFormat $updates - exit 1 - } + # Check software updates have been installed + $updates = Get-SoftwareUpdate -HostName $ipAddress + if ($updates.Contains("Action: restart") -and !($updates -match $nextOSVersion)) { + Write-Host "`t[x] Software updates failed to install: " + Show-StringWithFormat $updates + exit 1 } } @@ -136,6 +128,7 @@ function Invoke-SoftwareUpdate { Invoke-SSHPassCommand -HostName $ipAddress -Command $command | Show-StringWithFormat } + function Invoke-UpdateSettings { param ( [Parameter(Mandatory)] diff --git a/images.CI/macos/anka/Service.Helpers.psm1 b/images.CI/macos/anka/Service.Helpers.psm1 index e7af5cb8fecb..882f2f7e91c6 100644 --- a/images.CI/macos/anka/Service.Helpers.psm1 +++ b/images.CI/macos/anka/Service.Helpers.psm1 @@ -266,36 +266,13 @@ function Install-SoftwareUpdate { [array] $listOfUpdates, [string] $Password ) - # If an update is happening on macOS 12 or 13 we will use the prepared list of updates, otherwise, we will install all updates. - $command = "sw_vers" - $guestMacosVersion = Invoke-SSHPassCommand -HostName $HostName -Command $command - if ($guestMacosVersion[1] -match "12") { - foreach ($update in $listOfUpdates) { - # Filtering updates that contain "Ventura" word - if ($update -notmatch "Ventura") { - $command = "sudo /usr/sbin/softwareupdate --restart --verbose --install '$($update.trim())'" - Invoke-SSHPassCommand -HostName $HostName -Command $command - } - } - } elseif ($guestMacosVersion[1] -match "13") { - $osArch = $(arch) - if ($osArch -eq "arm64") { - Invoke-SoftwareUpdateArm64 -HostName $HostName -Password $Password -ListOfUpdates $listOfUpdates - } else { - foreach ($update in $listOfUpdates) { - # Filtering updates that contain "Sonoma" word - if ($update -notmatch "Sonoma") { - $command = "sudo /usr/sbin/softwareupdate --restart --verbose --install '$($update.trim())'" - Invoke-SSHPassCommand -HostName $HostName -Command $command - } - } - } + # If an update is happening on macOS arm64 we will use the additional tool to install updates. + $osArch = $(arch) + if ($osArch -eq "arm64") { + Invoke-SoftwareUpdateArm64 -HostName $HostName -Password $Password -ListOfUpdates $listOfUpdates } else { - $osArch = $(arch) - if ($osArch -eq "arm64") { - Invoke-SoftwareUpdateArm64 -HostName $HostName -Password $Password -ListOfUpdates $listOfUpdates - } else { - $command = "sudo /usr/sbin/softwareupdate --all --install --restart --verbose" + foreach ($update in $listOfUpdates) { + $command = "sudo /usr/sbin/softwareupdate --restart --verbose --install '$($update.trim())'" Invoke-SSHPassCommand -HostName $HostName -Command $command } } @@ -348,14 +325,17 @@ function Invoke-WithRetry { [int] $RetryCount = 20, [int] $Seconds = 60 ) - while ($RetryCount -gt 0) { - if ($Command) { - $result = & $Command - } + try { + if ($Command) { + $result = & $Command + } - if (& $BreakCondition) { - return $result + if (& $BreakCondition) { + return $result + } + } catch { + Write-Host "`t [!] Error during command execution: $_" } $RetryCount-- From 2633fdfcc464823de9bf72355c74b86981436e54 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 15 Dec 2023 14:55:37 +0000 Subject: [PATCH 2542/3485] macOS 12 (20231211) Image Update (#9012) * Updating readme file for macOS-12 version 20231211.1 * Update macos-12-Readme.md --------- Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-12-Readme.md | 87 +++++++++++++++++---------------- 1 file changed, 44 insertions(+), 43 deletions(-) diff --git a/images/macos/macos-12-Readme.md b/images/macos/macos-12-Readme.md index d0ebc5eff949..5013f443c9b1 100644 --- a/images/macos/macos-12-Readme.md +++ b/images/macos/macos-12-Readme.md @@ -1,12 +1,13 @@ | Announcements | |-| +| [Old versions of Android SDK & tools will be removed from images on January, 8](https://github.com/actions/runner-images/issues/8952) | | [[all OSs] Nodejs 14.x will be removed from the images on November, 26](https://github.com/actions/runner-images/issues/8779) | | [Major Refactoring of GitHub Actions Runner Images Repository](https://github.com/actions/runner-images/issues/8706) | *** # macOS 12 - OS Version: macOS 12.7.1 (21G920) - Kernel Version: Darwin 21.6.0 -- Image Version: 20231127.1 +- Image Version: 20231211.1 ## Installed Software @@ -23,16 +24,16 @@ - GNU Fortran 13 (Homebrew GCC 13.2.0) - available by `gfortran-13` alias - Julia 1.9.4 - Kotlin 1.9.21-release-633 -- Go 1.20.11 +- Go 1.20.12 - Mono 6.12.0.188 -- Node.js 18.18.2 +- Node.js 18.19.0 - MSBuild 16.10.1.51301 (Mono 6.12.0.188) -- NVM 0.39.5 -- NVM - Cached node versions: 16.20.2, 18.18.2, 20.10.0 -- Perl 5.38.1 +- NVM 0.39.7 +- NVM - Cached node versions: 16.20.2, 18.19.0, 20.10.0 +- Perl 5.38.2 - PHP 8.3.0 - Python 2.7.18 -- Python3 3.12.0 +- Python3 3.12.1 - R 4.3.2 - Ruby 3.0.6p216 @@ -40,16 +41,16 @@ - Bundler 2.4.22 - Carthage 0.39.1 - CocoaPods 1.14.3 -- Composer 2.6.5 -- Homebrew 4.1.22 +- Composer 2.6.6 +- Homebrew 4.1.25 - Miniconda 23.10.0 -- NPM 9.8.1 +- NPM 10.2.3 - NuGet 6.3.1.1 - Pip 20.3.4 (python 2.7) - Pip3 23.3.1 (python 3.12) -- Pipx 1.2.1 +- Pipx 1.3.3 - RubyGems 3.4.22 -- Vcpkg 2023 (build from commit 13c3c0fcc) +- Vcpkg 2023 (build from commit 000d1bda1) - Yarn 1.22.19 #### Environment variables @@ -60,25 +61,25 @@ ### Project Management - Apache Ant 1.10.14 -- Apache Maven 3.9.5 -- Gradle 8.4 +- Apache Maven 3.9.6 +- Gradle 8.5 - Sbt 1.9.7 ### Utilities - 7-Zip 17.05 - aria2 1.37.0 - azcopy 10.21.2 -- bazel 6.4.0 +- bazel 7.0.0 - bazelisk 1.19.0 - bsdtar 3.5.1 - available by 'tar' alias -- Curl 8.4.0 +- Curl 8.5.0 - Git 2.43.0 - Git LFS 3.4.0 -- GitHub CLI 2.39.1 +- GitHub CLI 2.40.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.21.4 - gpg (GnuPG) 2.4.3 -- ImageMagick 7.1.1-21 +- ImageMagick 7.1.1-23 - jq 1.7 - mongo 5.0.21 - mongod 5.0.21 @@ -92,29 +93,29 @@ - Switchaudio-osx 1.2.2 - Vagrant 2.4.0 - VirtualBox 6.1.38r153438 -- yq 4.40.3 +- yq 4.40.4 - zstd 1.5.5 ### Tools - App Center CLI 2.14.0 -- AWS CLI 2.13.39 -- AWS SAM CLI 1.103.0 -- AWS Session Manager CLI 1.2.497.0 -- Azure CLI 2.54.0 +- AWS CLI 2.15.0 +- AWS SAM CLI 1.104.0 +- AWS Session Manager CLI 1.2.536.0 +- Azure CLI 2.55.0 - Azure CLI (azure-devops) 0.26.0 - Bicep CLI 0.23.1 - Cabal 3.6.2.0 -- Cmake 3.27.8 +- Cmake 3.28.0 - CodeQL Action Bundle 2.15.3 -- Colima 0.6.6 +- Colima 0.6.7 - Fastlane 2.217.0 - GHC 9.8.1 - GHCup 0.1.20.0 - Jazzy 0.14.4 - Stack 2.13.1 -- SwiftFormat 0.52.10 +- SwiftFormat 0.52.11 - Swig 4.1.1 -- Xcbeautify 1.0.1 +- Xcbeautify 1.1.0 - Xcode Command Line Tools 14.2.0.0.1.1668646533 - Xcodes 1.4.1 @@ -125,12 +126,12 @@ ### Browsers - Safari 17.1 (17616.2.9.11.9) - SafariDriver 17.1 (17616.2.9.11.9) -- Google Chrome 119.0.6045.159 -- Google Chrome for Testing 119.0.6045.105 -- ChromeDriver 119.0.6045.105 -- Microsoft Edge 119.0.2151.72 -- Microsoft Edge WebDriver 119.0.2151.72 -- Mozilla Firefox 120.0 +- Google Chrome 120.0.6099.62 +- Google Chrome for Testing 120.0.6099.71 +- ChromeDriver 120.0.6099.71 +- Microsoft Edge 120.0.2210.61 +- Microsoft Edge WebDriver 120.0.2210.61 +- Mozilla Firefox 120.0.1 - geckodriver 0.33.0 - Selenium server 4.15.0 @@ -168,23 +169,23 @@ - 3.8.18 - 3.9.18 - 3.10.13 -- 3.11.6 -- 3.12.0 +- 3.11.7 +- 3.12.1 #### Node.js - 16.20.2 -- 18.18.2 +- 18.19.0 - 20.10.0 #### Go - 1.19.13 -- 1.20.11 -- 1.21.4 +- 1.20.12 +- 1.21.5 ### Rust Tools -- Cargo 1.74.0 -- Rust 1.74.0 -- Rustdoc 1.74.0 +- Cargo 1.74.1 +- Rust 1.74.1 +- Rustdoc 1.74.1 - Rustup 1.26.0 #### Packages @@ -199,7 +200,7 @@ - PowerShell 7.2.17 #### PowerShell Modules -- Az: 11.0.0 +- Az: 11.1.0 - MarkdownPS: 1.9 - Pester: 5.5.0 - PSScriptAnalyzer: 1.21.0 @@ -335,7 +336,7 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" | Package Name | Version | | -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 8.0 | -| Android Emulator | 32.1.15 | +| Android Emulator | 33.1.23 | | Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | | Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34 (rev 2)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | | Android SDK Platform-Tools | 34.0.5 | From 1cb43238b5cdfa434d4f1d7c0eaee55acfceeb2e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 15 Dec 2023 15:43:26 +0000 Subject: [PATCH 2543/3485] macOS 11 (20231211) Image Update (#9013) * Updating readme file for macOS-11 version 20231211.2 * Update macos-11-Readme.md --------- Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-11-Readme.md | 85 +++++++++++++++++---------------- 1 file changed, 43 insertions(+), 42 deletions(-) diff --git a/images/macos/macos-11-Readme.md b/images/macos/macos-11-Readme.md index b372ca90dae6..a667db296ace 100644 --- a/images/macos/macos-11-Readme.md +++ b/images/macos/macos-11-Readme.md @@ -1,12 +1,13 @@ | Announcements | |-| +| [Old versions of Android SDK & tools will be removed from images on January, 8](https://github.com/actions/runner-images/issues/8952) | | [[all OSs] Nodejs 14.x will be removed from the images on November, 26](https://github.com/actions/runner-images/issues/8779) | | [Major Refactoring of GitHub Actions Runner Images Repository](https://github.com/actions/runner-images/issues/8706) | *** # macOS 11 - OS Version: macOS 11.7.10 (20G1427) - Kernel Version: Darwin 20.6.0 -- Image Version: 20231127.1 +- Image Version: 20231211.2 ## Installed Software @@ -23,16 +24,16 @@ - GNU Fortran 12 (Homebrew GCC 12.3.0) - available by `gfortran-12` alias - Julia 1.9.4 - Kotlin 1.9.21-release-633 -- Go 1.20.11 +- Go 1.20.12 - Mono 6.12.0.188 -- Node.js 18.18.2 +- Node.js 18.19.0 - MSBuild 16.10.1.51301 (Mono 6.12.0.188) -- NVM 0.39.5 -- NVM - Cached node versions: 16.20.2, 18.18.2, 20.10.0 -- Perl 5.38.1 +- NVM 0.39.7 +- NVM - Cached node versions: 16.20.2, 18.19.0, 20.10.0 +- Perl 5.38.2 - PHP 8.3.0 - Python 2.7.18 -- Python3 3.12.0 +- Python3 3.12.1 - R 4.3.2 - Ruby 2.7.8p225 @@ -40,16 +41,16 @@ - Bundler 2.4.22 - Carthage 0.39.1 - CocoaPods 1.14.3 -- Composer 2.6.5 -- Homebrew 4.1.22 +- Composer 2.6.6 +- Homebrew 4.1.25 - Miniconda 23.10.0 -- NPM 9.8.1 +- NPM 10.2.3 - NuGet 6.3.1.1 - Pip 20.3.4 (python 2.7) - Pip3 23.3.1 (python 3.12) -- Pipx 1.2.1 +- Pipx 1.3.3 - RubyGems 3.4.22 -- Vcpkg 2023 (build from commit 2a01db703) +- Vcpkg 2023 (build from commit f56238700) - Yarn 1.22.19 #### Environment variables @@ -60,26 +61,26 @@ ### Project Management - Apache Ant 1.10.14 -- Apache Maven 3.9.5 -- Gradle 8.4 +- Apache Maven 3.9.6 +- Gradle 8.5 - Sbt 1.9.7 ### Utilities - 7-Zip 17.05 - aria2 1.37.0 - azcopy 10.21.2 -- bazel 6.4.0 +- bazel 7.0.0 - bazelisk 1.19.0 - bsdtar 3.3.2 - available by 'tar' alias -- Curl 8.4.0 +- Curl 8.5.0 - Git 2.43.0 - Git LFS 3.4.0 -- GitHub CLI 2.39.1 +- GitHub CLI 2.40.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.21.4 - gpg (GnuPG) 2.4.3 - helm v3.13.2+g2a2fb3b -- ImageMagick 7.1.1-21 +- ImageMagick 7.1.1-23 - jq 1.7 - mongo 5.0.21 - mongod 5.0.21 @@ -92,27 +93,27 @@ - Sox 14.4.2 - Subversion (SVN) 1.14.2 - Switchaudio-osx 1.2.2 -- yq 4.40.3 +- yq 4.40.5 - zstd 1.5.5 ### Tools -- Aliyun CLI 3.0.188 +- Aliyun CLI 3.0.189 - App Center CLI 2.14.0 -- AWS CLI 2.14.0 -- AWS SAM CLI 1.103.0 -- AWS Session Manager CLI 1.2.497.0 -- Azure CLI 2.54.0 +- AWS CLI 2.15.0 +- AWS SAM CLI 1.104.0 +- AWS Session Manager CLI 1.2.536.0 +- Azure CLI 2.55.0 - Azure CLI (azure-devops) 0.26.0 - Bicep CLI 0.23.1 - Cabal 3.6.2.0 -- Cmake 3.27.8 +- Cmake 3.28.0 - CodeQL Action Bundle 2.15.3 - Fastlane 2.217.0 - GHC 9.8.1 - GHCup 0.1.20.0 - Jazzy 0.14.4 - Stack 2.13.1 -- SwiftFormat 0.52.10 +- SwiftFormat 0.52.11 - Swig 4.1.1 - Xcode Command Line Tools 13.2.0.0.1.1638488800 @@ -123,12 +124,12 @@ ### Browsers - Safari 16.6.1 (16615.3.12.11.5) - SafariDriver 16.6.1 (16615.3.12.11.5) -- Google Chrome 119.0.6045.159 -- Google Chrome for Testing 119.0.6045.105 -- ChromeDriver 119.0.6045.105 -- Microsoft Edge 119.0.2151.72 -- Microsoft Edge WebDriver 119.0.2151.72 -- Mozilla Firefox 120.0 +- Google Chrome 120.0.6099.62 +- Google Chrome for Testing 120.0.6099.71 +- ChromeDriver 120.0.6099.71 +- Microsoft Edge 120.0.2210.61 +- Microsoft Edge WebDriver 120.0.2210.61 +- Mozilla Firefox 120.0.1 - geckodriver 0.33.0 - Selenium server 4.15.0 @@ -168,23 +169,23 @@ - 3.8.18 - 3.9.18 - 3.10.13 -- 3.11.6 -- 3.12.0 +- 3.11.7 +- 3.12.1 #### Node.js - 16.20.2 -- 18.18.2 +- 18.19.0 - 20.10.0 #### Go - 1.19.13 -- 1.20.11 -- 1.21.4 +- 1.20.12 +- 1.21.5 ### Rust Tools -- Cargo 1.74.0 -- Rust 1.74.0 -- Rustdoc 1.74.0 +- Cargo 1.74.1 +- Rust 1.74.1 +- Rustdoc 1.74.1 - Rustup 1.26.0 #### Packages @@ -199,7 +200,7 @@ - PowerShell 7.2.17 #### PowerShell Modules -- Az: 11.0.0 +- Az: 11.1.0 - MarkdownPS: 1.9 - Pester: 5.5.0 - PSScriptAnalyzer: 1.21.0 @@ -332,7 +333,7 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" | Package Name | Version | | -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 8.0 | -| Android Emulator | 32.1.15 | +| Android Emulator | 33.1.23 | | Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | | Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34 (rev 2)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | | Android SDK Platform-Tools | 34.0.5 | From 7fe17c761427b487b5b81414b894cb4d95a517c9 Mon Sep 17 00:00:00 2001 From: sergei-pyshnoi <121864472+sergei-pyshnoi@users.noreply.github.com> Date: Fri, 15 Dec 2023 16:44:17 +0100 Subject: [PATCH 2544/3485] [MacOS] Pin sha256 for xcode (#9007) * pin sha256 for xcode * add sha256 for xcode 15.1 --- images/macos/scripts/build/Install-Xcode.ps1 | 2 +- .../scripts/helpers/Xcode.Installer.psm1 | 13 ++++++++++-- images/macos/toolsets/toolset-11.json | 12 +++++------ images/macos/toolsets/toolset-12.json | 14 ++++++------- images/macos/toolsets/toolset-13.json | 21 ++++++++++--------- images/macos/toolsets/toolset-14.json | 8 +++---- 6 files changed, 40 insertions(+), 30 deletions(-) diff --git a/images/macos/scripts/build/Install-Xcode.ps1 b/images/macos/scripts/build/Install-Xcode.ps1 index 1e4edfc1f590..6219becee80e 100644 --- a/images/macos/scripts/build/Install-Xcode.ps1 +++ b/images/macos/scripts/build/Install-Xcode.ps1 @@ -21,7 +21,7 @@ $xcodeVersions | ForEach-Object -ThrottleLimit $threadCount -Parallel { Import-Module "$env:HOME/image-generation/helpers/Common.Helpers.psm1" Import-Module "$env:HOME/image-generation/helpers/Xcode.Installer.psm1" -DisableNameChecking - Install-XcodeVersion -Version $_.version -LinkTo $_.link + Install-XcodeVersion -Version $_.version -LinkTo $_.link -Sha256Sum $_.sha256 Confirm-XcodeIntegrity -Version $_.link } diff --git a/images/macos/scripts/helpers/Xcode.Installer.psm1 b/images/macos/scripts/helpers/Xcode.Installer.psm1 index 9ce10ac625f1..0efb531ea1c6 100644 --- a/images/macos/scripts/helpers/Xcode.Installer.psm1 +++ b/images/macos/scripts/helpers/Xcode.Installer.psm1 @@ -6,7 +6,9 @@ function Install-XcodeVersion { [Parameter(Mandatory)] [string] $Version, [Parameter(Mandatory)] - [string] $LinkTo + [string] $LinkTo, + [Parameter(Mandatory)] + [string] $Sha256Sum ) $xcodeDownloadDirectory = "$env:HOME/Library/Caches/XcodeInstall" @@ -28,8 +30,15 @@ function Invoke-DownloadXcodeArchive { $tempXipDirectory = New-Item -Path $DownloadDirectory -Name "Xcode$Version" -ItemType "Directory" $xcodeFileName = 'Xcode-{0}.xip' -f $Version $xcodeUri = '{0}{1}?{2}'-f ${env:XCODE_INSTALL_STORAGE_URL}, $xcodeFileName, ${env:XCODE_INSTALL_SAS} - Invoke-DownloadWithRetry -Url $xcodeUri -Path (Join-Path $tempXipDirectory.FullName $xcodeFileName) | Out-Null + $xcodeFullPath = Join-Path $tempXipDirectory.FullName $xcodeFileName + Invoke-DownloadWithRetry -Url $xcodeUri -Path $xcodeFullPath | Out-Null + # Validating checksum + $xcodeSha256 = Get-FileHash -Path $xcodeFullPath -Algorithm SHA256 | Select-Object -ExpandProperty Hash + if ($xcodeSha256 -ne $Sha256Sum) { + throw "Xcode $Version checksum mismatch. Expected: $Sha256Sum, Actual: $xcodeSha256" + } + return $tempXipDirectory } diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index a7b656d94957..d278f8ed8b04 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -3,12 +3,12 @@ "default": "13.2.1", "x64": { "versions": [ - { "link": "13.2.1", "version": "13.2.1+13C100", "symlinks": ["13.2"] }, - { "link": "13.1", "version": "13.1.0+13A1030d" }, - { "link": "13.0", "version": "13.0.0+13A233" }, - { "link": "12.5.1", "version": "12.5.1+12E507", "symlinks": ["12.5"] }, - { "link": "12.4", "version": "12.4.0+12D4e" }, - { "link": "11.7", "version": "11.7.0-GM+11E801a", "symlinks": ["11.7_beta"] } + { "link": "13.2.1", "version": "13.2.1+13C100", "symlinks": ["13.2"], "sha256": "D3BFCC6225D531587490C0DFC0926C80B7D50D17671DC8F25868F965F5D65F9D" }, + { "link": "13.1", "version": "13.1.0+13A1030d", "sha256": "4EFDEEA0EEEDA1957BB394128CCCD1DAAC3CB0A3D074224E0FAB90855CCA09C4" }, + { "link": "13.0", "version": "13.0.0+13A233", "sha256": "1D8257750A4E0333A2B372B32381BE5EC9B29704C8A0D44CE2E6D26D1CF4301E" }, + { "link": "12.5.1", "version": "12.5.1+12E507", "symlinks": ["12.5"], "sha256": "2592BF58E654440B3DF7062219DBBD24BDF345FAE6BA000756D6D5B1166A7168" }, + { "link": "12.4", "version": "12.4.0+12D4e", "sha256": "CC8D10155258F9DDAA5E422AB8F50E6058758C95208E58E59B5DB1DB033CE2FF" }, + { "link": "11.7", "version": "11.7.0-GM+11E801a", "symlinks": ["11.7_beta"], "sha256": "A53FDEAB92326CD9BF93A1B5FAE01E3D658B04DA60DFF5DE74141CABA0808B03" } ] } }, diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index 72e06fc7688b..8e9e51711898 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -3,13 +3,13 @@ "default": "14.2", "x64": { "versions": [ - { "link": "14.2", "version": "14.2.0+14C18", "install_runtimes": "true" }, - { "link": "14.1", "version": "14.1.0+14B47b", "install_runtimes": "true" }, - { "link": "14.0.1", "version": "14.0.1+14A400", "symlinks": ["14.0"], "install_runtimes": "true" }, - { "link": "13.4.1", "version": "13.4.1+13F100", "symlinks": ["13.4"] }, - { "link": "13.3.1", "version": "13.3.1+13E500a", "symlinks": ["13.3"] }, - { "link": "13.2.1", "version": "13.2.1+13C100", "symlinks": ["13.2"] }, - { "link": "13.1", "version": "13.1.0+13A1030d" } + { "link": "14.2", "version": "14.2.0+14C18", "install_runtimes": "true", "sha256": "686B9D53CA49E50D563BC0104B1E8B4F7CCFE80064A6D689965FB819BF8EFE72" }, + { "link": "14.1", "version": "14.1.0+14B47b", "install_runtimes": "true", "sha256": "12F8A3AEF78BF354470AD8B351ADDD925C8EDAD888137D138CA50A8130EB9F2F" }, + { "link": "14.0.1", "version": "14.0.1+14A400", "symlinks": ["14.0"], "install_runtimes": "true", "sha256": "EDB4DDCE02F92338E3D10B011FC86CD26520E3238585F06F3C182880DDD3B2AF" }, + { "link": "13.4.1", "version": "13.4.1+13F100", "symlinks": ["13.4"], "sha256": "A1E0DBD6D5A96C4A6D3D63600B58486759AA836C2D9F7E8FA6D7DA4C7399638B" }, + { "link": "13.3.1", "version": "13.3.1+13E500a", "symlinks": ["13.3"], "sha256": "D10B4644DB84BA43F7B18CE94FB3CA1ACD255D39781F4AF8FC88BD8581E08F97" }, + { "link": "13.2.1", "version": "13.2.1+13C100", "symlinks": ["13.2"], "sha256": "D3BFCC6225D531587490C0DFC0926C80B7D50D17671DC8F25868F965F5D65F9D" }, + { "link": "13.1", "version": "13.1.0+13A1030d", "sha256": "4EFDEEA0EEEDA1957BB394128CCCD1DAAC3CB0A3D074224E0FAB90855CCA09C4" } ] } }, diff --git a/images/macos/toolsets/toolset-13.json b/images/macos/toolsets/toolset-13.json index c5efecde993b..3a095d0e07fa 100644 --- a/images/macos/toolsets/toolset-13.json +++ b/images/macos/toolsets/toolset-13.json @@ -3,20 +3,21 @@ "default": "14.3.1", "x64": { "versions": [ - { "link": "15.1", "version": "15.1.0+15C65", "install_runtimes": "true"}, - { "link": "15.0.1", "version": "15.0.1+15A507", "symlinks": ["15.0"], "install_runtimes": "true"}, - { "link": "14.3.1", "version": "14.3.1+14E300c","symlinks": ["14.3"], "install_runtimes": "true"}, - { "link": "14.2", "version": "14.2.0+14C18", "install_runtimes": "true"}, - { "link": "14.1", "version": "14.1.0+14B47b", "install_runtimes": "true"} + { "link": "15.1", "version": "15.1.0+15C65", "install_runtimes": "true", "sha256": "857D8DB537BAC82BF99DE0E1D3895D214D4D02101C1340CEF3DAF6E821BA1D05"}, + { "link": "15.0.1", "version": "15.0.1+15A507", "symlinks": ["15.0"], "install_runtimes": "true", "sha256": "5AC17AE6060CAFC3C7112C6DA0B153450BE21F1DE6632777FBA9FBC9D999C9E8"}, + { "link": "14.3.1", "version": "14.3.1+14E300c","symlinks": ["14.3"], "install_runtimes": "true", "sha256": "B5CC7BF37447C32A971B37D71C7DA1AF7ABB45CEE4B96FE126A1D3B0D2C260AF"}, + { "link": "14.2", "version": "14.2.0+14C18", "install_runtimes": "true", "sha256": "686B9D53CA49E50D563BC0104B1E8B4F7CCFE80064A6D689965FB819BF8EFE72"}, + { "link": "14.1", "version": "14.1.0+14B47b", "install_runtimes": "true", "sha256": "12F8A3AEF78BF354470AD8B351ADDD925C8EDAD888137D138CA50A8130EB9F2F"} + ] }, "arm64":{ "versions": [ - { "link": "15.1", "version": "15.1.0+15C65", "install_runtimes": "true"}, - { "link": "15.0.1", "version": "15.0.1+15A507", "symlinks": ["15.0"], "install_runtimes": "true"}, - { "link": "14.3.1", "version": "14.3.1+14E300c","symlinks": ["14.3"], "install_runtimes": "true" }, - { "link": "14.2", "version": "14.2.0+14C18", "install_runtimes": "true" }, - { "link": "14.1", "version": "14.1.0+14B47b", "install_runtimes": "true" } + { "link": "15.1", "version": "15.1.0+15C65", "install_runtimes": "true", "sha256": "857D8DB537BAC82BF99DE0E1D3895D214D4D02101C1340CEF3DAF6E821BA1D05"}, + { "link": "15.0.1", "version": "15.0.1+15A507", "symlinks": ["15.0"], "install_runtimes": "true", "sha256": "5AC17AE6060CAFC3C7112C6DA0B153450BE21F1DE6632777FBA9FBC9D999C9E8"}, + { "link": "14.3.1", "version": "14.3.1+14E300c","symlinks": ["14.3"], "install_runtimes": "true", "sha256": "B5CC7BF37447C32A971B37D71C7DA1AF7ABB45CEE4B96FE126A1D3B0D2C260AF"}, + { "link": "14.2", "version": "14.2.0+14C18", "install_runtimes": "true", "sha256": "686B9D53CA49E50D563BC0104B1E8B4F7CCFE80064A6D689965FB819BF8EFE72"}, + { "link": "14.1", "version": "14.1.0+14B47b", "install_runtimes": "true", "sha256": "12F8A3AEF78BF354470AD8B351ADDD925C8EDAD888137D138CA50A8130EB9F2F"} ] } }, diff --git a/images/macos/toolsets/toolset-14.json b/images/macos/toolsets/toolset-14.json index 2158f4fb478d..f0bcd66fb3c3 100644 --- a/images/macos/toolsets/toolset-14.json +++ b/images/macos/toolsets/toolset-14.json @@ -3,14 +3,14 @@ "default": "15.0.1", "x64": { "versions": [ - { "link": "15.0.1", "version": "15.0.1+15A507", "symlinks": ["15.0"], "install_runtimes": "true"}, - { "link": "14.3.1", "version": "14.3.1+14E300c","symlinks": ["14.3"], "install_runtimes": "true"} + { "link": "15.0.1", "version": "15.0.1+15A507", "symlinks": ["15.0"], "install_runtimes": "true", "sha256": "5AC17AE6060CAFC3C7112C6DA0B153450BE21F1DE6632777FBA9FBC9D999C9E8"}, + { "link": "14.3.1", "version": "14.3.1+14E300c","symlinks": ["14.3"], "install_runtimes": "true", "sha256": "B5CC7BF37447C32A971B37D71C7DA1AF7ABB45CEE4B96FE126A1D3B0D2C260AF"} ] }, "arm64":{ "versions": [ - { "link": "15.0.1", "version": "15.0.1+15A507", "symlinks": ["15.0"], "install_runtimes": "true"}, - { "link": "14.3.1", "version": "14.3.1+14E300c","symlinks": ["14.3"], "install_runtimes": "true"} + { "link": "15.0.1", "version": "15.0.1+15A507", "symlinks": ["15.0"], "install_runtimes": "true", "sha256": "5AC17AE6060CAFC3C7112C6DA0B153450BE21F1DE6632777FBA9FBC9D999C9E8"}, + { "link": "14.3.1", "version": "14.3.1+14E300c","symlinks": ["14.3"], "install_runtimes": "true", "sha256": "B5CC7BF37447C32A971B37D71C7DA1AF7ABB45CEE4B96FE126A1D3B0D2C260AF"} ] } }, From 5d6e226c1dbf7b156ef05c49157aad290a5b95ae Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Fri, 15 Dec 2023 19:29:17 +0100 Subject: [PATCH 2545/3485] [macOS] Fix Nunit version in the mono conf file (#9028) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Update Software Report to support azcopy output * [macOS] Fix nunit version in the mono conf file * [macOS] temporary Nunit version fix * Fix typo --------- Co-authored-by: Alexey Ayupov <“alexey.ayupov@akvelon.com”> --- images/macos/scripts/build/install-xamarin.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/images/macos/scripts/build/install-xamarin.sh b/images/macos/scripts/build/install-xamarin.sh index 8b956dade91d..5eda104164aa 100644 --- a/images/macos/scripts/build/install-xamarin.sh +++ b/images/macos/scripts/build/install-xamarin.sh @@ -86,4 +86,7 @@ mkdir -p $PREFERENCES_XAMARIN_DIR rm -rf $HOME/.config/NuGet/NuGet.Config nuget config +# Temporary workaround to point Mono to the proper NUnit console +sudo sed -Ei '' 's/3.6.0/3.6.1/' /Library/Frameworks/Mono.framework/Versions/Current/Commands/nunit3-console + invoke_tests "Xamarin" From 50f736491f1cf19f726b44ef46b872aa3f51e27f Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Sat, 16 Dec 2023 20:00:54 +0100 Subject: [PATCH 2546/3485] [windows] Update signature for Edge Web Driver (#9036) --- images/windows/scripts/build/Install-EdgeDriver.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/windows/scripts/build/Install-EdgeDriver.ps1 b/images/windows/scripts/build/Install-EdgeDriver.ps1 index a8c54c35412f..c81e77811aef 100644 --- a/images/windows/scripts/build/Install-EdgeDriver.ps1 +++ b/images/windows/scripts/build/Install-EdgeDriver.ps1 @@ -27,7 +27,7 @@ Write-Host "Expand Microsoft Edge WebDriver archive..." Expand-7ZipArchive -Path $archivePath -DestinationPath $edgeDriverPath #Validate the EdgeDriver signature -$signatureThumbprint = "CB9C4FBEA1D87D2D468AC5A9CAAB0163F6AD8401" +$signatureThumbprint = "573EF451A68C33FB904346D44551BEF3BB5BBF68" Test-FileSignature -Path "$edgeDriverPath\msedgedriver.exe" -ExpectedThumbprint $signatureThumbprint Write-Host "Setting the environment variables..." From 1f11cd7e1780a772c2ad38486a84f5378eb8b701 Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Tue, 19 Dec 2023 12:14:39 +0100 Subject: [PATCH 2547/3485] [Ubuntu] Force ruby gem to check gems (#9022) * [Ubuntu] Force ruby gem to check gems * High to Medium Security for unsigned gems --- images/ubuntu/scripts/build/install-ruby.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/ubuntu/scripts/build/install-ruby.sh b/images/ubuntu/scripts/build/install-ruby.sh index 5241a73c4cde..0fdc9af97840 100644 --- a/images/ubuntu/scripts/build/install-ruby.sh +++ b/images/ubuntu/scripts/build/install-ruby.sh @@ -14,7 +14,7 @@ gemsToInstall=$(get_toolset_value ".rubygems[] .name") if [ -n "$gemsToInstall" ]; then for gem in $gemsToInstall; do echo "Installing gem $gem" - gem install $gem + gem install $gem -P MediumSecurity done fi From 0298168e004fb9ccc26ff2b61aebf0fc025c4830 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 20 Dec 2023 11:57:26 +0000 Subject: [PATCH 2548/3485] Updating readme file for macOS-11 version 20231216.1 (#9041) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-11-Readme.md | 55 ++++++++++++++++----------------- 1 file changed, 27 insertions(+), 28 deletions(-) diff --git a/images/macos/macos-11-Readme.md b/images/macos/macos-11-Readme.md index a667db296ace..eaa55ec872d6 100644 --- a/images/macos/macos-11-Readme.md +++ b/images/macos/macos-11-Readme.md @@ -1,13 +1,12 @@ | Announcements | |-| | [Old versions of Android SDK & tools will be removed from images on January, 8](https://github.com/actions/runner-images/issues/8952) | -| [[all OSs] Nodejs 14.x will be removed from the images on November, 26](https://github.com/actions/runner-images/issues/8779) | | [Major Refactoring of GitHub Actions Runner Images Repository](https://github.com/actions/runner-images/issues/8706) | *** # macOS 11 - OS Version: macOS 11.7.10 (20G1427) - Kernel Version: Darwin 20.6.0 -- Image Version: 20231211.2 +- Image Version: 20231216.1 ## Installed Software @@ -49,8 +48,8 @@ - Pip 20.3.4 (python 2.7) - Pip3 23.3.1 (python 3.12) - Pipx 1.3.3 -- RubyGems 3.4.22 -- Vcpkg 2023 (build from commit f56238700) +- RubyGems 3.4.10 +- Vcpkg 2023 (build from commit 0e47c1985) - Yarn 1.22.19 #### Environment variables @@ -63,7 +62,7 @@ - Apache Ant 1.10.14 - Apache Maven 3.9.6 - Gradle 8.5 -- Sbt 1.9.7 +- Sbt 1.9.8 ### Utilities - 7-Zip 17.05 @@ -74,14 +73,14 @@ - bsdtar 3.3.2 - available by 'tar' alias - Curl 8.5.0 - Git 2.43.0 -- Git LFS 3.4.0 -- GitHub CLI 2.40.0 +- Git LFS 3.4.1 +- GitHub CLI 2.40.1 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.21.4 - gpg (GnuPG) 2.4.3 -- helm v3.13.2+g2a2fb3b +- helm v3.13.3+gc8b9489 - ImageMagick 7.1.1-23 -- jq 1.7 +- jq 1.7.1 - mongo 5.0.21 - mongod 5.0.21 - Newman 6.0.0 @@ -99,15 +98,15 @@ ### Tools - Aliyun CLI 3.0.189 - App Center CLI 2.14.0 -- AWS CLI 2.15.0 -- AWS SAM CLI 1.104.0 +- AWS CLI 2.15.2 +- AWS SAM CLI 1.105.0 - AWS Session Manager CLI 1.2.536.0 - Azure CLI 2.55.0 - Azure CLI (azure-devops) 0.26.0 -- Bicep CLI 0.23.1 +- Bicep CLI 0.24.24 - Cabal 3.6.2.0 - Cmake 3.28.0 -- CodeQL Action Bundle 2.15.3 +- CodeQL Action Bundle 2.15.4 - Fastlane 2.217.0 - GHC 9.8.1 - GHCup 0.1.20.0 @@ -124,11 +123,11 @@ ### Browsers - Safari 16.6.1 (16615.3.12.11.5) - SafariDriver 16.6.1 (16615.3.12.11.5) -- Google Chrome 120.0.6099.62 +- Google Chrome 120.0.6099.109 - Google Chrome for Testing 120.0.6099.71 - ChromeDriver 120.0.6099.71 -- Microsoft Edge 120.0.2210.61 -- Microsoft Edge WebDriver 120.0.2210.61 +- Microsoft Edge 120.0.2210.77 +- Microsoft Edge WebDriver 120.0.2210.77 - Mozilla Firefox 120.0.1 - geckodriver 0.33.0 - Selenium server 4.15.0 @@ -330,18 +329,18 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" | watchOS 8.3 | 13.2.1 | Apple Watch Series 4 - 40mm<br>Apple Watch Series 4 - 44mm<br>Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | ### Android -| Package Name | Version | -| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 8.0 | -| Android Emulator | 33.1.23 | -| Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | -| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34 (rev 2)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | -| Android SDK Platform-Tools | 34.0.5 | -| Android Support Repository | 47.0.0 | -| CMake | 3.10.2<br>3.18.1<br>3.22.1 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 24.0.8215888<br>25.2.9519653 (default)<br>26.1.10909125 | +| Package Name | Version | +| -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 8.0 | +| Android Emulator | 33.1.23 | +| Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | +| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 2)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | +| Android SDK Platform-Tools | 34.0.5 | +| Android Support Repository | 47.0.0 | +| CMake | 3.10.2<br>3.18.1<br>3.22.1 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 24.0.8215888<br>25.2.9519653 (default)<br>26.1.10909125 | #### Environment variables | Name | Value | From 045b46c8c152ea8a867eeae3adedb312dbf83bd0 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 20 Dec 2023 12:13:45 +0000 Subject: [PATCH 2549/3485] Updating readme file for macOS-12 version 20231216.1 (#9042) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-12-Readme.md | 67 ++++++++++++++++----------------- 1 file changed, 33 insertions(+), 34 deletions(-) diff --git a/images/macos/macos-12-Readme.md b/images/macos/macos-12-Readme.md index 5013f443c9b1..c8d07e8ca57f 100644 --- a/images/macos/macos-12-Readme.md +++ b/images/macos/macos-12-Readme.md @@ -1,13 +1,12 @@ | Announcements | |-| | [Old versions of Android SDK & tools will be removed from images on January, 8](https://github.com/actions/runner-images/issues/8952) | -| [[all OSs] Nodejs 14.x will be removed from the images on November, 26](https://github.com/actions/runner-images/issues/8779) | | [Major Refactoring of GitHub Actions Runner Images Repository](https://github.com/actions/runner-images/issues/8706) | *** # macOS 12 -- OS Version: macOS 12.7.1 (21G920) +- OS Version: macOS 12.7.2 (21G1974) - Kernel Version: Darwin 21.6.0 -- Image Version: 20231211.1 +- Image Version: 20231216.1 ## Installed Software @@ -38,7 +37,7 @@ - Ruby 3.0.6p216 ### Package Management -- Bundler 2.4.22 +- Bundler 2.5.1 - Carthage 0.39.1 - CocoaPods 1.14.3 - Composer 2.6.6 @@ -49,8 +48,8 @@ - Pip 20.3.4 (python 2.7) - Pip3 23.3.1 (python 3.12) - Pipx 1.3.3 -- RubyGems 3.4.22 -- Vcpkg 2023 (build from commit 000d1bda1) +- RubyGems 3.5.1 +- Vcpkg 2023 (build from commit 0e47c1985) - Yarn 1.22.19 #### Environment variables @@ -63,7 +62,7 @@ - Apache Ant 1.10.14 - Apache Maven 3.9.6 - Gradle 8.5 -- Sbt 1.9.7 +- Sbt 1.9.8 ### Utilities - 7-Zip 17.05 @@ -74,13 +73,13 @@ - bsdtar 3.5.1 - available by 'tar' alias - Curl 8.5.0 - Git 2.43.0 -- Git LFS 3.4.0 -- GitHub CLI 2.40.0 +- Git LFS 3.4.1 +- GitHub CLI 2.40.1 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.21.4 - gpg (GnuPG) 2.4.3 - ImageMagick 7.1.1-23 -- jq 1.7 +- jq 1.7.1 - mongo 5.0.21 - mongod 5.0.21 - OpenSSL 1.1.1w 11 Sep 2023 @@ -93,20 +92,20 @@ - Switchaudio-osx 1.2.2 - Vagrant 2.4.0 - VirtualBox 6.1.38r153438 -- yq 4.40.4 +- yq 4.40.5 - zstd 1.5.5 ### Tools - App Center CLI 2.14.0 -- AWS CLI 2.15.0 -- AWS SAM CLI 1.104.0 +- AWS CLI 2.15.2 +- AWS SAM CLI 1.105.0 - AWS Session Manager CLI 1.2.536.0 - Azure CLI 2.55.0 - Azure CLI (azure-devops) 0.26.0 -- Bicep CLI 0.23.1 +- Bicep CLI 0.24.24 - Cabal 3.6.2.0 - Cmake 3.28.0 -- CodeQL Action Bundle 2.15.3 +- CodeQL Action Bundle 2.15.4 - Colima 0.6.7 - Fastlane 2.217.0 - GHC 9.8.1 @@ -115,7 +114,7 @@ - Stack 2.13.1 - SwiftFormat 0.52.11 - Swig 4.1.1 -- Xcbeautify 1.1.0 +- Xcbeautify 1.1.1 - Xcode Command Line Tools 14.2.0.0.1.1668646533 - Xcodes 1.4.1 @@ -124,13 +123,13 @@ - Yamllint 1.33.0 ### Browsers -- Safari 17.1 (17616.2.9.11.9) -- SafariDriver 17.1 (17616.2.9.11.9) -- Google Chrome 120.0.6099.62 +- Safari 17.2 (17617.1.17.11.11) +- SafariDriver 17.2 (17617.1.17.11.11) +- Google Chrome 120.0.6099.109 - Google Chrome for Testing 120.0.6099.71 - ChromeDriver 120.0.6099.71 -- Microsoft Edge 120.0.2210.61 -- Microsoft Edge WebDriver 120.0.2210.61 +- Microsoft Edge 120.0.2210.77 +- Microsoft Edge WebDriver 120.0.2210.77 - Mozilla Firefox 120.0.1 - geckodriver 0.33.0 - Selenium server 4.15.0 @@ -333,18 +332,18 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" | watchOS 9.1 | 13.1<br>13.2.1<br>13.3.1<br>13.4.1<br>14.0.1<br>14.1<br>14.2 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | ### Android -| Package Name | Version | -| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 8.0 | -| Android Emulator | 33.1.23 | -| Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | -| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34 (rev 2)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | -| Android SDK Platform-Tools | 34.0.5 | -| Android Support Repository | 47.0.0 | -| CMake | 3.18.1<br>3.22.1 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 24.0.8215888<br>25.2.9519653 (default)<br>26.1.10909125 | +| Package Name | Version | +| -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 8.0 | +| Android Emulator | 33.1.23 | +| Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | +| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 2)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | +| Android SDK Platform-Tools | 34.0.5 | +| Android Support Repository | 47.0.0 | +| CMake | 3.18.1<br>3.22.1 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 24.0.8215888<br>25.2.9519653 (default)<br>26.1.10909125 | #### Environment variables | Name | Value | @@ -365,7 +364,7 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" #### Environment variables | Name | Value | | ----------------- | ----------------------------------------------------------------------------------------- | -| PARALLELS_DMG_URL | https://download.parallels.com/desktop/v19/19.1.1-54734/ParallelsDesktop-19.1.1-54734.dmg | +| PARALLELS_DMG_URL | https://download.parallels.com/desktop/v19/19.2.0-54827/ParallelsDesktop-19.2.0-54827.dmg | ##### Notes ``` From 522c8fb680f54f74cc9722e07abc91ad8cfe5200 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 20 Dec 2023 15:37:11 +0000 Subject: [PATCH 2550/3485] Windows Server 2019 (20231217) Image Update (#9046) * Updating readme file for win19 version 20231217.2.1 * Update Windows2019-Readme.md * Update Windows2019-Readme.md --------- Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/windows/Windows2019-Readme.md | 79 ++++++++++++++-------------- 1 file changed, 39 insertions(+), 40 deletions(-) diff --git a/images/windows/Windows2019-Readme.md b/images/windows/Windows2019-Readme.md index f7c06d6bd0d8..0dadc58a4712 100644 --- a/images/windows/Windows2019-Readme.md +++ b/images/windows/Windows2019-Readme.md @@ -1,12 +1,11 @@ | Announcements | |-| | [Old versions of Android SDK & tools will be removed from images on January, 8](https://github.com/actions/runner-images/issues/8952) | -| [[all OSs] Nodejs 14.x will be removed from the images on November, 26](https://github.com/actions/runner-images/issues/8779) | | [Major Refactoring of GitHub Actions Runner Images Repository](https://github.com/actions/runner-images/issues/8706) | *** # Windows Server 2019 -- OS Version: 10.0.17763 Build 5122 -- Image Version: 20231211.1.0 +- OS Version: 10.0.17763 Build 5206 +- Image Version: 20231217.2.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -28,14 +27,14 @@ ### Package Management - Chocolatey 2.2.2 - Composer 2.6.6 -- Helm 3.13.1 +- Helm 3.13.2 - Miniconda 23.10.0 (pre-installed on the image but not added to PATH) - NPM 9.8.1 - NuGet 6.8.0.131 -- pip 23.3.1 (python 3.7) +- pip 23.3.2 (python 3.7) - Pipx 1.2.1 - RubyGems 2.7.6.3 -- Vcpkg (build from commit 000d1bda1) +- Vcpkg (build from commit 0e47c1985) - Yarn 1.22.21 #### Environment variables @@ -48,7 +47,7 @@ - Ant 1.10.14 - Gradle 8.5 - Maven 3.8.7 -- sbt 1.9.7 +- sbt 1.9.8 ### Tools - 7zip 23.01 @@ -56,10 +55,10 @@ - azcopy 10.21.1 - Bazel 7.0.0 - Bazelisk 1.19.0 -- Bicep 0.23.1 +- Bicep 0.24.24 - Cabal 3.10.2.0 - CMake 3.27.9 -- CodeQL Action Bundle 2.15.3 +- CodeQL Action Bundle 2.15.4 - Docker 24.0.7 - Docker Compose v1 1.29.2 - Docker Compose v2 2.23.3 @@ -67,12 +66,12 @@ - ghc 9.8.1 - Git 2.43.0.windows.1 - Git LFS 3.4.0 -- Google Cloud CLI 456.0.0 +- Google Cloud CLI 457.0.0 - ImageMagick 7.1.1-23 - InnoSetup 6.2.2 - jq 1.7-dirty - Kind 0.20.0 -- Kubectl 1.28.2 +- Kubectl 1.29.0 - Mercurial 5.0 - gcc 8.1.0 - gdb 8.1 @@ -80,9 +79,9 @@ - Newman 6.0.0 - NSIS 3.09 - OpenSSL 1.1.1w -- Packer 1.9.4 +- Packer 1.10.0 - Parcel 2.10.3 -- Pulumi 3.96.2 +- Pulumi 3.97.0 - R 4.3.2 - Service Fabric SDK 9.1.1436.9590 - Stack 2.13.1 @@ -96,13 +95,13 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.189 -- AWS CLI 2.15.0 -- AWS SAM CLI 1.104.0 +- AWS CLI 2.15.2 +- AWS SAM CLI 1.105.0 - AWS Session Manager CLI 1.2.536.0 - Azure CLI 2.55.0 - Azure DevOps CLI extension 0.26.0 - Cloud Foundry CLI 6.53.0 -- GitHub CLI 2.40.0 +- GitHub CLI 2.40.1 ### Rust Tools - Cargo 1.74.1 @@ -119,10 +118,10 @@ - Rustfmt 1.6.0 ### Browsers and Drivers -- Google Chrome 120.0.6099.71 +- Google Chrome 120.0.6099.110 - Chrome Driver 120.0.6099.71 -- Microsoft Edge 120.0.2210.61 -- Microsoft Edge Driver 120.0.2210.61 +- Microsoft Edge 120.0.2210.77 +- Microsoft Edge Driver 120.0.2210.77 - Mozilla Firefox 120.0.1 - Gecko Driver 0.33.0 - IE Driver 4.14.0.0 @@ -514,14 +513,14 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Az (Cached): 1.0.0.zip, 1.6.0.zip, 2.3.2.zip, 2.6.0.zip, 3.1.0.zip, 3.5.0.zip, 3.8.0.zip, 4.3.0.zip, 4.4.0.zip, 4.7.0.zip, 5.5.0.zip, 5.9.0.zip, 6.6.0.zip, 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.472 +- AWSPowershell: 4.1.477 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 -- Microsoft.Graph: 2.11.0 +- Microsoft.Graph: 2.11.1 - Pester: 3.4.0, 5.5.0 - PowerShellGet: 1.0.0.1, 2.2.5 - PSScriptAnalyzer: 1.21.0 -- PSWindowsUpdate: 2.2.1.3 +- PSWindowsUpdate: 2.2.1.4 - SqlServer: 22.1.1 - VSSetup: 2.2.16 ``` @@ -531,19 +530,19 @@ All other versions are saved but not installed. ``` ### Android -| Package Name | Version | -| -------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 8.0 | -| Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3<br>26.0.0 26.0.1 26.0.2 26.0.3<br>25.0.0 25.0.1 25.0.2 25.0.3<br>24.0.0 24.0.1 24.0.2 24.0.3<br>23.0.1 23.0.2 23.0.3<br>22.0.1<br>21.1.2<br>20.0.0<br>19.1.0 | -| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34 (rev 2)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3)<br>android-26 (rev 2)<br>android-25 (rev 3)<br>android-24 (rev 2)<br>android-23 (rev 3)<br>android-22 (rev 2)<br>android-21 (rev 2)<br>android-20 (rev 2)<br>android-19 (rev 4) | -| Android SDK Platform-Tools | 34.0.5 | -| Android SDK Tools | 26.1.1 | -| Android Support Repository | 47.0.0 | -| CMake | 3.10.2<br>3.18.1<br>3.22.1 | -| Google APIs | addon-google_apis-google-21<br>addon-google_apis-google-22<br>addon-google_apis-google-23<br>addon-google_apis-google-24 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 24.0.8215888<br>25.2.9519653<br>26.1.10909125 | +| Package Name | Version | +| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 8.0 | +| Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3<br>26.0.0 26.0.1 26.0.2 26.0.3<br>25.0.0 25.0.1 25.0.2 25.0.3<br>24.0.0 24.0.1 24.0.2 24.0.3<br>23.0.1 23.0.2 23.0.3<br>22.0.1<br>21.1.2<br>20.0.0<br>19.1.0 | +| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 2)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3)<br>android-26 (rev 2)<br>android-25 (rev 3)<br>android-24 (rev 2)<br>android-23 (rev 3)<br>android-22 (rev 2)<br>android-21 (rev 2)<br>android-20 (rev 2)<br>android-19 (rev 4) | +| Android SDK Platform-Tools | 34.0.5 | +| Android SDK Tools | 26.1.1 | +| Android Support Repository | 47.0.0 | +| CMake | 3.10.2<br>3.18.1<br>3.22.1 | +| Google APIs | addon-google_apis-google-21<br>addon-google_apis-google-22<br>addon-google_apis-google-23<br>addon-google_apis-google-24 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 24.0.8215888<br>25.2.9519653<br>26.1.10909125 | #### Environment variables | Name | Value | @@ -558,9 +557,9 @@ All other versions are saved but not installed. ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:551a34fca19fcaf95eda0940b9fdb6bc4e5f6db4e95843de7748ab8a940bb436 | 2023-11-14 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:56853d8287c49f7544a119f5ab03b6348662d80f6bae68eb50b36e009ef4469a | 2023-11-14 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:3ff7fe9ba749cc5a60297511a40b428bb0694561f9de53cfeb06add0951e2766 | 2023-11-14 | -| mcr.microsoft.com/windows/nanoserver:1809 | sha256:9886d51a1214934b69236ad05b480cecea4953ba5e88bc306e967744a413d588 | 2023-11-09 | -| mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:4fe58f25a157ea749c7b770acebfdbd70c3cb2088c446943e90fe89ea059558b | 2023-11-09 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:d6343ce21c9774ea1fb72fc24776a327bad9b34581ae802124f0121f7c5324d2 | 2023-12-12 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:cce35f582d79d6a808a718c429c7866fec85b704fc29a9a6fc0d1f6f8b19bb70 | 2023-12-12 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:89454d3ead4f492dd667b8d02c2a1e16d6103c48aab7ed8466442ff198990747 | 2023-12-12 | +| mcr.microsoft.com/windows/nanoserver:1809 | sha256:18dc202bc15c4ab948a993a021b554e70a5bc8f9f854a0674b3f5467cc7092da | 2023-12-04 | +| mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:56c5fe9f320b41a873f73ce5d019a9650dce2e10cb27b234d425418bef9310dd | 2023-12-04 | From 28be760bba37289f8f7361bbb84c3d0527e804c3 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 20 Dec 2023 15:51:32 +0000 Subject: [PATCH 2551/3485] Updating readme file for ubuntu22 version 20231217.2.1 (#9044) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2204-Readme.md | 97 +++++++++++++++--------------- 1 file changed, 48 insertions(+), 49 deletions(-) diff --git a/images/ubuntu/Ubuntu2204-Readme.md b/images/ubuntu/Ubuntu2204-Readme.md index f4eddb1bd79e..7e2456ece1f5 100644 --- a/images/ubuntu/Ubuntu2204-Readme.md +++ b/images/ubuntu/Ubuntu2204-Readme.md @@ -1,13 +1,12 @@ | Announcements | |-| | [Old versions of Android SDK & tools will be removed from images on January, 8](https://github.com/actions/runner-images/issues/8952) | -| [[all OSs] Nodejs 14.x will be removed from the images on November, 26](https://github.com/actions/runner-images/issues/8779) | | [Major Refactoring of GitHub Actions Runner Images Repository](https://github.com/actions/runner-images/issues/8706) | *** # Ubuntu 22.04 - OS Version: 22.04.3 LTS - Kernel Version: 6.2.0-1018-azure -- Image Version: 20231211.1.0 +- Image Version: 20231217.2.0 - Systemd version: 249.11-0ubuntu3.11 ## Installed Software @@ -28,12 +27,12 @@ - Perl 5.34.0 - Python 3.10.12 - Ruby 3.0.2p107 -- Swift 5.9.1 +- Swift 5.9.2 ### Package Management - cpan 1.64 - Helm 3.13.1 -- Homebrew 4.1.24 +- Homebrew 4.1.25 - Miniconda 23.10.0 - Npm 10.2.3 - NuGet 6.6.1.2 @@ -41,7 +40,7 @@ - Pip3 22.0.2 - Pipx 1.3.3 - RubyGems 3.3.5 -- Vcpkg (build from commit 000d1bda1) +- Vcpkg (build from commit 0e47c1985) - Yarn 1.22.21 #### Environment variables @@ -59,19 +58,19 @@ to accomplish this. ``` ### Project Management -- Lerna 8.0.0 +- Lerna 8.0.1 - Maven 3.8.8 ### Tools -- Ansible 2.16.1 -- apt-fast 1.9.12 +- Ansible 2.16.2 +- apt-fast 1.10.0 - AzCopy 10.21.2 - available by `azcopy` and `azcopy10` aliases -- Bazel 6.4.0 +- Bazel 7.0.0 - Bazelisk 1.19.0 -- Bicep 0.23.1 +- Bicep 0.24.24 - Buildah 1.23.1 -- CMake 3.28.0 -- CodeQL Action Bundle 2.15.3 +- CMake 3.28.1 +- CodeQL Action Bundle 2.15.4 - Docker Amazon ECR Credential Helper 0.7.1 - Docker Compose v1 1.29.2 - Docker Compose v2 2.23.3 @@ -80,13 +79,13 @@ to accomplish this. - Docker Server 24.0.7 - Fastlane 2.217.0 - Git 2.43.0 -- Git LFS 3.4.0 +- Git LFS 3.4.1 - Git-ftp 1.6.0 - Haveged 1.9.14 - Heroku 8.7.1 - jq 1.6 - Kind 0.20.0 -- Kubectl 1.28.4 +- Kubectl 1.29.0 - Kustomize 5.3.0 - Leiningen 2.10.0 - MediaInfo 21.09 @@ -96,32 +95,32 @@ to accomplish this. - Newman 6.0.0 - nvm 0.39.7 - OpenSSL 3.0.2-0ubuntu1.12 -- Packer v1.10.0 +- Packer 1.10.0 - Parcel 2.10.3 - Podman 3.4.4 -- Pulumi 3.96.2 +- Pulumi 3.97.0 - R 4.3.2 - Skopeo 1.4.1 - Sphinx Open Source Search Server 2.2.11 - SVN 1.14.1 -- Terraform 1.6.5 +- Terraform 1.6.6 - yamllint 1.33.0 -- yq 4.40.4 +- yq 4.40.5 - zstd 1.5.5 ### CLI Tools - Alibaba Cloud CLI 3.0.189 -- AWS CLI 2.15.0 +- AWS CLI 2.15.2 - AWS CLI Session Manager Plugin 1.2.536.0 -- AWS SAM CLI 1.104.0 +- AWS SAM CLI 1.105.0 - Azure CLI 2.55.0 - Azure CLI (azure-devops) 0.26.0 -- GitHub CLI 2.40.0 -- Google Cloud CLI 456.0.0 +- GitHub CLI 2.40.1 +- Google Cloud CLI 457.0.0 - Netlify CLI 17.10.1 -- OpenShift CLI 4.14.5 +- OpenShift CLI 4.14.6 - ORAS CLI 1.1.0 -- Vercel CLI 32.6.1 +- Vercel CLI 32.7.2 ### Java | Version | Environment Variable | @@ -160,13 +159,13 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.6.0 ### Browsers and Drivers -- Google Chrome 120.0.6099.71 +- Google Chrome 120.0.6099.109 - ChromeDriver 120.0.6099.71 - Chromium 120.0.6099.0 -- Microsoft Edge 120.0.2210.61 -- Microsoft Edge WebDriver 120.0.2210.61 +- Microsoft Edge 120.0.2210.77 +- Microsoft Edge WebDriver 120.0.2210.77 - Selenium server 4.16.0 -- Mozilla Firefox 120.0.1 +- Mozilla Firefox 121.0 - Geckodriver 0.33.0 #### Environment variables @@ -240,7 +239,7 @@ Use the following command as a part of your job to start the service: 'sudo syst #### PowerShell Modules - Az: 9.3.0 - MarkdownPS: 1.9 -- Microsoft.Graph: 2.11.0 +- Microsoft.Graph: 2.11.1 - Pester: 5.5.0 - PSScriptAnalyzer: 1.21.0 @@ -251,19 +250,19 @@ Use the following command as a part of your job to start the service: 'sudo syst | nginx | 1.18.0 | /etc/nginx/nginx.conf | inactive | 80 | ### Android -| Package Name | Version | -| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 9.0 | -| Android Emulator | 33.1.23 | -| Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | -| Android SDK Platform-Tools | 34.0.5 | -| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34 (rev 2)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | -| Android SDK Tools | 26.1.1 | -| Android Support Repository | 47.0.0 | -| CMake | 3.10.2<br>3.18.1<br>3.22.1 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 24.0.8215888<br>25.2.9519653 (default)<br>26.1.10909125 | +| Package Name | Version | +| -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 9.0 | +| Android Emulator | 33.1.23 | +| Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | +| Android SDK Platform-Tools | 34.0.5 | +| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 2)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | +| Android SDK Tools | 26.1.1 | +| Android Support Repository | 47.0.0 | +| CMake | 3.10.2<br>3.18.1<br>3.22.1 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 24.0.8215888<br>25.2.9519653 (default)<br>26.1.10909125 | #### Environment variables | Name | Value | @@ -289,11 +288,11 @@ Use the following command as a part of your job to start the service: 'sudo syst | node:16 | sha256:f77a1aef2da8d83e45ec990f45df50f1a286c5fe8bbfb8c6e4246c6389705c0b | 2023-09-07 | | node:16-alpine | sha256:a1f9d027912b58a7c75be7716c97cfbc6d3099f3a97ed84aa490be9dee20e787 | 2023-08-10 | | node:18 | sha256:7a4282663db6f22326c03618eef4320fa3cf70c5c3715546f9779858dc0ed3fd | 2023-12-02 | -| node:18-alpine | sha256:4bdb3f3105718f0742bc8d64bb4e36e8f955ebbee295325e40ae80bc8ef78833 | 2023-12-02 | +| node:18-alpine | sha256:b1a0356f7d6b86c958a06949d3db3f7fb27f95f627aa6157cb98bc65c801efa2 | 2023-12-11 | | node:20 | sha256:445acd9b2ef7e9de665424053bf95652e0b8995ef36500557d48faf29300170a | 2023-11-23 | -| node:20-alpine | sha256:32427bc0620132b2d9e79e405a1b27944d992501a20417a7f407427cc4c2b672 | 2023-12-01 | -| ubuntu:20.04 | sha256:f5c3e53367f142fab0b49908550bdcdc4fb619d2f61ec1dfa60d26e0d59ac9e7 | 2023-11-28 | -| ubuntu:22.04 | sha256:8eab65df33a6de2844c9aefd19efe8ddb87b7df5e9185a4ab73af936225685bb | 2023-12-01 | +| node:20-alpine | sha256:9e38d3d4117da74a643f67041c83914480b335c3bd44d37ccf5b5ad86cd715d1 | 2023-12-11 | +| ubuntu:20.04 | sha256:f2034e7195f61334e6caff6ecf2e965f92d11e888309065da85ff50c617732b8 | 2023-12-13 | +| ubuntu:22.04 | sha256:6042500cf4b44023ea1894effe7890666b0c5c7871ed83a97c36c76ae560bb9b | 2023-12-12 | ### Installed apt packages | Name | Version | @@ -302,7 +301,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | aria2 | 1.36.0-1 | | autoconf | 2.71-2 | | automake | 1:1.16.5-1.3 | -| binutils | 2.38-4ubuntu2.3 | +| binutils | 2.38-4ubuntu2.4 | | bison | 2:3.8.2+dfsg-1build1 | | brotli | 1.0.9-2build6 | | bzip2 | 1.0.8-5build1 | @@ -316,7 +315,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | file | 1:5.41-3ubuntu0.1 | | findutils | 4.8.0-1ubuntu3 | | flex | 2.6.4-8build2 | -| fonts-noto-color-emoji | 2.038-0ubuntu1 | +| fonts-noto-color-emoji | 2.042-0ubuntu0.22.04.1 | | ftp | 20210827-4build1 | | g++ | 4:11.2.0-1ubuntu1 | | gcc | 4:11.2.0-1ubuntu1 | @@ -384,7 +383,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | upx | 3.96-3 | | wget | 1.21.2-2ubuntu1 | | xorriso | 1.5.4-2 | -| xvfb | 2:21.1.4-2ubuntu1.7\~22.04.2 | +| xvfb | 2:21.1.4-2ubuntu1.7\~22.04.5 | | xz-utils | 5.2.5-2ubuntu1 | | zip | 3.0-12build2 | | zsync | 0.6.2-3ubuntu1 | From 6b0f6eb18499ef56f864520dca2280748198ea17 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 20 Dec 2023 15:58:31 +0000 Subject: [PATCH 2552/3485] Updating readme file for ubuntu20 version 20231217.2.0 (#9045) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2004-Readme.md | 93 +++++++++++++++--------------- 1 file changed, 46 insertions(+), 47 deletions(-) diff --git a/images/ubuntu/Ubuntu2004-Readme.md b/images/ubuntu/Ubuntu2004-Readme.md index 32fd384d47ff..5c41c4db0479 100644 --- a/images/ubuntu/Ubuntu2004-Readme.md +++ b/images/ubuntu/Ubuntu2004-Readme.md @@ -1,13 +1,12 @@ | Announcements | |-| | [Old versions of Android SDK & tools will be removed from images on January, 8](https://github.com/actions/runner-images/issues/8952) | -| [[all OSs] Nodejs 14.x will be removed from the images on November, 26](https://github.com/actions/runner-images/issues/8779) | | [Major Refactoring of GitHub Actions Runner Images Repository](https://github.com/actions/runner-images/issues/8706) | *** # Ubuntu 20.04 - OS Version: 20.04.6 LTS - Kernel Version: 5.15.0-1053-azure -- Image Version: 20231211.1.0 +- Image Version: 20231217.2.0 - Systemd version: 245.4-4ubuntu3.22 ## Installed Software @@ -30,12 +29,12 @@ - Perl 5.30.0 - Python 3.8.10 - Ruby 2.7.0p0 -- Swift 5.9.1 +- Swift 5.9.2 ### Package Management - cpan 1.64 - Helm 3.13.1 -- Homebrew 4.1.24 +- Homebrew 4.1.25 - Miniconda 23.10.0 - Npm 10.2.3 - NuGet 6.6.1.2 @@ -43,7 +42,7 @@ - Pip3 20.0.2 - Pipx 1.3.3 - RubyGems 3.1.2 -- Vcpkg (build from commit 000d1bda1) +- Vcpkg (build from commit 0e47c1985) - Yarn 1.22.21 #### Environment variables @@ -63,20 +62,20 @@ to accomplish this. ### Project Management - Ant 1.10.7 - Gradle 8.5 -- Lerna 8.0.0 +- Lerna 8.0.1 - Maven 3.8.8 -- Sbt 1.9.7 +- Sbt 1.9.8 ### Tools - Ansible 2.13.13 -- apt-fast 1.9.12 +- apt-fast 1.10.0 - AzCopy 10.21.2 - available by `azcopy` and `azcopy10` aliases -- Bazel 6.4.0 +- Bazel 7.0.0 - Bazelisk 1.19.0 -- Bicep 0.23.1 +- Bicep 0.24.24 - Buildah 1.22.3 -- CMake 3.28.0 -- CodeQL Action Bundle 2.15.3 +- CMake 3.28.1 +- CodeQL Action Bundle 2.15.4 - Docker Amazon ECR Credential Helper 0.7.1 - Docker Compose v1 1.29.2 - Docker Compose v2 2.23.3 @@ -85,14 +84,14 @@ to accomplish this. - Docker Server 24.0.7 - Fastlane 2.217.0 - Git 2.43.0 -- Git LFS 3.4.0 +- Git LFS 3.4.1 - Git-ftp 1.6.0 - Haveged 1.9.1 - Heroku 8.7.1 - HHVM (HipHop VM) 4.172.1 - jq 1.6 - Kind 0.20.0 -- Kubectl 1.28.4 +- Kubectl 1.29.0 - Kustomize 5.3.0 - Leiningen 2.10.0 - MediaInfo 19.09 @@ -102,33 +101,33 @@ to accomplish this. - Newman 6.0.0 - nvm 0.39.7 - OpenSSL 1.1.1f-1ubuntu2.20 -- Packer v1.10.0 +- Packer 1.10.0 - Parcel 2.10.3 - PhantomJS 2.1.1 2.1.1 - Podman 3.4.2 -- Pulumi 3.96.2 +- Pulumi 3.97.0 - R 4.3.2 - Skopeo 1.5.0 - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 -- Terraform 1.6.5 +- Terraform 1.6.6 - yamllint 1.33.0 -- yq 4.40.4 +- yq 4.40.5 - zstd 1.5.5 ### CLI Tools - Alibaba Cloud CLI 3.0.174 -- AWS CLI 2.15.0 +- AWS CLI 2.15.2 - AWS CLI Session Manager Plugin 1.2.536.0 -- AWS SAM CLI 1.104.0 +- AWS SAM CLI 1.105.0 - Azure CLI 2.55.0 - Azure CLI (azure-devops) 0.26.0 -- GitHub CLI 2.40.0 -- Google Cloud CLI 456.0.0 +- GitHub CLI 2.40.1 +- Google Cloud CLI 457.0.0 - Netlify CLI 17.10.1 -- OpenShift CLI 4.14.5 +- OpenShift CLI 4.14.6 - ORAS CLI 1.1.0 -- Vercel CLI 32.6.1 +- Vercel CLI 32.7.2 ### Java | Version | Environment Variable | @@ -167,13 +166,13 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.6.0 ### Browsers and Drivers -- Google Chrome 120.0.6099.71 +- Google Chrome 120.0.6099.109 - ChromeDriver 120.0.6099.71 - Chromium 120.0.6099.0 -- Microsoft Edge 120.0.2210.61 -- Microsoft Edge WebDriver 120.0.2210.61 +- Microsoft Edge 120.0.2210.77 +- Microsoft Edge WebDriver 120.0.2210.77 - Selenium server 4.16.0 -- Mozilla Firefox 120.0.1 +- Mozilla Firefox 121.0 - Geckodriver 0.33.0 #### Environment variables @@ -255,7 +254,7 @@ Use the following command as a part of your job to start the service: 'sudo syst - Az: 9.3.0 - Az (Cached): 3.1.0.zip, 4.4.0.zip, 5.9.0.zip, 6.6.0.zip, 7.5.0.zip - MarkdownPS: 1.9 -- Microsoft.Graph: 2.11.0 +- Microsoft.Graph: 2.11.1 - Pester: 5.5.0 - PSScriptAnalyzer: 1.21.0 @@ -267,19 +266,19 @@ Use the following command as a part of your job to start the service: 'sudo syst | nginx | 1.18.0 | /etc/nginx/nginx.conf | inactive | 80 | ### Android -| Package Name | Version | -| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 9.0 | -| Android Emulator | 33.1.23 | -| Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | -| Android SDK Platform-Tools | 34.0.5 | -| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34 (rev 2)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | -| Android SDK Tools | 26.1.1 | -| Android Support Repository | 47.0.0 | -| CMake | 3.10.2<br>3.18.1<br>3.22.1 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 24.0.8215888<br>25.2.9519653 (default)<br>26.1.10909125 | +| Package Name | Version | +| -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 9.0 | +| Android Emulator | 33.1.23 | +| Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | +| Android SDK Platform-Tools | 34.0.5 | +| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 2)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | +| Android SDK Tools | 26.1.1 | +| Android Support Repository | 47.0.0 | +| CMake | 3.10.2<br>3.18.1<br>3.22.1 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 24.0.8215888<br>25.2.9519653 (default)<br>26.1.10909125 | #### Environment variables | Name | Value | @@ -307,10 +306,10 @@ Use the following command as a part of your job to start the service: 'sudo syst | node:16 | sha256:f77a1aef2da8d83e45ec990f45df50f1a286c5fe8bbfb8c6e4246c6389705c0b | 2023-09-07 | | node:16-alpine | sha256:a1f9d027912b58a7c75be7716c97cfbc6d3099f3a97ed84aa490be9dee20e787 | 2023-08-10 | | node:18 | sha256:7a4282663db6f22326c03618eef4320fa3cf70c5c3715546f9779858dc0ed3fd | 2023-12-02 | -| node:18-alpine | sha256:4bdb3f3105718f0742bc8d64bb4e36e8f955ebbee295325e40ae80bc8ef78833 | 2023-12-02 | +| node:18-alpine | sha256:b1a0356f7d6b86c958a06949d3db3f7fb27f95f627aa6157cb98bc65c801efa2 | 2023-12-11 | | node:20 | sha256:445acd9b2ef7e9de665424053bf95652e0b8995ef36500557d48faf29300170a | 2023-11-23 | -| node:20-alpine | sha256:32427bc0620132b2d9e79e405a1b27944d992501a20417a7f407427cc4c2b672 | 2023-12-01 | -| ubuntu:20.04 | sha256:f5c3e53367f142fab0b49908550bdcdc4fb619d2f61ec1dfa60d26e0d59ac9e7 | 2023-11-28 | +| node:20-alpine | sha256:9e38d3d4117da74a643f67041c83914480b335c3bd44d37ccf5b5ad86cd715d1 | 2023-12-11 | +| ubuntu:20.04 | sha256:f2034e7195f61334e6caff6ecf2e965f92d11e888309065da85ff50c617732b8 | 2023-12-13 | ### Installed apt packages | Name | Version | @@ -319,7 +318,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | aria2 | 1.35.0-1build1 | | autoconf | 2.69-11.1 | | automake | 1:1.16.1-4ubuntu6 | -| binutils | 2.34-6ubuntu1.6 | +| binutils | 2.34-6ubuntu1.7 | | bison | 2:3.5.1+dfsg-1 | | brotli | 1.0.7-6ubuntu0.1 | | bzip2 | 1.0.8-2 | @@ -399,7 +398,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | upx | 3.95-2build1 | | wget | 1.20.3-1ubuntu2 | | xorriso | 1.5.2-1 | -| xvfb | 2:1.20.13-1ubuntu1\~20.04.9 | +| xvfb | 2:1.20.13-1ubuntu1\~20.04.12 | | xz-utils | 5.2.4-1ubuntu1.1 | | zip | 3.0-11build1 | | zsync | 0.6.2-3ubuntu1 | From 087fb382a85c473f274bd827e1bb49076e6de79d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 20 Dec 2023 16:00:30 +0000 Subject: [PATCH 2553/3485] Windows Server 2022 (20231217) Image Update (#9043) * Updating readme file for win22 version 20231217.2.1 * Update Windows2022-Readme.md * Update Windows2022-Readme.md --------- Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Co-authored-by: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/windows/Windows2022-Readme.md | 77 ++++++++++++++-------------- 1 file changed, 38 insertions(+), 39 deletions(-) diff --git a/images/windows/Windows2022-Readme.md b/images/windows/Windows2022-Readme.md index 812c33d0019d..c3db18b2d2bd 100644 --- a/images/windows/Windows2022-Readme.md +++ b/images/windows/Windows2022-Readme.md @@ -1,12 +1,11 @@ | Announcements | |-| | [Old versions of Android SDK & tools will be removed from images on January, 8](https://github.com/actions/runner-images/issues/8952) | -| [[all OSs] Nodejs 14.x will be removed from the images on November, 26](https://github.com/actions/runner-images/issues/8779) | | [Major Refactoring of GitHub Actions Runner Images Repository](https://github.com/actions/runner-images/issues/8706) | *** # Windows Server 2022 -- OS Version: 10.0.20348 Build 2113 -- Image Version: 20231211.1.0 +- OS Version: 10.0.20348 Build 2159 +- Image Version: 20231217.2.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -28,14 +27,14 @@ ### Package Management - Chocolatey 2.2.2 - Composer 2.6.6 -- Helm 3.13.1 +- Helm 3.13.2 - Miniconda 23.10.0 (pre-installed on the image but not added to PATH) - NPM 9.8.1 - NuGet 6.8.0.131 -- pip 23.3.1 (python 3.9) +- pip 23.3.2 (python 3.9) - Pipx 1.3.3 - RubyGems 3.2.33 -- Vcpkg (build from commit 000d1bda1) +- Vcpkg (build from commit 0e47c1985) - Yarn 1.22.21 #### Environment variables @@ -48,7 +47,7 @@ - Ant 1.10.14 - Gradle 8.5 - Maven 3.8.7 -- sbt 1.9.7 +- sbt 1.9.8 ### Tools - 7zip 23.01 @@ -56,10 +55,10 @@ - azcopy 10.21.1 - Bazel 7.0.0 - Bazelisk 1.19.0 -- Bicep 0.23.1 +- Bicep 0.24.24 - Cabal 3.10.2.0 - CMake 3.27.9 -- CodeQL Action Bundle 2.15.3 +- CodeQL Action Bundle 2.15.4 - Docker 24.0.7 - Docker Compose v1 1.29.2 - Docker Compose v2 2.23.3 @@ -67,11 +66,11 @@ - ghc 9.8.1 - Git 2.43.0.windows.1 - Git LFS 3.4.0 -- ImageMagick 7.1.1-22 +- ImageMagick 7.1.1-23 - InnoSetup 6.2.2 - jq 1.7-dirty - Kind 0.20.0 -- Kubectl 1.28.2 +- Kubectl 1.29.0 - Mercurial 5.0 - gcc 12.2.0 - gdb 11.2 @@ -79,8 +78,8 @@ - Newman 6.0.0 - NSIS 3.09 - OpenSSL 1.1.1w -- Packer 1.9.4 -- Pulumi 3.96.2 +- Packer 1.10.0 +- Pulumi 3.97.0 - R 4.3.2 - Service Fabric SDK 9.1.1436.9590 - Stack 2.13.1 @@ -94,12 +93,12 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.189 -- AWS CLI 2.15.0 -- AWS SAM CLI 1.104.0 +- AWS CLI 2.15.2 +- AWS SAM CLI 1.105.0 - AWS Session Manager CLI 1.2.536.0 - Azure CLI 2.55.0 - Azure DevOps CLI extension 0.26.0 -- GitHub CLI 2.40.0 +- GitHub CLI 2.40.1 ### Rust Tools - Cargo 1.74.1 @@ -116,10 +115,10 @@ - Rustfmt 1.6.0 ### Browsers and Drivers -- Google Chrome 120.0.6099.71 +- Google Chrome 120.0.6099.110 - Chrome Driver 120.0.6099.71 -- Microsoft Edge 120.0.2210.61 -- Microsoft Edge Driver 120.0.2210.61 +- Microsoft Edge 120.0.2210.77 +- Microsoft Edge Driver 120.0.2210.77 - Mozilla Firefox 120.0.1 - Gecko Driver 0.33.0 - IE Driver 4.14.0.0 @@ -568,14 +567,14 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Az (Cached): 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.472 +- AWSPowershell: 4.1.477 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 -- Microsoft.Graph: 2.11.0 +- Microsoft.Graph: 2.11.1 - Pester: 3.4.0, 5.5.0 - PowerShellGet: 1.0.0.1, 2.2.5 - PSScriptAnalyzer: 1.21.0 -- PSWindowsUpdate: 2.2.1.3 +- PSWindowsUpdate: 2.2.1.4 - SqlServer: 22.1.1 - VSSetup: 2.2.16 ``` @@ -585,18 +584,18 @@ All other versions are saved but not installed. ``` ### Android -| Package Name | Version | -| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 8.0 | -| Android Emulator | 31.2.9 | -| Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | -| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34 (rev 2)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | -| Android SDK Platform-Tools | 34.0.5 | -| Android Support Repository | 47.0.0 | -| CMake | 3.18.1<br>3.22.1 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 24.0.8215888<br>25.2.9519653<br>26.1.10909125 | +| Package Name | Version | +| -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 8.0 | +| Android Emulator | 31.2.9 | +| Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | +| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 2)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | +| Android SDK Platform-Tools | 34.0.5 | +| Android Support Repository | 47.0.0 | +| CMake | 3.18.1<br>3.22.1 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 24.0.8215888<br>25.2.9519653<br>26.1.10909125 | #### Environment variables | Name | Value | @@ -611,9 +610,9 @@ All other versions are saved but not installed. ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2022 | sha256:c06059416579f6019d3767bc8adc15b8f196f528bddaeb79272120243d874f17 | 2023-11-14 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2022 | sha256:affaf23c364af4050c11c229b946f6f033c26551a67b5d3a16134a396f75b8e5 | 2023-11-14 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:40e1acbcf70a5d9c5fd5fad045eca44da5c2ce090a1d4bae3f9aba3a089f0452 | 2023-11-14 | -| mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:585a8381ae8ba03cd58c18917d17a6b3a0bdc1f80f294e33cee2eaab06be96ce | 2023-11-09 | -| mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:308ef3f8ee3e9c9a1bdec460009c1e6394b329db13eb3149461f8841be5b538a | 2023-11-09 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2022 | sha256:87dbfdaafd5083bc36103fd4e011c2d186b84054058d3d947c80dc2aeaee606d | 2023-12-12 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2022 | sha256:26778846add42604670e37c700dc86cdbb419ce3530650e40e4162dcbbd697eb | 2023-12-12 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:a903702e9b545059a47d87d1f14cd8c75bf47e22e4889fc9a9b0a04b2acfb7fd | 2023-12-12 | +| mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:56a7c823d8aed810849a38f47d995a727bf3de1ec611394025e1de24898a9622 | 2023-12-02 | +| mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:029d8eb737c978e3df0f26abb529efd38d3c9ecee9d8d0bba6d0c205f32dc263 | 2023-12-02 | From dec20a5272b8878f400fa2dc6588de003391d5a8 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 20 Dec 2023 21:32:31 +0000 Subject: [PATCH 2554/3485] Updating readme file for macos-13 version 20231218.2 (#9049) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-13-Readme.md | 203 +++++++++++++++++--------------- 1 file changed, 107 insertions(+), 96 deletions(-) diff --git a/images/macos/macos-13-Readme.md b/images/macos/macos-13-Readme.md index 0ad49ccd6877..01ad4688f1bb 100644 --- a/images/macos/macos-13-Readme.md +++ b/images/macos/macos-13-Readme.md @@ -1,12 +1,17 @@ +| Announcements | +|-| +| [Old versions of Android SDK & tools will be removed from images on January, 8](https://github.com/actions/runner-images/issues/8952) | +| [Major Refactoring of GitHub Actions Runner Images Repository](https://github.com/actions/runner-images/issues/8706) | +*** # macOS 13 -- OS Version: macOS 13.6 (22G120) +- OS Version: macOS 13.6.3 (22G436) - Kernel Version: Darwin 22.6.0 -- Image Version: 20231025.2 +- Image Version: 20231218.2 ## Installed Software ### Language and Runtime -- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.403 +- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.404, 8.0.100 - Bash 3.2.57(1)-release - Clang/LLVM 14.0.3 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` @@ -16,87 +21,85 @@ - GNU Fortran 11 (Homebrew GCC 11.4.0) - available by `gfortran-11` alias - GNU Fortran 12 (Homebrew GCC 12.3.0) - available by `gfortran-12` alias - GNU Fortran 13 (Homebrew GCC 13.2.0) - available by `gfortran-13` alias -- Julia 1.9.3 -- Kotlin 1.9.10-release-459 +- Julia 1.9.4 +- Kotlin 1.9.21-release-633 - Mono 6.12.0.188 -- Node.js 18.18.2 -- Perl 5.38.0 -- PHP 8.2.11 -- Python3 3.12.0 -- R 4.3.1 +- Node.js 18.19.0 +- Perl 5.38.2 +- PHP 8.3.0 +- Python3 3.12.1 +- R 4.3.2 - Ruby 3.0.6p216 ### Package Management -- Bundler 2.4.21 +- Bundler 2.5.1 - Carthage 0.39.1 -- CocoaPods 1.13.0 -- Composer 2.6.5 -- Homebrew 4.1.17 -- NPM 9.8.1 +- CocoaPods 1.14.3 +- Composer 2.6.6 +- Homebrew 4.1.25 +- NPM 10.2.3 - NuGet 6.3.1.1 -- Pip3 23.3.1 (python 3.12) -- Pipx 1.2.1 -- RubyGems 3.4.21 -- Vcpkg 2023 (build from commit 213c01f87) +- Pip3 23.3.2 (python 3.12) +- Pipx 1.3.3 +- RubyGems 3.5.1 +- Vcpkg 2023 (build from commit 0e47c1985) - Yarn 1.22.19 ### Project Management - Apache Ant 1.10.14 -- Apache Maven 3.9.5 -- Gradle 8.4 +- Apache Maven 3.9.6 +- Gradle 8.5 ### Utilities - 7-Zip 17.05 -- aria2 1.36.0 -- azcopy 10.21.1 -- bazel 6.4.0 -- bazelisk 1.18.0 +- aria2 1.37.0 +- azcopy 10.21.2 +- bazel 7.0.0 +- bazelisk 1.19.0 - bsdtar 3.5.3 - available by 'tar' alias -- Curl 8.4.0 -- Git 2.42.0 -- Git LFS 3.4.0 -- GitHub CLI 2.37.0 +- Curl 8.5.0 +- Git 2.43.0 +- Git LFS 3.4.1 +- GitHub CLI 2.40.1 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.21.4 - gpg (GnuPG) 2.4.3 -- jq 1.7 +- jq 1.7.1 - OpenSSL 1.1.1w 11 Sep 2023 - Packer 1.9.4 - pkg-config 0.29.2 -- yq 4.35.2 +- yq 4.40.5 - zstd 1.5.5 ### Tools -- AWS CLI 2.13.29 -- AWS SAM CLI 1.99.0 -- AWS Session Manager CLI 1.2.497.0 -- Azure CLI 2.53.1 +- AWS CLI 2.15.2 +- AWS SAM CLI 1.105.0 +- AWS Session Manager CLI 1.2.536.0 +- Azure CLI 2.55.0 - Azure CLI (azure-devops) 0.26.0 -- Bicep CLI 0.22.6 -- Cabal 3.6.2.0 -- Cmake 3.27.7 -- CodeQL Action Bundle 2.15.1 -- Fastlane 2.216.0 -- GHC 9.8.1 -- GHCup 0.1.19.4 -- Stack 2.13.1 -- SwiftFormat 0.52.8 -- Xcode Command Line Tools 15.0.0.0.1.1694021235 +- Bicep CLI 0.24.24 +- Cmake 3.28.1 +- CodeQL Action Bundle 2.15.4 +- Fastlane 2.217.0 +- SwiftFormat 0.52.11 +- Xcbeautify 1.1.1 +- Xcode Command Line Tools 15.1.0.0.1.1700200546 +- Xcodes 1.4.1 ### Linters - SwiftLint 0.53.0 ### Browsers -- Safari 17.0 (18616.1.27.111.22) -- SafariDriver 17.0 (18616.1.27.111.22) -- Google Chrome 118.0.5993.117 -- Google Chrome for Testing 118.0.5993.70 -- ChromeDriver 118.0.5993.70 -- Microsoft Edge 118.0.2088.69 -- Microsoft Edge WebDriver 118.0.2088.69 -- Mozilla Firefox 119.0 +- Safari 17.2 (18617.1.17.11.11) +- SafariDriver 17.2 (18617.1.17.11.11) +- Google Chrome 120.0.6099.109 +- Google Chrome for Testing 120.0.6099.71 +- ChromeDriver 120.0.6099.71 +- Microsoft Edge 120.0.2210.77 +- Microsoft Edge WebDriver 120.0.2210.77 +- Mozilla Firefox 120.0.1 - geckodriver 0.33.0 -- Selenium server 4.14.1 +- Selenium server 4.15.0 #### Environment variables | Name | Value | @@ -111,7 +114,7 @@ | 8.0.392+8 | JAVA_HOME_8_X64 | | 11.0.21+9 | JAVA_HOME_11_X64 | | 17.0.9+9 (default) | JAVA_HOME_17_X64 | -| 21.0.1+12.0.LTS | JAVA_HOME_21_X64 | +| 21.0.1+12.0 | JAVA_HOME_21_X64 | ### Cached Tools @@ -130,44 +133,41 @@ - 3.8.18 - 3.9.18 - 3.10.13 -- 3.11.6 -- 3.12.0 +- 3.11.7 +- 3.12.1 #### Node.js - 16.20.2 -- 18.18.2 -- 20.9.0 +- 18.19.0 +- 20.10.0 #### Go - 1.19.13 -- 1.20.10 -- 1.21.3 +- 1.20.12 +- 1.21.5 ### Rust Tools -- Cargo 1.73.0 -- Rust 1.73.0 -- Rustdoc 1.73.0 +- Cargo 1.74.1 +- Rust 1.74.1 +- Rustdoc 1.74.1 - Rustup 1.26.0 #### Packages -- Bindgen 0.68.1 -- Cargo-audit 0.18.3 -- Cargo-outdated 0.13.1 -- Cbindgen 0.26.0 -- Clippy 0.1.73 +- Clippy 0.1.74 - Rustfmt 1.6.0-stable ### PowerShell Tools -- PowerShell 7.2.15 +- PowerShell 7.2.17 #### PowerShell Modules -- Az: 10.4.1 +- Az: 11.1.0 - Pester: 5.5.0 - PSScriptAnalyzer: 1.21.0 ### Xcode | Version | Build | Path | | ---------------- | ------- | ------------------------------ | +| 15.1 | 15C65 | /Applications/Xcode_15.1.app | | 15.0.1 | 15A507 | /Applications/Xcode_15.0.1.app | | 14.3.1 (default) | 14E300c | /Applications/Xcode_14.3.1.app | | 14.2 | 14C18 | /Applications/Xcode_14.2.app | @@ -183,26 +183,33 @@ | macOS 13.1 | macosx13.1 | 14.2 | | macOS 13.3 | macosx13.3 | 14.3.1 | | macOS 14.0 | macosx14.0 | 15.0.1 | +| macOS 14.2 | macosx14.2 | 15.1 | | iOS 16.1 | iphoneos16.1 | 14.1 | | iOS 16.2 | iphoneos16.2 | 14.2 | | iOS 16.4 | iphoneos16.4 | 14.3.1 | | iOS 17.0 | iphoneos17.0 | 15.0.1 | +| iOS 17.2 | iphoneos17.2 | 15.1 | | Simulator - iOS 16.1 | iphonesimulator16.1 | 14.1 | | Simulator - iOS 16.2 | iphonesimulator16.2 | 14.2 | | Simulator - iOS 16.4 | iphonesimulator16.4 | 14.3.1 | | Simulator - iOS 17.0 | iphonesimulator17.0 | 15.0.1 | +| Simulator - iOS 17.2 | iphonesimulator17.2 | 15.1 | | tvOS 16.1 | appletvos16.1 | 14.1, 14.2 | | tvOS 16.4 | appletvos16.4 | 14.3.1 | | tvOS 17.0 | appletvos17.0 | 15.0.1 | +| tvOS 17.2 | appletvos17.2 | 15.1 | | Simulator - tvOS 16.1 | appletvsimulator16.1 | 14.1, 14.2 | | Simulator - tvOS 16.4 | appletvsimulator16.4 | 14.3.1 | | Simulator - tvOS 17.0 | appletvsimulator17.0 | 15.0.1 | +| Simulator - tvOS 17.2 | appletvsimulator17.2 | 15.1 | | watchOS 9.1 | watchos9.1 | 14.1, 14.2 | | watchOS 9.4 | watchos9.4 | 14.3.1 | | watchOS 10.0 | watchos10.0 | 15.0.1 | +| watchOS 10.2 | watchos10.2 | 15.1 | | Simulator - watchOS 9.1 | watchsimulator9.1 | 14.1, 14.2 | | Simulator - watchOS 9.4 | watchsimulator9.4 | 14.3.1 | | Simulator - watchOS 10.0 | watchsimulator10.0 | 15.0.1 | +| Simulator - watchOS 10.2 | watchsimulator10.2 | 15.1 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | @@ -210,35 +217,38 @@ | DriverKit 22.2 | driverkit22.2 | 14.2 | | DriverKit 22.4 | driverkit22.4 | 14.3.1 | | DriverKit 23.0 | driverkit23.0 | 15.0.1 | +| DriverKit 23.2 | driverkit23.2 | 15.1 | #### Installed Simulators -| OS | Xcode Version | Simulators | -| ------------ | -------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| iOS 16.1 | 14.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 16.2 | 14.2 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 16.4 | 14.3.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 17.0 | 14.1<br>14.2<br>14.3.1<br>15.0.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| tvOS 16.1 | 14.1<br>14.2<br>14.3.1<br>15.0.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 16.4 | 14.1<br>14.2<br>14.3.1<br>15.0.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 17.0 | 14.1<br>14.2<br>14.3.1<br>15.0.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| watchOS 9.1 | 14.1<br>14.2<br>14.3.1<br>15.0.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | -| watchOS 9.4 | 14.1<br>14.2<br>14.3.1<br>15.0.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | -| watchOS 10.0 | 14.1<br>14.2<br>14.3.1<br>15.0.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | +| OS | Xcode Version | Simulators | +| ------------ | ---------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| iOS 16.1 | 14.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 16.2 | 14.2 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 16.4 | 14.3.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 17.0 | 14.1<br>14.2<br>14.3.1<br>15.0.1<br>15.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 17.2 | 14.1<br>14.2<br>14.3.1<br>15.0.1<br>15.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| tvOS 16.1 | 14.1<br>14.2<br>14.3.1<br>15.0.1<br>15.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 16.4 | 14.1<br>14.2<br>14.3.1<br>15.0.1<br>15.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 17.0 | 14.1<br>14.2<br>14.3.1<br>15.0.1<br>15.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 17.2 | 14.1<br>14.2<br>14.3.1<br>15.0.1<br>15.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| watchOS 9.1 | 14.1<br>14.2<br>14.3.1<br>15.0.1<br>15.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | +| watchOS 9.4 | 14.1<br>14.2<br>14.3.1<br>15.0.1<br>15.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | +| watchOS 10.0 | 14.1<br>14.2<br>14.3.1<br>15.0.1<br>15.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 10.2 | 14.1<br>14.2<br>14.3.1<br>15.0.1<br>15.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | ### Android -| Package Name | Version | -| -------------------------- | ------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 11.0 | -| Android Emulator | 32.1.15 | -| Android SDK Build-tools | 34.0.0<br>33.0.2 | -| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34 (rev 2)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | -| Android SDK Platform-Tools | 34.0.5 | -| Android Support Repository | 47.0.0 | -| CMake | 3.22.1 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 24.0.8215888<br>25.2.9519653<br>26.1.10909125 (default) | -| SDK Patch Applier v4 | 1 | +| Package Name | Version | +| -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 11.0 | +| Android Emulator | 33.1.23 | +| Android SDK Build-tools | 34.0.0<br>33.0.2 | +| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 2)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | +| Android SDK Platform-Tools | 34.0.5 | +| Android Support Repository | 47.0.0 | +| CMake | 3.22.1 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 24.0.8215888<br>25.2.9519653<br>26.1.10909125 (default) | #### Environment variables | Name | Value | @@ -249,3 +259,4 @@ | ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/26.1.10909125 | | ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk/26.1.10909125 | | ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | + From 43e3d8bfc620a548a1cf5ada3ba2155cd9c15bf5 Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Wed, 20 Dec 2023 22:51:25 +0100 Subject: [PATCH 2555/3485] Revert "[Ubuntu] Force ruby gem to check gems (#9022)" (#9054) This reverts commit 1f11cd7e1780a772c2ad38486a84f5378eb8b701. --- images/ubuntu/scripts/build/install-ruby.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/ubuntu/scripts/build/install-ruby.sh b/images/ubuntu/scripts/build/install-ruby.sh index 0fdc9af97840..5241a73c4cde 100644 --- a/images/ubuntu/scripts/build/install-ruby.sh +++ b/images/ubuntu/scripts/build/install-ruby.sh @@ -14,7 +14,7 @@ gemsToInstall=$(get_toolset_value ".rubygems[] .name") if [ -n "$gemsToInstall" ]; then for gem in $gemsToInstall; do echo "Installing gem $gem" - gem install $gem -P MediumSecurity + gem install $gem done fi From ed3d2204dbd27600ec8cf5c30d08f4ee34fa8c53 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Thu, 21 Dec 2023 14:48:28 +0100 Subject: [PATCH 2556/3485] [macOS] refactor utils.sh and related scripts (#8998) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Update Software Report to support azcopy output * Update util.sh and related scripts * Remove rosetta test from the script * Update mono script * clean up * remove condition from install pipx script * Update scripts according to comments --------- Co-authored-by: Alexey Ayupov <“alexey.ayupov@akvelon.com”> --- .../scripts/build/configure-autologin.sh | 2 - .../macos/scripts/build/configure-machine.sh | 3 - .../build/configure-max-files-limitation.sh | 1 - .../configure-network-interface-detection.sh | 1 - .../macos/scripts/build/configure-windows.sh | 5 +- images/macos/scripts/build/configure-xcode.sh | 1 + .../scripts/build/install-actions-cache.sh | 2 +- images/macos/scripts/build/install-chrome.sh | 46 +++++------ .../scripts/build/install-common-utils.sh | 6 +- images/macos/scripts/build/install-dotnet.sh | 18 ++--- images/macos/scripts/build/install-edge.sh | 18 ++--- images/macos/scripts/build/install-golang.sh | 6 +- images/macos/scripts/build/install-mono.sh | 54 ++++++------- images/macos/scripts/build/install-nvm.sh | 1 - .../scripts/build/install-pipx-packages.sh | 14 +--- .../macos/scripts/build/install-powershell.sh | 2 +- .../scripts/build/install-visualstudio.sh | 36 ++++----- images/macos/scripts/build/install-xamarin.sh | 50 ++++++------ .../scripts/build/install-xcode-simulators.sh | 8 +- images/macos/scripts/helpers/utils.sh | 79 +++++-------------- images/macos/scripts/tests/Rosetta.Tests.ps1 | 11 +++ .../templates/macOS-13.arm64.anka.pkr.hcl | 4 +- 22 files changed, 161 insertions(+), 207 deletions(-) create mode 100644 images/macos/scripts/tests/Rosetta.Tests.ps1 diff --git a/images/macos/scripts/build/configure-autologin.sh b/images/macos/scripts/build/configure-autologin.sh index f281237e4109..16bdc9242c50 100644 --- a/images/macos/scripts/build/configure-autologin.sh +++ b/images/macos/scripts/build/configure-autologin.sh @@ -7,9 +7,7 @@ ################################################################################ echo "Enabling automatic GUI login for the '$USERNAME' user.." - python3 $HOME/bootstrap/kcpassword.py "$PASSWORD" - /usr/bin/defaults write /Library/Preferences/com.apple.loginwindow autoLoginUser "$USERNAME" : ' diff --git a/images/macos/scripts/build/configure-machine.sh b/images/macos/scripts/build/configure-machine.sh index e8eda5c4719a..11488e76af28 100644 --- a/images/macos/scripts/build/configure-machine.sh +++ b/images/macos/scripts/build/configure-machine.sh @@ -43,7 +43,6 @@ defaults write com.apple.VoiceOver4/default SCREnableAppleScript -bool YES swiftc -suppress-warnings "${HOME}/image-generation/add-certificate.swift" - certs=( AppleWWDRCAG3.cer DeveloperIDG2CA.cer @@ -52,9 +51,7 @@ for cert in ${certs[@]}; do echo "Adding ${cert} certificate" cert_path="${HOME}/${cert}" curl -fsSL "https://www.apple.com/certificateauthority/${cert}" --output ${cert_path} - sudo ./add-certificate ${cert_path} - rm ${cert_path} done diff --git a/images/macos/scripts/build/configure-max-files-limitation.sh b/images/macos/scripts/build/configure-max-files-limitation.sh index de9d13f0cc34..6877bf50c694 100644 --- a/images/macos/scripts/build/configure-max-files-limitation.sh +++ b/images/macos/scripts/build/configure-max-files-limitation.sh @@ -41,5 +41,4 @@ echo "limit.maxfiles.plist permissions changing" chown root:wheel "${Launch_Daemons}/limit.maxfiles.plist" chmod 0644 "${Launch_Daemons}/limit.maxfiles.plist" - echo "Done, limit.maxfiles has been updated" diff --git a/images/macos/scripts/build/configure-network-interface-detection.sh b/images/macos/scripts/build/configure-network-interface-detection.sh index c60cd636f3cc..87808eba5add 100644 --- a/images/macos/scripts/build/configure-network-interface-detection.sh +++ b/images/macos/scripts/build/configure-network-interface-detection.sh @@ -30,7 +30,6 @@ EOF /bin/chmod 644 "${PLIST}" /usr/sbin/chown root:wheel "${PLIST}" - : ' The MIT License (MIT) Copyright (c) 2013-2017 Timothy Sutton diff --git a/images/macos/scripts/build/configure-windows.sh b/images/macos/scripts/build/configure-windows.sh index 02da5fadb6f4..92cb9aa98d3a 100644 --- a/images/macos/scripts/build/configure-windows.sh +++ b/images/macos/scripts/build/configure-windows.sh @@ -13,11 +13,10 @@ if is_Arm64; then fi retry=10 -while [ $retry -gt 0 ]; do +while [[ $retry -gt 0 ]]; do openwindows=$(osascript -e 'tell application "System Events" to get every window of (every process whose class of windows contains window)') && break - retry=$((retry-1)) - if [ $retry -eq 0 ]; then + if [[ $retry -eq 0 ]]; then echo "No retry attempts left" exit 1 fi diff --git a/images/macos/scripts/build/configure-xcode.sh b/images/macos/scripts/build/configure-xcode.sh index 23b054f6fe29..bde2703814c3 100644 --- a/images/macos/scripts/build/configure-xcode.sh +++ b/images/macos/scripts/build/configure-xcode.sh @@ -5,6 +5,7 @@ ################################################################################ source ~/utils/utils.sh + XCODE_LIST=($(get_toolset_value '.xcode.versions | reverse | .[].link')) DEFAULT_XCODE_VERSION=$(get_toolset_value '.xcode.default') diff --git a/images/macos/scripts/build/install-actions-cache.sh b/images/macos/scripts/build/install-actions-cache.sh index 02a4c39dc0db..4871bf86ae23 100644 --- a/images/macos/scripts/build/install-actions-cache.sh +++ b/images/macos/scripts/build/install-actions-cache.sh @@ -12,7 +12,7 @@ if [ ! -d $ACTIONS_RUNNER_ACTION_ARCHIVE_CACHE ]; then mkdir -p $ACTIONS_RUNNER_ACTION_ARCHIVE_CACHE fi -download_url=$(get_github_package_download_url "actions/action-versions" "contains(\"action-versions.tar.gz\")" "latest") +download_url=$(resolve_github_release_asset_url "actions/action-versions" "contains(\"action-versions.tar.gz\")" "latest") echo "Downloading action-versions $download_url" archive_path=$(download_with_retry "$download_url") tar -xzf "$archive_path" -C "$ACTIONS_RUNNER_ACTION_ARCHIVE_CACHE" diff --git a/images/macos/scripts/build/install-chrome.sh b/images/macos/scripts/build/install-chrome.sh index 22dfe417802c..ace3ee7284b3 100644 --- a/images/macos/scripts/build/install-chrome.sh +++ b/images/macos/scripts/build/install-chrome.sh @@ -11,40 +11,40 @@ echo "Installing Google Chrome..." brew install --cask google-chrome # Parse Google Chrome version -FULL_CHROME_VERSION=$("/Applications/Google Chrome.app/Contents/MacOS/Google Chrome" --version) -FULL_CHROME_VERSION=${FULL_CHROME_VERSION#Google Chrome } -CHROME_VERSION=${FULL_CHROME_VERSION%.*} -echo "Google Chrome version is $FULL_CHROME_VERSION" +full_chrome_version=$("/Applications/Google Chrome.app/Contents/MacOS/Google Chrome" --version) +full_chrome_version=${full_chrome_version#Google Chrome } +chrome_version=${full_chrome_version%.*} +echo "Google Chrome version is $full_chrome_version" # Get Google Chrome versions information -CHROME_PLATFORM="mac-$arch" +chrome_platform="mac-$arch" CHROME_VERSIONS_URL="https://googlechromelabs.github.io/chrome-for-testing/latest-patch-versions-per-build-with-downloads.json" -CHROME_VERSIONS_JSON="$(cat "$(download_with_retry "$CHROME_VERSIONS_URL")")" +chrome_versions_json="$(cat "$(download_with_retry "$CHROME_VERSIONS_URL")")" # Download and unpack the latest release of Chrome Driver -CHROMEDRIVER_VERSION=$(echo "${CHROME_VERSIONS_JSON}" | jq -r '.builds["'"$CHROME_VERSION"'"].version') -echo "Installing Chrome Driver version $CHROMEDRIVER_VERSION" +chromedriver_version=$(echo "${chrome_versions_json}" | jq -r '.builds["'"$chrome_version"'"].version') +echo "Installing Chrome Driver version $chromedriver_version" -CHROMEDRIVER_URL=$(echo "${CHROME_VERSIONS_JSON}" | jq -r '.builds["'"$CHROME_VERSION"'"].downloads.chromedriver[] | select(.platform=="'"${CHROME_PLATFORM}"'").url') -CHROMEDRIVER_DIR="/usr/local/share/chromedriver-${CHROME_PLATFORM}" -CHROMEDRIVER_BIN="$CHROMEDRIVER_DIR/chromedriver" +chromedriver_url=$(echo "${chrome_versions_json}" | jq -r '.builds["'"$chrome_version"'"].downloads.chromedriver[] | select(.platform=="'"${chrome_platform}"'").url') +chromedriver_dir="/usr/local/share/chromedriver-${chrome_platform}" +chromedriver_bin="$chromedriver_dir/chromedriver" -CHROMEDRIVER_ARCHIVE_PATH=$(download_with_retry "$CHROMEDRIVER_URL") -unzip -qq "$CHROMEDRIVER_ARCHIVE_PATH" -d /tmp/ -sudo mv "/tmp/chromedriver-${CHROME_PLATFORM}" "$CHROMEDRIVER_DIR" -ln -s "$CHROMEDRIVER_BIN" /usr/local/bin/chromedriver -echo "export CHROMEWEBDRIVER=$CHROMEDRIVER_DIR" >> "${HOME}/.bashrc" +chromedriver_archive_path=$(download_with_retry "$chromedriver_url") +unzip -qq "$chromedriver_archive_path" -d /tmp/ +sudo mv "/tmp/chromedriver-${chrome_platform}" "$chromedriver_dir" +ln -s "$chromedriver_bin" /usr/local/bin/chromedriver +echo "export CHROMEWEBDRIVER=$chromedriver_dir" >> "${HOME}/.bashrc" # Download and unpack the latest release of Google Chrome for Testing -CHROME_FOR_TESTING_VERSION=$(echo "${CHROME_VERSIONS_JSON}" | jq -r '.builds["'"$CHROME_VERSION"'"].version') -echo "Installing Google Chrome for Testing version $CHROME_FOR_TESTING_VERSION" +chrome_for_testing_version=$(echo "${chrome_versions_json}" | jq -r '.builds["'"$chrome_version"'"].version') +echo "Installing Google Chrome for Testing version $chrome_for_testing_version" -CHROME_FOR_TESTING_URL=$(echo "${CHROME_VERSIONS_JSON}" | jq -r '.builds["'"$CHROME_VERSION"'"].downloads.chrome[] | select(.platform=="'"${CHROME_PLATFORM}"'").url') -CHROME_FOR_TESTING_APP="Google Chrome for Testing.app" +chrome_for_testing_url=$(echo "${chrome_versions_json}" | jq -r '.builds["'"$chrome_version"'"].downloads.chrome[] | select(.platform=="'"${chrome_platform}"'").url') +chrome_for_testing_app="Google Chrome for Testing.app" -CHROME_FOR_TESTING_ARCHIVE_PATH=$(download_with_retry "$CHROME_FOR_TESTING_URL") -unzip -qq "$CHROME_FOR_TESTING_ARCHIVE_PATH" -d /tmp/ -mv "/tmp/chrome-${CHROME_PLATFORM}/${CHROME_FOR_TESTING_APP}" "/Applications/${CHROME_FOR_TESTING_APP}" +chrome_for_testing_archive_path=$(download_with_retry "$chrome_for_testing_url") +unzip -qq "$chrome_for_testing_archive_path" -d /tmp/ +mv "/tmp/chrome-${chrome_platform}/${chrome_for_testing_app}" "/Applications/${chrome_for_testing_app}" echo "Installing Selenium" brew_smart_install "selenium-server" diff --git a/images/macos/scripts/build/install-common-utils.sh b/images/macos/scripts/build/install-common-utils.sh index 253a2b60d607..a414637a7fc5 100644 --- a/images/macos/scripts/build/install-common-utils.sh +++ b/images/macos/scripts/build/install-common-utils.sh @@ -51,7 +51,7 @@ if is_Monterey; then osascript $HOME/utils/confirm-identified-developers.scpt $USER_PASSWORD } && break - if [ "$retry" -eq 0 ]; then + if [[ "$retry" -eq 0 ]]; then echo "Executing AppleScript failed. No retries left" exit 1 fi @@ -75,14 +75,14 @@ if is_Monterey; then dbQuery="SELECT * FROM kext_policy WHERE bundle_id LIKE 'com.parallels.kext.%';" kext=$(sudo sqlite3 $dbName "$dbQuery") - if [ -z "$kext" ]; then + if [[ -z "$kext" ]]; then echo "Parallels International GmbH not found" exit 1 fi # Create env variable url=$(brew info --json=v2 --installed | jq -r '.casks[] | select(.name[] == "Parallels Desktop").url') - if [ -z "$url" ]; then + if [[ -z "$url" ]]; then echo "Unable to parse url for Parallels Desktop cask" exit 1 fi diff --git a/images/macos/scripts/build/install-dotnet.sh b/images/macos/scripts/build/install-dotnet.sh index f7fc1039d676..0bc0feb088b7 100644 --- a/images/macos/scripts/build/install-dotnet.sh +++ b/images/macos/scripts/build/install-dotnet.sh @@ -15,21 +15,21 @@ DOTNET_INSTALL_SCRIPT="https://dot.net/v1/dotnet-install.sh" install_script_path=$(download_with_retry $DOTNET_INSTALL_SCRIPT) chmod +x "$install_script_path" -ARGS_LIST=() +args_list=() echo "Parsing dotnet SDK (except rc and preview versions) from .json..." -DOTNET_VERSIONS=($(get_toolset_value ".dotnet.arch[\"$arch\"].versions | .[]")) +dotnet_versions=($(get_toolset_value ".dotnet.arch[\"$arch\"].versions | .[]")) -for DOTNET_VERSION in "${DOTNET_VERSIONS[@]}"; do - RELEASE_URL="https://raw.githubusercontent.com/dotnet/core/main/release-notes/${DOTNET_VERSION}/releases.json" - releases_json_file=$(download_with_retry "$RELEASE_URL") +for dotnet_version in "${dotnet_versions[@]}"; do + release_url="https://raw.githubusercontent.com/dotnet/core/main/release-notes/${dotnet_version}/releases.json" + releases_json_file=$(download_with_retry "$release_url") - if [[ $DOTNET_VERSION == "6.0" ]]; then - ARGS_LIST+=( + if [[ $dotnet_version == "6.0" ]]; then + args_list+=( $(cat "$releases_json_file" | jq -r 'first(.releases[].sdks[]?.version | select(contains("preview") or contains("rc") | not))') ) else - ARGS_LIST+=( + args_list+=( $(cat "$releases_json_file" | \ jq -r '.releases[].sdk."version"' | grep -v -E '\-(preview|rc)\d*' | \ sort -r | rev | uniq -s 2 | rev) @@ -37,7 +37,7 @@ for DOTNET_VERSION in "${DOTNET_VERSIONS[@]}"; do fi done -for ARGS in "${ARGS_LIST[@]}"; do +for ARGS in "${args_list[@]}"; do "$install_script_path" --version $ARGS -NoPath --arch $arch done diff --git a/images/macos/scripts/build/install-edge.sh b/images/macos/scripts/build/install-edge.sh index 94f0b7777cc7..5146e202b16b 100644 --- a/images/macos/scripts/build/install-edge.sh +++ b/images/macos/scripts/build/install-edge.sh @@ -10,27 +10,27 @@ echo "Installing Microsoft Edge..." brew install --cask microsoft-edge EDGE_INSTALLATION_PATH="/Applications/Microsoft Edge.app/Contents/MacOS/Microsoft Edge" -EDGE_VERSION=$("$EDGE_INSTALLATION_PATH" --version | cut -d' ' -f 3) -EDGE_VERSION_MAJOR=$(echo $EDGE_VERSION | cut -d'.' -f 1) +edge_version=$("$EDGE_INSTALLATION_PATH" --version | cut -d' ' -f 3) +edge_version_major=$(echo $edge_version | cut -d'.' -f 1) -echo "Version of Microsoft Edge: ${EDGE_VERSION}" +echo "Version of Microsoft Edge: ${edge_version}" echo "Installing Microsoft Edge WebDriver..." -EDGE_DRIVER_VERSION_FILE_PATH=$(download_with_retry "https://msedgedriver.azureedge.net/LATEST_RELEASE_${EDGE_VERSION_MAJOR}_MACOS") -EDGE_DRIVER_LATEST_VERSION=$(iconv -f utf-16 -t utf-8 "$EDGE_DRIVER_VERSION_FILE_PATH" | tr -d '\r') -EDGE_DRIVER_URL="https://msedgedriver.azureedge.net/${EDGE_DRIVER_LATEST_VERSION}/edgedriver_mac64.zip" +edge_driver_version_file_path=$(download_with_retry "https://msedgedriver.azureedge.net/LATEST_RELEASE_${edge_version_major}_MACOS") +edge_driver_latest_version=$(iconv -f utf-16 -t utf-8 "$edge_driver_version_file_path" | tr -d '\r') +edge_driver_url="https://msedgedriver.azureedge.net/${edge_driver_latest_version}/edgedriver_mac64.zip" -echo "Compatible version of WebDriver: ${EDGE_DRIVER_LATEST_VERSION}" +echo "Compatible version of WebDriver: ${edge_driver_latest_version}" -EDGE_DRIVER_ARCHIVE_PATH=$(download_with_retry "$EDGE_DRIVER_URL") +edge_driver_archive_path=$(download_with_retry "$edge_driver_url") # Move webdriver to the separate directory to be consistent with the docs # https://docs.microsoft.com/en-us/azure/devops/pipelines/test/continuous-test-selenium?view=azure-devops#decide-how-you-will-deploy-and-test-your-app EDGE_DRIVER_DIR="/usr/local/share/edge_driver" mkdir -p $EDGE_DRIVER_DIR -unzip -qq "$EDGE_DRIVER_ARCHIVE_PATH" -d "$EDGE_DRIVER_DIR" +unzip -qq "$edge_driver_archive_path" -d "$EDGE_DRIVER_DIR" ln -s "$EDGE_DRIVER_DIR/msedgedriver" "/usr/local/bin/msedgedriver" echo "export EDGEWEBDRIVER=${EDGE_DRIVER_DIR}" >> "${HOME}/.bashrc" diff --git a/images/macos/scripts/build/install-golang.sh b/images/macos/scripts/build/install-golang.sh index 21d00d62ddea..7a28868edf53 100644 --- a/images/macos/scripts/build/install-golang.sh +++ b/images/macos/scripts/build/install-golang.sh @@ -6,11 +6,11 @@ source ~/utils/utils.sh -DEFAULT_GO_VERSION=$(get_toolset_value '.go.default') +default_go_version=$(get_toolset_value '.go.default') echo "Installing Go..." -brew_smart_install "go@${DEFAULT_GO_VERSION}" +brew_smart_install "go@${default_go_version}" # Create symlinks to preserve backward compatibility. Symlinks are not created when non-latest go is being installed -ln -sf $(brew --prefix go@${DEFAULT_GO_VERSION})/bin/* /usr/local/bin/ +ln -sf $(brew --prefix go@${default_go_version})/bin/* /usr/local/bin/ invoke_tests "Common" "Go" diff --git a/images/macos/scripts/build/install-mono.sh b/images/macos/scripts/build/install-mono.sh index 1fa6e29f44b5..b5569a4194ed 100644 --- a/images/macos/scripts/build/install-mono.sh +++ b/images/macos/scripts/build/install-mono.sh @@ -4,50 +4,48 @@ ## Desc: Install Mono Framework ################################################################################ -# Source utility functions source ~/utils/utils.sh # Install Mono Framework -MONO_VERSION_FULL=$(get_toolset_value '.mono.framework.version') -MONO_PKG_SHA256=$(get_toolset_value '.mono.framework.sha256') -MONO_VERSION=$(echo "$MONO_VERSION_FULL" | cut -d. -f 1,2,3) -MONO_VERSION_SHORT=$(echo $MONO_VERSION_FULL | cut -d. -f 1,2) -MONO_PKG_URL="https://download.mono-project.com/archive/${MONO_VERSION}/macos-10-universal/MonoFramework-MDK-${MONO_VERSION_FULL}.macos10.xamarin.universal.pkg" +mono_version_full=$(get_toolset_value '.mono.framework.version') +mono_pkg_sha256=$(get_toolset_value '.mono.framework.sha256') +mono_version=$(echo "$mono_version_full" | cut -d. -f 1,2,3) +mono_version_short=$(echo $mono_version_full | cut -d. -f 1,2) +mono_pkg_url="https://download.mono-project.com/archive/${mono_version}/macos-10-universal/MonoFramework-MDK-${mono_version_full}.macos10.xamarin.universal.pkg" MONO_VERSIONS_PATH='/Library/Frameworks/Mono.framework/Versions' -MONO_PKG_PATH=$(download_with_retry "$MONO_PKG_URL") -use_checksum_comparison "$MONO_PKG_PATH" "$MONO_PKG_SHA256" - -echo "Installing Mono Framework ${MONO_VERSION_FULL}..." -sudo installer -pkg "$MONO_PKG_PATH" -target / +mono_pkg_path=$(download_with_retry "$mono_pkg_url") +use_checksum_comparison "$mono_pkg_path" "$mono_pkg_sha256" +echo "Installing Mono Framework ${mono_version_full}..." +sudo installer -pkg "$mono_pkg_path" -target / # Download and install NUnit console -NUNIT_VERSION=$(get_toolset_value '.mono.nunit.version') -NUNIT_ARCHIVE_URL="https://github.com/nunit/nunit-console/releases/download/${NUNIT_VERSION}/NUnit.Console-${NUNIT_VERSION}.zip" -NUNIT_ARCHIVE_SHA256=$(get_toolset_value '.mono.nunit.sha256') +nunit_version=$(get_toolset_value '.mono.nunit.version') +nunit_archive_url="https://github.com/nunit/nunit-console/releases/download/${nunit_version}/NUnit.Console-${nunit_version}.zip" +nunit_archive_sha256=$(get_toolset_value '.mono.nunit.sha256') NUNIT_PATH="/Library/Developer/nunit" -NUNIT_VERSION_PATH="$NUNIT_PATH/$NUNIT_VERSION" +nunit_version_path="$NUNIT_PATH/$nunit_version" -NUNIT_ARCHIVE_PATH=$(download_with_retry "$NUNIT_ARCHIVE_URL") -use_checksum_comparison "$NUNIT_ARCHIVE_PATH" "$NUNIT_ARCHIVE_SHA256" -echo "Installing NUnit ${NUNIT_VERSION}..." -sudo mkdir -p "$NUNIT_VERSION_PATH" -sudo unzip -q "$NUNIT_ARCHIVE_PATH" -d "$NUNIT_VERSION_PATH" +nunit_archive_path=$(download_with_retry "$nunit_archive_url") +use_checksum_comparison "$nunit_archive_path" "$nunit_archive_sha256" +echo "Installing NUnit ${nunit_version}..." +sudo mkdir -p "$nunit_version_path" +sudo unzip -q "$nunit_archive_path" -d "$nunit_version_path" # Create a wrapper script for nunit3-console echo "Creating nunit3-console wrapper..." -NUNIT3_CONSOLE_WRAPPER=$(mktemp) -cat <<EOF > "$NUNIT3_CONSOLE_WRAPPER" +nunit3_console_wrapper=$(mktemp) +cat <<EOF > "$nunit3_console_wrapper" #!/bin/bash -e -o pipefail -exec ${MONO_VERSIONS_PATH}/${MONO_VERSION}/bin/mono --debug \$MONO_OPTIONS $NUNIT_VERSION_PATH/nunit3-console.exe "\$@" +exec ${MONO_VERSIONS_PATH}/${mono_version}/bin/mono --debug \$MONO_OPTIONS $nunit_version_path/nunit3-console.exe "\$@" EOF -cat "$NUNIT3_CONSOLE_WRAPPER" -sudo chmod +x "$NUNIT3_CONSOLE_WRAPPER" -sudo mv "$NUNIT3_CONSOLE_WRAPPER" "${MONO_VERSIONS_PATH}/${MONO_VERSION}/Commands/nunit3-console" +cat "$nunit3_console_wrapper" +sudo chmod +x "$nunit3_console_wrapper" +sudo mv "$nunit3_console_wrapper" "${MONO_VERSIONS_PATH}/${mono_version}/Commands/nunit3-console" # Create a symlink for the short version of Mono (e.g., 6.12) -echo "Creating short symlink '${MONO_VERSION_SHORT}'..." -sudo ln -s "${MONO_VERSIONS_PATH}/${MONO_VERSION}" "${MONO_VERSIONS_PATH}/${MONO_VERSION_SHORT}" +echo "Creating short symlink '${mono_version_short}'..." +sudo ln -s "${MONO_VERSIONS_PATH}/${mono_version}" "${MONO_VERSIONS_PATH}/${mono_version_short}" # Invoke tests for Xamarin and Mono invoke_tests "Xamarin" "Mono" diff --git a/images/macos/scripts/build/install-nvm.sh b/images/macos/scripts/build/install-nvm.sh index 4c2c121d54bf..49948459d48f 100644 --- a/images/macos/scripts/build/install-nvm.sh +++ b/images/macos/scripts/build/install-nvm.sh @@ -19,7 +19,6 @@ if bash "$nvm_installer_path"; then # set system node as default nvm alias default system - echo "Node version manager has been installed successfully" else echo "Node version manager installation failed" diff --git a/images/macos/scripts/build/install-pipx-packages.sh b/images/macos/scripts/build/install-pipx-packages.sh index 19efeee7b0bf..0b4a8f90f804 100644 --- a/images/macos/scripts/build/install-pipx-packages.sh +++ b/images/macos/scripts/build/install-pipx-packages.sh @@ -8,19 +8,11 @@ source ~/utils/utils.sh export PATH="$PATH:/opt/pipx_bin" -toolset=$(get_toolset_path) -pipx_packages=$(jq -r ".pipx[] .package" $toolset) +pipx_packages=$(get_toolset_value '.pipx[].package') for package in $pipx_packages; do - python_version=$(jq -r ".pipx[] | select(.package == \"$package\") .python" $toolset) - if [ "$python_version" != "null" ]; then - python_path="$HOME/hostedtoolcache/Python/$python_version*/x64/bin/python$python_version" - echo "Install $package into python $python_path" - pipx install $package --python $python_path - else - echo "Install $package into default python" - pipx install $package - fi + echo "Install $package into default python" + pipx install $package done invoke_tests "PipxPackages" diff --git a/images/macos/scripts/build/install-powershell.sh b/images/macos/scripts/build/install-powershell.sh index 3a0a1bbd9b9a..b38ff10e7b83 100644 --- a/images/macos/scripts/build/install-powershell.sh +++ b/images/macos/scripts/build/install-powershell.sh @@ -11,7 +11,7 @@ arch=$(get_arch) metadata_json_path=$(download_with_retry "https://raw.githubusercontent.com/PowerShell/PowerShell/master/tools/metadata.json") version=$(jq -r '.LTSReleaseTag[0]' "$metadata_json_path") -download_url=$(get_github_package_download_url "PowerShell/PowerShell" "contains(\"osx-$arch.pkg\")" "$version" "$API_PAT") +download_url=$(resolve_github_release_asset_url "PowerShell/PowerShell" "contains(\"osx-$arch.pkg\")" "$version" "$API_PAT") pkg_path=$(download_with_retry "$download_url") # Work around the issue on macOS Big Sur 11.5 or higher for possible error message ("can't be opened because Apple cannot check it for malicious software") when installing the package diff --git a/images/macos/scripts/build/install-visualstudio.sh b/images/macos/scripts/build/install-visualstudio.sh index 805a0c542e9a..402665b736b7 100644 --- a/images/macos/scripts/build/install-visualstudio.sh +++ b/images/macos/scripts/build/install-visualstudio.sh @@ -8,33 +8,33 @@ source ~/utils/utils.sh source ~/utils/xamarin-utils.sh install_vsmac() { - local VSMAC_VERSION=$1 - local VSMAC_DEFAULT=$2 - if [ $VSMAC_VERSION == "2019" ]; then - VSMAC_DOWNLOAD_URL=$(curl -fsSL "https://aka.ms/manifest/stable" | jq -r '.items[] | select(.genericName=="VisualStudioMac").url') - elif [ $VSMAC_VERSION == "2022" ]; then - VSMAC_DOWNLOAD_URL=$(curl -fsSL "https://aka.ms/manifest/stable-2022" | jq -r '.items[] | select(.genericName=="VisualStudioMac").url') - elif [ $VSMAC_VERSION == "preview" ]; then - VSMAC_DOWNLOAD_URL=$(curl -fsSL "https://aka.ms/manifest/preview" | jq -r '.items[] | select(.genericName=="VisualStudioMac").url') + local vsmac_version=$1 + local vsmac_default=$2 + if [[ $vsmac_version == "2019" ]]; then + vsmac_download_url=$(curl -fsSL "https://aka.ms/manifest/stable" | jq -r '.items[] | select(.genericName=="VisualStudioMac").url') + elif [[ $vsmac_version == "2022" ]]; then + vsmac_download_url=$(curl -fsSL "https://aka.ms/manifest/stable-2022" | jq -r '.items[] | select(.genericName=="VisualStudioMac").url') + elif [[ $vsmac_version == "preview" ]]; then + vsmac_download_url=$(curl -fsSL "https://aka.ms/manifest/preview" | jq -r '.items[] | select(.genericName=="VisualStudioMac").url') else - VSMAC_DOWNLOAD_URL=$(buildVSMacDownloadUrl $VSMAC_VERSION) + vsmac_download_url=$(buildVSMacDownloadUrl $vsmac_version) fi - echo "Installing Visual Studio ${VSMAC_VERSION} for Mac" + echo "Installing Visual Studio ${vsmac_version} for Mac" TMPMOUNT=$(/usr/bin/mktemp -d /tmp/visualstudio.XXXX) mkdir -p "$TMPMOUNT/downloads" - VSMAC_INSTALLER=$(download_with_retry "$VSMAC_DOWNLOAD_URL" "$TMPMOUNT/downloads/${VSMAC_DOWNLOAD_URL##*/}") + vsmac_installer=$(download_with_retry "$vsmac_download_url" "$TMPMOUNT/downloads/${vsmac_download_url##*/}") echo "Mounting Visual Studio..." - hdiutil attach "$VSMAC_INSTALLER" -mountpoint "$TMPMOUNT" + hdiutil attach "$vsmac_installer" -mountpoint "$TMPMOUNT" echo "Moving Visual Studio to /Applications/..." pushd "$TMPMOUNT" tar cf - "./Visual Studio.app" | tar xf - -C /Applications/ - if [ $VSMAC_VERSION != $VSMAC_DEFAULT ]; then - mv "/Applications/Visual Studio.app" "/Applications/Visual Studio ${VSMAC_VERSION}.app" + if [[ $vsmac_version != $vsmac_default ]]; then + mv "/Applications/Visual Studio.app" "/Applications/Visual Studio ${vsmac_version}.app" fi popd @@ -42,11 +42,11 @@ install_vsmac() { sudo rm -rf "$TMPMOUNT" } -VSMAC_VERSIONS=($(get_toolset_value '.xamarin.vsmac.versions[]')) -DEFAULT_VSMAC_VERSION=$(get_toolset_value '.xamarin.vsmac.default') +vsmac_versions=($(get_toolset_value '.xamarin.vsmac.versions[]')) +default_vsmac_version=$(get_toolset_value '.xamarin.vsmac.default') -for VERSION in "${VSMAC_VERSIONS[@]}"; do - install_vsmac $VERSION $DEFAULT_VSMAC_VERSION +for version in "${vsmac_versions[@]}"; do + install_vsmac $version $default_vsmac_version done invoke_tests "Common" "VSMac" diff --git a/images/macos/scripts/build/install-xamarin.sh b/images/macos/scripts/build/install-xamarin.sh index 5eda104164aa..33ba012817bc 100644 --- a/images/macos/scripts/build/install-xamarin.sh +++ b/images/macos/scripts/build/install-xamarin.sh @@ -7,16 +7,16 @@ source ~/utils/utils.sh source ~/utils/xamarin-utils.sh -MONO_VERSIONS=($(get_toolset_value '.xamarin."mono_versions" | reverse | .[]')) -XAMARIN_IOS_VERSIONS=($(get_toolset_value '.xamarin."ios_versions" | reverse | .[]')) -XAMARIN_MAC_VERSIONS=($(get_toolset_value '.xamarin."mac_versions" | reverse | .[]')) -XAMARIN_ANDROID_VERSIONS=($(get_toolset_value '.xamarin."android_versions" | reverse | .[]')) -LATEST_SDK_SYMLINK=$(get_toolset_value '.xamarin.bundles[0].symlink') -CURRENT_SDK_SYMLINK=$(get_toolset_value '.xamarin."bundle_default"') -DEFAULT_XCODE_VERSION=$(get_toolset_value '.xcode.default') - -if [ "$CURRENT_SDK_SYMLINK" == "latest" ]; then - CURRENT_SDK_SYMLINK=$LATEST_SDK_SYMLINK +mono_versions=($(get_toolset_value '.xamarin."mono_versions" | reverse | .[]')) +xamarin_ios_versions=($(get_toolset_value '.xamarin."ios_versions" | reverse | .[]')) +xamarin_mac_versions=($(get_toolset_value '.xamarin."mac_versions" | reverse | .[]')) +xamarin_android_versions=($(get_toolset_value '.xamarin."android_versions" | reverse | .[]')) +latest_sdk_symlink=$(get_toolset_value '.xamarin.bundles[0].symlink') +current_sdk_symlink=$(get_toolset_value '.xamarin."bundle_default"') +default_xcode_version=$(get_toolset_value '.xcode.default') + +if [ "$current_sdk_symlink" == "latest" ]; then + current_sdk_symlink=$latest_sdk_symlink fi MONO_VERSIONS_PATH='/Library/Frameworks/Mono.framework/Versions' @@ -34,36 +34,36 @@ pushd $TMPMOUNT downloadNUnitConsole # Install Mono sdks -for VERSION in "${MONO_VERSIONS[@]}"; do installMono $VERSION; done +for version in "${mono_versions[@]}"; do installMono $version; done sudo mv -v $TMPMOUNT_FRAMEWORKS/mono/* $MONO_VERSIONS_PATH/ # Install Xamarin.iOS sdks -for VERSION in "${XAMARIN_IOS_VERSIONS[@]}"; do installXamarinIOS $VERSION; done +for version in "${xamarin_ios_versions[@]}"; do installXamarinIOS $version; done sudo mv -v $TMPMOUNT_FRAMEWORKS/ios/* $IOS_VERSIONS_PATH/ # Install Xamarin.Mac sdks -for VERSION in "${XAMARIN_MAC_VERSIONS[@]}"; do installXamarinMac $VERSION; done +for version in "${xamarin_mac_versions[@]}"; do installXamarinMac $version; done sudo mv -v $TMPMOUNT_FRAMEWORKS/mac/* $MAC_VERSIONS_PATH/ # Install Xamarin.Android sdks -for VERSION in "${XAMARIN_ANDROID_VERSIONS[@]}"; do installXamarinAndroid $VERSION; done +for version in "${xamarin_android_versions[@]}"; do installXamarinAndroid $version; done sudo mv -v $TMPMOUNT_FRAMEWORKS/android/* $ANDROID_VERSIONS_PATH/ # Create bundles -BUNDLES_COUNT=$(get_toolset_value '.xamarin.bundles | length') -for ((BUNDLE_INDEX=0; BUNDLE_INDEX<BUNDLES_COUNT; BUNDLE_INDEX++)); do - SYMLINK=$(get_toolset_value ".xamarin.bundles[$BUNDLE_INDEX].symlink") - MONO=$(get_toolset_value ".xamarin.bundles[$BUNDLE_INDEX].mono") - IOS=$(get_toolset_value ".xamarin.bundles[$BUNDLE_INDEX].ios") - MAC=$(get_toolset_value ".xamarin.bundles[$BUNDLE_INDEX].mac") - ANDROID=$(get_toolset_value ".xamarin.bundles[$BUNDLE_INDEX].android") - createBundle $SYMLINK $MONO $IOS $MAC $ANDROID +bundles_count=$(get_toolset_value '.xamarin.bundles | length') +for ((bundle_index=0; bundle_index<bundles_count; bundle_index++)); do + symlink=$(get_toolset_value ".xamarin.bundles[$bundle_index].symlink") + mono=$(get_toolset_value ".xamarin.bundles[$bundle_index].mono") + ios=$(get_toolset_value ".xamarin.bundles[$bundle_index].ios") + mac=$(get_toolset_value ".xamarin.bundles[$bundle_index].mac") + android=$(get_toolset_value ".xamarin.bundles[$bundle_index].android") + createBundle $symlink $mono $ios $mac $android done # Symlinks for the latest Xamarin bundle -createBundleLink $LATEST_SDK_SYMLINK "Latest" -createBundleLink $CURRENT_SDK_SYMLINK "Current" +createBundleLink $latest_sdk_symlink "Latest" +createBundleLink $current_sdk_symlink "Current" # # Fix nuget in some mono versions because of known bugs @@ -80,7 +80,7 @@ sudo rm -rf "$TMPMOUNT" # Fix Xamarin issue with Xcode symlink: https://github.com/xamarin/xamarin-macios/issues/9960 PREFERENCES_XAMARIN_DIR="${HOME}/Library/Preferences/Xamarin" mkdir -p $PREFERENCES_XAMARIN_DIR -/usr/libexec/PlistBuddy -c "add :AppleSdkRoot string /Applications/Xcode_${DEFAULT_XCODE_VERSION}.app" $PREFERENCES_XAMARIN_DIR/Settings.plist +/usr/libexec/PlistBuddy -c "add :AppleSdkRoot string /Applications/Xcode_${default_xcode_version}.app" $PREFERENCES_XAMARIN_DIR/Settings.plist # Temporary workaround to recreate nuget.config file with a correct feed https://github.com/actions/runner-images/issues/5768 rm -rf $HOME/.config/NuGet/NuGet.Config diff --git a/images/macos/scripts/build/install-xcode-simulators.sh b/images/macos/scripts/build/install-xcode-simulators.sh index 3ff94dacb13e..f04ea329b3a1 100644 --- a/images/macos/scripts/build/install-xcode-simulators.sh +++ b/images/macos/scripts/build/install-xcode-simulators.sh @@ -19,11 +19,11 @@ SIMS_TO_INSTALL=( "10.3" ) -for SIM_VERSION in ${SIMS_TO_INSTALL[@]} +for sim_version in ${SIMS_TO_INSTALL[@]} do - echo "Installing iOS $SIM_VERSION ..." - sudo xcversion simulators --install="iOS ${SIM_VERSION}" - echo "Successfuly installed iOS $SIM_VERSION ..." + echo "Installing iOS $sim_version ..." + sudo xcversion simulators --install="iOS ${sim_version}" + echo "Successfuly installed iOS $sim_version ..." done echo "Done installing simulator runtimes." diff --git a/images/macos/scripts/helpers/utils.sh b/images/macos/scripts/helpers/utils.sh index 2954ff0c6ff2..f9219113d908 100644 --- a/images/macos/scripts/helpers/utils.sh +++ b/images/macos/scripts/helpers/utils.sh @@ -78,15 +78,11 @@ is_BigSur() { } is_Veertu() { - [ -d "/Library/Application Support/Veertu" ] -} - -get_toolset_path() { - echo "$HOME/image-generation/toolset.json" + [[ -d "/Library/Application Support/Veertu" ]] } get_toolset_value() { - local toolset_path=$(get_toolset_path) + local toolset_path=$(echo "$HOME/image-generation/toolset.json") local query=$1 echo "$(jq -r "$query" $toolset_path)" } @@ -96,32 +92,6 @@ verlte() { [ "$1" = "$sortedVersion" ] } -brew_cask_install_ignoring_sha256() { - local TOOL_NAME=$1 - - CASK_DIR="$(brew --repo homebrew/cask)/Casks" - chmod a+w "$CASK_DIR/$TOOL_NAME.rb" - SHA=$(grep "sha256" "$CASK_DIR/$TOOL_NAME.rb" | awk '{print $2}') - sed -i '' "s/$SHA/:no_check/" "$CASK_DIR/$TOOL_NAME.rb" - brew install --cask $TOOL_NAME - pushd $CASK_DIR - git checkout HEAD -- "$TOOL_NAME.rb" - popd -} - -get_brew_os_keyword() { - if is_BigSur; then - echo "big_sur" - elif is_Monterey; then - echo "monterey" - elif is_Ventura; then - echo "ventura" - elif is_Sonoma; then - echo "sonoma" - else - echo "null" - fi -} # brew provides package bottles for different macOS versions # The 'brew install' command will fail if a package bottle does not exist @@ -172,7 +142,6 @@ brew_smart_install() { configure_system_tccdb () { local values=$1 - local dbPath="/Library/Application Support/com.apple.TCC/TCC.db" local sqlQuery="INSERT OR IGNORE INTO access VALUES($values);" sudo sqlite3 "$dbPath" "$sqlQuery" @@ -180,46 +149,38 @@ configure_system_tccdb () { configure_user_tccdb () { local values=$1 - local dbPath="$HOME/Library/Application Support/com.apple.TCC/TCC.db" local sqlQuery="INSERT OR IGNORE INTO access VALUES($values);" sqlite3 "$dbPath" "$sqlQuery" } -get_github_package_download_url() { - local REPO_ORG=$1 - local FILTER=$2 - local VERSION=$3 - local API_PAT=$4 - local SEARCH_IN_COUNT="100" +resolve_github_release_asset_url() { + local repo=$1 + local filter=$2 + local version=${3:-"*"} + local api_pat=$4 - [ -n "$API_PAT" ] && authString=(-H "Authorization: token ${API_PAT}") + page_size="100" - failed=true - for i in {1..10}; do - curl "${authString[@]}" -fsSL "https://api.github.com/repos/${REPO_ORG}/releases?per_page=${SEARCH_IN_COUNT}" >/tmp/get_github_package_download_url.json && failed=false || sleep 60 - [ "$failed" = false ] && break - done + [ -n "$api_pat" ] && authString=(-H "Authorization: token ${api_pat}") - if [ "$failed" = true ]; then - echo "Failed: get_github_package_download_url" - exit 1; - fi + json=$(curl "${authString[@]}" -fsSL "https://api.github.com/repos/${repo}/releases?per_page=${page_size}") - json=$(cat /tmp/get_github_package_download_url.json) - - if [[ "$VERSION" == "latest" ]]; then - tagName=$(echo $json | jq -r '.[] | select((.prerelease==false) and (.assets | length > 0)).tag_name' | sort --unique --version-sort | egrep -v ".*-[a-z]" | tail -1) + if [[ $version == "latest" ]]; then + tag_name=$(echo $json | jq -r '.[].tag_name' | sort --unique --version-sort | egrep -v ".*-[a-z]|beta" | tail -n 1) + elif [[ $version == *"*"* ]]; then + tag_name=$(echo $json | jq -r '.[].tag_name' | sort --unique --version-sort | egrep -v ".*-[a-z]|beta" | egrep "${version}" | tail -n 1) else - tagName=$(echo $json | jq -r '.[] | select(.prerelease==false).tag_name' | sort --unique --version-sort | egrep -v ".*-[a-z]" | egrep "\w*${VERSION}" | tail -1) + tag_name=$(echo $json | jq -r '.[].tag_name' | sort --unique --version-sort | egrep -v ".*-[a-z]|beta" | egrep "${version}") fi - downloadUrl=$(echo $json | jq -r ".[] | select(.tag_name==\"${tagName}\").assets[].browser_download_url | select(${FILTER})" | head -n 1) - if [ -z "$downloadUrl" ]; then - echo "Failed to parse a download url for the '${tagName}' tag using '${FILTER}' filter" + download_url=$(echo $json | jq -r ".[] | select(.tag_name==\"${tag_name}\").assets[].browser_download_url | select(${filter})" | head -n 1) + if [ -z "$download_url" ]; then + echo "Failed to parse a download url for the '${tag_name}' tag using '${filter}' filter" exit 1 fi - echo $downloadUrl + + echo $download_url } # Close all finder windows because they can interfere with UI tests diff --git a/images/macos/scripts/tests/Rosetta.Tests.ps1 b/images/macos/scripts/tests/Rosetta.Tests.ps1 new file mode 100644 index 000000000000..e65f22e327ca --- /dev/null +++ b/images/macos/scripts/tests/Rosetta.Tests.ps1 @@ -0,0 +1,11 @@ +Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" + +$os = Get-OSVersion + +Describe "Rosetta" -Skip:(-not $os.IsArm64) { + It "Rosetta is available" { + $commandResult = Get-CommandResult "/usr/bin/pgrep oahd" + $commandResult.Output | Should -Match "\d+" + $commandResult.ExitCode | Should -Be 0 + } +} diff --git a/images/macos/templates/macOS-13.arm64.anka.pkr.hcl b/images/macos/templates/macOS-13.arm64.anka.pkr.hcl index 1ab3ffc0cd7b..98a2118eb63d 100644 --- a/images/macos/templates/macOS-13.arm64.anka.pkr.hcl +++ b/images/macos/templates/macOS-13.arm64.anka.pkr.hcl @@ -131,8 +131,7 @@ build { provisioner "shell" { scripts = [ "./scripts/build/install-xcode-clt.sh", - "./scripts/build/install-homebrew.sh", - "./scripts/build/install-rosetta.sh" + "./scripts/build/install-homebrew.sh" ] execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" } @@ -170,6 +169,7 @@ build { provisioner "shell" { pause_before = "30s" scripts = [ + "./scripts/build/install-rosetta.sh", "./scripts/build/configure-windows.sh", "./scripts/build/install-powershell.sh", "./scripts/build/install-mono.sh", From e969572ffbb0cbfbc959eb2f9ccdb6a756e764d3 Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Thu, 21 Dec 2023 19:43:31 +0100 Subject: [PATCH 2557/3485] [macOS] Add Xcode 15.2 Beta (#9050) --- images/macos/toolsets/toolset-13.json | 2 ++ images/macos/toolsets/toolset-14.json | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/images/macos/toolsets/toolset-13.json b/images/macos/toolsets/toolset-13.json index 3a095d0e07fa..5f29d86fbf51 100644 --- a/images/macos/toolsets/toolset-13.json +++ b/images/macos/toolsets/toolset-13.json @@ -3,6 +3,7 @@ "default": "14.3.1", "x64": { "versions": [ + { "link": "15.2", "version": "15.2.0-Beta+15C5500c", "install_runtimes": "true", "sha256": "BA01241CF6F611163A1E594423AA4836C4B91A37E88CBFCB7B00E095697F5083"}, { "link": "15.1", "version": "15.1.0+15C65", "install_runtimes": "true", "sha256": "857D8DB537BAC82BF99DE0E1D3895D214D4D02101C1340CEF3DAF6E821BA1D05"}, { "link": "15.0.1", "version": "15.0.1+15A507", "symlinks": ["15.0"], "install_runtimes": "true", "sha256": "5AC17AE6060CAFC3C7112C6DA0B153450BE21F1DE6632777FBA9FBC9D999C9E8"}, { "link": "14.3.1", "version": "14.3.1+14E300c","symlinks": ["14.3"], "install_runtimes": "true", "sha256": "B5CC7BF37447C32A971B37D71C7DA1AF7ABB45CEE4B96FE126A1D3B0D2C260AF"}, @@ -13,6 +14,7 @@ }, "arm64":{ "versions": [ + { "link": "15.2", "version": "15.2.0-Beta+15C5500c", "install_runtimes": "true", "sha256": "BA01241CF6F611163A1E594423AA4836C4B91A37E88CBFCB7B00E095697F5083"}, { "link": "15.1", "version": "15.1.0+15C65", "install_runtimes": "true", "sha256": "857D8DB537BAC82BF99DE0E1D3895D214D4D02101C1340CEF3DAF6E821BA1D05"}, { "link": "15.0.1", "version": "15.0.1+15A507", "symlinks": ["15.0"], "install_runtimes": "true", "sha256": "5AC17AE6060CAFC3C7112C6DA0B153450BE21F1DE6632777FBA9FBC9D999C9E8"}, { "link": "14.3.1", "version": "14.3.1+14E300c","symlinks": ["14.3"], "install_runtimes": "true", "sha256": "B5CC7BF37447C32A971B37D71C7DA1AF7ABB45CEE4B96FE126A1D3B0D2C260AF"}, diff --git a/images/macos/toolsets/toolset-14.json b/images/macos/toolsets/toolset-14.json index f0bcd66fb3c3..b5a71ba03942 100644 --- a/images/macos/toolsets/toolset-14.json +++ b/images/macos/toolsets/toolset-14.json @@ -3,12 +3,16 @@ "default": "15.0.1", "x64": { "versions": [ + { "link": "15.2", "version": "15.2.0-Beta+15C5500c", "install_runtimes": "true", "sha256": "BA01241CF6F611163A1E594423AA4836C4B91A37E88CBFCB7B00E095697F5083"}, + { "link": "15.1", "version": "15.1.0+15C65", "install_runtimes": "true", "sha256": "857D8DB537BAC82BF99DE0E1D3895D214D4D02101C1340CEF3DAF6E821BA1D05"}, { "link": "15.0.1", "version": "15.0.1+15A507", "symlinks": ["15.0"], "install_runtimes": "true", "sha256": "5AC17AE6060CAFC3C7112C6DA0B153450BE21F1DE6632777FBA9FBC9D999C9E8"}, { "link": "14.3.1", "version": "14.3.1+14E300c","symlinks": ["14.3"], "install_runtimes": "true", "sha256": "B5CC7BF37447C32A971B37D71C7DA1AF7ABB45CEE4B96FE126A1D3B0D2C260AF"} ] }, "arm64":{ "versions": [ + { "link": "15.2", "version": "15.2.0-Beta+15C5500c", "install_runtimes": "true", "sha256": "BA01241CF6F611163A1E594423AA4836C4B91A37E88CBFCB7B00E095697F5083"}, + { "link": "15.1", "version": "15.1.0+15C65", "install_runtimes": "true", "sha256": "857D8DB537BAC82BF99DE0E1D3895D214D4D02101C1340CEF3DAF6E821BA1D05"}, { "link": "15.0.1", "version": "15.0.1+15A507", "symlinks": ["15.0"], "install_runtimes": "true", "sha256": "5AC17AE6060CAFC3C7112C6DA0B153450BE21F1DE6632777FBA9FBC9D999C9E8"}, { "link": "14.3.1", "version": "14.3.1+14E300c","symlinks": ["14.3"], "install_runtimes": "true", "sha256": "B5CC7BF37447C32A971B37D71C7DA1AF7ABB45CEE4B96FE126A1D3B0D2C260AF"} ] From c46c9c7f7d3666b0992a62d00d0dc229dc90398a Mon Sep 17 00:00:00 2001 From: sergei-pyshnoi <121864472+sergei-pyshnoi@users.noreply.github.com> Date: Thu, 21 Dec 2023 19:57:37 +0100 Subject: [PATCH 2558/3485] [MacOS] Fix rules for screencapture (#9052) * fix rule for screen capture * Update configure-tccdb-macos.sh * rollback changes --- images/macos/scripts/build/configure-tccdb-macos.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/macos/scripts/build/configure-tccdb-macos.sh b/images/macos/scripts/build/configure-tccdb-macos.sh index dd2c9bb20cd9..66f04608279d 100644 --- a/images/macos/scripts/build/configure-tccdb-macos.sh +++ b/images/macos/scripts/build/configure-tccdb-macos.sh @@ -22,7 +22,7 @@ systemValuesArray=( "'kTCCServiceScreenCapture','/bin/bash',1,2,0,1,NULL,NULL,NULL,'UNUSED',NULL,0,1599831148" "'kTCCServiceScreenCapture','com.devexpress.testcafe-browser-tools',0,2,3,1,X'fade0c0000000068000000010000000700000007000000080000001443fa4ca5141baeda21aeca1f50894673b440d4690000000800000014f8afcf6e69791b283e55bd0b03e39e422745770e0000000800000014bf4fc1aed64c871a49fc6bc9dd3878ce5d4d17c6',NULL,0,'UNUSED',NULL,0,1687952810" "'kTCCServicePostEvent','/Library/Application Support/Veertu/Anka/addons/ankarund',1,2,4,1,NULL,NULL,0,'UNUSED',NULL,0,1644565949" - "'kTCCServiceScreenCapture','/usr/local/opt/runner/provisioner/provisioner',0,2,4,1,NULL,NULL,0,'UNUSED',NULL,0,1687786159" + "'kTCCServiceScreenCapture','/usr/local/opt/runner/provisioner/provisioner',1,2,4,1,NULL,NULL,0,'UNUSED',NULL,0,1687786159" "'kTCCServiceAppleEvents','/usr/local/opt/runner/provisioner/provisioner',1,2,3,1,NULL,NULL,0,'com.apple.finder',X'fade0c000000002c00000001000000060000000200000010636f6d2e6170706c652e66696e64657200000003',NULL,1592919552" "'kTCCServiceAccessibility','/usr/local/opt/runner/provisioner/provisioner',1,2,4,1,NULL,NULL,0,'UNUSED',NULL,NULL,1592919552" # Allow Full Disk Access for "Microsoft Defender for macOS" to bypass installation on-flight @@ -62,7 +62,7 @@ userValuesArray=( "'kTCCServiceAppleEvents','/usr/libexec/sshd-keygen-wrapper',1,2,3,1,X'fade0c000000003c0000000100000006000000020000001d636f6d2e6170706c652e737368642d6b657967656e2d7772617070657200000000000003',NULL,0,'com.apple.Terminal',X'fade0c000000003000000001000000060000000200000012636f6d2e6170706c652e5465726d696e616c000000000003',NULL,1650386089" "'kTCCServicePostEvent','/bin/bash',1,2,0,1,NULL,NULL,NULL,'UNUSED',NULL,0,1583997993" "'kTCCServiceAppleEvents','/usr/local/opt/runner/provisioner/provisioner',1,2,3,1,NULL,NULL,0,'com.apple.finder',X'fade0c000000002c00000001000000060000000200000010636f6d2e6170706c652e66696e64657200000003',NULL,1592919552" - "'kTCCServiceScreenCapture','/usr/local/opt/runner/provisioner/provisioner',0,2,4,1,NULL,NULL,0,'UNUSED',NULL,0,1687786159" + "'kTCCServiceScreenCapture','/usr/local/opt/runner/provisioner/provisioner',1,2,4,1,NULL,NULL,0,'UNUSED',NULL,0,1687786159" "'kTCCServiceAppleEvents','/usr/local/opt/runner/provisioner/provisioner',1,2,3,1,NULL,NULL,0,'com.apple.systemevents',X'fade0c000000003400000001000000060000000200000016636f6d2e6170706c652e73797374656d6576656e7473000000000003',NULL,1592919552" ) for values in "${userValuesArray[@]}"; do From 50c8126f76e62a075b0f371e230b4ab055804a52 Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Fri, 22 Dec 2023 10:12:43 +0100 Subject: [PATCH 2559/3485] [windows] Update signature for Edge Web Driver (#9056) --- images/windows/scripts/build/Install-EdgeDriver.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/windows/scripts/build/Install-EdgeDriver.ps1 b/images/windows/scripts/build/Install-EdgeDriver.ps1 index c81e77811aef..a8c54c35412f 100644 --- a/images/windows/scripts/build/Install-EdgeDriver.ps1 +++ b/images/windows/scripts/build/Install-EdgeDriver.ps1 @@ -27,7 +27,7 @@ Write-Host "Expand Microsoft Edge WebDriver archive..." Expand-7ZipArchive -Path $archivePath -DestinationPath $edgeDriverPath #Validate the EdgeDriver signature -$signatureThumbprint = "573EF451A68C33FB904346D44551BEF3BB5BBF68" +$signatureThumbprint = "CB9C4FBEA1D87D2D468AC5A9CAAB0163F6AD8401" Test-FileSignature -Path "$edgeDriverPath\msedgedriver.exe" -ExpectedThumbprint $signatureThumbprint Write-Host "Setting the environment variables..." From 08d10be70d3c2c3cc99b0dc4affd1981e6fafdc7 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 22 Dec 2023 16:30:48 +0100 Subject: [PATCH 2560/3485] Updating readme file for macos-13-arm64 version 20231218.3 (#9048) Co-authored-by: Image generation service account <no-reply@microsoft.com> --- images/macos/macos-13-arm64-Readme.md | 155 ++++++++++++++------------ 1 file changed, 84 insertions(+), 71 deletions(-) diff --git a/images/macos/macos-13-arm64-Readme.md b/images/macos/macos-13-arm64-Readme.md index 6508084feb3f..06872db3b4e1 100644 --- a/images/macos/macos-13-arm64-Readme.md +++ b/images/macos/macos-13-arm64-Readme.md @@ -1,13 +1,12 @@ | Announcements | |-| -| [[all OSs] Nodejs 14.x will be removed from the images on November, 26](https://github.com/actions/runner-images/issues/8779) | +| [Old versions of Android SDK & tools will be removed from images on January, 8](https://github.com/actions/runner-images/issues/8952) | | [Major Refactoring of GitHub Actions Runner Images Repository](https://github.com/actions/runner-images/issues/8706) | -| [[All OS] Android NDK r23 will be removed from images on November 13](https://github.com/actions/runner-images/issues/8383) | *** # macOS 13 -- OS Version: macOS 13.6.1 (22G313) +- OS Version: macOS 13.6.3 (22G436) - Kernel Version: Darwin 22.6.0 -- Image Version: 20231115.2 +- Image Version: 20231218.3 ## Installed Software @@ -23,70 +22,72 @@ - GNU Fortran 12 (Homebrew GCC 12.3.0) - available by `gfortran-12` alias - GNU Fortran 13 (Homebrew GCC 13.2.0) - available by `gfortran-13` alias - Julia 1.9.4 -- Kotlin 1.9.255-SNAPSHOT +- Kotlin 1.9.21-release-633 - Mono 6.12.0.188 -- Node.js 18.18.2 -- Perl 5.38.0 +- Node.js 18.19.0 +- Perl 5.38.2 - R 4.3.2 - Ruby 3.0.6p216 ### Package Management -- Bundler 2.4.22 +- Bundler 2.5.1 - Carthage 0.39.1 -- CocoaPods 1.14.2 -- Homebrew 4.1.20 -- NPM 9.8.1 +- CocoaPods 1.14.3 +- Homebrew 4.1.25 +- NPM 10.2.3 - NuGet 6.3.1.1 -- RubyGems 3.4.22 +- RubyGems 3.5.1 - Yarn 1.22.19 ### Project Management - Apache Ant 1.10.14 -- Apache Maven 3.9.5 -- Gradle 8.4 +- Apache Maven 3.9.6 +- Gradle 8.5 ### Utilities - 7-Zip 17.05 - aria2 1.37.0 - azcopy 10.21.2 -- bazel 6.4.0 -- bazelisk 1.18.0 +- bazel 7.0.0 +- bazelisk 1.19.0 - bsdtar 3.5.3 - available by 'tar' alias - Curl 8.1.2 -- Git 2.42.1 -- Git LFS 3.4.0 -- GitHub CLI 2.39.1 +- Git 2.43.0 +- Git LFS 3.4.1 +- GitHub CLI 2.40.1 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.21.4 - gpg (GnuPG) 2.4.3 -- jq 1.7 +- jq 1.7.1 - OpenSSL 1.1.1w 11 Sep 2023 - Packer 1.9.4 - pkg-config 0.29.2 -- yq 4.35.2 +- yq 4.40.5 - zstd 1.5.5 ### Tools -- AWS CLI 2.13.36 -- AWS SAM CLI 1.102.0 -- AWS Session Manager CLI 1.2.497.0 -- Azure CLI 2.54.0 +- AWS CLI 2.15.2 +- AWS SAM CLI 1.105.0 +- AWS Session Manager CLI 1.2.536.0 +- Azure CLI 2.55.0 - Azure CLI (azure-devops) 0.26.0 -- Bicep CLI 0.23.1 -- Cmake 3.27.7 -- CodeQL Action Bundle 2.15.2 +- Bicep CLI 0.24.24 +- Cmake 3.28.1 +- CodeQL Action Bundle 2.15.4 - Fastlane 2.217.0 -- SwiftFormat 0.52.9 -- Xcode Command Line Tools 15.0.0.0.1.1694021235 +- SwiftFormat 0.52.11 +- Xcbeautify 1.1.1 +- Xcode Command Line Tools 15.1.0.0.1.1700200546 +- Xcodes 1.4.1 ### Linters ### Browsers -- Safari 17.1 (18616.2.9.11.10) -- SafariDriver 17.1 (18616.2.9.11.10) -- Google Chrome 119.0.6045.159 -- Google Chrome for Testing 119.0.6045.105 -- ChromeDriver 119.0.6045.105 +- Safari 17.2 (18617.1.17.11.11) +- SafariDriver 17.2 (18617.1.17.11.11) +- Google Chrome 120.0.6099.109 +- Google Chrome for Testing 120.0.6099.71 +- ChromeDriver 120.0.6099.71 - Selenium server 4.15.0 #### Environment variables @@ -106,40 +107,41 @@ ### Cached Tools #### Python -- 3.11.6 -- 3.12.0 +- 3.11.7 +- 3.12.1 #### Node.js - 16.20.1 -- 18.18.2 -- 20.9.0 +- 18.19.0 +- 20.10.0 #### Go - 1.19.13 -- 1.20.11 -- 1.21.4 +- 1.20.12 +- 1.21.5 ### Rust Tools -- Cargo 1.73.0 -- Rust 1.73.0 -- Rustdoc 1.73.0 +- Cargo 1.74.1 +- Rust 1.74.1 +- Rustdoc 1.74.1 - Rustup 1.26.0 #### Packages -- Clippy 0.1.73 +- Clippy 0.1.74 - Rustfmt 1.6.0-stable ### PowerShell Tools -- PowerShell 7.2.16 +- PowerShell 7.2.17 #### PowerShell Modules -- Az: 11.0.0 +- Az: 11.1.0 - Pester: 5.5.0 - PSScriptAnalyzer: 1.21.0 ### Xcode | Version | Build | Path | | ---------------- | ------- | ------------------------------ | +| 15.1 | 15C65 | /Applications/Xcode_15.1.app | | 15.0.1 | 15A507 | /Applications/Xcode_15.0.1.app | | 14.3.1 (default) | 14E300c | /Applications/Xcode_14.3.1.app | | 14.2 | 14C18 | /Applications/Xcode_14.2.app | @@ -155,26 +157,33 @@ | macOS 13.1 | macosx13.1 | 14.2 | | macOS 13.3 | macosx13.3 | 14.3.1 | | macOS 14.0 | macosx14.0 | 15.0.1 | +| macOS 14.2 | macosx14.2 | 15.1 | | iOS 16.1 | iphoneos16.1 | 14.1 | | iOS 16.2 | iphoneos16.2 | 14.2 | | iOS 16.4 | iphoneos16.4 | 14.3.1 | | iOS 17.0 | iphoneos17.0 | 15.0.1 | +| iOS 17.2 | iphoneos17.2 | 15.1 | | Simulator - iOS 16.1 | iphonesimulator16.1 | 14.1 | | Simulator - iOS 16.2 | iphonesimulator16.2 | 14.2 | | Simulator - iOS 16.4 | iphonesimulator16.4 | 14.3.1 | | Simulator - iOS 17.0 | iphonesimulator17.0 | 15.0.1 | +| Simulator - iOS 17.2 | iphonesimulator17.2 | 15.1 | | tvOS 16.1 | appletvos16.1 | 14.1, 14.2 | | tvOS 16.4 | appletvos16.4 | 14.3.1 | | tvOS 17.0 | appletvos17.0 | 15.0.1 | +| tvOS 17.2 | appletvos17.2 | 15.1 | | Simulator - tvOS 16.1 | appletvsimulator16.1 | 14.1, 14.2 | | Simulator - tvOS 16.4 | appletvsimulator16.4 | 14.3.1 | | Simulator - tvOS 17.0 | appletvsimulator17.0 | 15.0.1 | +| Simulator - tvOS 17.2 | appletvsimulator17.2 | 15.1 | | watchOS 9.1 | watchos9.1 | 14.1, 14.2 | | watchOS 9.4 | watchos9.4 | 14.3.1 | | watchOS 10.0 | watchos10.0 | 15.0.1 | +| watchOS 10.2 | watchos10.2 | 15.1 | | Simulator - watchOS 9.1 | watchsimulator9.1 | 14.1, 14.2 | | Simulator - watchOS 9.4 | watchsimulator9.4 | 14.3.1 | | Simulator - watchOS 10.0 | watchsimulator10.0 | 15.0.1 | +| Simulator - watchOS 10.2 | watchsimulator10.2 | 15.1 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | @@ -182,34 +191,38 @@ | DriverKit 22.2 | driverkit22.2 | 14.2 | | DriverKit 22.4 | driverkit22.4 | 14.3.1 | | DriverKit 23.0 | driverkit23.0 | 15.0.1 | +| DriverKit 23.2 | driverkit23.2 | 15.1 | #### Installed Simulators -| OS | Xcode Version | Simulators | -| ------------ | -------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| iOS 16.1 | 14.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 16.2 | 14.2 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 16.4 | 14.3.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 17.0 | 14.1<br>14.2<br>14.3.1<br>15.0.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| tvOS 16.1 | 14.1<br>14.2<br>14.3.1<br>15.0.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 16.4 | 14.1<br>14.2<br>14.3.1<br>15.0.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 17.0 | 14.1<br>14.2<br>14.3.1<br>15.0.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| watchOS 9.1 | 14.1<br>14.2<br>14.3.1<br>15.0.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | -| watchOS 9.4 | 14.1<br>14.2<br>14.3.1<br>15.0.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | -| watchOS 10.0 | 14.1<br>14.2<br>14.3.1<br>15.0.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | +| OS | Xcode Version | Simulators | +| ------------ | ---------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| iOS 16.1 | 14.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 16.2 | 14.2 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 16.4 | 14.3.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 17.0 | 14.1<br>14.2<br>14.3.1<br>15.0.1<br>15.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 17.2 | 14.1<br>14.2<br>14.3.1<br>15.0.1<br>15.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| tvOS 16.1 | 14.1<br>14.2<br>14.3.1<br>15.0.1<br>15.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 16.4 | 14.1<br>14.2<br>14.3.1<br>15.0.1<br>15.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 17.0 | 14.1<br>14.2<br>14.3.1<br>15.0.1<br>15.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 17.2 | 14.1<br>14.2<br>14.3.1<br>15.0.1<br>15.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| watchOS 9.1 | 14.1<br>14.2<br>14.3.1<br>15.0.1<br>15.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | +| watchOS 9.4 | 14.1<br>14.2<br>14.3.1<br>15.0.1<br>15.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | +| watchOS 10.0 | 14.1<br>14.2<br>14.3.1<br>15.0.1<br>15.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 10.2 | 14.1<br>14.2<br>14.3.1<br>15.0.1<br>15.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | ### Android -| Package Name | Version | -| -------------------------- | ------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 11.0 | -| Android Emulator | 32.1.15 | -| Android SDK Build-tools | 34.0.0<br>33.0.2 | -| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34 (rev 2)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | -| Android SDK Platform-Tools | 34.0.5 | -| Android Support Repository | 47.0.0 | -| CMake | 3.22.1 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 24.0.8215888<br>25.2.9519653<br>26.1.10909125 (default) | +| Package Name | Version | +| -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 11.0 | +| Android Emulator | 33.1.23 | +| Android SDK Build-tools | 34.0.0<br>33.0.2 | +| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 2)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | +| Android SDK Platform-Tools | 34.0.5 | +| Android Support Repository | 47.0.0 | +| CMake | 3.22.1 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 24.0.8215888<br>25.2.9519653<br>26.1.10909125 (default) | #### Environment variables | Name | Value | From 694536d87fa61d2ae5c6224be6a4d512a26567fc Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Mon, 25 Dec 2023 19:47:58 +0100 Subject: [PATCH 2561/3485] [ubuntu] Refactor functions for GitHub assets and hashes (#9040) --- .../scripts/build/install-actions-cache.sh | 2 +- .../scripts/build/install-aliyun-cli.sh | 2 +- .../ubuntu/scripts/build/install-aws-tools.sh | 5 +- images/ubuntu/scripts/build/install-cmake.sh | 2 +- images/ubuntu/scripts/build/install-docker.sh | 8 +- .../scripts/build/install-github-cli.sh | 6 +- images/ubuntu/scripts/build/install-kotlin.sh | 4 +- .../scripts/build/install-kubernetes-tools.sh | 6 +- .../ubuntu/scripts/build/install-oras-cli.sh | 4 +- images/ubuntu/scripts/build/install-pulumi.sh | 2 +- .../scripts/build/install-runner-package.sh | 2 +- .../ubuntu/scripts/build/install-selenium.sh | 2 +- images/ubuntu/scripts/build/install-yq.sh | 2 +- images/ubuntu/scripts/build/install-zstd.sh | 2 +- images/ubuntu/scripts/helpers/install.sh | 190 +++++++++++------- 15 files changed, 137 insertions(+), 102 deletions(-) diff --git a/images/ubuntu/scripts/build/install-actions-cache.sh b/images/ubuntu/scripts/build/install-actions-cache.sh index 1761c8a0b167..3adfaa177843 100644 --- a/images/ubuntu/scripts/build/install-actions-cache.sh +++ b/images/ubuntu/scripts/build/install-actions-cache.sh @@ -17,7 +17,7 @@ echo "Setting up ACTIONS_RUNNER_ACTION_ARCHIVE_CACHE variable to ${ACTION_ARCHIV setEtcEnvironmentVariable "ACTIONS_RUNNER_ACTION_ARCHIVE_CACHE" "${ACTION_ARCHIVE_CACHE_DIR}" # Download latest release from github.com/actions/action-versions and untar to /opt/actionarchivecache -downloadUrl=$(resolve_github_release_asset_url "actions/action-versions" "contains(\"action-versions.tar.gz\")" "latest") +downloadUrl=$(resolve_github_release_asset_url "actions/action-versions" "endswith(\"action-versions.tar.gz\")" "latest") archive_path=$(download_with_retry "$downloadUrl") tar -xzf "$archive_path" -C $ACTION_ARCHIVE_CACHE_DIR diff --git a/images/ubuntu/scripts/build/install-aliyun-cli.sh b/images/ubuntu/scripts/build/install-aliyun-cli.sh index 2603ae3d54af..fd9414606574 100644 --- a/images/ubuntu/scripts/build/install-aliyun-cli.sh +++ b/images/ubuntu/scripts/build/install-aliyun-cli.sh @@ -25,7 +25,7 @@ archive_path=$(download_with_retry "$download_url") if isUbuntu20; then external_hash=$(get_toolset_value '.aliyunCli.sha256') else - external_hash=$(get_hash_from_remote_file "$hash_url" "aliyun-cli-linux" "amd64.tgz") + external_hash=$(get_checksum_from_url "$hash_url" "aliyun-cli-linux.*amd64.tgz" "SHA256") fi use_checksum_comparison "$archive_path" "$external_hash" diff --git a/images/ubuntu/scripts/build/install-aws-tools.sh b/images/ubuntu/scripts/build/install-aws-tools.sh index be2980538ffe..78b13d6b6928 100644 --- a/images/ubuntu/scripts/build/install-aws-tools.sh +++ b/images/ubuntu/scripts/build/install-aws-tools.sh @@ -18,10 +18,11 @@ apt install "$smplugin_deb_path" # Download the latest aws sam cli release aws_sam_cli_archive_name="aws-sam-cli-linux-x86_64.zip" -aws_sam_cli_archive_path=$(download_with_retry "https://github.com/aws/aws-sam-cli/releases/latest/download/${aws_sam_cli_archive_name}") +sam_cli_download_url=$(resolve_github_release_asset_url "aws/aws-sam-cli" "endswith(\"$aws_sam_cli_archive_name\")" "latest") +aws_sam_cli_archive_path=$(download_with_retry "$sam_cli_download_url") # Supply chain security - AWS SAM CLI -aws_sam_cli_hash=$(get_github_package_hash "aws" "aws-sam-cli" "${aws_sam_cli_archive_name}.. ") +aws_sam_cli_hash=$(get_checksum_from_github_release "aws/aws-sam-cli" "${aws_sam_cli_archive_name}.. " "latest" "SHA256") use_checksum_comparison "$aws_sam_cli_archive_path" "$aws_sam_cli_hash" # Install the latest aws sam cli release diff --git a/images/ubuntu/scripts/build/install-cmake.sh b/images/ubuntu/scripts/build/install-cmake.sh index 373388bca6f5..249f905e1483 100644 --- a/images/ubuntu/scripts/build/install-cmake.sh +++ b/images/ubuntu/scripts/build/install-cmake.sh @@ -18,7 +18,7 @@ else curl -fsSL "${download_url}" -o cmakeinstall.sh # Supply chain security - CMake hash_url=$(resolve_github_release_asset_url "Kitware/CMake" "endswith(\"SHA-256.txt\")" "latest") - external_hash=$(get_hash_from_remote_file "$hash_url" "linux-x86_64.sh") + external_hash=$(get_checksum_from_url "$hash_url" "linux-x86_64.sh" "SHA256") use_checksum_comparison "cmakeinstall.sh" "$external_hash" # Install CMake and remove the install script chmod +x cmakeinstall.sh \ diff --git a/images/ubuntu/scripts/build/install-docker.sh b/images/ubuntu/scripts/build/install-docker.sh index 967dd3567545..e03e4d520d70 100644 --- a/images/ubuntu/scripts/build/install-docker.sh +++ b/images/ubuntu/scripts/build/install-docker.sh @@ -19,11 +19,11 @@ apt-get update apt-get install --no-install-recommends docker-ce docker-ce-cli containerd.io docker-buildx-plugin # Download docker compose v2 from releases -URL=$(resolve_github_release_asset_url "docker/compose" "contains(\"compose-linux-x86_64\")" "latest") +URL=$(resolve_github_release_asset_url "docker/compose" "endswith(\"compose-linux-x86_64\")" "latest") curl -fsSL "${URL}" -o /tmp/docker-compose # Supply chain security - Docker Compose v2 -compose_hash_url=$(resolve_github_release_asset_url "docker/compose" "contains(\"checksums.txt\")" "latest") -compose_external_hash=$(get_hash_from_remote_file "${compose_hash_url}" "compose-linux-x86_64") +compose_hash_url=$(resolve_github_release_asset_url "docker/compose" "endswith(\"checksums.txt\")" "latest") +compose_external_hash=$(get_checksum_from_url "${compose_hash_url}" "compose-linux-x86_64" "SHA256") use_checksum_comparison "/tmp/docker-compose" "${compose_external_hash}" # Install docker compose v2 install /tmp/docker-compose /usr/libexec/docker/cli-plugins/docker-compose @@ -68,7 +68,7 @@ aws_latest_release_url="https://api.github.com/repos/awslabs/amazon-ecr-credenti aws_helper_url=$(curl "${authString[@]}" -fsSL "${aws_latest_release_url}" | jq -r '.body' | awk -F'[()]' '/linux-amd64/ {print $2}') aws_helper_binary_path=$(download_with_retry "$aws_helper_url") # Supply chain security - amazon-ecr-credential-helper -aws_helper_external_hash=$(get_hash_from_remote_file "${aws_helper_url}.sha256" "docker-credential-ecr-login") +aws_helper_external_hash=$(get_checksum_from_url "${aws_helper_url}.sha256" "docker-credential-ecr-login" "SHA256") use_checksum_comparison "$aws_helper_binary_path" "$aws_helper_external_hash" # Install amazon-ecr-credential-helper install "$aws_helper_binary_path" "/usr/bin/docker-credential-ecr-login" diff --git a/images/ubuntu/scripts/build/install-github-cli.sh b/images/ubuntu/scripts/build/install-github-cli.sh index dc14febaa18e..b38844756e96 100644 --- a/images/ubuntu/scripts/build/install-github-cli.sh +++ b/images/ubuntu/scripts/build/install-github-cli.sh @@ -10,11 +10,11 @@ source $HELPER_SCRIPTS/install.sh # Download GitHub CLI -gh_cli_url=$(resolve_github_release_asset_url "cli/cli" "contains(\"linux\") and contains(\"amd64\") and contains(\".deb\")" "latest") +gh_cli_url=$(resolve_github_release_asset_url "cli/cli" "contains(\"linux\") and contains(\"amd64\") and endswith(\".deb\")" "latest") gh_cli_deb_path=$(download_with_retry "$gh_cli_url") # Supply chain security - GitHub CLI -hash_url=$(resolve_github_release_asset_url "cli/cli" "contains(\"checksums.txt\")" "latest") -external_hash=$(get_hash_from_remote_file "$hash_url" "linux_amd64.deb") +hash_url=$(resolve_github_release_asset_url "cli/cli" "endswith(\"checksums.txt\")" "latest") +external_hash=$(get_checksum_from_url "$hash_url" "linux_amd64.deb" "SHA256") use_checksum_comparison "$gh_cli_deb_path" "$external_hash" # Install GitHub CLI apt install "$gh_cli_deb_path" diff --git a/images/ubuntu/scripts/build/install-kotlin.sh b/images/ubuntu/scripts/build/install-kotlin.sh index 3b144443a7c3..2b7d2367e671 100644 --- a/images/ubuntu/scripts/build/install-kotlin.sh +++ b/images/ubuntu/scripts/build/install-kotlin.sh @@ -8,11 +8,11 @@ source $HELPER_SCRIPTS/install.sh KOTLIN_ROOT="/usr/share" -download_url=$(resolve_github_release_asset_url "JetBrains/kotlin" "contains(\"kotlin-compiler\")" "latest") +download_url=$(resolve_github_release_asset_url "JetBrains/kotlin" "contains(\"kotlin-compiler\") and endswith(\".zip\")" "latest") archive_path=$(download_with_retry "$download_url") # Supply chain security - Kotlin -kotlin_hash=$(get_github_package_hash "JetBrains" "kotlin" "kotlin-compiler-.*\.zip" "" "latest" "false" "|" 3) +kotlin_hash=$(get_checksum_from_github_release "JetBrains/kotlin" "kotlin-compiler-.*\.zip" "latest" "SHA256") use_checksum_comparison "$archive_path" "$kotlin_hash" unzip -qq "$archive_path" -d $KOTLIN_ROOT diff --git a/images/ubuntu/scripts/build/install-kubernetes-tools.sh b/images/ubuntu/scripts/build/install-kubernetes-tools.sh index 03383065c908..50c36bd11c46 100644 --- a/images/ubuntu/scripts/build/install-kubernetes-tools.sh +++ b/images/ubuntu/scripts/build/install-kubernetes-tools.sh @@ -9,10 +9,10 @@ source $HELPER_SCRIPTS/install.sh # Download KIND -kind_url=$(resolve_github_release_asset_url "kubernetes-sigs/kind" "contains(\"kind-linux-amd64\")" "latest") +kind_url=$(resolve_github_release_asset_url "kubernetes-sigs/kind" "endswith(\"kind-linux-amd64\")" "latest") curl -fsSL -o /tmp/kind "${kind_url}" # Supply chain security - KIND -kind_external_hash=$(get_hash_from_remote_file "${kind_url}.sha256sum" "kind-linux-amd64") +kind_external_hash=$(get_checksum_from_url "${kind_url}.sha256sum" "kind-linux-amd64" "SHA256") use_checksum_comparison "/tmp/kind" "${kind_external_hash}" # Install KIND sudo install /tmp/kind /usr/local/bin/kind @@ -30,7 +30,7 @@ curl -fsSL https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3 # Download minikube curl -fsSL -O https://storage.googleapis.com/minikube/releases/latest/minikube-linux-amd64 # Supply chain security - minikube -minikube_hash=$(get_github_package_hash "kubernetes" "minikube" "linux-amd64" "" "latest" "false" ":" 2) +minikube_hash=$(get_checksum_from_github_release "kubernetes/minikube" "linux-amd64" "latest" "SHA256") use_checksum_comparison "minikube-linux-amd64" "${minikube_hash}" # Install minikube sudo install minikube-linux-amd64 /usr/local/bin/minikube diff --git a/images/ubuntu/scripts/build/install-oras-cli.sh b/images/ubuntu/scripts/build/install-oras-cli.sh index 43cfefc933d2..cf01267056a2 100644 --- a/images/ubuntu/scripts/build/install-oras-cli.sh +++ b/images/ubuntu/scripts/build/install-oras-cli.sh @@ -14,8 +14,8 @@ download_url=$(resolve_github_release_asset_url "oras-project/oras" "endswith(\" archive_path=$(download_with_retry "$download_url") # Supply chain security - ORAS CLI -hash_url=$(resolve_github_release_asset_url "oras-project/oras" "contains(\"checksums.txt\")" "latest") -external_hash=$(get_hash_from_remote_file "${hash_url}" "linux_amd64.tar.gz") +hash_url=$(resolve_github_release_asset_url "oras-project/oras" "endswith(\"checksums.txt\")" "latest") +external_hash=$(get_checksum_from_url "${hash_url}" "linux_amd64.tar.gz" "SHA256") use_checksum_comparison "$archive_path" "${external_hash}" # Unzip ORAS CLI diff --git a/images/ubuntu/scripts/build/install-pulumi.sh b/images/ubuntu/scripts/build/install-pulumi.sh index 33d4d9533aac..9310466f75b9 100644 --- a/images/ubuntu/scripts/build/install-pulumi.sh +++ b/images/ubuntu/scripts/build/install-pulumi.sh @@ -14,7 +14,7 @@ download_url="https://get.pulumi.com/releases/sdk/pulumi-v${version}-linux-x64.t archive_path=$(download_with_retry "$download_url") # Supply chain security - Pulumi -external_hash=$(get_hash_from_remote_file "https://github.com/pulumi/pulumi/releases/download/v${version}/SHA512SUMS" "linux-x64.tar.gz") +external_hash=$(get_checksum_from_url "https://github.com/pulumi/pulumi/releases/download/v${version}/SHA512SUMS" "linux-x64.tar.gz" "SHA512") use_checksum_comparison "$archive_path" "$external_hash" "512" # Unzipping Pulumi diff --git a/images/ubuntu/scripts/build/install-runner-package.sh b/images/ubuntu/scripts/build/install-runner-package.sh index b18fdbc4931a..019689ee408c 100644 --- a/images/ubuntu/scripts/build/install-runner-package.sh +++ b/images/ubuntu/scripts/build/install-runner-package.sh @@ -7,7 +7,7 @@ # Source the helpers for use with the script source $HELPER_SCRIPTS/install.sh -download_url=$(resolve_github_release_asset_url "actions/runner" 'test("actions-runner-linux-x64-[0-9]+\\.[0-9]{3}\\.[0-9]+\\.tar\\.gz")' "latest") +download_url=$(resolve_github_release_asset_url "actions/runner" 'test("actions-runner-linux-x64-[0-9]+\\.[0-9]{3}\\.[0-9]+\\.tar\\.gz$")' "latest") archive_name="${download_url##*/}" archive_path=$(download_with_retry "$download_url") diff --git a/images/ubuntu/scripts/build/install-selenium.sh b/images/ubuntu/scripts/build/install-selenium.sh index fa30d5e7dc14..1a18510fb796 100644 --- a/images/ubuntu/scripts/build/install-selenium.sh +++ b/images/ubuntu/scripts/build/install-selenium.sh @@ -11,7 +11,7 @@ source $HELPER_SCRIPTS/etc-environment.sh SELENIUM_MAJOR_VERSION=$(get_toolset_value '.selenium.version') # Download Selenium server -SELENIUM_DOWNLOAD_URL=$(resolve_github_release_asset_url "SeleniumHQ/selenium" "contains(\"selenium-server-\") and endswith(\".jar\")" "$SELENIUM_MAJOR_VERSION\.*") +SELENIUM_DOWNLOAD_URL=$(resolve_github_release_asset_url "SeleniumHQ/selenium" "contains(\"selenium-server-\") and endswith(\".jar\")" "$SELENIUM_MAJOR_VERSION\.+" "" "true") SELENIUM_JAR_PATH=$(download_with_retry "$SELENIUM_DOWNLOAD_URL" "/usr/share/java/selenium-server.jar") # Create an epmty file to retrive selenium version diff --git a/images/ubuntu/scripts/build/install-yq.sh b/images/ubuntu/scripts/build/install-yq.sh index f4f26dce8524..07a192651212 100644 --- a/images/ubuntu/scripts/build/install-yq.sh +++ b/images/ubuntu/scripts/build/install-yq.sh @@ -13,7 +13,7 @@ base_url="https://github.com/mikefarah/yq/releases/latest/download" binary_path=$(download_with_retry "${base_url}/yq_linux_amd64") # Supply chain security - yq -external_hash=$(get_hash_from_remote_file "${base_url}/checksums" "yq_linux_amd64 " "" " " "19") +external_hash=$(get_checksum_from_url "${base_url}/checksums" "yq_linux_amd64 " "SHA256" "true" " " "19") use_checksum_comparison "$binary_path" "$external_hash" # Install yq diff --git a/images/ubuntu/scripts/build/install-zstd.sh b/images/ubuntu/scripts/build/install-zstd.sh index 5f4db375f9fd..84d5932ddb99 100644 --- a/images/ubuntu/scripts/build/install-zstd.sh +++ b/images/ubuntu/scripts/build/install-zstd.sh @@ -15,7 +15,7 @@ download_url="https://github.com/facebook/zstd/releases/download/${release_tag}/ archive_path=$(download_with_retry "${download_url}") # Supply chain security - zstd -external_hash=$(get_hash_from_remote_file "${download_url}.sha256" "${release_name}.tar.gz") +external_hash=$(get_checksum_from_url "${download_url}.sha256" "${release_name}.tar.gz" "SHA256") use_checksum_comparison "$archive_path" "$external_hash" # Install zstd diff --git a/images/ubuntu/scripts/helpers/install.sh b/images/ubuntu/scripts/helpers/install.sh index 68df9f68d6a5..40a0b816199b 100644 --- a/images/ubuntu/scripts/helpers/install.sh +++ b/images/ubuntu/scripts/helpers/install.sh @@ -61,137 +61,171 @@ get_toolset_value() { echo "$(jq -r "$query" $toolset_path)" } -resolve_github_release_asset_url() { +get_github_releases_by_version() { local repo=$1 - local filter=$2 - local version=${3:-"*"} - local allow_pre_release=${4:-false} + local version=${2:-".+"} + local allow_pre_release=${3:-false} + local with_assets_only=${4:-false} page_size="100" json=$(curl -fsSL "https://api.github.com/repos/${repo}/releases?per_page=${page_size}") - if [[ $allow_pre_release == "true" ]]; then + if [[ -z "$json" ]]; then + echo "Failed to get releases" + exit 1 + fi + + if [[ $with_assets_only == "true" ]]; then json=$(echo $json | jq -r '.[] | select(.assets | length > 0)') else - json=$(echo $json | jq -r '.[] | select((.prerelease==false) and (.assets | length > 0))') + json=$(echo $json | jq -r '.[]') fi - if [[ $version == "latest" ]]; then - tag_name=$(echo $json | jq -r '.tag_name' | sort --unique --version-sort | egrep -v ".*-[a-z]|beta" | tail -n 1) - elif [[ $version == *"*"* ]]; then - tag_name=$(echo $json | jq -r '.tag_name' | sort --unique --version-sort | egrep -v ".*-[a-z]|beta" | egrep "${version}" | tail -n 1) + if [[ $allow_pre_release == "true" ]]; then + json=$(echo $json | jq -r '.') else - tag_names=$(echo $json | jq -r '.tag_name' | sort --unique --version-sort | egrep -v ".*-[a-z]|beta" | egrep "${version}") + json=$(echo $json | jq -r '. | select(.prerelease==false)') + fi - for element in $tag_names; do - semver=$(echo "$element" | awk 'match($0, /[0-9]+\.[0-9]+\.[0-9]+/) {print substr($0, RSTART, RLENGTH)}') + # Filter out rc/beta/etc releases, convert to numeric version and sort + json=$(echo $json | jq '. | select(.tag_name | test(".*-[a-z]|beta") | not)' | jq '.tag_name |= gsub("[^\\d.]"; "")' | jq -s 'sort_by(.tag_name | split(".") | map(tonumber))') - if [[ $semver == $version ]]; then - tag_name=$element - fi - done + # Select releases matching version + if [[ $version == "latest" ]]; then + json_filtered=$(echo $json | jq .[-1]) + elif [[ $version == *"+"* ]] || [[ $version == *"*"* ]]; then + json_filtered=$(echo $json | jq --arg version $version '.[] | select(.tag_name | test($version))') + else + json_filtered=$(echo $json | jq --arg version $version '.[] | select(.tag_name | contains($version))') fi - download_url=$(echo $json | jq -r ". | select(.tag_name==\"${tag_name}\").assets[].browser_download_url | select(${filter})" | head -n 1) - if [ -z "$download_url" ]; then - echo "Failed to parse a download url for the '${tag_name}' tag using '${filter}' filter" + if [[ -z "$json_filtered" ]]; then + echo "Failed to get releases from ${repo} matching version ${version}" + echo "Available versions: $(echo "$json" | jq -r '.tag_name')" exit 1 fi - echo $download_url + echo $json_filtered } -get_github_package_hash() { - local repo_owner=$1 - local repo_name=$2 - local file_name=$3 - local url=$4 - local version=${5:-"latest"} - local prerelease=${6:-false} - local delimiter=${7:-'|'} - local word_number=${8:-2} +resolve_github_release_asset_url() { + local repo=$1 + local url_filter=$2 + local version=${3:-".+"} + local allow_pre_release=${4:-false} + local allow_multiple_matches=${5:-false} + + matching_releases=$(get_github_releases_by_version "${repo}" "${version}" "${allow_pre_release}" "true") + matched_url=$(echo $matching_releases | jq -r ".assets[].browser_download_url | select(${url_filter})") + + if [[ -z "$matched_url" ]]; then + echo "Found no download urls matching pattern: ${url_filter}" + echo "Available download urls: $(echo "$matching_releases" | jq -r '.assets[].browser_download_url')" + exit 1 + fi + + if [[ "$(echo "$matched_url" | wc -l)" -gt 1 ]]; then + if [[ $allow_multiple_matches == "true" ]]; then + matched_url=$(echo "$matched_url" | tail -n 1) + else + echo "Multiple matches found for ${version} version and ${url_filter} URL filter. Please make filters more specific" + exit 1 + fi + fi + + echo $matched_url +} + +get_checksum_from_github_release() { + local repo=$1 + local file_name=$2 + local version=${3:-".+"} + local hash_type=$4 + local allow_pre_release=${5:-false} if [[ -z "$file_name" ]]; then echo "File name is not specified." exit 1 fi - if [[ -n "$url" ]]; then - release_url="$url" + if [[ "$hash_type" == "SHA256" ]]; then + hash_pattern="[A-Fa-f0-9]{64}" + elif [[ "$hash_type" == "SHA512" ]]; then + hash_pattern="[A-Fa-f0-9]{128}" else - if [ "$version" == "latest" ]; then - release_url="https://api.github.com/repos/${repo_owner}/${repo_name}/releases/latest" - else - json=$(curl -fsSL "https://api.github.com/repos/${repo_owner}/${repo_name}/releases?per_page=100") - tags=$(echo "$json" | jq -r --arg prerelease "$prerelease" '.[] | select(.prerelease == ($prerelease | test("true"; "i"))) | .tag_name') - tag=$(echo "$tags" | grep -o "$version") - if [[ "$(echo "$tag" | wc -l)" -gt 1 ]]; then - echo "Multiple tags found matching the version $version. Please specify a more specific version." - exit 1 - fi - if [[ -z "$tag" ]]; then - echo "Failed to get a tag name for version $version." - exit 1 - fi - release_url="https://api.github.com/repos/${repo_owner}/${repo_name}/releases/tags/$tag" - fi + echo "Unknown hash type: ${hash_type}" + exit 1 fi - body=$(curl -fsSL "$release_url" | jq -r '.body' | tr -d '`') - matching_line=$(echo "$body" | grep "$file_name") - if [[ "$(echo "$matching_line" | wc -l)" -gt 1 ]]; then - echo "Multiple lines found included the file $file_name. Please specify a more specific file name." + matching_releases=$(get_github_releases_by_version "${repo}" "${version}" "${allow_pre_release}" "true") + matched_line=$(printf "$(echo $matching_releases | jq '.body')\n" | grep "$file_name") + + if [[ -z "$matched_line" ]]; then + echo "File name ${file_name} not found in release body" exit 1 fi - if [[ -z "$matching_line" ]]; then - echo "File name '$file_name' not found in release body." + + if [[ "$(echo "$matched_line" | wc -l)" -gt 1 ]]; then + echo "Multiple matches found for ${file_name} in release body: ${matched_line}" exit 1 fi - result=$(echo "$matching_line" | cut -d "$delimiter" -f "$word_number" | tr -d -c '[:alnum:]') - if [[ -z "$result" ]]; then - echo "Empty result. Check parameters delimiter and/or word_number for the matching line." + hash=$(echo $matched_line | grep -oP "$hash_pattern") + + if [[ -z "$hash" ]]; then + echo "Found ${file_name} in body of release, but failed to get hash from it: ${matched_line}" exit 1 fi - echo "$result" + echo "$hash" } -get_hash_from_remote_file() { +get_checksum_from_url() { local url=$1 - local keywords=("$2" "$3") - local delimiter=${4:-' '} - local word_number=${5:-1} - - if [[ -z "${keywords[0]}" || -z "$url" ]]; then - echo "File name and/or URL is not specified." + local file_name=$2 + local hash_type=$3 + local use_custom_search_pattern=${4:-false} + local delimiter=${5:-' '} + local word_number=${6:-1} + + if [[ "$hash_type" == "SHA256" ]]; then + hash_pattern="[A-Fa-f0-9]{64}" + elif [[ "$hash_type" == "SHA512" ]]; then + hash_pattern="[A-Fa-f0-9]{128}" + else + echo "Unknown hash type: ${hash_type}" exit 1 fi - matching_line=$(curl -fsSL "$url" | sed 's/ */ /g' | tr -d '`') - for keyword in "${keywords[@]}"; do - matching_line=$(echo "$matching_line" | grep "$keyword") - done + checksums_file_path=$(download_with_retry "$url") + checksums=$(cat "$checksums_file_path") + rm "$checksums_file_path" + + matched_line=$(printf "$checksums\n" | grep "$file_name") - if [[ "$(echo "$matching_line" | wc -l)" -gt 1 ]]; then - echo "Multiple lines found including the words: ${keywords[*]}. Please use a more specific filter." + if [[ "$(echo "$matched_line" | wc -l)" -gt 1 ]]; then + echo "Found multiple lines matching file name ${file_name} in checksum file." exit 1 fi - if [[ -z "$matching_line" ]]; then - echo "Keywords (${keywords[*]}) not found in the file with hashes." + if [[ -z "$matched_line" ]]; then + echo "File name ${file_name} not found in checksum file." exit 1 fi - result=$(echo "$matching_line" | cut -d "$delimiter" -f "$word_number" | tr -d -c '[:alnum:]') - if [[ ${#result} -ne 64 && ${#result} -ne 128 ]]; then - echo "Invalid result length. Expected 64 or 128 characters. Please check delimiter and/or word_number parameters." - echo "Result: $result" + if [[ $use_custom_search_pattern == "true" ]]; then + hash=$(echo "$matched_line" | sed 's/ */ /g' | cut -d "$delimiter" -f "$word_number" | tr -d -c '[:alnum:]') + else + hash=$(echo $matched_line | grep -oP "$hash_pattern") + fi + + if [[ -z "$hash" ]]; then + echo "Found ${file_name} in checksum file, but failed to get hash from it: ${matched_line}" exit 1 fi - echo "$result" + echo "$hash" } use_checksum_comparison() { From d16bc5f12076ec3a408f531ea7e59c3682a09c8f Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Tue, 26 Dec 2023 11:26:20 +0100 Subject: [PATCH 2562/3485] Fix SBOM workflow first step name (#9065) --- .github/workflows/create_sbom_report.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/create_sbom_report.yml b/.github/workflows/create_sbom_report.yml index 54b34b06d2aa..be9b8642ae1d 100644 --- a/.github/workflows/create_sbom_report.yml +++ b/.github/workflows/create_sbom_report.yml @@ -20,7 +20,7 @@ jobs: check_status: ${{ steps.check.outputs.status }} runs-on: ubuntu-latest steps: - - name: Check release + - name: Check release for ${{ github.event.client_payload.ReleaseBranchName }} id: check shell: pwsh run: | From 503ae89818e7a31cd6d2c309df6653af2c75ce3e Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Tue, 26 Dec 2023 12:50:52 +0100 Subject: [PATCH 2563/3485] [ubuntu] Refactor bash functions (#9055) --- images/ubuntu/scripts/build/configure-dpkg.sh | 2 +- .../scripts/build/configure-environment.sh | 12 +-- images/ubuntu/scripts/build/configure-snap.sh | 2 +- .../ubuntu/scripts/build/configure-system.sh | 2 +- .../scripts/build/install-actions-cache.sh | 2 +- .../scripts/build/install-aliyun-cli.sh | 4 +- .../scripts/build/install-android-sdk.sh | 14 ++-- .../scripts/build/install-azure-devops-cli.sh | 2 +- images/ubuntu/scripts/build/install-clang.sh | 10 +-- .../scripts/build/install-container-tools.sh | 6 +- images/ubuntu/scripts/build/install-docker.sh | 2 +- .../scripts/build/install-dotnetcore-sdk.sh | 10 +-- .../ubuntu/scripts/build/install-firefox.sh | 4 +- .../scripts/build/install-gcc-compilers.sh | 10 +-- .../ubuntu/scripts/build/install-gfortran.sh | 13 +--- .../scripts/build/install-google-chrome.sh | 26 ++++--- .../ubuntu/scripts/build/install-haskell.sh | 6 +- .../ubuntu/scripts/build/install-homebrew.sh | 6 +- .../scripts/build/install-java-tools.sh | 78 +++++++++---------- .../ubuntu/scripts/build/install-leiningen.sh | 4 +- .../scripts/build/install-microsoft-edge.sh | 2 +- .../ubuntu/scripts/build/install-miniconda.sh | 2 +- .../ubuntu/scripts/build/install-mongodb.sh | 2 +- images/ubuntu/scripts/build/install-mono.sh | 2 +- images/ubuntu/scripts/build/install-nvm.sh | 2 +- images/ubuntu/scripts/build/install-php.sh | 6 +- .../scripts/build/install-postgresql.sh | 2 +- images/ubuntu/scripts/build/install-pypy.sh | 73 +++++++++-------- images/ubuntu/scripts/build/install-python.sh | 8 +- images/ubuntu/scripts/build/install-rlang.sh | 2 +- images/ubuntu/scripts/build/install-rust.sh | 4 +- .../ubuntu/scripts/build/install-selenium.sh | 2 +- .../scripts/build/install-sqlpackage.sh | 2 +- images/ubuntu/scripts/build/install-swift.sh | 2 +- images/ubuntu/scripts/build/install-vcpkg.sh | 2 +- .../ubuntu/scripts/helpers/etc-environment.sh | 65 ++++++++-------- images/ubuntu/scripts/helpers/install.sh | 13 +--- images/ubuntu/scripts/helpers/os.sh | 9 +-- 38 files changed, 191 insertions(+), 224 deletions(-) diff --git a/images/ubuntu/scripts/build/configure-dpkg.sh b/images/ubuntu/scripts/build/configure-dpkg.sh index 7f9f19e2f6ab..28e00c381f58 100644 --- a/images/ubuntu/scripts/build/configure-dpkg.sh +++ b/images/ubuntu/scripts/build/configure-dpkg.sh @@ -14,7 +14,7 @@ source $HELPER_SCRIPTS/etc-environment.sh # automatic installs. If you are using this front-end, and require # non-default answers to questions, you will need to preseed the # debconf database -setEtcEnvironmentVariable "DEBIAN_FRONTEND" "noninteractive" +set_etc_environment_variable "DEBIAN_FRONTEND" "noninteractive" # dpkg can be instructed not to ask for confirmation # when replacing a configuration file (with the --force-confdef --force-confold options) diff --git a/images/ubuntu/scripts/build/configure-environment.sh b/images/ubuntu/scripts/build/configure-environment.sh index fe2a5d3d4a89..dbf93999d4ae 100644 --- a/images/ubuntu/scripts/build/configure-environment.sh +++ b/images/ubuntu/scripts/build/configure-environment.sh @@ -9,15 +9,15 @@ source $HELPER_SCRIPTS/os.sh source $HELPER_SCRIPTS/etc-environment.sh # Set ImageVersion and ImageOS env variables -setEtcEnvironmentVariable "ImageVersion" "${IMAGE_VERSION}" -setEtcEnvironmentVariable "ImageOS" "${IMAGE_OS}" +set_etc_environment_variable "ImageVersion" "${IMAGE_VERSION}" +set_etc_environment_variable "ImageOS" "${IMAGE_OS}" # Set the ACCEPT_EULA variable to Y value to confirm your acceptance of the End-User Licensing Agreement -setEtcEnvironmentVariable "ACCEPT_EULA" "Y" +set_etc_environment_variable "ACCEPT_EULA" "Y" # This directory is supposed to be created in $HOME and owned by user(https://github.com/actions/runner-images/issues/491) mkdir -p /etc/skel/.config/configstore -setEtcEnvironmentVariable "XDG_CONFIG_HOME" '$HOME/.config' +set_etc_environment_variable "XDG_CONFIG_HOME" '$HOME/.config' # Change waagent entries to use /mnt for swapfile sed -i 's/ResourceDisk.Format=n/ResourceDisk.Format=y/g' /etc/waagent.conf @@ -30,7 +30,7 @@ sed -i 's/::1 ip6-localhost ip6-loopback/::1 localhost ip6-localhost ip6-loo # Prepare directory and env variable for toolcache AGENT_TOOLSDIRECTORY=/opt/hostedtoolcache mkdir $AGENT_TOOLSDIRECTORY -setEtcEnvironmentVariable "AGENT_TOOLSDIRECTORY" "${AGENT_TOOLSDIRECTORY}" +set_etc_environment_variable "AGENT_TOOLSDIRECTORY" "${AGENT_TOOLSDIRECTORY}" chmod -R 777 $AGENT_TOOLSDIRECTORY # https://www.elastic.co/guide/en/elasticsearch/reference/current/vm-max-map-count.html @@ -62,6 +62,6 @@ fi # Disable to load providers # https://github.com/microsoft/azure-pipelines-agent/issues/3834 -if isUbuntu22; then +if is_ubuntu22; then sed -i 's/openssl_conf = openssl_init/#openssl_conf = openssl_init/g' /etc/ssl/openssl.cnf fi diff --git a/images/ubuntu/scripts/build/configure-snap.sh b/images/ubuntu/scripts/build/configure-snap.sh index aa0de806494d..a08f3e4556b2 100644 --- a/images/ubuntu/scripts/build/configure-snap.sh +++ b/images/ubuntu/scripts/build/configure-snap.sh @@ -9,7 +9,7 @@ source $HELPER_SCRIPTS/etc-environment.sh # Update /etc/environment to include /snap/bin in PATH # because /etc/profile.d is ignored by `--norc` shell launch option -prependEtcEnvironmentPath "/snap/bin" +prepend_etc_environment_path "/snap/bin" # Put snapd auto refresh on hold # as it may generate too much traffic on Canonical's snap server diff --git a/images/ubuntu/scripts/build/configure-system.sh b/images/ubuntu/scripts/build/configure-system.sh index 997ab8583dfe..fcfe867c572e 100644 --- a/images/ubuntu/scripts/build/configure-system.sh +++ b/images/ubuntu/scripts/build/configure-system.sh @@ -20,7 +20,7 @@ chmod 755 $IMAGE_FOLDER ENVPATH=$(grep 'PATH=' /etc/environment | head -n 1 | sed -z 's/^PATH=*//') ENVPATH=${ENVPATH#"\""} ENVPATH=${ENVPATH%"\""} -addEtcEnvironmentVariable "PATH" "${ENVPATH}" +add_etc_environment_variable "PATH" "${ENVPATH}" echo "Updated /etc/environment: $(cat /etc/environment)" # Сlean yarn and npm cache diff --git a/images/ubuntu/scripts/build/install-actions-cache.sh b/images/ubuntu/scripts/build/install-actions-cache.sh index 3adfaa177843..e50b94c9431f 100644 --- a/images/ubuntu/scripts/build/install-actions-cache.sh +++ b/images/ubuntu/scripts/build/install-actions-cache.sh @@ -14,7 +14,7 @@ ACTION_ARCHIVE_CACHE_DIR=/opt/actionarchivecache mkdir -p $ACTION_ARCHIVE_CACHE_DIR chmod -R 777 $ACTION_ARCHIVE_CACHE_DIR echo "Setting up ACTIONS_RUNNER_ACTION_ARCHIVE_CACHE variable to ${ACTION_ARCHIVE_CACHE_DIR}" -setEtcEnvironmentVariable "ACTIONS_RUNNER_ACTION_ARCHIVE_CACHE" "${ACTION_ARCHIVE_CACHE_DIR}" +set_etc_environment_variable "ACTIONS_RUNNER_ACTION_ARCHIVE_CACHE" "${ACTION_ARCHIVE_CACHE_DIR}" # Download latest release from github.com/actions/action-versions and untar to /opt/actionarchivecache downloadUrl=$(resolve_github_release_asset_url "actions/action-versions" "endswith(\"action-versions.tar.gz\")" "latest") diff --git a/images/ubuntu/scripts/build/install-aliyun-cli.sh b/images/ubuntu/scripts/build/install-aliyun-cli.sh index fd9414606574..13d959d7abed 100644 --- a/images/ubuntu/scripts/build/install-aliyun-cli.sh +++ b/images/ubuntu/scripts/build/install-aliyun-cli.sh @@ -11,7 +11,7 @@ source $HELPER_SCRIPTS/install.sh # Install Alibaba Cloud CLI # Pin tool version on ubuntu20 due to issues with GLIBC_2.32 not available -if isUbuntu20; then +if is_ubuntu20; then toolset_version=$(get_toolset_value '.aliyunCli.version') download_url="https://github.com/aliyun/aliyun-cli/releases/download/v$toolset_version/aliyun-cli-linux-$toolset_version-amd64.tgz" else @@ -22,7 +22,7 @@ fi archive_path=$(download_with_retry "$download_url") # Supply chain security - Alibaba Cloud CLI -if isUbuntu20; then +if is_ubuntu20; then external_hash=$(get_toolset_value '.aliyunCli.sha256') else external_hash=$(get_checksum_from_url "$hash_url" "aliyun-cli-linux.*amd64.tgz" "SHA256") diff --git a/images/ubuntu/scripts/build/install-android-sdk.sh b/images/ubuntu/scripts/build/install-android-sdk.sh index 772a4aa54366..43d228ea1b3f 100644 --- a/images/ubuntu/scripts/build/install-android-sdk.sh +++ b/images/ubuntu/scripts/build/install-android-sdk.sh @@ -36,10 +36,10 @@ get_full_ndk_version() { ANDROID_ROOT=/usr/local/lib/android ANDROID_SDK_ROOT=${ANDROID_ROOT}/sdk SDKMANAGER=${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager -setEtcEnvironmentVariable "ANDROID_SDK_ROOT" "${ANDROID_SDK_ROOT}" +set_etc_environment_variable "ANDROID_SDK_ROOT" "${ANDROID_SDK_ROOT}" # ANDROID_HOME is deprecated, but older versions of Gradle rely on it -setEtcEnvironmentVariable "ANDROID_HOME" "${ANDROID_SDK_ROOT}" +set_etc_environment_variable "ANDROID_HOME" "${ANDROID_SDK_ROOT}" # Create android sdk directory mkdir -p ${ANDROID_SDK_ROOT} @@ -87,10 +87,10 @@ ndk_default_full_version=$(get_full_ndk_version $android_ndk_major_default) ndk_latest_full_version=$(get_full_ndk_version $android_ndk_major_latest) ANDROID_NDK=${ANDROID_SDK_ROOT}/ndk/${ndk_default_full_version} # ANDROID_NDK, ANDROID_NDK_HOME, and ANDROID_NDK_ROOT variables should be set as many customer builds depend on them https://github.com/actions/runner-images/issues/5879 -setEtcEnvironmentVariable "ANDROID_NDK" "${ANDROID_NDK}" -setEtcEnvironmentVariable "ANDROID_NDK_HOME" "${ANDROID_NDK}" -setEtcEnvironmentVariable "ANDROID_NDK_ROOT" "${ANDROID_NDK}" -setEtcEnvironmentVariable "ANDROID_NDK_LATEST_HOME" "${ANDROID_SDK_ROOT}/ndk/${ndk_latest_full_version}" +set_etc_environment_variable "ANDROID_NDK" "${ANDROID_NDK}" +set_etc_environment_variable "ANDROID_NDK_HOME" "${ANDROID_NDK}" +set_etc_environment_variable "ANDROID_NDK_ROOT" "${ANDROID_NDK}" +set_etc_environment_variable "ANDROID_NDK_LATEST_HOME" "${ANDROID_SDK_ROOT}/ndk/${ndk_latest_full_version}" # Prepare components for installation extras=$(get_toolset_value '.android.extra_list[] | "extras;" + .') @@ -119,6 +119,6 @@ sed -i "2i export JAVA_HOME=${JAVA_HOME_8_X64}" ${ANDROID_SDK_ROOT}/tools/bin/sd # Add required permissions chmod -R a+rwx ${ANDROID_SDK_ROOT} -reloadEtcEnvironment +reload_etc_environment invoke_tests "Android" diff --git a/images/ubuntu/scripts/build/install-azure-devops-cli.sh b/images/ubuntu/scripts/build/install-azure-devops-cli.sh index b1da23f4ec8f..81948ac95440 100644 --- a/images/ubuntu/scripts/build/install-azure-devops-cli.sh +++ b/images/ubuntu/scripts/build/install-azure-devops-cli.sh @@ -10,7 +10,7 @@ source $HELPER_SCRIPTS/etc-environment.sh # AZURE_EXTENSION_DIR shell variable defines where modules are installed # https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview export AZURE_EXTENSION_DIR=/opt/az/azcliextensions -setEtcEnvironmentVariable "AZURE_EXTENSION_DIR" "${AZURE_EXTENSION_DIR}" +set_etc_environment_variable "AZURE_EXTENSION_DIR" "${AZURE_EXTENSION_DIR}" # install azure devops Cli extension az extension add -n azure-devops diff --git a/images/ubuntu/scripts/build/install-clang.sh b/images/ubuntu/scripts/build/install-clang.sh index 02dbe1190942..46732e341403 100644 --- a/images/ubuntu/scripts/build/install-clang.sh +++ b/images/ubuntu/scripts/build/install-clang.sh @@ -7,14 +7,14 @@ # Source the helpers for use with the script source $HELPER_SCRIPTS/install.sh -function InstallClang { +install_clang() { local version=$1 echo "Installing clang-$version..." apt-get install -y "clang-$version" "lldb-$version" "lld-$version" "clang-format-$version" "clang-tidy-$version" } -function SetDefaultClang { +set_default_clang() { local version=$1 echo "Make Clang ${version} default" @@ -30,11 +30,11 @@ default_clang_version=$(get_toolset_value '.clang.default_version') for version in ${versions[*]}; do if [[ $version != $default_clang_version ]]; then - InstallClang $version + install_clang $version fi done -InstallClang $default_clang_version -SetDefaultClang $default_clang_version +install_clang $default_clang_version +set_default_clang $default_clang_version invoke_tests "Tools" "clang" diff --git a/images/ubuntu/scripts/build/install-container-tools.sh b/images/ubuntu/scripts/build/install-container-tools.sh index d10bbf15b7b8..130356945e82 100644 --- a/images/ubuntu/scripts/build/install-container-tools.sh +++ b/images/ubuntu/scripts/build/install-container-tools.sh @@ -10,14 +10,14 @@ source $HELPER_SCRIPTS/os.sh # pin podman due to https://github.com/actions/runner-images/issues/7753 # https://bugs.launchpad.net/ubuntu/+source/libpod/+bug/2024394 # -if isUbuntu20; then +if is_ubuntu20; then install_packages=(podman buildah skopeo) else install_packages=(podman=3.4.4+ds1-1ubuntu1 buildah skopeo) fi # Packages is available in the official Ubuntu upstream starting from Ubuntu 21 -if isUbuntu20; then +if is_ubuntu20; then REPO_URL="https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable" source /etc/os-release sh -c "echo 'deb ${REPO_URL}/x${NAME}_${VERSION_ID}/ /' > /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list" @@ -31,7 +31,7 @@ apt-get -y install ${install_packages[@]} mkdir -p /etc/containers printf "[registries.search]\nregistries = ['docker.io', 'quay.io']\n" | tee /etc/containers/registries.conf -if isUbuntu20; then +if is_ubuntu20; then # Remove source repo rm /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list # Document source repo diff --git a/images/ubuntu/scripts/build/install-docker.sh b/images/ubuntu/scripts/build/install-docker.sh index e03e4d520d70..cbbed19a85e0 100644 --- a/images/ubuntu/scripts/build/install-docker.sh +++ b/images/ubuntu/scripts/build/install-docker.sh @@ -14,7 +14,7 @@ gpg_key="/usr/share/keyrings/docker.gpg" repo_path="/etc/apt/sources.list.d/docker.list" curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o $gpg_key -echo "deb [arch=amd64 signed-by=$gpg_key] $repo_url $(getOSVersionLabel) stable" > $repo_path +echo "deb [arch=amd64 signed-by=$gpg_key] $repo_url $(get_os_version_label) stable" > $repo_path apt-get update apt-get install --no-install-recommends docker-ce docker-ce-cli containerd.io docker-buildx-plugin diff --git a/images/ubuntu/scripts/build/install-dotnetcore-sdk.sh b/images/ubuntu/scripts/build/install-dotnetcore-sdk.sh index 3eef7af1a124..82c683d55dda 100644 --- a/images/ubuntu/scripts/build/install-dotnetcore-sdk.sh +++ b/images/ubuntu/scripts/build/install-dotnetcore-sdk.sh @@ -31,7 +31,7 @@ apt-get update for latest_package in ${LATEST_DOTNET_PACKAGES[@]}; do echo "Determing if .NET Core ($latest_package) is installed" - if ! IsPackageInstalled $latest_package; then + if ! dpkg -S $latest_package &> /dev/null; then echo "Could not find .NET Core ($latest_package), installing..." apt-get install $latest_package -y else @@ -82,10 +82,10 @@ find . -name "*.tar.gz" | parallel --halt soon,fail=1 'extract_dotnet_sdk {}' # NuGetFallbackFolder at /usr/share/dotnet/sdk/NuGetFallbackFolder is warmed up by smoke test # Additional FTE will just copy to ~/.dotnet/NuGet which provides no benefit on a fungible machine -setEtcEnvironmentVariable DOTNET_SKIP_FIRST_TIME_EXPERIENCE 1 -setEtcEnvironmentVariable DOTNET_NOLOGO 1 -setEtcEnvironmentVariable DOTNET_MULTILEVEL_LOOKUP 0 -prependEtcEnvironmentPath '$HOME/.dotnet/tools' +set_etc_environment_variable DOTNET_SKIP_FIRST_TIME_EXPERIENCE 1 +set_etc_environment_variable DOTNET_NOLOGO 1 +set_etc_environment_variable DOTNET_MULTILEVEL_LOOKUP 0 +prepend_etc_environment_path '$HOME/.dotnet/tools' # install dotnet tools for dotnet_tool in ${DOTNET_TOOLS[@]}; do diff --git a/images/ubuntu/scripts/build/install-firefox.sh b/images/ubuntu/scripts/build/install-firefox.sh index 337d74339502..b4a81dcba508 100644 --- a/images/ubuntu/scripts/build/install-firefox.sh +++ b/images/ubuntu/scripts/build/install-firefox.sh @@ -19,7 +19,7 @@ repo_path="/etc/apt/sources.list.d/mozillateam-ubuntu-ppa-focal.list" # Install Firefox curl -fsSL "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x${gpg_fingerprint}" | sudo gpg --dearmor -o $gpg_key -echo "deb $repo_url $(getOSVersionLabel) main" > $repo_path +echo "deb $repo_url $(get_os_version_label) main" > $repo_path apt-get update apt-get install --target-release 'o=LP-PPA-mozillateam' -y firefox @@ -44,6 +44,6 @@ tar -xzf "$driver_archive_path" -C $GECKODRIVER_DIR chmod +x $GECKODRIVER_BIN ln -s "$GECKODRIVER_BIN" /usr/bin/ -setEtcEnvironmentVariable "GECKOWEBDRIVER" "${GECKODRIVER_DIR}" +set_etc_environment_variable "GECKOWEBDRIVER" "${GECKODRIVER_DIR}" invoke_tests "Browsers" "Firefox" diff --git a/images/ubuntu/scripts/build/install-gcc-compilers.sh b/images/ubuntu/scripts/build/install-gcc-compilers.sh index cdefcfdbc7de..bfc4e0e746c2 100644 --- a/images/ubuntu/scripts/build/install-gcc-compilers.sh +++ b/images/ubuntu/scripts/build/install-gcc-compilers.sh @@ -8,13 +8,6 @@ source $HELPER_SCRIPTS/os.sh source $HELPER_SCRIPTS/install.sh -function InstallGcc { - version=$1 - - echo "Installing $version..." - apt-get install $version -y -} - # Install GNU C++ compiler add-apt-repository ppa:ubuntu-toolchain-r/test -y apt-get update -y @@ -22,7 +15,8 @@ apt-get update -y versions=$(get_toolset_value '.gcc.versions[]') for version in ${versions[*]}; do - InstallGcc $version + echo "Installing $version..." + apt-get install $version -y done invoke_tests "Tools" "gcc" diff --git a/images/ubuntu/scripts/build/install-gfortran.sh b/images/ubuntu/scripts/build/install-gfortran.sh index c0dcdcc15415..024a0311e978 100644 --- a/images/ubuntu/scripts/build/install-gfortran.sh +++ b/images/ubuntu/scripts/build/install-gfortran.sh @@ -6,22 +6,15 @@ source $HELPER_SCRIPTS/install.sh source $HELPER_SCRIPTS/os.sh -function InstallFortran { - version=$1 - - echo "Installing $version..." - apt-get install $version -y -} - # Install GNU Fortran compiler add-apt-repository ppa:ubuntu-toolchain-r/test -y apt-get update -y versions=$(get_toolset_value '.gfortran.versions[]') -for version in ${versions[*]} -do - InstallFortran $version +for version in ${versions[*]}; do + echo "Installing $version..." + apt-get install $version -y done invoke_tests "Tools" "gfortran" diff --git a/images/ubuntu/scripts/build/install-google-chrome.sh b/images/ubuntu/scripts/build/install-google-chrome.sh index 88b9202081da..b8458cbe900a 100644 --- a/images/ubuntu/scripts/build/install-google-chrome.sh +++ b/images/ubuntu/scripts/build/install-google-chrome.sh @@ -8,35 +8,37 @@ source $HELPER_SCRIPTS/install.sh source $HELPER_SCRIPTS/etc-environment.sh -function GetChromiumRevision { - CHROME_REVISION=$1 +get_chromium_revision() { + local chrome_revision=$1 # Take the first part of the revision variable to search not only for a specific version, # but also for similar ones, so that we can get a previous one if the required revision is not found - CHROME_REVISION_PREFIX=${CHROME_REVISION:0:${#CHROME_REVISION}/2+1} + chrome_revision_prefix=${chrome_revision:0:${#chrome_revision}/2+1} SEARCH_URL="https://www.googleapis.com/storage/v1/b/chromium-browser-snapshots/o?delimiter=/&prefix=Linux_x64" # Revision can include a hash instead of a number. Need to filter it out https://github.com/actions/runner-images/issues/5256 - REVISIONS_AVAILABLE=$(curl -s $SEARCH_URL/${CHROME_REVISION_PREFIX} | jq -r '.prefixes[]' | grep -E "Linux_x64\/[0-9]+\/"| cut -d "/" -f 2 | sort --version-sort) + revisions_available=$(curl -s $SEARCH_URL/${chrome_revision_prefix} | jq -r '.prefixes[]' | grep -E "Linux_x64\/[0-9]+\/"| cut -d "/" -f 2 | sort --version-sort) # If required Chromium revision is not found in the list # we should have to decrement the revision number until we find one. # This is mentioned in the documentation we use for this installation: # https://www.chromium.org/getting-involved/download-chromium - LATEST_VALID_REVISION=$(echo $REVISIONS_AVAILABLE | cut -f 1 -d " ") - for REVISION in $REVISIONS_AVAILABLE; do - if [ "$CHROME_REVISION" -lt "$REVISION" ]; then + latest_valid_revision=$(echo $revisions_available | cut -f 1 -d " ") + for revision in $revisions_available; do + if [ "$chrome_revision" -lt "$revision" ]; then break fi - LATEST_VALID_REVISION=$REVISION + + latest_valid_revision=$revision done - echo $LATEST_VALID_REVISION + + echo $latest_valid_revision } # Download and install Google Chrome CHROME_DEB_URL="https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb" CHROME_DEB_PATH=$(download_with_retry "$CHROME_DEB_URL") apt install "$CHROME_DEB_PATH" -f -setEtcEnvironmentVariable "CHROME_BIN" "/usr/bin/google-chrome" +set_etc_environment_variable "CHROME_BIN" "/usr/bin/google-chrome" # Remove Google Chrome repo rm -f /etc/cron.daily/google-chrome /etc/apt/sources.list.d/google-chrome.list /etc/apt/sources.list.d/google-chrome.list.save @@ -63,11 +65,11 @@ unzip -qq "$driver_archive_path" -d /usr/local/share chmod +x $CHROMEDRIVER_BIN ln -s "$CHROMEDRIVER_BIN" /usr/bin/ -setEtcEnvironmentVariable "CHROMEWEBDRIVER" "${CHROMEDRIVER_DIR}" +set_etc_environment_variable "CHROMEWEBDRIVER" "${CHROMEDRIVER_DIR}" # Download and unpack Chromium CHROME_REVISION=$(echo "${CHROME_VERSIONS_JSON}" | jq -r '.builds["'"$CHROME_VERSION"'"].revision') -CHROMIUM_REVISION=$(GetChromiumRevision $CHROME_REVISION) +CHROMIUM_REVISION=$(get_chromium_revision $CHROME_REVISION) CHROMIUM_URL="https://www.googleapis.com/download/storage/v1/b/chromium-browser-snapshots/o/Linux_x64%2F${CHROMIUM_REVISION}%2Fchrome-linux.zip?alt=media" CHROMIUM_DIR="/usr/local/share/chromium" CHROMIUM_BIN="${CHROMIUM_DIR}/chrome-linux/chrome" diff --git a/images/ubuntu/scripts/build/install-haskell.sh b/images/ubuntu/scripts/build/install-haskell.sh index 3e2796544af9..a5710fb7340a 100644 --- a/images/ubuntu/scripts/build/install-haskell.sh +++ b/images/ubuntu/scripts/build/install-haskell.sh @@ -13,13 +13,13 @@ export BOOTSTRAP_HASKELL_INSTALL_NO_STACK_HOOK=1 export GHCUP_INSTALL_BASE_PREFIX=/usr/local export BOOTSTRAP_HASKELL_GHC_VERSION=0 ghcup_bin=$GHCUP_INSTALL_BASE_PREFIX/.ghcup/bin -setEtcEnvironmentVariable "BOOTSTRAP_HASKELL_NONINTERACTIVE" $BOOTSTRAP_HASKELL_NONINTERACTIVE -setEtcEnvironmentVariable "GHCUP_INSTALL_BASE_PREFIX" $GHCUP_INSTALL_BASE_PREFIX +set_etc_environment_variable "BOOTSTRAP_HASKELL_NONINTERACTIVE" $BOOTSTRAP_HASKELL_NONINTERACTIVE +set_etc_environment_variable "GHCUP_INSTALL_BASE_PREFIX" $GHCUP_INSTALL_BASE_PREFIX # Install GHCup curl --proto '=https' --tlsv1.2 -fsSL https://get-ghcup.haskell.org | sh > /dev/null 2>&1 || true export PATH="$ghcup_bin:$PATH" -prependEtcEnvironmentPath $ghcup_bin +prepend_etc_environment_path $ghcup_bin availableVersions=$(ghcup list -t ghc -r | grep -v "prerelease" | awk '{print $2}') diff --git a/images/ubuntu/scripts/build/install-homebrew.sh b/images/ubuntu/scripts/build/install-homebrew.sh index 8f94e469cbaf..7fd491609a78 100644 --- a/images/ubuntu/scripts/build/install-homebrew.sh +++ b/images/ubuntu/scripts/build/install-homebrew.sh @@ -15,12 +15,12 @@ source $HELPER_SCRIPTS/install.sh # Invoke shellenv to make brew available during runnig session eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)" -setEtcEnvironmentVariable HOMEBREW_NO_AUTO_UPDATE 1 -setEtcEnvironmentVariable HOMEBREW_CLEANUP_PERIODIC_FULL_DAYS 3650 +set_etc_environment_variable HOMEBREW_NO_AUTO_UPDATE 1 +set_etc_environment_variable HOMEBREW_CLEANUP_PERIODIC_FULL_DAYS 3650 # Validate the installation ad hoc echo "Validate the installation reloading /etc/environment" -reloadEtcEnvironment +reload_etc_environment gfortran=$(brew --prefix)/bin/gfortran # Remove gfortran symlink, not to conflict with system gfortran diff --git a/images/ubuntu/scripts/build/install-java-tools.sh b/images/ubuntu/scripts/build/install-java-tools.sh index bee2b5fd0320..b1776b7940f0 100644 --- a/images/ubuntu/scripts/build/install-java-tools.sh +++ b/images/ubuntu/scripts/build/install-java-tools.sh @@ -8,71 +8,63 @@ source $HELPER_SCRIPTS/install.sh source $HELPER_SCRIPTS/os.sh source $HELPER_SCRIPTS/etc-environment.sh -createJavaEnvironmentalVariable() { - local JAVA_VERSION=$1 - local DEFAULT=$2 +create_java_environment_variable() { + local java_version=$1 + local default=$2 - local INSTALL_PATH_PATTERN="/usr/lib/jvm/temurin-${JAVA_VERSION}-jdk-amd64" + local install_path_pattern="/usr/lib/jvm/temurin-${java_version}-jdk-amd64" - if [[ ${DEFAULT} == "True" ]]; then - echo "Setting up JAVA_HOME variable to ${INSTALL_PATH_PATTERN}" - setEtcEnvironmentVariable "JAVA_HOME" "${INSTALL_PATH_PATTERN}" + if [[ ${default} == "True" ]]; then + echo "Setting up JAVA_HOME variable to ${install_path_pattern}" + set_etc_environment_variable "JAVA_HOME" "${install_path_pattern}" echo "Setting up default symlink" - update-java-alternatives -s ${INSTALL_PATH_PATTERN} + update-java-alternatives -s ${install_path_pattern} fi - echo "Setting up JAVA_HOME_${JAVA_VERSION}_X64 variable to ${INSTALL_PATH_PATTERN}" - setEtcEnvironmentVariable "JAVA_HOME_${JAVA_VERSION}_X64" "${INSTALL_PATH_PATTERN}" + echo "Setting up JAVA_HOME_${java_version}_X64 variable to ${install_path_pattern}" + set_etc_environment_variable "JAVA_HOME_${java_version}_X64" "${install_path_pattern}" } -enableRepositories() { - osLabel=$(getOSVersionLabel) - - # Add Addoptium PPA - # apt-key is deprecated, dearmor and add manually - wget -qO - https://packages.adoptium.net/artifactory/api/gpg/key/public | gpg --dearmor > /usr/share/keyrings/adoptium.gpg - echo "deb [signed-by=/usr/share/keyrings/adoptium.gpg] https://packages.adoptium.net/artifactory/deb/ $osLabel main" > /etc/apt/sources.list.d/adoptium.list - -} - -installOpenJDK() { - local JAVA_VERSION=$1 +install_open_jdk() { + local java_version=$1 # Install Java from PPA repositories. - apt-get -y install temurin-${JAVA_VERSION}-jdk=\* - javaVersionPath="/usr/lib/jvm/temurin-${JAVA_VERSION}-jdk-amd64" + apt-get -y install temurin-${java_version}-jdk=\* + java_version_path="/usr/lib/jvm/temurin-${java_version}-jdk-amd64" - JAVA_TOOLCACHE_PATH="${AGENT_TOOLSDIRECTORY}/Java_Temurin-Hotspot_jdk" + java_toolcache_path="${AGENT_TOOLSDIRECTORY}/Java_Temurin-Hotspot_jdk" - fullJavaVersion=$(cat "${javaVersionPath}/release" | grep "^SEMANTIC" | cut -d "=" -f 2 | tr -d "\"" | tr "+" "-") + full_java_version=$(cat "${java_version_path}/release" | grep "^SEMANTIC" | cut -d "=" -f 2 | tr -d "\"" | tr "+" "-") # If there is no semver in java release, then extract java version from -fullversion - [[ -z ${fullJavaVersion} ]] && fullJavaVersion=$(${javaVersionPath}/bin/java -fullversion 2>&1 | tr -d "\"" | tr "+" "-" | awk '{print $4}') + [[ -z ${full_java_version} ]] && full_java_version=$(${java_version_path}/bin/java -fullversion 2>&1 | tr -d "\"" | tr "+" "-" | awk '{print $4}') # Convert non valid semver like 11.0.14.1-9 -> 11.0.14-9 # https://github.com/adoptium/temurin-build/issues/2248 - [[ ${fullJavaVersion} =~ ^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+ ]] && fullJavaVersion=$(echo $fullJavaVersion | sed -E 's/\.[0-9]+-/-/') + [[ ${full_java_version} =~ ^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+ ]] && full_java_version=$(echo $full_java_version | sed -E 's/\.[0-9]+-/-/') # When version string is too short, add extra ".0" to make it valid semver - [[ ${fullJavaVersion} =~ ^[0-9]+- ]] && fullJavaVersion=$(echo $fullJavaVersion | sed -E 's/-/.0-/') - [[ ${fullJavaVersion} =~ ^[0-9]+\.[0-9]+- ]] && fullJavaVersion=$(echo $fullJavaVersion | sed -E 's/-/.0-/') + [[ ${full_java_version} =~ ^[0-9]+- ]] && full_java_version=$(echo $full_java_version | sed -E 's/-/.0-/') + [[ ${full_java_version} =~ ^[0-9]+\.[0-9]+- ]] && full_java_version=$(echo $full_java_version | sed -E 's/-/.0-/') - javaToolcacheVersionPath="${JAVA_TOOLCACHE_PATH}/${fullJavaVersion}" - echo "Java ${JAVA_VERSION} Toolcache Version Path: ${javaToolcacheVersionPath}" - mkdir -p "${javaToolcacheVersionPath}" + java_toolcache_version_path="${java_toolcache_path}/${full_java_version}" + echo "Java ${java_version} Toolcache Version Path: ${java_toolcache_version_path}" + mkdir -p "${java_toolcache_version_path}" # Create a complete file - touch "${javaToolcacheVersionPath}/x64.complete" + touch "${java_toolcache_version_path}/x64.complete" # Create symlink for Java - ln -s ${javaVersionPath} "${javaToolcacheVersionPath}/x64" + ln -s ${java_version_path} "${java_toolcache_version_path}/x64" # add extra permissions to be able execute command without sudo chmod -R 777 /usr/lib/jvm } -# Fetch repositories data -enableRepositories +# Add Addoptium PPA +# apt-key is deprecated, dearmor and add manually +wget -qO - https://packages.adoptium.net/artifactory/api/gpg/key/public | gpg --dearmor > /usr/share/keyrings/adoptium.gpg +echo "deb [signed-by=/usr/share/keyrings/adoptium.gpg] https://packages.adoptium.net/artifactory/deb/ $(get_os_version_label) main" > /etc/apt/sources.list.d/adoptium.list # Get all the updates from enabled repositories. apt-get update @@ -81,19 +73,19 @@ defaultVersion=$(get_toolset_value '.java.default') jdkVersionsToInstall=($(get_toolset_value ".java.versions[]")) for jdkVersionToInstall in ${jdkVersionsToInstall[@]}; do - installOpenJDK ${jdkVersionToInstall} + install_open_jdk ${jdkVersionToInstall} if [[ ${jdkVersionToInstall} == ${defaultVersion} ]] then - createJavaEnvironmentalVariable ${jdkVersionToInstall} True + create_java_environment_variable ${jdkVersionToInstall} True else - createJavaEnvironmentalVariable ${jdkVersionToInstall} False + create_java_environment_variable ${jdkVersionToInstall} False fi done # Install Ant apt-get install -y --no-install-recommends ant ant-optional -setEtcEnvironmentVariable "ANT_HOME" "/usr/share/ant" +set_etc_environment_variable "ANT_HOME" "/usr/share/ant" # Install Maven mavenVersion=$(get_toolset_value '.java.maven') @@ -114,7 +106,7 @@ gradle_archive_path=$(download_with_retry "$gradleDownloadUrl") unzip -qq -d /usr/share "$gradle_archive_path" ln -s /usr/share/gradle-"${gradleLatestVersion}"/bin/gradle /usr/bin/gradle gradle_home_dir=$(find /usr/share -depth -maxdepth 1 -name "gradle*") -setEtcEnvironmentVariable "GRADLE_HOME" "${gradle_home_dir}" +set_etc_environment_variable "GRADLE_HOME" "${gradle_home_dir}" # Delete java repositories and keys rm -f /etc/apt/sources.list.d/adoptium.list @@ -122,5 +114,5 @@ rm -f /etc/apt/sources.list.d/zulu.list rm -f /usr/share/keyrings/adoptium.gpg rm -f /usr/share/keyrings/zulu.gpg -reloadEtcEnvironment +reload_etc_environment invoke_tests "Java" diff --git a/images/ubuntu/scripts/build/install-leiningen.sh b/images/ubuntu/scripts/build/install-leiningen.sh index 400385958cfa..6d61d78e11d5 100644 --- a/images/ubuntu/scripts/build/install-leiningen.sh +++ b/images/ubuntu/scripts/build/install-leiningen.sh @@ -16,7 +16,7 @@ export LEIN_HOME=/usr/local/lib/lein lein LEIN_JAR=$(find $LEIN_HOME -name "leiningen-*-standalone.jar") -setEtcEnvironmentVariable "LEIN_JAR" "${LEIN_JAR}" -setEtcEnvironmentVariable "LEIN_HOME" "${LEIN_HOME}" +set_etc_environment_variable "LEIN_JAR" "${LEIN_JAR}" +set_etc_environment_variable "LEIN_HOME" "${LEIN_HOME}" invoke_tests "Tools" "Leiningen" diff --git a/images/ubuntu/scripts/build/install-microsoft-edge.sh b/images/ubuntu/scripts/build/install-microsoft-edge.sh index a52f4cb27400..221ccc5133ac 100644 --- a/images/ubuntu/scripts/build/install-microsoft-edge.sh +++ b/images/ubuntu/scripts/build/install-microsoft-edge.sh @@ -46,6 +46,6 @@ unzip -qq "$EDGEDRIVER_ARCHIVE_PATH" -d "$EDGEDRIVER_DIR" chmod +x $EDGEDRIVER_BIN ln -s $EDGEDRIVER_BIN /usr/bin -setEtcEnvironmentVariable "EDGEWEBDRIVER" "${EDGEDRIVER_DIR}" +set_etc_environment_variable "EDGEWEBDRIVER" "${EDGEDRIVER_DIR}" invoke_tests "Browsers" "Edge" diff --git a/images/ubuntu/scripts/build/install-miniconda.sh b/images/ubuntu/scripts/build/install-miniconda.sh index 805a9325c340..2e8e7b4177b7 100644 --- a/images/ubuntu/scripts/build/install-miniconda.sh +++ b/images/ubuntu/scripts/build/install-miniconda.sh @@ -14,7 +14,7 @@ curl -fsSL https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh && rm miniconda.sh CONDA=/usr/share/miniconda -setEtcEnvironmentVariable "CONDA" "${CONDA}" +set_etc_environment_variable "CONDA" "${CONDA}" ln -s $CONDA/bin/conda /usr/bin/conda diff --git a/images/ubuntu/scripts/build/install-mongodb.sh b/images/ubuntu/scripts/build/install-mongodb.sh index 063d7b315e97..7a47185347ac 100644 --- a/images/ubuntu/scripts/build/install-mongodb.sh +++ b/images/ubuntu/scripts/build/install-mongodb.sh @@ -9,7 +9,7 @@ source $HELPER_SCRIPTS/os.sh source $HELPER_SCRIPTS/install.sh REPO_URL="https://repo.mongodb.org/apt/ubuntu" -osLabel=$(getOSVersionLabel) +osLabel=$(get_os_version_label) toolsetVersion=$(get_toolset_value '.mongodb.version') # Install Mongo DB diff --git a/images/ubuntu/scripts/build/install-mono.sh b/images/ubuntu/scripts/build/install-mono.sh index ebeb0a750713..e8be1f9c6a71 100644 --- a/images/ubuntu/scripts/build/install-mono.sh +++ b/images/ubuntu/scripts/build/install-mono.sh @@ -9,7 +9,7 @@ source $HELPER_SCRIPTS/os.sh LSB_CODENAME=$(lsb_release -cs) # There are no packages for Ubuntu 22 in the repo, but developers confirmed that packages from Ubuntu 20 should work -if isUbuntu22; then +if is_ubuntu22; then LSB_CODENAME="focal" fi diff --git a/images/ubuntu/scripts/build/install-nvm.sh b/images/ubuntu/scripts/build/install-nvm.sh index 91848911d2ad..c63aaab3e9c6 100644 --- a/images/ubuntu/scripts/build/install-nvm.sh +++ b/images/ubuntu/scripts/build/install-nvm.sh @@ -11,7 +11,7 @@ export NVM_DIR="/etc/skel/.nvm" mkdir $NVM_DIR VERSION=$(curl -fsSL https://api.github.com/repos/nvm-sh/nvm/releases/latest | jq -r '.tag_name') curl -fsSL https://raw.githubusercontent.com/nvm-sh/nvm/$VERSION/install.sh | bash -setEtcEnvironmentVariable "NVM_DIR" '$HOME/.nvm' +set_etc_environment_variable "NVM_DIR" '$HOME/.nvm' echo '[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm' | tee -a /etc/skel/.bash_profile [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" diff --git a/images/ubuntu/scripts/build/install-php.sh b/images/ubuntu/scripts/build/install-php.sh index 3f8ce40ddd45..81409da4694b 100644 --- a/images/ubuntu/scripts/build/install-php.sh +++ b/images/ubuntu/scripts/build/install-php.sh @@ -11,7 +11,7 @@ source $HELPER_SCRIPTS/install.sh # add repository for old Ubuntu images # details in thread: https://github.com/actions/runner-images/issues/6331 -if isUbuntu20; then +if is_ubuntu20; then apt-add-repository ppa:ondrej/php -y apt-get update fi @@ -94,7 +94,7 @@ sudo mv composer.phar /usr/bin/composer php -r "unlink('composer-setup.php');" # Add composer bin folder to path -prependEtcEnvironmentPath '$HOME/.config/composer/vendor/bin' +prepend_etc_environment_path '$HOME/.config/composer/vendor/bin' #Create composer folder for user to preserve folder permissions mkdir -p /etc/skel/.composer @@ -106,7 +106,7 @@ mv phpunit /usr/local/bin/phpunit # ubuntu 20.04 libzip-dev is libzip5 based and is not compatible libzip-dev of ppa:ondrej/php # see https://github.com/actions/runner-images/issues/1084 -if isUbuntu20; then +if is_ubuntu20; then rm /etc/apt/sources.list.d/ondrej-*.list apt-get update fi diff --git a/images/ubuntu/scripts/build/install-postgresql.sh b/images/ubuntu/scripts/build/install-postgresql.sh index f7e16c31764b..18b5bc037052 100644 --- a/images/ubuntu/scripts/build/install-postgresql.sh +++ b/images/ubuntu/scripts/build/install-postgresql.sh @@ -12,7 +12,7 @@ REPO_URL="https://apt.postgresql.org/pub/repos/apt/" # Preparing repo for PostgreSQL wget -qO - https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor > /usr/share/keyrings/postgresql.gpg -echo "deb [signed-by=/usr/share/keyrings/postgresql.gpg] $REPO_URL $(getOSVersionLabel)-pgdg main" > /etc/apt/sources.list.d/pgdg.list +echo "deb [signed-by=/usr/share/keyrings/postgresql.gpg] $REPO_URL $(get_os_version_label)-pgdg main" > /etc/apt/sources.list.d/pgdg.list # Fetch PostgreSQL version to install from the toolset toolsetVersion=$(get_toolset_value '.postgresql.version') diff --git a/images/ubuntu/scripts/build/install-pypy.sh b/images/ubuntu/scripts/build/install-pypy.sh index 51f09cbc5c05..47dba4496e18 100644 --- a/images/ubuntu/scripts/build/install-pypy.sh +++ b/images/ubuntu/scripts/build/install-pypy.sh @@ -7,70 +7,69 @@ source $HELPER_SCRIPTS/install.sh # This function installs PyPy using the specified arguments: -# $1=PACKAGE_URL -function InstallPyPy -{ - PACKAGE_URL=$1 +# $1=package_url +install_pypy() { + local package_url=$1 - PACKAGE_TAR_NAME=$(echo "$PACKAGE_URL" | awk -F/ '{print $NF}') - PACKAGE_NAME=${PACKAGE_TAR_NAME/.tar.bz2/} + package_tar_name=$(echo "$package_url" | awk -F/ '{print $NF}') + package_name=${package_tar_name/.tar.bz2/} - echo "Downloading tar archive '$PACKAGE_NAME'" - PACKAGE_TAR_TEMP_PATH=$(download_with_retry $PACKAGE_URL) + echo "Downloading tar archive '$package_name'" + package_tar_temp_path=$(download_with_retry $package_url) - echo "Expand '$PACKAGE_NAME' to the /tmp folder" - tar xf "$PACKAGE_TAR_TEMP_PATH" -C /tmp + echo "Expand '$package_name' to the /tmp folder" + tar xf "$package_tar_temp_path" -C /tmp # Get Python version - MAJOR_VERSION=$(echo ${PACKAGE_NAME/pypy/} | cut -d. -f1) - PYTHON_MAJOR="python$MAJOR_VERSION" + major_version=$(echo ${package_name/pypy/} | cut -d. -f1) + python_major="python$major_version" - if [ $MAJOR_VERSION != 2 ]; then - PYPY_MAJOR="pypy$MAJOR_VERSION" + if [ $major_version != 2 ]; then + pypy_major="pypy$major_version" else - PYPY_MAJOR="pypy" + pypy_major="pypy" fi - PACKAGE_TEMP_FOLDER="/tmp/$PACKAGE_NAME" - PYTHON_FULL_VERSION=$("$PACKAGE_TEMP_FOLDER/bin/$PYPY_MAJOR" -c "import sys;print('{}.{}.{}'.format(sys.version_info[0],sys.version_info[1],sys.version_info[2]))") - PYPY_FULL_VERSION=$("$PACKAGE_TEMP_FOLDER/bin/$PYPY_MAJOR" -c "import sys;print('{}.{}.{}'.format(*sys.pypy_version_info[0:3]))") - echo "Put '$PYPY_FULL_VERSION' to PYPY_VERSION file" - echo $PYPY_FULL_VERSION > "$PACKAGE_TEMP_FOLDER/PYPY_VERSION" + package_temp_folder="/tmp/$package_name" + python_full_version=$("$package_temp_folder/bin/$pypy_major" -c "import sys;print('{}.{}.{}'.format(sys.version_info[0],sys.version_info[1],sys.version_info[2]))") + pypy_full_version=$("$package_temp_folder/bin/$pypy_major" -c "import sys;print('{}.{}.{}'.format(*sys.pypy_version_info[0:3]))") + echo "Put '$pypy_full_version' to PYPY_VERSION file" + echo $pypy_full_version > "$package_temp_folder/PYPY_VERSION" # PyPy folder structure - PYPY_TOOLCACHE_PATH=$AGENT_TOOLSDIRECTORY/PyPy - PYPY_TOOLCACHE_VERSION_PATH=$PYPY_TOOLCACHE_PATH/$PYTHON_FULL_VERSION - PYPY_TOOLCACHE_VERSION_ARCH_PATH=$PYPY_TOOLCACHE_VERSION_PATH/x64 + pypy_toolcache_path=$AGENT_TOOLSDIRECTORY/PyPy + pypy_toolcache_version_path=$pypy_toolcache_path/$python_full_version + pypy_toolcache_version_arch_path=$pypy_toolcache_version_path/x64 echo "Check if PyPy hostedtoolcache folder exist..." - if [ ! -d $PYPY_TOOLCACHE_PATH ]; then - mkdir -p $PYPY_TOOLCACHE_PATH + if [ ! -d $pypy_toolcache_path ]; then + mkdir -p $pypy_toolcache_path fi - echo "Create PyPy '$PYPY_TOOLCACHE_VERSION_PATH' folder" - mkdir $PYPY_TOOLCACHE_VERSION_PATH + echo "Create PyPy '$pypy_toolcache_version_path' folder" + mkdir $pypy_toolcache_version_path - echo "Move PyPy '$PACKAGE_TEMP_FOLDER' binaries to '$PYPY_TOOLCACHE_VERSION_ARCH_PATH' folder" - mv $PACKAGE_TEMP_FOLDER $PYPY_TOOLCACHE_VERSION_ARCH_PATH + echo "Move PyPy '$package_temp_folder' binaries to '$pypy_toolcache_version_arch_path' folder" + mv $package_temp_folder $pypy_toolcache_version_arch_path echo "Create additional symlinks (Required for UsePythonVersion Azure DevOps task)" - cd $PYPY_TOOLCACHE_VERSION_ARCH_PATH/bin + cd $pypy_toolcache_version_arch_path/bin # Starting from PyPy 7.3.4 these links are already included in the package - [ -f ./$PYTHON_MAJOR ] || ln -s $PYPY_MAJOR $PYTHON_MAJOR - [ -f ./python ] || ln -s $PYTHON_MAJOR python + [ -f ./$python_major ] || ln -s $pypy_major $python_major + [ -f ./python ] || ln -s $python_major python - chmod +x ./python ./$PYTHON_MAJOR + chmod +x ./python ./$python_major echo "Install latest Pip" ./python -m ensurepip ./python -m pip install --ignore-installed pip echo "Create complete file" - touch $PYPY_TOOLCACHE_VERSION_PATH/x64.complete + touch $pypy_toolcache_version_path/x64.complete - echo "Remove '$PACKAGE_TAR_TEMP_PATH'" - rm -f $PACKAGE_TAR_TEMP_PATH + echo "Remove '$package_tar_temp_path'" + rm -f $package_tar_temp_path } # Installation PyPy @@ -87,7 +86,7 @@ for toolsetVersion in $toolsetVersions; do exit 1 fi - InstallPyPy $latestMajorPyPyVersion + install_pypy $latestMajorPyPyVersion done chown -R "$SUDO_USER:$SUDO_USER" "$AGENT_TOOLSDIRECTORY/PyPy" diff --git a/images/ubuntu/scripts/build/install-python.sh b/images/ubuntu/scripts/build/install-python.sh index 70321af93d29..846aa4206289 100644 --- a/images/ubuntu/scripts/build/install-python.sh +++ b/images/ubuntu/scripts/build/install-python.sh @@ -19,9 +19,9 @@ export PIPX_HOME=/opt/pipx python3 -m pip install pipx python3 -m pipx ensurepath # Update /etc/environment -setEtcEnvironmentVariable "PIPX_BIN_DIR" $PIPX_BIN_DIR -setEtcEnvironmentVariable "PIPX_HOME" $PIPX_HOME -prependEtcEnvironmentPath $PIPX_BIN_DIR +set_etc_environment_variable "PIPX_BIN_DIR" $PIPX_BIN_DIR +set_etc_environment_variable "PIPX_HOME" $PIPX_HOME +prepend_etc_environment_path $PIPX_BIN_DIR # Test pipx if ! command -v pipx; then echo "pipx was not installed or not found on PATH" @@ -29,6 +29,6 @@ if ! command -v pipx; then fi # Adding this dir to PATH will make installed pip commands are immediately available. -prependEtcEnvironmentPath '$HOME/.local/bin' +prepend_etc_environment_path '$HOME/.local/bin' invoke_tests "Tools" "Python" diff --git a/images/ubuntu/scripts/build/install-rlang.sh b/images/ubuntu/scripts/build/install-rlang.sh index a463b0d6681a..7445d7de507e 100644 --- a/images/ubuntu/scripts/build/install-rlang.sh +++ b/images/ubuntu/scripts/build/install-rlang.sh @@ -8,7 +8,7 @@ source $HELPER_SCRIPTS/os.sh # install R -osLabel=$(getOSVersionLabel) +osLabel=$(get_os_version_label) wget -qO- https://cloud.r-project.org/bin/linux/ubuntu/marutter_pubkey.asc | gpg --dearmor > /usr/share/keyrings/rlang.gpg echo "deb [signed-by=/usr/share/keyrings/rlang.gpg] https://cloud.r-project.org/bin/linux/ubuntu $osLabel-cran40/" > /etc/apt/sources.list.d/rlang.list diff --git a/images/ubuntu/scripts/build/install-rust.sh b/images/ubuntu/scripts/build/install-rust.sh index b046b75f5565..2f0c8a0c0b10 100644 --- a/images/ubuntu/scripts/build/install-rust.sh +++ b/images/ubuntu/scripts/build/install-rust.sh @@ -19,7 +19,7 @@ source $CARGO_HOME/env # Install common tools rustup component add rustfmt clippy -if isUbuntu22; then +if is_ubuntu22; then cargo install bindgen-cli cbindgen cargo-audit cargo-outdated else cargo install --locked bindgen-cli cbindgen cargo-audit cargo-outdated @@ -29,6 +29,6 @@ fi rm -rf ${CARGO_HOME}/registry/* # Update /etc/environemnt -prependEtcEnvironmentPath '$HOME/.cargo/bin' +prepend_etc_environment_path '$HOME/.cargo/bin' invoke_tests "Tools" "Rust" diff --git a/images/ubuntu/scripts/build/install-selenium.sh b/images/ubuntu/scripts/build/install-selenium.sh index 1a18510fb796..3b9360762c19 100644 --- a/images/ubuntu/scripts/build/install-selenium.sh +++ b/images/ubuntu/scripts/build/install-selenium.sh @@ -19,6 +19,6 @@ SELENIUM_FULL_VERSION=$(echo $SELENIUM_DOWNLOAD_URL | awk -F"selenium-server-|.j touch "/usr/share/java/selenium-server-$SELENIUM_FULL_VERSION" # Add SELENIUM_JAR_PATH environment variable -setEtcEnvironmentVariable "SELENIUM_JAR_PATH" "$SELENIUM_JAR_PATH" +set_etc_environment_variable "SELENIUM_JAR_PATH" "$SELENIUM_JAR_PATH" invoke_tests "Tools" "Selenium" diff --git a/images/ubuntu/scripts/build/install-sqlpackage.sh b/images/ubuntu/scripts/build/install-sqlpackage.sh index 537d1b29bc0c..d8dcb89ed1f9 100644 --- a/images/ubuntu/scripts/build/install-sqlpackage.sh +++ b/images/ubuntu/scripts/build/install-sqlpackage.sh @@ -9,7 +9,7 @@ source $HELPER_SCRIPTS/install.sh source $HELPER_SCRIPTS/os.sh # Install libssl1.1 dependency -if isUbuntu22; then +if is_ubuntu22; then libssl_deb_path=$(download_with_retry "http://security.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.1f-1ubuntu2.20_amd64.deb") libssl_hash="0b3251aee55db6e20d02f4b9a2b703c9874a85ab6a20b12f4870f52f91633d37" use_checksum_comparison "$libssl_deb_path" "$libssl_hash" diff --git a/images/ubuntu/scripts/build/install-swift.sh b/images/ubuntu/scripts/build/install-swift.sh index 64fc6637f237..43e3f2b16ee7 100644 --- a/images/ubuntu/scripts/build/install-swift.sh +++ b/images/ubuntu/scripts/build/install-swift.sh @@ -42,6 +42,6 @@ ln -s "$SWIFT_BIN_ROOT/swift" /usr/local/bin/swift ln -s "$SWIFT_BIN_ROOT/swiftc" /usr/local/bin/swiftc ln -s "$SWIFT_LIB_ROOT/libsourcekitdInProc.so" /usr/local/lib/libsourcekitdInProc.so -setEtcEnvironmentVariable "SWIFT_PATH" "${SWIFT_BIN_ROOT}" +set_etc_environment_variable "SWIFT_PATH" "${SWIFT_BIN_ROOT}" invoke_tests "Common" "Swift" diff --git a/images/ubuntu/scripts/build/install-vcpkg.sh b/images/ubuntu/scripts/build/install-vcpkg.sh index 8d407cad5aba..5fd65f39c5d3 100644 --- a/images/ubuntu/scripts/build/install-vcpkg.sh +++ b/images/ubuntu/scripts/build/install-vcpkg.sh @@ -9,7 +9,7 @@ source $HELPER_SCRIPTS/etc-environment.sh # Set env variable for vcpkg VCPKG_INSTALLATION_ROOT=/usr/local/share/vcpkg -setEtcEnvironmentVariable "VCPKG_INSTALLATION_ROOT" "${VCPKG_INSTALLATION_ROOT}" +set_etc_environment_variable "VCPKG_INSTALLATION_ROOT" "${VCPKG_INSTALLATION_ROOT}" # Install vcpkg git clone https://github.com/Microsoft/vcpkg $VCPKG_INSTALLATION_ROOT diff --git a/images/ubuntu/scripts/helpers/etc-environment.sh b/images/ubuntu/scripts/helpers/etc-environment.sh index 7ec5907dce1e..4255c9d01a3f 100644 --- a/images/ubuntu/scripts/helpers/etc-environment.sh +++ b/images/ubuntu/scripts/helpers/etc-environment.sh @@ -8,68 +8,67 @@ # values containg slashes (i.e. directory path) # The values containing '%' will break the functions -getEtcEnvironmentVariable () { - variable_name="$1" +get_etc_environment_variable() { + local variable_name=$1 # remove `variable_name=` and possible quotes from the line grep "^${variable_name}=" /etc/environment | sed -E "s%^${variable_name}=\"?([^\"]+)\"?.*$%\1%" } -addEtcEnvironmentVariable () { - variable_name="$1" - variable_value="$2" +add_etc_environment_variable() { + local variable_name=$1 + local variable_value=$2 echo "${variable_name}=${variable_value}" | sudo tee -a /etc/environment } -replaceEtcEnvironmentVariable () { - variable_name="$1" - variable_value="$2" +replace_etc_environment_variable() { + local variable_name=$1 + local variable_value=$2 # modify /etc/environemnt in place by replacing a string that begins with variable_name sudo sed -i -e "s%^${variable_name}=.*$%${variable_name}=\"${variable_value}\"%" /etc/environment } -setEtcEnvironmentVariable () { - variable_name="$1" - variable_value="$2" +set_etc_environment_variable() { + local variable_name=$1 + local variable_value=$2 - if grep "^${variable_name}=" /etc/environment > /dev/null - then - replaceEtcEnvironmentVariable $variable_name $variable_value + if grep "^${variable_name}=" /etc/environment > /dev/null; then + replace_etc_environment_variable $variable_name $variable_value else - addEtcEnvironmentVariable $variable_name $variable_value + add_etc_environment_variable $variable_name $variable_value fi } -prependEtcEnvironmentVariable () { - variable_name="$1" - element="$2" +prepend_etc_environment_variable() { + local variable_name=$1 + local element=$2 # TODO: handle the case if the variable does not exist - existing_value=$(getEtcEnvironmentVariable "${variable_name}") - setEtcEnvironmentVariable "${variable_name}" "${element}:${existing_value}" + existing_value=$(get_etc_environment_variable "${variable_name}") + set_etc_environment_variable "${variable_name}" "${element}:${existing_value}" } -appendEtcEnvironmentVariable () { - variable_name="$1" - element="$2" +append_etc_environment_variable() { + local variable_name=$1 + local element=$2 # TODO: handle the case if the variable does not exist - existing_value=$(getEtcEnvironmentVariable "${variable_name}") - setEtcEnvironmentVariable "${variable_name}" "${existing_value}:${element}" + existing_value=$(get_etc_environment_variable "${variable_name}") + set_etc_environment_variable "${variable_name}" "${existing_value}:${element}" } -prependEtcEnvironmentPath () { - element="$1" +prepend_etc_environment_path() { + local element=$1 - prependEtcEnvironmentVariable PATH "${element}" + prepend_etc_environment_variable PATH "${element}" } -appendEtcEnvironmentPath () { - element="$1" +append_etc_environment_path() { + local element=$1 - appendEtcEnvironmentVariable PATH "${element}" + append_etc_environment_variable PATH "${element}" } # Process /etc/environment as if it were shell script with `export VAR=...` expressions @@ -81,10 +80,10 @@ appendEtcEnvironmentPath () { # TODO: there might be the others variables to be processed in the same way as "PATH" variable # ie MANPATH, INFOPATH, LD_*, etc. In the current implementation the values from /etc/evironments # replace the values of the current environment -reloadEtcEnvironment () { +reload_etc_environment() { # add `export ` to every variable of /etc/environemnt except PATH and eval the result shell script eval $(grep -v '^PATH=' /etc/environment | sed -e 's%^%export %') # handle PATH specially - etc_path=$(getEtcEnvironmentVariable PATH) + etc_path=$(get_etc_environment_variable PATH) export PATH="$PATH:$etc_path" } diff --git a/images/ubuntu/scripts/helpers/install.sh b/images/ubuntu/scripts/helpers/install.sh index 40a0b816199b..626e06f73a44 100644 --- a/images/ubuntu/scripts/helpers/install.sh +++ b/images/ubuntu/scripts/helpers/install.sh @@ -5,8 +5,8 @@ ################################################################################ download_with_retry() { - url=$1 - download_path=$2 + local url=$1 + local download_path=$2 if [ -z "$download_path" ]; then download_path="/tmp/$(basename "$url")" @@ -45,15 +45,6 @@ download_with_retry() { echo "$download_path" } -## Use dpkg to figure out if a package has already been installed -## Example use: -## if ! IsPackageInstalled packageName; then -## echo "packageName is not installed!" -## fi -IsPackageInstalled() { - dpkg -S $1 &> /dev/null -} - get_toolset_value() { local toolset_path="/imagegeneration/installers/toolset.json" local query=$1 diff --git a/images/ubuntu/scripts/helpers/os.sh b/images/ubuntu/scripts/helpers/os.sh index 894ee025a8d5..c500ab582e83 100644 --- a/images/ubuntu/scripts/helpers/os.sh +++ b/images/ubuntu/scripts/helpers/os.sh @@ -4,17 +4,14 @@ ## Desc: Helper functions for OS releases ################################################################################ -function isUbuntu20 -{ +is_ubuntu20() { lsb_release -d | grep -q 'Ubuntu 20' } -function isUbuntu22 -{ +is_ubuntu22() { lsb_release -d | grep -q 'Ubuntu 22' } -function getOSVersionLabel -{ +get_os_version_label() { lsb_release -cs } From 62a46d0fd896885c49f08d0d35b9a7dd6ad24bbe Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Wed, 27 Dec 2023 10:44:43 +0100 Subject: [PATCH 2564/3485] [Windows] Update the Packer version output (#9067) --- images/windows/scripts/docs-gen/SoftwareReport.Tools.psm1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/windows/scripts/docs-gen/SoftwareReport.Tools.psm1 b/images/windows/scripts/docs-gen/SoftwareReport.Tools.psm1 index e179c5d8a1d7..757316b6dfea 100644 --- a/images/windows/scripts/docs-gen/SoftwareReport.Tools.psm1 +++ b/images/windows/scripts/docs-gen/SoftwareReport.Tools.psm1 @@ -149,7 +149,7 @@ function Get-OpenSSLVersion { } function Get-PackerVersion { - $packerVersion = packer --version + $packerVersion = (packer --version | Select-String "^Packer").Line.Replace('v','') | Get-StringPart -Part 1 return $packerVersion } From 62aeae3a20921f9d786df0e2db560c6d0d70afa5 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Wed, 27 Dec 2023 16:00:04 +0100 Subject: [PATCH 2565/3485] [macOS] pin pwsh-core in toolset (#9070) --- images/macos/scripts/build/install-powershell.sh | 12 ++++++++++-- images/macos/toolsets/toolset-11.json | 3 +++ images/macos/toolsets/toolset-12.json | 3 +++ images/macos/toolsets/toolset-13.json | 3 +++ images/macos/toolsets/toolset-14.json | 3 +++ 5 files changed, 22 insertions(+), 2 deletions(-) diff --git a/images/macos/scripts/build/install-powershell.sh b/images/macos/scripts/build/install-powershell.sh index b38ff10e7b83..557d0f76721b 100644 --- a/images/macos/scripts/build/install-powershell.sh +++ b/images/macos/scripts/build/install-powershell.sh @@ -10,8 +10,16 @@ echo Installing PowerShell... arch=$(get_arch) metadata_json_path=$(download_with_retry "https://raw.githubusercontent.com/PowerShell/PowerShell/master/tools/metadata.json") -version=$(jq -r '.LTSReleaseTag[0]' "$metadata_json_path") -download_url=$(resolve_github_release_asset_url "PowerShell/PowerShell" "contains(\"osx-$arch.pkg\")" "$version" "$API_PAT") +pwshVersionToolset=$(get_toolset_value '.pwsh.version') +pwshVersions=$(jq -r '.LTSReleaseTag[]' "$metadata_json_path") + +for version in ${pwshVersions[@]}; do + if [[ "$version" =~ "$pwshVersionToolset" ]]; then + download_url=$(resolve_github_release_asset_url "PowerShell/PowerShell" "contains(\"osx-$arch.pkg\")" "$version" "$API_PAT") + break + fi +done + pkg_path=$(download_with_retry "$download_url") # Work around the issue on macOS Big Sur 11.5 or higher for possible error message ("can't be opened because Apple cannot check it for malicious software") when installing the package diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index d278f8ed8b04..e7bdd309e029 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -361,5 +361,8 @@ }, "postgresql": { "version": "14" + }, + "pwsh": { + "version": "7.2" } } diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index 8e9e51711898..979e24819dd2 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -349,5 +349,8 @@ }, "postgresql": { "version": "14" + }, + "pwsh": { + "version": "7.2" } } diff --git a/images/macos/toolsets/toolset-13.json b/images/macos/toolsets/toolset-13.json index 5f29d86fbf51..0de30a0f61c5 100644 --- a/images/macos/toolsets/toolset-13.json +++ b/images/macos/toolsets/toolset-13.json @@ -234,5 +234,8 @@ "version": "3.15.4", "sha256": "356dab61433b5be76b76fd0e2e979bda56d164f6d85a900e55c3a4a5fffa28de" } + }, + "pwsh": { + "version": "7.2" } } diff --git a/images/macos/toolsets/toolset-14.json b/images/macos/toolsets/toolset-14.json index b5a71ba03942..b06ee6c0745a 100644 --- a/images/macos/toolsets/toolset-14.json +++ b/images/macos/toolsets/toolset-14.json @@ -126,6 +126,9 @@ "php": { "version": "8.3" }, + "pwsh": { + "version": "7.2" + }, "mono": { "framework":{ "version": "6.12.0.188", From e9057a22fc960311b58a0f03eb87fdc5c78db664 Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Wed, 27 Dec 2023 18:39:58 +0100 Subject: [PATCH 2566/3485] [ubuntu] Refactor PowerShell build scripts (#9064) * [ubuntu] Refactor PowerShell build scripts * Add Module import * Add Invoke-DownloadWithRetry function * Fix temp download dir * Update function to Add-GlobalEnvironmentVariable --- .../scripts/build/Configure-Toolset.ps1 | 112 ++++++++---------- .../build/Install-PowerShellAzModules.ps1 | 26 ++-- .../build/Install-PowerShellModules.ps1 | 18 ++- .../ubuntu/scripts/build/Install-Toolset.ps1 | 35 +++--- .../scripts/helpers/Common.Helpers.psm1 | 76 +++++++++++- 5 files changed, 162 insertions(+), 105 deletions(-) diff --git a/images/ubuntu/scripts/build/Configure-Toolset.ps1 b/images/ubuntu/scripts/build/Configure-Toolset.ps1 index 657915f3b33b..df7e8efe3ef8 100644 --- a/images/ubuntu/scripts/build/Configure-Toolset.ps1 +++ b/images/ubuntu/scripts/build/Configure-Toolset.ps1 @@ -4,91 +4,79 @@ ## Desc: Configure toolset ################################################################################ -Import-Module "$env:HELPER_SCRIPTS/../tests/Helpers.psm1" -DisableNameChecking - -function Get-ToolsetToolFullPath -{ - param - ( - [Parameter(Mandatory)] [string] $ToolName, - [Parameter(Mandatory)] [string] $ToolVersion, - [Parameter(Mandatory)] [string] $ToolArchitecture +Import-Module "$env:HELPER_SCRIPTS/../tests/Helpers.psm1" + +function Get-TCToolVersionPath { + param( + [Parameter(Mandatory)] + [string] $ToolName, + [Parameter(Mandatory)] + [string] $ToolVersion, + [Parameter(Mandatory)] + [string] $ToolArchitecture ) - $toolPath = Join-Path -Path $env:AGENT_TOOLSDIRECTORY -ChildPath $toolName - $toolPathVersion = Join-Path -Path $toolPath -ChildPath $toolVersion - $foundVersion = Get-Item $toolPathVersion | Sort-Object -Property {[version]$_.name} -Descending | Select-Object -First 1 - $installationDir = Join-Path -Path $foundVersion -ChildPath $toolArchitecture + $toolPath = Join-Path -Path $env:AGENT_TOOLSDIRECTORY -ChildPath $ToolName + $toolPathVersion = Join-Path -Path $toolPath -ChildPath $ToolVersion + $foundVersion = Get-Item $toolPathVersion | Sort-Object -Property { [version] $_.name } -Descending | Select-Object -First 1 + $installationDir = Join-Path -Path $foundVersion -ChildPath $ToolArchitecture + return $installationDir } -function Add-EnvironmentVariable -{ - param - ( - [Parameter(Mandatory)] [string] $Name, - [Parameter(Mandatory)] [string] $Value, +function Add-GlobalEnvironmentVariable { + param( + [Parameter(Mandatory)] + [string] $Name, + [Parameter(Mandatory)] + [string] $Value, [string] $FilePath = "/etc/environment" ) - $envVar = "{0}={1}" -f $name, $value - Tee-Object -InputObject $envVar -FilePath $filePath -Append + $envVar = "{0}={1}" -f $Name, $Value + Tee-Object -InputObject $envVar -FilePath $FilePath -Append } $ErrorActionPreference = "Stop" -Write-Host "Configure toolset tools environment..." -$toolsEnvironment = @{ +Write-Host "Configure toolcache tools environment..." +$toolEnvConfigs = @{ go = @{ - command = "ln -s {0}/bin/* /usr/bin/" + command = "ln -s {0}/bin/* /usr/bin/" variableTemplate = "GOROOT_{0}_{1}_X64" } } -$toolset = Get-Content -Path "$env:INSTALLER_SCRIPT_FOLDER/toolset.json" -Raw | ConvertFrom-Json - -foreach ($tool in $toolset.toolcache) -{ - $toolName = $tool.name - $toolArch = $tool.arch - $toolEnvironment = $toolsEnvironment[$toolName] +# Get toolcache content from toolset +$tools = (Get-ToolsetContent).toolcache | Where-Object { $toolEnvConfigs.Keys -contains $_.name } - if (-not $toolEnvironment) - { - continue - } +foreach ($tool in $tools) { + $toolEnvConfig = $toolEnvConfigs[$tool.name] - foreach ($toolVersion in $tool.versions) - { - Write-Host "Set $toolName $toolVersion environment variable..." - $toolPath = Get-ToolsetToolFullPath -ToolName $toolName -ToolVersion $toolVersion -ToolArchitecture $toolArch - $envName = $toolEnvironment.variableTemplate -f $toolVersion.split(".") + if (-not ([string]::IsNullOrEmpty($toolEnvConfig.variableTemplate))) { + foreach ($toolVersion in $tool.versions) { + Write-Host "Set $($tool.name) $toolVersion environment variable..." + $toolPath = Get-TCToolVersionPath -ToolName $tool.name -ToolVersion $toolVersion -ToolArchitecture $tool.arch + $envVariableName = $toolEnvConfig.variableTemplate -f $toolVersion.split(".") - # Add environment variable name=value - Add-EnvironmentVariable -Name $envName -Value $toolPath + Add-GlobalEnvironmentVariable -Name $envVariableName -Value $toolPath + } } # Invoke command and add env variable for the default tool version - $toolDefVersion = $tool.default - if (-not $toolDefVersion) - { - continue - } - - $envDefName = $toolEnvironment.defaultVariable - $toolPath = Get-ToolsetToolFullPath -ToolName $toolName -ToolVersion $toolDefVersion -ToolArchitecture $toolArch - - if ($envDefName) - { - Write-Host "Set default $envDefName for $toolName $toolDefVersion environment variable..." - Add-EnvironmentVariable -Name $envDefName -Value $toolPath - } - - if ($toolEnvironment.command) - { - $command = $toolEnvironment.command -f $toolPath - Write-Host "Invoke $command command for default $toolName $toolDefVersion..." - Invoke-Expression -Command $command + if (-not ([string]::IsNullOrEmpty($tool.default))) { + $toolDefaultPath = Get-TCToolVersionPath -ToolName $tool.name -ToolVersion $tool.default -ToolArchitecture $tool.arch + + if (-not ([string]::IsNullOrEmpty($toolEnvConfig.defaultVariable))) { + Write-Host "Set default $($toolEnvConfig.defaultVariable) for $($tool.name) $($tool.default) environment variable..." + Add-GlobalEnvironmentVariable -Name $toolEnvConfig.defaultVariable -Value $toolDefaultPath + } + + if (-not ([string]::IsNullOrEmpty($toolEnvConfig.command))) { + $command = $toolEnvConfig.command -f $toolDefaultPath + Write-Host "Invoke $command command for default $($tool.name) $($tool.default) ..." + Invoke-Expression -Command $command + } } } diff --git a/images/ubuntu/scripts/build/Install-PowerShellAzModules.ps1 b/images/ubuntu/scripts/build/Install-PowerShellAzModules.ps1 index 081c8c45b95a..6dd5fef883e1 100644 --- a/images/ubuntu/scripts/build/Install-PowerShellAzModules.ps1 +++ b/images/ubuntu/scripts/build/Install-PowerShellAzModules.ps1 @@ -6,18 +6,17 @@ $ErrorActionPreference = "Stop" $ProgressPreference = "SilentlyContinue" -Import-Module "$env:HELPER_SCRIPTS/../tests/Helpers.psm1" -DisableNameChecking +Import-Module "$env:HELPER_SCRIPTS/../tests/Helpers.psm1" # Get modules content from toolset $modules = (Get-ToolsetContent).azureModules $installPSModulePath = "/usr/share" -foreach ($module in $modules) -{ +foreach ($module in $modules) { $moduleName = $module.name + Write-Host "Installing ${moduleName} to the ${installPSModulePath} path..." - foreach ($version in $module.versions) - { + foreach ($version in $module.versions) { $modulePath = Join-Path -Path $installPSModulePath -ChildPath "${moduleName}_${version}" Write-Host " - $version [$modulePath]" Save-Module -Path $modulePath -Name $moduleName -RequiredVersion $version -Force @@ -28,17 +27,16 @@ foreach ($module in $modules) # Get github release asset for each version foreach ($toolVersion in $module.zip_versions) { $asset = $assets | Where-Object version -eq $toolVersion ` - | Select-Object -ExpandProperty files ` - | Select-Object -First 1 - - Write-Host "Installing $($module.name) $toolVersion ..." - if ($null -ne $asset) { - Write-Host "Download $($asset.filename)" - wget $asset.download_url -nv --retry-connrefused --tries=10 -P $installPSModulePath - } else { - Write-Host "Asset was not found in versions manifest" + | Select-Object -ExpandProperty files ` + | Select-Object -First 1 + + if (-not $asset) { + Write-Host "Asset for ${moduleName} ${toolVersion} was not found in versions manifest" exit 1 } + + Write-Host "Downloading asset for ${moduleName} ${toolVersion}: $($asset.filename)" + Invoke-DownloadWithRetry $asset.download_url -Destination "$installPSModulePath/$($asset.filename)" } } diff --git a/images/ubuntu/scripts/build/Install-PowerShellModules.ps1 b/images/ubuntu/scripts/build/Install-PowerShellModules.ps1 index 82e09f3840c9..14bb757e483c 100644 --- a/images/ubuntu/scripts/build/Install-PowerShellModules.ps1 +++ b/images/ubuntu/scripts/build/Install-PowerShellModules.ps1 @@ -6,7 +6,7 @@ $ErrorActionPreference = "Stop" $ProgressPreference = "SilentlyContinue" -Import-Module "$env:HELPER_SCRIPTS/../tests/Helpers.psm1" -DisableNameChecking +Import-Module "$env:HELPER_SCRIPTS/../tests/Helpers.psm1" # Specifies the installation policy Set-PSRepository -InstallationPolicy Trusted -Name PSGallery @@ -18,22 +18,18 @@ Update-Module -Name PowerShellGet -Force # Install PowerShell modules $modules = (Get-ToolsetContent).powershellModules -foreach($module in $modules) -{ +foreach($module in $modules) { $moduleName = $module.name - Write-Host "Installing ${moduleName} module" - if ($module.versions) - { - foreach ($version in $module.versions) - { + Write-Host "Installing ${moduleName} module" + if ($module.versions) { + foreach ($version in $module.versions) { Write-Host " - $version" Install-Module -Name $moduleName -RequiredVersion $version -Scope AllUsers -SkipPublisherCheck -Force } - continue + } else { + Install-Module -Name $moduleName -Scope AllUsers -SkipPublisherCheck -Force } - - Install-Module -Name $moduleName -Scope AllUsers -SkipPublisherCheck -Force } Invoke-PesterTests -TestFile "PowerShellModules" -TestName "PowerShellModules" diff --git a/images/ubuntu/scripts/build/Install-Toolset.ps1 b/images/ubuntu/scripts/build/Install-Toolset.ps1 index 87c14f512ea8..6c53b6089aaf 100644 --- a/images/ubuntu/scripts/build/Install-Toolset.ps1 +++ b/images/ubuntu/scripts/build/Install-Toolset.ps1 @@ -4,19 +4,21 @@ ## Desc: Install toolset ################################################################################ -Function Install-Asset { +Import-Module "$env:HELPER_SCRIPTS/../tests/Helpers.psm1" + +function Install-Asset { param( [Parameter(Mandatory = $true)] [object] $ReleaseAsset ) Write-Host "Download $($ReleaseAsset.filename)" - wget $ReleaseAsset.download_url -nv --retry-connrefused --tries=10 + $assetArchivePath = Invoke-DownloadWithRetry $ReleaseAsset.download_url Write-Host "Extract $($ReleaseAsset.filename) content..." - $assetFolderPath = Join-Path "/tmp" $($ReleaseAsset.filename) - New-Item -ItemType Directory -Path $assetFolderPath - tar -xzf $ReleaseAsset.filename -C $assetFolderPath + $assetFolderPath = Join-Path "/tmp" "$($ReleaseAsset.filename)-temp-dir" + New-Item -ItemType Directory -Path $assetFolderPath | Out-Null + tar -xzf $assetArchivePath -C $assetFolderPath Write-Host "Invoke installation script..." Push-Location -Path $assetFolderPath @@ -26,10 +28,8 @@ Function Install-Asset { $ErrorActionPreference = "Stop" -# Get toolset content -$toolset = Get-Content -Path "$env:INSTALLER_SCRIPT_FOLDER/toolset.json" -Raw - -$tools = ConvertFrom-Json -InputObject $toolset | Select-Object -ExpandProperty toolcache | Where-Object {$_.url -ne $null } +# Get toolcache content from toolset +$tools = (Get-ToolsetContent).toolcache | Where-Object { $_.url -ne $null } foreach ($tool in $tools) { # Get versions manifest for current tool @@ -38,17 +38,18 @@ foreach ($tool in $tools) { # Get github release asset for each version foreach ($toolVersion in $tool.versions) { $asset = $assets | Where-Object version -like $toolVersion ` - | Select-Object -ExpandProperty files ` - | Where-Object { ($_.platform -eq $tool.platform) -and ($_.platform_version -eq $tool.platform_version)} ` - | Select-Object -First 1 + | Select-Object -ExpandProperty files ` + | Where-Object { ($_.platform -eq $tool.platform) -and ($_.platform_version -eq $tool.platform_version)} ` + | Select-Object -First 1 - Write-Host "Installing $($tool.name) $toolVersion $($tool.arch)..." - if ($null -ne $asset) { - Install-Asset -ReleaseAsset $asset - } else { - Write-Host "Asset was not found in versions manifest" + if (-not $asset) { + Write-Host "Asset for $($tool.name) $toolVersion $($tool.arch) not found in versions manifest" exit 1 } + + Write-Host "Installing $($tool.name) $toolVersion $($tool.arch)..." + Install-Asset -ReleaseAsset $asset } + chown -R "$($env:SUDO_USER):$($env:SUDO_USER)" "/opt/hostedtoolcache/$($tool.name)" } diff --git a/images/ubuntu/scripts/helpers/Common.Helpers.psm1 b/images/ubuntu/scripts/helpers/Common.Helpers.psm1 index 22376cd4fa3a..1f740345228b 100644 --- a/images/ubuntu/scripts/helpers/Common.Helpers.psm1 +++ b/images/ubuntu/scripts/helpers/Common.Helpers.psm1 @@ -24,7 +24,7 @@ function Get-CommandResult { This command runs "ls -la" in bash and returns the output and exit code as hashtable. #> - param ( + param( [Parameter(Mandatory=$true)] [string] $Command, [int[]] $ExpectedExitCode = 0, @@ -76,3 +76,77 @@ function Get-ToolsetContent { $toolsetJson = Get-Content -Path $toolsetPath -Raw ConvertFrom-Json -InputObject $toolsetJson } + +function Invoke-DownloadWithRetry { + <# + .SYNOPSIS + Downloads a file from a given URL with retry functionality. + + .DESCRIPTION + The Invoke-DownloadWithRetry function downloads a file from the specified URL + to the specified path. It includes retry functionality in case the download fails. + + .PARAMETER Url + The URL of the file to download. + + .PARAMETER Path + The path where the downloaded file will be saved. If not provided, a temporary path + will be used. + + .EXAMPLE + Invoke-DownloadWithRetry -Url "https://example.com/file.zip" -Path "/usr/local/bin" + Downloads the file from the specified URL and saves it to the specified path. + + .EXAMPLE + Invoke-DownloadWithRetry -Url "https://example.com/file.zip" + Downloads the file from the specified URL and saves it to a temporary path. + + .OUTPUTS + The path where the downloaded file is saved. + #> + param( + [Parameter(Mandatory)] + [string] $Url, + [Alias("Destination")] + [string] $DestinationPath + ) + + if (-not $DestinationPath) { + $invalidChars = [IO.Path]::GetInvalidFileNameChars() -join '' + $re = "[{0}]" -f [RegEx]::Escape($invalidChars) + $fileName = [IO.Path]::GetFileName($Url) -replace $re + + if ([String]::IsNullOrEmpty($fileName)) { + $fileName = [System.IO.Path]::GetRandomFileName() + } + $DestinationPath = Join-Path -Path "/tmp" -ChildPath $fileName + } + + Write-Host "Downloading package from $Url to $DestinationPath..." + + $interval = 30 + $downloadStartTime = Get-Date + for ($retries = 20; $retries -gt 0; $retries--) { + try { + $attemptStartTime = Get-Date + (New-Object System.Net.WebClient).DownloadFile($Url, $DestinationPath) + $attemptSeconds = [math]::Round(($(Get-Date) - $attemptStartTime).TotalSeconds, 2) + Write-Host "Package downloaded in $attemptSeconds seconds" + break + } catch { + $attemptSeconds = [math]::Round(($(Get-Date) - $attemptStartTime).TotalSeconds, 2) + Write-Warning "Package download failed in $attemptSeconds seconds" + Write-Warning $_.Exception.Message + } + + if ($retries -eq 0) { + $totalSeconds = [math]::Round(($(Get-Date) - $downloadStartTime).TotalSeconds, 2) + throw "Package download failed after $totalSeconds seconds" + } + + Write-Warning "Waiting $interval seconds before retrying (retries left: $retries)..." + Start-Sleep -Seconds $interval + } + + return $DestinationPath +} From 34b6b3172fd0df92534a35723efd7489aa44682a Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Thu, 28 Dec 2023 11:18:57 +0100 Subject: [PATCH 2567/3485] [windows] pin pwsh in toolset (#9072) --- .../windows/scripts/build/Install-PowershellCore.ps1 | 11 +++++++++-- images/windows/toolsets/toolset-2019.json | 3 +++ images/windows/toolsets/toolset-2022.json | 3 +++ 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/images/windows/scripts/build/Install-PowershellCore.ps1 b/images/windows/scripts/build/Install-PowershellCore.ps1 index d14d0e30e56f..68a3bc80ab0d 100644 --- a/images/windows/scripts/build/Install-PowershellCore.ps1 +++ b/images/windows/scripts/build/Install-PowershellCore.ps1 @@ -13,8 +13,15 @@ try { [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12 $metadata = Invoke-RestMethod https://raw.githubusercontent.com/PowerShell/PowerShell/master/tools/metadata.json - $release = $metadata.LTSReleaseTag[0] -replace '^v' - $downloadUrl = "https://github.com/PowerShell/PowerShell/releases/download/v${release}/PowerShell-${release}-win-x64.msi" + $pwshMajorMinor = (Get-ToolsetContent).pwsh.version + + $releases = $metadata.LTSReleaseTag -replace '^v' + foreach ($release in $releases) { + if ($release -like "${pwshMajorMinor}*") { + $downloadUrl = "https://github.com/PowerShell/PowerShell/releases/download/v${release}/PowerShell-${release}-win-x64.msi" + break + } + } $installerName = Split-Path $downloadUrl -Leaf $externalHash = Get-ChecksumFromUrl -Type "SHA256" ` diff --git a/images/windows/toolsets/toolset-2019.json b/images/windows/toolsets/toolset-2019.json index 5f3dcbdc3357..6669619061a0 100644 --- a/images/windows/toolsets/toolset-2019.json +++ b/images/windows/toolsets/toolset-2019.json @@ -491,5 +491,8 @@ }, "openssl": { "version": "1.1.1" + }, + "pwsh": { + "version": "7.2" } } diff --git a/images/windows/toolsets/toolset-2022.json b/images/windows/toolsets/toolset-2022.json index 0312de3aec2b..200bc3c6f1e0 100644 --- a/images/windows/toolsets/toolset-2022.json +++ b/images/windows/toolsets/toolset-2022.json @@ -431,5 +431,8 @@ }, "openssl": { "version": "1.1.1" + }, + "pwsh": { + "version": "7.2" } } From e16b5524ff45f46e6d326a374601c6bf87f364a4 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Thu, 28 Dec 2023 11:19:26 +0100 Subject: [PATCH 2568/3485] [macOS] distinguish Arm64/M1 in the template (#9075) --- .github/ISSUE_TEMPLATE/announcement.yml | 1 + .github/ISSUE_TEMPLATE/bug-report.yml | 1 + .github/ISSUE_TEMPLATE/tool-request.yml | 1 + 3 files changed, 3 insertions(+) diff --git a/.github/ISSUE_TEMPLATE/announcement.yml b/.github/ISSUE_TEMPLATE/announcement.yml index 4eefc43a051c..0fc10d988347 100644 --- a/.github/ISSUE_TEMPLATE/announcement.yml +++ b/.github/ISSUE_TEMPLATE/announcement.yml @@ -41,6 +41,7 @@ body: - label: macOS 11 - label: macOS 12 - label: macOS 13 + - label: macOS 13 Arm64 - label: Windows Server 2019 - label: Windows Server 2022 - type: textarea diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml index c860387987f0..fa8ff0500623 100644 --- a/.github/ISSUE_TEMPLATE/bug-report.yml +++ b/.github/ISSUE_TEMPLATE/bug-report.yml @@ -24,6 +24,7 @@ body: - label: macOS 11 - label: macOS 12 - label: macOS 13 + - label: macOS 13 Arm64 - label: Windows Server 2019 - label: Windows Server 2022 - type: textarea diff --git a/.github/ISSUE_TEMPLATE/tool-request.yml b/.github/ISSUE_TEMPLATE/tool-request.yml index 308837bd7e0e..5d8d1db8a29b 100644 --- a/.github/ISSUE_TEMPLATE/tool-request.yml +++ b/.github/ISSUE_TEMPLATE/tool-request.yml @@ -62,6 +62,7 @@ body: - label: macOS 11 - label: macOS 12 - label: macOS 13 + - label: macOS 13 Arm64 - label: Windows Server 2019 - label: Windows Server 2022 - type: textarea From 1658c2e905519035090224ac30d61263f81a52a1 Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Fri, 29 Dec 2023 12:36:27 +0100 Subject: [PATCH 2569/3485] [ubuntu] Cleanup bash scripts (#9076) * [ubuntu] Cleanup bash scripts * Fix ms-repos lsb_release * Fix install-bicep url * Fix install-nvm --- images/ubuntu/scripts/build/cleanup.sh | 19 ++++---- .../scripts/build/configure-apt-mock.sh | 8 ++-- .../scripts/build/configure-apt-sources.sh | 1 + .../scripts/build/configure-environment.sh | 4 +- images/ubuntu/scripts/build/configure-snap.sh | 1 + .../ubuntu/scripts/build/configure-system.sh | 11 ++--- .../scripts/build/install-actions-cache.sh | 4 +- .../scripts/build/install-apt-common.sh | 3 ++ .../ubuntu/scripts/build/install-apt-vital.sh | 2 + images/ubuntu/scripts/build/install-azcopy.sh | 2 + .../ubuntu/scripts/build/install-azure-cli.sh | 1 + images/ubuntu/scripts/build/install-bazel.sh | 1 + images/ubuntu/scripts/build/install-bicep.sh | 5 +- images/ubuntu/scripts/build/install-cmake.sh | 2 + .../scripts/build/install-codeql-bundle.sh | 1 + .../scripts/build/install-container-tools.sh | 1 + .../scripts/build/install-docker-compose.sh | 11 +++-- images/ubuntu/scripts/build/install-docker.sh | 36 +++++++------- .../scripts/build/install-dotnetcore-sdk.sh | 48 ++++++++++--------- images/ubuntu/scripts/build/install-erlang.sh | 6 +-- .../ubuntu/scripts/build/install-firefox.sh | 19 ++++---- .../ubuntu/scripts/build/install-gfortran.sh | 2 + images/ubuntu/scripts/build/install-git.sh | 1 + .../scripts/build/install-github-cli.sh | 2 + .../scripts/build/install-google-chrome.sh | 44 ++++++++--------- .../ubuntu/scripts/build/install-haskell.sh | 20 ++++---- images/ubuntu/scripts/build/install-heroku.sh | 2 - images/ubuntu/scripts/build/install-hhvm.sh | 1 + .../scripts/build/install-java-tools.sh | 4 +- images/ubuntu/scripts/build/install-kotlin.sh | 1 + .../scripts/build/install-kubernetes-tools.sh | 18 ++++--- .../scripts/build/install-microsoft-edge.sh | 33 +++++++------ .../ubuntu/scripts/build/install-mongodb.sh | 11 ++--- images/ubuntu/scripts/build/install-mono.sh | 10 ++-- .../ubuntu/scripts/build/install-ms-repos.sh | 4 +- images/ubuntu/scripts/build/install-mysql.sh | 1 + images/ubuntu/scripts/build/install-nodejs.sh | 4 +- images/ubuntu/scripts/build/install-nvm.sh | 5 +- images/ubuntu/scripts/build/install-oc-cli.sh | 4 +- .../ubuntu/scripts/build/install-oras-cli.sh | 1 + images/ubuntu/scripts/build/install-packer.sh | 1 + .../ubuntu/scripts/build/install-phantomjs.sh | 10 ++-- images/ubuntu/scripts/build/install-php.sh | 7 ++- .../scripts/build/install-pipx-packages.sh | 22 ++++----- .../scripts/build/install-postgresql.sh | 6 +-- .../scripts/build/install-powershell.sh | 5 +- images/ubuntu/scripts/build/install-pypy.sh | 19 ++++---- images/ubuntu/scripts/build/install-python.sh | 2 + images/ubuntu/scripts/build/install-rlang.sh | 7 +-- images/ubuntu/scripts/build/install-ruby.sh | 47 +++++++++--------- .../ubuntu/scripts/build/install-selenium.sh | 12 ++--- .../scripts/build/install-sqlpackage.sh | 1 + images/ubuntu/scripts/build/install-swift.sh | 12 ++--- images/ubuntu/scripts/build/install-yq.sh | 9 ++-- images/ubuntu/scripts/build/install-zstd.sh | 4 +- images/ubuntu/scripts/helpers/os.sh | 4 -- 56 files changed, 275 insertions(+), 247 deletions(-) diff --git a/images/ubuntu/scripts/build/cleanup.sh b/images/ubuntu/scripts/build/cleanup.sh index c6cf5e5df882..d0fa9a0e6e01 100644 --- a/images/ubuntu/scripts/build/cleanup.sh +++ b/images/ubuntu/scripts/build/cleanup.sh @@ -26,20 +26,19 @@ find /var/log -type f -regex ".*\.[0-9]$" -delete # wipe log files find /var/log/ -type f -exec cp /dev/null {} \; -# after cleanup -after=$(df / -Pm | awk 'NR==2{print $4}') - -# display size - echo "Before: $before MB" - echo "After : $after MB" - echo "Delta : $(($after-$before)) MB" - # delete symlink for tests running rm -f /usr/local/bin/invoke_tests # remove apt mock prefix=/usr/local/bin - for tool in apt apt-get apt-fast apt-key;do - sudo rm -f $prefix/$tool + sudo rm -f $prefix/$tool done + +# after cleanup +after=$(df / -Pm | awk 'NR==2{print $4}') + +# display size +echo "Before: $before MB" +echo "After : $after MB" +echo "Delta : $(($after-$before)) MB" diff --git a/images/ubuntu/scripts/build/configure-apt-mock.sh b/images/ubuntu/scripts/build/configure-apt-mock.sh index 18af3ca002cc..e12b0f56d13b 100644 --- a/images/ubuntu/scripts/build/configure-apt-mock.sh +++ b/images/ubuntu/scripts/build/configure-apt-mock.sh @@ -7,9 +7,9 @@ prefix=/usr/local/bin -for real_tool in /usr/bin/apt /usr/bin/apt-get /usr/bin/apt-fast /usr/bin/apt-key;do - tool=`basename $real_tool` - cat >$prefix/$tool <<EOT +for real_tool in /usr/bin/apt /usr/bin/apt-get /usr/bin/apt-fast /usr/bin/apt-key; do + tool=$(basename $real_tool) + cat >$prefix/$tool <<EOT #!/bin/sh i=1 @@ -50,5 +50,5 @@ while [ \$i -le 30 ];do i=\$((i + 1)) done EOT - chmod +x $prefix/$tool + chmod +x $prefix/$tool done diff --git a/images/ubuntu/scripts/build/configure-apt-sources.sh b/images/ubuntu/scripts/build/configure-apt-sources.sh index 6b2ec4c91891..b5afda474a67 100644 --- a/images/ubuntu/scripts/build/configure-apt-sources.sh +++ b/images/ubuntu/scripts/build/configure-apt-sources.sh @@ -12,4 +12,5 @@ printf "http://security.ubuntu.com/ubuntu/\tpriority:3\n" | tee -a /etc/apt/apt- sed -i 's/http:\/\/azure.archive.ubuntu.com\/ubuntu\//mirror+file:\/etc\/apt\/apt-mirrors.txt/' /etc/apt/sources.list +# Apt changes to survive Cloud Init cp -f /etc/apt/sources.list /etc/cloud/templates/sources.list.ubuntu.tmpl diff --git a/images/ubuntu/scripts/build/configure-environment.sh b/images/ubuntu/scripts/build/configure-environment.sh index dbf93999d4ae..6db18e0a340c 100644 --- a/images/ubuntu/scripts/build/configure-environment.sh +++ b/images/ubuntu/scripts/build/configure-environment.sh @@ -43,8 +43,8 @@ echo 'fs.inotify.max_user_instances=1280' | tee -a /etc/sysctl.conf # https://github.com/actions/runner-images/pull/7860 netfilter_rule='/etc/udev/rules.d/50-netfilter.rules' -rulesd="$(dirname "${netfilter_rule}")" -mkdir -p $rulesd +rules_directory="$(dirname "${netfilter_rule}")" +mkdir -p $rules_directory touch $netfilter_rule echo 'ACTION=="add", SUBSYSTEM=="module", KERNEL=="nf_conntrack", RUN+="/usr/sbin/sysctl net.netfilter.nf_conntrack_tcp_be_liberal=1"' | tee -a $netfilter_rule diff --git a/images/ubuntu/scripts/build/configure-snap.sh b/images/ubuntu/scripts/build/configure-snap.sh index a08f3e4556b2..e1858f69fdd8 100644 --- a/images/ubuntu/scripts/build/configure-snap.sh +++ b/images/ubuntu/scripts/build/configure-snap.sh @@ -4,6 +4,7 @@ ## Desc: Configure snap ################################################################################ +# Source the helpers for use with the script source $HELPER_SCRIPTS/etc-environment.sh # Update /etc/environment to include /snap/bin in PATH diff --git a/images/ubuntu/scripts/build/configure-system.sh b/images/ubuntu/scripts/build/configure-system.sh index fcfe867c572e..652083eb23a3 100644 --- a/images/ubuntu/scripts/build/configure-system.sh +++ b/images/ubuntu/scripts/build/configure-system.sh @@ -24,11 +24,10 @@ add_etc_environment_variable "PATH" "${ENVPATH}" echo "Updated /etc/environment: $(cat /etc/environment)" # Сlean yarn and npm cache -if yarn --version > /dev/null -then - yarn cache clean +if yarn --version > /dev/null; then + yarn cache clean fi -if npm --version -then - npm cache clean --force + +if npm --version; then + npm cache clean --force fi diff --git a/images/ubuntu/scripts/build/install-actions-cache.sh b/images/ubuntu/scripts/build/install-actions-cache.sh index e50b94c9431f..22c2f71f5506 100644 --- a/images/ubuntu/scripts/build/install-actions-cache.sh +++ b/images/ubuntu/scripts/build/install-actions-cache.sh @@ -17,8 +17,8 @@ echo "Setting up ACTIONS_RUNNER_ACTION_ARCHIVE_CACHE variable to ${ACTION_ARCHIV set_etc_environment_variable "ACTIONS_RUNNER_ACTION_ARCHIVE_CACHE" "${ACTION_ARCHIVE_CACHE_DIR}" # Download latest release from github.com/actions/action-versions and untar to /opt/actionarchivecache -downloadUrl=$(resolve_github_release_asset_url "actions/action-versions" "endswith(\"action-versions.tar.gz\")" "latest") -archive_path=$(download_with_retry "$downloadUrl") +download_url=$(resolve_github_release_asset_url "actions/action-versions" "endswith(\"action-versions.tar.gz\")" "latest") +archive_path=$(download_with_retry "$download_url") tar -xzf "$archive_path" -C $ACTION_ARCHIVE_CACHE_DIR invoke_tests "ActionArchiveCache" diff --git a/images/ubuntu/scripts/build/install-apt-common.sh b/images/ubuntu/scripts/build/install-apt-common.sh index 7a63390dec54..590c5e41d991 100644 --- a/images/ubuntu/scripts/build/install-apt-common.sh +++ b/images/ubuntu/scripts/build/install-apt-common.sh @@ -3,10 +3,13 @@ ## File: install-apt-common.sh ## Desc: Install basic command line utilities and dev packages ################################################################################ + +# Source the helpers for use with the script source $HELPER_SCRIPTS/install.sh common_packages=$(get_toolset_value .apt.common_packages[]) cmd_packages=$(get_toolset_value .apt.cmd_packages[]) + for package in $common_packages $cmd_packages; do echo "Install $package" apt-get install -y --no-install-recommends $package diff --git a/images/ubuntu/scripts/build/install-apt-vital.sh b/images/ubuntu/scripts/build/install-apt-vital.sh index 69c18beac54f..26a3fa819be4 100644 --- a/images/ubuntu/scripts/build/install-apt-vital.sh +++ b/images/ubuntu/scripts/build/install-apt-vital.sh @@ -3,6 +3,8 @@ ## File: install-apt-vital.sh ## Desc: Install vital command line utilities ################################################################################ + +# Source the helpers for use with the script source $HELPER_SCRIPTS/install.sh vital_packages=$(get_toolset_value .apt.vital_packages[]) diff --git a/images/ubuntu/scripts/build/install-azcopy.sh b/images/ubuntu/scripts/build/install-azcopy.sh index 83132cc46c27..6865db8304af 100644 --- a/images/ubuntu/scripts/build/install-azcopy.sh +++ b/images/ubuntu/scripts/build/install-azcopy.sh @@ -4,6 +4,7 @@ ## Desc: Install AzCopy ################################################################################ +# Source the helpers for use with the script source $HELPER_SCRIPTS/install.sh # Install AzCopy10 @@ -11,6 +12,7 @@ source $HELPER_SCRIPTS/install.sh archive_path=$(download_with_retry "https://azcopyvnext.azureedge.net/releases/release-10.21.2-20231106/azcopy_linux_amd64_10.21.2.tar.gz") tar xzf "$archive_path" --strip-components=1 -C /tmp install /tmp/azcopy /usr/local/bin/azcopy + # Create azcopy 10 alias for backward compatibility ln -sf /usr/local/bin/azcopy /usr/local/bin/azcopy10 diff --git a/images/ubuntu/scripts/build/install-azure-cli.sh b/images/ubuntu/scripts/build/install-azure-cli.sh index eef93fe18212..a2665b592850 100644 --- a/images/ubuntu/scripts/build/install-azure-cli.sh +++ b/images/ubuntu/scripts/build/install-azure-cli.sh @@ -7,6 +7,7 @@ # Install Azure CLI (instructions taken from https://docs.microsoft.com/en-us/cli/azure/install-azure-cli) curl -fsSL https://aka.ms/InstallAzureCLIDeb | sudo bash echo "azure-cli https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt" >> $HELPER_SCRIPTS/apt-sources.txt + rm -f /etc/apt/sources.list.d/azure-cli.list rm -f /etc/apt/sources.list.d/azure-cli.list.save diff --git a/images/ubuntu/scripts/build/install-bazel.sh b/images/ubuntu/scripts/build/install-bazel.sh index 46d13998d22f..a9b066193315 100644 --- a/images/ubuntu/scripts/build/install-bazel.sh +++ b/images/ubuntu/scripts/build/install-bazel.sh @@ -4,6 +4,7 @@ ## Desc: Install Bazel and Bazelisk (A user-friendly launcher for Bazel) ################################################################################ +# Source the helpers for use with the script source $HELPER_SCRIPTS/install.sh # Install bazelisk diff --git a/images/ubuntu/scripts/build/install-bicep.sh b/images/ubuntu/scripts/build/install-bicep.sh index 840b95310d12..5cf996b96cf5 100644 --- a/images/ubuntu/scripts/build/install-bicep.sh +++ b/images/ubuntu/scripts/build/install-bicep.sh @@ -4,10 +4,13 @@ ## Desc: Install bicep cli ################################################################################ +# Source the helpers for use with the script source $HELPER_SCRIPTS/install.sh # Install Bicep CLI -bicep_binary_path=$(download_with_retry "https://github.com/Azure/bicep/releases/latest/download/bicep-linux-x64") +download_url=$(resolve_github_release_asset_url "Azure/bicep" "endswith(\"bicep-linux-x64\")" "latest") +bicep_binary_path=$(download_with_retry "${download_url}") + # Mark it as executable install "$bicep_binary_path" /usr/local/bin/bicep diff --git a/images/ubuntu/scripts/build/install-cmake.sh b/images/ubuntu/scripts/build/install-cmake.sh index 249f905e1483..3a53eec3e613 100644 --- a/images/ubuntu/scripts/build/install-cmake.sh +++ b/images/ubuntu/scripts/build/install-cmake.sh @@ -16,10 +16,12 @@ else # Download script to install CMake download_url=$(resolve_github_release_asset_url "Kitware/CMake" "endswith(\"inux-x86_64.sh\")" "latest") curl -fsSL "${download_url}" -o cmakeinstall.sh + # Supply chain security - CMake hash_url=$(resolve_github_release_asset_url "Kitware/CMake" "endswith(\"SHA-256.txt\")" "latest") external_hash=$(get_checksum_from_url "$hash_url" "linux-x86_64.sh" "SHA256") use_checksum_comparison "cmakeinstall.sh" "$external_hash" + # Install CMake and remove the install script chmod +x cmakeinstall.sh \ && ./cmakeinstall.sh --prefix=/usr/local --exclude-subdir \ diff --git a/images/ubuntu/scripts/build/install-codeql-bundle.sh b/images/ubuntu/scripts/build/install-codeql-bundle.sh index c9dd18120313..a92933aabfdf 100644 --- a/images/ubuntu/scripts/build/install-codeql-bundle.sh +++ b/images/ubuntu/scripts/build/install-codeql-bundle.sh @@ -4,6 +4,7 @@ ## Desc: Install CodeQL CLI Bundle to the toolcache. ################################################################################ +# Source the helpers for use with the script source $HELPER_SCRIPTS/install.sh # Retrieve the CLI version of the latest CodeQL bundle. diff --git a/images/ubuntu/scripts/build/install-container-tools.sh b/images/ubuntu/scripts/build/install-container-tools.sh index 130356945e82..f7374163719f 100644 --- a/images/ubuntu/scripts/build/install-container-tools.sh +++ b/images/ubuntu/scripts/build/install-container-tools.sh @@ -4,6 +4,7 @@ ## Desc: Install container tools: podman, buildah and skopeo onto the image ################################################################################ +# Source the helpers for use with the script source $HELPER_SCRIPTS/os.sh # diff --git a/images/ubuntu/scripts/build/install-docker-compose.sh b/images/ubuntu/scripts/build/install-docker-compose.sh index 3cd844adb2f2..4d152c77c391 100644 --- a/images/ubuntu/scripts/build/install-docker-compose.sh +++ b/images/ubuntu/scripts/build/install-docker-compose.sh @@ -8,13 +8,14 @@ # Source the helpers for use with the script source $HELPER_SCRIPTS/install.sh -# Install docker-compose v1 from releases -URL="https://github.com/docker/compose/releases/download/1.29.2/docker-compose-Linux-x86_64" -curl -fsSL "${URL}" -o /tmp/docker-compose-v1 +# Download docker-compose v1 from releases +binary_path=$(download_with_retry "https://github.com/docker/compose/releases/download/1.29.2/docker-compose-Linux-x86_64") # Supply chain security - Docker Compose v1 external_hash="f3f10cf3dbb8107e9ba2ea5f23c1d2159ff7321d16f0a23051d68d8e2547b323" -use_checksum_comparison "/tmp/docker-compose-v1" "${external_hash}" -install /tmp/docker-compose-v1 /usr/local/bin/docker-compose +use_checksum_comparison "${binary_path}" "${external_hash}" + +# Install docker-compose v1 +install "${binary_path}" "/usr/local/bin/docker-compose" invoke_tests "Tools" "Docker-compose v1" diff --git a/images/ubuntu/scripts/build/install-docker.sh b/images/ubuntu/scripts/build/install-docker.sh index cbbed19a85e0..039398bd4e3e 100644 --- a/images/ubuntu/scripts/build/install-docker.sh +++ b/images/ubuntu/scripts/build/install-docker.sh @@ -6,28 +6,28 @@ ################################################################################ # Source the helpers for use with the script -source $HELPER_SCRIPTS/os.sh source $HELPER_SCRIPTS/install.sh -repo_url="https://download.docker.com/linux/ubuntu" -gpg_key="/usr/share/keyrings/docker.gpg" -repo_path="/etc/apt/sources.list.d/docker.list" +REPO_URL="https://download.docker.com/linux/ubuntu" +GPG_KEY="/usr/share/keyrings/docker.gpg" +REPO_PATH="/etc/apt/sources.list.d/docker.list" -curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o $gpg_key -echo "deb [arch=amd64 signed-by=$gpg_key] $repo_url $(get_os_version_label) stable" > $repo_path +curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o $GPG_KEY +echo "deb [arch=amd64 signed-by=$GPG_KEY] $REPO_URL $(lsb_release -cs) stable" > $REPO_PATH apt-get update apt-get install --no-install-recommends docker-ce docker-ce-cli containerd.io docker-buildx-plugin # Download docker compose v2 from releases URL=$(resolve_github_release_asset_url "docker/compose" "endswith(\"compose-linux-x86_64\")" "latest") -curl -fsSL "${URL}" -o /tmp/docker-compose +compose_binary_path=$(download_with_retry "${URL}" "/tmp/docker-compose-v2") + # Supply chain security - Docker Compose v2 compose_hash_url=$(resolve_github_release_asset_url "docker/compose" "endswith(\"checksums.txt\")" "latest") compose_external_hash=$(get_checksum_from_url "${compose_hash_url}" "compose-linux-x86_64" "SHA256") -use_checksum_comparison "/tmp/docker-compose" "${compose_external_hash}" -# Install docker compose v2 -install /tmp/docker-compose /usr/libexec/docker/cli-plugins/docker-compose +use_checksum_comparison "${compose_binary_path}" "${compose_external_hash}" +# Install docker compose v2 +install "${compose_binary_path}" /usr/libexec/docker/cli-plugins/docker-compose # docker from official repo introduced different GID generation: https://github.com/actions/runner-images/issues/8157 gid=$(cut -d ":" -f 3 /etc/group | grep "^1..$" | sort -n | tail -n 1 | awk '{ print $1+1 }') @@ -42,11 +42,11 @@ systemctl is-enabled --quiet docker.service || systemctl enable docker.service sleep 10 docker info -if [ "${DOCKERHUB_PULL_IMAGES:-yes}" == "yes" ]; then +if [[ "${DOCKERHUB_PULL_IMAGES:-yes}" == "yes" ]]; then # If credentials are provided, attempt to log into Docker Hub # with a paid account to avoid Docker Hub's rate limit. - if [ "${DOCKERHUB_LOGIN}" ] && [ "${DOCKERHUB_PASSWORD}" ]; then - docker login --username "${DOCKERHUB_LOGIN}" --password "${DOCKERHUB_PASSWORD}" + if [[ "${DOCKERHUB_LOGIN}" ]] && [[ "${DOCKERHUB_PASSWORD}" ]]; then + docker login --username "${DOCKERHUB_LOGIN}" --password "${DOCKERHUB_PASSWORD}" fi # Pull images @@ -65,19 +65,21 @@ fi # Download amazon-ecr-credential-helper aws_latest_release_url="https://api.github.com/repos/awslabs/amazon-ecr-credential-helper/releases/latest" -aws_helper_url=$(curl "${authString[@]}" -fsSL "${aws_latest_release_url}" | jq -r '.body' | awk -F'[()]' '/linux-amd64/ {print $2}') +aws_helper_url=$(curl -fsSL "${aws_latest_release_url}" | jq -r '.body' | awk -F'[()]' '/linux-amd64/ {print $2}') aws_helper_binary_path=$(download_with_retry "$aws_helper_url") + # Supply chain security - amazon-ecr-credential-helper aws_helper_external_hash=$(get_checksum_from_url "${aws_helper_url}.sha256" "docker-credential-ecr-login" "SHA256") use_checksum_comparison "$aws_helper_binary_path" "$aws_helper_external_hash" + # Install amazon-ecr-credential-helper install "$aws_helper_binary_path" "/usr/bin/docker-credential-ecr-login" # Cleanup custom repositories -rm $gpg_key -rm $repo_path +rm $GPG_KEY +rm $REPO_PATH invoke_tests "Tools" "Docker" -if [ "${DOCKERHUB_PULL_IMAGES:-yes}" == "yes" ]; then +if [[ "${DOCKERHUB_PULL_IMAGES:-yes}" == "yes" ]]; then invoke_tests "Tools" "Docker images" fi diff --git a/images/ubuntu/scripts/build/install-dotnetcore-sdk.sh b/images/ubuntu/scripts/build/install-dotnetcore-sdk.sh index 82c683d55dda..591a41729abb 100644 --- a/images/ubuntu/scripts/build/install-dotnetcore-sdk.sh +++ b/images/ubuntu/scripts/build/install-dotnetcore-sdk.sh @@ -4,23 +4,38 @@ ## Desc: Install .NET Core SDK ################################################################################ +# Source the helpers for use with the script source $HELPER_SCRIPTS/etc-environment.sh source $HELPER_SCRIPTS/install.sh source $HELPER_SCRIPTS/os.sh +extract_dotnet_sdk() { + local archive_name=$1 + + set -e + destination="./tmp-$(basename -s .tar.gz $archive_name)" + + echo "Extracting $archive_name to $destination" + mkdir "$destination" && tar -C "$destination" -xzf "$archive_name" + rsync -qav --remove-source-files "$destination/shared/" /usr/share/dotnet/shared/ + rsync -qav --remove-source-files "$destination/host/" /usr/share/dotnet/host/ + rsync -qav --remove-source-files "$destination/sdk/" /usr/share/dotnet/sdk/ + rm -rf "$destination" "$archive_name" +} + # Ubuntu 20 doesn't support EOL versions -LATEST_DOTNET_PACKAGES=$(get_toolset_value '.dotnet.aptPackages[]') -DOTNET_VERSIONS=$(get_toolset_value '.dotnet.versions[]') -DOTNET_TOOLS=$(get_toolset_value '.dotnet.tools[].name') +latest_dotnet_packages=$(get_toolset_value '.dotnet.aptPackages[]') +dotnet_versions=$(get_toolset_value '.dotnet.versions[]') +dotnet_tools=$(get_toolset_value '.dotnet.tools[].name') # Disable telemetry export DOTNET_CLI_TELEMETRY_OPTOUT=1 +# Install .NET SDK from apt # There is a versions conflict, that leads to # Microsoft <-> Canonical repos dependencies mix up. # Give Microsoft's repo higher priority to avoid collisions. # See: https://github.com/dotnet/core/issues/7699 - cat << EOF > /etc/apt/preferences.d/dotnet Package: *net* Pin: origin packages.microsoft.com @@ -29,7 +44,7 @@ EOF apt-get update -for latest_package in ${LATEST_DOTNET_PACKAGES[@]}; do +for latest_package in ${latest_dotnet_packages[@]}; do echo "Determing if .NET Core ($latest_package) is installed" if ! dpkg -S $latest_package &> /dev/null; then echo "Could not find .NET Core ($latest_package), installing..." @@ -43,9 +58,10 @@ rm /etc/apt/preferences.d/dotnet apt-get update +# Install .NET SDK from home repository # Get list of all released SDKs from channels which are not end-of-life or preview sdks=() -for version in ${DOTNET_VERSIONS[@]}; do +for version in ${dotnet_versions[@]}; do release_url="https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/${version}/releases.json" releases=$(cat "$(download_with_retry "$release_url")") if [[ $version == "6.0" ]]; then @@ -56,19 +72,7 @@ for version in ${DOTNET_VERSIONS[@]}; do fi done -sortedSdks=$(echo ${sdks[@]} | tr ' ' '\n' | sort -r | uniq -w 5) - -extract_dotnet_sdk() { - local ARCHIVE_NAME="$1" - set -e - dest="./tmp-$(basename -s .tar.gz $ARCHIVE_NAME)" - echo "Extracting $ARCHIVE_NAME to $dest" - mkdir "$dest" && tar -C "$dest" -xzf "$ARCHIVE_NAME" - rsync -qav --remove-source-files "$dest/shared/" /usr/share/dotnet/shared/ - rsync -qav --remove-source-files "$dest/host/" /usr/share/dotnet/host/ - rsync -qav --remove-source-files "$dest/sdk/" /usr/share/dotnet/sdk/ - rm -rf "$dest" "$ARCHIVE_NAME" -} +sorted_sdks=$(echo ${sdks[@]} | tr ' ' '\n' | sort -r | uniq -w 5) # Download/install additional SDKs in parallel export -f download_with_retry @@ -76,7 +80,7 @@ export -f extract_dotnet_sdk parallel --jobs 0 --halt soon,fail=1 \ 'url="https://dotnetcli.blob.core.windows.net/dotnet/Sdk/{}/dotnet-sdk-{}-linux-x64.tar.gz"; \ - download_with_retry $url' ::: "${sortedSdks[@]}" + download_with_retry $url' ::: "${sorted_sdks[@]}" find . -name "*.tar.gz" | parallel --halt soon,fail=1 'extract_dotnet_sdk {}' @@ -87,8 +91,8 @@ set_etc_environment_variable DOTNET_NOLOGO 1 set_etc_environment_variable DOTNET_MULTILEVEL_LOOKUP 0 prepend_etc_environment_path '$HOME/.dotnet/tools' -# install dotnet tools -for dotnet_tool in ${DOTNET_TOOLS[@]}; do +# Install .Net tools +for dotnet_tool in ${dotnet_tools[@]}; do echo "Installing dotnet tool $dotnet_tool" dotnet tool install $dotnet_tool --tool-path '/etc/skel/.dotnet/tools' done diff --git a/images/ubuntu/scripts/build/install-erlang.sh b/images/ubuntu/scripts/build/install-erlang.sh index e78439caef46..d5308a5cc238 100644 --- a/images/ubuntu/scripts/build/install-erlang.sh +++ b/images/ubuntu/scripts/build/install-erlang.sh @@ -18,9 +18,9 @@ apt-get update apt-get install --no-install-recommends esl-erlang # Install rebar3 -rebar3_url="https://github.com/erlang/rebar3/releases/latest/download/rebar3" -rebar3_binary_path=$(download_with_retry "$rebar3_url") -install "$rebar3_binary_path" /usr/local/bin/rebar3 +rebar3_url=$(resolve_github_release_asset_url "erlang/rebar3" "endswith(\"rebar3\")" "latest") +binary_path=$(download_with_retry "$rebar3_url") +install "$binary_path" /usr/local/bin/rebar3 # Clean up source list rm $source_list diff --git a/images/ubuntu/scripts/build/install-firefox.sh b/images/ubuntu/scripts/build/install-firefox.sh index b4a81dcba508..837c0f6a3bfc 100644 --- a/images/ubuntu/scripts/build/install-firefox.sh +++ b/images/ubuntu/scripts/build/install-firefox.sh @@ -5,28 +5,27 @@ ################################################################################ # Source the helpers for use with the script -source "$HELPER_SCRIPTS/install.sh" -source "$HELPER_SCRIPTS/os.sh" +source $HELPER_SCRIPTS/install.sh source $HELPER_SCRIPTS/etc-environment.sh # Mozillateam PPA is added manually because sometimes # lanuchad portal sends empty answer when trying to add it automatically -repo_url="http://ppa.launchpad.net/mozillateam/ppa/ubuntu" -gpg_fingerprint="0ab215679c571d1c8325275b9bdb3d89ce49ec21" -gpg_key="/etc/apt/trusted.gpg.d/mozillateam_ubuntu_ppa.gpg" -repo_path="/etc/apt/sources.list.d/mozillateam-ubuntu-ppa-focal.list" +REPO_URL="http://ppa.launchpad.net/mozillateam/ppa/ubuntu" +GPG_FINGERPRINT="0ab215679c571d1c8325275b9bdb3d89ce49ec21" +GPG_KEY="/etc/apt/trusted.gpg.d/mozillateam_ubuntu_ppa.gpg" +REPO_PATH="/etc/apt/sources.list.d/mozillateam-ubuntu-ppa-focal.list" # Install Firefox -curl -fsSL "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x${gpg_fingerprint}" | sudo gpg --dearmor -o $gpg_key -echo "deb $repo_url $(get_os_version_label) main" > $repo_path +curl -fsSL "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x${GPG_FINGERPRINT}" | sudo gpg --dearmor -o $GPG_KEY +echo "deb $REPO_URL $(lsb_release -cs) main" > $REPO_PATH apt-get update apt-get install --target-release 'o=LP-PPA-mozillateam' -y firefox -rm $repo_path +rm $REPO_PATH # Document apt source repo's -echo "mozillateam $repo_url" >> $HELPER_SCRIPTS/apt-sources.txt +echo "mozillateam $REPO_URL" >> $HELPER_SCRIPTS/apt-sources.txt # add to gloabl system preferences for firefox locale en_US, because other browsers have en_US local. # Default firefox local is en_GB diff --git a/images/ubuntu/scripts/build/install-gfortran.sh b/images/ubuntu/scripts/build/install-gfortran.sh index 024a0311e978..04d848f6dd64 100644 --- a/images/ubuntu/scripts/build/install-gfortran.sh +++ b/images/ubuntu/scripts/build/install-gfortran.sh @@ -3,6 +3,8 @@ ## File: install-gfortran.sh ## Desc: Install GNU Fortran ################################################################################ + +# Source the helpers for use with the script source $HELPER_SCRIPTS/install.sh source $HELPER_SCRIPTS/os.sh diff --git a/images/ubuntu/scripts/build/install-git.sh b/images/ubuntu/scripts/build/install-git.sh index 385df085559f..f38c586e2b74 100644 --- a/images/ubuntu/scripts/build/install-git.sh +++ b/images/ubuntu/scripts/build/install-git.sh @@ -14,6 +14,7 @@ add-apt-repository $GIT_REPO -y apt-get update apt-get install git -y git --version + # Git version 2.35.2 introduces security fix that breaks action\checkout https://github.com/actions/checkout/issues/760 cat <<EOF >> /etc/gitconfig [safe] diff --git a/images/ubuntu/scripts/build/install-github-cli.sh b/images/ubuntu/scripts/build/install-github-cli.sh index b38844756e96..bebdf9a349bd 100644 --- a/images/ubuntu/scripts/build/install-github-cli.sh +++ b/images/ubuntu/scripts/build/install-github-cli.sh @@ -12,10 +12,12 @@ source $HELPER_SCRIPTS/install.sh # Download GitHub CLI gh_cli_url=$(resolve_github_release_asset_url "cli/cli" "contains(\"linux\") and contains(\"amd64\") and endswith(\".deb\")" "latest") gh_cli_deb_path=$(download_with_retry "$gh_cli_url") + # Supply chain security - GitHub CLI hash_url=$(resolve_github_release_asset_url "cli/cli" "endswith(\"checksums.txt\")" "latest") external_hash=$(get_checksum_from_url "$hash_url" "linux_amd64.deb" "SHA256") use_checksum_comparison "$gh_cli_deb_path" "$external_hash" + # Install GitHub CLI apt install "$gh_cli_deb_path" diff --git a/images/ubuntu/scripts/build/install-google-chrome.sh b/images/ubuntu/scripts/build/install-google-chrome.sh index b8458cbe900a..b8f5016a0b21 100644 --- a/images/ubuntu/scripts/build/install-google-chrome.sh +++ b/images/ubuntu/scripts/build/install-google-chrome.sh @@ -36,51 +36,51 @@ get_chromium_revision() { # Download and install Google Chrome CHROME_DEB_URL="https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb" -CHROME_DEB_PATH=$(download_with_retry "$CHROME_DEB_URL") -apt install "$CHROME_DEB_PATH" -f +chrome_deb_path=$(download_with_retry "$CHROME_DEB_URL") +apt install "$chrome_deb_path" -f set_etc_environment_variable "CHROME_BIN" "/usr/bin/google-chrome" # Remove Google Chrome repo rm -f /etc/cron.daily/google-chrome /etc/apt/sources.list.d/google-chrome.list /etc/apt/sources.list.d/google-chrome.list.save # Parse Google Chrome version -FULL_CHROME_VERSION=$(google-chrome --product-version) -CHROME_VERSION=${FULL_CHROME_VERSION%.*} -echo "Chrome version is $FULL_CHROME_VERSION" +full_chrome_version=$(google-chrome --product-version) +chrome_version=${full_chrome_version%.*} +echo "Chrome version is $full_chrome_version" # Get chrome versions information CHROME_PLATFORM="linux64" CHROME_VERSIONS_URL="https://googlechromelabs.github.io/chrome-for-testing/latest-patch-versions-per-build-with-downloads.json" -CHROME_VERSIONS_JSON=$(curl -fsSL "${CHROME_VERSIONS_URL}") +chrome_versions_json=$(curl -fsSL "${CHROME_VERSIONS_URL}") # Download and unpack the latest release of chromedriver -CHROMEDRIVER_VERSION=$(echo "${CHROME_VERSIONS_JSON}" | jq -r '.builds["'"$CHROME_VERSION"'"].version') -CHROMEDRIVER_URL=$(echo "${CHROME_VERSIONS_JSON}" | jq -r '.builds["'"$CHROME_VERSION"'"].downloads.chromedriver[] | select(.platform=="'"${CHROME_PLATFORM}"'").url') +chromedriver_version=$(echo "${chrome_versions_json}" | jq -r '.builds["'"$chrome_version"'"].version') +chromedriver_url=$(echo "${chrome_versions_json}" | jq -r '.builds["'"$chrome_version"'"].downloads.chromedriver[] | select(.platform=="'"${CHROME_PLATFORM}"'").url') CHROMEDRIVER_DIR="/usr/local/share/chromedriver-linux64" -CHROMEDRIVER_BIN="$CHROMEDRIVER_DIR/chromedriver" +chromedriver_bin="$CHROMEDRIVER_DIR/chromedriver" -echo "Installing chromedriver version $CHROMEDRIVER_VERSION" -driver_archive_path=$(download_with_retry "$CHROMEDRIVER_URL") +echo "Installing chromedriver version $chromedriver_version" +driver_archive_path=$(download_with_retry "$chromedriver_url") unzip -qq "$driver_archive_path" -d /usr/local/share -chmod +x $CHROMEDRIVER_BIN -ln -s "$CHROMEDRIVER_BIN" /usr/bin/ +chmod +x $chromedriver_bin +ln -s "$chromedriver_bin" /usr/bin/ set_etc_environment_variable "CHROMEWEBDRIVER" "${CHROMEDRIVER_DIR}" # Download and unpack Chromium -CHROME_REVISION=$(echo "${CHROME_VERSIONS_JSON}" | jq -r '.builds["'"$CHROME_VERSION"'"].revision') -CHROMIUM_REVISION=$(get_chromium_revision $CHROME_REVISION) -CHROMIUM_URL="https://www.googleapis.com/download/storage/v1/b/chromium-browser-snapshots/o/Linux_x64%2F${CHROMIUM_REVISION}%2Fchrome-linux.zip?alt=media" +chrome_revision=$(echo "${chrome_versions_json}" | jq -r '.builds["'"$chrome_version"'"].revision') +chromium_revision=$(get_chromium_revision $chrome_revision) +chromium_url="https://www.googleapis.com/download/storage/v1/b/chromium-browser-snapshots/o/Linux_x64%2F${chromium_revision}%2Fchrome-linux.zip?alt=media" CHROMIUM_DIR="/usr/local/share/chromium" -CHROMIUM_BIN="${CHROMIUM_DIR}/chrome-linux/chrome" +chromium_bin="${CHROMIUM_DIR}/chrome-linux/chrome" -echo "Installing chromium revision $CHROMIUM_REVISION" -CHROMIUM_ARCHIVE_PATH=$(download_with_retry "$CHROMIUM_URL") +echo "Installing chromium revision $chromium_revision" +chromium_archive_path=$(download_with_retry "$chromium_url") mkdir $CHROMIUM_DIR -unzip -qq "$CHROMIUM_ARCHIVE_PATH" -d $CHROMIUM_DIR +unzip -qq "$chromium_archive_path" -d $CHROMIUM_DIR -ln -s $CHROMIUM_BIN /usr/bin/chromium -ln -s $CHROMIUM_BIN /usr/bin/chromium-browser +ln -s $chromium_bin /usr/bin/chromium +ln -s $chromium_bin /usr/bin/chromium-browser invoke_tests "Browsers" "Chrome" invoke_tests "Browsers" "Chromium" diff --git a/images/ubuntu/scripts/build/install-haskell.sh b/images/ubuntu/scripts/build/install-haskell.sh index a5710fb7340a..b249f0fc3607 100644 --- a/images/ubuntu/scripts/build/install-haskell.sh +++ b/images/ubuntu/scripts/build/install-haskell.sh @@ -21,15 +21,15 @@ curl --proto '=https' --tlsv1.2 -fsSL https://get-ghcup.haskell.org | sh > /dev/ export PATH="$ghcup_bin:$PATH" prepend_etc_environment_path $ghcup_bin -availableVersions=$(ghcup list -t ghc -r | grep -v "prerelease" | awk '{print $2}') - -# Get 2 latest Haskell Major.Minor versions -minorMajorVersions=$(echo "$availableVersions" | cut -d"." -f 1,2 | uniq | tail -n2) -for majorMinorVersion in $minorMajorVersions; do - fullVersion=$(echo "$availableVersions" | grep "$majorMinorVersion." | tail -n1) - echo "install ghc version $fullVersion..." - ghcup install ghc $fullVersion - ghcup set ghc $fullVersion +available_versions=$(ghcup list -t ghc -r | grep -v "prerelease" | awk '{print $2}') + +# Install 2 latest Haskell Major.Minor versions +major_minor_versions=$(echo "$available_versions" | cut -d"." -f 1,2 | uniq | tail -n2) +for major_minor_version in $major_minor_versions; do + full_version=$(echo "$available_versions" | grep "$major_minor_version." | tail -n1) + echo "install ghc version $full_version..." + ghcup install ghc $full_version + ghcup set ghc $full_version done echo "install cabal..." @@ -39,6 +39,6 @@ chmod -R 777 $GHCUP_INSTALL_BASE_PREFIX/.ghcup ln -s $GHCUP_INSTALL_BASE_PREFIX/.ghcup /etc/skel/.ghcup # Install the latest stable release of haskell stack -curl -fsSL https://get.haskellstack.org/ | sh +curl -fsSL https://get.haskellstack.org/ | bash invoke_tests "Haskell" diff --git a/images/ubuntu/scripts/build/install-heroku.sh b/images/ubuntu/scripts/build/install-heroku.sh index b432729ead77..dc53ed7bfb7f 100644 --- a/images/ubuntu/scripts/build/install-heroku.sh +++ b/images/ubuntu/scripts/build/install-heroku.sh @@ -4,8 +4,6 @@ ## Desc: Install Heroku CLI. Based on instructions found here: https://devcenter.heroku.com/articles/heroku-cli ################################################################################ -## Install Heroku CLI - # add heroku repository to apt echo "deb https://cli-assets.heroku.com/channels/stable/apt ./" > /etc/apt/sources.list.d/heroku.list diff --git a/images/ubuntu/scripts/build/install-hhvm.sh b/images/ubuntu/scripts/build/install-hhvm.sh index 49591a51c12e..0e1bdb25d43a 100644 --- a/images/ubuntu/scripts/build/install-hhvm.sh +++ b/images/ubuntu/scripts/build/install-hhvm.sh @@ -6,6 +6,7 @@ apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xB4112585D386EB94 add-apt-repository https://dl.hhvm.com/ubuntu + apt-get update apt-get -qq install -y hhvm diff --git a/images/ubuntu/scripts/build/install-java-tools.sh b/images/ubuntu/scripts/build/install-java-tools.sh index b1776b7940f0..c366d87b0c4e 100644 --- a/images/ubuntu/scripts/build/install-java-tools.sh +++ b/images/ubuntu/scripts/build/install-java-tools.sh @@ -4,8 +4,8 @@ ## Desc: Install Java and related tooling (Ant, Gradle, Maven) ################################################################################ +# Source the helpers for use with the script source $HELPER_SCRIPTS/install.sh -source $HELPER_SCRIPTS/os.sh source $HELPER_SCRIPTS/etc-environment.sh create_java_environment_variable() { @@ -64,7 +64,7 @@ install_open_jdk() { # Add Addoptium PPA # apt-key is deprecated, dearmor and add manually wget -qO - https://packages.adoptium.net/artifactory/api/gpg/key/public | gpg --dearmor > /usr/share/keyrings/adoptium.gpg -echo "deb [signed-by=/usr/share/keyrings/adoptium.gpg] https://packages.adoptium.net/artifactory/deb/ $(get_os_version_label) main" > /etc/apt/sources.list.d/adoptium.list +echo "deb [signed-by=/usr/share/keyrings/adoptium.gpg] https://packages.adoptium.net/artifactory/deb/ $(lsb_release -cs) main" > /etc/apt/sources.list.d/adoptium.list # Get all the updates from enabled repositories. apt-get update diff --git a/images/ubuntu/scripts/build/install-kotlin.sh b/images/ubuntu/scripts/build/install-kotlin.sh index 2b7d2367e671..80edb8a33b9c 100644 --- a/images/ubuntu/scripts/build/install-kotlin.sh +++ b/images/ubuntu/scripts/build/install-kotlin.sh @@ -5,6 +5,7 @@ ## Supply chain security: Kotlin - checksum validation ################################################################################ +# Source the helpers for use with the script source $HELPER_SCRIPTS/install.sh KOTLIN_ROOT="/usr/share" diff --git a/images/ubuntu/scripts/build/install-kubernetes-tools.sh b/images/ubuntu/scripts/build/install-kubernetes-tools.sh index 50c36bd11c46..bd7ae7c74174 100644 --- a/images/ubuntu/scripts/build/install-kubernetes-tools.sh +++ b/images/ubuntu/scripts/build/install-kubernetes-tools.sh @@ -10,17 +10,19 @@ source $HELPER_SCRIPTS/install.sh # Download KIND kind_url=$(resolve_github_release_asset_url "kubernetes-sigs/kind" "endswith(\"kind-linux-amd64\")" "latest") -curl -fsSL -o /tmp/kind "${kind_url}" +kind_binary_path=$(download_with_retry "${kind_url}") + # Supply chain security - KIND kind_external_hash=$(get_checksum_from_url "${kind_url}.sha256sum" "kind-linux-amd64" "SHA256") -use_checksum_comparison "/tmp/kind" "${kind_external_hash}" +use_checksum_comparison "${kind_binary_path}" "${kind_external_hash}" + # Install KIND -sudo install /tmp/kind /usr/local/bin/kind +install "${kind_binary_path}" /usr/local/bin/kind ## Install kubectl -KUBECTL_MINOR_VERSION=$(curl -fsSL "https://dl.k8s.io/release/stable.txt" | cut -d'.' -f1,2 ) -curl -fsSL https://pkgs.k8s.io/core:/stable:/$KUBECTL_MINOR_VERSION/deb/Release.key | sudo gpg --dearmor -o /etc/apt/keyrings/kubernetes-apt-keyring.gpg -echo 'deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring.gpg] https://pkgs.k8s.io/core:/stable:/'$KUBECTL_MINOR_VERSION'/deb/ /' | sudo tee /etc/apt/sources.list.d/kubernetes.list +kubectl_minor_version=$(curl -fsSL "https://dl.k8s.io/release/stable.txt" | cut -d'.' -f1,2 ) +curl -fsSL https://pkgs.k8s.io/core:/stable:/$kubectl_minor_version/deb/Release.key | sudo gpg --dearmor -o /etc/apt/keyrings/kubernetes-apt-keyring.gpg +echo 'deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring.gpg] https://pkgs.k8s.io/core:/stable:/'$kubectl_minor_version'/deb/ /' | sudo tee /etc/apt/sources.list.d/kubernetes.list sudo apt-get update -y && sudo apt-get install -y kubectl rm -f /etc/apt/sources.list.d/kubernetes.list @@ -29,11 +31,13 @@ curl -fsSL https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3 # Download minikube curl -fsSL -O https://storage.googleapis.com/minikube/releases/latest/minikube-linux-amd64 + # Supply chain security - minikube minikube_hash=$(get_checksum_from_github_release "kubernetes/minikube" "linux-amd64" "latest" "SHA256") use_checksum_comparison "minikube-linux-amd64" "${minikube_hash}" + # Install minikube -sudo install minikube-linux-amd64 /usr/local/bin/minikube +install minikube-linux-amd64 /usr/local/bin/minikube # Install kustomize download_url="https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh" diff --git a/images/ubuntu/scripts/build/install-microsoft-edge.sh b/images/ubuntu/scripts/build/install-microsoft-edge.sh index 221ccc5133ac..c46d5622a7cc 100644 --- a/images/ubuntu/scripts/build/install-microsoft-edge.sh +++ b/images/ubuntu/scripts/build/install-microsoft-edge.sh @@ -9,42 +9,41 @@ source $HELPER_SCRIPTS/install.sh source $HELPER_SCRIPTS/etc-environment.sh REPO_URL="https://packages.microsoft.com/repos/edge" -gpg_key="/usr/share/keyrings/microsoft-edge.gpg" -repo_path="/etc/apt/sources.list.d/microsoft-edge.list" +GPG_KEY="/usr/share/keyrings/microsoft-edge.gpg" +REPO_PATH="/etc/apt/sources.list.d/microsoft-edge.list" - -wget -qO- https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > $gpg_key +wget -qO- https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > $GPG_KEY # Specify an arch as Microsoft repository supports armhf and arm64 as well -echo "deb [arch=amd64 signed-by=$gpg_key] $REPO_URL stable main" > $repo_path +echo "deb [arch=amd64 signed-by=$GPG_KEY] $REPO_URL stable main" > $REPO_PATH apt-get update apt-get install --no-install-recommends microsoft-edge-stable -rm $gpg_key -rm $repo_path +rm $GPG_KEY +rm $REPO_PATH echo "microsoft-edge $REPO_URL" >> $HELPER_SCRIPTS/apt-sources.txt # Install Microsoft Edge Webdriver EDGEDRIVER_DIR="/usr/local/share/edge_driver" -EDGEDRIVER_BIN="$EDGEDRIVER_DIR/msedgedriver" +edgedriver_bin="$EDGEDRIVER_DIR/msedgedriver" mkdir -p $EDGEDRIVER_DIR -EDGE_VERSION=$(microsoft-edge --version | cut -d' ' -f 3) -EDGE_VERSION_MAJOR=$(echo $EDGE_VERSION | cut -d'.' -f 1) +edge_version=$(microsoft-edge --version | cut -d' ' -f 3) +edge_version_major=$(echo $edge_version | cut -d'.' -f 1) -EDGE_DRIVER_VERSION_URL="https://msedgedriver.azureedge.net/LATEST_RELEASE_${EDGE_VERSION_MAJOR}_LINUX" +edgedriver_version_url="https://msedgedriver.azureedge.net/LATEST_RELEASE_${edge_version_major}_LINUX" # Convert a resulting file to normal UTF-8 -EDGE_DRIVER_LATEST_VERSION=$(curl -fsSL "$EDGE_DRIVER_VERSION_URL" | iconv -f utf-16 -t utf-8 | tr -d '\r') +edgedriver_latest_version=$(curl -fsSL "$edgedriver_version_url" | iconv -f utf-16 -t utf-8 | tr -d '\r') -EDGEDRIVER_URL="https://msedgedriver.azureedge.net/${EDGE_DRIVER_LATEST_VERSION}/edgedriver_linux64.zip" -EDGEDRIVER_ARCHIVE_PATH=$(download_with_retry "$EDGEDRIVER_URL") +edgedriver_url="https://msedgedriver.azureedge.net/${edgedriver_latest_version}/edgedriver_linux64.zip" +edgedriver_archive_path=$(download_with_retry "$edgedriver_url") -unzip -qq "$EDGEDRIVER_ARCHIVE_PATH" -d "$EDGEDRIVER_DIR" -chmod +x $EDGEDRIVER_BIN -ln -s $EDGEDRIVER_BIN /usr/bin +unzip -qq "$edgedriver_archive_path" -d "$EDGEDRIVER_DIR" +chmod +x $edgedriver_bin +ln -s $edgedriver_bin /usr/bin set_etc_environment_variable "EDGEWEBDRIVER" "${EDGEDRIVER_DIR}" diff --git a/images/ubuntu/scripts/build/install-mongodb.sh b/images/ubuntu/scripts/build/install-mongodb.sh index 7a47185347ac..266485926208 100644 --- a/images/ubuntu/scripts/build/install-mongodb.sh +++ b/images/ubuntu/scripts/build/install-mongodb.sh @@ -5,21 +5,20 @@ ################################################################################ # Source the helpers -source $HELPER_SCRIPTS/os.sh source $HELPER_SCRIPTS/install.sh REPO_URL="https://repo.mongodb.org/apt/ubuntu" -osLabel=$(get_os_version_label) -toolsetVersion=$(get_toolset_value '.mongodb.version') +os_label=$(lsb_release -cs) +toolset_version=$(get_toolset_value '.mongodb.version') # Install Mongo DB -wget -qO - https://www.mongodb.org/static/pgp/server-$toolsetVersion.asc | sudo apt-key add - +wget -qO - https://www.mongodb.org/static/pgp/server-$toolset_version.asc | sudo apt-key add - -echo "deb [ arch=amd64,arm64 ] $REPO_URL $osLabel/mongodb-org/$toolsetVersion multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-org-$toolsetVersion.list +echo "deb [ arch=amd64,arm64 ] $REPO_URL $os_label/mongodb-org/$toolset_version multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-org-$toolset_version.list sudo apt-get update sudo apt-get install -y mongodb-org -rm /etc/apt/sources.list.d/mongodb-org-$toolsetVersion.list +rm /etc/apt/sources.list.d/mongodb-org-$toolset_version.list echo "mongodb $REPO_URL" >> $HELPER_SCRIPTS/apt-sources.txt diff --git a/images/ubuntu/scripts/build/install-mono.sh b/images/ubuntu/scripts/build/install-mono.sh index e8be1f9c6a71..3abf40b14f41 100644 --- a/images/ubuntu/scripts/build/install-mono.sh +++ b/images/ubuntu/scripts/build/install-mono.sh @@ -4,25 +4,27 @@ ## Desc: Install Mono ################################################################################ +# Source the helpers for use with the script source $HELPER_SCRIPTS/os.sh -LSB_CODENAME=$(lsb_release -cs) +os_label=$(lsb_release -cs) # There are no packages for Ubuntu 22 in the repo, but developers confirmed that packages from Ubuntu 20 should work if is_ubuntu22; then - LSB_CODENAME="focal" + os_label="focal" fi # Test to see if the software in question is already installed, if not install it # wget "http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF" -O out && sudo apt-key add out && rm out apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF -echo "deb https://download.mono-project.com/repo/ubuntu stable-$LSB_CODENAME main" | tee /etc/apt/sources.list.d/mono-official-stable.list +echo "deb https://download.mono-project.com/repo/ubuntu stable-$os_label main" | tee /etc/apt/sources.list.d/mono-official-stable.list apt-get update apt-get install -y --no-install-recommends apt-transport-https mono-complete nuget rm /etc/apt/sources.list.d/mono-official-stable.list rm -f /etc/apt/sources.list.d/mono-official-stable.list.save -echo "mono https://download.mono-project.com/repo/ubuntu stable-$LSB_CODENAME main" >> $HELPER_SCRIPTS/apt-sources.txt + +echo "mono https://download.mono-project.com/repo/ubuntu stable-$os_label main" >> $HELPER_SCRIPTS/apt-sources.txt invoke_tests "Tools" "Mono" diff --git a/images/ubuntu/scripts/build/install-ms-repos.sh b/images/ubuntu/scripts/build/install-ms-repos.sh index 26eb8f475852..09f04d7b808b 100644 --- a/images/ubuntu/scripts/build/install-ms-repos.sh +++ b/images/ubuntu/scripts/build/install-ms-repos.sh @@ -4,10 +4,10 @@ ## Desc: Install official Microsoft package repos for the distribution ################################################################################ -LSB_RELEASE=$(lsb_release -rs) +os_label=$(lsb_release -rs) # Install Microsoft repository -wget https://packages.microsoft.com/config/ubuntu/$LSB_RELEASE/packages-microsoft-prod.deb +wget https://packages.microsoft.com/config/ubuntu/$os_label/packages-microsoft-prod.deb dpkg -i packages-microsoft-prod.deb # update diff --git a/images/ubuntu/scripts/build/install-mysql.sh b/images/ubuntu/scripts/build/install-mysql.sh index 9ff05155958a..d01f83daad8d 100644 --- a/images/ubuntu/scripts/build/install-mysql.sh +++ b/images/ubuntu/scripts/build/install-mysql.sh @@ -4,6 +4,7 @@ ## Desc: Install MySQL Client ################################################################################ +# Source the helpers for use with the script source $HELPER_SCRIPTS/os.sh # Mysql setting up root password diff --git a/images/ubuntu/scripts/build/install-nodejs.sh b/images/ubuntu/scripts/build/install-nodejs.sh index dd96adc85d6f..9cd007398eab 100644 --- a/images/ubuntu/scripts/build/install-nodejs.sh +++ b/images/ubuntu/scripts/build/install-nodejs.sh @@ -8,9 +8,9 @@ source $HELPER_SCRIPTS/install.sh # Install default Node.js -defaultVersion=$(get_toolset_value '.node.default') +default_version=$(get_toolset_value '.node.default') curl -fsSL https://raw.githubusercontent.com/tj/n/master/bin/n -o ~/n -bash ~/n $defaultVersion +bash ~/n $default_version # Install node modules node_modules=$(get_toolset_value '.node_modules[].name') diff --git a/images/ubuntu/scripts/build/install-nvm.sh b/images/ubuntu/scripts/build/install-nvm.sh index c63aaab3e9c6..def0d5dc3f63 100644 --- a/images/ubuntu/scripts/build/install-nvm.sh +++ b/images/ubuntu/scripts/build/install-nvm.sh @@ -9,9 +9,10 @@ source $HELPER_SCRIPTS/etc-environment.sh export NVM_DIR="/etc/skel/.nvm" mkdir $NVM_DIR -VERSION=$(curl -fsSL https://api.github.com/repos/nvm-sh/nvm/releases/latest | jq -r '.tag_name') -curl -fsSL https://raw.githubusercontent.com/nvm-sh/nvm/$VERSION/install.sh | bash +nvm_version=$(curl -fsSL https://api.github.com/repos/nvm-sh/nvm/releases/latest | jq -r '.tag_name') +curl -fsSL https://raw.githubusercontent.com/nvm-sh/nvm/$nvm_version/install.sh | bash set_etc_environment_variable "NVM_DIR" '$HOME/.nvm' + echo '[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm' | tee -a /etc/skel/.bash_profile [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" diff --git a/images/ubuntu/scripts/build/install-oc-cli.sh b/images/ubuntu/scripts/build/install-oc-cli.sh index f1094ff6a35c..8f8a06de49c6 100644 --- a/images/ubuntu/scripts/build/install-oc-cli.sh +++ b/images/ubuntu/scripts/build/install-oc-cli.sh @@ -4,11 +4,11 @@ ## Desc: Install the OC CLI ################################################################################ +# Source the helpers for use with the script source $HELPER_SCRIPTS/install.sh # Install the oc CLI -download_url="https://mirror.openshift.com/pub/openshift-v4/clients/ocp/latest/openshift-client-linux.tar.gz" -archive_path=$(download_with_retry "$download_url") +archive_path=$(download_with_retry "https://mirror.openshift.com/pub/openshift-v4/clients/ocp/latest/openshift-client-linux.tar.gz") tar xzf "$archive_path" -C "/usr/local/bin" oc invoke_tests "CLI.Tools" "OC CLI" diff --git a/images/ubuntu/scripts/build/install-oras-cli.sh b/images/ubuntu/scripts/build/install-oras-cli.sh index cf01267056a2..119bea0b2511 100644 --- a/images/ubuntu/scripts/build/install-oras-cli.sh +++ b/images/ubuntu/scripts/build/install-oras-cli.sh @@ -5,6 +5,7 @@ ## Supply chain security: ORAS CLI - checksum validation ################################################################################ +# Source the helpers for use with the script source $HELPER_SCRIPTS/install.sh # Determine latest ORAS CLI version diff --git a/images/ubuntu/scripts/build/install-packer.sh b/images/ubuntu/scripts/build/install-packer.sh index 5fb0bd8b50e8..33d284869a14 100644 --- a/images/ubuntu/scripts/build/install-packer.sh +++ b/images/ubuntu/scripts/build/install-packer.sh @@ -4,6 +4,7 @@ ## Desc: Install packer ################################################################################ +# Source the helpers for use with the script source $HELPER_SCRIPTS/install.sh # Install Packer diff --git a/images/ubuntu/scripts/build/install-phantomjs.sh b/images/ubuntu/scripts/build/install-phantomjs.sh index 2ed14a04800d..1eec7a1b1a75 100644 --- a/images/ubuntu/scripts/build/install-phantomjs.sh +++ b/images/ubuntu/scripts/build/install-phantomjs.sh @@ -11,16 +11,16 @@ source $HELPER_SCRIPTS/install.sh apt-get install -y chrpath libssl-dev libxft-dev libfreetype6 libfreetype6-dev libfontconfig1 libfontconfig1-dev # Define the version and hash of PhantomJS to be installed -dir_name=phantomjs-2.1.1-linux-x86_64 -archive_hash="86dd9a4bf4aee45f1a84c9f61cf1947c1d6dce9b9e8d2a907105da7852460d2f" +DIR_NAME=phantomjs-2.1.1-linux-x86_64 +ARCHIVE_HASH="86dd9a4bf4aee45f1a84c9f61cf1947c1d6dce9b9e8d2a907105da7852460d2f" # Download the archive and verify its integrity using checksum comparison -download_url="https://bitbucket.org/ariya/phantomjs/downloads/$dir_name.tar.bz2" +download_url="https://bitbucket.org/ariya/phantomjs/downloads/$DIR_NAME.tar.bz2" archive_path=$(download_with_retry "$download_url") -use_checksum_comparison "$archive_path" "$archive_hash" +use_checksum_comparison "$archive_path" "$ARCHIVE_HASH" # Extract the archive and create a symbolic link to the executable tar xjf "$archive_path" -C /usr/local/share -ln -sf /usr/local/share/$dir_name/bin/phantomjs /usr/local/bin +ln -sf /usr/local/share/$DIR_NAME/bin/phantomjs /usr/local/bin invoke_tests "Tools" "Phantomjs" diff --git a/images/ubuntu/scripts/build/install-php.sh b/images/ubuntu/scripts/build/install-php.sh index 81409da4694b..d03494b50fb5 100644 --- a/images/ubuntu/scripts/build/install-php.sh +++ b/images/ubuntu/scripts/build/install-php.sh @@ -101,14 +101,13 @@ mkdir -p /etc/skel/.composer # Install phpunit (for PHP) wget -q -O phpunit https://phar.phpunit.de/phpunit-8.phar -chmod +x phpunit -mv phpunit /usr/local/bin/phpunit +install phpunit /usr/local/bin/phpunit # ubuntu 20.04 libzip-dev is libzip5 based and is not compatible libzip-dev of ppa:ondrej/php # see https://github.com/actions/runner-images/issues/1084 if is_ubuntu20; then - rm /etc/apt/sources.list.d/ondrej-*.list - apt-get update + rm /etc/apt/sources.list.d/ondrej-*.list + apt-get update fi invoke_tests "Common" "PHP" diff --git a/images/ubuntu/scripts/build/install-pipx-packages.sh b/images/ubuntu/scripts/build/install-pipx-packages.sh index 14262d128863..40356b6c3f77 100644 --- a/images/ubuntu/scripts/build/install-pipx-packages.sh +++ b/images/ubuntu/scripts/build/install-pipx-packages.sh @@ -3,6 +3,8 @@ ## File: install-pipx-packages.sh ## Desc: Install tools via pipx ################################################################################ + +# Source the helpers for use with the script source $HELPER_SCRIPTS/install.sh export PATH="$PATH:/opt/pipx_bin" @@ -10,22 +12,14 @@ export PATH="$PATH:/opt/pipx_bin" pipx_packages=$(get_toolset_value ".pipx[] .package") for package in $pipx_packages; do - python_version=$(get_toolset_value ".pipx[] | select(.package == \"$package\") .python") - if [ "$python_version" != "null" ]; then - python_path="/opt/hostedtoolcache/Python/$python_version*/x64/bin/python$python_version" - echo "Install $package into python $python_path" - pipx install $package --python $python_path - else - echo "Install $package into default python" - pipx install $package + echo "Install $package into default python" + pipx install $package - # https://docs.ansible.com/ansible/latest/installation_guide/intro_installation.html - # Install ansible into an existing ansible-core Virtual Environment - if [[ $package == "ansible-core" ]]; then - pipx inject $package ansible - fi + # https://docs.ansible.com/ansible/latest/installation_guide/intro_installation.html + # Install ansible into an existing ansible-core Virtual Environment + if [[ $package == "ansible-core" ]]; then + pipx inject $package ansible fi - done invoke_tests "Common" "PipxPackages" diff --git a/images/ubuntu/scripts/build/install-postgresql.sh b/images/ubuntu/scripts/build/install-postgresql.sh index 18b5bc037052..8285f610a133 100644 --- a/images/ubuntu/scripts/build/install-postgresql.sh +++ b/images/ubuntu/scripts/build/install-postgresql.sh @@ -12,15 +12,15 @@ REPO_URL="https://apt.postgresql.org/pub/repos/apt/" # Preparing repo for PostgreSQL wget -qO - https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor > /usr/share/keyrings/postgresql.gpg -echo "deb [signed-by=/usr/share/keyrings/postgresql.gpg] $REPO_URL $(get_os_version_label)-pgdg main" > /etc/apt/sources.list.d/pgdg.list +echo "deb [signed-by=/usr/share/keyrings/postgresql.gpg] $REPO_URL $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list # Fetch PostgreSQL version to install from the toolset -toolsetVersion=$(get_toolset_value '.postgresql.version') +toolset_version=$(get_toolset_value '.postgresql.version') # Install PostgreSQL echo "Install PostgreSQL" apt update -apt install postgresql-$toolsetVersion +apt install postgresql-$toolset_version echo "Install libpq-dev" apt-get install libpq-dev diff --git a/images/ubuntu/scripts/build/install-powershell.sh b/images/ubuntu/scripts/build/install-powershell.sh index b2a0069bcbaf..f1345375d1be 100644 --- a/images/ubuntu/scripts/build/install-powershell.sh +++ b/images/ubuntu/scripts/build/install-powershell.sh @@ -4,9 +4,10 @@ ## Desc: Install PowerShell Core ################################################################################ +# Source the helpers for use with the script source $HELPER_SCRIPTS/install.sh -pwshversion=$(get_toolset_value .pwsh.version) +pwsh_version=$(get_toolset_value .pwsh.version) # Install Powershell -apt-get install -y powershell=$pwshversion* +apt-get install -y powershell=$pwsh_version* diff --git a/images/ubuntu/scripts/build/install-pypy.sh b/images/ubuntu/scripts/build/install-pypy.sh index 47dba4496e18..61808c14af8e 100644 --- a/images/ubuntu/scripts/build/install-pypy.sh +++ b/images/ubuntu/scripts/build/install-pypy.sh @@ -4,6 +4,7 @@ ## Desc: Install PyPy ################################################################################ +# Source the helpers for use with the script source $HELPER_SCRIPTS/install.sh # This function installs PyPy using the specified arguments: @@ -73,20 +74,20 @@ install_pypy() { } # Installation PyPy -pypyVersions=$(curl -fsSL https://downloads.python.org/pypy/versions.json) -toolsetVersions=$(get_toolset_value '.toolcache[] | select(.name | contains("PyPy")) | .versions[]') +pypy_versions_json=$(curl -fsSL https://downloads.python.org/pypy/versions.json) +toolset_versions=$(get_toolset_value '.toolcache[] | select(.name | contains("PyPy")) | .versions[]') -for toolsetVersion in $toolsetVersions; do - latestMajorPyPyVersion=$(echo $pypyVersions | - jq -r --arg toolsetVersion $toolsetVersion '.[] - | select((.python_version | startswith($toolsetVersion)) and .stable == true).files[] +for toolset_version in $toolset_versions; do + latest_major_pypy_version=$(echo $pypy_versions_json | + jq -r --arg toolset_version $toolset_version '.[] + | select((.python_version | startswith($toolset_version)) and .stable == true).files[] | select(.arch == "x64" and .platform == "linux").download_url' | head -1) - if [[ -z "$latestMajorPyPyVersion" ]]; then - echo "Failed to get PyPy version '$toolsetVersion'" + if [[ -z "$latest_major_pypy_version" ]]; then + echo "Failed to get PyPy version '$toolset_version'" exit 1 fi - install_pypy $latestMajorPyPyVersion + install_pypy $latest_major_pypy_version done chown -R "$SUDO_USER:$SUDO_USER" "$AGENT_TOOLSDIRECTORY/PyPy" diff --git a/images/ubuntu/scripts/build/install-python.sh b/images/ubuntu/scripts/build/install-python.sh index 846aa4206289..f96cfac97548 100644 --- a/images/ubuntu/scripts/build/install-python.sh +++ b/images/ubuntu/scripts/build/install-python.sh @@ -18,10 +18,12 @@ export PIPX_BIN_DIR=/opt/pipx_bin export PIPX_HOME=/opt/pipx python3 -m pip install pipx python3 -m pipx ensurepath + # Update /etc/environment set_etc_environment_variable "PIPX_BIN_DIR" $PIPX_BIN_DIR set_etc_environment_variable "PIPX_HOME" $PIPX_HOME prepend_etc_environment_path $PIPX_BIN_DIR + # Test pipx if ! command -v pipx; then echo "pipx was not installed or not found on PATH" diff --git a/images/ubuntu/scripts/build/install-rlang.sh b/images/ubuntu/scripts/build/install-rlang.sh index 7445d7de507e..42871cae9020 100644 --- a/images/ubuntu/scripts/build/install-rlang.sh +++ b/images/ubuntu/scripts/build/install-rlang.sh @@ -4,14 +4,11 @@ ## Desc: Install R ################################################################################ -# Source the helpers for use with the script -source $HELPER_SCRIPTS/os.sh - # install R -osLabel=$(get_os_version_label) +os_label=$(lsb_release -cs) wget -qO- https://cloud.r-project.org/bin/linux/ubuntu/marutter_pubkey.asc | gpg --dearmor > /usr/share/keyrings/rlang.gpg -echo "deb [signed-by=/usr/share/keyrings/rlang.gpg] https://cloud.r-project.org/bin/linux/ubuntu $osLabel-cran40/" > /etc/apt/sources.list.d/rlang.list +echo "deb [signed-by=/usr/share/keyrings/rlang.gpg] https://cloud.r-project.org/bin/linux/ubuntu $os_label-cran40/" > /etc/apt/sources.list.d/rlang.list apt-get update apt-get install r-base diff --git a/images/ubuntu/scripts/build/install-ruby.sh b/images/ubuntu/scripts/build/install-ruby.sh index 5241a73c4cde..d3cd3f4e4894 100644 --- a/images/ubuntu/scripts/build/install-ruby.sh +++ b/images/ubuntu/scripts/build/install-ruby.sh @@ -4,15 +4,16 @@ ## Desc: Install Ruby requirements and ruby gems ################################################################################ +# Source the helpers for use with the script source $HELPER_SCRIPTS/os.sh source $HELPER_SCRIPTS/install.sh apt-get install ruby-full # Install ruby gems from toolset -gemsToInstall=$(get_toolset_value ".rubygems[] .name") -if [ -n "$gemsToInstall" ]; then - for gem in $gemsToInstall; do +gems_to_install=$(get_toolset_value ".rubygems[] .name") +if [[ -n "$gems_to_install" ]]; then + for gem in $gems_to_install; do echo "Installing gem $gem" gem install $gem done @@ -22,35 +23,35 @@ fi apt-get install -y libz-dev openssl libssl-dev echo "Install Ruby from toolset..." -PACKAGE_TAR_NAMES=$(curl -fsSL "https://api.github.com/repos/ruby/ruby-builder/releases/latest" | jq -r '.assets[].name') -TOOLSET_VERSIONS=$(get_toolset_value '.toolcache[] | select(.name | contains("Ruby")) | .versions[]') -PLATFORM_VERSION=$(get_toolset_value '.toolcache[] | select(.name | contains("Ruby")) | .platform_version') -RUBY_PATH="$AGENT_TOOLSDIRECTORY/Ruby" +package_tar_names=$(curl -fsSL "https://api.github.com/repos/ruby/ruby-builder/releases/latest" | jq -r '.assets[].name') +toolset_versions=$(get_toolset_value '.toolcache[] | select(.name | contains("Ruby")) | .versions[]') +platform_version=$(get_toolset_value '.toolcache[] | select(.name | contains("Ruby")) | .platform_version') +ruby_path="$AGENT_TOOLSDIRECTORY/Ruby" echo "Check if Ruby hostedtoolcache folder exist..." -if [ ! -d $RUBY_PATH ]; then - mkdir -p $RUBY_PATH +if [[ ! -d $ruby_path ]]; then + mkdir -p $ruby_path fi -for TOOLSET_VERSION in ${TOOLSET_VERSIONS[@]}; do - PACKAGE_TAR_NAME=$(echo "$PACKAGE_TAR_NAMES" | grep "^ruby-${TOOLSET_VERSION}-ubuntu-${PLATFORM_VERSION}.tar.gz$" | sort -V | tail -1) - RUBY_VERSION=$(echo "$PACKAGE_TAR_NAME" | cut -d'-' -f 2) - RUBY_VERSION_PATH="$RUBY_PATH/$RUBY_VERSION" +for toolset_version in ${toolset_versions[@]}; do + package_tar_name=$(echo "$package_tar_names" | grep "^ruby-${toolset_version}-ubuntu-${platform_version}.tar.gz$" | sort -V | tail -1) + ruby_version=$(echo "$package_tar_name" | cut -d'-' -f 2) + ruby_version_path="$ruby_path/$ruby_version" - echo "Create Ruby $RUBY_VERSION directory..." - mkdir -p $RUBY_VERSION_PATH + echo "Create Ruby $ruby_version directory..." + mkdir -p $ruby_version_path - echo "Downloading tar archive $PACKAGE_TAR_NAME" - DOWNLOAD_URL="https://github.com/ruby/ruby-builder/releases/download/toolcache/${PACKAGE_TAR_NAME}" - PACKAGE_ARCHIVE_PATH=$(download_with_retry "$DOWNLOAD_URL") + echo "Downloading tar archive $package_tar_name" + download_url="https://github.com/ruby/ruby-builder/releases/download/toolcache/${package_tar_name}" + package_archive_path=$(download_with_retry "$download_url") - echo "Expand '$PACKAGE_TAR_NAME' to the '$RUBY_VERSION_PATH' folder" - tar xf "$PACKAGE_ARCHIVE_PATH" -C $RUBY_VERSION_PATH + echo "Expand '$package_tar_name' to the '$ruby_version_path' folder" + tar xf "$package_archive_path" -C $ruby_version_path - COMPLETE_FILE_PATH="$RUBY_VERSION_PATH/x64.complete" - if [ ! -f $COMPLETE_FILE_PATH ]; then + complete_file_path="$ruby_version_path/x64.complete" + if [[ ! -f $complete_file_path ]]; then echo "Create complete file" - touch $COMPLETE_FILE_PATH + touch $complete_file_path fi done diff --git a/images/ubuntu/scripts/build/install-selenium.sh b/images/ubuntu/scripts/build/install-selenium.sh index 3b9360762c19..270c75f93673 100644 --- a/images/ubuntu/scripts/build/install-selenium.sh +++ b/images/ubuntu/scripts/build/install-selenium.sh @@ -8,17 +8,17 @@ source $HELPER_SCRIPTS/install.sh source $HELPER_SCRIPTS/etc-environment.sh -SELENIUM_MAJOR_VERSION=$(get_toolset_value '.selenium.version') +selenium_major_version=$(get_toolset_value '.selenium.version') # Download Selenium server -SELENIUM_DOWNLOAD_URL=$(resolve_github_release_asset_url "SeleniumHQ/selenium" "contains(\"selenium-server-\") and endswith(\".jar\")" "$SELENIUM_MAJOR_VERSION\.+" "" "true") -SELENIUM_JAR_PATH=$(download_with_retry "$SELENIUM_DOWNLOAD_URL" "/usr/share/java/selenium-server.jar") +selenium_download_url=$(resolve_github_release_asset_url "SeleniumHQ/selenium" "contains(\"selenium-server-\") and endswith(\".jar\")" "$selenium_major_version\.+" "" "true") +selenium_jar_path=$(download_with_retry "$selenium_download_url" "/usr/share/java/selenium-server.jar") # Create an epmty file to retrive selenium version -SELENIUM_FULL_VERSION=$(echo $SELENIUM_DOWNLOAD_URL | awk -F"selenium-server-|.jar" '{print $2}') -touch "/usr/share/java/selenium-server-$SELENIUM_FULL_VERSION" +selenium_full_version=$(echo $selenium_download_url | awk -F"selenium-server-|.jar" '{print $2}') +touch "/usr/share/java/selenium-server-$selenium_full_version" # Add SELENIUM_JAR_PATH environment variable -set_etc_environment_variable "SELENIUM_JAR_PATH" "$SELENIUM_JAR_PATH" +set_etc_environment_variable "SELENIUM_JAR_PATH" "$selenium_jar_path" invoke_tests "Tools" "Selenium" diff --git a/images/ubuntu/scripts/build/install-sqlpackage.sh b/images/ubuntu/scripts/build/install-sqlpackage.sh index d8dcb89ed1f9..c002a68d538d 100644 --- a/images/ubuntu/scripts/build/install-sqlpackage.sh +++ b/images/ubuntu/scripts/build/install-sqlpackage.sh @@ -13,6 +13,7 @@ if is_ubuntu22; then libssl_deb_path=$(download_with_retry "http://security.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.1f-1ubuntu2.20_amd64.deb") libssl_hash="0b3251aee55db6e20d02f4b9a2b703c9874a85ab6a20b12f4870f52f91633d37" use_checksum_comparison "$libssl_deb_path" "$libssl_hash" + dpkg -i "$libssl_deb_path" fi diff --git a/images/ubuntu/scripts/build/install-swift.sh b/images/ubuntu/scripts/build/install-swift.sh index 43e3f2b16ee7..06b4860d58ee 100644 --- a/images/ubuntu/scripts/build/install-swift.sh +++ b/images/ubuntu/scripts/build/install-swift.sh @@ -32,16 +32,16 @@ rm ~/.gnupg/swift tar xzf "$archive_path" -C /tmp SWIFT_INSTALL_ROOT="/usr/share/swift" -SWIFT_BIN_ROOT="$SWIFT_INSTALL_ROOT/usr/bin" -SWIFT_LIB_ROOT="$SWIFT_INSTALL_ROOT/usr/lib" +swift_bin_root="$SWIFT_INSTALL_ROOT/usr/bin" +swift_lib_root="$SWIFT_INSTALL_ROOT/usr/lib" mv "/tmp/${swift_release_name}" $SWIFT_INSTALL_ROOT mkdir -p /usr/local/lib -ln -s "$SWIFT_BIN_ROOT/swift" /usr/local/bin/swift -ln -s "$SWIFT_BIN_ROOT/swiftc" /usr/local/bin/swiftc -ln -s "$SWIFT_LIB_ROOT/libsourcekitdInProc.so" /usr/local/lib/libsourcekitdInProc.so +ln -s "$swift_bin_root/swift" /usr/local/bin/swift +ln -s "$swift_bin_root/swiftc" /usr/local/bin/swiftc +ln -s "$swift_lib_root/libsourcekitdInProc.so" /usr/local/lib/libsourcekitdInProc.so -set_etc_environment_variable "SWIFT_PATH" "${SWIFT_BIN_ROOT}" +set_etc_environment_variable "SWIFT_PATH" "${swift_bin_root}" invoke_tests "Common" "Swift" diff --git a/images/ubuntu/scripts/build/install-yq.sh b/images/ubuntu/scripts/build/install-yq.sh index 07a192651212..9caf52a56802 100644 --- a/images/ubuntu/scripts/build/install-yq.sh +++ b/images/ubuntu/scripts/build/install-yq.sh @@ -9,14 +9,15 @@ source $HELPER_SCRIPTS/install.sh # Download yq -base_url="https://github.com/mikefarah/yq/releases/latest/download" -binary_path=$(download_with_retry "${base_url}/yq_linux_amd64") +yq_url=$(resolve_github_release_asset_url "mikefarah/yq" "endswith(\"yq_linux_amd64\")" "latest") +binary_path=$(download_with_retry "${yq_url}") # Supply chain security - yq -external_hash=$(get_checksum_from_url "${base_url}/checksums" "yq_linux_amd64 " "SHA256" "true" " " "19") +hash_url=$(resolve_github_release_asset_url "mikefarah/yq" "endswith(\"checksums\")" "latest") +external_hash=$(get_checksum_from_url "${hash_url}" "yq_linux_amd64 " "SHA256" "true" " " "19") use_checksum_comparison "$binary_path" "$external_hash" # Install yq -sudo install "$binary_path" /usr/bin/yq +install "$binary_path" /usr/bin/yq invoke_tests "Tools" "yq" diff --git a/images/ubuntu/scripts/build/install-zstd.sh b/images/ubuntu/scripts/build/install-zstd.sh index 84d5932ddb99..a980ad8917e4 100644 --- a/images/ubuntu/scripts/build/install-zstd.sh +++ b/images/ubuntu/scripts/build/install-zstd.sh @@ -26,13 +26,13 @@ make -C "/tmp/${release_name}/contrib/pzstd" all make -C "/tmp/${release_name}" zstd-release for copyprocess in zstd zstdless zstdgrep; do - cp "/tmp/${release_name}/programs/${copyprocess}" /usr/local/bin/ + cp "/tmp/${release_name}/programs/${copyprocess}" /usr/local/bin/ done cp "/tmp/${release_name}/contrib/pzstd/pzstd" /usr/local/bin/ for symlink in zstdcat zstdmt unzstd; do - ln -sf /usr/local/bin/zstd /usr/local/bin/${symlink} + ln -sf /usr/local/bin/zstd /usr/local/bin/${symlink} done invoke_tests "Tools" "Zstd" diff --git a/images/ubuntu/scripts/helpers/os.sh b/images/ubuntu/scripts/helpers/os.sh index c500ab582e83..09a2213c2f70 100644 --- a/images/ubuntu/scripts/helpers/os.sh +++ b/images/ubuntu/scripts/helpers/os.sh @@ -11,7 +11,3 @@ is_ubuntu20() { is_ubuntu22() { lsb_release -d | grep -q 'Ubuntu 22' } - -get_os_version_label() { - lsb_release -cs -} From 266f9413d39fc77ade974757b633ef98873c9c21 Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Fri, 29 Dec 2023 18:11:55 +0100 Subject: [PATCH 2570/3485] [ubuntu] Remove apt-key from build scripts (#9082) --- .../scripts/build/install-container-tools.sh | 15 +++++++++------ images/ubuntu/scripts/build/install-heroku.sh | 13 ++++++++----- images/ubuntu/scripts/build/install-hhvm.sh | 14 ++++++++++++-- images/ubuntu/scripts/build/install-mongodb.sh | 17 +++++++++++------ images/ubuntu/scripts/build/install-mono.sh | 18 ++++++++++++------ 5 files changed, 52 insertions(+), 25 deletions(-) diff --git a/images/ubuntu/scripts/build/install-container-tools.sh b/images/ubuntu/scripts/build/install-container-tools.sh index f7374163719f..f17ce2f07912 100644 --- a/images/ubuntu/scripts/build/install-container-tools.sh +++ b/images/ubuntu/scripts/build/install-container-tools.sh @@ -19,11 +19,12 @@ fi # Packages is available in the official Ubuntu upstream starting from Ubuntu 21 if is_ubuntu20; then - REPO_URL="https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable" - source /etc/os-release - sh -c "echo 'deb ${REPO_URL}/x${NAME}_${VERSION_ID}/ /' > /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list" - wget -nv https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/x${NAME}_${VERSION_ID}/Release.key -O Release.key - apt-key add Release.key + REPO_URL="https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/xUbuntu_$(lsb_release -rs)" + GPG_KEY="/usr/share/keyrings/devel_kubic_libcontainers_stable.gpg" + REPO_PATH="/etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list" + + curl -fsSL "${REPO_URL}/Release.key" | gpg --dearmor -o $GPG_KEY + echo "deb [arch=amd64 signed-by=$GPG_KEY] ${REPO_URL}/ /" > $REPO_PATH fi # Install podman, buildah, scopeo container's tools @@ -34,7 +35,9 @@ printf "[registries.search]\nregistries = ['docker.io', 'quay.io']\n" | tee /etc if is_ubuntu20; then # Remove source repo - rm /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list + rm $GPG_KEY + rm $REPO_PATH + # Document source repo echo "containers $REPO_URL" >> $HELPER_SCRIPTS/apt-sources.txt fi diff --git a/images/ubuntu/scripts/build/install-heroku.sh b/images/ubuntu/scripts/build/install-heroku.sh index dc53ed7bfb7f..e5f774253d40 100644 --- a/images/ubuntu/scripts/build/install-heroku.sh +++ b/images/ubuntu/scripts/build/install-heroku.sh @@ -4,16 +4,19 @@ ## Desc: Install Heroku CLI. Based on instructions found here: https://devcenter.heroku.com/articles/heroku-cli ################################################################################ -# add heroku repository to apt -echo "deb https://cli-assets.heroku.com/channels/stable/apt ./" > /etc/apt/sources.list.d/heroku.list +REPO_URL="https://cli-assets.heroku.com/channels/stable/apt" +GPG_KEY="/usr/share/keyrings/heroku.gpg" +REPO_PATH="/etc/apt/sources.list.d/heroku.list" -# install heroku's release key for package verification -curl https://cli-assets.heroku.com/channels/stable/apt/release.key | apt-key add - +# add heroku repository to apt +curl -fsSL "${REPO_URL}/release.key" | gpg --dearmor -o $GPG_KEY +echo "deb [signed-by=$GPG_KEY] $REPO_URL ./" > $REPO_PATH # install heroku apt-get update -y && apt-get install -y heroku # remove heroku's apt repository -rm /etc/apt/sources.list.d/heroku.list +rm $REPO_PATH +rm $GPG_KEY invoke_tests "Tools" "Heroku" diff --git a/images/ubuntu/scripts/build/install-hhvm.sh b/images/ubuntu/scripts/build/install-hhvm.sh index 0e1bdb25d43a..fb529ce6f9bb 100644 --- a/images/ubuntu/scripts/build/install-hhvm.sh +++ b/images/ubuntu/scripts/build/install-hhvm.sh @@ -4,10 +4,20 @@ ## Desc: Install HHVM ################################################################################ -apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xB4112585D386EB94 -add-apt-repository https://dl.hhvm.com/ubuntu +REPO_URL="https://dl.hhvm.com/ubuntu" +GPG_KEY="/usr/share/keyrings/hhvm.gpg" +REPO_PATH="/etc/apt/sources.list.d/hhvm.list" +# add HHVM repository to apt +curl -fsSL https://dl.hhvm.com/conf/hhvm.gpg.key | gpg --dearmor -o $GPG_KEY +echo "deb [signed-by=$GPG_KEY] $REPO_URL $(lsb_release -cs) main" > $REPO_PATH + +# install HHVM apt-get update apt-get -qq install -y hhvm +# remove HHVM's apt repository +rm $REPO_PATH +rm $GPG_KEY + invoke_tests "Tools" "HHVM" diff --git a/images/ubuntu/scripts/build/install-mongodb.sh b/images/ubuntu/scripts/build/install-mongodb.sh index 266485926208..a593ac583cbc 100644 --- a/images/ubuntu/scripts/build/install-mongodb.sh +++ b/images/ubuntu/scripts/build/install-mongodb.sh @@ -7,19 +7,24 @@ # Source the helpers source $HELPER_SCRIPTS/install.sh -REPO_URL="https://repo.mongodb.org/apt/ubuntu" -os_label=$(lsb_release -cs) toolset_version=$(get_toolset_value '.mongodb.version') +REPO_URL="https://repo.mongodb.org/apt/ubuntu" +GPG_KEY="/usr/share/keyrings/mongodb-org-$toolset_version.gpg" +REPO_PATH="/etc/apt/sources.list.d/mongodb-org-$toolset_version.list" -# Install Mongo DB -wget -qO - https://www.mongodb.org/static/pgp/server-$toolset_version.asc | sudo apt-key add - +# add Mongo DB repository to apt +curl -fsSL https://www.mongodb.org/static/pgp/server-$toolset_version.asc | gpg --dearmor -o $GPG_KEY +echo "deb [ arch=amd64,arm64 signed-by=$GPG_KEY ] $REPO_URL $(lsb_release -cs)/mongodb-org/$toolset_version multiverse" > $REPO_PATH -echo "deb [ arch=amd64,arm64 ] $REPO_URL $os_label/mongodb-org/$toolset_version multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-org-$toolset_version.list +# Install Mongo DB sudo apt-get update sudo apt-get install -y mongodb-org -rm /etc/apt/sources.list.d/mongodb-org-$toolset_version.list +# remove Mongo DB's apt repository +rm $REPO_PATH +rm $GPG_KEY +# Document source repo echo "mongodb $REPO_URL" >> $HELPER_SCRIPTS/apt-sources.txt invoke_tests "Databases" "MongoDB" diff --git a/images/ubuntu/scripts/build/install-mono.sh b/images/ubuntu/scripts/build/install-mono.sh index 3abf40b14f41..78394cbcd670 100644 --- a/images/ubuntu/scripts/build/install-mono.sh +++ b/images/ubuntu/scripts/build/install-mono.sh @@ -8,23 +8,29 @@ source $HELPER_SCRIPTS/os.sh os_label=$(lsb_release -cs) +REPO_URL="https://download.mono-project.com/repo/ubuntu" +GPG_KEY="/usr/share/keyrings/mono-official-stable.gpg" +REPO_PATH="/etc/apt/sources.list.d/mono-official-stable.list" # There are no packages for Ubuntu 22 in the repo, but developers confirmed that packages from Ubuntu 20 should work if is_ubuntu22; then os_label="focal" fi -# Test to see if the software in question is already installed, if not install it -# wget "http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF" -O out && sudo apt-key add out && rm out +# Install Mono repo +curl -fsSL https://download.mono-project.com/repo/xamarin.gpg | gpg --dearmor -o $GPG_KEY +echo "deb [signed-by=$GPG_KEY] $REPO_URL stable-$os_label main" > $REPO_PATH -apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF -echo "deb https://download.mono-project.com/repo/ubuntu stable-$os_label main" | tee /etc/apt/sources.list.d/mono-official-stable.list +# Install Mono apt-get update apt-get install -y --no-install-recommends apt-transport-https mono-complete nuget -rm /etc/apt/sources.list.d/mono-official-stable.list -rm -f /etc/apt/sources.list.d/mono-official-stable.list.save +# Remove Mono's apt repo +rm $REPO_PATH +rm -f "${REPO_PATH}.save" +rm $GPG_KEY +# Document source repo echo "mono https://download.mono-project.com/repo/ubuntu stable-$os_label main" >> $HELPER_SCRIPTS/apt-sources.txt invoke_tests "Tools" "Mono" From 20d2e9821fc72729c87436f7c7195c118426d899 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Wed, 3 Jan 2024 12:07:53 +0100 Subject: [PATCH 2571/3485] [Ubuntu] Remove buildpack-deps docker images (#9093) --- images/ubuntu/toolsets/toolset-2004.json | 3 --- images/ubuntu/toolsets/toolset-2204.json | 2 -- 2 files changed, 5 deletions(-) diff --git a/images/ubuntu/toolsets/toolset-2004.json b/images/ubuntu/toolsets/toolset-2004.json index e1b5664fe7de..816d31370664 100644 --- a/images/ubuntu/toolsets/toolset-2004.json +++ b/images/ubuntu/toolsets/toolset-2004.json @@ -225,9 +225,6 @@ "alpine:3.16", "alpine:3.17", "alpine:3.18", - "buildpack-deps:stretch", - "buildpack-deps:buster", - "buildpack-deps:bullseye", "debian:9", "debian:10", "debian:11", diff --git a/images/ubuntu/toolsets/toolset-2204.json b/images/ubuntu/toolsets/toolset-2204.json index b4213e10eb43..98459780cba6 100644 --- a/images/ubuntu/toolsets/toolset-2204.json +++ b/images/ubuntu/toolsets/toolset-2204.json @@ -216,8 +216,6 @@ "alpine:3.16", "alpine:3.17", "alpine:3.18", - "buildpack-deps:buster", - "buildpack-deps:bullseye", "debian:10", "debian:11", "moby/buildkit:latest", From a9b737bac526f1e0e53716638e6fdd1a0f954d50 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Wed, 3 Jan 2024 21:21:02 +0100 Subject: [PATCH 2572/3485] [Ubuntu] Remove old android SDK versions (#9094) --- images/ubuntu/scripts/build/install-android-sdk.sh | 3 --- images/ubuntu/scripts/docs-gen/SoftwareReport.Android.psm1 | 4 ---- images/ubuntu/scripts/tests/Android.Tests.ps1 | 4 ---- images/ubuntu/toolsets/toolset-2004.json | 4 ++-- images/ubuntu/toolsets/toolset-2204.json | 4 ++-- 5 files changed, 4 insertions(+), 15 deletions(-) diff --git a/images/ubuntu/scripts/build/install-android-sdk.sh b/images/ubuntu/scripts/build/install-android-sdk.sh index 43d228ea1b3f..583928fea922 100644 --- a/images/ubuntu/scripts/build/install-android-sdk.sh +++ b/images/ubuntu/scripts/build/install-android-sdk.sh @@ -113,9 +113,6 @@ add_filtered_instalaltion_components $minimum_build_tool_version "${available_bu # Install components echo "y" | $SDKMANAGER ${components[@]} -# Old skdmanager from sdk tools doesn't work with Java > 8, set version 8 explicitly -sed -i "2i export JAVA_HOME=${JAVA_HOME_8_X64}" ${ANDROID_SDK_ROOT}/tools/bin/sdkmanager - # Add required permissions chmod -R a+rwx ${ANDROID_SDK_ROOT} diff --git a/images/ubuntu/scripts/docs-gen/SoftwareReport.Android.psm1 b/images/ubuntu/scripts/docs-gen/SoftwareReport.Android.psm1 index d79ac8568673..5ecc901055c6 100644 --- a/images/ubuntu/scripts/docs-gen/SoftwareReport.Android.psm1 +++ b/images/ubuntu/scripts/docs-gen/SoftwareReport.Android.psm1 @@ -43,10 +43,6 @@ function Build-AndroidTable { "Package" = "Android SDK Platforms" "Version" = Get-AndroidPlatformVersions -PackageInfo $packageInfo }, - @{ - "Package" = "Android SDK Tools" - "Version" = Get-AndroidPackageVersions -PackageInfo $packageInfo -MatchedString "Android SDK Tools" - }, @{ "Package" = "Android Support Repository" "Version" = Get-AndroidPackageVersions -PackageInfo $packageInfo -MatchedString "Android Support Repository" diff --git a/images/ubuntu/scripts/tests/Android.Tests.ps1 b/images/ubuntu/scripts/tests/Android.Tests.ps1 index aef895716f98..ab2ac2c4f196 100644 --- a/images/ubuntu/scripts/tests/Android.Tests.ps1 +++ b/images/ubuntu/scripts/tests/Android.Tests.ps1 @@ -81,10 +81,6 @@ Describe "Android" { Context "SDKManagers" { $testCases = @( - @{ - PackageName = "SDK tools" - Sdkmanager = "$env:ANDROID_HOME/tools/bin/sdkmanager" - }, @{ PackageName = "Command-line tools" Sdkmanager = "$env:ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager" diff --git a/images/ubuntu/toolsets/toolset-2004.json b/images/ubuntu/toolsets/toolset-2004.json index 816d31370664..5c75bb7458ac 100644 --- a/images/ubuntu/toolsets/toolset-2004.json +++ b/images/ubuntu/toolsets/toolset-2004.json @@ -79,8 +79,8 @@ }, "android": { "cmdline-tools": "commandlinetools-linux-9477386_latest.zip", - "platform_min_version": "27", - "build_tools_min_version": "27.0.0", + "platform_min_version": "31", + "build_tools_min_version": "31.0.0", "extra_list": [ "android;m2repository", "google;m2repository", diff --git a/images/ubuntu/toolsets/toolset-2204.json b/images/ubuntu/toolsets/toolset-2204.json index 98459780cba6..e881226c3e07 100644 --- a/images/ubuntu/toolsets/toolset-2204.json +++ b/images/ubuntu/toolsets/toolset-2204.json @@ -73,8 +73,8 @@ }, "android": { "cmdline-tools": "commandlinetools-linux-9477386_latest.zip", - "platform_min_version": "27", - "build_tools_min_version": "27.0.0", + "platform_min_version": "31", + "build_tools_min_version": "31.0.0", "extra_list": [ "android;m2repository", "google;m2repository", From f36abbb92bd1a1b1877aac64074a761917bdc9c0 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Thu, 4 Jan 2024 10:35:37 +0100 Subject: [PATCH 2573/3485] [Windows] Remove old android SDK versions (#9095) --- images/windows/scripts/docs-gen/SoftwareReport.Android.psm1 | 4 ---- images/windows/scripts/tests/Android.Tests.ps1 | 4 ---- images/windows/toolsets/toolset-2019.json | 4 ++-- images/windows/toolsets/toolset-2022.json | 4 ++-- 4 files changed, 4 insertions(+), 12 deletions(-) diff --git a/images/windows/scripts/docs-gen/SoftwareReport.Android.psm1 b/images/windows/scripts/docs-gen/SoftwareReport.Android.psm1 index ad46586efdc9..9aeeb4df62a4 100644 --- a/images/windows/scripts/docs-gen/SoftwareReport.Android.psm1 +++ b/images/windows/scripts/docs-gen/SoftwareReport.Android.psm1 @@ -38,10 +38,6 @@ function Build-AndroidTable { "Package" = "Android SDK Platform-Tools" "Version" = Get-AndroidPackageVersions -PackageInfo $packageInfo -MatchedString "Android SDK Platform-Tools" }, - @{ - "Package" = "Android SDK Tools" - "Version" = Get-AndroidPackageVersions -PackageInfo $packageInfo -MatchedString "Android SDK Tools" - }, @{ "Package" = "Android Support Repository" "Version" = Get-AndroidPackageVersions -PackageInfo $packageInfo -MatchedString "Android Support Repository" diff --git a/images/windows/scripts/tests/Android.Tests.ps1 b/images/windows/scripts/tests/Android.Tests.ps1 index 3ed9da8b75e8..2716b87f494a 100644 --- a/images/windows/scripts/tests/Android.Tests.ps1 +++ b/images/windows/scripts/tests/Android.Tests.ps1 @@ -30,10 +30,6 @@ Describe "Android SDK" { Context "SDKManagers" { $testCases = @( - @{ - PackageName = "SDK tools" - Sdkmanager = "$env:ANDROID_HOME\tools\bin\sdkmanager.bat" - }, @{ PackageName = "Command-line tools" Sdkmanager = "$env:ANDROID_HOME\cmdline-tools\latest\bin\sdkmanager.bat" diff --git a/images/windows/toolsets/toolset-2019.json b/images/windows/toolsets/toolset-2019.json index 6669619061a0..00fb1a37d8aa 100644 --- a/images/windows/toolsets/toolset-2019.json +++ b/images/windows/toolsets/toolset-2019.json @@ -149,8 +149,8 @@ "android": { "commandline_tools_url": "https://dl.google.com/android/repository/commandlinetools-win-9123335_latest.zip", "hash": "8A90E6A3DEB2FA13229B2E335EFD07687DCC8A55A3C544DA9F40B41404993E7D", - "platform_min_version": "19", - "build_tools_min_version": "19.1.0", + "platform_min_version": "31", + "build_tools_min_version": "31.0.0", "extras": [ "android;m2repository", "google;m2repository", diff --git a/images/windows/toolsets/toolset-2022.json b/images/windows/toolsets/toolset-2022.json index 200bc3c6f1e0..be15c713c76f 100644 --- a/images/windows/toolsets/toolset-2022.json +++ b/images/windows/toolsets/toolset-2022.json @@ -133,8 +133,8 @@ "android": { "commandline_tools_url": "https://dl.google.com/android/repository/commandlinetools-win-9123335_latest.zip", "hash": "8A90E6A3DEB2FA13229B2E335EFD07687DCC8A55A3C544DA9F40B41404993E7D", - "platform_min_version": "27", - "build_tools_min_version": "27.0.0", + "platform_min_version": "31", + "build_tools_min_version": "31.0.0", "extras": [ "android;m2repository", "google;m2repository", From 83fbf5a7529e39245a9cd40090c81cbdb86b71e5 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Thu, 4 Jan 2024 10:36:19 +0100 Subject: [PATCH 2574/3485] [macOS] Remove old android SDK versions (#9096) --- images/macos/toolsets/toolset-11.json | 4 ++-- images/macos/toolsets/toolset-12.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index e7bdd309e029..05cd919226fe 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -160,8 +160,8 @@ }, "android": { "cmdline-tools": "commandlinetools-mac-9123335_latest.zip", - "platform_min_version": "27", - "build_tools_min_version": "27.0.0", + "platform_min_version": "31", + "build_tools_min_version": "31.0.0", "extras": [ "android;m2repository", "google;m2repository", "google;google_play_services" ], diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index 979e24819dd2..cf05b02723c9 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -147,8 +147,8 @@ }, "android": { "cmdline-tools": "commandlinetools-mac-9123335_latest.zip", - "platform_min_version": "27", - "build_tools_min_version": "27.0.0", + "platform_min_version": "31", + "build_tools_min_version": "31.0.0", "extras": [ "android;m2repository", "google;m2repository", "google;google_play_services" ], From 9da2ec6b06d8a9e11a6f96de6ae15d2917b6e590 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Thu, 4 Jan 2024 10:46:00 +0100 Subject: [PATCH 2575/3485] [macOS] Update SoftwareReport scripts (#9092) --- images/macos/scripts/build/Install-Xcode.ps1 | 1 - .../docs-gen/SoftwareReport.Common.psm1 | 18 +++++++++--------- .../macos/scripts/helpers/Xcode.Installer.psm1 | 3 ++- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/images/macos/scripts/build/Install-Xcode.ps1 b/images/macos/scripts/build/Install-Xcode.ps1 index 6219becee80e..3552741aed88 100644 --- a/images/macos/scripts/build/Install-Xcode.ps1 +++ b/images/macos/scripts/build/Install-Xcode.ps1 @@ -44,7 +44,6 @@ $xcodeVersions | ForEach-Object { $xcodebuildPath = Get-XcodeToolPath -Version $_.link -ToolName 'xcodebuild' Invoke-ValidateCommand "sudo $xcodebuildPath -downloadPlatform $runtime" | Out-Null } - } Invoke-XcodeRunFirstLaunch -Version $defaultXcode diff --git a/images/macos/scripts/docs-gen/SoftwareReport.Common.psm1 b/images/macos/scripts/docs-gen/SoftwareReport.Common.psm1 index 41d4b9f74918..0a9df5bab21d 100644 --- a/images/macos/scripts/docs-gen/SoftwareReport.Common.psm1 +++ b/images/macos/scripts/docs-gen/SoftwareReport.Common.psm1 @@ -154,7 +154,7 @@ function Build-OSInfoSection { ) $fieldsToInclude = @("System Version:", "Kernel Version:") - $rawSystemInfo = Invoke-Expression "system_profiler SPSoftwareDataType" + $rawSystemInfo = Run-Command "system_profiler SPSoftwareDataType" $parsedSystemInfo = $rawSystemInfo | Where-Object { -not ($_ | Select-String -NotMatch $fieldsToInclude) } | ForEach-Object { $_.Trim() } $parsedSystemInfo[0] -match "System Version: macOS (?<version>\d+)" | Out-Null $version = $Matches.Version @@ -169,12 +169,12 @@ function Build-OSInfoSection { } function Get-MonoVersion { - $monoVersion = mono --version | Out-String | Take-Part -Part 4 + $monoVersion = Run-Command "mono --version" | Out-String | Take-Part -Part 4 return $monoVersion } function Get-MSBuildVersion { - $msbuildVersion = msbuild -version | Select-Object -Last 1 + $msbuildVersion = Run-Command "msbuild -version" | Select-Object -Last 1 $monoVersion = Get-MonoVersion return "$msbuildVersion (Mono $monoVersion)" } @@ -250,7 +250,7 @@ function Get-NuGetVersion { } function Get-CondaVersion { - $condaVersion = Invoke-Expression "conda --version" + $condaVersion = Run-Command "conda --version" return ($condaVersion -replace "^conda").Trim() } @@ -312,7 +312,7 @@ function Get-SVNVersion { function Get-PackerVersion { # Packer 1.7.1 has a bug and outputs version to stderr instead of stdout https://github.com/hashicorp/packer/issues/10855 - $result = Run-Command -Command "packer --version" + $result = Run-Command "packer --version" $packerVersion = [regex]::matches($result, "(\d+.){2}\d+").Value return $packerVersion } @@ -538,22 +538,22 @@ function Get-JazzyVersion { } function Get-ZlibVersion { - $zlibVersion = brew info --json zlib | jq -r '.[].installed[].version' + $zlibVersion = (Run-Command "brew info --json zlib" | ConvertFrom-Json).installed.version return $zlibVersion } function Get-LibXftVersion { - $libXftVersion = brew info --json libxft | jq -r '.[].installed[].version' + $libXftVersion = (Run-Command "brew info --json libxft" | ConvertFrom-Json).installed.version return $libXftVersion } function Get-LibXextVersion { - $libXextVersion = brew info --json libxext | jq -r '.[].installed[].version' + $libXextVersion = (Run-Command "brew info --json libxext" | ConvertFrom-Json).installed.version return $libXextVersion } function Get-TclTkVersion { - $tcltkVersion = brew info --json tcl-tk | jq -r '.[].installed[].version' + $tcltkVersion = (Run-Command "brew info --json tcl-tk" | ConvertFrom-Json).installed.version return $tcltkVersion } diff --git a/images/macos/scripts/helpers/Xcode.Installer.psm1 b/images/macos/scripts/helpers/Xcode.Installer.psm1 index 0efb531ea1c6..bbca20b89dc4 100644 --- a/images/macos/scripts/helpers/Xcode.Installer.psm1 +++ b/images/macos/scripts/helpers/Xcode.Installer.psm1 @@ -38,7 +38,7 @@ function Invoke-DownloadXcodeArchive { if ($xcodeSha256 -ne $Sha256Sum) { throw "Xcode $Version checksum mismatch. Expected: $Sha256Sum, Actual: $xcodeSha256" } - + return $tempXipDirectory } @@ -65,6 +65,7 @@ function Get-AvailableXcodeVersions { $availableVersions = $rawVersionsList | ForEach-Object { $partStable,$partMajor = $_.Split(" ", 2) $semver = $stableSemver = [SemVer]::Parse($partStable) + if ($partMajor) { # Convert 'beta 3' -> 'beta.3', 'Release Candidate' -> 'releasecandidate', 'GM Seed 2' -> 'gmseed.2' $normalizedLabel = $partMajor.toLower() -replace " (\d)", '.$1' -replace " ([a-z])", '$1' From 4960fde8f74bfb3a49e013da8a1c2ccfbbb9a5af Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Fri, 5 Jan 2024 12:29:46 +0100 Subject: [PATCH 2576/3485] [macos] Convert packer templates to HCL2 (#9098) * [macos] Convert packer templates to HCL2 * Fix inline shell provisioner * Fix folder name * Fix bootstrap folder copy --- docs/create-image-and-azure-resources.md | 2 +- docs/debugging-failed-builds.md | 3 +- .../azure-pipelines/image-generation.yml | 1 + images.CI/macos/azure-pipelines/macos11.yml | 2 +- images.CI/macos/azure-pipelines/macos12.yml | 2 +- images/macos/templates/macOS-11.json | 262 --------------- images/macos/templates/macOS-11.pkr.hcl | 303 +++++++++++++++++ images/macos/templates/macOS-12.json | 268 --------------- images/macos/templates/macOS-12.pkr.hcl | 307 ++++++++++++++++++ 9 files changed, 615 insertions(+), 535 deletions(-) delete mode 100644 images/macos/templates/macOS-11.json create mode 100644 images/macos/templates/macOS-11.pkr.hcl delete mode 100644 images/macos/templates/macOS-12.json create mode 100644 images/macos/templates/macOS-12.pkr.hcl diff --git a/docs/create-image-and-azure-resources.md b/docs/create-image-and-azure-resources.md index 877f5f0e7d71..14336728ffec 100644 --- a/docs/create-image-and-azure-resources.md +++ b/docs/create-image-and-azure-resources.md @@ -2,7 +2,7 @@ The runner-images project uses [Packer](https://www.packer.io/) to generate disk images for Windows 2019/2022 and Ubuntu 20.04/22.04. -Each image is configured by a JSON or HCL2 Packer template that specifies where to build the image (Azure, in this case), +Each image is configured by a HCL2 Packer template that specifies where to build the image (Azure, in this case), and what steps to run to install software and prepare the disk. The Packer process initializes a connection to the Azure subscription using Azure CLI and creates temporary resources diff --git a/docs/debugging-failed-builds.md b/docs/debugging-failed-builds.md index d8a4c2ed8910..4e301e83f771 100644 --- a/docs/debugging-failed-builds.md +++ b/docs/debugging-failed-builds.md @@ -21,7 +21,6 @@ Log into the Azure Portal. Find that resource group under `Resource groups`. Y ## Step 3: Connect to the VM Select the VM in the resource group. Click `Connect:` -This will download an RDP file. Open that and enter the credentials found in the JSON file you pass to `packer build`: +This will download an RDP file. Open that and enter the credentials found in the HCL2 file you pass to `packer build`: ![VM credentials screenshot](/docs/resources/vmCredentials.png "VM credentials screenshot") - diff --git a/images.CI/macos/azure-pipelines/image-generation.yml b/images.CI/macos/azure-pipelines/image-generation.yml index bda268b9f442..19bfdde3cc6b 100644 --- a/images.CI/macos/azure-pipelines/image-generation.yml +++ b/images.CI/macos/azure-pipelines/image-generation.yml @@ -63,6 +63,7 @@ jobs: 'Using ssh communicator to connect:' ) + packer init ${{ parameters.template_path }} packer build -on-error=abort ` -var="vcenter_server=$(vcenter-server-v2)" ` -var="vcenter_username=$(vcenter-username-v2)" ` diff --git a/images.CI/macos/azure-pipelines/macos11.yml b/images.CI/macos/azure-pipelines/macos11.yml index bbf019fdece3..012b3e61d0b9 100644 --- a/images.CI/macos/azure-pipelines/macos11.yml +++ b/images.CI/macos/azure-pipelines/macos11.yml @@ -19,5 +19,5 @@ jobs: parameters: image_label: 'macOS Big Sur' base_image_name: 'clean-macOS-11-380Gb-runner' - template_path: 'templates/macOS-11.json' + template_path: 'templates/macOS-11.pkr.hcl' target_datastore: 'ds-image' diff --git a/images.CI/macos/azure-pipelines/macos12.yml b/images.CI/macos/azure-pipelines/macos12.yml index 4baf7e30ed8e..afa2190c2baa 100644 --- a/images.CI/macos/azure-pipelines/macos12.yml +++ b/images.CI/macos/azure-pipelines/macos12.yml @@ -19,5 +19,5 @@ jobs: parameters: image_label: 'macOS Monterey' base_image_name: 'clean-macOS-12-380Gb-runner' - template_path: 'templates/macOS-12.json' + template_path: 'templates/macOS-12.pkr.hcl' target_datastore: 'ds-image' diff --git a/images/macos/templates/macOS-11.json b/images/macos/templates/macOS-11.json deleted file mode 100644 index ded01dd95121..000000000000 --- a/images/macos/templates/macOS-11.json +++ /dev/null @@ -1,262 +0,0 @@ -{ - "variables": { - "vcenter_server": null, - "vcenter_username": null, - "vcenter_password": null, - "vcenter_datacenter": null, - "cluster_or_esxi_host": null, - "esxi_datastore": null, - "build_id": null, - "baseimage_name": null, - "output_folder": null, - "vm_username": null, - "vm_password": null, - "github_api_pat": null, - "xcode_install_storage_url": null, - "xcode_install_sas": null, - "image_os": "macos11" - }, - "builders": [ - { - "type": "vsphere-clone", - "vcenter_server": "{{user `vcenter_server`}}", - "username": "{{user `vcenter_username`}}", - "password": "{{user `vcenter_password`}}", - "insecure_connection": true, - "datacenter": "{{ user `vcenter_datacenter` }}", - "template": "{{ user `baseimage_name` }}", - "folder": "{{user `output_folder` }}", - "host": "{{user `cluster_or_esxi_host`}}", - "datastore": "{{user `esxi_datastore`}}", - "vm_name": "{{user `build_id`}}", - "ssh_username": "{{user `vm_username`}}", - "ssh_password": "{{user `vm_password`}}", - "CPUs": "5", - "cpu_cores": "5", - "RAM": "24576", - "NestedHV": "true", - "shutdown_timeout": "15m" - } - ], - "provisioners": [ - { - "type": "shell", - "inline": "mkdir ~/image-generation" - }, - { - "type": "file", - "sources": [ - "./assets/xamarin-selector", - "./scripts/tests", - "./scripts/docs-gen", - "./scripts/helpers" - ], - "destination": "~/image-generation/" - }, - { - "type": "file", - "source": "../../helpers/software-report-base", - "destination": "~/image-generation/docs-gen/" - }, - { - "type": "file", - "source": "./assets/add-certificate.swift", - "destination": "~/image-generation/add-certificate.swift" - }, - { - "type": "file", - "source": "./assets/bashrc", - "destination": "~/.bashrc" - }, - { - "type": "file", - "source": "./assets/bashprofile", - "destination": "~/.bash_profile" - }, - { - "type": "file", - "source": "./assets/bootstrap-provisioner", - "destination": "~/bootstrap" - }, - { - "type": "file", - "source": "./toolsets/toolset-11.json", - "destination": "~/image-generation/toolset.json" - }, - { - "type": "shell", - "inline": [ - "mv ~/image-generation/docs-gen ~/image-generation/software-report", - "mv ~/image-generation/xamarin-selector ~/image-generation/assets", - "mkdir ~/utils", - "mv ~/image-generation/helpers/confirm-identified-developers.scpt ~/utils", - "mv ~/image-generation/helpers/invoke-tests.sh ~/utils", - "mv ~/image-generation/helpers/utils.sh ~/utils", - "mv ~/image-generation/helpers/xamarin-utils.sh ~/utils" - ], - "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" - }, - { - "type": "shell", - "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}", - "scripts": [ - "./scripts/build/install-xcode-clt.sh", - "./scripts/build/install-homebrew.sh" - ] - }, - { - "type": "shell", - "execute_command": "chmod +x {{ .Path }}; sudo {{ .Vars }} {{ .Path }}", - "scripts": [ - "./scripts/build/install-xcode-clt.sh", - "./scripts/build/configure-network-interface-detection.sh", - "./scripts/build/configure-autologin.sh", - "./scripts/build/configure-auto-updates.sh", - "./scripts/build/configure-screensaver.sh", - "./scripts/build/configure-ntpconf.sh", - "./scripts/build/configure-max-files-limitation.sh", - "./scripts/build/configure-shell.sh" - ], - "environment_vars": [ - "PASSWORD={{user `vm_password`}}", - "USERNAME={{user `vm_username`}}" - ] - }, - { - "type": "shell", - "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}", - "scripts": [ - "./scripts/build/configure-preimagedata.sh", - "./scripts/build/configure-ssh.sh", - "./scripts/build/configure-machine.sh" - ], - "environment_vars": [ - "IMAGE_VERSION={{user `build_id`}}", - "IMAGE_OS={{user `image_os`}}" - ] - }, - { - "type": "shell", - "execute_command": "sudo {{ .Vars }} {{ .Path }}", - "inline": [ - "echo 'Reboot VM'", - "shutdown -r now" - ], - "expect_disconnect": true - }, - { - "type": "shell", - "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}", - "pause_before": "30s", - "scripts": [ - "./scripts/build/configure-windows.sh", - "./scripts/build/install-powershell.sh", - "./scripts/build/install-dotnet.sh", - "./scripts/build/install-python.sh", - "./scripts/build/install-azcopy.sh", - "./scripts/build/install-openssl.sh", - "./scripts/build/install-ruby.sh", - "./scripts/build/install-rubygems.sh", - "./scripts/build/install-git.sh", - "./scripts/build/install-mongodb.sh", - "./scripts/build/install-node.sh" - ], - "environment_vars": [ - "API_PAT={{user `github_api_pat`}}" - ] - }, - { - "type": "shell", - "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} pwsh -f {{ .Path }}", - "script": "./scripts/build/Install-Xcode.ps1", - "environment_vars": [ - "XCODE_INSTALL_STORAGE_URL={{user `xcode_install_storage_url`}}", - "XCODE_INSTALL_SAS={{user `xcode_install_sas`}}" - ] - }, - { - "type": "shell", - "execute_command": "sudo {{ .Vars }} {{ .Path }}", - "inline": [ - "echo 'Reboot VM'", - "shutdown -r now" - ], - "expect_disconnect": true - }, - { - "type": "shell", - "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}", - "scripts": [ - "./scripts/build/install-actions-cache.sh", - "./scripts/build/install-common-utils.sh", - "./scripts/build/install-llvm.sh", - "./scripts/build/install-golang.sh", - "./scripts/build/install-swiftlint.sh", - "./scripts/build/install-openjdk.sh", - "./scripts/build/install-php.sh", - "./scripts/build/install-aws-tools.sh", - "./scripts/build/install-rust.sh", - "./scripts/build/install-gcc.sh", - "./scripts/build/install-haskell.sh", - "./scripts/build/install-cocoapods.sh", - "./scripts/build/install-android-sdk.sh", - "./scripts/build/install-xamarin.sh", - "./scripts/build/install-visualstudio.sh", - "./scripts/build/install-nvm.sh", - "./scripts/build/install-apache.sh", - "./scripts/build/install-nginx.sh", - "./scripts/build/install-postgresql.sh", - "./scripts/build/install-audiodevice.sh", - "./scripts/build/install-vcpkg.sh", - "./scripts/build/install-miniconda.sh", - "./scripts/build/install-safari.sh", - "./scripts/build/install-chrome.sh", - "./scripts/build/install-edge.sh", - "./scripts/build/install-firefox.sh", - "./scripts/build/install-pypy.sh", - "./scripts/build/install-pipx-packages.sh", - "./scripts/build/install-bicep.sh", - "./scripts/build/install-codeql-bundle.sh" - ], - "environment_vars": [ - "API_PAT={{user `github_api_pat`}}" - ] - }, - { - "type": "shell", - "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} pwsh -f {{ .Path }}", - "scripts": [ - "./scripts/build/Install-Toolset.ps1", - "./scripts/build/Configure-Toolset.ps1" - ] - }, - { - "type": "shell", - "execute_command": "ruby {{ .Path }}", - "scripts": [ - "./scripts/build/configure-xcode-simulators.rb" - ] - }, - { - "type": "shell", - "inline": [ - "pwsh -File \"$HOME/image-generation/software-report/Generate-SoftwareReport.ps1\" -OutputDirectory \"$HOME/image-generation/output/software-report\" -ImageName {{user `build_id`}}", - "pwsh -File \"$HOME/image-generation/tests/RunAll-Tests.ps1\"" - ] - }, - { - "type": "file", - "direction": "download", - "source": "~/image-generation/output/*", - "destination": "../image-output/" - }, - { - "type": "shell", - "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}", - "scripts": [ - "./scripts/build/configure-hostname.sh", - "./scripts/build/configure-system.sh" - ] - } - ] -} diff --git a/images/macos/templates/macOS-11.pkr.hcl b/images/macos/templates/macOS-11.pkr.hcl new file mode 100644 index 000000000000..7635ad3af99f --- /dev/null +++ b/images/macos/templates/macOS-11.pkr.hcl @@ -0,0 +1,303 @@ +packer { + required_plugins { + vsphere = { + source = "github.com/hashicorp/vsphere" + version = "~> 1" + } + } +} + +variable "baseimage_name" { + type = string +} + +variable "build_id" { + type = string +} + +variable "cluster_or_esxi_host" { + type = string +} + +variable "esxi_datastore" { + type = string +} + +variable "github_api_pat" { + type = string + default = "" + sensitive = true +} + +variable "image_os" { + type = string + default = "macos11" +} + +variable "output_folder" { + type = string +} + +variable "vcenter_datacenter" { + type = string +} + +variable "vcenter_password" { + type = string + sensitive = true +} + +variable "vcenter_server" { + type = string +} + +variable "vcenter_username" { + type = string + sensitive = true +} + +variable "vm_password" { + type = string + sensitive = true +} + +variable "vm_username" { + type = string + sensitive = true +} + +variable "xcode_install_sas" { + type = string + sensitive = true +} + +variable "xcode_install_storage_url" { + type = string + sensitive = true +} + +source "vsphere-clone" "template" { + CPUs = "5" + NestedHV = "true" + RAM = "24576" + cpu_cores = "5" + datacenter = "${var.vcenter_datacenter}" + datastore = "${var.esxi_datastore}" + folder = "${var.output_folder}" + host = "${var.cluster_or_esxi_host}" + insecure_connection = true + password = "${var.vcenter_password}" + shutdown_timeout = "15m" + ssh_password = "${var.vm_password}" + ssh_username = "${var.vm_username}" + template = "${var.baseimage_name}" + username = "${var.vcenter_username}" + vcenter_server = "${var.vcenter_server}" + vm_name = "${var.build_id}" +} + +build { + sources = ["source.vsphere-clone.template"] + + provisioner "shell" { + inline = ["mkdir ~/image-generation"] + } + + provisioner "file" { + destination = "~/image-generation/" + sources = [ + "./assets/xamarin-selector", + "./scripts/tests", + "./scripts/docs-gen", + "./scripts/helpers" + ] + } + + provisioner "file" { + destination = "~/image-generation/docs-gen/" + source = "../../helpers/software-report-base" + } + + provisioner "file" { + destination = "~/image-generation/add-certificate.swift" + source = "./assets/add-certificate.swift" + } + + provisioner "file" { + destination = "~/.bashrc" + source = "./assets/bashrc" + } + + provisioner "file" { + destination = "~/.bash_profile" + source = "./assets/bashprofile" + } + + provisioner "shell" { + inline = [ "mkdir ~/bootstrap" ] + } + + provisioner "file" { + destination = "~/bootstrap" + source = "./assets/bootstrap-provisioner/" + } + + provisioner "file" { + destination = "~/image-generation/toolset.json" + source = "./toolsets/toolset-11.json" + } + + provisioner "shell" { + execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" + inline = [ + "mv ~/image-generation/docs-gen ~/image-generation/software-report", + "mv ~/image-generation/xamarin-selector ~/image-generation/assets", + "mkdir ~/utils", + "mv ~/image-generation/helpers/confirm-identified-developers.scpt ~/utils", + "mv ~/image-generation/helpers/invoke-tests.sh ~/utils", + "mv ~/image-generation/helpers/utils.sh ~/utils", + "mv ~/image-generation/helpers/xamarin-utils.sh ~/utils" + ] + } + + provisioner "shell" { + execute_command = "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}" + scripts = [ + "./scripts/build/install-xcode-clt.sh", + "./scripts/build/install-homebrew.sh" + ] + } + + provisioner "shell" { + environment_vars = ["PASSWORD=${var.vm_password}", "USERNAME=${var.vm_username}"] + execute_command = "chmod +x {{ .Path }}; sudo {{ .Vars }} {{ .Path }}" + scripts = [ + "./scripts/build/install-xcode-clt.sh", + "./scripts/build/configure-network-interface-detection.sh", + "./scripts/build/configure-autologin.sh", + "./scripts/build/configure-auto-updates.sh", + "./scripts/build/configure-screensaver.sh", + "./scripts/build/configure-ntpconf.sh", + "./scripts/build/configure-max-files-limitation.sh", + "./scripts/build/configure-shell.sh" + ] + } + + provisioner "shell" { + environment_vars = ["IMAGE_VERSION=${var.build_id}", "IMAGE_OS=${var.image_os}"] + execute_command = "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}" + scripts = [ + "./scripts/build/configure-preimagedata.sh", + "./scripts/build/configure-ssh.sh", + "./scripts/build/configure-machine.sh" + ] + } + + provisioner "shell" { + execute_command = "sudo {{ .Vars }} {{ .Path }}" + expect_disconnect = true + inline = ["echo 'Reboot VM'", "shutdown -r now"] + } + + provisioner "shell" { + environment_vars = ["API_PAT=${var.github_api_pat}"] + execute_command = "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}" + pause_before = "30s" + scripts = [ + "./scripts/build/configure-windows.sh", + "./scripts/build/install-powershell.sh", + "./scripts/build/install-dotnet.sh", + "./scripts/build/install-python.sh", + "./scripts/build/install-azcopy.sh", + "./scripts/build/install-openssl.sh", + "./scripts/build/install-ruby.sh", + "./scripts/build/install-rubygems.sh", + "./scripts/build/install-git.sh", + "./scripts/build/install-mongodb.sh", + "./scripts/build/install-node.sh" + ] + } + + provisioner "shell" { + environment_vars = ["XCODE_INSTALL_STORAGE_URL=${var.xcode_install_storage_url}", "XCODE_INSTALL_SAS=${var.xcode_install_sas}"] + execute_command = "chmod +x {{ .Path }}; {{ .Vars }} pwsh -f {{ .Path }}" + script = "./scripts/build/Install-Xcode.ps1" + } + + provisioner "shell" { + execute_command = "sudo {{ .Vars }} {{ .Path }}" + expect_disconnect = true + inline = ["echo 'Reboot VM'", "shutdown -r now"] + } + + provisioner "shell" { + environment_vars = ["API_PAT=${var.github_api_pat}"] + execute_command = "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}" + scripts = [ + "./scripts/build/install-actions-cache.sh", + "./scripts/build/install-common-utils.sh", + "./scripts/build/install-llvm.sh", + "./scripts/build/install-golang.sh", + "./scripts/build/install-swiftlint.sh", + "./scripts/build/install-openjdk.sh", + "./scripts/build/install-php.sh", + "./scripts/build/install-aws-tools.sh", + "./scripts/build/install-rust.sh", + "./scripts/build/install-gcc.sh", + "./scripts/build/install-haskell.sh", + "./scripts/build/install-cocoapods.sh", + "./scripts/build/install-android-sdk.sh", + "./scripts/build/install-xamarin.sh", + "./scripts/build/install-visualstudio.sh", + "./scripts/build/install-nvm.sh", + "./scripts/build/install-apache.sh", + "./scripts/build/install-nginx.sh", + "./scripts/build/install-postgresql.sh", + "./scripts/build/install-audiodevice.sh", + "./scripts/build/install-vcpkg.sh", + "./scripts/build/install-miniconda.sh", + "./scripts/build/install-safari.sh", + "./scripts/build/install-chrome.sh", + "./scripts/build/install-edge.sh", + "./scripts/build/install-firefox.sh", + "./scripts/build/install-pypy.sh", + "./scripts/build/install-pipx-packages.sh", + "./scripts/build/install-bicep.sh", + "./scripts/build/install-codeql-bundle.sh" + ] + } + + provisioner "shell" { + execute_command = "chmod +x {{ .Path }}; {{ .Vars }} pwsh -f {{ .Path }}" + scripts = [ + "./scripts/build/Install-Toolset.ps1", + "./scripts/build/Configure-Toolset.ps1" + ] + } + + provisioner "shell" { + execute_command = "ruby {{ .Path }}" + script = "./scripts/build/configure-xcode-simulators.rb" + } + + provisioner "shell" { + inline = [ + "pwsh -File \"$HOME/image-generation/software-report/Generate-SoftwareReport.ps1\" -OutputDirectory \"$HOME/image-generation/output/software-report\" -ImageName ${var.build_id}", + "pwsh -File \"$HOME/image-generation/tests/RunAll-Tests.ps1\"" + ] + } + + provisioner "file" { + destination = "../image-output/" + direction = "download" + source = "~/image-generation/output/*" + } + + provisioner "shell" { + execute_command = "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}" + scripts = [ + "./scripts/build/configure-hostname.sh", + "./scripts/build/configure-system.sh" + ] + } +} diff --git a/images/macos/templates/macOS-12.json b/images/macos/templates/macOS-12.json deleted file mode 100644 index 7ca2da135a12..000000000000 --- a/images/macos/templates/macOS-12.json +++ /dev/null @@ -1,268 +0,0 @@ -{ - "variables": { - "vcenter_server": null, - "vcenter_username": null, - "vcenter_password": null, - "vcenter_datacenter": null, - "cluster_or_esxi_host": null, - "esxi_datastore": null, - "build_id": null, - "baseimage_name": null, - "output_folder": null, - "vm_username": null, - "vm_password": null, - "github_api_pat": null, - "xcode_install_storage_url": null, - "xcode_install_sas": null, - "image_os": "macos12" - }, - "builders": [ - { - "type": "vsphere-clone", - "vcenter_server": "{{user `vcenter_server`}}", - "username": "{{user `vcenter_username`}}", - "password": "{{user `vcenter_password`}}", - "insecure_connection": true, - "datacenter": "{{ user `vcenter_datacenter` }}", - "template": "{{ user `baseimage_name` }}", - "folder": "{{user `output_folder` }}", - "host": "{{user `cluster_or_esxi_host`}}", - "datastore": "{{user `esxi_datastore`}}", - "vm_name": "{{user `build_id`}}", - "ssh_username": "{{user `vm_username`}}", - "ssh_password": "{{user `vm_password`}}", - "CPUs": "5", - "cpu_cores": "5", - "RAM": "24576", - "NestedHV": "true", - "shutdown_timeout": "15m" - } - ], - "provisioners": [ - { - "type": "shell", - "inline": "mkdir ~/image-generation" - }, - { - "type": "file", - "sources": [ - "./assets/xamarin-selector", - "./scripts/tests", - "./scripts/docs-gen", - "./scripts/helpers" - ], - "destination": "~/image-generation/" - }, - { - "type": "file", - "source": "../../helpers/software-report-base", - "destination": "~/image-generation/docs-gen/" - }, - { - "type": "file", - "source": "./assets/add-certificate.swift", - "destination": "~/image-generation/add-certificate.swift" - }, - { - "type": "file", - "source": "./assets/bashrc", - "destination": "~/.bashrc" - }, - { - "type": "file", - "source": "./assets/bashprofile", - "destination": "~/.bash_profile" - }, - { - "type": "file", - "source": "./assets/bootstrap-provisioner", - "destination": "~/bootstrap" - }, - { - "type": "file", - "source": "./toolsets/toolset-12.json", - "destination": "~/image-generation/toolset.json" - }, - { - "type": "shell", - "inline": [ - "mv ~/image-generation/docs-gen ~/image-generation/software-report", - "mv ~/image-generation/xamarin-selector ~/image-generation/assets", - "mkdir ~/utils", - "mv ~/image-generation/helpers/confirm-identified-developers.scpt ~/utils", - "mv ~/image-generation/helpers/invoke-tests.sh ~/utils", - "mv ~/image-generation/helpers/utils.sh ~/utils", - "mv ~/image-generation/helpers/xamarin-utils.sh ~/utils" - ], - "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" - }, - { - "type": "shell", - "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}", - "scripts": [ - "./scripts/build/install-xcode-clt.sh", - "./scripts/build/install-homebrew.sh" - ] - }, - { - "type": "shell", - "execute_command": "chmod +x {{ .Path }}; sudo {{ .Vars }} {{ .Path }}", - "scripts": [ - "./scripts/build/configure-network-interface-detection.sh", - "./scripts/build/configure-autologin.sh", - "./scripts/build/configure-auto-updates.sh", - "./scripts/build/configure-screensaver.sh", - "./scripts/build/configure-ntpconf.sh", - "./scripts/build/configure-max-files-limitation.sh", - "./scripts/build/configure-shell.sh" - ], - "environment_vars": [ - "PASSWORD={{user `vm_password`}}", - "USERNAME={{user `vm_username`}}" - ] - }, - { - "type": "shell", - "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}", - "scripts": [ - "./scripts/build/configure-preimagedata.sh", - "./scripts/build/configure-ssh.sh", - "./scripts/build/configure-machine.sh" - ], - "environment_vars": [ - "IMAGE_VERSION={{user `build_id`}}", - "IMAGE_OS={{user `image_os`}}", - "PASSWORD={{user `vm_password`}}" - ] - }, - { - "type": "shell", - "execute_command": "sudo {{ .Vars }} {{ .Path }}", - "inline": [ - "echo 'Reboot VM'", - "shutdown -r now" - ], - "expect_disconnect": true - }, - { - "type": "shell", - "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}", - "pause_before": "30s", - "scripts": [ - "./scripts/build/configure-windows.sh", - "./scripts/build/install-powershell.sh", - "./scripts/build/install-dotnet.sh", - "./scripts/build/install-python.sh", - "./scripts/build/install-azcopy.sh", - "./scripts/build/install-openssl.sh", - "./scripts/build/install-ruby.sh", - "./scripts/build/install-rubygems.sh", - "./scripts/build/install-git.sh", - "./scripts/build/install-mongodb.sh", - "./scripts/build/install-node.sh", - "./scripts/build/install-common-utils.sh" - ], - "environment_vars": [ - "API_PAT={{user `github_api_pat`}}", - "USER_PASSWORD={{user `vm_password`}}" - ] - }, - { - "type": "shell", - "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} pwsh -f {{ .Path }}", - "script": "./scripts/build/Install-Xcode.ps1", - "environment_vars": [ - "XCODE_INSTALL_STORAGE_URL={{user `xcode_install_storage_url`}}", - "XCODE_INSTALL_SAS={{user `xcode_install_sas`}}" - ] - }, - { - "type": "shell", - "execute_command": "sudo {{ .Vars }} {{ .Path }}", - "inline": [ - "echo 'Reboot VM'", - "shutdown -r now" - ], - "expect_disconnect": true - }, - { - "type": "shell", - "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}", - "scripts": [ - "./scripts/build/install-actions-cache.sh", - "./scripts/build/install-llvm.sh", - "./scripts/build/install-golang.sh", - "./scripts/build/install-swiftlint.sh", - "./scripts/build/install-openjdk.sh", - "./scripts/build/install-php.sh", - "./scripts/build/install-aws-tools.sh", - "./scripts/build/install-rust.sh", - "./scripts/build/install-gcc.sh", - "./scripts/build/install-haskell.sh", - "./scripts/build/install-cocoapods.sh", - "./scripts/build/install-android-sdk.sh", - "./scripts/build/install-xamarin.sh", - "./scripts/build/install-visualstudio.sh", - "./scripts/build/install-nvm.sh", - "./scripts/build/install-apache.sh", - "./scripts/build/install-nginx.sh", - "./scripts/build/install-postgresql.sh", - "./scripts/build/install-audiodevice.sh", - "./scripts/build/install-vcpkg.sh", - "./scripts/build/install-miniconda.sh", - "./scripts/build/install-safari.sh", - "./scripts/build/install-chrome.sh", - "./scripts/build/install-edge.sh", - "./scripts/build/install-firefox.sh", - "./scripts/build/install-pypy.sh", - "./scripts/build/install-pipx-packages.sh", - "./scripts/build/install-bicep.sh", - "./scripts/build/install-codeql-bundle.sh" - ], - "environment_vars": [ - "API_PAT={{user `github_api_pat`}}" - ] - }, - { - "type": "shell", - "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} pwsh -f {{ .Path }}", - "scripts": [ - "./scripts/build/Install-Toolset.ps1", - "./scripts/build/Configure-Toolset.ps1" - ] - }, - { - "type": "shell", - "execute_command": "ruby {{ .Path }}", - "scripts": [ - "./scripts/build/configure-xcode-simulators.rb" - ] - }, - { - "type": "shell", - "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} pwsh -f {{ .Path }}", - "script": "./scripts/build/Update-XcodeSimulators.ps1" - }, - { - "type": "shell", - "inline": [ - "pwsh -File \"$HOME/image-generation/software-report/Generate-SoftwareReport.ps1\" -OutputDirectory \"$HOME/image-generation/output/software-report\" -ImageName {{user `build_id`}}", - "pwsh -File \"$HOME/image-generation/tests/RunAll-Tests.ps1\"" - ] - }, - { - "type": "file", - "direction": "download", - "source": "~/image-generation/output/*", - "destination": "../image-output/" - }, - { - "type": "shell", - "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}", - "scripts": [ - "./scripts/build/configure-hostname.sh", - "./scripts/build/configure-system.sh" - ] - } - ] -} diff --git a/images/macos/templates/macOS-12.pkr.hcl b/images/macos/templates/macOS-12.pkr.hcl new file mode 100644 index 000000000000..8d27481be137 --- /dev/null +++ b/images/macos/templates/macOS-12.pkr.hcl @@ -0,0 +1,307 @@ +packer { + required_plugins { + vsphere = { + source = "github.com/hashicorp/vsphere" + version = "~> 1" + } + } +} + +variable "baseimage_name" { + type = string +} + +variable "build_id" { + type = string +} + +variable "cluster_or_esxi_host" { + type = string +} + +variable "esxi_datastore" { + type = string +} + +variable "github_api_pat" { + type = string + default = "" + sensitive = true +} + +variable "image_os" { + type = string + default = "macos12" +} + +variable "output_folder" { + type = string +} + +variable "vcenter_datacenter" { + type = string +} + +variable "vcenter_password" { + type = string + sensitive = true +} + +variable "vcenter_server" { + type = string +} + +variable "vcenter_username" { + type = string + sensitive = true +} + +variable "vm_password" { + type = string + sensitive = true +} + +variable "vm_username" { + type = string + sensitive = true +} + +variable "xcode_install_sas" { + type = string + sensitive = true +} + +variable "xcode_install_storage_url" { + type = string + sensitive = true +} + +source "vsphere-clone" "template" { + CPUs = "5" + NestedHV = "true" + RAM = "24576" + cpu_cores = "5" + datacenter = "${var.vcenter_datacenter}" + datastore = "${var.esxi_datastore}" + folder = "${var.output_folder}" + host = "${var.cluster_or_esxi_host}" + insecure_connection = true + password = "${var.vcenter_password}" + shutdown_timeout = "15m" + ssh_password = "${var.vm_password}" + ssh_username = "${var.vm_username}" + template = "${var.baseimage_name}" + username = "${var.vcenter_username}" + vcenter_server = "${var.vcenter_server}" + vm_name = "${var.build_id}" +} + +build { + sources = ["source.vsphere-clone.template"] + + provisioner "shell" { + inline = ["mkdir ~/image-generation"] + } + + provisioner "file" { + destination = "~/image-generation/" + sources = [ + "./assets/xamarin-selector", + "./scripts/tests", + "./scripts/docs-gen", + "./scripts/helpers" + ] + } + + provisioner "file" { + destination = "~/image-generation/docs-gen/" + source = "../../helpers/software-report-base" + } + + provisioner "file" { + destination = "~/image-generation/add-certificate.swift" + source = "./assets/add-certificate.swift" + } + + provisioner "file" { + destination = "~/.bashrc" + source = "./assets/bashrc" + } + + provisioner "file" { + destination = "~/.bash_profile" + source = "./assets/bashprofile" + } + + provisioner "shell" { + inline = [ "mkdir ~/bootstrap" ] + } + + provisioner "file" { + destination = "~/bootstrap" + source = "./assets/bootstrap-provisioner/" + } + + provisioner "file" { + destination = "~/image-generation/toolset.json" + source = "./toolsets/toolset-12.json" + } + + provisioner "shell" { + execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" + inline = [ + "mv ~/image-generation/docs-gen ~/image-generation/software-report", + "mv ~/image-generation/xamarin-selector ~/image-generation/assets", + "mkdir ~/utils", + "mv ~/image-generation/helpers/confirm-identified-developers.scpt ~/utils", + "mv ~/image-generation/helpers/invoke-tests.sh ~/utils", + "mv ~/image-generation/helpers/utils.sh ~/utils", + "mv ~/image-generation/helpers/xamarin-utils.sh ~/utils" + ] + } + + provisioner "shell" { + execute_command = "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}" + scripts = [ + "./scripts/build/install-xcode-clt.sh", + "./scripts/build/install-homebrew.sh" + ] + } + + provisioner "shell" { + environment_vars = ["PASSWORD=${var.vm_password}", "USERNAME=${var.vm_username}"] + execute_command = "chmod +x {{ .Path }}; sudo {{ .Vars }} {{ .Path }}" + scripts = [ + "./scripts/build/configure-network-interface-detection.sh", + "./scripts/build/configure-autologin.sh", + "./scripts/build/configure-auto-updates.sh", + "./scripts/build/configure-screensaver.sh", + "./scripts/build/configure-ntpconf.sh", + "./scripts/build/configure-max-files-limitation.sh", + "./scripts/build/configure-shell.sh" + ] + } + + provisioner "shell" { + environment_vars = ["IMAGE_VERSION=${var.build_id}", "IMAGE_OS=${var.image_os}", "PASSWORD=${var.vm_password}"] + execute_command = "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}" + scripts = [ + "./scripts/build/configure-preimagedata.sh", + "./scripts/build/configure-ssh.sh", + "./scripts/build/configure-machine.sh" + ] + } + + provisioner "shell" { + execute_command = "sudo {{ .Vars }} {{ .Path }}" + expect_disconnect = true + inline = ["echo 'Reboot VM'", "shutdown -r now"] + } + + provisioner "shell" { + environment_vars = ["API_PAT=${var.github_api_pat}", "USER_PASSWORD=${var.vm_password}"] + execute_command = "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}" + pause_before = "30s" + scripts = [ + "./scripts/build/configure-windows.sh", + "./scripts/build/install-powershell.sh", + "./scripts/build/install-dotnet.sh", + "./scripts/build/install-python.sh", + "./scripts/build/install-azcopy.sh", + "./scripts/build/install-openssl.sh", + "./scripts/build/install-ruby.sh", + "./scripts/build/install-rubygems.sh", + "./scripts/build/install-git.sh", + "./scripts/build/install-mongodb.sh", + "./scripts/build/install-node.sh", + "./scripts/build/install-common-utils.sh" + ] + } + + provisioner "shell" { + environment_vars = ["XCODE_INSTALL_STORAGE_URL=${var.xcode_install_storage_url}", "XCODE_INSTALL_SAS=${var.xcode_install_sas}"] + execute_command = "chmod +x {{ .Path }}; {{ .Vars }} pwsh -f {{ .Path }}" + script = "./scripts/build/Install-Xcode.ps1" + } + + provisioner "shell" { + execute_command = "sudo {{ .Vars }} {{ .Path }}" + expect_disconnect = true + inline = ["echo 'Reboot VM'", "shutdown -r now"] + } + + provisioner "shell" { + environment_vars = ["API_PAT=${var.github_api_pat}"] + execute_command = "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}" + scripts = [ + "./scripts/build/install-actions-cache.sh", + "./scripts/build/install-llvm.sh", + "./scripts/build/install-golang.sh", + "./scripts/build/install-swiftlint.sh", + "./scripts/build/install-openjdk.sh", + "./scripts/build/install-php.sh", + "./scripts/build/install-aws-tools.sh", + "./scripts/build/install-rust.sh", + "./scripts/build/install-gcc.sh", + "./scripts/build/install-haskell.sh", + "./scripts/build/install-cocoapods.sh", + "./scripts/build/install-android-sdk.sh", + "./scripts/build/install-xamarin.sh", + "./scripts/build/install-visualstudio.sh", + "./scripts/build/install-nvm.sh", + "./scripts/build/install-apache.sh", + "./scripts/build/install-nginx.sh", + "./scripts/build/install-postgresql.sh", + "./scripts/build/install-audiodevice.sh", + "./scripts/build/install-vcpkg.sh", + "./scripts/build/install-miniconda.sh", + "./scripts/build/install-safari.sh", + "./scripts/build/install-chrome.sh", + "./scripts/build/install-edge.sh", + "./scripts/build/install-firefox.sh", + "./scripts/build/install-pypy.sh", + "./scripts/build/install-pipx-packages.sh", + "./scripts/build/install-bicep.sh", + "./scripts/build/install-codeql-bundle.sh" + ] + } + + provisioner "shell" { + execute_command = "chmod +x {{ .Path }}; {{ .Vars }} pwsh -f {{ .Path }}" + scripts = [ + "./scripts/build/Install-Toolset.ps1", + "./scripts/build/Configure-Toolset.ps1" + ] + } + + provisioner "shell" { + execute_command = "ruby {{ .Path }}" + script = "./scripts/build/configure-xcode-simulators.rb" + } + + provisioner "shell" { + execute_command = "chmod +x {{ .Path }}; {{ .Vars }} pwsh -f {{ .Path }}" + script = "./scripts/build/Update-XcodeSimulators.ps1" + } + + provisioner "shell" { + inline = [ + "pwsh -File \"$HOME/image-generation/software-report/Generate-SoftwareReport.ps1\" -OutputDirectory \"$HOME/image-generation/output/software-report\" -ImageName ${var.build_id}", + "pwsh -File \"$HOME/image-generation/tests/RunAll-Tests.ps1\"" + ] + } + + provisioner "file" { + destination = "../image-output/" + direction = "download" + source = "~/image-generation/output/*" + } + + provisioner "shell" { + execute_command = "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}" + scripts = [ + "./scripts/build/configure-hostname.sh", + "./scripts/build/configure-system.sh" + ] + } +} From 4b8f0f965c7b328d10ac63e209feb33a4e3676a9 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Fri, 5 Jan 2024 14:00:08 +0100 Subject: [PATCH 2577/3485] [Ubuntu] Increase threshold in the Disk free space test (#9109) --- images/ubuntu/scripts/tests/System.Tests.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/ubuntu/scripts/tests/System.Tests.ps1 b/images/ubuntu/scripts/tests/System.Tests.ps1 index 333db232d692..de18d6eaa1f4 100644 --- a/images/ubuntu/scripts/tests/System.Tests.ps1 +++ b/images/ubuntu/scripts/tests/System.Tests.ps1 @@ -1,6 +1,6 @@ Describe "Disk free space" { - It "Image has more than 15GB free space" { + It "Image has more than 31GB free space" { $freeSpace = (Get-PSDrive "/").Free - $freeSpace | Should -BeGreaterOrEqual 15GB + $freeSpace | Should -BeGreaterOrEqual 31GB } } From 5bdda2e8c2fb49a5de799c9e62c5e1664dd72948 Mon Sep 17 00:00:00 2001 From: sergei-pyshnoi <121864472+sergei-pyshnoi@users.noreply.github.com> Date: Tue, 9 Jan 2024 11:44:03 +0100 Subject: [PATCH 2578/3485] [Windows] Update signature for Edge driver (#9123) * update signature for Edge driver * Update Install-EdgeDriver.ps1 * fix comment * add signature for different versions --- images/windows/scripts/build/Install-EdgeDriver.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/windows/scripts/build/Install-EdgeDriver.ps1 b/images/windows/scripts/build/Install-EdgeDriver.ps1 index a8c54c35412f..ada638d0ee68 100644 --- a/images/windows/scripts/build/Install-EdgeDriver.ps1 +++ b/images/windows/scripts/build/Install-EdgeDriver.ps1 @@ -4,7 +4,7 @@ ################################################################################ # Disable Edge auto-updates -Rename-Item -Path "C:\Program Files (x86)\Microsoft\EdgeUpdate\MicrosoftEdgeUpdate.exe" -NewName "Disabled_MicrosoftEdgeUpdate.exe" -ErrorAction Stop +#Rename-Item -Path "C:\Program Files (x86)\Microsoft\EdgeUpdate\MicrosoftEdgeUpdate.exe" -NewName "Disabled_MicrosoftEdgeUpdate.exe" -ErrorAction Stop Write-Host "Get the Microsoft Edge WebDriver version..." $edgeBinaryPath = (Get-ItemProperty "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\msedge.exe").'(default)' @@ -27,7 +27,7 @@ Write-Host "Expand Microsoft Edge WebDriver archive..." Expand-7ZipArchive -Path $archivePath -DestinationPath $edgeDriverPath #Validate the EdgeDriver signature -$signatureThumbprint = "CB9C4FBEA1D87D2D468AC5A9CAAB0163F6AD8401" +$signatureThumbprint = "CB9C4FBEA1D87D2D468AC5A9CAAB0163F6AD8401","573EF451A68C33FB904346D44551BEF3BB5BBF68" Test-FileSignature -Path "$edgeDriverPath\msedgedriver.exe" -ExpectedThumbprint $signatureThumbprint Write-Host "Setting the environment variables..." From 5a6e2158591c3f3b0c732691694d061fea8f792e Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Tue, 9 Jan 2024 14:47:31 +0100 Subject: [PATCH 2579/3485] [macOS] Refactor the rest of the scripts (#9113) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [macOS] Refactor the rest of the scripts * Return quotes to config tccdb script * Return quotes to config tccdb script * Revert some changes in ruby scripts * Revert some changes in ruby scripts * Revert some changes chrome script * check errors * check errors 01 * find errors in common-utils * find errors in edge install * find errors in edge install --------- Co-authored-by: Alexey Ayupov <“alexey.ayupov@akvelon.com”> --- .../bootstrap-provisioner/setAutoLogin.sh | 2 +- .../xamarin-selector/select-xamarin-sdk-v2.sh | 6 +-- .../macos/scripts/build/configure-hostname.sh | 2 +- .../macos/scripts/build/configure-machine.sh | 8 +-- .../build/configure-max-files-limitation.sh | 8 +-- .../configure-network-interface-detection.sh | 6 +-- .../macos/scripts/build/configure-ntpconf.sh | 2 +- .../scripts/build/configure-screensaver.sh | 2 +- .../macos/scripts/build/configure-windows.sh | 8 +-- .../scripts/build/configure-xcode-symlinks.sh | 19 ------- images/macos/scripts/build/configure-xcode.sh | 7 ++- .../scripts/build/install-actions-cache.sh | 6 +-- .../scripts/build/install-android-sdk.sh | 50 +++++++++---------- .../macos/scripts/build/install-aws-tools.sh | 4 +- images/macos/scripts/build/install-azcopy.sh | 8 +-- images/macos/scripts/build/install-bicep.sh | 2 +- images/macos/scripts/build/install-chrome.sh | 28 +++++------ .../scripts/build/install-codeql-bundle.sh | 12 ++--- .../scripts/build/install-common-utils.sh | 15 +++--- images/macos/scripts/build/install-dotnet.sh | 16 +++--- images/macos/scripts/build/install-edge.sh | 6 +-- images/macos/scripts/build/install-firefox.sh | 2 +- images/macos/scripts/build/install-gcc.sh | 2 +- images/macos/scripts/build/install-git.sh | 6 +-- images/macos/scripts/build/install-haskell.sh | 4 +- .../macos/scripts/build/install-homebrew.sh | 2 +- .../macos/scripts/build/install-miniconda.sh | 8 +-- images/macos/scripts/build/install-mongodb.sh | 4 +- images/macos/scripts/build/install-mono.sh | 26 +++++----- images/macos/scripts/build/install-node.sh | 2 +- images/macos/scripts/build/install-nvm.sh | 6 +-- images/macos/scripts/build/install-openjdk.sh | 10 ++-- .../macos/scripts/build/install-postgresql.sh | 4 +- .../macos/scripts/build/install-powershell.sh | 10 ++-- images/macos/scripts/build/install-pypy.sh | 27 +++++----- images/macos/scripts/build/install-python.sh | 14 +++--- images/macos/scripts/build/install-rosetta.sh | 2 +- images/macos/scripts/build/install-ruby.sh | 24 ++++----- .../macos/scripts/build/install-rubygems.sh | 4 +- images/macos/scripts/build/install-rust.sh | 10 ++-- images/macos/scripts/build/install-safari.sh | 2 +- .../macos/scripts/build/install-swiftlint.sh | 4 +- .../scripts/build/install-visualstudio.sh | 12 ++--- images/macos/scripts/build/install-xamarin.sh | 24 ++++----- .../macos/scripts/build/install-xcode-clt.sh | 4 +- .../scripts/build/install-xcode-simulators.sh | 29 ----------- images/macos/scripts/helpers/utils.sh | 6 --- images/macos/scripts/helpers/xamarin-utils.sh | 2 +- 48 files changed, 203 insertions(+), 264 deletions(-) delete mode 100644 images/macos/scripts/build/configure-xcode-symlinks.sh delete mode 100644 images/macos/scripts/build/install-xcode-simulators.sh diff --git a/images/macos/assets/bootstrap-provisioner/setAutoLogin.sh b/images/macos/assets/bootstrap-provisioner/setAutoLogin.sh index e2880e157028..17a9d4de260d 100644 --- a/images/macos/assets/bootstrap-provisioner/setAutoLogin.sh +++ b/images/macos/assets/bootstrap-provisioner/setAutoLogin.sh @@ -11,7 +11,7 @@ LICENSE_BLOCK USERNAME="${1}" PW="${2}" -function kcpasswordEncode { +kcpasswordEncode() { #ascii string local thisString="${1}" local i diff --git a/images/macos/assets/xamarin-selector/select-xamarin-sdk-v2.sh b/images/macos/assets/xamarin-selector/select-xamarin-sdk-v2.sh index 0e6b08187b4c..153b52e884b0 100644 --- a/images/macos/assets/xamarin-selector/select-xamarin-sdk-v2.sh +++ b/images/macos/assets/xamarin-selector/select-xamarin-sdk-v2.sh @@ -23,7 +23,7 @@ change_framework_version() { echo "Select $framework $version" local countDigit=$(echo "${version}" | grep -o "\." | grep -c "\.") - + if [[ countDigit -gt 1 ]]; then echo "[WARNING] It is not recommended to specify the exact framework version because your build can be broken with the next patch update. Consider using "major.minor" only format." fi @@ -31,7 +31,7 @@ change_framework_version() { local framework_path=$(get_framework_path "$framework") if [ -d "${framework_path}/${version}" ]; then - sudo rm -f "${framework_path}/Current" + sudo rm -f ${framework_path}/Current sudo ln -s "${framework_path}/${version}" "${framework_path}/Current" else echo "Invalid framework version ${framework_path}/${version}" @@ -46,7 +46,7 @@ for arg in "$@"; do case $key in --mono | --ios | --android | --mac) change_framework_version $key $value ;; *) - echo "Invalid parameter <${key}>" + echo "Invalid parameter <${key}>" exit 1 ;; esac diff --git a/images/macos/scripts/build/configure-hostname.sh b/images/macos/scripts/build/configure-hostname.sh index 40c9f51e46ef..7b44557ec5c1 100644 --- a/images/macos/scripts/build/configure-hostname.sh +++ b/images/macos/scripts/build/configure-hostname.sh @@ -14,7 +14,7 @@ scutil --set LocalHostName $name scutil --set ComputerName "${name}.local" EOF -chmod +x "/usr/local/bin/change_hostname.sh" +chmod +x /usr/local/bin/change_hostname.sh sudo tee -a /Library/LaunchDaemons/change_hostname.plist > /dev/null <<\EOF <?xml version="1.0" encoding="UTF-8"?> diff --git a/images/macos/scripts/build/configure-machine.sh b/images/macos/scripts/build/configure-machine.sh index 11488e76af28..294935000dab 100644 --- a/images/macos/scripts/build/configure-machine.sh +++ b/images/macos/scripts/build/configure-machine.sh @@ -22,7 +22,7 @@ if is_Veertu; then fi # Change screen resolution to the maximum supported for 4Mb video memory -if [ -d "/Library/Application Support/VMware Tools" ]; then +if [[ -d "/Library/Application Support/VMware Tools" ]]; then sudo "/Library/Application Support/VMware Tools/vmware-resolutionSet" 1176 885 fi @@ -60,7 +60,7 @@ rm -f ./add-certificate # enable-automationmode-without-authentication if ! is_BigSur; then retry=10 -while [ $retry -gt 0 ]; do +while [[ $retry -gt 0 ]]; do { osascript <<EOF tell application "Terminal" @@ -77,7 +77,7 @@ EOF } && break retry=$((retry-1)) - if [ $retry -eq 0 ]; then + if [[ $retry -eq 0 ]]; then echo "No retry attempts left" exit 1 fi @@ -97,7 +97,7 @@ done fi # Create symlink for tests running -if [ ! -d "/usr/local/bin" ];then +if [[ ! -d "/usr/local/bin" ]];then sudo mkdir -p -m 775 /usr/local/bin sudo chown $USER:admin /usr/local/bin fi diff --git a/images/macos/scripts/build/configure-max-files-limitation.sh b/images/macos/scripts/build/configure-max-files-limitation.sh index 6877bf50c694..49e5fc0c52ae 100644 --- a/images/macos/scripts/build/configure-max-files-limitation.sh +++ b/images/macos/scripts/build/configure-max-files-limitation.sh @@ -8,7 +8,7 @@ Launch_Daemons="/Library/LaunchDaemons" # EOF in quotes to disable variable expansion echo "Creating limit.maxfiles.plist" -cat > "${Launch_Daemons}/limit.maxfiles.plist" << EOF +cat > ${Launch_Daemons}/limit.maxfiles.plist << EOF <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> @@ -28,17 +28,17 @@ EOF # Creating script for applying workaround https://developer.apple.com/forums/thread/735798 -cat > "/Users/runner/limit-maxfiles.sh" << EOF +cat > /Users/runner/limit-maxfiles.sh << EOF #!/bin/bash sudo launchctl limit maxfiles 256 unlimited sudo launchctl limit maxfiles 65536 524288 EOF echo "limit.maxfiles.sh permissions changing" -chmod +x "/Users/runner/limit-maxfiles.sh" +chmod +x /Users/runner/limit-maxfiles.sh echo "limit.maxfiles.plist permissions changing" chown root:wheel "${Launch_Daemons}/limit.maxfiles.plist" -chmod 0644 "${Launch_Daemons}/limit.maxfiles.plist" +chmod 0644 ${Launch_Daemons}/limit.maxfiles.plist echo "Done, limit.maxfiles has been updated" diff --git a/images/macos/scripts/build/configure-network-interface-detection.sh b/images/macos/scripts/build/configure-network-interface-detection.sh index 87808eba5add..1a09bc2c62e5 100644 --- a/images/macos/scripts/build/configure-network-interface-detection.sh +++ b/images/macos/scripts/build/configure-network-interface-detection.sh @@ -7,7 +7,7 @@ ################################################################################ PLIST=/Library/LaunchDaemons/sonoma.detectnewhardware.plist -cat <<EOF > "${PLIST}" +cat <<EOF > ${PLIST} <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <plist version="1.0"> @@ -27,8 +27,8 @@ EOF # These should be already set as follows, but since they're required # in order to load properly, we set them explicitly. -/bin/chmod 644 "${PLIST}" -/usr/sbin/chown root:wheel "${PLIST}" +/bin/chmod 644 ${PLIST} +/usr/sbin/chown root:wheel ${PLIST} : ' The MIT License (MIT) diff --git a/images/macos/scripts/build/configure-ntpconf.sh b/images/macos/scripts/build/configure-ntpconf.sh index cdb6f3d14d49..e629c6172129 100644 --- a/images/macos/scripts/build/configure-ntpconf.sh +++ b/images/macos/scripts/build/configure-ntpconf.sh @@ -15,5 +15,5 @@ server time.windows.com EOF # Set the timezone to UTC. -echo The Timezone setting to UTC... +echo "The Timezone setting to UTC..." ln -sf /usr/share/zoneinfo/UTC /etc/localtime diff --git a/images/macos/scripts/build/configure-screensaver.sh b/images/macos/scripts/build/configure-screensaver.sh index 6b4900cc9e86..687302880b97 100644 --- a/images/macos/scripts/build/configure-screensaver.sh +++ b/images/macos/scripts/build/configure-screensaver.sh @@ -5,7 +5,7 @@ ################################################################################ # set screensaver idleTime to 0, to prevent turning screensaver on -macUUID=`ioreg -rd1 -c IOPlatformExpertDevice | grep -i "UUID" | cut -c27-62` +macUUID=$(ioreg -rd1 -c IOPlatformExpertDevice | grep -i "UUID" | cut -c27-62) rm -rf /Users/$USERNAME/Library/Preferences/com.apple.screensaver.$macUUID.plist rm -rf /Users/$USERNAME/Library/Preferences/ByHost/com.apple.screensaver.$macUUID.plist diff --git a/images/macos/scripts/build/configure-windows.sh b/images/macos/scripts/build/configure-windows.sh index 92cb9aa98d3a..72cb4c8ac8e2 100644 --- a/images/macos/scripts/build/configure-windows.sh +++ b/images/macos/scripts/build/configure-windows.sh @@ -22,13 +22,13 @@ while [[ $retry -gt 0 ]]; do fi sleep 30 done -IFS=',' read -r -a windowslist <<< "$openwindows" +IFS=',' read -r -a windowslist <<< $openwindows -if [ -n "${openwindows}" ]; then +if [[ -n ${openwindows} ]]; then echo "Found opened window:" fi -for window in "${windowslist[@]}"; do +for window in ${windowslist[@]}; do if [[ $window =~ "NotificationCenter" ]]; then echo "[Warning] $window" else @@ -37,6 +37,6 @@ for window in "${windowslist[@]}"; do fi done -if [ "${scripterror}" = true ]; then +if [[ ${scripterror} = true ]]; then exit 1 fi diff --git a/images/macos/scripts/build/configure-xcode-symlinks.sh b/images/macos/scripts/build/configure-xcode-symlinks.sh deleted file mode 100644 index 1fbfe7ed86aa..000000000000 --- a/images/macos/scripts/build/configure-xcode-symlinks.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash -e -o pipefail -################################################################################ -## File: configure-xcode-symlinks.sh -## Desc: Link the existing Xcodes into the correct location for provisionator. -## This is maintained for backwards compatibility only. Do not add new xcodes here. -################################################################################ - -source ~/utils/utils.sh - -ln -sf /Applications/Xcode_8.app /Applications/Xcode8.app -ln -sf /Applications/Xcode_8.1.app /Applications/Xcode81.app -ln -sf /Applications/Xcode_9.app /Applications/Xcode9.app -ln -sf /Applications/Xcode_9.1.app /Applications/Xcode91.app -ln -sf /Applications/Xcode_9.2.app /Applications/Xcode92.app -ln -sf /Applications/Xcode_9.3.app /Applications/Xcode93.app -ln -sf /Applications/Xcode_9.3.app /Applications/Xcode_9.3_beta.app -ln -sf /Applications/Xcode_9.4.app /Applications/Xcode_9.4-beta.app -ln -sf /Applications/Xcode_9.4.app /Applications/Xcode_9.4_beta.app -ln -sf /Applications/Xcode_9.4.app /Applications/Xcode_9.4_beta_2.app diff --git a/images/macos/scripts/build/configure-xcode.sh b/images/macos/scripts/build/configure-xcode.sh index bde2703814c3..f707679e75a0 100644 --- a/images/macos/scripts/build/configure-xcode.sh +++ b/images/macos/scripts/build/configure-xcode.sh @@ -13,15 +13,14 @@ DEFAULT_XCODE_VERSION=$(get_toolset_value '.xcode.default') # Assets.xcassets : error : CoreData: error: (6922) I/O error for database # at $HOME/Library/Developer/Xcode/UserData/IB Support/Simulator Devices/{GUID} echo "Erase a device's contents and settings:" -for XCODE_VERSION in "${XCODE_LIST[@]}" -do +for XCODE_VERSION in ${XCODE_LIST[@]}; do echo " Xcode Version: ${XCODE_VERSION}" launchctl remove com.apple.CoreSimulator.CoreSimulatorService || true #add sleep to let CoreSimulatorService to exit sleep 3 # Select xcode version by default - sudo xcode-select -s "/Applications/Xcode_${XCODE_VERSION}.app/Contents/Developer" + sudo xcode-select -s /Applications/Xcode_${XCODE_VERSION}.app/Contents/Developer # Erase a device's contents and settings xcrun simctl erase all @@ -32,4 +31,4 @@ done # Select xcode version by default echo "Setting Xcode ${DEFAULT_XCODE_VERSION} as default" -sudo xcode-select -s "/Applications/Xcode_${DEFAULT_XCODE_VERSION}.app/Contents/Developer" +sudo xcode-select -s /Applications/Xcode_${DEFAULT_XCODE_VERSION}.app/Contents/Developer diff --git a/images/macos/scripts/build/install-actions-cache.sh b/images/macos/scripts/build/install-actions-cache.sh index 4871bf86ae23..4fbebe3d8e6a 100644 --- a/images/macos/scripts/build/install-actions-cache.sh +++ b/images/macos/scripts/build/install-actions-cache.sh @@ -8,13 +8,13 @@ source ~/utils/utils.sh echo "Check if ACTIONS_RUNNER_ACTION_ARCHIVE_CACHE folder exist..." -if [ ! -d $ACTIONS_RUNNER_ACTION_ARCHIVE_CACHE ]; then +if [[ ! -d $ACTIONS_RUNNER_ACTION_ARCHIVE_CACHE ]]; then mkdir -p $ACTIONS_RUNNER_ACTION_ARCHIVE_CACHE fi download_url=$(resolve_github_release_asset_url "actions/action-versions" "contains(\"action-versions.tar.gz\")" "latest") echo "Downloading action-versions $download_url" -archive_path=$(download_with_retry "$download_url") -tar -xzf "$archive_path" -C "$ACTIONS_RUNNER_ACTION_ARCHIVE_CACHE" +archive_path=$(download_with_retry $download_url) +tar -xzf $archive_path -C $ACTIONS_RUNNER_ACTION_ARCHIVE_CACHE invoke_tests "ActionArchiveCache" diff --git a/images/macos/scripts/build/install-android-sdk.sh b/images/macos/scripts/build/install-android-sdk.sh index 86eee8a7e097..204a2db82d97 100644 --- a/images/macos/scripts/build/install-android-sdk.sh +++ b/images/macos/scripts/build/install-android-sdk.sh @@ -6,39 +6,37 @@ source ~/utils/utils.sh -function filter_components_by_version { - minimumVersion=$1 +add_filtered_instalaltion_components() { + local minimum_version=$1 shift - toolsArr=("$@") + local tools_array=("$@") - for item in ${toolsArr[@]} - do + for item in ${tools_array[@]}; do # take the last argument after spliting string by ';'' and '-'' version=$(echo "${item##*[-;]}") - if verlte $minimumVersion $version - then + if [[ "$(printf "${minimum_version}\n${version}\n" | sort -V | head -n1)" == "$minimum_version" ]]; then components+=($item) fi done } -function get_full_ndk_version { - majorVersion=$1 - ndkVersion=$(${SDKMANAGER} --list | grep "ndk;${majorVersion}.*" | awk '{gsub("ndk;", ""); print $1}' | sort -V | tail -n1) +get_full_ndk_version() { + local majorVersion=$1 + ndkVersion=$(${SDKMANAGER} --list | grep "ndk;${majorVersion}.*" | awk '{gsub("ndk;", ""); print $1}' | sort -V | tail -n1) echo "$ndkVersion" } components=() -ANDROID_PLATFORM=$(get_toolset_value '.android.platform_min_version') -ANDROID_BUILD_TOOL=$(get_toolset_value '.android.build_tools_min_version') -ANDROID_EXTRA_LIST=($(get_toolset_value '.android."extras"[]')) -ANDROID_ADDON_LIST=($(get_toolset_value '.android."addons"[]')) -ANDROID_ADDITIONAL_TOOLS=($(get_toolset_value '.android."additional_tools"[]')) -ANDROID_NDK_MAJOR_VERSIONS=($(get_toolset_value '.android.ndk."versions"[]')) -ANDROID_NDK_MAJOR_DEFAULT=$(get_toolset_value '.android.ndk.default') -ANDROID_NDK_MAJOR_LATEST=$(get_toolset_value '.android.ndk."versions"[-1]') +android_platform=$(get_toolset_value '.android.platform_min_version') +android_build_tool=$(get_toolset_value '.android.build_tools_min_version') +android_extra_list=($(get_toolset_value '.android."extras"[]')) +android_addon_list=($(get_toolset_value '.android."addons"[]')) +android_additional_tools=($(get_toolset_value '.android."additional_tools"[]')) +android_ndk_major_versions=($(get_toolset_value '.android.ndk."versions"[]')) +android_ndk_major_default=$(get_toolset_value '.android.ndk.default') +android_ndk_major_latest=$(get_toolset_value '.android.ndk."versions"[-1]') # Get the latest command line tools from https://developer.android.com/studio#cmdline-tools # Newer version(s) require Java 11 by default # See https://github.com/actions/runner-images/issues/6960 @@ -81,15 +79,15 @@ echo "Installing latest tools & platform tools..." echo y | $SDKMANAGER "tools" "platform-tools" echo "Installing latest ndk..." -for ndk_version in "${ANDROID_NDK_MAJOR_VERSIONS[@]}" +for ndk_version in "${android_ndk_major_versions[@]}" do ndk_full_version=$(get_full_ndk_version $ndk_version) echo y | $SDKMANAGER "ndk;$ndk_full_version" done -ndkDefault=$(get_full_ndk_version $ANDROID_NDK_MAJOR_DEFAULT) +ndkDefault=$(get_full_ndk_version $android_ndk_major_default) ANDROID_NDK_HOME=$ANDROID_HOME/ndk/$ndkDefault -ndkLatest=$(get_full_ndk_version $ANDROID_NDK_MAJOR_LATEST) +ndkLatest=$(get_full_ndk_version $android_ndk_major_latest) ANDROID_NDK_LATEST_HOME=$ANDROID_HOME/ndk/$ndkLatest # ANDROID_NDK, ANDROID_NDK_HOME, and ANDROID_NDK_ROOT variables should be set as many customer builds depend on them https://github.com/actions/runner-images/issues/5879 echo "export ANDROID_NDK=$ANDROID_NDK_HOME" >> "${HOME}/.bashrc" @@ -98,27 +96,27 @@ echo "export ANDROID_NDK_ROOT=$ANDROID_NDK_HOME" >> "${HOME}/.bashrc" echo "export ANDROID_NDK_LATEST_HOME=$ANDROID_NDK_LATEST_HOME" >> "${HOME}/.bashrc" availablePlatforms=($($SDKMANAGER --list | grep "platforms;android-[0-9]" | cut -d"|" -f 1 | sort -u)) -filter_components_by_version $ANDROID_PLATFORM "${availablePlatforms[@]}" +add_filtered_instalaltion_components $android_platform "${availablePlatforms[@]}" allBuildTools=($($SDKMANAGER --list --include_obsolete | grep "build-tools;" | cut -d"|" -f 1 | sort -u)) availableBuildTools=$(echo ${allBuildTools[@]//*rc[0-9]/}) -filter_components_by_version $ANDROID_BUILD_TOOL "${availableBuildTools[@]}" +add_filtered_instalaltion_components $android_build_tool "${availableBuildTools[@]}" echo "y" | $SDKMANAGER ${components[@]} -for extra_name in "${ANDROID_EXTRA_LIST[@]}" +for extra_name in "${android_extra_list[@]}" do echo "Installing extra $extra_name ..." echo y | $SDKMANAGER "extras;$extra_name" done -for addon_name in "${ANDROID_ADDON_LIST[@]}" +for addon_name in "${android_addon_list[@]}" do echo "Installing add-on $addon_name ..." echo y | $SDKMANAGER "add-ons;$addon_name" done -for tool_name in "${ANDROID_ADDITIONAL_TOOLS[@]}" +for tool_name in "${android_additional_tools[@]}" do echo "Installing additional tool $tool_name ..." echo y | $SDKMANAGER "$tool_name" diff --git a/images/macos/scripts/build/install-aws-tools.sh b/images/macos/scripts/build/install-aws-tools.sh index 113881bab568..db4565b73969 100644 --- a/images/macos/scripts/build/install-aws-tools.sh +++ b/images/macos/scripts/build/install-aws-tools.sh @@ -6,11 +6,11 @@ source ~/utils/utils.sh -echo Installing aws... +echo "Installing aws..." awscliv2_pkg_path=$(download_with_retry "https://awscli.amazonaws.com/AWSCLIV2.pkg") sudo installer -pkg "$awscliv2_pkg_path" -target / -echo Installing aws sam cli... +echo "Installing aws sam cli..." brew tap aws/tap brew_smart_install aws-sam-cli diff --git a/images/macos/scripts/build/install-azcopy.sh b/images/macos/scripts/build/install-azcopy.sh index e0e95d9d964d..39df17a7de55 100644 --- a/images/macos/scripts/build/install-azcopy.sh +++ b/images/macos/scripts/build/install-azcopy.sh @@ -15,11 +15,11 @@ else fi # Install AzCopy -archive_path=$(download_with_retry "${url}") -unzip -qq "$archive_path" -d /tmp/azcopy +archive_path=$(download_with_retry ${url}) +unzip -qq $archive_path -d /tmp/azcopy extract_path=$(echo /tmp/azcopy/azcopy*) -cp "$extract_path/azcopy" "/usr/local/bin/azcopy" -chmod +x "/usr/local/bin/azcopy" +cp $extract_path/azcopy /usr/local/bin/azcopy +chmod +x /usr/local/bin/azcopy invoke_tests "Common" "AzCopy" diff --git a/images/macos/scripts/build/install-bicep.sh b/images/macos/scripts/build/install-bicep.sh index fbae13e59594..6a5a3ddb22d4 100644 --- a/images/macos/scripts/build/install-bicep.sh +++ b/images/macos/scripts/build/install-bicep.sh @@ -6,7 +6,7 @@ source ~/utils/utils.sh -echo Installing bicep cli... +echo "Installing bicep cli..." brew tap azure/bicep brew_smart_install bicep diff --git a/images/macos/scripts/build/install-chrome.sh b/images/macos/scripts/build/install-chrome.sh index ace3ee7284b3..709e1eaf3d61 100644 --- a/images/macos/scripts/build/install-chrome.sh +++ b/images/macos/scripts/build/install-chrome.sh @@ -19,32 +19,32 @@ echo "Google Chrome version is $full_chrome_version" # Get Google Chrome versions information chrome_platform="mac-$arch" CHROME_VERSIONS_URL="https://googlechromelabs.github.io/chrome-for-testing/latest-patch-versions-per-build-with-downloads.json" -chrome_versions_json="$(cat "$(download_with_retry "$CHROME_VERSIONS_URL")")" +chrome_versions_json="$(cat $(download_with_retry "$CHROME_VERSIONS_URL"))" # Download and unpack the latest release of Chrome Driver -chromedriver_version=$(echo "${chrome_versions_json}" | jq -r '.builds["'"$chrome_version"'"].version') +chromedriver_version=$(echo $chrome_versions_json | jq -r '.builds["'"$chrome_version"'"].version') echo "Installing Chrome Driver version $chromedriver_version" -chromedriver_url=$(echo "${chrome_versions_json}" | jq -r '.builds["'"$chrome_version"'"].downloads.chromedriver[] | select(.platform=="'"${chrome_platform}"'").url') -chromedriver_dir="/usr/local/share/chromedriver-${chrome_platform}" +chromedriver_url=$(echo $chrome_versions_json | jq -r '.builds["'"$chrome_version"'"].downloads.chromedriver[] | select(.platform=="'"${chrome_platform}"'").url') +chromedriver_dir="/usr/local/share/chromedriver-$chrome_platform" chromedriver_bin="$chromedriver_dir/chromedriver" -chromedriver_archive_path=$(download_with_retry "$chromedriver_url") -unzip -qq "$chromedriver_archive_path" -d /tmp/ -sudo mv "/tmp/chromedriver-${chrome_platform}" "$chromedriver_dir" -ln -s "$chromedriver_bin" /usr/local/bin/chromedriver -echo "export CHROMEWEBDRIVER=$chromedriver_dir" >> "${HOME}/.bashrc" +chromedriver_archive_path=$(download_with_retry $chromedriver_url) +unzip -qq $chromedriver_archive_path -d /tmp/ +sudo mv /tmp/chromedriver-$chrome_platform $chromedriver_dir +ln -s $chromedriver_bin /usr/local/bin/chromedriver +echo "export CHROMEWEBDRIVER=$chromedriver_dir" >> ${HOME}/.bashrc # Download and unpack the latest release of Google Chrome for Testing -chrome_for_testing_version=$(echo "${chrome_versions_json}" | jq -r '.builds["'"$chrome_version"'"].version') +chrome_for_testing_version=$(echo $chrome_versions_json | jq -r '.builds["'"$chrome_version"'"].version') echo "Installing Google Chrome for Testing version $chrome_for_testing_version" -chrome_for_testing_url=$(echo "${chrome_versions_json}" | jq -r '.builds["'"$chrome_version"'"].downloads.chrome[] | select(.platform=="'"${chrome_platform}"'").url') +chrome_for_testing_url=$(echo $chrome_versions_json | jq -r '.builds["'"$chrome_version"'"].downloads.chrome[] | select(.platform=="'"${chrome_platform}"'").url') chrome_for_testing_app="Google Chrome for Testing.app" -chrome_for_testing_archive_path=$(download_with_retry "$chrome_for_testing_url") -unzip -qq "$chrome_for_testing_archive_path" -d /tmp/ -mv "/tmp/chrome-${chrome_platform}/${chrome_for_testing_app}" "/Applications/${chrome_for_testing_app}" +chrome_for_testing_archive_path=$(download_with_retry $chrome_for_testing_url) +unzip -qq $chrome_for_testing_archive_path -d /tmp/ +mv "/tmp/chrome-$chrome_platform/$chrome_for_testing_app" "/Applications/$chrome_for_testing_app" echo "Installing Selenium" brew_smart_install "selenium-server" diff --git a/images/macos/scripts/build/install-codeql-bundle.sh b/images/macos/scripts/build/install-codeql-bundle.sh index 68fed26346a2..ca05d231dddb 100644 --- a/images/macos/scripts/build/install-codeql-bundle.sh +++ b/images/macos/scripts/build/install-codeql-bundle.sh @@ -8,7 +8,7 @@ source ~/utils/utils.sh # Retrieve the CLI version of the latest CodeQL bundle. defaults_json_path=$(download_with_retry https://raw.githubusercontent.com/github/codeql-action/v2/src/defaults.json) -bundle_version="$(jq -r '.cliVersion' "$defaults_json_path")" +bundle_version=$(jq -r '.cliVersion' $defaults_json_path) bundle_tag_name="codeql-bundle-v$bundle_version" echo "Downloading CodeQL bundle $bundle_version..." @@ -16,17 +16,17 @@ echo "Downloading CodeQL bundle $bundle_version..." # different operating systems within containers. archive_path=$(download_with_retry "https://github.com/github/codeql-action/releases/download/$bundle_tag_name/codeql-bundle.tar.gz") -codeql_toolcache_path="$AGENT_TOOLSDIRECTORY/CodeQL/$bundle_version/x64" -mkdir -p "$codeql_toolcache_path" +codeql_toolcache_path=$AGENT_TOOLSDIRECTORY/CodeQL/$bundle_version/x64 +mkdir -p $codeql_toolcache_path echo "Unpacking the downloaded CodeQL bundle archive..." -tar -xzf "$archive_path" -C "$codeql_toolcache_path" +tar -xzf $archive_path -C $codeql_toolcache_path # Touch a file to indicate to the CodeQL Action that this bundle shipped with the toolcache. This is # to support overriding the CodeQL version specified in defaults.json on GitHub Enterprise. -touch "$codeql_toolcache_path/pinned-version" +touch $codeql_toolcache_path/pinned-version # Touch a file to indicate to the toolcache that setting up CodeQL is complete. -touch "$codeql_toolcache_path.complete" +touch $codeql_toolcache_path.complete invoke_tests "Common" "CodeQL Bundle" diff --git a/images/macos/scripts/build/install-common-utils.sh b/images/macos/scripts/build/install-common-utils.sh index a414637a7fc5..f031bd67b288 100644 --- a/images/macos/scripts/build/install-common-utils.sh +++ b/images/macos/scripts/build/install-common-utils.sh @@ -28,9 +28,9 @@ for package in $cask_packages; do # Do not update VirtualBox on macOS 12 due to the issue with VMs in gurumediation state which blocks Vagrant on macOS: https://github.com/actions/runner-images/issues/8730 # macOS host: Dropped all kernel extensions. VirtualBox relies fully on the hypervisor and vmnet frameworks provided by Apple now. virtualbox_cask_path=$(download_with_retry "https://raw.githubusercontent.com/Homebrew/homebrew-cask/aa3c55951fc9d687acce43e5c0338f42c1ddff7b/Casks/virtualbox.rb") - brew install "$virtualbox_cask_path" + brew install $virtualbox_cask_path else - brew install --cask "$package" + brew install --cask $package fi done @@ -51,7 +51,7 @@ if is_Monterey; then osascript $HOME/utils/confirm-identified-developers.scpt $USER_PASSWORD } && break - if [[ "$retry" -eq 0 ]]; then + if [[ $retry -eq 0 ]]; then echo "Executing AppleScript failed. No retries left" exit 1 fi @@ -75,23 +75,20 @@ if is_Monterey; then dbQuery="SELECT * FROM kext_policy WHERE bundle_id LIKE 'com.parallels.kext.%';" kext=$(sudo sqlite3 $dbName "$dbQuery") - if [[ -z "$kext" ]]; then + if [[ -z $kext ]]; then echo "Parallels International GmbH not found" exit 1 fi # Create env variable url=$(brew info --json=v2 --installed | jq -r '.casks[] | select(.name[] == "Parallels Desktop").url') - if [[ -z "$url" ]]; then + if [[ -z $url ]]; then echo "Unable to parse url for Parallels Desktop cask" exit 1 fi - echo "export PARALLELS_DMG_URL=$url" >> "${HOME}/.bashrc" + echo "export PARALLELS_DMG_URL=$url" >> ${HOME}/.bashrc fi -# Invoke bazel to download bazel version via bazelisk -bazel - # Install Azure DevOps extension for Azure Command Line Interface az extension add -n azure-devops diff --git a/images/macos/scripts/build/install-dotnet.sh b/images/macos/scripts/build/install-dotnet.sh index 0bc0feb088b7..212c40419719 100644 --- a/images/macos/scripts/build/install-dotnet.sh +++ b/images/macos/scripts/build/install-dotnet.sh @@ -13,32 +13,32 @@ arch=$(get_arch) # Download installer from dot.net and keep it locally DOTNET_INSTALL_SCRIPT="https://dot.net/v1/dotnet-install.sh" install_script_path=$(download_with_retry $DOTNET_INSTALL_SCRIPT) -chmod +x "$install_script_path" +chmod +x $install_script_path args_list=() echo "Parsing dotnet SDK (except rc and preview versions) from .json..." dotnet_versions=($(get_toolset_value ".dotnet.arch[\"$arch\"].versions | .[]")) -for dotnet_version in "${dotnet_versions[@]}"; do +for dotnet_version in ${dotnet_versions[@]}; do release_url="https://raw.githubusercontent.com/dotnet/core/main/release-notes/${dotnet_version}/releases.json" releases_json_file=$(download_with_retry "$release_url") if [[ $dotnet_version == "6.0" ]]; then args_list+=( - $(cat "$releases_json_file" | jq -r 'first(.releases[].sdks[]?.version | select(contains("preview") or contains("rc") | not))') + $(cat $releases_json_file | jq -r 'first(.releases[].sdks[]?.version | select(contains("preview") or contains("rc") | not))') ) else args_list+=( - $(cat "$releases_json_file" | \ + $(cat $releases_json_file | \ jq -r '.releases[].sdk."version"' | grep -v -E '\-(preview|rc)\d*' | \ sort -r | rev | uniq -s 2 | rev) ) fi done -for ARGS in "${args_list[@]}"; do - "$install_script_path" --version $ARGS -NoPath --arch $arch +for ARGS in ${args_list[@]}; do + $install_script_path --version $ARGS -NoPath --arch $arch done # dotnet installer doesn't create symlink to executable in /user/local/bin @@ -46,12 +46,12 @@ done ln -s ~/.dotnet/dotnet /usr/local/bin/dotnet # Validate installation -if [ $(dotnet --list-sdks | wc -l) -lt "1" ]; then +if [[ $(dotnet --list-sdks | wc -l) -lt "1" ]]; then echo "The .NET Core SDK is not installed" exit 1 fi -echo 'export PATH="$PATH:$HOME/.dotnet/tools"' >> "$HOME/.bashrc" +echo 'export PATH="$PATH:$HOME/.dotnet/tools"' >> $HOME/.bashrc echo "Dotnet operations have been completed successfully..." invoke_tests "Common" ".NET" diff --git a/images/macos/scripts/build/install-edge.sh b/images/macos/scripts/build/install-edge.sh index 5146e202b16b..c4237873456c 100644 --- a/images/macos/scripts/build/install-edge.sh +++ b/images/macos/scripts/build/install-edge.sh @@ -30,10 +30,10 @@ edge_driver_archive_path=$(download_with_retry "$edge_driver_url") EDGE_DRIVER_DIR="/usr/local/share/edge_driver" mkdir -p $EDGE_DRIVER_DIR -unzip -qq "$edge_driver_archive_path" -d "$EDGE_DRIVER_DIR" -ln -s "$EDGE_DRIVER_DIR/msedgedriver" "/usr/local/bin/msedgedriver" +unzip -qq $edge_driver_archive_path -d $EDGE_DRIVER_DIR +ln -s $EDGE_DRIVER_DIR/msedgedriver /usr/local/bin/msedgedriver -echo "export EDGEWEBDRIVER=${EDGE_DRIVER_DIR}" >> "${HOME}/.bashrc" +echo "export EDGEWEBDRIVER=${EDGE_DRIVER_DIR}" >> ${HOME}/.bashrc # Configure Edge Updater to prevent auto update # https://learn.microsoft.com/en-us/deployedge/edge-learnmore-edgeupdater-for-macos diff --git a/images/macos/scripts/build/install-firefox.sh b/images/macos/scripts/build/install-firefox.sh index 75c4f6ccbb05..c20e25359fea 100644 --- a/images/macos/scripts/build/install-firefox.sh +++ b/images/macos/scripts/build/install-firefox.sh @@ -14,6 +14,6 @@ brew_smart_install "geckodriver" geckoPath="$(brew --prefix geckodriver)/bin" echo "Add GECKOWEBDRIVER to bashrc..." -echo "export GECKOWEBDRIVER=${geckoPath}" >> "${HOME}/.bashrc" +echo "export GECKOWEBDRIVER=${geckoPath}" >> ${HOME}/.bashrc invoke_tests "Browsers" "Firefox" diff --git a/images/macos/scripts/build/install-gcc.sh b/images/macos/scripts/build/install-gcc.sh index 07155b60743e..9647d56d4ad1 100644 --- a/images/macos/scripts/build/install-gcc.sh +++ b/images/macos/scripts/build/install-gcc.sh @@ -14,7 +14,7 @@ done # Delete default gfortran link if it exists https://github.com/actions/runner-images/issues/1280 gfortranPath=$(which gfortran) || true -if [ $gfortranPath ]; then +if [[ $gfortranPath ]]; then rm $gfortranPath fi diff --git a/images/macos/scripts/build/install-git.sh b/images/macos/scripts/build/install-git.sh index fedc7d6800de..adc3ecccfc40 100644 --- a/images/macos/scripts/build/install-git.sh +++ b/images/macos/scripts/build/install-git.sh @@ -6,12 +6,12 @@ source ~/utils/utils.sh -echo Installing Git... +echo "Installing Git..." brew_smart_install "git" git config --global --add safe.directory "*" -echo Installing Git LFS +echo "Installing Git LFS" brew_smart_install "git-lfs" # Update global git config @@ -19,7 +19,7 @@ git lfs install # Update system git config sudo git lfs install --system -echo Disable all the Git help messages... +echo "Disable all the Git help messages..." git config --global advice.pushUpdateRejected false git config --global advice.pushNonFFCurrent false git config --global advice.pushNonFFMatching false diff --git a/images/macos/scripts/build/install-haskell.sh b/images/macos/scripts/build/install-haskell.sh index 982db587742f..d88bf616e05f 100644 --- a/images/macos/scripts/build/install-haskell.sh +++ b/images/macos/scripts/build/install-haskell.sh @@ -6,9 +6,9 @@ source ~/utils/utils.sh -curl --proto '=https' --tlsv1.2 -fsSL https://get-ghcup.haskell.org | sh +curl --proto '=https' --tlsv1.2 -fsSL https://get-ghcup.haskell.org | bash export PATH="$HOME/.ghcup/bin:$PATH" -echo 'export PATH="$PATH:$HOME/.ghcup/bin"' >> "$HOME/.bashrc" +echo 'export PATH="$PATH:$HOME/.ghcup/bin"' >> $HOME/.bashrc # ghcup output looks like this "ghc 8.6.4 base-4.12.0.0 hls-powered", need to take all the first versions only(8.6.4 in that case) and avoid pre-release ones availableVersions=$(ghcup list -t ghc -r | grep -v "prerelease" | awk '{print $2}') diff --git a/images/macos/scripts/build/install-homebrew.sh b/images/macos/scripts/build/install-homebrew.sh index cb32793d9dd2..4a72cf2e677d 100644 --- a/images/macos/scripts/build/install-homebrew.sh +++ b/images/macos/scripts/build/install-homebrew.sh @@ -10,7 +10,7 @@ arch=$(get_arch) echo "Installing Homebrew..." homebrew_installer_path=$(download_with_retry "https://raw.githubusercontent.com/Homebrew/install/master/install.sh") -/bin/bash "$homebrew_installer_path" +/bin/bash $homebrew_installer_path if [[ $arch == "arm64" ]]; then /opt/homebrew/bin/brew update diff --git a/images/macos/scripts/build/install-miniconda.sh b/images/macos/scripts/build/install-miniconda.sh index 2ee589580cb2..7d9ea2fe1730 100644 --- a/images/macos/scripts/build/install-miniconda.sh +++ b/images/macos/scripts/build/install-miniconda.sh @@ -7,16 +7,16 @@ source ~/utils/utils.sh miniconda_installer_path=$(download_with_retry "https://repo.anaconda.com/miniconda/Miniconda3-latest-MacOSX-x86_64.sh") -chmod +x "$miniconda_installer_path" -sudo "$miniconda_installer_path" -b -p /usr/local/miniconda +chmod +x $miniconda_installer_path +sudo $miniconda_installer_path -b -p /usr/local/miniconda # Chmod with full permissions recursively to avoid permissions restrictions sudo chmod -R 777 /usr/local/miniconda sudo ln -s /usr/local/miniconda/bin/conda /usr/local/bin/conda -if [ -d "$HOME/.conda" ]; then - sudo chown -R $USER "$HOME/.conda" +if [[ -d $HOME/.conda ]]; then + sudo chown -R $USER $HOME/.conda fi echo "export CONDA=/usr/local/miniconda" >> $HOME/.bashrc diff --git a/images/macos/scripts/build/install-mongodb.sh b/images/macos/scripts/build/install-mongodb.sh index 092d71535fac..c603d3892c7d 100644 --- a/images/macos/scripts/build/install-mongodb.sh +++ b/images/macos/scripts/build/install-mongodb.sh @@ -14,10 +14,10 @@ toolsetVersion=$(get_toolset_value '.mongodb.version') brew tap mongodb/brew versionToInstall=$(brew search --formulae /mongodb-community@$toolsetVersion/ | awk -F'/' '{print $3}' | tail -1) echo "Installing mongodb $versionToInstall" -brew_smart_install "$versionToInstall" +brew_smart_install $versionToInstall if ! which mongo ; then - brew link "$versionToInstall" + brew link $versionToInstall fi invoke_tests "Databases" "MongoDB" diff --git a/images/macos/scripts/build/install-mono.sh b/images/macos/scripts/build/install-mono.sh index b5569a4194ed..3ac147f0a4aa 100644 --- a/images/macos/scripts/build/install-mono.sh +++ b/images/macos/scripts/build/install-mono.sh @@ -9,28 +9,28 @@ source ~/utils/utils.sh # Install Mono Framework mono_version_full=$(get_toolset_value '.mono.framework.version') mono_pkg_sha256=$(get_toolset_value '.mono.framework.sha256') -mono_version=$(echo "$mono_version_full" | cut -d. -f 1,2,3) +mono_version=$(echo $mono_version_full | cut -d. -f 1,2,3) mono_version_short=$(echo $mono_version_full | cut -d. -f 1,2) mono_pkg_url="https://download.mono-project.com/archive/${mono_version}/macos-10-universal/MonoFramework-MDK-${mono_version_full}.macos10.xamarin.universal.pkg" MONO_VERSIONS_PATH='/Library/Frameworks/Mono.framework/Versions' -mono_pkg_path=$(download_with_retry "$mono_pkg_url") -use_checksum_comparison "$mono_pkg_path" "$mono_pkg_sha256" +mono_pkg_path=$(download_with_retry $mono_pkg_url) +use_checksum_comparison $mono_pkg_path $mono_pkg_sha256 echo "Installing Mono Framework ${mono_version_full}..." -sudo installer -pkg "$mono_pkg_path" -target / +sudo installer -pkg $mono_pkg_path -target / # Download and install NUnit console nunit_version=$(get_toolset_value '.mono.nunit.version') nunit_archive_url="https://github.com/nunit/nunit-console/releases/download/${nunit_version}/NUnit.Console-${nunit_version}.zip" nunit_archive_sha256=$(get_toolset_value '.mono.nunit.sha256') NUNIT_PATH="/Library/Developer/nunit" -nunit_version_path="$NUNIT_PATH/$nunit_version" +nunit_version_path=$NUNIT_PATH/$nunit_version -nunit_archive_path=$(download_with_retry "$nunit_archive_url") -use_checksum_comparison "$nunit_archive_path" "$nunit_archive_sha256" +nunit_archive_path=$(download_with_retry $nunit_archive_url) +use_checksum_comparison $nunit_archive_path $nunit_archive_sha256 echo "Installing NUnit ${nunit_version}..." -sudo mkdir -p "$nunit_version_path" -sudo unzip -q "$nunit_archive_path" -d "$nunit_version_path" +sudo mkdir -p $nunit_version_path +sudo unzip -q $nunit_archive_path -d $nunit_version_path # Create a wrapper script for nunit3-console echo "Creating nunit3-console wrapper..." @@ -39,13 +39,13 @@ cat <<EOF > "$nunit3_console_wrapper" #!/bin/bash -e -o pipefail exec ${MONO_VERSIONS_PATH}/${mono_version}/bin/mono --debug \$MONO_OPTIONS $nunit_version_path/nunit3-console.exe "\$@" EOF -cat "$nunit3_console_wrapper" -sudo chmod +x "$nunit3_console_wrapper" -sudo mv "$nunit3_console_wrapper" "${MONO_VERSIONS_PATH}/${mono_version}/Commands/nunit3-console" +cat $nunit3_console_wrapper +sudo chmod +x $nunit3_console_wrapper +sudo mv $nunit3_console_wrapper "${MONO_VERSIONS_PATH}/${mono_version}/Commands/nunit3-console" # Create a symlink for the short version of Mono (e.g., 6.12) echo "Creating short symlink '${mono_version_short}'..." -sudo ln -s "${MONO_VERSIONS_PATH}/${mono_version}" "${MONO_VERSIONS_PATH}/${mono_version_short}" +sudo ln -s ${MONO_VERSIONS_PATH}/${mono_version} ${MONO_VERSIONS_PATH}/${mono_version_short} # Invoke tests for Xamarin and Mono invoke_tests "Xamarin" "Mono" diff --git a/images/macos/scripts/build/install-node.sh b/images/macos/scripts/build/install-node.sh index 60a25d5de79f..a4c4aaeba745 100644 --- a/images/macos/scripts/build/install-node.sh +++ b/images/macos/scripts/build/install-node.sh @@ -14,7 +14,7 @@ brew link node@$defaultVersion --force --overwrite echo Installing yarn... yarn_installer_path=$(download_with_retry "https://yarnpkg.com/install.sh") -bash "$yarn_installer_path" +bash $yarn_installer_path if is_BigSur || is_Monterey; then npm_global_packages=$(get_toolset_value '.npm.global_packages[].name') diff --git a/images/macos/scripts/build/install-nvm.sh b/images/macos/scripts/build/install-nvm.sh index 49948459d48f..4d475cd1ba5d 100644 --- a/images/macos/scripts/build/install-nvm.sh +++ b/images/macos/scripts/build/install-nvm.sh @@ -6,12 +6,12 @@ source ~/utils/utils.sh -[ -n "$API_PAT" ] && authString=(-H "Authorization: token ${API_PAT}") +[[ -n $API_PAT ]] && authString=(-H "Authorization: token ${API_PAT}") nvm_version=$(curl "${authString[@]}" -fsSL https://api.github.com/repos/nvm-sh/nvm/releases/latest | jq -r '.tag_name') nvm_installer_path=$(download_with_retry "https://raw.githubusercontent.com/nvm-sh/nvm/$nvm_version/install.sh") -if bash "$nvm_installer_path"; then - . ~/.bashrc +if bash $nvm_installer_path; then + source ~/.bashrc nvm --version for version in $(get_toolset_value '.node.nvm_versions[]'); do nvm install "v${version}" diff --git a/images/macos/scripts/build/install-openjdk.sh b/images/macos/scripts/build/install-openjdk.sh index 6000439f6d65..6c7ec3633650 100644 --- a/images/macos/scripts/build/install-openjdk.sh +++ b/images/macos/scripts/build/install-openjdk.sh @@ -18,15 +18,15 @@ createEnvironmentVariable() { if [[ ${DEFAULT} == "True" ]]; then echo "Setting up JAVA_HOME variable to ${INSTALL_PATH_PATTERN}" - echo "export JAVA_HOME=${INSTALL_PATH_PATTERN}" >> "${HOME}/.bashrc" + echo "export JAVA_HOME=${INSTALL_PATH_PATTERN}" >> ${HOME}/.bashrc fi if [[ $arch == "arm64" ]]; then echo "Setting up JAVA_HOME_${JAVA_VERSION}_arm64 variable to ${INSTALL_PATH_PATTERN}" - echo "export JAVA_HOME_${JAVA_VERSION}_arm64=${INSTALL_PATH_PATTERN}" >> "${HOME}/.bashrc" + echo "export JAVA_HOME_${JAVA_VERSION}_arm64=${INSTALL_PATH_PATTERN}" >> ${HOME}/.bashrc else echo "Setting up JAVA_HOME_${JAVA_VERSION}_X64 variable to ${INSTALL_PATH_PATTERN}" - echo "export JAVA_HOME_${JAVA_VERSION}_X64=${INSTALL_PATH_PATTERN}" >> "${HOME}/.bashrc" + echo "export JAVA_HOME_${JAVA_VERSION}_X64=${INSTALL_PATH_PATTERN}" >> ${HOME}/.bashrc fi } @@ -58,12 +58,12 @@ installOpenJDK() { fi # Download and extract Java binaries - archive_path=$(download_with_retry "$archive_url") + archive_path=$(download_with_retry $archive_url) echo "Creating ${javaToolcacheVersionArchPath} directory" mkdir -p ${javaToolcacheVersionArchPath} - tar -xf "$archive_path" -C ${javaToolcacheVersionArchPath} --strip-components=1 + tar -xf $archive_path -C ${javaToolcacheVersionArchPath} --strip-components=1 # Create complete file if [[ $arch == "arm64" ]]; then diff --git a/images/macos/scripts/build/install-postgresql.sh b/images/macos/scripts/build/install-postgresql.sh index 5f62cc45b42f..0f28b759e22f 100644 --- a/images/macos/scripts/build/install-postgresql.sh +++ b/images/macos/scripts/build/install-postgresql.sh @@ -20,11 +20,11 @@ brew services start $postgreService echo "Check PostgreSQL service is running" i=10 COMMAND='pg_isready' -while [ $i -gt 0 ]; do +while [[ $i -gt 0 ]]; do echo "Check PostgreSQL service status" eval $COMMAND && break ((i--)) - if [ $i == 0 ]; then + if [[ $i == 0 ]]; then echo "PostgreSQL service not ready, all attempts exhausted" exit 1 fi diff --git a/images/macos/scripts/build/install-powershell.sh b/images/macos/scripts/build/install-powershell.sh index 557d0f76721b..d6c2a9fc8ae9 100644 --- a/images/macos/scripts/build/install-powershell.sh +++ b/images/macos/scripts/build/install-powershell.sh @@ -11,7 +11,7 @@ arch=$(get_arch) metadata_json_path=$(download_with_retry "https://raw.githubusercontent.com/PowerShell/PowerShell/master/tools/metadata.json") pwshVersionToolset=$(get_toolset_value '.pwsh.version') -pwshVersions=$(jq -r '.LTSReleaseTag[]' "$metadata_json_path") +pwshVersions=$(jq -r '.LTSReleaseTag[]' $metadata_json_path) for version in ${pwshVersions[@]}; do if [[ "$version" =~ "$pwshVersionToolset" ]]; then @@ -20,19 +20,19 @@ for version in ${pwshVersions[@]}; do fi done -pkg_path=$(download_with_retry "$download_url") +pkg_path=$(download_with_retry $download_url) # Work around the issue on macOS Big Sur 11.5 or higher for possible error message ("can't be opened because Apple cannot check it for malicious software") when installing the package -sudo xattr -rd com.apple.quarantine "$pkg_path" +sudo xattr -rd com.apple.quarantine $pkg_path -sudo installer -pkg "$pkg_path" -target / +sudo installer -pkg $pkg_path -target / # Install PowerShell modules psModules=$(get_toolset_value '.powershellModules[].name') for module in ${psModules[@]}; do echo "Installing $module module" moduleVersions="$(get_toolset_value ".powershellModules[] | select(.name==\"$module\") | .versions[]?")" - if [[ -z "$moduleVersions" ]];then + if [[ -z $moduleVersions ]];then # Check MacOS architecture and sudo on Arm64 if [[ $arch == "arm64" ]]; then sudo pwsh -command "& {Install-Module $module -Force -Scope AllUsers}" diff --git a/images/macos/scripts/build/install-pypy.sh b/images/macos/scripts/build/install-pypy.sh index 5e1900b579ef..08f4ca70d858 100644 --- a/images/macos/scripts/build/install-pypy.sh +++ b/images/macos/scripts/build/install-pypy.sh @@ -6,23 +6,22 @@ source ~/utils/utils.sh -function InstallPyPy -{ - PACKAGE_URL=$1 +InstallPyPy() { + local package_url=$1 - PACKAGE_TAR_NAME=$(basename "$PACKAGE_URL") + PACKAGE_TAR_NAME=$(basename $package_url) echo "Downloading tar archive '$PACKAGE_TAR_NAME'" - archive_path=$(download_with_retry "$PACKAGE_URL") + archive_path=$(download_with_retry $package_url) echo "Expand '$PACKAGE_TAR_NAME' to the /tmp folder" - tar xf "$archive_path" -C /tmp + tar xf $archive_path -C /tmp # Get Python version PACKAGE_NAME=${PACKAGE_TAR_NAME/.tar.bz2/} MAJOR_VERSION=$(echo ${PACKAGE_NAME/pypy/} | cut -d. -f1) PYTHON_MAJOR="python$MAJOR_VERSION" - if [ $MAJOR_VERSION != 2 ]; then + if [[ $MAJOR_VERSION != 2 ]]; then PYPY_MAJOR="pypy$MAJOR_VERSION" else PYPY_MAJOR="pypy" @@ -40,14 +39,14 @@ function InstallPyPy PYPY_TOOLCACHE_VERSION_ARCH_PATH=$PYPY_TOOLCACHE_VERSION_PATH/x64 echo "Check if PyPy hostedtoolcache folder exist..." - if [ ! -d $PYPY_TOOLCACHE_PATH ]; then + if [[ ! -d $PYPY_TOOLCACHE_PATH ]]; then mkdir -p $PYPY_TOOLCACHE_PATH fi echo "Create PyPy '$PYPY_TOOLCACHE_VERSION_PATH' folder" mkdir $PYPY_TOOLCACHE_VERSION_PATH - echo "Move PyPy '$PACKAGE_TEMP_FOLDER' binaries to '$PYPY_TOOLCACHE_VERSION_ARCH_PATH' folder" + echo "Move PyPy $PACKAGE_TEMP_FOLDER binaries to $PYPY_TOOLCACHE_VERSION_ARCH_PATH folder" mv $PACKAGE_TEMP_FOLDER $PYPY_TOOLCACHE_VERSION_ARCH_PATH echo "Create additional symlinks (Required for UsePythonVersion Azure DevOps task)" @@ -58,8 +57,8 @@ function InstallPyPy echo $PYPY_FULL_VERSION > "PYPY_VERSION" # Starting from PyPy 7.3.4 these links are already included in the package - [ -f ./$PYTHON_MAJOR ] || ln -s $PYPY_MAJOR $PYTHON_MAJOR - [ -f ./python ] || ln -s $PYTHON_MAJOR python + [[ -f ./$PYTHON_MAJOR ]] || ln -s $PYPY_MAJOR $PYTHON_MAJOR + [[ -f ./python ]] || ln -s $PYTHON_MAJOR python chmod +x ./python ./$PYTHON_MAJOR @@ -76,12 +75,12 @@ versions_json_path=$(download_with_retry "https://downloads.python.org/pypy/vers toolsetVersions=$(get_toolset_value '.toolcache[] | select(.name | contains("PyPy")) | .arch.'$arch'.versions[]') for toolsetVersion in $toolsetVersions; do - latestMajorPyPyVersion=$(cat "$versions_json_path" | + latestMajorPyPyVersion=$(cat $versions_json_path | jq -r --arg toolsetVersion $toolsetVersion '.[] | select((.python_version | startswith($toolsetVersion)) and .stable == true).files[] | select(.platform == "darwin").download_url' | head -1) - if [[ -z "$latestMajorPyPyVersion" ]]; then - echo "Failed to get PyPy version '$toolsetVersion'" + if [[ -z $latestMajorPyPyVersion ]]; then + echo "Failed to get PyPy version $toolsetVersion" exit 1 fi InstallPyPy $latestMajorPyPyVersion diff --git a/images/macos/scripts/build/install-python.sh b/images/macos/scripts/build/install-python.sh index 91269d19f512..3fa93b27a15e 100644 --- a/images/macos/scripts/build/install-python.sh +++ b/images/macos/scripts/build/install-python.sh @@ -12,19 +12,19 @@ if is_Monterey || is_BigSur; then echo "Install latest Python 2" python2_pkg=$(download_with_retry "https://www.python.org/ftp/python/2.7.18/python-2.7.18-macosx10.9.pkg") python2_pkg_sha256="c570f38b05dd8b112ad21b418cdf51a9816d62f9f44746452739d421be24d50c" - use_checksum_comparison "$python2_pkg" "$python2_pkg_sha256" + use_checksum_comparison $python2_pkg $python2_pkg_sha256 choice_changes_xml=$(mktemp /tmp/python2_choice_changes.xml.XXXXXX) - sudo installer -showChoiceChangesXML -pkg "$python2_pkg" -target / | tee "$choice_changes_xml" > /dev/null + sudo installer -showChoiceChangesXML -pkg $python2_pkg -target / | tee $choice_changes_xml > /dev/null # To avoid symlink conflicts, remove tools installation in /usr/local/bin using installer choices - xmllint --shell "$choice_changes_xml" <<EOF + xmllint --shell $choice_changes_xml <<EOF cd //array/dict[string[text()='org.python.Python.PythonUnixTools-2.7']]/integer set 0 save EOF - sudo installer -applyChoiceChangesXML "$choice_changes_xml" -pkg "$python2_pkg" -target / + sudo installer -applyChoiceChangesXML $choice_changes_xml -pkg $python2_pkg -target / pip install --upgrade pip @@ -46,8 +46,8 @@ export PIPX_HOME=/usr/local/opt/pipx brew_smart_install "pipx" -echo "export PIPX_BIN_DIR=${PIPX_BIN_DIR}" >> "${HOME}/.bashrc" -echo "export PIPX_HOME=${PIPX_HOME}" >> "${HOME}/.bashrc" -echo 'export PATH="$PIPX_BIN_DIR:$PATH"' >> "${HOME}/.bashrc" +echo "export PIPX_BIN_DIR=${PIPX_BIN_DIR}" >> ${HOME}/.bashrc +echo "export PIPX_HOME=${PIPX_HOME}" >> ${HOME}/.bashrc +echo 'export PATH="$PIPX_BIN_DIR:$PATH"' >> ${HOME}/.bashrc invoke_tests "Python" diff --git a/images/macos/scripts/build/install-rosetta.sh b/images/macos/scripts/build/install-rosetta.sh index af3a438c520b..3eeec7f52495 100644 --- a/images/macos/scripts/build/install-rosetta.sh +++ b/images/macos/scripts/build/install-rosetta.sh @@ -4,5 +4,5 @@ ## Desc: Install Rosetta ################################################################################ -echo 'Installing Rosetta' +echo "Installing Rosetta" /usr/sbin/softwareupdate --install-rosetta --agree-to-license diff --git a/images/macos/scripts/build/install-ruby.sh b/images/macos/scripts/build/install-ruby.sh index 13989a62e0cd..e93ca6ab2df1 100644 --- a/images/macos/scripts/build/install-ruby.sh +++ b/images/macos/scripts/build/install-ruby.sh @@ -8,7 +8,7 @@ source ~/utils/utils.sh arch=$(get_arch) DEFAULT_RUBY_VERSION=$(get_toolset_value '.ruby.default') -echo Installing Ruby... +echo "Installing Ruby..." brew_smart_install "ruby@${DEFAULT_RUBY_VERSION}" if [[ $arch == "arm64" ]]; then export PATH=/opt/homebrew/opt/ruby@${DEFAULT_RUBY_VERSION}/bin:$PATH @@ -16,12 +16,12 @@ else export PATH=/usr/local/opt/ruby@${DEFAULT_RUBY_VERSION}/bin:$PATH fi -GEM_PATH=`gem env|awk '/EXECUTABLE DIRECTORY/ {print $4}'` -echo "GEM_PATH=$GEM_PATH" >> "$HOME/.bashrc" +GEM_PATH=$(gem env|awk '/EXECUTABLE DIRECTORY/ {print $4}') +echo "GEM_PATH=$GEM_PATH" >> $HOME/.bashrc if [[ $arch == "arm64" ]]; then - echo 'export PATH="$GEM_PATH:/opt/homebrew/opt/ruby@'${DEFAULT_RUBY_VERSION}'/bin:$PATH"' >> "$HOME/.bashrc" + echo 'export PATH="$GEM_PATH:/opt/homebrew/opt/ruby@'${DEFAULT_RUBY_VERSION}'/bin:$PATH"' >> $HOME/.bashrc else - echo 'export PATH="$GEM_PATH:/usr/local/opt/ruby@'${DEFAULT_RUBY_VERSION}'/bin:$PATH"' >> "$HOME/.bashrc" + echo 'export PATH="$GEM_PATH:/usr/local/opt/ruby@'${DEFAULT_RUBY_VERSION}'/bin:$PATH"' >> $HOME/.bashrc fi if ! is_Arm64; then @@ -29,13 +29,13 @@ if ! is_Arm64; then [ -n "$API_PAT" ] && authString=(-H "Authorization: token ${API_PAT}") PACKAGE_TAR_NAMES=$(curl "${authString[@]}" -fsSL "https://api.github.com/repos/ruby/ruby-builder/releases/latest" | jq -r '.assets[].name') TOOLSET_VERSIONS=$(get_toolset_value '.toolcache[] | select(.name | contains("Ruby")) | .arch.'$arch'.versions[]') - RUBY_PATH="$AGENT_TOOLSDIRECTORY/Ruby" + RUBY_PATH=$AGENT_TOOLSDIRECTORY/Ruby echo "Check if Ruby hostedtoolcache folder exists..." - if [ ! -d $RUBY_PATH ]; then + if [[ ! -d $RUBY_PATH ]]; then mkdir -p $RUBY_PATH fi - + echo "ruby path - $RUBY_PATH " for TOOLSET_VERSION in ${TOOLSET_VERSIONS[@]}; do PACKAGE_TAR_NAME=$(echo "$PACKAGE_TAR_NAMES" | grep "^ruby-${TOOLSET_VERSION}-macos-latest.tar.gz$" | egrep -v "rc|preview" | sort -V | tail -1) RUBY_VERSION=$(echo "$PACKAGE_TAR_NAME" | cut -d'-' -f 2) @@ -47,10 +47,10 @@ if ! is_Arm64; then echo "Downloading tar archive $PACKAGE_TAR_NAME" ARCHIVE_PATH=$(download_with_retry "https://github.com/ruby/ruby-builder/releases/download/toolcache/${PACKAGE_TAR_NAME}") - echo "Expand '$PACKAGE_TAR_NAME' to the '$RUBY_VERSION_PATH' folder" - tar xf "$ARCHIVE_PATH" -C $RUBY_VERSION_PATH - COMPLETE_FILE_PATH="$RUBY_VERSION_PATH/x64.complete" - if [ ! -f $COMPLETE_FILE_PATH ]; then + echo "Expand $PACKAGE_TAR_NAME to the $RUBY_VERSION_PATH folder" + tar xf $ARCHIVE_PATH -C $RUBY_VERSION_PATH + COMPLETE_FILE_PATH=$RUBY_VERSION_PATH/x64.complete + if [[ ! -f $COMPLETE_FILE_PATH ]]; then echo "Create complete file" touch $COMPLETE_FILE_PATH fi diff --git a/images/macos/scripts/build/install-rubygems.sh b/images/macos/scripts/build/install-rubygems.sh index 15a20616b71b..02caefe0b61f 100644 --- a/images/macos/scripts/build/install-rubygems.sh +++ b/images/macos/scripts/build/install-rubygems.sh @@ -6,14 +6,14 @@ source ~/utils/utils.sh -echo Updating RubyGems... +echo "Updating RubyGems..." gem update --system # Temporarily install activesupport 7.0.8 due to compatibility issues with cocoapods https://github.com/CocoaPods/CocoaPods/issues/12081 gem install activesupport -v 7.0.8 gemsToInstall=$(get_toolset_value '.ruby.rubygems | .[]') -if [ -n "$gemsToInstall" ]; then +if [[ -n $gemsToInstall ]]; then for gem in $gemsToInstall; do echo "Installing gem $gem" gem install $gem diff --git a/images/macos/scripts/build/install-rust.sh b/images/macos/scripts/build/install-rust.sh index a1fa98403423..9b6e9be25c12 100644 --- a/images/macos/scripts/build/install-rust.sh +++ b/images/macos/scripts/build/install-rust.sh @@ -6,23 +6,23 @@ source ~/utils/utils.sh -echo Installing Rustup... +echo "Installing Rustup..." brew_smart_install "rustup-init" -echo Installing Rust language... +echo "Installing Rust language..." rustup-init -y --no-modify-path --default-toolchain=stable --profile=minimal -echo Initialize environment variables... +echo "Initialize environment variables..." CARGO_HOME=$HOME/.cargo -echo Install common tools... +echo "Install common tools..." rustup component add rustfmt clippy if is_BigSur || is_Monterey; then cargo install --locked bindgen-cli cbindgen cargo-audit cargo-outdated fi -echo Cleanup Cargo registry cached data... +echo "Cleanup Cargo registry cached data..." rm -rf $CARGO_HOME/registry/* invoke_tests "Rust" diff --git a/images/macos/scripts/build/install-safari.sh b/images/macos/scripts/build/install-safari.sh index bd4f54e7c74d..a00ef482c8ab 100644 --- a/images/macos/scripts/build/install-safari.sh +++ b/images/macos/scripts/build/install-safari.sh @@ -13,7 +13,7 @@ sudo safaridriver --enable echo "Enabling the 'Allow Remote Automation' option in Safari's Develop menu" mkdir -p $HOME/Library/WebDriver safari_plist="$HOME/Library/WebDriver/com.apple.Safari.plist" -# "|| true" is needed to suppress exit code 1 in case if property or file doesn't exist +# "|| true" is needed to suppress exit code 1 in case if property or file doesn't exist /usr/libexec/PlistBuddy -c 'delete AllowRemoteAutomation' $safari_plist || true /usr/libexec/PlistBuddy -c 'add AllowRemoteAutomation bool true' $safari_plist diff --git a/images/macos/scripts/build/install-swiftlint.sh b/images/macos/scripts/build/install-swiftlint.sh index 5a3222e97288..c04382987e04 100644 --- a/images/macos/scripts/build/install-swiftlint.sh +++ b/images/macos/scripts/build/install-swiftlint.sh @@ -6,13 +6,13 @@ source ~/utils/utils.sh -echo Installing Swiftlint... +echo "Installing Swiftlint..." if is_BigSur; then # SwiftLint now requires Swift 5.6 or higher to build, and macOS 12 or higher to run https://github.com/realm/SwiftLint/releases/tag/0.49.0 COMMIT=d1d5743344227fe6e3c37cfba19f0cfe15a9448a FORMULA_URL="https://raw.githubusercontent.com/Homebrew/homebrew-core/$COMMIT/Formula/swiftlint.rb" - curl -fsSL "$FORMULA_URL" > $(find $(brew --repository) -name swiftlint.rb) + curl -fsSL $FORMULA_URL > $(find $(brew --repository) -name swiftlint.rb) HOMEBREW_NO_AUTO_UPDATE=1 HOMEBREW_NO_INSTALL_FROM_API=1 brew install swiftlint else brew_smart_install "swiftlint" diff --git a/images/macos/scripts/build/install-visualstudio.sh b/images/macos/scripts/build/install-visualstudio.sh index 402665b736b7..e4fa7a35a29c 100644 --- a/images/macos/scripts/build/install-visualstudio.sh +++ b/images/macos/scripts/build/install-visualstudio.sh @@ -24,13 +24,13 @@ install_vsmac() { TMPMOUNT=$(/usr/bin/mktemp -d /tmp/visualstudio.XXXX) mkdir -p "$TMPMOUNT/downloads" - vsmac_installer=$(download_with_retry "$vsmac_download_url" "$TMPMOUNT/downloads/${vsmac_download_url##*/}") + vsmac_installer=$(download_with_retry $vsmac_download_url "$TMPMOUNT/downloads/${vsmac_download_url##*/}") echo "Mounting Visual Studio..." - hdiutil attach "$vsmac_installer" -mountpoint "$TMPMOUNT" + hdiutil attach $vsmac_installer -mountpoint $TMPMOUNT echo "Moving Visual Studio to /Applications/..." - pushd "$TMPMOUNT" + pushd $TMPMOUNT tar cf - "./Visual Studio.app" | tar xf - -C /Applications/ if [[ $vsmac_version != $vsmac_default ]]; then @@ -38,14 +38,14 @@ install_vsmac() { fi popd - sudo hdiutil detach "$TMPMOUNT" - sudo rm -rf "$TMPMOUNT" + sudo hdiutil detach $TMPMOUNT + sudo rm -rf $TMPMOUNT } vsmac_versions=($(get_toolset_value '.xamarin.vsmac.versions[]')) default_vsmac_version=$(get_toolset_value '.xamarin.vsmac.default') -for version in "${vsmac_versions[@]}"; do +for version in ${vsmac_versions[@]}; do install_vsmac $version $default_vsmac_version done diff --git a/images/macos/scripts/build/install-xamarin.sh b/images/macos/scripts/build/install-xamarin.sh index 33ba012817bc..faa0b70df516 100644 --- a/images/macos/scripts/build/install-xamarin.sh +++ b/images/macos/scripts/build/install-xamarin.sh @@ -15,17 +15,17 @@ latest_sdk_symlink=$(get_toolset_value '.xamarin.bundles[0].symlink') current_sdk_symlink=$(get_toolset_value '.xamarin."bundle_default"') default_xcode_version=$(get_toolset_value '.xcode.default') -if [ "$current_sdk_symlink" == "latest" ]; then +if [[ $current_sdk_symlink == "latest" ]]; then current_sdk_symlink=$latest_sdk_symlink fi -MONO_VERSIONS_PATH='/Library/Frameworks/Mono.framework/Versions' -IOS_VERSIONS_PATH='/Library/Frameworks/Xamarin.iOS.framework/Versions' -ANDROID_VERSIONS_PATH='/Library/Frameworks/Xamarin.Android.framework/Versions' -MAC_VERSIONS_PATH='/Library/Frameworks/Xamarin.Mac.framework/Versions' +MONO_VERSIONS_PATH="/Library/Frameworks/Mono.framework/Versions" +IOS_VERSIONS_PATH="/Library/Frameworks/Xamarin.iOS.framework/Versions" +ANDROID_VERSIONS_PATH="/Library/Frameworks/Xamarin.Android.framework/Versions" +MAC_VERSIONS_PATH="/Library/Frameworks/Xamarin.Mac.framework/Versions" -TMPMOUNT=`/usr/bin/mktemp -d /tmp/visualstudio.XXXX` -TMPMOUNT_FRAMEWORKS="$TMPMOUNT/frameworks" +TMPMOUNT=$(/usr/bin/mktemp -d /tmp/visualstudio.XXXX) +TMPMOUNT_FRAMEWORKS=$TMPMOUNT/frameworks createBackupFolders pushd $TMPMOUNT @@ -34,19 +34,19 @@ pushd $TMPMOUNT downloadNUnitConsole # Install Mono sdks -for version in "${mono_versions[@]}"; do installMono $version; done +for version in ${mono_versions[@]}; do installMono $version; done sudo mv -v $TMPMOUNT_FRAMEWORKS/mono/* $MONO_VERSIONS_PATH/ # Install Xamarin.iOS sdks -for version in "${xamarin_ios_versions[@]}"; do installXamarinIOS $version; done +for version in ${xamarin_ios_versions[@]}; do installXamarinIOS $version; done sudo mv -v $TMPMOUNT_FRAMEWORKS/ios/* $IOS_VERSIONS_PATH/ # Install Xamarin.Mac sdks -for version in "${xamarin_mac_versions[@]}"; do installXamarinMac $version; done +for version in ${xamarin_mac_versions[@]}; do installXamarinMac $version; done sudo mv -v $TMPMOUNT_FRAMEWORKS/mac/* $MAC_VERSIONS_PATH/ # Install Xamarin.Android sdks -for version in "${xamarin_android_versions[@]}"; do installXamarinAndroid $version; done +for version in ${xamarin_android_versions[@]}; do installXamarinAndroid $version; done sudo mv -v $TMPMOUNT_FRAMEWORKS/android/* $ANDROID_VERSIONS_PATH/ @@ -75,7 +75,7 @@ createUWPShim popd echo "Clean up packages..." -sudo rm -rf "$TMPMOUNT" +sudo rm -rf $TMPMOUNT # Fix Xamarin issue with Xcode symlink: https://github.com/xamarin/xamarin-macios/issues/9960 PREFERENCES_XAMARIN_DIR="${HOME}/Library/Preferences/Xamarin" diff --git a/images/macos/scripts/build/install-xcode-clt.sh b/images/macos/scripts/build/install-xcode-clt.sh index 13c17a5e6b79..4e6f334576bd 100644 --- a/images/macos/scripts/build/install-xcode-clt.sh +++ b/images/macos/scripts/build/install-xcode-clt.sh @@ -7,8 +7,8 @@ source ~/utils/utils.sh is_clt_installed() { - clt_path=`xcode-select -p 2>&1` - [[ -d "$clt_path" ]] + clt_path=$(xcode-select -p 2>&1) + [[ -d $clt_path ]] } install_clt() { diff --git a/images/macos/scripts/build/install-xcode-simulators.sh b/images/macos/scripts/build/install-xcode-simulators.sh deleted file mode 100644 index f04ea329b3a1..000000000000 --- a/images/macos/scripts/build/install-xcode-simulators.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash -e -o pipefail -################################################################################ -## File: install-xcode-simulators.sh -## Desc: Install Xcode simulators -################################################################################ - -source ~/utils/utils.sh - -# Downloading and installing simulators -SIMS_TO_INSTALL=( -"8.4" -"9.0" -"9.1" -"9.2" -"9.3" -"10.0" -"10.1" -"10.2" -"10.3" -) - -for sim_version in ${SIMS_TO_INSTALL[@]} -do - echo "Installing iOS $sim_version ..." - sudo xcversion simulators --install="iOS ${sim_version}" - echo "Successfuly installed iOS $sim_version ..." -done - -echo "Done installing simulator runtimes." diff --git a/images/macos/scripts/helpers/utils.sh b/images/macos/scripts/helpers/utils.sh index f9219113d908..c4d71881fe8c 100644 --- a/images/macos/scripts/helpers/utils.sh +++ b/images/macos/scripts/helpers/utils.sh @@ -87,12 +87,6 @@ get_toolset_value() { echo "$(jq -r "$query" $toolset_path)" } -verlte() { - sortedVersion=$(echo -e "$1\n$2" | sort -V | head -n1) - [ "$1" = "$sortedVersion" ] -} - - # brew provides package bottles for different macOS versions # The 'brew install' command will fail if a package bottle does not exist # Use the '--build-from-source' option to build from source in this case diff --git a/images/macos/scripts/helpers/xamarin-utils.sh b/images/macos/scripts/helpers/xamarin-utils.sh index 83ddfb1bcfe9..20e3b9dc86f6 100644 --- a/images/macos/scripts/helpers/xamarin-utils.sh +++ b/images/macos/scripts/helpers/xamarin-utils.sh @@ -160,7 +160,7 @@ installNunitConsole() { #!/bin/bash -e -o pipefail exec /Library/Frameworks/Mono.framework/Versions/${MONO_VERSION}/bin/mono --debug \$MONO_OPTIONS $NUNIT3_PATH/nunit3-console.exe "\$@" EOF - sudo chmod +x "$TMP_WRAPPER_PATH" + sudo chmod +x $TMP_WRAPPER_PATH sudo mv "$TMP_WRAPPER_PATH" "${MONO_VERSIONS_PATH}/${MONO_VERSION}/Commands/nunit3-console" } From ec4e51233fe145e3ef234797571e4a66be47ca5c Mon Sep 17 00:00:00 2001 From: sergei-pyshnoi <121864472+sergei-pyshnoi@users.noreply.github.com> Date: Tue, 9 Jan 2024 20:05:02 +0100 Subject: [PATCH 2580/3485] [Windows] Fix signature for azure cli (#9134) * fix signature for azure cli * disable edge auto updates --- images/windows/scripts/build/Install-AzureCli.ps1 | 2 +- images/windows/scripts/build/Install-EdgeDriver.ps1 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/images/windows/scripts/build/Install-AzureCli.ps1 b/images/windows/scripts/build/Install-AzureCli.ps1 index 9f516c53328b..47a24319bf4d 100644 --- a/images/windows/scripts/build/Install-AzureCli.ps1 +++ b/images/windows/scripts/build/Install-AzureCli.ps1 @@ -15,7 +15,7 @@ New-Item -ItemType 'Directory' -Path $azureCliExtensionPath | Out-Null Install-Binary -Type MSI ` -Url 'https://aka.ms/installazurecliwindowsx64' ` - -ExpectedSignature '72105B6D5F370B62FD5C82F1512F7AD7DEE5F2C0' + -ExpectedSignature 'C2048FB509F1C37A8C3E9EC6648118458AA01780' Update-Environment diff --git a/images/windows/scripts/build/Install-EdgeDriver.ps1 b/images/windows/scripts/build/Install-EdgeDriver.ps1 index ada638d0ee68..91547ba0eb13 100644 --- a/images/windows/scripts/build/Install-EdgeDriver.ps1 +++ b/images/windows/scripts/build/Install-EdgeDriver.ps1 @@ -4,7 +4,7 @@ ################################################################################ # Disable Edge auto-updates -#Rename-Item -Path "C:\Program Files (x86)\Microsoft\EdgeUpdate\MicrosoftEdgeUpdate.exe" -NewName "Disabled_MicrosoftEdgeUpdate.exe" -ErrorAction Stop +Rename-Item -Path "C:\Program Files (x86)\Microsoft\EdgeUpdate\MicrosoftEdgeUpdate.exe" -NewName "Disabled_MicrosoftEdgeUpdate.exe" -ErrorAction Stop Write-Host "Get the Microsoft Edge WebDriver version..." $edgeBinaryPath = (Get-ItemProperty "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\msedge.exe").'(default)' From c40faf56bfad4fd47d8aee64f4371a26c41fa7eb Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Wed, 10 Jan 2024 10:41:11 +0100 Subject: [PATCH 2581/3485] [ubuntu] Fix static path in install.sh (#9138) --- images/ubuntu/scripts/helpers/install.sh | 2 +- images/ubuntu/templates/ubuntu-20.04.pkr.hcl | 2 +- images/ubuntu/templates/ubuntu-22.04.pkr.hcl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/images/ubuntu/scripts/helpers/install.sh b/images/ubuntu/scripts/helpers/install.sh index 626e06f73a44..da954560aaea 100644 --- a/images/ubuntu/scripts/helpers/install.sh +++ b/images/ubuntu/scripts/helpers/install.sh @@ -46,7 +46,7 @@ download_with_retry() { } get_toolset_value() { - local toolset_path="/imagegeneration/installers/toolset.json" + local toolset_path="${INSTALLER_SCRIPT_FOLDER}/toolset.json" local query=$1 echo "$(jq -r "$query" $toolset_path)" diff --git a/images/ubuntu/templates/ubuntu-20.04.pkr.hcl b/images/ubuntu/templates/ubuntu-20.04.pkr.hcl index 85b3c53856a9..7a35f657ae9c 100644 --- a/images/ubuntu/templates/ubuntu-20.04.pkr.hcl +++ b/images/ubuntu/templates/ubuntu-20.04.pkr.hcl @@ -259,7 +259,7 @@ build { } provisioner "shell" { - environment_vars = ["HELPER_SCRIPTS=${var.helper_script_folder}"] + environment_vars = ["HELPER_SCRIPTS=${var.helper_script_folder}", "INSTALLER_SCRIPT_FOLDER=${var.installer_script_folder}"] execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" scripts = ["${path.root}/../scripts/build/install-powershell.sh"] } diff --git a/images/ubuntu/templates/ubuntu-22.04.pkr.hcl b/images/ubuntu/templates/ubuntu-22.04.pkr.hcl index 58c8d7c54f24..25fce43fd1bc 100644 --- a/images/ubuntu/templates/ubuntu-22.04.pkr.hcl +++ b/images/ubuntu/templates/ubuntu-22.04.pkr.hcl @@ -259,7 +259,7 @@ build { } provisioner "shell" { - environment_vars = ["HELPER_SCRIPTS=${var.helper_script_folder}"] + environment_vars = ["HELPER_SCRIPTS=${var.helper_script_folder}", "INSTALLER_SCRIPT_FOLDER=${var.installer_script_folder}"] execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" scripts = ["${path.root}/../scripts/build/install-powershell.sh"] } From 4d5381bd212a4080452e70049f5e0f57cd287b99 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 10 Jan 2024 11:38:07 +0000 Subject: [PATCH 2582/3485] Updating readme file for ubuntu20 version 20240107.1.0 (#9125) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2004-Readme.md | 138 ++++++++++++++--------------- 1 file changed, 67 insertions(+), 71 deletions(-) diff --git a/images/ubuntu/Ubuntu2004-Readme.md b/images/ubuntu/Ubuntu2004-Readme.md index 5c41c4db0479..f36914006e8c 100644 --- a/images/ubuntu/Ubuntu2004-Readme.md +++ b/images/ubuntu/Ubuntu2004-Readme.md @@ -1,12 +1,14 @@ | Announcements | |-| +| [[All OSes] Powershell Core will be updated to 7.4.x LTS on January, 28](https://github.com/actions/runner-images/issues/9115) | +| [[Ubuntu] buildpack-deps docker images will be removed from runners on January, 8](https://github.com/actions/runner-images/issues/9053) | | [Old versions of Android SDK & tools will be removed from images on January, 8](https://github.com/actions/runner-images/issues/8952) | | [Major Refactoring of GitHub Actions Runner Images Repository](https://github.com/actions/runner-images/issues/8706) | *** # Ubuntu 20.04 - OS Version: 20.04.6 LTS - Kernel Version: 5.15.0-1053-azure -- Image Version: 20231217.2.0 +- Image Version: 20240107.1.0 - Systemd version: 245.4-4ubuntu3.22 ## Installed Software @@ -21,8 +23,8 @@ - Erlang rebar3 3.22.1 - GNU C++: 9.4.0, 10.5.0 - GNU Fortran: 9.4.0, 10.5.0 -- Julia 1.9.4 -- Kotlin 1.9.21-release-633 +- Julia 1.10.0 +- Kotlin 1.9.22-release-704 - Mono 6.12.0.200 - MSBuild 16.10.1.31701 (Mono 6.12.0.200) - Node.js 18.19.0 @@ -34,15 +36,15 @@ ### Package Management - cpan 1.64 - Helm 3.13.1 -- Homebrew 4.1.25 -- Miniconda 23.10.0 +- Homebrew 4.2.2 +- Miniconda 23.11.0 - Npm 10.2.3 - NuGet 6.6.1.2 - Pip 20.0.2 - Pip3 20.0.2 -- Pipx 1.3.3 +- Pipx 1.4.1 - RubyGems 3.1.2 -- Vcpkg (build from commit 0e47c1985) +- Vcpkg (build from commit ce46ba877) - Yarn 1.22.21 #### Environment variables @@ -62,7 +64,7 @@ to accomplish this. ### Project Management - Ant 1.10.7 - Gradle 8.5 -- Lerna 8.0.1 +- Lerna 8.0.2 - Maven 3.8.8 - Sbt 1.9.8 @@ -75,14 +77,14 @@ to accomplish this. - Bicep 0.24.24 - Buildah 1.22.3 - CMake 3.28.1 -- CodeQL Action Bundle 2.15.4 +- CodeQL Action Bundle 2.15.5 - Docker Amazon ECR Credential Helper 0.7.1 - Docker Compose v1 1.29.2 - Docker Compose v2 2.23.3 - Docker-Buildx 0.11.2 - Docker Client 24.0.7 - Docker Server 24.0.7 -- Fastlane 2.217.0 +- Fastlane 2.219.0 - Git 2.43.0 - Git LFS 3.4.1 - Git-ftp 1.6.0 @@ -98,14 +100,14 @@ to accomplish this. - Mercurial 5.3.1 - Minikube 1.32.0 - n 9.2.0 -- Newman 6.0.0 +- Newman 6.1.0 - nvm 0.39.7 - OpenSSL 1.1.1f-1ubuntu2.20 - Packer 1.10.0 -- Parcel 2.10.3 +- Parcel 2.11.0 - PhantomJS 2.1.1 2.1.1 - Podman 3.4.2 -- Pulumi 3.97.0 +- Pulumi 3.100.0 - R 4.3.2 - Skopeo 1.5.0 - Sphinx Open Source Search Server 2.2.11 @@ -117,17 +119,17 @@ to accomplish this. ### CLI Tools - Alibaba Cloud CLI 3.0.174 -- AWS CLI 2.15.2 +- AWS CLI 2.15.8 - AWS CLI Session Manager Plugin 1.2.536.0 -- AWS SAM CLI 1.105.0 +- AWS SAM CLI 1.106.0 - Azure CLI 2.55.0 - Azure CLI (azure-devops) 0.26.0 - GitHub CLI 2.40.1 -- Google Cloud CLI 457.0.0 -- Netlify CLI 17.10.1 -- OpenShift CLI 4.14.6 +- Google Cloud CLI 458.0.1 +- Netlify CLI 17.11.1 +- OpenShift CLI 4.14.7 - ORAS CLI 1.1.0 -- Vercel CLI 32.7.2 +- Vercel CLI 33.0.2 ### Java | Version | Environment Variable | @@ -138,7 +140,7 @@ to accomplish this. | 21.0.1+12 | JAVA_HOME_21_X64 | ### PHP Tools -- PHP: 7.4.33, 8.0.30, 8.1.26, 8.2.13, 8.3.0 +- PHP: 7.4.33, 8.0.30, 8.1.27, 8.2.14, 8.3.1 - Composer 2.6.6 - PHPUnit 8.5.36 ``` @@ -146,34 +148,34 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ``` ### Haskell Tools -- Cabal 3.10.2.0 +- Cabal 3.10.2.1 - GHC 9.8.1 - GHCup 0.1.20.0 - Stack 2.13.1 ### Rust Tools -- Cargo 1.74.1 -- Rust 1.74.1 -- Rustdoc 1.74.1 +- Cargo 1.75.0 +- Rust 1.75.0 +- Rustdoc 1.75.0 - Rustup 1.26.0 #### Packages - Bindgen 0.69.1 - Cargo audit 0.18.3 -- Cargo clippy 0.1.74 +- Cargo clippy 0.1.75 - Cargo outdated 0.14.0 - Cbindgen 0.26.0 -- Rustfmt 1.6.0 +- Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 120.0.6099.109 -- ChromeDriver 120.0.6099.71 +- Google Chrome 120.0.6099.199 +- ChromeDriver 120.0.6099.109 - Chromium 120.0.6099.0 -- Microsoft Edge 120.0.2210.77 -- Microsoft Edge WebDriver 120.0.2210.77 -- Selenium server 4.16.0 +- Microsoft Edge 120.0.2210.121 +- Microsoft Edge WebDriver 120.0.2210.121 +- Selenium server 4.16.1 - Mozilla Firefox 121.0 -- Geckodriver 0.33.0 +- Geckodriver 0.34.0 #### Environment variables | Name | Value | @@ -233,12 +235,12 @@ Use the following command as a part of your job to start the service: 'sudo syst - 3.12.1 #### PyPy -- 2.7.18 [PyPy 7.3.13] +- 2.7.18 [PyPy 7.3.14] - 3.6.12 [PyPy 7.3.3] - 3.7.13 [PyPy 7.3.9] - 3.8.16 [PyPy 7.3.11] -- 3.9.18 [PyPy 7.3.13] -- 3.10.13 [PyPy 7.3.13] +- 3.9.18 [PyPy 7.3.14] +- 3.10.13 [PyPy 7.3.14] #### Ruby - 2.5.9 @@ -266,19 +268,16 @@ Use the following command as a part of your job to start the service: 'sudo syst | nginx | 1.18.0 | /etc/nginx/nginx.conf | inactive | 80 | ### Android -| Package Name | Version | -| -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 9.0 | -| Android Emulator | 33.1.23 | -| Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | -| Android SDK Platform-Tools | 34.0.5 | -| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 2)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | -| Android SDK Tools | 26.1.1 | -| Android Support Repository | 47.0.0 | -| CMake | 3.10.2<br>3.18.1<br>3.22.1 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 24.0.8215888<br>25.2.9519653 (default)<br>26.1.10909125 | +| Package Name | Version | +| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 9.0 | +| Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0 | +| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 2)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1) | +| Android Support Repository | 47.0.0 | +| CMake | 3.10.2<br>3.18.1<br>3.22.1 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 24.0.8215888<br>25.2.9519653 (default)<br>26.1.10909125 | #### Environment variables | Name | Value | @@ -291,25 +290,22 @@ Use the following command as a part of your job to start the service: 'sudo syst | ANDROID_SDK_ROOT | /usr/local/lib/android/sdk | ### Cached Docker images -| Repository:Tag | Digest | Created | -| ----------------------- | ------------------------------------------------------------------------ | ---------- | -| alpine:3.16 | sha256:e4cdb7d47b06ba0a062ad2a97a7d154967c8f83934594d9f2bd3efa89292996b | 2023-11-30 | -| alpine:3.17 | sha256:6e94b5cda2d6fd57d85abf81e81dabaea97a5885f919da676cc19d3551da4061 | 2023-11-30 | -| alpine:3.18 | sha256:34871e7290500828b39e22294660bee86d966bc0017544e848dd9a255cdf59e0 | 2023-11-30 | -| buildpack-deps:bullseye | sha256:257cbe4fba66709d5a536dd5ac13b22411d469eaf61f421f5c2b871f2290e25c | 2023-11-21 | -| buildpack-deps:buster | sha256:77c7243f791521c7bf816e786ef46956eabb0c8e73c8479141ba5e92c05497a7 | 2023-11-21 | -| buildpack-deps:stretch | sha256:78e995165a5788c2f55aed6e548d8f6c1534830d4310c870408fccb2da8c5b2e | 2022-06-23 | -| debian:10 | sha256:46ca02d33c65ab188d6e56f26c323bf1aa9a99074f2f54176fdc3884304f58b8 | 2023-11-21 | -| debian:11 | sha256:ab2b95aa8d7d6d54866b92c322cf0693933c1ae8038652f24ddfda1d1763a45a | 2023-11-21 | -| debian:9 | sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be | 2022-06-23 | -| moby/buildkit:latest | sha256:5a8f30813a104b86e927ff4695a746f74a5bb921c7be1dbcca6d754dfbe04822 | 2023-12-01 | -| node:16 | sha256:f77a1aef2da8d83e45ec990f45df50f1a286c5fe8bbfb8c6e4246c6389705c0b | 2023-09-07 | -| node:16-alpine | sha256:a1f9d027912b58a7c75be7716c97cfbc6d3099f3a97ed84aa490be9dee20e787 | 2023-08-10 | -| node:18 | sha256:7a4282663db6f22326c03618eef4320fa3cf70c5c3715546f9779858dc0ed3fd | 2023-12-02 | -| node:18-alpine | sha256:b1a0356f7d6b86c958a06949d3db3f7fb27f95f627aa6157cb98bc65c801efa2 | 2023-12-11 | -| node:20 | sha256:445acd9b2ef7e9de665424053bf95652e0b8995ef36500557d48faf29300170a | 2023-11-23 | -| node:20-alpine | sha256:9e38d3d4117da74a643f67041c83914480b335c3bd44d37ccf5b5ad86cd715d1 | 2023-12-11 | -| ubuntu:20.04 | sha256:f2034e7195f61334e6caff6ecf2e965f92d11e888309065da85ff50c617732b8 | 2023-12-13 | +| Repository:Tag | Digest | Created | +| -------------------- | ------------------------------------------------------------------------ | ---------- | +| alpine:3.16 | sha256:e4cdb7d47b06ba0a062ad2a97a7d154967c8f83934594d9f2bd3efa89292996b | 2023-11-30 | +| alpine:3.17 | sha256:6e94b5cda2d6fd57d85abf81e81dabaea97a5885f919da676cc19d3551da4061 | 2023-11-30 | +| alpine:3.18 | sha256:34871e7290500828b39e22294660bee86d966bc0017544e848dd9a255cdf59e0 | 2023-11-30 | +| debian:10 | sha256:cd3bbe339eeb538f4a1a6b04e290690658c119cd50b73677d29b80e3cda8f1dd | 2023-12-19 | +| debian:11 | sha256:71f0e09d55a4042ddee1f114a0838d99266e185bf33e71f15c15bf6b9545a9a0 | 2023-12-19 | +| debian:9 | sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be | 2022-06-23 | +| moby/buildkit:latest | sha256:5a8f30813a104b86e927ff4695a746f74a5bb921c7be1dbcca6d754dfbe04822 | 2023-12-01 | +| node:16 | sha256:f77a1aef2da8d83e45ec990f45df50f1a286c5fe8bbfb8c6e4246c6389705c0b | 2023-09-07 | +| node:16-alpine | sha256:a1f9d027912b58a7c75be7716c97cfbc6d3099f3a97ed84aa490be9dee20e787 | 2023-08-10 | +| node:18 | sha256:f152130c9bb77afd49873a26fcfb6da7971b451ae6db51901fb7e028ccc0ca75 | 2023-12-19 | +| node:18-alpine | sha256:b1a0356f7d6b86c958a06949d3db3f7fb27f95f627aa6157cb98bc65c801efa2 | 2023-12-11 | +| node:20 | sha256:8d0f16fe841577f9317ab49011c6d819e1fa81f8d4af7ece7ae0ac815e07ac84 | 2023-12-19 | +| node:20-alpine | sha256:9e38d3d4117da74a643f67041c83914480b335c3bd44d37ccf5b5ad86cd715d1 | 2023-12-11 | +| ubuntu:20.04 | sha256:f2034e7195f61334e6caff6ecf2e965f92d11e888309065da85ff50c617732b8 | 2023-12-13 | ### Installed apt packages | Name | Version | @@ -355,7 +351,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | libmagickcore-dev | 8:6.9.10.23+dfsg-2.1ubuntu11.9 | | libmagickwand-dev | 8:6.9.10.23+dfsg-2.1ubuntu11.9 | | libsecret-1-dev | 0.20.4-0ubuntu1 | -| libsqlite3-dev | 3.31.1-4ubuntu0.5 | +| libsqlite3-dev | 3.31.1-4ubuntu0.6 | | libtool | 2.4.6-14 | | libunwind8 | 1.2.1-9ubuntu0.1 | | libxkbfile-dev | 1:1.1.0-1 | @@ -368,7 +364,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | mercurial | 5.3.1-1ubuntu1 | | net-tools | 1.60+git20180626.aebd88e-1ubuntu1 | | netcat | 1.206-1ubuntu1 | -| openssh-client | 1:8.2p1-4ubuntu0.9 | +| openssh-client | 1:8.2p1-4ubuntu0.11 | | p7zip-full | 16.02+dfsg-7build1 | | p7zip-rar | 16.02-3build1 | | parallel | 20161222-1.1 | @@ -382,8 +378,8 @@ Use the following command as a part of your job to start the service: 'sudo syst | rsync | 3.1.3-8ubuntu0.7 | | shellcheck | 0.7.0-2build2 | | sphinxsearch | 2.2.11-2ubuntu2 | -| sqlite3 | 3.31.1-4ubuntu0.5 | -| ssh | 1:8.2p1-4ubuntu0.9 | +| sqlite3 | 3.31.1-4ubuntu0.6 | +| ssh | 1:8.2p1-4ubuntu0.11 | | sshpass | 1.06-1 | | subversion | 1.13.0-3ubuntu0.2 | | sudo | 1.8.31-1ubuntu1.5 | From 10ddf030ed5f9874dafecc54c55a69fd721948de Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 10 Jan 2024 12:28:32 +0000 Subject: [PATCH 2583/3485] Updating readme file for win19 version 20240108.2.1 (#9135) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/windows/Windows2019-Readme.md | 92 ++++++++++++++-------------- 1 file changed, 46 insertions(+), 46 deletions(-) diff --git a/images/windows/Windows2019-Readme.md b/images/windows/Windows2019-Readme.md index 0dadc58a4712..604838a72bad 100644 --- a/images/windows/Windows2019-Readme.md +++ b/images/windows/Windows2019-Readme.md @@ -1,11 +1,12 @@ | Announcements | |-| +| [[All OSes] Powershell Core will be updated to 7.4.x LTS on January, 28](https://github.com/actions/runner-images/issues/9115) | | [Old versions of Android SDK & tools will be removed from images on January, 8](https://github.com/actions/runner-images/issues/8952) | | [Major Refactoring of GitHub Actions Runner Images Repository](https://github.com/actions/runner-images/issues/8706) | *** # Windows Server 2019 - OS Version: 10.0.17763 Build 5206 -- Image Version: 20231217.2.0 +- Image Version: 20240108.2.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -15,12 +16,12 @@ ### Language and Runtime - Bash 5.2.21(1)-release - Go 1.20.12 -- Julia 1.9.4 -- Kotlin 1.9.21 +- Julia 1.10.0 +- Kotlin 1.9.22 - LLVM 16.0.6 - Node 18.18.2 - Perl 5.32.1 -- PHP 8.2.13 +- PHP 8.2.14 - Python 3.7.9 - Ruby 2.5.9p229 @@ -28,13 +29,13 @@ - Chocolatey 2.2.2 - Composer 2.6.6 - Helm 3.13.2 -- Miniconda 23.10.0 (pre-installed on the image but not added to PATH) +- Miniconda 23.11.0 (pre-installed on the image but not added to PATH) - NPM 9.8.1 - NuGet 6.8.0.131 - pip 23.3.2 (python 3.7) - Pipx 1.2.1 - RubyGems 2.7.6.3 -- Vcpkg (build from commit 0e47c1985) +- Vcpkg (build from commit ce46ba877) - Yarn 1.22.21 #### Environment variables @@ -52,13 +53,13 @@ ### Tools - 7zip 23.01 - aria2 1.37.0 -- azcopy 10.21.1 +- azcopy 10.22.1 - Bazel 7.0.0 - Bazelisk 1.19.0 - Bicep 0.24.24 -- Cabal 3.10.2.0 +- Cabal 3.10.2.1 - CMake 3.27.9 -- CodeQL Action Bundle 2.15.4 +- CodeQL Action Bundle 2.15.5 - Docker 24.0.7 - Docker Compose v1 1.29.2 - Docker Compose v2 2.23.3 @@ -66,8 +67,8 @@ - ghc 9.8.1 - Git 2.43.0.windows.1 - Git LFS 3.4.0 -- Google Cloud CLI 457.0.0 -- ImageMagick 7.1.1-23 +- Google Cloud CLI 458.0.1 +- ImageMagick 7.1.1-25 - InnoSetup 6.2.2 - jq 1.7-dirty - Kind 0.20.0 @@ -76,12 +77,12 @@ - gcc 8.1.0 - gdb 8.1 - GNU Binutils 2.30 -- Newman 6.0.0 +- Newman 6.1.0 - NSIS 3.09 - OpenSSL 1.1.1w - Packer 1.10.0 -- Parcel 2.10.3 -- Pulumi 3.97.0 +- Parcel 2.11.0 +- Pulumi 3.100.0 - R 4.3.2 - Service Fabric SDK 9.1.1436.9590 - Stack 2.13.1 @@ -94,19 +95,19 @@ - zstd 1.5.5 ### CLI Tools -- Alibaba Cloud CLI 3.0.189 -- AWS CLI 2.15.2 -- AWS SAM CLI 1.105.0 +- Alibaba Cloud CLI 3.0.196 +- AWS CLI 2.15.8 +- AWS SAM CLI 1.106.0 - AWS Session Manager CLI 1.2.536.0 - Azure CLI 2.55.0 - Azure DevOps CLI extension 0.26.0 - Cloud Foundry CLI 6.53.0 -- GitHub CLI 2.40.1 +- GitHub CLI 2.41.0 ### Rust Tools -- Cargo 1.74.1 -- Rust 1.74.1 -- Rustdoc 1.74.1 +- Cargo 1.75.0 +- Rust 1.75.0 +- Rustdoc 1.75.0 - Rustup 1.26.0 #### Packages @@ -114,16 +115,16 @@ - cargo-audit 0.18.3 - cargo-outdated 0.14.0 - cbindgen 0.26.0 -- Clippy 0.1.74 -- Rustfmt 1.6.0 +- Clippy 0.1.75 +- Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 120.0.6099.110 -- Chrome Driver 120.0.6099.71 -- Microsoft Edge 120.0.2210.77 -- Microsoft Edge Driver 120.0.2210.77 -- Mozilla Firefox 120.0.1 -- Gecko Driver 0.33.0 +- Google Chrome 120.0.6099.200 +- Chrome Driver 120.0.6099.109 +- Microsoft Edge 120.0.2210.121 +- Microsoft Edge Driver 120.0.2210.121 +- Mozilla Firefox 121.0 +- Gecko Driver 0.34.0 - IE Driver 4.14.0.0 - Selenium server 4.16.0 @@ -184,12 +185,12 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 3.12.1 #### PyPy -- 2.7.18 [PyPy 7.3.13] +- 2.7.18 [PyPy 7.3.14] - 3.6.12 [PyPy 7.3.3] - 3.7.13 [PyPy 7.3.9] - 3.8.16 [PyPy 7.3.11] -- 3.9.18 [PyPy 7.3.13] -- 3.10.13 [PyPy 7.3.13] +- 3.9.18 [PyPy 7.3.14] +- 3.10.13 [PyPy 7.3.14] #### Ruby - 2.5.9 @@ -513,7 +514,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Az (Cached): 1.0.0.zip, 1.6.0.zip, 2.3.2.zip, 2.6.0.zip, 3.1.0.zip, 3.5.0.zip, 3.8.0.zip, 4.3.0.zip, 4.4.0.zip, 4.7.0.zip, 5.5.0.zip, 5.9.0.zip, 6.6.0.zip, 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.477 +- AWSPowershell: 4.1.489 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 - Microsoft.Graph: 2.11.1 @@ -530,19 +531,18 @@ All other versions are saved but not installed. ``` ### Android -| Package Name | Version | -| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 8.0 | -| Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3<br>26.0.0 26.0.1 26.0.2 26.0.3<br>25.0.0 25.0.1 25.0.2 25.0.3<br>24.0.0 24.0.1 24.0.2 24.0.3<br>23.0.1 23.0.2 23.0.3<br>22.0.1<br>21.1.2<br>20.0.0<br>19.1.0 | -| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 2)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3)<br>android-26 (rev 2)<br>android-25 (rev 3)<br>android-24 (rev 2)<br>android-23 (rev 3)<br>android-22 (rev 2)<br>android-21 (rev 2)<br>android-20 (rev 2)<br>android-19 (rev 4) | -| Android SDK Platform-Tools | 34.0.5 | -| Android SDK Tools | 26.1.1 | -| Android Support Repository | 47.0.0 | -| CMake | 3.10.2<br>3.18.1<br>3.22.1 | -| Google APIs | addon-google_apis-google-21<br>addon-google_apis-google-22<br>addon-google_apis-google-23<br>addon-google_apis-google-24 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 24.0.8215888<br>25.2.9519653<br>26.1.10909125 | +| Package Name | Version | +| -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 8.0 | +| Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.2 | +| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 2)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3) | +| Android SDK Platform-Tools | 34.0.5 | +| Android Support Repository | 47.0.0 | +| CMake | 3.10.2<br>3.18.1<br>3.22.1 | +| Google APIs | addon-google_apis-google-21<br>addon-google_apis-google-22<br>addon-google_apis-google-23<br>addon-google_apis-google-24 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 24.0.8215888<br>25.2.9519653<br>26.1.10909125 | #### Environment variables | Name | Value | From a89e382279a91339e9afe0d7477a8bb1f087670f Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Wed, 10 Jan 2024 13:59:08 +0100 Subject: [PATCH 2584/3485] [ubuntu] Fix pwsh installation for ubuntu-minimal (#9144) --- images/ubuntu/templates/ubuntu-minimal.pkr.hcl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/ubuntu/templates/ubuntu-minimal.pkr.hcl b/images/ubuntu/templates/ubuntu-minimal.pkr.hcl index b2c76ac34815..dc472575deff 100644 --- a/images/ubuntu/templates/ubuntu-minimal.pkr.hcl +++ b/images/ubuntu/templates/ubuntu-minimal.pkr.hcl @@ -241,7 +241,7 @@ build { } provisioner "shell" { - environment_vars = ["DEBIAN_FRONTEND=noninteractive", "HELPER_SCRIPTS=${local.helper_script_folder}"] + environment_vars = ["DEBIAN_FRONTEND=noninteractive", "HELPER_SCRIPTS=${local.helper_script_folder}", "INSTALLER_SCRIPT_FOLDER=${local.installer_script_folder}"] execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" scripts = ["${path.root}/../scripts/build/install-powershell.sh"] } From d5d2dd7704b2ae7c3858489fb8b204692bd7fa7d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 11 Jan 2024 06:24:59 +0000 Subject: [PATCH 2585/3485] Updating readme file for macos-13-arm64 version 20240107.1 (#9126) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-13-arm64-Readme.md | 113 ++++++++++++++------------ 1 file changed, 59 insertions(+), 54 deletions(-) diff --git a/images/macos/macos-13-arm64-Readme.md b/images/macos/macos-13-arm64-Readme.md index 06872db3b4e1..a2e8ac316006 100644 --- a/images/macos/macos-13-arm64-Readme.md +++ b/images/macos/macos-13-arm64-Readme.md @@ -1,12 +1,13 @@ | Announcements | |-| +| [[All OSes] Powershell Core will be updated to 7.4.x LTS on January, 28](https://github.com/actions/runner-images/issues/9115) | | [Old versions of Android SDK & tools will be removed from images on January, 8](https://github.com/actions/runner-images/issues/8952) | | [Major Refactoring of GitHub Actions Runner Images Repository](https://github.com/actions/runner-images/issues/8706) | *** # macOS 13 - OS Version: macOS 13.6.3 (22G436) - Kernel Version: Darwin 22.6.0 -- Image Version: 20231218.3 +- Image Version: 20240107.1 ## Installed Software @@ -21,8 +22,8 @@ - GNU Fortran 11 (Homebrew GCC 11.4.0) - available by `gfortran-11` alias - GNU Fortran 12 (Homebrew GCC 12.3.0) - available by `gfortran-12` alias - GNU Fortran 13 (Homebrew GCC 13.2.0) - available by `gfortran-13` alias -- Julia 1.9.4 -- Kotlin 1.9.21-release-633 +- Julia 1.10.0 +- Kotlin 1.9.22-release-704 - Mono 6.12.0.188 - Node.js 18.19.0 - Perl 5.38.2 @@ -30,13 +31,13 @@ - Ruby 3.0.6p216 ### Package Management -- Bundler 2.5.1 +- Bundler 2.5.4 - Carthage 0.39.1 - CocoaPods 1.14.3 -- Homebrew 4.1.25 +- Homebrew 4.2.2 - NPM 10.2.3 - NuGet 6.3.1.1 -- RubyGems 3.5.1 +- RubyGems 3.5.4 - Yarn 1.22.19 ### Project Management @@ -66,29 +67,29 @@ - zstd 1.5.5 ### Tools -- AWS CLI 2.15.2 -- AWS SAM CLI 1.105.0 +- AWS CLI 2.15.8 +- AWS SAM CLI 1.106.0 - AWS Session Manager CLI 1.2.536.0 - Azure CLI 2.55.0 - Azure CLI (azure-devops) 0.26.0 - Bicep CLI 0.24.24 - Cmake 3.28.1 -- CodeQL Action Bundle 2.15.4 -- Fastlane 2.217.0 +- CodeQL Action Bundle 2.15.5 +- Fastlane 2.219.0 - SwiftFormat 0.52.11 -- Xcbeautify 1.1.1 +- Xcbeautify 1.3.0 - Xcode Command Line Tools 15.1.0.0.1.1700200546 - Xcodes 1.4.1 ### Linters ### Browsers -- Safari 17.2 (18617.1.17.11.11) -- SafariDriver 17.2 (18617.1.17.11.11) -- Google Chrome 120.0.6099.109 -- Google Chrome for Testing 120.0.6099.71 -- ChromeDriver 120.0.6099.71 -- Selenium server 4.15.0 +- Safari 17.2.1 (18617.1.17.11.12) +- SafariDriver 17.2.1 (18617.1.17.11.12) +- Google Chrome 120.0.6099.199 +- Google Chrome for Testing 120.0.6099.109 +- ChromeDriver 120.0.6099.109 +- Selenium server 4.16.1 #### Environment variables | Name | Value | @@ -121,14 +122,14 @@ - 1.21.5 ### Rust Tools -- Cargo 1.74.1 -- Rust 1.74.1 -- Rustdoc 1.74.1 +- Cargo 1.75.0 +- Rust 1.75.0 +- Rustdoc 1.75.0 - Rustup 1.26.0 #### Packages -- Clippy 0.1.74 -- Rustfmt 1.6.0-stable +- Clippy 0.1.75 +- Rustfmt 1.7.0-stable ### PowerShell Tools - PowerShell 7.2.17 @@ -139,13 +140,14 @@ - PSScriptAnalyzer: 1.21.0 ### Xcode -| Version | Build | Path | -| ---------------- | ------- | ------------------------------ | -| 15.1 | 15C65 | /Applications/Xcode_15.1.app | -| 15.0.1 | 15A507 | /Applications/Xcode_15.0.1.app | -| 14.3.1 (default) | 14E300c | /Applications/Xcode_14.3.1.app | -| 14.2 | 14C18 | /Applications/Xcode_14.2.app | -| 14.1 | 14B47b | /Applications/Xcode_14.1.app | +| Version | Build | Path | +| ---------------- | -------- | ------------------------------ | +| 15.2 (beta) | 15C5500c | /Applications/Xcode_15.2.app | +| 15.1 | 15C65 | /Applications/Xcode_15.1.app | +| 15.0.1 | 15A507 | /Applications/Xcode_15.0.1.app | +| 14.3.1 (default) | 14E300c | /Applications/Xcode_14.3.1.app | +| 14.2 | 14C18 | /Applications/Xcode_14.2.app | +| 14.1 | 14B47b | /Applications/Xcode_14.1.app | #### Xcode Support Tools - xcpretty 0.3.0 @@ -157,64 +159,67 @@ | macOS 13.1 | macosx13.1 | 14.2 | | macOS 13.3 | macosx13.3 | 14.3.1 | | macOS 14.0 | macosx14.0 | 15.0.1 | -| macOS 14.2 | macosx14.2 | 15.1 | +| macOS 14.2 | macosx14.2 | 15.1, 15.2 | | iOS 16.1 | iphoneos16.1 | 14.1 | | iOS 16.2 | iphoneos16.2 | 14.2 | | iOS 16.4 | iphoneos16.4 | 14.3.1 | | iOS 17.0 | iphoneos17.0 | 15.0.1 | -| iOS 17.2 | iphoneos17.2 | 15.1 | +| iOS 17.2 | iphoneos17.2 | 15.1, 15.2 | | Simulator - iOS 16.1 | iphonesimulator16.1 | 14.1 | | Simulator - iOS 16.2 | iphonesimulator16.2 | 14.2 | | Simulator - iOS 16.4 | iphonesimulator16.4 | 14.3.1 | | Simulator - iOS 17.0 | iphonesimulator17.0 | 15.0.1 | -| Simulator - iOS 17.2 | iphonesimulator17.2 | 15.1 | +| Simulator - iOS 17.2 | iphonesimulator17.2 | 15.1, 15.2 | | tvOS 16.1 | appletvos16.1 | 14.1, 14.2 | | tvOS 16.4 | appletvos16.4 | 14.3.1 | | tvOS 17.0 | appletvos17.0 | 15.0.1 | -| tvOS 17.2 | appletvos17.2 | 15.1 | +| tvOS 17.2 | appletvos17.2 | 15.1, 15.2 | | Simulator - tvOS 16.1 | appletvsimulator16.1 | 14.1, 14.2 | | Simulator - tvOS 16.4 | appletvsimulator16.4 | 14.3.1 | | Simulator - tvOS 17.0 | appletvsimulator17.0 | 15.0.1 | -| Simulator - tvOS 17.2 | appletvsimulator17.2 | 15.1 | +| Simulator - tvOS 17.2 | appletvsimulator17.2 | 15.1, 15.2 | | watchOS 9.1 | watchos9.1 | 14.1, 14.2 | | watchOS 9.4 | watchos9.4 | 14.3.1 | | watchOS 10.0 | watchos10.0 | 15.0.1 | -| watchOS 10.2 | watchos10.2 | 15.1 | +| watchOS 10.2 | watchos10.2 | 15.1, 15.2 | | Simulator - watchOS 9.1 | watchsimulator9.1 | 14.1, 14.2 | | Simulator - watchOS 9.4 | watchsimulator9.4 | 14.3.1 | | Simulator - watchOS 10.0 | watchsimulator10.0 | 15.0.1 | -| Simulator - watchOS 10.2 | watchsimulator10.2 | 15.1 | +| Simulator - watchOS 10.2 | watchsimulator10.2 | 15.1, 15.2 | +| Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | +| visionOS 1.0 | xros1.0 | 15.2 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | -| Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | +| Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | DriverKit 22.1 | driverkit22.1 | 14.1 | | DriverKit 22.2 | driverkit22.2 | 14.2 | | DriverKit 22.4 | driverkit22.4 | 14.3.1 | | DriverKit 23.0 | driverkit23.0 | 15.0.1 | -| DriverKit 23.2 | driverkit23.2 | 15.1 | +| DriverKit 23.2 | driverkit23.2 | 15.1, 15.2 | #### Installed Simulators -| OS | Xcode Version | Simulators | -| ------------ | ---------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| iOS 16.1 | 14.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 16.2 | 14.2 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 16.4 | 14.3.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 17.0 | 14.1<br>14.2<br>14.3.1<br>15.0.1<br>15.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 17.2 | 14.1<br>14.2<br>14.3.1<br>15.0.1<br>15.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| tvOS 16.1 | 14.1<br>14.2<br>14.3.1<br>15.0.1<br>15.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 16.4 | 14.1<br>14.2<br>14.3.1<br>15.0.1<br>15.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 17.0 | 14.1<br>14.2<br>14.3.1<br>15.0.1<br>15.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 17.2 | 14.1<br>14.2<br>14.3.1<br>15.0.1<br>15.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| watchOS 9.1 | 14.1<br>14.2<br>14.3.1<br>15.0.1<br>15.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | -| watchOS 9.4 | 14.1<br>14.2<br>14.3.1<br>15.0.1<br>15.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | -| watchOS 10.0 | 14.1<br>14.2<br>14.3.1<br>15.0.1<br>15.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | -| watchOS 10.2 | 14.1<br>14.2<br>14.3.1<br>15.0.1<br>15.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | +| OS | Xcode Version | Simulators | +| ------------ | ------------------------------------------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| iOS 16.1 | 14.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 16.2 | 14.2 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 16.4 | 14.3.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 17.0 | 14.1<br>14.2<br>14.3.1<br>15.0.1<br>15.1<br>15.2 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 17.2 | 14.1<br>14.2<br>14.3.1<br>15.0.1<br>15.1<br>15.2 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| tvOS 16.1 | 14.1<br>14.2<br>14.3.1<br>15.0.1<br>15.1<br>15.2 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 16.4 | 14.1<br>14.2<br>14.3.1<br>15.0.1<br>15.1<br>15.2 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 17.0 | 14.1<br>14.2<br>14.3.1<br>15.0.1<br>15.1<br>15.2 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 17.2 | 14.1<br>14.2<br>14.3.1<br>15.0.1<br>15.1<br>15.2 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| watchOS 9.1 | 14.1<br>14.2<br>14.3.1<br>15.0.1<br>15.1<br>15.2 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | +| watchOS 9.4 | 14.1<br>14.2<br>14.3.1<br>15.0.1<br>15.1<br>15.2 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | +| watchOS 10.0 | 14.1<br>14.2<br>14.3.1<br>15.0.1<br>15.1<br>15.2 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 10.2 | 14.1<br>14.2<br>14.3.1<br>15.0.1<br>15.1<br>15.2 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | +| visionOS 1.0 | 14.1<br>14.2<br>14.3.1<br>15.0.1<br>15.1<br>15.2 | Apple Vision Pro | ### Android | Package Name | Version | | -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 11.0 | -| Android Emulator | 33.1.23 | +| Android Emulator | 33.1.24 | | Android SDK Build-tools | 34.0.0<br>33.0.2 | | Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 2)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | | Android SDK Platform-Tools | 34.0.5 | From b4635a0ab9f5f1296b812378a32cf9a392f14f91 Mon Sep 17 00:00:00 2001 From: sergei-pyshnoi <121864472+sergei-pyshnoi@users.noreply.github.com> Date: Thu, 11 Jan 2024 10:55:56 +0100 Subject: [PATCH 2586/3485] [windows] fix signature for vs and dacfx (#9143) --- images/windows/scripts/build/Install-DACFx.ps1 | 2 +- images/windows/toolsets/toolset-2019.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/images/windows/scripts/build/Install-DACFx.ps1 b/images/windows/scripts/build/Install-DACFx.ps1 index 2fcb1037ecb9..80a70fecb596 100644 --- a/images/windows/scripts/build/Install-DACFx.ps1 +++ b/images/windows/scripts/build/Install-DACFx.ps1 @@ -5,6 +5,6 @@ Install-Binary -Type MSI ` -Url 'https://aka.ms/dacfx-msi' ` - -ExpectedSignature '72105B6D5F370B62FD5C82F1512F7AD7DEE5F2C0' + -ExpectedSignature 'C2048FB509F1C37A8C3E9EC6648118458AA01780' Invoke-PesterTests -TestFile "Tools" -TestName "DACFx" diff --git a/images/windows/toolsets/toolset-2019.json b/images/windows/toolsets/toolset-2019.json index 00fb1a37d8aa..b4ecc5fd6549 100644 --- a/images/windows/toolsets/toolset-2019.json +++ b/images/windows/toolsets/toolset-2019.json @@ -266,7 +266,7 @@ "subversion" : "16", "edition" : "Enterprise", "channel": "release", - "signature": "72105B6D5F370B62FD5C82F1512F7AD7DEE5F2C0", + "signature": "6E78B3DCE2998F6C2457C3E54DA90A01034916AE", "workloads": [ "Component.Dotfuscator", "Component.Linux.CMake", From 17d0f979abf29d4a69b45b33d6ed6670da5e3d86 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 11 Jan 2024 12:15:27 +0100 Subject: [PATCH 2587/3485] Updating readme file for win22 version 20240108.1.1 (#9137) --- images/windows/Windows2022-Readme.md | 87 ++++++++++++++-------------- 1 file changed, 44 insertions(+), 43 deletions(-) diff --git a/images/windows/Windows2022-Readme.md b/images/windows/Windows2022-Readme.md index c3db18b2d2bd..8b4e4c172d1e 100644 --- a/images/windows/Windows2022-Readme.md +++ b/images/windows/Windows2022-Readme.md @@ -1,11 +1,12 @@ | Announcements | |-| +| [[All OSes] Powershell Core will be updated to 7.4.x LTS on January, 28](https://github.com/actions/runner-images/issues/9115) | | [Old versions of Android SDK & tools will be removed from images on January, 8](https://github.com/actions/runner-images/issues/8952) | | [Major Refactoring of GitHub Actions Runner Images Repository](https://github.com/actions/runner-images/issues/8706) | *** # Windows Server 2022 - OS Version: 10.0.20348 Build 2159 -- Image Version: 20231217.2.0 +- Image Version: 20240108.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -15,12 +16,12 @@ ### Language and Runtime - Bash 5.2.21(1)-release - Go 1.20.12 -- Julia 1.9.4 -- Kotlin 1.9.21 +- Julia 1.10.0 +- Kotlin 1.9.22 - LLVM 16.0.6 - Node 18.18.2 - Perl 5.32.1 -- PHP 8.2.13 +- PHP 8.2.14 - Python 3.9.13 - Ruby 3.0.6p216 @@ -28,13 +29,13 @@ - Chocolatey 2.2.2 - Composer 2.6.6 - Helm 3.13.2 -- Miniconda 23.10.0 (pre-installed on the image but not added to PATH) +- Miniconda 23.11.0 (pre-installed on the image but not added to PATH) - NPM 9.8.1 - NuGet 6.8.0.131 - pip 23.3.2 (python 3.9) -- Pipx 1.3.3 +- Pipx 1.4.1 - RubyGems 3.2.33 -- Vcpkg (build from commit 0e47c1985) +- Vcpkg (build from commit ce46ba877) - Yarn 1.22.21 #### Environment variables @@ -52,13 +53,13 @@ ### Tools - 7zip 23.01 - aria2 1.37.0 -- azcopy 10.21.1 +- azcopy 10.22.1 - Bazel 7.0.0 - Bazelisk 1.19.0 - Bicep 0.24.24 -- Cabal 3.10.2.0 +- Cabal 3.10.2.1 - CMake 3.27.9 -- CodeQL Action Bundle 2.15.4 +- CodeQL Action Bundle 2.15.5 - Docker 24.0.7 - Docker Compose v1 1.29.2 - Docker Compose v2 2.23.3 @@ -66,7 +67,7 @@ - ghc 9.8.1 - Git 2.43.0.windows.1 - Git LFS 3.4.0 -- ImageMagick 7.1.1-23 +- ImageMagick 7.1.1-25 - InnoSetup 6.2.2 - jq 1.7-dirty - Kind 0.20.0 @@ -75,11 +76,11 @@ - gcc 12.2.0 - gdb 11.2 - GNU Binutils 2.39 -- Newman 6.0.0 +- Newman 6.1.0 - NSIS 3.09 - OpenSSL 1.1.1w - Packer 1.10.0 -- Pulumi 3.97.0 +- Pulumi 3.100.0 - R 4.3.2 - Service Fabric SDK 9.1.1436.9590 - Stack 2.13.1 @@ -92,18 +93,18 @@ - zstd 1.5.5 ### CLI Tools -- Alibaba Cloud CLI 3.0.189 -- AWS CLI 2.15.2 -- AWS SAM CLI 1.105.0 +- Alibaba Cloud CLI 3.0.196 +- AWS CLI 2.15.8 +- AWS SAM CLI 1.106.0 - AWS Session Manager CLI 1.2.536.0 - Azure CLI 2.55.0 - Azure DevOps CLI extension 0.26.0 - GitHub CLI 2.40.1 ### Rust Tools -- Cargo 1.74.1 -- Rust 1.74.1 -- Rustdoc 1.74.1 +- Cargo 1.75.0 +- Rust 1.75.0 +- Rustdoc 1.75.0 - Rustup 1.26.0 #### Packages @@ -111,16 +112,16 @@ - cargo-audit 0.18.3 - cargo-outdated 0.14.0 - cbindgen 0.26.0 -- Clippy 0.1.74 -- Rustfmt 1.6.0 +- Clippy 0.1.75 +- Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 120.0.6099.110 -- Chrome Driver 120.0.6099.71 -- Microsoft Edge 120.0.2210.77 -- Microsoft Edge Driver 120.0.2210.77 -- Mozilla Firefox 120.0.1 -- Gecko Driver 0.33.0 +- Google Chrome 120.0.6099.200 +- Chrome Driver 120.0.6099.109 +- Microsoft Edge 120.0.2210.121 +- Microsoft Edge Driver 120.0.2210.121 +- Mozilla Firefox 121.0 +- Gecko Driver 0.34.0 - IE Driver 4.14.0.0 - Selenium server 4.16.0 @@ -178,11 +179,11 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 3.12.1 #### PyPy -- 2.7.18 [PyPy 7.3.13] +- 2.7.18 [PyPy 7.3.14] - 3.7.13 [PyPy 7.3.9] - 3.8.16 [PyPy 7.3.11] -- 3.9.18 [PyPy 7.3.13] -- 3.10.13 [PyPy 7.3.13] +- 3.9.18 [PyPy 7.3.14] +- 3.10.13 [PyPy 7.3.14] #### Ruby - 2.7.8 @@ -567,7 +568,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Az (Cached): 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.477 +- AWSPowershell: 4.1.489 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 - Microsoft.Graph: 2.11.1 @@ -584,18 +585,18 @@ All other versions are saved but not installed. ``` ### Android -| Package Name | Version | -| -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 8.0 | -| Android Emulator | 31.2.9 | -| Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | -| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 2)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | -| Android SDK Platform-Tools | 34.0.5 | -| Android Support Repository | 47.0.0 | -| CMake | 3.18.1<br>3.22.1 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 24.0.8215888<br>25.2.9519653<br>26.1.10909125 | +| Package Name | Version | +| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 8.0 | +| Android Emulator | 31.2.9 | +| Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0 | +| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 2)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1) | +| Android SDK Platform-Tools | 34.0.5 | +| Android Support Repository | 47.0.0 | +| CMake | 3.18.1<br>3.22.1 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 24.0.8215888<br>25.2.9519653<br>26.1.10909125 | #### Environment variables | Name | Value | From b56952d51efd44164d7c732d507602a9807de6d1 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 11 Jan 2024 12:16:41 +0100 Subject: [PATCH 2588/3485] Updating readme file for ubuntu22 version 20240107.1.1 (#9124) --- images/ubuntu/Ubuntu2204-Readme.md | 135 ++++++++++++++--------------- 1 file changed, 66 insertions(+), 69 deletions(-) diff --git a/images/ubuntu/Ubuntu2204-Readme.md b/images/ubuntu/Ubuntu2204-Readme.md index 7e2456ece1f5..8272eea0c293 100644 --- a/images/ubuntu/Ubuntu2204-Readme.md +++ b/images/ubuntu/Ubuntu2204-Readme.md @@ -1,12 +1,14 @@ | Announcements | |-| +| [[All OSes] Powershell Core will be updated to 7.4.x LTS on January, 28](https://github.com/actions/runner-images/issues/9115) | +| [[Ubuntu] buildpack-deps docker images will be removed from runners on January, 8](https://github.com/actions/runner-images/issues/9053) | | [Old versions of Android SDK & tools will be removed from images on January, 8](https://github.com/actions/runner-images/issues/8952) | | [Major Refactoring of GitHub Actions Runner Images Repository](https://github.com/actions/runner-images/issues/8706) | *** # Ubuntu 22.04 - OS Version: 22.04.3 LTS - Kernel Version: 6.2.0-1018-azure -- Image Version: 20231217.2.0 +- Image Version: 20240107.1.0 - Systemd version: 249.11-0ubuntu3.11 ## Installed Software @@ -19,8 +21,8 @@ - Dash 0.5.11+git20210903+057cd650a4ed-3build1 - GNU C++: 9.5.0, 10.5.0, 11.4.0, 12.3.0, 13.1.0 - GNU Fortran: 9.5.0, 10.5.0, 11.4.0, 12.3.0, 13.1.0 -- Julia 1.9.4 -- Kotlin 1.9.21-release-633 +- Julia 1.10.0 +- Kotlin 1.9.22-release-704 - Mono 6.12.0.200 - MSBuild 16.10.1.31701 (Mono 6.12.0.200) - Node.js 18.19.0 @@ -32,15 +34,15 @@ ### Package Management - cpan 1.64 - Helm 3.13.1 -- Homebrew 4.1.25 -- Miniconda 23.10.0 +- Homebrew 4.2.2 +- Miniconda 23.11.0 - Npm 10.2.3 - NuGet 6.6.1.2 - Pip 22.0.2 - Pip3 22.0.2 -- Pipx 1.3.3 +- Pipx 1.4.1 - RubyGems 3.3.5 -- Vcpkg (build from commit 0e47c1985) +- Vcpkg (build from commit ce46ba877) - Yarn 1.22.21 #### Environment variables @@ -58,7 +60,7 @@ to accomplish this. ``` ### Project Management -- Lerna 8.0.1 +- Lerna 8.0.2 - Maven 3.8.8 ### Tools @@ -70,14 +72,14 @@ to accomplish this. - Bicep 0.24.24 - Buildah 1.23.1 - CMake 3.28.1 -- CodeQL Action Bundle 2.15.4 +- CodeQL Action Bundle 2.15.5 - Docker Amazon ECR Credential Helper 0.7.1 - Docker Compose v1 1.29.2 - Docker Compose v2 2.23.3 - Docker-Buildx 0.11.2 - Docker Client 24.0.7 - Docker Server 24.0.7 -- Fastlane 2.217.0 +- Fastlane 2.219.0 - Git 2.43.0 - Git LFS 3.4.1 - Git-ftp 1.6.0 @@ -92,13 +94,13 @@ to accomplish this. - Mercurial 6.1.1 - Minikube 1.32.0 - n 9.2.0 -- Newman 6.0.0 +- Newman 6.1.0 - nvm 0.39.7 - OpenSSL 3.0.2-0ubuntu1.12 - Packer 1.10.0 -- Parcel 2.10.3 +- Parcel 2.11.0 - Podman 3.4.4 -- Pulumi 3.97.0 +- Pulumi 3.100.0 - R 4.3.2 - Skopeo 1.4.1 - Sphinx Open Source Search Server 2.2.11 @@ -109,18 +111,18 @@ to accomplish this. - zstd 1.5.5 ### CLI Tools -- Alibaba Cloud CLI 3.0.189 -- AWS CLI 2.15.2 +- Alibaba Cloud CLI 3.0.196 +- AWS CLI 2.15.8 - AWS CLI Session Manager Plugin 1.2.536.0 -- AWS SAM CLI 1.105.0 +- AWS SAM CLI 1.106.0 - Azure CLI 2.55.0 - Azure CLI (azure-devops) 0.26.0 - GitHub CLI 2.40.1 -- Google Cloud CLI 457.0.0 -- Netlify CLI 17.10.1 -- OpenShift CLI 4.14.6 +- Google Cloud CLI 458.0.1 +- Netlify CLI 17.11.1 +- OpenShift CLI 4.14.7 - ORAS CLI 1.1.0 -- Vercel CLI 32.7.2 +- Vercel CLI 33.0.2 ### Java | Version | Environment Variable | @@ -139,34 +141,34 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ``` ### Haskell Tools -- Cabal 3.10.2.0 +- Cabal 3.10.2.1 - GHC 9.8.1 - GHCup 0.1.20.0 - Stack 2.13.1 ### Rust Tools -- Cargo 1.74.1 -- Rust 1.74.1 -- Rustdoc 1.74.1 +- Cargo 1.75.0 +- Rust 1.75.0 +- Rustdoc 1.75.0 - Rustup 1.26.0 #### Packages - Bindgen 0.69.1 - Cargo audit 0.18.3 -- Cargo clippy 0.1.74 +- Cargo clippy 0.1.75 - Cargo outdated 0.14.0 - Cbindgen 0.26.0 -- Rustfmt 1.6.0 +- Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 120.0.6099.109 -- ChromeDriver 120.0.6099.71 +- Google Chrome 120.0.6099.199 +- ChromeDriver 120.0.6099.109 - Chromium 120.0.6099.0 -- Microsoft Edge 120.0.2210.77 -- Microsoft Edge WebDriver 120.0.2210.77 -- Selenium server 4.16.0 +- Microsoft Edge 120.0.2210.121 +- Microsoft Edge WebDriver 120.0.2210.121 +- Selenium server 4.16.1 - Mozilla Firefox 121.0 -- Geckodriver 0.33.0 +- Geckodriver 0.34.0 #### Environment variables | Name | Value | @@ -227,8 +229,8 @@ Use the following command as a part of your job to start the service: 'sudo syst #### PyPy - 3.7.13 [PyPy 7.3.9] - 3.8.16 [PyPy 7.3.11] -- 3.9.18 [PyPy 7.3.13] -- 3.10.13 [PyPy 7.3.13] +- 3.9.18 [PyPy 7.3.14] +- 3.10.13 [PyPy 7.3.14] #### Ruby - 3.1.4 @@ -250,19 +252,16 @@ Use the following command as a part of your job to start the service: 'sudo syst | nginx | 1.18.0 | /etc/nginx/nginx.conf | inactive | 80 | ### Android -| Package Name | Version | -| -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 9.0 | -| Android Emulator | 33.1.23 | -| Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | -| Android SDK Platform-Tools | 34.0.5 | -| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 2)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | -| Android SDK Tools | 26.1.1 | -| Android Support Repository | 47.0.0 | -| CMake | 3.10.2<br>3.18.1<br>3.22.1 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 24.0.8215888<br>25.2.9519653 (default)<br>26.1.10909125 | +| Package Name | Version | +| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 9.0 | +| Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0 | +| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 2)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1) | +| Android Support Repository | 47.0.0 | +| CMake | 3.10.2<br>3.18.1<br>3.22.1 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 24.0.8215888<br>25.2.9519653 (default)<br>26.1.10909125 | #### Environment variables | Name | Value | @@ -275,24 +274,22 @@ Use the following command as a part of your job to start the service: 'sudo syst | ANDROID_SDK_ROOT | /usr/local/lib/android/sdk | ### Cached Docker images -| Repository:Tag | Digest | Created | -| ----------------------- | ------------------------------------------------------------------------ | ---------- | -| alpine:3.16 | sha256:e4cdb7d47b06ba0a062ad2a97a7d154967c8f83934594d9f2bd3efa89292996b | 2023-11-30 | -| alpine:3.17 | sha256:6e94b5cda2d6fd57d85abf81e81dabaea97a5885f919da676cc19d3551da4061 | 2023-11-30 | -| alpine:3.18 | sha256:34871e7290500828b39e22294660bee86d966bc0017544e848dd9a255cdf59e0 | 2023-11-30 | -| buildpack-deps:bullseye | sha256:257cbe4fba66709d5a536dd5ac13b22411d469eaf61f421f5c2b871f2290e25c | 2023-11-21 | -| buildpack-deps:buster | sha256:77c7243f791521c7bf816e786ef46956eabb0c8e73c8479141ba5e92c05497a7 | 2023-11-21 | -| debian:10 | sha256:46ca02d33c65ab188d6e56f26c323bf1aa9a99074f2f54176fdc3884304f58b8 | 2023-11-21 | -| debian:11 | sha256:ab2b95aa8d7d6d54866b92c322cf0693933c1ae8038652f24ddfda1d1763a45a | 2023-11-21 | -| moby/buildkit:latest | sha256:5a8f30813a104b86e927ff4695a746f74a5bb921c7be1dbcca6d754dfbe04822 | 2023-12-01 | -| node:16 | sha256:f77a1aef2da8d83e45ec990f45df50f1a286c5fe8bbfb8c6e4246c6389705c0b | 2023-09-07 | -| node:16-alpine | sha256:a1f9d027912b58a7c75be7716c97cfbc6d3099f3a97ed84aa490be9dee20e787 | 2023-08-10 | -| node:18 | sha256:7a4282663db6f22326c03618eef4320fa3cf70c5c3715546f9779858dc0ed3fd | 2023-12-02 | -| node:18-alpine | sha256:b1a0356f7d6b86c958a06949d3db3f7fb27f95f627aa6157cb98bc65c801efa2 | 2023-12-11 | -| node:20 | sha256:445acd9b2ef7e9de665424053bf95652e0b8995ef36500557d48faf29300170a | 2023-11-23 | -| node:20-alpine | sha256:9e38d3d4117da74a643f67041c83914480b335c3bd44d37ccf5b5ad86cd715d1 | 2023-12-11 | -| ubuntu:20.04 | sha256:f2034e7195f61334e6caff6ecf2e965f92d11e888309065da85ff50c617732b8 | 2023-12-13 | -| ubuntu:22.04 | sha256:6042500cf4b44023ea1894effe7890666b0c5c7871ed83a97c36c76ae560bb9b | 2023-12-12 | +| Repository:Tag | Digest | Created | +| -------------------- | ------------------------------------------------------------------------ | ---------- | +| alpine:3.16 | sha256:e4cdb7d47b06ba0a062ad2a97a7d154967c8f83934594d9f2bd3efa89292996b | 2023-11-30 | +| alpine:3.17 | sha256:6e94b5cda2d6fd57d85abf81e81dabaea97a5885f919da676cc19d3551da4061 | 2023-11-30 | +| alpine:3.18 | sha256:34871e7290500828b39e22294660bee86d966bc0017544e848dd9a255cdf59e0 | 2023-11-30 | +| debian:10 | sha256:cd3bbe339eeb538f4a1a6b04e290690658c119cd50b73677d29b80e3cda8f1dd | 2023-12-19 | +| debian:11 | sha256:71f0e09d55a4042ddee1f114a0838d99266e185bf33e71f15c15bf6b9545a9a0 | 2023-12-19 | +| moby/buildkit:latest | sha256:5a8f30813a104b86e927ff4695a746f74a5bb921c7be1dbcca6d754dfbe04822 | 2023-12-01 | +| node:16 | sha256:f77a1aef2da8d83e45ec990f45df50f1a286c5fe8bbfb8c6e4246c6389705c0b | 2023-09-07 | +| node:16-alpine | sha256:a1f9d027912b58a7c75be7716c97cfbc6d3099f3a97ed84aa490be9dee20e787 | 2023-08-10 | +| node:18 | sha256:f152130c9bb77afd49873a26fcfb6da7971b451ae6db51901fb7e028ccc0ca75 | 2023-12-19 | +| node:18-alpine | sha256:b1a0356f7d6b86c958a06949d3db3f7fb27f95f627aa6157cb98bc65c801efa2 | 2023-12-11 | +| node:20 | sha256:8d0f16fe841577f9317ab49011c6d819e1fa81f8d4af7ece7ae0ac815e07ac84 | 2023-12-19 | +| node:20-alpine | sha256:9e38d3d4117da74a643f67041c83914480b335c3bd44d37ccf5b5ad86cd715d1 | 2023-12-11 | +| ubuntu:20.04 | sha256:f2034e7195f61334e6caff6ecf2e965f92d11e888309065da85ff50c617732b8 | 2023-12-13 | +| ubuntu:22.04 | sha256:6042500cf4b44023ea1894effe7890666b0c5c7871ed83a97c36c76ae560bb9b | 2023-12-12 | ### Installed apt packages | Name | Version | @@ -338,7 +335,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | libmagickcore-dev | 8:6.9.11.60+dfsg-1.3ubuntu0.22.04.3 | | libmagickwand-dev | 8:6.9.11.60+dfsg-1.3ubuntu0.22.04.3 | | libsecret-1-dev | 0.20.5-2 | -| libsqlite3-dev | 3.37.2-2ubuntu0.1 | +| libsqlite3-dev | 3.37.2-2ubuntu0.3 | | libssl-dev | 3.0.2-0ubuntu1.12 | | libtool | 2.4.6-15build2 | | libunwind8 | 1.3.2-2build2.1 | @@ -353,7 +350,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | mercurial | 6.1.1-1ubuntu1 | | net-tools | 1.60+git20181103.0eebece-1ubuntu5 | | netcat | 1.218-4ubuntu1 | -| openssh-client | 1:8.9p1-3ubuntu0.4 | +| openssh-client | 1:8.9p1-3ubuntu0.6 | | p7zip-full | 16.02+dfsg-8 | | p7zip-rar | 16.02-3build1 | | parallel | 20210822+ds-2 | @@ -367,8 +364,8 @@ Use the following command as a part of your job to start the service: 'sudo syst | rsync | 3.2.7-0ubuntu0.22.04.2 | | shellcheck | 0.8.0-2 | | sphinxsearch | 2.2.11-8 | -| sqlite3 | 3.37.2-2ubuntu0.1 | -| ssh | 1:8.9p1-3ubuntu0.4 | +| sqlite3 | 3.37.2-2ubuntu0.3 | +| ssh | 1:8.9p1-3ubuntu0.6 | | sshpass | 1.09-1 | | subversion | 1.14.1-3ubuntu0.22.04.1 | | sudo | 1.9.9-1ubuntu2.4 | From b6b0130a7d3a37839697a4dbb38a0cf78b83e2ca Mon Sep 17 00:00:00 2001 From: MaksimZhukov <46996400+MaksimZhukov@users.noreply.github.com> Date: Thu, 11 Jan 2024 12:29:56 +0100 Subject: [PATCH 2589/3485] Add Xcode 15.2 (#9145) --- images/macos/toolsets/toolset-13.json | 4 ++-- images/macos/toolsets/toolset-14.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/images/macos/toolsets/toolset-13.json b/images/macos/toolsets/toolset-13.json index 0de30a0f61c5..ca32d92d2c49 100644 --- a/images/macos/toolsets/toolset-13.json +++ b/images/macos/toolsets/toolset-13.json @@ -3,7 +3,7 @@ "default": "14.3.1", "x64": { "versions": [ - { "link": "15.2", "version": "15.2.0-Beta+15C5500c", "install_runtimes": "true", "sha256": "BA01241CF6F611163A1E594423AA4836C4B91A37E88CBFCB7B00E095697F5083"}, + { "link": "15.2", "version": "15.2.0+15C500b", "install_runtimes": "true", "sha256": "04E93680C6DDBEC84666531BE412DE778AFC8EAC6AB2037F4C2BE7290818B59B"}, { "link": "15.1", "version": "15.1.0+15C65", "install_runtimes": "true", "sha256": "857D8DB537BAC82BF99DE0E1D3895D214D4D02101C1340CEF3DAF6E821BA1D05"}, { "link": "15.0.1", "version": "15.0.1+15A507", "symlinks": ["15.0"], "install_runtimes": "true", "sha256": "5AC17AE6060CAFC3C7112C6DA0B153450BE21F1DE6632777FBA9FBC9D999C9E8"}, { "link": "14.3.1", "version": "14.3.1+14E300c","symlinks": ["14.3"], "install_runtimes": "true", "sha256": "B5CC7BF37447C32A971B37D71C7DA1AF7ABB45CEE4B96FE126A1D3B0D2C260AF"}, @@ -14,7 +14,7 @@ }, "arm64":{ "versions": [ - { "link": "15.2", "version": "15.2.0-Beta+15C5500c", "install_runtimes": "true", "sha256": "BA01241CF6F611163A1E594423AA4836C4B91A37E88CBFCB7B00E095697F5083"}, + { "link": "15.2", "version": "15.2.0+15C500b", "install_runtimes": "true", "sha256": "04E93680C6DDBEC84666531BE412DE778AFC8EAC6AB2037F4C2BE7290818B59B"}, { "link": "15.1", "version": "15.1.0+15C65", "install_runtimes": "true", "sha256": "857D8DB537BAC82BF99DE0E1D3895D214D4D02101C1340CEF3DAF6E821BA1D05"}, { "link": "15.0.1", "version": "15.0.1+15A507", "symlinks": ["15.0"], "install_runtimes": "true", "sha256": "5AC17AE6060CAFC3C7112C6DA0B153450BE21F1DE6632777FBA9FBC9D999C9E8"}, { "link": "14.3.1", "version": "14.3.1+14E300c","symlinks": ["14.3"], "install_runtimes": "true", "sha256": "B5CC7BF37447C32A971B37D71C7DA1AF7ABB45CEE4B96FE126A1D3B0D2C260AF"}, diff --git a/images/macos/toolsets/toolset-14.json b/images/macos/toolsets/toolset-14.json index b06ee6c0745a..bf37359c0920 100644 --- a/images/macos/toolsets/toolset-14.json +++ b/images/macos/toolsets/toolset-14.json @@ -3,7 +3,7 @@ "default": "15.0.1", "x64": { "versions": [ - { "link": "15.2", "version": "15.2.0-Beta+15C5500c", "install_runtimes": "true", "sha256": "BA01241CF6F611163A1E594423AA4836C4B91A37E88CBFCB7B00E095697F5083"}, + { "link": "15.2", "version": "15.2.0+15C500b", "install_runtimes": "true", "sha256": "04E93680C6DDBEC84666531BE412DE778AFC8EAC6AB2037F4C2BE7290818B59B"}, { "link": "15.1", "version": "15.1.0+15C65", "install_runtimes": "true", "sha256": "857D8DB537BAC82BF99DE0E1D3895D214D4D02101C1340CEF3DAF6E821BA1D05"}, { "link": "15.0.1", "version": "15.0.1+15A507", "symlinks": ["15.0"], "install_runtimes": "true", "sha256": "5AC17AE6060CAFC3C7112C6DA0B153450BE21F1DE6632777FBA9FBC9D999C9E8"}, { "link": "14.3.1", "version": "14.3.1+14E300c","symlinks": ["14.3"], "install_runtimes": "true", "sha256": "B5CC7BF37447C32A971B37D71C7DA1AF7ABB45CEE4B96FE126A1D3B0D2C260AF"} @@ -11,7 +11,7 @@ }, "arm64":{ "versions": [ - { "link": "15.2", "version": "15.2.0-Beta+15C5500c", "install_runtimes": "true", "sha256": "BA01241CF6F611163A1E594423AA4836C4B91A37E88CBFCB7B00E095697F5083"}, + { "link": "15.2", "version": "15.2.0+15C500b", "install_runtimes": "true", "sha256": "04E93680C6DDBEC84666531BE412DE778AFC8EAC6AB2037F4C2BE7290818B59B"}, { "link": "15.1", "version": "15.1.0+15C65", "install_runtimes": "true", "sha256": "857D8DB537BAC82BF99DE0E1D3895D214D4D02101C1340CEF3DAF6E821BA1D05"}, { "link": "15.0.1", "version": "15.0.1+15A507", "symlinks": ["15.0"], "install_runtimes": "true", "sha256": "5AC17AE6060CAFC3C7112C6DA0B153450BE21F1DE6632777FBA9FBC9D999C9E8"}, { "link": "14.3.1", "version": "14.3.1+14E300c","symlinks": ["14.3"], "install_runtimes": "true", "sha256": "B5CC7BF37447C32A971B37D71C7DA1AF7ABB45CEE4B96FE126A1D3B0D2C260AF"} From b3ae9702f7ab8bab96119beb4ab04228f301e1ba Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Thu, 11 Jan 2024 19:25:36 +0100 Subject: [PATCH 2590/3485] [Windows] Exclude KB5034439 from windows updates (#9149) --- images/windows/scripts/build/Install-WindowsUpdates.ps1 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/images/windows/scripts/build/Install-WindowsUpdates.ps1 b/images/windows/scripts/build/Install-WindowsUpdates.ps1 index 681af89c308d..c5d22fc99bab 100644 --- a/images/windows/scripts/build/Install-WindowsUpdates.ps1 +++ b/images/windows/scripts/build/Install-WindowsUpdates.ps1 @@ -8,10 +8,10 @@ function Install-WindowsUpdates { Write-Host "Starting wuauserv" Start-Service -Name wuauserv -PassThru | Out-Host - # Temporarily exclude Windows update KB5001148 since it throws an error. - # The KB5001148 itself is quite old and looks like not needed (https://support.microsoft.com/en-us/topic/kb5001148-visual-studio-client-detector-utility-for-administrator-updates-ad593454-547c-43c3-b5a3-6f201ae63f03) + # Temporarily exclude Windows update KB5034439 since it throws an error. + # The known issue (https://support.microsoft.com/en-au/topic/kb5034439-windows-recovery-environment-update-for-azure-stack-hci-version-22h2-and-windows-server-2022-january-9-2024-6f9d26e6-784c-4503-a3c6-0beedda443ca) Write-Host "Getting list of available windows updates" - Get-WindowsUpdate -MicrosoftUpdate -NotKBArticleID "KB5001148" -OutVariable updates | Out-Host + Get-WindowsUpdate -MicrosoftUpdate -NotKBArticleID "KB5034439" -OutVariable updates | Out-Host if ( -not $updates ) { Write-Host "There are no windows updates to install" @@ -19,7 +19,7 @@ function Install-WindowsUpdates { } Write-Host "Installing windows updates" - Get-WindowsUpdate -MicrosoftUpdate -NotKBArticleID "KB5001148" -AcceptAll -Install -IgnoreUserInput -IgnoreReboot | Out-Host + Get-WindowsUpdate -MicrosoftUpdate -NotKBArticleID "KB5034439" -AcceptAll -Install -IgnoreUserInput -IgnoreReboot | Out-Host Write-Host "Validating windows updates installation" # Get-WUHistory doesn't support Windows Server 2022 From cb77fa2a6442ecfed871c4b47e231f50e993979c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 12 Jan 2024 09:37:47 +0000 Subject: [PATCH 2591/3485] Updating readme file for macos-13 version 20240106.8 (#9127) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-13-Readme.md | 130 ++++++++++++++++---------------- 1 file changed, 67 insertions(+), 63 deletions(-) diff --git a/images/macos/macos-13-Readme.md b/images/macos/macos-13-Readme.md index 01ad4688f1bb..79ca18b43e45 100644 --- a/images/macos/macos-13-Readme.md +++ b/images/macos/macos-13-Readme.md @@ -1,12 +1,13 @@ | Announcements | |-| +| [[All OSes] Powershell Core will be updated to 7.4.x LTS on January, 28](https://github.com/actions/runner-images/issues/9115) | | [Old versions of Android SDK & tools will be removed from images on January, 8](https://github.com/actions/runner-images/issues/8952) | | [Major Refactoring of GitHub Actions Runner Images Repository](https://github.com/actions/runner-images/issues/8706) | *** # macOS 13 - OS Version: macOS 13.6.3 (22G436) - Kernel Version: Darwin 22.6.0 -- Image Version: 20231218.2 +- Image Version: 20240106.8 ## Installed Software @@ -21,28 +22,28 @@ - GNU Fortran 11 (Homebrew GCC 11.4.0) - available by `gfortran-11` alias - GNU Fortran 12 (Homebrew GCC 12.3.0) - available by `gfortran-12` alias - GNU Fortran 13 (Homebrew GCC 13.2.0) - available by `gfortran-13` alias -- Julia 1.9.4 -- Kotlin 1.9.21-release-633 +- Julia 1.10.0 +- Kotlin 1.9.22-release-704 - Mono 6.12.0.188 - Node.js 18.19.0 - Perl 5.38.2 -- PHP 8.3.0 +- PHP 8.3.1 - Python3 3.12.1 - R 4.3.2 - Ruby 3.0.6p216 ### Package Management -- Bundler 2.5.1 +- Bundler 2.5.4 - Carthage 0.39.1 - CocoaPods 1.14.3 - Composer 2.6.6 -- Homebrew 4.1.25 +- Homebrew 4.2.2 - NPM 10.2.3 - NuGet 6.3.1.1 - Pip3 23.3.2 (python 3.12) -- Pipx 1.3.3 -- RubyGems 3.5.1 -- Vcpkg 2023 (build from commit 0e47c1985) +- Pipx 1.4.1 +- RubyGems 3.5.4 +- Vcpkg 2023 (build from commit ce46ba877) - Yarn 1.22.19 ### Project Management @@ -72,17 +73,17 @@ - zstd 1.5.5 ### Tools -- AWS CLI 2.15.2 -- AWS SAM CLI 1.105.0 +- AWS CLI 2.15.8 +- AWS SAM CLI 1.106.0 - AWS Session Manager CLI 1.2.536.0 - Azure CLI 2.55.0 - Azure CLI (azure-devops) 0.26.0 - Bicep CLI 0.24.24 - Cmake 3.28.1 -- CodeQL Action Bundle 2.15.4 -- Fastlane 2.217.0 +- CodeQL Action Bundle 2.15.5 +- Fastlane 2.219.0 - SwiftFormat 0.52.11 -- Xcbeautify 1.1.1 +- Xcbeautify 1.3.0 - Xcode Command Line Tools 15.1.0.0.1.1700200546 - Xcodes 1.4.1 @@ -90,16 +91,16 @@ - SwiftLint 0.53.0 ### Browsers -- Safari 17.2 (18617.1.17.11.11) -- SafariDriver 17.2 (18617.1.17.11.11) -- Google Chrome 120.0.6099.109 -- Google Chrome for Testing 120.0.6099.71 -- ChromeDriver 120.0.6099.71 -- Microsoft Edge 120.0.2210.77 -- Microsoft Edge WebDriver 120.0.2210.77 -- Mozilla Firefox 120.0.1 -- geckodriver 0.33.0 -- Selenium server 4.15.0 +- Safari 17.2.1 (18617.1.17.11.12) +- SafariDriver 17.2.1 (18617.1.17.11.12) +- Google Chrome 120.0.6099.199 +- Google Chrome for Testing 120.0.6099.109 +- ChromeDriver 120.0.6099.109 +- Microsoft Edge 120.0.2210.121 +- Microsoft Edge WebDriver 120.0.2210.91 +- Mozilla Firefox 121.0 +- geckodriver 0.34.0 +- Selenium server 4.16.1 #### Environment variables | Name | Value | @@ -123,11 +124,11 @@ - 3.1.4 #### PyPy -- 2.7.18 [PyPy 7.3.13] +- 2.7.18 [PyPy 7.3.14] - 3.7.13 [PyPy 7.3.9] - 3.8.16 [PyPy 7.3.11] -- 3.9.18 [PyPy 7.3.13] -- 3.10.13 [PyPy 7.3.13] +- 3.9.18 [PyPy 7.3.14] +- 3.10.13 [PyPy 7.3.14] #### Python - 3.8.18 @@ -147,14 +148,14 @@ - 1.21.5 ### Rust Tools -- Cargo 1.74.1 -- Rust 1.74.1 -- Rustdoc 1.74.1 +- Cargo 1.75.0 +- Rust 1.75.0 +- Rustdoc 1.75.0 - Rustup 1.26.0 #### Packages -- Clippy 0.1.74 -- Rustfmt 1.6.0-stable +- Clippy 0.1.75 +- Rustfmt 1.7.0-stable ### PowerShell Tools - PowerShell 7.2.17 @@ -165,13 +166,14 @@ - PSScriptAnalyzer: 1.21.0 ### Xcode -| Version | Build | Path | -| ---------------- | ------- | ------------------------------ | -| 15.1 | 15C65 | /Applications/Xcode_15.1.app | -| 15.0.1 | 15A507 | /Applications/Xcode_15.0.1.app | -| 14.3.1 (default) | 14E300c | /Applications/Xcode_14.3.1.app | -| 14.2 | 14C18 | /Applications/Xcode_14.2.app | -| 14.1 | 14B47b | /Applications/Xcode_14.1.app | +| Version | Build | Path | +| ---------------- | -------- | ------------------------------ | +| 15.2 (beta) | 15C5500c | /Applications/Xcode_15.2.app | +| 15.1 | 15C65 | /Applications/Xcode_15.1.app | +| 15.0.1 | 15A507 | /Applications/Xcode_15.0.1.app | +| 14.3.1 (default) | 14E300c | /Applications/Xcode_14.3.1.app | +| 14.2 | 14C18 | /Applications/Xcode_14.2.app | +| 14.1 | 14B47b | /Applications/Xcode_14.1.app | #### Xcode Support Tools - xcpretty 0.3.0 @@ -183,33 +185,35 @@ | macOS 13.1 | macosx13.1 | 14.2 | | macOS 13.3 | macosx13.3 | 14.3.1 | | macOS 14.0 | macosx14.0 | 15.0.1 | -| macOS 14.2 | macosx14.2 | 15.1 | +| macOS 14.2 | macosx14.2 | 15.1, 15.2 | | iOS 16.1 | iphoneos16.1 | 14.1 | | iOS 16.2 | iphoneos16.2 | 14.2 | | iOS 16.4 | iphoneos16.4 | 14.3.1 | | iOS 17.0 | iphoneos17.0 | 15.0.1 | -| iOS 17.2 | iphoneos17.2 | 15.1 | +| iOS 17.2 | iphoneos17.2 | 15.1, 15.2 | | Simulator - iOS 16.1 | iphonesimulator16.1 | 14.1 | | Simulator - iOS 16.2 | iphonesimulator16.2 | 14.2 | | Simulator - iOS 16.4 | iphonesimulator16.4 | 14.3.1 | | Simulator - iOS 17.0 | iphonesimulator17.0 | 15.0.1 | -| Simulator - iOS 17.2 | iphonesimulator17.2 | 15.1 | +| Simulator - iOS 17.2 | iphonesimulator17.2 | 15.1, 15.2 | | tvOS 16.1 | appletvos16.1 | 14.1, 14.2 | | tvOS 16.4 | appletvos16.4 | 14.3.1 | | tvOS 17.0 | appletvos17.0 | 15.0.1 | -| tvOS 17.2 | appletvos17.2 | 15.1 | +| tvOS 17.2 | appletvos17.2 | 15.1, 15.2 | | Simulator - tvOS 16.1 | appletvsimulator16.1 | 14.1, 14.2 | | Simulator - tvOS 16.4 | appletvsimulator16.4 | 14.3.1 | | Simulator - tvOS 17.0 | appletvsimulator17.0 | 15.0.1 | -| Simulator - tvOS 17.2 | appletvsimulator17.2 | 15.1 | +| Simulator - tvOS 17.2 | appletvsimulator17.2 | 15.1, 15.2 | | watchOS 9.1 | watchos9.1 | 14.1, 14.2 | | watchOS 9.4 | watchos9.4 | 14.3.1 | | watchOS 10.0 | watchos10.0 | 15.0.1 | -| watchOS 10.2 | watchos10.2 | 15.1 | +| watchOS 10.2 | watchos10.2 | 15.1, 15.2 | | Simulator - watchOS 9.1 | watchsimulator9.1 | 14.1, 14.2 | | Simulator - watchOS 9.4 | watchsimulator9.4 | 14.3.1 | | Simulator - watchOS 10.0 | watchsimulator10.0 | 15.0.1 | -| Simulator - watchOS 10.2 | watchsimulator10.2 | 15.1 | +| Simulator - watchOS 10.2 | watchsimulator10.2 | 15.1, 15.2 | +| Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | +| visionOS 1.0 | xros1.0 | 15.2 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | @@ -217,30 +221,30 @@ | DriverKit 22.2 | driverkit22.2 | 14.2 | | DriverKit 22.4 | driverkit22.4 | 14.3.1 | | DriverKit 23.0 | driverkit23.0 | 15.0.1 | -| DriverKit 23.2 | driverkit23.2 | 15.1 | +| DriverKit 23.2 | driverkit23.2 | 15.1, 15.2 | #### Installed Simulators -| OS | Xcode Version | Simulators | -| ------------ | ---------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| iOS 16.1 | 14.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 16.2 | 14.2 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 16.4 | 14.3.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 17.0 | 14.1<br>14.2<br>14.3.1<br>15.0.1<br>15.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 17.2 | 14.1<br>14.2<br>14.3.1<br>15.0.1<br>15.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| tvOS 16.1 | 14.1<br>14.2<br>14.3.1<br>15.0.1<br>15.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 16.4 | 14.1<br>14.2<br>14.3.1<br>15.0.1<br>15.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 17.0 | 14.1<br>14.2<br>14.3.1<br>15.0.1<br>15.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 17.2 | 14.1<br>14.2<br>14.3.1<br>15.0.1<br>15.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| watchOS 9.1 | 14.1<br>14.2<br>14.3.1<br>15.0.1<br>15.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | -| watchOS 9.4 | 14.1<br>14.2<br>14.3.1<br>15.0.1<br>15.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | -| watchOS 10.0 | 14.1<br>14.2<br>14.3.1<br>15.0.1<br>15.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | -| watchOS 10.2 | 14.1<br>14.2<br>14.3.1<br>15.0.1<br>15.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | +| OS | Xcode Version | Simulators | +| ------------ | ------------------------------------------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| iOS 16.1 | 14.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 16.2 | 14.2 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 16.4 | 14.3.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 17.0 | 14.1<br>14.2<br>14.3.1<br>15.0.1<br>15.1<br>15.2 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 17.2 | 14.1<br>14.2<br>14.3.1<br>15.0.1<br>15.1<br>15.2 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| tvOS 16.1 | 14.1<br>14.2<br>14.3.1<br>15.0.1<br>15.1<br>15.2 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 16.4 | 14.1<br>14.2<br>14.3.1<br>15.0.1<br>15.1<br>15.2 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 17.0 | 14.1<br>14.2<br>14.3.1<br>15.0.1<br>15.1<br>15.2 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 17.2 | 14.1<br>14.2<br>14.3.1<br>15.0.1<br>15.1<br>15.2 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| watchOS 9.1 | 14.1<br>14.2<br>14.3.1<br>15.0.1<br>15.1<br>15.2 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | +| watchOS 9.4 | 14.1<br>14.2<br>14.3.1<br>15.0.1<br>15.1<br>15.2 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | +| watchOS 10.0 | 14.1<br>14.2<br>14.3.1<br>15.0.1<br>15.1<br>15.2 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 10.2 | 14.1<br>14.2<br>14.3.1<br>15.0.1<br>15.1<br>15.2 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | ### Android | Package Name | Version | | -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 11.0 | -| Android Emulator | 33.1.23 | +| Android Emulator | 33.1.24 | | Android SDK Build-tools | 34.0.0<br>33.0.2 | | Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 2)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | | Android SDK Platform-Tools | 34.0.5 | From ebef5f5fee9505823944389cbbd9fe1c1bc326cb Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Fri, 12 Jan 2024 12:31:21 +0100 Subject: [PATCH 2592/3485] [windows] Add dynamic path for Get-ToolsetContent (#9147) * [windows] Add dynamic path for Get-ToolsetContent * Add missing variable in win22 template --- .../scripts/helpers/InstallHelpers.ps1 | 6 ++-- images/windows/templates/windows-2019.pkr.hcl | 20 +++++++---- images/windows/templates/windows-2022.pkr.hcl | 33 ++++++++++++++----- 3 files changed, 40 insertions(+), 19 deletions(-) diff --git a/images/windows/scripts/helpers/InstallHelpers.ps1 b/images/windows/scripts/helpers/InstallHelpers.ps1 index 0f8611a5cccb..139d51b385d9 100644 --- a/images/windows/scripts/helpers/InstallHelpers.ps1 +++ b/images/windows/scripts/helpers/InstallHelpers.ps1 @@ -217,11 +217,11 @@ function Get-ToolsetContent { Retrieves the content of the toolset.json file. .DESCRIPTION - This function reads the toolset.json file located at "C:\image\toolset.json" - and returns the content as a PowerShell object. + This function reads the toolset.json file in path provided by IMAGE_FOLDER + environment variable and returns the content as a PowerShell object. #> - $toolsetPath = Join-Path "C:\\image" "toolset.json" + $toolsetPath = Join-Path $env:IMAGE_FOLDER "toolset.json" $toolsetJson = Get-Content -Path $toolsetPath -Raw ConvertFrom-Json -InputObject $toolsetJson } diff --git a/images/windows/templates/windows-2019.pkr.hcl b/images/windows/templates/windows-2019.pkr.hcl index 3e3fd2426093..203805289f95 100644 --- a/images/windows/templates/windows-2019.pkr.hcl +++ b/images/windows/templates/windows-2019.pkr.hcl @@ -253,7 +253,7 @@ build { } provisioner "powershell" { - environment_vars = ["IMAGE_VERSION=${var.image_version}", "IMAGE_OS=${var.image_os}", "AGENT_TOOLSDIRECTORY=${var.agent_tools_directory}", "IMAGEDATA_FILE=${var.imagedata_file}"] + environment_vars = ["IMAGE_VERSION=${var.image_version}", "IMAGE_OS=${var.image_os}", "AGENT_TOOLSDIRECTORY=${var.agent_tools_directory}", "IMAGEDATA_FILE=${var.imagedata_file}", "IMAGE_FOLDER=${var.image_folder}"] execution_policy = "unrestricted" scripts = [ "${path.root}/../scripts/build/Configure-WindowsDefender.ps1", @@ -273,7 +273,8 @@ build { } provisioner "powershell" { - scripts = [ + environment_vars = ["IMAGE_FOLDER=${var.image_folder}"] + scripts = [ "${path.root}/../scripts/build/Install-VCRedist.ps1", "${path.root}/../scripts/build/Install-Docker.ps1", "${path.root}/../scripts/build/Install-DockerWinCred.ps1", @@ -291,6 +292,7 @@ build { provisioner "powershell" { elevated_password = "${var.install_password}" elevated_user = "${var.install_user}" + environment_vars = ["IMAGE_FOLDER=${var.image_folder}"] scripts = [ "${path.root}/../scripts/build/Install-VisualStudio.ps1", "${path.root}/../scripts/build/Install-KubernetesTools.ps1", @@ -300,7 +302,8 @@ build { } provisioner "powershell" { - scripts = [ + environment_vars = ["IMAGE_FOLDER=${var.image_folder}"] + scripts = [ "${path.root}/../scripts/build/Install-Wix.ps1", "${path.root}/../scripts/build/Install-WDK.ps1", "${path.root}/../scripts/build/Install-VSExtensions.ps1", @@ -315,6 +318,7 @@ build { provisioner "powershell" { execution_policy = "remotesigned" + environment_vars = ["IMAGE_FOLDER=${var.image_folder}"] scripts = ["${path.root}/../scripts/build/Install-ServiceFabricSDK.ps1"] } @@ -327,7 +331,8 @@ build { } provisioner "powershell" { - scripts = [ + environment_vars = ["IMAGE_FOLDER=${var.image_folder}"] + scripts = [ "${path.root}/../scripts/build/Install-ActionsCache.ps1", "${path.root}/../scripts/build/Install-Ruby.ps1", "${path.root}/../scripts/build/Install-PyPy.ps1", @@ -398,8 +403,9 @@ build { } provisioner "powershell" { - pause_before = "2m0s" - scripts = [ + pause_before = "2m0s" + environment_vars = ["IMAGE_FOLDER=${var.image_folder}"] + scripts = [ "${path.root}/../scripts/build/Install-WindowsUpdatesAfterReboot.ps1", "${path.root}/../scripts/tests/RunAll-Tests.ps1" ] @@ -410,7 +416,7 @@ build { } provisioner "powershell" { - environment_vars = ["IMAGE_VERSION=${var.image_version}"] + environment_vars = ["IMAGE_VERSION=${var.image_version}", "IMAGE_FOLDER=${var.image_folder}"] inline = ["pwsh -File '${var.image_folder}\\SoftwareReport\\Generate-SoftwareReport.ps1'"] } diff --git a/images/windows/templates/windows-2022.pkr.hcl b/images/windows/templates/windows-2022.pkr.hcl index ec9e436d7000..70bb6c5a6acf 100644 --- a/images/windows/templates/windows-2022.pkr.hcl +++ b/images/windows/templates/windows-2022.pkr.hcl @@ -242,7 +242,7 @@ build { } provisioner "powershell" { - environment_vars = ["IMAGE_VERSION=${var.image_version}", "IMAGE_OS=${var.image_os}", "AGENT_TOOLSDIRECTORY=${var.agent_tools_directory}", "IMAGEDATA_FILE=${var.imagedata_file}"] + environment_vars = ["IMAGE_VERSION=${var.image_version}", "IMAGE_OS=${var.image_os}", "AGENT_TOOLSDIRECTORY=${var.agent_tools_directory}", "IMAGEDATA_FILE=${var.imagedata_file}", "IMAGE_FOLDER=${var.image_folder}"] execution_policy = "unrestricted" scripts = [ "${path.root}/../scripts/build/Configure-WindowsDefender.ps1", @@ -264,7 +264,8 @@ build { } provisioner "powershell" { - scripts = [ + environment_vars = ["IMAGE_FOLDER=${var.image_folder}"] + scripts = [ "${path.root}/../scripts/build/Install-Docker.ps1", "${path.root}/../scripts/build/Install-DockerWinCred.ps1", "${path.root}/../scripts/build/Install-DockerCompose.ps1", @@ -281,6 +282,7 @@ build { provisioner "powershell" { elevated_password = "${var.install_password}" elevated_user = "${var.install_user}" + environment_vars = ["IMAGE_FOLDER=${var.image_folder}"] scripts = [ "${path.root}/../scripts/build/Install-VisualStudio.ps1", "${path.root}/../scripts/build/Install-KubernetesTools.ps1" @@ -294,8 +296,9 @@ build { } provisioner "powershell" { - pause_before = "2m0s" - scripts = [ + pause_before = "2m0s" + environment_vars = ["IMAGE_FOLDER=${var.image_folder}"] + scripts = [ "${path.root}/../scripts/build/Install-Wix.ps1", "${path.root}/../scripts/build/Install-WDK.ps1", "${path.root}/../scripts/build/Install-VSExtensions.ps1", @@ -310,6 +313,7 @@ build { provisioner "powershell" { execution_policy = "remotesigned" + environment_vars = ["IMAGE_FOLDER=${var.image_folder}"] scripts = ["${path.root}/../scripts/build/Install-ServiceFabricSDK.ps1"] } @@ -322,7 +326,8 @@ build { } provisioner "powershell" { - scripts = [ + environment_vars = ["IMAGE_FOLDER=${var.image_folder}"] + scripts = [ "${path.root}/../scripts/build/Install-ActionsCache.ps1", "${path.root}/../scripts/build/Install-Ruby.ps1", "${path.root}/../scripts/build/Install-PyPy.ps1", @@ -361,12 +366,21 @@ build { "${path.root}/../scripts/build/Install-Mercurial.ps1", "${path.root}/../scripts/build/Install-Zstd.ps1", "${path.root}/../scripts/build/Install-NSIS.ps1", - "${path.root}/../scripts/build/Install-Vcpkg.ps1", "${path.root}/../scripts/build/Install-PostgreSQL.ps1", "${path.root}/../scripts/build/Install-Bazel.ps1", "${path.root}/../scripts/build/Install-AliyunCli.ps1", "${path.root}/../scripts/build/Install-RootCA.ps1", "${path.root}/../scripts/build/Install-MongoDB.ps1", "${path.root}/../scripts/build/Install-CodeQLBundle.ps1", "${path.root}/../scripts/build/Configure-Diagnostics.ps1"] + "${path.root}/../scripts/build/Install-Vcpkg.ps1", + "${path.root}/../scripts/build/Install-PostgreSQL.ps1", + "${path.root}/../scripts/build/Install-Bazel.ps1", + "${path.root}/../scripts/build/Install-AliyunCli.ps1", + "${path.root}/../scripts/build/Install-RootCA.ps1", + "${path.root}/../scripts/build/Install-MongoDB.ps1", + "${path.root}/../scripts/build/Install-CodeQLBundle.ps1", + "${path.root}/../scripts/build/Configure-Diagnostics.ps1" + ] } provisioner "powershell" { elevated_password = "${var.install_password}" elevated_user = "${var.install_user}" + environment_vars = ["IMAGE_FOLDER=${var.image_folder}"] scripts = [ "${path.root}/../scripts/build/Install-WindowsUpdates.ps1", "${path.root}/../scripts/build/Configure-DynamicPort.ps1", @@ -384,8 +398,9 @@ build { } provisioner "powershell" { - pause_before = "2m0s" - scripts = [ + pause_before = "2m0s" + environment_vars = ["IMAGE_FOLDER=${var.image_folder}"] + scripts = [ "${path.root}/../scripts/build/Install-WindowsUpdatesAfterReboot.ps1", "${path.root}/../scripts/tests/RunAll-Tests.ps1" ] @@ -396,7 +411,7 @@ build { } provisioner "powershell" { - environment_vars = ["IMAGE_VERSION=${var.image_version}"] + environment_vars = ["IMAGE_VERSION=${var.image_version}", "IMAGE_FOLDER=${var.image_folder}"] inline = ["pwsh -File '${var.image_folder}\\SoftwareReport\\Generate-SoftwareReport.ps1'"] } From 2a7ca2e6a23321572d9ec80c32c1c7d13ecd2d08 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Mon, 15 Jan 2024 11:57:43 +0100 Subject: [PATCH 2593/3485] [Ubuntu] Add predefined variable to skip test in the pipeline (#9153) --- images/ubuntu/scripts/tests/System.Tests.ps1 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/images/ubuntu/scripts/tests/System.Tests.ps1 b/images/ubuntu/scripts/tests/System.Tests.ps1 index de18d6eaa1f4..1abe55934562 100644 --- a/images/ubuntu/scripts/tests/System.Tests.ps1 +++ b/images/ubuntu/scripts/tests/System.Tests.ps1 @@ -1,4 +1,6 @@ -Describe "Disk free space" { +# The $env:AGENT_NAME and $env:RUNNER_NAME are predefined variables for the ADO pipelines and for the GitHub actions respectively. +# If the test is running on the ADO pipeline or on the GitHub actions, the test will be skipped +Describe "Disk free space" -Skip:(-not [String]::IsNullOrEmpty($env:AGENT_NAME) -or -not [String]::IsNullOrEmpty($env:RUNNER_NAME)) { It "Image has more than 31GB free space" { $freeSpace = (Get-PSDrive "/").Free $freeSpace | Should -BeGreaterOrEqual 31GB From ba2e955e0bcfddec9f834226456fce2f5415600a Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Mon, 15 Jan 2024 12:21:24 +0100 Subject: [PATCH 2594/3485] [macos] Add path variables to packer templates (#9155) * Update macos-12.pkr.hcl template * Update remaining macos templates * Update Get-ToolsetContent and get_toolset_value functions * Fix ~ symbol expansion issues * Fix bad path in macOS-14.arm64.anka.pkr.hcl --- .../macos/scripts/helpers/Common.Helpers.psm1 | 12 +- images/macos/scripts/helpers/utils.sh | 2 +- images/macos/templates/macOS-11.pkr.hcl | 188 +++++------ images/macos/templates/macOS-12.anka.pkr.hcl | 303 +++++++++--------- images/macos/templates/macOS-12.pkr.hcl | 188 +++++------ images/macos/templates/macOS-13.anka.pkr.hcl | 279 ++++++++-------- .../templates/macOS-13.arm64.anka.pkr.hcl | 258 +++++++-------- images/macos/templates/macOS-14.anka.pkr.hcl | 267 +++++++-------- .../templates/macOS-14.arm64.anka.pkr.hcl | 246 +++++++------- 9 files changed, 896 insertions(+), 847 deletions(-) diff --git a/images/macos/scripts/helpers/Common.Helpers.psm1 b/images/macos/scripts/helpers/Common.Helpers.psm1 index 0e8ea1e0cb71..83259984bda6 100644 --- a/images/macos/scripts/helpers/Common.Helpers.psm1 +++ b/images/macos/scripts/helpers/Common.Helpers.psm1 @@ -40,9 +40,17 @@ function Get-OSVersion { } } -# Get the value of the toolset function Get-ToolsetContent { - $toolsetPath = Join-Path $env:HOME "image-generation" "toolset.json" + <# + .SYNOPSIS + Retrieves the content of the toolset.json file. + + .DESCRIPTION + This function reads the toolset.json in path provided by IMAGE_FOLDER + environment variable and returns the content as a PowerShell object. + #> + + $toolsetPath = Join-Path $env:IMAGE_FOLDER "toolset.json" $toolsetJson = Get-Content -Path $toolsetPath -Raw ConvertFrom-Json -InputObject $toolsetJson } diff --git a/images/macos/scripts/helpers/utils.sh b/images/macos/scripts/helpers/utils.sh index c4d71881fe8c..62315cfca8e6 100644 --- a/images/macos/scripts/helpers/utils.sh +++ b/images/macos/scripts/helpers/utils.sh @@ -82,7 +82,7 @@ is_Veertu() { } get_toolset_value() { - local toolset_path=$(echo "$HOME/image-generation/toolset.json") + local toolset_path=$(echo "$IMAGE_FOLDER/toolset.json") local query=$1 echo "$(jq -r "$query" $toolset_path)" } diff --git a/images/macos/templates/macOS-11.pkr.hcl b/images/macos/templates/macOS-11.pkr.hcl index 7635ad3af99f..432eccdb4703 100644 --- a/images/macos/templates/macOS-11.pkr.hcl +++ b/images/macos/templates/macOS-11.pkr.hcl @@ -7,6 +7,10 @@ packer { } } +locals { + image_folder = "/Users/${var.vm_username}/image-generation" +} + variable "baseimage_name" { type = string } @@ -100,37 +104,37 @@ build { sources = ["source.vsphere-clone.template"] provisioner "shell" { - inline = ["mkdir ~/image-generation"] + inline = ["mkdir ${local.image_folder}"] } provisioner "file" { - destination = "~/image-generation/" + destination = "${local.image_folder}/" sources = [ - "./assets/xamarin-selector", - "./scripts/tests", - "./scripts/docs-gen", - "./scripts/helpers" + "${path.root}/../assets/xamarin-selector", + "${path.root}/../scripts/tests", + "${path.root}/../scripts/docs-gen", + "${path.root}/../scripts/helpers" ] } provisioner "file" { - destination = "~/image-generation/docs-gen/" - source = "../../helpers/software-report-base" + destination = "${local.image_folder}/docs-gen/" + source = "${path.root}/../../../helpers/software-report-base" } provisioner "file" { - destination = "~/image-generation/add-certificate.swift" - source = "./assets/add-certificate.swift" + destination = "${local.image_folder}/add-certificate.swift" + source = "${path.root}/../assets/add-certificate.swift" } provisioner "file" { destination = "~/.bashrc" - source = "./assets/bashrc" + source = "${path.root}/../assets/bashrc" } provisioner "file" { destination = "~/.bash_profile" - source = "./assets/bashprofile" + source = "${path.root}/../assets/bashprofile" } provisioner "shell" { @@ -139,32 +143,32 @@ build { provisioner "file" { destination = "~/bootstrap" - source = "./assets/bootstrap-provisioner/" + source = "${path.root}/../assets/bootstrap-provisioner/" } provisioner "file" { - destination = "~/image-generation/toolset.json" - source = "./toolsets/toolset-11.json" + destination = "${local.image_folder}/toolset.json" + source = "${path.root}/../toolsets/toolset-11.json" } provisioner "shell" { execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" inline = [ - "mv ~/image-generation/docs-gen ~/image-generation/software-report", - "mv ~/image-generation/xamarin-selector ~/image-generation/assets", + "mv ${local.image_folder}/docs-gen ${local.image_folder}/software-report", + "mv ${local.image_folder}/xamarin-selector ${local.image_folder}/assets", "mkdir ~/utils", - "mv ~/image-generation/helpers/confirm-identified-developers.scpt ~/utils", - "mv ~/image-generation/helpers/invoke-tests.sh ~/utils", - "mv ~/image-generation/helpers/utils.sh ~/utils", - "mv ~/image-generation/helpers/xamarin-utils.sh ~/utils" + "mv ${local.image_folder}/helpers/confirm-identified-developers.scpt ~/utils", + "mv ${local.image_folder}/helpers/invoke-tests.sh ~/utils", + "mv ${local.image_folder}/helpers/utils.sh ~/utils", + "mv ${local.image_folder}/helpers/xamarin-utils.sh ~/utils" ] } provisioner "shell" { execute_command = "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}" scripts = [ - "./scripts/build/install-xcode-clt.sh", - "./scripts/build/install-homebrew.sh" + "${path.root}/../scripts/build/install-xcode-clt.sh", + "${path.root}/../scripts/build/install-homebrew.sh" ] } @@ -172,14 +176,14 @@ build { environment_vars = ["PASSWORD=${var.vm_password}", "USERNAME=${var.vm_username}"] execute_command = "chmod +x {{ .Path }}; sudo {{ .Vars }} {{ .Path }}" scripts = [ - "./scripts/build/install-xcode-clt.sh", - "./scripts/build/configure-network-interface-detection.sh", - "./scripts/build/configure-autologin.sh", - "./scripts/build/configure-auto-updates.sh", - "./scripts/build/configure-screensaver.sh", - "./scripts/build/configure-ntpconf.sh", - "./scripts/build/configure-max-files-limitation.sh", - "./scripts/build/configure-shell.sh" + "${path.root}/../scripts/build/install-xcode-clt.sh", + "${path.root}/../scripts/build/configure-network-interface-detection.sh", + "${path.root}/../scripts/build/configure-autologin.sh", + "${path.root}/../scripts/build/configure-auto-updates.sh", + "${path.root}/../scripts/build/configure-screensaver.sh", + "${path.root}/../scripts/build/configure-ntpconf.sh", + "${path.root}/../scripts/build/configure-max-files-limitation.sh", + "${path.root}/../scripts/build/configure-shell.sh" ] } @@ -187,9 +191,9 @@ build { environment_vars = ["IMAGE_VERSION=${var.build_id}", "IMAGE_OS=${var.image_os}"] execute_command = "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}" scripts = [ - "./scripts/build/configure-preimagedata.sh", - "./scripts/build/configure-ssh.sh", - "./scripts/build/configure-machine.sh" + "${path.root}/../scripts/build/configure-preimagedata.sh", + "${path.root}/../scripts/build/configure-ssh.sh", + "${path.root}/../scripts/build/configure-machine.sh" ] } @@ -200,28 +204,28 @@ build { } provisioner "shell" { - environment_vars = ["API_PAT=${var.github_api_pat}"] + environment_vars = ["API_PAT=${var.github_api_pat}", "IMAGE_FOLDER=${local.image_folder}"] execute_command = "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}" pause_before = "30s" scripts = [ - "./scripts/build/configure-windows.sh", - "./scripts/build/install-powershell.sh", - "./scripts/build/install-dotnet.sh", - "./scripts/build/install-python.sh", - "./scripts/build/install-azcopy.sh", - "./scripts/build/install-openssl.sh", - "./scripts/build/install-ruby.sh", - "./scripts/build/install-rubygems.sh", - "./scripts/build/install-git.sh", - "./scripts/build/install-mongodb.sh", - "./scripts/build/install-node.sh" + "${path.root}/../scripts/build/configure-windows.sh", + "${path.root}/../scripts/build/install-powershell.sh", + "${path.root}/../scripts/build/install-dotnet.sh", + "${path.root}/../scripts/build/install-python.sh", + "${path.root}/../scripts/build/install-azcopy.sh", + "${path.root}/../scripts/build/install-openssl.sh", + "${path.root}/../scripts/build/install-ruby.sh", + "${path.root}/../scripts/build/install-rubygems.sh", + "${path.root}/../scripts/build/install-git.sh", + "${path.root}/../scripts/build/install-mongodb.sh", + "${path.root}/../scripts/build/install-node.sh" ] } provisioner "shell" { - environment_vars = ["XCODE_INSTALL_STORAGE_URL=${var.xcode_install_storage_url}", "XCODE_INSTALL_SAS=${var.xcode_install_sas}"] + environment_vars = ["XCODE_INSTALL_STORAGE_URL=${var.xcode_install_storage_url}", "XCODE_INSTALL_SAS=${var.xcode_install_sas}", "IMAGE_FOLDER=${local.image_folder}"] execute_command = "chmod +x {{ .Path }}; {{ .Vars }} pwsh -f {{ .Path }}" - script = "./scripts/build/Install-Xcode.ps1" + script = "${path.root}/../scripts/build/Install-Xcode.ps1" } provisioner "shell" { @@ -231,73 +235,75 @@ build { } provisioner "shell" { - environment_vars = ["API_PAT=${var.github_api_pat}"] + environment_vars = ["API_PAT=${var.github_api_pat}", "IMAGE_FOLDER=${local.image_folder}"] execute_command = "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}" scripts = [ - "./scripts/build/install-actions-cache.sh", - "./scripts/build/install-common-utils.sh", - "./scripts/build/install-llvm.sh", - "./scripts/build/install-golang.sh", - "./scripts/build/install-swiftlint.sh", - "./scripts/build/install-openjdk.sh", - "./scripts/build/install-php.sh", - "./scripts/build/install-aws-tools.sh", - "./scripts/build/install-rust.sh", - "./scripts/build/install-gcc.sh", - "./scripts/build/install-haskell.sh", - "./scripts/build/install-cocoapods.sh", - "./scripts/build/install-android-sdk.sh", - "./scripts/build/install-xamarin.sh", - "./scripts/build/install-visualstudio.sh", - "./scripts/build/install-nvm.sh", - "./scripts/build/install-apache.sh", - "./scripts/build/install-nginx.sh", - "./scripts/build/install-postgresql.sh", - "./scripts/build/install-audiodevice.sh", - "./scripts/build/install-vcpkg.sh", - "./scripts/build/install-miniconda.sh", - "./scripts/build/install-safari.sh", - "./scripts/build/install-chrome.sh", - "./scripts/build/install-edge.sh", - "./scripts/build/install-firefox.sh", - "./scripts/build/install-pypy.sh", - "./scripts/build/install-pipx-packages.sh", - "./scripts/build/install-bicep.sh", - "./scripts/build/install-codeql-bundle.sh" + "${path.root}/../scripts/build/install-actions-cache.sh", + "${path.root}/../scripts/build/install-common-utils.sh", + "${path.root}/../scripts/build/install-llvm.sh", + "${path.root}/../scripts/build/install-golang.sh", + "${path.root}/../scripts/build/install-swiftlint.sh", + "${path.root}/../scripts/build/install-openjdk.sh", + "${path.root}/../scripts/build/install-php.sh", + "${path.root}/../scripts/build/install-aws-tools.sh", + "${path.root}/../scripts/build/install-rust.sh", + "${path.root}/../scripts/build/install-gcc.sh", + "${path.root}/../scripts/build/install-haskell.sh", + "${path.root}/../scripts/build/install-cocoapods.sh", + "${path.root}/../scripts/build/install-android-sdk.sh", + "${path.root}/../scripts/build/install-xamarin.sh", + "${path.root}/../scripts/build/install-visualstudio.sh", + "${path.root}/../scripts/build/install-nvm.sh", + "${path.root}/../scripts/build/install-apache.sh", + "${path.root}/../scripts/build/install-nginx.sh", + "${path.root}/../scripts/build/install-postgresql.sh", + "${path.root}/../scripts/build/install-audiodevice.sh", + "${path.root}/../scripts/build/install-vcpkg.sh", + "${path.root}/../scripts/build/install-miniconda.sh", + "${path.root}/../scripts/build/install-safari.sh", + "${path.root}/../scripts/build/install-chrome.sh", + "${path.root}/../scripts/build/install-edge.sh", + "${path.root}/../scripts/build/install-firefox.sh", + "${path.root}/../scripts/build/install-pypy.sh", + "${path.root}/../scripts/build/install-pipx-packages.sh", + "${path.root}/../scripts/build/install-bicep.sh", + "${path.root}/../scripts/build/install-codeql-bundle.sh" ] } provisioner "shell" { - execute_command = "chmod +x {{ .Path }}; {{ .Vars }} pwsh -f {{ .Path }}" - scripts = [ - "./scripts/build/Install-Toolset.ps1", - "./scripts/build/Configure-Toolset.ps1" + environment_vars = ["IMAGE_FOLDER=${local.image_folder}"] + execute_command = "chmod +x {{ .Path }}; {{ .Vars }} pwsh -f {{ .Path }}" + scripts = [ + "${path.root}/../scripts/build/Install-Toolset.ps1", + "${path.root}/../scripts/build/Configure-Toolset.ps1" ] } provisioner "shell" { execute_command = "ruby {{ .Path }}" - script = "./scripts/build/configure-xcode-simulators.rb" + script = "${path.root}/../scripts/build/configure-xcode-simulators.rb" } provisioner "shell" { - inline = [ - "pwsh -File \"$HOME/image-generation/software-report/Generate-SoftwareReport.ps1\" -OutputDirectory \"$HOME/image-generation/output/software-report\" -ImageName ${var.build_id}", - "pwsh -File \"$HOME/image-generation/tests/RunAll-Tests.ps1\"" + environment_vars = ["IMAGE_FOLDER=${local.image_folder}"] + inline = [ + "pwsh -File \"${local.image_folder}/software-report/Generate-SoftwareReport.ps1\" -OutputDirectory \"${local.image_folder}/output/software-report\" -ImageName ${var.build_id}", + "pwsh -File \"${local.image_folder}/tests/RunAll-Tests.ps1\"" ] } provisioner "file" { - destination = "../image-output/" + destination = "${path.root}/../../image-output/" direction = "download" - source = "~/image-generation/output/*" + source = "${local.image_folder}/output/*" } provisioner "shell" { execute_command = "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}" scripts = [ - "./scripts/build/configure-hostname.sh", - "./scripts/build/configure-system.sh" + "${path.root}/../scripts/build/configure-hostname.sh", + "${path.root}/../scripts/build/configure-system.sh" ] } } diff --git a/images/macos/templates/macOS-12.anka.pkr.hcl b/images/macos/templates/macOS-12.anka.pkr.hcl index 2e852325c673..6ff847173a69 100644 --- a/images/macos/templates/macOS-12.anka.pkr.hcl +++ b/images/macos/templates/macOS-12.anka.pkr.hcl @@ -2,11 +2,15 @@ packer { required_plugins { veertu-anka = { version = ">= v3.2.0" - source = "github.com/veertuinc/veertu-anka" + source = "github.com/veertuinc/veertu-anka" } } } +locals { + image_folder = "/Users/${var.vm_username}/image-generation" +} + variable "source_vm_name" { type = string } @@ -20,259 +24,262 @@ variable "build_id" { } variable "vm_username" { - type = string + type = string sensitive = true } variable "vm_password" { - type = string + type = string sensitive = true } variable "github_api_pat" { - type = string + type = string default = "" } variable "xcode_install_storage_url" { - type = string + type = string sensitive = true } variable "xcode_install_sas" { - type = string + type = string sensitive = true } variable "vcpu_count" { - type = string + type = string default = "6" } variable "ram_size" { - type = string + type = string default = "24G" } variable "image_os" { - type = string + type = string default = "macos12" } source "veertu-anka-vm-clone" "template" { - vm_name = "${var.build_id}" + vm_name = "${var.build_id}" source_vm_name = "${var.source_vm_name}" - source_vm_tag = "${var.source_vm_tag}" - vcpu_count = "${var.vcpu_count}" - ram_size = "${var.ram_size}" - stop_vm = "true" + source_vm_tag = "${var.source_vm_tag}" + vcpu_count = "${var.vcpu_count}" + ram_size = "${var.ram_size}" + stop_vm = "true" } build { - sources = [ - "source.veertu-anka-vm-clone.template" - ] + sources = ["source.veertu-anka-vm-clone.template"] + provisioner "shell" { - inline = [ - "mkdir ~/image-generation" - ] + inline = ["mkdir ${local.image_folder}"] } + provisioner "file" { - destination = "image-generation/" + destination = "${local.image_folder}/" sources = [ - "./assets/xamarin-selector", - "./scripts/tests", - "./scripts/docs-gen", - "./scripts/helpers" + "${path.root}/../assets/xamarin-selector", + "${path.root}/../scripts/tests", + "${path.root}/../scripts/docs-gen", + "${path.root}/../scripts/helpers" ] } + provisioner "file" { - destination = "image-generation/docs-gen/" - source = "../../helpers/software-report-base" + destination = "${local.image_folder}/docs-gen/" + source = "${path.root}/../../../helpers/software-report-base" } + provisioner "file" { - destination = "image-generation/add-certificate.swift" - source = "./assets/add-certificate.swift" + destination = "${local.image_folder}/add-certificate.swift" + source = "${path.root}/../assets/add-certificate.swift" } + provisioner "file" { destination = ".bashrc" - source = "./assets/bashrc" + source = "${path.root}/../assets/bashrc" } + provisioner "file" { destination = ".bash_profile" - source = "./assets/bashprofile" + source = "${path.root}/../assets/bashprofile" } + provisioner "shell" { - inline = [ - "mkdir ~/bootstrap" - ] + inline = [ "mkdir ~/bootstrap" ] } + provisioner "file" { destination = "bootstrap" - source = "./assets/bootstrap-provisioner/" + source = "${path.root}/../assets/bootstrap-provisioner/" } + provisioner "file" { - destination = "image-generation/toolset.json" - source = "./toolsets/toolset-12.json" + destination = "${local.image_folder}/toolset.json" + source = "${path.root}/../toolsets/toolset-12.json" } provisioner "shell" { execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" inline = [ - "mv ~/image-generation/docs-gen ~/image-generation/software-report", - "mv ~/image-generation/xamarin-selector ~/image-generation/assets", + "mv ${local.image_folder}/docs-gen ${local.image_folder}/software-report", + "mv ${local.image_folder}/xamarin-selector ${local.image_folder}/assets", "mkdir ~/utils", - "mv ~/image-generation/helpers/confirm-identified-developers.scpt ~/utils", - "mv ~/image-generation/helpers/invoke-tests.sh ~/utils", - "mv ~/image-generation/helpers/utils.sh ~/utils", - "mv ~/image-generation/helpers/xamarin-utils.sh ~/utils" + "mv ${local.image_folder}/helpers/confirm-identified-developers.scpt ~/utils", + "mv ${local.image_folder}/helpers/invoke-tests.sh ~/utils", + "mv ${local.image_folder}/helpers/utils.sh ~/utils", + "mv ${local.image_folder}/helpers/xamarin-utils.sh ~/utils" ] } provisioner "shell" { - scripts = [ - "./scripts/build/install-xcode-clt.sh", - "./scripts/build/install-homebrew.sh" - ] execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" + scripts = [ + "${path.root}/../scripts/build/install-xcode-clt.sh", + "${path.root}/../scripts/build/install-homebrew.sh" + ] } + provisioner "shell" { - scripts = [ - "./scripts/build/configure-tccdb-macos.sh", - "./scripts/build/configure-network-interface-detection.sh", - "./scripts/build/configure-autologin.sh", - "./scripts/build/configure-auto-updates.sh", - "./scripts/build/configure-screensaver.sh", - "./scripts/build/configure-ntpconf.sh", - "./scripts/build/configure-max-files-limitation.sh", - "./scripts/build/configure-shell.sh" - ] - environment_vars = [ - "PASSWORD=${var.vm_password}", - "USERNAME=${var.vm_username}" + environment_vars = ["PASSWORD=${var.vm_password}", "USERNAME=${var.vm_username}"] + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}" + scripts = [ + "${path.root}/../scripts/build/configure-tccdb-macos.sh", + "${path.root}/../scripts/build/configure-network-interface-detection.sh", + "${path.root}/../scripts/build/configure-autologin.sh", + "${path.root}/../scripts/build/configure-auto-updates.sh", + "${path.root}/../scripts/build/configure-screensaver.sh", + "${path.root}/../scripts/build/configure-ntpconf.sh", + "${path.root}/../scripts/build/configure-max-files-limitation.sh", + "${path.root}/../scripts/build/configure-shell.sh" ] - execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}" } + provisioner "shell" { - scripts = [ - "./scripts/build/configure-preimagedata.sh", - "./scripts/build/configure-ssh.sh", - "./scripts/build/configure-machine.sh" + environment_vars = ["IMAGE_VERSION=${var.build_id}", "IMAGE_OS=${var.image_os}", "PASSWORD=${var.vm_password}"] + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" + scripts = [ + "${path.root}/../scripts/build/configure-preimagedata.sh", + "${path.root}/../scripts/build/configure-ssh.sh", + "${path.root}/../scripts/build/configure-machine.sh" ] - environment_vars = [ - "IMAGE_VERSION=${var.build_id}", - "IMAGE_OS=${var.image_os}", - "PASSWORD=${var.vm_password}" - ] - execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" } + provisioner "shell" { execute_command = "source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}" expect_disconnect = true inline = ["echo 'Reboot VM'", "shutdown -r now"] } + provisioner "shell" { - pause_before = "30s" - scripts = [ - "./scripts/build/configure-windows.sh", - "./scripts/build/install-powershell.sh", - "./scripts/build/install-dotnet.sh", - "./scripts/build/install-python.sh", - "./scripts/build/install-azcopy.sh", - "./scripts/build/install-openssl.sh", - "./scripts/build/install-ruby.sh", - "./scripts/build/install-rubygems.sh", - "./scripts/build/install-git.sh", - "./scripts/build/install-mongodb.sh", - "./scripts/build/install-node.sh", - "./scripts/build/install-common-utils.sh" - ] - environment_vars = [ - "API_PAT=${var.github_api_pat}", - "USER_PASSWORD=${var.vm_password}" + environment_vars = ["API_PAT=${var.github_api_pat}", "USER_PASSWORD=${var.vm_password}", "IMAGE_FOLDER=${local.image_folder}"] + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" + pause_before = "30s" + scripts = [ + "${path.root}/../scripts/build/configure-windows.sh", + "${path.root}/../scripts/build/install-powershell.sh", + "${path.root}/../scripts/build/install-dotnet.sh", + "${path.root}/../scripts/build/install-python.sh", + "${path.root}/../scripts/build/install-azcopy.sh", + "${path.root}/../scripts/build/install-openssl.sh", + "${path.root}/../scripts/build/install-ruby.sh", + "${path.root}/../scripts/build/install-rubygems.sh", + "${path.root}/../scripts/build/install-git.sh", + "${path.root}/../scripts/build/install-mongodb.sh", + "${path.root}/../scripts/build/install-node.sh", + "${path.root}/../scripts/build/install-common-utils.sh" ] - execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" } + provisioner "shell" { - script = "./scripts/build/Install-Xcode.ps1" - environment_vars = [ - "XCODE_INSTALL_STORAGE_URL=${var.xcode_install_storage_url}", - "XCODE_INSTALL_SAS=${var.xcode_install_sas}" - ] - execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} pwsh -f {{ .Path }}" + environment_vars = ["XCODE_INSTALL_STORAGE_URL=${var.xcode_install_storage_url}", "XCODE_INSTALL_SAS=${var.xcode_install_sas}", "IMAGE_FOLDER=${local.image_folder}"] + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} pwsh -f {{ .Path }}" + script = "${path.root}/../scripts/build/Install-Xcode.ps1" } + provisioner "shell" { execute_command = "source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}" expect_disconnect = true inline = ["echo 'Reboot VM'", "shutdown -r now"] } + provisioner "shell" { - scripts = [ - "./scripts/build/install-actions-cache.sh", - "./scripts/build/install-llvm.sh", - "./scripts/build/install-golang.sh", - "./scripts/build/install-swiftlint.sh", - "./scripts/build/install-openjdk.sh", - "./scripts/build/install-php.sh", - "./scripts/build/install-aws-tools.sh", - "./scripts/build/install-rust.sh", - "./scripts/build/install-gcc.sh", - "./scripts/build/install-haskell.sh", - "./scripts/build/install-cocoapods.sh", - "./scripts/build/install-android-sdk.sh", - "./scripts/build/install-xamarin.sh", - "./scripts/build/install-visualstudio.sh", - "./scripts/build/install-nvm.sh", - "./scripts/build/install-apache.sh", - "./scripts/build/install-nginx.sh", - "./scripts/build/install-postgresql.sh", - "./scripts/build/install-audiodevice.sh", - "./scripts/build/install-vcpkg.sh", - "./scripts/build/install-miniconda.sh", - "./scripts/build/install-safari.sh", - "./scripts/build/install-chrome.sh", - "./scripts/build/install-edge.sh", - "./scripts/build/install-firefox.sh", - "./scripts/build/install-pypy.sh", - "./scripts/build/install-pipx-packages.sh", - "./scripts/build/install-bicep.sh", - "./scripts/build/install-codeql-bundle.sh" - ] - environment_vars = [ - "API_PAT=${var.github_api_pat}" + environment_vars = ["API_PAT=${var.github_api_pat}", "IMAGE_FOLDER=${local.image_folder}"] + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" + scripts = [ + "${path.root}/../scripts/build/install-actions-cache.sh", + "${path.root}/../scripts/build/install-llvm.sh", + "${path.root}/../scripts/build/install-golang.sh", + "${path.root}/../scripts/build/install-swiftlint.sh", + "${path.root}/../scripts/build/install-openjdk.sh", + "${path.root}/../scripts/build/install-php.sh", + "${path.root}/../scripts/build/install-aws-tools.sh", + "${path.root}/../scripts/build/install-rust.sh", + "${path.root}/../scripts/build/install-gcc.sh", + "${path.root}/../scripts/build/install-haskell.sh", + "${path.root}/../scripts/build/install-cocoapods.sh", + "${path.root}/../scripts/build/install-android-sdk.sh", + "${path.root}/../scripts/build/install-xamarin.sh", + "${path.root}/../scripts/build/install-visualstudio.sh", + "${path.root}/../scripts/build/install-nvm.sh", + "${path.root}/../scripts/build/install-apache.sh", + "${path.root}/../scripts/build/install-nginx.sh", + "${path.root}/../scripts/build/install-postgresql.sh", + "${path.root}/../scripts/build/install-audiodevice.sh", + "${path.root}/../scripts/build/install-vcpkg.sh", + "${path.root}/../scripts/build/install-miniconda.sh", + "${path.root}/../scripts/build/install-safari.sh", + "${path.root}/../scripts/build/install-chrome.sh", + "${path.root}/../scripts/build/install-edge.sh", + "${path.root}/../scripts/build/install-firefox.sh", + "${path.root}/../scripts/build/install-pypy.sh", + "${path.root}/../scripts/build/install-pipx-packages.sh", + "${path.root}/../scripts/build/install-bicep.sh", + "${path.root}/../scripts/build/install-codeql-bundle.sh" ] - execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" } + provisioner "shell" { - scripts = [ - "./scripts/build/Install-Toolset.ps1", - "./scripts/build/Configure-Toolset.ps1" + environment_vars = ["IMAGE_FOLDER=${local.image_folder}"] + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} pwsh -f {{ .Path }}" + scripts = [ + "${path.root}/../scripts/build/Install-Toolset.ps1", + "${path.root}/../scripts/build/Configure-Toolset.ps1" ] - execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} pwsh -f {{ .Path }}" } + provisioner "shell" { - script = "./scripts/build/configure-xcode-simulators.rb" execute_command = "source $HOME/.bash_profile; ruby {{ .Path }}" + script = "${path.root}/../scripts/build/configure-xcode-simulators.rb" } + provisioner "shell" { - script = "./scripts/build/Update-XcodeSimulators.ps1" - execute_command = "chmod +x {{ .Path }}; {{ .Vars }} pwsh -f {{ .Path }}" + execute_command = "chmod +x {{ .Path }}; {{ .Vars }} pwsh -f {{ .Path }}" + script = "${path.root}/../scripts/build/Update-XcodeSimulators.ps1" } + provisioner "shell" { - inline = [ - "pwsh -File \"$HOME/image-generation/software-report/Generate-SoftwareReport.ps1\" -OutputDirectory \"$HOME/image-generation/output/software-report\" -ImageName ${var.build_id}", - "pwsh -File \"$HOME/image-generation/tests/RunAll-Tests.ps1\"" + environment_vars = ["IMAGE_FOLDER=${local.image_folder}"] + execute_command = "source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" + inline = [ + "pwsh -File \"${local.image_folder}/software-report/Generate-SoftwareReport.ps1\" -OutputDirectory \"${local.image_folder}/output/software-report\" -ImageName ${var.build_id}", + "pwsh -File \"${local.image_folder}/tests/RunAll-Tests.ps1\"" ] - execute_command = "source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" } + provisioner "file" { - destination = "../image-output/" - direction = "download" - source = "./image-generation/output/" + destination = "${path.root}/../../image-output/" + direction = "download" + source = "${local.image_folder}/output/" } + provisioner "shell" { - scripts = [ - "./scripts/build/configure-hostname.sh", - "./scripts/build/configure-system.sh" - ] execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" + scripts = [ + "${path.root}/../scripts/build/configure-hostname.sh", + "${path.root}/../scripts/build/configure-system.sh" + ] } } diff --git a/images/macos/templates/macOS-12.pkr.hcl b/images/macos/templates/macOS-12.pkr.hcl index 8d27481be137..1c6d2f9caeb9 100644 --- a/images/macos/templates/macOS-12.pkr.hcl +++ b/images/macos/templates/macOS-12.pkr.hcl @@ -7,6 +7,10 @@ packer { } } +locals { + image_folder = "/Users/${var.vm_username}/image-generation" +} + variable "baseimage_name" { type = string } @@ -100,37 +104,37 @@ build { sources = ["source.vsphere-clone.template"] provisioner "shell" { - inline = ["mkdir ~/image-generation"] + inline = ["mkdir ${local.image_folder}"] } provisioner "file" { - destination = "~/image-generation/" + destination = "${local.image_folder}/" sources = [ - "./assets/xamarin-selector", - "./scripts/tests", - "./scripts/docs-gen", - "./scripts/helpers" + "${path.root}/../assets/xamarin-selector", + "${path.root}/../scripts/tests", + "${path.root}/../scripts/docs-gen", + "${path.root}/../scripts/helpers" ] } provisioner "file" { - destination = "~/image-generation/docs-gen/" - source = "../../helpers/software-report-base" + destination = "${local.image_folder}/docs-gen/" + source = "${path.root}/../../../helpers/software-report-base" } provisioner "file" { - destination = "~/image-generation/add-certificate.swift" - source = "./assets/add-certificate.swift" + destination = "${local.image_folder}/add-certificate.swift" + source = "${path.root}/../assets/add-certificate.swift" } provisioner "file" { destination = "~/.bashrc" - source = "./assets/bashrc" + source = "${path.root}/../assets/bashrc" } provisioner "file" { destination = "~/.bash_profile" - source = "./assets/bashprofile" + source = "${path.root}/../assets/bashprofile" } provisioner "shell" { @@ -139,32 +143,32 @@ build { provisioner "file" { destination = "~/bootstrap" - source = "./assets/bootstrap-provisioner/" + source = "${path.root}/../assets/bootstrap-provisioner/" } provisioner "file" { - destination = "~/image-generation/toolset.json" - source = "./toolsets/toolset-12.json" + destination = "${local.image_folder}/toolset.json" + source = "${path.root}/../toolsets/toolset-12.json" } provisioner "shell" { execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" inline = [ - "mv ~/image-generation/docs-gen ~/image-generation/software-report", - "mv ~/image-generation/xamarin-selector ~/image-generation/assets", + "mv ${local.image_folder}/docs-gen ${local.image_folder}/software-report", + "mv ${local.image_folder}/xamarin-selector ${local.image_folder}/assets", "mkdir ~/utils", - "mv ~/image-generation/helpers/confirm-identified-developers.scpt ~/utils", - "mv ~/image-generation/helpers/invoke-tests.sh ~/utils", - "mv ~/image-generation/helpers/utils.sh ~/utils", - "mv ~/image-generation/helpers/xamarin-utils.sh ~/utils" + "mv ${local.image_folder}/helpers/confirm-identified-developers.scpt ~/utils", + "mv ${local.image_folder}/helpers/invoke-tests.sh ~/utils", + "mv ${local.image_folder}/helpers/utils.sh ~/utils", + "mv ${local.image_folder}/helpers/xamarin-utils.sh ~/utils" ] } provisioner "shell" { execute_command = "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}" scripts = [ - "./scripts/build/install-xcode-clt.sh", - "./scripts/build/install-homebrew.sh" + "${path.root}/../scripts/build/install-xcode-clt.sh", + "${path.root}/../scripts/build/install-homebrew.sh" ] } @@ -172,13 +176,13 @@ build { environment_vars = ["PASSWORD=${var.vm_password}", "USERNAME=${var.vm_username}"] execute_command = "chmod +x {{ .Path }}; sudo {{ .Vars }} {{ .Path }}" scripts = [ - "./scripts/build/configure-network-interface-detection.sh", - "./scripts/build/configure-autologin.sh", - "./scripts/build/configure-auto-updates.sh", - "./scripts/build/configure-screensaver.sh", - "./scripts/build/configure-ntpconf.sh", - "./scripts/build/configure-max-files-limitation.sh", - "./scripts/build/configure-shell.sh" + "${path.root}/../scripts/build/configure-network-interface-detection.sh", + "${path.root}/../scripts/build/configure-autologin.sh", + "${path.root}/../scripts/build/configure-auto-updates.sh", + "${path.root}/../scripts/build/configure-screensaver.sh", + "${path.root}/../scripts/build/configure-ntpconf.sh", + "${path.root}/../scripts/build/configure-max-files-limitation.sh", + "${path.root}/../scripts/build/configure-shell.sh" ] } @@ -186,9 +190,9 @@ build { environment_vars = ["IMAGE_VERSION=${var.build_id}", "IMAGE_OS=${var.image_os}", "PASSWORD=${var.vm_password}"] execute_command = "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}" scripts = [ - "./scripts/build/configure-preimagedata.sh", - "./scripts/build/configure-ssh.sh", - "./scripts/build/configure-machine.sh" + "${path.root}/../scripts/build/configure-preimagedata.sh", + "${path.root}/../scripts/build/configure-ssh.sh", + "${path.root}/../scripts/build/configure-machine.sh" ] } @@ -199,29 +203,29 @@ build { } provisioner "shell" { - environment_vars = ["API_PAT=${var.github_api_pat}", "USER_PASSWORD=${var.vm_password}"] + environment_vars = ["API_PAT=${var.github_api_pat}", "USER_PASSWORD=${var.vm_password}", "IMAGE_FOLDER=${local.image_folder}"] execute_command = "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}" pause_before = "30s" scripts = [ - "./scripts/build/configure-windows.sh", - "./scripts/build/install-powershell.sh", - "./scripts/build/install-dotnet.sh", - "./scripts/build/install-python.sh", - "./scripts/build/install-azcopy.sh", - "./scripts/build/install-openssl.sh", - "./scripts/build/install-ruby.sh", - "./scripts/build/install-rubygems.sh", - "./scripts/build/install-git.sh", - "./scripts/build/install-mongodb.sh", - "./scripts/build/install-node.sh", - "./scripts/build/install-common-utils.sh" + "${path.root}/../scripts/build/configure-windows.sh", + "${path.root}/../scripts/build/install-powershell.sh", + "${path.root}/../scripts/build/install-dotnet.sh", + "${path.root}/../scripts/build/install-python.sh", + "${path.root}/../scripts/build/install-azcopy.sh", + "${path.root}/../scripts/build/install-openssl.sh", + "${path.root}/../scripts/build/install-ruby.sh", + "${path.root}/../scripts/build/install-rubygems.sh", + "${path.root}/../scripts/build/install-git.sh", + "${path.root}/../scripts/build/install-mongodb.sh", + "${path.root}/../scripts/build/install-node.sh", + "${path.root}/../scripts/build/install-common-utils.sh" ] } provisioner "shell" { - environment_vars = ["XCODE_INSTALL_STORAGE_URL=${var.xcode_install_storage_url}", "XCODE_INSTALL_SAS=${var.xcode_install_sas}"] + environment_vars = ["XCODE_INSTALL_STORAGE_URL=${var.xcode_install_storage_url}", "XCODE_INSTALL_SAS=${var.xcode_install_sas}", "IMAGE_FOLDER=${local.image_folder}"] execute_command = "chmod +x {{ .Path }}; {{ .Vars }} pwsh -f {{ .Path }}" - script = "./scripts/build/Install-Xcode.ps1" + script = "${path.root}/../scripts/build/Install-Xcode.ps1" } provisioner "shell" { @@ -231,77 +235,79 @@ build { } provisioner "shell" { - environment_vars = ["API_PAT=${var.github_api_pat}"] + environment_vars = ["API_PAT=${var.github_api_pat}", "IMAGE_FOLDER=${local.image_folder}"] execute_command = "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}" scripts = [ - "./scripts/build/install-actions-cache.sh", - "./scripts/build/install-llvm.sh", - "./scripts/build/install-golang.sh", - "./scripts/build/install-swiftlint.sh", - "./scripts/build/install-openjdk.sh", - "./scripts/build/install-php.sh", - "./scripts/build/install-aws-tools.sh", - "./scripts/build/install-rust.sh", - "./scripts/build/install-gcc.sh", - "./scripts/build/install-haskell.sh", - "./scripts/build/install-cocoapods.sh", - "./scripts/build/install-android-sdk.sh", - "./scripts/build/install-xamarin.sh", - "./scripts/build/install-visualstudio.sh", - "./scripts/build/install-nvm.sh", - "./scripts/build/install-apache.sh", - "./scripts/build/install-nginx.sh", - "./scripts/build/install-postgresql.sh", - "./scripts/build/install-audiodevice.sh", - "./scripts/build/install-vcpkg.sh", - "./scripts/build/install-miniconda.sh", - "./scripts/build/install-safari.sh", - "./scripts/build/install-chrome.sh", - "./scripts/build/install-edge.sh", - "./scripts/build/install-firefox.sh", - "./scripts/build/install-pypy.sh", - "./scripts/build/install-pipx-packages.sh", - "./scripts/build/install-bicep.sh", - "./scripts/build/install-codeql-bundle.sh" + "${path.root}/../scripts/build/install-actions-cache.sh", + "${path.root}/../scripts/build/install-llvm.sh", + "${path.root}/../scripts/build/install-golang.sh", + "${path.root}/../scripts/build/install-swiftlint.sh", + "${path.root}/../scripts/build/install-openjdk.sh", + "${path.root}/../scripts/build/install-php.sh", + "${path.root}/../scripts/build/install-aws-tools.sh", + "${path.root}/../scripts/build/install-rust.sh", + "${path.root}/../scripts/build/install-gcc.sh", + "${path.root}/../scripts/build/install-haskell.sh", + "${path.root}/../scripts/build/install-cocoapods.sh", + "${path.root}/../scripts/build/install-android-sdk.sh", + "${path.root}/../scripts/build/install-xamarin.sh", + "${path.root}/../scripts/build/install-visualstudio.sh", + "${path.root}/../scripts/build/install-nvm.sh", + "${path.root}/../scripts/build/install-apache.sh", + "${path.root}/../scripts/build/install-nginx.sh", + "${path.root}/../scripts/build/install-postgresql.sh", + "${path.root}/../scripts/build/install-audiodevice.sh", + "${path.root}/../scripts/build/install-vcpkg.sh", + "${path.root}/../scripts/build/install-miniconda.sh", + "${path.root}/../scripts/build/install-safari.sh", + "${path.root}/../scripts/build/install-chrome.sh", + "${path.root}/../scripts/build/install-edge.sh", + "${path.root}/../scripts/build/install-firefox.sh", + "${path.root}/../scripts/build/install-pypy.sh", + "${path.root}/../scripts/build/install-pipx-packages.sh", + "${path.root}/../scripts/build/install-bicep.sh", + "${path.root}/../scripts/build/install-codeql-bundle.sh" ] } provisioner "shell" { - execute_command = "chmod +x {{ .Path }}; {{ .Vars }} pwsh -f {{ .Path }}" - scripts = [ - "./scripts/build/Install-Toolset.ps1", - "./scripts/build/Configure-Toolset.ps1" + environment_vars = ["IMAGE_FOLDER=${local.image_folder}"] + execute_command = "chmod +x {{ .Path }}; {{ .Vars }} pwsh -f {{ .Path }}" + scripts = [ + "${path.root}/../scripts/build/Install-Toolset.ps1", + "${path.root}/../scripts/build/Configure-Toolset.ps1" ] } provisioner "shell" { execute_command = "ruby {{ .Path }}" - script = "./scripts/build/configure-xcode-simulators.rb" + script = "${path.root}/../scripts/build/configure-xcode-simulators.rb" } provisioner "shell" { execute_command = "chmod +x {{ .Path }}; {{ .Vars }} pwsh -f {{ .Path }}" - script = "./scripts/build/Update-XcodeSimulators.ps1" + script = "${path.root}/../scripts/build/Update-XcodeSimulators.ps1" } provisioner "shell" { - inline = [ - "pwsh -File \"$HOME/image-generation/software-report/Generate-SoftwareReport.ps1\" -OutputDirectory \"$HOME/image-generation/output/software-report\" -ImageName ${var.build_id}", - "pwsh -File \"$HOME/image-generation/tests/RunAll-Tests.ps1\"" + environment_vars = ["IMAGE_FOLDER=${local.image_folder}"] + inline = [ + "pwsh -File \"${local.image_folder}/software-report/Generate-SoftwareReport.ps1\" -OutputDirectory \"${local.image_folder}/output/software-report\" -ImageName ${var.build_id}", + "pwsh -File \"${local.image_folder}/tests/RunAll-Tests.ps1\"" ] } provisioner "file" { - destination = "../image-output/" + destination = "${path.root}/../../image-output/" direction = "download" - source = "~/image-generation/output/*" + source = "${local.image_folder}/output/*" } provisioner "shell" { execute_command = "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}" scripts = [ - "./scripts/build/configure-hostname.sh", - "./scripts/build/configure-system.sh" + "${path.root}/../scripts/build/configure-hostname.sh", + "${path.root}/../scripts/build/configure-system.sh" ] } } diff --git a/images/macos/templates/macOS-13.anka.pkr.hcl b/images/macos/templates/macOS-13.anka.pkr.hcl index 5600b2ef3507..6eb430615b04 100644 --- a/images/macos/templates/macOS-13.anka.pkr.hcl +++ b/images/macos/templates/macOS-13.anka.pkr.hcl @@ -2,11 +2,15 @@ packer { required_plugins { veertu-anka = { version = ">= v3.2.0" - source = "github.com/veertuinc/veertu-anka" + source = "github.com/veertuinc/veertu-anka" } } } +locals { + image_folder = "/Users/${var.vm_username}/image-generation" +} + variable "source_vm_name" { type = string } @@ -20,246 +24,249 @@ variable "build_id" { } variable "vm_username" { - type = string + type = string sensitive = true } variable "vm_password" { - type = string + type = string sensitive = true } variable "github_api_pat" { - type = string + type = string default = "" } variable "xcode_install_storage_url" { - type = string + type = string sensitive = true } variable "xcode_install_sas" { - type = string + type = string sensitive = true } variable "vcpu_count" { - type = string + type = string default = "6" } variable "ram_size" { - type = string + type = string default = "24G" } variable "image_os" { - type = string + type = string default = "macos13" } source "veertu-anka-vm-clone" "template" { - vm_name = "${var.build_id}" + vm_name = "${var.build_id}" source_vm_name = "${var.source_vm_name}" - source_vm_tag = "${var.source_vm_tag}" - vcpu_count = "${var.vcpu_count}" - ram_size = "${var.ram_size}" - stop_vm = "true" + source_vm_tag = "${var.source_vm_tag}" + vcpu_count = "${var.vcpu_count}" + ram_size = "${var.ram_size}" + stop_vm = "true" } build { - sources = [ - "source.veertu-anka-vm-clone.template" - ] + sources = ["source.veertu-anka-vm-clone.template"] + provisioner "shell" { - inline = [ - "mkdir ~/image-generation" - ] + inline = ["mkdir ${local.image_folder}"] } + provisioner "file" { - destination = "image-generation/" - sources = [ - "./assets/xamarin-selector", - "./scripts/tests", - "./scripts/docs-gen", - "./scripts/helpers" + destination = "${local.image_folder}/" + sources = [ + "${path.root}/../assets/xamarin-selector", + "${path.root}/../scripts/tests", + "${path.root}/../scripts/docs-gen", + "${path.root}/../scripts/helpers" ] } + provisioner "file" { - destination = "image-generation/docs-gen/" - source = "../../helpers/software-report-base" + destination = "${local.image_folder}/docs-gen/" + source = "${path.root}/../../../helpers/software-report-base" } + provisioner "file" { - destination = "image-generation/add-certificate.swift" - source = "./assets/add-certificate.swift" + destination = "${local.image_folder}/add-certificate.swift" + source = "${path.root}/../assets/add-certificate.swift" } + provisioner "file" { destination = ".bashrc" - source = "./assets/bashrc" + source = "${path.root}/../assets/bashrc" } + provisioner "file" { destination = ".bash_profile" - source = "./assets/bashprofile" + source = "${path.root}/../assets/bashprofile" } + provisioner "shell" { - inline = [ - "mkdir ~/bootstrap" - ] + inline = ["mkdir ~/bootstrap"] } + provisioner "file" { destination = "bootstrap" - source = "./assets/bootstrap-provisioner/" + source = "${path.root}/../assets/bootstrap-provisioner/" } + provisioner "file" { - destination = "image-generation/toolset.json" - source = "./toolsets/toolset-13.json" + destination = "${local.image_folder}/toolset.json" + source = "${path.root}/../toolsets/toolset-13.json" } + provisioner "shell" { execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" inline = [ - "mv ~/image-generation/docs-gen ~/image-generation/software-report", - "mv ~/image-generation/xamarin-selector ~/image-generation/assets", + "mv ${local.image_folder}/docs-gen ${local.image_folder}/software-report", + "mv ${local.image_folder}/xamarin-selector ${local.image_folder}/assets", "mkdir ~/utils", - "mv ~/image-generation/helpers/confirm-identified-developers.scpt ~/utils", - "mv ~/image-generation/helpers/invoke-tests.sh ~/utils", - "mv ~/image-generation/helpers/utils.sh ~/utils", - "mv ~/image-generation/helpers/xamarin-utils.sh ~/utils" + "mv ${local.image_folder}/helpers/confirm-identified-developers.scpt ~/utils", + "mv ${local.image_folder}/helpers/invoke-tests.sh ~/utils", + "mv ${local.image_folder}/helpers/utils.sh ~/utils", + "mv ${local.image_folder}/helpers/xamarin-utils.sh ~/utils" ] } + provisioner "shell" { - scripts = [ - "./scripts/build/install-xcode-clt.sh", - "./scripts/build/install-homebrew.sh" - ] execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" + scripts = [ + "${path.root}/../scripts/build/install-xcode-clt.sh", + "${path.root}/../scripts/build/install-homebrew.sh" + ] } + provisioner "shell" { - scripts = [ - "./scripts/build/configure-tccdb-macos.sh", - "./scripts/build/configure-auto-updates.sh", - "./scripts/build/configure-ntpconf.sh", - "./scripts/build/configure-shell.sh" - ] - environment_vars = [ - "PASSWORD=${var.vm_password}", - "USERNAME=${var.vm_username}" + environment_vars = ["PASSWORD=${var.vm_password}", "USERNAME=${var.vm_username}"] + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}" + scripts = [ + "${path.root}/../scripts/build/configure-tccdb-macos.sh", + "${path.root}/../scripts/build/configure-auto-updates.sh", + "${path.root}/../scripts/build/configure-ntpconf.sh", + "${path.root}/../scripts/build/configure-shell.sh" ] - execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}" } + provisioner "shell" { - scripts = [ - "./scripts/build/configure-preimagedata.sh", - "./scripts/build/configure-ssh.sh", - "./scripts/build/configure-machine.sh" + environment_vars = ["IMAGE_VERSION=${var.build_id}", "IMAGE_OS=${var.image_os}", "PASSWORD=${var.vm_password}"] + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" + scripts = [ + "${path.root}/../scripts/build/configure-preimagedata.sh", + "${path.root}/../scripts/build/configure-ssh.sh", + "${path.root}/../scripts/build/configure-machine.sh" ] - environment_vars = [ - "IMAGE_VERSION=${var.build_id}", - "IMAGE_OS=${var.image_os}", - "PASSWORD=${var.vm_password}" - ] - execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" } + provisioner "shell" { execute_command = "source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}" expect_disconnect = true inline = ["echo 'Reboot VM'", "shutdown -r now"] } + provisioner "shell" { - pause_before = "30s" - scripts = [ - "./scripts/build/configure-windows.sh", - "./scripts/build/install-powershell.sh", - "./scripts/build/install-mono.sh", - "./scripts/build/install-dotnet.sh", - "./scripts/build/install-python.sh", - "./scripts/build/install-azcopy.sh", - "./scripts/build/install-openssl.sh", - "./scripts/build/install-ruby.sh", - "./scripts/build/install-rubygems.sh", - "./scripts/build/install-git.sh", - "./scripts/build/install-node.sh", - "./scripts/build/install-common-utils.sh" - ] - environment_vars = [ - "API_PAT=${var.github_api_pat}", - "USER_PASSWORD=${var.vm_password}" + environment_vars = ["API_PAT=${var.github_api_pat}", "USER_PASSWORD=${var.vm_password}", "IMAGE_FOLDER=${local.image_folder}"] + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" + pause_before = "30s" + scripts = [ + "${path.root}/../scripts/build/configure-windows.sh", + "${path.root}/../scripts/build/install-powershell.sh", + "${path.root}/../scripts/build/install-mono.sh", + "${path.root}/../scripts/build/install-dotnet.sh", + "${path.root}/../scripts/build/install-python.sh", + "${path.root}/../scripts/build/install-azcopy.sh", + "${path.root}/../scripts/build/install-openssl.sh", + "${path.root}/../scripts/build/install-ruby.sh", + "${path.root}/../scripts/build/install-rubygems.sh", + "${path.root}/../scripts/build/install-git.sh", + "${path.root}/../scripts/build/install-node.sh", + "${path.root}/../scripts/build/install-common-utils.sh" ] - execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" } + provisioner "shell" { - script = "./scripts/build/Install-Xcode.ps1" - environment_vars = [ - "XCODE_INSTALL_STORAGE_URL=${var.xcode_install_storage_url}", - "XCODE_INSTALL_SAS=${var.xcode_install_sas}" - ] - execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} pwsh -f {{ .Path }}" + environment_vars = ["XCODE_INSTALL_STORAGE_URL=${var.xcode_install_storage_url}", "XCODE_INSTALL_SAS=${var.xcode_install_sas}", "IMAGE_FOLDER=${local.image_folder}"] + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} pwsh -f {{ .Path }}" + script = "${path.root}/../scripts/build/Install-Xcode.ps1" } + provisioner "shell" { execute_command = "source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}" expect_disconnect = true inline = ["echo 'Reboot VM'", "shutdown -r now"] } + provisioner "shell" { - scripts = [ - "./scripts/build/install-actions-cache.sh", - "./scripts/build/install-llvm.sh", - "./scripts/build/install-swiftlint.sh", - "./scripts/build/install-openjdk.sh", - "./scripts/build/install-php.sh", - "./scripts/build/install-aws-tools.sh", - "./scripts/build/install-rust.sh", - "./scripts/build/install-gcc.sh", - "./scripts/build/install-cocoapods.sh", - "./scripts/build/install-android-sdk.sh", - "./scripts/build/install-apache.sh", - "./scripts/build/install-vcpkg.sh", - "./scripts/build/install-safari.sh", - "./scripts/build/install-chrome.sh", - "./scripts/build/install-edge.sh", - "./scripts/build/install-firefox.sh", - "./scripts/build/install-pypy.sh", - "./scripts/build/install-bicep.sh", - "./scripts/build/install-codeql-bundle.sh" - ] - environment_vars = [ - "API_PAT=${var.github_api_pat}" + environment_vars = ["API_PAT=${var.github_api_pat}", "IMAGE_FOLDER=${local.image_folder}"] + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" + scripts = [ + "${path.root}/../scripts/build/install-actions-cache.sh", + "${path.root}/../scripts/build/install-llvm.sh", + "${path.root}/../scripts/build/install-swiftlint.sh", + "${path.root}/../scripts/build/install-openjdk.sh", + "${path.root}/../scripts/build/install-php.sh", + "${path.root}/../scripts/build/install-aws-tools.sh", + "${path.root}/../scripts/build/install-rust.sh", + "${path.root}/../scripts/build/install-gcc.sh", + "${path.root}/../scripts/build/install-cocoapods.sh", + "${path.root}/../scripts/build/install-android-sdk.sh", + "${path.root}/../scripts/build/install-apache.sh", + "${path.root}/../scripts/build/install-vcpkg.sh", + "${path.root}/../scripts/build/install-safari.sh", + "${path.root}/../scripts/build/install-chrome.sh", + "${path.root}/../scripts/build/install-edge.sh", + "${path.root}/../scripts/build/install-firefox.sh", + "${path.root}/../scripts/build/install-pypy.sh", + "${path.root}/../scripts/build/install-bicep.sh", + "${path.root}/../scripts/build/install-codeql-bundle.sh" ] - execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" } + provisioner "shell" { - scripts = [ - "./scripts/build/Install-Toolset.ps1", - "./scripts/build/Configure-Toolset.ps1" + environment_vars = ["IMAGE_FOLDER=${local.image_folder}"] + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} pwsh -f {{ .Path }}" + scripts = [ + "${path.root}/../scripts/build/Install-Toolset.ps1", + "${path.root}/../scripts/build/Configure-Toolset.ps1" ] - execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} pwsh -f {{ .Path }}" } + provisioner "shell" { - script = "./scripts/build/configure-xcode-simulators.rb" execute_command = "source $HOME/.bash_profile; ruby {{ .Path }}" + script = "${path.root}/../scripts/build/configure-xcode-simulators.rb" } + provisioner "shell" { - inline = [ - "pwsh -File \"$HOME/image-generation/software-report/Generate-SoftwareReport.ps1\" -OutputDirectory \"$HOME/image-generation/output/software-report\" -ImageName ${var.build_id}", - "pwsh -File \"$HOME/image-generation/tests/RunAll-Tests.ps1\"" + environment_vars = ["IMAGE_FOLDER=${local.image_folder}"] + execute_command = "source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" + inline = [ + "pwsh -File \"${local.image_folder}/software-report/Generate-SoftwareReport.ps1\" -OutputDirectory \"${local.image_folder}/output/software-report\" -ImageName ${var.build_id}", + "pwsh -File \"${local.image_folder}/tests/RunAll-Tests.ps1\"" ] - execute_command = "source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" } + provisioner "file" { - destination = "../image-output/" - direction = "download" - source = "./image-generation/output/" + destination = "${path.root}/../../image-output/" + direction = "download" + source = "${local.image_folder}/output/" } + provisioner "shell" { - inline = [ - "rm -rf \"$(brew --cache)\"" - ] + inline = ["rm -rf \"$(brew --cache)\""] } + provisioner "shell" { - scripts = [ - "./scripts/build/configure-hostname.sh", - "./scripts/build/configure-system.sh" - ] execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" + scripts = [ + "${path.root}/../scripts/build/configure-hostname.sh", + "${path.root}/../scripts/build/configure-system.sh" + ] } } diff --git a/images/macos/templates/macOS-13.arm64.anka.pkr.hcl b/images/macos/templates/macOS-13.arm64.anka.pkr.hcl index 98a2118eb63d..42e640af6db2 100644 --- a/images/macos/templates/macOS-13.arm64.anka.pkr.hcl +++ b/images/macos/templates/macOS-13.arm64.anka.pkr.hcl @@ -2,11 +2,15 @@ packer { required_plugins { veertu-anka = { version = ">= v3.2.0" - source = "github.com/veertuinc/veertu-anka" + source = "github.com/veertuinc/veertu-anka" } } } +locals { + image_folder = "/Users/${var.vm_username}/image-generation" +} + variable "source_vm_name" { type = string } @@ -20,234 +24,236 @@ variable "build_id" { } variable "vm_username" { - type = string + type = string sensitive = true } variable "vm_password" { - type = string + type = string sensitive = true } variable "github_api_pat" { - type = string + type = string default = "" } variable "xcode_install_storage_url" { - type = string + type = string sensitive = true } variable "xcode_install_sas" { - type = string + type = string sensitive = true } variable "vcpu_count" { - type = string + type = string default = "6" } variable "ram_size" { - type = string + type = string default = "8G" } variable "image_os" { - type = string + type = string default = "macos13" } source "veertu-anka-vm-clone" "template" { - vm_name = "${var.build_id}" + vm_name = "${var.build_id}" source_vm_name = "${var.source_vm_name}" - source_vm_tag = "${var.source_vm_tag}" - vcpu_count = "${var.vcpu_count}" - ram_size = "${var.ram_size}" - stop_vm = "true" - log_level = "debug" + source_vm_tag = "${var.source_vm_tag}" + vcpu_count = "${var.vcpu_count}" + ram_size = "${var.ram_size}" + stop_vm = "true" + log_level = "debug" } build { - sources = [ - "source.veertu-anka-vm-clone.template" - ] + sources = ["source.veertu-anka-vm-clone.template"] + provisioner "shell" { - inline = [ - "mkdir ~/image-generation" - ] + inline = ["mkdir ${local.image_folder}"] } + provisioner "file" { - destination = "image-generation/" - sources = [ - "./assets/xamarin-selector", - "./scripts/tests", - "./scripts/docs-gen", - "./scripts/helpers" + destination = "${local.image_folder}/" + sources = [ + "${path.root}/../assets/xamarin-selector", + "${path.root}/../scripts/tests", + "${path.root}/../scripts/docs-gen", + "${path.root}/../scripts/helpers" ] } + provisioner "file" { - destination = "image-generation/docs-gen/" - source = "../../helpers/software-report-base" + destination = "${local.image_folder}/docs-gen/" + source = "${path.root}/../../../helpers/software-report-base" } + provisioner "file" { - destination = "image-generation/add-certificate.swift" - source = "./assets/add-certificate.swift" + destination = "${local.image_folder}/add-certificate.swift" + source = "${path.root}/../assets/add-certificate.swift" } + provisioner "file" { destination = ".bashrc" - source = "./assets/bashrc" + source = "${path.root}/../assets/bashrc" } + provisioner "file" { destination = ".bash_profile" - source = "./assets/bashprofile" + source = "${path.root}/../assets/bashprofile" } + provisioner "shell" { - inline = [ - "mkdir ~/bootstrap" - ] + inline = ["mkdir ~/bootstrap"] } + provisioner "file" { destination = "bootstrap" - source = "./assets/bootstrap-provisioner/" + source = "${path.root}/../assets/bootstrap-provisioner/" } + provisioner "file" { - destination = "image-generation/toolset.json" - source = "./toolsets/toolset-13.json" + destination = "${local.image_folder}/toolset.json" + source = "${path.root}/../toolsets/toolset-13.json" } + provisioner "shell" { execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" inline = [ - "mv ~/image-generation/docs-gen ~/image-generation/software-report", - "mv ~/image-generation/xamarin-selector ~/image-generation/assets", + "mv ${local.image_folder}/docs-gen ${local.image_folder}/software-report", + "mv ${local.image_folder}/xamarin-selector ${local.image_folder}/assets", "mkdir ~/utils", - "mv ~/image-generation/helpers/confirm-identified-developers.scpt ~/utils", - "mv ~/image-generation/helpers/invoke-tests.sh ~/utils", - "mv ~/image-generation/helpers/utils.sh ~/utils", - "mv ~/image-generation/helpers/xamarin-utils.sh ~/utils" + "mv ${local.image_folder}/helpers/confirm-identified-developers.scpt ~/utils", + "mv ${local.image_folder}/helpers/invoke-tests.sh ~/utils", + "mv ${local.image_folder}/helpers/utils.sh ~/utils", + "mv ${local.image_folder}/helpers/xamarin-utils.sh ~/utils" ] } + provisioner "shell" { - scripts = [ - "./scripts/build/install-xcode-clt.sh", - "./scripts/build/install-homebrew.sh" - ] execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" + scripts = [ + "${path.root}/../scripts/build/install-xcode-clt.sh", + "${path.root}/../scripts/build/install-homebrew.sh" + ] } + provisioner "shell" { - scripts = [ - "./scripts/build/configure-tccdb-macos.sh", - "./scripts/build/configure-auto-updates.sh", - "./scripts/build/configure-ntpconf.sh", - "./scripts/build/configure-shell.sh" + environment_vars = ["PASSWORD=${var.vm_password}", "USERNAME=${var.vm_username}"] + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}" + scripts = [ + "${path.root}/../scripts/build/configure-tccdb-macos.sh", + "${path.root}/../scripts/build/configure-auto-updates.sh", + "${path.root}/../scripts/build/configure-ntpconf.sh", + "${path.root}/../scripts/build/configure-shell.sh" ] - environment_vars = [ - "PASSWORD=${var.vm_password}", - "USERNAME=${var.vm_username}" - ] - execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}" } + provisioner "shell" { - scripts = [ - "./scripts/build/configure-preimagedata.sh", - "./scripts/build/configure-ssh.sh", - "./scripts/build/configure-machine.sh" - ] - environment_vars = [ - "IMAGE_VERSION=${var.build_id}", - "IMAGE_OS=${var.image_os}", - "PASSWORD=${var.vm_password}" + environment_vars = ["IMAGE_VERSION=${var.build_id}", "IMAGE_OS=${var.image_os}", "PASSWORD=${var.vm_password}"] + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" + scripts = [ + "${path.root}/../scripts/build/configure-preimagedata.sh", + "${path.root}/../scripts/build/configure-ssh.sh", + "${path.root}/../scripts/build/configure-machine.sh" ] - execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" } + provisioner "shell" { execute_command = "source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}" expect_disconnect = true inline = ["echo 'Reboot VM'", "shutdown -r now"] } + provisioner "shell" { - pause_before = "30s" - scripts = [ - "./scripts/build/install-rosetta.sh", - "./scripts/build/configure-windows.sh", - "./scripts/build/install-powershell.sh", - "./scripts/build/install-mono.sh", - "./scripts/build/install-dotnet.sh", - "./scripts/build/install-azcopy.sh", - "./scripts/build/install-openssl.sh", - "./scripts/build/install-ruby.sh", - "./scripts/build/install-rubygems.sh", - "./scripts/build/install-git.sh", - "./scripts/build/install-node.sh", - "./scripts/build/install-common-utils.sh" + environment_vars = ["API_PAT=${var.github_api_pat}", "USER_PASSWORD=${var.vm_password}", "IMAGE_FOLDER=${local.image_folder}"] + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" + pause_before = "30s" + scripts = [ + "${path.root}/../scripts/build/install-rosetta.sh", + "${path.root}/../scripts/build/configure-windows.sh", + "${path.root}/../scripts/build/install-powershell.sh", + "${path.root}/../scripts/build/install-mono.sh", + "${path.root}/../scripts/build/install-dotnet.sh", + "${path.root}/../scripts/build/install-azcopy.sh", + "${path.root}/../scripts/build/install-openssl.sh", + "${path.root}/../scripts/build/install-ruby.sh", + "${path.root}/../scripts/build/install-rubygems.sh", + "${path.root}/../scripts/build/install-git.sh", + "${path.root}/../scripts/build/install-node.sh", + "${path.root}/../scripts/build/install-common-utils.sh" ] - environment_vars = [ - "API_PAT=${var.github_api_pat}", - "USER_PASSWORD=${var.vm_password}" - ] - execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" } + provisioner "shell" { - script = "./scripts/build/Install-Xcode.ps1" - environment_vars = [ - "XCODE_INSTALL_STORAGE_URL=${var.xcode_install_storage_url}", - "XCODE_INSTALL_SAS=${var.xcode_install_sas}" - ] - execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} pwsh -f {{ .Path }}" + environment_vars = ["XCODE_INSTALL_STORAGE_URL=${var.xcode_install_storage_url}", "XCODE_INSTALL_SAS=${var.xcode_install_sas}", "IMAGE_FOLDER=${local.image_folder}"] + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} pwsh -f {{ .Path }}" + script = "${path.root}/../scripts/build/Install-Xcode.ps1" } + provisioner "shell" { execute_command = "source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}" expect_disconnect = true inline = ["echo 'Reboot VM'", "shutdown -r now"] } + provisioner "shell" { - scripts = [ - "./scripts/build/install-actions-cache.sh", - "./scripts/build/install-llvm.sh", - "./scripts/build/install-openjdk.sh", - "./scripts/build/install-aws-tools.sh", - "./scripts/build/install-rust.sh", - "./scripts/build/install-gcc.sh", - "./scripts/build/install-cocoapods.sh", - "./scripts/build/install-android-sdk.sh", - "./scripts/build/install-safari.sh", - "./scripts/build/install-chrome.sh", - "./scripts/build/install-bicep.sh", - "./scripts/build/install-codeql-bundle.sh" + environment_vars = ["API_PAT=${var.github_api_pat}", "IMAGE_FOLDER=${local.image_folder}"] + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" + scripts = [ + "${path.root}/../scripts/build/install-actions-cache.sh", + "${path.root}/../scripts/build/install-llvm.sh", + "${path.root}/../scripts/build/install-openjdk.sh", + "${path.root}/../scripts/build/install-aws-tools.sh", + "${path.root}/../scripts/build/install-rust.sh", + "${path.root}/../scripts/build/install-gcc.sh", + "${path.root}/../scripts/build/install-cocoapods.sh", + "${path.root}/../scripts/build/install-android-sdk.sh", + "${path.root}/../scripts/build/install-safari.sh", + "${path.root}/../scripts/build/install-chrome.sh", + "${path.root}/../scripts/build/install-bicep.sh", + "${path.root}/../scripts/build/install-codeql-bundle.sh" ] - environment_vars = [ - "API_PAT=${var.github_api_pat}" - ] - execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" } + provisioner "shell" { - scripts = [ - "./scripts/build/Install-Toolset.ps1", - "./scripts/build/Configure-Toolset.ps1" + environment_vars = ["IMAGE_FOLDER=${local.image_folder}"] + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} pwsh -f {{ .Path }}" + scripts = [ + "${path.root}/../scripts/build/Install-Toolset.ps1", + "${path.root}/../scripts/build/Configure-Toolset.ps1" ] - execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} pwsh -f {{ .Path }}" } + provisioner "shell" { - script = "./scripts/build/configure-xcode-simulators.rb" execute_command = "source $HOME/.bash_profile; ruby {{ .Path }}" + script = "${path.root}/../scripts/build/configure-xcode-simulators.rb" } + provisioner "shell" { - inline = [ - "pwsh -File \"$HOME/image-generation/software-report/Generate-SoftwareReport.ps1\" -OutputDirectory \"$HOME/image-generation/output/software-report\" -ImageName ${var.build_id}", - "pwsh -File \"$HOME/image-generation/tests/RunAll-Tests.ps1\"" + environment_vars = ["IMAGE_FOLDER=${local.image_folder}"] + execute_command = "source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" + inline = [ + "pwsh -File \"${local.image_folder}/software-report/Generate-SoftwareReport.ps1\" -OutputDirectory \"${local.image_folder}/output/software-report\" -ImageName ${var.build_id}", + "pwsh -File \"${local.image_folder}/tests/RunAll-Tests.ps1\"" ] - execute_command = "source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" } + provisioner "file" { - destination = "../image-output/" - direction = "download" - source = "./image-generation/output/" + destination = "${path.root}/../../image-output/" + direction = "download" + source = "${local.image_folder}/output/" } + provisioner "shell" { - scripts = [ - "./scripts/build/configure-hostname.sh" - ] execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" + scripts = ["${path.root}/../scripts/build/configure-hostname.sh"] } } diff --git a/images/macos/templates/macOS-14.anka.pkr.hcl b/images/macos/templates/macOS-14.anka.pkr.hcl index edcfbdc3a8e1..c37bb31fc96f 100644 --- a/images/macos/templates/macOS-14.anka.pkr.hcl +++ b/images/macos/templates/macOS-14.anka.pkr.hcl @@ -2,11 +2,15 @@ packer { required_plugins { veertu-anka = { version = ">= v3.2.0" - source = "github.com/veertuinc/veertu-anka" + source = "github.com/veertuinc/veertu-anka" } } } +locals { + image_folder = "/Users/${var.vm_username}/image-generation" +} + variable "source_vm_name" { type = string } @@ -20,238 +24,239 @@ variable "build_id" { } variable "vm_username" { - type = string + type = string sensitive = true } variable "vm_password" { - type = string + type = string sensitive = true } variable "github_api_pat" { - type = string + type = string default = "" } variable "xcode_install_storage_url" { - type = string + type = string sensitive = true } variable "xcode_install_sas" { - type = string + type = string sensitive = true } variable "vcpu_count" { - type = string + type = string default = "6" } variable "ram_size" { - type = string + type = string default = "24G" } variable "image_os" { - type = string + type = string default = "macos14" } source "veertu-anka-vm-clone" "template" { - vm_name = "${var.build_id}" + vm_name = "${var.build_id}" source_vm_name = "${var.source_vm_name}" - source_vm_tag = "${var.source_vm_tag}" - vcpu_count = "${var.vcpu_count}" - ram_size = "${var.ram_size}" - stop_vm = "true" + source_vm_tag = "${var.source_vm_tag}" + vcpu_count = "${var.vcpu_count}" + ram_size = "${var.ram_size}" + stop_vm = "true" } build { - sources = [ - "source.veertu-anka-vm-clone.template" - ] + sources = ["source.veertu-anka-vm-clone.template"] + provisioner "shell" { - inline = [ - "mkdir ~/image-generation" - ] + inline = ["mkdir ${local.image_folder}"] } + provisioner "file" { - destination = "image-generation/" - sources = [ - "./assets/xamarin-selector", - "./scripts/tests", - "./scripts/docs-gen", - "./scripts/helpers" + destination = "${local.image_folder}/" + sources = [ + "${path.root}/../assets/xamarin-selector", + "${path.root}/../scripts/tests", + "${path.root}/../scripts/docs-gen", + "${path.root}/../scripts/helpers" ] } + provisioner "file" { - destination = "image-generation/docs-gen/" - source = "../../helpers/software-report-base" + destination = "${local.image_folder}/docs-gen/" + source = "${path.root}/../../../helpers/software-report-base" } + provisioner "file" { - destination = "image-generation/add-certificate.swift" - source = "./assets/add-certificate.swift" + destination = "${local.image_folder}/add-certificate.swift" + source = "${path.root}/../assets/add-certificate.swift" } + provisioner "file" { destination = ".bashrc" - source = "./assets/bashrc" + source = "${path.root}/../assets/bashrc" } + provisioner "file" { destination = ".bash_profile" - source = "./assets/bashprofile" + source = "${path.root}/../assets/bashprofile" } + provisioner "shell" { - inline = [ - "mkdir ~/bootstrap" - ] + inline = ["mkdir ~/bootstrap"] } + provisioner "file" { destination = "bootstrap" - source = "./assets/bootstrap-provisioner/" + source = "${path.root}/../assets/bootstrap-provisioner/" } + provisioner "file" { - destination = "image-generation/toolset.json" - source = "./toolsets/toolset-14.json" + destination = "${local.image_folder}/toolset.json" + source = "${path.root}/../toolsets/toolset-14.json" } + provisioner "shell" { execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" inline = [ - "mv ~/image-generation/docs-gen ~/image-generation/software-report", - "mv ~/image-generation/xamarin-selector ~/image-generation/assets", + "mv ${local.image_folder}/docs-gen ${local.image_folder}/software-report", + "mv ${local.image_folder}/xamarin-selector ${local.image_folder}/assets", "mkdir ~/utils", - "mv ~/image-generation/helpers/confirm-identified-developers.scpt ~/utils", - "mv ~/image-generation/helpers/invoke-tests.sh ~/utils", - "mv ~/image-generation/helpers/utils.sh ~/utils", - "mv ~/image-generation/helpers/xamarin-utils.sh ~/utils" + "mv ${local.image_folder}/helpers/confirm-identified-developers.scpt ~/utils", + "mv ${local.image_folder}/helpers/invoke-tests.sh ~/utils", + "mv ${local.image_folder}/helpers/utils.sh ~/utils", + "mv ${local.image_folder}/helpers/xamarin-utils.sh ~/utils" ] } + provisioner "shell" { - scripts = [ - "./scripts/build/install-xcode-clt.sh", - "./scripts/build/install-homebrew.sh" - ] execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" + scripts = [ + "${path.root}/../scripts/build/install-xcode-clt.sh", + "${path.root}/../scripts/build/install-homebrew.sh" + ] } + provisioner "shell" { - scripts = [ - "./scripts/build/configure-tccdb-macos.sh", - "./scripts/build/configure-auto-updates.sh", - "./scripts/build/configure-ntpconf.sh", - "./scripts/build/configure-shell.sh" - ] - environment_vars = [ - "PASSWORD=${var.vm_password}", - "USERNAME=${var.vm_username}" + environment_vars = ["PASSWORD=${var.vm_password}", "USERNAME=${var.vm_username}"] + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}" + scripts = [ + "${path.root}/../scripts/build/configure-tccdb-macos.sh", + "${path.root}/../scripts/build/configure-auto-updates.sh", + "${path.root}/../scripts/build/configure-ntpconf.sh", + "${path.root}/../scripts/build/configure-shell.sh" ] - execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}" } + provisioner "shell" { - scripts = [ - "./scripts/build/configure-preimagedata.sh", - "./scripts/build/configure-ssh.sh", - "./scripts/build/configure-machine.sh" - ] - environment_vars = [ - "IMAGE_VERSION=${var.build_id}", - "IMAGE_OS=${var.image_os}", - "PASSWORD=${var.vm_password}" + environment_vars = ["IMAGE_VERSION=${var.build_id}", "IMAGE_OS=${var.image_os}", "PASSWORD=${var.vm_password}"] + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" + scripts = [ + "${path.root}/../scripts/build/configure-preimagedata.sh", + "${path.root}/../scripts/build/configure-ssh.sh", + "${path.root}/../scripts/build/configure-machine.sh" ] - execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" } + provisioner "shell" { execute_command = "source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}" expect_disconnect = true inline = ["echo 'Reboot VM'", "shutdown -r now"] } + provisioner "shell" { - pause_before = "30s" - scripts = [ - "./scripts/build/configure-windows.sh", - "./scripts/build/install-powershell.sh", - "./scripts/build/install-mono.sh", - "./scripts/build/install-dotnet.sh", - "./scripts/build/install-python.sh", - "./scripts/build/install-azcopy.sh", - "./scripts/build/install-openssl.sh", - "./scripts/build/install-ruby.sh", - "./scripts/build/install-rubygems.sh", - "./scripts/build/install-git.sh", - "./scripts/build/install-node.sh", - "./scripts/build/install-common-utils.sh" - ] - environment_vars = [ - "API_PAT=${var.github_api_pat}", - "USER_PASSWORD=${var.vm_password}" + environment_vars = ["API_PAT=${var.github_api_pat}", "USER_PASSWORD=${var.vm_password}", "IMAGE_FOLDER=${local.image_folder}"] + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" + pause_before = "30s" + scripts = [ + "${path.root}/../scripts/build/configure-windows.sh", + "${path.root}/../scripts/build/install-powershell.sh", + "${path.root}/../scripts/build/install-mono.sh", + "${path.root}/../scripts/build/install-dotnet.sh", + "${path.root}/../scripts/build/install-python.sh", + "${path.root}/../scripts/build/install-azcopy.sh", + "${path.root}/../scripts/build/install-openssl.sh", + "${path.root}/../scripts/build/install-ruby.sh", + "${path.root}/../scripts/build/install-rubygems.sh", + "${path.root}/../scripts/build/install-git.sh", + "${path.root}/../scripts/build/install-node.sh", + "${path.root}/../scripts/build/install-common-utils.sh" ] - execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" } + provisioner "shell" { - script = "./scripts/build/Install-Xcode.ps1" - environment_vars = [ - "XCODE_INSTALL_STORAGE_URL=${var.xcode_install_storage_url}", - "XCODE_INSTALL_SAS=${var.xcode_install_sas}" - ] - execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} pwsh -f {{ .Path }}" + environment_vars = ["XCODE_INSTALL_STORAGE_URL=${var.xcode_install_storage_url}", "XCODE_INSTALL_SAS=${var.xcode_install_sas}", "IMAGE_FOLDER=${local.image_folder}"] + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} pwsh -f {{ .Path }}" + script = "${path.root}/../scripts/build/Install-Xcode.ps1" } + provisioner "shell" { execute_command = "source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}" expect_disconnect = true inline = ["echo 'Reboot VM'", "shutdown -r now"] } + provisioner "shell" { - scripts = [ - "./scripts/build/install-actions-cache.sh", - "./scripts/build/install-llvm.sh", - "./scripts/build/install-swiftlint.sh", - "./scripts/build/install-openjdk.sh", - "./scripts/build/install-php.sh", - "./scripts/build/install-aws-tools.sh", - "./scripts/build/install-rust.sh", - "./scripts/build/install-gcc.sh", - "./scripts/build/install-cocoapods.sh", - "./scripts/build/install-android-sdk.sh", - "./scripts/build/install-apache.sh", - "./scripts/build/install-vcpkg.sh", - "./scripts/build/install-safari.sh", - "./scripts/build/install-chrome.sh", - "./scripts/build/install-edge.sh", - "./scripts/build/install-firefox.sh", - "./scripts/build/install-pypy.sh", - "./scripts/build/install-bicep.sh", - "./scripts/build/install-codeql-bundle.sh" - ] - environment_vars = [ - "API_PAT=${var.github_api_pat}" + environment_vars = ["API_PAT=${var.github_api_pat}", "IMAGE_FOLDER=${local.image_folder}"] + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" + scripts = [ + "${path.root}/../scripts/build/install-actions-cache.sh", + "${path.root}/../scripts/build/install-llvm.sh", + "${path.root}/../scripts/build/install-swiftlint.sh", + "${path.root}/../scripts/build/install-openjdk.sh", + "${path.root}/../scripts/build/install-php.sh", + "${path.root}/../scripts/build/install-aws-tools.sh", + "${path.root}/../scripts/build/install-rust.sh", + "${path.root}/../scripts/build/install-gcc.sh", + "${path.root}/../scripts/build/install-cocoapods.sh", + "${path.root}/../scripts/build/install-android-sdk.sh", + "${path.root}/../scripts/build/install-apache.sh", + "${path.root}/../scripts/build/install-vcpkg.sh", + "${path.root}/../scripts/build/install-safari.sh", + "${path.root}/../scripts/build/install-chrome.sh", + "${path.root}/../scripts/build/install-edge.sh", + "${path.root}/../scripts/build/install-firefox.sh", + "${path.root}/../scripts/build/install-pypy.sh", + "${path.root}/../scripts/build/install-bicep.sh", + "${path.root}/../scripts/build/install-codeql-bundle.sh" ] - execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" } + provisioner "shell" { - script = "./scripts/build/configure-xcode-simulators.rb" execute_command = "source $HOME/.bash_profile; ruby {{ .Path }}" + script = "${path.root}/../scripts/build/configure-xcode-simulators.rb" } + provisioner "shell" { - inline = [ - "pwsh -File \"$HOME/image-generation/software-report/Generate-SoftwareReport.ps1\" -OutputDirectory \"$HOME/image-generation/output/software-report\" -ImageName ${var.build_id}" + environment_vars = ["IMAGE_FOLDER=${local.image_folder}"] + execute_command = "source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" + inline = [ + "pwsh -File \"${local.image_folder}/software-report/Generate-SoftwareReport.ps1\" -OutputDirectory \"${local.image_folder}/output/software-report\" -ImageName ${var.build_id}" ] - execute_command = "source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" } + provisioner "file" { - destination = "../image-output/" - direction = "download" - source = "./image-generation/output/" + destination = "${path.root}/../../image-output/" + direction = "download" + source = "${local.image_folder}/output/" } + provisioner "shell" { - inline = [ - "rm -rf \"$(brew --cache)\"" - ] + inline = ["rm -rf \"$(brew --cache)\""] } + provisioner "shell" { - scripts = [ - "./scripts/build/configure-hostname.sh", - "./scripts/build/configure-system.sh" - ] execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" + scripts = [ + "${path.root}/../scripts/build/configure-hostname.sh", + "${path.root}/../scripts/build/configure-system.sh" + ] } } diff --git a/images/macos/templates/macOS-14.arm64.anka.pkr.hcl b/images/macos/templates/macOS-14.arm64.anka.pkr.hcl index 0259f04e738d..19d25641966d 100644 --- a/images/macos/templates/macOS-14.arm64.anka.pkr.hcl +++ b/images/macos/templates/macOS-14.arm64.anka.pkr.hcl @@ -2,11 +2,15 @@ packer { required_plugins { veertu-anka = { version = ">= v3.2.0" - source = "github.com/veertuinc/veertu-anka" + source = "github.com/veertuinc/veertu-anka" } } } +locals { + image_folder = "/Users/${var.vm_username}/image-generation" +} + variable "source_vm_name" { type = string } @@ -20,226 +24,226 @@ variable "build_id" { } variable "vm_username" { - type = string + type = string sensitive = true } variable "vm_password" { - type = string + type = string sensitive = true } variable "github_api_pat" { - type = string + type = string default = "" } variable "xcode_install_storage_url" { - type = string + type = string sensitive = true } variable "xcode_install_sas" { - type = string + type = string sensitive = true } variable "vcpu_count" { - type = string + type = string default = "6" } variable "ram_size" { - type = string + type = string default = "8G" } variable "image_os" { - type = string + type = string default = "macos14" } source "veertu-anka-vm-clone" "template" { - vm_name = "${var.build_id}" + vm_name = "${var.build_id}" source_vm_name = "${var.source_vm_name}" - source_vm_tag = "${var.source_vm_tag}" - vcpu_count = "${var.vcpu_count}" - ram_size = "${var.ram_size}" - stop_vm = "true" - log_level = "debug" + source_vm_tag = "${var.source_vm_tag}" + vcpu_count = "${var.vcpu_count}" + ram_size = "${var.ram_size}" + stop_vm = "true" + log_level = "debug" } build { - sources = [ - "source.veertu-anka-vm-clone.template" - ] + sources = ["source.veertu-anka-vm-clone.template"] + provisioner "shell" { - inline = [ - "mkdir ~/image-generation" - ] + inline = ["mkdir ${local.image_folder}"] } + provisioner "file" { - destination = "image-generation/" - sources = [ - "./assets/xamarin-selector", - "./scripts/tests", - "./scripts/docs-gen", - "./scripts/helpers" + destination = "${local.image_folder}/" + sources = [ + "${path.root}/../assets/xamarin-selector", + "${path.root}/../scripts/tests", + "${path.root}/../scripts/docs-gen", + "${path.root}/../scripts/helpers" ] } + provisioner "file" { - destination = "image-generation/docs-gen/" - source = "../../helpers/software-report-base" + destination = "${local.image_folder}/docs-gen/" + source = "${path.root}/../../../helpers/software-report-base" } + provisioner "file" { - destination = "image-generation/add-certificate.swift" - source = "./assets/add-certificate.swift" + destination = "${local.image_folder}/add-certificate.swift" + source = "${path.root}/../assets/add-certificate.swift" } + provisioner "file" { destination = ".bashrc" - source = "./assets/bashrc" + source = "${path.root}/../assets/bashrc" } + provisioner "file" { destination = ".bash_profile" - source = "./assets/bashprofile" + source = "${path.root}/../assets/bashprofile" } + provisioner "shell" { - inline = [ - "mkdir ~/bootstrap" - ] + inline = ["mkdir ~/bootstrap"] } + provisioner "file" { destination = "bootstrap" - source = "./assets/bootstrap-provisioner/" + source = "${path.root}/../assets/bootstrap-provisioner/" } + provisioner "file" { - destination = "image-generation/toolset.json" - source = "./toolsets/toolset-14.json" + destination = "${local.image_folder}/toolset.json" + source = "${path.root}/../toolsets/toolset-14.json" } + provisioner "shell" { execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" inline = [ - "mv ~/image-generation/docs-gen ~/image-generation/software-report", - "mv ~/image-generation/xamarin-selector ~/image-generation/assets", + "mv ${local.image_folder}/docs-gen ${local.image_folder}/software-report", + "mv ${local.image_folder}/xamarin-selector ${local.image_folder}/assets", "mkdir ~/utils", - "mv ~/image-generation/helpers/confirm-identified-developers.scpt ~/utils", - "mv ~/image-generation/helpers/invoke-tests.sh ~/utils", - "mv ~/image-generation/helpers/utils.sh ~/utils", - "mv ~/image-generation/helpers/xamarin-utils.sh ~/utils" + "mv ${local.image_folder}/helpers/confirm-identified-developers.scpt ~/utils", + "mv ${local.image_folder}/helpers/invoke-tests.sh ~/utils", + "mv ${local.image_folder}/helpers/utils.sh ~/utils", + "mv ${local.image_folder}/helpers/xamarin-utils.sh ~/utils" ] } + provisioner "shell" { - scripts = [ - "./scripts/build/install-xcode-clt.sh", - "./scripts/build/install-homebrew.sh", - "./scripts/build/install-rosetta.sh" - ] execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" + scripts = [ + "${path.root}/../scripts/build/install-xcode-clt.sh", + "${path.root}/../scripts/build/install-homebrew.sh", + "${path.root}/../scripts/build/install-rosetta.sh" + ] } + provisioner "shell" { - scripts = [ - "./scripts/build/configure-tccdb-macos.sh", - "./scripts/build/configure-auto-updates.sh", - "./scripts/build/configure-ntpconf.sh", - "./scripts/build/configure-shell.sh" + environment_vars = ["PASSWORD=${var.vm_password}", "USERNAME=${var.vm_username}"] + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}" + scripts = [ + "${path.root}/../scripts/build/configure-tccdb-macos.sh", + "${path.root}/../scripts/build/configure-auto-updates.sh", + "${path.root}/../scripts/build/configure-ntpconf.sh", + "${path.root}/../scripts/build/configure-shell.sh" ] - environment_vars = [ - "PASSWORD=${var.vm_password}", - "USERNAME=${var.vm_username}" - ] - execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}" } + provisioner "shell" { - scripts = [ - "./scripts/build/configure-preimagedata.sh", - "./scripts/build/configure-ssh.sh", - "./scripts/build/configure-machine.sh" - ] - environment_vars = [ - "IMAGE_VERSION=${var.build_id}", - "IMAGE_OS=${var.image_os}", - "PASSWORD=${var.vm_password}" + environment_vars = ["IMAGE_VERSION=${var.build_id}", "IMAGE_OS=${var.image_os}", "PASSWORD=${var.vm_password}"] + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" + scripts = [ + "${path.root}/../scripts/build/configure-preimagedata.sh", + "${path.root}/../scripts/build/configure-ssh.sh", + "${path.root}/../scripts/build/configure-machine.sh" ] - execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" } + provisioner "shell" { execute_command = "source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}" expect_disconnect = true inline = ["echo 'Reboot VM'", "shutdown -r now"] } + provisioner "shell" { - pause_before = "30s" - scripts = [ - "./scripts/build/configure-windows.sh", - "./scripts/build/install-powershell.sh", - "./scripts/build/install-mono.sh", - "./scripts/build/install-dotnet.sh", - "./scripts/build/install-azcopy.sh", - "./scripts/build/install-openssl.sh", - "./scripts/build/install-ruby.sh", - "./scripts/build/install-rubygems.sh", - "./scripts/build/install-git.sh", - "./scripts/build/install-node.sh", - "./scripts/build/install-common-utils.sh" + environment_vars = ["API_PAT=${var.github_api_pat}", "USER_PASSWORD=${var.vm_password}", "IMAGE_FOLDER=${local.image_folder}"] + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" + pause_before = "30s" + scripts = [ + "${path.root}/../scripts/build/configure-windows.sh", + "${path.root}/../scripts/build/install-powershell.sh", + "${path.root}/../scripts/build/install-mono.sh", + "${path.root}/../scripts/build/install-dotnet.sh", + "${path.root}/../scripts/build/install-azcopy.sh", + "${path.root}/../scripts/build/install-openssl.sh", + "${path.root}/../scripts/build/install-ruby.sh", + "${path.root}/../scripts/build/install-rubygems.sh", + "${path.root}/../scripts/build/install-git.sh", + "${path.root}/../scripts/build/install-node.sh", + "${path.root}/../scripts/build/install-common-utils.sh" ] - environment_vars = [ - "API_PAT=${var.github_api_pat}", - "USER_PASSWORD=${var.vm_password}" - ] - execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" } + provisioner "shell" { - script = "./scripts/build/Install-Xcode.ps1" - environment_vars = [ - "XCODE_INSTALL_STORAGE_URL=${var.xcode_install_storage_url}", - "XCODE_INSTALL_SAS=${var.xcode_install_sas}" - ] - execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} pwsh -f {{ .Path }}" + environment_vars = ["XCODE_INSTALL_STORAGE_URL=${var.xcode_install_storage_url}", "XCODE_INSTALL_SAS=${var.xcode_install_sas}", "IMAGE_FOLDER=${local.image_folder}"] + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} pwsh -f {{ .Path }}" + script = "${path.root}/../scripts/build/Install-Xcode.ps1" } + provisioner "shell" { execute_command = "source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}" expect_disconnect = true inline = ["echo 'Reboot VM'", "shutdown -r now"] } + provisioner "shell" { - scripts = [ - "./scripts/build/install-actions-cache.sh", - "./scripts/build/install-llvm.sh", - "./scripts/build/install-openjdk.sh", - "./scripts/build/install-aws-tools.sh", - "./scripts/build/install-rust.sh", - "./scripts/build/install-gcc.sh", - "./scripts/build/install-cocoapods.sh", - "./scripts/build/install-android-sdk.sh", - "./scripts/build/install-safari.sh", - "./scripts/build/install-chrome.sh", - "./scripts/build/install-bicep.sh", - "./scripts/build/install-codeql-bundle.sh" - ] - environment_vars = [ - "API_PAT=${var.github_api_pat}" + environment_vars = ["API_PAT=${var.github_api_pat}", "IMAGE_FOLDER=${local.image_folder}"] + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" + scripts = [ + "${path.root}/../scripts/build/install-actions-cache.sh", + "${path.root}/../scripts/build/install-llvm.sh", + "${path.root}/../scripts/build/install-openjdk.sh", + "${path.root}/../scripts/build/install-aws-tools.sh", + "${path.root}/../scripts/build/install-rust.sh", + "${path.root}/../scripts/build/install-gcc.sh", + "${path.root}/../scripts/build/install-cocoapods.sh", + "${path.root}/../scripts/build/install-android-sdk.sh", + "${path.root}/../scripts/build/install-safari.sh", + "${path.root}/../scripts/build/install-chrome.sh", + "${path.root}/../scripts/build/install-bicep.sh", + "${path.root}/../scripts/build/install-codeql-bundle.sh" ] - execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" } + provisioner "shell" { - script = "./scripts/build/configure-xcode-simulators.rb" execute_command = "source $HOME/.bash_profile; ruby {{ .Path }}" + script = "${path.root}/../scripts/build/configure-xcode-simulators.rb" } + provisioner "shell" { - inline = [ - "pwsh -File \"$HOME/image-generation/software-report/Generate-SoftwareReport.ps1\" -OutputDirectory \"$HOME/image-generation/output/software-report\" -ImageName ${var.build_id}" + environment_vars = ["IMAGE_FOLDER=${local.image_folder}"] + execute_command = "source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" + inline = [ + "pwsh -File \"${local.image_folder}/software-report/Generate-SoftwareReport.ps1\" -OutputDirectory \"${local.image_folder}/output/software-report\" -ImageName ${var.build_id}" ] - execute_command = "source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" } + provisioner "file" { - destination = "../image-output/" - direction = "download" - source = "./image-generation/output/" + destination = "${path.root}/../../image-output/" + direction = "download" + source = "${local.image_folder}/output/" } + provisioner "shell" { - scripts = [ - "./scripts/build/configure-hostname.sh" - ] execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" + scripts = ["${path.root}/../scripts/build/configure-hostname.sh"] } } From 5ee9ae1e60b6e109a956cb47e5c065d1df4fd201 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 15 Jan 2024 15:07:54 +0000 Subject: [PATCH 2595/3485] Updating readme file for macOS-12 version 20240105.3 (#9128) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-12-Readme.md | 103 ++++++++++++++++---------------- 1 file changed, 52 insertions(+), 51 deletions(-) diff --git a/images/macos/macos-12-Readme.md b/images/macos/macos-12-Readme.md index c8d07e8ca57f..8915ec003509 100644 --- a/images/macos/macos-12-Readme.md +++ b/images/macos/macos-12-Readme.md @@ -1,12 +1,13 @@ | Announcements | |-| +| [[All OSes] Powershell Core will be updated to 7.4.x LTS on January, 28](https://github.com/actions/runner-images/issues/9115) | | [Old versions of Android SDK & tools will be removed from images on January, 8](https://github.com/actions/runner-images/issues/8952) | | [Major Refactoring of GitHub Actions Runner Images Repository](https://github.com/actions/runner-images/issues/8706) | *** # macOS 12 - OS Version: macOS 12.7.2 (21G1974) - Kernel Version: Darwin 21.6.0 -- Image Version: 20231216.1 +- Image Version: 20240105.3 ## Installed Software @@ -21,8 +22,8 @@ - GNU Fortran 11 (Homebrew GCC 11.4.0) - available by `gfortran-11` alias - GNU Fortran 12 (Homebrew GCC 12.3.0) - available by `gfortran-12` alias - GNU Fortran 13 (Homebrew GCC 13.2.0) - available by `gfortran-13` alias -- Julia 1.9.4 -- Kotlin 1.9.21-release-633 +- Julia 1.10.0 +- Kotlin 1.9.22-release-704 - Go 1.20.12 - Mono 6.12.0.188 - Node.js 18.19.0 @@ -30,26 +31,26 @@ - NVM 0.39.7 - NVM - Cached node versions: 16.20.2, 18.19.0, 20.10.0 - Perl 5.38.2 -- PHP 8.3.0 +- PHP 8.3.1 - Python 2.7.18 - Python3 3.12.1 - R 4.3.2 - Ruby 3.0.6p216 ### Package Management -- Bundler 2.5.1 +- Bundler 2.5.4 - Carthage 0.39.1 - CocoaPods 1.14.3 - Composer 2.6.6 -- Homebrew 4.1.25 -- Miniconda 23.10.0 +- Homebrew 4.2.2 +- Miniconda 23.11.0 - NPM 10.2.3 - NuGet 6.3.1.1 - Pip 20.3.4 (python 2.7) -- Pip3 23.3.1 (python 3.12) -- Pipx 1.3.3 -- RubyGems 3.5.1 -- Vcpkg 2023 (build from commit 0e47c1985) +- Pip3 23.3.2 (python 3.12) +- Pipx 1.4.1 +- RubyGems 3.5.4 +- Vcpkg 2023 (build from commit ce46ba877) - Yarn 1.22.19 #### Environment variables @@ -78,7 +79,7 @@ - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.21.4 - gpg (GnuPG) 2.4.3 -- ImageMagick 7.1.1-23 +- ImageMagick 7.1.1-25 - jq 1.7.1 - mongo 5.0.21 - mongod 5.0.21 @@ -88,7 +89,7 @@ - PostgreSQL 14.10 (Homebrew) - psql (PostgreSQL) 14.10 (Homebrew) - Sox 14.4.2 -- Subversion (SVN) 1.14.2 +- Subversion (SVN) 1.14.3 - Switchaudio-osx 1.2.2 - Vagrant 2.4.0 - VirtualBox 6.1.38r153438 @@ -97,24 +98,24 @@ ### Tools - App Center CLI 2.14.0 -- AWS CLI 2.15.2 -- AWS SAM CLI 1.105.0 +- AWS CLI 2.15.8 +- AWS SAM CLI 1.106.0 - AWS Session Manager CLI 1.2.536.0 - Azure CLI 2.55.0 - Azure CLI (azure-devops) 0.26.0 - Bicep CLI 0.24.24 -- Cabal 3.6.2.0 -- Cmake 3.28.0 -- CodeQL Action Bundle 2.15.4 +- Cabal 3.10.2.1 +- Cmake 3.28.1 +- CodeQL Action Bundle 2.15.5 - Colima 0.6.7 -- Fastlane 2.217.0 +- Fastlane 2.219.0 - GHC 9.8.1 - GHCup 0.1.20.0 - Jazzy 0.14.4 - Stack 2.13.1 - SwiftFormat 0.52.11 - Swig 4.1.1 -- Xcbeautify 1.1.1 +- Xcbeautify 1.3.0 - Xcode Command Line Tools 14.2.0.0.1.1668646533 - Xcodes 1.4.1 @@ -123,16 +124,16 @@ - Yamllint 1.33.0 ### Browsers -- Safari 17.2 (17617.1.17.11.11) -- SafariDriver 17.2 (17617.1.17.11.11) -- Google Chrome 120.0.6099.109 -- Google Chrome for Testing 120.0.6099.71 -- ChromeDriver 120.0.6099.71 -- Microsoft Edge 120.0.2210.77 -- Microsoft Edge WebDriver 120.0.2210.77 -- Mozilla Firefox 120.0.1 -- geckodriver 0.33.0 -- Selenium server 4.15.0 +- Safari 17.2.1 (17617.1.17.11.12) +- SafariDriver 17.2.1 (17617.1.17.11.12) +- Google Chrome 120.0.6099.199 +- Google Chrome for Testing 120.0.6099.109 +- ChromeDriver 120.0.6099.109 +- Microsoft Edge 120.0.2210.121 +- Microsoft Edge WebDriver 120.0.2210.91 +- Mozilla Firefox 121.0 +- geckodriver 0.34.0 +- Selenium server 4.16.1 #### Environment variables | Name | Value | @@ -157,11 +158,11 @@ - 3.1.4 #### PyPy -- 2.7.18 [PyPy 7.3.13] +- 2.7.18 [PyPy 7.3.14] - 3.7.13 [PyPy 7.3.9] - 3.8.16 [PyPy 7.3.11] -- 3.9.18 [PyPy 7.3.13] -- 3.10.13 [PyPy 7.3.13] +- 3.9.18 [PyPy 7.3.14] +- 3.10.13 [PyPy 7.3.14] #### Python - 3.7.17 @@ -182,9 +183,9 @@ - 1.21.5 ### Rust Tools -- Cargo 1.74.1 -- Rust 1.74.1 -- Rustdoc 1.74.1 +- Cargo 1.75.0 +- Rust 1.75.0 +- Rustdoc 1.75.0 - Rustup 1.26.0 #### Packages @@ -192,8 +193,8 @@ - Cargo-audit 0.18.3 - Cargo-outdated 0.14.0 - Cbindgen 0.26.0 -- Clippy 0.1.74 -- Rustfmt 1.6.0-stable +- Clippy 0.1.75 +- Rustfmt 1.7.0-stable ### PowerShell Tools - PowerShell 7.2.17 @@ -332,18 +333,18 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" | watchOS 9.1 | 13.1<br>13.2.1<br>13.3.1<br>13.4.1<br>14.0.1<br>14.1<br>14.2 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | ### Android -| Package Name | Version | -| -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 8.0 | -| Android Emulator | 33.1.23 | -| Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | -| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 2)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | -| Android SDK Platform-Tools | 34.0.5 | -| Android Support Repository | 47.0.0 | -| CMake | 3.18.1<br>3.22.1 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 24.0.8215888<br>25.2.9519653 (default)<br>26.1.10909125 | +| Package Name | Version | +| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 8.0 | +| Android Emulator | 33.1.24 | +| Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0 | +| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 2)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1) | +| Android SDK Platform-Tools | 34.0.5 | +| Android Support Repository | 47.0.0 | +| CMake | 3.18.1<br>3.22.1 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 24.0.8215888<br>25.2.9519653 (default)<br>26.1.10909125 | #### Environment variables | Name | Value | @@ -364,7 +365,7 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" #### Environment variables | Name | Value | | ----------------- | ----------------------------------------------------------------------------------------- | -| PARALLELS_DMG_URL | https://download.parallels.com/desktop/v19/19.2.0-54827/ParallelsDesktop-19.2.0-54827.dmg | +| PARALLELS_DMG_URL | https://download.parallels.com/desktop/v19/19.2.1-54832/ParallelsDesktop-19.2.1-54832.dmg | ##### Notes ``` From 4d310f0a5908d895c80e2cd1ebb82c76f8693846 Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Mon, 15 Jan 2024 16:40:23 +0100 Subject: [PATCH 2596/3485] Cleanup json formatted packer template references (#9165) --- helpers/CreateAzureVMFromPackerTemplate.ps1 | 2 +- helpers/GenerateResourcesAndImage.ps1 | 38 +++++-------------- .../azure-pipelines/image-generation.yml | 9 +---- 3 files changed, 11 insertions(+), 38 deletions(-) diff --git a/helpers/CreateAzureVMFromPackerTemplate.ps1 b/helpers/CreateAzureVMFromPackerTemplate.ps1 index 7a7c9cacdea4..588eeafd0d6b 100644 --- a/helpers/CreateAzureVMFromPackerTemplate.ps1 +++ b/helpers/CreateAzureVMFromPackerTemplate.ps1 @@ -28,7 +28,7 @@ Function CreateAzureVMFromPackerTemplate { The location where the Azure virtual machine will be provisioned. Example: "eastus" .EXAMPLE - CreateAzureVMFromPackerTemplate -SubscriptionId {YourSubscriptionId} -ResourceGroupName {ResourceGroupName} -TemplateFile "C:\BuildVmImages\temporaryTemplate.json" -VirtualMachineName "testvm1" -AdminUsername "shady1" -AdminPassword "SomeSecurePassword1" -AzureLocation "eastus" + CreateAzureVMFromPackerTemplate -SubscriptionId {SubscriptionId} -ResourceGroupName {ResourceGroupName} -VirtualMachineName "testvm1" -ManagedImageName {ManagedImageName} -AdminUsername "shady1" -AdminPassword "SomeSecurePassword1" -AzureLocation "eastus" #> param ( [Parameter(Mandatory = $True)] diff --git a/helpers/GenerateResourcesAndImage.ps1 b/helpers/GenerateResourcesAndImage.ps1 index 650ccac6a758..f7e5d1216412 100644 --- a/helpers/GenerateResourcesAndImage.ps1 +++ b/helpers/GenerateResourcesAndImage.ps1 @@ -176,30 +176,20 @@ Function GenerateResourcesAndImage { } Write-Host "Access to packer generated VM will be restricted to agent IP Address: $AgentIp." - if ($TemplatePath.Contains("pkr.hcl")) { - if ($PSVersionTable.PSVersion.Major -eq 5) { - Write-Verbose "PowerShell 5 detected. Replacing double quotes with escaped double quotes in allowed inbound IP addresses." - $AllowedInboundIpAddresses = '[\"{0}\"]' -f $AgentIp - } - elseif ($PSVersionTable.PSVersion.Major -eq 7 -and $PSVersionTable.PSVersion.Minor -le 2) { - Write-Verbose "PowerShell 7.0-7.2 detected. Replacing double quotes with escaped double quotes in allowed inbound IP addresses." - $AllowedInboundIpAddresses = '[\"{0}\"]' -f $AgentIp - } - else { - $AllowedInboundIpAddresses = '["{0}"]' -f $AgentIp - } + if ($PSVersionTable.PSVersion.Major -eq 5) { + Write-Verbose "PowerShell 5 detected. Replacing double quotes with escaped double quotes in allowed inbound IP addresses." + $AllowedInboundIpAddresses = '[\"{0}\"]' -f $AgentIp + } + elseif ($PSVersionTable.PSVersion.Major -eq 7 -and $PSVersionTable.PSVersion.Minor -le 2) { + Write-Verbose "PowerShell 7.0-7.2 detected. Replacing double quotes with escaped double quotes in allowed inbound IP addresses." + $AllowedInboundIpAddresses = '[\"{0}\"]' -f $AgentIp } else { - $AllowedInboundIpAddresses = $AgentIp + $AllowedInboundIpAddresses = '["{0}"]' -f $AgentIp } } else { - if ($TemplatePath.Contains("pkr.hcl")) { - $AllowedInboundIpAddresses = "[]" - } - else { - $AllowedInboundIpAddresses = "" - } + $AllowedInboundIpAddresses = "[]" } Write-Debug "Allowed inbound IP addresses: $AllowedInboundIpAddresses." @@ -216,16 +206,6 @@ Function GenerateResourcesAndImage { $TagsJson = $TagsJson -replace '"', '\"' } Write-Debug "Tags JSON: $TagsJson." - if ($TemplatePath.Contains(".json")) { - Write-Verbose "Injecting tags into packer template." - if ($Tags) { - $BuilderScriptPathInjected = $TemplatePath.Replace(".json", "-temp.json") - $PackerTemplateContent = Get-Content -Path $TemplatePath | ConvertFrom-Json - $PackerTemplateContent.builders | Add-Member -Name "azure_tags" -Value $Tags -MemberType NoteProperty - $PackerTemplateContent | ConvertTo-Json -Depth 3 | Out-File -Encoding Ascii $BuilderScriptPathInjected - $TemplatePath = $BuilderScriptPathInjected - } - } $InstallPassword = $env:UserName + [System.GUID]::NewGuid().ToString().ToUpper() diff --git a/images.CI/linux-and-win/azure-pipelines/image-generation.yml b/images.CI/linux-and-win/azure-pipelines/image-generation.yml index 4815ff241344..72deb989b892 100644 --- a/images.CI/linux-and-win/azure-pipelines/image-generation.yml +++ b/images.CI/linux-and-win/azure-pipelines/image-generation.yml @@ -69,14 +69,7 @@ jobs: $TemplateDirectoryPath = Join-Path "images" $TemplateDirectoryName | Resolve-Path $TemplateFileName = "${{ parameters.image_template_name }}" - if ($TemplateFileName) { - $TemplatePath = Join-Path $TemplateDirectoryPath $TemplateFileName - } else { - $TemplatePath = Join-Path $TemplateDirectoryPath "$ImageType.pkr.hcl" - if ( -not (Test-Path $TemplatePath) ) { - $TemplatePath = Join-Path $TemplateDirectoryPath "$ImageType.json" - } - } + $TemplatePath = Join-Path $TemplateDirectoryPath $TemplateFileName Write-Host "##vso[task.setvariable variable=TemplateDirectoryPath;]$TemplateDirectoryPath" Write-Host "##vso[task.setvariable variable=TemplatePath;]$TemplatePath" From c40e9d7d53d634ecc9994070332998a3a0996d83 Mon Sep 17 00:00:00 2001 From: sergei-pyshnoi <121864472+sergei-pyshnoi@users.noreply.github.com> Date: Tue, 16 Jan 2024 15:39:13 +0100 Subject: [PATCH 2597/3485] [Ubuntu] Pin docker compose 2.23.3 (#9173) --- images/ubuntu/scripts/build/install-docker.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/images/ubuntu/scripts/build/install-docker.sh b/images/ubuntu/scripts/build/install-docker.sh index 039398bd4e3e..e5b52b05b736 100644 --- a/images/ubuntu/scripts/build/install-docker.sh +++ b/images/ubuntu/scripts/build/install-docker.sh @@ -16,13 +16,13 @@ curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o $GPG_ echo "deb [arch=amd64 signed-by=$GPG_KEY] $REPO_URL $(lsb_release -cs) stable" > $REPO_PATH apt-get update apt-get install --no-install-recommends docker-ce docker-ce-cli containerd.io docker-buildx-plugin - # Download docker compose v2 from releases -URL=$(resolve_github_release_asset_url "docker/compose" "endswith(\"compose-linux-x86_64\")" "latest") +# Temporaty pinned to v2.23.3 due https://github.com/actions/runner-images/issues/9172 +URL=$(resolve_github_release_asset_url "docker/compose" "endswith(\"compose-linux-x86_64\")" "2.23.3") compose_binary_path=$(download_with_retry "${URL}" "/tmp/docker-compose-v2") # Supply chain security - Docker Compose v2 -compose_hash_url=$(resolve_github_release_asset_url "docker/compose" "endswith(\"checksums.txt\")" "latest") +compose_hash_url=$(resolve_github_release_asset_url "docker/compose" "endswith(\"checksums.txt\")" "2.23.3") compose_external_hash=$(get_checksum_from_url "${compose_hash_url}" "compose-linux-x86_64" "SHA256") use_checksum_comparison "${compose_binary_path}" "${compose_external_hash}" From f046bcaec35305f006ce3cb6fdebb161d0ea5577 Mon Sep 17 00:00:00 2001 From: sergei-pyshnoi <121864472+sergei-pyshnoi@users.noreply.github.com> Date: Tue, 16 Jan 2024 16:53:44 +0100 Subject: [PATCH 2598/3485] [Windows] pin docker compose version (#9174) --- images/windows/scripts/build/Install-DockerCompose.ps1 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/images/windows/scripts/build/Install-DockerCompose.ps1 b/images/windows/scripts/build/Install-DockerCompose.ps1 index ff982f32a9dd..a297275e41c2 100644 --- a/images/windows/scripts/build/Install-DockerCompose.ps1 +++ b/images/windows/scripts/build/Install-DockerCompose.ps1 @@ -9,7 +9,8 @@ $versionToInstall = Resolve-ChocoPackageVersion -PackageName "docker-compose" -T Install-ChocoPackage docker-compose -ArgumentList "--version=$versionToInstall" Write-Host "Install-Package Docker-Compose v2" -$dockerComposev2Url = "https://github.com/docker/compose/releases/latest/download/docker-compose-windows-x86_64.exe" +# Temporaty pinned to v2.23.3 due https://github.com/actions/runner-images/issues/9172 +$dockerComposev2Url = "https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-windows-x86_64.exe" $cliPluginsDir = "C:\ProgramData\docker\cli-plugins" New-Item -Path $cliPluginsDir -ItemType Directory Invoke-DownloadWithRetry -Url $dockerComposev2Url -Path "$cliPluginsDir\docker-compose.exe" From 192a94d178e6df98256745c2bb8ef99998aa95fd Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Wed, 17 Jan 2024 10:56:11 +0100 Subject: [PATCH 2599/3485] Update LICENSE (Happy 2024!) (#9183) --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index 545898acf7b8..163ff113900b 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2023 GitHub +Copyright (c) 2024 GitHub Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal From 76ad0eb3d6cb154ae82e60f6ec46c193f8749c12 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Thu, 18 Jan 2024 10:41:59 +0100 Subject: [PATCH 2600/3485] [macOS] Get rid of unused software in macOS 13 (#9187) --- .../scripts/docs-gen/Generate-SoftwareReport.ps1 | 15 ++++++++++----- images/macos/scripts/tests/BasicTools.Tests.ps1 | 4 ++-- images/macos/scripts/tests/RubyGem.Tests.ps1 | 2 +- images/macos/scripts/tests/WebServers.Tests.ps1 | 2 +- images/macos/templates/macOS-13.anka.pkr.hcl | 1 - images/macos/toolsets/toolset-13.json | 8 +++----- 6 files changed, 17 insertions(+), 15 deletions(-) diff --git a/images/macos/scripts/docs-gen/Generate-SoftwareReport.ps1 b/images/macos/scripts/docs-gen/Generate-SoftwareReport.ps1 index 2419f45baa11..01d07b2bddb7 100644 --- a/images/macos/scripts/docs-gen/Generate-SoftwareReport.ps1 +++ b/images/macos/scripts/docs-gen/Generate-SoftwareReport.ps1 @@ -38,7 +38,9 @@ $languageAndRuntime.AddToolVersion("Bash", $(Get-BashVersion)) $languageAndRuntime.AddNodes($(Get-ClangLLVMVersions)) $languageAndRuntime.AddNodes($(Get-GccVersions)) $languageAndRuntime.AddNodes($(Get-FortranVersions)) -$languageAndRuntime.AddToolVersion("Julia", $(Get-JuliaVersion)) +if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) { + $languageAndRuntime.AddToolVersion("Julia", $(Get-JuliaVersion)) +} $languageAndRuntime.AddToolVersion("Kotlin", $(Get-KotlinVersion)) if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) { $languageAndRuntime.AddToolVersion("Go", $(Get-GoVersion)) @@ -62,7 +64,9 @@ if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) { if ((-not $os.IsVenturaArm64) -and (-not $os.IsSonomaArm64)) { $languageAndRuntime.AddToolVersion("Python3", $(Get-Python3Version)) } -$languageAndRuntime.AddToolVersion("R", $(Get-RVersion)) +if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) { + $languageAndRuntime.AddToolVersion("R", $(Get-RVersion)) +} $languageAndRuntime.AddToolVersion("Ruby", $(Get-RubyVersion)) # Package Management @@ -275,9 +279,10 @@ Get-XcodeInfoList | Out-Null $xcodeInfo = Get-XcodeInfoList $xcode.AddTable($(Build-XcodeTable $xcodeInfo)) - -$xcodeTools = $xcode.AddHeader("Xcode Support Tools") -$xcodeTools.AddNodes($(Build-XcodeSupportToolsSection)) +if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) { + $xcodeTools = $xcode.AddHeader("Xcode Support Tools") + $xcodeTools.AddNodes($(Build-XcodeSupportToolsSection)) +} $installedSdks = $xcode.AddHeader("Installed SDKs") $installedSdks.AddTable($(Build-XcodeSDKTable $xcodeInfo)) diff --git a/images/macos/scripts/tests/BasicTools.Tests.ps1 b/images/macos/scripts/tests/BasicTools.Tests.ps1 index 9e65f7845486..a570f9988db2 100644 --- a/images/macos/scripts/tests/BasicTools.Tests.ps1 +++ b/images/macos/scripts/tests/BasicTools.Tests.ps1 @@ -123,7 +123,7 @@ Describe "Aliyun CLI" -Skip:($os.IsMonterey -or $os.IsVentura -or $os.IsSonoma) } } -Describe "Julia" { +Describe "Julia" -Skip:($os.IsVentura -or $os.IsSonoma) { It "Julia" { "julia --version" | Should -ReturnZeroExitCode } @@ -159,7 +159,7 @@ Describe "virtualbox" -Skip:($os.IsBigSur -or $os.IsVentura -or $os.IsSonoma) { } } -Describe "R" { +Describe "R" -Skip:($os.IsVentura -or $os.IsSonoma) { It "R" { "R --version" | Should -ReturnZeroExitCode } diff --git a/images/macos/scripts/tests/RubyGem.Tests.ps1 b/images/macos/scripts/tests/RubyGem.Tests.ps1 index f5ef6f1557fb..2dc611e598b0 100644 --- a/images/macos/scripts/tests/RubyGem.Tests.ps1 +++ b/images/macos/scripts/tests/RubyGem.Tests.ps1 @@ -32,7 +32,7 @@ Describe "Fastlane" { } } -Describe "xcpretty" { +Describe "xcpretty" -Skip:($os.IsVentura -or $os.IsSonoma) { It "xcpretty" { "xcpretty --version" | Should -ReturnZeroExitCode } diff --git a/images/macos/scripts/tests/WebServers.Tests.ps1 b/images/macos/scripts/tests/WebServers.Tests.ps1 index f1365b2ad7ef..a132ba06f07e 100644 --- a/images/macos/scripts/tests/WebServers.Tests.ps1 +++ b/images/macos/scripts/tests/WebServers.Tests.ps1 @@ -2,7 +2,7 @@ Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" $os = Get-OSVersion -Describe "Apache" -Skip:($os.IsVenturaArm64 -or $os.IsSonomaArm64) { +Describe "Apache" -Skip:($os.IsVentura -or $os.IsSonoma) { It "Apache CLI" { "httpd -v" | Should -ReturnZeroExitCode } diff --git a/images/macos/templates/macOS-13.anka.pkr.hcl b/images/macos/templates/macOS-13.anka.pkr.hcl index 6eb430615b04..ee3b447ef57b 100644 --- a/images/macos/templates/macOS-13.anka.pkr.hcl +++ b/images/macos/templates/macOS-13.anka.pkr.hcl @@ -217,7 +217,6 @@ build { "${path.root}/../scripts/build/install-gcc.sh", "${path.root}/../scripts/build/install-cocoapods.sh", "${path.root}/../scripts/build/install-android-sdk.sh", - "${path.root}/../scripts/build/install-apache.sh", "${path.root}/../scripts/build/install-vcpkg.sh", "${path.root}/../scripts/build/install-safari.sh", "${path.root}/../scripts/build/install-chrome.sh", diff --git a/images/macos/toolsets/toolset-13.json b/images/macos/toolsets/toolset-13.json index ca32d92d2c49..0ae144262400 100644 --- a/images/macos/toolsets/toolset-13.json +++ b/images/macos/toolsets/toolset-13.json @@ -1,6 +1,6 @@ { "xcode": { - "default": "14.3.1", + "default": "15.0.1", "x64": { "versions": [ { "link": "15.2", "version": "15.2.0+15C500b", "install_runtimes": "true", "sha256": "04E93680C6DDBEC84666531BE412DE778AFC8EAC6AB2037F4C2BE7290818B59B"}, @@ -77,14 +77,13 @@ "swiftformat", "zstd", "gmp", - "r", "yq", "unxip", "xcbeautify", "xcodes" ], "cask_packages": [ - "julia" + "" ] }, "gcc": { @@ -114,7 +113,6 @@ "default": "3.0", "rubygems": [ "cocoapods", - "xcpretty", "bundler", "fastlane" ] @@ -217,7 +215,7 @@ "default": "1.20" }, "node": { - "default": "18" + "default": "20" }, "llvm": { "version": "15" From 8943e98be13fa39ff3598ba88be2d0b3e9465721 Mon Sep 17 00:00:00 2001 From: sergei-pyshnoi <121864472+sergei-pyshnoi@users.noreply.github.com> Date: Thu, 18 Jan 2024 10:48:42 +0100 Subject: [PATCH 2601/3485] fix vs signature for windows-2022 (#9189) --- images/windows/toolsets/toolset-2022.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/windows/toolsets/toolset-2022.json b/images/windows/toolsets/toolset-2022.json index be15c713c76f..d6009b1aa550 100644 --- a/images/windows/toolsets/toolset-2022.json +++ b/images/windows/toolsets/toolset-2022.json @@ -176,7 +176,7 @@ "subversion" : "17", "edition" : "Enterprise", "channel": "release", - "signature": "72105B6D5F370B62FD5C82F1512F7AD7DEE5F2C0", + "signature": "C2048FB509F1C37A8C3E9EC6648118458AA01780", "workloads": [ "Component.Dotfuscator", "Component.Linux.CMake", From 10cbb2750995aadda0e129c83b6b1b6dc67cdee6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 18 Jan 2024 10:40:14 +0000 Subject: [PATCH 2602/3485] Updating readme file for ubuntu22 version 20240116.3.1 (#9181) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2204-Readme.md | 68 +++++++++++++++--------------- 1 file changed, 33 insertions(+), 35 deletions(-) diff --git a/images/ubuntu/Ubuntu2204-Readme.md b/images/ubuntu/Ubuntu2204-Readme.md index 8272eea0c293..3c133014eec2 100644 --- a/images/ubuntu/Ubuntu2204-Readme.md +++ b/images/ubuntu/Ubuntu2204-Readme.md @@ -1,14 +1,12 @@ | Announcements | |-| | [[All OSes] Powershell Core will be updated to 7.4.x LTS on January, 28](https://github.com/actions/runner-images/issues/9115) | -| [[Ubuntu] buildpack-deps docker images will be removed from runners on January, 8](https://github.com/actions/runner-images/issues/9053) | | [Old versions of Android SDK & tools will be removed from images on January, 8](https://github.com/actions/runner-images/issues/8952) | -| [Major Refactoring of GitHub Actions Runner Images Repository](https://github.com/actions/runner-images/issues/8706) | *** # Ubuntu 22.04 - OS Version: 22.04.3 LTS - Kernel Version: 6.2.0-1018-azure -- Image Version: 20240107.1.0 +- Image Version: 20240116.3.0 - Systemd version: 249.11-0ubuntu3.11 ## Installed Software @@ -34,15 +32,15 @@ ### Package Management - cpan 1.64 - Helm 3.13.1 -- Homebrew 4.2.2 +- Homebrew 4.2.4 - Miniconda 23.11.0 - Npm 10.2.3 - NuGet 6.6.1.2 - Pip 22.0.2 - Pip3 22.0.2 -- Pipx 1.4.1 +- Pipx 1.4.2 - RubyGems 3.3.5 -- Vcpkg (build from commit ce46ba877) +- Vcpkg (build from commit 53bef8994) - Yarn 1.22.21 #### Environment variables @@ -100,7 +98,7 @@ to accomplish this. - Packer 1.10.0 - Parcel 2.11.0 - Podman 3.4.4 -- Pulumi 3.100.0 +- Pulumi 3.101.1 - R 4.3.2 - Skopeo 1.4.1 - Sphinx Open Source Search Server 2.2.11 @@ -112,17 +110,17 @@ to accomplish this. ### CLI Tools - Alibaba Cloud CLI 3.0.196 -- AWS CLI 2.15.8 -- AWS CLI Session Manager Plugin 1.2.536.0 -- AWS SAM CLI 1.106.0 -- Azure CLI 2.55.0 +- AWS CLI 2.15.10 +- AWS CLI Session Manager Plugin 1.2.553.0 +- AWS SAM CLI 1.107.0 +- Azure CLI 2.56.0 - Azure CLI (azure-devops) 0.26.0 -- GitHub CLI 2.40.1 -- Google Cloud CLI 458.0.1 -- Netlify CLI 17.11.1 -- OpenShift CLI 4.14.7 +- GitHub CLI 2.42.0 +- Google Cloud CLI 459.0.0 +- Netlify CLI 17.14.0 +- OpenShift CLI 4.14.8 - ORAS CLI 1.1.0 -- Vercel CLI 33.0.2 +- Vercel CLI 33.1.0 ### Java | Version | Environment Variable | @@ -153,7 +151,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustup 1.26.0 #### Packages -- Bindgen 0.69.1 +- Bindgen 0.69.2 - Cargo audit 0.18.3 - Cargo clippy 0.1.75 - Cargo outdated 0.14.0 @@ -161,13 +159,13 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 120.0.6099.199 +- Google Chrome 120.0.6099.216 - ChromeDriver 120.0.6099.109 - Chromium 120.0.6099.0 -- Microsoft Edge 120.0.2210.121 -- Microsoft Edge WebDriver 120.0.2210.121 +- Microsoft Edge 120.0.2210.133 +- Microsoft Edge WebDriver 120.0.2210.133 - Selenium server 4.16.1 -- Mozilla Firefox 121.0 +- Mozilla Firefox 121.0.1 - Geckodriver 0.34.0 #### Environment variables @@ -179,7 +177,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | ### .NET Tools -- .NET Core SDK: 6.0.417, 7.0.404, 8.0.100 +- .NET Core SDK: 6.0.418, 7.0.405, 8.0.101 - nbgv 3.6.133+2d32d93cb1 ### Databases @@ -204,7 +202,7 @@ Use the following command as a part of your job to start the service: 'sudo syst #### MS SQL - sqlcmd 17.10.0001.1 -- SqlPackage 162.1.167.1 +- SqlPackage 162.1.172.1 ### Cached Tools @@ -229,14 +227,14 @@ Use the following command as a part of your job to start the service: 'sudo syst #### PyPy - 3.7.13 [PyPy 7.3.9] - 3.8.16 [PyPy 7.3.11] -- 3.9.18 [PyPy 7.3.14] -- 3.10.13 [PyPy 7.3.14] +- 3.9.18 [PyPy 7.3.15] +- 3.10.13 [PyPy 7.3.15] #### Ruby - 3.1.4 ### PowerShell Tools -- PowerShell 7.2.17 +- PowerShell 7.2.18 #### PowerShell Modules - Az: 9.3.0 @@ -279,15 +277,15 @@ Use the following command as a part of your job to start the service: 'sudo syst | alpine:3.16 | sha256:e4cdb7d47b06ba0a062ad2a97a7d154967c8f83934594d9f2bd3efa89292996b | 2023-11-30 | | alpine:3.17 | sha256:6e94b5cda2d6fd57d85abf81e81dabaea97a5885f919da676cc19d3551da4061 | 2023-11-30 | | alpine:3.18 | sha256:34871e7290500828b39e22294660bee86d966bc0017544e848dd9a255cdf59e0 | 2023-11-30 | -| debian:10 | sha256:cd3bbe339eeb538f4a1a6b04e290690658c119cd50b73677d29b80e3cda8f1dd | 2023-12-19 | -| debian:11 | sha256:71f0e09d55a4042ddee1f114a0838d99266e185bf33e71f15c15bf6b9545a9a0 | 2023-12-19 | +| debian:10 | sha256:defa5d214292f2aaf7905d3e4bcdf8f628019feb63e7c8746df563d1a941f8d7 | 2024-01-11 | +| debian:11 | sha256:71cb300d5448af821aedfe63afd55ba05f45a6a79f00dcd131b96b780bb99fe4 | 2024-01-11 | | moby/buildkit:latest | sha256:5a8f30813a104b86e927ff4695a746f74a5bb921c7be1dbcca6d754dfbe04822 | 2023-12-01 | | node:16 | sha256:f77a1aef2da8d83e45ec990f45df50f1a286c5fe8bbfb8c6e4246c6389705c0b | 2023-09-07 | | node:16-alpine | sha256:a1f9d027912b58a7c75be7716c97cfbc6d3099f3a97ed84aa490be9dee20e787 | 2023-08-10 | -| node:18 | sha256:f152130c9bb77afd49873a26fcfb6da7971b451ae6db51901fb7e028ccc0ca75 | 2023-12-19 | +| node:18 | sha256:d7885552c11adb0f251db87d96a9c964990235569c8291bc61c276261947d6de | 2024-01-11 | | node:18-alpine | sha256:b1a0356f7d6b86c958a06949d3db3f7fb27f95f627aa6157cb98bc65c801efa2 | 2023-12-11 | -| node:20 | sha256:8d0f16fe841577f9317ab49011c6d819e1fa81f8d4af7ece7ae0ac815e07ac84 | 2023-12-19 | -| node:20-alpine | sha256:9e38d3d4117da74a643f67041c83914480b335c3bd44d37ccf5b5ad86cd715d1 | 2023-12-11 | +| node:20 | sha256:9aa3de5470c99408fda002dc1f406e92a31daf0492eb33d857d8d9d252edcc52 | 2024-01-11 | +| node:20-alpine | sha256:8e6a472eb9742f4f486ca9ef13321b7fc2e54f2f60814f339eeda2aff3037573 | 2024-01-10 | | ubuntu:20.04 | sha256:f2034e7195f61334e6caff6ecf2e965f92d11e888309065da85ff50c617732b8 | 2023-12-13 | | ubuntu:22.04 | sha256:6042500cf4b44023ea1894effe7890666b0c5c7871ed83a97c36c76ae560bb9b | 2023-12-12 | @@ -298,7 +296,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | aria2 | 1.36.0-1 | | autoconf | 2.71-2 | | automake | 1:1.16.5-1.3 | -| binutils | 2.38-4ubuntu2.4 | +| binutils | 2.38-4ubuntu2.5 | | bison | 2:3.8.2+dfsg-1build1 | | brotli | 1.0.9-2build6 | | bzip2 | 1.0.8-5build1 | @@ -325,7 +323,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | lib32z1 | 1:1.2.11.dfsg-2ubuntu9.2 | | libc++-dev | 1:14.0-55\~exp2 | | libc++abi-dev | 1:14.0-55\~exp2 | -| libc6-dev | 2.35-0ubuntu3.5 | +| libc6-dev | 2.35-0ubuntu3.6 | | libcurl4 | 7.81.0-1ubuntu1.15 | | libgbm-dev | 23.0.4-0ubuntu1\~22.04.1 | | libgconf-2-4 | 3.2.6-7ubuntu2 | @@ -342,7 +340,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | libxkbfile-dev | 1:1.1.0-1build3 | | libxss1 | 1:1.2.3-1build2 | | libyaml-dev | 0.2.2-1build2 | -| locales | 2.35-0ubuntu3.5 | +| locales | 2.35-0ubuntu3.6 | | lz4 | 1.9.3-2build2 | | m4 | 1.4.18-5ubuntu2 | | make | 4.3-4.1build1 | @@ -375,7 +373,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | texinfo | 6.8-4build1 | | time | 1.9-0.1build2 | | tk | 8.6.11+1build2 | -| tzdata | 2023c-0ubuntu0.22.04.2 | +| tzdata | 2023d-0ubuntu0.22.04 | | unzip | 6.0-26ubuntu3.1 | | upx | 3.96-3 | | wget | 1.21.2-2ubuntu1 | From 6c52c5a74407557164fd381660538a25e7d41b9e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 18 Jan 2024 12:12:04 +0000 Subject: [PATCH 2603/3485] Updating readme file for ubuntu20 version 20240116.2.1 (#9180) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2004-Readme.md | 68 +++++++++++++++--------------- 1 file changed, 33 insertions(+), 35 deletions(-) diff --git a/images/ubuntu/Ubuntu2004-Readme.md b/images/ubuntu/Ubuntu2004-Readme.md index f36914006e8c..fb7a7ddaf34b 100644 --- a/images/ubuntu/Ubuntu2004-Readme.md +++ b/images/ubuntu/Ubuntu2004-Readme.md @@ -1,14 +1,12 @@ | Announcements | |-| | [[All OSes] Powershell Core will be updated to 7.4.x LTS on January, 28](https://github.com/actions/runner-images/issues/9115) | -| [[Ubuntu] buildpack-deps docker images will be removed from runners on January, 8](https://github.com/actions/runner-images/issues/9053) | | [Old versions of Android SDK & tools will be removed from images on January, 8](https://github.com/actions/runner-images/issues/8952) | -| [Major Refactoring of GitHub Actions Runner Images Repository](https://github.com/actions/runner-images/issues/8706) | *** # Ubuntu 20.04 - OS Version: 20.04.6 LTS - Kernel Version: 5.15.0-1053-azure -- Image Version: 20240107.1.0 +- Image Version: 20240116.2.0 - Systemd version: 245.4-4ubuntu3.22 ## Installed Software @@ -36,15 +34,15 @@ ### Package Management - cpan 1.64 - Helm 3.13.1 -- Homebrew 4.2.2 +- Homebrew 4.2.4 - Miniconda 23.11.0 - Npm 10.2.3 - NuGet 6.6.1.2 - Pip 20.0.2 - Pip3 20.0.2 -- Pipx 1.4.1 +- Pipx 1.4.2 - RubyGems 3.1.2 -- Vcpkg (build from commit ce46ba877) +- Vcpkg (build from commit 53bef8994) - Yarn 1.22.21 #### Environment variables @@ -107,7 +105,7 @@ to accomplish this. - Parcel 2.11.0 - PhantomJS 2.1.1 2.1.1 - Podman 3.4.2 -- Pulumi 3.100.0 +- Pulumi 3.101.1 - R 4.3.2 - Skopeo 1.5.0 - Sphinx Open Source Search Server 2.2.11 @@ -119,17 +117,17 @@ to accomplish this. ### CLI Tools - Alibaba Cloud CLI 3.0.174 -- AWS CLI 2.15.8 -- AWS CLI Session Manager Plugin 1.2.536.0 -- AWS SAM CLI 1.106.0 -- Azure CLI 2.55.0 +- AWS CLI 2.15.10 +- AWS CLI Session Manager Plugin 1.2.553.0 +- AWS SAM CLI 1.107.0 +- Azure CLI 2.56.0 - Azure CLI (azure-devops) 0.26.0 -- GitHub CLI 2.40.1 -- Google Cloud CLI 458.0.1 -- Netlify CLI 17.11.1 -- OpenShift CLI 4.14.7 +- GitHub CLI 2.42.0 +- Google Cloud CLI 459.0.0 +- Netlify CLI 17.14.0 +- OpenShift CLI 4.14.8 - ORAS CLI 1.1.0 -- Vercel CLI 33.0.2 +- Vercel CLI 33.1.0 ### Java | Version | Environment Variable | @@ -160,7 +158,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustup 1.26.0 #### Packages -- Bindgen 0.69.1 +- Bindgen 0.69.2 - Cargo audit 0.18.3 - Cargo clippy 0.1.75 - Cargo outdated 0.14.0 @@ -168,13 +166,13 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 120.0.6099.199 +- Google Chrome 120.0.6099.216 - ChromeDriver 120.0.6099.109 - Chromium 120.0.6099.0 -- Microsoft Edge 120.0.2210.121 -- Microsoft Edge WebDriver 120.0.2210.121 +- Microsoft Edge 120.0.2210.133 +- Microsoft Edge WebDriver 120.0.2210.133 - Selenium server 4.16.1 -- Mozilla Firefox 121.0 +- Mozilla Firefox 121.0.1 - Geckodriver 0.34.0 #### Environment variables @@ -186,7 +184,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | ### .NET Tools -- .NET Core SDK: 6.0.417, 7.0.404, 8.0.100 +- .NET Core SDK: 6.0.418, 7.0.405, 8.0.101 - nbgv 3.6.133+2d32d93cb1 ### Databases @@ -212,7 +210,7 @@ Use the following command as a part of your job to start the service: 'sudo syst #### MS SQL - sqlcmd 17.10.0001.1 -- SqlPackage 162.1.167.1 +- SqlPackage 162.1.172.1 ### Cached Tools @@ -235,12 +233,12 @@ Use the following command as a part of your job to start the service: 'sudo syst - 3.12.1 #### PyPy -- 2.7.18 [PyPy 7.3.14] +- 2.7.18 [PyPy 7.3.15] - 3.6.12 [PyPy 7.3.3] - 3.7.13 [PyPy 7.3.9] - 3.8.16 [PyPy 7.3.11] -- 3.9.18 [PyPy 7.3.14] -- 3.10.13 [PyPy 7.3.14] +- 3.9.18 [PyPy 7.3.15] +- 3.10.13 [PyPy 7.3.15] #### Ruby - 2.5.9 @@ -250,7 +248,7 @@ Use the following command as a part of your job to start the service: 'sudo syst - 3.1.4 ### PowerShell Tools -- PowerShell 7.2.17 +- PowerShell 7.2.18 #### PowerShell Modules - Az: 9.3.0 @@ -295,16 +293,16 @@ Use the following command as a part of your job to start the service: 'sudo syst | alpine:3.16 | sha256:e4cdb7d47b06ba0a062ad2a97a7d154967c8f83934594d9f2bd3efa89292996b | 2023-11-30 | | alpine:3.17 | sha256:6e94b5cda2d6fd57d85abf81e81dabaea97a5885f919da676cc19d3551da4061 | 2023-11-30 | | alpine:3.18 | sha256:34871e7290500828b39e22294660bee86d966bc0017544e848dd9a255cdf59e0 | 2023-11-30 | -| debian:10 | sha256:cd3bbe339eeb538f4a1a6b04e290690658c119cd50b73677d29b80e3cda8f1dd | 2023-12-19 | -| debian:11 | sha256:71f0e09d55a4042ddee1f114a0838d99266e185bf33e71f15c15bf6b9545a9a0 | 2023-12-19 | +| debian:10 | sha256:defa5d214292f2aaf7905d3e4bcdf8f628019feb63e7c8746df563d1a941f8d7 | 2024-01-11 | +| debian:11 | sha256:71cb300d5448af821aedfe63afd55ba05f45a6a79f00dcd131b96b780bb99fe4 | 2024-01-11 | | debian:9 | sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be | 2022-06-23 | | moby/buildkit:latest | sha256:5a8f30813a104b86e927ff4695a746f74a5bb921c7be1dbcca6d754dfbe04822 | 2023-12-01 | | node:16 | sha256:f77a1aef2da8d83e45ec990f45df50f1a286c5fe8bbfb8c6e4246c6389705c0b | 2023-09-07 | | node:16-alpine | sha256:a1f9d027912b58a7c75be7716c97cfbc6d3099f3a97ed84aa490be9dee20e787 | 2023-08-10 | -| node:18 | sha256:f152130c9bb77afd49873a26fcfb6da7971b451ae6db51901fb7e028ccc0ca75 | 2023-12-19 | +| node:18 | sha256:d7885552c11adb0f251db87d96a9c964990235569c8291bc61c276261947d6de | 2024-01-11 | | node:18-alpine | sha256:b1a0356f7d6b86c958a06949d3db3f7fb27f95f627aa6157cb98bc65c801efa2 | 2023-12-11 | -| node:20 | sha256:8d0f16fe841577f9317ab49011c6d819e1fa81f8d4af7ece7ae0ac815e07ac84 | 2023-12-19 | -| node:20-alpine | sha256:9e38d3d4117da74a643f67041c83914480b335c3bd44d37ccf5b5ad86cd715d1 | 2023-12-11 | +| node:20 | sha256:9aa3de5470c99408fda002dc1f406e92a31daf0492eb33d857d8d9d252edcc52 | 2024-01-11 | +| node:20-alpine | sha256:8e6a472eb9742f4f486ca9ef13321b7fc2e54f2f60814f339eeda2aff3037573 | 2024-01-10 | | ubuntu:20.04 | sha256:f2034e7195f61334e6caff6ecf2e965f92d11e888309065da85ff50c617732b8 | 2023-12-13 | ### Installed apt packages @@ -314,7 +312,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | aria2 | 1.35.0-1build1 | | autoconf | 2.69-11.1 | | automake | 1:1.16.1-4ubuntu6 | -| binutils | 2.34-6ubuntu1.7 | +| binutils | 2.34-6ubuntu1.8 | | bison | 2:3.5.1+dfsg-1 | | brotli | 1.0.7-6ubuntu0.1 | | bzip2 | 1.0.8-2 | @@ -336,7 +334,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | haveged | 1.9.1-6ubuntu1 | | imagemagick | 8:6.9.10.23+dfsg-2.1ubuntu11.9 | | iproute2 | 5.5.0-1ubuntu1 | -| iputils-ping | 3:20190709-3 | +| iputils-ping | 3:20190709-3ubuntu1 | | jq | 1.6-1ubuntu0.20.04.1 | | lib32z1 | 1:1.2.11.dfsg-2ubuntu1.5 | | libc++-dev | 1:10.0-50\~exp1 | @@ -389,7 +387,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | texinfo | 6.7.0.dfsg.2-5 | | time | 1.7-25.1build1 | | tk | 8.6.9+1 | -| tzdata | 2023c-0ubuntu0.20.04.2 | +| tzdata | 2023d-0ubuntu0.20.04 | | unzip | 6.0-25ubuntu1.1 | | upx | 3.95-2build1 | | wget | 1.20.3-1ubuntu2 | From 55a6d9d6872b00b74bd13f10eb4cd95695c7f1ae Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 18 Jan 2024 16:47:12 +0000 Subject: [PATCH 2604/3485] Updating readme file for win19 version 20240116.2.1 (#9186) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/windows/Windows2019-Readme.md | 81 ++++++++++++++-------------- 1 file changed, 40 insertions(+), 41 deletions(-) diff --git a/images/windows/Windows2019-Readme.md b/images/windows/Windows2019-Readme.md index 604838a72bad..60b240217d28 100644 --- a/images/windows/Windows2019-Readme.md +++ b/images/windows/Windows2019-Readme.md @@ -2,11 +2,10 @@ |-| | [[All OSes] Powershell Core will be updated to 7.4.x LTS on January, 28](https://github.com/actions/runner-images/issues/9115) | | [Old versions of Android SDK & tools will be removed from images on January, 8](https://github.com/actions/runner-images/issues/8952) | -| [Major Refactoring of GitHub Actions Runner Images Repository](https://github.com/actions/runner-images/issues/8706) | *** # Windows Server 2019 -- OS Version: 10.0.17763 Build 5206 -- Image Version: 20240108.2.0 +- OS Version: 10.0.17763 Build 5329 +- Image Version: 20240116.2.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -15,7 +14,7 @@ ### Language and Runtime - Bash 5.2.21(1)-release -- Go 1.20.12 +- Go 1.20.13 - Julia 1.10.0 - Kotlin 1.9.22 - LLVM 16.0.6 @@ -28,14 +27,14 @@ ### Package Management - Chocolatey 2.2.2 - Composer 2.6.6 -- Helm 3.13.2 +- Helm 3.13.3 - Miniconda 23.11.0 (pre-installed on the image but not added to PATH) - NPM 9.8.1 - NuGet 6.8.0.131 - pip 23.3.2 (python 3.7) - Pipx 1.2.1 - RubyGems 2.7.6.3 -- Vcpkg (build from commit ce46ba877) +- Vcpkg (build from commit 763a397e3) - Yarn 1.22.21 #### Environment variables @@ -53,7 +52,7 @@ ### Tools - 7zip 23.01 - aria2 1.37.0 -- azcopy 10.22.1 +- azcopy 10.22.2 - Bazel 7.0.0 - Bazelisk 1.19.0 - Bicep 0.24.24 @@ -63,12 +62,12 @@ - Docker 24.0.7 - Docker Compose v1 1.29.2 - Docker Compose v2 2.23.3 -- Docker-wincred 0.8.0 +- Docker-wincred 0.8.1 - ghc 9.8.1 - Git 2.43.0.windows.1 - Git LFS 3.4.0 -- Google Cloud CLI 458.0.1 -- ImageMagick 7.1.1-25 +- Google Cloud CLI 459.0.0 +- ImageMagick 7.1.1-26 - InnoSetup 6.2.2 - jq 1.7-dirty - Kind 0.20.0 @@ -82,7 +81,7 @@ - OpenSSL 1.1.1w - Packer 1.10.0 - Parcel 2.11.0 -- Pulumi 3.100.0 +- Pulumi 3.101.1 - R 4.3.2 - Service Fabric SDK 9.1.1436.9590 - Stack 2.13.1 @@ -96,13 +95,13 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.196 -- AWS CLI 2.15.8 -- AWS SAM CLI 1.106.0 -- AWS Session Manager CLI 1.2.536.0 -- Azure CLI 2.55.0 +- AWS CLI 2.15.10 +- AWS SAM CLI 1.107.0 +- AWS Session Manager CLI 1.2.553.0 +- Azure CLI 2.56.0 - Azure DevOps CLI extension 0.26.0 - Cloud Foundry CLI 6.53.0 -- GitHub CLI 2.41.0 +- GitHub CLI 2.42.1 ### Rust Tools - Cargo 1.75.0 @@ -111,7 +110,7 @@ - Rustup 1.26.0 #### Packages -- bindgen 0.69.1 +- bindgen 0.69.2 - cargo-audit 0.18.3 - cargo-outdated 0.14.0 - cbindgen 0.26.0 @@ -119,11 +118,11 @@ - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 120.0.6099.200 +- Google Chrome 120.0.6099.225 - Chrome Driver 120.0.6099.109 -- Microsoft Edge 120.0.2210.121 -- Microsoft Edge Driver 120.0.2210.121 -- Mozilla Firefox 121.0 +- Microsoft Edge 120.0.2210.133 +- Microsoft Edge Driver 120.0.2210.133 +- Mozilla Firefox 121.0.1 - Gecko Driver 0.34.0 - IE Driver 4.14.0.0 - Selenium server 4.16.0 @@ -168,8 +167,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Go - 1.19.13 -- 1.20.12 -- 1.21.5 +- 1.20.13 +- 1.21.6 #### Node.js - 16.20.2 @@ -185,12 +184,12 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 3.12.1 #### PyPy -- 2.7.18 [PyPy 7.3.14] +- 2.7.18 [PyPy 7.3.15] - 3.6.12 [PyPy 7.3.3] - 3.7.13 [PyPy 7.3.9] - 3.8.16 [PyPy 7.3.11] -- 3.9.18 [PyPy 7.3.14] -- 3.10.13 [PyPy 7.3.14] +- 3.9.18 [PyPy 7.3.15] +- 3.10.13 [PyPy 7.3.15] #### Ruby - 2.5.9 @@ -220,7 +219,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Database tools - Azure CosmosDb Emulator 2.14.12.0 -- DacFx 162.1.167.1 +- DacFx 162.1.172.1 - MySQL 5.7.44.0 - SQL OLEDB Driver 18.6.7.0 - SQLPS 1.0 @@ -234,12 +233,12 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Visual Studio Enterprise 2019 | Name | Version | Path | | ----------------------------- | --------------- | -------------------------------------------------------------- | -| Visual Studio Enterprise 2019 | 16.11.34301.259 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | +| Visual Studio Enterprise 2019 | 16.11.34407.143 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | #### Workloads, components and extensions | Package | Version | | ------------------------------------------------------------------------- | --------------- | -| Component.Android.NDK.R16B | 16.11.34231.236 | +| Component.Android.NDK.R16B | 16.11.34407.143 | | Component.Android.SDK25.Private | 16.0.28625.61 | | Component.Android.SDK30 | 16.10.31205.252 | | Component.Ant | 1.9.3.8 | @@ -497,15 +496,15 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 10.0.22621.0 ### .NET Core Tools -- .NET Core SDK: 6.0.125, 6.0.203, 6.0.320, 6.0.417, 7.0.114, 7.0.203, 7.0.311, 7.0.404 +- .NET Core SDK: 6.0.126, 6.0.203, 6.0.321, 6.0.418, 7.0.115, 7.0.203, 7.0.312, 7.0.405 - .NET Framework: 4.7.2, 4.8 -- Microsoft.AspNetCore.App: 6.0.5, 6.0.25, 7.0.5, 7.0.14 -- Microsoft.NETCore.App: 6.0.5, 6.0.25, 7.0.5, 7.0.14 -- Microsoft.WindowsDesktop.App: 6.0.5, 6.0.25, 7.0.5, 7.0.14 +- Microsoft.AspNetCore.App: 6.0.5, 6.0.26, 7.0.5, 7.0.15 +- Microsoft.NETCore.App: 6.0.5, 6.0.26, 7.0.5, 7.0.15 +- Microsoft.WindowsDesktop.App: 6.0.5, 6.0.26, 7.0.5, 7.0.15 - nbgv 3.6.133+2d32d93cb1 ### PowerShell Tools -- PowerShell 7.2.17 +- PowerShell 7.2.18 #### Powershell Modules - Az: 9.3.0 @@ -514,7 +513,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Az (Cached): 1.0.0.zip, 1.6.0.zip, 2.3.2.zip, 2.6.0.zip, 3.1.0.zip, 3.5.0.zip, 3.8.0.zip, 4.3.0.zip, 4.4.0.zip, 4.7.0.zip, 5.5.0.zip, 5.9.0.zip, 6.6.0.zip, 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.489 +- AWSPowershell: 4.1.494 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 - Microsoft.Graph: 2.11.1 @@ -522,7 +521,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - PowerShellGet: 1.0.0.1, 2.2.5 - PSScriptAnalyzer: 1.21.0 - PSWindowsUpdate: 2.2.1.4 -- SqlServer: 22.1.1 +- SqlServer: 22.2.0 - VSSetup: 2.2.16 ``` Azure PowerShell module 2.1.0 and AzureRM PowerShell module 2.1.0 are installed @@ -557,9 +556,9 @@ All other versions are saved but not installed. ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:d6343ce21c9774ea1fb72fc24776a327bad9b34581ae802124f0121f7c5324d2 | 2023-12-12 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:cce35f582d79d6a808a718c429c7866fec85b704fc29a9a6fc0d1f6f8b19bb70 | 2023-12-12 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:89454d3ead4f492dd667b8d02c2a1e16d6103c48aab7ed8466442ff198990747 | 2023-12-12 | -| mcr.microsoft.com/windows/nanoserver:1809 | sha256:18dc202bc15c4ab948a993a021b554e70a5bc8f9f854a0674b3f5467cc7092da | 2023-12-04 | -| mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:56c5fe9f320b41a873f73ce5d019a9650dce2e10cb27b234d425418bef9310dd | 2023-12-04 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:c50eb90a59089b232ad4358b2369fe94a3a806d7c6b51ad7fbd6c0b2d7c39167 | 2024-01-09 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:e020a77e215dc4f11b64d04f3bfeee7e623f70ba87bd926713665e8a0c1c97c8 | 2024-01-09 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:f7000fcf98754e4e41785765d734fd436b9bee5ac80e0dbca5ffd47fe83038e0 | 2024-01-09 | +| mcr.microsoft.com/windows/nanoserver:1809 | sha256:14b967649dca50e3e7718b2367d43c461b1f035850694e85f19942bce7e6f616 | 2024-01-02 | +| mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:097949cfe0247fde3f8457a4d68fffee63a2385fb83e3be4f5d0dd9a46e9a3c3 | 2024-01-02 | From 9eea2470fb8279b966adbadb5dc762b21647c467 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Fri, 19 Jan 2024 00:01:52 +0100 Subject: [PATCH 2605/3485] [macOS] Get rid of unused software in macOS 14 (#9191) --- images/macos/templates/macOS-14.anka.pkr.hcl | 1 - images/macos/toolsets/toolset-14.json | 6 ++---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/images/macos/templates/macOS-14.anka.pkr.hcl b/images/macos/templates/macOS-14.anka.pkr.hcl index c37bb31fc96f..38c6396afb09 100644 --- a/images/macos/templates/macOS-14.anka.pkr.hcl +++ b/images/macos/templates/macOS-14.anka.pkr.hcl @@ -217,7 +217,6 @@ build { "${path.root}/../scripts/build/install-gcc.sh", "${path.root}/../scripts/build/install-cocoapods.sh", "${path.root}/../scripts/build/install-android-sdk.sh", - "${path.root}/../scripts/build/install-apache.sh", "${path.root}/../scripts/build/install-vcpkg.sh", "${path.root}/../scripts/build/install-safari.sh", "${path.root}/../scripts/build/install-chrome.sh", diff --git a/images/macos/toolsets/toolset-14.json b/images/macos/toolsets/toolset-14.json index bf37359c0920..52a27ed384c5 100644 --- a/images/macos/toolsets/toolset-14.json +++ b/images/macos/toolsets/toolset-14.json @@ -72,14 +72,13 @@ "swiftformat", "zstd", "gmp", - "r", "yq", "unxip", "xcbeautify", "xcodes" ], "cask_packages": [ - "julia" + "" ] }, "gcc": { @@ -109,7 +108,6 @@ "default": "3.0", "rubygems": [ "cocoapods", - "xcpretty", "bundler", "fastlane" ] @@ -118,7 +116,7 @@ "default": "1.20" }, "node": { - "default": "18" + "default": "20" }, "llvm": { "version": "15" From 299257c4bc0389feaea49e12521e1560b6801599 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 18 Jan 2024 23:35:26 +0000 Subject: [PATCH 2606/3485] Updating readme file for win22 version 20240116.1.1 (#9185) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/windows/Windows2022-Readme.md | 109 +++++++++++++-------------- 1 file changed, 54 insertions(+), 55 deletions(-) diff --git a/images/windows/Windows2022-Readme.md b/images/windows/Windows2022-Readme.md index 8b4e4c172d1e..9b63180e3f49 100644 --- a/images/windows/Windows2022-Readme.md +++ b/images/windows/Windows2022-Readme.md @@ -2,11 +2,10 @@ |-| | [[All OSes] Powershell Core will be updated to 7.4.x LTS on January, 28](https://github.com/actions/runner-images/issues/9115) | | [Old versions of Android SDK & tools will be removed from images on January, 8](https://github.com/actions/runner-images/issues/8952) | -| [Major Refactoring of GitHub Actions Runner Images Repository](https://github.com/actions/runner-images/issues/8706) | *** # Windows Server 2022 -- OS Version: 10.0.20348 Build 2159 -- Image Version: 20240108.1.0 +- OS Version: 10.0.20348 Build 2227 +- Image Version: 20240116.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -28,14 +27,14 @@ ### Package Management - Chocolatey 2.2.2 - Composer 2.6.6 -- Helm 3.13.2 +- Helm 3.13.3 - Miniconda 23.11.0 (pre-installed on the image but not added to PATH) - NPM 9.8.1 - NuGet 6.8.0.131 - pip 23.3.2 (python 3.9) -- Pipx 1.4.1 +- Pipx 1.4.2 - RubyGems 3.2.33 -- Vcpkg (build from commit ce46ba877) +- Vcpkg (build from commit 53bef8994) - Yarn 1.22.21 #### Environment variables @@ -53,7 +52,7 @@ ### Tools - 7zip 23.01 - aria2 1.37.0 -- azcopy 10.22.1 +- azcopy 10.22.2 - Bazel 7.0.0 - Bazelisk 1.19.0 - Bicep 0.24.24 @@ -63,11 +62,11 @@ - Docker 24.0.7 - Docker Compose v1 1.29.2 - Docker Compose v2 2.23.3 -- Docker-wincred 0.8.0 +- Docker-wincred 0.8.1 - ghc 9.8.1 - Git 2.43.0.windows.1 - Git LFS 3.4.0 -- ImageMagick 7.1.1-25 +- ImageMagick 7.1.1-26 - InnoSetup 6.2.2 - jq 1.7-dirty - Kind 0.20.0 @@ -80,7 +79,7 @@ - NSIS 3.09 - OpenSSL 1.1.1w - Packer 1.10.0 -- Pulumi 3.100.0 +- Pulumi 3.101.1 - R 4.3.2 - Service Fabric SDK 9.1.1436.9590 - Stack 2.13.1 @@ -94,12 +93,12 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.196 -- AWS CLI 2.15.8 -- AWS SAM CLI 1.106.0 -- AWS Session Manager CLI 1.2.536.0 -- Azure CLI 2.55.0 +- AWS CLI 2.15.10 +- AWS SAM CLI 1.107.0 +- AWS Session Manager CLI 1.2.553.0 +- Azure CLI 2.56.0 - Azure DevOps CLI extension 0.26.0 -- GitHub CLI 2.40.1 +- GitHub CLI 2.42.0 ### Rust Tools - Cargo 1.75.0 @@ -108,7 +107,7 @@ - Rustup 1.26.0 #### Packages -- bindgen 0.69.1 +- bindgen 0.69.2 - cargo-audit 0.18.3 - cargo-outdated 0.14.0 - cbindgen 0.26.0 @@ -116,11 +115,11 @@ - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 120.0.6099.200 +- Google Chrome 120.0.6099.217 - Chrome Driver 120.0.6099.109 -- Microsoft Edge 120.0.2210.121 -- Microsoft Edge Driver 120.0.2210.121 -- Mozilla Firefox 121.0 +- Microsoft Edge 120.0.2210.133 +- Microsoft Edge Driver 120.0.2210.133 +- Mozilla Firefox 121.0.1 - Gecko Driver 0.34.0 - IE Driver 4.14.0.0 - Selenium server 4.16.0 @@ -179,11 +178,11 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 3.12.1 #### PyPy -- 2.7.18 [PyPy 7.3.14] +- 2.7.18 [PyPy 7.3.15] - 3.7.13 [PyPy 7.3.9] - 3.8.16 [PyPy 7.3.11] -- 3.9.18 [PyPy 7.3.14] -- 3.10.13 [PyPy 7.3.14] +- 3.9.18 [PyPy 7.3.15] +- 3.10.13 [PyPy 7.3.15] #### Ruby - 2.7.8 @@ -211,8 +210,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Database tools - Azure CosmosDb Emulator 2.14.12.0 -- DacFx 162.1.167.1 -- MySQL 8.0.35.0 +- DacFx 162.1.172.1 +- MySQL 8.0.36.0 - SQL OLEDB Driver 18.6.7.0 - SQLPS 1.0 @@ -225,7 +224,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Visual Studio Enterprise 2022 | Name | Version | Path | | ----------------------------- | -------------- | -------------------------------------------------------- | -| Visual Studio Enterprise 2022 | 17.8.34330.188 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | +| Visual Studio Enterprise 2022 | 17.8.34408.163 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | #### Workloads, components and extensions | Package | Version | @@ -286,20 +285,20 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.Net.ComponentGroup.4.8.DeveloperTools | 17.8.34129.139 | | Microsoft.Net.ComponentGroup.DevelopmentPrerequisites | 17.8.34129.139 | | Microsoft.Net.ComponentGroup.TargetingPacks.Common | 17.8.34129.139 | -| microsoft.net.runtime.android | 8.0.23.53103 | -| microsoft.net.runtime.android.aot | 8.0.23.53103 | -| microsoft.net.runtime.android.aot.net7 | 8.0.23.53103 | -| microsoft.net.runtime.android.net7 | 8.0.23.53103 | -| microsoft.net.runtime.ios | 8.0.23.53103 | -| microsoft.net.runtime.ios.net7 | 8.0.23.53103 | -| microsoft.net.runtime.maccatalyst | 8.0.23.53103 | -| microsoft.net.runtime.maccatalyst.net7 | 8.0.23.53103 | -| microsoft.net.runtime.mono.tooling | 8.0.23.53103 | -| microsoft.net.runtime.mono.tooling.net7 | 8.0.23.53103 | -| microsoft.net.sdk.emscripten | 8.0.9.3002 | +| microsoft.net.runtime.android | 8.0.123.57805 | +| microsoft.net.runtime.android.aot | 8.0.123.57805 | +| microsoft.net.runtime.android.aot.net7 | 8.0.123.57805 | +| microsoft.net.runtime.android.net7 | 8.0.123.57805 | +| microsoft.net.runtime.ios | 8.0.123.57805 | +| microsoft.net.runtime.ios.net7 | 8.0.123.57805 | +| microsoft.net.runtime.maccatalyst | 8.0.123.57805 | +| microsoft.net.runtime.maccatalyst.net7 | 8.0.123.57805 | +| microsoft.net.runtime.mono.tooling | 8.0.123.57805 | +| microsoft.net.runtime.mono.tooling.net7 | 8.0.123.57805 | +| microsoft.net.sdk.emscripten | 8.0.9.7101 | | Microsoft.NetCore.Component.DevelopmentTools | 17.8.34129.139 | -| Microsoft.NetCore.Component.Runtime.8.0 | 17.8.34308.169 | -| Microsoft.NetCore.Component.SDK | 17.8.34308.169 | +| Microsoft.NetCore.Component.Runtime.8.0 | 17.8.34408.163 | +| Microsoft.NetCore.Component.SDK | 17.8.34408.163 | | Microsoft.NetCore.Component.Web | 17.8.34129.139 | | Microsoft.VisualStudio.Component.AppInsights.Tools | 17.8.34129.139 | | Microsoft.VisualStudio.Component.AspNet | 17.8.34129.139 | @@ -517,11 +516,11 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Workload.Python | 17.8.34129.139 | | Microsoft.VisualStudio.Workload.Universal | 17.8.34129.139 | | Microsoft.VisualStudio.Workload.VisualStudioExtension | 17.8.34129.139 | -| runtimes.ios | 8.0.23.53103 | -| runtimes.ios.net7 | 8.0.23.53103 | -| runtimes.maccatalyst | 8.0.23.53103 | -| runtimes.maccatalyst.net7 | 8.0.23.53103 | -| wasm.tools | 8.0.23.53103 | +| runtimes.ios | 8.0.123.57805 | +| runtimes.ios.net7 | 8.0.123.57805 | +| runtimes.maccatalyst | 8.0.123.57805 | +| runtimes.maccatalyst.net7 | 8.0.123.57805 | +| wasm.tools | 8.0.123.57805 | | ProBITools.MicrosoftAnalysisServicesModelingProjects2022 | 3.0.4 | | ProBITools.MicrosoftReportProjectsforVisualStudio2022 | 3.0.1 | | SSIS.MicrosoftDataToolsIntegrationServices | 1.3.2 | @@ -551,15 +550,15 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 10.0.22621.0 ### .NET Core Tools -- .NET Core SDK: 6.0.125, 6.0.203, 6.0.320, 6.0.417, 7.0.114, 7.0.203, 7.0.311, 7.0.404, 8.0.100 +- .NET Core SDK: 6.0.126, 6.0.203, 6.0.321, 6.0.418, 7.0.115, 7.0.203, 7.0.312, 7.0.405, 8.0.101 - .NET Framework: 4.8, 4.8.1 -- Microsoft.AspNetCore.App: 6.0.5, 6.0.25, 7.0.5, 7.0.14, 8.0.0 -- Microsoft.NETCore.App: 6.0.5, 6.0.25, 7.0.5, 7.0.14, 8.0.0 -- Microsoft.WindowsDesktop.App: 6.0.5, 6.0.25, 7.0.5, 7.0.14, 8.0.0 +- Microsoft.AspNetCore.App: 6.0.5, 6.0.26, 7.0.5, 7.0.15, 8.0.1 +- Microsoft.NETCore.App: 6.0.5, 6.0.26, 7.0.5, 7.0.15, 8.0.1 +- Microsoft.WindowsDesktop.App: 6.0.5, 6.0.26, 7.0.5, 7.0.15, 8.0.1 - nbgv 3.6.133+2d32d93cb1 ### PowerShell Tools -- PowerShell 7.2.17 +- PowerShell 7.2.18 #### Powershell Modules - Az: 9.3.0 @@ -568,7 +567,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Az (Cached): 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.489 +- AWSPowershell: 4.1.494 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 - Microsoft.Graph: 2.11.1 @@ -611,9 +610,9 @@ All other versions are saved but not installed. ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2022 | sha256:87dbfdaafd5083bc36103fd4e011c2d186b84054058d3d947c80dc2aeaee606d | 2023-12-12 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2022 | sha256:26778846add42604670e37c700dc86cdbb419ce3530650e40e4162dcbbd697eb | 2023-12-12 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:a903702e9b545059a47d87d1f14cd8c75bf47e22e4889fc9a9b0a04b2acfb7fd | 2023-12-12 | -| mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:56a7c823d8aed810849a38f47d995a727bf3de1ec611394025e1de24898a9622 | 2023-12-02 | -| mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:029d8eb737c978e3df0f26abb529efd38d3c9ecee9d8d0bba6d0c205f32dc263 | 2023-12-02 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2022 | sha256:f450296061ecdfefd5c0706f40ebe1e24ff20ae81a1a96f6a518ab2d3cf4adf8 | 2024-01-09 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2022 | sha256:751e21c836ab69e5a85e9a80fa019375f37174b7199c4b0d3c30867532a80c22 | 2024-01-09 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:13ebc67b0803546a86042bf8de65f44b36900e467f996de0e8fdf454cba1fabd | 2024-01-09 | +| mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:1abc7e4d96a7dd1f80a31597abf6b98f112f1e24c2b448747e28bbea5ba97975 | 2024-01-04 | +| mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:ba06e92a92c3533354926622f405265d31d86ef5080f5531a4705e7936de0b1d | 2024-01-04 | From 17d89dbd7479c7a35d3a2fb87f6d7e495e8fd528 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 19 Jan 2024 01:31:47 +0000 Subject: [PATCH 2607/3485] Updating readme file for macos-13 version 20240114.1 (#9169) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-13-Readme.md | 61 ++++++++++++++++----------------- 1 file changed, 30 insertions(+), 31 deletions(-) diff --git a/images/macos/macos-13-Readme.md b/images/macos/macos-13-Readme.md index 79ca18b43e45..4f5038276b1e 100644 --- a/images/macos/macos-13-Readme.md +++ b/images/macos/macos-13-Readme.md @@ -2,17 +2,16 @@ |-| | [[All OSes] Powershell Core will be updated to 7.4.x LTS on January, 28](https://github.com/actions/runner-images/issues/9115) | | [Old versions of Android SDK & tools will be removed from images on January, 8](https://github.com/actions/runner-images/issues/8952) | -| [Major Refactoring of GitHub Actions Runner Images Repository](https://github.com/actions/runner-images/issues/8706) | *** # macOS 13 - OS Version: macOS 13.6.3 (22G436) - Kernel Version: Darwin 22.6.0 -- Image Version: 20240106.8 +- Image Version: 20240114.1 ## Installed Software ### Language and Runtime -- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.404, 8.0.100 +- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.405, 8.0.101 - Bash 3.2.57(1)-release - Clang/LLVM 14.0.3 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` @@ -37,13 +36,13 @@ - Carthage 0.39.1 - CocoaPods 1.14.3 - Composer 2.6.6 -- Homebrew 4.2.2 +- Homebrew 4.2.3 - NPM 10.2.3 - NuGet 6.3.1.1 - Pip3 23.3.2 (python 3.12) -- Pipx 1.4.1 +- Pipx 1.4.2 - RubyGems 3.5.4 -- Vcpkg 2023 (build from commit ce46ba877) +- Vcpkg 2024 (build from commit 53bef8994) - Yarn 1.22.19 ### Project Management @@ -61,7 +60,7 @@ - Curl 8.5.0 - Git 2.43.0 - Git LFS 3.4.1 -- GitHub CLI 2.40.1 +- GitHub CLI 2.42.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.21.4 - gpg (GnuPG) 2.4.3 @@ -73,17 +72,17 @@ - zstd 1.5.5 ### Tools -- AWS CLI 2.15.8 -- AWS SAM CLI 1.106.0 -- AWS Session Manager CLI 1.2.536.0 -- Azure CLI 2.55.0 +- AWS CLI 2.15.10 +- AWS SAM CLI 1.107.0 +- AWS Session Manager CLI 1.2.553.0 +- Azure CLI 2.56.0 - Azure CLI (azure-devops) 0.26.0 - Bicep CLI 0.24.24 - Cmake 3.28.1 - CodeQL Action Bundle 2.15.5 - Fastlane 2.219.0 -- SwiftFormat 0.52.11 -- Xcbeautify 1.3.0 +- SwiftFormat 0.53.0 +- Xcbeautify 1.4.0 - Xcode Command Line Tools 15.1.0.0.1.1700200546 - Xcodes 1.4.1 @@ -93,12 +92,12 @@ ### Browsers - Safari 17.2.1 (18617.1.17.11.12) - SafariDriver 17.2.1 (18617.1.17.11.12) -- Google Chrome 120.0.6099.199 +- Google Chrome 120.0.6099.216 - Google Chrome for Testing 120.0.6099.109 - ChromeDriver 120.0.6099.109 -- Microsoft Edge 120.0.2210.121 -- Microsoft Edge WebDriver 120.0.2210.91 -- Mozilla Firefox 121.0 +- Microsoft Edge 120.0.2210.133 +- Microsoft Edge WebDriver 120.0.2210.133 +- Mozilla Firefox 121.0.1 - geckodriver 0.34.0 - Selenium server 4.16.1 @@ -124,11 +123,11 @@ - 3.1.4 #### PyPy -- 2.7.18 [PyPy 7.3.14] +- 2.7.18 [PyPy 7.3.15] - 3.7.13 [PyPy 7.3.9] - 3.8.16 [PyPy 7.3.11] -- 3.9.18 [PyPy 7.3.14] -- 3.10.13 [PyPy 7.3.14] +- 3.9.18 [PyPy 7.3.15] +- 3.10.13 [PyPy 7.3.15] #### Python - 3.8.18 @@ -158,22 +157,22 @@ - Rustfmt 1.7.0-stable ### PowerShell Tools -- PowerShell 7.2.17 +- PowerShell 7.2.18 #### PowerShell Modules -- Az: 11.1.0 +- Az: 11.2.0 - Pester: 5.5.0 - PSScriptAnalyzer: 1.21.0 ### Xcode -| Version | Build | Path | -| ---------------- | -------- | ------------------------------ | -| 15.2 (beta) | 15C5500c | /Applications/Xcode_15.2.app | -| 15.1 | 15C65 | /Applications/Xcode_15.1.app | -| 15.0.1 | 15A507 | /Applications/Xcode_15.0.1.app | -| 14.3.1 (default) | 14E300c | /Applications/Xcode_14.3.1.app | -| 14.2 | 14C18 | /Applications/Xcode_14.2.app | -| 14.1 | 14B47b | /Applications/Xcode_14.1.app | +| Version | Build | Path | +| ---------------- | ------- | ------------------------------ | +| 15.2 | 15C500b | /Applications/Xcode_15.2.app | +| 15.1 | 15C65 | /Applications/Xcode_15.1.app | +| 15.0.1 | 15A507 | /Applications/Xcode_15.0.1.app | +| 14.3.1 (default) | 14E300c | /Applications/Xcode_14.3.1.app | +| 14.2 | 14C18 | /Applications/Xcode_14.2.app | +| 14.1 | 14B47b | /Applications/Xcode_14.1.app | #### Xcode Support Tools - xcpretty 0.3.0 @@ -215,8 +214,8 @@ | Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | | visionOS 1.0 | xros1.0 | 15.2 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | -| Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | +| Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | DriverKit 22.1 | driverkit22.1 | 14.1 | | DriverKit 22.2 | driverkit22.2 | 14.2 | | DriverKit 22.4 | driverkit22.4 | 14.3.1 | From 097e28c9d7d1650c88af5ac591be7b2fd338bab2 Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Mon, 22 Jan 2024 21:29:42 +0100 Subject: [PATCH 2608/3485] [Windows] Pin Docker 24.0.7 to avoid bugs (#9208) * [Windows] Pin Docker 24.0.7 to avoid bugs * Fix typos, avoid using special characters --- images/windows/scripts/build/Install-Docker.ps1 | 8 ++++---- images/windows/scripts/build/Install-DockerCompose.ps1 | 4 +++- images/windows/toolsets/toolset-2019.json | 6 +++++- images/windows/toolsets/toolset-2022.json | 6 +++++- 4 files changed, 17 insertions(+), 7 deletions(-) diff --git a/images/windows/scripts/build/Install-Docker.ps1 b/images/windows/scripts/build/Install-Docker.ps1 index cc353a1b76be..5eabf994079a 100644 --- a/images/windows/scripts/build/Install-Docker.ps1 +++ b/images/windows/scripts/build/Install-Docker.ps1 @@ -6,13 +6,13 @@ ################################################################################ Write-Host "Get latest Moby release" -$mobyLatestVersion = (Get-GithubReleasesByVersion -Repo "moby/moby" -Version "latest").version - +$toolsetVersion = (Get-ToolsetContent).docker.components.docker +$mobyVersion = (Get-GithubReleasesByVersion -Repo "moby/moby" -Version "${toolsetVersion}").version $dockerceUrl = "https://download.docker.com/win/static/stable/x86_64/" $dockerceBinaries = Invoke-WebRequest -Uri $dockerceUrl -UseBasicParsing -Write-Host "Check Moby version $mobyLatestVersion" -$mobyRelease = $dockerceBinaries.Links.href -match "${mobyLatestVersion}\.zip" | Select-Object -Last 1 +Write-Host "Check Moby version $mobyVersion" +$mobyRelease = $dockerceBinaries.Links.href -match "${mobyVersion}\.zip" | Select-Object -Last 1 if (-not $mobyRelease) { Write-Host "Release not found for $mobyLatestRelease version" $versions = [regex]::Matches($dockerceBinaries.Links.href, "docker-(\d+\.\d+\.\d+)\.zip") | Sort-Object { [version] $_.Groups[1].Value } diff --git a/images/windows/scripts/build/Install-DockerCompose.ps1 b/images/windows/scripts/build/Install-DockerCompose.ps1 index a297275e41c2..962b396cb204 100644 --- a/images/windows/scripts/build/Install-DockerCompose.ps1 +++ b/images/windows/scripts/build/Install-DockerCompose.ps1 @@ -10,7 +10,9 @@ Install-ChocoPackage docker-compose -ArgumentList "--version=$versionToInstall" Write-Host "Install-Package Docker-Compose v2" # Temporaty pinned to v2.23.3 due https://github.com/actions/runner-images/issues/9172 -$dockerComposev2Url = "https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-windows-x86_64.exe" +$toolsetVersion = (Get-ToolsetContent).docker.components.compose +$composeVersion = (Get-GithubReleasesByVersion -Repo "docker/compose" -Version "${toolsetVersion}").version +$dockerComposev2Url = "https://github.com/docker/compose/releases/download/v${composeVersion}/docker-compose-windows-x86_64.exe" $cliPluginsDir = "C:\ProgramData\docker\cli-plugins" New-Item -Path $cliPluginsDir -ItemType Directory Invoke-DownloadWithRetry -Url $dockerComposev2Url -Path "$cliPluginsDir\docker-compose.exe" diff --git a/images/windows/toolsets/toolset-2019.json b/images/windows/toolsets/toolset-2019.json index b4ecc5fd6549..3d468e8d77fe 100644 --- a/images/windows/toolsets/toolset-2019.json +++ b/images/windows/toolsets/toolset-2019.json @@ -383,7 +383,11 @@ "mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019", "mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019", "mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019" - ] + ], + "components": { + "docker": "24.0.7", + "compose": "2.23.3" + } }, "pipx": [ { diff --git a/images/windows/toolsets/toolset-2022.json b/images/windows/toolsets/toolset-2022.json index d6009b1aa550..b73a0522bca0 100644 --- a/images/windows/toolsets/toolset-2022.json +++ b/images/windows/toolsets/toolset-2022.json @@ -330,7 +330,11 @@ "mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2022", "mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2022", "mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022" - ] + ], + "components": { + "docker": "24.0.7", + "compose": "2.23.3" + } }, "pipx": [ { From cbc79f8a0ce6d868f36f40ca2e83d551f01da225 Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Tue, 23 Jan 2024 14:44:07 +0100 Subject: [PATCH 2609/3485] [Ubuntu] Pin Docker 24.0.7 to avoid bugs (#9205) * [Ubuntu] Pin Docker 24.0.7 to avoid bugs * Fix character escaping for jq * Fix order of install --- images/ubuntu/scripts/build/install-docker.sh | 21 +++++++++++++++---- images/ubuntu/toolsets/toolset-2004.json | 9 +++++++- images/ubuntu/toolsets/toolset-2204.json | 9 +++++++- 3 files changed, 33 insertions(+), 6 deletions(-) diff --git a/images/ubuntu/scripts/build/install-docker.sh b/images/ubuntu/scripts/build/install-docker.sh index e5b52b05b736..73ed38e57b81 100644 --- a/images/ubuntu/scripts/build/install-docker.sh +++ b/images/ubuntu/scripts/build/install-docker.sh @@ -11,18 +11,31 @@ source $HELPER_SCRIPTS/install.sh REPO_URL="https://download.docker.com/linux/ubuntu" GPG_KEY="/usr/share/keyrings/docker.gpg" REPO_PATH="/etc/apt/sources.list.d/docker.list" +os_codename=$(lsb_release -cs) curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o $GPG_KEY -echo "deb [arch=amd64 signed-by=$GPG_KEY] $REPO_URL $(lsb_release -cs) stable" > $REPO_PATH +echo "deb [arch=amd64 signed-by=$GPG_KEY] $REPO_URL ${os_codename} stable" > $REPO_PATH apt-get update -apt-get install --no-install-recommends docker-ce docker-ce-cli containerd.io docker-buildx-plugin + +for pkg in containerd.io docker-ce-cli docker-ce docker-buildx-plugin; do + version=$(get_toolset_value ".docker.components.\"$pkg\"") + if [[ $version == "latest" ]]; then + components_to_install+="${pkg} " + else + version_string=$(apt-cache madison "${pkg}" | awk '{ print $3 }' | grep "${version}" | grep "${os_codename}" | head -1) + components_to_install+="${pkg}=${version_string} " + fi +done +apt-get install -y --no-install-recommends $components_to_install + # Download docker compose v2 from releases # Temporaty pinned to v2.23.3 due https://github.com/actions/runner-images/issues/9172 -URL=$(resolve_github_release_asset_url "docker/compose" "endswith(\"compose-linux-x86_64\")" "2.23.3") +compose_version=$(get_toolset_value ".docker.components.compose") +URL=$(resolve_github_release_asset_url "docker/compose" "endswith(\"compose-linux-x86_64\")" "${compose_version}") compose_binary_path=$(download_with_retry "${URL}" "/tmp/docker-compose-v2") # Supply chain security - Docker Compose v2 -compose_hash_url=$(resolve_github_release_asset_url "docker/compose" "endswith(\"checksums.txt\")" "2.23.3") +compose_hash_url=$(resolve_github_release_asset_url "docker/compose" "endswith(\"checksums.txt\")" "${compose_version}") compose_external_hash=$(get_checksum_from_url "${compose_hash_url}" "compose-linux-x86_64" "SHA256") use_checksum_comparison "${compose_binary_path}" "${compose_external_hash}" diff --git a/images/ubuntu/toolsets/toolset-2004.json b/images/ubuntu/toolsets/toolset-2004.json index 5c75bb7458ac..30971711f2f0 100644 --- a/images/ubuntu/toolsets/toolset-2004.json +++ b/images/ubuntu/toolsets/toolset-2004.json @@ -236,7 +236,14 @@ "node:18-alpine", "node:20-alpine", "ubuntu:20.04" - ] + ], + "components": { + "docker-ce": "24.0.7", + "docker-ce-cli": "24.0.7", + "containerd.io": "latest", + "docker-buildx-plugin": "latest", + "compose": "2.23.3" + } }, "pipx": [ { diff --git a/images/ubuntu/toolsets/toolset-2204.json b/images/ubuntu/toolsets/toolset-2204.json index e881226c3e07..2dc4bc9aaca6 100644 --- a/images/ubuntu/toolsets/toolset-2204.json +++ b/images/ubuntu/toolsets/toolset-2204.json @@ -227,7 +227,14 @@ "node:20-alpine", "ubuntu:20.04", "ubuntu:22.04" - ] + ], + "components": { + "docker-ce": "24.0.7", + "docker-ce-cli": "24.0.7", + "containerd.io": "latest", + "docker-buildx-plugin": "latest", + "compose": "2.23.3" + } }, "pipx": [ { From d622d2bc2e8ec43116c8bcf8f331dfe207103c49 Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Tue, 23 Jan 2024 18:17:44 +0100 Subject: [PATCH 2610/3485] [macos] Fix links in preimage data (#9204) --- images/macos/scripts/build/configure-preimagedata.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/macos/scripts/build/configure-preimagedata.sh b/images/macos/scripts/build/configure-preimagedata.sh index ddd5d8f5ebff..d86ab3278a5e 100644 --- a/images/macos/scripts/build/configure-preimagedata.sh +++ b/images/macos/scripts/build/configure-preimagedata.sh @@ -21,7 +21,7 @@ else fi release_label="macOS-${label_version}" -if is_VenturaX64 || is_SonomaX64; then +if is_Ventura || is_Sonoma; then software_url="https://github.com/actions/runner-images/blob/${image_label}/${image_version}/images/macos/${image_label}-Readme.md" releaseUrl="https://github.com/actions/runner-images/releases/tag/${image_label}%2F${image_version}" else From ba3718b5d8126b82e2861e603251d80e0b17bc8d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 24 Jan 2024 09:48:57 +0000 Subject: [PATCH 2611/3485] Updating readme file for macOS-11 version 20240113.1 (#9168) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-11-Readme.md | 118 ++++++++++++++++---------------- 1 file changed, 59 insertions(+), 59 deletions(-) diff --git a/images/macos/macos-11-Readme.md b/images/macos/macos-11-Readme.md index eaa55ec872d6..cdc3484ff281 100644 --- a/images/macos/macos-11-Readme.md +++ b/images/macos/macos-11-Readme.md @@ -1,17 +1,17 @@ | Announcements | |-| +| [[All OSes] Powershell Core will be updated to 7.4.x LTS on January, 28](https://github.com/actions/runner-images/issues/9115) | | [Old versions of Android SDK & tools will be removed from images on January, 8](https://github.com/actions/runner-images/issues/8952) | -| [Major Refactoring of GitHub Actions Runner Images Repository](https://github.com/actions/runner-images/issues/8706) | *** # macOS 11 - OS Version: macOS 11.7.10 (20G1427) - Kernel Version: Darwin 20.6.0 -- Image Version: 20231216.1 +- Image Version: 20240113.1 ## Installed Software ### Language and Runtime -- .NET Core SDK: 6.0.417, 7.0.102, 7.0.202, 7.0.306, 7.0.404, 8.0.100 +- .NET Core SDK: 6.0.418, 7.0.102, 7.0.202, 7.0.306, 7.0.405, 8.0.101 - Bash 3.2.57(1)-release - Clang/LLVM 13.0.0 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` @@ -21,16 +21,16 @@ - GNU Fortran 10 (Homebrew GCC 10.5.0) - available by `gfortran-10` alias - GNU Fortran 11 (Homebrew GCC 11.4.0) - available by `gfortran-11` alias - GNU Fortran 12 (Homebrew GCC 12.3.0) - available by `gfortran-12` alias -- Julia 1.9.4 -- Kotlin 1.9.21-release-633 -- Go 1.20.12 +- Julia 1.10.0 +- Kotlin 1.9.22-release-704 +- Go 1.20.13 - Mono 6.12.0.188 - Node.js 18.19.0 - MSBuild 16.10.1.51301 (Mono 6.12.0.188) - NVM 0.39.7 -- NVM - Cached node versions: 16.20.2, 18.19.0, 20.10.0 +- NVM - Cached node versions: 16.20.2, 18.19.0, 20.11.0 - Perl 5.38.2 -- PHP 8.3.0 +- PHP 8.3.1 - Python 2.7.18 - Python3 3.12.1 - R 4.3.2 @@ -41,15 +41,15 @@ - Carthage 0.39.1 - CocoaPods 1.14.3 - Composer 2.6.6 -- Homebrew 4.1.25 -- Miniconda 23.10.0 +- Homebrew 4.2.3 +- Miniconda 23.11.0 - NPM 10.2.3 - NuGet 6.3.1.1 - Pip 20.3.4 (python 2.7) -- Pip3 23.3.1 (python 3.12) -- Pipx 1.3.3 +- Pip3 23.3.2 (python 3.12) +- Pipx 1.4.2 - RubyGems 3.4.10 -- Vcpkg 2023 (build from commit 0e47c1985) +- Vcpkg 2024 (build from commit 53bef8994) - Yarn 1.22.19 #### Environment variables @@ -74,45 +74,45 @@ - Curl 8.5.0 - Git 2.43.0 - Git LFS 3.4.1 -- GitHub CLI 2.40.1 +- GitHub CLI 2.42.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.21.4 - gpg (GnuPG) 2.4.3 - helm v3.13.3+gc8b9489 -- ImageMagick 7.1.1-23 +- ImageMagick 7.1.1-26 - jq 1.7.1 - mongo 5.0.21 - mongod 5.0.21 -- Newman 6.0.0 +- Newman 6.1.0 - OpenSSL 1.1.1w 11 Sep 2023 - Packer 1.9.4 - pkg-config 0.29.2 - PostgreSQL 14.10 (Homebrew) - psql (PostgreSQL) 14.10 (Homebrew) - Sox 14.4.2 -- Subversion (SVN) 1.14.2 +- Subversion (SVN) 1.14.3 - Switchaudio-osx 1.2.2 - yq 4.40.5 - zstd 1.5.5 ### Tools -- Aliyun CLI 3.0.189 +- Aliyun CLI 3.0.196 - App Center CLI 2.14.0 -- AWS CLI 2.15.2 -- AWS SAM CLI 1.105.0 -- AWS Session Manager CLI 1.2.536.0 -- Azure CLI 2.55.0 +- AWS CLI 2.15.10 +- AWS SAM CLI 1.107.0 +- AWS Session Manager CLI 1.2.553.0 +- Azure CLI 2.56.0 - Azure CLI (azure-devops) 0.26.0 - Bicep CLI 0.24.24 -- Cabal 3.6.2.0 -- Cmake 3.28.0 -- CodeQL Action Bundle 2.15.4 -- Fastlane 2.217.0 +- Cabal 3.10.2.1 +- Cmake 3.28.1 +- CodeQL Action Bundle 2.15.5 +- Fastlane 2.219.0 - GHC 9.8.1 - GHCup 0.1.20.0 - Jazzy 0.14.4 - Stack 2.13.1 -- SwiftFormat 0.52.11 +- SwiftFormat 0.53.0 - Swig 4.1.1 - Xcode Command Line Tools 13.2.0.0.1.1638488800 @@ -123,14 +123,14 @@ ### Browsers - Safari 16.6.1 (16615.3.12.11.5) - SafariDriver 16.6.1 (16615.3.12.11.5) -- Google Chrome 120.0.6099.109 -- Google Chrome for Testing 120.0.6099.71 -- ChromeDriver 120.0.6099.71 -- Microsoft Edge 120.0.2210.77 -- Microsoft Edge WebDriver 120.0.2210.77 -- Mozilla Firefox 120.0.1 -- geckodriver 0.33.0 -- Selenium server 4.15.0 +- Google Chrome 120.0.6099.216 +- Google Chrome for Testing 120.0.6099.109 +- ChromeDriver 120.0.6099.109 +- Microsoft Edge 120.0.2210.133 +- Microsoft Edge WebDriver 120.0.2210.133 +- Mozilla Firefox 121.0.1 +- geckodriver 0.34.0 +- Selenium server 4.16.1 #### Environment variables | Name | Value | @@ -157,11 +157,11 @@ - 3.1.4 #### PyPy -- 2.7.18 [PyPy 7.3.13] +- 2.7.18 [PyPy 7.3.14] - 3.7.13 [PyPy 7.3.9] - 3.8.16 [PyPy 7.3.11] -- 3.9.18 [PyPy 7.3.13] -- 3.10.13 [PyPy 7.3.13] +- 3.9.18 [PyPy 7.3.14] +- 3.10.13 [PyPy 7.3.14] #### Python - 3.7.17 @@ -182,24 +182,24 @@ - 1.21.5 ### Rust Tools -- Cargo 1.74.1 -- Rust 1.74.1 -- Rustdoc 1.74.1 +- Cargo 1.75.0 +- Rust 1.75.0 +- Rustdoc 1.75.0 - Rustup 1.26.0 #### Packages -- Bindgen 0.69.1 +- Bindgen 0.69.2 - Cargo-audit 0.18.3 - Cargo-outdated 0.14.0 - Cbindgen 0.26.0 -- Clippy 0.1.74 -- Rustfmt 1.6.0-stable +- Clippy 0.1.75 +- Rustfmt 1.7.0-stable ### PowerShell Tools -- PowerShell 7.2.17 +- PowerShell 7.2.18 #### PowerShell Modules -- Az: 11.1.0 +- Az: 11.2.0 - MarkdownPS: 1.9 - Pester: 5.5.0 - PSScriptAnalyzer: 1.21.0 @@ -216,7 +216,7 @@ | Version | Build | Path | | -------------- | ---------- | ------------------------------------ | | 2019 | 8.10.25.2 | /Applications/Visual Studio 2019.app | -| 2022 (default) | 17.6.7.417 | /Applications/Visual Studio.app | +| 2022 (default) | 17.6.8.400 | /Applications/Visual Studio.app | ##### Notes ``` @@ -329,18 +329,18 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" | watchOS 8.3 | 13.2.1 | Apple Watch Series 4 - 40mm<br>Apple Watch Series 4 - 44mm<br>Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | ### Android -| Package Name | Version | -| -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 8.0 | -| Android Emulator | 33.1.23 | -| Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3 | -| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 2)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) | -| Android SDK Platform-Tools | 34.0.5 | -| Android Support Repository | 47.0.0 | -| CMake | 3.10.2<br>3.18.1<br>3.22.1 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 24.0.8215888<br>25.2.9519653 (default)<br>26.1.10909125 | +| Package Name | Version | +| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 8.0 | +| Android Emulator | 33.1.24 | +| Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0 | +| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 2)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1) | +| Android SDK Platform-Tools | 34.0.5 | +| Android Support Repository | 47.0.0 | +| CMake | 3.10.2<br>3.18.1<br>3.22.1 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 24.0.8215888<br>25.2.9519653 (default)<br>26.1.10909125 | #### Environment variables | Name | Value | From 807eb76cfcfc7cf7c9a49b0dcd4cf699055f5393 Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Wed, 24 Jan 2024 19:01:47 +0100 Subject: [PATCH 2612/3485] [ubuntu] Update PowerShell Core to 7.4.x (#9222) --- images/ubuntu/toolsets/toolset-2004.json | 2 +- images/ubuntu/toolsets/toolset-2204.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/images/ubuntu/toolsets/toolset-2004.json b/images/ubuntu/toolsets/toolset-2004.json index 30971711f2f0..bbf28474d172 100644 --- a/images/ubuntu/toolsets/toolset-2004.json +++ b/images/ubuntu/toolsets/toolset-2004.json @@ -365,7 +365,7 @@ "version": "14" }, "pwsh": { - "version": "7.2" + "version": "7.4" }, "aliyunCli": { "version": "3.0.174", diff --git a/images/ubuntu/toolsets/toolset-2204.json b/images/ubuntu/toolsets/toolset-2204.json index 2dc4bc9aaca6..57a741ac333f 100644 --- a/images/ubuntu/toolsets/toolset-2204.json +++ b/images/ubuntu/toolsets/toolset-2204.json @@ -356,6 +356,6 @@ "version": "14" }, "pwsh": { - "version": "7.2" + "version": "7.4" } } From a6643f8ce635a5ca9ca0e38761b16b9bc1172a8d Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Thu, 25 Jan 2024 10:22:30 +0100 Subject: [PATCH 2613/3485] [windows] Update PowerShell Core to 7.4.x (#9223) * [windows] Update PowerShell Core to 7.4.x * Update CosmosDB Emulator signature --- images/windows/scripts/build/Install-AzureCosmosDbEmulator.ps1 | 2 +- images/windows/toolsets/toolset-2019.json | 2 +- images/windows/toolsets/toolset-2022.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/images/windows/scripts/build/Install-AzureCosmosDbEmulator.ps1 b/images/windows/scripts/build/Install-AzureCosmosDbEmulator.ps1 index cf48ca62ad87..5a39869b9ff6 100644 --- a/images/windows/scripts/build/Install-AzureCosmosDbEmulator.ps1 +++ b/images/windows/scripts/build/Install-AzureCosmosDbEmulator.ps1 @@ -5,6 +5,6 @@ Install-Binary -Type MSI ` -Url "https://aka.ms/cosmosdb-emulator" ` - -ExpectedSignature "F372C27F6E052A6BE8BAB3112B465C692196CD6F" + -ExpectedSignature "C2048FB509F1C37A8C3E9EC6648118458AA01780" Invoke-PesterTests -TestFile "Tools" -TestName "Azure Cosmos DB Emulator" diff --git a/images/windows/toolsets/toolset-2019.json b/images/windows/toolsets/toolset-2019.json index 3d468e8d77fe..8d80a9398d46 100644 --- a/images/windows/toolsets/toolset-2019.json +++ b/images/windows/toolsets/toolset-2019.json @@ -497,6 +497,6 @@ "version": "1.1.1" }, "pwsh": { - "version": "7.2" + "version": "7.4" } } diff --git a/images/windows/toolsets/toolset-2022.json b/images/windows/toolsets/toolset-2022.json index b73a0522bca0..f95c2f4896cf 100644 --- a/images/windows/toolsets/toolset-2022.json +++ b/images/windows/toolsets/toolset-2022.json @@ -437,6 +437,6 @@ "version": "1.1.1" }, "pwsh": { - "version": "7.2" + "version": "7.4" } } From a9c56530669922d7fa9cb1e7b6a78802faf3701e Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Thu, 25 Jan 2024 10:23:55 +0100 Subject: [PATCH 2614/3485] [macos] Update PowerShell Core to 7.4.x (#9224) --- images/macos/toolsets/toolset-11.json | 2 +- images/macos/toolsets/toolset-12.json | 2 +- images/macos/toolsets/toolset-13.json | 2 +- images/macos/toolsets/toolset-14.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index 05cd919226fe..6964d47b0d0d 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -363,6 +363,6 @@ "version": "14" }, "pwsh": { - "version": "7.2" + "version": "7.4" } } diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index cf05b02723c9..e02723f8b1ba 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -351,6 +351,6 @@ "version": "14" }, "pwsh": { - "version": "7.2" + "version": "7.4" } } diff --git a/images/macos/toolsets/toolset-13.json b/images/macos/toolsets/toolset-13.json index 0ae144262400..274e956612c6 100644 --- a/images/macos/toolsets/toolset-13.json +++ b/images/macos/toolsets/toolset-13.json @@ -234,6 +234,6 @@ } }, "pwsh": { - "version": "7.2" + "version": "7.4" } } diff --git a/images/macos/toolsets/toolset-14.json b/images/macos/toolsets/toolset-14.json index 52a27ed384c5..47d3290f8b9d 100644 --- a/images/macos/toolsets/toolset-14.json +++ b/images/macos/toolsets/toolset-14.json @@ -125,7 +125,7 @@ "version": "8.3" }, "pwsh": { - "version": "7.2" + "version": "7.4" }, "mono": { "framework":{ From 4637c233814ae15d6241c2f931010971a4566d95 Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Thu, 25 Jan 2024 10:51:07 +0100 Subject: [PATCH 2615/3485] Add secondary MacOs image generation pipelines (#9218) --- .../azure-pipelines/image-generation.yml | 4 +++- images.CI/macos/azure-pipelines/macos11.yml | 5 ++++ images.CI/macos/azure-pipelines/macos12.yml | 5 ++++ .../azure-pipelines/secondary-macos11.yml | 23 +++++++++++++++++++ .../azure-pipelines/secondary-macos12.yml | 23 +++++++++++++++++++ 5 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 images.CI/macos/azure-pipelines/secondary-macos11.yml create mode 100644 images.CI/macos/azure-pipelines/secondary-macos12.yml diff --git a/images.CI/macos/azure-pipelines/image-generation.yml b/images.CI/macos/azure-pipelines/image-generation.yml index 19bfdde3cc6b..a8a917c64bc5 100644 --- a/images.CI/macos/azure-pipelines/image-generation.yml +++ b/images.CI/macos/azure-pipelines/image-generation.yml @@ -4,8 +4,10 @@ jobs: timeoutInMinutes: 1200 pool: name: Mac-Cloud Image Generation + demands: + - PrimaryRackAgent -equals ${{ parameters.primary_agent }} variables: - - group: Mac-Cloud Image Generation + - group: ${{ parameters.variable_group_name }} steps: - pwsh: | diff --git a/images.CI/macos/azure-pipelines/macos11.yml b/images.CI/macos/azure-pipelines/macos11.yml index 012b3e61d0b9..7f659c75f57c 100644 --- a/images.CI/macos/azure-pipelines/macos11.yml +++ b/images.CI/macos/azure-pipelines/macos11.yml @@ -14,6 +14,9 @@ pr: include: - main +variables: +- group: Mac-Cloud Image Generation + jobs: - template: image-generation.yml parameters: @@ -21,3 +24,5 @@ jobs: base_image_name: 'clean-macOS-11-380Gb-runner' template_path: 'templates/macOS-11.pkr.hcl' target_datastore: 'ds-image' + variable_group_name: 'Mac-Cloud Image Generation' + primary_agent: 'true' diff --git a/images.CI/macos/azure-pipelines/macos12.yml b/images.CI/macos/azure-pipelines/macos12.yml index afa2190c2baa..e3652d8d4b61 100644 --- a/images.CI/macos/azure-pipelines/macos12.yml +++ b/images.CI/macos/azure-pipelines/macos12.yml @@ -14,6 +14,9 @@ pr: include: - main +variables: +- group: Mac-Cloud Image Generation + jobs: - template: image-generation.yml parameters: @@ -21,3 +24,5 @@ jobs: base_image_name: 'clean-macOS-12-380Gb-runner' template_path: 'templates/macOS-12.pkr.hcl' target_datastore: 'ds-image' + variable_group_name: 'Mac-Cloud Image Generation' + primary_agent: 'true' diff --git a/images.CI/macos/azure-pipelines/secondary-macos11.yml b/images.CI/macos/azure-pipelines/secondary-macos11.yml new file mode 100644 index 000000000000..5e86fa88a1f8 --- /dev/null +++ b/images.CI/macos/azure-pipelines/secondary-macos11.yml @@ -0,0 +1,23 @@ +name: macOS-11_$(date:yyyyMMdd)$(rev:.r)_unstable +schedules: +- cron: '45 0 * * 1' + displayName: Weekly + branches: + include: + - main + always: true + +trigger: none + +variables: +- group: Mac-Cloud Image Generation + +jobs: +- template: image-generation.yml + parameters: + image_label: 'macOS Big Sur' + base_image_name: 'clean-macOS-11-380Gb-runner' + template_path: 'templates/macOS-11.pkr.hcl' + target_datastore: 'ds-image' + variable_group_name: 'Mac-Cloud Secondary Image Generation' + primary_agent: 'false' diff --git a/images.CI/macos/azure-pipelines/secondary-macos12.yml b/images.CI/macos/azure-pipelines/secondary-macos12.yml new file mode 100644 index 000000000000..a43c2c0ea267 --- /dev/null +++ b/images.CI/macos/azure-pipelines/secondary-macos12.yml @@ -0,0 +1,23 @@ +name: macOS-12_$(date:yyyyMMdd)$(rev:.r)_unstable +schedules: +- cron: '45 1 * * 1' + displayName: Weekly + branches: + include: + - main + always: true + +trigger: none + +variables: +- group: Mac-Cloud Image Generation + +jobs: +- template: image-generation.yml + parameters: + image_label: 'macOS Monterey' + base_image_name: 'clean-macOS-12-380Gb-runner' + template_path: 'templates/macOS-12.pkr.hcl' + target_datastore: 'ds-image' + variable_group_name: 'Mac-Cloud Secondary Image Generation' + primary_agent: 'false' From 07fa737c4c88f85c3dd3692d97ac0858dad57a36 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 25 Jan 2024 10:57:40 +0000 Subject: [PATCH 2616/3485] Updating readme file for macOS-12 version 20240119.1 (#9206) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-12-Readme.md | 77 ++++++++++++++++----------------- 1 file changed, 38 insertions(+), 39 deletions(-) diff --git a/images/macos/macos-12-Readme.md b/images/macos/macos-12-Readme.md index 8915ec003509..5aeae712a0db 100644 --- a/images/macos/macos-12-Readme.md +++ b/images/macos/macos-12-Readme.md @@ -2,17 +2,16 @@ |-| | [[All OSes] Powershell Core will be updated to 7.4.x LTS on January, 28](https://github.com/actions/runner-images/issues/9115) | | [Old versions of Android SDK & tools will be removed from images on January, 8](https://github.com/actions/runner-images/issues/8952) | -| [Major Refactoring of GitHub Actions Runner Images Repository](https://github.com/actions/runner-images/issues/8706) | *** # macOS 12 - OS Version: macOS 12.7.2 (21G1974) - Kernel Version: Darwin 21.6.0 -- Image Version: 20240105.3 +- Image Version: 20240119.1 ## Installed Software ### Language and Runtime -- .NET Core SDK: 6.0.417, 7.0.102, 7.0.202, 7.0.306, 7.0.404, 8.0.100 +- .NET Core SDK: 6.0.418, 7.0.102, 7.0.202, 7.0.306, 7.0.405, 8.0.101 - Bash 3.2.57(1)-release - Clang/LLVM 14.0.0 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` @@ -24,33 +23,33 @@ - GNU Fortran 13 (Homebrew GCC 13.2.0) - available by `gfortran-13` alias - Julia 1.10.0 - Kotlin 1.9.22-release-704 -- Go 1.20.12 +- Go 1.20.13 - Mono 6.12.0.188 - Node.js 18.19.0 - MSBuild 16.10.1.51301 (Mono 6.12.0.188) - NVM 0.39.7 -- NVM - Cached node versions: 16.20.2, 18.19.0, 20.10.0 +- NVM - Cached node versions: 16.20.2, 18.19.0, 20.11.0 - Perl 5.38.2 -- PHP 8.3.1 +- PHP 8.3.2 - Python 2.7.18 - Python3 3.12.1 - R 4.3.2 - Ruby 3.0.6p216 ### Package Management -- Bundler 2.5.4 +- Bundler 2.5.5 - Carthage 0.39.1 - CocoaPods 1.14.3 - Composer 2.6.6 -- Homebrew 4.2.2 +- Homebrew 4.2.4 - Miniconda 23.11.0 - NPM 10.2.3 - NuGet 6.3.1.1 - Pip 20.3.4 (python 2.7) - Pip3 23.3.2 (python 3.12) -- Pipx 1.4.1 -- RubyGems 3.5.4 -- Vcpkg 2023 (build from commit ce46ba877) +- Pipx 1.4.3 +- RubyGems 3.5.5 +- Vcpkg 2024 (build from commit a1a1cbc97) - Yarn 1.22.19 #### Environment variables @@ -69,17 +68,17 @@ - 7-Zip 17.05 - aria2 1.37.0 - azcopy 10.21.2 -- bazel 7.0.0 +- bazel 7.0.1 - bazelisk 1.19.0 - bsdtar 3.5.1 - available by 'tar' alias - Curl 8.5.0 - Git 2.43.0 - Git LFS 3.4.1 -- GitHub CLI 2.40.1 +- GitHub CLI 2.42.1 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.21.4 - gpg (GnuPG) 2.4.3 -- ImageMagick 7.1.1-25 +- ImageMagick 7.1.1-26 - jq 1.7.1 - mongo 5.0.21 - mongod 5.0.21 @@ -98,24 +97,24 @@ ### Tools - App Center CLI 2.14.0 -- AWS CLI 2.15.8 -- AWS SAM CLI 1.106.0 -- AWS Session Manager CLI 1.2.536.0 -- Azure CLI 2.55.0 +- AWS CLI 2.15.12 +- AWS SAM CLI 1.107.0 +- AWS Session Manager CLI 1.2.553.0 +- Azure CLI 2.56.0 - Azure CLI (azure-devops) 0.26.0 - Bicep CLI 0.24.24 - Cabal 3.10.2.1 - Cmake 3.28.1 -- CodeQL Action Bundle 2.15.5 +- CodeQL Action Bundle 2.16.0 - Colima 0.6.7 - Fastlane 2.219.0 - GHC 9.8.1 - GHCup 0.1.20.0 - Jazzy 0.14.4 - Stack 2.13.1 -- SwiftFormat 0.52.11 -- Swig 4.1.1 -- Xcbeautify 1.3.0 +- SwiftFormat 0.53.0 +- Swig 4.2.0 +- Xcbeautify 1.4.0 - Xcode Command Line Tools 14.2.0.0.1.1668646533 - Xcodes 1.4.1 @@ -126,12 +125,12 @@ ### Browsers - Safari 17.2.1 (17617.1.17.11.12) - SafariDriver 17.2.1 (17617.1.17.11.12) -- Google Chrome 120.0.6099.199 +- Google Chrome 120.0.6099.234 - Google Chrome for Testing 120.0.6099.109 - ChromeDriver 120.0.6099.109 -- Microsoft Edge 120.0.2210.121 -- Microsoft Edge WebDriver 120.0.2210.91 -- Mozilla Firefox 121.0 +- Microsoft Edge 120.0.2210.144 +- Microsoft Edge WebDriver 120.0.2210.144 +- Mozilla Firefox 121.0.1 - geckodriver 0.34.0 - Selenium server 4.16.1 @@ -145,10 +144,10 @@ ### Java | Version | Environment Variable | | ------------------- | -------------------- | -| 8.0.392+8 (default) | JAVA_HOME_8_X64 | +| 8.0.402+6 (default) | JAVA_HOME_8_X64 | | 11.0.21+9 | JAVA_HOME_11_X64 | -| 17.0.9+9 | JAVA_HOME_17_X64 | -| 21.0.1+12.0 | JAVA_HOME_21_X64 | +| 17.0.10+7 | JAVA_HOME_17_X64 | +| 21.0.2+13.0 | JAVA_HOME_21_X64 | ### Cached Tools @@ -158,11 +157,11 @@ - 3.1.4 #### PyPy -- 2.7.18 [PyPy 7.3.14] +- 2.7.18 [PyPy 7.3.15] - 3.7.13 [PyPy 7.3.9] - 3.8.16 [PyPy 7.3.11] -- 3.9.18 [PyPy 7.3.14] -- 3.10.13 [PyPy 7.3.14] +- 3.9.18 [PyPy 7.3.15] +- 3.10.13 [PyPy 7.3.15] #### Python - 3.7.17 @@ -175,12 +174,12 @@ #### Node.js - 16.20.2 - 18.19.0 -- 20.10.0 +- 20.11.0 #### Go - 1.19.13 -- 1.20.12 -- 1.21.5 +- 1.20.13 +- 1.21.6 ### Rust Tools - Cargo 1.75.0 @@ -189,7 +188,7 @@ - Rustup 1.26.0 #### Packages -- Bindgen 0.69.1 +- Bindgen 0.69.2 - Cargo-audit 0.18.3 - Cargo-outdated 0.14.0 - Cbindgen 0.26.0 @@ -197,10 +196,10 @@ - Rustfmt 1.7.0-stable ### PowerShell Tools -- PowerShell 7.2.17 +- PowerShell 7.2.18 #### PowerShell Modules -- Az: 11.1.0 +- Az: 11.2.0 - MarkdownPS: 1.9 - Pester: 5.5.0 - PSScriptAnalyzer: 1.21.0 @@ -217,7 +216,7 @@ | Version | Build | Path | | -------------- | ---------- | ------------------------------------ | | 2019 | 8.10.25.2 | /Applications/Visual Studio 2019.app | -| 2022 (default) | 17.6.7.417 | /Applications/Visual Studio.app | +| 2022 (default) | 17.6.8.400 | /Applications/Visual Studio.app | ##### Notes ``` From 96659c7d4477da0366d038c452d966c6aeeb73cb Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 25 Jan 2024 11:25:12 +0000 Subject: [PATCH 2617/3485] Updating readme file for ubuntu20 version 20240122.3.1 (#9211) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2004-Readme.md | 62 +++++++++++++++--------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/images/ubuntu/Ubuntu2004-Readme.md b/images/ubuntu/Ubuntu2004-Readme.md index fb7a7ddaf34b..3e262999faec 100644 --- a/images/ubuntu/Ubuntu2004-Readme.md +++ b/images/ubuntu/Ubuntu2004-Readme.md @@ -6,8 +6,8 @@ # Ubuntu 20.04 - OS Version: 20.04.6 LTS - Kernel Version: 5.15.0-1053-azure -- Image Version: 20240116.2.0 -- Systemd version: 245.4-4ubuntu3.22 +- Image Version: 20240122.3.0 +- Systemd version: 245.4-4ubuntu3.23 ## Installed Software @@ -33,16 +33,16 @@ ### Package Management - cpan 1.64 -- Helm 3.13.1 -- Homebrew 4.2.4 +- Helm 3.14.0 +- Homebrew 4.2.5 - Miniconda 23.11.0 - Npm 10.2.3 - NuGet 6.6.1.2 - Pip 20.0.2 - Pip3 20.0.2 -- Pipx 1.4.2 +- Pipx 1.4.3 - RubyGems 3.1.2 -- Vcpkg (build from commit 53bef8994) +- Vcpkg (build from commit fa6e6a6ec) - Yarn 1.22.21 #### Environment variables @@ -70,16 +70,16 @@ to accomplish this. - Ansible 2.13.13 - apt-fast 1.10.0 - AzCopy 10.21.2 - available by `azcopy` and `azcopy10` aliases -- Bazel 7.0.0 +- Bazel 7.0.1 - Bazelisk 1.19.0 - Bicep 0.24.24 - Buildah 1.22.3 - CMake 3.28.1 -- CodeQL Action Bundle 2.15.5 +- CodeQL Action Bundle 2.16.0 - Docker Amazon ECR Credential Helper 0.7.1 - Docker Compose v1 1.29.2 - Docker Compose v2 2.23.3 -- Docker-Buildx 0.11.2 +- Docker-Buildx 0.12.1 - Docker Client 24.0.7 - Docker Server 24.0.7 - Fastlane 2.219.0 @@ -91,7 +91,7 @@ to accomplish this. - HHVM (HipHop VM) 4.172.1 - jq 1.6 - Kind 0.20.0 -- Kubectl 1.29.0 +- Kubectl 1.29.1 - Kustomize 5.3.0 - Leiningen 2.10.0 - MediaInfo 19.09 @@ -105,29 +105,29 @@ to accomplish this. - Parcel 2.11.0 - PhantomJS 2.1.1 2.1.1 - Podman 3.4.2 -- Pulumi 3.101.1 +- Pulumi 3.102.0 - R 4.3.2 - Skopeo 1.5.0 - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 -- Terraform 1.6.6 +- Terraform 1.7.0 - yamllint 1.33.0 - yq 4.40.5 - zstd 1.5.5 ### CLI Tools - Alibaba Cloud CLI 3.0.174 -- AWS CLI 2.15.10 +- AWS CLI 2.15.12 - AWS CLI Session Manager Plugin 1.2.553.0 - AWS SAM CLI 1.107.0 - Azure CLI 2.56.0 - Azure CLI (azure-devops) 0.26.0 -- GitHub CLI 2.42.0 -- Google Cloud CLI 459.0.0 -- Netlify CLI 17.14.0 -- OpenShift CLI 4.14.8 +- GitHub CLI 2.42.1 +- Google Cloud CLI 460.0.0 +- Netlify CLI 17.15.2 +- OpenShift CLI 4.14.9 - ORAS CLI 1.1.0 -- Vercel CLI 33.1.0 +- Vercel CLI 33.2.0 ### Java | Version | Environment Variable | @@ -138,7 +138,7 @@ to accomplish this. | 21.0.1+12 | JAVA_HOME_21_X64 | ### PHP Tools -- PHP: 7.4.33, 8.0.30, 8.1.27, 8.2.14, 8.3.1 +- PHP: 7.4.33, 8.0.30, 8.1.27, 8.2.15, 8.3.2 - Composer 2.6.6 - PHPUnit 8.5.36 ``` @@ -166,13 +166,13 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 120.0.6099.216 +- Google Chrome 120.0.6099.224 - ChromeDriver 120.0.6099.109 - Chromium 120.0.6099.0 -- Microsoft Edge 120.0.2210.133 -- Microsoft Edge WebDriver 120.0.2210.133 +- Microsoft Edge 120.0.2210.144 +- Microsoft Edge WebDriver 120.0.2210.144 - Selenium server 4.16.1 -- Mozilla Firefox 121.0.1 +- Mozilla Firefox 122.0 - Geckodriver 0.34.0 #### Environment variables @@ -188,7 +188,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - nbgv 3.6.133+2d32d93cb1 ### Databases -- MongoDB 5.0.23 +- MongoDB 5.0.24 - sqlite3 3.31.1 #### PostgreSQL @@ -216,13 +216,13 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Go - 1.19.13 -- 1.20.12 -- 1.21.5 +- 1.20.13 +- 1.21.6 #### Node.js - 16.20.2 - 18.19.0 -- 20.10.0 +- 20.11.0 #### Python - 3.7.17 @@ -254,7 +254,7 @@ Use the following command as a part of your job to start the service: 'sudo syst - Az: 9.3.0 - Az (Cached): 3.1.0.zip, 4.4.0.zip, 5.9.0.zip, 6.6.0.zip, 7.5.0.zip - MarkdownPS: 1.9 -- Microsoft.Graph: 2.11.1 +- Microsoft.Graph: 2.12.0 - Pester: 5.5.0 - PSScriptAnalyzer: 1.21.0 @@ -299,9 +299,9 @@ Use the following command as a part of your job to start the service: 'sudo syst | moby/buildkit:latest | sha256:5a8f30813a104b86e927ff4695a746f74a5bb921c7be1dbcca6d754dfbe04822 | 2023-12-01 | | node:16 | sha256:f77a1aef2da8d83e45ec990f45df50f1a286c5fe8bbfb8c6e4246c6389705c0b | 2023-09-07 | | node:16-alpine | sha256:a1f9d027912b58a7c75be7716c97cfbc6d3099f3a97ed84aa490be9dee20e787 | 2023-08-10 | -| node:18 | sha256:d7885552c11adb0f251db87d96a9c964990235569c8291bc61c276261947d6de | 2024-01-11 | +| node:18 | sha256:995a5f4314885452a4a785abc25a0fec40e26c346559e11e709d58bb7a927cf4 | 2024-01-17 | | node:18-alpine | sha256:b1a0356f7d6b86c958a06949d3db3f7fb27f95f627aa6157cb98bc65c801efa2 | 2023-12-11 | -| node:20 | sha256:9aa3de5470c99408fda002dc1f406e92a31daf0492eb33d857d8d9d252edcc52 | 2024-01-11 | +| node:20 | sha256:ffebb4405810c92d267a764b21975fb2d96772e41877248a37bf3abaa0d3b590 | 2024-01-17 | | node:20-alpine | sha256:8e6a472eb9742f4f486ca9ef13321b7fc2e54f2f60814f339eeda2aff3037573 | 2024-01-10 | | ubuntu:20.04 | sha256:f2034e7195f61334e6caff6ecf2e965f92d11e888309065da85ff50c617732b8 | 2023-12-13 | @@ -392,7 +392,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | upx | 3.95-2build1 | | wget | 1.20.3-1ubuntu2 | | xorriso | 1.5.2-1 | -| xvfb | 2:1.20.13-1ubuntu1\~20.04.12 | +| xvfb | 2:1.20.13-1ubuntu1\~20.04.14 | | xz-utils | 5.2.4-1ubuntu1.1 | | zip | 3.0-11build1 | | zsync | 0.6.2-3ubuntu1 | From 022efa3751e61b67fc972fe441e6281d5abe5729 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 25 Jan 2024 12:45:03 +0000 Subject: [PATCH 2618/3485] Updating readme file for win19 version 20240122.1.1 (#9212) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/windows/Windows2019-Readme.md | 38 ++++++++++++++-------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/images/windows/Windows2019-Readme.md b/images/windows/Windows2019-Readme.md index 60b240217d28..6d3b6c32437a 100644 --- a/images/windows/Windows2019-Readme.md +++ b/images/windows/Windows2019-Readme.md @@ -5,7 +5,7 @@ *** # Windows Server 2019 - OS Version: 10.0.17763 Build 5329 -- Image Version: 20240116.2.0 +- Image Version: 20240122.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -20,7 +20,7 @@ - LLVM 16.0.6 - Node 18.18.2 - Perl 5.32.1 -- PHP 8.2.14 +- PHP 8.2.15 - Python 3.7.9 - Ruby 2.5.9p229 @@ -34,7 +34,7 @@ - pip 23.3.2 (python 3.7) - Pipx 1.2.1 - RubyGems 2.7.6.3 -- Vcpkg (build from commit 763a397e3) +- Vcpkg (build from commit fa6e6a6ec) - Yarn 1.22.21 #### Environment variables @@ -53,12 +53,12 @@ - 7zip 23.01 - aria2 1.37.0 - azcopy 10.22.2 -- Bazel 7.0.0 +- Bazel 7.0.1 - Bazelisk 1.19.0 - Bicep 0.24.24 - Cabal 3.10.2.1 - CMake 3.27.9 -- CodeQL Action Bundle 2.15.5 +- CodeQL Action Bundle 2.16.0 - Docker 24.0.7 - Docker Compose v1 1.29.2 - Docker Compose v2 2.23.3 @@ -66,12 +66,12 @@ - ghc 9.8.1 - Git 2.43.0.windows.1 - Git LFS 3.4.0 -- Google Cloud CLI 459.0.0 +- Google Cloud CLI 460.0.0 - ImageMagick 7.1.1-26 - InnoSetup 6.2.2 - jq 1.7-dirty - Kind 0.20.0 -- Kubectl 1.29.0 +- Kubectl 1.29.1 - Mercurial 5.0 - gcc 8.1.0 - gdb 8.1 @@ -81,7 +81,7 @@ - OpenSSL 1.1.1w - Packer 1.10.0 - Parcel 2.11.0 -- Pulumi 3.101.1 +- Pulumi 3.102.0 - R 4.3.2 - Service Fabric SDK 9.1.1436.9590 - Stack 2.13.1 @@ -95,7 +95,7 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.196 -- AWS CLI 2.15.10 +- AWS CLI 2.15.12 - AWS SAM CLI 1.107.0 - AWS Session Manager CLI 1.2.553.0 - Azure CLI 2.56.0 @@ -120,8 +120,8 @@ ### Browsers and Drivers - Google Chrome 120.0.6099.225 - Chrome Driver 120.0.6099.109 -- Microsoft Edge 120.0.2210.133 -- Microsoft Edge Driver 120.0.2210.133 +- Microsoft Edge 120.0.2210.144 +- Microsoft Edge Driver 120.0.2210.144 - Mozilla Firefox 121.0.1 - Gecko Driver 0.34.0 - IE Driver 4.14.0.0 @@ -138,10 +138,10 @@ ### Java | Version | Environment Variable | | ------------------- | -------------------- | -| 8.0.392+8 (default) | JAVA_HOME_8_X64 | -| 11.0.21+9 | JAVA_HOME_11_X64 | -| 17.0.9+9.1 | JAVA_HOME_17_X64 | -| 21.0.1+12.1 | JAVA_HOME_21_X64 | +| 8.0.402+6 (default) | JAVA_HOME_8_X64 | +| 11.0.22+7 | JAVA_HOME_11_X64 | +| 17.0.10+7 | JAVA_HOME_17_X64 | +| 21.0.2+13.0 | JAVA_HOME_21_X64 | ### Shells | Name | Target | @@ -173,7 +173,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Node.js - 16.20.2 - 18.19.0 -- 20.10.0 +- 20.11.0 #### Python - 3.7.9 @@ -215,7 +215,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### MongoDB | Version | ServiceName | ServiceStatus | ServiceStartType | | -------- | ----------- | ------------- | ---------------- | -| 5.0.23.0 | MongoDB | Stopped | Disabled | +| 5.0.24.0 | MongoDB | Stopped | Disabled | ### Database tools - Azure CosmosDb Emulator 2.14.12.0 @@ -513,10 +513,10 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Az (Cached): 1.0.0.zip, 1.6.0.zip, 2.3.2.zip, 2.6.0.zip, 3.1.0.zip, 3.5.0.zip, 3.8.0.zip, 4.3.0.zip, 4.4.0.zip, 4.7.0.zip, 5.5.0.zip, 5.9.0.zip, 6.6.0.zip, 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.494 +- AWSPowershell: 4.1.498 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 -- Microsoft.Graph: 2.11.1 +- Microsoft.Graph: 2.12.0 - Pester: 3.4.0, 5.5.0 - PowerShellGet: 1.0.0.1, 2.2.5 - PSScriptAnalyzer: 1.21.0 From 0b56eac4f1aae14e80fea06601b26fc2176b06bf Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 25 Jan 2024 14:12:32 +0000 Subject: [PATCH 2619/3485] Updating readme file for win22 version 20240122.1.1 (#9213) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/windows/Windows2022-Readme.md | 60 ++++++++++++++-------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/images/windows/Windows2022-Readme.md b/images/windows/Windows2022-Readme.md index 9b63180e3f49..e7ca6849e35b 100644 --- a/images/windows/Windows2022-Readme.md +++ b/images/windows/Windows2022-Readme.md @@ -5,7 +5,7 @@ *** # Windows Server 2022 - OS Version: 10.0.20348 Build 2227 -- Image Version: 20240116.1.0 +- Image Version: 20240122.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -14,13 +14,13 @@ ### Language and Runtime - Bash 5.2.21(1)-release -- Go 1.20.12 +- Go 1.20.13 - Julia 1.10.0 - Kotlin 1.9.22 - LLVM 16.0.6 - Node 18.18.2 - Perl 5.32.1 -- PHP 8.2.14 +- PHP 8.2.15 - Python 3.9.13 - Ruby 3.0.6p216 @@ -32,9 +32,9 @@ - NPM 9.8.1 - NuGet 6.8.0.131 - pip 23.3.2 (python 3.9) -- Pipx 1.4.2 +- Pipx 1.4.3 - RubyGems 3.2.33 -- Vcpkg (build from commit 53bef8994) +- Vcpkg (build from commit fa6e6a6ec) - Yarn 1.22.21 #### Environment variables @@ -53,12 +53,12 @@ - 7zip 23.01 - aria2 1.37.0 - azcopy 10.22.2 -- Bazel 7.0.0 +- Bazel 7.0.1 - Bazelisk 1.19.0 - Bicep 0.24.24 - Cabal 3.10.2.1 - CMake 3.27.9 -- CodeQL Action Bundle 2.15.5 +- CodeQL Action Bundle 2.16.0 - Docker 24.0.7 - Docker Compose v1 1.29.2 - Docker Compose v2 2.23.3 @@ -70,7 +70,7 @@ - InnoSetup 6.2.2 - jq 1.7-dirty - Kind 0.20.0 -- Kubectl 1.29.0 +- Kubectl 1.29.1 - Mercurial 5.0 - gcc 12.2.0 - gdb 11.2 @@ -79,7 +79,7 @@ - NSIS 3.09 - OpenSSL 1.1.1w - Packer 1.10.0 -- Pulumi 3.101.1 +- Pulumi 3.102.0 - R 4.3.2 - Service Fabric SDK 9.1.1436.9590 - Stack 2.13.1 @@ -93,12 +93,12 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.196 -- AWS CLI 2.15.10 +- AWS CLI 2.15.12 - AWS SAM CLI 1.107.0 - AWS Session Manager CLI 1.2.553.0 - Azure CLI 2.56.0 - Azure DevOps CLI extension 0.26.0 -- GitHub CLI 2.42.0 +- GitHub CLI 2.42.1 ### Rust Tools - Cargo 1.75.0 @@ -115,10 +115,10 @@ - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 120.0.6099.217 +- Google Chrome 120.0.6099.225 - Chrome Driver 120.0.6099.109 -- Microsoft Edge 120.0.2210.133 -- Microsoft Edge Driver 120.0.2210.133 +- Microsoft Edge 120.0.2210.144 +- Microsoft Edge Driver 120.0.2210.144 - Mozilla Firefox 121.0.1 - Gecko Driver 0.34.0 - IE Driver 4.14.0.0 @@ -135,10 +135,10 @@ ### Java | Version | Environment Variable | | ------------------- | -------------------- | -| 8.0.392+8 (default) | JAVA_HOME_8_X64 | -| 11.0.21+9 | JAVA_HOME_11_X64 | -| 17.0.9+9.1 | JAVA_HOME_17_X64 | -| 21.0.1+12.1 | JAVA_HOME_21_X64 | +| 8.0.402+6 (default) | JAVA_HOME_8_X64 | +| 11.0.22+7 | JAVA_HOME_11_X64 | +| 17.0.10+7 | JAVA_HOME_17_X64 | +| 21.0.2+13.0 | JAVA_HOME_21_X64 | ### Shells | Name | Target | @@ -161,13 +161,13 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Go - 1.19.13 -- 1.20.12 -- 1.21.5 +- 1.20.13 +- 1.21.6 #### Node.js - 16.20.2 - 18.19.0 -- 20.10.0 +- 20.11.0 #### Python - 3.7.9 @@ -206,7 +206,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### MongoDB | Version | ServiceName | ServiceStatus | ServiceStartType | | -------- | ----------- | ------------- | ---------------- | -| 5.0.23.0 | MongoDB | Stopped | Disabled | +| 5.0.24.0 | MongoDB | Stopped | Disabled | ### Database tools - Azure CosmosDb Emulator 2.14.12.0 @@ -222,9 +222,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Nginx | 1.25.3 | C:\tools\nginx-1.25.3\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2022 -| Name | Version | Path | -| ----------------------------- | -------------- | -------------------------------------------------------- | -| Visual Studio Enterprise 2022 | 17.8.34408.163 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | +| Name | Version | Path | +| ----------------------------- | ------------- | -------------------------------------------------------- | +| Visual Studio Enterprise 2022 | 17.8.34511.84 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | #### Workloads, components and extensions | Package | Version | @@ -257,8 +257,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Component.WixToolset.VisualStudioExtension.Schemas3 | 1.0.0.22 | | Component.Xamarin | 17.8.34129.139 | | Component.Xamarin.RemotedSimulator | 17.8.34129.139 | -| ios | 17.0.8478.0 | -| maccatalyst | 17.0.8478.0 | +| ios | 17.2.8004.0 | +| maccatalyst | 17.2.8004.0 | | maui.blazor | 8.0.3.0 | | maui.core | 8.0.3.0 | | maui.windows | 8.0.3.0 | @@ -567,15 +567,15 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Az (Cached): 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.494 +- AWSPowershell: 4.1.498 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 -- Microsoft.Graph: 2.11.1 +- Microsoft.Graph: 2.12.0 - Pester: 3.4.0, 5.5.0 - PowerShellGet: 1.0.0.1, 2.2.5 - PSScriptAnalyzer: 1.21.0 - PSWindowsUpdate: 2.2.1.4 -- SqlServer: 22.1.1 +- SqlServer: 22.2.0 - VSSetup: 2.2.16 ``` Azure PowerShell module 2.1.0 and AzureRM PowerShell module 2.1.0 are installed From 8d5da63ac4098a9037f58b4201471a7b0d753675 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 25 Jan 2024 14:34:43 +0000 Subject: [PATCH 2620/3485] Updating readme file for ubuntu22 version 20240122.3.1 (#9214) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2204-Readme.md | 58 +++++++++++++++--------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/images/ubuntu/Ubuntu2204-Readme.md b/images/ubuntu/Ubuntu2204-Readme.md index 3c133014eec2..f4a9acf8c6c8 100644 --- a/images/ubuntu/Ubuntu2204-Readme.md +++ b/images/ubuntu/Ubuntu2204-Readme.md @@ -6,7 +6,7 @@ # Ubuntu 22.04 - OS Version: 22.04.3 LTS - Kernel Version: 6.2.0-1018-azure -- Image Version: 20240116.3.0 +- Image Version: 20240122.3.0 - Systemd version: 249.11-0ubuntu3.11 ## Installed Software @@ -31,16 +31,16 @@ ### Package Management - cpan 1.64 -- Helm 3.13.1 -- Homebrew 4.2.4 +- Helm 3.14.0 +- Homebrew 4.2.5 - Miniconda 23.11.0 - Npm 10.2.3 - NuGet 6.6.1.2 - Pip 22.0.2 - Pip3 22.0.2 -- Pipx 1.4.2 +- Pipx 1.4.3 - RubyGems 3.3.5 -- Vcpkg (build from commit 53bef8994) +- Vcpkg (build from commit fa6e6a6ec) - Yarn 1.22.21 #### Environment variables @@ -65,16 +65,16 @@ to accomplish this. - Ansible 2.16.2 - apt-fast 1.10.0 - AzCopy 10.21.2 - available by `azcopy` and `azcopy10` aliases -- Bazel 7.0.0 +- Bazel 7.0.1 - Bazelisk 1.19.0 - Bicep 0.24.24 - Buildah 1.23.1 - CMake 3.28.1 -- CodeQL Action Bundle 2.15.5 +- CodeQL Action Bundle 2.16.0 - Docker Amazon ECR Credential Helper 0.7.1 - Docker Compose v1 1.29.2 - Docker Compose v2 2.23.3 -- Docker-Buildx 0.11.2 +- Docker-Buildx 0.12.1 - Docker Client 24.0.7 - Docker Server 24.0.7 - Fastlane 2.219.0 @@ -85,7 +85,7 @@ to accomplish this. - Heroku 8.7.1 - jq 1.6 - Kind 0.20.0 -- Kubectl 1.29.0 +- Kubectl 1.29.1 - Kustomize 5.3.0 - Leiningen 2.10.0 - MediaInfo 21.09 @@ -98,29 +98,29 @@ to accomplish this. - Packer 1.10.0 - Parcel 2.11.0 - Podman 3.4.4 -- Pulumi 3.101.1 +- Pulumi 3.102.0 - R 4.3.2 - Skopeo 1.4.1 - Sphinx Open Source Search Server 2.2.11 - SVN 1.14.1 -- Terraform 1.6.6 +- Terraform 1.7.0 - yamllint 1.33.0 - yq 4.40.5 - zstd 1.5.5 ### CLI Tools - Alibaba Cloud CLI 3.0.196 -- AWS CLI 2.15.10 +- AWS CLI 2.15.12 - AWS CLI Session Manager Plugin 1.2.553.0 - AWS SAM CLI 1.107.0 - Azure CLI 2.56.0 - Azure CLI (azure-devops) 0.26.0 -- GitHub CLI 2.42.0 -- Google Cloud CLI 459.0.0 -- Netlify CLI 17.14.0 -- OpenShift CLI 4.14.8 +- GitHub CLI 2.42.1 +- Google Cloud CLI 460.0.0 +- Netlify CLI 17.15.2 +- OpenShift CLI 4.14.9 - ORAS CLI 1.1.0 -- Vercel CLI 33.1.0 +- Vercel CLI 33.2.0 ### Java | Version | Environment Variable | @@ -159,13 +159,13 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 120.0.6099.216 +- Google Chrome 120.0.6099.224 - ChromeDriver 120.0.6099.109 - Chromium 120.0.6099.0 -- Microsoft Edge 120.0.2210.133 -- Microsoft Edge WebDriver 120.0.2210.133 +- Microsoft Edge 120.0.2210.144 +- Microsoft Edge WebDriver 120.0.2210.144 - Selenium server 4.16.1 -- Mozilla Firefox 121.0.1 +- Mozilla Firefox 122.0 - Geckodriver 0.34.0 #### Environment variables @@ -208,13 +208,13 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Go - 1.19.13 -- 1.20.12 -- 1.21.5 +- 1.20.13 +- 1.21.6 #### Node.js - 16.20.2 - 18.19.0 -- 20.10.0 +- 20.11.0 #### Python - 3.7.17 @@ -239,7 +239,7 @@ Use the following command as a part of your job to start the service: 'sudo syst #### PowerShell Modules - Az: 9.3.0 - MarkdownPS: 1.9 -- Microsoft.Graph: 2.11.1 +- Microsoft.Graph: 2.12.0 - Pester: 5.5.0 - PSScriptAnalyzer: 1.21.0 @@ -282,12 +282,12 @@ Use the following command as a part of your job to start the service: 'sudo syst | moby/buildkit:latest | sha256:5a8f30813a104b86e927ff4695a746f74a5bb921c7be1dbcca6d754dfbe04822 | 2023-12-01 | | node:16 | sha256:f77a1aef2da8d83e45ec990f45df50f1a286c5fe8bbfb8c6e4246c6389705c0b | 2023-09-07 | | node:16-alpine | sha256:a1f9d027912b58a7c75be7716c97cfbc6d3099f3a97ed84aa490be9dee20e787 | 2023-08-10 | -| node:18 | sha256:d7885552c11adb0f251db87d96a9c964990235569c8291bc61c276261947d6de | 2024-01-11 | +| node:18 | sha256:995a5f4314885452a4a785abc25a0fec40e26c346559e11e709d58bb7a927cf4 | 2024-01-17 | | node:18-alpine | sha256:b1a0356f7d6b86c958a06949d3db3f7fb27f95f627aa6157cb98bc65c801efa2 | 2023-12-11 | -| node:20 | sha256:9aa3de5470c99408fda002dc1f406e92a31daf0492eb33d857d8d9d252edcc52 | 2024-01-11 | +| node:20 | sha256:ffebb4405810c92d267a764b21975fb2d96772e41877248a37bf3abaa0d3b590 | 2024-01-17 | | node:20-alpine | sha256:8e6a472eb9742f4f486ca9ef13321b7fc2e54f2f60814f339eeda2aff3037573 | 2024-01-10 | | ubuntu:20.04 | sha256:f2034e7195f61334e6caff6ecf2e965f92d11e888309065da85ff50c617732b8 | 2023-12-13 | -| ubuntu:22.04 | sha256:6042500cf4b44023ea1894effe7890666b0c5c7871ed83a97c36c76ae560bb9b | 2023-12-12 | +| ubuntu:22.04 | sha256:e6173d4dc55e76b87c4af8db8821b1feae4146dd47341e4d431118c7dd060a74 | 2024-01-11 | ### Installed apt packages | Name | Version | @@ -378,7 +378,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | upx | 3.96-3 | | wget | 1.21.2-2ubuntu1 | | xorriso | 1.5.4-2 | -| xvfb | 2:21.1.4-2ubuntu1.7\~22.04.5 | +| xvfb | 2:21.1.4-2ubuntu1.7\~22.04.7 | | xz-utils | 5.2.5-2ubuntu1 | | zip | 3.0-12build2 | | zsync | 0.6.2-3ubuntu1 | From 237618d14ff86d6626fe13fb15e3ccd3655ba179 Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Fri, 26 Jan 2024 10:33:21 +0100 Subject: [PATCH 2621/3485] [macos11] Remove imagemagick package (#9229) --- images/macos/scripts/docs-gen/Generate-SoftwareReport.ps1 | 2 +- images/macos/scripts/tests/BasicTools.Tests.ps1 | 2 +- images/macos/toolsets/toolset-11.json | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/images/macos/scripts/docs-gen/Generate-SoftwareReport.ps1 b/images/macos/scripts/docs-gen/Generate-SoftwareReport.ps1 index 01d07b2bddb7..9792066b1ee3 100644 --- a/images/macos/scripts/docs-gen/Generate-SoftwareReport.ps1 +++ b/images/macos/scripts/docs-gen/Generate-SoftwareReport.ps1 @@ -128,7 +128,7 @@ $utilities.AddToolVersion("gpg (GnuPG)", $(Get-GPGVersion)) if ($os.IsBigSur) { $utilities.AddToolVersion("helm", $(Get-HelmVersion)) } -if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) { +if ((-not $os.IsBigSur) -and (-not $os.IsVentura) -and (-not $os.IsSonoma)) { $utilities.AddToolVersion("ImageMagick", $(Get-ImageMagickVersion)) } $utilities.AddToolVersion("jq", $(Get-JqVersion)) diff --git a/images/macos/scripts/tests/BasicTools.Tests.ps1 b/images/macos/scripts/tests/BasicTools.Tests.ps1 index a570f9988db2..213e6fb93c52 100644 --- a/images/macos/scripts/tests/BasicTools.Tests.ps1 +++ b/images/macos/scripts/tests/BasicTools.Tests.ps1 @@ -191,7 +191,7 @@ Describe "yq" { } } -Describe "imagemagick" -Skip:($os.IsVentura -or $os.IsSonoma) { +Describe "imagemagick" -Skip:($os.IsBigSur -or $os.IsVentura -or $os.IsSonoma) { It "imagemagick" { "magick -version" | Should -ReturnZeroExitCode } diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index 6964d47b0d0d..05d0c0154d3a 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -219,8 +219,7 @@ "libxext", "libxft", "tcl-tk", - "r", - "imagemagick" + "r" ], "cask_packages": [ "julia" From 17b9f1e58286e666a4c4584efb525859304188b8 Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Fri, 26 Jan 2024 11:52:45 +0100 Subject: [PATCH 2622/3485] [Ubuntu] Unpin AzCopy version to latest (#9233) --- images/ubuntu/scripts/build/install-azcopy.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/images/ubuntu/scripts/build/install-azcopy.sh b/images/ubuntu/scripts/build/install-azcopy.sh index 6865db8304af..640b0a457c39 100644 --- a/images/ubuntu/scripts/build/install-azcopy.sh +++ b/images/ubuntu/scripts/build/install-azcopy.sh @@ -8,8 +8,7 @@ source $HELPER_SCRIPTS/install.sh # Install AzCopy10 -# Temporary pin 10.21.2 version of AzCopy until 10.22.0 is fixed -archive_path=$(download_with_retry "https://azcopyvnext.azureedge.net/releases/release-10.21.2-20231106/azcopy_linux_amd64_10.21.2.tar.gz") +archive_path=$(download_with_retry "https://aka.ms/downloadazcopy-v10-linux") tar xzf "$archive_path" --strip-components=1 -C /tmp install /tmp/azcopy /usr/local/bin/azcopy From 83c984cdd94a6b8d45ba83db63d71861d10b3e0f Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Fri, 26 Jan 2024 14:25:50 +0100 Subject: [PATCH 2623/3485] README: temp removal of rollout badges (#9240) --- README.md | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index dc17ae557d41..796823f72e5c 100644 --- a/README.md +++ b/README.md @@ -19,16 +19,15 @@ To build a VM machine from this repo's source, see the [instructions](docs/creat ## Available Images -| Image | YAML Label | Included Software | Rollout Progress of Latest Image Release | -| --------------------|---------------------|--------------------|---------------------| -| Ubuntu 22.04 | `ubuntu-latest` or `ubuntu-22.04` | [ubuntu-22.04] | [![status22](https://gh-runnerimagesdeploymentstatus.azurewebsites.net/api/status?imageName=ubuntu22&badge=1)](https://gh-runnerimagesdeploymentstatus.azurewebsites.net/api/status?imageName=ubuntu22&redirect=1) -| Ubuntu 20.04 | `ubuntu-20.04` | [ubuntu-20.04] | [![status20](https://gh-runnerimagesdeploymentstatus.azurewebsites.net/api/status?imageName=ubuntu20&badge=1)](https://gh-runnerimagesdeploymentstatus.azurewebsites.net/api/status?imageName=ubuntu20&redirect=1) -| macOS 13 [beta] | `macos-13` or `macos-13-xl`| [macOS-13] | [![statusumac13](https://gh-runnerimagesdeploymentstatus.azurewebsites.net/api/status?imageName=macos-13&badge=1)](https://gh-runnerimagesdeploymentstatus.azurewebsites.net/api/status?imageName=macos-13&redirect=1) -| macOS 12 | `macos-latest`, `macos-latest-xl`, `macos-12`, or `macos-12-xl`| [macOS-12] | [![statusumac12](https://gh-runnerimagesdeploymentstatus.azurewebsites.net/api/status?imageName=macos-12&badge=1)](https://gh-runnerimagesdeploymentstatus.azurewebsites.net/api/status?imageName=macos-12&redirect=1) -| macOS 11 | `macos-11`| [macOS-11] | [![statusmac11](https://gh-runnerimagesdeploymentstatus.azurewebsites.net/api/status?imageName=macos-11&badge=1)](https://gh-runnerimagesdeploymentstatus.azurewebsites.net/api/status?imageName=macos-11&redirect=1) -| Windows Server 2022 | `windows-latest` or `windows-2022` | [windows-2022] | [![statuswin22](https://gh-runnerimagesdeploymentstatus.azurewebsites.net/api/status?imageName=windows-2022&badge=1)](https://gh-runnerimagesdeploymentstatus.azurewebsites.net/api/status?imageName=windows-2022&redirect=1) | -| Windows Server 2019 | `windows-2019` | [windows-2019] | [![statuswin19](https://gh-runnerimagesdeploymentstatus.azurewebsites.net/api/status?imageName=windows-2019&badge=1)](https://gh-runnerimagesdeploymentstatus.azurewebsites.net/api/status?imageName=windows-2019&redirect=1) - +| Image | YAML Label | Included Software | +| --------------------|---------------------|--------------------| +| Ubuntu 22.04 | `ubuntu-latest` or `ubuntu-22.04` | [ubuntu-22.04] | +| Ubuntu 20.04 | `ubuntu-20.04` | [ubuntu-20.04] | +| macOS 13 [beta] | `macos-13` or `macos-13-xl`| [macOS-13] | +| macOS 12 | `macos-latest`, `macos-latest-xl`, `macos-12`, or `macos-12-xl`| [macOS-12] | +| macOS 11 | `macos-11`| [macOS-11] | +| Windows Server 2022 | `windows-latest` or `windows-2022` | [windows-2022] | +| Windows Server 2019 | `windows-2019` | [windows-2019] | ### Label scheme - In general the `-latest` label is used for the latest OS image version that is GA From 74ed9d7d83e35a9b7144b79f464bb334ac863f93 Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Fri, 26 Jan 2024 17:19:27 +0100 Subject: [PATCH 2624/3485] [macOS] Unpin AzCopy version to latest (#9234) --- images/macos/scripts/build/install-azcopy.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/images/macos/scripts/build/install-azcopy.sh b/images/macos/scripts/build/install-azcopy.sh index 39df17a7de55..8c6ca81c940a 100644 --- a/images/macos/scripts/build/install-azcopy.sh +++ b/images/macos/scripts/build/install-azcopy.sh @@ -7,11 +7,9 @@ source ~/utils/utils.sh if is_Arm64; then - # latest is available by https://aka.ms/downloadazcopy-v10-mac-arm64 - url="https://azcopyvnext.azureedge.net/releases/release-10.21.2-20231106/azcopy_darwin_arm64_10.21.2.zip" + url="https://aka.ms/downloadazcopy-v10-mac-arm64" else - # latest is available by https://aka.ms/downloadazcopy-v10-mac - url="https://azcopyvnext.azureedge.net/releases/release-10.21.2-20231106/azcopy_darwin_amd64_10.21.2.zip" + url="https://aka.ms/downloadazcopy-v10-mac" fi # Install AzCopy From 47e2999afbbf5416ab5877f2dc0c1672c6ffcc8f Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Fri, 26 Jan 2024 22:41:19 +0100 Subject: [PATCH 2625/3485] [macos] Add Xcode 15.3 Beta (#9239) --- images/macos/toolsets/toolset-13.json | 2 ++ images/macos/toolsets/toolset-14.json | 2 ++ 2 files changed, 4 insertions(+) diff --git a/images/macos/toolsets/toolset-13.json b/images/macos/toolsets/toolset-13.json index 274e956612c6..ddaa8f384d82 100644 --- a/images/macos/toolsets/toolset-13.json +++ b/images/macos/toolsets/toolset-13.json @@ -3,6 +3,7 @@ "default": "15.0.1", "x64": { "versions": [ + { "link": "15.3", "version": "15.3.0-Beta+15E5178i", "install_runtimes": "true", "sha256": "CE08F7B13B072AE901C3D455C02BF374FA47F678A85B180532C5D80EC4B619C0"}, { "link": "15.2", "version": "15.2.0+15C500b", "install_runtimes": "true", "sha256": "04E93680C6DDBEC84666531BE412DE778AFC8EAC6AB2037F4C2BE7290818B59B"}, { "link": "15.1", "version": "15.1.0+15C65", "install_runtimes": "true", "sha256": "857D8DB537BAC82BF99DE0E1D3895D214D4D02101C1340CEF3DAF6E821BA1D05"}, { "link": "15.0.1", "version": "15.0.1+15A507", "symlinks": ["15.0"], "install_runtimes": "true", "sha256": "5AC17AE6060CAFC3C7112C6DA0B153450BE21F1DE6632777FBA9FBC9D999C9E8"}, @@ -14,6 +15,7 @@ }, "arm64":{ "versions": [ + { "link": "15.3", "version": "15.3.0-Beta+15E5178i", "install_runtimes": "true", "sha256": "CE08F7B13B072AE901C3D455C02BF374FA47F678A85B180532C5D80EC4B619C0"}, { "link": "15.2", "version": "15.2.0+15C500b", "install_runtimes": "true", "sha256": "04E93680C6DDBEC84666531BE412DE778AFC8EAC6AB2037F4C2BE7290818B59B"}, { "link": "15.1", "version": "15.1.0+15C65", "install_runtimes": "true", "sha256": "857D8DB537BAC82BF99DE0E1D3895D214D4D02101C1340CEF3DAF6E821BA1D05"}, { "link": "15.0.1", "version": "15.0.1+15A507", "symlinks": ["15.0"], "install_runtimes": "true", "sha256": "5AC17AE6060CAFC3C7112C6DA0B153450BE21F1DE6632777FBA9FBC9D999C9E8"}, diff --git a/images/macos/toolsets/toolset-14.json b/images/macos/toolsets/toolset-14.json index 47d3290f8b9d..9e0f98ea5479 100644 --- a/images/macos/toolsets/toolset-14.json +++ b/images/macos/toolsets/toolset-14.json @@ -3,6 +3,7 @@ "default": "15.0.1", "x64": { "versions": [ + { "link": "15.3", "version": "15.3.0-Beta+15E5178i", "install_runtimes": "true", "sha256": "CE08F7B13B072AE901C3D455C02BF374FA47F678A85B180532C5D80EC4B619C0"}, { "link": "15.2", "version": "15.2.0+15C500b", "install_runtimes": "true", "sha256": "04E93680C6DDBEC84666531BE412DE778AFC8EAC6AB2037F4C2BE7290818B59B"}, { "link": "15.1", "version": "15.1.0+15C65", "install_runtimes": "true", "sha256": "857D8DB537BAC82BF99DE0E1D3895D214D4D02101C1340CEF3DAF6E821BA1D05"}, { "link": "15.0.1", "version": "15.0.1+15A507", "symlinks": ["15.0"], "install_runtimes": "true", "sha256": "5AC17AE6060CAFC3C7112C6DA0B153450BE21F1DE6632777FBA9FBC9D999C9E8"}, @@ -11,6 +12,7 @@ }, "arm64":{ "versions": [ + { "link": "15.3", "version": "15.3.0-Beta+15E5178i", "install_runtimes": "true", "sha256": "CE08F7B13B072AE901C3D455C02BF374FA47F678A85B180532C5D80EC4B619C0"}, { "link": "15.2", "version": "15.2.0+15C500b", "install_runtimes": "true", "sha256": "04E93680C6DDBEC84666531BE412DE778AFC8EAC6AB2037F4C2BE7290818B59B"}, { "link": "15.1", "version": "15.1.0+15C65", "install_runtimes": "true", "sha256": "857D8DB537BAC82BF99DE0E1D3895D214D4D02101C1340CEF3DAF6E821BA1D05"}, { "link": "15.0.1", "version": "15.0.1+15A507", "symlinks": ["15.0"], "install_runtimes": "true", "sha256": "5AC17AE6060CAFC3C7112C6DA0B153450BE21F1DE6632777FBA9FBC9D999C9E8"}, From 8f1339b65b0063e84d739ab128cd3b0b9743592f Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Sat, 27 Jan 2024 11:05:44 +0100 Subject: [PATCH 2626/3485] [macos11] Remove php package (#9237) --- images/macos/scripts/docs-gen/Generate-SoftwareReport.ps1 | 2 +- images/macos/scripts/tests/PHP.Tests.ps1 | 4 ++-- images/macos/templates/macOS-11.pkr.hcl | 1 - images/macos/toolsets/toolset-11.json | 3 --- 4 files changed, 3 insertions(+), 7 deletions(-) diff --git a/images/macos/scripts/docs-gen/Generate-SoftwareReport.ps1 b/images/macos/scripts/docs-gen/Generate-SoftwareReport.ps1 index 9792066b1ee3..049eaa53e131 100644 --- a/images/macos/scripts/docs-gen/Generate-SoftwareReport.ps1 +++ b/images/macos/scripts/docs-gen/Generate-SoftwareReport.ps1 @@ -53,7 +53,7 @@ if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) { $languageAndRuntime.AddToolVersionsListInline("NVM - Cached node versions", $(Get-NVMNodeVersionList), '^\d+') } $languageAndRuntime.AddToolVersion("Perl", $(Get-PerlVersion)) -if ((-not $os.IsVenturaArm64) -and (-not $os.IsSonomaArm64)) { +if ((-not $os.IsBigSur) -and (-not $os.IsVenturaArm64) -and (-not $os.IsSonomaArm64)) { $languageAndRuntime.AddToolVersion("PHP", $(Get-PHPVersion)) } diff --git a/images/macos/scripts/tests/PHP.Tests.ps1 b/images/macos/scripts/tests/PHP.Tests.ps1 index c87b36bb420d..9316a06dfb6e 100644 --- a/images/macos/scripts/tests/PHP.Tests.ps1 +++ b/images/macos/scripts/tests/PHP.Tests.ps1 @@ -3,7 +3,7 @@ Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" $os = Get-OSVersion Describe "PHP" { - Context "PHP" -Skip:($os.IsVenturaArm64 -or $os.IsSonomaArm64) { + Context "PHP" -Skip:($os.IsBigSur -or $os.IsVenturaArm64 -or $os.IsSonomaArm64) { It "PHP Path" { Get-ToolPath "php" | Should -Not -BeLike "/usr/bin/php*" } @@ -14,7 +14,7 @@ Describe "PHP" { } } - Context "Composer" -Skip:($os.IsVenturaArm64 -or $os.IsSonomaArm64) { + Context "Composer" -Skip:($os.IsBigSur -or $os.IsVenturaArm64 -or $os.IsSonomaArm64) { It "Composer" { "composer --version" | Should -ReturnZeroExitCode } diff --git a/images/macos/templates/macOS-11.pkr.hcl b/images/macos/templates/macOS-11.pkr.hcl index 432eccdb4703..b136ccb4b2ca 100644 --- a/images/macos/templates/macOS-11.pkr.hcl +++ b/images/macos/templates/macOS-11.pkr.hcl @@ -244,7 +244,6 @@ build { "${path.root}/../scripts/build/install-golang.sh", "${path.root}/../scripts/build/install-swiftlint.sh", "${path.root}/../scripts/build/install-openjdk.sh", - "${path.root}/../scripts/build/install-php.sh", "${path.root}/../scripts/build/install-aws-tools.sh", "${path.root}/../scripts/build/install-rust.sh", "${path.root}/../scripts/build/install-gcc.sh", diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index 05d0c0154d3a..ce14831ecd23 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -352,9 +352,6 @@ "llvm": { "version": "15" }, - "php": { - "version": "8.3" - }, "mongodb": { "version": "5.0" }, From 6308849b2531330934dc881cfa920a7fc53b0929 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 27 Jan 2024 14:54:20 +0100 Subject: [PATCH 2627/3485] Updating readme file for macos-13-arm64 version 20240114.1 (#9170) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-13-arm64-Readme.md | 43 +++++++++++++-------------- 1 file changed, 21 insertions(+), 22 deletions(-) diff --git a/images/macos/macos-13-arm64-Readme.md b/images/macos/macos-13-arm64-Readme.md index a2e8ac316006..876133180f48 100644 --- a/images/macos/macos-13-arm64-Readme.md +++ b/images/macos/macos-13-arm64-Readme.md @@ -2,17 +2,16 @@ |-| | [[All OSes] Powershell Core will be updated to 7.4.x LTS on January, 28](https://github.com/actions/runner-images/issues/9115) | | [Old versions of Android SDK & tools will be removed from images on January, 8](https://github.com/actions/runner-images/issues/8952) | -| [Major Refactoring of GitHub Actions Runner Images Repository](https://github.com/actions/runner-images/issues/8706) | *** # macOS 13 - OS Version: macOS 13.6.3 (22G436) - Kernel Version: Darwin 22.6.0 -- Image Version: 20240107.1 +- Image Version: 20240114.1 ## Installed Software ### Language and Runtime -- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.404, 8.0.100 +- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.405, 8.0.101 - Bash 3.2.57(1)-release - Clang/LLVM 14.0.3 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` @@ -34,7 +33,7 @@ - Bundler 2.5.4 - Carthage 0.39.1 - CocoaPods 1.14.3 -- Homebrew 4.2.2 +- Homebrew 4.2.3 - NPM 10.2.3 - NuGet 6.3.1.1 - RubyGems 3.5.4 @@ -55,7 +54,7 @@ - Curl 8.1.2 - Git 2.43.0 - Git LFS 3.4.1 -- GitHub CLI 2.40.1 +- GitHub CLI 2.42.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.21.4 - gpg (GnuPG) 2.4.3 @@ -67,17 +66,17 @@ - zstd 1.5.5 ### Tools -- AWS CLI 2.15.8 -- AWS SAM CLI 1.106.0 -- AWS Session Manager CLI 1.2.536.0 -- Azure CLI 2.55.0 +- AWS CLI 2.15.10 +- AWS SAM CLI 1.107.0 +- AWS Session Manager CLI 1.2.553.0 +- Azure CLI 2.56.0 - Azure CLI (azure-devops) 0.26.0 - Bicep CLI 0.24.24 - Cmake 3.28.1 - CodeQL Action Bundle 2.15.5 - Fastlane 2.219.0 -- SwiftFormat 0.52.11 -- Xcbeautify 1.3.0 +- SwiftFormat 0.53.0 +- Xcbeautify 1.4.0 - Xcode Command Line Tools 15.1.0.0.1.1700200546 - Xcodes 1.4.1 @@ -86,7 +85,7 @@ ### Browsers - Safari 17.2.1 (18617.1.17.11.12) - SafariDriver 17.2.1 (18617.1.17.11.12) -- Google Chrome 120.0.6099.199 +- Google Chrome 120.0.6099.216 - Google Chrome for Testing 120.0.6099.109 - ChromeDriver 120.0.6099.109 - Selenium server 4.16.1 @@ -132,22 +131,22 @@ - Rustfmt 1.7.0-stable ### PowerShell Tools -- PowerShell 7.2.17 +- PowerShell 7.2.18 #### PowerShell Modules -- Az: 11.1.0 +- Az: 11.2.0 - Pester: 5.5.0 - PSScriptAnalyzer: 1.21.0 ### Xcode -| Version | Build | Path | -| ---------------- | -------- | ------------------------------ | -| 15.2 (beta) | 15C5500c | /Applications/Xcode_15.2.app | -| 15.1 | 15C65 | /Applications/Xcode_15.1.app | -| 15.0.1 | 15A507 | /Applications/Xcode_15.0.1.app | -| 14.3.1 (default) | 14E300c | /Applications/Xcode_14.3.1.app | -| 14.2 | 14C18 | /Applications/Xcode_14.2.app | -| 14.1 | 14B47b | /Applications/Xcode_14.1.app | +| Version | Build | Path | +| ---------------- | ------- | ------------------------------ | +| 15.2 | 15C500b | /Applications/Xcode_15.2.app | +| 15.1 | 15C65 | /Applications/Xcode_15.1.app | +| 15.0.1 | 15A507 | /Applications/Xcode_15.0.1.app | +| 14.3.1 (default) | 14E300c | /Applications/Xcode_14.3.1.app | +| 14.2 | 14C18 | /Applications/Xcode_14.2.app | +| 14.1 | 14B47b | /Applications/Xcode_14.1.app | #### Xcode Support Tools - xcpretty 0.3.0 From 3243ea36ef0c080a48f7a9f2c4517370ec075297 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Tue, 30 Jan 2024 13:05:32 +0100 Subject: [PATCH 2628/3485] [Ubuntu] reduce disks size in packer template (#9251) --- images/ubuntu/scripts/tests/System.Tests.ps1 | 4 ++-- images/ubuntu/templates/ubuntu-20.04.pkr.hcl | 2 +- images/ubuntu/templates/ubuntu-22.04.pkr.hcl | 2 +- images/ubuntu/templates/ubuntu-minimal.pkr.hcl | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/images/ubuntu/scripts/tests/System.Tests.ps1 b/images/ubuntu/scripts/tests/System.Tests.ps1 index 1abe55934562..457eae078ea9 100644 --- a/images/ubuntu/scripts/tests/System.Tests.ps1 +++ b/images/ubuntu/scripts/tests/System.Tests.ps1 @@ -1,8 +1,8 @@ # The $env:AGENT_NAME and $env:RUNNER_NAME are predefined variables for the ADO pipelines and for the GitHub actions respectively. # If the test is running on the ADO pipeline or on the GitHub actions, the test will be skipped Describe "Disk free space" -Skip:(-not [String]::IsNullOrEmpty($env:AGENT_NAME) -or -not [String]::IsNullOrEmpty($env:RUNNER_NAME)) { - It "Image has more than 31GB free space" { + It "Image has enough free space" { $freeSpace = (Get-PSDrive "/").Free - $freeSpace | Should -BeGreaterOrEqual 31GB + $freeSpace | Should -BeGreaterOrEqual 17GB } } diff --git a/images/ubuntu/templates/ubuntu-20.04.pkr.hcl b/images/ubuntu/templates/ubuntu-20.04.pkr.hcl index 7a35f657ae9c..fd3a295b7920 100644 --- a/images/ubuntu/templates/ubuntu-20.04.pkr.hcl +++ b/images/ubuntu/templates/ubuntu-20.04.pkr.hcl @@ -155,7 +155,7 @@ source "azure-arm" "build_image" { location = "${var.location}" managed_image_name = "${local.managed_image_name}" managed_image_resource_group_name = "${var.managed_image_resource_group_name}" - os_disk_size_gb = "86" + os_disk_size_gb = "75" os_type = "Linux" private_virtual_network_with_public_ip = "${var.private_virtual_network_with_public_ip}" subscription_id = "${var.subscription_id}" diff --git a/images/ubuntu/templates/ubuntu-22.04.pkr.hcl b/images/ubuntu/templates/ubuntu-22.04.pkr.hcl index 25fce43fd1bc..473e597cd3a0 100644 --- a/images/ubuntu/templates/ubuntu-22.04.pkr.hcl +++ b/images/ubuntu/templates/ubuntu-22.04.pkr.hcl @@ -155,7 +155,7 @@ source "azure-arm" "build_image" { location = "${var.location}" managed_image_name = "${local.managed_image_name}" managed_image_resource_group_name = "${var.managed_image_resource_group_name}" - os_disk_size_gb = "86" + os_disk_size_gb = "75" os_type = "Linux" private_virtual_network_with_public_ip = "${var.private_virtual_network_with_public_ip}" subscription_id = "${var.subscription_id}" diff --git a/images/ubuntu/templates/ubuntu-minimal.pkr.hcl b/images/ubuntu/templates/ubuntu-minimal.pkr.hcl index dc472575deff..f2cef0e0d64a 100644 --- a/images/ubuntu/templates/ubuntu-minimal.pkr.hcl +++ b/images/ubuntu/templates/ubuntu-minimal.pkr.hcl @@ -149,7 +149,7 @@ source "azure-arm" "build_image" { // VM Configuration vm_size = "${var.vm_size}" - os_disk_size_gb = "86" + os_disk_size_gb = "75" os_type = "Linux" dynamic "azure_tag" { From 14e41b1b5bb62f5d01d3cd296f0ec0a98bfd821e Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Tue, 30 Jan 2024 13:06:25 +0100 Subject: [PATCH 2629/3485] [macOS] Remove Composer version from macOS 11 doc due to previous tool removal (#9249) --- images/macos/scripts/docs-gen/Generate-SoftwareReport.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/macos/scripts/docs-gen/Generate-SoftwareReport.ps1 b/images/macos/scripts/docs-gen/Generate-SoftwareReport.ps1 index 049eaa53e131..acb6db20ef0e 100644 --- a/images/macos/scripts/docs-gen/Generate-SoftwareReport.ps1 +++ b/images/macos/scripts/docs-gen/Generate-SoftwareReport.ps1 @@ -74,7 +74,7 @@ $packageManagement = $installedSoftware.AddHeader("Package Management") $packageManagement.AddToolVersion("Bundler", $(Get-BundlerVersion)) $packageManagement.AddToolVersion("Carthage", $(Get-CarthageVersion)) $packageManagement.AddToolVersion("CocoaPods", $(Get-CocoaPodsVersion)) -if ((-not $os.IsVenturaArm64) -and (-not $os.IsSonomaArm64)) { +if ((-not $os.IsBigSur) -and (-not $os.IsVenturaArm64) -and (-not $os.IsSonomaArm64)) { $packageManagement.AddToolVersion("Composer", $(Get-ComposerVersion)) } $packageManagement.AddToolVersion("Homebrew", $(Get-HomebrewVersion)) From 52777b1081c9f0a20cd039235b812f8de96eb5bd Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Tue, 30 Jan 2024 13:10:04 +0100 Subject: [PATCH 2630/3485] Add macOS 14 and macOS 14 Arm64 labels (#9250) --- .github/ISSUE_TEMPLATE/announcement.yml | 2 ++ .github/ISSUE_TEMPLATE/bug-report.yml | 2 ++ .github/ISSUE_TEMPLATE/tool-request.yml | 2 ++ 3 files changed, 6 insertions(+) diff --git a/.github/ISSUE_TEMPLATE/announcement.yml b/.github/ISSUE_TEMPLATE/announcement.yml index 0fc10d988347..2dc3395932c2 100644 --- a/.github/ISSUE_TEMPLATE/announcement.yml +++ b/.github/ISSUE_TEMPLATE/announcement.yml @@ -42,6 +42,8 @@ body: - label: macOS 12 - label: macOS 13 - label: macOS 13 Arm64 + - label: macOS 14 + - label: macOS 14 Arm64 - label: Windows Server 2019 - label: Windows Server 2022 - type: textarea diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml index fa8ff0500623..f3502d0345c2 100644 --- a/.github/ISSUE_TEMPLATE/bug-report.yml +++ b/.github/ISSUE_TEMPLATE/bug-report.yml @@ -25,6 +25,8 @@ body: - label: macOS 12 - label: macOS 13 - label: macOS 13 Arm64 + - label: macOS 14 + - label: macOS 14 Arm64 - label: Windows Server 2019 - label: Windows Server 2022 - type: textarea diff --git a/.github/ISSUE_TEMPLATE/tool-request.yml b/.github/ISSUE_TEMPLATE/tool-request.yml index 5d8d1db8a29b..07c443707be8 100644 --- a/.github/ISSUE_TEMPLATE/tool-request.yml +++ b/.github/ISSUE_TEMPLATE/tool-request.yml @@ -63,6 +63,8 @@ body: - label: macOS 12 - label: macOS 13 - label: macOS 13 Arm64 + - label: macOS 14 + - label: macOS 14 Arm64 - label: Windows Server 2019 - label: Windows Server 2022 - type: textarea From 2d19e2799a0c8a96fc8dd0c5b52f1e4622a24892 Mon Sep 17 00:00:00 2001 From: Steve-Glass <84886334+Steve-Glass@users.noreply.github.com> Date: Tue, 30 Jan 2024 09:08:42 -0500 Subject: [PATCH 2631/3485] Update for OS 14 Public Beta (#9179) --- README.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 796823f72e5c..9cfb0d3e8446 100644 --- a/README.md +++ b/README.md @@ -23,11 +23,13 @@ To build a VM machine from this repo's source, see the [instructions](docs/creat | --------------------|---------------------|--------------------| | Ubuntu 22.04 | `ubuntu-latest` or `ubuntu-22.04` | [ubuntu-22.04] | | Ubuntu 20.04 | `ubuntu-20.04` | [ubuntu-20.04] | -| macOS 13 [beta] | `macos-13` or `macos-13-xl`| [macOS-13] | -| macOS 12 | `macos-latest`, `macos-latest-xl`, `macos-12`, or `macos-12-xl`| [macOS-12] | +| macOS 14 [beta] | `macos-14`, `macos-14-large`, or `macos-14-xlarge`| [macOS-14] | +| macOS 13 | `macos-13`, `macos-13-large`, or `macos-13-xlarge`| [macOS-13] | +| macOS 12 | `macos-latest`,`macos-12`, `macos-latest-large`, or `macos-12-large`| [macOS-12] | | macOS 11 | `macos-11`| [macOS-11] | | Windows Server 2022 | `windows-latest` or `windows-2022` | [windows-2022] | | Windows Server 2019 | `windows-2019` | [windows-2019] | + ### Label scheme - In general the `-latest` label is used for the latest OS image version that is GA @@ -40,6 +42,7 @@ To build a VM machine from this repo's source, see the [instructions](docs/creat [macOS-11]: https://github.com/actions/runner-images/blob/main/images/macos/macos-11-Readme.md [macOS-12]: https://github.com/actions/runner-images/blob/main/images/macos/macos-12-Readme.md [macOS-13]: https://github.com/actions/runner-images/blob/main/images/macos/macos-13-Readme.md +[macOS-14]: https://github.com/actions/runner-images/blob/main/images/macos/macos-14-Readme.md [self-hosted runners]: https://help.github.com/en/actions/hosting-your-own-runners ## Announcements From 5418817c5fd272379f7d5a56c2e63a3d7f1a49d8 Mon Sep 17 00:00:00 2001 From: Steve-Glass <84886334+Steve-Glass@users.noreply.github.com> Date: Tue, 30 Jan 2024 10:00:14 -0500 Subject: [PATCH 2632/3485] Update README.md (#9252) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9cfb0d3e8446..60469b472cd6 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ To build a VM machine from this repo's source, see the [instructions](docs/creat | macOS 14 [beta] | `macos-14`, `macos-14-large`, or `macos-14-xlarge`| [macOS-14] | | macOS 13 | `macos-13`, `macos-13-large`, or `macos-13-xlarge`| [macOS-13] | | macOS 12 | `macos-latest`,`macos-12`, `macos-latest-large`, or `macos-12-large`| [macOS-12] | -| macOS 11 | `macos-11`| [macOS-11] | +| macOS 11 [deprecated] | `macos-11`| [macOS-11] | | Windows Server 2022 | `windows-latest` or `windows-2022` | [windows-2022] | | Windows Server 2019 | `windows-2019` | [windows-2019] | From 37a171e44de1f134793d7f0cbff137ca481942ab Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Tue, 30 Jan 2024 16:21:29 +0100 Subject: [PATCH 2633/3485] [macOS] Add OS14 READMEs (#9253) --- images/macos/macos-14-Readme.md | 201 ++++++++++++++++++++++++++ images/macos/macos-14-arm64-Readme.md | 190 ++++++++++++++++++++++++ 2 files changed, 391 insertions(+) create mode 100644 images/macos/macos-14-Readme.md create mode 100644 images/macos/macos-14-arm64-Readme.md diff --git a/images/macos/macos-14-Readme.md b/images/macos/macos-14-Readme.md new file mode 100644 index 000000000000..b95544185c9a --- /dev/null +++ b/images/macos/macos-14-Readme.md @@ -0,0 +1,201 @@ +# macOS 14 +- OS Version: macOS 14.2.1 (23C71) +- Kernel Version: Darwin 23.2.0 +- Image Version: 20240116.1 + +## Installed Software + +### Language and Runtime +- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.405, 8.0.101 +- Bash 3.2.57(1)-release +- Clang/LLVM 15.0.0 +- Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` +- GCC 11 (Homebrew GCC 11.4.0) - available by `gcc-11` alias +- GCC 12 (Homebrew GCC 12.3.0) - available by `gcc-12` alias +- GCC 13 (Homebrew GCC 13.2.0) - available by `gcc-13` alias +- GNU Fortran 11 (Homebrew GCC 11.4.0) - available by `gfortran-11` alias +- GNU Fortran 12 (Homebrew GCC 12.3.0) - available by `gfortran-12` alias +- GNU Fortran 13 (Homebrew GCC 13.2.0) - available by `gfortran-13` alias +- Julia 1.10.0 +- Kotlin 1.9.22-release-704 +- Mono 6.12.0.188 +- Node.js 18.19.0 +- Perl 5.38.2 +- PHP 8.3.1 +- Python3 3.11.7 +- R 4.3.2 +- Ruby 3.0.6p216 + +### Package Management +- Bundler 2.5.4 +- Carthage 0.39.1 +- CocoaPods 1.14.3 +- Composer 2.6.6 +- Homebrew 4.2.4 +- NPM 10.2.3 +- NuGet 6.3.1.1 +- Pip3 23.3.1 (python 3.11) +- Pipx 1.4.2 +- RubyGems 3.5.4 +- Vcpkg 2024 (build from commit 91b17dd72) +- Yarn 1.22.19 + +### Project Management +- Apache Ant 1.10.14 +- Apache Maven 3.9.6 +- Gradle 8.5 + +### Utilities +- 7-Zip 17.05 +- aria2 1.37.0 +- azcopy 10.21.2 +- bazel 7.0.0 +- bazelisk 1.19.0 +- bsdtar 3.5.3 - available by 'tar' alias +- Curl 8.5.0 +- Git 2.43.0 +- Git LFS 3.4.1 +- GitHub CLI 2.42.0 +- GNU Tar 1.35 - available by 'gtar' alias +- GNU Wget 1.21.4 +- gpg (GnuPG) 2.4.3 +- jq 1.7.1 +- OpenSSL 1.1.1w 11 Sep 2023 +- Packer 1.9.4 +- pkg-config 0.29.2 +- yq 4.40.5 +- zstd 1.5.5 + +### Tools +- AWS CLI 2.15.10 +- AWS SAM CLI 1.107.0 +- AWS Session Manager CLI 1.2.553.0 +- Azure CLI 2.56.0 +- Azure CLI (azure-devops) 0.26.0 +- Bicep CLI 0.24.24 +- Cmake 3.28.1 +- CodeQL Action Bundle 2.15.5 +- Fastlane 2.219.0 +- SwiftFormat 0.53.0 +- Xcbeautify 1.4.0 +- Xcode Command Line Tools 15.1.0.0.1.1700200546 +- Xcodes 1.4.1 + +### Linters +- SwiftLint 0.53.0 + +### Browsers +- Safari 17.2.1 (19617.1.17.11.12) +- SafariDriver 17.2.1 (19617.1.17.11.12) +- Google Chrome 120.0.6099.234 +- Google Chrome for Testing 120.0.6099.109 +- ChromeDriver 120.0.6099.109 +- Microsoft Edge 120.0.2210.133 +- Microsoft Edge WebDriver 120.0.2210.133 +- Mozilla Firefox 121.0.1 +- geckodriver 0.34.0 +- Selenium server 4.16.1 + +#### Environment variables +| Name | Value | +| --------------- | ------------------------------------- | +| CHROMEWEBDRIVER | /usr/local/share/chromedriver-mac-x64 | +| EDGEWEBDRIVER | /usr/local/share/edge_driver | +| GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | + +### Java +| Version | Environment Variable | +| --------------------- | -------------------- | +| 8.0.392+8 | JAVA_HOME_8_X64 | +| 11.0.21+9 | JAVA_HOME_11_X64 | +| 17.0.9+9 | JAVA_HOME_17_X64 | +| 21.0.1+12.0 (default) | JAVA_HOME_21_X64 | + +### PowerShell Tools +- PowerShell 7.2.18 + +#### PowerShell Modules +- Az: 11.2.0 +- Pester: 5.5.0 +- PSScriptAnalyzer: 1.21.0 + +### Xcode +| Version | Build | Path | +| ---------------- | ------- | ------------------------------ | +| 15.2 | 15C500b | /Applications/Xcode_15.2.app | +| 15.1 | 15C65 | /Applications/Xcode_15.1.app | +| 15.0.1 (default) | 15A507 | /Applications/Xcode_15.0.1.app | +| 14.3.1 | 14E300c | /Applications/Xcode_14.3.1.app | + +#### Xcode Support Tools +- xcpretty 0.3.0 + +#### Installed SDKs +| SDK | SDK Name | Xcode Version | +| ------------------------------------------------------- | --------------------------------------------- | ------------- | +| macOS 13.3 | macosx13.3 | 14.3.1 | +| macOS 14.0 | macosx14.0 | 15.0.1 | +| macOS 14.2 | macosx14.2 | 15.1, 15.2 | +| iOS 16.4 | iphoneos16.4 | 14.3.1 | +| iOS 17.0 | iphoneos17.0 | 15.0.1 | +| iOS 17.2 | iphoneos17.2 | 15.1, 15.2 | +| Simulator - iOS 16.4 | iphonesimulator16.4 | 14.3.1 | +| Simulator - iOS 17.0 | iphonesimulator17.0 | 15.0.1 | +| Simulator - iOS 17.2 | iphonesimulator17.2 | 15.1, 15.2 | +| tvOS 16.4 | appletvos16.4 | 14.3.1 | +| tvOS 17.0 | appletvos17.0 | 15.0.1 | +| tvOS 17.2 | appletvos17.2 | 15.1, 15.2 | +| Simulator - tvOS 16.4 | appletvsimulator16.4 | 14.3.1 | +| Simulator - tvOS 17.0 | appletvsimulator17.0 | 15.0.1 | +| Simulator - tvOS 17.2 | appletvsimulator17.2 | 15.1, 15.2 | +| watchOS 9.4 | watchos9.4 | 14.3.1 | +| watchOS 10.0 | watchos10.0 | 15.0.1 | +| watchOS 10.2 | watchos10.2 | 15.1, 15.2 | +| Simulator - watchOS 9.4 | watchsimulator9.4 | 14.3.1 | +| Simulator - watchOS 10.0 | watchsimulator10.0 | 15.0.1 | +| Simulator - watchOS 10.2 | watchsimulator10.2 | 15.1, 15.2 | +| Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | +| visionOS 1.0 | xros1.0 | 15.2 | +| Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | +| Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | +| Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | +| DriverKit 22.4 | driverkit22.4 | 14.3.1 | +| DriverKit 23.0 | driverkit23.0 | 15.0.1 | +| DriverKit 23.2 | driverkit23.2 | 15.1, 15.2 | + +#### Installed Simulators +| OS | Xcode Version | Simulators | +| ------------ | -------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| iOS 16.4 | 14.3.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 17.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 17.2 | 14.3.1<br>15.0.1<br>15.1<br>15.2 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| tvOS 16.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 17.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 17.2 | 14.3.1<br>15.0.1<br>15.1<br>15.2 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| watchOS 9.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | +| watchOS 10.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 10.2 | 14.3.1<br>15.0.1<br>15.1<br>15.2 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | + +### Android +| Package Name | Version | +| -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 11.0 | +| Android Emulator | 33.1.24 | +| Android SDK Build-tools | 34.0.0<br>33.0.2 | +| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 2)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | +| Android SDK Platform-Tools | 34.0.5 | +| Android Support Repository | 47.0.0 | +| CMake | 3.22.1 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 24.0.8215888<br>25.2.9519653<br>26.1.10909125 (default) | + +#### Environment variables +| Name | Value | +| ----------------------- | --------------------------------------------------- | +| ANDROID_HOME | /Users/runner/Library/Android/sdk | +| ANDROID_NDK | /Users/runner/Library/Android/sdk/ndk/26.1.10909125 | +| ANDROID_NDK_HOME | /Users/runner/Library/Android/sdk/ndk/26.1.10909125 | +| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/26.1.10909125 | +| ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk/26.1.10909125 | +| ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | diff --git a/images/macos/macos-14-arm64-Readme.md b/images/macos/macos-14-arm64-Readme.md new file mode 100644 index 000000000000..be41235fcc9b --- /dev/null +++ b/images/macos/macos-14-arm64-Readme.md @@ -0,0 +1,190 @@ +# macOS 14 +- OS Version: macOS 14.2.1 (23C71) +- Kernel Version: Darwin 23.2.0 +- Image Version: 20240116.1 + +## Installed Software + +### Language and Runtime +- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.405, 8.0.101 +- Bash 3.2.57(1)-release +- Clang/LLVM 15.0.0 +- Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` +- GCC 11 (Homebrew GCC 11.4.0) - available by `gcc-11` alias +- GCC 12 (Homebrew GCC 12.3.0) - available by `gcc-12` alias +- GCC 13 (Homebrew GCC 13.2.0) - available by `gcc-13` alias +- GNU Fortran 11 (Homebrew GCC 11.4.0) - available by `gfortran-11` alias +- GNU Fortran 12 (Homebrew GCC 12.3.0) - available by `gfortran-12` alias +- GNU Fortran 13 (Homebrew GCC 13.2.0) - available by `gfortran-13` alias +- Julia 1.10.0 +- Kotlin 1.9.22-release-704 +- Mono 6.12.0.188 +- Node.js 18.19.0 +- Perl 5.38.2 +- R 4.3.2 +- Ruby 3.0.6p216 + +### Package Management +- Bundler 2.5.4 +- Carthage 0.39.1 +- CocoaPods 1.14.3 +- Homebrew 4.2.4 +- NPM 10.2.3 +- NuGet 6.3.1.1 +- RubyGems 3.5.4 +- Yarn 1.22.19 + +### Project Management +- Apache Ant 1.10.14 +- Apache Maven 3.9.6 +- Gradle 8.5 + +### Utilities +- 7-Zip 17.05 +- aria2 1.37.0 +- azcopy 10.21.2 +- bazel 7.0.0 +- bazelisk 1.19.0 +- bsdtar 3.5.3 - available by 'tar' alias +- Curl 8.4.0 +- Git 2.43.0 +- Git LFS 3.4.1 +- GitHub CLI 2.42.0 +- GNU Tar 1.35 - available by 'gtar' alias +- GNU Wget 1.21.4 +- gpg (GnuPG) 2.4.3 +- jq 1.7.1 +- OpenSSL 1.1.1w 11 Sep 2023 +- Packer 1.9.4 +- pkg-config 0.29.2 +- yq 4.40.5 +- zstd 1.5.5 + +### Tools +- AWS CLI 2.15.10 +- AWS SAM CLI 1.107.0 +- AWS Session Manager CLI 1.2.553.0 +- Azure CLI 2.56.0 +- Azure CLI (azure-devops) 0.26.0 +- Bicep CLI 0.24.24 +- Cmake 3.28.1 +- CodeQL Action Bundle 2.15.5 +- Fastlane 2.219.0 +- SwiftFormat 0.53.0 +- Xcbeautify 1.4.0 +- Xcode Command Line Tools 15.1.0.0.1.1700200546 +- Xcodes 1.4.1 + +### Linters + +### Browsers +- Safari 17.2.1 (19617.1.17.11.12) +- SafariDriver 17.2.1 (19617.1.17.11.12) +- Google Chrome 120.0.6099.234 +- Google Chrome for Testing 120.0.6099.109 +- ChromeDriver 120.0.6099.109 +- Selenium server 4.16.1 + +#### Environment variables +| Name | Value | +| --------------- | --------------------------------------- | +| CHROMEWEBDRIVER | /usr/local/share/chromedriver-mac-arm64 | +| EDGEWEBDRIVER | | +| GECKOWEBDRIVER | | + +### Java +| Version | Environment Variable | +| --------------------- | -------------------- | +| 11.0.21+9 | JAVA_HOME_11_arm64 | +| 17.0.9+9 | JAVA_HOME_17_arm64 | +| 21.0.1+12.0 (default) | JAVA_HOME_21_arm64 | + +### PowerShell Tools +- PowerShell 7.2.18 + +#### PowerShell Modules +- Az: 11.2.0 +- Pester: 5.5.0 +- PSScriptAnalyzer: 1.21.0 + +### Xcode +| Version | Build | Path | +| ---------------- | ------- | ------------------------------ | +| 15.2 | 15C500b | /Applications/Xcode_15.2.app | +| 15.1 | 15C65 | /Applications/Xcode_15.1.app | +| 15.0.1 (default) | 15A507 | /Applications/Xcode_15.0.1.app | +| 14.3.1 | 14E300c | /Applications/Xcode_14.3.1.app | + +#### Xcode Support Tools +- xcpretty 0.3.0 + +#### Installed SDKs +| SDK | SDK Name | Xcode Version | +| ------------------------------------------------------- | --------------------------------------------- | ------------- | +| macOS 13.3 | macosx13.3 | 14.3.1 | +| macOS 14.0 | macosx14.0 | 15.0.1 | +| macOS 14.2 | macosx14.2 | 15.1, 15.2 | +| iOS 16.4 | iphoneos16.4 | 14.3.1 | +| iOS 17.0 | iphoneos17.0 | 15.0.1 | +| iOS 17.2 | iphoneos17.2 | 15.1, 15.2 | +| Simulator - iOS 16.4 | iphonesimulator16.4 | 14.3.1 | +| Simulator - iOS 17.0 | iphonesimulator17.0 | 15.0.1 | +| Simulator - iOS 17.2 | iphonesimulator17.2 | 15.1, 15.2 | +| tvOS 16.4 | appletvos16.4 | 14.3.1 | +| tvOS 17.0 | appletvos17.0 | 15.0.1 | +| tvOS 17.2 | appletvos17.2 | 15.1, 15.2 | +| Simulator - tvOS 16.4 | appletvsimulator16.4 | 14.3.1 | +| Simulator - tvOS 17.0 | appletvsimulator17.0 | 15.0.1 | +| Simulator - tvOS 17.2 | appletvsimulator17.2 | 15.1, 15.2 | +| watchOS 9.4 | watchos9.4 | 14.3.1 | +| watchOS 10.0 | watchos10.0 | 15.0.1 | +| watchOS 10.2 | watchos10.2 | 15.1, 15.2 | +| Simulator - watchOS 9.4 | watchsimulator9.4 | 14.3.1 | +| Simulator - watchOS 10.0 | watchsimulator10.0 | 15.0.1 | +| Simulator - watchOS 10.2 | watchsimulator10.2 | 15.1, 15.2 | +| visionOS 1.0 | xros1.0 | 15.2 | +| Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | +| Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | +| Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | +| Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | +| DriverKit 22.4 | driverkit22.4 | 14.3.1 | +| DriverKit 23.0 | driverkit23.0 | 15.0.1 | +| DriverKit 23.2 | driverkit23.2 | 15.1, 15.2 | + +#### Installed Simulators +| OS | Xcode Version | Simulators | +| ------------ | -------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| iOS 16.4 | 14.3.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 17.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 17.2 | 14.3.1<br>15.0.1<br>15.1<br>15.2 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| tvOS 16.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 17.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 17.2 | 14.3.1<br>15.0.1<br>15.1<br>15.2 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| watchOS 9.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | +| watchOS 10.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 10.2 | 14.3.1<br>15.0.1<br>15.1<br>15.2 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | +| visionOS 1.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2 | Apple Vision Pro | + +### Android +| Package Name | Version | +| -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 11.0 | +| Android Emulator | 33.1.24 | +| Android SDK Build-tools | 34.0.0<br>33.0.2 | +| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 2)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | +| Android SDK Platform-Tools | 34.0.5 | +| Android Support Repository | 47.0.0 | +| CMake | 3.22.1 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 24.0.8215888<br>25.2.9519653<br>26.1.10909125 (default) | + +#### Environment variables +| Name | Value | +| ----------------------- | --------------------------------------------------- | +| ANDROID_HOME | /Users/runner/Library/Android/sdk | +| ANDROID_NDK | /Users/runner/Library/Android/sdk/ndk/26.1.10909125 | +| ANDROID_NDK_HOME | /Users/runner/Library/Android/sdk/ndk/26.1.10909125 | +| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/26.1.10909125 | +| ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk/26.1.10909125 | +| ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | From 6f1fa8953f71675f26fa8e1e808871f6515e8b81 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 31 Jan 2024 12:37:15 +0000 Subject: [PATCH 2634/3485] Updating readme file for win22 version 20240128.1.1 (#9243) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/windows/Windows2022-Readme.md | 39 ++++++++++++++-------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/images/windows/Windows2022-Readme.md b/images/windows/Windows2022-Readme.md index e7ca6849e35b..08f8eaae0a9c 100644 --- a/images/windows/Windows2022-Readme.md +++ b/images/windows/Windows2022-Readme.md @@ -1,11 +1,10 @@ | Announcements | |-| | [[All OSes] Powershell Core will be updated to 7.4.x LTS on January, 28](https://github.com/actions/runner-images/issues/9115) | -| [Old versions of Android SDK & tools will be removed from images on January, 8](https://github.com/actions/runner-images/issues/8952) | *** # Windows Server 2022 - OS Version: 10.0.20348 Build 2227 -- Image Version: 20240122.1.0 +- Image Version: 20240128.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -34,7 +33,7 @@ - pip 23.3.2 (python 3.9) - Pipx 1.4.3 - RubyGems 3.2.33 -- Vcpkg (build from commit fa6e6a6ec) +- Vcpkg (build from commit 7032c5759) - Yarn 1.22.21 #### Environment variables @@ -53,12 +52,12 @@ - 7zip 23.01 - aria2 1.37.0 - azcopy 10.22.2 -- Bazel 7.0.1 +- Bazel 7.0.2 - Bazelisk 1.19.0 - Bicep 0.24.24 - Cabal 3.10.2.1 - CMake 3.27.9 -- CodeQL Action Bundle 2.16.0 +- CodeQL Action Bundle 2.16.1 - Docker 24.0.7 - Docker Compose v1 1.29.2 - Docker Compose v2 2.23.3 @@ -66,9 +65,9 @@ - ghc 9.8.1 - Git 2.43.0.windows.1 - Git LFS 3.4.0 -- ImageMagick 7.1.1-26 +- ImageMagick 7.1.1-27 - InnoSetup 6.2.2 -- jq 1.7-dirty +- jq 1.7.1 - Kind 0.20.0 - Kubectl 1.29.1 - Mercurial 5.0 @@ -79,7 +78,7 @@ - NSIS 3.09 - OpenSSL 1.1.1w - Packer 1.10.0 -- Pulumi 3.102.0 +- Pulumi 3.103.1 - R 4.3.2 - Service Fabric SDK 9.1.1436.9590 - Stack 2.13.1 @@ -92,9 +91,9 @@ - zstd 1.5.5 ### CLI Tools -- Alibaba Cloud CLI 3.0.196 -- AWS CLI 2.15.12 -- AWS SAM CLI 1.107.0 +- Alibaba Cloud CLI 3.0.197 +- AWS CLI 2.15.15 +- AWS SAM CLI 1.108.0 - AWS Session Manager CLI 1.2.553.0 - Azure CLI 2.56.0 - Azure DevOps CLI extension 0.26.0 @@ -115,14 +114,14 @@ - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 120.0.6099.225 -- Chrome Driver 120.0.6099.109 -- Microsoft Edge 120.0.2210.144 -- Microsoft Edge Driver 120.0.2210.144 -- Mozilla Firefox 121.0.1 +- Google Chrome 121.0.6167.86 +- Chrome Driver 121.0.6167.85 +- Microsoft Edge 121.0.2277.83 +- Microsoft Edge Driver 121.0.2277.83 +- Mozilla Firefox 122.0 - Gecko Driver 0.34.0 - IE Driver 4.14.0.0 -- Selenium server 4.16.0 +- Selenium server 4.17.0 #### Environment variables | Name | Value | @@ -209,7 +208,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | 5.0.24.0 | MongoDB | Stopped | Disabled | ### Database tools -- Azure CosmosDb Emulator 2.14.12.0 +- Azure CosmosDb Emulator 2.14.16.0 - DacFx 162.1.172.1 - MySQL 8.0.36.0 - SQL OLEDB Driver 18.6.7.0 @@ -558,7 +557,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - nbgv 3.6.133+2d32d93cb1 ### PowerShell Tools -- PowerShell 7.2.18 +- PowerShell 7.4.1 #### Powershell Modules - Az: 9.3.0 @@ -567,7 +566,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Az (Cached): 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.498 +- AWSPowershell: 4.1.503 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 - Microsoft.Graph: 2.12.0 From 9547a10a19b7e110887d706c1a12facb61b23b13 Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Wed, 31 Jan 2024 14:44:38 +0100 Subject: [PATCH 2635/3485] [Windows] Visual Studio 2022 signature updated (#9261) --- images/windows/toolsets/toolset-2022.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/windows/toolsets/toolset-2022.json b/images/windows/toolsets/toolset-2022.json index f95c2f4896cf..c12e5001cf47 100644 --- a/images/windows/toolsets/toolset-2022.json +++ b/images/windows/toolsets/toolset-2022.json @@ -176,7 +176,7 @@ "subversion" : "17", "edition" : "Enterprise", "channel": "release", - "signature": "C2048FB509F1C37A8C3E9EC6648118458AA01780", + "signature": "F9A7CF9FBE13BAC767F4781061332DA6E8B4E0EE", "workloads": [ "Component.Dotfuscator", "Component.Linux.CMake", From 218c157acc53e24d295ac18df7fa18dc6246c8e1 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 31 Jan 2024 15:54:28 +0000 Subject: [PATCH 2636/3485] Updating readme file for win19 version 20240128.1.1 (#9247) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/windows/Windows2019-Readme.md | 41 ++++++++++++++-------------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/images/windows/Windows2019-Readme.md b/images/windows/Windows2019-Readme.md index 6d3b6c32437a..8593acea60a1 100644 --- a/images/windows/Windows2019-Readme.md +++ b/images/windows/Windows2019-Readme.md @@ -1,11 +1,10 @@ | Announcements | |-| | [[All OSes] Powershell Core will be updated to 7.4.x LTS on January, 28](https://github.com/actions/runner-images/issues/9115) | -| [Old versions of Android SDK & tools will be removed from images on January, 8](https://github.com/actions/runner-images/issues/8952) | *** # Windows Server 2019 - OS Version: 10.0.17763 Build 5329 -- Image Version: 20240122.1.0 +- Image Version: 20240128.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -34,7 +33,7 @@ - pip 23.3.2 (python 3.7) - Pipx 1.2.1 - RubyGems 2.7.6.3 -- Vcpkg (build from commit fa6e6a6ec) +- Vcpkg (build from commit 7032c5759) - Yarn 1.22.21 #### Environment variables @@ -53,12 +52,12 @@ - 7zip 23.01 - aria2 1.37.0 - azcopy 10.22.2 -- Bazel 7.0.1 +- Bazel 7.0.2 - Bazelisk 1.19.0 - Bicep 0.24.24 - Cabal 3.10.2.1 - CMake 3.27.9 -- CodeQL Action Bundle 2.16.0 +- CodeQL Action Bundle 2.16.1 - Docker 24.0.7 - Docker Compose v1 1.29.2 - Docker Compose v2 2.23.3 @@ -66,10 +65,10 @@ - ghc 9.8.1 - Git 2.43.0.windows.1 - Git LFS 3.4.0 -- Google Cloud CLI 460.0.0 -- ImageMagick 7.1.1-26 +- Google Cloud CLI 461.0.0 +- ImageMagick 7.1.1-27 - InnoSetup 6.2.2 -- jq 1.7-dirty +- jq 1.7.1 - Kind 0.20.0 - Kubectl 1.29.1 - Mercurial 5.0 @@ -81,7 +80,7 @@ - OpenSSL 1.1.1w - Packer 1.10.0 - Parcel 2.11.0 -- Pulumi 3.102.0 +- Pulumi 3.103.1 - R 4.3.2 - Service Fabric SDK 9.1.1436.9590 - Stack 2.13.1 @@ -94,9 +93,9 @@ - zstd 1.5.5 ### CLI Tools -- Alibaba Cloud CLI 3.0.196 -- AWS CLI 2.15.12 -- AWS SAM CLI 1.107.0 +- Alibaba Cloud CLI 3.0.197 +- AWS CLI 2.15.15 +- AWS SAM CLI 1.108.0 - AWS Session Manager CLI 1.2.553.0 - Azure CLI 2.56.0 - Azure DevOps CLI extension 0.26.0 @@ -118,14 +117,14 @@ - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 120.0.6099.225 -- Chrome Driver 120.0.6099.109 -- Microsoft Edge 120.0.2210.144 -- Microsoft Edge Driver 120.0.2210.144 -- Mozilla Firefox 121.0.1 +- Google Chrome 121.0.6167.86 +- Chrome Driver 121.0.6167.85 +- Microsoft Edge 121.0.2277.83 +- Microsoft Edge Driver 121.0.2277.83 +- Mozilla Firefox 122.0 - Gecko Driver 0.34.0 - IE Driver 4.14.0.0 -- Selenium server 4.16.0 +- Selenium server 4.17.0 #### Environment variables | Name | Value | @@ -218,7 +217,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | 5.0.24.0 | MongoDB | Stopped | Disabled | ### Database tools -- Azure CosmosDb Emulator 2.14.12.0 +- Azure CosmosDb Emulator 2.14.16.0 - DacFx 162.1.172.1 - MySQL 5.7.44.0 - SQL OLEDB Driver 18.6.7.0 @@ -504,7 +503,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - nbgv 3.6.133+2d32d93cb1 ### PowerShell Tools -- PowerShell 7.2.18 +- PowerShell 7.4.1 #### Powershell Modules - Az: 9.3.0 @@ -513,7 +512,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Az (Cached): 1.0.0.zip, 1.6.0.zip, 2.3.2.zip, 2.6.0.zip, 3.1.0.zip, 3.5.0.zip, 3.8.0.zip, 4.3.0.zip, 4.4.0.zip, 4.7.0.zip, 5.5.0.zip, 5.9.0.zip, 6.6.0.zip, 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.498 +- AWSPowershell: 4.1.503 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 - Microsoft.Graph: 2.12.0 From 5a9870800dc54127d22ee36c303b47314d231c69 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 31 Jan 2024 22:58:21 +0000 Subject: [PATCH 2637/3485] Updating readme file for ubuntu22 version 20240126.1.1 (#9245) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2204-Readme.md | 71 +++++++++++++++--------------- 1 file changed, 35 insertions(+), 36 deletions(-) diff --git a/images/ubuntu/Ubuntu2204-Readme.md b/images/ubuntu/Ubuntu2204-Readme.md index f4a9acf8c6c8..027f472eba63 100644 --- a/images/ubuntu/Ubuntu2204-Readme.md +++ b/images/ubuntu/Ubuntu2204-Readme.md @@ -1,13 +1,12 @@ | Announcements | |-| | [[All OSes] Powershell Core will be updated to 7.4.x LTS on January, 28](https://github.com/actions/runner-images/issues/9115) | -| [Old versions of Android SDK & tools will be removed from images on January, 8](https://github.com/actions/runner-images/issues/8952) | *** # Ubuntu 22.04 - OS Version: 22.04.3 LTS -- Kernel Version: 6.2.0-1018-azure -- Image Version: 20240122.3.0 -- Systemd version: 249.11-0ubuntu3.11 +- Kernel Version: 6.2.0-1019-azure +- Image Version: 20240126.1.0 +- Systemd version: 249.11-0ubuntu3.12 ## Installed Software @@ -40,7 +39,7 @@ - Pip3 22.0.2 - Pipx 1.4.3 - RubyGems 3.3.5 -- Vcpkg (build from commit fa6e6a6ec) +- Vcpkg (build from commit 7032c5759) - Yarn 1.22.21 #### Environment variables @@ -64,13 +63,13 @@ to accomplish this. ### Tools - Ansible 2.16.2 - apt-fast 1.10.0 -- AzCopy 10.21.2 - available by `azcopy` and `azcopy10` aliases -- Bazel 7.0.1 +- AzCopy 10.22.2 - available by `azcopy` and `azcopy10` aliases +- Bazel 7.0.2 - Bazelisk 1.19.0 - Bicep 0.24.24 - Buildah 1.23.1 - CMake 3.28.1 -- CodeQL Action Bundle 2.16.0 +- CodeQL Action Bundle 2.16.1 - Docker Amazon ECR Credential Helper 0.7.1 - Docker Compose v1 1.29.2 - Docker Compose v2 2.23.3 @@ -87,48 +86,48 @@ to accomplish this. - Kind 0.20.0 - Kubectl 1.29.1 - Kustomize 5.3.0 -- Leiningen 2.10.0 +- Leiningen 2.11.0 - MediaInfo 21.09 - Mercurial 6.1.1 - Minikube 1.32.0 - n 9.2.0 - Newman 6.1.0 - nvm 0.39.7 -- OpenSSL 3.0.2-0ubuntu1.12 +- OpenSSL 3.0.2-0ubuntu1.13 - Packer 1.10.0 - Parcel 2.11.0 - Podman 3.4.4 -- Pulumi 3.102.0 +- Pulumi 3.103.1 - R 4.3.2 - Skopeo 1.4.1 - Sphinx Open Source Search Server 2.2.11 - SVN 1.14.1 -- Terraform 1.7.0 +- Terraform 1.7.1 - yamllint 1.33.0 - yq 4.40.5 - zstd 1.5.5 ### CLI Tools -- Alibaba Cloud CLI 3.0.196 -- AWS CLI 2.15.12 +- Alibaba Cloud CLI 3.0.197 +- AWS CLI 2.15.15 - AWS CLI Session Manager Plugin 1.2.553.0 -- AWS SAM CLI 1.107.0 +- AWS SAM CLI 1.108.0 - Azure CLI 2.56.0 - Azure CLI (azure-devops) 0.26.0 - GitHub CLI 2.42.1 -- Google Cloud CLI 460.0.0 -- Netlify CLI 17.15.2 -- OpenShift CLI 4.14.9 +- Google Cloud CLI 461.0.0 +- Netlify CLI 17.15.3 +- OpenShift CLI 4.14.10 - ORAS CLI 1.1.0 -- Vercel CLI 33.2.0 +- Vercel CLI 33.3.0 ### Java | Version | Environment Variable | | ------------------- | -------------------- | -| 8.0.392+8 | JAVA_HOME_8_X64 | -| 11.0.21+9 (default) | JAVA_HOME_11_X64 | -| 17.0.9+9 | JAVA_HOME_17_X64 | -| 21.0.1+12 | JAVA_HOME_21_X64 | +| 8.0.402+6 | JAVA_HOME_8_X64 | +| 11.0.22+7 (default) | JAVA_HOME_11_X64 | +| 17.0.10+7 | JAVA_HOME_17_X64 | +| 21.0.2+13 | JAVA_HOME_21_X64 | ### PHP Tools - PHP: 8.1.2 @@ -159,12 +158,12 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 120.0.6099.224 -- ChromeDriver 120.0.6099.109 -- Chromium 120.0.6099.0 -- Microsoft Edge 120.0.2210.144 -- Microsoft Edge WebDriver 120.0.2210.144 -- Selenium server 4.16.1 +- Google Chrome 121.0.6167.85 +- ChromeDriver 121.0.6167.85 +- Chromium 121.0.6167.0 +- Microsoft Edge 121.0.2277.83 +- Microsoft Edge WebDriver 121.0.2277.83 +- Selenium server 4.17.0 - Mozilla Firefox 122.0 - Geckodriver 0.34.0 @@ -234,7 +233,7 @@ Use the following command as a part of your job to start the service: 'sudo syst - 3.1.4 ### PowerShell Tools -- PowerShell 7.2.18 +- PowerShell 7.4.1 #### PowerShell Modules - Az: 9.3.0 @@ -274,18 +273,18 @@ Use the following command as a part of your job to start the service: 'sudo syst ### Cached Docker images | Repository:Tag | Digest | Created | | -------------------- | ------------------------------------------------------------------------ | ---------- | -| alpine:3.16 | sha256:e4cdb7d47b06ba0a062ad2a97a7d154967c8f83934594d9f2bd3efa89292996b | 2023-11-30 | -| alpine:3.17 | sha256:6e94b5cda2d6fd57d85abf81e81dabaea97a5885f919da676cc19d3551da4061 | 2023-11-30 | -| alpine:3.18 | sha256:34871e7290500828b39e22294660bee86d966bc0017544e848dd9a255cdf59e0 | 2023-11-30 | +| alpine:3.16 | sha256:452e7292acee0ee16c332324d7de05fa2c99f9994ecc9f0779c602916a672ae4 | 2024-01-27 | +| alpine:3.17 | sha256:53cf9478b76f4c8fae126acbdfb79bed6e69e628faff572ebe4a029d3d247d98 | 2024-01-27 | +| alpine:3.18 | sha256:11e21d7b981a59554b3f822c49f6e9f57b6068bb74f49c4cd5cc4c663c7e5160 | 2024-01-27 | | debian:10 | sha256:defa5d214292f2aaf7905d3e4bcdf8f628019feb63e7c8746df563d1a941f8d7 | 2024-01-11 | | debian:11 | sha256:71cb300d5448af821aedfe63afd55ba05f45a6a79f00dcd131b96b780bb99fe4 | 2024-01-11 | | moby/buildkit:latest | sha256:5a8f30813a104b86e927ff4695a746f74a5bb921c7be1dbcca6d754dfbe04822 | 2023-12-01 | | node:16 | sha256:f77a1aef2da8d83e45ec990f45df50f1a286c5fe8bbfb8c6e4246c6389705c0b | 2023-09-07 | | node:16-alpine | sha256:a1f9d027912b58a7c75be7716c97cfbc6d3099f3a97ed84aa490be9dee20e787 | 2023-08-10 | | node:18 | sha256:995a5f4314885452a4a785abc25a0fec40e26c346559e11e709d58bb7a927cf4 | 2024-01-17 | -| node:18-alpine | sha256:b1a0356f7d6b86c958a06949d3db3f7fb27f95f627aa6157cb98bc65c801efa2 | 2023-12-11 | +| node:18-alpine | sha256:0085670310d2879621f96a4216c893f92e2ded827e9e6ef8437672e1bd72f437 | 2024-01-27 | | node:20 | sha256:ffebb4405810c92d267a764b21975fb2d96772e41877248a37bf3abaa0d3b590 | 2024-01-17 | -| node:20-alpine | sha256:8e6a472eb9742f4f486ca9ef13321b7fc2e54f2f60814f339eeda2aff3037573 | 2024-01-10 | +| node:20-alpine | sha256:2f46fd49c767554c089a5eb219115313b72748d8f62f5eccb58ef52bc36db4ad | 2024-01-27 | | ubuntu:20.04 | sha256:f2034e7195f61334e6caff6ecf2e965f92d11e888309065da85ff50c617732b8 | 2023-12-13 | | ubuntu:22.04 | sha256:e6173d4dc55e76b87c4af8db8821b1feae4146dd47341e4d431118c7dd060a74 | 2024-01-11 | @@ -334,7 +333,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | libmagickwand-dev | 8:6.9.11.60+dfsg-1.3ubuntu0.22.04.3 | | libsecret-1-dev | 0.20.5-2 | | libsqlite3-dev | 3.37.2-2ubuntu0.3 | -| libssl-dev | 3.0.2-0ubuntu1.12 | +| libssl-dev | 3.0.2-0ubuntu1.13 | | libtool | 2.4.6-15build2 | | libunwind8 | 1.3.2-2build2.1 | | libxkbfile-dev | 1:1.1.0-1build3 | From 36b3a6c45887eba2e55a5ef19803814d22686740 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 1 Feb 2024 10:15:40 +0000 Subject: [PATCH 2638/3485] Updating readme file for ubuntu20 version 20240126.1.1 (#9244) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2004-Readme.md | 61 +++++++++++++++--------------- 1 file changed, 30 insertions(+), 31 deletions(-) diff --git a/images/ubuntu/Ubuntu2004-Readme.md b/images/ubuntu/Ubuntu2004-Readme.md index 3e262999faec..652315600dae 100644 --- a/images/ubuntu/Ubuntu2004-Readme.md +++ b/images/ubuntu/Ubuntu2004-Readme.md @@ -1,12 +1,11 @@ | Announcements | |-| | [[All OSes] Powershell Core will be updated to 7.4.x LTS on January, 28](https://github.com/actions/runner-images/issues/9115) | -| [Old versions of Android SDK & tools will be removed from images on January, 8](https://github.com/actions/runner-images/issues/8952) | *** # Ubuntu 20.04 - OS Version: 20.04.6 LTS -- Kernel Version: 5.15.0-1053-azure -- Image Version: 20240122.3.0 +- Kernel Version: 5.15.0-1054-azure +- Image Version: 20240126.1.0 - Systemd version: 245.4-4ubuntu3.23 ## Installed Software @@ -42,7 +41,7 @@ - Pip3 20.0.2 - Pipx 1.4.3 - RubyGems 3.1.2 -- Vcpkg (build from commit fa6e6a6ec) +- Vcpkg (build from commit 7032c5759) - Yarn 1.22.21 #### Environment variables @@ -69,13 +68,13 @@ to accomplish this. ### Tools - Ansible 2.13.13 - apt-fast 1.10.0 -- AzCopy 10.21.2 - available by `azcopy` and `azcopy10` aliases -- Bazel 7.0.1 +- AzCopy 10.22.2 - available by `azcopy` and `azcopy10` aliases +- Bazel 7.0.2 - Bazelisk 1.19.0 - Bicep 0.24.24 - Buildah 1.22.3 - CMake 3.28.1 -- CodeQL Action Bundle 2.16.0 +- CodeQL Action Bundle 2.16.1 - Docker Amazon ECR Credential Helper 0.7.1 - Docker Compose v1 1.29.2 - Docker Compose v2 2.23.3 @@ -105,37 +104,37 @@ to accomplish this. - Parcel 2.11.0 - PhantomJS 2.1.1 2.1.1 - Podman 3.4.2 -- Pulumi 3.102.0 +- Pulumi 3.103.1 - R 4.3.2 - Skopeo 1.5.0 - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 -- Terraform 1.7.0 +- Terraform 1.7.1 - yamllint 1.33.0 - yq 4.40.5 - zstd 1.5.5 ### CLI Tools - Alibaba Cloud CLI 3.0.174 -- AWS CLI 2.15.12 +- AWS CLI 2.15.15 - AWS CLI Session Manager Plugin 1.2.553.0 -- AWS SAM CLI 1.107.0 +- AWS SAM CLI 1.108.0 - Azure CLI 2.56.0 - Azure CLI (azure-devops) 0.26.0 - GitHub CLI 2.42.1 -- Google Cloud CLI 460.0.0 -- Netlify CLI 17.15.2 -- OpenShift CLI 4.14.9 +- Google Cloud CLI 461.0.0 +- Netlify CLI 17.15.3 +- OpenShift CLI 4.14.10 - ORAS CLI 1.1.0 -- Vercel CLI 33.2.0 +- Vercel CLI 33.3.0 ### Java | Version | Environment Variable | | ------------------- | -------------------- | -| 8.0.392+8 | JAVA_HOME_8_X64 | -| 11.0.21+9 (default) | JAVA_HOME_11_X64 | -| 17.0.9+9 | JAVA_HOME_17_X64 | -| 21.0.1+12 | JAVA_HOME_21_X64 | +| 8.0.402+6 | JAVA_HOME_8_X64 | +| 11.0.22+7 (default) | JAVA_HOME_11_X64 | +| 17.0.10+7 | JAVA_HOME_17_X64 | +| 21.0.2+13 | JAVA_HOME_21_X64 | ### PHP Tools - PHP: 7.4.33, 8.0.30, 8.1.27, 8.2.15, 8.3.2 @@ -166,12 +165,12 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 120.0.6099.224 -- ChromeDriver 120.0.6099.109 -- Chromium 120.0.6099.0 -- Microsoft Edge 120.0.2210.144 -- Microsoft Edge WebDriver 120.0.2210.144 -- Selenium server 4.16.1 +- Google Chrome 121.0.6167.85 +- ChromeDriver 121.0.6167.85 +- Chromium 121.0.6167.0 +- Microsoft Edge 121.0.2277.83 +- Microsoft Edge WebDriver 121.0.2277.83 +- Selenium server 4.17.0 - Mozilla Firefox 122.0 - Geckodriver 0.34.0 @@ -248,7 +247,7 @@ Use the following command as a part of your job to start the service: 'sudo syst - 3.1.4 ### PowerShell Tools -- PowerShell 7.2.18 +- PowerShell 7.4.1 #### PowerShell Modules - Az: 9.3.0 @@ -290,9 +289,9 @@ Use the following command as a part of your job to start the service: 'sudo syst ### Cached Docker images | Repository:Tag | Digest | Created | | -------------------- | ------------------------------------------------------------------------ | ---------- | -| alpine:3.16 | sha256:e4cdb7d47b06ba0a062ad2a97a7d154967c8f83934594d9f2bd3efa89292996b | 2023-11-30 | -| alpine:3.17 | sha256:6e94b5cda2d6fd57d85abf81e81dabaea97a5885f919da676cc19d3551da4061 | 2023-11-30 | -| alpine:3.18 | sha256:34871e7290500828b39e22294660bee86d966bc0017544e848dd9a255cdf59e0 | 2023-11-30 | +| alpine:3.16 | sha256:452e7292acee0ee16c332324d7de05fa2c99f9994ecc9f0779c602916a672ae4 | 2024-01-27 | +| alpine:3.17 | sha256:53cf9478b76f4c8fae126acbdfb79bed6e69e628faff572ebe4a029d3d247d98 | 2024-01-27 | +| alpine:3.18 | sha256:11e21d7b981a59554b3f822c49f6e9f57b6068bb74f49c4cd5cc4c663c7e5160 | 2024-01-27 | | debian:10 | sha256:defa5d214292f2aaf7905d3e4bcdf8f628019feb63e7c8746df563d1a941f8d7 | 2024-01-11 | | debian:11 | sha256:71cb300d5448af821aedfe63afd55ba05f45a6a79f00dcd131b96b780bb99fe4 | 2024-01-11 | | debian:9 | sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be | 2022-06-23 | @@ -300,9 +299,9 @@ Use the following command as a part of your job to start the service: 'sudo syst | node:16 | sha256:f77a1aef2da8d83e45ec990f45df50f1a286c5fe8bbfb8c6e4246c6389705c0b | 2023-09-07 | | node:16-alpine | sha256:a1f9d027912b58a7c75be7716c97cfbc6d3099f3a97ed84aa490be9dee20e787 | 2023-08-10 | | node:18 | sha256:995a5f4314885452a4a785abc25a0fec40e26c346559e11e709d58bb7a927cf4 | 2024-01-17 | -| node:18-alpine | sha256:b1a0356f7d6b86c958a06949d3db3f7fb27f95f627aa6157cb98bc65c801efa2 | 2023-12-11 | +| node:18-alpine | sha256:0085670310d2879621f96a4216c893f92e2ded827e9e6ef8437672e1bd72f437 | 2024-01-27 | | node:20 | sha256:ffebb4405810c92d267a764b21975fb2d96772e41877248a37bf3abaa0d3b590 | 2024-01-17 | -| node:20-alpine | sha256:8e6a472eb9742f4f486ca9ef13321b7fc2e54f2f60814f339eeda2aff3037573 | 2024-01-10 | +| node:20-alpine | sha256:2f46fd49c767554c089a5eb219115313b72748d8f62f5eccb58ef52bc36db4ad | 2024-01-27 | | ubuntu:20.04 | sha256:f2034e7195f61334e6caff6ecf2e965f92d11e888309065da85ff50c617732b8 | 2023-12-13 | ### Installed apt packages From 03c4d84bba93f509162bcd6e041a98f377c1677f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 1 Feb 2024 11:10:15 +0000 Subject: [PATCH 2639/3485] Updating readme file for macOS-12 version 20240127.1 (#9246) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-12-Readme.md | 49 ++++++++++++++++----------------- 1 file changed, 24 insertions(+), 25 deletions(-) diff --git a/images/macos/macos-12-Readme.md b/images/macos/macos-12-Readme.md index 5aeae712a0db..ead752588fe5 100644 --- a/images/macos/macos-12-Readme.md +++ b/images/macos/macos-12-Readme.md @@ -1,12 +1,11 @@ | Announcements | |-| | [[All OSes] Powershell Core will be updated to 7.4.x LTS on January, 28](https://github.com/actions/runner-images/issues/9115) | -| [Old versions of Android SDK & tools will be removed from images on January, 8](https://github.com/actions/runner-images/issues/8952) | *** # macOS 12 -- OS Version: macOS 12.7.2 (21G1974) +- OS Version: macOS 12.7.3 (21H1015) - Kernel Version: Darwin 21.6.0 -- Image Version: 20240119.1 +- Image Version: 20240127.1 ## Installed Software @@ -41,7 +40,7 @@ - Carthage 0.39.1 - CocoaPods 1.14.3 - Composer 2.6.6 -- Homebrew 4.2.4 +- Homebrew 4.2.5 - Miniconda 23.11.0 - NPM 10.2.3 - NuGet 6.3.1.1 @@ -49,7 +48,7 @@ - Pip3 23.3.2 (python 3.12) - Pipx 1.4.3 - RubyGems 3.5.5 -- Vcpkg 2024 (build from commit a1a1cbc97) +- Vcpkg 2024 (build from commit 7032c5759) - Yarn 1.22.19 #### Environment variables @@ -67,8 +66,8 @@ ### Utilities - 7-Zip 17.05 - aria2 1.37.0 -- azcopy 10.21.2 -- bazel 7.0.1 +- azcopy 10.22.2 +- bazel 7.0.2 - bazelisk 1.19.0 - bsdtar 3.5.1 - available by 'tar' alias - Curl 8.5.0 @@ -77,8 +76,8 @@ - GitHub CLI 2.42.1 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.21.4 -- gpg (GnuPG) 2.4.3 -- ImageMagick 7.1.1-26 +- gpg (GnuPG) 2.4.4 +- ImageMagick 7.1.1-27 - jq 1.7.1 - mongo 5.0.21 - mongod 5.0.21 @@ -90,22 +89,22 @@ - Sox 14.4.2 - Subversion (SVN) 1.14.3 - Switchaudio-osx 1.2.2 -- Vagrant 2.4.0 +- Vagrant 2.4.1 - VirtualBox 6.1.38r153438 - yq 4.40.5 - zstd 1.5.5 ### Tools - App Center CLI 2.14.0 -- AWS CLI 2.15.12 -- AWS SAM CLI 1.107.0 +- AWS CLI 2.15.15 +- AWS SAM CLI 1.108.0 - AWS Session Manager CLI 1.2.553.0 - Azure CLI 2.56.0 - Azure CLI (azure-devops) 0.26.0 - Bicep CLI 0.24.24 - Cabal 3.10.2.1 - Cmake 3.28.1 -- CodeQL Action Bundle 2.16.0 +- CodeQL Action Bundle 2.16.1 - Colima 0.6.7 - Fastlane 2.219.0 - GHC 9.8.1 @@ -123,16 +122,16 @@ - Yamllint 1.33.0 ### Browsers -- Safari 17.2.1 (17617.1.17.11.12) -- SafariDriver 17.2.1 (17617.1.17.11.12) -- Google Chrome 120.0.6099.234 -- Google Chrome for Testing 120.0.6099.109 -- ChromeDriver 120.0.6099.109 -- Microsoft Edge 120.0.2210.144 -- Microsoft Edge WebDriver 120.0.2210.144 -- Mozilla Firefox 121.0.1 +- Safari 17.3 (17617.2.4.11.9) +- SafariDriver 17.3 (17617.2.4.11.9) +- Google Chrome 121.0.6167.85 +- Google Chrome for Testing 121.0.6167.85 +- ChromeDriver 121.0.6167.85 +- Microsoft Edge 121.0.2277.83 +- Microsoft Edge WebDriver 121.0.2277.83 +- Mozilla Firefox 122.0 - geckodriver 0.34.0 -- Selenium server 4.16.1 +- Selenium server 4.17.0 #### Environment variables | Name | Value | @@ -145,7 +144,7 @@ | Version | Environment Variable | | ------------------- | -------------------- | | 8.0.402+6 (default) | JAVA_HOME_8_X64 | -| 11.0.21+9 | JAVA_HOME_11_X64 | +| 11.0.22+7 | JAVA_HOME_11_X64 | | 17.0.10+7 | JAVA_HOME_17_X64 | | 21.0.2+13.0 | JAVA_HOME_21_X64 | @@ -196,7 +195,7 @@ - Rustfmt 1.7.0-stable ### PowerShell Tools -- PowerShell 7.2.18 +- PowerShell 7.4.1 #### PowerShell Modules - Az: 11.2.0 @@ -359,7 +358,7 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" - libXext 1.3.5 - libXft 2.3.8 - Tcl/Tk 8.6.13_5 -- Zlib 1.3 +- Zlib 1.3.1 #### Environment variables | Name | Value | From ee179c70f28b176d59e21baf9c68c3446c177e5f Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Thu, 1 Feb 2024 13:46:06 +0100 Subject: [PATCH 2640/3485] [Ubuntu] Update Docker installer script (#9232) --- images/ubuntu/scripts/build/install-docker.sh | 44 ++++++++++--------- images/ubuntu/scripts/tests/Tools.Tests.ps1 | 23 ++++++++-- images/ubuntu/toolsets/toolset-2004.json | 33 +++++++++++--- images/ubuntu/toolsets/toolset-2204.json | 33 +++++++++++--- 4 files changed, 94 insertions(+), 39 deletions(-) diff --git a/images/ubuntu/scripts/build/install-docker.sh b/images/ubuntu/scripts/build/install-docker.sh index 73ed38e57b81..8c759d8df4f9 100644 --- a/images/ubuntu/scripts/build/install-docker.sh +++ b/images/ubuntu/scripts/build/install-docker.sh @@ -2,7 +2,7 @@ ################################################################################ ## File: install-docker.sh ## Desc: Install docker onto the image -## Supply chain security: Docker Compose v2, amazon-ecr-credential-helper - checksum validation +## Supply chain security: amazon-ecr-credential-helper - dynamic checksum validation ################################################################################ # Source the helpers for use with the script @@ -17,34 +17,36 @@ curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o $GPG_ echo "deb [arch=amd64 signed-by=$GPG_KEY] $REPO_URL ${os_codename} stable" > $REPO_PATH apt-get update -for pkg in containerd.io docker-ce-cli docker-ce docker-buildx-plugin; do - version=$(get_toolset_value ".docker.components.\"$pkg\"") +# Install docker components which available via apt-get +# Using toolsets keep installation order to install dependencies before the package in order to control versions + +components=$(get_toolset_value '.docker.components[] .package') +for package in $components; do + version=$(get_toolset_value ".docker.components[] | select(.package == \"$package\") | .version") if [[ $version == "latest" ]]; then - components_to_install+="${pkg} " + apt-get install -y --no-install-recommends "$package" else - version_string=$(apt-cache madison "${pkg}" | awk '{ print $3 }' | grep "${version}" | grep "${os_codename}" | head -1) - components_to_install+="${pkg}=${version_string} " + version_string=$(apt-cache madison "$package" | awk '{ print $3 }' | grep "$version" | grep "$os_codename" | head -1) + apt-get install -y --no-install-recommends "${package}=${version_string}" fi done -apt-get install -y --no-install-recommends $components_to_install - -# Download docker compose v2 from releases -# Temporaty pinned to v2.23.3 due https://github.com/actions/runner-images/issues/9172 -compose_version=$(get_toolset_value ".docker.components.compose") -URL=$(resolve_github_release_asset_url "docker/compose" "endswith(\"compose-linux-x86_64\")" "${compose_version}") -compose_binary_path=$(download_with_retry "${URL}" "/tmp/docker-compose-v2") -# Supply chain security - Docker Compose v2 -compose_hash_url=$(resolve_github_release_asset_url "docker/compose" "endswith(\"checksums.txt\")" "${compose_version}") -compose_external_hash=$(get_checksum_from_url "${compose_hash_url}" "compose-linux-x86_64" "SHA256") -use_checksum_comparison "${compose_binary_path}" "${compose_external_hash}" - -# Install docker compose v2 -install "${compose_binary_path}" /usr/libexec/docker/cli-plugins/docker-compose +# Install plugins that are best installed from the GitHub repository +# Be aware that `url` built from github repo name and plugin name because of current repo naming for those plugins + +plugins=$(get_toolset_value '.docker.plugins[] .plugin') +for plugin in $plugins; do + version=$(get_toolset_value ".docker.plugins[] | select(.plugin == \"$plugin\") | .version") + filter=$(get_toolset_value ".docker.plugins[] | select(.plugin == \"$plugin\") | .asset") + url=$(resolve_github_release_asset_url "docker/$plugin" "endswith(\"$filter\")" "$version") + binary_path=$(download_with_retry "$url" "/tmp/docker-$plugin") + mkdir -pv "/usr/libexec/docker/cli-plugins" + install "$binary_path" "/usr/libexec/docker/cli-plugins/docker-$plugin" +done # docker from official repo introduced different GID generation: https://github.com/actions/runner-images/issues/8157 gid=$(cut -d ":" -f 3 /etc/group | grep "^1..$" | sort -n | tail -n 1 | awk '{ print $1+1 }') -groupmod -g $gid docker +groupmod -g "$gid" docker chgrp -hR docker /run/docker.sock # Enable docker.service diff --git a/images/ubuntu/scripts/tests/Tools.Tests.ps1 b/images/ubuntu/scripts/tests/Tools.Tests.ps1 index 3e42763fce76..a58f052e9dfe 100644 --- a/images/ubuntu/scripts/tests/Tools.Tests.ps1 +++ b/images/ubuntu/scripts/tests/Tools.Tests.ps1 @@ -65,16 +65,31 @@ Describe "Rust" { } Describe "Docker" { - It "docker" { - "docker --version" | Should -ReturnZeroExitCode + It "docker client" { + $version=(Get-ToolsetContent).docker.components | Where-Object { $_.package -eq 'docker-ce-cli' } | Select-Object -ExpandProperty version + If ($version -ne "latest") { + $(docker version --format '{{.Client.Version}}') | Should -BeLike "*$version*" + }else{ + "docker version --format '{{.Client.Version}}'" | Should -ReturnZeroExitCode + } } It "docker buildx" { - "docker buildx" | Should -ReturnZeroExitCode + $version=(Get-ToolsetContent).docker.plugins | Where-Object { $_.plugin -eq 'buildx' } | Select-Object -ExpandProperty version + If ($version -ne "latest") { + $(docker buildx version) | Should -BeLike "*$version*" + }else{ + "docker buildx" | Should -ReturnZeroExitCode + } } It "docker compose v2" { - "docker compose" | Should -ReturnZeroExitCode + $version=(Get-ToolsetContent).docker.plugins | Where-Object { $_.plugin -eq 'compose' } | Select-Object -ExpandProperty version + If ($version -ne "latest") { + $(docker compose version --short) | Should -BeLike "*$version*" + }else{ + "docker compose version --short" | Should -ReturnZeroExitCode + } } It "docker-credential-ecr-login" { diff --git a/images/ubuntu/toolsets/toolset-2004.json b/images/ubuntu/toolsets/toolset-2004.json index bbf28474d172..203e620ac261 100644 --- a/images/ubuntu/toolsets/toolset-2004.json +++ b/images/ubuntu/toolsets/toolset-2004.json @@ -237,13 +237,32 @@ "node:20-alpine", "ubuntu:20.04" ], - "components": { - "docker-ce": "24.0.7", - "docker-ce-cli": "24.0.7", - "containerd.io": "latest", - "docker-buildx-plugin": "latest", - "compose": "2.23.3" - } + "components": [ + { + "package": "containerd.io", + "version": "latest" + }, + { + "package": "docker-ce-cli", + "version": "24.0.7" + }, + { + "package": "docker-ce", + "version": "24.0.7" + } + ], + "plugins": [ + { + "plugin": "buildx", + "version": "latest", + "asset": "linux-amd64" + }, + { + "plugin": "compose", + "version": "2.23.3", + "asset": "linux-x86_64" + } + ] }, "pipx": [ { diff --git a/images/ubuntu/toolsets/toolset-2204.json b/images/ubuntu/toolsets/toolset-2204.json index 57a741ac333f..23df32a66b3d 100644 --- a/images/ubuntu/toolsets/toolset-2204.json +++ b/images/ubuntu/toolsets/toolset-2204.json @@ -228,13 +228,32 @@ "ubuntu:20.04", "ubuntu:22.04" ], - "components": { - "docker-ce": "24.0.7", - "docker-ce-cli": "24.0.7", - "containerd.io": "latest", - "docker-buildx-plugin": "latest", - "compose": "2.23.3" - } + "components": [ + { + "package": "containerd.io", + "version": "latest" + }, + { + "package": "docker-ce-cli", + "version": "24.0.7" + }, + { + "package": "docker-ce", + "version": "24.0.7" + } + ], + "plugins": [ + { + "plugin": "buildx", + "version": "latest", + "asset": "linux-amd64" + }, + { + "plugin": "compose", + "version": "2.23.3", + "asset": "linux-x86_64" + } + ] }, "pipx": [ { From be3dd8b0dd5750af9918d35dcb53d713e30ee8a0 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 1 Feb 2024 12:46:24 +0000 Subject: [PATCH 2641/3485] macOS 11 (20240127) Image Update (#9248) * Updating readme file for macOS-11 version 20240127.1 * Update images/macos/macos-11-Readme.md Co-authored-by: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> --------- Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Co-authored-by: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-11-Readme.md | 70 ++++++++++++++++----------------- 1 file changed, 33 insertions(+), 37 deletions(-) diff --git a/images/macos/macos-11-Readme.md b/images/macos/macos-11-Readme.md index cdc3484ff281..a0696ae0a609 100644 --- a/images/macos/macos-11-Readme.md +++ b/images/macos/macos-11-Readme.md @@ -1,12 +1,11 @@ | Announcements | |-| | [[All OSes] Powershell Core will be updated to 7.4.x LTS on January, 28](https://github.com/actions/runner-images/issues/9115) | -| [Old versions of Android SDK & tools will be removed from images on January, 8](https://github.com/actions/runner-images/issues/8952) | *** # macOS 11 - OS Version: macOS 11.7.10 (20G1427) - Kernel Version: Darwin 20.6.0 -- Image Version: 20240113.1 +- Image Version: 20240127.1 ## Installed Software @@ -30,7 +29,6 @@ - NVM 0.39.7 - NVM - Cached node versions: 16.20.2, 18.19.0, 20.11.0 - Perl 5.38.2 -- PHP 8.3.1 - Python 2.7.18 - Python3 3.12.1 - R 4.3.2 @@ -40,16 +38,15 @@ - Bundler 2.4.22 - Carthage 0.39.1 - CocoaPods 1.14.3 -- Composer 2.6.6 -- Homebrew 4.2.3 +- Homebrew 4.2.5 - Miniconda 23.11.0 - NPM 10.2.3 - NuGet 6.3.1.1 - Pip 20.3.4 (python 2.7) - Pip3 23.3.2 (python 3.12) -- Pipx 1.4.2 +- Pipx 1.4.3 - RubyGems 3.4.10 -- Vcpkg 2024 (build from commit 53bef8994) +- Vcpkg 2024 (build from commit 7032c5759) - Yarn 1.22.19 #### Environment variables @@ -67,19 +64,18 @@ ### Utilities - 7-Zip 17.05 - aria2 1.37.0 -- azcopy 10.21.2 -- bazel 7.0.0 +- azcopy 10.22.2 +- bazel 7.0.2 - bazelisk 1.19.0 - bsdtar 3.3.2 - available by 'tar' alias - Curl 8.5.0 - Git 2.43.0 - Git LFS 3.4.1 -- GitHub CLI 2.42.0 +- GitHub CLI 2.42.1 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.21.4 -- gpg (GnuPG) 2.4.3 -- helm v3.13.3+gc8b9489 -- ImageMagick 7.1.1-26 +- gpg (GnuPG) 2.4.4 +- helm v3.14.0+g3fc9f4b - jq 1.7.1 - mongo 5.0.21 - mongod 5.0.21 @@ -96,24 +92,24 @@ - zstd 1.5.5 ### Tools -- Aliyun CLI 3.0.196 +- Aliyun CLI 3.0.197 - App Center CLI 2.14.0 -- AWS CLI 2.15.10 -- AWS SAM CLI 1.107.0 +- AWS CLI 2.15.15 +- AWS SAM CLI 1.108.0 - AWS Session Manager CLI 1.2.553.0 - Azure CLI 2.56.0 - Azure CLI (azure-devops) 0.26.0 - Bicep CLI 0.24.24 - Cabal 3.10.2.1 - Cmake 3.28.1 -- CodeQL Action Bundle 2.15.5 +- CodeQL Action Bundle 2.16.1 - Fastlane 2.219.0 - GHC 9.8.1 - GHCup 0.1.20.0 - Jazzy 0.14.4 - Stack 2.13.1 - SwiftFormat 0.53.0 -- Swig 4.1.1 +- Swig 4.2.0 - Xcode Command Line Tools 13.2.0.0.1.1638488800 ### Linters @@ -123,14 +119,14 @@ ### Browsers - Safari 16.6.1 (16615.3.12.11.5) - SafariDriver 16.6.1 (16615.3.12.11.5) -- Google Chrome 120.0.6099.216 -- Google Chrome for Testing 120.0.6099.109 -- ChromeDriver 120.0.6099.109 -- Microsoft Edge 120.0.2210.133 -- Microsoft Edge WebDriver 120.0.2210.133 -- Mozilla Firefox 121.0.1 +- Google Chrome 121.0.6167.85 +- Google Chrome for Testing 121.0.6167.85 +- ChromeDriver 121.0.6167.85 +- Microsoft Edge 121.0.2277.83 +- Microsoft Edge WebDriver 121.0.2277.83 +- Mozilla Firefox 122.0 - geckodriver 0.34.0 -- Selenium server 4.16.1 +- Selenium server 4.17.0 #### Environment variables | Name | Value | @@ -142,10 +138,10 @@ ### Java | Version | Environment Variable | | ------------------- | -------------------- | -| 8.0.392+8 (default) | JAVA_HOME_8_X64 | -| 11.0.21+9 | JAVA_HOME_11_X64 | -| 17.0.9+9 | JAVA_HOME_17_X64 | -| 21.0.1+12.0 | JAVA_HOME_21_X64 | +| 8.0.402+6 (default) | JAVA_HOME_8_X64 | +| 11.0.22+7 | JAVA_HOME_11_X64 | +| 17.0.10+7 | JAVA_HOME_17_X64 | +| 21.0.2+13.0 | JAVA_HOME_21_X64 | ### Cached Tools @@ -157,11 +153,11 @@ - 3.1.4 #### PyPy -- 2.7.18 [PyPy 7.3.14] +- 2.7.18 [PyPy 7.3.15] - 3.7.13 [PyPy 7.3.9] - 3.8.16 [PyPy 7.3.11] -- 3.9.18 [PyPy 7.3.14] -- 3.10.13 [PyPy 7.3.14] +- 3.9.18 [PyPy 7.3.15] +- 3.10.13 [PyPy 7.3.15] #### Python - 3.7.17 @@ -174,12 +170,12 @@ #### Node.js - 16.20.2 - 18.19.0 -- 20.10.0 +- 20.11.0 #### Go - 1.19.13 -- 1.20.12 -- 1.21.5 +- 1.20.13 +- 1.21.6 ### Rust Tools - Cargo 1.75.0 @@ -196,7 +192,7 @@ - Rustfmt 1.7.0-stable ### PowerShell Tools -- PowerShell 7.2.18 +- PowerShell 7.4.1 #### PowerShell Modules - Az: 11.2.0 @@ -356,5 +352,5 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" - libXext 1.3.5 - libXft 2.3.8 - Tcl/Tk 8.6.13_5 -- Zlib 1.3 +- Zlib 1.3.1 From a8d9540421ce869a9f59c032efae1d6b7309f2e6 Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Thu, 1 Feb 2024 14:03:59 +0100 Subject: [PATCH 2642/3485] [macOS] Remove Xcode 15.3 Beta release due to the issues with simulators (#9270) --- images/macos/toolsets/toolset-13.json | 2 -- images/macos/toolsets/toolset-14.json | 2 -- 2 files changed, 4 deletions(-) diff --git a/images/macos/toolsets/toolset-13.json b/images/macos/toolsets/toolset-13.json index ddaa8f384d82..274e956612c6 100644 --- a/images/macos/toolsets/toolset-13.json +++ b/images/macos/toolsets/toolset-13.json @@ -3,7 +3,6 @@ "default": "15.0.1", "x64": { "versions": [ - { "link": "15.3", "version": "15.3.0-Beta+15E5178i", "install_runtimes": "true", "sha256": "CE08F7B13B072AE901C3D455C02BF374FA47F678A85B180532C5D80EC4B619C0"}, { "link": "15.2", "version": "15.2.0+15C500b", "install_runtimes": "true", "sha256": "04E93680C6DDBEC84666531BE412DE778AFC8EAC6AB2037F4C2BE7290818B59B"}, { "link": "15.1", "version": "15.1.0+15C65", "install_runtimes": "true", "sha256": "857D8DB537BAC82BF99DE0E1D3895D214D4D02101C1340CEF3DAF6E821BA1D05"}, { "link": "15.0.1", "version": "15.0.1+15A507", "symlinks": ["15.0"], "install_runtimes": "true", "sha256": "5AC17AE6060CAFC3C7112C6DA0B153450BE21F1DE6632777FBA9FBC9D999C9E8"}, @@ -15,7 +14,6 @@ }, "arm64":{ "versions": [ - { "link": "15.3", "version": "15.3.0-Beta+15E5178i", "install_runtimes": "true", "sha256": "CE08F7B13B072AE901C3D455C02BF374FA47F678A85B180532C5D80EC4B619C0"}, { "link": "15.2", "version": "15.2.0+15C500b", "install_runtimes": "true", "sha256": "04E93680C6DDBEC84666531BE412DE778AFC8EAC6AB2037F4C2BE7290818B59B"}, { "link": "15.1", "version": "15.1.0+15C65", "install_runtimes": "true", "sha256": "857D8DB537BAC82BF99DE0E1D3895D214D4D02101C1340CEF3DAF6E821BA1D05"}, { "link": "15.0.1", "version": "15.0.1+15A507", "symlinks": ["15.0"], "install_runtimes": "true", "sha256": "5AC17AE6060CAFC3C7112C6DA0B153450BE21F1DE6632777FBA9FBC9D999C9E8"}, diff --git a/images/macos/toolsets/toolset-14.json b/images/macos/toolsets/toolset-14.json index 9e0f98ea5479..47d3290f8b9d 100644 --- a/images/macos/toolsets/toolset-14.json +++ b/images/macos/toolsets/toolset-14.json @@ -3,7 +3,6 @@ "default": "15.0.1", "x64": { "versions": [ - { "link": "15.3", "version": "15.3.0-Beta+15E5178i", "install_runtimes": "true", "sha256": "CE08F7B13B072AE901C3D455C02BF374FA47F678A85B180532C5D80EC4B619C0"}, { "link": "15.2", "version": "15.2.0+15C500b", "install_runtimes": "true", "sha256": "04E93680C6DDBEC84666531BE412DE778AFC8EAC6AB2037F4C2BE7290818B59B"}, { "link": "15.1", "version": "15.1.0+15C65", "install_runtimes": "true", "sha256": "857D8DB537BAC82BF99DE0E1D3895D214D4D02101C1340CEF3DAF6E821BA1D05"}, { "link": "15.0.1", "version": "15.0.1+15A507", "symlinks": ["15.0"], "install_runtimes": "true", "sha256": "5AC17AE6060CAFC3C7112C6DA0B153450BE21F1DE6632777FBA9FBC9D999C9E8"}, @@ -12,7 +11,6 @@ }, "arm64":{ "versions": [ - { "link": "15.3", "version": "15.3.0-Beta+15E5178i", "install_runtimes": "true", "sha256": "CE08F7B13B072AE901C3D455C02BF374FA47F678A85B180532C5D80EC4B619C0"}, { "link": "15.2", "version": "15.2.0+15C500b", "install_runtimes": "true", "sha256": "04E93680C6DDBEC84666531BE412DE778AFC8EAC6AB2037F4C2BE7290818B59B"}, { "link": "15.1", "version": "15.1.0+15C65", "install_runtimes": "true", "sha256": "857D8DB537BAC82BF99DE0E1D3895D214D4D02101C1340CEF3DAF6E821BA1D05"}, { "link": "15.0.1", "version": "15.0.1+15A507", "symlinks": ["15.0"], "install_runtimes": "true", "sha256": "5AC17AE6060CAFC3C7112C6DA0B153450BE21F1DE6632777FBA9FBC9D999C9E8"}, From b8d3d784e4acc7be051cfe1278cf9fa327137f5f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 2 Feb 2024 02:49:53 +0000 Subject: [PATCH 2643/3485] Updating readme file for ubuntu20 version 20240131.1.1 (#9271) Co-authored-by: Image generation service account <no-reply@microsoft.com> --- images/ubuntu/Ubuntu2004-Readme.md | 46 +++++++++++++++--------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/images/ubuntu/Ubuntu2004-Readme.md b/images/ubuntu/Ubuntu2004-Readme.md index 652315600dae..f9c0e51442be 100644 --- a/images/ubuntu/Ubuntu2004-Readme.md +++ b/images/ubuntu/Ubuntu2004-Readme.md @@ -5,7 +5,7 @@ # Ubuntu 20.04 - OS Version: 20.04.6 LTS - Kernel Version: 5.15.0-1054-azure -- Image Version: 20240126.1.0 +- Image Version: 20240131.1.0 - Systemd version: 245.4-4ubuntu3.23 ## Installed Software @@ -33,7 +33,7 @@ ### Package Management - cpan 1.64 - Helm 3.14.0 -- Homebrew 4.2.5 +- Homebrew 4.2.6 - Miniconda 23.11.0 - Npm 10.2.3 - NuGet 6.6.1.2 @@ -41,7 +41,7 @@ - Pip3 20.0.2 - Pipx 1.4.3 - RubyGems 3.1.2 -- Vcpkg (build from commit 7032c5759) +- Vcpkg (build from commit 10e052511) - Yarn 1.22.21 #### Environment variables @@ -68,12 +68,12 @@ to accomplish this. ### Tools - Ansible 2.13.13 - apt-fast 1.10.0 -- AzCopy 10.22.2 - available by `azcopy` and `azcopy10` aliases +- AzCopy 10.23.0 - available by `azcopy` and `azcopy10` aliases - Bazel 7.0.2 - Bazelisk 1.19.0 - Bicep 0.24.24 - Buildah 1.22.3 -- CMake 3.28.1 +- CMake 3.28.2 - CodeQL Action Bundle 2.16.1 - Docker Amazon ECR Credential Helper 0.7.1 - Docker Compose v1 1.29.2 @@ -92,7 +92,7 @@ to accomplish this. - Kind 0.20.0 - Kubectl 1.29.1 - Kustomize 5.3.0 -- Leiningen 2.10.0 +- Leiningen 2.11.1 - MediaInfo 19.09 - Mercurial 5.3.1 - Minikube 1.32.0 @@ -100,33 +100,33 @@ to accomplish this. - Newman 6.1.0 - nvm 0.39.7 - OpenSSL 1.1.1f-1ubuntu2.20 -- Packer 1.10.0 +- Packer 1.10.1 - Parcel 2.11.0 - PhantomJS 2.1.1 2.1.1 - Podman 3.4.2 -- Pulumi 3.103.1 +- Pulumi 3.104.1 - R 4.3.2 - Skopeo 1.5.0 - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 -- Terraform 1.7.1 +- Terraform 1.7.2 - yamllint 1.33.0 - yq 4.40.5 - zstd 1.5.5 ### CLI Tools - Alibaba Cloud CLI 3.0.174 -- AWS CLI 2.15.15 +- AWS CLI 2.15.16 - AWS CLI Session Manager Plugin 1.2.553.0 - AWS SAM CLI 1.108.0 - Azure CLI 2.56.0 - Azure CLI (azure-devops) 0.26.0 -- GitHub CLI 2.42.1 -- Google Cloud CLI 461.0.0 -- Netlify CLI 17.15.3 +- GitHub CLI 2.43.1 +- Google Cloud CLI 462.0.1 +- Netlify CLI 17.15.6 - OpenShift CLI 4.14.10 - ORAS CLI 1.1.0 -- Vercel CLI 33.3.0 +- Vercel CLI 33.4.1 ### Java | Version | Environment Variable | @@ -165,7 +165,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 121.0.6167.85 +- Google Chrome 121.0.6167.139 - ChromeDriver 121.0.6167.85 - Chromium 121.0.6167.0 - Microsoft Edge 121.0.2277.83 @@ -199,7 +199,7 @@ Use the following command as a part of your job to start the service: 'sudo syst ``` #### MySQL -- MySQL 8.0.35-0ubuntu0.20.04.1 +- MySQL 8.0.36-0ubuntu0.20.04.1 ``` User: root Password: root @@ -268,7 +268,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | Package Name | Version | | -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 9.0 | -| Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0 | +| Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2 33.0.3<br>32.0.0<br>31.0.0 | | Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 2)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1) | | Android Support Repository | 47.0.0 | | CMake | 3.10.2<br>3.18.1<br>3.22.1 | @@ -292,15 +292,15 @@ Use the following command as a part of your job to start the service: 'sudo syst | alpine:3.16 | sha256:452e7292acee0ee16c332324d7de05fa2c99f9994ecc9f0779c602916a672ae4 | 2024-01-27 | | alpine:3.17 | sha256:53cf9478b76f4c8fae126acbdfb79bed6e69e628faff572ebe4a029d3d247d98 | 2024-01-27 | | alpine:3.18 | sha256:11e21d7b981a59554b3f822c49f6e9f57b6068bb74f49c4cd5cc4c663c7e5160 | 2024-01-27 | -| debian:10 | sha256:defa5d214292f2aaf7905d3e4bcdf8f628019feb63e7c8746df563d1a941f8d7 | 2024-01-11 | -| debian:11 | sha256:71cb300d5448af821aedfe63afd55ba05f45a6a79f00dcd131b96b780bb99fe4 | 2024-01-11 | +| debian:10 | sha256:8fc5c3f7828792d01a02f490202c4b1aaa33f00a3beed5bc12814e3ed55fa0e2 | 2024-01-31 | +| debian:11 | sha256:44cfd77e3dbebfa8a0545d9fd1bee6e874cf6998a3bbfb5cccf34919df4e3360 | 2024-01-31 | | debian:9 | sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be | 2022-06-23 | -| moby/buildkit:latest | sha256:5a8f30813a104b86e927ff4695a746f74a5bb921c7be1dbcca6d754dfbe04822 | 2023-12-01 | +| moby/buildkit:latest | sha256:449188623c7a8a3bd4f161c5d0ddf5cabbfb828f7eaadf9ed8111864b911a308 | 2024-01-31 | | node:16 | sha256:f77a1aef2da8d83e45ec990f45df50f1a286c5fe8bbfb8c6e4246c6389705c0b | 2023-09-07 | | node:16-alpine | sha256:a1f9d027912b58a7c75be7716c97cfbc6d3099f3a97ed84aa490be9dee20e787 | 2023-08-10 | -| node:18 | sha256:995a5f4314885452a4a785abc25a0fec40e26c346559e11e709d58bb7a927cf4 | 2024-01-17 | +| node:18 | sha256:56ed84097b42a0aa7c218bb7970add8efa4407750a576d8a8e4a5726002ca3b0 | 2024-02-01 | | node:18-alpine | sha256:0085670310d2879621f96a4216c893f92e2ded827e9e6ef8437672e1bd72f437 | 2024-01-27 | -| node:20 | sha256:ffebb4405810c92d267a764b21975fb2d96772e41877248a37bf3abaa0d3b590 | 2024-01-17 | +| node:20 | sha256:33bfe51ff32a17d6cfb5bca5ae2743a9b2390ac99dcffde543565bb83b1fb786 | 2024-02-01 | | node:20-alpine | sha256:2f46fd49c767554c089a5eb219115313b72748d8f62f5eccb58ef52bc36db4ad | 2024-01-27 | | ubuntu:20.04 | sha256:f2034e7195f61334e6caff6ecf2e965f92d11e888309065da85ff50c617732b8 | 2023-12-13 | @@ -391,7 +391,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | upx | 3.95-2build1 | | wget | 1.20.3-1ubuntu2 | | xorriso | 1.5.2-1 | -| xvfb | 2:1.20.13-1ubuntu1\~20.04.14 | +| xvfb | 2:1.20.13-1ubuntu1\~20.04.15 | | xz-utils | 5.2.4-1ubuntu1.1 | | zip | 3.0-11build1 | | zsync | 0.6.2-3ubuntu1 | From 33875804693d2c58977c82f70dcb7a10dafad9d7 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 4 Feb 2024 02:09:04 +0000 Subject: [PATCH 2644/3485] Updating readme file for ubuntu22 version 20240201.1.1 (#9275) Co-authored-by: Image generation service account <no-reply@microsoft.com> --- images/ubuntu/Ubuntu2204-Readme.md | 48 +++++++++++++++--------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/images/ubuntu/Ubuntu2204-Readme.md b/images/ubuntu/Ubuntu2204-Readme.md index 027f472eba63..7d6c38df3420 100644 --- a/images/ubuntu/Ubuntu2204-Readme.md +++ b/images/ubuntu/Ubuntu2204-Readme.md @@ -5,7 +5,7 @@ # Ubuntu 22.04 - OS Version: 22.04.3 LTS - Kernel Version: 6.2.0-1019-azure -- Image Version: 20240126.1.0 +- Image Version: 20240201.1.0 - Systemd version: 249.11-0ubuntu3.12 ## Installed Software @@ -31,7 +31,7 @@ ### Package Management - cpan 1.64 - Helm 3.14.0 -- Homebrew 4.2.5 +- Homebrew 4.2.6 - Miniconda 23.11.0 - Npm 10.2.3 - NuGet 6.6.1.2 @@ -39,7 +39,7 @@ - Pip3 22.0.2 - Pipx 1.4.3 - RubyGems 3.3.5 -- Vcpkg (build from commit 7032c5759) +- Vcpkg (build from commit 10e052511) - Yarn 1.22.21 #### Environment variables @@ -61,14 +61,14 @@ to accomplish this. - Maven 3.8.8 ### Tools -- Ansible 2.16.2 +- Ansible 2.16.3 - apt-fast 1.10.0 -- AzCopy 10.22.2 - available by `azcopy` and `azcopy10` aliases +- AzCopy 10.23.0 - available by `azcopy` and `azcopy10` aliases - Bazel 7.0.2 - Bazelisk 1.19.0 - Bicep 0.24.24 - Buildah 1.23.1 -- CMake 3.28.1 +- CMake 3.28.2 - CodeQL Action Bundle 2.16.1 - Docker Amazon ECR Credential Helper 0.7.1 - Docker Compose v1 1.29.2 @@ -86,7 +86,7 @@ to accomplish this. - Kind 0.20.0 - Kubectl 1.29.1 - Kustomize 5.3.0 -- Leiningen 2.11.0 +- Leiningen 2.11.1 - MediaInfo 21.09 - Mercurial 6.1.1 - Minikube 1.32.0 @@ -94,32 +94,32 @@ to accomplish this. - Newman 6.1.0 - nvm 0.39.7 - OpenSSL 3.0.2-0ubuntu1.13 -- Packer 1.10.0 +- Packer 1.10.1 - Parcel 2.11.0 - Podman 3.4.4 -- Pulumi 3.103.1 +- Pulumi 3.104.2 - R 4.3.2 - Skopeo 1.4.1 - Sphinx Open Source Search Server 2.2.11 - SVN 1.14.1 -- Terraform 1.7.1 +- Terraform 1.7.2 - yamllint 1.33.0 - yq 4.40.5 - zstd 1.5.5 ### CLI Tools - Alibaba Cloud CLI 3.0.197 -- AWS CLI 2.15.15 +- AWS CLI 2.15.16 - AWS CLI Session Manager Plugin 1.2.553.0 - AWS SAM CLI 1.108.0 - Azure CLI 2.56.0 - Azure CLI (azure-devops) 0.26.0 -- GitHub CLI 2.42.1 -- Google Cloud CLI 461.0.0 -- Netlify CLI 17.15.3 +- GitHub CLI 2.43.1 +- Google Cloud CLI 462.0.1 +- Netlify CLI 17.15.7 - OpenShift CLI 4.14.10 - ORAS CLI 1.1.0 -- Vercel CLI 33.3.0 +- Vercel CLI 33.4.1 ### Java | Version | Environment Variable | @@ -158,7 +158,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 121.0.6167.85 +- Google Chrome 121.0.6167.139 - ChromeDriver 121.0.6167.85 - Chromium 121.0.6167.0 - Microsoft Edge 121.0.2277.83 @@ -191,7 +191,7 @@ Use the following command as a part of your job to start the service: 'sudo syst ``` #### MySQL -- MySQL 8.0.35-0ubuntu0.22.04.1 +- MySQL 8.0.36-0ubuntu0.22.04.1 ``` User: root Password: root @@ -252,7 +252,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | Package Name | Version | | -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 9.0 | -| Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0 | +| Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2 33.0.3<br>32.0.0<br>31.0.0 | | Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 2)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1) | | Android Support Repository | 47.0.0 | | CMake | 3.10.2<br>3.18.1<br>3.22.1 | @@ -276,14 +276,14 @@ Use the following command as a part of your job to start the service: 'sudo syst | alpine:3.16 | sha256:452e7292acee0ee16c332324d7de05fa2c99f9994ecc9f0779c602916a672ae4 | 2024-01-27 | | alpine:3.17 | sha256:53cf9478b76f4c8fae126acbdfb79bed6e69e628faff572ebe4a029d3d247d98 | 2024-01-27 | | alpine:3.18 | sha256:11e21d7b981a59554b3f822c49f6e9f57b6068bb74f49c4cd5cc4c663c7e5160 | 2024-01-27 | -| debian:10 | sha256:defa5d214292f2aaf7905d3e4bcdf8f628019feb63e7c8746df563d1a941f8d7 | 2024-01-11 | -| debian:11 | sha256:71cb300d5448af821aedfe63afd55ba05f45a6a79f00dcd131b96b780bb99fe4 | 2024-01-11 | -| moby/buildkit:latest | sha256:5a8f30813a104b86e927ff4695a746f74a5bb921c7be1dbcca6d754dfbe04822 | 2023-12-01 | +| debian:10 | sha256:8fc5c3f7828792d01a02f490202c4b1aaa33f00a3beed5bc12814e3ed55fa0e2 | 2024-01-31 | +| debian:11 | sha256:44cfd77e3dbebfa8a0545d9fd1bee6e874cf6998a3bbfb5cccf34919df4e3360 | 2024-01-31 | +| moby/buildkit:latest | sha256:449188623c7a8a3bd4f161c5d0ddf5cabbfb828f7eaadf9ed8111864b911a308 | 2024-01-31 | | node:16 | sha256:f77a1aef2da8d83e45ec990f45df50f1a286c5fe8bbfb8c6e4246c6389705c0b | 2023-09-07 | | node:16-alpine | sha256:a1f9d027912b58a7c75be7716c97cfbc6d3099f3a97ed84aa490be9dee20e787 | 2023-08-10 | -| node:18 | sha256:995a5f4314885452a4a785abc25a0fec40e26c346559e11e709d58bb7a927cf4 | 2024-01-17 | +| node:18 | sha256:2a13079c6393cd19adfd8d362fac004b2d0eed462f3c3fedfad2c0d0de17b429 | 2024-02-01 | | node:18-alpine | sha256:0085670310d2879621f96a4216c893f92e2ded827e9e6ef8437672e1bd72f437 | 2024-01-27 | -| node:20 | sha256:ffebb4405810c92d267a764b21975fb2d96772e41877248a37bf3abaa0d3b590 | 2024-01-17 | +| node:20 | sha256:fd0115473b293460df5b217ea73ff216928f2b0bb7650c5e7aa56aae4c028426 | 2024-02-01 | | node:20-alpine | sha256:2f46fd49c767554c089a5eb219115313b72748d8f62f5eccb58ef52bc36db4ad | 2024-01-27 | | ubuntu:20.04 | sha256:f2034e7195f61334e6caff6ecf2e965f92d11e888309065da85ff50c617732b8 | 2023-12-13 | | ubuntu:22.04 | sha256:e6173d4dc55e76b87c4af8db8821b1feae4146dd47341e4d431118c7dd060a74 | 2024-01-11 | @@ -377,7 +377,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | upx | 3.96-3 | | wget | 1.21.2-2ubuntu1 | | xorriso | 1.5.4-2 | -| xvfb | 2:21.1.4-2ubuntu1.7\~22.04.7 | +| xvfb | 2:21.1.4-2ubuntu1.7\~22.04.8 | | xz-utils | 5.2.5-2ubuntu1 | | zip | 3.0-12build2 | | zsync | 0.6.2-3ubuntu1 | From 33261492c5ae908962df7401e7326e9a34f32faa Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Mon, 5 Feb 2024 18:16:30 +0100 Subject: [PATCH 2645/3485] [macOS] Add toolcache to the macOS 14 (#9274) --- .../docs-gen/Generate-SoftwareReport.ps1 | 39 +++++----- .../docs-gen/SoftwareReport.Toolcache.psm1 | 8 ++- .../macos/scripts/tests/Toolcache.Tests.ps1 | 2 +- images/macos/templates/macOS-14.anka.pkr.hcl | 12 +++- .../templates/macOS-14.arm64.anka.pkr.hcl | 12 +++- images/macos/toolsets/toolset-14.json | 72 +++++++++++++++++++ 6 files changed, 120 insertions(+), 25 deletions(-) diff --git a/images/macos/scripts/docs-gen/Generate-SoftwareReport.ps1 b/images/macos/scripts/docs-gen/Generate-SoftwareReport.ps1 index acb6db20ef0e..7c57214edf08 100644 --- a/images/macos/scripts/docs-gen/Generate-SoftwareReport.ps1 +++ b/images/macos/scripts/docs-gen/Generate-SoftwareReport.ps1 @@ -216,27 +216,26 @@ $java = $installedSoftware.AddHeader("Java") $java.AddTable($(Get-JavaVersions)) # Toolcache -if (-not $os.IsSonoma) { - $toolcache = $installedSoftware.AddHeader("Cached Tools") - $toolcache.AddNodes($(Build-ToolcacheSection)) - - # Rust - $rust = $installedSoftware.AddHeader("Rust Tools") - $rust.AddToolVersion("Cargo", $(Get-RustCargoVersion)) - $rust.AddToolVersion("Rust", $(Get-RustVersion)) - $rust.AddToolVersion("Rustdoc", $(Get-RustdocVersion)) - $rust.AddToolVersion("Rustup", $(Get-RustupVersion)) - - $rustPackages = $rust.AddHeader("Packages") - if (-not $os.IsVentura) { - $rustPackages.AddToolVersion("Bindgen", $(Get-Bindgen)) - $rustPackages.AddToolVersion("Cargo-audit", $(Get-Cargoaudit)) - $rustPackages.AddToolVersion("Cargo-outdated", $(Get-Cargooutdated)) - $rustPackages.AddToolVersion("Cbindgen", $(Get-Cbindgen)) - } - $rustPackages.AddToolVersion("Clippy", $(Get-RustClippyVersion)) - $rustPackages.AddToolVersion("Rustfmt", $(Get-RustfmtVersion)) + +$toolcache = $installedSoftware.AddHeader("Cached Tools") +$toolcache.AddNodes($(Build-ToolcacheSection)) + +# Rust +$rust = $installedSoftware.AddHeader("Rust Tools") +$rust.AddToolVersion("Cargo", $(Get-RustCargoVersion)) +$rust.AddToolVersion("Rust", $(Get-RustVersion)) +$rust.AddToolVersion("Rustdoc", $(Get-RustdocVersion)) +$rust.AddToolVersion("Rustup", $(Get-RustupVersion)) + +$rustPackages = $rust.AddHeader("Packages") +if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) { + $rustPackages.AddToolVersion("Bindgen", $(Get-Bindgen)) + $rustPackages.AddToolVersion("Cargo-audit", $(Get-Cargoaudit)) + $rustPackages.AddToolVersion("Cargo-outdated", $(Get-Cargooutdated)) + $rustPackages.AddToolVersion("Cbindgen", $(Get-Cbindgen)) } +$rustPackages.AddToolVersion("Clippy", $(Get-RustClippyVersion)) +$rustPackages.AddToolVersion("Rustfmt", $(Get-RustfmtVersion)) # PowerShell $powerShell = $installedSoftware.AddHeader("PowerShell Tools") diff --git a/images/macos/scripts/docs-gen/SoftwareReport.Toolcache.psm1 b/images/macos/scripts/docs-gen/SoftwareReport.Toolcache.psm1 index ad5c41881299..18fc1bdf3332 100644 --- a/images/macos/scripts/docs-gen/SoftwareReport.Toolcache.psm1 +++ b/images/macos/scripts/docs-gen/SoftwareReport.Toolcache.psm1 @@ -37,12 +37,16 @@ function Build-ToolcacheSection { $nodes = @() - if ((-not $os.IsVenturaArm64) -and (-not $os.IsSonomaArm64)) { + if ((-not $os.IsVenturaArm64) -and (-not $os.IsSonoma)) { $nodes += @( - [ToolVersionsListNode]::new("Ruby", $(Get-ToolcacheRubyVersions), '^\d+\.\d+', "List"), [ToolVersionsListNode]::new("PyPy", $(Get-ToolcachePyPyVersions), '^\d+\.\d+', "List") ) } + if ((-not $os.IsVenturaArm64) -and (-not $os.IsSonomaArm64)) { + $nodes += @( + [ToolVersionsListNode]::new("Ruby", $(Get-ToolcacheRubyVersions), '^\d+\.\d+', "List") + ) + } $nodes += @( [ToolVersionsListNode]::new("Python", $(Get-ToolcachePythonVersions), '^\d+\.\d+', "List"), diff --git a/images/macos/scripts/tests/Toolcache.Tests.ps1 b/images/macos/scripts/tests/Toolcache.Tests.ps1 index 4f57962ec6a8..623a41632a2d 100644 --- a/images/macos/scripts/tests/Toolcache.Tests.ps1 +++ b/images/macos/scripts/tests/Toolcache.Tests.ps1 @@ -99,7 +99,7 @@ Describe "Toolcache" { } } } - Context "PyPy" -Skip:($os.IsVenturaArm64 -or $os.IsSonomaArm64) { + Context "PyPy" -Skip:($os.IsVenturaArm64 -or $os.IsSonoma) { $pypyDirectory = Join-Path $toolcacheDirectory "PyPy" $pypyPackage = $packages | Where-Object { $_.ToolName -eq "pypy" } | Select-Object -First 1 $testCase = @{ PypyDirectory = $pypyDirectory } diff --git a/images/macos/templates/macOS-14.anka.pkr.hcl b/images/macos/templates/macOS-14.anka.pkr.hcl index 38c6396afb09..89fccc987c07 100644 --- a/images/macos/templates/macOS-14.anka.pkr.hcl +++ b/images/macos/templates/macOS-14.anka.pkr.hcl @@ -228,6 +228,15 @@ build { ] } + provisioner "shell" { + environment_vars = ["IMAGE_FOLDER=${local.image_folder}"] + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} pwsh -f {{ .Path }}" + scripts = [ + "${path.root}/../scripts/build/Install-Toolset.ps1", + "${path.root}/../scripts/build/Configure-Toolset.ps1" + ] + } + provisioner "shell" { execute_command = "source $HOME/.bash_profile; ruby {{ .Path }}" script = "${path.root}/../scripts/build/configure-xcode-simulators.rb" @@ -237,7 +246,8 @@ build { environment_vars = ["IMAGE_FOLDER=${local.image_folder}"] execute_command = "source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" inline = [ - "pwsh -File \"${local.image_folder}/software-report/Generate-SoftwareReport.ps1\" -OutputDirectory \"${local.image_folder}/output/software-report\" -ImageName ${var.build_id}" + "pwsh -File \"${local.image_folder}/software-report/Generate-SoftwareReport.ps1\" -OutputDirectory \"${local.image_folder}/output/software-report\" -ImageName ${var.build_id}", + "pwsh -File \"${local.image_folder}/tests/RunAll-Tests.ps1\"" ] } diff --git a/images/macos/templates/macOS-14.arm64.anka.pkr.hcl b/images/macos/templates/macOS-14.arm64.anka.pkr.hcl index 19d25641966d..360251efd05b 100644 --- a/images/macos/templates/macOS-14.arm64.anka.pkr.hcl +++ b/images/macos/templates/macOS-14.arm64.anka.pkr.hcl @@ -223,6 +223,15 @@ build { ] } + provisioner "shell" { + environment_vars = ["IMAGE_FOLDER=${local.image_folder}"] + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} pwsh -f {{ .Path }}" + scripts = [ + "${path.root}/../scripts/build/Install-Toolset.ps1", + "${path.root}/../scripts/build/Configure-Toolset.ps1" + ] + } + provisioner "shell" { execute_command = "source $HOME/.bash_profile; ruby {{ .Path }}" script = "${path.root}/../scripts/build/configure-xcode-simulators.rb" @@ -232,7 +241,8 @@ build { environment_vars = ["IMAGE_FOLDER=${local.image_folder}"] execute_command = "source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" inline = [ - "pwsh -File \"${local.image_folder}/software-report/Generate-SoftwareReport.ps1\" -OutputDirectory \"${local.image_folder}/output/software-report\" -ImageName ${var.build_id}" + "pwsh -File \"${local.image_folder}/software-report/Generate-SoftwareReport.ps1\" -OutputDirectory \"${local.image_folder}/output/software-report\" -ImageName ${var.build_id}", + "pwsh -File \"${local.image_folder}/tests/RunAll-Tests.ps1\"" ] } diff --git a/images/macos/toolsets/toolset-14.json b/images/macos/toolsets/toolset-14.json index 47d3290f8b9d..2d3cbc459d26 100644 --- a/images/macos/toolsets/toolset-14.json +++ b/images/macos/toolsets/toolset-14.json @@ -112,6 +112,78 @@ "fastlane" ] }, + "toolcache": [ + { + "name": "Python", + "url" : "https://raw.githubusercontent.com/actions/python-versions/main/versions-manifest.json", + "platform" : "darwin", + "arch": { + "x64": { + "versions": [ + "3.11.*", + "3.12.*" + ] + }, + "arm64": { + "versions": [ + "3.11.*", + "3.12.*" + ] + } + } + }, + { + "name": "Node", + "url" : "https://raw.githubusercontent.com/actions/node-versions/main/versions-manifest.json", + "platform" : "darwin", + "arch": { + "x64": { + "versions": [ + "18.*", + "20.*" + ] + }, + "arm64": { + "versions": [ + "18.*", + "20.*" + ] + } + } + }, + { + "name": "Go", + "url" : "https://raw.githubusercontent.com/actions/go-versions/main/versions-manifest.json", + "platform" : "darwin", + "arch": { + "x64": { + "variable_template" : "GOROOT_{0}_{1}_X64", + "versions": [ + "1.20.*", + "1.21.*" + ] + }, + "arm64": { + "variable_template" : "GOROOT_{0}_{1}_ARM64", + "versions": [ + "1.20.*", + "1.21.*" + ] + } + } + }, + { + "name": "Ruby", + "arch": { + "x64": { + "versions": [ + "3.0.*", + "3.1.*" + ] + } + } + } + ], "go": { "default": "1.20" }, From 82095c61979733a15635ba25d2538695727ba92d Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Mon, 5 Feb 2024 20:42:05 +0100 Subject: [PATCH 2646/3485] [macOS] make naming schema & README granular (#9300) --- README.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 60469b472cd6..05cba07fb8a7 100644 --- a/README.md +++ b/README.md @@ -23,8 +23,10 @@ To build a VM machine from this repo's source, see the [instructions](docs/creat | --------------------|---------------------|--------------------| | Ubuntu 22.04 | `ubuntu-latest` or `ubuntu-22.04` | [ubuntu-22.04] | | Ubuntu 20.04 | `ubuntu-20.04` | [ubuntu-20.04] | -| macOS 14 [beta] | `macos-14`, `macos-14-large`, or `macos-14-xlarge`| [macOS-14] | -| macOS 13 | `macos-13`, `macos-13-large`, or `macos-13-xlarge`| [macOS-13] | +| macOS 14 [beta] | `macos-14-large`| [macOS-14] | +| macOS 14 Arm64 [beta] | `macos-14` or `macos-14-xlarge`| [macOS-14-arm64] | +| macOS 13 | `macos-13` or `macos-13-large` | [macOS-13] | +| macOS 13 Arm64 | `macos-13-xlarge` | [macOS-13-arm64] | | macOS 12 | `macos-latest`,`macos-12`, `macos-latest-large`, or `macos-12-large`| [macOS-12] | | macOS 11 [deprecated] | `macos-11`| [macOS-11] | | Windows Server 2022 | `windows-latest` or `windows-2022` | [windows-2022] | @@ -42,7 +44,9 @@ To build a VM machine from this repo's source, see the [instructions](docs/creat [macOS-11]: https://github.com/actions/runner-images/blob/main/images/macos/macos-11-Readme.md [macOS-12]: https://github.com/actions/runner-images/blob/main/images/macos/macos-12-Readme.md [macOS-13]: https://github.com/actions/runner-images/blob/main/images/macos/macos-13-Readme.md +[macOS-13-arm64]: https://github.com/actions/runner-images/blob/main/images/macos/macos-13-arm64-Readme.md [macOS-14]: https://github.com/actions/runner-images/blob/main/images/macos/macos-14-Readme.md +[macOS-14-arm64]: https://github.com/actions/runner-images/blob/main/images/macos/macos-14-arm64-Readme.md [self-hosted runners]: https://help.github.com/en/actions/hosting-your-own-runners ## Announcements From 5d5f63b19a6bfedd8ef26f5cbbafe342790a7c51 Mon Sep 17 00:00:00 2001 From: Ikko Eltociear Ashimine <eltociear@gmail.com> Date: Tue, 6 Feb 2024 20:19:39 +0900 Subject: [PATCH 2647/3485] [ubuntu] Fix typo in install-bazel.sh (#9276) instal -> install --- images/ubuntu/scripts/build/install-bazel.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/ubuntu/scripts/build/install-bazel.sh b/images/ubuntu/scripts/build/install-bazel.sh index a9b066193315..70fe46f77e74 100644 --- a/images/ubuntu/scripts/build/install-bazel.sh +++ b/images/ubuntu/scripts/build/install-bazel.sh @@ -10,7 +10,7 @@ source $HELPER_SCRIPTS/install.sh # Install bazelisk npm install -g @bazel/bazelisk -# run bazelisk once in order to instal /usr/local/bin/bazel binary +# run bazelisk once in order to install /usr/local/bin/bazel binary sudo -u $SUDO_USER bazel version invoke_tests "Tools" "Bazel" From 3151c92d253865a2d18bd2cc909954491ebc6913 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 7 Feb 2024 13:24:30 +0000 Subject: [PATCH 2648/3485] Updating readme file for win19 version 20240204.1.1 (#9294) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/windows/Windows2019-Readme.md | 42 ++++++++++++++-------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/images/windows/Windows2019-Readme.md b/images/windows/Windows2019-Readme.md index 8593acea60a1..2c8d2c407ef5 100644 --- a/images/windows/Windows2019-Readme.md +++ b/images/windows/Windows2019-Readme.md @@ -4,7 +4,7 @@ *** # Windows Server 2019 - OS Version: 10.0.17763 Build 5329 -- Image Version: 20240128.1.0 +- Image Version: 20240204.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -30,10 +30,10 @@ - Miniconda 23.11.0 (pre-installed on the image but not added to PATH) - NPM 9.8.1 - NuGet 6.8.0.131 -- pip 23.3.2 (python 3.7) +- pip 24.0 (python 3.7) - Pipx 1.2.1 - RubyGems 2.7.6.3 -- Vcpkg (build from commit 7032c5759) +- Vcpkg (build from commit 80403036a) - Yarn 1.22.21 #### Environment variables @@ -51,7 +51,7 @@ ### Tools - 7zip 23.01 - aria2 1.37.0 -- azcopy 10.22.2 +- azcopy 10.23.0 - Bazel 7.0.2 - Bazelisk 1.19.0 - Bicep 0.24.24 @@ -65,11 +65,11 @@ - ghc 9.8.1 - Git 2.43.0.windows.1 - Git LFS 3.4.0 -- Google Cloud CLI 461.0.0 +- Google Cloud CLI 462.0.1 - ImageMagick 7.1.1-27 - InnoSetup 6.2.2 - jq 1.7.1 -- Kind 0.20.0 +- Kind 0.21.0 - Kubectl 1.29.1 - Mercurial 5.0 - gcc 8.1.0 @@ -80,7 +80,7 @@ - OpenSSL 1.1.1w - Packer 1.10.0 - Parcel 2.11.0 -- Pulumi 3.103.1 +- Pulumi 3.104.2 - R 4.3.2 - Service Fabric SDK 9.1.1436.9590 - Stack 2.13.1 @@ -93,14 +93,14 @@ - zstd 1.5.5 ### CLI Tools -- Alibaba Cloud CLI 3.0.197 -- AWS CLI 2.15.15 +- Alibaba Cloud CLI 3.0.198 +- AWS CLI 2.15.17 - AWS SAM CLI 1.108.0 - AWS Session Manager CLI 1.2.553.0 - Azure CLI 2.56.0 - Azure DevOps CLI extension 0.26.0 - Cloud Foundry CLI 6.53.0 -- GitHub CLI 2.42.1 +- GitHub CLI 2.43.1 ### Rust Tools - Cargo 1.75.0 @@ -109,18 +109,18 @@ - Rustup 1.26.0 #### Packages -- bindgen 0.69.2 -- cargo-audit 0.18.3 +- bindgen 0.69.4 +- cargo-audit 0.19.0 - cargo-outdated 0.14.0 - cbindgen 0.26.0 - Clippy 0.1.75 - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 121.0.6167.86 +- Google Chrome 121.0.6167.140 - Chrome Driver 121.0.6167.85 -- Microsoft Edge 121.0.2277.83 -- Microsoft Edge Driver 121.0.2277.83 +- Microsoft Edge 121.0.2277.98 +- Microsoft Edge Driver 121.0.2277.98 - Mozilla Firefox 122.0 - Gecko Driver 0.34.0 - IE Driver 4.14.0.0 @@ -478,10 +478,10 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft Visual C++ 2013 Minimum Runtime | x86 | 12.0.21005 | | Microsoft Visual C++ 2019 Debug Runtime | x64 | 14.29.30153 | | Microsoft Visual C++ 2019 Debug Runtime | x86 | 14.29.30153 | -| Microsoft Visual C++ 2022 Additional Runtime | x64 | 14.38.33130 | -| Microsoft Visual C++ 2022 Minimum Runtime | x64 | 14.38.33130 | -| Microsoft Visual C++ 2022 Additional Runtime | x86 | 14.38.33130 | -| Microsoft Visual C++ 2022 Minimum Runtime | x86 | 14.38.33130 | +| Microsoft Visual C++ 2022 Additional Runtime | x64 | 14.38.33135 | +| Microsoft Visual C++ 2022 Minimum Runtime | x64 | 14.38.33135 | +| Microsoft Visual C++ 2022 Additional Runtime | x86 | 14.38.33135 | +| Microsoft Visual C++ 2022 Minimum Runtime | x86 | 14.38.33135 | #### Installed Windows SDKs - 10.0.14393.0 @@ -512,7 +512,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Az (Cached): 1.0.0.zip, 1.6.0.zip, 2.3.2.zip, 2.6.0.zip, 3.1.0.zip, 3.5.0.zip, 3.8.0.zip, 4.3.0.zip, 4.4.0.zip, 4.7.0.zip, 5.5.0.zip, 5.9.0.zip, 6.6.0.zip, 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.503 +- AWSPowershell: 4.1.508 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 - Microsoft.Graph: 2.12.0 @@ -532,7 +532,7 @@ All other versions are saved but not installed. | Package Name | Version | | -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 8.0 | -| Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.2 | +| Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2 33.0.3<br>32.0.0<br>31.0.0<br>30.0.2 | | Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 2)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3) | | Android SDK Platform-Tools | 34.0.5 | | Android Support Repository | 47.0.0 | From b99ee7f44e4b86fe7a2239ae9c6097641d924ea6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 7 Feb 2024 14:23:13 +0000 Subject: [PATCH 2649/3485] Updating readme file for ubuntu20 version 20240204.1.1 (#9295) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2004-Readme.md | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/images/ubuntu/Ubuntu2004-Readme.md b/images/ubuntu/Ubuntu2004-Readme.md index f9c0e51442be..adfa266ea795 100644 --- a/images/ubuntu/Ubuntu2004-Readme.md +++ b/images/ubuntu/Ubuntu2004-Readme.md @@ -5,7 +5,7 @@ # Ubuntu 20.04 - OS Version: 20.04.6 LTS - Kernel Version: 5.15.0-1054-azure -- Image Version: 20240131.1.0 +- Image Version: 20240204.1.0 - Systemd version: 245.4-4ubuntu3.23 ## Installed Software @@ -41,7 +41,7 @@ - Pip3 20.0.2 - Pipx 1.4.3 - RubyGems 3.1.2 -- Vcpkg (build from commit 10e052511) +- Vcpkg (build from commit 80403036a) - Yarn 1.22.21 #### Environment variables @@ -60,7 +60,7 @@ to accomplish this. ### Project Management - Ant 1.10.7 -- Gradle 8.5 +- Gradle 8.6 - Lerna 8.0.2 - Maven 3.8.8 - Sbt 1.9.8 @@ -89,7 +89,7 @@ to accomplish this. - Heroku 8.7.1 - HHVM (HipHop VM) 4.172.1 - jq 1.6 -- Kind 0.20.0 +- Kind 0.21.0 - Kubectl 1.29.1 - Kustomize 5.3.0 - Leiningen 2.11.1 @@ -104,7 +104,7 @@ to accomplish this. - Parcel 2.11.0 - PhantomJS 2.1.1 2.1.1 - Podman 3.4.2 -- Pulumi 3.104.1 +- Pulumi 3.104.2 - R 4.3.2 - Skopeo 1.5.0 - Sphinx Open Source Search Server 2.2.11 @@ -116,14 +116,14 @@ to accomplish this. ### CLI Tools - Alibaba Cloud CLI 3.0.174 -- AWS CLI 2.15.16 +- AWS CLI 2.15.17 - AWS CLI Session Manager Plugin 1.2.553.0 - AWS SAM CLI 1.108.0 - Azure CLI 2.56.0 - Azure CLI (azure-devops) 0.26.0 - GitHub CLI 2.43.1 - Google Cloud CLI 462.0.1 -- Netlify CLI 17.15.6 +- Netlify CLI 17.15.7 - OpenShift CLI 4.14.10 - ORAS CLI 1.1.0 - Vercel CLI 33.4.1 @@ -157,8 +157,8 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustup 1.26.0 #### Packages -- Bindgen 0.69.2 -- Cargo audit 0.18.3 +- Bindgen 0.69.4 +- Cargo audit 0.19.0 - Cargo clippy 0.1.75 - Cargo outdated 0.14.0 - Cbindgen 0.26.0 @@ -168,8 +168,8 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Google Chrome 121.0.6167.139 - ChromeDriver 121.0.6167.85 - Chromium 121.0.6167.0 -- Microsoft Edge 121.0.2277.83 -- Microsoft Edge WebDriver 121.0.2277.83 +- Microsoft Edge 121.0.2277.98 +- Microsoft Edge WebDriver 121.0.2277.98 - Selenium server 4.17.0 - Mozilla Firefox 122.0 - Geckodriver 0.34.0 @@ -298,11 +298,11 @@ Use the following command as a part of your job to start the service: 'sudo syst | moby/buildkit:latest | sha256:449188623c7a8a3bd4f161c5d0ddf5cabbfb828f7eaadf9ed8111864b911a308 | 2024-01-31 | | node:16 | sha256:f77a1aef2da8d83e45ec990f45df50f1a286c5fe8bbfb8c6e4246c6389705c0b | 2023-09-07 | | node:16-alpine | sha256:a1f9d027912b58a7c75be7716c97cfbc6d3099f3a97ed84aa490be9dee20e787 | 2023-08-10 | -| node:18 | sha256:56ed84097b42a0aa7c218bb7970add8efa4407750a576d8a8e4a5726002ca3b0 | 2024-02-01 | +| node:18 | sha256:2a13079c6393cd19adfd8d362fac004b2d0eed462f3c3fedfad2c0d0de17b429 | 2024-02-01 | | node:18-alpine | sha256:0085670310d2879621f96a4216c893f92e2ded827e9e6ef8437672e1bd72f437 | 2024-01-27 | -| node:20 | sha256:33bfe51ff32a17d6cfb5bca5ae2743a9b2390ac99dcffde543565bb83b1fb786 | 2024-02-01 | +| node:20 | sha256:fd0115473b293460df5b217ea73ff216928f2b0bb7650c5e7aa56aae4c028426 | 2024-02-01 | | node:20-alpine | sha256:2f46fd49c767554c089a5eb219115313b72748d8f62f5eccb58ef52bc36db4ad | 2024-01-27 | -| ubuntu:20.04 | sha256:f2034e7195f61334e6caff6ecf2e965f92d11e888309065da85ff50c617732b8 | 2023-12-13 | +| ubuntu:20.04 | sha256:bb1c41682308d7040f74d103022816d41c50d7b0c89e9d706a74b4e548636e54 | 2024-01-23 | ### Installed apt packages | Name | Version | From 0b5f4562aa01bcafab6b034fd96f7e76621b848e Mon Sep 17 00:00:00 2001 From: MaksimZhukov <46996400+MaksimZhukov@users.noreply.github.com> Date: Wed, 7 Feb 2024 15:37:57 +0100 Subject: [PATCH 2650/3485] [Ubuntu] Update version of libssl (#9311) --- images/ubuntu/scripts/build/install-sqlpackage.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/ubuntu/scripts/build/install-sqlpackage.sh b/images/ubuntu/scripts/build/install-sqlpackage.sh index c002a68d538d..2ef6bd7f4f08 100644 --- a/images/ubuntu/scripts/build/install-sqlpackage.sh +++ b/images/ubuntu/scripts/build/install-sqlpackage.sh @@ -10,8 +10,8 @@ source $HELPER_SCRIPTS/os.sh # Install libssl1.1 dependency if is_ubuntu22; then - libssl_deb_path=$(download_with_retry "http://security.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.1f-1ubuntu2.20_amd64.deb") - libssl_hash="0b3251aee55db6e20d02f4b9a2b703c9874a85ab6a20b12f4870f52f91633d37" + libssl_deb_path=$(download_with_retry "http://security.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.1f-1ubuntu2.21_amd64.deb") + libssl_hash="97d7f8cb9ddc7f06b23dce73a25b75e5c02ec18112c4a8e5da53624d1fd718a2" use_checksum_comparison "$libssl_deb_path" "$libssl_hash" dpkg -i "$libssl_deb_path" From bd5782ca77e824bf5c47918d82e06afb66d9f4bc Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 7 Feb 2024 23:40:58 +0000 Subject: [PATCH 2651/3485] Updating readme file for ubuntu22 version 20240204.1.1 (#9299) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2204-Readme.md | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/images/ubuntu/Ubuntu2204-Readme.md b/images/ubuntu/Ubuntu2204-Readme.md index 7d6c38df3420..7444a55801ce 100644 --- a/images/ubuntu/Ubuntu2204-Readme.md +++ b/images/ubuntu/Ubuntu2204-Readme.md @@ -5,7 +5,7 @@ # Ubuntu 22.04 - OS Version: 22.04.3 LTS - Kernel Version: 6.2.0-1019-azure -- Image Version: 20240201.1.0 +- Image Version: 20240204.1.0 - Systemd version: 249.11-0ubuntu3.12 ## Installed Software @@ -39,7 +39,7 @@ - Pip3 22.0.2 - Pipx 1.4.3 - RubyGems 3.3.5 -- Vcpkg (build from commit 10e052511) +- Vcpkg (build from commit fecdd89f2) - Yarn 1.22.21 #### Environment variables @@ -83,7 +83,7 @@ to accomplish this. - Haveged 1.9.14 - Heroku 8.7.1 - jq 1.6 -- Kind 0.20.0 +- Kind 0.21.0 - Kubectl 1.29.1 - Kustomize 5.3.0 - Leiningen 2.11.1 @@ -108,8 +108,8 @@ to accomplish this. - zstd 1.5.5 ### CLI Tools -- Alibaba Cloud CLI 3.0.197 -- AWS CLI 2.15.16 +- Alibaba Cloud CLI 3.0.198 +- AWS CLI 2.15.17 - AWS CLI Session Manager Plugin 1.2.553.0 - AWS SAM CLI 1.108.0 - Azure CLI 2.56.0 @@ -150,8 +150,8 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustup 1.26.0 #### Packages -- Bindgen 0.69.2 -- Cargo audit 0.18.3 +- Bindgen 0.69.4 +- Cargo audit 0.19.0 - Cargo clippy 0.1.75 - Cargo outdated 0.14.0 - Cbindgen 0.26.0 @@ -161,8 +161,8 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Google Chrome 121.0.6167.139 - ChromeDriver 121.0.6167.85 - Chromium 121.0.6167.0 -- Microsoft Edge 121.0.2277.83 -- Microsoft Edge WebDriver 121.0.2277.83 +- Microsoft Edge 121.0.2277.98 +- Microsoft Edge WebDriver 121.0.2277.98 - Selenium server 4.17.0 - Mozilla Firefox 122.0 - Geckodriver 0.34.0 @@ -285,8 +285,8 @@ Use the following command as a part of your job to start the service: 'sudo syst | node:18-alpine | sha256:0085670310d2879621f96a4216c893f92e2ded827e9e6ef8437672e1bd72f437 | 2024-01-27 | | node:20 | sha256:fd0115473b293460df5b217ea73ff216928f2b0bb7650c5e7aa56aae4c028426 | 2024-02-01 | | node:20-alpine | sha256:2f46fd49c767554c089a5eb219115313b72748d8f62f5eccb58ef52bc36db4ad | 2024-01-27 | -| ubuntu:20.04 | sha256:f2034e7195f61334e6caff6ecf2e965f92d11e888309065da85ff50c617732b8 | 2023-12-13 | -| ubuntu:22.04 | sha256:e6173d4dc55e76b87c4af8db8821b1feae4146dd47341e4d431118c7dd060a74 | 2024-01-11 | +| ubuntu:20.04 | sha256:bb1c41682308d7040f74d103022816d41c50d7b0c89e9d706a74b4e548636e54 | 2024-01-23 | +| ubuntu:22.04 | sha256:e9569c25505f33ff72e88b2990887c9dcf230f23259da296eb814fc2b41af999 | 2024-01-25 | ### Installed apt packages | Name | Version | From 213dba8dd6fe8f67ca007a0fb1c466ac5d5ab187 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Thu, 8 Feb 2024 14:56:43 +0100 Subject: [PATCH 2652/3485] [macOS] remove unused go version from toolset (#9322) --- images/macos/toolsets/toolset-13.json | 3 --- images/macos/toolsets/toolset-14.json | 3 --- 2 files changed, 6 deletions(-) diff --git a/images/macos/toolsets/toolset-13.json b/images/macos/toolsets/toolset-13.json index 274e956612c6..729375c77b5e 100644 --- a/images/macos/toolsets/toolset-13.json +++ b/images/macos/toolsets/toolset-13.json @@ -211,9 +211,6 @@ } } ], - "go": { - "default": "1.20" - }, "node": { "default": "20" }, diff --git a/images/macos/toolsets/toolset-14.json b/images/macos/toolsets/toolset-14.json index 2d3cbc459d26..6397d24b975b 100644 --- a/images/macos/toolsets/toolset-14.json +++ b/images/macos/toolsets/toolset-14.json @@ -184,9 +184,6 @@ } } ], - "go": { - "default": "1.20" - }, "node": { "default": "20" }, From 68d16ce43cec2fd987605f516f2f0821579b8b46 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 8 Feb 2024 19:09:28 +0000 Subject: [PATCH 2653/3485] Updating readme file for win22 version 20240204.1.1 (#9293) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/windows/Windows2022-Readme.md | 50 ++++++++++++++-------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/images/windows/Windows2022-Readme.md b/images/windows/Windows2022-Readme.md index 08f8eaae0a9c..fc489874a8d7 100644 --- a/images/windows/Windows2022-Readme.md +++ b/images/windows/Windows2022-Readme.md @@ -4,7 +4,7 @@ *** # Windows Server 2022 - OS Version: 10.0.20348 Build 2227 -- Image Version: 20240128.1.0 +- Image Version: 20240204.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -30,10 +30,10 @@ - Miniconda 23.11.0 (pre-installed on the image but not added to PATH) - NPM 9.8.1 - NuGet 6.8.0.131 -- pip 23.3.2 (python 3.9) +- pip 24.0 (python 3.9) - Pipx 1.4.3 - RubyGems 3.2.33 -- Vcpkg (build from commit 7032c5759) +- Vcpkg (build from commit 80403036a) - Yarn 1.22.21 #### Environment variables @@ -51,7 +51,7 @@ ### Tools - 7zip 23.01 - aria2 1.37.0 -- azcopy 10.22.2 +- azcopy 10.23.0 - Bazel 7.0.2 - Bazelisk 1.19.0 - Bicep 0.24.24 @@ -68,7 +68,7 @@ - ImageMagick 7.1.1-27 - InnoSetup 6.2.2 - jq 1.7.1 -- Kind 0.20.0 +- Kind 0.21.0 - Kubectl 1.29.1 - Mercurial 5.0 - gcc 12.2.0 @@ -78,7 +78,7 @@ - NSIS 3.09 - OpenSSL 1.1.1w - Packer 1.10.0 -- Pulumi 3.103.1 +- Pulumi 3.104.2 - R 4.3.2 - Service Fabric SDK 9.1.1436.9590 - Stack 2.13.1 @@ -91,13 +91,13 @@ - zstd 1.5.5 ### CLI Tools -- Alibaba Cloud CLI 3.0.197 -- AWS CLI 2.15.15 +- Alibaba Cloud CLI 3.0.198 +- AWS CLI 2.15.17 - AWS SAM CLI 1.108.0 - AWS Session Manager CLI 1.2.553.0 - Azure CLI 2.56.0 - Azure DevOps CLI extension 0.26.0 -- GitHub CLI 2.42.1 +- GitHub CLI 2.43.1 ### Rust Tools - Cargo 1.75.0 @@ -106,18 +106,18 @@ - Rustup 1.26.0 #### Packages -- bindgen 0.69.2 -- cargo-audit 0.18.3 +- bindgen 0.69.4 +- cargo-audit 0.19.0 - cargo-outdated 0.14.0 - cbindgen 0.26.0 - Clippy 0.1.75 - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 121.0.6167.86 +- Google Chrome 121.0.6167.140 - Chrome Driver 121.0.6167.85 -- Microsoft Edge 121.0.2277.83 -- Microsoft Edge Driver 121.0.2277.83 +- Microsoft Edge 121.0.2277.98 +- Microsoft Edge Driver 121.0.2277.98 - Mozilla Firefox 122.0 - Gecko Driver 0.34.0 - IE Driver 4.14.0.0 @@ -221,9 +221,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Nginx | 1.25.3 | C:\tools\nginx-1.25.3\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2022 -| Name | Version | Path | -| ----------------------------- | ------------- | -------------------------------------------------------- | -| Visual Studio Enterprise 2022 | 17.8.34511.84 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | +| Name | Version | Path | +| ----------------------------- | -------------- | -------------------------------------------------------- | +| Visual Studio Enterprise 2022 | 17.8.34525.116 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | #### Workloads, components and extensions | Package | Version | @@ -534,12 +534,12 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | -------------------------------------------- | ------------ | ----------- | | Microsoft Visual C++ 2013 Additional Runtime | x64 | 12.0.40660 | | Microsoft Visual C++ 2013 Minimum Runtime | x64 | 12.0.40660 | -| Microsoft Visual C++ 2022 Additional Runtime | x64 | 14.38.33130 | -| Microsoft Visual C++ 2022 Debug Runtime | x64 | 14.38.33130 | -| Microsoft Visual C++ 2022 Minimum Runtime | x64 | 14.38.33130 | -| Microsoft Visual C++ 2022 Additional Runtime | x86 | 14.38.33130 | -| Microsoft Visual C++ 2022 Debug Runtime | x86 | 14.38.33130 | -| Microsoft Visual C++ 2022 Minimum Runtime | x86 | 14.38.33130 | +| Microsoft Visual C++ 2022 Additional Runtime | x64 | 14.38.33135 | +| Microsoft Visual C++ 2022 Debug Runtime | x64 | 14.38.33135 | +| Microsoft Visual C++ 2022 Minimum Runtime | x64 | 14.38.33135 | +| Microsoft Visual C++ 2022 Additional Runtime | x86 | 14.38.33135 | +| Microsoft Visual C++ 2022 Debug Runtime | x86 | 14.38.33135 | +| Microsoft Visual C++ 2022 Minimum Runtime | x86 | 14.38.33135 | #### Installed Windows SDKs - 10.0.17763.0 @@ -566,7 +566,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Az (Cached): 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.503 +- AWSPowershell: 4.1.508 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 - Microsoft.Graph: 2.12.0 @@ -587,7 +587,7 @@ All other versions are saved but not installed. | -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 8.0 | | Android Emulator | 31.2.9 | -| Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0 | +| Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2 33.0.3<br>32.0.0<br>31.0.0 | | Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 2)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1) | | Android SDK Platform-Tools | 34.0.5 | | Android Support Repository | 47.0.0 | From 04da57c694c573e3d0b5dac6ba51f6347944646a Mon Sep 17 00:00:00 2001 From: sergei-pyshnoi <121864472+sergei-pyshnoi@users.noreply.github.com> Date: Thu, 8 Feb 2024 22:38:51 +0100 Subject: [PATCH 2654/3485] [macOS] add go 1.22 (#9320) --- images/macos/toolsets/toolset-12.json | 3 ++- images/macos/toolsets/toolset-13.json | 6 ++++-- images/macos/toolsets/toolset-14.json | 6 ++++-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index e02723f8b1ba..e1a6ae45517a 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -281,7 +281,8 @@ "versions": [ "1.19.*", "1.20.*", - "1.21.*" + "1.21.*", + "1.22.*" ] } } diff --git a/images/macos/toolsets/toolset-13.json b/images/macos/toolsets/toolset-13.json index 729375c77b5e..e2e71afa4216 100644 --- a/images/macos/toolsets/toolset-13.json +++ b/images/macos/toolsets/toolset-13.json @@ -186,7 +186,8 @@ "versions": [ "1.19.*", "1.20.*", - "1.21.*" + "1.21.*", + "1.22.*" ] }, "arm64": { @@ -194,7 +195,8 @@ "versions": [ "1.19.*", "1.20.*", - "1.21.*" + "1.21.*", + "1.22.*" ] } } diff --git a/images/macos/toolsets/toolset-14.json b/images/macos/toolsets/toolset-14.json index 6397d24b975b..09f86dad7fc2 100644 --- a/images/macos/toolsets/toolset-14.json +++ b/images/macos/toolsets/toolset-14.json @@ -160,14 +160,16 @@ "variable_template" : "GOROOT_{0}_{1}_X64", "versions": [ "1.20.*", - "1.21.*" + "1.21.*", + "1.22.*" ] }, "arm64": { "variable_template" : "GOROOT_{0}_{1}_ARM64", "versions": [ "1.20.*", - "1.21.*" + "1.21.*", + "1.22.*" ] } } From fb980e97513f8eb079e39c3e5f1235617e9e12c2 Mon Sep 17 00:00:00 2001 From: sergei-pyshnoi <121864472+sergei-pyshnoi@users.noreply.github.com> Date: Thu, 8 Feb 2024 22:39:27 +0100 Subject: [PATCH 2655/3485] [Windows] add go 1.22 (#9321) --- images/windows/toolsets/toolset-2019.json | 3 ++- images/windows/toolsets/toolset-2022.json | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/images/windows/toolsets/toolset-2019.json b/images/windows/toolsets/toolset-2019.json index 8d80a9398d46..57ff3cd975e3 100644 --- a/images/windows/toolsets/toolset-2019.json +++ b/images/windows/toolsets/toolset-2019.json @@ -74,7 +74,8 @@ "versions": [ "1.19.*", "1.20.*", - "1.21.*" + "1.21.*", + "1.22.*" ], "default": "1.20.*" } diff --git a/images/windows/toolsets/toolset-2022.json b/images/windows/toolsets/toolset-2022.json index c12e5001cf47..bd39044be8c8 100644 --- a/images/windows/toolsets/toolset-2022.json +++ b/images/windows/toolsets/toolset-2022.json @@ -71,7 +71,8 @@ "versions": [ "1.19.*", "1.20.*", - "1.21.*" + "1.21.*", + "1.22.*" ], "default": "1.20.*" } From e844facbb931ee1a122ef569d76b68edfaf1d8f0 Mon Sep 17 00:00:00 2001 From: sergei-pyshnoi <121864472+sergei-pyshnoi@users.noreply.github.com> Date: Thu, 8 Feb 2024 22:39:59 +0100 Subject: [PATCH 2656/3485] [Ubuntu] add go 1.22 (#9319) --- images/ubuntu/toolsets/toolset-2004.json | 3 ++- images/ubuntu/toolsets/toolset-2204.json | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/images/ubuntu/toolsets/toolset-2004.json b/images/ubuntu/toolsets/toolset-2004.json index 203e620ac261..6be5c9895705 100644 --- a/images/ubuntu/toolsets/toolset-2004.json +++ b/images/ubuntu/toolsets/toolset-2004.json @@ -47,7 +47,8 @@ "versions": [ "1.19.*", "1.20.*", - "1.21.*" + "1.21.*", + "1.22.*" ], "default": "1.20.*" }, diff --git a/images/ubuntu/toolsets/toolset-2204.json b/images/ubuntu/toolsets/toolset-2204.json index 23df32a66b3d..be36fd0a311a 100644 --- a/images/ubuntu/toolsets/toolset-2204.json +++ b/images/ubuntu/toolsets/toolset-2204.json @@ -45,7 +45,8 @@ "versions": [ "1.19.*", "1.20.*", - "1.21.*" + "1.21.*", + "1.22.*" ], "default": "1.20.*" }, From 0390d98adc9f16efe6c10bd48a8cd71eef9a7972 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 9 Feb 2024 15:31:51 +0000 Subject: [PATCH 2657/3485] Updating readme file for macOS-12 version 20240202.1 (#9297) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-12-Readme.md | 34 ++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/images/macos/macos-12-Readme.md b/images/macos/macos-12-Readme.md index ead752588fe5..e962b71ea13b 100644 --- a/images/macos/macos-12-Readme.md +++ b/images/macos/macos-12-Readme.md @@ -5,7 +5,7 @@ # macOS 12 - OS Version: macOS 12.7.3 (21H1015) - Kernel Version: Darwin 21.6.0 -- Image Version: 20240127.1 +- Image Version: 20240202.1 ## Installed Software @@ -38,9 +38,9 @@ ### Package Management - Bundler 2.5.5 - Carthage 0.39.1 -- CocoaPods 1.14.3 +- CocoaPods 1.15.0 - Composer 2.6.6 -- Homebrew 4.2.5 +- Homebrew 4.2.6 - Miniconda 23.11.0 - NPM 10.2.3 - NuGet 6.3.1.1 @@ -48,7 +48,7 @@ - Pip3 23.3.2 (python 3.12) - Pipx 1.4.3 - RubyGems 3.5.5 -- Vcpkg 2024 (build from commit 7032c5759) +- Vcpkg 2024 (build from commit 80403036a) - Yarn 1.22.19 #### Environment variables @@ -66,14 +66,14 @@ ### Utilities - 7-Zip 17.05 - aria2 1.37.0 -- azcopy 10.22.2 +- azcopy 10.23.0 - bazel 7.0.2 - bazelisk 1.19.0 - bsdtar 3.5.1 - available by 'tar' alias -- Curl 8.5.0 +- Curl 8.6.0 - Git 2.43.0 - Git LFS 3.4.1 -- GitHub CLI 2.42.1 +- GitHub CLI 2.43.1 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.21.4 - gpg (GnuPG) 2.4.4 @@ -96,22 +96,22 @@ ### Tools - App Center CLI 2.14.0 -- AWS CLI 2.15.15 +- AWS CLI 2.15.17 - AWS SAM CLI 1.108.0 - AWS Session Manager CLI 1.2.553.0 - Azure CLI 2.56.0 - Azure CLI (azure-devops) 0.26.0 - Bicep CLI 0.24.24 - Cabal 3.10.2.1 -- Cmake 3.28.1 +- Cmake 3.28.2 - CodeQL Action Bundle 2.16.1 -- Colima 0.6.7 +- Colima 0.6.8 - Fastlane 2.219.0 - GHC 9.8.1 - GHCup 0.1.20.0 - Jazzy 0.14.4 - Stack 2.13.1 -- SwiftFormat 0.53.0 +- SwiftFormat 0.53.1 - Swig 4.2.0 - Xcbeautify 1.4.0 - Xcode Command Line Tools 14.2.0.0.1.1668646533 @@ -122,13 +122,13 @@ - Yamllint 1.33.0 ### Browsers -- Safari 17.3 (17617.2.4.11.9) -- SafariDriver 17.3 (17617.2.4.11.9) -- Google Chrome 121.0.6167.85 +- Safari 17.3 (17617.2.4.11.11) +- SafariDriver 17.3 (17617.2.4.11.11) +- Google Chrome 121.0.6167.139 - Google Chrome for Testing 121.0.6167.85 - ChromeDriver 121.0.6167.85 -- Microsoft Edge 121.0.2277.83 -- Microsoft Edge WebDriver 121.0.2277.83 +- Microsoft Edge 121.0.2277.98 +- Microsoft Edge WebDriver 121.0.2277.98 - Mozilla Firefox 122.0 - geckodriver 0.34.0 - Selenium server 4.17.0 @@ -335,7 +335,7 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" | -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 8.0 | | Android Emulator | 33.1.24 | -| Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0 | +| Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2 33.0.3<br>32.0.0<br>31.0.0 | | Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 2)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1) | | Android SDK Platform-Tools | 34.0.5 | | Android Support Repository | 47.0.0 | From d84718d23e27dc0b908f754ef8de3bd710188ff1 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 9 Feb 2024 21:11:36 +0000 Subject: [PATCH 2658/3485] Updating readme file for macos-13-arm64 version 20240204.1 (#9291) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-13-arm64-Readme.md | 86 +++++++++++++-------------- 1 file changed, 40 insertions(+), 46 deletions(-) diff --git a/images/macos/macos-13-arm64-Readme.md b/images/macos/macos-13-arm64-Readme.md index 876133180f48..fef684f1f0b7 100644 --- a/images/macos/macos-13-arm64-Readme.md +++ b/images/macos/macos-13-arm64-Readme.md @@ -1,19 +1,18 @@ | Announcements | |-| | [[All OSes] Powershell Core will be updated to 7.4.x LTS on January, 28](https://github.com/actions/runner-images/issues/9115) | -| [Old versions of Android SDK & tools will be removed from images on January, 8](https://github.com/actions/runner-images/issues/8952) | *** # macOS 13 -- OS Version: macOS 13.6.3 (22G436) +- OS Version: macOS 13.6.4 (22G513) - Kernel Version: Darwin 22.6.0 -- Image Version: 20240114.1 +- Image Version: 20240204.1 ## Installed Software ### Language and Runtime - .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.405, 8.0.101 - Bash 3.2.57(1)-release -- Clang/LLVM 14.0.3 +- Clang/LLVM 15.0.0 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` - GCC 11 (Homebrew GCC 11.4.0) - available by `gcc-11` alias - GCC 12 (Homebrew GCC 12.3.0) - available by `gcc-12` alias @@ -21,43 +20,41 @@ - GNU Fortran 11 (Homebrew GCC 11.4.0) - available by `gfortran-11` alias - GNU Fortran 12 (Homebrew GCC 12.3.0) - available by `gfortran-12` alias - GNU Fortran 13 (Homebrew GCC 13.2.0) - available by `gfortran-13` alias -- Julia 1.10.0 - Kotlin 1.9.22-release-704 - Mono 6.12.0.188 -- Node.js 18.19.0 +- Node.js 20.11.0 - Perl 5.38.2 -- R 4.3.2 - Ruby 3.0.6p216 ### Package Management -- Bundler 2.5.4 +- Bundler 2.5.5 - Carthage 0.39.1 -- CocoaPods 1.14.3 -- Homebrew 4.2.3 -- NPM 10.2.3 +- CocoaPods 1.15.0 +- Homebrew 4.2.6 +- NPM 10.2.4 - NuGet 6.3.1.1 -- RubyGems 3.5.4 +- RubyGems 3.5.5 - Yarn 1.22.19 ### Project Management - Apache Ant 1.10.14 - Apache Maven 3.9.6 -- Gradle 8.5 +- Gradle 8.6 ### Utilities - 7-Zip 17.05 - aria2 1.37.0 -- azcopy 10.21.2 -- bazel 7.0.0 +- azcopy 10.23.0 +- bazel 7.0.2 - bazelisk 1.19.0 - bsdtar 3.5.3 - available by 'tar' alias -- Curl 8.1.2 +- Curl 8.4.0 - Git 2.43.0 - Git LFS 3.4.1 -- GitHub CLI 2.42.0 +- GitHub CLI 2.43.1 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.21.4 -- gpg (GnuPG) 2.4.3 +- gpg (GnuPG) 2.4.4 - jq 1.7.1 - OpenSSL 1.1.1w 11 Sep 2023 - Packer 1.9.4 @@ -66,16 +63,16 @@ - zstd 1.5.5 ### Tools -- AWS CLI 2.15.10 -- AWS SAM CLI 1.107.0 +- AWS CLI 2.15.17 +- AWS SAM CLI 1.108.0 - AWS Session Manager CLI 1.2.553.0 - Azure CLI 2.56.0 - Azure CLI (azure-devops) 0.26.0 - Bicep CLI 0.24.24 -- Cmake 3.28.1 -- CodeQL Action Bundle 2.15.5 +- Cmake 3.28.2 +- CodeQL Action Bundle 2.16.1 - Fastlane 2.219.0 -- SwiftFormat 0.53.0 +- SwiftFormat 0.53.1 - Xcbeautify 1.4.0 - Xcode Command Line Tools 15.1.0.0.1.1700200546 - Xcodes 1.4.1 @@ -83,12 +80,12 @@ ### Linters ### Browsers -- Safari 17.2.1 (18617.1.17.11.12) -- SafariDriver 17.2.1 (18617.1.17.11.12) -- Google Chrome 120.0.6099.216 -- Google Chrome for Testing 120.0.6099.109 -- ChromeDriver 120.0.6099.109 -- Selenium server 4.16.1 +- Safari 17.3 (18617.2.4.11.11) +- SafariDriver 17.3 (18617.2.4.11.11) +- Google Chrome 121.0.6167.139 +- Google Chrome for Testing 121.0.6167.85 +- ChromeDriver 121.0.6167.85 +- Selenium server 4.17.0 #### Environment variables | Name | Value | @@ -98,11 +95,11 @@ | GECKOWEBDRIVER | | ### Java -| Version | Environment Variable | -| ------------------ | -------------------- | -| 11.0.21+9 | JAVA_HOME_11_arm64 | -| 17.0.9+9 (default) | JAVA_HOME_17_arm64 | -| 21.0.1+12.0 | JAVA_HOME_21_arm64 | +| Version | Environment Variable | +| ------------------- | -------------------- | +| 11.0.22+7.1 | JAVA_HOME_11_arm64 | +| 17.0.10+7 (default) | JAVA_HOME_17_arm64 | +| 21.0.2+13.0 | JAVA_HOME_21_arm64 | ### Cached Tools @@ -113,12 +110,12 @@ #### Node.js - 16.20.1 - 18.19.0 -- 20.10.0 +- 20.11.0 #### Go - 1.19.13 -- 1.20.12 -- 1.21.5 +- 1.20.13 +- 1.21.6 ### Rust Tools - Cargo 1.75.0 @@ -131,7 +128,7 @@ - Rustfmt 1.7.0-stable ### PowerShell Tools -- PowerShell 7.2.18 +- PowerShell 7.4.1 #### PowerShell Modules - Az: 11.2.0 @@ -143,14 +140,11 @@ | ---------------- | ------- | ------------------------------ | | 15.2 | 15C500b | /Applications/Xcode_15.2.app | | 15.1 | 15C65 | /Applications/Xcode_15.1.app | -| 15.0.1 | 15A507 | /Applications/Xcode_15.0.1.app | -| 14.3.1 (default) | 14E300c | /Applications/Xcode_14.3.1.app | +| 15.0.1 (default) | 15A507 | /Applications/Xcode_15.0.1.app | +| 14.3.1 | 14E300c | /Applications/Xcode_14.3.1.app | | 14.2 | 14C18 | /Applications/Xcode_14.2.app | | 14.1 | 14B47b | /Applications/Xcode_14.1.app | -#### Xcode Support Tools -- xcpretty 0.3.0 - #### Installed SDKs | SDK | SDK Name | Xcode Version | | ------------------------------------------------------- | --------------------------------------------- | ------------- | @@ -185,11 +179,11 @@ | Simulator - watchOS 9.4 | watchsimulator9.4 | 14.3.1 | | Simulator - watchOS 10.0 | watchsimulator10.0 | 15.0.1 | | Simulator - watchOS 10.2 | watchsimulator10.2 | 15.1, 15.2 | -| Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | | visionOS 1.0 | xros1.0 | 15.2 | +| Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | -| Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | +| Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | | DriverKit 22.1 | driverkit22.1 | 14.1 | | DriverKit 22.2 | driverkit22.2 | 14.2 | | DriverKit 22.4 | driverkit22.4 | 14.3.1 | @@ -219,7 +213,7 @@ | -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 11.0 | | Android Emulator | 33.1.24 | -| Android SDK Build-tools | 34.0.0<br>33.0.2 | +| Android SDK Build-tools | 34.0.0<br>33.0.2 33.0.3 | | Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 2)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | | Android SDK Platform-Tools | 34.0.5 | | Android Support Repository | 47.0.0 | From 13d5100df5e7d490b069f0e284dffbc8e321a756 Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Mon, 12 Feb 2024 10:57:50 +0100 Subject: [PATCH 2659/3485] Pin syft for SBOM report to v0.100.0 (#9334) --- .github/workflows/create_sbom_report.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/create_sbom_report.yml b/.github/workflows/create_sbom_report.yml index be9b8642ae1d..103177a0d47d 100644 --- a/.github/workflows/create_sbom_report.yml +++ b/.github/workflows/create_sbom_report.yml @@ -55,10 +55,10 @@ jobs: } - name: Install SYFT tool on Windows if: ${{ runner.os == 'Windows' }} - run: curl -sSfL https://raw.githubusercontent.com/anchore/syft/main/install.sh | sh -s -- -b D:/syft + run: curl -sSfL https://raw.githubusercontent.com/anchore/syft/main/install.sh | sh -s -- -b D:/syft v0.100.0 - name: Install SYFT tool on Ubuntu or macOS if: ${{ runner.os != 'Windows' }} - run: curl -sSfL https://raw.githubusercontent.com/anchore/syft/main/install.sh | sh -s -- -b /usr/local/bin + run: curl -sSfL https://raw.githubusercontent.com/anchore/syft/main/install.sh | sh -s -- -b /usr/local/bin v0.100.0 #Running section. - name: Run SYFT on Windows if: ${{ runner.os == 'Windows' }} From e579fdb9e6ac25a843bc583291fce07af7e8540d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 13 Feb 2024 12:47:12 +0000 Subject: [PATCH 2660/3485] Updating readme file for ubuntu22 version 20240212.1.1 (#9337) Co-authored-by: Image generation service account <no-reply@microsoft.com> --- images/ubuntu/Ubuntu2204-Readme.md | 77 ++++++++++++++++-------------- 1 file changed, 40 insertions(+), 37 deletions(-) diff --git a/images/ubuntu/Ubuntu2204-Readme.md b/images/ubuntu/Ubuntu2204-Readme.md index 7444a55801ce..005896439475 100644 --- a/images/ubuntu/Ubuntu2204-Readme.md +++ b/images/ubuntu/Ubuntu2204-Readme.md @@ -1,11 +1,13 @@ | Announcements | |-| +| [[All OSes] Ruby versions <= 2.7.x will be removed on February, 26](https://github.com/actions/runner-images/issues/9327) | +| [[All OSes] Go 1.19.x will be removed and 1.21.x set as default on February, 26](https://github.com/actions/runner-images/issues/9326) | | [[All OSes] Powershell Core will be updated to 7.4.x LTS on January, 28](https://github.com/actions/runner-images/issues/9115) | *** # Ubuntu 22.04 - OS Version: 22.04.3 LTS - Kernel Version: 6.2.0-1019-azure -- Image Version: 20240204.1.0 +- Image Version: 20240212.1.0 - Systemd version: 249.11-0ubuntu3.12 ## Installed Software @@ -31,7 +33,7 @@ ### Package Management - cpan 1.64 - Helm 3.14.0 -- Homebrew 4.2.6 +- Homebrew 4.2.7 - Miniconda 23.11.0 - Npm 10.2.3 - NuGet 6.6.1.2 @@ -39,7 +41,7 @@ - Pip3 22.0.2 - Pipx 1.4.3 - RubyGems 3.3.5 -- Vcpkg (build from commit fecdd89f2) +- Vcpkg (build from commit 345ac44ab) - Yarn 1.22.21 #### Environment variables @@ -57,7 +59,7 @@ to accomplish this. ``` ### Project Management -- Lerna 8.0.2 +- Lerna 8.1.2 - Maven 3.8.8 ### Tools @@ -66,9 +68,9 @@ to accomplish this. - AzCopy 10.23.0 - available by `azcopy` and `azcopy10` aliases - Bazel 7.0.2 - Bazelisk 1.19.0 -- Bicep 0.24.24 +- Bicep 0.25.3 - Buildah 1.23.1 -- CMake 3.28.2 +- CMake 3.28.3 - CodeQL Action Bundle 2.16.1 - Docker Amazon ECR Credential Helper 0.7.1 - Docker Compose v1 1.29.2 @@ -81,7 +83,7 @@ to accomplish this. - Git LFS 3.4.1 - Git-ftp 1.6.0 - Haveged 1.9.14 -- Heroku 8.7.1 +- Heroku 8.9.0 - jq 1.6 - Kind 0.21.0 - Kubectl 1.29.1 @@ -91,35 +93,35 @@ to accomplish this. - Mercurial 6.1.1 - Minikube 1.32.0 - n 9.2.0 -- Newman 6.1.0 +- Newman 6.1.1 - nvm 0.39.7 -- OpenSSL 3.0.2-0ubuntu1.13 +- OpenSSL 3.0.2-0ubuntu1.14 - Packer 1.10.1 - Parcel 2.11.0 - Podman 3.4.4 -- Pulumi 3.104.2 +- Pulumi 3.105.0 - R 4.3.2 - Skopeo 1.4.1 - Sphinx Open Source Search Server 2.2.11 - SVN 1.14.1 -- Terraform 1.7.2 -- yamllint 1.33.0 -- yq 4.40.5 +- Terraform 1.7.3 +- yamllint 1.34.0 +- yq 4.40.7 - zstd 1.5.5 ### CLI Tools - Alibaba Cloud CLI 3.0.198 -- AWS CLI 2.15.17 +- AWS CLI 2.15.19 - AWS CLI Session Manager Plugin 1.2.553.0 -- AWS SAM CLI 1.108.0 -- Azure CLI 2.56.0 +- AWS SAM CLI 1.109.0 +- Azure CLI 2.57.0 - Azure CLI (azure-devops) 0.26.0 - GitHub CLI 2.43.1 -- Google Cloud CLI 462.0.1 -- Netlify CLI 17.15.7 -- OpenShift CLI 4.14.10 +- Google Cloud CLI 463.0.0 +- Netlify CLI 17.16.1 +- OpenShift CLI 4.14.11 - ORAS CLI 1.1.0 -- Vercel CLI 33.4.1 +- Vercel CLI 33.5.0 ### Java | Version | Environment Variable | @@ -131,7 +133,7 @@ to accomplish this. ### PHP Tools - PHP: 8.1.2 -- Composer 2.6.6 +- Composer 2.7.1 - PHPUnit 8.5.36 ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. @@ -141,30 +143,30 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Cabal 3.10.2.1 - GHC 9.8.1 - GHCup 0.1.20.0 -- Stack 2.13.1 +- Stack 2.15.1 ### Rust Tools -- Cargo 1.75.0 -- Rust 1.75.0 -- Rustdoc 1.75.0 +- Cargo 1.76.0 +- Rust 1.76.0 +- Rustdoc 1.76.0 - Rustup 1.26.0 #### Packages - Bindgen 0.69.4 - Cargo audit 0.19.0 -- Cargo clippy 0.1.75 +- Cargo clippy 0.1.76 - Cargo outdated 0.14.0 - Cbindgen 0.26.0 - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 121.0.6167.139 +- Google Chrome 121.0.6167.160 - ChromeDriver 121.0.6167.85 - Chromium 121.0.6167.0 -- Microsoft Edge 121.0.2277.98 -- Microsoft Edge WebDriver 121.0.2277.98 +- Microsoft Edge 121.0.2277.113 +- Microsoft Edge WebDriver 121.0.2277.113 - Selenium server 4.17.0 -- Mozilla Firefox 122.0 +- Mozilla Firefox 122.0.1 - Geckodriver 0.34.0 #### Environment variables @@ -183,7 +185,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - sqlite3 3.37.2 #### PostgreSQL -- PostgreSQL 14.10 +- PostgreSQL 14.11 ``` User: postgres PostgreSQL service is disabled by default. @@ -207,8 +209,9 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Go - 1.19.13 -- 1.20.13 -- 1.21.6 +- 1.20.14 +- 1.21.7 +- 1.22.0 #### Node.js - 16.20.2 @@ -220,8 +223,8 @@ Use the following command as a part of your job to start the service: 'sudo syst - 3.8.18 - 3.9.18 - 3.10.13 -- 3.11.7 -- 3.12.1 +- 3.11.8 +- 3.12.2 #### PyPy - 3.7.13 [PyPy 7.3.9] @@ -238,7 +241,7 @@ Use the following command as a part of your job to start the service: 'sudo syst #### PowerShell Modules - Az: 9.3.0 - MarkdownPS: 1.9 -- Microsoft.Graph: 2.12.0 +- Microsoft.Graph: 2.13.1 - Pester: 5.5.0 - PSScriptAnalyzer: 1.21.0 @@ -333,7 +336,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | libmagickwand-dev | 8:6.9.11.60+dfsg-1.3ubuntu0.22.04.3 | | libsecret-1-dev | 0.20.5-2 | | libsqlite3-dev | 3.37.2-2ubuntu0.3 | -| libssl-dev | 3.0.2-0ubuntu1.13 | +| libssl-dev | 3.0.2-0ubuntu1.14 | | libtool | 2.4.6-15build2 | | libunwind8 | 1.3.2-2build2.1 | | libxkbfile-dev | 1:1.1.0-1build3 | From cda60174f79ce81de6a81a7bc5915a1be020edb7 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 13 Feb 2024 12:55:47 +0000 Subject: [PATCH 2661/3485] Updating readme file for win22 version 20240211.1.1 (#9338) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/windows/Windows2022-Readme.md | 59 +++++++++++++++------------- 1 file changed, 31 insertions(+), 28 deletions(-) diff --git a/images/windows/Windows2022-Readme.md b/images/windows/Windows2022-Readme.md index fc489874a8d7..b3770b8cac15 100644 --- a/images/windows/Windows2022-Readme.md +++ b/images/windows/Windows2022-Readme.md @@ -1,10 +1,12 @@ | Announcements | |-| +| [[All OSes] Ruby versions <= 2.7.x will be removed on February, 26](https://github.com/actions/runner-images/issues/9327) | +| [[All OSes] Go 1.19.x will be removed and 1.21.x set as default on February, 26](https://github.com/actions/runner-images/issues/9326) | | [[All OSes] Powershell Core will be updated to 7.4.x LTS on January, 28](https://github.com/actions/runner-images/issues/9115) | *** # Windows Server 2022 - OS Version: 10.0.20348 Build 2227 -- Image Version: 20240204.1.0 +- Image Version: 20240211.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -13,7 +15,7 @@ ### Language and Runtime - Bash 5.2.21(1)-release -- Go 1.20.13 +- Go 1.20.14 - Julia 1.10.0 - Kotlin 1.9.22 - LLVM 16.0.6 @@ -25,7 +27,7 @@ ### Package Management - Chocolatey 2.2.2 -- Composer 2.6.6 +- Composer 2.7.1 - Helm 3.13.3 - Miniconda 23.11.0 (pre-installed on the image but not added to PATH) - NPM 9.8.1 @@ -33,7 +35,7 @@ - pip 24.0 (python 3.9) - Pipx 1.4.3 - RubyGems 3.2.33 -- Vcpkg (build from commit 80403036a) +- Vcpkg (build from commit 345ac44ab) - Yarn 1.22.21 #### Environment variables @@ -44,7 +46,7 @@ ### Project Management - Ant 1.10.14 -- Gradle 8.5 +- Gradle 8.6 - Maven 3.8.7 - sbt 1.9.8 @@ -54,7 +56,7 @@ - azcopy 10.23.0 - Bazel 7.0.2 - Bazelisk 1.19.0 -- Bicep 0.24.24 +- Bicep 0.25.3 - Cabal 3.10.2.1 - CMake 3.27.9 - CodeQL Action Bundle 2.16.1 @@ -74,35 +76,35 @@ - gcc 12.2.0 - gdb 11.2 - GNU Binutils 2.39 -- Newman 6.1.0 +- Newman 6.1.1 - NSIS 3.09 - OpenSSL 1.1.1w - Packer 1.10.0 -- Pulumi 3.104.2 +- Pulumi 3.105.0 - R 4.3.2 - Service Fabric SDK 9.1.1436.9590 -- Stack 2.13.1 +- Stack 2.15.1 - Subversion (SVN) 1.14.2 - Swig 4.1.1 - VSWhere 3.1.7 - WinAppDriver 1.2.2009.02003 - WiX Toolset 3.11.2.4516 -- yamllint 1.33.0 +- yamllint 1.34.0 - zstd 1.5.5 ### CLI Tools - Alibaba Cloud CLI 3.0.198 -- AWS CLI 2.15.17 -- AWS SAM CLI 1.108.0 +- AWS CLI 2.15.19 +- AWS SAM CLI 1.109.0 - AWS Session Manager CLI 1.2.553.0 -- Azure CLI 2.56.0 +- Azure CLI 2.57.0 - Azure DevOps CLI extension 0.26.0 - GitHub CLI 2.43.1 ### Rust Tools -- Cargo 1.75.0 -- Rust 1.75.0 -- Rustdoc 1.75.0 +- Cargo 1.76.0 +- Rust 1.76.0 +- Rustdoc 1.76.0 - Rustup 1.26.0 #### Packages @@ -110,15 +112,15 @@ - cargo-audit 0.19.0 - cargo-outdated 0.14.0 - cbindgen 0.26.0 -- Clippy 0.1.75 +- Clippy 0.1.76 - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 121.0.6167.140 +- Google Chrome 121.0.6167.161 - Chrome Driver 121.0.6167.85 -- Microsoft Edge 121.0.2277.98 -- Microsoft Edge Driver 121.0.2277.98 -- Mozilla Firefox 122.0 +- Microsoft Edge 121.0.2277.112 +- Microsoft Edge Driver 121.0.2277.112 +- Mozilla Firefox 122.0.1 - Gecko Driver 0.34.0 - IE Driver 4.14.0.0 - Selenium server 4.17.0 @@ -160,8 +162,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Go - 1.19.13 -- 1.20.13 -- 1.21.6 +- 1.20.14 +- 1.21.7 +- 1.22.0 #### Node.js - 16.20.2 @@ -173,8 +176,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 3.8.10 - 3.9.13 - 3.10.11 -- 3.11.7 -- 3.12.1 +- 3.11.8 +- 3.12.2 #### PyPy - 2.7.18 [PyPy 7.3.15] @@ -194,7 +197,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Property | Value | | -------------------- | ------------------------------------------------------------------------------------------------------------------------------------ | | ServiceName | postgresql-x64-14 | -| Version | 14.10 | +| Version | 14.11 | | ServiceStatus | Stopped | | ServiceStartType | Disabled | | EnvironmentVariables | PGBIN=C:\Program Files\PostgreSQL\14\bin <br> PGDATA=C:\Program Files\PostgreSQL\14\data <br> PGROOT=C:\Program Files\PostgreSQL\14 | @@ -566,10 +569,10 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Az (Cached): 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.508 +- AWSPowershell: 4.1.513 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 -- Microsoft.Graph: 2.12.0 +- Microsoft.Graph: 2.13.1 - Pester: 3.4.0, 5.5.0 - PowerShellGet: 1.0.0.1, 2.2.5 - PSScriptAnalyzer: 1.21.0 From 0202f4b94c2000e61621a31fe8007a348abcd22f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 13 Feb 2024 14:13:03 +0000 Subject: [PATCH 2662/3485] Updating readme file for ubuntu20 version 20240212.2.1 (#9339) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2004-Readme.md | 75 ++++++++++++++++-------------- 1 file changed, 39 insertions(+), 36 deletions(-) diff --git a/images/ubuntu/Ubuntu2004-Readme.md b/images/ubuntu/Ubuntu2004-Readme.md index adfa266ea795..a92b46739b3e 100644 --- a/images/ubuntu/Ubuntu2004-Readme.md +++ b/images/ubuntu/Ubuntu2004-Readme.md @@ -1,11 +1,13 @@ | Announcements | |-| +| [[All OSes] Ruby versions <= 2.7.x will be removed on February, 26](https://github.com/actions/runner-images/issues/9327) | +| [[All OSes] Go 1.19.x will be removed and 1.21.x set as default on February, 26](https://github.com/actions/runner-images/issues/9326) | | [[All OSes] Powershell Core will be updated to 7.4.x LTS on January, 28](https://github.com/actions/runner-images/issues/9115) | *** # Ubuntu 20.04 - OS Version: 20.04.6 LTS - Kernel Version: 5.15.0-1054-azure -- Image Version: 20240204.1.0 +- Image Version: 20240212.2.0 - Systemd version: 245.4-4ubuntu3.23 ## Installed Software @@ -33,7 +35,7 @@ ### Package Management - cpan 1.64 - Helm 3.14.0 -- Homebrew 4.2.6 +- Homebrew 4.2.7 - Miniconda 23.11.0 - Npm 10.2.3 - NuGet 6.6.1.2 @@ -41,7 +43,7 @@ - Pip3 20.0.2 - Pipx 1.4.3 - RubyGems 3.1.2 -- Vcpkg (build from commit 80403036a) +- Vcpkg (build from commit 345ac44ab) - Yarn 1.22.21 #### Environment variables @@ -61,7 +63,7 @@ to accomplish this. ### Project Management - Ant 1.10.7 - Gradle 8.6 -- Lerna 8.0.2 +- Lerna 8.1.2 - Maven 3.8.8 - Sbt 1.9.8 @@ -71,9 +73,9 @@ to accomplish this. - AzCopy 10.23.0 - available by `azcopy` and `azcopy10` aliases - Bazel 7.0.2 - Bazelisk 1.19.0 -- Bicep 0.24.24 +- Bicep 0.25.3 - Buildah 1.22.3 -- CMake 3.28.2 +- CMake 3.28.3 - CodeQL Action Bundle 2.16.1 - Docker Amazon ECR Credential Helper 0.7.1 - Docker Compose v1 1.29.2 @@ -86,7 +88,7 @@ to accomplish this. - Git LFS 3.4.1 - Git-ftp 1.6.0 - Haveged 1.9.1 -- Heroku 8.7.1 +- Heroku 8.9.0 - HHVM (HipHop VM) 4.172.1 - jq 1.6 - Kind 0.21.0 @@ -97,36 +99,36 @@ to accomplish this. - Mercurial 5.3.1 - Minikube 1.32.0 - n 9.2.0 -- Newman 6.1.0 +- Newman 6.1.1 - nvm 0.39.7 -- OpenSSL 1.1.1f-1ubuntu2.20 +- OpenSSL 1.1.1f-1ubuntu2.21 - Packer 1.10.1 - Parcel 2.11.0 - PhantomJS 2.1.1 2.1.1 - Podman 3.4.2 -- Pulumi 3.104.2 +- Pulumi 3.105.0 - R 4.3.2 - Skopeo 1.5.0 - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 -- Terraform 1.7.2 -- yamllint 1.33.0 -- yq 4.40.5 +- Terraform 1.7.3 +- yamllint 1.34.0 +- yq 4.40.7 - zstd 1.5.5 ### CLI Tools - Alibaba Cloud CLI 3.0.174 -- AWS CLI 2.15.17 +- AWS CLI 2.15.19 - AWS CLI Session Manager Plugin 1.2.553.0 -- AWS SAM CLI 1.108.0 -- Azure CLI 2.56.0 +- AWS SAM CLI 1.109.0 +- Azure CLI 2.57.0 - Azure CLI (azure-devops) 0.26.0 - GitHub CLI 2.43.1 -- Google Cloud CLI 462.0.1 -- Netlify CLI 17.15.7 -- OpenShift CLI 4.14.10 +- Google Cloud CLI 463.0.0 +- Netlify CLI 17.16.1 +- OpenShift CLI 4.14.11 - ORAS CLI 1.1.0 -- Vercel CLI 33.4.1 +- Vercel CLI 33.5.0 ### Java | Version | Environment Variable | @@ -138,7 +140,7 @@ to accomplish this. ### PHP Tools - PHP: 7.4.33, 8.0.30, 8.1.27, 8.2.15, 8.3.2 -- Composer 2.6.6 +- Composer 2.7.1 - PHPUnit 8.5.36 ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. @@ -148,30 +150,30 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Cabal 3.10.2.1 - GHC 9.8.1 - GHCup 0.1.20.0 -- Stack 2.13.1 +- Stack 2.15.1 ### Rust Tools -- Cargo 1.75.0 -- Rust 1.75.0 -- Rustdoc 1.75.0 +- Cargo 1.76.0 +- Rust 1.76.0 +- Rustdoc 1.76.0 - Rustup 1.26.0 #### Packages - Bindgen 0.69.4 - Cargo audit 0.19.0 -- Cargo clippy 0.1.75 +- Cargo clippy 0.1.76 - Cargo outdated 0.14.0 - Cbindgen 0.26.0 - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 121.0.6167.139 +- Google Chrome 121.0.6167.160 - ChromeDriver 121.0.6167.85 - Chromium 121.0.6167.0 -- Microsoft Edge 121.0.2277.98 -- Microsoft Edge WebDriver 121.0.2277.98 +- Microsoft Edge 121.0.2277.113 +- Microsoft Edge WebDriver 121.0.2277.113 - Selenium server 4.17.0 -- Mozilla Firefox 122.0 +- Mozilla Firefox 122.0.1 - Geckodriver 0.34.0 #### Environment variables @@ -191,7 +193,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - sqlite3 3.31.1 #### PostgreSQL -- PostgreSQL 14.10 +- PostgreSQL 14.11 ``` User: postgres PostgreSQL service is disabled by default. @@ -215,8 +217,9 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Go - 1.19.13 -- 1.20.13 -- 1.21.6 +- 1.20.14 +- 1.21.7 +- 1.22.0 #### Node.js - 16.20.2 @@ -228,8 +231,8 @@ Use the following command as a part of your job to start the service: 'sudo syst - 3.8.18 - 3.9.18 - 3.10.13 -- 3.11.7 -- 3.12.1 +- 3.11.8 +- 3.12.2 #### PyPy - 2.7.18 [PyPy 7.3.15] @@ -253,7 +256,7 @@ Use the following command as a part of your job to start the service: 'sudo syst - Az: 9.3.0 - Az (Cached): 3.1.0.zip, 4.4.0.zip, 5.9.0.zip, 6.6.0.zip, 7.5.0.zip - MarkdownPS: 1.9 -- Microsoft.Graph: 2.12.0 +- Microsoft.Graph: 2.13.1 - Pester: 5.5.0 - PSScriptAnalyzer: 1.21.0 From 7535fb59ffbdb1638ace2d693ccc244fb2faf41c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 14 Feb 2024 01:18:08 +0000 Subject: [PATCH 2663/3485] Updating readme file for macos-13 version 20240204.1 (#9292) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-13-Readme.md | 98 ++++++++++++++++----------------- 1 file changed, 46 insertions(+), 52 deletions(-) diff --git a/images/macos/macos-13-Readme.md b/images/macos/macos-13-Readme.md index 4f5038276b1e..704341457e70 100644 --- a/images/macos/macos-13-Readme.md +++ b/images/macos/macos-13-Readme.md @@ -1,19 +1,18 @@ | Announcements | |-| | [[All OSes] Powershell Core will be updated to 7.4.x LTS on January, 28](https://github.com/actions/runner-images/issues/9115) | -| [Old versions of Android SDK & tools will be removed from images on January, 8](https://github.com/actions/runner-images/issues/8952) | *** # macOS 13 -- OS Version: macOS 13.6.3 (22G436) +- OS Version: macOS 13.6.4 (22G513) - Kernel Version: Darwin 22.6.0 -- Image Version: 20240114.1 +- Image Version: 20240204.1 ## Installed Software ### Language and Runtime - .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.405, 8.0.101 - Bash 3.2.57(1)-release -- Clang/LLVM 14.0.3 +- Clang/LLVM 15.0.0 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` - GCC 11 (Homebrew GCC 11.4.0) - available by `gcc-11` alias - GCC 12 (Homebrew GCC 12.3.0) - available by `gcc-12` alias @@ -21,49 +20,47 @@ - GNU Fortran 11 (Homebrew GCC 11.4.0) - available by `gfortran-11` alias - GNU Fortran 12 (Homebrew GCC 12.3.0) - available by `gfortran-12` alias - GNU Fortran 13 (Homebrew GCC 13.2.0) - available by `gfortran-13` alias -- Julia 1.10.0 - Kotlin 1.9.22-release-704 - Mono 6.12.0.188 -- Node.js 18.19.0 +- Node.js 20.11.0 - Perl 5.38.2 -- PHP 8.3.1 +- PHP 8.3.2 - Python3 3.12.1 -- R 4.3.2 - Ruby 3.0.6p216 ### Package Management -- Bundler 2.5.4 +- Bundler 2.5.5 - Carthage 0.39.1 -- CocoaPods 1.14.3 +- CocoaPods 1.15.0 - Composer 2.6.6 -- Homebrew 4.2.3 -- NPM 10.2.3 +- Homebrew 4.2.6 +- NPM 10.2.4 - NuGet 6.3.1.1 -- Pip3 23.3.2 (python 3.12) -- Pipx 1.4.2 -- RubyGems 3.5.4 -- Vcpkg 2024 (build from commit 53bef8994) +- Pip3 24.0 (python 3.12) +- Pipx 1.4.3 +- RubyGems 3.5.5 +- Vcpkg 2024 (build from commit 80403036a) - Yarn 1.22.19 ### Project Management - Apache Ant 1.10.14 - Apache Maven 3.9.6 -- Gradle 8.5 +- Gradle 8.6 ### Utilities - 7-Zip 17.05 - aria2 1.37.0 -- azcopy 10.21.2 -- bazel 7.0.0 +- azcopy 10.23.0 +- bazel 7.0.2 - bazelisk 1.19.0 - bsdtar 3.5.3 - available by 'tar' alias -- Curl 8.5.0 +- Curl 8.6.0 - Git 2.43.0 - Git LFS 3.4.1 -- GitHub CLI 2.42.0 +- GitHub CLI 2.43.1 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.21.4 -- gpg (GnuPG) 2.4.3 +- gpg (GnuPG) 2.4.4 - jq 1.7.1 - OpenSSL 1.1.1w 11 Sep 2023 - Packer 1.9.4 @@ -72,16 +69,16 @@ - zstd 1.5.5 ### Tools -- AWS CLI 2.15.10 -- AWS SAM CLI 1.107.0 +- AWS CLI 2.15.17 +- AWS SAM CLI 1.108.0 - AWS Session Manager CLI 1.2.553.0 - Azure CLI 2.56.0 - Azure CLI (azure-devops) 0.26.0 - Bicep CLI 0.24.24 -- Cmake 3.28.1 -- CodeQL Action Bundle 2.15.5 +- Cmake 3.28.2 +- CodeQL Action Bundle 2.16.1 - Fastlane 2.219.0 -- SwiftFormat 0.53.0 +- SwiftFormat 0.53.1 - Xcbeautify 1.4.0 - Xcode Command Line Tools 15.1.0.0.1.1700200546 - Xcodes 1.4.1 @@ -90,16 +87,16 @@ - SwiftLint 0.53.0 ### Browsers -- Safari 17.2.1 (18617.1.17.11.12) -- SafariDriver 17.2.1 (18617.1.17.11.12) -- Google Chrome 120.0.6099.216 -- Google Chrome for Testing 120.0.6099.109 -- ChromeDriver 120.0.6099.109 -- Microsoft Edge 120.0.2210.133 -- Microsoft Edge WebDriver 120.0.2210.133 -- Mozilla Firefox 121.0.1 +- Safari 17.3 (18617.2.4.11.11) +- SafariDriver 17.3 (18617.2.4.11.11) +- Google Chrome 121.0.6167.139 +- Google Chrome for Testing 121.0.6167.85 +- ChromeDriver 121.0.6167.85 +- Microsoft Edge 121.0.2277.98 +- Microsoft Edge WebDriver 121.0.2277.98 +- Mozilla Firefox 122.0 - geckodriver 0.34.0 -- Selenium server 4.16.1 +- Selenium server 4.17.0 #### Environment variables | Name | Value | @@ -109,12 +106,12 @@ | GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | ### Java -| Version | Environment Variable | -| ------------------ | -------------------- | -| 8.0.392+8 | JAVA_HOME_8_X64 | -| 11.0.21+9 | JAVA_HOME_11_X64 | -| 17.0.9+9 (default) | JAVA_HOME_17_X64 | -| 21.0.1+12.0 | JAVA_HOME_21_X64 | +| Version | Environment Variable | +| ------------------- | -------------------- | +| 8.0.402+6 | JAVA_HOME_8_X64 | +| 11.0.22+7 | JAVA_HOME_11_X64 | +| 17.0.10+7 (default) | JAVA_HOME_17_X64 | +| 21.0.2+13.0 | JAVA_HOME_21_X64 | ### Cached Tools @@ -139,12 +136,12 @@ #### Node.js - 16.20.2 - 18.19.0 -- 20.10.0 +- 20.11.0 #### Go - 1.19.13 -- 1.20.12 -- 1.21.5 +- 1.20.13 +- 1.21.6 ### Rust Tools - Cargo 1.75.0 @@ -157,7 +154,7 @@ - Rustfmt 1.7.0-stable ### PowerShell Tools -- PowerShell 7.2.18 +- PowerShell 7.4.1 #### PowerShell Modules - Az: 11.2.0 @@ -169,14 +166,11 @@ | ---------------- | ------- | ------------------------------ | | 15.2 | 15C500b | /Applications/Xcode_15.2.app | | 15.1 | 15C65 | /Applications/Xcode_15.1.app | -| 15.0.1 | 15A507 | /Applications/Xcode_15.0.1.app | -| 14.3.1 (default) | 14E300c | /Applications/Xcode_14.3.1.app | +| 15.0.1 (default) | 15A507 | /Applications/Xcode_15.0.1.app | +| 14.3.1 | 14E300c | /Applications/Xcode_14.3.1.app | | 14.2 | 14C18 | /Applications/Xcode_14.2.app | | 14.1 | 14B47b | /Applications/Xcode_14.1.app | -#### Xcode Support Tools -- xcpretty 0.3.0 - #### Installed SDKs | SDK | SDK Name | Xcode Version | | ------------------------------------------------------- | --------------------------------------------- | ------------- | @@ -244,7 +238,7 @@ | -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 11.0 | | Android Emulator | 33.1.24 | -| Android SDK Build-tools | 34.0.0<br>33.0.2 | +| Android SDK Build-tools | 34.0.0<br>33.0.2 33.0.3 | | Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 2)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | | Android SDK Platform-Tools | 34.0.5 | | Android Support Repository | 47.0.0 | From 8a4dc5b0f67c00cdd82296fefd78191d6d2e162c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 14 Feb 2024 08:41:32 +0000 Subject: [PATCH 2664/3485] Updating readme file for win19 version 20240211.1.1 (#9340) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/windows/Windows2019-Readme.md | 59 +++++++++++++++------------- 1 file changed, 31 insertions(+), 28 deletions(-) diff --git a/images/windows/Windows2019-Readme.md b/images/windows/Windows2019-Readme.md index 2c8d2c407ef5..a75d097854f3 100644 --- a/images/windows/Windows2019-Readme.md +++ b/images/windows/Windows2019-Readme.md @@ -1,10 +1,12 @@ | Announcements | |-| +| [[All OSes] Ruby versions <= 2.7.x will be removed on February, 26](https://github.com/actions/runner-images/issues/9327) | +| [[All OSes] Go 1.19.x will be removed and 1.21.x set as default on February, 26](https://github.com/actions/runner-images/issues/9326) | | [[All OSes] Powershell Core will be updated to 7.4.x LTS on January, 28](https://github.com/actions/runner-images/issues/9115) | *** # Windows Server 2019 - OS Version: 10.0.17763 Build 5329 -- Image Version: 20240204.1.0 +- Image Version: 20240211.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -13,7 +15,7 @@ ### Language and Runtime - Bash 5.2.21(1)-release -- Go 1.20.13 +- Go 1.20.14 - Julia 1.10.0 - Kotlin 1.9.22 - LLVM 16.0.6 @@ -25,7 +27,7 @@ ### Package Management - Chocolatey 2.2.2 -- Composer 2.6.6 +- Composer 2.7.1 - Helm 3.13.3 - Miniconda 23.11.0 (pre-installed on the image but not added to PATH) - NPM 9.8.1 @@ -33,7 +35,7 @@ - pip 24.0 (python 3.7) - Pipx 1.2.1 - RubyGems 2.7.6.3 -- Vcpkg (build from commit 80403036a) +- Vcpkg (build from commit 345ac44ab) - Yarn 1.22.21 #### Environment variables @@ -44,7 +46,7 @@ ### Project Management - Ant 1.10.14 -- Gradle 8.5 +- Gradle 8.6 - Maven 3.8.7 - sbt 1.9.8 @@ -54,7 +56,7 @@ - azcopy 10.23.0 - Bazel 7.0.2 - Bazelisk 1.19.0 -- Bicep 0.24.24 +- Bicep 0.25.3 - Cabal 3.10.2.1 - CMake 3.27.9 - CodeQL Action Bundle 2.16.1 @@ -65,7 +67,7 @@ - ghc 9.8.1 - Git 2.43.0.windows.1 - Git LFS 3.4.0 -- Google Cloud CLI 462.0.1 +- Google Cloud CLI 463.0.0 - ImageMagick 7.1.1-27 - InnoSetup 6.2.2 - jq 1.7.1 @@ -75,15 +77,15 @@ - gcc 8.1.0 - gdb 8.1 - GNU Binutils 2.30 -- Newman 6.1.0 +- Newman 6.1.1 - NSIS 3.09 - OpenSSL 1.1.1w - Packer 1.10.0 - Parcel 2.11.0 -- Pulumi 3.104.2 +- Pulumi 3.105.0 - R 4.3.2 - Service Fabric SDK 9.1.1436.9590 -- Stack 2.13.1 +- Stack 2.15.1 - Subversion (SVN) 1.14.2 - Swig 4.1.1 - VSWhere 3.1.7 @@ -94,18 +96,18 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.198 -- AWS CLI 2.15.17 -- AWS SAM CLI 1.108.0 +- AWS CLI 2.15.19 +- AWS SAM CLI 1.109.0 - AWS Session Manager CLI 1.2.553.0 -- Azure CLI 2.56.0 +- Azure CLI 2.57.0 - Azure DevOps CLI extension 0.26.0 - Cloud Foundry CLI 6.53.0 - GitHub CLI 2.43.1 ### Rust Tools -- Cargo 1.75.0 -- Rust 1.75.0 -- Rustdoc 1.75.0 +- Cargo 1.76.0 +- Rust 1.76.0 +- Rustdoc 1.76.0 - Rustup 1.26.0 #### Packages @@ -113,15 +115,15 @@ - cargo-audit 0.19.0 - cargo-outdated 0.14.0 - cbindgen 0.26.0 -- Clippy 0.1.75 +- Clippy 0.1.76 - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 121.0.6167.140 +- Google Chrome 121.0.6167.161 - Chrome Driver 121.0.6167.85 -- Microsoft Edge 121.0.2277.98 -- Microsoft Edge Driver 121.0.2277.98 -- Mozilla Firefox 122.0 +- Microsoft Edge 121.0.2277.112 +- Microsoft Edge Driver 121.0.2277.112 +- Mozilla Firefox 122.0.1 - Gecko Driver 0.34.0 - IE Driver 4.14.0.0 - Selenium server 4.17.0 @@ -166,8 +168,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Go - 1.19.13 -- 1.20.13 -- 1.21.6 +- 1.20.14 +- 1.21.7 +- 1.22.0 #### Node.js - 16.20.2 @@ -179,8 +182,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 3.8.10 - 3.9.13 - 3.10.11 -- 3.11.7 -- 3.12.1 +- 3.11.8 +- 3.12.2 #### PyPy - 2.7.18 [PyPy 7.3.15] @@ -203,7 +206,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Property | Value | | -------------------- | ------------------------------------------------------------------------------------------------------------------------------------ | | ServiceName | postgresql-x64-14 | -| Version | 14.10 | +| Version | 14.11 | | ServiceStatus | Stopped | | ServiceStartType | Disabled | | EnvironmentVariables | PGBIN=C:\Program Files\PostgreSQL\14\bin <br> PGDATA=C:\Program Files\PostgreSQL\14\data <br> PGROOT=C:\Program Files\PostgreSQL\14 | @@ -512,10 +515,10 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Az (Cached): 1.0.0.zip, 1.6.0.zip, 2.3.2.zip, 2.6.0.zip, 3.1.0.zip, 3.5.0.zip, 3.8.0.zip, 4.3.0.zip, 4.4.0.zip, 4.7.0.zip, 5.5.0.zip, 5.9.0.zip, 6.6.0.zip, 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.508 +- AWSPowershell: 4.1.513 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 -- Microsoft.Graph: 2.12.0 +- Microsoft.Graph: 2.13.1 - Pester: 3.4.0, 5.5.0 - PowerShellGet: 1.0.0.1, 2.2.5 - PSScriptAnalyzer: 1.21.0 From b33a106fb914e95aefeac186d93f57f07ee8802a Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Wed, 14 Feb 2024 12:09:49 +0100 Subject: [PATCH 2665/3485] [ubuntu] Remove quoted PATH from /etc/environment (#9347) * [ubuntu] Remove quoted PATH from /etc/environment * Update quotes handling in replace_etc_environment_variable() --- images/ubuntu/scripts/build/configure-system.sh | 2 +- images/ubuntu/scripts/helpers/etc-environment.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/images/ubuntu/scripts/build/configure-system.sh b/images/ubuntu/scripts/build/configure-system.sh index 652083eb23a3..5a9e44f049a6 100644 --- a/images/ubuntu/scripts/build/configure-system.sh +++ b/images/ubuntu/scripts/build/configure-system.sh @@ -20,7 +20,7 @@ chmod 755 $IMAGE_FOLDER ENVPATH=$(grep 'PATH=' /etc/environment | head -n 1 | sed -z 's/^PATH=*//') ENVPATH=${ENVPATH#"\""} ENVPATH=${ENVPATH%"\""} -add_etc_environment_variable "PATH" "${ENVPATH}" +replace_etc_environment_variable "PATH" "${ENVPATH}" echo "Updated /etc/environment: $(cat /etc/environment)" # Сlean yarn and npm cache diff --git a/images/ubuntu/scripts/helpers/etc-environment.sh b/images/ubuntu/scripts/helpers/etc-environment.sh index 4255c9d01a3f..6ffafd01c614 100644 --- a/images/ubuntu/scripts/helpers/etc-environment.sh +++ b/images/ubuntu/scripts/helpers/etc-environment.sh @@ -27,7 +27,7 @@ replace_etc_environment_variable() { local variable_value=$2 # modify /etc/environemnt in place by replacing a string that begins with variable_name - sudo sed -i -e "s%^${variable_name}=.*$%${variable_name}=\"${variable_value}\"%" /etc/environment + sudo sed -i -e "s%^${variable_name}=.*$%${variable_name}=${variable_value}%" /etc/environment } set_etc_environment_variable() { From b9da7c8a7644089d9b4288164ca04295158b1be1 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Thu, 15 Feb 2024 12:12:11 +0100 Subject: [PATCH 2666/3485] [Ubuntu] update docker version (#9352) --- images/ubuntu/toolsets/toolset-2004.json | 6 +++--- images/ubuntu/toolsets/toolset-2204.json | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/images/ubuntu/toolsets/toolset-2004.json b/images/ubuntu/toolsets/toolset-2004.json index 6be5c9895705..2b73399c103c 100644 --- a/images/ubuntu/toolsets/toolset-2004.json +++ b/images/ubuntu/toolsets/toolset-2004.json @@ -245,11 +245,11 @@ }, { "package": "docker-ce-cli", - "version": "24.0.7" + "version": "24.0.8" }, { "package": "docker-ce", - "version": "24.0.7" + "version": "24.0.8" } ], "plugins": [ @@ -257,7 +257,7 @@ "plugin": "buildx", "version": "latest", "asset": "linux-amd64" - }, + }, { "plugin": "compose", "version": "2.23.3", diff --git a/images/ubuntu/toolsets/toolset-2204.json b/images/ubuntu/toolsets/toolset-2204.json index be36fd0a311a..8df6c81342ad 100644 --- a/images/ubuntu/toolsets/toolset-2204.json +++ b/images/ubuntu/toolsets/toolset-2204.json @@ -236,11 +236,11 @@ }, { "package": "docker-ce-cli", - "version": "24.0.7" + "version": "24.0.8" }, { "package": "docker-ce", - "version": "24.0.7" + "version": "24.0.8" } ], "plugins": [ From 61a8703bd17400457851cf84ebc1d37290dc680d Mon Sep 17 00:00:00 2001 From: sergei-pyshnoi <121864472+sergei-pyshnoi@users.noreply.github.com> Date: Thu, 15 Feb 2024 12:13:24 +0100 Subject: [PATCH 2667/3485] [Windows] update VS signature (#9348) --- images/windows/toolsets/toolset-2019.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/windows/toolsets/toolset-2019.json b/images/windows/toolsets/toolset-2019.json index 57ff3cd975e3..ad7a68e80af1 100644 --- a/images/windows/toolsets/toolset-2019.json +++ b/images/windows/toolsets/toolset-2019.json @@ -267,7 +267,7 @@ "subversion" : "16", "edition" : "Enterprise", "channel": "release", - "signature": "6E78B3DCE2998F6C2457C3E54DA90A01034916AE", + "signature": "C2048FB509F1C37A8C3E9EC6648118458AA01780", "workloads": [ "Component.Dotfuscator", "Component.Linux.CMake", From 1812c0ce71a56a7767342cacc5176e00abec9678 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Thu, 15 Feb 2024 12:20:54 +0100 Subject: [PATCH 2668/3485] [macOS] Add libsodium to the macOS-14 (#9350) --- images/macos/toolsets/toolset-14.json | 1 + 1 file changed, 1 insertion(+) diff --git a/images/macos/toolsets/toolset-14.json b/images/macos/toolsets/toolset-14.json index 09f86dad7fc2..529baccf4411 100644 --- a/images/macos/toolsets/toolset-14.json +++ b/images/macos/toolsets/toolset-14.json @@ -65,6 +65,7 @@ "gnu-tar", "kotlin", "libpq", + "libsodium", "p7zip", "packer", "perl", From deba4d6cd51c753d23f5f2e9c8bbbb9da75c8b06 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Thu, 15 Feb 2024 18:43:53 +0100 Subject: [PATCH 2669/3485] README: recommend always using main for custom images (#8946) --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index 05cba07fb8a7..4d3e3bf7b083 100644 --- a/README.md +++ b/README.md @@ -205,3 +205,9 @@ For some tools, we always install the latest at the time of the deployment; for <summary><b><i>How do I request that a new tool be pre-installed on the image?</b></i></summary> Please create an issue and get an approval from us to add this tool to the image before creating the pull request. </details> + +<details> + <summary><b><i>What branch should I use to build custom image?</b></i></summary> +We strongly encourage customers to build their own images using the main branch. +This repository contains multiple branches and releases that serve as document milestones to reflect what software is installed in the images at certain point of time. Current builds are not idempotent and if one tries to build a runner image using the specific tag it is not guaranteed that the build will succeed. +</details> From ca82d0a325c2569374f6c030624c287dea3dfb6e Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Thu, 15 Feb 2024 18:55:11 +0100 Subject: [PATCH 2670/3485] [ubuntu] Fix error message redirection in install.sh (#9324) --- images/ubuntu/scripts/helpers/install.sh | 30 ++++++++++++------------ 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/images/ubuntu/scripts/helpers/install.sh b/images/ubuntu/scripts/helpers/install.sh index da954560aaea..edc6cee7492f 100644 --- a/images/ubuntu/scripts/helpers/install.sh +++ b/images/ubuntu/scripts/helpers/install.sh @@ -63,7 +63,7 @@ get_github_releases_by_version() { json=$(curl -fsSL "https://api.github.com/repos/${repo}/releases?per_page=${page_size}") if [[ -z "$json" ]]; then - echo "Failed to get releases" + echo "Failed to get releases" >&2 exit 1 fi @@ -92,8 +92,8 @@ get_github_releases_by_version() { fi if [[ -z "$json_filtered" ]]; then - echo "Failed to get releases from ${repo} matching version ${version}" - echo "Available versions: $(echo "$json" | jq -r '.tag_name')" + echo "Failed to get releases from ${repo} matching version ${version}" >&2 + echo "Available versions: $(echo "$json" | jq -r '.tag_name')" >&2 exit 1 fi @@ -111,8 +111,8 @@ resolve_github_release_asset_url() { matched_url=$(echo $matching_releases | jq -r ".assets[].browser_download_url | select(${url_filter})") if [[ -z "$matched_url" ]]; then - echo "Found no download urls matching pattern: ${url_filter}" - echo "Available download urls: $(echo "$matching_releases" | jq -r '.assets[].browser_download_url')" + echo "Found no download urls matching pattern: ${url_filter}" >&2 + echo "Available download urls: $(echo "$matching_releases" | jq -r '.assets[].browser_download_url')" >&2 exit 1 fi @@ -120,7 +120,7 @@ resolve_github_release_asset_url() { if [[ $allow_multiple_matches == "true" ]]; then matched_url=$(echo "$matched_url" | tail -n 1) else - echo "Multiple matches found for ${version} version and ${url_filter} URL filter. Please make filters more specific" + echo "Multiple matches found for ${version} version and ${url_filter} URL filter. Please make filters more specific" >&2 exit 1 fi fi @@ -136,7 +136,7 @@ get_checksum_from_github_release() { local allow_pre_release=${5:-false} if [[ -z "$file_name" ]]; then - echo "File name is not specified." + echo "File name is not specified." >&2 exit 1 fi @@ -145,7 +145,7 @@ get_checksum_from_github_release() { elif [[ "$hash_type" == "SHA512" ]]; then hash_pattern="[A-Fa-f0-9]{128}" else - echo "Unknown hash type: ${hash_type}" + echo "Unknown hash type: ${hash_type}" >&2 exit 1 fi @@ -153,19 +153,19 @@ get_checksum_from_github_release() { matched_line=$(printf "$(echo $matching_releases | jq '.body')\n" | grep "$file_name") if [[ -z "$matched_line" ]]; then - echo "File name ${file_name} not found in release body" + echo "File name ${file_name} not found in release body" >&2 exit 1 fi if [[ "$(echo "$matched_line" | wc -l)" -gt 1 ]]; then - echo "Multiple matches found for ${file_name} in release body: ${matched_line}" + echo "Multiple matches found for ${file_name} in release body: ${matched_line}" >&2 exit 1 fi hash=$(echo $matched_line | grep -oP "$hash_pattern") if [[ -z "$hash" ]]; then - echo "Found ${file_name} in body of release, but failed to get hash from it: ${matched_line}" + echo "Found ${file_name} in body of release, but failed to get hash from it: ${matched_line}" >&2 exit 1 fi @@ -185,7 +185,7 @@ get_checksum_from_url() { elif [[ "$hash_type" == "SHA512" ]]; then hash_pattern="[A-Fa-f0-9]{128}" else - echo "Unknown hash type: ${hash_type}" + echo "Unknown hash type: ${hash_type}" >&2 exit 1 fi @@ -196,12 +196,12 @@ get_checksum_from_url() { matched_line=$(printf "$checksums\n" | grep "$file_name") if [[ "$(echo "$matched_line" | wc -l)" -gt 1 ]]; then - echo "Found multiple lines matching file name ${file_name} in checksum file." + echo "Found multiple lines matching file name ${file_name} in checksum file." >&2 exit 1 fi if [[ -z "$matched_line" ]]; then - echo "File name ${file_name} not found in checksum file." + echo "File name ${file_name} not found in checksum file." >&2 exit 1 fi @@ -212,7 +212,7 @@ get_checksum_from_url() { fi if [[ -z "$hash" ]]; then - echo "Found ${file_name} in checksum file, but failed to get hash from it: ${matched_line}" + echo "Found ${file_name} in checksum file, but failed to get hash from it: ${matched_line}" >&2 exit 1 fi From 395174881d2f6fd203a41f64f80681cabc81eb25 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Sat, 17 Feb 2024 17:59:40 +0100 Subject: [PATCH 2671/3485] [Windows] Update downloadsPageUrl for mysql (#9359) --- images/windows/scripts/build/Install-MysqlCli.ps1 | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/images/windows/scripts/build/Install-MysqlCli.ps1 b/images/windows/scripts/build/Install-MysqlCli.ps1 index 782a7db5f82d..69d39a69988b 100644 --- a/images/windows/scripts/build/Install-MysqlCli.ps1 +++ b/images/windows/scripts/build/Install-MysqlCli.ps1 @@ -15,7 +15,11 @@ Install-Binary ` $mysqlVersionMajorMinor = $mysqlVersion.ToString(2) if ($mysqlVersion.Build -lt 0) { - $downloadsPageUrl = "https://dev.mysql.com/downloads/mysql/${mysqlVersionMajorMinor}.html" + if ($mysqlVersionMajorMinor -eq "5.7") { + $downloadsPageUrl = "https://downloads.mysql.com/archives/community/" + } else { + $downloadsPageUrl = "https://dev.mysql.com/downloads/mysql/${mysqlVersionMajorMinor}.html" + } $mysqlVersion = Invoke-RestMethod -Uri $downloadsPageUrl -Headers @{ 'User-Agent' = 'curl/8.4.0' } ` | Select-String -Pattern "${mysqlVersionMajorMinor}\.\d+" ` | ForEach-Object { $_.Matches.Value } From 9813840059cb0326f827634de5f1e3b7d92a828e Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Mon, 19 Feb 2024 11:30:42 +0100 Subject: [PATCH 2672/3485] Update README.md (#9362) --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 4d3e3bf7b083..b098e8818aaa 100644 --- a/README.md +++ b/README.md @@ -25,9 +25,9 @@ To build a VM machine from this repo's source, see the [instructions](docs/creat | Ubuntu 20.04 | `ubuntu-20.04` | [ubuntu-20.04] | | macOS 14 [beta] | `macos-14-large`| [macOS-14] | | macOS 14 Arm64 [beta] | `macos-14` or `macos-14-xlarge`| [macOS-14-arm64] | -| macOS 13 | `macos-13` or `macos-13-large` | [macOS-13] | +| macOS 13 | `macos-13`, `macos-13-large` or `macos-latest-large` | [macOS-13] | | macOS 13 Arm64 | `macos-13-xlarge` | [macOS-13-arm64] | -| macOS 12 | `macos-latest`,`macos-12`, `macos-latest-large`, or `macos-12-large`| [macOS-12] | +| macOS 12 | `macos-latest`,`macos-12` or`macos-12-large`| [macOS-12] | | macOS 11 [deprecated] | `macos-11`| [macOS-11] | | Windows Server 2022 | `windows-latest` or `windows-2022` | [windows-2022] | | Windows Server 2019 | `windows-2019` | [windows-2019] | From 4f368bbc5d8f823f27ed9399556f44533f46da14 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 21 Feb 2024 11:11:17 +0000 Subject: [PATCH 2673/3485] Updating readme file for macos-14 version 20240219.1 (#9377) Co-authored-by: Image generation service account <no-reply@microsoft.com> --- images/macos/macos-14-Readme.md | 148 +++++++++++++++++++------------- 1 file changed, 89 insertions(+), 59 deletions(-) diff --git a/images/macos/macos-14-Readme.md b/images/macos/macos-14-Readme.md index b95544185c9a..3ef0bcfa1065 100644 --- a/images/macos/macos-14-Readme.md +++ b/images/macos/macos-14-Readme.md @@ -1,12 +1,17 @@ +| Announcements | +|-| +| [[All OSes] Ruby versions <= 2.7.x will be removed on February, 26](https://github.com/actions/runner-images/issues/9327) | +| [[All OSes] Go 1.19.x will be removed and 1.21.x set as default on February, 26](https://github.com/actions/runner-images/issues/9326) | +*** # macOS 14 -- OS Version: macOS 14.2.1 (23C71) -- Kernel Version: Darwin 23.2.0 -- Image Version: 20240116.1 +- OS Version: macOS 14.3.1 (23D60) +- Kernel Version: Darwin 23.3.0 +- Image Version: 20240219.1 ## Installed Software ### Language and Runtime -- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.405, 8.0.101 +- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.406, 8.0.101, 8.0.201 - Bash 3.2.57(1)-release - Clang/LLVM 15.0.0 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` @@ -16,67 +21,65 @@ - GNU Fortran 11 (Homebrew GCC 11.4.0) - available by `gfortran-11` alias - GNU Fortran 12 (Homebrew GCC 12.3.0) - available by `gfortran-12` alias - GNU Fortran 13 (Homebrew GCC 13.2.0) - available by `gfortran-13` alias -- Julia 1.10.0 - Kotlin 1.9.22-release-704 - Mono 6.12.0.188 -- Node.js 18.19.0 +- Node.js 20.11.1 - Perl 5.38.2 -- PHP 8.3.1 -- Python3 3.11.7 -- R 4.3.2 +- PHP 8.3.3 +- Python3 3.12.2 - Ruby 3.0.6p216 ### Package Management -- Bundler 2.5.4 +- Bundler 2.5.6 - Carthage 0.39.1 -- CocoaPods 1.14.3 -- Composer 2.6.6 -- Homebrew 4.2.4 -- NPM 10.2.3 +- CocoaPods 1.15.2 +- Composer 2.7.1 +- Homebrew 4.2.9 +- NPM 10.2.4 - NuGet 6.3.1.1 -- Pip3 23.3.1 (python 3.11) -- Pipx 1.4.2 -- RubyGems 3.5.4 -- Vcpkg 2024 (build from commit 91b17dd72) +- Pip3 24.0 (python 3.12) +- Pipx 1.4.3 +- RubyGems 3.5.6 +- Vcpkg 2024 (build from commit 13bde2ff1) - Yarn 1.22.19 ### Project Management - Apache Ant 1.10.14 - Apache Maven 3.9.6 -- Gradle 8.5 +- Gradle 8.6 ### Utilities - 7-Zip 17.05 - aria2 1.37.0 -- azcopy 10.21.2 -- bazel 7.0.0 +- azcopy 10.23.0 +- bazel 7.0.2 - bazelisk 1.19.0 - bsdtar 3.5.3 - available by 'tar' alias -- Curl 8.5.0 -- Git 2.43.0 +- Curl 8.6.0 +- Git 2.43.2 - Git LFS 3.4.1 -- GitHub CLI 2.42.0 +- GitHub CLI 2.44.1 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.21.4 -- gpg (GnuPG) 2.4.3 +- gpg (GnuPG) 2.4.4 - jq 1.7.1 - OpenSSL 1.1.1w 11 Sep 2023 - Packer 1.9.4 - pkg-config 0.29.2 -- yq 4.40.5 +- yq 4.41.1 - zstd 1.5.5 ### Tools -- AWS CLI 2.15.10 -- AWS SAM CLI 1.107.0 +- AWS CLI 2.15.21 +- AWS SAM CLI 1.109.0 - AWS Session Manager CLI 1.2.553.0 -- Azure CLI 2.56.0 +- Azure CLI 2.57.0 - Azure CLI (azure-devops) 0.26.0 -- Bicep CLI 0.24.24 -- Cmake 3.28.1 -- CodeQL Action Bundle 2.15.5 +- Bicep CLI 0.25.53 +- Cmake 3.28.3 +- CodeQL Action Bundle 2.16.2 - Fastlane 2.219.0 -- SwiftFormat 0.53.0 +- SwiftFormat 0.53.2 - Xcbeautify 1.4.0 - Xcode Command Line Tools 15.1.0.0.1.1700200546 - Xcodes 1.4.1 @@ -85,16 +88,16 @@ - SwiftLint 0.53.0 ### Browsers -- Safari 17.2.1 (19617.1.17.11.12) -- SafariDriver 17.2.1 (19617.1.17.11.12) -- Google Chrome 120.0.6099.234 -- Google Chrome for Testing 120.0.6099.109 -- ChromeDriver 120.0.6099.109 -- Microsoft Edge 120.0.2210.133 -- Microsoft Edge WebDriver 120.0.2210.133 -- Mozilla Firefox 121.0.1 +- Safari 17.3.1 (19617.2.4.11.12) +- SafariDriver 17.3.1 (19617.2.4.11.12) +- Google Chrome 121.0.6167.184 +- Google Chrome for Testing 121.0.6167.184 +- ChromeDriver 121.0.6167.184 +- Microsoft Edge 121.0.2277.128 +- Microsoft Edge WebDriver 121.0.2277.128 +- Mozilla Firefox 122.0.1 - geckodriver 0.34.0 -- Selenium server 4.16.1 +- Selenium server 4.17.0 #### Environment variables | Name | Value | @@ -106,16 +109,45 @@ ### Java | Version | Environment Variable | | --------------------- | -------------------- | -| 8.0.392+8 | JAVA_HOME_8_X64 | -| 11.0.21+9 | JAVA_HOME_11_X64 | -| 17.0.9+9 | JAVA_HOME_17_X64 | -| 21.0.1+12.0 (default) | JAVA_HOME_21_X64 | +| 8.0.402+6 | JAVA_HOME_8_X64 | +| 11.0.22+7 | JAVA_HOME_11_X64 | +| 17.0.10+7 | JAVA_HOME_17_X64 | +| 21.0.2+13.0 (default) | JAVA_HOME_21_X64 | + +### Cached Tools + +#### Ruby +- 3.0.6 +- 3.1.4 + +#### Python +- 3.11.8 +- 3.12.2 + +#### Node.js +- 18.19.1 +- 20.11.1 + +#### Go +- 1.20.14 +- 1.21.7 +- 1.22.0 + +### Rust Tools +- Cargo 1.76.0 +- Rust 1.76.0 +- Rustdoc 1.76.0 +- Rustup 1.26.0 + +#### Packages +- Clippy 0.1.76 +- Rustfmt 1.7.0-stable ### PowerShell Tools -- PowerShell 7.2.18 +- PowerShell 7.4.1 #### PowerShell Modules -- Az: 11.2.0 +- Az: 11.3.1 - Pester: 5.5.0 - PSScriptAnalyzer: 1.21.0 @@ -127,9 +159,6 @@ | 15.0.1 (default) | 15A507 | /Applications/Xcode_15.0.1.app | | 14.3.1 | 14E300c | /Applications/Xcode_14.3.1.app | -#### Xcode Support Tools -- xcpretty 0.3.0 - #### Installed SDKs | SDK | SDK Name | Xcode Version | | ------------------------------------------------------- | --------------------------------------------- | ------------- | @@ -181,21 +210,22 @@ | -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 11.0 | | Android Emulator | 33.1.24 | -| Android SDK Build-tools | 34.0.0<br>33.0.2 | -| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 2)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | -| Android SDK Platform-Tools | 34.0.5 | +| Android SDK Build-tools | 34.0.0<br>33.0.2 33.0.3 | +| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | +| Android SDK Platform-Tools | 35.0.0 | | Android Support Repository | 47.0.0 | | CMake | 3.22.1 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 24.0.8215888<br>25.2.9519653<br>26.1.10909125 (default) | +| NDK | 24.0.8215888<br>25.2.9519653<br>26.2.11394342 (default) | #### Environment variables | Name | Value | | ----------------------- | --------------------------------------------------- | | ANDROID_HOME | /Users/runner/Library/Android/sdk | -| ANDROID_NDK | /Users/runner/Library/Android/sdk/ndk/26.1.10909125 | -| ANDROID_NDK_HOME | /Users/runner/Library/Android/sdk/ndk/26.1.10909125 | -| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/26.1.10909125 | -| ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk/26.1.10909125 | +| ANDROID_NDK | /Users/runner/Library/Android/sdk/ndk/26.2.11394342 | +| ANDROID_NDK_HOME | /Users/runner/Library/Android/sdk/ndk/26.2.11394342 | +| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/26.2.11394342 | +| ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk/26.2.11394342 | | ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | + From c940226bafb4af0cb68ca867002a3b6f39b76cc0 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 21 Feb 2024 12:44:23 +0000 Subject: [PATCH 2674/3485] Updating readme file for win19 version 20240218.2.1 (#9370) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/windows/Windows2019-Readme.md | 81 ++++++++++++++-------------- 1 file changed, 40 insertions(+), 41 deletions(-) diff --git a/images/windows/Windows2019-Readme.md b/images/windows/Windows2019-Readme.md index a75d097854f3..f3fa90dddf49 100644 --- a/images/windows/Windows2019-Readme.md +++ b/images/windows/Windows2019-Readme.md @@ -2,11 +2,10 @@ |-| | [[All OSes] Ruby versions <= 2.7.x will be removed on February, 26](https://github.com/actions/runner-images/issues/9327) | | [[All OSes] Go 1.19.x will be removed and 1.21.x set as default on February, 26](https://github.com/actions/runner-images/issues/9326) | -| [[All OSes] Powershell Core will be updated to 7.4.x LTS on January, 28](https://github.com/actions/runner-images/issues/9115) | *** # Windows Server 2019 -- OS Version: 10.0.17763 Build 5329 -- Image Version: 20240211.1.0 +- OS Version: 10.0.17763 Build 5458 +- Image Version: 20240218.2.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -21,21 +20,21 @@ - LLVM 16.0.6 - Node 18.18.2 - Perl 5.32.1 -- PHP 8.2.15 +- PHP 8.2.16 - Python 3.7.9 - Ruby 2.5.9p229 ### Package Management - Chocolatey 2.2.2 - Composer 2.7.1 -- Helm 3.13.3 +- Helm 3.14.0 - Miniconda 23.11.0 (pre-installed on the image but not added to PATH) - NPM 9.8.1 -- NuGet 6.8.0.131 +- NuGet 6.9.1.3 - pip 24.0 (python 3.7) - Pipx 1.2.1 - RubyGems 2.7.6.3 -- Vcpkg (build from commit 345ac44ab) +- Vcpkg (build from commit 13bde2ff1) - Yarn 1.22.21 #### Environment variables @@ -56,10 +55,10 @@ - azcopy 10.23.0 - Bazel 7.0.2 - Bazelisk 1.19.0 -- Bicep 0.25.3 +- Bicep 0.25.53 - Cabal 3.10.2.1 -- CMake 3.27.9 -- CodeQL Action Bundle 2.16.1 +- CMake 3.28.3 +- CodeQL Action Bundle 2.16.2 - Docker 24.0.7 - Docker Compose v1 1.29.2 - Docker Compose v2 2.23.3 @@ -67,11 +66,11 @@ - ghc 9.8.1 - Git 2.43.0.windows.1 - Git LFS 3.4.0 -- Google Cloud CLI 463.0.0 -- ImageMagick 7.1.1-27 +- Google Cloud CLI 464.0.0 +- ImageMagick 7.1.1-28 - InnoSetup 6.2.2 - jq 1.7.1 -- Kind 0.21.0 +- Kind 0.22.0 - Kubectl 1.29.1 - Mercurial 5.0 - gcc 8.1.0 @@ -82,7 +81,7 @@ - OpenSSL 1.1.1w - Packer 1.10.0 - Parcel 2.11.0 -- Pulumi 3.105.0 +- Pulumi 3.106.0 - R 4.3.2 - Service Fabric SDK 9.1.1436.9590 - Stack 2.15.1 @@ -96,13 +95,13 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.198 -- AWS CLI 2.15.19 +- AWS CLI 2.15.21 - AWS SAM CLI 1.109.0 - AWS Session Manager CLI 1.2.553.0 - Azure CLI 2.57.0 - Azure DevOps CLI extension 0.26.0 - Cloud Foundry CLI 6.53.0 -- GitHub CLI 2.43.1 +- GitHub CLI 2.44.1 ### Rust Tools - Cargo 1.76.0 @@ -112,17 +111,17 @@ #### Packages - bindgen 0.69.4 -- cargo-audit 0.19.0 +- cargo-audit 0.20.0 - cargo-outdated 0.14.0 - cbindgen 0.26.0 - Clippy 0.1.76 - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 121.0.6167.161 -- Chrome Driver 121.0.6167.85 -- Microsoft Edge 121.0.2277.112 -- Microsoft Edge Driver 121.0.2277.112 +- Google Chrome 121.0.6167.185 +- Chrome Driver 121.0.6167.184 +- Microsoft Edge 121.0.2277.106 +- Microsoft Edge Driver 121.0.2277.128 - Mozilla Firefox 122.0.1 - Gecko Driver 0.34.0 - IE Driver 4.14.0.0 @@ -174,8 +173,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Node.js - 16.20.2 -- 18.19.0 -- 20.11.0 +- 18.19.1 +- 20.11.1 #### Python - 3.7.9 @@ -230,17 +229,17 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Name | Version | ConfigFile | ServiceName | ServiceStatus | ListenPort | | ------ | ------- | ------------------------------------- | ----------- | ------------- | ---------- | | Apache | 2.4.55 | C:\tools\Apache24\conf\httpd.conf | Apache | Stopped | 80 | -| Nginx | 1.25.3 | C:\tools\nginx-1.25.3\conf\nginx.conf | nginx | Stopped | 80 | +| Nginx | 1.25.4 | C:\tools\nginx-1.25.4\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2019 | Name | Version | Path | | ----------------------------- | --------------- | -------------------------------------------------------------- | -| Visual Studio Enterprise 2019 | 16.11.34407.143 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | +| Visual Studio Enterprise 2019 | 16.11.34601.136 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | #### Workloads, components and extensions | Package | Version | | ------------------------------------------------------------------------- | --------------- | -| Component.Android.NDK.R16B | 16.11.34407.143 | +| Component.Android.NDK.R16B | 16.11.34526.176 | | Component.Android.SDK25.Private | 16.0.28625.61 | | Component.Android.SDK30 | 16.10.31205.252 | | Component.Ant | 1.9.3.8 | @@ -498,11 +497,11 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 10.0.22621.0 ### .NET Core Tools -- .NET Core SDK: 6.0.126, 6.0.203, 6.0.321, 6.0.418, 7.0.115, 7.0.203, 7.0.312, 7.0.405 +- .NET Core SDK: 6.0.127, 6.0.203, 6.0.321, 6.0.419, 7.0.116, 7.0.203, 7.0.313, 7.0.406 - .NET Framework: 4.7.2, 4.8 -- Microsoft.AspNetCore.App: 6.0.5, 6.0.26, 7.0.5, 7.0.15 -- Microsoft.NETCore.App: 6.0.5, 6.0.26, 7.0.5, 7.0.15 -- Microsoft.WindowsDesktop.App: 6.0.5, 6.0.26, 7.0.5, 7.0.15 +- Microsoft.AspNetCore.App: 6.0.5, 6.0.26, 6.0.27, 7.0.5, 7.0.16 +- Microsoft.NETCore.App: 6.0.5, 6.0.26, 6.0.27, 7.0.5, 7.0.16 +- Microsoft.WindowsDesktop.App: 6.0.5, 6.0.26, 6.0.27, 7.0.5, 7.0.16 - nbgv 3.6.133+2d32d93cb1 ### PowerShell Tools @@ -515,10 +514,10 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Az (Cached): 1.0.0.zip, 1.6.0.zip, 2.3.2.zip, 2.6.0.zip, 3.1.0.zip, 3.5.0.zip, 3.8.0.zip, 4.3.0.zip, 4.4.0.zip, 4.7.0.zip, 5.5.0.zip, 5.9.0.zip, 6.6.0.zip, 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.513 +- AWSPowershell: 4.1.518 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 -- Microsoft.Graph: 2.13.1 +- Microsoft.Graph: 2.14.0 - Pester: 3.4.0, 5.5.0 - PowerShellGet: 1.0.0.1, 2.2.5 - PSScriptAnalyzer: 1.21.0 @@ -536,14 +535,14 @@ All other versions are saved but not installed. | -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 8.0 | | Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2 33.0.3<br>32.0.0<br>31.0.0<br>30.0.2 | -| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 2)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3) | -| Android SDK Platform-Tools | 34.0.5 | +| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3) | +| Android SDK Platform-Tools | 35.0.0 | | Android Support Repository | 47.0.0 | | CMake | 3.10.2<br>3.18.1<br>3.22.1 | | Google APIs | addon-google_apis-google-21<br>addon-google_apis-google-22<br>addon-google_apis-google-23<br>addon-google_apis-google-24 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 24.0.8215888<br>25.2.9519653<br>26.1.10909125 | +| NDK | 24.0.8215888<br>25.2.9519653<br>26.2.11394342 | #### Environment variables | Name | Value | @@ -551,16 +550,16 @@ All other versions are saved but not installed. | ANDROID_HOME | C:\Android\android-sdk | | ANDROID_NDK | C:\Android\android-sdk\ndk\25.2.9519653 | | ANDROID_NDK_HOME | C:\Android\android-sdk\ndk\25.2.9519653 | -| ANDROID_NDK_LATEST_HOME | C:\Android\android-sdk\ndk\26.1.10909125 | +| ANDROID_NDK_LATEST_HOME | C:\Android\android-sdk\ndk\26.2.11394342 | | ANDROID_NDK_ROOT | C:\Android\android-sdk\ndk\25.2.9519653 | | ANDROID_SDK_ROOT | C:\Android\android-sdk | ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:c50eb90a59089b232ad4358b2369fe94a3a806d7c6b51ad7fbd6c0b2d7c39167 | 2024-01-09 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:e020a77e215dc4f11b64d04f3bfeee7e623f70ba87bd926713665e8a0c1c97c8 | 2024-01-09 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:f7000fcf98754e4e41785765d734fd436b9bee5ac80e0dbca5ffd47fe83038e0 | 2024-01-09 | -| mcr.microsoft.com/windows/nanoserver:1809 | sha256:14b967649dca50e3e7718b2367d43c461b1f035850694e85f19942bce7e6f616 | 2024-01-02 | -| mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:097949cfe0247fde3f8457a4d68fffee63a2385fb83e3be4f5d0dd9a46e9a3c3 | 2024-01-02 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:ac235873629d014498dfddf6aeed8ce60a48703e29157a9f8d97e30ca856de7f | 2024-02-13 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:805fcab81c350abe0299881fafb393ea6b4b0426a0bdf933883d69bc8d306d7a | 2024-02-13 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:acfa738b8316825b41a74459dd0820b3bce1ba95f0faf38398eab2c2eece6a08 | 2024-02-13 | +| mcr.microsoft.com/windows/nanoserver:1809 | sha256:0bd2e8d6d5cdb26eac9ebb0ef939a3b6362af71f3c1ac257fd5f0c53d1fc1388 | 2024-02-04 | +| mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:035894dc32a667c5f6f40054a4e92e208a60691438958c68696084fcce709ed5 | 2024-02-04 | From 38928c989dd2778b309bedf14e1b1bcdb397e218 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Wed, 21 Feb 2024 15:18:51 +0100 Subject: [PATCH 2675/3485] [Ubuntu] update docker components to be >=24.0.9 (#9384) --- images/ubuntu/toolsets/toolset-2004.json | 4 ++-- images/ubuntu/toolsets/toolset-2204.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/images/ubuntu/toolsets/toolset-2004.json b/images/ubuntu/toolsets/toolset-2004.json index 2b73399c103c..36d3acf4a801 100644 --- a/images/ubuntu/toolsets/toolset-2004.json +++ b/images/ubuntu/toolsets/toolset-2004.json @@ -245,11 +245,11 @@ }, { "package": "docker-ce-cli", - "version": "24.0.8" + "version": "24.0.9" }, { "package": "docker-ce", - "version": "24.0.8" + "version": "24.0.9" } ], "plugins": [ diff --git a/images/ubuntu/toolsets/toolset-2204.json b/images/ubuntu/toolsets/toolset-2204.json index 8df6c81342ad..96d324504085 100644 --- a/images/ubuntu/toolsets/toolset-2204.json +++ b/images/ubuntu/toolsets/toolset-2204.json @@ -236,11 +236,11 @@ }, { "package": "docker-ce-cli", - "version": "24.0.8" + "version": "24.0.9" }, { "package": "docker-ce", - "version": "24.0.8" + "version": "24.0.9" } ], "plugins": [ From 688fce6569e06c13412abc39f2cfb54c3bd9e4b9 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 21 Feb 2024 21:17:15 +0000 Subject: [PATCH 2676/3485] Updating readme file for ubuntu20 version 20240218.1.1 (#9372) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2004-Readme.md | 93 +++++++++++++++--------------- 1 file changed, 46 insertions(+), 47 deletions(-) diff --git a/images/ubuntu/Ubuntu2004-Readme.md b/images/ubuntu/Ubuntu2004-Readme.md index a92b46739b3e..ae9a20109edb 100644 --- a/images/ubuntu/Ubuntu2004-Readme.md +++ b/images/ubuntu/Ubuntu2004-Readme.md @@ -2,12 +2,11 @@ |-| | [[All OSes] Ruby versions <= 2.7.x will be removed on February, 26](https://github.com/actions/runner-images/issues/9327) | | [[All OSes] Go 1.19.x will be removed and 1.21.x set as default on February, 26](https://github.com/actions/runner-images/issues/9326) | -| [[All OSes] Powershell Core will be updated to 7.4.x LTS on January, 28](https://github.com/actions/runner-images/issues/9115) | *** # Ubuntu 20.04 - OS Version: 20.04.6 LTS -- Kernel Version: 5.15.0-1054-azure -- Image Version: 20240212.2.0 +- Kernel Version: 5.15.0-1056-azure +- Image Version: 20240218.1.0 - Systemd version: 245.4-4ubuntu3.23 ## Installed Software @@ -22,11 +21,11 @@ - Erlang rebar3 3.22.1 - GNU C++: 9.4.0, 10.5.0 - GNU Fortran: 9.4.0, 10.5.0 -- Julia 1.10.0 +- Julia 1.10.1 - Kotlin 1.9.22-release-704 - Mono 6.12.0.200 - MSBuild 16.10.1.31701 (Mono 6.12.0.200) -- Node.js 18.19.0 +- Node.js 18.19.1 - Perl 5.30.0 - Python 3.8.10 - Ruby 2.7.0p0 @@ -34,16 +33,16 @@ ### Package Management - cpan 1.64 -- Helm 3.14.0 -- Homebrew 4.2.7 +- Helm 3.14.1 +- Homebrew 4.2.8 - Miniconda 23.11.0 -- Npm 10.2.3 +- Npm 10.2.4 - NuGet 6.6.1.2 - Pip 20.0.2 - Pip3 20.0.2 - Pipx 1.4.3 - RubyGems 3.1.2 -- Vcpkg (build from commit 345ac44ab) +- Vcpkg (build from commit 13bde2ff1) - Yarn 1.22.21 #### Environment variables @@ -73,28 +72,28 @@ to accomplish this. - AzCopy 10.23.0 - available by `azcopy` and `azcopy10` aliases - Bazel 7.0.2 - Bazelisk 1.19.0 -- Bicep 0.25.3 +- Bicep 0.25.53 - Buildah 1.22.3 - CMake 3.28.3 -- CodeQL Action Bundle 2.16.1 +- CodeQL Action Bundle 2.16.2 - Docker Amazon ECR Credential Helper 0.7.1 - Docker Compose v1 1.29.2 - Docker Compose v2 2.23.3 - Docker-Buildx 0.12.1 -- Docker Client 24.0.7 -- Docker Server 24.0.7 +- Docker Client 24.0.8 +- Docker Server 24.0.8 - Fastlane 2.219.0 -- Git 2.43.0 +- Git 2.43.2 - Git LFS 3.4.1 - Git-ftp 1.6.0 - Haveged 1.9.1 - Heroku 8.9.0 - HHVM (HipHop VM) 4.172.1 - jq 1.6 -- Kind 0.21.0 -- Kubectl 1.29.1 +- Kind 0.22.0 +- Kubectl 1.29.2 - Kustomize 5.3.0 -- Leiningen 2.11.1 +- Leiningen 2.11.2 - MediaInfo 19.09 - Mercurial 5.3.1 - Minikube 1.32.0 @@ -106,29 +105,29 @@ to accomplish this. - Parcel 2.11.0 - PhantomJS 2.1.1 2.1.1 - Podman 3.4.2 -- Pulumi 3.105.0 +- Pulumi 3.106.0 - R 4.3.2 - Skopeo 1.5.0 - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 - Terraform 1.7.3 -- yamllint 1.34.0 -- yq 4.40.7 +- yamllint 1.35.1 +- yq 4.41.1 - zstd 1.5.5 ### CLI Tools - Alibaba Cloud CLI 3.0.174 -- AWS CLI 2.15.19 +- AWS CLI 2.15.21 - AWS CLI Session Manager Plugin 1.2.553.0 - AWS SAM CLI 1.109.0 - Azure CLI 2.57.0 - Azure CLI (azure-devops) 0.26.0 -- GitHub CLI 2.43.1 -- Google Cloud CLI 463.0.0 -- Netlify CLI 17.16.1 -- OpenShift CLI 4.14.11 +- GitHub CLI 2.44.1 +- Google Cloud CLI 464.0.0 +- Netlify CLI 17.16.2 +- OpenShift CLI 4.14.12 - ORAS CLI 1.1.0 -- Vercel CLI 33.5.0 +- Vercel CLI 33.5.1 ### Java | Version | Environment Variable | @@ -139,7 +138,7 @@ to accomplish this. | 21.0.2+13 | JAVA_HOME_21_X64 | ### PHP Tools -- PHP: 7.4.33, 8.0.30, 8.1.27, 8.2.15, 8.3.2 +- PHP: 7.4.33, 8.0.30, 8.1.27, 8.2.15, 8.3.3 - Composer 2.7.1 - PHPUnit 8.5.36 ``` @@ -160,20 +159,20 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. #### Packages - Bindgen 0.69.4 -- Cargo audit 0.19.0 +- Cargo audit 0.20.0 - Cargo clippy 0.1.76 - Cargo outdated 0.14.0 - Cbindgen 0.26.0 - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 121.0.6167.160 -- ChromeDriver 121.0.6167.85 +- Google Chrome 121.0.6167.184 +- ChromeDriver 121.0.6167.184 - Chromium 121.0.6167.0 -- Microsoft Edge 121.0.2277.113 -- Microsoft Edge WebDriver 121.0.2277.113 +- Microsoft Edge 121.0.2277.128 +- Microsoft Edge WebDriver 121.0.2277.128 - Selenium server 4.17.0 -- Mozilla Firefox 122.0.1 +- Mozilla Firefox 123.0 - Geckodriver 0.34.0 #### Environment variables @@ -185,7 +184,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | ### .NET Tools -- .NET Core SDK: 6.0.418, 7.0.405, 8.0.101 +- .NET Core SDK: 6.0.419, 7.0.406, 8.0.200 - nbgv 3.6.133+2d32d93cb1 ### Databases @@ -223,8 +222,8 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Node.js - 16.20.2 -- 18.19.0 -- 20.11.0 +- 18.19.1 +- 20.11.1 #### Python - 3.7.17 @@ -256,7 +255,7 @@ Use the following command as a part of your job to start the service: 'sudo syst - Az: 9.3.0 - Az (Cached): 3.1.0.zip, 4.4.0.zip, 5.9.0.zip, 6.6.0.zip, 7.5.0.zip - MarkdownPS: 1.9 -- Microsoft.Graph: 2.13.1 +- Microsoft.Graph: 2.14.0 - Pester: 5.5.0 - PSScriptAnalyzer: 1.21.0 @@ -272,12 +271,12 @@ Use the following command as a part of your job to start the service: 'sudo syst | -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 9.0 | | Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2 33.0.3<br>32.0.0<br>31.0.0 | -| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 2)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1) | +| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1) | | Android Support Repository | 47.0.0 | | CMake | 3.10.2<br>3.18.1<br>3.22.1 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 24.0.8215888<br>25.2.9519653 (default)<br>26.1.10909125 | +| NDK | 24.0.8215888<br>25.2.9519653 (default)<br>26.2.11394342 | #### Environment variables | Name | Value | @@ -285,7 +284,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | ANDROID_HOME | /usr/local/lib/android/sdk | | ANDROID_NDK | /usr/local/lib/android/sdk/ndk/25.2.9519653 | | ANDROID_NDK_HOME | /usr/local/lib/android/sdk/ndk/25.2.9519653 | -| ANDROID_NDK_LATEST_HOME | /usr/local/lib/android/sdk/ndk/26.1.10909125 | +| ANDROID_NDK_LATEST_HOME | /usr/local/lib/android/sdk/ndk/26.2.11394342 | | ANDROID_NDK_ROOT | /usr/local/lib/android/sdk/ndk/25.2.9519653 | | ANDROID_SDK_ROOT | /usr/local/lib/android/sdk | @@ -295,16 +294,16 @@ Use the following command as a part of your job to start the service: 'sudo syst | alpine:3.16 | sha256:452e7292acee0ee16c332324d7de05fa2c99f9994ecc9f0779c602916a672ae4 | 2024-01-27 | | alpine:3.17 | sha256:53cf9478b76f4c8fae126acbdfb79bed6e69e628faff572ebe4a029d3d247d98 | 2024-01-27 | | alpine:3.18 | sha256:11e21d7b981a59554b3f822c49f6e9f57b6068bb74f49c4cd5cc4c663c7e5160 | 2024-01-27 | -| debian:10 | sha256:8fc5c3f7828792d01a02f490202c4b1aaa33f00a3beed5bc12814e3ed55fa0e2 | 2024-01-31 | -| debian:11 | sha256:44cfd77e3dbebfa8a0545d9fd1bee6e874cf6998a3bbfb5cccf34919df4e3360 | 2024-01-31 | +| debian:10 | sha256:a52d4e1c201d9ab2f3b939b91a3fdd345d3d11404755bc1cdb22c1d5be131c5d | 2024-02-13 | +| debian:11 | sha256:171478fbe347a3cfe45058dae333b6ed848fd8ce89f3104c89fa94c245086db1 | 2024-02-13 | | debian:9 | sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be | 2022-06-23 | | moby/buildkit:latest | sha256:449188623c7a8a3bd4f161c5d0ddf5cabbfb828f7eaadf9ed8111864b911a308 | 2024-01-31 | | node:16 | sha256:f77a1aef2da8d83e45ec990f45df50f1a286c5fe8bbfb8c6e4246c6389705c0b | 2023-09-07 | | node:16-alpine | sha256:a1f9d027912b58a7c75be7716c97cfbc6d3099f3a97ed84aa490be9dee20e787 | 2023-08-10 | -| node:18 | sha256:2a13079c6393cd19adfd8d362fac004b2d0eed462f3c3fedfad2c0d0de17b429 | 2024-02-01 | -| node:18-alpine | sha256:0085670310d2879621f96a4216c893f92e2ded827e9e6ef8437672e1bd72f437 | 2024-01-27 | -| node:20 | sha256:fd0115473b293460df5b217ea73ff216928f2b0bb7650c5e7aa56aae4c028426 | 2024-02-01 | -| node:20-alpine | sha256:2f46fd49c767554c089a5eb219115313b72748d8f62f5eccb58ef52bc36db4ad | 2024-01-27 | +| node:18 | sha256:aa329c613f0067755c0787d2a3a9802c7d95eecdb927d62b910ec1d28689882f | 2024-02-15 | +| node:18-alpine | sha256:ca9f6cb0466f9638e59e0c249d335a07c867cd50c429b5c7830dda1bed584649 | 2024-02-15 | +| node:20 | sha256:f3299f16246c71ab8b304d6745bb4059fa9283e8d025972e28436a9f9b36ed24 | 2024-02-15 | +| node:20-alpine | sha256:c0a3badbd8a0a760de903e00cedbca94588e609299820557e72cba2a53dbaa2c | 2024-02-15 | | ubuntu:20.04 | sha256:bb1c41682308d7040f74d103022816d41c50d7b0c89e9d706a74b4e548636e54 | 2024-01-23 | ### Installed apt packages @@ -390,7 +389,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | time | 1.7-25.1build1 | | tk | 8.6.9+1 | | tzdata | 2023d-0ubuntu0.20.04 | -| unzip | 6.0-25ubuntu1.1 | +| unzip | 6.0-25ubuntu1.2 | | upx | 3.95-2build1 | | wget | 1.20.3-1ubuntu2 | | xorriso | 1.5.2-1 | From 4fb315d636d8d0872c0bcae98df669755354c15f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 21 Feb 2024 23:30:45 +0000 Subject: [PATCH 2677/3485] Updating readme file for ubuntu22 version 20240218.1.1 (#9371) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2204-Readme.md | 99 +++++++++++++++--------------- 1 file changed, 49 insertions(+), 50 deletions(-) diff --git a/images/ubuntu/Ubuntu2204-Readme.md b/images/ubuntu/Ubuntu2204-Readme.md index 005896439475..7baefcca0c6b 100644 --- a/images/ubuntu/Ubuntu2204-Readme.md +++ b/images/ubuntu/Ubuntu2204-Readme.md @@ -2,12 +2,11 @@ |-| | [[All OSes] Ruby versions <= 2.7.x will be removed on February, 26](https://github.com/actions/runner-images/issues/9327) | | [[All OSes] Go 1.19.x will be removed and 1.21.x set as default on February, 26](https://github.com/actions/runner-images/issues/9326) | -| [[All OSes] Powershell Core will be updated to 7.4.x LTS on January, 28](https://github.com/actions/runner-images/issues/9115) | *** # Ubuntu 22.04 -- OS Version: 22.04.3 LTS +- OS Version: 22.04.4 LTS - Kernel Version: 6.2.0-1019-azure -- Image Version: 20240212.1.0 +- Image Version: 20240218.1.0 - Systemd version: 249.11-0ubuntu3.12 ## Installed Software @@ -20,11 +19,11 @@ - Dash 0.5.11+git20210903+057cd650a4ed-3build1 - GNU C++: 9.5.0, 10.5.0, 11.4.0, 12.3.0, 13.1.0 - GNU Fortran: 9.5.0, 10.5.0, 11.4.0, 12.3.0, 13.1.0 -- Julia 1.10.0 +- Julia 1.10.1 - Kotlin 1.9.22-release-704 - Mono 6.12.0.200 - MSBuild 16.10.1.31701 (Mono 6.12.0.200) -- Node.js 18.19.0 +- Node.js 18.19.1 - Perl 5.34.0 - Python 3.10.12 - Ruby 3.0.2p107 @@ -32,16 +31,16 @@ ### Package Management - cpan 1.64 -- Helm 3.14.0 -- Homebrew 4.2.7 +- Helm 3.14.1 +- Homebrew 4.2.8 - Miniconda 23.11.0 -- Npm 10.2.3 +- Npm 10.2.4 - NuGet 6.6.1.2 - Pip 22.0.2 - Pip3 22.0.2 - Pipx 1.4.3 - RubyGems 3.3.5 -- Vcpkg (build from commit 345ac44ab) +- Vcpkg (build from commit 13bde2ff1) - Yarn 1.22.21 #### Environment variables @@ -68,27 +67,27 @@ to accomplish this. - AzCopy 10.23.0 - available by `azcopy` and `azcopy10` aliases - Bazel 7.0.2 - Bazelisk 1.19.0 -- Bicep 0.25.3 +- Bicep 0.25.53 - Buildah 1.23.1 - CMake 3.28.3 -- CodeQL Action Bundle 2.16.1 +- CodeQL Action Bundle 2.16.2 - Docker Amazon ECR Credential Helper 0.7.1 - Docker Compose v1 1.29.2 - Docker Compose v2 2.23.3 - Docker-Buildx 0.12.1 -- Docker Client 24.0.7 -- Docker Server 24.0.7 +- Docker Client 24.0.8 +- Docker Server 24.0.8 - Fastlane 2.219.0 -- Git 2.43.0 +- Git 2.43.2 - Git LFS 3.4.1 - Git-ftp 1.6.0 - Haveged 1.9.14 - Heroku 8.9.0 - jq 1.6 -- Kind 0.21.0 -- Kubectl 1.29.1 +- Kind 0.22.0 +- Kubectl 1.29.2 - Kustomize 5.3.0 -- Leiningen 2.11.1 +- Leiningen 2.11.2 - MediaInfo 21.09 - Mercurial 6.1.1 - Minikube 1.32.0 @@ -99,29 +98,29 @@ to accomplish this. - Packer 1.10.1 - Parcel 2.11.0 - Podman 3.4.4 -- Pulumi 3.105.0 +- Pulumi 3.106.0 - R 4.3.2 - Skopeo 1.4.1 - Sphinx Open Source Search Server 2.2.11 - SVN 1.14.1 - Terraform 1.7.3 -- yamllint 1.34.0 -- yq 4.40.7 +- yamllint 1.35.1 +- yq 4.41.1 - zstd 1.5.5 ### CLI Tools - Alibaba Cloud CLI 3.0.198 -- AWS CLI 2.15.19 +- AWS CLI 2.15.21 - AWS CLI Session Manager Plugin 1.2.553.0 - AWS SAM CLI 1.109.0 - Azure CLI 2.57.0 - Azure CLI (azure-devops) 0.26.0 -- GitHub CLI 2.43.1 -- Google Cloud CLI 463.0.0 -- Netlify CLI 17.16.1 -- OpenShift CLI 4.14.11 +- GitHub CLI 2.44.1 +- Google Cloud CLI 464.0.0 +- Netlify CLI 17.16.2 +- OpenShift CLI 4.14.12 - ORAS CLI 1.1.0 -- Vercel CLI 33.5.0 +- Vercel CLI 33.5.1 ### Java | Version | Environment Variable | @@ -153,20 +152,20 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. #### Packages - Bindgen 0.69.4 -- Cargo audit 0.19.0 +- Cargo audit 0.20.0 - Cargo clippy 0.1.76 - Cargo outdated 0.14.0 - Cbindgen 0.26.0 - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 121.0.6167.160 -- ChromeDriver 121.0.6167.85 +- Google Chrome 121.0.6167.184 +- ChromeDriver 121.0.6167.184 - Chromium 121.0.6167.0 -- Microsoft Edge 121.0.2277.113 -- Microsoft Edge WebDriver 121.0.2277.113 +- Microsoft Edge 121.0.2277.128 +- Microsoft Edge WebDriver 121.0.2277.128 - Selenium server 4.17.0 -- Mozilla Firefox 122.0.1 +- Mozilla Firefox 123.0 - Geckodriver 0.34.0 #### Environment variables @@ -178,7 +177,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | ### .NET Tools -- .NET Core SDK: 6.0.418, 7.0.405, 8.0.101 +- .NET Core SDK: 6.0.419, 7.0.406, 8.0.200 - nbgv 3.6.133+2d32d93cb1 ### Databases @@ -215,8 +214,8 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Node.js - 16.20.2 -- 18.19.0 -- 20.11.0 +- 18.19.1 +- 20.11.1 #### Python - 3.7.17 @@ -241,7 +240,7 @@ Use the following command as a part of your job to start the service: 'sudo syst #### PowerShell Modules - Az: 9.3.0 - MarkdownPS: 1.9 -- Microsoft.Graph: 2.13.1 +- Microsoft.Graph: 2.14.0 - Pester: 5.5.0 - PSScriptAnalyzer: 1.21.0 @@ -256,12 +255,12 @@ Use the following command as a part of your job to start the service: 'sudo syst | -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 9.0 | | Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2 33.0.3<br>32.0.0<br>31.0.0 | -| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 2)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1) | +| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1) | | Android Support Repository | 47.0.0 | | CMake | 3.10.2<br>3.18.1<br>3.22.1 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 24.0.8215888<br>25.2.9519653 (default)<br>26.1.10909125 | +| NDK | 24.0.8215888<br>25.2.9519653 (default)<br>26.2.11394342 | #### Environment variables | Name | Value | @@ -269,7 +268,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | ANDROID_HOME | /usr/local/lib/android/sdk | | ANDROID_NDK | /usr/local/lib/android/sdk/ndk/25.2.9519653 | | ANDROID_NDK_HOME | /usr/local/lib/android/sdk/ndk/25.2.9519653 | -| ANDROID_NDK_LATEST_HOME | /usr/local/lib/android/sdk/ndk/26.1.10909125 | +| ANDROID_NDK_LATEST_HOME | /usr/local/lib/android/sdk/ndk/26.2.11394342 | | ANDROID_NDK_ROOT | /usr/local/lib/android/sdk/ndk/25.2.9519653 | | ANDROID_SDK_ROOT | /usr/local/lib/android/sdk | @@ -279,17 +278,17 @@ Use the following command as a part of your job to start the service: 'sudo syst | alpine:3.16 | sha256:452e7292acee0ee16c332324d7de05fa2c99f9994ecc9f0779c602916a672ae4 | 2024-01-27 | | alpine:3.17 | sha256:53cf9478b76f4c8fae126acbdfb79bed6e69e628faff572ebe4a029d3d247d98 | 2024-01-27 | | alpine:3.18 | sha256:11e21d7b981a59554b3f822c49f6e9f57b6068bb74f49c4cd5cc4c663c7e5160 | 2024-01-27 | -| debian:10 | sha256:8fc5c3f7828792d01a02f490202c4b1aaa33f00a3beed5bc12814e3ed55fa0e2 | 2024-01-31 | -| debian:11 | sha256:44cfd77e3dbebfa8a0545d9fd1bee6e874cf6998a3bbfb5cccf34919df4e3360 | 2024-01-31 | +| debian:10 | sha256:a52d4e1c201d9ab2f3b939b91a3fdd345d3d11404755bc1cdb22c1d5be131c5d | 2024-02-13 | +| debian:11 | sha256:171478fbe347a3cfe45058dae333b6ed848fd8ce89f3104c89fa94c245086db1 | 2024-02-13 | | moby/buildkit:latest | sha256:449188623c7a8a3bd4f161c5d0ddf5cabbfb828f7eaadf9ed8111864b911a308 | 2024-01-31 | | node:16 | sha256:f77a1aef2da8d83e45ec990f45df50f1a286c5fe8bbfb8c6e4246c6389705c0b | 2023-09-07 | | node:16-alpine | sha256:a1f9d027912b58a7c75be7716c97cfbc6d3099f3a97ed84aa490be9dee20e787 | 2023-08-10 | -| node:18 | sha256:2a13079c6393cd19adfd8d362fac004b2d0eed462f3c3fedfad2c0d0de17b429 | 2024-02-01 | -| node:18-alpine | sha256:0085670310d2879621f96a4216c893f92e2ded827e9e6ef8437672e1bd72f437 | 2024-01-27 | -| node:20 | sha256:fd0115473b293460df5b217ea73ff216928f2b0bb7650c5e7aa56aae4c028426 | 2024-02-01 | -| node:20-alpine | sha256:2f46fd49c767554c089a5eb219115313b72748d8f62f5eccb58ef52bc36db4ad | 2024-01-27 | +| node:18 | sha256:aa329c613f0067755c0787d2a3a9802c7d95eecdb927d62b910ec1d28689882f | 2024-02-15 | +| node:18-alpine | sha256:ca9f6cb0466f9638e59e0c249d335a07c867cd50c429b5c7830dda1bed584649 | 2024-02-15 | +| node:20 | sha256:f3299f16246c71ab8b304d6745bb4059fa9283e8d025972e28436a9f9b36ed24 | 2024-02-15 | +| node:20-alpine | sha256:c0a3badbd8a0a760de903e00cedbca94588e609299820557e72cba2a53dbaa2c | 2024-02-15 | | ubuntu:20.04 | sha256:bb1c41682308d7040f74d103022816d41c50d7b0c89e9d706a74b4e548636e54 | 2024-01-23 | -| ubuntu:22.04 | sha256:e9569c25505f33ff72e88b2990887c9dcf230f23259da296eb814fc2b41af999 | 2024-01-25 | +| ubuntu:22.04 | sha256:f9d633ff6640178c2d0525017174a688e2c1aef28f0a0130b26bd5554491f0da | 2024-02-13 | ### Installed apt packages | Name | Version | @@ -302,10 +301,10 @@ Use the following command as a part of your job to start the service: 'sudo syst | bison | 2:3.8.2+dfsg-1build1 | | brotli | 1.0.9-2build6 | | bzip2 | 1.0.8-5build1 | -| coreutils | 8.32-4.1ubuntu1 | +| coreutils | 8.32-4.1ubuntu1.1 | | curl | 7.81.0-1ubuntu1.15 | | dbus | 1.12.20-2ubuntu4.1 | -| dnsutils | 1:9.18.18-0ubuntu0.22.04.1 | +| dnsutils | 1:9.18.18-0ubuntu0.22.04.2 | | dpkg | 1.21.1ubuntu2.2 | | dpkg-dev | 1.21.1ubuntu2.2 | | fakeroot | 1.28-1ubuntu1 | @@ -327,7 +326,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | libc++abi-dev | 1:14.0-55\~exp2 | | libc6-dev | 2.35-0ubuntu3.6 | | libcurl4 | 7.81.0-1ubuntu1.15 | -| libgbm-dev | 23.0.4-0ubuntu1\~22.04.1 | +| libgbm-dev | 23.2.1-1ubuntu3.1\~22.04.2 | | libgconf-2-4 | 3.2.6-7ubuntu2 | | libgsl-dev | 2.7.1+dfsg-3 | | libgtk-3-0 | 3.24.33-1ubuntu2 | @@ -376,7 +375,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | time | 1.9-0.1build2 | | tk | 8.6.11+1build2 | | tzdata | 2023d-0ubuntu0.22.04 | -| unzip | 6.0-26ubuntu3.1 | +| unzip | 6.0-26ubuntu3.2 | | upx | 3.96-3 | | wget | 1.21.2-2ubuntu1 | | xorriso | 1.5.4-2 | From 554135d9c680ad160cc4c8f141d631765deefe33 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 22 Feb 2024 10:04:52 +0000 Subject: [PATCH 2678/3485] Updating readme file for win22 version 20240218.2.1 (#9376) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/windows/Windows2022-Readme.md | 647 +++++++++++++-------------- 1 file changed, 323 insertions(+), 324 deletions(-) diff --git a/images/windows/Windows2022-Readme.md b/images/windows/Windows2022-Readme.md index b3770b8cac15..3f536bfe8009 100644 --- a/images/windows/Windows2022-Readme.md +++ b/images/windows/Windows2022-Readme.md @@ -2,11 +2,10 @@ |-| | [[All OSes] Ruby versions <= 2.7.x will be removed on February, 26](https://github.com/actions/runner-images/issues/9327) | | [[All OSes] Go 1.19.x will be removed and 1.21.x set as default on February, 26](https://github.com/actions/runner-images/issues/9326) | -| [[All OSes] Powershell Core will be updated to 7.4.x LTS on January, 28](https://github.com/actions/runner-images/issues/9115) | *** # Windows Server 2022 -- OS Version: 10.0.20348 Build 2227 -- Image Version: 20240211.1.0 +- OS Version: 10.0.20348 Build 2322 +- Image Version: 20240218.2.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -21,21 +20,21 @@ - LLVM 16.0.6 - Node 18.18.2 - Perl 5.32.1 -- PHP 8.2.15 +- PHP 8.2.16 - Python 3.9.13 - Ruby 3.0.6p216 ### Package Management - Chocolatey 2.2.2 - Composer 2.7.1 -- Helm 3.13.3 +- Helm 3.14.0 - Miniconda 23.11.0 (pre-installed on the image but not added to PATH) - NPM 9.8.1 -- NuGet 6.8.0.131 +- NuGet 6.9.1.3 - pip 24.0 (python 3.9) - Pipx 1.4.3 - RubyGems 3.2.33 -- Vcpkg (build from commit 345ac44ab) +- Vcpkg (build from commit 13bde2ff1) - Yarn 1.22.21 #### Environment variables @@ -56,10 +55,10 @@ - azcopy 10.23.0 - Bazel 7.0.2 - Bazelisk 1.19.0 -- Bicep 0.25.3 +- Bicep 0.25.53 - Cabal 3.10.2.1 -- CMake 3.27.9 -- CodeQL Action Bundle 2.16.1 +- CMake 3.28.3 +- CodeQL Action Bundle 2.16.2 - Docker 24.0.7 - Docker Compose v1 1.29.2 - Docker Compose v2 2.23.3 @@ -67,10 +66,10 @@ - ghc 9.8.1 - Git 2.43.0.windows.1 - Git LFS 3.4.0 -- ImageMagick 7.1.1-27 +- ImageMagick 7.1.1-28 - InnoSetup 6.2.2 - jq 1.7.1 -- Kind 0.21.0 +- Kind 0.22.0 - Kubectl 1.29.1 - Mercurial 5.0 - gcc 12.2.0 @@ -89,17 +88,17 @@ - VSWhere 3.1.7 - WinAppDriver 1.2.2009.02003 - WiX Toolset 3.11.2.4516 -- yamllint 1.34.0 +- yamllint 1.35.1 - zstd 1.5.5 ### CLI Tools - Alibaba Cloud CLI 3.0.198 -- AWS CLI 2.15.19 +- AWS CLI 2.15.21 - AWS SAM CLI 1.109.0 - AWS Session Manager CLI 1.2.553.0 - Azure CLI 2.57.0 - Azure DevOps CLI extension 0.26.0 -- GitHub CLI 2.43.1 +- GitHub CLI 2.44.1 ### Rust Tools - Cargo 1.76.0 @@ -109,17 +108,17 @@ #### Packages - bindgen 0.69.4 -- cargo-audit 0.19.0 +- cargo-audit 0.20.0 - cargo-outdated 0.14.0 - cbindgen 0.26.0 - Clippy 0.1.76 - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 121.0.6167.161 -- Chrome Driver 121.0.6167.85 -- Microsoft Edge 121.0.2277.112 -- Microsoft Edge Driver 121.0.2277.112 +- Google Chrome 121.0.6167.185 +- Chrome Driver 121.0.6167.184 +- Microsoft Edge 121.0.2277.128 +- Microsoft Edge Driver 121.0.2277.128 - Mozilla Firefox 122.0.1 - Gecko Driver 0.34.0 - IE Driver 4.14.0.0 @@ -168,8 +167,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Node.js - 16.20.2 -- 18.19.0 -- 20.11.0 +- 18.19.1 +- 20.11.1 #### Python - 3.7.9 @@ -221,308 +220,308 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Name | Version | ConfigFile | ServiceName | ServiceStatus | ListenPort | | ------ | ------- | ------------------------------------- | ----------- | ------------- | ---------- | | Apache | 2.4.55 | C:\tools\Apache24\conf\httpd.conf | Apache | Stopped | 80 | -| Nginx | 1.25.3 | C:\tools\nginx-1.25.3\conf\nginx.conf | nginx | Stopped | 80 | +| Nginx | 1.25.4 | C:\tools\nginx-1.25.4\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2022 | Name | Version | Path | | ----------------------------- | -------------- | -------------------------------------------------------- | -| Visual Studio Enterprise 2022 | 17.8.34525.116 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | +| Visual Studio Enterprise 2022 | 17.9.34607.119 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | #### Workloads, components and extensions | Package | Version | | ------------------------------------------------------------------------- | --------------- | -| android | 34.0.43.0 | -| Component.Android.Emulator.MDD | 17.8.34129.139 | -| Component.Android.NDK.R23C | 17.8.34129.139 | -| Component.Android.SDK.MAUI | 17.8.34129.139 | -| Component.Dotfuscator | 17.8.34129.139 | -| Component.HAXM.Private | 17.8.34129.139 | -| Component.Linux.CMake | 17.8.34129.139 | -| Component.Linux.RemoteFileExplorer | 17.8.34129.139 | -| Component.MDD.Android | 17.8.34129.139 | -| Component.MDD.Linux | 17.8.34129.139 | -| Component.MDD.Linux.GCC.arm | 17.8.34129.139 | -| Component.Microsoft.VisualStudio.LiveShare.2022 | 1.0.5886 | -| Component.Microsoft.VisualStudio.RazorExtension | 17.8.34129.139 | +| android | 34.0.52.0 | +| Component.Android.Emulator.MDD | 17.9.34511.75 | +| Component.Android.NDK.R23C | 17.9.34511.75 | +| Component.Android.SDK.MAUI | 17.9.34511.75 | +| Component.Dotfuscator | 17.9.34511.75 | +| Component.HAXM.Private | 17.9.34511.75 | +| Component.Linux.CMake | 17.9.34511.75 | +| Component.Linux.RemoteFileExplorer | 17.9.34511.75 | +| Component.MDD.Android | 17.9.34511.75 | +| Component.MDD.Linux | 17.9.34511.75 | +| Component.MDD.Linux.GCC.arm | 17.9.34511.75 | +| Component.Microsoft.VisualStudio.LiveShare.2022 | 1.0.5898 | +| Component.Microsoft.VisualStudio.RazorExtension | 17.9.34511.75 | | Component.Microsoft.VisualStudio.Tools.Applications.amd64 | 17.0.33617.0 | -| Component.Microsoft.VisualStudio.Web.AzureFunctions | 17.8.34129.139 | -| Component.Microsoft.Web.LibraryManager | 17.8.34129.139 | -| Component.Microsoft.WebTools.BrowserLink.WebLivePreview | 17.8.18.11108 | +| Component.Microsoft.VisualStudio.Web.AzureFunctions | 17.9.34511.75 | +| Component.Microsoft.Web.LibraryManager | 17.9.34511.75 | +| Component.Microsoft.WebTools.BrowserLink.WebLivePreview | 17.9.2.55198 | | Component.Microsoft.Windows.DriverKit | 10.0.22621.0 | -| Component.OpenJDK | 17.8.34129.139 | -| Component.UnityEngine.x64 | 17.8.34129.139 | -| Component.Unreal | 17.8.34129.139 | -| Component.Unreal.Android | 17.8.34129.139 | -| Component.Unreal.Ide | 17.8.34129.139 | +| Component.OpenJDK | 17.9.34511.75 | +| Component.UnityEngine.x64 | 17.9.34511.75 | +| Component.Unreal | 17.9.34511.75 | +| Component.Unreal.Android | 17.9.34511.75 | +| Component.Unreal.Ide | 17.9.34511.75 | | Component.VSInstallerProjects2022 | 2.0.1 | | Component.WixToolset.VisualStudioExtension.Dev17 | 1.0.0.22 | | Component.WixToolset.VisualStudioExtension.Schemas3 | 1.0.0.22 | -| Component.Xamarin | 17.8.34129.139 | -| Component.Xamarin.RemotedSimulator | 17.8.34129.139 | +| Component.Xamarin | 17.9.34511.75 | +| Component.Xamarin.RemotedSimulator | 17.9.34511.75 | | ios | 17.2.8004.0 | | maccatalyst | 17.2.8004.0 | -| maui.blazor | 8.0.3.0 | -| maui.core | 8.0.3.0 | -| maui.windows | 8.0.3.0 | -| Microsoft.Component.Azure.DataLake.Tools | 17.8.34129.139 | -| Microsoft.Component.ClickOnce | 17.8.34129.139 | -| Microsoft.Component.CodeAnalysis.SDK | 17.8.34129.139 | -| Microsoft.Component.MSBuild | 17.8.34129.139 | -| Microsoft.Component.NetFX.Native | 17.8.34129.139 | -| Microsoft.Component.PythonTools | 17.8.34129.139 | -| Microsoft.Component.PythonTools.Web | 17.8.34129.139 | -| Microsoft.Component.VC.Runtime.UCRTSDK | 17.8.34129.139 | -| Microsoft.ComponentGroup.Blend | 17.8.34129.139 | -| Microsoft.ComponentGroup.ClickOnce.Publish | 17.8.34129.139 | -| Microsoft.Net.Component.4.5.2.TargetingPack | 17.8.34129.139 | -| Microsoft.Net.Component.4.6.2.TargetingPack | 17.8.34129.139 | -| Microsoft.Net.Component.4.6.TargetingPack | 17.8.34129.139 | -| Microsoft.Net.Component.4.7.1.TargetingPack | 17.8.34129.139 | -| Microsoft.Net.Component.4.7.2.TargetingPack | 17.8.34129.139 | -| Microsoft.Net.Component.4.7.TargetingPack | 17.8.34129.139 | -| Microsoft.Net.Component.4.8.1.SDK | 17.8.34129.139 | -| Microsoft.Net.Component.4.8.1.TargetingPack | 17.8.34129.139 | -| Microsoft.Net.Component.4.8.SDK | 17.8.34129.139 | -| Microsoft.Net.Component.4.8.TargetingPack | 17.8.34129.139 | -| Microsoft.Net.ComponentGroup.4.8.DeveloperTools | 17.8.34129.139 | -| Microsoft.Net.ComponentGroup.DevelopmentPrerequisites | 17.8.34129.139 | -| Microsoft.Net.ComponentGroup.TargetingPacks.Common | 17.8.34129.139 | -| microsoft.net.runtime.android | 8.0.123.57805 | -| microsoft.net.runtime.android.aot | 8.0.123.57805 | -| microsoft.net.runtime.android.aot.net7 | 8.0.123.57805 | -| microsoft.net.runtime.android.net7 | 8.0.123.57805 | -| microsoft.net.runtime.ios | 8.0.123.57805 | -| microsoft.net.runtime.ios.net7 | 8.0.123.57805 | -| microsoft.net.runtime.maccatalyst | 8.0.123.57805 | -| microsoft.net.runtime.maccatalyst.net7 | 8.0.123.57805 | -| microsoft.net.runtime.mono.tooling | 8.0.123.57805 | -| microsoft.net.runtime.mono.tooling.net7 | 8.0.123.57805 | -| microsoft.net.sdk.emscripten | 8.0.9.7101 | -| Microsoft.NetCore.Component.DevelopmentTools | 17.8.34129.139 | -| Microsoft.NetCore.Component.Runtime.8.0 | 17.8.34408.163 | -| Microsoft.NetCore.Component.SDK | 17.8.34408.163 | -| Microsoft.NetCore.Component.Web | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.AppInsights.Tools | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.AspNet | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.AspNet45 | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.Azure.AuthoringTools | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.Azure.ClientLibs | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.Azure.Compute.Emulator | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.Azure.Powershell | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.Azure.ResourceManager.Tools | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.Azure.ServiceFabric.Tools | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.Azure.Waverton | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.Azure.Waverton.BuildTools | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.ClassDesigner | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.CodeMap | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.Common.Azure.Tools | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.CoreEditor | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.CppBuildInsights | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.Debugger.JustInTime | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.Debugger.Snapshot | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.DiagnosticTools | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.DockerTools | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.DotNetModelBuilder | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.DslTools | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.Embedded | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.EntityFramework | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.FSharp | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.FSharp.Desktop | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.FSharp.WebTemplates | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.GraphDocument | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.Graphics | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.Graphics.Tools | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.HLSL | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.IISExpress | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.IntelliCode | 17.8.34219.23 | -| Microsoft.VisualStudio.Component.IntelliTrace.FrontEnd | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.JavaScript.Diagnostics | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.JavaScript.TypeScript | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.LinqToSql | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.LiveUnitTesting | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.ManagedDesktop.Core | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.ManagedDesktop.Prerequisites | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.Merq | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.MonoDebugger | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.MSODBC.SQL | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.MSSQL.CMDLnUtils | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.Node.Tools | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.NuGet | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.NuGet.BuildTools | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.PortableLibrary | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.Roslyn.Compiler | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.Roslyn.LanguageServices | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.SecurityIssueAnalysis | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.Sharepoint.Tools | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.SQL.CLR | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.SQL.DataSources | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.SQL.LocalDB.Runtime | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.SQL.SSDT | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.TeamOffice | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.TestTools.CodedUITest | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.TestTools.WebLoadTest | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.TextTemplating | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.TypeScript.TSServer | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.Unity | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.UWP.VC.ARM64 | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.UWP.VC.ARM64EC | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM.Spectre | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM64 | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM64.Spectre | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM.Spectre | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM64 | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM64.Spectre | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.Spectre | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.ARM | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.ARM.Spectre | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.ARM64 | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.ARM64.Spectre | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.Spectre | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64 | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64.Spectre | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.VC.14.37.17.7.ARM | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.VC.14.37.17.7.ARM.Spectre | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.VC.14.37.17.7.ARM64 | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.VC.14.37.17.7.ARM64.Spectre | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.VC.14.37.17.7.ATL | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.VC.14.37.17.7.ATL.ARM | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.VC.14.37.17.7.ATL.ARM.Spectre | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.VC.14.37.17.7.ATL.ARM64 | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.VC.14.37.17.7.ATL.ARM64.Spectre | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.VC.14.37.17.7.ATL.Spectre | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.VC.14.37.17.7.MFC | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.VC.14.37.17.7.MFC.ARM | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.VC.14.37.17.7.MFC.ARM.Spectre | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.VC.14.37.17.7.MFC.ARM64 | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.VC.14.37.17.7.MFC.ARM64.Spectre | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.VC.14.37.17.7.MFC.Spectre | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.VC.14.37.17.7.x86.x64 | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.VC.14.37.17.7.x86.x64.Spectre | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.VC.14.38.17.8.ARM | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.VC.14.38.17.8.ARM.Spectre | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.VC.14.38.17.8.ARM64 | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.VC.14.38.17.8.ARM64.Spectre | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.VC.14.38.17.8.ATL | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.VC.14.38.17.8.ATL.ARM | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.VC.14.38.17.8.ATL.ARM.Spectre | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.VC.14.38.17.8.ATL.ARM64 | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.VC.14.38.17.8.ATL.ARM64.Spectre | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.VC.14.38.17.8.ATL.Spectre | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.VC.14.38.17.8.MFC | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.VC.14.38.17.8.MFC.ARM | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.VC.14.38.17.8.MFC.ARM.Spectre | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.VC.14.38.17.8.MFC.ARM64 | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.VC.14.38.17.8.MFC.ARM64.Spectre | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.VC.14.38.17.8.MFC.Spectre | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.VC.14.38.17.8.x86.x64 | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.VC.14.38.17.8.x86.x64.Spectre | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.VC.ASAN | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.VC.ATL | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.VC.ATL.ARM | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.VC.ATL.ARM.Spectre | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.VC.ATL.ARM64 | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.VC.ATL.ARM64.Spectre | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.VC.ATL.Spectre | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.VC.ATLMFC | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.VC.ATLMFC.Spectre | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.VC.CLI.Support | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.VC.CMake.Project | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.VC.CoreIde | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.VC.DiagnosticTools | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.VC.Llvm.Clang | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.VC.Llvm.ClangToolset | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.VC.MFC.ARM | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.VC.MFC.ARM.Spectre | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.VC.MFC.ARM64 | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.VC.MFC.ARM64.Spectre | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.VC.Modules.x86.x64 | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.VC.Redist.14.Latest | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.VC.Redist.MSM | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.VC.Runtimes.ARM.Spectre | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.VC.Runtimes.ARM64.Spectre | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.VC.Runtimes.ARM64EC.Spectre | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.VC.Runtimes.x86.x64.Spectre | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.VC.TestAdapterForBoostTest | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.VC.TestAdapterForGoogleTest | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.VC.Tools.ARM | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.VC.Tools.ARM64 | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.VC.Tools.ARM64EC | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.VC.Tools.x86.x64 | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.VC.v141.ARM | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.VC.v141.ARM.Spectre | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.VC.v141.ARM64 | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.VC.v141.ARM64.Spectre | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.VC.v141.ATL | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.VC.v141.ATL.Spectre | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.VC.v141.MFC | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.VC.v141.MFC.Spectre | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.VC.v141.x86.x64 | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.VC.v141.x86.x64.Spectre | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.Vcpkg | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.VSSDK | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.Wcf.Tooling | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.Web | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.WebDeploy | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.Windows10SDK | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.Windows10SDK.19041 | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.Windows10SDK.20348 | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.Windows11SDK.22000 | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.Windows11SDK.22621 | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.Windows11Sdk.WindowsPerformanceToolkit | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.Workflow | 17.8.34129.139 | -| Microsoft.VisualStudio.Component.WslDebugging | 17.8.34129.139 | -| Microsoft.VisualStudio.ComponentGroup.ArchitectureTools.Native | 17.8.34129.139 | -| Microsoft.VisualStudio.ComponentGroup.Azure.CloudServices | 17.8.34129.139 | -| Microsoft.VisualStudio.ComponentGroup.Azure.Prerequisites | 17.8.34129.139 | -| Microsoft.VisualStudio.ComponentGroup.Azure.ResourceManager.Tools | 17.8.34129.139 | -| Microsoft.VisualStudio.ComponentGroup.AzureFunctions | 17.8.34129.139 | -| Microsoft.VisualStudio.ComponentGroup.Maui.All | 17.8.34129.139 | -| Microsoft.VisualStudio.ComponentGroup.Maui.Android | 17.8.34129.139 | -| Microsoft.VisualStudio.ComponentGroup.Maui.Blazor | 17.8.34129.139 | -| Microsoft.VisualStudio.ComponentGroup.Maui.iOS | 17.8.34129.139 | -| Microsoft.VisualStudio.ComponentGroup.Maui.MacCatalyst | 17.8.34129.139 | -| Microsoft.VisualStudio.ComponentGroup.Maui.Shared | 17.8.34129.139 | -| Microsoft.VisualStudio.ComponentGroup.Maui.Windows | 17.8.34129.139 | -| Microsoft.VisualStudio.ComponentGroup.MSIX.Packaging | 17.8.34129.139 | -| Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core | 17.8.34129.139 | -| Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Llvm.Clang | 17.8.34129.139 | -| Microsoft.VisualStudio.ComponentGroup.UWP.NetCoreAndStandard | 17.8.34129.139 | -| Microsoft.VisualStudio.ComponentGroup.UWP.Support | 17.8.34129.139 | -| Microsoft.VisualStudio.ComponentGroup.UWP.VC.v142 | 17.8.34129.139 | -| Microsoft.VisualStudio.ComponentGroup.UWP.Xamarin | 17.8.34129.139 | -| Microsoft.VisualStudio.ComponentGroup.VC.Tools.142.x86.x64 | 17.8.34129.139 | -| Microsoft.VisualStudio.ComponentGroup.VisualStudioExtension.Prerequisites | 17.8.34129.139 | -| Microsoft.VisualStudio.ComponentGroup.Web | 17.8.34129.139 | -| Microsoft.VisualStudio.ComponentGroup.Web.CloudTools | 17.8.34129.139 | -| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions | 17.8.34129.139 | -| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.CMake | 17.8.34129.139 | -| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.TemplateEngine | 17.8.34129.139 | -| Microsoft.VisualStudio.Workload.Azure | 17.8.34129.139 | -| Microsoft.VisualStudio.Workload.CoreEditor | 17.8.34129.139 | -| Microsoft.VisualStudio.Workload.Data | 17.8.34129.139 | -| Microsoft.VisualStudio.Workload.DataScience | 17.8.34129.139 | -| Microsoft.VisualStudio.Workload.ManagedDesktop | 17.8.34129.139 | -| Microsoft.VisualStudio.Workload.ManagedGame | 17.8.34129.139 | -| Microsoft.VisualStudio.Workload.NativeCrossPlat | 17.8.34219.23 | -| Microsoft.VisualStudio.Workload.NativeDesktop | 17.8.34316.72 | -| Microsoft.VisualStudio.Workload.NativeGame | 17.8.34316.72 | -| Microsoft.VisualStudio.Workload.NativeMobile | 17.8.34129.139 | -| Microsoft.VisualStudio.Workload.NetCrossPlat | 17.8.34129.139 | -| Microsoft.VisualStudio.Workload.NetWeb | 17.8.34129.139 | -| Microsoft.VisualStudio.Workload.Node | 17.8.34129.139 | -| Microsoft.VisualStudio.Workload.Office | 17.8.34129.139 | -| Microsoft.VisualStudio.Workload.Python | 17.8.34129.139 | -| Microsoft.VisualStudio.Workload.Universal | 17.8.34129.139 | -| Microsoft.VisualStudio.Workload.VisualStudioExtension | 17.8.34129.139 | -| runtimes.ios | 8.0.123.57805 | -| runtimes.ios.net7 | 8.0.123.57805 | -| runtimes.maccatalyst | 8.0.123.57805 | -| runtimes.maccatalyst.net7 | 8.0.123.57805 | -| wasm.tools | 8.0.123.57805 | +| maui.blazor | 8.0.6.0 | +| maui.core | 8.0.6.0 | +| maui.windows | 8.0.6.0 | +| Microsoft.Component.Azure.DataLake.Tools | 17.9.34511.75 | +| Microsoft.Component.ClickOnce | 17.9.34511.75 | +| Microsoft.Component.CodeAnalysis.SDK | 17.9.34511.75 | +| Microsoft.Component.MSBuild | 17.9.34511.75 | +| Microsoft.Component.NetFX.Native | 17.9.34511.75 | +| Microsoft.Component.PythonTools | 17.9.34511.75 | +| Microsoft.Component.PythonTools.Web | 17.9.34511.75 | +| Microsoft.Component.VC.Runtime.UCRTSDK | 17.9.34511.75 | +| Microsoft.ComponentGroup.Blend | 17.9.34511.75 | +| Microsoft.ComponentGroup.ClickOnce.Publish | 17.9.34511.75 | +| Microsoft.Net.Component.4.5.2.TargetingPack | 17.9.34511.75 | +| Microsoft.Net.Component.4.6.2.TargetingPack | 17.9.34511.75 | +| Microsoft.Net.Component.4.6.TargetingPack | 17.9.34511.75 | +| Microsoft.Net.Component.4.7.1.TargetingPack | 17.9.34511.75 | +| Microsoft.Net.Component.4.7.2.TargetingPack | 17.9.34511.75 | +| Microsoft.Net.Component.4.7.TargetingPack | 17.9.34511.75 | +| Microsoft.Net.Component.4.8.1.SDK | 17.9.34511.75 | +| Microsoft.Net.Component.4.8.1.TargetingPack | 17.9.34511.75 | +| Microsoft.Net.Component.4.8.SDK | 17.9.34511.75 | +| Microsoft.Net.Component.4.8.TargetingPack | 17.9.34511.75 | +| Microsoft.Net.ComponentGroup.4.8.DeveloperTools | 17.9.34511.75 | +| Microsoft.Net.ComponentGroup.DevelopmentPrerequisites | 17.9.34511.75 | +| Microsoft.Net.ComponentGroup.TargetingPacks.Common | 17.9.34511.75 | +| microsoft.net.runtime.android | 8.0.224.6711 | +| microsoft.net.runtime.android.aot | 8.0.224.6711 | +| microsoft.net.runtime.android.aot.net7 | 8.0.224.6711 | +| microsoft.net.runtime.android.net7 | 8.0.224.6711 | +| microsoft.net.runtime.ios | 8.0.224.6711 | +| microsoft.net.runtime.ios.net7 | 8.0.224.6711 | +| microsoft.net.runtime.maccatalyst | 8.0.224.6711 | +| microsoft.net.runtime.maccatalyst.net7 | 8.0.224.6711 | +| microsoft.net.runtime.mono.tooling | 8.0.224.6711 | +| microsoft.net.runtime.mono.tooling.net7 | 8.0.224.6711 | +| microsoft.net.sdk.emscripten | 8.0.10.6201 | +| Microsoft.NetCore.Component.DevelopmentTools | 17.9.34511.75 | +| Microsoft.NetCore.Component.Runtime.8.0 | 17.9.34606.255 | +| Microsoft.NetCore.Component.SDK | 17.9.34606.255 | +| Microsoft.NetCore.Component.Web | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.AppInsights.Tools | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.AspNet | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.AspNet45 | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.Azure.AuthoringTools | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.Azure.ClientLibs | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.Azure.Compute.Emulator | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.Azure.Powershell | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.Azure.ResourceManager.Tools | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.Azure.ServiceFabric.Tools | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.Azure.Waverton | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.Azure.Waverton.BuildTools | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.ClassDesigner | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.CodeMap | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.Common.Azure.Tools | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.CoreEditor | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.CppBuildInsights | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.Debugger.JustInTime | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.Debugger.Snapshot | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.DiagnosticTools | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.DockerTools | 17.9.34518.88 | +| Microsoft.VisualStudio.Component.DotNetModelBuilder | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.DslTools | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.Embedded | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.EntityFramework | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.FSharp | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.FSharp.Desktop | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.FSharp.WebTemplates | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.GraphDocument | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.Graphics | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.Graphics.Tools | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.HLSL | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.IISExpress | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.IntelliCode | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.IntelliTrace.FrontEnd | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.JavaScript.Diagnostics | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.JavaScript.TypeScript | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.LinqToSql | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.LiveUnitTesting | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.ManagedDesktop.Core | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.ManagedDesktop.Prerequisites | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.Merq | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.MonoDebugger | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.MSODBC.SQL | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.MSSQL.CMDLnUtils | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.Node.Tools | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.NuGet | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.NuGet.BuildTools | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.PortableLibrary | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.Roslyn.Compiler | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.Roslyn.LanguageServices | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.SecurityIssueAnalysis | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.Sharepoint.Tools | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.SQL.CLR | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.SQL.DataSources | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.SQL.LocalDB.Runtime | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.SQL.SSDT | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.TeamOffice | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.TestTools.CodedUITest | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.TestTools.WebLoadTest | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.TextTemplating | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.TypeScript.TSServer | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.Unity | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.UWP.VC.ARM64 | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.UWP.VC.ARM64EC | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM.Spectre | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM64 | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM64.Spectre | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM.Spectre | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM64 | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM64.Spectre | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.Spectre | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.ARM | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.ARM.Spectre | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.ARM64 | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.ARM64.Spectre | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.Spectre | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64 | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64.Spectre | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.14.37.17.7.ARM | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.14.37.17.7.ARM.Spectre | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.14.37.17.7.ARM64 | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.14.37.17.7.ARM64.Spectre | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.14.37.17.7.ATL | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.14.37.17.7.ATL.ARM | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.14.37.17.7.ATL.ARM.Spectre | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.14.37.17.7.ATL.ARM64 | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.14.37.17.7.ATL.ARM64.Spectre | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.14.37.17.7.ATL.Spectre | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.14.37.17.7.MFC | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.14.37.17.7.MFC.ARM | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.14.37.17.7.MFC.ARM.Spectre | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.14.37.17.7.MFC.ARM64 | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.14.37.17.7.MFC.ARM64.Spectre | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.14.37.17.7.MFC.Spectre | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.14.37.17.7.x86.x64 | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.14.37.17.7.x86.x64.Spectre | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.14.38.17.8.ARM | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.14.38.17.8.ARM.Spectre | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.14.38.17.8.ARM64 | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.14.38.17.8.ARM64.Spectre | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.14.38.17.8.ATL | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.14.38.17.8.ATL.ARM | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.14.38.17.8.ATL.ARM.Spectre | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.14.38.17.8.ATL.ARM64 | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.14.38.17.8.ATL.ARM64.Spectre | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.14.38.17.8.ATL.Spectre | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.14.38.17.8.MFC | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.14.38.17.8.MFC.ARM | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.14.38.17.8.MFC.ARM.Spectre | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.14.38.17.8.MFC.ARM64 | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.14.38.17.8.MFC.ARM64.Spectre | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.14.38.17.8.MFC.Spectre | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.14.38.17.8.x86.x64 | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.14.38.17.8.x86.x64.Spectre | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.ASAN | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.ATL | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.ATL.ARM | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.ATL.ARM.Spectre | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.ATL.ARM64 | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.ATL.ARM64.Spectre | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.ATL.Spectre | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.ATLMFC | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.ATLMFC.Spectre | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.CLI.Support | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.CMake.Project | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.CoreIde | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.DiagnosticTools | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.Llvm.Clang | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.Llvm.ClangToolset | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.MFC.ARM | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.MFC.ARM.Spectre | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.MFC.ARM64 | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.MFC.ARM64.Spectre | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.Modules.x86.x64 | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.Redist.14.Latest | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.Redist.MSM | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.Runtimes.ARM.Spectre | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.Runtimes.ARM64.Spectre | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.Runtimes.ARM64EC.Spectre | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.Runtimes.x86.x64.Spectre | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.TestAdapterForBoostTest | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.TestAdapterForGoogleTest | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.Tools.ARM | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.Tools.ARM64 | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.Tools.ARM64EC | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.Tools.x86.x64 | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.v141.ARM | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.v141.ARM.Spectre | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.v141.ARM64 | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.v141.ARM64.Spectre | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.v141.ATL | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.v141.ATL.Spectre | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.v141.MFC | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.v141.MFC.Spectre | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.v141.x86.x64 | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.v141.x86.x64.Spectre | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.Vcpkg | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VSSDK | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.Wcf.Tooling | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.Web | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.WebDeploy | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.Windows10SDK | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.Windows10SDK.19041 | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.Windows10SDK.20348 | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.Windows11SDK.22000 | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.Windows11SDK.22621 | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.Windows11Sdk.WindowsPerformanceToolkit | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.Workflow | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.WslDebugging | 17.9.34511.75 | +| Microsoft.VisualStudio.ComponentGroup.ArchitectureTools.Native | 17.9.34511.75 | +| Microsoft.VisualStudio.ComponentGroup.Azure.CloudServices | 17.9.34511.75 | +| Microsoft.VisualStudio.ComponentGroup.Azure.Prerequisites | 17.9.34511.75 | +| Microsoft.VisualStudio.ComponentGroup.Azure.ResourceManager.Tools | 17.9.34511.75 | +| Microsoft.VisualStudio.ComponentGroup.AzureFunctions | 17.9.34511.75 | +| Microsoft.VisualStudio.ComponentGroup.Maui.All | 17.9.34511.75 | +| Microsoft.VisualStudio.ComponentGroup.Maui.Android | 17.9.34511.75 | +| Microsoft.VisualStudio.ComponentGroup.Maui.Blazor | 17.9.34511.75 | +| Microsoft.VisualStudio.ComponentGroup.Maui.iOS | 17.9.34511.75 | +| Microsoft.VisualStudio.ComponentGroup.Maui.MacCatalyst | 17.9.34511.75 | +| Microsoft.VisualStudio.ComponentGroup.Maui.Shared | 17.9.34511.75 | +| Microsoft.VisualStudio.ComponentGroup.Maui.Windows | 17.9.34511.75 | +| Microsoft.VisualStudio.ComponentGroup.MSIX.Packaging | 17.9.34511.75 | +| Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core | 17.9.34511.75 | +| Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Llvm.Clang | 17.9.34511.75 | +| Microsoft.VisualStudio.ComponentGroup.UWP.NetCoreAndStandard | 17.9.34511.75 | +| Microsoft.VisualStudio.ComponentGroup.UWP.Support | 17.9.34511.75 | +| Microsoft.VisualStudio.ComponentGroup.UWP.VC.v142 | 17.9.34511.75 | +| Microsoft.VisualStudio.ComponentGroup.UWP.Xamarin | 17.9.34511.75 | +| Microsoft.VisualStudio.ComponentGroup.VC.Tools.142.x86.x64 | 17.9.34511.75 | +| Microsoft.VisualStudio.ComponentGroup.VisualStudioExtension.Prerequisites | 17.9.34511.75 | +| Microsoft.VisualStudio.ComponentGroup.Web | 17.9.34511.75 | +| Microsoft.VisualStudio.ComponentGroup.Web.CloudTools | 17.9.34511.75 | +| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions | 17.9.34511.75 | +| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.CMake | 17.9.34511.75 | +| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.TemplateEngine | 17.9.34511.75 | +| Microsoft.VisualStudio.Workload.Azure | 17.9.34511.75 | +| Microsoft.VisualStudio.Workload.CoreEditor | 17.9.34511.75 | +| Microsoft.VisualStudio.Workload.Data | 17.9.34511.75 | +| Microsoft.VisualStudio.Workload.DataScience | 17.9.34511.75 | +| Microsoft.VisualStudio.Workload.ManagedDesktop | 17.9.34511.75 | +| Microsoft.VisualStudio.Workload.ManagedGame | 17.9.34511.75 | +| Microsoft.VisualStudio.Workload.NativeCrossPlat | 17.9.34511.75 | +| Microsoft.VisualStudio.Workload.NativeDesktop | 17.9.34511.75 | +| Microsoft.VisualStudio.Workload.NativeGame | 17.9.34511.75 | +| Microsoft.VisualStudio.Workload.NativeMobile | 17.9.34511.75 | +| Microsoft.VisualStudio.Workload.NetCrossPlat | 17.9.34511.75 | +| Microsoft.VisualStudio.Workload.NetWeb | 17.9.34606.255 | +| Microsoft.VisualStudio.Workload.Node | 17.9.34511.75 | +| Microsoft.VisualStudio.Workload.Office | 17.9.34511.75 | +| Microsoft.VisualStudio.Workload.Python | 17.9.34511.75 | +| Microsoft.VisualStudio.Workload.Universal | 17.9.34511.75 | +| Microsoft.VisualStudio.Workload.VisualStudioExtension | 17.9.34511.75 | +| runtimes.ios | 8.0.224.6711 | +| runtimes.ios.net7 | 8.0.224.6711 | +| runtimes.maccatalyst | 8.0.224.6711 | +| runtimes.maccatalyst.net7 | 8.0.224.6711 | +| wasm.tools | 8.0.224.6711 | | ProBITools.MicrosoftAnalysisServicesModelingProjects2022 | 3.0.4 | | ProBITools.MicrosoftReportProjectsforVisualStudio2022 | 3.0.1 | | SSIS.MicrosoftDataToolsIntegrationServices | 1.3.2 | @@ -552,11 +551,11 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 10.0.22621.0 ### .NET Core Tools -- .NET Core SDK: 6.0.126, 6.0.203, 6.0.321, 6.0.418, 7.0.115, 7.0.203, 7.0.312, 7.0.405, 8.0.101 +- .NET Core SDK: 6.0.127, 6.0.203, 6.0.321, 6.0.419, 7.0.116, 7.0.203, 7.0.313, 7.0.406, 8.0.200 - .NET Framework: 4.8, 4.8.1 -- Microsoft.AspNetCore.App: 6.0.5, 6.0.26, 7.0.5, 7.0.15, 8.0.1 -- Microsoft.NETCore.App: 6.0.5, 6.0.26, 7.0.5, 7.0.15, 8.0.1 -- Microsoft.WindowsDesktop.App: 6.0.5, 6.0.26, 7.0.5, 7.0.15, 8.0.1 +- Microsoft.AspNetCore.App: 6.0.5, 6.0.26, 6.0.27, 7.0.5, 7.0.16, 8.0.2 +- Microsoft.NETCore.App: 6.0.5, 6.0.26, 6.0.27, 7.0.5, 7.0.16, 8.0.2 +- Microsoft.WindowsDesktop.App: 6.0.5, 6.0.26, 6.0.27, 7.0.5, 7.0.16, 8.0.2 - nbgv 3.6.133+2d32d93cb1 ### PowerShell Tools @@ -569,10 +568,10 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Az (Cached): 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.513 +- AWSPowershell: 4.1.518 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 -- Microsoft.Graph: 2.13.1 +- Microsoft.Graph: 2.14.0 - Pester: 3.4.0, 5.5.0 - PowerShellGet: 1.0.0.1, 2.2.5 - PSScriptAnalyzer: 1.21.0 @@ -591,13 +590,13 @@ All other versions are saved but not installed. | Android Command Line Tools | 8.0 | | Android Emulator | 31.2.9 | | Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2 33.0.3<br>32.0.0<br>31.0.0 | -| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 2)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1) | -| Android SDK Platform-Tools | 34.0.5 | +| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1) | +| Android SDK Platform-Tools | 35.0.0 | | Android Support Repository | 47.0.0 | | CMake | 3.18.1<br>3.22.1 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 24.0.8215888<br>25.2.9519653<br>26.1.10909125 | +| NDK | 24.0.8215888<br>25.2.9519653<br>26.2.11394342 | #### Environment variables | Name | Value | @@ -605,16 +604,16 @@ All other versions are saved but not installed. | ANDROID_HOME | C:\Android\android-sdk | | ANDROID_NDK | C:\Android\android-sdk\ndk\25.2.9519653 | | ANDROID_NDK_HOME | C:\Android\android-sdk\ndk\25.2.9519653 | -| ANDROID_NDK_LATEST_HOME | C:\Android\android-sdk\ndk\26.1.10909125 | +| ANDROID_NDK_LATEST_HOME | C:\Android\android-sdk\ndk\26.2.11394342 | | ANDROID_NDK_ROOT | C:\Android\android-sdk\ndk\25.2.9519653 | | ANDROID_SDK_ROOT | C:\Android\android-sdk | ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2022 | sha256:f450296061ecdfefd5c0706f40ebe1e24ff20ae81a1a96f6a518ab2d3cf4adf8 | 2024-01-09 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2022 | sha256:751e21c836ab69e5a85e9a80fa019375f37174b7199c4b0d3c30867532a80c22 | 2024-01-09 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:13ebc67b0803546a86042bf8de65f44b36900e467f996de0e8fdf454cba1fabd | 2024-01-09 | -| mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:1abc7e4d96a7dd1f80a31597abf6b98f112f1e24c2b448747e28bbea5ba97975 | 2024-01-04 | -| mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:ba06e92a92c3533354926622f405265d31d86ef5080f5531a4705e7936de0b1d | 2024-01-04 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2022 | sha256:59926d7692cac2c349bd6f320d24bd9dbaeb7818a9c2c5f81b6d416b5a89789e | 2024-02-13 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2022 | sha256:6e6e681d5bf0040611844b2b3f385afc0a44fbc06d258ab51979d04133f14c98 | 2024-02-13 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:8ad2a6294e31cd60c794874e0a163b02664e09e7e62351083178fbe0c9ab122a | 2024-02-13 | +| mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:64b22e42a69ebcdb86e49bf50780b64156431a508f7f06ac3050c71920fe57b7 | 2024-02-07 | +| mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:8a75266be74ad7a904470e18057f6fd62055cf7028172307fefc67aff37dfd10 | 2024-02-07 | From 39b838e8fdba4ae9439a37754710dd5610049445 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Thu, 22 Feb 2024 16:12:24 +0100 Subject: [PATCH 2679/3485] [Windows] Add Wireless LAN feature (#9373) * [Windows] Add Wireless LAN feature * Change WLAN service startup type to manual * Update template directly --- images/windows/scripts/tests/WindowsFeatures.Tests.ps1 | 4 ++++ images/windows/templates/windows-2019.pkr.hcl | 4 ++++ images/windows/templates/windows-2022.pkr.hcl | 4 ++++ images/windows/toolsets/toolset-2019.json | 3 ++- images/windows/toolsets/toolset-2022.json | 3 ++- 5 files changed, 16 insertions(+), 2 deletions(-) diff --git a/images/windows/scripts/tests/WindowsFeatures.Tests.ps1 b/images/windows/scripts/tests/WindowsFeatures.Tests.ps1 index 633de532f729..03b56a2108d1 100644 --- a/images/windows/scripts/tests/WindowsFeatures.Tests.ps1 +++ b/images/windows/scripts/tests/WindowsFeatures.Tests.ps1 @@ -13,6 +13,10 @@ Describe "WindowsFeatures" { it "Check WSL is on path" { (Get-Command -Name 'wsl') | Should -BeTrue } + + it "Check WLAN service is stopped" { + (Get-Service -Name wlansvc).Status | Should -Be "Stopped" + } } Describe "DiskSpace" { diff --git a/images/windows/templates/windows-2019.pkr.hcl b/images/windows/templates/windows-2019.pkr.hcl index 203805289f95..9c734d633f8f 100644 --- a/images/windows/templates/windows-2019.pkr.hcl +++ b/images/windows/templates/windows-2019.pkr.hcl @@ -272,6 +272,10 @@ build { restart_timeout = "30m" } + provisioner "powershell" { + inline = ["Set-Service -Name wlansvc -StartupType Manual", "if ($(Get-Service -Name wlansvc).Status -eq 'Running') { Stop-Service -Name wlansvc}"] + } + provisioner "powershell" { environment_vars = ["IMAGE_FOLDER=${var.image_folder}"] scripts = [ diff --git a/images/windows/templates/windows-2022.pkr.hcl b/images/windows/templates/windows-2022.pkr.hcl index 70bb6c5a6acf..2fb94ea72874 100644 --- a/images/windows/templates/windows-2022.pkr.hcl +++ b/images/windows/templates/windows-2022.pkr.hcl @@ -263,6 +263,10 @@ build { restart_timeout = "10m" } + provisioner "powershell" { + inline = ["Set-Service -Name wlansvc -StartupType Manual", "if ($(Get-Service -Name wlansvc).Status -eq 'Running') { Stop-Service -Name wlansvc}"] + } + provisioner "powershell" { environment_vars = ["IMAGE_FOLDER=${var.image_folder}"] scripts = [ diff --git a/images/windows/toolsets/toolset-2019.json b/images/windows/toolsets/toolset-2019.json index ad7a68e80af1..c6fb5e4e5831 100644 --- a/images/windows/toolsets/toolset-2019.json +++ b/images/windows/toolsets/toolset-2019.json @@ -260,7 +260,8 @@ { "name": "FS-iSCSITarget-Server", "includeAllSubFeatures": true, "includeManagementTools": true }, { "name": "Containers" }, { "name": "Microsoft-Windows-Subsystem-Linux", "optionalFeature": true }, - { "name": "VirtualMachinePlatform", "optionalFeature": true } + { "name": "VirtualMachinePlatform", "optionalFeature": true }, + { "name": "Wireless-Networking" } ], "visualStudio": { "version" : "2019", diff --git a/images/windows/toolsets/toolset-2022.json b/images/windows/toolsets/toolset-2022.json index bd39044be8c8..cad4d23f3cb7 100644 --- a/images/windows/toolsets/toolset-2022.json +++ b/images/windows/toolsets/toolset-2022.json @@ -170,7 +170,8 @@ { "name": "NET-Framework-Features", "includeAllSubFeatures": true }, { "name": "Hyper-V", "includeAllSubFeatures": true }, { "name": "HypervisorPlatform", "optionalFeature": true }, - { "name": "Hyper-V-PowerShell" } + { "name": "Hyper-V-PowerShell" }, + { "name": "Wireless-Networking" } ], "visualStudio": { "version" : "2022", From d4e0d19512a62e7f34efe68b0b85464437a31b55 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 22 Feb 2024 19:54:13 +0000 Subject: [PATCH 2680/3485] Updating readme file for macOS-12 version 20240218.1 (#9379) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-12-Readme.md | 132 ++++++++++++++++---------------- 1 file changed, 67 insertions(+), 65 deletions(-) diff --git a/images/macos/macos-12-Readme.md b/images/macos/macos-12-Readme.md index e962b71ea13b..a1d31c8c0f39 100644 --- a/images/macos/macos-12-Readme.md +++ b/images/macos/macos-12-Readme.md @@ -1,16 +1,17 @@ | Announcements | |-| -| [[All OSes] Powershell Core will be updated to 7.4.x LTS on January, 28](https://github.com/actions/runner-images/issues/9115) | +| [[All OSes] Ruby versions <= 2.7.x will be removed on February, 26](https://github.com/actions/runner-images/issues/9327) | +| [[All OSes] Go 1.19.x will be removed and 1.21.x set as default on February, 26](https://github.com/actions/runner-images/issues/9326) | *** # macOS 12 - OS Version: macOS 12.7.3 (21H1015) - Kernel Version: Darwin 21.6.0 -- Image Version: 20240202.1 +- Image Version: 20240218.1 ## Installed Software ### Language and Runtime -- .NET Core SDK: 6.0.418, 7.0.102, 7.0.202, 7.0.306, 7.0.405, 8.0.101 +- .NET Core SDK: 6.0.419, 7.0.102, 7.0.202, 7.0.306, 7.0.406, 8.0.101, 8.0.201 - Bash 3.2.57(1)-release - Clang/LLVM 14.0.0 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` @@ -20,35 +21,35 @@ - GNU Fortran 11 (Homebrew GCC 11.4.0) - available by `gfortran-11` alias - GNU Fortran 12 (Homebrew GCC 12.3.0) - available by `gfortran-12` alias - GNU Fortran 13 (Homebrew GCC 13.2.0) - available by `gfortran-13` alias -- Julia 1.10.0 +- Julia 1.10.1 - Kotlin 1.9.22-release-704 -- Go 1.20.13 +- Go 1.20.14 - Mono 6.12.0.188 -- Node.js 18.19.0 +- Node.js 18.19.1 - MSBuild 16.10.1.51301 (Mono 6.12.0.188) - NVM 0.39.7 -- NVM - Cached node versions: 16.20.2, 18.19.0, 20.11.0 +- NVM - Cached node versions: 16.20.2, 18.19.1, 20.11.1 - Perl 5.38.2 -- PHP 8.3.2 +- PHP 8.3.3 - Python 2.7.18 -- Python3 3.12.1 +- Python3 3.12.2 - R 4.3.2 - Ruby 3.0.6p216 ### Package Management -- Bundler 2.5.5 +- Bundler 2.5.6 - Carthage 0.39.1 -- CocoaPods 1.15.0 -- Composer 2.6.6 -- Homebrew 4.2.6 +- CocoaPods 1.15.2 +- Composer 2.7.1 +- Homebrew 4.2.8 - Miniconda 23.11.0 -- NPM 10.2.3 +- NPM 10.2.4 - NuGet 6.3.1.1 - Pip 20.3.4 (python 2.7) -- Pip3 23.3.2 (python 3.12) +- Pip3 24.0 (python 3.12) - Pipx 1.4.3 -- RubyGems 3.5.5 -- Vcpkg 2024 (build from commit 80403036a) +- RubyGems 3.5.6 +- Vcpkg 2024 (build from commit 13bde2ff1) - Yarn 1.22.19 #### Environment variables @@ -60,7 +61,7 @@ ### Project Management - Apache Ant 1.10.14 - Apache Maven 3.9.6 -- Gradle 8.5 +- Gradle 8.6 - Sbt 1.9.8 ### Utilities @@ -71,47 +72,47 @@ - bazelisk 1.19.0 - bsdtar 3.5.1 - available by 'tar' alias - Curl 8.6.0 -- Git 2.43.0 +- Git 2.43.2 - Git LFS 3.4.1 -- GitHub CLI 2.43.1 +- GitHub CLI 2.44.1 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.21.4 - gpg (GnuPG) 2.4.4 -- ImageMagick 7.1.1-27 +- ImageMagick 7.1.1-28 - jq 1.7.1 - mongo 5.0.21 - mongod 5.0.21 - OpenSSL 1.1.1w 11 Sep 2023 - Packer 1.9.4 - pkg-config 0.29.2 -- PostgreSQL 14.10 (Homebrew) -- psql (PostgreSQL) 14.10 (Homebrew) +- PostgreSQL 14.11 (Homebrew) +- psql (PostgreSQL) 14.11 (Homebrew) - Sox 14.4.2 - Subversion (SVN) 1.14.3 - Switchaudio-osx 1.2.2 - Vagrant 2.4.1 - VirtualBox 6.1.38r153438 -- yq 4.40.5 +- yq 4.41.1 - zstd 1.5.5 ### Tools - App Center CLI 2.14.0 -- AWS CLI 2.15.17 -- AWS SAM CLI 1.108.0 +- AWS CLI 2.15.21 +- AWS SAM CLI 1.109.0 - AWS Session Manager CLI 1.2.553.0 -- Azure CLI 2.56.0 +- Azure CLI 2.57.0 - Azure CLI (azure-devops) 0.26.0 -- Bicep CLI 0.24.24 +- Bicep CLI 0.25.53 - Cabal 3.10.2.1 -- Cmake 3.28.2 -- CodeQL Action Bundle 2.16.1 +- Cmake 3.28.3 +- CodeQL Action Bundle 2.16.2 - Colima 0.6.8 - Fastlane 2.219.0 - GHC 9.8.1 - GHCup 0.1.20.0 - Jazzy 0.14.4 -- Stack 2.13.1 -- SwiftFormat 0.53.1 +- Stack 2.15.1 +- SwiftFormat 0.53.2 - Swig 4.2.0 - Xcbeautify 1.4.0 - Xcode Command Line Tools 14.2.0.0.1.1668646533 @@ -119,17 +120,17 @@ ### Linters - SwiftLint 0.53.0 -- Yamllint 1.33.0 +- Yamllint 1.35.1 ### Browsers -- Safari 17.3 (17617.2.4.11.11) -- SafariDriver 17.3 (17617.2.4.11.11) -- Google Chrome 121.0.6167.139 -- Google Chrome for Testing 121.0.6167.85 -- ChromeDriver 121.0.6167.85 -- Microsoft Edge 121.0.2277.98 -- Microsoft Edge WebDriver 121.0.2277.98 -- Mozilla Firefox 122.0 +- Safari 17.3.1 (17617.2.4.11.12) +- SafariDriver 17.3.1 (17617.2.4.11.12) +- Google Chrome 121.0.6167.184 +- Google Chrome for Testing 121.0.6167.184 +- ChromeDriver 121.0.6167.184 +- Microsoft Edge 121.0.2277.128 +- Microsoft Edge WebDriver 121.0.2277.128 +- Mozilla Firefox 122.0.1 - geckodriver 0.34.0 - Selenium server 4.17.0 @@ -150,11 +151,6 @@ ### Cached Tools -#### Ruby -- 2.7.8 -- 3.0.6 -- 3.1.4 - #### PyPy - 2.7.18 [PyPy 7.3.15] - 3.7.13 [PyPy 7.3.9] @@ -162,43 +158,49 @@ - 3.9.18 [PyPy 7.3.15] - 3.10.13 [PyPy 7.3.15] +#### Ruby +- 2.7.8 +- 3.0.6 +- 3.1.4 + #### Python - 3.7.17 - 3.8.18 - 3.9.18 - 3.10.13 -- 3.11.7 -- 3.12.1 +- 3.11.8 +- 3.12.2 #### Node.js - 16.20.2 -- 18.19.0 -- 20.11.0 +- 18.19.1 +- 20.11.1 #### Go - 1.19.13 -- 1.20.13 -- 1.21.6 +- 1.20.14 +- 1.21.7 +- 1.22.0 ### Rust Tools -- Cargo 1.75.0 -- Rust 1.75.0 -- Rustdoc 1.75.0 +- Cargo 1.76.0 +- Rust 1.76.0 +- Rustdoc 1.76.0 - Rustup 1.26.0 #### Packages -- Bindgen 0.69.2 -- Cargo-audit 0.18.3 +- Bindgen 0.69.4 +- Cargo-audit 0.20.0 - Cargo-outdated 0.14.0 - Cbindgen 0.26.0 -- Clippy 0.1.75 +- Clippy 0.1.76 - Rustfmt 1.7.0-stable ### PowerShell Tools - PowerShell 7.4.1 #### PowerShell Modules -- Az: 11.2.0 +- Az: 11.3.1 - MarkdownPS: 1.9 - Pester: 5.5.0 - PSScriptAnalyzer: 1.21.0 @@ -207,7 +209,7 @@ | Name | Version | ConfigFile | ServiceStatus | ListenPort | | ----- | ------- | ------------------------------- | ------------- | ---------- | | httpd | 2.4.58 | /usr/local/etc/httpd/httpd.conf | none | 80 | -| nginx | 1.25.3 | /usr/local/etc/nginx/nginx.conf | none | 80 | +| nginx | 1.25.4 | /usr/local/etc/nginx/nginx.conf | none | 80 | ### Xamarin @@ -215,7 +217,7 @@ | Version | Build | Path | | -------------- | ---------- | ------------------------------------ | | 2019 | 8.10.25.2 | /Applications/Visual Studio 2019.app | -| 2022 (default) | 17.6.8.400 | /Applications/Visual Studio.app | +| 2022 (default) | 17.6.9.415 | /Applications/Visual Studio.app | ##### Notes ``` @@ -336,13 +338,13 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" | Android Command Line Tools | 8.0 | | Android Emulator | 33.1.24 | | Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2 33.0.3<br>32.0.0<br>31.0.0 | -| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 2)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1) | -| Android SDK Platform-Tools | 34.0.5 | +| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1) | +| Android SDK Platform-Tools | 35.0.0 | | Android Support Repository | 47.0.0 | | CMake | 3.18.1<br>3.22.1 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 24.0.8215888<br>25.2.9519653 (default)<br>26.1.10909125 | +| NDK | 24.0.8215888<br>25.2.9519653 (default)<br>26.2.11394342 | #### Environment variables | Name | Value | @@ -350,7 +352,7 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" | ANDROID_HOME | /Users/runner/Library/Android/sdk | | ANDROID_NDK | /Users/runner/Library/Android/sdk/ndk/25.2.9519653 | | ANDROID_NDK_HOME | /Users/runner/Library/Android/sdk/ndk/25.2.9519653 | -| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/26.1.10909125 | +| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/26.2.11394342 | | ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk/25.2.9519653 | | ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | From adb51dcf33fbf68b3fa4d6ad3fdf35131b158e59 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Fri, 23 Feb 2024 01:59:16 +0100 Subject: [PATCH 2681/3485] [Windows] Remove Ruby, Go old versions (#9391) --- images/windows/toolsets/toolset-2019.json | 8 ++------ images/windows/toolsets/toolset-2022.json | 4 +--- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/images/windows/toolsets/toolset-2019.json b/images/windows/toolsets/toolset-2019.json index c6fb5e4e5831..7f364f28009f 100644 --- a/images/windows/toolsets/toolset-2019.json +++ b/images/windows/toolsets/toolset-2019.json @@ -5,13 +5,10 @@ "arch": "x64", "platform" : "win32", "versions": [ - "2.5", - "2.6", - "2.7", "3.0", "3.1" ], - "default": "2.5" + "default": "3.0" }, { "name": "Python", @@ -72,12 +69,11 @@ "arch": "x64", "platform" : "win32", "versions": [ - "1.19.*", "1.20.*", "1.21.*", "1.22.*" ], - "default": "1.20.*" + "default": "1.21.*" } ], "powershellModules": [ diff --git a/images/windows/toolsets/toolset-2022.json b/images/windows/toolsets/toolset-2022.json index cad4d23f3cb7..244aba6b497f 100644 --- a/images/windows/toolsets/toolset-2022.json +++ b/images/windows/toolsets/toolset-2022.json @@ -5,7 +5,6 @@ "arch": "x64", "platform" : "win32", "versions": [ - "2.7", "3.0", "3.1" ], @@ -69,12 +68,11 @@ "arch": "x64", "platform" : "win32", "versions": [ - "1.19.*", "1.20.*", "1.21.*", "1.22.*" ], - "default": "1.20.*" + "default": "1.21.*" } ], "powershellModules": [ From 2730b04222bce454147a124e5d50efaa89ab8c1d Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Fri, 23 Feb 2024 11:14:06 +0100 Subject: [PATCH 2682/3485] [Ubuntu] Remove Ruby, Go old versions (#9392) --- images/ubuntu/toolsets/toolset-2004.json | 6 +----- images/ubuntu/toolsets/toolset-2204.json | 3 +-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/images/ubuntu/toolsets/toolset-2004.json b/images/ubuntu/toolsets/toolset-2004.json index 36d3acf4a801..de3a182d7f08 100644 --- a/images/ubuntu/toolsets/toolset-2004.json +++ b/images/ubuntu/toolsets/toolset-2004.json @@ -45,21 +45,17 @@ "arch": "x64", "platform" : "linux", "versions": [ - "1.19.*", "1.20.*", "1.21.*", "1.22.*" ], - "default": "1.20.*" + "default": "1.21.*" }, { "name": "Ruby", "platform_version": "20.04", "arch": "x64", "versions": [ - "2.5.*", - "2.6.*", - "2.7.*", "3.0.*", "3.1.*" ] diff --git a/images/ubuntu/toolsets/toolset-2204.json b/images/ubuntu/toolsets/toolset-2204.json index 96d324504085..ad5913d3ccb3 100644 --- a/images/ubuntu/toolsets/toolset-2204.json +++ b/images/ubuntu/toolsets/toolset-2204.json @@ -43,12 +43,11 @@ "arch": "x64", "platform" : "linux", "versions": [ - "1.19.*", "1.20.*", "1.21.*", "1.22.*" ], - "default": "1.20.*" + "default": "1.21.*" }, { "name": "Ruby", From 083e89fd952678199c2d8e8c554d7d685d757e91 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Fri, 23 Feb 2024 12:58:08 +0100 Subject: [PATCH 2683/3485] [macOS] Remove Ruby, Go old versions (#9393) --- images/macos/toolsets/toolset-11.json | 8 ++------ images/macos/toolsets/toolset-12.json | 4 +--- images/macos/toolsets/toolset-13.json | 2 -- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index ce14831ecd23..25f4f4059662 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -287,7 +287,6 @@ "x64": { "variable_template" : "GOROOT_{0}_{1}_X64", "versions": [ - "1.19.*", "1.20.*", "1.21.*" ] @@ -299,9 +298,6 @@ "arch": { "x64": { "versions": [ - "2.5.*", - "2.6.*", - "2.7.*", "3.0.*", "3.1.*" ] @@ -327,7 +323,7 @@ } }, "ruby": { - "default": "2.7", + "default": "3.0", "rubygems": [ "xcode-install", "cocoapods", @@ -339,7 +335,7 @@ ] }, "go": { - "default": "1.20" + "default": "1.21" }, "node": { "default": "18", diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index e1a6ae45517a..5a3bceea5901 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -279,7 +279,6 @@ "x64": { "variable_template" : "GOROOT_{0}_{1}_X64", "versions": [ - "1.19.*", "1.20.*", "1.21.*", "1.22.*" @@ -292,7 +291,6 @@ "arch": { "x64": { "versions": [ - "2.7.*", "3.0.*", "3.1.*" ] @@ -329,7 +327,7 @@ ] }, "go": { - "default": "1.20" + "default": "1.21" }, "node": { "default": "18", diff --git a/images/macos/toolsets/toolset-13.json b/images/macos/toolsets/toolset-13.json index e2e71afa4216..ff00f9ad7894 100644 --- a/images/macos/toolsets/toolset-13.json +++ b/images/macos/toolsets/toolset-13.json @@ -184,7 +184,6 @@ "x64": { "variable_template" : "GOROOT_{0}_{1}_X64", "versions": [ - "1.19.*", "1.20.*", "1.21.*", "1.22.*" @@ -193,7 +192,6 @@ "arm64": { "variable_template" : "GOROOT_{0}_{1}_ARM64", "versions": [ - "1.19.*", "1.20.*", "1.21.*", "1.22.*" From df722a3cf81bbe65c3b964c9b4830c85451542fc Mon Sep 17 00:00:00 2001 From: Pavel Iakovenko <paveliak@users.noreply.github.com> Date: Fri, 23 Feb 2024 15:05:36 -0500 Subject: [PATCH 2684/3485] [macOS] Support null builder for anka MacOS templates (#9385) --- images/macos/templates/macOS-12.anka.pkr.hcl | 24 ++++++++++++++++++- images/macos/templates/macOS-13.anka.pkr.hcl | 24 ++++++++++++++++++- .../templates/macOS-13.arm64.anka.pkr.hcl | 24 ++++++++++++++++++- images/macos/templates/macOS-14.anka.pkr.hcl | 24 ++++++++++++++++++- .../templates/macOS-14.arm64.anka.pkr.hcl | 24 ++++++++++++++++++- 5 files changed, 115 insertions(+), 5 deletions(-) diff --git a/images/macos/templates/macOS-12.anka.pkr.hcl b/images/macos/templates/macOS-12.anka.pkr.hcl index 6ff847173a69..edd828b4192b 100644 --- a/images/macos/templates/macOS-12.anka.pkr.hcl +++ b/images/macos/templates/macOS-12.anka.pkr.hcl @@ -11,12 +11,27 @@ locals { image_folder = "/Users/${var.vm_username}/image-generation" } +variable "builder_type" { + type = string + default = "veertu-anka-vm-clone" + validation { + condition = contains(["veertu-anka-vm-clone", "null"], var.builder_type) + error_message = "The builder_type value must be one of [veertu-anka-vm-clone, null]." + } +} + variable "source_vm_name" { type = string } variable "source_vm_tag" { type = string + default = "" +} + +variable "socks_proxy" { + type = string + default = "" } variable "build_id" { @@ -72,8 +87,15 @@ source "veertu-anka-vm-clone" "template" { stop_vm = "true" } +source "null" "template" { + ssh_host = "${var.source_vm_name}" + ssh_username = "${var.vm_username}" + ssh_password = "${var.vm_password}" + ssh_proxy_host = "${var.socks_proxy}" +} + build { - sources = ["source.veertu-anka-vm-clone.template"] + sources = ["source.${var.builder_type}.template"] provisioner "shell" { inline = ["mkdir ${local.image_folder}"] diff --git a/images/macos/templates/macOS-13.anka.pkr.hcl b/images/macos/templates/macOS-13.anka.pkr.hcl index ee3b447ef57b..9039d4d7a0fb 100644 --- a/images/macos/templates/macOS-13.anka.pkr.hcl +++ b/images/macos/templates/macOS-13.anka.pkr.hcl @@ -11,12 +11,27 @@ locals { image_folder = "/Users/${var.vm_username}/image-generation" } +variable "builder_type" { + type = string + default = "veertu-anka-vm-clone" + validation { + condition = contains(["veertu-anka-vm-clone", "null"], var.builder_type) + error_message = "The builder_type value must be one of [veertu-anka-vm-clone, null]." + } +} + variable "source_vm_name" { type = string } variable "source_vm_tag" { type = string + default = "" +} + +variable "socks_proxy" { + type = string + default = "" } variable "build_id" { @@ -72,8 +87,15 @@ source "veertu-anka-vm-clone" "template" { stop_vm = "true" } +source "null" "template" { + ssh_host = "${var.source_vm_name}" + ssh_username = "${var.vm_username}" + ssh_password = "${var.vm_password}" + ssh_proxy_host = "${var.socks_proxy}" +} + build { - sources = ["source.veertu-anka-vm-clone.template"] + sources = ["source.${var.builder_type}.template"] provisioner "shell" { inline = ["mkdir ${local.image_folder}"] diff --git a/images/macos/templates/macOS-13.arm64.anka.pkr.hcl b/images/macos/templates/macOS-13.arm64.anka.pkr.hcl index 42e640af6db2..5c12e8960f65 100644 --- a/images/macos/templates/macOS-13.arm64.anka.pkr.hcl +++ b/images/macos/templates/macOS-13.arm64.anka.pkr.hcl @@ -11,12 +11,27 @@ locals { image_folder = "/Users/${var.vm_username}/image-generation" } +variable "builder_type" { + type = string + default = "veertu-anka-vm-clone" + validation { + condition = contains(["veertu-anka-vm-clone", "null"], var.builder_type) + error_message = "The builder_type value must be one of [veertu-anka-vm-clone, null]." + } +} + variable "source_vm_name" { type = string } variable "source_vm_tag" { type = string + default = "" +} + +variable "socks_proxy" { + type = string + default = "" } variable "build_id" { @@ -73,8 +88,15 @@ source "veertu-anka-vm-clone" "template" { log_level = "debug" } +source "null" "template" { + ssh_host = "${var.source_vm_name}" + ssh_username = "${var.vm_username}" + ssh_password = "${var.vm_password}" + ssh_proxy_host = "${var.socks_proxy}" +} + build { - sources = ["source.veertu-anka-vm-clone.template"] + sources = ["source.${var.builder_type}.template"] provisioner "shell" { inline = ["mkdir ${local.image_folder}"] diff --git a/images/macos/templates/macOS-14.anka.pkr.hcl b/images/macos/templates/macOS-14.anka.pkr.hcl index 89fccc987c07..c4b9f456000a 100644 --- a/images/macos/templates/macOS-14.anka.pkr.hcl +++ b/images/macos/templates/macOS-14.anka.pkr.hcl @@ -11,12 +11,27 @@ locals { image_folder = "/Users/${var.vm_username}/image-generation" } +variable "builder_type" { + type = string + default = "veertu-anka-vm-clone" + validation { + condition = contains(["veertu-anka-vm-clone", "null"], var.builder_type) + error_message = "The builder_type value must be one of [veertu-anka-vm-clone, null]." + } +} + variable "source_vm_name" { type = string } variable "source_vm_tag" { type = string + default = "" +} + +variable "socks_proxy" { + type = string + default = "" } variable "build_id" { @@ -72,8 +87,15 @@ source "veertu-anka-vm-clone" "template" { stop_vm = "true" } +source "null" "template" { + ssh_host = "${var.source_vm_name}" + ssh_username = "${var.vm_username}" + ssh_password = "${var.vm_password}" + ssh_proxy_host = "${var.socks_proxy}" +} + build { - sources = ["source.veertu-anka-vm-clone.template"] + sources = ["source.${var.builder_type}.template"] provisioner "shell" { inline = ["mkdir ${local.image_folder}"] diff --git a/images/macos/templates/macOS-14.arm64.anka.pkr.hcl b/images/macos/templates/macOS-14.arm64.anka.pkr.hcl index 360251efd05b..85ea62da6a16 100644 --- a/images/macos/templates/macOS-14.arm64.anka.pkr.hcl +++ b/images/macos/templates/macOS-14.arm64.anka.pkr.hcl @@ -11,12 +11,27 @@ locals { image_folder = "/Users/${var.vm_username}/image-generation" } +variable "builder_type" { + type = string + default = "veertu-anka-vm-clone" + validation { + condition = contains(["veertu-anka-vm-clone", "null"], var.builder_type) + error_message = "The builder_type value must be one of [veertu-anka-vm-clone, null]." + } +} + variable "source_vm_name" { type = string } variable "source_vm_tag" { type = string + default = "" +} + +variable "socks_proxy" { + type = string + default = "" } variable "build_id" { @@ -73,8 +88,15 @@ source "veertu-anka-vm-clone" "template" { log_level = "debug" } +source "null" "template" { + ssh_host = "${var.source_vm_name}" + ssh_username = "${var.vm_username}" + ssh_password = "${var.vm_password}" + ssh_proxy_host = "${var.socks_proxy}" +} + build { - sources = ["source.veertu-anka-vm-clone.template"] + sources = ["source.${var.builder_type}.template"] provisioner "shell" { inline = ["mkdir ${local.image_folder}"] From a9200e9659307a37cc416d73e1dbb10b9610e3d0 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Mon, 26 Feb 2024 11:45:20 +0100 Subject: [PATCH 2685/3485] Update create_pull_request.yml (#9406) --- .github/workflows/create_pull_request.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/create_pull_request.yml b/.github/workflows/create_pull_request.yml index 2b1645b26c91..67c23a342e33 100644 --- a/.github/workflows/create_pull_request.yml +++ b/.github/workflows/create_pull_request.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 @@ -22,11 +22,11 @@ jobs: - name: Create pull request for ${{ github.event.client_payload.ReleaseBranchName }} id: create-pr - uses: actions/github-script@v2 + uses: actions/github-script@v7 with: github-token: ${{secrets.GITHUB_TOKEN}} script: | - let response = await github.pulls.create({ + let response = await github.rest.pulls.create({ owner: context.repo.owner, repo: context.repo.repo, title: "${{ github.event.client_payload.PullRequestTitle }}", @@ -37,11 +37,11 @@ jobs: return response.data.number - name: Request reviewers - uses: actions/github-script@v2 + uses: actions/github-script@v7 with: github-token: ${{secrets.PRAPPROVAL_SECRET}} script: | - github.pulls.requestReviewers({ + github.rest.pulls.requestReviewers({ owner: context.repo.owner, repo: context.repo.repo, pull_number: ${{ steps.create-pr.outputs.result }}, From ae4a4a5262d79e335f23ada1b7ad219c1107069f Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Mon, 26 Feb 2024 12:21:59 +0100 Subject: [PATCH 2686/3485] Update create_github_release.yml (#9410) --- .github/workflows/create_github_release.yml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/workflows/create_github_release.yml b/.github/workflows/create_github_release.yml index e49c491a1124..d107ed239917 100644 --- a/.github/workflows/create_github_release.yml +++ b/.github/workflows/create_github_release.yml @@ -10,15 +10,13 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Create release for ${{ github.event.client_payload.ReleaseBranchName }} - uses: actions/create-release@v1.1.1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + uses: ncipollo/release-action@v1.14.0 with: - tag_name: ${{ github.event.client_payload.ReleaseBranchName }} - release_name: ${{ github.event.client_payload.ReleaseTitle }} + tag: ${{ github.event.client_payload.ReleaseBranchName }} + name: ${{ github.event.client_payload.ReleaseTitle }} body: ${{ github.event.client_payload.ReleaseBody }} prerelease: ${{ github.event.client_payload.Prerelease }} - commitish: ${{ github.event.client_payload.Commitish }} \ No newline at end of file + commit: ${{ github.event.client_payload.Commitish }} From 49be543fef272946c1990213be3d53df4a3ed7b7 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Mon, 26 Feb 2024 13:05:31 +0100 Subject: [PATCH 2687/3485] [merge-pr yaml] update to modern actions version (#9412) --- .github/workflows/merge_pull_request.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/merge_pull_request.yml b/.github/workflows/merge_pull_request.yml index 201c23d7cbe4..916e7db4f61b 100644 --- a/.github/workflows/merge_pull_request.yml +++ b/.github/workflows/merge_pull_request.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 @@ -24,11 +24,11 @@ jobs: sleep 30 - name: Approve pull request by GitHub-Actions bot - uses: actions/github-script@v2 + uses: actions/github-script@v7 with: github-token: ${{secrets.PRAPPROVAL_SECRET}} script: | - github.pulls.createReview({ + github.rest.pulls.createReview({ owner: context.repo.owner, repo: context.repo.repo, pull_number: ${{ github.event.client_payload.PullRequestNumber }}, @@ -36,11 +36,11 @@ jobs: }); - name: Merge pull request for ${{ github.event.client_payload.ReleaseBranchName }} - uses: actions/github-script@v2 + uses: actions/github-script@v7 with: github-token: ${{secrets.GITHUB_TOKEN}} script: | - github.pulls.merge({ + github.rest.pulls.merge({ owner: context.repo.owner, repo: context.repo.repo, pull_number: ${{ github.event.client_payload.PullRequestNumber }}, From 0a6a7e0869e999325b2f3cb109c9def35d77915a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 26 Feb 2024 12:12:56 +0000 Subject: [PATCH 2688/3485] Updating readme file for macOS-11 version 20240224.1 (#9411) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-11-Readme.md | 145 ++++++++++++++++---------------- 1 file changed, 71 insertions(+), 74 deletions(-) diff --git a/images/macos/macos-11-Readme.md b/images/macos/macos-11-Readme.md index a0696ae0a609..8190a17cf473 100644 --- a/images/macos/macos-11-Readme.md +++ b/images/macos/macos-11-Readme.md @@ -1,16 +1,17 @@ | Announcements | |-| -| [[All OSes] Powershell Core will be updated to 7.4.x LTS on January, 28](https://github.com/actions/runner-images/issues/9115) | +| [[All OSes] Ruby versions <= 2.7.x will be removed on February, 26](https://github.com/actions/runner-images/issues/9327) | +| [[All OSes] Go 1.19.x will be removed and 1.21.x set as default on February, 26](https://github.com/actions/runner-images/issues/9326) | *** # macOS 11 - OS Version: macOS 11.7.10 (20G1427) - Kernel Version: Darwin 20.6.0 -- Image Version: 20240127.1 +- Image Version: 20240224.1 ## Installed Software ### Language and Runtime -- .NET Core SDK: 6.0.418, 7.0.102, 7.0.202, 7.0.306, 7.0.405, 8.0.101 +- .NET Core SDK: 6.0.419, 7.0.102, 7.0.202, 7.0.306, 7.0.406, 8.0.101, 8.0.201 - Bash 3.2.57(1)-release - Clang/LLVM 13.0.0 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` @@ -20,33 +21,33 @@ - GNU Fortran 10 (Homebrew GCC 10.5.0) - available by `gfortran-10` alias - GNU Fortran 11 (Homebrew GCC 11.4.0) - available by `gfortran-11` alias - GNU Fortran 12 (Homebrew GCC 12.3.0) - available by `gfortran-12` alias -- Julia 1.10.0 +- Julia 1.10.1 - Kotlin 1.9.22-release-704 -- Go 1.20.13 +- Go 1.21.7 - Mono 6.12.0.188 -- Node.js 18.19.0 +- Node.js 18.19.1 - MSBuild 16.10.1.51301 (Mono 6.12.0.188) - NVM 0.39.7 -- NVM - Cached node versions: 16.20.2, 18.19.0, 20.11.0 +- NVM - Cached node versions: 16.20.2, 18.19.1, 20.11.1 - Perl 5.38.2 - Python 2.7.18 -- Python3 3.12.1 +- Python3 3.12.2 - R 4.3.2 -- Ruby 2.7.8p225 +- Ruby 3.0.6p216 ### Package Management -- Bundler 2.4.22 +- Bundler 2.5.6 - Carthage 0.39.1 -- CocoaPods 1.14.3 -- Homebrew 4.2.5 +- CocoaPods 1.15.2 +- Homebrew 4.2.9 - Miniconda 23.11.0 -- NPM 10.2.3 +- NPM 10.2.4 - NuGet 6.3.1.1 - Pip 20.3.4 (python 2.7) -- Pip3 23.3.2 (python 3.12) +- Pip3 24.0 (python 3.12) - Pipx 1.4.3 -- RubyGems 3.4.10 -- Vcpkg 2024 (build from commit 7032c5759) +- RubyGems 3.5.6 +- Vcpkg 2024 (build from commit 37c3e63a1) - Yarn 1.22.19 #### Environment variables @@ -58,75 +59,75 @@ ### Project Management - Apache Ant 1.10.14 - Apache Maven 3.9.6 -- Gradle 8.5 -- Sbt 1.9.8 +- Gradle 8.6 +- Sbt 1.9.9 ### Utilities - 7-Zip 17.05 - aria2 1.37.0 -- azcopy 10.22.2 +- azcopy 10.23.0 - bazel 7.0.2 - bazelisk 1.19.0 - bsdtar 3.3.2 - available by 'tar' alias -- Curl 8.5.0 -- Git 2.43.0 +- Curl 8.6.0 +- Git 2.44.0 - Git LFS 3.4.1 -- GitHub CLI 2.42.1 +- GitHub CLI 2.44.1 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.21.4 - gpg (GnuPG) 2.4.4 -- helm v3.14.0+g3fc9f4b +- helm v3.14.2+gc309b6f - jq 1.7.1 - mongo 5.0.21 - mongod 5.0.21 -- Newman 6.1.0 +- Newman 6.1.1 - OpenSSL 1.1.1w 11 Sep 2023 - Packer 1.9.4 - pkg-config 0.29.2 -- PostgreSQL 14.10 (Homebrew) -- psql (PostgreSQL) 14.10 (Homebrew) +- PostgreSQL 14.11 (Homebrew) +- psql (PostgreSQL) 14.11 (Homebrew) - Sox 14.4.2 - Subversion (SVN) 1.14.3 - Switchaudio-osx 1.2.2 -- yq 4.40.5 +- yq 4.41.1 - zstd 1.5.5 ### Tools -- Aliyun CLI 3.0.197 +- Aliyun CLI 3.0.198 - App Center CLI 2.14.0 -- AWS CLI 2.15.15 -- AWS SAM CLI 1.108.0 +- AWS CLI 2.15.23 +- AWS SAM CLI 1.110.0 - AWS Session Manager CLI 1.2.553.0 -- Azure CLI 2.56.0 +- Azure CLI 2.57.0 - Azure CLI (azure-devops) 0.26.0 -- Bicep CLI 0.24.24 +- Bicep CLI 0.25.53 - Cabal 3.10.2.1 -- Cmake 3.28.1 -- CodeQL Action Bundle 2.16.1 +- Cmake 3.28.3 +- CodeQL Action Bundle 2.16.3 - Fastlane 2.219.0 -- GHC 9.8.1 +- GHC 9.8.2 - GHCup 0.1.20.0 - Jazzy 0.14.4 -- Stack 2.13.1 -- SwiftFormat 0.53.0 +- Stack 2.15.1 +- SwiftFormat 0.53.2 - Swig 4.2.0 - Xcode Command Line Tools 13.2.0.0.1.1638488800 ### Linters - SwiftLint 0.48.0 -- Yamllint 1.33.0 +- Yamllint 1.35.1 ### Browsers - Safari 16.6.1 (16615.3.12.11.5) - SafariDriver 16.6.1 (16615.3.12.11.5) -- Google Chrome 121.0.6167.85 -- Google Chrome for Testing 121.0.6167.85 -- ChromeDriver 121.0.6167.85 -- Microsoft Edge 121.0.2277.83 -- Microsoft Edge WebDriver 121.0.2277.83 -- Mozilla Firefox 122.0 +- Google Chrome 122.0.6261.69 +- Google Chrome for Testing 122.0.6261.69 +- ChromeDriver 122.0.6261.69 +- Microsoft Edge 122.0.2365.52 +- Microsoft Edge WebDriver 122.0.2365.52 +- Mozilla Firefox 123.0 - geckodriver 0.34.0 -- Selenium server 4.17.0 +- Selenium server 4.18.1 #### Environment variables | Name | Value | @@ -145,13 +146,6 @@ ### Cached Tools -#### Ruby -- 2.5.9 -- 2.6.10 -- 2.7.8 -- 3.0.6 -- 3.1.4 - #### PyPy - 2.7.18 [PyPy 7.3.15] - 3.7.13 [PyPy 7.3.9] @@ -159,43 +153,46 @@ - 3.9.18 [PyPy 7.3.15] - 3.10.13 [PyPy 7.3.15] +#### Ruby +- 3.0.6 +- 3.1.4 + #### Python - 3.7.17 - 3.8.18 - 3.9.18 - 3.10.13 -- 3.11.7 -- 3.12.1 +- 3.11.8 +- 3.12.2 #### Node.js - 16.20.2 -- 18.19.0 -- 20.11.0 +- 18.19.1 +- 20.11.1 #### Go -- 1.19.13 -- 1.20.13 -- 1.21.6 +- 1.20.14 +- 1.21.7 ### Rust Tools -- Cargo 1.75.0 -- Rust 1.75.0 -- Rustdoc 1.75.0 +- Cargo 1.76.0 +- Rust 1.76.0 +- Rustdoc 1.76.0 - Rustup 1.26.0 #### Packages -- Bindgen 0.69.2 -- Cargo-audit 0.18.3 +- Bindgen 0.69.4 +- Cargo-audit 0.20.0 - Cargo-outdated 0.14.0 - Cbindgen 0.26.0 -- Clippy 0.1.75 +- Clippy 0.1.76 - Rustfmt 1.7.0-stable ### PowerShell Tools - PowerShell 7.4.1 #### PowerShell Modules -- Az: 11.2.0 +- Az: 11.3.1 - MarkdownPS: 1.9 - Pester: 5.5.0 - PSScriptAnalyzer: 1.21.0 @@ -204,7 +201,7 @@ | Name | Version | ConfigFile | ServiceStatus | ListenPort | | ----- | ------- | ------------------------------- | ------------- | ---------- | | httpd | 2.4.58 | /usr/local/etc/httpd/httpd.conf | none | 80 | -| nginx | 1.25.3 | /usr/local/etc/nginx/nginx.conf | none | 80 | +| nginx | 1.25.4 | /usr/local/etc/nginx/nginx.conf | none | 80 | ### Xamarin @@ -212,7 +209,7 @@ | Version | Build | Path | | -------------- | ---------- | ------------------------------------ | | 2019 | 8.10.25.2 | /Applications/Visual Studio 2019.app | -| 2022 (default) | 17.6.8.400 | /Applications/Visual Studio.app | +| 2022 (default) | 17.6.9.415 | /Applications/Visual Studio.app | ##### Notes ``` @@ -329,14 +326,14 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" | -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 8.0 | | Android Emulator | 33.1.24 | -| Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0 | -| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 2)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1) | -| Android SDK Platform-Tools | 34.0.5 | +| Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2 33.0.3<br>32.0.0<br>31.0.0 | +| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1) | +| Android SDK Platform-Tools | 35.0.0 | | Android Support Repository | 47.0.0 | | CMake | 3.10.2<br>3.18.1<br>3.22.1 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 24.0.8215888<br>25.2.9519653 (default)<br>26.1.10909125 | +| NDK | 24.0.8215888<br>25.2.9519653 (default)<br>26.2.11394342 | #### Environment variables | Name | Value | @@ -344,12 +341,12 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" | ANDROID_HOME | /Users/runner/Library/Android/sdk | | ANDROID_NDK | /Users/runner/Library/Android/sdk/ndk/25.2.9519653 | | ANDROID_NDK_HOME | /Users/runner/Library/Android/sdk/ndk/25.2.9519653 | -| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/26.1.10909125 | +| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/26.2.11394342 | | ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk/25.2.9519653 | | ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | ### Miscellaneous -- libXext 1.3.5 +- libXext 1.3.6 - libXft 2.3.8 - Tcl/Tk 8.6.13_5 - Zlib 1.3.1 From 208aa68b101ffe73b145a2779fff9d28fec19c13 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Mon, 26 Feb 2024 13:18:09 +0100 Subject: [PATCH 2689/3485] [update GitHub release yaml] switch to modern actions version (#9413) --- .github/workflows/update_github_release.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/update_github_release.yml b/.github/workflows/update_github_release.yml index 440b9aeb4952..21215750859c 100644 --- a/.github/workflows/update_github_release.yml +++ b/.github/workflows/update_github_release.yml @@ -10,19 +10,19 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Update release for ${{ github.event.client_payload.ReleaseBranchName }} - uses: actions/github-script@v2 + uses: actions/github-script@v7 with: github-token: ${{secrets.GITHUB_TOKEN}} script: | - const response = await github.repos.getReleaseByTag({ + const response = await github.rest.repos.getReleaseByTag({ owner: context.repo.owner, repo: context.repo.repo, tag: "${{ github.event.client_payload.ReleaseBranchName }}" }); - github.repos.updateRelease({ + github.rest.repos.updateRelease({ owner: context.repo.owner, repo: context.repo.repo, release_id: response.data.id, From 81eb448ee02647a9634bbba21d902b1424b31915 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Mon, 26 Feb 2024 13:23:46 +0100 Subject: [PATCH 2690/3485] Revert "Updating readme file for macOS-11 version 20240224.1 (#9411)" (#9415) This reverts commit 0a6a7e0869e999325b2f3cb109c9def35d77915a. --- images/macos/macos-11-Readme.md | 145 ++++++++++++++++---------------- 1 file changed, 74 insertions(+), 71 deletions(-) diff --git a/images/macos/macos-11-Readme.md b/images/macos/macos-11-Readme.md index 8190a17cf473..a0696ae0a609 100644 --- a/images/macos/macos-11-Readme.md +++ b/images/macos/macos-11-Readme.md @@ -1,17 +1,16 @@ | Announcements | |-| -| [[All OSes] Ruby versions <= 2.7.x will be removed on February, 26](https://github.com/actions/runner-images/issues/9327) | -| [[All OSes] Go 1.19.x will be removed and 1.21.x set as default on February, 26](https://github.com/actions/runner-images/issues/9326) | +| [[All OSes] Powershell Core will be updated to 7.4.x LTS on January, 28](https://github.com/actions/runner-images/issues/9115) | *** # macOS 11 - OS Version: macOS 11.7.10 (20G1427) - Kernel Version: Darwin 20.6.0 -- Image Version: 20240224.1 +- Image Version: 20240127.1 ## Installed Software ### Language and Runtime -- .NET Core SDK: 6.0.419, 7.0.102, 7.0.202, 7.0.306, 7.0.406, 8.0.101, 8.0.201 +- .NET Core SDK: 6.0.418, 7.0.102, 7.0.202, 7.0.306, 7.0.405, 8.0.101 - Bash 3.2.57(1)-release - Clang/LLVM 13.0.0 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` @@ -21,33 +20,33 @@ - GNU Fortran 10 (Homebrew GCC 10.5.0) - available by `gfortran-10` alias - GNU Fortran 11 (Homebrew GCC 11.4.0) - available by `gfortran-11` alias - GNU Fortran 12 (Homebrew GCC 12.3.0) - available by `gfortran-12` alias -- Julia 1.10.1 +- Julia 1.10.0 - Kotlin 1.9.22-release-704 -- Go 1.21.7 +- Go 1.20.13 - Mono 6.12.0.188 -- Node.js 18.19.1 +- Node.js 18.19.0 - MSBuild 16.10.1.51301 (Mono 6.12.0.188) - NVM 0.39.7 -- NVM - Cached node versions: 16.20.2, 18.19.1, 20.11.1 +- NVM - Cached node versions: 16.20.2, 18.19.0, 20.11.0 - Perl 5.38.2 - Python 2.7.18 -- Python3 3.12.2 +- Python3 3.12.1 - R 4.3.2 -- Ruby 3.0.6p216 +- Ruby 2.7.8p225 ### Package Management -- Bundler 2.5.6 +- Bundler 2.4.22 - Carthage 0.39.1 -- CocoaPods 1.15.2 -- Homebrew 4.2.9 +- CocoaPods 1.14.3 +- Homebrew 4.2.5 - Miniconda 23.11.0 -- NPM 10.2.4 +- NPM 10.2.3 - NuGet 6.3.1.1 - Pip 20.3.4 (python 2.7) -- Pip3 24.0 (python 3.12) +- Pip3 23.3.2 (python 3.12) - Pipx 1.4.3 -- RubyGems 3.5.6 -- Vcpkg 2024 (build from commit 37c3e63a1) +- RubyGems 3.4.10 +- Vcpkg 2024 (build from commit 7032c5759) - Yarn 1.22.19 #### Environment variables @@ -59,75 +58,75 @@ ### Project Management - Apache Ant 1.10.14 - Apache Maven 3.9.6 -- Gradle 8.6 -- Sbt 1.9.9 +- Gradle 8.5 +- Sbt 1.9.8 ### Utilities - 7-Zip 17.05 - aria2 1.37.0 -- azcopy 10.23.0 +- azcopy 10.22.2 - bazel 7.0.2 - bazelisk 1.19.0 - bsdtar 3.3.2 - available by 'tar' alias -- Curl 8.6.0 -- Git 2.44.0 +- Curl 8.5.0 +- Git 2.43.0 - Git LFS 3.4.1 -- GitHub CLI 2.44.1 +- GitHub CLI 2.42.1 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.21.4 - gpg (GnuPG) 2.4.4 -- helm v3.14.2+gc309b6f +- helm v3.14.0+g3fc9f4b - jq 1.7.1 - mongo 5.0.21 - mongod 5.0.21 -- Newman 6.1.1 +- Newman 6.1.0 - OpenSSL 1.1.1w 11 Sep 2023 - Packer 1.9.4 - pkg-config 0.29.2 -- PostgreSQL 14.11 (Homebrew) -- psql (PostgreSQL) 14.11 (Homebrew) +- PostgreSQL 14.10 (Homebrew) +- psql (PostgreSQL) 14.10 (Homebrew) - Sox 14.4.2 - Subversion (SVN) 1.14.3 - Switchaudio-osx 1.2.2 -- yq 4.41.1 +- yq 4.40.5 - zstd 1.5.5 ### Tools -- Aliyun CLI 3.0.198 +- Aliyun CLI 3.0.197 - App Center CLI 2.14.0 -- AWS CLI 2.15.23 -- AWS SAM CLI 1.110.0 +- AWS CLI 2.15.15 +- AWS SAM CLI 1.108.0 - AWS Session Manager CLI 1.2.553.0 -- Azure CLI 2.57.0 +- Azure CLI 2.56.0 - Azure CLI (azure-devops) 0.26.0 -- Bicep CLI 0.25.53 +- Bicep CLI 0.24.24 - Cabal 3.10.2.1 -- Cmake 3.28.3 -- CodeQL Action Bundle 2.16.3 +- Cmake 3.28.1 +- CodeQL Action Bundle 2.16.1 - Fastlane 2.219.0 -- GHC 9.8.2 +- GHC 9.8.1 - GHCup 0.1.20.0 - Jazzy 0.14.4 -- Stack 2.15.1 -- SwiftFormat 0.53.2 +- Stack 2.13.1 +- SwiftFormat 0.53.0 - Swig 4.2.0 - Xcode Command Line Tools 13.2.0.0.1.1638488800 ### Linters - SwiftLint 0.48.0 -- Yamllint 1.35.1 +- Yamllint 1.33.0 ### Browsers - Safari 16.6.1 (16615.3.12.11.5) - SafariDriver 16.6.1 (16615.3.12.11.5) -- Google Chrome 122.0.6261.69 -- Google Chrome for Testing 122.0.6261.69 -- ChromeDriver 122.0.6261.69 -- Microsoft Edge 122.0.2365.52 -- Microsoft Edge WebDriver 122.0.2365.52 -- Mozilla Firefox 123.0 +- Google Chrome 121.0.6167.85 +- Google Chrome for Testing 121.0.6167.85 +- ChromeDriver 121.0.6167.85 +- Microsoft Edge 121.0.2277.83 +- Microsoft Edge WebDriver 121.0.2277.83 +- Mozilla Firefox 122.0 - geckodriver 0.34.0 -- Selenium server 4.18.1 +- Selenium server 4.17.0 #### Environment variables | Name | Value | @@ -146,6 +145,13 @@ ### Cached Tools +#### Ruby +- 2.5.9 +- 2.6.10 +- 2.7.8 +- 3.0.6 +- 3.1.4 + #### PyPy - 2.7.18 [PyPy 7.3.15] - 3.7.13 [PyPy 7.3.9] @@ -153,46 +159,43 @@ - 3.9.18 [PyPy 7.3.15] - 3.10.13 [PyPy 7.3.15] -#### Ruby -- 3.0.6 -- 3.1.4 - #### Python - 3.7.17 - 3.8.18 - 3.9.18 - 3.10.13 -- 3.11.8 -- 3.12.2 +- 3.11.7 +- 3.12.1 #### Node.js - 16.20.2 -- 18.19.1 -- 20.11.1 +- 18.19.0 +- 20.11.0 #### Go -- 1.20.14 -- 1.21.7 +- 1.19.13 +- 1.20.13 +- 1.21.6 ### Rust Tools -- Cargo 1.76.0 -- Rust 1.76.0 -- Rustdoc 1.76.0 +- Cargo 1.75.0 +- Rust 1.75.0 +- Rustdoc 1.75.0 - Rustup 1.26.0 #### Packages -- Bindgen 0.69.4 -- Cargo-audit 0.20.0 +- Bindgen 0.69.2 +- Cargo-audit 0.18.3 - Cargo-outdated 0.14.0 - Cbindgen 0.26.0 -- Clippy 0.1.76 +- Clippy 0.1.75 - Rustfmt 1.7.0-stable ### PowerShell Tools - PowerShell 7.4.1 #### PowerShell Modules -- Az: 11.3.1 +- Az: 11.2.0 - MarkdownPS: 1.9 - Pester: 5.5.0 - PSScriptAnalyzer: 1.21.0 @@ -201,7 +204,7 @@ | Name | Version | ConfigFile | ServiceStatus | ListenPort | | ----- | ------- | ------------------------------- | ------------- | ---------- | | httpd | 2.4.58 | /usr/local/etc/httpd/httpd.conf | none | 80 | -| nginx | 1.25.4 | /usr/local/etc/nginx/nginx.conf | none | 80 | +| nginx | 1.25.3 | /usr/local/etc/nginx/nginx.conf | none | 80 | ### Xamarin @@ -209,7 +212,7 @@ | Version | Build | Path | | -------------- | ---------- | ------------------------------------ | | 2019 | 8.10.25.2 | /Applications/Visual Studio 2019.app | -| 2022 (default) | 17.6.9.415 | /Applications/Visual Studio.app | +| 2022 (default) | 17.6.8.400 | /Applications/Visual Studio.app | ##### Notes ``` @@ -326,14 +329,14 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" | -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 8.0 | | Android Emulator | 33.1.24 | -| Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2 33.0.3<br>32.0.0<br>31.0.0 | -| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1) | -| Android SDK Platform-Tools | 35.0.0 | +| Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0 | +| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 2)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1) | +| Android SDK Platform-Tools | 34.0.5 | | Android Support Repository | 47.0.0 | | CMake | 3.10.2<br>3.18.1<br>3.22.1 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 24.0.8215888<br>25.2.9519653 (default)<br>26.2.11394342 | +| NDK | 24.0.8215888<br>25.2.9519653 (default)<br>26.1.10909125 | #### Environment variables | Name | Value | @@ -341,12 +344,12 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" | ANDROID_HOME | /Users/runner/Library/Android/sdk | | ANDROID_NDK | /Users/runner/Library/Android/sdk/ndk/25.2.9519653 | | ANDROID_NDK_HOME | /Users/runner/Library/Android/sdk/ndk/25.2.9519653 | -| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/26.2.11394342 | +| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/26.1.10909125 | | ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk/25.2.9519653 | | ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | ### Miscellaneous -- libXext 1.3.6 +- libXext 1.3.5 - libXft 2.3.8 - Tcl/Tk 8.6.13_5 - Zlib 1.3.1 From c6fa7ece2efb010893b426d5cb7e41aa6f464241 Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Tue, 27 Feb 2024 19:26:00 +0100 Subject: [PATCH 2691/3485] [windows] Update out-of-support VS 17.9 components (#9414) --- images/windows/toolsets/toolset-2022.json | 36 +++++++++++------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/images/windows/toolsets/toolset-2022.json b/images/windows/toolsets/toolset-2022.json index 244aba6b497f..5f63a353caa4 100644 --- a/images/windows/toolsets/toolset-2022.json +++ b/images/windows/toolsets/toolset-2022.json @@ -248,24 +248,6 @@ "Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.ARM.Spectre", "Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.ARM64", "Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.ARM64.Spectre", - "Microsoft.VisualStudio.Component.VC.14.37.17.7.ARM.Spectre", - "Microsoft.VisualStudio.Component.VC.14.37.17.7.ARM", - "Microsoft.VisualStudio.Component.VC.14.37.17.7.ARM64.Spectre", - "Microsoft.VisualStudio.Component.VC.14.37.17.7.ARM64", - "Microsoft.VisualStudio.Component.VC.14.37.17.7.ATL.ARM.Spectre", - "Microsoft.VisualStudio.Component.VC.14.37.17.7.ATL.ARM", - "Microsoft.VisualStudio.Component.VC.14.37.17.7.ATL.ARM64.Spectre", - "Microsoft.VisualStudio.Component.VC.14.37.17.7.ATL.ARM64", - "Microsoft.VisualStudio.Component.VC.14.37.17.7.ATL.Spectre", - "Microsoft.VisualStudio.Component.VC.14.37.17.7.ATL", - "Microsoft.VisualStudio.Component.VC.14.37.17.7.MFC.ARM.Spectre", - "Microsoft.VisualStudio.Component.VC.14.37.17.7.MFC.ARM", - "Microsoft.VisualStudio.Component.VC.14.37.17.7.MFC.ARM64.Spectre", - "Microsoft.VisualStudio.Component.VC.14.37.17.7.MFC.ARM64", - "Microsoft.VisualStudio.Component.VC.14.37.17.7.MFC.Spectre", - "Microsoft.VisualStudio.Component.VC.14.37.17.7.MFC", - "Microsoft.VisualStudio.Component.VC.14.37.17.7.x86.x64.Spectre", - "Microsoft.VisualStudio.Component.VC.14.37.17.7.x86.x64", "Microsoft.VisualStudio.Component.VC.14.38.17.8.ARM", "Microsoft.VisualStudio.Component.VC.14.38.17.8.ARM.Spectre", "Microsoft.VisualStudio.Component.VC.14.38.17.8.ARM64", @@ -284,6 +266,24 @@ "Microsoft.VisualStudio.Component.VC.14.38.17.8.MFC.Spectre", "Microsoft.VisualStudio.Component.VC.14.38.17.8.x86.x64", "Microsoft.VisualStudio.Component.VC.14.38.17.8.x86.x64.Spectre", + "Microsoft.VisualStudio.Component.VC.14.39.17.9.ARM", + "Microsoft.VisualStudio.Component.VC.14.39.17.9.ARM.Spectre", + "Microsoft.VisualStudio.Component.VC.14.39.17.9.ARM64", + "Microsoft.VisualStudio.Component.VC.14.39.17.9.ARM64.Spectre", + "Microsoft.VisualStudio.Component.VC.14.39.17.9.ATL", + "Microsoft.VisualStudio.Component.VC.14.39.17.9.ATL.ARM", + "Microsoft.VisualStudio.Component.VC.14.39.17.9.ATL.ARM.Spectre", + "Microsoft.VisualStudio.Component.VC.14.39.17.9.ATL.ARM64", + "Microsoft.VisualStudio.Component.VC.14.39.17.9.ATL.ARM64.Spectre", + "Microsoft.VisualStudio.Component.VC.14.39.17.9.ATL.Spectre", + "Microsoft.VisualStudio.Component.VC.14.39.17.9.MFC", + "Microsoft.VisualStudio.Component.VC.14.39.17.9.MFC.ARM", + "Microsoft.VisualStudio.Component.VC.14.39.17.9.MFC.ARM.Spectre", + "Microsoft.VisualStudio.Component.VC.14.39.17.9.MFC.ARM64", + "Microsoft.VisualStudio.Component.VC.14.39.17.9.MFC.ARM64.Spectre", + "Microsoft.VisualStudio.Component.VC.14.39.17.9.MFC.Spectre", + "Microsoft.VisualStudio.Component.VC.14.39.17.9.x86.x64", + "Microsoft.VisualStudio.Component.VC.14.39.17.9.x86.x64.Spectre", "Microsoft.VisualStudio.Component.VC.ATLMFC", "Microsoft.VisualStudio.Component.VC.ATLMFC.Spectre", "Microsoft.VisualStudio.Component.Windows10SDK.19041", From 6c2dccad75a5896f9bfbbabfe46a693bb24a4da1 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 28 Feb 2024 12:14:47 +0000 Subject: [PATCH 2692/3485] Updating readme file for win19 version 20240225.1.1 (#9421) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/windows/Windows2019-Readme.md | 52 +++++++++++++--------------- 1 file changed, 24 insertions(+), 28 deletions(-) diff --git a/images/windows/Windows2019-Readme.md b/images/windows/Windows2019-Readme.md index f3fa90dddf49..a816844792ac 100644 --- a/images/windows/Windows2019-Readme.md +++ b/images/windows/Windows2019-Readme.md @@ -5,7 +5,7 @@ *** # Windows Server 2019 - OS Version: 10.0.17763 Build 5458 -- Image Version: 20240218.2.0 +- Image Version: 20240225.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -13,8 +13,8 @@ ## Installed Software ### Language and Runtime -- Bash 5.2.21(1)-release -- Go 1.20.14 +- Bash 5.2.26(1)-release +- Go 1.21.7 - Julia 1.10.0 - Kotlin 1.9.22 - LLVM 16.0.6 @@ -22,19 +22,19 @@ - Perl 5.32.1 - PHP 8.2.16 - Python 3.7.9 -- Ruby 2.5.9p229 +- Ruby 3.0.6p216 ### Package Management - Chocolatey 2.2.2 - Composer 2.7.1 -- Helm 3.14.0 +- Helm 3.14.1 - Miniconda 23.11.0 (pre-installed on the image but not added to PATH) - NPM 9.8.1 - NuGet 6.9.1.3 - pip 24.0 (python 3.7) - Pipx 1.2.1 -- RubyGems 2.7.6.3 -- Vcpkg (build from commit 13bde2ff1) +- RubyGems 3.2.33 +- Vcpkg (build from commit 37c3e63a1) - Yarn 1.22.21 #### Environment variables @@ -47,7 +47,7 @@ - Ant 1.10.14 - Gradle 8.6 - Maven 3.8.7 -- sbt 1.9.8 +- sbt 1.9.9 ### Tools - 7zip 23.01 @@ -58,15 +58,15 @@ - Bicep 0.25.53 - Cabal 3.10.2.1 - CMake 3.28.3 -- CodeQL Action Bundle 2.16.2 +- CodeQL Action Bundle 2.16.3 - Docker 24.0.7 - Docker Compose v1 1.29.2 - Docker Compose v2 2.23.3 - Docker-wincred 0.8.1 -- ghc 9.8.1 -- Git 2.43.0.windows.1 -- Git LFS 3.4.0 -- Google Cloud CLI 464.0.0 +- ghc 9.8.2 +- Git 2.44.0.windows.1 +- Git LFS 3.4.1 +- Google Cloud CLI 465.0.0 - ImageMagick 7.1.1-28 - InnoSetup 6.2.2 - jq 1.7.1 @@ -81,7 +81,7 @@ - OpenSSL 1.1.1w - Packer 1.10.0 - Parcel 2.11.0 -- Pulumi 3.106.0 +- Pulumi 3.107.0 - R 4.3.2 - Service Fabric SDK 9.1.1436.9590 - Stack 2.15.1 @@ -95,8 +95,8 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.198 -- AWS CLI 2.15.21 -- AWS SAM CLI 1.109.0 +- AWS CLI 2.15.23 +- AWS SAM CLI 1.110.0 - AWS Session Manager CLI 1.2.553.0 - Azure CLI 2.57.0 - Azure DevOps CLI extension 0.26.0 @@ -118,14 +118,14 @@ - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 121.0.6167.185 -- Chrome Driver 121.0.6167.184 -- Microsoft Edge 121.0.2277.106 -- Microsoft Edge Driver 121.0.2277.128 -- Mozilla Firefox 122.0.1 +- Google Chrome 122.0.6261.70 +- Chrome Driver 122.0.6261.69 +- Microsoft Edge 122.0.2365.52 +- Microsoft Edge Driver 122.0.2365.52 +- Mozilla Firefox 123.0 - Gecko Driver 0.34.0 - IE Driver 4.14.0.0 -- Selenium server 4.17.0 +- Selenium server 4.18.0 #### Environment variables | Name | Value | @@ -166,7 +166,6 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Cached Tools #### Go -- 1.19.13 - 1.20.14 - 1.21.7 - 1.22.0 @@ -193,9 +192,6 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 3.10.13 [PyPy 7.3.15] #### Ruby -- 2.5.9 -- 2.6.10 -- 2.7.8 - 3.0.6 - 3.1.4 @@ -514,10 +510,10 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Az (Cached): 1.0.0.zip, 1.6.0.zip, 2.3.2.zip, 2.6.0.zip, 3.1.0.zip, 3.5.0.zip, 3.8.0.zip, 4.3.0.zip, 4.4.0.zip, 4.7.0.zip, 5.5.0.zip, 5.9.0.zip, 6.6.0.zip, 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.518 +- AWSPowershell: 4.1.523 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 -- Microsoft.Graph: 2.14.0 +- Microsoft.Graph: 2.15.0 - Pester: 3.4.0, 5.5.0 - PowerShellGet: 1.0.0.1, 2.2.5 - PSScriptAnalyzer: 1.21.0 From 248063da0836475aea6eee151d6d6b6582c0084f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 28 Feb 2024 12:31:59 +0000 Subject: [PATCH 2693/3485] Updating readme file for win22 version 20240225.2.1 (#9416) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/windows/Windows2022-Readme.md | 50 +++++++++++++--------------- 1 file changed, 24 insertions(+), 26 deletions(-) diff --git a/images/windows/Windows2022-Readme.md b/images/windows/Windows2022-Readme.md index 3f536bfe8009..7acaca14204e 100644 --- a/images/windows/Windows2022-Readme.md +++ b/images/windows/Windows2022-Readme.md @@ -5,7 +5,7 @@ *** # Windows Server 2022 - OS Version: 10.0.20348 Build 2322 -- Image Version: 20240218.2.0 +- Image Version: 20240225.2.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -13,8 +13,8 @@ ## Installed Software ### Language and Runtime -- Bash 5.2.21(1)-release -- Go 1.20.14 +- Bash 5.2.26(1)-release +- Go 1.21.7 - Julia 1.10.0 - Kotlin 1.9.22 - LLVM 16.0.6 @@ -27,14 +27,14 @@ ### Package Management - Chocolatey 2.2.2 - Composer 2.7.1 -- Helm 3.14.0 +- Helm 3.14.1 - Miniconda 23.11.0 (pre-installed on the image but not added to PATH) - NPM 9.8.1 - NuGet 6.9.1.3 - pip 24.0 (python 3.9) - Pipx 1.4.3 - RubyGems 3.2.33 -- Vcpkg (build from commit 13bde2ff1) +- Vcpkg (build from commit 37c3e63a1) - Yarn 1.22.21 #### Environment variables @@ -47,7 +47,7 @@ - Ant 1.10.14 - Gradle 8.6 - Maven 3.8.7 -- sbt 1.9.8 +- sbt 1.9.9 ### Tools - 7zip 23.01 @@ -58,14 +58,14 @@ - Bicep 0.25.53 - Cabal 3.10.2.1 - CMake 3.28.3 -- CodeQL Action Bundle 2.16.2 +- CodeQL Action Bundle 2.16.3 - Docker 24.0.7 - Docker Compose v1 1.29.2 - Docker Compose v2 2.23.3 - Docker-wincred 0.8.1 -- ghc 9.8.1 -- Git 2.43.0.windows.1 -- Git LFS 3.4.0 +- ghc 9.8.2 +- Git 2.44.0.windows.1 +- Git LFS 3.4.1 - ImageMagick 7.1.1-28 - InnoSetup 6.2.2 - jq 1.7.1 @@ -79,7 +79,7 @@ - NSIS 3.09 - OpenSSL 1.1.1w - Packer 1.10.0 -- Pulumi 3.105.0 +- Pulumi 3.107.0 - R 4.3.2 - Service Fabric SDK 9.1.1436.9590 - Stack 2.15.1 @@ -93,8 +93,8 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.198 -- AWS CLI 2.15.21 -- AWS SAM CLI 1.109.0 +- AWS CLI 2.15.23 +- AWS SAM CLI 1.110.0 - AWS Session Manager CLI 1.2.553.0 - Azure CLI 2.57.0 - Azure DevOps CLI extension 0.26.0 @@ -115,14 +115,14 @@ - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 121.0.6167.185 -- Chrome Driver 121.0.6167.184 -- Microsoft Edge 121.0.2277.128 -- Microsoft Edge Driver 121.0.2277.128 -- Mozilla Firefox 122.0.1 +- Google Chrome 122.0.6261.70 +- Chrome Driver 122.0.6261.69 +- Microsoft Edge 122.0.2365.52 +- Microsoft Edge Driver 122.0.2365.52 +- Mozilla Firefox 123.0 - Gecko Driver 0.34.0 - IE Driver 4.14.0.0 -- Selenium server 4.17.0 +- Selenium server 4.18.0 #### Environment variables | Name | Value | @@ -160,7 +160,6 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Cached Tools #### Go -- 1.19.13 - 1.20.14 - 1.21.7 - 1.22.0 @@ -186,7 +185,6 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 3.10.13 [PyPy 7.3.15] #### Ruby -- 2.7.8 - 3.0.6 - 3.1.4 @@ -223,9 +221,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Nginx | 1.25.4 | C:\tools\nginx-1.25.4\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2022 -| Name | Version | Path | -| ----------------------------- | -------------- | -------------------------------------------------------- | -| Visual Studio Enterprise 2022 | 17.9.34607.119 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | +| Name | Version | Path | +| ----------------------------- | ------------- | -------------------------------------------------------- | +| Visual Studio Enterprise 2022 | 17.9.34616.47 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | #### Workloads, components and extensions | Package | Version | @@ -568,10 +566,10 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Az (Cached): 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.518 +- AWSPowershell: 4.1.523 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 -- Microsoft.Graph: 2.14.0 +- Microsoft.Graph: 2.15.0 - Pester: 3.4.0, 5.5.0 - PowerShellGet: 1.0.0.1, 2.2.5 - PSScriptAnalyzer: 1.21.0 From 211da2488f82dff735b407282bf312b4d19049c0 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 29 Feb 2024 09:10:07 +0000 Subject: [PATCH 2694/3485] Updating readme file for ubuntu20 version 20240225.1.1 (#9417) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2004-Readme.md | 60 ++++++++++++++---------------- 1 file changed, 28 insertions(+), 32 deletions(-) diff --git a/images/ubuntu/Ubuntu2004-Readme.md b/images/ubuntu/Ubuntu2004-Readme.md index ae9a20109edb..a63940477ec3 100644 --- a/images/ubuntu/Ubuntu2004-Readme.md +++ b/images/ubuntu/Ubuntu2004-Readme.md @@ -5,8 +5,8 @@ *** # Ubuntu 20.04 - OS Version: 20.04.6 LTS -- Kernel Version: 5.15.0-1056-azure -- Image Version: 20240218.1.0 +- Kernel Version: 5.15.0-1057-azure +- Image Version: 20240225.1.0 - Systemd version: 245.4-4ubuntu3.23 ## Installed Software @@ -33,8 +33,8 @@ ### Package Management - cpan 1.64 -- Helm 3.14.1 -- Homebrew 4.2.8 +- Helm 3.14.2 +- Homebrew 4.2.9 - Miniconda 23.11.0 - Npm 10.2.4 - NuGet 6.6.1.2 @@ -42,7 +42,7 @@ - Pip3 20.0.2 - Pipx 1.4.3 - RubyGems 3.1.2 -- Vcpkg (build from commit 13bde2ff1) +- Vcpkg (build from commit 37c3e63a1) - Yarn 1.22.21 #### Environment variables @@ -64,7 +64,7 @@ to accomplish this. - Gradle 8.6 - Lerna 8.1.2 - Maven 3.8.8 -- Sbt 1.9.8 +- Sbt 1.9.9 ### Tools - Ansible 2.13.13 @@ -75,19 +75,19 @@ to accomplish this. - Bicep 0.25.53 - Buildah 1.22.3 - CMake 3.28.3 -- CodeQL Action Bundle 2.16.2 +- CodeQL Action Bundle 2.16.3 - Docker Amazon ECR Credential Helper 0.7.1 - Docker Compose v1 1.29.2 - Docker Compose v2 2.23.3 - Docker-Buildx 0.12.1 -- Docker Client 24.0.8 -- Docker Server 24.0.8 +- Docker Client 24.0.9 +- Docker Server 24.0.9 - Fastlane 2.219.0 - Git 2.43.2 - Git LFS 3.4.1 - Git-ftp 1.6.0 - Haveged 1.9.1 -- Heroku 8.9.0 +- Heroku 8.10.0 - HHVM (HipHop VM) 4.172.1 - jq 1.6 - Kind 0.22.0 @@ -97,7 +97,7 @@ to accomplish this. - MediaInfo 19.09 - Mercurial 5.3.1 - Minikube 1.32.0 -- n 9.2.0 +- n 9.2.1 - Newman 6.1.1 - nvm 0.39.7 - OpenSSL 1.1.1f-1ubuntu2.21 @@ -105,29 +105,29 @@ to accomplish this. - Parcel 2.11.0 - PhantomJS 2.1.1 2.1.1 - Podman 3.4.2 -- Pulumi 3.106.0 +- Pulumi 3.107.0 - R 4.3.2 - Skopeo 1.5.0 - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 -- Terraform 1.7.3 +- Terraform 1.7.4 - yamllint 1.35.1 - yq 4.41.1 - zstd 1.5.5 ### CLI Tools - Alibaba Cloud CLI 3.0.174 -- AWS CLI 2.15.21 +- AWS CLI 2.15.23 - AWS CLI Session Manager Plugin 1.2.553.0 -- AWS SAM CLI 1.109.0 +- AWS SAM CLI 1.110.0 - Azure CLI 2.57.0 - Azure CLI (azure-devops) 0.26.0 - GitHub CLI 2.44.1 -- Google Cloud CLI 464.0.0 -- Netlify CLI 17.16.2 -- OpenShift CLI 4.14.12 +- Google Cloud CLI 465.0.0 +- Netlify CLI 17.17.0 +- OpenShift CLI 4.14.13 - ORAS CLI 1.1.0 -- Vercel CLI 33.5.1 +- Vercel CLI 33.5.2 ### Java | Version | Environment Variable | @@ -147,7 +147,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ### Haskell Tools - Cabal 3.10.2.1 -- GHC 9.8.1 +- GHC 9.8.2 - GHCup 0.1.20.0 - Stack 2.15.1 @@ -166,12 +166,12 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 121.0.6167.184 -- ChromeDriver 121.0.6167.184 -- Chromium 121.0.6167.0 -- Microsoft Edge 121.0.2277.128 -- Microsoft Edge WebDriver 121.0.2277.128 -- Selenium server 4.17.0 +- Google Chrome 122.0.6261.69 +- ChromeDriver 122.0.6261.69 +- Chromium 122.0.6261.0 +- Microsoft Edge 122.0.2365.52 +- Microsoft Edge WebDriver 122.0.2365.52 +- Selenium server 4.18.1 - Mozilla Firefox 123.0 - Geckodriver 0.34.0 @@ -215,7 +215,6 @@ Use the following command as a part of your job to start the service: 'sudo syst ### Cached Tools #### Go -- 1.19.13 - 1.20.14 - 1.21.7 - 1.22.0 @@ -242,9 +241,6 @@ Use the following command as a part of your job to start the service: 'sudo syst - 3.10.13 [PyPy 7.3.15] #### Ruby -- 2.5.9 -- 2.6.10 -- 2.7.8 - 3.0.6 - 3.1.4 @@ -255,7 +251,7 @@ Use the following command as a part of your job to start the service: 'sudo syst - Az: 9.3.0 - Az (Cached): 3.1.0.zip, 4.4.0.zip, 5.9.0.zip, 6.6.0.zip, 7.5.0.zip - MarkdownPS: 1.9 -- Microsoft.Graph: 2.14.0 +- Microsoft.Graph: 2.15.0 - Pester: 5.5.0 - PSScriptAnalyzer: 1.21.0 @@ -320,7 +316,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | coreutils | 8.30-3ubuntu2 | | curl | 7.68.0-1ubuntu2.21 | | dbus | 1.12.16-2ubuntu2.3 | -| dnsutils | 1:9.16.1-0ubuntu2.16 | +| dnsutils | 1:9.16.48-0ubuntu0.20.04.1 | | dpkg | 1.19.7ubuntu3.2 | | dpkg-dev | 1.19.7ubuntu3.2 | | fakeroot | 1.24-1 | From 5b3748924eb0a1afb70897cc8a9d45140629cfb2 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 29 Feb 2024 15:40:09 +0000 Subject: [PATCH 2695/3485] Updating readme file for ubuntu22 version 20240225.1.1 (#9420) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2204-Readme.md | 55 +++++++++++++++--------------- 1 file changed, 27 insertions(+), 28 deletions(-) diff --git a/images/ubuntu/Ubuntu2204-Readme.md b/images/ubuntu/Ubuntu2204-Readme.md index 7baefcca0c6b..d56343c24468 100644 --- a/images/ubuntu/Ubuntu2204-Readme.md +++ b/images/ubuntu/Ubuntu2204-Readme.md @@ -5,8 +5,8 @@ *** # Ubuntu 22.04 - OS Version: 22.04.4 LTS -- Kernel Version: 6.2.0-1019-azure -- Image Version: 20240218.1.0 +- Kernel Version: 6.5.0-1015-azure +- Image Version: 20240225.1.0 - Systemd version: 249.11-0ubuntu3.12 ## Installed Software @@ -31,8 +31,8 @@ ### Package Management - cpan 1.64 -- Helm 3.14.1 -- Homebrew 4.2.8 +- Helm 3.14.2 +- Homebrew 4.2.10 - Miniconda 23.11.0 - Npm 10.2.4 - NuGet 6.6.1.2 @@ -40,7 +40,7 @@ - Pip3 22.0.2 - Pipx 1.4.3 - RubyGems 3.3.5 -- Vcpkg (build from commit 13bde2ff1) +- Vcpkg (build from commit 37c3e63a1) - Yarn 1.22.21 #### Environment variables @@ -70,19 +70,19 @@ to accomplish this. - Bicep 0.25.53 - Buildah 1.23.1 - CMake 3.28.3 -- CodeQL Action Bundle 2.16.2 +- CodeQL Action Bundle 2.16.3 - Docker Amazon ECR Credential Helper 0.7.1 - Docker Compose v1 1.29.2 - Docker Compose v2 2.23.3 - Docker-Buildx 0.12.1 -- Docker Client 24.0.8 -- Docker Server 24.0.8 +- Docker Client 24.0.9 +- Docker Server 24.0.9 - Fastlane 2.219.0 - Git 2.43.2 - Git LFS 3.4.1 - Git-ftp 1.6.0 - Haveged 1.9.14 -- Heroku 8.9.0 +- Heroku 8.10.0 - jq 1.6 - Kind 0.22.0 - Kubectl 1.29.2 @@ -91,36 +91,36 @@ to accomplish this. - MediaInfo 21.09 - Mercurial 6.1.1 - Minikube 1.32.0 -- n 9.2.0 +- n 9.2.1 - Newman 6.1.1 - nvm 0.39.7 - OpenSSL 3.0.2-0ubuntu1.14 - Packer 1.10.1 - Parcel 2.11.0 - Podman 3.4.4 -- Pulumi 3.106.0 +- Pulumi 3.107.0 - R 4.3.2 - Skopeo 1.4.1 - Sphinx Open Source Search Server 2.2.11 - SVN 1.14.1 -- Terraform 1.7.3 +- Terraform 1.7.4 - yamllint 1.35.1 -- yq 4.41.1 +- yq 4.42.1 - zstd 1.5.5 ### CLI Tools - Alibaba Cloud CLI 3.0.198 -- AWS CLI 2.15.21 +- AWS CLI 2.15.23 - AWS CLI Session Manager Plugin 1.2.553.0 -- AWS SAM CLI 1.109.0 +- AWS SAM CLI 1.110.0 - Azure CLI 2.57.0 - Azure CLI (azure-devops) 0.26.0 - GitHub CLI 2.44.1 -- Google Cloud CLI 464.0.0 -- Netlify CLI 17.16.2 -- OpenShift CLI 4.14.12 +- Google Cloud CLI 465.0.0 +- Netlify CLI 17.17.0 +- OpenShift CLI 4.14.13 - ORAS CLI 1.1.0 -- Vercel CLI 33.5.1 +- Vercel CLI 33.5.2 ### Java | Version | Environment Variable | @@ -140,7 +140,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ### Haskell Tools - Cabal 3.10.2.1 -- GHC 9.8.1 +- GHC 9.8.2 - GHCup 0.1.20.0 - Stack 2.15.1 @@ -159,12 +159,12 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 121.0.6167.184 -- ChromeDriver 121.0.6167.184 -- Chromium 121.0.6167.0 -- Microsoft Edge 121.0.2277.128 -- Microsoft Edge WebDriver 121.0.2277.128 -- Selenium server 4.17.0 +- Google Chrome 122.0.6261.69 +- ChromeDriver 122.0.6261.69 +- Chromium 122.0.6261.0 +- Microsoft Edge 122.0.2365.52 +- Microsoft Edge WebDriver 122.0.2365.52 +- Selenium server 4.18.1 - Mozilla Firefox 123.0 - Geckodriver 0.34.0 @@ -207,7 +207,6 @@ Use the following command as a part of your job to start the service: 'sudo syst ### Cached Tools #### Go -- 1.19.13 - 1.20.14 - 1.21.7 - 1.22.0 @@ -240,7 +239,7 @@ Use the following command as a part of your job to start the service: 'sudo syst #### PowerShell Modules - Az: 9.3.0 - MarkdownPS: 1.9 -- Microsoft.Graph: 2.14.0 +- Microsoft.Graph: 2.15.0 - Pester: 5.5.0 - PSScriptAnalyzer: 1.21.0 From 879626d9bd6229400882cc334115630205da3aa2 Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Thu, 29 Feb 2024 17:05:16 +0100 Subject: [PATCH 2696/3485] [ubuntu] Update libssl1.1 version (#9428) * [ubuntu] Update libssl1.1 version * [ubuntu] Fix hash --- images/ubuntu/scripts/build/install-sqlpackage.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/ubuntu/scripts/build/install-sqlpackage.sh b/images/ubuntu/scripts/build/install-sqlpackage.sh index 2ef6bd7f4f08..c4ea756c7827 100644 --- a/images/ubuntu/scripts/build/install-sqlpackage.sh +++ b/images/ubuntu/scripts/build/install-sqlpackage.sh @@ -10,8 +10,8 @@ source $HELPER_SCRIPTS/os.sh # Install libssl1.1 dependency if is_ubuntu22; then - libssl_deb_path=$(download_with_retry "http://security.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.1f-1ubuntu2.21_amd64.deb") - libssl_hash="97d7f8cb9ddc7f06b23dce73a25b75e5c02ec18112c4a8e5da53624d1fd718a2" + libssl_deb_path=$(download_with_retry "http://security.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.1f-1ubuntu2.22_amd64.deb") + libssl_hash="df9d07d552aab0c7e5b9fbcc568913acd20d50fb8b1e34876fa348b7a0c82d48" use_checksum_comparison "$libssl_deb_path" "$libssl_hash" dpkg -i "$libssl_deb_path" From 346a8b1a9d6f1db6560c7983d0ce960407831ca7 Mon Sep 17 00:00:00 2001 From: You-Sheng Yang <vicamo@gmail.com> Date: Mon, 4 Mar 2024 20:39:13 +0800 Subject: [PATCH 2697/3485] [Ubuntu] 22.04: install libssl1.1 via apt (#9432) Signed-off-by: You-Sheng Yang <vicamo@gmail.com> --- images/ubuntu/scripts/build/install-sqlpackage.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/images/ubuntu/scripts/build/install-sqlpackage.sh b/images/ubuntu/scripts/build/install-sqlpackage.sh index c4ea756c7827..311ea5beae7c 100644 --- a/images/ubuntu/scripts/build/install-sqlpackage.sh +++ b/images/ubuntu/scripts/build/install-sqlpackage.sh @@ -10,11 +10,14 @@ source $HELPER_SCRIPTS/os.sh # Install libssl1.1 dependency if is_ubuntu22; then - libssl_deb_path=$(download_with_retry "http://security.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.1f-1ubuntu2.22_amd64.deb") - libssl_hash="df9d07d552aab0c7e5b9fbcc568913acd20d50fb8b1e34876fa348b7a0c82d48" - use_checksum_comparison "$libssl_deb_path" "$libssl_hash" + focal_list=/etc/apt/sources.list.d/focal-security.list + echo "deb http://archive.ubuntu.com/ubuntu/ focal-security main" | tee "${focal_list}" + apt-get update --quiet - dpkg -i "$libssl_deb_path" + apt-get install --no-install-recommends --yes libssl1.1 + + rm "${focal_list}" + apt-get update --quiet fi # Install SqlPackage From e27310f1e35416512fa52fce7e2fb25e07371a22 Mon Sep 17 00:00:00 2001 From: Shivam Mathur <shivam_jpr@hotmail.com> Date: Mon, 4 Mar 2024 08:10:45 -0800 Subject: [PATCH 2698/3485] [Windows] Upgrade php version to 8.3 (#9439) --- images/windows/toolsets/toolset-2019.json | 2 +- images/windows/toolsets/toolset-2022.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/images/windows/toolsets/toolset-2019.json b/images/windows/toolsets/toolset-2019.json index 7f364f28009f..b0029285a619 100644 --- a/images/windows/toolsets/toolset-2019.json +++ b/images/windows/toolsets/toolset-2019.json @@ -479,7 +479,7 @@ "version": "3.09" }, "php": { - "version": "8.2" + "version": "8.3" }, "llvm": { "version": "16" diff --git a/images/windows/toolsets/toolset-2022.json b/images/windows/toolsets/toolset-2022.json index 5f63a353caa4..04512a6696b1 100644 --- a/images/windows/toolsets/toolset-2022.json +++ b/images/windows/toolsets/toolset-2022.json @@ -424,7 +424,7 @@ "version": "16" }, "php": { - "version": "8.2" + "version": "8.3" }, "postgresql": { "version": "14", From 9d2d1a4c06c7ac2e92f6227a476588af1658c7e6 Mon Sep 17 00:00:00 2001 From: sergei-pyshnoi <121864472+sergei-pyshnoi@users.noreply.github.com> Date: Tue, 5 Mar 2024 00:10:31 +0100 Subject: [PATCH 2699/3485] [macOS] update webservers pester test (#9444) --- images/macos/scripts/tests/WebServers.Tests.ps1 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/images/macos/scripts/tests/WebServers.Tests.ps1 b/images/macos/scripts/tests/WebServers.Tests.ps1 index a132ba06f07e..18c6bbb26425 100644 --- a/images/macos/scripts/tests/WebServers.Tests.ps1 +++ b/images/macos/scripts/tests/WebServers.Tests.ps1 @@ -8,7 +8,8 @@ Describe "Apache" -Skip:($os.IsVentura -or $os.IsSonoma) { } It "Apache Service" { - brew services list | Out-String | Should -Match "httpd\s+(stopped|none)" + $service = brew services list --json | ConvertFrom-Json | Where-Object { $_.name -eq "httpd" } + $service.status | Should -Match "(stopped|none)" } } @@ -18,6 +19,7 @@ Describe "Nginx" -Skip:($os.IsVentura -or $os.IsSonoma) { } It "Nginx Service" { - brew services list | Out-String | Should -Match "nginx\s+(stopped|none)" + $service = brew services list --json | ConvertFrom-Json | Where-Object { $_.name -eq "nginx" } + $service.status | Should -Match "(stopped|none)" } } From e32a4a56ec1874b9827244febecb3f3a58e98820 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 6 Mar 2024 15:57:17 +0000 Subject: [PATCH 2700/3485] Updating readme file for win19 version 20240304.2.1 (#9453) Co-authored-by: Image generation service account <no-reply@microsoft.com> --- images/windows/Windows2019-Readme.md | 39 ++++++++++++++-------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/images/windows/Windows2019-Readme.md b/images/windows/Windows2019-Readme.md index a816844792ac..2f1d9bb6acad 100644 --- a/images/windows/Windows2019-Readme.md +++ b/images/windows/Windows2019-Readme.md @@ -1,11 +1,12 @@ | Announcements | |-| +| [[Ubuntu, Windows] Az Powershell module will be updated to v11.3.1 on March 18](https://github.com/actions/runner-images/issues/9445) | | [[All OSes] Ruby versions <= 2.7.x will be removed on February, 26](https://github.com/actions/runner-images/issues/9327) | | [[All OSes] Go 1.19.x will be removed and 1.21.x set as default on February, 26](https://github.com/actions/runner-images/issues/9326) | *** # Windows Server 2019 - OS Version: 10.0.17763 Build 5458 -- Image Version: 20240225.1.0 +- Image Version: 20240304.2.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -20,7 +21,7 @@ - LLVM 16.0.6 - Node 18.18.2 - Perl 5.32.1 -- PHP 8.2.16 +- PHP 8.3.3 - Python 3.7.9 - Ruby 3.0.6p216 @@ -28,13 +29,13 @@ - Chocolatey 2.2.2 - Composer 2.7.1 - Helm 3.14.1 -- Miniconda 23.11.0 (pre-installed on the image but not added to PATH) +- Miniconda 24.1.2 (pre-installed on the image but not added to PATH) - NPM 9.8.1 - NuGet 6.9.1.3 - pip 24.0 (python 3.7) - Pipx 1.2.1 - RubyGems 3.2.33 -- Vcpkg (build from commit 37c3e63a1) +- Vcpkg (build from commit 215a25355) - Yarn 1.22.21 #### Environment variables @@ -66,8 +67,8 @@ - ghc 9.8.2 - Git 2.44.0.windows.1 - Git LFS 3.4.1 -- Google Cloud CLI 465.0.0 -- ImageMagick 7.1.1-28 +- Google Cloud CLI 466.0.0 +- ImageMagick 7.1.1-29 - InnoSetup 6.2.2 - jq 1.7.1 - Kind 0.22.0 @@ -80,8 +81,8 @@ - NSIS 3.09 - OpenSSL 1.1.1w - Packer 1.10.0 -- Parcel 2.11.0 -- Pulumi 3.107.0 +- Parcel 2.12.0 +- Pulumi 3.108.1 - R 4.3.2 - Service Fabric SDK 9.1.1436.9590 - Stack 2.15.1 @@ -89,19 +90,19 @@ - Swig 4.1.1 - VSWhere 3.1.7 - WinAppDriver 1.2.2009.02003 -- WiX Toolset 3.11.2.4516 +- WiX Toolset 3.14.0.8606 - yamllint 1.32.0 - zstd 1.5.5 ### CLI Tools - Alibaba Cloud CLI 3.0.198 -- AWS CLI 2.15.23 +- AWS CLI 2.15.25 - AWS SAM CLI 1.110.0 - AWS Session Manager CLI 1.2.553.0 - Azure CLI 2.57.0 -- Azure DevOps CLI extension 0.26.0 +- Azure DevOps CLI extension 1.0.0 - Cloud Foundry CLI 6.53.0 -- GitHub CLI 2.44.1 +- GitHub CLI 2.45.0 ### Rust Tools - Cargo 1.76.0 @@ -112,16 +113,16 @@ #### Packages - bindgen 0.69.4 - cargo-audit 0.20.0 -- cargo-outdated 0.14.0 +- cargo-outdated 0.15.0 - cbindgen 0.26.0 - Clippy 0.1.76 - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 122.0.6261.70 -- Chrome Driver 122.0.6261.69 -- Microsoft Edge 122.0.2365.52 -- Microsoft Edge Driver 122.0.2365.52 +- Google Chrome 122.0.6261.95 +- Chrome Driver 122.0.6261.94 +- Microsoft Edge 122.0.2365.66 +- Microsoft Edge Driver 122.0.2365.66 - Mozilla Firefox 123.0 - Gecko Driver 0.34.0 - IE Driver 4.14.0.0 @@ -216,7 +217,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Database tools - Azure CosmosDb Emulator 2.14.16.0 -- DacFx 162.1.172.1 +- DacFx 162.2.111.2 - MySQL 5.7.44.0 - SQL OLEDB Driver 18.6.7.0 - SQLPS 1.0 @@ -510,7 +511,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Az (Cached): 1.0.0.zip, 1.6.0.zip, 2.3.2.zip, 2.6.0.zip, 3.1.0.zip, 3.5.0.zip, 3.8.0.zip, 4.3.0.zip, 4.4.0.zip, 4.7.0.zip, 5.5.0.zip, 5.9.0.zip, 6.6.0.zip, 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.523 +- AWSPowershell: 4.1.528 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 - Microsoft.Graph: 2.15.0 From 8a42507a08d73d031c0bff9122950bb5d9fc9bd8 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 6 Mar 2024 16:58:52 +0000 Subject: [PATCH 2701/3485] Updating readme file for ubuntu22 version 20240304.1.1 (#9450) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2204-Readme.md | 55 +++++++++++++++--------------- 1 file changed, 28 insertions(+), 27 deletions(-) diff --git a/images/ubuntu/Ubuntu2204-Readme.md b/images/ubuntu/Ubuntu2204-Readme.md index d56343c24468..10c3749c5460 100644 --- a/images/ubuntu/Ubuntu2204-Readme.md +++ b/images/ubuntu/Ubuntu2204-Readme.md @@ -1,12 +1,13 @@ | Announcements | |-| +| [[Ubuntu, Windows] Az Powershell module will be updated to v11.3.1 on March 18](https://github.com/actions/runner-images/issues/9445) | | [[All OSes] Ruby versions <= 2.7.x will be removed on February, 26](https://github.com/actions/runner-images/issues/9327) | | [[All OSes] Go 1.19.x will be removed and 1.21.x set as default on February, 26](https://github.com/actions/runner-images/issues/9326) | *** # Ubuntu 22.04 - OS Version: 22.04.4 LTS - Kernel Version: 6.5.0-1015-azure -- Image Version: 20240225.1.0 +- Image Version: 20240304.1.0 - Systemd version: 249.11-0ubuntu3.12 ## Installed Software @@ -19,7 +20,7 @@ - Dash 0.5.11+git20210903+057cd650a4ed-3build1 - GNU C++: 9.5.0, 10.5.0, 11.4.0, 12.3.0, 13.1.0 - GNU Fortran: 9.5.0, 10.5.0, 11.4.0, 12.3.0, 13.1.0 -- Julia 1.10.1 +- Julia 1.10.2 - Kotlin 1.9.22-release-704 - Mono 6.12.0.200 - MSBuild 16.10.1.31701 (Mono 6.12.0.200) @@ -32,15 +33,15 @@ ### Package Management - cpan 1.64 - Helm 3.14.2 -- Homebrew 4.2.10 -- Miniconda 23.11.0 +- Homebrew 4.2.11 +- Miniconda 24.1.2 - Npm 10.2.4 - NuGet 6.6.1.2 - Pip 22.0.2 - Pip3 22.0.2 - Pipx 1.4.3 - RubyGems 3.3.5 -- Vcpkg (build from commit 37c3e63a1) +- Vcpkg (build from commit 215a25355) - Yarn 1.22.21 #### Environment variables @@ -62,7 +63,7 @@ to accomplish this. - Maven 3.8.8 ### Tools -- Ansible 2.16.3 +- Ansible 2.16.4 - apt-fast 1.10.0 - AzCopy 10.23.0 - available by `azcopy` and `azcopy10` aliases - Bazel 7.0.2 @@ -94,12 +95,12 @@ to accomplish this. - n 9.2.1 - Newman 6.1.1 - nvm 0.39.7 -- OpenSSL 3.0.2-0ubuntu1.14 +- OpenSSL 3.0.2-0ubuntu1.15 - Packer 1.10.1 -- Parcel 2.11.0 +- Parcel 2.12.0 - Podman 3.4.4 -- Pulumi 3.107.0 -- R 4.3.2 +- Pulumi 3.108.1 +- R 4.3.3 - Skopeo 1.4.1 - Sphinx Open Source Search Server 2.2.11 - SVN 1.14.1 @@ -110,17 +111,17 @@ to accomplish this. ### CLI Tools - Alibaba Cloud CLI 3.0.198 -- AWS CLI 2.15.23 +- AWS CLI 2.15.25 - AWS CLI Session Manager Plugin 1.2.553.0 - AWS SAM CLI 1.110.0 - Azure CLI 2.57.0 -- Azure CLI (azure-devops) 0.26.0 -- GitHub CLI 2.44.1 -- Google Cloud CLI 465.0.0 -- Netlify CLI 17.17.0 -- OpenShift CLI 4.14.13 +- Azure CLI (azure-devops) 1.0.0 +- GitHub CLI 2.45.0 +- Google Cloud CLI 466.0.0 +- Netlify CLI 17.17.2 +- OpenShift CLI 4.15.0 - ORAS CLI 1.1.0 -- Vercel CLI 33.5.2 +- Vercel CLI 33.5.3 ### Java | Version | Environment Variable | @@ -154,18 +155,18 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Bindgen 0.69.4 - Cargo audit 0.20.0 - Cargo clippy 0.1.76 -- Cargo outdated 0.14.0 +- Cargo outdated 0.15.0 - Cbindgen 0.26.0 - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 122.0.6261.69 -- ChromeDriver 122.0.6261.69 +- Google Chrome 122.0.6261.94 +- ChromeDriver 122.0.6261.94 - Chromium 122.0.6261.0 -- Microsoft Edge 122.0.2365.52 -- Microsoft Edge WebDriver 122.0.2365.52 +- Microsoft Edge 122.0.2365.63 +- Microsoft Edge WebDriver 122.0.2365.63 - Selenium server 4.18.1 -- Mozilla Firefox 123.0 +- Mozilla Firefox 123.0.1 - Geckodriver 0.34.0 #### Environment variables @@ -202,7 +203,7 @@ Use the following command as a part of your job to start the service: 'sudo syst #### MS SQL - sqlcmd 17.10.0001.1 -- SqlPackage 162.1.172.1 +- SqlPackage 162.2.111.2 ### Cached Tools @@ -296,7 +297,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | aria2 | 1.36.0-1 | | autoconf | 2.71-2 | | automake | 1:1.16.5-1.3 | -| binutils | 2.38-4ubuntu2.5 | +| binutils | 2.38-4ubuntu2.6 | | bison | 2:3.8.2+dfsg-1build1 | | brotli | 1.0.9-2build6 | | bzip2 | 1.0.8-5build1 | @@ -334,7 +335,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | libmagickwand-dev | 8:6.9.11.60+dfsg-1.3ubuntu0.22.04.3 | | libsecret-1-dev | 0.20.5-2 | | libsqlite3-dev | 3.37.2-2ubuntu0.3 | -| libssl-dev | 3.0.2-0ubuntu1.14 | +| libssl-dev | 3.0.2-0ubuntu1.15 | | libtool | 2.4.6-15build2 | | libunwind8 | 1.3.2-2build2.1 | | libxkbfile-dev | 1:1.1.0-1build3 | @@ -373,7 +374,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | texinfo | 6.8-4build1 | | time | 1.9-0.1build2 | | tk | 8.6.11+1build2 | -| tzdata | 2023d-0ubuntu0.22.04 | +| tzdata | 2024a-0ubuntu0.22.04 | | unzip | 6.0-26ubuntu3.2 | | upx | 3.96-3 | | wget | 1.21.2-2ubuntu1 | From 61df9288f9be9f6aeaaaa4ad52a7332432913fc3 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 6 Mar 2024 18:25:13 +0000 Subject: [PATCH 2702/3485] Updating readme file for ubuntu20 version 20240304.1.1 (#9451) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2004-Readme.md | 55 +++++++++++++++--------------- 1 file changed, 28 insertions(+), 27 deletions(-) diff --git a/images/ubuntu/Ubuntu2004-Readme.md b/images/ubuntu/Ubuntu2004-Readme.md index a63940477ec3..5d3b5a727b21 100644 --- a/images/ubuntu/Ubuntu2004-Readme.md +++ b/images/ubuntu/Ubuntu2004-Readme.md @@ -1,12 +1,13 @@ | Announcements | |-| +| [[Ubuntu, Windows] Az Powershell module will be updated to v11.3.1 on March 18](https://github.com/actions/runner-images/issues/9445) | | [[All OSes] Ruby versions <= 2.7.x will be removed on February, 26](https://github.com/actions/runner-images/issues/9327) | | [[All OSes] Go 1.19.x will be removed and 1.21.x set as default on February, 26](https://github.com/actions/runner-images/issues/9326) | *** # Ubuntu 20.04 - OS Version: 20.04.6 LTS - Kernel Version: 5.15.0-1057-azure -- Image Version: 20240225.1.0 +- Image Version: 20240304.1.0 - Systemd version: 245.4-4ubuntu3.23 ## Installed Software @@ -21,7 +22,7 @@ - Erlang rebar3 3.22.1 - GNU C++: 9.4.0, 10.5.0 - GNU Fortran: 9.4.0, 10.5.0 -- Julia 1.10.1 +- Julia 1.10.2 - Kotlin 1.9.22-release-704 - Mono 6.12.0.200 - MSBuild 16.10.1.31701 (Mono 6.12.0.200) @@ -34,15 +35,15 @@ ### Package Management - cpan 1.64 - Helm 3.14.2 -- Homebrew 4.2.9 -- Miniconda 23.11.0 +- Homebrew 4.2.11 +- Miniconda 24.1.2 - Npm 10.2.4 - NuGet 6.6.1.2 - Pip 20.0.2 - Pip3 20.0.2 - Pipx 1.4.3 - RubyGems 3.1.2 -- Vcpkg (build from commit 37c3e63a1) +- Vcpkg (build from commit 215a25355) - Yarn 1.22.21 #### Environment variables @@ -100,34 +101,34 @@ to accomplish this. - n 9.2.1 - Newman 6.1.1 - nvm 0.39.7 -- OpenSSL 1.1.1f-1ubuntu2.21 +- OpenSSL 1.1.1f-1ubuntu2.22 - Packer 1.10.1 -- Parcel 2.11.0 +- Parcel 2.12.0 - PhantomJS 2.1.1 2.1.1 - Podman 3.4.2 -- Pulumi 3.107.0 -- R 4.3.2 +- Pulumi 3.108.1 +- R 4.3.3 - Skopeo 1.5.0 - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 - Terraform 1.7.4 - yamllint 1.35.1 -- yq 4.41.1 +- yq 4.42.1 - zstd 1.5.5 ### CLI Tools - Alibaba Cloud CLI 3.0.174 -- AWS CLI 2.15.23 +- AWS CLI 2.15.25 - AWS CLI Session Manager Plugin 1.2.553.0 - AWS SAM CLI 1.110.0 - Azure CLI 2.57.0 -- Azure CLI (azure-devops) 0.26.0 -- GitHub CLI 2.44.1 -- Google Cloud CLI 465.0.0 -- Netlify CLI 17.17.0 -- OpenShift CLI 4.14.13 +- Azure CLI (azure-devops) 1.0.0 +- GitHub CLI 2.45.0 +- Google Cloud CLI 466.0.0 +- Netlify CLI 17.17.2 +- OpenShift CLI 4.15.0 - ORAS CLI 1.1.0 -- Vercel CLI 33.5.2 +- Vercel CLI 33.5.3 ### Java | Version | Environment Variable | @@ -161,18 +162,18 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Bindgen 0.69.4 - Cargo audit 0.20.0 - Cargo clippy 0.1.76 -- Cargo outdated 0.14.0 +- Cargo outdated 0.15.0 - Cbindgen 0.26.0 - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 122.0.6261.69 -- ChromeDriver 122.0.6261.69 +- Google Chrome 122.0.6261.94 +- ChromeDriver 122.0.6261.94 - Chromium 122.0.6261.0 -- Microsoft Edge 122.0.2365.52 -- Microsoft Edge WebDriver 122.0.2365.52 +- Microsoft Edge 122.0.2365.63 +- Microsoft Edge WebDriver 122.0.2365.63 - Selenium server 4.18.1 -- Mozilla Firefox 123.0 +- Mozilla Firefox 123.0.1 - Geckodriver 0.34.0 #### Environment variables @@ -188,7 +189,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - nbgv 3.6.133+2d32d93cb1 ### Databases -- MongoDB 5.0.24 +- MongoDB 5.0.25 - sqlite3 3.31.1 #### PostgreSQL @@ -210,7 +211,7 @@ Use the following command as a part of your job to start the service: 'sudo syst #### MS SQL - sqlcmd 17.10.0001.1 -- SqlPackage 162.1.172.1 +- SqlPackage 162.2.111.2 ### Cached Tools @@ -309,7 +310,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | aria2 | 1.35.0-1build1 | | autoconf | 2.69-11.1 | | automake | 1:1.16.1-4ubuntu6 | -| binutils | 2.34-6ubuntu1.8 | +| binutils | 2.34-6ubuntu1.9 | | bison | 2:3.5.1+dfsg-1 | | brotli | 1.0.7-6ubuntu0.1 | | bzip2 | 1.0.8-2 | @@ -384,7 +385,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | texinfo | 6.7.0.dfsg.2-5 | | time | 1.7-25.1build1 | | tk | 8.6.9+1 | -| tzdata | 2023d-0ubuntu0.20.04 | +| tzdata | 2024a-0ubuntu0.20.04 | | unzip | 6.0-25ubuntu1.2 | | upx | 3.95-2build1 | | wget | 1.20.3-1ubuntu2 | From cde48c99e6ae440b4349cde8a709b62c46327555 Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Thu, 7 Mar 2024 17:11:44 +0100 Subject: [PATCH 2703/3485] [Windows] Update Kotlin installer hash check (#9469) --- images/windows/scripts/build/Install-Kotlin.ps1 | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/images/windows/scripts/build/Install-Kotlin.ps1 b/images/windows/scripts/build/Install-Kotlin.ps1 index 09189134095a..e10c269f650f 100644 --- a/images/windows/scripts/build/Install-Kotlin.ps1 +++ b/images/windows/scripts/build/Install-Kotlin.ps1 @@ -14,11 +14,7 @@ $kotlinDownloadUrl = Resolve-GithubReleaseAssetUrl ` $kotlinArchivePath = Invoke-DownloadWithRetry $kotlinDownloadUrl #region Supply chain security -$externalHash = Get-ChecksumFromGithubRelease ` - -Repo "JetBrains/kotlin" ` - -Version "$kotlinVersion" ` - -FileName (Split-Path $kotlinDownloadUrl -Leaf) ` - -HashType "SHA256" +$externalHash = Get-Content $(Invoke-DownloadWithRetry "$kotlinDownloadUrl.sha256") Test-FileChecksum $kotlinArchivePath -ExpectedSHA256Sum $externalHash #endregion From 3d6eedc86d7bffdcd0a31cad8d8a6677e7f2402e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 7 Mar 2024 19:01:02 +0000 Subject: [PATCH 2704/3485] Updating readme file for win22 version 20240304.2.1 (#9449) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/windows/Windows2022-Readme.md | 77 ++++++++++++++-------------- 1 file changed, 39 insertions(+), 38 deletions(-) diff --git a/images/windows/Windows2022-Readme.md b/images/windows/Windows2022-Readme.md index 7acaca14204e..fb85eeebc8e2 100644 --- a/images/windows/Windows2022-Readme.md +++ b/images/windows/Windows2022-Readme.md @@ -1,11 +1,12 @@ | Announcements | |-| +| [[Ubuntu, Windows] Az Powershell module will be updated to v11.3.1 on March 18](https://github.com/actions/runner-images/issues/9445) | | [[All OSes] Ruby versions <= 2.7.x will be removed on February, 26](https://github.com/actions/runner-images/issues/9327) | | [[All OSes] Go 1.19.x will be removed and 1.21.x set as default on February, 26](https://github.com/actions/runner-images/issues/9326) | *** # Windows Server 2022 - OS Version: 10.0.20348 Build 2322 -- Image Version: 20240225.2.0 +- Image Version: 20240304.2.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -20,7 +21,7 @@ - LLVM 16.0.6 - Node 18.18.2 - Perl 5.32.1 -- PHP 8.2.16 +- PHP 8.3.3 - Python 3.9.13 - Ruby 3.0.6p216 @@ -28,13 +29,13 @@ - Chocolatey 2.2.2 - Composer 2.7.1 - Helm 3.14.1 -- Miniconda 23.11.0 (pre-installed on the image but not added to PATH) +- Miniconda 24.1.2 (pre-installed on the image but not added to PATH) - NPM 9.8.1 - NuGet 6.9.1.3 - pip 24.0 (python 3.9) - Pipx 1.4.3 - RubyGems 3.2.33 -- Vcpkg (build from commit 37c3e63a1) +- Vcpkg (build from commit 215a25355) - Yarn 1.22.21 #### Environment variables @@ -66,7 +67,7 @@ - ghc 9.8.2 - Git 2.44.0.windows.1 - Git LFS 3.4.1 -- ImageMagick 7.1.1-28 +- ImageMagick 7.1.1-29 - InnoSetup 6.2.2 - jq 1.7.1 - Kind 0.22.0 @@ -79,7 +80,7 @@ - NSIS 3.09 - OpenSSL 1.1.1w - Packer 1.10.0 -- Pulumi 3.107.0 +- Pulumi 3.108.1 - R 4.3.2 - Service Fabric SDK 9.1.1436.9590 - Stack 2.15.1 @@ -87,18 +88,18 @@ - Swig 4.1.1 - VSWhere 3.1.7 - WinAppDriver 1.2.2009.02003 -- WiX Toolset 3.11.2.4516 +- WiX Toolset 3.14.0.8606 - yamllint 1.35.1 - zstd 1.5.5 ### CLI Tools - Alibaba Cloud CLI 3.0.198 -- AWS CLI 2.15.23 +- AWS CLI 2.15.25 - AWS SAM CLI 1.110.0 - AWS Session Manager CLI 1.2.553.0 - Azure CLI 2.57.0 -- Azure DevOps CLI extension 0.26.0 -- GitHub CLI 2.44.1 +- Azure DevOps CLI extension 1.0.0 +- GitHub CLI 2.45.0 ### Rust Tools - Cargo 1.76.0 @@ -109,16 +110,16 @@ #### Packages - bindgen 0.69.4 - cargo-audit 0.20.0 -- cargo-outdated 0.14.0 +- cargo-outdated 0.15.0 - cbindgen 0.26.0 - Clippy 0.1.76 - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 122.0.6261.70 -- Chrome Driver 122.0.6261.69 -- Microsoft Edge 122.0.2365.52 -- Microsoft Edge Driver 122.0.2365.52 +- Google Chrome 122.0.6261.95 +- Chrome Driver 122.0.6261.94 +- Microsoft Edge 122.0.2365.66 +- Microsoft Edge Driver 122.0.2365.66 - Mozilla Firefox 123.0 - Gecko Driver 0.34.0 - IE Driver 4.14.0.0 @@ -209,7 +210,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Database tools - Azure CosmosDb Emulator 2.14.16.0 -- DacFx 162.1.172.1 +- DacFx 162.2.111.2 - MySQL 8.0.36.0 - SQL OLEDB Driver 18.6.7.0 - SQLPS 1.0 @@ -221,9 +222,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Nginx | 1.25.4 | C:\tools\nginx-1.25.4\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2022 -| Name | Version | Path | -| ----------------------------- | ------------- | -------------------------------------------------------- | -| Visual Studio Enterprise 2022 | 17.9.34616.47 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | +| Name | Version | Path | +| ----------------------------- | -------------- | -------------------------------------------------------- | +| Visual Studio Enterprise 2022 | 17.9.34622.214 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | #### Workloads, components and extensions | Package | Version | @@ -381,24 +382,6 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.Spectre | 17.9.34511.75 | | Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64 | 17.9.34511.75 | | Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64.Spectre | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.14.37.17.7.ARM | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.14.37.17.7.ARM.Spectre | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.14.37.17.7.ARM64 | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.14.37.17.7.ARM64.Spectre | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.14.37.17.7.ATL | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.14.37.17.7.ATL.ARM | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.14.37.17.7.ATL.ARM.Spectre | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.14.37.17.7.ATL.ARM64 | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.14.37.17.7.ATL.ARM64.Spectre | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.14.37.17.7.ATL.Spectre | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.14.37.17.7.MFC | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.14.37.17.7.MFC.ARM | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.14.37.17.7.MFC.ARM.Spectre | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.14.37.17.7.MFC.ARM64 | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.14.37.17.7.MFC.ARM64.Spectre | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.14.37.17.7.MFC.Spectre | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.14.37.17.7.x86.x64 | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.14.37.17.7.x86.x64.Spectre | 17.9.34511.75 | | Microsoft.VisualStudio.Component.VC.14.38.17.8.ARM | 17.9.34511.75 | | Microsoft.VisualStudio.Component.VC.14.38.17.8.ARM.Spectre | 17.9.34511.75 | | Microsoft.VisualStudio.Component.VC.14.38.17.8.ARM64 | 17.9.34511.75 | @@ -417,6 +400,24 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Component.VC.14.38.17.8.MFC.Spectre | 17.9.34511.75 | | Microsoft.VisualStudio.Component.VC.14.38.17.8.x86.x64 | 17.9.34511.75 | | Microsoft.VisualStudio.Component.VC.14.38.17.8.x86.x64.Spectre | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.14.39.17.9.ARM | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.14.39.17.9.ARM.Spectre | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.14.39.17.9.ARM64 | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.14.39.17.9.ARM64.Spectre | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.14.39.17.9.ATL | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.14.39.17.9.ATL.ARM | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.14.39.17.9.ATL.ARM.Spectre | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.14.39.17.9.ATL.ARM64 | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.14.39.17.9.ATL.ARM64.Spectre | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.14.39.17.9.ATL.Spectre | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.14.39.17.9.MFC | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.14.39.17.9.MFC.ARM | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.14.39.17.9.MFC.ARM.Spectre | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.14.39.17.9.MFC.ARM64 | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.14.39.17.9.MFC.ARM64.Spectre | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.14.39.17.9.MFC.Spectre | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.14.39.17.9.x86.x64 | 17.9.34511.75 | +| Microsoft.VisualStudio.Component.VC.14.39.17.9.x86.x64.Spectre | 17.9.34511.75 | | Microsoft.VisualStudio.Component.VC.ASAN | 17.9.34511.75 | | Microsoft.VisualStudio.Component.VC.ATL | 17.9.34511.75 | | Microsoft.VisualStudio.Component.VC.ATL.ARM | 17.9.34511.75 | @@ -566,7 +567,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Az (Cached): 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.523 +- AWSPowershell: 4.1.528 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 - Microsoft.Graph: 2.15.0 From 3d9bcaefb10dfcd0371a353a6d3fe8eba2ded36e Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Thu, 7 Mar 2024 21:01:25 +0100 Subject: [PATCH 2705/3485] [Ubuntu] Update Kotlin installer hash check (#9468) --- images/ubuntu/scripts/build/install-kotlin.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/images/ubuntu/scripts/build/install-kotlin.sh b/images/ubuntu/scripts/build/install-kotlin.sh index 80edb8a33b9c..7b35212d207c 100644 --- a/images/ubuntu/scripts/build/install-kotlin.sh +++ b/images/ubuntu/scripts/build/install-kotlin.sh @@ -13,7 +13,8 @@ download_url=$(resolve_github_release_asset_url "JetBrains/kotlin" "contains(\"k archive_path=$(download_with_retry "$download_url") # Supply chain security - Kotlin -kotlin_hash=$(get_checksum_from_github_release "JetBrains/kotlin" "kotlin-compiler-.*\.zip" "latest" "SHA256") +kotlin_hash_file=$(download_with_retry "${download_url}.sha256") +kotlin_hash=$(cat "$kotlin_hash_file") use_checksum_comparison "$archive_path" "$kotlin_hash" unzip -qq "$archive_path" -d $KOTLIN_ROOT From cb3fcb62b9ccef6bfcf0ffd613e0baad92e5a9e8 Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Thu, 7 Mar 2024 21:02:41 +0100 Subject: [PATCH 2706/3485] [macOS] Remove VCPKG from macOS-14 (#9465) --- images/macos/scripts/docs-gen/Generate-SoftwareReport.ps1 | 2 +- images/macos/scripts/tests/Common.Tests.ps1 | 2 +- images/macos/templates/macOS-14.anka.pkr.hcl | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/images/macos/scripts/docs-gen/Generate-SoftwareReport.ps1 b/images/macos/scripts/docs-gen/Generate-SoftwareReport.ps1 index 7c57214edf08..c73361aa64d9 100644 --- a/images/macos/scripts/docs-gen/Generate-SoftwareReport.ps1 +++ b/images/macos/scripts/docs-gen/Generate-SoftwareReport.ps1 @@ -93,7 +93,7 @@ if ((-not $os.IsVenturaArm64) -and (-not $os.IsSonomaArm64)) { } $packageManagement.AddToolVersion("RubyGems", $(Get-RubyGemsVersion)) -if ((-not $os.IsVenturaArm64) -and (-not $os.IsSonomaArm64)) { +if ((-not $os.IsVenturaArm64) -and (-not $os.IsSonomaArm64) -and (-not $os.IsSonoma)) { $packageManagement.AddToolVersion("Vcpkg", $(Get-VcpkgVersion)) } $packageManagement.AddToolVersion("Yarn", $(Get-YarnVersion)) diff --git a/images/macos/scripts/tests/Common.Tests.ps1 b/images/macos/scripts/tests/Common.Tests.ps1 index 720fdd5c8af2..8a07c618046e 100644 --- a/images/macos/scripts/tests/Common.Tests.ps1 +++ b/images/macos/scripts/tests/Common.Tests.ps1 @@ -33,7 +33,7 @@ Describe "GCC" { } } -Describe "vcpkg" -Skip:($os.IsVenturaArm64 -or $os.IsSonomaArm64) { +Describe "vcpkg" -Skip:($os.IsVenturaArm64 -or $os.IsSonomaArm64 -or $os.IsSonoma) { It "vcpkg" { "vcpkg version" | Should -ReturnZeroExitCode } diff --git a/images/macos/templates/macOS-14.anka.pkr.hcl b/images/macos/templates/macOS-14.anka.pkr.hcl index c4b9f456000a..015d306f13ea 100644 --- a/images/macos/templates/macOS-14.anka.pkr.hcl +++ b/images/macos/templates/macOS-14.anka.pkr.hcl @@ -239,7 +239,6 @@ build { "${path.root}/../scripts/build/install-gcc.sh", "${path.root}/../scripts/build/install-cocoapods.sh", "${path.root}/../scripts/build/install-android-sdk.sh", - "${path.root}/../scripts/build/install-vcpkg.sh", "${path.root}/../scripts/build/install-safari.sh", "${path.root}/../scripts/build/install-chrome.sh", "${path.root}/../scripts/build/install-edge.sh", From e442ffab3aef709a47149d4132256002a57b2013 Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Mon, 11 Mar 2024 12:47:07 +0100 Subject: [PATCH 2707/3485] Add Image Rollout Status badges (#9486) --- README.md | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index b098e8818aaa..d5050f5f93ed 100644 --- a/README.md +++ b/README.md @@ -19,18 +19,18 @@ To build a VM machine from this repo's source, see the [instructions](docs/creat ## Available Images -| Image | YAML Label | Included Software | -| --------------------|---------------------|--------------------| -| Ubuntu 22.04 | `ubuntu-latest` or `ubuntu-22.04` | [ubuntu-22.04] | -| Ubuntu 20.04 | `ubuntu-20.04` | [ubuntu-20.04] | -| macOS 14 [beta] | `macos-14-large`| [macOS-14] | -| macOS 14 Arm64 [beta] | `macos-14` or `macos-14-xlarge`| [macOS-14-arm64] | -| macOS 13 | `macos-13`, `macos-13-large` or `macos-latest-large` | [macOS-13] | -| macOS 13 Arm64 | `macos-13-xlarge` | [macOS-13-arm64] | -| macOS 12 | `macos-latest`,`macos-12` or`macos-12-large`| [macOS-12] | -| macOS 11 [deprecated] | `macos-11`| [macOS-11] | -| Windows Server 2022 | `windows-latest` or `windows-2022` | [windows-2022] | -| Windows Server 2019 | `windows-2019` | [windows-2019] | +| Image | YAML Label | Included Software | Rollout Status of Latest Image Release | +| --------------------|---------------------|--------------------|--------------------| +| Ubuntu 22.04 | `ubuntu-latest` or `ubuntu-22.04` | [ubuntu-22.04] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fmikhailkoliada%2F35b243dd6e217d041fe3dfa5b4e2e2ed%2Fraw%2Fubuntu22.json) | +| Ubuntu 20.04 | `ubuntu-20.04` | [ubuntu-20.04] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fmikhailkoliada%2F35b243dd6e217d041fe3dfa5b4e2e2ed%2Fraw%2Fubuntu20.json) | +| macOS 14 [beta] | `macos-14-large`| [macOS-14] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fmikhailkoliada%2F35b243dd6e217d041fe3dfa5b4e2e2ed%2Fraw%2Fmacos-14.json) | +| macOS 14 Arm64 [beta] | `macos-14` or `macos-14-xlarge`| [macOS-14-arm64] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fmikhailkoliada%2F35b243dd6e217d041fe3dfa5b4e2e2ed%2Fraw%2Fmacos-14-arm64.json) | +| macOS 13 | `macos-13`, `macos-13-large` or `macos-latest-large` | [macOS-13] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fmikhailkoliada%2F35b243dd6e217d041fe3dfa5b4e2e2ed%2Fraw%2Fmacos-13.json) | +| macOS 13 Arm64 | `macos-13-xlarge` | [macOS-13-arm64] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fmikhailkoliada%2F35b243dd6e217d041fe3dfa5b4e2e2ed%2Fraw%2Fmacos-13-arm64.json) | +| macOS 12 | `macos-latest`,`macos-12` or`macos-12-large`| [macOS-12] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fmikhailkoliada%2F35b243dd6e217d041fe3dfa5b4e2e2ed%2Fraw%2FmacOS-12.json) | +| macOS 11 [deprecated] | `macos-11`| [macOS-11] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fmikhailkoliada%2F35b243dd6e217d041fe3dfa5b4e2e2ed%2Fraw%2FmacOS-11.json) | +| Windows Server 2022 | `windows-latest` or `windows-2022` | [windows-2022] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fmikhailkoliada%2F35b243dd6e217d041fe3dfa5b4e2e2ed%2Fraw%2Fwin22.json) | +| Windows Server 2019 | `windows-2019` | [windows-2019] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fmikhailkoliada%2F35b243dd6e217d041fe3dfa5b4e2e2ed%2Fraw%2Fwin19.json) | ### Label scheme From c8b27061269ec9bccb811c264ef2389b246d0975 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Mon, 11 Mar 2024 20:05:42 +0100 Subject: [PATCH 2708/3485] [macOS] remove blackhole 2ch (#9487) * [macOS] remove blackhole-2ch * Update System.Tests.ps1 --- images/macos/scripts/build/install-audiodevice.sh | 10 ---------- images/macos/scripts/tests/System.Tests.ps1 | 4 ---- 2 files changed, 14 deletions(-) diff --git a/images/macos/scripts/build/install-audiodevice.sh b/images/macos/scripts/build/install-audiodevice.sh index e600de552479..b9ccc2d90203 100644 --- a/images/macos/scripts/build/install-audiodevice.sh +++ b/images/macos/scripts/build/install-audiodevice.sh @@ -12,14 +12,4 @@ brew_smart_install "switchaudio-osx" echo "install sox" brew_smart_install "sox" -# Big Sur doesn't support soundflower installation without user interaction https://github.com/mattingalls/Soundflower/releases/tag/2.0b2 -# Install blackhole-2ch for Big Sur instead - -echo "install blackhole-2ch" -brew_smart_install "blackhole-2ch" - -echo "set BlackHole 2ch as input/output device" -SwitchAudioSource -s "BlackHole 2ch" -t input -SwitchAudioSource -s "BlackHole 2ch" -t output - invoke_tests "System" "Audio Device" diff --git a/images/macos/scripts/tests/System.Tests.ps1 b/images/macos/scripts/tests/System.Tests.ps1 index cf785a9b56cc..27fe198bba18 100644 --- a/images/macos/scripts/tests/System.Tests.ps1 +++ b/images/macos/scripts/tests/System.Tests.ps1 @@ -33,10 +33,6 @@ Describe "Audio device" -Skip:($os.IsVentura -or $os.IsSonoma) { It "SwitchAudioSource is installed" { "SwitchAudioSource -c" | Should -ReturnZeroExitCode } - - It "Audio channel BlackHole 2ch" { - SwitchAudioSource -c | Should -BeLikeExactly "BlackHole 2ch" - } } Describe "Screen Resolution" -Skip:(isVeertu) { From 66c0961dc8eb7f28ca1602132a51a21f73fc02f3 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Mon, 11 Mar 2024 20:51:13 +0100 Subject: [PATCH 2709/3485] [Ubuntu] Update Az to 11.3.1 (#9490) --- images/ubuntu/toolsets/toolset-2004.json | 7 +------ images/ubuntu/toolsets/toolset-2204.json | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/images/ubuntu/toolsets/toolset-2004.json b/images/ubuntu/toolsets/toolset-2004.json index de3a182d7f08..5b5e4338aad4 100644 --- a/images/ubuntu/toolsets/toolset-2004.json +++ b/images/ubuntu/toolsets/toolset-2004.json @@ -108,14 +108,9 @@ "name": "az", "url" : "https://raw.githubusercontent.com/Azure/az-ps-module-versions/main/versions-manifest.json", "versions": [ - "9.3.0" + "11.3.1" ], "zip_versions": [ - "3.1.0", - "4.4.0", - "5.9.0", - "6.6.0", - "7.5.0" ] } ], diff --git a/images/ubuntu/toolsets/toolset-2204.json b/images/ubuntu/toolsets/toolset-2204.json index ad5913d3ccb3..b36e575a2fd7 100644 --- a/images/ubuntu/toolsets/toolset-2204.json +++ b/images/ubuntu/toolsets/toolset-2204.json @@ -105,7 +105,7 @@ "name": "az", "url" : "https://raw.githubusercontent.com/Azure/az-ps-module-versions/main/versions-manifest.json", "versions": [ - "9.3.0" + "11.3.1" ], "zip_versions": [ ] From aa58a23bf88190d336de66f07c1451baa5c8e79c Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Mon, 11 Mar 2024 20:51:28 +0100 Subject: [PATCH 2710/3485] [windows] Update Az to 11.3.1 (#9489) --- images/windows/toolsets/toolset-2019.json | 16 +--------------- images/windows/toolsets/toolset-2022.json | 4 ++-- 2 files changed, 3 insertions(+), 17 deletions(-) diff --git a/images/windows/toolsets/toolset-2019.json b/images/windows/toolsets/toolset-2019.json index b0029285a619..5b5360c10745 100644 --- a/images/windows/toolsets/toolset-2019.json +++ b/images/windows/toolsets/toolset-2019.json @@ -119,23 +119,9 @@ { "name": "az", "versions": [ - "9.3.0" + "11.3.1" ], "zip_versions": [ - "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.7.0", - "5.5.0", - "5.9.0", - "6.6.0", - "7.5.0" ] } ], diff --git a/images/windows/toolsets/toolset-2022.json b/images/windows/toolsets/toolset-2022.json index 04512a6696b1..6b603486661d 100644 --- a/images/windows/toolsets/toolset-2022.json +++ b/images/windows/toolsets/toolset-2022.json @@ -118,10 +118,10 @@ { "name": "az", "versions": [ - "9.3.0" + "11.3.1" ], "zip_versions": [ - "7.5.0" + ] } ], From c910aa42d0bd668cee3df19dc9b799b1f952fa81 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Wed, 13 Mar 2024 11:18:49 +0100 Subject: [PATCH 2711/3485] [macOS] Add PowerShell version of Configure-Xcode-Simulators script (#9496) --- .../build/Configure-Xcode-Simulators.ps1 | 68 +++++++++++++++++++ images/macos/templates/macOS-13.anka.pkr.hcl | 5 +- .../templates/macOS-13.arm64.anka.pkr.hcl | 5 +- images/macos/templates/macOS-14.anka.pkr.hcl | 5 +- .../templates/macOS-14.arm64.anka.pkr.hcl | 5 +- 5 files changed, 80 insertions(+), 8 deletions(-) create mode 100644 images/macos/scripts/build/Configure-Xcode-Simulators.ps1 diff --git a/images/macos/scripts/build/Configure-Xcode-Simulators.ps1 b/images/macos/scripts/build/Configure-Xcode-Simulators.ps1 new file mode 100644 index 000000000000..d4bcd8cb73a2 --- /dev/null +++ b/images/macos/scripts/build/Configure-Xcode-Simulators.ps1 @@ -0,0 +1,68 @@ +################################################################################ +## File: Configure-Xcode-Simulators.ps1 +## Team: CI-Build +## Desc: CHeck and remove duplicate simulators +################################################################################ + +Import-Module "~/image-generation/helpers/Common.Helpers.psm1" +Import-Module "~/image-generation/helpers/Xcode.Helpers.psm1" +$arch = Get-Architecture +$xcodeVersions = (Get-ToolsetContent).xcode.${arch}.versions + +# Switch to each Xcode version +foreach ($xcodeVersion in $xcodeVersions.link) { + write-host "Switching to Xcode $xcodeVersion" + Switch-Xcode -Version $XcodeVersion + + # Make object of all simulators + $devicesList = $(xcrun simctl list -j devices | ConvertFrom-Json) + $devicesObject = [System.Collections.ArrayList]@() + foreach ($runtime in $devicesList.devices.psobject.Properties.name) { + foreach ($device in $devicesList.devices.$runtime) { + $devicesObject += [PSCustomObject]@{ + runtime = $runtime + DeviceName = $($device.name) + DeviceId = $($device.udid) + DeviceCreationTime = (Get-Item $HOME/Library/Developer/CoreSimulator/Devices/$($device.udid)).CreationTime + } + } + } + + # Remove duplicates + foreach ($simRuntume in $devicesObject.runtime | Sort-Object -Unique) { + [System.Collections.ArrayList]$sameRuntimeDevices = [array]$($devicesObject | Where-Object {$_.runtime -eq $simRuntume} | Sort-Object -Property DeviceName) + Write-Host "///////////////////////////////////////////////////////////////////" + Write-Host "// Checking for duplicates in $simRuntume " + $devicesAsHashTable = $sameRuntimeDevices | Group-Object -Property DeviceName -AsHashTable -AsString + foreach ($key in $devicesAsHashTable.Keys) { + if ( $devicesAsHashTable[$key].count -gt 1) { + Write-Host "// Duplicates for $key - $($devicesAsHashTable[$key].count)" + } + } + Write-Host "///////////////////////////////////////////////////////////////////" + for ($i = 0; $i -lt $sameRuntimeDevices.Count; $i++) { + if ( [string]::IsNullOrEmpty($($sameRuntimeDevices[$i+1].DeviceName)) ){ + Write-Host "No more devices to compare in $simRuntume" + Write-Host "-------------------------------------------------------------------" + continue + } + Write-Host "$($sameRuntimeDevices[$i].DeviceName) - DeviceId $($sameRuntimeDevices[$i].DeviceId) comparing with" + Write-Host "$($sameRuntimeDevices[$i+1].DeviceName) - DeviceId $($sameRuntimeDevices[$i+1].DeviceId)" + Write-Host "-------------------------------------------------------------------" + if ($sameRuntimeDevices[$i].DeviceName -eq $sameRuntimeDevices[$i+1].DeviceName) { + write-host "*******************************************************************" + write-host "** Duplicate found" + if ($sameRuntimeDevices[$i].DeviceCreationTime -lt $sameRuntimeDevices[$i+1].DeviceCreationTime) { + Write-Host "** will be removed $($sameRuntimeDevices[$i+1].DeviceName) with id $($sameRuntimeDevices[$i+1].DeviceId)" + xcrun simctl delete $sameRuntimeDevices[$i+1].DeviceId + $sameRuntimeDevices.RemoveAt($i+1) + } else { + Write-Host "** will be removed $($sameRuntimeDevices[$i].DeviceName) with id $($sameRuntimeDevices[$i].DeviceId)" + xcrun simctl delete $sameRuntimeDevices[$i].DeviceId + $sameRuntimeDevices.RemoveAt($i) + } + write-host "*******************************************************************" + } + } + } +} diff --git a/images/macos/templates/macOS-13.anka.pkr.hcl b/images/macos/templates/macOS-13.anka.pkr.hcl index 9039d4d7a0fb..ee57ed83dbc8 100644 --- a/images/macos/templates/macOS-13.anka.pkr.hcl +++ b/images/macos/templates/macOS-13.anka.pkr.hcl @@ -260,8 +260,9 @@ build { } provisioner "shell" { - execute_command = "source $HOME/.bash_profile; ruby {{ .Path }}" - script = "${path.root}/../scripts/build/configure-xcode-simulators.rb" + environment_vars = ["IMAGE_FOLDER=${local.image_folder}"] + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} pwsh -f {{ .Path }}" + script = "${path.root}/../scripts/build/Configure-Xcode-Simulators.ps1" } provisioner "shell" { diff --git a/images/macos/templates/macOS-13.arm64.anka.pkr.hcl b/images/macos/templates/macOS-13.arm64.anka.pkr.hcl index 5c12e8960f65..be53d27a6c97 100644 --- a/images/macos/templates/macOS-13.arm64.anka.pkr.hcl +++ b/images/macos/templates/macOS-13.arm64.anka.pkr.hcl @@ -255,8 +255,9 @@ build { } provisioner "shell" { - execute_command = "source $HOME/.bash_profile; ruby {{ .Path }}" - script = "${path.root}/../scripts/build/configure-xcode-simulators.rb" + environment_vars = ["IMAGE_FOLDER=${local.image_folder}"] + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} pwsh -f {{ .Path }}" + script = "${path.root}/../scripts/build/Configure-Xcode-Simulators.ps1" } provisioner "shell" { diff --git a/images/macos/templates/macOS-14.anka.pkr.hcl b/images/macos/templates/macOS-14.anka.pkr.hcl index 015d306f13ea..ed93c149e038 100644 --- a/images/macos/templates/macOS-14.anka.pkr.hcl +++ b/images/macos/templates/macOS-14.anka.pkr.hcl @@ -259,8 +259,9 @@ build { } provisioner "shell" { - execute_command = "source $HOME/.bash_profile; ruby {{ .Path }}" - script = "${path.root}/../scripts/build/configure-xcode-simulators.rb" + environment_vars = ["IMAGE_FOLDER=${local.image_folder}"] + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} pwsh -f {{ .Path }}" + script = "${path.root}/../scripts/build/Configure-Xcode-Simulators.ps1" } provisioner "shell" { diff --git a/images/macos/templates/macOS-14.arm64.anka.pkr.hcl b/images/macos/templates/macOS-14.arm64.anka.pkr.hcl index 85ea62da6a16..693fbae36559 100644 --- a/images/macos/templates/macOS-14.arm64.anka.pkr.hcl +++ b/images/macos/templates/macOS-14.arm64.anka.pkr.hcl @@ -255,8 +255,9 @@ build { } provisioner "shell" { - execute_command = "source $HOME/.bash_profile; ruby {{ .Path }}" - script = "${path.root}/../scripts/build/configure-xcode-simulators.rb" + environment_vars = ["IMAGE_FOLDER=${local.image_folder}"] + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} pwsh -f {{ .Path }}" + script = "${path.root}/../scripts/build/Configure-Xcode-Simulators.ps1" } provisioner "shell" { From 82a37d19facbc55fc7adcb53fe608db0200c61b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Grabski-Gradzi=C5=84ski?= <piotr.gradzinski@gmail.com> Date: Wed, 13 Mar 2024 12:54:42 +0100 Subject: [PATCH 2712/3485] Updating signature for Visual Studio Enterprise 2022.17. (#9502) --- images/windows/toolsets/toolset-2022.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/windows/toolsets/toolset-2022.json b/images/windows/toolsets/toolset-2022.json index 6b603486661d..e08ec9d9348c 100644 --- a/images/windows/toolsets/toolset-2022.json +++ b/images/windows/toolsets/toolset-2022.json @@ -176,7 +176,7 @@ "subversion" : "17", "edition" : "Enterprise", "channel": "release", - "signature": "F9A7CF9FBE13BAC767F4781061332DA6E8B4E0EE", + "signature": "C2048FB509F1C37A8C3E9EC6648118458AA01780", "workloads": [ "Component.Dotfuscator", "Component.Linux.CMake", From 074e246081b1d316362b9f7fc38b6d03f708d307 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Wed, 13 Mar 2024 14:27:57 +0100 Subject: [PATCH 2713/3485] [macOS] pin xcbeautify on OS12 (#9501) --- images/macos/scripts/build/install-common-utils.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/images/macos/scripts/build/install-common-utils.sh b/images/macos/scripts/build/install-common-utils.sh index f031bd67b288..d9351a668853 100644 --- a/images/macos/scripts/build/install-common-utils.sh +++ b/images/macos/scripts/build/install-common-utils.sh @@ -18,7 +18,13 @@ fi common_packages=$(get_toolset_value '.brew.common_packages[]') for package in $common_packages; do echo "Installing $package..." - brew_smart_install "$package" + if is_Monterey && [[ $package == "xcbeautify" ]]; then + # Pin the version on Monterey as 2.0.x requires Xcode >=15.0 which is not available on OS12 + xcbeautify_path=$(download_with_retry "https://raw.githubusercontent.com/Homebrew/homebrew-core/d3653e83f9c029a3fddb828ac804b07ac32f7b3b/Formula/x/xcbeautify.rb") + brew install "$xcbeautify_path" + else + brew_smart_install "$package" + fi done cask_packages=$(get_toolset_value '.brew.cask_packages[]') From 8b2c86662bda274843bb80279bff15c4f870cda0 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 13 Mar 2024 16:56:56 +0000 Subject: [PATCH 2714/3485] Updating readme file for ubuntu20 version 20240310.1.1 (#9483) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2004-Readme.md | 56 +++++++++++++++--------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/images/ubuntu/Ubuntu2004-Readme.md b/images/ubuntu/Ubuntu2004-Readme.md index 5d3b5a727b21..5e858dcf55c7 100644 --- a/images/ubuntu/Ubuntu2004-Readme.md +++ b/images/ubuntu/Ubuntu2004-Readme.md @@ -6,8 +6,8 @@ *** # Ubuntu 20.04 - OS Version: 20.04.6 LTS -- Kernel Version: 5.15.0-1057-azure -- Image Version: 20240304.1.0 +- Kernel Version: 5.15.0-1058-azure +- Image Version: 20240310.1.0 - Systemd version: 245.4-4ubuntu3.23 ## Installed Software @@ -23,14 +23,14 @@ - GNU C++: 9.4.0, 10.5.0 - GNU Fortran: 9.4.0, 10.5.0 - Julia 1.10.2 -- Kotlin 1.9.22-release-704 +- Kotlin 1.9.23-release-779 - Mono 6.12.0.200 - MSBuild 16.10.1.31701 (Mono 6.12.0.200) - Node.js 18.19.1 - Perl 5.30.0 - Python 3.8.10 - Ruby 2.7.0p0 -- Swift 5.9.2 +- Swift 5.10 ### Package Management - cpan 1.64 @@ -43,8 +43,8 @@ - Pip3 20.0.2 - Pipx 1.4.3 - RubyGems 3.1.2 -- Vcpkg (build from commit 215a25355) -- Yarn 1.22.21 +- Vcpkg (build from commit 0719a7138) +- Yarn 1.22.22 #### Environment variables | Name | Value | @@ -80,12 +80,12 @@ to accomplish this. - Docker Amazon ECR Credential Helper 0.7.1 - Docker Compose v1 1.29.2 - Docker Compose v2 2.23.3 -- Docker-Buildx 0.12.1 +- Docker-Buildx 0.13.0 - Docker Client 24.0.9 - Docker Server 24.0.9 - Fastlane 2.219.0 - Git 2.43.2 -- Git LFS 3.4.1 +- Git LFS 3.5.1 - Git-ftp 1.6.0 - Haveged 1.9.1 - Heroku 8.10.0 @@ -102,11 +102,11 @@ to accomplish this. - Newman 6.1.1 - nvm 0.39.7 - OpenSSL 1.1.1f-1ubuntu2.22 -- Packer 1.10.1 +- Packer 1.10.2 - Parcel 2.12.0 - PhantomJS 2.1.1 2.1.1 - Podman 3.4.2 -- Pulumi 3.108.1 +- Pulumi 3.109.0 - R 4.3.3 - Skopeo 1.5.0 - Sphinx Open Source Search Server 2.2.11 @@ -118,17 +118,17 @@ to accomplish this. ### CLI Tools - Alibaba Cloud CLI 3.0.174 -- AWS CLI 2.15.25 +- AWS CLI 2.15.27 - AWS CLI Session Manager Plugin 1.2.553.0 -- AWS SAM CLI 1.110.0 -- Azure CLI 2.57.0 +- AWS SAM CLI 1.111.0 +- Azure CLI 2.58.0 - Azure CLI (azure-devops) 1.0.0 - GitHub CLI 2.45.0 -- Google Cloud CLI 466.0.0 -- Netlify CLI 17.17.2 +- Google Cloud CLI 467.0.0 +- Netlify CLI 17.19.0 - OpenShift CLI 4.15.0 - ORAS CLI 1.1.0 -- Vercel CLI 33.5.3 +- Vercel CLI 33.5.5 ### Java | Version | Environment Variable | @@ -139,9 +139,9 @@ to accomplish this. | 21.0.2+13 | JAVA_HOME_21_X64 | ### PHP Tools -- PHP: 7.4.33, 8.0.30, 8.1.27, 8.2.15, 8.3.3 +- PHP: 7.4.33, 8.0.30, 8.1.27, 8.2.16, 8.3.3 - Composer 2.7.1 -- PHPUnit 8.5.36 +- PHPUnit 8.5.37 ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ``` @@ -150,7 +150,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Cabal 3.10.2.1 - GHC 9.8.2 - GHCup 0.1.20.0 -- Stack 2.15.1 +- Stack 2.15.3 ### Rust Tools - Cargo 1.76.0 @@ -167,11 +167,11 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 122.0.6261.94 -- ChromeDriver 122.0.6261.94 +- Google Chrome 122.0.6261.111 +- ChromeDriver 122.0.6261.111 - Chromium 122.0.6261.0 -- Microsoft Edge 122.0.2365.63 -- Microsoft Edge WebDriver 122.0.2365.63 +- Microsoft Edge 122.0.2365.80 +- Microsoft Edge WebDriver 122.0.2365.80 - Selenium server 4.18.1 - Mozilla Firefox 123.0.1 - Geckodriver 0.34.0 @@ -217,8 +217,8 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Go - 1.20.14 -- 1.21.7 -- 1.22.0 +- 1.21.8 +- 1.22.1 #### Node.js - 16.20.2 @@ -254,7 +254,7 @@ Use the following command as a part of your job to start the service: 'sudo syst - MarkdownPS: 1.9 - Microsoft.Graph: 2.15.0 - Pester: 5.5.0 -- PSScriptAnalyzer: 1.21.0 +- PSScriptAnalyzer: 1.22.0 ### Web Servers | Name | Version | ConfigFile | ServiceStatus | ListenPort | @@ -294,14 +294,14 @@ Use the following command as a part of your job to start the service: 'sudo syst | debian:10 | sha256:a52d4e1c201d9ab2f3b939b91a3fdd345d3d11404755bc1cdb22c1d5be131c5d | 2024-02-13 | | debian:11 | sha256:171478fbe347a3cfe45058dae333b6ed848fd8ce89f3104c89fa94c245086db1 | 2024-02-13 | | debian:9 | sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be | 2022-06-23 | -| moby/buildkit:latest | sha256:449188623c7a8a3bd4f161c5d0ddf5cabbfb828f7eaadf9ed8111864b911a308 | 2024-01-31 | +| moby/buildkit:latest | sha256:24fddad8ce5063e822f32df151b5d7c0b060a850e680bed615ccf9162eabf6e3 | 2024-03-05 | | node:16 | sha256:f77a1aef2da8d83e45ec990f45df50f1a286c5fe8bbfb8c6e4246c6389705c0b | 2023-09-07 | | node:16-alpine | sha256:a1f9d027912b58a7c75be7716c97cfbc6d3099f3a97ed84aa490be9dee20e787 | 2023-08-10 | | node:18 | sha256:aa329c613f0067755c0787d2a3a9802c7d95eecdb927d62b910ec1d28689882f | 2024-02-15 | | node:18-alpine | sha256:ca9f6cb0466f9638e59e0c249d335a07c867cd50c429b5c7830dda1bed584649 | 2024-02-15 | | node:20 | sha256:f3299f16246c71ab8b304d6745bb4059fa9283e8d025972e28436a9f9b36ed24 | 2024-02-15 | | node:20-alpine | sha256:c0a3badbd8a0a760de903e00cedbca94588e609299820557e72cba2a53dbaa2c | 2024-02-15 | -| ubuntu:20.04 | sha256:bb1c41682308d7040f74d103022816d41c50d7b0c89e9d706a74b4e548636e54 | 2024-01-23 | +| ubuntu:20.04 | sha256:80ef4a44043dec4490506e6cc4289eeda2d106a70148b74b5ae91ee670e9c35d | 2024-02-16 | ### Installed apt packages | Name | Version | From 936416229adc30790140a23882276e6f002d9a2e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 13 Mar 2024 21:50:44 +0000 Subject: [PATCH 2715/3485] Updating readme file for win19 version 20240310.1.1 (#9485) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/windows/Windows2019-Readme.md | 46 ++++++++++++++-------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/images/windows/Windows2019-Readme.md b/images/windows/Windows2019-Readme.md index 2f1d9bb6acad..555298642d88 100644 --- a/images/windows/Windows2019-Readme.md +++ b/images/windows/Windows2019-Readme.md @@ -6,7 +6,7 @@ *** # Windows Server 2019 - OS Version: 10.0.17763 Build 5458 -- Image Version: 20240304.2.0 +- Image Version: 20240310.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -15,9 +15,9 @@ ### Language and Runtime - Bash 5.2.26(1)-release -- Go 1.21.7 -- Julia 1.10.0 -- Kotlin 1.9.22 +- Go 1.21.8 +- Julia 1.10.2 +- Kotlin 1.9.23 - LLVM 16.0.6 - Node 18.18.2 - Perl 5.32.1 @@ -35,8 +35,8 @@ - pip 24.0 (python 3.7) - Pipx 1.2.1 - RubyGems 3.2.33 -- Vcpkg (build from commit 215a25355) -- Yarn 1.22.21 +- Vcpkg (build from commit 0719a7138) +- Yarn 1.22.22 #### Environment variables | Name | Value | @@ -67,7 +67,7 @@ - ghc 9.8.2 - Git 2.44.0.windows.1 - Git LFS 3.4.1 -- Google Cloud CLI 466.0.0 +- Google Cloud CLI 467.0.0 - ImageMagick 7.1.1-29 - InnoSetup 6.2.2 - jq 1.7.1 @@ -82,10 +82,10 @@ - OpenSSL 1.1.1w - Packer 1.10.0 - Parcel 2.12.0 -- Pulumi 3.108.1 +- Pulumi 3.109.0 - R 4.3.2 - Service Fabric SDK 9.1.1436.9590 -- Stack 2.15.1 +- Stack 2.15.3 - Subversion (SVN) 1.14.2 - Swig 4.1.1 - VSWhere 3.1.7 @@ -95,11 +95,11 @@ - zstd 1.5.5 ### CLI Tools -- Alibaba Cloud CLI 3.0.198 -- AWS CLI 2.15.25 -- AWS SAM CLI 1.110.0 +- Alibaba Cloud CLI 3.0.199 +- AWS CLI 2.15.27 +- AWS SAM CLI 1.111.0 - AWS Session Manager CLI 1.2.553.0 -- Azure CLI 2.57.0 +- Azure CLI 2.58.0 - Azure DevOps CLI extension 1.0.0 - Cloud Foundry CLI 6.53.0 - GitHub CLI 2.45.0 @@ -119,11 +119,11 @@ - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 122.0.6261.95 -- Chrome Driver 122.0.6261.94 -- Microsoft Edge 122.0.2365.66 -- Microsoft Edge Driver 122.0.2365.66 -- Mozilla Firefox 123.0 +- Google Chrome 122.0.6261.112 +- Chrome Driver 122.0.6261.111 +- Microsoft Edge 122.0.2365.80 +- Microsoft Edge Driver 122.0.2365.80 +- Mozilla Firefox 123.0.1 - Gecko Driver 0.34.0 - IE Driver 4.14.0.0 - Selenium server 4.18.0 @@ -168,8 +168,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Go - 1.20.14 -- 1.21.7 -- 1.22.0 +- 1.21.8 +- 1.22.1 #### Node.js - 16.20.2 @@ -213,7 +213,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### MongoDB | Version | ServiceName | ServiceStatus | ServiceStartType | | -------- | ----------- | ------------- | ---------------- | -| 5.0.24.0 | MongoDB | Stopped | Disabled | +| 5.0.25.0 | MongoDB | Stopped | Disabled | ### Database tools - Azure CosmosDb Emulator 2.14.16.0 @@ -511,13 +511,13 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Az (Cached): 1.0.0.zip, 1.6.0.zip, 2.3.2.zip, 2.6.0.zip, 3.1.0.zip, 3.5.0.zip, 3.8.0.zip, 4.3.0.zip, 4.4.0.zip, 4.7.0.zip, 5.5.0.zip, 5.9.0.zip, 6.6.0.zip, 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.528 +- AWSPowershell: 4.1.533 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 - Microsoft.Graph: 2.15.0 - Pester: 3.4.0, 5.5.0 - PowerShellGet: 1.0.0.1, 2.2.5 -- PSScriptAnalyzer: 1.21.0 +- PSScriptAnalyzer: 1.22.0 - PSWindowsUpdate: 2.2.1.4 - SqlServer: 22.2.0 - VSSetup: 2.2.16 From d67fa31aeeec3cf0d666d0eb2976b683471c6b90 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 14 Mar 2024 07:31:33 +0000 Subject: [PATCH 2716/3485] Updating readme file for ubuntu22 version 20240310.1.1 (#9482) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2204-Readme.md | 62 +++++++++++++++--------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/images/ubuntu/Ubuntu2204-Readme.md b/images/ubuntu/Ubuntu2204-Readme.md index 10c3749c5460..761f9bddf83d 100644 --- a/images/ubuntu/Ubuntu2204-Readme.md +++ b/images/ubuntu/Ubuntu2204-Readme.md @@ -6,8 +6,8 @@ *** # Ubuntu 22.04 - OS Version: 22.04.4 LTS -- Kernel Version: 6.5.0-1015-azure -- Image Version: 20240304.1.0 +- Kernel Version: 6.5.0-1016-azure +- Image Version: 20240310.1.0 - Systemd version: 249.11-0ubuntu3.12 ## Installed Software @@ -21,14 +21,14 @@ - GNU C++: 9.5.0, 10.5.0, 11.4.0, 12.3.0, 13.1.0 - GNU Fortran: 9.5.0, 10.5.0, 11.4.0, 12.3.0, 13.1.0 - Julia 1.10.2 -- Kotlin 1.9.22-release-704 +- Kotlin 1.9.23-release-779 - Mono 6.12.0.200 - MSBuild 16.10.1.31701 (Mono 6.12.0.200) - Node.js 18.19.1 - Perl 5.34.0 - Python 3.10.12 - Ruby 3.0.2p107 -- Swift 5.9.2 +- Swift 5.10 ### Package Management - cpan 1.64 @@ -41,8 +41,8 @@ - Pip3 22.0.2 - Pipx 1.4.3 - RubyGems 3.3.5 -- Vcpkg (build from commit 215a25355) -- Yarn 1.22.21 +- Vcpkg (build from commit 0719a7138) +- Yarn 1.22.22 #### Environment variables | Name | Value | @@ -75,12 +75,12 @@ to accomplish this. - Docker Amazon ECR Credential Helper 0.7.1 - Docker Compose v1 1.29.2 - Docker Compose v2 2.23.3 -- Docker-Buildx 0.12.1 +- Docker-Buildx 0.13.0 - Docker Client 24.0.9 - Docker Server 24.0.9 - Fastlane 2.219.0 - Git 2.43.2 -- Git LFS 3.4.1 +- Git LFS 3.5.1 - Git-ftp 1.6.0 - Haveged 1.9.14 - Heroku 8.10.0 @@ -96,10 +96,10 @@ to accomplish this. - Newman 6.1.1 - nvm 0.39.7 - OpenSSL 3.0.2-0ubuntu1.15 -- Packer 1.10.1 +- Packer 1.10.2 - Parcel 2.12.0 - Podman 3.4.4 -- Pulumi 3.108.1 +- Pulumi 3.109.0 - R 4.3.3 - Skopeo 1.4.1 - Sphinx Open Source Search Server 2.2.11 @@ -110,18 +110,18 @@ to accomplish this. - zstd 1.5.5 ### CLI Tools -- Alibaba Cloud CLI 3.0.198 -- AWS CLI 2.15.25 +- Alibaba Cloud CLI 3.0.199 +- AWS CLI 2.15.27 - AWS CLI Session Manager Plugin 1.2.553.0 -- AWS SAM CLI 1.110.0 -- Azure CLI 2.57.0 +- AWS SAM CLI 1.111.0 +- Azure CLI 2.58.0 - Azure CLI (azure-devops) 1.0.0 - GitHub CLI 2.45.0 -- Google Cloud CLI 466.0.0 -- Netlify CLI 17.17.2 +- Google Cloud CLI 467.0.0 +- Netlify CLI 17.19.0 - OpenShift CLI 4.15.0 - ORAS CLI 1.1.0 -- Vercel CLI 33.5.3 +- Vercel CLI 33.5.5 ### Java | Version | Environment Variable | @@ -134,7 +134,7 @@ to accomplish this. ### PHP Tools - PHP: 8.1.2 - Composer 2.7.1 -- PHPUnit 8.5.36 +- PHPUnit 8.5.37 ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ``` @@ -143,7 +143,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Cabal 3.10.2.1 - GHC 9.8.2 - GHCup 0.1.20.0 -- Stack 2.15.1 +- Stack 2.15.3 ### Rust Tools - Cargo 1.76.0 @@ -160,11 +160,11 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 122.0.6261.94 -- ChromeDriver 122.0.6261.94 +- Google Chrome 122.0.6261.111 +- ChromeDriver 122.0.6261.111 - Chromium 122.0.6261.0 -- Microsoft Edge 122.0.2365.63 -- Microsoft Edge WebDriver 122.0.2365.63 +- Microsoft Edge 122.0.2365.80 +- Microsoft Edge WebDriver 122.0.2365.80 - Selenium server 4.18.1 - Mozilla Firefox 123.0.1 - Geckodriver 0.34.0 @@ -209,8 +209,8 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Go - 1.20.14 -- 1.21.7 -- 1.22.0 +- 1.21.8 +- 1.22.1 #### Node.js - 16.20.2 @@ -242,7 +242,7 @@ Use the following command as a part of your job to start the service: 'sudo syst - MarkdownPS: 1.9 - Microsoft.Graph: 2.15.0 - Pester: 5.5.0 -- PSScriptAnalyzer: 1.21.0 +- PSScriptAnalyzer: 1.22.0 ### Web Servers | Name | Version | ConfigFile | ServiceStatus | ListenPort | @@ -280,15 +280,15 @@ Use the following command as a part of your job to start the service: 'sudo syst | alpine:3.18 | sha256:11e21d7b981a59554b3f822c49f6e9f57b6068bb74f49c4cd5cc4c663c7e5160 | 2024-01-27 | | debian:10 | sha256:a52d4e1c201d9ab2f3b939b91a3fdd345d3d11404755bc1cdb22c1d5be131c5d | 2024-02-13 | | debian:11 | sha256:171478fbe347a3cfe45058dae333b6ed848fd8ce89f3104c89fa94c245086db1 | 2024-02-13 | -| moby/buildkit:latest | sha256:449188623c7a8a3bd4f161c5d0ddf5cabbfb828f7eaadf9ed8111864b911a308 | 2024-01-31 | +| moby/buildkit:latest | sha256:24fddad8ce5063e822f32df151b5d7c0b060a850e680bed615ccf9162eabf6e3 | 2024-03-05 | | node:16 | sha256:f77a1aef2da8d83e45ec990f45df50f1a286c5fe8bbfb8c6e4246c6389705c0b | 2023-09-07 | | node:16-alpine | sha256:a1f9d027912b58a7c75be7716c97cfbc6d3099f3a97ed84aa490be9dee20e787 | 2023-08-10 | | node:18 | sha256:aa329c613f0067755c0787d2a3a9802c7d95eecdb927d62b910ec1d28689882f | 2024-02-15 | | node:18-alpine | sha256:ca9f6cb0466f9638e59e0c249d335a07c867cd50c429b5c7830dda1bed584649 | 2024-02-15 | | node:20 | sha256:f3299f16246c71ab8b304d6745bb4059fa9283e8d025972e28436a9f9b36ed24 | 2024-02-15 | | node:20-alpine | sha256:c0a3badbd8a0a760de903e00cedbca94588e609299820557e72cba2a53dbaa2c | 2024-02-15 | -| ubuntu:20.04 | sha256:bb1c41682308d7040f74d103022816d41c50d7b0c89e9d706a74b4e548636e54 | 2024-01-23 | -| ubuntu:22.04 | sha256:f9d633ff6640178c2d0525017174a688e2c1aef28f0a0130b26bd5554491f0da | 2024-02-13 | +| ubuntu:20.04 | sha256:80ef4a44043dec4490506e6cc4289eeda2d106a70148b74b5ae91ee670e9c35d | 2024-02-16 | +| ubuntu:22.04 | sha256:77906da86b60585ce12215807090eb327e7386c8fafb5402369e421f44eff17e | 2024-02-27 | ### Installed apt packages | Name | Version | @@ -305,8 +305,8 @@ Use the following command as a part of your job to start the service: 'sudo syst | curl | 7.81.0-1ubuntu1.15 | | dbus | 1.12.20-2ubuntu4.1 | | dnsutils | 1:9.18.18-0ubuntu0.22.04.2 | -| dpkg | 1.21.1ubuntu2.2 | -| dpkg-dev | 1.21.1ubuntu2.2 | +| dpkg | 1.21.1ubuntu2.3 | +| dpkg-dev | 1.21.1ubuntu2.3 | | fakeroot | 1.28-1ubuntu1 | | file | 1:5.41-3ubuntu0.1 | | findutils | 4.8.0-1ubuntu3 | From d6d95ff7288afcb8160039f840f8a93bb9d7fa7f Mon Sep 17 00:00:00 2001 From: Leon Zandman <leon@wirwar.com> Date: Thu, 14 Mar 2024 10:53:11 +0100 Subject: [PATCH 2717/3485] Fixed typos (#9509) * Fixed some typos. * Some more typos. --------- Co-authored-by: Leon Zandman <lzandman@rdw.nl> --- .../software-report-base/SoftwareReport.BaseNodes.psm1 | 10 +++++----- images.CI/macos/anka/Anka.Helpers.psm1 | 2 +- images.CI/macos/anka/CreateCleanAnkaTemplate.ps1 | 2 +- images.CI/macos/anka/Service.Helpers.psm1 | 4 ++-- images/macos/scripts/build/install-android-sdk.sh | 8 ++++---- images/macos/scripts/build/install-openssl.sh | 2 +- images/macos/scripts/build/install-xcode-clt.sh | 2 +- images/ubuntu/scripts/build/configure-dpkg.sh | 2 +- images/ubuntu/scripts/build/configure-environment.sh | 2 +- images/ubuntu/scripts/build/configure-system.sh | 2 +- images/ubuntu/scripts/build/install-android-sdk.sh | 8 ++++---- images/ubuntu/scripts/build/install-dotnetcore-sdk.sh | 2 +- images/ubuntu/scripts/build/install-firefox.sh | 4 ++-- images/ubuntu/scripts/build/install-haskell.sh | 2 +- images/ubuntu/scripts/build/install-homebrew.sh | 2 +- images/ubuntu/scripts/build/install-java-tools.sh | 2 +- images/ubuntu/scripts/build/install-rust.sh | 2 +- images/ubuntu/scripts/build/install-selenium.sh | 2 +- images/ubuntu/scripts/build/install-swift.sh | 6 +++--- images/windows/scripts/build/Install-Selenium.ps1 | 2 +- 20 files changed, 34 insertions(+), 34 deletions(-) diff --git a/helpers/software-report-base/SoftwareReport.BaseNodes.psm1 b/helpers/software-report-base/SoftwareReport.BaseNodes.psm1 index 8bfb01c988dc..5aabf3b41e91 100644 --- a/helpers/software-report-base/SoftwareReport.BaseNodes.psm1 +++ b/helpers/software-report-base/SoftwareReport.BaseNodes.psm1 @@ -13,15 +13,15 @@ class BaseNode { } [String] ToMarkdown([Int32] $Level) { - throw "Abtract method 'ToMarkdown(level)' is not implemented for '$($this.GetType().Name)'" + throw "Abstract method 'ToMarkdown(level)' is not implemented for '$($this.GetType().Name)'" } [Boolean] IsSimilarTo([BaseNode] $OtherNode) { - throw "Abtract method 'IsSimilarTo' is not implemented for '$($this.GetType().Name)'" + throw "Abstract method 'IsSimilarTo' is not implemented for '$($this.GetType().Name)'" } [Boolean] IsIdenticalTo([BaseNode] $OtherNode) { - throw "Abtract method 'IsIdenticalTo' is not implemented for '$($this.GetType().Name)'" + throw "Abstract method 'IsIdenticalTo' is not implemented for '$($this.GetType().Name)'" } } @@ -39,7 +39,7 @@ class BaseToolNode: BaseNode { } [String] GetValue() { - throw "Abtract method 'GetValue' is not implemented for '$($this.GetType().Name)'" + throw "Abstract method 'GetValue' is not implemented for '$($this.GetType().Name)'" } [Boolean] IsSimilarTo([BaseNode] $OtherNode) { @@ -53,4 +53,4 @@ class BaseToolNode: BaseNode { [Boolean] IsIdenticalTo([BaseNode] $OtherNode) { return $this.IsSimilarTo($OtherNode) -and ($this.GetValue() -eq $OtherNode.GetValue()) } -} \ No newline at end of file +} diff --git a/images.CI/macos/anka/Anka.Helpers.psm1 b/images.CI/macos/anka/Anka.Helpers.psm1 index 69801c135ec2..97dabeebcf5d 100644 --- a/images.CI/macos/anka/Anka.Helpers.psm1 +++ b/images.CI/macos/anka/Anka.Helpers.psm1 @@ -13,7 +13,7 @@ function Push-AnkaTemplateToRegistry { [string] $TemplateName ) - # if registry uuid doesn't match than delete an image in registry + # if registry uuid doesn't match then delete an image in registry $AnkaCaCrtPath="$HOME/.config/anka/certs/anka-ca-crt.pem" $images = anka --machine-readable registry --cacert $AnkaCaCrtPath --registry-path $RegistryUrl list | ConvertFrom-Json | ForEach-Object body $images | Where-Object name -eq $TemplateName | ForEach-Object { diff --git a/images.CI/macos/anka/CreateCleanAnkaTemplate.ps1 b/images.CI/macos/anka/CreateCleanAnkaTemplate.ps1 index 4221d743b3a2..bcf0246f49be 100644 --- a/images.CI/macos/anka/CreateCleanAnkaTemplate.ps1 +++ b/images.CI/macos/anka/CreateCleanAnkaTemplate.ps1 @@ -76,7 +76,7 @@ function Invoke-SoftwareUpdate { $ipAddress = Get-AnkaVMIPAddress -VMName $TemplateName # Unenroll Seed - Write-Host "`t[*] Reseting the seed before requesting stable versions" + Write-Host "`t[*] Resetting the seed before requesting stable versions" Remove-CurrentBetaSeed -HostName $ipAddress | Show-StringWithFormat # Install Software Updates diff --git a/images.CI/macos/anka/Service.Helpers.psm1 b/images.CI/macos/anka/Service.Helpers.psm1 index 882f2f7e91c6..188ea01266c2 100644 --- a/images.CI/macos/anka/Service.Helpers.psm1 +++ b/images.CI/macos/anka/Service.Helpers.psm1 @@ -171,11 +171,11 @@ function Get-MacOSInstaller { Write-Host "`t[*] Beta Version requested. Enrolling machine to DeveloperSeed" sudo $seedutil enroll DeveloperSeed | Out-Null } else { - Write-Host "`t[*] Reseting the seed before requesting stable versions" + Write-Host "`t[*] Resetting the seed before requesting stable versions" sudo $seedutil unenroll | Out-Null } - # Validate there is no softwareupdate at the moment + # Validate there is no software update at the moment Test-SoftwareUpdate # Validate availability OSVersion diff --git a/images/macos/scripts/build/install-android-sdk.sh b/images/macos/scripts/build/install-android-sdk.sh index 204a2db82d97..1cabb1c90576 100644 --- a/images/macos/scripts/build/install-android-sdk.sh +++ b/images/macos/scripts/build/install-android-sdk.sh @@ -6,13 +6,13 @@ source ~/utils/utils.sh -add_filtered_instalaltion_components() { +add_filtered_installation_components() { local minimum_version=$1 shift local tools_array=("$@") for item in ${tools_array[@]}; do - # take the last argument after spliting string by ';'' and '-'' + # take the last argument after splitting string by ';'' and '-'' version=$(echo "${item##*[-;]}") if [[ "$(printf "${minimum_version}\n${version}\n" | sort -V | head -n1)" == "$minimum_version" ]]; then components+=($item) @@ -96,11 +96,11 @@ echo "export ANDROID_NDK_ROOT=$ANDROID_NDK_HOME" >> "${HOME}/.bashrc" echo "export ANDROID_NDK_LATEST_HOME=$ANDROID_NDK_LATEST_HOME" >> "${HOME}/.bashrc" availablePlatforms=($($SDKMANAGER --list | grep "platforms;android-[0-9]" | cut -d"|" -f 1 | sort -u)) -add_filtered_instalaltion_components $android_platform "${availablePlatforms[@]}" +add_filtered_installation_components $android_platform "${availablePlatforms[@]}" allBuildTools=($($SDKMANAGER --list --include_obsolete | grep "build-tools;" | cut -d"|" -f 1 | sort -u)) availableBuildTools=$(echo ${allBuildTools[@]//*rc[0-9]/}) -add_filtered_instalaltion_components $android_build_tool "${availableBuildTools[@]}" +add_filtered_installation_components $android_build_tool "${availableBuildTools[@]}" echo "y" | $SDKMANAGER ${components[@]} diff --git a/images/macos/scripts/build/install-openssl.sh b/images/macos/scripts/build/install-openssl.sh index aa55b74fa920..16f11fe761f6 100644 --- a/images/macos/scripts/build/install-openssl.sh +++ b/images/macos/scripts/build/install-openssl.sh @@ -18,7 +18,7 @@ else fi if ! is_Arm64; then - # Most of buildsystems and scripts look up ssl here + # Most of build systems and scripts look up ssl here ln -sf $(brew --cellar openssl@1.1)/1.1* /usr/local/opt/openssl fi diff --git a/images/macos/scripts/build/install-xcode-clt.sh b/images/macos/scripts/build/install-xcode-clt.sh index 4e6f334576bd..b2b7d9df8acb 100644 --- a/images/macos/scripts/build/install-xcode-clt.sh +++ b/images/macos/scripts/build/install-xcode-clt.sh @@ -43,7 +43,7 @@ while ! is_clt_installed; do echo "Unable to find the Command Line Tools, all the attempts exhausted" exit 1 fi - echo "Command Line Tools not found, trying to install them via softwareupdates, $retries attempts left" + echo "Command Line Tools not found, trying to install them via software updates, $retries attempts left" install_clt ((retries--)) echo "Wait $sleepInterval seconds before the next check for installed Command Line Tools" diff --git a/images/ubuntu/scripts/build/configure-dpkg.sh b/images/ubuntu/scripts/build/configure-dpkg.sh index 28e00c381f58..2c523721187c 100644 --- a/images/ubuntu/scripts/build/configure-dpkg.sh +++ b/images/ubuntu/scripts/build/configure-dpkg.sh @@ -12,7 +12,7 @@ source $HELPER_SCRIPTS/etc-environment.sh # might mail error messages to root, but that's it; otherwise it # is completely silent and unobtrusive, a perfect frontend for # automatic installs. If you are using this front-end, and require -# non-default answers to questions, you will need to preseed the +# non-default answers to questions, you will need to pre-seed the # debconf database set_etc_environment_variable "DEBIAN_FRONTEND" "noninteractive" diff --git a/images/ubuntu/scripts/build/configure-environment.sh b/images/ubuntu/scripts/build/configure-environment.sh index 6db18e0a340c..7ffbe60d8d49 100644 --- a/images/ubuntu/scripts/build/configure-environment.sh +++ b/images/ubuntu/scripts/build/configure-environment.sh @@ -19,7 +19,7 @@ set_etc_environment_variable "ACCEPT_EULA" "Y" mkdir -p /etc/skel/.config/configstore set_etc_environment_variable "XDG_CONFIG_HOME" '$HOME/.config' -# Change waagent entries to use /mnt for swapfile +# Change waagent entries to use /mnt for swap file sed -i 's/ResourceDisk.Format=n/ResourceDisk.Format=y/g' /etc/waagent.conf sed -i 's/ResourceDisk.EnableSwap=n/ResourceDisk.EnableSwap=y/g' /etc/waagent.conf sed -i 's/ResourceDisk.SwapSizeMB=0/ResourceDisk.SwapSizeMB=4096/g' /etc/waagent.conf diff --git a/images/ubuntu/scripts/build/configure-system.sh b/images/ubuntu/scripts/build/configure-system.sh index 5a9e44f049a6..257e5ff42515 100644 --- a/images/ubuntu/scripts/build/configure-system.sh +++ b/images/ubuntu/scripts/build/configure-system.sh @@ -23,7 +23,7 @@ ENVPATH=${ENVPATH%"\""} replace_etc_environment_variable "PATH" "${ENVPATH}" echo "Updated /etc/environment: $(cat /etc/environment)" -# Сlean yarn and npm cache +# Clean yarn and npm cache if yarn --version > /dev/null; then yarn cache clean fi diff --git a/images/ubuntu/scripts/build/install-android-sdk.sh b/images/ubuntu/scripts/build/install-android-sdk.sh index 583928fea922..51c9d814b7d5 100644 --- a/images/ubuntu/scripts/build/install-android-sdk.sh +++ b/images/ubuntu/scripts/build/install-android-sdk.sh @@ -9,13 +9,13 @@ source $HELPER_SCRIPTS/os.sh source $HELPER_SCRIPTS/install.sh source $HELPER_SCRIPTS/etc-environment.sh -add_filtered_instalaltion_components() { +add_filtered_installation_components() { local minimum_version=$1 shift local tools_array=("$@") for item in ${tools_array[@]}; do - # Take the last argument after spliting string by ';'' and '-'' + # Take the last argument after splitting string by ';'' and '-'' item_version=$(echo "${item##*[-;]}") # Semver 'comparison'. Add item to components array, if item's version is greater than or equal to minimum version @@ -107,8 +107,8 @@ available_platforms=($($SDKMANAGER --list | sed -n '/Available Packages:/,/^$/p' all_build_tools=($($SDKMANAGER --list | grep "build-tools;" | cut -d"|" -f 1 | sort -u)) available_build_tools=$(echo ${all_build_tools[@]//*rc[0-9]/}) -add_filtered_instalaltion_components $minimum_platform_version "${available_platforms[@]}" -add_filtered_instalaltion_components $minimum_build_tool_version "${available_build_tools[@]}" +add_filtered_installation_components $minimum_platform_version "${available_platforms[@]}" +add_filtered_installation_components $minimum_build_tool_version "${available_build_tools[@]}" # Install components echo "y" | $SDKMANAGER ${components[@]} diff --git a/images/ubuntu/scripts/build/install-dotnetcore-sdk.sh b/images/ubuntu/scripts/build/install-dotnetcore-sdk.sh index 591a41729abb..1e3cd2d6fbf3 100644 --- a/images/ubuntu/scripts/build/install-dotnetcore-sdk.sh +++ b/images/ubuntu/scripts/build/install-dotnetcore-sdk.sh @@ -45,7 +45,7 @@ EOF apt-get update for latest_package in ${latest_dotnet_packages[@]}; do - echo "Determing if .NET Core ($latest_package) is installed" + echo "Determining if .NET Core ($latest_package) is installed" if ! dpkg -S $latest_package &> /dev/null; then echo "Could not find .NET Core ($latest_package), installing..." apt-get install $latest_package -y diff --git a/images/ubuntu/scripts/build/install-firefox.sh b/images/ubuntu/scripts/build/install-firefox.sh index 837c0f6a3bfc..0b378238af8b 100644 --- a/images/ubuntu/scripts/build/install-firefox.sh +++ b/images/ubuntu/scripts/build/install-firefox.sh @@ -9,7 +9,7 @@ source $HELPER_SCRIPTS/install.sh source $HELPER_SCRIPTS/etc-environment.sh # Mozillateam PPA is added manually because sometimes -# lanuchad portal sends empty answer when trying to add it automatically +# launchpad portal sends empty answer when trying to add it automatically REPO_URL="http://ppa.launchpad.net/mozillateam/ppa/ubuntu" GPG_FINGERPRINT="0ab215679c571d1c8325275b9bdb3d89ce49ec21" @@ -27,7 +27,7 @@ rm $REPO_PATH # Document apt source repo's echo "mozillateam $REPO_URL" >> $HELPER_SCRIPTS/apt-sources.txt -# add to gloabl system preferences for firefox locale en_US, because other browsers have en_US local. +# add to global system preferences for firefox locale en_US, because other browsers have en_US local. # Default firefox local is en_GB echo 'pref("intl.locale.requested","en_US");' >> "/usr/lib/firefox/browser/defaults/preferences/syspref.js" diff --git a/images/ubuntu/scripts/build/install-haskell.sh b/images/ubuntu/scripts/build/install-haskell.sh index b249f0fc3607..b5a6b09c0258 100644 --- a/images/ubuntu/scripts/build/install-haskell.sh +++ b/images/ubuntu/scripts/build/install-haskell.sh @@ -7,7 +7,7 @@ # Source the helpers for use with the script source $HELPER_SCRIPTS/etc-environment.sh -# Any nonzero value for noninteractive installation +# Any nonzero value for non-interactive installation export BOOTSTRAP_HASKELL_NONINTERACTIVE=1 export BOOTSTRAP_HASKELL_INSTALL_NO_STACK_HOOK=1 export GHCUP_INSTALL_BASE_PREFIX=/usr/local diff --git a/images/ubuntu/scripts/build/install-homebrew.sh b/images/ubuntu/scripts/build/install-homebrew.sh index 7fd491609a78..c8f2b6828c8f 100644 --- a/images/ubuntu/scripts/build/install-homebrew.sh +++ b/images/ubuntu/scripts/build/install-homebrew.sh @@ -12,7 +12,7 @@ source $HELPER_SCRIPTS/install.sh # Install the Homebrew on Linux /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)" -# Invoke shellenv to make brew available during runnig session +# Invoke shellenv to make brew available during running session eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)" set_etc_environment_variable HOMEBREW_NO_AUTO_UPDATE 1 diff --git a/images/ubuntu/scripts/build/install-java-tools.sh b/images/ubuntu/scripts/build/install-java-tools.sh index c366d87b0c4e..05ba2e0d795f 100644 --- a/images/ubuntu/scripts/build/install-java-tools.sh +++ b/images/ubuntu/scripts/build/install-java-tools.sh @@ -61,7 +61,7 @@ install_open_jdk() { chmod -R 777 /usr/lib/jvm } -# Add Addoptium PPA +# Add Adoptium PPA # apt-key is deprecated, dearmor and add manually wget -qO - https://packages.adoptium.net/artifactory/api/gpg/key/public | gpg --dearmor > /usr/share/keyrings/adoptium.gpg echo "deb [signed-by=/usr/share/keyrings/adoptium.gpg] https://packages.adoptium.net/artifactory/deb/ $(lsb_release -cs) main" > /etc/apt/sources.list.d/adoptium.list diff --git a/images/ubuntu/scripts/build/install-rust.sh b/images/ubuntu/scripts/build/install-rust.sh index 2f0c8a0c0b10..1b2b9cd48413 100644 --- a/images/ubuntu/scripts/build/install-rust.sh +++ b/images/ubuntu/scripts/build/install-rust.sh @@ -28,7 +28,7 @@ fi # Cleanup Cargo cache rm -rf ${CARGO_HOME}/registry/* -# Update /etc/environemnt +# Update /etc/environment prepend_etc_environment_path '$HOME/.cargo/bin' invoke_tests "Tools" "Rust" diff --git a/images/ubuntu/scripts/build/install-selenium.sh b/images/ubuntu/scripts/build/install-selenium.sh index 270c75f93673..eb6f00856c22 100644 --- a/images/ubuntu/scripts/build/install-selenium.sh +++ b/images/ubuntu/scripts/build/install-selenium.sh @@ -14,7 +14,7 @@ selenium_major_version=$(get_toolset_value '.selenium.version') selenium_download_url=$(resolve_github_release_asset_url "SeleniumHQ/selenium" "contains(\"selenium-server-\") and endswith(\".jar\")" "$selenium_major_version\.+" "" "true") selenium_jar_path=$(download_with_retry "$selenium_download_url" "/usr/share/java/selenium-server.jar") -# Create an epmty file to retrive selenium version +# Create an empty file to retrieve selenium version selenium_full_version=$(echo $selenium_download_url | awk -F"selenium-server-|.jar" '{print $2}') touch "/usr/share/java/selenium-server-$selenium_full_version" diff --git a/images/ubuntu/scripts/build/install-swift.sh b/images/ubuntu/scripts/build/install-swift.sh index 06b4860d58ee..61473e936404 100644 --- a/images/ubuntu/scripts/build/install-swift.sh +++ b/images/ubuntu/scripts/build/install-swift.sh @@ -16,8 +16,8 @@ swift_release_name="swift-${swift_version}-RELEASE-${image_label}" archive_url="https://swift.org/builds/swift-${swift_version}-release/${image_label//./}/swift-${swift_version}-RELEASE/${swift_release_name}.tar.gz" archive_path=$(download_with_retry "$archive_url") -# Verifing pgp signature using official swift pgp key. Referring to https://www.swift.org/install/linux/#Installation-via-Tarball -# Download and import swift pgp key +# Verifying PGP signature using official Swift PGP key. Referring to https://www.swift.org/install/linux/#Installation-via-Tarball +# Download and import Swift PGP key pgp_key_path=$(download_with_retry "https://swift.org/keys/all-keys.asc") gpg --no-default-keyring --keyring swift --import "$pgp_key_path" @@ -25,7 +25,7 @@ gpg --no-default-keyring --keyring swift --import "$pgp_key_path" signature_path=$(download_with_retry "${archive_url}.sig") gpg --no-default-keyring --keyring swift --verify "$signature_path" "$archive_path" -# Remove swift pgp public key with temporary keyring +# Remove Swift PGP public key with temporary keyring rm ~/.gnupg/swift # Extract and install swift diff --git a/images/windows/scripts/build/Install-Selenium.ps1 b/images/windows/scripts/build/Install-Selenium.ps1 index 95aad377d252..726fd4a1f1fc 100644 --- a/images/windows/scripts/build/Install-Selenium.ps1 +++ b/images/windows/scripts/build/Install-Selenium.ps1 @@ -19,7 +19,7 @@ $seleniumDownloadUrl = Resolve-GithubReleaseAssetUrl ` $seleniumBinPath = Join-Path $seleniumDirectory "selenium-server.jar" Invoke-DownloadWithRetry -Url $seleniumDownloadUrl -Path $seleniumBinPath -# Create an empty file to retrive Selenium version +# Create an empty file to retrieve Selenium version $seleniumFullVersion = $seleniumDownloadUrl.Split("-")[1].Split("/")[0] New-Item -Path $seleniumDirectory -Name "selenium-server-$seleniumFullVersion" From 6751b1a8d6c4a3b611ccbab45040fa7ba54f03ec Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Thu, 14 Mar 2024 13:36:14 +0100 Subject: [PATCH 2718/3485] [macOS] add xcode 15.3 to macOS 13, 14 (#9505) --- images/macos/toolsets/toolset-13.json | 2 ++ images/macos/toolsets/toolset-14.json | 2 ++ 2 files changed, 4 insertions(+) diff --git a/images/macos/toolsets/toolset-13.json b/images/macos/toolsets/toolset-13.json index ff00f9ad7894..384a1ac31143 100644 --- a/images/macos/toolsets/toolset-13.json +++ b/images/macos/toolsets/toolset-13.json @@ -3,6 +3,7 @@ "default": "15.0.1", "x64": { "versions": [ + { "link": "15.3", "version": "15.3.0+15E204a", "install_runtimes": "true", "sha256": "f13f6a2e2df432c3008e394640b8549a18c285acd7fd148d6c4bac8c3a5af234"}, { "link": "15.2", "version": "15.2.0+15C500b", "install_runtimes": "true", "sha256": "04E93680C6DDBEC84666531BE412DE778AFC8EAC6AB2037F4C2BE7290818B59B"}, { "link": "15.1", "version": "15.1.0+15C65", "install_runtimes": "true", "sha256": "857D8DB537BAC82BF99DE0E1D3895D214D4D02101C1340CEF3DAF6E821BA1D05"}, { "link": "15.0.1", "version": "15.0.1+15A507", "symlinks": ["15.0"], "install_runtimes": "true", "sha256": "5AC17AE6060CAFC3C7112C6DA0B153450BE21F1DE6632777FBA9FBC9D999C9E8"}, @@ -14,6 +15,7 @@ }, "arm64":{ "versions": [ + { "link": "15.3", "version": "15.3.0+15E204a", "install_runtimes": "true", "sha256": "f13f6a2e2df432c3008e394640b8549a18c285acd7fd148d6c4bac8c3a5af234"}, { "link": "15.2", "version": "15.2.0+15C500b", "install_runtimes": "true", "sha256": "04E93680C6DDBEC84666531BE412DE778AFC8EAC6AB2037F4C2BE7290818B59B"}, { "link": "15.1", "version": "15.1.0+15C65", "install_runtimes": "true", "sha256": "857D8DB537BAC82BF99DE0E1D3895D214D4D02101C1340CEF3DAF6E821BA1D05"}, { "link": "15.0.1", "version": "15.0.1+15A507", "symlinks": ["15.0"], "install_runtimes": "true", "sha256": "5AC17AE6060CAFC3C7112C6DA0B153450BE21F1DE6632777FBA9FBC9D999C9E8"}, diff --git a/images/macos/toolsets/toolset-14.json b/images/macos/toolsets/toolset-14.json index 529baccf4411..0fba2c8ab8f9 100644 --- a/images/macos/toolsets/toolset-14.json +++ b/images/macos/toolsets/toolset-14.json @@ -3,6 +3,7 @@ "default": "15.0.1", "x64": { "versions": [ + { "link": "15.3", "version": "15.3.0+15E204a", "install_runtimes": "true", "sha256": "f13f6a2e2df432c3008e394640b8549a18c285acd7fd148d6c4bac8c3a5af234"}, { "link": "15.2", "version": "15.2.0+15C500b", "install_runtimes": "true", "sha256": "04E93680C6DDBEC84666531BE412DE778AFC8EAC6AB2037F4C2BE7290818B59B"}, { "link": "15.1", "version": "15.1.0+15C65", "install_runtimes": "true", "sha256": "857D8DB537BAC82BF99DE0E1D3895D214D4D02101C1340CEF3DAF6E821BA1D05"}, { "link": "15.0.1", "version": "15.0.1+15A507", "symlinks": ["15.0"], "install_runtimes": "true", "sha256": "5AC17AE6060CAFC3C7112C6DA0B153450BE21F1DE6632777FBA9FBC9D999C9E8"}, @@ -11,6 +12,7 @@ }, "arm64":{ "versions": [ + { "link": "15.3", "version": "15.3.0+15E204a", "install_runtimes": "true", "sha256": "f13f6a2e2df432c3008e394640b8549a18c285acd7fd148d6c4bac8c3a5af234"}, { "link": "15.2", "version": "15.2.0+15C500b", "install_runtimes": "true", "sha256": "04E93680C6DDBEC84666531BE412DE778AFC8EAC6AB2037F4C2BE7290818B59B"}, { "link": "15.1", "version": "15.1.0+15C65", "install_runtimes": "true", "sha256": "857D8DB537BAC82BF99DE0E1D3895D214D4D02101C1340CEF3DAF6E821BA1D05"}, { "link": "15.0.1", "version": "15.0.1+15A507", "symlinks": ["15.0"], "install_runtimes": "true", "sha256": "5AC17AE6060CAFC3C7112C6DA0B153450BE21F1DE6632777FBA9FBC9D999C9E8"}, From 8f3745bf87a8dd93ffd0422e0ac84f2dbc0b92e7 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Thu, 14 Mar 2024 15:39:16 +0100 Subject: [PATCH 2719/3485] [macOS] Delete more software from Big Sur (#9488) --- .../macos/scripts/build/install-aws-tools.sh | 8 +++++--- .../scripts/build/install-common-utils.sh | 6 ++++-- images/macos/scripts/build/install-git.sh | 15 +++++++++------ .../docs-gen/Generate-SoftwareReport.ps1 | 18 +++++++++++++----- .../macos/scripts/tests/BasicTools.Tests.ps1 | 6 +++--- images/macos/scripts/tests/Common.Tests.ps1 | 2 +- images/macos/scripts/tests/Git.Tests.ps1 | 4 +++- images/macos/scripts/tests/Rust.Tests.ps1 | 2 +- images/macos/templates/macOS-11.pkr.hcl | 1 - images/macos/toolsets/toolset-11.json | 4 +--- 10 files changed, 40 insertions(+), 26 deletions(-) diff --git a/images/macos/scripts/build/install-aws-tools.sh b/images/macos/scripts/build/install-aws-tools.sh index db4565b73969..168483862136 100644 --- a/images/macos/scripts/build/install-aws-tools.sh +++ b/images/macos/scripts/build/install-aws-tools.sh @@ -10,9 +10,11 @@ echo "Installing aws..." awscliv2_pkg_path=$(download_with_retry "https://awscli.amazonaws.com/AWSCLIV2.pkg") sudo installer -pkg "$awscliv2_pkg_path" -target / -echo "Installing aws sam cli..." -brew tap aws/tap -brew_smart_install aws-sam-cli +if ! is_BigSur; then + echo "Installing aws sam cli..." + brew tap aws/tap + brew_smart_install aws-sam-cli +fi echo "Install aws cli session manager" brew install --cask session-manager-plugin diff --git a/images/macos/scripts/build/install-common-utils.sh b/images/macos/scripts/build/install-common-utils.sh index d9351a668853..53a0af5804e6 100644 --- a/images/macos/scripts/build/install-common-utils.sh +++ b/images/macos/scripts/build/install-common-utils.sh @@ -95,8 +95,10 @@ if is_Monterey; then echo "export PARALLELS_DMG_URL=$url" >> ${HOME}/.bashrc fi -# Install Azure DevOps extension for Azure Command Line Interface -az extension add -n azure-devops +if ! is_BigSur; then + # Install Azure DevOps extension for Azure Command Line Interface + az extension add -n azure-devops +fi # Invoke tests for all basic tools invoke_tests "BasicTools" diff --git a/images/macos/scripts/build/install-git.sh b/images/macos/scripts/build/install-git.sh index adc3ecccfc40..5a77ba3a49e3 100644 --- a/images/macos/scripts/build/install-git.sh +++ b/images/macos/scripts/build/install-git.sh @@ -11,13 +11,16 @@ brew_smart_install "git" git config --global --add safe.directory "*" -echo "Installing Git LFS" -brew_smart_install "git-lfs" -# Update global git config -git lfs install -# Update system git config -sudo git lfs install --system +if ! is_BigSur; then + echo "Installing Git LFS" + brew_smart_install "git-lfs" + + # Update global git config + git lfs install + # Update system git config + sudo git lfs install --system +fi echo "Disable all the Git help messages..." git config --global advice.pushUpdateRejected false diff --git a/images/macos/scripts/docs-gen/Generate-SoftwareReport.ps1 b/images/macos/scripts/docs-gen/Generate-SoftwareReport.ps1 index c73361aa64d9..c982e8efbb35 100644 --- a/images/macos/scripts/docs-gen/Generate-SoftwareReport.ps1 +++ b/images/macos/scripts/docs-gen/Generate-SoftwareReport.ps1 @@ -64,7 +64,7 @@ if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) { if ((-not $os.IsVenturaArm64) -and (-not $os.IsSonomaArm64)) { $languageAndRuntime.AddToolVersion("Python3", $(Get-Python3Version)) } -if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) { +if ((-not $os.IsVentura) -and (-not $os.IsSonoma) -and (-not $os.IsBigSur)) { $languageAndRuntime.AddToolVersion("R", $(Get-RVersion)) } $languageAndRuntime.AddToolVersion("Ruby", $(Get-RubyVersion)) @@ -120,7 +120,9 @@ $utilities.AddToolVersion("bazelisk", $(Get-BazeliskVersion)) $utilities.AddToolVersion("bsdtar", $(Get-BsdtarVersion)) $utilities.AddToolVersion("Curl", $(Get-CurlVersion)) $utilities.AddToolVersion("Git", $(Get-GitVersion)) -$utilities.AddToolVersion("Git LFS", $(Get-GitLFSVersion)) +if (-not $os.IsBigSur) { + $utilities.AddToolVersion("Git LFS", $(Get-GitLFSVersion)) +} $utilities.AddToolVersion("GitHub CLI", $(Get-GitHubCLIVersion)) $utilities.AddToolVersion("GNU Tar", $(Get-GnuTarVersion)) $utilities.AddToolVersion("GNU Wget", $(Get-WgetVersion)) @@ -165,10 +167,14 @@ if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) { $tools.AddToolVersion("App Center CLI", $(Get-AppCenterCLIVersion)) } $tools.AddToolVersion("AWS CLI", $(Get-AWSCLIVersion)) -$tools.AddToolVersion("AWS SAM CLI", $(Get-AWSSAMCLIVersion)) +if (-not $os.IsBigSur) { + $tools.AddToolVersion("AWS SAM CLI", $(Get-AWSSAMCLIVersion)) +} $tools.AddToolVersion("AWS Session Manager CLI", $(Get-AWSSessionManagerCLIVersion)) -$tools.AddToolVersion("Azure CLI", $(Get-AzureCLIVersion)) -$tools.AddToolVersion("Azure CLI (azure-devops)", $(Get-AzureDevopsVersion)) +if (-not $os.IsBigSur) { + $tools.AddToolVersion("Azure CLI", $(Get-AzureCLIVersion)) + $tools.AddToolVersion("Azure CLI (azure-devops)", $(Get-AzureDevopsVersion)) +} $tools.AddToolVersion("Bicep CLI", $(Get-BicepVersion)) if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) { $tools.AddToolVersion("Cabal", $(Get-CabalVersion)) @@ -221,6 +227,7 @@ $toolcache = $installedSoftware.AddHeader("Cached Tools") $toolcache.AddNodes($(Build-ToolcacheSection)) # Rust +if (-not $os.IsBigSur) { $rust = $installedSoftware.AddHeader("Rust Tools") $rust.AddToolVersion("Cargo", $(Get-RustCargoVersion)) $rust.AddToolVersion("Rust", $(Get-RustVersion)) @@ -236,6 +243,7 @@ if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) { } $rustPackages.AddToolVersion("Clippy", $(Get-RustClippyVersion)) $rustPackages.AddToolVersion("Rustfmt", $(Get-RustfmtVersion)) +} # PowerShell $powerShell = $installedSoftware.AddHeader("PowerShell Tools") diff --git a/images/macos/scripts/tests/BasicTools.Tests.ps1 b/images/macos/scripts/tests/BasicTools.Tests.ps1 index 213e6fb93c52..7daa7f6b66eb 100644 --- a/images/macos/scripts/tests/BasicTools.Tests.ps1 +++ b/images/macos/scripts/tests/BasicTools.Tests.ps1 @@ -2,13 +2,13 @@ Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" $os = Get-OSVersion -Describe "Azure CLI" { +Describe "Azure CLI" -Skip:($os.IsBigSur) { It "Azure CLI" { "az -v" | Should -ReturnZeroExitCode } } -Describe "Azure DevOps CLI" { +Describe "Azure DevOps CLI" -Skip:($os.IsBigSur) { It "az devops" { "az devops -h" | Should -ReturnZeroExitCode } @@ -159,7 +159,7 @@ Describe "virtualbox" -Skip:($os.IsBigSur -or $os.IsVentura -or $os.IsSonoma) { } } -Describe "R" -Skip:($os.IsVentura -or $os.IsSonoma) { +Describe "R" -Skip:($os.IsVentura -or $os.IsSonoma -or $os.IsBigSur) { It "R" { "R --version" | Should -ReturnZeroExitCode } diff --git a/images/macos/scripts/tests/Common.Tests.ps1 b/images/macos/scripts/tests/Common.Tests.ps1 index 8a07c618046e..6ce3c53499bf 100644 --- a/images/macos/scripts/tests/Common.Tests.ps1 +++ b/images/macos/scripts/tests/Common.Tests.ps1 @@ -43,7 +43,7 @@ Describe "AWS" { It "AWS CLI" { "aws --version" | Should -ReturnZeroExitCode } - It "AWS SAM CLI" { + It "AWS SAM CLI" -Skip:($os.IsBigSur) { "sam --version" | Should -ReturnZeroExitCode } diff --git a/images/macos/scripts/tests/Git.Tests.ps1 b/images/macos/scripts/tests/Git.Tests.ps1 index e88bf6bb53ea..f216baa0bcd1 100644 --- a/images/macos/scripts/tests/Git.Tests.ps1 +++ b/images/macos/scripts/tests/Git.Tests.ps1 @@ -1,10 +1,12 @@ Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" +$os = Get-OSVersion + Describe "Git" { It "git is installed" { "git --version" | Should -ReturnZeroExitCode } - It "git lfs is installed" { + It "git lfs is installed" -Skip:($os.IsBigSur) { "git lfs version" | Should -ReturnZeroExitCode } } diff --git a/images/macos/scripts/tests/Rust.Tests.ps1 b/images/macos/scripts/tests/Rust.Tests.ps1 index b5c1c53fc507..fda5475fb44a 100644 --- a/images/macos/scripts/tests/Rust.Tests.ps1 +++ b/images/macos/scripts/tests/Rust.Tests.ps1 @@ -2,7 +2,7 @@ Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" $os = Get-OSVersion -Describe "Rust" { +Describe "Rust" -Skip:($os.IsBigSur) { Context "Rust" { It "Rustup is installed" { "rustup --version" | Should -ReturnZeroExitCode diff --git a/images/macos/templates/macOS-11.pkr.hcl b/images/macos/templates/macOS-11.pkr.hcl index b136ccb4b2ca..c9dc4256a7ae 100644 --- a/images/macos/templates/macOS-11.pkr.hcl +++ b/images/macos/templates/macOS-11.pkr.hcl @@ -245,7 +245,6 @@ build { "${path.root}/../scripts/build/install-swiftlint.sh", "${path.root}/../scripts/build/install-openjdk.sh", "${path.root}/../scripts/build/install-aws-tools.sh", - "${path.root}/../scripts/build/install-rust.sh", "${path.root}/../scripts/build/install-gcc.sh", "${path.root}/../scripts/build/install-haskell.sh", "${path.root}/../scripts/build/install-cocoapods.sh", diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index 25f4f4059662..cf26c25ea907 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -195,7 +195,6 @@ "aliyun-cli", "ant", "aria2", - "azure-cli", "bazelisk", "carthage", "cmake", @@ -218,8 +217,7 @@ "zlib", "libxext", "libxft", - "tcl-tk", - "r" + "tcl-tk" ], "cask_packages": [ "julia" From ee03fb0bdf031b28dd93a9d041ccafc17f5912e2 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 14 Mar 2024 20:07:32 +0000 Subject: [PATCH 2720/3485] Updating readme file for win22 version 20240310.1.1 (#9481) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/windows/Windows2022-Readme.md | 44 ++++++++++++++-------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/images/windows/Windows2022-Readme.md b/images/windows/Windows2022-Readme.md index fb85eeebc8e2..3ddb68e1df07 100644 --- a/images/windows/Windows2022-Readme.md +++ b/images/windows/Windows2022-Readme.md @@ -6,7 +6,7 @@ *** # Windows Server 2022 - OS Version: 10.0.20348 Build 2322 -- Image Version: 20240304.2.0 +- Image Version: 20240310.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -15,9 +15,9 @@ ### Language and Runtime - Bash 5.2.26(1)-release -- Go 1.21.7 -- Julia 1.10.0 -- Kotlin 1.9.22 +- Go 1.21.8 +- Julia 1.10.2 +- Kotlin 1.9.23 - LLVM 16.0.6 - Node 18.18.2 - Perl 5.32.1 @@ -35,8 +35,8 @@ - pip 24.0 (python 3.9) - Pipx 1.4.3 - RubyGems 3.2.33 -- Vcpkg (build from commit 215a25355) -- Yarn 1.22.21 +- Vcpkg (build from commit 0719a7138) +- Yarn 1.22.22 #### Environment variables | Name | Value | @@ -80,10 +80,10 @@ - NSIS 3.09 - OpenSSL 1.1.1w - Packer 1.10.0 -- Pulumi 3.108.1 +- Pulumi 3.109.0 - R 4.3.2 - Service Fabric SDK 9.1.1436.9590 -- Stack 2.15.1 +- Stack 2.15.3 - Subversion (SVN) 1.14.2 - Swig 4.1.1 - VSWhere 3.1.7 @@ -93,11 +93,11 @@ - zstd 1.5.5 ### CLI Tools -- Alibaba Cloud CLI 3.0.198 -- AWS CLI 2.15.25 -- AWS SAM CLI 1.110.0 +- Alibaba Cloud CLI 3.0.199 +- AWS CLI 2.15.27 +- AWS SAM CLI 1.111.0 - AWS Session Manager CLI 1.2.553.0 -- Azure CLI 2.57.0 +- Azure CLI 2.58.0 - Azure DevOps CLI extension 1.0.0 - GitHub CLI 2.45.0 @@ -116,11 +116,11 @@ - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 122.0.6261.95 -- Chrome Driver 122.0.6261.94 -- Microsoft Edge 122.0.2365.66 -- Microsoft Edge Driver 122.0.2365.66 -- Mozilla Firefox 123.0 +- Google Chrome 122.0.6261.112 +- Chrome Driver 122.0.6261.111 +- Microsoft Edge 122.0.2365.80 +- Microsoft Edge Driver 122.0.2365.80 +- Mozilla Firefox 123.0.1 - Gecko Driver 0.34.0 - IE Driver 4.14.0.0 - Selenium server 4.18.0 @@ -162,8 +162,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Go - 1.20.14 -- 1.21.7 -- 1.22.0 +- 1.21.8 +- 1.22.1 #### Node.js - 16.20.2 @@ -206,7 +206,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### MongoDB | Version | ServiceName | ServiceStatus | ServiceStartType | | -------- | ----------- | ------------- | ---------------- | -| 5.0.24.0 | MongoDB | Stopped | Disabled | +| 5.0.25.0 | MongoDB | Stopped | Disabled | ### Database tools - Azure CosmosDb Emulator 2.14.16.0 @@ -567,13 +567,13 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Az (Cached): 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.528 +- AWSPowershell: 4.1.533 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 - Microsoft.Graph: 2.15.0 - Pester: 3.4.0, 5.5.0 - PowerShellGet: 1.0.0.1, 2.2.5 -- PSScriptAnalyzer: 1.21.0 +- PSScriptAnalyzer: 1.22.0 - PSWindowsUpdate: 2.2.1.4 - SqlServer: 22.2.0 - VSSetup: 2.2.16 From 9485052d98ba055be3355565e23630de8f8c4ef8 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Fri, 15 Mar 2024 11:06:43 +0100 Subject: [PATCH 2721/3485] [Ubuntu] Decrease vm.mmap_rnd_bit to prevent ASLR ASAN issues (#9513) --- images/ubuntu/scripts/build/configure-environment.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/images/ubuntu/scripts/build/configure-environment.sh b/images/ubuntu/scripts/build/configure-environment.sh index 7ffbe60d8d49..5e3781578523 100644 --- a/images/ubuntu/scripts/build/configure-environment.sh +++ b/images/ubuntu/scripts/build/configure-environment.sh @@ -41,6 +41,9 @@ echo 'vm.max_map_count=262144' | tee -a /etc/sysctl.conf echo 'fs.inotify.max_user_watches=655360' | tee -a /etc/sysctl.conf echo 'fs.inotify.max_user_instances=1280' | tee -a /etc/sysctl.conf +# https://github.com/actions/runner-images/issues/9491 +echo 'vm.mmap_rnd_bits=28' | tee -a /etc/sysctl.conf + # https://github.com/actions/runner-images/pull/7860 netfilter_rule='/etc/udev/rules.d/50-netfilter.rules' rules_directory="$(dirname "${netfilter_rule}")" From 2eee3a2d6a2268795c1b9bf10a75cecac03ddc7d Mon Sep 17 00:00:00 2001 From: MaksimZhukov <46996400+MaksimZhukov@users.noreply.github.com> Date: Fri, 15 Mar 2024 15:33:36 +0100 Subject: [PATCH 2722/3485] Add Xamarin bundle (#9514) --- images/macos/toolsets/toolset-12.json | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index 5a3bceea5901..05dc71b31025 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -22,16 +22,23 @@ "6.12.0.188" ], "ios_versions": [ - "16.2.0.5", "16.1.1.27", "16.0.0.72", "15.12.0.2", "15.10.0.5", "15.8.0.3", "15.6.0.3", "15.4.0.0", "15.2.0.17", "15.0.0.6" + "16.4.0.23", "16.2.0.5", "16.1.1.27", "16.0.0.72", "15.12.0.2", "15.10.0.5", "15.8.0.3", "15.6.0.3", "15.4.0.0", "15.2.0.17", "15.0.0.6" ], "mac_versions": [ - "9.1.0.5", "9.0.0.27", "8.12.0.2", "8.10.0.5", "8.8.0.3", "8.6.0.3", "8.4.0.0", "8.2.0.17", "7.14.0.27" + "9.3.0.23", "9.1.0.5", "9.0.0.27", "8.12.0.2", "8.10.0.5", "8.8.0.3", "8.6.0.3", "8.4.0.0", "8.2.0.17", "7.14.0.27" ], "android_versions": [ - "13.2.1.2", "13.1.0.1", "13.0.0.0", "12.3.3.3", "12.2.8.3", "12.1.0.2", "12.0.0.3", "11.3.0.4" + "13.2.2.0", "13.1.0.1", "13.0.0.0", "12.3.3.3", "12.2.8.3", "12.1.0.2", "12.0.0.3", "11.3.0.4" ], "bundle_default": "6_12_21", "bundles": [ + { + "symlink": "6_12_25", + "mono":"6.12", + "ios": "16.4", + "mac": "9.3", + "android": "13.2" + }, { "symlink": "6_12_24", "mono":"6.12", From f73cc2503fa5180296267b1babebbcc15800c9aa Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Sun, 17 Mar 2024 17:41:50 +0100 Subject: [PATCH 2723/3485] Unpin SYFT tool version for Windows images (#9522) * Unpin SYFT tool version for Windows images * Update upload-artifact action version to v4 --- .github/workflows/create_sbom_report.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/create_sbom_report.yml b/.github/workflows/create_sbom_report.yml index 103177a0d47d..a44c0b2bb88f 100644 --- a/.github/workflows/create_sbom_report.yml +++ b/.github/workflows/create_sbom_report.yml @@ -55,7 +55,7 @@ jobs: } - name: Install SYFT tool on Windows if: ${{ runner.os == 'Windows' }} - run: curl -sSfL https://raw.githubusercontent.com/anchore/syft/main/install.sh | sh -s -- -b D:/syft v0.100.0 + run: curl -sSfL https://raw.githubusercontent.com/anchore/syft/main/install.sh | sh -s -- -b D:/syft - name: Install SYFT tool on Ubuntu or macOS if: ${{ runner.os != 'Windows' }} run: curl -sSfL https://raw.githubusercontent.com/anchore/syft/main/install.sh | sh -s -- -b /usr/local/bin v0.100.0 @@ -74,7 +74,7 @@ jobs: - name: Compress SBOM file run: Compress-Archive sbom.json sbom.json.zip #Upload artifact action - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: name: sbom-${{ github.event.client_payload.agentSpec }}-${{ github.event.client_payload.imageVersion }} path: sbom.json.zip From 250c5145f6085d9e70aa11158458854dd7043c6c Mon Sep 17 00:00:00 2001 From: sergei-pyshnoi <121864472+sergei-pyshnoi@users.noreply.github.com> Date: Mon, 18 Mar 2024 18:34:52 +0100 Subject: [PATCH 2724/3485] [MacOS] Add install-python.sh to arm64 templates (#9474) * add install-python.sh to arm64 templates * add Pipx pester test * Update Python.Tests.ps1 * bump python version --- images/macos/scripts/build/install-python.sh | 2 +- .../scripts/docs-gen/Generate-SoftwareReport.ps1 | 12 +++++------- images/macos/scripts/tests/Python.Tests.ps1 | 14 ++++++++++---- images/macos/templates/macOS-13.arm64.anka.pkr.hcl | 1 + images/macos/templates/macOS-14.arm64.anka.pkr.hcl | 1 + 5 files changed, 18 insertions(+), 12 deletions(-) diff --git a/images/macos/scripts/build/install-python.sh b/images/macos/scripts/build/install-python.sh index 3fa93b27a15e..75d8700040c4 100644 --- a/images/macos/scripts/build/install-python.sh +++ b/images/macos/scripts/build/install-python.sh @@ -38,7 +38,7 @@ if is_Veertu; then fi echo "Brew Installing Python 3" -brew_smart_install "python@3.11" +brew_smart_install "python@3.12" echo "Installing pipx" export PIPX_BIN_DIR=/usr/local/opt/pipx_bin diff --git a/images/macos/scripts/docs-gen/Generate-SoftwareReport.ps1 b/images/macos/scripts/docs-gen/Generate-SoftwareReport.ps1 index c982e8efbb35..ce141bbe557a 100644 --- a/images/macos/scripts/docs-gen/Generate-SoftwareReport.ps1 +++ b/images/macos/scripts/docs-gen/Generate-SoftwareReport.ps1 @@ -61,12 +61,12 @@ if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) { $languageAndRuntime.AddToolVersion("Python", $(Get-PythonVersion)) } -if ((-not $os.IsVenturaArm64) -and (-not $os.IsSonomaArm64)) { - $languageAndRuntime.AddToolVersion("Python3", $(Get-Python3Version)) -} +$languageAndRuntime.AddToolVersion("Python3", $(Get-Python3Version)) + if ((-not $os.IsVentura) -and (-not $os.IsSonoma) -and (-not $os.IsBigSur)) { $languageAndRuntime.AddToolVersion("R", $(Get-RVersion)) } + $languageAndRuntime.AddToolVersion("Ruby", $(Get-RubyVersion)) # Package Management @@ -87,10 +87,8 @@ if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) { $packageManagement.AddToolVersion("Pip", $(Get-PipVersion -Version 2)) } -if ((-not $os.IsVenturaArm64) -and (-not $os.IsSonomaArm64)) { - $packageManagement.AddToolVersion("Pip3", $(Get-PipVersion -Version 3)) - $packageManagement.AddToolVersion("Pipx", $(Get-PipxVersion)) -} +$packageManagement.AddToolVersion("Pip3", $(Get-PipVersion -Version 3)) +$packageManagement.AddToolVersion("Pipx", $(Get-PipxVersion)) $packageManagement.AddToolVersion("RubyGems", $(Get-RubyGemsVersion)) if ((-not $os.IsVenturaArm64) -and (-not $os.IsSonomaArm64) -and (-not $os.IsSonoma)) { diff --git a/images/macos/scripts/tests/Python.Tests.ps1 b/images/macos/scripts/tests/Python.Tests.ps1 index c60d5708263f..4179d6233066 100644 --- a/images/macos/scripts/tests/Python.Tests.ps1 +++ b/images/macos/scripts/tests/Python.Tests.ps1 @@ -3,13 +3,19 @@ Import-Module "$PSScriptRoot/Helpers.psm1" -DisableNameChecking $os = Get-OSVersion -Describe "Python3" -Skip:($os.IsVenturaArm64 -or $os.IsSonomaArm64) { +Describe "Python3" { It "Python 3 is available" { "python3 --version" | Should -ReturnZeroExitCode } - - It "Python 3 is installed under /usr/local/bin" { - Get-ToolPath "python3" | Should -BeLike "/usr/local/bin*" + + if ($os.IsVenturaArm64 -or $os.IsSonomaArm64) { + It "Python 3 is installed under /opt/homebrew/bin/" { + Get-ToolPath "python3" | Should -BeLike "/opt/homebrew/bin/*" + } + } else { + It "Python 3 is installed under /usr/local/bin" { + Get-ToolPath "python3" | Should -BeLike "/usr/local/bin*" + } } It "Pip 3 is available" { diff --git a/images/macos/templates/macOS-13.arm64.anka.pkr.hcl b/images/macos/templates/macOS-13.arm64.anka.pkr.hcl index be53d27a6c97..858b4873f24b 100644 --- a/images/macos/templates/macOS-13.arm64.anka.pkr.hcl +++ b/images/macos/templates/macOS-13.arm64.anka.pkr.hcl @@ -204,6 +204,7 @@ build { "${path.root}/../scripts/build/install-powershell.sh", "${path.root}/../scripts/build/install-mono.sh", "${path.root}/../scripts/build/install-dotnet.sh", + "${path.root}/../scripts/build/install-python.sh", "${path.root}/../scripts/build/install-azcopy.sh", "${path.root}/../scripts/build/install-openssl.sh", "${path.root}/../scripts/build/install-ruby.sh", diff --git a/images/macos/templates/macOS-14.arm64.anka.pkr.hcl b/images/macos/templates/macOS-14.arm64.anka.pkr.hcl index 693fbae36559..750b55387762 100644 --- a/images/macos/templates/macOS-14.arm64.anka.pkr.hcl +++ b/images/macos/templates/macOS-14.arm64.anka.pkr.hcl @@ -204,6 +204,7 @@ build { "${path.root}/../scripts/build/install-powershell.sh", "${path.root}/../scripts/build/install-mono.sh", "${path.root}/../scripts/build/install-dotnet.sh", + "${path.root}/../scripts/build/install-python.sh", "${path.root}/../scripts/build/install-azcopy.sh", "${path.root}/../scripts/build/install-openssl.sh", "${path.root}/../scripts/build/install-ruby.sh", From 4224f365e0fb518e4eb80364c5f2f7716578ea0a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 20 Mar 2024 12:58:07 +0000 Subject: [PATCH 2725/3485] Updating readme file for ubuntu22 version 20240317.1.1 (#9532) Co-authored-by: Image generation service account <no-reply@microsoft.com> --- images/ubuntu/Ubuntu2204-Readme.md | 68 +++++++++++++++--------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/images/ubuntu/Ubuntu2204-Readme.md b/images/ubuntu/Ubuntu2204-Readme.md index 761f9bddf83d..8a41224caea2 100644 --- a/images/ubuntu/Ubuntu2204-Readme.md +++ b/images/ubuntu/Ubuntu2204-Readme.md @@ -7,7 +7,7 @@ # Ubuntu 22.04 - OS Version: 22.04.4 LTS - Kernel Version: 6.5.0-1016-azure -- Image Version: 20240310.1.0 +- Image Version: 20240317.1.0 - Systemd version: 249.11-0ubuntu3.12 ## Installed Software @@ -32,8 +32,8 @@ ### Package Management - cpan 1.64 -- Helm 3.14.2 -- Homebrew 4.2.11 +- Helm 3.14.3 +- Homebrew 4.2.12 - Miniconda 24.1.2 - Npm 10.2.4 - NuGet 6.6.1.2 @@ -41,7 +41,7 @@ - Pip3 22.0.2 - Pipx 1.4.3 - RubyGems 3.3.5 -- Vcpkg (build from commit 0719a7138) +- Vcpkg (build from commit cf4ebef22) - Yarn 1.22.22 #### Environment variables @@ -66,16 +66,16 @@ to accomplish this. - Ansible 2.16.4 - apt-fast 1.10.0 - AzCopy 10.23.0 - available by `azcopy` and `azcopy10` aliases -- Bazel 7.0.2 +- Bazel 7.1.0 - Bazelisk 1.19.0 -- Bicep 0.25.53 +- Bicep 0.26.54 - Buildah 1.23.1 - CMake 3.28.3 -- CodeQL Action Bundle 2.16.3 +- CodeQL Action Bundle 2.16.4 - Docker Amazon ECR Credential Helper 0.7.1 - Docker Compose v1 1.29.2 - Docker Compose v2 2.23.3 -- Docker-Buildx 0.13.0 +- Docker-Buildx 0.13.1 - Docker Client 24.0.9 - Docker Server 24.0.9 - Fastlane 2.219.0 @@ -86,42 +86,42 @@ to accomplish this. - Heroku 8.10.0 - jq 1.6 - Kind 0.22.0 -- Kubectl 1.29.2 +- Kubectl 1.29.3 - Kustomize 5.3.0 - Leiningen 2.11.2 - MediaInfo 21.09 - Mercurial 6.1.1 - Minikube 1.32.0 - n 9.2.1 -- Newman 6.1.1 +- Newman 6.1.2 - nvm 0.39.7 - OpenSSL 3.0.2-0ubuntu1.15 - Packer 1.10.2 - Parcel 2.12.0 - Podman 3.4.4 -- Pulumi 3.109.0 +- Pulumi 3.111.1 - R 4.3.3 - Skopeo 1.4.1 - Sphinx Open Source Search Server 2.2.11 - SVN 1.14.1 -- Terraform 1.7.4 +- Terraform 1.7.5 - yamllint 1.35.1 - yq 4.42.1 - zstd 1.5.5 ### CLI Tools - Alibaba Cloud CLI 3.0.199 -- AWS CLI 2.15.27 +- AWS CLI 2.15.30 - AWS CLI Session Manager Plugin 1.2.553.0 -- AWS SAM CLI 1.111.0 +- AWS SAM CLI 1.112.0 - Azure CLI 2.58.0 - Azure CLI (azure-devops) 1.0.0 - GitHub CLI 2.45.0 -- Google Cloud CLI 467.0.0 -- Netlify CLI 17.19.0 -- OpenShift CLI 4.15.0 +- Google Cloud CLI 468.0.0 +- Netlify CLI 17.19.4 +- OpenShift CLI 4.15.2 - ORAS CLI 1.1.0 -- Vercel CLI 33.5.5 +- Vercel CLI 33.6.1 ### Java | Version | Environment Variable | @@ -133,7 +133,7 @@ to accomplish this. ### PHP Tools - PHP: 8.1.2 -- Composer 2.7.1 +- Composer 2.7.2 - PHPUnit 8.5.37 ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. @@ -142,14 +142,14 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ### Haskell Tools - Cabal 3.10.2.1 - GHC 9.8.2 -- GHCup 0.1.20.0 +- GHCup 0.1.22.0 - Stack 2.15.3 ### Rust Tools - Cargo 1.76.0 - Rust 1.76.0 - Rustdoc 1.76.0 -- Rustup 1.26.0 +- Rustup 1.27.0 #### Packages - Bindgen 0.69.4 @@ -160,13 +160,13 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 122.0.6261.111 -- ChromeDriver 122.0.6261.111 +- Google Chrome 122.0.6261.128 +- ChromeDriver 122.0.6261.128 - Chromium 122.0.6261.0 -- Microsoft Edge 122.0.2365.80 -- Microsoft Edge WebDriver 122.0.2365.80 +- Microsoft Edge 122.0.2365.92 +- Microsoft Edge WebDriver 122.0.2365.92 - Selenium server 4.18.1 -- Mozilla Firefox 123.0.1 +- Mozilla Firefox 124.0 - Geckodriver 0.34.0 #### Environment variables @@ -178,7 +178,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | ### .NET Tools -- .NET Core SDK: 6.0.419, 7.0.406, 8.0.200 +- .NET Core SDK: 6.0.420, 7.0.407, 8.0.202 - nbgv 3.6.133+2d32d93cb1 ### Databases @@ -238,7 +238,7 @@ Use the following command as a part of your job to start the service: 'sudo syst - PowerShell 7.4.1 #### PowerShell Modules -- Az: 9.3.0 +- Az: 11.3.1 - MarkdownPS: 1.9 - Microsoft.Graph: 2.15.0 - Pester: 5.5.0 @@ -278,15 +278,15 @@ Use the following command as a part of your job to start the service: 'sudo syst | alpine:3.16 | sha256:452e7292acee0ee16c332324d7de05fa2c99f9994ecc9f0779c602916a672ae4 | 2024-01-27 | | alpine:3.17 | sha256:53cf9478b76f4c8fae126acbdfb79bed6e69e628faff572ebe4a029d3d247d98 | 2024-01-27 | | alpine:3.18 | sha256:11e21d7b981a59554b3f822c49f6e9f57b6068bb74f49c4cd5cc4c663c7e5160 | 2024-01-27 | -| debian:10 | sha256:a52d4e1c201d9ab2f3b939b91a3fdd345d3d11404755bc1cdb22c1d5be131c5d | 2024-02-13 | -| debian:11 | sha256:171478fbe347a3cfe45058dae333b6ed848fd8ce89f3104c89fa94c245086db1 | 2024-02-13 | +| debian:10 | sha256:f6b3b7c7b049c2c7d0f19ae988b4eac64fd8e127fa891c9de1d3cf3f8c33cad4 | 2024-03-12 | +| debian:11 | sha256:5a87974e73c64b3fb161d444a84bdd47c0e6b6058eacaeea64342e7cbce1f04d | 2024-03-12 | | moby/buildkit:latest | sha256:24fddad8ce5063e822f32df151b5d7c0b060a850e680bed615ccf9162eabf6e3 | 2024-03-05 | | node:16 | sha256:f77a1aef2da8d83e45ec990f45df50f1a286c5fe8bbfb8c6e4246c6389705c0b | 2023-09-07 | | node:16-alpine | sha256:a1f9d027912b58a7c75be7716c97cfbc6d3099f3a97ed84aa490be9dee20e787 | 2023-08-10 | -| node:18 | sha256:aa329c613f0067755c0787d2a3a9802c7d95eecdb927d62b910ec1d28689882f | 2024-02-15 | -| node:18-alpine | sha256:ca9f6cb0466f9638e59e0c249d335a07c867cd50c429b5c7830dda1bed584649 | 2024-02-15 | -| node:20 | sha256:f3299f16246c71ab8b304d6745bb4059fa9283e8d025972e28436a9f9b36ed24 | 2024-02-15 | -| node:20-alpine | sha256:c0a3badbd8a0a760de903e00cedbca94588e609299820557e72cba2a53dbaa2c | 2024-02-15 | +| node:18 | sha256:b39895225fb1984139d5af76400aff8fac3dd5bc00dd41a3ce22fc8a6cf538d5 | 2024-03-12 | +| node:18-alpine | sha256:c7620fdecfefb96813da62519897808775230386f4c8482e972e37b8b18cb460 | 2024-03-16 | +| node:20 | sha256:e06aae17c40c7a6b5296ca6f942a02e6737ae61bbbf3e2158624bb0f887991b5 | 2024-03-12 | +| node:20-alpine | sha256:bf77dc26e48ea95fca9d1aceb5acfa69d2e546b765ec2abfb502975f1a2d4def | 2024-03-16 | | ubuntu:20.04 | sha256:80ef4a44043dec4490506e6cc4289eeda2d106a70148b74b5ae91ee670e9c35d | 2024-02-16 | | ubuntu:22.04 | sha256:77906da86b60585ce12215807090eb327e7386c8fafb5402369e421f44eff17e | 2024-02-27 | From 243142386f2a4a789dd8a0951c6d08f6f9722149 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 20 Mar 2024 13:09:37 +0000 Subject: [PATCH 2726/3485] Updating readme file for win19 version 20240317.1.1 (#9527) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/windows/Windows2019-Readme.md | 61 ++++++++++++++-------------- 1 file changed, 30 insertions(+), 31 deletions(-) diff --git a/images/windows/Windows2019-Readme.md b/images/windows/Windows2019-Readme.md index 555298642d88..8bcdab9fc9f5 100644 --- a/images/windows/Windows2019-Readme.md +++ b/images/windows/Windows2019-Readme.md @@ -5,8 +5,8 @@ | [[All OSes] Go 1.19.x will be removed and 1.21.x set as default on February, 26](https://github.com/actions/runner-images/issues/9326) | *** # Windows Server 2019 -- OS Version: 10.0.17763 Build 5458 -- Image Version: 20240310.1.0 +- OS Version: 10.0.17763 Build 5576 +- Image Version: 20240317.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -21,21 +21,21 @@ - LLVM 16.0.6 - Node 18.18.2 - Perl 5.32.1 -- PHP 8.3.3 +- PHP 8.3.4 - Python 3.7.9 - Ruby 3.0.6p216 ### Package Management - Chocolatey 2.2.2 -- Composer 2.7.1 -- Helm 3.14.1 +- Composer 2.7.2 +- Helm 3.14.2 - Miniconda 24.1.2 (pre-installed on the image but not added to PATH) - NPM 9.8.1 - NuGet 6.9.1.3 - pip 24.0 (python 3.7) - Pipx 1.2.1 - RubyGems 3.2.33 -- Vcpkg (build from commit 0719a7138) +- Vcpkg (build from commit cf4ebef22) - Yarn 1.22.22 #### Environment variables @@ -54,12 +54,12 @@ - 7zip 23.01 - aria2 1.37.0 - azcopy 10.23.0 -- Bazel 7.0.2 +- Bazel 7.1.0 - Bazelisk 1.19.0 -- Bicep 0.25.53 +- Bicep 0.26.54 - Cabal 3.10.2.1 - CMake 3.28.3 -- CodeQL Action Bundle 2.16.3 +- CodeQL Action Bundle 2.16.4 - Docker 24.0.7 - Docker Compose v1 1.29.2 - Docker Compose v2 2.23.3 @@ -67,7 +67,7 @@ - ghc 9.8.2 - Git 2.44.0.windows.1 - Git LFS 3.4.1 -- Google Cloud CLI 467.0.0 +- Google Cloud CLI 468.0.0 - ImageMagick 7.1.1-29 - InnoSetup 6.2.2 - jq 1.7.1 @@ -77,12 +77,12 @@ - gcc 8.1.0 - gdb 8.1 - GNU Binutils 2.30 -- Newman 6.1.1 +- Newman 6.1.2 - NSIS 3.09 - OpenSSL 1.1.1w - Packer 1.10.0 - Parcel 2.12.0 -- Pulumi 3.109.0 +- Pulumi 3.111.1 - R 4.3.2 - Service Fabric SDK 9.1.1436.9590 - Stack 2.15.3 @@ -96,8 +96,8 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.199 -- AWS CLI 2.15.27 -- AWS SAM CLI 1.111.0 +- AWS CLI 2.15.30 +- AWS SAM CLI 1.112.0 - AWS Session Manager CLI 1.2.553.0 - Azure CLI 2.58.0 - Azure DevOps CLI extension 1.0.0 @@ -108,7 +108,7 @@ - Cargo 1.76.0 - Rust 1.76.0 - Rustdoc 1.76.0 -- Rustup 1.26.0 +- Rustup 1.27.0 #### Packages - bindgen 0.69.4 @@ -119,10 +119,10 @@ - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 122.0.6261.112 -- Chrome Driver 122.0.6261.111 -- Microsoft Edge 122.0.2365.80 -- Microsoft Edge Driver 122.0.2365.80 +- Google Chrome 122.0.6261.129 +- Chrome Driver 122.0.6261.128 +- Microsoft Edge 122.0.2365.92 +- Microsoft Edge Driver 122.0.2365.92 - Mozilla Firefox 123.0.1 - Gecko Driver 0.34.0 - IE Driver 4.14.0.0 @@ -494,24 +494,23 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 10.0.22621.0 ### .NET Core Tools -- .NET Core SDK: 6.0.127, 6.0.203, 6.0.321, 6.0.419, 7.0.116, 7.0.203, 7.0.313, 7.0.406 +- .NET Core SDK: 6.0.128, 6.0.203, 6.0.321, 6.0.420, 7.0.117, 7.0.203, 7.0.314, 7.0.407 - .NET Framework: 4.7.2, 4.8 -- Microsoft.AspNetCore.App: 6.0.5, 6.0.26, 6.0.27, 7.0.5, 7.0.16 -- Microsoft.NETCore.App: 6.0.5, 6.0.26, 6.0.27, 7.0.5, 7.0.16 -- Microsoft.WindowsDesktop.App: 6.0.5, 6.0.26, 6.0.27, 7.0.5, 7.0.16 +- Microsoft.AspNetCore.App: 6.0.5, 6.0.26, 6.0.28, 7.0.5, 7.0.17 +- Microsoft.NETCore.App: 6.0.5, 6.0.26, 6.0.28, 7.0.5, 7.0.17 +- Microsoft.WindowsDesktop.App: 6.0.5, 6.0.26, 6.0.28, 7.0.5, 7.0.17 - nbgv 3.6.133+2d32d93cb1 ### PowerShell Tools - PowerShell 7.4.1 #### Powershell Modules -- Az: 9.3.0 +- Az: 11.3.1 - Azure: 2.1.0 (Default), 5.3.0 - AzureRM: 2.1.0 (Default), 6.13.1 -- Az (Cached): 1.0.0.zip, 1.6.0.zip, 2.3.2.zip, 2.6.0.zip, 3.1.0.zip, 3.5.0.zip, 3.8.0.zip, 4.3.0.zip, 4.4.0.zip, 4.7.0.zip, 5.5.0.zip, 5.9.0.zip, 6.6.0.zip, 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.533 +- AWSPowershell: 4.1.538 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 - Microsoft.Graph: 2.15.0 @@ -554,9 +553,9 @@ All other versions are saved but not installed. ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:ac235873629d014498dfddf6aeed8ce60a48703e29157a9f8d97e30ca856de7f | 2024-02-13 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:805fcab81c350abe0299881fafb393ea6b4b0426a0bdf933883d69bc8d306d7a | 2024-02-13 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:acfa738b8316825b41a74459dd0820b3bce1ba95f0faf38398eab2c2eece6a08 | 2024-02-13 | -| mcr.microsoft.com/windows/nanoserver:1809 | sha256:0bd2e8d6d5cdb26eac9ebb0ef939a3b6362af71f3c1ac257fd5f0c53d1fc1388 | 2024-02-04 | -| mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:035894dc32a667c5f6f40054a4e92e208a60691438958c68696084fcce709ed5 | 2024-02-04 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:ac14bbc4ac85bb5d2891ea7e7d39316c6df63b749ef6447644289bb09455951c | 2024-03-12 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:78dac4e522f121788fbc834f3ccb6b7f7b19c15a3fbdcbfae60a9b3eee4537c8 | 2024-03-12 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:e15423aa2e5b51384f2edd40ddd1317371fc43f9483ec055989ef5ceb0c627a5 | 2024-03-12 | +| mcr.microsoft.com/windows/nanoserver:1809 | sha256:05f991b57e0095d6ea29c4fa7bef9e614c290de030c8e10e40cebc505871f725 | 2024-03-04 | +| mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:00cdad01de658d8d64acf052ddaa19c848e6d7edd214f2d8c2fd3da116fa58b2 | 2024-03-04 | From 65efa8ca2d33fb499f6fa36f5dc16f43b4c2ee63 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 20 Mar 2024 13:09:46 +0000 Subject: [PATCH 2727/3485] Updating readme file for win22 version 20240317.1.1 (#9528) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/windows/Windows2022-Readme.md | 109 +++++++++++++-------------- 1 file changed, 54 insertions(+), 55 deletions(-) diff --git a/images/windows/Windows2022-Readme.md b/images/windows/Windows2022-Readme.md index 3ddb68e1df07..8d6eee10743e 100644 --- a/images/windows/Windows2022-Readme.md +++ b/images/windows/Windows2022-Readme.md @@ -5,8 +5,8 @@ | [[All OSes] Go 1.19.x will be removed and 1.21.x set as default on February, 26](https://github.com/actions/runner-images/issues/9326) | *** # Windows Server 2022 -- OS Version: 10.0.20348 Build 2322 -- Image Version: 20240310.1.0 +- OS Version: 10.0.20348 Build 2340 +- Image Version: 20240317.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -21,21 +21,21 @@ - LLVM 16.0.6 - Node 18.18.2 - Perl 5.32.1 -- PHP 8.3.3 +- PHP 8.3.4 - Python 3.9.13 - Ruby 3.0.6p216 ### Package Management - Chocolatey 2.2.2 -- Composer 2.7.1 -- Helm 3.14.1 +- Composer 2.7.2 +- Helm 3.14.2 - Miniconda 24.1.2 (pre-installed on the image but not added to PATH) - NPM 9.8.1 - NuGet 6.9.1.3 - pip 24.0 (python 3.9) - Pipx 1.4.3 - RubyGems 3.2.33 -- Vcpkg (build from commit 0719a7138) +- Vcpkg (build from commit cf4ebef22) - Yarn 1.22.22 #### Environment variables @@ -54,12 +54,12 @@ - 7zip 23.01 - aria2 1.37.0 - azcopy 10.23.0 -- Bazel 7.0.2 +- Bazel 7.1.0 - Bazelisk 1.19.0 -- Bicep 0.25.53 +- Bicep 0.26.54 - Cabal 3.10.2.1 - CMake 3.28.3 -- CodeQL Action Bundle 2.16.3 +- CodeQL Action Bundle 2.16.4 - Docker 24.0.7 - Docker Compose v1 1.29.2 - Docker Compose v2 2.23.3 @@ -76,11 +76,11 @@ - gcc 12.2.0 - gdb 11.2 - GNU Binutils 2.39 -- Newman 6.1.1 +- Newman 6.1.2 - NSIS 3.09 - OpenSSL 1.1.1w - Packer 1.10.0 -- Pulumi 3.109.0 +- Pulumi 3.111.1 - R 4.3.2 - Service Fabric SDK 9.1.1436.9590 - Stack 2.15.3 @@ -94,8 +94,8 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.199 -- AWS CLI 2.15.27 -- AWS SAM CLI 1.111.0 +- AWS CLI 2.15.30 +- AWS SAM CLI 1.112.0 - AWS Session Manager CLI 1.2.553.0 - Azure CLI 2.58.0 - Azure DevOps CLI extension 1.0.0 @@ -105,7 +105,7 @@ - Cargo 1.76.0 - Rust 1.76.0 - Rustdoc 1.76.0 -- Rustup 1.26.0 +- Rustup 1.27.0 #### Packages - bindgen 0.69.4 @@ -116,10 +116,10 @@ - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 122.0.6261.112 -- Chrome Driver 122.0.6261.111 -- Microsoft Edge 122.0.2365.80 -- Microsoft Edge Driver 122.0.2365.80 +- Google Chrome 122.0.6261.129 +- Chrome Driver 122.0.6261.128 +- Microsoft Edge 122.0.2365.92 +- Microsoft Edge Driver 122.0.2365.92 - Mozilla Firefox 123.0.1 - Gecko Driver 0.34.0 - IE Driver 4.14.0.0 @@ -222,9 +222,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Nginx | 1.25.4 | C:\tools\nginx-1.25.4\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2022 -| Name | Version | Path | -| ----------------------------- | -------------- | -------------------------------------------------------- | -| Visual Studio Enterprise 2022 | 17.9.34622.214 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | +| Name | Version | Path | +| ----------------------------- | ------------- | -------------------------------------------------------- | +| Visual Studio Enterprise 2022 | 17.9.34701.34 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | #### Workloads, components and extensions | Package | Version | @@ -259,9 +259,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Component.Xamarin.RemotedSimulator | 17.9.34511.75 | | ios | 17.2.8004.0 | | maccatalyst | 17.2.8004.0 | -| maui.blazor | 8.0.6.0 | -| maui.core | 8.0.6.0 | -| maui.windows | 8.0.6.0 | +| maui.blazor | 8.0.7.0 | +| maui.core | 8.0.7.0 | +| maui.windows | 8.0.7.0 | | Microsoft.Component.Azure.DataLake.Tools | 17.9.34511.75 | | Microsoft.Component.ClickOnce | 17.9.34511.75 | | Microsoft.Component.CodeAnalysis.SDK | 17.9.34511.75 | @@ -285,20 +285,20 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.Net.ComponentGroup.4.8.DeveloperTools | 17.9.34511.75 | | Microsoft.Net.ComponentGroup.DevelopmentPrerequisites | 17.9.34511.75 | | Microsoft.Net.ComponentGroup.TargetingPacks.Common | 17.9.34511.75 | -| microsoft.net.runtime.android | 8.0.224.6711 | -| microsoft.net.runtime.android.aot | 8.0.224.6711 | -| microsoft.net.runtime.android.aot.net7 | 8.0.224.6711 | -| microsoft.net.runtime.android.net7 | 8.0.224.6711 | -| microsoft.net.runtime.ios | 8.0.224.6711 | -| microsoft.net.runtime.ios.net7 | 8.0.224.6711 | -| microsoft.net.runtime.maccatalyst | 8.0.224.6711 | -| microsoft.net.runtime.maccatalyst.net7 | 8.0.224.6711 | -| microsoft.net.runtime.mono.tooling | 8.0.224.6711 | -| microsoft.net.runtime.mono.tooling.net7 | 8.0.224.6711 | -| microsoft.net.sdk.emscripten | 8.0.10.6201 | +| microsoft.net.runtime.android | 8.0.324.11423 | +| microsoft.net.runtime.android.aot | 8.0.324.11423 | +| microsoft.net.runtime.android.aot.net7 | 8.0.324.11423 | +| microsoft.net.runtime.android.net7 | 8.0.324.11423 | +| microsoft.net.runtime.ios | 8.0.324.11423 | +| microsoft.net.runtime.ios.net7 | 8.0.324.11423 | +| microsoft.net.runtime.maccatalyst | 8.0.324.11423 | +| microsoft.net.runtime.maccatalyst.net7 | 8.0.324.11423 | +| microsoft.net.runtime.mono.tooling | 8.0.324.11423 | +| microsoft.net.runtime.mono.tooling.net7 | 8.0.324.11423 | +| microsoft.net.sdk.emscripten | 8.0.10.10803 | | Microsoft.NetCore.Component.DevelopmentTools | 17.9.34511.75 | -| Microsoft.NetCore.Component.Runtime.8.0 | 17.9.34606.255 | -| Microsoft.NetCore.Component.SDK | 17.9.34606.255 | +| Microsoft.NetCore.Component.Runtime.8.0 | 17.9.34629.179 | +| Microsoft.NetCore.Component.SDK | 17.9.34629.179 | | Microsoft.NetCore.Component.Web | 17.9.34511.75 | | Microsoft.VisualStudio.Component.AppInsights.Tools | 17.9.34511.75 | | Microsoft.VisualStudio.Component.AspNet | 17.9.34511.75 | @@ -516,18 +516,18 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Workload.Python | 17.9.34511.75 | | Microsoft.VisualStudio.Workload.Universal | 17.9.34511.75 | | Microsoft.VisualStudio.Workload.VisualStudioExtension | 17.9.34511.75 | -| runtimes.ios | 8.0.224.6711 | -| runtimes.ios.net7 | 8.0.224.6711 | -| runtimes.maccatalyst | 8.0.224.6711 | -| runtimes.maccatalyst.net7 | 8.0.224.6711 | -| wasm.tools | 8.0.224.6711 | +| runtimes.ios | 8.0.324.11423 | +| runtimes.ios.net7 | 8.0.324.11423 | +| runtimes.maccatalyst | 8.0.324.11423 | +| runtimes.maccatalyst.net7 | 8.0.324.11423 | +| wasm.tools | 8.0.324.11423 | | ProBITools.MicrosoftAnalysisServicesModelingProjects2022 | 3.0.4 | | ProBITools.MicrosoftReportProjectsforVisualStudio2022 | 3.0.1 | | SSIS.MicrosoftDataToolsIntegrationServices | 1.3.2 | | VisualStudioClient.MicrosoftVisualStudio2022InstallerProjects | 2.0.1 | | Windows Driver Kit | 10.1.22621.2428 | | Windows Driver Kit Visual Studio Extension | 10.0.22621.0 | -| Windows Software Development Kit | 10.1.22621.2428 | +| Windows Software Development Kit | 10.1.22621.3233 | | WixToolset.WixToolsetVisualStudio2022Extension | 1.0.0.22 | #### Microsoft Visual C++ @@ -550,24 +550,23 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 10.0.22621.0 ### .NET Core Tools -- .NET Core SDK: 6.0.127, 6.0.203, 6.0.321, 6.0.419, 7.0.116, 7.0.203, 7.0.313, 7.0.406, 8.0.200 +- .NET Core SDK: 6.0.128, 6.0.203, 6.0.321, 6.0.420, 7.0.117, 7.0.203, 7.0.314, 7.0.407, 8.0.202 - .NET Framework: 4.8, 4.8.1 -- Microsoft.AspNetCore.App: 6.0.5, 6.0.26, 6.0.27, 7.0.5, 7.0.16, 8.0.2 -- Microsoft.NETCore.App: 6.0.5, 6.0.26, 6.0.27, 7.0.5, 7.0.16, 8.0.2 -- Microsoft.WindowsDesktop.App: 6.0.5, 6.0.26, 6.0.27, 7.0.5, 7.0.16, 8.0.2 +- Microsoft.AspNetCore.App: 6.0.5, 6.0.26, 6.0.27, 6.0.28, 7.0.5, 7.0.17, 8.0.3 +- Microsoft.NETCore.App: 6.0.5, 6.0.26, 6.0.27, 6.0.28, 7.0.5, 7.0.17, 8.0.3 +- Microsoft.WindowsDesktop.App: 6.0.5, 6.0.26, 6.0.28, 7.0.5, 7.0.17, 8.0.3 - nbgv 3.6.133+2d32d93cb1 ### PowerShell Tools - PowerShell 7.4.1 #### Powershell Modules -- Az: 9.3.0 +- Az: 11.3.1 - Azure: 2.1.0 (Default), 5.3.0 - AzureRM: 2.1.0 (Default), 6.13.1 -- Az (Cached): 7.5.0.zip - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.533 +- AWSPowershell: 4.1.538 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 - Microsoft.Graph: 2.15.0 @@ -610,9 +609,9 @@ All other versions are saved but not installed. ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2022 | sha256:59926d7692cac2c349bd6f320d24bd9dbaeb7818a9c2c5f81b6d416b5a89789e | 2024-02-13 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2022 | sha256:6e6e681d5bf0040611844b2b3f385afc0a44fbc06d258ab51979d04133f14c98 | 2024-02-13 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:8ad2a6294e31cd60c794874e0a163b02664e09e7e62351083178fbe0c9ab122a | 2024-02-13 | -| mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:64b22e42a69ebcdb86e49bf50780b64156431a508f7f06ac3050c71920fe57b7 | 2024-02-07 | -| mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:8a75266be74ad7a904470e18057f6fd62055cf7028172307fefc67aff37dfd10 | 2024-02-07 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2022 | sha256:860454405335b1f0dd84a8b5fd2bb3a5e0289cc78a71d4efd4055eefaab13653 | 2024-03-12 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2022 | sha256:4d29a1431d9bc6b7ec0f1b64289a8810d25790f86abe55050729a6485c8cf1d9 | 2024-03-12 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:76d2dd2054a18f47d9c690f9d0047e319d7b68aa4e72ee7aae46e3637042c165 | 2024-03-12 | +| mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:6e6053f0358f9522d2d14693f9bc152f47fe04c82c53dc8c6d127a5a823c8720 | 2024-03-05 | +| mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:6b8781cab588a2858d1aba2c5d5456e79c823e04d666d59d0732dab1273dc8fb | 2024-03-05 | From b3d50abbad0a192b88d444263e39aa31830bafa5 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Wed, 20 Mar 2024 16:55:15 +0100 Subject: [PATCH 2728/3485] Update README.md to inccude macOS-latest-xlarge (#9541) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d5050f5f93ed..d48f595e2ade 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ To build a VM machine from this repo's source, see the [instructions](docs/creat | macOS 14 [beta] | `macos-14-large`| [macOS-14] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fmikhailkoliada%2F35b243dd6e217d041fe3dfa5b4e2e2ed%2Fraw%2Fmacos-14.json) | | macOS 14 Arm64 [beta] | `macos-14` or `macos-14-xlarge`| [macOS-14-arm64] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fmikhailkoliada%2F35b243dd6e217d041fe3dfa5b4e2e2ed%2Fraw%2Fmacos-14-arm64.json) | | macOS 13 | `macos-13`, `macos-13-large` or `macos-latest-large` | [macOS-13] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fmikhailkoliada%2F35b243dd6e217d041fe3dfa5b4e2e2ed%2Fraw%2Fmacos-13.json) | -| macOS 13 Arm64 | `macos-13-xlarge` | [macOS-13-arm64] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fmikhailkoliada%2F35b243dd6e217d041fe3dfa5b4e2e2ed%2Fraw%2Fmacos-13-arm64.json) | +| macOS 13 Arm64 | `macos-13-xlarge` or `macos-latest-xlarge` | [macOS-13-arm64] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fmikhailkoliada%2F35b243dd6e217d041fe3dfa5b4e2e2ed%2Fraw%2Fmacos-13-arm64.json) | | macOS 12 | `macos-latest`,`macos-12` or`macos-12-large`| [macOS-12] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fmikhailkoliada%2F35b243dd6e217d041fe3dfa5b4e2e2ed%2Fraw%2FmacOS-12.json) | | macOS 11 [deprecated] | `macos-11`| [macOS-11] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fmikhailkoliada%2F35b243dd6e217d041fe3dfa5b4e2e2ed%2Fraw%2FmacOS-11.json) | | Windows Server 2022 | `windows-latest` or `windows-2022` | [windows-2022] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fmikhailkoliada%2F35b243dd6e217d041fe3dfa5b4e2e2ed%2Fraw%2Fwin22.json) | From bb7b256a9bcd1e55ce70d4d3d57388102d10bf7f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 20 Mar 2024 23:42:34 +0000 Subject: [PATCH 2729/3485] Updating readme file for ubuntu20 version 20240317.1.1 (#9531) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2004-Readme.md | 71 +++++++++++++++--------------- 1 file changed, 35 insertions(+), 36 deletions(-) diff --git a/images/ubuntu/Ubuntu2004-Readme.md b/images/ubuntu/Ubuntu2004-Readme.md index 5e858dcf55c7..6a7feb612747 100644 --- a/images/ubuntu/Ubuntu2004-Readme.md +++ b/images/ubuntu/Ubuntu2004-Readme.md @@ -7,7 +7,7 @@ # Ubuntu 20.04 - OS Version: 20.04.6 LTS - Kernel Version: 5.15.0-1058-azure -- Image Version: 20240310.1.0 +- Image Version: 20240317.1.0 - Systemd version: 245.4-4ubuntu3.23 ## Installed Software @@ -34,8 +34,8 @@ ### Package Management - cpan 1.64 -- Helm 3.14.2 -- Homebrew 4.2.11 +- Helm 3.14.3 +- Homebrew 4.2.12 - Miniconda 24.1.2 - Npm 10.2.4 - NuGet 6.6.1.2 @@ -43,7 +43,7 @@ - Pip3 20.0.2 - Pipx 1.4.3 - RubyGems 3.1.2 -- Vcpkg (build from commit 0719a7138) +- Vcpkg (build from commit cf4ebef22) - Yarn 1.22.22 #### Environment variables @@ -71,16 +71,16 @@ to accomplish this. - Ansible 2.13.13 - apt-fast 1.10.0 - AzCopy 10.23.0 - available by `azcopy` and `azcopy10` aliases -- Bazel 7.0.2 +- Bazel 7.1.0 - Bazelisk 1.19.0 -- Bicep 0.25.53 +- Bicep 0.26.54 - Buildah 1.22.3 - CMake 3.28.3 -- CodeQL Action Bundle 2.16.3 +- CodeQL Action Bundle 2.16.4 - Docker Amazon ECR Credential Helper 0.7.1 - Docker Compose v1 1.29.2 - Docker Compose v2 2.23.3 -- Docker-Buildx 0.13.0 +- Docker-Buildx 0.13.1 - Docker Client 24.0.9 - Docker Server 24.0.9 - Fastlane 2.219.0 @@ -92,43 +92,43 @@ to accomplish this. - HHVM (HipHop VM) 4.172.1 - jq 1.6 - Kind 0.22.0 -- Kubectl 1.29.2 +- Kubectl 1.29.3 - Kustomize 5.3.0 - Leiningen 2.11.2 - MediaInfo 19.09 - Mercurial 5.3.1 - Minikube 1.32.0 - n 9.2.1 -- Newman 6.1.1 +- Newman 6.1.2 - nvm 0.39.7 - OpenSSL 1.1.1f-1ubuntu2.22 - Packer 1.10.2 - Parcel 2.12.0 - PhantomJS 2.1.1 2.1.1 - Podman 3.4.2 -- Pulumi 3.109.0 +- Pulumi 3.111.1 - R 4.3.3 - Skopeo 1.5.0 - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 -- Terraform 1.7.4 +- Terraform 1.7.5 - yamllint 1.35.1 - yq 4.42.1 - zstd 1.5.5 ### CLI Tools - Alibaba Cloud CLI 3.0.174 -- AWS CLI 2.15.27 +- AWS CLI 2.15.30 - AWS CLI Session Manager Plugin 1.2.553.0 -- AWS SAM CLI 1.111.0 +- AWS SAM CLI 1.112.0 - Azure CLI 2.58.0 - Azure CLI (azure-devops) 1.0.0 - GitHub CLI 2.45.0 -- Google Cloud CLI 467.0.0 -- Netlify CLI 17.19.0 -- OpenShift CLI 4.15.0 +- Google Cloud CLI 468.0.0 +- Netlify CLI 17.19.4 +- OpenShift CLI 4.15.2 - ORAS CLI 1.1.0 -- Vercel CLI 33.5.5 +- Vercel CLI 33.6.1 ### Java | Version | Environment Variable | @@ -139,8 +139,8 @@ to accomplish this. | 21.0.2+13 | JAVA_HOME_21_X64 | ### PHP Tools -- PHP: 7.4.33, 8.0.30, 8.1.27, 8.2.16, 8.3.3 -- Composer 2.7.1 +- PHP: 7.4.33, 8.0.30, 8.1.27, 8.2.17, 8.3.4 +- Composer 2.7.2 - PHPUnit 8.5.37 ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. @@ -149,14 +149,14 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ### Haskell Tools - Cabal 3.10.2.1 - GHC 9.8.2 -- GHCup 0.1.20.0 +- GHCup 0.1.22.0 - Stack 2.15.3 ### Rust Tools - Cargo 1.76.0 - Rust 1.76.0 - Rustdoc 1.76.0 -- Rustup 1.26.0 +- Rustup 1.27.0 #### Packages - Bindgen 0.69.4 @@ -167,13 +167,13 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 122.0.6261.111 -- ChromeDriver 122.0.6261.111 +- Google Chrome 122.0.6261.128 +- ChromeDriver 122.0.6261.128 - Chromium 122.0.6261.0 -- Microsoft Edge 122.0.2365.80 -- Microsoft Edge WebDriver 122.0.2365.80 +- Microsoft Edge 122.0.2365.92 +- Microsoft Edge WebDriver 122.0.2365.92 - Selenium server 4.18.1 -- Mozilla Firefox 123.0.1 +- Mozilla Firefox 124.0 - Geckodriver 0.34.0 #### Environment variables @@ -185,7 +185,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | ### .NET Tools -- .NET Core SDK: 6.0.419, 7.0.406, 8.0.200 +- .NET Core SDK: 6.0.420, 7.0.407, 8.0.202 - nbgv 3.6.133+2d32d93cb1 ### Databases @@ -249,8 +249,7 @@ Use the following command as a part of your job to start the service: 'sudo syst - PowerShell 7.4.1 #### PowerShell Modules -- Az: 9.3.0 -- Az (Cached): 3.1.0.zip, 4.4.0.zip, 5.9.0.zip, 6.6.0.zip, 7.5.0.zip +- Az: 11.3.1 - MarkdownPS: 1.9 - Microsoft.Graph: 2.15.0 - Pester: 5.5.0 @@ -291,16 +290,16 @@ Use the following command as a part of your job to start the service: 'sudo syst | alpine:3.16 | sha256:452e7292acee0ee16c332324d7de05fa2c99f9994ecc9f0779c602916a672ae4 | 2024-01-27 | | alpine:3.17 | sha256:53cf9478b76f4c8fae126acbdfb79bed6e69e628faff572ebe4a029d3d247d98 | 2024-01-27 | | alpine:3.18 | sha256:11e21d7b981a59554b3f822c49f6e9f57b6068bb74f49c4cd5cc4c663c7e5160 | 2024-01-27 | -| debian:10 | sha256:a52d4e1c201d9ab2f3b939b91a3fdd345d3d11404755bc1cdb22c1d5be131c5d | 2024-02-13 | -| debian:11 | sha256:171478fbe347a3cfe45058dae333b6ed848fd8ce89f3104c89fa94c245086db1 | 2024-02-13 | +| debian:10 | sha256:f6b3b7c7b049c2c7d0f19ae988b4eac64fd8e127fa891c9de1d3cf3f8c33cad4 | 2024-03-12 | +| debian:11 | sha256:5a87974e73c64b3fb161d444a84bdd47c0e6b6058eacaeea64342e7cbce1f04d | 2024-03-12 | | debian:9 | sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be | 2022-06-23 | | moby/buildkit:latest | sha256:24fddad8ce5063e822f32df151b5d7c0b060a850e680bed615ccf9162eabf6e3 | 2024-03-05 | | node:16 | sha256:f77a1aef2da8d83e45ec990f45df50f1a286c5fe8bbfb8c6e4246c6389705c0b | 2023-09-07 | | node:16-alpine | sha256:a1f9d027912b58a7c75be7716c97cfbc6d3099f3a97ed84aa490be9dee20e787 | 2023-08-10 | -| node:18 | sha256:aa329c613f0067755c0787d2a3a9802c7d95eecdb927d62b910ec1d28689882f | 2024-02-15 | -| node:18-alpine | sha256:ca9f6cb0466f9638e59e0c249d335a07c867cd50c429b5c7830dda1bed584649 | 2024-02-15 | -| node:20 | sha256:f3299f16246c71ab8b304d6745bb4059fa9283e8d025972e28436a9f9b36ed24 | 2024-02-15 | -| node:20-alpine | sha256:c0a3badbd8a0a760de903e00cedbca94588e609299820557e72cba2a53dbaa2c | 2024-02-15 | +| node:18 | sha256:b39895225fb1984139d5af76400aff8fac3dd5bc00dd41a3ce22fc8a6cf538d5 | 2024-03-12 | +| node:18-alpine | sha256:c7620fdecfefb96813da62519897808775230386f4c8482e972e37b8b18cb460 | 2024-03-16 | +| node:20 | sha256:e06aae17c40c7a6b5296ca6f942a02e6737ae61bbbf3e2158624bb0f887991b5 | 2024-03-12 | +| node:20-alpine | sha256:bf77dc26e48ea95fca9d1aceb5acfa69d2e546b765ec2abfb502975f1a2d4def | 2024-03-16 | | ubuntu:20.04 | sha256:80ef4a44043dec4490506e6cc4289eeda2d106a70148b74b5ae91ee670e9c35d | 2024-02-16 | ### Installed apt packages From 88b4de5d653020e38ff5f83876ce94324224ee30 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 21 Mar 2024 02:58:29 +0000 Subject: [PATCH 2730/3485] Updating readme file for macos-13 version 20240219.1 (#9375) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-13-Readme.md | 110 ++++++++++++++++---------------- 1 file changed, 56 insertions(+), 54 deletions(-) diff --git a/images/macos/macos-13-Readme.md b/images/macos/macos-13-Readme.md index 704341457e70..89eef5c32e0e 100644 --- a/images/macos/macos-13-Readme.md +++ b/images/macos/macos-13-Readme.md @@ -1,16 +1,17 @@ | Announcements | |-| -| [[All OSes] Powershell Core will be updated to 7.4.x LTS on January, 28](https://github.com/actions/runner-images/issues/9115) | +| [[All OSes] Ruby versions <= 2.7.x will be removed on February, 26](https://github.com/actions/runner-images/issues/9327) | +| [[All OSes] Go 1.19.x will be removed and 1.21.x set as default on February, 26](https://github.com/actions/runner-images/issues/9326) | *** # macOS 13 - OS Version: macOS 13.6.4 (22G513) - Kernel Version: Darwin 22.6.0 -- Image Version: 20240204.1 +- Image Version: 20240219.1 ## Installed Software ### Language and Runtime -- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.405, 8.0.101 +- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.406, 8.0.101, 8.0.201 - Bash 3.2.57(1)-release - Clang/LLVM 15.0.0 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` @@ -22,24 +23,24 @@ - GNU Fortran 13 (Homebrew GCC 13.2.0) - available by `gfortran-13` alias - Kotlin 1.9.22-release-704 - Mono 6.12.0.188 -- Node.js 20.11.0 +- Node.js 20.11.1 - Perl 5.38.2 -- PHP 8.3.2 -- Python3 3.12.1 +- PHP 8.3.3 +- Python3 3.12.2 - Ruby 3.0.6p216 ### Package Management -- Bundler 2.5.5 +- Bundler 2.5.6 - Carthage 0.39.1 -- CocoaPods 1.15.0 -- Composer 2.6.6 -- Homebrew 4.2.6 +- CocoaPods 1.15.2 +- Composer 2.7.1 +- Homebrew 4.2.9 - NPM 10.2.4 - NuGet 6.3.1.1 - Pip3 24.0 (python 3.12) - Pipx 1.4.3 -- RubyGems 3.5.5 -- Vcpkg 2024 (build from commit 80403036a) +- RubyGems 3.5.6 +- Vcpkg 2024 (build from commit 13bde2ff1) - Yarn 1.22.19 ### Project Management @@ -55,9 +56,9 @@ - bazelisk 1.19.0 - bsdtar 3.5.3 - available by 'tar' alias - Curl 8.6.0 -- Git 2.43.0 +- Git 2.43.2 - Git LFS 3.4.1 -- GitHub CLI 2.43.1 +- GitHub CLI 2.44.1 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.21.4 - gpg (GnuPG) 2.4.4 @@ -65,20 +66,20 @@ - OpenSSL 1.1.1w 11 Sep 2023 - Packer 1.9.4 - pkg-config 0.29.2 -- yq 4.40.5 +- yq 4.41.1 - zstd 1.5.5 ### Tools -- AWS CLI 2.15.17 -- AWS SAM CLI 1.108.0 +- AWS CLI 2.15.21 +- AWS SAM CLI 1.109.0 - AWS Session Manager CLI 1.2.553.0 -- Azure CLI 2.56.0 +- Azure CLI 2.57.0 - Azure CLI (azure-devops) 0.26.0 -- Bicep CLI 0.24.24 -- Cmake 3.28.2 -- CodeQL Action Bundle 2.16.1 +- Bicep CLI 0.25.53 +- Cmake 3.28.3 +- CodeQL Action Bundle 2.16.2 - Fastlane 2.219.0 -- SwiftFormat 0.53.1 +- SwiftFormat 0.53.2 - Xcbeautify 1.4.0 - Xcode Command Line Tools 15.1.0.0.1.1700200546 - Xcodes 1.4.1 @@ -87,14 +88,14 @@ - SwiftLint 0.53.0 ### Browsers -- Safari 17.3 (18617.2.4.11.11) -- SafariDriver 17.3 (18617.2.4.11.11) -- Google Chrome 121.0.6167.139 -- Google Chrome for Testing 121.0.6167.85 -- ChromeDriver 121.0.6167.85 -- Microsoft Edge 121.0.2277.98 -- Microsoft Edge WebDriver 121.0.2277.98 -- Mozilla Firefox 122.0 +- Safari 17.3.1 (18617.2.4.11.12) +- SafariDriver 17.3.1 (18617.2.4.11.12) +- Google Chrome 121.0.6167.184 +- Google Chrome for Testing 121.0.6167.184 +- ChromeDriver 121.0.6167.184 +- Microsoft Edge 121.0.2277.128 +- Microsoft Edge WebDriver 121.0.2277.128 +- Mozilla Firefox 122.0.1 - geckodriver 0.34.0 - Selenium server 4.17.0 @@ -115,10 +116,6 @@ ### Cached Tools -#### Ruby -- 3.0.6 -- 3.1.4 - #### PyPy - 2.7.18 [PyPy 7.3.15] - 3.7.13 [PyPy 7.3.9] @@ -126,38 +123,43 @@ - 3.9.18 [PyPy 7.3.15] - 3.10.13 [PyPy 7.3.15] +#### Ruby +- 3.0.6 +- 3.1.4 + #### Python - 3.8.18 - 3.9.18 - 3.10.13 -- 3.11.7 -- 3.12.1 +- 3.11.8 +- 3.12.2 #### Node.js - 16.20.2 -- 18.19.0 -- 20.11.0 +- 18.19.1 +- 20.11.1 #### Go - 1.19.13 -- 1.20.13 -- 1.21.6 +- 1.20.14 +- 1.21.7 +- 1.22.0 ### Rust Tools -- Cargo 1.75.0 -- Rust 1.75.0 -- Rustdoc 1.75.0 +- Cargo 1.76.0 +- Rust 1.76.0 +- Rustdoc 1.76.0 - Rustup 1.26.0 #### Packages -- Clippy 0.1.75 +- Clippy 0.1.76 - Rustfmt 1.7.0-stable ### PowerShell Tools - PowerShell 7.4.1 #### PowerShell Modules -- Az: 11.2.0 +- Az: 11.3.1 - Pester: 5.5.0 - PSScriptAnalyzer: 1.21.0 @@ -205,11 +207,11 @@ | Simulator - watchOS 9.4 | watchsimulator9.4 | 14.3.1 | | Simulator - watchOS 10.0 | watchsimulator10.0 | 15.0.1 | | Simulator - watchOS 10.2 | watchsimulator10.2 | 15.1, 15.2 | -| Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | | visionOS 1.0 | xros1.0 | 15.2 | +| Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | -| Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | +| Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | | DriverKit 22.1 | driverkit22.1 | 14.1 | | DriverKit 22.2 | driverkit22.2 | 14.2 | | DriverKit 22.4 | driverkit22.4 | 14.3.1 | @@ -239,21 +241,21 @@ | Android Command Line Tools | 11.0 | | Android Emulator | 33.1.24 | | Android SDK Build-tools | 34.0.0<br>33.0.2 33.0.3 | -| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 2)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | -| Android SDK Platform-Tools | 34.0.5 | +| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | +| Android SDK Platform-Tools | 35.0.0 | | Android Support Repository | 47.0.0 | | CMake | 3.22.1 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 24.0.8215888<br>25.2.9519653<br>26.1.10909125 (default) | +| NDK | 24.0.8215888<br>25.2.9519653<br>26.2.11394342 (default) | #### Environment variables | Name | Value | | ----------------------- | --------------------------------------------------- | | ANDROID_HOME | /Users/runner/Library/Android/sdk | -| ANDROID_NDK | /Users/runner/Library/Android/sdk/ndk/26.1.10909125 | -| ANDROID_NDK_HOME | /Users/runner/Library/Android/sdk/ndk/26.1.10909125 | -| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/26.1.10909125 | -| ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk/26.1.10909125 | +| ANDROID_NDK | /Users/runner/Library/Android/sdk/ndk/26.2.11394342 | +| ANDROID_NDK_HOME | /Users/runner/Library/Android/sdk/ndk/26.2.11394342 | +| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/26.2.11394342 | +| ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk/26.2.11394342 | | ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | From c0f1a024dcbc148ef11bcfc51cdde1fffd0068fc Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 22 Mar 2024 00:11:51 +0000 Subject: [PATCH 2731/3485] Updating readme file for macos-13-arm64 version 20240219.3 (#9374) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-13-arm64-Readme.md | 84 ++++++++++++++------------- 1 file changed, 43 insertions(+), 41 deletions(-) diff --git a/images/macos/macos-13-arm64-Readme.md b/images/macos/macos-13-arm64-Readme.md index fef684f1f0b7..2776dbc64ca0 100644 --- a/images/macos/macos-13-arm64-Readme.md +++ b/images/macos/macos-13-arm64-Readme.md @@ -1,16 +1,17 @@ | Announcements | |-| -| [[All OSes] Powershell Core will be updated to 7.4.x LTS on January, 28](https://github.com/actions/runner-images/issues/9115) | +| [[All OSes] Ruby versions <= 2.7.x will be removed on February, 26](https://github.com/actions/runner-images/issues/9327) | +| [[All OSes] Go 1.19.x will be removed and 1.21.x set as default on February, 26](https://github.com/actions/runner-images/issues/9326) | *** # macOS 13 - OS Version: macOS 13.6.4 (22G513) - Kernel Version: Darwin 22.6.0 -- Image Version: 20240204.1 +- Image Version: 20240219.3 ## Installed Software ### Language and Runtime -- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.405, 8.0.101 +- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.406, 8.0.101, 8.0.201 - Bash 3.2.57(1)-release - Clang/LLVM 15.0.0 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` @@ -22,18 +23,18 @@ - GNU Fortran 13 (Homebrew GCC 13.2.0) - available by `gfortran-13` alias - Kotlin 1.9.22-release-704 - Mono 6.12.0.188 -- Node.js 20.11.0 +- Node.js 20.11.1 - Perl 5.38.2 - Ruby 3.0.6p216 ### Package Management -- Bundler 2.5.5 +- Bundler 2.5.6 - Carthage 0.39.1 -- CocoaPods 1.15.0 -- Homebrew 4.2.6 +- CocoaPods 1.15.2 +- Homebrew 4.2.9 - NPM 10.2.4 - NuGet 6.3.1.1 -- RubyGems 3.5.5 +- RubyGems 3.5.6 - Yarn 1.22.19 ### Project Management @@ -49,9 +50,9 @@ - bazelisk 1.19.0 - bsdtar 3.5.3 - available by 'tar' alias - Curl 8.4.0 -- Git 2.43.0 +- Git 2.43.2 - Git LFS 3.4.1 -- GitHub CLI 2.43.1 +- GitHub CLI 2.44.1 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.21.4 - gpg (GnuPG) 2.4.4 @@ -59,20 +60,20 @@ - OpenSSL 1.1.1w 11 Sep 2023 - Packer 1.9.4 - pkg-config 0.29.2 -- yq 4.40.5 +- yq 4.41.1 - zstd 1.5.5 ### Tools -- AWS CLI 2.15.17 -- AWS SAM CLI 1.108.0 +- AWS CLI 2.15.21 +- AWS SAM CLI 1.109.0 - AWS Session Manager CLI 1.2.553.0 -- Azure CLI 2.56.0 +- Azure CLI 2.57.0 - Azure CLI (azure-devops) 0.26.0 -- Bicep CLI 0.24.24 -- Cmake 3.28.2 -- CodeQL Action Bundle 2.16.1 +- Bicep CLI 0.25.53 +- Cmake 3.28.3 +- CodeQL Action Bundle 2.16.2 - Fastlane 2.219.0 -- SwiftFormat 0.53.1 +- SwiftFormat 0.53.2 - Xcbeautify 1.4.0 - Xcode Command Line Tools 15.1.0.0.1.1700200546 - Xcodes 1.4.1 @@ -80,11 +81,11 @@ ### Linters ### Browsers -- Safari 17.3 (18617.2.4.11.11) -- SafariDriver 17.3 (18617.2.4.11.11) -- Google Chrome 121.0.6167.139 -- Google Chrome for Testing 121.0.6167.85 -- ChromeDriver 121.0.6167.85 +- Safari 17.3.1 (18617.2.4.11.12) +- SafariDriver 17.3.1 (18617.2.4.11.12) +- Google Chrome 121.0.6167.184 +- Google Chrome for Testing 121.0.6167.184 +- ChromeDriver 121.0.6167.184 - Selenium server 4.17.0 #### Environment variables @@ -104,34 +105,35 @@ ### Cached Tools #### Python -- 3.11.7 -- 3.12.1 +- 3.11.8 +- 3.12.2 #### Node.js - 16.20.1 -- 18.19.0 -- 20.11.0 +- 18.19.1 +- 20.11.1 #### Go - 1.19.13 -- 1.20.13 -- 1.21.6 +- 1.20.14 +- 1.21.7 +- 1.22.0 ### Rust Tools -- Cargo 1.75.0 -- Rust 1.75.0 -- Rustdoc 1.75.0 +- Cargo 1.76.0 +- Rust 1.76.0 +- Rustdoc 1.76.0 - Rustup 1.26.0 #### Packages -- Clippy 0.1.75 +- Clippy 0.1.76 - Rustfmt 1.7.0-stable ### PowerShell Tools - PowerShell 7.4.1 #### PowerShell Modules -- Az: 11.2.0 +- Az: 11.3.1 - Pester: 5.5.0 - PSScriptAnalyzer: 1.21.0 @@ -214,21 +216,21 @@ | Android Command Line Tools | 11.0 | | Android Emulator | 33.1.24 | | Android SDK Build-tools | 34.0.0<br>33.0.2 33.0.3 | -| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 2)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | -| Android SDK Platform-Tools | 34.0.5 | +| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | +| Android SDK Platform-Tools | 35.0.0 | | Android Support Repository | 47.0.0 | | CMake | 3.22.1 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 24.0.8215888<br>25.2.9519653<br>26.1.10909125 (default) | +| NDK | 24.0.8215888<br>25.2.9519653<br>26.2.11394342 (default) | #### Environment variables | Name | Value | | ----------------------- | --------------------------------------------------- | | ANDROID_HOME | /Users/runner/Library/Android/sdk | -| ANDROID_NDK | /Users/runner/Library/Android/sdk/ndk/26.1.10909125 | -| ANDROID_NDK_HOME | /Users/runner/Library/Android/sdk/ndk/26.1.10909125 | -| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/26.1.10909125 | -| ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk/26.1.10909125 | +| ANDROID_NDK | /Users/runner/Library/Android/sdk/ndk/26.2.11394342 | +| ANDROID_NDK_HOME | /Users/runner/Library/Android/sdk/ndk/26.2.11394342 | +| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/26.2.11394342 | +| ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk/26.2.11394342 | | ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | From a30db65b295a8d5b3c399417221dcabe0f79d6e3 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Fri, 22 Mar 2024 17:04:46 +0100 Subject: [PATCH 2732/3485] [DOCS] remove obsolete debug guide (#9548) --- docs/debugging-failed-builds.md | 26 ------------------------- docs/resources/askOnError.png | Bin 21961 -> 0 bytes docs/resources/packerResourceGroup.png | Bin 71149 -> 0 bytes docs/resources/resourceGroupName.png | Bin 208502 -> 0 bytes docs/resources/vmCredentials.png | Bin 142298 -> 0 bytes 5 files changed, 26 deletions(-) delete mode 100644 docs/debugging-failed-builds.md delete mode 100644 docs/resources/askOnError.png delete mode 100644 docs/resources/packerResourceGroup.png delete mode 100644 docs/resources/resourceGroupName.png delete mode 100644 docs/resources/vmCredentials.png diff --git a/docs/debugging-failed-builds.md b/docs/debugging-failed-builds.md deleted file mode 100644 index 4e301e83f771..000000000000 --- a/docs/debugging-failed-builds.md +++ /dev/null @@ -1,26 +0,0 @@ -# Debugging Failed Packer Builds - -## Step 1: Run packer build `-on-error=ask` -When you run the `packer build` command, give it the `-on-error=ask` flag. -By default, `packer build` will delete the resource group as soon as the build fails. -`-on-error=ask` will pause it and wait for your input so you have time to remote in to the VM and diagnose the failure. - -When the build fails, you will see this: - -![Ask on error screenshot](/docs/resources/askOnError.png "Ask on error screenshot") - -## Step 2: Find the resource group name in the build log -At the beginning of the build log (written to console), find the resource group name for the VM: - -![Resource group from log screenshot](/docs/resources/resourceGroupName.png "Resource group from log screenshot") - -Log into the Azure Portal. Find that resource group under `Resource groups`. You should see the resources for the Packer build: - -![Packer resource group in Azure screenshot](/docs/resources/packerResourceGroup.png "Packer resource group in Azure screenshot") - -## Step 3: Connect to the VM -Select the VM in the resource group. Click `Connect:` - -This will download an RDP file. Open that and enter the credentials found in the HCL2 file you pass to `packer build`: - -![VM credentials screenshot](/docs/resources/vmCredentials.png "VM credentials screenshot") diff --git a/docs/resources/askOnError.png b/docs/resources/askOnError.png deleted file mode 100644 index fff463b4967a81edc7bf07fdb63b785c258d641f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21961 zcmZU*1z3}R*aeJ*iUKO#q5{(0rGzv{ODodd9V*f#ATdTrcQZPalpHl`gfwh~#E1dg z_kjQR{oe2Tc3r@;?Wtcp_wSr@pPTTvs&e>vlz2EeIQR<kG8#BIxIw`7*u9&;Z-Nw# zr@)^Zt{QSuIOW6CTfm#!makP_<KR@qKDhXB2Y7$qNnXzt2Zxm5>gR@n#*4o=INHVv zGOx9~jCU@fwp6<3KQCh?7O_8OHXWjic153V_ILBlrm#hXaew*Z?NrU}^7H-IUw4R_ z6oN>l$5gmND5JQ^HI`IN+sN@c8d5kS1bgsM#qZ@yOvkjq>yln0t^q?<N4{?|MhQ1A zrC!8~C0PuoQCM@BY#3He&)=OCk}rcZDLD@`&B^Z(54o=Q^?y#E4JgPgVjx=}-XKbH zx2cd|+uF$0_t=sC(0`5`=7r50E;X~FzH8KsRX}xl*eif$UA^YIupq45LN~NsdljoW zQ|iMeZ9(+lWI0J&{A}jyl320hVybWY;Dzo*`P<fmuS@@q`V<zW@?yBDNvJUiYuTn) z(wmfcDI#gDXUX9B1{`SOSN_a-3VTsbd)2|fD~=K@Z#d|4vbvVnA}E@!31ti9XTXSG zt{IBsZJ)FkAGG&j{j&bwy))B<vX0iZFidv~C*vP14(d;$_8;WC+`2y5Pa*OG;A|p+ z&QFPEcuew=_X0tcrTrCT=9e{pI51km&KcnwwQECmJ#$xM2fU<sb%dQA=0j!@*|p_R zcMHsHBo!rh5aAnmwvD+hno9YZj<W_eP4UvcjYF-0P}q(Wy?MsJi{bcC)yStA)V~(- z)#N)tt7m!*r_QqU|CtS4Rt%V&9oi}3uKahAS1CPgPd4snqD)GDk+AOg#fwU~OZg@u z2civ^6igD|-MHTE)2?Y%GvT1ozhiLXDC$Rx{%!yCdiLb*zs-j?<AnZgy?+$e_3uEO zASd`UXUMA5ncv=`>$&%s7?IYHVtaf=<q3;z#*L;D^C_87>&CLRK`6XLj|fWW&%Py# zy?u3>_kM9i|L4qq@=f#7MYpt1j>G+}1O8p-&+8Wi<S{9z-DX*u7C3Y2#`VWP?MWl& z{on5{;6YY9z{`Fe#k=cxi$)-(TSa<XQyZ)l10oPzx}?E`EZ51JgaLdek(F|_9GkW6 zdb;D7hz$Fq_FUFPBe*|bV#-8phxgDUcP~#}tgo;JWP3KW<GUwQh!xi*uZW<e)O8!l zO;)?2i@Z!d0!lUuxMa^6+#5e7e4z><8jP=~CRz`Vxo8*tce_#CVO_#&Z%_J>_RnNg zZ}bbO)9>fZ<(CEOvW*D*e37hYQo>o2k-;r#%~@ZRJa>L_HK5Jm2#0cs_LPlD#$?2V zfaK*1d+1Cu$(f;8d#aA4-5<-owIM0vo<GF}b@rsgJA1~Fmdl_H8{3cQKu`Kood~@R zLKwIhCaU9zu&?sbNUXPTNWP@4<%Go-`%=$ZxOVM0?Rf9Wo6GIu@y&_UYm8vF<XAuf zuu55vM(3O~kLh#Injs87_)lrgVv=Y7Kmb?Kk9|LN&h<G;s$Z4^1(QQJRT9nSRep4^ zUA6LkZq(}+93JjRouHP42ElR0_i<?;aBXRg#(;eN5wf#m(r%981|^gjuPhn47-^oA zj~HMpOS4l2%jK|Gw6Z39xPjj#WP03pch|2@GJ>ZjdaCYpbdHIl(yTTPnIh{5de$=C zqwvoHPw2Pm7H^>#gb8X3n|jR*FW-UE`s>|t!(>J!HIc^(&J5#~vio1B3*}I_kDE_7 zr;7hQ#9l*lSdCJ(wW-Kz?+(~`*kNDbfQj8+5v{E`p6!Bmx}Hhm=k=OPXX>91t{T+P z-Sg265!+s9`aQvfqjuGXy`rBOJZ>^P^s#rYCUMZrU6;YnKOQa#OGcXTub!q1xKn)7 zh|JrG4jSm+*4hZ~a|mCn$X^Yd>gA+dA?8NTCnVE=eb|oX_HLYOppM=L4)=AOzwq=c z&ag+wW4g;@G*pu^8-{2KKk44hI)SDpVmuVO>xPdv(%j!F#GE&`x9LWblffAvd73lp ze;@(D19WvNI8(6JwfTeU9TzH?{eB^L?MBI(d8~i2iIdGh-=7i&G7p%dgP4N^`&E;0 zxC}q?s2OfWHxa}_=N-v2bZW+CW&|EHRGFD-sNAo3(q^i=!RZzgE66z*uBb&|mrll5 zj);Vdjx%bE81Fk5{QUI_gzuP{I`PB3FO@$|Yd`(C9iCOx>eF`qSHI{a;AAm*VtTrx zbLX%+!GWS##3$>c<tWpw<0(mB`2e)!nTfmS-rPLrviU&X;a-<TD$|Rq9fm})6z_=? z8c=$Y^UoSV_M8I$+7`#p`o<SlvpS=&nZyJ1SLGLe`Ok_4NUX0Pyyuo;&zzV04NXFs zlG+@ogOY~a!tSQe;wMsYVkVOJv1d}^-`$jd6=z(qeZ1?gyNBgE!Tn)g$L5UWuh(a3 z{)>LAOKhKzx(fTy2i+}}pQ8(`yPR)dEVj#6y=Xsw3k;C|QQlHmc3|pa^hRdcT0G73 zGJV^F9}iu`Q^!7w9e$VFd(OdAH8vbV>()|>_DOKQj)|W}`5A?smpd>Ui$~;qo(+aW zsqY%d9Epm*{qLg0NFB~lA+{8xp2VE;c3$Cw#B*tDV5K`RrNb(D#GPL7x~kn@<IkD$ zZGZ3?tpPlZ#uZYPp4oDqZ#W|`6g9(in@3fBMP;T-i>}QrAXRtD5JPmIGUevv+Q{Li z5!PeEBGC`x_w=(qrnmQ81jfzFO8U`|<!a>L%S8WM0j*OHS<fMg0oG-(KLcc$B@fP# zfdRUNp}Dj99>o=p)03$(`m>DAOsZe6RkRPa3ZVUl)R!taVOk6$3CoIY#=-BMo*^=; z#$r;tR2WM2_Pe(G71Wa$h9F%lrtI!igJM3M&*_}!<OZ6HVx;nh{^(s@9p_EQw9NAA z#CB84Cn~bH=6CgN`A?6|O@gSz$s#ljdbZN;?;#Jz>k*J#ia>NbwvHy#s;69FAG@0a zwKPf9GntRSuY;d=t7+=pJ$1KBUJrMSQ`OV@ZV3T;VbC*6Nyqy=-bewVgj>c**>tEG z;Ns(m`{6To$hzyRbK&(cF{yI7?vymVa#;fRoS`J2RF&kk5GV|mx7d{0&g72A1J7q- zL>I&EP%Y?N`S_7p1lE(zy%il#H6sk6QoK9IxHdN0+5Lsc$X+w&`Fat&vUFoq^pqLl zRwJQrtopuSouia`8~hm3&A<2J)Ad!O!ki<z8gGsKx8^s@T%ax9ctg!T%pT-N2}M;O zc)W(HWir?HeLO(a=JHZtFY2S=9M36T6fvr<pA|5R{@;V)$=O^Dn5`(7{lE^30guR} zgoLOYFS1y%6XhIme$h7$|5kVZ>S_&TJuFPa>9&C$vfXzabehMN<sHrOEaFR3Q|XQI zBatubt=D7s^p^NEb}x?3EX8$lcH$k%`jmeKB=UpanjW@Gvi%MV(Vq98wdbhJ*pqlx zHepoJX4do9f|gxqURuRCe++`lUD#NGnK81N$DBCrocXjW22B^58`;%rvKv|Q=ML}B z;7}s!i!F)Omcrh%n<#N?7r)Hftqm9x=*<qihE@)F+>u@Ut9x^H#>Z&050eu*>c&Zd z-*~$WnuTdBD5JcLTiuamEejq`1f@xTO$6aFZKyS^W8Cx)dVA|=dy|=ok3{>2bU!p` z`d0Yz<6`#$r1@Dd`>nqb%Ib0asOok|`aT8Wgf;iBwv3D88Px3e&*aTHjaqi$$x!r$ z7YC}Ut|e<F;*J-)<aCWE)?9|};QB<uxZJ5qoox6UX2NV-L~1CPJ(i=G@Fxy<A`d~^ z<cUE(1+6sJ;HyslWMDn`%sJz)3>HFZSRAvuUqlpBWN6~Bil^p~f#Q7x%qeRF{_btX z*h-^j23e(m`UVk86P-D$@7iT)G?AoU?-1$Mo7j0d9cbH&rrtFF?YdY5ZAnqDsA;FR zyu8?<@g-g2$oWS1aYpHwlMW17QIrhPj1{F-QJoJNvElz-|DbpUgp;XJW{CZ`i)-!8 z%Ym|!gr$saN?H?N-{9+r?p+Bk&l^8vZH!_bmQhcujB;Fkf%9mhAzJkg*DHQo)1{2G zV0%7W{_D@Vi~+=ERbipR=2-lU)-rEb^X@+oEJ>b@_d}1p`8bQqoc0|Mq&~}2UmqbT zr%L@P#tn3@!|D3{*X6pkE?E2n$B4slDzp8G(j(+yVw8FMYzd(>3+Y*$6Q#*ybxV$o z^SZ!Eokcg6&QT+AJe@;uOjPzT%|yN4k{yHz;1?C7N_NcBD(A#{oh4*0H(sCm2jOZL zy<cKGX3{eNTT;B|S8Fj@LoxdFuH+s3PH)-K43`UQXNJA|o%h50iUxHvLH}UmQ#+aE zM;Rq2fhoQ{-I*dTTCHe#qGh+G(W?bB3FO6C-*$``;h@{S^xd87>KqC-)Zkoxtmhj6 zJH^DM;;Irz7_}w{)Hlvyb~zal|IR5T_kv*Qd<ELG6bhh2ZOYLg8n@RMbU0S*;& z#+7h|!*@>zEjQ{TeAiI-50!KN!g+;x3v~V*t*MR@O|Y7z2lkF=UAO9)^b3c3F5nEm zLXP^O+Oy!Q{S&zDz9VYK;BusT0i(%%k_w9_Y8(ogs65EJv}vX1FHJIh*<3cdUYDd9 zdFBX3KcMBvo!Ik%l^(I4X`XxA`sh2UF6fEVm+#sImeUjMoNCp96W{6E`yp|5X2_td z*WBRK=HqZ_E7QqlRuXj^kIOc@U5aAT*B@-_==s^WDWGgaj%9Di1EY*+RN%=63#%6n zN;iQ(RXU+AJpG`c;j3a;&G15PI(_-vw{VZ6KU>bWVMBqw*K_4l6&Ef<a~>}~@s=no z-uMM?EWv{_1x=MPy>}9RF8oz3jp%4lLYt4x9)vWQxV^0fgA!EIv;YN-McO0b!w}8% z<-{a+f3bQmV#QZo&BH3(Pc4xM7;oz!r-<!X<xUb?Bq%d_V6D8QfK$}Yx7A;SgR}|# z#)!^QOnfZod3OSDACz=g4eF0!T(h%IPTI=eaD<e-O4YAdOIo&vHxdpDpp6bOb$o?B zdpm_6?wAoimg{Y0W_qt*mX>%B3x#)Ur^hf6i0oDTR@J_zAJm{}o8mv=vY8jZ<(O&C zn^0W;U<wwYE$)4$IW7;^cQHL{dspw3-L|^sFkq^`GMXjWatX?E?)ya}cQwGDocVBt zoq<?DH@uqO)e4$?9Bk23Qlp`C@$3@)*4zjby04t|m&KOWO2n|*yu(RKtftnbTG*a8 z`V+utHg)+Gu-mn?;amK!Sf#4<L=(=`TVFiM77D9V)|YbUj`M|o+w>hFT^-MBP1q<i z=Mz7qBFc$Eh`N&c75eKu=eP{r0{mJ6S+KDinIP_B$ad=e{jaE9M*4DyL0y4o9(L{S zkNnuD&Tc7OX^+$f%hTMbT9MRmcPkpWD}Mj}Yv`Ou8$z_o=cjolhhOlZQCPOsVS%CG zfW6?(uQUoVOG3yJ&%-IR!rsSMZGC?c)w?-C7dZMHuien<{tdQ@;Yiy*<0h%MUb;fN zy1m_}>h^MVCHr=e-VHn^{84^s0Lor^0$R-`Rf1F9O-`ICnndo<H%)UCRgP-a2}h-1 zJeU_8D675NxH6q=Oe3Oa?Lk4xvJ6`9meA8ib}O$!F7)$RB2_PTja(gnnogeGf|6^` zPzE#8P&{Pn8y(~A()K*@>qa4pj33L<N5&2fx@E2&y`M&uTQ-Tf^9ozB5HrL)g+z&n zblDG2wv#}~h93H>tY`G`{TvUv6mD%nsK>d)+ywCzFKW%nSZ36mcn11cknU?B*X^pU zZo8ZDXOezhQ%S60CbAZ{#J%K=9TkeX>Is|`Gv)Pg*49x4W!DobqUKUJ4;^FNb}L#8 zsoLh}&o)u-wh<S>!))M-36%uriY3;&b+n44H47y5p7|=@vc(0HoSAa7ip0B1591Z@ z4~p5a@q9~9qW@Gk{;hAxH=i+ox{%3&pxOsHRBGvd`rcvGEHAt}U~WN^yLtUh%qI?+ z_vUyW-n{dSP;MUpoy8C_B<U<tBj`hy@E`1?6wH)bsEA3<iRwk@4j*??Zc`Jaj~9Tu zDXjE3glo3-G#6|8&Uo(5ckZk&l{{9w!s?k1eVQCu4q25p7WvCVgkos(VNJrK3;@HE z>ctZ;xRaG+c={%Ksf;@1b$<Hr!%m6+y5Sm}v*?@f0^t0Zab=TrNuZP0;3g|sAVO*P zN;Xjxi8t3)3vd`@ZuY^3HVU%nYu;?OFoLXl7#XE));2&TiLeoiMhyj0-=cR&T@kl7 zyR)A!Z1!ajYfJ=Tjxpkfz8UG8)bWuUkr_`4(Uaw;)=$Y)yJQIR#NdP?$$DfgYBiox zY5k%Jjk*PO={6ug`-Y_UC#@w$QO!pQ3RQMf3aJE52OdkRO+#jpA9&<!#jtkl$q$(i z+)pHJ3aw*#J4a%lUk&L`AxiLU5t$@5|A_`7h%cRWDd~Yl5&F2SajI`H5cWf$#0SRe zY<;SH`aHuE8G$G*K`zGlm9|h(I=KWM@!9K`7L5=uAo$Y*t<1iREhEzW^|)CX3y>nh zi>!_dd~NHQR;0XlO$wFYB*uOf;uX@zy<s5wmn-}^Ymtw<ZQNv1+bZn*$AfgsANv4O zI<ibOpYeWY1<-;v>*RC-&bxQ&|N2{yW1O#L6LQgyMB%PP&4>h%J88u2eE_yc?p$Mg zIX!WU)d_p9nw8cl3$c&jr%EsS^U^1l5lq6qE2YJ~mkbsgYQqK_Pi@nO*}jhcLNWJz zok^UuK0hC~UhZIYc%uzvkQ>?ygybd@XqVRJFn*bMt(|DD_gyckvBxXT>hD~B>CU$k z9bGG?THekdG5`9GoZ>$bEl)APIY-?F$7u0$l=_30ZX0Fr_ZGc197>p;OLs+Q5r{#D z0a{@C{(!0OUPSDJ@nNkKn)Rm-KvqP0ajyiv6j{YF*H%b93R4KP<#qnRnxM|_@rLUw zO|wW~!%Ml2;hA2>7fhO~lr}BHr4<f+HXZn~R8mFE+|T}tP;60Zs%h^L0)<vupT70l z|0x5YyJfHFX^~1<$g%QB!NJrbB1@AiE6;58QTJ-@X)rz{`c}&O0Z|?;Reh#R@a$}h zb<inPTkFnkvlhl#>k0Ij`8}KD&m}oO3`Kkz-Z`;!PTDdyoW&M+NRNip`Sotf?F(J6 zi%|_%1i+oDD{t@Ml9PzWhX2&eM#zgXV?0SvTfA#@Wx_sXF`hfPu4cu0zu9w0Jf})P zR(zNTjAF#c*GLAn;QmN5(j@w7<RF%GKM~c~W1-tGDBs(xGWwyu#vjgSHC0rEka5ph zn)vYd*vzux>`#>0p4tX)kaD(LbjSbBibSG~N&6Hd_0d8A|2T5NS~c%z5GZMpjq&q? zn<+ac)g8t`$(KD4(Oa%M?-2SW^qSKNhm$4eMcW<VFU3JyptpOyy&@0TGB{@|#AKCh z`@#)9mbAOfiOjxeI9JTQ<J4}0*!g)&junk}HMb|>Ys?SrG$;fEK}ez3Kz~QHm?tN@ zQ-Wy^ko?@_niRG<rBFGYq|FNAYg<Z!Vn;r%V?(rk<u41o4C*CQ>K(r6*PAcRqkIx^ zN8^Bg>c}y_+%IU3N0GS^c<|e&5$y2iwS(s1J-nS+2BBHTDcS8SRw)~guAkS+XuTKZ z^zgOq=)EP7{RC4+O@3X(LC0xO+R*&$&{hdD?zzr%8ES@qPP5EVcdZ45u)*d&?Nw?z zGf5r1>H6lcxz?x#4dv-uHan7aUZ2wsT~Ab7C(s5Z<W_4x9VjX(pd~aDJ`X5+Tna)< zsJHn^(1mi^87Lw;?iD)60Viv3H@4l({*UY&9tjTi1)Ti1xpUs`ArcO=L;Zv}fB!z8 z2{^Z&myy%g(59SFoD_|x_9;#NOTC?NIQ)x)tR&3{5iw}6?3v#1PF!xx*CK`3VBXJy zJb2~aRpYpf{|UCi--PpuIcQ6qg0vdj=6;i89BGHUbEP%mi`($0iLnpPh;%*G22`W5 zp{#^ySR6~dlb-W)aP^%DzhkwWbZg^o&Q*g<V{m+tBE-d`CC)%a7G$@kN;rk)K%EW% zu<x%Jgo5AOL<?pY`dZ+(sV3p$bNQn@sX$o7t;XpExR6tG=w{L}joQl@2GRs=%Cy<$ zRFQ8xS}O<3@5z*!;MqxfD&h+ukC^ZMC|^|jgqua>5$G5CC~)0*{?Y%0)qgC7`#=Nf zB4z~iELC~&zf1s+x%H!}Ck?A%Qvio>ZybHH-&M9mZL)2C)dR1vJ@#%0IbbDYn~OA< zx8Z*;<R)eK&8CiA(uejH5}mn-`gpY;&X?y;1Ziz1yACW~N0*k88UK9A#oHxo+=UaQ zIl$2pul;oJsksr4RI+D-%B^qLl2Q<WV$^j9%Ds!<cu;xwZ)!ay_91WZ{-Z7ocT5c+ zxH{>lSHHulsG5G<rWbf>LnfK*0ZonIGTfaV(tdjNHO@T*z=P(+I0r%gi&r|c2fI3+ zRkU|xIj!dTRB8AgAuMd=sVvTB=JnoDoG#1P8#td{KYem{POG%mm8li6AW_9RMELIu zF@TwMKCW5tuP+Sp3<%Bt4{P^`IS=9T5+>JVq)#vrxK0(QLtKvGguZgJPyw{bSYm(q zjzp^B@1p*%PR6`4Gz;_m+1jS*)+;v$G3$%((Uxw7f3Nk;)08+O!Tja$nX|I&OEGI& z&&dEl)7!sr+RObDvUIy<wPgFNclLAa-gWD7a6Uf#Up@b@^}q*wFD~ZgrSAeG%Zq^T z@LJSf#GP5(lvN(2Ey{dyoOhjRXH5VV?~4Vf%Al*D`uq@VgY0l_c2y&NcD*1ocSrcV z`dMb=hVD2b6#s&)v8AZQLr2XX&XxvWY$b(u@dm>tdycTXQt!%$0o|)uP`kvlbYTK+ zippgvNcinAV%~mtM+uUPpbf2?p>`HE^j#3un2Bq?iC;flMqC?+j#JDx;kS!3a+rHr zKy!?lx2p*pViZDd*RR#sqIV=xv_`zz3dvj@qND%RtZ5=GKI`foMy)$YjUQh3{=+G9 znPpR5Imxs>(Qsd0`<tYFphkrO5mrc)n^L<3o83@P`r{t}kRS1B#I(M%ur6*J9P95} zul43D1~`_BwOoBT|Cx32TipT%+Zjlip7+KChZtL{CN$hbBCy&D`Q8wt*E{_UP?_Q# z&c)xF#IL-HEcR9IfyE~F75OR2MaUCh@<JRkiFJAK4T#mkqJ6X+A5}%h29)*t){G0I zqNWBfIlIwX0j)2=OopwoLYWu!7l3epsM5)=TsMM&P}&q$5^%cS8!cB2`ea}y_ND-H z8p-lT_-su|seJOFSh-60a&1n`V^G|nPg%!PyJL!}@lw;j5u+^~6WeH*e1jSCZgxSa zp>$ByJtJj1=^e&K5##B9k<G0NOiOX^nW~~*Dd;6_C8xF;As|z;wWzuD79eKwV^&SJ z5ii%w&cfkypYgohANgQQ^|l<7wd{~~fx~)t6IUDB&yl{6Fy|^G4Fi!xdjeymZo|a~ z_-!Ynd4mOZPB=%s`aEeYrL=FGzVY#N0s2lsUE0GoeU}fqWve|a>*LqY0!}AC<6&3g zLLu_+>D*<=k~KeTdb&N4`V%EaM%eeiEK96_PAIi;>UG$WRw%RfbJF|6a&cQjE3f^t zJ3AzFo_N#`zt8+VE>ghPPcGFXQXpBh#x~QW&X#O66ILYp?0I7S6{4fr#pWb9MYoaw zLPsXzLF&)*KJc<8bhQARfCZ?=@ciX7<2pkTtg2nUx6~83u|{7ING^INZpND8u9)vQ zkI$^!z&UB*T6b)|J&94e5p#vwZ<!8DmTVi%IMS<;;d1GD{)DM~5asS=x`piFwwh56 z^%^Ofe+$}QR`aL8W^ztQEA$eVBKn{_9&bHS7(!P^9DR#{C-ugzC3)2kDhS<WM+J%$ zjA@cCw#y^BF83|ri<jqR{T7HWY%`%O^m0MYgfiwOy5MZy3p1n7F~dDp3}Gbfe>#=J zO!J#p&HG4V`56)Gj@{<#UZs)>L5k$7%rg$T(Z_fqCXVeuj7scl*U$l2X?U>jzCae< z{{mq1j<|OR{X`Pv=AbY4Vd=!{ygc7^=7%6q^nSY;SvXXZ_vHIqV_u)uljcW-oB*5N zK(XBRW%6;eJj&k8<VIe6R;2@{&9abU#OnvZTUrGle&=Nl=6-fCA`p*VKsn0U>-6ak z+<j8G7U<Vfp-IDAW6Ir=cRloPCICITv?MYiU%0*6q+~UDQXjv~Z@;mrvK_PGiE@%J zwznxjQ;vE!E)`MFCSn<=v@mG+oNW$tikbw2)=<&DDb8HJiqyV`%ao0wVBINHnA7S= zCAs3m#O8WqhDu@_lN$BE26Ik$4j%Uc83{1rrPl1jjO!Hb`xihuSygqYJo0{n^9^l} z9}t}&wRS9j!>DVP5X3xf81%PILejs)SSfYC0DJBT-w(IgwjsjqNud3X^FSyVJLo;^ zt;i4G=-@}PQ<5KbHweidxEO4IB#KX9b~!#wdY@MB5X39|$DA2R;Q|*IEz9_pGF0bq z9k_9F-ut;M-{zfai+J#Ytj#*j1pEAPvq(Sk8=%FP^fV=@h_F-CEEpBZ8!j&>gYR#N zsHo+i2A-%-m2fu3rE4~4x&5@);GhvVWD^>N3Gj=UW;Eds_|UcnWoD}iB6HT(ZhP45 zcJ%*hqfj?6JXF1T4L^Q{0cq?sQ5^O|ZJ#qtayWRX!qMXUi85(EyJLS?=Sx;cvZIS5 zkQ7*qu|iczBw-&K2yfWo$)+z@-Qy!mSp`&2y#{|~ydY%e@VoiCx$<g;oR2#zHPV7L z<;8r4bQ|^1OtDt{|Abb!O{vTBT;s8&u9o2+3yA2@*CU<$_l$kTMHI`h%7z#hum$Ec zgGBZD+OS$?;N(aCS&psA)Is8HUA=_+3<B8m&M#3`fNEJVzkU;Ww)=ccaUO+GvUupY zKKf-`d}7s{#mM$iQ0h4%b3Si!Cy;O|qhhLrFDzPrviprFY|LFp8bO_j|064)#OKXE zam>BR10bbb9`OXBie$2PWkWMvJt2Q|C~M>mr7^=p>*f_|q!udnBx~kpcZH=}AmH&2 z`M<(8U<UOIK+>1Vnb+*GvUs7B3ntfgSFL~{(9aI(><5y1-JUb&M-n0mIcd`U_!qk? zs0G*^(s0k-eqXyuX|Qdf;B9oS(dw%_EIOZ4$xl_0X4H>Q=KrSj)pzH#LiEO}R)B)G zHCGvnprV+OFg$SD;Ya;De9ih_cm+B^;OIie0^SmO2c}`Ku~+PzHA0zvG3vsFp0n_{ z|8fS2*N9T>2(SR;A>?T@MV3<fQEP9?|E{j<N!|kHRBD~J=3x2JJvhWbqjuFZvc&b+ zygT}h9;|<+%Ib4y-U28DNK=@hww1Dd2WNU6&I@;|Qhi#U3m67}?c&{oVb$-q1{&M# z^|9bvYPVuiee^_84J)Gn8NFAgBkkS%LnPz=UuIZ8N^;%dTaw_42J~1nnmHPi@aA8J zJ@?)A?k!g`9R1wMwcjKCpXZ5p{zd-R(eO<zoLgEojHJ7Lded)ebgnf{oRwgC>QBd4 z&@Z25*;xl6;r{e$q;UQQ0ltM)ShX!3p62>z?fD^+|BMPwuB%-)HszDUpFX@6dSAVC zFi<sQZ~U7tl-cl_R1NSfNSO4!n=EQYbLE=G(cLfDH)kIZEhe>eaCNlRxxnr-Y75VA zxjb*x<b$4(xcg4VZ|&*UxYjtIkt(jC4`P!g&zLj*J-6srs?;62XGll?4ZuW#9+tDU z5C=cTcloP1!j+~=yu;j^NveC0!IkzcC9U5N1@gYWb)1ejfb`sWC6!njUKBl-gO$Yc z(W{ctwgL;L87SP+1!-GBuye4q(7rLOA~t9En*sHVHV#toE_#oy$okLfpK+L|wJUgF zXAfhV{m(%0)D2L`+axh|)C*ph(7p8qImUDMfNEy?-J0z&EeoEE6uwx7eJ8-#(4cFa z$pz)ZYZp)8b+x&pYO+f#{<`%5cINp|<vJEV<&jwqd0M~K7m9F!D}znQsRG+uNwGSM zZ7@Q1<c=hXYlR-Wa2(uD9-ozNwqlY>qtm7@xEfAr?_etoNx>eMw*Og@QoJnJy|RZ$ zLNe>~3+`;Jro)Jq5de#!<Qa`oGjG-l&x7^U6O3f|@3-(=cS{&;oX}TBi`Hh1$9Wc0 zdjsnkSvHS}>nwotKS|gh9J`pb`MTdb4I8cXXWmm8-m81@0|-=#G>Jj2P7z9lUjZnn z0;gE+#|K%-5oXZVhfH78Uq972<PSc+6@`^O)f2AN1WYMBhntn(GWlRH(u3DJnRJN; zz$J?*!doQ;$Hunm^83gEq)A{6pLvq-%hu_-wjD!J7_+gp-c+w^q+Hf*nHJ<6@hz9S za%1uFfs5=KMtrzKUv<jaOoQQWlMlMOvu+Aruwt53;y8iY?-_qCE}|hOoN!^cggKhq zaMT!1@~{SR_+WJ4c)3OH=Vr_cb?N7S>~a?Q_Z*diicc0|D0N;PKXP`P1H0VJhxO|* zV^3R*3}IVd%Rde=5!+h9KlsB$At5tz?4iaiAk49z0B?~`vy)NTJ6J-pB!6^m83R+& zUZi^@6GF*&w~j5JpO(g_6P`&ynM^(RpMoIw@f#6Yvj}=gc|l<gY)zwXWzhoQ;4aRw z3PSD4L~nAy(@{~q{yD#s!GQ50Qx~riD-(Epee_<K-d;?AcES-<6&aUe%zM&KY-@am z$`*d=<+&8i5@}7V+Hdce8dRF3+%9oar*__*y+30_kzcec@<HgeT~S)Doo_FGr|brh z%Pu&;dSO5mIr;<Tphs%&_8gup>o=SG`skuf0&r~5_nydw0$HHzWOV&#^YD!|Oa#?o zMASnli7o;-nQEtCV&H^R(>Ji@1ajTTg=Nu2|Ir}mm+SFcDvnMkl@K55>wwb(^@>ux z+$R&y{yPwy^yudSqNM>>;xbS86VHjVVVbU|{kf_SDq*fIBb4<}yYqMN70Tv_Q{b?v zs%>?4(gUU2v@XzQNAASqQK^`NJHr6byS$T6AGz`1@P5IShC81m{98*)Dww1^cD`GH z!0dO0d2#h-*WLpE2`-yOy5!#|^~5sul(D#9PVv<2;?joho={!GiVOsaGja9l^q}&I zf+}H1*{)B1iKbveP`;G<@;!}#!W`+jb-PQ0eZSGcktwrXkn$}t@#)O*ff8C0=8c!% z6mrli-70SD!oGngQztf$IUx?ijFE5N%IO?hzkau%B@E_?n{>4pkvt@i{!eXC?J>(} z7^6z>;`40ht{PCZv|Ka)8@ayZxc`-wys#&%yL{MWbFjKkZJv+fgtE=$Ju=IT8)@Y1 zYdL$HdDitKg{Kr{>a6CV2xrmvpMyC)&u#&T_@<R8K8U)_@=DnEF<pOJQok_hqZ3NF zPO74l`fj^-N1UX_)?xMDrqpd<xla}xw?ClHA!FUy6jC>}Mh#`rx{xnaj>LGU4gn$l zu(LHG&uh(2vh>&R(ulBslU~~Aq_ue7fee0>3OJ3^bwqs5fwqk@>l&-~{U|uk=V`BY z!x*jDgsp6T&@ThmXaWq6)2(#GRsRtXlpH6>7y3U_n9Xhta&7<D4FT8SJR8ODYPx0X z$P?4{#DQ0=hN04Bzo2au10_Rb<v!QbL9K4|q*Y&M9CNby87gfjwUr#EVBO)Wk>?k@ z`xU42!M-fFXQmyv3nV@nvxzK6XRsmIWW_ff_ZB-L8#Cd<^o?F^o6Mh!9d{x!ab1>V zlvm&O*IfQ^1-WM(@cA-z6}9k!eBEu}MM-^AA+~3%qs_D34N8(A;sKBJ+^rt~`r6Hf zE7y@Ty4Lm_LML7NzCAPX#O8#g9t-h4y!=m(%&96$_t`&mWTDTKkRNY+;?Vd$>3_W` z_%=1gx~)%=L!e(Jm%Z!D3jx0*X6JWre{<FirV}}}aSMhdJe8#~<MFf5H;gaY%ZC9s zT8*hoQ+WcQ2dt~C*kZyhxLyAS_nT>*$%pX<<(NOJgxn%b5UP$Z4y`4%w%<}RZY69Q z@y4Z8vnP=a)X_^y4-L)-XaU$`X6vuZTc-z$mLW@Y|B`4`yaI7Tf>k9FMVdbq_Q6-! zexdCe+kc0Be4{##%PYDtVAaE0cfVRD+i+Hay*wbkMsT>;XU@db1GC!VPEb9$H7G?+ zW0+~GoML31Ue_*}&d6c6Y@vlRbeXuo=qmYaz3o;MwRt8_qou8vBnvVJ*+%t-<3jEG zX9>I=-Ge=(M0p<~{_DHAs_?GvQcpGG;#D$1$~@c=6wPmP$R{b!g(iFp4>4r*s^gqV z0daw5Geb+BV^De}n+K}=w1I0!*?sW?LG`zAfjE-;X3tY1NI_EPEVn<Wd~FaQBCF$} z(Eez7TY9>x<S;bS<;8ZIznzo|k8F8X4{{KVNGfHVds|EYJ@v_Rm;WME$LVU<{d|X@ zh&OlcdC%bjS0C{4XbH-kov^Wj-u7n+yey*?xkIF{_=Z4TSvA6B`Yl}O)BU=Z=hADr z?gx!UWkX<rFsz}h_N!Mtw%O@#$~cWeet1wch~V|-<%CAwDd4edwfF+Ydf5mP+glBI zMg<W6r`m;40R#ZBmKvft7O^~|SpetB4+*kd7Pj}+gh^A210IDlb_z`^QPB+2cHgNv zUP@cdi50dQJ;$+;r|zIWTO6Aie*V|fYds%9Z}l>5?L6}Qg4|l*#55kF@OqUXkMz`H zRV_hERT^AJHIL&|!eRMijGF}S?-z<wFRA}$R{Up;B_WA!y7+L8t2r;K{dBET#+}|s zv!=0x-i~HXAl-Y$(Xg49%Q85x974$xEH3QW+LYPP(ZXCPl9F*B72sD|^K<zu`?6oN zwl*p4w>g=ytf9bb#+M`~{n03mHG_ek<df&=A}THCwlhy*^K&s^EppbK6t|W<SX&MY zFN?^w>p`2ohl*z|xC`@4OH#zH3Ou2i(dO1ET_MOcza6(7;Sy2rejenF#4U0+AYCx3 z(6xR<W9_ZUAf`V_7udwA7x;SPz3zC=)`+nt8r;`vFUCvV<W7zVW=4y~gm@ENuSO5y zDYDCy)keb$r?eR}Z~T{qZEZ?kaz;u1o|!9~Pit$U6*di?*UvQS6o>V@YY!V#lpm|% zxwPbhv3Y%LT$Z;@-jJ}vvOW`bcj$bO$O)x;!?rY`RMrlO_^d;)opb}d-!l8Utp3Lb zHcy|1{$IwLS+PD^YkHFVk9jfsbq|x1<a(DeMPif7rh;3O9%v2eN4$8batUEhpWmT} zU!qzvcj_}IRorqJwDVq<nYBLe%j)&H5B((}yhpw5QUzFV%73>o1WbiT!dzdpT81c8 z!G<hD)c+@4YJP2{(YpuIEJiF>;R(wBzux1!okj4G9G%X-@s6}I>4zF?c7Yu8)FR<V zG)2$uCzA+PGaI}bvc&Sug4VS!q}oth5N1%Z7OQ11RU=I6d!NqkkyF{8Mr^zC@E$Hy z6Re(aBC9>*L2eerCV+ZW6)R)Ha->@(^eu9yHTqV)Z<vGi;{MloBU5g@ykAAFB}KPp zRQWkL2|TKDo7rtZu!)s)>kauL!**S)l8Pm+QYJ;I8rG6_3jcr7JURbZ%5zQ#NAI{c z!FJtJvA)Zain9d0W)kjW*3U{YUg7|UNTy<ctTsnEyx(n%dj(;S9OvE?1atu_Sx0LF ztW4)th%{5zog$0K{hW;(wdL3|BgyOio(es4Udg(0=#WnQ?)O=`6LphU+Hh6&A(s$j zyMtBlPRB!yNrvZc-l1?l9Ez(ma{(xZ#vRD~7ucB9#}!1W-jT`*{S3ZK3s|1=w>GYJ z!MXP}t)VLGf#M_6TiG7_uGS}|MfW<_%I6L5{L`6#06b`J2vE*uPRcZWQ6HwB<XJ8A zwXvxdvl{*9<jLK_mmf+!#k`F+C8(%;MO-nXIpJTFq#W3unhuU0sDH~cl^ob|vGt({ zO5ZbYP{dsWBT?{m!M&ntpVZ&{f5;HQNajm)d{iXK|DOQ8;tT7d7rVA`Mny`xALaVU zN>SeoFXil8g~+jps}P(R{~x;!S<^e~UjOIL=Ur`llGiQuGXswI3%r;S>e>Tx1ViF7 ztQM{34(g%4QdGy}-L`15029UG!9MQX$*qC(Y^FlpHW6(3VpdUylfkvOj*BC#3t#h! z#MBOi`eHM{24^DykhX71sdo$khr1rfdr8N$(U)iEWofHzKz2C5O3x8nl;S(oV+z+q z);0TNfZy#vCQ&klH;?k#yo|5M=+kTZCxU!7s%XF%EtbXOR@-GJR>Rj0Nfn6gRUGv3 zTw@m0^SpNHd~Dk>g%s39_yQoCTWX`7^Ex<iy^$(U*RL5{q*FB!w<kY#mv$iOzACG5 zpp{tv&c;VV@_+e?_slh4`5^QE=PTYL%zv!@@fH8OcMyrB6|sUDv|H;>)P`S38Z=0X zpPYfe7n99ot!B#&*!*TMc7(k90Z<q3PAYwc?P{1^fB;9}h{MuI^k`kd<PHGI#;E{V zviXko<oKbVYcEkcV&Qu@Z@(^w*Ll35+TKkah>K3Yq=e^Uc7?=Zp(|FIVSG_yz=9E` z^FKD51W!AQk*V!QSt(Z{l!!p5wxo+F&kplMJkh{O_j(r*N~dYg-tHN_6>DQ!+kBNr zab`v-DCxxidS>A~)IAk;_S9~A>s>R%)rsjUj|mV;@O*M&p@9J5`b-wo#J7DtmT#BP z($ii4Ag1|}kAZtDtS6~4jAR*<mzXeQefUxzu+?x!0=AlnC#I94!g{dd7y?;T)-_Ra zfS9ZF<8xN1rG%>Na<r(+z8LD<eGqEVQr~JQk~+z|s}|5WlAj=&-rtqG$_f@$R5?)w z8ZE}%?6OP|0C&vXQ|Td%WJPhMaWQLN9K_DH#z_X$6{_!jbPZcwCq}J%8CbJO7A77o zCWQL@Ythm3)$0n9IJjhM-IJO_7TV<9^MeIsuZak*M3Sz#YX27J&=R=Ok`>g4D7PO_ z47N%9I;e~PoX&Dm*W4mWnO6OOed%v5-JULc?xp(LH!_e(_R*9mR2MgA*u);J_qC}% zz72Zt(TEP2{mmxQth=vk%%(X-Ud$v#O^D=0cSmz^q6iyx6TET96>3&DyY&l`rr#$F zA>bepc`U9u$Dgjr@ezq1wGnA6>@9b&xbaa}j=5e%e_>RqcC22BrOC}gM{TaF4m$In zm;JTz_#SEF1vNN}RYCwhRwbIJB9)eX{G;a6X`&{|Zd?)V$bh|xT74`ObUo$2oV6#- zY=RvQr1TA`+iU{bP!=4G16ShdT3$m$Z(mD_E>bY27f1-OE?p%AN*`63&ggmfp|iao z>4;_Z?iTGE0yvATy*P3e;4S>lIZqOA84#XF=<P)S9`|*rR`C;`1u9%bWX89Je&X%Q z<wRbjp8pNWdaqp9p)S(PhSma8<slWz-@!v~O{@MU6fk}o3s@S7x~$_2%nKdTsX$aw z4Y{?1!trnMBCAbAvxvrpgMH%D`BBl}6XFKw`L~Osz=L+guCYI=t1cOE*0}30Wn4JM zjh;_am#4U6xXOUmy8`{j>Gqu+eKiHnMgO%ugta&Ve_7+=SGG9dC_VaA<a(}M=lLmz z2xMbfE!B3MKfPHp2^1BTy}nIB_E$!M12aK3cI||(9%pgQ^*N}yPe*<oL!Z5nmW&jk zl8;@11BE6#-X7U|$ct3|Dkn9gB*D56ujk^2{>z8Z2_j<`KP%~Rz?0)<D8%=%b*IP- zeU@KlNnJvHF(J~YtJ!-^I*{Y;phw2G)MbFRrr&j;6(}nMZ^8F3Y9NNy*p<-%ENP<; z9hk1<y|{OwCD&Czeiev;nt8dm^xf~)j+Y-lEURBH>g|SoY^>!iyQ^GO^uz6E_l3}p z$jm^^a9T}0%VNfjV#u15R&krZ?XEk|p^0}lYm%LUE#;$`Vjl0m)!F4$C>brL4VQ@4 zHd76s1Af*jEh|OcZGLtCbl+ce?z_+w`}5V7hh)X@a9)Vvnq502N$Mnq$;VEk%+mJ8 zNZlT7CG><b_3|@l$pHXZvx;jk7T)tYjIe6}cb@Yq)No)oU@FJwIoS^;!pn!(Yx1Tv zP`Ab5{JQ+Eav$|e5~s8J_8Z}<{TlwojN)wN72e2TP6^$qs_UXM0;R^<1bxHH7nY7` z+NhN3uI-C(-U&hFQNq#(Hf;5mP5QzKL|!N(z3hZVtc?QxgJ$T1D}Q~eN^A140$YDt zS0$pv3o?`K{I-VC1zcS&yI{ckLB`AHAS~_I^$Pb{hBiDQ8G^J0Jh(2ZCrBk>mGhMV zi(Fu0XS8T-iPemYXyk-;LndwhTIY7$t}5~D?!A*JSt$LYtj6}t-9~VYMMRK}2=1=n z95GC8caEwuSo||=N{^aW{zFne`BQPz-#D@lM7@@x#}CSpzynMb>4>yrM`dYQUSx>@ z&rVgAmGny(`NiRQLNDLQ^`c4F_?K0n!Ddp1rTKWhr4quI_$V1t=WprUn?Bx3XF=dA z{H_9Ukmc`rBjpnN>DcVj`p)MqS#5ingPd|GzgsvN0`&*5&R=Kbbw+j{3vN`>tb9^G zK6BaHTr&Mt#4xJ{iV3K*s%<oXq`DK5jUV(xQSEwUqRI<hmNjOAr$U1hzC`?@*@osl zXlhziX>gs69GF-;H(^9))EjdjcKI?cjRF3WosP|Uvw(6PRLXC=NlzEeD`O#alkcwI zw8X4E7LbBe;D9f`b-3)+Eb-lk_0al_sLwlUBkWRSpM4HSpzp5+;FH8xlPdZ|<#v%d zQRd%Eg^9c*LGWEmAsYh=f^(pX4^;1RCJkmj^mnxpwYWCrGe;JMOt^o8ySd;Ho|mw{ z|2+X-Hg2r4uwrLsDjd_S5sZChSLjoeq25AYMn|_-a#7^f_L3DQ&|(KzZ<<Z-fjTnM zYE0(U%z^qzEt)|pW$E?a-j<yVW6Nfk5@K(mTq$&V1Hc}osny06V^3!-y<N3K2QjBL z6}kj%vN=P2ioUgf(nu$2otsRhkECDUI$CWT{@0eJf98zNxBn_HleC3JF&{WDwrT;O zdJ=kvMyPW5c&~Oa74Y}BFb^}80##~%@QWq@Y2D1~k4vZK3e0;<>B4l&LEWJPP|YjN z$=^GSGn;z(i*0;7u2P)~u_<wRUq88~Tqe5o2{+onOrV_xiq~AG)mZl=L8W5m?-zCQ z9DBh%<VO=vgjd<>I$im1Ya%cNJD=g-rjYEuI}#Pob_afz*jyh3Wk*cN*vAfS9?fa) zs6NQ{=O~+D9&Z+@mHxCa=APhxY?c+vOMW#(?;ASk($U9g4eg{TGoAAk(NKTebuFjj zm|PY_vDRuTS%ysIY#HDu4N3!qJZ~TS{ty;bqhSwgnYEpcE8m_rC&XqAP3Nk6#X`pJ znsOgTJq?g0coZ<pDB^UW)tc{}>q`DSHpFib&hdN5#7<wWYKO<S*8cs=E{VXZR;Cg@ zp+p;g*v=04`xpEs+2^Whq%y3H@a$Q+v=NW|^aYK^fC@}(1U5sg>)##!kfh(}`oMOo z_NU2TV%`4kRV#2hNwmAKr#Y}~EVF$5**^!#zs>(!is@j`9Rh~-n*2A8*EO~vrks^F zqnv=r#hGKqTP!MX2g?0lDueF2CsW;GmX83FJ7p5)TB!I1zWc2f(VPQMc7Upjb%=lX z)`4)RbGN6Kc<hj4;9A~!T70D&2VM@fG9z^jbm6h+gpzZnjv=T!-4c`I|2X<Rp*R4k zlQhO0Rle}FqRU>8qXWNM{35jo{;4t?0SMZw8SZG?t#0VXS{zp7wdz%Y!KYDeAj%<+ zLrp)}TC>o9yiKme!=Yo?=X+C7%G8DB5N5f4qvx(KQH~W)hMvAK^KPQxIP>8|*s~{s z&w!$W5>G^Z0EUseSwzv>cs1b&Q*_q%v`bNR*I>Z29<bJYitV1J>wfj_RHgwYH1%P` zEq-`X!*H%5jmB|RS!!;?x%`35ZZAM9cF-=*bshf|0R)!FcJxX_{C<1PIAY}8{M7f4 zp7z{Ts+gL?4X>xDeYdn#<R3K<72J1nrBCJ?kckEoQKKZ+?j6Zl3YkwgvZikQl-FCB z__$WwT$k?Sr`1AfNFJm1m5af0T}xu+ntFUO0jS3=ZV<(c+|mI&V{}{PPly?zpW*2X zPs7KAj2mhK<LEQeO!MS?o`n677q<T=MI#d~Pko_iPG&Ye9Ziu5Ujt-CWKPC$xB(Dl z-_DN(NEEiee=4$4EvTpVXT|wECTD*(Ti?STNMTjvKVHSd3KU)~uOBX=j}}%9M&tnN z1YcQ@a}8@nHM-H`IuRoht5&f#4kTi398o-T-Yf&q@KwAU9H^}FRt;lfEI3eNUG&(R z0|xPx$?C+sP19xnFIt!w4vqv++<0);CB-JcGHF~5vckUowoSz6uU7XS?z7d|qUFPb z^G+b4g0E04sO5@hr%f<Bh?iv<^II*|$6&bQU@4&_d~FEkILH<c0}6j2QIV&pHB?2r zUMkN3^><@CgGG<>$vF6&W?*tnDRQN;JEywImq^w55go+3G#s=&)f~GVt{|)u;${RC z&UjRN?i)3;`EMjT>W2^72aZdq(#Hd){`K9#`q=fdWP8efW~~Y5X0w5*lbE@r@#Gzk zZ_M#)^N4|YAY*c=&bJwG(s`b`fcu?aFKKy!VC3)a@}qY{>z1%tkLj10&t{K*_%9Gj z`i|Ec3^a!=!bno*HpGpFbJoI;Zyydk&kd?&l9a20w$8k0$(c4W;c;X-=?;qDYjcC9 zi#6*Dv#!x)3PQYH$xuN4hUHGxqVyuT?6Np<W})U%G!~k(>F!SpHiD0zry30_sngMz zY6tn#MkAQMK#z$jjd@!R{hrd(I$!R4mLoUjJ4L7Nc%5Xla%?)UZp?RsQ?tJ!26F;* zERC}kJ9!h81JBvO`?QHVs4mw}N6r?1UF`(yyr$(sV{1Ye)j0Ni(4q@eXVaW*!|vH1 zzwXlv`c6>K8^PI?8Ok{YCm7z@_}lBY$#y28g#+JANFsIBXkfbhf4tk&$<KecFKj%r zWVkf!Y*ND&U2Y2KIooI#zqO-+O%;r&@m!fP_*-sv!keO0S_5^ol}J7smxR1mLW{DZ zt@9Wc2=8SwO{?xu2mf_l-c?oYtAZ>Ix&NOW6z?OASanHONUatc_2I+7{H4wnkIQ3> zpy7;psTb5ImW5}3U0E!1biYcNX<2h}$L|YeUz$mDrC79Gwk5iSt$C$$$4C6nG_3g= zQdI8Y>$5Y*;O#A_Ypdb~=hM#|{Na|ZZZQx~beu_~Z9Vb*x*H*_oAii>5N`in?XkTt zvH!xxLJQ!C)ZS`S2~1AWGl6B=_`Bsgk4`N-R595rM=N|Zv2pc6wB@!J$uCFMx{TT1 z`!s$zXR=?eQFv8{16#zLnAFUg2AlLf#`8s$sRFk9{mave8-uLd8`Il4;-SxvpgG*< zGWYhx=zfRMIqyUrHJ@+0Um{L-mnYngN-l_6`9<f^OlZ)#Nd&6s!e<m3oYp|jT0X(4 zep~o*NDHIh%n8NZcF4OI6SGz^v34{=MfaKrwjJGjjuWGT&2HLlXlGRWy&ThU+d!qD z+LmdZefiANqRu6A1G<SWQ1egU2<?Q9K0cxpIQ3@!0&Q4Y*=Aon3bAzjg{|k$R6;wR z;V7XcSdXU^xsffoF~0_N(=8%x^F7U*|7e^_#dL+2`CpUPK|@b^SPYO^(_XhY08(oe z;DHhzRX4PftC`O(Xj<FFbV_s!rZ&NHU*-JgR~)nNTI@-6f&?6_HJTKt@zE@aq;*~w z?UI7K=dQ!@>uN5h!Le%CF(ujO=a6xkEZJb#`tLur?*64pJB3Nf1$7?M)i6fUm3n~R zA`fiR3790$#d-GqJ{V(OkIlTK@oM@dbojSk{77Oi&@qCrl8JHN(`Eo9s+orNG|!$} z3)zTOQsGCfPn1AhB0qqbh0QA)Fa`&cQzm)Oi0m9g*r%H#2?tu-t<mw*S!mx}%g|y% z)zQT+qw%$?suIy>8Ju-$H#2=1vB$`at`=W`h}N@nlVZAnUBA%Zs>p!dp7qjZ>|;8* zzzb$<JgIdB(%bHMD#J*|)9ow9o6jNhURLIY|NYA_s!!?xo|&!Xdn<+K%_erqTJ7om z0>)gC5VVf}Q_Q0lmcqm41E@YKhX?rI0RLFE{O7utf2x?j2D*i1WKNjq>$h#xBhLEP zGNEc;e`GiAhHWJ0v)rwlDX5v5m(yHE4Rv1qFAGu)zjVo*&CKpzl%W0MKBXepxjr=P zI8F@{OMsoK{1w~4CAo4@Z~3#8g51*4nTQJJc1)ni|Gnb+*_}D~f@QdqY1s{~jTgp+ zcdHq|h#ne@(dPUO9Ns=pcQ`<%PkW^+j-V{s?j=<W({c23hAq4O!0MkP))Ual3xxr6 znazuj6i8T;(i5A{WL*VR#OPI(g?X!NuZm`3KBxsC%EO!Gx(kw36Qi!#x`jhK!CZ~n zVluaXiXIfP>t$0?%I9tpW)w~$@dTRE`<N>*!fw3dk{6ugVugBXF?t}G`n4#;h#D}H z=7XQ?#~5$AW?Sm|94+jP##5PxSoq#l8@il~eOcGqF0q)7ZDkHqNtx_kvDEEH5*^I` zKkc07S5sTJ#!(MPnv?^mh#Hlupr|Mi0*TZpAc!Cxq-j7(D1nFsqT&HWih_u=P$C@( ziV8>xNRtvmY$#P~AanwxCvWh0?j85j{d~u`|G?T~%)QrKb3g0%JXdeHV1~309XUOD ze}!;*le%24lHIHrJ~zdg)vVSw#qE{uQG)TD_%<3w?~D1ukjs6Vr1$h14|y0@4eVGU zyVg3*_H_bl#%IPx<zz5@i4#H`st+41^#MfOeOesqf_)NAyO8J7x_KK(N+aaW0Wwia zM!dHz_Urbd=@V)=Et(#*XtRnB8di<F4p^!EjYgot?Ke@^zcge|H7%(OUNPbKXPw~; z1psc0cNEYrJ;++$Bp9{v7@Dcvd1uJDL+sHO(gcgYlcn|%U?Y!%x1P0|j!rM0d>*^L z7C<1Ua-GL`sXO`;w0(<ed30b`LhmPXT%?LQ-$dK&Ky7vgKQ29?6|WI5v3DEZEld+5 zF4_O!rtBfDY&z<^+IXv-Q$|A!8((1rTw97H)GJciz8|NdwpP(v*KZ|trc@P3kMg~z zi`W=IGnsq*)B9+E9TK5k;){FebxA_0LZy16h!&l4C5+}f6&x8B{8y(b;~X74-Zhq( z9zFuG!H+d^rml8<neQ#O%EymuEe|B0VScir#Jr2jgHsCmV|p$E(l*Tb1Zbj2o{rjl zzY*i0PtK=LhLR#H>@n98E)u<J@LLBP2Oue(tI{4iWX77#<bkBc2I%O*1I+MPma@V( z3JdC~(c3FVwLM}fqr7bkYMgjm`o&(&BnY8ne?6M({fV09_mST?eJGlo@S`cKEb`J{ zb91W^dxppV?T}HSfkvC`ceA0Fcqak=00u-YcED`S+e;UdG4k+cxG(7ISxz8=YlXm7 zX=hdxaxaiJPzx`C6((<P^EHrMyGyaRelqcKeneJMmn)l{Edu-Y*&tVc^fmRxSl*8l z@`n4{Z+s^_$L|*RK8xKljPk1iJ}fe{ak^1553%Xqpk8)P&wr+!d3K28Bl{`bN;irZ zabhGOC7-x^Ec-qSMoG*uEB0`qEbaA%$F3-^jD1P#sIRq2Z1&3o&?kIP?c9Xo7Aq!g zi(@N$V10HjJZgiJmYKd*<M`IWgze&Sr9A{#KK{vde`49o98`$lgxBz8q4SvQVVzIr z<*-#~5M^PP6UrK$FReJ^P4H~+2SO~!72*IxpP~s&tLYLOSh|oLh+Cnt<-&Plx9Y|- zP(tAddPD5eRJ{DMuhy}gCV2GLUJD}z{dX1Jx2tIS*(?m>*z4S8CY8W9yDNc(!cq$k zHdNglVb|ijr*a^bU!nMg)&m^Nl9Ja)+dVYz_Eu+~K}(!VliSll;C+z1OBPL|=l2Bk z{E(xL$pIkZ*8VI>CaM94U(Vb8w^@7JLDTl2$o0G9uEc&V5p-(UsW!e;N`W+V;~FWV zulkeh$7Mg5(~~~Vy(u|ICn|uY?#R7790D>1)JefgiZk(qL~DYh>kj_^#;rnC&RThS zgba=ER}-y>cB*N8P@AJC6mb9$+Sarzgy1F?qL~Que(Gf?RCTaA1~}Py2nHwcYTs5j z4>I5p#MFEItr%F8yao;)B1NF0l@<5cPe0L#Fmt^giB;LzXeV8^mA<aR<fLVskfCfv zo_D~mD9dMS;4GtWMm<|I2(I!{0OE3oE(6p137V%PZ$^cg7hgVaF{=9$=m<ANaGT?3 zrmvPrn-Tn3b;eTUh~mwf0CIlQjo9I|HWU(|AMt|wv4GX66G1sXF%7HM#rEJ&m1+PA zl-Z`9Z@4}(Kgc9{^s$j?JwO79a@0#{K*fHpQ4^glhpp_rI_P1n-!W}L2vJYZs&qt8 z@^Ad%wrGa(OPNlRhw1aNk3Q^<8+C(+42XHw8&(igs^0iRB35DG{9+K%eCmD;Qi6+r zDadvs<7YVPavPQ3VQOVef7eXC=2lU>XN);YfIqIl`@=kj$}8h1EM5$$Xp)O4G(N;( zjF)(u+EN-aTkqp60P^g2r!(O4e(fW7f8=1&qegBM$}o`ExV|nAYUbLoKkD7+${6C| z=lhicszcN6<KD>KI8mTmY=gE@1d?{kj5dAh46^{Ll=U2FQ%UrG^Fh(Q+!Dl?Ph`6X zg6doIldL06S0fOjU@4{^k)>^?@2&m^cRInaPm@Y}jX6X4SyG+a-dm&)Tt6wZXA!=a zdc|qJ7#cUsU^yfeTUDhv0?5RRESO3yeHfSG_x*{EMv`9t7&!C4dUCWROZAFcW@b1@ zqU|q`EwSxelx35uak_K{|3VwAo+D!`w(O2R<yyz6c1B*w{{FU?hPQ~19@p9DexzSE zOHbtvAA3`{g@}hARTj33ZDWECz*{o+=-Sj-6ZY715<EB33i_@KALumZOE|eD6+UwM zB;Uh5M}?b+v{%}&4ITEv6nm@Q=32llzckz-Y!O4lt2ofBNd=im0?8hR&h$WK11_S# zxw$Xnq-Ny8)*+&S&qjoV1~B)C<{l#aQ;wb|<Q0MeWGe(7OzfvgB5MP?xqA)vg><%W z7U1j>rsqz-oK}<$Bk>z+9hn$hzZ_&T2I;Z`K%qpx?<Al`((4q?;u1?t`9Kf(_t1HP zHCGHX0ptarPkW>D;7LjJ|J2`Ji&R#byo^SK-t6!FA^UYj1O2_(0FUc>-X}1Xl?AX> zGC@B5CB4a4?1Oe+x-VPdv}$SPkmeXCN*rWmA&G!soqChGuMHZv7t&v(hRg*I2<3u2 z(9NpY$mO2F_6j~R5b%D_Li-oML+y0r^v>*ez)`VdP59=Wp6SMZ<Znw7g0gliNBBlM z(8bYx4YNsZb$MlC*dJTXOcb)2R&2YSjbWwk>UJ_b?CGF__)UAa^R8}xPNL41-O;7U z6@50w?1Ci34X3dpXzi)GUrSk=n8n=0Z_-%g!s?fd#_n$5&#^@V{Ltc4jG`r^1WYek zFBA+so3AmlDK>!FK{TJJg8h*PZQ~jXeaD2f?aCn=frgEd?NLv6MulAR06=4FoQtvv zf9LVdcGu1Y3%rl>4)Ju{rwRw{c${)lWW;Poia0*UyAb{@5;eTY>6T^RmazF_ycM;u zz?O64ZJaEmqUcN=-8*h=TWeW>f)v)`p`T*2yx}aO5~mh*H)@(yxu34tU+_rgkwR7P z>I9#bKwnd%F`o*%egp=e#nsgndIoLZ*RNKz-0{lO&R%fse7=z%wM{rU^I~!UU-*8# zF-^m5hqvpxA&NNgS-O0AeWEew>T}{a%l4#f`Zn8{1F#;m>g%t#qjXcyG9hGcjmNEc zM!gJAmLCNLyDi1sJ}=wyl>+j)+E`Z8;@=n&UKWkKWzM#H`b6f{&gJXE?Pdwzp5^7j zSo|-))UK)`WcPgM@sA8p$CGhrz(D*v{RHqzC|qRn0hgosLpeQ0pJpBr(NJ9=-Pkcx z6dJgvhhvV-Qg5leTbG;ISvNSbHQhYsy5SvGP9n^0c@z7@*Kh3G^gViNVfCE4<0#>L z#-}Zf#U|h8xAAYwOYmjJ!1+ISF+aFk@s^H16GOO(aOMW$Q1N+CreGw-=$LNu{dcf< zGUGxaXcBA*j?7itn7UYjgs3Ifud49n7L3u=Lq{g(6V(4K$tb1Pm>4)8FT@&E#h%E_ zaBx~;>bDN6*tbmSTWqE|+~&W#a(vihD(oZYa~$_usOo*dp(dOMD}s<>HDLEw?|4=X zl5;sKrxjtuVEjIHy}OUVI*#N8XQl1*%pFo-o<GhemBDcu*Tj}f_qPJ9^g!wl6pgOM zv~B1W92;z0^_E0ah1K~Ead%Rcl~t*$Js-(v&|m=y7t*o-B#Y$IWVOqv`T7z4@5J3a zo5sZD?XWEKwYS|$%`M&c`c62TNrNsnmNg^}85H_0Sqw839RJBg`9*3V(>f^KcNAu= zK`K_Fq5bcLPpG^hDnJSYQVNNzk?fl;lpoRMuiC!wLe?vJaQm5nuj^x2qb(x3Z`4CR z&`O-WJcyr}SzBJ}?s}>37(H-GYY7=_ni?^nZH5*KgD0ejr75m(zWH%4-1)pCYGO;5 zw<NdGD8nR4G0CJLh*a!tjD+HQh2^Q~n!);G%%{PrQh~a|wR4^8kM*e0mp*sJ=TZjp zIR4fHb_sKHl3mSAY;Iq5P^e)xgEcL3r!h_~VZ|N1iR6k^pqcwf5nvI66miI4wZV1j z)W(^-rd_$M#zu^P=SKHSXjlgrJjLe{wM{lvGW!eO2XXLSycA+KL+};jS1O;F(QiCG zL*4_Oj&!SkpFQPw=S_}LZt-DxKK@}r1`kWjsOdn@1TAbvVI*k&nl3pDh8a#73M(ge zhkqU~?d%n37VLh*Y`cFrUh$MT`g?<_TT<|&q({Rf$UW5{L}I1w*{13&!otxiKGD3Z ztW@o`k^d-%H_PKOEp27xB_H?HRgE*{%2b+#)Acph4Wi2g2RajTUP3m2{lJ7B=N`@e zdgce~ZBqZ?a;poysT*}HSDMoI^ekOC3aqtZl`ox~{6tCNMM!)FlM?n0QhnM5&8PF} zbzdwpQL{R`B~SKi%^ACVJP9vX#L4eHNB3#3M0PCY&bv_KRgCX(g%KY}XDAz|9e~yP ziwS}rUWgMxHoNv`+>@N)C(bBqXk(U*&txdwbuPnG^<eUE&hC1aG`vc<2REqY=ThWd zaL~~m5X9Q-$d8+x`U-mFvVT|nL6|(Eprm-#P#pX4*ZTLaJpS)YLSXPeVtdOG$%p^g z4g~)EHyuadw9x+|%l|eW2nfVnQ2cGJ-2cb1|6lU|Y%L}Adzn0e=Rr$J<_faE?mjP> LSQ=Luy5Ii~gBQ$% diff --git a/docs/resources/packerResourceGroup.png b/docs/resources/packerResourceGroup.png deleted file mode 100644 index e06c535174a70d4eed2b1e3af8a1825ec9d24f56..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 71149 zcmcG$XIK+o`1gruL_t6yfC2$5bSWaeBOPfW^cE12W++0C9t}T1KtZJ=p@bG{klrJr zqV(Q^ROtki4k56E|J{AF&-LuS*|{z*CSjO4=ggUN?)&@woQX0v)TXCpr=_BzqSw{Y zFrlKl0HdNhuX5=k@C~FIqYV5y=WC+<fU2yAa|QTt!9~qLjf(119Nn=a2>5*2TgS?m zii(x@?B|@W$(=t`RHu2m8fvBi_UpfB(!mRq_P<NumFCx3)Mzjr&m+~luV?Rmjec|) z+y5@>R?>xX2i;HEj~>OfI)L9qT@%jw9{&2kLN8aC_BFK-PV!tKc0Y5|cbn6<ZGEa| zmq=*}>|XQF#9(SFJCz9(CBn~+o}M1578YUigIb_Cz;@MH>{RT3c1={p&&o(e#d8rY z_&;CWyQ+Wg-`?w&4rjHdqEfwbR^_wp5l;&Bzn!b+TfzT!UR=MF|8Ixt>;Ljpx=z~M zp;duPnCD%X=Tj@SR6qQTR47$}r0UV*;Kbf>mrTTyo^-de<~?h|SxE$fFTjj%;=(1L zZ`f8o{`o;E{}mluS~5IrJpK7p;K?NJuA%(Oo$XozrMqc=DtIv`PPqeRpmH#Cp18N1 z6E_j~&OTP<Bw%|JbxQ2YRGDs>3L;Ght%>-KJ0~CdCg5+!%6?J&`<400R8yconN`gG z=~U>xo$sK5OsaLY`=Rey)uTwi8jx$#<l64<Z#gJ7ydKk``_*uJ8Lz3QHD1#jwX9_w zEh74FJquE~NAS}13N=TiuLh48ly;0OJw`<<ojX|xQrn!~pU*A+jyIAPHZKuBrEH=o zBhiKGkqr43c>5<E34%58z~)qNN+z7%x3aQY{L{u*8)s2$-rbdQuMNd2R20srJa)Wd zgpwc}4deAGN4tmuGtAm$X1+1Q-3WRP{q8g=(h^z%H#B}S7bAA;k|ViGB930Xa`HD0 zbs$o>HufneaQ##J`cg+RzGbzRbqEhv*>0Ss^b8eS^uFPc>3PGgGIddShimg!V{IWc zCn8ljv_a*0h;=Mlinc;XomUi*S+ToE^itXWLMN7jI@!*Yeuq7kF_c>X`wl_1Q{{XY zQ@jY25!Bg}P+nlttq*ls;a53~lAHaHS$})6n?y2QH*3x>3@sYH-1yrcma`_9Kbu81 z=yp1q*fSM)H&A3I+-P44BfjjIZQN|Bv=Z<%(O&8h#!Fh*`n<Ag^e?TSLDT(sjGF=L z9ByZxK9zsI@f1$TJlQGOlR73(pL)V!$TF|yU31?axuvn5HTcOE+xD;p{IFL`GoMF) zFyEkCnY=z<3(g(2ALpk{T9HEiX{8}~ocy>Qm(nRln7rtp=xA=g>4-p`o>00ORgN7Z z7`Z(+TF4v6y{R#x4L?qX1IaP)<1hc}c(v3NEofG3E)@y!PoaD%$%@Dk8+Zl%lY4^S zkQruFnezGx+fJ!O1Xs7kZrd=C7e9I(+k7vB6SGPE{@Kq4#QJ)b_R~pMcGt%Ty)-p* zMwen0HpGGZcpvD=_<G77G5$%U;OnjR%HFhv&SbI(u1nI^=;gMBec-nzw?Uy>Klv9A zmojTp1^F`qu+!Ex;4zQ!ioC#6%6@m1+u-rYuLRv3Uy0$*D!>hqu!y38?PyxJ(m6-g z&3sFf^5`OZ5fJV9{1v?~Bgd{JSo7~0rM$%M$%lp^?wd=ZZpE;QRIK^BO-wK#;%Xie zBRh1F(vqennlY?lbV6w!W%b`VpZ&PG#};Pr<8C`wa0&gB(<PPDzc#ccRO+YPeyc-2 zy##GaZEB^1N!7`RKqZco(BL7PYWKuKyT%&1tsl23=0L$5jCk4g``O$KJT1HTr%_%f z`-IcfLRbOo57x^Q#hy;EO*987msn^l!qSb;R*lNY*)3d*7{QaSB9e*UKV<prH(1BI zE93UUO(v?9hiUq9efEn^v)i$*T`lf(xQr-jP?_=k*C^(0D;LZ{FN*<z%A<)O{AYQj zK>kwH2wMUMgHVtza?Bn&=0POy86Yp%_8XUKONp5l^V|*KENeM(w_#Kx=D<-#3M5HX z*&NLMBu?dId7212NO2{`vm}~+<f7Xsu&05<XHwQ(PHY=BA#Ak_7U4JbNkS#Xh=&>$ zy#0!^#qo8;Wv&W|v-g7co;Df|b3*MRvw$9&{A3_k_i*WbETKnpxc1VMNL^^pu&Jw3 zkw;GK>U^BaM(uaDCfdXr?Nnjzu!HPhhAfrz1BVAgFr#s&oc3QHIHznUCe8M$^5XI3 zu}0sC%bv+~PF#v?JN8_XuJ1ydaOkyuIV3P-u>_R**;uJSm;BOwwI=`4u|68!s_vON zEb)cmTgN^*k;F5(l!C?%rRukBGK-58wpI!<`MM-c$V-_hPj*RHhb4=o)YV&*HTY@t zBzGXt`?^c4DsQPg+)2+?kDQ>;wM6dTU^gqbCg%5EBdLQ$jN;r<K1?yk?)BQK=`7_= z2?tF!^BrBOn~mT&uFrWj{oK=rC4gPr;e`qt&<})Sn1oe}yW*q~69@ZmD08J^nQJ4Z z+dy|p(gnuWj}0zxkG-<duU>BpfZ^5vc&22m%!<;uM@l5?8@JGWY8{3?@T^@;`07xh z)9EVPz?|_t&Ad0o-ivQ#rd(0orUj}_e^^wDO!D-?BGn*WGvfR#&rBm>E5C(uafTgh zc!DSET}uaoU-9Rh)yU;e|936xaqLnZ$48@t8Y_0%4A;<jek19R(g+FCM0MvWHUmdh zTC>E6Ita(WtA!JO&I^=dk1kG#His4YW{Z*GC`vWycOgS}g>xtEdW-^t5IA_FerbZI zyNyxhX|3IMz6oO+OO{=OpWBy5_3}?TL<d@$|9<BP^T=2$YwS5*lp)+xc)n3};~H(z zvirT&>nqm<ZtJ#I^B~R5-oP*%$g!%-VhemtyXsPeymxGD>gtQSxrEiK)!hO4oiqX2 zJj9^SW$uqP2;zi(A<$vRyhL=`&G7Z|Rjuf>GGpA7jl6Ua<`k&igj138%H&9m@=l+6 z&B>3BMB(oHy^2oZYVxPge0>ow)G>AzlV;?5&wlHW?T6)ZVyjM8>k6GpDT9A431Q6` z6$YezHAX&mb&@qv!7K4*mUGc^`JN3K@3huq0ou@dbKQ|{a<#heDt+_!qxF9B%+8=u z?XH-ga{Y@UoOHw;;m<`*cm_h!QY?lj3RwcKJ?LMKe7ZX|th^Rlux+{YvZBDxHs)5{ zX^{%n*?sIyk4JOaTXw06cB^rSJEPu0y3e*iT?l1&l-PR%RN^-!Adt1Nrr7V2tiZM- zSH_dKA-t_aF4_-|joX8fNW|LOw&!4dvln;Xd;V$|Ck^`gP3~|FFGXLN_QlEzyQKR> z1a5cBY@hclqbl9g&J1to^nIf=?YH3(yu-CIkQWnb6hUW>I$TKJt7qT4al*;$Yz}!o z=_7qTXTN5Cq;S-J_oH9W%5K2lZ)~J{gJk_RBI=ZaxJD936e#;j9UElYwfdTEeuF6Z zkBzbdJwH)93IyAE<-ggyU$c8{hZhPt2NK7cDjWyE_R}5nSJfbtBy49<Mcnw(XNG+1 z$eivtV(mnhUP_HR#)%?SB-Y5jmm}7;dKDZg-=W80(QW{lEiP;5@V~Re3x_CE9yB3{ z(!_gE8eIs7Hl`E^Vm_(>QNf;tA&6^75jn(S+&>luq5^|2nNX?1C(ORWAoP^2k|no+ zWFMpe_~|>GgWmqeF9ek)J~4@9y{R}H2~1pLp(dZT2w@&7RZo$zRkny^d7ss%bqqzZ z;qtqy0<PS<F?H0I6LF?=G5JjT^#^k?2!0)i3#oP+n7Jpp=t_-V-5##*mtIR*J*aPx zo69I*NLw6k*zxf7RvGTU?7v#&6@*zGDfL);xja@k`VcjIdHAr5Wbv6l<Y_dsK2*C> zH=eIXz2reDZHJr6u%JIaIW~&gf%dNJ4ePi)ZHO82z*hV-Dbn3s;Glr&!{Tr*!zZ+d zyde$5@7=G+I#W)|UNgHZ&ly->DR{A@4+UGK(#Y2$J?m7X?R}B%yIkfpmKf_=v7oms zoPFen<eaS6u>{zpL$tCASaImnkjGpP1ap6NXN}YNvnu|*e5X(SuE2ebrT%iqwso@I zT3>^G&<by`;Yt&fN2ArUpxpO+cg~Bb9**W70)^zY-OGXLl~0o2JDMDj!~3eAV`<Kp zf9|JmcEwsvPDvXdQ=|UvKbEh3a-0m&7gi1ge&jhsEW%Xv)UGR8oa5L}&E7UsGocW2 zk@ZxWbWfMv)o3pjzAHhGO|TjSF#=^$wcHeTE~y(eZiiLdBv|F>vw>`OQhIEfQMMPO zr<Pi&(nkvCvwIOBQ&U@uOvpycitK8o898tM+LeK2TZqKt*N8ZI3%hq$&bsHrDEe)m zUFcBZWP{X^#P=d!Y!E+EQj!0g@OG|VTd1j#W*bWKia<0FB=CC%$2^2cgY+eB`HTAU z!wyHq%8z)>ApzRz4nvoX`T6t_tEM;@i+=ZLG734iD_jz`@a7>V-o~^3oBx;U=2_}D zdQukJ+VH(ykc$4c$FEgm+&nlp_HBj5&`V+ZWZP#^kf5B{WNNM0J<V}Cy-o`nfmJEv zc58?(=$I4q#!r)pUQXbR{B)2A`0-^IYFYQucZ|pmJqc&{QnLIPC_XZ{d8pr9wM=}1 z5wt96%6B{wGm<@DY*-_|>QlIl-?#L+-@*x60?QgN$^2+u?C3K2EOuO%la(w#5Y&r< z*_kAyX1{=%E=EzGlaKA7HR-FA1^?*_!YbcRpkzHHXb*Gg`uE7nXR`bm^3D*T?OCZ4 z5&$oa2~y2cv;7o^F*s+}A8g)w)%nWBX$5wzyr&OH+6Pi2OSQ_8epCEMSB8U4I@bpa z;-=HI;{;#i-em!K?AROknPs}sx(l?4tomwXvZd|FU1ebM2n&@q$J_t%BTWo@i5wjI z5fQb#iWWe=VtkkoaL$^ZO-Dn@kO?HO7fmg_D_ZxHP+RbrXaQdBTTbr7iA~3HjlRp2 z1<_Y4A}<WB_#`Z3!B^p-yJiGlByH~Us2xaYCnm_$#Tr9}jEJZ2H@>O^(L~O*?a&2Q z%)g_h+$w`d{>pvB3^LkTYYKB@q|r|h^qqN0GeOcDf<l*cd(D<Q5w#p)Bjt|jWSMKo zh@ouLtD@JxMq%IF03mkhkh;(%({r%`?Cja_wRmJ2gcKQeXu&U@P6Fo|)>SZK?WZg9 zoo*mAiUy0juF_AxUe!@33oqV(AK{q*#?W;f0SU8|vz<V2u53HBm4W_dG<H8N*2ol- z@p$P?&VHb{4ZnW7q1Ek<8Q~aVB91Fwq9cKlo%M;YxwiT(ZG;vyKeFNrQ@;n;Y`q3f z2=h<L=(%ZkQ(qkewl&AFm%`#!wk4u_WSoUH`}bVyV$oKy%56J`xp!Hq&(h+RJX6uP z=|8^v)TWhgHa~v$T*IX-;erUNjai)%oM!~jpd)`MiEWY>W0$_FiBS(twP1~jxa^9H zb9ea9P4>NfTU12r9W4B1;(M$Edf+4{3~J$G6Sp=x;qdmQIMNWvDqGrHG$1s{J41zo ze_s5_on@Rw7h~b?6A?3f6ulA#3|at)%1*e}yfIud$G5KyL;LXG*-v;n0{Ygl4ea4G zj5P@8PI1!+e(2;2wdSfT@9GR|VuX>aLR-S8T-A@U+Cs@JBVn%7!?O=-xI2W5%k{0U z#YPlsHb<ll{e5%W-72aF)cgcW&NnRAfFz4IdrojW*C&9RY3LLd*%z-VPT$$^F_l)o zWlccywT}MO_3ODHSgd_6^Rb_&pe1K@>_Aqp3ZgM$+ijq{^6{%TbVO~)ZHzi?U&E~~ z+7VaWTl72YNag2JlF)OyEDYxPu{~nRt!%m5I&B}B`dyl0E&kXJ{^5b<-vk<a;9=@T znCal-wP3N2^hVR}{vj!Ks*ce0gU7K}DnU5AmJyiw&Vow%79{^Elie#m&KKSmErCE^ zTo?PaT7|1DzH$j<h8_wur%)rs=S*lGsLNDkXjol20@-0`oO?Bpdy~2F4zu{1O=9e; zzunnoX*+N*EIh0&-rawh?O2@N!?;gp5FfTH%wcKrjz1-vITyHdh#c?{j)aUiAr03L z-vfid3E4UD)8YC7u^HN;{}hZ@uM~@_2TU{dujS~!#$Jh!!ZM^$+d8h6yV<~giPmzn z3$Y+WCUdEhVhi?Kp*BMvINeq`?WOuyA8c0kf5~|z;SPxCEDdu0sBLnsfwSy;Y9`tf zUU^jXtwhJWtEM!)GP=96^0XJgTJ1OQ_RBHnI_Ono6}oaKK-m=8Xmd!=KUi^V|2o-v z^n2Q8?$;C1S39!wz&P^=N38HykRTOyv=t=FGGn$lyxgC2JGr!1#`y<sFKUr~ATaH2 z%3R&-LoB<U{OJeKci<Kn%O&cHFJzq%?jaebFdHZH`PEOh*Njr$_P&*zMse9C+&5Es zYU`0)dALABdWO*wvH9p*M(8A1+`B+9o<@$^?a?v{`QxmG*!8dkp-1Eb70S<xZs?&x zXoN1*)e`M~1?R6JYk4()M$^<qO!1WhYL&B)nJt$mo|^AyK}JzfNd>C?v;Qh1<aT#~ z!)xJN9QnJe(b7=jjdbwXWq+RGz`<u`;ue^PpjuNGH3Z8md2guI)zxxMWG-D!whpwN zPq8rKRgOFp6rY_x^Vd{5f;LF#YLZTXRge*`jU%sIKP%c0v+VHa{_wn|ZB$PxwvTMR z`POtf6xWOUB4K4pqq*d1+Ukp_rRJsW5$dyI+L5n&QQKoM?5`)SsM99#%{dXQEnW_Y zVJ~(}_*xURR8|lZaAd99?)I8~B6}mM`uJo!uIu~KhV;kj1Do}1l{8eRP4C1_CF@vN zahUp`%a2R<*ZWZ^nLCR8ULs1bC`@8UW~ORaMg^hyuc<j!RST&eIjVu6E~*%6r1|`_ zanYiM>@U^Ob1W8{8jw_6k9~m9&mOqM1Rv!=>3qpLMx0_&(vuTwG~|DgALMUaAf#h~ z?Dyt&uEpICXrq@I6ZU>x!9ApV_wJ<y0p^>Da7xTWj30)v&@-9HsKmcI_Fusa%OjIK z)%1v9LAoNz6)6jTmBcHTnq`n1xgQKZ6n$A;e=XtYXV1zTUvf9sgiX86ZYNB~FOV!Q zqoJ=E8{hw_-{&$-h@U9jf81I6bAE63%kwmRiUgM2zCVp$1a3ck=~gQW@}VViV{A+k z9Gp}3G+%l<zXIkjp5_Ey@o#REB1F!xwQ2or7?~^*=pXVYmOdIcr7Kj^9X8lQK=`-b zdZ(TFys&<;-^HL8_8cx%P$gIg9lJ^m<b1F>(QlJ2p}`*oKde_2A||T-dMyA=2YE#Q zNw6bP*OX2bbi*uO14;b_T-7I5Ba~!$EjsR^;8=EXg+Q?OOB|20`tn$k293S?8`E41 zj6*VLel-iX_`vZc9X+Z4YQl^&R0^D39!to`DgN(kHk>qk)4;j$D@nVe<o(<Lo<ck6 zhD%u`Ca~_O6@T_{tRkezjQNa`b=rx;{jWdVZN!$R$p)Rex~55dF}+@YYv9mwY$-|N z{*JvsNlkRlKCb6pXbZ1A|F2K|SM$9;8*1jWe1^_gSbztg`5mqa(B^~p<d-WATN7r; z&^D29bv#z!;AUEF9oWG{TrAO-<zLVS44N9Lg55?dUh=<=atl!h8x2fl8PTg5xD#D4 z{pEpqo2eu1mkk1>I1=Kb$`+&Vh?uAha&36qrZb{NfE#uE_p$<`(7PZ&Gn_E2e#p&+ z{KG`qD!lT>TU>LelMu$j2w%N##@>>>enkYn%kgEXzJCj;854b$ZkH1_BG#@irz|Hw zvGciOwIplSU=kT-;6JWKD^aLk;>_m%bDr5qvEMU?nk`neIlW{azpVw)?`DofpQruq z*4U%8Z%dH6M~XxT(k3N7$x?qQ=FGorGQt}uH^&144eJh*MaSj+o(AtMJBAxJDAwl$ z-Rf}H0ZR^fD}Y3pq2gJnQ}nr69%s3gP*do6L9Dz$gS_P}TE5k>qFBT7nd;7WF<4)d z%$u~Y|C=s|Rki_lU4rZCWa_5v$iIasjM%r>EO|_~gzjI;k`JOVDe(!dm+lV-Z#FO0 z{$?3AYtH_Y_ba^07G$D)QWv0ZtZAV!@QycBI+tnZ0w9ksKo?uV1@3L3-L2=n?vd~f zokNp^>gm-{Sm2?W4UO|?T4Id>5-L4j)3}d|88~HROnd0n(8f9DzAw@7A;NE&Z3rj) zWx2C5%xV~)bCfqskuNhuN2t4w8642npv8)qvG9Pl?{VB-C}*>!aeDQrhixII4u1hj zND2_e3xMFUO~G%MSwuxafe2*%5KCvT1S$GmsB}by3K}8+0aQ|!JJ%&1>pYIsM6^XR z)>>?OOA_+Mk++8X8SDigPuBTJ3q0%BWaCv74N~$0@ge!bla0;GwIRmH)f~~<qPsU) z3jNgS=K2;Mn>~N<DkvT)1Zi$zUyZ-pmmPGkNCaj|J0h5cebGkQpN6|qZh*k^7e9cn z5AY&bt{#xQP#?wB)!NO!>GK<=Tk?F)BU-zdimTz@M<n0Lal(x%tX^L|HZF&ab3!$p zg=s@QSDJHuZ|b+hHd&le%baurWFUo(s!%YE*KSRs6KnF0+qPT6o!vxQdu!`WBZw~u z;-|^o?@`jL;Cx~iw31gNqI2W^gffN<#S``(syzi&p~+beg*|f3VbDw#cMD_f%*r4F zIC)jM&^(q}5_;n$@Cf0W_5gigcauVV4>|{1h_DiPWe+nBurxBRjxaEYcREUG_85|| zvABCrWn;pP$Rated@8a{S&BjMbug~c*^ke;sB5LPSR8*}M>$M6n=q$ttzSPi=K@Ka zQbB1O(>)!BZoopRoDFQfTR}Cq%fyyDSdEvgFatTU@*Vz*=v1B~Y#CLTPdmgVvdr~I zoIKYNi@8O8|5{c;pmV`8o9#YbA@$wW*8+6v7S1bxE@3b_>Wj3o$b()pqp$80+t-^{ zIs6?@I-10HuKu@N6Y&V=8I!RYRzExpt2$;jlx;m}D3e4XEu~B!kaJ>-<;7O-3d;Uo zmR%loMVdxie|)euu;)t55v7!n%-_wYIK_U#WX~*Mkea#S4Dvtx(L<@j(!$1A=OSM} zKrbQA=R6|NvED83g(5DpWB?jjG3h#RC+h*TratueQ#)5DH`i4~QJ0Lse3C}vQr&!+ zJ_ux6B}$+CY$r_+rrxeYi0~l#^(+U<{PK&3Q0Frw?<-efLJ&DQ+iFYkXlAHii5cUA zrT2SE$3cS3x|l~6`sU=EQNyLe9&V7LpZ=~Q>0^&YDXcZq!9_-NIHq5&WK?fWZmpzp zT|S|7w#I;%=LqRA?Yn2fKZ#j_E+NKfxI-M`-lEYRcly`3C)q&syHf)TuXp8X1aq|U zn2chlr72VprP`oqG}}?Y+Wt?vKQV9HAoDiu^<||Zr?TDE^nt@1)mKxSg+mXbKXjbL zpo5tdRcIAlG`4@Nk5`h`va+Jxadl2vzLuLVc4czculwz!=Ig3w`>pSc7dT|a##3j= za|Ma5rH_&|mKu9P?G|lsa5r=X{xNC2t@WlHACBf?cVAlG9uGBiw@j)~)M&Rx1R-{n zO+Fir^RbIQKbVaq-kJ(h5z5LF_6Ol<^Lp7J+@K~udv`MUs~n)`bthWbyH)n?90@vb zhES>uK_6J|(zj@bPp;*6)j05IZPJLqHx)`{jt_HrVrtq*+(5?{ihRbHFI#Pc6n`5h zH~c${F!<E!y@ibiI#uA=SHaM3XH>}NDupK4$=KdwJ%tpkVLKpGdn(YZrW89B#D-TG z`Y9q4QzN;<#!%lqX&rFqa~Lw^(~q#FJa6PL3B4$Sn@LIDxvqZ=Sw7SX(>Cfgi!@#v z1U#uR9IVJ$;NTq&mft>fW7s2q*Ii*q4cuKE+MgVXjHnI~QOEF8Zk57g&paLlJdCv! z-0#!ZFw|;NE?6fDvKY#SE$NYSov^VD^3RTt){xbih5Tx<i6@}^DpcCe+NX*Lzr4Je zKB|5n=nJ(rl`rjfgpA_t+!;;rcXP{@#o>7ji5WS%?dBLoXBxq*JSqb~@LA?GFR+9F zje!((gZrJ-KdSUy>e*fDA+kcWM{f=vuc|%=tPTdv!TO__aK<BFHjF$*o{>ezBujmh zo>XhkL28W6sX%1}%w6XAd?{nT@FMe&u9<@dd5&5pD5K{bg!q`uw0i<$jY%qWK=<6I z-;JitcWq<|FwuJ7a}UI|8-now>YJp*_+eOGNZ;xLOfpVF89dn+nB|ae&yAs>r4_o) za^>j-L7i-#4|I=LwoS)9MYj#xjny~(3>){cfY7@SmIbaHG->zgAt-Bi9GvTGvU#sr z`pDKKs~04_(=y_MuhDFOh|f`0_jB`dt`M}mu^TqD=O%Z=*?)xO++|<g9SjqA$Hb6Q zhh*hV!G@YB-DIokSCsb;nik9|r1Y76tui<pG8HSD#QY9Nd54qtvCmeHS2g|%2WwLT zu_$3Fg;A7~GT<e2FB<u?2|VrpR4hl?n*Pq!<2$&bbZis2<2(WiV?wf;<i(b^EPGsv zYRNjU1MiqIzUku3Bsg>CGxPW++H@y81_Y;M6NZMZ4egFn(f_feU%+mL|DS#}3(NoB zivE@*9JKr_)%GWi4k{>fjnb1C0-T!af8laFGwB~5FYtFU5^E0jJHE$46!d%OPIoqe z7!}wO-bh@|525S{Kba++?;ahr-?h;jrSUy++29C>J=~n;-m>|39F?9H;Jg)?m#$6= zxsKLsb}fm$m5$M}bCO0?^m&O`W#SLIju-N8E^^n}In{(TPI-w4^zVH`o>{6iTmhdI z_r{zK2XWAxu3prMFRavB3MKmQ#P2-y?xt)3Gc1un-XstTtt#`IA<k>bnQ7nRrXDNb z@Qob*bizTX4gee#*Nor;`|U9^N_WSrO3H|mTVqvdh4aIoR}_u_W3DS#H@?fptJyh{ z^-Rdl2jqv7oPXEg`ITTP?)>uu?;f6-wE*LvCbwSR_TkCP5OV94%0GMXG&3(no8Lh~ zwDwKg-!J$+KZSKSoi_ch-O&AKa@MQ%ZY^|@rss|T@AIkn0^nB47%Be!Z@dQaQEukN z`D5*WZK>Mu4@%he`uLAZh+YKdnxDPL?=T9_(*m~_SsEsb==Y__nL+Q}cH*bP9%k&L zd>c@mDUJMw`#@lCmmu?9(P5<YV8|<K1gMqo*K69~OY0$kLciF&KefHd@;2h|%60M2 zT^NN?Mas@#O(|f!Kk3U-leSryjpVLD08+dpfFxwN4dLD&{%z;(Zs$fl1$1&3py?j( z{dx``B%n}$eaulgY9E|>W^%s)qQtxQO=CkvW}WGPud@hP$W_ELr^8kn?*H+|i}~Cs zvo$b7xo_#n5i0;{kn@L_6`9^+RN8q*PlW+2>U@vUGU>V<zz#||1zgX?ykz?hIG$_p zc%lcmOn1|EkAgqM5r{f#<xY>c4FC!L%)WLSDYNq!!Na{KYQ4Pd0~c5TJ^i@-c#e%A z4tPnQh^Xc4$O-3@!(NoMh;@}X01DiH%OO+KX<h4y3GG=Q4;<Ir2<%ndesks%-zH9m zmM#IHL`|p3JA>2*%>0Iu_4S7ZGXL&AFIK}NUqJQmM&srpV>a|^mQAhaVs5-)#mjIF z|FYBXA$#kYq(7NoRts^W9kA!qkJhkv=yF{{t??t9)PfVD2)NIAK{e|*345?OwB7z( zyxU;@csuyrby@E$`u~mr2%?sRAl68+!9zZk7C&3bOHMN{wH{ZE;Ig=i^(RgE2crPD zkx2E58rl(JRsSrHo_$#kfFt}53r!r<Q||+zs|-Bk@2mPhU+75QcR*58A=?J`eHZmP zF8QpPQ7xUGY@V)5ucWw*eLz2ehV4~mraHwbjXa%d8vp(KcM4$LkB43vtY8^45nlpa z=VrNsnQ+plGxi~nOsXa2e(up^vrF){ixODg9?U!$3IRM%f4N3~QU$&__H3r4qT((6 zO4nC(Uny|w@ix$v7Du6la6-!&@$l6Afdp-?K-Si{3b#1XJan;k(Q3PUbTP5u)O`(m zH|%-zG<&ICqrX4UT&@aLN*(2Wdx`%dtBWv0#lISrPrBKCfnt0-++HHSh?GD|u4}7Z zc7~o|8c)7)2F$#a7FKUP4-y7X_Rph^1~Z@X_1=u+d=!4S;}P_|4G6{+x&z$?p16-A zr8e3Zg+D;GURS_0+AwF-MDm$~lX8a9JPAA_Cwky`v@mUp>qqcY=$`J7hefTY9Y+9^ zX90K^YCGALf~xG`DH0msto}bj&!7J0K0S!EtL0OIzr40@SyZJ6`kC-IXQ2r&d1~y) zm(SWoRaf}0L$m<1Q$JR-<~A4ST>M=HUe{kGKNs7`WqX?ohl66h()Tk^9fag`2_DYU zGbloko>oy{UcHqTWS;Q%Cat8at5I{%ZdbR=^i%v^&WqQJQ13_NJ<^l$3TNq=`;Wd} z@*Os_7`GN?e^xmiMjqE^7|!--GnMpn-d!EutGD*&1oZ4glrUb^8~CCd4We6@2%iiB ztk8pFVXz>xmX&ajValFCs$>VwM@<NUkC1x>O!|(BbFptDq(B~{%hdzY!-cSRFWt9E zrEfU2&lO|u(wtT9g=vDG__y%}WO1sLM-n9Hli$jK37zYIK!-l9gt(Vltd067@Hr<p z9jz8i%l1{e7=2Wl!$tf65FXcmFp2K&18|73)@unl@Ez!4yI0sY$Hx^YE4WHmBUQ7N zG@M)VUIVOpd4#XO53`l~0ydd#e0E)`+#=I(!C2Z1_k-w@BoIhS(l5Vcgx@+DE!#2l zqo=1v9WE(Ir)~vdH=pMNnV8yWYPv|>asB<{y?;QogsQ2S#tqJnjec)lHn8#A#3$Wp z<3T(VD*P$;ux~h>lkUtXL6FtF`zaL`2`kqo7lBdZ$d{DA&Tc@@E-7yCQMwv2VNdU* zr&Vq3_cS3f$5Au322Q>)sRGg(;yWTX1^Nan=%|M$@Xq7L%3@<8?Ea1I#smL%76o~t z0V`;M6&U(odP{u^+tXOancJRlBWFJFER40jLtBKit2Q&;)@Y3u#y1T}x($522sIV3 zsI4x!asSC!psB3+ITre;6~G^%S6tRp0?t&e#==rJEU~MI=rju3V&(`jF4yXWzPGS* z)Ulu$cy|l>S)+5rX+l)Qrgt!eR@F_8Jvw(+h$ov|bUBB*j`qa`!Fla!c-7r*{LE|G zfz=jjP0wa|KH3XzuJ1V*a=WgBV!=aDaV=Ev{stm)30KnvkXBD$XtW!x_5D>iORi3Y z9OjeqoIL^(7JWKbhKrMxlsj0TsmJ`gT>^p^V9^3XDcDDq>~q-98f_8uh?}O>g0k7t zATd)v^W+mV9#!=q@DF1i%^M;@*rLwEqKmI1Gz!1Jq2>-Mqvi-Yu3yTiv=U*r&OHRz z^=(z#4tqh3TM;l*aZR-=wNIVB1srl-L`VNBvfCEAuNem@SPOz{TIaY*#q=%uprtJI zhymZ0lOqp>r@H63hTlWY9|Hf`$_H|(BFT$(=t0HxG#~$}aaZvxbOODftdMdWZ*_>? z(<GM_L)=h)UGRWekOJesy6}n!D<~)s#x%<<?;3;Iqwhcdah2og5ded@$1ErD*~MC` zfrm5uha>-|<_Kq#`=FI#fTLP$SS!1Kmh@qOwtG@(s!Z8|+4x;QJM4v@x;W??c7l(c z)vrUaAO&WmG&~~G@10wa5mfY<CG6j+bl9$J|4+pA`eoPuH^}h+I{g0=uUPR6*eFCk zKq~==L)_gF&uy=Smw}sxdtQJ4VO|n!ssF#AkpHix#DM{LV{w|ggAIsiRlmE9mf8IV z^ren=AY$M=MEM3B5vNZURn7~*t>on7>Q4~y7z}B;NH!yM&+3$w>T%Kug-ovfU}F=Z z($^LIyaHAH=p^&KQ0R@AipM{hfFq~`JZN#QdW);Y_!?&8sUK&cr>a)qYGJ|NK{fds z8+?ZwWNd#aAxolAGF7nf<N+O3qTOV#k_2q-_I(i5i)fD_9Q4V~a{oy)`UA-JELh42 zJ949zNE`zw&&L<9Tz8Q6np&^D4g;o>`<|1szCUh89*D4<|JR^8HbAdf<gyYdG&~Cc z2w*B_&2#So0jr&mEU#p=X+_W60Prvrb5m*B6vgeX`}u|#`LNE7QFD|q(;1y=D&Any z+Lx_P67zjEUhWt!x7oDab?|qdlC*Vg_}bevw9_n1L>gBp`Au%h83D{1|5(eB600z} zxudO4F^bJ!AVT^<FuS+RIb7c{tpBd(A|uz+O6ECQWuvyejiznG;KrtvZ6XD3K9RX_ zq>=+Tg?nDk=2p}~X9TPOZ`p1ArGlOMEE936`F!k!v>i?nqfX5QX@Kxj_zy1-pJ4-* zM`3$3L%B@%3>l2mz!xrG<V=(C@(cs$N%H=O#>2&rbbc*Tll+Fp-$5e}w?d0U>ral> zy3c4N6&OIBE~=ovXn;(2f>`;p=9E9e4*zOwyG}hmSN`To{$0C<q1gI{-4Pqa1=!$u zMn#7yfNZTqu9=@@2+=MZllA#N^WUF*i)MK;Tx1p|tT$-){8zPhq$Ob>@j~e3+v4VO zAO$U-{JG`H`bvP`eDc!w?^N)nROr!;;P&=wU$(?=>WoUirzL8bDRHRdw&PhwluqHr z=(P}<mDB&~F4D7`&V(ue0|B{3M9=&uz#QrWeH3AQ>2IQzswSUddWxiKe!HZRql9S6 z*70`lN0rmV-Y0-Ev{*H0c%N|C?X_NYdO{|i_Xo`DaR)jos&CnbojWUoB(~2<A~qAB z_2hj)=jcA72^}l`LyAzC6^u%2`Ub$F&D8Qh{FeJ1<9x*f2tc}$H?h*+0CqTw5d(Mn zwE?hDB5><BwTj|$B|KE}xkBP8-OwRJPr<&8PsCBw(VH{KhyG30`ifL2pl=@s2ZD_S z-R(F-zpq7>J)Z8IjB|WNLA`^vCVX;gPXi{O-!#Ut%15q)H3%C8!Nh%lf|bF@BP&{y z#99u%pv<2@pY#Az)+1$rJ0|2kDt=0&%i7VTG;n4xMWx9o=DE*)c~#SvdukB`2-fF? zSB{Iz$yl4Qq2}P{r#HS&#isGQQ|o;JxLoU*WRG7AQ-r0A;C013-E$3eqIIABx2|hl zTu+LRpP%mN)RS9E_XP@ULOGpbBOJU!2^)FWYeI9h=m$%z?w@i+>mdiC<pqUx)Dn3> z)6q=EZUebd&9@eOdzIJ@Z<I(Y<<Bj=`kCSojTYEm>aA4+gN(34C02vB&wlbsi)`aj z6ptvzL#XtdfxF0Ym`pR!Ll=Sca(_txHQ|Cd3&@U>4t7FF76H??Gq>wb)6RHlRP2G? zqu{p5Jr5fxPZ*wq>T4dn9DLWfz3^eOXw4p)`Y!a#E=$6-_pdqH*7zu=5dkK0Q)%tP z`aacOXLuN&eu@KuKUX5c9)5yeyR4$!$uJt&9~AG?d%3qj6%*leq5b7rP5z939pVyR z;XtupvFx?upLE~$I|5Ca&}~z`h6^rkgDzhHs&(&21Ou0cLE#nQON6A>dHg88+*jr} zOkkZ8+?}&+pz_2maMqc%hPyER{w#^McYaSHasPoM(PpgSOI+k=>T89QjlhYElsXRE z79t~r`S~Q8xWV<jvkz=f*odsPs_L3)xj1Sz6e?uUdWDH{dSlmK9}q;A1UtK+1&y+P zhNbq+6IJfR9bP|~caIvl4JMr$nks`g>)Usa+@EcR<F;Ex?)R^)av4d+)olxoD>@4b z=`guO7ol=mtfACG+FXH;f4h|Hr%HS~G2?Rr?*rjc+P&5U0Cq~v1VHD-7v~xN*f0%V zzl$7rxJ9>m#%3xk2SJbaH@ylfdzFc232A1|qrRV?dX>p3T5s78Mg9t0&7QbFfsZ#* z9vAHd@!N+TItR}+P)2hD{cbhBctuyY9FT{tBXTSNJ+Q**Pps0O<zST?tTN#5qtk0V zp>G0@9V-KUTR-JLWJ5jX2WPgFFIy~SC<RZD^_YiKR&Zd)(D8mTp0XM=^=TSk0K5e~ ziJCfkP|z-g&)5c-_X+Yscc`QA(*d?y+O;{0QE7U5MePbWAf$W(z?%N+%_hxKgpFdQ zYe@aGIir$mvX0E*S=Wk^-0Uour|U5Gjw@E3y&b3csP<Fta!gZ?LM>jNu^K`+*~NGN zcz=6)v^cwGwkP4l%N#?6Y2P?JOMC$#BT|W5lYH%N8BQ<}zAa$~gkL0lPKSLwZod|w zx76joN8#G?4W0fd4g}_<F&=RWtxwVuxF_XO^xCbfvm`S!=95x8!odDLb<P)RAI9%J zB(GAR_t8Y)m#@2KG9!$jaqstFo7}@ceLBsOuv03~9ed<vwPRbvxU@))q%wb%s88pR zNA3$7A$+hKt$$LR)g`sU3#KM3+j)BGTRZk7fV7{kSXwLIw)3oCU=3zy+|QVb*=T+a zWah-XY)}<nKsDH__tbH7+;kCKr`#?K@h^zSUNB9t^*LH8AnyDBNm;Iuh}vb>*cIDl zUl|jE>9$MXMhmi6RC@lBS193U=`e=w^fe1cKWx1aD(l*H4CJUAwTq?N5P#5lA=*&m zWdr*m#Iu()GACmo3%^G~0e)u?kH5B4|4<nLJF463!!7wraAPk*FeQgk8q{26a5U3T z^I_tppHF+KOv*h};8<5EYM;#y1dX`TG^Xh7^{wuWgY#0@ig)U}qx6Af*U%e`Cla}* z3A?ZKFxD0y)wfqWQ%<;PpS4Boq>$eX`R>@#5=r?CYT}oekIkfe{)#e`YGWWsWAv`< z4yX$$y9+XeOgi}3D&>nUzGC?vqfVCco>2|9As30g2J8lLHv0g_Fc%ZlZk~j@Kw3>d zDLlBPqQutjJSKj2F8T=C0fFagZF)g0?7*$f1mxs!6fJ6;5io_4*Z*1=(6l#CZHx|U z_{FZ+awvxcoUG;fs(q8L?)eh-ZDjv;^N43KZz4rtJ>4f0x%!8uH|GqjR5l{pf}zCX z*uvP>lzUEF(~NU91-N#B11`p}i_4TUr)#{ny#<mg{8eQ$64myl{E4H@k_bR`Aee=; zqVs|<^L_Pf$0!Z8C<l6x{fXsjKYVJBFlPT}g>iUAMaBA(o3YU5lBtR>9eLeQroO)Z zq;yEon<cDy(j}#WCTCe{;51ouCiPk?7}>{bxQCvS{U&1mTR=8T#!i<(Q;>e5N5rOP ztmFgs0{>3t5PxRKqe`R6Z5CS}D=u0tmM8Py-|p2Hc75#FbH4;l4-yiR&SgyBBN2&Y zd6%lEXh9t|+T5nS)rX5oDzTDEMqM=s(RTw2IL{})&x7bfZYuBdJ|ysg2$LFlyKDEg zU+#H}=LYSrN~dsuIi<nB!)CR(LSOn3M%-vms3A)MY>^{5qj&ntABCn4<9|cpBRiZ* z7M%i@XMMF!@ouNEaX1BcbxLdBt|PQ|;90`3`n}<~ezFa`FB}roUrvq8__xMpJ>L*d zUA1}#bpFCdh<!^){WO!oQi{AYpxo`)Y%SLxl~@BP^4XV#$|$tSc-)tsRE<pJL_03a zuZRiZRp-QRI^>kQUnl=KP3*3s>DSA($%{+>q0c)Owru1H_OBU(TR-b#XW63!bmk=F z6U?5S5%aQ3lOD{RdUs~uR6h1=+O<cTgsQChJ7(6OJ&4TB3`Ngbl6z#D3A=JLcaE+w z@3VuZRc>4ZRx=P~UxNFOd52$`yV!csHva`v>1aVt9hBbVR9{4VzOdAvn|;qSc(-n2 zt$WTr;X-7$z~`$WWj5O4%Q>H4n^1P@PFBMl!Lt1{uRA6B_XHl5NeYZ6y|&2=6M?<Z zP)AQH^G;-bU@&pxNJuKG`r_dIy_5#Gj((YtiAl5=>IRv_s(h-Y&mAg+9aU2gV8~36 z6X%CkmxJ_QvhJsvSh}?LA0LGj{jhcX{3U-z4Br5eG8!^vGEtiPmbd#KK>&#EDosz| zrB`;?g?`x*KCCI?FU@ZWpGR8mJ}i<~+@L^Cy83eUi#4jQAj72o<2&GVzRk-~v$(7{ z9FnGT5F#SRGV7~2OwsZ0Nmz8T!;*&gha8rqaJcp#NXz*hm8wv+l^wbFMKgWrb0cz> z?e%kU$ajAB0>03M=HJWJ&`ix!JWVeh;JQM_uPSc>jc&2nJBd3b&g(<fK4CAKXtcvy zg_9TZbjOQlc~a-?bF$uC%3lue3dQB=_5b+5?okk1FTZ@GI`l3X_ab`2)IviH8_`@B zbPK>5e8PCXcIP+>cybvWB^vOD(@_aDo()RJy8M{OOZ|V?L44ph#^n#Z6syl52>-DD z`Jjvq4~Po}nS?RoR&C&}{uR4tz@OZ?d==tbDtw%&4hGp&DN}|M#i|eu_$!Hz$vJx; zF6Fz*O=yRfgCcL$tEMPusXCik@+>3~WA?bAn&2)y9Z6m$DX##bH=TNYc(&OkA&&={ z&a_23Shzsjj$CeULG<0#7^9(Fv5&Ey+TF}jiT|0#J@;X$;R+QKT-T1!n8YWrM1{4& zF23VP#*1M!Az|+XcjRU(awo||3OiQ@lO2{wq2(&+WKOqb54t69WG52&$2a_jU14-3 zH$XVaW+K0Zise?6eNfi&`FfZxP}q9`V>G*tsmK*BkrjGxoDQXKb<nRk5`NV$$Fc4m zW6!Z`fkr+=!@Mt<70oqe3a`0%4xN$;4TI>1#TZPy7XXQWZ<ED9yz`-Y0Jg#c0z3`Q z8sgvVG8GNgtT5@kR&_cMzvdONpRwv~PB(M&$XmZ@S?{pVF-gUtsc0>iH5mb7r451Z z9MHv{$^sJT*W<uyJ9hMK>%AU~0tsQEXda(b+Wr9qGp#aPqot7sJQerRR9ZxB#D!PM z?_E(<h6s2%4s~l|Oe@bsPuH11wQw_@T5tg{Y>O1GC1OQ|?3YdkSwk<=UbNs${>79l zwhLV$u}kNkRvOpIwl~T$mA3b@NxV&dzNGff-iRXme);q^f4VblfNTstI<+Uvt#ZbZ zZ=3T$DHomHFAN?sHxuH0TK{v14&r=;DbT$3Tm=h^I-NQ@ht}!;g32MM1lQ}a#7NVx zl=MEzpQ{*+B`wp&i7G-X(9Wz^YC8X=SJB!a-SD=MFUgj%52f@aIe!CQc_rSlVl*EY zy%pAz&}$1C`2u>vq63{Nth0dowpN_U;?fSRTu)fQyX-(CYeKwPGKX106S|GBhYFgx zTb3Uf=^FpF0tssLYp@yjOADsq1ajzDm+y7Yqe0MZ9a*Ybv~YA4P0qM=hRKaKbxX8l zi_xz37x+vS1I9EeqX4<8lIozUZF}{O*^&2$nak;}s5|bB3E!AGzvTXXqu1uU|En)M zOQYSqDy-H{)fxF48VEOB>=Lzn(apNH)p8~4H_khCz$fQ>PRz;RNV2BIGHm|OF314R zG?^S&y+&tq(An4+ty<0wAXJ|wS=7Wu<i<@iEViS3n{sj|KAEuBe77z3cK9>;fD&Cu zmS;5WlL*<pqLg1OiK}zQ!kczaGgh@+1zrgkU3cNuOC$2PBe(SCB4hn>h06urs@SH> zu2MvT-ZHcF4%KIgoyfC&v2eU0<7xYnN^Pi~V>j$-b4HL|%&mV@d;h){0xw~UCN7lW znC{|iC-)y<k@fQyLr%ZtU4!Ci;3~VCXm#liQQLB}XqmD~F>8FRLBh;EW)V2zr~C(J zHA;emf3yS$d_77X;^q8Oe$|hS|GwsAumK)(l4-Pav^usnFxu*?VpiCad7pIO0$)J8 zUPM?+Fy;Byzm$Y_3SwMoPIzs9o8^Xi-#0r0VIYE=8z{98n0=Ldjs*nu`yv#aBWb7y zy5Q%04l4bhYw(a8qyLdqx;DJ-mob|rhg5GEndFi=Unf&cp7CvEp|oGkJ+yV;i>9-7 zC8N)QMl(u&6w}H6S1B|1#MhO$n}11JtpDWBgsAg`>-BdZ6N(lh=-r;R-`9aULkKfh zdA0Fx<<mC~s1x5;Kob(TCWOV(6g)d))@u={*MU1fUAn3S<qi=7$`tGDzuiAi?we<Q z3%xn$5+e^edNb(Kg1*Qe9ty0l9Ut1_2@M=fzKi6WJP1WnNt#>kzt@I)hO1pS*m!7^ zJ`eeZEZIq)F+*bocx^D4nUtVBOyiED%!Zu>#V5|g-Yzev9PFc1HahjTG_I17*Wi?m zW*>@a`jZG1`Z$xkH`f>EyP@bCFW{_lUFTXeVfb>qLny<r<v?Jv&QM^k?ovb2iUy`J zO*`3rSo&fu>}9wq{>6=?e<3|kdx`+gnP$JZZu6DK+R@P(o)i@A`=$!9Iz;2)pi`a$ zPca1|xY7o_RO%-ib!(@$k+L~wONIBOfT(_}I^$2E71x(GX}=N}J+AIb#7uBqU7IQ= zh9Hl(y=M(UL8fQcik<MWEj=HxIt!Ha*v$GU4UmanB46mHV4-UC^4Kb+)WQ7EHg9xn zB|4<Tb?|R*$IqWX39-iFOqNiAa-P*oY>^QM%jYfmbL0o3HHza&@*}k7u3VaLc4q^A z@+Ob%4P>dla4&d`mS!)*vT2;w^Rjak-uiSDC#HBs=iB2%<lIDJ>b2?;jo#;A$v-`y zVDtsC>2-<6erS+K)P?#b_v?n<8KxO)bxzos*Bt(LqW1Xv_acDhCbIFa85*6>fpt-9 zTHdZ;<B7SjjZ%ZZG*{X5eOg)iy)%o$<Ua4Lhnj@hNNi92Qo2}w>r7ds&|KHVaDol6 zPV9@{RbnJy=v1Mfe<reICl6P`vPY8r1lN_9AbM#P3<((AXHTfYFU>rj7igo7fWk{J z<2AsFP~$r~({kYJJ_{V^q46*v$032&1K0{=1v@OTs?pSz-?}A*bb$!V=Oq}V16J*i zOexO9>eI`7*RN%HEa)z&Y&QE@O-L;g=kPi>BjR%%l?Jv4<){{}K{OuQ)_6&;WWn7r z8~CL)LxTyV%|tRPdYSgPH9_MXXS-4v{8~Kd>5C8M)~#S&R%5v>{$JhQwQ>4En%qE0 zd}lc8^$EVurFQu=*&*6bLX_$}ShJ|LMO>NL_(Q_aQg*hZ4SUO%GXus}Xu%HxfB{l< z!U%1*9$JZQ*ou?Tum_e_oN@`pcQEO^uVT!<a9*&LCrW;^=xXWd9Tt`mR0Xe<_Xt#6 z6^-#h{z)uarUsV{mN8ng`5Av~aVQFl+Gw14seHZa?yu2gW2N@$dgq6-vNLEFYq<Cy ztZF#=8nl&NcZlnE5~N4}+J4G^$=L|AqUwxzfs_xfD3i-uIu#Cjj^upgGOfzbJ%|8( z-VOb0Y{oYN7KWe9umnO(*^J$YvsbqPVzbKOW(swdL=YeXKaG6YR!>)4kS#_!`cl?g z_fV{P$O|+Vc>K4W^js&j7Ag7Lcp5JCxUziqLSD862zCcpCC<{J17&@v%K$ou%|(jy zLV5D;*7Lk>)Qc5hzBQ@#{2WX7ra%ne^$W&JaHN^WxeJ=k)lb=8=z!mOe<5OnZi(t- zXN7;Cd39fv33MNA@^hx|ndud29r9IMxHp$wg;nYUppynPeQ6hD`AMz%p+osxUS3tW zpaiM(XMQL27wzM0fvj6a1s^V*K_IjR`T@h<v?kqex2{jko7Mm@Py43AX48EM@*VwY zBEEhx?Ge10M#pU8B24H34{v-flV70@6DW=oREA4LZ<(;RCSY%!z2cxF4J~wZQxaH> zm-TKHw;Z|Jaol_%5oUc6b}2WZxkK`f*2@oou_!xxHQO}u>bbmE|Eve&PkF!c-e1m5 zU<67o7?T-xR5)$o<2Dv6>cYw*0L@weUV-pQ9d{}BpV5KMH4}fOs(09LoB}8{^#h}9 z{d>Y3JmW0re}7IDDMbs$^BLTFcZR}HQR$gkgJ7NnivPbADO6Nhrg?VV|EE7Ppz*(X zjl)f0et!N@0-~a_l48Ts4v0o;)6_4zu$_Jdk4Vy|S~pVmHy)pwe>+w=4_roo?(zTi zLI>m7`+(~G^L^@B0TM(c{+};_XbYjr`XG#VJbMX-YW`WvCE5mFfEjkIdY<YTZs?Qu zALF|zkz4trNedJux#Ewb`8Mt!7k+g}6$Btuju5ARC-$}`40k8O{t&1BOziDV90ed6 zk84JoYlLb@{Ps5XCV3v@RGI1hlMs9$f*gP-2t+7QYIN;w%<!b0=7v;AeISAvmF`^R z9Eh0O@;~VOm_k;8brUP@H`S2Bh!^ms4Ws_~qcz=L!NVTKv(=dDQKPPr$)*~Mu;a|a z)P-tih;vPljTiCRw2V}9vpms*I9J=eUOl`uaTJ7@K17I74q6H^c{OGBHi=C&ljHd{ zwFRNw?-v_OLboQmIAIF=!M?GhHRE2v{aw<?XU|i8o0mMdGRf%u$%ZLkav*|(QuEi| zMyWcm_t&z@^QPLSpsB5%PWge5HHcK8^7GijO-T24a}9kMk<eUo(VhshCk7Ena`@8h z34OLo<zjdHkEtH)iyM;v2XF5g&{WrTiv~0n5Nx0VQXUlv9qH1MCQU$^NV5=nK%_}; ziV6sbbfhC4f|LZLi6}kNTS65HHGq^L{jQDA^L_7o?)%+y{+ydXzy^}N*Is+AImaAx zjEk18Hx_EH@*T7#+cA2ezjoGQDtrmDwU{O|V?Q+N%{aMma6l17JW+PNAaPu@(~j_v zuTA2M_f)Om>S;8}9F6iHBv*`+!!}2<$DEHp>)gZpEeTns*d$grnk?crV`Rt0m#cO> zI%~h$8I!PYHt>lasQMMW!4^u(3x(^qlt|Jy>fgg`nGxKaZ49i|KDaBl=$aAs%?L;{ z!bM-gcrE5g4aVFPmAZq{@<biSWA2z4)6}B^!0?}1#~W;;9@k(lm=Vx57<%y6HJDiN zeJy6%mvG+9n42)rZC7BFhKdv$x7zp4ti=S?VA^XjT6>s!PgD`gSOv|yT;+!|ovlEL z7(PR_?_!#3F`{OK7&8KgFTuP96I6?7FeCKrVouj!c+CitX2!e(a{S=HfL(Q)o$(KR z$IEQgk~@*hIo>ErpMa5`uc%nV2U{>(UhuN2mWtX*w^^>GE+*q;$OINLULqHF*;eLz z{<}fT3kkGUNjQ<QRhiYe%}8vGLd~@4g0%bFgOTI4Gc5Dcn-XY}LOqEBO%kZ^i141} zU#3`Qc<Ir;qdAaHJo0XkJTsz1d{Q>NJ78x#i`{FrTgVl4eq|J|FNVf>TSyQc1QlvA za9_fnnK1_%b#LG=%eqa6Xq_rn539cGLL+ubGuY9Y3g&cC$I~;&{&u@H^6smVH^l8i z+A&EkG-+%kqShU+>>M;mthGZCq{o~i)>FJP2eaL=Ve9yH)hC(Qn&JIbWzY77dEVvg zj&+-RTTA3v_h@X*Su?`HE~dH$lllxL=7lQT#Yom-956+-g9hV{#)}m`b`HPrmfI-z zXQ<IyjBzc7!IwZXBXrvekvhT(kAX*y!O3Omn6t5gq|oS&-dkBB-wo*+t)y`e)bbX} zZv`Lz3-7yJQM-WM8?%!%K#dJ=I2b6@qw)qZW4jGW%Llt#zB4%Y_hRF$wHWtZ450=y zRf{3iVr+_Wl8+-gO_wVwHt?&l?giMIl(E&N75tbRYD_ZCYDvQRrF(XLa(@eE^hZVV zM8#-=Ye~Yq&zDwQRcgH17{|D&8Nt|>Z~{$ItngUQ#+EY9fUl+Jod*-EYcU7gC@~L| z>;_)hvf_qrjh0H)4fljOl8<fp`dG4VY2r`txA?ItyAEkHf<-;)*mBkInDg>RY}^$8 zvgdLY2Y5z0jmMJqSA)G!90fS9rKEl5mtO6X!^UF>G)dN%Ab=*(p-KCN14NqT^Y?;@ zzP5KZWQq=cR@5$G_Xg}1GDVkli5rDJYxo+iRGF&rcv&wLdJ9$Gy4SJWv2)aqZGlaw zb!R<xp$5}igE?M{dF@N6FeA*_uF14sw-mwIt;tN@0S~ZLbbp)1ip=zM;>a}d)N=2^ z!{sXUc4sZ#YbjyOnU$QflYcN$P&<<{C%t(VO`@+yz1kcptC^7jGXd%6Vd#Of@<K&; zp!l~?;PI&gZ|`H?hUZ7)cJ!8#c4D^F4b+zpMr$zK&W6tpSpASJn|QMoLh%az`v!i0 zzT(X$fo~JPorl|b&YIfa;b=TpQ6!pKc0Ycm_TYs@<e*#1Ao=+q*|DB9Xhs0*26*OY zb}{B2sEb3GBefVJ9N+Y8ZLb|Svlrnkzr-cfv@=dLH}Y7cS;zCO<5Sl0`*Ya69=n|? zl;meS!notk7rULF-BCNQ0mteNyM^Tn>FJ8SM#t(tyXqD@FNp=%;mMi<Omfd}vBG0B z^%owM<nHG`C^KNkG=nw$QDM4R@n#L*w2ivxg^GKI>U`Gjhc}KmwGw+k?I_*(Y-hV1 z+lj&Lu<l%}N=@>6*6Gvcx1==Y%)gORK<al3#TXKb_ImbTgVMmJmZOK(cKc2hw#MAE zeJ5^Ew8^o$%Z_QbLVAWdr{1Gk9nhjpHtx@goCU>e?baAW0d}mr*>Px-Z4vg6&HKX# zU}J|$%O9)KrJ+6a`eF0|zB?3HlCy81EI-^@L5v2z{(Ttw=8x{uqf8ht_(6~XihiQ* zVeAv;2GOZ|ps)&q0wOv4m~<EkRLC^}hmA@jQ~Av*YmrGgKSX_m3h3i^y+3@^0B@!t z58{VN13*8p45nqa&DKhFAa<rY#_||F${95G8|^DLC8TmYBkpCSwE_*0T}Z`%?vSN$ z->C9QdV;hUhC%9C3B;rux77fW86EV7CX?d@Cc+)F5C;?xidKw6(893{FR4B0V|mv% znwW`^={Je8YxQJfE*4S{;Gh7igCHa;C1+1x1tS4f3QZ9GXn-Ql-UU5H@U0-ElmmWT z1LYM6l?P-RKvl7Tgsc3^dp@XNgcx)}$Tqrqq*iO`l_(^`?8gT*u`68+Vp-RRr9QEG z*8uIMt#7CbZ%qdl!`^Eq<JZJpI82z7H<@`00OQB4ve%#D$l{dkJ4F%QC{$|Z%>1RI z`xW`0_dg*oDmRk>olC%HhrD6TC5DtU1x*}8z}C4c35XG=pz%9nti&f*Fe#-FeCh@u z^S?TEfv%rMY~+C_c`?B}Xu7z1sg#21B2Tv`sH0m*_B*5iIz*EU5pg1YCU+E<IeiQV zl%F~hgqmdxh6LVsXQ~kD8#Zj}P34q~ScR;<3j=oScXO*!jWckC;`)70WAi3n-R4rT zd~EH^X~YXOm;l`!HzrWU5_0<Sm9pWzBHi=1L|hV~{(H=0Vq#%xy>-s@pzDcS+@jkN zm)1tZO^M}RW9@!Y;)^P4Holwju~U@~Z}E3*3r?;nZH_)pJjlZu4sBtdEw}~}ay-iI za{zVI5|CoIc7Whh4-<5!@H*0GT$f_fGdjY49Mgx0s(dvow|a|=#p>A|nW<7L?VoQf z3?_|?m?SYwS^I8YM!HJ@9U#%%vnJt`^i(j2+$qZTE`*j@Vu<tvG+23*YdUQj5_06e zgE|Y9z1A~XX80}T@XHCTi`~w5WcOT*e`8A)!>XKT@Q*$>B#Kh$6`EAzyf^z2u5YH! z#2W^0tgyB^e;X$zR`W@9$dD)aC6X4J_*za|c9`xLC3vs>B7a1)$l^3i%iSU#sFu#y zjZsAGcXluh6J%sIFe$_o!?>a5%NNtSrxJ^$@+!8br^?oXc>4<sL95(=2oR_#+oXWW zd0qw2<8Af%5v^ni5!u{~zt|@yx$<m5A5{R`>s}yhWt@ow%tefHDCJ*bW6vI2uqjX+ z?SHCsOhFKoDodEx^boq&H980Pxhl`U#GsMwv0fITuLd$R>KY0|i%qMSZaA(yqf=g! zXyY*|dHT*{HKaJ(paO)%@osN4W@0xMQB@o76;_wcyQW|}?qjQtq;YjE>x6@Qy`KFV zXa%OEZw2*bo5?F{OasNXb=z*$G{I8qO{J6(b_}OYdRoUWV14SB-E+sIuwjl^Uq_iO z+t6C{=SbVn)(7C~wxO$gRdnTI8jY^D5(T~MKC9Q_$GZhK>8IWRegytOaOp!mg=^x% zmRqaSoN%?izfN1)N7JLsjZUH$ND%{x+ajAcDhifK*u^}bvY&Akw6qN#-m6x=3l5Vr z=mUownrv_E-to0LG2<vc^R-&6Me^`+i0alt7ph|J1`HPI0cpzhq;Q{^FXcA5Ag_Aj z*zNKWKuQ=NIO8OuZ$k6-!F6RD?zaB0wx>H81N|9JZ*~i##Z5HnoD`lEx5%`NX~mT4 zkqc6#TKdyHm?fXL6g6t*xH!yrf+bh*<UdOcN^p{`alXHR+9KcjSvVCYIL|U9xZ&uW zNB-$3#JjKkj7~<Es6IV^*+w@AscRWm=kdmziZ8Js<RF!47C6HJ23UGaZ|2&)E)jjk z`CiZQ`<8wF;lAopZNWMQVWp1)0~?>yS+{QNv$x;s-b!0jZ9WSaowA3^Rfb073O!Pf zTgfm_$1Q|AK3{_E(-j<`<uCf^{L(j777qz&K4w=ewLP0D`g?+Jxu9A2eT!27L)?q> zA0=E}5>F;RQ?_?Ihum*hGVD1?%iiN#pt&<gDFrB%L9F!8PO6pr+|MrV5qh>V(UPX4 zle^#HKJF98+9FY`aFyxI*4}R=a-H=F%@tdj*NCo<i%H9?c5%7!_I(1WiqSNgi&6DI zy%SkGx;-8JeqHr4)>EJUs*n_a_F!9}exh)HY^$evYg3;?*>DXa(AR=h`0wSQdpbbB z?5pOdN8bStpUGo7X`+Uz1d()218%+HO&{mF#-+X5qs~uXxr&qC9C>$8IiHOHYe5d5 z`XZmmA~8wI<LO%=8K`x}D~1`%1NWwTf6|QiHpLm#%Rn9g>&f1^X1i0qyW)Exj$j@K z&-8DqM=w~SiBq;wr*;?K-+DRrijp}<%l2`2rBjH{So<<MM7m=pQI{}OuvVFfph}e5 zF9?LcG$pE&)Xgi_W|wt}n0}tty#L81uQpLj)p8l^g(2MknlHor+rBLL#U}jC4^;NJ zI}jQu1BmGSXT<X~qJL$i%TP_|DSrCW34l&PKZeQ~{r6v@A3C@5Vu#Z7kv?Eomy?1r zYJWj@yiLw9<JDF{WLqc`(V481hfJ_;iE~-JSN;j?;%TdY0gfG4)oP1|4h4Q>%ykhJ zUF*`Kk#{@##ZyvmwcWIEv2MRc-PSY7=O;jKjM|IS**r$6^&YTD9lS`#sv~<`UPE+Y zVPE)ZSeo}w;;J-@-1eh*aC5-xkA&mL>7U=%9ig}*;pM+^B|qj_LVY!ndH-3=(SHab z2Vx3;4ds7@8UFK8=+j__8j@d?Dei;sEd;@gKYaav9EE;=s5i+bO4S8I9kzF%%7L5- zCt2>VA0(cfV%adJ^0fNKD6~paA|BM#>zFa`yz;4wg@P&YOdI2m>&k3B38%^6N!&}h z`MZP<sA@$F+6!Ve&8(Yt9TRHz#Fo*4T%VZxeoQEk)+#RZo`wlB!>z$sM7I7bBUIn% za7;hqJQqaPy5DbV%&^FcymXUp(kn6;#h^z^8+S>2H88a+Dx!|o+wKlFjDz`>%iP>x znMCGZe){u9HsQ5w840F+|Ia<ax+VE#o`Tqzdj${F9F`@>ZXT^|YNX!)V^VQ&=&o-* zBBvBLkibcm_5PWGpYzunvK0Z*MdQn*!yJufsY$|-SDX!suxrwielL7dQqa@Z9`_wo zjl`{DZ|=>K;n_O%OqLi&{>Cw#Q#a2yC8Zzf6iccboxmQBOQcbcZ@gB;ya<pXv>)9H z8eZKyy<gi`I9%E&(|M8)El$Uy)Adu!ucl#l+8mwmTIj-z)|(_zp*>ILhevo}+GlnA zp-3-*=W#Ky%)8g1tbNCebc59KhU2oWgm7NcrW~cG$(qeRmp-|)lVA0~bM;2qc4!Q- zA;(PkIL3AgORREP(RL=`-0^blGwpF(Mf8oTR_j8W5nI?i<NAQ{!=P5qvi1Fgwk8ts z7n~c{p6ZPv7Z^7lQ!Boioou5gguWh<xpTy?r%A?FyAe-pbRAFZ6m!IM@^ex}*6a}# zo#*r$&mChAmz@)KzBf~B*=EPT15VvZ`=3(}<osSElGJg;IW{TJyin-nlJWS+K^Y&W zt1u8@#p>x_J5KUfw)_>WIksN3bz@WIAc1{m>V>mrqq3$(`v7V$R$3oz*61QLZ(a6; ztYMt`Gp~6mqVPk;=MJP*>b(cIBkk1nf|Ojf`pB)#tV3JEdz%$;r12-$!<fReHq<i` zIX$KBZGJ;({oV>Mpg%w2Ach_|jQr)4Vw@W2tmbDHa7UbFg@g<p1vs!M%OKG1?~Snu z-FnuDwVXL!tzl!z@uR)dFy8WbxqyDbjHxN&?H<|j;Q-qBv8ZqLn2YrGv$e_HVN0B0 z!LG{M^CLo3cT7AcJ3Aa5tD6VR8Dw2kP<}s`jH!?68F&y@h|e$D*T&Y@@5bJok3YZo zw7iC`NNb^gJF^njf=3$?Ty2uwWktV_2>*Um%{!SExz-=YO&T8-8vE#{w9w<`I(u*B z+`!@F(!0jMr16$i?JJDtH@Dm0`ep0oH;H$|xl6k1wFG56P!%6amuuSHw2Ig5lo_YJ z*t2&~v+CHp93`JU^>%boiptXD$#9G)Td7O;Ey8uC0knwKd$G?le4f6|#iOLvK>3SB zT8(e;Eck9m&fD#Mr4_VTo+4vH8mhaL?y`=y^|u^#(v(9rC?*Ry_}n*KJ7S!8eMbbl zNug&#mj<L{<*v8SJ_sqBdRbGj@ze8wixI9p-|uK0#7vb~^J}$!O-SlX!sR93<<w-< zvZQBS>{O}zS6;E(oz%xnO}Z2k*!i^2Wp_lKza!%lapltv>rl^yq0uUzYMO8a+Z0fv z+;v#Ho<ssv2OpiL@M4Q-YtuiYa`dQfo4i0*WLV(ohDo`}Q>W>3Xe^(4SNkR#m0AZd z6VDf#_Z;+P;(nZ-A$YvceW=VgI~hDyS@=$|(SgqXW20A7IA4j3=IJqyGTFhUZGOH5 zB?d$ht%GBkY5CqKH0*6KB|GDtqiK)Q|4IF#pPr!&QGDG-b@G^`$;xDO+4oMr8sA3c z?9udOduF<RzLQ#?3Y`SO=gcQvYm;yit`}4Va$UAQ4eE%3{ZL9Fa~^ZcO?CP6SQ%ti z<>R-72>!!Mp_gwusw*K}h`is=i(h$b@(!75ewXgOcI1yd6%~3!8{_(&@7I!Qd-i^V z7Cp0-TMg&ok{3Es9ufi@j?)lY+kncDAv+&dhF3O5<1BKxazb6OnAn~HcV0ZhiXEjY zo!w&PegD`FbM2F!@ShJ<0?WAD?{Au$1^PG>&moGj^7=eO6f42tk|~|Xc%q0#P7}@I z+BaTwCExD!1Ia!jUcGa8>gm@{VJl^iSwsd$JvUhz;1{1?@>p}-dSS(EXsD!M|0V9S z@5cCJ()br^1}a<YEqt9K_|-*khP@d{Y98~2(+)w#ON(>MLx0IQR9DEl&i9K6jir1! z!<u&P?;$q2e_WUL=IW)j0q)Mkt=<DWx22W>t)6@b&9$Vf#tCJ#4v7M}8Ek5#{C<s@ zCK}D&M2}$}FrzZ3ZK}R~;Cc7Z?-G*#;pJkdE1yi9`c@b(Mt4P~=H9=~*fzzdxfnZ$ z9z07-3z8gi&He%xiK0(&Ethte*)Fdw+NgA$SCg5P3yYQX+AgP*KQC?GKyPY#yD=KZ zrVnUh8qkaW8Ku8VYz$BnK2VMO(-06_$Uk=c7YFP28*5`b=q=x7H)rd?$Iw=`!Fq$- z(;{TxXJ_Cz{LptSJ)u_kX+`a(DDT3+>i$x=(A*X)&ZBctw+Kk|#iu3)otEtJI|@_N zstz{VFZwwUtMSD|jaVx=ys!Uvi~{Z)TW{8$04rSPdyT~_-1V*bwa(oEss4gRq$l%G z*Ri`<kEgb?O@k!hl$@oj@07?}_h|$E)GZG8?X3J%ou_SENA_Z$(J6L=t@&^+L=Fo= zPzb^(LC@a}qVhvjd}v;>L2!wU&F=4C*`S#YY=D`{TM-6)_&Cr#*=au%xhuHt6x}4K zd&6#krx)mDQZ{f_yfEh$gAxn>kYEt@u!+*A73Kb)U>&MTr`3cV$42Uumo}cFhc^bz z&H3a(AE3X*VS>{3<pnhkwEg2I8iF+6Fjn&~kAap^=Wq0ezc;xq(g=C(Z_Q{19i!Qe z{lWbP87o|CNtIh}-Th?*NIZyYgCtt}EYyXZ6%)g4n0Q??F&;F`Yy;6>x-->4_t@Uw z{*c5ER<bQ<C=L@c5|Di`Dzki(AczbZFXa%UL*xgC;MeczU3ku-ZqV6Clcy@GRVj13 z#P?M!x)nDSjD5b4boAxYbGydbx=f_&^4KV?J0!vCV}gpxwNxu50X`=4Rk&E-&O)qd z4<3WEJ7NL#yF<OqfBI1FcXvhpr4Sr{_NubtG3t={U?v9vX)kgIdd6wc)O{HCf;!e( z8eC<m5#9eeq=6hNd1y)ONXQ1CwY8vUe1$4FS6Q{h?R7XZRmNv^vo}HDVPF**Z$}cf zmXWsl@%1%4@Fx2QKs$8Hg<6dFKwRR#s`L-)!kvFS<9n^3UUY)aNLm}d!VdT1qM0?+ zPJ#Vdq|opV(Cfcjek?SvANxrp;yW&>tX0n-s;AznuzZw%Gx3xzR~yy>7OYZ=1U=AY z(BSYgbDFCq6BSZjkC%ZzZ3<)1ec<(FXD;`_BE&uplJ@)#v~nG&5AG5GXq6>-n9^l^ z-vj)+wID745sf~sRLf@s^b@w*KOl1Wfc0>lPjyjuhFl9!%elnR(shQOM!!2U#v(c( zT_f!Og$9V;K9{}m+%6V~{kcYX1T}*&mo51$G*?96`gGblGY5b dK%5@`)JCLa?5 zNgLyphV&bZ8BuC!Szw01i*M-}aIKzUgj>;Ny{2LTAxHFa=sbtGo>JfulR$5#F7N{T zUzgarpDx!Q_!=vG?bmY>QH-w8F$j4ol36-ZR~gG^YI|@YwjX@DwgEKb1(n5HO29p! zOyFWn$qX!dn4fU2E-EY~XPfP{psGpH*|=ZnY3i!xWA6BJoBg8EzF4(m8uv;`y@Hv+ z8_{qY++7_Lcw-d(6xf~->W8?e{!hyCwxcJ_b*|?t6#sSge@=qa?(<~)lLY_zw<I`l zbE+%GB~amY`M7Pb?<ZJ9^|?EG6YQX=-X`IbS|@louLdc9P+c$xFf-Lb+_Sz2a;=)f z!DKdNxhJANl101qe>q)^J%;>xbg)1*L6*wl>}_x_=rs-Q+__WiN3gK6+QD*#voEZP zfs91$pJjGZ-+Jb7m9;#~8ARJsO3moj83189;PXl7(NqT6AL0cgOz^F(URH)wAm`n) z2c0c+(3t*tZgbO4WM7MmiMdatg{AHOBt{`=*`)P<L+f9a1~U;f;=#CNz=Y_bKg@!_ zzx}(oznuNeDxp1S8IU9X8~Q9~&jlreFbl4K%j>|A|0RQihWLMT6#Dhwsp;RTM%cgS zrT-)#|C*A|JsyiQ))>#ZkTkvE{+svPTJ^ir0`;=fatAE1==uu6E)(*>SoJ%SIb8Rt z*WgENySjlvtRFQ@TW6X`bQgiK6=nGdeAvg8b+CGh2+S}Wv^#PpngZ?jZ2s*p-q6yX zdk>oJT+jvf=!2M~H299#OOkPaU(x*<{!uZPF$avp&KOT|PvQeAf2t4A=#L#(fwkN} zBmx|9i8<R49ksHk<&LihH$+bux+{k=6>}k!<u?}fi-P^Al|bLXG3POlnS@_c%^+jp zy82JzYauY*N4xRvPEI*`xwFdHfb-a0(AI$jtC|&P;hn}thh-e)JK=UXwvi@Ha9!o~ zvGJPy1%;?Pj;AEPx=5!zgWKtTnE3YNTc~Evo#c)~ZTR1GyO$(fa)&WRKiBr+c#SQ$ zHx{f84im7*Inb|FI%t;n=HvL5!f@EK3BW`0jIqU4pr08B5NXtt4_U(2U7w|ZEP?2m zsQe76<8s8-*5tXv1Wxd@h;G~4(%UIsOE-HnRZb@*T%jsHJUf7;Oa*c}*9|=~GpUrB zTi@MvC6;YS?pj5sfL{CrApQ`~XZmR<EOKeInlPc(r_Eepb1A~Mpi;HMKzRMId++P3 zvzA|;pM>@aavi>LLrd7NPn!*Us^9*kOmk5gK))>;0^wxzKtc04-hx~a!*e8aI$lZf zaY*3Y`8@7)+RuOH5I7aIPkF=poxUGgy<3mt;+NfaCuB3%A(e=7`{5pFrypA$F3W++ z88oFwIpv%n(iH);O^K<;@_bYXOcX`gf|cztXiT(S`n163+{9ot)a+_bdiXjPO|k}! zS2hGp(Rfr2xL?Hmon<j}{r)H1`)>0hV+H?nymr9$f$X?ER!bV!L&RswX@Y{q;_B$W z4b^dbAeiu3HNr-QguV`sIvhL%^{F*Z4yrR6sWPLqzjV58(RFBRD>S@GyYaXw{sQm) zc*&*8tA1w4QWNiA-^gzH8L`WlsX%JJl6DRK=5S_B(3yt=44$9ZMYC8z`yV{&?czWR z0|)eqcVlbzm~KAJq8Z{bsqDgV&I&$mIz?EDMNc_FuvOTf2&|2=A^K?sEPxWu_+tto zmnQd|@*E$Nf)QuimlMZKLx2=-mtq3*{o<o98Na2Yx<zdWU)tvhSafYF71poK<)m&? zIHl+kmkJdn5{XOzp$&fL4(Q8Am7J6t{+HYZd_v&qV%pb9$`LH6mxYz~VNk_D#BLz^ zUWuIidEQR?Px=P8pXBOXo<zQQ$@}38$($>e-`pW0D3AjdnUvK26}<EsIAFI8LFN_E z-lUy;-tg+Rd)$f&1|~oNO+Z*UC+ldL^oSe6_yfX-KfgU=^5%VmzLF1m(d+vZ2&TW2 z#jEjmX`@@y?Za}@MH~>}Ofpl!C6yCuPMlqnvFPoq=lG<UUIx!t8*zD7Kb>y7_ri*O zc%Rc*MIn9UOq!yS<LIHN3@jQR$cfZoxSVg4u^6e?_%N{13Osk9G?pOl^e906fU8Ro zw8b8ze581tE2ltrQ3{H2bh)Go7SHx`oxIpYk1YiKEq}R98mVIZK;<A4=RG%2l!S6t za_lc|R%%`Y`@XtO{o%rjIC)g}(Ql{bCH3_SG3^<*MK3qeeADStYM`Xa(LtR@`d8w) zs7%To$H)AdmgItLOV;Q6+s(GFpEaB{Sa{tQe$shZ5E7kQV3GB$IcQmGjy5`{uP93Y znyl4MV>YSMtZpcLcj9)0oeXIi8E0zAPfe4y_z$cCEy(qPdTwqQKW-ljn&hQ%t`tA= zFyZIYkmUtK8<ekKTYxXOVgr4@`bo1-RXm&%S?yQ3<@$jMNj-hbWxG(;8O`Auca9xw z&)NZ`I?YCJk)3rrAiA(t+~gsnL*}W(s7e=Soho})WFhRo?~=rs#(m!VZ)45@6qRmA z%wcjkLwiEmRX_Um55<0i!*NLy{@^1p{an;_&-hze=0F|scjJjHaYlS*B72(}gS4m1 z;+Ha|bnb&f(79(OAz_4q^b-NUN*6x}R&W=ULsC_m{f&-8?T0_kIR9I$GxnWi@1cQ> z1<Su}i~kt}g+A}!;m-ffX8FHxxIoeYw&qBqPj007aW#kkVsY&lCU92OE({UC`^#lR zc=8#hzd=qeZvgSKLFn??{m#Q*|4rATSxYD(p}d&Du@>QfYrW6?c?kRdP5t`#pLb}R zLxlPNK5~50=#xWe)#G^%%a*UFfj>xr*zyW19CqUG%R7;MRO5bW)9#NKaH7ca@_YTH z#Vo?izH_(_G`T>s@E}BMn8W?f-q(68hqQ9=9~mjO_#a*llePy2kI=kZP2m0|yg4km zw^$t2_0EsEdx>U8o_HTBs{^G6Nc-atV%eeyevO;gTXSR|!07NE7_>5q*hYhXedgqK z;nKhN_2EH-bv)OZOn(hJ>0;;4I3PPj5ETOHMfCUcSO?8dq(Hf;=7`N1SV+Wwf2OP* z7VXFVF{Oxc8><#BQ5|}bUlcSR3xcxinz7DhDn`Ug8cfjxbSQ_-jn!5&h}y@GN4+=O z0nM3-2|`wQ=PL;y*WsJ1(*zBrkpEG=6;zI2B<}*@2DM8ahYv_r_=Aw;7NRSz6EE^> znFO|-lqihL++C<^-+80oFsJXW^0yrSZ($5V8bB0tFZQR2915r>k?X#{R-|(={`lyH zQH5>H_}$1rp57cSY(N4VTn}oOUIVqAEr^f+^9MA_b5GRKK{(u4xjAW6!PmtY<yn}O zH&wtB1i6mfDZRFEJM(G0q<gUq@UXENtEmDPBB)BI4H*~VELCIET_BYZBnMRpv`ZD5 zRP|g28d<*W4tbV!u)MTC=$8?IsPv@Vmgc`ux1<adzxMce@RnFBFAZ+KEjLXYpLVQ# z9G|HMNKfrmB)ZSgR#YW2I8Y4^K5-Qrp)2m5w6&^i&J6xy{Yv8rLxV@(NkiuFiK)Ck zkCXhp{i{zhVwsAU(^1P1r((gj<9XaP+3{ZjlC9>?MGAz46jmwUJbMK$m%?a<444rx zs@NU)`eluK;)c@?#cG_6?O-u#<_%SdwULCM3yX-u$dKb`5vZk;`6(o!u|lK(g0MH% zId1D4HFZbiYu3bq>)zIm1vn@93!1IPvzg5!-g!rnch7!*psfPP1jAmZCbe_6qSX05 zV)dyX1F<fQ&?so%C0w8XeHy4<LDC6iCrz=DCqW0+W@#Tlj6?)o{uL2biHz8hr|P~X zitXA~Chcx(2)4iQ$7mEFm!;J>v@5+bMJVV;{#pYR3AQ>V!Q1SqtYOrX4<??1#@_R^ z7l3@xz*127J7O=n;%^+oja4`r37UF|fZiYob=muvZ1yjOu}DiCY!#=dzDFTCK&K%t zTQkYtpNGD|KM^s}ouzu-%i&s2wY%evAp@_xgVF2YivVLEW#LB_!@eo~sT!4nK>?)} zeyXFYE?zx9ME0fMv069<#6taD>+wlix=u<+fot=(3!ddtGgf-Uv_1v)8w5hzBW=(t z_69Qg5Y?HG4>%h4F%59TP1+%T3eA|c^(!9px{+h_<@ViDR6k~yK@_a%;NTFz77$Bs zVjdqz*H+p^K7ND|?@-i;iVI|g@KSW3j1B{1qFCi=Dt|?I+POKPK@ouBYZJYeIYsyV zlIr!#+RhAW5@O{j9pMPFF@f16E_nYMlUdeOKWNe4kvJ?;h45V!)culyf6p{-Vlv@0 zYGACY3saEyfAHi={?(%IrGiRPG)y`#P2?|$g<a**X}Se<FRz(o-zqRDvL`C{tz5t* z#l#>TYJN3E2f_3Ax-0AkpC|7;F;Ldld!VXd_+?Ghwy$O16sUgf8DAnj)*eCKeqpA< zjQ%n!&c$}l7X$<dxQ*9fq0u{8i{@kws?uu`TGwh04xiTFJu>m<>V7(r^1V1}zy6xX zNp>*nx?5ctSvow=H2GvCGUDih3nD(<la<d{F@bhom|KYbERu27iDv3mhFl|1TO!|! zqZD(fj6et}4D;sS%xDhUxJ$=&Nz$#*G$JLZImRRERSMQ~!#3&U+gxWfsi!Nslujmm z`Xfy^<zEu}OV6rR8!KEKu2rvw3tB-`52mp0j{}jcq@<7`N@T#_YoraUM)!0W>&-m@ z=lx0C;`%JZ%LL3D+pP%YB#d{h2UyG{Yo|u}Z1_Uu6x2=L(2C`mx~h%Po0^bs3%)=y zA-og}si_8dPu^*m<YlDH6h*xhG!X7+MrI%oPoXaC<_gmMItN!zz6bqnRb>LbKB9sr zrb%@68RrRuOSMhK81<EnuB^X|JZVNgM*I-GNB1nW?a6C^79T#zb>+0#l|M>JjDy01 z%)M=Qz#hR}K2#_r?o*Yl79@Bs8g)*jT#<o|F@I8`r`X!Mw0(O1mqp{Pku%BSjr!%x zS5?BxUGHX49-;c2+n8GDT+F6b>MvJHQgaJayQ}IL6r1zd@DlTR<|IXmGc>JKv{SD$ zc<5*{?~1;w{8IknVeV-)%D?x+9*OuLA?-3NV@tFL59<BxONw}GZU>j1i0VIga-dOL z#rVY|{SzYIoZ~<+WSG!)y*n}j=yhK}#O7<zjk;4X(r}!l#dTw>XTzD=GN<83Sg8aM zU1_iY0BYalyA)aY*cYm1%S8n8HB5inu&#!D)3Ds}lNqk2etR31Es=l0sRpz2OD67W zgYynF2kaSM;U^y+-fX25kq~nUzeb%gH`29`?-BSS=)4m;0TivlD{U4OEF)?#7H<-M zYEq?nmpT-T-<RoYFjSEpjyyH^)@?(eFTrr{l<RX-QySM40@iU^wsEL^H-Cz?FceY% z+4X-@@G>L)=8_W)M^8U$#0_!@+S<?-w%Kd*e3HBll>0aiZs2mly`Q|&j*l&PC=VWM zlcHu`-2gUshDV!~WO>6LRm`G=NmFp_A$&}cjbN{$!CTd0T8o=9-K0}^(ulFTL;cV7 zu5CU)f9LkIn?Kp&rlWGT0lo~PSdo8~=21J{9G0>)es^-13trsQ`@zW6Se9K}>+&+q z{Ny+#)!mgT0H&5S<YZV3L|=#-&ic&M(~h65G|l_N$lu;eh4$+#F0gW38=j5~h{}Ss zb*r!@uiHu?H7Qa+6p$6&aG1j1=6f8-DQ9$dkCCRGYM_dfpDN4R3vjW%P{nWtwf%Qc z<9|0TQJ_=y!289eyP2>y09b~a1OX%(Abi^Qq3~Bjn?*!7Iw6Ws9bQWV4qGrnwEzD| z900MRzgqZ18MyS$V%a{l?Wb9+FOQGc$GrS6-6kM01pcNYI?%*Y?e`$G5V933j`Owx zXy`vj#$U7lrI`Ty`5z)A^v!=U9#QhZ38RVuBrQh3B5?e!Xx+iS*Ba<XO#~d5L5SWU zX9W3F`gg)PTu#=ktOJS0ArH`8?X%}9>M&wW9=2lDEwj|D|6p(Jg$0yHzyX?p3g&4% z5FGzCwis@0`XmFWjb#HlD|j|gUmE$Yo2g8rTVbp3MbHuW0G^qx2D*#UP89Jyr9gh? zT~d-AWR!TA03iR5WA%n;h~+^FQ8v1o0lRI&m@VWwuh$DSVjyFc?V?uBw8=el2yl4E z`h>IXX~?aHM8FhFcy~u4ucPb{IAKBgjOAE}Tr#0+5Q5mbrcafPIL|KLmyKxWq(XkR zW@dZ@@M-^2-9L>SF)EfJdVL2%A@340ZWSA2>~8=c!ABPUSGWKgr3=|`0&Evqrm$Wa zJ86A8lBHLGO-Hm9($Pb8M_$45V0VEeM-LQ<72f;!1%ga216~;U7aRNuBt)cJV8Gj( zp+pS|G0Q`4qwWb@I)sHvlKB4bsjFpH(WYyD2b+Gx%Bk?OhV<O&<8wncUO|BbmX3@B zNq2|+8ixZ@(N56#yD4sY=Na>B3^TYPS=Y85sy5l<Ojf-PFgBx~Dj*oo$bNKs9C5_l zXFt!c;KzRI$0w7wcCe3|!^w{Mbnow#TD+#YaHz<_dpm&*>cOG8Q>j4**X<iiS2)h} zplclHkR*V8KdJYQB<`~3Y&yoYJr&ebfbxx_eKqBEh-L~P@jBp17;c(kybpy4fIn-` zrVtQ?kaSxV06{sX;rQr)V8s$72XySwdJVvj31bI9Jdv75MgBt3W~2h`4G`jO7*j(s zoLfL}s{_#bAT_zg)rxU^U11?l*>c?uev9rXWQDpYW6i?sj?0<K*mGXv1u{=8LBIfV zW;rQ#4ZJ6TWSBM$iM>O<lSZ|k70Dwq)?O8~{V%&E!o`1_@baer+Oygi07lF|Dr&Zx z9kk`ZK7M#iao=@4CLq1z_#WkCHe@2{Mr4=rR_O%6yMDlrvP46Q;1zl|y5C)E@A}2M zr>MdanVBVF)NsjYip;dY_I+(pO~}RbDb(dY5lQUzQK2}idf|+&oN{L`=2#rs$FNJK zyaU*P4yCCIcquot-Ma)BVMeygK!9?;Ztjwe9~5n*()`5Syq&;v-!UWXFK9L%l87Rx zVef&wrs$hqP0(m>;JczA{~W5<99N^eraf`xl6d#iJ{AXE;tN61k<yWp3-IG0#j+rj zd&AG&ZQbs!VWjN^eh>BRTH>!Vclau=+((znM>D)b<W2>$Qk{dxv5uJ|ixJcuH8i${ z1Fwziyix?M0u|iBz!{rFel0R?mIva7$UH<Su<0tiNFzyA2QgicuOaw3<q3>UBiS37 zUU{cZ5q^hG81N6j;&K?-`KFZO?hN$%nv^v0%EnJeX^59h<w^sDWEg);Cpb({H40g0 z?Mr%DYBEx%_RKG)Hp-eQ@P$*1Qs&GH{>jS~ryWL%HL)?Z856H1-5AG!%T)FR8LU^) z^Z+yPAA0)KY8%_5A`UxqVd-b+QYaJoDwV+VxG5sFRqfFuj5_UFifhNp#4cC7JR*pX z<<id|BDBqF$Et|GyQU%kZbE>Wqq6=rM!r*DRJFvk*#H|PpJCBC_;^WtwkmOEv8?mE ztOHPo<&K;LTZZ<)VL`_%Biu*3@*V#qn|#J}<%3XaWkprG&#y8z6yatW!K2nJs8qZx zAR$Tz;}un-KfD9W%k7POE~f(Fj+vDD4y<3`ZvEL?CYBKcA3R(k2#kyB@KSn;V5p1< z#YpPsm7ibH#o~TgS5e){y;nd@Wu5$~4_%F(=3ug<qZ6@j>Ob4vmHwbak&r#{9VDEK zdtXZLUej5*dI`~!^-!+OMdy0R>}oUDM1cfiNxW+2#miGwJ||eTPFj%>xfuirw?uQ7 z4wpq2^FtKN6#IO6q0-tqavxk`G#zv*VL9KcB#5nnoW;86`y9oY#h;%G%D8-Eb^T%L z-(Y&S1()My`dV2&5Yk4KAp_Ae!ba7EYTrtlg`SEc;Rlf0A4*FX(5cWK@r8$0UXMcj zPA5P4th$3{drP35>&tt$w}24Hd`u^UnJi>+TA;Ng&pMe>s4fiL==F3t71JFx{}G%E z!scJ&0!o<P1-tVRmpPr*#**z1xP(As0JB$hhEuX<|A3sC|BoW<SSdxw#B?Z_9NLxt zY?!g(aO>Wf;<3!aZ~&YChIU*8AA~k#aneX{|DKA#fr4hjU0!G=XB}3$F)rM4Ne+4i zN}OOZyCVX`yg~{y!Rh#CKonoO#GAV-jikyk-@R>mPX-I{Z(mjZ2ZkT}M1j^|!i>W~ zgvWN%NiPlC@j7IVEC=`(02}E6ID{%o%BQh_I5pRfTZI>p<NJ!6Pv*j4f5Oq>6WPz| zwt4s?&(R}{s!<igI?KkAIAifR|35ek1K+<EcoL=-ItLPFmOE}N7@*dTsqmGZgG4R# zh^1r1?=9(U(7j<<Kk%kwI%2&H1=Ak;F9Ao4U(BDt#k6}i>N7YoIn|z+b3uX<Let<4 zlV+CNZb)MMma&VR+}!QnSf_$yH;4B2+uf0DuojDdI734nbnv@P<H?UPjyUQ_Z>(>@ z9uvl?S)$Bl=9q4gvc4|TP^7oSQ@6MDv5@newAHrr*E0KIK_Q?~RA$@H1$qzMM_uFQ z1|vEy!tyvHI_O%z+ABlnA}A<?Y=~wjCKz)}AHN%wXIS+1X36&k%W*DVd$tdi|I`(r zo(m569Z0kn?8ph@%4~2sC6&K(;xOuLL}b+3=8q3KhG>1<VY~st08M4M?uA`<n~z60 zOU;v%4`VSvY_t))9{=bFr`GqCWqQ+!`}#QFBBq^9wPpZBb$}EW+SEYPv!PcP*p@ng zMR%NRghM^Z{h`7OMl|$%iWZQVD+8L{Y%>4UrW6G}Tsy+aB}GVA;jaJS0wFU%4)SV! zaL9Zf6c|8+<^9VZFYE#P-HxwvB5-#L$_yZTZ@+LUs;pCt!nvQlAvNj)1Q-;6f^w6B zIG3fwauknn?o{yY{UtN{$(39CIYvI{nCPWa5RmLHM#q_Xw!R15;c#N_nqHTvHCV;2 zi-`>a72a=-tw~zvVRV0rn31g@?GgO-*2Z$+`RP3`CBxW&=rlkOnLgdlaO2T)+#RS2 zj}z6ws1+D^S++o2jQW@ypx<>JOo)+ZQ*X!~hbNWx47^Xzk1osoq73c`xi-*21I#c- zy52u%dR?js1SQK<Ca#5)-Ukx#b~B{0TFDJy3lCn1Y>@xCY}*(+_wYxMm%kaZ1km;0 z^7#2y#oqKC_?WGtZ%`cR3=++m<48#Q?1(5#Tkr3wr@oWODVp}wX!qlurm>iyp;QmL z<0V;9Cpj7@;O=aOK^WN_aM?%@MJ0}x8tWNH+7{-rk^W{wfR8_;0&106y31}KDY<|W z_0<o)y%N6a!#Zz3^GqV$i4cuM;Z~?oq&_arCL^#sQze2g@?plLq%HN`>`=bA#cKsv zN?2aT-^iNsQC&rf7z%8vWqyC*JXX;;AbP$cs?+ek-joGU7`6nQjID20?A|dfrf*af z0`%esa5*rIK4io)=!)6(&=XS%h@a5+hsFgaH~+63+nBn#ef!$2O;g9jWJ2Ah@hW)A z?5d96RSPWDU8-J|NlMT7e9C_vE4myqhkSHc%0*`XB=hYo0yZ@)?Mh302VKsbJPmH^ z>K#G-g5@dfPt})lAqYt&!=*g4+D`zaW&a0LWw@yEHv71U;LK=^WLi%R>Yduf+d4(j zE9~L@*^}~+Z=S3EpHpmYuY4#YZ|;Nn?k(<`Fy~_=R{voY2=&H^)6S1n2{n58pZY2Q zrTJ<0NEfh5_E3OEg2SJF9v+5P)kB`ne`i~VZ~UjO{z_8>D$V<AK%5om#dfTicmx)6 z*>FwX$OEJ#d&VCi^<3!L^$&Rs5-2(Qe=1V|#y_Nm1K_?zicjc6xuA-g*A{pW_80&5 zcVJ0}UWct?ut<zS;k}1YH`jrIuw%`y;3{A;jsu<sfQ{4*XrDkOtjAH+9u!ZBKpGVt z+5F+k4jB9n$U_~XFvWv3qxH_GB2npMu$IezxEkw}<p8o41A?A}$9KI1+hci!z?LEi z%9yLh+TEO&($f6r3oC6PZV%8L+rJ!>8pt<?(TeF#a;&rAtNZ<E4LH@~JE>H#{Xi!4 zG>lE?kpJ{S=(~6$1XlAHm0t6k2Wabo^*o)wj%6bTg}gU+ky9sf5`q_@V%0Z0kv$;0 zE%uVdGgtOF7b6mv6?Id$8*%$kzpF(?XGQT{CU|cOdRWUT`h8oOGOJFqBZZtL^yK() zSFKhiMo@JT$;FQy4Hc>Uq2ek;$I1p3TVK2G=%1xr)gdk-tVo*?AhANOZqLg}nFsC$ z3EYs3KhO`b(*Re!HxMG<z(#|Gig%h7w*9*U8NC9jz+9$F7@)hmt8w+~#+f#?5i;Ak zG>S3PPEG;QUohw^I+2R<?;fyy09!Fs9mZnm?fZYZK=3eRJpgL)J&^LSe|eer)>CNZ z4Lj|dRR)<4Kmztqb=r|atr^s{H*;TROtb=@0IQq_Y)ZoDlq0a)j`T8MnnYes;PirO z5qkv^=bduN4W9#!pw4!JiyI~Y9C4LZ1T!UL*>MT7Ht;ex;@(D%cSpXP(7qDa{}c$g zBmkb*PyU4jtCSnez###E#i0-n3)Nea^@JR1i-kNDKtW;Vdom7~2>zkAmFmA0)HS&f ze64-)gk?6QW2uqy-ko-#q6X;HYJ%yp=%d0s_4caD_GTCqgaj<oAPowEA^c~F3ffvS zAWQK^vg_Wv5Zta&wcevnx;gXxv=1w_4CqO#ZX^_tALQ(TpbXnM{3U^tFSME0e5ZI# zvsv<e!Vh2|$940^tE*ItcKL+M7i5YvNaC9#&N!edO`q`Bd8q-&HRh-1`P%Tw$IhUV zPxlNpvL)m=CRLB@^tjyra|_r~?|J2QTYZIG*T;{*vH;Ek5+{g~l#c>ik1dnSlNVO{ zdZPCP1nK8bX(mhbyYZOr(T}<VH4=M>?f`iY5CVJv#)N~^Dvu!KsbX`(U$P8(gNlP7 z=$x!&76pBR7l%Z7A5XW%xDCC?lnWs`clNpv6Rfr)ZY6s$%hncC8RTUqzY>Hye44xN z3~WG#VS#25KAWS1yBlaf-Y4wLu45aFBjA9Wj3!m&Y?Z^-{osMEena!&os0)B0#7G4 z^J<|&FYuPGab$k40gh@XfF%R=`*HY@sBR3`=Zu1uN}rya=T6bS3cM;2LAUs1Co3(0 zEUiI6`_#_o7p%r{Qb`<*(AB{hH9itXV;WJRV+#3>ng0Di)cI#;f(oGs$yGT?c@uIt z_W<&_tAh(>D)5lNZyt@!%7jf&^qF={rOrakW;KsWy%rqK0A3KO@84gRRC>MRaRip@ z4W$}Dq*gH>IYD_Q5yEys*(mi~wOWLP8stC$+G#pF&*?-e4RcVH*bkL7fOhAbtWwXO z_^N0oJKqE`g(lWvbP>g?5J2I|GU`lkqBD9~dRzyVT~m6O>k3j3v7k77zRgoxSv?~y zg!05ZEL37<KI?eUmH8S!P(|{xxNR-ty5E1+ki#V6h2#O0-QNVJBOM@7#ewn!Dk+v@ z(mqsxcL5~o-#ZJtc1Nq-`On0kbS5x*r;t?{=o;3PqTc`<REW>zvWrw;IUgyLEb{EV z$!FVNKfYl!LrQV4fe&>~AZvsFt8nzdc`0A25Y8tT#;kOX#aFV0k@+iqJjbhCXGI`m z6sn`2ggZ}iyq^GbF73(T(rOd0h0K_gX*;2lmU*qXO~`%8glV=*J2?#^dH^y+JRn5? zSHu_3gP2D^w06iA1=bl`yxrwI$cm$7`XwB$xiKE;Jn)NpC#`Pho|y&K5I@G-rzG&j zN6_EBzyptiG^3V}!^?EmrI5On53hUHQJMoHXL+*EMaAx^w!~bpb=Ic73Vbr@I`6Gx zH4eA@at>86@WE9Ak5L@HF_{($yc1Y!y*A0lt9@wm@na$*`)WFvn+&z0ZHrFLcPJR( zmUI?Q=y!@mgQPNo3^NmM5aj4y<A8|AoL@1OlDQdcY$aG^j3qmMC`N#0JUu?>;u+){ zs9ilndxoiX1B~GkdW~Oc*n8*-9q*d7-S0lbiu`On3>ucr0>UoR{S4%4yWJHTt|!qd z-|#^GA;d<%)j(C01Bg+WwPLo=Qauv^IR+Mdaa8O)=F^qhyskRyXYYfz5RJ{600BW3 zKGvn9ibTLN9&_-OoTv5waEp-t@OImSlS?WkW}%XX(VA0avEei9wVhKEz=sDE+5KIh z9os*iF5byiFR<~oFnl4OE)L>$OSkEDYr}1CTpI+DlyvZ9)|K~pZ^KI2O|HM7gz;Ht zu!T}(=hx;o`0HhTD&i}+Mvvz(rQp8De_dRO-jbJ7!tH(?wKjYEIkm6M=lAr3qXc8V z?4(KDXn3f=6<<JRa;)jTP~Zv=YNSgm&@YJfLqAE}eDD1I*D?j*?EO~{BOMJ%M-#qx z&h(s!3f)k=w3l1n!K3Bev5?~3%t?9BuexUZR^$D|E9?CSG(aF)BTzvDoZoybg3t=r zq>I!(qa+_t+2Ah@?)1{}Ae4i6X#4LIR9McHsF)af$rJi_O(GSH*z-X$uO?o=F)VXD zi1W2sv!V$N1N=*dZJl*|{5%UBXsv&<WVNB{t?{G<cAkgaN_v_XK!5GMAAf}HRmAVf zkou;x^x`^2ARg}K$2X*l&40DAzN6apG?01fgL)j^ljoC#&??oN`FYib?`Q|^9XX2U zPjF#hautdmBo&X*UA~ev$;xG&f2*+A8C{=fPI1!o?Db0)I%kkTGWUb%SCw){Dxwrf zXGPyBlrQI>q`N#Y1zfY<pP+rL1Cv9^QytAyek~{*NI}WFIUQ#neoBz;MIbZZ5%${) zg93Sm=05$$t^_h%1455GvlylJt{Yt+pP=3QKAx@320JjOwulS?Xk!<6wRQ>z1-tFs zfHe#uu$NCkX&INU@DktJ{Wwu&4Q%18e{M}JtVqJ5;r{h}c>2V12_vVf&##M*{p9<& zSbQn#JN7!31*q@Fq(r5e*HzrX+V?-ZBxI@ami(6~uSsQz9O~4l!OMHi`G|m1G&@h? zZn?GVb;-w3(7G?hyvYbG1A)eq{ZH$L^3hr{Ti0ZDGlZ?Bfq_sF4P##RYs^}rUGWX8 zR38lUk8@chr^b6DGMp!}FamJ1zNO-@EY)VcZ+f9mr82EA#adVEUy``AqW#O5Sr;xq zZ*sD?ZccjE%$Zk#B7S0_sQwe$&D~y@v+|sjD3IE}6X4V5kvS;K09OS%{tRB>N2xpJ zF~#K{nt`B^9I*uwGuv<^m|p`H^6mH^=I^f~*T!%=BE}HTo!9?JZd=>uq|Whj;b`)z z&PPr!#kfxf4-l7Y?pnSnRiRVl%KJ<U1mWcmI}zJPqd9feDh2>~gB`-;*f4Dd{ukuF zWf#)*XTRo>qK3&S{n0#{z9k>s&R;(=kXHrvGW$1x-OF{vHXA0#4v0L_^oG4z<vJiT zg6X;Zm#&c<_z1nHe||)U{*NKFoIN9m(EtA>y8b);6^iB$S-G$Nb58Lek3#?Sw|c}s z3B*5%fx^F%j=^2}hDYtc5foS+Z6%}s35pGXjCi46!TMn(2aKD)%dNvZ0+P5>F)~8z zAn)b@CJIsj)rZ8qEdkXKG94fS&|eso6EYyHud3--<BsPi&+l6Oyg3yn)G=(8iaJJn zc^11kw+U>Q0KbyV(&-9891!UbqM1XvFf^%vbO3hO6*!nIK!k$Qg_BS)3%GL`5aR{7 zNxd1j?SLfE<HP{{tIUmbAM!`*{rFhL87DFrpBW*8|DH+q+nr*Cq#4>%XF$Fo3i%Fn zKt@_K6p=<P8k~%A33nNXuYRbq2O||-ua=r1=(q2^7HYox#T&3+h!}!HS;H%!pFem^ zIFK%^>#>&fMszY?^`c-ec+z)ws62&1rTv(p2?3Dt>}H%dwIoTxP}Bd~O5<t54#e8a z0}FP2urx@N+93r&OA!0{std!P1G+DBFV@jq2!$7R25NUnP-BJp!S<jffCR*#_$t{E zWKKjNPKXVN23DtC#~y?2-ttiS6b?hape#plLxr1EA98{pNT9q$DW}mr$91FMlmbhn z1dtWAya$dNht%2Gu5_Z6>`sELN($6m0ywrwkHc>^-2q08l_=-UYL~f3Wm3_cKk$Iy zWCJdPekj)vor06;-UFoyyqxkCP$v;t7(|PKGZK>BT?rch#DT<&crFwX0oEvnu2~H^ zL{*f#U4V9SLfLnT_V1gm9I5f(Ud7Aq|B4{rz@g=OfE&1#ZC~!g844JiX>M5wRISMj z+(#dUtqh;gqqETwnyy~16G{>TYO?y5RhV6)t9Do0aR76{9UAan$YN^;Bk>?ekTGAk z-q+{g?N?Fzp$BC~fW>bee_A`S&*(QWG}8b9um%`#O@JTG3By{RfuW&S`EWYhdiD+F zS%4trF=w){jOnI;oQ=QQN7{2;!0%vZoFtGe;KRmeRQlDjTG(!&!|{z9@GKenORj!r zblF}yj=z2vYJiGd0uja`1)HOPjOuQr>2QLl#u^;Xs!Jx8BHMRWR%Z`1kuIN*3vRy; zdL}*vwRc6pi>1Y1VEOq5jk*rJ9K?%CrQf+SLT)%aQm_*}GchvQ44DGqxiy^)s!<=G z;+qXK`O?2V7~cn`hE8_&P0;Oohlh45r#;GBZ-@qv9sWLITU*C}vO}n|94NOYFmYWe z2>iIz$n#s?D3R_4i?DU1QOSb<4={x{hxm}$h%#jc&SHQ2-wNYCAB%ul;8r8+{sZ5Q z0`ml5zta64DE?tqmO%7NS_3V<@=6_}7dOAmQe);rTl4h`I!3CTNhC$RXQpfLyc9#D zyG0)#ST#5$2j{YKU>ru(_5@%`PXVxnUtSOd_946er84{*9=X(pv&VZBg#qQrCxn@Y z^Hk~^xo=SyfLk%0!3(nkkhl{h5RCWNnwT7aM-We5Omj7C=A`~~B|;Dw0*mVO-DAZU z7l+840T2?4@vOnlg)BUxevjmcI$8_*zc2=2Av3__q&M{lOpO(8-5yt0DGQ=BFN;V; zr+`SvprF1X{FXK-T0y*b@`=jXxFLuY2P{eGT!raMbh1BOr&r+*&;1^ld2m&~{uJzP zy63C>kGY-KO+9qij}*uZ_CY0pB%sjp(@%N+_`UwC-Bzi5+iVwsXD`df$qF86^Y-r5 zYnPu5xVvmt<*FvkervG0s{JubNkB<Bi}>nlcu4{ySI0K6=*#&W_w5M<{s^u3XTPj< z5~vUop+xq@(^T(O)uh)y5Y8V!@=Fd~0A;ULLV3~lXU+BWN~kDUaFK>pW~641Ot1u2 zF8f!(8cYmi+5RGH({rs}B$4|0?9J_dee>U$f?A5GrI*1EK7T`Ea@izdS=@WS^FEg# z5I<yg)~oU~ek;<w>fUq%B|}#=c?a0sU#LLN@ZdJY(?X3mK<gS9&-+pNnmB!<CxX^C zF>vJLcp|nIAVZ}nU0j?v!*xiWMWSfN8>~*g+^}c>1IM!NiKn&yZU^aZluKpA!l~JL z=lN5)4<3rIU7Iawq$OOP_~C1V0;SqLCU&W4Ou6nTMOs$gLE0%goih^gF&X}<SGG?L zbgAp?H9j~NTHG}!b5Y+;i2|HmCRoRWT~rhv0e_~&EcH|MpdgExEwBv}w;L$@$Qt%3 zKm59n4$ngRjkZ_a$ncqt1OWWq1ot26za!O|xO6KKfn{bHbDeWDvpe01n%Q==ppMH1 zYyXRGsnb#`{<Vc`0moTpJK?a~?rm&3*{>;C_-ogrz_NDnMEAk#`BSs#Ye2{&SLf;u zbpdr{Wyb}$nuN>j1o(%!R%8z11S#+<l>V^tT7UMZ5WSsopL4rI@7M!~BdJ1R5vazh zq0{uTZq^hM;@Ji_8wYZBE6AxsNbEgW6o>dz@=Y^r0C<Wt8^)WuB211eHTs(fd;mU2 zZiq-<RNqA-QZvZwQTc{w2Ws^q(60ui{ba*ds5+(G{{OJ{o?%UPZMQC>SU`jaK~zLk zL@5F)O=?gCl-@$G(o5(?Y7hhjL{xh3y$Xa55fG6sy#xqFI-!LglB^k@_xtu<W&c>m zvGYrknA|P*oO4`boR`3D_5QPDW>@f#bl#H_q!h6us7~?&JF7Ik&ln@&rIhb|Z9VDs zp^*X=f9ZFzFIxrF!}J*MFmP5Kf%A(yq;%G5B=dh34V@3@Q`6QA%j%ajPb-p;S1Gp$ zE9zC7JhD62r3CJn$-V~@2VH_BMIlOUR|BSZhH@Ze9yA_JBR-E^Ior#Sr=~jgQbUDz zEl|biCPLwGaiBz9{qcx$^n;R~8zo#v?}`$6!6`_l&dy(ni9JLU31d^PLyCe&ncqJz zY5jvbM8hFOCyLLmY<EBoj6R(keu8{85td1$0)5#j4ci}{QWbWKg=Wr4+UG}7W`t9f zM~8rNC;cyeHw|?=u$J|9y{T{6Lh+gG&J{-2(QH&`EqPU9W-~TUP=e{*Zk#(wYyCyv z5)f)KS0wj-wId{d2S+(rn<3GqplZyfv(rA9J82xchOlZFwmt%t(GA}*omcMdRAjF% zkVaGx;sGg9%HNuoPuMitUhY%bs5pL5J{nBk98B-heeGID0IX$luArRU5USsRT~yUm zYL%hX28K;L8yo;vtv({le;hzzB@h96H-aDk&cwxNQr3!0<IPQS5zs%0Xqd{Oo;z;* zS|hQ(*_dnlZfJ#805*D=Hci9Y+l_(ReC@XmnZFp=mYn~UM)C$Wai2{4|EU`;^7xc= z4}??t##IgK3xXL<7Yj*5{J$o4I0~?k<^Sngu#r%kAoe?IO>rpd_W}p}9r1tppQK48 z_+Y>>11^&POcqJA<Ah)^fhIlv_2-cO^+OV@m}&I@|C7{n4B&h?eR`uODnZbV>`o<! zG>#xivNtGgl677CyR903Sq;B5NMFb)Owz@{#O#0OjsE{M1OAsU_P@@HNzalV|7|fM zl~(_Ss{MWT|6RQJpIXLM!=e6y|JH6vp&{T-0YxBYAZnz4B^6jndl5_$>cQjRgYsW) ze3ByepJ&@E_i-$}RlI@;jIpJBw$;8{pbA5$`ZtAeM;(+Jq(RRnl~T`jb?nh;Sr01B z;i;m{#sVZ!=Vv5~14-bohH<sY#s2*~jTZpQ0NQvS+(=7ej4iILS<J`Vppc&`G)nPX zmKFo`C4TaqU;_Eq&`xSFM{p%Y(5RUNk6eB%#|nec^nZ$q(a|5NbEk-eIE(gNW<ryg z@0G$WbQe|i=_(#7n7*4g;R%<Y1YL@Og6`V`1~*$!xcmws1&ozqxUYi=Ha8_FN9{}F zi}~9BfyczEw$Pi$v-@WvSxR`v=OEc85#&-nKY30bK*ryMoaNTBbch4BSI|bx$`Fos z`%4iM=m&YF9?-?iyc8hMlFaF}NN_n|TRYSSEziJ%y}39!Ia!}r-PzX%WF;Dk7xdRv z-%XhDY&E6{&-vFAnx<zCQV++DjS>=Z8|DP}-4;LF9d^m5pk7OAX*fg*q#*8?drUcZ zbLWEKtYEF$WHc1aX<SL8NIY179F^=u|9ILOo$%D^_Z>c;BgX(KNpjon^5FrHUqK-` zC6h>IIRhQV)Z`l891dop5m+`!CR*m!*0TpusM%;vbf0Ehw|H^PlXGO6$7o=pN%%4( zsd+Cvi~TwPz0v&bVXLCzC@p0bJwTURJ-eL<5Ol5(?IdaJ{cfKDXMwbU`}5UzYcGp0 zjS7KIsC*`^=Z3(?kau4x(^7wns^U?!Hw03UicDJyiQGq8Poc67{<>2AE22kRqQ@Yp za#@3Dc0CWgmEZo-!(3uEo1p)_7D>6+dZ4`usXX%6gilu@9exc=b_FazmDNvvfMX@Y z{|8^cSd>xHB5*5ivrI<?T(iIawZbwW;pyhFS20P3YzyP(U;W6}SKdN1t<{h!1eP~U z^v?bA{O_$nc=~TI<W#V1n<-W9S9kmg^UyI{CHwWL>o&(KDa^XcT@uK_^Z0AwPl1DP zQoeK)YKg<e$#IIBzvoE_?K7dXDmNIA(C@50pfdmQMilXgWGN>B0{c_NF}?$)x-w6@ z%2mm-LCx4N{0SJM1r-zdpRA8E6iY<`&orn*lM`?IhkYckV(16Ske;>PAfi7&=I@Jv zZ~qYmjt=5U+4roX<NMvO>Q+-2mYlYpP#+g4@E5;o2?tZ}6YfwB*88_!eF08EltM!0 zwRShDcl;V1)YGbt4_<YTd6ALrkkTiY6OJ-S7GxxwK%!Cq5a|~8xgL~+*@x~!3zP13 z1|P70$UNbKb1ZGAfy0&n?ukht2nkeNdOH=`Y)~Nv2i!_qmGd3th^T4`9m7v*%VPGn zKcpyOUYcKhuZ*h7j}f)kKMf|eDLfd`2UM7aTpub(eUK}3<n|xTA+O56PJgk^W$oe8 ztc*Z!*(Z_j4vG;=W7s_(a!#<T1@i00a>FB@bOnh18H=gR;pSI;gcDJs=0I(0WhpI; ze&psrj8k-b#@(lsPua&+=qYEiU+gQ9cwBm~1Xa^tO1ab14t&1btEK&1n?i;Dm#S|} z{#|KM_@p|oc3X7ev3i3I1M$nSm7h58G&v_$%Z^|1ydr<zG&Xgj!ZZ#YHb3}n_{qq( zktgR>1owPJ-+l{KSnx}xHu_G^?qJQVu<D|6cBsN$fN1D!`{wc`k!+Kliih+XD#0CK zHEs#Hl}V~#Ta@i#P-70Am82j#OSV_@Q}M5=k6B|BuB$3CFtWdn^~^lhcqP~<UZ4$P ztju6AVXvP*ua@jeogW><)zKrM1Az~mXI%0*C_&ew#+W?frGl4eeaO1LFxjMTc$YLJ zX0I1pdTo<S+5i`TnoC+!Pl+sxRUZt+4!^GK#PQ6f(*$>N7`9nhR9f-;3Wa>Dz^lD8 zrN%$OO;GPnl2p5q0KM$HYqAL}L7=nDk;=A=6f9s}t@@P){wgE;rSlr}RU~1wiJQme z!887coK{zF4`we;0q^R8JEwlhHG_XHO13{gGr0>@dq*GQFSk=X-8gi*(;g|uPh~Mi zQ@0dzsFie;@T^zC@F)UJd56b9TwQBm_;B=P%Rj#T!?b%EYgECj-rgn&lQCaTF4kvS zY8ai7Oa+(W2XfBkYFjgcdsoX+OWJKSd*KuRd&(Xx=s~3di-!9PHlNvz=WRaMS_4am zJ21iBz5d4$%lVyj+k=1l!7nC@PzhL11dO)UZoc)lp%VEoo(8?kV7}T5FD108-eG%N zFb@jMlf>exD|qr*iT8nSnpGvBB&TfF8_h1F1Ul}03QbM>MASJWd5ewtmD9z1`swDG z!+=ni=BNGrM}rO=&CCsckF)Z8EOLFTMo+g*OG!KE8@B;&lC6(maf_JX(eP&Uns+^} zg_bPSY!S5eCeoyks3$Kx)f4AP_)ZvwSgY3988S=Q4U4<|f5BViRewWqF)`#_YB!08 zF{2e%Db%XBPDXq5_N$I<uwpK*;kLbgZlB6APaQ_oEsle06hj_ZCS1X#Vrp)d!3q<w zi)e+CLPf=`z%730K^K=AVY<)2V*5Q!@5A-##3XNKJ0;t(AJtk9ZmLE3E{o>sB?T{` z$K3c3g)s`>ITYG_Zl|3l)UDK>?bTx`eL`)kB~Ui)SS(zwYIp&>=!JJm)M@YxA@M15 zUAn!h#TmMsg^BNUmJpss2}1T_qsfDH1;kg!PAGociIZ{M+31J(?|GMD`0{*~lYl7? zduo?4nmDIA@CW2^EPsiV)Vf>7hYHH=mH27LHtGY}-@BWE?6Wy6W+5~zhS_5m*}1LL z64Z27178Fg3V_09j3gzQS*_U(4qmupfv4$?o1o+FFz#WZLk)Kgrk=PP5;uV)CZflD zPJ6qn4O-&hJ;J?@wDB~2zU^rnVxPKIgqs0|t6RkhAw3gML@?J6uB{1e0CczK&`dw| zeZxmO_>>z*V-vZni%}b52p-?|)7_nkr6fhsQ{mm>$?|D^+}<fU)>>S&nK+P^m0s74 z6u{B=^$xQ<Yf(sSz!myb#=^?q#TA}4tR8Yg!cnK_dADQK9*aW~!iQTAGr8nwf=a8h zH!g)_r5w*<6_?(PLB2`3QbyS|=~|LtfA8pp-TpMVGs!6G+l(13eATl18ODc=+RxoI zFH5wqX*3^&*9=v!K1(LfDh$2(wQjMh<r##n**t1FwH{O(I+-MnFG^#|YRBX!1QU%q z4l;x?)$u|w+)T13+EslqGp^^i<+a2u_y-Asq^I*fWmfPB`&E5L6O~{@)~qyGVFfp> z6M%AWTv;a21OzTYTiuBvo<Ln`wUHey|DWd87gn1m4Pe&>VB$j0C|HzZP%`FdE77S6 zI&-%oahsG$OKw@6MbH56S3eI3+FHWA-+J2P0#O^W{}iidEznKzD9(up@)Q|#==4V> zb~tqmGP|UUk^B|ubZ@tt`Zv%+lbD8%-?z=PpHW8pG>G%Y)7de4z%j9ry@wEcM9pG% z1O>9z_LzsYy`<*8*!}?}-%6<PQeKF_la6W!GYOnU_$u*NF?mY_1X(?-aBLhQoTumF z0!s_*ox3nB06$Fi=vBw|9&EwOvFzCF4wyRZ0#atAsh45mLPBM|pb%5d=F<khsY*U# z`w2|&4i+=I)yt=a|B*au4ndU~w}jRx^BI+*?RgGkpKSk#wU`*w>*4SqrX?KgY#Imo z?2cUH`?G~@M0y(z@B+V<{$OQ}@Z9I0OFNxui5_vqSe8)Daj!!M?Y7Gj1qkbb+T0Xk zaaQ7l=|B!td??F6%KO$51?8lYK^5>*G<V<b?;l%qBQ#IePWKS@^oDl6d*yltt_iL< z%}G_-eP8Hcalt$hEm&x_7=6gpqwE0h5W~W`FxUV?KX^>tah<f_#jDcqqEM;CUkdS+ zlb3~aB5oXG+j=Ctu_JU0QNce$LQZP$O58lJq5ZQXjDgFp!%*PDzSJ^F3y1G%{Cxjl z+7Ix7upyK=FP>kZaH*o+l+~cFB>C?SFaF4WfnX>Dra7jmfr_dUP$Pdt``Pi`74!Q1 z&CDfr%}*6BU?6t-P5V&126!qC%9d8qNTj&Z<f!rXo5ili{!hl9<jkhbydD(l+*)n< z{H|zBUM%hxYvjxG-nZY*o&jJ`V^O1LQLjK}ck662ohj2R(f0{}GXqi?lNBDACl@A= zrWSCM*izIR2T|FY#y+HZkDr@Jk|wp+1WJ}4Ijm9iRft{+KK(fD>>4vHaikOXl`BL* z9Hc*FrF^SWC!vRek*QAcXkDKo<h1>@Y4}$X#dawLonlPzdHpcy`A%H2GL}!g^p`zM zf-v-YiT7+n{DsC2quZlxRkoU_MnHw7rf2``c*qsr+lA2U{ZNTY%ArZNTlPIzOB?49 z%eEY<2DjjNPm8(bq{cqN-0{0;-Z2Nhnp2$AP^FY9ANG^s(ww~LGPmU~<&X1El$8t& z@3g&~V8Ta=|F&cDj!kfFd*WT3_q@cnhow(+c!n^I4etr&9?-g^VBW->IQHbw(6yHO zerL?glYwt5zDLc1WNLX{3=ZC-lcsqKxsPH34@%6p`t`neKr<L@t0y;7QbYKwQ73W9 z{dT_>KC&hyP#hjquMhh*9-*>&C7=~{GQEi^2a%NM=A~ZjLgjM2t<p4~l%`bj?c@HZ z4Ly)lkBjf<HLN&!P#_^mvH&32wkV^3_|>_!_mEWVZ~+m=xRu9D-12RK0WJPBP2MPs zehrVOieQ-B*^jq`pTa#=ZwON{@>D%%qu`oqW@j}#bJxInxR+77<8_C8ha!JjY{~NZ zvh4!XsS0!X263AqXNLQf=Vhv3h0F!U%8wnh7koe?m<K&wH0RaiT&x&AQxZUGC!J0u z_k&G5`){X__tF%gX>CnypT5(czRQ6LTqy3gz=#9Xc=4jk;sDmJfpFfoK>r}hqvuA* zCqYJ6zX7wFCKRyJW?LN>2|0kO#^1CaJ(|}W!5?9xg{Y~l_$XXy%QsZvq(~wH_jsVN z6)clNWiaPPrPC4RULo0;JtJ>x6KecKHTFW%-3)&qy~y6yK<ke!&t@|pr2qn94c=ST zZ|Qx-lPbgGw<8v!k7T7H*YKdWJes+h=h0|-R?t=mQzdPjB1MyL$|IVQQ_$Q$<JX<~ z2{!iYeBcbhs^o?!EU1(EQ_4=efrB;*Z<BNdH}-_Zt9!iMJdZlwXS@A@i#+<ES~L8q zV%6kCn(sPu(xajE-#-s(n;PDxOdpu!)d;xRZY=Qjj(0@bqQ@Vdys121>Fxy_Qmpr_ zS@D_s#CVF;_?e@A8ikIt>xmubZ>t(7NJ?ju1y-;IyrVEzUzxuY%JYjhn@koYKk?pd z-PAe*<=0?YPi6Ff%HC4NWpdft=+wu*w@PF9aPb0HD^_}d#6*O3Nlt)-Q11ya%6FgW zH2ZiG7$9vroX=Iy@C?L=WwC#EU5F5(d-Xi%FQYt(@^|J28&y8LN~S{e8gvbqO4i1# z%u)M7`D-%>g)uxFc4eZb46RoGj((!d(C~|%YznRr>JDcZP@!jdhVdp|MjdbYzP-w~ zmifs&J}m3IKRK7KX0J`?S*8l(MH%dA4=;>tIn$Kp5$#*m(a_SbE;h@#OCxjQ2l4is zs2Po-3h!eBnnH)0W3T-LkeuF@6J-5!7e)mRm9*d3#%$=7&AQB&3Kc&uDXf<1&O_TF zo<E@WEUeIq1^4;~OZkG-Jw%CVV?O^}UIWWO9?E8bcC6}~961!+x4CxNYq->~y=tZ= zm-^32?Ro2QHH|ywMM7y6YJ0l+uKHA!@W2X=50~h*9P^cv?@DA|@!MacfV72mkNl&W z8^j}+VZuF`t5N24BQD@o*BvJT!+@yLS)J?551DxxKdaGZ1HHa_<|ELQ(ac)RwyI<= zCmxWX-`_|SWO&&fY7;tU-t>E<?3pCn*GK7Uw{n<YeKE+8KlNL5J8{clqPTmoD}r(0 zIr?cKrVr5FqUV;H!$lJL>IK7lytEg@c~!sZEa#6>_b6H-Y7lC`w~tV7rT;we`vx`i zl2S*NtyxX?1Pb*%|ND#h3MqThWm<2xv<5>%{q%BMmBMxEAwe_me)XoWhmdLGvU|e_ zH(wXYwwu-0BGz(yjCM+>E7(^uXT!5L(jsQQT|BYJ@i4`M@Wly&^0p;~HRuXnUsHz- zkb-?)_gG+L$oD*}Vb-GX;hB`ryxL>Q=kHp9baN+SE#&^qQMIr1msNj$DB7V*RV#pG zVxW?86a18g>{jyukGfttN%^}LvyGU32?GV;)>0!BOEHQ(n(?my`jm}Xg(F-t?9^@7 zQV{o&{<4b61R}{Jar1&uRf-?A&KKR0g9DLWPa{=Aja{HloxR7mDR7^)7D41&l9p^Y z4*TS=rkPej4k}xL03^v^2gT6W5JnYkC%%USqZABlabeQB$rW!jXsh%4R_fDM$9&-p z8y+u$?7}N%9BJjGlKI8f+KDAk)fr2^wYe5zD&vGR%?&jN)g8*J-my|-()$4IZA3}+ zAhh)2pHJ`d-<GVE-Ku~y59M0JkO)Uz;OcYBZt^`wFO3(monbI=%<s1?Yl_{aP0Lgf zl&Ree4R~hHu5gc1#wuRfdcZN&@t=uj`jR%lrsDn~k}8q?SH@zYLB}|SIX}OgbbXtY z=Y4xg`R7aqw-fy-|C63!m((N3ai*(jzN0_3>%HbOwKY?{ucFk5XVz=fn4qp#i>P?= z$;JR}VaI+wovUB}ByQqhx8r%2+A+o&hS`n=#QVn>c#<jaB8oUioZxud`KCaZt^1lR zbTp*G&~^U?h4U4AUDRbTSMIeJURLJYU<*MsE)ch?g%A7r?0(9qS|1Je`ijzDPyLf! zKa&V8iq}-!EnUJE4Y+KKeE6x<U8J6VSE)-zHQjpJLlon9Yv45Gw#rzeh&Lid_6*(f z*HrGF0T|Py>F?DOj)QpXX@D7k*JGxn6c$7pDz()z-ZXQr6+OBIGtyY1Q5j&5dZE=c zkmKj(mY@-QbpI+tvLiwon30=L-OZg>)&!n=*>6)yC2I9^C~`V-QOea$KFQ?TJjd&h z%zkm6T&=Jv^R5IiT&2qa$*T8HXB0N%=)-Lm37=YK8T!V;&!0j{b@|PHeb&|y_G<du zcst3TvWwKffQ*xaLPI8XYNjE^b~C=d=e*23d$(lRloP>ZX=)RP;u_6YDGaV_bhA~~ z`=Q}g1v9%{w|8+U+a8K-E#__NJJ#geEX+~}m+^c~A)9if<B@E2a%*51ENFU1x8iqO zgboTJJXvh7&Rl1BEuLvE&h&lY)On<{q!(F+v7g-3>OQq>89Vq!jmA`=3SQK<XK?N4 z!(~K?GxlBdug#khw_;sH#wR)JyZT)CntvfTDl1f?BQnVwFiB&bH1$>xgrRvl`#4>( z>QJ$t8+J*tBLRIV`r~|*>*ZX(s-MaDD2oH_`l4Ha&!nM>&hKGK&s57Z5_rvDR~$C) z*m8;Dx(4xO3eGsh2vhiacic2`!dUL{RT-@s)h8noz9%3wd#e`UMC3{=!q{t{xNm5C z>#aKhU9z2dM8b(bEkKbnU}eYn&dU}$3ia0KS1Gijzg#W#%q*g)lfT=rZ=L2Qkd`mc z!YH$@HqAJ&Lw)`okRnN-(lpUT(vtme461v(V-~>G|5eftH;tOOSn*yDa(3WG);ywN z6>6o4+Zn5ajj44V=e5*a+LFS1r=U#o;-51gU38m4*Y0S$$SvoB;v|{mqBO~<5|d1R zS2+zep+A;2%iv9!b-dp=*hfO{y%Hjs4PTuFnfyxiThgAuY(#dQWWhJ|yo~+QMSur0 zg{dbV!3AhY@kz;g5<Q13x)6DJ<Bc=X^DnaWv*5pZ=D#cg$%%WUcYwzoQVWv5k0%;O zCjX1$T=;KvhU~A;i1Z%+>m)fm=GNa}lz+wFZ3a*OOTi<(;a|fK_d}1|zvYBqVx-Of z`vQr1qTvk6Wgq0%&PtyAb+l8Fagx4WrSq@pPLzC+jPvGy|4k~ekV;|y_voI#*#v!0 z{a)E4NY+LP`XtnIWxATsH0UJRw7H};ZE<u6Hi?#$KOjB+yKn+KDU3pNpC0YAi!S;d z0`&&Gmj01>sq$^_IqY%GR)T=uwFHEogrM8u@c@6mD#|P&F;{m4-`ni=Nl=!bSOO6u z)6idh(j)tyaCDc=?w@I?SULIEL}cRH<1`pkQT!#i)he26>Yc2QrI-FLqRCeyP$^e= zq-+CIoZHr8s2GAG@sGy27oMtLE52<h(=XPgaJu5m2j3sE7|A6jq(JPdBUg>h5=tzV z`*N1T-4=S@QyBCXGaxG?&ycAkY)pRB>beR(V!kuJCmPexEKug_gE+Rs(<5`ze~#ED z$OzbgYU-r-7GAMGP&P>yn)Dy!c(oPCxm$0@T5|(~dWE0408#Tf3W-7~_`1T0hI3ce znn}qHaJZh%FSApq5d_K{S|#O7{Ep`2`4+)av%3%K2Wm*bPQ6x_YZA`vtw4Q%UIk8B zGXKHP04f+KQTwA9RX>i@;`cVk@H=qVjUzAog%&Y%_i=kCVUh|rQU$ekSVA2vH)kFc zjXv>IA32NH1p9IhK(V9+)HGpUXrz`(h;P3jUWCwn8B^DFnu$_#@#?5sn$1NDcw<tG zpDAy8@!7VQ5K=Nxz|D07U;{~|qIU%#7iIxiyaatBdM4$&EHn+r0&l%pEvapWHdmkc zXs#O0J{}9njIkLA8;y<i`ll4b5R+NbG@`3-)udHE8f)_fH7eImA<b0$flI?oU6ocR z+V|3XHk0mCEPgThkJ;1L7B5B<`f<&DDK22VT<%eM$cOgy1N(nRq=P>9R-yUB3T$pv zM^vNtn;M8lzm1#GY;N|jZ6gBg;Ki`@$I@-yGe@U}4h53alM$E-31rPc6APlRpsf+% z>6PZxghy5yR$M6%()Qy^@J~sg>W0<!{|LPb1LMZ=5EwXM!}+S!AbsILr4jV;<K+gx zKRoszQ^^{3NH$gMd$yVTlUwPn?bV?*?h7R&KY|2L2p${1zD3PUu9=Rtm{!}P?ovsg zq@N+ndk*O_bQ^&>Vb7MNhWI&-()0t0;Nd9wh?IT^$NFJoJUk~geQw&%qDePmC-xrG z@41JgB8yKQ3j7VrBi&DV95Rw4Zi`QXYKN(O9MAqJndE--ZQZ5bjCzqRR6}^m`A^fP zzA~HrM)m{3DDP;UBwZbM8%0~8#SO3Ddf~4KrhRhq^#?kPQ$FRZ{x#M9FQO!BavN|A z+rJ2H9k8CjEp0T45rveP#EhQF*KR4?p7(o%MOHmri?kluIbKhGpb&3NvP|ISbngD6 zlJdhXes^L<tErA0qt;jH2ctTa5PrLzPHI>L%s^`;oqYLNaf{axjXC7rSDF@jW6FSo zMjKo_O>E#El>2-rY80Cp*sdhb(^J)F9YR$iHGvU#o$@>0sLwAnUK=YhPtg;sI_PE6 zPO|8n(Ityn1k46k=&!}s3|A>_=_l{s3%bpqN?qx^C}%rT7_+~k>c}9PE)u%_m<>A~ zH>3ZqQqKs}%TT-BN`>haLRS%SNFsKW{#jOMJ9trDIHaj=H%Dj|gj%!#4ysYW^E7*W ztAuW~SJz>lfd5jx6H<Dv<`QqrP(}46;@PbCBIEsR&n_=zgxq$<4VIKunFgU*R^!_T zo&@5kQ{$rD?Tnnt;!-<+?*s;rhJt>lZ#~k8Q?5v2Q7}Y$Qt0zVD@iK)XRJBR+^5EQ z;@BBM2gRM6BW0%jr*F$)o`0C!-9zXdxc$4*DII}7=~ILBI}!o&E1SF>z--OjB+CJN z2BJCpVB>Q;Q=00;3gy0ln%smk{6t-dC3-MDPe@Br>!9EwNH@8Ukh)E6kNyd|u$DC+ zSF<YLJOw;=$0ni8zafD5SZy~^aS8)2l&#IH7^yQYwN4AWxJr_T6MQ0+{aok>h`-o_ zHKz+MNyM#CFVA?Pi>u7FgX(sXYE~m93z0BeXQj6v$-%8MfYtc^#9^lKv||Qjre>N3 zApKtrdBtf;#wy^qN``Dp#`I&PT6}T+RAhxw5B5cL(bpj5Jc`YmCC{bntI#(_>#cp0 zjt9@<-Wa_hJf$8!cXBJQKNRQ{kM>M&kwr^`-^PH|WK}^E2m)1`cVE-WpexmCvlry7 zYWk&dn_lKz(Jguf65c8{F>!5kjPb4Ss@Ct>ydO6y`GGZx#3dsUs!C9eo|RPpoOW0z zG1=F)OrPLLt}4n1K8=%N|0P#K{2n;iDqba~;viV!4q{J>AzYcJ9JF64sIF=2>L#w! zEDUMCB4HV(VE092gYHp23+Nd3LlCu7Enk;uIe|W^2ETLQtVY|OXC&Rej;?7kO)eoZ zwkd=^0Sp5SepfK1%eh%M%#p6nI!8^?hB{5%sc?9RTf%Ob-sVmeynfM`b#!0!3hF(& ztb7#W)d?F~`MHe2MV6FLCv-G&@7neMs@5Yk*8g@F>HBt7c;;GA$&}CcNoB8zM8&rQ zhPrh_dbZU*roj=XBT1SLr!MyO+l&t5dTE>8kUTAyejVIcGs1BB*39?;*R&eu;E6b< zjrS>LPC9L(Q@!0Ic4T4i$e4wpQ^Ki>a8%aoelYA><T6bzL|wn`hN@lvP($Iro8F&( z@~E)C_~cYO@hfNH{)8HIkc4_8IS29A^UR@dS2Q7e6ssLg+hKMXR-X?F)-mImEEk|p z@N*$7^*C180``!xpniH8!bnWUFPE4za}Cy68BOL%(3I&^{+za9f^A_B*C7(8w_K5_ z$kY&{GZH}Y@~~?vJsD6>L*d7IA-PE8E8HGMzn=P$EsGy~yYZbBxDgFznhX?v4V=(x ztRwg0!vLS6UyR({ht1m-l=lTh&`F}=gb|;;2N@M@+fR}KA;{xyB&TpdqL9PpPnr{P zL;gpvS`@N{$lxqzFI?FhrT={-g^^wOr~97Iv#+0WK0mzv?A&Ty!I~8E;<>=^KYz^D zLByX*I81#qzVkol|I~$K%?rm%QQW7y`CHSWLy6&3T-1FqiH2<=6ohEiAsuUizrLMU zR9-A8d#T*~t^EOE?rg)K4NdpwW!I{$5C6gS6)y(0MxdJ;TMTiIkrB+pefBrpa#M!x zwx|B`oq|i$O;TLRq<yo}A2&{Ht{AvETm%z}*s#&cMpOpMDo=JMXPR`y;VSj-xXi9x zO7Z}O*1hk7_D#V{`ab<?sA>qxFS;S}5~GLvT>BUt4+4v3WvHKr6Md|L$Dz==8tIUe z2W)H;)NLXtX<yw*({M;l&Da)pGgQf9^b!+f-4|!FX<O;JrP|>2${RPwW>9RHqU*l* zc9AH0W=A3IIiBUgexS|ky@aytFdKY%?(9p*(rRU+#E`8HioN`jp~efN1A$~C6e-H3 zmvneT3oQlc#mlh_wJX?M&UC!#HIH^>--D559az!AnosNMlfsQrVKCxX{$QbD9WZT& zFygI5fQjJn6v2y8?*ITkBZ4pvVz)Lfvh|g7!<PnfT8{G=a6kE?4tczu%%HN03nT_s z`YGHNakU~GuSoblR11QCHk8HFGWjqA53lpqOd~EZW^Galbv6IaH78~;ZP=RaWjM0Z z8X!vU<<e3H-D}PWK7e3)DTaB_Px`!A2b03ibvSMUqOD5Ty0TZ`0s7-h2kpXf6|W*( z;A-)~HxGw7n)i#+b1y!BVgp^>9Bbwdw$KjV2OFJR((}q*Q5uOxbQIhosV^d4z41(C zYcg!#A!@I{xxT1*kmW0BZlqevSL1&WzU|n$i#;6DOOoxi#urpzo_&U~^fwL@T-6hs zJP)N0P)sLva$nIo@KmE!r=ef=2b~T)2(;pLE1KmQ;?!`)XeG?l+Y&D!^j_v&7l_Ud zS8oDc7dg=_D0V7PgE7kWX;)l(O&6WuHu#`d$J`eAtLnyBY7|Sh9V*S-1CM8A8g0no zZt$oTcQz$9;uQ#C9FfOEUweZ%6*OXYQ>a9AN2j<pazy)hos)-U+%U*8iSAxBzNaJB z>HbN#I-~*Ak`4*(qDV_B+{RoP$|&!$^YZQ}FHc1?^J)=!v{29$O7^|Qx@?xtE?w1< z{)m&-GTt=;P0q<2FCX7f5D$SS^W^jxEcfeS``1&tNv7{+nsb5w__{;=vv`Ru;4ZY` z4I-8e9Wr#6)lU6cHAU>Vzfs2Rc}iTrD4mJ@nA>W&C)T_Z;qdZuV5_xJ3s&`eX1V<H z7~<rLXA!6PsoSt^4rX6uoq)1$;6|!V6VdPcgpU>kRle3<QSY<UaV<VN=z*gWnUy`| zJ^34#dEv+MUmWj5?+8&bb9gPLX6G(Ks@mYJ7q7^wvj3yt*_JoU6gs0_)u(J3v$7T; ziL(L(%Nl5BYZ|;*PBhj?_3DNvU2=d_U~7<8%lq&}PdTSDEo;|LUdb#!&v}0%3w?jS zY9xs~djA5!9#;X`9o3*gv&>BB@|P|zMSbnzQMO$#wZk57vbsMLEhEp;YWNx3>|Uej z>5NFh4Z-W=sccu2M|afS_r^IG^Vzk9Yi#*&JNbMi_LzA{*DXkbDTIjYIGDd6YPUPq z&_H>OSxaKV?-zCV!0)VFG<<-1alo~+$)Wzcg~O7QsCz{^=bz#$iW}aHZq<M45lsTp z2EQwVr~+rSYsQv%rsw_gIU-uK<FqiY{R=Y=Y38uHRvHzK;VhLjd4~9xnf*a0$=b1D zHmZoKnX`MQnfc^7V41-4Ow~V=mq2*zOyqm}Hb(9<Cz9a>d-Trg>He_@ov$G@sC)Gs z2c4nQZNs}pw~#iCRg~UF#b~L$8&gCR&9qJgq$xEs>`svJ7em>B^<o^rNvxN2X1S=S z{2?ZtAx)2REQ_Ahu_)d2mZu<1`EjnwoiVhigVQ$W=Gt~W%KVf!uM5WBQY~`%T+W-Z z(-7I9Q4S4$al>F~0*>XeW|52D5B}%Y&8w@__q8*%zYg||5f`pv2myPw+mJiYzey+? z9j!BP2R%7ipjT))L&j!1ROP6WZu~+@$LHqeE+!-n6~l+Ftbt5hvi4b<(-@46P3Bw^ zQ+gK`z<?<-!OsU$>s0Qii&xquQ8|`2q?=~UN<$y!IlnlFAe3N&P{G#{HXAGAM#|L7 ziB+Y&#pY2bGiqjTHV^Ckmy<tn9DEO7hqd*!xyuZFWyvymEnA_iv+!qfbc!mGOhe4~ zyoPx|uwMvG+CRQL!^<5N8XDovzqqasSgQMKYWQawzetm1c)G$@Vl+KRW6H~&ekrfN z<4a*Rbd|*SrY|TgP#Dl05BH<xF0Bwx=4?Z-?7%;dSURT}+WJapRnE<Gy6=hL#O(u? zmuRfXGa1HA<eXD11RGKPV1D1B%v=$)?q|m9>s;wuUo+eL829H)&FL6aYaBhQ_zmIK zhu!2*DVi3a(LWx7Z_6R~S!(3ar#1{ZB`rdpO|SExL=o8tAXd+*0nHGCQBYA{KZVdw z$~tO?6&gir7A5!c!m-}r=a`&VYfo6OMu0(i?I!V9dQFRtaI2N0@i#3~jOIy<XeQo9 zICfcQaGmYT3l>;e$MGp7jIBxatfaZ9UsWt-=J)rf%{@4Bq^<AS8hwN09uED2Z&=A{ zu<YmwqD6e|A=Fva6y3WaR29hNg`IWtg(>Lj$y=+8dB1!oUKhz#I#ImUXkTzJ#N}0I z$gwt(Im0nW|4V=J@G_H&J?ceN@YG7955h(H@u9MGfk?HLF@y!x;m#~(aVUORAg!7_ zpZ|2(c+-<SU+l!Ez=VBGZ-qwdaMdM4f-x>9Q+MxJCGG0Ir)rw4zz^9p1pc#h$B?CB z5Y@>ot{mtaS^2s5eR?A|znnyA1Z#6{WaW$vAn!;!l_81saWBg%(F+ew8^hMc&%UG^ zGYQ+X^=?AQbKDI3^{|0)yfqST#ur!ZGPL2*=iGgh@_re{K!;sLbzvf`P;RGS>e2W| zO$UCjwu`y*a;k1@%tZN9U|XJI`UXe-JmDzcM#t}mv^o_2aaa%vq-1f)=cI=EAH6P_ z`QvtKB`p$5PCI?g1NlIlk?0eiC8UTv6GyCV4`*DC+m^<O$$K}s^7yS};qVz^yr2&( z!F2CrC8E9xk}cVoc?PzhO>4f>#%$Mqs%d|WAg<2Fvep%M`y{<R5EO#OqIqZj6e|Du zQE+Qa+kGozLGY+&DRweHwc$l1f1wd-ZMX~fVRtLyMztGSRfyN1-^vOvB7mR~WG>H} znX(bi$!54J>*^-uqX`pU@ya{u*cz?>LM6f9W4SXaZl7Z1Q5YtiQnd2%wXLZZwf)us z-a?xd<+#@Lv{+eQsA{DpXdNSYxk-~OSps<>OoI1(ijp)!Ifk8*pG3A30w+lT&x->S ziHf51i&wHZ3h4BfRR@2^I8yTM=~Nez#|(0gc83$sT7GW*YK%;D%z-wZ9SFlcmM#^u zwEw|{dnxs<i*Y|hTWxnjv#1*g218jwsselwd(u-#-nXG<LFeWQ3Pz8s(q?^II!>a? zIjyPf8K**ceMB*OC<=95j9$lwy|<UpvTs|NR`oL#^AHBxPICsGtQgT#u`JJ~z3W6j z*cN1YcHtf#cSaK0DI8;#_epCDvYvEs>l@XUU)#P^-4QTmjutUZ)7~~f$U^TdyV)*r zN~ijm78ziX-I$-~62~~m6}6Zyc*LejMAZ6t<Z|gZLt@M(kKSpDECG`{%NCwvm~tPt zIO4012rV@9BlL(c{z;yw|28d{n^$Ci1DA9-wHSs#mJtq_fV-~QGNiJ5CS9v74&3WJ zGUi^h)or$Z63q85Y^Ya>Bl@(9(}+Jb$kmB(IiqpQ_oupBWpMU6r2YlCK37R*eJ$^D z;Y;h$;so3d@AX70!#MJTBB;;F=?!q~JG6|X1stgTHn}5GlZaB*(&st91YBhnO{BzW zAC0_d@t0?$y~N_4lc9Jbv{P392TPpZTR;SG5DQ;QG%cN&T>GH;;yuUBO_yH(<zm}4 zwwc6nAI+l3k+tUU#qR13)MWPs!OR}gab>K6^#<D^ZGp|9AI=UpI(x7wC)^F`c5JgX zBu<o{a*bZb476HIKl`qmGh7LOgtjo+gxDxg`=q+r4E&zn8e;H_MSFjXxcPgs+R|*o zG+b!HmSxjj3%|pq8$kbEOvJ>WdSz;u;@PC3JwaCphvN<`kxi00SW7h6Z2s8RG3{CS z&*tiHwiE}JtJ5^X%!xwf?H+z3)UOMT@?!D(DZF-@NqQwZZT0r#D&J1KwjC*jG7It# zkjX{&ypFc#j-P+1R+SD52sXCL^emBo{hDJC`w}u5r1hpKOgF+g5TYa_A2|Sp(dS#G zwS3NPJQsL1rHn;FTHS<&3UW)W{LhwhfVlcg+$c?H;Y%9LtRfKu9Q&qU5Ep21y>mbw z&BGxsE{>FN2Z@#${nNo1pBdC{IkQM}o1VHDHBEgjPJA@?H5?pH4Tv|_H)oF#RQPmB zYxM6A5A2(B2YG|k{(<8-ZP2(#KMNwxz2(BLRKvPX6yGOrc~5aQ{;K7Vw{-+}JB%ic z?E6p$qLo79ou-IKE?Ne*<Bzr|1<)eP4x`PTDni5~S<G}va@=IU%m`|ADN0uvp<CkM zg3XhHUZZ?$nBe}-w+U|R08IUoy)m>g9M9J>o;v-aY$)#EDuJVz^o{3@c1Q%Hrl<J} z^d3aSS;IS^VDKX*>w--KNA%UYq_w`}^O_B49-$c7&%o7B8%f8bu(NL?@Kfd>evUkf z*l64|En?R&{dR_q3FVRMi&$5l#*_K~vXayjPyVG;f!AAKR@S)?#zLo-=l4lq%k>ew z5c;sIy9daY=^x%RfhxpKE@$xZD@9_`98G({D+ckNhx)JEz{<!*0&|mrd1)wP)fm^3 ze%P3^+d`rZ(K^soKcyg3apzAjIX*Clo1r2b*K@-T8ZMpX-W&UN4%8#=*sCOvlL_3S zwz?{79mBDhagUQ!NSLRN`LANd9TM&I<M}G^>?<=8&GqJ|zkf(BW`fVA<-7T}6YH0M z{wu5C|KI4M_aI>sKkzrT5&H4}{H#3dSxIUwhBz6`c)FVdKYF!<xHOBmmw;3H9yfPy z(pmqtjL8rVANKQ~^E2_YuRzWGgNM&UGL>msklhx5rnJ##B>n@oEHn%NVO84x-H4cQ zuz~;QZw7A#eP{pf(j)Pzo+MI+gpS7KU%s5=<%?k7pJbgO1v}_&#L1lZzgf!36H)w_ zjXyIqNp^7@VOxVi)%5EXKFd(~rIaeR%AJ6)pPmF%HVikA-zCBSPY-5Q;7Do@$EM0l zbM_;PKmfKdMa-@1lXl8fL8)GxO^3^}Qr+=x`W-etzDkvNwK7BThJ!?>89MN#@4;S> zHoSV5<JIxt&57>Ofopo+LgJPwQ}w&F9Iw6ru#&e6c;mJz>8$BPHFE!64O+PxKd|{9 ze0hCV&An&pYrCRNnAN80bBru>3z;hi5Y;-MpUhN!g__k@7tRj7F6`DJ+M@>DH0R|3 z3JLyV8sOx;kvThAm~m&Z_!>1PmjKgGcOLtE#U1;3bF<mrpdod1xIv3obiG*OSRHo- zGwla<SB0K*-~`?msz}Uu3>!{Fn<)D>c5M1?$tU4wWIT*CHQf_(0rg@MaDBoQz*e*0 z21T><;H)#SiQyk65@~v2O_r9m=FnWL_<mXxZ2HkqN%+WITL=c=i)PezNOd<dmFwV2 z{CiAn*!gdmpo*KAzeN~rI%3VK)#x){Ud<kUSyXeYO7kk?<O&Y`jkSYPXt<=$wN%71 zr6E=7^*tC9WkLzc{g*rQ$9}k0x`^jWM#z*#Vg!@W<n~+}4D=?SNj!@B^2G$u9T2?$ zF9q&Ouq?2~OwVN{*&@#$)v9U<VQhzg>I%rYM=jy^zbOz)Q3Hl$Bb|g4XHAW(_i&NI zT->XZmQ;$<_MRht$B}OCd)mha6(YJ0eidVV_*JCcpR$=M@q_^iPD;a*sYJv3-wW*f zsh=@}<fQw0NsTT@C{QUv_j3&Ie(aN7hH8Exzf2)G*RQJ1fA@m_IO(b;ot-X^a-}Ti zgzClnsNk#nF!=NXRb}>x8yx#3VDU#<;G^6gqc&5KeWl0f#n=S5R#c{Qm6ck5pOr4! ztH$;X_4?SsXlm-(?v(%TW6*U#59Fi?{J`Vau-nCDu>Y#jYOFK`XcX*3VH-cduTzB% zkbR&w39|$e{md=!n_N9AxP@wqn|1bBj%mU~B^XsI!=r>qW0RpFVu&PC)krTsYmf>f zsn-WRkr(u`PTU$1d3p6>Lh1KNP&r+MjX9TA>E5WuCxCgH1YM&_KpbNxF^mK>293Qd zxb><(W(Y_Mvnq6gUzSM2d>EG<_;~@fn`}NjAevbg-1hU?Nkbe{uv@jd@Lj!w2|ovz z&xhsZ;2+UI@GVpqbeP#F2~`HdU6l&E8SW5^=2l6ilTc9o><sh)JqwFm5{mj9CmAip z&EKPs{62rhG1tl+;f4Np4c1&hX}<*RH2&b!F9<;xkhf2g5t48~!|j4FSJux|h_j;X zkFjenP^-^6l>WTcqpx<xp0S0jn%fG_Nqbu_Dmj!)>_*%u?ReF+(_gpRYSd`r;9Jj2 zOg8Klx5OCXM!iy8tRrByV{*<l7b2ISXYgBGOxVMJ{*;ZuYOmH2Eh2N__T2E=-)s6c z-_N7>>zgY5(mWi@+687J_7R+~k6g~qhkAX=*ReY)Py3qq>*Vkl|2lIuh_1j=F1wj0 zMwtKM;7+(Vk4V|9`&JXM-YT1XF=R6M1o^dv&m0>?J8XN(VowSmeuTr11PO$|!wwfd zV~x`HSJY4Mn1dD;_BwIp3d+jLA0&g6CdocucYcw<Nv#$DCWGOMr)?M9J10su0t~tB zhBjFbQgphhf|!uLo`Fm+p1P}uHkc15xGROwd*3^BA|C&->6Z91cBGNf@;i;!>F&!w zF9as{ivcFA%Dv8L`>$4crsaRvD)Fr}?vw3@j}S0iB}TRm7w_m~NfMuZ@na4XgUSc> zFrPGx*qf*{?HF(GalNYvFRn8ypSanq*_-D0p1vW7c+UpyZ@N7z^1aG<qL1Hx%1GIM zZ*;8i{^HJ*|Juv6K!H<$mEi#sJNB1vfu(WRJKD-fuf`tHuvyRb=A!DYln!d4so5o< zRiq%x00*kUEl<8J{_EGT#h%!unZ(S|QUhD5kSo1gh<QjH2<mw2(Vyc1^k;V0RQSnI z+LZHW@^FBboH$D(_8F;+A%YGY`_=3l0M}dtay)ey{>yT$hjT2fM<;8dy+g_nOkW$C z#1r3?XewQc;<KNsJ#~o}a!75UVW+voocj?ZMVkR~U=qY^w_<U7s|$p)Lre=%$`Y%i z&~wBH_V~{y>e*EcWQ9!N(!NZo=B^oaN80_?uj)ukLmPNKM=uaK@8K}iczw4YTZ54P zvg}%GGa=j`p}5Jd2bZftT(;o$Ybs->8qga?8{N+TpHksm(~GB-N|V{bMRpj*1i^(# zm)*c<aFRAkk#Ms%ubL|J!z(qi_8Vz6X`Mz-%rC=rD<+guIp5Cx&thTZc+|^&b1*x# zJAer3=EYJQSZQ3tU19O)HQN^vBec1|+RJ#ITE22BkZKS?oSt%Y>$cFZyI%H^ZW;Zk zlQ-xB^@mL2UR5=Mf|TsQv=e(e^YEr1Kj>6Os`F4i%oMQfyXA3PByF~NFKcU6?amVr z*=xX5qoyRn`9NZ&0nlI?a~c=8-m5sy!-WQ1cH1(ymy3VaNWjYc7n*UKF1USbBBjv1 zRlxenfZ=_uyx~osgslg&UzC*vTUqDF5~r#n0yw5^w4;KBtmC7Uag?_&JYxpuY6`GY z1p$A=fg_SU2DIyHA%(<C3ZBg|w+kR(sL`AP{np~sd@&V=nR*KUmva|5I>_HiLUDxc zzR^r4aiKIE^A8~M*`~N4<KfM?56pdiMIr++rh{Xf)f~#D?s3N>=H3E(57&=4JYE}u zkwvo)Guh)Owx&>|*Kid1v_pAmyq`$;)^yZzCFyj3vy@Y+BSyKJrGf_e%T+2e(T^xC zbSgc>cG$f7;zLtHUD<SJfIL~+NJgmdR%TzUe$5Khng6{^q+;`&aKnxV*OajM3I0r7 ze~z8ji@_%kE^mE>Kf-KHVnwy1{)kk2_N$6|H6GoSdH$_Yvz=pW`Md@j6mkSHUc**P zc%&(@j?c!uO)G>94{K&f@t>|;hr*)w#R94w(3^$Ar^}u=Oie>qg4Nmgv$VH^9(&!M zn3&jX2EWbNqhw!^5HKpxQ$F!&hn@*4J3P!N;-&~fHhU!#3|M_V2CFF>`Pckyd^FyJ z8yA4BuJ<y;e*HQhe5yeagD4P@aWMS2e3mR4>PDrOtvF=nz!TXT;N?as5w_yofcAS^ zXCRCf_r?wR3eG2M9{hImEitfZS)d1!=|Hnw!|7IH$puV;IZEH(WtxJSD(F(7h$`!d z!=3|-cS^A8mn#?vi~Ujp@Of@93+|-h!&pizFN+W6m>JVDg&l!9oKnVDSS9PD5(SIb zxfcg)p-6i>7StQhk}!3UdC8ZXgP5JPy)OJ(_z?8$S>ROfk~+%y68A`FzH~+XCUWb; zQ6$tnR5|8ep<3wAW?!7$)=aAuoBUP6DIyXO-{>iW`8j$nUEvs{$t8F^oMtKB)mkB$ z!fPDFl@76Z%0-Thw&=A&2XwO_AUeho$R*ugo}FA%jDwWgKMza3%;Zq@AH8dBSn27$ z0Dd`fx-`se>h~4<m5AoX$k(>E9MqH-s45;FI^_tch?nUV;`hP~OSQth5Jz~40Q#r@ zt#%C^i|f^5cMEn3jYjDDkUr(XeF{y*Aqe}M!mgL{w%O^#d6AHh%2L@+KPCSXjhrHe z11crdsq19QKQSM~Nk@U%++lU^CDW((T5cK?P>23Rf$ku>b_#{UL{&Cr{;mbLVF`fQ z*J8g;snl}!bz%L02(mvs`1mM>UBm&(vg#KkWrO{Gkt~|Al|C|2mO-mPZDNn5Ne;gk zO#A5dkWV?2+uO4`L_fAtzxoa3foAKKZ!H}`9{gIXMqsoge8VqTi7K|>k8zan+by4_ zpSL`fQk;8T0l$pl8(&00E~I4jK||diPh3Hw;riPWWcda3*|#JNkHX)&?cmyzcF&$O zD3OUUKfEnsAJ}haUl6fYmwIO~-w#%#&b7tbg%q+FAN8fsg0FbVNR6HD1u9<HC=jZt zpHpB<c$QhjG+$}c{d`Qc9pYCr8c}Q-e%?O5e;(mIB{Hz7!H^|WwV30*`OR#)T8fAE z9|}>Tc6D!Wh-kF$AmOAhZc~6R1)D`Yoq`VLJ2_NAAAD=pB<q1{<a6G8MXfKeabN$) z(ru#LB(R8I^*U_?s8}*KYSgf(?h7AJd!YAYcdcG2I`s={bI;S14Xj_Iw@z#4uxDZ0 z!PU@v+^|Ag$~PKOGR1^EZqFJl1F>3fd8o2Op%?1``Xc>xs~+QWCPbf(!^JrVtD8dX z1b4qxJ?rQ10xrSzbBN=eQ4bqvTWOvSo9ij2wGz`C0a|Bs6#4Y)ir8MrbKC%v9jK;H z1E;_NAkX}68nABqgm9c|eX+b0a;rsY&g+WY*S50^%nP8UNiUGDXgMIEqrNR>dJfql z!HJd}CSxK*{hI<^xbIZyW?-G`*Vl`0^=kt&lPNyRnU0&ICFaDK(LTk*L+bU<Z#<}1 zXYIL$a>ZpgS{u-gcom-JWyPfZH5sAzvb|6!g|lIe1rPh%-G~zRULuc&xX5rN>nkWH zQJ_9VK&jLelG^ao3$In*(6i-n`?w~ll~+f<OzA6rcTJ*n@+FiP0=Gz^;^?!R9=B&2 z8iLw=#P@n{I=4=uwTL)s+^7S(vTb5upDk1d{fVPAbdzcQU{bmcrxo*&r$Zm|g2<ri z5Y4E$QC^is=!T)T4#uYHiVi!e+cH@wY1eHj?u$@=8CV_x@vz54EW!x!PpCv*p=Yr& zYOQh)v|hY6^84n%GE@LMvOG6S^HHSPZ=>Y0pPRzt-=3>EaU1Q7MtiZlM`_p*cCEA= z>E(hku2&hs&6V$KxIa|&&(qh?Fl$M9oGz>jQ2H@a8rHoc-ahf!8gi!$?DE=wa7Q25 zE=bU?^#FsJsF`g}6zKRdmE>KHIsyo<sS*~mqhV^%#yv%I*xCnXpUO*vNfD)QvLP2+ zgy4{t5!3zLoV%|?Xi_4T*JGZB2xY68@)B?DhrDq3P)JJx=I%yj=;2!i7VtvSZp)g+ zSz|hpSH(kSJ&#;J8q4ljg}f^G65B<_aOK#Qhw>9y`h%N;)uH=xFk?nH_F6MoT(p^J znWCwX^-LbD&t{<fcXiAhs6xTeH>YL{I4qAXZ`i->U579&wVuB*nHAJq@8pk=E3hPL zH}^JA!G}}pkHyxby-T03O?*3@35N~)k5-GbcHh=(>;#LN8mdR9VX=3DC?k~sid#g; z?aZg@xFqCgFTt<dczq!EOH;i?Tm$dIwv$Kd+Eq2+oKAXZFXv+Np_DUQ{yF+dZk#PA zQ>a&#Sgd!m^|YEndA5m&jUR3vwycM;2*UM6KNuaOd}VebR?r_ae>na-(w$O0K&xnH zwX&c&9>>ska;t#lo++k16SytxN_bBQ&90}0O<taQ8jp~fQtv*&eJ&j+`~%BldAff? zH?0McVtCfz2DJP6$(1>pA`a^`wgHJ#77e`b%CnQw1^59PVXH+z#ykLhIfPHpuU+j4 zzLQF5*#LBu|InA{)YMcXtPWIBi%TwBE_gRnF1SMN`mB~T{h>t>R<okSQL3|WCg1gS zrSZefZ9F@BXjRI&!#p87XuvtNT~)Cp>)Y3YM%Ix~+N`jvO**T7J5l?ySa1<(xt1Kw z9$V`{Gmbhw?P*_v*gK(uws;4RkIPbCByE#j%C|nacH2!WL$j%Ae7f){P+TmGdQErc z8<+p;e{awp&Ct`ByZptnF%KyfXV9MG)n>P`n@^ZV1h&pDW-3yccr8bt{8Pi-XC$-i zdy$6=Dzzei$~DAOUUuk!DFGhb{5rb%hnL{jWjz(<;?zpn<$R!LGU=zbc9|8-1vnBS zsx?aazkOsLHt%zlxXHr7nYRvHBR_sfXi^H(zh{4ZNkU7J6U)U*sl$Kn74*qmlLlEd zP{Kw+0_gW&tFrG#?&HGVvr?)CJP)I<At^|iQofb~*^<wp_Xzt-c&Cq?F5&ds^jgz& zO1R(6_d?A#(hHx_zp!Fg{2#5obzGF&-!44h#y}B7kS$1vBB6jm2vXAB1JWYWB_bVz zC?QBlD%~-3&CqN@L6B~S0qO3p;jDXf@AtRg^SsY_&*vQe(y6=GTHot?#ePKs$BI}a z53=yXwr--!?3d%>n$4s^#iJd!y#0O-nDW(^i9hU~LLe2Jrl=2VJ=;0Bi}Wk2lnf|` zFK^KLRShcV9z^nrWc3Wsd{*TyHKMpwO1g5F97~m5lsjMK8TnDEMsho5eq^WKo}Kio z195@0r@?jjR~80B<zi<Gk(`@+GlFp6sm#|_gWXejEQ;-FBx}Ea!x_DY&z_1F+Jzyx z`|imsHTb2xcLIVVs%6U5X0!NR72O^GhCkr3S(zVPKkjco<4z^!c^3(?8_O|}!JY(l zXF|Soe1k+M>wa}gx<%Z&T+RabMMvqqyH@IyYIKyq+5Qtn+VbPqqpvMmB5e@7hDkm+ z{wPm8G)b1Bp1fYmK+M!9z|*6A&4;$KG`jM`Ir>yi+yn+UL5g@4q<vz&{ih&LHLLYw z5|<55pJic<BNeBO^|N{W84cIrd4Cl6tI?I(>TSv&D^B1l<}Cz^Hap>s&ZYFip{^4? zRGWKwQxSb+e~KKd*bfCHw1#td++(&Ejl7n|m8;fP+n?%#2H{9B15rS77JP7QYygZ* zmVt|5DTpc?F7VvB3rc)|R$<fH*eo~Abp$0F5nKmHxr(xtF-j83EGnavUNH3pB=8e& z!i)o-N*IIo1<H(wa}5y!xT126C(1hz<_Pm@jU+Rab<yv5cBG~hE>5bZ9+_guTR+AD zLrTKmvs#GIK<FrhR(`mX-$=o&ke8LicH81}3YkQWRG-m%2BIvw-#-KzvBa?3gbfhq zI_b3?FzgZe(IeJY%?E9K1K_6kza|K#C3{4IH`pPk{09LAlterld=aXjc+bK7sm#sI z0r;a%3ea5TM!3Xh#^ZKiQFP7wHLRZme68;lcmqJ6GbyIP4#|Wo2|Q^cj1Y7N{rMC8 z^UHW_RgRQ>3!u9&uO_j-?IzEFJr(%@Z5QSxuCc-y^n-hb;5M?fl*=~%CEU*Zr4MWJ z6@^g&WTx^g<3(eSmyXlcCE5z@)Nw{KtmB1gqdMUC;^-jQ+W%H^E-AZd<N3B>_f#K8 zL9^t>wP~We6<avhCk|a0fFZ$*RaWkTPcr2Mv{Ga*ARb-g<Z$MoOfNP_?V3Qdo3`!A zlFBVQl#U4MKgz-O=|G(7XAnXzBJda|(Zs-%-F*-h;f_L2ccT(Rb|B*-vb$i@0Ms;< z9o~;*rQARlFz(T=*5r|5yc~J8YiNbh%HMj&Mg)jeAtLguQl9yW%{vQ+V^9QG-#cm| zSn~MBTLV#(S@4*9pK_<io75G7($=sgE_)A^1|LQDPfoEr$yFp&{N*i`X_wJ;d9^(n z)`%V*=#=$9S5*1TiFH4(HFkB*N;;E%&W9=UVT~JMFk*sDwa=L+OnFyo)loWAXSpJz z)--W?6-v=dhb~bQ9t0PIE6;CyPncVAn`1BHQ8*iMvM4Y%Rog8m=2N>w7<oo37RwL5 zK@kFO882#aLqE}w3G8aeMb+0#+>e{FvZ{>*&s4XT<l@|Az7vJ0C57o`X4e$sn8#vT zou-FmXgp4z3|LHx>eQrL5p*MdXqn3l3RxE9kIm!}cr|TziIEP2BpVAYt;iu=5@`l} z*C3mK9qCKm!M6Qp&q4E8jBaI<-3kRS4gc<!Dt3+e_q^db`ck&vbjKqnu!sqyewHEu znG(ev7Io!vGQ}m3ernzp&AA8o&~Ko-F6$|UBa5`k{*{Qn*DuC?WM3+oqS>0gb)MD* z6Wew|)^*4OYQlWtzIzoV7p-6nV-N~Vhd8zaW|Ijd)Lbn(G<6RjK3oQ_-*+ApwqAhl zXzus<qxKALfjc(v?T6pWC^Gi@S^dU~x;{DmP+Wc3#ur9a7`NXb>er*ErY&P}&?p+o zDx}A#b@B|xkie?^S;)h+;SW||!UcW{dS>#dk+SB!X?5I|U0-#sDpzIqFQWd+)%UBO zF`{9QI8eGs>pUQOj!JvJi@fCO6Re(0_EfG$l^fRmu@5WtY@;$gY{LThZ#sf18Uw80 zK>sP}$FC!A@Z0+%`-=4n-RWyX89R%zs%CKO8Q5mCAWqK}w{gmE#5U9xyG9G1;w~>e zoS{UIPBEXpX-f`88~*V{i+OqT+;|!PAbX+CTwdAL%-6d1T7vpV9!tF*Ho_LVIcHH5 zr6-{OYlkt|!5E{=`V}o-HE!|D=MP$+PE3tym@q5(ELYXJjnkUe*P-1k37Tj~9H3wl zJwT{+?1yW*SYA{cdI-#t2IVBw3O`udDd?Tt<f7)M$WKdPM}~G6y^%)@3+D?H`OUny zUEAv9E4K~}76gd34#+oyY|~bFdk$d!bpM=2>e;JBY)sOWY%8m*Z+z%wT7O)m-gL{M zXsi=emQc?SIQVugcHfV5Ijlryn5ag3C<80C{G=obBX@U;&7^_#{K3JarRA@rjziN0 zPG~@Yvv#nga({DRHFqWUxCuFmX&j4bpy&}mIfu8qI-~~iq4Q1_GVHN-oomCR12*lY z09)Bcabco98QXdkcOE*~SWwN{oMFJ-5ON<{t=ZFuc%oSMt@g2z1`5fKplpF;_5g>k zxkx_^tZZK=w*V(AE8ypd@^G8z+9?~<w?_ls_AB&La3dB%7Sg~+RCk`d6a+EL$;kn^ z_ejMF;8QLP#i$FWvc;^g-_`(9e}|(Lp!BC1N%OFz^(w~qF??HuT>gr^tJN_J?x>w) z;ECwi8k^1k<nl{Q^CQkOVQhqn?U=`>lU-j=$7S*06ONNDe>hV;!*sOf9xFwfKT@^U z{;5=3jGIr*o92UoEKl0C1Oa06jFTO)CCr1bbn*B9Ql;*5=p8&PLoHv;v|3<xt6^`) z)jVhv8uw`8SaI_OEAF*CA~Gc$NWK^f<g7IVcdR{u)MKCPO2Q|l3UQAgAofF0v0Ub1 z7nLDg73gRkCYqr#<0PfI2E>l!Z{FhO?$^;7g7PXr%LD~7v~3mixdRC=pSp9g{ye`b zHX#oM;R35g&@kvH!au3v(R~vt@Q=645@N<b@@ODEKdIh*-um;X@rh30x1CXU)v)0i zbL%|&HeZgW$8ma(msPlBoyo{o|HXDA5*l*<%X7P#G#9kdIjR@Bs(%LdQqGl?Ic9%{ zXm_*%t_>s`-5aGV@OKzD9Rhz|Vi_(<&4px(aDZJ6MQZ9V<bCh0cCn{2v%*$#zlfBv z3%R%mvbkxr(+VXg0{81>L+AuY^E&B^Q<ER#x^B?Yi0p_$?au2YW;u$x-`|btZiG=A z{PaDHkSOivH15tYFXoMwx+z`5FCiRoL(sDoo_<5nu{FP{FuY8O{qSOO8Xk}m&u9Fy zb!dV~_+%X&j~VD#c=q_&Vh=KzWTAUh!-oHPqLpxjaMN6vy*B0WH4*pjbvk%dmaXi5 zC=DC|!bQH3Y+cyBw{eEVz&Y|e@Y2e&pX;#6Qk3x)dw<OK`8jvsxRY_i`wKh(W#y%4 zrjI$3bO=~?GX;suWoy-?V+w;D$6Sco(uD-4Ee@IsFcF8I^n>;4wp-Dv@j#8qhe52e zf0fj{1c(aRIo_<c%=W}iF<2J{%q|_j3E;VD<=wV5&iCE1z!ZFopFv8kCY;(83BoPr zgrq4sKFOb&a6SRFMk*xB=L<X)aDRIUc2nM!(b?P>JH9D&YAX`!59feQ`mxFNor<fc zlV4KTE;Ta*I-U}MH_hzbyP)XVs9o18exd+Aj@0O`l}jO}fS0qle^75vfk~X`zHz6$ zMILVi(p-Q>1<ty9SB+z#ug}xLkhy9tCmw5U-b;Fj+NHYyW4R2jlP}?ABHGwTQO=f( z7gt=nmem(1?|otchE-sOPv6`D7}03Ii+H<nqO(yTq-;5xI6SIKGedH^0eWaZJWt=* zW2=3aaz}6IeEo>j!ad&5wZxXz(r{4FwOm?Eun@%XpuSo<VbpAG9JUst2^nzN<S&8v zC%;mh#QemNm%1Z7B4WBBxF@Ss9DYkK>Ykn0D@N`FlFTWja6m&edff8~(&8Gt?vI=o zFF`+8!ZmB3fW)gc{C=bR7}l-@hg%Tht*Kd2F6uq}cyI9MYM%9%gR3xDzmIn?Q{pKa zO`(;?f#BHKZ21aWX<+grF>^{qXSiFB*f()hACbgvPFqv~_K=>v7CdqE;i9}|Jh=^E zoI~9KD<FK@J!#e$iaxq%5Kzi>riy~TrBu%PIY@o);V$wp!s=H|Ryz(9Nr<iK!!{Hn z=__A^Q1^5s2x9WK8iPT!6;)+ZVM7!!vzztfnB3z#Xcoq)yqFq(Ma`I&EJSSAKr`XE z(39R3>8;Ma_46HRrAuN16^UApYaLQjPy=XKW@hEW;^LOs4AfQ5{M=@e|6J_a**&`8 zAFDqWp|V`M-6pRSUe%tO<5+2KpwXQJmR8DeU#BA<<M@_BI3{s>AR<vy=%mO&rY1|& zcfX}(TnJOkU0!oy{@p|er{$aThs%j+qi*=HG}rq%(AmNof6}z(GYg;1Z7s0+pkep+ zV?*o`$Nc=PgG92*i4N71m*+*?dnn!BEKD@hBSvjN2n|(~8A}KUt$^q8{&529q85lg zUlXnOqpxQ9tQ;v@dVF8}=#s5Kj*;bl=y-`lW9Vw#DNa;S&ATyzV$!S%q_Fh)u%^Q+ z=8O1E1q}pOfh=irl|cEL%)-LLL8`x0@QsD`ujh8;`Cd;(1kLyL(dm@5)s9tsaj>R7 znYnC$aqZIP&a%{u8y?kB6J(7Xh|L?jaZ(fqBX1rX^2`-x&l%HSZtp*?yAFtag3$ra zbd(jgTE!bwyJG{VMKqmm*b%PlKl9i_x4t5@S*FZwS(SQlQ`ao?J1zDwGkL7?PXp>Y zH!rI}qO(Etbfh`e(BRRdI56gX7Dm+46sNL<_Z+6f{Dm*5eNkoje$ASntUnDIfmjo; z+T$EI>9l64v#h$iqj9*BiN&R@V(afb%M_C-Ni38SYwq9Jkphy;8j>~KMN6=Z65Q+F zW7PLx&fYix+9+iUJvj^YH#J$U5>H!sT~AOANL8>5n=dKJ|8`YjN(;8ZO3+AQ@1g9< zYpcAt9mx}<cLsA=VR3kTaIK`yqj(S_cA(5HQz%w0yVKYGq{m^6Ac;Sjz`DQ6<S+Y* zQ{k6NwFtXUIY+nC^^MB-aUtjk=InYtjU2h|<fq8jDlCtZuuj%sSq|1eFs5IEA+8`( zf~L$rZp?;TIn|bZ)vI9Ej=fA*BAnlTHxMT|s9rUZt6@`{tInQM6bu4l%RsN()v`@U z*UwN$1hBFUg^1NeZ^e`!#I(`}sC{BPTtgyNaj3;u)K-_pkz|3N9s@ZA|1oODssbcS zI+ki<sXq7HEMko~yj+Y=lyrNC!TQ~?pM%l|@J%LtkmdbJ8Xod}ZnsCimB1#IL^U#+ z*eVp+2Q4Lfi)sCIrPZ!%o8&G=w8vgNZ8#4Tx&7TCW;h7c3OD0ziX;-pUXa%H_iI?6 z+T*$s)4owX%d@#iOvGB5Tg;|Xy3+9@(ox}*h>|+31?n(%88nlp!Ll~C8`IfZ0oHNd zn}VTU<qP>O?sRK)G)fOsm5#pS_!XYvKMuzjtl8$Yp$^o2RJA1ncS}HcFC$6OF&B0& zbCEo|QbH^k2oOUNA5agBzC~1aN@HMIkGYb3vU*;ApQ|f$s7fp`VkWKpR!Xe%rfRE; z4IN}dS(-H-z=8NtNCzsX;^c?v)G92+AeYf8$VDYISuU0J&BhUO-czB7D|(0ZdAD&d z2-b<HtAmmws?aQY1_sT8-1{K=y*~%*>hlCwM46U#5Y_R0{EqVh4=91n29g3jww9S! zGO6ebV|{Z=$MW)DMe~ihn58ofnlH}!In`l2-6t|ek2J5Ofr={5_dTha#<I{PQb9J> z@dn?7V9E=YIAv}r;7e`=?DcH0(CVjb_8pvsjXCatk#8PIR0d0<r9Ad{?@vA#sYc@X z>~r1rR>!nUmI~^GUVKRDkh=K+34cT4sgnLZO(vX}R!1z1i|hNiAF5))mnKV=U=mQh za(LmXAhZ1r$r;rW?e@DOD)Ug<XK(nrp=_1p&gM~a1Xub%!IWUiv6*uaLhB{mK8w(J z_Qw|v|MeVokTfuBt(T-%<rozeWrEk8MkrzyAGlg^apjtVnR0be^l5u6FB*7P4uh6C zwis!)El{5J5F9X!LFKml=N^=b-qHY9MIUR0V%VPlW-5{tQ67}>oTwFdas(~x#(EZ1 zB0n5vvgCe1y?6;$b10K`YTh5sr0!hV#9!%GZ!H!)1PNV(k0kb@jrSq`7pTZ&8vIyK zM_jvb<tCchz0F5#ybSAiMOxnxQV_8gnRTc5fN-P&Wklpp3M<tdLlNyvS!#H$+2;^8 zOITCEcGp8&Na`;waDhHUw<kOMB*|b&HM2xp-G($2bV~+>nR=AzNa|I_!=%N$0#YX) z6F*5I;iH(n4HQyfT~x!JzI9abUi7A>76j4&xB$?4XZ|V*M=kt(V4IzFX$`k7vy>Bt zl<8ZBD;S-$F$Fe+f~1OyZ>63_LuOgoc@5V|*on`wffNb#CNGJ4e~$26kh!S8)Jv8C zO?sp=7ZBAAR6h5KjbKfjzd3hbJwEs3deR;pKS%k9js@ILtXjWa)snUY;9G1rrH8r- z`Lb3@=&d0GCTe2SzEO>k!Ra+ypwYfkFnh~WIAUX}dCs;#vI1D4cC6K;G@skcybH^| zX>E4|L0+(=3^`dPrOuG+lK813F|lsT#{*P0W#M7V>MSqoDhtD%l&s!-nU-|0#FW+O zxLU%JELQTGq7<R2!Up~Y&*=MwSs6A&pi#z^m^kGYI-Q!p`$Qt6SpoMYkW1s2b|MI2 zP0<kCa~X#8dw)UA9S9&CPf|z#5HNWbs_e$DM4ZX8A?K0jqcy7JWtJyUw!Z%Zm`=m8 zbT3c=9$@uNJle#jIcflTQA4{ffagp_L1JhKi2C67Z~9?2z^Z`jY8D<c1OIyQS3g8d z1Gd&5ZUVKD(BZz(6PL|2^c~maG%Gn`CO5h69K9S=dV0JixQhU=@Hf{l2OPwHtV)Hx z+loO{Wc&)d1ZVcDehzlg*70?7yDYrAjOj^~TU?`5aQOksdSqy@)-gL4?4t-BK)tdi z&a1VWY)pF3sj9SYacl4Qw5>YEbC(<@tJw%?J6M>Gd{<)~Q~e%HD{RC3n%NxTUQl(i zN-|glAzstqpaB)rP{>$KtuX?@RECaEK5J9U=)jL^JG?QrJbM8kA24E2`+-m0Pq#Y0 zpU#Neg*VkIG0R^cxXHAKU}j#K@{j^|E*`97p@Yn}85HCDQ<6_Qne-qI;Bx*=+EMGA zvko<G5ZzA$56z_eMY-5#1yg)x5$LA4q@<p_xm4hYvfVM8$O9h|(Sq<OGO61B5}zDN z6}aqelBI#x@eF(7Xo0f;;|jDGe`E~mTL3BEj{1f1Z3Dif^U9Z$!k6lUedIYxyC(64 z2TOayJ)Dn#%m^;g8F8ywaRg1TZ_~!RiiViYpsrrTo`HQ>0&ARNAlDv(oTW*q)!ol* z7RP|q1XL{c;{@JriW-CKY&UuAs9^QXF9Y?;$QQd=pn$S5m`Gch|9<1B+1G<-rJa4Z ze)Sg5`bWtzK^R#gkIkqVh?;XU*bamu7MF%gGOH+ksL*4sImX8D$pXp?O{csY2DV8V zlNJ!?ROO2*&&IPaDfefN9a$Zh)r0ef9EQdqDb-#@Ho_7U=JI3Kv$XkPaC~V(Hc75R zYPCKaG)`fCQy&tE2q-hW9@KNHIGAL+Ly>S#2lWF&p5zo1g0jiQF|EME8fz`#k8Y*# zVZC}szVIBK^IuTxL>`d^9`OWZRqGv%I!AUYr2O*W$Yok#<I{rz1)i;wm4R}7YpU}7 zr^K+PCmz}Kz@EX9w$S6q(boDcFfE`;yF@22M8ul%{3RIJ`}xbWzE?V}*?^+qru5Sw zDaf2EPBvS!`P+`g!fX|fLPz|fPQ12^&2<?0S5SUqSHPf$wT3c*tsrf?)zE!F;1-7- zGd!rAvO{mLq1{u~IdV70X?SaGt&l@a->yy2b5jX@qm}-Zt~$_=Rvp(n<#jk*Tpn<- zTmg~}H*P0k*XrG)fy|>(Ps#DqV2_HmEJ$w*p-QMXSbbYkmsw8CEZx?-X5m60aV=lb zQP4G8%N;lEJ>C7pUAf`HYmS>QQrq2#{=#z{Er+$!!M#crjKNhr;qi)*iX@BHbNoW% zO+I$c7}N?7Az}##H_;hpofISn-J2ltX5Q7q%yqS5PB)Q~grq0!Ag7>q1YVg%<&Wxq z6_q4iBYNz~UY~uhM!cc(K{?R0W9JG2`$+GMY;|q*Ze6mW8VkAOPJ>{H;5>F%M-LY7 z&Ioh#ShC=zPF5HN>60Ep&j#@7ou<*Tnxq#hl<TlDrrNeJjCG_hTKl1G!<jd_V6F1G zAuv(6q(lGsxt{{g)hX6)Wmp64ST7ab=}1@fT`9M<MsPVwjb^aKmc+t#m|1bSEr)p5 zWmCOn<yM7_b=9hOutuh%z5^r*-wm&@gpin(%~IgNPyl3~HXYcxA)vX)i@k&Kx9=!C zBc(Kyr<7NQ$RA!o5h!nEZQgdz3K4FSYV?w&=_vv7`aKCmcZ!6Ke=Bd@fdT|o0i>o| zAqD}mDL4IyCBz848g9hDqbpbdY^f5AZJpo?f8`iR0S*~LI|bt^%nhK3OF+2o$m=Zv zyI}!^t<q7RxR~J}3jwi|<CQnLl0n2VUzTn_zDrd15B4}gz?t+<^6wzu2b))COY|JX zIoO{n3K4OnN(Q|?(I^c<28esuomW>LhQ@IJt5x=O+c^hTrNQyJqq2dt=ZaURzC@2C z+Q^phuGO}9x`_!>nH_VS*bln%j6wp7Tut7Q&-R!R&Vp4n7U?VSboV*$;3)1rVz-6h ztvr<zeuxb;kZY*t=G5q^`IZs$uy{F7X;*7pk<}+=gsxS{e9l3xY!I;vKU#`-x;w2f zr?sLjv)dP|voc%YfUY~4V{kJbA=))abu0Ihq<jFg$N){TX8@fdCfVsGO9bIo)1+tE zz5{ngJr<P&5A{;c9n%YE??YhUT!rnpkgdWtP(z!7Q07))DI)rZz?te8cbh-To05px zQ~FA~3rm*scDIz?UstS9IY@dR8lm{ckJle<?!i^z%8z}7HT4`K(GgC#!@cgh@c9i0 zV#9PGg!r8VO^J*x2lE}4yjuSOm@+#7445c9VoksDWHIl<@=L`Qo|i8%7!0Y4C0p~J zpA&G0TdFunyKUdk0C{k9I?)$34rh+KCbG%=8v&%Sj&alQyR%yp$X^w3b)2sPWAIvW zl_~>pU9PSjoVXeJKJi6r#JDw63EBXX(ZNlHPE-(knTnp1B0q0@YDVDU^iI4X2yC)n zXscmk^EOz72Yrf)nkDq=VR>c-vaQkTwcd>yZ-S91<sIqVhQz=Q%{gqk9F?uYcUgW? z_%=%+OCDN2ZBVUw&=Ytt)Np_DS;GjQ{^ZLNZ6W>OK7k>K^nv;qkHcJ!BiKg(XB|;F z=x90vH~C{l;B|xE!-GJv=4$T9%->Y8kFE{@o)mmBM>jxAZj5PAZ|M6-rX-H(ah~NP z%i*+IbcEE=G2+ZfIWl~^tO|IFmC7lg?sl}%v`$&#X<zrKd*<W32}l&&-tLp#SiIUs zM!x`1U?yfNPtqrPo&{ujcbtK!-DW7DBO5S3$F4=*irHGf3n5h#HaXrMhQMV%pZwce zH2Eb@uU5&wF+pJ;CVOzf3amQrP6@e#LjfIeh=vc(Q1@A%S``SjcC+tP6O{LMk!S>D zTg|DC*90xtEnyB+W`OT>*6Z7&Ew!f4(2uBxm*`iDLeR#QH-*GpxzHSW)UG-(Y4Q4G zp`uG0A0i3;qS&|CMr2cdirx%53^02v5C1SLkm8|8DKpnqU{H6QaDPJWl|PyCb^L>9 zM8DcjvsuEt^!}ncvS*FT_O<5R6_PJ5lR@mLy)HW%cN2R#YxVobl4sx8nADxtSJ>dB z5XXOM*a-ccO-+`K3hcBownWjDy4ZRc>by31w?XB|rfyBhu<?iAVKp#BRw3PBy}0x2 z!kSwO8S@Z~m;6+<9nO9%z!h<am6dgJCjG9Q!{c)d{`gkaZKgLrI*Lvl70v2)1ZsOL zO|5f6vuzZ+eG4-!dlPOsPGD_^BA7KXU-zmPV%m_0(@`p>vj&FDX8$v4m0G3xZa2Nz z<OZK1!qX_wlHbj+0C`v8oU(^mR!IKit?0VruiP(!O#GE(`bcjN{eV++v1GZd*Pq)O z%%T4dkkrv?r4SN*LupVcMY6|iDU&&1tkJ{U3%wWhzDRY-MKVS{ol8PIiWgfiZeM&0 zD0~1J93`9y!q2EcW>$N+v&F{SQBvc$`yD&5@N;fpr|a62t@&t59vNBLfGT#<zr|;} znM|?Pfb!yKKK^KVCy~Tn!Q@sqSwgI&qeHZWe%VZtLQDx;U2!@Wu@Xhfa)-byhwY6q z9U_qzJ<9YugxzTez3Dk){%rbvPU27B6H@CT2Mr2p=_<*C8zP=Fee_MAm*w>&CDTiX z(y0r!6Ii<w{PL4he~NcDu4$$S-L1^K$3F<z(G_hhM{`MA%h;+t^K(WbxnVuMy<6w* zhuq-n0kWGu3b(r(exKpCoV&9Yxbcs_1Tz950YiJMShwXV2YSrL6!Sf>7#B?rSaa(s zw=<#%JCb1FF8hMcu)>2#${NwvajvHWzzGQE6$5Gtm_<4Ayjq_Z52V&9$hOe_OdbeU zhZL;Lq&<|Zp1UQ9E^?Gm6BE`%0|l;-nU0{?-7oxnm5v1+QLiw(rshT@tMQa(h<Y0G zu&UC$_s-E2{pmbAW%_;N&FSxBs$apP4f;ORZpJUZLV;7A@B(>UA_7-Y0~|l{`4Tzk zwMI*U$_LmB9SNgr=%_}OB=)iI-(EXhdgcw<@?^Y|l@BEboldtBPp!^fzEKG9i}K5T zK(1vb5?h|&yeR{sTv6yZhoXFZj#EK^o(ER)%5lJkz@~iSEO0*9t7a;J!bmF}R~Ban z^K?x8F4Ml=Dl+Ry`>?an+pI(Ag>1f`*tCPrOhhd&8-a4#GBnO=>YE2f2Ne1uc9Wo# za^21%0YTk5t&iMxt*W3*ZQwaw21-&FOCw&upQd@@m<y;6aOk{3m6jdmQ97Wk^H}t; z*s|JIKqFPp!uKCPwr9cH;73zFEEx(}r0s#YY)t*Tb1RkxM=^jS(O%WO4ATDYZQW0V zvTAkMVsmrvRW0RL;rVC-(<(z-ASO`9!UBoDBP0Nt!6>8V%T*wR9<K}0hRygS{Gu03 z_O!tNB2{~1-iimqwnY8@6aN^AF@pM^Ad6)PP~#2ek1wcs1xVm22I?FfLApWz5}!1k zBa(b%+HqT&VA9_eEXg4K*!^_s?)3z)=a|{{*cxu=MOaehhok$(-@}-88!mE|*Rpae zNJ{$ZdF=E<?q9s>8K#{Hs{?c61v|KQW6~5DjIvus{HZz@$cbDV6R7u?uMI;*u6uwY z-u+XDj3#d-$U4_+90#=Ba?DR$S^VnY`W*xF<}0*~b#>*|_$_8x0n?G=NvgWS4_BEh z4eyNOcF`+9r!*$mAMWjK+!m$v%bBV#!f~k35aoGtcuaSfm|FeoLz~gZX#L(4i9jo$ z-0>l#O5DAPLxGID5(qmdR`1)I28*qGrAoA71%}T4R|J^#Otc%F-yDOVsL;u)gLv?H z7XxP>yLy5?fg7%tOV9IQW>p9V=ln+}r!>lw1g8|=PY<Q{*jCxQLHTSHv@(rBZypRl z?EtFxIN;2YCNVp4nB=v97bbZ<Z6@YH?x1Ob-O8uG8c1&*-$8v{5u-?(w~)e7zNct- z&l|8qU+`0`nav#0&65-~`<NdM5-y@M%0wuDDsl)Iq66BBNVT+_9AJ$kx%w~V9At$} z0J+0P)Q<!N&Sj}LGo<R?CTMxj<pn`uu%qf4o_~^i0@BEZdM`$S=j)VI+R}Ct&DLnF z2?$%?M73VMqz_zv=<KT2e`c23hnY1*EH5u-1*h862zypzcmzrbl%M@4<3_prd@F%E zFSsmbW-Ue`f+k0MYfdLTAd+-tAcs*xOs!S>OA6i1O7@)fpGl9u65X8WXMSo-q9(3+ zb)?p#DwcH4kD6(PGv>a;QONA$l#>GtvbCiki9q>Js5=Q$u9&Pe4Ty=t&GOdSMY4E? zG7^h&O-p%*y@=l~@4cYfDh2}9a>0cMPg{5TXLw|a%$94gXGqvjb^ZREMK`40exyEM zpkFh>@31(1n9K4Uf;(VIY<A|;)Y5OoRaL|CbSrvv)Sd(DE|h5}9nIrcN$5MBJ?V15 zrcFCDl#!2bSRp2)RL_O2&93i}M5F+*At3n9<q;`I{^sOJepWqWo)zdjEM7?+;=3ZB zAW+e=P7kQ4g>;E@nGV#K(+WkyXUjOsm0W;?W^_HFCxT*gKSeM&fAVUs=!O_0d<K7S zD@RTO5f)P;s0}9Azmo3U1$3?43HcbwAZlaaA}8|cTj8dk@NvCfMf12uNbl4;4<*JG zwQ#~vGuKEn8X_iQ7ht<l*hJNC7kq<nG9d(EU?=zjrcSbhM}NrSy1YqngJ1*DUbfNK z+*P^NC$6U2_zbr3_P1O$0CRr^)YFb27C}c*F&O<#*SJx$?hp>tZLuednsvoM$m6mn zULX^G#}Pz{YXdit8t#4?Lt?U1JWk}*N{McCw;0T~4x;AXjN0tW(;38q#Mly)^TrF1 zmZkM0oG!EZj0odz0jZYmo;=8xbpw;Xi4E?Y@cvtp>kpgSLuj82z&}U$&{5eoCgV?x z$TqkKAkNmW6tKuZpo+!6fhTD}|6(|chhF|`EiK^6fRFqKm?eTA_rN^!FKQLEa)kc= zn^&Q?z5axXR3JA5vnuR%aoYCwb||myEvew`S!4+1T@7b@Sm?8!o}TK8u$A^r6SjIJ zn##?-f6MkP_`LG<EO0UYQ49CiLh9pUWR|?jFL^H>4D@Y<sA>Q2Ej`2&*8clfp>O>r zuKic4<Nre~GJc|i&h-VFjF%=RBZ;TSrVtw;9z^91l$a_x<rwD;o<REmgH1rI8L_eI zAZRrcXd5E1DV_ZmT8DY;RgIT{)IMhbhPsZ#&a|t0<JUOkbNCZP#xcRBwpu=QnJObf z!zJaY3|ng6Tm5UcfnB(kApqS@&+7?+XvkA5UdW?TaHmgg6<`?}f|6HZNiY&K@O+21 zkXwB2gw(6x799&424$bs@=(#3DuEAkeLw_wd@-OKu*%*qKq|N$S``oc`l^V?43IBA zhy0S&gYE}RnhP}Aifyo!qEB0sp1xx|%bK!NIgYl*@bE@PLvu8kthU4;OdMQR``hxL z$;WP`m$JpJC(VF%2sG<2BpU-15A2RJ`EE}Oh<DwXW$f*Oej8lHSKuT9Q^#LYap{-u zS^Gba>!gDT^FYncLnDgQK;P^MHwIg7m+E9|Sbwr;7xqhn>yYfRzlR^gya+E`$q=u+ zT^vR4GX3dArZmQ{AV->56dEp|o)`dPtIUDVsEsOFibxYLm~^2L95fy{5tt{d<&9P7 z`+}=bJTwT4uJp+6&i9T0bLt3WY)D_=@oN()lenH1&&R6z8S-ByGkPb^Q4@ouw62|9 z^dpUyhaf%8?dRKbx@6?FH$K!A#M;*K2}`>iZ#1(58cN=v5C!0lpPmc=<tqBJNV^J9 zu}3-A#R-AK2aB}=d6gXr7q+z%i4@r@w5DLT9*ZFa$-^Z8^wa^7Q#$$;uhYvc`deMM z=O?1%9s)-&#-{;Xwqv6}T?k2DSBLOtGRb*cKHK-VXV^xREXrle1Y!{}F*CbaGOBr{ zEPy2HyMUk*HP;cpv<pRcfHo=%<?lP?yc+T*JRoc2HZ@3++nANjNMPB+IwdaUk+ZUx zcO|`TkK^mzk=sD4aY9^1u;+go%5tZ%U4?(x7juE+SvEkB-$GBAwo;nAlMaQa%U)7< zA5okLMC#+eAYurvZ75P4gh#)GJR0AyzTA1FVi4ZOQFX6wIM=2u_fBcO+)YmH(yXrH zPEuL#w*jc$T_GSTDTQ;w$dz2PCXYb#7SIeR4P_}+Nw4lOUr@vuhd97#^#Zh#eG!R= zU*<QzPH66Tg9UgvHa+6Rnu=3@Ii_DSW#vTVE2-rhro{Cr7H9kwh539vN&h5A(?fn2 z?)@W{w-Z_m<NXEBj6jAGzwUfU?hgGmF|0O5L_|>7=DVAnhse3$vCy@n2RFmR^r5kv zMLlGRMMll8a<I_y-*e%$JwY|lkN}`G#RUF=CZ_~1z#gdKhf4+(sO<p#{r?-e|EuvF z|Mg!E1%I0^fU*C7^(yqf|5H_0SJ#$UG?3f7+V?|oGGO&2eGek=>VDrfad{N^9C&Ng zR4g9wLIZKurGL&t(ugM5aaj$@$bV6d|2<Me+xRv5mi#~MvVZTJJpQip692XG{yo<~ z-~0Eh@_%!z2R*RY`|F=xCqkQniA>6Zo)xLf7SHQxX<H7V<D-*3>%n~NnCb-!W39Xh zr+agMowt>E$*g$8$*}bcuv6_y76Zn>%4PqYA8Z~QzPauKevYBL$-y|lI|3_1vaDtq z#p@Gu?MLjaeP)`;u8g7%#(n$l?uYbQ#fr97Pg|iqoI?dBPq2Gv;D)W0n<Y1Dhla;l z3Q(QJf6t}m^s`r6ALtmeZ)K!u5N%}~jI#Fi6zjYxmWkF6cf)iGwbUr}5?g-aO>{eL z9bFk1ur^BMS)5*>#2?yiHfYZKdtwGjlNLXr_6L+_y*blX!~H>~pz&`WEi8o)BC+Pz z9$K`uw5&t@DxjZ#+ThEYN8MM}!ManE-cVXwe$*OUYlZ*`^8+B?5*n1ysAURiGh_$F z!zMK|)hpX|7l|HxpeuwPEfI%^azok1%H5Kiw1MyMXb&8Mwx63N+W=?*++$+;3Lcsl zp!q8|&*u9tWq-^Hlz?ZN;POpXO|6Do<T&Y<y@nRp8Tz#+7Hez#%iiHa?3=aKiG!7& zbOv0p2HomkHlR8ZTpK;(02bX}k9NPN=$^cb)s7-noO_PcMf7n{ezuL)(%nWd;aP)C z^MJ5U&6@jQ0Hn(Q!>`UvU+e`V3HHM7pWUy>cJ!ce8=H2p?n#T|!Eph~DF#3H&>_xu zK)C<v9=hM?#C~H?f*N_%^O6EinUYrSC=SfPHT#o+19gZ~(K#|8tKWaX?NfKH{^kRI z1foj1lau^(quywLZu#P>rrLU0|AE<NVim%`xsxJ35VYZQR^A<5q*K~kKwQkxEI@&V zYt>O>;v?n$-@{4NI*A!&+`W^Bz3oe=Vs8p9Fef;yjt=8}F#SkqOu*p#>ZV*SX!*PZ z-D@;d6v}MX-@J49&=cbNf^u)vBj%1$f)#+p*~o9O%sWqhVBSRc<F<#u5@76G5Y60x zxpWU`!&?J+=~(KfH|dT?w+HS4Fj5rSdq#8~$ePhia#7_DM&CZ#8NQ7w6CxLsoErpj zmd7XN<1vgxe8hB3<GaOe93=o7nDM**X<kTB_|(N56j2FIwsbX)B_{1`+apl5I9B5V z^zDL2fPOXVkxsHwF%|q|w63g<vxbh}>2&;QWBm3FN}dJX(x3tS6$Ra1QZ;dc0Actw zA_8E(n@=-2wRe7@JJk=G7k%!{$Rxk7UGDtyC{y`WGTQ~B3lshKiJibi6M@jz)OSg* zqJ8+%|Dv_H;akG<9t(So#MT9zC-n@5z`0<R5AV}*wFbELmW$l}^S0UeBa<Jml6%3K zttoTa*4>VC=U)RLe8l577N@wAYs5af4xvh&-G~I@$JaP?pG}vk6;ik-$jHd7?y$52 zlzt_~GXMK{9mU=n{$a{WAm^7?Dbd=I>n>$p634k4>wcGd>P7e#$eca+2G=ix-9Jd@ zuO__1qRK6=t*xDG4d~>ngr7L{DxEE5GuFS+GftCgs!+<^gOI}R1E1cCg&U0po)oot zh%qKw9SqBP)_iY?=JN<a#$R|bvzy#kOR(TcM%X9n>%^NnI-<~Lv&R0umAVXDNlfD> zs5^X>v<<qqne+&JeT)8ZGtC<R;5+<YQ!g$Utc~34Ddh~`yS|6u5cq2|=Kx_{CJp4D zDsUMIH7{<U8>aGQ+3&7<D?BRsb^xR_j^0o0$-ht0&I28^*M2D2$Y_WYre@7U>t)Yj zz_g}bmZtAGZ)4)|dVN7<7u6dN6=B+Ljfgl7A{HRq(Mc;8V(H$@k!5?QZ=@HdRZurx zC*E$<HdPh^Sgh<K4kCXKjihReOfy4FsCJIWAf&fVSJTX5XNJwP++5<5%u*wIC$lm+ zd@P|&QBXkL;fi^=9~)DH+b4gv+umY`W05=5hhh4<Mi?`{qKL?Z9N&W`*<|mIC+;jE z^DgrT;?#t1DvxnYp4=hcS?h?v-sA+<2|>H<HDt1$IvP4Kk#;iRUYMy!%ibTXRkHkX z)V!|jGOgfBw$>`{?Bzdy(%y7DoXnL>Wg_~MSj#&|jgs1IzEh5~W;#j&&hSYzK-vJ; zzpNgl%Y7_)BJYl@RkrVcUNYR9Y;;bHCcg0<snGoFJ6U2UcYgZ#=nhV2t>-IhCkor{ z-U_;HvITx@=I)--Gn!i;ft7oF0b$fn%fmi3B}(mJpZrS{$4*_8pSE51gFMsI?q7g* zR=I4FUw&Z_U7*KvcsdLpr?wpQm>Xg2JrMI7YNq#i_Og}V_4ed$%r}EQS}<l5IK3Y_ zfK%4z?7!cl$vxC`QZY-KU<NMDz}70oOTu8iabb}!1xLSVFo~ELq_jJhyLoifg>(2C z*Gn5Vr3UvCy?pv7f8Eg<uvzYmsI55VaP=Hf46=AvFB;k*H<$UUQP@<F6TTWTm+tKl zJaM#FK%9oSMM40Wmze<>fF(o;lu)I8Ub}D4(Y<;bTE{6^w~jbRt2viU$3JrCPZolH zg5OKk|17EGE`bE+Vqx4y$e8L|5HeC;dtJmu)$9!b_{!HastNCj>}pI>mT3a9V60qq z-F0wYyf_W1yJn}S!AU^G31>_B_&R|K9o@1Ggs(%uG#!i%Ah~X{>z5zZy<`wnv$m%> zt+d4JZW2VzTa=Hjr1~;aw)R{H<*8!k2AygcOy;wp5c1x^d}>H_`cOPbyw}Ll5H(g} zF}<|)R3aM?@sRQtg3Kmo!Fc8+9^M5l4(Ylc{X$G5pb8rN{WldW^!D%C9#5+P{}q}1 z#byEPIY>M8zf@HH?N)_Hlfc*i?P2xLtN(d&bA&W<pG~wAh`f-2fHheZZ(D5kAO90+ z2U`98hcN3O+0@?)-`~DWP~GrvdoSpyew%Fl?=E5gzYqEU)``GFIbi=@Kqv{st_PPc hwB^5iwfqN8_)6Gcw9=Jdm!U(Fkx&%R7k%#iKL8~?)FA)> diff --git a/docs/resources/resourceGroupName.png b/docs/resources/resourceGroupName.png deleted file mode 100644 index 366f0dcad78fd58ff5f75e37de5e997e0c67230e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 208502 zcmeFZcTiJX8!wC^azMd?fP%mgr8fma2}Kc+CY>aND!q3?FA56MYd}g6=}G7idJ*Ye zN<s}thX6sTQvKpNp7Xx<-kGn=H}}80W|++0dmwA?^{i(<&#w@!sjf&v%|uN`Mn<Eo z^h}$K><?}-vP%+wTqd1q%?-*TeOz$YR(wiUGI)2Lba2U9PEC%CtUUJ0sVN2Nn94;7 z>P|++!13$ng0l95Z)9XY^OT>->3SP)o?X#>uo|%XGw6ZOR6@M~6@Pg7RlQ)PKPO-I zUH5Zo?C*Tsd8A=&-c7M^`aZf~>+ZKq^2w`%+fURP23fneFAavLde7fw4pjC{xT=2f zAhhT0q_>{6wOM-k#e|D7{oR*)$m^>t#1pVeZm}F^AL>0uMe&BdX?4veUGyLb1O}2B z(g9gC&-rFDQ(w6<cat>Tf5s=l`r$L7e~w6>pGxk@UHGr#P2kO2|8@AO<o^G;OnM&w z=dt`16#pk2{@xq^`@_MI(Ji7^H(?w0c-~Ai`QIJc-A?oN?OW%%T{4{Q$fswB2uzl1 z5IPi}$5?Fpgbvm*^11f37<vM7$gbb51)|&r40U%~pJSqnfhLA|X_q;dMDMi-!sw=y zp<u6ARL;n1puYQ~E|!ylZjVx?`oUV&e{+EgAdB*?qj#6o?8n2V?SSKMMcM2ywm?0< zgH6|#3nj+jEH5)Nvqe!^)Ym5kguW8E_|l<mP&mD2jdzj>cz)1))f1e|*SD*$r{_|@ z@ivFZ`0q{B3dU!}b<&8>WHk`$RpD^B@6VIDQYm7sy!fn=>-^NM=;!zz|8GB%AclEQ zOf;J?<4+SlL!&dHn(b-Pp`s!^28XHBQ0O3y7ZQWPBA!<%1z-H<kAH$izw@I8vwxPq zCX<_xa1-w_s&?FZE%2pAx1h6HLvYs#>_?i9&QD(YRB(_Hg0R_BdVG*&)rMn~g^PO< zvYJM)TQe?brqjTqjf;f)kLR=h`|01JqULElT1of)-oc1zY%Ee_3(!?nRrOtr7N2pB zXW_6z&6PIJXan}HqIO@#G~7*@Cd|ACs`vK=PU2Gvc7**N{WDK8GQ*_5va{Q2dAJ|3 zPEkQYLEp#->(#u=VpQwWdUpBFZt}W|Mgfybz>55{-5eQ$v{(UXb(;S>!R6<>$uLD~ zgtpGt!eqSjO`r73qF@NW!YW{DBH#Q#PSo~gwt9#Dm)aJ2oqb0;WU;1P$&tW)CgU$l zE-9CXiY7jYKV0=H<H-s|u`eHGIQD}hp3Cg$u`zZoJF|E)IDZAHt;S8E+|-8On-fI4 zJO<BrRZ$I!SS{OLS>fW@P{CrqJI(b5IV|uUo+2bso*=m)C{7A43wrG5S`+4LkHJ<q z)DFc8`Q{Z7TN%p%eEW9JNQmWY(BX5@qP)@j1PNd54b{;znUmWmRoZhU$;T?ij@7xN z_gR3xZssiQLqf`gMbD1G>5}wEpc)S}GGEUL&UZ5n`z$CnW+2ZlPtxj4odQL-;g_R! z*rFB=`|=1>TAi#9y0z3hY5z=>^bOm<k4v11ws=e3WM*BoUzI#=$icoL!w$e=s|)jy zYdqcB=*r03e<X}Yhqi}!EbEG|E16?@7ng4U_Nxm;S~Eq*?aY`rMqWU*eV#u}L##nG zaNBDCF5WnsujZ%aN??Jx;{elpY98JXD$Ks36F!=gTdJm@u6%}pZDt>OYTbz|iA(9r z9S4RUu3&TK>^RnCFIuFKrX?5Gvm9{T82^Aka!ZcM7Ba9h7u+NtU?-zVxP&ft+}xU3 zdQ+T)DI8W&FZ-ba8Z8@2ZF#1`OZ_7HcD$t;*8?s?=~y?rWBSc25<OI&b$XHRAeSr< zIRZOq*CQ>7TECVCbV;DY5wf08>Qg4!Rjv_Gm6=jo?@E>Mty#cRu-oUUgXTszz}_B; zXYTxc)-yG7+_8E<SPDZ`S=j@>+^Z?@FBN5FS<4(=atz)(QUHtIieBpc=~Y{SePmVz zG=N+!-_p8E0d9G@@g&BEd*Wlg3YVm*V~e`mQy_;LIko3lYBd~fW78wJombX1W`L{% zhcMajx{kkSP086w%iXC;Sw+swr27)?MEokb{u*D+;<L!6n-8)&ySi!~?QfJdM01R8 z;fmHQG$MhDtMu`TKA>VI!sDU}ht7*#>bA0G152nPF@*;WMOyR}xEIfM3u5xTRqLO? zLEumBD&*0DSS%J<(rhw%;JkuFHRFu!)xu*uMA0+7LVpbLP8bWdV4?v>8(0rJ<{Jb! zh)aS{f4%A1w$th@WWMDS8OojhutEmT5a7ChA_pryB)ON-XaqU?yvC3T@X($y-;M87 zMNlohKo6cLtB|6O6bDmAle>xaf!+o!f~`+34*DM4LYF%B@<A*!yL3%7xAq5}$7(ce zdSc=k(}5;z$A_#=$t@Gqh%k@(2IH_a1MJjPk^KHvnx2c@h`TAYt+<%bXZD&w7tABh zG~!Waw141(LkF0(D$jD4X!XfiH$}p<EbDY;^<mX4ny=yS<MigNc235pdM{%Ugd#pM zf&QxL@AvKg5KRZ#fObFXrM|C*jK>2%c7yqY(seR*$epJ5*oJG3f>`0ll_}r;llz<4 z<t~WDj`PKK`8EWhZDViFy&Uvt*ari=iqu}8k5VgenAnCKht|Vf&?UG0>!u9!3ZIH> z4d5rvPSX;Z(%ok*58=n~yOqU-e2Mfi5N~yJ+u*L@w^Xp|J#N{APlVjif~N;XT&22} z2N@eLpMVaog?gY0+BT&g)x8Auq18Y6>hy&W*bpG@o1lqJKO2|9Gc!KcWg^}_McH(I z_D#um@p-gvSNj{zB3lbh$8$43o3Nu{b=XyFA44it54pvy0U*=1Q;-4|Wx)&EJDJk( z625-G@LN}mI2(4#iVN_*gtp>OX?*EQ%%cvJGt5boZdV<@d`oxoXEc(xw`SVQBk*Z} zH66hZrXG^Gt6rgO+>CREx0_Gx8W+eg5~FD}$|!V_=@0@0rbwE{FH7=T&C|-$8#EL^ zw!XQw!ON7VyfuQW-9^EURQrwwT7<qXbQ_Gm!Yw#^cTsr@$D1gtHsvGdgHnR$-ZJMJ ztSaOR{P<zirSUvssU{__Y|HP)Kbzvye)J`Zi9ruQ_x7Q)xgBWX%lA~LlwN|xhl^V| z>dusPa61~>LJmg=HS6-R|Mx#jy84|N7&E9c;Vd8a;DjelP2Difeak^jYE|oywDQ#i z0ow}mhpdG$P-EEK(t$7hy=r->@Z23%Q`_f^baRirisWC10$J=>bj|wxbeav1q`zxF zV#AxVi_y{8+nUN<Q7ykf#h%8tr8O-WUDqNySzd0K3>h#MF!s^m%-4fGEQ(IgD+!5Y zNX3<x^w6xfEYLcCovaLWp7l<(9<*lqrjJcMXpBZx_PRZ+Gfe|aW7d))g$l;bx3TRe zW?t6W-KV+g4h<KMLB<yJ#=4O@NMAW9Zm%LeS64GWpX*JbRfr=n&A+_3R$e9-Q~BQy zD(Vu2p((hEPku&-5@6YKM%2>6ns$t`(h?!@^e>_Y?RjfA`KSLxA)?AO18eA@F>kEA zI6i%V4J$-fRiiLRafFis`ecnf8WvzhkINb3{j^~hdMR{>!-TR(Muth%_~9*Vkp}8} zGBPiJjLKLDG5V(Iq2CDH@^m6V61ojF^8)eB5d)r43upjErW0~xoI*e00pv`#CnNw< zR98dA6%_^zZ;p0?wUbs;1py8sJ-_<TzehT$&#ER6wF)AC3KU!b)J^LN;|1xro9{Cb z?7?;PbJsNN|NN4+u=VYI;pccI>FdmZUDHF$<1sMIp_hg|1<doc`KeJ*));Z?&w7bG z^AriPW<GXPg@rq;TDy;Me4h{Wn)IS3%}-a6yqXQk-LKV(S(&{;LEmn5&xz+R%7Zoi zmAbl)mxK=9qx8Ob|I8Z6`=rO7f1wnFupN>@*N<hR^*yXhudyyO+(Oq%bR^Xn;F&h} zj4%B&f0r{-%BUv2XR?Ra#PY9vf098;-3joq1G~bFSJcwrabk|0Gf~_B_74wsQ<<Ri z#=-RUqpfF`y3{4x6bqkN!j2LS%TSv&sQYP;0agL=^n8pNBKtpPAgzf>-d>eI4+}pJ zJ$6p%IociKYlMC*s6x@1yH}VkHtzrdjw6x5UGm3IUj*tj@w%z4hcQ%HP~)i*7`ern zv}^*OHoe9bhn>7jJ2-6|%^Z5nHoNCLsS+ave&zv4s$h)et096doOr}c)KSfBjo;l> z1+v%Am*y=K@<Rm?uH%Dgh}p=0Zj-D;=K=R8&uXEp`ucju7mmOcC-WYU27ocPiV{0+ zSYoI^pT?x=KK&?fOJY7dV{9U0SKn7op-F{_PuH#k*yhe8Wh*ooaTJ#bo$nFS!N}Bf z8jKbXk|XID6X17=AQunAE=v8XZSBrP>tJAm#el<X<kLYsh-mmCJnix+ujgZ<$Gu~E zApThPG!|P@POrzj^fn5)=okX51XZYs`Pk#z(+e4_b*}NcF5~bS43LbmsK!$ijbmvp z67qUSmx`KB|0?w7KC%jUglceuhC{oySgoD|#*8ZmSXEVYr~PKuQ>{FdwgA&jk{0zW z|J?YKgSf0$eO(6mZD(?rt)a@0hTR;5-MS<aAGJJqX{a~6DFvO=OVuTapt0-B?2D-j z_mM0gaifUYbPtI!hGP%y3X8Stz_B+ED%6&03X4A)`pCw*MV{F?DesFNIYGfLX1FmW zg7K{tNQQWOz%s^uZW1<`1GJY2*-(#Z^yE0v)dV@p8mV)jwu&HiSY<`;=ZngV$%ZsA z@fF&R>;)zmu9H?+5vv$F2C*)Ix}P~zIaC{z)$D?*ZP%2dcM=!2B^3a61R}Uk)~nUB zMuTP_Y?j<ng*e;){?S?tQ!2NAAR!T2`s8GTd}`3@jx*&yw;rePfIHW9Nak=YhwaS9 zpO=@nBE_%CIN(PcTZ~W*PM%X`Y-}zkRQm%~s5$>~8rIW6(9&xUin%*B)=1ykuak+5 zm-8^zX|+5-7o{?fbys0^LKJ-{>qW(6OTK@9v`^6sXEyrc?c%v{>FwRpN#B7?)ftYT zgz!g_2sMXIh57#Oq{LVAJYf7VmAli*Y3K1~eU#vU-F(E_eBg(v5O7^rz8I+fzWuEe zx|G9>vdSOq8N<2LB8tYKu;-iN3wXEk0xgO#Us!H6`$o@|4w%*B961`At2QsW3x~sV z?5cymfTcFpCm$xsS;10lp;oo{i8xM%O<i(0>1Fu_GuZwPNPDZBE_38-F2by;b>~}F zaOEHj;*zD-W=;irNier4Q-i@3QY2qnh_G(Cu6nj74uezw^ZZ<HC~1DObW^`?u0#En z)T2yhXC|hguAPFS2kM<|n1_!>ReXD-uYduQSk!ABRcZsN9q<01?9>Aqh2mdO^II7x z_|n7WOHK5t<4bE$>+^(EtuJ?0P0fX<S7T7cUQe$a^gs)&2Ze5qoIWePI6&7hMc#Sf zv$U_j+$`3?!N2Q$P^5aPXRIGtsUIPZDm?mdbbT&N!-rxS_+=*N>k}RDtUep_6~bN- zwmEy}$BwS1VbMacbOS3xez2Xh=+<UNgIjhKL2$I9-=o2uiMTel=Fm;-XfqaP!X?0r z^RIH5FE_SIBGzocC!cr*!q^W0taD+QvrQfvST$-@+eF0{fnA#@%0NqJlbRo<S@n{! zNiFwlk$C204_^ztX_fL`52=5G?G=Ch$Fj0-0$!|SWjeFI`>~gF3Gtst&+Le4hI4dE z>Te0tvD`1cO4&x%4_+OwWR(8%i)61hsARawK6Tg>RVUIF%|BItz{RBpwi0E?a18~= zL1y{9qW&%L$X-H7r8e2**B%Hodi*S|@EPVc^)j?FUO^2}&iHRLO*YOF>P_}4a=ut= zRWlt`bmMN6&4XM`?(D+-*2J9PU_&SizmloizBt<2O`h$_zf<`Hdwq$5tX6MUn8m?P z*GK`m<0j+uG`LMgPcQAm$i%QI0_ytT-*WGN!W<j^zhji7UFo*^?*z!mCRiSj0NsDb zD<j4KU<9PI6R`i^m!IexFQ+6Sxx3E(Agg`u4Z;a$4Zr4u*Q%E2&kAF%-W`833JT&h z_?mk4?^zgLapLCZ_wPe=!BB;TN|BL~M6RO$TM);>s2Pcp!_xcp`zsYlkrUEgn=g<V z;#K-9YloyGWvJ~@hjG4xwI+sdiLx`L^P$@Af?B%;3Jv;ULv?e8lBABje|PNcI^(d1 zb4YzP=s-I0?*MpZPeDbUUi-b188&X@wT|BotZ`~SvhtfG5Kze}DfF~q`#6K~=ffnF zW^g|t>nmuom6L)ArJJ;xxUccE+D1=x*BT&pdu(Y3)$q+Ov2^Od6AQY<EetI{(0dh~ zvs_s`XK@O$?0bB3?AvSURe2AvJd6c6@BdjWm$v#25hgMsUMRvx6gJ$)5u}QcgYpDr z>L{=WD?|fSBGV$ORl3rO-p}+2_=fYa|Mk|$mn}F+#{%j=0a%n*BXpTaF6_}OEfOmz z#g?G^8^%((9?e}PS`a=T7(KwTRr(h?QBfT+7>g?3dXFofmnk}rzYNzuiG6`?`KX#W zDDE0g#W*chpt|w$<kjgBk<vZir^9FEC-H&Yd~Xov>UcG}spKg|yfQZa)$b}Tx8wRX z+s3mkX9yIUN^JQV=y$$9ZZiJ%3gcdkSEKwj*&kWNrbA=AOB)Sw>JzB9K|?Y0`PjJc zlf3XADh7=b>fSRuduI<u!{`WIEv+Kyxq6Z5{2Pe()KZo4P(-SWRVmF8O2{jbjz3cy zgstD5_*j@dJYgYQKdz?eq9i~+$W)uWglhj_SWdr_LhAdIGa8UT_|j^OWdy)(!El=| zl}%3q9pQ<0zxMK#ihB(g7q^J($sO@h90wDM_kn!5UwL>T0VCtH$8Pi;2itv*G^(RX z7@Ca>&}_vGG&xq1w%1V0uYQ0*VE|%kJWGOe&3r#o4Ry6XE-ba={oYCrPlBH^`5hAB z;~N-1)gK2nEyce;uvqDxcbVP`R86Fy@*QuO&C9rZxwQjZ^h~XZ1*rM*OvhJu{)lRy z%~rc<PN=2DSWWSmUb-pk8-?}O#t@3rk2ba9;qvg8kL6=Rea48LjpZe-H}utuGOX}~ zk8!DQsYs1{U7|^JQ$dvl<^3y5&UTaF>vWKMf1fSJ1;i6~CulKhYq=z3pSKUreuGaU ziZ304LF}tn$gL&$#yUB3znS8-|8Z&bVn5AjeIp!Fa$GFvgf0kq<0l{Br&)P$hAY_V zRA;GzxGj5U%+)ZxFVLlr4xgkrqMkU3<u==vX4&m0Fef8&zM^$?PU^wFG_|20dj5VS zpJ1Vv-ij8rzu6Ah_WK1jW{J=Fj~ZL;zkf-y^{tKV{0r+jDIFRP?4;{2)pWUeb{5Hw zi52#^_c_&!p!H?Nk>$<c$_%H7Qozyva>Xv)QxPC=v9XK5Q+$($n$dZ=UyDY)Zu{~o zJ+e2o4OFZo>Defeo5!)sW`aDW8eR@LiQFt9tgd>Ut4j!$M=)UF29umO)F@-^($}d_ z6(UU8X>81+jfo$#b_7Ij;S3PWI$hyDT&=Cv)k2kwQag?6!NImK!GUtF3NHofcv{pg zDOOsp>=K*B%Yn$|N7ii3z0Wam_kNLHr16#7L*CSM-he1wy`Jeu>aeup1NU;+)@SP6 zzh4SP!(oEI5?g_NG$iaqaqJ}p<I{q%TM{T;A^b0t(u(FGD`MQnJUwPo>v+Pu>k8AM zmkp{}O#nmB+l~4BhZXi)FlShU=zFIuALmqBF^VxwP}0NpSNoSs6j?VGN#M3^7xw`w z-(ATO_kQJu`wPU%`)Wqz$$Vi9<w@1!p}X;tF%0f^rvvXi5(8KJol0T_2v>Ed<)7(g z&vPJH*S`!WB6~Z~6(MTWqPiX9HN6iSMRVvvcsiG>y>~&2&bn%9sgs=JJW`Q>%)^DG z=V37f3$w`wQOiwv-BrHK^+^(^`%`+m;bLrDQerE$GMoo`82$QmT^)xQ>^bi4>gJnc zzZf3uy0Rq7X<au9SdMT=YWiNi3wt0@M4nHSFPNr(|BY{=#>8hu!kUt4%yq;_phO>^ z!=eJn_09f;!Q<#P7xqU{G+|C9byVoAQQT{T6%k96v%Qw1!s`rG=iQxtq|-=zryZQJ zz4tLn$wtdMSZ2Kxd$oO98MPtd>9js5leqE8jL4%7T}rJ`vf<Nmk5Nq|*s_deG;qh) z6d60J1;QuIn;WuC1qL#{y!<)Q=@w-q&qL_E$z~qZR@VR{I*FTa)#QQc%j@605tSM) z%`|s+V%M#}xbdj0apLO>`ZI3p{?tQl3G?@{gd34xNxPkLn(uVKlH9ILD4A5UQ0g)P zR;5#OXm^b~WDD!7A6e_Ds=u{kwg>5Gp@QG+R&2cV95D>)@(?p(nXr_$BHqB;p?Ew? zFQB=t0mE}S<~)N!1=-+e3;@L~py#Dg-s|cqT-a=GJ(?7hf0&IJZ>{%RadBwLvueTB z;HnD%Bc{Zy$p#BYN<T%c9S1kRS|QTM#c!x-$~am)rO*6a_75DUN4NGOZtj+C;QhdW z-1@+Up@Opf`fJG5qK26!>u330026)dsi_3cv^0QCU}F(}EY(L(DC*EYFMq(F@vmY_ z+i0_z8pgUEzrQN)jnWD8wVGLmChHXE-;YKK#^TdyPU`%hw`R&Y1~x>?u!#j#>kIpE zc5UwY#QoS@H$X!CRGWCO%!oM}l@=(Dx$foSs%K_*hs&GHe*>T;lzUlm7tn{7BC+(P zfEn@<3p7v+!@c^pi<&~4mL}6VS?cF8i%|x4B2+Iz@dzPLxS~7RLv`Rif*YAJJCZua zW)j3z?XXf~1vql>rw(%fgO`-Jq$!`JfL&Gg6$TTe9n*p2?qq^Vj`j)taUsLd=AV-H zw2YhW(l6iI{5CCzB(3n5*Erqfg$G7^7}m1!YeE7xrl!gt-znBn;A&^&3F-hFPxFSU zizf)OkS+m5KSkMPIIE`p+^aN|43Oh6sJOFt+ISdV#xGl30(87DxA*xN=J^>iR{XL| zK9Encb#~Sm)wpwce^0Eq=>{_-JO4EajaHWmhlfk`Ru8DWf$Hgfsn}of6l)Lj`olKR zOg$}qBmpndq@i#!4g(S+>|n5f)FL$^Zz#xVa#=^+CmJ{ayH!|m@n!j0-SVW4v;LSb zho@hWPM$5_@RtN5Csor}f1kV+eHy!$M)H#a##jbusT8y7YL)Bzy{o0<&e8RYmh-b= zX0VsCCp$ziN;W`+_K<IaQ4@~Hh^tjAp+;RKTshcqsgCUUg<GrBKu<6w2KFBgcBJ9r zdxcy+uL9Cx0#WUK9T}#ldc}S!pe*HRVwyc^YeZgWNgWM7DlN5X!7H>Jy1*m)Wn`qi z*je8lY(h=wu!>XI%~Frf{F))2kF>nZV}P;Zs<3rFZLcr&ih4a%gVhHMe<Sp^ZEAV? zic{&!rTo>~JcG^s7R}|o<rN=Q<?#UK5=8&D0waXd=Lkb}5{>wPDXyzItl?X}FJ+FI zGO<%g$VvM^?Q~Md$Tn;0ssf(sX>T+jqp(Cxn_i>fpr=>?in8~m#c*&HiIn#EY=jzS z37>TF=|Ze5Zw}g9wIlt|{Y~kfUjaGaB@4u3Y1-l~!p9Bgx)g!BkabS3_Nmk}!vplP z(!oL6x`^cN>T5+wz+k|rx_a56y@1&G#%nN*2WO_i$nLO_oq&e4m376rm}|>F@$UYB zd-IE$I6imUxdoqD)0ti!8t{qUX)|dvXd6<}Yo~LX;{(m%-Sjs58`-a{A|d;@$1WPS zS;N~=Tt;(3ei_!wNR(`y`RPrTbsKOU+~j&DsI1BOd_rRE+!uhDdY<cJ8SwS=sp$Sm z$sIJWOGxTH0jH=er`S^M0a(Y5o{aQ+_o$Remf<Nq!6UUMyYfWA&uPTc@sBHDOtl!_ zmoJ4E{BjII)q6Jbn{LY#IzsXUC*kEaufAc{jh|IdJ-=k>0balPbUZ0bVYY0<h~~02 zWv}KprQYL_eC|;s;EJG<x?N}FvkdRueFI>2fHXA)G)-|OZ`SYKf;ir;objujWU;!R zJBqirbSrE&qPwDg<(r`%&cz;mEVkzmm-^!yZ9IqCr1RHIS8_9Zx$*r$lu(==XL--v z#e`{<woxGNgYcB6R>YYjsyCWf6p;12fp`WKZvL8NjSLEKsjk;Sfc-@01f$rr<g+G| zEYWG#ps<&Yi(0Nmii9`W{NGo$bpj5vE-r%+X`ZsxkN!wohiMLb>cJ1JM(q#p`R$}{ ze4c>-LoxF*>k*zX(WI#h!`~c8Oosim=s{+JQ9!dc7L%)zS$Df*rv~(krWkvY<NkA( z#46zPWq9|wwujJZM0ISP{2)Jq0Na?B#2x1cMh^*cHDWfqe`Hpe=aHbJdriRXJLnGq zI!-6{O(-EDVe4BXGv3EFV>v?o_P&iK0{OEGLl-w@uV(->Snk(o@4prW#E~LIdZ_*w z?fk)oFgSC961ysL9eZVWlxf@fk>&d@>iset5*voAb?|+aStHVGBeIy>#In+8JN{@G zv%B#@ti@_6)z3<-3o!{P@!z;rygJ+YqFvOiO-f01cd*S3tELTAWuFMmV8>QnE$kxH zch)PaU50zBmJZfz_g0H=t!(ZJ6&6AQ-<ojbdlxVLQD9xLl`7S=mh`do2`F4%*+O19 z(bu4V-*LeC2XlcILcT!sFnH9e;$DvRj)Kg!elPe+^BoeOWPErIvYv9^JbnbL!10ei zW;+=_|N2hIApIht@7(;ic&C;(KC4WA+kaJR>(X0@v5x{DAC&0#BVt~QINQX_&o4SU ziz)G|Nt*Y}G~B}5JDTS=l{<OYkZQcjLr`H;UHO_8FBd?}`ln8lf8IIGg^7rIVXl|V znWK7Xf4X>>K1B$~*yGho)$Jx&tY;G;DA>>Qpodw!CzSF)>}dR0(>^M>W|tbjlXa|U zO&{@$UhIUG>BV%4dx9fQZjiMmBL^Hto_b}-uA3>4-7^MU*I&DwU{Zn!WaGV6SRG7Z zm59tCq`jC~k5KoF?mn*x(m<k^6WO8WGImnFPpwnN+17efWut2^kbf8tFh8rP4E7ix zyz^3MLDjWVdCh#gORqb5Wf2vzvn3ops8J|X9(#zDq*1Rohp#U4*;ejX2e9bvfVMq8 zWObifoJMbph&Tz|Z)VTid}bQ*=9L?X5Rx&{hvY#QFQE;5arI-e;?j56$eX*Jg@hY{ zh7eQAeiAQ3xUGJ7w+$8YU(`%uPg7y7IvpL|fvDI_-V@7AY4A?h6MJo`8jC;{-5JL) za{2(%M+)QXE6o+Po7HuI{b<l&lYobc49iBCo1Ub*uA|ed8I?@ie$VTpv_uSv<{6bP znD<T>)NUm3A6>vsPcr5=b4_9W_xkHC-e4`=P1e^c=ZsC<ZyY8)ld213=SvgMlNPf# z5@LmeG3XhB>^)KRjSYq-w^qr=v0YW&0Bg#IG0Ul~g?e9+t&y4O!P+A`NiRl85uP^% zC)f<lAhdf(nv3AY<p*=R9^eooqx>Sqarj4=#+?nx`_^8Pq`hHvn7uhB=k2M4aI}}N zE>frM^NAv9I5L|L|1@#>T<L^1_>gz%#8v1-14!^LOh*<cBz`E%s*9hvpl&nl(~rz5 z5)5!7B~%t-ld0KXY#dZxsz26~6Q6^7lRRMLWA${k=rMGs7prSv79)u|8U=5d4BKti zZkbQDPx?qoUX&CL%672jvh;bVd0#4pL%8^SWvRs#Eb6{c=zCen`ho0~A@Yqn+-y<K z_w-`hp%9&wQeazR!HC10P&7-8_3zGv_j&MV+8NJjN8cg8*_@hLUy?FI)ib4d{DDb{ z|996vq*rq2Zcl56P9M1i*tfBI`%leUkvKD4=gz_Vqk(fdFHUb9RsRnaSk|oZ60q=C z*gA|vnK92jss2ToxwJ`ak(fyrL*vq$eg?CU)NPM>Qu84C=$)hFzns~OgscxR6=(E3 z<5Coz^6G6NMh$+d&)jIO_yF$pSy9<KhHpG5SF37Mw@LgO^^H{7WOnW*Ga@}MNJfQl zWHjq-WNBwT-a7S-R!d;;!PPebX1z4WC%U>A*!awBnkS2=@#^^A%Ps}X?!Yta5Id<f zY2&~mX}TlClX95x|G<=qWxXG6;=butPkXIyOO|P5eZKn5C;#BcT3XIQ$&Z#Awjsgf zin<2nwrtzai+MMN;~DZp;iw3(T9eR}Wop5xTIEYmUex5v^cc>$T5z^{mXvZ}z}wAR zIctramun{9SGZ|R&hIbk%d8}&7c`F08Ve0XNy=Eh7kl}^WDq}PtjK~+i^imTu#;X< zfVz)rrL~N5J1#fV^)U&vGe-~Z;3F%vC_Q)j!*dVniZESDX^T7Wtq}nKgx%Ku^dVw_ z$3oMsH_3}VP=j!q?W`}^oD1->qVma!aCr9z!9#Wu^jas*&o6n%s+0N`7g?@%(EwO} zk7-BO7H@rj7Z~taU$%h0!O$NZcGchy9y9Uy=ph7+r*3k&sc=7Qe}HA%A~C|{`%p+; z&#fWMGN_=7&Joc5{Iamk(BI+o2^)3kt>cbw6E6?XaHfpk-rlIjhT`Mn_!F8E>OMKO z$s2mH5h&WyCcLjpOGHr+MGT2weDCy(fY=w-BsQ<#r5bR$@uv2s_tNCj^1^^ZRT^)y z#0+oCoKTSbxc+tSu8rh6NS@kX>>y~V_JVjR^D~vDf$`=kPL_3|Nef~W)Ir}a8Mc*{ z;pHp%?H0B$kN+ckqop0vmE2r)HEEsuZqGuSl-?Ge*1IF)OB5Y4xwOh^_fg*#v59Z1 zMn}FNaV~AJ#Kwc81K{!8hz3`7IS@nJ5Sf&tcXyYV_U0h|A)vn1m#?DA(!rVQsgC;i z{OilsKd3Y^55!?8F)R#rW4v|eWlN|PK1=`m1;AmHjhVl0>$xWuQV@~6+++X2?HS+h zI>AP}{O*Uw(_%WE>Y*7Ci1z00ixj3JzmOKtca%uPi@J$q1~t{0{K%$)&1X<`?J}1a z1$fr0{c`qB()h~zudy9L0g+RF<80=QMo#S21&HoPhe^lDp8K4e_Aj%v);&{5VayD> z4pmE)7MUR!F47oHt8q-w*tbc&vBE#NHNLadn4wyrXSwbh_D;~QeTG>-{aRfc_=oP) zmyh>3h=)`=3$3<YGu=feC;9IfH275SpIWp|1z6fzF>jq$)c#nN6P<3e`;Cn2g^||0 zEP;;IckP~(<UFz<bEI-e7R~Hb+j@4ubc>4bW{`rUoowgq`SjD!X@$@681d|!8;;JE zg`aO6I)XM5Q^g-whJ#qr-N+y2fxdsQ*|;XLSh?-tzsiU6+;|z-5kU7)<7j%j?9VIy zy?laT*9hdF1KzhdFik*Nv7(X{AWI>?QH#+m_AF+eQ0_XQ2U_BZYjJ+j6;|}MCr)xs z)>_&doxXnF3VU6?@9D-;M6-R}C}Z;aADLwh#p3>XC}l?U0j{v2a*#MHRsXPLws|Zd z#!!~T+CHd?WvPbu6BX<SX|55f=s|mMbP12bEn%nC@z;Q7pTlG1QO;~%+V_HYIUBo9 z)z<?lfX_u`J)WJ6v@4GqTv<{OYF9tCOH_t-I_w^YQ!b2WNXR(P$>;3qsH9I@?b^-7 z--|XdI;A|FGHD()pSia!%W{Wly!&PP#q%>>jR}aWtK5`nkRZ|6;}I<GW1$aD(&&;N zTYuxxW?*j`sm#4Mpuvean#pCrpUAsH7ef!?9bgq2<_F%4J}BxjC%wm9bp`L19}P?( z^4|bboHmgTb+;^ipoTNMUlZ!BHvZnUWJ=MO-U>Y6<l+|;G(PE}s{X|qm+r0(rLX(E ztzoI@b!o8CBk{<j`e?On1yappMyiis#zW4Th_AP$@_hU-7vb3D^j?`F-V=fPcPkpj zZ1_{NqT1K8u|oUIIUKY2)3EQ3xYkrjf$2G@jEck6WDBD)mUJW4v_h}hC^f0#CI+Ep z61`bB6KL>Q`f<s5a_9a=jF7~JQQl5E0c5H!$fW-z0m;wxUOQ{X=GjLQCVE-FhE>+I zVO-ANn^I>Z?}D}A-W%JZ)&Ny~S$KZGCbyQ3b7V$5OFm#C-gn|vv|xTp3?jm&{_)3v z+_am12TIB7P29wcPz|ZY{Z$Z!*g<yOIxOxbjF@}5L7(2{8@d^3vRHZVL|le~a%?6+ z;^A>bhC#fdt&_s@w>vX~jNqrpuBf@ZZ#%&6OYa&_2mH2`lHOKSZS6_kbgyV5(qxwi zC@}7T7v7PC5C}Ud&6mB8P<f;B1hH}dh4OuMYw@c-WtD1_)Gvw^QapSM4b(Pz^C5q4 zTLaQUD@n{lYog6Ed|FvNEz`I7WgA0~17`sn+bMK(GN=mT+vEk|yp3n311R;Vfu3I5 zZ}4&3(Nm7;ip%N66;ipGw|rhUXSCbPz@;S-!p~s$I&4IGJoS@t?(7A73HS*SkNBYw zRfkpB@AWrqQqr7gcdWr%ad9<nkv3-6?I2>^s>c==mtmi}ox`Bda(Py^F-J80;B@@F zq~$I}$59*|&9|i#$3KF-?d!2Ve>zsVAQIY|sAFO_emqgV?EKu>@<l<01I<zI1~%~F zG&wJqq|^rIv!zrw4Zwms)A>y=hhu0ohQ{8_H6WM6y3chq$0-h%QQ$>+()8ee;_9=M ze{=QGpGG`8!n`Izb=#zMy*yEZ2b?gCaoSGSp<xo)@9;u7@$zX0G0fq;OIQ6NvdVY* z9?_`Ww_ojz3O4d-{<s_yx-XH5_y@PdhUiY?X?t*{TVH!lHX%Q0vB+=Zu)+DAkd0Hj zaaE>}M$aQ9XSISf-pX_fn5X9?mB)$7vWBGCb84typIV2L$oE(NOy%1$elO5ox)72m z*7l7$x?uawpdgpAgmF#7sRI%Wm$8b+G_dX?B<yL@TRJzQKlJ+EnT-^*WU*)^_;+V~ zG@XJSB@Z|_dWRJ|3ir!rr)CXKHL*W9%zjC*4BPs&fnP{90$XIp;`$?!^EWx5Hyg&& zDogA}l6@FbI+p!d+Y^iZXOj+RHu<z1w_Ukx|JENg2I<QbUyTAzvuuygZ-FiHr+;T@ zWhG6eHWhVl9-i_<x@M9(dHrbh1DE7H(?dFGJ}z0!k{DjDC-oj;g$|y&kHzO>)VBB_ zU%O?+|Ck3s14=`uc;U>^POM86dNP!vNz;qks|+WJvr&UFiLJ^46O;+)UR+jilNyRA zf<mUTR|u)4a~KzMC|=hm*h!@(aTbQIErB%c(|;$+Y}<4;DUR9mLd_ag#BgckQ9+qz zPnj@RqwLz93xpgNidIZqRHU4PPL9j5LJfEMjBS39R164R*2(13dTlP5d%(x2W4&*W zY*DfMO7nap=hW6XGY*{SWa*VKfXqZWtdzFer&wb634FYSqN33<3_G`Yl`dYUk11Wh ztd!5hGCeeAjQcSXRs85Ey}kikF=SL`ug)v6{OsHBJW!ez0^n7a<xw4!tKquMQz7j9 zbG*FhYwl=zNY{+KFYsCkUt&fGg2};S_WCuAXj_R#aWa*gF+nC-0b2l~Og}z9ua`Ld z0IeR?!y`Njz8FF%5sKU%H8a{)YuZw_bc;VsLOeWFklJjyDeRS`mO;ZK8N+r>&-aRM z;`RPMWFf@M<yrCa<ckA6)$SdJ_Xi98Op>U=ZLmu&2<erw-n4cTCnxrz)0dW4vj<E? zL5W^61e>bC@|#UK50tbt^;=2?@~ujG!l6>iW&uLf^!3w%weN67pLzPF#IXX)<4Hg& z+j#}Vq{kl#2z^}H5p$PdXCpb`j*ZrSy^6SF@xeQw*U#q-;eChF5>h{d4a82cPUlY3 z^=gK>0W>7CZM(bq;#TQ32cbvV<yw>x_;fiZ<mu~>!Bem>p7!sYqU83Q@Gumg_0B<L zd>iy?9yLnH#G-?-4WF?^g@xU$%?rn0vGeCQ0PV9;B%N7RxmuTYGtF%7>u?~wz1-qC z*l{hZ{x5;PwuOGvMm-gY!|+pb^fdVqiirE_IvZCtD|@Y^FuzW_`R(^Tym1PKL=wzV zJ-j`SbYdY)ii#%RAW6Xp+Y*1G6~9#_#8&>|H&=d)!c~E|bgwfO^~1#y8;4IpIue5; zxpR9sbkKvZ&C4tXa{{Ux?hn|H{C6C{$@KaBez@Kd<hAkMBwz9XD!HyU0$Zt0{7KJ3 z_%{EUCl;SWDBMfU|AG!JS)$EBV`Zl9ZRG8~b#1}XTdumo+E1vw+WXo!9XYBBC&M4H zNIj~&_pR>!kpL6Z0s7PF%BfAxl(x9H&g{ymBGcv$tp+Sj%sP+w9(Y@$B;=M@Ql75c zgTkEetnx38Qq>SUQFgYT%96_+JC3!1MXL5s2lL=4>Cy7p2V1)C{CegN4kn~PVAB>8 z%$s=RR4dC*wR{^0d-ghq>JCe)AtjY#cLkWzemt0cm%18b>tOUyc-?pjC%53K<$k)g z@?(58!&?n{Sq<9hWm6sHNQc|pq<|YNzIBi|oRAU8UZ1_}*g)V1mof!}hx7Gxr7Z*| zYC*03^emm*lr@h;v;damDlZrJ@vomR-ksAwQtX%Mw<el0Px)@jrY{_qwG$<Kx^#zG zb%#hC@Qgn6S^v4eRS@$A*P@?RC@hZn!^^;NyViDmr7)RuY)rb)qx>YKDMx)r$y)^x z<~zdq2>jk{qr6vO-Z}h7U0zWGiC6Fn4SUy5%k#zcDf;_{-^Pa37If5ksxP-ebaF}- zM_in=Ao3wrniD3BUm&J2MBGuQpO@7TuD_;l)8~3aDc55(%XD1}s8D7i=Lg5_hRcq8 zX#|==p({flY6B3!S$Lc%128ZD({R-mP|#DuT|v#DNW{@qHPz|2(CNWPN(w`3FhH!~ z_D{vFwbOOc9x6t2P@+*WlLRKW40C^jtxbk%(c778L|VKsp2u2(n(v#0WZFQ`uyLjD zL17y6^g#I_->vYUeDwlMRJNwRhGzlD<G`U$1SpFmZK0R{6zk#)4-?u!dgU%Y001kx z_MjvNSt(M8%yapCyfX1wHI3Sn_u*P|PhD!NEXE_&Zt9F?gVO9|-(hWMCPyZGE}civ z)n}??#LH@B3@Xr}{)xI;FFxu=AgPw-9)G>UN<pdZHQZu!1S82^@8k<0rixliSx3jR z-JjHP1WF>fm);APTRVIgR?5^)>Z!|dBp~!$O2~JMF~$!>OT%YhrEv-JF0;RN2M!Mx z9lX{_yQYA{2x*W!3zIrb1cw0?x6jEhBs)VjdsK-E_Yyar@abpP5V<zSYsAV+MvrvJ z?XLaO+!Xm~nWa8(U~CB0Pb87~XyCB<6n-z^thxsCx{D6vZL89HU<KoM+7=+PNQxJM z-G!*t1!@noC(561iMiXo)MF+-y8~a&i_2*+mx+6SqG7Q8#^^k`-92s1S^MS4I-1?U z>bS^$u>OO=hZ*50;LwNj{8uAef{T8`^ahkj#O?I>GYf%2u<BGw%Qd?eDcw%64F5pX zkYrP|cZ9BS3*vCu`j$thj}k$_)Y@M%{NBlaBW9nsk{vfpfuORIl5902^2vma*-Y&_ z?6_m=$J2mp(rI^_hV~}YNQK>o&%>PNWT)sfKkEheq0|bQ+(=i?u~RkX69ZS}0>#i8 z68aw%wKf*)$98SVUb=SRLCA|5^1pLw!k3VXC6%nVUhzG9x_y0qJrLlfW@kir@>|x_ za)AU?{FXKSX<vf&i-+u=-KU<wr)PkzvxLy{(nf(;g7mEEVdixp9{FSr1M~b{_?6J? zWs#Ak$eUwC9G-d@b0v@mC&TYVQ&?xzxG%%KPRQHHKOGoB4zoeg`x-W_z6~<YEioSB z??vjtdh+$6Bp!`g!`>op=^sHWgp;I6`s%i`gf8L)y({{qkFwr8?#|8^yOVO4OmJ%7 zO-P>=-1W6eW=!76GSXLs#d@AvXJibWtWuK_nPZeTV<F1+dv3KEw-+v4{Z3{`JIe&4 z#Yj3gFbyjy-SaAP@Nv`CjN6Dovfy-sDt+IHU6`O5UvDbRwS5u*>sXoT_aP;~A?RTw z`U{@20XwIUG;|lNl$Rk$xDKBEW1A?E7RLvkZ2iQOghjkuT#9^rd_*p?l=im@h@%4N zTlXE0*t*LBHFG61GltgnXADg@sMgmfm1%xHZYgc?UkGlvL1r-t^A$QC?!O}w;05pX z0GpitwA#Dxb%eFquS@s%d497=b~xwfs<V>%?>lm_%%P+pt>y1S(#Okj{Mz|{EMC7( z#AW^GG8vgC3)O$r&c81I5}^HOc;f#tw*BWESwk@E|7J7lp8};js=c~Ni-G?vJQ-Qs zqno#0Ri%kOeDpCq{DMe|f*SdX_`o);#Xck+c9f5LF6v*U5prJ+1F4PtkD|`v&84?$ zGo*#!6%fFNJw7!JAju*?AP{`^u=$WjTzuS!yq3Wm<oWI0aYznR4W00e?P+bOuYqpj zHf+3sX&GG|@T7IvbxWG9y|ltCR_a56|9`3CUPV47>264vCR#;BWz*sfsT7efZ9YcL z`tPdYUAtI(*FJ`M%mo~-hcY|4j9)I%o(%vBi)J_D$ax2Lc^G19eB3~qM2LZ3PQzC_ z-Q0)>v*jZkVp1%6tzCB_HM*bB|3>6L`n^9zNQzfe4i0~kFK@i2<;+n{Lt|rDkqxst zgpjfhIxO*OQmw&zrZ<QQ&llT5zInIMrWg%4ubB*xq_EQ;$tl3!WKrKv-yFw^B4@W# z=1fZS@1Id;8f*Rtt~}Vc1|`aby@0;ov03{vQPFVw-vxj2oK)B^ay>o@|2$uYh>BbL z1-F60U=NbLu6Ki@EVJ$=0J{w_c0w}wUdH-7>@tc`<!C`F1p56EQpnIb4J&liOk7RI z*abD9mfaJXHtYd?VOu1J_CLer(LWMAF?vSEX&G)3OhA~l{s2oc>uR(F&Ws{SD&C{( z!>2Z}z}SJh3p)<~quEZo>5pwkrZ0L%<+pyTSSW}8t?_8pur<iM>ZcTSgDxbJ>@OXQ zw^he^<7>&55VZ>cU3!kIkFJA63GrRWwGRb@?CZa_KmZ7NJ9IBV!8`^zdUsUv5M9Kr z<5#9}vfF<nb<yTgSNRt0MN|V|N{i>i|7$hN8B@Bd*2%0t_6IXaN5`tV2i7}ylcbK5 z$Q%Bc15DKuD_?Yf?8N(*lMmtgSpS!E5Ab%MJ&ow730a7s`pfFKE&?JzHvS*gEfzly zI#wbKU*J2Y-I0>&UQp7@GL?>LlTFp#DRi==xmW>1@6#I%$-EKGTOo?f#K{fRMc(x3 zBVch$5UA^{zL8T!iyq6fd_Qd2$86NEl5-ap;pS25UL(-2cjAZyDZDlaijTA6I>sg* z%vumi*WZzP-^Ihr?paoq3J9u$+`7jWE-Z#`^kf)Q1M(bAl@IT)0$rxhUKG(@dBLJT z=Y-22s7v*;Ol*14@!h==<)kdabs77(y8Nz4aYMWLrhzg_+&${IXRv4%_|K01r0|jQ zElY*3`ZsTB-`xT6{o{?&2G#g@tR#!QJ?@jPlGYIkV$5kB4C!?;q5h@RunC;&Mr&q$ zHh%wLj^B%YWVizw?f6HnPtu%ZZu1j3%d4p8IS1Q5ZjsB|YY;!w96u7Yt@%O!nqI46 z?2#$oqt>ZGHT4M<Xe3kd(xu2!T>#BV#*sr$sg`XffDXHm%JP8gL2n<#ar9L%OQ2MD zJy?(e_$3Wxn2{Sv+UEzy^LZ2k{QNw(zH`@Psl0B!2OG~_gXfkTIleyQt+^P>T61@c z<tPc_`=mI4+>X~3j8TAKnE0Ii6d<1~epJ;Hs-iCqU)dO+q%zT}32vo5BF)0j&kwoN z%RDwZZK1DUaT7pu2|MpKrCjvlGqHw&?}nABsa&5bG1y_k7Vl#}cE@?hR3LQ`sz=SU z&;ybKJqeJ<tAJoQPrOyb6FB{ZXDLFj?)^}6V}p+IHb>YA$-Y?FtFEpz(}_1JGYO;H zkY@Im<Sktvi^G_pNiODpJ%TzJSs=kK#WAhFL<ccgV2$>XK}_KkR75UxTrO1QCSj7! zxMF%_<oL3ckb%<VC;wg^FTyNRzJ}GzvA$q7LoNFz3-Q|2p$e(E5xi1xx40Tazot|6 zvkc0Y-e3NsVSGH@FNy*_Kwwsa;s1$%SAB0Uy=C#<D6ZKfwR}2~l9C4xuL-rBR-6oA zolX2S7Z(?&-yg#!@SO?kp7vmmiUI{h&Td3^P9q9Tv(E;G9xS+zOz;dS7Nr`(u})VR zQU8lgu`VJsU-Ziw#E9fXCY%5qe_Cat2=-eTT+*77Vr6gfY4EqA;H~`~gK51)l4!D^ z`i8ABlue@L`T&s`i{f=5Z@VX;J|QBtiq>^EDwhUdyS8$7aoLRWv3Rm-piZg&W^QCz z{>cWcuntsQJU}ffYWHcD8v+-QnYvDC?9)2d7gwMDLh=~zR<w&QKP2fHmMTelhLFMf z<jMf*_TC0Tu*S&eXAaQMx7J3Xs~ffEj^P_GY+8+)S^gJELk5|nE1ZzXo;TYzKzzu2 z4?#5MOZ?l+sQ+s9b493u0oH5e{5^{ls==RRvh7CJ+wPCEX;(^S;#OWUF;QkXy76Hv z?&%4Ds#w5z4MwL^<y<XDRd)f8tM;8xn3_TZkV(a|$&W3Q2GtbknBF<7qhArx0YTL# zJ5XjuE<2;OokVkyub;1`?f)`0UL%<r6AvL3V8MK~X;|ijtW=nX9q}z}yqsfk<4?NT zHoJp#U$M%Mqj=QgF^2;zYDFI0VCWJv;4atKwsLz!w9G6hU9zk2DXFfn8X79Szc^T( zsoj!xlR7WEscq{9*LS9}-g2#`mF87lBZU4<@!sHz?s(|FSQD|{J+{2|xd2to@79Wp z%*BVq-@pB3cR$2?eTayN*dqx=H4o>4T8#a_E65xzCI00h$CL!JmW~tem~Gg`vTR0> zoJGGqmw{YgH~AdP=DKBTK@jR@!z}@R-H)jUD<v?F=3(XNfysEt?sOnW7mAnAYvILt z{lAI*h(rGtAaWiVC$rJR2TGM$1>V+#pM~5*5Z09lB>|v5w5Ohn`~Tp#d<f$Df%Hyl z@G3RpeEZf9Pn^){4#z5v5nTRspNG;w+ceq-hj~-()EMscVQ|~>Z!coivqYs~x<-lN zQbxl)B{v52!!MC!%;KC1R$abho_i!fvGnm5xJUp~xw!B?0VDFFgbe(p4$AV~X;W>Q zHRDU8(Xu3OVFhC+h<<t6@+RVg=G^3)T?54E*QG|fCxd;E5vvWy6QEKBz8?KY;govz zANB;B6dVMv42$mXMb_JKK#V%@o_of_j0_mpTyl2-e!+(2s(g}Gs*Y8@U~IHJkUI=6 zqKIYiI3)dFfle5sF~hSI4^)kU%=as28KH~&nh#o<`YlU#nHmh)m0?7^RLPGyG9k)T z4;fuq9(-HoG+ayv`GDeg5SR1An=7fhtTBDcHAX8uL8F%$up}J^W-mijaZN(JvD#6q zQImjOoB8nqyZ->*6)||%QRj=KBs~OB(qe5~v=+<>G#JAW>!tGVoK$b?Xn`WytKPpT z{ik0bi@S02R<+BtW6fXMd=h@m>eFQG_b!a2lQQy}^(k<woxki=jGjv^xqNhnGZ-*X zD^|JNEHk>L4Ml9~WCe_^Z~a-LUEF#Ble?wTnqxRO<xOA}X@NS}a(aV3TPT{fSqf_y z>u6EU{Z!c`$Ci_S`gC<}PfRO~d9hHbKBe7z&-lM>p@Am`sv=Cy?^=h3ST;1XKB|Z5 zQ^IdI%q9szWHlOf`xRGbJi`)Sxw5a5@=n70ByDgG`-$e$G-eG@FBfL5y%VIVyV&p0 zwp7tDOwTSHz|XVh0CjE1IJD8w9*Gt=hNMnS!pf{pU=Xm*g95@zQayoTpcG1-WC){M z&6s^Eokv4WdsoY`0}NHfpt#)*8Xp3RbW?^1;XDFPd}Yl#S_7A-Jw%Vp3|vFGmB0;i z>&tQ<d1#yqcSS2)S-krJPBhGm{ttIoDo<?5OSz0=QzHg1V?9M5)wSNVAEmP6Thhe` z=WEaY0K?d2X9gLR#igo5CqK3>F;~^4YX|_hCR23metPBn_u}x77UyO3z*)4je_Lkr zezEiV+|RSQ{grg*DH)y_zwM@R-GtBZdkSCqn3F@&Dol>{3kwO~^dWnchv;r<CDOlX zpf~hPb}XwjzTAti>Ae4OGB;}$-hE%=m=RNReb^2qvE+hIOd9!;CqiUj_QnezqN;44 zkdrePMBFV{kTG5r*n~A6O+lt}@8i!lYTV~0n%y>wzN-&PT`<tl8aTGN>zt}@r-Jyj zJ|bxeq*nBuE^WA5>Ss8s4d6%)@JGezz*spT_`kW`S=ESZg>}}?=oWLR4{FfOKv2cg zOnM!0cKuY1|BJQv4r^jv*naISa3Na}Q4z2sMGzH`E}|k*rFRgdS1F-}h$x5%C>=sT z={@w&k{}95?=^&o^n}nuNJ5e`xOA<(_j%vz`_6Tp`A;O7%rJT8ndiRm-|b6M7fMWu zO+vRr*JbTWHxo|M<OXxXPO2LC_k;k`xh!wrXm-(UnX!U)e}R-Qy4k6T71gx#6k+Fr zCk2B|-fnS6PDPbw*T%q}7>33Ljhq#ZmxB*lToQh4>C@?UQ!Ty1*r)%t)Z)(YVrRQs z4EyhC`gt3`82BO~xvZihlS1)-ko5!$CS&V?Pzu%^?glJVrY0wkwch@C)t5&t7nAb? z>w8}r+%1IoK^sXXg^ZkZZ)v^H6@CB5{`~wDjs`JEUQMCR3Z@}_K<Mz~g+4%%byrg1 z&hr+*mX==qP<C<s&zOA5;-PS<WXtk~cErKg|2O(<{U)H#=J5n*h3tZDWE7qqE(q_U zY`43!^ZyIT@-e?(-M<F2VB!9pgg`CN=qgb^-S^fMkU3U>0^j8vJj!O=HZSh_(Hnh$ z_tIH@nM^RN{~1hNmi!7Mll#Yo#iFhrcxY{YUF#**(ORGGh73s~`P}DuAq7piyz&`k z(21{oKyHvy^66@($?4V6?=`nXM0J|`ZYEXXf97;Y8(xia{63pyK#V73)DmJ|R8%xk zX&)nRel&AFs5m>aB=6|DRrFp=*H~%sQ|UpWwMQQ)PpYMS1r`1blKD`Ut_ZPM=-%1| zWj?maOPju=_pzcrs6Eg~ACxhBygTD;CF<K-E~$<A^_<{?^<NvHN~C|w=%$tS^>#Uq zGkWk(G9{<G@#ZJs%qtp0vhEgnupjVeJe2EB&Z3C$(|`2F6rppT)9YuB_5>If?B)jO zC&xvG0SR6qVMG&~&VOWhS;v=r%9PhHzsO-77DxoY6)eY}DCvO>Ss4}`U=JRaA~^?1 zK0~l*ecmsDxQxP}ejF*4H&D2LmaD@{*3yU-=3_T9ez7UTc4Tco1{Hi0c`WvRGwbM% zoqjqlJ0LH_@u^_3gIfsn&~g30)&mPFOU{l-meelTUHLe6R44yioUV`XV`CrV(uQ-s ze<UnAT?4yIHU!aspXwK+N7~<BB*c4kUPpWlT^)T{3EmGRS6pqJ2E~6~t0n7&x$^l6 zvVZXEJ2>6#c5REVnRylIsbk}%8FSz;7fHym*rWaqN3Y{@Hu8?}yt1a<YXP)+J2E+N zPnxs}G)E-;9TL9j*BK;iBQy8R`J15yd^@zD9@CpyS?PA~e!8G9g7%iUmXzN_b@w)~ zas85NW|mQX;^^I6#CC2?Z$l{E;)JbJamAE%i~}fJzdIa1@^a9Jovn%;-({dGlhiam zZY!{sW|#@nGne^WY1C7<2u`3|w#A<!itm#XDs<B+#QFnbqcW$+Pq8stOicP|)1-|I zR4-+&@gwWP-JBmn5(#%IO*^(^zG)lVBos&AxmbD0$yFh{-tWMD*x3WFXS?hULQTBG z+}BPP)C<~n7X+haUD}(|bo9(YgdS7E)sGLV??8!4I)5dTc^!TxlN*%+$xGi}U<iHd z!Msy$4ekHrCrj@FV@H#zJJOb8Nn1xJ6Y7pK7DMf1S_Bd$$fnE52=#DUs1qi`p2cxN zMRs_=OQ+#X9E>%6I94Lgur#{RI&geo{G;7+-EuNC+4q1C>Su)cpxZwYX6s0#3#UQv ze)hSJP5*e)WvzftIa$pk0@YUhk4lA1L)o?^3v#a|=6}}@R*g!n5BF|_6n&Nk{?1n? zOXnjA0mG)2(<oJ5n{5Q#K!qx+zbb0n26)+CiLko|N0}UXDDeX^$SwKYU{kC%WQ|UA z62#b@UyuFvVN~H<23uiaT*nNXr*$)LSf-H=5?Kg;B%|Yw+8*Y60<rh(o-3NSih8`E z8}HwvB;_aaz+j%plu6`DOGCgpVjRixFqVW`|DMm9?2<A{D{Di^VVoyY>=LoBLSBMd z_s^W;T|TF$mN3ks0=mwj<uIiod8hBz$3#47E>`#HgqMBfc3lQ9w?FT)cJyG=tZ=^0 zz_cySQ#%e6lI*of&fl~`1+G@!A@wajd*$fl;%6Rn1TfnZ#s>!TJ%!6J$Yrg&#NaCT za@I!o|H@el#yLtlxD16@OJOb|^cYP__QAq`>k<2!xE8~jo0}1n{+DmeWy-EL4$^1+ zXc$~6)U96C9Yx8t@S8p?Pa4ww3%^u;>x$D^ye>>4R~dK=_#{bkk<L|?^z*5O+-L6* z9<#%3o^^H6#qa3H9l46vD?S`WGp+vgg_OHrV~9)bgCj}Od+A-n*o2A(`Tc|tc3&bO z%zdC&K!$b=JRV4NCv04Qm$%xAEH?j)qOX?@e9^_q48>JwZAI?ge(1bCeP<o7@Z0+! z9?EvD=Lsiy7b9NKWWCQnwO{9Zq&|H|EiQP_6wdhYg4P=30!E0G^nQ3VyV+i8Y;2HR zv1}}?mZxAQtcz#gax8hqQ3Pq!e6S)ADS)cn!s!1@INGP)0{~qkCNH!0;zHY|-;d4^ z!j<w@<VvHn_br>iMV^$rIwc`1o@*muR}ohm_Y~{uB4Ds8-ecAnBsuhX!ryeH$GL=Y zGR3g0M8l?Y#oly)#ECP!hlGNwq2Lmpv?kM{DXU7(c*$jY3j4A~b7d-0yVP^=k63~g zQ6|Qr9-+ij=*~F>L?Ej5$CcmTiH-L8g8ck#R_2?YPhPa|WxkB3+gwEvi;uspm|HE6 zv36gUD9a6Dl|~@+TxHmSphY(_s02R=Zs`?v>Og~M%1)daF<(A?9astfq<#O1^P7m5 za)YfUuXE2~G^FhuPe#^)bIlq~bVztV)(FWm8GWZ4A%DxPfBeF*Pnw6K>%~Fh?@_n* zK!51Hvm-Z-8Mw2Sx8ub>v!%*ycHIitU2h`+<g%DqV1)fAeC`<$3urQDq2^{s`?@nU z<I+6D|1Ei5alkeG&Am-dJbRUspKPAYZ=vgrtaK`U_E0B&Jj=<=MXF5(u6@}+=$P<# z#0~jU21*ZBZf`{@j+SH@l2s_VqI*NL-^g}Gd|`2=sK5rS4f0Wk!IU(NXBMC_J^!Y3 zHM*h;{!{7lL%Myx-TGVWqJ$A|-txj1Ct3?w9rm&bF%GOaQ1UCbj-Ngz%GCfn6d<AC zTJ6|yb<(D)&`oJ@hVF!abSw|<;6G)Io4Ocmp@{*28XvdsdV0QWsSi#aR`7VdY0xD7 z)N(yQ3s7o`)3vp<`i3fRc}E~MfW^Clj}uVYszs5W!r^v4UZ>^Zuf>5SZ7~vsYXeoS zEHR~8nq|*Cd7nAW$M=*<+-LxoB;=`}8V@A!I~Ztr+!a)@9V-}C^^p*m)S9IGby<8- z(`5r4k-REkRH5z5XPM6SHd5d0y+Dk9^hixq!}~NVX<4WAOXal9Sk0I}-C=1~XU_B& z940^Os&xNP<p>BK-sfQ3=OKN0>)7%16+^Gl*?PCt1l>>6Z9pJ0ZwC-c@*h#s3&K{; z7Q^J2Yu|6*AW8W;dV&w?J^(jFAL<~c@4E-Y?`k{F8Wpp=jzU`hzI<K?bM58k=lYC@ zf0`eMjYiA@f9H;OtuJqRK3pJoKy7;WVTSUZfaw9_K5!CkAKbE0>b}FSZgKYSmFwC= zkF@u_=xmRJSDb~@E<A~FI>^;gX?H0yb>fD>zA|3ExuoH1wnvND^P3&5OtM4%USU#u zae)s|nbt<~z4A5m4Vcu2w@>I?JNaaY`n~;$l2U0g8JAO*ON9<su5<ZWaas&}A1iPz z2}#-J()sFW)ggFIyL7PWWIEo^OY5zLT&V{jGX2_`hQs$F_-4Se_SjH<{ac;6xq!)6 zhr$!e%5E#>lxKaBsr(^&2=sL?3+Yr`r0r-?Do5Z+zNfaCdRDe@x~MATAARPp_xk<L z`}UO)+`O6ps0F|eoPp#2w+%Sozv7}le+c~kU&(it7e!P2km-C`0lM3&ICdu*S>I37 z^koHpO9ZaCZR_jSP1#()N`D^^77_7Y`1#_d>UV$$WL7y<Lq=W}_-7}EfBc&~vd1y~ zKZ8n}s%Kgeb+`U`kJ8%!1)vtxNYVBEt)>C*lo0k`pB^~40jGf`fHrmYNSE0u3HD^% zZM5wBVavn&%r5F*8L)(Or39>ab6a$8*DvVW_H>*77L%IXYJbrjptaLsJl?BFGJY>^ zPp8x^qz^VXzm$)0PDuEuoo9XBVG>vP)OYDY<%yH{w>ht$Q%ozji#+J-+|l)30|&`T zwO-Dd@Wx_+jAVT#j(%6HuG7P|eukmLOEoG`*cHua44ix&pj;&U6ihR%lwp)Clt#+z z)@eyBdU5zIQxXIi2!&f4Y4RD@`aB<@w?vl;-1$Zqu1>xllSm+|p-sPcDKg#+@jRc0 zn;5)oR-Q-0RV|ZayO^cC3QJmwm;JFZ5eAkY()}J&e{kd&Vr^?{8Wjzx5}N{}fo=(M zQguhg9*KqJux{G#wvS?MM+-*zX%(`F`CZE9$~liEu2ZM#0a`AweK&c?!G?*Ci_1a= zlIt_}nMsH?esXZR$uGZJYraZbgY+c@FDO%AR30h4<BL}W&l{5L!-YxZ&0m3UrN+km zWKInI2SnRBrD0Jf)(c15dhW}Y)Vn3T@@J_i_p|iFJ<rxr%G7aB$L~r@2KL8Gx%dhQ zUj|lFSm^ZJ^cf(Bzo}j)tVJFAvUU2GdTDm-@->&xwwZF=ydNMmZT*N8t5<to-Y7w2 z;{%Lm6?&@@KTPyIYc1PCVKT`xqP2(817_h{?aUQTG?NR==ud*(f8D^>m#6p~T6v=M zeBjn*#spl88*2@DTl#8?Y)Mf8Q^_#|!!GZ|Mdm=0qI`*$FnpZkCvOaHN!z^cPt~fz z2zPXjQh3G;<J$P+f;TPGmf|dvP|Ki)Kfp;_4Ze3aYbCw)9&yw`EKm-3N+iw$Kbbnw zwVMR7O0;z6_{9qQ&ZhLT`Bd>I-r}dcZb*{B_3PJ{+7ub(G<H$Vh*UgTSPY@ZE+2|- zj6d#dcD0&qM=b$rm^1RJGa-4S9z_{e+4}Z&b7{r54qP?!_Bla?k)=R?5tmlBF^kw* zQk2R0ZX>+@>6`_9nuFA9kNSk8WuXmmX$@-u>t>I%%-?VD2P97^iXt+E($7~q%|G{{ zHmp9z1%63E6JR}%=Oo#kk6Zf}#53FSatw5P^EhLVr%P-?5LSu3W;S0^etjtoBYr_K zKiqS3D+RR9tpPQ$rFMY~JqwHUy=Bu$uU^NePd}R<J+uD*Cm!?Gsi519AKRxz+0&nA zVcWYXye@3{p9&xOE7<c0XLCgb%$6&NzU#!vEQ?Gv6{YrEsMeoL%@l7Na*SR|qYV#> zEPRxqLG=^t+0FwIIBjTvX09Om&wswX+2`UEB`whDw9;T(k5=R4Z)Cp1!PRE`$W_o> z?U$qXEh85T#@mL-zKU;HI^(cUwl7pOo00WmZA0Y^>J?#0Z}2z)RAIWx<O9NTe_)Yf zrWWK{@093OYDZ_lvT2ONcXfv^V~gc8T0U+%uN9a~g?yU2Y2Y$kWjOBiS20>LV<V3I zjgaoU?58$KH=*sej%qoseYg#Om3NIh#Vc^SE{~LSDP|E`&^nEl*5YTja4Z_~HLCeG z?7w90r_qUnj`kTc&6y}SLqq|^SK*UoZD&`hNd8Pr?pF3@i)8HreWH@O%O7MOgC$#3 zk0j!!8{D4bn}=||d?`AsqmqdWImHL<W$h^omsHyvMl6Fp4MHIb=#@suiY_~K@*rP{ z0!574i2xgAT#rS0S?igz5(SCtlR?m6hVmSh!ZE)TBHI-_GK`63EPRbe)y#@kO1A}* z<8V5g%kp@7OJIUK{(AjJRoD^qC;LK(5|OqVo1jzU$&khK1OzGbVxJg%8etMFkW#@G z?hZazirsey9of5yI=%-F&(|v2cI+lfZ8a|=hPS061@Y36T{Z+Q#b?-poCvrYWLgA! zttP#$8@wT2fahCcqO|G>#GcV7o5j+u6Kxr}GGjbBp@BK{)x;Imvx>|V?rikU-dB#k zPlPzI7wE0@fxzMwBGz_<!RX#y+Gyc-0#lOdyQE*EtO<V=k|bGx2FxQVF^orehSU<R z$MAVM*w}mtGxgqrS}q7(eGEw|?1<}_18q`#`OPp>GChJ`!ItX2mDq?^^#PM+w~(sj z0>Jm0OpmQQra+VTeR@%s1MS#Dyp;QH#e;C3%DKd%r3%?9-m0i{2py9~3Y4$>>FgIF zpbjJFN+ZHoZqshL&Q2K_pLHa3?{tS>LD!wn2yRa6++1lsgyg@4wq-zrR)CuwM8Z|L z#@rJV)IQX0sBW%>S_+yvZy@Rm^^Cw8sw2@3(d(VLQ+YbBNl%SezG1R^4b|p{wleFa zt8=MY?wlb1y3x;QtO%W3H+)rU&e>9V-YDaS>ugLHDG482-LW>x)`jBS5Hqy=fU@nF z(bARUxABSF;HzktNb!3o2HoB`v$^0LlrevrUy4RxZ^%HbQEe<i3nOWYkSW+fQTd|L zdq2k#4`LR}YmKjApq(Wxh!fKWCh_%Pg@cb~+eE6w4K5u$g#^hhhqBF&ygMD~Kw!h< zHrjnw|C;twG4)vYL~e}No_Y(of+FNPR?q2Jegt&NH~+JI8!yw&IwH9Za`S99=r9>_ zxFTQ#1Th@P7P>5n2AYL=Il5V!$8}%$7dr9kFsE<IdU&@_nibMkyzP>D^WHo(4(Y+s zIjA`-ZiYQtmrR01i}NgkG}29jgeZGALldE`7Y$CCEW5$rr8thU&%rUU`0twas_F8G z#bdr11Z;tFH@Z08@|wqinRQq7^~M<xc!&F#Lq6r8AldiHO079laN3WPOevpWW=yR3 z8mM^_zR*Z{=!L{cu6J*F34AdtqCs~v=)>eY!dL6-9ud)Az`s5wq^+fzCLS+I-6#v# zzes__EG@W$Myn?&7V<7v1d=yorDTzzv#$;zCX2}_HoQ9};iRX+cURJ(>U5+#vu((j zH!{1$ELvu5v6KVsLKmN~`2h{=KA3=)bnRj*&Dp5Fb)h7g#OJqj5W{neX~VBi5SuI_ z8`H*T(xKI24O4GP<GnjvkNQ8nk;*gT1$n+SJtcjZx+4~>=L*1XDC}y{1!QIZ3j3Kf z!gnRvr60|}K-e)v*$|dW!8NF%*V-*d7U+UvuOhcQ87$rzuzg-}E23h<aEzMohq~9` zR-&katLMFoy2iX5YRu{()_tZvR!K#56y6&MaxW!q_=J86VNKT#EUfJ+FS+bmoGGQT zgUt=ubxWwiS$JjPg3v=GCEsQ6=J?cz`UoSq#*8XqUw!?`Re@quvW)aov~<rH$|Arx zfT}VOsVIR-4yQ2b$GxVYQID)kA;PRSO;wkiX<t3Z-Ges~h~aNyF9p+l8zOXjbI*S6 z48qa8VsY_g-ubk2@rCUwX_c6QFEkD8pUE=xGrq(372`ZKBj(&Qpap2z6RUx&!C77L zIR*THxIN@!?QcYqv_ffBqa&Y>5;X%=U7)9m7{LVlE1Sbd3>tO@Al{uV!F;uC0dbTl zxk~f5_K$J_hAcU`0<oHryNjy+GW+Vz;8nhg36vvR(HXd!7wpUf=Z*LSGPVK*-E7dV z9UVf-vQL_>b3~2~&FvpNb)+jJ#n`oH{xnDY9b(Hwo;hPhJox*;+~QS`!7txm>3zUZ z^x;m`myL~ziyuzH70i{lt63xz6i`tGmf=`ekrX$C-2;I@lObst_#3&7BBx<(=2P2h zGP7K_;>WZO00Sr@J|M(P6gD60dvF_qH+su=j!n;a4>A1ziSvskbQF{nPbfts9~~jY zjlNZjO^)s0L()Ez3oGZIB752L8#js>+s^IEHH|97C=R^BCU~oEwQz=`m4pf9q)zff z^urmmsttkQ-UdEB4BQkecDa^vkS*xiXw`SAEdcMk)VIn^P@v$jOM8<(#u~qbN2|Hi zXO>`k7B%6Xa1bdKwW(#-up?>NzrYV3cRM)M%rd-;6KPHgF<t4;gY=wRbr!=z811+_ zv}H;nUtkM$Adf>oX`-lwOD{jKrl}yy@E%pIvKxN+oHJQbbWv8=;MwJVSGL`ez3*V3 zT}Qyjg(5fOXo4bh8UX_%XZR!_c%-uulqCpsen=?Bp3f&sRyMK7a!10enEN7iI|6>E zjY4CpL6~ViK~e>?$_a#*%%q}Y8<8vJG3(_!3e1Nv+%ehD-+Z}>qy^Xb$;h^?Z;^Je zX6x!)wgXoqi}90LgLru-yvUSj3}FyLud*n6>!($!u)Tg#(c3V6id<91V5mWIv>=!O zIOQtV(BNZ3N&PZim_DAVpU#H`Tc#uHOI*+sB_LaK7Tm5SwHLBQrlu8a;#Q(yP)bw= z&7tE^a%44i@YS~ObW{~G%}mmuug~mmkzy=r4U&!9<-V1|RA8iTl6n&#k?&MK=kAi& z*x}S^FkX$z!@71s8thAkWM@t-aZ<Jm3CmLGIp1($zj>O@<|x*+d&|*_Kh;kYBb0&Z zZaJ-{>9=&Iz}3yhvsvC(E#o<-S#jx>qU<G~UFZ;1V@az^GLfSZcP{T%!w2bbE%|3A z16tXfIM0~DbMD1vLb|i^ww-}pSFp6o+yW?N@$J^!$=4foY)cjdAj-sapHEY;?<x6` zHj~#~uHY)qp$=mh3ZS3Ev{GcsR)n;Ap*}V~3+WgE4RG-KVS9i^Err%~7I0A2N|uRs zx38hR6!fE6JVP-{kUcWvKP05?7a_-3ueq60stVK^?sVa-t9vy3qom74b@R5Z2mgh3 z>G%=Hx<C$(fzBW@t`KZZ5@kujgcKWbNLI?luCe_^MCc54R0X?vOHuM^G}aUCm=rNe z5a`H`F``KjGJ>C#$Q2*T6@wDGJ(I@g5xSQzn!gKI$3D<7-WxH|(yh8H;#1Bml@dK7 zf6d`NS}rJEh)PR4N5nQ50%p{J>DS!LuU<Q+v;oAhcVht)Hq5L*^;}E|qOi`!m2E4- z;F^=q>AsJsPj0-ELe|92;i=|(4M~y6Iw-wp74SAlgR#`dbQy=<k^%rH&1-%1r##{i zy4d_m#x&q0f0UJv&KKPafg=F7;AUWt&)?jFr`xb(v$DcDec`UM*K<mwm>!{%5kfB8 z^0$-6w3v2s9TIya=H_Okr%KjXYFqrAMV`n}vdR8dtlgE|LqqBBlTVy;7{4jrk_7c| z!|aALXu&J*84FBj4RmRUG6!Kg4O&J05sSLL<3sn-8J$4{H|lX<l)|`49FUupE9?xz zjDY*}7#Ut|9GDqOl?FZ=j#!U*9H6Zy79`d3uLB>r<dGNJmXK5u3oOoWx_=OFBK59` zK%F;aCPj;xxXxY0lC|rMWjifcmwFky8Qzl}^<|Byd_`Ki*ZcH_jri02%$>GKVm3Q+ zyZ8uWC!Qf$6GilqXOsw%=;i}Og=EFz7*r?z3rzw{D^j)PrKAU-_$oq+)0@eQqc-lG zxZ@34_p7POfvxM`RY*BZ1`n0sqYInh^G0idrftD=cg7R&`X`~_{O?(cRR@FS=SyQS zogzu)$3$O|v>=Qae8lSJO9p+F&nxb}T>a{2?+@er1TlVae_H4D085hOMY_EvfsB%Y zs{|(-*$=3B;reiLbCZ#ch-^)i-_w=jhm+JXzM)J5jz4jfdfg;|3b@)`-hs(d=C5nh zw2nw;mdXg65bl#fxG!c9rG~%(JC~sMVK`9ahUcobQhJJ~d%4Wfu|#;3I)MP-R~Mbd z2<7nZMR)9+X?@Fb??h6{##DKOuY&A1raP-S4$5T294@NnLAd{URZ~%zq##B=Ur@9w zpxz(c2|k7W5Y!t4-C~tGxRBz%<h3yB3uWT9a?oXA<{pZ9Hdh3;z<nB;H(Wmw&G0K^ z$c#c!b*fLWRkVa4&UwIP^Q%_ZyMp^gYRoE&IL5AJ4*GGe%I<4u+k!ZY_EMK!3rklN z5w19|4xSHR1vf~8Hm|LMU2Ha5N_^E;5dnrbH0aL;$naDfI=`0mrf&+VFwMBF#4bfP z=yRl4&S|!$A$w1lNpQD@WO>+?Ma{DvPdkQYEbBs60=wsINV^#tVktO=@}_+&=gNYi zhB*UjI!&%s<rJ4_(aa3dcemW#ZoMD}Jb~1a{0Bjtwq}WEYK1{+H(lk|ZwPfiXSP5d zr3QoIwr#KQbR~PKJ~E>m^-AL@HLOG*EdP2!H_TE!V1x;)o6>BsrM$1RsAzw@y(lrN zY0bM^P`9$IEa}?d355v!TG~uH3p8aI?I(@(9aG%-%uyQoiT7`W`S4#{|NpmFCCVr; zp0HW>S$(q|V3?Ps?=j3**Zwz#xi(?r&v$eBWXn%Ti!1Xw%SBy?utrH}x5G{v^4g_^ zXrF6++Ih+)p)$~_)vBPnjg)P|T5`<FjpL?kDb1#suK2lAP}d2shh^p%-uFMu?peRh z8$<hBzimr{N|=TH!Vq*D+29mOlbr#d!IwtQsxf;}-X@lq_czYdo57l%54Y-Ud9~Q; zjnXMoF}7`o-Rm?s1VHP%SbNetIt{V-CCUfC&Ao(mtY3?!eUsPhvjkS>_&G!C#JRUP zaOTfL@rV+&)3tub!Qk0=#)X1gG4>W-2Sx%g8muAHI^e1%K{7W=7I~rI5{w*tqpeQV z;2t$xZ>C=HMB?U&bz=Q$=yq4?tkieh{0H9{3B89uo+To?>A^6mEf}0G#vbeozH0$* zeA)sXX?W*Tw!0|EUZS>DCYPs@?uBonMQ<rzXbi9$(R{Xc>f}<N0nvq%xoiD4^8EbE z0tEbOLVHJS7~k^+DZjg`)tow0eY!Yskd3y1;)soy4EHB;Y2d)Ir_)FxG1m>t5ja&k zIfm&o^#?x*h3x8sH#is;^0>$PNd=SHX{KF_Nv(8KoSQ-ee+5xsz%u8L4YZT!%du|< z$jj%GcfPhBsA*|HNNG6V6nxZZKJ{w$6*uI3bqYahZbco_Fbck}IK7?tUL-Nur}rvr zxWT`6vI7Yb{@Zyg@5(`9o<`<N?tk2Fh#QV#*je0^@^Jp+ZPKJ7q1fUeV-YucU^BvL zqgWuypYN3hRyuOTe?$bastZ8f&aYcMV<Q*~i+|Y}XDjF&QuSOt&6C_590MI%gFA*@ zxkE|gIVWYC-kr^!64=fU_O*H0S_r*gF0jPZ-FXw}9MCVPSc6ekYPDU$t3DYmFIaH% z&AHs4efhooyl+WhXMMYfnwzD#Rx)V4Wj4%x!gj-)#;3~%3VvCKgqe`Pn|L+1+gCFh z>lY8byPwCe)(`3yS0vV;WpyTXV>^Fyf6f7x_*h`#JTMSz0hZ7>xv$~bgZ}Kh4-7<D zBqZGFWhxK!!%HAI-*c1jiv)g;tj$!mT%O`PzZv(~m{)c%w_3OobUW=Sc%c+={kSe_ zW!cSdI)WAKwzf(dSM;c-kY^{0w4@SC*@fSKkCu0PbuI5vhWomE8UucgJSo><EY<Oa zJVYBleBJazq`U%hbwMFBq(_-bh_=*O5Lg)v)II#c26?z~yFOi=dkeB<EA?homr?H~ zBWj>mqza_)BUtHgB`&uB%R@MCZsYzNaNf@m_!NP-@UM?nqoG&>k4+fWyRgEgu5CpD z!*;@Sf4`5qe6i_mvJc&!P`kX;;AvT-0gxa3u1LRn_7!4tPsz7`t~m6lqQ>)g4|h#! zDTx{ZE`FMA8GhsOgXYvlv0SZZZyG3);KfT^PLv_BVt8n{WW*ch7Q4V1fqp_Rdu=5T z_MDbTEiIIl_9!_Rt7&zks}4)(GFO~Z&&OOYPyDXolW_x*LzL3r#c(`Eu3AEauWOtb z547e$yczb@KGMYq{-UAT7n9Abd4E;<^F~dzIB8YP7!p*zL|<V`*Er#*0}|S59F%7W z<XzrG`?zUvIe-KR4c&5ddHX-!_NIfvK9q&2@4yAa+RG-7)2@4^WXm9?XrnJN2mu(5 zU;e7RjUq>OIA1JP@hZI~yc@NuI!Fr{pQ__F){47r(IJvztEPxePO}0=>0<`GL01L) zHw?(x8LFJ`wC1ck1}fTuQVLNeg3=+)^&=t%8%mjiUVI>EMXuf%K~){bb*Ivz-dglJ z_e$oDgnjyjc2|jc<ITk?CSPNVnecY(@+105@yVMvAknVx&3@HSHO&F+*VsKnh40kT zp`haXuQ`I(LJ7IMK?{}@B|g@jD=67+f~nyLpvFK$UERgztajYb1{a<671_*BD7ysH zkfgP$BL_;(s;|_X7cKO-e1c==es_>xTvA90<g5Z<p@**umgqFGKN{k{R?R?~^|uJ} zHk_(p-D@&n7V=5(e_7d`znHr=B6-WUuEh?xsQdR^asj4-1;k<P(f!6^i>6;3s-%2N z*t0%}IQ3kQ^>7=htIw!e2xm+8n>Z#J82Omw=sUTkCkMz4WTdcE%dDxIo9YJMH*X8W zqzhAbf#vyCBlB*k?Z~R!?lebH-lpL&Zy?cIAV{i?^|<@B)U}7}`g5l&-+ET%VgT6g zIe({N_P6%37iKP+mCEcmdJo=zXOF7M_TtWN;19a<^xNAgzMXIT>5dBmL+g<ocpHw% zYSb~$v|F8}(0DJyW(80!dYGSizu#zx*sOI@Q#=v8-S{bCbZ^Y;H-uONW2R{6>|Jn< zzb3r}63<Yp+xp<EN=A9P29VuITWh&n2?E8k#ZR|41EK8Q@4uJ6vcV8%mSK<oxGkX3 z{&}l=H)d5vX{KSyhLjVZ-j=3Z=vA3p)f;M<(@T%sdTrd^ait=I#cqxx{;@g#t-);> zDU;sET^{ygwfh%~G_Kk@E<M^C+-CfJuNXG^et=eDOg}#mXW~ZYz8!v(Tbpqu=~uwU zL;C&4_h0c!pHtl$*B@d%JFkPZ*dpRcVYRls>GJEg?tz$7@MZJEnMFl!A7){aMZbnh zC#oaV5>Mwxcg45?jU*ATNPu1><DR=9)vM|84(1saqaD(L-?*~+RG-V3bf$l|K%5X+ zY*hC>t)MN*o+)J<Aq9miT#Xdk-Q5JGq$x5Ro1t6*nfZd93$O|~W{}@teaA8QHt!i7 zORqZ5?kT{^%~s`h?%^fl%V{2NvYnb9A{qpqg%T7JOkHc!1$YI<;0@Ci40S2@38|}2 z7`|DL@}K9ySJbC6>F|6SKlfHV@A=vXt2DpY!Q&QfT>f7K7ZAiJ6DRXng50zYz?WXH zPTV3ai(@Qg_^?mP=yda)0!%nHQVXx$anlT{AT?cFFR2%%LQaGeGOc~hLVVtDO6Dbn zEIJo0;mi<?j9SLDpw|{+vLFKvO1jdpsq92)kuydT;Aza#BS%mbsAY5=@=z`;0$&cl zynJc6sx&<MvLaaH)0&zITZ-VW303M<<(x#NqO+wP8?u7ti(>D};3#ieE{bT7idsR- zeLs|)K?&JXu^(aKLch-yj`aIZz4)?HOkRv0BT$kWzXE=Q*GS5?0=yg<x~y%9o&jCv z>uei%wE@nNTMNWkMSU?gH{;UO3Qd1aR$cehh5jLqoRu?6Qr$9;o!YG`o*TjW>eN@a z2s;J3QwFawUk+zmGrViDFtB(__fuu90}Ud>Yx^B-KZzimsSgC!zv4^2Us~eZFy8VM zdEPx_-Z3TqXHnZxf=Nxlw@1VN$~76Y<x`hNu)2ReT)q(ggOyFS_yRAV|Lk$_3=i&+ z^mS3u34%O%(reweR{=VGx7YCf|7g3b71hR0f?PW9`q=G(Kv=(V=?xWSm*2}7L7xs^ zxSjaKa;%^`JgtjOD>x-~CTuFz&4=$1toD8JtOxvM){KloUnUreH1Qi2?4M?QtOqI) zY_5dA0~O{h%(kw~`nDYAg)E1I)-D1k$TF}e;+@~omEqoTFYcM2&tu>fwWB@%+8^jP zN;?sF*w4DfJiRD}>R!oRf>1%5f$}(q{6w?S<w+$;adDIEUtw%javy1vTI1{T@^c0~ zU=Dr!etVEwj2y{E;5(=dMkTrW@~z9$wFI)1rOAec{&5zf6+a#qg+kRx7XnYe0#>4Q zwPZRa*SjG>CY|-FWci)_3#a42i<;xlM~_~h6Z_sVC=}9+(d6`1<!36zFu$$4l)&XH zNkiQaoG38MVM`{$Qpf%(GQsSsV&y3NBPeuW=@q`<W(+H>hFP&iIqWD?KtAT4ik>R| zUJS-!FY+2mX?FCei>X2ISCx!Z*?0?r3HnRMQp(c|*X=5g9EvdcoGvNz2IbNMdTMgH zF#=c$>5Yko_=G#&NSdlYZeaaIDtV4yRW~u?2I4GDMrw52aQO-WyMD~~>SuQpZYV=G z<GSJv*8$Jf1`V2z9U`7sF{vlA{?!lCz8xd3tCj3k>1!`Krj@Nau_K{tkf=X+Bo{XB zv+_82H~DQ%81mcKl6ezwOv3tFm~;)lOy}<lik+3MHmK1S^s(L*k}j(MF#zz$Z}-vs z=kWPLHA&b1=`(p<e8#fwfXa5Ads~3M0j}s%&Eq)}`Nw0Ok{@uHHDR7}6uFM;+eLMA zkC#>%7w69D*_Uat=O_s7F)=GAqPwM;wU7e2jbxOoR7Di>nw(dFs+RG7gz3r?!m8fV z!m4@zygw-`gA7rJWjqSNZZl}448E@CxGJqGl~wvT*viJ6L{1iN=ClpfzCkJ+>WvFm z$ld0^CVGfS5oV&$`Icf;2fo3VFnRVPNDXE-Ef+yX=^VCRUx#jb=TmH`Ib(O2#+x?u z@k?Sdu9A61u<QH-y(LGRCyP0PvL6%MZ8u5;NXf(U%ycvQfIDxW7%t;>*-kfNN!hMJ z(Ip7p(6qi|$nS+{Fh{SY$oLqbg&)+}wI}GYjMQWZjnaxm*Dd`Gm}}LpTfA1$%;R3W z>CFd_QZ2Q_=Yfp@-#=H^1QB2l=F<m0D$+cb!OJc?<&16CJTlknLH>T`&hSN~>{9Z| zm}z!Xo<i<C3-++_)_Ut>@N%i?Y~374K5f#poeK{dEMpcy+c&m!2hh@$HDA;JwJq>0 z!)RvHcei-UbV=s4ziKMTJ%7ZM%Ilj-1u0CpfuUQ_+}%+mGNX0LYv2{_E~AO1+db#o zwDcSZ?tVqwI|Y0NkssLA!;Gx^il{_)PLJCzMPwwWoCN+x&OJm&n!i=g^iy4qc9?An z`XhN&V$L&$Cfz#JujCb@?&BlxO`h1W=L}@qDG+p*RsI}5M;};F$2=-VoZVdLfY+G| z?-uz-U!ICYEd;Nn;uzhpYBqRsfi)9v#b^B)%qESO;sP6it4W2i48;iYLh6i`P~5xD zo645ErC`BtaW)e<bruTc<Megw6ka-@p@5s>+uW}bI}5{Oj39rcZYm<bi$wYhj%0-u z;EXP|l-SYuyt>GCeI+leiK{7u?g^|~?_<cE$ZzWI9jTM2PNC*{Y<Tv9C0txw<3J8p z<T73D5(wx4R0bDTwtANx7*=-0k9(?zyR7ZiO`csY<$Sl;_>c$VEn@qsQS~6FkI=}= zR(i=<P*SS|yF+HF(OdN*#3wcT$(9iXr~2?AgQa6PT?H=tJ&QSZLITZY_C&)gC+O(R z2EuJeU&XlLC78xVaK0cnT%s&*kJU0PI_nctQ!v2hrlMX)_QsEidMB*6S>D0-sB%nN zX6B(%ZoGOy7>QxNWVkTRLDpTP=-Z`Avd%3}qsDP7ph)+I@5c^)gw8%cctluhmmh5R zY@A}XP9rHodP-JzsI7dJQSzH%7RmHP1)7v%nPLmpEV~CsdBYctq@2Y_K5fWD`FEUy z3^>0(tWO=VkDU2(;(j-%+%;1yZ0ntv78!eD*aiZ-ee%J0+g4IWV_Q`pu%JyAIO)yp z?iv$}TIX~Ee|wwW0C*xv?T~&*%|%02H*ncwB-)~Q*Y9JC%S<a)-cA<dg&T(dc{S$` zuAsY+odR;f<)^;e(r4F+T~nhOmcL|sNfBK0mD13=ofqh_JZ90TQ~gK99{5bV0;}Xn zy~l)>UKT(VC4A!guKrTa)8lQ6Ie7alN9Lt5X9*Lu?$u#_kX-Qz#4haS?Y7gj-Bjs8 z(=Mc=IdARU4j|G8xm*h~qG=k5k;JhD%&inU)w|!Mr3LR=B4;^>h=J&X1;aXPPopPy zd8oahn-R8o#6a#88a5;N8|!Hk_uJ@`;)7Zm&nHEYn3Ad_b#ug(!?2RYttM3U3WG?P ze>lj%>Y9POcXI{piaK|D)4UQ}QeLjm*QomzCVUoleSZ)JEbmlCBL^%^>4Q)ly*d6F zgPSb9X{zYVTf}80G0bf7VG*Jyu{lES-Bzd(E5Zfj_2@2(eKL~_N^)hT1?+x^QvRb6 zC)Wz;#c$0B3}ir$WQ=_p=uNg`Ht_eE#KsqV$%o3F5LPQ<C_s~gP6?~2HB%$z)_;(5 zMmAT%5Ao^`uvjN)xnN!q(}SCfXRf~fnj*%ckUC^A>6$s;TWGIgT2ChO^dbxIQ{f{} zx*ZI5>~lFYSa&r7)|L#GA#2#93npwI+WH?4Zk<entb$jn?N!UsdPF4ICbzK*qFbF% z)ujq=n4jEuv)Z;Z>bSJ22vV#KzG_JgHA389S#PQFpO@A(m^Yrr&Yr$r1W(?62C8X0 z_oV^5V6>&8Lq@CSrnoMV+EB|qCFNlQ2Sk&aoA3Glg(EWSTvXbh)Gi(MPDAiy`ly3_ z=M|tMwAjf7)K3Zbz9a*Y(eP|;F&chmSad}5x}Xd5Xmvu`zy4}LGhlaL&|5enadR%3 zgMY6~X*fO2DrM-~*T!ZbGj$t51OO)>B(?g1yd%1<wwxQt9{4;ifo!;f=|T64Kp)%K z7EK0uO#H>O;mjH4$ifMLZlbtbo@kiqW_7Iwl_F|{kt;$o3Fy7&QeY)W9uoA}GGOZg za&3ag8PhT0rV8<2c9%NRdR-0hVG{&ML&A1EU#8}(-}HcKmRsYB!2`iww;MzkGgMH8 zT2OHCLd)pLft_t>RPLMrx=0M{GebdAv4Zq%etIN>(VkR&f+N~AuI{lxbHFkbcheRY zpJrtoV1_2M0NNUwQk>W=Efd0LZz>$pR2U8zKB^cZJR!xMMl685-T^TzU1{jdlefd< zrTeMFkeq~A&YG=nzFS81fgJ>9DG+~A$AJhU2HX9H79$Ae5`<7G5bV&>U$GcY4OgVg z`lK86NfQEYs9BTj5OFPs>Eq>)t^m)MbM6A_=3}E(34h+s@Vpb<*>f8w>z1?v&Rd?k z0w}^Vq&J-JHQrJ%M;TDcN}z%J#V~z$K-1=WCns^eT47E^tNmn98~Tx@WYTP;!Ro#+ zB+>_)Lex@B4S4gyTY>4i^t{NWdz&Uag3fWLWY)bxuf5uOSC=E}v!ZU$#9XrPBHM$c z_fKD>Lj?r_v%`VgSP)Jw3<KCHM4ol@)ElYujxE?T0&4K9TQfR=8{kEs&A{9=;)0S3 z*!d>nZBkdY%u~FCzURvv-^bLr)dtcj%m{X+bN-IxWdS4gPo}POj^qzc?lv{dsmAeM z8#_~}YZ)4O-O^G}u)@=h^G?_UHVY0tlry@?kk}tnX-|wTUag|fgXfva8<K6CIy&Y? zJ~mhO1yOLLWV2XtLMqL!88t~aQe~NcZfkk49VoV0g(_Y_S>czi6#a>vsf0h*t;xX5 zdo|IHk<+ai&aO0g<$QWY_it9qcTa#^v~M*2E8j_(XnK(>i`f}#`D@wu@q?ou$1pU( zsh3AysDBO6{`PS7($>cp!t8+EcW?6me*|9l&sIkGKe$-`>%Uiir4#nm;{P&w>9mzY zeD++c?-&32@=60ehrq`P04lpz&i&j`ZDRkwQ&axO9;z44BT%>;Tq+9=_#^+`%rt-9 zw|`3NrMe5f8NLfI)Zk@heXze&_R*UG|K-B{FM0~VZ29}`_FTOGbv*x@X?NegyDtHR zW`kGLNEdGS*MaQYcb*H_-3x-g=7)~Q8*@I2zwDI29vUJJ9X?-jm0exk!P>g1%l66O z3yQ{O!$D)ZzLkBUtWVH0ZLmtX#DJw%>_0Es<HI;k1`tZ9ec=k(F+iz|V;)cm{>7Z9 zi7OAloi%*0@;uxQcOAX!p*M5pa>FvlGSkd=D$X*O4d_byy^UQ5%$(CvQd50Ja8#=2 z9=HKpy$|pc7v^g}PuJojZ)&FT%4fZPBf+ijV5eihob&sY`<hlRC_OzYhTMwfgX}(+ zr!Hpk<nGC9D<<DwA#%+>&(LMe9xiN*M#g@j%kV7^eLm;AUo^w(i<9eG=PF$HW6aiX z*YCc4%L*q>dZfhX197GePqpE`Tltz7M@B<T4)5l4bQkFm{uLqk&wfeszhf@7K*W&* z01dU^jT>)!V6tr<#~MBZm5cH)r)#7Xj^o`i+xeSgX$CO&%CALV=$GvH`2_!pM}W|( zv;P-l63uYx|41eg?ByoBQY>^Bx)eit{?v>y0>oC1{B)a_2#ubMlFrriQeT*am)c3Q z43FcA3*~h8^}o*zn;7!CsX;L>#=Av<^g8TEEsF*cyoIJJ0;(k_`UYwCHNFqNn50U7 z`pgjT&T-AQNZ@tR`S|Ja16F0R`(M;jrN#3Z<xxc0zq?)@ISBMfR>mojcx9nw8rAhG zvU+C}^Skfg#$rB}e(gE_!#4KWV9jDjfq`0J)^^H_x7dEK_s3tK>b*90D?chJB#?eT zcNo)`mp}zo4;dCVVe5Q?^HgNKy%Bi+(WDcDQvvFMn-92T<nt3z?ZxtHJsFCtJ^M{> zK@1!IawqTG_d;*){@ROAi>{V%wi3$D4-#@+?6+D_vPFo!{@;9Ju5X-vQ$Ap6|B8A@ z#BI)=>csWKxAoA*Iz>~T6sq~I`Mm7;|6mg{R|N|iebGKdJ5X2=$2l3`C1iG3e?RFk z&8POOu`d!palFfilU_U~&c3R4m9INo$acG+-`q>1I=V`#)6&=l!D$b^mEvCPD#TNN zd&oRaTj5DbX>0JPaqow{c9xFf`gEkoQ(oV7gXL+Xm%JNEvOwj?_WaQpE&rTgpF^Qe za8=#N^mD^oEZwA;%K~4wong3;k^MdfvPJv3vryx3YgtN5RwKPyuvFsrrR;I#Bg^aC zz}V||BD0-a)NJoNSjcVR_c?tkfG{Cg4<;)4=(!3=SUs8X0h&{TI{>^vqmb-mR!^7? zt$XF$ZhnAFjO#`sRg+h5)uE`PJ4R)X3$v2one{Vv)uDU8@*q3@&XQ;h`Q!ID06Jr6 z<Pz<*I}k1kb=`(8{|W~gR3t1uTFXB+n=-yuOd;|`wP>{#?OvjvRnRV@m=b>S3OkE! zkHXvxKf3qOy{~`k|J)NSVK_G)vfDTGej-3qsAzS-ejxPTYsaJV2Bu|&qWP%w>Zuc+ zg)#XE;tRIoeaM1_Q@Xy+$mf3ggRVWF1|ADVI4$X+Wuns~GGe6A52LPgnJg_1CO34I zYhA|%Kj=L-I5zuZf)d!NhZ`?=G3-#C9g%Ctp1VlRst?rTHMlgX$?=Dvi*ukmlB#l` zLgqq*C`<>^*6-)eYM{jlBkoTy&2uHk_vKU<2`^DqCnej=;*@(N>ei|IK`U0P`6fg{ z%bOlyhjb|dyt)gx#en`HXIXgxwL)PDL2CfO2E)o)zSPR&K12j~V6;`V<=osHA(p!o z1W+dwGD`B~AIlNc5vK0?UTqU67ZppihwwK(DghW5nOgm+P%*>6qeqEWO;cu4HxdQ_ zXU1!yv}J)M3$adu%f}XU*JN5cswIwdBvMp8zp_OGn3iff`3XJi4cK_BZ`WIQ?1-K% z)9O)PfXs=#2$spznn@tre_$s(8roU^Y5A@$-9h{ix2+o$>}&?iAVc~!drk0ni2!3I z89Aq4Ep(?Zv*LQa4uEDz!vGoHPt;bSyz8$t3-WB}+Q)?LqYJO!agH86Y4|+hET^!% z;zz2HXY>7rRL;G<cjh8p9%+`P4O<x|g>mj-`f{%WYC<gif{HKqH~{@Jj>KtdYCkjh zTvNT5`<hIa3D8VQbld6BH*^=9YI?lr;I26an#(>iXs$>w`>~z21j3-Wue5tKbd`qw z*|{N95E>`{MW*_s!R?CdrSE;)ahx|x{;v7lBRmZF5vxaU%gPo31$ws?G&D5EJBy#a z_HCTutzSjama|_wfBp%0V7RIiaQAz?8}tkWXeS-`6NYJM0F`p~oVMD;n`)IhRJAxm z-Y&RuY(Rajm~)wwfN!clk5?K_l2#TJ`MG?h_7~hiUPfdO?%;=f+?6v16d1f)N8iqx z_S(*TmnJ*%>8>*DSoJZy%K&O{W3FQ%BIzw<@fc_M;S9mX>TY#oxAK%>uhyL%KfK^r zDe>5&=b{(HTXdIka^fvEJ>6$Tzfi2^yY0!kprOLdZxs6Lf~Pr!^~0RHCRLki8}XL5 zVij|vhIf$W_ZK9@{f;N3I}AV8e!d_E4H}N05afB=rL}m!5aj2kUI{7<QK8rtv^tlS zW<<@UtWb>?PE;=>chz9Vkq#PR7~25eXGV!BZoZC$CL`ET|GaXcvxC8C1koat=Qjo% zxC4uxI0;(Zi$9z?b!rP>GvI45Zi5&c14QO|*7o*R4Y=m|KMLw->y~1z<pTqCAsKjq z)mw!v*C)=43|C<^CL;gAy~>Htc7_QWfjwm?uTf0m8$nCo?TwDOQH8ZP2J?f%li7(d zZe~If`qVqIj_0OB1DQ9^6raz_e@MDc#Pgo+yBp*b4;6cUhD#9S^l2{p(~}>G5{TK$ zJUgC`iOf<&C4uGl0J?7!_|!M8NTpWnOrS+lYHYB&>1<@MwY4?R;EUABJ)30GTVLF9 zc9Mkb%y@X7#J?PdtvnHjpFeqh>4Tq@tke7#D9RO8XrmjsP2IyCY`}6zERTtZn5;-$ z8PN4ZPcHqc1n)mHVJ&=I*UuT6QZZ>=2^^clqE5Xws3La4g58H#JEUzH^z<IF+uZq! z!{x|SugJ@3P@mG3JT(E8z{%{8#n)ryW{3U*@h%3??1O~Hl%#f(l13}lSOOv@ywvS5 z#4U@Hanqm_3zjp9wz(Md37Kz0tulWfa6{yw*MAy)kue(Fi)?F+zWk>_{4X@Yl_Q0h zHnX5Cg*N|Q8@}E8pS9tJLqKhKHSu^SqG~VmuaM`w`wW1!FF%wkT-)r$*m^Q{H`&|` z79%oqMKXLlHg-3sH3&kojT64l9)Y{(IwS&*YOr7HtABnv>e&a6<~m#X#M+B_c)7>A zK6{k(^*;>m*~89UN-ut&1lJ2am+iHOJYQaZ2XqSJ4RpcQ6)NytvA{;}2lFQo6wi*d z6!s1M_=U^YURfqrGokWHwet4$Sk2W3;%D5F#(myDHMY3!^S(fx@Cz}#Z{Hq0khkK* z2~ST?Z(z<!7&f%5{$BwC|D|O3^CJF2nhRC`C<KOJSQWQ@OVGFW;-6G=gP-Vt^R8Qg z|4_{%w_Dn>Yfr^5dO)<zS=eUFW0fEN%)*<_Wi6uwuTOlD^3&79UPi=4`81MfFv+aL z-BDwaF820Gu)BqDJ;nslz@WNtdHq3l-_jlzylCz#2p#q5=8uTu3ho^<NI$Psc4;My zoL6_YIx62muMV4i$wUsBShe3wXX-5P8JW`cet=JwSbOw$6ml<h_nNmX%&T@GJ@98v zZf_EQt5?p3$$e%caXbWHL-$V-(U#|wE4t!*6>i3>-?CkiQ>oNF<~1%ZB`zl0^B3h? zdfExzfe(}zGAJ-BQeh1ozq(;MG@@N9m!VSE5-fqp4h*CV#d&GNJ}XGXQ?nf&=^pHM zl9kL8w(*X#JuI+5tY1&Qxw<5mzx&E8^d}lyq&n_Mv#!lqO}Rx*n^aFB^SKZupV6c` z(#qQWXnq00oU~%EGDIx@9Av4TRsG&6S_t33b<R<rath{}27`QdRPzU@(-Ys^X3Nvg zL7!v1a!jaDz3J`qPuCN94Is2&V+w2kYgKl4Ul)$^oyS0uOLvt@<xmIokEF)^+vF<e zXOwW_bk=!5Xs5Z&Ex?g+fE9nQkQNaR+G*Dc&J@T9(%E}}L7q#w_GC~y1HZgNR8BqX zq}!WlBl9fuXC>$N#v|_A^6>svNnW)x7u*M$?!(?ze|!!p3d80+*EpD(FPwOB5bwG; zVB#_YRCfVEr+FEE;;Tb3%TK9U^N5$ig^s21?t9M&>}dQoXT!2y)?Jh4y)?X6H5z7- zwbC!CZ=ytgBS=oy<i)^BZ=M^*o+aLxbFmvFdspPI`yc}^55o$i?R621cfi>L>AEkZ z#W+7!4_vxMY%zDAso}vqc@U^APqV3BE_F8m1z*g3^i?23Y>(OOlk+FT@F(F|>nqvO zxL?oxE||63E@RwMMgLxyQjlc?CPn8AT-WqolE9VR5^_onpR7cl+-S$w+u9^4vV*6& zk6i$LpR6HHvGndTD!sJZ_S;#;{xQ)_-)h<4!|<cme89aKgPF<&#v};^<91enoI+)g z(eRX%GsxYI&dUO3@m^=oKy|Lk!TWm>)%I4MhR2pOt;@&$3!6OqZq)5?i2U)_^8!OW z4#R68O&>SyOS(NCCk<{uJhx01Wgt42I5*kC0Seq?4KVvrl>_l+r*3}@T{%{?@>f{< z(;G*Da+10!tC*wESi#*wU^Y_sv|6%8_)hgl?aQZ{5V`pmKl#JXo;GOC|5r^4N|IzE z?>3fot(Kqys~NzZ?90abe73V28XYL<cSMx5kR3HF{6{m=<VMPludjB`iUM6TDuJ;z zvQm?UcUNn3lbW}yXNv7RF7NfJqf>!JpM6OqV|}kqEfcO4_APPp{M$8YyEox4PCo(6 z@2>{}&+?-J0oqNP|A1j#qW4ZEFrcaaCdclL{O8sFT6tJw+OI-hOvtPTtuu+)`4T!a z7iB-d9=IHU{y*HkWl&se+clU3hsNDqgS!(vg1c+*;I19qEy10}Jp^}$;O@cQwShGD zb<X!ZZ*rz)rfRC@$JE?^x~tiA?|tjK*19Az4K@w+y8qhTQKT;ul*#h*CgL>cC*zV; zA2-TinmK-*bDx6o9^MVzU2=pi!cr5crqCH>?PhbO<R_Ag)5$2#cQ|`wtJn5;U#N6+ z!>JFY);016&pfl7X=o^)kc^4%AJeiR`;!8Kd&1++Xe+*=dsi5k|7|Dy3Kwsr{@sLP z2yw#x-7E(<-uVCfqcArTnE$_CW+~6=@#uH=Xi%Lb&02LQf6=m9{>1d(KKti&($!W` zT)e9VB3NMzb@^E60E#i=p~%r;Lr*oeU(h<)>|9)Va|bdsFgVuAL4<(i^vR-RyL5n3 zG0Q9S5M%qXr79J@@)h3jlYe!;i#mH?x8SPpt^V<H13J`V`L_7!$MCSK8MM5YwYCA2 zo23CA$>I!8GJxJiJ|)KKu_o;Vv4#IVG?oLuzhcCkD<U%TVod1F$j^@~R|(O+<FWpU z#WuOR6juZlFXP}c2k52D)|SN{C{d5g=hEZ+@g)okDSulIz5#0D34u#;Pr^w(4b@)_ zByS2I%=5#F1Q{7w%|U_!qqE8n{2HGAqdJFP4E47Z+v1~r{~|#}wjyFp)C@P`ktAg9 zTerO2-r{8Jzx!@-^fMvOoKdxw!??&T1p#0a3IO_kSDmtFu!*9z+&|A5GshyQLIk*V zPK!k!@2aqaa=qV>^t=d?S$E3nY<-fa${UWPOr515>NN62fy}<6F;{Xh9hnR$OykrV z-E0W5^nlOvwcQtJkzsn_=sU|wf5?Pv%wcu^;{XAq3<J2_Y9_>qD!#l16?8L~%4B?% z&6xIlEL&l&BFZ|IQPYxwlaeGjvK1egeOvG?5rFJzR$NjguAYjj5s6ftgpC@rKEvRn z|45*?{O(F=aofL!v${<)ov@y|Zt;pKece$5#D3vXS|!Ckd(W_>a3n32U{LL0;2ySD z#~3k@O2+LPZT`z1>8~y^gW+Pxrwqiryu4Jq2?`E|gQq`E=(D<R;O-W}lfa={I24@N zDv@z>W@H8dKWRL)8!-mf$l(_Lz~7O!W)Tz$&Q;ITf#3G_f_e%nbs<e!sy$|P>A|+N z5LX=d)ilCqw&`1nnoq-*?TA{7iSQd!)5;eocOiWl3@L5yS%TO#I1rJ_lL6qVK(APe zEl;K0C6OwN^pFz=bSEv@Wa9yNVRh+q>)(>*b1NE1)yotb30SMp?ONtmH`W2><^hOD zYwtO8%*@T<uf*HlXdYj7@74Dd24I^EM1pa-F3TYyQnhrld8E>ubMim=lBju#H4FaQ za$MSs;e)xiuhF0>BE?p(vToPKp0>o)zI8u6-d{j7N^8QgJV0x&tE-B(K0%HSucFr- z%Fs_EMuXr-Od9Lq9w9|?w;#-<-bo?|yYd$6A^VHFctAKZ>!1|fq`*Ry%EeZExWY_b z=IpR5ZN<4OsXrX1oafPcOh*OTa86EmNdLt0)Jt%8M>X<EJ6=NMT9g79H0S$%`7L9= z;~El4P1x*t!rciPppUIT>|twVU&vfvEKtG^+w1-~ELuKvthRfRrvliFxt+T-9o>%{ zNtA#d4F(l#al0`mcjIv~kl0y=ig@8YO6H|RXUFa5p`i<psm#g-`r#9KYdAR)5I1vB zK&oC+W?0!vXfpQ&RKv<=l77P{{74O&T@23G;O5Qo&Ozgq#NqNo|0%*qD0PXf%y62S zctrtnDHTGPWG25<;eL^Q=gpPx`}cA^Li|0eV6eBTV6aYG&O~`udNwyf$nWn)?fvqG zcCOK#ns$<i^N>+xr~&Z5`fp@DpkZOZ_}FatU0Uw8p>xp}KDStoKq<6x)lJPF=hldG z%Siksa<9`wIl5edE0N^%Qp+)2I_a#nt+ci+(nsc(-O~g*)QNsB{pgBc$ucNdVnFuH z`5LHr#P4U)Dwo2M!GV-fE{)g$*!j{UY^6SEN9kwcx9d0(@eJLY3vD9ls0!?zKIb{5 zUjqUHCoJ+7Qp9I=#4A`)(9-6u%06j#9-z_dAi#u$<!LjeZCvr@ehgGYrgQGDtC-(j zW?!8Ssc-LHhkbWFnTwV&TSLCRqFh|D&xCxXo+%CUl(-IS<wzuw_cGBDCdo&wxEq#M z<7Y0DP{4ful$`zdZ{h1f@@oi;oIly7d4GKBDEpbswPLSXD<0z7^kHe;MV4G9z*ve} zT<*?`FypTs+a=QkI(MC%oz>xkp$G~Wnx~wJ)u1)ZeNDfFE^jgnnjulsOa~G66=Enh zcGGk{4qr}79vZK}K3=B(+Lnysk{a?-&f<{Tv$9k-K4#25xoRI5mK5gsEQnUrtL}?F zCAi`ax&w*dkw)*o6G2VJe_EnSO?sK>Y8$p=#(yjj&MP1yIe{)~I({g=x8QeVrt~A> zfC3py79$UHME_?aFbxfl231&w+F8rK!IjH`IVyL0G1&2OOD0OaV&6*eRiv<=$E(%d z`ouSJQr7D#3V}J;^LTjlO&VY67bW0>!D{vB-THPqiQ##L&IHi~@KP|MGnFo^^78Z{ z#2@-Ri-d08KTC24F+RWWf|udQt{g6^>$|65?Rn(14V1fWdH*OtSM%uhj`*Wia!VfS zU+0u%gAshN>yHu=R{iD#oD7P=PsmUjRcR4>`x?DuZQ705^6JrIxfR{?<*y!iD6vHG z1o8u8;*@r6yy*7{??MU(h1q#^5-_y&ls`oW6>1>R|D>23&7ka<ZdgtTD>n26H^*y+ zG09@<2(_JiX(mCsuQhpzQq<>-7|JD7O^6T$`Xm!GAmWHwp@z70g3&Rjn6R^BcnNd$ zIrcwdH@>!6+Lx}f=fVE9O=C{lbpw#CTF-pXR0(lzju!)y4ZM&vEA=Kjw12O&Yjpe8 z3wS8e9t%xeD*J5i9??eFUcKGW$+f~py0x*j??xV|9<y6{OXnLU7i%}SN)sc~-Pkx; zHV|V65ZW<v#PHLk{`ehM_Le=Po@do3)<Q{Z>*xHBob^jcE-rnC8F|B3LY&^&RP;1s z&SD+$?M>+*J}wB`+E9{fi8>vt0l+XZ$A2?T!Gq`nrKI2tH_<6szI;mV*OHUb!^Er6 z_JYb~7kD^oH1e~M`xMs|ipW`8U8M1Md>=Ofj3gOd5;LD$smhvpQ&B%Qs*~KdLIk6Q z)dcmvX(o1>%gfo2_p8|>{4ARL>3DQ2E*EldwgjJg;+}Z#TzG#H!TaMItNRDyKgbeu zva<7cXFc95-#wlIs|p?BJ_w$9j(cD8{KO!{0YyeaW6aaFlD@)6a;~r?k`$lXP6uF9 z`HR=`+F?Ma!^^fNfst@CRTytcYQ*Bva)y#ogecTvCHr1k41&Scs2!Byr9>h*Jg|MK z$(H#mK~7xhyG?0zdS~Z!($6>`5G$LtE8}#-*~8}?0PMbWGO|J#758p%jprkDk3j41 zud@AW+NrB@A|CnsFCK;XC#(p^Zr(lz8E=6TKGpiE+G?hj@Z!n`<~EoS9~~sP1C%;r z752QkkfvUZp}BUg+%Z_6fX}aEjATfMqEsxXNvzX(K7mEU1|2%&mMLl;E1iI2E*<)l z@Pu<ac2+Qd?aWKKDdNVcz-w7xP#^;OKk(<_;c(`e*jF*#OiJAbJuOCSCda|D9G``> zs9O1xMB$Jy{UoKKGkWy;off6S4>|Y^4iB=E&iwY#h!IYPgj&c1Z6$r39;ZfKUPFPN zcbQ)x0J#q}6Pi}{2U0X>U?uQ^*t|W=gxkeEXN(Sp=Rer0t!CQz6K9}=Fm>2IIqM!0 z&Dx@jnmc4d&-(pfj#7YzA%2V&Rmy&)<Z`h=tNyQnjUyrW$l|<kg^L!eFOC@TV_Lym zE2#Wm8p2Ba?P@EMU4#Bw-<5>sN?JWORc(de8At?O5M{Q8q|P~Y0~SB^|0d)M{X8DQ z^I&_+;op$&CRZAc{)fLcdYT(Mzj)epG&O@JbAf{<PRaN6MmBi|iQU4-mqFVRB{*YS zp}Al(>h~m>It~FN47o#d@oPaz%_>@Q@F|hUmY<j=I~H~>OE)fDt)M^%qrWxUa`9k2 zh$ZZBk<F+URH~($csWF3d5c=S9yEK|%O&w-6Ho_I@mUJ^ZaqW7DpwP`&sN9VCLHwZ zlbaHVSgCFx*wo1j=PT|Gu^B1lpFsrKguFzy`JFJ`VWS(4r%%$#it)7V*5D^Jd+Qxk z)rCzTEeybi;+Q9xj{B9fYY|JEh>eIgX&?_m>7FkE$`5f%6lN#*5X%>)?aUUPDW_eX zQd;E%Mgnsoxf{j+boAU|ZDeN`_@4HXXc(N!D3dc>fsjOs)Ri*ileW>~Z^fR%?E6*{ z10h!)diq;WRw9kPA<fu+lXl-v9tidwKzbSOG+$V=pR}VChHvoNO1q<9c98p3Tiy?u zVYII*kW?}1l7=an%bKR|vpHqo-I!cNKAFrHrXgk$O01!N6$!MoNC6-z%1MsRy$b$o zSocefKX(&-EQA&Cm4sRVQ&U)?=l<yH=uhkD=TNMM-|+;ly0Cw~v2XPG^}U_PcEu9_ zh^EA8UxJy9BuGn(MnIH;v6#pPcdbcB)${ZSVa@E?@DcO^sSx2F_FZ`M?75Pe0!jL7 z#q9-B#02>(E6%L*2+k2O(4xDR7XqFRjvQuuzoW2Z`oT)*Py~qA>EpyJy?C<2&&Xr) zF-{zecZA)_WMX=v7A^MOF$w6?i7<^OJ@?fAG0&$OaD^CQIykCXj~~f^h(OQ&^B|}u z(pd<@_G9sUETQZ2P)?RAfzrQ`>7uHV(s^aOf|Qi5nM;m$CsO)LL`9dpYFlmr?6(Gl zBozZ2%si3kQ0(RkveCJZ_^YSF_RXQEg_P8?vSCR8_O=UUkxC$Te(*cMFS@!CYNMd| zroF%Iwtc$37jRUdPwd-y`9sCPw`x&D7KF@BJe-jnV+(&F4k;-<#@{x3EoncKhnKDr zrG*0qC>}#17ZG$BNQtgdM#$Oq3Zq}komx;vb4QEf&y=O2YG!1In(>w`QMAQwvw8I+ z@R5r-2sD--J0;lJLvpcw`CD@EvHm{rR)Pp}{`K2X*e-O6_h|U{w?f~8NPD0+|L?Zs z2vGXhum8Sm;QvFHf%IvszQOkWl6jm)?N5o_{35Y^K>qiTgxS$}Lv7vF+4*pWa1;X| zO9XqMu{Rgwddk+>bEE2i40(fRre%(O*3fs)1P#Gn#n%}@E#1s>AjG@FNzU40-)i-F zQ{wH&r#Wg!x_Ei$Sm)MpcmB<2^g**#;DT=!6{r7LGjGPM7?!>*YZdt=-aEW5DGSo2 z1&%-WVwwCOn0b-?d<E?9K^JS?aN5gsKlH{tLF*5(1KdBJ-y=*Kl;BtPVJ_F>%m4Dy zF2vi#OiAsEYKQGnevBLyjH2%2<QM0p=*X8d?1)KdnppJ4>Y*1|D7MzDPPT+vgS6!H z8?!4p0V#_6$y~W%1`34BW4>|z4`~`6zJUZc&DURuB^{vYkj8=>)V+4q?S%e}ck?gk z#M-B;;pYz4#w9kA*oX&*c9G%+E1B+gSpmk&KqK<ExfM->qY%!V%wD`G)AQpf-naOu z#!lCQKEaLUumu`ifDn>4BNTWAW9IS-nZmK|s*0%?q3FsWzeQoZsbNOb<tB7aB`u8* zs>pZV8Y^!U+-a|ecRBPDvpf@*WB#l=J5hkrTT?45q-RLgbHrXYQ1pb8mp24zRJUG@ z32Et#u=fdfY0V<94cc)h5P-3oneal{3lI=eB2SK5OU~X%=kjjjXOQ)~ZDD`k@G;~% zJa${K$=q+ARLNkA0c|Ne+HOJ)e@f0v`~Hj6FvEty;rwR5CR+D{BKUVbcD8~FsB@_! zEM5&%V-h)6+dJ5)y~5+*=0U*)8L>*KhcoF_6asX7Brv9z6|(=m$oN`B;NalS4v%V) zpkMX+6K^`Q(myr?IODk1wI7Sy#Y4%0D;ymY7G7xmAR9^ys1Qs}h)~2BzmTAI5Kzqb z<yzUlG%2n}41;IaS_|-V#ex!Abqw8rkQ2Ko0i6joRroUPVI~aJaiiKQR1pjOnLYJh zuzE{IaT!BUAI=9+GHGt>&*FX=gduHBimwg&!k84<beKj!*1ZCry#kr@9YgS@FwF>u zIi)*tuQT+gA^5MY1w$vbn0PVv4lwqbrdVaRH5Zi))q}Cp;mln*RB+-anET<q9XGH0 z>2()H5#5_C?_G~5jazWIdfduu(&@hP{&+1Z4=q$V^ywR2VRUQ=W(HAkRT=pfQs&GK zSkf(XRLgg)8d^mDpXE}XNFyO+4vU@Xy07DqQ#a`ERAwN1DLfA7^xfp1x{*_+kAW5= zOwg8IJ}@h@>{v;PX2wljMes~?Agz)$I~ekmp{5+k0_W!K9hcffg0a;HBoi$!`IQ+V zMH;V_gDhkww@%+#x77C5bg~h<1oBR7=YB821&2x-hHDnOk!OHi^M#4)@0h=glge^I z@Lo@f?#uiNAdfjk6cpZU$BhkMa5nz26k#`y`C~U0c08x5041+vp1>X^-4dov?&j;D z>iz*)x69$p|EAjVm(1VlnF{HtOJBH!1r@HJoxTBf$1Jy?*T1j&IvX3zJ$E=Plc3hJ zUS9Uuwm<~~O<_|_kuT&6lNqrs)MZ1&L8G!Z5F#|SB{SYnstVNj<YT{^IGfX6h-}7d z(=9?Di`zR>jIRH<^$uv!u;!*)^5L(wyT}pPjo0^`Ua#Fpo23>ta(dt1D#)EVh(Ye# ztZUAI>Te28OX@i#i=|Tq-eTz&;8MDYR}echvwNbn8VBZ5q;20xqgechC3mUcxDji> z%1ZQ{ONX{z;MgiFH~Ci>W%!F8r#Bj>Md(9z`T0oT-@DMFlDfN=?s!s=6&W+HkOsYS zv3M}aTU_%(1eE}p!^x%1UQ8Z`^7&A$k0Pneyd*ZK0rTqRwrOyaeSLQvwOgN5LTr^h zTXCaroNN{D?;QK^;kn9pTrH1mW!1aOX(o3Tcp+}hiQf~YKcz_|(c0zV+ef_gR9`uF z6{uSeT6nq?j^*h&Dw*N^@Uc8Vb|$<=qFx_17fNOYP)c1_6@)RTBN_QcH>R@;UW+og zbsah9)$3(ga0jhN36HY_=uken@%b3w&m9`$>9#D*R|a6$ZVfhb;x9@sd&U)Na8e(B zpWO>wHYkOo-=D{8K|i)5_o-0VI$+w==Ej;h^x_%^b<)6N*|)a(c>HuS(wobs$U>1l zOq-abLFljJ{0c@S8T0vdg4{M*$BTI6%DAL=^A(xCSq0*ZrAoOp%QFOh25`8^2gXA| z!HxI)GdHJ!6%i(m92<OK740k!5?k${1@2(H7jv^da;U|j>e=X2IGB&UIxj6W*_Ni& z-xu0ago{p|Cc2iu(f5w&K9X7;NjER^a3%7uE+Kk*#y9V6f+^ZLQYsj#Y$WZyO*($s zEt_d2|KaRhrlIE%%iEEx^RwrtvqqPLFHfVV?v1ku?tSJGFy<V3%K?6ms)hHoT%i11 zm@L6`uVn!&0;$j<AXvAJuuNvpi0ge{tSp_Nax&!5>fLJ}eOV)MSk+a*M#ZBYM*9X? zNz;AXgH9^}2b*$<mMZDCF5=8X>5BV=`goP7t#)jFbIh_0#*1ZAB>Om`cwj5B??Aat zhXCsiUv9%VT6N-gjikU6c3v0LH#1EyDWe)Q_~Y*c-CgP7(?3Xi_pWZv4dWsRul!0O zBI(}0dw72?VL+?XqU+FWf`KanXP-%YQ7UIzLx}UGqE(>nNp~T&p=+biZ6VKMQj9xd z@s6VH9}-VNoBqwjnS`lg+U;7y^^Gr4`cJWg=sime>J_^TCHtej@WLbMn&ab1#_PG} z_yw+Es1X;>`dZe2XQ^$J0pCy>N~P2T4h%oZ7TPNPHp92AWcu7IHd_{~h(4rEEE>zk z@0;XukvS^L9j?(_)6)hJ0@0VQ<xo6lPtJLhB|{#{7u`70tzoE1R$v^4D6;Y)$%cuY z8<@8?CBiy~%cn@=AV#)B4Km)eJ74m59(c6oD2S$@7ED{qKBEs!$T=JoVH<PicPFCC z*+~gE!}!V5)Q|}N@pIT_;$@B1V@0bguWH2ygP1mO6%e5KYhpInOefBEf@P_bY1yb3 z4(c@~*|2hN6uD{JF=+9woxg+3(Jw^Hw^9wcbh*uPjtQ<Ef+u2ROKcmbk{nMc=C$ON zvr_rmmO_wDFIvQ^#@doMU3`N*ZRsQ|>ttYJ|M-0&<}6#E2(?f)zhOrirj>mlOa02+ z(U-ptcejz8Z*bMeNRg3||InDps|0|5=u3?&D18Zlh^jy*oo=rS5G7;90wZE5S><R( zw{4cVPb6i8UrXupt7;PNfe_%7Ky<E^Efd<;(HQHxdQf>itP=ot!wOKr0V2!1=$Xz( zpnn^gw@-{xq8`|nl;NNAKkTLIlrEczANZ)XZ1gtA+W|Q@Oiunx)_&YP5F5ZwE?j(= zpR;ZxOzSNeDXBW~g+WW{@U7og1LSQkZw@b4<^x^>XHZNMHh&@klpoEIp6|q&A>O1j z6>i*2TaY1+x~<KvVB_Ey$MSV4hOr1-Dryx%u1mCG5e(dz>rd=*WL|d}PieI7GV*6B zF(p!tXOoqXu8@O#DFSHoN4LLg6WdERYD;dC-wk@ITZLvNBqkuXR;E+rBI^9+P0KH? zlW{6OUp$AH^gWGdj4KMso;nS?&|iyxC3y0)o3Kr_{!A}#B6n9MXOtBCj?KGbps}*B z>`zhx<yk8Us|rb68?0>Ufw;S9H5J3c6~6cv4^~;y@g<awk03H|>DTeObxVAR6zwRR zwI@430117Jlb*@UA)xqcH8v6yUs_)AKKk)2Fe!J)6a>*XPwpF}!b{Zq8&(Yq+XO@S z$^e^9eoEez_$1s_SMJoRW)2!dFI^pNP3f`VXJ{RtYf+8fm*J=tmL#w=hzFbp;YW{p zIRwxw<=AlNJSNl;+?3N05y&d)5<{>8v1t~eP7)F=-j{KivI{qdoOaW|;XiPCU#9a# zuzd4Qk}gz*n(4r2Gw6ku8>#?0oANJfAhfKshZhirpB0%m8wx_pn>y5^QBfdpkL+09 zcuuN)pUVk(Y5tW_)WZzp=qTDo4$@!ePxuve;EN1g*#^TTylvo?XnAXFCPSFA`*>*- zT6Gr#LG)Xa7(u<PD%4X1`q>=y!m-<yjq<X-ywUU&KC%9fA%hrIxEIPT^|fCLJ&XI^ zhe^;fA=eG*iL~{=%k0&4UDz<|+QxmtRHbYit-|h7zCAojH=GHOG793b%HT#9NGCjr zW*z7^(Bukx!p)vGxMo{iyH+gWw1x4u%5AR7t1;bIoc^^-zndF!C$EuEFqluCx-Y9M z{Dr|BQ?kZuymp)V<QQ2u&d_W+AnhYXSBZ=J4^M!60s38-SR^30*z&DUdtz?A)FV^( zbkS666Ir*`c**uXhalXu;3CEQQe^cx#GpcsjMEJ_FO3ev3Wjo(*Mn5p`}V~8V1QPb zwaCW`|GN|RaD-n&)N;b}^PWLw`T5AfIt508z6BI>>g8ojW=FOdMTeIzP7|NM@#EOQ zpj<XAbMSp<2wc4ee_GJc@BegSFYw1SJ@Er5EzqP2P_nV1+qZ%7Rz0>*+Y-Lpzl1Dk zx{cnm7p_8ha=w9#cTf)xsg+DGCZVLU4JxNJraT{fQ^=H1EoR+YOY7OrRj?VRq-qUh zxrMek8udm)qpNU!aQpBYNs#&yeZJGRm2|~`t@WZng1E7*zkUVYGq~7^JGYMOVyU&5 z?dJ&M^DOn={93DLM&|75YD2;-y#>QySxA|jP1BDD*#6n2n~zKIp4AKyLZx30McZd= zUIM<ON0`5-euVkRabv`hQokaLa&=Ar_U%kbef`jbi_$pV7ld@CNm}8^Pq<@=ojIIB z5$cI>9H$@n7Kpn{4yoVksUCiI2MOo-Wyuih9UM;Sh6t;(z!S_DCtTMxMTXZ;TlXQR zzt+$6P%czQ2K>{paSXQltPve-)_pHj@yN40gVi0l>p)xwONa5ZvJ3Txe{ZlF(0+wY z<=I&83OrncR?>M48P1{@6li_)d#1x<)B9(GEie`KA!*Z(R#I&UrC)dD&7<eB71zVr zcuOO?j*WY?;kpLUhvG$E0{d_3oh7lzf-#FTx~n#A6>UdS-C@1d!l2DOUW&G)L@Tm# zhPkUqO^v?8k4%pl8+|<c!U93<^)fSLuR|+}5v4EszV8x)TLLjdV{c77au8S)gklot z40JKek496gQRHqi`l9qW5<#9u812w;Y7+&Z?O&}&-d9$cMtdsc7w;R!2R+f=r#~?+ z1I%qyR;rknk4-0k6e1)v^jS{8Fsg)GOul_n#&=}Q4{q3fZS!8OKG4z#T7&Ps+0e&# zs<BShl|rZ^br_iFmx;0|9+g$kh|BQU%vML+IxBmdenT<?++_V1tHyxq+D<F6fT?_& z<&v9K1${g4zb302v{Qq$Zh{I5X!V+1-m$e+OX1^VM$7P3(-Z;6T{_hIcry2Gh2YCx zhQY#5E-i$pYcHuvcQ^9$g$h*b{TvDFp9tgig)L`@KX~<<1F!ljgF!&}#qeWa_jk8~ z5FUe27T(is3_qNWNPP9okx_jqsNZWcR-q>YQ%NYM89%5Xq4Rh~DUEOKYH|h(g$l{2 zu>}eIPSq1&1G7G_)o-hGB0kLV8n6iowD6idb)wNrC(Xoe@!l@~UV<gPx#r*ipBsjR z2PMMG@lrs>ume7a?H|%)M5EvG=K?EKNtfHusj#8N={mehB$ss#P^Nywk}3+<T$f)F z>SA={rd%q4Dk{DhT28*g>8>(<pGd<m5@f}5ZYNW%FT<eLQ(3^Gz12P}r)CcW`{<Bg z(UVx<nJ3^;i8l$|nP;+&obh{(o>qRmeXv)?@RNl!hp}nqsa!^Tb&gWuL3fE@Yekfp zL9zTvim~hZo<x`E%pZr;%(|{kvmHBsAZu+I#~WjqaA@&NXmuQ(1wU${Gbd1ey&Lui z6bRTiU+z}dSW3MNT|c^jojPJ71wWeQQH#s5yFQ~oj+Y71CKaX+Z1!ysv-g}kWX{vd zr|cCa%Xcc*Q_n%IS+w!$(Sl}HyZs=02Lk#wdH!+>>+$wpE3!`x2?x#*vKAbPyuJaX zeHy>))qK_h+9wyc8z!&jylfs0hiXxoUL)6abx#nwxMX(U`IwLr?0mRLH)W@|ueq{M zhN(0A?ifg5ZxvF*YJC3fMw#0UU<Pg<u0?%-<b&yScS;{QH370EZms9X4282gyM;v( zI`FU`2uZ9IzXQOK3#uB6DY;Y*q%{wviqsDz#gzge`7$gdBbvw(z5b%zI`3tbD9D{2 zmgb~-Gy0}K0o~S60-+6Ic6X}=<EDLQU2($4z8DqTq4;xV8E9Ykk*emt8rh~UhtV(U zkAFbqvU~c~np)pd=&Bu+HuhB~q_E4NR>Sr(Hh+YDW0p%S^H@f*+MqpN?w0z0EKZO* zLC!b--eV-rH~!y$Xa$7Wk?X|#;ESe41b9u%IC{xWS1CgJb3@=*pbEeb_d);lM)U)7 zpYfSmv7EMCTc+TvJLBHneO5;oP(uNUd8)ERVg+>v5{qlWw-f+7{^I09?VR`0asxlk z#9^;e7;>^aYEp$jn`FjIJl*3ZSX0r`v{nL=Z<2j%dZwxM;yyXkmeT6oFVqZDVNTj# zawl5{0&R%W=VNRbg7exSf+#9KBx8s&M<jFeJ{Fv~y)Cq57vl~g{1se6!qPUNoS5xY z`1@3-%WFIMX7DXuSk3z<Ml9iECl~+GaQBLz7vk5YzTDOl;>zzqNgCsIb9Waq_ftil zDYwy-Ih8dSV6=21el$gN%E)S!PDU|0Gr6Q(#JbE(2b!!Rn$zVTo`J~|$9*_$r^K_s zi%uIaihj)62#Xzv?>)|gPC-s_J$7cy_k=4hs%Hn(7<ccu9UX1jswJ3)Ic0WdUSeP< zNXs)w-FOExDU?%I$OmS0VIQ-;uD&J2)w2-|EpbSeUE8sD<0n7AbZON<HB}qd2=7AX z>=HzVb0zi<?$-D(56<{;E@*Sp<an)v{I}E{&_w~2LGyqgmQ?|o_W0K7Ootf#Ub++2 z8yRSeMpBZuFAmiXVJZLd)0yh1Jr0;RjHDVdT3C%zM=I4fxU-4;$m-=XS7&TSFcnsM zV^CZC?h%d$!zPX`Kf?7ww;fK6C#i><tJQ7k=!?c(bBv|^9P&oBoA6RKMCACGJ>mml zKr4<sj(?X|ZGHs~H3{e`;{q}bpNe|8xxI%-#oqN%OWz_?*VjRl24EQOTie!azaMBl zb?i{VU;p$nbn?)d+OuKX)W)16BcXu0hnE2xyjrbtrqhq(D@KWhscFF(PIo4yzw`@E z<<Mfq2Ain4&lCTUJU`Kt*4##$;3%lZrr=TEpu@T<b;G6Pm+2#KK=@d%6~<+spNL7v zLesnOJ$!LXH@vS;qJXF|3*$8Zkuw;9ok&?T^~n<7f<(x>HhQLIgbmht1dN>o+%7oR zR$-e@tB>sc&BT-Of}zqOwx3Ou$Mr#3rn4p4rmetA*H+ls%s?b@HWTmhynQX6_xj;C z;(SB$NVjTcLhvh~Q><)}>OJN6zC`HcvJJZFqOvtpyBE&#wt+4k*%SuzHljWC9^{{N zQ#}-1EX66`Z(iWB&mBmaOqVolw5%+tAvSyHMhZ^8$IdohhUQLpJCwvRzUZLF>&*pt zYG~EPFhZR8h=gQRPn+OfBE8-proJXs1@o9012V@dJ(6NLFEUQTG=mJ#FKn>J_rg3x z(^axj!|NB^bSsCM1&+H0>mw2^q%2{fYU9We`8<vdwZ2O!e%+}mq{#JSGx;BYR{_;d zj>60o?@sK2k<be8fn7-2u4FKhrij5X1lQd91?#Yk#_wS$iTG<|9J<|@O=>F$SK}$V ztGg&AVRJu|XO5X)+wQ6qd9$+@%F9wtx5uK<#Z;OtQ^6NnT)P^N9+1)~1If^ROvC5R zG46vfNv^uKjwe@<6?-VABafELq}lM-XcBGge+>{Aank|Gla<Wbw`m@-5{!xE+;R)1 zW8b_@N6^1NVW7%=@vy?mFFV`PcZ30+o??n2e!~DlD}N5Dr!h>Y7#G^`zQ}Iub<##y z=8NUZd%55C9+hgyu{Uum#kejpuf71iE$fq9W!x`cho=PM=n8`<Sc!>J4!0Pm&+f?7 zZDib4_}{3j3ZP&}S|g<o7on(^<A_|IoH@>lIO9yRrUttQyW}>&EqbLA43(FrpI&To zogxgxM{lE*;0-9|aQJ0~`>F`*NN}YPoQ4c%&gPmLN8WbT%Y({FNCT_u-wGO}m1yG) zID#g_$2O2)`_Oc*td=9+ca8LZvlMf8LzuyZ8PQl|i!|bq1e*aZM9B1Uq3XQX`_`DC z$hXXjsrAO+%iuCOy~7W+AiNi%2fZP&-zw@?>Pm+%#4j3zZ}>RFxL|yVp$0V!3_<GT znczi-Scq>rfb)lo*#8^}R64=GeNOG*FOD&kM*t0=rnA<k;Qkatxa6XD-q?afpR4NO zBq8oC;>Q(Fbv3$rp`}6`3wp?ob18?e-M&mmlPWG1wsFw`f3~cB^Pb=88=rsA4VLX; z!~_9E1?qUz_e(kB9HI7@DkKASH>>EREU3r;o*oe-?*mZyORNH=zxeIkYDec8%&$^j zMgPTlaM@O;`EK3wPMz{3to1#~nXPzm+8eQ;_%UoPQcj6KI77;1%lPvv%t?78pL1sO z8Q2Sr1;slKpYQkvRhleq?cxCRx`Sz<5hwz)aK37q#^cWM_8{mnxj=8MYnCCvUd78W za(VS<9bm4|{FdNcxcJvX%`NCd=*=-Aq>R~hmDSYp@yhyM1O=uLU4ZJ^39ZaO=h$*l z3>bYDXAYCWK#uBMUJ9$9MuFV^b#GF9?f+30{{Hayd!c~;SDk);W(5QUxPx7(K>BAf z4-&r7VU|}0>DjaMe+DSbvWPwK?<f8J&?o%nN)#YsWG)5_Wx6RdrIhsa>EHje@1>%o zlvDMeewnoUXKerV47FSTCsJk1OXw8%SNnf*SuGuYtDo3|UzOG{RkG$o;hny{1~Boj zCxG5pbA3@x&bq#Drpixf7C5M@uB4xzXp~GIq_wp*YB-r~OS1!lyXtc#f4o>DyOw4r z%=so4PdcURTN|OT*FpW@i{K?HBXfeA-SS7KgVP^uIM0t(wYQ|w{u&7%e_cwCwC)e^ z!H;cxH;|bx^1b!Ni4hZuK&ZHnPtU_QA^ecM>v$^b2YB4a=aVKDy}n!9Lb=^51rI;p zpnGf*cPJf&lU-b|Z)q6W)gsvjdQsXA+FaE@mLi&(1fW9_7FJ0Q2Y2w4Ec%~*J%NYP zYaze=*q|xK&_$uiY)jXJ)*esYwRCh;)=2psUeMCgHbP~zi_?~<Gm7R)7PhiZs=BaP zfqS%Ww{5ob8BNhZEL)W3)1Seyzzg7JD*Y2N8LJ#XA<ikzd)-d>fskHQvl4$r>IN4` zA`6`!e;R1zw?hTL%RYu($D>=21Z7lgtf`X|*4|iV4+>lBXTyh0d?t2ryQ|+Gp=*Kl zLw{>{lTZ)lt^D!8L*ce{rW7G(lI-UXzK*^~Yj+pYEJ_;_+3WFMk@cARvNxL>1Nt8M zcf4S$UsJ;#bGPck8`ctmT4Xlf$ZL=%8gtgRlBEmt?=ISU&Zi=G{P!&X>6+g!Cn`{B zQBq;~92y^CSkVD>M)iPdurppG(7Fc1QdF3~9m9H7+q}UlOKB#JB(g>v%S!W;Fypf% z)rB_s@Cq%c<{#kFysOlWhIBo0pIi9d-`%@(>XcSYxKiJmvI;wO;AJ@cDggFk8~VYo z5#Fo&FohOGR&D+whfG}Tbo9*AU3aHTpPP-az=V?B(bNF{<!x09ors^Eaq=6Xw3d>d z9yBTM?bc4Rp@udN*3R~JF(cH!7skNrfEKs>4Iz6{PHqo0Tkt!dFbejCmx|Bacy-V? z`>>GHmyQ4!3?lzw&sSFvzVIkkwh-&c&z3I&!7Tfl^c(-hZ>Rk!d2sSPX5Z5K?2#tV z0W$YX6V7hpz6R2IhIPZ?%@Gn>a!aBnY*KmflkUBTBkaeczB(67GHRY)lPbn|>eOR{ z)ME#&PqTJOny8BI)J)8vS0KtLaDC3!H4!*DSLhO@4+tbW@s*{tD3s@;2YzbzgU!bF zJ@?iz1}&5IQlq*FtNCEuUmw6FC9ih=R8-iof!W&(+$p(91j5GxO95~QPSu>R{WA<U zkzcJna%PE^;nOanEYp+qQ77IOKbj=58TMYswny4Oo|{>I9WD>c1UB2~Hr>$5-9Dmb zDUkHC0Re{YE0KDS&8B<0`Q(~pSHVE&s0iLCL0aFZd12xPe&~7!@O^CY*pP2yo?P{I zxaP|4%@%dw+e~hFpkr;lCTU+03+TjcldE2@F}zscr>yp}A|W*tWjt*kovQLa*t_dD z^d+5sJ|Ga)1me(!+D$J>)Ecgjyz_yEN>+}SEy6GP>HOkbl@pMyehf~2xSN}QGMsW1 z`_D2rIVgCJ&dm@Tu!!{U9PALckO1mj`P}H7pJNJ<RW{1j*6=H+w8(EDtcis08B7l2 zocu&@y^i&`q`&RHO64TMQvdE_g|&8izR^wJ9yU;R)-PJUv$JS%Q8xzEnU%R85{n*x z)F%9Nair5fRp8lr{wV6>Z4%vHr|%wl<tH)YdCJN9xc!`SlFpWIwFhqF6)UT%_<O&m zc>c4o$c#YavPV)Jb|QGK>53fV{1G{vtV3ZC(29?doYL2xZW<tbwPycU(&Iw;oo^RZ zdrW1Li)R~(oY8S{LzXO~q5=H4y#@_y=LTSdCW|2=flY{R?tD7akLHf3g5E6?J|l%t zuQJ~mKQD)FnfGZ*Y*1eKE2_F{XdQUPZi8DeO_%^6B?YIWH2E{~Gz3d;Ru9=*EFvIq z=`eV4uP#x_Dd(yT=pVZV#JEpd>kM8O-eqkK&-nSsAb5%IF?3~R*+#3aoJp+M^dyCP zvsau0>x-G~<Yd<)`j|3!8qo8I+b9O6v^5fLM~|a+^Eg*kTxYzcpC+@{z0p0t2)dFN z-tCDM4QKmVWShj$uzBUN%h+bHUF>|U=j`N|bFO&47=loTihbgX7~3G`Kkg?5Pv2TH zzeB8r1$NwzwOO|V0?_H{as@m9v`|SkV{}BZy&-r#2)3!Ai*5{DrZ~4QF7T$(kXY(| zv6Q?AUo1WiysJ~|UtB{SOPihN_J!Z&85pR0&7qEJC4AeH?5O=o^EzHJ;(0Yl%z4u} zdnypl>DopWpMLp-UGzSmIQD0SZ5o67v#~H#@4Rm2SBl8XcHBgP{<M(x@oOJ~nD=!= zMJot86MdHjktx`=ej83`PUt_Q^D5nH=T{2sQ}uz6)KKLdCK?0;Q6HST(uBWG(n>x6 z)LXC$_-K<z*!7Wf<LUlPQ&sdw3HjyKmE-M-d)b>{BlfU{H9y@oQ+J`Chdt-#=X6PS z-23-$Q%@UAUKR<ZtrG$$UcoTqj_#k>z0s(7Mvs0I6AELVFq0ou_>LCL@YQ~Lm>G@w z(TbB_OWD9!hMODSzKyi5uCCbC#Z=<45DqtnsBSjGgv6Z>q}GogRJ3m6+R1twAGz{! z{;ksTClQoL9i?D9fwYxYtoa#rB)NAMY-l150K@B<PCA4Iwr3KtJ3l8koON;Grv+u4 zu(RaA@!YMdCp^Q$eW~R&Kf+iMFdI{wUksR`{rngD;quXqA66{Mpr${Pvqe^yY30`4 zgW+Lh84{|ZAMP3?x7{}2%ec@*QLvL5SRS^W?I!Z<iq>aq0DrdA!EQs@r+y4nKc4o} z`{HdP|5}0Od0^3#j?galbC^{kk%<`DL$B<txuZLf=u}oLe>H7jCz*rh#_BEqd{Ku` zOeb;4xC9EB=jHfCj@Rtd-rXFw;oQ-s{l&u9XIY`ScJGTt`j`qp?OKDOP)Knsis`!& z+<FRf+00G7<h9PGuZB}&(_ow|)KX(N9CbSMC&Mycel?#e!GVK2j%T7wi`_b-7e|tJ zpVDL#FKd9^O(-Vm-92}DX>Y!$ulm4ni9JCxC-P33U-&Hs(L?AQ-;pwtqXQ3(ZI`7& zPcd%?g|i+H9fcitK@2~{yFx!WzNz2&I&hJBRch{#b4OO!r1In`%zB^LiY}AgZEE-= zR2$CwJY_ggDgPjo$YuLt#Es=Z96LhG@b&QDQ8xOz&^Z?9v;4Rx_AKCcmA*#7$EPWO za6Tc4Ua}6GDj=?Kf`Jwau5cF%oGj*){?xin!SV9VzxBkRm#+JVwz6Ou>Nz?tG(4Q* z>nwy(r?jxTjQ)w*IgLNz5Hk~|9z>Ew>XS^9gkr+-q+#PS-}ociIcy!4jjCzK5e!eH zf+1ZPGJ-!h7s9*XB2x_I03upFKIqK|MNou~i8pY1k~-J15cYC65J5c?2Ztm`l(?@S z0AfYAcGY&6XjRZPiv-9yf_Ny|`}S;?*xCC&Dm2!E(}cyv)zKmM+m{{Zvjf&jP80|q z@ckm}-F-;Mi=zDZp62ry;;FZXtJW8bzO1bqLT=AWU)mgW`pRC!=}hD5Qut{!27F*E zOqEz4H8i$^=0q7#y6^O>b2}LD-Iq&~S!ZdTc;*fn8~#FqBWx5Ze^2Gj+7WdoOdWG^ z=0&UL`Eu>oBC$2k-nz)!kx++gRrHb^ROUyLHEVBpv9Oc8*5Cv3%-(tU!t3$od(rUF za;G9b$4aq+$~7M{#pfEgHi2NX;%Hi)g$_-<3KzH!I_frL4x1%Fet&y97Q-%lvWX7G zIv>n&U=6lmq@wx-Q~TAH=Ipu{+V)m4)7MI4V&?I!CJVs}mxmNh3<CZFgz)W%t%AX~ zxk2pQHxZ3V%SQK7X`KOTVh?nJkZ1BSeYw-)WO^S0jd{A5q;%0c35CS-OwH}}4m=+! zE_T=_ZJXg?uQzW_S8vOJW-sFM4h?XPz6;-z2qGBHM&NqdiV6e8E6-#H2j-f2DJ{sM z&=uopU7`ACyW$x-vG?iG8g|DsU6S-bDl~=SIZT_6WYea{rIyLxj>MS*FQ9P{$B4gU z2mGGz*S3;$?Yg{IugD&Wqenmvd4D8H-~X+?)bKCCSsdjgopkEOm}le5+r(%Q8}X)Y z!W_U?x37K%=i8Go+4~QMn4+oYmxbg>rN5`-Kkdoa`GDJ7+=B4V5x)BY^gj0mRFsS= z;MdDScV+5&cb%yzO(?K-7E)7*7t4EV<Wqx$BWIohxX{5Q2U}6`8et_id`~YPMs?HW za}KG(P0x(m^pP-%$o<joXA~i>m!82Yc~3FdXYn}gwf*zfxht|UKUR3S>AGY3m%MNT zlhF%)9p<$syk*!T_5|UqGQB(Px87Vr^8sIa8Ho)Z;8=^-I#AI?Z*Uur$hvc9Qejnm zj}2@m$glWsS9-gCro8sJ=`%bCJWR^}?0@17GY)(t6uysmQg%0f*Rh|G5#+xSyGfa7 z{G#!C^Hu}SwY={p-iL*_yCC`Ecw9~Sd(Bm2z6LYHU6_t`JOuv1`-Vz0OLdBB=nMH^ zvl(prGj}`KWGLKVu8`@i6YBDMcWic7!`D|L`G)IyO6Wuj$>ytYD^uu?OmUPA=al@s zhZaX3Pn&|`Zo{Azi0a|?6i&OZhN0n(@q*f$A<kWchoV_=K}2H+$ZdLutkr##k=aQs z4n?y3YG->BM(2HWv_5p5K$h9Iu7F^74~Xo+5@#lfPbWi65%7;eL<RaiGkAV9Je@&< zw{UQAH!2!dyPKT%&c9|qNXb8bb3ZdkRNjC_c(&#S;8dccgxOJbbtXZ@PrNv>Pj8H+ zVK$A?XJwTbWSjC{M*Z5Y`>qaJ7y_UaxLfAk$4{uG9Z=Z;j?Bm6)()0!-%HI@wKrq4 zwk?F$$8_|31r`+i8W&IsktMsgT>5o?yR%Q7cTX<SGSKGri;Ly6csolwn_<O%*1$Yu zz)?Kr<KA&-#bL)*+4%K(`tuQRJra!GlVpb>ki=qiAU{&hv;Vvm3882w3>}(%pQP8N z^4=kUb0HjFfVK|`f!X$@FQaeuPNW<+3T7BN=IRxN=@WmpoWE^uzJ`MQnIAwjr#c$= z*HS_>(H|6jNMi@DREC{XrX#0y`!9F6afzOz6?|mbnv-n5wPrkhzMzO`YpD2Iy@5~Q zbpa|aYPp!OIGq}vtDX-)5WBJRIlW+`Yv_VGlA<a|r`s69Ev7-VTA@pq7f_0Khzcs0 zE0s;yUJZF=``bYNZ?oh4ZTgvih*K5#9hlnznXNjn$$kVt!*cJSMUF!k7qwwuy~Is% znAdlQmeYbwJPAC%e@xeEbvXEqP?BRV&K<AactC0~slopT$@Cj3?vb%buDDm^K6$$O zGVv!|hr__(7*k#_o}Y^w;E_*)Tbw59t#CIrlc=2?(U-8|*2EPleY<bV&8b|6OW$@s z%rQpT2u?1$0W<>nkE6&dqHSMKTjobZ*hE5wyjG3J>D|_dvy2S2z|p2Y*^3`bY{k?T zYvMRsSJTY*)9}1+Kd@!>CO=(%xa+^A$BZl4l}>%g{6Y;xyXAVuK8>|Cp%9pD*P;t- z$hBBp^L4r{Dv@m>Nk~pUUR#?$=&K=(t45tKMNLYcL+x!me`Fj9Q*c}NPYYsvt??SN zfbFqMh)(uAqAcw5yfSF(U{tZ%N-D76&agqCE4(^opM()DZ51YXH(JUN{z<3b9<T4> zTJbN&ruK>;C$8Un?cU(0+p;Y*WC$@>qU<|OP>(TGN&Uw=b|hUc7uXib%36A~;-RfT zG%^SkRKsCr<2%<OFtZ%-?5ty>#tO{%^RWsOfN0BU+0KYBOFo?opCcrGRRUrC<0*eZ zD~vGPXj-!uWY4!PG^U0l{Rt+*$6P)Bp{q8tBVEC|#~M=A{W<fu7!4|`#xZxSh3bT3 zyR*MLI|#ed)@BkZO|v}|-+X6(&rkTS<XRgizaaTZ8K?`a*s(vq4r+J&(s165?z^8* zva4^{J-tRckRb{VJW<W=&n~rfu|HHr+dl4lsUFwwdk>a-WxqKUX-ylRvAcda*w@}Y zN^UQ}n+Du4#QIL2Z@2_sC$CvJ^h3HURIE6{ZN_y0zM7eAShL%z@ZDR7o$T{t&uZyY zeUCeAFYVI6?5;gg=UBn#;hOOc-4nz2mG_f%-}^reU={iz4ZLljG24Gz?L%1A;rFrw zQm19m(fUQ%q=-3uYtS_O@8}OVG8mkxg&GURsqb0Q?Q1OkP><n?ik04}06$-H#_2~5 zsH@Q72clxTPX}ubIf7h89NZNJ@ZXXIl=KYY)1wp-6;1bRnZ_dCyp1ep-%id^si<Jr zsOxcN_Fb1K-3(E<gAa9_S`O;D5MZ=}?fV@UbdrJ#Pe{VKFRnUZ^$92T3#lgiHT1;q zv~Olc9*0{~dfvrL+MukfC$%?*$kI>F2~^5s#+mxFaJ=q}yz=rCB`f_fPk*ziDCU!V zbK`ez1}OXf@%|?H(1ycFFgUa(L-g5m#LAf@XWd^h@2&32L=zC*DsUL#ROUony%uSF z3t?|f&F22}nOn3)At|!FadpY)O!gv2oy?Zdc`ti@XzrqWorX26=C#NASFfZ{oJ9An zxCi%NW)C@6-X4BWEb1gRY_i!-l&?)5Y4D}V{ge{*)V;~O_u4PTE=Hf%o;&fm1~vYs zk2T?-U94qb&=2)U`dwM>VT1fB7s59Q4VsF9+RN*i?yFrp!$N65NWVF=GR!QCEVHI< zj@J}lOpac4LbrY{Y90K5Z;G1DBF72(o6#BjfAmtzYB-q$e&{Blf>!f?8#R?XX8xOr z@g$y{5{oVqZ0TQA<u8I)(X>!*Jnvx~8B_*CEsmxt;fPT5!d6n?GWq&O^T2r@BtiV( zo~(a>{0`<({$9%4_<lj(%aZ`#uTX;<{~2k#>=T**1OFufSye4f#_+x4HHzH~-jKz3 zI=?%_`<?ytxZa#7Eu8jo8v@#`>0Kky`dA@GyYmgM$ig~%`~EKgS+l%vuD95G(HjOb z#fq=wk0^yZTO9P{<j<SfchmQ)Rfz+~b?f5Q*?TAh*RMuho*8{R0{J1^n&*9rKJ4;s z=7ZoFc&9b`<8Oo5jStSk_rNO4og>UWph5;v!I<&W5v|h?j=X*UL{ukq(V%g!C$e#p zMVIX#bV28V_<QPNgKf{y(+w4ULup9hWEhATEBr(tdjHuVPFj}yo|{b6h1kgn9Yn*U z`!9oo?*<14hi2UHO+-d>ZeydC{1yca<~BFnr6DwF7Jk#yk>N8@$HNYrru<9sbme~( z)SV18r<~>nI8x%VgE&+fZWr_%g#rZ(&`ZEvLyp)9V$;9kQ274|2&VW?1WBa2Mi^8> zO*onc7Jr6?<~fK{{-dD+yst_PXA^3>=Uri|-J5$%PdsW(^`2{W)pLEn!R<JOM1~dL zqM<|FDb)K(e+6%Lh(+JD=N+=#G))FE!n!m)gCji(A$HsAsKU>)9eoW3lN}h_8IQ3? zRu_q8zC<soU70lwE<3;*;r4P?<oSYpkh04<@ZC*-k3n&wnI2?NY;({)OEr7*Ml^`6 z{@FdD7Y%Qj&$y#$(xUfQN2zGv$|FM-WNPEC7M2rQj9~mSIN8y7O@!fxez%L^kQ&ZT z?8Z^0cYLI$@X=wf`}Jn@NnelQ`MNVO10yxgsqzEcqrLD=-S*M2@4B*wD3BoZ+Ux5) zwW4|if*)MAq~ySDEjXn`3~3yjTvl1)I;>g7nAV6H3^B3I+HIb9PF!BcR74lGo1IIB z@`(j}l}5irydBpk{8;!+v};FILAF?sZOPbYk#+~5-IAcp4)z@+@3t4_^%uzfs_D6~ zdLUKXP^}=&9>INUEe#PPzQ8-%ocXP(@r&pMH9+-K<~Mzab2AG0GYBOXr|SBvR!haq zUON9Rm~G3(s&IHAM$9$)vn1Ttx4I{5Y4f`l;5uBV_k>U|*!+Zp^O4Vj;6F69zQ}Ke z-hn>~c;5h26-RXXyyJW3P5wIooxS_0sv{=*>AJ{cCsC6iBd+?2fPhGnfuu91=zs|h z>d^W-{?39u41TN}Gvga+B!R6>h&xT#H{m#OczP)e<h#j(Pcm!ftgg)nFs4f`I8N+9 z7l#I@aQ7zw?>luDQhMDr(6BSg>!qJ7UT`Y8NFbXC7<m40Osu7{)#UU>lXbY!XTwbR zc?I}J*Tf;fg(C<hIca;rt^39VS^<&mfn@xqt^!RVuCn!W(Q;N-1MmTvbuh5+Ch+H3 z5rJ2sEx5Dsdgz_Y^&`qIt4&~sb#?(CyYnt^Yp~-H|D#ydFs|@(G}{)E<49*PpC<hI zEKhql3Y$o%{cTlydjY=U<_AN_n#WB+WFrYVNpj@f>6CDx?6dNWD-?2G4~an;nf4(2 zs3#KqULNb&(v#P(wd;FO)}G1Qzox`fsm^~xb#l7hisK=N3%x1x-FrI05zLlDQ&^Z- zwBV>v?5ZA0#1wuUVa%9bX4bfc>N}f1Z=YW(X8EYw43~T2j*G7N|1b95GAyobZPyGC zAOv@Jg1ft0f?KfQ!68U+4H8^JaJS$t1pxvCCqQr~cyM<pq|U6Ywf4&TdhhR??(?Jj z>hAi3U6q=dbIdWvc%S#VpW*oRl(?%P`fyPCF5MPTwy<nVyI6U=gShNV_I5WbsY86E zATuWDuazb6wNm7l=oOJ95wH!$8O-^>T8C($KLmB&)qDR-BO5#HfeM=cc>SMIv;Of$ zK=6C>C%*<TYP-w%<+jO6*LzldAKA5K+T7ec=YfvBEMWTDw*B*s^$Y(xlz(X=2mA>1 zzljjg-;c$Z0rKZRUk9ImQyo90|KF+U{nxYb?-WAlto@~|3R?{e|I33OjtN57rN#M9 z!NTTgr;+~SA(XDA43JTQ0mF2kx-{*m?o3D>SdOZh_dlPuPQf=#8+g#B89>PiJ&ud@ zk!AtpH40|DNN`M8r3zsC^MmY~dw5`oItaZ=^aLl(=wY03aixT_{PN*3z0Iw=q6ty) zQZ2!+P(ldXzBl_!j4Ip8uLksdY+MB$q+g5twsEA=LzkPIaRj`{Ygyih9f)Gr5<h?b zq`-N)3YsyDOvcB@FLMPht_)^$FWy&U_6~K;7`>}U%5Kv+I?KEB0@0P57TkSFH6H*6 zAQO{B$rSUvpd8yQO%N*Xu+Kf*@0a%AF#>&ghYe`$a>1bwN(0Iea#wC$yd#I4klWlx z^DU{S;-ZlX2D>kBpb(}4_ViBoT4K~^JBIp&#A;4be9B<q;<gt^C_wihu#TL<7uvrd zyQY;4i#Qr8h(4~@4rq;i$KGjj@}tU55@h)MGD&(4*c@|T9xj#zV*A}LEU(S9KkzJh zZjs&-uUxf5TGQgaJUt2Be>fp7-7a12E{{&*bZzj%M$Uya$B=ncPKWUrNbxw%+q3I4 zj{fkDhSk8M<(Qlf&I+#vTd}&oWBVSzO^}j>21836Q;@m!5B62932^7YXgvD#VGi@> zBpRni=grwxJS+~40H~|=YAF)<`1|X*5x)>%de~bYO(IYj9bJ{k{7xe(jX|*guE?J# za=ua56zGn6#~%XoB>L-yaDeB1y0mOEz7$ACocmn|81K9+{=?bCOx_bNf`%53O)Civ zCBkxx6Mac;;h?cL-t!Ct)og9d8SMk-yvjTby!eJ#-i>!K2schpDOt3_1DCo~xYeqJ zJ+c&Y>nG-xiy_2@Z?G(+s09-jPYnj}#RE-RPF~UA1%%`o^tp^b0XYiT1jM5vs)$o8 ze?o0?2g`!@JVY23Dn`?Z$K;>XS^92o3q($GRoamUxBQ?<n~d4aeZlRSQCzP};oV?& zc05Gy^+SYUx%h3Q-}a0$2>>dQf4hlvsya6r0R}pcvJ?6uf-Rh;XX3`$8a>GSMUSjx zmrb9|BQDY#9e0h9N`%Tyrfz?%5fylCFVnd9q<l@1x`S)mcBj*7m#6m#F8wq5d94*e z$A9(D9mY~RMISh7;r1+0Vx<MPx4_*a3H8o<b7>OyIJ5+N|8ONU_jS_=^7{-hcXsLA zM9b#8!|oV`cFRgtspjX)-`G624XWud%;3-TnXtKk4dW-rN3}aw#Hb;BD{Mtrn+IBW zPpxOZrf7uRtj_ed%+-^N0ndJpa()~K_sRu5ty#A2v{4#?25?W0T>wI?xY3{ej)1I9 z2yB_?nF5FMDC(G?O#+Myu;x}yME5Mw$1&d$ZvQ*F)BLu@FR4ow^q16y5SagOr7lG@ z8lrCW!LN^-vdJ>4<37?(4z4`@_F777(Zt@jQJ+6Lh87(G4pS`vPm}v9uO;{Au1a0? zY^=DdKIo^m6%&VZ&cv3ieG~4c)sv1?!lB1q>?zFEbBlm=o_?B7$-D+s=6k@%FJb$3 z&VNY8t^NX-itHPFdl~D&K8_0tpq0n1{@=_1tKJx!?=gs0*@*HmDDIJTg~Orf6Gc;s z6Vd*`&_0$R?D{sg+n;gGv|~wtZp6f;8~ZgbEk-h<h|Z5Z_@Wtw(v-bRZ&g~`L8x@v z#^>L8-85ZvZw>X&B~1$K%rVmo`Hs4D#C@zqzR2ExDwVU1#Fo><h<td3p-_$*!{gqu z_hLrlwEL{PA`p9W^K{Pr6PgmK67b(hOfBbMbBw@yUY*(e1&N>NfL>jK7(pjyGHm+y z((E24bT9Vmm8LE>3PR9RNqM>?Et85P_w=p`Q2^24V7en4)E1kt<Hv;O*qo1)B_ZHp z^R6I|uyql&-{umMi`jqT_%-Td8n;w8AVAd(BtC%!^rxj}P~Ml$C@U+JB`+ZxTU)ig z?cQMC`N*eo(epMk95F4#YK-g1of^j=LF44x{+`2kw$kK;MkAehycp&BF-ziAvVhGi zAsQY}6K>$i`{1tuFFb@n^dHS0xVrcax1`P9a-|WIzt5inx=`su^7KAW$QC@J)o+^R z0}Nzzy9avdGv0JLv<d9mIc*HYXU_>%KLpJ&BFkV<XI`8<n7h|^@;!^CMYJ}sQrbT( z8ZqW|Bj+#GQu}zPmr(9Xp7KJ?1_^MHk%1Pm8AmCr%AfM4daih|q{&L!a4DFWR?CUL z%2ZNy;$1~@5h9z~8xL>xVw+?p-gM@6<sU~Z)_I}ETFD{2Ayp>TB07g4feWWfbJ&vD zyzek}#MX3eS>GAPZ&A){V!bodX2^oqZ6d4d+eI5_fp@HD{J8aim46@nR)YBwtek;V z5-+Wmh+SqoA3UxeS^V+M<jn3!+!s#Gxz}!?>&5m&0i{X`lrL@Grn`D#hgpr0rEQ;< zGSmIG0&wv)ekVx;MeA`8MSliJH5cmNTaMbw0Iy%8L$;x_8GD#*A`Brhn}EFHqYpcN z-|#pVmtifh2>YEx;wzL}QD3!=g@L|B1;N8Jwr)whWnT6agqA!)!g?GQv{4C?rjou= zX#-d+!HS5N;ltOf*1O_9yn#Jx=h4<dwFr@@&uo;me;0zJTA@M^fxQ0UpF&Xo4$R&5 z!SmEWV<m(XbTUm>byY|9EIfZH1hr&DP%|^Xm0?jutqejT|5zGE%Gw#PJwb{oC*7+B zFQqI>GbxsVpA?SV?@Zjuv9QnCl&^AZHIZ3s5~j-IP$_@6f2rMAv>CHBIQTzm`h?^r zpcPcy#9)N1OryL}O%JYafz$i)4ygcyrd9s@3wjLY3317%HmG&|(F6CD#A_S*bZ7CS zw$nDW7`I#%&GEZDynU1Y=bx<yGl~=9$nunXmFu6W+*dmi*~4itj&>NAN#7GCQX!rY zFEVN1_wyd_xu#kwee;P!Eed64*c~=56Sv_En+h2nbA~PI-HHzqz#Gm}Xy;9d(#tH2 zP&AQOlEA1^BnZsk9%s~8&=%%e2c^DmPT*|uuRP^?)^)G!er`fTAj^%_9bBbdKTP}V z?jPV5XjPp%DLHxS%LFGuZgKGw|GPf_C?Iv{ZjAgMb6{}rBp2QHNmEl3c$zPy&fc|p z;UHZn4KusVpx>q41y8PJ#g25cmNaE>Z2v6J`a7mA+z_pX&+!1o^bE0M`gybzDoeT@ ze-byRKB`<eZ=$5*kI?6!B*tHEu$x7*pjvjKI06Ny&%)%pnt|~)$GjR_w~LO`Q)^?J zWKl&V-b%DwiXk2qVX^Zd`)(RW2Xj8PWa9mXH=8I%OuRyrJvYH$airpW@4w;%edZM~ z2)UFfj~oFP+0`WDm5SnKl1llf31(-f%+yk*l+!D4y(9f)^@?}~wR-8XM-EL_m(0OU z#{ph1Sesv7FVc14kizqo)Vq(L#3QbKjp?Ojq}E!sLguk9%ATlXcj|(Y=!0vrG`_)| zj4@n$Z(g96C2HbIy5^5^hfFN$6j_24VXE`0UsTXUD(18+p{>#Bk1i*uJPqkjdw!mQ zM8P<`bG*6fDevH7*xqn1X(l57rkTF*PDH1Sx6vS3z3^&8%d4>ab#pcfk<b`GRoWvO zbF-;KU;5cj{oB0?Ed>AC`9gQNfa4eo=mWcgsvnwjIDS_x%d7b9*YJ{*_WbgGg?4(Q zTjnFRvv;TLIn`8@zTN;hY(T9U%Gv>iAm;z6f>7JUjZT(!0OnAjkp9yh?3Rv&c~Mqn zhz)Qv?GQZ$z^Th>@KrM{UL`ZI1V6cvJ>T0rlL0g7M!DJqJx6Ap4e1nay$ac!c#LJW zSrh~&zVoau!7}LdH7;|cA~RF7kgM5kkche+kA5dto#N#kX8QuQM?QfL9AH}Ckyy#v zYTmCgW%|x3`b87oy=je6I#%ziHSzCyCu&ZzKglZt_B@1|<0~sn7u{mYD;1?@N`~wv zpZ&J@9=mu4^K|dSgfJjHL`6rh-fU%SL)y;A6?AlTRN-pItZ<-Yvc{!FXoLCHEnkht z>iAV0z}otSB0I2=E+L^uRr$JSC#zyJANZNRGfv*;5f|fhmzQMFIo_BUZ&`zi;_@NC zg@yxW)kW`JB{mY>P!Aa{IVj<QI6Q1Xe@<y~1EHlNT_C^G{(HdLzf4RLByPR2)4dIe z*4*kcJs=sZN+rXx2kX64HH)bw@>td(Dpy$4pt;i8qH;s#g~54>UAI<=`*IGV=_gp2 zR~=y)FQux<WSO6fn=6HTNr@2=bfq~7rgG|zPv*ZWPtRsuDIG8BWKZmDTM|b9hhvOo zXTD)hWx6)AdFcG1>BUGwisIFv;^{KxZ+oM8PZZVucVkw;-(GjFt*xQPOHeXa${@V5 z`@&3zx(UD!OS=Ph<&7Qh19ns73GlZzCtXPXkPfUJWCyvopMh@jD2Y|o=;bb`o<!Ms z^`4@#{GlEACpOJ~rj|->rtidOD-}#lZwWiLkX!nLL?+<Q;e(5?AI0zU1s`fLip+oC z`^AyBDod7H3&`iSPnDw!lXc9|<Wa$?)9}+upywRR6uqWuo6NPZQzMY{EC1eeUu(Dv z`L6RH{8Wzx9?;azdfW(eRZ&}%va-t~bIZ-|!*;J=0{!^Mr&kBYzl`0nY0rH+Vz%hs z(I4EMDPH&C26YFPz!Dt3k@OwsK{b<IU}vh;N={uA)4oY{24%}2`OE!Qrm)%q98{5S zS}$JeRJ^>X%Gg|mZnOa7Kkw3pw7vZSZ4%!3-miX~&al##M&shHW(trHxT(~!<tV&z zb2OZp<PKUnr><X*!#XOAaVjR1n`gzEwoFl42gf7}uh1@klK_Yd)0UMY#zqgM764}& zC;#iwpu(65ZMwR5>L}V1m@M%Aub*}ym2lnF>0Q73_Ohw;05C#@;-Ll{?{Amdq3ZL9 z;Epf(G$wS!UD6DyR*|!DdLyjcu#D08tV@7si#Px$6fABw2Gj{<Ee&--b(kw~?9M!w zt~NtK__<T2&%2D+9%WIRki&bRN#=&5ztOIyhziPaaN%u&Y*r+8P;t$CVReTy!;QJh z>OMARo41X)ko;|=H7~J?o5VvYfnUA|CnP0x+VQS;zDM?0kLEjfV4&{B;!$06mTo)n zbwwzp^Icb!s!LM;%oL%i3p_Af>JBY!=E+BwKJq1Ydfu_u&%#2HXWRA+p}H0cs^)wB z4w4E649v7}z+#-6x8kDmjx}BzHMR=b)md7Ys57MzljVLw*W1>g+S44ZK5~5qucRMG z@!a*9k{pK^ci~b-=wI$7EW(cfCQ(~xJ{@fjp7@&-s1Fr@Y+MYll(Qj=9Gqj&g3v-v z3*USmzzSKN5}6_rTe30&bEBWNaXg-M#mieV(FodE-JyKVp^V7C(f26|krOAkp$<Ey z`z#^qhX2)Dl0~vm!w=8Q&gSnep@u5Kb&B^BQWJThDQfDu@ZO&+-}T_N^uaqRX(<_^ zpv~s4;n!~HO>MBMA2_Y1OrZpQi*UB2ezTPJTX%kQ8!!-2p?iBWpJNG-&vh4hum24j z1RiJ<BL_+Xkwy=v$u^$APZt%|dl9R<ho1o@@JuwSBu*EZ*#?8}U5%Yev)E!#01{8y zlffEZ6jXFG5057X!|EydTm+X&_9QtUEET=rfKV#xPpZX|-VR)h%xeQwFeqMWfVWAQ zY{87t0n?Rj&xqMi3_&o1KDiIy_f1|SoP9on$eT8Fkvw0`J>A&c0*5CLvkzT<*N9%D z>iRLAJhH7y8*ggvpPzdHOiFJjXOBnUaXBB+Mb(h;fz?~|q^<^TzV%eXe=mL%9_(yn zYbxGN(<~TzA^w!uMhIbTYnyyLNNifraL80lcG8EAHs!lsb+4yCZ<ouby6r<k3DvBk zCLCqYtcOI~Q}m16iW34m_t!*{)d)_In<)`iH2tNhfMBzMf))v1P|b7l*Lg_sQ;aqY zQ;&vs`>IL87uV-`Kw-SxGSp#q9`O!6Jf(vM-LK_6Oo^O1N3tY-dl(BvK;d^I-b+D0 ze!K!fH?;unjnl%y0@|DKxWgFZ=*wA5+cWb`VT6!gjHgDK0lT<=<KI5?lwUUg_xQIR z`k%%R+bg@$_bnsz2zM~SQf9}z4LSann<w&=dxl2RWpaR{<=A^n??`%~<P6OFZ8+OG zzh){jPF$Y&b<BZ77!^rIr+gLSchbH3&<+$^HOz>Ja(3#dl?1CRu-sT25eg-t^UGls z7O$ocI&ZjXeJC^kbkl_UDk2zK-Ip&+r95~bDMvP_YRJfUIK8HBk}B;v!M2LZE)rC` zPm^v;vgi1Ln%ttYz;D|vvNX<k*#1aT4{o<_GASdW^wol}PksPTV0br&Fxhpl`kqn! z6|jJ}j7`d=imX&JI3$y5^&2WiBbC`6Vn8WY|Hs6!&p=OaO!SB<&%XFqoh7(mnr?S~ zT&2u$vE;DZ_$@=Xu36~}(p5<rCc9*P%h31lJJ2eviwN+((Z4JfR*fbI08lPn`I#^j zx$`8tqi^N$Zy!U|{PYiJ$+xoZlO;UOl#NiJ9ZiMe{x$w@S6W(nu7`mvEUaM%oV}I{ zv)Bcq$FW5Sl3<bqyeby;nTDfc|KMO9Fax!0s^(R~4`%EDRBY^tWB{gzKJh=Gxzf_w zxPZaqx3vuLEl@WG4)>q0|HmWb{&~26;O+A4xHj`Yf5Pwtio(CYVE>oO%B?0^zlgiz zVihTb4eQP2Z9ZcTUefIxVHcx>9vKEHlWk2L27LDdZtaC(iaB+asFoM8(%R{Rd!b)s zKFY9<>4x&UDgOPr&EI}#65=dD9<J7bp4vV+(NoO36LJU#fT=%s821L|$SG0iw8_ZG zczoQ2zTQRtzz#6)pvB`|ear(%fKPRPyJ`eNF}r@vCK#)o-(BqB9nCU?2<6+eNd)JE z@n@L4!|^gGbWha^tHza)O+}Yfy0Id*HximSKMMkr+%=7GqSu%*BeaP9$pgXDkq6Bk z^mq#!yrK9+yTEcO$MyN&1FmHml{}}~a)j)MA7HLyW9thQJ*V_pfg}IQ(rD*1$H~7s znkz-mz#w60NVep6YyYarSq7e`{}KF+zW3GPR3q(tYu=cZ4-5)BKra%Rj;ahWBoXsD z$j2!JEDAq<l(WI5v@XHn{2wrL9%7h-I`V8qLy5VcCZE=Iyu0YSsr~dPn6AvZzHHM) zTe97btV?SrmCwrHZ%X3Wp}Q0!eZP1xfO^L7>FHry?_l%4Q2^P6puG5ed)T67+^N9U z8ti{R<KOf1=O;a?xF>*G=LGZ#*)z@tjC1{26Q3C@1M?LSUIXQzGB&psxXL$T7C)KV z5SU_`gjN}+8$K!Nk;wGryQw9+O*VzHSK<HTu3OxHvpseJP=^t#+8+crx3-)Pe+WDd zlDGq$Dl_c{=_rEy9>+OPZ9d#SZ1T0Mr4oFCx_TIu&Q4EjpPGKq5Lcy*Sal`|=&_SB zkV6-q^7Ilg(2q<ZKai-iB;aDqmBcK~n3~uA`!YelTd4lS`gC9D2-slqs;e;oDi0%9 zAPTqqvpVV@{*e2VeI&izTU^d}t77*>kYH%L|DzCXBVR4R9N7&RztPZl?PyOZ1HT$0 z3g1uYOtyW;q9$ra?B+lbhgw9#>mBNe4GdAH@L<LsA?)doRw;MFSGE7LPc24s$RVfM z3>fo7E@S1b5=LEua<}#a!CxXix7j3PyW+mDPO10pHp~+vH2y$t2_!BYPDE&P<PA(j zCOxeyCUR0Hb5h>AsH)AaB@H@sPMHMpP%r8xcq->fkr_>fL+yrMO}$|sZSXT(ajSJ- z-#%9h4vOcWnuyNbnX1@61*_@fKrxNYcqCTVr4p%%5|wSy6#N|T4jVLdAe_H|a83L_ zhpI_!Um7VIK1<WvbDE`{nA|f5ro=kS)xB*A^@&7J$J%^Y3nx;IR*+-%_+WfFi5TZt zcymLYmuGp^r$6rRnhJI3l)&PrXfXJJf5r{JG~(qh4flqeyPVj#X3?(EFVfw!R||}K zzI`fhg*XpJPVVhY#afw(WF1d&yqZH_8tIoilr9rXn#Us!4<!0d`OW~KxN8KJr%o!j z8zQX|#8%S&cvp>shJkt4&j-xlIXp`d7p1~S3Rpxneu`{jT%}yYRJ7u+xVup2W%;f> zsE>%E>xGnC9k{KAX}MJb+yxLo;n^Spw)4Mg@V5#y-0=SHh+u5@sHp{u@>`Szl7prk z|5<Ucx1a4u-q3=0d!Ls7Zl~nHGF;Prw>aOtvi*5Zj0h9269BHuEo?*3GUwIl0reaT zPHk%BAG=;qpYYE584So3BKPevfp#c0pKG4S>jE6U^83c$=#N&&{9+PBfDg;tgq@(e zzP_IE9UyM&FyjGTdn&$5E$(bZp8b<+++cm8RZ?Wir`UF`q}wN&)GbXo&@C^MpHX!} zhi>6hjh~Uu_L_9iXoX1$QGyRgJ2J_2lBlxZ-r**``ubm^6=)H$P}f2?#4CTOkPj`& zKgZrRcYOD{Hn;S!y1@@uDJDZsr;^}QO}!+-MekTz`;3E!f&gvU*n&1pwfj*W2zI#A zuwJ`@$37GZ&s)d~=&AYuXIyGn?`-Qy-TZ}hjA$;m5aXoDMEmXbAnj<ZImVW8UDv@` zF3*WDoi73U04|)J98tGcp_+YYL=h$rmoKB!YmNx>i`yC*wj~-3lNPs1PJYU^cK(rZ zARn}_1ltT(IL}{z=_g1A<D)$Wip1~`CbrrE)>j|iUL3B25wNGt?R(6Ov5^Vm5Kw10 z!2d6w(_-eW_x5#M0CjjAcz}Iprjb?Dvwy?@Na@?jd!W3&HbWb0F7v()x$O|4Mk~sr zFzRuA^U@I4GxqR+PnIvTJhDDdef`WIMUmwzw>vsH_6ea^EA?9hHJYV!i$f8s(t9iX z`$c;olw$s(<S($Du&Rr0i=S_}0(~UgAkwm>{6p`6!|r>@ai??hi&aivJo8zEkKbUu zZ+F`foo`QjSv}$z-+D8~Hs*~PR)PyIUww$YmTd6!B%N2E_wjaRIDDLpFY3-R&{HQs z^t9AYt)p7vRjtxp#aX!Rx{ui3lUuzniLQzi0;xRkv{?imRoJIS0-0UV2NBSPOG!s3 zm)H)Buog;K9JEF-yRh(=@B(7gU%lBCI$w8UXgv@%-etoiMOd7>@#O&MqXtEkXo?(J z?C<m?&$&u<)nhr!UWHSzk7v^c1>tVsI)AnJhY}ze{@*D9(ScPCCThgz<1BL8*;6sZ z=;70Giv4vZxX+fS!fA1ZF?*#O;bM7t^P8G5hnu}T=w8bQ5pF1vI+l-xOpiOK<WnkM z>#eF@tcjQT%MxR-mP%^yS|qRwj*huJ#uG>)BayHyU$i-J3=<W4rZQpNfvL^((yLoI zqzKf&G0V83$Th6v`$=^&1cM~hK^=DoJcea!))clk_cXE?JCZW0<dY!MuB$qX+(1(T zh+CW|V5rjR3!3sALbUSaly`2LI6HF|?!kCSoAtrlO<=0JadhRi-XhErZ(LX7<}J!7 zY9di0jXCe2pd}uNL<t+Z)}Ckc^R>{N<f|YP9v0UvBPmX*NYjCw&hL&fR4O$De0v#L z*d4GnVaZPHUC2M~G7FU{ZWK9k>nEv7KM`Mmz;9`)P_)*_(g{Ul<_j@{e_A9-YWDjl z+D{i0;B2f}JORjdyQ7sOW4m&yd&X;oNsjjSEb|v-J?Is5a^0<DObR-B;Hk!ivE`4) z-Zi(hRFxbj{NRsXpNFz#QtKt6a0@n0k2->z@h6)E^j2p!yCu}Luxoi3l+QtrXuFq( zX~!VzR~bIM*M;?u2*);Kf)S_OcCix4JZvJnaiz6LCk2RQ40!WT#%9lSU+Gr}`HGYM zy)qudV;854*7@3z$fP~l4%DkZe<lDtxQrf9DZgvP?~>~RFRvb0E?peGv0x|CnhuLj zCZTC#&-_iS2$oJvvvb|GU)haTXZRa~S7x%#19hzsP2sfL8}WE(zSM_}e1-I@LsRdW z;Cg6L30#qxLq0&gbx=e#=`gOzm9E$+%`8?GBj}V56?)clO|^*+@~f-7A#*`jro;)S zVvbo{sGC!>fEz+YFBN2<=l`s{3sFq$&}BfZk#>#F6xUaO3Wm>kL;N*?M1X5nRkvL> zSkeW-PX&8^&H7B{_UhbBohJ_IJ??@(Pur(&XsH3@aSYdb$}~zF)%+rl-9tqmSu@H2 zAUY;!`9bqcN9|?yWN9E=U;Q~!O6qxm(q6WJz}NXF?&_J>7jM4>@mMEJhDG=Y&@*|Z z@W*~C5yMl?cThh{zIle!fp2Yh`S7h?ELlKJ_mkICK%<~+D$9^vc*omsQ>|rMQHhmx zoL3`Y!iZL5G-D+WkNQ;)<(BByJ`3(*zK4=~JWdrd4m+G>6`-;=N?%&6@_7V1o1w3} ziiW9#4O>J$?D2}ql_KW7bFr-^i9(goO%zH@UYQE_=3O4|HFH+#iJbAv-CE-4!$fNe zydv+F89{>6k3u?b1kw<};)|-lpqd@nTI=+Yyov@1*n=a9g@M*;{^+cS=VO9_B^bIM z!3^sn_EvkuJ$CANI45=lyI*xhSm}>qB<;=hqpXTqf_zG);kq0L1;gS;@>ruv*L78s zSo_&5Cj8@n<KS8JLcJ&A@1;V~Ryz>MyGh-D<ig?=78N-?+<D#|x&vVv%^Vr_WkHK? zmb=HJx~<EAD2vRVF;;$kM35aKpy}OyvC`v841}?m7|8em^`Ch31O5{mpPtuUHJ`@1 zZTMf*cPs$_pXY2neefK+hq^rNw|99&ov=}|G-#%ztRpkawb|0+{3CdoNA6v^+L3bU z-XAv!jgr5i#8VnFt>wGf>uRXKm%NClR75W-tC&cc>g_XODIb5S{#b5t`+0?;+L_rr z(+>NyLfd|M(NeqloVPS9eI+ig?tV`+c7;*<RWjO5Ysjhfno)IL*u-7eR@dahzOS{( zhf$>6+Fx$ym-ZicR963p1!3S_#wWFL;h%OE_1cBIGuqk<clYtu{;Va8ns8Z9l&F2R zQ>Ostp3HnDR;sxFg0)CwUqnyttRLP_hb#NTG|mboj-Z-){Khbi69&`M_@%;FF^xaq zdCE|D-k$&Jj)r{36B=6X>G*NB{FKwHa>DbEnav47C*SbSDTJh)5eJ{fZ>uuJQjN9O z-qFt=)>)O=S5w_D!zsq>=<<Bz8s3kRIk_8$JiLBSS}@;*T4%OX`{cWssUdoQO;SZ% z(`(y*T;0tcK<QfY%riJ2fAk1){#;r@bBpxi$iRKEpz!U7pRb0*?srs9ru7{pEEL07 zoEK&<6Hsd;=9ts3OcYyLpcay@7ewc~)bt5K^nU>Klw@iW3GrSWjmoZ3<(6>6iL|KU z4A!Wv3FjNS%g(+s^k^+ht`+tjohU{fFN~;EOFgmR+jwUAX|`6<Gwp?y=;CoTckGTa z_+1!K0-R4D-NY(?eZ<$PrdN!xOcj86ZrN(mIKH#x<o1%7xgJW>Bl<<tLmy7b{`y&O zAxrW0ZI+tD<9yUg?)&aNmY``Z6rKFCPgRLBPGY6F0(@<H-!giNQHy2qFm(3TWVf_o zsj!U5R6Gi288euI8qD2r${3MNg+0kWeC{{ht&@GFVM8MuNLn_yX!q+@>xck7kd;qX zGdOswRMY$g`@5On1@)&f>mqqI=QG~$m&I5PVXNr;y~oZQ;($)lZjT8)D2m?lyC0IU zzWV$DCyb(q<%5P;zctyL;79KVE+ww-AC#C4Kc7QsV+ws9*Zf{Brf(Oa5{&X$p|9dE zfF2DF6rg8BZy??NKwIDOGGMlT5$XkT^KfyqLqy1|3Xms=^9YvH^qEAc<x<xuE-2}P zm4pF({Q6iyE$->cbA$4QOl_*>FkN3)I>PlT_o9?@lUE9jFbf<aDLp!|oIIA&1QWL3 z;hb@mE;HVznJj5WYz9bN0|m)TFgyQfl=D3hvY>M$+~@_d3;Oo4AsYu*w^0B-e0w>a zNOh_3%j`L~8go^Y1oB!cC)Q{oY&BVk#>l3su0~$b0C`s$hf3;vP4iG&*q`IL;e=jq z8BH{j6UShv7kenItIwN5cr*yFh*a)HRWFFpxPg|Ou1$ycMW`cgHp6dgFaXy^iAtDr z40M*2nFA4agM))$KBmiqg`$T<LR@G<9;hu{1|MImx~EscdHxzWrCP5h!j~G%s)^po z8)E=282;9=6*HQs$hU7(um^j-M+N`G{_*tUrPW{VkL~;vfTDNA%6s^FY411v#w)Rn zmD+}}J__c^h^dPnZbWu0$P8f6HJ1ouC2dC2UdSgEA)-j*ODzlu*E||yNdzsw9+u0M z5i-06F<cx)cwYCy?h2y5FK{I2nI7gWe#N+Yc3kAo@K9Q6SE{*%jW$ey!_h&7h+FX& zSMNcW$4t6ZX-O>ga?8q&TWmX&+5jT2(=e%Z8qHWNkMJa{vQ`Ay%bzz)P!rxdK{w}F ziH<lu&$FH#N=4fpURAqf%%@Y;3!44d7DXWqbFtd{ItGU{zd(B6nIApX4?p_zNPY0k zX;revsTjfLczSK~K}lvWPf%k12*HsX=W$iu@80%*jJ=3-k@Tj-Rzb)<ymqSn+us+* zMZ*;6n*iiRwE#p;1t8MJ5cl1$^pD%CBkcfWWMu7i+@(yue<ur(HxntC$l~O3uo3Bl zwMULJaf>)UMbmcbZHhbj64ocL6~%o|UW22oP$4)~_>h8W2s90Ly|w$EJ4yot+8m>z zt$%7n3cWx%(vAd@3;{A-j_YPQ`U%I)3BypCnnYxA`#D#fWw%Z~Vq|}SLHo<3nw{&r zeY~;Z68oHlseDZysmFDeFI9r8XR8qF2<(a-lRDH2H$Fazp_}aCSr@lY^^p?`J4v$O z-@`&cw<VV`>r;Jsl&yGsc0KvUN~uFV%FZp(RIUV1@dE*Wd`XS2Js3fXlF?vCdHhKq zW;$Lm7gsclR+1H#D9a+k&@(j68Iphqm9WR`AA1s*g|w2>E#FZ(F~()mK3u->_?+p5 zXWp-)0ds)K8)+}r89Wdn$$~-Wf<S6e#4egWn;peos@#N>UZQZ#QTFCBwq2ric8bso z1o|w^)Fgzl1-)mLZ@41VCOp*#N4aMsr%RO{;s73{Q&rZ@&TBrRhzsYx=cr~IsE_K% zAL0!S(X-h_D4U7^93~=UpD2o4KkUR@0kR3uRt^v<wUmG1K^8)jsPPD1;{{2erwJ;X z(MgHY0wPscI8>yX6gtr*cgea$td~&HV94l0-wR^-@9ZT5YZ;q+9Gm&2-;lF~RZchr z*X2}<OtZim$0`F9=x`A>LSsAh3WRr@e?sh5MiqEzZYAVIG=-%-u)1^!W<^A}OBy8v z(wYtE75JZ<J%?-7k1dus+#aF_kGG*^U<^55^D|EN!bF*iSo+hNp7m_yj;hsu>-aKc z{v%uECf7BQYSPWEGj8_D$8FnC+nD@?x}B`RFE;2u);uZUbU(sca`GH?S&3)0ZjW4| zd6b@E?{c9}WsyzpX?RDWUKD%}V?QDe0wZZq?vm=UOL=(7pXV^o2Q>f4;25&SB%yb$ z&-Yr7J3JsvpMjHov1(PdWNhq<m?cB_aU>xItd6USkwr2*;39ESPAJP%iiI$C_A7)a zM^}V>rlz1dqi=LJsyS9^gJoO9@ELX@%{Qj<z_M0SrO=DOa)BtpP!!b!#cDFA?jmEo znN>mlNgvff=;oP@7q?K|DAr8IYcbWnTBr>48&Rj(23m05f4D)KcKV|}rwXZW0E~)v z;F<PmvG9nwIz;zHS9~D3=Rw>zX+pIB9ek?DD%5?vF_;Wp0P^_4nCB5xF0oDy2$24P zXEEy%Ag%3ya$+V+B;<a9{RWBPUi>Rv;=4{F&5w=u?LhK`Vh$I>0SHs;pw)_D22o}5 zQKf_egcP@ZLtk9WOhA#V%eIJ&&H8<n0<m;*=Px(PMfw9_nO$Fwenyav(ta1Gt-Rvv z-q<(p=)D?yvTXtL2fZ9~Zq3&YVfUc%Dc8+YFlCuSgskL~_f%m6lVE2XSS|WXYuwum z?euN5{HZNjna*v!JCb;WUQ3RQj|KTU^(x8y#{0~mx04GJPh)diYRnEwFiz7)7c4`Q zge3OK38Z}${K572sEcdY;UlSu>on6xojP<G222M!zalH1yW|2vk_ECaH1m8%QBQa* zLa;Tiwj!JNF<l8;FrF*t=T%V!e(=ar0^hQ;3ueE!M&LXe>Fw&1As;V%Ggh8q`Gr*D zN?|+Q`PPv=48A6oa)c<`T}*g7x;JL*r|n=hsxd&j_ju@LRcR5G*e^dI!!4R++!ZS^ zqb)fkQ6ykTGaEXi7aW&X>7Ms45HYhSfmR^vSwB29)m1dVx`-O@9=4qFLy7|8<oGX` zu_R3mOx*}TYgzqd)Ff*+`%xm<*p+H&q?Iz`tDGKq=1T}QoD322^1@wIYs&1p#-Qz1 ztx2=8>#?6%<L}-$Ej<@`TVQ76tE5LDRaA$3lBG-gfZ$Sohbr&uCqspqqG&53^oeD< zU_gFF!pv^eNXH;K&!I80Ewe{V=9KVAU@j!$+C+-LNx;c8U#Gf@EW@sB6plD}^vSDX z>{<3;=1X^d{6DDv4}Wh-!YUDf+_0dbl;Z)Wsuh6L(3Ey4VWIp%7yETi=O9~qRQCP8 zB@<-Cd*JII$x>*>qZ2NP&`e1brSH9n@ACq<bUhb%=BQ*B(pE{4sLFd2e&(qES0rF- z2irtXESiO@G<`S;b0o_c&{JH(b?iEwUn!vE7+B9AgB`8xf~G=2&#KxYZSOBFnUYE% z+c?-Nm_r>vG|9v$88-zR^uux}bQ(MfG}=DOciOm{<S@k=KncmXeq=Lr(`Lah6v}}) zx!FF`fNjqjgMaMa1u}FD<UZ>98P&$h<r4+Ca45d5(`CjQveG0C+Rn9kW)Px^ACc|~ z(2&b8^>K9BFv-~~kb8;D$<JhY`U5&ffGm^%_p{B$@}9(8JGBEq^dVj~i@;lyZPVpd z>3kRG=ZA0KPLC}_pp#E+=vbqlC(`e^fS-I<_e0H|$xDf!A0fN1=?!4YnJ32(k;Vr~ zIEb4tbAARE7EZ<R6-$_pUyH|GXXqp&uq4Xig>Su8kks$4QqzA)%8CqBZ3&EPbwGaB z9K~SrGf<wN7C>Jg5xNmv!y1g1tuYV$##-+J)@oIlcjIKIdgR}TJgk;TZbGVGuHdv; z^dov_LGRvx0COaMlNs<7trL)>jb~e8J|01#V6Yz1>qYEYKAm0erx->#w<pP<Kt(Zr zE!(c&19>30<lz6i|9;!1Wfjm4$1W(7Bq#-lzg{qtE4BJo58^z{#UydhlIObiK<!>G zSB6-$bF@EYRf)fR>B;@b$R0W5{K)M+>Jqq}Rm<J9TDR~z*7%o%S}rFt#?vSvOZxY- zl4>3YDq_B%UY?3z<Y||BtkJcz6xGIywxCd7f0WB{Uf@~h@8pL=cL#HUP(Q>7EUM1x zeG`wNE!PtD;jtY^e=n7!rEN_CKa3jIul|j47IlUhY7MyU&t!<1XHT6z=@_ZdY;80y z)VrK?oE?`*&SQE4Ash>NBiZDg@>{MS&42d^Z3{vp!l+h(_}i|oE>l9u<T@PZApziN zD%Z#GN@W#kJ;;(HpEj(q)2|bnV0rA-YO`~JYU)v}l)VJFSQbUn(~~nBa$puqvr)Rl zR;G7}OcXuz9RtVyalm`f1CBFhCjv_7-LTSK5{fA9opV2ecJ^32J8wj}g@ibSIf7Ja zo(9cD<mFL;bXeAY_B5$PdyMHVM{#qBk2Vl~$Onh-(_;q1QXe<)<{g{|K8XBX)5658 zF#pSY^!sn28nE&Ibq)BhsID-#RsbJ%!9$f-;cf5t@~=jG=;h6```^%*|I@#(&%wu6 z^ovYrZy+HN0Qji>c>VHk{XP(+h5nt{=s!>kZJj&zuDXt{B0$W}o;?l`%NG_G+P_Vc zP}>;5toxNt=HLOW>uyg%{jWnmA2cjDZVcdlf%X9capCO-`h~Y+Z|MGW3i-!FfX{fc zoGt6UtcGJH^Bf9B8;bPvF<T*F-7|Obop)cBTfMH!_ZV#^ZxZmLOsa9QCfoA+**6;N z=cG};`ll(fQm_5a0rHNn?F1Q=wf)OW3BM_uKFV8+uP*zG{P^;(HU(*YZPgEl5Y9h4 z?VAM_kN-$h1=gda8yg$Y_{3mzK=TDicF}A?6Zc`;f^}cYVIwA~L^t<^o-D+*f7LL$ zL3vTnvfca^U-Y2|5^kAw?cnj59f-~tkT?uzIXSk>xPH}S=z=|`edk011i1ay$L5w! z?A2|6fb#=TZ0T89djYIQ#IKH_IeFk*O%s&qtqRRWhhXI!O7b<Yg}li)_f*X+!hZ$- z)-nblc9gJHvaJ$}wH3oNl7O*=)g8uo^Y;1;h3`HC*3RWZQ5GXF!Vz#=1l=noD~v%i zdzDrF<?QaE0zNIFCB-DxNZa97L~_gaXMfK(c?P>7XsS?_;4yfw$_&`-0?<P#;O2ua z*Y6iV=FQ~xGQVZ4Z`s7?Oz^0~6)hsv6~KOPond6(fMR(JGFm?Q3L3Laz1(h&yXC+q zYXW+>Ki`dut%b9R1sz4*Gm0j5jrVAu+yMxJ>(k{`TWqh@?^M^En@Isu=sq9k#C|(V zR@(D_WFPuzK#7lPIyzxJJu=X7#dvUQ0kC>2y8h=1E&%ymrr~V<LQu*A`-g?uC^Psk z2XhOtSqvWcR6>UhUi&lYE-r!tTd9#b_zO?m-!t38S}~%D{#yyxt?rABM>DaS2_`NE zs!2KEoi3UwZbw;+GopXEov=C*dMYqs+bnQnc6LF1ov|IXJn<BJ@sfhfx_Ui#Eoin# zg{}I_Il`u&^HU>YetdFf6;Rb3m&cukIX(Y}$V6SFpXXTG7}tl%C+E7Y^xq6;MNjC- zO1{V);Me)wP!;;08~E&nvY9<+iwyt&8G`>?48iZ7(E0iw^J&0cyW*dNQocEti+<Gg z&7aPx_ZaVy8k*70Jxb#iUp<AgQ*hhabOu(KHQqCv%6P`<MGh;QSZM_Z!`x&Ux(G07 z0ujDMTJ4tX_#KCbvbN33%#{+B4)|%YbM-5an_}lx(3NNZP;LYNRBqcASTbbg;t_)a z!ivR_8PmMS7F7ew(iBXN<kTEh^;_9*zchT5M|1JJU^_m!MK@hOCH{<&(f8v$UtD|( zxs2Qctcs^7YDFUrQ|a4vhMDZ*jt3IlgdDat4dr3`*&=eTIRnSf?XXuxqMuNs`mSJ{ zyV217c9DcP9$wF{+YkC7i)J~th4=YfkI|jHzpej{weix2Y(%(VCX&Q8Cev1#6%FSB zNp#^jr@<tz6@B&OlJ0mewtpp<@1ofUP9aYe?cNFX$3g7sYAd*5yu*w>t^;Y!&cg4s zmE|!VO@AvYuT!OwZ!H4)0F3kfJjMLT%X@;h>+o*47c+UN(wU^5%r_*U`0m_W2=R}+ z*b*E0^(OMRs6o?~yjUOgyDQqeRP5~A1Ty9i`9|r@{Bv(Y0cPBy$ImzR6Vgq$=<80n z896gO0qP|8QP@Tw0A2T+snKeeqh{$8|AFXeAZrqvL3f7L8FKPlC>fT-72xL|vic70 zgC|CWqhPft1^ACw^NY3q8OI8cl^Fn>I{_KlQulZ?!XL~LAQVXsTQ~?t+W6mjuM)<% zOFogApW1t+_LzJUQ$j#w8ekd<3+Y{{Xv}YDzyrm+Q7m4r&*@alZ_rbVT0fLc7`P5R z#__2@o81s~t`S-xLb6G(uryIaE*)i&t4r5jOKWBfVA$F3$wiD=jm#pN{rTv2BYPcj z8Qt2bM<lF|Tqpwe<lgyMz~ydgc};;d)9MyLJ=GLF$P~<s)R6Vyi$WxPy%(2M*5asd z7}-q@hqye3T>n7U^5m|5t6I|+n`~54J@uq}s8@|CZ43W;)#G>K3;5RWuJecphFOFo zMy7QqFLmR+*~m(;wpz}g`W;Ui+4lLYk#kh2OYQdsWnUN1GanwRblq=<PU@e1zT*t( z7DYwc0-wA0VS23FgLa<&e-Zyj(PPZrY5c+A%Ax*$1@7mP`Y*Vji%vzVottJE2-h6+ zOjRlt2n)-6DN`nGd3Vh1N+C)NY_`C?^&R#=T$nJq4+tA~7g35}$1&234gsIp)Q^MX z+!*ytWScBQk{(M&hoq&^QV(KE{Vz`!2G|aVm@BMVxOmFEL*h)(K9Pl!y(fGc@cLvo zT6cZLi5FO%pSC@H46h}!eH1?k>C`4KllT@u!fbHO(6)HuDxA%UkacSmn<pLffvr8z zGW&&JkpIqddl^D`0o)a7j}+iEvkSP^U46>hnqu)ZfY1MZlhy<|iPQny?bLh$`Bg5L zHBmt0u_Od&&u3F`Ry}@4%6kyG-*m^>b{56o+rF3RxB>68W$92nl@WAB!9m_RrXunw zkhl8$txwqj;T=Uo>?vNMzYCTTamu*Z-r+3`S?xgPQg_osLbKnQr||vA{KY0tQZ8@O zq%p+M2{ew&Y^_z{`8B-gVfAraYP}D<k%u@$bm~+_81h}&hecGYr|fz-)<`P|!v7&Q zzf`d~#J*ZMb}MVAd*Z~*P{Md6fsE!OQ%o`~^?R(&(OIT7y*EJz*w(Pf>i5U#+uIO- zes_+hI-{&(6CHzee!Vx~6=VUePItq&Ac)>^_|R93Ys(52wmle_Chz5{heR0hm{M=8 zci&F;-)@umXfeI~3A#DHgKughe@3pqHy@ng3m62Yu7iYnoNq;2#q9Q*s{B>%9@2I2 zNG-v)%U$T_r>GkdP+-!=rEmJc^WWR07rs7%S08Se>Uh)WU}`O!{mV1D!yMz*F(+7T zF2tUkKer__kw!g@kfKz0E#53qUd3lDvO^p?pl@8enj(d}Qwk)D6{<gpxn(bzR)^}S z66zTN?Cr(s^p9kzvCJ6IlDDKXUpQj<ZfU8>{wrM!Fk;)m!p9TRN_~0RE$5pShMFS1 zQL#_E>m0N={XJvVw#S0*6Mr^FiYa|<6?uv&#td!I;HYSr>xnL;o=o8C{?#!R>kjpZ zGwc14iy!t##Z!VuF?fTG?LE953@FcHw;1vL@Wz*hhCw+rP6HwM{sG9lR}Ni4vA*z! z&7qF;uCxJ~<Sp97=Y7J%zI;yXe49_Rd{4B&InB=)jE!%XzMdKRBaF1=`A-_?jI#;S z(U}-u=X=PT6Fg#Vy>8W#AhoUWr7;=|aojN%zU9(N*xwgsEx|>8Dw_B5<)=0nNLFiq z;#NX^SnbvJGM%pM%B{+}K3ieNwz++2APs=>V7<F0^bukhl>);L!(ZeC_*!oojI!L1 zR>2ZFBa;W3<@+_nY_Zt{=v%Wyy6vfy#4BiAU+Vh$CWe}5z%UG^0Lcw65qBtpcOvJN zlD&_Yc#5j~@5NbBYKD{JBhjrGczE4_dt%R_J!%9pwY<7RUSK=u;(QE~&!6@14WJ>e z{<iI~LgWw+sO0*85v9+e%5SX6eKpR-b?1iSvLp^d^3&!y%F8e}d7|X3YeBO3t%9U2 z_9FbE#;A=!Yewz|;>_z9Ll>3>V^4v5m~{ypZwGxkvo1FF^EDYY75DYrksk%g6=qfN z=zjYX*FV;c6yF3PPKQgs;8W^MWKw;OG2X1io9>)LwMu}bP@xq||E(1jexB&J62jtZ zU^o53{FdVG-=vk%Cz@HTB6(zf-+r#7kAW}4j}?w?C)eYpqhj@8i3;3jF?ETc51#>E zsa;P|YJE=*I4L2~7)lsO)L5~{VG*%=UnnyvsDATfMm6)6-+Xk9SW8nrZy*htqCgW` zm$Nln7~m!<$y=MJLYkqi(t^|rRILfo(M=h@eRHBFTziSU+dt=y0Y81mJ@`-`fI2=N zNq17veuvd|a{v7C>rziOTK}S-{n=gjLy+KGvvdM^We{7^w-x(s-AniEANSU~YOIJG z8_#a9_|7E&o8oJ`E|5*oMu96F2dj_&Q?9&tQjZ*3lYxk-2+_;OS)RQ?ePVBM(3kz) zory_i!(CwhXY4(-8dkL50enJXFi$`I6<5aGhxisMUMKRak|Lp0im8%fBdxFfAldA8 zcDmnw{Qb|EvXbwJKuj5Z!Vy^Rx12Hr4Y228WORCJ3WbJRFq@&KD<_{j=IRBbh}ysS zdNcNA`|NASCx$LONuA6wctmHNb6>oOqBY|jJ3;m=f)Zx~SI3>@B=<jJ5ycWkBLnNt z$HjIX_NqX4s99N~e9EVIhS$01nVeH!_7ougmk)>yHT%QpKJ8Nnrm^Y!VtI?-o%JVY zu~0ZflsxTh3JYZAE&>Y>m=JVMT48W0c4ed~VkHq?Z-!%wXY}ObVFut^$5k&egOG|1 zg7xeeX65@?nZ$L_so^EGqEy%ETsNN&zav67cUL=Pbz4Y)e6U9!T)Y@=y81}P5Rpg! zLQCCO?D(Kr_)GHD(%a!yqM@6`<qomi8DftdrF-L>_IuHXhT7=Ot@#AFnf5R?CV1Do z>EwDvSh2oX$Sd6vsv?2U{A_E9hnuli#oTF-G5_*@KUM!!T{S+D490aCm;2#m)rjFK zjah^OX0lkn)G{t5$@fMN`gc2(vuiz7tBVjlrZU&{qm?5_rUU&Jq^=e64q|>8TejzS z|GAvQ@`S<76t}OqQPX_8_+;Di`e%IXaXxy_>9-Lyt``}}Dm^DZYr27-2r_>QD0f)` z?y`tzPreLgOYBH;g?Ul+vRl&eE>Y4lqT;M`woHE2#k3ZkMKuk$6nob5m<8jw6Qm~6 z@+GZ^1*$|XY9^P=mnaOjq34&nk3;tmStoZhQ>5&k#Vla5Aq>1#e+A!~@}!TQ%PvG2 zA+-GQD(Yg-^Aq}m6NU1JB63E!_KRBjyU-z(1b?IbhE;p>17^Q~On-l3uD8UyI50Cx z)tVOY*Jr*JU$7lwr}nUox|bg^t4bV>EZbr~tG_%*WV^7oeFm`q+!p}$pO8n+u+zKB z<p<yM;xalf2wUCm%4u>t+7@a-G178J`@(%w?d5=edu;m*#h{G7u)Y0p4+Oc*K1t3y z7_ntpZII}?E|JBDX1H>%5kkx|C>5Pswa#?9EVta(o_@=BJ^a9yu=Y{A(pH1DUZy1b zOIX(OO@q2~Zre5Q!-Lp^|Em9kKSb<AuHrS*@7xLGjz{ob&gU=9bLRagTuk7m^lMOG z|BNU>50G#z=BdN%N~)bE6AH&kNCl(%I;x<GN3)D}?WRdhE~DoIbiV|i(Vh4H<><6Q zXuV{Jw5=}>A{8pl9(T+N_c9~oq{wh`B0<K{SY6zrZ{3gEI6ruCM|R3Vvh9TdzA;-{ zcsnF^xvPcGW+}%1rp&{AAN^QvohN9#{eso+sIk4Y)!Jw$vieTjXky^)^>#ZwQ)ws! zZ&|HY;Fa9Wcd@TxB%E3qg9_LB5Q;~ZjU;Xl0!!_;4y8+lDz*+@+VHwQC&Z5M50Bc5 zP#haI@F2Sn==H`yFn4OlM=J-(iEP|#9blu@P=6hLI>>{Vsa)Y!`%?JwZN3<A9V?P2 zPd~Dy9oyF!9h0Nj!k1<i2+jNP9XCFViS?2L28(><)`o8rP|%;4%U3Fu6-)mBv3oK9 zk|aK=VTiBO!%WMqv2{ZKYBQ!tyYJ@?AXln)8TkSIIzC-VE{2;j(*J7f_Jx?|Nd*KC z@_NnQr(iR~aL0$(|BCzp=3&Xf7T*56@nPla<WSqN_X6MHt6q9V@NXrvETWm_=4LY6 zJ?(K~hc5w#hi?uhPA)Gmk5@y<ZL;;2W7DRPRb0rF1&V@5ietc-f=<ezZlh*YU!pjk zxdy5#nwbBHEoi3xNhXb@d`=PlxhqtrqJ9WlqH_-JCm#nNZ_uq?%|~2Q-lzWUYWKyD zX|{9XLzyF%BS^oB&Y?>QqJ<vySCy7egneI@-pM?C<&1aqo)^$O6G`is{LTjnSx@tp zq$HR#rAnh_gf@I{Z&M8J^au3!(WjXTF-E^!``=UFee0ibA{Fa!fB5Df3)w)N#}CY? zgOJ-;pWw#UTR-Za*1Pn*+ZSV7Lx=P<fF+2KjlV6GR3<m#ccbmH#vZRjjvyia=VI+u zK8&|(3)lH`5WMN}ju*Et_pglaRl08=syCXK7gxtB5RV*TmJaF~BkOEAa$j=t)>BlM z)@uegJln#&Z3x`m+mUn+%-d^?5t4_*mp-*@Ym5FE-OG@dGOs1SH~E2E{lmqs$;+ya zdY1jrJ0Q1@+VZB-zmR#Bj$f#oTRgzgN<w4}*lxi7K`Z1BWL}JUatXFL1GnEw9+y^D zO>VkYw!|U732G;P_4O!q>OwC2;j!4mH@1^)WTWon_S0uP{A+Pm>HduKg?TD%_vjGB zyP!tHa{WF6u+-hzRht@GdGYR%5sB<^c1)gJ87By>M<7YmA6#Pf3E!!;6t&*#?wswI z?S%$M0@%IB?P6rd_PSN<bmi!h>@r@xg>-sr<m5pNa&#;<oyxk-{NT2N_v!_ExXb*5 z!NK~yi2cEb480IwTor2>7#w_e`cqJFN#zKF6`^d=F;t>TS1@_D-I}xVxa8f`L8~)D zkm>FcM+cIn+E;KCdK?JF`BYqxFyn(9Z{pXCh0q>=>1PQu_}o?SsX$75oAVqH6z0lI zr`~TKAEpQ%dB&fsoBfdOA5wn`dpE}XbjKe;cfIZpZeJJj7V9V)@TepiO&p}Y+s{8* z7lMHOI~9RY=X3VRSiidxl7-4yL*~2{OY(d82N$PJE8s7KVqIeCH`sSokR8P98etu4 zvHtr9f1UgI)O@)0ar8IT_1EMlE0((}Rkb5UViMq`_HHro5rq0RY~UsMS=$-ggV0?r zzr}8THaXe~)6Df-pL6JA%XMe_!WX>Nc+%&8$97V*>>ZY!h}gG5)pmO#>NXAGQ=8%G zKpIDXV3CBxiuJbZK#+a@2Xk*3*4DnR{T6qpxR>HivEYS5i%W5r;z5H;p~1byi$igD zhvLQE-QC?!=v-^h&b{{gUi;HICm(vHX`o|_jQr((?)&#p7b_O2I_hckl#@R0KV9=& ztHlt~YhJ+4E#HRdwW;+dZ{PODMSGIpZ}G?9NlvsP(bhlZOpjzQ^RC8OUYmZlM>w(s zs^;HG3cCkhJw-erJ#AlNOjKJXlCR1?X&^e(@I=N!NPqNIiKFsPJjW%E>#3E3yrQ?x zPq&bnWgfy8*%luEC+jbzkug=&CoqNC0v;|SN0}b{wyB@&9Q0S+%Yx^*?)duw==cxV zAL#HuYeifCSyK8R-*%{}rZ!~+Ob*;0b#JQB(t1S&Xo|SHs;m;jAQKp#d>+K)N(u_3 zA^-5#<G&8%Uw@~{aOi$6KK|nYa7O+2@&5bu3<u|;f`YxWYPsjq7Z;g;OIp$M3O!j@ zO)aka|6CjU-=4_-@_hf7Z~L#ylJA1~fp-M_W)+<ruWFR@Ogz%|^2H7>NptlBgN{^| zkm{?Jpt>@``6(gnk*JI1R+!&(@a=QRcwhO9N_>8}WpmIy*GF6+*~w!Fm}FUN=@ze8 zucg>idC6f&5Fx6^*XHxxT(6M*4J3pY#Ok>tUF&r4z4|4VAW+~dEOt<)v_SJ0bz{7g zbaY@JEi?E5M6@&dZNPG4oFfszVPr0F3El8LBOnD8bL3W1AQY)dRomPQkMZ;_W`@S= zk8YiTfkbtuP{<sS%aD+O*yqnJ*xJXt1tknV2(+#%e)#%TnkQj49%33#6D3}Lk`ZL| zqUfL3Z0^xK4lMPIBB4i=O9BncDqjGSp|VrFcwzc#1$lyXfd#Z%ESsJ}*HY3P1u@Ef zR;uR-VHril2x+A075c*qd7ghH^r<q=Y_ni+jVam^ZJL7?7j*@m?$555!5Gn5ggn;s z-nu2-kB>r+`$LbYM=ei6&36k&tE`W!tj9B^sVj_nH^=}$N^DIjD{Ye}QQ4e<jQU<v zwTznLkvKt(k!Yy)a8c9}YWohzA_OM<gu*aU1Gm$;tN8=0>4E;yD~bSZbT$lE_KcW6 z6UK^nIy*1?hJ>F;Qaw(Cu#G8TP&pDpv9*U$>xLj03(wbSqL1O!oHXn9eD~Mg!m3}$ z3DRuwnvQF&+l(vqnJT@P--W4<;k-evX@|}<$86rlL6+g0ZrcsTM@i({$ShleYkni2 zVWe+Li$cIeP|QE{4^CoLdsT69arf*k=L!UhDB|qQgX{<0eARSBKgOM;y2Imj8kMT= z>|8_gQzYj{jUg3oM|>xR(E3+RB+A-K@RwU);x;>$E?)OA)C`x)d`)SIr}BrRApMCM z7+hs_!YiW>d`Nu4O_12Zt3yPJozr%H3-An`mo(kxsJdQKYuf|N#u?V?t%QJeD4J8d zvBH&N4#}`6t#J05?KR%S>Z|iogv?_MqIVO44#>d{vlGqr{QwC}RC&W;YKG_a;;!WO zA^U|he9C+1a=x=f2ZF@9k{H!td5T5>_$;mYM1OZL$-B2>?65=Qy#BZS!{3QJJ@DMG zj1ZaUB@YNO28t<$Z7^kby=@#37t@Hv@NkTWVu2~rB}SB`-eFOIn(Y9ji;m|74!~45 z9Y$=?JQPE{*Hej%F?FH+K|MEHFXdDy(sOa6-OvEBf)VPRoO&5~3kx|IfTL4BPOCOB zhUjkH#>Da_wJzY@lfa~9Ntp+^dWUCP%u9z~Rtv3fU0(86&0!1}z8=N^+kY+$woLNt zUR1UY@NgmyvPG1B$sar0Kqy5VW781qK3{<{mjSaW1D(?2*M3W%JoJ@&By;TWXYB%d zfth8dy|T0gF|}Gotz*q?w#r=(6m~J&X>Wymp3KQUN?VIX7ib!sXz^)vF$3a}iE*8+ z_lP|Yu0{>2euLX7*!1G)-c9Q%R>0+0<o8GmXeusd`L9L;#UOaUGpY*O_x8GXCY&4! zq<*AKH?&wEdZX{))w|xRBZj9n)!`zmOC1I+;mdH>0;LSX<P?j;t?{m^%iN4VN(T(; z<DMOgexgvXZnzgrE<*?xAsD;xs&K}27;(M!-w?@=bHW1(GxM%ctFm@MW^v=vpF-Se z#d=N%&RD1LW#4*3klz>#<G*uhb2}Mh!i|mW%`M0t6m`rJM+bF5+g>IbFqwS)kn?qL zJ&iM7-wqZt#AUbusM%+npmOO**9s|=^gSBw+v(E~bwt+B%<LS*hj(Jyp69h9X+C}H z=7?v?(CflXEKX{EJC9&VAE*hz1HK0u)SU`#Z;P{0fN{p3@qh#DC1%ouNolc!{X8rA zkmjv}oa)UO_L@2-U#AES$UsIy0F*nsFq`eJLi;cd-gJ;>#`JhV*)WN~%K!!;r4}{( zA_ZP1e(jFzi-Yb+nIP5ynC@};B0HJ8h1xvWGP5DLvgld;X`YC{99{Vx%%Lc6?4&d+ zmQ+uk?qxLBm}S_ke*G@lIIYU}eih>zoIkmCL?W;&)4@BNxn_U5gxrYOMOLCyK0mrP zp7t{Kx(THQBwemB5X6U5l11>8`Ld@UysD~SN{5+8bH&pB3eEw<!+Qq$(+*GWKNVO; zuB~`uO^yJ>IwtL=`|V#xjL#}1*H{m1lfTJ`m!;x3^d8&s9edf84VVoPoyskrNY|Bt zqZy%HL$RL=lx<j!gpdJOzL?4q6WXk&rJ=)GlD#Y$E*Qbbj<+u#_Zju(c$-dTtB=^4 zh9hX-FHG7!9#0%4MD7uF)XJ4CqWLDcxI0K>As6?j{to`#=2y9XgZcF88y91oUSI4k z(NOm}_EcXo7QXl*<MdzpK<mc&7LsD~j_Qq(b&4W{v6zL2L&5!+Lzt;RrH@%-NPBiy zJ`ieJHVJq8nyo)ij7R`_A}L;it9~!ik*4ZQ|F{m}{s_`g624TDtTm3ol)I)*Jv%p< z4@aMW8Tn#lftNRAbNjGL<S@rB(=fgl1&mZQeBsvN>8u_n?RD_@O`56*Z?ltK`qRsh z&mSIcbCoayu&PgjAXq^3V>=795e*D&^n*GIyzXm~!%s0$;t>mBnOr~-z0?mMKM<_R z9q^4BfETDL_+?smbihi9+14bJn}mC(gpq2Qf*(62CCiikm@7uce4vnX&a+rOKOiYw zcd~l<fWZZvuo+`}>0>=Lck-IWnH*3e1$Qcp`ldY?&evq?wJEI}*^Oud_M?GSt%1Zk zI#Tuh#9d0wXKsgvj*^5_cr6FK9QtMsng-t({}MvN>9TPU-NfjIBox%U4V6fvClZ)S z87#kJ@xaHB_Zu?fVs;mk>@w@OD6mI5B|X6Ts#Sj-=-Yw94rCdZ5w&F^4dt<>bA-5H zGn4S1!~u$NJmdBI^#)eMss~gs%JcEXh%!O%8foFP2|`~^P3HD!{YbTKqe1Wqq3?hR z$(0$_o7VVwUr(fMSRO_eg+>`L@Qd2x<(LS`d~$ca2d5s}6<|=v+v=i?GRFdwtA_M! zO?BfVI^0MA3}x;KH2gWAj#OFxsStt02G2Lgd3Y`%N<Z=BJBpU3d^x@}M?F_P)5)ze zItKHWG<f&zVzv27ZXSQ*9|5^h>qQB>dF1Gah9<6BNT6X2e>N|ftY4z{JwI2*;mXml zHFccgEjjcm+ZR-<g6hXK;1v^5S94W-?`v#LjamTlYs*5LRhD4Ul1cNTdv4Vjdc@us zBpnmdGmB68cfqD6b=-3baY~j~LvX^%n)652W>}U9B*8bR+(wEc09lLMBg8-C;wl&z zT)7oUkIXKc$4#5nleO+&#vGb}qk@&kegYD7Nt_Ujjh#6^)vJP>QX!11^Wg6XKc_MD zn4pi!UQGfB(ELxAW8?~Xh_q&dfg*&O-0E!FTpaw+aVp7Dl)pt9RYvf|&$h2O3)0~7 z;XOq{Y4+hIq>YapTD{A_0;f1=+X%js6dNdFu5O{&Rzz^IHYD%n2Bc*V?B$<_z}1i% zxcZZ@5+y2dl=f9&v$x$y!eEp^tF!AM!d-+i79q>j+0K!vqVv2}U2JK`U60QWdISFY zZ0)M1FZf&Pd=u<(r9VIwxLZ6!|Axo+q0m6H%oZYHsMNK}B}V&(j#?-wJC&+%O3_C! zIy~^S3`fkwNva!aU+3z;cfFcfOy5wP^AT1<=H4^yTat&D&o-okGWXF}FRTk2+%2+S z#E$^gRP#4@%HF&}I4K}C8(PTM53HVPYiq&{UQL4kp176XeBpU8yW2;Dudo1mXGM!= zs|`%4W66RfDp1_Aqbr}0e+^tWWJyL*@pWVS;49ESfMeVH1Zl(6O}Y_~1*CS17pd_5 z3dYHE^P@Ze**%fOxTXQAvp%ta!`9&QgI7Ew%m_b%>8Xvn(J=7rz7yiz>Z(bOpUxb- z0vD*gYwssK<p(xoufKb+D3BLVR~U2}w$tH1n>q*-r;?1b<MI}js~8?BDjd)K{Mt_` zXOeJy`3vXv;jo*HQ;QshkHu%&%%;{Qs1T)$yjlz<uywQ%lNI_o!vZ%rOuY%~SOB@I zCZINZRv}c1G=rS(9M5HU;!}q|dX^?=m|U4&K0^;TcAVZIR25$$A|!%gEYm?BHziNQ zx1bnUYQVo0p-K~s#!x}}CkaLT{0)Roieqg1yoSz$rM+K95dIlJ?iFY`RcyYbizZgV z_?{YDmI=$H((?!89+ebk^V`0szFikFx5mM$!9b}pN9hgzwQ;rq)t{k0WR8Tk%cxIZ zmt&=u(7eE9rMO5XbQpFcO`BQ}AJRl8lu!R4{|!IJxfasp3&+Vap3lf?bK2)jvnkUd za1gb<5GO#EmQ9e)fj3N|D5JL8qqC~VazZFsm)6SULS<*QmCS;6c$jctduJ!FB7QKo zN^~5UDf&=7vKNl@O!fN?q5835q(xKfn~mo;rt8VPwzEo-D?rT#T+rb=oQ=V0(*YS! z#mGs*HeI(#JLeBnm<DCq_~tRBC#sUmQc1R$9A|bP97Knrzo}kX4wyfM|2bl7KxSgt zm{ufrcXu@i>xcmlIZ|0QsZoFdWAlB{p<01`8X#5ETtGqR+tA7i7{P@iHeeu>p(y`1 z(ofYi$7~)6)u~UhNkGX`c1YbT11z~4vx|D6_vvsVwQo2pJ8-@|Kq?usY{RURh|$fX z+dWO!jKd(?B&t?%-)3if*?DhF9=d8aV+?D(G-Ce7V#DF(lvAuvhc5nY^d`Nb4SzbW zO0SLo9)ezU9DDy8Vn0ey?5y@YYnaj#&zi`+f7>urLA{f>Y0U>Tg<qbbz^or_3o5@( zoCCifIsQWQ!{TK+y*Jh=tY+SmRBXVA{P0ty1|0)`>BCuzc4^VH=a0^vMBrNYxE*cd zqY|46@<}QFn#vTeq~<~?^Q=l-(Sk7ky-eM<>BxV(Yzb^4={|9KUK&Vp*KPRC-XK6& zgwQRb8pK998}AI+U~!jSm;Ly?ilG$TA1llE+5PY|3hAv>G_n|q*Uydb)(tHEr8qy2 zu6o4K3H;id|Mg|P9HW19m6+Qd)0g&v4gI6PwS74muFnbQhEyc&{iTEeLXvW9Umnnv zAqNVb+set}N9E(K8myA{$zP|H+YwM>(_aCn>UC?!%@EfwCnJn4d5e+{3U4<Xdf?R- zqACrv`E|XH$hf1cq_hHo#?f4SVXeQmW$8|kZg3}O<0XuZ-1SJcxi1VGMXA0xWR9ha zX$e+6yrVXL6V-!kx{xP8vdz`^Ib>S*!pP3Er2ff?B(61sOTLkX6{d+)8M4(b5ohP0 zEqM7i=Lc(K4AP*w8{%YYYHE_QZF}A{3V2)}_rlW(u)7s-C>*rVFI_gr`|K7?!$+rU zD3e2j1*J4hUirIK9M)LSepOof#&g~($n}D&S_GrO5?%4La41KnuhOJQ4*p}AP&_Jt zz?~%iob0Oj{`DC97kw)-BYW}2f2s9ybBnXW9|8vaH0(S~Bd`;`40PV)@6cVUMfE10 zv7NV*Cx2<GpyBwDN$fPlWYPqq+4=#%hK(u$va@S4pO2_Y&sosvjGb*AK0<3ZDj@Jz zJIvcTJ(<Mc%W<8Kc>PtWxPo|%C4?hBWlrNA@fygRAIYl6g+d1-$-%)^B_-#_QOD11 z+&0lT)nS?*&x^;gi&ifFQTxcYg$dFTvCvZV{8qAy9sTm?LpxFJs0HHI-f|eJ`?n1O zdG(Fr5?{zr6T^lH`?sCtS7(Zl{!&Yx|IEmli@{KMCL$gmHXOyq9a>*Fs`ELvLyW*W zEOB!&0+2T3*Sl&h!T7o^P>{X5023a{<L1(RqDqUh=KB58c(ATZTY3n2?qURGUTFV! zeI<B1<@eR@qYue&Og0ReL2PJ4`dnm^0?om$&g7w;Z&u3=qF`_V=PEY(dQ&=nxX4cZ z5}pKaf*AX9O0mzWK&t{|rbgRWA@y+=tg+(IeUv=68z=8l=R*D2Ds;!zF7eAKW+lx9 z&)Dum3f@OwM$ks8>v}KEL>wAPG@(5}l|2B(Utx(;Db9zpw)4=z*xJ8mfh|>^o1ke6 z*rLS`xD@ybh5d4)Y^T>dkhy=Tvq}URB`JO5l#fQWYB^#pTun*6?K{U(5R^nFQDIr4 znQ44Dh<wG5%Xr<D=x#Z7D}lE$yJMHigeJhiwP^zLi&5YmYx?}!YUzUzlNyOK%L>v) zK@_l)0!Nmh-$YTmD%K9tzIDfBhfJ-chjn&Xq5swARaq}0`CJxOEO7B^P+r5L+a>DX zp9d8{4dPmt|HTrk7WHeB#U$-k0jglmedC3X;V#*1{DiLZU;1(=K(9fL_A%~neOU#b zk9y)awC}ceMEoIc2oQ@yzh3@9oaR9tkm@R6@vD9cZ)EqziYPG%F}r&qzOJGGs0_T4 zdl5B;RhU)2OW|PtSqH1GpL;Sx^!hE@teB~9T@Hevpb5cOF%zxIyK8sE33##h^?LzZ zIZT>$3L3>zY95paENxpUVjdOc5j{Uqs#5&~qb?%UR*KC+PDAe!&?+IwzM{4+W|`O_ zWj@7&-^e~JjCLILk381Ib`f_uoeyzuRe>T0@w@g-*${3_#I)OPygrp(s6J+yG4LVe zQmzXV#F|UUFuUC|zOhk8Buh~Q+NLVMI@H&o|I@&oGw_$b1Hi(n(l>L0^YMZ?eU?e` zgp1mgO^wkRn}q@^x}3(tekO+?5>VDB{a<v^^M1m&w%YKth%?lNsB-@h)leWlBB~72 z58asA8D6MF8v#s{o7U-%{|(r8@Eh1SxV@9QY5=`bi?d)Tn=_X8?w0}QYJ2|z%mL>g zOJJ;#8^dQxAftT19w3=0337`hYKj@VefwvI1(Y5S5v~9E7$p5qhF{%(_I^p`|IZdN z|G$5mAP%6uX!~H?GBq#-n{=V{(rGorjphjEkFSc`w_-;}N5RR-pxj`DufD&vw_^iE zMnO(_SR_-7$nf?R%efLI7_rtlL{y?qO{~0W-unW$ixAUL+Hc;o7bN;q?#QTccKmFJ zS*F>B1Xm>)GbwpB^~+b`Z6+LVbH<S0J+YWX#XAfci81DN+@*!5YZSuX8ekTbqa|ga z{qb3B-wP-c;_ABXyl%Xh)cPGGD6;WHnJUqnYR)@~QPcJ5G;D<osbS7bp7>xexc5;a zlVq8)o&lgwocxxz`il#dkGOeI2?btCTW*oqT(KZPG6(Bxcd$$4HxrN{2=HZEiX>-N zmfbtCDa&0oK(0VmtL0v^K-wawqO$epfbMHv(NRau5v!r`Ia91;XQSalcv{?$caB&O zS~*i8Pm>NvhcJH%*v_4j8H<$@9;#aIqyB6S8A1UON2(m&huhqcHEqDqaql~!p;w}{ zh25q@kx(-Bb1^e01)hIjdN+8Tn-_kNRq!(d2O@6^H{T4{tWK!ubvg_sd(5ylUsJic zyT|DJ4hh|%rh47d3q9RCe0t(p^1#u1x}AzyqNyKulVo>xCrs}#P?z!F^^r}6qUmF! z$;p`os80hc(sM4=X?OhxCSjshK<;_mrS`&MjoQp6WmR5!^i9bBKJ%_#&mR-vLHm<{ z?|TWVF5Pz%g(wMJ{bBseAizZDinrw{UiCPdrS_M*pC<28u|XreE~Q1><-EhHCEx9r zgF}Bt4xOcl)@~Wa6K~*>|D6;%U)SDw0Y?}}0Y)-TYdsqhj)3$E64Cfh3C4chEqO%# zd};dGe_%ki@#*od_xA9x_;f+7`SfMu{b}Fq<T&!bB=a{enNfpZ7sF?ksc)m>@<V=E zcVk^bZc5w0PPn0u1ZD2@#u#MuiFzgtAwr=&d-nD0pB-0mw#(;qd~IYFZRBbb597hx zZ+bqTP3t!K-En2^`GLVkIYG;w!|E&g@>&hhr-_Jh&}vEOwb@3~gFURM+r$`#;xm8V zn5z)Y9WLQyIZ9rr_3^P8TR*bLIC}Yu$^C`i6PJD6{MUoe5aD}yd07O>Yj}^Zbg^F7 zMVrTfLz4|pQ^fX1(-`9LhjRinx8V|4+VxUGvH<?lz>B6)GgGL$hCTJ<t9C&`i_-yX zs(N08Yu>z~Q9_dCuiV{Y&7~#9+M<5RDzJw?#&?)dY0fob4FA4=GEn|iqI#5hUV02K zEQGyH_kL!^xtwpG+XP&lpVL7CN&l+bXMrr-7-`;$hH9X$ijn2TV1AM2?{0pWBNC)( z>suuNP&B|t+~Mt_iS7tu6$0G74UrkwyqM@|DYvejG7!u=NTH~8yj&!KY{V1Bhn?C) zdm)_axt@M?;@V4r-C<>|hrxMB#`VBt4jX|{J6?|vixVujX|UooLRf}H2OnG~-+_f* zl~@k`$UB67L#_sHxT~VE$6B&UER1<0aPK%~K9zj}^SlP4kz-Ez%MFiRsPi~(OS*`G zI`;lwfq}orjFEZk#CYPwJmepd4rK_tByUKam!~aQNtMkLRZv|`SIVwLEbZ4T=HB~? zspr=>e?u?x#5_#zy%fq{IguYX)UjA6IV(@>b3mllId+#ch@!vPi0dR7-3y7=sMQnR z@T?Qo>bNlfWSH7NNy_A_rdT62_}+#T>uR3>zCo6^(T|9{!sr(`?}XAZ|3%ghx>+E` zl~KCUp~`{K)a`I=RkrS_h81laVoa*6sU_Ix&ar(<G^=;(8wTyc$f&2nN+odEfVlHI zmy|oCZdZtIlVe&p!obTsbC*zWH)<gF^I(oE-h{(+itI#CErzxis|1kdM4Pu!h%e%; zP(^s84HUno;@)?@93|o0#q9Y-$CRJ|Pu76-eRo8l*~WJzt#zI)Hq{C9KfIc=TT-S9 zyciq~U*vL>%Q^2MOVClNyx0Gd<4qKOp<>H0@xHt=vtjXrj{WAodIcASW}T>{o~ayN z@XENe30O!*I5e8hNzmEou7D(`uz4Pv)kVe&Z6GssH?XMK|88rAI2K$7_;f6_Ade!) z8#EDON0>xG$W$7Emb(WW-6^MUMdF}XTU^}%;}{=zG}@>WV)lO;eV@bmYtxbK`v%FD zV*e~-MF_4Uo!L~$L~?#cVIwXD_e68-Ucgd}N_0%z+w@gu6)BBQ?i|DIE-NN~Z!vgU zl0zG|3j?M%2=Y0nWp7ypu<Dv-7qbA09Ql^UBGQ25E-wj2vkxJT8e&s~;-JMaQ9i^H zD@K&CZHUreJe7Xo1l#w(7Z6$-4x$NZobDFb?(zWPsmLzEH>DuPZg~<^=fbRI?S0## zkJurc;x44P3W7`8#-CE@H;KL-TnA+=Fs<r_QLgSxR2Q}n`v|$qHqmX+oCldI|5B;{ z$yqHb+fob>caeP8>^k~F#0aDPuS+uXwRH@~CWeA5<`Hsiz?3qw@@*qanezx6Yr!@k z2~LP_6EnFgg!WhZYG%7bl(3Gyx>Id52Pp~QpdvTrE?zNv#*BuyHC)4vycS^qvTs|d z3p(mB1@ByNKRsBK=q75Qh4vg7RnYvAF%I0$U<0?&bI=KR-4i?mRhuF8Qo1pL`whLv zPh-jw0tfKfMu@1~oR#GPwPO*l50oKd@K`$l>#c2n25QQ>G9w~f-0Zc)CE}*4$F{OA zL(!Q@t|L*|O(I(l-@+>+#QBL{#zlpg;2G+SN6f?CxY7*~mHv{(70vnZHp1FW>mS>l zANTS6Hv~@VfG2b5!8I-y+eyeqcGFCH?t+hDJHe<3N|%do=Fdz&v(^}cSi*aRblMBC zyLZmTOPBY3<PwMsu{rm$Ecbr?vVs-jvk_<ao33q<E0yddZkBCfXGuO~-g@<YzGd^^ za^4B`jPionu4y8~_I+iL5|FIchII0~7ggw|k<X65Ru>EL&xmLJ_KJ=N{g$`C@-MVk zx;LZQsF4GJI;u@Yy8Tpy7q5OenN6D-9T$)iDVn|r5Uf|;uc5fanTnhfcd>^LkQMqe z6DXg+@FPChV7_HG7M0HJuCR9MmQoB9oWSJ^Q==f~m3HLoIgc_Y`r@oWGvN(x$HC9E z=^VOzBh5-X`eO+Jy+#K_KI7Dv2RI-jFX=leMbA{VsSs3w1htZfc=xQTN006G2g|`D z*svupn@1swJT$f!M};t*chc%QOZ@#ElojZ(VB5X`Hjei$G-V1$>910lkuF|7X4*VW z*-b)pk(n<wSl@h%R)qquO~zZ`KCR9yF8F|(9=PXWfP-nnBh0gw$YgdH1mW}K0smME zvp{pwB|X>K+aV3;9AD?I%q=}uV<#Q=(57nVEyI4unPN<!l+!I1%XyYj^s1npV()DO zjwrRFkzl%_dCDc_g5B8&>@o{bbPVeZqG9y9>p~_-FLa#1ojzEf4k8E4{X$=hSR)i{ zEc;q?f}ll9AgJY+lV$P!3<ZEFIF&Kih+6jCdwo31bP?I$6X?qb_oAlJN9Z=jxnG+h zzk-Y;@xPN!PPV$N`76=t=<xI^<BW6cRI#3}dW>`Vq4MT=zTziK?1Cg-xoZQ~z0-1w z*NcLoM0Z{|o5q$U;}-x>{JZAvr5@n=fd1@+yfOxm%7F+~R<%xmtHMo<acP5cUX&q& z9RcK^oJvcJ2kxwQ#V>TZKpDbI3U>}uVWa1;TR-9@sJ18ISF)fd@uM=jkpVbNF{HDb zU6CYdapo&FDzLQg5uDj88qunH0)}&Y(7J-XX11MT2xYaid`@7qX&K?Wvf7$?r)GWZ z1Zk4E9aBG&_~f^$op@-(ch`TbYlEHJj#ScAV+U8&^}5Y;8rD73L;Ccx%u;!vU!Z+< z40=@*-A7Nx&^M7K2-8<o=~L<Bmq4g!`mz=2TP=pF*i||W#?H^Zh2CC5o%@Pkm-U5M zinQcMDpLV(1*GLs<;)Im=JEW!V6l;?*UKAUv|uMiidno?clcbX_)nUi285=E^Slgu z)-3Xkb%*yZdT}vI8c&g%Ax(bQW~(e`RpXW(63Sk|=v>6@@(pP%l%%xX3e1l&zV8uz zZ6xebhS)f{1|JJzBSPH})lOEoc|%tIa!vuE8x;?=A)0CcQCrn<n7#r_Y$9ah6Ja3& zUbr!6n)MgXOYxT6&@6)OqmN5JhpbkZ)<hblp=!I6T!w1Ad)bftQ6&gK8=6?;6PEmP zCyEzzS_|Gd8rhy01*8kT@+M_CC2CsEWjS5IpYuR9HI~eKnpl&`2vlw|y1Myyf;uJP zDI;-vjgIgmK7GQOI1hDpW62*(1ik$-Ni~t)M1mh~gZnCG8)AGcjGYx)dalNQ!pGZL zMeT{VL_5Idl6TZ!7kUCR#^4eGPl!rEaBrMZ_=cyLKeq%ntt%yqu6kM>T8c`U5Qp~< zr_&koZ*~{WCLW~a!qW*zYg&MDaE*V)R4<~-FKa|ktB5gyV%a;WlnJW1q6Bl>=u?MG zm6&8ZmA;$NM2t%zK4vB3e4*2HtpAf%b-r)t-G;PIvbl6K=p4QA8%6zes`rTUyf1hi z)i%|9S;hGB$1#XkVe8Dg=7Hc_@7xgpg0xH{xn#4)S+K{<ihs-DG%t?ujt}TDc3W9v zbvAS0K!j+KI_q<p?;TZpo8lCM-lXd6rY-<ce<bm>0=NT9)JETHYv%0u@8t=8a@VP8 z0^~}_o#@9Y3nM1zP)E1Xmbe6?FQiWuOWOG4$hk{Wap%ewi)nptY!KTsBHULQOd3@{ zD7Ji+Su(emYy`U|^#YuBB=UfN-RbG2kfVDzq+i%WQNWm)#mzfTc?c8dOyr;fWD8fq zsqDmY!8>5}#aftz)^US;X*DINAhseGqT+OAc*dlfRkB!!i-%?j%-9%2f?661$2L*m z`G@2G+?P#c1=m==t+f?ODGxWelS=pVgJa|MDx_;=Tw+p<<_9>>Rcs&0IY|r07PoU4 z<-kGt4EgY*KECFK=1d#cxR+o1w)()o-j$_TUOQPsNq+!h&Tt^sTq0LlPG>as=*&wS z?wCi=m`Ml)c<{Al(h0>brW92_l&M074zTYP8iD@qj;MTcr$@1CU#gs67H_q2%x=GJ zf61!TNAySuJ9kGibUwki>|ri0=@x)6P1g}0j6}Kfty|fvbpjd3xrUr>5BvPvjP1Ca zU@!W+yvw{M5Zm{?<V<xLkL0`g9R#+QVMea47&U7&xB0VaL0+TZLOk#eR^^rjYqMXy zx5}Of#RS-S^vTx3^aV=huqj}rg2bbSw#Mi)Xs`ycIQU2MIhOp8z=w*=rI`zIcRUGy z?|D*GP!-HtpF5%ABEvyyRyrERUovXR2tjtIr?~<zC?Qio(c%c7I0Q&O33W4$oK0)0 zkOKe6dqYAd<l>EB=sMm1{@3nzfG2E!DS#j90Tw<+&F$=c5ov-<(<g+8amES4-Il7k z0^uQ_Q7U^3at6oK<yNuv@VxV|0Z&Ko>EW<M?yOwC4X1vJ6$aTQyZ%*olSLlMoNl;8 z#gFpbVWGJo$H;k9BlZX@1|PnfqxBu3;0$5mk9TL_fI9!HzIO~34}=M@+848RhUVkz zH`?!7tUwL1ckxKcIpHZiMx5GD^Syo3sE3wXW9*t%;IC=q?WdHw{mZ%_yp(*?4ifG; zKK%#S)OUW#4eIeHt%950eK-;x`~^uNg94!+N>mndi#Jn->>Eabro&UIk+5#b+{tgT zT!9QBYcFk09T7N4+J?7$w;Idok}hpH{#L34qad|FXu{}YNIkwx;M(h@Re!?@2#~0L zuRePDRdeAelI(JaV3YPvUmOckhKYK7O_IpFBJ*5-_cWTYa!7ZchYulH={eB9C{~)s z%PS<(NZ+d@>yb;V8KUBy*RDTV4C3ohU9BZO;r3#zdFiZ{uIh)y9f2<!p$4=v(%U(u zQT*JEnv|R-unZi|ywNi={COBuX6R9h09Y?;+HYTXA8hwg+#;BNgqs(ppU!?)G_kQ` zWpxxXi!ak;R@Nh*GvAF`%KP1Oj^9V{Q>5xX=eVX^q^gcMv370jtUe;R*Mm>wQWx>e znY&c)hGc553hIJp8^mkZ=F2S*GMir765i=eTn4Nnj|U*cd>%4^$%~j++GCsBn`~K} zU@q3CJ2c8k2uv&@;O4O35U8N5lz^vOROMhUq5$YTxkc=DZqEa`#Kxp>$1Z6~-kaP6 znkA%K2e7x&v;KYivXDGi#36<7-e`14nd3Ta=^D-Bw1@V3gY|Qsr*uv>#G6I}e#-tp zI4@iDJDR~4w!u(sNUYFpc8f`{uh`2$%x*<*c~BPhUX+ya0PJodLToki?`#69m0~Z^ z_IaD|Btn!Zf>FepZ;icHncwlZq&V&7i@l#7R(LF0oDR85qHmM?UI-5I_19T(!34R1 z&_fLwNPMLk^QykysuLeK2btUH44^TRqE9DS%e7m2e)pdOtWOu{d%N0hulr1JTNJU# z@5sGPY|cO!tgFj>5MK)N8KL(DcUN7TFSJ@HdA^<>-s);AL{S-F4mZ8(H>lsWy)#U$ zRKoZ763$R|0!@CDkgOq1nbB}TsQkiR7s*{~TU6O<fcbUNsszz(*L#2~WV#%~llFDQ zhr@y)IURECidVGr(x#vBlEZ5^vFvoJNTqiPM#@iK+<>D`k2GHQDr56urQ~}RgHVI+ z2Fw+qh3vKL-o!nbl9zQ<f8*QIuAobrebJ@OA)<&qG@Mv`iYtSL7TTKCkMNqHzjnu- z2cP1NQ1}X2(JLZm+gi!-KS6J7|F_t|3q{szNTj9EQ>p2=4aMd0X6ppfDQ;~I;*rMi zI)?GMoH3oP0Rfth#kW>Ij{2B>4gEg_69|a~0;!X>MTzVJFeJbEx>LR9b@#rf*~}m9 z+A~NEYg;NoOQC~80^BH-s^ho3<oEV0C-(>4UyrX%ns;p4<lFp0u3KkXL;;$m&gM8% zg$~EV1+4jVFb3YM@$2PX-mVkpu6Td%)lnX#rgBn}j>zNmLmMl@w2sC35FJiWO2N0) z<<TTv6$C&coea_}`3|PuoIm582a1rq@@@@Q6x7-I!f@42wi+`d=x<VnjR|!4A*%vW z6cNuuX7kM((wBj-@Ku+SBqnO~s}v0Z2OSKthgMa5FSZ~7#vp2n1}lKB4ZvUN^N^8) zH7e&zd`KepEpM7!YX(3-u1=TuVoMokC?L>9=$z!hC~J+h3I0aH5i=@FRC>j%rJs`T zjx66MYptY#FUJz>vlG9~s6wjDU(@>_J`~EoQj+Mj>AR&AgLeeexij~ZrkMF-G2($+ z?^K+mkd1fiaBj+lZO~Rl!?}l0p4{L)6CjMTzZjOn=JU?+BVIQ>sZi?M{-f^Q=F1xy zx6Y;f$ZIVXH$dF(>aj~_KhfrWO{wC^Rl$8|{vB!sr3*joO>VD^<O=${=tgSu=vjL8 zA|omF)^hQkxAlZKZw}!`(npO#*ZEpUB~o-)J9iTW6f4Yf%i~&`m5zMYhlNSpcY?g{ z1ph9uk8~Qq`x*T*Co!(}9i`%=`2`h3{;(~1eJ1?m;PG^~WNO=%uy5$f6=cQY7n64N z1wvzkR;`)fQO^2jE+G`qT}whYw((W=HQUyuL0N+Ig2qpKr3A1j;kl-s`Ih%^`oe4B zuC6W2rRc5vq(WXb#}|d_{gf4+7-gNEyQnyRX!GAeMl8)ip|v6x*b@)y#@jmsylp8W zV5nB+es|Nd3=(B87E)yvH@+%2Ppz}#!D4;RDCN15#t8NB9}!cctXpO!)7ga?GC2*p z6?&G{liZPta#ENVxv09a5eD8p^8qV8n1)#Li8)YaWi0Y}rFJM$hqn*Zsj^0#Wd5|a zmz2w54eIA%Mu1pxKw`<R(YujuB}*(OmI5uZ+0Nvj)Y-2r-%spkD&L+GWr*s@+P>va zDn^TL)_l}u(saG>0%+Sv&n0gN@p=+l4cxKQa{l@?buK-n{4v$jAcA<$LdhS#<7`Hl zIVJg&hv6=vo+K}dQ#eF!?Zq8^)sq@zpPsAaDbq0bGKu2Au;-|2KiCZz;7A!B*Qd|V zj&Nn{Xxr9Pjj6ol%1asYc1K+je<pR-5{9v0PKuj+#O&9+R+k~CV{IALV{F``go&+< z>&f~uthp<prFj+@diCisu$v(1@1!4Sq}b!RIOLG!Oxd{a@3F&QL)f+6?>3>;vt8QC zB?wn@Y69sSlD!bWq}cMez6yEf7Rv^P#v0KG#enEo_VtncRgh>#E1s&6*6#f6u$Z2p zqR`({JB0hi35G%z7e7eb^PMQ368gB?nL7s$$?@EieRJGer2X?(*WdDX!a#oW_5q^A z13@$=FQUEBZ6UX*Fo={bF>Ln!k&n7P3b82FV$|i&AIo6;{Xdvy)fjegqUQ`iM=9pO zQRf=}d`lD4v0L<RUU(S!4*@VRFh%r#h&Eg$U9$dp+>qxZbr2@We|zo!g_2jp<ix}U zBqIko#|+aBFapMZr4XLaTID%w;Ux4Aq2l)>KS&CL`}b`B``Pw9B$xi*UK?EacR5q# zgyNg+Zy8&N$s)^iGl*hkAL?1B2HvS;<O~k)BSSyHAB?4g=AoQCGiZ-m!3cjQvcKj( zXG-|Vhd#pl#p${s*)(0?ExK-zdhBT}wO#B@RoTcn9n5lhJnZRpKQ~@x5)>4i<q<z0 zC;Z+i1*u9=K}V>9-ecVD15c9gAGu8q+=}jZOi^M7wX~;@a)8O<d2_}62I7njW(arm zKgP^~Jrru=&1S)9DRp$#-8Qdyf4r<pMt%G3f<D%T0Ow-2ay(Ae#LhbBPdLMQXzg=Y zqV!*3iGNg+9?SUw0Nb@Lv;!P09aT3q#6_=6bw(;u3<Hy<G%q_OtJh9nl_&d4Yl+^` zsjrmAM_1i13eKxcvMdg+qIw9WRx=qLMMEJ^3UP)4NWWve=7&j!10TvA{39HY9KcAL zMgfDh=y4`{etEeHnV!25$UV}Sa<ayDqCeuLdR`I=-K^sjMGs2Zq)O~N5#UVrox$@b z%l<150WyQbFPZ|^*`a_8xoYaXf36m5dTCg_E-etJ+a6xnYAbUNpMZjxG$Wea<rxH4 zIC>~)cP9kaJq>4Q{`}-q;M4#jE0BVd8Z`3d)zt~4Vc4sv9y(F@97;|$kBb7m&Jfn- z-2JDs)F<sb|G{j0vMJg4P`pq-JWLP6SCb$+i4`Yx{WoZB_@2-{^ltnnV7c>cZ$m)% za6f=W{?PXuGxazk+;;ulvchEeZlzXQ7wx{!3DN-X&p|mnHi&!DIR)X*FReuYqi|<? zH~HsK^2g%<NO9(?sy!epj}#ppJ$mUI6v{YyL+wUtmlOlWwhY1fJFJvavL^|bzH>-? zc!F=!NST+#r(qGtTmYl#nzVp1a2t3~(}CSW>f@X%s_(ZL{56lwkTKwn8r!aeRB#qP zY}){1QT0j#YiqpVrJjW|W_&0`0y6_lD?S8hf&%d__x7XL$uhy>y~D6dGeS(6f!txz z2Q;(pul-A%5vxqC7^{>$&@(k>AbpnA6}?R1D#SE3LVCvpw(Hrqm4YomZ4)`NN0CzF zGDm5WISYO}e6GNW2m9A}UE}YY!Z$_5XK1J<cj*@R87p|#vPd6e%X!lm>EX{2q&~fr z{&6@{xv%evLb$C@2qM2r%5}P}C;6^}1!40|Tm^4^o3s&6MeHNiw&@0a^kVH*&4{m_ za>a~ErOz@7dhJC#l7=E9?hvEX*@Ey#ow2YUa^ssSexF@|XqV4XE!*9F6wsG8^w|5T zK<Wy*wikWsh$yXJU%~t|RsN}DFMr>xU)~B-Mz#b6+dI-#*4BhgyegU48zu}jTogpC zPz*3E%e_w-oQ9F42;FgOnc)wv+ZOO>$BRcjjqxmtC{L9;X9Oln6zYaz^p1d9^?f|8 zM08sA(GRKC(R4-hrK)sG$kDkRp;yxh3wflHhxbIO@w_XRAluat89*3_1|hi>HsqDJ zdIz}oq!nVb;;?^b+B#sg*i3GxE{=h3&tL1HM{l9C@do393KyWGu!eK`zG#Zfie$`- z$NDnJ5{FcAC(7_^%O^Gsw*5rOjx$(E;gE>ltsg0I*^mN?K>l?z>7~*8><*jn2;r`B z;}%sc{2gc1-s~ZYR;<Dyrb`3tE@Ha#Z-~b^z=S+HTt3)t{9iUqrR4VFG}av@;t>|& zBL*{cWngrm)Gm&o{+<?|cdxdgy?LbTxL7wHx_6rvME`S2-~%NFsSH?1ydCGjli0-( z&0c_ntqq{LMQXFhYh_aRP0|9GCpY_<^A;hD&Lk=@^tsl&0`e=%yU#`f7tda8y0gEG z7f(H{e&jYBW8qyFvbU>U)=>7ZAm*pb6@B?#va^qeu(gbZnr$O;P$(p=oykoNJrM<p ziCZR_%~!wk4W_b@wal%@v1~KK6bRaUgsz^97CJ_e{?2Yc7Yn(&(Np+K;)0Y5^k4ft zQ$@Z3@WJ~@e>qcgw*cJm4%)!GgSBy@j0&<^5=}k45F-!tD`OKBJ2XM38s0Tp;~qUB z+8pKa8m0JdliH7}W!G`hHgh@NSzI?H9Bte}BjUp{1&-zr<33W|09#k`tiz9X_y)N5 z-8swW#gvRZoQ_5cj|JNwIlSqN#_ME#b&kv*M#IWZ5V=1&vt70m+b6r1VhBR1-TdR? zJ3L=}Q=kPxvTliSD6eZ>crWY=h%L0pJNdQn{EE9m#Zv^m4NPkM!;*eSSTW1%zD~4E zzzgjqox;Ohn0ok-wO`)p1Li6SAP0VRL6hc3Lx4{jk8cBlrl<jF$cIk^SP&&%^^+{; zYFFARSfkJndUZMm`~hwspCRCTcv*}0aW8lI4VC@s^oSqnK}giLKJJ6+<Oj7WG=jvQ zNs1kDokfMc@;(1DQLU;FR2e&?dMdWpcqb_Y@rG=w+FF@3teowK2LU8g1B;2>GVS9? z-d=4;iSxDbZyQaB0^0_mH>W0+v7>;Mh5)c<$2WS%7b8~fE-I#&+U=!uTi?4>t@P;g z_i%x>yaQl3unHD(vaM!}8S%RE9`E-;gO`*~%=0tTCFmV|wGlTPz!AJJqO2AN-z=+y zmmr?O+9JnT(OUVWtrb+qgr%<C`}%2lcf4Pw#t_pzhnq=D+96{~!iHqpKo}(<*DFmy z*8&=tU#&X*X5C}Y?*4tj@zsj-i3d#}7~<Q#JrWJWyW)SScyCe0qV?depd9!2cqA?l z15Y<ji7>wLB&H{Ka13ckBY>mKKc7knZeKAoJTXxGOL9csJF}H9$(=zDeK_u<Iws>c zECP?{(_!fDbhu@TX4n&Xf#KR!G)^R!%kyD)x?2`fTHW-aRP5l}yhI5lV9(t?b}6Br zJLm7*b868x7A;L5D!n*lr(HZ_*3Uety`=<W!H;}a0i2Z8iPD2}8`~Geby7;TAP({} z^EZj!9yL^K@21wwNa8bao^eSE!q2#*J5VExF~=@NY0oBr9j-aEL~BR6vxz!(cl_pY zvzdtC*_F@kt)tHHX@{+Kw=juZBqB)kfJa$N-Fi4Y#{!&hPR8)o`W*c{w%mtAHg$OV zw)uAR@ultTqlXy^%9U|x5FyOKz?s4ll4F7_%d(t`9z-cG^ImIHE4;LR{R@7Ev|~^3 z$Kj!QH)rNtaUsdXzc2daCI7+_Sd95_YP90LSrwYE>Lc0s<R5+HN5&v+<hdAfoFLhU z>+>=BDw}OX60@`N8Vz$V*I!TzzrFS8#!IZ(kph<omsE05iVa7OkSav#La|rHEwXt$ zpO{w;a4NbnR}WbAa5{~|lxu#D_HaDtI$YqTsMhUx(63kX3Ok5Ir)xqVhS25NWp9RF z0U{_WZf7EO!@sTHAnTSTAI)z!CqrG}>FXYg&>DHA_B@zdd3+&DhRHmZ8KBa3^aNYb zd^OdkpBArP+eU(7E}Hz*tZ-L|btOX2FHK6inxeGLeEg9#r*e8YeO?@}JrnrHt#yuT z<oy<+W`!;NjBC07^hpPv!Q*ajsaO-hKQWcP!JSn;rT1BfzM<dWL@n|?^>=luW3#(w z>v)8hKJv)Thx4A3hj|(*YjQk`F}&#C3OCFgMByI8CK^|Jo*HMGIXoMl_3azCdE&D; zxqoZh`QT~Vo{&HC9PHf6rWQW8ZjxJ=$%OtIwCIU)`fm1{wnSl?@9cm#!In`|`JNWJ z6v|sR3<($@K{-gOH2{jC`@g*P;hxI%4AR}cZm<uvXn2IF!}_<8-^Qv%UB4rULDEAv zH0K003@b>#4rq2wVRrsurH`6&nn|i=DKKxP@fYGH8aO+q-W}D?=atwn6mqTi#!E#j zI-If~uB=`%e<F*ntko+R%21t4dsp>mF5!190WCpPlx0ZpiliA5kYY%{Wx&7juLV8a zUf9pzHy^`g?Q<~VA=BZ7$TCIrg83kPn2CIn+`$}GB8-o5>kcm0%TQ#28wQ-2QUzIW z?oHH_lfAv5!4M9%+6F$*?)ZI^QgZrZL4VWj83{ZK)zxvj5-lXBE?%sdrN$6k?~yyX z@hn#ZC&=7TW!|w1&md&-YH}0$%sGP~m+?lsvntuJv8YrCtRPUN9apv#5?Npu_|}V4 zTlhMoG1MTN8#$9hS~69-Sqr1)z}MSHDhCKYeS-n7zAu&`rBg~b#=l;gnCo0A=kk#C zA`N%dfVHcjm_EF+eudrG2^Dx@?%eg*__86Qa=OQgI6#H5z-h8xAUWewMwA9hZNe^` zrP*j})cj;-c-ITkzN_Fa`SM8gL&#m#C6h%Jn&!v<9P}cU0UlQkOP$WmXUX+_i;F4c z3lJ>EN0vKCOWv6BJ}aX|w4AY-j@9mO)e+;nUIFK&^4<B6w($?rwCEpeHrdcxW;Wj* z(JxvHhkaBHD;##zOmCdl6}3ryXIooGvfqT`5Lnb<$G_V7^AjO~wG=B&8+$)$VtQ07 zC8MZ|n6sUdK(EFD3kwCMWOAn>^P0o)c)}iKS<c|PO(`m=c|+98(#lw+#UHBWpg<uL zWoUSg>A+-yl;JPC=44jkLUbqGbvol=^4>5_y*IdJO}pKzx4MqW&fDSxZ$^El5UM7= z>0(f!b0MzX2cGQ?tFrb!Qeks^?=kkPuwaPzRx$ZoC@+Ay$kq+zdA}>7HZ}3!{<jPv zK12jhHyo8&!vHh!n3#=1oXe84!gE2%mWy6!!fi;~vfzdM48t+779*cmhM5IHyQ%9q z1m4~mL=(P_E{BI`n-LeS#>1`CYd?R~Ji5=v$#o-sDRYH5x<uGRjE%7$vq-i3_lX+R zQJM6W!*}-FmQe@WbUBA>TE2f=ObSRRf8561Pv#;9f!YrfIt!ge7<28MUs|As62d5h zBh%?RKVp}8YD{`*U0sfkpLSWh>@W1DUH8lof!H*p9+ZZi+YZC@Kh01M)~Dd2M}rB5 zd3HtVi^Xh`MR?c6<@qI73#iLV=HCO(>rB|~TSbwb)tn>2Sd*<1Q15bz`tTO8fSS8C z5F`GK1%nugvpxuUB~6+!jd3IYQSfhjaE9sVe|qU5*{PZ(uLf<Fn#_=K6nS3I3CzUC zn|qr0@ew2HIYGC^3hz&jxFp#tgoRyef!%8CM~C3DcnN`OPkZmT0lI`%EOlPy_Io^r z-B#lPqEWTw9>|QMtZ!)t*G5eI9Q)_%bKoNh?pBidNo>{jSq()iBSzge4X*LkzADVh zvmjB&LVCttX5LM=o-%iEM`IEYgxNDhP+eB54VCCE=}l!bv$ryBN%A?lA(#_h#Wb^4 zH*4(1*-@+FuQ;FoROrtXDDsNAQ<uw6cnui{=cRJ*iUuQE4e6*Vl2yUf;RHWHg&&>m zPapu=g&*CD8f0C*n%YJPC_&L~C4tqa%(M)bSkkqRy1<H;U@Ix`OlW3Qd8KAtQGLX5 z8xhATPnf4|K<wAyS%`X(0C9rqwrqdI0Z|sOFa6>3byNL=y3(-ivkMV6uX>@NJI4i? zsyxqYy)OvKsVoT{!|jsg?pgn;s$ql-Xy>Eazh@{}Wdz^sF%s|IW>tr8h$GioVSoJ~ z96M-A77+y;Fk(qjz4b2chO!yZ#%OScj!z2LXO2-pNQk+NlKw9%e0NQ^mlcXRP^Wr9 z^NwHL?@nFq74FAwxg(08W^z=j*uwodfE~_y<cDXgx(Km@u;EoKxkFGTw`p^|o>1aj z!@;ng4m(m!gr???&a-7w485TGJr!_C403^&jO1iw@8-m1{`}FcoqJWEkl~)DcL!F{ z)TaVu;u^Lch_zmsOqnlN6+a{K)7W%qzzPymKJnOu{p%;PKh)uhUCn>dMFI!&$3nI< zzOM@ZHY(~=B?WHNpZyz`@h`36{lvsXR#7s>Gh)OdQO+g%K*|>SbS{vU<4+G31b^fE zmnc}%#>InR8j<8i5pl4Ac_@&s!SttU5tt&8v<g8qe}ah*hhv+jRCNUW8iq{^1W^V4 zY(pnV6%m)`lsoxjIH~%rASz2EH0dHFV<#zyvs46KClL$5)Bb%<kgXeO>t6(xA&Ng) zC>fgn$@PyT``@W*|4Z@h|C6`<zo+<xyPb66pER`GHMl?;&qwI!dS0jiEvek{Q6Yea zuOd`fK9Y=p9|4}1)z@-fpNT7+np7XpE8wKJn2Yy($ExMJ$AM~_Y#A{+mEZ^5(Vfa_ z<48sey*HikL)y4CYc*ITqrro+2v(WOh~27~YP&U+9awrnlz@jH7RMhN0=Xl7^dWt+ z+v9VmN~EvOdYJ~B82|X#N9vw6k*Q*xcFU3`|Hnr!kF&(3k6(~e+>3Ae9``GTj(2iW zCv~2kBS1!~dZzPY%*F?aGF5Q^SzEuG=))@ZwA4OTPGN$99apeIX`2B%z2!}ldu>6X zPGfQ>;kAblP@`*+9tOA2(}chgKte7x34aSE^UerS7QNk&LxlGBU0E*kYSf_qm%6b+ z;C*3T8aLgD2HW=GxX_=6sRH_+@hTf{yl%%*SBIYNA&9BFBXSL|$Fo#REk(xjOY;s$ zwb!6Yz@~I;=3LI#jvue%eSoU%h?`(Mag7MAszV|QBGX|$#M-M0-5}-r1%1Jjg~WYJ zo%C5onQplH(T2kkkZvyQKae4bTk&2(z?Lt`7ElE-x*N@h%w)OGPJ+Dbe+4xI$xemJ zLjUlyi-R7ELEc~bZJ$kX`kz1RA<;qh8d4IlZbav8YxPJ`BVWpfp})vmb$n+Tq?<=a z3C$M0&XA{IduP*aH5^372dSyPdQ%bJ7sa1$jDp1V7OMVGh&Q?_6L5f+dxGSy@A3AP z(=;>uCuVonz~P05OwUz)3}US~rpOH?!2c{Q)+7Hbypf7z(|7`3-_W2)hkM*~<cSeM zCOF!hcextEx(ewF(Z=d^g0g>jXb%WDOZ$t<!XXkbY4O^3c~mYDA?zX^ku}6<+k2l# z;81HC61VtqC0@F_4;4&b7<yOsBgr?3cp-@F2bMEzB<N;^w5ruA`e-Rc*1^1xbx?oh z(dYCA(a!S~8BZ5{g8@hG-7j;v;CG~;QzHn=%|?+~=<WZ*-djgS{r2y^Dgx3V-3ZbR z($b|!cc*kCAuSBjDc#-OCEeXMG?GJ#grw&)enY>{^Zb5ipR@K}d!Mz={DTWv%bDRb z_vgN^_jSE4G<O!n9~lbDVchu{-1)^U5?~-0`2Hz~3ZF9aZ!8Or!|1h;AhOirRRs-< zA^A7E!Ck*4s?KP3Gwy29KJ=GLU+@$s7mLMzF<G|o7omQ~L**rjY5aEL($7*?9;fpu zgk8e`Hxavz%q9TN0LzmW`(0;SQEa@EAzfXdLG&&!kZ3CAO(02ihVMOeR%fK5bZRRK z^l(NSh^4VvE<H4hz4R#=BG_1Y-S1BQ6PHBfZ7!OigOH)ObhOt1<J9c6SD!R-a&NA> z2j2YB0draECKn)aRuLX}*9#X5bh?XgvS~F`qxV8&yJY>JjbZf$Tn~=LDDo{ud<=i7 z1{}@M(PQ&xQ|IRh{oMP>(-=>+T!-D&QI|xP7x%F4t_Es-cJ<P9=5dHwOrM@eGZ6_C zzquTX5^%o0FPZ)F2dQP1lxI2Q_68H{@)Q1)0h&#cc<wfPL;Y@_#~~=|R-1XIMIM+p zI>95YtGuu}jZ0l!1%@jmW|qI5C5xcUmO~HiJ!HhQ82SVK0l}bGY$4=;mFi;!I+3vZ zJ6f!Ym?g|M<^(Id#h6Zl)GTe{Nctmdqx1d;(Wt2%G~3IdL7^;Ot`-`Oi*}4BMolZW z7vY9XylATxMBS4?q-6<HtuOp%0|8Sw4<6;8rttXX4jsSG!X-JUS&wA?P`fuiuf`vp zU$4t6QInDIKI6`u1HEE+VA_V?YlxEwu%o0=c|iy`k`F2a;ak9Yld4uQ_>EcBYul{0 zUJ=|3Spi6m#7jJH?0l7ZM!GWI&=yVZiKKJ3h+4E<=zmGLXtr0vFPOcqQs1=2m&QT9 z*~a*)th)?LFF=<b?WUU)Tm?9qHg4i5E7Mixq`C6f`BhZWoW|d;aFqaI4YsWGoIkAU z@at(2hO=J7$9soQR&*uW7s_F&W6IuG!w0w^ibCQf6L=-pgSyetJqH0UQS_nd3$!lW zwBD$`3EG=)J@vvL0XrV;*W_&<qqLb?&BHO`jYJZ8U(A@1t=05oqZ9wnQg*(ICM;j_ zh8XX8l_L*Ty~=iKnuf{C**pKRr}uGOC2G(7L-&@3`T<)3z{h&3%Ss0@cM1VE$%LxK z*i_L7z|uce*FXRmyaW5b$S@d4|C9k-b|1Ki>ONLe>=%Wf%0Qbqc??dv^Zr|&HJu;h zMNQTy1At9hMbRA{q4&ZRfVrFe3#yZin;Ks7pluS%E`drN?{r9EJCM+SuV_P9X^u;@ z#dD~0QbOCc5JrqOoq;%#z0vqN?&hubEB(P|sh&8(0UBpzM4Y&f)UCd6e?|8N03Fg{ zjjVg$I=HS#w5Jeq#ItwZQl2PF<R0`@W=qhtv#GOZ6ykM^*qp2E4@)3x4T3e4Wxwf* zS|9H_YS!!#D{?<gCp)T-P_hghbz5^V^VDDn|H`v8R0Pxf-{`YrCh$l@$yugPnn<{} z<L&ugepFZ-XsMiHhc9O{W4KnC|9D9yF8EcZlb<uZKkrtY;=1KoL-@-fxAnwtBE+_% z27H{1;4DWS)KK_r^~I|O$bI?S-E?I(AHXP|;9Pjq*a_xHfK#~Rw#XFJdrzoLr*AHE z&&cvq4qj6%zFYXvDuC&bY!J#<Yw8++;v6E4$O@b9f+DpPTu2By)f3+_XdYl-D7&m_ zax}7f`KWf_W*wywOls#8`;ToZdjOE%et-L&)e9J9txw4bGBQII3|-ePY>zL5t3rBu zq>eHzh~7NAXKq_=fM+}Vv<PtMYChz9<JHi0N!AyG9LKsPGaVJ(`vgT|X&0h68M?$0 z=U_ee4!4+Z@FexSbzf8mUGh{B>h894h1;;l9n`RGyUXI~2GxnrXDm|(9u-&R;oBR@ zUv)6diufeGI0jVWa6-3|ivOSzf3_Dbj4mr9+;Tjko(yXGoH=VehhhY(v%tkq*ywc> z*Oy}0;Ads&(JyJJlaSFh@n2p<<H<{C;fhG~FT{Ls=ZDGJXwUlby*@^4CGy8q*x~Zx z4oa#;vmU~un?On>$b+l}|F1=(WDWkA!-l>u>I_lx(7DA4fuUxtuoDtoF<cJcdJWwK zXMg_ezI1&>aO4l1BdY^7_zj|^zT49}Go+3T+*;>>)GQ{XefESDARMdxxxt&ED*>62 z!k#Z!V{Dw&haIq$yTz=IP}<I%(NEL^rgBDaxtg)@_cHl7WAM$Pc=B*})EMfeX|vn< z`=~Y_aVj!B%c$###mC!}(_}L$S_2uk>~lm-SJxNMOV4*W&Ce4ZTvQryQjO7%vL^&M zM#s~?Evl#L;og{!8C|*1RfoIcchu;~Ut)XL4<6dSGkRrSPxPtYqN;*usVCI=WvcO$ zS{bi`o}G8a-e?x!55G<lyXNf=J{sKuUa9Vj3(ghqA9tspq^V-r@Jmi6-!QN5>-}hY zT4RU(mmFP~25OzTgV2_Yb@8`kneYMQ2i%YsuNupKYSC^`E&Ad9f7YVc`<FIuV2z(3 z0ZbU4K%Vi{!n|)|R;ed-UPixc+hIvYq(l0C!fIvM|8JD&2RTqB`mX6eE79*Y|5Bod zWy<@yGcJ+~85y|D`jl#gXI`LTKjU(PcYCuS6rLw%X632pX?cstZSBou#n8^R?Ms~^ zL|42#2SjgDA2O5&?u-k`^i_f<N^ebY_`bTyg*DGl(M>^p<S(+hYWD=HUNfYjvnZ)K zqhz+H76AhAb0s&Ty|Q?w&*%3`sDSV$s-@mQ4dXS8XJ(TYa4ow#wy^o=NO|Tp#$phx zLiD-D;j&Z)W))w->ZUvR>u`bjsVJjBdM;GPuKR7m_EW~rKLbY7M0<_|>E8D|x?Wet zp8?Aom}{B@9-Ojft(vr`jXz%cidet_Q|jW*5OKh0)rNWF1%B;~t{QwQfQo_CyOl@! zC$ew4fSqLqLat|27nvhc+aJYX9r=5`-?7+UET2#ySn^yBfA!qK5nm17!+1?tvc4*d zXL!<}rU?+WcXf96<J^h3JYN-~=DV^ut}>9y3EGH9Xb&8&jaGg|fLa+l**QY&X3kNH z62;OqU=PZf+mA^=MlS=^*|J;3ZFhYrSm5Q1`}W2y$I$s1(gt~7YFiOol+W%JTh8RD zxyuVwJ00l17rhbzdMYg@^5H;XBSf4Y`@r^x4)(U+-TcfiBTMz>U8}s-%?6M1V5E{{ z!22><fJjpmuB2%tpR65_MD?4cCJPa8Ec*<Xk>z_sX_Qskuz+RmKZ9kyd;JSo#^(?U zma#>j`%40MYOqxIOulO13T009K)rJClT`3fhOhiruuR_Q^rQ3h@X=?y?8w!!M4YMZ zXPd+8F9>RbH^8UZP;CCqw7hVhwc5^Z{I^4R(?jsu=~p1^<>uxFVaPM8=2SM`OBnYr zhtfwd*5IZBVp8f*fJr-E6Klcd&YaOwksmc#eR4rMN)CX&t5>V!W=Ghu6J(IlT{M0N zZhE<)k5rubx*;D^{;A!rn?7kd7lQA@ydvP89+ufT7W6JX+o|T&A~bs__?Jw6UEQH< zA3E6MaT<dHTz*<Ai*Uc~2%&?k8X?(zviQCTQu-kkc?K+b2ApJdl336qD4IuwM?O`q z^aV)))4<NjNe9eJ^r0?oOc3*bBYs=f{I3zeGdIMYRE*=o1>!x*32hb;9>T=RF2ZdA zqnC>L0I}F6eT6)iegiIrW3$wg>o*UDXuG>~L)CPYh|Hb3jQS7oz>ujjnY+e{>JN;R z5V2{80CAnD!Le%Or)7h@CDq>{ayAs+$5}<yx%VEbrdFVza2i>YMeY(!joRu9z(a2_ z=JfWdoeJ^Ju7h+m($DvD>R;c>luyX7c6WE%ZEt&R*MJ+f3fyYB@Ba;Oz6+QmBqO!t zzi+;Kp{T)8B{F9&e#kfXCx_<8(cc^zi~RPsB{x=#a08Qh<Wyu-4TMg@rjY0jg;5I^ z`-ccT8?@mT_~ow`%3mK8R`(M!h)RNw-oi4J=EjtuO2wg0^jS%@3&9aqVs>F_%JYwa zMke4XSE%Ykn!X~~WvKC_lh>);scWwmmwiJ`El8B$J-N=P)12HF?#_fWNFlY?B?d!2 z?u*f;6{ySK_!}A#-VA21K2M`SSve`sp6(lGSFcB_n_9SjmrFekcN6leKaedNd$egv zE~Qp5eYE$YmEf%bq=z>7Gh^A&KZMFzXl!HC5fyr%1rjag>(yfdT@hYq6kB>0Q7c8r z$~U%2b_zfB-#mfGa5FwL!x9IZ^^0-_)KR`{3}(Afv$p#i&Hsi?GwU7jeR2;^n1wTf zHRK_UNmQtGXIl*@BvHo*H^c|lYLL|vK*n@v%v-`;L(w!^i+`bMOhDl_^ZeBb=cs0| z97km$VLq%z`ckPdZ3$B3s(j0y$yUpYO8Jc}&Rs^ws&H@RMrSiX1B#G%-&Ra#+sE`n zsP?nxId&OD-5**N(4>qYZu^frpHaJkc@VWJgFLq+CNsx4LZZImksa4`aqxaPa%*FR z7(d7Jeg6_+<I3?kT(P7H)Eze&HU1@~D`m(Zl0FV4a4D^mX=}b7xHo(xm4!0F=P!!! zKA`CGpd#qbSC?q2OLlAc?us0o;nQ5q*WdAEUq3seZ0ceM5acga_7+&V;Nwg4*t+fE zCGycxXY1Y*{_8QL2{7q7act9Y`y<or9+ll(8^^Y^@Oyk;4**lIozLk>n(nMyeq!SW zn7q33dCuSW+wLu)8B<EAhC{anrP}};U7&k=Q^;vLVm#;_Zw-h9bKN+Uwh+_rkDU1o z@w3an9eP9q;6tcEFY0Ov3RCSu-gBEb%|5vtTKeMqG%^DuOHxJSMeqFJ=B*&|-uKGA zRfALstNT2*cE+tw)$f^WGCiA04ia<#J-sz54fmV`(Qwa0(f9#iXF>?%Et_-ZRH%Pe zYZH=%k|$1hP_#<3=|~|=nH`WvB%f8AIbOie+oHh0D<zsOo}=2kUcTA^)_*l^E>x-{ zjykXg;9J7v$Ga%6Tbq|IXZ9y!nTir5b*B@AU1~<%@(mkQMsJ_xThSh>iJ9<$!dppz zq$T`ML06qM-2HvYAXzGZcf>$NmdnS=gSx;ZH5KEMg^;ej^7Qyz^DQs(!Z{U10X2oR zmU<{+)rl<3>w(hx1OF{{X(a){%5qK39}AiF@EGT4Bo~#Zm9+xSIZRuHWn^T8O%w03 z!-0kAoh`_JY(e&Yb_mU?tjhVMrZ>}!5ifAe&2&WDs^n2if@IzE?7`=uqZTM(6r$cp zUp3@grRSx5S%u-b`_0a$ko$)^00f9xTTebRul3;SF#yVTraaABIe>4dsIC17t*}Ox z<&M^2D5r`V$py$my7Is&yd83p#wi4krF0pNAj=){Xx7vtu*7(pr*}&~m+9AJ0W$h1 zF52SS>p!8~nE|q^*0+R^{F#nn68O&?t`{!Hk6Cz#J2dG+JR0vd6#=a~tkw*@6%GWt zsbq}VX~ng!ceVk{xt=9MFTPX$7h?r8+Y8cK_o0YJG0kLly=CTfnP;p!y>B-fP)k9& zdPRJP>Xg{VyvygOYc8doMWj<v96422r)%$A8@-lv^DF8>si9V;JPkTu7Y%8Fgr+V4 zm?1g>1N8a|AFXJciFnQ^3~VJ=uPleil~9TU1R@04NW}eTpSc7Ay6a|fwv2`Z>Vm#^ zmKLq~RdZW<3tV!VnUPkW$2cryYaWl4(pfEa=D4GNm2s8c%Fxv5r;_{W)gIqod%P$0 z&k@;7>{!M)T_Wwzh>M8Wbd4-?R)~e$)d3i5sh;i|J30nG|36%_7ObF7%u~RT$qvjW zWD7CV%$s>HJ-rCOivP>BAeIGi(H0P&sWxnHuN_309|PD7)b&x!q#oa2M~uM0UGr{Q zlE6Ss&JTO)4?x6*Dx>1%fSo}0F^2m5!!MY?&wHUi|LakJlmDKK+|6PyV{Sh~$rm%Y z-<T64{ashz+T-7il35ggJn3Ehe^BF<L-7C2?K}DZMM95`^G^nkNV(@rTjFKaGiTlD ziND?==-1t%hClt#S#-abXPgbc#CV><F9gV`<<@OdV?~){Ht>M7S=^(H{N-K+YuZ*e zufB8Z(s0_uR{<dI^c(}i_Glw(TPC(L9^#6GzB~_sVx|3ewPXPT41VLkp-q1p`wF4- z_u6k?rH$p^@8!my%xc;GRFvvl&l#cFzni>DD5Yjd@1D(TzupVUw(X8{#q(0fcyDiS zqK+&pUlmYis{vS8U(~DTHI(78>W_uvQHa4Naxo*I#$D@fTX@zSY!1sclk%r2WP7}& z73TZYlZ&i`sR8bPFm^V)9WdImr$oK+%H<6naJdgjisskuW$UD{Pj59wcf79pQ94ZG zZUgM-o$8`G6mwg(TDol|S$BweTS>X>rGLAIvO*lT0ARaa$8U3w?&9*+;GHzfqbgEC zuTV8zSMh~8!^({8Y*E@9z$p~FHIXd|jsrNA5aQIX!>tD?K#izJA}X8`8r<?!f*XN^ zwKWtHKfafQlvGqx=|H;oS(~1`xi<VpYHy%q#r}*w2%SwmnJ}Ph&reB%$gY9P-tx_I z85mCWC_j^gDWvq=B*NKeR6aglgeOvrVIzCgOd=hye@-uY*dhKhS7J<HI{fEpNUnz7 z^<;d^-PZ9>cxG=e+)vW{-Q}tpPM(AS;a_xlp7^`!EFh7zSV<<qL}u-?A`r6nHa$s) zEM1t56Y01C1~ovvw<RHrsv?!AJr|7~3}xi##$z5`ZNtF9@yQIfT^*_{HF;;0#ABn{ z*$oe){DkW8IyTt{cPS+2VCD)vt>o@yt&dZH!5&6^|2Y-%R};d|Q-oY0-~c~?#<Kn* z<;Vl194HLme3g?b-#hY~W&i4{T*dDb5ng^!h7pk1a{dRKJ``ZnbN<bycZJVGHULkR z!%=T?VmQl@*EIRGOmg3LkZ>L`kg?DXrhgT_07XQD33LSD8@w$a4wPIEO!F6%{Wf93 z;LrUpMkL4c<^<AIm_L~q!YEKCYiuET!N{4aw4X0tHC}hXOGWx;kK>)~hC>z^CxLbw zhVV?7pXnk4y_>vGE0`Tc)$lZV6>LX+pB$b#thi9SMM^AT2u*GUxJ<)UE2IL*`8P(M z_HanGw(0SK`-EQ`SUKlWqBCE#e2^X~1F<baKhOVRJfd@0JX8YI9GyIelgWA%tnobC z%kPLp$=h@tk>aQh7_H50FX5TU68eq*398?mMz>I4P48K`!xKTev_A{2ZT+;`y)=(p zSHkqYCA(sv5N>nMaP?3OFEjZ55E>EFW}mc&FKQYbXHb1~7wIA!>+e~lx%XYtt2sP# z0sHZF1W{?BC$<wrNtvd~{SpI-ajl<m+MsLqJIw(n(l8ZBGeD6wVEBU9@Y|dDg7@+% zg-jg8q9oE`XoXXvG?d~KR_+a?NW|U|>2dEzpKk_P+~w%jGt4>7aORpS+<jx#^KQAY z-AFjA;cIJyAAT(U>j+xA`Q~<K51`hV#Ue`pM<@9zY9b;cn)E#)Ea!^Nbg}1&;u!zJ zkf)^`H>m2+art!diy{A9MC4C~JSF$K-O=U0AZzLhIuN#azSOSyMXR^q#e)<+bv(M6 z|Ip;MK)fX0PuML*$4ocwC#;9HjzAAiePb{^TZ+nNT3_J?##jIxK$XA>VS*Q;@pjTY zhn;5^nM!?A`v(S^Tdhn4i(|$Z$sfp>@zQhbK+hYoAE=F}<u%`5?PCsRVIu|@2ZYSm zXjXm@+2Yi+r@&n2-uT+plj-bw#$7ZNOUW5FNTSAoRW!Qu;w($RhS~C*mN55>j~7N7 z2mZ5?D8wJzKQE7UZ&xw`S(b)W%_Eb&b4k!YahKr$J9S&yiT2EmJP^vNu~r>6iNvu^ z8`u-8*68LZ5$%3w6(Z<*t>BnEGc#->qLW$tueO_~Fj$bE^i*J07$W8TaVOndcc9^f zuk9Njbin-;+5`fHf_ySqZ`>)9Jx7u53rAI))#*$a{~25!e|Y5o`AJz$WB_WOFlp90 zLJh~w4+z2Ldv1L{r?XvsnvyRSv@jm7IkRz)w{|Sq-tws0R2cX!1@GFLJLi?Xru=@# z!}mr1frqCV!$0;lWz4pj?HA6p7{5~Zx~rk1xkHj*_)*-%4E;2b@qos1gg}I4S1clw z_H`dC$98Yd7(5`d*~w5x;)G@G+mp+4(TPKRx&#Xzb3Ui|V$sZ(haS%td~a?4e!S3z z1|qbN>F_#drt_AnGq)<Zr!B`zr;ZiPrRUP1mYp-FnF(Y>hf}I8F{~UrBwj9ft2>|I zqLw08c+3UNsd&l@&>Foqb@3!wn*38EA|#Np1Z54BUb27Q@S?Xpb~NCvV?0vqm`96m zR*p6;8OkK{9VM}E5zqOeg!fLalN#)C%5VSjs}@^9K_7krY2caI-UQED=YcPwXH}&` zvU=Fe5SnQGipu>zd}KsWe=!W!=4mGq^IAP{Pma-l%tP4?JtW_r<qN6|Zk?eyG|~wp z4t{vs;xkAwbYA2$1n4)a?W3Pak52gChMdAquntR_vi>5yCq)tVX7BBwE%!iVWi{B< ziSQI=Q5RBF6E>v)YKu#37De#hW8W3@!D<Yw*~$W$+cI_yeU;f46gJ3of(bpEG-TmA zJPFF}UhBXZ8RG^CATCiPGm}$?6YH2cC+NU`2_uwBb#z+hmd^Knnp!YKXrbf0Oq1In zC<hb-11O;O81-&<L;c_mb$jbRPFHxb`so)6bJ%B?vh$l}Zhxr%8q-L8NC|pspf}QW z3eyNq3fS!G$=_6^bt*%8&STuD@@%+cszT~_-?guEYj1$LTT|FFs<bu0FR<GK7t0>I z({wzFuD$GhSa-A}VrC$E<6&lG0LLD(KVO`rA^ehBRkWeJ=hE@>N@-b25DBJi@>3xN z=^hOA5)1nShG9`_2TZGT-(;yIFPv1J2zDPa5vF4G6#MMe98rO2v2HHV`8)jj)-_Y9 z;+tA99N<)5sxD9s0dUW&proefzxF6@1OToWl_wXZEpT(dPC0W4+|Pl|nEOY9-#gG^ zyzA@hzs`Bz&3&JYZ}n5t^Hf>fcW4%5cXo`dI@%E3Lf!$~ymAJfBu9JL9E(1cq^;_Y zSBxY}oLC4@ck<?f&Lu!%K+PV_mryt)e;uhPlgCWOymrwGfd+3hierB|$c>5t2f2Hg zcDbZ6LywR*b&S%0Ri?$~Z!v$P+%qj&@BW6ZBooH4{Z4XMVCNU2XvX%TZ6cBU(vFqd zz{#WIe=S@RG6v3fwm&OW5(S3R>P1RBH_12hB09(>^Qd}j<?`Lm!x37wD9-XPjSIR} zSb~#rYCl#D^l+l2;Z~$tb9#!h6YcJ+Y7)5*xGgAMR5q5wawS@C9pKK$UNZ0&dvG$| zGa1Vl`5Ru4;M`$%C>=UO8QQZKmVgs=seHy%A;gKc_VhBNj_J4jV;USF3a_cPU1NLQ zej)t=00A_Eq)e2)?`B8D93T)A6HB({S91$}eJSB^3FKuq(e}srxqTewyZU7uhwPJ~ z()v_3?pDkXnSFO1V#h(#`hDd0x+o~@rv1k?he@9V$2xA5QW1E|EEn5sB%eR!X$mcV zh<rM76W+vp5@N|yFa^0ZWtn}OF*;-5t6Ny|l1+<InxBkr{^-=ut*i;9H}-?C^Ip3_ zv>NG7|JO5OGs#i^>Om^clPjuq5~Y09iA0-DOd@`dyx(?-82mkW8S;I=@?6G{TSx+l z5=Q()6zK^B;$zQ;tjwIn-w=9D{s*qf4kw2FO@(}NT}DZuwtybVJX7$wb{B3j641j! zySUE)qLI-%Ca9yaZ6&$vz0Hjtd!`qDLK7STSzP_6^V>dn@8Q4NzQ1#Ig#4{}D<2A6 z%q(!}vuH)Q?zga}PK2hVrSXOo9%>L4#F4-#DRjpJeo8*O>hdNOK&b8!L?I5{hJ1;^ zoqEma1vXWP?p{skeU0H<*<goORZMuDa&lIbYwhy;-+RwgAq;1~O6A`j-NbG8=jE|` z#L&VjhI3^&Chd>Nh&>_?dkiaswiH}hptKjwSeTisX{j$hkWU_{XrwROVJcr*nJAk( z$)pNA`pd;VxHtjat5p9sa(Cq1Y89(_r-?3!Z;}An-pvkBKtD&(nUuIfJlaf?#|g_^ zMJZU6*e@;p0Hi>~m>k-E$j1v%<~_<bzyvQ`tFSWlA)w-qK8v>|4PGbWuJ~Qj)e3lH zFJX8Y^53_4KY#KAz==;Vvt4E-oHrCfyllR`gwy;skE~W_o0_YzHe#MG&PyDgIv{p~ zdj)e~R@?{H>E@?o4+RJ=-v+bnI>usDFZrwqp?>%3u`CP5S>s|0$fsZD%b$Zm-nSoq znt_ZF1E9ck`qGO*`f{2dgNJ1zA3A$K6UydS2lYfyT9X#e+@bCnq=&1ZD9c^P%MumX zj6h>Vpchbe`U|J}rkVcF`@%-uE904dM4fzW(LwOD7Ehdx^=lubS~u!#bgiH-&fOtC z^s#L%xR~pBCNaXhz@8dv)Rud%b?fLHS0AY`E8Vbn-U)ttM|lC@mO#e4uNHLz;b7+C z<sNA|WtomsXtwZ(f|f1ff)DupwvY9V+D;8J=JLYKM3kH~cqL&NL~+MA20SUh_`K)N z7|V;9t}u{Kd?%rO@1=NEU->9*R&j9gW+zG9C#|9Q=JK~OX&MKzJa;b;$}D-S@O@CN z^-;^c-3uW&3cN6h&lg}zC@CaJPT&gYXpoh$Re>wI<C59ol-IGOuggT$PX1R&NFgZF zU!Wl$uBJZeyrO9v{rs|vhFyxr7{$?Topc{GkO8Xf^8v6iHyfY!|4nzU>&rgqt7s~O z%ia~c8|foYARrbp-BUf<?S;b1D`|YOzf9f~zs@oKf_J?hA={z5B1~~n?QX)lPdttY z&UtCK3_o|!kBy)>-<Q>Z8`Ek-AVIUyBR})eshtW;rmhq(&Ip5WW-?C?x5Q_~G~64v zzR&jzW}pz_Kw3Od;}HIn6>`xfkhQm4*Tv2kQupF&lvi<Z0H2kc176K|GxR-4({>&U zO@0GyUX-=~tG6%22Kn_C*BE=qBYuT{O$b7dTRQi1KM4PXl9qb%uB@z(2;82C9!3`= zSk9d!w_PO<-m}rHn+o0}K8=Kqr91RlXf$w~U0h-vEX0{#PPlS!rJw?B2S8(2HxDsb zI3nnTtv6;GL4@^Vti50yBs|jn_o6$tKUl@9-P$VGF8l}83g2(GUS($h)uNk7%Y*Gk zFaH#afg(JLwxTLo3Qlj#Ty3PkFdj_wd?sqQyYXL!TosNp$>K(-Rs8dCv)>6zUzi`t ztC1wXo0;P1-;?l_l0cK;$q=&?T{m-&0SMu%mf<8!6U@uGUbNvfs9JTnE}eQ&zHjw; z{oD0>#+$iWoyK}^R8Ga7MlN#!u+j#b0)lo&h7XXg*rW78{bWE2ek+A>DI&jwG+5A_ zR}<kpdNslms-l`8b9Ogwuo|z_tvu@~kgk^2A$dX1r=v5wPYq%H=+Lqqnc|6d*Z_Ne zVb1Wr=R8(Ut~A0SHQ2~nQuN8v!i>P1+<TR_mNQHPh6s)BMw3d;t=`fio!Xrk`PMQ` z_}9aYJN66dENZhn_xzDlg1;S?RUi<^<m@OsI}MR29OdmvfS?#%Y-fJDS1_;>!PdKj zsC@<YoHRbjKduCSn8Hz~4E(`ZS5!xEW2ONbEA*Y*%U>2~N-y(Kaj!EVs;7T_Ruu=} zgyKOdO)skoA8#)SFmS#r<U>-IwRq>hqol6ah$tGcuP&PtIYfn#c$WUo&bKCn&*zdw z0JqPCN{!<cBYf$*MC%gq9s6RFQ1`z{>;3VIa!k3Nz9+T(>SAYae$?!;)4rVnS@bE# z@8?!phRK$fU*DhX2eVa9AI%XEpIt*%8H;JA_R7>!B!e1oMSzl?`8aE`5UE96pj@rD zQhxCPz}W~nRMK!V^ggc-={Hq+<;QPVPQUkvfLlkW=<e-PKo8zZu!y!?9D28;EBa#B z66!fqPY-C8{UM_8l4A08cOJE+FQ%-j`qP~<WwkF1h+F$bI&Zxv>oW7lV{iYlg)jP9 zp9w6^;ZSb*-;bi6f3M5j`ww7)|MlK#oqY(zt)vw5_nimu?^LAUUF1KX_y2IC=Ko;v z=Kq6VbE9%})S6f<oD;y{r{rxiI6UkYKbKzlEgUX(_WZ9`qJWJ?j_^~YS?|hHbu&qO z@^qAhj5wfcu1+r(&L41+;=Ks2CI2auB0+G+@Z_F9tlj5nFT2FTL)>uIN0%Ct?qNC7 z6R+l1vUTb>CjL0`)=xGcJNRB_n2L2Lt<PUoG3Zj57&>P<>mpM%CIn1KzkRkQu3Z1? zX3axjzS4bse{{UD?6S&l?+O5&Ygz)CvQg)Osa$v|S=uWy1>KFn@^180l8HLY^w9}( zvCXgKB&9j{sd%a3WOYyb3Z0dZ0g06;Cf0Gc23&JKR9@SZ<IMYp5P9i9#TWBAaEl(f zkOuD16RuovBNlcdmFmj46KzgzE#GbV<JSZ#Tv>2i!oDAp`PXE<Q}cKZk<l74t*xcD z2D%C%)!)C{P{Qnn+pxcAR{Tm-uD(GZDDG>g5iyqb3?^Z-j=maK_2!q3bB6pM{O5n_ zuwRC8#KzI|=?Fy49Pn_WAM##ZIBf~#cRYTVud&$R*<{UmM$^X^W;1Wa&w?*oA8!Fe ze>v4ZG-HUPwSO5qS)B3b%d#q2lGHp*=(j1&ZcH=(=<-=_q$yIPYpDSSpdITFp*B$2 z8oXJq=%s8x14=$=g>lb8@MAp^IPhSIijr5_&=X{6G3b8*E{}4<4?NjUw#}-q$Ava_ z2z+0IG3FV7u7t;4m(AZtU0Rh~UQ<PLb91)?Tk&uaAKEId+<G|*XTH!NI9tcbEBvGj zqxlj5RTzx{w7OYGDiQ8FhPtyhJIXCyJ1pv)8A$6!Pla6-W2OtmFCUS67-i`NyN@k9 z_7REYzrIiIyMQn*mE-F$2e!%d-KlK+16Q85BMYxR#cH*)i3@iY20wAX#Qp2N7aM7u z1VA7k{=}6F02VOMw`}--5VA_$w_?>|#NlXfH*nj=rS^dRiT$$QfLVvS*~5+~)Y23t ze`4p56er^T6(n*;mmj+s+ko6!=Uj^>cIL>_-uK!%c69AQL=6wg=|@keEkwG55^_80 zTv<~CmdvpttlyRkod!!C9i52UbJNa0Tf`~9bzHVy^1pODdv%k?!-fg!F;sYj1+W<% zc(!82EC7^6kUYB4ppfhT4m^1+hiZnSb(Q8zyH(!9_7nh2Ub#A-!N%`b6sT>2<bu<w zzFcS}&Xex;;4XKBVDKkf>-6yGA7FB+DCQkQv}qnQ-lO))8C~AINzP)t)6q_&W1rd0 ze$)D>Cjk}8PM(y+hBstOqOpgb%3WX53woNS`+2sFx#D-wU;V62pi+ViF^BNv%;B<D z+qHQO-Z*&I1@2D`b_*ny@~J;5&$5Y4iCW<$KU!c#c22f?kHjHh(iaJ@^hFe+{7~w( zLd_z{QJ+ZPQZcwC<2;kmQl@3IdS2EKgHAAcbQZ4fV&8uZBo#YGNh%A@&b`U#G+)f< z;tc+(z-NW?ZpKr7*tnvFr0aH4VurnSnmSqGM~d7xhN7Jc{^TM|fIfYz8w!@*XtaCp z=|J+)!-V+R>LcfxtXYnCve3!{>%l{voy7O^mkzH+TLZ@ZRm*5=#l7C48mXkl{W^*i zc>e4Nl^;wysZPI>*4RZx<WoPDBmXp<^#q2&=o!Of$?+9!L|6vO%kE<&D#9hs+zN?& z8a2uOVE09Jezvq+QB#&+*UJo`@p5>N@l6=N-Q&)LvdiR_?1YffE-nW6cTR(Au}$eX zDRxhbalZgvT5Rh2q=fQwi&Q~(B~2zxJSfM7c?<F&>TS=i!4LXO(Gt9=!kp!x35FeR zz~`-d<t~ne2tK!T$}gg!XNC=wsV(2SUUxCZHr~pWFZiw#tEgHzQV1Be2t%H&0cA=7 zH-yrjct|51Q-vNS<4AI1Hsy6Lg|c*A@&7-O{5LGqUqo_c6S?n0ZMScr9mTV)jko`s zLFCZ!Ici`j)`I(#-B|iv%aRln?VaXTV1O>Zsd!n@^x2P3tM9GfxT71ny4{6P08kJb zouI+2qXjQvLUD2)qQ{VjPIx(oa8dBStA3BGH&>~3%R?;sX72NH+G4nYKu#-VS-l$u zY7plH@d$5b`V%9KGd<#}2Cn^{TYu+uH~P=-o^iWv%3iV@rrCBa&IHJ6#jDsB;{y4l zyC;Rj1Q!c<w-y1=l#4;c5!MZ3;9WNdFcV8l=`e_n(C6F$fj3!0Z`2k)J<P4L#bLL6 z0&kO<ax1ioaMOTW2YRrrR?B8i6S(LjTq&oZ+*f1vMR5@0tH;;TXPc3psx@-sVONZY z^y259x;o5kCvSCIE{xbJYG%{XQa^i-T%~4wT|6FHm1L}a2)CB%l=0php?KdtAd&m+ ztdBmr%@w)?9KzUh90;W~##o%+HR6wn`XBq;`_;QORzPXYKs&2Fsh9^lWYw4LtJU#Q zdxvi7o`Y=Z2tF2XleoJ~2gT9DuBe+Y=)c$SOo;2leN>_`mW%8_5xm=ztDP(s&Yu&_ zkG8!`uh9;W{YlWUfIVQiT1Q<Kt)sz&3#GMv8<B!_sn4<@p@!Sk?a)O7-x>~ev_qN? z;6h+10CggH3K9R!2cYF`r~_dJDrf650!Nk-Bi6z^vhhTQf}~OR?l9pk_-b_|SPR8a z+zRg{%fr|UTy)(92~IsRSt7os@q>yw)Lufa7~VZdlR{cj1^~WBrZUBRwX;QCnQn|1 zooW2sMv`?OpLbhEpKwXkK}cR%?NqhrLx$srX7-`^xVHRieY4La<<oi<OD1^HK3!NB zfTjJpqQ#<90>DFk1J}$K%S)U0G@t`P(EuK4AN=_^PgeO@MU?vb8%nL9%QB6OoSkg2 z`Ey@gYjj;YeNR?ew~`F@4#kB`Ya8T&hi-{D_p0J{zK(Xd>_dz4$sSL_l9u#KcH_fr z)DkDURS59p^xdiq^|k2^Lf(}U<INd$nk!wt?!hP^@W396|L9smpGYrV5r#^e>jah8 zi%a5l7~&So2~l$ovKTve<X2DB;<+cK8dEkhtF(2%>=jE=gs%wI6B03;R54P>f^PIV z97!!sBT)ezy(DF#M=->ye24(U>GZ3vlP67g^<DRx-!{OzHrbUVixLuH8bUgu??B+m zQT64xlqBT1`v->D7|?Gg|0tc$xxG1A7rninYXcSxf}^oeV*K5rHsvwb6^Pe4*6hxD zny#=EDjojKdWblIG=IiV|M~_5@UMT3ES>k~<u<9%pU=fImjG}oAlbw)ydvEarXhX) z3cKgoT>w#K0UjW#pl+i9L>1dL(>l92`;6t>2TMk>pLeu`wh~-K;V6)s97+QtAhpE# z6_pQG6OhvE9u<~2^Rr<$vwzsaR`>zKac*0it#viP;Jk5evCni-Q%Etq?Ci9~HfU>T zZgSVJ|HbFikk0hMIphSzvvE|*6rK2c#h#eA&61<(Ck-_Hb+Z7~M<|>6ZLJ%p01(AE zgJ6Mp+V+&6qvD|n(c&hc4sH=W{IfGPeAlrfF9(&DJXT%kU40~s=kn=g$ow0o8T{uf zecP=#IdALM`;m!*$?J@~mWo;yP=hT#bXMm8oNZxYIBoO&!;{Bp;z2qb-6E#=q6}<6 z80NKtBZusjhd{KUIbGbO7`tnZs>liRVG6p~MA6ip4AtMK)GSk67_6k{?9`5qj%&DW z-(jJ>?`FBvUhoi)mBTtxQAO7q9iYz?Atqp1(k4p_H497WRWD?VC_dN${5|j7+;(BR zdU59k`n1hIedDOggl=n3hBGa|_y31-$ZJB`zhZZHPT8TPvZ=3s#=fjL_#?)&F0-ls z!I<Gg;ouI>uQT%mCJ@G;>MudyvRRV9zuSzKE7QJs{CZTYG{;xKKBztWXPW~5wGXY> z4)p|e-{lt3Dp0*y|9R+V<Eii_U`*%m;H&?To5LAsh3}{3{t*oAJl$kEqO5e}$wD9) z+KFVAe2>-BH@R3X!#m$;VfOTB?=hQ{@p-#|E;D5-aKs@wo7NcKNvglyQ&tZ)dZSu9 zirjZgXCt}wz#OYyZD&1liUMmYFaXz1`$=dF?jKjAfbmo+AE?mA{qih94#4za-LdIS zFdGZb2-L=-O1x`%hZPc3{w|&G?m=FbJp=Rib$~0cr$YE*LQc~mYAj1<3E?vU-g+D~ zQj>%sLLF|~h~T1+|8*D3B6?JrXa8Gc8951YqD@xPuxw4yu!})whPyJ-fm!|3{XZ@< zY~V73ZW4j8@<yNFeWj{fEfx|iR!9$3oaENSCxAw6@t6G`wLf1K=ye77CntTs-03C~ zBC2!KdldTqGYbg2)GP&`CzB;D4*TCi82R4k=oXI3|0rG7y>ms4!HIJJE?*c8ge1x5 z3ML6@4jA;`jF_N`{xpUkCJ1+`@P$c^{LjOXpBowhr-=U<9CDNNG4U81K2Ynu-}CYP znmw%GeoMfHRQ`dlm@jf2-Cw}eNj1fp_i**?-ydLdH>#gavkRC4_uq|-EAHt2Q%@@E zu-rvQAbHim6RNv6+?@8EiAz0@@ax_pD5M2o_V9E@FLpq5avK=`Hmc93-TxR{Sr)2w zO1<j*!G|Cfip8hTH_w!X@WSW0zlRXP?)lmPmMJ28Y2roj61IcdM2TvN30a}}wn(!s zYq8xN)^^_erwPu&%@U4bdrdy(!TIbC`Bb)Lp5Jg%K16?r7E!eGePu;i7f9@b85QAj z>>2L&ygMHKzWv84q%b1f(Q$OaJ)N=dhG&ea0OWZ&IT@B8&(S`y5Oz0$jU*V`O!sL$ zBKt%JHq7fB#ZYAV(d(?+ZG3JmG5z+%w^))IMU=?%IxiAwM&5uP>LNQUXWg!EEci@p zJXJ5&w0m2rpG+gJ7B@7-#r;f5@0FBfj7sZEA5Ieyi3!E@3ui-V4y8)D`>JdL)lHG< z4p>|j;!O&<k$9K}w7KlBLZno_H}=^Ir1E-?Ko3J?6VO4eG&p%wZsV#(AC2TK;a?B9 zLdIhEx=xzGmy`)e<Z*2ipXkc8Ph|AXXfe28P|pf8s%M6?(24Og8uW}cA!3$JoBOHs z#O?$amiS4$S_(Q9-SnR{1d`5&<!+MYd;bAM=Z2$UAm?`XMV8ONV>8Jr8Sp96d2M0m z(l8Ysd<|01t<*MdpMbXxr9$FxHMdAE9`kuvi$f?nYG7uRt5I<@G6Sy_+F$b`qm~Xn z2xxl+*L~PTRE~Z7Y~Zbsq2>g++?K?%#s_iyjSfXujiCcHHFKiMA!Lv(yOZZ<@N3iC zY(kp$Fa!(>1~5Sq&v%YGR;c(GuH)=HyN)3+E6wtZWtQe$Qq?fdubYb$qFiZF$|?IR z)c{3E_kIJWm=#M$gK6qvzJRAVK`<eK{s3yT$b_!L<$-v#XDfkT8O$zZ#@A3<L$zjF z16^@><2`I0oN@q>jmQCe(O_qc(#P2r*jK3Zp?=ek<{=RIsAAi|C?rLAT<sT5EQDfj zU*PIHFL6Cwh~wqvrHiUnKTTLcC_R4hwnI^^p}(c(wAIYDn*%p^AJJA_Q6w`hO!6!t zx(oPAIl$#Tr<0gk8TX=mrnh9<gHN~C#XcUEyY(aSLl+N?o1;d4ae}zPf`fu#)WhIU zyP_@{kCa##Y3d*2aFE96vl+$rG}S!FoK!rJogy?egbObD2nLEb|9a@K>?<lN3QWz- z<s2^7Q*dyocyqK>R<eHnHp+KRA2ys6nU)qVlgzn3!nNu*wAI<<w14JeZaisVX)RVM z1%D)AYl#iPO`Up%6G~$V5ekw@CHw9_p`rQlA`qVtm=ohrpk(hd6?LaPU#~Oa4w-sj zD@Y(R*-NM(KNnm?<ar_n`y6jmw8K!xBi`sK>=qA8nDbb=+skT#@LnA-W|eO~P~ALt zxmRvT)`ptOu|YJA!~+|kselX-qa<Al(2}2+2Ssi~$z^cPm=!KL`3#dA>RIo<G|qdQ z4PHn45a}Bs7_<UMPe7q#QAZPfy}&jxsKT`n0%u8K;xdHYS0JoAUZA_y<a^nL*959| z|2||an`&{o&#MqkA;nm7bb5HB5S>3)Z^OA5j23;wip<+Q?xj!G`;dEx{*6{OX4OEr zvt&|u$LdPUt}TtQ^>`2AyUVOXiDX}KcJ~yaMyBbsc$qV_ku2|5$&0<WeaY@9r$H8c zgLj~~&L!tPVcX@dCoQqtZAZBpy2P8Rd}3M%<_Xu0u*cMzCN8W+<awzYIeLf~Tb>yV zZKzc}wKMRDB5i5y=dSDLN&0Mz%A*qMVn3|TFULY+2ZC?1w)!P?Oi?xunMYPuH@NS+ z+ymANibUr8?%l*Edu&x&zL%a#I(;89ym&7#_w0r8p{SlbJn?Qe`Gvtk#c_GSLD6SW zX~itjlfA{eJJI)z@W}_(A2<x*iA%NZWoscRFKmdaG%9T?*@kP4ysgtn=E)k+I!u-W z#6wnoG?#u0a-hN4`i&fei^@*J(4Nk}-i0REoycz5zUHS+AS|iIyp(3(2&QKOT>LLS zmI)sYC=YOXyiZ&6i%k%bv!+Z!YpelW{6dKxNS76uD6>*Ej9ZEUn&T72GLp~WTike! zc*vfIq8RjV`Oi_q({5djFbSl?mvxAml`(zfc*!lC1nFvZpeJa$S$~RKpp#Wso`URI z(?%#$mjny<7=Bz`Az;+2#X}_AHb$vfl5;#TxJmY``K9I^>;=Y9%Gp;qye*<b;dF#2 zU=x<^kB7LaKBAs>umrJ0OPI`$`dFR~q<mc7I=6eVX!sIED8{%^TFLW9-o{#}o;Unu z<PW^6LCJ~L<;Pkhg8?5*!!k;%ux7$_Lz`NjSr1c#=T9<CYMji{Q#gEKIJOFG1pL-3 zJdxd!ZEDs0VX3=2Pa#6JGwnBq6ZHW{rb61%5F5(Nj?;bpj7mflHc+UC^r|<%K<Tk% zmBvIirLp>l-Spxj@m1P3iiTA4p%gX^d%YT>=mfl3u=lIQrvaz&l7QX_#1)=^i%Saj zr^~GC7`nf{WJ2a8)MrFPkyT%MKm>k?7V=i%gw*ngd{N2jJhR#o9bBG@Th>KvrX_`c z;S{{;@WVC-DS!`*gC-jZ;GNBsIpl?I@3I#=esk4lAz6=@0)Qe-6$zvy-jYZ(PxtF& zd0j%B>8MDQH|M(QGtqZ8L}hhZ_OIMSehGAd7hS3oI*OuKNGkWm+;n^f-wDFZ8F=W( z16R{{Zs5o2nC0<nI|0zU>EWR8Aj6Kx(BVhf_vGrl7wXlSCfk?cnOqx7zfA@Jo!XKV zng-BBFnV}Us?s0*lYQ=1FJLN&jKGqNd46@rziUk=={Z(K74}=elbl?W9WO&jtVXd{ z8Vf9?kdo??BL*Ug%!qo3RJN|`cxc%b_1cr-ujLc^bpksOieCE1qXtqo`QtY?*3TEA z377$XA;^AyD@*0y=TMqX|A+rt){vBl1=VD9*mW^SZ$jwVu=4X==HL8Kfq}E1oM>rj z)A#npusZ!sOj##cf{(JKYWB3$hG&sY?Fm@GVOfI-p8L7X&{ds>WseyqP674m;;vxe z4VI+<GM|*f3`cHDrFOg_@$-<2S#of)a7i;-myLDzhl^3L<G{4f4*|3<hmxYN8N-49 zo9P9x7@y)GY>9h|B3LZ2{CYCGY)<0F@(uUb`;|t0s2+Q7^g4mjS6D*>_g!j#SrdfL z3S5KWvf`Q#Hr*LbZ8&bdiHwTMY~8OO!&?-NCpFT*Y)X~oP6e!lb6lf+8$Yb*={}uX zPb8(ZpX|~|ocC;f-Lqv-VRFtLT6;Y3VRP8Z^X};<Yf;gCFURA0qspw*Y#Jpb*~m|y z>=AUA3AQ@L<eQ0{+|LiOYGaq+6<)0<g_%fFHziwN$JKUlU`#VfE;o=detR@W{ObzS zah>(}0KM^67!ToWZf+I`fe39Hgkeb-wjssky^QrszKb@^C=%Hiq@HIOdHMM>?#W!X z5+){8b+)UcWUx&K(oQIb(mikqkxiEC26k_B>82AJEuSo7S}2|QgXOg}f}}k6#$^rh zug6{ADih{>Yh)dNhae!5k{ZPDjvU$lBPg95!u>%vq7Fj*@=<=BRPhlR0SIhtT&}e$ ztDrUDiT-i=z$%9_v8L4mg=Zdbnu*@sURZM*wv6xBhqvjp<Y!N>-OXV=1wX$IED^MS z*+L`Oda<ss9j<;cthH4D85wzPzS4->?TiLsm<txPKfX!?A{MHvptvD*d6d3;su*K} zb4EvDX(t1DG}Kqp%$jSjJ&{foYo7_u$#ba^q@yEISjW=P(upWkVux8W_FO5WK}d1t zsLIN7^7cQ`*#3G#z-pqdIrR_`+IhU<e#|c|EnTqoD1PW8)Q{us;>EV_o6;%#>1OB{ z;R1j|b?u*TH0_slU7zotm)5-8tI%+MM#~CAdCpjYOSQXbelC+~X@^WF_KX!9HqqjX zwtH1(4|M}e&BhtRKUN0ET&?&|pB%(T6v*<8U&+YyOiyEllM03>CgR_vYOsCt9d4>H zpQ8HwwU>}CM5F?^P&s-)9s2UC&p_BTh`rJ=Gm8qJ44yK7#yctrXz_fa1a4+E6w^=& z;P!uLN9sG$#Jmx`C!xjO6g>4{m4)|B@pzf+ug@UCnP!oEB{ku;7-R8=G4|lJI?WoQ zMCI}wAeC-bo%Ng<`!$vKsXeKO0LYBb(5Z${Jk}b#%@ayfQJ+P}tbi59P2J3$k8xM3 z&JvednEkj&9aXIh%$?K5YAGkmHCWvZ-|ec|?K(Oef-wLqPQyqeWFqnO=}gZnf%nTs zyN6ait)P%}D=!^t3kR`fW_48IbR=j#1lD;<ObH%gVP2^T9(Dnr1wKFQ(shmCz$d$s z*i$%cdiKE2iuVocWy+m3LufrI3T15q^J_n6Y36G}sc~*|VW*F<JSHuno312BLL;r9 zz<D<DMD-%N3hG4$i0mq7z{PTHWxpcEp=V?y+Tx1hrs+sp{@8x+JO(^OD}1<-)0<Dh zcqujlu^Ia+%hMuv17unQ&&a{}%n3JY7b&Gm1h)`I=FusAkwOwZSSo|1_GT?GTcE^N z-9+#C4e=XFaNeoHoCYZ6H8l{LpI+?oq;G=tZW}i)lZdv)eS7Y%6ELAV6PR{li99Xr zUjPH-cd23E$0w&hW}b}g%w<+n!BeSl>1+_}>(jqNng-4BKQUF}2ZNlo7d$Jp-4cfn zamW+O8405_%s{oz(eSH3K8mn>0I!)ej;%;TUjX7UHV@$Nt|OT~e)R@L6UR2eO|SBM zOJZaTe6BlUWU2vb)6Qn4Hr|1KMr8~0ri=5IQ+-O+ubWdA{c_T120CLR>-z20Hwzuv zFF?J*?dCKpu!^WIU~Za1O;vZqnstTGYSd!08|P3+rTb|LB|}=!D@Sr!K3?eZYY8cG zmSF6#zrtCpoxoq6Cu`aU3Kk=+Y{j!V<WNMeJp|4@{kvaa&AiCuopi}N78bRnpmQ1W zp_%a76tEEVly_!L#HNV_Dkf=RU@05HZY7UpzD33;_%*)9x*(H7%|Xl-B{mSI$So+V zGK?qSo*fcps7jH3jX$rm5NM*+bTNT<A|nGEo=I#PlvM({ZJD8A9-P>&K_gQ8Z1BpD zC;xG6sT0kUq}Xn*FF!)>d6p0A7Q{VXgf8LS;(LDkgcm74{#Y_w1xfbgn0f4-3uV&b z6}ZnAA4wnA*l;A;Y3Ji2N3cRXVaGF7-9~FiJj`$1%M5R7E`^&=M#2fOb^^bhHLerH z?(F$=#Q23~5pXA2CzOArG@dT>3{kf8b$+R#8e}e>b#xFYPd9;KtZ`_Ukw^0eNp`$^ z#G4drhI_4msohEm!*e3jptK}@5*Gz6gW`Mdn^*oV5~!g=r<h`G6~#G^&aoZzwHHm; zj(vNQ7*<nr=NeVvNm>}hQ-_>CnTi{!yQ3ONiKjM6;HRv$2~_gXB2k{BRKOBj7+-cc zT(NLqpQT=_Hu8Vx2D8C_onX;?pl-Bf!;x{MV7&rcuU3Qkj-({4v>-&8W@6UoIao}m zn&Ay2cZc^1#3iQ=JIZEmchkt$i6_`$a+)8P2L5aKvx(4@PntEeu=PW+vpO-xuYWCb zY78dwfsw+(pM((rRumtQe**4GDpatEw8BR}uExA|Vd+9cL)*W6-F4SqaVRD(7|@b3 zYsYH}0T!#aVCOb@iMMexUAmt#)0{6*U9whI1TG6#3b3;>tDkCY47J>$&>(o9z4&=X zeC3M^8lf!UDX>LzZ(80t61P<0M;-LhGI|IhQh^}ouIkeVTcVngDo$3;RiZUVcNdw; zd$@RxW9CRaKeiTGwE1=`7yf1d+svBY_j?SRUK}WvC5|IgG^X+4&(jX`cl)DGI7d~J zpz9OCo>E&ih6*l9ql#)IeoxHm4kU!D0-K`FvgaV0UEvq;(`5277z`XBk%9&4d|ZID zd(GQlS|A#A`~=+W#)5;FgKIr)7_dw?^w^Han#MNh<o2d2tu;bF=qBLh*MoNenhfQl zF#jA=Y^F9#k<)pVOf$q1eTl6aIE9kZ(o2dwgCx;MQLLPz@X2e><hE5lotPCCIJmJS zlbfPmDaJXzlAB7<@bSMU&k3U17O=v-?EY{sEAOuO8PBOMLv^esQeHh^dyuF<GTn85 z)b_QLzF%%3j4FONrsDl+skHjRhS$g^NhEJDe*rUrmBfIRX*R;r<w`~?4Y$?@_&b@c z0&x!BVh801VGo%c)zmsQHqo~du~fYWHXJm?v@mw|_9T^D4-ca644ic7E)bT6?(^@@ z<I{xU3HEEHk*ZLW#E27&iHWK@2qx`!RozG#lroOu=i{G;e6z&ZF+GXjvC7P-D8rA{ z%xqWC%!My0%|PuOoaBRuy|G5BS#+vH73=aV{Y+`7iZY_ePP3VnRraKn;&2y&pFHv+ z3!K|v`t}Rv&VEfS#fEjoaFdpo#?!wyQ4_J@_*mP|(y=@aYv)dY+c|}RfUeA*-Kyv1 zI^e%iO~ia_*QE(0sgWhJ5eL;hf<VHnlF%zr3D2V3w|0+ZN#IJ}BFL?%-mbC%UWvRe zFNaK=K@0P)OE8K^Y%Wq&EiaTDtEg6Ep(ioYsNe)S(=rXiX|(|J0+AnjA{Evu=R6O1 zMoaMmMmQ7O6@s+Pt*nO`x8jC~`Hpla)iMiKCKY7oZfxO3t*I49kfJZNF<V+Bt*BTB zr&uM)HpB6RF-YWT6+@=n|3%wdhDFuxeZvX@N{VzVC?O3>NH<E0pwcKEQqnPW!_X}) z9n#IvAdPf4Lw5|!F!L_1z4vw9`+e@`INmSs`T*;gVpwsW=l}mJ1nJ?sNz4h^Ajyn1 z%|=!I8UifeyPAo?Y@giUO>)5q_rXUUVqjKiP0*UC#lT{c&yH}KTn|=okGK6=RBK;x zEjy;GD=H)q`Ig#hhvXwWc}x`HAFhZ#g#?DI><^gKS?Ym`w9@n5OX;z^6{DRCd4S<j z&8Rh*F%9`ZXf(UZIDhzI$}A9sWl?|;A)@u-x$#jlR9Ix&hC|MH^wr~7EUGcy5}J`T zz31<~1n{t`=JJHQaBml2zXTb+J7;)(A&?t7?qBjHY_8<dVVDyGjE1G^m3EU&bEmEB zc388Y?%Iuv;I0f4T=Sy}!<_UpB}H>rE?hea8q->mYk*-9_x7kY6NrkQa4q$M0KUX( zZ&b2e?ut!bAw2&Q^nAU9M_a-driv8OkXDVoY4uu0j^if6QmapAo8FD}wM(87=({oX zAPXU`0ut;~2IBt8y{EzX5Q@!sH(TH5yO|ZHpWrVY-h_UMG0P-iuc<M^!B>tlYAO*! zJ2-qRZq@iJKHj)31~l+biDAZW;N5|C*WykSbimB;IDK?iSLiqly}l8mOqMY$6?m`h zo1LBgf-U}`m+0%cTl(Z(bN`w~qE35p25zkQNRtmn!~6w?;@Q86$(wnCF9LdAV^Vw0 zwS}{wH%ZB2;28d%z_ix*v|(+mcrrz8kc&>;NOxF`vQspC^)OYjbxFefrKs%7Ua z4cJ+FI^z|R_?JiG9>zXXeYy72$(k@g@k}**_Hls6#!rg?L1(uhnR7)mzjd<DCA&{2 zh%p!4e(2Ndh`e?vxB2o8=ZOztPn6xC2VLyO)zkdzbnZU}p3Z$VP<9_{HF6)<4+yKp z53PJZ>3Kl4C*$tl!#^f=|8<uQ4}*{-qo)l>$O1iD+Dm<#a$MWwJrDhG*)QDR7!+En zvAE9#9`E2&NK6}Sc!S0DjpSwYKHH)aBGwcyN{?}Af{!;Esan{vB#-2lpQhm$`Sr2M zYkX!{p_O#b9X?n|@`9v9Yh`Lmy28iw=6Ul8lFrT9jaq$R@mwL19<?|`w>N0IpFZ&5 zL=}->2hx*aBb2&@^Hme{vF;bK5d>o5Jyh34zLA$aeMhzRCC_LywUri!^`!!2^ETlh zGTGQB_&)Yol#0xfT`!Hif<h;dE9L#QH*)okH7Rt|><46U6^CQnHwM)Z=h~Vl`HNnX zXcOU|7v+25$q%undiplnl1+SSwjpncyv9uSIF_OGOOu<5m<vvs77;KtIQqjAP}a_U zyR)cB499Xm!->jD{N1*2{^$)ujKfu1Z5_VS(2yBEo9kTLflTe%8+mydpPy)xc<s|u z;eRH6h9Bz-*n8dnOl^ziKG?a<-TyO+`{Gf+FJsHs&>!1!8Cu%OW_wTD>16D_O32S* zCA??%mZ+6bQzDc;6wgD@gtb?%@uj3>UOoM$mNz#?O(ex3k}8kJGeN4Wsvj3^`U4NQ zpF^_oB@fvRbu^}XOA_``cGv3w0v9X=u3f14pf`ZO@R>45kc8duam9XNZ?4xPy=eaP zi*z9S`{Y*)+N{LnTg3gRdrv=gRi-_Ga9VWVQ^yq=0ovi8UKWi#wzvKnY))32{a*`D z0C}U2ntihI0iTNhTi3h|B;t+$K0ZEvr=8;B;|p9}H6%&09arKn94W!D$G6EJZ}9&~ z!RJZG0^CO2TflVxRd8bBAl>VgHtX1v^xCIwSm0?Y^5c^b#}QwZK;^8Kk5u9OMjP!# zU~DZX(}MhFsJj-ta{Z!>D){&~BoRkNibrV3k7CEo>jZ%YO2(B<=N0xOpuBX>Dy^mN zZgPl<PRK)Zt$ty?#I(yvAiHsBE#oYQQ&b`|6Hnq{ZO+B{%CyJWAanDf>}DtnPCU&I z+iJd?hDo1cd{0^ryXBh65#EuI4Wfeqs)@gDpYD`rW7O|2s|K*=lSZ00?r)NCQ=W^5 z+GcaUc~ughDoCbzTX>BSNq#x+V^dFd*7HtgAdWbTdh?5(EoD+zJL{X%Sq{bXJsf94 zRs+fRT|5n+t{UnyzKn52G|bG;MMNgN{1oQ&jCEs9v$*x+`-Fj8_J5jN*#iKfo4y{< zom3chVgl~U^^1pspPvZR5-4YgMgaB&lp)+BVxD%eyu67Ej#mFX5ZDP~yW>tds?|hg zg1$m?DDCLVzGY-i0KHh5fC=<;+gq?OQ0fL%1JI{zo+6n6n^d}6+C<o@l<sLnQc~Jj z*#y_f`mddyN$QTPc8A@#m$4@&>c?y!w%?DwA}~+>$wg1qR2}z(oN7Pxc*C9NWf4N+ zdFS@GB60J+544MO_h2%ljx@w`YBlq?e)V3{tC|zDY!cI&{(;B=_YF1(J)QZQ3fPkP zTlu56Td#7HV+~GSS9To>;2cJj*AJW1fr(4puH;<w_>w;$?snnlgPOCSoWW0LLBeCE zJD;IBd@QX}+%KN0Yo{^@zJ80NdfXf)QS+j&oddVf=Sn)4?DxX}Nn&$zg{_98?Dg@z zdmKz`gafutg*sOF={Pdg-Rk+(UY>|J)Ar?vf(Kq<I<{K$i82Naj{{<?CeXj-an<|@ zWFej_{-uqKy3r9>(8AL0d(HPWPxn(vzkLH_^PdIt_s>A!%7eYBQk>7El{4_fuvS^t z(6F$?Umvn`|5}H9mL>imH2Nt$KpM7kXf5liA+)8G_KO~C>}LdaN1C;Sn>ioP#zVk$ zR2N71RjW?tH}*<;k3-krpH#8nhd+NdDsx(T=TuR_Q(2>mO)bDJE9SI32EV7E#8(l9 zTwiYd>2p&zGel3kNaoynBr{}Hl8y>ba9HQw^o=M?V&W_YsV%$Q^CW6FHi#qW=8S0f zo*5a2yeB0#9q4z=Dld966_eTCxfZ0Rw@fk)=a_qAyBj-|%5w_cCu{lssj_<Awa1Ms zcPg9z)%Fz6)91#WPfng!sTI+U2ssIK#8IHzo;OTreaXWJaCb5vFLDX8V-76Txxr+r zb{Ary`RUW}oFfzGJKX~`ZpEHi7T&FK{@_QYs$Dj1-OO>SI|*#o{e&arZklsk-88ZJ zXoE&%n&2LE&xZ#c;R;6?iSM1sYS_jr@(m$C$D)d45<>wI9Y?|VZ~QW$%tl|a8vge} zk#LL}S2ftc!~~NLgy3FVTRXn1S8ge+1`^n3nq7HCZ_m}!MBFu(-wl`yN`H<;*J#>^ z?a{+^o>Nl;*=mfJ6A0X724ciks>U*9yui}&#FtJv5zzu5&VxtR>ZB#^4yzeCLgRnD zr;4bb_lG~Rm`96YRn>?IcpiHns1cdVla2%r;!}4ir~131LWQ*hDcMqi3Hu&;3=d+O zkvvvSbu4^1lD+^I5XLt5<{|EP$|2^5l-}?9YBPt&eEQj}k8Si?i016@KL45^(fcBS z{U}&HC-#wijnVMb;>(a)e8xsM?w8A4o0&z9oY*m)!>^u^U;tLT8XLP*q_N(T?s(Gt z3@=@X<*2#q=Lwt)#hU~+KD=sAp!qOfq+g6rU7pWwpAz&)jx%u5F)w=}CJQrCL`pZ< zu!PvQE#y8$tg*b5ofJA-JCr2^&gVR$_iC2?CXl?L?Mh<#xXJBl566eFR{Paj&wI+H zs!^H?-k1tbGuIT+X-!z}sr$ipg@e(mW^xfzs$6c*Ng-0AgHDDRNe3NIqO1%3a&n%8 zIT{WWH-&vlXn66f;De~|?{Hnxy|s3h_vS24`8xqoNj~(JS+%W6W>*Y<H~O*#r+((< z`VZ^>>akjGr70{dyeYnph={l|pBdAaP+9~K&aynaD4&P+DQMUExSCO6I*A#ez0$fZ z#rqNp(fHby451n?E%@EEi&Y`pY4{ZeK)Vg=-G|)=?fl`xe_l#^na%#w<Q{yhYHb-< zC4hH)nUj@ETGbgPOFU7N{Z46@v%u$*pT|>;lCUFt#q3OBth}+q>v26(&CaoU1@}tL z<MXN2)tiP9!`?tOop)p#Kg~SI57}fix+J+f==(<~nZ>N5W-~dITQ56sh!g`Gj1#mE z#Fg|$kK<?L<`q1GL<<-r9Ld7I?r}ziS;*l@I^&4cn&2)z`}_uIiCC!}UQ}&z9Jvd^ zw#0I$S<8lvo@gw2#{{3@_{Wd<PBX^64mra=%rF7}q|xS`oxf+fZgo4K@}sC#wu#~A z)>WN0&};L}myjog*96}ppo|z98D!ta2=E2wN5^;x{me15Ap{$7oKEo?GWnPBCId`} z^uF>vX{AU}Z|3|GTcx7)7fH8ghwh{EA0ls#1=+Go&~wA=zY%Zlb1L6bqaQf5u4AxR z0TgXF!i+kx@EgILiR*&B5{XEb?ezX~Dbon%rj^#-Wx9a)d~RpX6pQK|hgVgOv;xz| zZ-UQnCD4pTZ0KqS;RfB6GGc1w7y-=fy{XbRekAQ0`RRc+MPqrAqZqqdaUr#@>j|_a zXkcRbdaxC{1}+wSV|lL5lGlo32|y9COyo2YpY=9QU49_VI;p6XCAP)v7awNjccU<` zT2a-<Zh{ZW-ky)>jftgpzyl2iN}7xljl(zQDj<9|wcx+{uLMLl1FqM5@=z)(8M~qT zx07hui{O7SuPuOb>gpm)+kE~<;pIaKlMnTWjeC#j=*oQw@4C><r~Rw~c54s(h_d;7 zBg^#aMLM^uKk5J#4~yA5^!EQ3P`YwLfKSnEOCU66P%1tDp2M*KgQjKfJ2B6JyNc=Y zwpNK!)>pF+`ea)_mL#5Rn$~rWQF&NnR)Dd}^sx4)NDm5+AL8<~)FWMMw&%Nrp3T?f zBW`iID5aJO{z5-7JTr)mX>ea<7qy2N*6|TEUM>QC+)i7*S%U+$5mHX^I2DZ=fkUnZ zJx7CEq3Rdsa}QjXB#y#R7!Pa`jepq_2`up9wrCVeNDD>^xTi@c@!A88i$G0xHpY*^ zNKtY@Rln0+6KYB)DOOpOVE_Fk32KX)9Q!P98dr96b9n_`1~r`uOI7Ns^VPm~w6Upn zd8(JCc-w~r5VC4Zt4en2w5K%R@fo<*TZ;)Q<PRTzE3%>MM~6}@Fv?7?(aM0FiL738 z)4U-~aHT7mxkt&mJGxUI7PT&ulww>&0Pim~+dd3Z*w56+xO7!xCO<eLz4%Bpf8Vj& zTe`|B(VUAZ6k-}&yKlwZ-RS@*n?5VIPZNG8Y@hGUvnDqyk@OqX%ce{~CX1(5e;MPj zYH)O}=&vkSM<l>O47vgfW3?`}z7u0UQaLxeOi1L|!KW`#68}BZSc(F<&xDVB_8*Ie zJAKTlw3Y@*eO2V}9@5Jad2~P(m{X6fd*hynj#9rpGp(zCK*E<<#e=g}!aZXlGvt#b zr!dxCE6<1h_fQAmqj-1xX5IVtVLUa3tP3qb9G-F%!2bC)B3NQf#@)rva|MKaiSGXd zD(T0LYX-LeGmTmI{vGo9{l#1P?y~QmB1vfqt;|viWJi=f>ejg$(NW+Q07z9Q+HSHd zFr?cG4F4ahGs04lJJ7Nb?c9;Jy&&c3Qh2tf^7kVf83%_dEiIZK+lNJy`Of4r&guhy zwjA<}nWfa7`5U{}_6x@PDQVC7KN`~I5dCwL1aD)v-vhF=S^sm!=>q2W{D6*Qb@i*7 zq*z?<-hg(gp#qLlX@82RX5F~KyyOOtaXj?ug9x%38mVirm@cmVDbN8tvh_cB<Ueb! zzxIlK{}0nQv&sKc38_hQhb7-_jlSVv@Sde~Vqjbxv1i1;zw*=@Oy<X9DfVCOf${S0 zgO8NMcPy)b!<h)AasB%^=?dOO>HPOrdiTcverT-d|1_QZ|KVjr1A!*_M9QXBpTeGL zSHYA|T86l9HGzLn+`jTidfu<$%WsJx=y^n9RqD6NGAL&qgWU4}IC#~RceAQTUU|7I zkOe3r3bb{<b_U`JfRMufL9-Sc?)o6lpFe*pC`cijqh@`V&vtS-Z?oQVwbTh{+=^<) zv|gYSheijgeJ9h%R$6WZGF`F+@W>Bj)r<#Q<G=GW=7*wCn7ea_a-p>>U4ygg<esx3 z8BWxlpFOE`Q}~un@_%_;crAQg@`nj{GME6?@o2s2j@f&&VmgG5F3UM6@1y<Tk9(&2 zH%!8p<6;FD1_ZO($KDj=M}^|n`K{5KL%Pn!Yti4Yuh34MLr@+VDlLHZoz?Gq0q`e2 zg?81qaG~vK{_;osRsb*56}wu9d8Rih-Gh#yyfxsm&Qx0I&s-J0v(;jFxrud<Yo}Y6 zZmG@XkKP^iqm|i@%ImW`tm|TaOFziRr%fXMzHH<{4*#ynvTMu$+Qg^2Z#1=5v%YC* z)C;cAAN8w&R3BE_zm&D!SS;8Nu-6~d&Oat2!vYXe=Ved+UqI-$ZYj~&i*F{f81#iQ z&EfO)Bos|ZN)^Phgpox?royn2%ZfV)%tQw-pGl?!#>nnxUS~ry*O?^Cjc9ZiOG(Ik zhttzLYp&O~;PcmwB`}YqF|rlPE+(s<MWL#b9L|(qdhiFOB-6>qEgkMBGi9%G86RLU z$p>D{q{Recp{%HQ1OL8ebst#15tqQEU+{t-_!#)sEx9SMD;V;nY8dzpCfM%JaEC`m zu7N>_94#@2EnGh9Ie!4}1<ZEKk{%Fqo3a%IegzTr^VIAUS6}{2d~FEnjO=*e*@?mB z<-*x|%YX9)F6wmySJ%qys1<9M`uTP)X!}Vetq@(!YSua4?&RPO|FKXn_&BK)&G?IJ z?&Tu{BKdxJx@i9H$vYlTO&tdWyNmb1<&#swVWpko?;%3q^%0uRWrUWtl?uU1GLhD1 z_p%2L?QFKDxl%nom~>zK2J<>YP&7@H8?DzTCwmw^@!s9w@d%<lVjP<M=s&l6@b;Ha z0CH@PjVVad+12Hb&1T!60|RK+=g!bNuUj{gw5RzFF3=y&l6m$~@PW93Q}ca5ok%#X z=U$4$XIFV+m7pvCZcrS6uJ_68fgqn4kzb_7Pq|qL;!DX`xi-<MtwEH%%9iDPsa4e^ zjYeId*}xztv-U@(U=$85yge3Xd^GP<NS&wB5&{M7iQf_+nbNh?UAGh4E--scy{(-+ zBWA@oYLivY?<K2nd;XN^FQMRt9pKm)D&E!{Ygx^a#uNo`eAP#;S<hr4L%9RiMS73@ z$QZ}qt5)JCg#`I0^X){i_Nx4;sqc(`-}Q+hccbXX57^%Sq6(6ztE&rmA?mSTJ!Gn4 z=qsc#%JYwoj*hyA@z&&PR5C>w1nJg%vs*0Sp1?aR*PRqn=_d4!M{zBHtn<gkuR4Nf zwFEhoYEu)>A`R~?1Q}EvcKRcgxpGP=bi2*HZODK8)G+(VWGGctMQ#qv9BO!O>>33# zv3L&IFphR8g^Y?eyH=!P(X>PG9&7bywV1@v=drb5kC+iCZ`)J-NT-~FN~L+>AVQ2w z%@3O|LbC~>Mr6=e*$_uT1!n)2LTcBy+4nrYo!4q+Ay<Sq$$nDBs&}J6=#JJ`Qo}}6 z=E`0uk6T+2rn!~!>WFr}1;3#FP+R>QO{<CC5|g|U14K8vOVRo#gI~f6J!x1c+tXFi zm4dWYQo8nTA!p=XH(0O}LQnPJi#}L?rwcQRv?gQuZUA$;G)ExnYz(xPx1eGu`Ds4) zgK=^TI33LHcw1qZ0Ty!L)U`K#Ah!JKw*E9p4s`b1%WDJu!Y%UQCOtN0zApOq&F^sm zH|1qgt6TPZRD1a<=V2p-&p@hRP;75TC+8f2p@7la)pL)tAg2Y0Qc3!u)GfhfSd&fR z`ChsgAagoY;rhP!&7=6-%jnyD=43ztWVI81GEojqfCiMHTZ>u4RYn4S<iHTW*Od{7 zLKKnx;+4n^0c<$ZMUf6=`n~&>--DNid<i8s`gkIJOC;ms?My@QL!q;8gcod)MDK0< zVBq|#^#-CFJ{h5_p<WaQ7~&$dPhj#jl{qGP933Xpg3bgv6%p2Q;pGceNvDC+q+7u1 z1Rblnp;WM`k5$ox^<@-_8R>0frgO((NY}ZkcZ+PpaBj7&6JCMaHI(eZNTh55l)TYU z2zfH1{+NKkE!~U8A;mib<!}_)cDVrWd)xF#AMzE4uRQT2D<f2U71s-eV17eSGN54x zI~~$K{#ngFL&*a|5-Uf7*Qe1<PbynkVzle5+NY0}@T(MU%4_@9TfpmnOryw4T*+@O zso!MgJ=d;GEU2wfNaeoFgBzuJwU1HRyB=E`57Qq*T%Re)jz-3ZPdpGYJ0qeSPItu` zp%n>OmMsd7vQO>`q~cqR=FHoMTSBkDps371oR}aPyopIyYShTb;|chU)8-rDn?&cr z_Wddb&Q%-zNG``-jp^)-!;$r+RGYS*;tMw+F^uVAP?w6Vm}KrZl|N-H6k98eoxMpX zp8nC$pyLVmn>?;MuWzih&0kXs_(Avf(JmO{7Ba$osk%pI)y7O)3vF=aA79zN86+$d zVS+2qwEogtw$c4Gk03W)rs=i8hlDYly`VTwR0w4z^P@dN{B}+Aaz`7X7V$&M!(~1v z3_PiOB!;+QR~2L6Yzd}oZgnv@Wov0Zhp$Y+@R*wb3txbC-V`(p@{Uf_>s8Tl*pomo z#WQyjdt6Mh&(y9`dd>rLr?4NHz6%k}QBa*RXmM~nXwY3HFnwKcOz&M)j49YvuR5M= zsZBj!vK+n`!tH6DfLqVl7?+#d2Wj|spMES}97QIBUHeJ%L9&blkUy+0-)DtG{PX`t zPFUhTxs?Ri39}YolZ+}vluECAFvngqNp^S}xwBH1y1o=>hn^K4@jlPXD#&{@8QsbY zw12gz)Eb1OfTc6M;P!mQzuQPN^8+T6d>$@w+=j(oV$*NGg7RNE4l}IST#sDiOU+&m zbYTG2)JT=+N)2rh!OP~_CyMyrk=x}bZIPuj0uGo=x<uq+uK0E*sZq6i<tP5PRHIr7 z1=TT>!iI37*E4kazE93&nnT0py(4b8r4}D33=ycET?p0qoV1CGr_HRUmx~25S+tU# zxUg2TJR*4T!{(UVSrj4A>JW5UVQ}KQ+!L#^y-6=;fq+tyfrkn~zBUPqIi6fIH}GS# z#jmifL?hb{!4|d=1Fg8;+NP__yhFl$+(XH_L)koPjVGqOH*4hyglUhTd!h4mH6XW7 zMC#@6qxPmT)j$*h;1zfMM@LnhvNXXw^B3~lf)-36)<Q^D3u!9#?#Jy85KnZ|Zs?!Z z^VcURg<}oY)(c0GPfwL0e2#XNOZF#2y_UzLLvwO|-8TK*IWGkyIKzfM*P|p@TN(U_ zs$;u*CVu?dD4x7`AUf*HVWOPTQD1NtYr6gza&59;Q!J(XTj_=gXll?dgb-^ywVUxc zx@FeX{x}9dT4{Qzi$H6C)LsU;4_?Z^(^h`M7se>S;6-54rQg2BXVqSot>^*8ymgSU zKWwET*vj3$kGXbcpP?d3;+ao4-)c)mdp&T_H!eoCYZ14x?AMD@%y8Go3mv$X*|C!E zS`@PB`FNqi!6+bL=(a{c=tp#V*gpX#398Ch>2&<#H{NRb>!c_3_@dloZA|F~i-EhW zH__$>&FdUmS8!`O@PbhPrfUA=VDDn2G-0o-SMvh>oKU%i=9$21<Aa&2g$Q5H=U;Mg zaRph*j?U$RwLv299S(cIhbrR!^H}`L-;2GJBpmb04k)`qZsy5P<c=&5lb{AF@KN(y z9A#J+1guHxd^FetMh^4@_iBeIr7C8(ER@y_sdRITk!l;?{#;uXgAfvW;eTj?>65nT z7}@%wZp!q)Lo9VGt4-zOVieE&D|O0B`EAB-MpTwM!v?UGAAWiDOt<#7d?~WY*w(k1 z?^<I`XB_gKi58xAS@C&#b)KLP?w(4@oS7KJ)(i80zJGIOh47qm4Bi28lk*#VtgXM2 zcAu?XeOZc_6kPJAX*vvCY*vO-|EI<odjXJT3H$c3c`SVaR-44bXjs+D!7Jn@W8Iw3 z;o;#6HYMiqtLW@So2lpcQy<%w1aUcW<@<}JE!8Q$q})RG9s^dNQNe>EhB@Z%O;{>7 z$Ip4fI<qbxQcw@}{Z{ZFSq$6yLr+XbmNWCm-|OPX+rFxOwTzVb$d=ceeK98(=@J4( z?94InzMp+)^Uo45D*_ai%_T@0DfF$*-syZGd(QPD=3>Ta`kTi{D;9;l_wBwV3~ahE zr+xowWlRpJLtH>T7u35DxHHVl6Ws!Jh~=^of-3&A*PDFQ>)h&@igaDPDPPUf{T=1= zXgw&Si=nm!cDcMA2CPuQsE1;xQsnH@<mK8m&i9)IyMnl443{|jXP$`jtNgCI`zM80 z>!~l^?w)ZIfrMyZK86Z;qM=T@mMwZc_Vu}P-%D9_i0EIdUsQOfLVQw!jz0Ls3BWNM zyF`s8pf~IJa4rv7d<zVP4k<8-e<6pq281UD+Q)MHjHID;MSv`O=UjwZuV)TteJ+Lg z%zGbi+EqFqo)s#@hQmwObWDd=W{^jgP;+-Qh(n>FQ|@LEK2pEr%}jz<)0^I`Hf|It zUJ%p7$=cx6YARvl%gsqpXGQE9Z(##WGdH@^7CLNjeuWCnw~+aPF=vcHYf05+?)b}S zA9166P}N?$NPign2yrL}R1~Y~U!<tt9}abxd`<)(b#uyn_-){D!@j%zZn*BG!0O|v z=(Z~w7_kD%)||M$LQR3J*MzW32+<8REwl(yRJ(3oBu<-oK5<%b!OK%=^{Fi*JLZRo z210fyyX+=wsO+3C8U1^?JQ1x}y<q(8vSNZ-5J^TN9I=PvvgTTsK+}=rTfXqd`7sYC z+=<vKHriG+&13V0F!DR3_NZLH?dwQ$cskJ$=g!*;Jncarz(*fMEq#D;c2c(O&^#kM zwrxbTClsFRw=Ijp<tFG{X~bZ4WECjz>00<qbVgu#fr{MIvekAtAHyNST>wVaqLc3R znKN<EZrYls^N+=+pbe!|1JF~v)b8SB=jAS52OdhDpd;ekPPS0{twln__Of30G7aJM z)jq4sKEF-d3v|(MioJDJ)d=D$zP0u=>9IMnz+%un@b#XuZfe0m8QE&^@yZR&X9{M; zg!`51<gTJ-kbH3VLHt!sEAus}u!p)8R{A>RmsAZIiFfwgJ2Bclis{2Fyx*{X(hK0O zez9`mQL4ML@K*SY%1+5=Pbid$0Q|*Bxz^ik!2bHMUIHbPEF7d~&5j*1^J2dBh+6Lk z1h$yID(B3G>ax2qy#A`tcY70$szkqH>}&JCI)S4m#5hUk$I)H3{H+G34bH6BZs;G- z%N$|mg4%<Vf7_{H-L#yQqYIQ|<Xj&T4_@&~{-?_LUcoK?%y(zUyaw>dvzmQ!!&#N# zd6}FtXSgnFO>SMv6>J%QpCXLY?xFI%#|K_nd0Z2E7?$IP^`1P2;*Th`_f+d=f@@d^ zwbkE$cr#iWf`j+vj-Vq~n#>cbS}<i|OlB&HC*l@3>Zod+(#gN;-;z!1Gy5>lZFH&_ z?;BMNk0jKOvzlJTGm9!{*Rrd^&krY$i<^YnjSCz?`pOZ%<KUv5A#!n!Cl^vdj{c<X zn}%^rOeM*U6>%7EaOFZ#ym9|j7sl>OO(TO)l1T|4mdLG88FY2U5Q*v9F1zA5U()Kj z-<zOSIq<&3)|P-`h6e_u0QD%HfC?RqDuze1*c>Di!4`?KRE||3$ZE=834F_TVu$LM zjpxsU%SndU&j$#B;JGWl9%%T(L)jDExt#8N&~jj4l=%bEwy{gP982kMAyWOiGJT^< z!9S{ORuWZ0zc!bVbzJAbHj7OsEEcA;AEyzlBFmTaefhX<DZTXI&yk%F@ag@)^hI#~ z8_bL8MxoX~_@I5hgTNH6<`iH$1qS8l+UQvDh2DbWzn$i1i-FBc3tl^aKIsxW=p2zu zpj#7i-Z=_N6%2raro8jf)HRwz^pQxV*KI*Vzw7m_V>!Oi3@WZPFi{<^w{eertzY-1 zeg1?qlI$5n0N|u>^vI5#D(WQup%2EY7o2yZ4n;>TL^3xsaw#-gTBbzJE^2=qkoIyl zk!fQELh3=!%Y}=QEgq<H6BkFgp%@PL3|Z=R@wA4+MS=o{S9H!!=crwfxjM`KgPbGI z){+adCrwRw8S@+o>{J(*zv`i0r>rNpP%Z|_;Za^l2WWeqjD$0i3H$<h9zBbvSQ77) z?$J9>)Xpof%YJvariE9gTqm1qWa(}WlthMwr}`lH13izA+RHAUpL+7^m0<m3MshdY z%9jvd2o=6kD#&X~>U--k2Yr`90N~nkDF#m~7*Vlv+AyBLSCo5b5!|VNFjKO-y-yc- z5;x_!E!r9FqZZz0VmjmNPWCR1+wqAC>Kicxf5BsoT7P<rKDfyaeXD6G(MH4x;mR>b z8#mxtz+R8Bb+LBSgYss|NKK{q(sJ!!v5R&6+)HH!4$U7~F)g=%)(aZr*iWP!x-sw- zve1Zj>^L(hVjS-<IqZIj6KHiScH;cuweuPwVDvI*WK>Kz+*G*_mteZhW1bX{@)Po! zs!;dFqLx25mqA29ThH}G*r#!4ZW>1U5;7cPv0t@K%-d3Xuv%e*M~-(3ua3vZMy-g| z5{-%ZC@vuFgRsY^yfKbK$er@TN4m82cF4;Yet2$rohs<#;U2!j>qxlc`u;5?h~YGL z^BmiLH`1^==z;0rN*!l&;Bs-L4)|P%ub{Mo=j@Qm<rD~JnQX^>bHh}<5_7@7QkH}% z{dWth8~=_)!t!ggxrB%O89O`PU7PH^y81}~r^kIkLBV=J%1B5DX+)<Wn~R=%LQF!! zZdfRt+6pE<@QPNvc-5h`SZFLHKPd4thl1oR@)K2*84m{LAG|M~S@-wu%h7#ULQ}_d z(w<<{ea4nN_W`?16bo}gOMuMHLhJDp)2E7xg~Zt2W5Fw*LKo7E3e@fJGOeYpL;L03 z@k(BFyVO@=cpCPmC$bPSN@afNQt(U(mPwLc9Xe#}w~t;V9ZXv-=y}hSOa2I35s0r~ zr%w9vc$zVPU{o*I@k9$$^H}iewtkOTc@O2y3H^gI?i@MR@s|reQb|++g^kn$rHtu^ zM*`PH+VCJ0?70!9nCSH>o$Y&16z0NNAAy>>JzXt(!oc-FouwZ#sjVU(sz}X|)_bJq zrA>$X7W)zTrv_dZB$LXTvmt{$Q~pI*WEc)5IZ}Ngp9l9|zCLm?Ei>}k$b;pxd&lKD z6>PECLcM^2NcAh9ykvjkM1RRK(@Obgu#2nmv#^=1j4h!q+`x=$ZZD+$Oi21<-phw} zgnKI+M;Tq5l4v5iVk=1smIWtNP!%W9TkU*oqhOU5f&`KcTo5vjw4P)vyrAy#7muJw zus-$JG;}5emn4ebOH3bG*C6r6_Um?>(|ET{3(c95At6Xg7#G<?Mh2!zpu}-OGJ7GN z#oFp1aIuqhQ-(?7=XUk&%#ryJo?u5*=QOu7(ps3vFbdVY=Xopo30yiru1GCNb}fsW zTX)qG#E>)gvkpw~fXO3#97HaCFhDm<W0bf?WT3fTO1E+$Hr&wUZyr3LUb`fqZ{vv% zIda7r@hX5!{5TzoTnSp*nqHeH@W<o9Vh3f^j1ue8t?xJ4V~1YZX>z9Qgb*Tfot+Fs zXUgIp99*qzxWj6IK6YU&wA!n`{=SfjkfIv(kyIEK&)T8y{7Fk{S!yiJ*GTqkHVsuj zEY1;L_Vy|!VJ-dY)j)Dg>xZ#9u-`aKzwSkhaFu?PSeR_5pi->=NbpJE_NFU_msnai zp<i}Fy1)|kK8MF(==IrKGtwZ-jiW$VnDVy0(kJ-onPILo`2mugU+iQ)x8{5n<uR9% zR#0hc&>zw1P-!clu~K&v@i@^y%kEwe8-W*UA-Tc&W3^bK1!%7#`X7zk_YfcwSQwxU z-G#xXiF#5_>pIf_TBEW`7LW5WIanth@?M>`yPIBX-lvo}^{bvGfAp5l)37^|oYd3( zEL*booAn`gEV)P4^VFhjrhx$^R5fFs<?dV^-w7={eSu6#_Zw(J7i<4VeO<hK{cqyd zx2Uf5<;g#YUhCl=DKNsk>l)7Av%|oUdMNdy#pLi*10cKIc7iIk#zesRb8y@Dkvd)0 zlCtffUU0fq`v~9^>vt4?C@q^SVFar6-f<w05T1I7K*ou>BnMkpP)$A_{`v-CXINNu z-`M_L=n?XP+=bF<$d${1wB4x-EROtazFrTq4NE;%&8@6n4vetKWx_vMb(jcqdq|OZ zh<ZdD4gHw_ef&(wEsA0=EkZTZ=g6#$^FoQN3g5(po{o!au*s_vje-j4U6!a4V&6z{ zB~m|{v(tF-wjMgL+*U_>t7k^DP$T~QeXjYF;f$bnzK_Q+KU?>2HD`W(z}{`*$;{=2 z{=T|~wKqRwaLPJZB@3D_?vd-#TwEr*1m#<u*GHi3Usnx$tlJ5oVVuoSTfKE~(bU#X zFRoqL18Qyo!O*~VR{+KAeC;M?(KaNQ1%>J#&SdKU;6A<X&-B^(wenzdXxcD#{2Age z(8GMnum$!bS!lF`{lpGO3B-jytpHrthKK`*#khPI({iBAauGfH*38o~mA5mrCv*GG zmVSpkW?!V_7nRnTMk3a7Z&-UVbC;dTc4-mx$iiby;S^FjLAcL})<IKVGr2kyy~_xd z2G>BgiD-JPh~%z^avY?<?+E|F$0)P>T`Z)qatoDcL?<GfQ(>nl*pcQ_N3ja{D45s3 zbxiCybSiJd{=3f#o6JIa^xWoMGhkOpPcFZe#dbvL2Z3dAmGY0|Kfbl$jJZYZ6@(2c zgy+D_LABL%^f$`L!2!4xh%29Q2@8iWE$IoP5NEq1>%HKw_V(}bx&X~enwZ#;*rL8B zpa)<5{wDF)tIoV52AL-P=RE+hYRx8>K+Su0o-?Zzl5kv&abMJ>d8w_fR;9%K+#fSq zDXYa<(Q_#(8mm~e-fH$oR(i)(#6`9zyEKuD$T23pu*cfw7u3V@lhBUTMWwh+`X=@y z!JJ&uGf^WNMo$%VElcO(?_>6q5xb{zv*xcluDfbn{mPW|ijfxPOI@5-1O@lgVdwCZ zQ3OE&!?$(K+@x3rwp4mdKKXIZquwjj796(2i%y<UxYf;fEt1@Xq_RjyxKDVvK0^P! z%Ga~w$4587ojah8$a}cSoLG8#D%s*COGgZL6z{>-DS4BWtjG0ueS_DJoFu~POxN8v zuOx}}U;w=Oo9V#iyd7TQ&^wgn_{;V6AB--;_1es@Y-cXxM=G6AI!7YoV`Lh0$fp#* zw0_OyhBf08Sr9~CG?`ZwG+kP^mce$_(RfC>;C^P3R5!#iA0C|n*Q-!j?zD;ARoS&s z=={nrL)%Q?$j*oLV}3Us8sxIOd?B&*P+{BPMpCqEBr^SjUr#D;%!#q}S82N*Dtf(C z*ZGSxByAdMMFg=}4wOCD{M`0#@8X~u!ShkUG=iU95bcT{Hhb^;Un{1;@M}(4OtKXs z?Z#x(6L@TEL?w0Mi8sIeS;{lUQ9PzPbe&chtluZC7Io!$)z1RC{$6J2egKGJzGG(o zzl}O3CMHsTXRZ)U)1z~c>YJeX3BIp}2jI{a0CE)$Vbz1b_>uJ~k?Rv3V~<kGq~^{E zxfrShK7TNxIDNmF<E@8Fw;N;A)wL1s^b=Ek!*y{yLLoWnsg|gV@{jk%JfdFM=>gax zNh)!hETwF{Dz2m@#WP&=&Ni%+165JXkz0q>fi?DruP9dmj-#cv-gn=vu5#P&ib%g( z#)Y$szR$$DJL{-yu~M<+Q?cXqVDLLH?;MC@rbJ#!ohOh^)kv^z(dK~8(~87H1l)ul zrlr4p^Q|R;_Dzfs-%j#_;nnj2ix>WBTPqzQy*(2@>1=w$Qb4CDOk=U&=7}3R89c>! zLU5eBje4r)<cm*ONH$ttsK^{q-I*ZD2DTUslSU}bT$6Ze*OwBkX%j4E52N;H9AK`C zS5gD5rmZF1tlSaL<VLya*`HCo=@?Awc0c;jHGdSm*;1u-TassPC+x~r(d_Kh{zRX~ zZd%+@f@ejo)U4Kn*4UYe9-nS~gDw&nVEpm>Yj3&jZ8v%|w$U?L$<svOTYIosg`==a z2<8_2(BHH5X@H7RaL`8kYNkV2y>Q(O!A*cOvc;K;9=h-ef~OxDC(|y5*F~ov>7nGa zNh17H#h7rH_Z;GhE#~F)5Oj8~ChY1$T*mTQOg8tZ`O&kwgYb02^+t@FY$|EG63yXt zMc4#-$7{7NVYUpAw`cM=R!Kcu;^Ai9$j&S_-|EudWS)lOFiP85S7&3NykqKti1x_D z_pTl3YCSQ{GD3*L=?K`)tMKH_e`;T8GIDg{gdITD8#rsF3F<ee6}{fz@eF5I)XyR5 z?(SCjR5V(4Hv}!SF<=+bJOkoMH4eh?KgdC!HU?Ht+}pCk`J+%3{cN2`SZe!C0bg&| zFKwz|?&qfT`lUlWq!aC}LiQ_?_2-qC0&kisAPr~@(eFX}wSUy6HpCCU@#69b<o;#U zQqR@-5ju7O=bv1W$z{VHX&5dLTUW2L11RPp1YGC)UK4!h=H?CSfO16m3+&XtRfOUS zuvR77J0ZJT%Ei;EUlOmIBehu1WAhwRQO^Ix+p}|)(OaMJk($NX6Wx4nH#@TBa0+vQ zZ#jHThRNW{ofefPi`!ju0K;r;5Kjn8s-M_3xXoCjtrDKY?U75Lu4P{_gWgjPtx{;% zvy8^7Keg%MyM_)@!N7s~tJfi;YC{or6&{U?%gSrfPDdgZ0~j?(QIEYKARFp-9hmuL zVoNvZ8?LvM=Dg1vcwwHZ9@5JFcv|-+cj}JEB{=o)!zO|uZ%*}>H&#k+3b-FN)fOnJ zxn5rw?xS)L&-mIrmJeLMEBF@@i3$X%zf7@4e{Z8@W)Yw;iR&d&6cH!~1S4$3UFsof zyU2w@P!xJ17qq*mGyf^5j&(<AJ38X1wcJLft>r9k^W(S0>_zBNdb`a;f-03wy|VsU z6XlC+0<OLCFYDAgH%C5#);I}sGQG8IWUB<igdoU5bd~vUD0%6$id&6$Fy8!ee6R$S z9n2!-vgiCQ!B$TLMFopTO3vOB1Bkm1iwo&5uK`Aq{V)|q?$g@Ze-P{Uo%aG>XaQ7% zCr_S4#m5J9bxEfQyFM`;HuFm+e(^PrvY>1({(C!S5f-(l?eF+pwuudMsnUPdI##%X zL0Kld{KoB#{A5~IK7`2$nAMt_Pt{D~ROd;fbbN|p*q$fj$}6%;y2|7sdyF}<9y`e~ z09dd0NW{{X{f8QYRo~$<yN!F1h4&L0J`*b=ogS~-f9FIx0Vj#zD|G5t{yM)0zK{ZK z`_;Qn%%4XyAy|ihpw<Kxv=sWSZ<i0-e}9||-I{=`y2cMZ!)IxtZO^%WD*?3^IYcSr zg{p7bP6$#9!HT2ucjPXZTBLm0rk2qZh8SGL@oalzs35}jk_3Ex-B<erYpr;@c#9W( zh|^A&SIvs)w-EA}o$K|OleR0`PW=VKOXj_s=L<ma0m!tjRf2cIOMKae^$>&zf-Qag z7N%OpZO=04vv5^GZ`4O50H^f2+Iyi$_k0+YB!H@)U^8Ni>wCsQXzo1Z_0((66P9;N zcf3*dLN1cchYEFa>TkhxB7_w3`rt%Y8}MViX9Ipbngd=*b>5-+vW=8$_4zT+_msnn zm8Y{RUMHK+YBtnn`56|6Sm0hgRr_M66{A019}cDS(qjPc5Va+sZT*~aCA#2#v|{{P zz@7b%^HQXo7#WjW*5|$TGO6EWHn^T{Aler6@+_$C_4j&0A*2-+EgqdT31mJ<rEf{w zL~F+9DCBFvcf5|NJtgLW`NrIJUEF-VjJDwBNqQqS0mrrHI;XvJNoaew+EHX)+WL;K zPruDY%8hsI(u>mSx32CA8b4c1iFw@Tn+cw^G#SoxmQ1K&9%!=ZbgnJIDXMeq8)>A` zS4y}qqYh*~zOA?_sc@JphQ$%bJ(zn(jogJ8Wf`PW7e@XZIX*vjzd4eiq#aoHPm4mu zd<qh({nqZ>(f@q6GQ1ymPM`eaI7auP3l1&FK&bTzB=r8PwRCrlMTfl#1~I%B&w67n zexYCW_pAs-EE8bnzY+jf?Q)8(=?%Sm_~3mBcsV!)>rc&7KjRp<XhNORZRC&J^?9He zOa9Mla66`o<Hd_jUQbV@xmHghpnY)h@r;U!suR%t<Ur8AHJ`{nXJRULOlDu5v#bHV zx&<N~SM3{)0XkE$W2ojEtI`PO1QZ%8R?+{3C0s2>{j4r)_H+2F@a(37C)PJp_q2J_ z0HVWRa(01in}lBG0!tZ<NaT4cwmetcQ-U3$<;^5%30Hi@oJHoMw6oHbK??y&=XR80 z-G5w>I6h(k99hZ8wABvQ{+6Z4OAYyWyRVha%MhQ&TKJ^;{<?^S`orxt)ULZr<*`ZE zDsDPzY<U&Rbk6@k&=i&9rsZKQn}I3rp*7M9uHvj&t;oQ);LMGotR^$N?cRrCRQS~n z;3`94oGu8{-ic!Gi>p<4M-)vm((n2TZ_cI}`qmC<7;CkR;7SMb?w^vt!e>SxBZI&B zZSB|D<wG)hRJCV55DS7=m}=(<!H*EbQ{MW!sbqDuLXfY$b%*$r_BcY*z*;3-E*-n2 z71l%>cst)Plb4v<OzT?oJ`KX9JCap`{5aRRJf!b;TY(itN-UCHruJ|@=y>mJ+SPwg zuMeZlFKD0LMI4mtYI1|CoFNEKww(HUR;#3C+ZA4r$|Sw`pyoH6_7=;-RL-M|M;7@N z_Pew00UE319Q<bSmskasxm&ckG4t>k%FRs+FRv$H!bdN1ynHnuSxAmJ5ZZQ#9@$|O zJ{F;(eV1X)gmg<~A8`=4jHO#Cd^m1g(xpGK?<a#1D?ebpT)Z8409XyHjO{`J5`Z!w zpbT4~T*sTKmB1GOg;p{66?k5EMoF0JfEbXi%o;ZO8DDy?DqsVBuY=W-iA1~4Cvevy zri<dPmuVgjtaD_va^TXgAU^GLqFU)M`TGFJ8rK^~|L<Y^i=nmfE}N+dfjQ(Y%^=_G z-tmtPwuKgneW*Jf<cLDnU7kMDQtfh6(Zjq-j4H^hECx0<Zn04<utX;XCSy)~2z_Gd z^YusX2`Wt}ppE8pvdcangDvuTI<l_rxTICL(RB}c(pP3(1;NV3H~p~22KpSj>=&JQ zT*rx}bhXK;z;f*ROqG^y{hYP;#BUYQF;B0KL7H)d5EQWpIOgS9yW=^@1cV}?VXu)L z1{X2UvX)sk-CB$laJ=P9njUGnOxqVSgm<{DEJhovv`0ICWGvZ{DE!g2>@e}8jE?_( zQ+N^E#}$*aA(wpx2?<leNdCH(Fn6eg-O=E<<`#+9$j&AqQ@<2%K%!gV@%XQLK*KxK zc6Bs0&QWmI^lqQw2(TSb7YK>~d{7Y0P-f3?^RfK2>tl5thsBGTgv{Hz{=wgb!gfYa zB*Yk8oWCgQr@qJ^q`zYt<m3i+-n)l7e=9BVp^FcT{NKQ(ZsR#9E5~+P#{q9`eSOk? zQsd+5{%jRF4NZ3#XKMi(F?rgr_YB+Hy8-jO;mYpa7}x;scJ#FXX`jIgm8h_aZO1#s zto+(1LqR&nedrVb6iaq!$V6EZZ>HV<6Tc=i=VNN5B>vXbcRj$+^gY3ww9eyt_c0y4 znwRa56kgx%<&bL-w2cg9bKUI6!jMELsuA#y_G(JQDD+1A<o4NEo0aQ))T5eq!0m~J zUpYNJ;p@Ca23gpQ?d66gOjrA00f=`-s3Gbv-y+tom~6FZ2O)GDUgep4zvmjz*Z+jv z7TCZc<YL8v{?(oUx#|2^Z2bfRhwT0yn|T9<f^N`-86yQf-m5&LtM73Ta773rvONzk zlpxJ?%P6GSx^u6}s+EDQ4#!%{I1%~oHJRF!A@Ef~KvK8P5OBt2b71TmWzCn#%lH7c zz13}?>CWj#CkURBDe<d^Db1KD%l6kQSuCF<;%Ba&jIQ|0&|K35p2zJuq>1^{iMihE zJ%4kScnk2S1TF`~R!?qiEF39#ZPuK{%H%qcqT&5;39FOoR0}2sPuOOxSg5P5?>U`{ z7}(BHWxya4O0V2&XBPtD)v<2t8A>%=s->6@&sf{vi4{O(aIV>O0{Ur!C7Di8t53yS z!B4DM?0CUVH|mNijdt}=84nZ;?G_poTY$Q_mww%8o+er@5?_AFZw5ypQ6hwPq27I> zT`C0lk~G7%=&c`YEl1UF{>YhuobFl6_1c}LQO8Y=Xy8|-qwbZ7MYf$NezNU&u{9~y z>=$eQLXtFqD1S-vzy|XKenP;-?k6lwW8rvGQ3P40qZRjrdEZRH1q5C7aIjB6dK?)r z+sj3}a|Be}A2^#*!WT#AGpJDQVt!Ps1%&@(&_*wXD($H!EZu^&%%QUE;*`u-Yzp<H z6_rM1`f;_qxP_Bo)y{4(dR)Cqg4q5<X*IXt?3Qz=rL~~n9z(fad8J90GYbl)P1Cq9 zdUJxCofrjmm5eh#`W-d+LM`@c;XbOOt7d1@M+E?(U{q_gNx)zG;o|wg`u1qGWH2dv z_~_*UEovn3*tr}Fx*sB~Spu_(_m?hJd0Vfw?@q}nBIe!O>H81Oo8$Fg1bE%g)qn?B zA|nVhKt5T-4DVE|MGVSfMxSj40}SLi;SYJ4M>oCy=4qEv4+1Rp|K5rt|LIQt`<d$9 zJ2Lx!Z~yDd{>@`1BGkS7rl>qQeYYam{)>Dx1%uVM%6>POfBSaquZMwW%u2uh&m^6{ zIN|@F4ZHqrwfHY)x>*Dj9o_VFFb5t$s=T56_c&AfznXvj&y@4ORxJNJN&U_n?Y}m& z$x?;4Z?6^g?+C})GXJ8ke`k4u^2{m!4<mzc>}TNL2lqek{@*_zAi<|3;tdUd$u%Ti zl!-SRuPaL`r5Ij&WpHN{#0}SMWV@dKL=IRyzO%5C2ECO|Bvn2U|8BlcOz`)KNGxNe z_v_I3s2h-*`+NZ~-M&kp%uN86SwyLP)_?g+stjGsnr5ut?3MS@I4}4#Hw*7CG!R`a zxtHI_jQ}!LEfg`Ku7%YQ;LGKZczCERkg{hmpfW1vTG7D8{U%fmwRX8X&tfsl_p16( z?#fH(^g`(@_CCEEeEXYZvf45=;HCKE^me%Mg$Lc=2Lae&HyXlX)^R_m=^GsE0$jDS zr^Eo`o58`sf;PW9gDw8W@9JGoF(}f0S<my;*hotLOY<)VqP4TLdkK)B1xoZGdZ<@~ zx+xyV*9aT~uB52A1i!Tu{C%4lzwfu|WFr!<G&QsTK+YTQ48ZmkjgpCEbbEKG68fTi zge@zPzW+J=cfU0|QwUUN8XZ}~Wf>S58EwzE)u@G>a5<Zg(e&I8UVEJWW&-p>m{0v< z=fAaHn*cIt1kA2xq^-?ct67f|n4~mp{RW4{$GAy9bXGtf87D{6YUkB3x0F1B(>M|9 zWj?@MLNWqGnLP!<(02#6=S{0bM=wm`JM})^s})5PK6bh1;Dv#G!T$G|19phrExo?$ zV*ce$<pL<=?ktmwta-lr_O7?@jOS~3OSpLZE-<1~ZM?#_M_nz0#G;H>bHJkS3ulZ; zF&i=lyTr%jgN7<`-iA;x7uxvTN=AGdm#M~@%Eo=pxS3UXL64EAh@V+pi^hISd%?rq zizfO?CEL)ztPd}V=a<l$@ITkl-M7K{_YGApFkfdQXJPSjI8D$GU?7X%^Bau(1t|B$ zFCQe+iYDP2)B|2)6|QF{ByD$bJG)1tmE^o?nl^H81K&0uf2pscy}W#;XnxcaOlYh` zvqp~D=J}9sPgHUH=mGCs%9utP=D$o$ogAOod)@r&@_)Tu^C9bt3g2MJTGN9JQ(_V8 z8Z$wjLcNh^W#ywLGH>->#wgB-&c&f)l5Y%*eIwSWHBW_dWw$Mb7Bx$&y;@7#UrUoc zuj4QUB>epG44iL??~3KAmlJep`3TK6!1Ag@*#?CE&H}ux?MFT^I-!O($@Xuztt^GU zAZr_z)2hMIVk*&cs;_d?1vY}d$GpRTN$%c$FeiN3bgE`pM=!?ksM2`g%~kki=FdC~ z&#>3u#_)g4h1^LK35SK{|7B{GN@x~)`bqDKJW^n{b8eI82z_>oJ>D#}|ISX-p7F=8 zSFUO{WX6msxez6%<l-@-d5o%h)$%>AxgyFjBCiM^_*1C`tQ$VShSLY#%zU>)6$U-q z8wJ#{v5jJlU9YFwHKRxiu*%&Z59hg6V;yXlAN^EyB(6X3J+zyDSUDeR;3R0sYLm=P zhq@jtBw~oc302in^;T4y4%y91sDAS=<FG9L(kW%e)#_L6#W$iFN!dqLIYk5EyNpy$ z<^ds{)*5EGoP(PQoAJ+eCyZMP6k=5t#@P$Z_Cro=-WHsk*a2c44jKD5e18qucRw0m z>5iQd!SYR`?mx6|#DV}ubEKGl_W}2Tm+F#S4Jz;7KjHhfP@q??4-q{Usa8~%GAn;6 z=TNTLU?VB}Rzzz*AlRBCfTj8>GUSLXrqXaoldAK1*umU(o{iOGT?g43T>09%?6H)5 zOkZR7=w(xRMJY8Uq9O)Q(;M1X)qL6Zb=2~&`egHt^0AoM7^~3kG+8{xnVJ6&Yi}78 z=eo7)Cc%OScXxMpcXuZQ2pS}~b#Ry91c%^3f_vixNpN>}ci%6WYt5OjYVCFQ+2{1H zrV5JgdhL0}J;rsBYw3aK6$r(>0}0YQ4OKqL{3x-JP}A8A%rt*nOwh?_%R$4Vq<0br zk^an{O8&h4v6BP1>m|WJtD&-nSuI=Ck{CQ$)PIfOt+D$Ir#QT;Uz^!gO*&pX`?=iP zW+MWs(1lxBEj|y5YWqNra3DUOWHt{XYIk{uuFKor0y}3s$%P2vnLs5d{Y;>Orn0a# zs_iqNz{p_)S^{f-nl3`gx$(j|WL&m+FOLk2B9@b&Z1U4Rx85)tZKSHI6qKnzQ(c!U z*(mml%6LQAhy<Vhv^cU3Z&gWN;A{$smgHO!KB{mVOXE|z380g3PQYkVe-pmQ6w+-3 z(?o|iViP{DiYg9L&GkbY?=@ShD}ltgzyLBVTeg(%111<8sHPNV?obu+SR@Kiw%9S% z*3pFoe;-xgxS|_;C);zpg$Bj=PVEJP;9z8+38Y!MfvJ;fNVHQWp7c&&^fwe3CF|<$ zE;<0h%Y`qmm4B4FWHmK;!pfobpL>6`xJu;+^}oQVaP4nbgNQw)9hp@RN;ZEw;)UcP zL?S2ss1!i5I;d)zx)Fxe89YnI?`$opXb6nl8?q;1X4ltacPCPwTj#d?*X~1aQ!kP@ zwOQec4?T53gpsYpzBJ)@8R{6+WaxgcU{2rGVUa0B-9)>*vkS%8NJuE82Vo~#QAtYV zVULEXps~<GF`KQ2c(-6Xb7oabmz<4m`V_)apq?q~qJ-a&M^yZ1w@C=>2oyui^S#tC zEed+4OsIe~I;%`DKaWh<ll&xDfnKaY5*z-RXUW^RUsN*|Ks@D9f7sRXMS`7y`Vo@? zbBUR|8l&e;Ps71IO@>n&1Xsw7rzG@+9(m8qQbNX(ZJZu2l&7$;P8>;Dre8FwUUDc4 zVgmEv)|8-L9YOd@{gL@VWs58ryuOM*!RgV>@-XL@SnP6e&~Pt;ANqrlK~HpekbIFq zFkq4wk6yw9Oq`fA3XShl5+|<fi}6uzHsISgausp~YKF<X&jB{*ra$(PJXQ1^UKg{+ zsj}#Op`#z5`=k|qIecxtY05+L&nb{2*NK6b^^8%($U1I^Au@Jkb)xPhvbTS{cfTk= zkd#(Zk}@~Xhco=GoCnJ7yGjG3<n=3#X3V%6lOf$n+>lf+LjIsXt=DJJ<cbRbmF>TK z%W#)ULm$1ie$$_DNimlU*x$D?H*urMICirIl=)kY;kT+#?PFZL9+YIB@UJzrRi2EA z_m!{7r~9+HEZCy}Xf9)q;mrJ3b6LU|1oy}+DkoHXGlKMdqeg;^Z2zRN?!5$#xXy=( zepWN<)mP3Kbb!q~Y&WY7UFu_ZjxP;>XtLHT?9Vl&r<1J3hrC40ZOTV%hrKNb(jA`8 zg-UuxG*RLC!94ujC`9-IZE|W%=CK}k<Hyrtu>tV|An(PhafHO;IjO%jI#x$g%R!tP z7YoN?CMlWD;k5QU@?UuEBh^p;GYB)28R31vT^rwY9v~>?GIBR+^1vOTgtG*&L6^*3 zPz%*Fn(G77$SRaAcUEErKFRzcvr!@#+r~eBNbT?klERz}Seq9x#yBsJ53si5C*F`^ zA_0hj_;eC7<dr_+&0SIN2|@hr)Ypic$^3qj53|OsR%W=r_(B*tphU8m-`ZbfsnE&W z8jZY%mSuxBqmgiZ(q9&&=zl<(tXqj0fXJK*^pPqlOsCL2J$n7e(yqG$11GBjV4iqA zo@Hw3py)Gd5f2lmA*fH++TtBHY!S`_7Fk;3w-y$!$;il_*)!)#rHE2ia?0xJ)d6{^ zzB_Y)7FXe>#RVvnyNV2RA|^<*1V0OtUAtyKiO10}yP3V&gO6lDd`3ScD&R~Lu(ImC zmdoc%@cWB!|LZrj>8$Av#_TOSDR&|%7ZuK~x;})}F{dus0Y^n5`r1lA=6N82r(wQ$ zGJ>xv3R8`>UW5$#;{JymdaN1S_CcH|D|%<qu+P9T7t<Z-@TGxvuyt%iI0)3nD!<VB zt{R_EJR5KK4eJ1<-zx_sIuK+G5Scn&)YgFsYJ90N!8A^hmhJScdY!T6$lAh=B0-qS zWDu}O;#SyX+qmQY?_=4-UeUa|@+HA=H*3Gr<P2k*sOw;JdLcEg%M6eYkOGjp?x0s} zQihEN6LezWCL-p=wxgWh5#W!pLbXMVzp6p)pNqcK<q09OQavgc^CK}af58wOyn?nB z-&E~RNV=CYT+YDiY6mY`@+(;6J^Uu!PmH8I^n-_wzPIRLi>o-1cX$0nk`6LFR><@< zYX*z|;{cY<V_;<&v*T)TLZ)Cmqv)S`;^(gB-nTmiyF;lT8f6r=h$DeX!vrlu6&x(n z9>^zBp}i;m?vAg5Or8-pTS>t$i`+$a=HOjPG?1ikf=2d|?c9cgHwG(WoO3yIHl2}w z;piLC0qs~MOJhQH<c2D(x4RN792h@bV%`*F-b6xKeE5*j6mRts!SPFAfO-uo<!OTa z4PH(AS17D+!d8BZ9t&tFuVC2$s?r1OBcy2|Lu1w*G1*X<aD;>l%BV(_bM_F5CFFc~ z(ea#^zM31gWCi3168bx6o6r4~Jb19h+6c_Q)Tps?4diRA)jG({bt~StUKhUjn+!!V zl~`vi;JJlK=>?B&PT&8Bayw*O)m{RM`p0qrKu|J(qDtd-cy-i#76r%pdTS_(7y^0S z38^=VptCQIO6(QNy70Gq!W8ef43O08Q_dYbPK<9YgA{&KW~3t;JV$1=qv&~*cXy<! zYET(gEa6{y9lN#ozLd|@zS@RGBuy3dJW9UxvcGj1I7GNWKk-r;G;#rA=!R+U)x5+} z5R0LTTUAqNrM_t$6x;jw@n3xQgp7YRG<4d$2_|sPX>4|J!Hu*Rbg*5_vW}Z72J5z( znx@uB<$1@wdz~rV8DpW@F7q+zYl4~W8?&b2ET2Ja#52gykh|rWG)*z)t&U7`Vvth4 zhv*X5e7O6XQ;wNzm~xaO3zK)_CwSRRxX$>%oWM<Y=_UW52Lp=|2C0)neA58^Ik>q# zFHP0Nkwqb_LZy>%7w|Uym21EsTQ1GrFj(c+NQ&5ac&S|6BC#*w00zu=U10OY%*K`r zX0u-FiQH96Q4vwZaA-JFP$)7E?@mf-GmZip30M4Jid#C<;gQwv+y%Hf1fv|jr|I?= zswQ2UR?GWm=%mr(N<3%(g&DwlA(8*xO%CPzYC4W&Qlb8|5Bdq&a_Pt!Y6a>k5z(1` z@3TdbH_^=8W$6Y^)H0y<XgMQ(EX;-VoYIqr<u-VxzAa7Ti<IOpr`n#?WQ|GwAd*;2 zNYn$JZl%U-2U1&K4sTQSo6VDa`?~Lu7wc+3wCE|xMAa+UL{>PzmQ%{nDi$+q*&WN@ zN-oCVAZG384MnCQIT<>fN<7JsQlf;`V5JYxS@H+$=rIZ2rp*B|clG?|Ox{_%!!xI; zUHxC2CJyI!>UYNSUB&ddO&~`5Ovh}%L+}{&ciRNOM-S6Sc?pNdX`|c@3)D{|zZ8p@ zizPF0i|~RTo8kClbWl;z(6%6npSRxA)s}H^`pId{#6x1`jsKB?Bnn+TP%?`}P#6{U zXj*OjtCqNh9S_G5ed_mP_oF;QQw`@^>0jclx~XRLzwIoJ75~^-ei*P%+;5N*m?<EQ zA98jQ`-|}&6c!4(y=8@`-l@>oA5}f}gc%`-=k4Ul4@6D|7)Ij;=c8{&a!8hO_EO?X z-!=q6FU-ar$;?!U^Y_`r@AjTW5lCk0!gIcm%9JbZvqXTq+V=}nI!0PkMi>h@M^v=% zACTFhHXuf6FGhKA^=oakL9?~*x5)o0k1mzgpZj{p{H6fe-$27+4+q{B40~o)5%Nod zX<)$j`wLIKtK6n43}?^Li^xB=;Z8+5XD{Jcxk;We+EmY^Xm01-aX+BmN|ov52h>TF z6c&s*Q@@)HBnrp)4Ym=hSpj<(Lc(YmU~gl^C()i<1YKO>(pS*JG$?%WDHqwwf|KTN zBa3v^p_KIxo^JvacKv?Nc8t~2ugF*#5G_jkMREqIvuhcM8(wKp=t#5T#3XA5oQB<G zB!CCW(K`+;#6$5>t{O(>^rMO|vy%mCz{vqN@Vi|n;bZEiaJO@~V)?nr+q)V{zdGan zizi#CrIErBWB|rpDUvfr!);JEdDgHY#7I~7Mbv5t88pLzF&1<+bWmCt<#eTg(8`2> z1_8IBlHNKyGFp@&Ldl-IL=lA;V!mfk<C{)yg5^(W5UhkhVuDtKptb#m)L1FW{>BgO zqz@koiDA+^2dco(;P2z2GLWOBxa(F(nL?ABT^~7!=&OlHu<`PRWvybFY?vf$n0+1o z(D?yipHs3qe%q*bl>4JHvprgy4}t!SHt;(9n5l+?{5+^{YHGTy^ti56@p0=HPdEba zYf1=o(|o8WA0xnk`#C*5((|ZA%S?mY^OAniW3QBhrKPhQAPcEI1QHcy*k@@)4pNfH zAg&_ia!tk^A_H-NQ6wd)r7J^YW7EjOLZGBICaQPtwhICyVOESWg8M7JUlo|D)aY4d zHK^_~tNqQ-keDo=5qEygo_IBie#1ntcABEoxZY>7Xr@_xkhOr7XNT^*IG(QfL*Xpj zk)(zmR@&o3Q@XuNbyhJqOwn0{N2;S$*Va{TO#{x)pQY1F3%>pQIG@%;?Boz<J5qIZ z#`bUe@}!S~O+SebyGS|P3wOQ1#cR9}4nshna)tagGLr`b8g%6c7rEf8o~0*?gYu!Q zBe>t;<dYGIs11<Rue(#4x6=-d@pvlyD&rhaJd*5*90__eC^ipLbdC=1+*HpY+fH`0 zq*b$H_|Wz;#iGNMGh7vJ%9rexCD!HU$l>5iu{gmOFGDx1mcFDlQs5wUnZDj-L39{- zKlF!HAxFbmLjL3pB95E=Y8PxX0K2nlgh}BMF;{qA*QrwmJrf26jpU`W%9#JkYd*e( zE`I+^Z>N7l3}iJC*yc4;3jfM#X1xxe{jW3s$ZGnDfk7BvIG*ICF&-|Jr;P#_f?sdl zfQCTEa?!ip!8H`g#Fo|&-K$2aks}*P=OT<67|HXY0NlS>H`e}xj}M4~Zu<V*<5p5; z53eqs3DpdUmX_w^9S~Dlg;%4&Dnx_`Bsi<)LrM&{E+lSEBiQFb?4v=l))0+%{&UF) z&BL=gai#pHCw}<o&M3(aOB2D`<gTx|ChCwke9zRWijCqdCMy{mQ;kb3#{}`&Rtd|C zF|U@G=XIfWd&d*&D{|77An^q{&mhr4-%SI>zn~;=;n8m<5QCTmf<ankvzJp1FH13Q zHS%F6%y4$?KPX+GUTkh4D+{Og;tfiv@Nbm6JOJ3s`pS7)4VRSm8<s4R#sRHYTF7Hh z@=7vfGU(scmsPOcImh4Iw8n8}0Dm)rK}B?_ijziM@450naWp6fFMcy+V#xvWv^B;l z>IOU)634#SdLQE-4{g8(68>ELw>HH20$eN%nD3<!T~ZNEQi0u$#&qvC<lp}fc+)8S z912u#;=FkeB<z^i06K|C^rJJd=2YB0`UeCGY#mDfB*s*S{I_rL$42A%5C0E|E{*?R zi8TMA*#DovHUBSu&E)5QlzF_?280EtDXog)B>xDVfcXjMZkwO>m<2DNyAvX2>dJI( zoYM>YSa!<IBVDjoV(D8=M?UC^H?f2`U%j0!jl>>a)JbJbx!eaEb-LY+D658(-OA;_ z{{#x1%@U&SBTLGDx}5U=9IeI<eH5JE_gQiZij@q{!}g@sbBda0L<+D<K$|SpD*##f zJi}*P_NTKio9+&qP_VEHz+z4*057ay40bCm4{za4Z=|B`O^W1071qpp7qg_4)I~Q` zv=V4dRU^I#fSSnk{g~9UtZ86Iv7j<>couWC*i7T<eg}IB?cdzyPsIOrd5pl!IFKN@ zX4g~t&2ALpVSP0#8~GDtI<N%P>Yu@ypHoso^*%I6l!C5Tf|FB#wIWR2f(zb<#-02S z5je-WL<YT>xVT(DoDcOY&=}jo)sxp=t!=NcjiuSitX(N^`E<W?U9C#dAk<9cR931Q z@iMy<!B9Kl3ztjjT_6$qs_ErvxW0+>bs<eOtZPlrNs1h#XG2AV){m)Z{+%bhW&T!5 z+~yxCa!^@`^`AZ`k;Bq|%@m%u#HgsE@57ROUq8d!N5{q-E+(|rO6wL?;ky&RXW>RY zC{Q=46Hb6hBRh2TBTT$$Xe-+$*SiY6x~7bK4!=N8kJc!SqAFZuJ+6?dBuY>h?Q{gR z{@rQweC=+_)@=e0NaGHGijw^b;Tft}qhKy|?8eXSeOnDD`5IX{CKGsMUX8c1X0>lP z78yf_<vC5$H^sy!`^Mg4PQ#1sePT?ckw34_8eNQ3Nl+$1gqjpRVEE_s0p8_c{Oip1 z>7Mzkr^jJ)5C<U7L%zZ$Jps8`S;6&26KRc!55wX7Kc@k$AxhPFwm-LN6(PJjx9Lko zn|NXIzNB|ccTzWoTMb(miFRk$B%^h^!U_&id(2vmIGU=qWQge-W&aF|ZB{2wsrK$N zJib9-{*m;2#n_B-4!srkZNboR56!XY;+g5@iQKm97WE<EwRSXCoze`Ie*f8aDcZx` zONBCOmDXuzjziKEbJm!lPfRlQn@}IjzZ?)8>~)y7KNZmneqTa8GVsN;m&AJc#9Bul zE4xR+Y6mary;A-{>2a@HxT0(_2!aE=)YX$nxy15|rs{5*?V|~Nb6cTEG?Hw4A8+}| z!}hRk7$kqb^!5yyS@XQZQ&#m9Uplm-d)xeAL0uI1q_*;GNF!^NH;_x>p5n!W8#N#3 z64(}3^X4N(FR(I7EQZ_fLu#z$sXj$Y+mscb%Ye8u3wb!V6-3tm?Y-c*n!UGG^ESdd zrQ5IA96BsHY)ZtfK4%zJ3-O$#Iogrf6(*alst4Ojq)5Z3edSMthk(%?9><txVyII3 ze3dLQ|85n&`ZgnAY!tG5_pa+9?^cknxN)%XL*?5f9Zp6pq&ki4?^OG^TKb936&PQk zX2bvO)Nnmdnp35p4rYj)WZGuJM7hZ@GBiT>CfL5Jw^E8sMz|A*$vir;5Iyki=CuMD zeGl+tBf;~Oy~-lygD`ineQZ*kxG_e?k34wYil}LrSUFJr*3Pn(Qy^e=745(jK??uk z>}m3kCjvv~m!YhRHz@)lu^*4v#5yFHIRY+=9oerMSNvgdC@w6%W0BT2pyv-S@=>-L zN%seF=-DE~(brn%^0s~#aSB8}ZT}aj!irh87ArxYm<3USL!mJ0JblM=cz8CXf5DM> zgcvWSHB&ITDR~eszJK{eU%anhtiJ8TD_m~&SJC<`<Ya6{wxgEqXpsp`6Q8nrIl@L% zu;vXRP=C5taMtFO8Mj*U$xG7~i&^JlxI4a(PYADFNK=dIF;6XwoK{u~;kHu#x;Z>` z_|ci(pF22$betQ%5J_<8CCsh9WA~>B1G80HGHQCiumThcHYZ{?(~)4Di-$*vrDpN` zaoz)cGkZ~EkVA$JMWJ1YGG))JX^Fea%|7e14u-w9ji9uY&Y_ZBGi<c)*lH2A0()CU z2V1_@>Ox9lq=W97?6s3`7xQD|eH+bTtir0>-45Jty|w1xJf&0hL!II|c*Y+}{m@=b zQAV3dX4IfW<+Gm92#plr1N>AE8t?w&7rdgk@sJ~#<AuHs4%i~+-c7Q~Dn{ARJrkU9 zI8F4E!yZO5I$u;(sAfGCJ|id&mnqr)E465c0aA;pa;BFebFT*EhwoHkmssx7ZzW0A zxo=so>_;voR3?2*WkppM=9eIDZqiOA*@MwH``3?3CEZn`tdexW#8@Xm-_Fud$Aczr z`ukPqVF3f8RoG{;Tl360ihf6Q#%K|J$Dr%dk0I7;UPAwD@TwiPY(8~NXc<LD;&Bx_ zmrud-9CRko|8D>ZG%)x71|+a<;aP-BPLUv#jC6^c9)>a(r|5*)ROz3XTq}D9ARw8q zulK!7{T~qpS^R&EC^+C+EBa_`hvm4|Qav?G%7z%Mq*zHv#7e3A0Q+U(GA#0KD!p5M zGipM@Mnz(LPJ>YpJ2`1V4q>AE?r>Uyzj!9zLzI=adV{v|0saJZz!;n|N;nQh1m?Kb zzGy7IoGXE-KX@@L+!)2yML8p%1h&a$BH0!NZJTg(w+9%Wu?}$P=`bkDVTaTr!iTVm zD<jZ&<V_5(&)ASgHH$SpHfH`R4;XUR+fiK@XEe-|HHfRM_ZfUOCPf-BDDr*+KV#=d zg?JQ6%*9;tdW_U=nNH)<R-c`p=k}d4_tSO$Vq<~9xJdlbPMnXh{uO7L!1>pt(ef?o zXDwY8*JEzDnF+@%-AOC^n*nP&3IBRd9hm$G6Lm;rej@$|7Eq>1=&*4d5TMv)nuuy@ z#!|;p#$)b1NQ-j9bqR3JwqSK*1TQBN$;nD&+^gxl)uA*ak(x&Ugc!vPvllwW>Gqb0 z^5<_wrX~&Z48Xc+!@8AP^LvlBB61o{9<CI#C4Q|#pe46%4rn4NqYh*&ZzFUCg6ove z31lGT+liK}Uq4k53plBeM&W4Rl*l-E9U<i!-MeUpToTo9nJz73kH0b%PuKI~El!B1 zI6bJqDhQ=JE@Gwro)}*FP5h?w@li)#&p~1R6aPO?%^b6O69{ww)Aschy5RLPguEiF z?e}(zfOg`{AVZr_v15p_kwYviII#nb3QmHcIVu<kx$&{K!0<d(W(pH)Svb|MN)8o7 zyrDH<B4NBR|N1b8$6pGNVo1l*Wso=#sHbioNAkWcFYFZosiiz?F>pKlNN6BZtQ52? zBr<MAxsWEN0`jmkJG$cWf9Q6J13E#NmCM^@l->`vI=j?WFGKa}idki3W*UWepDfHe zzc9gk7k9Wg6tk6vyOqKJcF>lE&%<U)40g(R4Yfp_b_q8QJ-QiwYiHT}shAW^^-S~8 z!pmF&#T44d4Q8cq7K=5Zb6gqAYWL!$v>Ij@gH;vl%64}}F(F%}oS2nHg>hY?;LBWy zs1VDCTq+pt0Tnb=O2r3#RAVF@3Jy{x9i;v+Ov+zmrn}L7{uX${b7qd_%EuCraxI`7 z+aVwgDJV+xTlB7ZZA%NIGM9~52^cF_jMPrfxpJFXEohOx8@(H<fW!U7Lm+XsU+07w zZ-oVOm3^CanndYfYJ`EW>o2KmXgTanIA5@jxr9m!s4}XF+xZaQe-)Id9w_S}bf9n9 zHznHH6#=MEgP}CG$2#XJzKqP2W-|e&UuG<c^MiDk$8oVyMe($4u*L6Yi)+f`OCNV$ znOFvTk2nJAi%U;sK2Iij#Oyq8;qfSASqX$j=DhMe%o<w(Z1@|xux-4?T?g@Kc-eXu z4Luzcvi`6t5>JdJdoC+e9LOK7g(w2MZZbcj(AT%>*8g-rH^v$OBcnjouMNPQxqDsC zyayP0v<oK*htjsNVPRp373!pJv%CK(R^dwUdl{NP!_)9Qf_)MLj9`ynhy8Y8p#64X zcmghr0Dg3$Wl<%CfwY?is{HXcn8xg+Zg1$gsB}R6J}*et_y^cW4I!*$SP08(U{l_E ziTo3+gr^L?`dVD>^sbOk)smnqnNtwyqm^$hYR`n4f8ucmI>l0nKrE7)ePd7|c`mUS zp3@}~p98V#Or+CW<@AD=eeGvj@-=HQi60<jQo3LJXisY=2CM5-x4uOP*xWZ_u>*Nd zzbIj+xuv`*c<Dfr`xQ1suiv6vexkhmSIzky)$C=OPE0X0{|ce#dOmADRA^g7h(b3I zp3M4tU`Fczo{ERqnC8)fhAUHR=P;FX$>w?*{MYg*armd~-dRd4UrEd9>ofZ$9r7n1 z`Nd$~@S}ueHq}vlGq`2mwn^dIrr<QAfmst%*adqB4MSt1QI2GpH<6CCn#^OARx{~- zAQ%k0_x$8*C{QA4(UUU4LUGIVa79HK7L(`v0edepUc%zl1Dc0$6pv@dAjQDlpQd!W zslQ^F&wvvc5Ysi^Y^HL5+>CfcGQhp}uVevY{c;c8=}+U$l{4(yflV>MIS(wAod>zt zH#!~7wSP3K;Dw$w!jK`H>qmJdpG2clVP90Tk#<f-Y;HElx%dfgTaH6pcHV5#3<}qz zqKdMq((4uTD|8E>Sh{I{X^WwA6z*y-BRP=S?vfugKjP|$O(=$5YVHgkCOiu>P|VE) z%ow&6%rs5x>|@fRBsMc1_C4Z4x8t+@z#0@y+^7Vb%{Y8m@k?q|HU|d8rX}rXIWyV$ zXe)_dk>#2>Nv7k_>Me2D8Aq!gl;#kmenf=GyK1bb->UopTbQ(##HOgxHb3#p#iHX@ zNg%=@myFS%8yJ{@0}9@g?cZ(y?3CPed_^T8y|^eX96d(ihu1B&stlEslIH#yALw5T z{7PHHK@&%o`{zlI-a_}>I7anM&!pvE=?X=ArbbqLSm1qFpwk0tD`|>bsEOv&zdI7b zyONu*N+TZ|4(~>6N+XWHwqzm`mUA(aucPf{KoL==i#9!yR|8S%qh%9A6WjRMO6&JU z4Q!{@*Uf}(5GaI#C#rZqqWUw`859I4R|qxfMC7Gq<-~LYx|>JcDZJFM$F#KKSdQIX zlYxa@wG-Zt=~9>~Y`M>+n-Ryx7On2Wj9I>kWXf!Vsg=qzBd}7|Y+v*Uw)YFgqkNvK zCzzZv23kOxZSm;e)4%4WXmLY@S}e)oDjQ})KAp1*4h}|%z~?COuzyp4GX52)F|-*2 zrczT%SPFN4myuIrWrpKv_^%UHa~Olc2IDS=`X=9G#2@E#Qys<v0YhOW=3A}Fz<N$# z)tcQ4OD_|iCszN-8}6UAw!vgs@{7Rb<p4lm4NVnr0t7Tgz;veQSdUbbQT@39P{Lk7 zta^D27{wZ!F=4Rqyv{xBt-SEpOn7SIKgawtrO6(~x?WTu+JY@OPO%gcD&vhl252l6 z0FA|<=Yjv$IE@D7+FHS~PT???X;%h6!@C#!@3wJN@w%t(_C}xzC`Q!@MdUV2;yeOm zhasT7)DAJsGm--=68rC!SgFW3WcV_+7DO(#zQJ;P1W!2Qs#Y1ZgemD&eWqMGjcCKU z$-aiC1(O=3NB45T)lCJE^AuVr`t@!3mP}<IX7aE}2I#FmpxJs}-bkGpC~A||L}!`l zC{WB4`h}T(`eZ>%$5vGL-k(~mhQx25+(L$yas^3A#-RdUOt%s7UrGzJ!WgOuM3>SE zf+5|SN_~YKh78`kn(`Ah!j`3wY>oZ!oVY9{%N4W(R%i|*3#o|@RonjF_5>d!(tn~l zDj+_Tu-qO=fYg*5By?r1$Q1Q*=&!i`*x#2)Yl(mA2tveDx9{MX()S-3QF$IULr{D@ zF=Zj);BbPPNL#&kCp~h=H4x%w1@k=A`kH9I<tKHyRVE+URUThFiSx_rkF`)cc{9U= zVML<zL}5fO)}Jwg*5x7J2P8#6IaeHIxKgu=d+0#mr!Pz|>HF#nblwG;06<v^IXnvj zfmLB+`Bu9(XjbaXGVw<1DL-;e=5t}ffA|^{)G}C!`QFULi3<cz`NkTA(Q6<YMi6B1 zp>(J>5e}OC5YFJhOSEA~3MgSJq-Vs153AZ>yJbAr(CE-bWp~rQXYSu?GVyo<ZYg)r zRN}U9GCLt=YBF`EmhF)3zHB4A1Y`Mj%wI{DFn7o!EB5<`UpY$#0~J&#yia0sb-rEl z@P8ykYL(wKbr{oM1}ztfYo@k;l0dH0^;U_G@I1|Oe)~?_0gG~dE6>W8`>?anj{j3@ z=<=m$fC@)Hg|@6tM<|OkS#r#0qVK)>8mz(&;Qs3I(8=9b4$g9)qXZD|Y7i9COA8sb zSEIkOV0orq3@Y8FDg(NUKYTFo=0L|Q5F4MLJ7J_9_u$zrj~A&SDAub3&5^)J=tLPg zwkf8+A|LH8vI$33E%I}J1KP9Nq97wQ`X=iv=A$;=Is5Zepcau03+aEcT7;~mZNjrq z=4R#KAh~C(=Gl#hCe|+VU%)Km$A}O@f5qU+YL6x0yfzbeJS5z=t?bOP(}}l%xyVyK zd6V(dsn^)}%6RINAq;RWRFd#*lSihQSrjkkK{t5k3Rr|+bK5I3%N-i77a=3(a&7Y5 z<*sBh3BD{!9Hc<nlwjJu^lF1GE&7^WpZzj%SvE#oZ(yMcOW~5D4xJp3%aGl|<NQEH z<wh%oh4Bd5m<hksS4Z}I>!|EbnKiuVr|NALy;xQof`dYd-=b^;I2MZ};LVQ_oI^3u z#Y&VD<;KEc8T=r05_!=X1xH(0ThKh(q@S~<aD;E=qDJTxGX>*G=0%@g4GFu-=flI9 z{$&25@`gPmBgR%FJr^ROxKqEavfuHQK}+tgAm@g9wzHkDygDi=NzIGeMqYKm%V9!^ zMS+QvMV(^2Xa+0aUY#|Msy*(d{M&v(mx!LPsvEXo=`llLp7lewu=JlY_6XF!XWD)? z>=u^*S7W|H>N&$%oDPPm3l#V-h_42SL+Hr~rCNWdqJ}d^``6C$$K1LaxQp;#J8$46 z<2jtO#1VPnTHiV)YW`%)GX0yzOR-4~TgTC<lLieGbKk^X&W89k0-W7#e=4gNQ(1XW zm!W@HF4Ur*Ef<A|IdU0`y!`q?S29n98-Vy!GR<E*LCyXe=iCyL{HPF3frDWio(b;; z(n<}{WuS2ks#R>i+%{d$yw;q`)IkR5bp23=C77aXq^OX^8RlKwEl9RY)~K(}XBC6R z-iXQF8{>Pz;uLJQBaL-2Mvb&BBzJ&+;Ss~%VnJJ;38D>HhpVo|5E)1(z9c#nx76@l zuYNF7SiNosX5Ae823#xaUQYJRcntp4M9ZEH9X}o<CA*$mRt3Fk8{q;|aHxc7HbdG! z3L=S3law$D1PmBVi2oQc?1lg`L=K{*TAhXY5Sw!J${kdV!i{_MK%mU`Xp(mPWY?v! zxq#E#jA85WN+e@?;q-0LeNurzCb7$;%T=h_H_Q#9QD!l8PA6zYY|mk95cUO14%PjI zfL`V!?_~}+8&Vf7Wd7(|A^q053NFwqJHr$*G8%wXk|81bno%yoIahlg?fbg`iSr>% z&=bB><fyhQizpJ7#B+t~x=sd=H{>9nh4Hn=Lw<~1)Ro}T3}-^Lr7^QW-69xeeUFzv zIr+8EkX;)O#Uf>9l`G5Vl8d<c>C~fzIc0N?@2gp2Uca=lR0C+(C|NHt$95{TmY_3} zbf$OiYKoM}UYiSP=G%0gHobNk!JYNlc^h>5?=EV3T+z*^g~=OeJr(_r!XSx%mOoe> z7%bfo24RxJBNOm-@3GS_!{E`=h<|5s%+%|6g7|R-24ert;*JYhD0m9j13jlhp{*%q z6CI1h7`C@3GM1BeRy}#&@sgs8A|>8nWe!11Ex+Z)l~qy2A$fK$cD6dw;Wpl_pkfso z<kSi^e~7qr&F#}<<H{ln!5x>A6Z^sg3*Dep4l$9p0vKptO0MnS6urBKvSq_weFahI z0|=!nIGu8r@_vHKy%onBxECv`U~2>Y(7wXLK)+&<17HqcsDO5nUSu93@1{4+28ILu z3d{CG%;%HY&?p<+tNRY9Z-4y|anQiiJ@_s?Md<CBu{#&+_#EbKv|7D?z&BIFkpR^d z27iIlgG2q9lO9rQq6o=fCc-T-=f%y>EfQ9Xl<%ReXUI@yr;W%xKrr!MqU5CBW2Hh5 z3qdgki8ojRex%`cSv$~O7^q2(r0f=pI-ijs416Lz;jO1f)TNEaMt%6Gp=<zIrlPlr z&j{_U;)K9Vky7K5Vye8cv{xv(lLjaiGhDZwAtCL!aJ#Aee@j1#`VB?}sUXOLR%|NU zXLC=<=#5j%Xnx%bE4Z&WYJ%Z|fhJv?wPna6<a7gn571`do;{3c?B!s=f3#pM&^}u* z{>=DB0&DXDU&TmXXQl`VJ6>BJJq|{xEp;pn`h0N3R3lTz@|wgOw@TjAxQCwgSJV3# zvuYcyZ@I%thV#I#I@;?+PjaenA$aM`!T_T3bKdyotdOd48?&!a?4OfNT&@EcFA_%~ zpDR|$+H^fOso)!p8^MwSEO?2R3k%`3uaz#96wZw^KWYoSWT=9p=l?H?jFIN&01>?- zL|zU8H*8G3-}%TGW|yg3WGg^@Uv_HBzt8<9oVD8Nqzr|7LQ)q4_GWrcH*YBOs3$u} zj(h<6pVcbL2u0X)ZYlbq24Z1h!DL4?mjm8$aE5DF-236BzU&IDce)gFF=Yr>u0<x= zbB;AX|1D7yki|DyUF;A@jx3B<R=dww;`9%Hot5EABjC{0>GXfxq}_k#^rzHg#P9hN zlVe9nVk1C*e<2tR|FD2qp;>FZttywn{I5(|3MjEWM^Fq53Jja%4yUX0FvuLajn$|q z=AW`K*oYNt&}NkXw_)js*WWW#e|$gSZ7G~NAO-m!uN;kDK<x29U;lA_s_w6G?DUZB zO4omDHJr>mpJz4yb~`n)KPSll^Hs_V{LdVYz`sVC*gvyU|26f5Whg5f_LrOkI5)It z|L;H9|KS$^el5p+W_aJJW5)*5n#I%_bBU(4jwgRfR$LrQTJbX7!joBxo~Q68t@Xsw zWvq1e;(o(reLMA!Y+JLlF+M(i==_3XuehYF0|*a~8-~1*fR6R_Sxyd)z|c@wz$D~# zsk2TR;v%F=XZlH$Wt2JWFh{m}M^8&0ni~D@bT;;|XI=f|X-U{%?m>ElGccLQ6E2sD z?_@0M9e0UcuH0A;-y?cr`C_!^VCoy90=q7Rd?lsj=_*AhfxBS39Hb-9bE4yPf)lHU zeYvNAUI1@jL%2`k2~Wrju_k~~crea2THLT#CeI)H0o{7b;a<q7UG2zvj!BPIc%@bR zBq{Cx2bo6Alk1HuRnK{i&f41AE$&EQQY`9@-S)pObtej)GaxT+xzsf^H(yQE`=GK% z<a148Zf<V>a51%3JNKbefombad2ezjGXvwmN8BkC<*KyVb%NBe$96s}!T=OW<#SEU zTB9^fu?5U~w}5-&q93&O<q-h^?CLX(df#g}%+A0!+QUvB^x|r7&*`N3{!!`{*Fe)t zaBv&m9&r_obL}vF=6VE6LA%`BZ!&C8{@QS*#mz<wR~60g8NTIVqbSqq52}sC5&Qc% zGx~85WmP!uX#&90gp1|vkz8(<eQZOw6{zR#m1nKQ^S~M4QQ7|exvQOe{H(Yyxw7fi z1OsKY{LU*W_g$w|++NzHpLBYj9Dql#=B`f0mNG|QVbngr64EM+3W_JiTuk2-A|mJ6 zDVLiof_;~Gd;)rHFsRW6$ZC|9w}udm&(C=@qP1dos#d?O*|kI1)Fs74+kcQX%9ERS z#|Ir^KW<LVns|D=7)l$aWqRDyJN|)LBWvB^>{e|IGs^YjY4Bv_JQRf+2_M6Gu^@34 z!ryHZ`9qrEQ_-cv-&cEM)}+@bKLlo=+nVcmQqOK>OsNJG5}$&+j*eKMl&Lw!Ee^;2 zd?pwFne{TQhj18>dm1zJ3!A7C(&{m38u!Bhlke<N>63=GobN5^occnZDiM(nhW*ff z5k6t@U;0y>3@p|`sPV{WdY}zGP5Ryv-7E3e<ev^R`R*Y`4852;yv3~o>D#bnZog#B zG`W=xkJn){Kc2%{?3ku<eE6@1jD2;a0>QK%I~b*9n4t_^y|I+Pn;i`(pYMd<9{RMl zzI)%fe9g~a9ZX@v#=(JwB&DaEeV~qDK{LB>i8oE|f@cci+k0zABx*w>$&vG|NDRO8 zMLlx6`9d)4L%Ok~9$RDB*o!4*UOB*tuGsOnUk>+Nw^;c*72c-!iGkk`TUbV|ZZ&?2 zdimCyDJ_et9C9WM8A@BC8}iJd_n$;s@t;jPskQD%WN`bXh5d5q5@f&n7=KxcgZ3N~ zm0x?R@tnqrzr3E`wk;KXXm{^tlKn@y6P&ifIhuC=cyqhrp;+B+WQpf*TMvVrfU(kg zUOHVEt@Bepv;8_8=2*S=dz-O)eIyU^>PY!}GP95T=E05Y=crpO_vgsRYh<_iZ}vW) zBm|!*KQdSefm5mq0EE!k^^M(9TXpNtA<*OJGTY190+#VhfK|0Tl9VQOj5c==GF3hY zYPGy|*kFl%+?2V${{gdmfsfKJfsUZq1U-BaSKx4-*2*w_t7re@Zv>!QoY`I_aeYLh ziWUksswV2N|Iu|MbG?atP!CGg7FY<rCECYwT~ghd5&(#|w+orZ+mj2|nmZ3a=4(Yt z;8j4K!B=ZVMneok@H#NFKC_pZ8Ss2kCpU4u>DM=EPgLuT|Gonz3qB5Qhuzs-oAWX^ zKY_AH3I%?83hu>KeAGg5*<2vq)xoFwx(Izjq;%B#k?Pzw%;hlkS=$0SahWC>?BP@) zXDfg?4)=gj^x5!qt3EcjLC@spyX51aIJWz^Yw_+E*KujNIT@L~0b8=5fN$<l^$OO* zS#@bbqfXk@yPUzb_x88lPm!~k1d+-^EKZ#+_iLF2#Ds+B{13dF>@S6$wiXF|4;rpM z$GM=j`t)Mj7&5Ji31QTA-~h)`#Yvntv1IjlBeiZ>&Qh;}!}Rf<CJmpcw;blzs+qSM zdEJK@zw)IP0`rtbL)*{2o<zMcN?8vFI05q>e^Done*UITq{oQNU8L6LmJv%#+&r@s z0LPH%mxwF^I-DZdDJwj|la>7x*W>*WwQJk2VXtYDWNhl+q7mMhgtdZQGMFyGzL!@f z$6DjU2G10V-{K`Zt+LKskb4sDpdjBV>f`0cYc*GWX9n5BNB+Z>8)%zm-SWCKHT#xZ zse99NGV$F@@`Eq2Z;{IQydrRxq_Ew6UMsZ}*uj0=+p1k{=c^6%7#ncR_CS+89Fk~{ zT;19)+-6%E=Yl2=@#H4hd_9#B=S^i}q+Nbg$N0_GC!*>oYK<#+sr&QIW7r;361oZ_ zw7}v`+!^=7C1eJV2lT_|%kWD2B#IAcKGzp|Sw5169w<U?1`=8HpA8Lfy^pQ#q2m{> z-1qB83Kzt-gxY?{m9J5iHCzxs#>vLNg=_WL!?c;Rk8C}7C$E&z9?sMp8g<n<R|)>G zxg)mOLM1kIl4ik_r_)!}%g;314{x_zq*gWcaM+dH%4w~CP9lyaCmVK;$NR6vjzQl! zNTr#zkN$P+(3aX5C%s1Xol5fmy#qsJvguw>%mg>g>WebL4&T^SR(1_aLK9o{GGs&a ztP--Kw!Ar%EHM6O+Al03Q&#KKkjfu&3&+PB+>-MmE=Fr6EWc7-e^?)G?+KkouVy0d z-H<h1`?~N}^dm0v{&ZL*+k5*_4&Rfwtv6U;Sj%T!)in5JX-$AET~Rw)t&ocUg99zK zh*4KbeLdoIArafSLdE#~8xA9|8Xh+CK15e2!QsvAJGY!oYn13Z($v^v;o%!-qK{jh z(QACJ7DVuvnOC;_Hvxu>j$eB~Wez9PX}46@<}(7bF#e@r<mgF(AUhu!XsWcafm4Kh z33r<&Ph_iI!uDUwp-cbg4vb98N0V`1>MDcifQ($1*y-9eaE@d(iv|J;|J59qy`~rA zft(TA6ByE{W>wE<${%X=+*%EbYL5YH$*UO}dEuKkyY_v)K7X+v+Ii)4THqZ~^(r4Q z^~tAWBfkJE*Q$#+d<em?ZL)bz6A{iU<j#q7@+9O5g20$^UV?uznlZPr?1{yhA?$;; z5hLh{A_*m_IlhqK;-W?zE5Mp%{81HlNL!`J_H9#CRr)sANkD8Wuu0eL1FJ_`_Ku&+ z!b%xkWrlES&ZWyZ^y&KNvdm8g_W08C?MOc+jpg3S`I`;>_+_m3)N;kcHb}>mE5fvW zrz3CyOxg_byg%|rin=<wzif$K{uo6F6!gCxrRafg^4=?dr6otc^11w2sHImo!e_S{ zt=@R;?1#3x;EmjR+W^N+%TTZ7)UI)IWvp>er@gp%XFshOB-AXm#H6_Kp0GEGHvIer z#CI_L*+}o|jAd85ktc%D%@Uz-LaSZQ+=%uAdF#p1MZ?uZRy{qF)%$XsO!rNc`^45Q z$yI+eMy4n0+2w#@rKFwS{?0sjtYsmruD~Az)2>gQ*Xc{Nomy9WeEIL@BZq|Ut*_6P z+|(0{O0d{69<QR;23+^<Y?GP}dtP3^Y-@2pNq$)lXgXc_c86f)^E1Mmm3cj_z7-xU zx_H>6qJM*Pf3tP^dGoTJ3>hQ}&abakn{t6U6~8->yOTO{xxWP8AhezgcIw)9NR6=S zdV6iAz}??~XOb@6wB9}W#BDQWj@)hbt|k+Ol~z84Ih=DHN_`Q6DK@&Ff^IQ1wHH0V z{je128BW+eGBlreghMsZIA07AJzpRoB;<kjRGGINz%7X;Yqs=M+IxZnbjy}2JjQcR zjTQ(6mJ1Xf)NV3*-N2td3Kl}aZC{Y=IViP41%q;5fi!)vVxMmHG1d(6%idgNY%{@J zE#^;vd3!yNyH<wUbn4~i{&tgYLpu#XQ$I&h({)OZRIbG6a78<KoMdy3T#aJsguph+ z&cq>Ghl$Kg@54_x#mm|bo?Wrm(Aveb%-dFyid9e13c^vr5a#g{6p{HdW(tKdc4Gtd zNNAmwtla21mHiRY#&Cy}c)NRhDoe{95w{BP#kjlUhSstpixYm1I7V;M{0pjHa_UGj z)<Sbr-p_v6(}A@H)EpDi9{@Fn))b)TNMGQ--XXhgtU}V{Y4h1JyI(_oHLJy<v|3_x zgCEv)Rq{xbdlmhNzO;WJc9r=E+j?61lsCG!h2et)y58tLe{gPkg77)Ae+jf6&ZrHo z(nYy=-3aZ3=VJU^y8d{7A+&SXLvvS20M?<G(pU;Sg2~bUHpq37B*eqygE*}QP;Y#4 zB@Qy#JPCV`CPL0yyr7@1ONAz*Zfc%<-4k$4gfi||!D>z2{HIOZytgzQ(xGzYCi3x? zQG8Q&AP{bAxT7*%1{C-z@`*sHUo@xe>DC&QGqsVqO1E?ku6cLhi4T6NA+v@!$eb@H z5F77pC>p;~<0^QOSrz`#pd|z=8l=Xj)LVBf2F5j)l5t*Le!8&o_s@$i`Ir_>a27q{ zYNbQKRDMiz@AE|};WQlF8@|;g*d2Tfvm=QV*W!s1E_8$ERiIa`^UbJs)mp5oJ_||n z(|eyS9NQ%~7$S_TK31RWt%K{?qB9dQ!Z1O-C{HszpIm|^J!KAmPdOruCb|Tp9xXF) z>{a`E-Eo4@4bwKJ?c-0OD8tn2NL<g^7s(~gI?sj<k9>Nnsh=O<GwPp^^aZbIgL(|x zK(|d;Cz(B)#~&{&xK`OP?mpvpp0DtU+~42uoJS~ho^Y9fbT;h_+v+mlEoMj}B(7Jf zRG$dG7Oy&t<HvutM@hSzQ96k{8nQ5ZI)w5%fMI%jI>?vmq2_($9r%4YKn|QHcJ<^+ zL&3cwyi&emQFQOmptb}4B=k7KG~#)Sao@M}1RwRJYM6$iq@J`KZgs@o#o@J6<oWsP zagO^2*`vkliK4~uu&0114kxj;lM#J?33&@k*1r6@`gYR#T0~aTzv(!bBaa$gqv3Y) z)#LpU$X7^!q3lRXsB`LZMdRA6t@k1C+OZ)q)8wb1SJ5cF$6fI8(BP`|2ynZgoORqc zT9!FGy`>r`Eo6w%LF>?VV=SA$%IqB;S{%ucfQnw-?reCt`XvCq4A^C&eIap?fa7I* z`ppITfT0cRNUf=~fsSaYaPk&vQ6QM;-oHM7`a&T3y%K{735A|;t#gBOX0y~&c;zW$ zesv9fvV->J!;hxxou{*A7jMuRQ?i#F{33PjVv;@B=VXcBcW85<Ex`3S4m5d%6~1;? zb={6LlXBG75*@lHhZYjw;;DRVE%~i14Z}8Ti4VjUu6E0V>68CD<?$c!tASk|(5d$L zaHo;g4z%kACnWqVNFJ)4kNjoK-eDYLcV$<-P9peHxOM|IkVR<zWz!z|E0h%GER+X- zfx-ogu36I_-yG5e%JWa|Eg}(d*r~|H9B~stx;3@=Ijsm*+brDC-{Y**!hYmn{hBoF zGADbjWMUzUH_xg4E%dB?YE~uBhxt?JBBR6p^|BvxV&_RV3=TbV8wYQ&FtuM6_vLb1 z^JBLp0y7bJ*6!EB?HA`W)STvToZW>>267-aoo8va080l!x`Qtbq3d3dFAe3#`5Ift z`Qk$J7oB2`H|5u7<>T4=i~PVT%yxgZc(mH^mE~9f{J<06r;;?mcD+)Ey0i?w@4uS( zRO56+B@|pR{-tdE)k#&yUH!4@7aGV#K#ip)2^pRBI5u0-jpf4{&>CO~x!8Huxzsc5 zHy<0Eqcmqc(fT7@u6)&V2=H{|Xm#8Tt$Bj$3pLM>_`|NfUT5B=7pM<IGlC<)hd!83 z*bKSN!8b$%y{?j*=R=K3k1+fi)bK6gSiy0-w+max2cY3HuJZa<7b8=$S5j&t;OGHe z4QoN$-nz$C>_^(SH$&H*N_$IGdIHf~kHyGKp$Zx&xUE-lQ{yj)4jJ0E#yNL*Yuk5O zeeP|DS_$|z?~WtWhW*7aL)P;8q_ZKJIh`f-2Mo2r$&?kuGeQp-9>GsW&2EC<tBk&! z80#CPa?fU*w_`aL2OOn;_J7hn4jpV;zJn=cVA^^4($huC$YCim=u7WJ*2eB=^avMj zrnRAAD$G!N+}@qa<&FFl<@!OV_Z2~xKXS-MD}b+@o{k3J)vaDFbr)}Qp9x*--RHJ? zi+OgPtbgxvTx!)W9IRFLzb{x*T>^RGfG(=)E_@n<%$QH|B!pVeX3glS^7=s=k!;sV zb=4Q%u2Karhc^y-u|Nuf(n4JgDVZxu-l3LfOGXbba+#U~*-unq0W#a!k`VRm**kq* zH`s-$q%la2^_9BJdaas~JkZ4o-|U*0D^$UItnb84=_`U>E-hU+D<7{Pk+Du(zo#mt zt<lZuL%LrbN#xIY?YXRlE^!BBGxcrII8E_~bu6sj{(7X#cyO>X4_OFAE-oTkPrZ(l zSptJ@NFR5xW_cF%oQP;Az8roayDXt0@Ck&s%S(Y<UW-<pRUhZ}*+ZLcaat*0TAPDa z<I!)A7z!pz`;0?)D7^CSY6Wc;i|6Cc;LyqblPhfbcIFb;4GCONJcYo0Y-~bQ!U)oa z!X>_k=BF}J`qHrm=i~5bd%s~~!Ws5$j}`td@)q3wO)}>A{nvYk`))g-lzOj~$H50V zXgvAW2ylb~+bN19z!EjODqSe|Jd|?wO*0fxTv+L}7q#!9ecTC5IziJ&YErrFYq7E} z`__6voAI!c>R?+D_Bq9jq2BaL;Mz$Mg7oj2m*Z9<g7S2eD-)r|Hi>?NBa{!=C~t8o z!e(FrLD7|~!@SDY#IiHS5WvFe^RD#yO!G<A*uZScR=dwz{Ny&V{WN15hWHh)>(&Ee zvMR%}uo;SyE{eTSp;4DT-cpU`x<DXV!@BQ2c^_9;G|jgHUy}y?MJ~$8cl2Od_$<Y4 zq3~>|8X7wIPJ;@r$u*0)7x{5f>7V-$;z%^<R&xavx}fEAPA9`c8|Sm88&lZ$)2H_X z(BXmGL=fuS?ccNa{@PfX7fO4dKQ3inWcETm2rUmZoP(#Xw5}b#XoU!A(Jnn=-d%4o zC$bhprrk*h-yuJF(o=_nyifB$-8>g}o+s;Ck8F*&nH}wsjy#}82iswy0k@Mo8nj^e zqqShBmTcr8ZPZuLWs4I0R}1e?I=`Ycd`tq8*@198>_=BOSu^YxjLqkDG$I5k+L?^Q zixn-$v_9AHH8dkTW`!(x+REqEx;k<9(DwvQ-=#9tI!J3J3T_lD;FgeEBf&m2JK{{1 zY8d48QMUGnR70y^Do79Mr!cGsU8#jCrjM0p15fK3z6hRSnWCK<fTZKF8M8iNve=?- z<tuLkbMTXou94CS!Z%uCGYmkmd^b)^0Lct8Y}&cRcf(J~ubBQgM2MY}&SZytsFH4h zwg@5wJrscan4U&J?RB8|GKR6fP60^={)ae`Z&F6BzZ$NV+K@*PPQgbYDKN6jS{o)b z8rGr$h^%LHPHM4dr+a^N?kE(B$}0r^i8uH#Nl+TlbX>0IDo56}25b4GIJ&|nkuWOp z*n{#5E}E|U*7vSQU~Z)rZhp+Z_F1*{p=!Mk{3^0pzcJJw_lgtMD@4w&kA`}&oub8x zk%?)!NzEGK>;wsG!y1JAt0fXV#!0~qIy5-oF`Eyknj}ol;a&8_L^kbuZ$;QUMbt`1 z!6zAZCvH%j6+~><&&<#s{R^_@{m7!HBX%{(H~Q5krhwR2>}AW9i;(Vhz3*+9SE@YP zIs&y4xze+V_ZrnNv*{G{q>>mDUeZnMN`>m+AI5;Vy1?7yjIQJt<%O>?^S!X6dg>)Y z!3w%cMt7M?FmQvk@Gu=O(`5TPNW23;qjmw!USk?C#@}F9sf1dSXI&+p&PpEZ@a~@T zo`1c#3iTL;+b!60s;kuz?OT9ya=jbNN&+~dl0izZhP2@DXNwtfzSn6mB6XRSB>jH& zC3DzDy-Zgy%}`}6g9M~r%G>OFA6q9O^kg|UgRWl{A2tzg(p#7E1H>P8OXgNO<h-{J zADFIth%7B1&kjr5j=VRP^3uVe%zALbgHm?yOhV&*B4%6GV<*TLP;&$yAt<e-;Wzx4 zL$>}2>dF-2`vkr%e}ZXUJV*Gp1N}L7<`pA2y!-rJWSi2jJ^v(g{K197pkqNsDlj8` z<Yl&wqRffZQui6qTiJ6*2)H>8xBApfOl$4xd`3J8dyeu-<hI^T7f5=XR#3S|d5j>z zu8p!Sb!)A=7j5)P#}NqpqSa)|D;l1*J6{2Wse3cfB_%t^*m#=@Ew1Sih)-ePlYWJJ zct9$7TefJ8IX5x5ot}Zig|2s}(B_uM_QXl^QYlv+uCinQ7i(`B700%<ZHHh9L4&&m z_u%f31P|^O++7=jy9IZ5cXtaGXxufpyTe!P=bXKB-t+wV#{2dkYS1-CS9h&dYpyx( zd0#|1waRSCwpNOZOzUxXLLf@(Q7tqRv-<D|el@cNC_>>;886=5^;64cd_|<A{&>&F znbi_4b&vfFt+~%|S=i{yE|~n|({)>Q_b1#hc#itOwnliM`n-nt$Z6U^8XL5Ysma%< z+|H$ccOEMU86WM98Z)EiB`h6q!oSiJ+V;8nU32eB;-r_M#awj#@&#=1$+LpA;957~ za~NA#PnviC$)-%f&+lk%y_ZzCNI9)++eS5lPS`A!?3su38_oP$J)D>2cy4lcllkED zT<w1CNsrgsbaT;s0H8zqu)d3!wh+Oj1%Hq_!9ci}Fz;JLq?jk|o_0+q;Yc5Q<WBw` z(!)K+v(gz0Vxoa|{J4e50$1G!_H=@kD5FmgdWKg<YUw|Q&iA2=sMbBCW*AmnP(5=z zHqb-&lJ%}NZXR>mnzkN#D==ydSTa>C2Er~z(FBp`=UUk(K;r)%z4oA`uRx#s&(+g@ zLS;c1qhBeV$yRMan$2u!L+rq=G<q*h&bf72iq?|j;^Wu4&2c6I(|#S#cY~V=s@5=; zZn!W%CNO$Lkm3FGAQw<72_{i-axnW&CV$MY=#+YE5^7j-=qXyQiO1zJwxDLc6%zE- zLm@ypwaEs!9B+dL)oIB0Y<=|h4SyLQi1o#nM8`~D>Q>wbe!-;62k)5gY9))2s)}f+ zQy$I#uH8##+h%n?zA3?3odW{p2dyp4$*B6{SHW=a#%b>-04_(oHdnaSQ@+(YgD2y= zbV*i*x`7oc?uYhlfL1R&v(3&FnPRS;#%Fw<i6`8|c{rDzN3dxtprw_iOuy%|-iY|K z0dA%kL5ZOpH_+w?)=mX2^<Y_MrdLWes_6H*c6aqC*Xa}k2yv9>^phU$Vl)2k>$8eu zokgZP=a!*k4Y3bgd*pkosWFs68fv}Vy1;W+UZf<XTbqI~7k<+74mG_)o5daD%7~!X zh_DgU4|XQbr|;qzq+J`a(#OwJ-d^Zg0j2H6@wf`g;<m9`Y_vFb@%VoHAOniz9QnbK z(3XaDqCA=|@6&g!_U^>RLSN0L&uv^weXX;Z`H9#0xwZZ@-}9QsKg|u{9cEV+pOx^k z7IRtwZ9jXPf`2*TtYj<s0BU=t5?`OG;{a1xv-#dvn6j%pll`6X<QT@ySf@+RMCPMk zx^>>g_6uqYni9opp~Ue29w{O-Q*@{q$b{c2YHDH>0ZQZGk~zs*MN*aCh5;*E0+6ww zSA7t0_{rY%B;cSx8F+3qx?ZC4tDG=313P&vFG7HLaPOVS23vNKN*f%Ox0RlxM-(be z@q8?f<nFcu1FNN>p0~LuGLNU$)WBTzHi}01_=c#6X4=f&*}?5<lSM497@jGih^GYS z@Vc=V75jlj;e_#rchDPU7G?kdgxND>JN~z4#YzN)Cj|%tdiQMfIpC?zBX9FLz$zc4 z2*9wPWe6??6wbq~))!XN`&3z18!@L>ZZ#kB=Ebke06d3PJ%Hy(l{uPWe%liAj-fCX z$~MWz%n0cU-RjA?7z}=}d#0hk7re{mzN0oZFAC+QygSf0ov3SqSRhL3)xUhqxazYY zKYr%*Xdt?pJ!ee2&1$2Y^I}*-YP%@ldX|vj@6*0^XRbV=U^WPA#EEA*4&oMTA|n<S z|1l-ue1B-?ydhQD0{U#0erT_XCqp1XYo)DL-&Zfbj6dcoD?(nNVz(k}{1l4qa)Z46 zbh&+Vg!CTPAiyJ$ue>vWa2GN|nTf+~w^sQ?nI9xR`G`;Hz9(;O2>12olfUyP!IWU` z`kJ8#_B$Vs!`A1kWR*xe%LBf^(fpw-<W!jTc!u2eyxB8mck%Q=5-|F3iw(ib6PV{| z0@yoO=VPoP4P7y1T_grXSud1%<V<a9?(>8kp^WO(p7GI>%kUB{Mu`r0Pm99N)^mV5 z6lXTKS}*#VUF*CbZw{7#-^i8yuKuX3<zkM>7xLD%F70HqW+KQ~=24?j_(Ai>^8@m+ z6`NMTzhl=OoMy7uXjex|#oq8o4I7BG^z`eCjdsbvgQ{+E#JFiC{O;~fiWVPhdg#+! zoVvb<R6d1nMpLf7bGO&tK}yeTOB_x{MHWP^6ne$rjqfT?pLEd(=h{1CNG5;pj|#=L ztbIuY91%H48lRNr7hy+tIKrFNZ74POj+2$Bk~9hI38{PqVFE(A!1HeJXAE!lK%tMn zSy`Q<=tH_99_J_N+=6LNV$_;(j&+~J`@u`>rMa8GsylG_^=`(i+FD=9u;%TfHlHS^ zgH&)EPTGTQYU#jjkDGUDF)7k(iFo;=o`^=ZE$ftb7spv5>PurG<xn*c^=^cMkN&6? z;=BQ#3Z(w)^JzDl4^LdG^tS6_W<E>Lh%y+1*`@0TU3T+z4m|u^A$IEr!F-Q|<4D$u z{N6ri>BZ&ig!fMvqjVJErbk0Vn+u0vk1ANQbkJ9e#ym%UKmMChPyhD2_9rBF-ehyK znE}#>gBgGx)f$-I(<`okv6KxhtLcpI$%)w|@i_{|%~IyM+{)Hk>Cm)h^#o)pucYPL z8?ezH;~9tm3@sb?%Qlwhqx0ovj`FOztE`)~<kOWfrBkPnd1L1$TDbgCvz0?m<6oW0 zH_9g==T_O*>7&M@DGO2ny5`lh`ti=f`RN?I!)>q3V*b*$m1Ylr0bS75l3jcoh66WF zFLQ?Ma}4frSNSt9C2b>8GDu{*j-DMEfd}Q;<5pzzNh)2xPKy(B{58oHK@a8xj0LcP z{8Ga}pZ<=7_18$?<G=*oQY_N8(R8A>5q|UWLb*5S6by&4JXZI&mSxG<@ugJ$k&=#1 zQ4prQ?T-3aI)D4_s;~JV7z1l)Qox~KcZe0YAnj7Jn?ad&bEjzBU+r;%V7RDuG2!|y z1E6)pb}xIpd7*U}Ab_wA3Vc;xXdTmXW5MBlwknb^2@>YUCUg_+4Fj7qUAw#D*;7y= zuM=$RGxVJaX6zlqCMZs_aCAP8WLY1jZ&@pa9~}ZZfRpry^+d?eR{h5y<WUw6Xl<)6 zI5AJZnQyxCFI^T;5Bx9Bk@gpSIIiE-W^q1WJ4+kb{S*eTm9G|0#WmP9;-=qs(@$a! ztra+(t`D?JIVXF_c}{Q>|J1wAHr}~|Ys-LXu%r5ZoXVFCi;LGald9b%?>2?m)C}YX zvTsanQy+Fbb+z)gM`=1R+n!h-wkV>t43;c9qq9=Zks@|*S<bsDE^J{>8m%6T+#f?C zatmkh8l&a~;vSO_lw4lNYxN;L({BtvoAunbQ~u&FZ@`<re9!qiQSNNF79ZHRz_lMg z@Sh&6Nr{J>3%z;<Cd?j%TiQ*;&G}ZoHREo|6*`aK%Ke`5$$k1X`|q*swzFpEtyQhx zhn(N5ew&lA7qnjEcf|8k0n85H=WU1{euC+b#0R2^iw)<?yl%ky%oCIyv2(sm;dU?8 zk^^IOEV9cSu~Ce)6_h`gwB+KHc{+0}<L<`qQ#cpTbQ|Z+y%<RG^oV+6dPY=q(+t`R zb$1<-d?&NIzpnB&0%omaiJV0le|GY;Ea1GHR$p-0)TD|sh2IX*<F<cZ1?qnLNLcaA z0<>^g;Cch$Ui+bt?&_d(`?!%emp(@ZZL`0MXh;7lX(}W^EzW^%?~FNO4e59Rea5m` zR`ZF&qgVh2&F^#~y)1CtEN*#<?~saGNWY{U7|YL6oTi9_QF|Iq-pBXL)6WDkt7cR8 za)~GH9~{@BVUM~A$)`R~J0!*`!na#1Nnyq~J!jwaVG?v;UYl>Uw}-eLVeX|Zgi#bp zj3rpp&LPUIR#!2L(63V1ol+qz_mf?|kUQu`BcQ(?ELS6GYEw>m!`FR^dsLeeymUGk zXISZ2F-iU(7j59FY{}6K^plnC>~sIJs9(zShQG>hNs9SmC=NJF<(LnFm14S>W+Pm0 zwRJWHE_GmC*;6KnF++_V!!qP@rIAVaLfIU2I1b-5LRwn!eyIqwQOEVaC}l!qZ@DBB zFopqzEpe0raE^jqY!UI?r>lR#Ij~XMH&q3tB*-K~HY#d!AByryP}82e1KTF>Q}#N+ z%O;N#BSkR0+4u!9%o@HTt=C*kEeM4lj~FO1o}Zn-%om)O8257n4OCF}ZXWmh&UIHP zzt>38?$7yqwbQ}v$iGt_wWlW5X^QVyUg=r!-t*Bv+P~4hAL2apnVj`oOL}d=Th~qm zXDq5@v!?w7+jgqVP$a|DoZdC#_Cz|E1sf6<M&smorfT!_Ioh1x7H#EjD^rE~L{W}j z&G2%un4|t!4(+fp^foi6kdnIH`<RQMpMZ8FAe_%#W~HTa2@vn3-uR66AT*Mt?r)|) zv%7C{2hG%PPl&HQoDt(q?n`M!@F;$kPR_pZ4Bc98pPJ4lxJ9z|IDAJL6ha_3L)kM( ze0!H=k+#(|V;8otdYuA!<NfsId~Y+P!TJ<bvRsLKO|V!FEnX5_cN=G%+`xA`sr)SS zu!ib3KFw6r?te@GV!=>}8e4H9^g35}pad6777N>igGb{TiaRG;eA&kKPtS&KhISO- z!B6=0+IM!YSlTyDknPG%(=u6ybxP^S>%GT71t{9EDYW=BS+jpE!~1hi>D94?{V3#3 zyGQmXv-Aj(hMKdo6jdlEtmDqkR@;tSAnBJNd@Vuv0iJ8)=>F8GPOsGy6gu@YpySYq zNX9_=1}nb1cvinfK6m&zdoG9P=<INR{s!U~lBf&z3DF?#w_76e_Gh^F1R+SCuZ3lT z+Ev%8vF_5X^h$@8{rF4h`i-uFZKHss`)5Lb)b}=vL0hBoYrAgQa~v0Tu|0&mrK0qK z8;>7Pohw~G+tD{-a8KXg-16s36Q2y6eRMx$B0YKHbbmh9?vJ=Q94Cb(=u$=`)VOye znzvSzQbsP70IIBO`8ON!9=X%8#+qL$AN^E7K*EIop7W_EKE?By-u=?^o+T~NP%=0! zEH<R$`C)YIUhM+b!D%UgznJFp0gY?oRQ<2Dhb36K2JXvw8X7+6{_;bZWwqHeG(5$0 zdY@Jn`r7E5YdnYi{eECyR}Gl4oqSp&y_uh|5i~LhkDp)ZZ9ONmIsUdogH5(#=L-5A zbT{UEIx*n#kQ<jnwG}0!ayl})V}dz(yF@<t(~Zj8&S<%}P5h`gEffHC1P-ky+MfDE z*z{{UZRoUNtX8^OLacDLdheu1)yKtO)Uw(((Pr)E7EsnVw*4z4+u6!~#^lN}vw$Gg zmwy8V!g8q7%3g({3axC+Re|vdJXY{u^({u}`{snZi0T2g=>>q!h<(40hVZ%J`m@;; zo<m|Kj^|}Z`rJlmv%6V)vjm}(BXxG5Ez;pHyici6jekCJp)JB(m9M6xecDlVKUaTd zPg8FS95VG4MBEuPK#%{`8ob^1jJXqzBpvw+*7~T+fU^$2zFnoqUt$|ra{`*=0mK9l ztkyTD_j*1LU~5DI6V!+HnmLqrA(e}fK9w_kIrG`CI({-TQfcc<ls4_o>ZULKiQ#g~ z*s>K!)St<mu-ZtjaPs=OAK<L?Hl{ygJ%czd@95j@@m3zTJiC!RJqY6Ud^T)RRy0-m z9)3R~JEQ_q`qW#uizhHp!Hj0uNNEr&1=_u;ei(4`Jo~iwUaxC&j!rw6`?T=h+f-D% z5{11kt}^m;eGOXq1TQ^1wo9m|CDWL;{`l7Yeh$@H&Z^pYsa%UI0@L#Z^QP}~rlxK< zapt7k>N@NAh6Q8uk*H2&LFzKv&&2(Bj(_w8!4a_n#FA6IbUt1lDUMv>`}_K<j*wSN zZVYfp%OO5}5jMMBoGEwPo}GjguoRz;Tm9NRJ<ug+Y%7!y)o>!6?)w2_fsVof&rWvF zwqNJxKIj)uOSB#*<(SrMpu<vk#pR6H=YeNC@<TL;UC{S-9!^*Xj&5G(rY%$(t6hoq zu9FBuri%yF6gOqW!M$y2Sk)Czq$h3qj&q-!RbSj;hNnxZlxUilHIwt1tLa%6k)QLP zfPRPw3GA<??p`o|Op$L0PUguV@POS`TAuM1%DNxg%zi`P>VOgb%#%#cA$a#{<u<*V z<Ei@lv?aKzXwmGZlmCH*6?kLSVoLepc(87IUwiU#d|2jmgb>#HvrJ!<ggnE@2JU(S zunjf?FdRX?Hqte>r|EfG+DZ;C=)Z18S0nm7f(Nu=Y(7KZ?DR7S=KJ!DGG|HW|04TF zKakY2EiDp3Rwh-B<bJ_Np8`@`ge(M{{}Pok7+KEQ=m$cn_8u%Jj!r$FsGcrjZ&G-7 zfBLsVx}A;8Gm||#%3ZzoxLc%cL%~e>J4t9yIu8ca(mT`H2C_s=Orp$`IYS46+_D#k zk1_QbL4j2$BN-L92c!UYgB|A|+4Mh0|I&A6S^T#$dfxHH!s|a?|NCkGTEay{*jw-4 z1z*0ngk`BOs1Hfp%_mhGjqaI=%xKBUMg1+{uK!;I-2YEL|L>H-Uk3}`|Bc32_-~u7 zI{g2(+4{dYZK*6PD~smtFR@oIr`uHt@U^*PZ&rl=#)P1tSg^xTA{+evzMvlQo>p&h z+MgJ-uV~k>R>}Z@(XVSZG*><@MK$05!`E<ZW;Sf%PMoC41IP^5od0q4JM)cXdCm=o zbqhL`Dkp%@cpcz5C=KQFT~Zyav=cTv9*$psskK_+Qz=#Axtx@D-byr*RaEq&NOOK| zSgpF^6KE-dSdXb?wfB*a4=$n^Hhj+=G`c?$vDqt1D;6*CX+>JK*gC`NgrhHlTdve< zP!c9^=TU#r&oH}<Q_BHKZ1XysH~EJ5&+(x)8V*=#0mybaB_)4xLXbkKCt%^NqN&-t z<g^mjPv8cR#Q$JDPvpnzc9j97wV_F0n9~jJw;%bQZuDP(BF+z|{ii=kBT8@=1w`1r z-;hM@yvBkjSNTFMx5DbZ0dk<6x^D82&T213umBrSXISNzD8^*AjM2_>$*fd-hM_4s zfWCwM^P1)nx%mXvI=mnmal%xzwEE6R`6Dp3-BJExad_MspgUWitP1|#&To^VYro%Q z@GKmB!G_q{f^>C>l`M~!Tkn=*5cH)ec=|Ps=_Rh`KOTzYj?m*>bI7@cy~px3)F>z~ zpTWd6my&iid>t5gJiJL~eKq;LHR3yww_rv^6MF3(#-A57*ose>K?I4a1-evhdAi%D zhV=fxObF#8sL^08DD@mkFR-TEeiu704nx}0?0ib1q@<+4iG3q5N9~ur#z<>OgX0Ff z+M+}{ZI3_IX<6N6UMRG%>HsIHn%Jx2L<3{!y_els1>tUzCeq*W;QoqH)#k(Df3i1X z-u-LF)~CP{IKKkmq|`eChGKy*jOIBxIU)wKDr#z7K(@BfDwmEqF0*kaNUZp?`<qVo z`FGnVJYDnkoO&YFW+H&-8H#+hg0Q>lNs1@CJFN2VJ<)o%u{^B*)aReKyZdt9qM-{- zj8kJ?(@k(_NxfEYqgF}C1DcquT}46C0BK`dS6p9_iI%)Hlx_1n1kA0C4PIRxv4tHR zscDMOPQk~JB9!glXxlXzo({}I<$e=W-qaxl-#@*Q_rc%cP0V~M^X@+MGygRvNr=-d zv#-8^mAr;y;=6~D&!u~uKGQz7soV`-_T4)Z+8GJ^MEN~;g5Ux%MeGb)`8qVKc>F`s zq<>wdX${~ZTc<|kR%d>`y8Z#C35Ky%ZX4rqtT>h94yQS4Yk1>#c2g~?R6t23A5{c8 z9PL_7K6|0I<tbkzs4Wvgc+K=8)G^bxHv~rcO{=t=QI>?*{cjar3XSk?N;FKIv-B=m zaengXawbPYm0nPWRS48tI<FVR4Axfkb@@@Ju`-$D-V+w;%q*n1)aMd>Aump6%~q^% z8Z3+B5m^hg=EL<PoBr3-{^pbyZfnNaD#htLw>dRIDA25IEK`#ik~OueOOrpQVdS%Y zI2=Eo=1tuVz_lRI`%YHNDCRj|ae|qY0;S_218N6*3NsNeD3rI9_Ro~QQqNZ@*W^-> z9PL8XT*+)5SOK|FBjC|JU)b|ZF#d0162MGqKD>d4+mBL3{=mr(vd#0A{D$q*nc<E7 z;xGfEF(BiKSPRE!$p1D7LM;hv#j>6zsc%H<!b($n-_D>yty3<G8;uqSfHe%inIP&@ zWvjuUalnGD%D+N(R<-|JVNQ_H*|*JPUb2dt&a|o^v=IL-kR|B&u{DJtr6Q_IiDh6F zYT%ow)CRG|qhY=6`_@wF&^w{5*K`G@xW2`W2lF!3$OQhQ<)vzHMK!UMoMXGYLLdX; z;iy*+At5Rku)2(@I<*d+8;%(YE3ApV^Vx&*3fA7!TUF0M3T21DK1*%ka1YyTZ1*%{ zNU02<YCHl|jc=8~9=l%o%pP}eHiVKlM5Z9SYcDGd($i}}4~P^^K=iqPUnN6eX^w6| z<%3#dk=NC2{7G7z_}2t>Gm^KfCJge&1UVH0@n;<*(~qoeg;>0MIDn7V#a)k~1SgK$ z{c0e$!Z*cxE%l4AuKBuJ(SxMrDp+~GQ-ifk_{->$x2gD!cuIn_cXoobU^b5NX{35m zO_>4A(P(<~lnlrC(YEd|<3kI@&bOw?g~$Q82U())8d93euW{7ODdhxlVN?)jf~NmO zD&T_Ya5Jp$59{?;+CZkfXmEnk_Z3kz%4IswPmiWw-f)g|=Ssw1SXp`maPeXh60Y>D z3st|=?-!HMQw}Wr>=Y2waC8byyEBThIY*xO*&qOrMuMDDykTHN$y;<kTQaDX9_yrf z%Xf0B24Wu=p`D@;E-x<&tgLm#a1TWlg;VFvfCa5tO_qM+owwbIJzEF)(9hoKSN*<x zAKTJ^7ER<5^{|5s<?Qm$I)i=gG(`{wzCs$S0<0;&Tw{JRJ@?wwu+M|Xr~T{VfLzms zo*YYXW)6X-N%q%Q(Y0S=5Ol!{0p!WkTT(~Z07he2(b#mP*ZsX1%l}|BB7)lTRGzC? z?Yo#MBFJG)@OMIwk0@kxsay$JCX1xr!tKe$?ea0kW-q?)2`zqmS%!_i6R9l+Sv<@$ zrWG+A^nHHhD<0v2+$(Wy8if=oYnU?sY*)>B@a%8@B!g~^py_4*3kd2sTZLdV_+Kt# za~YcH=8yp8loI87Nlg>cY3Dj#qa|d%FOtL1UVU+#sRWctjnktmCMthU?ro@a5@+?= zhZm7$_F~&x#as%+fi6oC^aF?ctJ%EonQchHd(5Q0%k57d(559Hn}xae)G0DdC%%T( z&bJIUwLtsU7$Zr2V<j7U`*;2k1!W1#a_$v0wlNVT+Opd*FS>c;0O)!tK%BruL<;)! zC0GE96ZQg*^I^(bE(Q~-n3gaw*>VQ{v(5v;?ytX_50Sy?do(~g&QSfd;f=19Yemp# z1_#y-ghGmnQqvtn*s-j*a8WR^mHP+wS}lBqfv4FU(utz!bO}vWNd78<(P~|HMZ$(F z==@$-em<k5Q%^KeZDQ(A$yeqwAo;R^G)erI<m;0((rWLjz&IKdHnt9*wZPP8Ik1<C z+5-Z%h$g|<Ue(Tbm(;pJbnFB@aU%_#;Qpm1U7g?oJSU5NR+qTYk;{TepAHnlzGi>q z^bCF;{_jtp=^A>z%Ec4o3L!HeVbt_WK~~yU5k{YlxMx;OI$lElG$^eYD8vyN8FAsV zruCo>sMzV&Y#m#NmZU7Vl1*kkz3xQm@g$99RTK!3Iq6K^;(Id^W+IQcv!uK{^EBWA zAM`~H(X5lezoj9$t}EOWdzX0c+n$Qk`Xmw!1(^3^{%d^rX;T)10yNIRmGN3O2QPET za;^AVzt4#bwrjt!3`Li)OB6pz!$g_Fx8nC(>$!3=CFpOm++CXa3=~Y6RE^>FO`<_n z4*GWT2YHl!tgTv4#4aAeo6L<_dbA5mr&5jMp5yj?>xmo{NywZg2<A$z*=;BNBLt3l zSO4vM*K(`d>6kE5Vdxt`rXw?ynznciP*r*$k$7HZgA4MUBfSs+*Kr26XoodJo2F(I zwqy%b30%F2`ge125)?dhNN(E&afclmL2MDYrP$&n2#m>+m7O#`D%w`&CezFatTpCU z>z}%Qn$zJ7))b;W{FTQ3<{{~bkTZNtfFFa75BZODrx?bnx|VSf+D)G~ybeK!Yj+kq zahMTXua<<*bfyj^x}c?2FN>a?vJTKH$WX9x6ZZ-MH#@VZ&O;|yP$M~oUihA9y4UDY zzHD|dL@_;>R!WycDwScB)@%-0(y!nX^LP9tY%wR=U^42^N;0|xQA4xY$peUe%7RK$ z2-c60t0GO|mES8ld7bkzXo(|990{?4<)-jFtrRobBp<20&jGq-Y41B7(^Zjm0rzi+ z%U%YL!bMd{dIgqf3H{DZxck3<#8JKSqb!r72@+z)I*RkT2~xV)b`W9|`8BM!8iRyl zBOSoTJ}T@QJ#<%_i<y8Upf@4PxQ#E6H{Y_?6jRmeSq5e%qh7H6XnX)Tl1;MLW!(1| z61Eh2ivPPv1^hL3Te5wro&!NLnv08z^I`3b_366kWAX(CCgv#+C>L&0@ZY}mI1SMT z1ZMn7iD(2KH*5IlIoA3r;BAA^%AJQZ#*7APdXU?pF4_=NVIY!xnq;>Rin)Qm-`RaF zO0BF80EBYLS7EpFe~@0Wk{8PIxSZN2!3#Iw{y91^`tXF)uyiz;`}v(t<OJ<+%;MM& zyX7D74kuxvF*K~vgU>IQaaE*IKV_(<UGH0+Y<Cyc?W`X`n#JN*Vuirreo?Hy)Sr*G zgyQkFK072XqvAv()oR;;4F<!BH#ONS6KN}kK=i@K+Vb9sI;$kV@6(w6-XwV{$0UY^ zSLBo33R~uDR;*T^DqI*F^ph(#F{J6kA0c!T%HoT*fMe}NThRITU)qAk+*gp;2}Jom zC%5j@`(2OMD-pmpV`pV~vB*tq?b4OKvSDrPrK~5>?_7ZI^GHV-51HGE-Ee4u^+{SC z8C8%GEf_&ZtjASW#yC<7t6N^e^!euE5J9|Tk8WMkYIwz7sI#GQmUKNEAZ3se%ek2K zifCHOnlBAwhb>{l{)&$MOJeW_4q?3_M9aR;zFaChik75|4$aBpOzl!eUHN;k(4ocd z&%yUUD8?8Q-pPIa`opkNLvtENu6`e3Z#xtmN&HD<5f;@}4I%RcIqUQ5qW!^1+&h#N zw2yte--f<@mXENdT70mFn2F&-_b<e&yWDc2EEQfkWrBC8&v^PoR`PbnG4}C8baCO3 z`Ek10g=7#Q!E^lj{2xSzt0sfjXh8o(TwGioUJCND4-%gM2cA+pS$rxHNtrl|rg=+A zAB-K4eJ2YcEI_;!n;|R+hl93xI#5kPAG*EFMrF~TPX>QPa8(6)?VybmP{(Dv65o)s z@#^3DD=F0iV2tthK@HQzxJ(I6sLu0k#ncpDH-gSfYF;go$xWA1`q4C`vIV6^-JZ-V z!HfEsZrX5+1l#WAIIb|UDp|&(`7%S=${L8xA{P>sr1K)FQz7OuK$cpWi?Wm))`bk0 zWkG)wfBE&<sxSBkp*JStqXnI)V5R6g**9%|oV8@X2AF=HIt3;%)DFDyQ=2V0d-$dq zx=Fh)F4B&)dYwgVfnP>vfjjbS8#dx9tuL42p(`ry&qXg_CeD&D7+|AJlk~pK1TSPh zoHMGpY53@=v2QfS?2&eUZw2MgF-Tnx_#^=jS3t1<fG#uh%sHHn@X8ELVX$K=+^&yi zSMQ}6m#oA=phxmJMEHFJ;P)(L%F3IFW|UnTXKGm!aBu{S1pT^#VPe=6JE+BNe9p1B z3)!}P88Sqbu;2z|OQ)x?%v@J_sv7YQaz{WXq2U`1&FBGalB}N0RHD^GK1ZZ}j6YW+ z<tWtLWVDipUw@&(D-Ebcd&uMr?a%#nLT|DLNp9xwWx=2v4MB|s%3C6uY7VE))Pp{w z_13abKzKg7L?GIuWo(>Evbff{`b6@6Dk-Heqwa`N!CmNQKoDLYN@AM&G)z2QuCW>g zN@pDtR%Cg(<=h!^%g3aFul{#6@-DNoYLw5|or@~4{^arR@2x!Y;4$VJj~rZ>8K*Nq zK<+>s7A&t^WcA1N&B7f4vILQxZ*y~V0pB#hDz*3ae7hP^y1{lcIB8t)X&HdJ`2qIT zxX10!ZBKL-iItKF3Ql-&R&LtKUVEyeER$m;xp<n2WTwfU^FH>~M@DAL`xDDQ{<~-j zQ&(WIPiZVFuFpwJ4mnK5R#Ri>s{BMAt^F=PpD@f;gy(%nOfxio_c^DVnJ4KjI>HW0 ze>sC(6jcKDo=ifxo{RaHR!$^&GA@_}Ir&I5>>t{pIO0gIYDhqD&5sB*BTNxY%$erE zi8Q>6nrQumDK0E(bxmu99)#{<w<2c8mVwL*6M{Hi`IEwZS}}PaMT9)q?f%FY;)O3} zH9)+O^}cK4W9doH|3=%9+2q)ef^g@Lm#8)k5HC1!TurMHzjAQ0F}Ma|8z=(A3s)GG z60n;F@{Gd7Uf)h20<{ORa+$K`vWRIaA|4e>w+^*PZYy-XrPSX&%|IkL>uCSI3#hI6 z!xFk9J1x6VShhbp0y&|F1<!k{(_!Y(99mm~V`ouOQD=ZkiW--n?g7-IzkMtefK7a_ z216&y_GQibQtRGp4^SIU{w#sUU=7^wRw$!bN+<028Hyw2yZMQ|udknpkI&!3jdM6k zG}LX24N>+dJ9&#&s?qFQDm2qE=2?I0kcO&Ar0icx7nU3m{ZmYej)6__mkb!?n53<a z3WFOVeC*7#Ax8r_1ob?=5MaKdOSp&(ePj4#<69es7E;Kaf^rcXe>p38gZSBJ4wxm& zh9w^kK0fa{YV7Z*J(B{M{y&=4s?81`e(O!73x5<Kv24y~<|ER>cm!>@68WKDwvtxb zU4-v;5+;UYq7(G_CLQ-cRja<6Ryo=FC@Ic`Fw+6`aK<yTSuu2eQKlK~Wd3G}PF$yz ze*xJWzUOgU@w$P-+yGZ>J)8<tx%$pjznb8u2x?xJketMTn6(<e|EBc?!Ax19a7`xF zdm-cQWOte}dEnki`ZrMI5i{H$VE+-C)s$KWQ4v%T=i5Ziz0V3629_;Aqyse8k4rEV zn!^)<E~47lEtX!3_2nVI(E>(2t8VBBUGHlsk~aCDx=L=ESkX%s)-pG>xAO=vr=G-6 z?phaf3yd|160w4a^7Hm+wv3*(EUa?RBS!B@wFtevs2bFPj%VI;=MPa1<qTO<!d{}o z&PzMyRoVAF-fc2jeyEzpyY~8Bm}4-B*_#L`P>*&ASoT?^PN`Rnz+U#N_m3Y!2`Ijv z(lu@qau?*V!k_$GYR~0E+B5@KELr+M#B}hPBg+A&i8p-YkPI~*TedYh{8}l|S#)~L zNB8+rA-@p^x+eO^-gC=1WZkg_S<)@&EkcXWMAq5;3Uq79mS6PbgQ|g<j3}gY`K*{Y z_mL;M4Zc%k9ZQ;mM}FXvVcu;JG9M%`BpW3>lTU9&pzotaTZD)&xH|bZw4n5lU)DZ* zPEkRj2kjN$6O!3vgr*rw?rV5AHk<09=7%e7K`6E`Nc;=O&d1R{wE+WyRD_){kuE6E zku8xk?C<!i4B;g|-n6OEJ@>%})wctU2VVNmM0l3j_ZRn<`X3LbHAs#bgS7lmj9@4D zU5e&E&mtM51G2m*ht4C`VG;Tow98TSz$6W{5FBpcwhjfq{o|rV?86uZyaJ8;nTbYq zz6;U@`XZl5bu7(!A4SvLUH^Ha$byx!oE#V(l=^bD>%hXQq)nQY`sLx67+|FS`&EYv zIP?6m9Rv=+b^71`PrDTh?w1SvkJtZtTC*nbbWpx<_+$BdIn1)?d@<+wk5|p%9}4Dw zy|eJY0KWhKoL2Aqu>LUy1M5=eKR(L76v&2ClEN-(F|=sas|*nbs6XW0XgW!I#!kx} z@`OiudEnvVconZrBYd@PFz~$c)?|p@;bp*(p%}a<wdYmLHd3e?pmZ&|luE9W8nyc4 z+co{QxC0MOn2=s?fXnn=hX1ifjqkEhMi)q!%+{L4x6R!B_K4s)dz0p}g<T66z3i+Y zFCCo8$;}|f8=-B0J5?J)Bf2(B#Wh9S+O#dvCLOxyB5HHx&R$PCG_7IdkLp=JA|u8p zT{=L*4N_lRCTlx7xcGcz>t-#xYy~5TXW{DIBi3QOn&QQpx<70v#-<{sv}r%YKNJjW zbJ5I1AKovX(YBBD@F8m??3t2S{}_I{;j?2_E{Yu;{KqW?v({`tq8+uIOUJ~<t^s>~ z#eG8e69^?`Wt;0Ir;W;fg6?i4{+2=_zlR5RJPvDtXOSA=nCZ;pn>ViN;T@(-of%e2 zK>EEzd~AF!oUXN@#cMqnF6INFnQ(7G0i{=OP3_ktlh8CRkxyk}uM<*vO6!iG=B73g zsCoPwa|6{_(FyySbUz>{QYv8{_CMTI&7&Dm(u>>vfY%ppY-`sU#B8NPB~(%nZv=}V zBZ?yjiC}`NE9#_Zi*2+&e4drL!18HC-V~o7JGRMeR9N|2HUbQE<K)8|AjP2okOeDS zT0*zeJqZ}vZb<&JUU>l21pqMUC9#k0UP0i~`8_L(r1lxeca&P?78{i8`ffM88*%r$ zz5}9^{yA@3z?$E?W06CnRH|amT+ift_7e0c72#`|V$<v7xh`2;oK1(R1#r9FI;vv= zW8YSshz#0rZbd0-=9sKv3ADk@cIG<j8NyyQo_j!NaB$v@(HDpVMWs{Fo6O;jYbuhp z?`@8x31aQ71ece0>q+3(mKATT?2|RP{HLZBKHmr3H%~D8d@n(YMi0X;&5HZ?G=BM8 zxAGD!dA)s6k!g88I=BM`64T`21Y~#^o3$=z*2ivF2sqo7m&M)f>cDH|xWD<ht=Lmo zIUg<Dzq=x#)c64Zdo^4A#G5g(&;mOy*+Oqr?*tpx&Sh5Lfn4;<QaoBMt%M#GPuK&x z*3|?)&39{+oW`HghAGRa<QKk9WeUjztfmtN45sTanL@y=W7EMNNl+h{K^{S0QqrJ3 zYg}~J>wfQo>(aHLdmps?j$01vTz|<J|JnqC*bm)!P+{rMNy}MNTu`tR+~zUlvg!pZ ztDzAZg2|u<6k0GkkVnngvVrX`06#?3a@j;zp~X<#0<@Vb8XA+=StS5OdvRYRd+Gz9 z?<(%0pPe(o-HlE-7We=MrJwPY*ISN*{u+pp4`Knh`hfJOCjgv>2wxm+-Emkd{uYDD za=%MK7*=hcTGn_PMx3-$R1(oaf7RaKOVS2Zi^z>r9K4Z79!WKg!1y!bMH7Tzk}QuU zw}B@j9;>Pl#zB$Kkq`Y?tU+nqyBdjLyU4}}M!c^qeQH24s70K`EuNf2PI}}0q?&?d zt!vKLhQ9f5t630wR9A*<2v{A_k&^rd{t-K?QHg!Q>PP|gRRJhK(2NLT_FMc^IRxt$ z)nN-em?7b@l8q(fWp?1Tlxe|JXlN_6&91z4b8vUdSG&H!9ju~v0P1yB$wPKKNu~ng zX86=_BWi5kpO8bMg?9)z!fJTArqfH;?=CE|LOrjbU^MhUsgtQ=c($hr<+l=^-?1|} zfUvBnFt=%shWy#!2R4H5XK3hYS(p*iYqcgL2(`rD!Ssx1P45am>xMKKVk(((^*BMK z?A2uRZw9b}x!^`FGMU=W#@}CiJ!w<~N>@$qt@9z>GR-acd%^cNQdhbO^CgSm?<C8c z*QCqw!1n#NBdRU`M$?{!DCNLfP=P_d2pg3_Xa~du{y=25abApXY*i%YQX}()n#TVj zW*2WJO|;i$BK4;^&d2+xox{SJH0yMvppCjNlk#xhq2G;ZIJ;ey(I!W}=Epw3(hC%B z=<A4{PKidDS=a-!mnbgjJ_Efm|BN?#pZQa4v}w|6ice?!7el+aKSc8#Z%(?AY_1OG zYVOAr-;C-vWJ4bnz9M1loSzMWFru?fmLLvYqvEw_$$foQW3utC=jweehH6r`%HXSL z2<Tse7Yl$Fr}qKF*){yu``IRq9m(tDT!$Up1MvkE&On36R7nN^32vTKf-VKr2|lXI zO*ns2AC2<%heJ;xg8V3rV8P2F2qSY*k1q%5D)>x-f%*8x7oHJQsdJe>FfHi@?f&!m z_P+Y&)ok7Dd;eL*XSK3&5GHCpU7c^YO?$E2!ur+RdwC{T9s>KhZ`NIEF44JoVXYwR zoZsCHe%*A}GxOYP6oQZHpJ8f#X5<;Pw-M8*P8+-z_Cob}bW|Ad(y1+9G!_dgeOG3W zKd%C5RKgFthB;HYgGBUU5KU<g%s=bnOFpW$$by7HV{Wp%S1v!n`X=NY>vN+rDB)rN z56+LWI6h3l>+WMn0Rf?*cvh^guT5&euxxV5dQV;9s&7(S?Y6g4#5_qlHcT}1^~z3= z?%BB><Xxj&*wrtLS!#(%5b}P=Ixg^Fj}2SGIw(Y8jUNsaKJ+=UpUVCUO(C-X)xGuz zvKq|+WHy?0V+*)4z|cY$*fsRpSQNQGG!mFdoSTnc@liT-9PWCL6hUM6?1}Qr*tNOh z<PX;2{S(cA5f0);{;GO(o7NWX;{QfN_7Yfk->@|e2q5&pf<+>D0nwgpC0i9)fJ@$S z)A@8|N+UHDu`wsr`JUb(iWqT?)@hKC4ko#+nb#E6Zwj}`U2p~1U5M2wgtUR#VnPUI z?v?CSDR>?ObOqno9f{fZYJCbblpPa!Esu4u<L6p9t>Qxv;f||ro{lR5nt5wM0YG!p z^f~lUiaR+^7g}wwp+hN+opg6TWx9v)+QIlWz{7rBRiHRX)Vlp8q`AVOHi)oq82dA) zW35jB^cLRKG!VmHMy#BUu$I@dX26A%gwHvNYaGh$XMFtSFwDMT<fpngPNHUbsASso zm|9|vZ9&iSE2Wys67(`HFnQ5DUIn3gF{^&{JJPIY9ORC|G^GofeN0PQVKZ$8bFwN~ z|Ik;;y2TFIBZwJ*oEYaopnN)0Zel|)U^<gYWyP<SK$B<?A<%Xm$D7%@)?UAKzzn=$ zDKGCQ;!eQg5UL4+LDOf}APpP)k@jKQ?xD4XW0`1Pj$5sUVDb^P&KQ2J)Jc1P_5CeK zZ|TFY(l*kJYcD*5cLmm_{ZZFm1wKbP^@m~5y+5^8yUrAqKjCl=X2{MTbu!&%{J1W5 z=8M=}sCIf&%F8AqjihgGYeI(_(13)KB0X!+txMM|8dF(@lon@elZJ9bp|Qh-5#K9( zQQ0Oqw^ewE!R-l#u}kx~2ro5QWx}ZGX0;dL5uVU+8wZtDO<r)-4pW}Z(I35=%12E* zoLh!9Qxzl$(c)-^`SDb@8RD6b>`AN-G>{pnhySxO@ANqi8OqMKd-7i$E(8D>bR-&@ z!e=jS82Xnm3Um!Pqydv5by$a`i2WnG*87!)kvfem#;pKu9j8<wA`(;>;0-x5_Fy;0 zM4OC)PX>(~I^hVcxi;_h&*z&D$cqtbO)aEELD;{MF}=^Rh9c?I5s+*5I^TYMsi~;R zh5$8{u8`$gM}<N{c%7_z8j~g;#yIBIX#y*kS7l&MC?OQ6-bz^ZREp(S)jRc7(!s%q zJ$dAx44L+{eS2<=&4S@Mun7reG<Z@~hE`-D+-l*ak*8Q4Xz4iw)j9``P=*IEXAzVX z*f)R2-tCifYzRrrs1077JiKb*D?L1WS3Jp|T@?IIAyveExfamt@kDri2BmpQK)jbA zV+wq77uX*ag<b!;Xch32q~(_q@X&+Pw>AE9q0*`2#o8vUJS#^BYk<--S=k_{YO?vE zNqj4V)rEE1%r=^{OuNjf*}tE$K4+>rw*}(u0JSMnwo0sKkGts|6jYoHWVIIU&xNJ0 zh~k=5!&z6L{NH2ua9v=M#)8G*`(CSeQS}uuhDq@!XXM_fY>)6mweAWm7oCML*P^Xb zVI`<36^%y0hB$z6Csr^Z`Rf5OPP^f#okhAYYL_V4Lsu*SUF6PqBQ9eogegR&Ifmlk z$*wY9W0Zs)QDqHlZ#0b9_8^MVooPF)82OzZOZ!vv^r`ei=uNZHwvuC?k7&!~ifTKh zg)Cl9G}zwoRdkr!YJBql44go=-T$S1S~8phc5>5mEMA`bMH5orGl`hrj7vO`WYzMa zEhx#N(Y`DCvBD`_$iSFgIcsD?%uF>8MFw&>ulBYNAZ@gswyKWSuyGgyr5K<2oMKVo zL>xn3AUmd78#f#=5L2)0wOPR<*J&)`PTQL~`1)`}<C(UO$4w~3Z;gHyci*PQ;?=4C z^8Uv}-S>~m`pAT}W<wvUk~lhI*;Yj?C)&kT5rU^=U>Nz+%Ic)`KFf%GRnf>UT?~CG zfuu=dox~_z82J%1FuC?&6`vm@iok|Hh6-M6UnU<F-B2_$M$TtWy()IM<Mx2_1&S#a zM0|`97gB9G&}<pV*vX4Tce%rI<-oGAUj0O+xXyxPng^rlpjfFye|Ui?SB;e(Z}d$t z*FBf_cQ@7L`v)GSN$8}=bVh+RvSaTnNhTFAWt!rl1Nz%huP}>4Y)6MLIw9}4&RoUE z%ovmpaZ+$av_0=A(yMxnzKH2!Tj!QjRAegT2EXlOcOltK8`_a2gR6n1GpzO)GZp+s z@gulD?a;={VQvL>B0+W9V^m|)H-FSC$$JFK>cu>#);;f!4VJ|;-CuBXIW@K5mKL5D z)5iwq)2yd3F~cv;fcB}<Xp{iG#rpQl;1RcpO=<FBp0oa-Gsg9P>HB(-VUNE{men_L z_k^==NjpT|Kl8*#z5~@6xeQqy%X1%#na^heZbBUc&Ph~~XJM{O*t!l4YmWK!=(l%7 zZE|kSw}!Q`mK?hiFp~(qtU-dTw!r~7oR>bU+TWEeTAoPMcgAkl6AQ6Qt#eGQ>YHDy zMdL;mlOsip2ufth23D!~3bC4&>>2u5Ieu7MuIlk7WH~3byVI#`K#G?p7S@X?Caq3^ z|0TF-$P~N!NrFMFWdrN7VQfyewO7aQ5R=gU17VfmGko8Dl6B2KR2fM)b*Z}zAxn*8 z7DHw_OD0EUBFhxC8VoL2Zz$T-z;5so9wYPBR+Yz?KeDvbsj$U7b44XC7@MqYi;rV& zzspyfmsp3YT)ck_t7W5~X?7xbK2*?oF8*)BSbzW;^;b{n|55iTeEoiX$zevb0eA>c zHNh+VPa4zvwMB*G5$clT^W$}~1v@imK=aK0QqQ`-@QVi$J^n_fBm7l;hDJCSw9#r^ zeQw(({{K{fNW^<w84nj4<#gd?c71+MQ_o&9jrx-+U5Yt=GlA=7cV+1`^!0wzOTt64 zp3PP(TGd#8aTxbn!OTqkn|E#w6q!j}*QH&@@u#&lo8dufR<y2Ze*X<0+YVdg{{B1N zXp=S45G*Hz50d#&v>&)m)Fy(SQrdRQ2&2g?+~Q-<EF-V90|Py<gZJaB()ZHGgOj&_ zdUYOjufhyahgRuYR9PQMN{_dHJ*1zYxQpPOFv?;jfk>OO(*^dIZfIpzQP_om&q^xc zFhB14c|$ahRLUOMGG#P7h5X16HzG!RdC4(99+t@>FP}5}n^}~JK<IvzLkxyXrygJI zR_T6Vgedu*h$l>+?$UVge04H~P*61$h8d2=!Z>;~q>U@a)Qx<wF6GGI^N(2orrV8s zD;o$H&8ew<!A&6=u&`|ebcsM2#4`3Xv4@;hI^3C4*1}7}UG1SE#@hhm{H9rF)i8vD z&p<U!No^*e^N5rZZ3_1+EUP*fw{rKC`R(8JrjgKtFe&2+agmilHn!|9t>d`fRwU=} z2kNy|MVf`3F;5O>U$X}#+N4O{r16*U{XUpGpZ~6eGr>GG|EjVOD}ZJ)ZzQNTn{e5` z0b<l%VnHn0^#Bh#97Z8Q^b!hV4Kvn~eiD|J^j|4dwzMNslDl)4QvP&aLXB&W#yApJ zPydw=fBQqc`jVO7nK~Nnizkj@z+K6a9NE>jQAu7Vu3`zux$$L*V;UnF-KBJ$$k|}u zjNdimL{94;@UpC#!__sj?qKB$_|9V^OdMWQqqjtAaf$7yX?~PQGR4JhEyCAB>XCwT z;6=KI4Gu`Ok8gNCU9FoCS*IF$Yc_$_qYh3Ng^5n{BK}+`cNwoS&<m=tb%lS_q~lPt z5{|Y*Mh#K(OBgyd{+!@SDOa~?Icf9<S!HS7GU%0GtJ`(aDirpoiiU<j0CP>OY3=<X z-`;u65Ay`5Cg*B?v-bJmN!la@!@YQrcYg>-8drM8y>wecV=Nk3#U|}t$5u$Tg(HX< zH^n6S89$OsH&DOGKU#&<RKVZI^WaoAJCv;n8r=uxF~>+~;Gqqu=H7;~@>&zjX%IY& zZ}B;c_1i2i1v_Z>{OTKEGFH?T^UHQvs<%d!9Mx3~vsD#&6qP@=k}}U2{noSPN$g## zH;3<ZACp;F1O?;E$Ug2LmksD5VlTrgoZxks8H$WZo0}Gsb{h>WbSAzA(<bxKoKEnl z;8M%V)5;f%RIsqeu{Z=XJ-)i)3hlE<`cB*uI*>^}%WLPFik|TWWJ6OR77NhF-lXh_ zJ_nfqjm$A}HPLNJIv#In)C@8+sBZ<8;l$JNH+SLgUdz_UX1+2gL{hu>tFiOv*Ro@u z*f~^=>1nUGte8O%&{UXFT6LRsLWaz?5vFqy;mt|xkJo}QI0VYr(PB)qs@XEIHI?Q= zf9y;~O#1&~cZ`pJ1=t;XK!4@K?K!p&>JAPdx18G)?AHy!S-cE;=@R{lYd=r^;*v6a z9A|5<7+YZRWP&u_@-4O2rCcWYd07F`?VcD^(HmIh&j;_Q&_&Dq<=-{0#w7I>4LxBA zGsKk}CBrqGG`aI_TsVuJ>x+y`J!YReiq)yDj{=`Tgm*a9kt&0M-og&XPMlG@y~`#m z>URPwy7s~Q^NTu@Ebdk&wT7IFLDRUVPnYhTSJVlzDvGHJgbOslO~?X-tarihC$BGa zuTb?N5T|OpH#LqGk7#}SSLNA@A$k=NRW^<7l6LXG!!4FeQ~9E&&qqdCkvXZt!I_%M z$*V=?{W_OZSET)=_NG+FM}A&#+B-1RkJZL!{<gq)$IB=OVbeq&Csg-K`mgMqzMv-K z&X=_NRkjvSUN0&0REu&S<s0&tg#~><jlL?F3k1iEaa!hU;{{ui{rim9wGIKYDO;U7 zw8a66D+DUiPc*=YE}ogRhaz)TPb_7dHLJb6#23;BO!H%Us!yzi&8c%Q|0B}3RQh*| zT6jtxz<UDJ)!HjR5{Cncs%gxBd%+S2092g3>wL*CYmq)O)cDSS=~I`ir2{k=v*uX6 z#bUVx18*4TC%x8cuyOIM-S*|Owydm#zf4;O;A(NYVk8M_>$6MmCvP&Dy260v3K1HA z%2mCApI2W-IaN<XpR7^ns^Lg;!SSt<cD_UEUw(xseYt9UT=PWb^d(ty$D*b$S11B; zZ+Dx9OglZrXn86(*LG&Wga=LT(?U|_uNXLcS63U3D_6S*fpxgNyMrAWr$Y2BY1f%O zkz(bgLA1MrM->{!Pk7ny6m5Lmz`LsN2X)_WoX+tUxiQX@&6DR!u}<-3?-Zfc#!fm; z{n`N9RTtDTi&1TAVmsb%wdiB<F(q%jN-3Sn?LJh5Yzx`g9Ul|FcYDJO3fl>9cD@y> zEtW|37Oi$nQE4rkNw5Bfc0HTGqpR7&9-J4xmIDtrwS#>qluLEl5-qyGz_KBvf1T6D z%3aw;)O%T|0{WRjBLmCT7k4?TOxnm_zLakED5-)Y-dd2JVC<=N?J=AhERE!<pDK4u zT4^NoCNuJFp8cT$^_^Dxj+@O4T511k%)5zerw*kbdD_z##)8^=(T+T&8Y1@MNJ^$^ zBJH2-4ppZm9Ipj0+I~!5$ryKcP&M?N(^T#osvqr%rlTgk*@D>zI|w}|fQdOGob(Tw zusVFZ!}W0;pZ{}G@5Lpods&LS!@^D$BHHOLsJ_GjAk{W@3-3@?3ITr*Wzx`rBen*L zhZitCX9k*3$F^vCD}r!x<K!(wsAM50*7r!H=<G&dQ-a~oJvKWTaEk3xw)bsHAQ|sf zh=}*eXsWl7F(p&Ch%-*V+QANPx|g;_hGUQ#r|)Z(6zqT@aP6;*71}#>H^!oHDt_?@ zDooPQyH)kzIggsFP`$qL(Od!=(zuw5Qy8pXq|!&r#d@0sc>k6h+quNl1b^++7@|En z1f2eGUGLlqJaIMGH5+bQ9(3V2hepx0U47%q{9}sD4idvYO>6s2j~i~Dj}f(u74{R{ z-}+;;OUezb4CeALJr(iIF2e&`W++yVYPKmk1OW@*J40QIWR)}9$yL>)!()N;VWRB! ziaXmmd)+i?ZyhCzLSap4;WLLggE>nxs4?H(F>UUONF0AVa7m@*nG0jP_B9RIITeB+ zYymmeSnLTlv(7ESdeGiOz9Bnczyv$>u>K0Y?o4C*Nwi?AZ1wHi>k!wfs0=H-Gz6e= z%Oo^>q_BkNBUZ1cDU@*X-qT#%KM`eC@>KXQz;UPMFciT$Y?e6M7RpG&csC7zSdEqo z2pe%9Y@VU7y^?mA2lJPM{(zr|h}hHU!a$Q`6@wK3gzay8Vu~NYhsCOfx)^4*@>u#Z zjij9YlZXV4>R-Rq+BUs`rG!=NQMl#n<Qz?g;T95|t|_-|)j!-HV3k;c;^>7$0Z%bb zcW};nQFHqEAisr1e&bu?a*l9INy{QkuJXz|!L~NT=_6VHf7JBA{~vpA8CO-mc>5~d z(%ndRcS$PU-5}i!(wzn=Atl{i(j_6VXcj2lAxJL-&Rp(iKf3pS@AKl`bMC9l8`j4U z5_8V=t1-rRu!cZ|Nu5#MNPRh+eddaqbaX$7P+0_)>i`WxVZQKbW{B(`Iu{Vr!Tb;5 zm#;++Nq=lup)YNgpaSK;e*7N}&itQ^;ry5H_Mi2_fBCz1Bb)vqQgm8;^;&Xl`QCYZ zvKsbey{i3KeW`biBQ-4z3lLwnUfAIsF4iNeh@8TqA%u0(&H^-a_fJ6h1ws$@1=<{b z=aF@k5Ey3C9zlhLtwS9~$%Z3!nb5%NBDqO%7h+}zUmNF^&P-lwDY@1Fe!BVVb);t@ zw2BF@O|Sb8SwWG%#$KM%i`8TtIe+U}Kar><)T3H+SPEwTu79MffTyvXnThFd*S=RI zS&rn|xbSyrJv}1wfOECRd%*H(>gkE+y%NAr?tjQB^7EwcmyGFM_F4>rl*VqN+zwTi zAjZ-jeX-L04|{RfHXH=`%X9D(rp!zYqPvkAv2C3jgnN!XSoW^~lyva0`M}#$<p!OD zOed=CI)s`1gFl~l{!Ad`;<DQP7}|@#x^}aZGZe?(8BJj9^O(KsXB~=|fX@l#kF&Fj z4vk?nWcH5pcT8!YKHVO-LyUiiZMgRhY>Js3z1CWWV!&g~hU2V$2WlqO>`ip%O4p4N z5zk0SE8)S)9<YF~YA7bvtsa7lJZ82$8%vjo&R5GL0ABl%70O-{s?|7DNrQ_<ZO$Yo zddvEI9ftMw<1bKyqR+*w&MD-edI+%O#3KU-#Ha*pC3_TesH(X~>L_x3X1ZhAJeL^V zzN~T;dqSmQUtdNnsz)^S9N?wbg-#D4aNtdf>BW{e;I)|%9%Q*_+Vvp!5D{b?8WCm~ z#wu-L8XI?S>WT{;vhIpjI)Bn)`C`EcgG*k=eT(?#FO%$rhlghbns*j_B69L5HZIN; zuza$xusl^<tO1S@L{9s0e7<*FsdpBTa{iUd$ubayTd`r!>N`WSU)hev`cj4EiUy0B z9^4m*HVWZCjmO|0+=M&EqL9rL;;2yWecaqkPOIDBQi-a8PG(bCE|I4<%1?pJX6{x( z0$a>I7Rvs2DyNq8!maEvEZUEabpZz=`Z)glLBZ%mruq_MS7l{aWmJd`fBjE=0VAN? zF&ZTrj)Qk0<XaNa{`WHJCAPb)pP(BEcavlwFX@p|2^)L(x8-PHk`g+S{NBB{VCq}< zb6;EFXqKTV9n;aZ@{3eDiAd~m5~K)DHaVtqt0pB+Iyo*D?k-)F^U=KSz9^RHgU5W6 z*Adm&Id8sjAZAw^Vu4W#$KE`ds7ZOCq3@UmjgdfVsnXO;TnQmus&e17aBxHOvqQ0( z*jtGeeB@qne;C**&M|sJ!^irFQKrne<?Dft1Xl;!?Hz$%^PsAnMN`FNvP#bq1|EAy zDzNkT!82#D^;n}lY-LtcM-c5E>A?N{d#si=m8XW@o)ZjhOiD;!&U-9uWDEp3cATVj z41-2|#0Ftz7BW;dH0Z!Uk3innA`T%RG<qB+Jz?+Bc+|^jJQqQX0#(iDPhC)8EALMD zTUH$!o<+Wa3n<t<B2>05_-Tg-&MZ?SZ?B3jxu?y#JbxKz{LS*kz)HNa+8W&{sW9(k z?EUbJu_y2N2hs9s;MoCHR+W^<|FcvFOyu<nA>!imA@aMdOk?FMiFsWg@;)+F7ZrHS z5ahW*V>AK#w@Zd7z{v({Y4UxIX7`87#toQSqeShv&KjPm+GJNcSQH?7)vQyx3b$x7 zgZub@YFrHV|5@YeTCB{Hb}q*$=zLQmfm#MeShHj6<NZ=-S|L?S`iS5ss<9)jaVe~m z3c)@zs#zl3s)=ELzBp3YFid$RDtR+(A*AYbGq|vLv<Tr=h8+YJp4)!8c`&4?8T&F# z?t+z<16aG<>QI#(-kr2$Op|{v(?wAw@a{Yv5}8WvR3Wj?5)jLuk2~xGx$~x*)`BO& z#+65e6M({XD2BA}NhBdZBWIRE24&aAIR6X<`p^AhyS?pfP<xPF6>k^_c7zt3<x)r~ z=d024??wi=i<+rgn~h%cVS2ticrGG$^i)lEF*Fb~#HF<E;^sgudGkqR>Qn1&Q7I1D zWuJacuw)mXr)%BU#N5gibh(T;ZawKG;2L(Yv1ru@3V~>Wm{3xLUPF6_cIBYWm82-s zz$x`(aeSG~+c1Pvf9=yx=iS-Iru^9m4GS-%nUU57y;`cCJJSB1tMe1S);&f6T#>?n z-cURzm4~_6@MI5~^aQ*qJWv-3G~~&^%p5jgKHT!~WnZ-z5op@U)HSsE2g|5FG^wM~ zB@u!d`Z%?W53McZ?eyV;1<sp|wO}GEPg?}F(TsCR5aufY`TebmP1-7j)FCspeK-;V z@tfgq;V1~44lRomYMjqdZ}4uEP|BnDPsH!AGAQwTWxS)R>bdC)A;8UTCovIBw&fNq zDiFr0;wF}0Cy;%?@RpM{Zo|g8p`Z|mak9#RCie#NZE&TYi?+R!J4yIr*R75~$Kodp zGM!#BXlzAqD$*t;nZ8QU04)|;V<MZ6(~Jy^@Z_nS<18X7&iOS6aiQy24{OGx`nh&; z2}kYb)QXWMn-uL$7h;?@YL_-|YutL^WQF0R2QhaJy?}Q)Z+tee7~ST@OFDZnl{iS( z?8V|vtM5-ThX7_~@e|h#5kKIc0&;1XJ51ajEtw5x4UHCtd>?G6%2{1c9{d_5&3p@m zhTbo5l1%OyX%2BG&*bvju8O~$3$r~%;?%XDtbOlGuKf*rqEYf(Kss{(Qi!e;P>eZ= z5t*^c09#sPxJ(~M=v*zAq$5_3#vo=0ALlSy<cBt1nh{d?N%5#kQ+O@;?!`C6jU$_e z=3J!)-%-$RBay25N{U#?K@s*8><gZ^v)OO)LVvGYcJ*7VU~w&1L(o*;Xb4nPe8gab zl3Af<A2yRtQUl9Dc)e}F|0Cn;D~Oiqhj+hi%0WDP;qYmb>b|U=HH{(uW({M(2ps%= z7+mtLqUtx_`Nxl7y^hh0p6Bsj%HQgo0%b-|2DE0<dZ={(Sqj+KnP6xG`sk4i%UJ+a znR?u4SEGx?FO4|!XWA!Z4x09%G5BZN=RX0SyY-3h6A1rG`$+Jx-g><YVf6ACgfH@0 zt|UPyN*{BbZ!%6AVl2JtJxCcPjBGn9X&}V>q0;kpE@6|?#ll^bX*1ZbKkBrqpZ~h= z40bnXCRBk1&r=@Blaaaqu59X=k3G{DTo`5r-50)NJh{&g7?2dt^O?<vL-4Z1<{nRE z#fNg{ek^0GeZBR}1tZLD|BcN<a)6)q_i6a8=!r!&`)VLvhxDa;_T6%^4u}6bp&w$= z#Y7v5aG6#fWl<vS?8V4)kJn={VC<nf?E*&dG5)ED8Z%Y+hJ_r4XKxbr`KF|GQ9m`7 zI2}ZPqv(lV_vA+v^!q+_v`jFa(GXuWOYeb$jQ3&sx}X3@yxv6#S6&N~5=TlM+Uqua z?h#@x8P0y91DT;(oOI(v=SQxd#kZXKRZ65^()l_NVTutro;rorh!L}MbBra}IJV|H za}yUlv7^a2VAjM`=;u#l)8mjeHV|)E8VZf|2r*Y%6pQ1#yP|xqy``M*Z3A;}DlMY$ za+OFCCm>lnb;A0Ov4?E)56KEIeD&&9YvjNZuxE>HZ*QNh$FUElmX<O$Dj_g012Hq7 z&9`#q)6&a_P#7@X%K0}JTdAMt+y6CAG`D@jAANB#nEFz5TGhhhHw+lK(Q7%ErrMRX zXBKt#l(to`Oa&{@fz0e*Di-TSbC5Rrv6a193+m;dAE_frx5rd1Hy~nh_1nq3nyGT6 zq5CtY@nJl?=jei^AHIn2g~I`25n+Gh@E%vg6LX_ibK;fsxVru8`4o>kS~m?LQe>_@ zbgm9t17#{Q0Aez$Xgtk2H7|jJAfNg^0<uTMQoh1pFtR6^Q-A<ZV)eMRT%xuuOGdHq zh`}r?T1iDcn5mIfr(yLy&hw~*i@osRd?8Y8A_VEu(!Au{M8y%i*v5F&5a0OX_F84O znEE#;YK8^cbJE&xCq)ow;*lS#xV>FE|BfTgv9s4*yP5e?CbNvP$I}7!!IA*s9R<@m zGEd{j#t_DpvitYSJ`U3GT<L&A?~|Ii!O&*i9E`2ZHb)>!sWM<g_>9?4drY2OJ`!(g z%Vb2CVKv5b5MmyIM^s$1uwO4<-`Is{U&l)SU`!@83i9J=@+e-GBeJ@AMfdyegP%LK zK7ua*MFXdmn_F9Jjq}ER191cw&U`ySs$a|9E(q8-Fik@D8#7&b%ev3yv$MHJ$rW!l zpOB~;;_-X`iXc6PMvxfy?hB|FM$k~VuI$5<^STW)B-^shfB?-8;eakB<U%5W@w{$L z5-?cb)Olv=Ckac`n#&x3q!kxe5kI@NU-fF&NTXu~y0KV4K($(W&_PD9i6<xO$bm2i z&-TFespNUXT+sv?))#zC{SbByx%Y;1h^MR!x;uqum8eu%PO6?IN~jEWhl92ONg_@7 zNSL8PeAA-um`u)L2W%o}jEvft-&7NSdsL9xZ<;{GPPL0z+zui{^&%e1?-UdT<!Dc7 z+8pw)hZa^@kVtchXqsPzG6n(g+4>WkGm+Jr0?m~s4CooC;N-WB7Y?wZ{?hvEl3Cb& zI4CskPd*QUk8r%>TMD1YAz<w!y$)acn@b1`<W5A*ngBFT8A?C^G9`amQ_Sb9j3CXK z^!3c2_b4nE9Y$87fi%+v&ov3_{{W|62SUNA1{wVE1=L89&uV)<Me9D<XAdeS7_7Oc zYv|F3Z@-5)^<kC!p^8tFobhL?V&>_F%SpeQ`KJ3#US9K?KBrn539bRZyKL|3CFI2c zgkvE9E&{=IL55w(pl$jkpDOh__?hcGUA5LjgCHs)u|Oe0rqb4huCw91DVy~3=g%_+ z-f`MX`9KKu_cJGV1S154R1fUey_p;xcPWGuJKL1dp3;xLe#sSW%ImksPm)BdBsx;a z!8>rbY@i<*n}uj;7;!L*@RlR>eAWYqO}ydMNoDdMY2ZEG6!m%qHRN9isM{(zz>d;Q z!#l)0-tKL&a5(ib2*9^(f?QDosXD!pA2*7>H=+$m%Uq99PJ56Q6cqFTOpTj9V(Vu{ z>diVF>0YzXrEGl0+7@Ag0Dkt}z!S}=R|N-8H02^f1%fVF#$&gBzLZTFq-)rt0mM=W z42Us9t?=6}dJli?qF_INQ~qmn05H0u%*N|9lxwQ_UxH5a2=mQpSW#d^(26=ny@0;y z2)e()J`eFQkR`JpeM#wRhE%LchmKlyxL400pGTwvS&dtmiau^oBV-m3oqJuCT2Ru= z+ao9tBIEhtW%8228;<tRv4JXtit7$sB{dSGPisQE8}y%377Mm`DSmEty7zgzYtsn` zRt=slO${;{#QjAh9C_C+5nv#5(9QRme|HUYts6q5+uKK&gOifN<*1Yus_jwYkA?&p zT(fh0QE_{E;jU&$A5NsR%sIt+0MBW43k^Sol{k!A(T?tL|K75KFx(X27(SO00!Fl7 z87OOL2C5ES`ORbGo12@KgQ|9@^38kQiKBS6q-J8$6;lY?=SRf2<YpgVvUmOzO|#hp z%~?P-I~%BvnE$5BT45t$s{vo(#=-%VN5r3%IcNWshI;c8yQQ`Wah&Ghqt<JU-)PNU z{X{9}c6FY1kzFx$q%brLBG3HBD@!|}8%M0clW-L)WBD|hp7xKlXZ(8Q8bB?LHgw(w z3(++&!l1!3#65sYX#@N@%gFX#Zt~}^)oA(q2f32d*cs&iye&U(EKwI&=1bnqaqC0v z&{tL8!jxOcf{IQqi|VmO9%*TFU{Sj&mt5Ysk2nTy1&txK%1<(4O>M`^9Sw%|@}^JX z>XWADY|PM~I}|b`Kg5rjRahV;Da3f|@eoq;=il|i*<U2QyEnfjv<Gwgydo_K6a7pl z_=k80s<itLN)hlRe|CeO5dfi2Gblj?8XcJtXH*#E;#K|Xy5RN&q0Cxz`eYPOL9nf? zflB(J0kPhWm4CZK%yDx1mtu6s8bC8b47|bBkn6`7@|r58I&YSBG2(_FxyPWhR=&3` z=qla(ceG^S9shv)(MLp$vJiCur}bLNOpPzG6q_vUsDx2I7HybaHlYAfv@+@(y)9OM zhKwolvM4|VbbO&5;Qwg!l+1B4?0L$Uo?vVP_N+#D*Bu~0weu*W0f|^K0iAZ{t+R~( z^pd7=Grncsak24C+NRs2p8nvQ-D&-r9<1{=1GQ|Iyql5|`zY>KWn~{uW(#yQ+LG@F zQc^PNM}(*@^2zRkI3^D{p6C{`Da_%OD`6iZV|gwzX!zAhKG$_9F{B}Dht?CWjAe1J z|19pm8MU<^nNt`uujwWx*s^3Pku3MerQyTtd_yxzn5nOM*RQ!4(sN1t@tYX0%lSEF zYx(l4e)lm~xQLgqiV-O_&6Y3BB!3Sy(!<cho1=I^l&Lq<Kq@c%?)K`yfa_OVdqm0Y z_bv)}czfrWk=1bF@1Hd8wyOg#m_Pj(VfNX{_O8S5%2gLYxK(4{@puC}3&2hO5RZ6w z8KhqkI_^tAY9$btzxgGbVr?|>N!L#f2`rz?r9A=;FK9oq@aGp<W0IwC)wborV56zB zGt2cm`)aFBt0PYXr#H3Bm(NFp*7n3n6@)2%5e|87ww#%G0og^OkW?N$#_zkQxsSiP z6%wck7Jq1?2y>Ds(}>VE*?AC=1LQPR3x9_ysm#AV127G1gRwi%Ba$zpFX0)*9?9TN z#!6!fY=w4+GuC#f&BW~9f~v5YNpzfCKWStIEhE1uJUSs2#y+56N{Tb4Th9p-?;@ow z0&LOmit<Z<m0a4c|9gmsY`%)HOioqo?2D1sNFc3~&htIuR8`o}2q5ATtI1ZAN;Pmz ze?=_(;&Q?FY_L{Zrhc}6WVjR#yNVsWZCm9pI^Tj$>cnntM2jmyiTO-gnN!UM>xh~^ zwrLO75y!g)V2yjkkkA{E6*N65aNN?@qsr?dAz3A^wSR98SBWtoC@UWIEO;1B>KV!I z1>u8X+~xO{yQv%v#(hYZ4Wr2ceJzVrEd<THY=^<=c<6n}{Ar_~(o$6QyDS9g9!#F; zUk+al%wwY*KF6a1e*73#fL2F}v60sGllG;xwd>v#Edsq^3VeLL5*6mT+03F}0#HQ` zO%yadmZw@5PN5Q5vkT{3{EBcDZjxzXh%rX=4C(sQZhf<v4R@N5c<@_B*4Ylyu^iHl zML=(O9`6%?giy5Vw6`$08lDglMZc=S-d+4sO;-REk*ds3_v&%D`4N2@;7u1)L=ys~ zinQ&UM4Djm&>ynn*HZ1~^!Vh60>CpAmHhTXjdMH-m>;GfxBMuCJB<^8qf*$7sa{Tx zbKlw$74zzmaF`R{TT|y#Cn<bvP_h5({O6?Z;}nJ@-8%Dx;XyA+VTaVK*+l}-STDum zCqDa2Y9(q9Qnq=TVsUS<3A9b29kQVn6x1RIY;d2%+0T?|F*7skHT5x0U`D#Vg=`8n zh4ffTnmtE;fx=pLxSoudtrXLPOd=#0sTY8fh`YuqkWH?*=ZIf<D?j;~@iornV^MC| zah6qS9aN#O>-X=j!WOU{`DazO={R;B+J}LQ!-?icFssSQ)qOk@<B=5fhiOYqNLVPW zclOPD>?*_7d;rdrZy5bjRX%Moj3M?HGVHHUz^%0@HbaO&gVL!G=>PZ*&^d4m=|4y( ze*n7v+MNGKmE;I`V%qYnp|TIi)9dn3?^k%s$rH#~{Sy-g8t?x9Bwh8#7zVujf1B0% zPv4Ed{ik_y3VwG<&>tyaz|DpA&#RyY^Lu1N+cT)n=tFl7K&}zMFfbSoOsOh>zJ0Ya zFf;a~EUs(=4qi&%>b{#q1L#b(r6y%w>pnVoW9Gc;XSt;oXl6$wv8A#THUvyc(8FT$ zGo@rl!TfUf|8j|46f9N$_XxES#bbBi(0x5A=jYQ8e*26fXJg!UjEv8Tw4dgagpyug z^=7^#qPXb(x*_4&*?Hi(HS}Yh8oxk+@}u+0C#fg}EkG+_V33OF{2=W1Ml8UHj>Rde zGf0ySoQn~#VZSAE1P}27D`R*!j1R5ZDW|2;fazsH8kK*h(Wt@UP%#CVDe@~S&;Y%r zME?O0q-xsQVu7p=$!pO|LMZ(qUJ^y8%CM(1;8s;n54n6c7Kn5;9{t!FwR_toCC%R= zFa0y8Gx{}P%BM}a*!|%%spsB7FC!3h-^AA-lU5qs8E{r4r(&Ttz$=ZJp1o{17r`1s zNt#$Lr5DrI=xDB&a7(TCGjM&QXeqY}MLVpMO?QN(8#BUw_>p}|wx{wRcV4g_2%TY& z3IKqS=&da)k%ymWKBof&r@g4`t6OO%g8&&WJPh$kS$CL+Wn{z<MUbJDset=7T2XPa zmfj7Cn;FV>xy4^0Eh_-;sI3M*>~(#O(>TxKFNwrm<u@~b5cegrNUWMK*STi3Mk*_= zY2%B%8IofH--5$M&6V>IDctmK^U!Rbz3fa`!|$xsVzZ=C3Lcjj6*gK~H-hd6s2lXd zo{nLkEMnHCW6v4;_pX<^P3;hxFH8Sr&$*a483KOKil$*e9$MY%jX-6(rZftEW^DW+ z<3KI-^ybyC^zK>|#s13FEc2hBHZK6w_I2iOP}>EnqMo2=aML{_+!kUIo*ePa%eF|q zc?8cA^*tQwlZ1qxVi|_qEG(4yv5}u5FdRL8ABoUteoNNCSha8pz%LYfp=q|Fm-6@+ zQM2Oc2w^Ci(bjyKW?b)G?tl9Jk|DK6vf)V&cKb`%KYq)v`o+s~AVKJX(v$7aO8vpy zMNIrc%V4n$wvX9vMn9GH!f?WdE>^HduU+}|=QE{ObR)rD1R@3YR-0MJ8%@{&Q5Qfa zN~9`<2yaKT48X%>OX$RrXoN%)CwEqbFxG46s@pz7`y3}8u}>afCiGpht@NVYU$&9Y zRrs9Mc2lQdcB^OiT0fJ*yLnxeP1yTfBq{A;oLN$=j7${yPVd7`$xvfp&Um4sBPL!p z;HnE>#G&VC|ENS|Ry$WMyd@FX2rC*k#7S<#zCl*PvnOm>v*iW?Si&M*ZFp?2zlryA z1-`;OBD!t%`7qN&e^?C}&c#7LfIp75ei7ylm@hY$lvvi!N_H)*AWn>Rtj%1ZdR;bD z_IQVx@u<VqB~tdUh4)&EXXRAR@@A|*`CTUF7t4yA2_aqtieji(CoD8;igaD<<X*L0 zle|5aOt&&JE>w5@wr@D(9A0Yv*Juy@<U|e-2hBu5xp0E)ZD^L!?}+d%wc+23nps)N z1Qa;}u0R(#)Mbsw(whcte-YFA3ZR<I-rgGXKY?lblM+y1n*Q<&(!V5`yh#V$Ot}?9 z7=tv_?7hJH28@8PI~!s1hyhEeA_G*0W3)Lzb4OY)9l!nyGHu)*GrbOLV;gK%j>hZa z-)35`Z^~uk$aed>wLkJ$(i)r_RUzGrBzK#<uVY|Z5ps5o)V9y86@)Kd^pN<NE)K70 z?s7SMr)|zTY~dV3L4y$I;T-bQP8elWHOH%F`JdsPx=EH1*=mJXjZPNU2Fliq64`yM zBTJ@@=?!(}^*x5sG>&^8o^V~ui>QDTOYXw%WmwoCSV%E}>bmg$54pq@DpcS~IT4LR ztq6{|v#D{{BN3(4+i7v(de&l=KJG1?d5vhPJ&F&{%Rt{2VGOKd{Ei0_X*=Ius4Xre z^pF$zycvU2NWe+#i{P-OM^H#XPaJ3C(f<N&?L{m9@_~m;KGoBAmUz;f8OxgWv+axh zj2Z1e-tORqe?z3v!ci@|4v{T%`11pC+1WsVl6ZY+Egon6!586|<nrprb6u9y<O)>& z`v2OnDv$o6(QI-yKCAOu2ntPOLu?t@pF-<M<;}}itqNbwB$R#e3I^qGYMN4}Tvty7 z(M2Y{ChtsX$6RuLM>+f!S0|+aqKY-FL+#BK$!hu}qW*k6wsx4GTKU_V`Zimmr0(Pk zqJuKkiop-Cx*yat-Fh{RW3Z)=;=YOTEH>~tyG__=5T%z-&SVtqAs5}6y}o3uZD|;9 zK`w+!A#nkKqB0$Wa3^wb;ArE9VQzk38Q$4!1l;Z2bBy4X9jynn*JBoHm3a9qO5vfk z<1vXe5lr3P;<efjKiV9WoW`t5@*PG8(wRW&CNNT;qtslh%j<sJ<PwWs+^DYZN|oCM zQ@%7r2YknoO-=X<B$=z)5o0BQWFR%gU6Wrxlv1`Z26kug`|zW6iZ@)(aUO0lH4f#8 z{e+4;KxR4QI;Hj*<qvb!DK8mnu>c@$1v(#F>!=+0B71+h5#kSlj91{QUr7_ky0(l^ zD=$S9K_th9m2K;CMcBSdHF^48JoB3jr>g^&Tfa{(ut2f^AT0veq?JF40DR*rR?nm9 zVR1LzfJqiQ)qg~heKRfj>2#39t_`vE4jP;uRYq3lAlzCS`*C!ikSfyOrIF>>Ds49Q z#Jl@g2%hyehz5e_Ut@L|lthFW8>{*>6?XgLM{^EP8A8m8+vTX>2TM>=!X7451-HZL zrSA9wOYgjQ5geBU?3X_DPijh360^+p<L><(=usdQ7Hgr5-#Vd-3`#>>CC-+j#FbPf z^>;BfelVv&NPj}A>Zz{j@n|3Z<_kx3n@H}g73lE|{*71CKUEXUvKw>+Y^CiMdxPp> zZm#^?A~H7rR=-=p^)vHnt#(ELL|`z<=b~?z_j1cpoGw5=lOPp5^+_}kJ*HDngW7-} zI08a#8{Ec$anpXOva0+25ukP~S>QNgW`BDemreni;5Zz3=QWyF!{VC}1+(A?{vNR{ zvMbP}{qRD)dm;k>2qBM~O)iG4?RK!`JgJAA<>ivv->3jkNH(=A9hZH=HhLU83i@`r zhG3*Hyji6f(ZcmWJgv~r1_}b%*YpaQ6DfsTJUv>AX$CYOa(?Ld3u-wEO!V;}w6$~c zv?lAmHam4V5=Cd_VWzl(5~?0&5fk=?3XnLSnEd=2J!baNU)@0u)J$X+e`oZ$lMTlK z@?HK@(k@v>usEUQXK~nx+_BSIB0aI3KXT<>Zw$C3%mC`E&u(6n%hm|q^<7{}sL+S8 zB1!_mqrUZZYG9QD(CgVZ#@=)9=eWDOU(Z$t7KV}@x9*U4%zQcW@TPI#yOBMTRRF38 zel=Smt6cVd6D+e5=J-c)XAsLCc8o5GI7>YT=s>hk0NlNfE@PGhZxI@w>%>KJIX;>Y zKN>!vtEEUXf|ZZv#!T%4lk{*9V^Ju$mefh0`}F?L3dDH|Nka>+KFjFY*y|FbCE0(g zKy-zzJ1~ewRpd-wn0ung8Ev05ZDm8z-*#OQG%^-GlGx&YmS|S8frK(JA^j6)*FDjZ zL!g~E@4cDFP`++{FJW9_g#k*<d+D2{!s8mP^7?MvNNfa;=IOa5N}&!|7=@F;PQ$?k zL!M`OxJ}`5Vd#Y*7KSAHrpY4Uom>o0oh{!sZ!r;dy;@O6j9c!{9DH-?p^}+oFG)DS z3yvLc&qe=EQju`dvZSU{+nPlK{3m{47Zk3+qLVkGxA!Eek98n^#BW<&NfpZax@Uq* z-lA3Iv&}mk0k`vHle2-eQqDrb`^A!V^48h=-xIM7ed`tsZoDkb3k8L@X=zdO#{TF8 z?8Y-)&o2Nw)GBll_l63%u`b8Uf+?a@;^N|4{%yn{ek*r}#W2PT{C2>*{Kek6cAi|e zmh?^RHOH3TTvK86XT}HqO2Z%vLEQAwz16D(%fIytTlX2~%xiZXITZL;=`P;+rCSTz zu;P5IcPZfo*<jPDI!{A-`~sj=<bj3j;?l9UkPn(3;NVYn`7oL!W@9l<3lvN;ceY7X z&j&BaRXQjG)w|)C%KQ?dKmf#=*K4Dp6ZuB=ZqXuqb}e!#yG?V`K48F9@sM#8mJMxu z@4e}Z#N0w}xNoOwK8D#gCF7(XZya0U*31-3e91>9Rnr)49FziG(TVkiL1`|IN|0po zJsE1oJu*y`>S=}Qe6~N{2D^~fLKs}&To<6rRfXbM@`dxSyu#tqcvkmX{9cz8R7yVe zRubhMsZ0Ca<<czVO9g;hF|PK;i6g=Il^O7ej{<Wptc1D=cCzm%G&h@33OY(E!u6;! z@R5>Y9rSp98^>dfTq~t*?CR0S%Y^M%i@ucgg$8VdsWK>Wr5W(ou&^i^LxvN=rMD{a za6DTjYdyKG`=5Mv%5A866806cbpD?pYwsgCrU`-qFKimTR~Lr+OVO){)SBP3Iq!hY zN&1Vtk-GWc^GJw_$Ix~-rzZ1O!V`b>P^?K#&VBktJ)QIW1B|i<nT%91$+!11tRx|5 zKDFeL9rkb=VMhYVP0#9B({?u(L_*g;jXGX_+~Zv*e3BR7LP`TmR<ndrAhHHVX|{b4 z=CIFYR~{r+rT(uHYWC*e5t$LfEXsiEwJ1A3#MWxVshB5*3&=#c)MkR;y)AJ@?HoAd z0BT#^b;$l3XOFv({SsBoorw<vdbL?AV<l4y;d}vbC~Dd!ltMDxWi!kjQ1Y5^)b-#$ z$!m=UcFUF+rxnuwj~dT}5wRl-6ASUBmkgKL{pM~CMv|R7%n+|EriHsh`|gHAlsigd zUk<P{O0mTBzR-Q*#X;4jSoxG|d-N$rDR6-*7u+YGI7_{nl+7q)z56Jzc9TT7>lD@j zibRM)-Ee<=kr~-bV`Ho2jRi~(17m(Jerm}K6%rbeU+uHW1oFRp4bcb_b$M!NLGjYf zcVau2Ev53Ftd;41jM3D;#%Q2?5djbA@G9FQ;sUJJToP*?SKl-=1U}d89WFJi+-V#) z<G|ql$2<!*LYaY3BtL1%_&DHfuy?M&*XGG>D1GLyAq<rsaI*iF9{vEad2IX*V)N8+ z7FZE^0XqDVdn-=`lu}sE036sPe(jf!li=q*3h~bgtd)$>wS2@y-_p-SOrztho~wG| z?4f@Dj!ED}<1EQ2_#A^IE_2%q$eh^K%!h`SZDtnYCW;A<Oy4;)ZPoFLMp@nY6e<y& zVLIsh_+m>LdHHNNymeBLOo8mk)-gB7Q&p=h*WxG75*#e8YZbisk_HQ>e3Adq&y%{5 zvtf`8v7!;I8m;7-Yp^)E7LY~sSM`?qrtrr$oxkW8h#U<V9s$9zyt*^?Y-ggHBn$Hb z8eV2W0TS|>iv;<W9HEO2gHU|z)k+YBbJtzdJ^DYHY)yvszldx<-3HVXtIDt&zlb08 zROpW;_*RRlbe57{UP?hS_hplL&&_HIuwTAcd*)~$C&?^CJZi>CWXe|Sc#OW2DH+I` z^&yZ)UrFL=FrzoBP-OMA2kPD!+W`><ifc(dU8)sj*IZ1<9Fw%kw-u51jQOznad8Jm z{kAG>{@^**C%$Xbh@P*{+d%r+)lG6xEA7|CSSiSkeN__*Qz<fFl`itdF=n-QUMJ8e zIp-tpn|bG@lQJVPj}U)W4iW?Eg<Q+yme>*ied_@3Q$3gbNboy|*g3BzWi61;7kCQp z-jWXMl+g&z023$UKSfkSTK_P`)$=G1F9)&%JjPZoZfIPCqlVhFeyVjy=bM}y_^}pt z<<G>Ji2YWHY^8jalZGq}(po7$SR~Tep&)CR(H^q4ivQu<1}Qf}EyvqIcjB<`AODdt zDFZSl(!-RIQRIF|fZ!91@}k9K?;VPK3*eLmw)&c>5fKsajoEc-C{d)3H21n;p`rcn zk?um9p-?X<kL=1+;$P7dnoW$Bjthn!>On_G`RCZjE`7{$98%o7_E0grUPM-Df>Ma- zV$A{Xjp?NNz#sa7&-ToQRrbj_MIt&3Lb0DqgSY;JM}3*(gbku5cIcauD`Wb|W_qni zOvm<LxRZ`K0TPb<s)?}FU3t4#OH|RVty;;W4oJ@(b-r@PR@rz($YTaR#4@Fs5N3Oe zM>Fc6`q3v<H7`b-hBt!>hTcUPlMtD_-w*2us=RyR={Ko`$4|<PVmq+u!DJ_+M_er@ zr@oK<9@)HxMr?svUsl}fMUYsyvI@Z*M%q2;K#yvUOHF07q~i($*zzl4@u~<olhdW7 z*O#=ztt#sJwpo+3+Juz-co_{6gHUXk-q{7)^p0oeontF-XyFxeD=>XVg|k7`(B9Ti zis@177vE^{!&y7dzgVH&JG{})#2(dG#aBp(qp2cDyN-Fs1>ippuD75Mzb*-#lSErY zxloC@P^W@eRmTp#JrBfdFT#9Am2`dkUNa5i&cibuB^zL|e_AmAR+A5aOGY5H3?Att zklS`x`=)O4U_#%V>VGt4G;l9tYlv7%A<#mD#Q@h7T9p7@Xo_5~hCzE4P62wwda?K& zfFZ9M`3Efy!m;nrAq#K<2rb+dqA{jrUKMk}(Hkak(6ukEemJprj~@-;l0tf%LlAJu zhvvAgzJtiYRj4FKg@{Qn=X|*eXZxEN*Te~xBV6;F2|f^s&nQ63j;N6!#jAS`lJn{i z!F}r?k&|&2YRp(lbB=-<Ao@xh!9j!ckY#gKQ~>mvyrWY2*(oCH0cu7)T}l{iVTTJ- zOryBE0|T*>{*ion8n-A04rle^zTe9GH-!LZX13s>O(dHrl$ndL{d2fpgq)IdG1 z4}$xc#ESPlS<XC{5diG{mTQfuOZY6!9oPMFWx}Q)V5V2}6#`8O6SePXSQ@Yytl5&< z*A_UxLI?ys0@FMzm-=TwCWR-rGt?@_p}POh>TNW`My5*vz;4W<1QNmZRudmTM9|DS z1R+8!5r~eqL5X;v4*_gZWJwS-8o?wjqwQWogpN2cH#N{}gF|D-{Kt0E(Lv7oS652g zB1ahXjV;6Z>l5(mhzICi`D4_DzWl#&%Kk4u;{OJQ?O%St|CK+1h)7LUKXU!m9nBw? z77NQN0SL7a39erHtzEPY=wk>juk#OlZ*zx~C%ePvm&$T@R8YXukb7wF{_d57?gAK? zp@`Q1J;f~pKm@PO0}anm5~f3o$VoS>A0u$~3lN&@Bq_}Wj}<BOR$c5@tP^o+^D6pt zs|{4&oIQ%Lc@(cZXk^2;pShuRWvUq{4i2*m_?Hk5=nGW2U-sR}20Xca1+T@*=EQ-< zgo>)F_2c&MgBGtvBLNDHfa4n&tRu94<R=WcLvb`D9eH`8ri~pv4G1er>Iilze(z_1 zS6<L5`>$993p@M9zvU{p#2~vgq#{0;H#adjV<w%i^p4Jc#e0j2ifZcWLV>kA;hKvs zyNtm<8E95}#$?6WB@K%a8|3tMIL@t(I4B5MoGAsJyqP@@9CZG#dtcV~%q>LJS_Qa| z!&52aM9fy|A*lb07WS3&Ut<*I!7$HXDk33-wYaQ>X53Q=N|@2yULI-0p{YXy4Cj>% zyoD}2q>%#-G8W$-WzF05XH*pkEjVhYvufFpe3A`eR5;U(eH0OO`1uA6U9dj%=H`(p zK(+w;lK<<~h=eX+>YsiB_8?GrY^RkH&uvJLscHyHrYq2PP+ozmPKg-}FFL8sx~eNj zFB?DwdW5gph~7JE7`gmpf*7EO&2QgaHPB4^pUXxWELkr{oLlq*%M}4mAHxUM+IR}@ zf=0jWZWIe5yCtKO_^OmszadU1W{|h;Yb@UJ4gL3OuF8dw?MyJTM`H^oUUW&%wLMNc zR|N9n(3q9Yf~6l!lrUKPbQDS%B%7m!Ja-f}{Gb*;ltLjchGZ?Zec!>wg({9#qrJ#| z36hq@o#Dx?cLt8Cac<{Jh9WM(GZ-3QxtTgCq|0kHmvQ`7u;;hlWsmBHjZ5BiEbs|M zk7w{$6CX@~EMlyF3Ls>on_}a(%_hfo5f$u{pM2~BNCJO<FjN8;tLB4^>a(ZVY9VNu zSYJN40CIHWf23duTarP$wyy(v)F1nU=XX*2y;yB1ft-77vYs#+g9}FfigCoVddUld z8-E0MWCtTQkD}WzQ$pwHmjy@Bc=$=bDm)$|oVrR`Roaws*&om`+YvvpJ>YLoN!oSv zG!E-d=A|Fn#!9|BkUuL*#L=5wdSSv>jf-)G1X+TD2V+tb?;{VHBTDLoCqI6FZw~Cp za~5h(R3pVQ{!x$tgi7>0N*djHyDe+i<qgD_6Ft;eZ}Qo_^FVgmJG4Rs6;UK0@KS7F z1fAornv8cawDG(ygAjMjd!XS60*gd6#!yjL5LAOmT2N>p2dnQuyMBz-?|$fFG$@?; z_jQYoezy!b@40Y7(RkiG%X^b?X+|@=h{H!R<H9X4v)6NdeNBf?kZ}P$>Y1xpwRC3A zDi8}d4K6H053AZ<?tClycU#6b?{yuWChkZI)MYOpqas1YR6Z6B2k7^8d7Yi)7wBwb zB`XcNWqHa+jYYUeMgXDw6uw8$M~K8U$!gQwKG>qS`lt!0%fQ#nGf4ROVOHrN1Foq5 z{e`K%W^0drSfUcz{S)t9$3lE|{EMRlZfGhBf=v{F9TJrPM5$@ld0}$Z#q5=n-ua~> z(9rVcDwqgQDHHjlZjV7HGTNoUr0MkS$6pN;wA`A}{-qxW6K6hR(IuxDU}m}Il^TEV zyTL1|g^AlZDsj%1kT`zHD4X)LSp8Qm#wW#JwHP+G_EH9MWC_5jFx-IGFIRmN?_~Jy zAl4M@E5Nlr=FRuV*iPF9nAR`9uT;bQs;Q``aBy;=$`F-QMn47Iq`L;*2w^})0l<p* z_f`s<#RrmEl0}l25ByMi5|WI$psDuvx|c2hJ;@DM>%NKAYO*Q66Aix=J8Nj+c_X8Y zB?#5po?ThC{RPyeZpT1?5Qk@Fr=(*qmjdZ|MCaGuU%L^8+N+B(6h&@XBl2i|mlP%s zDRg}y4E78{K*HJmYBjhlDL)^U!<o(?%o5YnSE770A9mXl%%o#!8cUY#8p25KeGnPK zNaw!XSUJCmoVxb@oQfJ&lTUb}PaAImq{=9FLUZCT401d4c*gO}NAEnXDlmR8XBz5p z02QJEq!IqC9kaj7AaY*<We{@P(%C3<G@8pw&^`zVy^LT7#RwpZ#N6k>t7(~4R<xK{ zG@C?_%`%-(N0(ZBO^+8}1x)A%L)^OMpa$hzt9h^a7IA9>r|F6Or+TTQRcwn0wpLol zPyM3kR-edX{+Q_IZaK~-qaXc~un(4W8vezMSkH?h?@eLW0UX~KGrI>#(~<y|@nQnl zCvE`T(3!49BB;mvWxb=hZQmPcVT_^B+Hl~4uw0`9;`WOM-({OG0_Kjvi%+L_5B@&v zEcpcg+v9Dk!FXLPnyzI({4@QKSmIe$NDZmBRBJFO`dT+uDg|DD-}!-MGu^ofKeFA_ zxnc;^^jOiEFC=srEs08-dA&ePsUP9r4m%eP!*Nl8+YyPq1PNh8aCLNRLpuu7CCIr@ zAwhnfV9Ljk`GAzsyvF+gQ2AI1Dc8fiDVJn(2D%xE<kh03GBbCmI)<%SQJ*1%ls?Xq z-&MgH^F^$w2zsHdt${X626INJ;vJS{IQ3d5dY!oO9n(@%yX>7HQ@fjiKYrzKone#b zFrPfllG~5(vwxjU@+&)BrcTuTdBEoN&VWs#$A%~W-y0q-hR2}hNv4h7m!qnD+SuyW zJBl8OL4<&nI_+84B}eR5ux5W0qe>AK7^#V?@7c{AI9G##BkkJj7NZWR&A7?#Tqz2d zzS}Qfvc@NO{D4U6mAt>?RxDuhT@478P0rO}lg|~=aHjF*I`v7Q(4b(<0+qM0X-nwd z4y99Ep_Z5^^jGd`4+l@*4ig+f=|N9P>Dx3ZO?Y!34_;vWVXg&2&7TaIB!KOz$o=&O zfN}>;#C^`b@YmYUv)wI?S<Z#SB4U&Tbpo@qFq?m<=2vc%>iPDV0raSUJSl@xM}&vY zlC7jGPsY0)o%<x*z@h0#p?Rtfroz;7VSdlT&Y?Y0>bFD1lg<L>TFzK<fEE7}PCoK8 z$#8Qla;#IeOtAUCH!%oQes6v|)ds*YC?xYFNxeXE<Eh7uwmk1-`WqwGtCWn(?`^q% zd5f8#-eMjKevAMiYz;w&gD+>Q`ca)57KHmwJr7+S{!w;M+s_d1k8GQ_seC`#klXoV zlK1%)Ug%#}n7sy(vu8^LV<$(4BdbzlGuqI;iGGCrwgmRA1a&B#WQ>p+;v0_~QRc&l z#jc*q*lc)zg9WFHF{E4Fj3_YoS=W{JUQEAK^l{{UVB%=<3s0>wgR4}?*ms?)wy0aP z?|YIezO`9?mNDF%dS!`f9l9#yWu3G3SMgx?=k{CUe(X%PwT9)M!}gOB<y-nQ=0@1R zM^z(QcBRl~o^HMO_xGhqI3K5Wk#hnriNtO;aRLrz)md;Ui`xWzef2T6<ttOmb;wG_ zi*;T<(M;QP_xZVtMIN(tYMcMU^=QvS5Vxc6D<km$T-H~vx(qqLqXzfroWqk+uObAE zjiF)3K~!XlgV@iafff6kz{dSEna<v9Y(5)>z30uY>+yp9EV(S&vT^@UOZKsKn?+6B zZ`~kUp8YL%tsSp933D@|7)Q0;&pZ@6Iy2RREZKxJbNWqq{?VeRu5+EP0_Tp6LTgV_ zv3;ii-wI*%bL{7)DoeGjBRi?jdo|p%3KUk;eGT>7y(U^joAr+?uJYgEk2Zpz_@EQp zG#V=CS1A0}cJrAx3*}XzPo|bzZ*%7b>*3MSno1A^M>#V~Rn)IHiC#ss=8g%Re${*A zm1B-<uE$Q(s9)6^omZ->l<UXU^2$87jTbV#7uq-hyW~T0$R$qI9CjVh*vdMk$6DVz zxhH^K!H4mMn&(xU>xm<dS-&<;3(1AWYX90jI}QmQHRl+bf!Uj3s&cC9o#Ty<uadod zTFx<v0y17Fkwe7e5{_V5-`LgldHz^N8xq!irv7qDm(<1kV9Bn<w0@*Z#$hN-SAV6t zvK^yuAS-hq^3(#slhW@!VU&}_sS`|jTs@)VLj~s_+cTZH6cyDs!^nJ@O0@L9{J}r3 zPoa;(J_yG$6sGYlC=X_~#~{@jzvNr2BPERvOGmobWr^ea1j42negDI!)1OE1G}u2i zBj!ewC%E|Z>Y`otvB&`p^ogK7IhP6o{G`X*<OFng2|0yb9zwF1v0p64oM2-0KISJO zv3*~C|E0<mQ;Nw*bNZD4Sn$n2hk!a*My}fXaXood;8)(kajNTH4S}O>^s5cw&pl{S zXDycauq>DAx7hL7gg@kJ+tx!zOl;EppF0eHBA0ryyv89CKnA`9Dwjh*OVQzA5f*q5 zs>1TntG=2HbPm1SwQS2J`rr3ksFFE5mr_m?y4U#S-ho^k)GQrcHwWGF|NOZlE?)P! zb>?99^@kI{jI{rK@@8>0ZcOx6qLDlofu-j2f-`4==AlH#ET1r{?xH4^k#3|lrpnVd z^8K9Ok0M%IqNE*eH{l{MEWT)*@T2LNAw^J)u_3HBM01Z8*AoA*IPUiq0apfZHS+wZ z=>>CKiibqE85a(~AB~$n3#zg6cR+!)^B>0F?nCC~g+;?Z_us)%Nxf8|?!*mmZ^rS= zyW4IuU-%qdpkKNE`9k|dwb2X|>zo4Cff>HW4y__jkM-SDaWJ($#e5sVYq@C+&`Glm zB<o%|fnBZXqRfJ>W~}8rhTof(v`LaU)g1k?Db1c!;2e-De^EgH3UFgxpHHhy@ce+u zwj^La#jR_#CM#j1?Cda6#$+g>Fl{~3!-B7vfWtHzwQ-LpL0b><wVZw)-tm|vdt1}$ zoz#oW#AgU+^E&(u7YdGK%)>lxi@5nok}M`;BINY#6ho=RN4Z$AP9+CgdLw1cB=$J+ z$zN&V28%Hjj;PAH;9lGkyqzej#W(7WZQ5ZZrEL1(^zJh?*oEO~qQ=+G{$|GQH_rz! zf3QhRnAl|Y4w5PQ^~pPoSZL>D+I(0Pb)cg@QDV0h#xe4BWud!zlU6>!LcS~<F!4uf z$#2o<V1FMXYXW^R@^=nF1#-Wfl^us|ZEfe!idyKumxs{&4+4IKMd%+#v%khwBLTYq z|I2>QFj!cBT@Vmw{BDEb<k!5eKb@U+SU9-R89%5p6sh0G$2Ri)kQuO!ok(c9(1>CC zO!-pBN?blv>C$S3(MgY4w~hOCL<(UM<owGY1DG_c4<k12Ulj14=f&a!UH1oFWxqPF zzWE)n8n$~WtsF4uDIe2ZrC0^tpXF>=i{BC*dI@*l9XW3R)uo`Tr}+fKtA}N&aMY>o zd4pJ5Cg(7r#{pvD1mCG$`NJgxa2m&V344y@(aMpJ^lcSjyb1bFo_O|_e3zr&>)+MH zt(}!dJ^BhS_gd1VIX4OU&!Phl3>`5^XmL$M-&*&Rplhkd`vC%z)xGIrrk+)bhf|8v z``hpQis~(acWq2GSDeHN*MMQ*bkRDe^y*vSt>eY}mD_Ju=^rJ|L%D@T2to7ghB>eu z+T3W7BoG9<1T5HQf?6($?wYSK8jNC9gr-fGy?9x@Eu9g{QwhL6QP+<7N3ymHd&;!- z*^*ECjP@V8ZM44Y77nh{w@;<mXc!n6Cvhe}VJHHxsRD0CP1c*c?pQk^`^>Md+E--c zhCnfmTbDp14C0~#J_!lQ0vN1rwPpSDD(Ip4h2opr&mR%(5?pOiYTL0C1+GcYM|=6O zdcNu+(M;H|-M(Ur$}c5w3M%f5V1vzMkKZ$6wiM_{SD+zkMb8<6PaB1Q{hg1x7I9%z zbk?f~Rl6Iqj97MTWHB90@vo<J`YyolYiZsK^@Kj$c0KgXn*>!h4P)WBwUR=YEW8O) z0imI<OcHA-1At`QmK$vlaJ%15?3{w_tJeTu=6v(i;==0La_E4=(84mzvk4}1r3nzj zCpO_Re0rF;2?kE9AjDglZlP6pxuUM8LIEf3ehr)99dJcrNakh%1c>lQN4-64a~o$! z(MJm4KZX#%qWrYV)6=t~!5#NABXL`M`zcVdZ0_ydoE1%(gzvyd0(}-!mMP`bO1w4( z(Rl~LdQ7{kgYN88DkNArgg7_}degr?HQsz{oGoSJi|9vMrxc$aT@h_T7<@?l>YK35 z`J);Tfz0w(Slnq{vM1(x0mu~j&-wjoqQdQo8C5XvL1MaJz#Mx6%j9!uFKbRtR6E3; zWvxU{#Bo}C&ra^k;Km_<y!!WzVX7qRG0U-}@?_w$U#ju03rF;OgJ)OT#-MYvVy`V0 zp6VENBVqsY9o>aDMp%7$`Y}IM7m@7Ps$4F?LSmvBq_Z<@HI9yo{l>UAf+j7`0<&{z zgYdBNS=TbdcKt#SVc&AElxEPz)J~S{mTqBF%0L(+`?mMYQbJ7A`(#9csX$?l-JIU* z;ErWFtJ@Llt5XiX`4%ILadXc$3c8LXPc#VD4~$-?w*jh6duZepiW|ybc!~NC_j#l} z`AV2Gul>%}e{P++%g5LYHwSi-AEw8e-KWaDA_9H?2~0VAF#$BB`8g0njPu={r^9F9 zw&q~@pSyR3Gukt)1Bh!m7iJ|x71&QV0~p)0r7fL^ggxOK4?YaN^g%m|0+OhryUqJU zEZc8<YeM&guk67uBCbEsi1`d<ZMCJ%v!yNec0?epUm%vx<vPX=#vI;D^>5>=b{-bm zS9XbL2jZ;N5{b;1yhvDT^y=iE6(&DDtm-+l#JO`*)_n7Pd5E0lnlotJ%jElinPb*Q zUgx@yzK^EFi<9B~Dix!sdHwTjVzw=7P?C;1`Ew~5bWGs&3tip;5IK`8dECs0rh)=7 zHcWBUiZ!plm{IYBUM3c*cDvb`yy`UF3u|7pIL|h3$B$t?cBTn@I&LXpZG&}YT#N!Y zdPyxlVR{^5FBDoTn`28N<Ks#mV%DCTMLAmH=I7S?oHQ_gbQ5maa%gfPxG8Xv?AuV5 zc=)V`v1Ts(csDgQ4u;{TE(&y2Hhjq|;@Y;c@G5$+XzjSU*KmxwzB#Hx5d*M~d(HEh zt5G;Ws?<+Q1084copG6#nBo?+(gyQJ?74bv)JQUj4`;j>$jLR|;lxX&#}05D?a#i$ zIiE;#oVBct^CFURuq(N_(HG*}kE7;0Qh)4rao7JcY%z9CB8e|RTFWgIZK{b%Q1Wts zsy(pt_Q^zgmT8~#(;`SIO8kMRx)6J@H+k)6=`W4tFZVylC>naFp~aWi*)g+pSfr!g z_Ve5K2PftsnV%W63g&5!n?`yH1l!oCE>%XRzT%-E)b`97jlOJ5ljL&_Ufd7&4#cXL zN~q3qWe9I)_FGE6!txZUCG5XyXkYCz^894}IAZE{UtzDTDJAWhWV@VpspI^`cfK<b z;1O8u`B*NeaF2OaYf!N9FM3e+VWE;LF#HR3o@IY8@f3s!&6>*tQ#@SDHGZ|^S{o9- zug&-&c|5(i7(?-M6_H7eDrtDtIp{Xic-@U8J(lXNe3p5P>9b$^kaf(fou5dRMQ@`X z<6A$9dyCxQdH!%sY$-y@(Z>m<G~FeX%h9R=1{nh<j?gf?J7w-zU@f-6)&f*yiDEgF zO*C}x5o!5rEx7pmVRvwKQ8p(mBqOrv$+EFMd1X)J*t|hHhk%xYZ;~q)HF5C%X_4k) zteF&Wpa?W=#DrW)hCg#ENxwCQX&(BNjs}OB{`1j?(x;dGGMwivoJM#(CK&tk+HAw3 zjuwG9Z>O5dXj>{e&_((~h|>qc6P+6KN~d;7q81w<%&^PkAZw>mH3lwS)YoZCX`|c` z3tq~HG>|D)iX!5HAzBS_y04-fpFx7sx0)*|O}2UsW|>tM9^EF&$_r9lGgb7TvupOz zsoHa9w3SPp?er-UXrqo6a7FyGTZ}f4;>750lZKBYSLOxA9QTf*22_pa!b(4Ck56ud z7n^ay`azC3W(}iUrJEboJjVjqX67x6+0nXQh>e(WulFD(<p;pit&!nu&A@XMtcWA3 z+=)(ZOD%lI{f;7c%)EibT4lELeAdXqg8bXm?eWwd%7Q{_lNReYUk4lKwAlvxW}92c z<%UR({fWrt#U`@SsqKa<*B^(-yCrFSl9I|RlsLHekom6llM@>kNwJHYrImYp=!^zf zO`S^^$pSCyb4oYi1l>Zjz*K1(pij&_073pOwX(631ZtX{KC4c7aP}7Er?-fo@vR=& zqn!b}KS4%wN3M;RI%&i|eiZ46j)MCG`n?<Mt?Jr2^5>W!%NQlrP42?cI!cdKD_hc} zKZ{5G_<R-N$x_%*DvpLPOlqgZzaF6xV2W?=KJD4pNZ_Jc66?V0UK9LzpRewQ+HHLy z4t40uW7RK@&c0-pDYvybX-5W&$4Jg>DOIwyJEcZycgb^c4#bs~^(X7j1eu%14jXzp z4H^9)MvSg3R!c@^`T!|685LNQ&53_RFfFghp692X&^r#ZJ>U4h+I!2OIJ<3KGz0>{ z-8DGD39i9|YvT^V-JRg>2`<6ig1cJ?7QAr_u0b0+FInrXFMFT6Z=K(_ZvUXVn(nTy zSLPh!v9X0Avr3!R|EOT4PbdPFH1?gwgB+eR5nhb?E%u~?Xe+_3Xgf0Zz5OtqjM%8n zU_g_Kz!y>By7fJt^1WfycH3C+lA<kPBoNi1eD~SLQ^sy8v)!E6G*njp^>}vy4Gm@C zOAYS+`MaW4SK<i;^`*e^gwwU|rrEtX-Sl4PQTCUi?(Q^UDbfTiUk7>g7WGF=db&(N znhyF}AIK|Otl-M!>(6LGaEYKfAhj*{^X@}H_e-zQZpa$(q0$3=a!X)pT0V-Bt?4W9 zT%ECfTf@63_fXZ1C~4o+^3EzEqk|RVAB@vQ`1~^CX9ORL9tDc0l$-BTw6#R3)x`vB z!{?23R(%t2PR9Q#e$|I$QolZrrP#Pzee(6d3Nr0gADKiKe7I2IcnHiu+0b5vBt6DR zBz3+e8H?)PcFZ(_|LTbVQ5)e<*2oTZvjh<ybuGodXF%|q3af`QO_X{CnWnGt)v>mq zZ-Bzq;#^?W!K@|rAIy;}h+7CVl&P2*G4SzRAG+Uxd&Ss=l!rdkj0OFW37%L@Wn=(J zHjSIRc@V6yatXd>FvvTemwTSr`@NoA&vM5V1DMz=4WtIpVDY(bMa`@JUUSV{F73k- zjXk*O!wTf)@?nQ^u|3zhRHvcqQ?LG#nCyoKs(GT&X<sgt!@gG0uvOfFONUb|VWOso zjNP)k?T6z`B&kT6^V_?Q<PlCRA50dR;RSK_ijssvULa(Ox-#ZaXG@&x<%QHl-nh~M z{vFDA5t*!J^*O;2n-)!x_?)*qz=$j|$fX7NhNp75B<e~SM0^!zc@vD#q@J~3fEm59 zbUV7;5(KrU=%>8$iBJyw(bNZGPE3T=hn*P3qL%E0l%suF!QhG!eav}XQ>DwR(HdHZ z{Sm8idI%=h#1h^HzdUz2Ym+1HBy;=vYwnEW`Sm^uwU9k9lj7G0A<NSKyLbPzN|T`T zpH#F!2;RIk=Tegcbm!B<3FxH=#d*n-AEd}nL_r~z;Nv=grT6(g?)a6KkUr0N;>hi} z?znEJ|B`=dMEfcad`K4Z*%N8*lkJY!N887E?cF4(5+i~VjavAVNJrjll>;BZ1i4+i z2vR`PXB>>lc(Xcn&G)5^Q}Ur7EFzn}1J&p~YT8v5rS{1!6fIgJmT6P#WgrrNHakbJ z6axO_Y`=csWN!VS<0p0BQ9*Om3GJ`_m$lsPv`;UWi9HWSN#3tI_jSulAjYNh8mMdU zZ!4K&sp=w_!;2fgLl#<O!~2<l87FG_CTx2O)>PYo<+In`FoS3M2r2n;`BVj|c^*L+ zZv{bJuC!IfsVs#+m{n2c7j#$sz$>bx4wNIWAy=h0;4s&KA#09S1pzbQM)`|ep4>iD zrlK9%3L<^jm3+&y?$&viDb3mBdX)BP8%)F~EWb@w^y#LT^zqZ`{V%SY!`ks@P{+v6 zk95yji;BAK>G94oyUf7e6?@p^97_gEusv$pvRNVuy0L~^C|nPJb=-!0U%+<vhTQSi zn<oQ=b-?qmelmcdF`K=@F`s$5uh8iga<ngXY^v}>pZAvNd>bh?*WIJV;=_6F`CDKB zaF*iXeEhpKm`1{y=#U!jcSvOb=FA*kGMxIIo!~NJW9b~ULp=`ib0L7M`AqP3W#fV* z^;ce2w>4;3N)lJ*F6(|(D2R6^#%+@3F^czyg)GvB10swHF`@V}jL5c6AK2lzI)xFe zTHQ4I4K=yC1RR1dzse9IpDt>@Z<QP(`1=(@<_yK_I$=o*)iCm`q>k@S#sLL}cl-XA zZ)5NL4CmI$JK?A*lB|>>um6tpDcdTLQY@C2kCTEOO~A}o*Y^R*LBA>T9Wt$zl#m+Q zcDw<m#M?hWTvDor&_?@3gfmZuN2VNEBrWT8+V|hP2)28Ae{G@6?%kA(J^jECtAGiL zsIr)n>_Q0DhV`SlcysytLsh0L%2^`uethHiiHCaYfrj8FLR#|co0`%@$ygE!H=P1? z`iK_q@|o?t!DizskQW}Sy%+lL#CDd*ypJkM?$DA&lf}v7pv*;0=<wi=lv_kMl7+Y2 zZ#(fVGQ5@a23VZH3{j@8R}QrFTG5Uy2t~Se{niBZXFeR!fI?crY_(M}4@@dZry%4= z3&|k=&XF}px_j7Q?!UH#X<f!>qpUOdV~M<B8<+i>q6v@JC81}pa#{3{X!oILF?@20 z`aRM9HEy6(`eSaqV5C|yx0tJF1;5w!odK+rLY^zA9)>_J!dN8q0f|BeSm5snGA^&b z=Fd1XTAV%pMUyxOw_(8}ur0i&rtv<|UhP>~A$bHKjT}wK0Ls-ey%?vTcgg(&ZMe3L zcUUrLBcAvrGmh92NOJv_FJ}_Fw=tn-Dw<<&Vy^m1{{=sr$l^5<_nnlD+Qg4precT4 z!|hA5ay`S(OYGk2y`1P0)*Sw=N<y%D6DcNE)+u3qEbpv?g{ec!L)NletD>pxyGfV? z#3YD7^1pLl-nb;(fnQuu->t=4xlzLgl7tD!OOP^l1)*fC)c0HShG$k#x`IMPNcr1| zE&D>eId!v`Ow9Poq6H1mPq^+AeDF?Yz#6_!P+*eC)%MW6W|%7z`<cTap~KL;=%aTX zNwZ_)(}?5KLv;H}AC9b4;P6^lcc(%nOALc{l8ACd<`=soz*j`p)}kYw)nRuEc_$09 z7@kvNu~Rgj6Ph3i1{VBr$E9~o40B)QqC^{O+`0T``Zc4n9s>SaCEDvMy#oSd<$>XS zz#0LFZF)8bV-;lIx<fAL9<LfZOD1tTfQ7fLb7sY3hxl18as#A&o&m0W@l|OvQ|IFM zE~iP};JXEw(nce~p&@J;=E6(?OKnpMHDBI#V%G!<Mn$vz;Onawb@LVIC<=Iy-M%T? zVHlQ+th^7eV=jA)*t(WBd-6LMYR{8p2VaZSctkD8y=RS7b;ju4&U8F|=ppWllg6E4 zCyjxH)+Fjv(OO%kl!R-F&KYYN@{;5V@vcp|MBOFa&%fZgLT*3(k%gtR`YCC|D5#yi zz4v>JdwXzS%smz&1h!6rmPk$R)LtltvBE!RmDIngYM-`LK~C72PN~yNL!bAA1y$~l z$<WhKCHleu?Z}B~NqV9!{EoG}ERqb);x!o#VlUUUZl#QIk(_Q|f9uB5rOkOu<;X3c z7~@sbFEoO^>ATEn|M-cQ1NGLF`5Q9hmF>h1sKbmPt6hgs^s9@RdUOh2I0*+n43Q%; zQaBBaYitmGlHm{W2fT8+dH;^d#n&8G$+;B;+2$^m%^a`%_})oNGmUbX!#R-tMlRdq zmYwx=r%}L52>z=&{$A-E&_iF<7VzxFl3O4vGXC#?eW#2`K+lQalb1J;)oO_l>UW#$ zC+z1Z<O`X~-T=VARB87(DHO-Fu-;y?v!!d0Ngy-Z^&#|(=O-;#KgPFV=@M^UzphxO zXTB;g4u>FDBaM?~eISbuGhSIlbaFrqpT8Q0M<A9^YS{=`fB7<Ed<o4I7usH{FLirL z1NoNKZG)fWNUiIer^qUTRh~ZsN>VjhWo(P*tRYPD#)r}anq<lZdc@Z)cayq=ph~nk z!4hyXj*h-m(sxT46OndMlA0)OikLQ*OTw~*j$H&F{o>n6;dGJ0u-?FZ&X(ZYYQX^i zVU+77>03VPP0#aCq?gRH#wDY2ty+dYuukCuGfBt-wn064Hqy%T{Xd=Ytne#HkdyS9 z0&^9p#2+H5I-DhSq05?i9m+qsn?q?e)^_1*{JhK5NT7es{SiYI-7B2uhpyt-fQ3L5 z!|sl$M3tL-rh0QU<)%hjYG1W(HaJiE4M~rPbk^6VLjfk)sxU|~?_l$=A@@o}ht+gM zRsO|RDoN9?vc-B0Bb8z~o0RwYkcS{dFmpcqLwD&B$2QYA2e(in5oN&-`@99@zoVk} z+p$#m>&TNw)}KLKKr$?=;eJ#<cM3E-YXDN)4fv{~^dI)sZ<bGdi}Y0JU28BD-lTiY z`tQHoSiIYY@i&4%B`s!QD|JC+Urg3VaSk?hlRYM@_g;toZ#p87B<geb{pHLKhlMX+ zg)vpC1XH?*Gh5hpWa{9i$u|0Hg2i^O=;0FD*`JzQBXbH&;#+Ks8rn#2Smq8r!>+J1 zFy;iK%hfcP%NV)#HwIBr-|ADg5=-)Auf6w{<d_b1rUl1zXnku9`otC0XX-+TNvbyu z*6ia7Z@!GIT3s%9QFuZ5%ISnsq*fH9Fq$oD2<=8a$cn8i%A3x7tuCImxk8N*e+#yF ziExmTT3&jm+#dO}Sr(xt4%fdx*Jo$vLuNYedLK30#)d_*LZ|O7!xbmy21L$SYOyt< zsp^N%r!#wu#ncQnngS;P#X{f4IVQrqT}=!1bHz@-{J3pYE*FMj7tx?~*`WcjEpy4O z40CHs8yd357Ao;rweI#O-xM_d3ahy|)B(5=qoC&*!n?1|b|)$R#82qC>gwwLCw^k4 z3mxmPJM{VKZV#*Q-)HvuH6|he?EkNi|Nm|O1N-4z(XfbUdGc4UCnnZn1swF%-2?U6 z=jHDijR#mu5<RaYj`|8k+O@T{7tJ~-tKL&h2qw)jF(}Tiu07`Lr8fHBXRjVlLxt7= zf7ZYs$b1q+1>InKVSoy+{z3*a>jY31$0P>KQ0iZ8vZXm-SzCFdeG?zQr9!M&xFcuw ze2Ey<#8{KXJ?Z_w6x_|z?WQkUut)WoFeB}Y<5&qY9}^YhnoV1_wtu~n7c;y1AFdJm zZAr!F@a%Pa?o*%$SF9L;2`o~`-T+Vy&c`#-C-mox$V%PT!V_Hwpq2zl96JF(xk;@i zzsGrg+p=kGi3_<WI<^ummJ&k}j!&)P0(DXm$Zoo10TmYShuQ@S91CfrK~Leyv_zhK zYgPuC=ET9?^xWTsM_6SDefC%T-@oKIApS&*>$sgauLSQ;Meom(JNp1gP5XJnxH)#~ zER&EbHmlc~DMoaxgV8j#vqOF68_H&dfX2EFu)LI7*G}T@nhfO7^&LyFtWQW3eJvaR zH{~JOs*`SGuyPQxSiu}Gw>5JmKq<4hg`uOS9b39MzTK^Ajj5SBZt%^RVOP>?3Ql6Z zZsa0}+>wXTqUYy<#c$UCa)V@50Y8`w6Z2WDd%ybhpzk3K%VPupKI@4JK(V^1cm&WI z>cjAkb-_Z9XR#bAJVW`gJQv@Hg4dq|7xUN@>8(#aY`cvbjIC{<aw20jrkuDCszy+1 z`@_37KFY|_8PEtq`;jAm5i~gJZ4zytB*~LEzlFEx+k~((w6Br<&1H!>f6=*xd6lYo zdNxSPMYQ)-ae_L53lHh7QqER1*NS2|+__I`n4$tTllRqv+4I7!$_8C;gzFZdq9M1_ z|Ee0;Xv9o<{I5dGqf^2t<7BDhqn2$UVl9)nGgne#ER&})c<ZM@)$Zy~3^kO;66>V= z)HOZ3T|-B&jmo~T4V%1#SC8%Jb%?@4Sf2S_uJ_~f%kdQfSp|vsgkH2ErPoY`M$&IO zV#~GO^~?`c>7}jYG<61hT{l!$eWdL=7GwgzpyBw%us*eT+D7I{CQK%x)t)guTYFc~ z5$5HvIx*hGh^y|~^seRp#Zk$A+UvmYH3{LZ8b}`Y)-lq9WcTrSYM7wyzJw29o1-zi ze8e-XyF!k(rK{n_Bq~w6vep}1#-N4@F(egHqE~;N#ogzMv&TVN3f?isBXvm8@n`XC zNBz`%vXOVf>qH2A8YuGQY2R~SV;&kiX}pg9+WzL?Ws=Gr1ar^l^r|G<g}2|8kzIRf zRYGS(yTs^U06tB*X`m(Z`ER6OBu#}BDV7(h4N5_{JLq@~y+&+95{1d{y2vOdX&i1? zkJ$l1Enmn0Y~AI^@u}di`y8{l6h~oR+hVbRt5VsM>g<TfPO1EN`^Xx^$JA0BoKYd- z=}1VuwyfbN`M_af`Pc(;sz{pB;FVmD9AG(0IMSl0zYAU9je2i_AlVY&@H)p)Xz0x! z#2?2a5MQkb7XTW~@fPcE(W2#gKQ_KU5UgLFS~8q*E2jz^sIgFAZVnf3V+%9pq?2%# zAdzkH?5j#5J2q~V7@YY#Wr24=CjIMkSLwaOx2kk->#Zkur${a-A2-E29b2wg!G0uK zd(E8gUy|a<cDqFt0RN|5j}TqT{!LMrCP4zLkpaaZK^^1w4N|^g6?bOeg*3SP6|CCJ z8Y76^^n;?kA&TM_zB+f+LV^{j0G3`gE+RM51jt>c;&2P(Symws+A1jIs{g{>YCumv z@1hzR>fiRalZzE3-Kl<o4`KAs;)hf)RhT8DII>!2={fWVZ$P<{l*;X>r>#KY=O>=q zLDBPhIf|Roew`#kXjq&|nI^z%FjhHjy13eQ?cUVJ%%0XL+m@DnNVLDki&LmF`kwdY zQjD{|2p)&VvQ>n}+fYa~OU@P(eH`u&n0{eo%^xABIkbfOlu^Va+#eP$h1+MSxFi#? zx$7hUl*Kg1eeY&ME=jx@gg`LT7u0TY*&N<a^*#D-vKVi2VH@;KR_bgor$geeO@+q8 z0u$>GHTm^)uJaK)G_=0^6^~D#4q%0T?tgsBB;>Krj_mweGnVW@czw;^gQ60X!8AkK z|Dekg5>KQm3ToNhkj~+#bY0zDj1jq7&!qbByRegDw9*@E+<i%p6DPj9uTHjbXLpuU z=xmAv=i}?XB_&w1HJ^XN-f?Lh+81*yhvCX!`fHYt%0(Kh)8JwO*s{EU`Gx^h{EUss zZ}F|Z8eCl03od!1Pq)A1Ks36#T!yxKd-X`UOm>zo3ocXMKk6-UQ&TqjRY6A54EsW? zto<gHyp5Yo9*Ztt$1x?$HFPyhROrnK4g`&LlaxeBreC~Z(vlJrRxNbvT0v2}C{+HC zRG3iR<3K5D2%}fw|E85Qbnix9PFZgKD`#^70N>R+E=In7m8@hr8+=J+UBYbj-pp?1 z1F4T5(su^vt+<wVftUM%08{qkdqdMz?q?sgO^&%`sDoCmitX(D?}H`WeUH9@pQ?Ki zDl|wGl<Rj2iH`G>Y6vQ>0##Nc_v<t&>wPCS+H+<cD`vL~nqaS48|y-3E5p1^F>Cs# zOgrj4k^fp(Dr1t_gx5#8R{O3ypM1Vp#|@iIqpi(k3Hn3;kV(n4m#63H_|yIP?(y*e zuyw5Fb#{^p-3}`}SJS&*`pBqe18WHi_}NV`)%nTsT8wia41GveN<cPs&`v@xYiRG~ zC}v?(<Q(zb9=>P@F*Vd-FHU5ka4oPNDy2J9oO0KdV6hRhT9?#&;+HEh6TyEb!J0-x z0MxkqIuZVl@;19CKX8&<X9|-JnG|~Yeht9+zp^F@Z{RcpvIl7ABHT+d7o`9>?mx(w z5g_ym!fFMD(}j@CorME(TwBLBzoTFc+^S3Uqd92x86K)c`jp>SBFM1S?O~_hn@QxE z6-+Wyd@mLrOsI-|(FPlma$b~;g7|v6-V5>8!-iDUvRA8(fJQ0}Z6PF<GNfOpv5~l> zX;8RBT0lN;S_8%M_FMF&dUi>a>06MkNz6&jT|>|i?^vciM1Doo)xcMz;EyRH8Lpzq ztCWK^@BDvRU*|^rQ4eahan)&6*0;1#&b_BCU+vz4vyGA)TU)VcRVkbM^v`M9Mex|e zz}hN)&6$qOWxLe%r!R%<6+!sw0oj7@Wtsl-R^Dw@)gE%<bK+&m9t;dU!2nLzQ?#`j zV#V;>w0tOss9EEvFj7g~y#aJfCgzt<Cqs<RBcD|Nh|d;X#n8=C4Rfw_8FxRA+miZ3 z+(mG^ZXw-fb*z?bi38$Z=7fExglM+p1u=5|7}OY;-SHg$c2S(gv;8Z#PnUIBITM@3 z#D-siFF4J{{W$is3!sh|_08RnWuO?*EvyUKPQ*ja;UXqc^w}eJ;|oxU_j?EpreR%a zTZM4DwImLzlJvL&WE?0l-D<cG20u*Y7u=;pmJ8FH3Rm%k6}V%Bw??L1#@4xk@%|;H z`qy8}VVN&q$r3SrFY-uBwt`k4j@@oHNuR>3<|_A2NT`ZDJ`_!TC{VruG$wAB*TCXb zpN1g<%eXy+nC<u2+;P3l$=w=Z!sZb{g^;Z$0YHru1OAH|8QDRc;*Zq1D=%<jVooaQ z$&<&Ep%=w#vVhj#w*1rfbO(6Vz^$h&Hthtzp{yu2@{W!{KiE3J8|Bt9L{h13y0C#; zN>5d<Af<Q&GlH1UabO<lt>OOWf<!McH!B46>%}1zD+iBCszjciQigWN{?b<Seihgb zHGJR6vGvUV##RPZA&p|q+C?*K<xTp4r>^ghF^FJYu7LgYn7@5<3WFtOT3#fuIbH`N zFQqyg^Aq(39w9lFZl)O?xxHZ_9b7)8wFYN#AP~B-?2$-vU%ddjx!KiGwTsr5DY2{K z?sZBf5w%y)qnan;RE$Yh^`v#~c7Tr6%Ed#fQn*a39rmx~9pHx&zba;CRCjjz89DYi zY?-CXQez<m)4vN4QObyvZTcU@z42)=o6q9jGY%U_*w41d0eJ4#k3sCQ7hsDWG@*rc zl_Oc?!j{1v7tT$(K{Pul^ya}>P$s|Ug$CkbmW0yuws8d$sle>ZR@{*=|Ha6Z?9Wrw zSn+b=>&Qfzz@ZaVcd^CA|G*!sGWYSLC!B_@VTWLe*;q-mJJ|*I0DYb>(Z0{Hfk-co zDdshePrU@7TvnaFgJP3%FHIC6VDP8@-AN=EW$f#TLE5B?hstPVqtLqhOOKh_s?f5; zH7xYZLsr4}MWYo_PCtiv|Bu~E`CJRuk{Mt7SuZ82$Zf3yIK~x1V9B%8)l0CNNK>nV z`iqB|Ia8*jZM*%I4giDzfrfK+b#)3DXW=WTX>>Y$iPg$L4_~JEpL+!eU-IJrJsg|O z+2;Fa2XxZTuhlXQ&YAKTu2(Z8N)tD4a@Y_NSQNvnnSnW$c))8??wwj>K@T@Hoks|i zMbSj=7IGt{iIubO|6Jt89lUQr@>8>-5-HQ3$i^TA8JSD|J#Ym?ayFpWt$phcaq#I& z_|3i463XXKHaq<T7uK1CCtL!h#^nU%WjAm*2r~GT5dQ&4Ggw&uo-G7wJ_jIZo^GJw z+6sD}_!LVjWJ|{*oV2&Q``*ru`G;w(wBxfP^wO<_N+J|N70ymGOY^HIeS?3LPR)f8 zcp<OhBd5{4vei*dqO4W7;vaSJ1<mUJn>rZfAzG%=7$#?)f8db%Yl`?=-te_^l**n% z0yB<{!`VW&p#n5ZmeNmJJ?W6s2eo+t&yXH@<zED^sV_Y3k`vXVP*8g!g)h>#!>GUw z1OSCG(@xo7A{dtgcWjTB)q!H;6<&i0o!5vCKND*)5gI=U<ve%9gimZce|fYJ*rK<{ z6)@><OT<VG$y%(m8_(?k3a0S86gxb%S}1BOp|;V`-(>$RUb(z;fHJgWa;_>vUC%?D zisrc|ge3g}dK)6$oGqa95;rTlny&&{OhEYuI?(rf;9yHddTzptT`a#Kcl3KSZD*jc zDYgSTt8gdYx<GWyc<iVzB)ZInHM}H!j=is&Q77{W1?EM2u)E@wc72p6mj&McTV2F8 zVvID(L_S}II#Gpzfy6Q-iqmh_kHX5nfI0=pyG)H2`3lj}J3+p=0?BFpa887fvJuPI zwPnH=BOWm4xhp#&8XYM)Y(Y@6{e|lcl4X|=+^x?PAMfCs0zt-JNPrGYODElQuFXaQ zO%M62`m{I`HpX0o=5!lsPOFoBM4_r|m649Ox~8!sCCZn>+^b0pL?kWfUOn=V-W(~V zamjI@etFi7CE*@7aV~yxSmPw00>XLIq%neAb=HT>k|3F?ne0j~$hD|wXJhJ@JUP>( zR7%ClvY%Dx#Z5@X)-tQ;#HU}PlEd45g!%mLDsn1r>isi<FZEwAr&DFwvk3&AjUGa~ zwj7+)-P31?o{Hsu$M3O7TG7C<$K%L|DocbjdBAe$DGK1N{y>ClA6Xy1N&)}Gsusk2 z@64Dt%E|<tAHx4_kFsawMUuQzDWK$*vY1jDGI)gSe^ii<o2^NZrAU^0!;9b61?Zt( z<SEU1Sxj;vez7rXR=OOhWp_keW>bR3x9*Ga%J)MIC+0YWLRxO8Mb1^!$QCAR35lBR znr_~zwV>?PgNd;)04`3D;U)@oyCEg#NBv?Vm3svuH`Mg-*WOc?{>w-xY?@nESIIKy z{W=n#;d`~S0mnH?-0-jZpb$s=nlR+%AJiBdM5!6?kI)B=92E$c^Hcf*z3Bg&q)0mU zkCEJY!5-!naNWLLfBo-9-g)L<ul#c{1JXr%qW=f1PV$dQ{jc}sA`brfvcFyeJ}UeF z*|&KL^0us312W&vHgn=-lzHClnaSPecdk9Zb|pd|6T&J<R{lbln6m$k&WWk^hMND3 zCOLewj$k0Q>S^0SoA4iW&9fOP#NG`IU#r1bXpDzCpfs`4j24*Fn&MiT_lB5IlEpV( z(hDUD#XZ0`>Ppjq6YnB=!#Ywkzen$f-7cXXPG;^2Q&<Om8Ts9dHz)iJb#A+_*nu)= z&lmGN-7spDf4UKa_=MrwMV}r1wpN=ycJvevyu77lH(uc9G(Bub&d&*bh4h~j*z#5{ z0v+pFch+Uw_(vA~tdH*9bKU?{XRJR=Z%G@{?*MhlDbN5CK3yn0<$oXg_H@qt6i`{o z1Z;)6tC73k&d3rzkf-YOAAap9!B3Tq$GVg7frMP)HGNbWhED+YI6<HGX89<2add6D zwL|@nFB+}4^Kzyf&L^3$Hv#5kXWd1sek;gG>0W_p!x~uvkNy^cnO}i22fVmHjEt$Y zz?7&|Gy7>Ihl=Jy(wItJRc#`a!VK4ba-S|k$OE1=yR&GCQ24fOad+cB;=1jg6V8JT zk?t1%L+Gx!bHknIF9TFBuL7#bwvLDXgl^$mz6h#2Bj0~KKe@kKfDO;C?F`nMGhJHZ z1{kq?3dpb552`u`Rv(sE*CmA@=)R|cq-)@ME655q8_#;{>H`xI3LGyl?<t^@Mh5Cp z9^0j+91JYq^Th16XQA;mb&Kq`AzXlFFfqP-bESG%5Oz2Vq02%#lF-*jWhhk3JtEZb zX)1b^AE9Yop<l71Nc`w<Q5G8Z4iLQcZoBqY;Na?HNi8*tiNcvI&akK-zxgBKMvb3V zWBx$*Mob35zZ=P_3UR7N{3bR$HO;1yA{^7FQhEc0cg4oosNVyEIvKfZeSLZN8w%!S z0Tq?+D}AwRR{h5qBdPY3)r9{vD7$Tc_)zJaXLRv?1Gls5*Dva4P_(|IwY6*|QR=l_ z$8BMUTd=Hj9H25_T?Z<0j%SIuk(HGUBY?_K2|g<)+_%3Z8=*xY0@aMjp)Cw1${6W` zH=Y6aHq66qZ(YYMb*s$lsOB}t=Jm|Zn;?IH2N}@WaJOa7>R!*HGb<8*7_}R8*jdlf zVx}kBIK>z<HRSf`73)pX)EHcX`{vWk!bv>n-*GE)NOc*6#z<$v-xd-jty<l){X0)( zQD%=lZCXF|$BSC%JPv5_sIE<xNT=_eUlrUi+chfBeV)mSe?4~Jww_O3K6hBnI`UK$ zs&_yg<KXUIjDZw20DjTD<ob*aNB4GjLp=iSpFH;O0r&ho7spdY3LuQYjF$mghJoWw zh&Z*x#!iT@qchmZq-;*n;P$&^p`)~{TT6rmZseFddTHo<j?O)cIb`wVZByKpw12Jl z@@dct+*<F2sA#LS@YSuRSyNLyuEMlhiM6Xq*yb$4Y)$RqUhLWa=hg%aC%;=~XJ#&= zJ05@T?d>U1&>o(gY{vTC=XHS6ah`8b2agMw%Q`FU)UH$1r&CmSAjJUmviG^ad?4n< z%!9^sdK0y<t<vw2ufBt(wIb|Adc$c%{*64w@WnT)Q;!pN?=<jkB>C|%RD?x&3|vil zM^MJj%AbWRP2xLdkY63DS}munCu?KqWdT0Jv{1bs`IuebPJc>mtEIUM4^kTx?5!if z8W>0|dI$YWQGOn7d6p@%!FRN8SMQ%8q@Q&Rh{Ox^h4C_U`<*-CQ}f{x5ew*z#dhKl zH$_G5=NVbb65}I=%&z0Lbo(;zkUI|77}SdHas)*63N!`S7dzwcse6pyaj1xY?(k|i z9&dJ*z0BOeyBP1`nx+_2^5V;0mSAHG-OiM#s1rRT4REW5c#^s(XJ*e>RDBG-&r-o7 ztxjHa+ye_ljdECz7qm>rDDf(^ax2{0qBsA5E|*>HexTM}pB596wWM*9T}6|gqe~1j za}@40`wX$lgtf`j8vT!I9I3+ee8`ptJyl!cfr@#?tM^2U7uDtD_16pATa96uHH=k` z&gk8F_T$KF{&<+SD{{`>gWVLIlW;GkAH-rh^q#Iehe8RH>%tQ|0eOSUw;4t#sTE!t zVSTaFQf1PY39CrPhbU{P9<1|>F(pg^=K5X-8Yy~R61|)F>v(6~e7}Npt>OZ#6SbQf z(S+~knd!jaPB;hPycCvkC*FXErnzAcXU~10#3$viNXa=HKY_`$((9}x)_mqe!%lF@ zH|TL{QLERoB?mBt&3{xDUJezgv*PLu#Pbz#XPsPe!+OyV(*H-npV2r1I@l%bzu85D z^fiN4dn1~W8s>~s^jC@@K7!+RWz*o34<!}Te2YHy&Q(K^kDMW?n-coFyS=+Nv>}kb z2j#jd$BH4}>h_rV`}25LkB%#y0%ua5b&^6J1)+b6Y0m~d@GZPa0+7Yg1&~wG%pEr( ztEC=5b2Z}ycu`Xc=yK8+%xW}FGf%uF+kGD{=Vmx9g$?0Gx~0TaG_kg)`u>fY8`EJ` zXMl0DnKdA5Hryp%Me~)x9Fcd6VWhVwH?YnjIIJfwrDREIR(iG^*IgXM-Ku%xb<yN) z+_7ENNE-xwa0gD)BNo`-(PNCc@9~m>y=yoorv}QVUGCc}#=QZPa-{b{1oC95vSb^R zT&i?9W%M73RD_vrOFpIQk-iNde3956v);v@E12G3#c_rotSnI6!Y#b~_z|@DT_(qV z>-Tg+sn1y7bo7D-(iBr_h9aHaHvrOQLejr%dWb;oC|=TUU1|P7a&^Tvw09!SmLne1 z;YdcBB@`O|;bpkkM|6FqJ%<@vbs1{}4#q+5AUYR4&-V>FT;O^qxk0pa0+CuNb%xA5 z(2gdZRRanITB=Czu?vpo18-W?mlAY|-Vc<CAJ}bEKu}ZUS^GPAjF4X{Y%b&EIO#Z- z79lx0D=;!Ac)xl&(n<(o%=*k5LE58-<Ruj|Zz~PV6z;K)4wHz)y1Aju8k<O(iI?cb z-yn01xiRybJ=MsGp`~B<lq6tE-$igCnQCO}{TL)qF`pP6?`H`rZi98j|1lF&0#=Vj zd>8p<`bSufdAQDRe?#ogjF+v}dJR%EZNDQ^h%JAniR-^!*6prq)mM<G&CFZDy>E;q zQjn9O?99$$P%Ocmls{yWjqKo<S#zh3<W7>7N4txhgN?*wTE!~-=okQb(Z%rHs|<Ep z(OM8hdhF}aW`u+9@H9WN)wj-2-CBqq3F*r$(uH;Kvc#x-BymBV8k2kKFr|kKnpSgb z``B@x*jZV1QtY%;H5!~=VNvTo?8XnnZ*N9$nF#HYVjel-jHb;mEIO5qO``tq?IbKL zD=?Yu+amzNu2nRyD66m!S&%#eY~t>Txyes|%0$eqj)Z&qBBz^S1>al=y(Wjv5bz`5 zM$!$33HC3UpIkHT{U4c&HS--mnb@i~71S<Vy-Iw0tpm@@g~Bs)p@V(OQ1c(=qF|Kc zB-}v7r|^~hcrm!FCuDIdaTgTZZ%e_s?O(<&***fj3Z^5U4y}jkE#iQGx#Lz0=Nd)4 zykC{^r1$DWKgX`C+RN^%m^_8j?^aio?IHb|r2I_nf_)nVsGGuSh+P**9{n`43n`(E zs;EZc=GgN(qmKm;*sFvu<Fw5GlC|6X@G841`78v;p&*Q~4!1@r=jPe#snX<m@>P;L zzrptP4n`Q2B$|Gj{3(}ffx|Ce`b&AQrHVKzlv(voK{LF1nUWkkk{!4nBI{V9b#cV@ zyTG(nCu-pP9ZL@d1kC85M{8P*L&DrBlYEm^W0NZX2C@ct0n)_Ap81o=-#?1f=`S%B zrZHF<<canW%v?04!R<BB+ev$eYC8tIIN4P;3COkGLoY^N0~dc%{*M>j0y1_&3?W3% zluYsXslnUS$(MBk8}mg&iY%@uUGG|7*j3#R@K_HRb0~aKhp0f&Yg?QxP|w>%_w4Qk zANnq2!Zch6j2-bm6e%EPjo4`~!!6n34)j`S39&4!Uu9D{Y?@FzAbTQtoDuipxmgSn z#qJ-C9QHMJUYTchu-w0mmzj3S|9R48ycuTuUD@>FZfA|>+{-AC`7ksIx=`Qg!F``d zG*V;HL)i%x2N&MyQ9Cz!=(sk-ey{QU;R$+Ypw@NGT9Vzq`5KT7t=CI}(b#_*#z}Rj zdCf?}&@3l5u&lA9hW!@&RrIJ5UyODO=kiTVV{+FKD>HTf0|m>ie+%yLVnohh^j-+Q zV+C!*9fTSKy|ei4yU%jPF|yVs>$TTfMF-3d#Kz{xZA<6+5(g_gzlQGdVFP!r^`4LE z1i8k>K`o$}G%HQIgxku?7Ig6N5AeNv>u!O8^~@mwrWK+0Zf;zE<X53W_ivs@q}&6{ z1nRTF(1%%$Zhh_dxRAQvN49`b)4<+!#bHE+EdFjg-{0xyQ(nMSI~70Xci2PLSZn;> zmWmPF8}usGp!i0F-6>GXHZiF0@P6T%u{!?T?4^EZ>*|st!@xBf{c?}$8husi4b<5} zB?VNhV54aIxL{+Td*Ygd19NzsUnN_Rk0G%Pg#R~eB=L+PRh0X>DrrhTc*%Kr;`=M2 z-8@{PgMTwmj@-MHIRA}#no;S9#>$@c2^B6%d(ta~hoSc%D!c?y#Wb%GFD-HxBXbiA z_T5L2)Uo2{2#NYyY;#hiWK<#<>(6VxXRDae4xK4^OyX|k1KlwdCZ<%8G`3a;2D{*g z;V@(tGlB-mz`x}x1l*Px<XG*emAhUgmwltW;BF(@X!C5<Dh++*cC(()TN6oNM~t{3 zf2nb?;WbdSQ(c%=2j6}Sn}@yoho+)eA;FqWt}ghFKe4drosXK>T&l}?P}yGu45dYi zXkp}%Roxz=y#<GO$g?$Zh3~mrq~SlC8AMvQh>Kgdumx->6Q%0=l1<l+8oT1g$*_?P zOxp`Xck3Qi!|aUpy&JlZ`&6rBdxng>#IJsfnlGy?aizmxDS(o9*6`gdulo)Oew9K# zIp3V31bEu3QQJn%E!~%9d=r?%m?Ps2e?K$*D)f4%rt+E(U~Dd7{7BmZ1@@hsO88t{ ze8TSD(JMN*1QG{sx?s~CPl~?Hq1AUA<p|Zjwl}lQp|<E<cN0DkTnr1p)3><}H}<rZ z(-H2Tj+9uYxif&0X*JS+SVe{vRnj@ZAF9%o$9t#ddl7|cdoi5i#2Vdqp*%W`dalRb zSxMER36V$_3im6ts`d{~#b>BENj}hvzYb{*orszBcaupK{qEtb%{+KAG|+=&nlxLZ zuT3`}KE9rlWi_v)O$QqLnWgO#<NHr)-$h0nJJ3#c+)}T2od|fJc&!FbnyX5^c1#Na zCNdL_Vjyh^K64!)kzQaTOBn`^tE+2uYilIXlPIqqSh{n+QzM+WZc+WElKc-PcN8xB zZ%QsynWf9R^aq>`+QHzf{RSgKtxx?XgZ6T#<}f6oo>4fd(He<G$?r6>^|;wqA;QAJ ziYBV?|2An%EvGVK$63xCpR>0a+j^sM_v_41QNNQ7ajXbS1~<<v4q2{a@TfMib5mv~ zF_C98M??eD#p>{eG=wGsoRf8ZF-P7V)ce27!TP|yR6Lr+nsm_SLOuD3K3TqQXCS%q zW99}ySy`q6g-4ZAAXwa6TcKsonH|Nm^wVW~i^n;t;y!|-b7%-su5Qv!9qy5GgUSOa zI=UQZC{gs+NN1pEbtG}*ZJT+fqjPLHC(H%Gh#eEx2U_mw5GUNhO5lRLEl+EqNSvY1 z0T8bOvR~g9WaY4u;+63c+IN%V?HoG8%GPnd#Vsqo3M3RD@&mV6FVI4!&EIzEm2$G^ zDK{l64`ZXLm()saNYEc?>IPC=s=fEt?<~{crJoAp4w<MBd>5H1mdAJP^EpEE*~hWG z%V^{L+C)XeGDS?e3RBeeNH0}^X0qw7FUN%xnwQw6y{IX=FS8{LYfz8dlpQ-+S_@tL z*{EXQ7B~uhB;}om?ITChXSXO&K$f_Daml-LXJfOWd>@0=cWJ9k*Yd7@M=djt^dE7u z05cHB5`aYZ0EmrRwH`Nx9z~-+odS45Sv=N?-;<9j4c*XD!V*)FQ=G}|A06a@{!{4{ zBctQ$&&O$$f=>qNfOc3}fpPW~kEE>y1svAYhyGGH<0`e!Q_b00C#_nF)Y;2|7;C<h z=KfcLO9@}d_6@`ZzR>R%&r$4~zrex%EYO!o;eh(A+FfrIi2T4FVeT=R-PZAP>?hLP z6j<jl<TwYMPml-w_@)(soxC<OAAIBO?6$i~@1=+j${7Q!AAXL_(603b@*NW_2D$_@ zhSr4(G}-a%A<~e&)|m<nv!C<_Z(m#P9)o&6qnaaQhDs9t;;D1r94<tA4a2fW+<VkV z5@DJ0geDPdqRg!*WGsE}FW3?iw;(kw3wL&}VW5hv7IQIih|&-f=onSM_xp~~+#6Xs z59KqaI^|?m{aenS<FXDo5a1W7$mrJaQvYU70}$v3pIufMQHxAa)2>JkP3k_?m*iDm zhn@IQ>WW_!Y{o1rNnd%m6|Xmo57xuLdOU8YdIJ0AQZN4_U654_S7jlY#jZ|gMe>%L znCfZVU~Gx~rCXFyn?=Frj2wZ+eWJfNJ`WFI<0~Bw3h3<>&7ZR1kP9RtUI+A16RYAL z&M?i{8DoD;JlTM<KTQmV$HqScBAnET0FMBG=G%tfWA$@S_dezW7A+&9rs)1#sf+J7 zzP6Z3b}tYwdvQKv$EzrS4yyV*kLN@25jEuZgiTs&`C}W*G`tcT7F0@;<po2%>2BVP zab{12tO^=EDI$u=KrmDK9~hTpj@4cTh!d)xCAYvJFVgn7Jxh9nyqZX_vPixR<uN94 z3XS^kU?pMBCxC3KdpH0xQXC&ot8e*+Uk6Ni{y_{U2KmD;ap+1N-pQ<Vofbr@%3G;7 zjY(MIt<xc|;+Xqd+$%au>tlPRd;8*MS!!IE!*weRbLWg1Vy6}PWqwV(t8T6P1jlC2 z9C~}bP#67?*s=PH)-{Pa#Q+guUxm|tOWOxxNV~9iAY{+T8TV&a{|*sxau1Bms6g>I zjr36mCt)yag0w*30{C=E-l<Apih~7Z?aJsSJ)*F?ZsUZu6N42Hy`%ML(~i|i@ti0m zX7mwCxC*h+v#isY5Uk#NwN#2*^w%Aixm6&mNP7#6rB<ZHQqA?(kp`sWtB+S)^+ZHO z&nXQMK5R$N*HSUXr$CKgd^u81yDv<wozXTuhQ4aq?Ab8Mf@2n9$noO#;%y<dnf=e# zdu(`5H<J|n7$cjTwV3Q@9E^Cc>4}czySSl>JYTZKUTEobOyY!kc2%<bhzO*gk&7~m zZ;=S8xt#A#8gHe6JT1IJUy&peK{~@8jwtQpy5xD#%HcTr>dSN@<Zl8CC==K*(1ix9 z3eP_PDMx1oKlgqY1HXSkz(lMdy@HL!B)B<6k~33mo{-z4B{tW5JhuMo{yAgm@n?kS zq&l_=91$3dp1F*}DE#IcX3<jSZp#UD^v%Kzs0TFonTC`ufu8xp#tZlg!_rBCx+KlM zsVnhounDdVr1&*XQDZkP!sW5Cr|boxTeUFS+$ZYBIF;FtWhgnzJ!z!+F)g{MM*h8r zAq~n^(MQd-&f{1%P5c*rw_H?#`R4Rryc7eeCfozw@cir!PyWF3IaE!SSk4Qzg;8td zhk%9t$*`RSLAHtqzUY*{%$Pm0gorTG2<e&;EGmxKdRfU73ummAnHg|;DLW}B-oS)b z<kDcpdsK&MI%HRQOXBtns!2N`11%bO;_nu%KABfon3}5X5pu9i<~h8R?N^C`x<w0b zT6_E9<)1L~#uZN)DyE@$yvl%R59TG?Yq}(|Bp{}-Z2N5#URs2q?>Ai2XZD&EUq@of zA9HM5aDxv_kv}VlYQ5<br_xCQWIVAt`DcT8%j&}=e%}y=nxYd3F0+g@gtHix!7oKa zSnXSA!Fyi<2w*87(@XpK`J3N<mO*zzw$9mxDl6cb=F89R&==3hl4h^1vR@oEeWf|= zKa)naOplVI*736?!gIR{`#omtMfGVIb?M8eI4`7?wU;CvFB-!$kIJv|+Y3;$Lh{b9 z4cpYM(r+K&%rRU$3<?gcKh-EukA)?r#*~#PqhRoD|2d;#k4uy7SM&@A-C&A5+RvU6 z1&my3CD0tuGTIphPk^oDpkKgXB2>bQP@u8Si{`4jHkVVEjF8{6^~X__v1A22;Uc%< zjtTnpdF?W0LV?t+R|YrRgt#c*{Fr68dF0KJ`I65-j?XCn6=_E2_2-VfVZr$ucN>n^ zMQO26LxL&2_wC3;s!y<l(c80&^O}Cz*>fjD3rM`%Snouxpnm;2G0baFz9>-~E0yxH zo#BB92P5aLw}Q>p%OX<<c#nj*wHRn555o5I?3SYqHdKA${?m?ECIFHsVQQiwI$|Jl z<5?N)4FrL_rOVj@BI}hGx2BQR%CJw`e#`Sn2~%?ny>a?zB+8WBYnJU(*r0+K1tiuP zy<SOBu-S>%d#2nwITa^OwQG>Ew}J|Ar^ZO?8Eer+`OLnpN)^_B>L|foS%ijQwn%XE z8#2J&879HA{+}ivl~zXZ(EjC8v@JgU0^naF@hX7{AofK2h7P1y{cMIGkVm@B)6jJg z?#~3<LhsRNRcPAEb)T5K4GegE4msxP-Y3GU(o?+Noc~Ec4S7Jnfs}TX>_@7g>7qOG zMqCz{#+vBYA@2gQ6|)4?u5XcR`CCHsJbJyMmLwSpUL{*eDgk6wgeytz!dK`tY2vzZ zO~^Qu(E*qi4c6f#6*2m2t>tx0JQ~ix(c4cMGW|8G#I-hjJbk{^OH8B#r6<$Zanrv* z!m)f&)kRg6C-{>*ED?+GX#9|*1Yjxp>8a@E&V=w}U^5&esKm52_~}urg>?1j$-%>^ zq<8U=AZD2CvNAkJf4fUv-W_0NnonF+B4TcGClsB*72e++h_l0~ecZQOD3yL0ImsI& z-PQ!{lcm|G_HuWI6k=CczdCF7z~{)hy(bf;h6H*w$p_(2iLM~CS1urO(D~DFezi70 zBH_pg1~Pw>1{Yaa_rlahqGOGlB&+ypiJ4Bq8vYqJ$Q=F5&?Wo%1{jC^?tLDK*ZFe@ z9j#Kovl0U>i{B&Qxhw~+6@ccMI|WjCHlGJXRBhLxI{Il|eNorz)_*+5Jv=_1jcR*u zW*BJaKw`_0?~GH@PxebbV=9OEIj_Z_9BYjM;P6+>-Cc(NLj$f2tquKQ0eN7#05rR} zFCSP{bj7OmpHQ#gzUh9!A>g6pt#*hen)twSM3sixe3&9)t%v9?)jZ80m}0f_?x?_N z>X3^6^=FFc%u{BjZcqf;$AnW^rsAUc?Pd?L2al1<A}Z~nNr}2Sk1fN1Vf(r<*g~Te zSG8byG5m_pMBQQ)w0H1a0ns6gyO=I)>LrOkYrgbi^{jZPTAII5sj-+Qsl4K|x{5C* zSvI!EDVy2=6Ezp6buWNquhUI}XLMS-Cv+WbA(ykDV`On6)9aedDC64|wM9&O?@3CN zcS|x&eH_zVoW_`QK6*NC?Qdgrgtp=$WQ}aw8${XpP9ha~NyUlADPq)ZQ-N7-AOh-y zEGdT1D;Z&7RtpuKaTkI#s;fn)Du(Vm^o#}0w!oOGftaW-LSYLt7Uo5I+MU}c3&rwL zm|^8nB{12CU>o<7p<4m@rfgL@A6M$VZj)P>@jcmxqGJ;3tLf6}Qu%%lh49~k7QYgv z0I7FLiYT=cZH)Q*&=~|9$o;^PvOqX->TDtP#Fr|U+sB_x9nqq17+^DtFTgEM*7m5? z;a-nzO)Ld@7K5eJ;Y~^uY&@ag=ccPXF3rC9a+QMRYB_0(1QALmgPpgn)Obu=eF*`) z+e2P_jH;dKy9@2{fro=W*LDrQEoVWWrmwd41F^+f2g)RA|B3YIa*k3n#8+|7Y`@A) zkh!B^Z`Z}DS)kD!l}|xP5muy$Ph|%84?VN?-fuw_&<FdxS6|W#@`7YNM*L@;(}Pv_ zg?YuZ0hkza>W0uUxBQwOo{h~<*H4e6fL9=o0)VfHScR#X?g2|9XiDI7VPIT1!nYsK zm`d7{fvj15<QI2@1s#I2H&5@R<>L^->`s!QG5Rk8si8jqrZw=P{<NzF%Y!{0C;WeC zBScLpvIijhx6q39R}LCkf_#C?CN5N;3q2;nUG+TFr}b%rG)f^$NJiO2Y$bRiE3Y1g zxAKr2Q|x{G>US6G$z(q^D|zJ2&hp>amd*dzbt+N+qLf|X`j)lJyxdct0l>?Fa4VN> zt=jqqf7xcG;k7JxCBYDQ94qD!njN%AP7=1K)CFCUE<y>T+DC}R(Yp;RG<L6nD|%$i z)MXRUVqzezd7hWKn1FgGUDe0tvF%(t+|tGoSBG_k5sfM8?J7d?b!*<0qp3OYn(Tw* zN-y=l>{sgDARGOKnRg%hMNS(4!4o)QFm7o{l#{u#1fW_KP(3}%SwxrA8~S~m?gIyo zzE%74CF%uXrVoX|R&ZDxwSK=90=!tcatd5X-*IMlPP^UlhHcuJKabah>6l`M2lGi{ ze0EKKc^ZPb&C4(s&aK9a?_WjDvwrV-B4_OQ_AOW$C)cvHGW9;@kKb&fu&=)2maNC| zf^^3Ea`W>EqF%XGU;xo3LuW<BV@#c=esU-M%n28r`YNheHhf58De4EXucKuudjdLX zo7~%i?W?7IfkUE)_X`@>bCnk-(Lk6ILuQ5vS-qC+$5&Qf5FfpJLKbvm$NxmwO^*Bm z@`v7wIp;)?h^e*hTih<0!X&;s;1G6kzUY4ELa4`q<%)w^*p?!6-M9Id&QMG&dHf40 zAR^fniAF62GD-4p+aX&pd-jNDDT00iQ7p6aX#Xt4zy~jW8UV?8N_=>{>v)#zNu9`f zD}pv8zwZT=k$3F=%4Y<`DG=^{X!J=ByihbPq#immd$cX@3r!BYPJ`V~GnTVE9OG}W zQ?2>0x&IOH0fUldK0T+f?R<1L=;K0h%O=LD6;}8#F%%Rm%Nu-?NyX1U&GlCdDmr?5 yP|E)?c>(tr`+@oIZv~!D1{?lgCH}pFeiV{F?ur{4@r!){Jfy_s#VSP%0{$0Whz98Z diff --git a/docs/resources/vmCredentials.png b/docs/resources/vmCredentials.png deleted file mode 100644 index 8ede9bdafdb6bfd61adf388e0891e1ba37666e80..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 142298 zcmd3NWl)^K(<c%n5Fo*w5Zoa+1U7`=7CgAS!{V|?g1fsrEbat%cXxMpzm5Fgy1IJr z%lqN#rV5x{o_S`byQk&XJptdOMNp9Nk)WWUP{c&P%0WTF8ACzAzCwh7d;`8wLxlW+ zwv!Y20#!0hxCi<0%1A&;01B!+4Ea$94)Xc6wWx|66cjea?;mI}Ir38|sFxhEuL25A znukls-xUm=5l*vK2WJPp)8DsSQ<1)xmCR|0|5-xqo7iAlVInTOog<lc*v~JaT920N z+?TDWtPwKEYqDEtunr&p{uMo@f4@Iszkx0g_uI=3-%g5733G=OWlP%5C);6OCZl2J z5xnFZ$7KmLNP~x34HKfq9Ak$p3<}CPE%lP>PY(*p6Z#eEziun}|FBEo>gw8Hnz80{ zB83MU8QSvDDL>ooh(2@d`LS}+#ymqi3xa}b2nB-~G+=+v<#}zQx2ioB<OpziSUzpL zIU>J7%b6cl&^V!Qcv!rBI6QwiksN**t%8PXK!rj0vpk|4KR-VNjq0z$f&Irae9L#) zMmjcV@(idjkH>JgOE0%auJ$b}XhGPc3Q(TIRG5Lg_<zP#$*AGOyt-Yge2@>5H{nCg znU4>|FPn{<eUpHL_W-!k2K~(a%~DA7yfT(pZI%A=%x<>{!(Y+*@|*d;+xNJdSEx=7 zkq<zyP|M5&7St~J_^qCha)~;3iypsJ87c;qbhcUd4`1K$zXWzlpC{%ji>*h8(c>WG zO&gdl<PxgSbLbS2*fX2Y9y{Ze-iqAEiEw?M^^O00ADPj*R}?uBSduKBy)gNxKSY3+ zm9|vX8sDjZtvxAXm*dZSJa##CJTmyDHh(Zj=Yli2zbP`wyu!A)k@vj04|!JtJG_La z`^jP6mpKt8g_NKF*$VVP@W8Y*&2F>a$<%ziPV#cwllFW`mH6t<j?hFGU=fsbfa?W5 zBvMGWHKlZPhA~qChfk@YOHRzr&6ey+Jb=5^?%BMj!vyijQaO_oLbkmu{U>wtE&Kbx zY`vYJX0?kMswI>j&7#Pda4pVnN+O!z=p4Ix)i&aRyA%HVfhdpb55i&ry*6Q?x!euh ztjJ4?AB|u{nBMC|+iAU6peM~mj}?UyP0SO`>G_QI#WkDq?|G97EC#yHdhaa;Vue$D zy>oSOK}~85p#(afot=&FKhQU}Kbzt5#&g-MuRLFKI&AIbr9D4hjJ)Ihvn{8xd2}vZ z{&=8VxZ<fAc(oGlHgT#nqeBSoOpg|HtM9#&e#%mODnRz~jG-3b=wbVebkx&#fwAH= zo=`Bb!qWr7?c*E-4RdyhcR%-G5mb?=P^I$RTqVwY@JS{(2lemhLc7St0z^DCMiyCZ zNjs=3ubXPaw#~fQ_)XxrV~fE-!Y=nk&eBddqBe@KLlZ*@%DaZK&XTsrj=U?+5R$Z4 zkW};=XF~5iZlZutDwJc1K#njiycInH&w8;FZw!&uSa|$(XzA$YU{Qli1byI)ryy+0 z^MXYfNAa0$OR{S26G3q*DJg-4f0It|XVa(ezY}s<+tt6!m^f~=tN>CBr%x*8W(S!h zTLzv#NbQR&0>B=Y$J;OsUCb30l@3NUc-?$ucP16UsY|LOJW2os<Juc3-C=sr$tyJ} zte?UMpHLL1v0hG33^3q@Qo<*qr-x*ciOF>X<&{cf$D(69-<)BU_f(wJ|G+#tglohJ zOSmFl+C3hm238KJ_p(hYZj;<S46>}*Nk|Gw=a#Cr9)r*QZrV2-I9n{#zA_=&8O8T| z5AAJ=!t{{Zj=uJIdAfl^#(um%C<Us~IkZ0WnoZO5M;OFo{MlYZs)3h}5YsYW!lFW{ z_BLa6%uEt{H*`|S&|(%s$Mc7W1GXu`3CCorr%5#Y$))zl@hYv=hlwKB8l0_E0B)&s zS(DpzvBmw=RUv%S{f=9Sg^S0%D-ZXCBThKN;&|&e<JCaVEgC-SO_O`<q*MpG-Yk#B zl1yV<(v*ysO$96H+BqfS)f)u#RS|Wrm|ju6-c_jL#m%2?2p(ilH_C+MLitx;%wXS= zr+(<`yGR&2)BlBlP1Mnr{Dre|uyzQa!}$B;y2akT>tw}y%E1KL?Y#Jj%q)Y6JOmzA zNtOF;i=v63dfaZ>r%()rU_BfDfCI@)8e9$dK1$?p<E{Dq3H1X*26sj-;CqxruT5q` zz05n}KtnV+_fPdEeGDYhMZw*us6;%SH(INtrhh0lDpi$J)b2izgj%(x9Pj>sL>t0) zg_1-fN{p0uvOH*+|1g2PrCxho!PC7w$2oe5=t^Hev`4*?Zu0RhhG^kug9?ntTw#}n z;!vH#6xBr)v+Wj^;jmBNwJa@nF5K0pxQ$)Ty<=CD@uQ-<)3{f1S|UkdUy~n;vf&Dh zG1`dyGPL&OJ;~Xr1T6Y>?h2tQ{eX*%MKw~oI13p&L%4efi@(bSmka-18zzdg6QAHj zAWk#G(Kum*<cLl;8qNq^)t@2WFX%I~!Cd16-W*R!x_A5XD6byb#&-qUKI9lcaj3*v z#rN(qsG*h`%IfR-)fMkI*<+vmerT`!P+#}S3vLPm_OykR3;s}47pBlVdDb`Am2+$S zf*`yO135TA6xqK<=(w|@wXGX87o1{XMy2yyUDG$XhdXC(zD>-BdyO-vl~-UWHkWLX z-Q;xXO{%VU?!I|;?#-F`^i^`sW?sfa^7j49>yzVwlJ!b_j9Ah8GS<7f#Kd1r;0gRH z#MQJ2UNNcA^%dG?0gok_2OvptExG%dtDEvmZOZ^(wT?%8K>yrhCsxF9W&`~dA~et+ zDq=-z9m8G_#z9b6qA2vmeOpvUW<;Q}hUK+UohGbHgwO3*2D#;DHK-pH-95gxWbnb0 zczLbQeVpi5;vJ5cZz&H}1}Mv1Z`imqJq0ox^%MMlip`}c_Q};5t>>zVRx$D?(!Jt$ z`miBL@1et!rGp!)$8sYHYeFvP;C8pj!S2LN|M{X6ECzOC%zjim#fe9K%`ymTr#hrC zT%oY>drlAckn!ycqsJEvGkn9T|C8D{SrZw4AR!R7j7C0JQeg6r@TDh})pfO12NE}4 zFU-Cah<v@}OPu_`L6GFU!^vS0-^}8kq_g>6btyjCweCP--@LyNT?*j*5&v_$sXUrT z4vSd8m`8BMZPL_`qBAe)gN#Ou&Wq1d1vbpv?f7O>LNzT$-pb+3^5YTuv_`iB83Xa| zWvlU(X8t(W{xTT)t$P4<r2~^CF{$TM)6iawIfYd(Fh$#^(r&6*#YR=?NjZ(0*`Kh} zuN<LpP+V-a=GGA1z-T#W0er_WSF=T9E;P??oh+TQyqq8=<5beMOwf(gL^kkgbU5@$ z8Mls<<yy?q*OhvhPn&b>OFQ`<tsJ7H$F-qL^lKV*|D3KqtafzA&R6A%mt-ehCQClp z%+#MHO2A?aAjWp3L8BG#KBJSMZREl2*-vI?HXA-)VpGJv7vtIaG+{|&RsxpXd9|kl zRzNRH%%81W7#O1eQnV6soWE=fp~HkX{4r`+vEK>V-;X;Uh@jp|?{@7~2|XpCk0+6` zZLb#Yf%!Fvi9n~TA`r>yPg5GvSguh`HMsRXNt}M!j>;h)L?Wr&z1Zl=UTR*+4r`_p zmk1my{MgL$13WupkhhCcTUQzggtLwe-QaZYFJ^T)BI5Wx4=rmWVEoQUN4FcUVyeHw z92`hTN*6(}C;Tn8sXhncNJD9N*h6kELTCtu9Gi&cqmZD)?H(pjJcx;Uhjc=!8ibot zM>{W*P5->z)MdfX`2<t7IiEOrzN4F5+F1VJZBP00fOwOa$CvVSU*8BgETi<TYZ-~? z3oBC=2M7cjZ2#?VLyfvuQCPRK+Qt3=i0z6eWnbt`ntVW*$P!z84{#>}pJ#V6?BHMf zJ=+gCD%;9XP$e3t3{Pu~oCKrTmkhkzWbVB2JJ!R^7!4?44|4brRzZM2KYjeUA&|{Y z*)RuJY2;St42T<=LnWa?#OVu$vRi|VaNQK?VGA3%gRKOeTV2MnKetbFUlm;|D#F{( z57Eq-H_2ddhcmt>!%{Ll$wDE!^>}q0H9Xc-_!ROf*YKcZK1SR?F`%zZ)a>VSxj|}+ zmF0z?P0b~?-N^17Pg#Su8slZzT{c2+#cHQ%;%D<^scRho`MmL^4p8?K4u`0iv54r` z7AS@Wh^D)(_rIptVvHj&qlj$pqUzPho-fpI+*3ukpGbSIGMiy+8hg8kulv_sUJ`>i zc!myqh^MSYB0e;axc2+K&^Vl<?g}o3ckwK&FV9lgCMm}^n_B$$j5o8iOJhqgIEP$m zozq%$l{Jikfi5yev4Y;NF0>V_#hpB_#jeCOr()lo7+a`cU}`Df2avhQN#j}_j{HQ+ z#3rI4i|K<ax~*ArSoEUV%Xfem7q3%~j_`UFZ}Ctuhr|*>cq&qOwVHGw(mH9A^#PwY z!o)X5KcR5FR&JL_Yun)C)6J~%dwEmkYBl=Hy~SR<VCqW?Rhb>I^L&B?d$PJ0UX#w0 z);tjhL`4OaSRkw3s-Ie&X+Q1BfbJpQ-_z66UX6>ok5$W4tR<PlpHnkxQN?G?Y;N87 z0cJbWVtD#1>b4BYdhyG*cnXP?n#cN6fmDoTK51ci#QOtUFgM%|6;;bqm7U=9G<Qd; z1T!N3TdF$0V!0Kp$6R>8u4YcL)YO+f0`-FzZwz5S&e>X*^3<D}>d`cT*a{~Cys%-F z{xlrG+s}f1mX>8aur}SgSPj=UQsec#(4cICxgmtsTERG@k(`H#tHpCAx+^e_i%9Gp zM+w{Ep{gtPid@D;lQ?b;%jQ)&DKd}@AuCEr%GM~li{>POfCF)3g9U8zQa#0d1u=H* zPF`msbJI#3h9B|Szn5vZowU59hKGC3LjT_PXUB=yR<B>FCGn*wWMqYX%VZN!;k|8c z<2R|&9mbMv$8{<Xy`s0rUcgBX6Swg|s-pvlH#BMILUdi-yZaeQr{QR<L$^+a1X*r= zeD!m~`_VA4Uu<%@@%K*bQ<?Rt;a*W>mz6OKl4MH~PQ9NG;qhbYX)Y;VxHVYeh0Tqn zni_NJ+n6qXvD}<KIXWhiXwiX#Z@$puifm^VKk9I+$xd;`Rb6X)3!BN5FuRNBX7gqZ zuJAe5M>vHgOQPs75oOA|jT_ULjE^>4YpJ=zry-ZLe)Y;i*^wt4lCht!Nm@qdb76ZC z82yTJE7dgX<skis+fMHxjz2a1G0n?UbIZw7UxcIDZa`~ur=fObdBVawuJj2gf497z z@H%J!O4j`2?XB_Ad>GS=pgNyAXg1JBzw_bJUKpNzG_v{rEB^z0267~hF>!mSv^sm} zCt3c9^-&Pz5Eb|(A<`T<6-_<>VFHzs5f^;H#$_#V4*V#qtpd##A3bCgh}V6$=L9A* z6wBI(3ZqEC?~}m+=>2rn{)EGsKEW*a`a$%;H+_$nV;9p>d(c-N0b|csY#R$A3fwJB zOXK0gGNGXPgawrY6!N+;YEdH;J(UUNv^CnLp(wgh4I_&n31*i-Dsj>LHg}-zMKo#_ zhNC2v;}5*ShMI9K1iMmo8Xm*%S3A{@_31xJFtc2}<`#m3{Hm^UISByB8+ewjU63Pk zT?%?Cy55DSmpc5+l>3K#P-tI&qXZ460W=#Y9*-Qa@$@zIx0}a;WF{;1G&WA#^tV!E zT!_W1*T(0K+uAZ~#g;;8ct5hbl}`&Ucgib2ujduhMJYz){rW-$aCEI%zmQtQErGs! z++1woGbt^mpWcftRjMehU%T1ulotb?>8*H;m{VQZVVfNFzHK>Jx7wY2aM6vl1GtPg zANKa1b}{(U2d@tM7mo^`(?|FxH!P2_k(A#b-uaX~>@5jY-ew%C@(WX%3(n6(^~zft zOjA9N?D=xdy4<w2@QJCO%qU{pEg{`j7*t(%6PYZ@fJoRR@>G7#{j{`6NOBRucKy{; zS59!}KIQ|4*oF1{8_7dS!9=HhLbc8N+Su4zJ!M^=_<oXDl%z(PC+TkKZ|=4(A{{BJ z9WsEvG`De$hh3>u>4O=iCok&f+MW0tQSaqy%R9TakH1<U)tF-dPa3Z8B`|Kj(bdM* zQ%Wa0UGB;@=&WwVX-P{<TiQ*2rq-AFtEYKB6ZCL#MVnqMN^m4SPhDsi_VJZ5mE+Bt z9|hx=-I_pE<?1L%j0~3+>m4pVaY;)WJV!XDO-zQuq|EjcklAi)P3;^E?0gueC%IT` z6bU?tb~D_8Um{Ww?Z28VjWSTfXV=a-<V{snSIJWdoD`ip_5(3Z@ZvxFSC1^0WY8b< zu5836@j~$f^x#~Rh2gEEEt0MlGr@o|I9(ZuFa|YS%pf%|b)v>Dk;?Yr+3>o!&q`cl zS;=i4sD)t4Wzw@M9Ffc`vEp#4I}5(}M>PFM2EFftFqAwV(44hD#xNAp2wmBN>f1M1 z#eP<h)G($}kl8y`R(V*+S4hl~$!({x)Y<-u1>n$Mzx5ls+vG};5S8f+Wq8?0BS^E$ zuB>{?uI+xe6=!VrM@~nHs>-{dp@3vWldo38UNQVdu6V>3j1-|fEi*M(J^zYx6`~g` z6dhH{i}3duN#B1WP6kwjDw7V#3lwHe)S>8mjML!e7pV0s`HS)p!9m_u9HqY8ibmHr ziACb<h@A=lcT(=rbttH3&)>fxEj=q8vV^}a{zvQocil&5c6Rpv0DUA7L~j*s_jrl2 z^B=AL9`yepTj|LEXb1)MKSuu~duHtkQ&lh9e&xB{OT2m`|8haax(>=_`bQ+7va!vm zP^TUS$1ftRQLPX8EwV~-a@0i`|Mh^L()4=k^z`)9lzpowbd$?f18`5y*_qotqtVr^ z>v}5dfprQ1x)*;GgOmD;UqS627iV>~Jw4nAeHd%?g7rfqIbK^ED^g~<_nvZ+n@@YH zrFUol$3Q4;sbVtg)!kiOeEj{xLv<~!mzI~Olk1~}OE|MLOdQVqmWZITe~kQ&b%03t z`228EYq``vFfcGQ6f>}ObFz~6pVfXgst9crke8R2m6f%yU|9MqBv77=UMg7scKm;k zvcc2oa2D!y$E4Q%o=D<9uu+@nE!XbXupSEY*)oHNWvgYkFYO9D$IH(|?*CTOD*oPj zG=MN0y1DuIiQ-LGAtTLwL79K<pXe0=N+SP-T`A1X&6877;9vx#q=q2AfV6yL4&4f< z()A{TmGe~?JSra7X}}u40fNV`FIxY`mcc_<GKX0aC1&LjRiuk6@-n8w_U`ZMTX`VU zQkW{xUTcZ$2s~2${nj()^Xk9dK}qhft*r?tH<oKQxxgVH1a;{)fF&}%ZEkI`b8w6w zS?(76XtDy3>WHHXF-T{M{TrqP^}mVQfw7JD)xQG;1yzipN(c-<j$z;Q`>g$|@;7=8 zX`eZNwhF|3+g#2!0@e9}af3$x!=iV8c8-*?+i!)c69FBHK0{?B=|p>&&`Y&su%eZp z&Ge7RKxITi;Jdq@Clv?o-fs5`yyy;BIL&v@NbV?q=SXjCU-kdnh0;dv=K9x#ihBEh z>F#3k^Ya7$jc!dOwf@ft%Kv#+saL1!Nlynz)DV1o*5X#Swc;0Q!_hgW@aNsPJ_mou zow0Fyd#m0646yv})ybWg=UNU3x}oS~Fv=xzGh2K6u0x$4z1c1$cw{W(Q`E0bpECY8 zS@g5lVM4Fj${B7e8Mz5rDE)HdF(ZM_6(kxvy`X37(ejf$VWWc=v17W9qe&}#4qX}B zY~+r~JgXG81N@<JxW^5S;?#9IZCpir6_pTi2lKQ2lU<2F%Q_V?lwv^r`XQpF<;DLU zS$jvv9B8h;{u_06sX$|I4DETA7zGuekRW;!K~3<`Ll)L|??F<V#8PPU-E5lL9!#~e zL}1WePGM@UJ&}Ps>`kSB%FuICi2{iL#?u_d^SO9*si$lVp(@W-X(_#CaQ+|Ow+eQc z!XQAPPec?Hdt2KE$CKrwg<99^!@d1|9^=vX<=-XkJ}>m`*S89|yE_JB?$%#T1?bAz zS?2eCvhk7GcT-jhox|v1GO`@6Dv?(nf&=2-ft8Ykfr)v<aY(bg<TuuG@1*`r<>~js z{uL^*^X9t(g+c{dJ6qe2tgMw46|<nCqN1N)GUDRmLPAi65Qsih7REk?uRM~}&MiG! z-KC0YzJB*CMpru)?KddJANq~-prY<IU8_L*v#X#(<jNoY<>}`KdAa3Evxb7g<!@bd zvjRF9%R)%9y*XYgQZD6SXAkJo1%5ZKrER`)m3POw%UC7o7Oa(>`0PTFZ;TVkc$D#1 z@X+{*_6py}4V*023vzOy5JLM=3J~NhuEQW)P0=jovUE87a=5pB+{+Z3F!qkUlNFhb zV{D0KPN8HD9xB5U1aM<HX76g8tLZzNtrX<P>E0?=lMm}?@kL4s(;)_g-6}Jty)2RK zP&Hu=?W9BYmbr|j5sAJh;nJyNIdT$zS-My&H^nV)x4}VK&nK+K`Mw(D(Ua_c`E7+S z5}VzE%{|A0Q1=Tz_f_Kk(wtqwy>RfD5(~$Od3*!a4a4*MKDkRJQ_JXMXACS`TXzN9 z5(<Ajh|nGKIULSr9MN@WQlb6XXH^tCN@#wb(MT!>2S*5D;wy_7jGdUbYt<Ka9%gsL zhz|0O)1DU(NOZF#?W;ygXRn7cvtUJ8uM69w-Q8e12E!h;+d9{p8PQ3drAt1b4GM)e z%M5B(Z${m*1#tvKv3<O&uD<BtJG|Z5uR+gitHdz+#FT^gebHn0OO#}MBklFpm=E9K zR~UXk2jZbROixz{AC@k;!+W3v*X{j4Ruf^pAcYl!yROdo;mkbG(uQ6@Ws54ibDb4H zacXNla=pm*`p}yStQs4guk44@;$S+5FxJNC@WD4#8G{V-_2GT}#G9e!wCdER4^f6^ z?iiN8`23r`>pvr7^m6%b1|r^vrJCaw{?&hF{#Xd8ox0_p-+!ZxK|wKAU4fGuHi*o? zuz>CO0yJxVjt~@OxH7%3zi@*oS`!wyUz@U17IJcDTYe$gcmf1!K3)lpv$l+!-jThb z>kdBY#L_XB;<d2A>?2{hv1W0V`UyRDHq`WOct~p9p^K6C<6Rq!RDQ%(j^#2N=O<F{ zk(28E4vdfJ{HH`0=P-$R36}xZR0cx#GZGzrY9dVh{Y}*?w^*rcK0@1J57rH7p0d~{ zYOE%+!*wjKnuM2Q<Iw}O!ke7##}7jcA92qL1ESo7Bs;dqf~I=*USxkLw^!9av}CHx z7i)Hf*!Rh?Pmlghs(Er$Ot*T0!Qe*T0?*|-o2-I@1;=}Au7*0Nw~V1+U{N?%A!}s6 z6Y}7&vA}RFyPI=vxPqv=Uvu#lo8~Xt&ag*%Ni{H5%bfe#kqURu$YM^?n=Db9`_(~% z3d5PWfl?U?-sd&DJb9$L5LWIUWYJ0(9IY&8wX>;3*q86_Ma9m({*5a=L_6)+=mAV= znNljr6<b>>Lfq;eLj6CPCi;H8Mqf!c67@FFOnm-9=E?{s633`KO77dI@@P*x=iIV3 zk+c&=czE!|60ZI*+43elku}g^=Bnj^c@JPPRd`>KR%><Vn~P_3+_ctWOnp}sgGIDa z`-kbPq`EO)KE!-3PR`E1QIEocf`Y>J?u&zE@=$ahRG-i5y-M^_=v?CD`@x4yHfF*J zDP!KrV7Xs$vY)+S$JdY#?=XGeHGksqTyl4J=mw}I^~*-MM-hm%#rytZGBQY>m=|O} z3ez5VTJV@DNo<hO&x>U&F)P_(9lT?W>$91^V&$gv7JK%AorATcl^&T{CUte$G0=B{ z37C|am|rJ+VU%7Y$(3@kXfD(9`|vGU{h?ngZ_tV2**eIMs>Z`g@_V^XhcCkme-%f+ zMmp`o$n_CeL;tUV+bC~tg(hLQwy`NFEoGvisduftE8qau&}rGoY-qsvp>ANb!=q7l zyj}cN_kfg^-qr2s^+Lc)Ns*E$6?f<1#xUg%Z%}O+6MZs80<m$HYNCYGj;iauGNA=4 z_mhX#;5Bq08{3}JIXii%Zx&|Fm(H~Gfx7LRt+@JT^;cgTtGl+zie%I&iKw%E@_I@| z*Wkn4^nSYE;17;!>>nH)NGJA9u24U2<!MP`{&n#lBUDsY(;?bOQ&ZE@((>x+3JwmA zR!Zym7~HJ7bfB)Nr7;A?%_}S^RW{NG1*oz19|mJ@vO$c+n91qIqBb-svad@Spb+WC z%vWgBUr+e4Xt#+;c`%vHr7W$KL?hc>5+0Q&(rLbJMlKSEF`3`cDg7So{-jQyT3Ol5 zpH!mKJ1sl^*bKD!c>d`{eR23qR;~Gy-C1EWDlxZ7+X2lERkfWo!bP=*6*)s_U|`^# z_CUf%ffoT;D-gO7?c-nf2&6uZ$+bIInFnb}Ned9)(Nahj_KTv1tW8XQzU5Z>LD3YR zTERxrZ&@--7bF*d>~{Vrxnkn=G#gU1w*w@Ack;j`*(23gsHl<}P!@^0!>^-Q+d<{> zoUXHqueU~YRj7u0sA(q5@h~g>;ZDIOc#v#f59N36+jVq)*T%8WijlaYY&4dV?@e6? zIc8)`sQ1(#_A8~R0>$pQP&}M}0$y}?SPz!->#d!x{ERG_gIjOTs1yIX+-PV;uL&=A z$2xj?dWMF;B_+q8mxnZVA(ZFuyKe&`Tf<E*MBX^)$^-p`^oP*S$--_7^5W8#TS^5c z8Z_t+^P!Pd(TPNf1B)uqm{dK$KS)d?%HG8<t!t~|?#X4)_5!|O3@WP+3Ms<$u%me! zmv}ck*|=h-zHea)zpv3z7q(b0m#BSw7+q#~9mPxgid5b@0?zN*A|(g?k60JSLQK5N z<?b3pg4WmNG&D56fA`OC^ZDv0iU}{7bV8*Qj1n|E+NqJoPdv7d`rvgvLe+Dm#ZsrC z$ExZLb`4XgEp$u+u+iK!iEXo2fapEOFZ3Py<_FzfU<nhm)`~85(G_1OJ(QAjI)WX6 zxJTEjwvz-bz$kWeuan*}4xkTJbsF~W7p1}y1KZaY>}x)CfJR;<@?)7n*DWSCupXj| zy_nVC9P6&Mi<48h^!}218o#@@kI$Yjbc}dRT%6;>wMD}c%6}Zs$FnyJXY>1G*-<bZ zi;`;3&cBYK5Z+AOJY67@iR!)jxStVNj&*8*vRQrQ;7)#?2AH%gPvhFT1TqOTjrlj9 z<aPO8Jm?>ketCB%;4n<LyaQTITTJBg=zhM_&qVMwkz;3L`Qp*~#h__XN!Lj27Za%^ z_Z;PIts(oQaxd*Zo?1ZEWLGGkg27p{l#S{I&BvnLT<MuNX4LEWOxC<R3J|}Q?*_YN zIHc@tqqQiBhhWzTia=Nf$5GSOSz{mmLACtZM14J}39%FnyF#*NN|h}^+_W(0?sD`~ zGh%$Cplnc7UA05tg0*=d(|@Aazv0WNby>3t)@mDXnw+SgQ?$md9Kf`-q1yI1mJH5Z zF}a8p*+TI=&^sDzmo*&jg|*-hzOHP{M3$1bLizzz5{Uhva}sD_vS{rCc^F(yS0pjs ztln&B;U&QIY|&Hi^*V+&qx0t*o!zYu3QA=OI4^=!rmea+E03CP=(Tp15xc;)Z-*eu zr}3dYq{7}ZA2ykep`y7w4u+NN0Q|CkaYp4bD{x;&EP4{d)2ZJ`HLGdsz2QJPx@}D% zff1@%6Ql+S(mtzw7YTwbx<Ih9fkGpx`WxXm8D~J?jH+WfloegUiK@Q=A~7~1A=Kvs zkH{tMmzXz+gfj+qLVt9|=NoN3D=Qi0j14X>uF1*CQ52|y87F}?R?<a{bzEkT^Vz&q zd;)I&yJK}0_rC$<bMNmsZ}4oxuaumS?w4$7<fY@y)m2Qx1n|$QZhbmd{Zn9k$o?v& zRuWiM!ax6j6y%6Omhrd!AKg!rZf<V>Dtw?kS^jU2{r7|ayKnhEefqRZ3nU~VNt1|U z91F1=R1K}<jX)wH&{d1b%+FYu9`5E;&F)u<?%TcYAfKIinaYF732mCY8lU8oxVY07 z%q+<A6+*MMe>=x4snVZVsb<0hg=>KGGG3W+{boWzS><tHI!l?=xB)t^b;%AsD4~&7 zNNNu>La|AUdHFl!-PMF30+^71)%Q7Vv-#s<sLmz;#I-wnqeFI0F4Dj(>3%;gR#`Ge zA1ixOHn-)j$qUFk=>7pmaTLEzr5|4?Pv@J$D<cn9e)+Me+&+hH-1}fV=v6uxO7zQt z)}w(*{?B=mB1PXxPCf2=-kiw$8#t<Ei?lnI99-sqy`2ph5S%p?*O(s8dacM8_X$AP z9;1VKchJ(yEmgTofXimO<>UyhrdQBx11^z`b+!yS>o~;X)w5+wijbX()+)8Ai*QN5 z<#O+H`84jhHCWyj$`M>aZ$C4~w8@6o3WL2UlsVg*(RQtCbmO7xP;{)j4nQ8iRlb}> z@h3Uhpm&JniMrJo`f0WEq;1+VUOkX{ZU~Bf;xZ@=j_^HB!E5!PH+Y$=q>dZ;&BK&l zNH7RNi}qJqS}H3mMalQ)DtA(N9W9p{?2qQFySs%Gvv>to(^+R*K+ji*R5jzNHNe?D zLQ3+zbA13h*X&1=X_UmSkJqI{$z1VhgoqE$q7R6wD1_w0{Cp|yGD>FLyz$oap(Yc) zPE%>OqIo6D(kvU-U?e+ov+9J`2P@0n6p3w4tM5I8_ua08+~nJ8!mufrN64A(-WSU# zV=0{G+tB&l=*1@)wR|cU9_}2DCpuczwf||O`E>ssq^4-Hzm{{y@QiYXvcTIVl1?u% z=izW*k!YCml}VD2m7z5ie3f9wXqh2n<<cEfOoLo&*)P6^UY&1dGbD<*J%hZ1VTV=C z_A`CPyP$9OdZ|bC2<RJ}cv`!LdMNHn>(M56f|L6C(xD1x)^?#EU&ZFxi=-sga+QPo z5t`bzIfQ#oPD+``^`m%g!fSU?%iw8-yg41IZ7*k|7<K$E5_F5r@%H6ORX!&&Z($;Q znf@hQ{^o8lezWTYQOvLHnO{MDJ7yQgksJfZAG&i-`s2uax)^GAN$;Id7TAttZ6p|6 zZb#^|X!*G}taG+|)s|QxJOd&Y;cc{bbaV_1K;m3Y@z8J7(c(Ei2x!<rYR}zpAVT}8 zM`fcsFyXOL<COdJVrm`BVg>lS5QbXSv81XZ#zQ4PZ%6uvse=1A1nWDxJ<6dx!^d`c z68m#$v~xc<3`I~RBd6>PzH7Zex$tc&uB>@17qC~lY)#7a$L6lrM#pBsn_rDImU<3- zkJj6gg^jhH8Ou5Wxr&k6hNW`SUcXB;{W4<mtUl>UaZX5@QzTq=B}q}s%mE`ZvkH)r zc3IX#beBr%Xw`nFLGg9tNp#Y4YqfY{zsG!?f;Cl*`$7z4WDgl@8xHTsl(5*omN+?^ zo=ugxc|rk}m!}PRa;_`tTlvM7|K^0sFTGW?!BjFzJfq1kw^6-tco+-CEt4WKQO1w> z*YqBBuNI5NkX6s@HRa4%L4FLf2t!7kXp)fQyT%Q*zB|sjG)s?RH*cEiI8a}qA?TW9 zcYq34?tBRsAB#s8_qRU5SHj@R2ZNie*S-h~3o9v2j{siWo*(b__f0dt?H(U5S5o;p zx#2EtZXjY+)Ub0JW6V|G>W~OIQAoO!<Ofr#uy^g~@f*k(x!u;En27uJ6|WQX4p=>h zEgY)mOpz0}_ij-p5-<nbX`$N`Hyad^`S`YwIUB1xFSYM9Eh%csx(p`r$#Ya+7k}Ty zlU#@AG!xY*xoJ&rRxf;)Lxnax+sR-Si2<TFI>?8aIi3ABw6dA1OK`0fQy5@#dh>c` z;`?~3wuo@XDx<vGWnc;mX?qjr9zZU>#>4I-cLBRAwk3ZJ>xG;YLE+q+D4T0cz6hzj zihWV>ivkOtmY{*GqDL-wMYB1@;+X_3S&b}ogs+@9{$7deTt|G#^i%=%EyXk9!MtY9 zJujITiCTc+r*gSX&a_qhCsNhKk)N0wsa0~<C_=~YDntC>2b+Sp+`h@Y$2?8Sr7`PM zL3%ZRmV>P@Wk)5eEZ=7Vv0b03DidjMz-qO}i?RSj-T3bAZnK$^rAEh62uj7lv6)2k zcs9irzN23V|Lh#~%*yK2S{SX)URIE51`8fFrC)}N4%sX>l_%38m1D6e;PLiV3#W4a ztp2=kPbe3Lb?Yo_x5v;B=fKbB^9mmqqCeG<B*y)|8e6J24l`eSY)nZ(fAGoH%`M5V z3lR)%fcq(An<X8cOPuO>xxcq?a~pV7y-<xXoIAoh*sM}3d#z@IL5AWy`JFD<a)17+ zNW$^?d;fC^R=r5@zMwqGrx@>t?{xULl$bXSdYnQKTMS^N^H5ruot>Th(ZA7={bjhi zD9-FAouiMGax+T4G)FTOFvL($Z$rR&$vJ*LO;0Me|1?U$xsP`r`L4n0={Vv-e#L(b z+4AazJkH%@*o^#QG<(r;sxjmN7~^iYlLW!0cBOaUhk8uhNnMSv>%@1rG+uuR?ZmXH z+EMFS55+8C#c5*iGuB&=R#RV1Z=N62BwQ~id3?Y%JIQ0ZpUAF>8W3anLJImULn0K> z;Y-oPb1_;mr?0}Lvq8P1eIJ=9ziN4%gJ(WfZ*-epc2s(iV07$3dI<;4y%!XgTD^X2 znw>d(qBHlyao&X>Ddbu{KU!miF*f1@mYCW;cr+MfJc#(lyI$zd;0@Us>bhCR@H=Sq z+>%Q+<+c+Fj*EAdzQ)tmjOO2BQ)g9WqAb(TfjWE}y8tl56BTjtLPbhFc`+F(Vtjwz zC#TC}Ifbkuh|sjcYIk|TdVSV5Gb@rSI9_TLiCPUidQdqK<AmnHTo0*5peRccMnDdh z^ssm-?CWrUcpXov=p#2ZN?vC7Iykjnmw!l`)Pw2~0#iBD+gvLzsudM7;>2NU#jv91 zt%?=JQc&QBc9Wh<gg%%~eFgBURTy!!4I5Yw(wSlWd>oMUsnC3CPQ<*@u?|`^UO7-= zpQ>yTbsQHzJSx8x<K-A6BH8`$Zah-|#|Mm%P`mYCvvirnNH%xU*ZW`J@E8_ibZ!Lc zrf$L;M!yP9dDl%*EvN`>!V4yjV?5d%qdDAOF2S>CJ5F(q!ufQSUs<N9<dRc$nEPe( zJrTddmW0<kHXrOY&s&^a#+S-4ABH`}VP+299ZwUc;9y0q^TXtoy1)jRIss;ikCR~s znl?1mAtQT3xyO0mqO<fjV?K^sYRT_dsc2bIoeMgsw7h)N^Dv=NL%zBW(0{qQIjb=+ z4P-pS83-0WZ1@5D*cXyT+w|US0Z6NH=wv91LWai$^jy>OJf`P8L8>1!e}K1}sp6e& zhy#ksqWz>+6Ti>P7jcH*wVu+3U@sp?vZKDfeyIiYa({K;c#^5|(HKJU;c@11g$AC7 zgPb*zkeintr<bq~nfwdD%(Bdoqn!(!h!ksyeuG5A$wwO!=^G5@{&jaVN|XgWPQ#HP zAAZ$DTa_;V$J`Nj5YJG~_D8Nkq4zDfTkEeXc1}k^duL65^)i_=6QQ`@?9E-eJL=oI z9|p-!`n55w<&D_jF#ydB>Rix@m}(}6+%Emmw$TjfOn4~pnt7_pXgArBq(-x3yK32L zh57XILJ8K4J0>;MU*^Vy5QZ6+Tt65tv5bo?dz=<UrCc2Z4u|>jAe){`H@6tB1WO_4 zHA`+V*6;Ygze>}+%b_o^^91=T+&I?fU7B0a?9`g`XH1NGAlX;Ev7P9X(V~oiZ602M z;Y8TE#YrWFeLt=7DLm)(_B{7!0+PN;7p?Fiw|KuKN;pz{k~6o3yCwb6NEfqZbgXsK zlGczF-d1p{RatpCd}BF&vqfB!AYBK3jqi!D{=`7Y3LDt>z~?=->e<Dc-#Uod?4CsR z{aYs&7Z+F8hldBiStmx=r*lyOfi{Td-5pp;XdUb7^0Brt-&#xTlue0HKv&gv5WcWW z1VtO}9RAR#>A%=AW^%x}+Ed%%SB}mqSjV0`3ga!e<XqY(XOaSWgAI$2LK!ud)v<<E z9@&*Ajyc_2K>Rrgk2_PcBF*ay*8}_0Ihzqy!*V0r0-MD7yPU!eWdQviz$l}bilDnl zu-5y9+r8yQf~&&)NIf-<=Pwu``*p5@;F%(UO}XB{daqs8Q~#cD=)<t{OkIx!&yK9M z<wJof{X-^WVxu!li!Y|6uCR!Yk49tJhV0xcj69lsGQhlWEj~?AU(3CTPt>hV8Y*$U z8mq@Q-VJy#K_KxFHjRGck|?vi-Vd2in3!<}Rd>Q`_9gsO1_zJ6zk2MNSYwBl*+Ay` zl_8mr?b}DHLTyEjik-{|NCvdIH?85}+SeB<&uSIw8aetds@K$-lR<zUge8eKcH1>O z*Q?loO$QchD`iSoDI#w_$Fwt;hVbHKwoDroe|A+4)sOwXkI2Ir(87uP5T~Qn$56@( zR!wc;`RSptzMh+#dv132a(`-|t4oNyq6%~f``#uR@wT)9CV*^)XW^As*4ND8-e>e$ z!{|9YhF+6v*~GL;42QWwEK;xRW(o;4NALiN-UAvcc}(N_rQ1@iB^MLf$T7Jb(^A0H z0qYDAZ^_eTb74S{Xh1_xR9|z4TOW!YJ8zbqp)mFR%)*7C<lVt~$R2}cL1-gqe6J4K zjI_JU!-0HHBeH@4;OL|3YpQ$tBp%zN3yf<<#JKt82zQW2T);Om>oTf(rKy&jU3-#n zjU8dN-5s#<oYLkA56uk!Qexv~q#5UoGA7ouxNV&;>dd3f!QGd9v?M{<@5bg%FQN1w z>;XS{bAIjzkn1aZP=vseFGCA&ODQO5(l9U-ZTf=c6*Xt?6~}Ba7+Nuf;>4411wMzj zFp$wTd~v}$C6k{OD>h#J%)kL7YxVRqNw7UUb5qxW9gk@hF7cGvq^^PgDlpInF@?|W z203e58YO_8<z>6N*p4R05%-}@LNhIzO>c9)7y2Id=O3QvNqPA!)LI!C8s^#zrvX4u z_gBsC52*NTqVzQ-C0U~d$@k&-(ZAN+cv_ZXjCVkBHkDD*d-Qhh^$FWY_xCn<lMQ#X zsd6~ya4j{Nl}X)>L<O~ZwY5b)V3e%7J2O)EL#yB)n?U>b_E-IM&N+{dXTq27u0H^N z@R!SrluW5SK7<!7s7Vs+7qOp>%&I9h0@6B3lb=4Bgs4()(O$4SCm5o<nJ2DF^F9|B zw)=XZ6dP=2w@SfojwGL8Z@K4HX`@9bN+bU|*{?^~_CnosHlT`wZlZ1*>y3PB+zK@8 zgtgEMR7{Sw-RFIJO24UZ$AdIR=I+8j`FFEw;>D+q%Mn2g41<hC8^V{?H`lQZChR$5 zQ%)R3=~c&!dUQ4pH<u2MPSk3U3tmt_`RVzDvW$$3s;WzfqW_X%-Re25`kCMOYU+x% zxgou<bUT-hRX|ZgtMtE-TN5~Qq8ty8=7u17x}~qJRj9u>>)NIwUz%UM2XnPf)2NCs zIj<1H2^=k!yub-tP06s`BbLO!M!9SNR_KwVn(9P#-(?p@NztbS&k)ei-UCn;*z@hx z-;H@7(I!Z`S_W@q$3b_@x{AaTQkB{q)Z)zQVIu%aST9<>r4xyW_O)bcJ8G)y7sC0e z&|2BpBzwpeCFZTFD#^-XY<zk=i}efK70w=B%zt&>e;vwij051c{o!gg7uFM7q6hHI z^<xDhJuXybEVmQn-MC$Rcz{+2v;SQyvgB0_kLpxiy?Lir3NeJ&hs#u%g%D3uTtVSN z>qM%sRLRJ^Aavv-Z`K|65J0@r&Y_)At&6X__TXj~Hed0S0TF`r_5#s_u_xr;03{xy zQP2ZC!~!WO6Y(7*At#gTrh*B_{ZXE~1MydV1gd01ktFwn9)6PSCf=dY#3dVtjm+@C zcyBUlH})0cDR!nH`MDjQf96v!B4S0d1Z9#aP~kU?Aclk<U<=)H=n)Hy*2Z;xc{>sJ z?65bddp)Ef5<G4JOqYu7!k!H7n6X#2_CKO0a4+4b#FLHOJ0jA*4{69cpt-XTo~3Hv z)z4j$0ftAbU+&Z8O}Q)0i|*r?j~wr;<LsD8s1f#Z@l2*QrN`9o9h7o9xJ>-MX;u~v z$;utCw7ld2o&q#XjE!46k<x2Qv%Mcrk-|>y#f5BGO!Dbp6VB+mS25g{qu~Z<49GO| zDha_ke>6ULmv6@t(O15~Yv{r8f&-Xqz8P)dq(?e9m#_zWJp`@oGJ8W}YT_B^v^_mt z+NR)jg3bOnr^!=oIKHS6)YlgQ4(G2O^iQBLIzBj1&&#y2Wi?^3IcU^nkD39sCDgVF zNP5cxNOO!92HIKpXk~CB-{*5V-F_@!f5M4%xW>UFJ4GcPeQKohM|dTT63ZN1$X2;j z=`<T82K6O_ZHd+2w&rB$xhUV#aR#v;WZNFw<acc;7H`g6O9R>Z_d!)y1U{EbYkPZp zJ3BLD<2suS_(m};Pd^P8VR7iY^}UbBG1(|jNoM3;*AtQ5P45J2c|<yt_cjxX$jy&i zA{Q5{i6?o39b6f>3yDrV4nT{7N^xVXEB@Q^4WBi{IbOGmwo^8Dk<?E<-}y)={kW24 zKeeEn7i!oY!t;TY9ECQ^meRW<Q#x?77FolnZTKv+RIDHJ)a)M+^YH=;Q?An{QptY( zQV!dfsHGQy;P1}DVOQ9dNtC`qhu`?J?mUpXRtPxK{lyr_R1Wz>s=p1yJw*!OiyO1^ zSXYtJ**e3w6!=Ns8kKJtRf_ldEs_GaH?u`eI?1Xwmx%W;cpWCM`<ALNR6C}Ebz@pb z0JEJ-lYE!KxR|kQuFS3}iUxa0yt-_G2xR8nTB+7?h!70^*ZKB`qWx(|2r$ZUb$WW5 zUbOW6WVwmN{Zdv<ZQf)S0$x#*qut`;<9j?^%{1_Q9CE5%-`KF*8>eU(3sD)cQ5D^f zwPxl>=Et&HH?6OMA$7f(G^8vBxe}xeGqb#NUGF;#AmoS5GW`ZPqUGk{7hf85o0^>5 zOVmLTg0Ve0YosWgs2xr%O2Ab3bfkUQP70J{YTzUV80%WhyB=)pxrILg`rHlbQjX8c zwnc~nKwsL`mv<of_QY%sK3y4It^~q}saD4i+VO>HfHwg5P%X~1J1R!|ht2PY)+P2l zeXS|}g`1~widi_mS2W9UZ)=kWrYXZpXPaHvR$?>m^M15=%vSrTz=!a#EvFPT#?Pt( z_Gj@bvzG9LhHF`<LTYERd7VmApR%LVpfdJC0~fJ5V4fr6JOEp*_7&~6NQ-<%WwWb9 z9X-<O#JVHVPsUs&%i*#Z&m766xik9a565~Ku!KO|jGk_xH929$%cEv2AvUQ2+t zhSk8NK5@KbY?Dg1SsdTiP^xaBwBws{(5%CFX~yH_Hp%pgQe0(u<;E#5jf95XHFBaZ zV~Xxf)`P<%mVy>OQFT4l`tZ0V2AOb(3WvW#=Ue~YEGw{9M2<Pn3Sr$E6NQ~}&NCrL z)Juh-G7AaCT50if3K_~0AFF3r;Vu@D!F9?U(u<C3PoddB=JKY4IX{tecdESE?Sj~g z`eZGmowDrx#67HXh=?2gct780aEn}bP!39VPz|}z*~M%=Qmu^h1%c)7T;zN&kLvFv zm>@YiU*>eB(MV!qVrFJ0G7clKBOm&cafR7ghmw1|EhIGvUMa)UlbcfRV=_8^aH)1+ z(4dYCkGuT|pEH>>MDycYX3Q`ZL@a{7@=|5ZzAWD7B*|bYM3B;$r1~Z)SIStZHj5Fl z8%Me4X?a+I4Ev<cuQZ>gVR-K;Rz7a0)g8_+R61naT8V2$Dr07wJ9|h<`vq&>4RkL7 zY<LTqKGokqOL~pTVzTE1HFG6L$}4p!HJRU;-1VxzQ7KqqocxM1PtJRS9)cB(b9@L% z&h6!`3eqM9O5}xnMfpC%${3Y2BEUN1!;)A}u7<z&IW47f%Uw&f+={2{u4jc7>roP= zxRJJNXgrx@hJ-^&ASX`P=pAwr$<vLlm9;&Ol<6~8RvN3`1Pc-zxJoAiOW%HIwX|j^ zPY_M>0N6PXsze;BpUsbEulR+`>*#?oK`QHmAX;-ap=aR6^;O%%>NlXqtWCs#T8s)w zPXNt`X4avgRL|2@3ClWzYTN|zi572V7JpTPfBn9RS~aNJ14*wKH=1%gGg>YbO<@z{ zfTh)7pmOWahIkTHiCXLO;;mkEMzgZPgp|dIWExlsKYJqI{w{PdX8K*Txn}pIMDb91 zJGPsylo)HIPL=Yi^O<yr6%NX?{!mx2&p#<9&gyg_*B{{%zqdX;Q_~<-RmTr30uJ-L zn~bHPG;4hY&SCS%RRW&y-?@b<q6S(Z5>U~z1hcB#IMeX7JGRP#xeJhcnny)Xvi}+0 ztBAf-VKK@eRZZ`)AbW|IiI2BERij>BMXA8J;SZ+&f&|1wXvv-nn;;cZbKrLG9&-pG z)BzV4`+qHu5cE0f8iu`(IK#yJsn*gfp24(NLGTtZ-J`Ooyic!Fi|O365xQb(#SXCS zD5q%-E^MH`=~*(1@;H1v6M(Fb7*dc3rG1qsVrp(+vY;IZk~9Ih-JF3uiWC;HcpF_^ zUB$(WTdD7QUOpwOI?0cbTSI)dYhurUC7x99XGw$|GmDI&ITC&)rLQoY*B$H2GJ}(f z*trxQCLc^&(Rpqw)A)CmA>xtwLZ~_WoDWTBVuNYcucZ|r^840WdPjPfK;Gw|f7Ow< zdjHjhVtx&&B>vm}UvvxpTyp;zy79lOdIu`GH9bLdIyp>sAVIqPmCd=6(c{MQ@HLFD z?4}!mot(55v$lscR2jasSL4nbY*t6bz{K&FREb_i>Rn{`-{Aepa2a>eKxK=}%dIV$ z6r}Wg7ZH+ZLVAVDBlsd?tA%IT!wgB+5&{n&%HFv~l4;=P^1B~otIQZ<59B+}9-i}; zrld{S>$Q7FI!In%e3YCj!0H%I$t%zn;(27O_yIhs$on;yW&n_$qtnaIa5aK2i*cI+ zUDNk(vF>7^Aue*cmccgW*3lFxC}3-d_9~w<?Xdui963G!Co7B==ROwnao1exTQEq$ z-*z}>pY$i_`4Cy)8mR1-RBBbd-KzX6ONaFK$3vD=>bDNdXq2`RPt&L;D+98$)wMdf zihH#PvDiylOna5LR*=M_ry@M0M#@H8JN+BALV<#_vvaN0N-h(S0J3fPhntZW;<Zkt z`H5Im-jt3X<Ql1mB86^hltT>ymEXIct9>vKF1%oM0B9y80!3avopX74l_!0s3`PhT z(hDpW^KVP<F-W=?^2E{y20!edHuj<q7ip0kSPkR{$_#U<7kGsCM&}-@B+A(BqBA6M z+DDVA1wA{AiPiV@1pm0>ZfxY2djUxj@6&%gQJ=&j_N4(do%vm%sAtBWmSe>E%}$_b z%4-;?*zEUZ!p_Gq-RH*^^nGGJDOPIjY6CqyW{?xg$6{CBm=YjQ3lly_8rOk92=5%T zgT-Z?`A%AJIO3?2$jBa{Cp9D=jRf$eK8kCsunN~Eh#_+i$W13NiO)>UB{Ckp(7WTL zb#I)=T#<G`Qd3gm`Ec`%)t=vtIn5OOmF}2>&!wfVa;mbp)v8NmkrA{nG01BUFnCRG z5t$Im{lP+&R8D!h=i=RHIF1@EJz64mCn)X3?Nz`0|C7Fwjm<F!G*(wLeRTijYms=J zKO1a|N_>6UpQo<&D~0|^4Faxd|I{OdfXYrzPKZChG@zh`G?+dwBtI&l-c&B_^Mfp9 z7I7`-l!`M07*ri8!G!@&DrqSZ?Rmfm{tn;U`q{a02IlsEJP>b=u*qs4tbuyU4n1r! zzytTd435k#P4x$^H*>|x7T6*>J8XRCt@$|Nz58CqUSootEC1)q@Nr?ZW8D^`p4rJE zA8>deO37txri%O488xG*GhCYlon3oQtZHJ2bCeGFKoFHBxR_+t75w?|kXyGuo<bV9 zfS!m^pJm!m6qjkdDi1U{=VTHm106xa&mT3H?w@l;=Uz)$j7ziCEKHYeRoaYIs^87# z-(=~2Z6Z?7u@ruZnsFAn`tnSDfcuWe^kG2u9rTm&q^H5aF{}3DVMOI_jc@%8e1>z+ zcFtWf1Jj4Ck}Q#xm+Qzco5Xxp3WsEDQ_=GSE&7U;fCse8Eey$iUafDPu>noMAJRcQ z7O~F^5ErworuBEJd`e0R5g}n=QBjQequ<T9#=aRSI{lQF^zVWW3?8#0?=)XWrP9%6 ziD^#}cWPuSDUP5-|4DA(+g8{azJMEJdaP<%ACr~VERT8`uccHfjWp?O!kft+U04TG z5>4gA?5=Ns8&N1zPZb^$ZFu^3Jlg|N&i3Y!<W6qJ<S(=xb&zX>a#R0{x3>&x^X=EQ zYd{4lu7MVJXmKy@P`tRi6?Z5F3Pp<-cXyXy#ogUqgKHp=_on~nS!?aJ_Uzg7&b%+5 z@_|fdk~?><>vtaKab+72-Df5poO|UWa4`qpviBHtK7Y27fYWwKLNmbW=(^X)2a%Lj zzaHwjn>g#ow%-5d?S;S>>Bk}$7wx~T#DnKDeIjvCc~yAM!L;L~f%BG)Z7S69Mo-ok zZ{A7S11+yo0{>$URShPJ%K|}$;~yhM{$Rj=(Q;&Y>D`;7TMtF@>v`}eg~v?uj2nxh zd&P1v2RXYcsKDbIcaj3E63XT<t4@<H0~uqc@nhUAuYbg;zOJ$sjZups?jT;voz^5O zuesN-4?uW^-a7Y;pK(;$Y8x|76^;XtdSA3xKaoaC<ctH;7TpH>ts`wid9_uv;#^<e zFN$m@=wyC@GEYogf4M|T{kb1gWIY)H9qU6Xog>{*jVwR+(;+=L1YqSC?Xa>GO1^g6 zx?9mDg?8P4pBgc221yS5=s)1V>s}V9Moa6J@M`L^N~x_ciKPJ>V>T#I?K76b*C9O= z!HV-D=^r-ErmkCW*EVQvsx<RQ=vw-Myhvet&NFZCJUkXE)ykQn<@B1@@N>&LY&S%Z z{2*xzBi?{0O24<K&mEMhl;g}Wo|=F_J|2tV-qig~7%Xg=(C72b;};gED!1+FisYZ^ z>8t&zB3f*CD~MNycJmU_O530=oXgee?`gkZGdXaY*FeF>VYBh$p?a>OODJmcE<@U8 zlI4Pe%yH!wK#KEP(6elqr2qGE&<5nc$3fLHM2Bf@#72=Ow#T_R%?Z_lbpuS|M2FDn z3eL;Orldq3s`okv@0<dP@fuEHNr?^|aS3!XN4<L=P7*GMQ!3pkKkVx!p3%5Fj8tTd zycnN(IS|sD2@cZ#uefm{x9RyQ8Zy4<rJp$iHa)PwZO;}SFp1u}+^HQoNwfIO6P)s= zh5N(uPxJ+@9)YqxUj2=7{{354%eMU)N%yFV?!!f5lj9WL^!u%;k1c86r6{E%`=lga z^g8KDH)B`#ZfUXgiKX9FSkcon7#~a7l02B7PiF7~sU3Bo$H@>5QoPyIl{URIyTSo( zt*?pld)*c+Z;V6R1SUI-io)dHLZ~w=K~%1;?_P<q#)1Us?_zV++dF|DkMnPj*WWj` z%EUI`+-M<DQBhfx+;$IYF9A!wJ<3l=72wmW^cT((yArOEePxHbf7#@x6WJD@3kecm zI5YZ=v8WB^;nQ~>`|FxT(L_)TKLmSN{u^EvTgT!xpQ_9j>2QzfW#T$2Qo+23SoNjO zz2J%e^P#L*R#||<`tx+ridu9gKeA2afl~roysP(QI0{S0+!=bId{_ncOA1E0TWh_p z^Pa<5W*5)&5D`YQJf$40S+{@@A20FBq(9IgU7pM7c?82}DdhVGruBo-JLAY2klTP? zd=5RImQzyi_FW&0iNPJlBr-nj9dhalidtHvMJ5r<U)Pb4cAD4|x6Opn6MS&decUMe z<CSe*+>6VHuSL%r9_Wl)Xz;;)ThW+{c(G<kr}B#P^6764Qr)L`%*5zE&Sb6La@M1z zoS*sMJOx52Utx(a;{%4m+7#JJE)&|_(}K6klk<6O`acfv<0UJ&19=Nq&UJS`_=lq9 z(K0mI%-XaFpWb6B=eWfpD?tyOqR21f6P1oZyIlxuSR9oX4^$0w19XPAJbTnM;17EK z@!tvnV74sWnn^k<e9ZfKZ$9FbC{m-sz_SU0QWLBqyqR<^>#)*V!S1c3O?C_f8Bh@@ z&LSceecT&@Hno*mVr@~bceV^HmcIFf08@7<b=lQV6OwE5HI|QErGh6vh^3ROSVKMC ziiaQE&2Pjv?%^Mn;aNfXBkU>E#b%ltYLq_cbFb>MwQ|kHhDfg090i_c(J$ATjF+d_ z8D2GU?q=oCSW!s-<+LZv8QJ3h=rcZpb}`{n{o)JsaTb{t$$X{nw>P>7mLJJI29rg5 zK-80g58wM0Fbfzk%V?p);a%&ElfMl&*YSkH44c%1L~izT4jjR^fe0nq=-pe31bk+M zTq*i#a+>!JY#p3Gx^`915_&gh_gb>IZl*9bC&BmB?$gs=a}?bz-#ui5(HyMuB{Z99 zzc<|_dQn&n>0)u(_?vt=Gra+^Yb|qJPs|x14_Hskks4IJYR;t+L*8I<QbjMAvYclx zASkJ)T-z2nQ~AjCNp?E5Y{%<gb7jveu0TGrz|jJIC3D8G<>mMM2FB36ls+YPQ1a;< zM^Z!T3aX&@80-MqVYQtC19uc3{o6}o;!m_oz~0meoZ`aUlJ?ADV+Nx#HhBbvdwm~s z$=((rNeA6e?BTHBfqebzRs05P?5Rt(taX$FV*y?t06-Y{$lGe>R^CXl!@qZlJlF2q zbPKMOvcz{az-`Dy6;9p1$R!<O)aBI?<JUuduK;&9SN8m+4PM~6aM;lJp&X~N+}hdM zJXSLKmG4bwyJ~C0DIfZaXDp9<&L_-%0C!s468#-W!UFi7qoLu75B1J>OA-MruX%_0 z{~-(`%PNo&TzaU-JaC>UkvkiARD7?7O{Cq}1humqUN2MX)4w3(Pq~*Xlzuqh&nMG8 zWnu088-{^3_wk1*90_o76&EZEsT(qtaO2owvL{rQ%Mr5fXPHt}%!^F5Cz9odwhehI z4<spk93>o3$gDcg^}S}jbY$l)3>Hy_Y_Ruc_<fER)f}bO{OH-<(|EJ2)Tp0Ae+nHf zdYLaN6R?IY=>KU+NlROct|xUr9#nDeqH)zAB#ij73r356P*N=^WV&;^i?cOLe6{UE zK7@t7K7>=AS=`hGg$7OA2XDhj%%^mtp<d6fjZz(sZ~D^CW(R1`@Ucar6C<H(-d}XP z<e&K*-=HC66I1SUe4g0;r20!7(RGFZ{o7m7yU1VKvfjR9?rKOl=qd6U#jFVn%2)&S ziJ3neupvlHJ9k=5r|}d%S6CcV*j{&scTo4G#=hRK!I^Y9vY~Awrt066+hTT%Y3D{* z1k8Mx7^CN2tlNxDFY!BeJ9yykGcw(TrI+nTVFPQqog=u=%oICe-4S0C+YTahcL5w2 z?&CaBxf4a{E>3WfKK2$VY)l{}z%Y)jF6!;e`kyKUPU13VKh>`hN21yxMEJ%Wb3Q4; z&q;5rqhs8*AS8Rs&*AdizjA>Kq&gn^1uAO_R;g~Qj<#$|kp}2zmPp&o4+ISHkCurv z&%}R<q(t6R*bGruv1t67fMl@>m{LJ1Rp^AC_08z0&o^#2+Nhn95J|Yt;N<Nbv^aIR z;qNIhMY`_|pJ}Hx9L?Ivn)#_rbp~{aq%3OG*MDm&u+|%l$|hgYpBF~lEssDZuW1YZ z{$>aIq9!Kl^_lQKSL%XM!wA}$o)7D04n2F-WGt?W?OmWVQD7?Aoxckz=)Ea^+HhSj z8|FBE=cj+`>hC0bC}wAWNavICaU=GogF!%u1MWASxSIZ}MoAnXKO7{3_>{DNdrohf zA#ZP2N4rOlOb#^>H9rj2z#P;$%yn(55+KD#c*iJVi^fyL+1d>(fuZ|Ms4vZI%HN?N zQ`#!03hpl;a+d~8-edjlU$=K}Wz*{0pv3=m+d$x^x2#M?*Q}^9jN&jdiJO!9MIoEj zF3Y}|StR1e?W^Bs(sz=W6yD$5d3I_CQvtNm{mlhVMw`f65onhWQvu!#dWR-SP3s10 zZZa>M;gWAkf-xKUr-=ow)jk9!fq2&1vQvVxl0SPvA_kYbVYTI}%jNmZJYD~reDBW% zwpULC{Fj24+UmokfKFPu-F|OP2X{UbpiANHEPnU3%|-DuHP+VFBChbaIL^!WPMB_8 zZcBkX+TVvKk3QNskJF?Wmoi-sO_wsM;ZN_*zrRmnEB3Ix79CHhiCC%sJ=IemN#=5M zfXposM6SiAfWfJ7>=@O48!6RN9+8U>kOopii_xANu}%~$7!UtlUJFXv{8uk)BAiJk zUZS~<A6t?@uw2~uTKt}L(e&Ho!orfeRfnp%R7e?CLTdKVVzSUvwRjw81gIgdM97Rm zn5ZuRYc^V{p51|XR%d{g)S+uZN<2SsJpwtZ(l(oxaek_sQP3po9;^TS49bpP?2%`@ zsZYOgWX-G~&_P{FPQqDtQIz$;gK?S}18yqLIF`VoJ1I^#`*rmhM=8Gt2X5cZQ)r30 z_O#r1thOoC)VF}0J~*>o7duq=b9%146mCNi@7F6x)5sP5VzjCV<qYJI2m?C&g{K4W z7wL}X{ltf9mezRa5T8Z^N42`@@06@lD^)@BCGBq2b;!});gR0$NIL8yV8tQ^LNzJ4 zf4FzJ)FJ_T97?=E1**CM$*ZfYpKApD5HF9G7N)1!nVEkrA-{fYFtf+xC~!HopE_Q6 zi?bk;UwCjZg+HgeJ{<}KYY1FJ{8HzS!CJ|;lB~&*5j7XPeUp{>;g}{adi}latON>d z2%n%>I1%5upP}tNT|wEJn$yqdKYJ1lyE1CK8yVNrE#8dU6O(O1+diWj(avYon(x)? zcX~(z{H{-WT@nMyCr!QO!aEZtNgQzsygV4m1w=AUsJ(ZBo?Nl3#cn6y;Z$q{2LWJI zT*`DX(Dyy%vt9H<@zBYqDa9q~HC&l<>ZCs8(XP|<g<xp9nItkA8<}TfSifuS9_e14 ztfSkZF{_)uhq8roz8jzQ#MfR0xHGz1l3YUze}BB6Pius9I@my8iPKkta#bjg!fd)} zPHZQBxWBPYUOpcRVfewY_+5<Q&f%M|@Y=9--v_JVW_Mo=;Eooe4p6?P^7g-;`L3cf zG<#f|OsJDa1}z!s9s;Gxv{oKP6*Xlo3fe*_(=g?fS`ka_S@S$3bbE&tPCYa{_X=!< zeT}zLx?*S)TFcm7_bz`#=H2s4LUlyYUFyJ?>}GMx$<^;{pxEhviK-hDS@DXmdq`^@ zRvdZE)21c+ffKzkUlXZ3J_5eBIlaC29_4EQ4cx8fA!%Hck3r~K|3Q45Xr^>PH9Jb5 zgb0?+;F4*>XNu|L)vw4FA$b{Bt4a&>RTh8w8~BiXL`hvAH@B%4%HqxsG7~`Pw!4vP zap7(qr0Ni;Y-;#{mYZ#aGgW>GUF|WH<^NLZ1rOm<;+I|#<#226VhA)wHqzSB_*CyM z#{v~wQgGg80)Bc}JA0G~Z-!ltT~%ptJt`fl>OF#Z%Yqjn&umB7SreHzmR;L2h41G) zz#loh?k~G>sA3Metbc*ODPVi0Ii+u>_NC$iZ*pAu_clRENy$Xt&`@Nc0IOI~3AAB{ zAP`8mSXLJPpAHj}75Fk8Z_7a%0XA;*>)+&GlmEO6Iut!P!2rv-&Fj=M><pchF-7Io z-Se`tfIimQ_sSrJO6vt3jUtOB4{Yb|RJ{q(`9oDr=mR>0rG9XE+bKs&dODk<`QT-C z9OvJ+j|kPy6O??&pW~_439#fc9SXDD6uP?R;Qp%T0c7Ud!hY^UuTRl`6XR5n0cmh9 z{$WYF!nr2m-bL=6UP84Rc*d;hcvSnS700)&Jsj?q5TM1|%?4ACKvH{Er{zaqQ=V$) z$=axGI8+_+xf6vbJ%3BX`inneRi}00`q*ysSPG{@b1>FaclX<|_iOGeiwa+KzI8+8 z<z_3dpWcIBJo$Fi{u=O=#z~Aw(5x1MH*_TDM_b)u{(QPKm)uz1{Z??JIeMbv{z20# z)_>?;Eh-7D8jTb<W>ZEXUbC@edmk}4*;^l)3KhHaAPH;`WqNB#LOh@^_>#l<leN>+ zv`-NEhF;Y-2rbbw#1}Kf!U~T)xADmrhkJNxY0_l(p%i{QJzf~LWzca3R0og4)!v=G zIErzm+{kj#v^BczCN|ytONQlc7r|aCq`>g(Bm$6z2mvO4&|MWc>(lx}XOr54&_rV* z)F(%Ft0^{7S2(pjJVI-aZoE{sf$Kv1<JgKGx7hjEdyEu6fWt6L1a1hzqKJ|W-mh^V zN@r}oYdh;~5|>_)%qkuN=wDTU6?+NNfHUeQVo}-TAY!Jl!d&gVTF2CLqjqVrRpOSj zoN@{sgL%_Gxic@Bj;EM-@8w)T)~B3qCr59I`em(V6MndIiSv#tl?5;N$Ti;1J+c3} zw;F>Jb#Jf1*JU{VCZpoH`zc4$msvVe>aQEp`W1`0uYO!3zSU=WIP(Yl!$6)}L!xNu zA4mYM;|);p=+)a*%>%IWKY#u}TK~?3lZg2sPXV`RgX12?(r$P07AFI_lQbtDp<HV$ zM*+d?ZFb2gvw`Vg7R>3^<}i8F-@k+SPK~ZaP}6)B*zynfD8zfjw<a!Cl$7!;f3RWM zDH)#sD_Qjj(KT(gljFeye|=e!G}inIYWH9<v8+iVzk|N}Pvzb*B9KjBUjl}Sv3<s0 zqVr_(B8czj8Y9fzFUqHJSot2Nf3xQRYlQBC%VTICLb&*Za$8mp0u)3SLvJQ~v!NuR z8?+Ymw=JHpn7i&U*5jhFEgU5j$Bn!<g_aCvcv6044@BQzlm;kdc?m4NW%<qiHV=XE zt^J7C)*cBmcZSb8=!*!!-}+N2M#nOGU?vWgouzgc&DZPXKL)w<#zS)@tbP8|4#7YZ z<b8XrKs1=v{k@07f*LSHo`9)BLg&VgWX$(dbN0b$WZGZ|jqOLy<h4(Z&sAF=LIt2F z%!TX6J0SKCZGwS&RcBNAdLNXcfyI-0$Gd>t6gMStPIeN>znv3ELSx8J?&d${?4rx3 z^&53q7Z8~^VqMBgI7B^0T4`{aj@#bKs(egc(eVw7*<{A)(NMft5-gq#9L%!Y{cY+^ zM-x;<)3<F}>`u+XLB2C(3QNF85fTUs|3hp{lQdk!V}QqZom$2(VA(`hSE%dA3%-d@ zMXBLvlBe&$Egn{1xZ2)PGTQfEXx)J^mcSRxw{v-5kl*uC^2AyhEPFp)`$Fx|k8Xv% z?Gr~Pn>_qXP4q1eev^(Hu5XwJ`M6|}%+~&5oR7ll;^0-nwn;lPp;MZ8_N0vj5L>j7 zL_joP<tik(T1~X3bU0Q^vC57rX9Ed$EjlIIO4z~Vn-tz_t;JF91v;<a$C%}uOTujW zNXLfzsILU-y!W=15LArtI1}^Mwx=LUNpZG{;wbY*D|_)P3u)^1(Vn&{tu^1|`1CRg zEfFe{0HIYgiI}=>Y<wfMYR3t1@;KNnr1~5)yR9Hz-hI5prVu!m{?e?>W6{PPjmfcH z#WaGY)(idhG$~=t*~1lSNI!#x!dA?y_DV!Y^xUahrOy~w9-{MM;GIR=ejDld&10=> zoJ7}YV{q+Cs|87};-TpI&jMWIDXXELA4!sOZPYe#+pv0XLx;(9+0q@mC1t$r;WAuq z;034kJe&G3EtF&lV`#dJjGp?&n}!TgPdZ3yoaxQ|nQIqB4eE~BSZS_5?<uY%P>FWW z4bJ6Z+X~3LPSdc>7VFU^SQ0gD7brm{w@8mB#UV(N{uJHnW`4<H2f&Fb8ktJi*l;l$ ziLIq=L&GC#+A^aYV(-&5ZUsLRv0Ovt9)d)g>0`c|hZzBEm1#C{{KS1)X{KBVSG-J} ztoiBksE2N4^)Xs#>@REB1>Q`!-@Vo4{^s2Gr%%!sDyMOfmWY7h_mhW{5fBrWyQ39$ zJ(X@U8{o(u`x6H59MTM-0Vp71DImrKhz^yh^OU0+V$P($v79R3UQ-5Q3LEmp`h0f+ z!SRGWDyFJ`Wa;a|c0<V^;Ay<YkGhfFR13Pk?299^?)g2Gcc#Fk{fS;|=W}8bLBv$* z$AI@Y>(|fk65K@G$VP5l({O&58~oF#_Bh21&+eG+Mr+x-IFbNfUpu2nDDRUR!mgAc zVF;xKqOFxAkN9i<((P>l`@^c#Y)mI@H*+UL*|7kB&n&MyhTd1!SM8lUna#WIA)ELf zawX<2DMJJqLENcJ-)<`Shu2#aO+RLr9OZ{KW_w!(ULP9^eA@4Qps1(2duYonzLHY{ z)ve89>58dn$K7ol)kq4g2S0tnI|vm2+V<HZCTIJ{ha;b56lv3OUq3v&soduYZ7!;- z%Y#3Oo*989kD5HISZ;I8#fkjlQ{NJZ5S+j93IuEB%NcG~2~HA)b2W`B1Br;hw|j^* z$a>b@yE~(UZXU#@N5K$oAPYU9JN^46UW~4%EB%L?3HISX9zOa1L(?<~bejB1g?j#% z-;zHDs9A^F1p5#1avb0o<(t{J3&B{TC`(7V#75|RdVg9T%J{LVoghP{@sDxg2o<3| zkmI`kevIP|hnZzvEP#deO)d2nyDW#^KUG4j;l}=T-CE-2M8OH*(gX{yrYix$9{gLM zsJs5JJU=4gu(fo<mB6ssXrjG#W`J|18fp})att?(iuZgwoyYGrkgd*Prg+^=!rVdq zruN=Y;h8LiR9{e%Cl~q(KX-pJSbt}DV$vqhTJ&PR;AXEy=CsAXev38WH;EJZ!>d;f z*nOb&R92rJP8x7*!pYvkf?3=!ChPvF>(v5x$&|P_KQ7^*>e+zeO!EEr5j{P<(frtr zC4@n3mCG<or?ARF2TP+13cl?fNOz~SNodGd(}8TtgM*D%l^(44Pc%&b^ibK)_MRR! z-`0b<XDfZalx4%t7pD<#qZk#eHb?b5DylpLK7dtRKAff@n8WC9C*LFTM~w2Ak3|n7 zXZ1qax3iN?fKfQ35u5LGU0r|<MI1$80BlaQw6u*bWgcE2k^fQ&6ifUsl|U!!Fq1u^ zX&lboq+ej>#qeUM!4H9MEv>Zn_0{}SJ|jD<ebs-n;P?P1x3rnz>2m=*YkJZRU%%ZT zKEie&HD4bzt=gIX@Y6v~{@UR8{Gk7(_FK-AzxBSh{9x2WO@(&<h?II>|NBhsxXNva zYNBw&`Tk7L?LwiH5*pKxZMJ!LLRwYQ0Y2A$!tB~Tg4LGkh|8-P^Fo^cQ3D*KDw+p? zm37!=G=Qm(zlh`3l<lrP=AX9kVlkTZZ$)v@Q#1P8mXxoOApy5Ih@pViw%*~)eSPJk z(tkT&n0fCJ65+5As<e8<<<})<`<%es!dud7#LT=gD?iTI6F#7tpePv4>Mr&I7(gE# zLuNJGs92X2`Yg{rPGFwJdVY^fT@!p-mB_N9LSs?7rMn1S>9^AO{I|Ectww{9b9>ni z?bH%wkX^&yw#rqC&fY1N%_(ewS}u2Op4YgscFn3E6b;O~v1SBoss!$Yj`io}F3AOY zJkyQ2@>-jwEwQCZ^aFNZ*N38Wo}>{zWtAj(kQ!DgQxo(8%Z;JgJ8>O#t>0%#dv;`( zb_4wU$YdI4u*sKdEQQzXUTQ5w`1CdzG|^^rO$Av*bBg_*J|1?dw=d9vo2~2TVyjTU zA3uI9G!hUJ9<Q{@>;4d^2C`@H_s8rRQ>Gp;2d%qbnF@<;{|paue1V8^?G*Xade3BF zIz_U`!oX+R)D%y(p)m}VAu~qPNDV@xHf1LOj?o&P+B>EmgpnQsl|vngE?b(C?!Phg z5|8(l^5P6GZ7ga=6;&tUPXWsVuA#ILf^v~mvTVmGyjUr>Kzdmh{764mPETl&e5=&6 zXYNFZh#|YQ?+K2@S-3bIGU(ofy#&Qx*c*v_5~v8uKuR}yLF!?8{geS@bugKirTn3` zxobE=Y%saet~f;w1s2&tw{vgYck{<8_RDCeX-ih+A;VY4OOj6=FNf*}2cUzjePZv9 zcKAFYXQs$<T2&nE5m}Z1rcA|m{K3Da+mNnqpV!LwAeWk;`WbtSs<+suE2#2hzgmZm ztAESlY`WF(r?aoDfr2<W-(l}JSj~-dX}T-Xn+@{#>+JhKW3a8Bl?Uvt@^iWmZ`KGl zo8ef8KTOQK%vFE+B9f?NR*C+L@aA#mRrf);n9xCA{o+)gX2w*<Kw1)VL?ojmQ}02? z1*g257#c~CXHGBPdam|5hjJYNa?pOo)^PR$9nz91FVr!H3;^F*O}qX`5lGg(S-!%~ z-xmh5F+I7d!~CMH7Jw?2wC=Kl^Fq7RHRQR|25#bVO_wN%_IOX~x?q+we6BfXx^-J% z#Of|u-cl?{c%``DXlJ!I|15lj(>tUkTPz8~ELMhu>Nu7qH6|D@m)CktO|2nS>7RbI zN{$7_ODv6eVS+{vlP6jExFHnQZeOLC>Iy%eZ?23?TR4sF?;Vows^q|8S1g1>o*%xk zCUbY1ugZ>ot(4k$8pvekcb;0ok}FpAGgz9&<6~WaQd(L_K=bzi7nW+pYGTWofsYd| z+Vu%`NnWvh5`n#=J$|;P4BP{0oL)bQF9(4(TX|j_?^b_H9pr9PRK0s1<19~apOVA* z=ueBUbT^vwbi*g^8%v8}Y;!Kt&e>PeLPR$|?k$b3C2D5Gu<juBW&*FwJu1(^5zyLK zFhN=i3x8D9*v7!g_i5m`;2<4>!yTAG#?l+iG~(kSVk7Zt=Jk=%9R8OUB`L*6rbCPm zQ>Mb278$^ZAmvRJ?YGN(^LG)>$|#;8Us8H_pP+?DdAy#>t}MrxeNUjg$kHH&paxdL z<99=lu19c-%1hg7Eg7LP^?42B&1$%an^KMSj+9PK`8ZrkR*&@~^5T7jjqSf1j`Fc& z|86)w4;1siiENJ39StKWKZ>=;L_Bm+gLbXGi8UIUS_zSUpDipwy(YI@w>J-zd^0l? zI4s)yBS2lEC>E7hMCy*UQNR~(*01TZ>y%_t;d$0kPKx|UKBeXG(S3ak>Mu3L@(Xe| z<l%b6K?`Xfv~%8dz7P=<<(!qMH2~0y0QZ*!$|qBpZZaDb2NI_BS~f<xsCU&P4t*H^ zoFh#`u&GOQ!<ZAw@ZR@2zlY5H%uj9N6JuiVU3?q-7Pxq^o+0V+(Qal-)=MqBCt=!E z`?MF#D2A-d>u$%pD1|J`%%?Bpu-T!y?J2)pQua8+g2s~d0gB_=wg+3H5FR0yyQ3B* zVQ~UWll`|WjvG)8r9I8)<O0z$ugY&Ng~ApjDXdQNN8tTr+e04g(<U30t%OYqh_vKS zNZ}9*A#1{%3kg1`*EHiMdH&6{CSpA%6&3YA-md)#uD{x@p>~U9LXI<%4p&*V<2YT% z5NdMC>#2zbg^|(tP{0c&!41#lJ_i>xIAE+FIxX~G{j1ce<wj{9OwDmLq2kWPpl5?_ z*EyDI%cgsDGa+g#dzQnrS6D)YopI~VlJ+*Z$NS{iu(&y`Wmi6WUT*kWs8#9iT_z4P zSuhbh{oYhUVB8SpK>I5~ar|2OxKd+XcN*qoj}vgDNos@3az2G(3H%!otS<UuN0k67 zG1t{9a@Fb;<D3K^{&Yv9++S*nJ0LNnPHtUMCsft6&$Ag=5~c$xr)~|^Ctnuys%HSE zny-}9+!GI|m!+*v_gok3NV*tDM<ouL6N#lzF{%WdhsOjrZA(aZlJT|IQN|GWpAmY$ z2n^4lrri;G-`pu=1I9$gC-{^pH`NNEAGf5=fRRQwqu_N<Iq=q%MB1%IeYbl_JiJ1T zrn)f=hY3B?Fi3m3;j=^hO$q_}g^d<D5Re#rLwe%-yqtJtM1y24HvNd{>&BtrD@d-s z0KzFOA4F*K<L(OcWs)+AR3&rmvy9HJ0<S4laE2t3ZUPq2%dEV!GH6xcxs`*R%yKsG zpBnyjXwhK%Fe*u^S6`QVygV{?0-oLdm91391j2<Fm=264lZvmL#IKA-7?*2hx0I!5 zTnVx!B`CDs{m$Vb{V_K4>ehJ?sFFrYh<n;YF5|^Lxa@N}k3N(BV>W9yLo8_?>*3X) zF)C2YbC?vB#Yr^!ev@NpTbe?0v_r0tR#Vb8Oy~J<pbL8A9=bjD7D~}mv9)JvI<RF_ z_I+UWx7svi?dd@4v|z2GNJN+Xe1-mzt9=7h$<n}|)JfNx4_1;7)JqpCBy}LUecrDl zn1bELBa0=Tbq{}zcV6g=E1hEzouK7`L$I8yrf}Lp9slQUX@+p;rX*b+a$ImjDm0r8 z?9n;c>yo^CATt!pd!}4_-InqEf-YZCz~|`nvdk?-%jc~-Vs!nVp-dtQva*=S_jIgI z52_*_b`d=T1Bwl@VcoEC#jDio|D|85CjO4qP9Pypq5J;S0o3UED}QK=rHV7CVWNd* zgSJUzC`?Kb*6i04C{nAH6)!b6VdTR>S7kj`+_Jo={T{rS!Pnu>j)Plg>>eH!l^>Z2 zX&lxIBtjqwG`Mv;=*locfLH^$l&i0ez-P8f-9A31U+ykCMaTo$DZKp;f=bt~BdK7~ z_nLv;Ku-tQy&|9j{vKd20zZa79RH+BJvl%3*o+is{z$sJ2R8VFX+*Sr0h(yyCpd<q zRhDBnoJ>j2)Es!^lb^g2(D$<Ik2BYS@Czi?-kK_oRJ=(73l?F}p=fX}Nw-mlDDj6- z&P^T@*O=5SKe<z^lV_KqoWNn%lJl}v@#o%I^zXoxzNxr!lxR1|y$jxdbH#*WD!-q# z`{HORCDqj%0nTk_V}s!(4hNO^7{{X$+vF8Xz!MkN1Tt|+7)<D3LanECywI7X>)KmV zmrwB#qbU={S6YX|E6@;DrW}A&=tf@n;NqO_uW!L*b4Q=}FB2U$&03%ICD}7ZzYeVz zXCb<ba__i01b9d-Nyq%l|KxUa+9ouJvbuL7og+nqsgvT+G`ArPG4tU%Jp^p8oxqy8 zk;kTbvF_b+AddF29|hq0hpMa))MU-ZYmvc5Lv^dJj(=LRMKz=&p9Ovv!ty$ubVp_# zzjikox@8BiGm}>{!MQuAqs@<>w5of4p9hE@Bik(~&%$imidJ=+Pzt@@BEi{2eBb*s zrw5#%fb{~yo~E~L0ORJDTh*BI+<KLKfL8T`!H9yQi3N}nFAffvd)$y6!`u|xL)-2~ zl<GzZYdfVU@goYm0B=$r%GUfMJZcd}(@=AXG#-~yfu?cN-5F+>gHD<0@@M&80$baT z3_K+ugt$nQyrJv*18_OGoPHa7iaKxc&c`mvW@~Tw+o&D6S3RAMk~yTB5Q~j`cwV!3 z0TR}H=u%nNTp}-$SC{)C@VkI>h2h;ZBu_X^M*bx+UcZ>V_}s<#-X8#UTZ)}}feNgh z_jq3~%Dg6x?Ct6@K3V+($T`cu&-(sH4L2hYsNq(`QWlt)vI^uu#m$|E<z|hGw6uCR z3Uh;_=(wkl)rBRwwXKWh2dC1y7+U@u*P5JHOg=kP86{&*Z-`=@9}0lwmvJiPDN)dW zj=>sLNxcj1UE3U(+aj~$fmeVVOx@>dlQ}k|c7K%aLzd_=&m8I-iwqVDWGYF|@G=Wr z)usMr>T?XF!EKSDYObbe5oB=uV8#J&$m)xp3&zx3kr~ArTRPsT^-9nlVXpPg65r>j z`vq^}-tSd|A){0_I?=doCgo1DBunp-kJ*Nj&nP&<{C3QsZ!3S?suC#u76rNj%?%v; zDpM3awN|hIN`fgnlGimlWr&dv6qN>wqP7Z_Tp(hUYZJ6WN<*JN=82s;z4QK)LRW>a zVX#YDIK9eT#IcWx6cv4wCYUSa4Q4&JStGmF04*(P8uj)2jCuG66uh;rmdHZtf!^QF zz~CNeORiUj+M@qbbxm2cG@#Mk;b_07Y4Phm5{=&RzrdyLXKCRtUHRC0q>A1_L>*J` zd-=Jr(Dyk^8hDs;7xWfmV&Y8o`I)~Du^hwJcckzLF`1;>vKdJbf75-~?NY}Tqi49L z$&t64Rr!5Ne{%FIq*BXxXc^RWWyL4b(nXI6#m%BGGXboNS1VGua+MMBD~Uh-r+|2s zYs5}tBYje{`NQmIQ$kT_z|ca?QPI^tS0~2>$R>EGzc>WxraIhorwv;q>(ovx<~62Z zyQMmUs8siR>hil#`ca*;q*zE_uqSD#9C?Op_azC?HMaJu1iWvqC&iRszh3T7(bt^s zi~!=g0i(?~&2@Ek&CTA(t>8#bsTZ(14d2d4%WSLfZ3?6c|JA>DM?Ez1nD%MgJ#F}4 z_1rLyoC1nE0YXUU+n=~@ZC2mmSyQ9XN*V97=B$&1Fg8l<$KAK9b$KQ3ZrfCPRG&cK zZ?dUeB{-Sh#7rxv+^#l6!N*W=N;+RB-o4Y5aJJYpNZIWMe2J0+&%oY@_Xym>uYCm0 zHtaRNKh*8s?{#ITu91WKY?Uq(4#Gh*%1i1hvRY1^p@HhwGcLcGpxIhO!=tn(sLB^* zbvr}9&t|#^CuAonTtPP(K}78Khm(1At^7_+;7=-76O0oh_CtgCL=ef+PnWhd?j=u* zX2Ll7O#0=HW6dL$UBc2xhQ-n^2Vu8+LiTT@ggsfuUetZ|@%c!%nKNO9z4!?UC$cfE zJ!M?z64P)lR#%cjeI29+d0M<~V!ns1PQg*_d)7VIA>c{RqN5s|DGlU^@7@LRp{tK! zD`M|Zja5hQ4s)7OcHtt0cU!^OYfdN|ysRWa-cUl!8Pt!-5+kI~eDgW#P6UINhXp$f zP_Cc{Ti@$t`+Ni(1yy@=_zAtIyAPROh!y2=SrLkE#g30xO4(S+t84|7=wgF7bne;H zEXl+CcwNlqid$u0ebqaf-UP|>F7!2P&u4z*s`~+4B@gKGjUn?9Xu8GvFP1m*j#93H zffZSN!fjgl+Wze%9c}k}$E(35rcezYHu74qV-&DOAuDzY^~=r81>{4jYHABWH~ny7 z+qCoqX|nvNc?nn2a+2SB!$6fJM1Cl2p}qs2fEx79%w>=2#uqYI2G^o{z8s5&5gtA3 zJ8FD#F$*#`nr)S5cm1*JW4qr`htLdQ!3(T@O*&;5cTl{Kox%&IK~`oT6)a;p6Ip(F zE&u?=6fblLZr=0E6<ntBi^Pj}+aW2&JHh2u!J7u|8tfn1u_dvS3lj?qQ-7v^lpH;1 ze3@&{-Zk0ImX8g1EK^rvKQHNOjX0&83*};I0*%m<`o8QD&obA`H)Wl9ole=h%9%E5 z4kX80v7y@@=c+h+LLEWP*<u9s%DD7=Uv0)p{cLmM3PkS3Wl^V~v$N&`fn_puo9l06 z+;qHqSX-$&R!R8KtHhK7>#iTp{bNh`SFHu-B8(i7E6JIb++dF8e1-#u6Dudu?ah#= zOi?&25lyEYf&42m5zm62-kSv-Pl+C)SoNJaVot*AF5j4sv2AXyRz@pV2!dbO_c<kO zbNA$A=elB2Rt9;zi#jM%nb+k)gl~Ro1RWTeZV%x3`s81KN<8_-HexWU8hoJkvA0>D z3>aBlUBx7N*PmOO>pQE1aQ*EcYuq(<7r^v<_w_UZryd~Mk!Pfe_yKg2k4zPGwaeDw zWU5nY4w$kD>Hpos`LFu`YfnNHM<50Lk|%3b_IEyg-xTT9-2@UMj{{xFLpZxdXp_#} zH*7GA&V}yf+EI1L$14v^{3~16i^UrAGB1J^8r$Vp`v)Wv0qPb5Gb|c}nx|`Hz9hjV z9+Ckk$9GJ<R<{U*Whjc<JLH}Bvl_lf>-(bs>+u3as=znglp;^fp^;Hw_Y`1^fR8Iy zru#a04Mf$9EK$NM#1fR{t9w2%(La~@G6;35u<i}QeA;ykjPAAbPM0W{`{ro-;3QB9 z`tu^yb8?ZGS2irSC*)l;WvRdkLrU^7JW<nUcg+viPIo8zW%m8*?mPYjN${{sjLXZ~ zdW_lnOU;ic*_=10vsY~TdcP~N2$1GjwyONjuW+nN_IuGWLlq_$DFu>|@I1_HOnbZ- z_buuXxo-ajruOXow#u4j+bxf&nc5fQu%2Xb?)E=@dXMEsC9o{P=)1Rue7J5Z9{%;1 z;qG*H+{p@X$)&J816pW~Pv}sI%3o;FO?g~%-@Oq87ZlRbmSSK}!RoZ4_a9xOg&S3X zyw_XqJYpP@oKi0Bu=OwW0`}GKW9|I=GdvE5g0(8g4C^Giiz8<(>;l0)KH3@Q>$_{Y zR{RI3Ynciidm1gJZu>1ts=%q+gXni#+mU*SFxlIibk0*1mo1cz?I$47;gQhvB{5-Z zN1xIH=uq&|;<jHWh@32P*Czy5y0I2yjpRdpWUR}0dqY(lPIt21&BR=CnH(m&sJm2I zjVF64<6?f$yW<!n;w{ns{(VH0>XWSi4dIKu{rpD*2cGZBmzF9%poKmicqcP^7g+su zkFd@}+hAqM?Ph~=VZXO>_Isk;O`{wgNd<@tjG7K3O|x`0T8Xc9wl%09FaMD2{&~<v z<a2MBs$R|Fg04h2@7STVfk;Vlbr5nxx{5yI2Dqpmu`UCl^KiT>dnD>0NFfDt`%t7` zcR&)1Q2|~H%??dUi?JNB=UWiza-H#cgB5DDI*QszHZMYdc|j@6IvrE%aEp<#^U~$% zgd@$CtFhQX<i`Tta=s2_UD&#(wYdjR9^kaft6FdK{q*kZ*RS<1$2!`e>l%bM>W_<h zH#4|>*YV!OSx{C6=ldFxalSatg-)&eADtseQHjP*f^w*7dYwz>MI&8ZpdHdTjPHlS zPHeYgewCR-y(i1%TQ!v#$_;>4#FDEBKA<P2PqzhfSy3FO@tkyGmr?`p$8Y&l=-AWj zVAZHrzZLIaw6wi-9-0xKQluP=>>;ibBPk4P@O7$%YvSAMAENr&Ivkl~Z#cO_SJ^d3 z?S~)h@ws@bTt!()I1}$N`dD8$k3ATf`E2~V9lz0xJ&7e6&`LWiqY;K`wHJJfO5oYG zT&pG?Hn~Q*x&BlN0R?Gtv6vhrcH7`~x-gXM9-XA2;#4*Dibot}HT<ZwFm8dhB>o#1 z2`jO;8iv7fLa_lenk|Y8oCjL>BK?)m2|$iDF{Gtl!G^2!_X7LQ6<P!MqNfyxSM=P4 zuSeooo-w82&I=416V5RZ%6CImV(-V7_oN~2(E?T_NO^eOIx-LYbTJH$sg?emR%1VW zNZgryG@b%QNmYE#dLQ@$Sp+Y}+qds<LM$yTEG#we44$J!GS}@Q7&I%q0^#`o`iYh> zZ*f?F^4cbfsnPk*1je3A=r0u(Re7pdQ-@HQMEpN3(!!^ELmE{WaxO_YWYa|`{+%}t zBjc83sjIbIcP?<5!qN6WOeCT1ItN@icd%db(Ss=3j_<A(cTgkCkrEmrEZvH&Idm7| z#fk|mn7{Z1jI)H}QqK`Y>s~DSV+&on@FeYm>>QqpLcn>4!(%?zNa>6eNy!!DR_mG{ zw7&mmm*27N_nUE1+hM#(UDB@?VeZCb8>|%r32^#ZS2=Y%XOPGHr7Y7xxtfUwpX{AS zP$X-f<p^0o#NgOBOX&V^PAcG3ADssaBq^u@Yu0}r{Co0aRM)bDvUCk>J|!W$ba8RF zZ7h6o>2HrePi#3CUhOV+a|JpLdVtT{D8gI$3e=cN2I~i>^${Kn({$Fe`&L*yXD7xs z(X?c*d^AfZE{QO(*y-vyz^Vxj0jm3uTRD&(vvq11wey+8M-Nh^)G1!ij%IBEEpjLM z$h(_(s#4Ij%Zo6^%M0gyu+e&bSe6DdRj+s7J7e>JFjPi(l;G`v#CIx7Y;c%s-}#2n z9FMx2Is6od@$S*>qg=~R_MQ0CW}Ef5p80snuSn|7FimySo;_|^8JU=}tZy)LuXDdw ztiUN0+;V@<ZJH08o1eeEyL%IGv48}odHWJDiK(fmIPHz+fL*}am>eV|Bv);_VjLz6 zJ?1}wYR!7us!7D>@#QlibdopuOgHZO%IIouR)4NYX|ku5z2cx&2@T@qw5<13n6@o1 z%jWkAF<JccH$m*KnX#^SQ&An*c8rk%^)0!wFsz;5SZ`v}+70jREei8j3Zr_t7<c^y zRc$yTe)I&SWE!%`-$zDFA5WmjZ9sqS<+3DVc-xYOLs;rf4&W#g-z`!7X#UE8VHW3t z)BmCR4R8d1#yMWVs#}y8@|q2wQFWN0j*`RK?{{#zot|@;5{!PtZX7Tv-)c!F_R~D7 z2k1GlbB@#xT0Q=0wW=j0ls{M>V&u+T|5ITlKTpsW(LgG&_<SawPs;@}p4tu2_X>VI zM`Ne5rf-9;wv2eF&N%;pX042*)+O%qz>9zT32sKdtEO_*#VJ8n0Rc+1V(Ht2Tpn8c z3hNiJ8v1+h{-;BO{(qA%O0VG&n;e>CoU7y2R<DQ8EvY&H^`c`M;m>q2TTiXkpC8<^ zRM#%?%K#`1rJdGU^GE&l9yE--xVCWF&zPfag;O#XMW&{B6QgKQ7FZ5@3n~rjKgPe= z&OM7N=0_R|wh!__K)?{9-8BTv(m(25CY!>bi5xyoW^%ERyJJ-&HhEM$e&_YGx6XOA zu~855QixdOz!EwI_Jt+=osSs3dx`q9ODtq3(UnJfd7{xEU2T_V;#nx7CKlI9ck(7r z+R0X1Oz!@LHTqqkHC2j8zr5{(J|D-|Cp60e`c`t^@8K(PUMt%|`9pl@E~;Ka|5T3& zmu(r=%L=A__s)Q~ubA7UAJ@>~eJ{&ZvPPDhi0x-cHFGS-FfnJ1*m=S#nj(Dr_%9dq z;3B)s#lTz@H0ct#jWt>KR>_6N$>$dL(8{LmqqlQ+_1TAtNq_k(M&iy95P+TpyA^3B zAL2ZDLT>_8@&U>A`?oKN6%3Vth}YiU{?V9WgU9v_sc>Jz7ec9KY+O{f*iL;=bf(DR zbJZj_`7P&0d@+uU!syFaMHZ}SH7uh0lZF%;m5VnSV%tX@;^QH7n^LjmX@O;FX=Rg< z4Q_0AyMYRg3eQy~`=$!r&yHZ4RnmTyjhj1O$0cJxknm9FIa1xFn-{D6>nFCk$rYYl ziS~^Bw>B)zpDDMpP}&dD%`|VvCApk{64a(+la_yfa8xxDF1!P1dOCR@?T|nopoPh- zIHOGgBKd5uiNWyg>-A`v%@}PDp8cvCsx#WneMN&=QmH$8D1p-PvfUsf>D4>aLy4^; zl(VR&%y-5E=Z5z49769e|5Lb7XPJcvl2TA=+zsiV;WB2k+UkrW`I9<W6d!wg*uI@F zm^7&cjm2?tb2gz8N0AUfAW@`YovU8szP?DcJ2|(qyAt7!H<Bg;?N&L|79UG{>DZ~~ ztcOcU7G^n`H!3OVxZWN-Kd%N5qlFnYPditE25y(VsWtoDBi?ceI*W8s7LcK>n7W#} z1v84^R&3@OLF`$0u#Tm(zH)F<4wnFBDNi9To8G-Um*q0|<)Pq`ic0*>y({nOooe@T zmbQQ+0f==Zs!ipmlVYc*eAuud-FOr3J=vJnOVWyIU5?UOG{~S8qqCSgnPJH8o05EA z$(p<K20M!R-geUQ<Yz91$$XACT|iZ7a#is5s3SYgJTO6rJ1hFxlTU%=;W$Y2goH`J zP7pX$Vf63_g#k64a6^-*dfET!!#52}@zFtmzj;D{R^0W}(yD!#BkdP+;Ua_5GQZ3O zAPn$(G-*!*dyWzc3jny0RT=2Z(sJ0I<q)8H^6kgxPP9-1PovKaj-N+z!!0;yy*<Z_ zN{iaV(pnx*$xYt?+FHO~bpGI$;Uj%2;CN8Y>t_L;`DE%~3QiXNyRhE|j|9IOKgBBZ ztkRo<KZK7szFdFcs(Gb2{0y7<GQdMX-OINHX!e47EgEUR-~wU?8%V^2%6l`zF_EEP zp$rAL(2kRdo!xF>M%dn~fxccp7wp)r*kF%G{6dBmlU;zSI?_*f90JJ4)ifO*Z4Osq zL{C-4EXzCM`h3)@it1}L-19<!u|tzb8UN8esQ2ZYt%4+<oA0Pr1>#tQT&%M?5Z-hW zd}1Mm`pXdd=qlyJy?@SqQkYt)znEA)lw7$VpUc_;@TTlX19-8@`AtX(y)#S?-X?Xo z29AKAYv!z%&dx0@EGS8d?QskPB#>C`vkLc{MpYa;st7pJQuwr9AOn+-po<w6`Q_Ec zm9vwcGMh23v$r`dpmnHk@NfrTW3o8K2AKcUtpy0P+YjDi%F2^5_~*-7A;6JApLPU8 z{N#Lb0O7&o-$~E6e?J6Hdjde+fBybId#L#L$N4n~IG|u>JV)9wi?Awg!++RtgOEYd zn6BT*@lGEDasb~~@>T3vhPXeHlu*yg_hXX^9hpcC+(A}&|AH_<PeLn0eD>x(d;Bmj zETVrfJ{T*)XI=XC54ka@9h;eZ(Yk|SkNx@<xG0`DGW}o59m-|?afOpw|6jVo|2bqz zJ5QXV{n5MAuBx<O=}at}zu&M4RYxxc_#0ig=&*UB=t^6<0v#aPn<bF`59}wD#H4H% zKRRnJG_)`m=5E~)Hu=1(XHR;11Hcqa!%>{8^<#_+z{B3}^ZK6Pl&>;kbcvy&)Z+30 zA99tZ6D}rP{a1HuW{=G$*cTGhimJ(k&SMKkPo85WrMuWt?W-7$yDCTzjfZh4tK;$D zlPg1-yOC7U2G7UiB6dYoaUR#r-hgBY2^kMK42~M>HE?iLfnveg*%@#WldOXy+JA9F zFsqnL2c`_`3q>)?Uy=FxF+`gzrK_{H^RDP(b7^U$?YHhYBpOZmPdLjYv3C|dbc%C3 zT{;Kj*V(H4CQ~mOlKBF^VrLvf?tYGR%A&YarMsE*y4I_j+SiTJtq)1x3lAWE%TiK& zUVRr2)8uL*=~(2w+xp37PwCtZF}uboq6__RSdbX>$6?Ak+2?<h3Lf_f6*0R3KMivc zW~*xW9frFYF7{+c>Z90<*QRCFX|ytNoES>+U;Tl(uX!4jX2#{dz0hE0!(V8*tN$TS z_HRpga1OSB)31C4PgsyH2d^ATNjKR=0|&4Lyt%u|wBnD%eZ;z4G}Nc2?9t7`t0>Rg znyRGuBYWasS#M^#Sx)?2D^xSjc97KCX>1wZ9Lc&UpC#&^Gg79N4P{Br(}P3sl3M6= z!;x|77Bd5PH`uHus>Qn)YIfHIszM8IHbXmN6Ul6y9(C@c?~Bbtp9A+~-{(jGm($qL z@G7AF5zwi#rHk#qyFQ*EItf%&8}f0ATj^i(t|ezSt1k-?F_Y#f(Mi)6hG{{#ZylY} zc(fHq9+dkSi8y#H^rDJ&M7<|x1itB@xlOs$r@2@R73*+aMpxz(+%V*9<v-QDKR=?= zW5L<_;s&e=7M(73?^bjagBG)P!h*g0a}!4$5(U&KOn&l;OY9Y*Tk$FNF@%P-jj`Q~ zL`SDy;|b|bY%?=|5m9?J<|+V)BDgpgPU%c6tUiysWFHTV5h1F_1XJ>>NS_xaic0#Z zC1t^@apY71vVZd}7M`S9n7JZNbwuGFW4wDEm#CZgSR0i_resl!S+GgqkF5!qbEvhg zJt!?$qv7i$hWpQIbw}I^o|f2TpXmF&?HvFJRrG+y7h7DJ!hKsjzrUwg3CmE(zzhJw znQx`~0R6^qG1}_m)1Z}_l5)QSf4FWBc%!ba4p?kmj!v8qUF#Pg&EFsWwh{FhA5Gt3 zCsKGM-bWsZ<N6<q>U)OIlHeQcU{!OrpMlKw4L`RLkvA6OJ(@fRl*JKIe8kU2>(3ek zMm)epO_>+J**tQsEDqHxMp=F<2is2nYScRR74&LQCIb-a<cgn~)8teSUxud@5K7l7 zG7{nH?!nfxJ}QNj-G5f7lI0C0pZkIE1HOZ0aQZntf?LSyh?vNJ274ZMDp^)1vVYyL zyt2@lqTg{DQ=7tKW0Q?qRUo!;1dDECM`kvPQJ@CdFur}x)@3&@?o^pfK7C)QL-*mR zcnbs%8MgFZN)JLF$b;2$pT_{w@FPh&<CV{w#2*%1&Ds{hK^;h!FNB`9nkQDqCFguf z2kBY}s_?mBII+bpQa;{GKR%u^0{~*SD=jK2Do`l&HFDa;*Fy7mBYny!uye`|)8La& zDl`oidP;mVh#F&`9u7bDi=BO`DTpk4TYxu^Hu@c>?w$PEw|ZFJC08~v-N||A_PC}a z)1jw3Vu2{jBXNQimyPywbg|w!MIUnCT|_b<jwsnBqpeT@EM=emCtPxt4fHETmH+S6 z-5TcffU)5TsGs{8Qf+N5aQG|=3JTDF5bf~~R0~M9RAZVs5-iyO=#V_7o@fey?vy-9 z9JVct2XK>y(4j|o0|f9UEdS^gmUYTHKC~`mi~M*6fp-JMiupFjH4*ab4`%5Q=B4Yf z%{dSImGza#l^v?0dZfi607)HaVclV4_ZfUteVcDD*2}AzH{ZdiFMaK@gg%C@IC?8J zZ;J7C7+1fAAI-nv!ca0p$Nul0?{uCfyZ<+$ZwSf+i|6Ors~PAZi%aX<+wZDM_wTbP zzk0l6Q+%^^U2fIRW1?)i5XjzM_CH16RuU}Ft^bGW`@*Sm46uEWZI}M~7vHgLVLb;U zE#%eyVk?OjbhK7$Wy<*KAn5tC+%p<9;$|?`)NUd037kCnBEGsBDNc+Y($xxo04x5q zMMkSQHZ6%bk@}1l;Q9~tadqQah?wJ^afn{6*sEA3xASu+VgW!TZa(4u)Kb+_^sJGh zDL;Rm2EPqA;%J_IDvg0xv$IMU?RocV_kn^@IJaaOJ)7r=Ivo4-Lv%ZEM-;h`#n*IB z>oCM2SjhWNaYI8gvf<80&h6NmpF$7DKZuz5>}6jsF|_uEU5?vmEAichI8v3cF1pft zV=$2FV-7K4C73xTWA1e6pkICt8gQvpqcRx%pp^2CSQqP@oP#-wTn`e;%vb;_d@ZqH z4*ZKbRfL>A2Z~tL0g?0ZU{cd+fp|*5W#u?sjxh%|Dbn6a1)c8e&~*Ijmq?wh%udiW zFCr_+GW#DD=sZX=9{NVbw^61$u<j`#uXdF0G?5wJo2Z2?G4pdHdsAU2A@(t$O^T{L zrI!0JhX04Sw+xOe*tRqUmSl^W!4@+!+hVrZVzQW-CCg%FW@ct)W@ct)raAU~x8LpQ zce{IfVq)r7RVYGHCr_TN%)R#d*75PFpvM61@jZdb2px?+pVb;~<VpJ*?^>Ot)FjE9 zZsKG>E6gDDRgswaBSe$=ZxSIp?&<=+NLXCXj*D<{$GB8S-xZ@eckf2iB|Nj$X8%|9 zV*hV3z<=5{WzN<Hc2oTOK;EmDAmJw2_k-p7^Ng?FX>M180J0H@NciFTIaqM@z!;5N zdw-7<;D1A@C~57ad1&!=0T0olt)(><ht5}1<p>T4fVL=%u!R1H``yi(TKBYX;%5yT ztb!+FYuxaGcayNBwc)hdsH!+TE>E5Gwb5OKyIlUzyomhKdHslGx&`?l+0XM%AJmv| z6BGTh%HwuH-zp)P-{W$)SAFkaSmAKOC%in#>w)iKl4arU*3j*Rnq4yK+l;CQb3<0Q z_(oq7>HpCPK{)i63$aq}hKlsBz;ON6)bM}b3L!Q1zX=TAZT?qaI9n>iI~S<Aj~3bR zXSURr8+|#Nz2g@eD_g5D&rK{w5Z%>YaFu%_O1*u4GX4mCv|`N4eR2vW7Jf=?i@i$4 zvop~~ru>x3+d$0Osdwr)G}-?dHN1E>lE|ci_oHs+>`ex+{5ci;=zpL1_Qe^0|L6!C z5pe?0{)UEzj_1qSSXcl+wXcuQ&Ed2=r%uvmD?97U&+52p&JCp23WhsLOUVZR%1dxa z(18(tuDn-NTsl&jXTF_F8tr%ZS*>U+yK#W%z3=^Vtcwlh=wXB-cpNpt;)ND}yTSZu zu4zBay-j8EMe>Kzz2Zt^@lUBO<bhnH=znw<xGj6AtTx4PUyZ69Epi8}fTO+kiDKOO zpFBW~qwN~~h5#B2!Z6$U|HuA<%X{H+WpB}RG!+ImL=71HOH9UJud<p7BbGQ;PRuLG zJOxQ1uMnf#)N7?uqBK7(QM}UMsgq_(NcWe8`l%iR&rq+5`(Xwrtlg8KAR6kaj*%N- zR$eu~vk7Ql${Z%<NnnlI+tA>t2-YCA0gVQ%>*OtCv->$_sp}E<PGydLRg1}c;c)hK zvN2i<EgHq-PWJUdn0x%0lD#+hn8?T{B-%rs5(dR9Zn05^i;v-3rvirD^^TcmSHIUk zJ{5)i5&VbZ^1oG-1Pri@{wy!#;Q9O(@N+i@Db$po`jNbrI6GvdeFGO;JE!nZb~U%r z91@UL7mb^*PCGs{^z^u&F2R2CRBJj9BmnL1?HTAz<kqSEZ2*{e{?h=EYX0vU08Z%d zBE53Tlw_?oxzjV^<mA43i1PH?CS%_oKCjOuR(~%fyfsw&S{yw%_!F(Kf2Vw0-SMR1 zZu+^1w2YAC2w#Tu8UC7tZDjT&WGoRY^FYgTJegs)JeV!7eqkd6{5<skC1*TZ;oot_ zxo^(?$r&%;LjuVs;^VDBdi$f|OHnmnQ5oZYzJ#Z@DW;+<kBN&@wCSEJq@*)@Ejnlj z^rArf?>OT&p;B8Sc@@!iy&YazYhbNH<Of1p)AETaYTW=TN)oPBM+d1Al?0=D^bqvY zf5yt*{Rj<h8<Ep>?+in@G!+}!bW7%cjvO}!vs`O&e!e>eDl8Yt0G5W1j!u~}7CG<( z9(soy;ir3UWn^}S!x^(wk`jW#p-;~T;n_xa-0<+(t7+?qm&Vt;fTPt@p4HJGAz;QA z*TG!KkS+9_Q_fPx(oz{p4M*7edj8wf!aC-s!NVi|qoY{mD{-l@?J1FgS)RXI`Tq($ zZc+q*$4Q|ePsxE9{@=jkt{G?lHF*389^8a%YN<qWJ4u-ykjvW&Bc#X*hnK{f`j4rP zkQiX~|5Lxt=$<0nn!rcQ{wDQ-s);VPXw_ZZ<NpDI9ErWbHJ-bBi;LRG)Xc2Kc3+wf zUg{|BsQ6gX&Hk&R)~J-S!SAA`HqHNv)R8Tg^77(lk71m?m){;2b>~iXTKdYRs}%-M zu+kz^PHQZ1DKhJI56RY`dbNJ96|r~&^GE7`%X<T{*)A*Ps$i*ZiMQ=|SRD1nz$QD} zm->dh6kP00<6a2|7}bw5AH4mcBGUa%v1k5h*F<iyl6gFAeb!UMzjRJoi6q0K=NoR9 zVNMu=y$R+MAGOFQ!iaKqv}7x|=x7;de`hxvH6+QF=&BQ>>*X8+2DO9#Q#`qDa3la# z06B007KRNnc|>U6q&-M(hiQOJw$|#p>K-PnXfM>On3a|E?qVtDUdyQ`Veb~Vh&2iX zJjo`d{)rioeUJtnnMGw}@vao&;rd0A#WsRRhsFR`HJ!{h3O9dZ0>f96S-Y8U79n~= zC8HY{nAew@<9#0Lx)>kK`&O6&G@h)8LXoa2=B2zcgpQJ5!QN#VyI?0bknQUm|CEN( z3wHV71OphRAHAN0COvYLL#g+p21$|e6oFNhm*@g#I9$Dht~s3qk7U85(lg*t!n65? zT5Zul9l(_*yD9`z2h$W_`IjHpY#=Vz+TOH|RUEfNKr^EK?#!%h4JgasnUBOr6eeRj z^~mzh*$F8sPqEn7qWdG{Hm3(`rIgdKOosYm;2n*xas1zK<p3qf<Nfs>h$#}mcNQ$y z_X@~XpgdpMRO<k{z<y}>Rob(|?OAUlF3LVcLNDmZ+k1Dw7lnhGu{ClQTWlF?yu=_O zHL7LAi@g`IQ2Vmetf#0DLFQeD@5MQL3_zSN@tF9M--FZ5)?E+QanOAeON<=iOyShw z`X)OME}T@)tW)n3c}er8hRNH$mW_antKhlm0MkpCFWrbNU0dW1o}PhP*FP)tLW*e> zHGRQ;GwNIUq!-O=uv8x-{Y+29RQ2gBo*_;FCAZqx#}+ru2|T`h9-)~3fo5*-o=_;x zw9FIi-<t69Do-wT51W;8>RSCyS+u;$^7|@1r9%HavsDe5G#R_}PxWlX5YNk-%kgYx zZjSeAfC$KUO%jFzVyDy6(pnqD(6O<boQIVUbeqdBh;RYv6I(Z@mZ6ewSC^&xqZ?T{ z&jFvLX&bopk9A`)c@)?@J!bDF7rI-Q5H+3iDV^f1yOboZhSu-{!0a!%-2d0?&zwF5 zaU@qIMj;MR&e6I_L{HQC8h#4>AW#&53K{#XakCfl^_2unWW7Kcoktp_IVDk%-K#Wk zQ(3=v(cWx!p2x-EK!NKNxO@>O=W_hncng&<fC_&Vf`3e7z$OJ7ypZW4d<|@z+u6+c zk)l<Fs}@|tOfuu>o=Lo!V<t@OHjG4+cCKJO<PlOY%3Zf~+5QNSHFWOJK>^30UoNf@ z&gQ%y@BYa%M=q+m8P(vy7V7_$d>K!+LIM`}j8fjxIMDO{XZW;Pk3ZtB0I^pkC6a{- zKpDr^&+iF%JwEaPVJ%@{VQdyF4IZyeni!D3vhWNCW;DUp15Kybq-b1%weC(PiU!TO zD(^lV#-FhN+&j{{%r{PZh}rRl>4&i022(v!5@&Um7uy(-if?Sy@UXNWL80whx*OMe zn60yu3&e1dTFT&<sh6836uzQUBPP`iH$b3*v}H1PlA6lFh1p_6;`k)eD2+aKS-jO) z@A|s?#a)5Kznz##sV*M;9ye-QBA=+mKC*oMJz8>bO$gLhGtK_M-lM4f5U?Y-7%oM> zNuL^<bRk48EHBQs0qMO82%QC#G&85-9kM$Z7?D<y-5nd~!dd1kLu@e<IENW5sqY`w z7VJV`{A;=UK?#~8n{0ScoK9&8%VhnE6-?t(dp#5OB#9b@6}K`Nj$#;wZv=44B5z1+ zj%gpO!xI{d$)(h)mG7uVwS9lGB$>{v?~674DQKGO<9UJ4oi5h{$@D|R!{%mYkU&}U z<YXid6&3a6ZrSo>A`pagZ2a}bdzDWsw%VRk&Fgy)9dhPafc^ef9nbsP=15fXPhBBi z1bHpltLrwOS&8^*ZgdVl$6<d8XEd9-r;gLo%(kqJgCmt=`PzMTv*f?%Z$1tM2Mu>l zux3{K-=B9g*1Vhe|MJ8CmjH0KREa8a08A{Tg)2QsQ7l`8spe6{$A}@IbW{(6pq`)j z7XXe2TiIfj9|#Eg5o!?#&eX*Xc1-~?6Sh3tjE#@D%(gt3*@+TWxsmWUiyV%U>+$Hu zGCiX4N_;$k_#;OAJsUhoR4HQi3qiWlVo=g}OdfN3!w=6LX`EXLR!aR)>hrF#)b$?R z29uW5fZ9J!?;lu=_$ONB7K=E*sCG2n{AKY^SOf8*v>Hu<Y)uTN9MZqw(f<}g^Uid2 zO^NFJ|GIPkCMX)m5~+i6Yrhzl{wX}G1*Tu6*G|pU!Bd!s{xOHkp26B~^I2cd)$zH& z09AnR)k%K@2)sO1>9pYGJCoX8VdLWIIFMh)7T+uc{qvM?An#DG1^DbbKq$HWKT&mw z(!nWiRuT&WQa{KN41l6`dQfjy9DJklVCF1{eY?e)7b61&em8_t??8X)Vc>`h+ZD99 zd9Skyac^8A5$ic0>hosek(Mj~@=-g&spg9hQFfEH!8X)7W|$~YCj>$NrtB;2RR%o~ z`<oSA>L&Y`rs%(yj{G_4M>K@=opZO+sIOPBw`E99*PIU*k?u~0QirO<g{J=&@gJ2l zve_R<Mm<^(R*fciZ?Hs`S!{f2tEve9S;I#-5b2Zuj%x8rNafp>GyIPlzO_~%6IPyL zq$Bs)L+PE;^)@SR^44%c(Xfr@N-OJO{}=%QaDdy;`6JsXl{??`E5+5p<vsMr+;uw= zyzkeG_i9vDHv>-c7$3-xD9@Mi?m}NSG$}AcM;Xg=(1eB3?M3JwJFB)i^re*7O+9@f zVk<p9>a*7#Nez7+)vb8aEJ*51Z@%Y4+p|)+73!z)P2baS?20IKk;=T6+gPW+<IV}I z3ZSz8BQ6)npo0A8TM&@wKfe8cy#7CX3nVi;O(-6)^YZe>(`sbltR~dr8r~D3@v`>R z5emr))R)GGTGoihmXb$Lp8AVbl)o3tK#1eHRv+gUy2kBY5Bdqpi@*ir?;L%u(n+X_ zVKJ<qvIC(XqJ7IX6gb7oD=e#eh%Xf>H<+*k|F8Jrz~xP}0uFNuAe|QWADIw%-2<L) zRuh%y-NGkgVRkwRPdBB}1{&Ea)KP!ap7VCBdJ=GxbV&=B$@+C0iNxNmCIZimi&&1* zBc8?CT?yfwwZb?qVizmD=cRjP?)CpRVB}ML&`N`qN_V&@^%W3=wS5$Q7_(2skNrr% zW$pY?O$yj*14iMZ{iuCIp$5hfLeEzWj(lTucW`gvQrvS|ZBy!5wz654A;$4i29JbR zT|>z*1183zq^sjvI5s&1RDygum2i=#vJ?*1g-JhvO?}4s?3+Rg{-fh}v*>>)nkN7_ z-eUG2*zETp{ASQgJ@=H}F*!rz_Tt8i(-s2BQ{^UyMftUp@jq7NSca*IRwnR;@Z1wV zSM=R0EMTxQP*g-VI_BpcJAQ%Mb^rR73D{JDJ$%mcDhL=<YUkVQb-4&TgQVipluo{F z!e2y-=!W)RQ$Bid4Tlx|KZr0@O38O?PY<i=y8Fog$s9kNnO&wZSZPz#3Hw>f%B1tU zyxbtjgo%LLGcKAs?h$E8xo|g`^<fXF=o0wc>Ld(5w>Wr6+uEgV$ZjjapZC+Vje9uj zhNc9jGH@-m_8viRw>;fezSR{?&2&p#tG!Hb;?y|?h4ZV#RlT0fEi;dD25Kg-8>s%` zQ9EYZS6}&-zIGErr6P}Ru^JQGMPed5zm*h;I8u%=Mz%+3VhsJY96~<2^0Ya;R`mcD zi)GWY8*d?&Rr%$K-MNM7&Dzq?weD_!o)T#I4mtN+q?9+|t5On)sR2yo3d69rMFj3R zj7EC8jQN3TWB&>^-}zp?|9aoGhfG3IfPR;k_t)j`+nJUj>)#h`!{!%WZe8qmzGf#v zQvS$tu6y;k#GRBgTGbp-dDwilJD_bnOyd&3tJ%#e<*KkE7mWYL^iNVd$Cc7OkSqs+ z2d0PnYqp?xubp$)Qsu|wxzX}iP8|7S`YnlJ+fh&fXz_T(7Y|y8I=kZR6JE!roV3@% zC=GTChnWsymDV7@pyCPAihosfZpC*#lcdsWb3~>uA%CeRJ}e7fw|BT2UwTRrWK+Uz z(jj-o>2mXGNk<`gHhC@F%ll1U>fm2};2-PK3U|=^gf|YbU-k#Z#$91E%Z+U@F{!hP zeT-TNfV^+ql+y>aU_ox4O)cB5*VI#p7f^bz%Ij<-CNfL6rLi9*>Ou%|g}P?0wjB8u zxW&oUV!0X4%)=T_QPz(3Otuo<;^!XN2WU;Np@WlO&W;K|gLxFjk>vZRt+(oK*6IU2 z<x^9suvK}H^^#&nT{9?>@F>xw+@gf9mn(M#%C_ZYsW8G+ztKgq2A>f+^w&pSTUPO{ zzN9>UkT;=wk5U|cJK>v%m!Z$uX=Y%i9MIANhW9`hIHQqMP>3<*Wn^psr!&X1l}6Y3 zt8+!|U5hJgA83{2B%GSyt!sw&fD7>iX3~96=3enivMUN#!tL&Hdnf<k5z4d5>X$ul z@~kNnWCWcZ8<bJNY}rUx$gH%^I2-x3dp(l7ysX7y^Lp)!vYed9U^I;)S=CjE`UaNN z+B=yghj!jo`@0tHY`|1Bl%d&H9Lr!JUtG1lf|se2S;3xX+`q}5joyWX40W+5S1W9l ze@X|Z^AKKlx7~w7)7z%ETM_s4exDzjI{a#}#HPRMHNz+u>+tcD``3Z?kwS{FZ0DKb zH7(T>ODzv|I=<!;%DJ-<I()>3u^JG$XQdc@T+SA|)iesT&GP5H?N?*xU1)6G3D@=L zUE<2K_*>OLYeSmz2Q53z>*Ic)T@WCabMDSyzjgwk5MQ1yU)L$|MK;t%kr7sWZ2EiJ zt&6WbUf)sJ7=%<L#^gRvgwfSz6s2(mHYJH$pa8dkGZC$x9f(=ne5P9g0-At(;70fo z`EL_xjXu9SVCfST!mzSjp%J2ai|RK2@oPi%{PAmlx&7glZpa+JmgQ=^Kg}eX;brY` z-k)1R>@MoF*H?QCt9Q<(xoY!;QIyi)C@5%|wZUkeBYPkLg#|;JW^`Be8Rb4KohMdZ z5)5N)95yT`ux~}t!}<YCdC~5cOwYy+A3&NzMHhTs?Y-4Xd2JAs6~{qgHc)SSdQ;|e z8*xNG@F>%0Z?fA5*4=fLNY|bMUgq0Qd5Q)w1?CGW@-zGFwLsvC5kP@{^99?ZqobWG zzJYFjBcXpvUgjwRBNH;yni8$Jo=IwQw%e>02bMXDG%_adFJT<dL2J8=?XJW$CQC+7 z(6Q|P>)~%vIJdB)ncaW0Zj&56?*|?WEqfyR%Y;Qwv!nCQ26xw!G}e|JDYu-Z@XS4C zkdnqip$F;zX4&d)fv8TuN2{;Cs;6CJyAOW+cY(J5r$X2NMxw3c+900qf0<}&c5{B8 z^}^^E=>&CI`~5#m(NCO<2Y(`MnMm$D?J^Q{l4w&|F@?@MJYfc&gP}q;TtO42CPdRW z9PRcA@Y=jOb83Oi_|4x+ICXYh_4-`4Vn0N15$R)PoG%Vma|?u(f#&~TP#r)@7*L>@ zFV_;`^Y!n&ubzvB2eTvZ!LdXT*JgtQLT*=(?q`bvy>nkbgviZi5RZR8RR_z~dOUIy z%+Wa&If%2m_-jdqeyoG7Lq0@-i8g3Q7uF)fJ{t6}Lw^d&>_;~AtTnl^TK6a_8tx_O zRo)Hhp>Uci(iaPa)F>D6Cr)*7KWxxubOLQx6W%$%dAq{-!YuG70yhkZzy-AmPDx4K zO*&fC%HcB3-R#r5jCL?f;NqPSA~eeaTx_Ye_PagKmCAxVs9RU5C$oW=b|VU80sR=g z+=Fl<<exCP1e$A>bBcb|q$-6=!~=XyW0bafQ(?6VSHra(2pOIu>XP_aAOW(u5RpUF zKm676ZVZC9$i($U1i$-W1P}AW4g)xBgdTrZ!Z+ms!LkfrY!|8Byh5QkgGi6E+v0|F z35Q@_>__q3nVI533gZMXint9pawOD127E#yORR+V5LluK&vW-NdISS)CyIq9k1_wm z>hZ0V>ifn05f#(&+Pgjs_ijv3JTvvJ^l;60Ho7*nFv@=C>y*AxPmd$<(D9ep-|K-{ zXJ}Ks3CKtX0$o%?Q%|hYmb^*q5Mo|IQS)NSllRi8?XJSX0e!Ts#+ZC|=Pu41Q{RL% zk$zm?Bdf?Vieb4|j#%l=6OBwmybIVXLbsMlxYOX1<(oltS$Hlz;L0UJQe18l5NEj! zIJ1h&`4t&{y;r9w>A)K`sqws5N_ZYf(_^0#h=!KM_CLEEO`;A5o@EdaSjO&IEB<Dj zflrc1AfMSUVYc%)s>x?dtDE;-J#Z=B*r%AjSXg=x$$iHaP_o4C9<V2L;_i`EjCN<H z-Qg2uKdL<!SB>1;L22ytM&fUY{(Ya_oU`_m6{|vb?-|BzVp1Z^GL7kx|0JZFF63QC z{YZ+X_fDnaWECO=Re0lWvaXR=RLiV2@oo%C=f;8uC5|Lzi0l&#gFj;&y~s+s#FMjF z(cXsx65?%Sq!SWHRzIV=h=g^GgvXkUdnHN!CHHN#Ja@w0_fIflk~klI)$>l6T~_3o zz&pATgJUO|yiaH<xt`+A=W^78xExsbrkR{Y7wb|hOv<7&YX=S^`N`r+E>@b8!|7Ho zrAGEurdXj332vsjgLd_uiP`yaKTo`CF^Y%R<o;eSpMda&M9H6^9_>t(PP0Z)gEvZT z$60xhz8sh7|Ad%)Eq}$S*YD(JAPsJ;8JM)?<O5xBU=4;o`~Am6zqKBl8n<P7RV2O# zD?bI1>^-h4<8dGZJ9mEQwe{~0_K&qh-Veu}_{ZX7)m38)D<8T+u}+uuhtI#1>c~v! z2*%A>+!PuAB!=|TV+z6h^5=}X@x|cB+c(E1oSE6#+FCgO??CWcbv0MtVw-;_OIfS% z#7;0>=;H4^i6qZB0}1#p+U9;%T4<Tm(gqtldo%O>4zsUa_2;R*L$qv8OS(;>!9~RO z_Y%Rx5Q11rd75wBIAoyvF3-1Lpf`FU!iiYaG;TCjTuPPXFP3DpjJYILGFa3;vI#~U zcqgy-;Xgb?%o*m{Sav2?=8g<`lOBZ@jvWXjy{%PCK5OTc26+u=eO`SVtSqjDw%0pM zTwN|_@D;|&Xv_4zrQ~y?$RQy{(qId*Ne@V8R*XV+X@z+a`6hUf^OJ+jZe?;g8F?y5 z7E1du0E0nD^(RFBd=Ar4j+_ToD`tLJ^)xBO0egb7-z`~YxWy5#OAG*f8=gGc;e`E( z!e9+Olq}chp52giU<;OW?I?sQmc=wjvsg*UJuxV!V(+})Mw|9H>PU<lD@Uy;Pt*_j z;lZ`4plH2vO1d~EMhL?&#bU#r>l66)s6_z%!@`l_;MGcIeAlbF+7a{^Nshw00qZ^7 z{6~Xy&f)3QX~=3(B~g%71I2~FKKqrSu{wsY(j*=?oDgA5TSb2puYe@qAK36t+-aqy zrE-O4X2gjNe%$J=w80*!hSsNnj&+}Y+^LrdBfg?M8lYA~xPCFdQ%R!Z_}F}swqf12 zP+C_=Ufad*`Cxv2i~VwlTk*TZk&uVrUbVXHf{t&s$NPfYU*zys^K;rpaBOqb$?=nj z<*QIo|5*c=%xKRMYcQEEjimc-zKmy<gx}|EGS_W*TVT#@jD&oCyei#=*?--xJzW%z z<$(jAVWUTi&L<V(t3AIx5d9*d@p%0;Tb#YmLgQv8r?)z+6`8QYBvSKXH{+9hV0$~1 zH2cJZYth$-Uo}ZT)vOS)$d`wXp~eU8i>XZeo2tv2+vMcjz$F?Wr4M1>>YaEeV8qCS zgAo`>Twt|PjJHr#hk{wUFQ<ZV7C3%UVH*nSE6*v$#4FE5*4Q644ZF5Q<s^T^lNTQv zS|*=k=c_~`iB-_fO&yc$+{R9Bv)0zBTp$|!W_nGO`a)WcJAN42nMD<s<bFi0O>-cA zTv}?3W)eiuu+u0o?oTQNRl=<E)R^i>QQP8Mm0EFk%P|N8TxkO)DfFKw3uL2{;RO~7 z9UXmaZ0x{NN^11NiVft9pe;MlIOlLqv#Lm<?gm}S=j6ow&>pVToU}%%tQ9M8=T_(U zd#WL=7;kw!^);!=f>XA800=MK)tOsy&F>O;sSjfh#K|U*%PeniUl5%G1k2p0B*Yi3 zvKw#+Y-r=`cJ(w`%d#p`()iXsI<U??boZI+-^>uV3Yqy6NE2~{WViXTx`ed4CP}OJ zJA5P~KoHKZLqgQoR7zO3)t&I@>Y*s0w5hoycf88!+3%3gNR^Ql&{)fDh#6VXpeT$r ziJOjzMf#aGEbU~LI@?6OrTJA>(Rcot8zHQ#K?W2&S#oQ_cPN;BA3`&%2TydIT=~0F zT~_-jBcrt*U4f+jU19Y~ehv0LN^Mg(1Bt3d42D*r87UTz4`F17lq0$%&zb%nS}a?= zyplRuroZR_0VfmZpTPv72gVX;lXBzL%KQ$C;Rx=NC7YQy3&Fx^e$~r<B<%Z*DBvy7 zjVWmHcWVUmGxcaZu8+nY9#!1nyka&vs=Go$=?Mfc@7hzao?{z6e?6@B`scyfu$Si^ z{lZ*tPe&J`!R9;Tp|llB(|qeliJC!}&~9r)ooJu4t)X*~J`Yl%tX3yp>mL{CjPRZg zx26;HR#H8{SmnyCHZn|E$AG##1a(R74K~;BGpB7wY`-V0jl8o`YY6e)a^8KAix-u2 zwo3Twe?!ZQ5!Nb;0*W&5UD=${^{a^UYicP)zC6{W^pC7|7r3Q_x))Xsh_LMge7$FX zaxgNRy{o1-1A?7iy1<XfVKJKADEAaipi=ovb~mr{FJgqrOCjA_?Y}JerOM?04wN5Q z_lVWRp~b|+gw^@lMPjeY>JNEa82M?@_O)ce$pWMk>3)#}8l$$HM?>SfozEv#YDbDW zVSOnOzf)5yuMGPh8ne-?alg;rxm-jz{F2=v-8jS#p<beZTsjcvglQr+#r-xR&uZ1^ zmwAd?_DOmBtFHEwFd3e*g*fj^BlK}7@wAuNl44;ZMs>vJ<?i(!pZEKvfdOZI^t9>D zg{(o4b%_Mjz#DbQ6LNwS(66fB4W@*2Gm-)V<uiWpZrbgExp3UT!pCHgt6Bd7B)59* z>JNA;EaVF7hx{1E_$CFu`9-%WknAm*`s>+5n-mzzM1$B6V4!vL3bDyUVx1G#SqUdS zQ7le+OB}O1h-LWK_B0gT{^We1Z3m%fSa~7z280)#({ikP=TEtXEz4LDSzx^d`!gD& zYpU*+6B?#}2l0Re7(`%0v(oBXUlt~a2>uJdFqg%Nd|F35BvY9EF;<LyJiTS7>q}Dy z@wK=6#B){C!Bf4Y*JDhKwi@`nqe1xIFD{5&Vly{gM4r4Al#ooX;p5bK!S{l~P9krm zvo@F6K=vv|8|^(ql=h3sHa)WUW^<_uF(KQEhE;K9Oji#?6&5L|Piy%n>LKa6(qc4i zjI{W{kPlt-6v!OBnzCV<Z+8Vy38KO58T8iBc?{U46N8<@`r^dd$9CF6-#EyJ8e;21 zyGjl9L$3uBMo*C`Jf75?g&-NZ=Cxao$~7N26=PEm2D85a>V37wYUuAHQsQXch><Y& z4Ep+n1bhvFG;0Ef$|qcmbt6w&7x=jSJ6CiBHF#Ejaz&mo+RdJk_{sB$kC2xuKCAuG z_{*vE^}{Q9f5+}7Y4a!hfgM{xaj`s8SR+V=NU!ou%EwNIWwu3!A|g-%YB$RyaG^r+ zv9$S+N1Xl12aaH}toz-(m2JpR@S~Zx#b(@lLvWgR`c=u_`w2VJ_wJ4&7cG0}ivv*n zJ$eVR%}HBsMo)S<-;lb{K+}m`nW$9HUi|V;vs3bUfW8|hx|_tk8L9`|#!i{{XkJ^d z(=E$6i;s2k_3->QNS#S+7-0n6`irhWwQW>Sa?`z^|CSkIct~)H%Xl!>Ag2d9JMM$< zwH-k|`q#9qo{7m3)pH#=;wql3E+J8OmRNLa{>p%?ZB%huJ9{9OxVVR~4nK3%=yA%F zV?p*?|6xa(fBV2L$4wFFh>vHhpk|bxCDV|x%Y*Rw7%ue5LBNIR7dcrR#%T+CE)5`H zrhP-`?T1JyRl&iGfp;HN%jxJLEY-%v$~>Q!TDGl2pysp-RW3+>T!qgU94%PQ<HE(p zT$VGOalYHTj)iqd+~A7K&Or&%jN_8Bk+sEpGgO464PQ@B^#Ofr-|+UAJ?!d}>c6+e zuKS~-qvPIjg#Y+H-_t=huyyeD^*x}I=On(ox}v0_(o^!I@80Ehh1j3HF2-=0emqb# znUOI|NbwC_bd95FDrJE(Q%$P;<&;rRX_CVNJrs0IZndYP^W1fbSIK!zf$jCC^;mvx znvGz@e%-Fp=t8*tUSdI_XE^eSS--WKMYDf>b5cqo3SIjgQj#hVCWAym#&?wbb1o<K zN3Ir%4_s28jdTQG%g_CPs%Nz)%SbM4I&qs5cLwQur#2_b3&nU~aHwr-(OEqojEFOu z6C-`j&!^?Nb$+dx?Q|gNN70=}spP#}@N*BGHq!FzOGkOT^k98-X}^Hs!J^1Xx@NmY z6=}8Ej3WP%OU;gFJJ!(8>Q5)Ge&zG)%*vd`#7w^O=VW}#OIJ&b$qU5hfveHs2kCes zKOeqU-VSub^W!LGOWlJKPpQmVJC(7ub3W$C4egE!>-9ELLH<IL{BTQp#(}e_hbKE= zTQMx9k`~Ar{MmRlnoyyaxz!3bjNOSK%(P%=;c<JeImv-li3_YXdZ=bJu{i;mX|vST z!=M1g_-E7TBGF*bH=CztIOI}K@aY!zZh~!+ab3M=P@&pk=yCT1k9|m$uSUenvkzxe z>YaTrr5c9uIdmjMh2bwtd)_3RO323r0T;1v!saxi&QKvj&&jJyuKe7OKN^J9@^JhQ zQ$9M6ZC)oIp8foRA=O*xp#M0oCU1dN|8Nt8|MUy}Nt5Y7)?K8+!12n=1s})$vd!7j zL+X#636L5@{6hP^EF8dNO)}K6y!;V&4VhTmJzwV4Y-S`Ds7sFPD2`y-r9@|{u|MDC zdA`Z>BFisZrCLJ^$Qa@%N*T}Xm%Fcc&+@~de9iE_>Zw-Sc1WWu>ZhQ%oSd9mvN|4m z#5;C8P=!NmFXiKYugzA;Wr1F5@*+WF5!#RDJ=JC5#~pV%OhswTg?k97p;vVpk?=UL z(6QyZ=P!Z$I9gQqfvEL$F6-5JC&MYaC6C<xehUi%JgW6-=}v$z8jm7q9Iv@u$s1IN zf=a9USi$6LE^MKu(oKz<6RlrM&2%wWDWv<BxDJ*cRRJY0{eluWZvKWZnv}kZpY{C9 zQA%>d^(EK73%&5Zdeo{uC%w=9%yFgT<DNG~vd2TKbfNKe-ComHx}(QiY1u5l|JWg> zh+NTL697F0*P@%R#Qt2SJ~m8c`Msz@ACzjGGLiXyrCFmCQZ+=X->7@)UZ*iW>FpH; zigr(NXvRG0;jIo`MbWx1@LKIT*{(vZWMQdVSDbS^dUUdJ@KdUNr9yTPh9<Ao#&H5@ zB{nyI&N3f|x2-nekJeznzuV7_kKKdY+L)mDPzW5L&stJRd)g~3Aeiv5DgD6TS1&WT z;Sp0<n%n!Np=$YhXl0Hz5B{-EjMGbmeFPEsJs8H0`E@n_qq#Qu1bP4VmeL%Li&@M) zyZI*&kUZ<^FOOe2@n|J=J2O!NVfn$(u-{7HI@uMzYPgYNmHbh`K_;|1tUy3`=$}G~ z<oD?&Nc&+H>g>GA(S%rb^Ofj@I;^sv;KxSBor#Ca{ci#|X4yr55y4N4p#lY|#tS9L zE!=2(Hq%3Uc`J2%n6BT7yKINQJ?Krl>&%<qU9Tog!<XfcmeT9m?`sn)4gY@i1juh_ zkPsggof0swCuifues@^N)9{ME)Jde>>9jdYtVdDsrucBPn7$J8N`omYE9Rd>>}f8U zxhX{5-vy6<Sj?iMv5&PMs#~gwiL!Hnq5pp29u?2smxFqmmb?hleyqF~usK9;N_aOE zAof;=ONIfJBJ)+H#ZXz3vRaHFO~S1q9>uVxBQSU_#`m!D(DCW{N9d}9K^j}GMM;ax z<#)NO-p+A^zYmiqWXCoLh)ae;fBt&pPk&;^&tkO+b+*G1z(gsrlf!XnzM)Cn>K2;| zU-t~CKCZP*0k+8gAjyy+gzp!@^2WVzL#%Pp69U9GUV*ES_*CfrVq^2uT@BUmkC+Bh zJvIVt!4qBrEc0lF=1(g=vmiR%7}?F^#yP5spC318j^5PZ5C_Xgg-4$IhcC7NWLty$ z0tM%WhlIHJZ?Y-COo#vTCI9mk{cH0-KL8Tz|6d<NtQ;K;+rYs6<KvZ8RIsWUeXwZv zKY{RvFK{%q<2@z}48{q`4*i~H*xwoPqkV7<R^~aRsvrn#i_gakYnH|U2f5hqpu72* z6Opwv8>*;G`_t3u8ee|RHx?#d@JlD~<k`y(8H*ih<lzF>`+x%G=lvBF7RtLbA-t@O z+gC*PN^70KbMKqg#3m8a7;5go8k6Cqx$p-N$RM=p_E681V6KHTj$jktL8`lP)Qs8{ zADOkK;Q(0t5mTP*SrH-b<|zV-$5`WJCdWxIjg5u}3oS;k@HPsZ9Qz^8!CjwYN|$I* zz1MGS!q6%|3=3LU-DHwnjjLl8ncX%@G}xIW1C|8i9GQ8(E_I@Uccdp|bWGS!PnJpz zLXY*Nnwsbag?_mZOJeL>()?Uen?r8@co@STc$rMDdo?4PS(`c$YbhjK6f{FedupuD ziZ%6|57@Oq=vy$Q{lHn1Pl2NR#zu#3B_}7R0;Qt4xw*YP%hQ-BELMjVJ?28&^YF1w z7^-4A8XHIUFKE#=j(L&nc?Lod`tO3icx&ielCms(<|<VsiAy!idR}C}(@tvEir@!+ zzM*&B@*_so=IX&uj*|H0@D{Z00FB$;b`M{;3*@e8cQW%%RENEFFGYP26}y+>^46*{ zwu$>xVZ}bWJER*lIAG$CDnCR=wyLFjolJo#mlWv(zN-c9R3Uj0rQUP6S~EG{$UqS- zWn#_FQ>1Nu)lwo@h%i^wZXWgc48!O}@3WF*mtXQwNrGN|Q|ku}s~esgJ1~EhOj)Yq zBA9naXVbzVZDrvxc>#=lq~O3b{NQiyLU(o4Ik!49Cb=zVHfKp%u(9GAj%YSFK`Aiv zccS)T(#kCyp3@jYDw0Ux(|q=<iOUJ8KWvnw5nz$RH>(FPS!UN&ijKG^*A!Zm?Tkqj zZC6LLW=4V(IIc}H8$s=jOv{R?#kk1C8209}k0%BCj!0B6g6?OITMBNn7$C%s(@-O& zu$N}V7f++IP%v^daHgd{zd4-|lhtvAgN3~B<g@Y~n%qd<=#*>V;_WS!QpuO6s{;43 zgI;f8hkfJv5fl`(tgP(d8L&gony@5~q6Z3Y_lFx+9w@_Ye93Q&^w5f2r}&%>LLZQ` zCL19m<j(ZiQa-RNm~SbY6v9g1@l`wgO=<6@fRdf_V}wJ_3y-}MuyWuXChqHnYnI7h zg2#^pIqHZ@A?@yGKBijT-XHJz%akhBZseAx>Rv;<eK}U<sfAt!huwU3lKk1GOZw!> zAje&1;e4KfP->D%j@~~=WTa_l(_`fB{o9XKSkBT|j}@8S6k`lH-IDbzpifYA=vw1` zAfzSA`f^gJqD2eW8FgcEIZ5!z)#B_f->EO$g4Td#@5gwDyX8nIG@=Qx6=-^5n&V_V zR&^<JvczO@*}iILD(zWNiU>11W<Cpyh3WUDKTfSN4O@^_S>y~PrExbN6P7VZhCGg) z9Jfee`=kapP$;KF^w{-DR$`y@QH6=nT|iAm!VXCYRHjUeMNcE%Vx2g)=ZrI2K7S92 zyPBtEe^~iJBJx9RTIuJ2{+I;*T9$grP?y+=!E}nlZ~yI<IAOy7ppFwIe%cP_E7NF> zi;j+tkH0@IZ{OS71DY6Z8r8|j$b{h^m?rs`kxX(nEI?p+h2VO^ChSZvR^ghga>MLy z_qdR&Og@O<dwgVFr^r!m?hGW)3Uy>WnAL$-igv(Ft8Wwu_n!R9OB5+iWGcwXu}ges zl^xtHm)L66&*rpfbK?unC!r`BY8M(}cOK(dT`A}}Yi=^MMkZc7w={acEiW!~jtd8C zJjNvq-@2XboGcHII`kc>-}7i0%%vEA=y*TzdPary;3hocBHxPKzle4JAToglJCVkJ z-~H*<-`FL5q|zg^xT084;t_#@ZXzl<{A8q5Q9kZPjEODi`7&xkUXPHSw#{;!z(4fU z5CAXC-{KWgj!xMLEa{@uSKd|%M>~gWc_2Z0yF2(@H-o0R(scci_hzrV*fEVG;@LH| zYS_r*y0&x#DZJ0kqYM!Twec;|3+YDb+YcwFn1HYhoh0|Qe2PMngGB~8RIE1#Wv+lm zqi4vb06N?ON)e4v9#XrqwMnd{WL|D3T*aS_Solz=xpKN+OvB(>O|X|}wFj%Rm0h#; z|FJ5rVB-6EM-qutEuOrKU^3`_&{&w8Q&J1o`t^1d-)@HvhQL&%#9fhNk^AcX%sub{ zWG_Q*yWRW<iotEJh}81sKBgzTtr!~o2Hvax2WwLn8U>%iM)A=RL%Rq|U{=!6u%m`~ z$9jsox9F#DKf~eZ>}L=1`;~ADCNn>162j+FQxxjWJ%>}0yfWfL=QT(Z+8wp}V(fWq z93OkMU1Zh>$hexd#|t39GKFYji)U@orH3~!VPX7g<p_(($kPqXlcCQ_y2H;74IHyw zohD`wv3;A<NF<1(96l@ylfK$3b!>mS>~^W*WET|TMhn0Zi*tNPUa&Ln(;$u6xLeJO z8PU>hkFwitDvz0Obp;LYkjI63AFF(l%@P7FU_H8;W<Q6VJ~=Jo$saRd&9Z#Su;R%U zOE)fRM{~SkWT1BTb)ME20C6$__MF@&un66q0Z2sD)YLzy(VvD<k<834mbKK>mI*vx zzQ%(fFtONh9~8$q#$N~Sd=D9KXuMIpnROh&G1P5u4OH4@A};qxJelm3h}#l$eyNt< z+k4N|&`3hGG@WUWCSWptrnAgrh!Xs9btF<wuV()#072qySE@82(tV1o@h%%}gtI$n zaYu4s&@{p0C(V+~73s~a%~Rb$xAJ@V+Ue!Be72i0lDk`fi_6bL>rXU(ly7^ROwoCc zk<9H|2HCDIelQ%KNxyz7*x29MxxsJwT$eLSxv<<tBQ&M_>TtMxBjJ30*}uHj3C>Ok z#U6ma#eu6frdXumjetDOoMd^bvaMHEc0*mSJ(7YpWBg7&GKxzcw(4*)lE_4MZ~pOI zi;Hl_&dgb2+Pgya^9w{)&;EXjdi@8wa=vEEO!lRTXq5;b*46`@-$YIB_2n*MANd^3 zoDTqao%|BXrF~2E4nI*l3l+weRR3PnO>?WuuQ2)V61jzP#vF5f8vPC!r5U*qPUPQ} z;vi+hTzhwS3*LiTjB+_$qA>hT;!q=sd%vs^fP?U$N~);o68LL&Z6?p>;a(EyMgCM% z=?nMMpxN~ldU(K%&u9yeKGw-$Xmx+BJX%X}EIROL?pSCLdDxB!ZGzc%k&e(o?PFSx z%5CIDAq(w}Z@XLq?H2Sd(rAo*n4TqyDnS6LGC8s1ul(UoPX&jJ@KgwB&>*m^-Q89h zgjVdhA|n0LIH1A3S>C8SHV=tUwpKcmbM)gMq$qoq>ifttW*2UMjv{j1Km6LU)J)qx z9x+!eRGW0o@_ruC=ei3ws6%0=GB{hWqedPa$R)`osXtPrPBR<`n!hKoW^y|9u$!JL z=XF||j~vdLSR44JQfY>J0_X3_PM7A)WGoaAP85HHO7#446tbQjBB^DC?$qw$vFa-O zHpVR;%0pLj(rVaqijX{FX2{RN>9My9(V2F~sx<Ox!79}~JuH}@TNG%zYFM=5lqr{0 zm6N0FB{KV9&!bAys5n%@c!3Lc!NHBOb=uKY>LZ>)*3*)LDPu`0dA;nhcN?Gg$bMZS znw+g#ecCFZxpcR8hwzkXa+Q)DRw6V%kh(@gizKO1$>|*3`I&jOlerM_J}q%OPzk|J zcrN7PKHkt(PsoSGU}*)jsenLqyJEhEv~b~8@<eb|;I0ak2>AKLNq7Br!YrqxD66Td zGC#BhLq_91_yZpl$75lI17}|f(TW_`Jv4^gRcFB#iIaA5mV?b2g$sgP7xU3_n-^)n zNj@G!8O2@iB4ZnMX4ltVRHo%?jiA>L?Xd;Rn0)ZJf+9(xV%4QwUs05ukKe3uy(A*Y zf=#H!a{c>DOPZI+p1TSr!AcaUEaGo6oqx)0y=>g{%qXt*mH9h2ZM1;RDpK4u(caeX zE;J4+ea20=_bCg-+7$>}BNxMx90$v8cy!*Bm{*ERoM*xBqV97+_KvS&ML>8ZqW%W) zFhoUF49KgT<PrxkTb~)xou<f2xZuzQ{Gc9Z{v5f^z<~)iF*RlL%$jB`BUn*UfyrVr zlO4`Gv}<#|(l|W<2(_U60HTX(?`eTN2;Mvp*%OyST6Cn(1A44eet&uysnbIY=lAKP zsp(x>!KJI7A+Cqc71=e4rx13zyH!XUB-MplD@Y+^QPd2LY?_hf&#xvsC!>K+NaxY_ zbZT3{HT`)ntvA+@3sC3jv4pdM$6Rb<-&sx}RyGnK*35(^0~;dV1%uvEVt<WC+qk)1 zLb`D2sDfw^74g1b&m(s+lU3;KKfbu64!~biS+J%cq@`_-<^fJZ$G7UwJ60zltuWu} z+|+_@;n5YV_4+nLxr{rdx%YdZmh0z!0-3kt)3(>v)FXGPSUF-TyicoA*Y1}m$qlqQ zqwgrJu8!F7F?&yaBc3b?k;gp0KXp1BJ!vJbGVTxF1qRXE=^vm$vnWL{9Jz*>>UH z$dDkN0~>LXcu#u@S`sFQ`FSpw@1YM~lbw?xF_3j483@W6x7T?x;admCGUE{)mTx`$ zrCzkVHdsn-w~S!gFZm(eoH13@dKG#ZhwKnVcaRL4c#YEGuP#FNu531D?30^JX#^r$ zvz{%p9Gk@p_@>tZL=gHWL0of|%pxaWs<Mv6DVvId-Fv_7Y^BxQd?K5Pr@V&0(XW!6 zEwg=Wz^L+#q~mEmH<m>mf3R##rWt!FH#1{2NclcAkn@V`+Wj-AwO3HDs=p~JTY2s_ zC0Q@ylO6G1YSU7i6Xy?A|IqZOa<YDHQ-!@+ySx}vktV;8uv4}SMT+k5jY!<Q=NpW$ z4sV|dW>GQ6Gbj^e`3~LNhiyR-!i5T`KH5L!4_E;||4r?l0HoR3+1%XR)6-Khug~P< zMqNIiaN$KLW6?1%vcCyi40KgFIym&RFFWRivck`65-oH$C;hA7J_==g-aOwjE!mEg z@0ld;&1=RD&YayDt(Cavy%u{^jf}B+=4Kjq%3b{)1ZG+>4OZj5G`*5?>7TVnW?%^` zG&DuHNA<PE3>#m*n4@`r)JJ;o4yMwTum8E`Dv_1t7sUxos4~2Hf_v+)0;HkVecMZn zx@W=CAoSZlSaqVu^1yMAXGKc+0O^hR9*N8HRh>B(MeFKMm*^S8d9+W)+h6j0qF6m$ z>M)O|!hRRp1%j4N)%ff@q~5F+zl5NpJ25S}zJwr_7>Q47P8UkZp7sZa?QMTl9gk3c zdV?&ZeYNPWHcVK}x?T}0p=V8#ha(hm>AgQEd;h*zprr8DWO+X?nP?5!R_+fGFd-zb zq;$*NVAwi@(3~bJQFL%iTM_?;=6XA9LwE3C>6nxL+=yt8R;OG*AU_k>bhXv270Wc; zRm*ld((P){cvV|CpDX0s;A{^}zy(>}2hB(gx~T(=ravP8HHAVP!I$EsN-Y#ys*mY8 z;LPx)iOtN~uo5b<w#==;RIb$}VRGV>fOH%eKHp?raITEDSM*(P;_&r3iD#YFiXsqB zrJmeaEFfT-mZ~knO47x9u?VW)vafP>{D_We?y$ga=qQWDwR$Ld(idxx;J#-l9zE5K zfq5-FJAE;1e<qdh_fP>xCdSP~0=4vc|A=czLn1p;@Tb|LBj!&KzDMVe&IGCIupgE` z9gEpZw_V=XdR}kTut-R!dnj{peF}$1Xf%9r_xZ$)g}9<F7--v{nO!Jx<#;>4DW~|u z*Oo2pwOE^4UKh++0MGfO&#kQs5JU~4y}-x~3&lJ-I!Z&sE;=<e6(#L((NEwB8(b3r zbQCb@69=1yL-|N`R_)uc{60t@V9QRRS%49%9-nd>{JN04h<K{8uSlcji$a|7$^=eT zhtwuGNZ0fNqml8Y7F7+C+)JAI=*u8YNeQQq8{+dIDO)Cm;WV5s!HYGM#C?Mg$|Cz@ zf*9Ho?$LPrz1gAV2y~X>SH|y^1!H18+<AJ2P(`HAZZ3{`F|CEbZ>l+`Og0tg7`&>& zqyL@9im^WbOnoGhs{!9NnakGOcNgb=89OgX<KA4tlYtFt`V^>9GmAW$X31qO%rFV@ zi{<*%*2xs4y)5qdn=8IO8aIwNg?oVm@cH@ISForofoNr(de)9O6KdWlW5#EZo}EIm zNtshu9!>!Hp#0`WKmHj~4P54Pm*LF!AHSA=_~+SVnKysB(RGjDOv@}^T(clCiPk)_ zpY;MWliCQu$+!Q3`0%t1uDGl1-V6i&$PWB!7Bods?v<I9k`o)Cc!d`up(IviwzPax z70J3(tWC`Kc=>LUReC@U3xJJysf&tEKD6N(??&v;^yh$>sOSqhJELJG<;9R-@V%5R z?R;;U6-8gx*0H^@{FZy7w1Od`OfVKTF<XfSDLnRi)vKLdEddYRY9v|BkiE5+J%?pq zQKxf!I_IZfKu|xJvx~N?cym(%Ew;1>hs;^@&Z~{n@Lg~6NBz(KD6$V`(5nN<GCCS< z={foD3DXN>$h?o2$JKQrGEzxqCQCkf2r|3F<Z<MTPYYN1QCazAI29Fukp@KDi5{3y zo-ddE2@HCq(kbjVI|IPHO80zgEGQ_*%@ra?4I|)7>uu2m`vni(omc>^YaP-=`ZHD6 zHW0$=_}T92k;Fx!0(?%}{KT#bOra${BFr3$bqoc)WF_5K{*y<|C{f2o>)<5(y`Xcq zrN-@@Kz*Q`#s1npgL&h(ev@C1W{^eFhJ8>zc!jdlrDnRa^kU_d7PQ7f>`|$^I5)!i z&Fvj`p^4j8-l7t<YY3_eCf-U@GKBPg{;yVOw=5d#!P7Z8G<d6aRrq)C-2$ePIO_eN zS43?x3ymKI2{Tdpkqeo3NzjnDepsM-4FDC`T{RU#jWgj&<8dn-^vT@Ct&2iYh6xSQ zrR}lKtbSvAdNTeOhqMneh}t9{k(o%4Jir(=DLEG04Nv(bQ@$x~-b%;T5($WBE&F5% z{nQBW%W8;`FopNH9<LE+Nj#J0^YAs#*E17sl)O61rlpN^fLFiwj=O@1-;(oCZ`-xg zWa_<4Y~!8SnJBB;VCHem7`xK=T`37#Uu<d49zX`c9ibLzNvc*pK$1x%GKqt>`h<F* zSVspeGwz))LH8hy`zowU@%|;Y>kM3yOq;LeCG1f)6lcZfy6{A=iBuj2N2+;P#;P%W zA==mrDITl_`9j&HLMr#JeUmY}{X@11=C6Wj){l-@oX%9d&fgPowZ1DU@1U|pC;*oH zNT|U-i4-6&fxtN$Tun`lj;<W&<LK(@0?LeccXxot6<|KBHQM?Q?@p;8U`~Ds%#uZU zFHvIFE!U7Qz(Io!{rp6BHA-#(bN6lPq?%dF2GN0I!V1sbt>qR2bn^XH7Jtb3>r3ae zf7Mm)LF=b|t`y{2YKr4onUJ5`Y<?X<Yh=>X?9BAlTLxKf`}ykJM&}%c%kOyOs!?tp zy_Y5P)^px-$^GkthnA>iyzJ*hes|w7MQ3bW=&h}=8rr0bIg1grV#pt}D3C1q^rz0< z#u;*u@E-32hvg)o-rGlyjBPy1Q0543(7nvlxuAYaM-CuEO-)a7_=XA$1va%z2&(pY znG%vpXUZmJ+U}#FD@9PFetV~l#7JFfNJ~}pT_w)Csd02acQIasQ}C**!j;Fzbr)>o zD8)QoFdou-ov*=KQlv;stV}l)i|iUf_j`>!qr{tPZb;?06PEfQ`B^}t)_LvX)I=Vi zjuczoBl#p@o85(<l;Q-<H#7(4!s*M;T4nO$U^(bX%R<xd2S%w5dUD^`8!?;VoVj^D z%r-w`RMVS{?6rVn3k=3t>cYQODROF$!CQD_9>1}Mt*g3epGRWWyzAxR&QUATrl4_* zeN}Nf>pp#u+$v+j0q*TDzE8l`n%?EcNJ3(`uTMBvIzijj)m2|#A2`};0cDcRGrJ6n zlEOycLgO4Qf2k~^nU4<n+e9Pi%vw_~)y!&tZs~V=ll@W!ZVOAZ!z8};*DfwBOFuW^ zd>rDjQy`L+yES1gAYz*0sgd~0Z{F!XME_$yY>j<4^O(+G{0PbS2bSypLH8k6(;*bx z++JNY9Qt$@mzU@ZfK(mS=K8(}o{rUno!}2Up2=V7B-~<<&mOgNa$8RqIV=6c-7!T! z8YGUj_jT};x5NF_q1H|STN<(R9tl$zp!xk@%)MiHUHjUHn<i<{q%j*dY#KMVt;V+9 z*lJ_jwr$(CZQD2_YpuQC{o;H+XMCHva?NYZfj{rx{aEefZg-_cfc7Cph(ih*W%Xmq z=T3YVo$JY#nE(?H<d2LDC%i?<C@rHHqKP-*8{%d_M9$-0kXjHH%9|Scl>CbLl^_(J zq`r<6o(;vesD-Je35Lvi0Wv{8F(UaC2{PU%QW91>-}nwa=Xn-2QpZzwELlgA*sArH zRnA__G#@^~I;otz6ST59VK1U?!-Wz`MeaBGTpR2!mcz*=*0zda56*mdcYl&2RhGY+ zbMQW))JG(eM`RdWdx&o}dHr0;@8rS6&WK{{@PlB&`;ZDMD(~jw-g{j{3yBu=u;oJ` zO4$$|M{u-1ilM!Q=ncL!C^L0r?Hl~zeea__4Op|`$>ZbMQwwek#-||%(ZY53Bs}V2 zxCSEe#p9~u076%HDxj~~hTHJEW8ss`CSA+WF?3KKV&2Q-(bIt)L}}G2iXCX3w<7Kt z6^sCUbTmTFC@FLPk`vyOtd;CMRnl%(CdvaFd>hRxSMUek=YhzDIO=`ku;Y))L>r(( zO#Q!Z!Mz+Csc$)`8+2%vch=dX9()tf!m;%&kibWML6RvWzYol%5oX2x>fEw_yW6f< zfwp0Qd$<czK!w9BpAiu;0wsa;;#jK>;8AeFatNi>$qE2_0*fM;U>F~Bmi9z%#1hXI z!2TJ}{Ba5+L}5HV8b#L+6zl}&XcFhnh&<)%36M<W&Yd+x;)Bhe`q2CPHvT75R5MsU z*LVRzNi)G`N|f26*F&F@@8XXTfrX_#k;k;JzJpY3!v1)wcGalu;DT6H093<Xr3OGX zXB9_qG~#~SQqM^)@FE{V2%b0~HSsv|{>VY6a`{!>sp}baZI{5>3g8V!{va_c@(5u` z{}oUt5>zQvhqNk8ksqCOKsP~{yw0%n>T<d5QC9-ZXx{oxh58}^FCq6Hzb(NyF_fvP zDL{JwGvX$PvqH=^1rVAf<bsF&o`@X|rUR@Cy%cF@$@Be(feGlwDkQ33NqAkfj$JVR zh{&YBb5#uoSP9rjarRECE(26z%R2<GsPr&vxa=`!?UE|tP>mpLO)Mk4NbiiR2=^Vt zHN(6ub^6&s-E!?9>1cWQHy=c%Y8Wb$o3%|k8O>#yG~|}m_M4&A?u>OG>0J%I2fM`t zlr%4rt0*Z7r|dmdjZ3LnW7(gIZp1MKX6QE^G)}$aK^Ap711^_Z&8aFrUc(|u1}Au~ z&R|t}JZ6S<9e69B^}I?LjctCy0~(jLgvuug>eM|Fh|05U^|*}DuYtky`y;b<cfYp6 zG@h#Gf3fyzq)&Li<VIpLNxa`^g6DHJJh`nM53GBM^c`-_2K2t*lhMH`Tl_h0mpr;X z@<abL7xZXB!_6bCx~tNS1d7L9Tdl63+iic?J&JOFs1)4as7gH{M~TV`+r-91Rz*|S zzifLL;3@5G`5m(n7&Q0{5)E$o8{~NDPtqT}CRE}+5wUPUaX`zXa;T4&h6JQ4*U6lV zr=f^pR9^I~*Q8>T7<5ds_RB`!Kg(L)9R<vD6qXn}_KLdh@4013h$|W=hW<%lPUasw zSl_L|UglSOYmh3jn?4?otg^ot=2o?BuS7mby#MpcxZA}oK5S;`f;P13a+`EEqBHp3 zK7Sp7%66gC^rMN5jn(Z7#o_pJ#CZn=ps5sSFfZ~2asmPZ4rhsyFt_;U{|yD|`Dec~ z23yL1<}kK5A+dS0C4s+=yE>8^tk+ciZH<X?M2XwC3={KMSM*g(-p2kda(?vMd){<C zi;jF^g0{L`uyXr8bpGZ`(+B6ZWtzPr#q!obT}YKBB}T{a$_vp9=gc-byQ_N1=Jsns z(>0jdEYWu=NGnhr*=l>{b4Pa+UWN^5;PDEpG0I43{Q?c?fTt<HhjDc5cG}CqRks0- z06G4{t{Pq;8B+$GbdD9U_IDQMkvv*ZX3>L&iI%dGUbF3Zti1x|FBGMC94~^UC3mQx zB5rpSIPIPZulRcOv^A!NzeMjRSWR}A!*I!nHny;Ws0nU&P*9Kg5#oT<rEiUkr6Kt~ z=BM1jz(N^ul;s_a&>Ei@>9733>5&ANcmm{mpVVL!nURO2)^9&(9SA3F415|U8H^R_ zQgn%w%Y;{4MXEe_CL2iw)WhaiUe%E_)2K+|eyUq*Kae3q!$H6{g%lY)*?d#B7`z-V zHNki~*_jX)Ibx4`-;RbRE4<8fXNIsDwL@<W9cePGoc*$&BJ9E3y!%~N2W@!Abd)VU zZtrh4X+w5!lcVX96*>6F-oh-e)JwkDLxUybIGr;M+cavG-h>oEVGh-ut6HwbsnTlW zo}n*mL`gNfO#^D=)S6|u(UhjOnkz7tXP$UPDMXv5Q!-;!&MiLgZg8+PAs#Um|MC}H zq%OD$?fh9sp~q!F>0;Z1;|fZbO8a(Lry`(7AP?T}FJh`ztjwS>ypo24@da)wHA@XC zP7-~}g@{crQCL1H!P>oQv^mv)iDYF5_NlkMBgo?-fm@aCR?4C96c?vOcUGuR153&s zv|urfkwU6j@Gk&~FMeagYJ7E-Dni)(>4d34%|ct7)@1q{TF}hoq>PG6Vq6^4bTLGG z`G(B#YR_5nAf<Ub3rxiC5IZvgiG#8}WTY+In7zqK)tgVnuv0&bjO7^!DjXP(ls_X( zE?JJOM%vaQkmV%e5DXNL%~{UYe8G<nSZl4jn^P5rJ?b*6c{Z3`r5sA7JR#E+fX}9W zG<#)Ri+~MH{8GcXJjfXno$ipjtFUZlElVANNgja7yYy4d@C-Vltoe1uiHp5|SuEOR zjKam-Lq$3yGlsyWD)XnhJ8R>HGDp#e&AR!Qv%FaPO=NDJ=*-shB?rc~a1(25-sxR6 zAt^jdJO`oL%vSK4=Vy0-kJ3Ej<SR{Wyv>t!PN49`8Z6PwF%un%V<garFis+@=qxb% zMqOWT=aM&*ZYhVpi4x!+ixmgCWa5cJMU6PSCf>l9FC$jY#5^>WrOFg|2>7t&T~L3t z=S6+GO(JiYt5`IjK4|YR_9j&B{`Mz=2}ObNTLtT4!;DNxqzH`1>caz5g|h;fx9e3$ zv;^0)MxGp9leuXrxnShlA#iqshmpY4=0_k_wE2l`q{k<bSWV9Jhr31vuqh1lVV8n~ zwYFdDIvP3RA@*WZvjj!oN13hMO%>&9p91e9u_85fI5}ceev-)=ACBe<^Qm*5t6!iB z4x%JF3EHK=ohn$)`;eB07c3s&$QW6EL}vo3tbD<LT#4^WJzJA{jd^IP$~ClkpK<sy zcXe%P%>w{bdm6Nt<I@8$TFmb~<`_a-nf*@OS{uZrbUVq<7HHD%cv2P8YoOoUHjWGF z42J^`33gxw?4hUmLGD_4LP;^-?ry1xy4l?|*Gbaq1K->}uJ7mwjE-o$opg~#*|<^D z#({?=FtP3N`iBUHaSu+nmcD19;&=r<hfo(&<b(ma>7qFfFid8eB@!HwYn8$=o4?-D zPhbAZ99EJb#*1p=@%rU2W~vL6=KXtV_Qh#B+7sS-iP%~6k4D5^63apM19BS;t`#v* zMvpr7>K@@F14rM<sXMYeK%-ZW!M2J%#-3S7NuPRFh0Hz#5tKO{Q^O)IlIBFgsJ(RR z*4HYTd@_=W($mK&+B|Ib*9BrkD5UwuoexSg{D9AD{y~Ir9{C;hZ0?f0Hz4L9_Eyo5 zl`X@^L_1#o2&bpk^p$+0>i(-Xv!f9o>bF4&c7_8?_~q3R`JIqEy~rWxxe!tVcqfzD zM-kUR6CignL&lcf5XX3D$OzpIMHNu=M_~BQB0_V?wLE(*5rcdEiHO=s+~GSy)bg;# zeTw^_7Z(<2S~i((vAH_<?S8@pRZDoKU{a|}nE!w*q0g*+CoPb42rLv`de|y`C5dtV zu`#b2W-}AGSeX`fBKG>an4ZV>{<9#U-VvsBaz?etu<|`0Q(XZO%Ra6q;sdi+%7(yA zmL`{{`*Z;<p#f9TN~snu7k{PCxE2;-R4p!>mDLqKm3F8B?A=r(x`>tT&#!#R&}AuG zMEsGUs=3%0%=_7q1{91Gzn(E@ij}bc>@w8+f;B9Bp3*-0edgvOW~Zw^Iv|TBuJjoJ zG{R4KdoXXha&QQe^Q>(K#ERB^<9MNJk5cW`07>ax8sdw(ZbkFW^Bu?g=Q#fbg8MJ? z`TL*Z!D0XZ_)*Whsfq0h6@$6Cxf!rE#>ade{>35%TzLc!%Zox%w~x1k6L*)@T~>1k zI)w4m(7>yd@K0A(BA}oiZLJdN97lErO8wen2x=aoXQMt)!?Ct9s67Z=3eOBU3;;u; z!G?v<<!pSsM8Opp@Nn~ZPJrp)@eAW;mW?KG8A}$Z!$btBe=ClEF@N4tTSj#lQ<fta z*QoHw1u5AfalM??5Y#(=Cw~K0XE94Szi%$Yyb2GLi7zEL1flJBDz%M=MDU``lv))3 z7hI+1`4Gv6F}mnO*X5lrq30wtg`ABeP75H6Q$b6l|0g?j(4~P%JFphJMP$34UbFiw zp^2hDp$a<@k70y~C4HGln*2>v`4{VMax&ukT|Oo38u-<2P^GS}j)Q{(5ZGrcO>@)J za?;WnG6nG?e9-T|y7uh#(m9?`V8*aVV)R=&Xr$%n&4iI@urMCft>fJve=<;k#QSqY zAZdv(e2gWn?N{f+EGsu6r5a0Nn#%}`$JRxpB^sbr&;D$*v)#|LQ={d?CbPF@M1O+z zaCQT6o+uSxNpA3qplSaP#OlTcSY;oM!`@Wl_m<RT(T9a0<ML~h$~O>|*g(6V4m~Kn zPbzdA3vHH@$%mn<EDRDQp=@y9UM?xN&jraqjM_PVdF8`Y_f5cHJ<^oD-w(R>>oP5! z)NknuWpXy&&&HSH^fMRvv^eu!0MH6|S47%YmL5Q?j3+y+H+ef7eAM3Cf3@G%B_LHr z(~u=U`fg37wnQjTHlXl@j=WSXEJUQMVuSM2XQ;oiDzci!idvdFtuZ^NJn8xV35M%A zbU_5i;|8nkc6rPtk7X0Jm7aST{xPXL)P<$WaEoC48L5X01>cP}CGYzXReFJAJ+8>( zTJ@6XmDW^`bq_nmYb?>ZEWh9xu}UhGvx2$9J=>Cyg27-Q-Xk)_X)<uIg+;{g?G-z% zX7$(DPb*}F{?YGf<>b%m^ej~<oDBnCOC5I0MGlmQBvV{ii-nVIK8FCqZfjFnb~qAI ziHi)lFEB~-gzPIHuxj7C0s{q2PD$CZegG^{fcBmZsFM<aOuD#~rHQ&O#bZPGQi|Uu z%gqT1q1i^ZI;w{C$bkT2OH*a}zbUN;f|GrG?i=aX)Ws~ycGrOnNg?Omhxx3yBe~~x z;;K#cco}4+VRU2x^p0C7BpS_-422?<^T}DsiU-iQ@SCDk6`#+b5a)f5RS9Jn_Sx`+ z-42@*n$7}0wTv#s5Vg0knau)OKA`sKEU`kXvr64+6p2;^P}mwLNd}1Km}QC4YD<kg zS{wV%1I*>nPm0hfLhZ4Ul~<Ipcwb|K9z+8MlER5rhB5w+Pz(xS;6eJ-u)(edEqGO> z0%d540(n$!_=977Hd=}vT(Z;x$u%%(EBDLD^)akzP}z^Bdxwf<)B7PqZ>^lxzdZpo zmO>dDaw7WtX3DOt{$_CBkZCl@y96RzCVED=^%w8-WP^zNY_PDVRsh(_O8i-`ku3R5 zVrZ>iwW*jK<)DK4m0+0#p0|mq1?HhOuq47ItMmJoO{kP9U5W{hv@so~kYw>!jvQ(v z(3k=Fz4x7wEWwb=i;DxGCc(FF_a}90fX}N;y-7h$EtoNYp8yLBO9l2`_HSP61<3b# ze#p!Bnnz5u_}tpWgI+ovk(Bumy6T@rC7D(6ecqAukH!ha6|o<fgp9~>XxA0v9lf5( z)<&583WPG@Bb#;cnvsl2@ZhlzTWiNqY!)^4y>cP1Nw%q;9)Q<$bgY7yWKUi8XneKB z<Xu0qlp>3%E-1KTek@I)(vv=HT&62x!qb=3>YH#%3hTzXCyqkQwEi(>%D6$?f`tCP z><BG&t=Q@}#u0j>3DV?~>Y#_PlQzsk<3s=GvI>L#KpMSGR{f9|FFfj8M{qB{kfxuh zH><gFZ-8tOQ<kZ%<7%F!ha&-bS!F|!0CyYOa3)v#s;VI5LookL97An7DrtouZOM}J zPN#CWt|le<=wjoQFf7a14BHrXKV{TG!NNaO*CKg#!yf0d6SyLzX3BMS=l6tA-M`^2 zxDU)oeE;BE`MSX<0={i0{r)#-%2~nIDd(b05Y);d#TG{?MV&q)bG3&ky#|M@iCV)g zZbn9?xx_=E8VnL&jcsBj@;dTewtrY_*v$YC9U%A8!hrDo!}WUKH8C;K+nZZktB^6? zYRSOJI6F5NhRuRxt{>>>howyJ9wJvaIYIV<r3dQyflt8Kc4-=Z)2>!tVm0TCEI=}o zeuEY+J|HO#68EL}(arROLcS6wu5@;@%U>K<k8WOclqmvP#<x<O+NSAM!NAxOscgZB zpmXG3`352ZlKZ@tP%!5mE+vi6XTu~f-BdU`H-%WkcN(<L#@}X_^y9|*)a4myeH_Cd zgrN^-DJHI=5ydkQgXPu4#zI&`t8qyu(x+q4-yQ^RXOl#8Wlrv_EmlRDZ`I!@KzF~M zV+;x2{Sp|2N4@8?zlmSdC+ZxbX8xUQ;Ivq<19Y$TOFZPWb!Ut@dIr>7Ir6!DoqSf} zoVSN>_7Vo_qw1{tAnGY>O_LsKQ3X!?!AO*!*0*p{djr5Q7+Tb8_NEua&Ga@PeH@M$ zv=Vb8*N(oO&Wlj>stNewRVuhjOm9;|xZePs9PYQS_Fr21`aN6PkX#LFoI2f5jp2eM zU1gdc4?~);gI<17Us!6f3U(6fRHuGrc0=!JN<?)VE@#KRiA6OhG)rLJu)XxF7$A$7 z3Q4EJV2Btz-1cJ-<P+m_Qar>lF@V0s+1nZOHk-%QRe9=F-y9wvr0j7IX@<OPgMn!e z4PcSD*>c{h4!jxPK8$Vc8Ma~YS<diTDnh`p!~#q7a@N-yMTu^r8ZXvu%;`xRd8zB* zO_Zx#dqYKU$L!9FGxH|{7GXb@K10vb*a1M9iMK=zQZI!FkRp2#1CmA(D7EuHpYYAy zZ4Qct3w<TTF532M!fp@2yT@K-s#I<FJz9AogLIwOm=aNx@Bqkb7`q?Z<E+gPp^wvv zXBg!MhXu!Hb@EyZVq+dLij=g>`E<LH*io6o)Wt~gO^*j@@jBBIDs=yLW%OTs*C;%K zW;1*oSJQ;B<xWqV|6Lok+}xfAjh5QcQTB|YXtv!xmg=~9^=~xi<LJst`tyZ2wX*DQ zrTt;Ju6CcW`f?J7==^hyM-J@l_}M23A>l&rBP#ZDP05GuC(6Ncp39&dC_}}5*2Ox> zqB7;t67u48#eUSk=+K?yROWyH>e%s6#^j3T>?l#&;h18Sv}@4&)LQ6S9+FWCN8`Ol zNTaD8y6d@bW?R*7hRneU!%luKwBJE`Lr@G8u3R<!GIUu8?3mv__;n&yNd~ygaqRpQ z*9VBNb5cDF3^;%VEG`Zf!mI-}g=%Ul7R<!NPE5JZ$F2W2^CbZ}8o2OO$MH^2RT|6I z6`sGdTlJ%%i+8rU*wn)qzLL-yD2djfdp&fPBqdN6R@*YwAd6qe==6GyG*d3<GI_7C zK^2DeMnAx0A?-oaQj_*hB|(!Dth($NBk@Y%eZdJeKYO{4gr9Y<{*9QiVdNlhQ&hdJ z;FdQhfviGF))FF=Zv<`uz1ED&G_{tHho5AE!U%Udl`6(c$Cg=E`$r$I*wuIu+yNI$ z(R<pb$L2Pr;m3h1cU+*22FKf2wxYp3tF<!9%B3(y&E&FvFgNM0h~$5eU$%+gwsXua zE#BJmDLdKCjtS0ZT$fXXRB-3|>8!gB!6mAqbSHvX+`xDo1OOPW#c<a#a|R5kX24lX zvI`xV;KN4cs!c<72tUbu3{xWF<H&*BB$zZT!&!d5s=;{|LyBirDJ?uiK1hxgZPuzK zdjBuu$i24Bo>?*zPy5%1hiKv<4UAhg?^$A11!-ZnY6lz&)O-JdZ>J%hJhOQ8r8kkF zsKjMao6)E#tRC?EPOR%;g@g2!ivul308-c$)J!n0SrOMC7%4KiU!+^>R~wrwdU<Y> zQti&(gjeSoOCyEuiu7;LtG>njW9R8Avbg+ma4$B_;hz)y$|Hf?ND??s+vMMk&E;^$ z1x)_6)Ce%wf=}jZ-S_VDahkEWG;U$so~6`<)*2Rf2JAsUKQLB(`-lEACWP6+Kir~g z+S1ZUNVNW(_+wt7_K9b<;cOgC0uYy^o_`EQ@DkB}Z>ms$rfPh4R!}NsoFR?}@`Kxl zFtGHf2`mjK>^<$#Rj#!wu87UBi{B^>;obF8H46w-lwt;q#Jk7>&%1Tkg$Bx%$8d<< z;;U_D0o2Z2=7VcZ#DQq%&+9K$GTAoPZhO7vhpg3GETo+Ctu-X%7k_9dnjaj=4m-@& z5_lGi*Gp;y7V?nd+z^1Gejb?`Y>8o-VaK_}<A_}|(1J74C^+hrlJ45Q8|Wk+Ke#Rw zbtu-qyR%|HnR$`OXO9#;>GFo-lDsj{>XAnVr$n$D-nu`38ggN$QeI}_;3J_FUuw`* z76vW#m+VnqrPFZsiO2vl$JSm<w+}6L_I0^CZ^$)9V;AH(5bg`RBBAaMQ?8oqPX@1h zWyIq@w5uHQHo{FxEr*{KpNg%Q?!_;53Ul_>(j?$GT)3u=rE#xsHEu#U@nv;nkv4E~ z3~4ATlrTBy`d1@OM%Nm5ni$C9HbYZF9<If4C*jRWixZFZ=2zx%y*SnEX2y~@i6b7; zQpvg#i9B?)440b@p|-|PtNf|P5jX~5&Pom+y*OF#lVG+~)&Nlo2QMH>Nh2t^ascb| zMaJRWdaxqWc<EF9vJ%;6h@G76L~Ihch4?)^vkzKHj_<2X_LJxab=x{xE|91fI8)_x zDj{8>DDpL4Hk&Y(9TX&iPT>^AObATVwOk(Q;P1h7wh+fkMV>WRwLpIA{^J!Yn{Hwm zy;(yz&*7b^){<$PcJP}vJHm7*K%D752)i6rP}$|9VgpvaeYR!)elQV4^>_Vw8kWc` zyYM3%QIU(!#69rI=j^h-)-ty8%;wdTe>SE!`r-M;&bkE+0fP~cQ##<WduMFunYJ9@ z(9zM=m%M-|E|3NwGxW~*IJCO3fU{+`)`fxmj)VOXEBsF!%%yt)6JDowCR$;?0CRG7 z(rnk18j(85w{O~H^wfziL;1>m#r>=O*`8v!hVc%axe17DK3@?%<yRJWQXK2j=VLQk zcP=DH)0Sg+b$3%~o=2(0cw7C#?Upo)P0Qv9&TMePbKAZd<Ng)0hY%{Bvm~~$J)JT~ zatBSEw1<zfUFD3c;W58RTBZzJ^EXRUl%Dh-ASjQfKxP$(WH=?8Wee;&g;1qP6B*-< zB;pW$|3QPynmejhEnw5|FF7%D(!V_!OKrJEtrDb>{oxM5`1|K%^<3*qp$&Uw{_U24 z(3KT^n_)k>n_C%>-vn0R!^O}8`$eS%WEe|v#n#QYS>Zq@PtvfPREmBw#ilN_ynK;0 ziuP(EqgN`s>{1t0;r)?mCnOd5Z}CfD^#bx==9dY|&PznBZ*Nd`J3S6<-wk(9Of44^ zgoeROpGU`imz<EG6%xFW!R$QZ)qb;2cuhyL^Ua{pg-dkT&yrh;8i#onZ<@HyS%VAj zG5tOlVddT$Pizna>n)F#XAzqEj593~I~c7~kobj#5x*TzKKt;FaQ`&phIlaZZkFAt z6FqNoFyNy7HKP1sLbLVt`t}!(FrNCU<BH^Q`hc;eC(C=s>qIDWBQJU)t%jt?<sxn< za*Q<8b&-@o&K-++<UIQ`q-!|ur?R_uv5DZ*&7Ojm>Xdp>-+;ieS-%;S`E}0;1a8{& zbLvGfQRC-HCP43DnO@xd`}#EN$-g-RPTuPTb$06-Ve<R(dg+$JExYpjmf`t2CWJ2- zzq$EI3Y$Z{nuV5DIsoPe@V~yk^6>D0dbM}zU;qxjG5v`$TndZ2DWS^a2DSf#$5@~v z7T_<q4N*=?KIT}6qdJDf>gEq=ONi0BXLTUJ%7f3s{wRB3M_KsH=fcI=U95Gu)Ze5B zuRyhf%KEhp4wSr6IXH8602LL10j^Hf?IK{y*2^~~hvB|!p-<`7o73tkcJ%p-z7y5` zbU&+x=B5T$!+9h+nG4Z0NbX<<hil^Fmu%Fyz;lqCs`e<VeGaCnSX5gTZG;%>$zaCg zS3CBr2-k<%OP{OPi^bbx3oKI*%RpdNF)A}{@y^*cJ3OcK`9Uj{N3RBrj`-z;qr7q! zkkELcdsZ)cXW8ldx??|?v!b_X9NxUIm4iWnHnWyMTkJ=KSzrO-;0kspuzCJ3bC0o? zIwQ>G)teBfCTbJRx`#FYkX;1N|027ZOQItyFBt<FM&af8zZbOc!n2;Rhp|OKT_f$3 zMxW`_rb&`pw6F9HDj=M1KQg6Cei=Jx!OWD3m%Y%SHvk@bF4f9;!kgGqDRFYQ56$H) zZrGgvV#);HnKEA>MtJ0AGTgBty2~Jf)fk3*APafKC4rYZ7$;33t#@6qBSkDArEWNA zvf^xNs^XKl2}$L2I)0TQGVy`DsY>sCl?pz7Lz~&i(vq5rii(m_zGwyzg9D~@Afd#- zz>tp+Q(aRt@c{<J)9B?oh3`SBs^%&IGs@AI=xT{Nb=45&cNWg9`1a>EW1$rW>_!P& zYc_|MV(@)C6?1$u_S2QgC)5k9r#+%H%}xq(SJ)Bo1!CfQDmYmM1c8ut5B*-0XM)`N zo2XgC)m7hS_A6Hfhtm*c5=5WCk&|GOGveg+i7O_Fm;GS-w6E$KU~c=_=97WQdNo+X z(b!#GxZQz|iKT^hiP6=KSxFiS{i|AzcDU}~1n?34F_!uP)vZ`Pb}Qn67P&-p^(I?2 zKb*hIz}li!q(BQD;X;}r9yB1C`ImbT1s<HBN$ahv*tdL3p~9fYm~)mF2(5Kk9_Z3$ zLFs$9;#5TaH%!Y#e1Dm{B|C+E1smK>xrcuwxA0RL{IFC^rF`pAQx$De*z?o2zA@co zv$=prQcXqQ2Ms=yUbjye^Lje|RJNK{zm-E41QAUO8HA36gh`LNhm4UTw88Z|j0w`4 zT;s-jB8}0+lYgHI9Q21riV%2bmQvB}GM1ulWoRYFT1356Kz4%ioBg`oe8{E0<q=d? zkC0vFmPx1&<i`b_I@M+x3@Ve$3^E_ELJH&utt<8N0Pb^pxHgbTLjXuUAv?R9ouRlY zsC_XfCnpydwxAxF?=j})ixG2Q{Q=PqNttl8%0#||{v4`Z7H<Y3{~LcRW{+8ihH#== z?C!f3Y-A&El8KbG`{bFbt{OrfgY+utcG<=7^+EqfLcBZ3L_Ju(UG5$uvZVNUT%-f% z+WB&_F|up3Tf6{wFpBfC$YTMx+b>cowyyy%m(P*Z9!^)?5Uc@R6L<ELKUn9PP49Xs zQeQ9vc81?}XQl~@6shBBdlZ|b_8=dv`{ISaEe33TH2_{}j=peryX`enDltl&=Lp{g zJ8SpPyJ9-baKhx{nraVj*ssKZK;_|8)}Ih`j2vO<v-s{ujCv9swIeHgw?@zK&@9+; z1zdy0WBV;<dj-JuWF_szTA1@$>`pt%xdqgC{}5@QW0mWBW6qXnf!+vuUihc5RNG8a zTw0y={ZP0Abv3Sk^gdc9i>_O!eerYgKQI&U`eMV(Vc|jkfxx6c!5knkWwhZb3r(+l zokfM@krH)8TltCI>H!ZgOycAn6;!cdha0xcGxB4zaf)zowBXatS4QSi4<o!hyJI{w za`e$a?7egf_PY&xvt`<p(Qx!OA_8G%8RrY}<-C{j5AUz>osYII^Zp=^x5CE82C}?~ ziHW|>*8Fz55+ju25?L2`50WS$Uph{0UA_NvfH9JTe{rcw7rEz1LLtT+6GnGfv0})H zK4)iEEVO-H4W(x2EFWjA>o2+bGYcz53k~<IPpEz=o$06;=Lk8goDNhO$^FDSq_=zI z`YZCc>2GGqD=luzI145ZBgHMM?;a60mHz6)Yqpcs>$uV>scZjVOEyKMtm#?kIBQpv zW+$bg4g*NN*ekHqAaum~db^-#Qhj0ST_{44y)Cb|#FdNCM;|_ye#QlJm9<rCAbU7B z%s#B(C-U$zc8+bH6NE4(uhN0_^GL`kOBhQ)39v<L3HT7El~Y-WvG<W?5TLWRRHQ0g zI}bqINrK-nsdWacP$6x%c-<`FM|GuGB%Fq~uLKhPzL;zjn6!LwhqLsQGngqoBDyF# z*<T$!OOO?Tm{(T|A@W3l0$2J|^1UxsEGs_0z9B@Jydy5r`s(0ESnrD`U^6<-Gn-}^ zh$1JM7^NcM`e37Q^I2w-pYZZ%;8IPb@1XwiZv8Q%QQC*&Cv#`1O<d+I0)k=4A$j#D ziC+F<%8-+ArTyp-l4f+hHbePBvN@}u)3&R&5TWpJftr|{+_@cFOETp9`z0AU-Pcmh z#K90lSKy|D_#yx*#`nSH`GYGYBqWO$*+<V(xl>9<I`7f^y>-qIs;P{a0nT=Yn4CAW zj~Bsr39I_I-aS*mEMwy@VCzbGWABdx$%s;#)uy9q-j5FL-bp+EG{%oDcOuj!B!UQ; zb#J8B&t8t^iGsdjiWZxJP|vY99==?krCXKI6*XCE3|>xTSYz;eBWLuvLs(cX)utf; zO_G7ALBudD#TtIs0y6mKLF;^5{dS<2!QsDou9-a|s4vdPSZ@5!okCBcDbHuM3>|ms z+B!dA=CA(rn=si@C&<bKE%o;3PH?-V0q^kzJ$UmsTA9ti@GYQ?p27%I80X%rn8R|Z z(`m(kA5U+&E-7Z~3VRGl`aBStFO$e5TC&5K0yjQLJ~?jM?mVM;FhDUV89)0HEZ2-4 zA|iz?T;U2jxAL~^2sF0F)f1oWY!5$&zD3*pw$M!2)+gE`-MQvJFSMAsk%P8sEq|xA zPPR*kI2i$0Yf+gn4_DP*sT9t4;nO`8fveM(Y&`-fUEAXa&4ftnbNKo*DNNRr9GO)c z%j%u=w4XVJN$Ulx?a&%kCvBv7!&#`nn)6uuIUP2DPUBIai4h@%U@?^fyF|^+uKs;w zAa`+Eb@__Syf1UKujC*2r7caSP1?S|P1t|nnTL!54Te)T+{@lFb5-D!9ztTAH_{NI z$hz&L>iS|PJDULthSO?@5i&i>AzH<yxzr=11E_tp;#(v8dZ`scSA$%xV}yslM)|o= z%`+NafTj=~fhHAT<yx$jv3=w{(}Hf!Gf@$&*O9rLaoDvr&+isfcJvHp(-t@ux~NT| zHc!^7Q*29Uj8`U%Csj^xEPy&9PqnG_5wJTvX~l(J8@>^UlSzGvnf1!dMN~{?`%1Dd zT{-$U;nlGDlGWEbK?-iVs>bXN8>fH9@wCGbM(cBjqe~dyOG`yY*)SP=`bm2_vfU{4 z^vqu%JntKAwM}FXCwHDOHVY&DPqU!tPg}-_kSHWkzZ<uC6(IxT=`#}+oW1Syc9?Mb zd%kDcAFrhPHPx!6@|AtTk3yz?S=B+@<zO|6-YBb0;(jh8y{;b7z^4`=B-2RA^|QP_ z9Uf{A4TTCr$rO^}Gf=rxNTNbLlhFN695-bZ?qj|l$s)4lbT?JN*(v3jRvZ%dwz5OC zhtp3gbxo_w@QQVi;G{Pw?7nVe6GaHFohY`>IB22oxZm24Vh|Skhii9B7_ye;GAA#J zBn(ammlutoZ^AS!wShxUSF+xT5>jaP*UKJf&8)Ny4<(B!`WP&~n})nSLCOKXkB`36 zOKn;;Bkxga`v!}7au^5U^v;|(>lS{tfKLd@niM;CC?#K7eEh=dEyc5u+f|FQ_`CX^ z<`*E%=p!5TV^&a5(5Z+|4MKdWsqQw3kSS=k+Jbl#<M&0=(9i&w-Qht5gZgAcOC{Q; zrTe~s#}XYG_<4ktq)Ze6A;qy+Tb#6n=C>LC9~%U4Nu;=!{s2<3c<}hq0xv~5K<E{* z1Tc~;<Q4t}eKo4n{EN-fK2mi_AkYnVzl)m@&!%3@Kn=QO2xlU5v{wV9QDIy*US`?9 zUn1|u<__DhCobZABQu8z($KPxhG_=^pci=v@S$vP7+k105E--PMz@mheMl7$%04yf z)7L2Um(;TtMQ%NAz)yijMzPJ<H4-0Wt+88#qfWAmyssH<SusL-H=-_C#5Y#QVux`& zCybiGgpriZ(?-o6OP3ha&XkbLJOyw%hYYBtQ0-M28~1`riAqIg?6pp~;4YO@TYbR+ z8Navb<XS!3qR4RT{>vQ#EOcB8AaY2hia1AZp9=(tr6P<2b{a~PW!6}V#-M1;__#?H zp0vLtP=!C<Jr}v&<0G#Rn{Hpitln8Kapci?FrSd8TZXToqLeIdu73~-eZ)48rg{_> z>69COiA0BIey1K~%T3acLM&=Jw=-Mi$hG(VkwRl0S<7OBE~^9Ae2<>i5lB2!I?E3A z?N<2lBDZvC#jc#6jUgBA8k!tNvM-sgQ2%n4gNtrDpcN2l>fIKEC%?M?;Xk6&1^}*w z`0af<-W1_!Zo?M(nD0_kz0EX2hR%t&JA19P_Qe+EOZ6tTTzzt9KmwbcwI6qhGuAXy z?Ap2M!{g^4vvlVt4_m=13D;B|-{QJ+rh2LieB}arNJ7#JN5om$lntGS%EvK_a)ZBq z=B<Md>LH2U*xlstyOI%U1P5Q?Y^3!41><VcXN$zd%dm$-6U)>74Eg(k`4Lxz)l2u4 zuXo#gQq{oC_PFMv`l97F@AD9HQ_2Y%i0Z|cG7ylrYY~1PIly1f@Xq-FK|2aG)9HL^ zGsY*tpAO7afLgjEV`F%U3SjGAG9FFBi`=&Cj4))4N^|mLhcHw27RqMBCZ6~D3x;Pn zk2kT&3K9u#o0F{HL#}UCtLlhSD2pSIcM^`PD(H`{Zjx?FAa-pGw<=fG&^DGs^!yY| zoFt?VQ}wGn2>6y+_146x38ed#ta2n^x4|7j*VY@bLYouQ=`#LY{v3rFJLODutCCiA z6P4DCba5T4)OUksQ6#}$DrW-r<VwP^6=jdI33LyBxPSLgso1$n6a7U_yB81|s`47G z{msuQa<IiPwxyQqbBzqSfL?L_tgk8;&dPal>I}$*>hbHHtk{=|4DW@Rx-&EPuQgJC z8XvEhnViRJPW;?SoSsp7_Ci-Qi#j|rqhrbz?7r8e%lJMKbI{`E6c_c2v9+j}GVCK) z24aclb`_F0sNXbx=p7k@QB4tVWR%+r-~ZAYCR7)-L~A2rA9v7>kScqY%PNf$D>qA~ zI{m#^?}wObP;nvimeHU!vH}=gxFu(N<$>SYQFP+b{H&Vd^VR5B+f2=uc)_yG7E5v4 zYs*!R$Exg7<(1ro(2A0e4%v8<@F;Y=D#7A?MrO0Ur-+V-TyKTgTP<QSD!icJ>>QZ~ zppA8B!V6A_HAoyh5Si*Ff8lL6(W#RzTL!C_QVe$=`I;Il3eR;Ob75G0lbU9*>~paD z1$0hqbH2rhtNgN>q5>E@0>Z23CO?rUnkjji`}&5x)fZk<2AZCeW`cqAHEupX03Vyp zhOV3)lKcd;m#|R(rpMabgB|Nu*>PRC6;;tn;~!srF_~L*CMNn9TCmK(UWenk+L<x< zA^^d`H9Jih7{6m@1ry$$%wbW}UW;8I+518Zgg<~Tf`E8P3JPtAe9liimW9wgj&Y&R ziQSAKij}y-Yz5>+f-JWY2Tp|#tHMBB*;c137dh*CzpRt!#tbVT8ufpoVqowXa3EU! zx@RYRc`rxa$jB%=ArcUEfsL$Jpq?UyXX|RF$wHaV@wBB(k?+69krNJ0pn%*o#1LYp zQ~ay6LzFnlA|7s##C)yGT16SMp-a^_fs2YTBx*WU;Qu{8fd4Ji0)g-qVxkmLS?B9@ zl@F02gWjs!Wc`%v#9XMT?)=?Cu*1@^$jKEUrMBJgVU_Y__ze<Pn>RJF2G<bR?7t|m zq+iI4nn?SEu4&uEVGFe6E7o)_8xAi+*canqArIUE@$3vTM&_j0U3Hb&`GwUfT&F)$ ze|xq3(1~oL>>KFu`s3ak-Q!}vbK}g20G2Awd^@|PR+CwKyr=sV+13WJ0JH}nf4QqX zzYbd-!Be~M$ypeOWX=p~tZ!|Fph+1f)e0KBFOE`Px#%-+&;Mehd$w!4rhCJq@g8`* zc!IYgX|@lI`bl(&uuk#POZ$GR3KXFhk!==ep`$28p3>>Gc;EgT)5QdQPx-PpE<pyE zpGhgO*?sNQRs!K4bOB>Hmdatdamf_bZUUSYjiYB@NBVzqUF}^T-s!=AA6iK7(BHq0 z|Ia=~BA%X}4l8P{|2GKy1H>!6>fY?`T4jQKJI3qkro7bSr(>bavmIl<t<tF;K^jdY zAoRz*(bIM>o=z!H!!Q@4wsf^pf}Pt86WZz*E4lvj#3ZNq*&`0A^n1+kUuwAeGS3aI zpCDZwS~R;^MbuIo($UXzcYSFM2-vpw!rpWOWR-Wr%C<>}9Y)>N%j~C4>vX$MGzO0m zHD@1}q@xRs&iYJ|;yZZ^dyXx)@b)(CS2+x&OK6;WUK2p8W0TGYR9!G5I=bGwX#}@P z6*sx=D)N_zNX>-zZj*A{2QbuN5&BSEN3JNjG(Du!-%T2jRSkduWCjg@pcwi>ODFYT zhUStAv&HKG`$SM#f|jmS%WJEVGV-}N!^^~mfgv6LC;7GB(Cz2KVwDUoIp0mz<m&to zmU~Msta6tP<))yK>>w@*4I0M56e=J+i3eBKAo`w{1mRx8MDhi?e!*Z&IzfDd@`Ym{ z8V3-~27fpKL|?dfV!~>>KLP;8fRL_C0YH2}zpxR~>b+k*t*2A!GCvj>IX8vn?O@RF ze~q?6c!&J8%rswi51^|z+Iu_Hwfeqv`u-V6+AU6H301B3@X|mH{=vF&c!(fVMkS9c zp4ka!31bDA1k!3LlxM}w0n2B5RA!<za_uT)mzTqNg_8yl5@K<3<s(BydcA%GQN5N) zZe+26C)D<o-8|aRA-4k%gZiVp_#a#G)GXZ<Kt!U|dJqGRc!=%Ujh8{z<WpUHp1rt3 z&zc<Y5^v{3@~SIPsUi88GqC3CO-3FGjjjxu7=A+dLi?9lGkQWlJ|Ls&mBA;h^;$qt zTTsF7zZ_kn9?|ky_?Q`{cjfW>2NmC@74<BKDl^6Y?dVF}zmc>}`I!$`+-iu9crQ|& zae`pYhkxYm(!R(x6^kk5n+wV5>*(zDZebycZivJ&@4jcKcH+S!8Ip|Wu8;uW9n z7q>>hWM_<N&|P!Je9Y4wwaYu0yk6#4q2PV)rA#ESufz+OR#bD#IljGl274=N%AAUW zLNi6D{zQl)s~+D<^8!aUt(C2dk!f?ea{ZamuG+@dgYA+wB8rlQZ+h)-zHR2jG7+aX zCS^X-Eu1PVLu$C3t~|}dx%b(sHX0Z(YVM{si5G}a2wA$4b*4>S?NnVQH|xF<Ca2<g zMmKIRcgotOoIsocLm-fL&vQ>3Y$a7y7iVV(NXV!A`|<^|+-VF7w4;hXTpI@mA<fg( zmZjO*-o2}r=Vx|ycHi_35DeHvtOIn;hZN9D<KMeLtA)+>hr&f{T6_aR|FRqUl%3H@ z_auT%Glfz*eQY*yx$17n#8bHC54@;!;G@B%lV-$FfaF@{v2x1ScRiRv{xe67km@@{ znG$+Ed{rStJy&q=C1%jmM3X~O9#2g&i23^jkw~lc3*Y}zgkgchu7};sxmi>Zx?y~6 zjY^%9`b!bU1MeOhB{bf=zwJNKdm|W<J(@Y$b^uI@{uYEO(M|VPS14gadif9e(<qe% zyW4LyizpFWbm{zeBy0`er3*%Xpwi*yZE1PC=M*`?T;(??-(3qmn^`iLE(3Qu@-H0p z2E9W919iVqw?iuP;a;9BCJB0z>)ss?O+1zl(59)sV)GXSWIKUVn`AO$e`dgm+Sx+v zah(~@RXCK7s%8BfGn<u^^_Fx(7r~(wpO>v_Rr~V$31TI+zKsLvc6s?k>LU1>iM%YG z+eRZn4zlg(bY)6kw3f!iX@5`}xZ8_o*bS?moGY%$`=GM)E6uTU{+xZmH@Ps4nVDS} zr)2Vaz%l{Q*F{1aGq3+*_VV%q_2SNv5g|fK5I0;F#e;!?v9vsEd)}e0si|pbXaLr8 z_o+|f*MTD3rlw*+A3VN)F=FElx#l#PfRA3A#Y^2vKp>G^WxnToAt5utxA)Ffg<r=8 zz%}w!S0P@7kahm)p<Xu3YZE5m&Biv06xDHfmyD5yfeCV$hHKyGZY#A-WKUznEWkLp z{)wX$(qulbLMixaHrFrgz+_PM5%Q?kB)i~$LTh96dpLxCs~029BV>@DF3v#T1!IE4 z*eW6^JLoI48~<-|F{#k<^Yd?rIM*G*qfhk2s7r@}fdpM^_Illq+z%`xR!n#cwiTiw zwz_lSF^}K(0nXQM%15|Ef$25X{{CntX<~*QyXxhrgp@jt39G`KtSrqCP|};xIO)Q| zwipv=JV!zuS4ffl!>7p`uI>_A0cqY(MS3N{KS?dzag~fM%-YeLibTW|kcw2NY~<_9 z9~Ko-I_HNa(Y+2or|hT`*>(R)DogCn%a6UplhH_j>fI$|voW2CCia*d4$=8jM~K;I z3NA~+PgBJ4^V>iukNm2(Z{G(b3o{-MWk!y~aCwRQYvtlo2xZ%R#qc<QGQd%O7bJPU zUf_R*q@<+${P}ZFPtV7XAAv$$2m3Ub=}&QO&pu;&<S2njOqR8Ebc7JV^ylX021t7W zwFl79;42B*-FRmMg{G%VuC)f!!%9DZJA>3onD3^)c}^A@^p5%GW=vyIfIENAN|k?U ztpOpI6ZEwYnUK?LJ^GG|nDdvNOu*`-d?n}Bo<U&Yk>6yx8H(!z;Ejror~hz=D=+$} z58XP`AW1-1L#*zo%{gDJc6a3ipQB>wA^y~Yy_n)-5N#w4GWm68C(o)7O0e=jiLx&e zk9<P2)C(+*e$i3mUeO3<;AP&(MLfVx?cGad(Iak3wZMWib(S2`oj@&g+x3%}W#Ts? zc9guAt_`}i(t+Zk2C=t#hv>OAfb!l-6#wG~y#*z!`0L`+Y5YoJHAL`)7@t+r5EY<C zE1cvH)p|=IoR<zEPPEV>{D~4v{}a26hPH~6NO}rhM4$Y`eu{SarQrR7f9?4*UB|}C zDk>(11(X)1#l(NT-wK<^5>i!C!XI$Ct8V*~-&|S>_d*>vq+j7oKLgg4_Jsv^P;My1 z7xE6#eK=dHQbVE%GmR&<x~O8QE`)Y7QUdB<T-h7-$>F58qbgXO!Yk+*Qz!+C>rL7< zoN+}M=lD%EoUj374>dkj-tu}JL+5qnwLF0k9l*uClw1rX#Y+gD<6QMJk%x-WcSbV7 zrzOy@#4Yrf8<Q<wpG43`12VD*)U_W?FKt_Ud4ib2I*BOvl$sedbT;^;&n<7MJlId$ zKCf-sLkGfJvAK}iHR<2%ySE1hic;AcETA<M#ujl8x5vy5`Tr4)>9)Dm(RGgDsNyy% zq+i+Y1l?_18Zv#sWZe53N2`Vpv??3VH=H~qCzfG{7(lbdDoOVN9-Lx|&!?~hH=@&S z0`B&DBV=aSaVAt__!{uD$zFwUTW;p&1y<{4AF*3IPK<vCMD<1>o|!@tL2wBIvatM6 zl$}FFk=duu97f_5wuM_<J&Jk)(&jM-dD%?ym0yJ{6Z^>q;gdc`e~fb$Z}ggA?i3c4 z!;~@0)Cpi8#-2Z;dzY6<uNjdK?ME8XyvxgwtkiyAuZSmF2j!rMVKd{CWb^z!P#+Y8 zlK-nsP1UCPX=!XMV#pUgbmP9hU{?F{TXlIkw`Sv57zjI&no>2xFda`6diib11+)=^ zJ%{oUGUAhN+vEBHG$<rmj!fNVh8++eWIEg_bB7M1na*b}OMNq(B&T!5X`m?l3{yv- zJr<5?6Gsb5uglooHw=AiwObJYyO@WHl!R2}{D#OB0>}5pX2bv6AVwJ=*@90=a{IxP zQMLWroSa7ay;?rI`7;js9vwejyR3D$HvNt`@ZMoIeoC0r{Dk)FVqz&=!RU;G@U(yU zVE9&Y-+nfmci9EPPb^-N@nJqOp7i(v{j~nvrz1O`3($l4RgoaS>%q>=zTe%0bh)@Z zEGwqEb`J=Cr7ZhaX7;o4;Wya^mge<mU2xm-4Zo3;DyvoS4}Js@ld%+k3BpwN%#{Vc z;^5E>^!$u^hs5TO0Z7b!?o4j%lU#JOWT32q?cp;A!j6b<U(xreeiPEW(zv)RchXB< z6I`KVpK8s7?BG^bgM0O)KEMmM%o(^u%ujrX^Fs$eBRMs`v9Ku`1}y{B3`tr+K{Er! z_UEJ^+8~c!YD5mHV32TG`06oibU76A`mX$1^zp%F7nk0?1Tr-EJRC2>_D-Vy`BXPq zbk0ygrw*C);>QfIsYMd#E87m7>c;Or8gn_Vwb*MxwV)ZVFfvCa$w&-4hjr7@`c6>g zdl+!m6WP4kX=!W3(^Ez7kH$DPAanBU(Wyb)M*@0Sc=)jPc5XJd-4b+INba(YZtCEq z-Qi5Ry3y0rvj?l}`z_%y@A{Sp;SOCE-{Mtz-v~l}Y~_Y_EV~~n_gqR!&uRGrE}@!a zGj~H4MPx5Gj+?s=snGnpTm9jbY3SPM&`<0BaTo%Rk6)al?zb!lzzG76UxI0>vR!$$ zjQ|F1Hu~)BR6q@1av5RMjIZFG%PL{%nhV{{@~E(abJ4B!67bx4si!WhI(<t>iw|32 zaYW8!9AA3!7hf>Gt{3XVgcYMu5FCT8tOLaObrug65`#JQx`w)(98rGJ=1b5;yR4Ys z-^{|e@k$#H_axGAdm<*^c`XwbfY-|Ft2u;1##z@5-=_lPfvc)BH(+4<>z1&<h#+=% zU6N?5K0qpB_Myp3w<`cH?c$jkY2kH?a-=zrol{{Kagse-)QUYk5uHP_J@d;a7>My_ z?XT8WQYw$&tmbz5t6r_*u?35ERB7HLFoc@U_G?p_-%=;i*h_H=LW3nUwYiIAd_9~5 zt>eGn;V`wzK3`2)F%IlLM>mgJxj-_xYUejzW?%=b29aE%vuLHLDZAt(^~Ip|A_^)i zEBbRD=0vW>S3d?PQKq8uE(nK>W2Hw&bc18N{JBn;ey^ZmtI4&{^E@XdcXzHkHQ6Yn z34s~Fvpx^|hlvSz5Y{(zF`l25fI~%Pl`wq<=nSM1=|#SwWX`O)Kb7R>`o?~(<U{>; z5iM=z_aa*7F+CtvA4lTo-zY|6fx<L!D79A7j=rWnF<C{rrfhb#zr8Kj*n${PEY7QY zY!L~VjjU*#L(H3E8n-^;X#W>8WwSSBIObX_TObdbGosm}(dg4=l@bCD3XAapZ}_~1 zr|kS8jk?h`!=FqpS9H~t5@(H|8TxALpi)wfxUXg=;zWF`^TvSf=~j#@(&BA<en!Qo zvEq98^kgoccMJBOxK3louY_X~DH5@S4Or9WLL%VZBN}3n&K^mfUyTk|2%d(G4XZbe zb-_+~m1m*T)^?d1W!EA3wd3H+xI7vauH?4C-%{*I#gn?vZ6czPCt2FXT^laQ(L|QR z0a_VY6!1w$$4K#>2q)djXk<C(gRatGVRF`iuf-mbn7(L*oJ0sV7Q%YicbS_f#BB0O z6$JeW#ht<bt=1aOhi@}q?=%c6nbl0an;_C@2mB_p$0Oe@1<?(NJeHBkHC1dcd&V8P zLR%FEvk1SOVoGIpbc<eNN)xH45VI+GL$WG=FQPhI&YLRxhQ=Y19gv0Px5d;|zFA~g zjMW`+u0bD>@;N~}Bjgl<ql3AVUhI<*-JfSs;?SUjiR>9J0Ni@)V1CBpQHh@OPXigt zGCTnxDCra=oU<Z#iAVJrEa=X_mh{>RzUO$~if_lKGdrFICisAHFuJYn4Ui6+n47CB zD?2@0?yxzWzHj&icO&=$q*WwMdHrp7*b+E}3zg#kQPT(xrDMyrqVJciw24m#+oq*U znXW{VHQadp9gHGSxhHJ4b9(MEn@2c@!QgYt4P+9O<?(58eWXpNmfmgNv#XlU&S}ve zACJgbU&&mFWYO<?5gYTzgBHU7DBQKeG~2Fz`9JxnbbE?9gun5qPw#ltEC_$NLejZP z+3@(BndMYft8%3+$}|8-9Z!FSIzOx?ss9+*<EYSI39I{X4tbfYHC+V&QWA>M3d`-I zAKn3}@6rDNQZiWiCUjCS_ZicUs$|6aJLV{+$#{kSaxz{cc-KUU>=tvFkRyDQMaAE! z%Lx9=M^|od`mM=tRTyQJ3su6RVa0ZIdx|cU)KiC+awZdJ6zP(~1}8u51a<Tp#9^aE z+vT&y*b$khG@f3jmJuDaR3KvX6^ivNn8DF<!%|}iVaVU0hOoIE-h9%T{2@+DL;v#x zFdzPf4yQ|omekeeW~f|&#j!i=Ka6MZd&ZC)f2q5o%89M}S&KZ|%1P?9F`W$+N2RRz z-cx9mzeh~~VhV5@NoNUi+|KLT+uKV>NB|QtR8-Xb<|z|yHbM~3h5JwvK@{DoPX_-F zb#E0GSJ$pxk`N?lkO0Bm-3jgz+=IJ2B)A24cXxMphu|LE-QDe9koW!e{-yisv+iCe zp-53z)vQ{x=9<s_jPcD<duw1sV*_`!i=gr?%Ord|xrky3{jm8Msb>&yx@X~F%2QrN z;z!HOrf=$rOi`=`lxR{iYD%OO!}0uiHt`S}&PymG8lAJ^Sviv0#YGK%PyI*xW!P!D zlnf#5RQdq}{}3lYM_w_AbR7)0Nh4Yk6$Tyssu*9`RIxFNga|4zkB2=?ha^PMnk?=Q z=Hqsnag51z{8)ph(*@1x?APVDU=v;*5Nt|foV)b>KM<(ek;g=Bm)~KIm(<0Jcv?5z z|MB&5xNiq-h^gOLa1x~6OV(}6Suj4COMYep5)2vpdcDVDq9yWG$+^YBW5dyfJ&i2= zIKX}jECpA6#$k&kKF~S6KTQ=(5ZsuJA4AO}lCyP74dgXomUZQ{C-OkLh@*VbgvrQS zGqP{pTDONpbhzH4PRw%AM17*9h#wclofsDfhbTI+8UHnkE&9W~zENYZ;iuh0aG<{4 z_H?bPt(_s()7%M6>y>k6gz1V&TgZ3m(v0NsNb(fu{c38&(k$fh%?>7D{~L_Tk-J>y zY7Sn3_CD?V3rB_f);AeEq-Ix__?`>5Tj_XTQ~of4NQ6bau6A{sNch9wZBlBnDqnA3 z%oXE4&ep`!1gx?8muK+WTW{SMO2>&t{Ju%!TfTPG@KiRYPe9dLRT0Tb70pq(3eJ4> zjLD7(Xy^L<v{V}%Dddx&qZU(guG8KlS1g#Rm<eqZu(9&6eduS2n*EeV76uz1`KMH@ ze<=8g<6EEwcrEQ=S+&VPcQtzh+N8WAht2qKDomTYxz2o?v$Le8(8KC2cP^ds*l&H- zLL96ot|8u8L#J_p@6+8yK3z8_XKVwko%w^`j>o{f8#|Ngb<tUjVPOCe)#j&vI8<2b z2>d|sG%kZ3pO0ocKkalqPT<2wVKJK2fQM>TjPR_JwrwfIxhVt8=X;;w8!9=<w=>4q zb1l84C8ZX5vB5Sk!&983)U!t?1d~m+MA1GG(U)|;H!)E)K2b;offitc5zMB9hS92y zxrknjPM84*!YvS)GW?Q`nv=rF5A5t4sLQ#)^`zCdH|A2~5UZBRRIPr*d**5K;aMOK z51D%DN!c_!NWF|BFP`qHI|Bp8yc`M$5i3#!v|zBnuOsdMi4<*A{#T?(XatB9T?*ON z1Q8oMS^_etiL(VHQ0xv35QQFA8V?!pLLaoNV4XYf$&Twwo82!o^u&u#W5+F=j{3X1 zOU5S?98=QJQVIvK>oyLATbgasVnO8vJ?&=WmeJ>`N+PY`a7TIk1s3uV^-kI|d(31k zIG(9AoJ%Y~cpMZ<8TsssbfNft^CHzKC9nA&I&$HG9WG6AUtAo~Iod4m;kz6b33*ZB z%li9=E30W>ItwI9%{z)UN;u)SA37FSdGeM-;c2Kx@6X2l1X+%iUD)ic!LliKTyxIc z5});qe|jbif86`1-o_YXkI{?xnN)}~@7Uz}&%QG#8x_#~478zl(9&Y!0#@+J@$rtG ziywwkz-2HukSdcFm6MY*Js3;rg+hzWj{URBwLweND{Y_rI6!zfNkh|M<xibXt&Rt( z)ojf<%t~ue$O31Qf44W*+sz)6BDwbd=M7gAWzuusAoJuI<Oot8x(W-5c!~$Xd6L-3 zKHNSm_Btxpy#3){%+b*?y9jLp*x_B{-dXTOi{7ghZS~cP#teoICqw*i9%zE|jq<~| zpCH<ZGoRyHbyaOou^n^<62h!wQdNoVkNLh3w0nv^ToM8e8gBe-de|-;EQTC!1ogT# z2&PKuR1vZ6lfLMejba(~pc<WPH21Fk3NP>5<FcYZRTdaL6XzITv9iPYraH&h5(9qu zVz(IKJAUbh6=UN>SbU<4uO<jK2B%Y5W9Ib9j#0|akQjK)83jlJIU}bMqnO;!6jnpy zJPna^Hm6boEW{+Rl0$l*K$&FmQ<KUcX8U!UkhTL8fRYMOI_f{A#r(ZxlOxM!vngU} zX=!S@ZMfXuACRh=QCn-O%mQ-B)1x$Z3zmj~S>+mKo(K2ow4?JTmkrl7XY=q58UQL0 zX$*Ao8!vvO(BTfOJDT!i>#!(uV^Cnfdq3^FQXG-oej#)2lSxV9PWy0rr;jAw{HzhV zZmT7c{4h?@^3jS}Xg|Y+-nnzb+VDNGX(fYI=3{N2A1eWD!R2FU=^Q5byZ_y%mgnaw zi52`!>{}@#K@J~U4I!<H<$LZRTqzkHBX_ldJ>&p_K40)a^9XP)4ytvJPCZ%aIJMn< z9)u{x06{ZOzNX3ZB)H9e)01ls7o@)?HTpY{P@m<ICPgEyT3Q?ojcO8MJqOe8K&v`@ zheT$*wYsi&6A+t$@cK74)ALVkCQcNH&8W+f04Sz)iC^1Ut-Ppsv*QSpUg78kg}?ic z6bqs>20P3PPV8`7Vr2r-upT|;`bQy3?J9DIAuurxXt`I8Xu!(|i{Q~NlKl5sZ*_Ml z<E2O>u(7()Rw)HSvu3zBZJkMtSur}4C+LXsV4H|kWJUWnA=U2_b*e}JI@IigmrWve z>v$7`Aw*;7S_EHq4~t&z55sYSJF(km&!?M0$Mg?0j}IGs)Ik(3k6SD=Xek=6+kGI_ zuYsMrb(~jDlTL-hrO}4vnn_J#dHLzFI-+ub1}-b6rluwaMiQ{n0E`3_6ci{yKCN*v zG1F61!Dw{9P%!Wv933-|{`I=?146aiJ|<9JMM}iwGK=Zv!8pLE)-*Yse6fEw4c)vq z?iSPd`2lCL^xZ$gw;cygDqJ?lQuvGKg<K2s$-~EO>rv3O@g8I*$Csjj*<+8fCGDup z=}^<j=%n&1D$pZ!+-0|CHjWVdOa;LOEYiZwde$xI?T20aDn(x-%%5LYK5RrzWhKQD zQ?*w;?4{uWkOLAfXXchkP@Tz%V6asAy@K*DVB#OwrZ3K*o5=*P0gKMPMWC};S8KO% zHIneg=*Jfa?j)BM&Ho^moM4`gL?gRUiKrd<c<e)KQGjs0c7G;~;hm2oSqcLZROBB{ zvP^P07Q<t0G03IEG@9i)9mJBnK^wVPLpYoGn7{d(;#8~^t!|OEH-THswfJj&iYPmO zAm}1=Pja-we_H+aEAt7q96Nu4WIVIzD@THi4*o9(%4&eW1?}W-#Y&1S=;m->a?>as z-qWHAWw>N4fbmBk4a8pA5FC3ME}tzzL2TpVg>{0>kvi7^k@cS4A!I1-IVCgpQcsjv zcJfLw!)Kzt9uhLAK%|S+c9M1x*~(6&o#mFfJ-?1*J;y{1GiYJVW_XAIdHusjYl@2p z-@i&Ak&`}<mgOEbT=S6X=(LC4S)$_vi|aYND>Jj)+=w9y{BFRJQnwSvU=k*ak{rrL zV*eJsQ7SAs?2a|tcG^ofCi?5Oi(kz4OPV3F{y}?;0eP9Ir5`XUX_Ol8G@apakec>o zUx1rVbm_l5bzTQXR$;2eD$S&kKjUe4JSRCh7o}BpDfGv(?nAYPk2mLb2MDHm9=2QV znC@Pq6(GG|u(2T^b7T|J(liwm1V_uYjE(02UFp_9%>4X(h5-}MM9gePEjyFolRqr5 z!c2-s%AHhk_q5Tr97*64V3sqFeC4x3Oo$H9hPXd>kIbImNf9yGTsj3H+Yn0OtyQPw zT{9rYYsMbAao2?Z4#%o}r9ggDt7aOWI!KqVB>pL-A_F@j-JXo66919$qoSIIVFPhy zM?K-y!aZov3R{foe7eENm>5+Vnb=a5_>2kdZ?y%tUBk#eDH)gJ*{2$G7=Y_>m#Cg6 z3r(&svZa;V+I6wNm6M`TQiFc^@p}*K1Rt`(kDQ0`J<oO^OA|(z2xKNl@T^%~aKbG7 zekL>!IwR4y+oGp~Tmir(>l>zhyY!Uca$9W}P&7w=ZGA7qgX<Jks%gMwbh?w0=8jZk z%EYr+vRn>5+JGxpGpUr!7x~IQqL&YdnI@`u7|}y!Azhf?LrR}dJQ$$CxqWoTD)JPK zAA|1_hZrd7YjwQY9gS=>D7g-`PfByToj@>9hai}w3)S1>TDteBaJ4bB!(@K_kc1>T z4suT~^1>YL_ZD^r?IltF9&ds;g3O|%J~m<E8Jl#;3}ySHc`?g?`t9gWx5!f?K;sAL z-G3~24Sh0Rs9CLNC85*p$XF1z*2iIMA$AWWhW=&H_Ys)kWB9-aU^Qc#*9nuO`;~pe z0pfH{Fs9Q=2wWzopZ~8`x<<|GSK^YE1HBo?>$2S`Jt7z{iNUk^?lsin6@YOBG5+Vs z8w!oMV5fb!crdL756zD}KWLQDYZ|x%$nLw>Y{hB0v@3+6*bWEc^dyH>OZW#65Hx{! zW3qjV>u^=yjdSHsD8=M$qNtZ%-!W><7oJw4{4|^wQ)OqKtDjoRV6!e>AFBNmqyic; zuKYV74}d2%tP;imUkjL{_M@>T7QZD)z+@-Te7yXe!uVr}psn^!E8vU`-9rNr`K#`d zLzMyDp)I|j7OqxVaQvp_ptX(ls`8p1{MQEVtF^z00U_w*Q<t=X&db?L_9ul4-MW;7 z9f<-AiZTt3=xCR5+$UgsfM*RT+5p^>!|%7uN^R9YnUz`kE%n#T3dL9B{YFhQ<<(m{ zY2}4-*rb`MiBY{ko;Iz9kDLO05OC9KO35{Qwm?wJ8&)$ITUwG}dH}p1K2Pyx1*q)0 znKSDwb8Cb`6uoX*Xi@+F1yA&U!6R~*E#E8-Oh(`D+EM=gm(Dk!!;Gf$U#J;Dve$rQ z6acYZmGaTt?H9oltSQ1MDpmXae7en<+f1?j?bRFsqQ$&w4FZGF>te^mwPE1WJ3Ti! zu3|N&efebYSSP%=JM7g5zzh35dub2aLG^%43j2dcEW{rcS|FYo2RK|dH-lR7jE04x zgImi~ZAg=aEt$b--0l{CTf<=%=9E@uHp~9$j>hP;K9f*E2eJkFfC+BvbEFAVm9{e7 z9|kKN<0xI|rKbdXkamC$z^DXh??jTwVq0j9o)-x#_UceCh@SY)QkpD8BXKl>0v%$D zeM|8%Uf)EJF?|sSOkg>nGZatv-qT~)KuJj{E;g1PqY+><Yym-&^>rO!D+&k&D=74s zq3Hl&rT=rPBv4lGB(*9(7U2tKF3$G{jq)W|)=y&$6b9}XFRcGy6tx0B!53R<%^t)G z`_0SA>mD~fh(VFPkq?)gAa4Ce7Fl~df!OT5pbWU20kXkp<*!N8k^UI*wQ}z++W^hm z?AbrE>W*hix)T`U6$pn8S#iFSQ0JSrv$5If>Ls#_)88a9DMU#Q&?$+XoG78LUg<u? zyNER^WMxgsP1~p;SiR#nV-p`S|H<2mfO3*9m6Z9By?veQwKC)<9uyAR(g)p4+0zm^ zDHp3ZlMa1$mqX2^5pUy%f?b<EMezam_U}8Lqs$eV#y6!Lyf4)XbK~AG2uMcMghy2c za;mq~8L4J09;MD(J&t|Z;sLF?&|f9=)dfd<Or5jImoyBE*XfP>uLyQ5^lKQv&<xr& z{c2J4byEmw+z)=}D`6zuxq9`wpUYvS*)i?RUs3L1xtOJ*2FZSt#9omW^LfK3#?sGg zzrKB|Qlp^PtUUK^d3lCbR^?$~@JYi4Vok3N9_b|j$}@#tKM;U%-P0I=o*HHXJ~!9c zH=kSjn&&mF0#b=OnS#$|mGCb$%rQ-4iyPp)_iD#}DjE8+4g4sp(XtjKM<RwyxfX?i z3e`*B<NE>3m$(fXfqBHUD|f08rBa%*wj^pyu-$*m>JN4DL)o2_mL^Ofim6Q9zo82l zX7j|2!g(?~-%LQ4mKDYCh-pv-$Bg~lZQ`MI=O93*d4+cHrQUUzLFOGF*8;%EVCuo{ zxBm>FJn0z?7$d}tCGCwT_wQdZLXkhsGAINqSS7=}Ia%x<<a!JF3lcUmIm`b=74;a_ z?v0hQaWd&MMQ&^&pt0QyZh6XN#Sf>%&#`<Zd(07;5R$3=m2TnU1j+erV2dy~L-6A} zp4X8aLxP{MYG1Q@4+;wQ-cu|mQiPB`A$V>K3?Nk#?rm;nOOpar$vS|SOON5fO$S?D zs!RYz10-u8=2<rBGi#?6k|qQlER;ixON(-qBsPBA^0_CS#2bg9o#(@)-v3<Q?t+#G zA!q-eU_9#e8yJ<CDRp-ui=LYFU+~05ZsoK)BclJYrd7|fK-XcW-t5ib<SylzmNvU- zIQyohicu&@BM%x6$XOn!vVH<W2f)&kc~z6OR#+PK-GI>Pz@oLtm13;g<4s=5XYSB> zldBONIlG65ISFq`-yBP8TAl(rp^z(Rb*7J4%{h;L(Wtw<i!OSG7A1+5n^K7l6-8<8 z`pmYAf5RH`KIB{IU-m4}P^MhWDQunc@r9pV>D%B$=fhMRx><rF#&YsnGa$^rRBYR+ z^8UJujHmdKU6OPn@|*m1TtON+M7nstef!4G&u?vQ&CA;X^b&vl8vNB!=XvGj!CfRB zxMJC#F0yHO4C8**Vg_+1*DEpKEo=PT;*Ni650dVf?#llsP!2x7UlYb|m<s`A)vK?r zi28-SYL8jHdrU^7Y+{_mQJbrFH|ux@8b^%%5`1RiWNVE7_f5i2pl!B_Eo2wN{*cg& zXsiS1`gy>Z`mEOci~m3<^a?{_pvI~jKjO2jO;A{Jq{jHwU0(izeT+}ZkiEB~1Yujq z)k*~BqKFWr^*EM0P79;_Z$8)C^Sk;YatTb{SB@3|Q9gH-z$A$Pt&fmVA<fE<ns@HD zHn8|a#JlyfD#&q>VG<;@NSUBG<waSsicEXlH__P<G4~<xuOs6@4S#;ql$DiLU0t1# zk%1BQPC`{RNdVv2gg%BB=GIo4Kq<Y=#Bub=1BpnI^~EI7n{cRW@FhodS$x@GQ*hoz zH25T*Wu$w3)5XE@Vvu0nqcqFUfS2S#^`2btOqbaFWlLgvH&Q98E`-?*4rNxr<<qrj z?1-q?GKY(S$rR8rjQxJ0=OGR|?h%I|z~|-e=uY(AkO38^f{WdIuCA8_?9pNjJ`%F% zp@h+5-S_KVk?aS*emcC-bx<{T0J=_$9-ZEZXKWk#LqCMN4^^IJ;?vf&yU9(1_AePF zyNd_#5Z0dy6%2+W$%}P(&4YB#5-F8nPc3=bB`7x-?83Z{o!|RJLhGUqP%xd`&dG(l zARY#Mj3y_~LXrJ;klP&KQa&AT0!|63+A3WE+R;&Uk3rO+M&g*wG2=}Qc(+tCGzS3= zhAbG?$7jtdPvIE3fCt<`p{NWG-vBwI@aTN{Y~?<K01g;=Yj<bcE{Y+G%+!d8@gJ{% zn|!*30eUw^yKvDvO$5b4Hfr8bJ5OsU4C|e|V#<&Y6uVi))C29kkYb-!ndEKs2KETy zs3d%A-gt}c;dr{Y5FXeK<wmCQhQElH)Q?m*kj6|7ohoxdfz0XCLMrsxPp!G?0#yZv zjACVGHACSpN_3#p)FCPoDAk9S0juL$8RQwx+lFpEYi>I<h!uiwKu*9|Q<&Q4CLkIH zA}xRV0XEmtVWR<-4iD+WE@A(dO#Uo}%M^sT=1T?81<&@QEQYc+#^K53-oOGl6a!nV zzEx>QtfBnd6!c`J;XqR{<I^AQ<iTn(d}Xr9sH4pZ)%e|h1<-T<;oUe#M~r*!d@9!= zwuMthi(!@WcVv^9k;FrL8ZG{DLglcS()Z_h(pS{m&?CW>ziUM^^(bUC?O%VGUdn?7 zFsCKT`=5K$z-3L>ALyBfe>q@ba@>pZ<XdiO6pIvHj@-Bu*__xVY%2}WQhxMU-Hhu5 zRc}DXO1J1i<zQpqBRjgi=-?x3MK0ZlMK|$884c^(JDy^pklp>oi<=jz#yKN;&{x&e zQlvNW^>OXh1;#1Zup-48Ygfp}$!HCwzh_fet}G^R&70raLbqc8YVq^Be%FeVT~cYt zEVI#|c*xc)e#M^td;2c|OQ(=E>@Vu@K#Bin=sr0?Tn$j+PwF&#<I7}nSa-q|7Se|l z{~YbmK}^#<nJ97Yd=fyf`?6F5yv7-Z@f7y5n>+f~Mbqji;K}yz3wZ;<<kgS<2L!X8 z@ChXn?WTbDvg$4pt@LDri#afpUp2FQ(_JxdxjVJFRZa<l;eCtW0mfl}WSq;x2!ysn z8V;fU#yi`G)x4Flr93qiyX!IMpm1XG5$VUYyOZQH-Yw?T2up`Ce8wp5cy=%{*>lY( z0}|S4gcpdt(LoLNv_b!|c!jf-{r-Md^fYh!c7%ha{rd$w`p*7`II1&2B8fZay=z|f zSL}>3?AHBA$ifs;_pGg?OS!A5gd%=H)6Vurj)<uC!wAg2cpsPhLZ!&NB$Jq2x+5<s zo97W1j^YJPWRv0o?Wr5_ZN)G5toN;0dmWimTgGH`5DXi#)FpT8yG`8kg=Dd$Huqoo zx7@Qy+k>(S2UxB2u;HX%oD8)Y$hRKuj3%#QP*&OtsaD)0TZKk0pt`%Z12N)?`XP_f zrEdpm9B+gF8<E8urDXm`C~HgAe>`25q>tetaEKuSI6tPlf24T^$Vn^ySrhntCHt`y zS7|d(vnuIsZ#OgJCw%<VR#3*78;9Jaf8v}#<<DjoxQ*Xh!ji#6=Y~3@-5l#m0`E;0 z&Cb{;FcKb9?@9Fulfn(SeXahniuqmR4nCa4y6t*@MBn>>%TZ_1g6700p#$Y4vd;4s zX9wnPY#?9l>ZyNnco=G3J7ceV^d6wG7(J?&ApQ4B{<VJ<gByu?5n0LDBxFuW&fJg^ z&~QG%xJ7L7{X&xADe!5*l>75qy|Up=f?kUyE|L5AniTwaM$J*d!6@n)&HELwY!6~Q zT?w;2q7=DEtj20?jG|Gs)YN&}?;d^6QxkzOm2r~f?k3Yp&_jg|)O46uSSfqc9#3Tk zi^1HjX#u0PBm^%|Y$b#NaS~mArLTss54o<=Kd8HppB|yUN>QX4%Qf|iX$A4{**r=% z9uJI;py=uguMQhkbnwa`$@nR3o-94kO>&`qfAS#wbo>0Yi9?Pt9XOzQbM%}@#t?eP zl9*tnCZLmDPgZ0bEE$u>uk7LP^<#uwZX<2<WjZd5+Mz$kzRVQ#0lG|MpuGa{oPrN< z^C=`Wp7fOrMSEiHaigq7IM;S5muO7}9Mnr$xwzOZ?U8_U@c9lCkyKyY7=NiJjwErh zCND`g>b(y09u9jxzsjrggXU|5*`)Zlu>Yj<Z($$tU;z`!7ktKldK8;Mxs&Mv6XpXZ z#`1j6<kR@HY)p>+zCbapHPmqA`(BJKF`_fDPmX)S6pIVChf}G)R9qltp+E`J<|>Zo zHuD4#gdWL;OfsF#zmB_ymeyn7IZBlo$?~kJ)_wP7pg&Cx#>_+-w!;Glgkb#Y|6K^i znb9Yn1{zRU4#lY?6#8TuCP({9x&;m%c#pMJxAvNyN+a|5o*EV_^cgSx(Jhk?<J=LJ zLUgL-sF4O~Id_p><%6kYWSs*cF_uH~n|dext#%nQLvh`tl~T<;Mh%SQm}(wa=X=v! z>A#;Y#S2R#X<9V+7#R#b&#a#%Cq%2O-xXwYQLfx+rlfs!_e7{OhBZ)7bIf^%LE?}V zFk*?Z6(j+A-TE%-jQlE}Kyd;+M^EhjuXl^0LwcMwLgH5<*8fUnDJPUMp@nW<8rO8R zcEWGrY9}2fYIzKEgw_n@o;H8~<H9lx8`!WAmRfp#Oy>Xg$QoTtdxV}~vjX|-_D*y> z14t06VrYG1Lc!^0jH&DBUqMPq0u(sy(CHguOft_{!Wb}W-xwHfc1J`eox&coG)C@T z_rG>l9ej*A7ml_cv`@f{J5H2#->ZX{2ha|vldbfaai=IQdW;VLHz*3->5$TZMUShs z-PIbUC{{p4-~II>jV25;Gfg^C5a)zd#s2m)Ep+G#OfUG^y{+FL4y5gYO!=5EepNqQ zpA%TYUMv0)q*qR0*5JE|tg9OP4HwYd5^UkBWL>ot5t19J4qG{fQC-6J;||UinaNHr z2P(E!t1^(x+%=?0)6p@wBI3+9Ncx~~ff-5a3Q3OpeegM)dSvKU6O-;k#%6{e(;jcH zzAt3u5lb*@)9;78ZQg(^f%<~3YG++d+QV&a+}N?FCC~*Ju1}WsTCC8dS_p75YepKh zM{Qxu;n4|6Q@Sd>7t><+!QajuCP4B^OVRUQ@fes1J+A)+3#E4QrHG}4--gteDs-<9 zFG1-nlU@0tTw6EJYt_27I&))}+a2t_yryqEGFNDRf6d5`Nf?l2b?;~NWh}53{;IU? zd&vnBGskVd8NwX(rUkb3BWm`#oqrX!nTxex|C~MT!H4%mnkb&GJg-dt8rA=Dr1k+n zVk|&cw5EUH8#y5{Nt%9ze@u_@#1vsR!X9OiH(|#+!)!=*ql~V3=kzN@xD?5i6(1P^ zFb#*_jU|*MCtQ1e1B!R0CnLS9Y>(96DpWm7b}g%z(fj9lmP%V|)>c_A{98k6jQ%64 zVlNQyu|B;2rb1LzF{=Dy9+$MHlGo;JsEM7vZolCaIK}rP1LYe*@M2;&7M2w;wT4z_ zU(4Nq6N{GFe>K~SAmu&>hD=G>K2!j0mEWzu`X5%N7O_aL=rpeuYz)gFB-SpIL+O z=&YA|2f9#t;E50-$V$4s%JL#!Bwy9%Jpw!B+ZYec5X8$JZm9OGp3A4?N%P6kUtkHX zcqk6oL<BJ7?Cn-o+|rCDe1+42LWj5}Q2);WDe<pxz<&rSHgO-JhvJ&s^7}F0F^2Vy zvZdCnJt=Jqfj>MrJkUam(v5*_1sHM%IhnuI%>nz|U;T7`f5T~xiv7$ut#u7yOP;#q zP4i*2BPr9H;xW0PHj|>qWMG74z$>#}jYDL~&XgwN5Zv=KC%OcNfG^he3KyrWCUVuC z)zI~10g+g%(Zm2zE8Y+||E_${tLh5312A135YjM$2hj-Zhd=)sMsoE7tXAg;+)^9} znIw)Gk{PYve}<be>47Bu4iBZsiDc4D=DR2RiZzZD7H>kQvJ(0lIIy#M4IH@Izo*9m zFg77y)^|JA4Ot#1ysOZ5JG;q%B!Rys9KSlAWGJ6C2N-b?KZd|{icX~ThYysQ-$Jx9 z1JJjEc|Axz&B>V*FxF)A1rh?ipk&|X8+l-qUQ-8phariO@jSkbCL3~ae^pw~j%xDh z2uYzbi{6sAJm%-;&%-*a+o+AlmK(PvJrLK}ymiyfy6O_KF#l}qjd5zR*3;x;n3`B< zo1pJ0nMIMJGyURh_DrHOYR$egG_KvmJ)BU3LZoS9B5({f?5y;byOT|J7<JvYweIch z1&G-$X8wGVWGYNE<g7+rfgi6OqEF=4E8#m&<2k;EuIPPeOcyV?wHsd}+W3dJ$CS_X z{g?kV4qAd%WnSP+c);hwWL-0q2PmLiHeovRjWqB8<C7qpRv4%wKN%HiUY_78{oW_L z1R<&2u{Y!jc!<L?RJGJsX+CJ-_FO828|Vv5MqBCHfg3=10l>Tt5KOuYGzO1M_Iw$W zuRTu)Xd`~5UgJn_V*U9dGNXQ<jF~DLvAcib=Z35H%ZkT)y;q+;%99SfHlQ(m{zppo zVKvrLOIC}l+W}NS_0A{zcnCN^XjRdD@q05aQNI;_ucJ1Tw#x_%^y|dMK)~~gE_nyF z#FWs`dkzgdk2s_pYMRn46+i*pUx#=*iD)h^IhHJjc(J)|Ld#DG^tWln#TMEO50R+@ zMyxWJA2L8tCE=#N+CYugLh*7m;<wJT10Jv$M!lKy`)lJx!miKX$&(Z0b@I%!vFu2~ z6TUd}uk&i^c=Wjkx>A(IlW5;Hfip&DuV(<yf)4J=a`?sMCxEt7k+N+K`2O*SjKRwD z;oRnE87@_f4Il>g5u%eh+ZN)W{9TjgKPsj!e;RY?<R*im&tP%StOFN5Lm#*|2Zb26 z`j5;iq)SD1@9OEYaSk~;^2<IZm{ThvfEv(wgy^<v{}}dKFzEY9GK3XgexhL=R<C)Q z5>I%OYpkICGztjSCLZQ(l0QUHTw_>qCWuCmesT`Jx<JS(HNdA@f9e?a6<ElRCYC^j zLBYh&CyqkkGI}*p#rrFc_4rEop2tXVhKyn`%V7ANU<YFP6S$dJu5w^w6(CNjTUEbb z&WxUnto!zRDppY=!dC+nFi{0^O5_(-BIUODL?i0x(vR+G6>C~Sihlln+vYYh+(86~ zNHvhUgfbMz2!FQdz0`+2X8YQr41!Io#R`H=|7$5zV-50(^Wv`T!|kUTCt~8XUYGs{ zuQK7zT;mau6EeWMvmyRP@!copk+9xyrpr+5!|UF=8j{S*Q4C$AijE^0uLe9<&RnMr z7~?>v%=yW9b!&QpteB^25JNGAOQb(st?m7AbFCc?WAf@!kyUt=wi7|}A`>Jg-#fuE zLME&9r=Dl^TX%OQzWYHr0Z=nF>W=$BL%qtItZWY)hO5EN1}@|?i(Q(k<)EjevDBW= zT&<5=Z4CN1DXHe%jJc^3SS06Gxj?!&_$ca%__PW`zmA@xT{)4*7KrXNI+fsr<@GV9 zqF8%WKwe;DF%FbhTD(7NOKsoJt;`PYNB+n3BxnDM!Y6SmSnvI@H0A-}9im0~MJ+D* zc>QDLofWxgc{@U*cz4>AfK*<&3`*jIZ$~JJh>LIhQgva|oCIOiMsT7cHNLzWK<on` z^BO{#pIy2ew>cd}(fc*`8980DSX6D{4tM=eMex2lydp*}D479N$#xNTG92X`U_WM# z<Q#yaXVI0))fPSNY~!ZhT;J&(v@G4bhkWg!_3%ps`gI+6E<Clgwee7bgu@KB?HPDV z6j4!7mRo`tyuPcdK0G|w!d#dzkj97+I-aEV>*?O$0RF|wN_qo*NCvf$Dwe+j1;Xy6 z)GHA9g>l`fz|5>7!*A7W<3q8@ZhA+~9X|p0k}V2?pO!Bjj=HNOR2Vs1>ZhhuGJ1?{ zcd|kWs<H-!vP`pAMab>$)m*@6s>BKA@@N0LH20CX=Di}-3Y!u9R&Z9J?{$!z^D}c6 zh-KIAVbt}-45Zw7=cuk+>wdDy_#^RrHKXo3YXzg>6};!`56|0Y0eW*EY`B=X&A(TQ zZ+yYCde|Kjv$5ll4rM|xNGpuoVAq*Bn1==I2>4HJWGnz)WGPp~0Z_YVgUw2$CX=Yg z`4)R)?%d|NZnm{@KM#T7{~>vP?(g3cAj`_1h^o^3M!a&2`ijr^Se-L43D>7?7#O^< z>uj|50dC|duECFtzWpmXzDo|bIi8WyB=cvA<WhJtBR1!@7wM=X%dJi#na)yS<X5u4 zz~7oc5cSRDB3Q7TtLj_;)m$$UCJdo?l@Y}+t*~sG$VO`WnT|-9bM;Be-ENgBJK??y z;;~;;KN@y6=$R0nml)IE%1_hDZ3Q>)u<Ufn-^d+o;YWYv3%QA*1aQkY!KmMCLw2$D z6_OkLk*6OY0=n8T^$_(Emjs4ldUn<9f)s*K1$Cf71r-c>Fq?83C>;M5>@`g%vWK|- zaXh&zCtMUa=ckdi6P;b{=};6Ncg|Ee3dCEe9*I^eo6QeR$|?cKga&q&-(uY93mpz^ z(|v%z>QnJt3I~QJ`PA}jDSz%szVvm{IJJ5Q_;vV&o{sR1LC2HlD6^Y%t`u_eX#o1H zenqKRFfHKgtk608z&e-F9vb=WLe73Ptr%#x6d}U+gENfp_OMAv_G(tjpbFydSv$GU zw}=tLsF(<~GiwwQsn6X#e6FAS3e+m@KGWbc&}YVNX1>>9;*nP)%^aLZ{{|=py#K{@ z5Q=_DaAl4)aBX#~YMo9;eXM<M_vOEH@Vn(8Yp$E&3R($Ld>EZ+8jW5z$v1WXIz4y@ z%^&#YBXYhp6jiTklwjD?N)lJOy+|FMWG?}CCCEX`6A{P{a>sEgddDZDEc-prOs0r5 z7r&mGs<LoBIE!qshMaDsL`HcoUA`utECg*qwxqM>O^}qL=milVhz#suprB%yf6d7b z9x7?aIS705BqVD4h9T3lQ1dxYCHlu_N8>z=+ssK5589>x(uQDTAMyZZ{&!d<JXsj0 zG%GH&`jhZ&Gi2jcUdx8I>U1VUmOo0sa|=dDdv9b>^SnmB)1DP0ZGnBi-G}j*UggDK zdhY*{?1$J<dF&_rwh0X*jGf)r!4Cr<2bTDqAuc)g;W)fu(t*nR<3~p=AcrxMxTL9@ z=QWR`6GyT)@9?$(rVa5{Z9gVC|GK_rVUCuw;^PE%#He+wXAg3k*PiI(mGkxZ>d;lM zHQVvj&>XTi18RSrp<j#X^)vCT=dlL-v)U><>+i+!LC&RX_eT`tv^KA{H0!8?8!E`{ z1>Mi)6J=(>0uyLwD1f$5DQsXqTWfyfE`{xMWbKT(`dW7P;}L*)eYiy>TzPG24{0B6 zEV-M$R#daTV!LnsXJIqVpczo^CT41p8p+gr<Pxe?)s=gxm1a^-Kk%v~;91V5vJE+` zavQe`&wHKe`?tIg9GoPyKpda<46_=ON~)0@N7gQq9!h?_cNJKTV$=_=DG6%FUix%2 z0ZnGQs}>AY)F;ez{^vS8g465poRWM1hDQr`Y?FY|Q2QC|c5*@mtB!^<Pc}E#3=CjR zhFcD7+Ns*?Eg{9_giuA76p3u&{luF)_I&5lGfs$psI6_gn*iql@v8*75$wZttcdd{ zo1+OoOD#Yk7$&}}ne%siabUxKQ$n?;eLiJHLvG)A9gDw*11m__+gJ8Kx5eMTx<&qT z{J(nBVa)0m+q+51gts>3*XQJs(E|y%D7PtSt$;jQOiT<N1z>WsNoD-M*ZV|h`&&&$ zj-uX{lNN3th7wiS$4_(^{KI?rv+#f5J@5*IS09Ta+!r^qp2SBZe!zCNz%&8bgZG<J z%K`J{cFQ0k@DT?)Vfj1hn~$)cs`GKmeTe55xt%-!H6shO_!?9bgzD2E8-0HNM;+`- z@T(vl2!5nR<E>fK0wM!L!yTaT%0Wojy|9o(cJw}J7$v9&Amxg{JPC@Gg@nLX!QLXJ z%T`B@Dk>1%CzZ&CGX<LHa`}<SAXQ9*tR05P-#iF%PC5lDe!f>F%Ud{gtI1Z82+g)o z*a%ac=6vK`G9|%rQWn2NCgOUzte63^1Hv@Wp(Tk8u9a9->JTiRQizektzjj%r)#K% z#)iY^_f>wWY3L_?bQ9~yJr!#uFz`!tPM(TxS5*%v5XGBx?}gBaL{x?$N$%+My@CaQ z-vUjZj3jsW#Ybz@yhFsCi7E-H`Q1{9a70UZ3&#-_Z}}|X6yJV_0asj7!pX_$<>lq- z;xcQ-EN23PiW&#>y$K8V0sRd?p;Sd#xxTUSRp#BbMvK_qC25<L>@skI96svj_2gGs zf#q#7@KO+uyof4$LhI}GiVSd<A&a@)NJUho67TxnWOdxO&5Z}-9b~9XK7XHArVRDs z>DCvp`xJr{6rTOL3hL79XKsyx$$$xAUq1n@&2iiyXqFINl5wvSxP|70xV%UBXzkQM zmGHSbm<2Ia;~$E&k0?KGvT=+kkJjT}T%T63t=Gp$<|MzLfxVktaT|ZFX3Eaa@^Psq z?vlJZxPT*ljTap*d;|v#jr0?wJb8=&enh|CkS}#GI#VDD1u5xo0J||b$nOrgUd+wR zI5;_}sPH%*M@2x*h4Ul+L{6^-+MLXRrGC^-Rb3HJ$0Eo6APCzXI%apk)lFuXp}~9n z_}ale{R#0|KHiEjr*N3fiO^t>1=>Dbe{jt)&Fx8h{<L+QKV{ogb??uzwF}U4{=$`@ znU_iWU`-LXOS-`POKCfFBkNh!=4>SmTfY=8mb=+$Cyb03`J}?F0|C%jsgV)IW<BtX zX{JF|*U8Up;oK&3^#k^pme7Z!Bkvdlp%&8WXqLz(KI&2Yw|+(dMPz`Ty_TMnlLHhc z>+9>&(^p4Q*a5}}@WK~coR#n+9<LWHUrt`0+5j*~dL)oBRjsoCkOJ1Mn2^f1Rk)@- z*vBU8>fDP2$k>eJ>uyWAZn*qKCi5TFME%I6v8ui5xteKlR4--T+Q6}#ObmcF@P>*P z5O5!0#{g(CxvQ?k!utKF_g0_X7wQp~6fN8Bi(hOlqGU7y#UOInBEt)c+;UZtwr@LL zP9Cx?0BdN1L-{dJpO_6s<}+L6L0|`)5%g6iBHz2#xf)hg;>*X>*V!2a<kps6K9T_V zbo%$K0}XorBwlisfS}9K$;s%N6%;gdQetBKM8-QpVNB$|aTctU(J}@lo&GcL*{fiX z9WNgeo!$yk<N3@M976^lm|q^7#SL8Ys^b|i#g2acaI^7=;iNz?q<1A10OOG`549e* zy7%lGzo*WrznUDM9<;bISBu7B*n48hy<@f6+XPeQwlp7jxvZ-DNq-P8@r?n+fqvy< zqSKdj(T~P31TXmIA%STXtPaTxVYi2MuSUtV%h2q0T0xwah1^B&5>^cSD2lVU0508o zaDUyp7VgocqS7bhhs18%CoCF`H(ngM6g#FpR>^n+B5dSc17S%Lb!L7ew6M;Fcp@@W z07$}TU9@dTJ6mfN#^srnKF`rynlP2`N)fiy?xr=Rbia~iZJ%>#0u!5Em7b31-t{4} zpRy?GKUo<URUh1y6A*JVyGQyV`OW1u4oB+i8^>dgM`CROPIFwFsu^$jd_7sw=MLLx zHa!Wi>s=)WNmBw63FPxLw-{I-RBAU;nJ?9?DOp-amwk`ww~4N`(uWc16c#9UlEOAd zUfS0?JJj(fU76^%D@#hUA~L*E!%ohKX|kVB<|5(-{O!W727GL@yeYqT>@n@+|JW=v z{>pO_|K=ML$DIEg`w@$+x_N+?a4I)06jjKz7+LH>M%Z<qkx%Q7xz(aqdkb@cz)<-L z*mSpQ1BbD(V^}-#J9rjU6m!@M@v;1Y8p{wVo}v_BU3s4J3-OUG{(QhlHeIk@I}-kx zvVUfL`KV>58Fj-_N)4^PbrQu=6^%ury~hm}&>JJrfKAG_Y>Z3%t@N5PNf)U0zbZ;F z4`D0aYRThEl+!Whk!?cae`@!dPJ>&Z0$OZKjj*J>lOef9aw;;i5}8@ndMRh>y`e+M zu4qrY1B9Y?IwuKitZJRn(;k`6&*x^A$x0solxVpR*?u}KZ%gLL09DKqbfX4(vH&$J zC!PI53;H9OqXEUQjjcYC_5LwGiI-C~<i%Q;5sNhuvG-5rzr=<Wc3V3Un)NRda+?Ze zBVoABF0x_lNPMy)r4$FO7Czdeg3U+2%?#0)oHl~S%Q)^JYthFba+GIH#(cu}7!;q) z-%ED$<e3?n=FJjs9FZ-IKU23ZXhOjwo_|-4&t!#r9_2tPTM7I1K21#HUJp02B9kKY znk{mUIUSR-v=`@ET%{v93ATQrvQN-&;cE3vYU~5qCJqP5N#5L^SjS1dX?Y7@x1DFK zKMzjwMQ#OU2}aR7!G^i;qO9n+C<Ur3LArbjlVIZSJFWaJ$ZrcJ;KcXWHhYDl0PNHp z*_v9e`dKS2e>~B)UmKA}B;XQx&}e3HV7k-at%-J^v6ws#*gL*Io300kAytjL&q)NJ z3&*6YP%S6>>OXTk+rR(QUBd$7qW5upv+|?=r|=R!PpEYvim5<FwLs-f6$;C%LMrv@ zWffPGhnjOPn)wAA&61LD3MyBHO7i=@Q#FAKYf$-+C}h>RkO-f`d6oq_LGDu+Y%3#q zl-~=yv>9SE*xJO4OA_mjxR0#wGKCCJe}3PlKW>r#tekwW?!CaB=ga_I7&W>WpHAn} zzSH-+YWam@P6jE-?|^^v0dKH2iZ7R%vh}RXWO@&Sifa}F=@)s;E|!nk^Fnm?ELlL6 z;qfqvT=dp#Ou#ZHx}ZGYU={|Wai6(SB^GM@_L*AT-br(-VXU)v&Yz$dyA8Km`=_&E z`*>??3i_?5qq(hhp_&czLbB#s)0>R=kZjfGWJ|eH#mt*tYj{_@<jshUP{{N3$(R}D za@X57&Xh3C4g<Sz6ZrubLA`qJ)Xp-i6?jqGS=6QY>O)x~M-9PmA+$S(doe4-!`gmk zx5uZbB+uP7MlsYN<Z8Jzkk#704(&}($9YpwF3HOqODUq@fh3SBbaMgx<DC>_?h6jy zj>3LB=^KZ}L7&X`1&1`KQs(MKzaO)?a70VA54pEsq3;+Lu#!_nryxT)X>0JGEn%uP zVxE9_-isc6+V;v)?QG_@toS&eAmG5B0nu0})ROVntvS}O3<_ajU;xnWjkY?xAWBO1 z>(n7|Lrb!<D7K9#EL%!JR}@oa2J6oXFGup-C7;4%Pm;lB^+{ymH`hg>C|&WF4Uy2s zb>Cb6$fLe#=Va!UjC5YTWW#elScbW=zU4TvFHA_d84sQuPqDxvW@BH65WU(Gsu@uA ztj_i*zLvht$Qe&nD{MIY?RWb-CX>WB!>*8;Q-i2wbvbXrmMGuBm4tG?pTo!S57D!% zjMO)Bi^I7)B+<#zIxZ106@_vadnaRE3_;l1Ge_$^_6w<1sKRT<cURY^MRGX>_%Xal z^Vt~g`X(nF8V~O?DN0?e%NbLS_Lu*Zr<9a`ox5fD7{BWCu^v$+AvQYeEB@+}0oBq* zmBmiaiZQ8zBXQg2{WMgwPS({R8GlpD?dQEO<CO>8_SO<h{l;IbLQ0n{eeTl}s~BG< z5)Wkc4NGeK&U;b8rz<Jg^p%!DT|^YAc_%d&YWJ_YzaOuuv@+@ugUM+03gu4og>f#Y zbs_r%&8U)ZESxrTo|Z$G*jIhsU*J3A=<{0(6Sq6yR`7)^fBR17hzX{*qBR=BWnrm% zr5oW#<k!{~wKzPyTZtXjrjWsGEupH)#OjNcy6>^Q-3^OpD!Ck)^+|TZ$$4gjEgzJ` z>KEyoHfXi<uEety5XW84JKcsCp8de4-JAQNGH|Sp+O3F=o=*vjl)R4@qA8q4w{33q za3ZR)k-3?OVdbL`(~j?<x9f@~aX_&LB+etYDRh`gbKeos^lis@k+3>UHY#(=gQo3v z3r3u*fNb?a3p`>(;DFMzgTr@OCmC1<DeTg8q3466)f=<;Jm+uI{8x9F$mA1|KJMW^ zg1te-*#cL4K9p(S=Gylx0h(}c>cO%ZCOiYV=K@WZBIY=wSh|!-WYi<=p%7cq@gu({ z`F9qgEmqdcb$!?RO8!>)I^|xYK__h&PU}+{1amuI0wtlE0I)tUuZsLF#B!Y6m_yH0 zD6u7&V>*MBigJBgwoylwwN!j)RlqqtGe(Cy*4r?H`kaBm&E|Uop)~<~GBPq_(@7gc zc#gqD_j)z|1-l3EW{LeH0^)~rvcj5G8x&i6CBZ6jCLiJprpxY@nzJ3N!}d-(TBp6` z%NP6W>&~*eV94DV$j)pJ3De%p0f(zCP(8EvpKDQu#vEcb2C1n<<W+lVuk5KcvrJpZ z>opZx4PMUJ#KAt#pp<X`(}Ma}Z`VrpWOH9?tevD!Ox8%>U9f&LB!0!>>{)r&N1J^G zd#@NEG2F$WuH-|Z;k53;qRx*vR^2N(hkYA(_IPL>--WVtlCp5?WD;R=31b?C)#UW! z%wCkWRc^(*3*y~cnnVp@3gl)Aa-}Szu<BugZ`M$DAe;t)P}N72_wKn^yl%C}o;H4v ze`p+J+IwI{TlZT?-w1~7RqemuLl6@a17-{WvV<6rou2NYXxEHAOL%ooy<VM-&5}Li zQyM3-`DGl3&QxVDr2?Amic9Rt7F{dODI7imK(6{4|HfqLK;=d;bP274k#NF2uw2$G zWe-oKDDLXQS7{6hQ?4d^^0HiaV*Cw4WcBRyEjtcOFfO}THT!F|=T~T98Y!Bqo{~J4 z=cY^+Zjm42U`*G3b{y@XGen0u7IuW%;Ph&by|qMZ2s98*O<`6fLF%Ji=&llwP!i9( zWfa@q-uJ+udAA3er_+tGHL<SBntYDikMBV0v%k(ZGwkz(gp400ltg>^#cqMrj=_0y zwW%Md55<n)`ygN0P<S9A^7~Uj?Xqn`dh&|{&ZF{+VPPm9t3zyQ5=vVz9JoEVjO8oJ z6ga->i+h41Aw>b#60Gd(FDoxkX$XR_w2iHejhIEHC!6U+SLeZ4(`N`R4Et$vFIiLU zdGCG}z|#w49_;d<20F3NLMsdt)>Xn)N?rTZeoM=9#XNtqtD~7QYf}z3Rrv`(=34r> z=CGRKuX|TTzx1#$Qw=<%5EkO)5OaL?+z}qD%$MZW=4rX-ttI#zx1wWFeqq*xz)I^# zL%+E4C)(tZfoU(VZLR6%&_>YK&b1{V@hpjPhYWoPiNLQK8e-KGM*Wn>cW$S3zR+PW z8`iP0k=!mf!90R?R;7w?h>e`{#W~<k?I%x1rSs10ha>E?K{EZ&z~Brci{59{t~D!& zB5HAb!Gww=HEi|>y|{2Z#Jgj+Kgc~Hr<ME|oy|>mLs96!xE-uOb;x+h`lG)Mnw{VH z2RLw8^v$)kwZp^3+1cBNlQs;wDUeG}U|`x$hDG0PxXP4dKb8BtW*s^437G*4!e~zq zB5{=&i9bxZnSsHo`nT+Or>avW-wD~fk{WGx+N20ig2T*MAT(C!*XZQ-#zThkA;?u! z67bH%hkwAIoOH{(C7q9ItSC%pnvGkSOjr;LxjxB+W$|G;H+}k<)PZsQFgMus+gHth z)XJr=^?X}N3CEzI`g$k9B%xl0Mu(1}(jx^V46#V7)oxkOeVA29D&!Ixu0wDper3<& z7m8XgZ4Rt>*9ZEnjO}w<I3y}E⩔4q3!|_dI9{=L4wZZt`)_da(@RkP+}8Ys@BV% zisfMR(_e9xcQ*k@FUyr2^_KI+Z{u@`u>pw*gU<MSauR4vu4rv-EieC+37*cN=P$s! z8mHSlru(3c082RUXaOUYwe*80m}T;Ndd4G1)si4Er^oG~eUg#jLrHavunAhGe;783 z8OU$fSx*d5y(yG>Sy5p4)7!eQGq~0itp0ecDVoUpU0JB%Y?0|;ig+y}DgnKCGmJfP ziK&uY;I?s<(cp@-G}Hu>9eY3v!akM5OLR7W6%@zE&KWZBvAL<fqdDfJ(^@a>Ih9xS zj4?0~l?-vF936!iC#7S40`ItFX65F@sCxo#TJQ4)s<ped+J`17x#d6>0s=MC#vR=s zr13Ucxsu<xmwdiRpY97e!n#){@y~uj3bCoJMJ8<C_F7PpU*;^NL;m#+_;fW8;O91G z5sZJO#1BQM-9Yz0AAOP%Qvi$#{s9Sl#)E6KP9u*FM=+6ZbJ?jK`sV(=nBqfnKtMoU z-OX4=VN@o?IAcm$+RH8icJU(6mA9hF2AT*yoeb*j=hwH?WZ&NlVnEpkoN+WeSRvZv zbn>Php6--0XscTNLs8bccSK~`a_3`zHu)+3fUAC^w;xG;0Wo*8qNARVBIla8+J3@7 z$rWr`i!u08z^Y=Epc}4`w$g-)a*}*?y(cyH?bA62V}Th{b{|P8cYCR`1y!JSuaQws z(!y}1lC!S5hzj^zx&s|jZI4e=<j?)X<ssI?^Z+8^uH3~AilvJgOG!!t=qPeFx{EFW zgW>Q)S9nU8?yHGE#CMy&axrV;^K%mqgDA>saTY_HOswTe+0(tw%euddqOuG;v<M3d z(R5=eiGWWSX#62%s#;G_$R_W_%Kng~*m5XYkW2f>Cnav5fo{w4n2)(nW40gs`JH$% z<WbbR)sQ&ZT+5VPW_g2Wb0CFn<QA2HSu<i>u%R!5S=M;JcJF5Pe0GQg2SqF6$xb|U zU<c@|lI76c%v{MW-uv1Wt|qDNqv`;Q)P5TW^Tr@-_hsw{@Hv8RR!nM)X5+&CrpmQW ze!(8+y=E|k`W!EOlF1W~BkQr-o$>602lhs6)!vpTmGI9N*5#EDBt-OI?RwqA3_*Wn z7B3mLny|EcKC=Fhej#l#>7D7v3Dw!)f~PL~o_vZ?^|tGG%1B??f$(lD&h7!rz+XV# zZ?tWSqzhk%h-j+@QLU?P)n+#5yP~Ge#_t^rg)DGL$5?fdM0%gH!|ahbdu0|mjv_V6 z&+b8M)?YMN90{w6vHj3yIij;`Ss#9v3I;hT@;(^v>>+ZPeRx{6feJ7}i>;?_%akPN zSFjfBbC6RZM%>n1c<wq=rjh{_sI`_F7;lD(D3(}u#HKQN+6l{f92&wBp_exDn?rpz z?3>P%oL{jgJnC#XQrdhF_<Y!T3Cm9Zvt}hD|2E2XPmn1eS>ntyp+?m7nIq{^?vM#9 z>uzr&;xy<f?!2Fi&CXTuPeAlmTOfN1OeVt+!n#jp&W{|&z4{@AOmGpIv$W28VwFF{ zqX8>T)!P~)bJ1;2v({7TEK37z-vY}jtu*1GDxF7)zcurMhtlmBRkyxPNDhschCyC= zXw|I1u6N$@)a_<i-#OX+^$1&9ZaCxXT|DwWz5XZAG!cB$c`lM$)ahl)%{%q_8xScL z$Ttl1y)z!O+u#UiKR40P<)(CG=Vlp_MWo@|eNtt|6gqIzi#p|W)|Y2%9E7|^KI7cw zZQllgT(;F2v|x9@%*=hMks*9Y3{hJDg?f3P8KXbKt|0j5VR-PYKP_}?G7`eRjOav^ z<3bhQ_xIa_(!!0cgMche3E>~=;kmzW=jmMQhoCvslfe+IEK9I<NbJkfT{D&(pTjBb z9!_Gj-A;B4;$HqB^Hy`<z)0`$<mCzaPXR&-!U!Op|9hn1TK)SY2+02jZitr@7ymYS z`NC)v4lHrQ!ovLg`~XU-2qC^yKF^+{q$J?L04Uf1s;RuLuCBa1Tr4LHhntuU91+<5 zEjiIir;FWq3w{BwYE1LKp~n;W>!c)Apf@Wn4mEC&s9+x063<K~Z3_mrm+(G80_{eQ z9N7JTHzt8U@>u?pMg=FG!i|gD4w$G53JR*Lr>3UtPFFh+0|X8@t$<b1`T2QeWo2Pu z;lRKE(4mLN?+aY;xYMz)l$DjapKpHrAI!aFR2=WJH%cH0NeB?!A-KCc1b26Lx8QCe zxVyW%y9Rf6cX!v@kbU;~@AIBdcinZ@+n*Si8G4?6rn;(rQhkh6|6Fk2XH%=u$w^tD z w7aMzXy7ni86(j8{5$9Z59$*6caC4H$iNfYkmY+{7^yV$_dQG@W_ea{^6<o(g zMNLjk*;*ud0Z#>t1S<Z0t{`Ak>q-br=ppg(C}I;})-JrSuX{aKi8YHn!K|&V0YrpQ zB1KkC4rmRBzd8~BJuXRfzMxw&B?0+fU1KAlunNUswd)PT224w#u{iJ~{=Hk$YEfiX z+Xe?sXUnvJG#Y3#=j7yUZ*Kzt1BS%<U;G7lOOKS@kv(KNNZ@8aJZuiUQA3Un?`%AL zKMFJ^8<+d~>Z+!N#melgUkXnA$B%I#F#kG_wuyGd9wtL`b6}8NaX~>vSs5~i3)4T> zfCl)4VZVQWyetJSq`$va>wmozL{pPy{r)<VP~!PKwlyspFwl)t{P)sOz1M+!%RTz~ z`sU_<m&Rk9c(DEZ&mPOPy;D=sMc2%5aBzShZ#s`}gqba!*v`%lr_<%9V&JTA>vvLU zX=!y*Y3S*z0h38m0A_d{#ipZ!o5*45;NSqX;bTp|YIgrj`qzg6xev6eVnU`f{1!Wa zfn%VpjRWf+5D;L#+{6r$`F10JePWwTCZ`HITUT1wf1Qm-E|@6)f4#^572m@DFM>jf zeohJu8`8TuU{->Ee*McgI85Nj*JGrFyQHK<7vT~U@M#2Ks)*osgNh-M^oIuvCn2?2 zL}$Uanc^B>Qo?MA7Q-{};v4lxS|uv-P!Qc8mcB)`GQao|_dtCS+NbqGT5I0UB;NR7 zhYrDz9*wA90wFY@S$m03X`NkxYyQwec#y39(uB?Gc9GjC6rp8vwYV!6V`b5b2>6r+ z*Q2?S3D#Ols6J<a@d;hHh17p1Q2NUAjox-f)S%$;eEhZ|WaLC?V7ml)D0Y#B**?(^ z&$fTrex!p7Eg%Del8i$R7eAlBm-4dH2I*4KiNR<Kg9PXCD*M@+xM2OTyO4GE4Ic+d zqXo<8YER?#M#sSD3Bf>vg<ap<6Oy*wICI$O4(5sP0V0@g@3)9ADRwkMv=_5vg#s`7 z{dj|j1+b9<kks#5OoL~Be4`3ha@0SK8C-1K3jQX+8p21qL<Tr!cb9Me?7g^;jE;pz zsthdiB=855L>dWR<`Y?n>tSek_q4D$ZiSI(VAQNVT?IC<%v5gtPW}1$K84YH8ErWk z?V%&`Lu;*M)B%KuRdXF~t~g?v*V@Aa1vM^la>6QO$8V*zueE4HMaZN|5Z2q{RbM&% z=6fB3gkQz}fP6nc6$~5*2SAbC-rf$xW>t#VEW2JHU`|a<b$Bfbd>9GocDjBpzSY9K znDqxkF~YBV7KE@!p*=i0_Uty^deAXDLu;)w-{#D5eu1MjKZCg#(Tn_gZ}Rwj1$0RV zD;ga@z@Zu(%r7aFz|cs-`p@HgphQ1?S-Kb=q{3pwoQcAVhpe$Wk8jajcd1xHD30#2 zpqGw1%9}IA(5MZ_7{I5~JH8q>buGP9nrn?-_Y;&6OQA~6LLn@V^M|1mf?Rlhi*>6; z)2W_dn4w7U@Oa-o>Cz}kNrekeI-<=3(UXaZX?AvYa%Lv86(@f+Ubbf%q0k39Zs<B| zMdFTNklf8lup2+(Jjl|zTHr<ar@etHiKYyd5qBaCBjZVe_y{BqY+&5alKk<a+>lE^ z^f~9lBW3fHY7ptBTtjU%+?^Fy%xT79RasS@2#k)$>MtHGByQipFbKeh-=bM|CKK8l z#9iyh@ZB*5W}H0b7g(+oXf2Cx{K3(O`+E^GIl;gI2RmC^TVPBv;A01baF@qhYR4ap z9I2GwK4G#u*_<pl*D%z$QaR}RC0GquH^c`cUkQ=g;L0nwrWCP5++Qtzqu=O8rn{ib zx!NLse<Gom@ex6xW!BnNKn{ZS)~l)>zc|ZqD>S|_ZioUd_9<7eHRpYO>rzQ35$lSh zC*GRUm?&*{5+d<Lvd<;y-^iv$E%{M^j+*-H`WlnP#!ya9PDtppkeq?BF$-XqWMXoV zk&*H8(E4(5bHm8UI5INgez^<NN3Gem>i3cQZZx2}eL7+=xpIe7GRRlK1&_myzOQZ6 zf~^&wR-!w&SRz>Bn?P~kS#36vQ2Q7??MdCST7_wZhlCK|uc2PE+p><>ELOFXvHN+$ z^+QOEX=sAHGTERQd-d^!?~(aNqWCiG-7p@OfC%}G$5iOF&H3+Bz6nsZxul_p{fGh1 zqL%!5(KHoM*a4ho7PPKW0{y}H8^YT!hqIp0hE}#`TT#_m9HVo`zQojSzKzxXpA{>0 zwbKaa2z?695cBG)zJ}zbRLV)K#9f>9*Md(T*u2$K<yiJys<ZvOnmK8b+mDfFgzlpF z^@{h&Xu`|oD$_$}n-kC!7HTP$>AqsrKXQhZF*Nb9Aj5;Ad!f2=SFu>ko*Y;Us&Q<4 zrqm8Sz9v^bnw|xHu8FET?SDxsxcA1Zfnz$}{i)%mcD<7d%#gw}>Ve7;M0%omaVNEH z(Q{q_g8-ZQsG3(tL#U*4$hXZNFrnjS?yquMQ5#J>^;V_y6g9!(^n7xNsyg2;@$NFh zqt%ApzEhob2n~mdL8r|L<u}n0vuYm`$=;b)Ybric<4k<^YV<~6_Lt4a@~>{z?Ak<n zR5OiBs;b&vo~mTDpR9rAf?z0inoBMaTyj7VFqkceoeL+M+j-j~Tn0e|mZzJ2aD;?} z00$*1y{Kq#aPTWAIJ<$aC)m^1CmdI!Pv(W8aaLrKaxw<19wfcdw;x#|?#<MkjF)ad zVToIl`n(7`{CqyPpq*Rn*L+`}YsUQ%wP<9q+OUPDg-falnt~$mn%CK+7%66o(b|mt zL(L$ZjhR(_90_Mcl^bhi@gQ+NMShIrdD4)cfcA~6d;Cx)XKOKEWm7N9LkU9d%4eHA z2t;<>nLjt(B}tpTO&?H#jmyt#d1i7foY;?&reW?`A<#udRV(ZgJmw@wgHK)}{}^I1 zIk^4t5*t$|%FU`NQeNyYx7Wb|tysrh&{imn!iQr@6Bfsx6jy{Z?KzI|<|LLC_Tdy2 zI&K$5aevzG)W*7Ik4=iZ)559L7bGBEPQu#e9qU5c&Yldb8V*wgBj}%Z-6l<@#yEC& zf9e*oi)bnq;OxT}nvZ98ZQPpL89I4+Jo6!MxW}4xz^8C%Pf%k-8|20cDrtLnWzcfT z>`s_qzLjQ5Kev}5g}tmVMt4toc~x&?=or!jMVUI|VQiLRW&IV(7h|1UKD=RPpCbC; zMzGcYAUCuPOH@bC$ThIOm`k&3yNI+nLK?wdUcCoQ66ZY0Y&@YKbx+4pyy4Qczn_)r z82dFoaZw)Zw8LEG?q*rOJU;>PG)xv`-m#A37Yfuj^3V0>V^`H14<A_qEbv6{41N&w z8?tkB_>u@IZ8x8hl@KsH5$|Xl7E{z);c0EC);d(|gq^q%wb3Ilte)C?&9Nb$3@BAv zk)^R5UAXi5;&qA7VPKpu^}(uo?nq88<Pc?ioZRFQ0ct}4zR9paTpa`7VkTeAVEh$~ zTYu?myr+8CAwNSL4c~OSwbxYVC_2d{@8-6n%1C3g-oI3TwJUMR6Jv(lt$zT!oG@o% zIq9)P$cnSU*`a?tWTwHcMq`E%g4!DpYMR7uu5lQZ)f#-?(?3a*u<pc1d5@E@DSe() zO)v{3Ko{qU`3Er@enZe#f>%|dTOfM$-28)0;PM6B^{?bgFt<G7DMn)tzpQ{YqJ`ZM z)Y$<$y%hn2i;GegTN-*ElP$`-T~T{CBMLaTF=1Ks#-m#{{W+K1a6DtZtEARQBEr4i zrcGAq%d5|*Ct`A0&z3G**}|7u-VkW#nt~<)B}os)CgVvbv+P*U3oVBU@&W4&zkDK) zKj_?!=Q9~gMkd2vY?P9Q>XE&iog%f$u1c>;cR-*7<h|27c|Zw49nCff?K*5Nh=|<a za6K;=<`4K=WU1+)dxF^!e4wSRJU{=bd=|LkXK9LoF~(|XYg?sv@^inlHrik_5+36} zkhznHO-v?Nalx@Vl?D`F*p#Qg5ZuB@Q0C#u>FL6ZgnO%6L6P<sH0W;qs15p-Ov=cP zPiLLAi+f%J2hd^gQ5OprKDSBLNTRwj-#k|qHD$Go$(b_7>p-?1A8D3zn_m|3O(UMq zwU^fa^hQVr$@GU1$((jntqBy#^RGG|MX313c9F0WY<8upI%D>T+_pz9>qa)Tttb0& z+1ME!Mv{b8zf`nf3=Q5&S{i2yZ+JC9L({gSHlB?scOX`sE;h_eNY7!S$6gF0ta1fq z<~Diq*(WK*-iq+Cljql!8|+BniLpMl8e(+ZY=*~_*p#)VMq1Ieij%-aKSz{j{(1Lh z&Jl%qxkY61e%G*lc)*bL-bV>9T_Edj4y|z1G3eyfdXTBZ1f>yE>L&3laZ@qRC3GNQ zTGc%+dz?Enz2<fl1AS^kDIfm868s%W_H?5`sW8G0|MQU-=jo0ap=A8e^Ws<+vr$K> zq%$Aj^dA>cjF@z_kmzzMrQdP}5H;QRo?u;~Ux2&v)s;hxUFM(KE$dm0G4vMl1xq#7 z5b{*Y5x-|Yr3vAaAhq878>#)&36RD^wT>XM&$<Zd7HUy9Vx!)Yic2Llxpjr5!Tn*5 zB9C#(7FOLmgE>D4j)%FVrc2sCCYsaD_8{GC7!nCK=Z=$tJh<K@8$a$Mk8YLu#Fm0Q zks7s**foK<S}m0^!L4M;kGZJ%oe*4nFeka<;kSN<zNn;;P3WJAq(H`ix83;%hBv;p zdVlZk`ZYuErT&6?VYsNNxJb|>S3(9<o^Q;(pV-)MrZ7_Q2ehpIQvpq<Z_#N|hJ_dA zc)>jV6%{=_p~*Z^D<{;m`7Teo$VK5~;MN(rek$8T`mpI=Kx7x6{~MDgE3shqc)zd< z>t~PU39`cPCUM<qAgHDU%&qnKhlzm@uzj${Q^(!gb6zy4Q`D}6F7VvaM4nRu6LHIz z9k5%LZZU^(pdoAh&3!k0ykBo)3Lxv8qfaDr?iVCWIFzwth;{!U){vMHT~_G+!gb4= zsE`oTrTWlgglgf^jw3<vO_N!+5}UiSNWIznDf=$b3N3)xQFkFOjuzt@lKUj*eW<+# zMGo=sMdYGoS+2nRtm79yeWgZ050c2w=6@7KF=~m8ag@B~uZX_MN3X|ldX-73@})w& zNVVWvQDs%+1&MJ9UO@U%pR4u7-cg8ddNR&paK3F14|N@2djRu^A%3^Ex`!?1No9V7 z#x&K}-#$19WB?`<jk4T%dkRQXo=A&{u$a<v&xqii2mPO@t{XP;z0f_Ozzu~fAr9W? z#6TdK`H>30AZKe*@WHZqW$j}t?p_{8)2874%2^&ba0liXk%p9}DpHGf#tqDDPe9#m z51J4tHP<H{b=gqAc6H;_fCer*3pOJ4pASr5vHDF>J(k5jXT?Iex${buP?AlVE@~0s zE_q!SCA`cn_G!Hvsc#JZ9?0_m-9$nUjQ}TbYCP##t1$;pZ*{O>QRF`5gEH`4$JaOv zbYr%z*M4e@<8NX@N#)h%>HnES5XzU9w`;ZCTZ*M)>*pAOlig?<x9PK|UrA{RMNh%O zoU)&Igp*^pI0><n!6awyvp~MRIM`tY7O$xiotg*9OGnkw0-_HQKjds*=cma!(>R*t z2+_2*$>0w)K&I&>bD%yGN91W_N8S?t9m|7DCp=U@6Qr7En{IW1WS*DkJu8h?;O~8v z!<uEABbhb}B!A6?M3IUO`V|@_{^XX<O=POemke9MB#poklaL3$>#b#xOAF!e!Yy(V zQZ<?SH+@82h$W=k_h|~S2pV%uPoqh}Lb}Wg6k+<*E+wf5_|B5b*cru1i%SBZisrNE z-BXtAMO`!A+ogRH5|40EK!q5rd~5TJE(CqIl$4f^SQeL;kC7$GHew+p1UFl5ur18~ zkh2Q<k=itauq9N<^{(yymoGwq{srjxzPis;hLAeCa6}`<2t1c@$MOnUoZ|&7YguYX zI4oO&NA}DnMJU0jPCfwBPZuxUA`fYO>S^Zuc*FD!Nkcm5FfVuVK@=B;RiQd@3BV2k z!RJ?WcqCd}s(bN+;YG-1KStZFVfR$QWfZJEG3l>|vqOz_JRBp0#s$^OPm+TxUs3@V zkRY*4hh)*%w$WDN_TbFcbY<3+6?-A9s)=({PcW2<4jtl-DuI6PZ$)DCjb^u@?(NAU zLV+cvq8zlLyzfFf4_jL@<#l#{foIpvpsp;8eE0r-{tviIF;)7Fr{X|>%)JT>0h;P( z@LYvhOfirr>bF^prH!PZ_%c~kYk60fGH9PnR}`sIA78)c5W;_OW`gKe(fK1AV1(Vd zwaxVO5bbE}y52wmVheCL%fV?#`2fK5|L5|&kX@deg3Gh^%*h>+9u+NygIHj~KsS_& zuWLjL*?eRM{X#4w)*u=GRv)zbWht)#QnbnjLu3*s6Wv87a)puR{{+fBKf8<Q5Fl24 zj*GvQA01!YHof&Q(8Ao_X}mgG%^u7l*-7)aemZhcMY~ZTY{^x?Py%Ajdc_O;SXBLt zNG0Tp1{bN!(awBu6c+qQ$9Z#}(u>oSzv+OI$|}qkhd;i)HZ-uE8=1^El2YfOIi?r} z`7BTwSKkh@Wx$pX4wvl72=sGu$$fPWm@hV}X$9ZV)V50Vu);!8r6X$qvtM3b=J7Q? zxfGeOadUgl6bS9DVF8+%?(XiF7T}Ke;r{_~Ay8`xSvhoY{zmbQ-{xZ8*XqmPqdi%T zek&8VVzbJ04#haCw9U$@@vI3K1XjHRt@6fI-s;I=R`V0^&vnwly_RCLUS=kv-;HXv zRp@kkES_aKh`u*sRd832519@;PCIE?9p4Rb;?a@#h9+*_4aFck?s{%+DpKjJ2hz@j zu%vp<G!T9-CmV;5=&3t#j>z!5Y3GwIH0W7Ta21es-7ev~I3e{dn5m=+7kcOKA3oR{ za@$;H@&1T>$!*V6q8jH%DaXz2xL&3Zad>lIAl=i&kX67n)LYRgwT^b+)cVq)(aKyN zhf)FC90*6tDXKgDHMCZHxr!>bT~|bmZ@;^+v6p4-twy|Vg3~+VxRCSJfrgDS=X9g( z%g(+%^+jo%i<F3Mvl57XI6tW1e7U?q!~2~0jYV&Y$T6zJl#2E%w%9-~T|_ogNNM|o zq~aS`75x}@^oq`H(r=q<K70afUE_{_$f?Fh4l;~b2`Vy7p{0H^qf1GR{Ij;+2C_ty zUUZAD$Iz6@4gnTj?WP2WR$&4&6OD+7KIG^i!W^IN$a_1P{cNgkR~wKy)mUT`cV>I; zn+X(!n5ycPOlyq#Z@PrlxsT*fZ8F_n0|M2O6=A<;&&BkFV^uY(tksO&s*&Y7<C3ZV zAmR<KxX8O!x#O|YXC^iGEC-Qn7T0kEA+=;0tX|%{xSeLCRzTiuMT8o-)$Xy)lNT^& zvM_Tn0Brzvcg>;46kf<n>?gPWZd(EKsEt_tkTB!u$?eo23CTdz@ApXCTTRi0q1)5K zvo}8i2gdE)eXqNxA18%ETUs2qt^+?*JIr!d6mB=1t02`DFXsfIB2P=OO2n>GL+pab z%G~ebQ}1nWZfKyl$jeR$k{VwX2h(TQ=L@0u_SQ&0PYo71$tsvfB5q?&RT31r%XlrW zn9oQ>C7(2LMYPcfq<*xgQrg6FY>cAF_g`_xF8skOlQSqz)X;)+&{;kkr9HH)SAA1K zl5i?)0!MC=G1Pl-j;{Ks0rhfn;}uK7+ESI3!iq~NWLN9WT#TdjT&>2LbRaYd!dyvl z_7P>IBMB_|uK)!3X>NU$7+CETA<&azq?OZZL;IEGnf)P3q-O7v@|kSc+b5^3q9Bk< z4h*r+^KiUkOY{@*6!&`1FY*Olf%ihPx|csFp{C**?|QuGB7VmOU4K=j28S+HjC3Wt zE@)~F#1;#dcy=I5&9FF0x-j}8^ww{4$l(ScDW?Ge9hWomv5rjCn<EHRXg6oL(BFdb zXGihyAYb_fWW26_5kk0Gq%#4T@>iN(O$A8kt940uH5(y%V-L0#x$}i$)TZuAP3Kr- z#1o&ba8U&x@EJF+yubY?2vBg4OPU^#p?X*cYffzfGDC_1NxLiXHY(l5iW3?5mpg@I z79+zI<vWp<Ul~an2?HVa)ZZ-MAIG5jvX3A6j6v;6Nh{BqgHA4A{xE%vNp_BK7mnNO zOULu+(;!^L8+l8W*e=ovy|}p)d<-Jmn4fRQzvYO%BQGh@zdw~hoGt-n-R3t^b9%h7 zQu~B{Yet^1#W&3=`-+e!c>3~zw2gMC$Cqn=rCrtn`YLkX@X%md=IkzUkeH(7Vm23p z=NetV52eq3x}4|g+*NJ1FPZc?!;U;Md~2|H`{!T3ePg2f^a-7<@Vz{YRpj=^2PWkR z$1kU3VCxO%UPaz#j<H_^Biv^DU@kSo9Kk_$ou5H(?$SAMG02$p&xuj=g6ZY5l@uWC zr)VZv-ZEd0XAn;?Z;!UWO9&u4xnM#6H{gX_?i(L2Knda_f;|T&X}xxEzN57{#3wvJ zQ?G?XYIY|1S}uV<`@HQf37`Kr_yRI^EF^@R-}Snr?A4tagf>>hBnSLAq#7EhqD*`w z46tdk!r{eg&G7E<uYs*k=ATF&w;!=`&{>J_@=4yhguN`@PjS8cjIOUF3OM!{46B73 zcKY?i3_edpcziYln4dEJ+f?WSb+sB06&ZQmi;$d%St@me6z*f58Ci~;J*wX#$$n$| zB{Z1i(8{?v8o9*Bc*&=`i{m@50MXQpD1f4=>{d3oU1W^vs|s&-yRMO}>@U{)agMr% zhjo4!A=iS>uZ=bgc6lH?lV!c<?z6Z}yP<r<H@Y)pcw3pThFos|6@aa7%$Do${P@Af zZpEI?9u<;ec5=6q%1G^L2RHIQJ}chQG-fK(omLN4KQKeNFViXjIXLs9U#0=L{RR2< zv09kT!wbIo_l0Ks$I$>Wksqp7lU)3anc2}5tLNl{y%S#m)FNguz~{RrYGp=#dQ(<i zoSN}gs%WVH=$R%>j`}aC&^crCqriI#ax)#wh24*r7S<w!rAGZKEc7-b6}xbSh*Tn% zp0xyS+kMpp684^_y6q?A@LTsC(nt{*fzQkc1h>IuTJlVPj`(RwyL;34bn$-QZREXE zhhd@y6cb;jTbXek%Pl_59e)@GEfupE5)Rq#>J}h?Nr!`530&S3sIg5m+WyJKIB}b< z^qWI5%jYTOb^o`u-PiY<nVTPPZzH0kA8u`RZT%D~FbA-|(8=nmDmKUSUu=*m#=%#I z$?9i+*tXC1%5Jy_LcAp*>ti9}-xnA41YiHGGF3=DN%!*)^pYBqe`_bzx{KfN4{&xY zt|N7Een)|a(#?uqwFDt=ax`a5%vxK%Cl)F{{8=B8b){Gx=g;kjKQ*YI8bM!{4w_Gv z>Uh{DSewR<#mE1?ZnihkEG>X}M62@`vyA*~<Pn8oF`HXqc!sIKkp97K!(OTk1?fYr zG&&4GM}f<Uq{G$i#i4<f%V&%~QPNqP(k9?0MY4A%L=!KyGqAilv$HQ-zufNf<D7T? z1txK}G{#4u*AhW4jZ*pQmE^%O^}nGaCIg%=kF)}6R#w#Sp;E+bP0`bpXG>yCWV0Ga z1RA@1>&>2-QkqkjeF+>{GTgiFz;&?l-0pZk=<@koJ`k_`s_&A3?%UNm@y2wJ9CBHY zn0NbxE2#}5W0apiewf?#N?}vQQYDR+*G(2wx-%OGDi-UOr@g|=y}M}X>l{M`HI671 z&jOj}77>=hl)cnQ2RzmKjnkyy9-UIOnm<12C}n;@yz`|yXYtoM!{r>UmR~<r!)|9x z5fx}LyaqN+%_kHlLu2CtAmbz>8ypyL1_XN>J)wPYAckEGs=0}C4`SU*JX#<yoXBOh zDF<^UUrcx4AIE5+U3ojJ{0NRRV2%irwhELSdO-@P?Jq(KHKGMYgus1ciYm@2p`P#M z$SddM{ySr4ZR9;jy&wkTyBx%B_RZQPy{mJUVt$R_HX~dp=wqFofMC&icQhU7#^B@Q z<H`Bt=I#J2fs2a^G*rvbjdxH0kmA?pD_;az6Qg^a#Qx%`UDUabdsbd3^iht1`khIP z=-10C9kjOb_5Jk$ViQi;#_EvS&LE|S=l2?($EL4&<bqz0yS34HgkI!(7h!pzOk)j1 zU1n>x@hqk1qlZVIt$wuLHm`bS7Sd;|7!GTtL=e$W2|^nnM4P{~1o?4|EG*rTv%CL@ zjTI*CkC9u(b7;=W#&9K(`)`nA{z_h+^M_p#FZl=j9gIf3C3Fdnr`7Z6t<OlCd`n{3 zG6uy^Wf8y)zFU}#J+bN>s?WpmBjL!|s$?+pgLu~g2JR<kz4-uYJK2p?fyj~*cV1Zf z4<W1#i?JH9Pj|VkE8m4!b|WX2Z`wMzs^j5jVYVl!EtFjBbaHH_tLix%bbB*WM@orN zoA!r@)5X1sjkczuG#KT>2X`wl{)u7GyZkqX(M+6@{U=~ghab9jY`ilW!!5#;Dw9tX z>dTpRMf-zkW_HH-i>`~UO2JmcN+Ta{+^^faL97$<GK@jf@$m#_g^}e&sX~|;hR-Mn zOzuIxZ854$^Ljes$W~5+Bji>P>en?idYs2P^6H<%b>6ed#xUArkct0cK8tgQ0wVsh zm1YV}wn>HkAtj<y=!5CKHG{rcMhB@zGJxjH5m(qOdwr@tL#;}3J~}rXXA5Q}#3Gd? z+|v3bmRye0_B(@D>0vnU<FLaY*IJ4;shWgCopJ>|<zXR6RKnknu6@uc7^LMU8tiWy z4Q<i$UH8WL<B*p5*}3qBw}e1frdY9*_bCq+`V-AhwvyPI3Y}*wG7MMTWyQ*0x|%*G z!R)tNMO^6gn!i705fLmjf|vUG6hc0A*$2f1>%6=D$TVX$-l^w|M1ES`>7$x@AlT zN05Q{BxwkCyRG-Yc!n&p_ku_|%H0RC{J3>$Yap+ZFEtF`%U{)DSUP7F|2hzvfN+|G zo03~y`~l;}{1r0s9?a#Li9v{kj}0VlX?{7RRKPbkR0vdThIZ`?sO!FwIVCJ1HRh6X zceT$U45_sIEfyf#;(ILIYH2*&jdzFsW&IY*3hRCFzWlElOI52PN|qe=sjhL8XJpnU zZ6D*Mh6AyGz?R&Eu0LzWrIp}@D3V>mV!TfMtzB=ciXbsEZbUFo_{1S>*GG%Z;75or z5fls}f-@coO5$ig+Nb9l>W`R3#YewV`YE9R7QC+38tMkC3?U$CN;vqHee;W6Y}0?5 zze-6NTl(XN-=7$odx8+h$T}qCgqhe_PZV(Bc0Th*pp!V&`cVyxAimgMT>=Yjs5j6b zwR5_7DTsB|{()Sf8KL@K4hy&d0Z}O9>-BpOnXo+MQyfwQTB&^E*EPm}^vthRcadl6 z^3FgZ5^_Wx#Wym&qF!FkO`ACabyESEm**O{dZC8%@b4ea4Ao~SwUS%Lydqnvna7l^ zG|=~xWej(zMC0+B6o!!uCXeI~>7<D9vMnQ35Ga6Y@0k9NEDPksU*R>(HeJz>3h@W= z{mgy3T*Lv*)FQOSV>y}%75ny*bw6?Ef4!yLqXI!iUGEy7Z_jiRa)61vB&4L-(t7~$ zVfNA!Od0($cZZQ|5&r1+zV%ftROv$*QD}4Vz6t$J=4Xo75qD>gIbP1Gjcp9Ib#J%3 zSb%OSz1+w7-TZnU-?OIR2Jq4a+l`2d23$!dHuNEsjrv6+>P^O6Ds3IS+8U~$TQySW zqm%Yon!}fkE&?dRu(He{=gty2%{W1EjGjj~5Wz)qF#I8EvUR%zYPw1Yf<ZxR$V378 znv&Z5{>coM)<lEWU*4s%;i!-Ew#y@2q@m!VTwvx8vqmO?OrL}4Eo@V<utldS&t&1S zzZH<(qSKF;q)!VGKkNg+TvU{zZZ6ItCJS!VA%4gy(e6LbMMZakvSI5TEV-`eVd_{n zIug##U^G5ai7b0}&MzONLUgmnNsT{FQ18HxfgBqIW)h@HleC<264M_hTbppV<uE>) z5;g30hST>SG;bMLv@*1RnIUf#M66(TeB+~A?HE%Qs*~efWMAOms*d{bM7ghzE8x>G zBvx;Y`fxWDX$(}xiQ$pZIHe;sSjy($Ys`rzAX{d35K>+WTxoYfT6U2;Nr{igJCLll zfpT8RCrsRbw;h?P<R~>wJmf{vh>MlRZM7Dcs`zp_iCsDhR@yL1lv|~F5&EI&bSCy5 zdfF;w*J@ztl?4-fU3=`D;e8=s<fl2Y9y^xXog}C&8<B<bV<UNpbDR2zOm@$3_%##t z@a!~HMh9${!yMt`;^FI5OENQcG&NU&dtR`nCGTHtmmq4*8-8?{=fjd=&;Mk-?;ho} zL)S*ZO23Yw`hoB2R4q_FRsb^0t2?v2Kkpr%QgKjQq=$$(hI$SSou>L@U-iz}%BeSD za~}arN7Zf9ic~PXLc}1`P`&fcN^Hbu(4kvno}Gi#O3t#I)444{6meo9shm|lmC3Z5 zCJgpzL<I5n{OI$%cM&&hYn64AN8JL@Ix-DggAJV;B>P4}UBT?Etp2FGFHd`)d}o5s z_7evfUsM%w&0wQ*PR23lxn}d<zkxg~frdaH-z*3bN*&G4R^*N1D-++mCJqrFHa>_B zz1v1Ys%))>LeGV290<MCexZ3<Br7u2j^es5t2T@e3;h09>rw%4D7t6kxu4^5OQw`q z<CS><8!!^0YYVMptq5uv^JoYDa0mys>D%wjkHL8<FFwFu>HM(F<^545W7H?k-WNnX zMrmvT++DlFMISnsIQeHv<}x8NBR7WQ#j${s<bME8Ry@Esr}^xXZDj(dfTQja>dcD~ z#I!Fpd60~xtNA;0prOAsl9~gdmI%JvOj#~&Zj$F*{20!^{>wN;2G9JA9u*rK=?MSx zXNg8@N_;#q{CdLg#>U2IIRSP`aL^X=)IZOs8>ePx7KUm}H7+e|xc9jFVx-NqcG$Vg z0{QN*4Rje3P#5x1Z>lF1S+yB*07RNuL;E6qVx$W|NErH)ZapB;ZjhJ7fiF#>)8YFA zJM-0O-!Dh*M9-lv>3OE|)(2VlyOv+kBuM~GVvo1baMGG+e4#g3ZnPri!{Y<cIfRdA z0#f3KAsd0A`LY7l#>J2LSW|zJH4+x)WUKFYCV9l{O8S`>qTH(=Ih0ORm7}}A<G|}_ z^&?ixpVwR})`fy>Wepr36MpV|8b@uCA@%+KI3z#g%m=^52zo=4M>d;{-pLJNK=}^p zD;*+jIE5U!KwzArUvsjsM<&g|jBh`!n!E#rfKJhSW+g4-5aB<M{VO#l$1A;p03Uxd zePoElP<|JXh<Q@5J7c%}sd#0EwsGkf>7ZBD)WpQb&dkgJDtRajmZ&UHt~r$r<AAz* zCxXUeZvbIxn3Y_9K6c6}LuX{It+~>xrB<fy2jRhyuOBH8e@Pm_qfqg;NvipNmN8$^ z8;L?c@-q)9@*S0UGFe_O(ZU$zAkJr&z0^vXas8=&@})IZL;|?Q-=%RZ<}#DK74L~v z@V*VnWjjcJZA?QdE}ny5lw0!|6W^8k*{Y~iT%&bTxbQ%7(@ha+#pRjdFg=e7aVZbO zthhGzExQ_;H6)^LfyNuzuj@$Vd8Jf4=dcQOf5=?NOnPeEB&Hgou-AxfYC6NcOutRI zv8}43?59<2#_ssnMe{dmEdPKXxBx(JDpw35bs!)Bdr}kJ$9EVc{S`C0u`=2)dIjtM zzilVVIIH=Ux%bU|gYv6eTlp=sH*3M}z#hPWTQT5gSOw-oLZQqyk_0@<h)eM_sVDQo z+Kh7=P@?Q1RvAn^j%<rVK{yOAxxQCIpLY+cIGVc|1sieSZe32Sp*LQiu2p|Q!d&%$ z-Fmv0Ykb&8Cnelk?$yq9{@Uj$%L@=@Z@C2$y$r@QP3{P1aI%9nIq+U{vR(a7Pq1Hq zs?6OV9ok+bGY<+22g>)IY8o;kv(!_{Bj<ybQLaYvU!?YvU$Iws+M3$zr3>Q;oGKYo z9bs>aLK<997{H<o3><Q*cGhe(a5j7ff9|XxlO&IfJzlMX^z!A|hN!Rrijyfgu8<>? z>%_6?;U~42RZ8mS^x5a7=%nWM4%;rE*1Dr?sc?KqXLfLL)@N4XrXf;ld0GDyC8elL zSX~BJ7y6CKa`!%<2(D*V>mn*Hk|*J&@~4GyU<o#ebG~1k!p>ZQMBu1653Th=QqPqE zgB&xf;`&P%D&O7Vb>*<G(Ig!ko9>1;DoWQyYSVJ4|C`4}8xxAvs>h!-fLq7r_E=XA zBk}YeWJB;X?GH~CK~-M_kI4w*#ox2$E<xLdE*r~O8-AFbU9nNP#Mh1T3<({zbk{ZC zy1H%=X;<u(B|dUb`u{f;ls~S#7<OI>5wEf>j$K+`Q!2DiGtNqM);x2=TQC0oGe)>N z#qAReUwuniRpl7g<;WaF6aQ*MZPBS>0M$`Ajg5)fym_6VgnsXz09KQb<j}hi$am-| zwL1mc^PoPJdJaJ#DT!%M-~BKSqH(k}l7F6!$B9VuxEWz^n5vu*4OxlTUw~PjKp4fB zMW&P9OOsxVDOxVrejoEP*l5{nW)v@S(itgQQzmGQGSRv*GG4YKO$>K~`?JI>Ytl8B z75HMkhAC#Xm@5&CON(n{sPjN|O6GI}?r*RAIK0`?^d>`)pwIk@4)h~*0k$;<2L~Ib z1Rg9s9T%KnT3CFvvWEbQWzx0zdW=^8%0P>}HC(Q1R?^bTa=WNYWgHfIrLA`~j!IkX z#k4pu4Lf7~0_kCUy4DTznWB@C7lW|*OzMFEwma)iQ=d9G&~>a8Hd#&f_+ei3=kw~Q zXf$*lntoBR>r_|FAA6L>+ojeBIxrIo&ffwanM@Se2P;tOYu&ij#4;D3&5u7@G@mOy z7}1fbDl~0xw4s@9U{=t{rj~!@>#N<DlCzyW6gP3d-#MhNx$dn-BX%cF@!4{gs(ij8 zDPb#IOW1fgtr3?>7IU$D5tkyq-&g)n61RhygNjW{4}EbFj5fuMSB4a@>n6?((_+cw zL!NY-(tPgDZ!(ZhsxI~U>=VRKOAV63wEA`ta)h}$3m~Jf=0gf`Hd44siK~Q`WzXY& z`RSUGLjoQ*s`tE!v~)&?ox{Mffw*tp6fTF|p(UD2T_|8>>x$R3){-h_zb0w3=QD^A zn)kqm;(I!?Oh7~;tD?%UEE{OQce>tr!@?@m@ZDiqqo?8YY-@EXG}e9^`7LTCqx@6B zRa=q{X_PShm+`2~NK4DZOitEoAyn13W{Jt^rmCXid~>{1!?0Di_^RguXQ8T~_COi1 zvJ3y)VwTo1$xf7tUI^0B;+F!l+yZOJbB?+?01GT`pq{{24oiR7r?n^VuqL8mAQKI= zi+t-DyqmvY)mE({lzYRz=25S&j_i9>`t1wd#RHrkE(v#)yqYLj^>D|-FjMQ)Gn;vA z6vuymTZ9KSiYbTumN$=f@MD~2_R3rn3R$9u2|qN;(C@QIz@JJ&npqlIl&A8|$;<e2 zqnXwq7PMmI>9B#Xu<bEyzx%D*GkgzONUrO9VkywX3aE80vfiVPbFQGzJpIOeW4p2S z5J>;j-uCq$OjwH-_$8qhuybl5v4H*%qwaqaWRQCZw<N0cSlI1qZ$`G{_NX5rB679{ zO=}lPGsP`1{5f4lJ~(2gZ}6ja9CSoXIH|#&&xT2y5z#F1{no@@W#s|svX|yWLF`g~ zz+|w3{aO>$=K;X|l2QUKSV92GH*f)UG#Iu&U_>f;b4B|$r<Smh6bG+ZjLumzls6lp zYp3MPgzRr<^gYB&lnF3UT;{$MR^mcTBp9!PMir#@1<fq?rQL&3#)C_zI-Wo2I<dXP z0yPLu1gC$kupvPg`GruE?hPvFu7lKEZg%ONIBRNsmng?-9fg}vBa#*tZ8vrgaKRaG zO4Xq#JM&xnJm9qyPcQptCkz6d<D=-~LibY_>Jdf;PA1a&9WD%cYF$CL6a-FhN#Z#) z*2|CQcQt?1s+qnB2z~3y74ol)pfJ}3cZiCGR<qiI*cwbQ^-MeAJ>JGT6OA-}Rl0>y z^7UBcLcAZaCm7aMiFqq@7W=*yzuk`F{v}`V{eyzzD-ATqE&zvKV3h1TWO|S%F$Yfb z#n=OB>w&I3>41X9I!uwkfr?Ocamhp;?)#^x;DeAw&5CrkT>*!}EC!%y;zeVuNi`_d zhZK<`x>kD<Zi#o4JQAuOJGr(p8NgX3`&g{CiYtYVKzrahA07!m=v5jqOi+#=iqv8( zF6?x9HAGsgL6+CG0T;nGWV=;MVXo3#3@!z>nVXy|avJvG(tCi|b#^2R|7tP5^{6pI z23uO3Vs;*{fJ~It$;$e{{BC`nhcP}J2K7aBVETmZm9*@aGuW)2ur!CDA|P%p+r8MX z8}1%<B;Alj;P&!idz-ePB_mn#u<S!QaaRJ*4&zKVLL~w)+=A~)^zLAu#Sy%zN&D{W z6hDf4)E3#xnvJqnGQ6DC(5y~od<0uf#l|O*(7;dO@(5(l3|ppd*@9>L@Z<%(Vq(Oy zi9BoJmRliFlTBZef*mPkfd-V;{dRFcp66Ow_7Ft?gfCl{*Mu9qrw%dkLg}LtZkGnb z){5~%C$w6FJP9A6Wnvzcb?R{5JDi0&!Y!hQ>p6g)7b|dW)PfV?U(kD;EF#4V`R%M* zrv8?#?2C&<3RflRuRMpXW066|yvW*#4;{rTNhO*(-_S3_6Ej{fb{ZT2{H2MAiUA{U zRKOuod27HKUWH-1VxAiz6gOKldhXAACyas-P(W~o%jC&@x^Z9?{>uhk^a!%VJbqT1 z3<Ra%d#w<?&?ax9#t>ns;Fr&nIoJ5Xq22t|n({Lh-<TsTdg$a(VKp@jI{pCE&qX=# zbYzFYH+MG-f%leVQl92GFQoe>EX)A1#oniaacjL>H>#eD*n}Zu6PR~k<?-bN$o6t+ z5E6tx-lTZD#6X1s<ifO~HKY$5d}pcdQ~4Wrpp6lgCyLPaqlU@Dl~&O9f3U%{sA-eA zDXETeK%4cu6UbHUo*z0rp?l`n-9%Joo^^LiUR8T-v~7kBB*;j+1t9kkE7KWD0pXun z$N#j$zuT<<Zpt$fSf04=i^Vb$5<arQXM7&fiUWhr9m`f|Val0@!}P!mT>9x0LWpU* zaUBho2wPf)Yx=gn2H!0;0dx+;l^CD}NSC&G-gY-g<${mXMXoAono%mk>>sc%{_YtJ z^;rAf(X65XVfR_jk{0>(wVJEmZGdKP_4Vi1qiy0{_nRv5?U9E#@UH)L{Qvvl63Mgc z0)`E(;$2Ye)wg3oh>E{5kQ5GYRW-Ffl3jL8OicTeWqdTSxN>wtli8Wt6$}fZR{{gT zRf1>3-jl4u<rAW@A4+jg)up!k+hH~U8oM<7Igz!zEwp_DV-X^-33?v{p6eg2EBM|& z;2$R+_!J~oBh3U2)QL;WnJUI19`R43{FMfLM_ZaKH3)wT?_)Y$(ae26gug{S{)YC= z_|=L>-a4dD74@GIp1m}8ai1^+{US^q9w{+C!jMv8Y=8b9073diwz2F+-djLzu#$hP z9P$1VhQ@Y!AA~eOJ8)RHEAiq_5|OZz!9_?DUBv4>ol5wBmGx9R0t&#`0b6@}EL#0R z5z6LY=YYP)4am|qjZS4Fg%aX>^p)7}8D$8xYKRJ=*-({j+8Fn+lA1ZpXy!2E$o_$@ zxrW@dcgdOHJ_7V*CH{?9bnWN-N@xgFn-o~*vNifeUVc_qT~?f0!CYty(&d2?@5JE1 z=n$QoVNCTZctLisqhXK6YRc(!(Pk?pQ+a?=%+M_AG3s<N+QX~Pr*`1xMopVv+GdP1 z7oBo4(2R~oan-!92pOLTQL1!<0@7V?q{1k5F7oJIA0Cd4_PX;};$yGf3Jn*`KLEDr zlJt0&;_O@D3&no7MirH~6E<LRG&}E^Ej9lGN9(tc*w=j1e)OiLeK#;LfPe@Dq(cIs zn0>kxue5OV)%<BiN`1^O=!>|X7DV)KL}eR_mnwSPoYNcp&dkc!E8N{aBiFnuo4*&A zR`?uVtXb5bVYaWg5|%a{vn?odXV#snHs$3>5;L@%`46M;?1YdasxS{`Dg_Cm*L@N5 zgXRuFEV`OzW?IiOYP}Hz&Xj(dy?@3g#rdFHDMAuJ5j*<EZ(?oSK1huW!)&%gY9*iZ zPGYMu4UT*lm^U+b_rN-5IW*L_-PVb9#NOfAgRSB^1j4tu9%9!=jjz(MIm1XDDhAp8 zX!iR3oIe2co1r}rU%tS8dY^Z$AuEdq3*@_z!Kh!+7(~esR~l>&IA88Yh7uXAfBrOI zX<3@=eCC8qA-6S!EK{ESQ*)5UD0Ypon&3sHW9EV@BcxyL|D`t};?!-i&K&^JM%<e7 zyzs7?pV<P9@dxosrDXq@lEhOcGvW^FQSpssbX*QCKzEsnCR9=z&0SACRGb7P*j7pG zcD`wg@{Va=wMAomFG-zP_B3ZO=8bh@bqiH!Wqxh6g;gm=lX!@^w28py@Hl%DqMpu7 zO(7s6Zf|X|yWF0hZS-t@Hv0{U#$dBM3iuDO+8+zfE!eFp;Tm@{=I!ZU+nH%xNrI>m z!pK9<o*25P@X;-pEA`vSrD0Z@CD1cHeDH0wl-wS#Bo35_&SiHRjM;h;fb1#Jrx4HA zu4$mSsa>#z*V|#G48z;aav#q93K+#PqfC&dSNk->{g7D-ynF@nz=r=%_$*<=BtAa= z?(WWtDe3XiCDTv?#2Xj2^RLsvfIu&9<{|=?f2f)mO_?{ubZ$4HU*>ez?Lr2s>HjJt zGER;`qSl^!Si^1!acP<o4)mE5kcO2#j&TQY{)S8|#z|<84ATsDBt8k`6VfnfNWYu- zL_nOf1HCYnEk<bZNrP@^MJ~KDzC#V0?xO&_;;&XtYL|%6(q;@4;xr{`wFp}(Y}_lF zO8>G<k_bq%$(ue1yOgKrxYIF?-S2ZbomF)WOc#?ivk$GbiAy=pC`JfjiimrB(<n|~ zKlZtO!8nrFM1W!38q&NBiOYEcQl)q#MpyNynUYYR9fNSxlUeeEZHMzc@Yq@kiMr7V z%ieKE2prYC@k$}mlQePwt_wcfsVhVj@R^qe+WgUdKbm_?s{W_4$QbsY#2>py@ykA9 ztoPzV&n>cRH@jgs)`u9rzj~=bQ;5|fn|0jFN1Yc9CQ>V@P2dpJ?}V>B#Oh((Fty$t z57(S?pwfhw5!t`^6p-nQ_z3mpQA22qFC(jO2o@cEASGyBJ<<N7o1IO6Q<BnLpD8br z*KiZyhoUN(gn3~tvgj4tTr8U3%^6Cd#;L#66$OT0+*E&{Sw3&*nA4OU>HXs|$rNyT zC<u-T5Ppd~n=&&3b4<v1bA-S?P%ig2?^jZRO6FW9>>X(LWQ-Fs%se2yc!{hm7Zlk| zh99#;b1Y|+QoU42@Wy3<wvXfNpII3g=674;@`<;_wzrOE`=tMt!iSm~PQ*2?^?*h% zoDgWGjQ9lKAn$4RwOgR8fuorOK!m81u;2JOwuoF(X1rAdc01BGd)d)F1+p!M+af!B z{B@Q@b4#uZG@*U1l^COJM{}@Ytzzf&QZI(D!9zzEP*wm_8{OSs?(gq2fczhM3<MPX z=~q6d%!hi|6|NqA6g^LpP20VE+YMY7CI>%`%Sgq)LMS1-<p?9^4KK5?1Vu$v(hWtH zhWU+o`!^P%kjvW9L~1V>_~9q_Jf~8-#0EvP7LdENr(Gm^XNd)`$2R#TLIULbzVz&g z52C$kO1~|n`mBxRv!Wv*dJWkYV^B~G((4Ze4_i*=X1PTbr56<+`H2F&SE^l7zf?0$ z`(){bK}H+;-HS}%6O-m{+S1!mSy_-31VlnskX}n71cW+ZJ%krM08}V^Xml#R`HMEs zzeO$ES7jbYAq=rI4EA`zuv`9)!HFHGbLXehl_bR=0}d`>@xe!`a3xwih?~wWN)}0* zF@N0q5y^ka;`HUBsviaw8k}7JQv-!z-!_fA^J|p2kUxCv8*^PmKCR`dx>TIS!G^^c zZzAM&TCE-NjQ+WU?=(UG*QaQ_m(xDVO{{Pl<gxi*;1P5iVg0%~Kmi3ITQIjRlBphO zDd4_LPyo+Bm#EU1cF*AERnltT8V;*(U>bE|owd?=H6dV`$6zF;7kpU`sH8j!&P2UK zqV4Ca?{=$kv_ZiqQ}4!i9+M4$`I;~V1gvUwB%KRE<lw>%d!y&*j;BA=L$kANJ5Y@R zeX1MbD8L)m`;q#7z$%_$#<E3YtaU{3wCIZ&ubfv5I_APdO3xa>j0&R-sYBG=^1(<g zj|@=y$?1T@d8sSW&-pvX<mj30UTj*<l{^Ae=ew%!=dKm0jmlc{uc|Q5X4Ei)xln2D zw;HpbDlDTwqM}bj`7OsUDd~o4kmkjG`Y|J6&rO)MAOBqfehV+z-+-ot{^07<^}Wb2 zzoTP+v^rBuj$hF$rXxWO*!?guGpCc7>*-}HlJOs~VUA2rR=s)Ht}Qn^(<tTQ24B&C zLcfIT3bxPb7Bstc5TlCC86;B0q6iYypj8`HE_=Wl*oYrI-vf~=yks~TdDMa|@ErJJ z_Y$cqqe*(2Jo(et&Bg`P_4&O0NLtzvPO&+@ZWlx2Qbd_tpZeyuXMq1AUw>`xw)usP z3$=2-D8BjTiEC&Nd84D|%Q42HS_JlsN@AS<LQ9etAxu-X{WTzLBN^Kxw>cbYmZJC& z3ytZZ$Zf2U6A6b@98a(+8L{}wf@67@U_Y?gSAwC6ly$x4#JQs6M=4Gh%U5(o7t6B~ zz#Fid%Jamp6q@|U78eqF3TtKF6QsQB&@Ic|A1P58s0PcCq)>NlSjawFCdUwP-vXw_ zvwf(DN#>n2g&HwCZTW+eXG^!tV^m7kXieAdHO3p8pL2keAS0xJ*3ttr-f8t;xLYxu zfO6Sg52*U>fyfj1j4oDSv#`2$N1n%Njq?Kpn()?9;}d(2E5i<RiW7a}4o1@sy{xdU zf_>_WV2k16&35x|6PK$wjYHyLgNbi{NoA9yzR#IIHq`l)<X%+sV*>=GEDQ?LWZOJH zxNYwS*K%-eSx$qytJ|FUI1(S;BF3aPKh3`<t)_Z6GH&~%f_<ziT<x-1RU<dn=4`R= z7sKj~S!^6$tF+2Llu$7Wjv=!(SKN9WCUEWGmDb7V;s8(H^m9A#;QS+0&h)`b{NBif zgMWJJP{rWONHZPG9tThSx%^Nf%zkHjmd}FyW|9t^Kh*FS1oP$3*S0<8oP!Zqq1DYZ zoJc|TRGC?KxjMtd3o16@9DKY!Z;S|jl&tS-Xv()D{pSluUc#n9Je6JVfvtI3v^zo# zb!njGd2-3Z%zSry8<z;oUY~sR#i*&7UswQt|6WnWUey2vgsCPZq$Dnr+<8QRu%(zy zN8o7qf0&*L9lulc%(8;EqlLm}dvIJnk)@@DPDK&m&{?dzAza%7F`0mqMFsV%NnLgp z@p99C5dX59S6?g+-Rk;uc>_r5a7@{d6Qx3CZbMo`zreC#Yt!A+;ng?VlV*JM^NZKx zl5v?oSJayXfx+mVP4pL7TvxHXnB=V6o#ljsmjcT=l0K|gRbAS=U_FdYp8{k-e-_v0 z^wbERvqOz<1K{<?5b1Zx$Kd{)vO(GIosk4Xd^vV)U`L9E>9Oy~Fc;(D`lnFMfKUqT zsWk#)EunJ9y-`_2;CM$DeW*0DpEtWz_i*==gPAot?PwQCKm2|2<w$;Lf=PUyb~n^n z+bbrxz73Ya;Ib2Akp9?hurwUlni+)p{SJSolt#y3J`eujJrejOqm5OGaJ5Fw2B-bm zv8k_wCLFRw^QMWnwZ2RGc-{9GJAP$+rz!~4OugscWpW%Nx9e__0OPLGVIZ26>ZSdx z8ws-P3vabbsXZ~2O}1!GEHG5{c$QRcSwrOz2Db<e*?F1ZZrJ$IP64b~I0ow#+6Ckq zGto+IpGrE%t~B9LYZX5XJ=Z*DAwAr8OgGyCI=R<}faB&9oW;4r(qlq2LUDZwaN>~F zUB1Vw185@!gc^9wS!#7Q2(G_WV^3#P1*Eq{G$6W@kw|D5YeV1U3L|Vlu#1aZ-GC45 zVrFJ$G+!jrO1lD#ToMx#Sy@>V6Dp2Kz=_^~PTtK^v$^Zdc`MU97f1d}fx!fMCxgQu z;?1GbFMv;JHXwvegzY8yvC@!NH&WU`vWQfBR6<ebm@F11LZ06Z?FBOtKcxO0Ufx7@ zJA>Vd2g_=WIeOzT!n%W{V%p?5_MnBDG3*2H?J8VO&FL--1GhQr12>CP7ggdCUUS*r z(n|vE$x>ZZhzjn(3m>gt%+t<rk11>Axt#%Sk39TSZc@f?hh`T4w=`S4?~9DJtg&`< ztC>P~5lgJbis1C71BTkEoB)O8sXY(Y7qtY9Y<03w3%Rv0uo1UB+QhU1#=tz91BK{v zF<qY>cvm>tUk|JKg1Z%s4?>_;tyLefvZHyvvDOGt8s?3W4QMUb<p*T#+C5M!Udmia zTFZxFis*18b6_tx+zRIht=9!<V9>)r3(v<j^5DC?u~t6-OI-%|>;OInbb!IA-9=v{ zAuy%@m<~R&V_h#=YYtMTAHRR;c7Aq2Z+SNu`u{NZmO*uOZMP-~9xNnC2$taP?gaPX zZo%DM6EwKHy99T4myNqS!QI)tNS^b`>95bPuCC@ERTOMiEt%_{*SLmF>&dU~V1%hS z9ZvVniB8uKo~@k!WcIMPdAeGrtjwh`=$^*SPKsHNrloY~ZKT>s1F~XZ*?%65uXr@C zW!kYyKHgVve8Tj-+!}QUR~U%6mtU&ok>ON^=n{O@;K6%n-}_)5^xW4(i#dt5dnaa@ z>ahaM$t0^JO9<v>CdM<u^LBL8N{c&5ErSS#+*xZ0TjbPK(eJ}-mzr1QJuB)@TDHCu zvc{qt%|juEQ+cz6$R39tPWqAStmx$RwfbvOWw8|gR>A+c{mH0{g}eM_nyp_dI<Y~D zJgp|qAJw%2?;9@jpj(S=I{)!Uq{2fBoKv5@)|F@nwnaouj!{<r1{rNb6mDIH4vX8M z!p$wtlzQ@hf38VbJoq+I@)$WBSSM0s;z4m)T=74LSiBdN&Dg99iE|zqp-4?lEh#B! z7>me+FKSA{*pZ1?O->v1%UI<9A>_BxTX%DQuAmJyGhB9MiHi6{^c0=#7T@|F^<BYI zzPil9S1x?k2hsZ^hZ7NLlxt-?BE~>Hr?VYA@TaS>N`rCv-UkZgiJ^*FOS5ZO1d$%> zNLp@+>(U8u@Jz+W>)x`|b{$=u{p}yC__8mW5>6aSym4M5tHifxNsr^&%ER#RSNQA4 z(iq=kcQEDDE*DFLgBa`*pGUFXRs<DCl&>GT-=J83Di)O@x5A8Fo2w_g5yl7zYvp^A z69hJDM||w-4wSseF<vGE;H&3hzp}71<>Ls%&+}3O{-xUg5_D4D%t!m=2sc6>sWOAB z8lt;ir$wKXN6X~Tva6qM@qS9u`7=)B!+beiyYK<MJy{ZV`B+|J;yi$s!rm(&*n2oQ zuq$bTW~l9>riK_D<*vp!v!B_oc*R>@tfMWtu^x%%3e%;xMG{Vp+al(wzNF&D7<m?} zwPb=7#i{eZHPL?qxnZgR7`o&)T;JWlLHn)2o5ew8y|MP-7w^oXjSX<h3DMu<h^Mxq z!nP2RMS>P_Y+;nQi8vFv#OwCr`<x$qs^FVtJr$1(^Yc*g-iw%1PMx%yv`@#WEt9)2 z+(9(Py*TZKB|g4vEq!Kp^Z8`lqp$Fg@AsnCOky%3RAt#RVJUOEM#ixa8fU)oy|Q4D zE-2d97hs-2%d?uxq(|oERQW+fD%QYSBeYBA<e@G&yv+w}7w@b`=4P)y*~6oxzuRF* zh*H$zPO6k_C{DLy8mvq-G#&I=WHzNEwQHkDY{tYowhG>jm6W>Qw;J@&A}7Xb9R0IT ztzezCL77~KA9X@!GO9Ywq6cFL#M2q;z91cAZlKk+vxfXtJTU{O^KBd876FV|fSt>@ znre*!aJtCLzZZMW$BS|yZp}70&dPV9?l%l_LttFKsR)p|>~<O~qQzG!<G9pmvgX4} zV|e@Y4P8>9rG$%IM?R#@aP89qcDVmoikr3JO2g0~{igZc^_^OTH{7b6(ZhE*?Z=|a zl9=t{lX$dplR%TEpdU8<^@{$hmF-rtbjf2)&hpB~k2gQJQqLk+h<e&hC*Ihsec$Ev zjO7C#RNbksPa;z#SD2v5q+55rgcOsoUP6jSH|bZPdArX%U1uH2E04d6fY;n3VWzcF zFB7PMs4eY&mDXLjLQ_vCifaXz#=(N15ZGL2Xa3eY?fAv}8w1o->MoH1yZ3wCa0CxL z?2T=eaql%wa|?DBVnYq&Vo5%bn6DxcSE%@wnK{0$8OpeuaEX3megL!6XMbkePH!n? z*~u#W8FuYyaafMQg|M7oF$?ET9fgi3fttrH7xt{PJpKWrp19|yB7$@?_i@Q*BC%xY z;6MW`Oe|xcY?fW+V^F_o4q0*g%??028co+Qh!}SqO_P13b-s)9N@qJep&s%<!XSTH zqq+LoKp_M7osS<s`Xgd(93K8MwtpEH0<|u7hEaYyhSOm=5PR#!rk33Iy8BoS`}H?$ zJ?^l#0ZU^IKV{Es^yT+$neog)1g9ecg!YfNG0F?jmLNvTJu2Lr?cto@;MdH*sn1x0 z&#(?yxW}VMOx`n|Y5$DWin)hc|A1X$?XJbsiBCIsmmN$QCcI}l@O<jD6IQdC!^#t+ zBVWA<$Azwo5KpZ4&dQ5NeU=8c-j^zmKS2F5Zr)0`Sb^=d{q6g@<D+{j)S~~});OmV zb3R&MwfT>gKuJVQU!>2<CcB?!B=Y@_f8vZ<7TF>vvCXcA_0`yTIb?~~c`bJvfXTDS z?aJZ}ovyXLfvfPBUrB;05<;{xTnRPq#)|8chgYco0S?}C!rf~tEu*R+E}kSi6pviz zSMs%CRSLMU;~y~%+ud*#UOkit9<P#jrq?U31-TsS7NKj(U(oTc*2^AI#t?jNbd>dZ z%7^teEBiJ?c|_xQ&QU&KEVJ5e!1%=Mq!g_fLd$VX8y2h+yc|=vG13o*88m}~?Ozgv z;%Kc5l`q*T42^#)I=e<Tk)_sb6oBcF9(_nU3T)zoKRIK>od}KG&la-@W~MrQvK0HS z!p+KE?E`9?B=|BMKbq{HKWsj{?7&Zz+pUc|Qp%qnKQsimo~Pu3%Urz!zHi+NN*(ni zrhNNm=(=FbR-4AitHtS)^JnBY@kv?PU7$)kAtAxp%?$;>pUjK1O*nXY!Q+Gzr}n_0 z9Wc!T9x5aPzQl-ba5=L3s!ywWm+`~#>sa(2$hCit^Ik-ri*%!S1orycc<g&4)+ zpOEOcb1(``uaKKuk4TKgEGY?%DrYFJ7b1#AufjsZAvMLc`5UXW=Pg|AYaR{C5l7Z` zb}+D0;TZd|?#2g-!8|j>vX?bKA(d4$spJmh4}rQo!X+jPvQnuh{}_Hdy2Z4)h5-ev z%vHl|s+zl5XF@qVehvu3H`i&ocg3?48ODgPkO~D8#}KCzdgYsDbw#oGvQ-{zNy#c4 zg*tpT!5XHZwOkn|<{6e?Jo$l>BT2xrsh(uwv3Wm9W=Gu$Y`z}}&4`&$B2@9%&HfNV znZK%&@%q6-`^7V&UZKMO^0xa5cFrLPlTlY)qn@(Rw!%e}U-re!YEKvJZuERV^0UWW zRhF34&@-X`7Zwhvms__Z_;rau>r1NW7dz>9uf6K4&G`%IKl7IR5HbA!b`I@laFbe1 zt51^jQ~Ki2$j6&mM1j^xC6^sj6A8T&rM2m=xH;dqK2rNirq*z@iznUK4MPJhCx8w! z>TFol&4P);W`qrgQDN6CnuX=;*X^MB9*TBig=<LG1W3Pk&wrul@$iR-0YfZ1+z4T3 zKFyU8<B(kvlA&d@ladlQ1;O8Z)r)M%0dt}9hP#|DB0n1^BGQsSoj&xMUM>U&8B^Is zh*cf~Tr_`?wu{wlgv|IM=ln=sL3O8DUO%F1Jah6nnVWd7#Rir!5j$6o60eNjC|&#} z;O`u-j}&_a{X(|(Um94o(SrUxKdoWQ1dk{b&A&$4fz?8aZP=hn=E!U`a4p~q#%Pje zC!$LJP3>jUqn?LN9D|;oeWZ}zOq%9w0o5eFo1W|xra`@MP#xHrH>!f_9i$NxZBL@b z!?M*cn|Yw!!;L8p%KN2|*cqKm_39EqNZ8XM=4JM>Nv_Pnuz9eBB2p1q0UJL{C4C#J z`m#L*^T}sb@Hcfh9{1qTQ1P!{Ow7!<Jnr>AK9J(%WMsD&AYNFtDToiDA#=-Co@r5< zav~IW^^O#UFQy$H-Q3#2i;l!a7NB$oBYSndKx=TT55Wbaq1AY|QGo^WLZK?BaZRD~ zal~lx>G8?qs+AemcALHMKI#&m=aI*fwUo916{AGegDrJ`p}iG@nnr^6bUAqyW6%q} z&h8Hgu)*p#gAQv_cu4a(R7R_cvqj^Kh78N|Y8smr{W8a@b%pA7E8?`1gd8EdYyw&! zGVp~X&?W8B5kt{`I=V^~VHis2Ae=+|x54%;GoR;zOCuB}0${KW;*!>NmXqB-x9F?Y zzN->0+Vh<jmN*c<C^eThaiWn`_!Ggk$1?vD!6h~I-g<Uy3d=fl--V8XO0C{y+Ezsr zRupmkY*O$=S}rDE9WyY9cRpTA!Dnz0?WFscl-kAad`|keGLzO^br&b!!zXJ6Tp@=q z=UGa~G(5U?+3&Lbi<xMQ#kiezg1csefc9b~!#ZOVboh(1qx*FYQq;IK3|Y)a*|@65 zfJqZS2RQ{?gW&NH3`LAQT<+RRP2g=dPTw=KyP3T9*PNfp&yGfit4@FIu{*+5bxJ(Q zZx=K2CbvAzjUt`2*V==mJ)@Zil$FvsRA9wlswQ~_dgQz(L#1zPqCDgnBIzDF!H4x~ zIc9wPvS)+K@wOC#M7A9?7&x(|NX%yswECHdTbf^oi}8b{$SuLY1!XPOpf7Tb9~rNT z0OnxA2K5YzA8;snzgr&uDu@)pYiX2L+^(#CvoF87z<kUe7uD%bX#=y(6Fd9MlI<m7 z+;Ey?mr(@->b$@I`j_oe$NRt1!;V~W&Cl!)Pz_Rm3*Lp@QkTYPFf@t7<+G*6SEs9h z3+!oFq9eR)Y62a>yk1f-t~i<TI;YV)CcnRrf$;G^rrxpOe@BElurc_-DIOgU>`V16 z03dBT1z`d-3aACTWy<ex#a@$f>;4jg3W53GqQc&<kbtBx#Hr*90j&K+c9eExnj`7Q zn<u+#tg6iCB<g_?!Y>}y;jSi%O0&DPQ=<jJaESV}-Mv=x4WxJZzKLl#;&KU(4xLix zFTzJUI(}tnAMesP?fr#Fx^t-0>xi%R5aQCQ)95=e!jnZMgqWG-mhe|PC+0i+5nU4O zcPL}E4j>Q(Y5PdMIO1d^@RnNQnn}-wt;RZl3%Q*S_HQ7U&i0QDAo2>?f$95e2$)VJ z{9WvI-p-D=R4RxLe&2^4Xc1cYN!@A<;6nf&TbTb}=6E6YXkQ2K5<0W!123Mg@fUAP zo5)pR)%a0?XZzSB@Mu@AeB%mOfB)?;ANU7UlZ*L7P|!llh;pDEi^@g~YgX;9lBz}^ zAxvg17evLBle-Y*VnPwc3Asi(z_=mmL)uG}Yj3PHXknl!y4j4>ha3<&e0mdzppL~o zGafahTbFDwo!Epy<=St#UlL%1>h{d~qJFSv6=OhrYBh!-n5+J6;B={CV<24_@eYc( zZQVy)^HyTwe9;_6AhE{$IB48`pd{L^?&lv&2I^_>ZzPw)15abw!zMcpB<@*B&a`8B zTk$E?{6owLFDnT71Hr(e>t(b?RF2OxdsF5l!SBz1A6cfu^G+14aYWyr+tYrd7h;zk z6Ogy)yr{%!^iwkrd}eNf4W}^IBMPgOU{(I{m5OPeUTOy4AGO))82^tnf?|f?Weg2q z&|qO@B~|U1lprxN#7j1~+FO-O^qtQtP&zl}L)s?p={c06^imxY7=OiP>OJQcribU& z`|WrITC5JNy#Z6Xtlo)IGFMI1jV^+uZ_lWvMvg$U+8M&N4BcysakYsVnq{2ig4LMV zi!xG)@yJ(GO^<SPi?H;5B`Nmt2AWifey9>ly-TxeZn7vCV9fcf;!jSRa;n0WPEz*b zqaWM*&xOz3CRwD=ecO>%N(E}rt~wQHk{?C!9J(HDVn39@r6h<*z0=)qk#j8E-?Yjh zyTjo5ndUY9Qv{$FD2){K0WSxnJoP{=$+ZHarZ@{a2X$6{aLdW7E5_aKqP?x2vS0W{ zM>4h_@BzGZqA=4fZvDMC)sWWeg<-p#=I)mhSx*n~gB&6$N{=?<7EjbTZ6-tayp?hr z`#r?kU$tQb<WEQY4HyFsFGpGsKpVU%9{<aE`Z_~Oj~lxWo%gV(7V5sC&Qn~Ds!5}i z&?F<EwIxL>7;F@|G$?K$@7nFUWK1hEWI46ViAHZDTh3f00YshHXOGe+TgK1B>FREU z&QL`CY3Smr3h>*E3vzOYX~+HtbfM7he?%7^tYpC{R4;k9l02NWRJZn_;??9zQ#O}( z_EN>obc&cq^d&`8$-_6lDo#!5qcaM1H!DJ752Ge$Z>X(sMyO5xxE45y*Y=~Ugck&7 zIL;HeC>+!TWpY`z69sJ8YNelPK^kDKQ+0v<Nn!mQ^|6`lG9e(BY%R5I6_i)+W03+i zx*U}5IM8r#UIwc8@i8hdc14>>K-1Sk_`Z0Cwtlij^ixM~$LSe*3m5k+0s9k}5>_}5 zFqm@T(UOsgetO%lUkPk?MvCs%<>urNX(s>p@dGgAvH}+78h*5cMEO1?t0KSUg3j-+ z_y8mkr_}c^2Z6*D&4oMOw(;mwfuc|*ll8jt9B~gst5)JmekB~a1Cj$0Qii?_h<Rjc z3JI+M?4AImidjgg7d>6IuQg@uZk{=vn>QsZe6uuq-NK2<8~4)Rn+%Kb@K|A2xyN7D zdF<!z?V>rU80&v!8-Qr!bKNB%my9)#LUmCR0HVg@s`R^kDSGDENw0)7Y$)(k1%b!N z(P7-r74{J+PIK3JGE;47$i_g#-1C%;t@(t@o}Wt}6>8R9hC}TgNU%bD{nnmD@f9HB zFtqQ|tx$&AkVO(G*US1E$F*9)SI0tgz5$Dl>*}j4D|nyHKN6f?0Y^vfa@Jed+bohK z6&wq>ISE9y71qoCJJNjAwT?^wvhu@Ot#LVB<5vb_d?1!(Y^@Mvt$HPS#F_}P=dl6n zF)?eM0UWH4)CQ(ca<v|WR|yuY1s(IWY)gJV4Do4Fs_sQxN8@_6nTP)eNJH8Isb-rJ zWwo0((-}`!t#SLi5!~X^g5xDZmFN%Y)E&vP&S}B0X&p!T=$2eaRmh}si8o4G^})2P z(mWTi{YOSmr_IaDBV^)A&SXN)65J}T;7F!bQ9}L}7t|f~O_D2=<81KTU(I<#*jauL z@XiW)vK6E1v7ijCW{iRTD{Xc<;g;p{I?AsWZ8<r<nymEuws2iR<8yOl7}y5-==Q2L zDqm!0s_Va-J4xzX?Zijg`7E2;1h>rGN7*g%G`kcohkn!Q4m3Ck2)N}qKU1Ql#xTSe z6AQFDEbmK`jz%d_!8X@?VW)4(!&wCV2b_YnJSMY}vA&Q*N9}JRtq12pH&!AYCKFE+ z$9t)ixI_$kl(M8Y6Q8Gw@ksi(SA&M!c!x!gj!Uexd~cG%^FlD^Y(#^5l@w&Dc-tti zyM!IpW2Ge9lZf9#av#k-mjmF(t?l3filS8~BO#c+Yu}*C&5$v;*iIg$>`9}B>k5Z3 z0ynGdFmSQehhA^SgK1zkjeKaQapNLD+4DBy(E3l)M<OX)*<O9Mab?)mAYI%@32r(H z3-Hseyd9Y6Bvpka?v0Y!!{iE~vn$utH=wLik8!g94H;>%3j6Wv)lqv~)Qr<uYb2)^ z*L#+N{v~S>ur}eJWzDOjhW}-tHH|nLYz0q98Z8Ad)>U>nWqFM{3M%Hx4f^-37c5oj z`eW$@U~CHeg$2XeR?;)(su45$&9bH!50W;(y(F;<zdzGBa$WOUCyF{h?1U9Ff1Do! z7k|#~rE)j%g$z#-C=v&elr(phGGwdJ>)9-SaZBSdtPVzchBVQ9&ZX2wA5d6Ly|50r z%XWWiIW+GV%>+cWS~Gr2BZ`A4Kd^`-{}mTkLc0%rzPMu+@=<PKC!R8)13;3b^Ml^w zUdPMKn*<9@Jpj_Azk~LwwN7C5ygD4gtx>a7yLEGIyQwVmInt3kE|IdglTwrGMGj4; zKo<g&<Aalm0qJ0AdZXk-^(3zmY<HBpzSJtgw?4P7eDTjGE&cIbONlq7o7IA%s7Q5y z2|!;e<{CSCZx}I!w^u-?m@8NT!LE~%kq28(;03GAx`H9*-1#Q|yuPVT29`HyWy|&- z07*Xno+wJz#-+6KO8J;06w6%Z0!L<-c28VeMZ0h+RZP+(@1X3()+T!p{`C)KUNC4j zgd9iVAA5ya-^P3gZ3TNB&mUb-^y$hx((nM{j~3WvxWIPix-?x1MgP2R{3>?8P2U_N zO76T)@hM$KdwAgPwfwnpz|Dl`=!`9L@_C#zkdW6a{X&+kpm3iaQf4V}^@yKo<O(Lx zu+Q&Y?&(<uCB4gXT6??GmH*LhvdA9>IwKq>HG?A8Y7p2cu7~I8N?;A+$>>emSiMfA zma$q545cQpBE_ajuKJnB)aA(GFQE_8nx?dl-*>>EzdupS0eNk=lU)J*9cf>gSPP1Z zet5nC1xZ}6ZpIy5%#%!_@Zh3{v*;-^s(++P*$f9irHWYsHD<<+F^MI+ziQmNm|)g7 zsS|6RhO+hxTxl^dfQ0$%AX}W}XNl+5n}{kry|%rrJx<26+omc&W^(uYKw2hQGR^1= z$W@qHT&gHbs50Zx$*5R$I9;aJT;F!0kVN7X;XtRcdHJ?w6BDoQ#>5`2M5Z}Q7#=U5 z3&Rz~sI57_(jsF-=74ac=Dp}d@vy!e5+!-tZfLo!!f`L$Tww@5kfCpa=^Y$1&$vP= zZi5)&!umPPBZ=5cs5ydY`OqDOn(KC(3W$GSsL#0wQ7yU|e{gA4C5b$dip;9?!lE`r z&XxcMKI)h7ssu~cLAz82Z?wL(1?t)|bl&u45h8ZWLhhiG2a%^cp=hBXoG2N&>3`dZ z^7(Bbt!n%PZ5dHjfS}E^RdzCZ+1;ki)<q&zgeKv1B;K2fywz6VO9{m2uP8!$tgX~9 z`Qlg5e)A6bcp0BUsb3<1Vs_uNDc>MwyvXB$B%?ey<tV`}AwB6xWgfBa(cEUM^NfZC zO=@U?jIq@Ryj3p>J6$|3da~B-lqYR15{ng+|I^Z<i;y!UeW5hE_HLq}f4Yokx1AAP zafOn)1Z^NWEMwt|$v$_cu=kj00oZ!A#28fYEyO8!l$sMfs}(G7hVfaYMaQ&&_qk-) zu|PPT1GL^y4jq~N$n<eQ{Y@w7=+*kB6ThlU+t!)ZR`pj>WFECN`8`U1i}%tJ+uU<a z&j8>Kz&hQ2w6F~-wNnaoxkf=Nx0imhM=NaTEDpW*?0Qgp@r~|mFoWiF0Y*m|#K$+z zH{0KmHn?~PN~$P@jM%YrZ%dMrqJN-65tpe&;1rIJdNU34H!28nv95OC5ac&4(w&HU zstF^_-o7P;YUxCaL<-<$l$9=>!FU^2yb`4LRD@F6RJq-iB2+;4UVwUDo;w(eJ5H}- z`V3s28;X9fOd+S_`PG2xjh9V~=F?g6h56kKkw5^I<aP%PF?Xx69P0Bs8yAi+27R_x zrm^sxpdp1hO2!0TRTxI?fuJPAu+X6dzmws>Nsf)5xdu=?2VcH=x<kZ}_stL=h87lY z#h3l6<ak`S0rF332UjfQgIKr_JnV^bot&2mtzR1iz5yw2w@BwDUqe*9iZZ#*^?8@J zkBMwDbWvM$zqH!m>Xyi<h4L$!MA+_U7rT~2-k~oWV58bn#iVmt)noF2#;-;~2=ak6 znvaa=!)Fs`mSgpKf{jY{#1l4bO$M$fP}cLylKL5Va7*`oWYbB;4#XmYham2ld+Vlp zwcRr8?FbGGZ2RsNFc<D&hxEWiIA=APq@w^?2wFm?H+A}>TYfOK>_l2Zq+}CrDP3fC zU#-x>h}uwaWNYy%f5@To!L*RoDka5N`*<{v3;4aL?hRkz(OEg!_dAhF=*Re}U&2tY zLwH&v4$_jdH8O1BA98j+OgW3(e{9@&su;!=+4i~a4Y}LJz{iLxKUW{|JbansGRz^D zOs#SZH#0GEtPP*krqceJkvnoq#>F&W)JRP`HTbZy+e^5IE32_;@?PQCa#?k>l|W5y zNHj^>eN~4wtp0XucNn>)Z7JrbmFpY~=$<UW<(Y5cb!A=4{BUjtn_{b-BRtS#!Ql8E z8vp5AEUkG|qWBxF+jE&HOjfIHB9Ti-6?WGw^+&)^y*If&7eKZ63B}qT+G^yGc@pZ} zgJRI#%CgB!vn@@?_MMv6RfhU~&RM?BhYQL(esYttJWN#iif`59xV}m1lwRXiDEZIq z(`QhGOJ~|s@QX-C>(9T<-kUF)R?2{nnl>+Lai6!$p*f7h;!osy{JMJ0uFUWX(g+6I zPJ4O@>m@Fn0>HH=NpC$yobgc0;L#k|({2*1ofIsJn;IWZH+--t!=D;&oAidC$&jyf zW-CHMlaA8=RLVwj_j9-#Bd;9E6b=Wwg*z!1;<HSnX)V?~d>s~^$aEd8BUh%hVYwN@ zoC+{6KfiH$x1Flmd?blnRHD}Uc1I{Sjhn?vgr(KzaE<Bvh{1;knTphw@u;5^h%N0a zH&y$DZ1rZt6$wwu%6LO6&ztMCp8U|=Ht9U7B`XG-Pf8FA7~2`&y739*#j&Hm)uyfH z9${8p+IF0TlMP<^<(l4rYxampIgQz^=s2_0>+u^szv8fllNm-=)^s?iD_q4M$f2^| zLUC9N-I0d%(B%_f^p11hq!r6Ot-=3Ll63qcMARI0&U!t(<mfzFmw&Oi3>OxZg7MqC z)H2rOA%PJo9#r9Rw>QyY^8vqcFl|7gi;28yE8MV_NtNN1pOQ`CV-OpM{kON43${j0 zmBnD)rD@*6ujBn$kc3adYi}hEy4-t=a%M55-0|@tR$=<+YpmDS>%}0k%;IdX({5Kj z>@10XYl~9Wb9$`iMrpB0&M4417b~oMqY*U9vA>+nOJ`-e31VlH)@9Xw{Ce$DM0JC6 z5n2nMa936*u=z;E{Du9f9xAjV)66nT&a_Qn_`C|5HX8vANR~z8?#AN}skodf45RGl zG6Zd&pZ^{!)jVh{oTceB_l8H^$ta?+5-jizI_K98ZG3FLuIs?v$m-?HVAXQ5fMgFw z?t8TUjE|1$q_Rh)z5Nz`Y7DgEESnMcKD8^Lc9W34o+d@;$$|Q{3?~qB1-8+FLXqm) zL91*;eH?WW5#`~?>fy<sR+OMQF+!&Qs-z^vDynO%+QU<ij67~l2=gMb!}S;d6ZZd$ z%-UI1eym5e;BC3VXneHuAcfwm56uV%s$);SZBqmGUl7LH<ka+Rz@hvaD`xogs+zU_ z>P=9uR%fpjZ<|J#(&5u?ZChe^@iFYoaC3Cu<BG@$S+a{rX|^I5G#i~w`0OyFruk(s z;4MqMew1PZ>WN@|CP?7LRB|A6D4_=(Dx&wIIx#Oa!AJ|030WL{7L4`uYJCeXM|Bpa zTU`F!T4CZjQ3pGRTbo<j+Rs#sd0TWXvZq;m<JYk6cIeFB>B}N67enqm|F~~SLTXUM z@ERmV)!^WqIJo!I<&1PTt<SFqCGC<Vc?ufiL=Y;gtf-f#@P}g^%)=d36elp8jSq5F zle5tSji!qxA>V7)aC9;o(V}YpW^~~t-8A-0RUn~w%GIQla)8-8D%|2);{N<j8)k1q z!y<qmfi_jurRKZEyT`s%z%+iMPU@7mjPUNt_EYJ)g4V<DluErX0v7v8F<<PFHtTOG zI80=$`C}O$DJY^Zh8!OQ_J=GuHQZWor?;bMJcT}fsXP3}$jL5cREveu#-W%*A-7VW z_b)Un$tgX@ua741OupU#0T5<{KEyKBt)Vg6O*gVgfb4vBS&3cd4}Jr~v;JuR^BIZO zJ@5UE5L$)C-mTS9(PF`HM}9p8ODB%G^|~1fir6|*Be7(4`|2=VBep7B<|dCw<2^bf z%3NEQ@|3ksw5&v(*NZych~SB6hIHY&47I^TT5-|**vG{~6O-LvkNr|BZ+eVs{?sT_ zAT2E7nMphA?lUhVXwzTFdoKSn|4hs2c>G%a#j8PILNu2-^~>LN6X{X;XE8>K%AwQ- z90txKexbrIvWZV_8YK1>p~BJU59i}D_Ka9ZSeNtqT$lz@(#P~HQYW-(Cfucz9CXwO zZw=*!_n>UYVvy`u)q?`G1nUvBKYp(jnvdUzeX_?(Z?Z<}Q>w?yRLe)RpjxV-wc~C0 z8tAmW#;{S3813by?ns<}IOyih>q;4)v0rAPe&xDBbz{9;x4Iv6dHW=^D@s1#w5Ok) z5E`|6#QE__)U+iziAv#eH!5g|Rild?S0Ug7Q_e~=94il1R)L=1m!ywe44>NZpE3#` zFWyqfsUlp&((8J~+y%h6+KsDIFL{+K*kFkDFl!TOc2!7IuEM!2QtoD8KAts{#=U3V z-4Ct>X|f03AE-g4ISOO3l>-8p%E~D5+^eg-CFa-e>O8Pulpm#I?&`Q5CNO<*pm-xe zukK$axlX+_TT>5YS0EE_&EI0qHroM3PrsAr3-|8^uUC}TTW^J39Xdu1%ztQ@iZOe> z4f%T4vcw!UoShz(#As9QTUap98E(W<NbD&|3f>3-B}(}XZ`eL!cPucgY-=GGUvDhT zN_diD!?}p09EZruX?Uab4YL{weaqTq(`J!PW`5Or%jdhlN})%I8?}u$_armz{l$Xv zBHgYI`%J8|jk{z9QrkH{fm}j_-^p_4rcwuA8|R0~i}GHUr|qP*D@8c$)q?2>?)iC7 zTOaY!O<`d=hyZ%uPwM1(HpS(nH+S#DQrZ|;P5&+R11L3o-qCQ|!ZD6)*&1Iu=;Ov! zQSAzz>E)maI+Ki6k7kX|;_DqH#h#i_a^@oxADZTB5|OJ@HBl?P^D{)GPS&WxiN)NH zdQ75zH{ywnDSVy?fks6woKONsPB|KX>#Bv{4Gb@)K8Y5%7Sv$7zGzOUily$9ha4W& z4EDS%6OeYSnK6X&9U*PnW08VrM#|*C{dlWIo!dQC_(jc=>Pj6N>fAf6xXqoR#WIlR z*dkuVd|>8%dM6JNcA?=wA}+(Xf^OgI(1lo8HegVnyXIYGWkfF+6imtC+|-JYC+LT< zm0O5~>b8AAduxZp?ILq3?r{x4#m4Mv-3s51juMJYATO>yn2$_-e}d#X)t+~iG&&$h z7C1|O7hIJ<y=9JdQKv;qD%>EV;&@**L#~16z)@lP>;*cj$XpP-+hx&ET=E0v<#CEW zG7x#`TpM(+(n)cg@N0*uQ_nhBgXXjg<6b*GcI7>_9Q(`dJZw@K<2QRm#KlD42bzDn z*}mv0un#x+cYQaVM<fjAZS(CjXBnw9Zc&LkzmQtxLLiEMKpsxd&yQhN{qpwn%TGk# z>$L})6)6KU9KnSj1ZlN>$xX(WCjgE2=B|Y>eDLwQS)@uxnN^Nruvh{F7%v6`(`*#! zX-|vC&K7=2jLWbQn`gFW>kv|t<DZM97n6;Sp5DgZUJ$ILtc)#U2RVkqfjttIC2D5( zZ^}_)wx;};zenMsIR?-=Q{OpT@-}xqPdOmYI`0Rs*P}vlPz*ULyHp6~wg!0cLa#o> zISHOb?O5^hMg(IQtGY=Ai?QK4T{|Amw5&ugio886IkO2WE;FkY91{{Yd&FDvaAj!~ zY6HOcWkt2tb#u+2$=1O8G(a;GH2GEf<EMgtw8|Q%MdS?zHEOJm6e0(;>%z=*P?qQH z`jj2__+kq;y5iCdiOER1NkBNYG>zhvi$YB~>sD;{8E=u}d)(ovuhpZ*S6}<9c@&o( zB`J%)#M6f*-?$AfhA-V{oww&p8uX~L@FPi?X)u~0B#6-fTO*6URU>1$o9^$kNGu70 zY3;&QqN`Pzx%dz0(|&3JHr4Fcvf51H<#jf5D?`Y7XjX|-7n%unUsw1c%xG5Kt0M}( zx%iHR-p>~8L0W~XZx0;oeIurMkcsqUoN!8tHW{Q}FoFs<z2E$TSA=V`BrGU91!btC zDvQ)$xBLLqmfP|929%vdG*QdvV+1eC$lJAv`^xZ54DwB6;P7}W{3aXhO*dIuw+e28 z5Z%^<h<ISfYO*$hl}~#JmRL>n+Bm6tXXGL>e?TE4FEj;@LZuv;+<21Tvx`^M4R`sJ zC3awgLWazV;lt;>%f^?irFC&e=ytmCU|wZi8w=HQl~&|}5n9{B%T_%S$S(nOqRyoj z-}-_p_^K`!^!rM+G#@o5DswKg?n!WX;NZaK6j*d$6!S}}=ak;Xw3PMoTP6+r%8}t= z57IZU)WcP2ss$!peo<f$HF!?Fj+A$NhA#3?Och+-bT{k<@`w+k)TxP_>I=3Xwc<y! zo?9@!=f|IU07*+F78aIwKf6_uus;DE2&_6EaapRea5ZTo`x&!%fxfv3PCZQ9-ySjd zFV-$M?A4W_A$bo}x*7w4w-QsUNj1g25^k>S*HT<y+kw8#4P{H-SWUUmQFyL|)g0Ct zfU?p4Ib4FH$F~^?hGk&9yM^<g@iLOd-1nmX{b3QDSoz-mI=FJtwWiKUZ<NOc{ibP? z{-MkYqi95aOhR(*73SGnOGJ}#tGch#L&FC5oK}Y}@1H8&4M3~ec}>=2szRpX0jyw7 zI{m%-9xHS8cX(&E8FdeEPL*?4oy^&Fqeze&04=&w>8>lntb8M)I=T_sR|}3(SMw<= z;R@LOvMcy(rn>iLxy028oVB}jg}a5uIBn^Ry<;FyqqH5PxS@V)_}a^AFlE1JYyy_L z(5-VS2EMC2wz02MWY1m4AEo@m`Uz0%<R?^u1{$KoQCvv$_xa6S7dK^R^v#pagXKgk zGzNFla=6p)B6_#M>>yS?Qv8ebEoB2+gHC*HA-(-qaMsU6f4pJM1GqNS`U`hY+<SLn z*v!|v8x0>49M36kkw4}~JivWdEPGn3*H&yblo@nfqD`-ahtt`>T<)l_onY%<xl3{q zqSf#fV@?)r@mV|_?-6=v`p`{OQm5b#w{LZyCiG+vti;&~5&o>ir>ASG?F)m=+Oq!9 z6<zm5zBFJ6U&bB={+F+a+Wft15m)R{&5Gy#wUjNjM!$j!L*5-n=aMMqs_2-zY~|$$ z?pm{Na=Nrw$`M8z84odL_<grS>UFPp%{W}bW_7jOijHD+X_ZcLkZ2Mo=h*{aNeDY! ztHr}-oFBM}3vL26JU(`X6E!lg+BAv2@udi9W`Y%q32Pj_JdVOPJz&ucGt;@bO-P2H zb#PI$KAGbrJm?^u&s>hKe9tZ+YurgIZyo7{f2y>v%=~EfW|H-=zENV6C9hR-B^dFh zjyV@lN4zkoK}EB@lr0Ppx+f{vFda%Ch}gw~>VCCWw?Rq{j4sotG=R5KLIYURsk>8` z8fbLwn$frin6Czxu5OpsIP2k?Eyx=WSJ;2sP=w*E#a&3o{>WoiW4*~TtgU&oubR=R zv6(eJHvDM5X|sswSLH*@Gb)U_825~l$N#;C8-x|EAsWB4yA?l<Ci9jeW64Gv1AhN? z#up09Ih)Ufj(zJudtm;~W*Qg==(lw=;^J*-GyYZqw_RO%mgg^h`cZOvl{+RB7Wths zLdwzIZBRzS>uAI;vNlSaTe4IGNvW)j2WJf_ayx5Osq>K}O;Bw%B}cAvxwIlZCr82M zbfkuQ6U}H>$Rg$^ctLRttF~zt4^=(gsV3_L1k@V#J4B((h((-6vR)d&?eZi2uVKyY ze1J&z^px?D61;aS-p=|fFuBO8_vpqvcb{AIeyx^vM0_6!j&84P`DN15Hu5QqYz61Z zW<*y58?x1I(Sm#gxAY)2k!3rRU;^5Qz@f@gHuP0RS$+b3_aUC<#Wb}}NorkI9^oqO zq57M?H9Xjj4GFb?h(o^L9y_oV_ptnDJae3^UpG^cVygb59)uhpefSS_yB+lxx&?Rs zyB@@TBrVU7@A~?e9!I6^QXiR-jLsQXI`&VmKBcYbhvcO@XGChTXTOkbx3GxSnAOxE z?p%v6wjS*CPjkuVAgxu!=`0)w&{VgMhcHYa&=V5PxVl(|T~dvozdZ0$O4mPdnwf;y z-zZ0f_PbFIDX_ITINysb+HukA1GhxmTa*3Zbev@h)n@^9(I_R?Ra0Vk0HP2ur+Wb< z56iS#25C#WrdeLZQXJGyo)D7`&654s8v{l#>}#s?!$SF*#dO8KxT|5j6QJo=UdUM= zmzN20Mm98eX^ugCQj@s;Rm(Vyf?(PtG#MqCvtLib8J9`lbX)gU@b_LHZ_&>}gY-X_ z7^R5_q8xAH<8(DYA%cq+e+;=3=OSr>yXVIVoGpK}VnJ2taks!FM^Z*#yM>q&ryx#I z43%|*^Nq2d#(TT)(-T5-o#tfZlm?d;zwE~T#<b4S-c#o};!M`zQm@5^LcM;&2q}7V zxkvT8%1pM-S)}(w@^~m6HDfV^+&aV9@~gbOK(yl#g#GNeg5f9^s9&nDMG+Qm3mPRg z`2+f@&;Ez$MB&3wcmapyosH@v6freJOAcgpm2mB<(`aH03QSFT&<$iO504?iJX46y zZs3gz&F@e+^A!{wj$YQO;xNGkz>C%HtDM)8TyK!TkaS|k%xbeB(n4qAg?SeixJn1F z*uM`nKjM5gu|@GRIu_uRcHPWAmRTQD{I5=ybND}<EPJ~}ziuCUB#5NEgs>zNfko7R zcCsKIXH2yjMRtbNRFpN&+1}FVVYWReM;YqumhR9A!~h~X)Wi=oaM)j-3GMK{wb+~P zrHN8kWpTnvr5srGZ7$TeameN_wpl_})a`CQ%{%8ohDn@y1*lOLG0nU_k(xYPgU(8J zIbV6k!L!sH!gO|;%dRn-i|EpUbrRa@Au?Au{T}`W=Bpc#kFz_|E*^!WR(njz=9FP` zRqw8PyBkFvduo7sc9ratQMFh-z8y%rYPvBA52Q(JAWTQ+;KW~(66EgqHN@~U-t35E zJL0kNS7z0oThhdb;7tO5I{3V1bSq)u`maeNIKI&AY;>mROsvj@wrB#!>XDOQEXL6< zv=$Uy4C?T1TGmutH$C6@dEp71eC26f7FA%65mRhjOz?&OC1UEUC{;pQZ;b4h!TQu@ zY+hm4;v;NbF!*SGX=zZ{vj>LCAAfbb8A-7S;^J}>@pati;dXDyUl4T|Wf4#wKA&O0 z)iV-qVz1_$Co_}a?=*8R!Y?{M9xp|qvIR?{wpRb63scJh;y9kIHrY&CBkiuvsI>;d zE?=<(<&ikk3YHoUU*k|!zH#T3qf_H4rvlkJcVchij?soq;PjyR_nn_kd)va_4u>L1 zCisT989doz7A-f6)Xl9h(Rdd3gGEW!GvyNo(3(mRjAX%@!HtCf_`g7bPP|&r)!^`N zhcFF|jZxD)Kqd6X(Gj<O!S&B}<G=bZ(fOi@-rgO+y>De{DZIa@9mVm<<v+WnH7j&= z)vB@6c&*+vG=Ttt7fz8YAW$i)T}?}<*QZXSOCKNBx*nK%>Jiz{Q{F^B1SHGj!w}aW zk~3p14HqsmS6N>WCj!*(FZ%Ev#;wej=~x78;~+E2w{shh0EfKVSBUJyI&hIpP5*t% zR^qz1LdOym_)n<~T_wozq~PH%D7~LTN$4Ppz(CWGvvyjUD1<)D@!2|zx0T6v3GZ9@ zWQg8(&jx1wK1xGk!9R@%Oz&&P>*xYJJRX+M>fO~$Y#dxlLMqE0(dX7Te~m~wKRq^F zOP&8AoFmpr2l9V1tf~N%C)qH~qzy;mnuj&&^zZoxQ%RRWg!e7+LKKW1zr8SIqhG&! zPngJtJldXyPA1U!G%=s{n|LW4xY+&_<lJS7{};XdJu#CnIEeB{-TXd4TAeqo<%aA} zdnT8mg3;?fT+QR5vZ3e4$yKWeBHZd-G;_79N>04ZjEn0QiCt>G8Y+_&5IrVG;qHrb z`!#4ZbPUi#gY1p{y>=)5IDk_4skdUWieuZpE*hVEWMG>X1LDE!*Z~DkrUSPW*~oE( zGY!{01+y$!^su2N-Dqa<kzdY+=!NI}Zv_4{yehiJ;ZBY-93Rd8_=U!4q%D!C>g9?# ze(Gz`aX$V=iv6%oc1Exic4L+0n3e<`{={ZLew$ZTjGp36kZHXK&vntpq8T14k3%7^ zdfGXcp-&?J`)O&?>y}OCJIW}zEFvLNPc8WgS?&A39-J}|+v5&i=t3<?3H$tc2SsT& z5yHHH6SAuTHskCkaqgFFvY`~1;M=Nn6N3@2y!bOJBjB&5_MFG{!ne7jJ81-pNhIUC z%qBIbWT*|K&$G@6-Wd?5-ignLd2=g9<UMxvwdu5up{|$FUKugW8hKUZtMKqcu;ays zhj*<r#PaT^KU{0@=H1p9|COP&P0Fm&CT+YgYpy-iAxAb+dFjN6w1CjI-{?<z*W9~S z;%q0J@ZPN?2A{%-uF8YfLC^m@;*wMPj<l4^WP6vW2<zE}Y5(4H8)SsL$_eaw7xXSB zH1X#)jR3s~pq={&GuR6$<(T|E!@&)0bnQ0+?&Ayl140QNP7BYRIuQ)A?zF=9ep&at z7c6sK(dj~04aqlXIqS@EKprL%)m-?}bDlxO#S&TbtSI<C-eB+krt@qm^blEWwDVC3 z-wXDtOa?PZbQJ)$%7m6bskAcMkhnc%A>0h#)ki0$@_R8{;zns@b2NUJoXLKV20=jR zc$1u-uOB}Zd5>3mE><LAiStuNr7-a0Ck*#TG}SpG1s4)>ca31nzRobLN@*R5>DX0{ z8p}M_DToG*^RwZTzgTuv;&L(;HO5XFZ@FP>WvkKKni~Y)J?iXL$SrDXvP3|_c6fcV zG6nqF&Ig;#R*m>1^-?bBAdGkeeD;(v8*jdN8q7SbJ~{8c$M-7o1@3ZAqqzChrrtPW zZo3!Rx08YgLGhpDQ9gtLr487#xD6dKC>KErloZ3!XYi(gNEpoO$!@j%JG;S|%qZnm ztmFOh$=FJN8JyyiGY0u%^@TlrYl$##eaghNC)P44dMwSVqxnNDuUXEa%DgBxbqVE2 zQzg65(0-&BGh=Zp(stxa84^HZBlfSPnP85(+uW+jBBhz5JiQfc6Wsr!AN{6C!PsBY z%;`M$4(iENke6nF?)=}pwOMt?OkYJzdZOy;SK=V7NG+0ghT6C3xXQuy;KLJ?LHY|Z z0~pyH73&yW%HjIK6v@=DS5__<=5G+fTSS6d6w~q*iH6&14+89p_zV0gGRyI%YZlPT zL<fMEgE9;7x_)2VR3zT0rZz=e12t8tg8L_PE9f|JAB&b?Q7^!WeApHf-lx;$Ai9$x zsrpRGxS8rN(izJsCwD<1SimycOfVfJvO3qS2$UBE3Yl9m&9_k9x#{%P3GBI63|9ZR zd<qgrEyX2Y!Sthn7E+e>st_PH9TRf(9G}?MW11<Ce*8RgV{7f^C8&{&@iW?z$JxAV zUc=o#LSXyrA+cGp_!OU&P><J!=D@<%$;WBD<Q(Q3+tIwoBa!I>{@MQ^&2eaS9nFM; zDG(;Z@YD-|=(B6OkmhYxjoxW+d9F|M>@dDlY47oiQZLG@FR^MbK0Urr2q_{?bAT5g z$cAsEe=Qh3GdM+v5s{!R56~vo?C(hZlz<zR!k&8s8lXXoY&DYQ)e3IpufIy3L?>$P zxW;=0spM75<{ZQy>|=!HrmdW<3Au+++w&by>H`EF8voRkCS&S;mi7*~tdb!w7Qn)N z1v)DWS2V=`7}dXRpC#C4=Sgb?o}|obKCM6YN`GYa<}p0iT~aS=m}ooUy&X6B1Ju5v zvlMniWifrSrrw}ly?bwIf4UYw*OOemg8drO=Pxo2aWB_)d3^}I0&=k<FZ#=gcU-h! zGC(3EUx*fC(pg{jE?q%zX@*=8m@nNws_8T8Nzok_@nNP(`xbPx17I}(So0;%3~HYP z7444`8YS7}1!KHM>GasY%h)AzTm%bHjy<SL27jB+L66<I>K?m7q%jD4pt7iWI8rB7 z7!Jjyf_ZG#x+-ex+csxvc=^pDUm*hyIw*TZXW=V(W$2gwX|%3mhn!j?Lg?$lm7}6l z1q@UO4i(Q@=UymvdBY`GS*cJoC+50xd&hF!Ug^mXelIGvJ=h9$Y0z0WWZ+V(t&aQ# zIyda6*H3V2I1oCQF?xp%l^@)5+Fv0A!Es4+YafZtd**&sk&)-({0>Y#s@YWKMw}5# zkXHX#_V~aOkJcm%yKO6>J_X++y)j^6UQz$my#arS3pb<ZC5`p>%l^l|`l5hJlm9Qj zc?!iGMo7>XXSq)*G=c&N@v;2#kup;M-ztG(pnAS;`dlEIeBqT~dzcZC<M<n>5FAfa zIE%cUn<j!@ET^MhK;o|4w+r{GG-ry>8kF`wd{8>!c2e%2QZ0u3MfQ(TE*jlx6vZx! zY(I5`^L#=y&IlI`_0Ol>t9^ya_5sMYm+N*xy?zxxR8mw#K~DZzra%A$=ql#t=K+-! zz`zdaSHhy;Wjq?EZhfEw^n!3o+8SWD1a6_}yfU2lI1%U<^nJa(V|4xkKY~g)u*6r7 zm|R!>JfY?q(8{H9I#nlcJ@QWd{>_cXc+?-?QR`gtnbY$kzbR3W+ZY9>dxW#8J3ycY z<M6rf+}ZRz6Wz?GguLj5FFX-L?m9zBt@Uii6`Fpz0EOvmUdl-@6+}h>?I}OUKxbu$ z+e6JK%A!m2i9t@HLV@!)EJEXVyF00qaEEX&y;P~c4!!~;J;TrBi0p~H<+FqkM{IiD zsoCY3Aidtav1$bkJ4Uy=D;P(0Jh(jwY{F02u9$z14@A;^L-CJ>hKA&1b!+SLcwo>m zL|nK4h@+vPpxD^g(@%kvQ<llcZJ<IPpV<^GpiB3{J6~O|CBX%acS^B^Mc55Re`d4K ze`&~1@`uu2n_Luyei?g2q!Iytc=hQHdrLM92Rt#8XM`x?N^3^T<2}hvMd5dD5!c`z zI4=@YZ|i1Z!3ae^7PXn2%4!p_n983NYKm!!R3%$tFhFv=ADs5^;*<-J(_gc8c6{x` zGw?;0dV~R}+VGQ7Tx^gms#F(1|NHMa!(1AzdG~EXLqo$uy-t)=dJ)6@?0<h`&4%OT zbOWgH9<LXzR8>{~iY59-M@!4fb}#Obk&%h;o#Un|Y<x{KQCV5}{-bWGHIe8FcmGDd z72Ym59WTn}XU=8Pq1w)9ef_bMVU<<v%%(FOF~-fQR%6vFoV!h7S=TJdaUgt>9=}4# zyrX;CH?e1_p!bxZLXxziZ?+U-CmISol-e_Bkw%dbg=H_;v_48DGJepVblPrH4*Tl! z<+SSdK$?T11@A6}b=LhTt>u)9)KLw=pAtC;(2r+C93XKv{U6G>avwZcAc(nR+W_tZ zPWHFSa|?iw_|-GkQ+(T_P$XQMVV0pgWUOTzy}Id*F+aFCmR@mO34W4IYoSi}ttvw6 z_R2!%OpHm<vd8l=UE)FLBKFjlW`p8SJlOC{?7<xD7=r}NWACqaM-$4OeUe09N=t|( zmcGn1b$k+f2^d2_q`?EVPtK3GHezC8nwpyVK4?Hfw7<LCw`)DaOYB`&XXopuMc_ki z4ZLT8<{ByLk!*6M-``rMPfqYIqxH0|rJ@N{9bE}qZZt?ha*-P#F&t*y$2A0Q040Z; zW$|Cv-QrWaU3kP64u-Rxt<tqR9tVO-w9gw;-ghLPQBuT32lz+kqs0yDU;AJfDu@Q1 z2Py6J4IL#$Cx&P;9Ud(Hejr!BedQvK08q#>(tT-EQARZP`YfDeKK@eyl52c&>4WBu zL99RsL56T(^>HMb$RRzUP)?$U`OvWJ(-Ye7pdbU2PLAqc8+_DJE<I5$?AWRtR;;YR zKmUDuRc3l0+gNl+$L87L(GfcRYvh0~N4dAbnV{pU^?!<iGT-96b5P(}nBr2=J&wVO zw1wcDnDk|;?Hgh(FAY}MUxqsCjl7Hcj^4_8y%t~f8k!7ykT82()vv0>?bKDJUai=^ zRj>Q-rDJMo>-zzl$wp;MFvhJ~_Oe_|jnySuZ0m{Zu6Z0Ctgx1HlVPG@nn+~UBV~1< z1K2`Djd%}bK$^p({>**putgn1>c(M9Jt8WHs-6P|eIU5UgJw(MbLmO|PinbrzJtRL zXI+=!;NkWV_w>SxABj151=NA_2}~k9quTd=@^)i+?h2j9kvH=7Zqkz5m~YNTywW~R ztuZPG`AUwgtoQspq3_7j()0dbXDl3`Z2->L<+gC6B|9S^T#Sgtum!xA0~a0&KF_b> zE>_4_pVC&#tqsa?)e74joDKSU^W4C8jW@iVhMsjt?z%PN4=!3u&9Tuq>@mL{A4eN3 z$w0jMO+95xsp>MaI1dp9*i*;grZD8Km>jB$=RPrw@$)yy`pW4IW~DdZHL3*=_`Suq z_*PTW@%4}qX-R8j2*1d}PGCfExm6|Zsn}55y|47mF`&b0+FQSWdx!VVHqr1khh$Q@ zqu8gS<>FX<(a!mm0*j!WpbQa&k{Kc|9pIeEL1(_(%T!XC3dFlT_MEvDgN!<=2i)9+ zYYb1Rvp2)G;pI$W#Y}(B5a%GQKA8!AADD_srrMesc&H!n?@6FwV9uSnGQX;*s06+f zYkd{0cd)k?#J=Fj0136KlqSpW-U#??{-gO?o^a)-wLnvZ{;}Gnt87|UkouT2)AeH= zY(K_JL(6H$JW$Yr@xVv#ukk-rv;fL><K>XalqRQV4|2<VZ`QkONerN42U4?J<UQ`V z&*_rdbQBtk#Hrgp`TC4ilofBp*cEZUljTz=k?FMCt}teV=bKO=7jqwyvywMll&?U` z*#Rx+&Ytp7@hzpTlB&5AoWg2~<?c?dCWMVZpW2y=%|7RaOf&As-9AS9?!Wgh2+fdv zEhRlYJ^A;~N0z3hgUF7jz+EBx14g9P5UISd?QN~(fjRE~sk`K?AG7n)O4dQM4xj-v z0<2zWfXJhpWv8OEY&~!BHkkXF9xpAD1JSE(yGD-lgLJ!gY>v_Q>2%w5m57XtU&h;b zG`Xxsy*%oftGZxdTbwNIU+w3ADsJpSyb8=&X$VLbJ@uE_(>?720M+6OYnR`Q7UKU` zXKxu-RrIZmq9C9GN(e{`(kb02sdRUDch@EqM7q1XyIW$zrn|ela})0Z|L5HM-rqT2 z?)t)J#auJinrqDQJYzgU8`L1~CK}4-JimB>5eTWV>w4=Vif8FP5&rWC!(gWXSr$^b zT^P-$%SJLq-Vt!uWo50;R+|AIBMAu!Iy$;c;o#LU)mJdTn^}1AJ13@?W-RdC{TaVS z`JFEG=M;$RaJ2NATkQ2&>Q(7Rz3>w(I!kGM;6UK^COOn!lJ*E(aE}2-!2X2CU|NKN zrVEx|*#+U;c>e|9M{%}(QN1DG#Lb<)>#1;)a1Y*ccQe;=e1%f1>>{r9zQG<5`uSfq zJ;3ZQ5deG<NGDueTnyy$1cdP{EG#ZAE^4ioJg<*Gr4AX1@DQmWeE!k=(-3Mm7IEup zD8$vENgVz^P)06aF`-yi!odIbWM})%_o|`l`cq<CUN3zIxZMu@XW46yObN&R-HB<! z(O=F@60v2mu1-CI|0=?1gy-#>F5nL&rkI?X63d3L4gmG|@ZkecEznJ$7QAaFY(q;! z172Z?k=a+yAG;eLxeC@u{_hu}pZP_M<B${gokwvHC2~tKq|Q&UERzHUk2}(7cA`v< z_4p=%w0G^wVxjtK5Sb_3^9=^rZO{k3Fse_Tev?yggJ5z?KmpMDsVz8uGlcmRtO{&t zr5{C>zmBAR{eqQQ@C~WrMT&!nXdLRBdHz+-Bow~tpYb~FfOy92{%e5!23|&e(e+>I z88zMgwflWF?<XeeUNpxSma3xuB2?vUcG?|S1VLS;P6I$zDg^T@A`@FcZ!Ngas->%m zJLg<`Tj~q*FmP)gpVB_^eu3d5c&^6qRS=1FTS&lmo3`A0K%^Up;ACQ|1R$W1EJ`Mr zc$NHD&QUMGCP!qJA9L`;2d7LeSF1vGfw^FTD=r}SWE}x)zM!4mgL%BsR2{hw1pl}{ ztdd5szURKfXOqvx`;Qid-)NlcTLhi!_DWuzJ_#Ut=j4N#Pw|dnj*7?-Vho7eYMg-= zJZZPt*r!Dl0PFor`}3Go`nFMUIO1`Hs(0nFx?gB_D7?1L$Bk|PTZN+%|0_W5znmFy zXCqR5_47qnXa9NC#&YP^f9sLMI13~5J6KiBZi$PFH#Il=qu`6yOpGumr=~t`kC0RW zlLDvh`gc~Nx3KrL{vF>QA^H_QJ}+74+E!LpY_1M9{%^$wTcxJx{EY+~ntqCcXPX-` z^4^6|T^;kF*I+V!2aUGQJT~^WUnB4s?@!QkK<nptE~6okR}F6+HrBz9=Zv+%HGa>& z)R@zS-PFj8Mc(_@t}#TVeUdZ3nX|y;B~!*n@9|@*KEbj5`kF8!2?s>I0z$*8@Qo#{ zab;O`<)=HZrz2!Ojy)?iIQ2BN-RzBtftj49Y~VN9cOs$)P04BB*2J_{Te|8Dr2PD0 zuI6`ZcJf$Vver)H7HBX(SNcjNeJmru66=nl+1gzKbp!7lQqwCbzqgRNWN=76L~+vO zd)2hro-U};IOLuk*A@9s?;!MFI))#zl~0R?*bq$|5-ynmL&&Es138Jyu4tt$)vYvb zC%OSB$L32ekiOKv+==_lH1Ft2Rg#8Rg5sZ_wdEZ{AeB6jZTQchKc0{GPUXtxy1I<| zJ?~Nc$AD~pva%78kxauG@M*2DkHEoDTMbjodTa$hnXb6L@-$-`mCNvs*QRz9-&<2F zY!<?C#aW{eCI(eWt8d8H(4%BveRV=aTf&$P-n4pz{v<Iua`$9z%tG-;!T=fPU(c1a zL6w>?;}N7=^2OVKUhyTjUeTOoTvOUOeA^vl%U!>KApUB#;IRC}v_w_OrMmN$+^ zw_!kNwTnc|N%g5JEAs$?`Y{&_HWkZ0?hFYhHArrWF?BlJd~g612!YgIEZGK6Qr!o9 zc%c)hEDS%H_Ry@tWMuj|hE<-|+RHPOsen+o?(iy*V0-_62#SaCG71MY9Du$Wj&-J| z3Ds|);;y?y7es#Uy%d}0#PMmz|GSvAm(d4%1qQ_bPKB?j-z>0zD~`%7rx_ykU{8}8 z!(Hb_>ms!pzjSLZ|Ez2R!=U|bxs8a(8gQ$8)m6#T^oBhNcF2@`mt{is9}fX6Ash<Q z%l}MUKvhyu7`p#|I1k!Uk^gpdWR6nBnImaS2FDBABmvR(VLX;-JTc=nyw}O5-Z#`w z<sM`BU_Q-}Uqj=NYQ9twnw;E;%eh(o!4Z^wzHJKTzYO}W?L=~Rl`EO>D#yLgeuK8L zf3^I2)K(5F0;+gE`?%_#8uqXmJaP@G*>hJ)y+y=(`q6CoehSU+S;@6c4*t1?UrRp% ziyI-HPq_cie1(YTl^dTwMv>ynG6SRCX1yv+vb_8D`Cw4z{}b>olC8ingWZ;d!xX&A zu7Yw@be}k+{l^rt(0b@z0*xD5iq{RSIXrw^1ye-`1$Qh>J{-J?YTdY!OOzeM`Cc&c z+8w%3%U#q1zxFTy^0bR8Djen8lFKdJ5<a>;f2?()x0cbkYH539cxUL0h;)hrx1LVa zo|cz4tsVM9d?LlzOj6JFlsiGt4b3joLO12$N5bT^sU<V{W_qxMxt`=&eob)wmw+qn z5}c(pIEK7y#7wWIkA~Xtb!NrQhS(`65WTjgD<(q2qiQU-%S9&cNl@v9)|kmlkd5m- z48HW3AI%$5#@OLixe9)StK5<K_bp|QW~xg>fBe#Rew+(NsVgS+<toH(R8U`;T?Qh~ z#{5l<#!6-iA^5#s2&gF!+|_F-hd!#%J&g&{TLPP*zP>(cVq)FX_1-1u;uRVin!X7+ zXL1NjPp)J#q@cVMSmYH6TKeL8P3U3`Ihx@^Rp*US%>)Nd>wSa9l_%r$n7iRdEV0>l z^7}l?oiCUw$$BpKWR)D!v+jzV)$^haH0)Y8%f|YKgbB@zQKe|*J6dLYX(nC6h%?}W zY<{X^V|Np&^88wqiY%PU&+!{n=n-)U#hSfOxc@6Du{uM>OELjT>{8rddKzl=1tJ6# zW}JcTk<46)#F)6aX*&!ec6N4JT3TY_jGCI7tgNi`^iQ8Z>#ueOz{8#@Em4^66|K&w zx(IV?b*1}qY+UTmC`Q{kx5_e0ugaqP3NV{it2gr+)qolft3$i=LVHJu4kMr}{>hr2 zthdV5qYM@q?kDaFshSv4n6n@u8l<RcYaINqv%I&(si1hp4G5TH<BfgCQ+28I;0!mI zo-N;Iwm5HCKEBrT^K+R@VU^-Zxm-!W_Uc7WzP`OBBO|M+s#*u6u`w_(u&`3OT`J1T z!Yuv-2A-Xq$P~0AXJ<%O1ydJ7I!%o>lS`ZHPiI&PJ)IatV%m^b3sQqU6&8A0W6ll{ zH2UZ=gxrirUfd>*O1*@araOxKo5?D)`thl&=Dz?{2<)=mfP9#I7#bKT&dW14v9bST zQCeNi!puAl2Im62;g*yoenojjML-8{@4~f40ki#Bk^B~C&Kwfl;eB+9lwu~$hdYsR zzqB6o(*8aX2|ge>iW?1i6**!}^yw~XY}}+A8MU=eva+(@zxQN|#SSK!OwB20%K}m7 zz?uh0bFZLOD`o@U4aH?E$;ikkD=Vv>@XcxEx9#*y|NK~)v~YTt!)V0YBzg0Q=W;r$ zJ`LTkNw%Ho`YU8c-gVsUVV>+Tm0Y<RyqdUQy#aN!;&M)tlWg`1s`9r?)<HU+>Ur5X zplG+*H*j<qy?2)CPE`oTR)h*DkS>HLL^FP3r4THYfoD-R>wEj|Xs&rLOnHyrDR({| z%HsB!4mJ8n^+q*?1~rPwp$XNZ#5Ex4C8I3XKwQFm9AeX1S_dI;>wNXSG!(w|40%>Q zhJoHp=XTwir%}4dw*5hhcfo;wQnv1D#u%N)<N$VU^?bm99Hr!Xd*6YKLO$Y=qw*6~ zJsQ{6V<U)o06C`bPm(}Y11%;MrQ6z)rf?v5tpELJ#i$__eP-}0jUYe7^W4<XOl7Un z0{tJ6!KYHAreJ!p_{MTKe3TA$pTj>HQQ;Wt&V&OF_UjlH`@A;7Ks#n8%v{Ir^(dHp zd^&fSSw?SkZ<~Lthgz4rVg_T*P}n(Cnd4=@3M?G|ej{`aW&B8Ky&4_hc#wWI^CyB@ zrdL1T{1D-L$dkTIN07*8k^T7E+S-Q1k=5YfV8=#{+_8N55Kz1hcHhkTCB$fo9jDOX zsHMrT*wOUkEUjYUKn{1(l~-dnN?h69N%ooZ_}BbW0#wek5>os#oNgNR^LZaGU6;t| zaywZw=1(u^!e4>|EBs~K5(Wm*9?BXCBsYt%2AW7XnAJ;VTEZ>Hf)SIg_k2VM2cs1H zFrDbai49jYhG^pw@o;oY*Jkj<XtUm7$JQ?|DbbuqvZ!yv5|h)b+*N)Y`+Fhk|FW7_ z`>yych`I2dCh^dNHOZ6N$sEs0tnja;WQ!VQ0}6uVNjkzH2Zkcya$z!VcMaKMmJ)%| z1{OcA;qbwyEDOvF1q_@Yg`+(bwPFFNRiAvj;f@U}=Q+X^1-{XJ)Wg{ikqBuEQg`6y zod2oC8_!7MGX8Z2a{X$!zqg8$-~3QXRh7qgQ&=V}S(Iv99ofXgSe(%!?t4Im-&>yS zpfrbgX41H-ed(E*8);E09wu2!C)H~IRuXR0Huab_!CQLMr}v5B4#}GUK~qz+x3||^ zPDVz?#3Y~QgS&@^oSd8mtD2@J0hCIN2gVi8*{^@5^<f3hBa{cFGoqRqG}m2h;2`)y z#V+Nc-I+&4%BXbdI)1tbj+7p>JE&X{vu^2fmN{F4VHWNw%$UeIbd|fW5|1N|=@1cq zc|0%xu6!GU(L0%RxY_By`N$s5VpQ1Te&HlCw*ZOdt^<2RV=3$==|Su+aD^`RXAK9o zFMWPCV(}zlW~TpHBeYs{6{ocG@a<8&x)`K&b72enl23h@jGLVfxtr3Op^A8|9yk*S zs$fo8${<s_L1?|*FU_zfqP%Kz+qOyT;rrIw`u8X`7u!UEF%(7rC_9+$MP97YDE5bB z>a19Cy4sm$%9w5UT;3boA%&{#I+~qPNFqgRTm>#3*LltcIwe!s($G>>Xp8ilxxGRH z1nS%|3?3GR5i#&i6~)QKNT8f?l^<kiY>f`|G3ss4%=YmQRq6(%`O@>9yz~zuy`Nc8 zFwdXtJue+Y#B+9I3yb3Xl?8bc5)zFwB3Cyz|6jixrarb;=3T7#rEMRl8T&4d+|=T_ zdaxH_5?~Mzsj@7by+vH+LVAaISdPxP<|v_1)-H2Kg*9=IaF|*LWr5;YwU?mEz~)#U zrEsTY$r=5&kEgUMk~wE!Q^Krg4u}`i5JH}}r?^^>Z~;<9>G9ayHe1P&j(&lGp>Fvh z_)VVvm{jAt{~ScXYcAH<@)pj~z#?bCiZcVgKR)!qHBRd?Z2g=eyED3Yx33siXxxhu z!sQ;&>hp<NvPdg&0mNC6J3p$Q&(Q)k9+H8*0uA4)52CvM5JZl1M^DB~m&r7fdaL#3 zgGVu>aL#GaYKPc#xutq(I2WkP82?^iCtf5kK9uX6c8Nh$534?&*8#W^p1PQR^KH5g zvqn^vUgmx#qiI`{7LB1MQr29Q!_%|8O(H;K-4+!S19;}Iq0rpiTyjz%MNU_CPL5<U zr^9%j%;KWJGRB?owQ=-hSvUAS5oSZqn@K3e3)tdPDJkR+)r(6?ACuEhr}i4Rmk-uG zC7MfHyJhSILxVrpnl*T=Hs{Su6;x=bl?eu8+VClrI_~Uw<mCmi&GL5-fwX7-_LN;F zuS3HwbT_1vg+>;{qT-C#UEYXy{W@5EJMLWYM+D)beFUEbp~gpQktbm*Vm@oI#GbjX zBrN@6ANSD>nxXZ0zmZ}jX#WV#EsYm5c7P_m6g?G+e<v{VmCS}VM?3?I<hD{lOKih7 zpKt+_4qjb;)W6~@qXHTTdcmANrk3)EY+;WaKfTc(_|zf8wSL0OX#fCIR(9MU&jdJ% z($mv{cO1~2jHTBy{8iLxS?k0`0^2q*oj6yk-DrQ(EY(6|Ab}>~yqX0~@igt)#lqxq zce4L`A^cvxyQuTmyFrzcb&b<6B!>;E9lpH-Vp(#M4D4MtkPxu>#-hvCBIac`XKdb! z%q*sD2G>>L3+S5s-%`%(tl<Wg^9OlVgDi~tli80RI}g~d9KniQ1h5Pa5@Dw^$5w7K zH`pD6p>OS9Z&D^WBfw%^R86xaKU?zW;pwRC+Nx@5^coHJ=i4KX<Ym8BS64ST4T}}c zSQ8HpMh9K+>?|@P^n%QTqeWw{OIVataH1c7CgR`}y4Ky8*N(GMB+n=A(PB>FZsON# zjg3lM*^L(+oOIXDu`KYOXpZCIO$vxi-Ps->AOQY5g?77#9leOL!<!koz}SJt?#AJU zpdV8AU`RCIwaw=AiA?&*DJmX&+Zyw&v=v>rt6<q$RB|W`sD31}?s1LjI}VQVhSK@% zYe*@o3F^HuKVvg{peA$Ao93KstlZHC6K1yX?w`ZPV7)e1HRB5l`dxP<eXV!T&#-w9 z9115O;D^Ius}JaiI5@DV#bl@ST2dAlwJ584l#gaqg)|zJM^%_+Ph>mbTV^}xmlUpX z(G>4dwh+~6RMr=a0uzA^Ht@iLRu8A}xCc16t}O2sHWh|SJjl5ke`*bcb$+ZgqQrG0 zzfE_k^)u^HytoJn)dC%=@V<fp-H~jW9&Kt%7jiD_91JSZho8FS)8F~8MR9SvekbQ( zpMU&@D~M1sEGDw^z;ix_$4MT-WWc>Z$$BxldJ^?FVFz>8;U~cdr=w^vM}0G2fT!MO zL=D!#@pjU8w5JBbcS|Eb2_eHHAcW#^R49gJ!@y?Tj2j_LS=?7d(EF3xe{st&CMZ-` zAT#U1!|H0pjI-rkgie$TZz;b{R{bb-q+`F5ZyOM(;yiU;c%^o9i1s1T8BOqUI*KlW z2<5ZJo!+C_O3l{e&98n*yDMaa`sk|NvL2DNj3`MBc5}#Yx}%hePeHHOwa(sd->a^w zkYg;`mVIr#&F}$TFxf}L*}&X{^eH#)rdSki@^V^kUp_uPgxh)o^wxl2Qo)4j+UhFc zuQ+gYv#}}n50&#ur{_71L25;j@%kC`B_k_`MysfiifRqnaNt@+ETb_5fBGOpt?PGL zBECl%iAcZdX<O;Fcv#AM#P`WOsX<kWP$r#+P=a`jB_TJ+g4lT7*1n44;qA4M)WRH{ zziwMx&yAQNeScWtz4>LUWXgwvsa;s|!IX0#r!(A+aR^^PjAvpLgNp91J?P<kbdtSx zeYkschUHJcDup<ctbrwRFkJY3kA3{$$q+nk;&&#ENDt?+e#DeU9qoCKz3DobXx27s z@ZY1M7=x$rVdE@~!{(5=Z9BWXloS<x^ZIr8-T?~>%f`kA3-fW*jA?bkg#4zizLo-& zr`Du7D+qc}yH8zuptHKRCgDA{{s)0+(w*mXNF^I%MM@%D`-qQ%nIM{L;((1@tNT>} z+nbHkXG>f9rUb?0a+B{yUXem&(9*?IE}ll#l##U%Pb7ULpu4h~5j01whCiX+?`nR- zojKaRWLeqU6SFgYd%+bg)X_Xd6Q74ix|GW;Suw7B?(Hfzh+x5UiG202x+o8B)(aNi zA9KN$Z@P*FEs@49l<x4h3bkHeQR-$0l~X7CCD$DM-7yu=&3mlYByLrUS!^T{W_8+7 zBcYy3nm@UW5pWNXyPP>RJ&z{jaUJsbB6<}9Y2~Zk<0&6s(ro#qyFuK`A!wdKI;3oJ zufs`<nM*!`F4F{lSe4UV(3!ALNXxamsoJfeNk^Q``OI&gLzd0v?I$JP7L}R<?wU`* zr%4r!7k%GzLn|l}GU^JRhjR+aO{KyY6@0a2lhE8NCDf>Xib9vlABnH0tj`kb;d!et zw~lx?CC)rNL>?AI&aq3eB<m3#gL(3*YgdIifnrN~DO4-2`I=m8ExJ(o@sagFnVigb zpLXwrua6WMRxceL<8$`o)6-GYY9P-pXY!z7rACYUO=kc)09U7cWbyizJ-MSoEzi4d zAqF;8`*9S76+1a`cG+sj$7*KbGPsEUIAbvGHFMUz8G81X>SjE|bgQs%PP55&FNPK> zk$vaMyOdR<B099?dA#fAkzv(JU9Gw0EJKRf#;(YM!<YS$tWImpW79&dcAvg<xg4e? z@>X=rh_I>p;A?UO!>|xNUHDC5?V=|W7nHm3$lc8RLpD~0lY3J>t?6*<L&M&juIEW& zpCpE77RCi1ve^U|K}4mXhlJjXB6(R6?!r7sd8%PSNrr}hLkJGT-n-F3v;xO_Oyrw} zJN)apAGc>N1%_5-d0$znIHXz^M1+zffPC$9mqhjZV;A=Gr7jH-iu<|yvW#4z!-)lE z6kPr(jsZC5g@7qztG-z&%>fE~dOIwweP`CRu?0e5VZ1)=rV?EDuIW|lQ{Q)#@;>_0 z?BV~nQ8!cooIPCYzQ*W@4fdys`mnB{_AG*_ef@12I7D=pj<8wscq3Iq_YpVu)7h^k z2SSYqHQ)%0r89QHFg=6(3+~Z7kY+Lgd90hfQqx5=ZSpBC43b_sJvXRN&;yw0PnQ>y z`0%J4)&rX`v7hb-(}4s?O}+GnJ^nse|E?rwA?P*CFjw%aM%Cg8+b6G|_O`%snik;m zgR$-~<#bBR-c2C0eFE8!zxUVxe}(~W<67^WL&gu_AFp)eC&rXl%lg4uX}}QwKClnQ z4;k)>OmrJZMWmj{4d!AW6vO)bY;5?^tg~-pJr^@o)TKTm>olXO`TbH@<*9rI=ixQr zPg|uk^j98<<>`-lxewf`n9oijg69&s!(&A=LsC{Z(21s=cEi7ZcFPg`0izJhZoGNA znCQ9Z+U#6*kZoTBJG8@|S^~3N-(*iRjaC2T2w}i}b`c({11lQA;(u)hC^s-2@et=q zEo?HGe;7=iqvn?{Uu;otCEeYdD6JFJPqe!eO8q-+sQwaouC(j(gp+Rh#yV|vO1K`b zs3Dsl>>~_WHGD3tLcd&o`!2-j!s1nG)8!S<M1_4%eA)U4bQN~vkF>4*0I*J(iH5SI zw+?_#^NWThr$8$i)sffq>e+WO*?m}@+rR1dwJI&#T0y+eQ-=Get@p(xxdxHOWY8k! z(Qc0@S}OI*9pPIOykED+8#%(9TH>v2GQrdK0xCR#!srLH0!Mv5iz+P1WXD=o=eI97 z({hkiFhup~(z|l66@j-sP!;F~7+<|(H#}ozoXP&do}TN)s}?qo+w=8xeJw4m`eGg{ zt0Mp?{}D-6o&ZShu`SrkX=`hnQFB@^QWRk}I@hS}O;4=~2P%`8#th->XLVPAIz9$} z`2;wl;?BnnT9un_<5ketZyoXr8>D4D6}jogAr&R{TIlfp)g#@h`;OG0f=aei@*3Xv zGQ~I>x&C?IXyVj5Mc=Xn80A9AM{86L2y2J^m>ZU~6paBcqGUFC1m&<K^zF{snfxNZ zUWCiNph^b`-0fJO+_ne!V>3(m;m&QS_~UU77y5Q_{OSZbq+$>U?+7upej0G?JvErS zQyU&dIgt<W&GGOo7&BK)`1$z(G6LZwB01UFACd4QznfLh0_un0&d#z|ier|wl}F7x zIf=S@dR^C2*bk<Af_8yL(MFwT3V57xa+*Ua7785xSJXnVq;xD_*ab5c`zH46457Ju znowo#%Q(FD2)d^hi$trKRH+qo?s`F-sssz82{Thz<RT?_zYC;)VrKJY{VeUjd0Fry zYE?wYrRtohm~CW}sp=Hwpn%u{k>`u(<VXAeEd9e2lQ7UR#Lsd^`gC;dKySuJDwt<4 zJ#I~CUghiSI2A;{mqgzPG<s@lC?nu$D^~1FxChWo000IsE>6e&>6H$DF;P)@stLeZ zIisi|b<Xnr`*%b{L<(A31=EUBqru}%J$ZR~ZSBUz8EfCXJamgSNC9K{Y`n{snN^9q z<3Pa@et$SA3_(_z<oQ;ud<s?}?4G-?bH(V3lX>qO#)ZddcbZ$m+a@0@zwXf?4K%<0 zkKo41Sd7uP23h;!Cl5AMrkl}Lk*|Cqsh%nP`&K`0TwIyeQY1sJ2fmO693CZ3YqALs zH;5;E<k!#4;D;O;P?W0Li%_<{@OKBA<t2jC-{w7F$mOsrucM<Q^y|7dDla>`3s8V4 zR@C}NssHljOCMj~y}iAmWUi@s8n+y+7Wew5CiQGtAwfZBH<G?J<g~%=qp4YQ2oQZK zOabFu<XULVGfUe<jiiF_ivaJZ5hQ9%W}q(UkNSqkBz>UXUfEvxdk`jR5dA>#=YsTL zGL_|BYtry{5{I_-9c>NdAwJW+iX&D-?4xv5!@HUCgP6=w9}6)qLRBH9nRdB5*`?dB z#wO^UtFPIaIruOjJ<rg}(6UW0YIAdQWJCl%KmT9~j~V01;}1Zu866ERNO-N@ZmR`) z$d#Qy%)oG*lL#P^ra-FiO4WrOFRrg)c;#9Yy^l0TwcM@w{qfZ0au0kWC|#^rm%NP@ zx$2Ie7$;8tXCGxt*Z<<96y<FqsN$1X7{$+5p+wj9<v+*S=+3RKX*xb`S!hHFsHU@b zf+W{#Rf?3v8n@4@t?CLNN7kwpobt|<Lko$sBQU}U*tk4oZL>zwrUC%(r!J?R?iB(T zHP@rD=7lb29@#vP)8aHcm^Z*&F|pZttFJK{cOzenz=MK!*zop9!72&!6+XpOyDO*L zefN+)s*oRT5+4`KD8=BfgR+(i_a*W<JG<HDH3-`uDU`xi>p?+1_DAPwD$zhkt9jRO zqZ#Y;Mh@3+lSSjh*3I*|6FDR0U6NCL4qaB8!W?{Iq9uZ)Gr1MbumgPed&!}>+r6?6 zOQ1XRJs}m>;5!pL_#4XltE76gLgNvedJUUL!35m-n8+a$Lo`~ue9#=bDq1fBWz(>N zKcN=M{ik>*VdWh(#X2VMO&rRelaR>Z{^}~$TDc*2D^>0gM&$LayczvWKStGEb^=m_ zm52MPmOiZ;)GFFvBFu_-q?fCr8+Ur=vQTcctDxK)?kl2Z`(Yax$OS4n_O=usAy|Zs zLBf#J`VXt4s6aTH;8jriG|XbMw+=%72ZVVITful}+1M*5*+tZ?Xr<lMCurq{DuM*~ zwzVyv*5O_N-!;=Otn<3zJX{J?(VC@JfWNNTBKBA!cT7k`#LdmE@|AGRUmy$Z&O!9h zvj=E@A$F>4LK0c8vCFi&JO&q}ejii9sr~m996Pus1DoCAD!AR>7-QdWhFxhrV)yp& z_Xe^Cc<@K@$WORB!8dsH5CYK`W=LFO*Byth?D4gWY-b_*BjXrqGpq~0hhNvyIiIhH zt8@u$`;znY(~V5Wq2hQ7@1yPblGD^(mE71=_`I(%UToFx23KOXaBDewoPX(+i{)<q zT+tzw%Y`L(ocOrjx)jSAB7z)cx=&ROU%$AFmz<*1Wkq6k?zwRH67lWwfQMZ&2}N38 zzpLerZ~PbG4fRfxd*p7eL$%wsW)1brwlbG|YGn_-x)deDQVg^d+o4m0xoqu#cp!O+ z(3QB3!|Y{mCcH+k+7%6SnDejlTy6QgW5{6!yr7NTktFH}jmI{hfritdm#b=%KW0GQ ziw>NQz-d#q;ORm4xyRzT-bEi_2qxd30C-g{0sV)>Z;4jv)tPze-b>o=(2%WOnZcjg zJmAE$d2itiho#ax;2Gv*PcUs?S`)B@u_U_qa`%wd^H*Q@Ezhw=6({fLhDu0qn|>v^ z?t~i`=Qv2b9}BimJXJZ%>|L!74%uY4B|cU%5?L2v8Z&W$?xWasj|A>mxS&V*Hc3Lb zR)eOBc-xes^Pa4vwzRW40t8P_&;0y+0F!cYaS`4BnmJO2b{QSbTn73sRQhv!dpj?W zVhi!tSgw>-%l@}Vopi9bQBTtS9--v$)%4m|8Wpj#T8nvAMG=fJmaQGapeZ@1+xWNM zzSIV$m?F}8wZ*%<ngd>=tkm%SoI$&9nirCck^e6r?iZ|vM0CQ0$2CDuxzj!+kW*D5 zZoTi=Q^C|jhqIR_J4_S%>|>ra#~~ERDs=AGcWQ%;%YMJa$mh<k4ra_^oYs7W`x~xO zT!be>m<~WrdzZS|RajVZY>y(X37o=ujb$Kc%>lXoCv=AH&_8&k8BJXa8oP;=DQe6E zUxiY+p;J8OEEG03k$fQ&VZ~H#bCbTJSiUuVi<ac4FW+2jy|eT%BIg_L6(eXS=M6I_ zce*<rD~$@)BjdSxpNd&^`4?oh&|UftYrS%Ng**pN>*#_ozWkxLT(m81zjI5BkLp9< zePJU30{vhb24M>2@(I)a-S)kGhL}C*#Z5?7ttDA;u&5~|#n0-_t^*IQRyV1T<Sf!* zrgHa;b_s-?x3L7*!n8w(+X;l<b`Xc<g$hG!_X6G*W}k($JU~!6t-747x14WH^48d+ z7ZE}vF~!sPc$iXz``BW*?pTTyLcZ?U5MkzrI}&8S>++YYKU?}NsTj`w$CD?9emym9 zNh=(DRG1T6NwLf6ig%90^JJfETe~QR!UA?4fCic{C!C(z8im3t=E>%pzf?nh{W_l6 zMAqJ(S&f#0LVESpAfk`I>|O`*w~>`^Bk(iP^=kj+XdWIwW<hB6f@$eE_R@|8`82No zm#3MdW4>hPA)ryKvQ$MZ#8Q(a173V#k;jF5t$FZ02R{a)UNAtTRaaRb9X6nI_`qU4 zmOk&qw!x7JA9T^VbJfz^7Hj{>JpuLIU)&orwqC{Z3&BJ3E^g`oUi&1m)*#4%)xqLU z5DvpcwOfrRZ9;>m-*=e|Yp5=npWjKS&qUM~8jJRBk_;?aYt)s%DDJxU1@JsT2jt9B zdqrgx?;Y-#tny_t7+$|M?5^OMmGnFXqyicCE3D=(4M^2Sa}5XNAnFrIi&x+aV$(Lf zn^VNn{D2?Y1G+l5#d0oJz6JD4ZhfdM+6A~9<LOgdkaV^Ru|Apsh1iz+jzNM<`1_l+ zj)cxWvXi_QGuw7w(tFpX7x|Vx%Z|~AE%$NMS1~GWKBC*jS4EOV;4@E*JzTC`N*n-f zml-$DJ7D*0|Hz^pRTYvR((=YBWGfjzN$xXTz|waJc_)QGOhBGD8?9t!EtBAQ8-FTc zI$F8R*o~C`uLoykVdS_gA#-uu@kzFo+|>@n2ioTK-#84&j*c$Cpu_mlzB9FQb8-0? z+#MDcc6;ke+UQMPGch#<WZ`z0ud~4k-dybp1UOz#*sO&`Gz*Zh1CekhTwzVmdZ%SB zfJ*r&6Ar1Wg_o!LY{C_!W#C93-Kt4{6yeZ&pWvzm3eMd8O`wNlIb{#+bd#wpRWN9+ zUvPlf&#aFXYH+p^Qc<CQD?B+PRIXuQ>?f^sU#ie7idta|{Yw{aHU*O*x1_la-Z3w6 z%Dt6U*gCU;>TY_td4rtVs{B2_7<uMMP5Gi0^mU3|znbr#LK_7i8@ji}?d-Tm6C>ZP zsc6N3mE3cF`jwIQb!BQfV3%n|Ir)hMj_ZWu8*LZ%FEyN?$A*g7WZLpGQos5b!S5nh zd;V7j^>oK>>F~jQr<70qt~*`ez=sC^;wCgy3$7Uy=-i*hr#~V-DOxLYDRY}Roj`nh za0cVeml_h@f6n$Lh$c$oz>sPOgXxC<Cw5hO)u-T1d!{_WaO%bQH04=_5JN}wC~g{` zmpCH&4u7!O&~WK;|1kf#SE_yYy`On>^Jwhg?jYCh*ZKB~S@k&!uGHksTsoUKk!$w) zg59w}ymuVA8ZA!*PcNN8xt9n<_k^gZsOac=l`{ZODj{L^!N$zQ#Kh9_^5O!Y&(mF6 zTH3+kqFfI=n94T<Nd`XMOfSD4%_O>+M^MtWT=m9g?=$7RmP)c;8j~tkzW<xye-t8F zw}|KiiHoi~Zs(v*X%gc#?7W!w)w8yD3(&V)pwt#$FKVoe;gH(uRT2H$dpX|{=f<}X z1M*fvB1paHAlJMZIMw3ia9hDAnXTof-n(wU*>-_y_`(0?M;miNB>Lnf0-<pb_4jRq zIZ4(SSekKe__IVdg<ub8?9!BcBNhH3dwkgljaJC~Ej})<VYJ9Ul)37Ac_Sbs5iI{X z2Y!0nI2a+|t;*up782*B2eNEmFZ$G0ucC1dvFshL+sy5i6)gUD`lB`RRV!o-a`trF z%YiQ;n_uwW1ZNqjR2^WdCJNS8gTT>nZ&a&)W5CH2{njxR*r9t6_asi!Mr$U}Pvnb> zAw64TRvO-W6etw8b$vzpet4L&UkC8+SjP%6B7(IMa6U<njZ)^403*>>wn^y?n>m7w zg$15{1PH8#c8!k{YO1RH#D(erulU<H?>)FTRMDcjW94s3yy4&JmsqU#wqdL38K}|k z4JH)Q1ViGPS(qJdDkpm_^R1*g>)EE9Oy{cBJSD^gng?VmYy77Ug(PaFny^?9{4a(_ zSX$Mg?d_#fN(wzyAd{=R{rs-J&5QAXOoaala-gs>LqRqSJmYl>(;1<UdE8BhZe~k} z*{4Vv2lY9JvL0&nHx<t*T1=nz){=|4@V!srX0+QJRZ5As>%&&@zE`DKOT2?64gjbq zKD~yVE-Bv$c}zIXz7*UvuapqK!ru`RR=ivzZb9Mjcv#b;LoGHqsRI!<Tc>Mq#gmJg ze|C%?6Fl<6+4ykZ)#;C%k;7+|7u$F9u3qZx_R{6p7ODJVPbOOW%J~?QD@ZqY{-+>r z=vbz|@gr%0VXGc9#s?uW#+_oDD2m#%X}G2GkkQ|pf~VeSH^fxoWEJ0z9~3Yn&^?v$ zBZ*YE&jhO2V^P?_q7(<93{$pMzo!Xq8P(gjr>Cc`j(zg_aWm116MzK)7>HC>T1LhO zAf9APr%#w(xbi@SLlXka-#Ut!7+iFX?gmC<ZY)79RcNw{R81UA78LkDZ8mVWbc{Bn ztiJV`V@WKe!e=QR^|Wowfs!A34z!OYRoWeOFIi|_?9Vz?REk|sApJ=C;ucd;?vz28 z;AF-=G<x-nnS?BLVupg&)ejcVkzP=Z3|bc1p5LUl7>`70<C|3z4lSPV;(&L!8?(#i zp5{AEs=3OIF&6q#wfdD}{2L>eF0YfbLt``Hl+vw%9xrWy=^z{Uio`#BJQfv^WS0Dx zLa(mTC%AIt%OKw<UL<FJ<dw-_<1gM%T;?sD&Q8_Lvanv+O5(NEM!E}?3e1!k^z8T@ z$e{8W-}rrNz|AoHB$-v}zL&+U`yYZOk;j@?M-8-Qc%L0_xcUhN37%s5wCtJlZBGbh z2c8e{j(4~&uHJ_)uXut#CH#FeaDL*VOW2ubokIL==OV0dyeKyL?cj&8%}azxG^$gg z$zd!=19X42vs$+WUP)C%SLkUXTQLrUePR;;Y;=HLq(}Q`)p8>o&zxQf%xHi&W_ekA z$^;8o35$f_^@<i07UJUK8c=?HG~>OP0g|%{3G=)W+t$V58;OuDY{0ij;h_8DM9Z+@ z-gH%{7d)63D_NWsa%^AQ*;U?A8~;Y%-{Xzg2Z4L)z=w*9N(iG7yf+aco3N%juqah8 zxHsJc@142aqDxpeG10HZb1t%v?*&y72Mcz&qz<P9cCns@O2lK(pcKe1(v<R$bdz9b z<T}KeMULi@9mjxzDYfu~=%WIlQ2a;|aZTH!sFok&UmPzFtav~}n_xypc-HqL)Sek# z?uo|JbAnmMWNMaKBnNZ5lE{v(tzNtsCrQI}&@A?GWfMI*gTTpFnUBAS<pa}%q~S<S z^X}ekut|r<Q-p0I1bljp9Fp|Q5rVqJ#R<vo@Bu{n9#v(j3@!FQkYcB2L|qEdDoX5P zh(5gl*uwBk*2^0k0F(U#@TDkMK0P~29;2{VR8s?x&<j@&etsWe5-vM{KtO3n9TkJp zNn>CQD;C;B+EFSX#_&lmXjH1P=uCSngE8C<bXP<=qESnD;Ao@eEI2(7(ijy^Vo2+< ztmIDiT`HF0QN*dUOju50rJP@+M}Px=6hVl~&`E)GAoYGe^6J<Gh3m;6Gw8|=F(Lf% z8pkGZRIrro!=IOjXoPf`uj4wwl<Mpi{yhz6pUqHAb;*wBgKKb%h}PQDxgT1#$>%SW zO(XO&5Ece{`?e&Q%KmK3aN&Euubm*M>j6Qx*No_8H&qaEzL-&_R*V?#)zgQl2^(^= zGI5KSz6rsDTAg(mr29*sxk2j{?k?T(!Y3uOUoUpz9Hp1LtHjrhxG;eX-;+8besUSZ z_#*Gca;mXlm^OV0igI^|qDa^-fhB}=Ay|o5Vdq+>(1WOMGqQzFN|EWBCwaN)IT7JT zhmw8qoA4tAnMbjv!j^|cg>;RDMI-Qx+Cz?o3?RY=cbLF%v{|or%^uj=v{6=mHm(lY zpH5zX;-B?_Ztw5z0EU{oyL&=nBJhw;n6f~HYuqpQXZm940Sk?Cf?M$a<9fan7M`>_ zBV(V<HVys`vZ~}zt=ni+YF;t6rBknRltp@?jwO6=IAVD0&8^_?wRP+}OT@#UicSa` zpyKi|vnTd6DDGdngiO-i)($;kW~8lLX7XIKVL5txQ%CZc$XC3T`Wd!S?y0Bjy|Q{E z2)nc#giTFcBIfHXARDWKwapx1lFJ=#B&tPdU+Yms-{F+K+FZbtl47jNH6FgOZwfwD zYKLudpE<^lcXXcmMYdwo5T<Czo}6C!t6dhBUys&?==)t=@{5SwCzl*05yj`%MxgoG z$sQ?<lf?RrE@PhLX3sSv_nl`?_-|_ItBb_e1!^+XbzMxl+nFrv6I%#$b=qhl{2kjN z$Lc=yH=TE_$J!Msq9G+JwHlZXv=pZ+;3GYjkDf`Z>gF4by!nacM7+nlON*I+Fmttj z)o5%w)guV=(S+#qdWkQ56aEYjAyBF}Vh~d*YtGkXioi8>LMpR<KiDeko}7{`DMsk* z4Jm2WiM(1&r$UCtK#w3&=NO%B@cEYSIa}=eJ^)!$rRhmn<mMvLD$We{$KQD!kOLrn ztN6J%sy6cHI8XFgm!Z~exaMWX91FmqBuB+2Cl|PuZBfM+I~mwZ^cggp)Xqgiu{8m^ zgj!`;As*fqA~&;A?_LnHmb-I%Fo=F6JNQX;K_WM3un7D}6Z`a%!~2S?vs?Smm=E^$ zeu)={AibrE-i1U{1EIw9w6qshc`uNtswIbTtWH18{>=EWke=lP2^8Dgb>SMTCrqra z;Wj!7dE5u+G5aohXW*Mx(eCm*W(km^h}YM3kYcr(eYWURNmlpBSwl*mRA_r4?xn*n zb?M|D9(_UQOKfm~@LFz_4;(<}P3c}DionMipM;#2^3BvNvY56d%~ovqs&BY=_08;3 zOQd>SAI|yDC9I-YYV}u~zKzBtP`6I<nKdk=;A!0RtyRy27gtFhRq0iXA_u5LN;g6k zMT6_WN(`&U%FO^=^4B&zN@gb4c4JNm*){Wav@wyFyWfc-B=X3jkGgc@;)l=BsxRS2 z;8<DI<5DvLGc@%FoNbV9R6Deu*ngFG5pjqv;s!&hK@b^RjzwWkP!`r82R>LY$Is&c zAp7S3=_l4FGAqdI73a7)uM->h;#l7HkUqpSTgHxVJ9Z(~&`-^Xm6U!BZTgc>oEHz8 z+FSK1l@Ori@etpa#>=e_G163bP%#HUFc|C{_)2g)gC79`1C9L{C9I`+3+lOlRN=X( zSIaMgCsc`{&QBbG1!0cikYn@n;_v=$OR7ALCQJw36OuK|)#!Ztqrr?g8%VZhCA!CI z_RQ`_QutrMzGwi^TTo*SFoZv)@!f)S3c|XIevy`kkwX9d;?V;|-~&*ywskuAMO(1I z!Pa+X=V<>$(r}WmN~{FgQ*ZN|ehG_=9Q4||(fo3idoZ~z+jCF1K1dj#t9*`-LV`aB zz`E@x%+KSmXLgV0NtybSKM5OY+h*8GRc-yr;mBfQQNtDsqE-S9JmYcq**lGTPte<P z!n9~ewW`_rf8laztyStbH7DbbCi#u?qvJ$Rh~WJ2?0DOQJM-paX7*|o%@aI_&D~=& zOb;*xhEjO`6$|Y2qj^S6fnP9QmY<#wz2|L#fB8SZU>bh?cb)?Kx6fG|o{nt)S40)i zxwLR7UfbcwjX&|#mOOPlBWRvLM_~K93{w}ll+0nbsY_~tJTgY;;m|>nssGIU2WoiS zq^qmDzDhJ=%setOLLw3}ZdyGsFaR*8vFOx|jg7++=i~|}gfqV|GDdhz%~TpmkVVcf zKT#cKR(hj9by(d+S~a=4u}=`H+(%+vLHPgOwJsgmFw}Q)a&mcj`TX2IbEHQR7Y7H> zXBQ5^i;syhWWbK%e4{9rI~I)3#R`!A$jF3&bC8E)`^mND6s85&33)u4o;wWa65M$J z*{V{tFgG_hGc)`4tsMw!3&H1dygpuuh(L=LWpO<>u2GmIVZ=t-+1UYr6Cm2I$kyo| zb-5vWlC8Yd)3Y5y^{-y@+ko|;T{#1=;S_+lP#Kx@D1ee3Cr(y4u}e+yOI$+(zc4a3 z)(POU1Hn3zlZy3E&&1PqJ4Qq<Ql(5&U0rP}R5oL7SQ$@S2amGv2+fzv1?;#D&VT2@ zAR&e(Dzx|Yi4`kWz6$Khi2Bd|HtmzTHgCz?vx^I$B~_}$6^QVX(c1^<6U5;E+ypV@ z1N-siB>{_RlyD{`Jw2f!4@#Ba@88&Te}`jE%f%kxMT9^qqsX<?ml<Ruz3AB&`__?G zZl8a|{JTdR@__HlC*u<sug{;eT3QzM8GA={+LxB;w|)=b)}|U)z!tYJEy;v?L@Mt_ z%zbc^k-I+Ma6*xfVAW|i<Em+C*6Hxe-Rk)lb^~KAa2nP24e0Zqb(B{BS(9HEc`+dN zBk(@n3X(S7sS4Qh^Z(5=R{2kU4Ytoxuko;hyMgsd;y_GlYH5D~L(;g?WZ(DiavlcR z%G;`P1|H3s#89&Ganh$|<S^`pPZVx0n&<JIEQ*ER_08AY5rRZ4|24=9H$q8VJV+gn zJ3Ktx#>NKV?*S`PWMt%uDqNgkG9XNUXy|Bvrjmdw;}b7$3Vw?EM^Ry(n?<f#f3^=T zwc1@;`l$a(n(u+H2YbiHPUXpD0?fH0#XYtqce{za7w47N+I*MQ`7QD)2a=<Av5OC- z_>UKtVrSt3|1Q;b#sxsR*jOb1IRxs`rQ16+M5s7Mfn+u2c}gFdd0+i75=p3WGEJfK zMCt~%juCAXh2x70ptci`8~BDW;9?Dp0nDTh^r%ymenX~0lggR(1_bO1fe#g$x1|b^ z_j{p5550kI1~OQ}JeQYTcF{!v*c1OsV`y?2whv;^cfaax(7=ig3RIOSbB2FD=C#sG z5<!B(*U<!iv34~*2U<x+5#<A|r%$y+{`$|=`)S}8b#E|XMH0+KoqQ}`4Y|1D5Ecx} z*X`l|C%Ov8j|mPXO=48fF0xusVk!ArHO8KKYX=#3aj{`dDpZP9TF&GWm;SDcruJW% zZDl{(UQn#S5WI7?u&j#NUd1{(h{ELzAczioZ;=KG6mcx_+)h_&{W|^ceC;@a5MR$P zowj(~6*^NsaF_G)E+^ZAY?JpJpI86$=%;-JXc<T|>;EGDVPFol^PZ;5r|o~A@ctc# lNmKh5(**qcmF@Qf-wtROP0&H=X*mY-Lr7AvgkRg|{{XUHNo4>4 From 9882429fb5d28d6efec33f4e91d23b170b183cba Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 23 Mar 2024 16:42:35 +0100 Subject: [PATCH 2733/3485] Updating readme file for macos-14-arm64 version 20240219.1 (#9380) Co-authored-by: Image generation service account <no-reply@microsoft.com> --- images/macos/macos-14-arm64-Readme.md | 122 ++++++++++++++++---------- 1 file changed, 74 insertions(+), 48 deletions(-) diff --git a/images/macos/macos-14-arm64-Readme.md b/images/macos/macos-14-arm64-Readme.md index be41235fcc9b..54a3807fbc9e 100644 --- a/images/macos/macos-14-arm64-Readme.md +++ b/images/macos/macos-14-arm64-Readme.md @@ -1,12 +1,17 @@ +| Announcements | +|-| +| [[All OSes] Ruby versions <= 2.7.x will be removed on February, 26](https://github.com/actions/runner-images/issues/9327) | +| [[All OSes] Go 1.19.x will be removed and 1.21.x set as default on February, 26](https://github.com/actions/runner-images/issues/9326) | +*** # macOS 14 -- OS Version: macOS 14.2.1 (23C71) -- Kernel Version: Darwin 23.2.0 -- Image Version: 20240116.1 +- OS Version: macOS 14.3.1 (23D60) +- Kernel Version: Darwin 23.3.0 +- Image Version: 20240219.1 ## Installed Software ### Language and Runtime -- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.405, 8.0.101 +- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.406, 8.0.101, 8.0.201 - Bash 3.2.57(1)-release - Clang/LLVM 15.0.0 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` @@ -16,61 +21,59 @@ - GNU Fortran 11 (Homebrew GCC 11.4.0) - available by `gfortran-11` alias - GNU Fortran 12 (Homebrew GCC 12.3.0) - available by `gfortran-12` alias - GNU Fortran 13 (Homebrew GCC 13.2.0) - available by `gfortran-13` alias -- Julia 1.10.0 - Kotlin 1.9.22-release-704 - Mono 6.12.0.188 -- Node.js 18.19.0 +- Node.js 20.11.1 - Perl 5.38.2 -- R 4.3.2 - Ruby 3.0.6p216 ### Package Management -- Bundler 2.5.4 +- Bundler 2.5.6 - Carthage 0.39.1 -- CocoaPods 1.14.3 -- Homebrew 4.2.4 -- NPM 10.2.3 +- CocoaPods 1.15.2 +- Homebrew 4.2.9 +- NPM 10.2.4 - NuGet 6.3.1.1 -- RubyGems 3.5.4 +- RubyGems 3.5.6 - Yarn 1.22.19 ### Project Management - Apache Ant 1.10.14 - Apache Maven 3.9.6 -- Gradle 8.5 +- Gradle 8.6 ### Utilities - 7-Zip 17.05 - aria2 1.37.0 -- azcopy 10.21.2 -- bazel 7.0.0 +- azcopy 10.23.0 +- bazel 7.0.2 - bazelisk 1.19.0 - bsdtar 3.5.3 - available by 'tar' alias - Curl 8.4.0 -- Git 2.43.0 +- Git 2.43.2 - Git LFS 3.4.1 -- GitHub CLI 2.42.0 +- GitHub CLI 2.44.1 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.21.4 -- gpg (GnuPG) 2.4.3 +- gpg (GnuPG) 2.4.4 - jq 1.7.1 - OpenSSL 1.1.1w 11 Sep 2023 - Packer 1.9.4 - pkg-config 0.29.2 -- yq 4.40.5 +- yq 4.41.1 - zstd 1.5.5 ### Tools -- AWS CLI 2.15.10 -- AWS SAM CLI 1.107.0 +- AWS CLI 2.15.21 +- AWS SAM CLI 1.109.0 - AWS Session Manager CLI 1.2.553.0 -- Azure CLI 2.56.0 +- Azure CLI 2.57.0 - Azure CLI (azure-devops) 0.26.0 -- Bicep CLI 0.24.24 -- Cmake 3.28.1 -- CodeQL Action Bundle 2.15.5 +- Bicep CLI 0.25.53 +- Cmake 3.28.3 +- CodeQL Action Bundle 2.16.2 - Fastlane 2.219.0 -- SwiftFormat 0.53.0 +- SwiftFormat 0.53.2 - Xcbeautify 1.4.0 - Xcode Command Line Tools 15.1.0.0.1.1700200546 - Xcodes 1.4.1 @@ -78,12 +81,12 @@ ### Linters ### Browsers -- Safari 17.2.1 (19617.1.17.11.12) -- SafariDriver 17.2.1 (19617.1.17.11.12) -- Google Chrome 120.0.6099.234 -- Google Chrome for Testing 120.0.6099.109 -- ChromeDriver 120.0.6099.109 -- Selenium server 4.16.1 +- Safari 17.3.1 (19617.2.4.11.12) +- SafariDriver 17.3.1 (19617.2.4.11.12) +- Google Chrome 121.0.6167.184 +- Google Chrome for Testing 121.0.6167.184 +- ChromeDriver 121.0.6167.184 +- Selenium server 4.17.0 #### Environment variables | Name | Value | @@ -95,15 +98,40 @@ ### Java | Version | Environment Variable | | --------------------- | -------------------- | -| 11.0.21+9 | JAVA_HOME_11_arm64 | -| 17.0.9+9 | JAVA_HOME_17_arm64 | -| 21.0.1+12.0 (default) | JAVA_HOME_21_arm64 | +| 11.0.22+7.1 | JAVA_HOME_11_arm64 | +| 17.0.10+7 | JAVA_HOME_17_arm64 | +| 21.0.2+13.0 (default) | JAVA_HOME_21_arm64 | + +### Cached Tools + +#### Python +- 3.11.8 +- 3.12.2 + +#### Node.js +- 18.19.1 +- 20.11.1 + +#### Go +- 1.20.14 +- 1.21.7 +- 1.22.0 + +### Rust Tools +- Cargo 1.76.0 +- Rust 1.76.0 +- Rustdoc 1.76.0 +- Rustup 1.26.0 + +#### Packages +- Clippy 0.1.76 +- Rustfmt 1.7.0-stable ### PowerShell Tools -- PowerShell 7.2.18 +- PowerShell 7.4.1 #### PowerShell Modules -- Az: 11.2.0 +- Az: 11.3.1 - Pester: 5.5.0 - PSScriptAnalyzer: 1.21.0 @@ -115,9 +143,6 @@ | 15.0.1 (default) | 15A507 | /Applications/Xcode_15.0.1.app | | 14.3.1 | 14E300c | /Applications/Xcode_14.3.1.app | -#### Xcode Support Tools -- xcpretty 0.3.0 - #### Installed SDKs | SDK | SDK Name | Xcode Version | | ------------------------------------------------------- | --------------------------------------------- | ------------- | @@ -170,21 +195,22 @@ | -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 11.0 | | Android Emulator | 33.1.24 | -| Android SDK Build-tools | 34.0.0<br>33.0.2 | -| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 2)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | -| Android SDK Platform-Tools | 34.0.5 | +| Android SDK Build-tools | 34.0.0<br>33.0.2 33.0.3 | +| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | +| Android SDK Platform-Tools | 35.0.0 | | Android Support Repository | 47.0.0 | | CMake | 3.22.1 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 24.0.8215888<br>25.2.9519653<br>26.1.10909125 (default) | +| NDK | 24.0.8215888<br>25.2.9519653<br>26.2.11394342 (default) | #### Environment variables | Name | Value | | ----------------------- | --------------------------------------------------- | | ANDROID_HOME | /Users/runner/Library/Android/sdk | -| ANDROID_NDK | /Users/runner/Library/Android/sdk/ndk/26.1.10909125 | -| ANDROID_NDK_HOME | /Users/runner/Library/Android/sdk/ndk/26.1.10909125 | -| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/26.1.10909125 | -| ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk/26.1.10909125 | +| ANDROID_NDK | /Users/runner/Library/Android/sdk/ndk/26.2.11394342 | +| ANDROID_NDK_HOME | /Users/runner/Library/Android/sdk/ndk/26.2.11394342 | +| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/26.2.11394342 | +| ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk/26.2.11394342 | | ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | + From 2259d75568df89688b874681d92cea0c4be93650 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Mon, 25 Mar 2024 15:52:52 +0100 Subject: [PATCH 2734/3485] [Ubuntu] remove Docker Comose v1 (#9559) --- .../scripts/build/install-docker-compose.sh | 21 ------------------- .../docs-gen/Generate-SoftwareReport.ps1 | 1 - .../docs-gen/SoftwareReport.Tools.psm1 | 5 ----- images/ubuntu/scripts/tests/Tools.Tests.ps1 | 8 +------ images/ubuntu/templates/ubuntu-20.04.pkr.hcl | 2 +- images/ubuntu/templates/ubuntu-22.04.pkr.hcl | 2 +- 6 files changed, 3 insertions(+), 36 deletions(-) delete mode 100644 images/ubuntu/scripts/build/install-docker-compose.sh diff --git a/images/ubuntu/scripts/build/install-docker-compose.sh b/images/ubuntu/scripts/build/install-docker-compose.sh deleted file mode 100644 index 4d152c77c391..000000000000 --- a/images/ubuntu/scripts/build/install-docker-compose.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash -e -################################################################################ -## File: install-docker-compose.sh -## Desc: Install Docker Compose v1 -## Supply chain security: Docker Compose v1 - checksum validation -################################################################################ - -# Source the helpers for use with the script -source $HELPER_SCRIPTS/install.sh - -# Download docker-compose v1 from releases -binary_path=$(download_with_retry "https://github.com/docker/compose/releases/download/1.29.2/docker-compose-Linux-x86_64") - -# Supply chain security - Docker Compose v1 -external_hash="f3f10cf3dbb8107e9ba2ea5f23c1d2159ff7321d16f0a23051d68d8e2547b323" -use_checksum_comparison "${binary_path}" "${external_hash}" - -# Install docker-compose v1 -install "${binary_path}" "/usr/local/bin/docker-compose" - -invoke_tests "Tools" "Docker-compose v1" diff --git a/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 b/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 index 758d7c91e4d5..1bae35381a6d 100644 --- a/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 +++ b/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 @@ -105,7 +105,6 @@ $tools.AddToolVersion("Buildah", $(Get-BuildahVersion)) $tools.AddToolVersion("CMake", $(Get-CMakeVersion)) $tools.AddToolVersion("CodeQL Action Bundle", $(Get-CodeQLBundleVersion)) $tools.AddToolVersion("Docker Amazon ECR Credential Helper", $(Get-DockerAmazonECRCredHelperVersion)) -$tools.AddToolVersion("Docker Compose v1", $(Get-DockerComposeV1Version)) $tools.AddToolVersion("Docker Compose v2", $(Get-DockerComposeV2Version)) $tools.AddToolVersion("Docker-Buildx", $(Get-DockerBuildxVersion)) $tools.AddToolVersion("Docker Client", $(Get-DockerClientVersion)) diff --git a/images/ubuntu/scripts/docs-gen/SoftwareReport.Tools.psm1 b/images/ubuntu/scripts/docs-gen/SoftwareReport.Tools.psm1 index a61b0a8d7aab..46ff6947a410 100644 --- a/images/ubuntu/scripts/docs-gen/SoftwareReport.Tools.psm1 +++ b/images/ubuntu/scripts/docs-gen/SoftwareReport.Tools.psm1 @@ -58,11 +58,6 @@ function Get-CMakeVersion { return $cmakeVersion } -function Get-DockerComposeV1Version { - $composeVersion = docker-compose -v | Get-StringPart -Part 2 | Get-StringPart -Part 0 -Delimiter "," - return $composeVersion -} - function Get-DockerComposeV2Version { $composeVersion = docker compose version | Get-StringPart -Part 3 | Get-StringPart -Part 0 -Delimiter "v" return $composeVersion diff --git a/images/ubuntu/scripts/tests/Tools.Tests.ps1 b/images/ubuntu/scripts/tests/Tools.Tests.ps1 index a58f052e9dfe..7baa3e8be384 100644 --- a/images/ubuntu/scripts/tests/Tools.Tests.ps1 +++ b/images/ubuntu/scripts/tests/Tools.Tests.ps1 @@ -83,7 +83,7 @@ Describe "Docker" { } } - It "docker compose v2" { + It "Docker compose v2" { $version=(Get-ToolsetContent).docker.plugins | Where-Object { $_.plugin -eq 'compose' } | Select-Object -ExpandProperty version If ($version -ne "latest") { $(docker compose version --short) | Should -BeLike "*$version*" @@ -105,12 +105,6 @@ Describe "Docker images" { } } -Describe "Docker-compose v1" { - It "docker-compose" { - "docker-compose --version"| Should -ReturnZeroExitCode - } -} - Describe "Ansible" { It "Ansible" { "ansible --version" | Should -ReturnZeroExitCode diff --git a/images/ubuntu/templates/ubuntu-20.04.pkr.hcl b/images/ubuntu/templates/ubuntu-20.04.pkr.hcl index fd3a295b7920..e6d74c2c4d55 100644 --- a/images/ubuntu/templates/ubuntu-20.04.pkr.hcl +++ b/images/ubuntu/templates/ubuntu-20.04.pkr.hcl @@ -344,7 +344,7 @@ build { provisioner "shell" { environment_vars = ["HELPER_SCRIPTS=${var.helper_script_folder}", "INSTALLER_SCRIPT_FOLDER=${var.installer_script_folder}", "DOCKERHUB_LOGIN=${var.dockerhub_login}", "DOCKERHUB_PASSWORD=${var.dockerhub_password}"] execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" - scripts = ["${path.root}/../scripts/build/install-docker-compose.sh", "${path.root}/../scripts/build/install-docker.sh"] + scripts = ["${path.root}/../scripts/build/install-docker.sh"] } provisioner "shell" { diff --git a/images/ubuntu/templates/ubuntu-22.04.pkr.hcl b/images/ubuntu/templates/ubuntu-22.04.pkr.hcl index 473e597cd3a0..702bb47a8ec8 100644 --- a/images/ubuntu/templates/ubuntu-22.04.pkr.hcl +++ b/images/ubuntu/templates/ubuntu-22.04.pkr.hcl @@ -340,7 +340,7 @@ build { provisioner "shell" { environment_vars = ["HELPER_SCRIPTS=${var.helper_script_folder}", "INSTALLER_SCRIPT_FOLDER=${var.installer_script_folder}", "DOCKERHUB_LOGIN=${var.dockerhub_login}", "DOCKERHUB_PASSWORD=${var.dockerhub_password}"] execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" - scripts = ["${path.root}/../scripts/build/install-docker-compose.sh", "${path.root}/../scripts/build/install-docker.sh"] + scripts = ["${path.root}/../scripts/build/install-docker.sh"] } provisioner "shell" { From 9ee0335bca637272ec439ed8b9a8b9108a7d39b2 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Mon, 25 Mar 2024 16:53:38 +0100 Subject: [PATCH 2735/3485] [Windows] remove Docker Comose v1 (#9558) --- images/windows/scripts/build/Install-DockerCompose.ps1 | 5 ----- images/windows/scripts/docs-gen/Generate-SoftwareReport.ps1 | 1 - images/windows/scripts/docs-gen/SoftwareReport.Tools.psm1 | 5 ----- images/windows/scripts/tests/Docker.Tests.ps1 | 3 --- 4 files changed, 14 deletions(-) diff --git a/images/windows/scripts/build/Install-DockerCompose.ps1 b/images/windows/scripts/build/Install-DockerCompose.ps1 index 962b396cb204..7e819398b99b 100644 --- a/images/windows/scripts/build/Install-DockerCompose.ps1 +++ b/images/windows/scripts/build/Install-DockerCompose.ps1 @@ -1,13 +1,8 @@ ################################################################################ ## File: Install-Docker-Compose.ps1 ## Desc: Install Docker Compose. -## Supply chain security: Docker Compose v1 - by package manager ################################################################################ -Write-Host "Install-Package Docker-Compose v1" -$versionToInstall = Resolve-ChocoPackageVersion -PackageName "docker-compose" -TargetVersion "1.29" -Install-ChocoPackage docker-compose -ArgumentList "--version=$versionToInstall" - Write-Host "Install-Package Docker-Compose v2" # Temporaty pinned to v2.23.3 due https://github.com/actions/runner-images/issues/9172 $toolsetVersion = (Get-ToolsetContent).docker.components.compose diff --git a/images/windows/scripts/docs-gen/Generate-SoftwareReport.ps1 b/images/windows/scripts/docs-gen/Generate-SoftwareReport.ps1 index 70c0021eb382..53f22b1ed1ad 100644 --- a/images/windows/scripts/docs-gen/Generate-SoftwareReport.ps1 +++ b/images/windows/scripts/docs-gen/Generate-SoftwareReport.ps1 @@ -71,7 +71,6 @@ $tools.AddToolVersion("Cabal", $(Get-CabalVersion)) $tools.AddToolVersion("CMake", $(Get-CMakeVersion)) $tools.AddToolVersion("CodeQL Action Bundle", $(Get-CodeQLBundleVersion)) $tools.AddToolVersion("Docker", $(Get-DockerVersion)) -$tools.AddToolVersion("Docker Compose v1", $(Get-DockerComposeVersion)) $tools.AddToolVersion("Docker Compose v2", $(Get-DockerComposeVersionV2)) $tools.AddToolVersion("Docker-wincred", $(Get-DockerWincredVersion)) $tools.AddToolVersion("ghc", $(Get-GHCVersion)) diff --git a/images/windows/scripts/docs-gen/SoftwareReport.Tools.psm1 b/images/windows/scripts/docs-gen/SoftwareReport.Tools.psm1 index 757316b6dfea..0aa224facf42 100644 --- a/images/windows/scripts/docs-gen/SoftwareReport.Tools.psm1 +++ b/images/windows/scripts/docs-gen/SoftwareReport.Tools.psm1 @@ -55,11 +55,6 @@ function Get-DockerVersion { return $dockerVersion } -function Get-DockerComposeVersion { - $dockerComposeVersion = docker-compose version --short - return $dockerComposeVersion -} - function Get-DockerComposeVersionV2 { $dockerComposeVersion = docker compose version --short return $dockerComposeVersion diff --git a/images/windows/scripts/tests/Docker.Tests.ps1 b/images/windows/scripts/tests/Docker.Tests.ps1 index d5a325ef8169..7cc4b60ab963 100644 --- a/images/windows/scripts/tests/Docker.Tests.ps1 +++ b/images/windows/scripts/tests/Docker.Tests.ps1 @@ -13,9 +13,6 @@ Describe "Docker" { } Describe "DockerCompose" { - It "docker-compose is installed" { - "docker-compose --version" | Should -ReturnZeroExitCode - } It "docker compose v2" { "docker compose version" | Should -ReturnZeroExitCode From 4e42df172bb2613c5e724e2d87bd57ac5c0a6262 Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Wed, 27 Mar 2024 16:05:36 +0100 Subject: [PATCH 2736/3485] [macos13] Remove Xcode 15.3 (#9575) --- images/macos/toolsets/toolset-13.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/images/macos/toolsets/toolset-13.json b/images/macos/toolsets/toolset-13.json index 384a1ac31143..ff00f9ad7894 100644 --- a/images/macos/toolsets/toolset-13.json +++ b/images/macos/toolsets/toolset-13.json @@ -3,7 +3,6 @@ "default": "15.0.1", "x64": { "versions": [ - { "link": "15.3", "version": "15.3.0+15E204a", "install_runtimes": "true", "sha256": "f13f6a2e2df432c3008e394640b8549a18c285acd7fd148d6c4bac8c3a5af234"}, { "link": "15.2", "version": "15.2.0+15C500b", "install_runtimes": "true", "sha256": "04E93680C6DDBEC84666531BE412DE778AFC8EAC6AB2037F4C2BE7290818B59B"}, { "link": "15.1", "version": "15.1.0+15C65", "install_runtimes": "true", "sha256": "857D8DB537BAC82BF99DE0E1D3895D214D4D02101C1340CEF3DAF6E821BA1D05"}, { "link": "15.0.1", "version": "15.0.1+15A507", "symlinks": ["15.0"], "install_runtimes": "true", "sha256": "5AC17AE6060CAFC3C7112C6DA0B153450BE21F1DE6632777FBA9FBC9D999C9E8"}, @@ -15,7 +14,6 @@ }, "arm64":{ "versions": [ - { "link": "15.3", "version": "15.3.0+15E204a", "install_runtimes": "true", "sha256": "f13f6a2e2df432c3008e394640b8549a18c285acd7fd148d6c4bac8c3a5af234"}, { "link": "15.2", "version": "15.2.0+15C500b", "install_runtimes": "true", "sha256": "04E93680C6DDBEC84666531BE412DE778AFC8EAC6AB2037F4C2BE7290818B59B"}, { "link": "15.1", "version": "15.1.0+15C65", "install_runtimes": "true", "sha256": "857D8DB537BAC82BF99DE0E1D3895D214D4D02101C1340CEF3DAF6E821BA1D05"}, { "link": "15.0.1", "version": "15.0.1+15A507", "symlinks": ["15.0"], "install_runtimes": "true", "sha256": "5AC17AE6060CAFC3C7112C6DA0B153450BE21F1DE6632777FBA9FBC9D999C9E8"}, From f6950e8a95e1479834a45cf440978bb2053c9a7a Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Wed, 27 Mar 2024 17:51:41 +0100 Subject: [PATCH 2737/3485] [Windows] pin zstd to v1.5.5 (#9570) --- images/windows/scripts/build/Install-Zstd.ps1 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/images/windows/scripts/build/Install-Zstd.ps1 b/images/windows/scripts/build/Install-Zstd.ps1 index 20ae3fd2fc1e..f0be73ba5a54 100644 --- a/images/windows/scripts/build/Install-Zstd.ps1 +++ b/images/windows/scripts/build/Install-Zstd.ps1 @@ -3,9 +3,10 @@ ## Desc: Install zstd ################################################################################ +# version newer than v1.5.5 has no windows builds yet $downloadUrl = Resolve-GithubReleaseAssetUrl ` -Repo "facebook/zstd" ` - -Version "latest" ` + -Version "1.5.5" ` -UrlMatchPattern "zstd-*-win64.zip" $zstdArchivePath = Invoke-DownloadWithRetry $downloadUrl $zstdName = [IO.Path]::GetFileNameWithoutExtension($zstdArchivePath) From 1efd43a2c96f299f8adaa71efcc52183c4612938 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 27 Mar 2024 18:00:38 +0000 Subject: [PATCH 2738/3485] Updating readme file for win19 version 20240322.1.1 (#9556) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/windows/Windows2019-Readme.md | 55 ++++++++++++---------------- 1 file changed, 24 insertions(+), 31 deletions(-) diff --git a/images/windows/Windows2019-Readme.md b/images/windows/Windows2019-Readme.md index 8bcdab9fc9f5..ab14213521f6 100644 --- a/images/windows/Windows2019-Readme.md +++ b/images/windows/Windows2019-Readme.md @@ -1,12 +1,6 @@ -| Announcements | -|-| -| [[Ubuntu, Windows] Az Powershell module will be updated to v11.3.1 on March 18](https://github.com/actions/runner-images/issues/9445) | -| [[All OSes] Ruby versions <= 2.7.x will be removed on February, 26](https://github.com/actions/runner-images/issues/9327) | -| [[All OSes] Go 1.19.x will be removed and 1.21.x set as default on February, 26](https://github.com/actions/runner-images/issues/9326) | -*** # Windows Server 2019 - OS Version: 10.0.17763 Build 5576 -- Image Version: 20240317.1.0 +- Image Version: 20240322.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -35,7 +29,7 @@ - pip 24.0 (python 3.7) - Pipx 1.2.1 - RubyGems 3.2.33 -- Vcpkg (build from commit cf4ebef22) +- Vcpkg (build from commit 18e898197) - Yarn 1.22.22 #### Environment variables @@ -54,12 +48,12 @@ - 7zip 23.01 - aria2 1.37.0 - azcopy 10.23.0 -- Bazel 7.1.0 +- Bazel 7.1.1 - Bazelisk 1.19.0 - Bicep 0.26.54 -- Cabal 3.10.2.1 -- CMake 3.28.3 -- CodeQL Action Bundle 2.16.4 +- Cabal 3.10.3.0 +- CMake 3.29.0 +- CodeQL Action Bundle 2.16.5 - Docker 24.0.7 - Docker Compose v1 1.29.2 - Docker Compose v2 2.23.3 @@ -67,7 +61,7 @@ - ghc 9.8.2 - Git 2.44.0.windows.1 - Git LFS 3.4.1 -- Google Cloud CLI 468.0.0 +- Google Cloud CLI 469.0.0 - ImageMagick 7.1.1-29 - InnoSetup 6.2.2 - jq 1.7.1 @@ -80,7 +74,7 @@ - Newman 6.1.2 - NSIS 3.09 - OpenSSL 1.1.1w -- Packer 1.10.0 +- Packer 1.10.2 - Parcel 2.12.0 - Pulumi 3.111.1 - R 4.3.2 @@ -95,19 +89,19 @@ - zstd 1.5.5 ### CLI Tools -- Alibaba Cloud CLI 3.0.199 -- AWS CLI 2.15.30 -- AWS SAM CLI 1.112.0 +- Alibaba Cloud CLI 3.0.200 +- AWS CLI 2.15.31 +- AWS SAM CLI 1.113.0 - AWS Session Manager CLI 1.2.553.0 - Azure CLI 2.58.0 - Azure DevOps CLI extension 1.0.0 - Cloud Foundry CLI 6.53.0 -- GitHub CLI 2.45.0 +- GitHub CLI 2.46.0 ### Rust Tools -- Cargo 1.76.0 -- Rust 1.76.0 -- Rustdoc 1.76.0 +- Cargo 1.77.0 +- Rust 1.77.0 +- Rustdoc 1.77.0 - Rustup 1.27.0 #### Packages @@ -115,15 +109,15 @@ - cargo-audit 0.20.0 - cargo-outdated 0.15.0 - cbindgen 0.26.0 -- Clippy 0.1.76 +- Clippy 0.1.77 - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 122.0.6261.129 -- Chrome Driver 122.0.6261.128 +- Google Chrome 123.0.6312.59 +- Chrome Driver 123.0.6312.58 - Microsoft Edge 122.0.2365.92 -- Microsoft Edge Driver 122.0.2365.92 -- Mozilla Firefox 123.0.1 +- Microsoft Edge Driver 122.0.2365.106 +- Mozilla Firefox 124.0.1 - Gecko Driver 0.34.0 - IE Driver 4.14.0.0 - Selenium server 4.18.0 @@ -459,7 +453,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | ms-biztalk.BizTalk | 3.13.2.0 | | ProBITools.MicrosoftAnalysisServicesModelingProjects | 2.9.18 | | ProBITools.MicrosoftReportProjectsforVisualStudio | 2.6.11 | -| SSIS.SqlServerIntegrationServicesProjects | 4.5 | +| SSIS.SqlServerIntegrationServicesProjects | 4.6 | | VisualStudioClient.MicrosoftVisualStudio2017InstallerProjects | 1.0.2 | | Windows Driver Kit | 10.1.22000.1 | | Windows Driver Kit Visual Studio Extension | 10.0.21381.0 | @@ -510,10 +504,10 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - AzureRM: 2.1.0 (Default), 6.13.1 - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.538 +- AWSPowershell: 4.1.542 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 -- Microsoft.Graph: 2.15.0 +- Microsoft.Graph: 2.16.0 - Pester: 3.4.0, 5.5.0 - PowerShellGet: 1.0.0.1, 2.2.5 - PSScriptAnalyzer: 1.22.0 @@ -532,7 +526,7 @@ All other versions are saved but not installed. | Android Command Line Tools | 8.0 | | Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2 33.0.3<br>32.0.0<br>31.0.0<br>30.0.2 | | Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3) | -| Android SDK Platform-Tools | 35.0.0 | +| Android SDK Platform-Tools | 35.0.1 | | Android Support Repository | 47.0.0 | | CMake | 3.10.2<br>3.18.1<br>3.22.1 | | Google APIs | addon-google_apis-google-21<br>addon-google_apis-google-22<br>addon-google_apis-google-23<br>addon-google_apis-google-24 | @@ -558,4 +552,3 @@ All other versions are saved but not installed. | mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:e15423aa2e5b51384f2edd40ddd1317371fc43f9483ec055989ef5ceb0c627a5 | 2024-03-12 | | mcr.microsoft.com/windows/nanoserver:1809 | sha256:05f991b57e0095d6ea29c4fa7bef9e614c290de030c8e10e40cebc505871f725 | 2024-03-04 | | mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:00cdad01de658d8d64acf052ddaa19c848e6d7edd214f2d8c2fd3da116fa58b2 | 2024-03-04 | - From b3a91f7100397306b70f66e51fc79f3db5858b44 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 27 Mar 2024 18:25:06 +0000 Subject: [PATCH 2739/3485] Updating readme file for ubuntu20 version 20240324.1.1 (#9561) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2004-Readme.md | 66 +++++++++++++++--------------- 1 file changed, 32 insertions(+), 34 deletions(-) diff --git a/images/ubuntu/Ubuntu2004-Readme.md b/images/ubuntu/Ubuntu2004-Readme.md index 6a7feb612747..93e5d43a4f26 100644 --- a/images/ubuntu/Ubuntu2004-Readme.md +++ b/images/ubuntu/Ubuntu2004-Readme.md @@ -1,13 +1,11 @@ | Announcements | |-| -| [[Ubuntu, Windows] Az Powershell module will be updated to v11.3.1 on March 18](https://github.com/actions/runner-images/issues/9445) | -| [[All OSes] Ruby versions <= 2.7.x will be removed on February, 26](https://github.com/actions/runner-images/issues/9327) | -| [[All OSes] Go 1.19.x will be removed and 1.21.x set as default on February, 26](https://github.com/actions/runner-images/issues/9326) | +| [[Ubuntu, Windows] Docker Compose v1 will be removed from images on April, 1](https://github.com/actions/runner-images/issues/9557) | *** # Ubuntu 20.04 - OS Version: 20.04.6 LTS -- Kernel Version: 5.15.0-1058-azure -- Image Version: 20240317.1.0 +- Kernel Version: 5.15.0-1059-azure +- Image Version: 20240324.1.0 - Systemd version: 245.4-4ubuntu3.23 ## Installed Software @@ -35,7 +33,7 @@ ### Package Management - cpan 1.64 - Helm 3.14.3 -- Homebrew 4.2.12 +- Homebrew 4.2.14 - Miniconda 24.1.2 - Npm 10.2.4 - NuGet 6.6.1.2 @@ -43,7 +41,7 @@ - Pip3 20.0.2 - Pipx 1.4.3 - RubyGems 3.1.2 -- Vcpkg (build from commit cf4ebef22) +- Vcpkg (build from commit a34c873a9) - Yarn 1.22.22 #### Environment variables @@ -62,7 +60,7 @@ to accomplish this. ### Project Management - Ant 1.10.7 -- Gradle 8.6 +- Gradle 8.7 - Lerna 8.1.2 - Maven 3.8.8 - Sbt 1.9.9 @@ -71,12 +69,12 @@ to accomplish this. - Ansible 2.13.13 - apt-fast 1.10.0 - AzCopy 10.23.0 - available by `azcopy` and `azcopy10` aliases -- Bazel 7.1.0 +- Bazel 7.1.1 - Bazelisk 1.19.0 - Bicep 0.26.54 - Buildah 1.22.3 -- CMake 3.28.3 -- CodeQL Action Bundle 2.16.4 +- CMake 3.29.0 +- CodeQL Action Bundle 2.16.5 - Docker Amazon ECR Credential Helper 0.7.1 - Docker Compose v1 1.29.2 - Docker Compose v2 2.23.3 @@ -88,7 +86,7 @@ to accomplish this. - Git LFS 3.5.1 - Git-ftp 1.6.0 - Haveged 1.9.1 -- Heroku 8.10.0 +- Heroku 8.11.0 - HHVM (HipHop VM) 4.172.1 - jq 1.6 - Kind 0.22.0 @@ -113,20 +111,20 @@ to accomplish this. - SVN 1.13.0 - Terraform 1.7.5 - yamllint 1.35.1 -- yq 4.42.1 +- yq 4.43.1 - zstd 1.5.5 ### CLI Tools - Alibaba Cloud CLI 3.0.174 -- AWS CLI 2.15.30 +- AWS CLI 2.15.32 - AWS CLI Session Manager Plugin 1.2.553.0 -- AWS SAM CLI 1.112.0 +- AWS SAM CLI 1.113.0 - Azure CLI 2.58.0 - Azure CLI (azure-devops) 1.0.0 -- GitHub CLI 2.45.0 -- Google Cloud CLI 468.0.0 -- Netlify CLI 17.19.4 -- OpenShift CLI 4.15.2 +- GitHub CLI 2.46.0 +- Google Cloud CLI 469.0.0 +- Netlify CLI 17.20.1 +- OpenShift CLI 4.15.3 - ORAS CLI 1.1.0 - Vercel CLI 33.6.1 @@ -147,33 +145,33 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ``` ### Haskell Tools -- Cabal 3.10.2.1 +- Cabal 3.10.3.0 - GHC 9.8.2 - GHCup 0.1.22.0 - Stack 2.15.3 ### Rust Tools -- Cargo 1.76.0 -- Rust 1.76.0 -- Rustdoc 1.76.0 +- Cargo 1.77.0 +- Rust 1.77.0 +- Rustdoc 1.77.0 - Rustup 1.27.0 #### Packages - Bindgen 0.69.4 - Cargo audit 0.20.0 -- Cargo clippy 0.1.76 +- Cargo clippy 0.1.77 - Cargo outdated 0.15.0 - Cbindgen 0.26.0 - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 122.0.6261.128 -- ChromeDriver 122.0.6261.128 -- Chromium 122.0.6261.0 -- Microsoft Edge 122.0.2365.92 -- Microsoft Edge WebDriver 122.0.2365.92 +- Google Chrome 123.0.6312.58 +- ChromeDriver 123.0.6312.58 +- Chromium 123.0.6312.0 +- Microsoft Edge 123.0.2420.53 +- Microsoft Edge WebDriver 123.0.2420.53 - Selenium server 4.18.1 -- Mozilla Firefox 124.0 +- Mozilla Firefox 124.0.1 - Geckodriver 0.34.0 #### Environment variables @@ -228,8 +226,8 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Python - 3.7.17 - 3.8.18 -- 3.9.18 -- 3.10.13 +- 3.9.19 +- 3.10.14 - 3.11.8 - 3.12.2 @@ -251,7 +249,7 @@ Use the following command as a part of your job to start the service: 'sudo syst #### PowerShell Modules - Az: 11.3.1 - MarkdownPS: 1.9 -- Microsoft.Graph: 2.15.0 +- Microsoft.Graph: 2.16.0 - Pester: 5.5.0 - PSScriptAnalyzer: 1.22.0 @@ -293,7 +291,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | debian:10 | sha256:f6b3b7c7b049c2c7d0f19ae988b4eac64fd8e127fa891c9de1d3cf3f8c33cad4 | 2024-03-12 | | debian:11 | sha256:5a87974e73c64b3fb161d444a84bdd47c0e6b6058eacaeea64342e7cbce1f04d | 2024-03-12 | | debian:9 | sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be | 2022-06-23 | -| moby/buildkit:latest | sha256:24fddad8ce5063e822f32df151b5d7c0b060a850e680bed615ccf9162eabf6e3 | 2024-03-05 | +| moby/buildkit:latest | sha256:00d2c6b8f39ae515e0eadd74f39e71a5efdc94321c9b919692a2aa32deef2bb1 | 2024-03-18 | | node:16 | sha256:f77a1aef2da8d83e45ec990f45df50f1a286c5fe8bbfb8c6e4246c6389705c0b | 2023-09-07 | | node:16-alpine | sha256:a1f9d027912b58a7c75be7716c97cfbc6d3099f3a97ed84aa490be9dee20e787 | 2023-08-10 | | node:18 | sha256:b39895225fb1984139d5af76400aff8fac3dd5bc00dd41a3ce22fc8a6cf538d5 | 2024-03-12 | From 07d23cf65fdcdd02899bc6dfe0fbdd8c44172861 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 27 Mar 2024 18:49:13 +0000 Subject: [PATCH 2740/3485] Updating readme file for ubuntu22 version 20240324.2.1 (#9560) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2204-Readme.md | 64 +++++++++++++++--------------- 1 file changed, 31 insertions(+), 33 deletions(-) diff --git a/images/ubuntu/Ubuntu2204-Readme.md b/images/ubuntu/Ubuntu2204-Readme.md index 8a41224caea2..52f10b59d06c 100644 --- a/images/ubuntu/Ubuntu2204-Readme.md +++ b/images/ubuntu/Ubuntu2204-Readme.md @@ -1,13 +1,11 @@ | Announcements | |-| -| [[Ubuntu, Windows] Az Powershell module will be updated to v11.3.1 on March 18](https://github.com/actions/runner-images/issues/9445) | -| [[All OSes] Ruby versions <= 2.7.x will be removed on February, 26](https://github.com/actions/runner-images/issues/9327) | -| [[All OSes] Go 1.19.x will be removed and 1.21.x set as default on February, 26](https://github.com/actions/runner-images/issues/9326) | +| [[Ubuntu, Windows] Docker Compose v1 will be removed from images on April, 1](https://github.com/actions/runner-images/issues/9557) | *** # Ubuntu 22.04 - OS Version: 22.04.4 LTS - Kernel Version: 6.5.0-1016-azure -- Image Version: 20240317.1.0 +- Image Version: 20240324.2.0 - Systemd version: 249.11-0ubuntu3.12 ## Installed Software @@ -33,7 +31,7 @@ ### Package Management - cpan 1.64 - Helm 3.14.3 -- Homebrew 4.2.12 +- Homebrew 4.2.14 - Miniconda 24.1.2 - Npm 10.2.4 - NuGet 6.6.1.2 @@ -41,7 +39,7 @@ - Pip3 22.0.2 - Pipx 1.4.3 - RubyGems 3.3.5 -- Vcpkg (build from commit cf4ebef22) +- Vcpkg (build from commit a34c873a9) - Yarn 1.22.22 #### Environment variables @@ -66,12 +64,12 @@ to accomplish this. - Ansible 2.16.4 - apt-fast 1.10.0 - AzCopy 10.23.0 - available by `azcopy` and `azcopy10` aliases -- Bazel 7.1.0 +- Bazel 7.1.1 - Bazelisk 1.19.0 - Bicep 0.26.54 - Buildah 1.23.1 -- CMake 3.28.3 -- CodeQL Action Bundle 2.16.4 +- CMake 3.29.0 +- CodeQL Action Bundle 2.16.5 - Docker Amazon ECR Credential Helper 0.7.1 - Docker Compose v1 1.29.2 - Docker Compose v2 2.23.3 @@ -83,7 +81,7 @@ to accomplish this. - Git LFS 3.5.1 - Git-ftp 1.6.0 - Haveged 1.9.14 -- Heroku 8.10.0 +- Heroku 8.11.0 - jq 1.6 - Kind 0.22.0 - Kubectl 1.29.3 @@ -106,20 +104,20 @@ to accomplish this. - SVN 1.14.1 - Terraform 1.7.5 - yamllint 1.35.1 -- yq 4.42.1 +- yq 4.43.1 - zstd 1.5.5 ### CLI Tools -- Alibaba Cloud CLI 3.0.199 -- AWS CLI 2.15.30 +- Alibaba Cloud CLI 3.0.200 +- AWS CLI 2.15.32 - AWS CLI Session Manager Plugin 1.2.553.0 -- AWS SAM CLI 1.112.0 +- AWS SAM CLI 1.113.0 - Azure CLI 2.58.0 - Azure CLI (azure-devops) 1.0.0 -- GitHub CLI 2.45.0 -- Google Cloud CLI 468.0.0 -- Netlify CLI 17.19.4 -- OpenShift CLI 4.15.2 +- GitHub CLI 2.46.0 +- Google Cloud CLI 469.0.0 +- Netlify CLI 17.20.1 +- OpenShift CLI 4.15.3 - ORAS CLI 1.1.0 - Vercel CLI 33.6.1 @@ -140,33 +138,33 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ``` ### Haskell Tools -- Cabal 3.10.2.1 +- Cabal 3.10.3.0 - GHC 9.8.2 - GHCup 0.1.22.0 - Stack 2.15.3 ### Rust Tools -- Cargo 1.76.0 -- Rust 1.76.0 -- Rustdoc 1.76.0 +- Cargo 1.77.0 +- Rust 1.77.0 +- Rustdoc 1.77.0 - Rustup 1.27.0 #### Packages - Bindgen 0.69.4 - Cargo audit 0.20.0 -- Cargo clippy 0.1.76 +- Cargo clippy 0.1.77 - Cargo outdated 0.15.0 - Cbindgen 0.26.0 - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 122.0.6261.128 -- ChromeDriver 122.0.6261.128 -- Chromium 122.0.6261.0 -- Microsoft Edge 122.0.2365.92 -- Microsoft Edge WebDriver 122.0.2365.92 +- Google Chrome 123.0.6312.58 +- ChromeDriver 123.0.6312.58 +- Chromium 123.0.6312.0 +- Microsoft Edge 123.0.2420.53 +- Microsoft Edge WebDriver 123.0.2420.53 - Selenium server 4.18.1 -- Mozilla Firefox 124.0 +- Mozilla Firefox 124.0.1 - Geckodriver 0.34.0 #### Environment variables @@ -220,8 +218,8 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Python - 3.7.17 - 3.8.18 -- 3.9.18 -- 3.10.13 +- 3.9.19 +- 3.10.14 - 3.11.8 - 3.12.2 @@ -240,7 +238,7 @@ Use the following command as a part of your job to start the service: 'sudo syst #### PowerShell Modules - Az: 11.3.1 - MarkdownPS: 1.9 -- Microsoft.Graph: 2.15.0 +- Microsoft.Graph: 2.16.0 - Pester: 5.5.0 - PSScriptAnalyzer: 1.22.0 @@ -280,7 +278,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | alpine:3.18 | sha256:11e21d7b981a59554b3f822c49f6e9f57b6068bb74f49c4cd5cc4c663c7e5160 | 2024-01-27 | | debian:10 | sha256:f6b3b7c7b049c2c7d0f19ae988b4eac64fd8e127fa891c9de1d3cf3f8c33cad4 | 2024-03-12 | | debian:11 | sha256:5a87974e73c64b3fb161d444a84bdd47c0e6b6058eacaeea64342e7cbce1f04d | 2024-03-12 | -| moby/buildkit:latest | sha256:24fddad8ce5063e822f32df151b5d7c0b060a850e680bed615ccf9162eabf6e3 | 2024-03-05 | +| moby/buildkit:latest | sha256:00d2c6b8f39ae515e0eadd74f39e71a5efdc94321c9b919692a2aa32deef2bb1 | 2024-03-18 | | node:16 | sha256:f77a1aef2da8d83e45ec990f45df50f1a286c5fe8bbfb8c6e4246c6389705c0b | 2023-09-07 | | node:16-alpine | sha256:a1f9d027912b58a7c75be7716c97cfbc6d3099f3a97ed84aa490be9dee20e787 | 2023-08-10 | | node:18 | sha256:b39895225fb1984139d5af76400aff8fac3dd5bc00dd41a3ce22fc8a6cf538d5 | 2024-03-12 | From e11c4abc897c00915fe9c3480103857035cfa4a3 Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Thu, 28 Mar 2024 17:26:46 +0100 Subject: [PATCH 2741/3485] [macos] Fix composer version parser (#9585) --- images/macos/scripts/docs-gen/SoftwareReport.Common.psm1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/macos/scripts/docs-gen/SoftwareReport.Common.psm1 b/images/macos/scripts/docs-gen/SoftwareReport.Common.psm1 index 0a9df5bab21d..d2996945a9e4 100644 --- a/images/macos/scripts/docs-gen/SoftwareReport.Common.psm1 +++ b/images/macos/scripts/docs-gen/SoftwareReport.Common.psm1 @@ -260,7 +260,7 @@ function Get-RubyGemsVersion { } function Get-ComposerVersion { - $composerVersion = Run-Command "composer --version" | Take-Part -Part 2 + $composerVersion = Run-Command "composer --version" | Select-Object -First 1 | Take-Part -Part 2 return $composerVersion } From 22ff21d8bd2f69bfb77716de95a2531d0869e8ec Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Thu, 28 Mar 2024 18:08:30 +0100 Subject: [PATCH 2742/3485] [macOS] Force curl to use IPv4 (#9586) --- images/macos/assets/bashrc | 1 + images/macos/scripts/build/install-homebrew.sh | 3 +++ 2 files changed, 4 insertions(+) diff --git a/images/macos/assets/bashrc b/images/macos/assets/bashrc index ca021fd78d2d..de4a49d76d10 100644 --- a/images/macos/assets/bashrc +++ b/images/macos/assets/bashrc @@ -28,6 +28,7 @@ export DOTNET_MULTILEVEL_LOOKUP=0 export HOMEBREW_NO_AUTO_UPDATE=1 export HOMEBREW_NO_INSTALL_CLEANUP=1 export HOMEBREW_CASK_OPTS="--no-quarantine" +export HOMEBREW_CURLRC=1 export BOOTSTRAP_HASKELL_NONINTERACTIVE=1 export BOOTSTRAP_HASKELL_INSTALL_NO_STACK_HOOK=1 diff --git a/images/macos/scripts/build/install-homebrew.sh b/images/macos/scripts/build/install-homebrew.sh index 4a72cf2e677d..85482869f431 100644 --- a/images/macos/scripts/build/install-homebrew.sh +++ b/images/macos/scripts/build/install-homebrew.sh @@ -36,6 +36,9 @@ brew_smart_install jq echo "Installing curl..." brew_smart_install curl +echo "Configuring curl to resolve names with IPv4..." +echo '--ipv4' >> ~/.curlrc + echo "Installing wget..." brew_smart_install "wget" From 98d2bcc93e055d8892f9446e72a4da66b334bfb1 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 28 Mar 2024 17:24:29 +0000 Subject: [PATCH 2743/3485] Updating readme file for macos-13 version 20240327.2 (#9580) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-13-Readme.md | 117 +++++++++++++++----------------- 1 file changed, 55 insertions(+), 62 deletions(-) diff --git a/images/macos/macos-13-Readme.md b/images/macos/macos-13-Readme.md index 89eef5c32e0e..aefa6f1c6cf2 100644 --- a/images/macos/macos-13-Readme.md +++ b/images/macos/macos-13-Readme.md @@ -1,19 +1,14 @@ -| Announcements | -|-| -| [[All OSes] Ruby versions <= 2.7.x will be removed on February, 26](https://github.com/actions/runner-images/issues/9327) | -| [[All OSes] Go 1.19.x will be removed and 1.21.x set as default on February, 26](https://github.com/actions/runner-images/issues/9326) | -*** # macOS 13 -- OS Version: macOS 13.6.4 (22G513) +- OS Version: macOS 13.6.5 (22G621) - Kernel Version: Darwin 22.6.0 -- Image Version: 20240219.1 +- Image Version: 20240327.2 ## Installed Software ### Language and Runtime -- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.406, 8.0.101, 8.0.201 +- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.407, 8.0.101, 8.0.203 - Bash 3.2.57(1)-release -- Clang/LLVM 15.0.0 +- Clang/LLVM 14.0.0 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` - GCC 11 (Homebrew GCC 11.4.0) - available by `gcc-11` alias - GCC 12 (Homebrew GCC 12.3.0) - available by `gcc-12` alias @@ -21,83 +16,83 @@ - GNU Fortran 11 (Homebrew GCC 11.4.0) - available by `gfortran-11` alias - GNU Fortran 12 (Homebrew GCC 12.3.0) - available by `gfortran-12` alias - GNU Fortran 13 (Homebrew GCC 13.2.0) - available by `gfortran-13` alias -- Kotlin 1.9.22-release-704 +- Kotlin 1.9.23-release-779 - Mono 6.12.0.188 -- Node.js 20.11.1 +- Node.js 20.12.0 - Perl 5.38.2 -- PHP 8.3.3 +- PHP 8.3.4 - Python3 3.12.2 - Ruby 3.0.6p216 ### Package Management -- Bundler 2.5.6 +- Bundler 2.5.7 - Carthage 0.39.1 - CocoaPods 1.15.2 -- Composer 2.7.1 -- Homebrew 4.2.9 -- NPM 10.2.4 +- Composer "diagnose" +- Homebrew 4.2.15 +- NPM 10.5.0 - NuGet 6.3.1.1 - Pip3 24.0 (python 3.12) - Pipx 1.4.3 -- RubyGems 3.5.6 -- Vcpkg 2024 (build from commit 13bde2ff1) +- RubyGems 3.5.7 +- Vcpkg 2024 (build from commit 3c76dc55f) - Yarn 1.22.19 ### Project Management - Apache Ant 1.10.14 - Apache Maven 3.9.6 -- Gradle 8.6 +- Gradle 8.7 ### Utilities - 7-Zip 17.05 - aria2 1.37.0 -- azcopy 10.23.0 -- bazel 7.0.2 +- azcopy 10.24.0 +- bazel 7.1.1 - bazelisk 1.19.0 - bsdtar 3.5.3 - available by 'tar' alias - Curl 8.6.0 -- Git 2.43.2 -- Git LFS 3.4.1 -- GitHub CLI 2.44.1 +- Git 2.44.0 +- Git LFS 3.5.1 +- GitHub CLI 2.46.0 - GNU Tar 1.35 - available by 'gtar' alias -- GNU Wget 1.21.4 -- gpg (GnuPG) 2.4.4 +- GNU Wget 1.24.5 +- gpg (GnuPG) 2.4.5 - jq 1.7.1 - OpenSSL 1.1.1w 11 Sep 2023 - Packer 1.9.4 - pkg-config 0.29.2 -- yq 4.41.1 -- zstd 1.5.5 +- yq 4.43.1 +- zstd 1.5.6 ### Tools -- AWS CLI 2.15.21 -- AWS SAM CLI 1.109.0 +- AWS CLI 2.15.33 +- AWS SAM CLI 1.113.0 - AWS Session Manager CLI 1.2.553.0 -- Azure CLI 2.57.0 -- Azure CLI (azure-devops) 0.26.0 -- Bicep CLI 0.25.53 -- Cmake 3.28.3 -- CodeQL Action Bundle 2.16.2 +- Azure CLI 2.58.0 +- Azure CLI (azure-devops) 1.0.0 +- Bicep CLI 0.26.54 +- Cmake 3.29.0 +- CodeQL Action Bundle 2.16.5 - Fastlane 2.219.0 -- SwiftFormat 0.53.2 -- Xcbeautify 1.4.0 -- Xcode Command Line Tools 15.1.0.0.1.1700200546 +- SwiftFormat 0.53.5 +- Xcbeautify 2.0.1 +- Xcode Command Line Tools 14.3.1.0.1.1683849156 - Xcodes 1.4.1 ### Linters - SwiftLint 0.53.0 ### Browsers -- Safari 17.3.1 (18617.2.4.11.12) -- SafariDriver 17.3.1 (18617.2.4.11.12) -- Google Chrome 121.0.6167.184 -- Google Chrome for Testing 121.0.6167.184 -- ChromeDriver 121.0.6167.184 -- Microsoft Edge 121.0.2277.128 -- Microsoft Edge WebDriver 121.0.2277.128 -- Mozilla Firefox 122.0.1 +- Safari 17.4 (18618.1.15.111.5) +- SafariDriver 17.4 (18618.1.15.111.5) +- Google Chrome 123.0.6312.87 +- Google Chrome for Testing 123.0.6312.86 +- ChromeDriver 123.0.6312.86 +- Microsoft Edge 123.0.2420.53 +- Microsoft Edge WebDriver 123.0.2420.53 +- Mozilla Firefox 124.0.1 - geckodriver 0.34.0 -- Selenium server 4.17.0 +- Selenium server 4.18.1 #### Environment variables | Name | Value | @@ -129,8 +124,8 @@ #### Python - 3.8.18 -- 3.9.18 -- 3.10.13 +- 3.9.19 +- 3.10.14 - 3.11.8 - 3.12.2 @@ -140,28 +135,27 @@ - 20.11.1 #### Go -- 1.19.13 - 1.20.14 -- 1.21.7 -- 1.22.0 +- 1.21.8 +- 1.22.1 ### Rust Tools -- Cargo 1.76.0 -- Rust 1.76.0 -- Rustdoc 1.76.0 -- Rustup 1.26.0 +- Cargo 1.77.0 +- Rust 1.77.0 +- Rustdoc 1.77.0 +- Rustup 1.27.0 #### Packages -- Clippy 0.1.76 +- Clippy 0.1.77 - Rustfmt 1.7.0-stable ### PowerShell Tools - PowerShell 7.4.1 #### PowerShell Modules -- Az: 11.3.1 +- Az: 11.4.0 - Pester: 5.5.0 -- PSScriptAnalyzer: 1.21.0 +- PSScriptAnalyzer: 1.22.0 ### Xcode | Version | Build | Path | @@ -239,10 +233,10 @@ | Package Name | Version | | -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 11.0 | -| Android Emulator | 33.1.24 | +| Android Emulator | 34.1.19 | | Android SDK Build-tools | 34.0.0<br>33.0.2 33.0.3 | | Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | -| Android SDK Platform-Tools | 35.0.0 | +| Android SDK Platform-Tools | 35.0.1 | | Android Support Repository | 47.0.0 | | CMake | 3.22.1 | | Google Play services | 49 | @@ -258,4 +252,3 @@ | ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/26.2.11394342 | | ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk/26.2.11394342 | | ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | - From 9690ca4c70316da4b7086bfa9f97d8ebea77d60f Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Fri, 29 Mar 2024 11:51:52 +0100 Subject: [PATCH 2744/3485] [Windows] Add WIX binaries folder to the PATH (#9582) * [Windows] Add WIX binaries folder to the PATH * Add Update-Environment, small prettifying * Move tests from script to Pester * Fix Wix tests to use Join-Path --------- Co-authored-by: Leon Zandman <lzandman@github.com> --- images/windows/scripts/build/Install-Wix.ps1 | 6 ++++++ images/windows/scripts/tests/Wix.Tests.ps1 | 13 +++++++++++++ 2 files changed, 19 insertions(+) diff --git a/images/windows/scripts/build/Install-Wix.ps1 b/images/windows/scripts/build/Install-Wix.ps1 index 0fd90bf329df..d94d03da1b09 100644 --- a/images/windows/scripts/build/Install-Wix.ps1 +++ b/images/windows/scripts/build/Install-Wix.ps1 @@ -5,4 +5,10 @@ Install-ChocoPackage wixtoolset -ArgumentList "--force" +Update-Environment +$currentPath = [System.Environment]::GetEnvironmentVariable("PATH", "Machine") +$newPath = $currentPath + ";$(Join-Path -Path $env:WIX -ChildPath "bin")" +[Environment]::SetEnvironmentVariable("PATH", $newPath, "Machine") +Update-Environment + Invoke-PesterTests -TestFile "Wix" diff --git a/images/windows/scripts/tests/Wix.Tests.ps1 b/images/windows/scripts/tests/Wix.Tests.ps1 index 66937f696969..cf6fc2fdf1ba 100644 --- a/images/windows/scripts/tests/Wix.Tests.ps1 +++ b/images/windows/scripts/tests/Wix.Tests.ps1 @@ -8,4 +8,17 @@ Describe "Wix" { It "Wix Toolset version from registry" { $version | Should -Not -BeNullOrEmpty } + + It "Wix variable exists" { + $env:WIX | Should -Not -BeNullOrEmpty + } + + It "Wix binaries folder exists" { + Test-Path -Path $(Join-Path -Path $env:WIX -ChildPath "bin") | Should -Be $true + } + + It "Wix binaries folder is in PATH" { + $testPath = Join-Path -Path $env:WIX -ChildPath "bin" + $env:PATH -split ";" | Should -Contain "$testPath" + } } From f1bb9d76e33f887a0fd11d89a57003ee4a8fe23d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 29 Mar 2024 11:54:43 +0100 Subject: [PATCH 2745/3485] Updating readme file for win22 version 20240322.1.1 (#9555) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/windows/Windows2022-Readme.md | 57 ++++++++++++---------------- 1 file changed, 25 insertions(+), 32 deletions(-) diff --git a/images/windows/Windows2022-Readme.md b/images/windows/Windows2022-Readme.md index 8d6eee10743e..a4e35b31889c 100644 --- a/images/windows/Windows2022-Readme.md +++ b/images/windows/Windows2022-Readme.md @@ -1,12 +1,6 @@ -| Announcements | -|-| -| [[Ubuntu, Windows] Az Powershell module will be updated to v11.3.1 on March 18](https://github.com/actions/runner-images/issues/9445) | -| [[All OSes] Ruby versions <= 2.7.x will be removed on February, 26](https://github.com/actions/runner-images/issues/9327) | -| [[All OSes] Go 1.19.x will be removed and 1.21.x set as default on February, 26](https://github.com/actions/runner-images/issues/9326) | -*** # Windows Server 2022 - OS Version: 10.0.20348 Build 2340 -- Image Version: 20240317.1.0 +- Image Version: 20240322.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -35,7 +29,7 @@ - pip 24.0 (python 3.9) - Pipx 1.4.3 - RubyGems 3.2.33 -- Vcpkg (build from commit cf4ebef22) +- Vcpkg (build from commit 18e898197) - Yarn 1.22.22 #### Environment variables @@ -54,12 +48,12 @@ - 7zip 23.01 - aria2 1.37.0 - azcopy 10.23.0 -- Bazel 7.1.0 +- Bazel 7.1.1 - Bazelisk 1.19.0 - Bicep 0.26.54 -- Cabal 3.10.2.1 -- CMake 3.28.3 -- CodeQL Action Bundle 2.16.4 +- Cabal 3.10.3.0 +- CMake 3.29.0 +- CodeQL Action Bundle 2.16.5 - Docker 24.0.7 - Docker Compose v1 1.29.2 - Docker Compose v2 2.23.3 @@ -79,7 +73,7 @@ - Newman 6.1.2 - NSIS 3.09 - OpenSSL 1.1.1w -- Packer 1.10.0 +- Packer 1.10.2 - Pulumi 3.111.1 - R 4.3.2 - Service Fabric SDK 9.1.1436.9590 @@ -93,18 +87,18 @@ - zstd 1.5.5 ### CLI Tools -- Alibaba Cloud CLI 3.0.199 -- AWS CLI 2.15.30 -- AWS SAM CLI 1.112.0 +- Alibaba Cloud CLI 3.0.200 +- AWS CLI 2.15.31 +- AWS SAM CLI 1.113.0 - AWS Session Manager CLI 1.2.553.0 - Azure CLI 2.58.0 - Azure DevOps CLI extension 1.0.0 -- GitHub CLI 2.45.0 +- GitHub CLI 2.46.0 ### Rust Tools -- Cargo 1.76.0 -- Rust 1.76.0 -- Rustdoc 1.76.0 +- Cargo 1.77.0 +- Rust 1.77.0 +- Rustdoc 1.77.0 - Rustup 1.27.0 #### Packages @@ -112,15 +106,15 @@ - cargo-audit 0.20.0 - cargo-outdated 0.15.0 - cbindgen 0.26.0 -- Clippy 0.1.76 +- Clippy 0.1.77 - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 122.0.6261.129 -- Chrome Driver 122.0.6261.128 +- Google Chrome 123.0.6312.59 +- Chrome Driver 123.0.6312.58 - Microsoft Edge 122.0.2365.92 -- Microsoft Edge Driver 122.0.2365.92 -- Mozilla Firefox 123.0.1 +- Microsoft Edge Driver 122.0.2365.106 +- Mozilla Firefox 124.0.1 - Gecko Driver 0.34.0 - IE Driver 4.14.0.0 - Selenium server 4.18.0 @@ -222,9 +216,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Nginx | 1.25.4 | C:\tools\nginx-1.25.4\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2022 -| Name | Version | Path | -| ----------------------------- | ------------- | -------------------------------------------------------- | -| Visual Studio Enterprise 2022 | 17.9.34701.34 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | +| Name | Version | Path | +| ----------------------------- | -------------- | -------------------------------------------------------- | +| Visual Studio Enterprise 2022 | 17.9.34714.143 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | #### Workloads, components and extensions | Package | Version | @@ -566,10 +560,10 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - AzureRM: 2.1.0 (Default), 6.13.1 - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.538 +- AWSPowershell: 4.1.542 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 -- Microsoft.Graph: 2.15.0 +- Microsoft.Graph: 2.16.0 - Pester: 3.4.0, 5.5.0 - PowerShellGet: 1.0.0.1, 2.2.5 - PSScriptAnalyzer: 1.22.0 @@ -589,7 +583,7 @@ All other versions are saved but not installed. | Android Emulator | 31.2.9 | | Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2 33.0.3<br>32.0.0<br>31.0.0 | | Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1) | -| Android SDK Platform-Tools | 35.0.0 | +| Android SDK Platform-Tools | 35.0.1 | | Android Support Repository | 47.0.0 | | CMake | 3.18.1<br>3.22.1 | | Google Play services | 49 | @@ -614,4 +608,3 @@ All other versions are saved but not installed. | mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:76d2dd2054a18f47d9c690f9d0047e319d7b68aa4e72ee7aae46e3637042c165 | 2024-03-12 | | mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:6e6053f0358f9522d2d14693f9bc152f47fe04c82c53dc8c6d127a5a823c8720 | 2024-03-05 | | mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:6b8781cab588a2858d1aba2c5d5456e79c823e04d666d59d0732dab1273dc8fb | 2024-03-05 | - From 9ce28c1d125373291b3a1542a2d3e175dbff8b39 Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Fri, 29 Mar 2024 22:17:15 +0100 Subject: [PATCH 2746/3485] Revert "[Windows] pin zstd to v1.5.5 (#9570)" (#9589) This reverts commit f6950e8a95e1479834a45cf440978bb2053c9a7a. --- images/windows/scripts/build/Install-Zstd.ps1 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/images/windows/scripts/build/Install-Zstd.ps1 b/images/windows/scripts/build/Install-Zstd.ps1 index f0be73ba5a54..20ae3fd2fc1e 100644 --- a/images/windows/scripts/build/Install-Zstd.ps1 +++ b/images/windows/scripts/build/Install-Zstd.ps1 @@ -3,10 +3,9 @@ ## Desc: Install zstd ################################################################################ -# version newer than v1.5.5 has no windows builds yet $downloadUrl = Resolve-GithubReleaseAssetUrl ` -Repo "facebook/zstd" ` - -Version "1.5.5" ` + -Version "latest" ` -UrlMatchPattern "zstd-*-win64.zip" $zstdArchivePath = Invoke-DownloadWithRetry $downloadUrl $zstdName = [IO.Path]::GetFileNameWithoutExtension($zstdArchivePath) From 65e1bb9ff5ff4c6c44aa804bc416ac09139f2ec3 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 1 Apr 2024 10:15:22 +0000 Subject: [PATCH 2747/3485] Updating readme file for macos-14 version 20240325.1 (#9578) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-14-Readme.md | 143 +++++++++++++++++--------------- 1 file changed, 75 insertions(+), 68 deletions(-) diff --git a/images/macos/macos-14-Readme.md b/images/macos/macos-14-Readme.md index 3ef0bcfa1065..89193da99072 100644 --- a/images/macos/macos-14-Readme.md +++ b/images/macos/macos-14-Readme.md @@ -1,19 +1,14 @@ -| Announcements | -|-| -| [[All OSes] Ruby versions <= 2.7.x will be removed on February, 26](https://github.com/actions/runner-images/issues/9327) | -| [[All OSes] Go 1.19.x will be removed and 1.21.x set as default on February, 26](https://github.com/actions/runner-images/issues/9326) | -*** # macOS 14 -- OS Version: macOS 14.3.1 (23D60) -- Kernel Version: Darwin 23.3.0 -- Image Version: 20240219.1 +- OS Version: macOS 14.4 (23E214) +- Kernel Version: Darwin 23.4.0 +- Image Version: 20240325.1 ## Installed Software ### Language and Runtime -- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.406, 8.0.101, 8.0.201 +- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.407, 8.0.101, 8.0.203 - Bash 3.2.57(1)-release -- Clang/LLVM 15.0.0 +- Clang/LLVM 14.0.3 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` - GCC 11 (Homebrew GCC 11.4.0) - available by `gcc-11` alias - GCC 12 (Homebrew GCC 12.3.0) - available by `gcc-12` alias @@ -21,83 +16,82 @@ - GNU Fortran 11 (Homebrew GCC 11.4.0) - available by `gfortran-11` alias - GNU Fortran 12 (Homebrew GCC 12.3.0) - available by `gfortran-12` alias - GNU Fortran 13 (Homebrew GCC 13.2.0) - available by `gfortran-13` alias -- Kotlin 1.9.22-release-704 +- Kotlin 1.9.23-release-779 - Mono 6.12.0.188 - Node.js 20.11.1 - Perl 5.38.2 -- PHP 8.3.3 +- PHP 8.3.4 - Python3 3.12.2 - Ruby 3.0.6p216 ### Package Management -- Bundler 2.5.6 +- Bundler 2.5.7 - Carthage 0.39.1 - CocoaPods 1.15.2 -- Composer 2.7.1 -- Homebrew 4.2.9 +- Composer "diagnose" +- Homebrew 4.2.15 - NPM 10.2.4 - NuGet 6.3.1.1 - Pip3 24.0 (python 3.12) - Pipx 1.4.3 -- RubyGems 3.5.6 -- Vcpkg 2024 (build from commit 13bde2ff1) +- RubyGems 3.5.7 - Yarn 1.22.19 ### Project Management - Apache Ant 1.10.14 - Apache Maven 3.9.6 -- Gradle 8.6 +- Gradle 8.7 ### Utilities - 7-Zip 17.05 - aria2 1.37.0 - azcopy 10.23.0 -- bazel 7.0.2 +- bazel 7.1.1 - bazelisk 1.19.0 - bsdtar 3.5.3 - available by 'tar' alias - Curl 8.6.0 -- Git 2.43.2 -- Git LFS 3.4.1 -- GitHub CLI 2.44.1 +- Git 2.44.0 +- Git LFS 3.5.1 +- GitHub CLI 2.46.0 - GNU Tar 1.35 - available by 'gtar' alias -- GNU Wget 1.21.4 -- gpg (GnuPG) 2.4.4 +- GNU Wget 1.24.5 +- gpg (GnuPG) 2.4.5 - jq 1.7.1 - OpenSSL 1.1.1w 11 Sep 2023 - Packer 1.9.4 - pkg-config 0.29.2 -- yq 4.41.1 +- yq 4.43.1 - zstd 1.5.5 ### Tools -- AWS CLI 2.15.21 -- AWS SAM CLI 1.109.0 +- AWS CLI 2.15.32 +- AWS SAM CLI 1.113.0 - AWS Session Manager CLI 1.2.553.0 -- Azure CLI 2.57.0 -- Azure CLI (azure-devops) 0.26.0 -- Bicep CLI 0.25.53 -- Cmake 3.28.3 -- CodeQL Action Bundle 2.16.2 +- Azure CLI 2.58.0 +- Azure CLI (azure-devops) 1.0.0 +- Bicep CLI 0.26.54 +- Cmake 3.29.0 +- CodeQL Action Bundle 2.16.5 - Fastlane 2.219.0 -- SwiftFormat 0.53.2 -- Xcbeautify 1.4.0 -- Xcode Command Line Tools 15.1.0.0.1.1700200546 +- SwiftFormat 0.53.5 +- Xcbeautify 2.0.1 +- Xcode Command Line Tools 15.3.0.0.1.1708646388 - Xcodes 1.4.1 ### Linters - SwiftLint 0.53.0 ### Browsers -- Safari 17.3.1 (19617.2.4.11.12) -- SafariDriver 17.3.1 (19617.2.4.11.12) -- Google Chrome 121.0.6167.184 -- Google Chrome for Testing 121.0.6167.184 -- ChromeDriver 121.0.6167.184 -- Microsoft Edge 121.0.2277.128 -- Microsoft Edge WebDriver 121.0.2277.128 -- Mozilla Firefox 122.0.1 +- Safari 17.4 (19618.1.15.11.12) +- SafariDriver 17.4 (19618.1.15.11.12) +- Google Chrome 123.0.6312.59 +- Google Chrome for Testing 123.0.6312.58 +- ChromeDriver 123.0.6312.58 +- Microsoft Edge 123.0.2420.53 +- Microsoft Edge WebDriver 123.0.2420.53 +- Mozilla Firefox 124.0.1 - geckodriver 0.34.0 -- Selenium server 4.17.0 +- Selenium server 4.18.1 #### Environment variables | Name | Value | @@ -130,30 +124,31 @@ #### Go - 1.20.14 -- 1.21.7 -- 1.22.0 +- 1.21.8 +- 1.22.1 ### Rust Tools -- Cargo 1.76.0 -- Rust 1.76.0 -- Rustdoc 1.76.0 -- Rustup 1.26.0 +- Cargo 1.77.0 +- Rust 1.77.0 +- Rustdoc 1.77.0 +- Rustup 1.27.0 #### Packages -- Clippy 0.1.76 +- Clippy 0.1.77 - Rustfmt 1.7.0-stable ### PowerShell Tools - PowerShell 7.4.1 #### PowerShell Modules -- Az: 11.3.1 +- Az: 11.4.0 - Pester: 5.5.0 -- PSScriptAnalyzer: 1.21.0 +- PSScriptAnalyzer: 1.22.0 ### Xcode | Version | Build | Path | | ---------------- | ------- | ------------------------------ | +| 15.3 | 15E204a | /Applications/Xcode_15.3.app | | 15.2 | 15C500b | /Applications/Xcode_15.2.app | | 15.1 | 15C65 | /Applications/Xcode_15.1.app | | 15.0.1 (default) | 15A507 | /Applications/Xcode_15.0.1.app | @@ -165,54 +160,67 @@ | macOS 13.3 | macosx13.3 | 14.3.1 | | macOS 14.0 | macosx14.0 | 15.0.1 | | macOS 14.2 | macosx14.2 | 15.1, 15.2 | +| macOS 14.4 | macosx14.4 | 15.3 | | iOS 16.4 | iphoneos16.4 | 14.3.1 | | iOS 17.0 | iphoneos17.0 | 15.0.1 | | iOS 17.2 | iphoneos17.2 | 15.1, 15.2 | +| iOS 17.4 | iphoneos17.4 | 15.3 | | Simulator - iOS 16.4 | iphonesimulator16.4 | 14.3.1 | | Simulator - iOS 17.0 | iphonesimulator17.0 | 15.0.1 | | Simulator - iOS 17.2 | iphonesimulator17.2 | 15.1, 15.2 | +| Simulator - iOS 17.4 | iphonesimulator17.4 | 15.3 | | tvOS 16.4 | appletvos16.4 | 14.3.1 | | tvOS 17.0 | appletvos17.0 | 15.0.1 | | tvOS 17.2 | appletvos17.2 | 15.1, 15.2 | +| tvOS 17.4 | appletvos17.4 | 15.3 | | Simulator - tvOS 16.4 | appletvsimulator16.4 | 14.3.1 | | Simulator - tvOS 17.0 | appletvsimulator17.0 | 15.0.1 | | Simulator - tvOS 17.2 | appletvsimulator17.2 | 15.1, 15.2 | +| Simulator - tvOS 17.4 | appletvsimulator17.4 | 15.3 | | watchOS 9.4 | watchos9.4 | 14.3.1 | | watchOS 10.0 | watchos10.0 | 15.0.1 | | watchOS 10.2 | watchos10.2 | 15.1, 15.2 | +| watchOS 10.4 | watchos10.4 | 15.3 | | Simulator - watchOS 9.4 | watchsimulator9.4 | 14.3.1 | | Simulator - watchOS 10.0 | watchsimulator10.0 | 15.0.1 | | Simulator - watchOS 10.2 | watchsimulator10.2 | 15.1, 15.2 | +| Simulator - watchOS 10.4 | watchsimulator10.4 | 15.3 | | Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | | visionOS 1.0 | xros1.0 | 15.2 | +| Simulator - visionOS 1.1 | xrsimulator1.1 | 15.3 | +| visionOS 1.1 | xros1.1 | 15.3 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | -| Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | +| Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | DriverKit 22.4 | driverkit22.4 | 14.3.1 | | DriverKit 23.0 | driverkit23.0 | 15.0.1 | | DriverKit 23.2 | driverkit23.2 | 15.1, 15.2 | +| DriverKit 23.4 | driverkit23.4 | 15.3 | #### Installed Simulators -| OS | Xcode Version | Simulators | -| ------------ | -------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| iOS 16.4 | 14.3.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 17.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 17.2 | 14.3.1<br>15.0.1<br>15.1<br>15.2 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| tvOS 16.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 17.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 17.2 | 14.3.1<br>15.0.1<br>15.1<br>15.2 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| watchOS 9.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | -| watchOS 10.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | -| watchOS 10.2 | 14.3.1<br>15.0.1<br>15.1<br>15.2 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | +| OS | Xcode Version | Simulators | +| ------------ | ---------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| iOS 16.4 | 14.3.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 17.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 17.2 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 17.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| tvOS 16.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 17.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 17.2 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 17.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| watchOS 9.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | +| watchOS 10.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 10.2 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 10.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | ### Android | Package Name | Version | | -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 11.0 | -| Android Emulator | 33.1.24 | +| Android Emulator | 34.1.19 | | Android SDK Build-tools | 34.0.0<br>33.0.2 33.0.3 | | Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | -| Android SDK Platform-Tools | 35.0.0 | +| Android SDK Platform-Tools | 35.0.1 | | Android Support Repository | 47.0.0 | | CMake | 3.22.1 | | Google Play services | 49 | @@ -228,4 +236,3 @@ | ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/26.2.11394342 | | ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk/26.2.11394342 | | ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | - From 41ad29f9c97a8550b829f13607098a0ec8d565cd Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Mon, 1 Apr 2024 15:55:42 +0200 Subject: [PATCH 2748/3485] [ubuntu] Fix arch in Install-Toolset.ps1 (#9598) --- images/ubuntu/scripts/build/Install-Toolset.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/ubuntu/scripts/build/Install-Toolset.ps1 b/images/ubuntu/scripts/build/Install-Toolset.ps1 index 6c53b6089aaf..2ebec67e2f43 100644 --- a/images/ubuntu/scripts/build/Install-Toolset.ps1 +++ b/images/ubuntu/scripts/build/Install-Toolset.ps1 @@ -39,7 +39,7 @@ foreach ($tool in $tools) { foreach ($toolVersion in $tool.versions) { $asset = $assets | Where-Object version -like $toolVersion ` | Select-Object -ExpandProperty files ` - | Where-Object { ($_.platform -eq $tool.platform) -and ($_.platform_version -eq $tool.platform_version)} ` + | Where-Object { ($_.platform -eq $tool.platform) -and ($_.arch -eq $tool.arch) -and ($_.platform_version -eq $tool.platform_version)} ` | Select-Object -First 1 if (-not $asset) { From 2fd9adccce8acd226d394935c55b8a932b04d315 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 2 Apr 2024 09:03:01 +0000 Subject: [PATCH 2749/3485] Updating readme file for macos-14-arm64 version 20240325.1 (#9579) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-14-arm64-Readme.md | 140 ++++++++++++++------------ 1 file changed, 76 insertions(+), 64 deletions(-) diff --git a/images/macos/macos-14-arm64-Readme.md b/images/macos/macos-14-arm64-Readme.md index 54a3807fbc9e..550b4e859807 100644 --- a/images/macos/macos-14-arm64-Readme.md +++ b/images/macos/macos-14-arm64-Readme.md @@ -1,19 +1,14 @@ -| Announcements | -|-| -| [[All OSes] Ruby versions <= 2.7.x will be removed on February, 26](https://github.com/actions/runner-images/issues/9327) | -| [[All OSes] Go 1.19.x will be removed and 1.21.x set as default on February, 26](https://github.com/actions/runner-images/issues/9326) | -*** # macOS 14 -- OS Version: macOS 14.3.1 (23D60) -- Kernel Version: Darwin 23.3.0 -- Image Version: 20240219.1 +- OS Version: macOS 14.4 (23E214) +- Kernel Version: Darwin 23.4.0 +- Image Version: 20240325.1 ## Installed Software ### Language and Runtime -- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.406, 8.0.101, 8.0.201 +- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.407, 8.0.101, 8.0.203 - Bash 3.2.57(1)-release -- Clang/LLVM 15.0.0 +- Clang/LLVM 14.0.3 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` - GCC 11 (Homebrew GCC 11.4.0) - available by `gcc-11` alias - GCC 12 (Homebrew GCC 12.3.0) - available by `gcc-12` alias @@ -21,72 +16,75 @@ - GNU Fortran 11 (Homebrew GCC 11.4.0) - available by `gfortran-11` alias - GNU Fortran 12 (Homebrew GCC 12.3.0) - available by `gfortran-12` alias - GNU Fortran 13 (Homebrew GCC 13.2.0) - available by `gfortran-13` alias -- Kotlin 1.9.22-release-704 +- Kotlin 1.9.23-release-779 - Mono 6.12.0.188 - Node.js 20.11.1 - Perl 5.38.2 +- Python3 3.12.2 - Ruby 3.0.6p216 ### Package Management -- Bundler 2.5.6 +- Bundler 2.5.7 - Carthage 0.39.1 - CocoaPods 1.15.2 -- Homebrew 4.2.9 +- Homebrew 4.2.15 - NPM 10.2.4 - NuGet 6.3.1.1 -- RubyGems 3.5.6 +- Pip3 24.0 (python 3.12) +- Pipx 1.4.3 +- RubyGems 3.5.7 - Yarn 1.22.19 ### Project Management - Apache Ant 1.10.14 - Apache Maven 3.9.6 -- Gradle 8.6 +- Gradle 8.7 ### Utilities - 7-Zip 17.05 - aria2 1.37.0 - azcopy 10.23.0 -- bazel 7.0.2 +- bazel 7.1.1 - bazelisk 1.19.0 - bsdtar 3.5.3 - available by 'tar' alias - Curl 8.4.0 -- Git 2.43.2 -- Git LFS 3.4.1 -- GitHub CLI 2.44.1 +- Git 2.44.0 +- Git LFS 3.5.1 +- GitHub CLI 2.46.0 - GNU Tar 1.35 - available by 'gtar' alias -- GNU Wget 1.21.4 -- gpg (GnuPG) 2.4.4 +- GNU Wget 1.24.5 +- gpg (GnuPG) 2.4.5 - jq 1.7.1 - OpenSSL 1.1.1w 11 Sep 2023 - Packer 1.9.4 - pkg-config 0.29.2 -- yq 4.41.1 +- yq 4.43.1 - zstd 1.5.5 ### Tools -- AWS CLI 2.15.21 -- AWS SAM CLI 1.109.0 +- AWS CLI 2.15.32 +- AWS SAM CLI 1.113.0 - AWS Session Manager CLI 1.2.553.0 -- Azure CLI 2.57.0 -- Azure CLI (azure-devops) 0.26.0 -- Bicep CLI 0.25.53 -- Cmake 3.28.3 -- CodeQL Action Bundle 2.16.2 +- Azure CLI 2.58.0 +- Azure CLI (azure-devops) 1.0.0 +- Bicep CLI 0.26.54 +- Cmake 3.29.0 +- CodeQL Action Bundle 2.16.5 - Fastlane 2.219.0 -- SwiftFormat 0.53.2 -- Xcbeautify 1.4.0 -- Xcode Command Line Tools 15.1.0.0.1.1700200546 +- SwiftFormat 0.53.5 +- Xcbeautify 2.0.1 +- Xcode Command Line Tools 15.3.0.0.1.1708646388 - Xcodes 1.4.1 ### Linters ### Browsers -- Safari 17.3.1 (19617.2.4.11.12) -- SafariDriver 17.3.1 (19617.2.4.11.12) -- Google Chrome 121.0.6167.184 -- Google Chrome for Testing 121.0.6167.184 -- ChromeDriver 121.0.6167.184 -- Selenium server 4.17.0 +- Safari 17.4 (19618.1.15.11.12) +- SafariDriver 17.4 (19618.1.15.11.12) +- Google Chrome 123.0.6312.59 +- Google Chrome for Testing 123.0.6312.58 +- ChromeDriver 123.0.6312.58 +- Selenium server 4.18.1 #### Environment variables | Name | Value | @@ -114,30 +112,31 @@ #### Go - 1.20.14 -- 1.21.7 -- 1.22.0 +- 1.21.8 +- 1.22.1 ### Rust Tools -- Cargo 1.76.0 -- Rust 1.76.0 -- Rustdoc 1.76.0 -- Rustup 1.26.0 +- Cargo 1.77.0 +- Rust 1.77.0 +- Rustdoc 1.77.0 +- Rustup 1.27.0 #### Packages -- Clippy 0.1.76 +- Clippy 0.1.77 - Rustfmt 1.7.0-stable ### PowerShell Tools - PowerShell 7.4.1 #### PowerShell Modules -- Az: 11.3.1 +- Az: 11.4.0 - Pester: 5.5.0 -- PSScriptAnalyzer: 1.21.0 +- PSScriptAnalyzer: 1.22.0 ### Xcode | Version | Build | Path | | ---------------- | ------- | ------------------------------ | +| 15.3 | 15E204a | /Applications/Xcode_15.3.app | | 15.2 | 15C500b | /Applications/Xcode_15.2.app | | 15.1 | 15C65 | /Applications/Xcode_15.1.app | | 15.0.1 (default) | 15A507 | /Applications/Xcode_15.0.1.app | @@ -149,55 +148,69 @@ | macOS 13.3 | macosx13.3 | 14.3.1 | | macOS 14.0 | macosx14.0 | 15.0.1 | | macOS 14.2 | macosx14.2 | 15.1, 15.2 | +| macOS 14.4 | macosx14.4 | 15.3 | | iOS 16.4 | iphoneos16.4 | 14.3.1 | | iOS 17.0 | iphoneos17.0 | 15.0.1 | | iOS 17.2 | iphoneos17.2 | 15.1, 15.2 | +| iOS 17.4 | iphoneos17.4 | 15.3 | | Simulator - iOS 16.4 | iphonesimulator16.4 | 14.3.1 | | Simulator - iOS 17.0 | iphonesimulator17.0 | 15.0.1 | | Simulator - iOS 17.2 | iphonesimulator17.2 | 15.1, 15.2 | +| Simulator - iOS 17.4 | iphonesimulator17.4 | 15.3 | | tvOS 16.4 | appletvos16.4 | 14.3.1 | | tvOS 17.0 | appletvos17.0 | 15.0.1 | | tvOS 17.2 | appletvos17.2 | 15.1, 15.2 | +| tvOS 17.4 | appletvos17.4 | 15.3 | | Simulator - tvOS 16.4 | appletvsimulator16.4 | 14.3.1 | | Simulator - tvOS 17.0 | appletvsimulator17.0 | 15.0.1 | | Simulator - tvOS 17.2 | appletvsimulator17.2 | 15.1, 15.2 | +| Simulator - tvOS 17.4 | appletvsimulator17.4 | 15.3 | | watchOS 9.4 | watchos9.4 | 14.3.1 | | watchOS 10.0 | watchos10.0 | 15.0.1 | | watchOS 10.2 | watchos10.2 | 15.1, 15.2 | +| watchOS 10.4 | watchos10.4 | 15.3 | | Simulator - watchOS 9.4 | watchsimulator9.4 | 14.3.1 | | Simulator - watchOS 10.0 | watchsimulator10.0 | 15.0.1 | | Simulator - watchOS 10.2 | watchsimulator10.2 | 15.1, 15.2 | -| visionOS 1.0 | xros1.0 | 15.2 | +| Simulator - watchOS 10.4 | watchsimulator10.4 | 15.3 | | Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | +| visionOS 1.0 | xros1.0 | 15.2 | +| Simulator - visionOS 1.1 | xrsimulator1.1 | 15.3 | +| visionOS 1.1 | xros1.1 | 15.3 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | -| Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | +| Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | DriverKit 22.4 | driverkit22.4 | 14.3.1 | | DriverKit 23.0 | driverkit23.0 | 15.0.1 | | DriverKit 23.2 | driverkit23.2 | 15.1, 15.2 | +| DriverKit 23.4 | driverkit23.4 | 15.3 | #### Installed Simulators -| OS | Xcode Version | Simulators | -| ------------ | -------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| iOS 16.4 | 14.3.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 17.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 17.2 | 14.3.1<br>15.0.1<br>15.1<br>15.2 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| tvOS 16.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 17.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 17.2 | 14.3.1<br>15.0.1<br>15.1<br>15.2 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| watchOS 9.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | -| watchOS 10.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | -| watchOS 10.2 | 14.3.1<br>15.0.1<br>15.1<br>15.2 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | -| visionOS 1.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2 | Apple Vision Pro | +| OS | Xcode Version | Simulators | +| ------------ | ---------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| iOS 16.4 | 14.3.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 17.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 17.2 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 17.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| tvOS 16.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 17.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 17.2 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 17.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| watchOS 9.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | +| watchOS 10.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 10.2 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 10.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | +| visionOS 1.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3 | Apple Vision Pro | +| visionOS 1.1 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3 | Apple Vision Pro | ### Android | Package Name | Version | | -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 11.0 | -| Android Emulator | 33.1.24 | +| Android Emulator | 34.1.19 | | Android SDK Build-tools | 34.0.0<br>33.0.2 33.0.3 | | Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | -| Android SDK Platform-Tools | 35.0.0 | +| Android SDK Platform-Tools | 35.0.1 | | Android Support Repository | 47.0.0 | | CMake | 3.22.1 | | Google Play services | 49 | @@ -213,4 +226,3 @@ | ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/26.2.11394342 | | ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk/26.2.11394342 | | ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | - From d9a35acaebd4ad28b41774342a486005927f50ff Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Tue, 2 Apr 2024 16:38:16 +0200 Subject: [PATCH 2750/3485] [Windows] Fix outdated Azure CLI installer signature (#9611) --- images/windows/scripts/build/Install-AzureCli.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/windows/scripts/build/Install-AzureCli.ps1 b/images/windows/scripts/build/Install-AzureCli.ps1 index 47a24319bf4d..35fdc478229a 100644 --- a/images/windows/scripts/build/Install-AzureCli.ps1 +++ b/images/windows/scripts/build/Install-AzureCli.ps1 @@ -15,7 +15,7 @@ New-Item -ItemType 'Directory' -Path $azureCliExtensionPath | Out-Null Install-Binary -Type MSI ` -Url 'https://aka.ms/installazurecliwindowsx64' ` - -ExpectedSignature 'C2048FB509F1C37A8C3E9EC6648118458AA01780' + -ExpectedSignature 'F9A7CF9FBE13BAC767F4781061332DA6E8B4E0EE' Update-Environment From da5ebb36223a06890092a423a0466b28ea2de595 Mon Sep 17 00:00:00 2001 From: Steve-Glass <84886334+Steve-Glass@users.noreply.github.com> Date: Tue, 2 Apr 2024 11:25:44 -0400 Subject: [PATCH 2751/3485] Update README.md (#9601) macOS 14 GA changes --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index d48f595e2ade..ad4756bcea74 100644 --- a/README.md +++ b/README.md @@ -23,11 +23,11 @@ To build a VM machine from this repo's source, see the [instructions](docs/creat | --------------------|---------------------|--------------------|--------------------| | Ubuntu 22.04 | `ubuntu-latest` or `ubuntu-22.04` | [ubuntu-22.04] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fmikhailkoliada%2F35b243dd6e217d041fe3dfa5b4e2e2ed%2Fraw%2Fubuntu22.json) | | Ubuntu 20.04 | `ubuntu-20.04` | [ubuntu-20.04] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fmikhailkoliada%2F35b243dd6e217d041fe3dfa5b4e2e2ed%2Fraw%2Fubuntu20.json) | -| macOS 14 [beta] | `macos-14-large`| [macOS-14] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fmikhailkoliada%2F35b243dd6e217d041fe3dfa5b4e2e2ed%2Fraw%2Fmacos-14.json) | -| macOS 14 Arm64 [beta] | `macos-14` or `macos-14-xlarge`| [macOS-14-arm64] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fmikhailkoliada%2F35b243dd6e217d041fe3dfa5b4e2e2ed%2Fraw%2Fmacos-14-arm64.json) | -| macOS 13 | `macos-13`, `macos-13-large` or `macos-latest-large` | [macOS-13] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fmikhailkoliada%2F35b243dd6e217d041fe3dfa5b4e2e2ed%2Fraw%2Fmacos-13.json) | -| macOS 13 Arm64 | `macos-13-xlarge` or `macos-latest-xlarge` | [macOS-13-arm64] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fmikhailkoliada%2F35b243dd6e217d041fe3dfa5b4e2e2ed%2Fraw%2Fmacos-13-arm64.json) | -| macOS 12 | `macos-latest`,`macos-12` or`macos-12-large`| [macOS-12] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fmikhailkoliada%2F35b243dd6e217d041fe3dfa5b4e2e2ed%2Fraw%2FmacOS-12.json) | +| macOS 14 | `macos-latest-large` or `macos-14-large`| [macOS-14] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fmikhailkoliada%2F35b243dd6e217d041fe3dfa5b4e2e2ed%2Fraw%2Fmacos-14.json) | +| macOS 14 Arm64 |`macos-latest`, `macos-14`, `macos-latest-xlarge` or `macos-14-xlarge`| [macOS-14-arm64] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fmikhailkoliada%2F35b243dd6e217d041fe3dfa5b4e2e2ed%2Fraw%2Fmacos-14-arm64.json) | +| macOS 13 | `macos-13` or `macos-13-large` | [macOS-13] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fmikhailkoliada%2F35b243dd6e217d041fe3dfa5b4e2e2ed%2Fraw%2Fmacos-13.json) | +| macOS 13 Arm64 | `macos-13-xlarge` | [macOS-13-arm64] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fmikhailkoliada%2F35b243dd6e217d041fe3dfa5b4e2e2ed%2Fraw%2Fmacos-13-arm64.json) | +| macOS 12 | `macos-12` or `macos-12-large`| [macOS-12] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fmikhailkoliada%2F35b243dd6e217d041fe3dfa5b4e2e2ed%2Fraw%2FmacOS-12.json) | | macOS 11 [deprecated] | `macos-11`| [macOS-11] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fmikhailkoliada%2F35b243dd6e217d041fe3dfa5b4e2e2ed%2Fraw%2FmacOS-11.json) | | Windows Server 2022 | `windows-latest` or `windows-2022` | [windows-2022] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fmikhailkoliada%2F35b243dd6e217d041fe3dfa5b4e2e2ed%2Fraw%2Fwin22.json) | | Windows Server 2019 | `windows-2019` | [windows-2019] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fmikhailkoliada%2F35b243dd6e217d041fe3dfa5b4e2e2ed%2Fraw%2Fwin19.json) | From dafa29286054c13d623a2253afb34a8835efc41a Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Tue, 2 Apr 2024 23:37:28 +0200 Subject: [PATCH 2752/3485] [Windows] Force Resolve-ChocoPackageVersion function to use CLI (#9605) --- images/windows/scripts/helpers/ChocoHelpers.ps1 | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/images/windows/scripts/helpers/ChocoHelpers.ps1 b/images/windows/scripts/helpers/ChocoHelpers.ps1 index 7332d0e131eb..610aee8fba35 100644 --- a/images/windows/scripts/helpers/ChocoHelpers.ps1 +++ b/images/windows/scripts/helpers/ChocoHelpers.ps1 @@ -77,13 +77,12 @@ function Resolve-ChocoPackageVersion { [string] $TargetVersion ) - $versionNumbers = $TargetVersion.Split(".") - [int] $versionNumbers[-1] += 1 - $incrementedVersion = $versionNumbers -join "." - $filterQuery = "`$filter=(Id eq '$PackageName') and (IsPrerelease eq false) and (Version ge '$TargetVersion') and (Version lt '$incrementedVersion')" - $latestVersion = (Invoke-RestMethod "https://community.chocolatey.org/api/v2/Packages()?$filterQuery").properties.Version | - Where-Object { $_ -Like "$TargetVersion.*" -or $_ -eq $TargetVersion } | - Sort-Object { [version] $_ } | + $searchResult = choco search $PackageName --exact --all-versions --approved-only --limit-output | + ConvertFrom-CSV -Delimiter '|' -Header 'Name', 'Version' + + $latestVersion = $searchResult.Version | + Where-Object { $_ -Like "$TargetVersion.*" -or $_ -eq $TargetVersion } | + Sort-Object { [version] $_ } | Select-Object -Last 1 return $latestVersion From df41637c07f1752efadfa844f2951744affb3e32 Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Wed, 3 Apr 2024 09:42:13 +0200 Subject: [PATCH 2753/3485] Revert "[Ubuntu] remove Docker Comose v1 (#9559)" (#9617) --- .../scripts/build/install-docker-compose.sh | 21 +++++++++++++++++++ .../docs-gen/Generate-SoftwareReport.ps1 | 1 + .../docs-gen/SoftwareReport.Tools.psm1 | 5 +++++ images/ubuntu/scripts/tests/Tools.Tests.ps1 | 8 ++++++- images/ubuntu/templates/ubuntu-20.04.pkr.hcl | 2 +- images/ubuntu/templates/ubuntu-22.04.pkr.hcl | 2 +- 6 files changed, 36 insertions(+), 3 deletions(-) create mode 100644 images/ubuntu/scripts/build/install-docker-compose.sh diff --git a/images/ubuntu/scripts/build/install-docker-compose.sh b/images/ubuntu/scripts/build/install-docker-compose.sh new file mode 100644 index 000000000000..4d152c77c391 --- /dev/null +++ b/images/ubuntu/scripts/build/install-docker-compose.sh @@ -0,0 +1,21 @@ +#!/bin/bash -e +################################################################################ +## File: install-docker-compose.sh +## Desc: Install Docker Compose v1 +## Supply chain security: Docker Compose v1 - checksum validation +################################################################################ + +# Source the helpers for use with the script +source $HELPER_SCRIPTS/install.sh + +# Download docker-compose v1 from releases +binary_path=$(download_with_retry "https://github.com/docker/compose/releases/download/1.29.2/docker-compose-Linux-x86_64") + +# Supply chain security - Docker Compose v1 +external_hash="f3f10cf3dbb8107e9ba2ea5f23c1d2159ff7321d16f0a23051d68d8e2547b323" +use_checksum_comparison "${binary_path}" "${external_hash}" + +# Install docker-compose v1 +install "${binary_path}" "/usr/local/bin/docker-compose" + +invoke_tests "Tools" "Docker-compose v1" diff --git a/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 b/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 index 1bae35381a6d..758d7c91e4d5 100644 --- a/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 +++ b/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 @@ -105,6 +105,7 @@ $tools.AddToolVersion("Buildah", $(Get-BuildahVersion)) $tools.AddToolVersion("CMake", $(Get-CMakeVersion)) $tools.AddToolVersion("CodeQL Action Bundle", $(Get-CodeQLBundleVersion)) $tools.AddToolVersion("Docker Amazon ECR Credential Helper", $(Get-DockerAmazonECRCredHelperVersion)) +$tools.AddToolVersion("Docker Compose v1", $(Get-DockerComposeV1Version)) $tools.AddToolVersion("Docker Compose v2", $(Get-DockerComposeV2Version)) $tools.AddToolVersion("Docker-Buildx", $(Get-DockerBuildxVersion)) $tools.AddToolVersion("Docker Client", $(Get-DockerClientVersion)) diff --git a/images/ubuntu/scripts/docs-gen/SoftwareReport.Tools.psm1 b/images/ubuntu/scripts/docs-gen/SoftwareReport.Tools.psm1 index 46ff6947a410..a61b0a8d7aab 100644 --- a/images/ubuntu/scripts/docs-gen/SoftwareReport.Tools.psm1 +++ b/images/ubuntu/scripts/docs-gen/SoftwareReport.Tools.psm1 @@ -58,6 +58,11 @@ function Get-CMakeVersion { return $cmakeVersion } +function Get-DockerComposeV1Version { + $composeVersion = docker-compose -v | Get-StringPart -Part 2 | Get-StringPart -Part 0 -Delimiter "," + return $composeVersion +} + function Get-DockerComposeV2Version { $composeVersion = docker compose version | Get-StringPart -Part 3 | Get-StringPart -Part 0 -Delimiter "v" return $composeVersion diff --git a/images/ubuntu/scripts/tests/Tools.Tests.ps1 b/images/ubuntu/scripts/tests/Tools.Tests.ps1 index 7baa3e8be384..a58f052e9dfe 100644 --- a/images/ubuntu/scripts/tests/Tools.Tests.ps1 +++ b/images/ubuntu/scripts/tests/Tools.Tests.ps1 @@ -83,7 +83,7 @@ Describe "Docker" { } } - It "Docker compose v2" { + It "docker compose v2" { $version=(Get-ToolsetContent).docker.plugins | Where-Object { $_.plugin -eq 'compose' } | Select-Object -ExpandProperty version If ($version -ne "latest") { $(docker compose version --short) | Should -BeLike "*$version*" @@ -105,6 +105,12 @@ Describe "Docker images" { } } +Describe "Docker-compose v1" { + It "docker-compose" { + "docker-compose --version"| Should -ReturnZeroExitCode + } +} + Describe "Ansible" { It "Ansible" { "ansible --version" | Should -ReturnZeroExitCode diff --git a/images/ubuntu/templates/ubuntu-20.04.pkr.hcl b/images/ubuntu/templates/ubuntu-20.04.pkr.hcl index e6d74c2c4d55..fd3a295b7920 100644 --- a/images/ubuntu/templates/ubuntu-20.04.pkr.hcl +++ b/images/ubuntu/templates/ubuntu-20.04.pkr.hcl @@ -344,7 +344,7 @@ build { provisioner "shell" { environment_vars = ["HELPER_SCRIPTS=${var.helper_script_folder}", "INSTALLER_SCRIPT_FOLDER=${var.installer_script_folder}", "DOCKERHUB_LOGIN=${var.dockerhub_login}", "DOCKERHUB_PASSWORD=${var.dockerhub_password}"] execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" - scripts = ["${path.root}/../scripts/build/install-docker.sh"] + scripts = ["${path.root}/../scripts/build/install-docker-compose.sh", "${path.root}/../scripts/build/install-docker.sh"] } provisioner "shell" { diff --git a/images/ubuntu/templates/ubuntu-22.04.pkr.hcl b/images/ubuntu/templates/ubuntu-22.04.pkr.hcl index 702bb47a8ec8..473e597cd3a0 100644 --- a/images/ubuntu/templates/ubuntu-22.04.pkr.hcl +++ b/images/ubuntu/templates/ubuntu-22.04.pkr.hcl @@ -340,7 +340,7 @@ build { provisioner "shell" { environment_vars = ["HELPER_SCRIPTS=${var.helper_script_folder}", "INSTALLER_SCRIPT_FOLDER=${var.installer_script_folder}", "DOCKERHUB_LOGIN=${var.dockerhub_login}", "DOCKERHUB_PASSWORD=${var.dockerhub_password}"] execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" - scripts = ["${path.root}/../scripts/build/install-docker.sh"] + scripts = ["${path.root}/../scripts/build/install-docker-compose.sh", "${path.root}/../scripts/build/install-docker.sh"] } provisioner "shell" { From cd4088d2822fb5fb6aee39d9883eceef98f3cfa2 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Wed, 3 Apr 2024 18:38:52 +0200 Subject: [PATCH 2754/3485] [Windows] Update docker-compose installation method (#9618) --- .../windows/scripts/build/Install-DockerCompose.ps1 | 13 +++++++++++++ .../scripts/docs-gen/Generate-SoftwareReport.ps1 | 1 + .../scripts/docs-gen/SoftwareReport.Tools.psm1 | 5 +++++ images/windows/scripts/tests/Docker.Tests.ps1 | 5 ++++- 4 files changed, 23 insertions(+), 1 deletion(-) diff --git a/images/windows/scripts/build/Install-DockerCompose.ps1 b/images/windows/scripts/build/Install-DockerCompose.ps1 index 7e819398b99b..dba8904a36b6 100644 --- a/images/windows/scripts/build/Install-DockerCompose.ps1 +++ b/images/windows/scripts/build/Install-DockerCompose.ps1 @@ -3,6 +3,19 @@ ## Desc: Install Docker Compose. ################################################################################ +Write-Host "Install-Package Docker-Compose v1" +$dockerComposev1Url = "https://github.com/docker/compose/releases/download/1.29.2/docker-compose-Windows-x86_64.exe" +$checksumsUrl = "https://github.com/docker/compose/releases/download/1.29.2/docker-compose-Windows-x86_64.exe.sha256" +$dockerComposev1Dir = "C:\ProgramData\docker-compose" +New-Item -Path $dockerComposev1Dir -ItemType Directory +$externalHash = Get-ChecksumFromUrl -Type "SHA256" ` + -Url $checksumsUrl ` + -FileName (Split-Path $dockerComposev1Url -Leaf) +$dockerComposev1Path = Invoke-DownloadWithRetry -Url $dockerComposev1Url -Path "$dockerComposev1Dir\docker-compose.exe" +Test-FileChecksum $dockerComposev1Path -ExpectedSHA256Sum $externalHash +Add-MachinePathItem $dockerComposev1Dir +Update-Environment + Write-Host "Install-Package Docker-Compose v2" # Temporaty pinned to v2.23.3 due https://github.com/actions/runner-images/issues/9172 $toolsetVersion = (Get-ToolsetContent).docker.components.compose diff --git a/images/windows/scripts/docs-gen/Generate-SoftwareReport.ps1 b/images/windows/scripts/docs-gen/Generate-SoftwareReport.ps1 index 53f22b1ed1ad..70c0021eb382 100644 --- a/images/windows/scripts/docs-gen/Generate-SoftwareReport.ps1 +++ b/images/windows/scripts/docs-gen/Generate-SoftwareReport.ps1 @@ -71,6 +71,7 @@ $tools.AddToolVersion("Cabal", $(Get-CabalVersion)) $tools.AddToolVersion("CMake", $(Get-CMakeVersion)) $tools.AddToolVersion("CodeQL Action Bundle", $(Get-CodeQLBundleVersion)) $tools.AddToolVersion("Docker", $(Get-DockerVersion)) +$tools.AddToolVersion("Docker Compose v1", $(Get-DockerComposeVersion)) $tools.AddToolVersion("Docker Compose v2", $(Get-DockerComposeVersionV2)) $tools.AddToolVersion("Docker-wincred", $(Get-DockerWincredVersion)) $tools.AddToolVersion("ghc", $(Get-GHCVersion)) diff --git a/images/windows/scripts/docs-gen/SoftwareReport.Tools.psm1 b/images/windows/scripts/docs-gen/SoftwareReport.Tools.psm1 index 0aa224facf42..757316b6dfea 100644 --- a/images/windows/scripts/docs-gen/SoftwareReport.Tools.psm1 +++ b/images/windows/scripts/docs-gen/SoftwareReport.Tools.psm1 @@ -55,6 +55,11 @@ function Get-DockerVersion { return $dockerVersion } +function Get-DockerComposeVersion { + $dockerComposeVersion = docker-compose version --short + return $dockerComposeVersion +} + function Get-DockerComposeVersionV2 { $dockerComposeVersion = docker compose version --short return $dockerComposeVersion diff --git a/images/windows/scripts/tests/Docker.Tests.ps1 b/images/windows/scripts/tests/Docker.Tests.ps1 index 7cc4b60ab963..dcd0dd70ab6c 100644 --- a/images/windows/scripts/tests/Docker.Tests.ps1 +++ b/images/windows/scripts/tests/Docker.Tests.ps1 @@ -13,6 +13,9 @@ Describe "Docker" { } Describe "DockerCompose" { + It "docker-compose is installed" { + "docker-compose --version" | Should -ReturnZeroExitCode + } It "docker compose v2" { "docker compose version" | Should -ReturnZeroExitCode @@ -34,4 +37,4 @@ Describe "DockerImages" { docker images "$ImageName" --format "{{.Repository}}" | Should -Not -BeNullOrEmpty } } -} \ No newline at end of file +} From 9d4816708f43d9e7e6eff04f0c433884126387e6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 3 Apr 2024 16:46:04 +0000 Subject: [PATCH 2755/3485] Updating readme file for macOS-12 version 20240329.1 (#9599) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-12-Readme.md | 158 +++++++++++++++----------------- 1 file changed, 76 insertions(+), 82 deletions(-) diff --git a/images/macos/macos-12-Readme.md b/images/macos/macos-12-Readme.md index a1d31c8c0f39..2e13b6f1fc78 100644 --- a/images/macos/macos-12-Readme.md +++ b/images/macos/macos-12-Readme.md @@ -1,17 +1,12 @@ -| Announcements | -|-| -| [[All OSes] Ruby versions <= 2.7.x will be removed on February, 26](https://github.com/actions/runner-images/issues/9327) | -| [[All OSes] Go 1.19.x will be removed and 1.21.x set as default on February, 26](https://github.com/actions/runner-images/issues/9326) | -*** # macOS 12 -- OS Version: macOS 12.7.3 (21H1015) +- OS Version: macOS 12.7.4 (21H1123) - Kernel Version: Darwin 21.6.0 -- Image Version: 20240218.1 +- Image Version: 20240329.1 ## Installed Software ### Language and Runtime -- .NET Core SDK: 6.0.419, 7.0.102, 7.0.202, 7.0.306, 7.0.406, 8.0.101, 8.0.201 +- .NET Core SDK: 6.0.420, 7.0.102, 7.0.202, 7.0.306, 7.0.407, 8.0.101, 8.0.203 - Bash 3.2.57(1)-release - Clang/LLVM 14.0.0 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` @@ -21,35 +16,35 @@ - GNU Fortran 11 (Homebrew GCC 11.4.0) - available by `gfortran-11` alias - GNU Fortran 12 (Homebrew GCC 12.3.0) - available by `gfortran-12` alias - GNU Fortran 13 (Homebrew GCC 13.2.0) - available by `gfortran-13` alias -- Julia 1.10.1 -- Kotlin 1.9.22-release-704 -- Go 1.20.14 +- Julia 1.10.2 +- Kotlin 1.9.23-release-779 +- Go 1.21.8 - Mono 6.12.0.188 - Node.js 18.19.1 - MSBuild 16.10.1.51301 (Mono 6.12.0.188) - NVM 0.39.7 -- NVM - Cached node versions: 16.20.2, 18.19.1, 20.11.1 +- NVM - Cached node versions: 16.20.2, 18.20.0, 20.12.0 - Perl 5.38.2 -- PHP 8.3.3 +- PHP 8.3.4 - Python 2.7.18 - Python3 3.12.2 -- R 4.3.2 +- R 4.3.3 - Ruby 3.0.6p216 ### Package Management -- Bundler 2.5.6 +- Bundler 2.5.7 - Carthage 0.39.1 - CocoaPods 1.15.2 -- Composer 2.7.1 -- Homebrew 4.2.8 -- Miniconda 23.11.0 +- Composer 2.7.2 +- Homebrew 4.2.15 +- Miniconda 24.1.2 - NPM 10.2.4 - NuGet 6.3.1.1 - Pip 20.3.4 (python 2.7) - Pip3 24.0 (python 3.12) -- Pipx 1.4.3 -- RubyGems 3.5.6 -- Vcpkg 2024 (build from commit 13bde2ff1) +- Pipx 1.5.0 +- RubyGems 3.5.7 +- Vcpkg 2024 (build from commit 6c296b954) - Yarn 1.22.19 #### Environment variables @@ -61,24 +56,24 @@ ### Project Management - Apache Ant 1.10.14 - Apache Maven 3.9.6 -- Gradle 8.6 -- Sbt 1.9.8 +- Gradle 8.7 +- Sbt 1.9.9 ### Utilities - 7-Zip 17.05 - aria2 1.37.0 -- azcopy 10.23.0 -- bazel 7.0.2 +- azcopy 10.24.0 +- bazel 7.1.1 - bazelisk 1.19.0 - bsdtar 3.5.1 - available by 'tar' alias -- Curl 8.6.0 -- Git 2.43.2 -- Git LFS 3.4.1 -- GitHub CLI 2.44.1 +- Curl 8.7.1 +- Git 2.44.0 +- Git LFS 3.5.1 +- GitHub CLI 2.46.0 - GNU Tar 1.35 - available by 'gtar' alias -- GNU Wget 1.21.4 -- gpg (GnuPG) 2.4.4 -- ImageMagick 7.1.1-28 +- GNU Wget 1.24.5 +- gpg (GnuPG) 2.4.5 +- ImageMagick 7.1.1-29 - jq 1.7.1 - mongo 5.0.21 - mongod 5.0.21 @@ -92,29 +87,29 @@ - Switchaudio-osx 1.2.2 - Vagrant 2.4.1 - VirtualBox 6.1.38r153438 -- yq 4.41.1 -- zstd 1.5.5 +- yq 4.43.1 +- zstd 1.5.6 ### Tools -- App Center CLI 2.14.0 -- AWS CLI 2.15.21 -- AWS SAM CLI 1.109.0 +- App Center CLI 3.0.0 +- AWS CLI 2.15.34 +- AWS SAM CLI 1.113.0 - AWS Session Manager CLI 1.2.553.0 -- Azure CLI 2.57.0 -- Azure CLI (azure-devops) 0.26.0 -- Bicep CLI 0.25.53 +- Azure CLI 2.58.0 +- Azure CLI (azure-devops) 1.0.0 +- Bicep CLI 0.26.54 - Cabal 3.10.2.1 -- Cmake 3.28.3 -- CodeQL Action Bundle 2.16.2 +- Cmake 3.29.0 +- CodeQL Action Bundle 2.16.5 - Colima 0.6.8 - Fastlane 2.219.0 -- GHC 9.8.1 -- GHCup 0.1.20.0 +- GHC 9.8.2 +- GHCup 0.1.22.0 - Jazzy 0.14.4 -- Stack 2.15.1 -- SwiftFormat 0.53.2 -- Swig 4.2.0 -- Xcbeautify 1.4.0 +- Stack 2.15.3 +- SwiftFormat 0.53.5 +- Swig 4.2.1 +- Xcbeautify 1.6.0 - Xcode Command Line Tools 14.2.0.0.1.1668646533 - Xcodes 1.4.1 @@ -123,16 +118,16 @@ - Yamllint 1.35.1 ### Browsers -- Safari 17.3.1 (17617.2.4.11.12) -- SafariDriver 17.3.1 (17617.2.4.11.12) -- Google Chrome 121.0.6167.184 -- Google Chrome for Testing 121.0.6167.184 -- ChromeDriver 121.0.6167.184 -- Microsoft Edge 121.0.2277.128 -- Microsoft Edge WebDriver 121.0.2277.128 -- Mozilla Firefox 122.0.1 +- Safari 17.4.1 (17618.1.15.111.8) +- SafariDriver 17.4.1 (17618.1.15.111.8) +- Google Chrome 123.0.6312.87 +- Google Chrome for Testing 123.0.6312.86 +- ChromeDriver 123.0.6312.86 +- Microsoft Edge 123.0.2420.65 +- Microsoft Edge WebDriver 123.0.2420.65 +- Mozilla Firefox 124.0.1 - geckodriver 0.34.0 -- Selenium server 4.17.0 +- Selenium server 4.19.0 #### Environment variables | Name | Value | @@ -159,51 +154,49 @@ - 3.10.13 [PyPy 7.3.15] #### Ruby -- 2.7.8 - 3.0.6 - 3.1.4 #### Python - 3.7.17 - 3.8.18 -- 3.9.18 -- 3.10.13 +- 3.9.19 +- 3.10.14 - 3.11.8 - 3.12.2 #### Node.js - 16.20.2 -- 18.19.1 -- 20.11.1 +- 18.20.0 +- 20.12.0 #### Go -- 1.19.13 - 1.20.14 -- 1.21.7 -- 1.22.0 +- 1.21.8 +- 1.22.1 ### Rust Tools -- Cargo 1.76.0 -- Rust 1.76.0 -- Rustdoc 1.76.0 -- Rustup 1.26.0 +- Cargo 1.77.1 +- Rust 1.77.1 +- Rustdoc 1.77.1 +- Rustup 1.27.0 #### Packages - Bindgen 0.69.4 - Cargo-audit 0.20.0 -- Cargo-outdated 0.14.0 +- Cargo-outdated 0.15.0 - Cbindgen 0.26.0 -- Clippy 0.1.76 +- Clippy 0.1.77 - Rustfmt 1.7.0-stable ### PowerShell Tools - PowerShell 7.4.1 #### PowerShell Modules -- Az: 11.3.1 +- Az: 11.4.0 - MarkdownPS: 1.9 - Pester: 5.5.0 -- PSScriptAnalyzer: 1.21.0 +- PSScriptAnalyzer: 1.22.0 ### Web Servers | Name | Version | ConfigFile | ServiceStatus | ListenPort | @@ -214,10 +207,10 @@ ### Xamarin #### Visual Studio for Mac -| Version | Build | Path | -| -------------- | ---------- | ------------------------------------ | -| 2019 | 8.10.25.2 | /Applications/Visual Studio 2019.app | -| 2022 (default) | 17.6.9.415 | /Applications/Visual Studio.app | +| Version | Build | Path | +| -------------- | ----------- | ------------------------------------ | +| 2019 | 8.10.25.2 | /Applications/Visual Studio 2019.app | +| 2022 (default) | 17.6.10.428 | /Applications/Visual Studio.app | ##### Notes ``` @@ -229,6 +222,7 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" #### Xamarin bundles | symlink | Xamarin.Mono | Xamarin.iOS | Xamarin.Mac | Xamarin.Android | | ----------------- | ------------ | ----------- | ----------- | --------------- | +| 6_12_25 | 6.12 | 16.4 | 9.3 | 13.2 | | 6_12_24 | 6.12 | 16.2 | 9.1 | 13.2 | | 6_12_23 | 6.12 | 16.2 | 9.1 | 13.1 | | 6_12_22 | 6.12 | 16.1 | 9.0 | 13.1 | @@ -336,10 +330,10 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" | Package Name | Version | | -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 8.0 | -| Android Emulator | 33.1.24 | +| Android Emulator | 34.1.19 | | Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2 33.0.3<br>32.0.0<br>31.0.0 | | Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1) | -| Android SDK Platform-Tools | 35.0.0 | +| Android SDK Platform-Tools | 35.0.1 | | Android Support Repository | 47.0.0 | | CMake | 3.18.1<br>3.22.1 | | Google Play services | 49 | @@ -357,15 +351,15 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" | ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | ### Miscellaneous -- libXext 1.3.5 +- libXext 1.3.6 - libXft 2.3.8 -- Tcl/Tk 8.6.13_5 +- Tcl/Tk 8.6.14 - Zlib 1.3.1 #### Environment variables | Name | Value | | ----------------- | ----------------------------------------------------------------------------------------- | -| PARALLELS_DMG_URL | https://download.parallels.com/desktop/v19/19.2.1-54832/ParallelsDesktop-19.2.1-54832.dmg | +| PARALLELS_DMG_URL | https://download.parallels.com/desktop/v19/19.3.0-54924/ParallelsDesktop-19.3.0-54924.dmg | ##### Notes ``` From 996a7d36a7b8a78671ac5c56ae2c239a7a5221dd Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 3 Apr 2024 17:03:56 +0000 Subject: [PATCH 2756/3485] Updating readme file for macos-14 version 20240402.2 (#9622) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-14-Readme.md | 60 ++++++++++++++++----------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/images/macos/macos-14-Readme.md b/images/macos/macos-14-Readme.md index 89193da99072..2fbca0eefa87 100644 --- a/images/macos/macos-14-Readme.md +++ b/images/macos/macos-14-Readme.md @@ -1,7 +1,7 @@ # macOS 14 -- OS Version: macOS 14.4 (23E214) +- OS Version: macOS 14.4.1 (23E224) - Kernel Version: Darwin 23.4.0 -- Image Version: 20240325.1 +- Image Version: 20240402.2 ## Installed Software @@ -18,7 +18,7 @@ - GNU Fortran 13 (Homebrew GCC 13.2.0) - available by `gfortran-13` alias - Kotlin 1.9.23-release-779 - Mono 6.12.0.188 -- Node.js 20.11.1 +- Node.js 20.12.0 - Perl 5.38.2 - PHP 8.3.4 - Python3 3.12.2 @@ -28,12 +28,12 @@ - Bundler 2.5.7 - Carthage 0.39.1 - CocoaPods 1.15.2 -- Composer "diagnose" -- Homebrew 4.2.15 -- NPM 10.2.4 +- Composer 2.7.2 +- Homebrew 4.2.16 +- NPM 10.5.0 - NuGet 6.3.1.1 - Pip3 24.0 (python 3.12) -- Pipx 1.4.3 +- Pipx 1.5.0 - RubyGems 3.5.7 - Yarn 1.22.19 @@ -45,11 +45,11 @@ ### Utilities - 7-Zip 17.05 - aria2 1.37.0 -- azcopy 10.23.0 +- azcopy 10.24.0 - bazel 7.1.1 - bazelisk 1.19.0 - bsdtar 3.5.3 - available by 'tar' alias -- Curl 8.6.0 +- Curl 8.7.1 - Git 2.44.0 - Git LFS 3.5.1 - GitHub CLI 2.46.0 @@ -61,13 +61,13 @@ - Packer 1.9.4 - pkg-config 0.29.2 - yq 4.43.1 -- zstd 1.5.5 +- zstd 1.5.6 ### Tools -- AWS CLI 2.15.32 +- AWS CLI 2.15.34 - AWS SAM CLI 1.113.0 - AWS Session Manager CLI 1.2.553.0 -- Azure CLI 2.58.0 +- Azure CLI 2.59.0 - Azure CLI (azure-devops) 1.0.0 - Bicep CLI 0.26.54 - Cmake 3.29.0 @@ -82,16 +82,16 @@ - SwiftLint 0.53.0 ### Browsers -- Safari 17.4 (19618.1.15.11.12) -- SafariDriver 17.4 (19618.1.15.11.12) -- Google Chrome 123.0.6312.59 -- Google Chrome for Testing 123.0.6312.58 -- ChromeDriver 123.0.6312.58 -- Microsoft Edge 123.0.2420.53 -- Microsoft Edge WebDriver 123.0.2420.53 -- Mozilla Firefox 124.0.1 +- Safari 17.4.1 (19618.1.15.11.14) +- SafariDriver 17.4.1 (19618.1.15.11.14) +- Google Chrome 123.0.6312.107 +- Google Chrome for Testing 123.0.6312.86 +- ChromeDriver 123.0.6312.86 +- Microsoft Edge 123.0.2420.65 +- Microsoft Edge WebDriver 123.0.2420.65 +- Mozilla Firefox 124.0.2 - geckodriver 0.34.0 -- Selenium server 4.18.1 +- Selenium server 4.19.1 #### Environment variables | Name | Value | @@ -119,8 +119,8 @@ - 3.12.2 #### Node.js -- 18.19.1 -- 20.11.1 +- 18.20.0 +- 20.12.0 #### Go - 1.20.14 @@ -128,9 +128,9 @@ - 1.22.1 ### Rust Tools -- Cargo 1.77.0 -- Rust 1.77.0 -- Rustdoc 1.77.0 +- Cargo 1.77.1 +- Rust 1.77.1 +- Rustdoc 1.77.1 - Rustup 1.27.0 #### Packages @@ -141,7 +141,7 @@ - PowerShell 7.4.1 #### PowerShell Modules -- Az: 11.4.0 +- Az: 11.5.0 - Pester: 5.5.0 - PSScriptAnalyzer: 1.22.0 @@ -187,11 +187,11 @@ | Simulator - watchOS 10.4 | watchsimulator10.4 | 15.3 | | Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | | visionOS 1.0 | xros1.0 | 15.2 | -| Simulator - visionOS 1.1 | xrsimulator1.1 | 15.3 | | visionOS 1.1 | xros1.1 | 15.3 | +| Simulator - visionOS 1.1 | xrsimulator1.1 | 15.3 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | -| Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | +| Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | | DriverKit 22.4 | driverkit22.4 | 14.3.1 | | DriverKit 23.0 | driverkit23.0 | 15.0.1 | | DriverKit 23.2 | driverkit23.2 | 15.1, 15.2 | @@ -217,7 +217,7 @@ | Package Name | Version | | -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 11.0 | -| Android Emulator | 34.1.19 | +| Android Emulator | 34.1.20 | | Android SDK Build-tools | 34.0.0<br>33.0.2 33.0.3 | | Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | | Android SDK Platform-Tools | 35.0.1 | From b9a57e0f4c038d117075470f26f95aee60bcfbbb Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 3 Apr 2024 21:23:39 +0000 Subject: [PATCH 2757/3485] Updating readme file for macos-14-arm64 version 20240402.2 (#9620) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-14-arm64-Readme.md | 46 +++++++++++++-------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/images/macos/macos-14-arm64-Readme.md b/images/macos/macos-14-arm64-Readme.md index 550b4e859807..8dbf064affa5 100644 --- a/images/macos/macos-14-arm64-Readme.md +++ b/images/macos/macos-14-arm64-Readme.md @@ -1,7 +1,7 @@ # macOS 14 -- OS Version: macOS 14.4 (23E214) +- OS Version: macOS 14.4.1 (23E224) - Kernel Version: Darwin 23.4.0 -- Image Version: 20240325.1 +- Image Version: 20240402.2 ## Installed Software @@ -18,7 +18,7 @@ - GNU Fortran 13 (Homebrew GCC 13.2.0) - available by `gfortran-13` alias - Kotlin 1.9.23-release-779 - Mono 6.12.0.188 -- Node.js 20.11.1 +- Node.js 20.12.0 - Perl 5.38.2 - Python3 3.12.2 - Ruby 3.0.6p216 @@ -27,11 +27,11 @@ - Bundler 2.5.7 - Carthage 0.39.1 - CocoaPods 1.15.2 -- Homebrew 4.2.15 -- NPM 10.2.4 +- Homebrew 4.2.16 +- NPM 10.5.0 - NuGet 6.3.1.1 - Pip3 24.0 (python 3.12) -- Pipx 1.4.3 +- Pipx 1.5.0 - RubyGems 3.5.7 - Yarn 1.22.19 @@ -43,7 +43,7 @@ ### Utilities - 7-Zip 17.05 - aria2 1.37.0 -- azcopy 10.23.0 +- azcopy 10.24.0 - bazel 7.1.1 - bazelisk 1.19.0 - bsdtar 3.5.3 - available by 'tar' alias @@ -59,13 +59,13 @@ - Packer 1.9.4 - pkg-config 0.29.2 - yq 4.43.1 -- zstd 1.5.5 +- zstd 1.5.6 ### Tools -- AWS CLI 2.15.32 +- AWS CLI 2.15.34 - AWS SAM CLI 1.113.0 - AWS Session Manager CLI 1.2.553.0 -- Azure CLI 2.58.0 +- Azure CLI 2.59.0 - Azure CLI (azure-devops) 1.0.0 - Bicep CLI 0.26.54 - Cmake 3.29.0 @@ -79,12 +79,12 @@ ### Linters ### Browsers -- Safari 17.4 (19618.1.15.11.12) -- SafariDriver 17.4 (19618.1.15.11.12) -- Google Chrome 123.0.6312.59 -- Google Chrome for Testing 123.0.6312.58 -- ChromeDriver 123.0.6312.58 -- Selenium server 4.18.1 +- Safari 17.4.1 (19618.1.15.11.14) +- SafariDriver 17.4.1 (19618.1.15.11.14) +- Google Chrome 123.0.6312.107 +- Google Chrome for Testing 123.0.6312.86 +- ChromeDriver 123.0.6312.86 +- Selenium server 4.19.1 #### Environment variables | Name | Value | @@ -107,8 +107,8 @@ - 3.12.2 #### Node.js -- 18.19.1 -- 20.11.1 +- 18.20.0 +- 20.12.0 #### Go - 1.20.14 @@ -116,9 +116,9 @@ - 1.22.1 ### Rust Tools -- Cargo 1.77.0 -- Rust 1.77.0 -- Rustdoc 1.77.0 +- Cargo 1.77.1 +- Rust 1.77.1 +- Rustdoc 1.77.1 - Rustup 1.27.0 #### Packages @@ -129,7 +129,7 @@ - PowerShell 7.4.1 #### PowerShell Modules -- Az: 11.4.0 +- Az: 11.5.0 - Pester: 5.5.0 - PSScriptAnalyzer: 1.22.0 @@ -207,7 +207,7 @@ | Package Name | Version | | -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 11.0 | -| Android Emulator | 34.1.19 | +| Android Emulator | 34.1.20 | | Android SDK Build-tools | 34.0.0<br>33.0.2 33.0.3 | | Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | | Android SDK Platform-Tools | 35.0.1 | From 84dd663dac77a2480e6078d3d052fb33e9681c00 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 4 Apr 2024 08:17:20 +0000 Subject: [PATCH 2758/3485] Updating readme file for macos-13 version 20240402.2 (#9619) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-13-Readme.md | 48 ++++++++++++++++----------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/images/macos/macos-13-Readme.md b/images/macos/macos-13-Readme.md index aefa6f1c6cf2..3599fe7d8fcb 100644 --- a/images/macos/macos-13-Readme.md +++ b/images/macos/macos-13-Readme.md @@ -1,7 +1,7 @@ # macOS 13 -- OS Version: macOS 13.6.5 (22G621) +- OS Version: macOS 13.6.6 (22G630) - Kernel Version: Darwin 22.6.0 -- Image Version: 20240327.2 +- Image Version: 20240402.2 ## Installed Software @@ -28,14 +28,14 @@ - Bundler 2.5.7 - Carthage 0.39.1 - CocoaPods 1.15.2 -- Composer "diagnose" -- Homebrew 4.2.15 +- Composer 2.7.2 +- Homebrew 4.2.16 - NPM 10.5.0 - NuGet 6.3.1.1 - Pip3 24.0 (python 3.12) -- Pipx 1.4.3 +- Pipx 1.5.0 - RubyGems 3.5.7 -- Vcpkg 2024 (build from commit 3c76dc55f) +- Vcpkg 2024 (build from commit 1daec834f) - Yarn 1.22.19 ### Project Management @@ -50,7 +50,7 @@ - bazel 7.1.1 - bazelisk 1.19.0 - bsdtar 3.5.3 - available by 'tar' alias -- Curl 8.6.0 +- Curl 8.7.1 - Git 2.44.0 - Git LFS 3.5.1 - GitHub CLI 2.46.0 @@ -65,10 +65,10 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.15.33 +- AWS CLI 2.15.34 - AWS SAM CLI 1.113.0 - AWS Session Manager CLI 1.2.553.0 -- Azure CLI 2.58.0 +- Azure CLI 2.59.0 - Azure CLI (azure-devops) 1.0.0 - Bicep CLI 0.26.54 - Cmake 3.29.0 @@ -83,16 +83,16 @@ - SwiftLint 0.53.0 ### Browsers -- Safari 17.4 (18618.1.15.111.5) -- SafariDriver 17.4 (18618.1.15.111.5) -- Google Chrome 123.0.6312.87 +- Safari 17.4.1 (18618.1.15.111.8) +- SafariDriver 17.4.1 (18618.1.15.111.8) +- Google Chrome 123.0.6312.107 - Google Chrome for Testing 123.0.6312.86 - ChromeDriver 123.0.6312.86 -- Microsoft Edge 123.0.2420.53 -- Microsoft Edge WebDriver 123.0.2420.53 -- Mozilla Firefox 124.0.1 +- Microsoft Edge 123.0.2420.65 +- Microsoft Edge WebDriver 123.0.2420.65 +- Mozilla Firefox 124.0.2 - geckodriver 0.34.0 -- Selenium server 4.18.1 +- Selenium server 4.19.1 #### Environment variables | Name | Value | @@ -131,8 +131,8 @@ #### Node.js - 16.20.2 -- 18.19.1 -- 20.11.1 +- 18.20.0 +- 20.12.0 #### Go - 1.20.14 @@ -140,9 +140,9 @@ - 1.22.1 ### Rust Tools -- Cargo 1.77.0 -- Rust 1.77.0 -- Rustdoc 1.77.0 +- Cargo 1.77.1 +- Rust 1.77.1 +- Rustdoc 1.77.1 - Rustup 1.27.0 #### Packages @@ -153,7 +153,7 @@ - PowerShell 7.4.1 #### PowerShell Modules -- Az: 11.4.0 +- Az: 11.5.0 - Pester: 5.5.0 - PSScriptAnalyzer: 1.22.0 @@ -201,8 +201,8 @@ | Simulator - watchOS 9.4 | watchsimulator9.4 | 14.3.1 | | Simulator - watchOS 10.0 | watchsimulator10.0 | 15.0.1 | | Simulator - watchOS 10.2 | watchsimulator10.2 | 15.1, 15.2 | -| visionOS 1.0 | xros1.0 | 15.2 | | Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | +| visionOS 1.0 | xros1.0 | 15.2 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | @@ -233,7 +233,7 @@ | Package Name | Version | | -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 11.0 | -| Android Emulator | 34.1.19 | +| Android Emulator | 34.1.20 | | Android SDK Build-tools | 34.0.0<br>33.0.2 33.0.3 | | Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | | Android SDK Platform-Tools | 35.0.1 | From 00b6696f3817da6aaf337a3d7a431799caf296c4 Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Thu, 4 Apr 2024 12:32:34 +0200 Subject: [PATCH 2759/3485] Revert "[macOS] Force curl to use IPv4 (#9586)" (#9631) --- images/macos/assets/bashrc | 1 - images/macos/scripts/build/install-homebrew.sh | 3 --- 2 files changed, 4 deletions(-) diff --git a/images/macos/assets/bashrc b/images/macos/assets/bashrc index de4a49d76d10..ca021fd78d2d 100644 --- a/images/macos/assets/bashrc +++ b/images/macos/assets/bashrc @@ -28,7 +28,6 @@ export DOTNET_MULTILEVEL_LOOKUP=0 export HOMEBREW_NO_AUTO_UPDATE=1 export HOMEBREW_NO_INSTALL_CLEANUP=1 export HOMEBREW_CASK_OPTS="--no-quarantine" -export HOMEBREW_CURLRC=1 export BOOTSTRAP_HASKELL_NONINTERACTIVE=1 export BOOTSTRAP_HASKELL_INSTALL_NO_STACK_HOOK=1 diff --git a/images/macos/scripts/build/install-homebrew.sh b/images/macos/scripts/build/install-homebrew.sh index 85482869f431..4a72cf2e677d 100644 --- a/images/macos/scripts/build/install-homebrew.sh +++ b/images/macos/scripts/build/install-homebrew.sh @@ -36,9 +36,6 @@ brew_smart_install jq echo "Installing curl..." brew_smart_install curl -echo "Configuring curl to resolve names with IPv4..." -echo '--ipv4' >> ~/.curlrc - echo "Installing wget..." brew_smart_install "wget" From ac855491e179aa5ff9dfe39786feefa3b7fb1f6b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 5 Apr 2024 11:19:15 +0000 Subject: [PATCH 2760/3485] Updating readme file for macos-13-arm64 version 20240402.2 (#9621) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-13-arm64-Readme.md | 110 +++++++++++++------------- 1 file changed, 53 insertions(+), 57 deletions(-) diff --git a/images/macos/macos-13-arm64-Readme.md b/images/macos/macos-13-arm64-Readme.md index 2776dbc64ca0..401881507d05 100644 --- a/images/macos/macos-13-arm64-Readme.md +++ b/images/macos/macos-13-arm64-Readme.md @@ -1,19 +1,14 @@ -| Announcements | -|-| -| [[All OSes] Ruby versions <= 2.7.x will be removed on February, 26](https://github.com/actions/runner-images/issues/9327) | -| [[All OSes] Go 1.19.x will be removed and 1.21.x set as default on February, 26](https://github.com/actions/runner-images/issues/9326) | -*** # macOS 13 -- OS Version: macOS 13.6.4 (22G513) +- OS Version: macOS 13.6.6 (22G630) - Kernel Version: Darwin 22.6.0 -- Image Version: 20240219.3 +- Image Version: 20240402.2 ## Installed Software ### Language and Runtime -- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.406, 8.0.101, 8.0.201 +- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.407, 8.0.101, 8.0.203 - Bash 3.2.57(1)-release -- Clang/LLVM 15.0.0 +- Clang/LLVM 14.0.0 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` - GCC 11 (Homebrew GCC 11.4.0) - available by `gcc-11` alias - GCC 12 (Homebrew GCC 12.3.0) - available by `gcc-12` alias @@ -21,72 +16,75 @@ - GNU Fortran 11 (Homebrew GCC 11.4.0) - available by `gfortran-11` alias - GNU Fortran 12 (Homebrew GCC 12.3.0) - available by `gfortran-12` alias - GNU Fortran 13 (Homebrew GCC 13.2.0) - available by `gfortran-13` alias -- Kotlin 1.9.22-release-704 +- Kotlin 1.9.23-release-779 - Mono 6.12.0.188 -- Node.js 20.11.1 +- Node.js 20.12.0 - Perl 5.38.2 +- Python3 3.12.2 - Ruby 3.0.6p216 ### Package Management -- Bundler 2.5.6 +- Bundler 2.5.7 - Carthage 0.39.1 - CocoaPods 1.15.2 -- Homebrew 4.2.9 -- NPM 10.2.4 +- Homebrew 4.2.16 +- NPM 10.5.0 - NuGet 6.3.1.1 -- RubyGems 3.5.6 +- Pip3 24.0 (python 3.12) +- Pipx 1.5.0 +- RubyGems 3.5.7 - Yarn 1.22.19 ### Project Management - Apache Ant 1.10.14 - Apache Maven 3.9.6 -- Gradle 8.6 +- Gradle 8.7 ### Utilities - 7-Zip 17.05 - aria2 1.37.0 -- azcopy 10.23.0 -- bazel 7.0.2 +- azcopy 10.24.0 +- bazel 7.1.1 - bazelisk 1.19.0 - bsdtar 3.5.3 - available by 'tar' alias - Curl 8.4.0 -- Git 2.43.2 -- Git LFS 3.4.1 -- GitHub CLI 2.44.1 +- Git 2.44.0 +- Git LFS 3.5.1 +- GitHub CLI 2.46.0 - GNU Tar 1.35 - available by 'gtar' alias -- GNU Wget 1.21.4 -- gpg (GnuPG) 2.4.4 +- GNU Wget 1.24.5 +- gpg (GnuPG) 2.4.5 - jq 1.7.1 - OpenSSL 1.1.1w 11 Sep 2023 - Packer 1.9.4 - pkg-config 0.29.2 -- yq 4.41.1 -- zstd 1.5.5 +- yq 4.43.1 +- zstd 1.5.6 ### Tools -- AWS CLI 2.15.21 -- AWS SAM CLI 1.109.0 +- AWS CLI 2.15.34 +- AWS SAM CLI 1.113.0 - AWS Session Manager CLI 1.2.553.0 -- Azure CLI 2.57.0 -- Azure CLI (azure-devops) 0.26.0 -- Bicep CLI 0.25.53 -- Cmake 3.28.3 -- CodeQL Action Bundle 2.16.2 +- Azure CLI 2.59.0 +- Azure CLI (azure-devops) 1.0.0 +- Bicep CLI 0.26.54 +- Cmake 3.29.0 +- CodeQL Action Bundle 2.16.5 - Fastlane 2.219.0 -- SwiftFormat 0.53.2 -- Xcbeautify 1.4.0 -- Xcode Command Line Tools 15.1.0.0.1.1700200546 +- SwiftFormat 0.53.5 +- Xcbeautify 2.0.1 +- Xcode Command Line Tools 14.3.1.0.1.1683849156 - Xcodes 1.4.1 ### Linters ### Browsers -- Safari 17.3.1 (18617.2.4.11.12) -- SafariDriver 17.3.1 (18617.2.4.11.12) -- Google Chrome 121.0.6167.184 -- Google Chrome for Testing 121.0.6167.184 -- ChromeDriver 121.0.6167.184 -- Selenium server 4.17.0 +- Safari 17.4.1 (18618.1.15.111.8) +- SafariDriver 17.4.1 (18618.1.15.111.8) +- Google Chrome 123.0.6312.107 +- Google Chrome for Testing 123.0.6312.86 +- ChromeDriver 123.0.6312.86 +- Selenium server 4.19.1 #### Environment variables | Name | Value | @@ -110,32 +108,31 @@ #### Node.js - 16.20.1 -- 18.19.1 -- 20.11.1 +- 18.20.0 +- 20.12.0 #### Go -- 1.19.13 - 1.20.14 -- 1.21.7 -- 1.22.0 +- 1.21.8 +- 1.22.1 ### Rust Tools -- Cargo 1.76.0 -- Rust 1.76.0 -- Rustdoc 1.76.0 -- Rustup 1.26.0 +- Cargo 1.77.1 +- Rust 1.77.1 +- Rustdoc 1.77.1 +- Rustup 1.27.0 #### Packages -- Clippy 0.1.76 +- Clippy 0.1.77 - Rustfmt 1.7.0-stable ### PowerShell Tools - PowerShell 7.4.1 #### PowerShell Modules -- Az: 11.3.1 +- Az: 11.5.0 - Pester: 5.5.0 -- PSScriptAnalyzer: 1.21.0 +- PSScriptAnalyzer: 1.22.0 ### Xcode | Version | Build | Path | @@ -181,8 +178,8 @@ | Simulator - watchOS 9.4 | watchsimulator9.4 | 14.3.1 | | Simulator - watchOS 10.0 | watchsimulator10.0 | 15.0.1 | | Simulator - watchOS 10.2 | watchsimulator10.2 | 15.1, 15.2 | -| visionOS 1.0 | xros1.0 | 15.2 | | Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | +| visionOS 1.0 | xros1.0 | 15.2 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | @@ -214,10 +211,10 @@ | Package Name | Version | | -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 11.0 | -| Android Emulator | 33.1.24 | +| Android Emulator | 34.1.20 | | Android SDK Build-tools | 34.0.0<br>33.0.2 33.0.3 | | Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | -| Android SDK Platform-Tools | 35.0.0 | +| Android SDK Platform-Tools | 35.0.1 | | Android Support Repository | 47.0.0 | | CMake | 3.22.1 | | Google Play services | 49 | @@ -233,4 +230,3 @@ | ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/26.2.11394342 | | ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk/26.2.11394342 | | ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | - From 84c158e8b8f516478f045f9712856e6c65c526b3 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Fri, 5 Apr 2024 13:43:20 +0200 Subject: [PATCH 2761/3485] Update README.md (OS14 latest migration) (#9642) --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index ad4756bcea74..323e2d506568 100644 --- a/README.md +++ b/README.md @@ -81,6 +81,10 @@ GitHub Actions and Azure DevOps use the `-latest` YAML label (ex: `ubuntu-latest The `-latest` migration process is gradual and happens over 1-2 months in order to allow customers to adapt their workflows to the newest OS version. During this process, any workflow using the `-latest` label, may see changes in the OS version in their workflows or pipelines. To avoid unwanted migration, users can specify a specific OS version in the yaml file (ex: macos-12, windows-2022, ubuntu-22.04). +#### Planned & ongoing migration(s) + +We are currently in the process of `macos-14` to `macos-latest` migration, details can be found [here](https://github.blog/changelog/2024-04-01-macos-14-sonoma-is-generally-available-and-the-latest-macos-runner-image). + ## Image Releases From 0bf0d5d4fb0188622c2630b26b23ac65c58fc608 Mon Sep 17 00:00:00 2001 From: sergei-pyshnoi <121864472+sergei-pyshnoi@users.noreply.github.com> Date: Fri, 5 Apr 2024 14:52:05 +0200 Subject: [PATCH 2762/3485] [MacOS] Fix pipx vars for arm64 (#9609) * fix pipx vars for arm64 * fix white space in path --- images/macos/scripts/build/install-python.sh | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/images/macos/scripts/build/install-python.sh b/images/macos/scripts/build/install-python.sh index 75d8700040c4..edc6f11ca366 100644 --- a/images/macos/scripts/build/install-python.sh +++ b/images/macos/scripts/build/install-python.sh @@ -41,8 +41,14 @@ echo "Brew Installing Python 3" brew_smart_install "python@3.12" echo "Installing pipx" -export PIPX_BIN_DIR=/usr/local/opt/pipx_bin -export PIPX_HOME=/usr/local/opt/pipx + +if is_Arm64; then + export PIPX_BIN_DIR="$HOME/.local/bin" + export PIPX_HOME="$HOME/Library/Application\ Support/pipx" +else + export PIPX_BIN_DIR=/usr/local/opt/pipx_bin + export PIPX_HOME=/usr/local/opt/pipx +fi brew_smart_install "pipx" From c5b46c53390d8ea0d806e2eba8d3f6277f147b96 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 5 Apr 2024 13:41:57 +0000 Subject: [PATCH 2763/3485] Updating readme file for win19 version 20240403.1.1 (#9636) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/windows/Windows2019-Readme.md | 55 +++++++++++++++------------- 1 file changed, 30 insertions(+), 25 deletions(-) diff --git a/images/windows/Windows2019-Readme.md b/images/windows/Windows2019-Readme.md index ab14213521f6..4d0c1facada8 100644 --- a/images/windows/Windows2019-Readme.md +++ b/images/windows/Windows2019-Readme.md @@ -1,6 +1,10 @@ +| Announcements | +|-| +| [[Ubuntu, Windows] Docker Compose v1 will be removed from images on April, 1](https://github.com/actions/runner-images/issues/9557) | +*** # Windows Server 2019 - OS Version: 10.0.17763 Build 5576 -- Image Version: 20240322.1.0 +- Image Version: 20240403.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -29,7 +33,7 @@ - pip 24.0 (python 3.7) - Pipx 1.2.1 - RubyGems 3.2.33 -- Vcpkg (build from commit 18e898197) +- Vcpkg (build from commit 11ed79186) - Yarn 1.22.22 #### Environment variables @@ -47,7 +51,7 @@ ### Tools - 7zip 23.01 - aria2 1.37.0 -- azcopy 10.23.0 +- azcopy 10.24.0 - Bazel 7.1.1 - Bazelisk 1.19.0 - Bicep 0.26.54 @@ -61,7 +65,7 @@ - ghc 9.8.2 - Git 2.44.0.windows.1 - Git LFS 3.4.1 -- Google Cloud CLI 469.0.0 +- Google Cloud CLI 471.0.0 - ImageMagick 7.1.1-29 - InnoSetup 6.2.2 - jq 1.7.1 @@ -76,32 +80,32 @@ - OpenSSL 1.1.1w - Packer 1.10.2 - Parcel 2.12.0 -- Pulumi 3.111.1 +- Pulumi 3.112.0 - R 4.3.2 - Service Fabric SDK 9.1.1436.9590 -- Stack 2.15.3 +- Stack 2.15.5 - Subversion (SVN) 1.14.2 - Swig 4.1.1 - VSWhere 3.1.7 - WinAppDriver 1.2.2009.02003 -- WiX Toolset 3.14.0.8606 +- WiX Toolset 3.14.1.8722 - yamllint 1.32.0 -- zstd 1.5.5 +- zstd 1.5.6 ### CLI Tools -- Alibaba Cloud CLI 3.0.200 -- AWS CLI 2.15.31 +- Alibaba Cloud CLI 3.0.201 +- AWS CLI 2.15.34 - AWS SAM CLI 1.113.0 - AWS Session Manager CLI 1.2.553.0 -- Azure CLI 2.58.0 +- Azure CLI 2.59.0 - Azure DevOps CLI extension 1.0.0 - Cloud Foundry CLI 6.53.0 - GitHub CLI 2.46.0 ### Rust Tools -- Cargo 1.77.0 -- Rust 1.77.0 -- Rustdoc 1.77.0 +- Cargo 1.77.1 +- Rust 1.77.1 +- Rustdoc 1.77.1 - Rustup 1.27.0 #### Packages @@ -113,14 +117,14 @@ - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 123.0.6312.59 -- Chrome Driver 123.0.6312.58 -- Microsoft Edge 122.0.2365.92 -- Microsoft Edge Driver 122.0.2365.106 -- Mozilla Firefox 124.0.1 +- Google Chrome 123.0.6312.106 +- Chrome Driver 123.0.6312.86 +- Microsoft Edge 122.0.2365.66 +- Microsoft Edge Driver 122.0.2365.113 +- Mozilla Firefox 124.0.2 - Gecko Driver 0.34.0 - IE Driver 4.14.0.0 -- Selenium server 4.18.0 +- Selenium server 4.19.0 #### Environment variables | Name | Value | @@ -167,15 +171,15 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Node.js - 16.20.2 -- 18.19.1 -- 20.11.1 +- 18.20.0 +- 20.12.0 #### Python - 3.7.9 - 3.8.10 - 3.9.13 - 3.10.11 -- 3.11.8 +- 3.11.9 - 3.12.2 #### PyPy @@ -207,7 +211,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### MongoDB | Version | ServiceName | ServiceStatus | ServiceStartType | | -------- | ----------- | ------------- | ---------------- | -| 5.0.25.0 | MongoDB | Stopped | Disabled | +| 5.0.26.0 | MongoDB | Stopped | Disabled | ### Database tools - Azure CosmosDb Emulator 2.14.16.0 @@ -504,7 +508,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - AzureRM: 2.1.0 (Default), 6.13.1 - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.542 +- AWSPowershell: 4.1.550 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 - Microsoft.Graph: 2.16.0 @@ -552,3 +556,4 @@ All other versions are saved but not installed. | mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:e15423aa2e5b51384f2edd40ddd1317371fc43f9483ec055989ef5ceb0c627a5 | 2024-03-12 | | mcr.microsoft.com/windows/nanoserver:1809 | sha256:05f991b57e0095d6ea29c4fa7bef9e614c290de030c8e10e40cebc505871f725 | 2024-03-04 | | mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:00cdad01de658d8d64acf052ddaa19c848e6d7edd214f2d8c2fd3da116fa58b2 | 2024-03-04 | + From 22d681c1e298e687e01a9c770194250340514d8a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 5 Apr 2024 15:56:16 +0000 Subject: [PATCH 2764/3485] Updating readme file for win22 version 20240403.1.1 (#9637) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/windows/Windows2022-Readme.md | 59 +++++++++++++++------------- 1 file changed, 32 insertions(+), 27 deletions(-) diff --git a/images/windows/Windows2022-Readme.md b/images/windows/Windows2022-Readme.md index a4e35b31889c..623db10d1eeb 100644 --- a/images/windows/Windows2022-Readme.md +++ b/images/windows/Windows2022-Readme.md @@ -1,6 +1,10 @@ +| Announcements | +|-| +| [[Ubuntu, Windows] Docker Compose v1 will be removed from images on April, 1](https://github.com/actions/runner-images/issues/9557) | +*** # Windows Server 2022 - OS Version: 10.0.20348 Build 2340 -- Image Version: 20240322.1.0 +- Image Version: 20240403.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -27,9 +31,9 @@ - NPM 9.8.1 - NuGet 6.9.1.3 - pip 24.0 (python 3.9) -- Pipx 1.4.3 +- Pipx 1.5.0 - RubyGems 3.2.33 -- Vcpkg (build from commit 18e898197) +- Vcpkg (build from commit 11ed79186) - Yarn 1.22.22 #### Environment variables @@ -47,7 +51,7 @@ ### Tools - 7zip 23.01 - aria2 1.37.0 -- azcopy 10.23.0 +- azcopy 10.24.0 - Bazel 7.1.1 - Bazelisk 1.19.0 - Bicep 0.26.54 @@ -74,31 +78,31 @@ - NSIS 3.09 - OpenSSL 1.1.1w - Packer 1.10.2 -- Pulumi 3.111.1 +- Pulumi 3.112.0 - R 4.3.2 - Service Fabric SDK 9.1.1436.9590 -- Stack 2.15.3 +- Stack 2.15.5 - Subversion (SVN) 1.14.2 - Swig 4.1.1 - VSWhere 3.1.7 - WinAppDriver 1.2.2009.02003 -- WiX Toolset 3.14.0.8606 +- WiX Toolset 3.14.1.8722 - yamllint 1.35.1 -- zstd 1.5.5 +- zstd 1.5.6 ### CLI Tools -- Alibaba Cloud CLI 3.0.200 -- AWS CLI 2.15.31 +- Alibaba Cloud CLI 3.0.201 +- AWS CLI 2.15.34 - AWS SAM CLI 1.113.0 - AWS Session Manager CLI 1.2.553.0 -- Azure CLI 2.58.0 +- Azure CLI 2.59.0 - Azure DevOps CLI extension 1.0.0 - GitHub CLI 2.46.0 ### Rust Tools -- Cargo 1.77.0 -- Rust 1.77.0 -- Rustdoc 1.77.0 +- Cargo 1.77.1 +- Rust 1.77.1 +- Rustdoc 1.77.1 - Rustup 1.27.0 #### Packages @@ -110,14 +114,14 @@ - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 123.0.6312.59 -- Chrome Driver 123.0.6312.58 -- Microsoft Edge 122.0.2365.92 -- Microsoft Edge Driver 122.0.2365.106 -- Mozilla Firefox 124.0.1 +- Google Chrome 123.0.6312.106 +- Chrome Driver 123.0.6312.86 +- Microsoft Edge 123.0.2420.65 +- Microsoft Edge Driver 123.0.2420.65 +- Mozilla Firefox 124.0.2 - Gecko Driver 0.34.0 - IE Driver 4.14.0.0 -- Selenium server 4.18.0 +- Selenium server 4.19.0 #### Environment variables | Name | Value | @@ -161,8 +165,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Node.js - 16.20.2 -- 18.19.1 -- 20.11.1 +- 18.20.0 +- 20.12.0 #### Python - 3.7.9 @@ -200,7 +204,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### MongoDB | Version | ServiceName | ServiceStatus | ServiceStartType | | -------- | ----------- | ------------- | ---------------- | -| 5.0.25.0 | MongoDB | Stopped | Disabled | +| 5.0.26.0 | MongoDB | Stopped | Disabled | ### Database tools - Azure CosmosDb Emulator 2.14.16.0 @@ -216,9 +220,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Nginx | 1.25.4 | C:\tools\nginx-1.25.4\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2022 -| Name | Version | Path | -| ----------------------------- | -------------- | -------------------------------------------------------- | -| Visual Studio Enterprise 2022 | 17.9.34714.143 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | +| Name | Version | Path | +| ----------------------------- | ------------- | -------------------------------------------------------- | +| Visual Studio Enterprise 2022 | 17.9.34723.18 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | #### Workloads, components and extensions | Package | Version | @@ -560,7 +564,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - AzureRM: 2.1.0 (Default), 6.13.1 - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.542 +- AWSPowershell: 4.1.550 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 - Microsoft.Graph: 2.16.0 @@ -608,3 +612,4 @@ All other versions are saved but not installed. | mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:76d2dd2054a18f47d9c690f9d0047e319d7b68aa4e72ee7aae46e3637042c165 | 2024-03-12 | | mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:6e6053f0358f9522d2d14693f9bc152f47fe04c82c53dc8c6d127a5a823c8720 | 2024-03-05 | | mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:6b8781cab588a2858d1aba2c5d5456e79c823e04d666d59d0732dab1273dc8fb | 2024-03-05 | + From 0e742d93bfc10e89a38342e0cd84e69364445239 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 8 Apr 2024 23:52:19 +0200 Subject: [PATCH 2765/3485] Updating readme file for ubuntu20 version 20240407.1.1 (#9657) Co-authored-by: Image generation service account <no-reply@microsoft.com> --- images/ubuntu/Ubuntu2004-Readme.md | 99 ++++++++++++++---------------- 1 file changed, 47 insertions(+), 52 deletions(-) diff --git a/images/ubuntu/Ubuntu2004-Readme.md b/images/ubuntu/Ubuntu2004-Readme.md index 93e5d43a4f26..442a46d12fc4 100644 --- a/images/ubuntu/Ubuntu2004-Readme.md +++ b/images/ubuntu/Ubuntu2004-Readme.md @@ -1,11 +1,7 @@ -| Announcements | -|-| -| [[Ubuntu, Windows] Docker Compose v1 will be removed from images on April, 1](https://github.com/actions/runner-images/issues/9557) | -*** # Ubuntu 20.04 - OS Version: 20.04.6 LTS - Kernel Version: 5.15.0-1059-azure -- Image Version: 20240324.1.0 +- Image Version: 20240407.1.0 - Systemd version: 245.4-4ubuntu3.23 ## Installed Software @@ -24,7 +20,7 @@ - Kotlin 1.9.23-release-779 - Mono 6.12.0.200 - MSBuild 16.10.1.31701 (Mono 6.12.0.200) -- Node.js 18.19.1 +- Node.js 18.20.1 - Perl 5.30.0 - Python 3.8.10 - Ruby 2.7.0p0 @@ -33,15 +29,15 @@ ### Package Management - cpan 1.64 - Helm 3.14.3 -- Homebrew 4.2.14 +- Homebrew 4.2.16 - Miniconda 24.1.2 -- Npm 10.2.4 +- Npm 10.5.0 - NuGet 6.6.1.2 - Pip 20.0.2 - Pip3 20.0.2 -- Pipx 1.4.3 +- Pipx 1.5.0 - RubyGems 3.1.2 -- Vcpkg (build from commit a34c873a9) +- Vcpkg (build from commit 5fa0f075e) - Yarn 1.22.22 #### Environment variables @@ -68,30 +64,30 @@ to accomplish this. ### Tools - Ansible 2.13.13 - apt-fast 1.10.0 -- AzCopy 10.23.0 - available by `azcopy` and `azcopy10` aliases +- AzCopy 10.24.0 - available by `azcopy` and `azcopy10` aliases - Bazel 7.1.1 - Bazelisk 1.19.0 - Bicep 0.26.54 - Buildah 1.22.3 -- CMake 3.29.0 -- CodeQL Action Bundle 2.16.5 +- CMake 3.29.1 +- CodeQL Action Bundle 2.17.0 - Docker Amazon ECR Credential Helper 0.7.1 - Docker Compose v1 1.29.2 - Docker Compose v2 2.23.3 - Docker-Buildx 0.13.1 - Docker Client 24.0.9 - Docker Server 24.0.9 -- Fastlane 2.219.0 +- Fastlane 2.220.0 - Git 2.43.2 - Git LFS 3.5.1 - Git-ftp 1.6.0 - Haveged 1.9.1 -- Heroku 8.11.0 +- Heroku 8.11.1 - HHVM (HipHop VM) 4.172.1 - jq 1.6 - Kind 0.22.0 - Kubectl 1.29.3 -- Kustomize 5.3.0 +- Kustomize 5.4.1 - Leiningen 2.11.2 - MediaInfo 19.09 - Mercurial 5.3.1 @@ -104,7 +100,7 @@ to accomplish this. - Parcel 2.12.0 - PhantomJS 2.1.1 2.1.1 - Podman 3.4.2 -- Pulumi 3.111.1 +- Pulumi 3.112.0 - R 4.3.3 - Skopeo 1.5.0 - Sphinx Open Source Search Server 2.2.11 @@ -112,21 +108,21 @@ to accomplish this. - Terraform 1.7.5 - yamllint 1.35.1 - yq 4.43.1 -- zstd 1.5.5 +- zstd 1.5.6 ### CLI Tools - Alibaba Cloud CLI 3.0.174 -- AWS CLI 2.15.32 +- AWS CLI 2.15.36 - AWS CLI Session Manager Plugin 1.2.553.0 -- AWS SAM CLI 1.113.0 -- Azure CLI 2.58.0 +- AWS SAM CLI 1.114.0 +- Azure CLI 2.59.0 - Azure CLI (azure-devops) 1.0.0 -- GitHub CLI 2.46.0 -- Google Cloud CLI 469.0.0 -- Netlify CLI 17.20.1 -- OpenShift CLI 4.15.3 +- GitHub CLI 2.47.0 +- Google Cloud CLI 471.0.0 +- Netlify CLI 17.21.2 +- OpenShift CLI 4.15.6 - ORAS CLI 1.1.0 -- Vercel CLI 33.6.1 +- Vercel CLI 33.7.0 ### Java | Version | Environment Variable | @@ -139,7 +135,7 @@ to accomplish this. ### PHP Tools - PHP: 7.4.33, 8.0.30, 8.1.27, 8.2.17, 8.3.4 - Composer 2.7.2 -- PHPUnit 8.5.37 +- PHPUnit 8.5.38 ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ``` @@ -148,12 +144,12 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Cabal 3.10.3.0 - GHC 9.8.2 - GHCup 0.1.22.0 -- Stack 2.15.3 +- Stack 2.15.5 ### Rust Tools -- Cargo 1.77.0 -- Rust 1.77.0 -- Rustdoc 1.77.0 +- Cargo 1.77.1 +- Rust 1.77.1 +- Rustdoc 1.77.1 - Rustup 1.27.0 #### Packages @@ -165,13 +161,13 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 123.0.6312.58 -- ChromeDriver 123.0.6312.58 +- Google Chrome 123.0.6312.105 +- ChromeDriver 123.0.6312.105 - Chromium 123.0.6312.0 -- Microsoft Edge 123.0.2420.53 -- Microsoft Edge WebDriver 123.0.2420.53 -- Selenium server 4.18.1 -- Mozilla Firefox 124.0.1 +- Microsoft Edge 123.0.2420.81 +- Microsoft Edge WebDriver 123.0.2420.81 +- Selenium server 4.19.1 +- Mozilla Firefox 124.0.2 - Geckodriver 0.34.0 #### Environment variables @@ -183,11 +179,11 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | ### .NET Tools -- .NET Core SDK: 6.0.420, 7.0.407, 8.0.202 +- .NET Core SDK: 6.0.420, 7.0.407, 8.0.203 - nbgv 3.6.133+2d32d93cb1 ### Databases -- MongoDB 5.0.25 +- MongoDB 5.0.26 - sqlite3 3.31.1 #### PostgreSQL @@ -215,20 +211,20 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Go - 1.20.14 -- 1.21.8 -- 1.22.1 +- 1.21.9 +- 1.22.2 #### Node.js - 16.20.2 -- 18.19.1 -- 20.11.1 +- 18.20.1 +- 20.12.1 #### Python - 3.7.17 - 3.8.18 - 3.9.19 - 3.10.14 -- 3.11.8 +- 3.11.9 - 3.12.2 #### PyPy @@ -294,10 +290,10 @@ Use the following command as a part of your job to start the service: 'sudo syst | moby/buildkit:latest | sha256:00d2c6b8f39ae515e0eadd74f39e71a5efdc94321c9b919692a2aa32deef2bb1 | 2024-03-18 | | node:16 | sha256:f77a1aef2da8d83e45ec990f45df50f1a286c5fe8bbfb8c6e4246c6389705c0b | 2023-09-07 | | node:16-alpine | sha256:a1f9d027912b58a7c75be7716c97cfbc6d3099f3a97ed84aa490be9dee20e787 | 2023-08-10 | -| node:18 | sha256:b39895225fb1984139d5af76400aff8fac3dd5bc00dd41a3ce22fc8a6cf538d5 | 2024-03-12 | -| node:18-alpine | sha256:c7620fdecfefb96813da62519897808775230386f4c8482e972e37b8b18cb460 | 2024-03-16 | -| node:20 | sha256:e06aae17c40c7a6b5296ca6f942a02e6737ae61bbbf3e2158624bb0f887991b5 | 2024-03-12 | -| node:20-alpine | sha256:bf77dc26e48ea95fca9d1aceb5acfa69d2e546b765ec2abfb502975f1a2d4def | 2024-03-16 | +| node:18 | sha256:be6b6dc2a62591408c3f0475de2e3ae34e22879fe0f5b4c3733ecfadffd62e3b | 2024-04-04 | +| node:18-alpine | sha256:6d9d5269cbe4088803e9ef81da62ac481c063b60cadbe8e628bfcbb12296d901 | 2024-04-04 | +| node:20 | sha256:8a03de2385cb16c4d76aac30bf86ab05f55f1754a5402dc9039916e8043f019a | 2024-04-04 | +| node:20-alpine | sha256:7e227295e96f5b00aa79555ae166f50610940d888fc2e321cf36304cbd17d7d6 | 2024-04-04 | | ubuntu:20.04 | sha256:80ef4a44043dec4490506e6cc4289eeda2d106a70148b74b5ae91ee670e9c35d | 2024-02-16 | ### Installed apt packages @@ -312,7 +308,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | brotli | 1.0.7-6ubuntu0.1 | | bzip2 | 1.0.8-2 | | coreutils | 8.30-3ubuntu2 | -| curl | 7.68.0-1ubuntu2.21 | +| curl | 7.68.0-1ubuntu2.22 | | dbus | 1.12.16-2ubuntu2.3 | | dnsutils | 1:9.16.48-0ubuntu0.20.04.1 | | dpkg | 1.19.7ubuntu3.2 | @@ -335,7 +331,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | libc++-dev | 1:10.0-50\~exp1 | | libc++abi-dev | 1:10.0-50\~exp1 | | libc6-dev | 2.31-0ubuntu9.14 | -| libcurl4 | 7.68.0-1ubuntu2.21 | +| libcurl4 | 7.68.0-1ubuntu2.22 | | libgbm-dev | 21.2.6-0ubuntu0.1\~20.04.2 | | libgconf-2-4 | 3.2.6-6ubuntu1 | | libgsl-dev | 2.5+dfsg-6+deb10u1build0.20.04.1 | @@ -387,8 +383,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | upx | 3.95-2build1 | | wget | 1.20.3-1ubuntu2 | | xorriso | 1.5.2-1 | -| xvfb | 2:1.20.13-1ubuntu1\~20.04.15 | +| xvfb | 2:1.20.13-1ubuntu1\~20.04.16 | | xz-utils | 5.2.4-1ubuntu1.1 | | zip | 3.0-11build1 | | zsync | 0.6.2-3ubuntu1 | - From 27614dc1de83d6a0bea9285b594ef8023d5ca214 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 9 Apr 2024 02:31:57 +0200 Subject: [PATCH 2766/3485] Updating readme file for ubuntu22 version 20240407.1.1 (#9656) Co-authored-by: Image generation service account <no-reply@microsoft.com> --- images/ubuntu/Ubuntu2204-Readme.md | 105 ++++++++++++++--------------- 1 file changed, 50 insertions(+), 55 deletions(-) diff --git a/images/ubuntu/Ubuntu2204-Readme.md b/images/ubuntu/Ubuntu2204-Readme.md index 52f10b59d06c..b5e67b842f72 100644 --- a/images/ubuntu/Ubuntu2204-Readme.md +++ b/images/ubuntu/Ubuntu2204-Readme.md @@ -1,11 +1,7 @@ -| Announcements | -|-| -| [[Ubuntu, Windows] Docker Compose v1 will be removed from images on April, 1](https://github.com/actions/runner-images/issues/9557) | -*** # Ubuntu 22.04 - OS Version: 22.04.4 LTS -- Kernel Version: 6.5.0-1016-azure -- Image Version: 20240324.2.0 +- Kernel Version: 6.5.0-1017-azure +- Image Version: 20240407.1.0 - Systemd version: 249.11-0ubuntu3.12 ## Installed Software @@ -22,7 +18,7 @@ - Kotlin 1.9.23-release-779 - Mono 6.12.0.200 - MSBuild 16.10.1.31701 (Mono 6.12.0.200) -- Node.js 18.19.1 +- Node.js 18.20.1 - Perl 5.34.0 - Python 3.10.12 - Ruby 3.0.2p107 @@ -31,15 +27,15 @@ ### Package Management - cpan 1.64 - Helm 3.14.3 -- Homebrew 4.2.14 +- Homebrew 4.2.16 - Miniconda 24.1.2 -- Npm 10.2.4 +- Npm 10.5.0 - NuGet 6.6.1.2 - Pip 22.0.2 - Pip3 22.0.2 -- Pipx 1.4.3 +- Pipx 1.5.0 - RubyGems 3.3.5 -- Vcpkg (build from commit a34c873a9) +- Vcpkg (build from commit 5fa0f075e) - Yarn 1.22.22 #### Environment variables @@ -61,31 +57,31 @@ to accomplish this. - Maven 3.8.8 ### Tools -- Ansible 2.16.4 +- Ansible 2.16.5 - apt-fast 1.10.0 -- AzCopy 10.23.0 - available by `azcopy` and `azcopy10` aliases +- AzCopy 10.24.0 - available by `azcopy` and `azcopy10` aliases - Bazel 7.1.1 - Bazelisk 1.19.0 - Bicep 0.26.54 - Buildah 1.23.1 -- CMake 3.29.0 -- CodeQL Action Bundle 2.16.5 +- CMake 3.29.1 +- CodeQL Action Bundle 2.17.0 - Docker Amazon ECR Credential Helper 0.7.1 - Docker Compose v1 1.29.2 - Docker Compose v2 2.23.3 - Docker-Buildx 0.13.1 - Docker Client 24.0.9 - Docker Server 24.0.9 -- Fastlane 2.219.0 +- Fastlane 2.220.0 - Git 2.43.2 - Git LFS 3.5.1 - Git-ftp 1.6.0 - Haveged 1.9.14 -- Heroku 8.11.0 +- Heroku 8.11.1 - jq 1.6 - Kind 0.22.0 - Kubectl 1.29.3 -- Kustomize 5.3.0 +- Kustomize 5.4.1 - Leiningen 2.11.2 - MediaInfo 21.09 - Mercurial 6.1.1 @@ -97,7 +93,7 @@ to accomplish this. - Packer 1.10.2 - Parcel 2.12.0 - Podman 3.4.4 -- Pulumi 3.111.1 +- Pulumi 3.112.0 - R 4.3.3 - Skopeo 1.4.1 - Sphinx Open Source Search Server 2.2.11 @@ -105,21 +101,21 @@ to accomplish this. - Terraform 1.7.5 - yamllint 1.35.1 - yq 4.43.1 -- zstd 1.5.5 +- zstd 1.5.6 ### CLI Tools -- Alibaba Cloud CLI 3.0.200 -- AWS CLI 2.15.32 +- Alibaba Cloud CLI 3.0.201 +- AWS CLI 2.15.36 - AWS CLI Session Manager Plugin 1.2.553.0 -- AWS SAM CLI 1.113.0 -- Azure CLI 2.58.0 +- AWS SAM CLI 1.114.0 +- Azure CLI 2.59.0 - Azure CLI (azure-devops) 1.0.0 -- GitHub CLI 2.46.0 -- Google Cloud CLI 469.0.0 -- Netlify CLI 17.20.1 -- OpenShift CLI 4.15.3 +- GitHub CLI 2.47.0 +- Google Cloud CLI 471.0.0 +- Netlify CLI 17.21.2 +- OpenShift CLI 4.15.6 - ORAS CLI 1.1.0 -- Vercel CLI 33.6.1 +- Vercel CLI 33.7.0 ### Java | Version | Environment Variable | @@ -132,7 +128,7 @@ to accomplish this. ### PHP Tools - PHP: 8.1.2 - Composer 2.7.2 -- PHPUnit 8.5.37 +- PHPUnit 8.5.38 ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ``` @@ -141,12 +137,12 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Cabal 3.10.3.0 - GHC 9.8.2 - GHCup 0.1.22.0 -- Stack 2.15.3 +- Stack 2.15.5 ### Rust Tools -- Cargo 1.77.0 -- Rust 1.77.0 -- Rustdoc 1.77.0 +- Cargo 1.77.1 +- Rust 1.77.1 +- Rustdoc 1.77.1 - Rustup 1.27.0 #### Packages @@ -158,13 +154,13 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 123.0.6312.58 -- ChromeDriver 123.0.6312.58 +- Google Chrome 123.0.6312.105 +- ChromeDriver 123.0.6312.105 - Chromium 123.0.6312.0 -- Microsoft Edge 123.0.2420.53 -- Microsoft Edge WebDriver 123.0.2420.53 -- Selenium server 4.18.1 -- Mozilla Firefox 124.0.1 +- Microsoft Edge 123.0.2420.81 +- Microsoft Edge WebDriver 123.0.2420.81 +- Selenium server 4.19.1 +- Mozilla Firefox 124.0.2 - Geckodriver 0.34.0 #### Environment variables @@ -176,7 +172,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | ### .NET Tools -- .NET Core SDK: 6.0.420, 7.0.407, 8.0.202 +- .NET Core SDK: 6.0.420, 7.0.407, 8.0.203 - nbgv 3.6.133+2d32d93cb1 ### Databases @@ -207,20 +203,20 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Go - 1.20.14 -- 1.21.8 -- 1.22.1 +- 1.21.9 +- 1.22.2 #### Node.js - 16.20.2 -- 18.19.1 -- 20.11.1 +- 18.20.1 +- 20.12.1 #### Python - 3.7.17 - 3.8.18 - 3.9.19 - 3.10.14 -- 3.11.8 +- 3.11.9 - 3.12.2 #### PyPy @@ -281,10 +277,10 @@ Use the following command as a part of your job to start the service: 'sudo syst | moby/buildkit:latest | sha256:00d2c6b8f39ae515e0eadd74f39e71a5efdc94321c9b919692a2aa32deef2bb1 | 2024-03-18 | | node:16 | sha256:f77a1aef2da8d83e45ec990f45df50f1a286c5fe8bbfb8c6e4246c6389705c0b | 2023-09-07 | | node:16-alpine | sha256:a1f9d027912b58a7c75be7716c97cfbc6d3099f3a97ed84aa490be9dee20e787 | 2023-08-10 | -| node:18 | sha256:b39895225fb1984139d5af76400aff8fac3dd5bc00dd41a3ce22fc8a6cf538d5 | 2024-03-12 | -| node:18-alpine | sha256:c7620fdecfefb96813da62519897808775230386f4c8482e972e37b8b18cb460 | 2024-03-16 | -| node:20 | sha256:e06aae17c40c7a6b5296ca6f942a02e6737ae61bbbf3e2158624bb0f887991b5 | 2024-03-12 | -| node:20-alpine | sha256:bf77dc26e48ea95fca9d1aceb5acfa69d2e546b765ec2abfb502975f1a2d4def | 2024-03-16 | +| node:18 | sha256:be6b6dc2a62591408c3f0475de2e3ae34e22879fe0f5b4c3733ecfadffd62e3b | 2024-04-04 | +| node:18-alpine | sha256:6d9d5269cbe4088803e9ef81da62ac481c063b60cadbe8e628bfcbb12296d901 | 2024-04-04 | +| node:20 | sha256:8a03de2385cb16c4d76aac30bf86ab05f55f1754a5402dc9039916e8043f019a | 2024-04-04 | +| node:20-alpine | sha256:7e227295e96f5b00aa79555ae166f50610940d888fc2e321cf36304cbd17d7d6 | 2024-04-04 | | ubuntu:20.04 | sha256:80ef4a44043dec4490506e6cc4289eeda2d106a70148b74b5ae91ee670e9c35d | 2024-02-16 | | ubuntu:22.04 | sha256:77906da86b60585ce12215807090eb327e7386c8fafb5402369e421f44eff17e | 2024-02-27 | @@ -299,8 +295,8 @@ Use the following command as a part of your job to start the service: 'sudo syst | bison | 2:3.8.2+dfsg-1build1 | | brotli | 1.0.9-2build6 | | bzip2 | 1.0.8-5build1 | -| coreutils | 8.32-4.1ubuntu1.1 | -| curl | 7.81.0-1ubuntu1.15 | +| coreutils | 8.32-4.1ubuntu1.2 | +| curl | 7.81.0-1ubuntu1.16 | | dbus | 1.12.20-2ubuntu4.1 | | dnsutils | 1:9.18.18-0ubuntu0.22.04.2 | | dpkg | 1.21.1ubuntu2.3 | @@ -323,7 +319,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | libc++-dev | 1:14.0-55\~exp2 | | libc++abi-dev | 1:14.0-55\~exp2 | | libc6-dev | 2.35-0ubuntu3.6 | -| libcurl4 | 7.81.0-1ubuntu1.15 | +| libcurl4 | 7.81.0-1ubuntu1.16 | | libgbm-dev | 23.2.1-1ubuntu3.1\~22.04.2 | | libgconf-2-4 | 3.2.6-7ubuntu2 | | libgsl-dev | 2.7.1+dfsg-3 | @@ -377,8 +373,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | upx | 3.96-3 | | wget | 1.21.2-2ubuntu1 | | xorriso | 1.5.4-2 | -| xvfb | 2:21.1.4-2ubuntu1.7\~22.04.8 | +| xvfb | 2:21.1.4-2ubuntu1.7\~22.04.9 | | xz-utils | 5.2.5-2ubuntu1 | | zip | 3.0-12build2 | | zsync | 0.6.2-3ubuntu1 | - From a659eb965009d0599c6359be4bbe4c3145e7c554 Mon Sep 17 00:00:00 2001 From: Pavel Iakovenko <paveliak@users.noreply.github.com> Date: Tue, 9 Apr 2024 02:50:21 -0700 Subject: [PATCH 2767/3485] Configurable SSH port (#9660) --- images/macos/templates/macOS-12.anka.pkr.hcl | 8 +++++++- images/macos/templates/macOS-13.anka.pkr.hcl | 8 +++++++- images/macos/templates/macOS-13.arm64.anka.pkr.hcl | 8 +++++++- images/macos/templates/macOS-14.anka.pkr.hcl | 8 +++++++- images/macos/templates/macOS-14.arm64.anka.pkr.hcl | 8 +++++++- 5 files changed, 35 insertions(+), 5 deletions(-) diff --git a/images/macos/templates/macOS-12.anka.pkr.hcl b/images/macos/templates/macOS-12.anka.pkr.hcl index edd828b4192b..200946859399 100644 --- a/images/macos/templates/macOS-12.anka.pkr.hcl +++ b/images/macos/templates/macOS-12.anka.pkr.hcl @@ -24,6 +24,11 @@ variable "source_vm_name" { type = string } +variable "source_vm_port" { + type = number + default = 22 +} + variable "source_vm_tag" { type = string default = "" @@ -89,8 +94,9 @@ source "veertu-anka-vm-clone" "template" { source "null" "template" { ssh_host = "${var.source_vm_name}" + ssh_port = "${var.source_vm_port}" ssh_username = "${var.vm_username}" - ssh_password = "${var.vm_password}" + ssh_private_key_file = "${var.vm_password}" ssh_proxy_host = "${var.socks_proxy}" } diff --git a/images/macos/templates/macOS-13.anka.pkr.hcl b/images/macos/templates/macOS-13.anka.pkr.hcl index ee57ed83dbc8..5a358df129dc 100644 --- a/images/macos/templates/macOS-13.anka.pkr.hcl +++ b/images/macos/templates/macOS-13.anka.pkr.hcl @@ -24,6 +24,11 @@ variable "source_vm_name" { type = string } +variable "source_vm_port" { + type = number + default = 22 +} + variable "source_vm_tag" { type = string default = "" @@ -89,8 +94,9 @@ source "veertu-anka-vm-clone" "template" { source "null" "template" { ssh_host = "${var.source_vm_name}" + ssh_port = "${var.source_vm_port}" ssh_username = "${var.vm_username}" - ssh_password = "${var.vm_password}" + ssh_private_key_file = "${var.vm_password}" ssh_proxy_host = "${var.socks_proxy}" } diff --git a/images/macos/templates/macOS-13.arm64.anka.pkr.hcl b/images/macos/templates/macOS-13.arm64.anka.pkr.hcl index 858b4873f24b..7f91b8c19f4b 100644 --- a/images/macos/templates/macOS-13.arm64.anka.pkr.hcl +++ b/images/macos/templates/macOS-13.arm64.anka.pkr.hcl @@ -24,6 +24,11 @@ variable "source_vm_name" { type = string } +variable "source_vm_port" { + type = number + default = 22 +} + variable "source_vm_tag" { type = string default = "" @@ -90,8 +95,9 @@ source "veertu-anka-vm-clone" "template" { source "null" "template" { ssh_host = "${var.source_vm_name}" + ssh_port = "${var.source_vm_port}" ssh_username = "${var.vm_username}" - ssh_password = "${var.vm_password}" + ssh_private_key_file = "${var.vm_password}" ssh_proxy_host = "${var.socks_proxy}" } diff --git a/images/macos/templates/macOS-14.anka.pkr.hcl b/images/macos/templates/macOS-14.anka.pkr.hcl index ed93c149e038..a772f726940b 100644 --- a/images/macos/templates/macOS-14.anka.pkr.hcl +++ b/images/macos/templates/macOS-14.anka.pkr.hcl @@ -24,6 +24,11 @@ variable "source_vm_name" { type = string } +variable "source_vm_port" { + type = number + default = 22 +} + variable "source_vm_tag" { type = string default = "" @@ -89,8 +94,9 @@ source "veertu-anka-vm-clone" "template" { source "null" "template" { ssh_host = "${var.source_vm_name}" + ssh_port = "${var.source_vm_port}" ssh_username = "${var.vm_username}" - ssh_password = "${var.vm_password}" + ssh_private_key_file = "${var.vm_password}" ssh_proxy_host = "${var.socks_proxy}" } diff --git a/images/macos/templates/macOS-14.arm64.anka.pkr.hcl b/images/macos/templates/macOS-14.arm64.anka.pkr.hcl index 750b55387762..65e4edbbc5e2 100644 --- a/images/macos/templates/macOS-14.arm64.anka.pkr.hcl +++ b/images/macos/templates/macOS-14.arm64.anka.pkr.hcl @@ -24,6 +24,11 @@ variable "source_vm_name" { type = string } +variable "source_vm_port" { + type = number + default = 22 +} + variable "source_vm_tag" { type = string default = "" @@ -90,8 +95,9 @@ source "veertu-anka-vm-clone" "template" { source "null" "template" { ssh_host = "${var.source_vm_name}" + ssh_port = "${var.source_vm_port}" ssh_username = "${var.vm_username}" - ssh_password = "${var.vm_password}" + ssh_private_key_file = "${var.vm_password}" ssh_proxy_host = "${var.socks_proxy}" } From 3afd153301d1a498c8d2be9c7abfed7cfa8e5498 Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Wed, 10 Apr 2024 13:32:54 +0200 Subject: [PATCH 2768/3485] [Windows] Update Visual Studio 2022 signature (#9668) --- images/windows/toolsets/toolset-2022.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/windows/toolsets/toolset-2022.json b/images/windows/toolsets/toolset-2022.json index e08ec9d9348c..6b603486661d 100644 --- a/images/windows/toolsets/toolset-2022.json +++ b/images/windows/toolsets/toolset-2022.json @@ -176,7 +176,7 @@ "subversion" : "17", "edition" : "Enterprise", "channel": "release", - "signature": "C2048FB509F1C37A8C3E9EC6648118458AA01780", + "signature": "F9A7CF9FBE13BAC767F4781061332DA6E8B4E0EE", "workloads": [ "Component.Dotfuscator", "Component.Linux.CMake", From 616481d859c43f5dc38cfc5ea84af7827b36316e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 10 Apr 2024 12:03:41 +0000 Subject: [PATCH 2769/3485] Updating readme file for win19 version 20240407.1.1 (#9655) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/windows/Windows2019-Readme.md | 39 ++++++++++++---------------- 1 file changed, 17 insertions(+), 22 deletions(-) diff --git a/images/windows/Windows2019-Readme.md b/images/windows/Windows2019-Readme.md index 4d0c1facada8..9e16836b9e5a 100644 --- a/images/windows/Windows2019-Readme.md +++ b/images/windows/Windows2019-Readme.md @@ -1,10 +1,6 @@ -| Announcements | -|-| -| [[Ubuntu, Windows] Docker Compose v1 will be removed from images on April, 1](https://github.com/actions/runner-images/issues/9557) | -*** # Windows Server 2019 - OS Version: 10.0.17763 Build 5576 -- Image Version: 20240403.1.0 +- Image Version: 20240407.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -13,7 +9,7 @@ ### Language and Runtime - Bash 5.2.26(1)-release -- Go 1.21.8 +- Go 1.21.9 - Julia 1.10.2 - Kotlin 1.9.23 - LLVM 16.0.6 @@ -33,7 +29,7 @@ - pip 24.0 (python 3.7) - Pipx 1.2.1 - RubyGems 3.2.33 -- Vcpkg (build from commit 11ed79186) +- Vcpkg (build from commit 5fa0f075e) - Yarn 1.22.22 #### Environment variables @@ -56,8 +52,8 @@ - Bazelisk 1.19.0 - Bicep 0.26.54 - Cabal 3.10.3.0 -- CMake 3.29.0 -- CodeQL Action Bundle 2.16.5 +- CMake 3.29.1 +- CodeQL Action Bundle 2.17.0 - Docker 24.0.7 - Docker Compose v1 1.29.2 - Docker Compose v2 2.23.3 @@ -81,7 +77,7 @@ - Packer 1.10.2 - Parcel 2.12.0 - Pulumi 3.112.0 -- R 4.3.2 +- R 4.3.3 - Service Fabric SDK 9.1.1436.9590 - Stack 2.15.5 - Subversion (SVN) 1.14.2 @@ -94,13 +90,13 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.201 -- AWS CLI 2.15.34 -- AWS SAM CLI 1.113.0 +- AWS CLI 2.15.36 +- AWS SAM CLI 1.114.0 - AWS Session Manager CLI 1.2.553.0 - Azure CLI 2.59.0 - Azure DevOps CLI extension 1.0.0 - Cloud Foundry CLI 6.53.0 -- GitHub CLI 2.46.0 +- GitHub CLI 2.47.0 ### Rust Tools - Cargo 1.77.1 @@ -118,9 +114,9 @@ ### Browsers and Drivers - Google Chrome 123.0.6312.106 -- Chrome Driver 123.0.6312.86 -- Microsoft Edge 122.0.2365.66 -- Microsoft Edge Driver 122.0.2365.113 +- Chrome Driver 123.0.6312.105 +- Microsoft Edge 123.0.2420.81 +- Microsoft Edge Driver 123.0.2420.81 - Mozilla Firefox 124.0.2 - Gecko Driver 0.34.0 - IE Driver 4.14.0.0 @@ -166,13 +162,13 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Go - 1.20.14 -- 1.21.8 -- 1.22.1 +- 1.21.9 +- 1.22.2 #### Node.js - 16.20.2 -- 18.20.0 -- 20.12.0 +- 18.20.1 +- 20.12.1 #### Python - 3.7.9 @@ -508,7 +504,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - AzureRM: 2.1.0 (Default), 6.13.1 - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.550 +- AWSPowershell: 4.1.553 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 - Microsoft.Graph: 2.16.0 @@ -556,4 +552,3 @@ All other versions are saved but not installed. | mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:e15423aa2e5b51384f2edd40ddd1317371fc43f9483ec055989ef5ceb0c627a5 | 2024-03-12 | | mcr.microsoft.com/windows/nanoserver:1809 | sha256:05f991b57e0095d6ea29c4fa7bef9e614c290de030c8e10e40cebc505871f725 | 2024-03-04 | | mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:00cdad01de658d8d64acf052ddaa19c848e6d7edd214f2d8c2fd3da116fa58b2 | 2024-03-04 | - From 3c356d1227bf637278b7eaa41fe983c8f25fc33f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 10 Apr 2024 12:24:58 +0000 Subject: [PATCH 2770/3485] Updating readme file for macos-14 version 20240405.1 (#9652) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-14-Readme.md | 34 ++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/images/macos/macos-14-Readme.md b/images/macos/macos-14-Readme.md index 2fbca0eefa87..a29fb61e7523 100644 --- a/images/macos/macos-14-Readme.md +++ b/images/macos/macos-14-Readme.md @@ -1,7 +1,7 @@ # macOS 14 - OS Version: macOS 14.4.1 (23E224) - Kernel Version: Darwin 23.4.0 -- Image Version: 20240402.2 +- Image Version: 20240405.1 ## Installed Software @@ -18,7 +18,7 @@ - GNU Fortran 13 (Homebrew GCC 13.2.0) - available by `gfortran-13` alias - Kotlin 1.9.23-release-779 - Mono 6.12.0.188 -- Node.js 20.12.0 +- Node.js 20.12.1 - Perl 5.38.2 - PHP 8.3.4 - Python3 3.12.2 @@ -52,7 +52,7 @@ - Curl 8.7.1 - Git 2.44.0 - Git LFS 3.5.1 -- GitHub CLI 2.46.0 +- GitHub CLI 2.47.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.24.5 - gpg (GnuPG) 2.4.5 @@ -64,15 +64,15 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.15.34 -- AWS SAM CLI 1.113.0 +- AWS CLI 2.15.36 +- AWS SAM CLI 1.114.0 - AWS Session Manager CLI 1.2.553.0 - Azure CLI 2.59.0 - Azure CLI (azure-devops) 1.0.0 - Bicep CLI 0.26.54 -- Cmake 3.29.0 -- CodeQL Action Bundle 2.16.5 -- Fastlane 2.219.0 +- Cmake 3.29.1 +- CodeQL Action Bundle 2.17.0 +- Fastlane 2.220.0 - SwiftFormat 0.53.5 - Xcbeautify 2.0.1 - Xcode Command Line Tools 15.3.0.0.1.1708646388 @@ -85,10 +85,10 @@ - Safari 17.4.1 (19618.1.15.11.14) - SafariDriver 17.4.1 (19618.1.15.11.14) - Google Chrome 123.0.6312.107 -- Google Chrome for Testing 123.0.6312.86 -- ChromeDriver 123.0.6312.86 -- Microsoft Edge 123.0.2420.65 -- Microsoft Edge WebDriver 123.0.2420.65 +- Google Chrome for Testing 123.0.6312.105 +- ChromeDriver 123.0.6312.105 +- Microsoft Edge 123.0.2420.81 +- Microsoft Edge WebDriver 123.0.2420.81 - Mozilla Firefox 124.0.2 - geckodriver 0.34.0 - Selenium server 4.19.1 @@ -115,17 +115,17 @@ - 3.1.4 #### Python -- 3.11.8 +- 3.11.9 - 3.12.2 #### Node.js -- 18.20.0 -- 20.12.0 +- 18.20.1 +- 20.12.1 #### Go - 1.20.14 -- 1.21.8 -- 1.22.1 +- 1.21.9 +- 1.22.2 ### Rust Tools - Cargo 1.77.1 From 34c2a66db85806b0e1a816b44943c4af2246e168 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 10 Apr 2024 12:49:45 +0000 Subject: [PATCH 2771/3485] Updating readme file for macos-13 version 20240405.2 (#9651) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-13-Readme.md | 40 ++++++++++++++++----------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/images/macos/macos-13-Readme.md b/images/macos/macos-13-Readme.md index 3599fe7d8fcb..4023cae3eec7 100644 --- a/images/macos/macos-13-Readme.md +++ b/images/macos/macos-13-Readme.md @@ -1,7 +1,7 @@ # macOS 13 - OS Version: macOS 13.6.6 (22G630) - Kernel Version: Darwin 22.6.0 -- Image Version: 20240402.2 +- Image Version: 20240405.2 ## Installed Software @@ -18,7 +18,7 @@ - GNU Fortran 13 (Homebrew GCC 13.2.0) - available by `gfortran-13` alias - Kotlin 1.9.23-release-779 - Mono 6.12.0.188 -- Node.js 20.12.0 +- Node.js 20.12.1 - Perl 5.38.2 - PHP 8.3.4 - Python3 3.12.2 @@ -35,7 +35,7 @@ - Pip3 24.0 (python 3.12) - Pipx 1.5.0 - RubyGems 3.5.7 -- Vcpkg 2024 (build from commit 1daec834f) +- Vcpkg 2024 (build from commit 8d8cec243) - Yarn 1.22.19 ### Project Management @@ -53,7 +53,7 @@ - Curl 8.7.1 - Git 2.44.0 - Git LFS 3.5.1 -- GitHub CLI 2.46.0 +- GitHub CLI 2.47.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.24.5 - gpg (GnuPG) 2.4.5 @@ -65,15 +65,15 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.15.34 -- AWS SAM CLI 1.113.0 +- AWS CLI 2.15.36 +- AWS SAM CLI 1.114.0 - AWS Session Manager CLI 1.2.553.0 - Azure CLI 2.59.0 - Azure CLI (azure-devops) 1.0.0 - Bicep CLI 0.26.54 -- Cmake 3.29.0 -- CodeQL Action Bundle 2.16.5 -- Fastlane 2.219.0 +- Cmake 3.29.1 +- CodeQL Action Bundle 2.17.0 +- Fastlane 2.220.0 - SwiftFormat 0.53.5 - Xcbeautify 2.0.1 - Xcode Command Line Tools 14.3.1.0.1.1683849156 @@ -86,10 +86,10 @@ - Safari 17.4.1 (18618.1.15.111.8) - SafariDriver 17.4.1 (18618.1.15.111.8) - Google Chrome 123.0.6312.107 -- Google Chrome for Testing 123.0.6312.86 -- ChromeDriver 123.0.6312.86 -- Microsoft Edge 123.0.2420.65 -- Microsoft Edge WebDriver 123.0.2420.65 +- Google Chrome for Testing 123.0.6312.105 +- ChromeDriver 123.0.6312.105 +- Microsoft Edge 123.0.2420.81 +- Microsoft Edge WebDriver 123.0.2420.81 - Mozilla Firefox 124.0.2 - geckodriver 0.34.0 - Selenium server 4.19.1 @@ -126,18 +126,18 @@ - 3.8.18 - 3.9.19 - 3.10.14 -- 3.11.8 +- 3.11.9 - 3.12.2 #### Node.js - 16.20.2 -- 18.20.0 -- 20.12.0 +- 18.20.1 +- 20.12.1 #### Go - 1.20.14 -- 1.21.8 -- 1.22.1 +- 1.21.9 +- 1.22.2 ### Rust Tools - Cargo 1.77.1 @@ -201,11 +201,11 @@ | Simulator - watchOS 9.4 | watchsimulator9.4 | 14.3.1 | | Simulator - watchOS 10.0 | watchsimulator10.0 | 15.0.1 | | Simulator - watchOS 10.2 | watchsimulator10.2 | 15.1, 15.2 | -| Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | | visionOS 1.0 | xros1.0 | 15.2 | +| Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | -| Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | +| Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | DriverKit 22.1 | driverkit22.1 | 14.1 | | DriverKit 22.2 | driverkit22.2 | 14.2 | | DriverKit 22.4 | driverkit22.4 | 14.3.1 | From a0af039ba1565df601a4c5630c264ab777daf66a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 10 Apr 2024 13:10:08 +0000 Subject: [PATCH 2772/3485] Updating readme file for win22 version 20240407.1.1 (#9648) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/windows/Windows2022-Readme.md | 41 ++++++++++++---------------- 1 file changed, 18 insertions(+), 23 deletions(-) diff --git a/images/windows/Windows2022-Readme.md b/images/windows/Windows2022-Readme.md index 623db10d1eeb..29056d60fb01 100644 --- a/images/windows/Windows2022-Readme.md +++ b/images/windows/Windows2022-Readme.md @@ -1,10 +1,6 @@ -| Announcements | -|-| -| [[Ubuntu, Windows] Docker Compose v1 will be removed from images on April, 1](https://github.com/actions/runner-images/issues/9557) | -*** # Windows Server 2022 - OS Version: 10.0.20348 Build 2340 -- Image Version: 20240403.1.0 +- Image Version: 20240407.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -13,7 +9,7 @@ ### Language and Runtime - Bash 5.2.26(1)-release -- Go 1.21.8 +- Go 1.21.9 - Julia 1.10.2 - Kotlin 1.9.23 - LLVM 16.0.6 @@ -33,7 +29,7 @@ - pip 24.0 (python 3.9) - Pipx 1.5.0 - RubyGems 3.2.33 -- Vcpkg (build from commit 11ed79186) +- Vcpkg (build from commit 5fa0f075e) - Yarn 1.22.22 #### Environment variables @@ -56,8 +52,8 @@ - Bazelisk 1.19.0 - Bicep 0.26.54 - Cabal 3.10.3.0 -- CMake 3.29.0 -- CodeQL Action Bundle 2.16.5 +- CMake 3.29.1 +- CodeQL Action Bundle 2.17.0 - Docker 24.0.7 - Docker Compose v1 1.29.2 - Docker Compose v2 2.23.3 @@ -79,7 +75,7 @@ - OpenSSL 1.1.1w - Packer 1.10.2 - Pulumi 3.112.0 -- R 4.3.2 +- R 4.3.3 - Service Fabric SDK 9.1.1436.9590 - Stack 2.15.5 - Subversion (SVN) 1.14.2 @@ -92,12 +88,12 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.201 -- AWS CLI 2.15.34 -- AWS SAM CLI 1.113.0 +- AWS CLI 2.15.36 +- AWS SAM CLI 1.114.0 - AWS Session Manager CLI 1.2.553.0 - Azure CLI 2.59.0 - Azure DevOps CLI extension 1.0.0 -- GitHub CLI 2.46.0 +- GitHub CLI 2.47.0 ### Rust Tools - Cargo 1.77.1 @@ -115,9 +111,9 @@ ### Browsers and Drivers - Google Chrome 123.0.6312.106 -- Chrome Driver 123.0.6312.86 -- Microsoft Edge 123.0.2420.65 -- Microsoft Edge Driver 123.0.2420.65 +- Chrome Driver 123.0.6312.105 +- Microsoft Edge 123.0.2420.81 +- Microsoft Edge Driver 123.0.2420.81 - Mozilla Firefox 124.0.2 - Gecko Driver 0.34.0 - IE Driver 4.14.0.0 @@ -160,20 +156,20 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Go - 1.20.14 -- 1.21.8 -- 1.22.1 +- 1.21.9 +- 1.22.2 #### Node.js - 16.20.2 -- 18.20.0 -- 20.12.0 +- 18.20.1 +- 20.12.1 #### Python - 3.7.9 - 3.8.10 - 3.9.13 - 3.10.11 -- 3.11.8 +- 3.11.9 - 3.12.2 #### PyPy @@ -564,7 +560,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - AzureRM: 2.1.0 (Default), 6.13.1 - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.550 +- AWSPowershell: 4.1.553 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 - Microsoft.Graph: 2.16.0 @@ -612,4 +608,3 @@ All other versions are saved but not installed. | mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:76d2dd2054a18f47d9c690f9d0047e319d7b68aa4e72ee7aae46e3637042c165 | 2024-03-12 | | mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:6e6053f0358f9522d2d14693f9bc152f47fe04c82c53dc8c6d127a5a823c8720 | 2024-03-05 | | mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:6b8781cab588a2858d1aba2c5d5456e79c823e04d666d59d0732dab1273dc8fb | 2024-03-05 | - From 91e422a825d3941ea357a13a91b13d4f4fdc326d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 10 Apr 2024 14:28:46 +0000 Subject: [PATCH 2773/3485] Updating readme file for macos-14-arm64 version 20240405.1 (#9653) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-14-arm64-Readme.md | 34 +++++++++++++-------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/images/macos/macos-14-arm64-Readme.md b/images/macos/macos-14-arm64-Readme.md index 8dbf064affa5..1568bc976d1b 100644 --- a/images/macos/macos-14-arm64-Readme.md +++ b/images/macos/macos-14-arm64-Readme.md @@ -1,7 +1,7 @@ # macOS 14 - OS Version: macOS 14.4.1 (23E224) - Kernel Version: Darwin 23.4.0 -- Image Version: 20240402.2 +- Image Version: 20240405.1 ## Installed Software @@ -18,7 +18,7 @@ - GNU Fortran 13 (Homebrew GCC 13.2.0) - available by `gfortran-13` alias - Kotlin 1.9.23-release-779 - Mono 6.12.0.188 -- Node.js 20.12.0 +- Node.js 20.12.1 - Perl 5.38.2 - Python3 3.12.2 - Ruby 3.0.6p216 @@ -50,7 +50,7 @@ - Curl 8.4.0 - Git 2.44.0 - Git LFS 3.5.1 -- GitHub CLI 2.46.0 +- GitHub CLI 2.47.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.24.5 - gpg (GnuPG) 2.4.5 @@ -62,15 +62,15 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.15.34 -- AWS SAM CLI 1.113.0 +- AWS CLI 2.15.36 +- AWS SAM CLI 1.114.0 - AWS Session Manager CLI 1.2.553.0 - Azure CLI 2.59.0 - Azure CLI (azure-devops) 1.0.0 - Bicep CLI 0.26.54 -- Cmake 3.29.0 -- CodeQL Action Bundle 2.16.5 -- Fastlane 2.219.0 +- Cmake 3.29.1 +- CodeQL Action Bundle 2.17.0 +- Fastlane 2.220.0 - SwiftFormat 0.53.5 - Xcbeautify 2.0.1 - Xcode Command Line Tools 15.3.0.0.1.1708646388 @@ -82,8 +82,8 @@ - Safari 17.4.1 (19618.1.15.11.14) - SafariDriver 17.4.1 (19618.1.15.11.14) - Google Chrome 123.0.6312.107 -- Google Chrome for Testing 123.0.6312.86 -- ChromeDriver 123.0.6312.86 +- Google Chrome for Testing 123.0.6312.105 +- ChromeDriver 123.0.6312.105 - Selenium server 4.19.1 #### Environment variables @@ -103,17 +103,17 @@ ### Cached Tools #### Python -- 3.11.8 +- 3.11.9 - 3.12.2 #### Node.js -- 18.20.0 -- 20.12.0 +- 18.20.1 +- 20.12.1 #### Go - 1.20.14 -- 1.21.8 -- 1.22.1 +- 1.21.9 +- 1.22.2 ### Rust Tools - Cargo 1.77.1 @@ -175,11 +175,11 @@ | Simulator - watchOS 10.4 | watchsimulator10.4 | 15.3 | | Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | | visionOS 1.0 | xros1.0 | 15.2 | -| Simulator - visionOS 1.1 | xrsimulator1.1 | 15.3 | | visionOS 1.1 | xros1.1 | 15.3 | +| Simulator - visionOS 1.1 | xrsimulator1.1 | 15.3 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | -| Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | +| Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | | DriverKit 22.4 | driverkit22.4 | 14.3.1 | | DriverKit 23.0 | driverkit23.0 | 15.0.1 | | DriverKit 23.2 | driverkit23.2 | 15.1, 15.2 | From 514d689e7ca41f51ac9cbb12e508ccc3e9f4801b Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Thu, 11 Apr 2024 14:28:25 +0200 Subject: [PATCH 2774/3485] [Ubuntu] Fix Swift installer (#9677) --- images/ubuntu/scripts/build/install-swift.sh | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/images/ubuntu/scripts/build/install-swift.sh b/images/ubuntu/scripts/build/install-swift.sh index 61473e936404..fe8ffc782f1c 100644 --- a/images/ubuntu/scripts/build/install-swift.sh +++ b/images/ubuntu/scripts/build/install-swift.sh @@ -17,16 +17,25 @@ archive_url="https://swift.org/builds/swift-${swift_version}-release/${image_lab archive_path=$(download_with_retry "$archive_url") # Verifying PGP signature using official Swift PGP key. Referring to https://www.swift.org/install/linux/#Installation-via-Tarball -# Download and import Swift PGP key -pgp_key_path=$(download_with_retry "https://swift.org/keys/all-keys.asc") -gpg --no-default-keyring --keyring swift --import "$pgp_key_path" +# Download and import Swift PGP keys +gpg --keyserver hkp://keyserver.ubuntu.com \ + --recv-keys \ + '7463 A81A 4B2E EA1B 551F FBCF D441 C977 412B 37AD' \ + '1BE1 E29A 084C B305 F397 D62A 9F59 7F4D 21A5 6D5F' \ + 'A3BA FD35 56A5 9079 C068 94BD 63BC 1CFE 91D3 06C6' \ + '5E4D F843 FB06 5D7F 7E24 FBA2 EF54 30F0 71E1 B235' \ + '8513 444E 2DA3 6B7C 1659 AF4D 7638 F1FB 2B2B 08C4' \ + 'A62A E125 BBBF BB96 A6E0 42EC 925C C1CC ED3D 1561' \ + '8A74 9566 2C3C D4AE 18D9 5637 FAF6 989E 1BC1 6FEA' \ + 'E813 C892 820A 6FA1 3755 B268 F167 DF1A CF9C E069' +gpg --keyserver hkp://keyserver.ubuntu.com --refresh-keys Swift # Download and verify signature signature_path=$(download_with_retry "${archive_url}.sig") -gpg --no-default-keyring --keyring swift --verify "$signature_path" "$archive_path" +gpg --verify "$signature_path" "$archive_path" # Remove Swift PGP public key with temporary keyring -rm ~/.gnupg/swift +rm -rf ~/.gnupg # Extract and install swift tar xzf "$archive_path" -C /tmp From d8214c6eaa70d26be1a265520ca620c941c496f4 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 11 Apr 2024 20:45:30 +0000 Subject: [PATCH 2775/3485] Updating readme file for macos-13-arm64 version 20240405.1 (#9650) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-13-arm64-Readme.md | 32 +++++++++++++-------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/images/macos/macos-13-arm64-Readme.md b/images/macos/macos-13-arm64-Readme.md index 401881507d05..68cb5220bfa6 100644 --- a/images/macos/macos-13-arm64-Readme.md +++ b/images/macos/macos-13-arm64-Readme.md @@ -1,7 +1,7 @@ # macOS 13 - OS Version: macOS 13.6.6 (22G630) - Kernel Version: Darwin 22.6.0 -- Image Version: 20240402.2 +- Image Version: 20240405.1 ## Installed Software @@ -18,7 +18,7 @@ - GNU Fortran 13 (Homebrew GCC 13.2.0) - available by `gfortran-13` alias - Kotlin 1.9.23-release-779 - Mono 6.12.0.188 -- Node.js 20.12.0 +- Node.js 20.12.1 - Perl 5.38.2 - Python3 3.12.2 - Ruby 3.0.6p216 @@ -50,7 +50,7 @@ - Curl 8.4.0 - Git 2.44.0 - Git LFS 3.5.1 -- GitHub CLI 2.46.0 +- GitHub CLI 2.47.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.24.5 - gpg (GnuPG) 2.4.5 @@ -62,15 +62,15 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.15.34 -- AWS SAM CLI 1.113.0 +- AWS CLI 2.15.36 +- AWS SAM CLI 1.114.0 - AWS Session Manager CLI 1.2.553.0 - Azure CLI 2.59.0 - Azure CLI (azure-devops) 1.0.0 - Bicep CLI 0.26.54 -- Cmake 3.29.0 -- CodeQL Action Bundle 2.16.5 -- Fastlane 2.219.0 +- Cmake 3.29.1 +- CodeQL Action Bundle 2.17.0 +- Fastlane 2.220.0 - SwiftFormat 0.53.5 - Xcbeautify 2.0.1 - Xcode Command Line Tools 14.3.1.0.1.1683849156 @@ -82,8 +82,8 @@ - Safari 17.4.1 (18618.1.15.111.8) - SafariDriver 17.4.1 (18618.1.15.111.8) - Google Chrome 123.0.6312.107 -- Google Chrome for Testing 123.0.6312.86 -- ChromeDriver 123.0.6312.86 +- Google Chrome for Testing 123.0.6312.105 +- ChromeDriver 123.0.6312.105 - Selenium server 4.19.1 #### Environment variables @@ -103,18 +103,18 @@ ### Cached Tools #### Python -- 3.11.8 +- 3.11.9 - 3.12.2 #### Node.js - 16.20.1 -- 18.20.0 -- 20.12.0 +- 18.20.1 +- 20.12.1 #### Go - 1.20.14 -- 1.21.8 -- 1.22.1 +- 1.21.9 +- 1.22.2 ### Rust Tools - Cargo 1.77.1 @@ -178,8 +178,8 @@ | Simulator - watchOS 9.4 | watchsimulator9.4 | 14.3.1 | | Simulator - watchOS 10.0 | watchsimulator10.0 | 15.0.1 | | Simulator - watchOS 10.2 | watchsimulator10.2 | 15.1, 15.2 | -| Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | | visionOS 1.0 | xros1.0 | 15.2 | +| Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | From 2530c697b5ca66ec6da5aa22f09cf7887bdc644c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 12 Apr 2024 10:11:22 +0000 Subject: [PATCH 2776/3485] Updating readme file for macOS-12 version 20240406.2 (#9649) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-12-Readme.md | 60 ++++++++++++++++----------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/images/macos/macos-12-Readme.md b/images/macos/macos-12-Readme.md index 2e13b6f1fc78..983a75969d78 100644 --- a/images/macos/macos-12-Readme.md +++ b/images/macos/macos-12-Readme.md @@ -1,7 +1,7 @@ # macOS 12 - OS Version: macOS 12.7.4 (21H1123) - Kernel Version: Darwin 21.6.0 -- Image Version: 20240329.1 +- Image Version: 20240406.2 ## Installed Software @@ -18,12 +18,12 @@ - GNU Fortran 13 (Homebrew GCC 13.2.0) - available by `gfortran-13` alias - Julia 1.10.2 - Kotlin 1.9.23-release-779 -- Go 1.21.8 +- Go 1.21.9 - Mono 6.12.0.188 -- Node.js 18.19.1 +- Node.js 18.20.1 - MSBuild 16.10.1.51301 (Mono 6.12.0.188) - NVM 0.39.7 -- NVM - Cached node versions: 16.20.2, 18.20.0, 20.12.0 +- NVM - Cached node versions: 16.20.2, 18.20.1, 20.12.1 - Perl 5.38.2 - PHP 8.3.4 - Python 2.7.18 @@ -36,15 +36,15 @@ - Carthage 0.39.1 - CocoaPods 1.15.2 - Composer 2.7.2 -- Homebrew 4.2.15 +- Homebrew 4.2.16 - Miniconda 24.1.2 -- NPM 10.2.4 +- NPM 10.5.0 - NuGet 6.3.1.1 - Pip 20.3.4 (python 2.7) - Pip3 24.0 (python 3.12) - Pipx 1.5.0 - RubyGems 3.5.7 -- Vcpkg 2024 (build from commit 6c296b954) +- Vcpkg 2024 (build from commit 5fa0f075e) - Yarn 1.22.19 #### Environment variables @@ -69,7 +69,7 @@ - Curl 8.7.1 - Git 2.44.0 - Git LFS 3.5.1 -- GitHub CLI 2.46.0 +- GitHub CLI 2.47.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.24.5 - gpg (GnuPG) 2.4.5 @@ -92,21 +92,21 @@ ### Tools - App Center CLI 3.0.0 -- AWS CLI 2.15.34 -- AWS SAM CLI 1.113.0 +- AWS CLI 2.15.36 +- AWS SAM CLI 1.114.0 - AWS Session Manager CLI 1.2.553.0 -- Azure CLI 2.58.0 +- Azure CLI 2.59.0 - Azure CLI (azure-devops) 1.0.0 - Bicep CLI 0.26.54 - Cabal 3.10.2.1 -- Cmake 3.29.0 -- CodeQL Action Bundle 2.16.5 +- Cmake 3.29.1 +- CodeQL Action Bundle 2.17.0 - Colima 0.6.8 -- Fastlane 2.219.0 +- Fastlane 2.220.0 - GHC 9.8.2 - GHCup 0.1.22.0 - Jazzy 0.14.4 -- Stack 2.15.3 +- Stack 2.15.5 - SwiftFormat 0.53.5 - Swig 4.2.1 - Xcbeautify 1.6.0 @@ -120,14 +120,14 @@ ### Browsers - Safari 17.4.1 (17618.1.15.111.8) - SafariDriver 17.4.1 (17618.1.15.111.8) -- Google Chrome 123.0.6312.87 -- Google Chrome for Testing 123.0.6312.86 -- ChromeDriver 123.0.6312.86 -- Microsoft Edge 123.0.2420.65 -- Microsoft Edge WebDriver 123.0.2420.65 -- Mozilla Firefox 124.0.1 +- Google Chrome 123.0.6312.107 +- Google Chrome for Testing 123.0.6312.105 +- ChromeDriver 123.0.6312.105 +- Microsoft Edge 123.0.2420.81 +- Microsoft Edge WebDriver 123.0.2420.81 +- Mozilla Firefox 124.0.2 - geckodriver 0.34.0 -- Selenium server 4.19.0 +- Selenium server 4.19.1 #### Environment variables | Name | Value | @@ -162,18 +162,18 @@ - 3.8.18 - 3.9.19 - 3.10.14 -- 3.11.8 +- 3.11.9 - 3.12.2 #### Node.js - 16.20.2 -- 18.20.0 -- 20.12.0 +- 18.20.1 +- 20.12.1 #### Go - 1.20.14 -- 1.21.8 -- 1.22.1 +- 1.21.9 +- 1.22.2 ### Rust Tools - Cargo 1.77.1 @@ -193,7 +193,7 @@ - PowerShell 7.4.1 #### PowerShell Modules -- Az: 11.4.0 +- Az: 11.5.0 - MarkdownPS: 1.9 - Pester: 5.5.0 - PSScriptAnalyzer: 1.22.0 @@ -201,7 +201,7 @@ ### Web Servers | Name | Version | ConfigFile | ServiceStatus | ListenPort | | ----- | ------- | ------------------------------- | ------------- | ---------- | -| httpd | 2.4.58 | /usr/local/etc/httpd/httpd.conf | none | 80 | +| httpd | 2.4.59 | /usr/local/etc/httpd/httpd.conf | none | 80 | | nginx | 1.25.4 | /usr/local/etc/nginx/nginx.conf | none | 80 | ### Xamarin @@ -330,7 +330,7 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" | Package Name | Version | | -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 8.0 | -| Android Emulator | 34.1.19 | +| Android Emulator | 34.1.20 | | Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2 33.0.3<br>32.0.0<br>31.0.0 | | Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1) | | Android SDK Platform-Tools | 35.0.1 | From 3b976c7acb0ce875060102c0c80f655b479aa5d4 Mon Sep 17 00:00:00 2001 From: Leon Zandman <leon@wirwar.com> Date: Mon, 15 Apr 2024 16:21:18 +0200 Subject: [PATCH 2777/3485] Filename fix. (#9689) Co-authored-by: Leon Zandman <lzandman@rdw.nl> --- images/windows/scripts/build/Configure-System.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/windows/scripts/build/Configure-System.ps1 b/images/windows/scripts/build/Configure-System.ps1 index e20b295dce2f..d02dde2ac3b5 100644 --- a/images/windows/scripts/build/Configure-System.ps1 +++ b/images/windows/scripts/build/Configure-System.ps1 @@ -193,4 +193,4 @@ $disableTaskNames | ForEach-Object { Disable-ScheduledTask @PSItem -ErrorAction Ignore } | Out-Null -Write-Host "Finalize-VM.ps1 - completed" +Write-Host "Configure-System.ps1 - completed" From 7993ee591358052f1dd23c6135281e24b80b572f Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Mon, 15 Apr 2024 18:01:52 +0200 Subject: [PATCH 2778/3485] [Ubuntu] Add Numbat (24.04) helper functions (#9690) --- images/ubuntu/scripts/helpers/Common.Helpers.psm1 | 4 ++++ images/ubuntu/scripts/helpers/os.sh | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/images/ubuntu/scripts/helpers/Common.Helpers.psm1 b/images/ubuntu/scripts/helpers/Common.Helpers.psm1 index 1f740345228b..75dcdb7457f7 100644 --- a/images/ubuntu/scripts/helpers/Common.Helpers.psm1 +++ b/images/ubuntu/scripts/helpers/Common.Helpers.psm1 @@ -62,6 +62,10 @@ function Test-IsUbuntu22 { return (lsb_release -rs) -eq "22.04" } +function Test-IsUbuntu24 { + return (lsb_release -rs) -eq "24.04" +} + function Get-ToolsetContent { <# .SYNOPSIS diff --git a/images/ubuntu/scripts/helpers/os.sh b/images/ubuntu/scripts/helpers/os.sh index 09a2213c2f70..1de83691b309 100644 --- a/images/ubuntu/scripts/helpers/os.sh +++ b/images/ubuntu/scripts/helpers/os.sh @@ -11,3 +11,7 @@ is_ubuntu20() { is_ubuntu22() { lsb_release -d | grep -q 'Ubuntu 22' } + +is_ubuntu24() { + lsb_release -d | grep -q 'Ubuntu 24' +} \ No newline at end of file From b61fcf40405bbc66631a5804fcc380de1116471f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 17 Apr 2024 10:33:01 +0000 Subject: [PATCH 2779/3485] Updating readme file for ubuntu20 version 20240414.1.1 (#9686) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2004-Readme.md | 85 ++++++++++++++++-------------- 1 file changed, 45 insertions(+), 40 deletions(-) diff --git a/images/ubuntu/Ubuntu2004-Readme.md b/images/ubuntu/Ubuntu2004-Readme.md index 442a46d12fc4..e95e4c026031 100644 --- a/images/ubuntu/Ubuntu2004-Readme.md +++ b/images/ubuntu/Ubuntu2004-Readme.md @@ -1,7 +1,11 @@ +| Announcements | +|-| +| [[Ubuntu] ubuntu-toolchain-r/test repository will be removed from images on May 6](https://github.com/actions/runner-images/issues/9679) | +*** # Ubuntu 20.04 - OS Version: 20.04.6 LTS -- Kernel Version: 5.15.0-1059-azure -- Image Version: 20240407.1.0 +- Kernel Version: 5.15.0-1060-azure +- Image Version: 20240414.1.0 - Systemd version: 245.4-4ubuntu3.23 ## Installed Software @@ -13,14 +17,14 @@ - Clang-tidy: 10.0.0, 11.0.0, 12.0.0 - Dash 0.5.10.2-6 - Erlang 25.3 (Eshell 13.2) -- Erlang rebar3 3.22.1 +- Erlang rebar3 3.23.0 - GNU C++: 9.4.0, 10.5.0 - GNU Fortran: 9.4.0, 10.5.0 - Julia 1.10.2 - Kotlin 1.9.23-release-779 - Mono 6.12.0.200 - MSBuild 16.10.1.31701 (Mono 6.12.0.200) -- Node.js 18.20.1 +- Node.js 18.20.2 - Perl 5.30.0 - Python 3.8.10 - Ruby 2.7.0p0 @@ -28,8 +32,8 @@ ### Package Management - cpan 1.64 -- Helm 3.14.3 -- Homebrew 4.2.16 +- Helm 3.14.4 +- Homebrew 4.2.17 - Miniconda 24.1.2 - Npm 10.5.0 - NuGet 6.6.1.2 @@ -37,7 +41,7 @@ - Pip3 20.0.2 - Pipx 1.5.0 - RubyGems 3.1.2 -- Vcpkg (build from commit 5fa0f075e) +- Vcpkg (build from commit ad3bae574) - Yarn 1.22.22 #### Environment variables @@ -67,9 +71,9 @@ to accomplish this. - AzCopy 10.24.0 - available by `azcopy` and `azcopy10` aliases - Bazel 7.1.1 - Bazelisk 1.19.0 -- Bicep 0.26.54 +- Bicep 0.26.170 - Buildah 1.22.3 -- CMake 3.29.1 +- CMake 3.29.2 - CodeQL Action Bundle 2.17.0 - Docker Amazon ECR Credential Helper 0.7.1 - Docker Compose v1 1.29.2 @@ -82,7 +86,7 @@ to accomplish this. - Git LFS 3.5.1 - Git-ftp 1.6.0 - Haveged 1.9.1 -- Heroku 8.11.1 +- Heroku 8.11.2 - HHVM (HipHop VM) 4.172.1 - jq 1.6 - Kind 0.22.0 @@ -105,24 +109,24 @@ to accomplish this. - Skopeo 1.5.0 - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 -- Terraform 1.7.5 +- Terraform 1.8.0 - yamllint 1.35.1 - yq 4.43.1 - zstd 1.5.6 ### CLI Tools - Alibaba Cloud CLI 3.0.174 -- AWS CLI 2.15.36 +- AWS CLI 2.15.38 - AWS CLI Session Manager Plugin 1.2.553.0 -- AWS SAM CLI 1.114.0 +- AWS SAM CLI 1.115.0 - Azure CLI 2.59.0 - Azure CLI (azure-devops) 1.0.0 - GitHub CLI 2.47.0 - Google Cloud CLI 471.0.0 -- Netlify CLI 17.21.2 -- OpenShift CLI 4.15.6 +- Netlify CLI 17.22.1 +- OpenShift CLI 4.15.8 - ORAS CLI 1.1.0 -- Vercel CLI 33.7.0 +- Vercel CLI 34.0.0 ### Java | Version | Environment Variable | @@ -133,7 +137,7 @@ to accomplish this. | 21.0.2+13 | JAVA_HOME_21_X64 | ### PHP Tools -- PHP: 7.4.33, 8.0.30, 8.1.27, 8.2.17, 8.3.4 +- PHP: 7.4.33, 8.0.30, 8.1.27, 8.2.18, 8.3.6 - Composer 2.7.2 - PHPUnit 8.5.38 ``` @@ -147,9 +151,9 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Stack 2.15.5 ### Rust Tools -- Cargo 1.77.1 -- Rust 1.77.1 -- Rustdoc 1.77.1 +- Cargo 1.77.2 +- Rust 1.77.2 +- Rustdoc 1.77.2 - Rustup 1.27.0 #### Packages @@ -161,13 +165,13 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 123.0.6312.105 -- ChromeDriver 123.0.6312.105 +- Google Chrome 123.0.6312.122 +- ChromeDriver 123.0.6312.122 - Chromium 123.0.6312.0 -- Microsoft Edge 123.0.2420.81 -- Microsoft Edge WebDriver 123.0.2420.81 +- Microsoft Edge 123.0.2420.97 +- Microsoft Edge WebDriver 123.0.2420.97 - Selenium server 4.19.1 -- Mozilla Firefox 124.0.2 +- Mozilla Firefox 125.0 - Geckodriver 0.34.0 #### Environment variables @@ -179,7 +183,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | ### .NET Tools -- .NET Core SDK: 6.0.420, 7.0.407, 8.0.203 +- .NET Core SDK: 6.0.421, 7.0.408, 8.0.204 - nbgv 3.6.133+2d32d93cb1 ### Databases @@ -216,8 +220,8 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Node.js - 16.20.2 -- 18.20.1 -- 20.12.1 +- 18.20.2 +- 20.12.2 #### Python - 3.7.17 @@ -225,7 +229,7 @@ Use the following command as a part of your job to start the service: 'sudo syst - 3.9.19 - 3.10.14 - 3.11.9 -- 3.12.2 +- 3.12.3 #### PyPy - 2.7.18 [PyPy 7.3.15] @@ -245,7 +249,7 @@ Use the following command as a part of your job to start the service: 'sudo syst #### PowerShell Modules - Az: 11.3.1 - MarkdownPS: 1.9 -- Microsoft.Graph: 2.16.0 +- Microsoft.Graph: 2.17.0 - Pester: 5.5.0 - PSScriptAnalyzer: 1.22.0 @@ -261,12 +265,12 @@ Use the following command as a part of your job to start the service: 'sudo syst | -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 9.0 | | Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2 33.0.3<br>32.0.0<br>31.0.0 | -| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1) | +| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1) | | Android Support Repository | 47.0.0 | | CMake | 3.10.2<br>3.18.1<br>3.22.1 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 24.0.8215888<br>25.2.9519653 (default)<br>26.2.11394342 | +| NDK | 24.0.8215888<br>25.2.9519653 (default)<br>26.3.11579264 | #### Environment variables | Name | Value | @@ -274,7 +278,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | ANDROID_HOME | /usr/local/lib/android/sdk | | ANDROID_NDK | /usr/local/lib/android/sdk/ndk/25.2.9519653 | | ANDROID_NDK_HOME | /usr/local/lib/android/sdk/ndk/25.2.9519653 | -| ANDROID_NDK_LATEST_HOME | /usr/local/lib/android/sdk/ndk/26.2.11394342 | +| ANDROID_NDK_LATEST_HOME | /usr/local/lib/android/sdk/ndk/26.3.11579264 | | ANDROID_NDK_ROOT | /usr/local/lib/android/sdk/ndk/25.2.9519653 | | ANDROID_SDK_ROOT | /usr/local/lib/android/sdk | @@ -284,16 +288,16 @@ Use the following command as a part of your job to start the service: 'sudo syst | alpine:3.16 | sha256:452e7292acee0ee16c332324d7de05fa2c99f9994ecc9f0779c602916a672ae4 | 2024-01-27 | | alpine:3.17 | sha256:53cf9478b76f4c8fae126acbdfb79bed6e69e628faff572ebe4a029d3d247d98 | 2024-01-27 | | alpine:3.18 | sha256:11e21d7b981a59554b3f822c49f6e9f57b6068bb74f49c4cd5cc4c663c7e5160 | 2024-01-27 | -| debian:10 | sha256:f6b3b7c7b049c2c7d0f19ae988b4eac64fd8e127fa891c9de1d3cf3f8c33cad4 | 2024-03-12 | -| debian:11 | sha256:5a87974e73c64b3fb161d444a84bdd47c0e6b6058eacaeea64342e7cbce1f04d | 2024-03-12 | +| debian:10 | sha256:873743c4eec09ddea0dcac0cda31fce2ff348ed41cd1d5c33ecee7d42f03052f | 2024-04-10 | +| debian:11 | sha256:26d72b71f88865377988af6f54da9aaa5bed201f39bcee13eb55737016660df2 | 2024-04-10 | | debian:9 | sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be | 2022-06-23 | | moby/buildkit:latest | sha256:00d2c6b8f39ae515e0eadd74f39e71a5efdc94321c9b919692a2aa32deef2bb1 | 2024-03-18 | | node:16 | sha256:f77a1aef2da8d83e45ec990f45df50f1a286c5fe8bbfb8c6e4246c6389705c0b | 2023-09-07 | | node:16-alpine | sha256:a1f9d027912b58a7c75be7716c97cfbc6d3099f3a97ed84aa490be9dee20e787 | 2023-08-10 | -| node:18 | sha256:be6b6dc2a62591408c3f0475de2e3ae34e22879fe0f5b4c3733ecfadffd62e3b | 2024-04-04 | -| node:18-alpine | sha256:6d9d5269cbe4088803e9ef81da62ac481c063b60cadbe8e628bfcbb12296d901 | 2024-04-04 | -| node:20 | sha256:8a03de2385cb16c4d76aac30bf86ab05f55f1754a5402dc9039916e8043f019a | 2024-04-04 | -| node:20-alpine | sha256:7e227295e96f5b00aa79555ae166f50610940d888fc2e321cf36304cbd17d7d6 | 2024-04-04 | +| node:18 | sha256:bdbe1cff7e74208531a90ffcfa32b1cb909d4720d9aa60b649b26b9e7ba439a5 | 2024-04-11 | +| node:18-alpine | sha256:80338ff3fc4e989c1d5264a23223cec1c6014e812e584e825e78d1a98d893381 | 2024-04-11 | +| node:20 | sha256:844b41cf784f66d7920fd673f7af54ca7b81e289985edc6cd864e7d05e0d133c | 2024-04-11 | +| node:20-alpine | sha256:ec0c413b1d84f3f7f67ec986ba885930c57b5318d2eb3abc6960ee05d4f2eb28 | 2024-04-11 | | ubuntu:20.04 | sha256:80ef4a44043dec4490506e6cc4289eeda2d106a70148b74b5ae91ee670e9c35d | 2024-02-16 | ### Installed apt packages @@ -383,7 +387,8 @@ Use the following command as a part of your job to start the service: 'sudo syst | upx | 3.95-2build1 | | wget | 1.20.3-1ubuntu2 | | xorriso | 1.5.2-1 | -| xvfb | 2:1.20.13-1ubuntu1\~20.04.16 | +| xvfb | 2:1.20.13-1ubuntu1\~20.04.17 | | xz-utils | 5.2.4-1ubuntu1.1 | | zip | 3.0-11build1 | | zsync | 0.6.2-3ubuntu1 | + From 8f8a09e01bd92fd056ebc4c22a0cd71ceed1d26f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 17 Apr 2024 13:28:48 +0200 Subject: [PATCH 2780/3485] Updating readme file for macos-13 version 20240415.1 (#9697) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-13-Readme.md | 68 ++++++++++++++++----------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/images/macos/macos-13-Readme.md b/images/macos/macos-13-Readme.md index 4023cae3eec7..02fd2e300a2f 100644 --- a/images/macos/macos-13-Readme.md +++ b/images/macos/macos-13-Readme.md @@ -1,12 +1,12 @@ # macOS 13 - OS Version: macOS 13.6.6 (22G630) - Kernel Version: Darwin 22.6.0 -- Image Version: 20240405.2 +- Image Version: 20240415.1 ## Installed Software ### Language and Runtime -- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.407, 8.0.101, 8.0.203 +- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.408, 8.0.101, 8.0.204 - Bash 3.2.57(1)-release - Clang/LLVM 14.0.0 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` @@ -20,22 +20,22 @@ - Mono 6.12.0.188 - Node.js 20.12.1 - Perl 5.38.2 -- PHP 8.3.4 -- Python3 3.12.2 +- PHP 8.3.6 +- Python3 3.12.3 - Ruby 3.0.6p216 ### Package Management -- Bundler 2.5.7 +- Bundler 2.5.9 - Carthage 0.39.1 - CocoaPods 1.15.2 - Composer 2.7.2 -- Homebrew 4.2.16 +- Homebrew 4.2.18 - NPM 10.5.0 - NuGet 6.3.1.1 - Pip3 24.0 (python 3.12) - Pipx 1.5.0 -- RubyGems 3.5.7 -- Vcpkg 2024 (build from commit 8d8cec243) +- RubyGems 3.5.9 +- Vcpkg 2024 (build from commit b4a3d8912) - Yarn 1.22.19 ### Project Management @@ -65,17 +65,17 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.15.36 -- AWS SAM CLI 1.114.0 +- AWS CLI 2.15.38 +- AWS SAM CLI 1.115.0 - AWS Session Manager CLI 1.2.553.0 - Azure CLI 2.59.0 - Azure CLI (azure-devops) 1.0.0 -- Bicep CLI 0.26.54 -- Cmake 3.29.1 +- Bicep CLI 0.26.170 +- Cmake 3.29.2 - CodeQL Action Bundle 2.17.0 - Fastlane 2.220.0 -- SwiftFormat 0.53.5 -- Xcbeautify 2.0.1 +- SwiftFormat 0.53.7 +- Xcbeautify 2.1.0 - Xcode Command Line Tools 14.3.1.0.1.1683849156 - Xcodes 1.4.1 @@ -85,11 +85,11 @@ ### Browsers - Safari 17.4.1 (18618.1.15.111.8) - SafariDriver 17.4.1 (18618.1.15.111.8) -- Google Chrome 123.0.6312.107 -- Google Chrome for Testing 123.0.6312.105 -- ChromeDriver 123.0.6312.105 -- Microsoft Edge 123.0.2420.81 -- Microsoft Edge WebDriver 123.0.2420.81 +- Google Chrome 123.0.6312.124 +- Google Chrome for Testing 123.0.6312.122 +- ChromeDriver 123.0.6312.122 +- Microsoft Edge 123.0.2420.97 +- Microsoft Edge WebDriver 123.0.2420.97 - Mozilla Firefox 124.0.2 - geckodriver 0.34.0 - Selenium server 4.19.1 @@ -127,12 +127,12 @@ - 3.9.19 - 3.10.14 - 3.11.9 -- 3.12.2 +- 3.12.3 #### Node.js - 16.20.2 -- 18.20.1 -- 20.12.1 +- 18.20.2 +- 20.12.2 #### Go - 1.20.14 @@ -140,9 +140,9 @@ - 1.22.2 ### Rust Tools -- Cargo 1.77.1 -- Rust 1.77.1 -- Rustdoc 1.77.1 +- Cargo 1.77.2 +- Rust 1.77.2 +- Rustdoc 1.77.2 - Rustup 1.27.0 #### Packages @@ -150,7 +150,7 @@ - Rustfmt 1.7.0-stable ### PowerShell Tools -- PowerShell 7.4.1 +- PowerShell 7.4.2 #### PowerShell Modules - Az: 11.5.0 @@ -201,11 +201,11 @@ | Simulator - watchOS 9.4 | watchsimulator9.4 | 14.3.1 | | Simulator - watchOS 10.0 | watchsimulator10.0 | 15.0.1 | | Simulator - watchOS 10.2 | watchsimulator10.2 | 15.1, 15.2 | -| visionOS 1.0 | xros1.0 | 15.2 | | Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | +| visionOS 1.0 | xros1.0 | 15.2 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | -| Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | +| Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | | DriverKit 22.1 | driverkit22.1 | 14.1 | | DriverKit 22.2 | driverkit22.2 | 14.2 | | DriverKit 22.4 | driverkit22.4 | 14.3.1 | @@ -235,20 +235,20 @@ | Android Command Line Tools | 11.0 | | Android Emulator | 34.1.20 | | Android SDK Build-tools | 34.0.0<br>33.0.2 33.0.3 | -| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | +| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | | Android SDK Platform-Tools | 35.0.1 | | Android Support Repository | 47.0.0 | | CMake | 3.22.1 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 24.0.8215888<br>25.2.9519653<br>26.2.11394342 (default) | +| NDK | 24.0.8215888<br>25.2.9519653<br>26.3.11579264 (default) | #### Environment variables | Name | Value | | ----------------------- | --------------------------------------------------- | | ANDROID_HOME | /Users/runner/Library/Android/sdk | -| ANDROID_NDK | /Users/runner/Library/Android/sdk/ndk/26.2.11394342 | -| ANDROID_NDK_HOME | /Users/runner/Library/Android/sdk/ndk/26.2.11394342 | -| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/26.2.11394342 | -| ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk/26.2.11394342 | +| ANDROID_NDK | /Users/runner/Library/Android/sdk/ndk/26.3.11579264 | +| ANDROID_NDK_HOME | /Users/runner/Library/Android/sdk/ndk/26.3.11579264 | +| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/26.3.11579264 | +| ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk/26.3.11579264 | | ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | From 7861e423d5d645b70e34148c5c35f22ebf1c4e2c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 17 Apr 2024 11:48:09 +0000 Subject: [PATCH 2781/3485] Updating readme file for ubuntu22 version 20240414.1.1 (#9685) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2204-Readme.md | 83 ++++++++++++++++-------------- 1 file changed, 44 insertions(+), 39 deletions(-) diff --git a/images/ubuntu/Ubuntu2204-Readme.md b/images/ubuntu/Ubuntu2204-Readme.md index b5e67b842f72..79796d5a112c 100644 --- a/images/ubuntu/Ubuntu2204-Readme.md +++ b/images/ubuntu/Ubuntu2204-Readme.md @@ -1,7 +1,11 @@ +| Announcements | +|-| +| [[Ubuntu] ubuntu-toolchain-r/test repository will be removed from images on May 6](https://github.com/actions/runner-images/issues/9679) | +*** # Ubuntu 22.04 - OS Version: 22.04.4 LTS -- Kernel Version: 6.5.0-1017-azure -- Image Version: 20240407.1.0 +- Kernel Version: 6.5.0-1018-azure +- Image Version: 20240414.1.0 - Systemd version: 249.11-0ubuntu3.12 ## Installed Software @@ -18,7 +22,7 @@ - Kotlin 1.9.23-release-779 - Mono 6.12.0.200 - MSBuild 16.10.1.31701 (Mono 6.12.0.200) -- Node.js 18.20.1 +- Node.js 18.20.2 - Perl 5.34.0 - Python 3.10.12 - Ruby 3.0.2p107 @@ -26,8 +30,8 @@ ### Package Management - cpan 1.64 -- Helm 3.14.3 -- Homebrew 4.2.16 +- Helm 3.14.4 +- Homebrew 4.2.17 - Miniconda 24.1.2 - Npm 10.5.0 - NuGet 6.6.1.2 @@ -35,7 +39,7 @@ - Pip3 22.0.2 - Pipx 1.5.0 - RubyGems 3.3.5 -- Vcpkg (build from commit 5fa0f075e) +- Vcpkg (build from commit ad3bae574) - Yarn 1.22.22 #### Environment variables @@ -62,9 +66,9 @@ to accomplish this. - AzCopy 10.24.0 - available by `azcopy` and `azcopy10` aliases - Bazel 7.1.1 - Bazelisk 1.19.0 -- Bicep 0.26.54 +- Bicep 0.26.170 - Buildah 1.23.1 -- CMake 3.29.1 +- CMake 3.29.2 - CodeQL Action Bundle 2.17.0 - Docker Amazon ECR Credential Helper 0.7.1 - Docker Compose v1 1.29.2 @@ -77,7 +81,7 @@ to accomplish this. - Git LFS 3.5.1 - Git-ftp 1.6.0 - Haveged 1.9.14 -- Heroku 8.11.1 +- Heroku 8.11.2 - jq 1.6 - Kind 0.22.0 - Kubectl 1.29.3 @@ -98,24 +102,24 @@ to accomplish this. - Skopeo 1.4.1 - Sphinx Open Source Search Server 2.2.11 - SVN 1.14.1 -- Terraform 1.7.5 +- Terraform 1.8.0 - yamllint 1.35.1 - yq 4.43.1 - zstd 1.5.6 ### CLI Tools -- Alibaba Cloud CLI 3.0.201 -- AWS CLI 2.15.36 +- Alibaba Cloud CLI 3.0.202 +- AWS CLI 2.15.38 - AWS CLI Session Manager Plugin 1.2.553.0 -- AWS SAM CLI 1.114.0 +- AWS SAM CLI 1.115.0 - Azure CLI 2.59.0 - Azure CLI (azure-devops) 1.0.0 - GitHub CLI 2.47.0 - Google Cloud CLI 471.0.0 -- Netlify CLI 17.21.2 -- OpenShift CLI 4.15.6 +- Netlify CLI 17.22.1 +- OpenShift CLI 4.15.8 - ORAS CLI 1.1.0 -- Vercel CLI 33.7.0 +- Vercel CLI 34.0.0 ### Java | Version | Environment Variable | @@ -140,9 +144,9 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Stack 2.15.5 ### Rust Tools -- Cargo 1.77.1 -- Rust 1.77.1 -- Rustdoc 1.77.1 +- Cargo 1.77.2 +- Rust 1.77.2 +- Rustdoc 1.77.2 - Rustup 1.27.0 #### Packages @@ -154,13 +158,13 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 123.0.6312.105 -- ChromeDriver 123.0.6312.105 +- Google Chrome 123.0.6312.122 +- ChromeDriver 123.0.6312.122 - Chromium 123.0.6312.0 -- Microsoft Edge 123.0.2420.81 -- Microsoft Edge WebDriver 123.0.2420.81 +- Microsoft Edge 123.0.2420.97 +- Microsoft Edge WebDriver 123.0.2420.97 - Selenium server 4.19.1 -- Mozilla Firefox 124.0.2 +- Mozilla Firefox 125.0 - Geckodriver 0.34.0 #### Environment variables @@ -172,7 +176,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | ### .NET Tools -- .NET Core SDK: 6.0.420, 7.0.407, 8.0.203 +- .NET Core SDK: 6.0.421, 7.0.408, 8.0.204 - nbgv 3.6.133+2d32d93cb1 ### Databases @@ -208,8 +212,8 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Node.js - 16.20.2 -- 18.20.1 -- 20.12.1 +- 18.20.2 +- 20.12.2 #### Python - 3.7.17 @@ -217,7 +221,7 @@ Use the following command as a part of your job to start the service: 'sudo syst - 3.9.19 - 3.10.14 - 3.11.9 -- 3.12.2 +- 3.12.3 #### PyPy - 3.7.13 [PyPy 7.3.9] @@ -234,7 +238,7 @@ Use the following command as a part of your job to start the service: 'sudo syst #### PowerShell Modules - Az: 11.3.1 - MarkdownPS: 1.9 -- Microsoft.Graph: 2.16.0 +- Microsoft.Graph: 2.17.0 - Pester: 5.5.0 - PSScriptAnalyzer: 1.22.0 @@ -249,12 +253,12 @@ Use the following command as a part of your job to start the service: 'sudo syst | -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 9.0 | | Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2 33.0.3<br>32.0.0<br>31.0.0 | -| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1) | +| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1) | | Android Support Repository | 47.0.0 | | CMake | 3.10.2<br>3.18.1<br>3.22.1 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 24.0.8215888<br>25.2.9519653 (default)<br>26.2.11394342 | +| NDK | 24.0.8215888<br>25.2.9519653 (default)<br>26.3.11579264 | #### Environment variables | Name | Value | @@ -262,7 +266,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | ANDROID_HOME | /usr/local/lib/android/sdk | | ANDROID_NDK | /usr/local/lib/android/sdk/ndk/25.2.9519653 | | ANDROID_NDK_HOME | /usr/local/lib/android/sdk/ndk/25.2.9519653 | -| ANDROID_NDK_LATEST_HOME | /usr/local/lib/android/sdk/ndk/26.2.11394342 | +| ANDROID_NDK_LATEST_HOME | /usr/local/lib/android/sdk/ndk/26.3.11579264 | | ANDROID_NDK_ROOT | /usr/local/lib/android/sdk/ndk/25.2.9519653 | | ANDROID_SDK_ROOT | /usr/local/lib/android/sdk | @@ -272,15 +276,15 @@ Use the following command as a part of your job to start the service: 'sudo syst | alpine:3.16 | sha256:452e7292acee0ee16c332324d7de05fa2c99f9994ecc9f0779c602916a672ae4 | 2024-01-27 | | alpine:3.17 | sha256:53cf9478b76f4c8fae126acbdfb79bed6e69e628faff572ebe4a029d3d247d98 | 2024-01-27 | | alpine:3.18 | sha256:11e21d7b981a59554b3f822c49f6e9f57b6068bb74f49c4cd5cc4c663c7e5160 | 2024-01-27 | -| debian:10 | sha256:f6b3b7c7b049c2c7d0f19ae988b4eac64fd8e127fa891c9de1d3cf3f8c33cad4 | 2024-03-12 | -| debian:11 | sha256:5a87974e73c64b3fb161d444a84bdd47c0e6b6058eacaeea64342e7cbce1f04d | 2024-03-12 | +| debian:10 | sha256:873743c4eec09ddea0dcac0cda31fce2ff348ed41cd1d5c33ecee7d42f03052f | 2024-04-10 | +| debian:11 | sha256:26d72b71f88865377988af6f54da9aaa5bed201f39bcee13eb55737016660df2 | 2024-04-10 | | moby/buildkit:latest | sha256:00d2c6b8f39ae515e0eadd74f39e71a5efdc94321c9b919692a2aa32deef2bb1 | 2024-03-18 | | node:16 | sha256:f77a1aef2da8d83e45ec990f45df50f1a286c5fe8bbfb8c6e4246c6389705c0b | 2023-09-07 | | node:16-alpine | sha256:a1f9d027912b58a7c75be7716c97cfbc6d3099f3a97ed84aa490be9dee20e787 | 2023-08-10 | -| node:18 | sha256:be6b6dc2a62591408c3f0475de2e3ae34e22879fe0f5b4c3733ecfadffd62e3b | 2024-04-04 | -| node:18-alpine | sha256:6d9d5269cbe4088803e9ef81da62ac481c063b60cadbe8e628bfcbb12296d901 | 2024-04-04 | -| node:20 | sha256:8a03de2385cb16c4d76aac30bf86ab05f55f1754a5402dc9039916e8043f019a | 2024-04-04 | -| node:20-alpine | sha256:7e227295e96f5b00aa79555ae166f50610940d888fc2e321cf36304cbd17d7d6 | 2024-04-04 | +| node:18 | sha256:bdbe1cff7e74208531a90ffcfa32b1cb909d4720d9aa60b649b26b9e7ba439a5 | 2024-04-11 | +| node:18-alpine | sha256:80338ff3fc4e989c1d5264a23223cec1c6014e812e584e825e78d1a98d893381 | 2024-04-11 | +| node:20 | sha256:844b41cf784f66d7920fd673f7af54ca7b81e289985edc6cd864e7d05e0d133c | 2024-04-11 | +| node:20-alpine | sha256:ec0c413b1d84f3f7f67ec986ba885930c57b5318d2eb3abc6960ee05d4f2eb28 | 2024-04-11 | | ubuntu:20.04 | sha256:80ef4a44043dec4490506e6cc4289eeda2d106a70148b74b5ae91ee670e9c35d | 2024-02-16 | | ubuntu:22.04 | sha256:77906da86b60585ce12215807090eb327e7386c8fafb5402369e421f44eff17e | 2024-02-27 | @@ -373,7 +377,8 @@ Use the following command as a part of your job to start the service: 'sudo syst | upx | 3.96-3 | | wget | 1.21.2-2ubuntu1 | | xorriso | 1.5.4-2 | -| xvfb | 2:21.1.4-2ubuntu1.7\~22.04.9 | +| xvfb | 2:21.1.4-2ubuntu1.7\~22.04.10 | | xz-utils | 5.2.5-2ubuntu1 | | zip | 3.0-12build2 | | zsync | 0.6.2-3ubuntu1 | + From c8d9d73807f4c5b5cdb4d4d15168b8f3f7112a1c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 17 Apr 2024 12:01:08 +0000 Subject: [PATCH 2782/3485] Updating readme file for macos-14 version 20240414.1 (#9696) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-14-Readme.md | 66 ++++++++++++++++----------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/images/macos/macos-14-Readme.md b/images/macos/macos-14-Readme.md index a29fb61e7523..4171bc9f8064 100644 --- a/images/macos/macos-14-Readme.md +++ b/images/macos/macos-14-Readme.md @@ -1,12 +1,12 @@ # macOS 14 - OS Version: macOS 14.4.1 (23E224) - Kernel Version: Darwin 23.4.0 -- Image Version: 20240405.1 +- Image Version: 20240414.1 ## Installed Software ### Language and Runtime -- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.407, 8.0.101, 8.0.203 +- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.408, 8.0.101, 8.0.204 - Bash 3.2.57(1)-release - Clang/LLVM 14.0.3 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` @@ -20,21 +20,21 @@ - Mono 6.12.0.188 - Node.js 20.12.1 - Perl 5.38.2 -- PHP 8.3.4 -- Python3 3.12.2 +- PHP 8.3.6 +- Python3 3.12.3 - Ruby 3.0.6p216 ### Package Management -- Bundler 2.5.7 +- Bundler 2.5.9 - Carthage 0.39.1 - CocoaPods 1.15.2 - Composer 2.7.2 -- Homebrew 4.2.16 +- Homebrew 4.2.17 - NPM 10.5.0 - NuGet 6.3.1.1 - Pip3 24.0 (python 3.12) - Pipx 1.5.0 -- RubyGems 3.5.7 +- RubyGems 3.5.9 - Yarn 1.22.19 ### Project Management @@ -64,17 +64,17 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.15.36 -- AWS SAM CLI 1.114.0 +- AWS CLI 2.15.38 +- AWS SAM CLI 1.115.0 - AWS Session Manager CLI 1.2.553.0 - Azure CLI 2.59.0 - Azure CLI (azure-devops) 1.0.0 -- Bicep CLI 0.26.54 -- Cmake 3.29.1 +- Bicep CLI 0.26.170 +- Cmake 3.29.2 - CodeQL Action Bundle 2.17.0 - Fastlane 2.220.0 -- SwiftFormat 0.53.5 -- Xcbeautify 2.0.1 +- SwiftFormat 0.53.7 +- Xcbeautify 2.1.0 - Xcode Command Line Tools 15.3.0.0.1.1708646388 - Xcodes 1.4.1 @@ -84,11 +84,11 @@ ### Browsers - Safari 17.4.1 (19618.1.15.11.14) - SafariDriver 17.4.1 (19618.1.15.11.14) -- Google Chrome 123.0.6312.107 -- Google Chrome for Testing 123.0.6312.105 -- ChromeDriver 123.0.6312.105 -- Microsoft Edge 123.0.2420.81 -- Microsoft Edge WebDriver 123.0.2420.81 +- Google Chrome 123.0.6312.124 +- Google Chrome for Testing 123.0.6312.122 +- ChromeDriver 123.0.6312.122 +- Microsoft Edge 123.0.2420.97 +- Microsoft Edge WebDriver 123.0.2420.97 - Mozilla Firefox 124.0.2 - geckodriver 0.34.0 - Selenium server 4.19.1 @@ -116,11 +116,11 @@ #### Python - 3.11.9 -- 3.12.2 +- 3.12.3 #### Node.js -- 18.20.1 -- 20.12.1 +- 18.20.2 +- 20.12.2 #### Go - 1.20.14 @@ -128,9 +128,9 @@ - 1.22.2 ### Rust Tools -- Cargo 1.77.1 -- Rust 1.77.1 -- Rustdoc 1.77.1 +- Cargo 1.77.2 +- Rust 1.77.2 +- Rustdoc 1.77.2 - Rustup 1.27.0 #### Packages @@ -138,7 +138,7 @@ - Rustfmt 1.7.0-stable ### PowerShell Tools -- PowerShell 7.4.1 +- PowerShell 7.4.2 #### PowerShell Modules - Az: 11.5.0 @@ -185,10 +185,10 @@ | Simulator - watchOS 10.0 | watchsimulator10.0 | 15.0.1 | | Simulator - watchOS 10.2 | watchsimulator10.2 | 15.1, 15.2 | | Simulator - watchOS 10.4 | watchsimulator10.4 | 15.3 | -| Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | | visionOS 1.0 | xros1.0 | 15.2 | -| visionOS 1.1 | xros1.1 | 15.3 | +| Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | | Simulator - visionOS 1.1 | xrsimulator1.1 | 15.3 | +| visionOS 1.1 | xros1.1 | 15.3 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | @@ -219,20 +219,20 @@ | Android Command Line Tools | 11.0 | | Android Emulator | 34.1.20 | | Android SDK Build-tools | 34.0.0<br>33.0.2 33.0.3 | -| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | +| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | | Android SDK Platform-Tools | 35.0.1 | | Android Support Repository | 47.0.0 | | CMake | 3.22.1 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 24.0.8215888<br>25.2.9519653<br>26.2.11394342 (default) | +| NDK | 24.0.8215888<br>25.2.9519653<br>26.3.11579264 (default) | #### Environment variables | Name | Value | | ----------------------- | --------------------------------------------------- | | ANDROID_HOME | /Users/runner/Library/Android/sdk | -| ANDROID_NDK | /Users/runner/Library/Android/sdk/ndk/26.2.11394342 | -| ANDROID_NDK_HOME | /Users/runner/Library/Android/sdk/ndk/26.2.11394342 | -| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/26.2.11394342 | -| ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk/26.2.11394342 | +| ANDROID_NDK | /Users/runner/Library/Android/sdk/ndk/26.3.11579264 | +| ANDROID_NDK_HOME | /Users/runner/Library/Android/sdk/ndk/26.3.11579264 | +| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/26.3.11579264 | +| ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk/26.3.11579264 | | ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | From d0baa451b5c685e1290f94b351b819ccf9e8fc7f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 17 Apr 2024 14:08:12 +0200 Subject: [PATCH 2783/3485] Updating readme file for win22 version 20240414.1.1 (#9688) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/windows/Windows2022-Readme.md | 114 +++++++++++++-------------- 1 file changed, 57 insertions(+), 57 deletions(-) diff --git a/images/windows/Windows2022-Readme.md b/images/windows/Windows2022-Readme.md index 29056d60fb01..f1de37e2ce0b 100644 --- a/images/windows/Windows2022-Readme.md +++ b/images/windows/Windows2022-Readme.md @@ -1,6 +1,6 @@ # Windows Server 2022 -- OS Version: 10.0.20348 Build 2340 -- Image Version: 20240407.1.0 +- OS Version: 10.0.20348 Build 2402 +- Image Version: 20240414.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -15,21 +15,21 @@ - LLVM 16.0.6 - Node 18.18.2 - Perl 5.32.1 -- PHP 8.3.4 +- PHP 8.3.6 - Python 3.9.13 - Ruby 3.0.6p216 ### Package Management - Chocolatey 2.2.2 - Composer 2.7.2 -- Helm 3.14.2 +- Helm 3.14.3 - Miniconda 24.1.2 (pre-installed on the image but not added to PATH) - NPM 9.8.1 - NuGet 6.9.1.3 - pip 24.0 (python 3.9) - Pipx 1.5.0 - RubyGems 3.2.33 -- Vcpkg (build from commit 5fa0f075e) +- Vcpkg (build from commit ad3bae574) - Yarn 1.22.22 #### Environment variables @@ -40,7 +40,7 @@ ### Project Management - Ant 1.10.14 -- Gradle 8.6 +- Gradle 8.7 - Maven 3.8.7 - sbt 1.9.9 @@ -50,9 +50,9 @@ - azcopy 10.24.0 - Bazel 7.1.1 - Bazelisk 1.19.0 -- Bicep 0.26.54 +- Bicep 0.26.170 - Cabal 3.10.3.0 -- CMake 3.29.1 +- CMake 3.29.2 - CodeQL Action Bundle 2.17.0 - Docker 24.0.7 - Docker Compose v1 1.29.2 @@ -87,18 +87,18 @@ - zstd 1.5.6 ### CLI Tools -- Alibaba Cloud CLI 3.0.201 -- AWS CLI 2.15.36 -- AWS SAM CLI 1.114.0 +- Alibaba Cloud CLI 3.0.202 +- AWS CLI 2.15.38 +- AWS SAM CLI 1.115.0 - AWS Session Manager CLI 1.2.553.0 - Azure CLI 2.59.0 - Azure DevOps CLI extension 1.0.0 - GitHub CLI 2.47.0 ### Rust Tools -- Cargo 1.77.1 -- Rust 1.77.1 -- Rustdoc 1.77.1 +- Cargo 1.77.2 +- Rust 1.77.2 +- Rustdoc 1.77.2 - Rustup 1.27.0 #### Packages @@ -110,10 +110,10 @@ - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 123.0.6312.106 -- Chrome Driver 123.0.6312.105 -- Microsoft Edge 123.0.2420.81 -- Microsoft Edge Driver 123.0.2420.81 +- Google Chrome 123.0.6312.123 +- Chrome Driver 123.0.6312.122 +- Microsoft Edge 123.0.2420.97 +- Microsoft Edge Driver 123.0.2420.97 - Mozilla Firefox 124.0.2 - Gecko Driver 0.34.0 - IE Driver 4.14.0.0 @@ -161,8 +161,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Node.js - 16.20.2 -- 18.20.1 -- 20.12.1 +- 18.20.2 +- 20.12.2 #### Python - 3.7.9 @@ -170,7 +170,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 3.9.13 - 3.10.11 - 3.11.9 -- 3.12.2 +- 3.12.3 #### PyPy - 2.7.18 [PyPy 7.3.15] @@ -216,9 +216,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Nginx | 1.25.4 | C:\tools\nginx-1.25.4\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2022 -| Name | Version | Path | -| ----------------------------- | ------------- | -------------------------------------------------------- | -| Visual Studio Enterprise 2022 | 17.9.34723.18 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | +| Name | Version | Path | +| ----------------------------- | -------------- | -------------------------------------------------------- | +| Visual Studio Enterprise 2022 | 17.9.34728.123 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | #### Workloads, components and extensions | Package | Version | @@ -279,20 +279,20 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.Net.ComponentGroup.4.8.DeveloperTools | 17.9.34511.75 | | Microsoft.Net.ComponentGroup.DevelopmentPrerequisites | 17.9.34511.75 | | Microsoft.Net.ComponentGroup.TargetingPacks.Common | 17.9.34511.75 | -| microsoft.net.runtime.android | 8.0.324.11423 | -| microsoft.net.runtime.android.aot | 8.0.324.11423 | -| microsoft.net.runtime.android.aot.net7 | 8.0.324.11423 | -| microsoft.net.runtime.android.net7 | 8.0.324.11423 | -| microsoft.net.runtime.ios | 8.0.324.11423 | -| microsoft.net.runtime.ios.net7 | 8.0.324.11423 | -| microsoft.net.runtime.maccatalyst | 8.0.324.11423 | -| microsoft.net.runtime.maccatalyst.net7 | 8.0.324.11423 | -| microsoft.net.runtime.mono.tooling | 8.0.324.11423 | -| microsoft.net.runtime.mono.tooling.net7 | 8.0.324.11423 | -| microsoft.net.sdk.emscripten | 8.0.10.10803 | +| microsoft.net.runtime.android | 8.0.424.16909 | +| microsoft.net.runtime.android.aot | 8.0.424.16909 | +| microsoft.net.runtime.android.aot.net7 | 8.0.424.16909 | +| microsoft.net.runtime.android.net7 | 8.0.424.16909 | +| microsoft.net.runtime.ios | 8.0.424.16909 | +| microsoft.net.runtime.ios.net7 | 8.0.424.16909 | +| microsoft.net.runtime.maccatalyst | 8.0.424.16909 | +| microsoft.net.runtime.maccatalyst.net7 | 8.0.424.16909 | +| microsoft.net.runtime.mono.tooling | 8.0.424.16909 | +| microsoft.net.runtime.mono.tooling.net7 | 8.0.424.16909 | +| microsoft.net.sdk.emscripten | 8.0.10.16301 | | Microsoft.NetCore.Component.DevelopmentTools | 17.9.34511.75 | -| Microsoft.NetCore.Component.Runtime.8.0 | 17.9.34629.179 | -| Microsoft.NetCore.Component.SDK | 17.9.34629.179 | +| Microsoft.NetCore.Component.Runtime.8.0 | 17.9.34728.123 | +| Microsoft.NetCore.Component.SDK | 17.9.34728.123 | | Microsoft.NetCore.Component.Web | 17.9.34511.75 | | Microsoft.VisualStudio.Component.AppInsights.Tools | 17.9.34511.75 | | Microsoft.VisualStudio.Component.AspNet | 17.9.34511.75 | @@ -510,11 +510,11 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Workload.Python | 17.9.34511.75 | | Microsoft.VisualStudio.Workload.Universal | 17.9.34511.75 | | Microsoft.VisualStudio.Workload.VisualStudioExtension | 17.9.34511.75 | -| runtimes.ios | 8.0.324.11423 | -| runtimes.ios.net7 | 8.0.324.11423 | -| runtimes.maccatalyst | 8.0.324.11423 | -| runtimes.maccatalyst.net7 | 8.0.324.11423 | -| wasm.tools | 8.0.324.11423 | +| runtimes.ios | 8.0.424.16909 | +| runtimes.ios.net7 | 8.0.424.16909 | +| runtimes.maccatalyst | 8.0.424.16909 | +| runtimes.maccatalyst.net7 | 8.0.424.16909 | +| wasm.tools | 8.0.424.16909 | | ProBITools.MicrosoftAnalysisServicesModelingProjects2022 | 3.0.4 | | ProBITools.MicrosoftReportProjectsforVisualStudio2022 | 3.0.1 | | SSIS.MicrosoftDataToolsIntegrationServices | 1.3.2 | @@ -544,15 +544,15 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 10.0.22621.0 ### .NET Core Tools -- .NET Core SDK: 6.0.128, 6.0.203, 6.0.321, 6.0.420, 7.0.117, 7.0.203, 7.0.314, 7.0.407, 8.0.202 +- .NET Core SDK: 6.0.129, 6.0.203, 6.0.321, 6.0.421, 7.0.118, 7.0.203, 7.0.315, 7.0.408, 8.0.204 - .NET Framework: 4.8, 4.8.1 -- Microsoft.AspNetCore.App: 6.0.5, 6.0.26, 6.0.27, 6.0.28, 7.0.5, 7.0.17, 8.0.3 -- Microsoft.NETCore.App: 6.0.5, 6.0.26, 6.0.27, 6.0.28, 7.0.5, 7.0.17, 8.0.3 -- Microsoft.WindowsDesktop.App: 6.0.5, 6.0.26, 6.0.28, 7.0.5, 7.0.17, 8.0.3 +- Microsoft.AspNetCore.App: 6.0.5, 6.0.26, 6.0.29, 7.0.5, 7.0.18, 8.0.4 +- Microsoft.NETCore.App: 6.0.5, 6.0.26, 6.0.29, 7.0.5, 7.0.18, 8.0.4 +- Microsoft.WindowsDesktop.App: 6.0.5, 6.0.26, 6.0.29, 7.0.5, 7.0.18, 8.0.4 - nbgv 3.6.133+2d32d93cb1 ### PowerShell Tools -- PowerShell 7.4.1 +- PowerShell 7.4.2 #### Powershell Modules - Az: 11.3.1 @@ -560,10 +560,10 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - AzureRM: 2.1.0 (Default), 6.13.1 - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.553 +- AWSPowershell: 4.1.558 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 -- Microsoft.Graph: 2.16.0 +- Microsoft.Graph: 2.17.0 - Pester: 3.4.0, 5.5.0 - PowerShellGet: 1.0.0.1, 2.2.5 - PSScriptAnalyzer: 1.22.0 @@ -582,13 +582,13 @@ All other versions are saved but not installed. | Android Command Line Tools | 8.0 | | Android Emulator | 31.2.9 | | Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2 33.0.3<br>32.0.0<br>31.0.0 | -| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1) | +| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1) | | Android SDK Platform-Tools | 35.0.1 | | Android Support Repository | 47.0.0 | | CMake | 3.18.1<br>3.22.1 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 24.0.8215888<br>25.2.9519653<br>26.2.11394342 | +| NDK | 24.0.8215888<br>25.2.9519653<br>26.3.11579264 | #### Environment variables | Name | Value | @@ -596,15 +596,15 @@ All other versions are saved but not installed. | ANDROID_HOME | C:\Android\android-sdk | | ANDROID_NDK | C:\Android\android-sdk\ndk\25.2.9519653 | | ANDROID_NDK_HOME | C:\Android\android-sdk\ndk\25.2.9519653 | -| ANDROID_NDK_LATEST_HOME | C:\Android\android-sdk\ndk\26.2.11394342 | +| ANDROID_NDK_LATEST_HOME | C:\Android\android-sdk\ndk\26.3.11579264 | | ANDROID_NDK_ROOT | C:\Android\android-sdk\ndk\25.2.9519653 | | ANDROID_SDK_ROOT | C:\Android\android-sdk | ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2022 | sha256:860454405335b1f0dd84a8b5fd2bb3a5e0289cc78a71d4efd4055eefaab13653 | 2024-03-12 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2022 | sha256:4d29a1431d9bc6b7ec0f1b64289a8810d25790f86abe55050729a6485c8cf1d9 | 2024-03-12 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:76d2dd2054a18f47d9c690f9d0047e319d7b68aa4e72ee7aae46e3637042c165 | 2024-03-12 | -| mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:6e6053f0358f9522d2d14693f9bc152f47fe04c82c53dc8c6d127a5a823c8720 | 2024-03-05 | -| mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:6b8781cab588a2858d1aba2c5d5456e79c823e04d666d59d0732dab1273dc8fb | 2024-03-05 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2022 | sha256:9463c19c08f8855d5520f488e858f9c0ca832c04740ab1a3e204c9fbfab4581b | 2024-04-09 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2022 | sha256:b732b5349aa99af46c02c2cc25e162d083cbe62f455875b35d5c3053c1cd75ce | 2024-04-09 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:51c056c03b12aa8004e6d7909e5bdf7b699502d89fc8fc861edbbbcd78cf16bd | 2024-04-09 | +| mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:6223f3a17f2652064c56ca55aaef866177d58d6a1c526636ac2120685df5466d | 2024-04-05 | +| mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:5d09ffa90d91a46e2fe7652b0a37cbf5217f34a819c3d71cbe635dae8226061b | 2024-04-05 | From 0cd9c988c44b139919fa95980f6ed411e7337a2c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 17 Apr 2024 12:33:42 +0000 Subject: [PATCH 2784/3485] Updating readme file for win19 version 20240414.1.1 (#9687) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/windows/Windows2019-Readme.md | 80 ++++++++++++++-------------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/images/windows/Windows2019-Readme.md b/images/windows/Windows2019-Readme.md index 9e16836b9e5a..7e31eb917d39 100644 --- a/images/windows/Windows2019-Readme.md +++ b/images/windows/Windows2019-Readme.md @@ -1,6 +1,6 @@ # Windows Server 2019 -- OS Version: 10.0.17763 Build 5576 -- Image Version: 20240407.1.0 +- OS Version: 10.0.17763 Build 5696 +- Image Version: 20240414.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -15,21 +15,21 @@ - LLVM 16.0.6 - Node 18.18.2 - Perl 5.32.1 -- PHP 8.3.4 +- PHP 8.3.6 - Python 3.7.9 - Ruby 3.0.6p216 ### Package Management - Chocolatey 2.2.2 - Composer 2.7.2 -- Helm 3.14.2 +- Helm 3.14.3 - Miniconda 24.1.2 (pre-installed on the image but not added to PATH) - NPM 9.8.1 - NuGet 6.9.1.3 - pip 24.0 (python 3.7) - Pipx 1.2.1 - RubyGems 3.2.33 -- Vcpkg (build from commit 5fa0f075e) +- Vcpkg (build from commit ad3bae574) - Yarn 1.22.22 #### Environment variables @@ -40,7 +40,7 @@ ### Project Management - Ant 1.10.14 -- Gradle 8.6 +- Gradle 8.7 - Maven 3.8.7 - sbt 1.9.9 @@ -50,9 +50,9 @@ - azcopy 10.24.0 - Bazel 7.1.1 - Bazelisk 1.19.0 -- Bicep 0.26.54 +- Bicep 0.26.170 - Cabal 3.10.3.0 -- CMake 3.29.1 +- CMake 3.29.2 - CodeQL Action Bundle 2.17.0 - Docker 24.0.7 - Docker Compose v1 1.29.2 @@ -89,9 +89,9 @@ - zstd 1.5.6 ### CLI Tools -- Alibaba Cloud CLI 3.0.201 -- AWS CLI 2.15.36 -- AWS SAM CLI 1.114.0 +- Alibaba Cloud CLI 3.0.202 +- AWS CLI 2.15.38 +- AWS SAM CLI 1.115.0 - AWS Session Manager CLI 1.2.553.0 - Azure CLI 2.59.0 - Azure DevOps CLI extension 1.0.0 @@ -99,9 +99,9 @@ - GitHub CLI 2.47.0 ### Rust Tools -- Cargo 1.77.1 -- Rust 1.77.1 -- Rustdoc 1.77.1 +- Cargo 1.77.2 +- Rust 1.77.2 +- Rustdoc 1.77.2 - Rustup 1.27.0 #### Packages @@ -113,10 +113,10 @@ - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 123.0.6312.106 -- Chrome Driver 123.0.6312.105 -- Microsoft Edge 123.0.2420.81 -- Microsoft Edge Driver 123.0.2420.81 +- Google Chrome 123.0.6312.123 +- Chrome Driver 123.0.6312.122 +- Microsoft Edge 123.0.2420.97 +- Microsoft Edge Driver 123.0.2420.97 - Mozilla Firefox 124.0.2 - Gecko Driver 0.34.0 - IE Driver 4.14.0.0 @@ -167,8 +167,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Node.js - 16.20.2 -- 18.20.1 -- 20.12.1 +- 18.20.2 +- 20.12.2 #### Python - 3.7.9 @@ -176,7 +176,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 3.9.13 - 3.10.11 - 3.11.9 -- 3.12.2 +- 3.12.3 #### PyPy - 2.7.18 [PyPy 7.3.15] @@ -223,14 +223,14 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Nginx | 1.25.4 | C:\tools\nginx-1.25.4\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2019 -| Name | Version | Path | -| ----------------------------- | --------------- | -------------------------------------------------------------- | -| Visual Studio Enterprise 2019 | 16.11.34601.136 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | +| Name | Version | Path | +| ----------------------------- | -------------- | -------------------------------------------------------------- | +| Visual Studio Enterprise 2019 | 16.11.34729.46 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | #### Workloads, components and extensions | Package | Version | | ------------------------------------------------------------------------- | --------------- | -| Component.Android.NDK.R16B | 16.11.34526.176 | +| Component.Android.NDK.R16B | 16.11.34728.71 | | Component.Android.SDK25.Private | 16.0.28625.61 | | Component.Android.SDK30 | 16.10.31205.252 | | Component.Ant | 1.9.3.8 | @@ -488,15 +488,15 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 10.0.22621.0 ### .NET Core Tools -- .NET Core SDK: 6.0.128, 6.0.203, 6.0.321, 6.0.420, 7.0.117, 7.0.203, 7.0.314, 7.0.407 +- .NET Core SDK: 6.0.129, 6.0.203, 6.0.321, 6.0.421, 7.0.118, 7.0.203, 7.0.315, 7.0.408 - .NET Framework: 4.7.2, 4.8 -- Microsoft.AspNetCore.App: 6.0.5, 6.0.26, 6.0.28, 7.0.5, 7.0.17 -- Microsoft.NETCore.App: 6.0.5, 6.0.26, 6.0.28, 7.0.5, 7.0.17 -- Microsoft.WindowsDesktop.App: 6.0.5, 6.0.26, 6.0.28, 7.0.5, 7.0.17 +- Microsoft.AspNetCore.App: 6.0.5, 6.0.26, 6.0.29, 7.0.5, 7.0.18 +- Microsoft.NETCore.App: 6.0.5, 6.0.26, 6.0.29, 7.0.5, 7.0.18 +- Microsoft.WindowsDesktop.App: 6.0.5, 6.0.26, 6.0.29, 7.0.5, 7.0.18 - nbgv 3.6.133+2d32d93cb1 ### PowerShell Tools -- PowerShell 7.4.1 +- PowerShell 7.4.2 #### Powershell Modules - Az: 11.3.1 @@ -504,10 +504,10 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - AzureRM: 2.1.0 (Default), 6.13.1 - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.553 +- AWSPowershell: 4.1.558 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 -- Microsoft.Graph: 2.16.0 +- Microsoft.Graph: 2.17.0 - Pester: 3.4.0, 5.5.0 - PowerShellGet: 1.0.0.1, 2.2.5 - PSScriptAnalyzer: 1.22.0 @@ -525,14 +525,14 @@ All other versions are saved but not installed. | -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 8.0 | | Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2 33.0.3<br>32.0.0<br>31.0.0<br>30.0.2 | -| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3) | +| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3) | | Android SDK Platform-Tools | 35.0.1 | | Android Support Repository | 47.0.0 | | CMake | 3.10.2<br>3.18.1<br>3.22.1 | | Google APIs | addon-google_apis-google-21<br>addon-google_apis-google-22<br>addon-google_apis-google-23<br>addon-google_apis-google-24 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 24.0.8215888<br>25.2.9519653<br>26.2.11394342 | +| NDK | 24.0.8215888<br>25.2.9519653<br>26.3.11579264 | #### Environment variables | Name | Value | @@ -540,15 +540,15 @@ All other versions are saved but not installed. | ANDROID_HOME | C:\Android\android-sdk | | ANDROID_NDK | C:\Android\android-sdk\ndk\25.2.9519653 | | ANDROID_NDK_HOME | C:\Android\android-sdk\ndk\25.2.9519653 | -| ANDROID_NDK_LATEST_HOME | C:\Android\android-sdk\ndk\26.2.11394342 | +| ANDROID_NDK_LATEST_HOME | C:\Android\android-sdk\ndk\26.3.11579264 | | ANDROID_NDK_ROOT | C:\Android\android-sdk\ndk\25.2.9519653 | | ANDROID_SDK_ROOT | C:\Android\android-sdk | ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:ac14bbc4ac85bb5d2891ea7e7d39316c6df63b749ef6447644289bb09455951c | 2024-03-12 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:78dac4e522f121788fbc834f3ccb6b7f7b19c15a3fbdcbfae60a9b3eee4537c8 | 2024-03-12 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:e15423aa2e5b51384f2edd40ddd1317371fc43f9483ec055989ef5ceb0c627a5 | 2024-03-12 | -| mcr.microsoft.com/windows/nanoserver:1809 | sha256:05f991b57e0095d6ea29c4fa7bef9e614c290de030c8e10e40cebc505871f725 | 2024-03-04 | -| mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:00cdad01de658d8d64acf052ddaa19c848e6d7edd214f2d8c2fd3da116fa58b2 | 2024-03-04 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:21e238b7a784c14fb02717859a9ac0cb39109c15e1a340400d3e3c2cccbc081d | 2024-04-09 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:504e7de522e227c46da6408894c19a4454b9979ab06b8577dae1fa5885795450 | 2024-04-09 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:46e393cbb7c915c504a810639e35f40cb516f8e886e4cbcf8a3b49f86705a070 | 2024-04-09 | +| mcr.microsoft.com/windows/nanoserver:1809 | sha256:9118c25a81609f13b441411f006b7cb6dd50958303e228f53914bebd8056d2e1 | 2024-04-06 | +| mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:6fdf140282a2f809dae9b13fe441635867f0a27c33a438771673b8da8f3348a4 | 2024-04-06 | From 5a21eb91dc5fc98acf3d3aed4697b1ee076f7af3 Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Wed, 17 Apr 2024 15:01:12 +0200 Subject: [PATCH 2785/3485] Update Windows/Ubuntu image gen pipeline to use OIDC (#9704) --- .../azure-pipelines/image-generation.yml | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/images.CI/linux-and-win/azure-pipelines/image-generation.yml b/images.CI/linux-and-win/azure-pipelines/image-generation.yml index 72deb989b892..458480dc2733 100644 --- a/images.CI/linux-and-win/azure-pipelines/image-generation.yml +++ b/images.CI/linux-and-win/azure-pipelines/image-generation.yml @@ -59,11 +59,13 @@ jobs: arguments: -RepoUrl $(CUSTOM_REPOSITORY_URL) ` -RepoBranch $(CUSTOM_REPOSITORY_BRANCH) - - task: PowerShell@2 + - task: AzurePowerShell@5 displayName: 'Set variables' inputs: - targetType: 'inline' - script: | + TargetAzurePs: LatestVersion + azureSubscription: 'spn-hosted-runners' + ScriptType: 'InlineScript' + Inline: | $ImageType = "${{ parameters.image_type }}" $TemplateDirectoryName = if ($ImageType.StartsWith("ubuntu")) { "ubuntu/templates" } else { "windows/templates" } $TemplateDirectoryPath = Join-Path "images" $TemplateDirectoryName | Resolve-Path @@ -79,13 +81,16 @@ jobs: $TempResourceGroupName = "packer-temp-$ManagedImageName" Write-Host "##vso[task.setvariable variable=TempResourceGroupName;]$TempResourceGroupName" + $clientSecret = $(az keyvault secret show --name "spnhostedrunners" --vault-name "gh-imagegeneration" --query value -o tsv) + Write-Host "##vso[task.setvariable variable=ClientSecret;issecret=true]$clientSecret" + - task: PowerShell@2 displayName: 'Build VM' inputs: targetType: filePath filePath: ./images.CI/linux-and-win/build-image.ps1 arguments: -ClientId $(CLIENT_ID) ` - -ClientSecret $(CLIENT_SECRET) ` + -ClientSecret "$(ClientSecret)" ` -TemplatePath $(TemplatePath) ` -ImageName "$(ManagedImageName)" ` -ImageResourceGroupName $(AZURE_RESOURCE_GROUP) ` @@ -172,5 +177,5 @@ jobs: arguments: -TempResourceGroupName "$(TempResourceGroupName)" ` -SubscriptionId $(AZURE_SUBSCRIPTION) ` -ClientId $(CLIENT_ID) ` - -ClientSecret $(CLIENT_SECRET) ` + -ClientSecret "$(ClientSecret)" ` -TenantId $(AZURE_TENANT) From 1a9753b7381fb8506e3dc4b9a3dcc42c997f8912 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 17 Apr 2024 14:08:45 +0000 Subject: [PATCH 2786/3485] Updating readme file for macos-13-arm64 version 20240415.2 (#9695) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-13-arm64-Readme.md | 56 +++++++++++++-------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/images/macos/macos-13-arm64-Readme.md b/images/macos/macos-13-arm64-Readme.md index 68cb5220bfa6..81bfaa2c9771 100644 --- a/images/macos/macos-13-arm64-Readme.md +++ b/images/macos/macos-13-arm64-Readme.md @@ -1,12 +1,12 @@ # macOS 13 - OS Version: macOS 13.6.6 (22G630) - Kernel Version: Darwin 22.6.0 -- Image Version: 20240405.1 +- Image Version: 20240415.2 ## Installed Software ### Language and Runtime -- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.407, 8.0.101, 8.0.203 +- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.408, 8.0.101, 8.0.204 - Bash 3.2.57(1)-release - Clang/LLVM 14.0.0 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` @@ -20,19 +20,19 @@ - Mono 6.12.0.188 - Node.js 20.12.1 - Perl 5.38.2 -- Python3 3.12.2 +- Python3 3.12.3 - Ruby 3.0.6p216 ### Package Management -- Bundler 2.5.7 +- Bundler 2.5.9 - Carthage 0.39.1 - CocoaPods 1.15.2 -- Homebrew 4.2.16 +- Homebrew 4.2.18 - NPM 10.5.0 - NuGet 6.3.1.1 - Pip3 24.0 (python 3.12) - Pipx 1.5.0 -- RubyGems 3.5.7 +- RubyGems 3.5.9 - Yarn 1.22.19 ### Project Management @@ -62,17 +62,17 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.15.36 -- AWS SAM CLI 1.114.0 +- AWS CLI 2.15.38 +- AWS SAM CLI 1.115.0 - AWS Session Manager CLI 1.2.553.0 - Azure CLI 2.59.0 - Azure CLI (azure-devops) 1.0.0 -- Bicep CLI 0.26.54 -- Cmake 3.29.1 +- Bicep CLI 0.26.170 +- Cmake 3.29.2 - CodeQL Action Bundle 2.17.0 - Fastlane 2.220.0 -- SwiftFormat 0.53.5 -- Xcbeautify 2.0.1 +- SwiftFormat 0.53.7 +- Xcbeautify 2.1.0 - Xcode Command Line Tools 14.3.1.0.1.1683849156 - Xcodes 1.4.1 @@ -81,9 +81,9 @@ ### Browsers - Safari 17.4.1 (18618.1.15.111.8) - SafariDriver 17.4.1 (18618.1.15.111.8) -- Google Chrome 123.0.6312.107 -- Google Chrome for Testing 123.0.6312.105 -- ChromeDriver 123.0.6312.105 +- Google Chrome 123.0.6312.124 +- Google Chrome for Testing 123.0.6312.122 +- ChromeDriver 123.0.6312.122 - Selenium server 4.19.1 #### Environment variables @@ -104,12 +104,12 @@ #### Python - 3.11.9 -- 3.12.2 +- 3.12.3 #### Node.js - 16.20.1 -- 18.20.1 -- 20.12.1 +- 18.20.2 +- 20.12.2 #### Go - 1.20.14 @@ -117,9 +117,9 @@ - 1.22.2 ### Rust Tools -- Cargo 1.77.1 -- Rust 1.77.1 -- Rustdoc 1.77.1 +- Cargo 1.77.2 +- Rust 1.77.2 +- Rustdoc 1.77.2 - Rustup 1.27.0 #### Packages @@ -127,7 +127,7 @@ - Rustfmt 1.7.0-stable ### PowerShell Tools -- PowerShell 7.4.1 +- PowerShell 7.4.2 #### PowerShell Modules - Az: 11.5.0 @@ -213,20 +213,20 @@ | Android Command Line Tools | 11.0 | | Android Emulator | 34.1.20 | | Android SDK Build-tools | 34.0.0<br>33.0.2 33.0.3 | -| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | +| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | | Android SDK Platform-Tools | 35.0.1 | | Android Support Repository | 47.0.0 | | CMake | 3.22.1 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 24.0.8215888<br>25.2.9519653<br>26.2.11394342 (default) | +| NDK | 24.0.8215888<br>25.2.9519653<br>26.3.11579264 (default) | #### Environment variables | Name | Value | | ----------------------- | --------------------------------------------------- | | ANDROID_HOME | /Users/runner/Library/Android/sdk | -| ANDROID_NDK | /Users/runner/Library/Android/sdk/ndk/26.2.11394342 | -| ANDROID_NDK_HOME | /Users/runner/Library/Android/sdk/ndk/26.2.11394342 | -| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/26.2.11394342 | -| ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk/26.2.11394342 | +| ANDROID_NDK | /Users/runner/Library/Android/sdk/ndk/26.3.11579264 | +| ANDROID_NDK_HOME | /Users/runner/Library/Android/sdk/ndk/26.3.11579264 | +| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/26.3.11579264 | +| ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk/26.3.11579264 | | ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | From 7fefd9f03ce35283628c05cf6b271dd7434860d9 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 17 Apr 2024 14:50:51 +0000 Subject: [PATCH 2787/3485] Updating readme file for macos-14-arm64 version 20240415.6 (#9698) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-14-arm64-Readme.md | 60 +++++++++++++-------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/images/macos/macos-14-arm64-Readme.md b/images/macos/macos-14-arm64-Readme.md index 1568bc976d1b..47093edccd1a 100644 --- a/images/macos/macos-14-arm64-Readme.md +++ b/images/macos/macos-14-arm64-Readme.md @@ -1,12 +1,12 @@ # macOS 14 - OS Version: macOS 14.4.1 (23E224) - Kernel Version: Darwin 23.4.0 -- Image Version: 20240405.1 +- Image Version: 20240415.6 ## Installed Software ### Language and Runtime -- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.407, 8.0.101, 8.0.203 +- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.408, 8.0.101, 8.0.204 - Bash 3.2.57(1)-release - Clang/LLVM 14.0.3 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` @@ -20,19 +20,19 @@ - Mono 6.12.0.188 - Node.js 20.12.1 - Perl 5.38.2 -- Python3 3.12.2 +- Python3 3.12.3 - Ruby 3.0.6p216 ### Package Management -- Bundler 2.5.7 +- Bundler 2.5.9 - Carthage 0.39.1 - CocoaPods 1.15.2 -- Homebrew 4.2.16 +- Homebrew 4.2.18 - NPM 10.5.0 - NuGet 6.3.1.1 - Pip3 24.0 (python 3.12) - Pipx 1.5.0 -- RubyGems 3.5.7 +- RubyGems 3.5.9 - Yarn 1.22.19 ### Project Management @@ -62,17 +62,17 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.15.36 -- AWS SAM CLI 1.114.0 +- AWS CLI 2.15.38 +- AWS SAM CLI 1.115.0 - AWS Session Manager CLI 1.2.553.0 - Azure CLI 2.59.0 - Azure CLI (azure-devops) 1.0.0 -- Bicep CLI 0.26.54 -- Cmake 3.29.1 +- Bicep CLI 0.26.170 +- Cmake 3.29.2 - CodeQL Action Bundle 2.17.0 - Fastlane 2.220.0 -- SwiftFormat 0.53.5 -- Xcbeautify 2.0.1 +- SwiftFormat 0.53.7 +- Xcbeautify 2.1.0 - Xcode Command Line Tools 15.3.0.0.1.1708646388 - Xcodes 1.4.1 @@ -81,9 +81,9 @@ ### Browsers - Safari 17.4.1 (19618.1.15.11.14) - SafariDriver 17.4.1 (19618.1.15.11.14) -- Google Chrome 123.0.6312.107 -- Google Chrome for Testing 123.0.6312.105 -- ChromeDriver 123.0.6312.105 +- Google Chrome 123.0.6312.124 +- Google Chrome for Testing 123.0.6312.122 +- ChromeDriver 123.0.6312.122 - Selenium server 4.19.1 #### Environment variables @@ -104,11 +104,11 @@ #### Python - 3.11.9 -- 3.12.2 +- 3.12.3 #### Node.js -- 18.20.1 -- 20.12.1 +- 18.20.2 +- 20.12.2 #### Go - 1.20.14 @@ -116,9 +116,9 @@ - 1.22.2 ### Rust Tools -- Cargo 1.77.1 -- Rust 1.77.1 -- Rustdoc 1.77.1 +- Cargo 1.77.2 +- Rust 1.77.2 +- Rustdoc 1.77.2 - Rustup 1.27.0 #### Packages @@ -126,7 +126,7 @@ - Rustfmt 1.7.0-stable ### PowerShell Tools -- PowerShell 7.4.1 +- PowerShell 7.4.2 #### PowerShell Modules - Az: 11.5.0 @@ -173,10 +173,10 @@ | Simulator - watchOS 10.0 | watchsimulator10.0 | 15.0.1 | | Simulator - watchOS 10.2 | watchsimulator10.2 | 15.1, 15.2 | | Simulator - watchOS 10.4 | watchsimulator10.4 | 15.3 | -| Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | | visionOS 1.0 | xros1.0 | 15.2 | -| visionOS 1.1 | xros1.1 | 15.3 | +| Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | | Simulator - visionOS 1.1 | xrsimulator1.1 | 15.3 | +| visionOS 1.1 | xros1.1 | 15.3 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | @@ -209,20 +209,20 @@ | Android Command Line Tools | 11.0 | | Android Emulator | 34.1.20 | | Android SDK Build-tools | 34.0.0<br>33.0.2 33.0.3 | -| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | +| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | | Android SDK Platform-Tools | 35.0.1 | | Android Support Repository | 47.0.0 | | CMake | 3.22.1 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 24.0.8215888<br>25.2.9519653<br>26.2.11394342 (default) | +| NDK | 24.0.8215888<br>25.2.9519653<br>26.3.11579264 (default) | #### Environment variables | Name | Value | | ----------------------- | --------------------------------------------------- | | ANDROID_HOME | /Users/runner/Library/Android/sdk | -| ANDROID_NDK | /Users/runner/Library/Android/sdk/ndk/26.2.11394342 | -| ANDROID_NDK_HOME | /Users/runner/Library/Android/sdk/ndk/26.2.11394342 | -| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/26.2.11394342 | -| ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk/26.2.11394342 | +| ANDROID_NDK | /Users/runner/Library/Android/sdk/ndk/26.3.11579264 | +| ANDROID_NDK_HOME | /Users/runner/Library/Android/sdk/ndk/26.3.11579264 | +| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/26.3.11579264 | +| ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk/26.3.11579264 | | ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | From 753a5bbaf44681087bde44546bd6105c2d7339a7 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 18 Apr 2024 09:08:40 +0000 Subject: [PATCH 2788/3485] Updating readme file for macOS-12 version 20240412.2 (#9699) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-12-Readme.md | 68 ++++++++++++++++----------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/images/macos/macos-12-Readme.md b/images/macos/macos-12-Readme.md index 983a75969d78..13bf67d7d58d 100644 --- a/images/macos/macos-12-Readme.md +++ b/images/macos/macos-12-Readme.md @@ -1,12 +1,12 @@ # macOS 12 - OS Version: macOS 12.7.4 (21H1123) - Kernel Version: Darwin 21.6.0 -- Image Version: 20240406.2 +- Image Version: 20240412.2 ## Installed Software ### Language and Runtime -- .NET Core SDK: 6.0.420, 7.0.102, 7.0.202, 7.0.306, 7.0.407, 8.0.101, 8.0.203 +- .NET Core SDK: 6.0.421, 7.0.102, 7.0.202, 7.0.306, 7.0.408, 8.0.101, 8.0.204 - Bash 3.2.57(1)-release - Clang/LLVM 14.0.0 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` @@ -23,28 +23,28 @@ - Node.js 18.20.1 - MSBuild 16.10.1.51301 (Mono 6.12.0.188) - NVM 0.39.7 -- NVM - Cached node versions: 16.20.2, 18.20.1, 20.12.1 +- NVM - Cached node versions: 16.20.2, 18.20.2, 20.12.2 - Perl 5.38.2 -- PHP 8.3.4 +- PHP 8.3.6 - Python 2.7.18 -- Python3 3.12.2 +- Python3 3.12.3 - R 4.3.3 - Ruby 3.0.6p216 ### Package Management -- Bundler 2.5.7 +- Bundler 2.5.9 - Carthage 0.39.1 - CocoaPods 1.15.2 - Composer 2.7.2 -- Homebrew 4.2.16 +- Homebrew 4.2.17 - Miniconda 24.1.2 - NPM 10.5.0 - NuGet 6.3.1.1 - Pip 20.3.4 (python 2.7) - Pip3 24.0 (python 3.12) - Pipx 1.5.0 -- RubyGems 3.5.7 -- Vcpkg 2024 (build from commit 5fa0f075e) +- RubyGems 3.5.9 +- Vcpkg 2024 (build from commit ad3bae574) - Yarn 1.22.19 #### Environment variables @@ -73,10 +73,10 @@ - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.24.5 - gpg (GnuPG) 2.4.5 -- ImageMagick 7.1.1-29 +- ImageMagick 7.1.1-30 - jq 1.7.1 -- mongo 5.0.21 -- mongod 5.0.21 +- mongo 5.0.26 +- mongod 5.0.26 - OpenSSL 1.1.1w 11 Sep 2023 - Packer 1.9.4 - pkg-config 0.29.2 @@ -92,14 +92,14 @@ ### Tools - App Center CLI 3.0.0 -- AWS CLI 2.15.36 -- AWS SAM CLI 1.114.0 +- AWS CLI 2.15.38 +- AWS SAM CLI 1.115.0 - AWS Session Manager CLI 1.2.553.0 - Azure CLI 2.59.0 - Azure CLI (azure-devops) 1.0.0 -- Bicep CLI 0.26.54 -- Cabal 3.10.2.1 -- Cmake 3.29.1 +- Bicep CLI 0.26.170 +- Cabal 3.10.3.0 +- Cmake 3.29.2 - CodeQL Action Bundle 2.17.0 - Colima 0.6.8 - Fastlane 2.220.0 @@ -107,7 +107,7 @@ - GHCup 0.1.22.0 - Jazzy 0.14.4 - Stack 2.15.5 -- SwiftFormat 0.53.5 +- SwiftFormat 0.53.6 - Swig 4.2.1 - Xcbeautify 1.6.0 - Xcode Command Line Tools 14.2.0.0.1.1668646533 @@ -120,11 +120,11 @@ ### Browsers - Safari 17.4.1 (17618.1.15.111.8) - SafariDriver 17.4.1 (17618.1.15.111.8) -- Google Chrome 123.0.6312.107 -- Google Chrome for Testing 123.0.6312.105 -- ChromeDriver 123.0.6312.105 -- Microsoft Edge 123.0.2420.81 -- Microsoft Edge WebDriver 123.0.2420.81 +- Google Chrome 123.0.6312.124 +- Google Chrome for Testing 123.0.6312.122 +- ChromeDriver 123.0.6312.122 +- Microsoft Edge 123.0.2420.97 +- Microsoft Edge WebDriver 123.0.2420.97 - Mozilla Firefox 124.0.2 - geckodriver 0.34.0 - Selenium server 4.19.1 @@ -163,12 +163,12 @@ - 3.9.19 - 3.10.14 - 3.11.9 -- 3.12.2 +- 3.12.3 #### Node.js - 16.20.2 -- 18.20.1 -- 20.12.1 +- 18.20.2 +- 20.12.2 #### Go - 1.20.14 @@ -176,9 +176,9 @@ - 1.22.2 ### Rust Tools -- Cargo 1.77.1 -- Rust 1.77.1 -- Rustdoc 1.77.1 +- Cargo 1.77.2 +- Rust 1.77.2 +- Rustdoc 1.77.2 - Rustup 1.27.0 #### Packages @@ -190,7 +190,7 @@ - Rustfmt 1.7.0-stable ### PowerShell Tools -- PowerShell 7.4.1 +- PowerShell 7.4.2 #### PowerShell Modules - Az: 11.5.0 @@ -210,7 +210,7 @@ | Version | Build | Path | | -------------- | ----------- | ------------------------------------ | | 2019 | 8.10.25.2 | /Applications/Visual Studio 2019.app | -| 2022 (default) | 17.6.10.428 | /Applications/Visual Studio.app | +| 2022 (default) | 17.6.11.400 | /Applications/Visual Studio.app | ##### Notes ``` @@ -332,13 +332,13 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" | Android Command Line Tools | 8.0 | | Android Emulator | 34.1.20 | | Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2 33.0.3<br>32.0.0<br>31.0.0 | -| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1) | +| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1) | | Android SDK Platform-Tools | 35.0.1 | | Android Support Repository | 47.0.0 | | CMake | 3.18.1<br>3.22.1 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 24.0.8215888<br>25.2.9519653 (default)<br>26.2.11394342 | +| NDK | 24.0.8215888<br>25.2.9519653 (default)<br>26.3.11579264 | #### Environment variables | Name | Value | @@ -346,7 +346,7 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" | ANDROID_HOME | /Users/runner/Library/Android/sdk | | ANDROID_NDK | /Users/runner/Library/Android/sdk/ndk/25.2.9519653 | | ANDROID_NDK_HOME | /Users/runner/Library/Android/sdk/ndk/25.2.9519653 | -| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/26.2.11394342 | +| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/26.3.11579264 | | ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk/25.2.9519653 | | ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | From 3c3caaa5e9e38dc4d12aa219240ac03ffe2e064c Mon Sep 17 00:00:00 2001 From: sssharif <sssharif@github.com> Date: Thu, 18 Apr 2024 09:10:14 -0400 Subject: [PATCH 2789/3485] [Windows] update nsis version in windows images (#9706) --- images/windows/toolsets/toolset-2019.json | 2 +- images/windows/toolsets/toolset-2022.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/images/windows/toolsets/toolset-2019.json b/images/windows/toolsets/toolset-2019.json index 5b5360c10745..2def478add80 100644 --- a/images/windows/toolsets/toolset-2019.json +++ b/images/windows/toolsets/toolset-2019.json @@ -462,7 +462,7 @@ "signature": "F2D7C28591847BB2CB2B1C2A0C59459FDC728A38" }, "nsis": { - "version": "3.09" + "version": "3.10" }, "php": { "version": "8.3" diff --git a/images/windows/toolsets/toolset-2022.json b/images/windows/toolsets/toolset-2022.json index 6b603486661d..8e3d157af780 100644 --- a/images/windows/toolsets/toolset-2022.json +++ b/images/windows/toolsets/toolset-2022.json @@ -418,7 +418,7 @@ "signature": "F2D7C28591847BB2CB2B1C2A0C59459FDC728A38" }, "nsis": { - "version": "3.09" + "version": "3.10" }, "llvm": { "version": "16" From a76eae469e4c8c16b0f91c38e17f9e1ffb5c633d Mon Sep 17 00:00:00 2001 From: MaksimZhukov <46996400+MaksimZhukov@users.noreply.github.com> Date: Fri, 19 Apr 2024 12:39:42 +0200 Subject: [PATCH 2790/3485] Add xcode 15.4 to macOS 14 (#9710) --- images/macos/toolsets/toolset-14.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/images/macos/toolsets/toolset-14.json b/images/macos/toolsets/toolset-14.json index 0fba2c8ab8f9..d7d602831625 100644 --- a/images/macos/toolsets/toolset-14.json +++ b/images/macos/toolsets/toolset-14.json @@ -3,6 +3,7 @@ "default": "15.0.1", "x64": { "versions": [ + { "link": "15.4", "version": "15.4.0-Beta+15F5021i", "install_runtimes": "true", "sha256": "e20a2af230e3dbac105496f194530e9c865a756b136ff8ed7c7f215774a91a9e"}, { "link": "15.3", "version": "15.3.0+15E204a", "install_runtimes": "true", "sha256": "f13f6a2e2df432c3008e394640b8549a18c285acd7fd148d6c4bac8c3a5af234"}, { "link": "15.2", "version": "15.2.0+15C500b", "install_runtimes": "true", "sha256": "04E93680C6DDBEC84666531BE412DE778AFC8EAC6AB2037F4C2BE7290818B59B"}, { "link": "15.1", "version": "15.1.0+15C65", "install_runtimes": "true", "sha256": "857D8DB537BAC82BF99DE0E1D3895D214D4D02101C1340CEF3DAF6E821BA1D05"}, @@ -12,6 +13,7 @@ }, "arm64":{ "versions": [ + { "link": "15.4", "version": "15.4.0-Beta+15F5021i", "install_runtimes": "true", "sha256": "e20a2af230e3dbac105496f194530e9c865a756b136ff8ed7c7f215774a91a9e"}, { "link": "15.3", "version": "15.3.0+15E204a", "install_runtimes": "true", "sha256": "f13f6a2e2df432c3008e394640b8549a18c285acd7fd148d6c4bac8c3a5af234"}, { "link": "15.2", "version": "15.2.0+15C500b", "install_runtimes": "true", "sha256": "04E93680C6DDBEC84666531BE412DE778AFC8EAC6AB2037F4C2BE7290818B59B"}, { "link": "15.1", "version": "15.1.0+15C65", "install_runtimes": "true", "sha256": "857D8DB537BAC82BF99DE0E1D3895D214D4D02101C1340CEF3DAF6E821BA1D05"}, From 22940f4a86adbaa3c03fa7c23195753fb2de9ad0 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Tue, 23 Apr 2024 11:06:00 +0200 Subject: [PATCH 2791/3485] [Ubuntu] Fix heroku installation (#9719) --- images/ubuntu/scripts/build/install-heroku.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/ubuntu/scripts/build/install-heroku.sh b/images/ubuntu/scripts/build/install-heroku.sh index e5f774253d40..9d01f371da35 100644 --- a/images/ubuntu/scripts/build/install-heroku.sh +++ b/images/ubuntu/scripts/build/install-heroku.sh @@ -10,7 +10,7 @@ REPO_PATH="/etc/apt/sources.list.d/heroku.list" # add heroku repository to apt curl -fsSL "${REPO_URL}/release.key" | gpg --dearmor -o $GPG_KEY -echo "deb [signed-by=$GPG_KEY] $REPO_URL ./" > $REPO_PATH +echo "deb [trusted=yes] $REPO_URL ./" > $REPO_PATH # install heroku apt-get update -y && apt-get install -y heroku From 30f313be541b7bdae9563e81e088a74e96911460 Mon Sep 17 00:00:00 2001 From: MaksimZhukov <46996400+MaksimZhukov@users.noreply.github.com> Date: Tue, 23 Apr 2024 11:06:38 +0200 Subject: [PATCH 2792/3485] Fix the issue related to open windows (#9722) --- images/macos/scripts/build/configure-windows.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/images/macos/scripts/build/configure-windows.sh b/images/macos/scripts/build/configure-windows.sh index 72cb4c8ac8e2..9a753a566d9c 100644 --- a/images/macos/scripts/build/configure-windows.sh +++ b/images/macos/scripts/build/configure-windows.sh @@ -22,17 +22,17 @@ while [[ $retry -gt 0 ]]; do fi sleep 30 done -IFS=',' read -r -a windowslist <<< $openwindows +IFS=',' read -r -a windowslist <<< "$openwindows" if [[ -n ${openwindows} ]]; then echo "Found opened window:" fi -for window in ${windowslist[@]}; do - if [[ $window =~ "NotificationCenter" ]]; then - echo "[Warning] $window" +for key in ${!windowslist[@]}; do + if [[ ${windowslist[$key]} =~ "NotificationCenter" ]]; then + echo "[Warning] ${windowslist[$key]}" else - echo " - ${window}" | xargs + echo " - ${windowslist[$key]}" | xargs scripterror=true fi done From 9356e9535108dd883de712c290bdfb56e7a6c5ca Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 24 Apr 2024 12:12:04 +0200 Subject: [PATCH 2793/3485] Updating readme file for ubuntu22 version 20240422.1.1 (#9730) Co-authored-by: Image generation service account <no-reply@microsoft.com> --- images/ubuntu/Ubuntu2204-Readme.md | 61 +++++++++++++++--------------- 1 file changed, 31 insertions(+), 30 deletions(-) diff --git a/images/ubuntu/Ubuntu2204-Readme.md b/images/ubuntu/Ubuntu2204-Readme.md index 79796d5a112c..1e5c3de7f7d6 100644 --- a/images/ubuntu/Ubuntu2204-Readme.md +++ b/images/ubuntu/Ubuntu2204-Readme.md @@ -1,11 +1,12 @@ | Announcements | |-| +| [[Ubuntu, Windows] Docker Compose v1 will be removed from images on July, 9](https://github.com/actions/runner-images/issues/9692) | | [[Ubuntu] ubuntu-toolchain-r/test repository will be removed from images on May 6](https://github.com/actions/runner-images/issues/9679) | *** # Ubuntu 22.04 - OS Version: 22.04.4 LTS - Kernel Version: 6.5.0-1018-azure -- Image Version: 20240414.1.0 +- Image Version: 20240422.1.0 - Systemd version: 249.11-0ubuntu3.12 ## Installed Software @@ -31,15 +32,15 @@ ### Package Management - cpan 1.64 - Helm 3.14.4 -- Homebrew 4.2.17 -- Miniconda 24.1.2 +- Homebrew 4.2.19 +- Miniconda 24.3.0 - Npm 10.5.0 - NuGet 6.6.1.2 - Pip 22.0.2 - Pip3 22.0.2 - Pipx 1.5.0 - RubyGems 3.3.5 -- Vcpkg (build from commit ad3bae574) +- Vcpkg (build from commit 9224b3bbd) - Yarn 1.22.22 #### Environment variables @@ -61,7 +62,7 @@ to accomplish this. - Maven 3.8.8 ### Tools -- Ansible 2.16.5 +- Ansible 2.16.6 - apt-fast 1.10.0 - AzCopy 10.24.0 - available by `azcopy` and `azcopy10` aliases - Bazel 7.1.1 @@ -73,7 +74,7 @@ to accomplish this. - Docker Amazon ECR Credential Helper 0.7.1 - Docker Compose v1 1.29.2 - Docker Compose v2 2.23.3 -- Docker-Buildx 0.13.1 +- Docker-Buildx 0.14.0 - Docker Client 24.0.9 - Docker Server 24.0.9 - Fastlane 2.220.0 @@ -81,45 +82,45 @@ to accomplish this. - Git LFS 3.5.1 - Git-ftp 1.6.0 - Haveged 1.9.14 -- Heroku 8.11.2 +- Heroku 8.11.4 - jq 1.6 - Kind 0.22.0 -- Kubectl 1.29.3 +- Kubectl 1.30.0 - Kustomize 5.4.1 - Leiningen 2.11.2 - MediaInfo 21.09 - Mercurial 6.1.1 -- Minikube 1.32.0 -- n 9.2.1 +- Minikube 1.33.0 +- n 9.2.3 - Newman 6.1.2 - nvm 0.39.7 - OpenSSL 3.0.2-0ubuntu1.15 - Packer 1.10.2 - Parcel 2.12.0 - Podman 3.4.4 -- Pulumi 3.112.0 +- Pulumi 3.113.3 - R 4.3.3 - Skopeo 1.4.1 - Sphinx Open Source Search Server 2.2.11 - SVN 1.14.1 -- Terraform 1.8.0 +- Terraform 1.8.1 - yamllint 1.35.1 - yq 4.43.1 - zstd 1.5.6 ### CLI Tools - Alibaba Cloud CLI 3.0.202 -- AWS CLI 2.15.38 +- AWS CLI 2.15.40 - AWS CLI Session Manager Plugin 1.2.553.0 - AWS SAM CLI 1.115.0 - Azure CLI 2.59.0 - Azure CLI (azure-devops) 1.0.0 -- GitHub CLI 2.47.0 -- Google Cloud CLI 471.0.0 +- GitHub CLI 2.48.0 +- Google Cloud CLI 472.0.0 - Netlify CLI 17.22.1 -- OpenShift CLI 4.15.8 +- OpenShift CLI 4.15.9 - ORAS CLI 1.1.0 -- Vercel CLI 34.0.0 +- Vercel CLI 34.1.1 ### Java | Version | Environment Variable | @@ -131,7 +132,7 @@ to accomplish this. ### PHP Tools - PHP: 8.1.2 -- Composer 2.7.2 +- Composer 2.7.3 - PHPUnit 8.5.38 ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. @@ -158,13 +159,13 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 123.0.6312.122 -- ChromeDriver 123.0.6312.122 -- Chromium 123.0.6312.0 -- Microsoft Edge 123.0.2420.97 -- Microsoft Edge WebDriver 123.0.2420.97 +- Google Chrome 124.0.6367.60 +- ChromeDriver 124.0.6367.60 +- Chromium 124.0.6367.0 +- Microsoft Edge 124.0.2478.51 +- Microsoft Edge WebDriver 124.0.2478.51 - Selenium server 4.19.1 -- Mozilla Firefox 125.0 +- Mozilla Firefox 125.0.2 - Geckodriver 0.34.0 #### Environment variables @@ -285,8 +286,8 @@ Use the following command as a part of your job to start the service: 'sudo syst | node:18-alpine | sha256:80338ff3fc4e989c1d5264a23223cec1c6014e812e584e825e78d1a98d893381 | 2024-04-11 | | node:20 | sha256:844b41cf784f66d7920fd673f7af54ca7b81e289985edc6cd864e7d05e0d133c | 2024-04-11 | | node:20-alpine | sha256:ec0c413b1d84f3f7f67ec986ba885930c57b5318d2eb3abc6960ee05d4f2eb28 | 2024-04-11 | -| ubuntu:20.04 | sha256:80ef4a44043dec4490506e6cc4289eeda2d106a70148b74b5ae91ee670e9c35d | 2024-02-16 | -| ubuntu:22.04 | sha256:77906da86b60585ce12215807090eb327e7386c8fafb5402369e421f44eff17e | 2024-02-27 | +| ubuntu:20.04 | sha256:71b82b8e734f5cd0b3533a16f40ca1271f28d87343972bb4cd6bd6c38f1bd38e | 2024-04-10 | +| ubuntu:22.04 | sha256:1b8d8ff4777f36f19bfe73ee4df61e3a0b789caeff29caa019539ec7c9a57f95 | 2024-04-10 | ### Installed apt packages | Name | Version | @@ -322,7 +323,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | lib32z1 | 1:1.2.11.dfsg-2ubuntu9.2 | | libc++-dev | 1:14.0-55\~exp2 | | libc++abi-dev | 1:14.0-55\~exp2 | -| libc6-dev | 2.35-0ubuntu3.6 | +| libc6-dev | 2.35-0ubuntu3.7 | | libcurl4 | 7.81.0-1ubuntu1.16 | | libgbm-dev | 23.2.1-1ubuntu3.1\~22.04.2 | | libgconf-2-4 | 3.2.6-7ubuntu2 | @@ -339,7 +340,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | libxkbfile-dev | 1:1.1.0-1build3 | | libxss1 | 1:1.2.3-1build2 | | libyaml-dev | 0.2.2-1build2 | -| locales | 2.35-0ubuntu3.6 | +| locales | 2.35-0ubuntu3.7 | | lz4 | 1.9.3-2build2 | | m4 | 1.4.18-5ubuntu2 | | make | 4.3-4.1build1 | @@ -347,7 +348,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | mercurial | 6.1.1-1ubuntu1 | | net-tools | 1.60+git20181103.0eebece-1ubuntu5 | | netcat | 1.218-4ubuntu1 | -| openssh-client | 1:8.9p1-3ubuntu0.6 | +| openssh-client | 1:8.9p1-3ubuntu0.7 | | p7zip-full | 16.02+dfsg-8 | | p7zip-rar | 16.02-3build1 | | parallel | 20210822+ds-2 | @@ -362,7 +363,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | shellcheck | 0.8.0-2 | | sphinxsearch | 2.2.11-8 | | sqlite3 | 3.37.2-2ubuntu0.3 | -| ssh | 1:8.9p1-3ubuntu0.6 | +| ssh | 1:8.9p1-3ubuntu0.7 | | sshpass | 1.09-1 | | subversion | 1.14.1-3ubuntu0.22.04.1 | | sudo | 1.9.9-1ubuntu2.4 | From 771153c58818173a8e7e96c3af3cd602d5755dbe Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 24 Apr 2024 10:59:02 +0000 Subject: [PATCH 2794/3485] Updating readme file for ubuntu20 version 20240422.1.1 (#9724) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2004-Readme.md | 55 +++++++++++++++--------------- 1 file changed, 28 insertions(+), 27 deletions(-) diff --git a/images/ubuntu/Ubuntu2004-Readme.md b/images/ubuntu/Ubuntu2004-Readme.md index e95e4c026031..c682422895b7 100644 --- a/images/ubuntu/Ubuntu2004-Readme.md +++ b/images/ubuntu/Ubuntu2004-Readme.md @@ -1,11 +1,12 @@ | Announcements | |-| +| [[Ubuntu, Windows] Docker Compose v1 will be removed from images on July, 9](https://github.com/actions/runner-images/issues/9692) | | [[Ubuntu] ubuntu-toolchain-r/test repository will be removed from images on May 6](https://github.com/actions/runner-images/issues/9679) | *** # Ubuntu 20.04 - OS Version: 20.04.6 LTS -- Kernel Version: 5.15.0-1060-azure -- Image Version: 20240414.1.0 +- Kernel Version: 5.15.0-1061-azure +- Image Version: 20240422.1.0 - Systemd version: 245.4-4ubuntu3.23 ## Installed Software @@ -33,15 +34,15 @@ ### Package Management - cpan 1.64 - Helm 3.14.4 -- Homebrew 4.2.17 -- Miniconda 24.1.2 +- Homebrew 4.2.19 +- Miniconda 24.3.0 - Npm 10.5.0 - NuGet 6.6.1.2 - Pip 20.0.2 - Pip3 20.0.2 - Pipx 1.5.0 - RubyGems 3.1.2 -- Vcpkg (build from commit ad3bae574) +- Vcpkg (build from commit 9224b3bbd) - Yarn 1.22.22 #### Environment variables @@ -78,7 +79,7 @@ to accomplish this. - Docker Amazon ECR Credential Helper 0.7.1 - Docker Compose v1 1.29.2 - Docker Compose v2 2.23.3 -- Docker-Buildx 0.13.1 +- Docker-Buildx 0.14.0 - Docker Client 24.0.9 - Docker Server 24.0.9 - Fastlane 2.220.0 @@ -86,17 +87,17 @@ to accomplish this. - Git LFS 3.5.1 - Git-ftp 1.6.0 - Haveged 1.9.1 -- Heroku 8.11.2 +- Heroku 8.11.4 - HHVM (HipHop VM) 4.172.1 - jq 1.6 - Kind 0.22.0 -- Kubectl 1.29.3 +- Kubectl 1.30.0 - Kustomize 5.4.1 - Leiningen 2.11.2 - MediaInfo 19.09 - Mercurial 5.3.1 -- Minikube 1.32.0 -- n 9.2.1 +- Minikube 1.33.0 +- n 9.2.3 - Newman 6.1.2 - nvm 0.39.7 - OpenSSL 1.1.1f-1ubuntu2.22 @@ -104,29 +105,29 @@ to accomplish this. - Parcel 2.12.0 - PhantomJS 2.1.1 2.1.1 - Podman 3.4.2 -- Pulumi 3.112.0 +- Pulumi 3.113.3 - R 4.3.3 - Skopeo 1.5.0 - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 -- Terraform 1.8.0 +- Terraform 1.8.1 - yamllint 1.35.1 - yq 4.43.1 - zstd 1.5.6 ### CLI Tools - Alibaba Cloud CLI 3.0.174 -- AWS CLI 2.15.38 +- AWS CLI 2.15.40 - AWS CLI Session Manager Plugin 1.2.553.0 - AWS SAM CLI 1.115.0 - Azure CLI 2.59.0 - Azure CLI (azure-devops) 1.0.0 -- GitHub CLI 2.47.0 -- Google Cloud CLI 471.0.0 +- GitHub CLI 2.48.0 +- Google Cloud CLI 472.0.0 - Netlify CLI 17.22.1 -- OpenShift CLI 4.15.8 +- OpenShift CLI 4.15.9 - ORAS CLI 1.1.0 -- Vercel CLI 34.0.0 +- Vercel CLI 34.1.1 ### Java | Version | Environment Variable | @@ -138,7 +139,7 @@ to accomplish this. ### PHP Tools - PHP: 7.4.33, 8.0.30, 8.1.27, 8.2.18, 8.3.6 -- Composer 2.7.2 +- Composer 2.7.3 - PHPUnit 8.5.38 ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. @@ -165,13 +166,13 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 123.0.6312.122 -- ChromeDriver 123.0.6312.122 -- Chromium 123.0.6312.0 -- Microsoft Edge 123.0.2420.97 -- Microsoft Edge WebDriver 123.0.2420.97 +- Google Chrome 124.0.6367.60 +- ChromeDriver 124.0.6367.60 +- Chromium 124.0.6367.0 +- Microsoft Edge 124.0.2478.51 +- Microsoft Edge WebDriver 124.0.2478.51 - Selenium server 4.19.1 -- Mozilla Firefox 125.0 +- Mozilla Firefox 125.0.1 - Geckodriver 0.34.0 #### Environment variables @@ -298,7 +299,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | node:18-alpine | sha256:80338ff3fc4e989c1d5264a23223cec1c6014e812e584e825e78d1a98d893381 | 2024-04-11 | | node:20 | sha256:844b41cf784f66d7920fd673f7af54ca7b81e289985edc6cd864e7d05e0d133c | 2024-04-11 | | node:20-alpine | sha256:ec0c413b1d84f3f7f67ec986ba885930c57b5318d2eb3abc6960ee05d4f2eb28 | 2024-04-11 | -| ubuntu:20.04 | sha256:80ef4a44043dec4490506e6cc4289eeda2d106a70148b74b5ae91ee670e9c35d | 2024-02-16 | +| ubuntu:20.04 | sha256:71b82b8e734f5cd0b3533a16f40ca1271f28d87343972bb4cd6bd6c38f1bd38e | 2024-04-10 | ### Installed apt packages | Name | Version | @@ -334,7 +335,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | lib32z1 | 1:1.2.11.dfsg-2ubuntu1.5 | | libc++-dev | 1:10.0-50\~exp1 | | libc++abi-dev | 1:10.0-50\~exp1 | -| libc6-dev | 2.31-0ubuntu9.14 | +| libc6-dev | 2.31-0ubuntu9.15 | | libcurl4 | 7.68.0-1ubuntu2.22 | | libgbm-dev | 21.2.6-0ubuntu0.1\~20.04.2 | | libgconf-2-4 | 3.2.6-6ubuntu1 | @@ -350,7 +351,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | libxkbfile-dev | 1:1.1.0-1 | | libxss1 | 1:1.2.3-1 | | libyaml-dev | 0.2.2-1 | -| locales | 2.31-0ubuntu9.14 | +| locales | 2.31-0ubuntu9.15 | | m4 | 1.4.18-4 | | make | 4.2.1-1.2 | | mediainfo | 19.09-1build1 | From 67a74919b47480f558bb242372b170c5eca86ed3 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 24 Apr 2024 12:02:49 +0000 Subject: [PATCH 2795/3485] Updating readme file for win19 version 20240422.1.1 (#9727) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/windows/Windows2019-Readme.md | 48 ++++++++++++++++------------ 1 file changed, 27 insertions(+), 21 deletions(-) diff --git a/images/windows/Windows2019-Readme.md b/images/windows/Windows2019-Readme.md index 7e31eb917d39..9371d261e627 100644 --- a/images/windows/Windows2019-Readme.md +++ b/images/windows/Windows2019-Readme.md @@ -1,6 +1,11 @@ +| Announcements | +|-| +| [[Windows-2022] Multiple VC Build Tools will be removed on May, 13](https://github.com/actions/runner-images/issues/9701) | +| [[Ubuntu, Windows] Docker Compose v1 will be removed from images on July, 9](https://github.com/actions/runner-images/issues/9692) | +*** # Windows Server 2019 - OS Version: 10.0.17763 Build 5696 -- Image Version: 20240414.1.0 +- Image Version: 20240422.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -21,15 +26,15 @@ ### Package Management - Chocolatey 2.2.2 -- Composer 2.7.2 +- Composer 2.7.3 - Helm 3.14.3 -- Miniconda 24.1.2 (pre-installed on the image but not added to PATH) +- Miniconda 24.3.0 (pre-installed on the image but not added to PATH) - NPM 9.8.1 - NuGet 6.9.1.3 - pip 24.0 (python 3.7) - Pipx 1.2.1 - RubyGems 3.2.33 -- Vcpkg (build from commit ad3bae574) +- Vcpkg (build from commit 9224b3bbd) - Yarn 1.22.22 #### Environment variables @@ -61,22 +66,22 @@ - ghc 9.8.2 - Git 2.44.0.windows.1 - Git LFS 3.4.1 -- Google Cloud CLI 471.0.0 +- Google Cloud CLI 472.0.0 - ImageMagick 7.1.1-29 - InnoSetup 6.2.2 - jq 1.7.1 - Kind 0.22.0 -- Kubectl 1.29.1 +- Kubectl 1.30.0 - Mercurial 5.0 - gcc 8.1.0 - gdb 8.1 - GNU Binutils 2.30 - Newman 6.1.2 -- NSIS 3.09 +- NSIS 3.10 - OpenSSL 1.1.1w - Packer 1.10.2 - Parcel 2.12.0 -- Pulumi 3.112.0 +- Pulumi 3.113.3 - R 4.3.3 - Service Fabric SDK 9.1.1436.9590 - Stack 2.15.5 @@ -90,13 +95,13 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.202 -- AWS CLI 2.15.38 +- AWS CLI 2.15.40 - AWS SAM CLI 1.115.0 - AWS Session Manager CLI 1.2.553.0 - Azure CLI 2.59.0 - Azure DevOps CLI extension 1.0.0 - Cloud Foundry CLI 6.53.0 -- GitHub CLI 2.47.0 +- GitHub CLI 2.48.0 ### Rust Tools - Cargo 1.77.2 @@ -113,11 +118,11 @@ - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 123.0.6312.123 -- Chrome Driver 123.0.6312.122 -- Microsoft Edge 123.0.2420.97 -- Microsoft Edge Driver 123.0.2420.97 -- Mozilla Firefox 124.0.2 +- Google Chrome 124.0.6367.61 +- Chrome Driver 124.0.6367.60 +- Microsoft Edge 124.0.2478.51 +- Microsoft Edge Driver 124.0.2478.51 +- Mozilla Firefox 125.0.1 - Gecko Driver 0.34.0 - IE Driver 4.14.0.0 - Selenium server 4.19.0 @@ -133,10 +138,10 @@ ### Java | Version | Environment Variable | | ------------------- | -------------------- | -| 8.0.402+6 (default) | JAVA_HOME_8_X64 | -| 11.0.22+7 | JAVA_HOME_11_X64 | -| 17.0.10+7 | JAVA_HOME_17_X64 | -| 21.0.2+13.0 | JAVA_HOME_21_X64 | +| 8.0.412+8 (default) | JAVA_HOME_8_X64 | +| 11.0.23+9 | JAVA_HOME_11_X64 | +| 17.0.11+9 | JAVA_HOME_17_X64 | +| 21.0.3+9.0 | JAVA_HOME_21_X64 | ### Shells | Name | Target | @@ -220,7 +225,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Name | Version | ConfigFile | ServiceName | ServiceStatus | ListenPort | | ------ | ------- | ------------------------------------- | ----------- | ------------- | ---------- | | Apache | 2.4.55 | C:\tools\Apache24\conf\httpd.conf | Apache | Stopped | 80 | -| Nginx | 1.25.4 | C:\tools\nginx-1.25.4\conf\nginx.conf | nginx | Stopped | 80 | +| Nginx | 1.25.5 | C:\tools\nginx-1.25.5\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2019 | Name | Version | Path | @@ -504,7 +509,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - AzureRM: 2.1.0 (Default), 6.13.1 - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.558 +- AWSPowershell: 4.1.562 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 - Microsoft.Graph: 2.17.0 @@ -552,3 +557,4 @@ All other versions are saved but not installed. | mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:46e393cbb7c915c504a810639e35f40cb516f8e886e4cbcf8a3b49f86705a070 | 2024-04-09 | | mcr.microsoft.com/windows/nanoserver:1809 | sha256:9118c25a81609f13b441411f006b7cb6dd50958303e228f53914bebd8056d2e1 | 2024-04-06 | | mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:6fdf140282a2f809dae9b13fe441635867f0a27c33a438771673b8da8f3348a4 | 2024-04-06 | + From c5a4a6ff8c2e3f92d8b7e61a5216743ae0daf60e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 24 Apr 2024 12:57:03 +0000 Subject: [PATCH 2796/3485] Updating readme file for macos-14 version 20240422.1 (#9726) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-14-Readme.md | 94 +++++++++++++++++++-------------- 1 file changed, 54 insertions(+), 40 deletions(-) diff --git a/images/macos/macos-14-Readme.md b/images/macos/macos-14-Readme.md index 4171bc9f8064..07581bbfc877 100644 --- a/images/macos/macos-14-Readme.md +++ b/images/macos/macos-14-Readme.md @@ -1,7 +1,7 @@ # macOS 14 - OS Version: macOS 14.4.1 (23E224) - Kernel Version: Darwin 23.4.0 -- Image Version: 20240414.1 +- Image Version: 20240422.1 ## Installed Software @@ -18,7 +18,7 @@ - GNU Fortran 13 (Homebrew GCC 13.2.0) - available by `gfortran-13` alias - Kotlin 1.9.23-release-779 - Mono 6.12.0.188 -- Node.js 20.12.1 +- Node.js 20.12.2 - Perl 5.38.2 - PHP 8.3.6 - Python3 3.12.3 @@ -28,8 +28,8 @@ - Bundler 2.5.9 - Carthage 0.39.1 - CocoaPods 1.15.2 -- Composer 2.7.2 -- Homebrew 4.2.17 +- Composer 2.7.3 +- Homebrew 4.2.19 - NPM 10.5.0 - NuGet 6.3.1.1 - Pip3 24.0 (python 3.12) @@ -52,7 +52,7 @@ - Curl 8.7.1 - Git 2.44.0 - Git LFS 3.5.1 -- GitHub CLI 2.47.0 +- GitHub CLI 2.48.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.24.5 - gpg (GnuPG) 2.4.5 @@ -64,7 +64,7 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.15.38 +- AWS CLI 2.15.40 - AWS SAM CLI 1.115.0 - AWS Session Manager CLI 1.2.553.0 - Azure CLI 2.59.0 @@ -84,12 +84,12 @@ ### Browsers - Safari 17.4.1 (19618.1.15.11.14) - SafariDriver 17.4.1 (19618.1.15.11.14) -- Google Chrome 123.0.6312.124 -- Google Chrome for Testing 123.0.6312.122 -- ChromeDriver 123.0.6312.122 -- Microsoft Edge 123.0.2420.97 -- Microsoft Edge WebDriver 123.0.2420.97 -- Mozilla Firefox 124.0.2 +- Google Chrome 124.0.6367.62 +- Google Chrome for Testing 124.0.6367.60 +- ChromeDriver 124.0.6367.60 +- Microsoft Edge 124.0.2478.51 +- Microsoft Edge WebDriver 124.0.2478.51 +- Mozilla Firefox 125.0.2 - geckodriver 0.34.0 - Selenium server 4.19.1 @@ -101,12 +101,12 @@ | GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | ### Java -| Version | Environment Variable | -| --------------------- | -------------------- | -| 8.0.402+6 | JAVA_HOME_8_X64 | -| 11.0.22+7 | JAVA_HOME_11_X64 | -| 17.0.10+7 | JAVA_HOME_17_X64 | -| 21.0.2+13.0 (default) | JAVA_HOME_21_X64 | +| Version | Environment Variable | +| -------------------- | -------------------- | +| 8.0.412+8 | JAVA_HOME_8_X64 | +| 11.0.23+9 | JAVA_HOME_11_X64 | +| 17.0.11+9 | JAVA_HOME_17_X64 | +| 21.0.3+9.0 (default) | JAVA_HOME_21_X64 | ### Cached Tools @@ -146,13 +146,14 @@ - PSScriptAnalyzer: 1.22.0 ### Xcode -| Version | Build | Path | -| ---------------- | ------- | ------------------------------ | -| 15.3 | 15E204a | /Applications/Xcode_15.3.app | -| 15.2 | 15C500b | /Applications/Xcode_15.2.app | -| 15.1 | 15C65 | /Applications/Xcode_15.1.app | -| 15.0.1 (default) | 15A507 | /Applications/Xcode_15.0.1.app | -| 14.3.1 | 14E300c | /Applications/Xcode_14.3.1.app | +| Version | Build | Path | +| ---------------- | -------- | ------------------------------ | +| 15.4 (beta) | 15F5021i | /Applications/Xcode_15.4.app | +| 15.3 | 15E204a | /Applications/Xcode_15.3.app | +| 15.2 | 15C500b | /Applications/Xcode_15.2.app | +| 15.1 | 15C65 | /Applications/Xcode_15.1.app | +| 15.0.1 (default) | 15A507 | /Applications/Xcode_15.0.1.app | +| 14.3.1 | 14E300c | /Applications/Xcode_14.3.1.app | #### Installed SDKs | SDK | SDK Name | Xcode Version | @@ -161,34 +162,43 @@ | macOS 14.0 | macosx14.0 | 15.0.1 | | macOS 14.2 | macosx14.2 | 15.1, 15.2 | | macOS 14.4 | macosx14.4 | 15.3 | +| macOS 14.5 | macosx14.5 | 15.4 | | iOS 16.4 | iphoneos16.4 | 14.3.1 | | iOS 17.0 | iphoneos17.0 | 15.0.1 | | iOS 17.2 | iphoneos17.2 | 15.1, 15.2 | | iOS 17.4 | iphoneos17.4 | 15.3 | +| iOS 17.5 | iphoneos17.5 | 15.4 | | Simulator - iOS 16.4 | iphonesimulator16.4 | 14.3.1 | | Simulator - iOS 17.0 | iphonesimulator17.0 | 15.0.1 | | Simulator - iOS 17.2 | iphonesimulator17.2 | 15.1, 15.2 | | Simulator - iOS 17.4 | iphonesimulator17.4 | 15.3 | +| Simulator - iOS 17.5 | iphonesimulator17.5 | 15.4 | | tvOS 16.4 | appletvos16.4 | 14.3.1 | | tvOS 17.0 | appletvos17.0 | 15.0.1 | | tvOS 17.2 | appletvos17.2 | 15.1, 15.2 | | tvOS 17.4 | appletvos17.4 | 15.3 | +| tvOS 17.5 | appletvos17.5 | 15.4 | | Simulator - tvOS 16.4 | appletvsimulator16.4 | 14.3.1 | | Simulator - tvOS 17.0 | appletvsimulator17.0 | 15.0.1 | | Simulator - tvOS 17.2 | appletvsimulator17.2 | 15.1, 15.2 | | Simulator - tvOS 17.4 | appletvsimulator17.4 | 15.3 | +| Simulator - tvOS 17.5 | appletvsimulator17.5 | 15.4 | | watchOS 9.4 | watchos9.4 | 14.3.1 | | watchOS 10.0 | watchos10.0 | 15.0.1 | | watchOS 10.2 | watchos10.2 | 15.1, 15.2 | | watchOS 10.4 | watchos10.4 | 15.3 | +| watchOS 10.5 | watchos10.5 | 15.4 | | Simulator - watchOS 9.4 | watchsimulator9.4 | 14.3.1 | | Simulator - watchOS 10.0 | watchsimulator10.0 | 15.0.1 | | Simulator - watchOS 10.2 | watchsimulator10.2 | 15.1, 15.2 | | Simulator - watchOS 10.4 | watchsimulator10.4 | 15.3 | -| visionOS 1.0 | xros1.0 | 15.2 | +| Simulator - watchOS 10.5 | watchsimulator10.5 | 15.4 | | Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | +| visionOS 1.0 | xros1.0 | 15.2 | | Simulator - visionOS 1.1 | xrsimulator1.1 | 15.3 | | visionOS 1.1 | xros1.1 | 15.3 | +| visionOS 1.2 | xros1.2 | 15.4 | +| Simulator - visionOS 1.2 | xrsimulator1.2 | 15.4 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | @@ -196,22 +206,26 @@ | DriverKit 23.0 | driverkit23.0 | 15.0.1 | | DriverKit 23.2 | driverkit23.2 | 15.1, 15.2 | | DriverKit 23.4 | driverkit23.4 | 15.3 | +| DriverKit 23.5 | driverkit23.5 | 15.4 | #### Installed Simulators -| OS | Xcode Version | Simulators | -| ------------ | ---------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| iOS 16.4 | 14.3.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 17.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 17.2 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 17.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| tvOS 16.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 17.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 17.2 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 17.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| watchOS 9.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | -| watchOS 10.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | -| watchOS 10.2 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | -| watchOS 10.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | +| OS | Xcode Version | Simulators | +| ------------ | ------------------------------------------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| iOS 16.4 | 14.3.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 17.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 17.2 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 17.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 17.5 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| tvOS 16.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 17.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 17.2 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 17.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 17.5 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| watchOS 9.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | +| watchOS 10.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 10.2 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 10.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 10.5 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | ### Android | Package Name | Version | From 04c43a0f58bdf12b4b903d5b06484b9783913161 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 24 Apr 2024 14:11:22 +0000 Subject: [PATCH 2797/3485] Updating readme file for macos-13-arm64 version 20240422.1 (#9729) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-13-arm64-Readme.md | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/images/macos/macos-13-arm64-Readme.md b/images/macos/macos-13-arm64-Readme.md index 81bfaa2c9771..e32e588004ff 100644 --- a/images/macos/macos-13-arm64-Readme.md +++ b/images/macos/macos-13-arm64-Readme.md @@ -1,7 +1,7 @@ # macOS 13 - OS Version: macOS 13.6.6 (22G630) - Kernel Version: Darwin 22.6.0 -- Image Version: 20240415.2 +- Image Version: 20240422.1 ## Installed Software @@ -18,7 +18,7 @@ - GNU Fortran 13 (Homebrew GCC 13.2.0) - available by `gfortran-13` alias - Kotlin 1.9.23-release-779 - Mono 6.12.0.188 -- Node.js 20.12.1 +- Node.js 20.12.2 - Perl 5.38.2 - Python3 3.12.3 - Ruby 3.0.6p216 @@ -27,7 +27,7 @@ - Bundler 2.5.9 - Carthage 0.39.1 - CocoaPods 1.15.2 -- Homebrew 4.2.18 +- Homebrew 4.2.19 - NPM 10.5.0 - NuGet 6.3.1.1 - Pip3 24.0 (python 3.12) @@ -50,7 +50,7 @@ - Curl 8.4.0 - Git 2.44.0 - Git LFS 3.5.1 -- GitHub CLI 2.47.0 +- GitHub CLI 2.48.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.24.5 - gpg (GnuPG) 2.4.5 @@ -62,7 +62,7 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.15.38 +- AWS CLI 2.15.40 - AWS SAM CLI 1.115.0 - AWS Session Manager CLI 1.2.553.0 - Azure CLI 2.59.0 @@ -81,9 +81,9 @@ ### Browsers - Safari 17.4.1 (18618.1.15.111.8) - SafariDriver 17.4.1 (18618.1.15.111.8) -- Google Chrome 123.0.6312.124 -- Google Chrome for Testing 123.0.6312.122 -- ChromeDriver 123.0.6312.122 +- Google Chrome 124.0.6367.62 +- Google Chrome for Testing 124.0.6367.60 +- ChromeDriver 124.0.6367.60 - Selenium server 4.19.1 #### Environment variables @@ -96,9 +96,9 @@ ### Java | Version | Environment Variable | | ------------------- | -------------------- | -| 11.0.22+7.1 | JAVA_HOME_11_arm64 | -| 17.0.10+7 (default) | JAVA_HOME_17_arm64 | -| 21.0.2+13.0 | JAVA_HOME_21_arm64 | +| 11.0.23+9 | JAVA_HOME_11_arm64 | +| 17.0.11+9 (default) | JAVA_HOME_17_arm64 | +| 21.0.3+9.0 | JAVA_HOME_21_arm64 | ### Cached Tools From 565a8e540a161cf3ef7182bab7621df87ecf1533 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 24 Apr 2024 14:33:51 +0000 Subject: [PATCH 2798/3485] Updating readme file for macos-14-arm64 version 20240422.3 (#9728) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-14-arm64-Readme.md | 89 ++++++++++++++++----------- 1 file changed, 52 insertions(+), 37 deletions(-) diff --git a/images/macos/macos-14-arm64-Readme.md b/images/macos/macos-14-arm64-Readme.md index 47093edccd1a..79b1bad6bd51 100644 --- a/images/macos/macos-14-arm64-Readme.md +++ b/images/macos/macos-14-arm64-Readme.md @@ -1,7 +1,7 @@ # macOS 14 - OS Version: macOS 14.4.1 (23E224) - Kernel Version: Darwin 23.4.0 -- Image Version: 20240415.6 +- Image Version: 20240422.3 ## Installed Software @@ -18,7 +18,7 @@ - GNU Fortran 13 (Homebrew GCC 13.2.0) - available by `gfortran-13` alias - Kotlin 1.9.23-release-779 - Mono 6.12.0.188 -- Node.js 20.12.1 +- Node.js 20.12.2 - Perl 5.38.2 - Python3 3.12.3 - Ruby 3.0.6p216 @@ -27,7 +27,7 @@ - Bundler 2.5.9 - Carthage 0.39.1 - CocoaPods 1.15.2 -- Homebrew 4.2.18 +- Homebrew 4.2.19 - NPM 10.5.0 - NuGet 6.3.1.1 - Pip3 24.0 (python 3.12) @@ -50,7 +50,7 @@ - Curl 8.4.0 - Git 2.44.0 - Git LFS 3.5.1 -- GitHub CLI 2.47.0 +- GitHub CLI 2.48.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.24.5 - gpg (GnuPG) 2.4.5 @@ -62,7 +62,7 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.15.38 +- AWS CLI 2.15.40 - AWS SAM CLI 1.115.0 - AWS Session Manager CLI 1.2.553.0 - Azure CLI 2.59.0 @@ -81,9 +81,9 @@ ### Browsers - Safari 17.4.1 (19618.1.15.11.14) - SafariDriver 17.4.1 (19618.1.15.11.14) -- Google Chrome 123.0.6312.124 -- Google Chrome for Testing 123.0.6312.122 -- ChromeDriver 123.0.6312.122 +- Google Chrome 124.0.6367.62 +- Google Chrome for Testing 124.0.6367.60 +- ChromeDriver 124.0.6367.60 - Selenium server 4.19.1 #### Environment variables @@ -94,11 +94,11 @@ | GECKOWEBDRIVER | | ### Java -| Version | Environment Variable | -| --------------------- | -------------------- | -| 11.0.22+7.1 | JAVA_HOME_11_arm64 | -| 17.0.10+7 | JAVA_HOME_17_arm64 | -| 21.0.2+13.0 (default) | JAVA_HOME_21_arm64 | +| Version | Environment Variable | +| -------------------- | -------------------- | +| 11.0.23+9 | JAVA_HOME_11_arm64 | +| 17.0.11+9 | JAVA_HOME_17_arm64 | +| 21.0.3+9.0 (default) | JAVA_HOME_21_arm64 | ### Cached Tools @@ -134,13 +134,14 @@ - PSScriptAnalyzer: 1.22.0 ### Xcode -| Version | Build | Path | -| ---------------- | ------- | ------------------------------ | -| 15.3 | 15E204a | /Applications/Xcode_15.3.app | -| 15.2 | 15C500b | /Applications/Xcode_15.2.app | -| 15.1 | 15C65 | /Applications/Xcode_15.1.app | -| 15.0.1 (default) | 15A507 | /Applications/Xcode_15.0.1.app | -| 14.3.1 | 14E300c | /Applications/Xcode_14.3.1.app | +| Version | Build | Path | +| ---------------- | -------- | ------------------------------ | +| 15.4 (beta) | 15F5021i | /Applications/Xcode_15.4.app | +| 15.3 | 15E204a | /Applications/Xcode_15.3.app | +| 15.2 | 15C500b | /Applications/Xcode_15.2.app | +| 15.1 | 15C65 | /Applications/Xcode_15.1.app | +| 15.0.1 (default) | 15A507 | /Applications/Xcode_15.0.1.app | +| 14.3.1 | 14E300c | /Applications/Xcode_14.3.1.app | #### Installed SDKs | SDK | SDK Name | Xcode Version | @@ -149,34 +150,43 @@ | macOS 14.0 | macosx14.0 | 15.0.1 | | macOS 14.2 | macosx14.2 | 15.1, 15.2 | | macOS 14.4 | macosx14.4 | 15.3 | +| macOS 14.5 | macosx14.5 | 15.4 | | iOS 16.4 | iphoneos16.4 | 14.3.1 | | iOS 17.0 | iphoneos17.0 | 15.0.1 | | iOS 17.2 | iphoneos17.2 | 15.1, 15.2 | | iOS 17.4 | iphoneos17.4 | 15.3 | +| iOS 17.5 | iphoneos17.5 | 15.4 | | Simulator - iOS 16.4 | iphonesimulator16.4 | 14.3.1 | | Simulator - iOS 17.0 | iphonesimulator17.0 | 15.0.1 | | Simulator - iOS 17.2 | iphonesimulator17.2 | 15.1, 15.2 | | Simulator - iOS 17.4 | iphonesimulator17.4 | 15.3 | +| Simulator - iOS 17.5 | iphonesimulator17.5 | 15.4 | | tvOS 16.4 | appletvos16.4 | 14.3.1 | | tvOS 17.0 | appletvos17.0 | 15.0.1 | | tvOS 17.2 | appletvos17.2 | 15.1, 15.2 | | tvOS 17.4 | appletvos17.4 | 15.3 | +| tvOS 17.5 | appletvos17.5 | 15.4 | | Simulator - tvOS 16.4 | appletvsimulator16.4 | 14.3.1 | | Simulator - tvOS 17.0 | appletvsimulator17.0 | 15.0.1 | | Simulator - tvOS 17.2 | appletvsimulator17.2 | 15.1, 15.2 | | Simulator - tvOS 17.4 | appletvsimulator17.4 | 15.3 | +| Simulator - tvOS 17.5 | appletvsimulator17.5 | 15.4 | | watchOS 9.4 | watchos9.4 | 14.3.1 | | watchOS 10.0 | watchos10.0 | 15.0.1 | | watchOS 10.2 | watchos10.2 | 15.1, 15.2 | | watchOS 10.4 | watchos10.4 | 15.3 | +| watchOS 10.5 | watchos10.5 | 15.4 | | Simulator - watchOS 9.4 | watchsimulator9.4 | 14.3.1 | | Simulator - watchOS 10.0 | watchsimulator10.0 | 15.0.1 | | Simulator - watchOS 10.2 | watchsimulator10.2 | 15.1, 15.2 | | Simulator - watchOS 10.4 | watchsimulator10.4 | 15.3 | +| Simulator - watchOS 10.5 | watchsimulator10.5 | 15.4 | | visionOS 1.0 | xros1.0 | 15.2 | | Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | -| Simulator - visionOS 1.1 | xrsimulator1.1 | 15.3 | | visionOS 1.1 | xros1.1 | 15.3 | +| Simulator - visionOS 1.1 | xrsimulator1.1 | 15.3 | +| Simulator - visionOS 1.2 | xrsimulator1.2 | 15.4 | +| visionOS 1.2 | xros1.2 | 15.4 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | @@ -184,24 +194,29 @@ | DriverKit 23.0 | driverkit23.0 | 15.0.1 | | DriverKit 23.2 | driverkit23.2 | 15.1, 15.2 | | DriverKit 23.4 | driverkit23.4 | 15.3 | +| DriverKit 23.5 | driverkit23.5 | 15.4 | #### Installed Simulators -| OS | Xcode Version | Simulators | -| ------------ | ---------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| iOS 16.4 | 14.3.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 17.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 17.2 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 17.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| tvOS 16.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 17.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 17.2 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 17.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| watchOS 9.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | -| watchOS 10.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | -| watchOS 10.2 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | -| watchOS 10.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | -| visionOS 1.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3 | Apple Vision Pro | -| visionOS 1.1 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3 | Apple Vision Pro | +| OS | Xcode Version | Simulators | +| ------------ | ------------------------------------------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| iOS 16.4 | 14.3.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 17.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 17.2 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 17.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 17.5 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| tvOS 16.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 17.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 17.2 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 17.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 17.5 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| watchOS 9.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | +| watchOS 10.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 10.2 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 10.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 10.5 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | +| visionOS 1.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4 | Apple Vision Pro | +| visionOS 1.1 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4 | Apple Vision Pro | +| visionOS 1.2 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4 | Apple Vision Pro | ### Android | Package Name | Version | From a420c2896eb6eb67b2d705c21ef0826c9f405e6a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 24 Apr 2024 17:01:10 +0000 Subject: [PATCH 2799/3485] Updating readme file for win22 version 20240421.1.1 (#9721) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/windows/Windows2022-Readme.md | 46 ++++++++++++++++------------ 1 file changed, 26 insertions(+), 20 deletions(-) diff --git a/images/windows/Windows2022-Readme.md b/images/windows/Windows2022-Readme.md index f1de37e2ce0b..7da51f79f90e 100644 --- a/images/windows/Windows2022-Readme.md +++ b/images/windows/Windows2022-Readme.md @@ -1,6 +1,11 @@ +| Announcements | +|-| +| [[Windows-2022] Multiple VC Build Tools will be removed on May, 13](https://github.com/actions/runner-images/issues/9701) | +| [[Ubuntu, Windows] Docker Compose v1 will be removed from images on July, 9](https://github.com/actions/runner-images/issues/9692) | +*** # Windows Server 2022 - OS Version: 10.0.20348 Build 2402 -- Image Version: 20240414.1.0 +- Image Version: 20240421.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -21,15 +26,15 @@ ### Package Management - Chocolatey 2.2.2 -- Composer 2.7.2 +- Composer 2.7.3 - Helm 3.14.3 -- Miniconda 24.1.2 (pre-installed on the image but not added to PATH) +- Miniconda 24.3.0 (pre-installed on the image but not added to PATH) - NPM 9.8.1 - NuGet 6.9.1.3 - pip 24.0 (python 3.9) - Pipx 1.5.0 - RubyGems 3.2.33 -- Vcpkg (build from commit ad3bae574) +- Vcpkg (build from commit 9224b3bbd) - Yarn 1.22.22 #### Environment variables @@ -65,16 +70,16 @@ - InnoSetup 6.2.2 - jq 1.7.1 - Kind 0.22.0 -- Kubectl 1.29.1 +- Kubectl 1.30.0 - Mercurial 5.0 - gcc 12.2.0 - gdb 11.2 - GNU Binutils 2.39 - Newman 6.1.2 -- NSIS 3.09 +- NSIS 3.10 - OpenSSL 1.1.1w - Packer 1.10.2 -- Pulumi 3.112.0 +- Pulumi 3.113.3 - R 4.3.3 - Service Fabric SDK 9.1.1436.9590 - Stack 2.15.5 @@ -88,12 +93,12 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.202 -- AWS CLI 2.15.38 +- AWS CLI 2.15.40 - AWS SAM CLI 1.115.0 - AWS Session Manager CLI 1.2.553.0 - Azure CLI 2.59.0 - Azure DevOps CLI extension 1.0.0 -- GitHub CLI 2.47.0 +- GitHub CLI 2.48.0 ### Rust Tools - Cargo 1.77.2 @@ -110,11 +115,11 @@ - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 123.0.6312.123 -- Chrome Driver 123.0.6312.122 -- Microsoft Edge 123.0.2420.97 -- Microsoft Edge Driver 123.0.2420.97 -- Mozilla Firefox 124.0.2 +- Google Chrome 124.0.6367.61 +- Chrome Driver 124.0.6367.60 +- Microsoft Edge 124.0.2478.51 +- Microsoft Edge Driver 124.0.2478.51 +- Mozilla Firefox 125.0.1 - Gecko Driver 0.34.0 - IE Driver 4.14.0.0 - Selenium server 4.19.0 @@ -130,10 +135,10 @@ ### Java | Version | Environment Variable | | ------------------- | -------------------- | -| 8.0.402+6 (default) | JAVA_HOME_8_X64 | -| 11.0.22+7 | JAVA_HOME_11_X64 | -| 17.0.10+7 | JAVA_HOME_17_X64 | -| 21.0.2+13.0 | JAVA_HOME_21_X64 | +| 8.0.412+8 (default) | JAVA_HOME_8_X64 | +| 11.0.23+9 | JAVA_HOME_11_X64 | +| 17.0.11+9 | JAVA_HOME_17_X64 | +| 21.0.3+9.0 | JAVA_HOME_21_X64 | ### Shells | Name | Target | @@ -213,7 +218,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Name | Version | ConfigFile | ServiceName | ServiceStatus | ListenPort | | ------ | ------- | ------------------------------------- | ----------- | ------------- | ---------- | | Apache | 2.4.55 | C:\tools\Apache24\conf\httpd.conf | Apache | Stopped | 80 | -| Nginx | 1.25.4 | C:\tools\nginx-1.25.4\conf\nginx.conf | nginx | Stopped | 80 | +| Nginx | 1.25.5 | C:\tools\nginx-1.25.5\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2022 | Name | Version | Path | @@ -560,7 +565,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - AzureRM: 2.1.0 (Default), 6.13.1 - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.558 +- AWSPowershell: 4.1.562 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 - Microsoft.Graph: 2.17.0 @@ -608,3 +613,4 @@ All other versions are saved but not installed. | mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:51c056c03b12aa8004e6d7909e5bdf7b699502d89fc8fc861edbbbcd78cf16bd | 2024-04-09 | | mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:6223f3a17f2652064c56ca55aaef866177d58d6a1c526636ac2120685df5466d | 2024-04-05 | | mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:5d09ffa90d91a46e2fe7652b0a37cbf5217f34a819c3d71cbe635dae8226061b | 2024-04-05 | + From cb3f1150db9f0787a47e69065b70e290c0e4dbed Mon Sep 17 00:00:00 2001 From: sergei-pyshnoi <121864472+sergei-pyshnoi@users.noreply.github.com> Date: Wed, 24 Apr 2024 22:49:24 +0200 Subject: [PATCH 2800/3485] [Windows] Update google updater service name parser (#9738) --- images/windows/scripts/build/Install-Chrome.ps1 | 2 +- images/windows/scripts/tests/Browsers.Tests.ps1 | 13 +++++-------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/images/windows/scripts/build/Install-Chrome.ps1 b/images/windows/scripts/build/Install-Chrome.ps1 index ff420791dd81..6fe140f3c113 100644 --- a/images/windows/scripts/build/Install-Chrome.ps1 +++ b/images/windows/scripts/build/Install-Chrome.ps1 @@ -12,7 +12,7 @@ Install-Binary ` Write-Host "Adding the firewall rule for Google update blocking..." New-NetFirewallRule -DisplayName "BlockGoogleUpdate" -Direction Outbound -Action Block -Program "C:\Program Files (x86)\Google\Update\GoogleUpdate.exe" -$googleServices = @('gupdate', 'gupdatem') | Get-Service +$googleServices = Get-Service -Name "GoogleUpdater*" Stop-Service $googleServices $googleServices.WaitForStatus('Stopped', "00:01:00") $googleServices | Set-Service -StartupType Disabled diff --git a/images/windows/scripts/tests/Browsers.Tests.ps1 b/images/windows/scripts/tests/Browsers.Tests.ps1 index b92d20083a3e..21b30d6f59e1 100644 --- a/images/windows/scripts/tests/Browsers.Tests.ps1 +++ b/images/windows/scripts/tests/Browsers.Tests.ps1 @@ -28,14 +28,11 @@ Describe "Chrome" { $versionInfo | Should -Not -BeNullOrEmpty } - It "gupdate service is stopped" { - $svc = Get-Service -Name gupdate - $svc.Status | Should -BeExactly Stopped - } - - It "gupdatem service is stopped" { - $svc = Get-Service -Name gupdatem - $svc.Status | Should -BeExactly Stopped + It "GoogleUpdater services is stopped" { + $services = Get-Service -Name "GoogleUpdater*" + foreach ($svc in $services) { + $svc.Status | Should -BeExactly 'Stopped' + } } It "BlockGoogleUpdate firewall rule exists" { From c7efc0685d959677c603acf49604c13396d854a3 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 25 Apr 2024 09:11:34 +0000 Subject: [PATCH 2801/3485] Updating readme file for macOS-12 version 20240418.1 (#9718) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-12-Readme.md | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/images/macos/macos-12-Readme.md b/images/macos/macos-12-Readme.md index 13bf67d7d58d..7d7e05b100b6 100644 --- a/images/macos/macos-12-Readme.md +++ b/images/macos/macos-12-Readme.md @@ -1,7 +1,7 @@ # macOS 12 - OS Version: macOS 12.7.4 (21H1123) - Kernel Version: Darwin 21.6.0 -- Image Version: 20240412.2 +- Image Version: 20240418.1 ## Installed Software @@ -20,7 +20,7 @@ - Kotlin 1.9.23-release-779 - Go 1.21.9 - Mono 6.12.0.188 -- Node.js 18.20.1 +- Node.js 18.20.2 - MSBuild 16.10.1.51301 (Mono 6.12.0.188) - NVM 0.39.7 - NVM - Cached node versions: 16.20.2, 18.20.2, 20.12.2 @@ -36,15 +36,15 @@ - Carthage 0.39.1 - CocoaPods 1.15.2 - Composer 2.7.2 -- Homebrew 4.2.17 -- Miniconda 24.1.2 +- Homebrew 4.2.18 +- Miniconda 24.3.0 - NPM 10.5.0 - NuGet 6.3.1.1 - Pip 20.3.4 (python 2.7) - Pip3 24.0 (python 3.12) - Pipx 1.5.0 - RubyGems 3.5.9 -- Vcpkg 2024 (build from commit ad3bae574) +- Vcpkg 2024 (build from commit 6c87aab05) - Yarn 1.22.19 #### Environment variables @@ -69,7 +69,7 @@ - Curl 8.7.1 - Git 2.44.0 - Git LFS 3.5.1 -- GitHub CLI 2.47.0 +- GitHub CLI 2.48.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.24.5 - gpg (GnuPG) 2.4.5 @@ -92,7 +92,7 @@ ### Tools - App Center CLI 3.0.0 -- AWS CLI 2.15.38 +- AWS CLI 2.15.39 - AWS SAM CLI 1.115.0 - AWS Session Manager CLI 1.2.553.0 - Azure CLI 2.59.0 @@ -107,7 +107,7 @@ - GHCup 0.1.22.0 - Jazzy 0.14.4 - Stack 2.15.5 -- SwiftFormat 0.53.6 +- SwiftFormat 0.53.7 - Swig 4.2.1 - Xcbeautify 1.6.0 - Xcode Command Line Tools 14.2.0.0.1.1668646533 @@ -120,12 +120,12 @@ ### Browsers - Safari 17.4.1 (17618.1.15.111.8) - SafariDriver 17.4.1 (17618.1.15.111.8) -- Google Chrome 123.0.6312.124 -- Google Chrome for Testing 123.0.6312.122 -- ChromeDriver 123.0.6312.122 -- Microsoft Edge 123.0.2420.97 -- Microsoft Edge WebDriver 123.0.2420.97 -- Mozilla Firefox 124.0.2 +- Google Chrome 124.0.6367.62 +- Google Chrome for Testing 124.0.6367.60 +- ChromeDriver 124.0.6367.60 +- Microsoft Edge 124.0.2478.51 +- Microsoft Edge WebDriver 124.0.2478.51 +- Mozilla Firefox 125.0.1 - geckodriver 0.34.0 - Selenium server 4.19.1 @@ -141,7 +141,7 @@ | ------------------- | -------------------- | | 8.0.402+6 (default) | JAVA_HOME_8_X64 | | 11.0.22+7 | JAVA_HOME_11_X64 | -| 17.0.10+7 | JAVA_HOME_17_X64 | +| 17.0.11+9 | JAVA_HOME_17_X64 | | 21.0.2+13.0 | JAVA_HOME_21_X64 | ### Cached Tools @@ -202,7 +202,7 @@ | Name | Version | ConfigFile | ServiceStatus | ListenPort | | ----- | ------- | ------------------------------- | ------------- | ---------- | | httpd | 2.4.59 | /usr/local/etc/httpd/httpd.conf | none | 80 | -| nginx | 1.25.4 | /usr/local/etc/nginx/nginx.conf | none | 80 | +| nginx | 1.25.5 | /usr/local/etc/nginx/nginx.conf | none | 80 | ### Xamarin From c98eeb230dd4921b8d51818e906576b4e61a372e Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Thu, 25 Apr 2024 12:13:07 +0200 Subject: [PATCH 2802/3485] [Ubuntu] fix overwrite packer files on unpack (#9744) --- images/ubuntu/scripts/build/install-packer.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/ubuntu/scripts/build/install-packer.sh b/images/ubuntu/scripts/build/install-packer.sh index 33d284869a14..c9cc638f8051 100644 --- a/images/ubuntu/scripts/build/install-packer.sh +++ b/images/ubuntu/scripts/build/install-packer.sh @@ -10,6 +10,6 @@ source $HELPER_SCRIPTS/install.sh # Install Packer download_url=$(curl -fsSL https://api.releases.hashicorp.com/v1/releases/packer/latest | jq -r '.builds[] | select((.arch=="amd64") and (.os=="linux")).url') archive_path=$(download_with_retry "$download_url") -unzip -qq "$archive_path" -d /usr/local/bin +unzip -o -qq "$archive_path" -d /usr/local/bin invoke_tests "Tools" "Packer" From e63a194563cb0bb3bc1493144fe0ef6804249b43 Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Thu, 25 Apr 2024 12:21:49 +0200 Subject: [PATCH 2803/3485] [CI] Update base test-generation pipeline to use AzureCLI task (#9745) --- .../linux-and-win/azure-pipelines/image-generation.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/images.CI/linux-and-win/azure-pipelines/image-generation.yml b/images.CI/linux-and-win/azure-pipelines/image-generation.yml index 458480dc2733..62af3d3e57d5 100644 --- a/images.CI/linux-and-win/azure-pipelines/image-generation.yml +++ b/images.CI/linux-and-win/azure-pipelines/image-generation.yml @@ -59,13 +59,13 @@ jobs: arguments: -RepoUrl $(CUSTOM_REPOSITORY_URL) ` -RepoBranch $(CUSTOM_REPOSITORY_BRANCH) - - task: AzurePowerShell@5 + - task: AzureCLI@2 displayName: 'Set variables' inputs: - TargetAzurePs: LatestVersion azureSubscription: 'spn-hosted-runners' - ScriptType: 'InlineScript' - Inline: | + scriptType: 'pscore' + scriptLocation: 'inlineScript' + inlineScript: | $ImageType = "${{ parameters.image_type }}" $TemplateDirectoryName = if ($ImageType.StartsWith("ubuntu")) { "ubuntu/templates" } else { "windows/templates" } $TemplateDirectoryPath = Join-Path "images" $TemplateDirectoryName | Resolve-Path From 54f59dcb98ad823bd00aaf033ce7d42999947f27 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 26 Apr 2024 12:39:18 +0200 Subject: [PATCH 2804/3485] Updating readme file for macos-13 version 20240421.1 (#9725) Co-authored-by: Image generation service account <no-reply@microsoft.com> --- images/macos/macos-13-Readme.md | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/images/macos/macos-13-Readme.md b/images/macos/macos-13-Readme.md index 02fd2e300a2f..b888394d2978 100644 --- a/images/macos/macos-13-Readme.md +++ b/images/macos/macos-13-Readme.md @@ -1,7 +1,7 @@ # macOS 13 - OS Version: macOS 13.6.6 (22G630) - Kernel Version: Darwin 22.6.0 -- Image Version: 20240415.1 +- Image Version: 20240421.1 ## Installed Software @@ -18,7 +18,7 @@ - GNU Fortran 13 (Homebrew GCC 13.2.0) - available by `gfortran-13` alias - Kotlin 1.9.23-release-779 - Mono 6.12.0.188 -- Node.js 20.12.1 +- Node.js 20.12.2 - Perl 5.38.2 - PHP 8.3.6 - Python3 3.12.3 @@ -28,14 +28,14 @@ - Bundler 2.5.9 - Carthage 0.39.1 - CocoaPods 1.15.2 -- Composer 2.7.2 +- Composer 2.7.3 - Homebrew 4.2.18 - NPM 10.5.0 - NuGet 6.3.1.1 - Pip3 24.0 (python 3.12) - Pipx 1.5.0 - RubyGems 3.5.9 -- Vcpkg 2024 (build from commit b4a3d8912) +- Vcpkg 2024 (build from commit 9224b3bbd) - Yarn 1.22.19 ### Project Management @@ -53,7 +53,7 @@ - Curl 8.7.1 - Git 2.44.0 - Git LFS 3.5.1 -- GitHub CLI 2.47.0 +- GitHub CLI 2.48.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.24.5 - gpg (GnuPG) 2.4.5 @@ -65,7 +65,7 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.15.38 +- AWS CLI 2.15.40 - AWS SAM CLI 1.115.0 - AWS Session Manager CLI 1.2.553.0 - Azure CLI 2.59.0 @@ -85,12 +85,12 @@ ### Browsers - Safari 17.4.1 (18618.1.15.111.8) - SafariDriver 17.4.1 (18618.1.15.111.8) -- Google Chrome 123.0.6312.124 -- Google Chrome for Testing 123.0.6312.122 -- ChromeDriver 123.0.6312.122 -- Microsoft Edge 123.0.2420.97 -- Microsoft Edge WebDriver 123.0.2420.97 -- Mozilla Firefox 124.0.2 +- Google Chrome 124.0.6367.62 +- Google Chrome for Testing 124.0.6367.60 +- ChromeDriver 124.0.6367.60 +- Microsoft Edge 124.0.2478.51 +- Microsoft Edge WebDriver 124.0.2478.51 +- Mozilla Firefox 125.0.1 - geckodriver 0.34.0 - Selenium server 4.19.1 @@ -104,10 +104,10 @@ ### Java | Version | Environment Variable | | ------------------- | -------------------- | -| 8.0.402+6 | JAVA_HOME_8_X64 | -| 11.0.22+7 | JAVA_HOME_11_X64 | -| 17.0.10+7 (default) | JAVA_HOME_17_X64 | -| 21.0.2+13.0 | JAVA_HOME_21_X64 | +| 8.0.412+8 | JAVA_HOME_8_X64 | +| 11.0.23+9 | JAVA_HOME_11_X64 | +| 17.0.11+9 (default) | JAVA_HOME_17_X64 | +| 21.0.3+9.0 | JAVA_HOME_21_X64 | ### Cached Tools From 3d2dd97aa7d0e528fca21b26a991d5028a3fa97a Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Fri, 26 Apr 2024 23:18:26 +0200 Subject: [PATCH 2805/3485] [Ubuntu] Add Ubuntu-24.04 base image (#9754) Co-authored-by: Alexey Ayupov <alexey-ayupov@github.com> --- .../azure-pipelines/ubuntu2404.yml | 21 + images/ubuntu/scripts/build/configure-apt.sh | 8 +- .../scripts/build/install-container-tools.sh | 4 +- images/ubuntu/scripts/build/install-docker.sh | 1 + .../scripts/build/install-gcc-compilers.sh | 6 +- .../ubuntu/scripts/build/install-gfortran.sh | 6 +- .../scripts/build/install-java-tools.sh | 29 +- images/ubuntu/scripts/build/install-php.sh | 4 +- .../scripts/build/install-powershell.sh | 10 +- images/ubuntu/scripts/build/install-python.sh | 10 +- images/ubuntu/scripts/build/install-rust.sh | 4 +- .../docs-gen/Generate-SoftwareReport.ps1 | 158 ++++--- .../docs-gen/SoftwareReport.Common.psm1 | 17 +- images/ubuntu/scripts/helpers/os.sh | 8 +- .../ubuntu/scripts/tests/Browsers.Tests.ps1 | 4 +- .../ubuntu/scripts/tests/CLI.Tools.Tests.ps1 | 8 +- images/ubuntu/scripts/tests/Common.Tests.ps1 | 2 +- .../ubuntu/scripts/tests/Databases.Tests.ps1 | 2 +- images/ubuntu/scripts/tests/Java.Tests.ps1 | 32 +- images/ubuntu/scripts/tests/Tools.Tests.ps1 | 45 +- images/ubuntu/scripts/tests/Toolset.Tests.ps1 | 2 +- images/ubuntu/templates/ubuntu-24.04.pkr.hcl | 385 ++++++++++++++++++ images/ubuntu/toolsets/toolset-2404.json | 305 ++++++++++++++ 23 files changed, 933 insertions(+), 138 deletions(-) create mode 100644 images.CI/linux-and-win/azure-pipelines/ubuntu2404.yml create mode 100644 images/ubuntu/templates/ubuntu-24.04.pkr.hcl create mode 100644 images/ubuntu/toolsets/toolset-2404.json diff --git a/images.CI/linux-and-win/azure-pipelines/ubuntu2404.yml b/images.CI/linux-and-win/azure-pipelines/ubuntu2404.yml new file mode 100644 index 000000000000..5856d31b6d4a --- /dev/null +++ b/images.CI/linux-and-win/azure-pipelines/ubuntu2404.yml @@ -0,0 +1,21 @@ +schedules: +- cron: "0 0 * * *" + displayName: Daily + branches: + include: + - main + always: true + +trigger: none +pr: + autoCancel: true + branches: + include: + - main + +jobs: +- template: image-generation.yml + parameters: + image_type: ubuntu2404 + image_readme_name: Ubuntu2404-Readme.md + image_template_name: ubuntu-24.04.pkr.hcl diff --git a/images/ubuntu/scripts/build/configure-apt.sh b/images/ubuntu/scripts/build/configure-apt.sh index f4bb76ae98bb..70660a313325 100644 --- a/images/ubuntu/scripts/build/configure-apt.sh +++ b/images/ubuntu/scripts/build/configure-apt.sh @@ -42,6 +42,8 @@ apt-get update # Install jq apt-get install jq -# Install apt-fast using quick-install.sh -# https://github.com/ilikenwf/apt-fast -bash -c "$(curl -fsSL https://raw.githubusercontent.com/ilikenwf/apt-fast/master/quick-install.sh)" +if ! is_ubuntu24; then + # Install apt-fast using quick-install.sh + # https://github.com/ilikenwf/apt-fast + bash -c "$(curl -fsSL https://raw.githubusercontent.com/ilikenwf/apt-fast/master/quick-install.sh)" +fi diff --git a/images/ubuntu/scripts/build/install-container-tools.sh b/images/ubuntu/scripts/build/install-container-tools.sh index f17ce2f07912..7319f04f2248 100644 --- a/images/ubuntu/scripts/build/install-container-tools.sh +++ b/images/ubuntu/scripts/build/install-container-tools.sh @@ -11,7 +11,7 @@ source $HELPER_SCRIPTS/os.sh # pin podman due to https://github.com/actions/runner-images/issues/7753 # https://bugs.launchpad.net/ubuntu/+source/libpod/+bug/2024394 # -if is_ubuntu20; then +if ! is_ubuntu22; then install_packages=(podman buildah skopeo) else install_packages=(podman=3.4.4+ds1-1ubuntu1 buildah skopeo) @@ -27,7 +27,7 @@ if is_ubuntu20; then echo "deb [arch=amd64 signed-by=$GPG_KEY] ${REPO_URL}/ /" > $REPO_PATH fi -# Install podman, buildah, scopeo container's tools +# Install podman, buildah, skopeo container's tools apt-get update apt-get -y install ${install_packages[@]} mkdir -p /etc/containers diff --git a/images/ubuntu/scripts/build/install-docker.sh b/images/ubuntu/scripts/build/install-docker.sh index 8c759d8df4f9..3b2853c05506 100644 --- a/images/ubuntu/scripts/build/install-docker.sh +++ b/images/ubuntu/scripts/build/install-docker.sh @@ -48,6 +48,7 @@ done gid=$(cut -d ":" -f 3 /etc/group | grep "^1..$" | sort -n | tail -n 1 | awk '{ print $1+1 }') groupmod -g "$gid" docker chgrp -hR docker /run/docker.sock +chgrp -hR docker /var/run/docker.sock # Enable docker.service systemctl is-active --quiet docker.service || systemctl start docker.service diff --git a/images/ubuntu/scripts/build/install-gcc-compilers.sh b/images/ubuntu/scripts/build/install-gcc-compilers.sh index bfc4e0e746c2..ac0b91909c19 100644 --- a/images/ubuntu/scripts/build/install-gcc-compilers.sh +++ b/images/ubuntu/scripts/build/install-gcc-compilers.sh @@ -9,8 +9,10 @@ source $HELPER_SCRIPTS/os.sh source $HELPER_SCRIPTS/install.sh # Install GNU C++ compiler -add-apt-repository ppa:ubuntu-toolchain-r/test -y -apt-get update -y +if ! is_ubuntu24 ; then + add-apt-repository ppa:ubuntu-toolchain-r/test -y + apt-get update -y +fi versions=$(get_toolset_value '.gcc.versions[]') diff --git a/images/ubuntu/scripts/build/install-gfortran.sh b/images/ubuntu/scripts/build/install-gfortran.sh index 04d848f6dd64..fe2e16c15157 100644 --- a/images/ubuntu/scripts/build/install-gfortran.sh +++ b/images/ubuntu/scripts/build/install-gfortran.sh @@ -9,8 +9,10 @@ source $HELPER_SCRIPTS/install.sh source $HELPER_SCRIPTS/os.sh # Install GNU Fortran compiler -add-apt-repository ppa:ubuntu-toolchain-r/test -y -apt-get update -y +if ! is_ubuntu24 ; then + add-apt-repository ppa:ubuntu-toolchain-r/test -y + apt-get update -y +fi versions=$(get_toolset_value '.gfortran.versions[]') diff --git a/images/ubuntu/scripts/build/install-java-tools.sh b/images/ubuntu/scripts/build/install-java-tools.sh index 05ba2e0d795f..6f09c4c2b607 100644 --- a/images/ubuntu/scripts/build/install-java-tools.sh +++ b/images/ubuntu/scripts/build/install-java-tools.sh @@ -69,19 +69,22 @@ echo "deb [signed-by=/usr/share/keyrings/adoptium.gpg] https://packages.adoptium # Get all the updates from enabled repositories. apt-get update -defaultVersion=$(get_toolset_value '.java.default') -jdkVersionsToInstall=($(get_toolset_value ".java.versions[]")) - -for jdkVersionToInstall in ${jdkVersionsToInstall[@]}; do - install_open_jdk ${jdkVersionToInstall} - - if [[ ${jdkVersionToInstall} == ${defaultVersion} ]] - then - create_java_environment_variable ${jdkVersionToInstall} True - else - create_java_environment_variable ${jdkVersionToInstall} False - fi -done +# While Ubuntu 24.04 binaries are not released in the Adoptium repo, we will not install Java +if ! is_ubuntu24; then + defaultVersion=$(get_toolset_value '.java.default') + jdkVersionsToInstall=($(get_toolset_value ".java.versions[]")) + + for jdkVersionToInstall in ${jdkVersionsToInstall[@]}; do + install_open_jdk ${jdkVersionToInstall} + + if [[ ${jdkVersionToInstall} == ${defaultVersion} ]] + then + create_java_environment_variable ${jdkVersionToInstall} True + else + create_java_environment_variable ${jdkVersionToInstall} False + fi + done +fi # Install Ant apt-get install -y --no-install-recommends ant ant-optional diff --git a/images/ubuntu/scripts/build/install-php.sh b/images/ubuntu/scripts/build/install-php.sh index d03494b50fb5..fa5cfe28f68f 100644 --- a/images/ubuntu/scripts/build/install-php.sh +++ b/images/ubuntu/scripts/build/install-php.sh @@ -73,11 +73,11 @@ for version in $php_versions; do # https://github.com/krakjoe/pcov#interoperability phpdismod -v $version pcov - if [[ $version == "7.2" || $version == "7.3" ]]; then + if [[ $version == "7.2" || $version == "7.3" || $version == "7.4" ]]; then apt-get install -y --no-install-recommends php$version-recode fi - if [[ $version != "8.0" && $version != "8.1" && $version != "8.2" ]]; then + if [[ $version != "8.0" && $version != "8.1" && $version != "8.2" && $version != "8.3" ]]; then apt-get install -y --no-install-recommends php$version-xmlrpc php$version-json fi done diff --git a/images/ubuntu/scripts/build/install-powershell.sh b/images/ubuntu/scripts/build/install-powershell.sh index f1345375d1be..09dd90dcf659 100644 --- a/images/ubuntu/scripts/build/install-powershell.sh +++ b/images/ubuntu/scripts/build/install-powershell.sh @@ -6,8 +6,16 @@ # Source the helpers for use with the script source $HELPER_SCRIPTS/install.sh +source $HELPER_SCRIPTS/os.sh pwsh_version=$(get_toolset_value .pwsh.version) # Install Powershell -apt-get install -y powershell=$pwsh_version* +if is_ubuntu24; then + dependency_path=$(download_with_retry "http://mirrors.kernel.org/ubuntu/pool/main/i/icu/libicu72_72.1-3ubuntu2_amd64.deb") + sudo dpkg -i "$dependency_path" + package_path=$(download_with_retry "https://github.com/PowerShell/PowerShell/releases/download/v7.4.2/powershell-lts_7.4.2-1.deb_amd64.deb") + sudo dpkg -i "$package_path" +else + apt-get install -y powershell=$pwsh_version* +fi diff --git a/images/ubuntu/scripts/build/install-python.sh b/images/ubuntu/scripts/build/install-python.sh index f96cfac97548..06ac4790d122 100644 --- a/images/ubuntu/scripts/build/install-python.sh +++ b/images/ubuntu/scripts/build/install-python.sh @@ -16,9 +16,13 @@ apt-get install -y --no-install-recommends python3 python3-dev python3-pip pytho # Set pipx custom directory export PIPX_BIN_DIR=/opt/pipx_bin export PIPX_HOME=/opt/pipx -python3 -m pip install pipx -python3 -m pipx ensurepath - +if is_ubuntu24; then + apt-get install -y --no-install-recommends pipx + pipx ensurepath +else + python3 -m pip install pipx + python3 -m pipx ensurepath +fi # Update /etc/environment set_etc_environment_variable "PIPX_BIN_DIR" $PIPX_BIN_DIR set_etc_environment_variable "PIPX_HOME" $PIPX_HOME diff --git a/images/ubuntu/scripts/build/install-rust.sh b/images/ubuntu/scripts/build/install-rust.sh index 1b2b9cd48413..fdf5d9c705dc 100644 --- a/images/ubuntu/scripts/build/install-rust.sh +++ b/images/ubuntu/scripts/build/install-rust.sh @@ -21,7 +21,9 @@ rustup component add rustfmt clippy if is_ubuntu22; then cargo install bindgen-cli cbindgen cargo-audit cargo-outdated -else +fi + +if is_ubuntu20; then cargo install --locked bindgen-cli cbindgen cargo-audit cargo-outdated fi diff --git a/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 b/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 index 758d7c91e4d5..0d759ed95ce7 100644 --- a/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 +++ b/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 @@ -41,21 +41,27 @@ $languageAndRuntime.AddToolVersionsListInline("Clang", $(Get-ClangToolVersions - $languageAndRuntime.AddToolVersionsListInline("Clang-format", $(Get-ClangToolVersions -ToolName "clang-format"), "^\d+") $languageAndRuntime.AddToolVersionsListInline("Clang-tidy", $(Get-ClangTidyVersions), "^\d+") $languageAndRuntime.AddToolVersion("Dash", $(Get-DashVersion)) -if (Test-IsUbuntu20) { +if ((Test-IsUbuntu20) -or (Test-IsUbuntu22)) { $languageAndRuntime.AddToolVersion("Erlang", $(Get-ErlangVersion)) $languageAndRuntime.AddToolVersion("Erlang rebar3", $(Get-ErlangRebar3Version)) } $languageAndRuntime.AddToolVersionsListInline("GNU C++", $(Get-CPPVersions), "^\d+") $languageAndRuntime.AddToolVersionsListInline("GNU Fortran", $(Get-FortranVersions), "^\d+") $languageAndRuntime.AddToolVersion("Julia", $(Get-JuliaVersion)) -$languageAndRuntime.AddToolVersion("Kotlin", $(Get-KotlinVersion)) -$languageAndRuntime.AddToolVersion("Mono", $(Get-MonoVersion)) -$languageAndRuntime.AddToolVersion("MSBuild", $(Get-MsbuildVersion)) +if ((Test-IsUbuntu20) -or (Test-IsUbuntu22)) { + $languageAndRuntime.AddToolVersion("Kotlin", $(Get-KotlinVersion)) +} +if (-not $(Test-IsUbuntu24)) { + $languageAndRuntime.AddToolVersion("Mono", $(Get-MonoVersion)) + $languageAndRuntime.AddToolVersion("MSBuild", $(Get-MsbuildVersion)) +} $languageAndRuntime.AddToolVersion("Node.js", $(Get-NodeVersion)) $languageAndRuntime.AddToolVersion("Perl", $(Get-PerlVersion)) $languageAndRuntime.AddToolVersion("Python", $(Get-PythonVersion)) $languageAndRuntime.AddToolVersion("Ruby", $(Get-RubyVersion)) -$languageAndRuntime.AddToolVersion("Swift", $(Get-SwiftVersion)) +if ((Test-IsUbuntu20) -or (Test-IsUbuntu22)) { + $languageAndRuntime.AddToolVersion("Swift", $(Get-SwiftVersion)) +} # Package Management $packageManagement = $installedSoftware.AddHeader("Package Management") @@ -64,7 +70,9 @@ $packageManagement.AddToolVersion("Helm", $(Get-HelmVersion)) $packageManagement.AddToolVersion("Homebrew", $(Get-HomebrewVersion)) $packageManagement.AddToolVersion("Miniconda", $(Get-MinicondaVersion)) $packageManagement.AddToolVersion("Npm", $(Get-NpmVersion)) -$packageManagement.AddToolVersion("NuGet", $(Get-NuGetVersion)) +if (-not $(Test-IsUbuntu24)) { + $packageManagement.AddToolVersion("NuGet", $(Get-NuGetVersion)) +} $packageManagement.AddToolVersion("Pip", $(Get-PipVersion)) $packageManagement.AddToolVersion("Pip3", $(Get-Pip3Version)) $packageManagement.AddToolVersion("Pipx", $(Get-PipxVersion)) @@ -81,15 +89,11 @@ to accomplish this. # Project Management $projectManagement = $installedSoftware.AddHeader("Project Management") -if (Test-IsUbuntu20) { - $projectManagement.AddToolVersion("Ant", $(Get-AntVersion)) - $projectManagement.AddToolVersion("Gradle", $(Get-GradleVersion)) -} -if ((Test-IsUbuntu20) -or (Test-IsUbuntu22)) { - $projectManagement.AddToolVersion("Lerna", $(Get-LernaVersion)) -} +$projectManagement.AddToolVersion("Ant", $(Get-AntVersion)) +$projectManagement.AddToolVersion("Gradle", $(Get-GradleVersion)) +$projectManagement.AddToolVersion("Lerna", $(Get-LernaVersion)) $projectManagement.AddToolVersion("Maven", $(Get-MavenVersion)) -if (Test-IsUbuntu20) { +if ((Test-IsUbuntu20) -or (Test-IsUbuntu22)) { $projectManagement.AddToolVersion("Sbt", $(Get-SbtVersion)) } @@ -98,14 +102,20 @@ $tools = $installedSoftware.AddHeader("Tools") $tools.AddToolVersion("Ansible", $(Get-AnsibleVersion)) $tools.AddToolVersion("apt-fast", $(Get-AptFastVersion)) $tools.AddToolVersion("AzCopy", $(Get-AzCopyVersion)) -$tools.AddToolVersion("Bazel", $(Get-BazelVersion)) -$tools.AddToolVersion("Bazelisk", $(Get-BazeliskVersion)) +if ((Test-IsUbuntu20) -or (Test-IsUbuntu22)) { + $tools.AddToolVersion("Bazel", $(Get-BazelVersion)) + $tools.AddToolVersion("Bazelisk", $(Get-BazeliskVersion)) +} $tools.AddToolVersion("Bicep", $(Get-BicepVersion)) -$tools.AddToolVersion("Buildah", $(Get-BuildahVersion)) +if ((Test-IsUbuntu20) -or (Test-IsUbuntu22)) { + $tools.AddToolVersion("Buildah", $(Get-BuildahVersion)) +} $tools.AddToolVersion("CMake", $(Get-CMakeVersion)) $tools.AddToolVersion("CodeQL Action Bundle", $(Get-CodeQLBundleVersion)) $tools.AddToolVersion("Docker Amazon ECR Credential Helper", $(Get-DockerAmazonECRCredHelperVersion)) -$tools.AddToolVersion("Docker Compose v1", $(Get-DockerComposeV1Version)) +if ((Test-IsUbuntu20) -or (Test-IsUbuntu22)) { + $tools.AddToolVersion("Docker Compose v1", $(Get-DockerComposeV1Version)) +} $tools.AddToolVersion("Docker Compose v2", $(Get-DockerComposeV2Version)) $tools.AddToolVersion("Docker-Buildx", $(Get-DockerBuildxVersion)) $tools.AddToolVersion("Docker Client", $(Get-DockerClientVersion)) @@ -117,7 +127,9 @@ $tools.AddToolVersion("Git", $(Get-GitVersion)) $tools.AddToolVersion("Git LFS", $(Get-GitLFSVersion)) $tools.AddToolVersion("Git-ftp", $(Get-GitFTPVersion)) $tools.AddToolVersion("Haveged", $(Get-HavegedVersion)) -$tools.AddToolVersion("Heroku", $(Get-HerokuVersion)) +if ((Test-IsUbuntu20) -or (Test-IsUbuntu22)) { + $tools.AddToolVersion("Heroku", $(Get-HerokuVersion)) +} if (Test-IsUbuntu20) { $tools.AddToolVersion("HHVM (HipHop VM)", $(Get-HHVMVersion)) } @@ -125,88 +137,123 @@ $tools.AddToolVersion("jq", $(Get-JqVersion)) $tools.AddToolVersion("Kind", $(Get-KindVersion)) $tools.AddToolVersion("Kubectl", $(Get-KubectlVersion)) $tools.AddToolVersion("Kustomize", $(Get-KustomizeVersion)) -$tools.AddToolVersion("Leiningen", $(Get-LeiningenVersion)) +if ((Test-IsUbuntu20) -or (Test-IsUbuntu22)) { + $tools.AddToolVersion("Leiningen", $(Get-LeiningenVersion)) +} $tools.AddToolVersion("MediaInfo", $(Get-MediainfoVersion)) $tools.AddToolVersion("Mercurial", $(Get-HGVersion)) $tools.AddToolVersion("Minikube", $(Get-MinikubeVersion)) $tools.AddToolVersion("n", $(Get-NVersion)) $tools.AddToolVersion("Newman", $(Get-NewmanVersion)) -$tools.AddToolVersion("nvm", $(Get-NvmVersion)) +if ((Test-IsUbuntu20) -or (Test-IsUbuntu22)) { + $tools.AddToolVersion("nvm", $(Get-NvmVersion)) +} $tools.AddToolVersion("OpenSSL", $(Get-OpensslVersion)) -$tools.AddToolVersion("Packer", $(Get-PackerVersion)) +if ((Test-IsUbuntu20) -or (Test-IsUbuntu22)) { + $tools.AddToolVersion("Packer", $(Get-PackerVersion)) +} $tools.AddToolVersion("Parcel", $(Get-ParcelVersion)) if (Test-IsUbuntu20) { $tools.AddToolVersion("PhantomJS", $(Get-PhantomJSVersion)) } -$tools.AddToolVersion("Podman", $(Get-PodManVersion)) +if ((Test-IsUbuntu20) -or (Test-IsUbuntu22)) { + $tools.AddToolVersion("Podman", $(Get-PodManVersion)) +} $tools.AddToolVersion("Pulumi", $(Get-PulumiVersion)) -$tools.AddToolVersion("R", $(Get-RVersion)) -$tools.AddToolVersion("Skopeo", $(Get-SkopeoVersion)) +if ((Test-IsUbuntu20) -or (Test-IsUbuntu22)) { + $tools.AddToolVersion("R", $(Get-RVersion)) + $tools.AddToolVersion("Skopeo", $(Get-SkopeoVersion)) +} $tools.AddToolVersion("Sphinx Open Source Search Server", $(Get-SphinxVersion)) -$tools.AddToolVersion("SVN", $(Get-SVNVersion)) -$tools.AddToolVersion("Terraform", $(Get-TerraformVersion)) +if ((Test-IsUbuntu20) -or (Test-IsUbuntu22)) { + $tools.AddToolVersion("SVN", $(Get-SVNVersion)) + $tools.AddToolVersion("Terraform", $(Get-TerraformVersion)) +} $tools.AddToolVersion("yamllint", $(Get-YamllintVersion)) $tools.AddToolVersion("yq", $(Get-YqVersion)) $tools.AddToolVersion("zstd", $(Get-ZstdVersion)) # CLI Tools $cliTools = $installedSoftware.AddHeader("CLI Tools") -$cliTools.AddToolVersion("Alibaba Cloud CLI", $(Get-AlibabaCloudCliVersion)) +if ((Test-IsUbuntu20) -or (Test-IsUbuntu22)) { + $cliTools.AddToolVersion("Alibaba Cloud CLI", $(Get-AlibabaCloudCliVersion)) +} $cliTools.AddToolVersion("AWS CLI", $(Get-AWSCliVersion)) $cliTools.AddToolVersion("AWS CLI Session Manager Plugin", $(Get-AWSCliSessionManagerPluginVersion)) $cliTools.AddToolVersion("AWS SAM CLI", $(Get-AWSSAMVersion)) $cliTools.AddToolVersion("Azure CLI", $(Get-AzureCliVersion)) $cliTools.AddToolVersion("Azure CLI (azure-devops)", $(Get-AzureDevopsVersion)) $cliTools.AddToolVersion("GitHub CLI", $(Get-GitHubCliVersion)) -$cliTools.AddToolVersion("Google Cloud CLI", $(Get-GoogleCloudCLIVersion)) -$cliTools.AddToolVersion("Netlify CLI", $(Get-NetlifyCliVersion)) -$cliTools.AddToolVersion("OpenShift CLI", $(Get-OCCliVersion)) -$cliTools.AddToolVersion("ORAS CLI", $(Get-ORASCliVersion)) -$cliTools.AddToolVersion("Vercel CLI", $(Get-VerselCliversion)) +if ((Test-IsUbuntu20) -or (Test-IsUbuntu22)) { + $cliTools.AddToolVersion("Google Cloud CLI", $(Get-GoogleCloudCLIVersion)) + $cliTools.AddToolVersion("Netlify CLI", $(Get-NetlifyCliVersion)) + $cliTools.AddToolVersion("OpenShift CLI", $(Get-OCCliVersion)) + $cliTools.AddToolVersion("ORAS CLI", $(Get-ORASCliVersion)) + $cliTools.AddToolVersion("Vercel CLI", $(Get-VerselCliversion)) +} -$installedSoftware.AddHeader("Java").AddTable($(Get-JavaVersionsTable)) +# Java +if (-not $(Test-IsUbuntu24)) { + $installedSoftware.AddHeader("Java").AddTable($(Get-JavaVersionsTable)) +} +# PHP Tools $phpTools = $installedSoftware.AddHeader("PHP Tools") $phpTools.AddToolVersionsListInline("PHP", $(Get-PHPVersions), "^\d+\.\d+") $phpTools.AddToolVersion("Composer", $(Get-ComposerVersion)) $phpTools.AddToolVersion("PHPUnit", $(Get-PHPUnitVersion)) $phpTools.AddNote("Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled.") +# Haskell Tools $haskellTools = $installedSoftware.AddHeader("Haskell Tools") $haskellTools.AddToolVersion("Cabal", $(Get-CabalVersion)) $haskellTools.AddToolVersion("GHC", $(Get-GHCVersion)) $haskellTools.AddToolVersion("GHCup", $(Get-GHCupVersion)) $haskellTools.AddToolVersion("Stack", $(Get-StackVersion)) +# Rust Tools Initialize-RustEnvironment $rustTools = $installedSoftware.AddHeader("Rust Tools") $rustTools.AddToolVersion("Cargo", $(Get-CargoVersion)) $rustTools.AddToolVersion("Rust", $(Get-RustVersion)) $rustTools.AddToolVersion("Rustdoc", $(Get-RustdocVersion)) $rustTools.AddToolVersion("Rustup", $(Get-RustupVersion)) + +# Packages $rustToolsPackages = $rustTools.AddHeader("Packages") -$rustToolsPackages.AddToolVersion("Bindgen", $(Get-BindgenVersion)) -$rustToolsPackages.AddToolVersion("Cargo audit", $(Get-CargoAuditVersion)) -$rustToolsPackages.AddToolVersion("Cargo clippy", $(Get-CargoClippyVersion)) -$rustToolsPackages.AddToolVersion("Cargo outdated", $(Get-CargoOutdatedVersion)) -$rustToolsPackages.AddToolVersion("Cbindgen", $(Get-CbindgenVersion)) +if ((Test-IsUbuntu20) -or (Test-IsUbuntu22)) { + $rustToolsPackages.AddToolVersion("Bindgen", $(Get-BindgenVersion)) + $rustToolsPackages.AddToolVersion("Cargo audit", $(Get-CargoAuditVersion)) + $rustToolsPackages.AddToolVersion("Cargo clippy", $(Get-CargoClippyVersion)) + $rustToolsPackages.AddToolVersion("Cargo outdated", $(Get-CargoOutdatedVersion)) + $rustToolsPackages.AddToolVersion("Cbindgen", $(Get-CbindgenVersion)) +} $rustToolsPackages.AddToolVersion("Rustfmt", $(Get-RustfmtVersion)) +# Browsers and Drivers $browsersTools = $installedSoftware.AddHeader("Browsers and Drivers") $browsersTools.AddToolVersion("Google Chrome", $(Get-ChromeVersion)) $browsersTools.AddToolVersion("ChromeDriver", $(Get-ChromeDriverVersion)) $browsersTools.AddToolVersion("Chromium", $(Get-ChromiumVersion)) -$browsersTools.AddToolVersion("Microsoft Edge", $(Get-EdgeVersion)) -$browsersTools.AddToolVersion("Microsoft Edge WebDriver", $(Get-EdgeDriverVersion)) +if ((Test-IsUbuntu20) -or (Test-IsUbuntu22)) { + $browsersTools.AddToolVersion("Microsoft Edge", $(Get-EdgeVersion)) + $browsersTools.AddToolVersion("Microsoft Edge WebDriver", $(Get-EdgeDriverVersion)) +} $browsersTools.AddToolVersion("Selenium server", $(Get-SeleniumVersion)) -$browsersTools.AddToolVersion("Mozilla Firefox", $(Get-FirefoxVersion)) -$browsersTools.AddToolVersion("Geckodriver", $(Get-GeckodriverVersion)) +if ((Test-IsUbuntu20) -or (Test-IsUbuntu22)) { + $browsersTools.AddToolVersion("Mozilla Firefox", $(Get-FirefoxVersion)) + $browsersTools.AddToolVersion("Geckodriver", $(Get-GeckodriverVersion)) +} + +# Environment variables $browsersTools.AddHeader("Environment variables").AddTable($(Build-BrowserWebdriversEnvironmentTable)) +# .NET Tools $netCoreTools = $installedSoftware.AddHeader(".NET Tools") $netCoreTools.AddToolVersionsListInline(".NET Core SDK", $(Get-DotNetCoreSdkVersions), "^\d+\.\d+\.\d") $netCoreTools.AddNodes($(Get-DotnetTools)) +# Databases $databasesTools = $installedSoftware.AddHeader("Databases") if (Test-IsUbuntu20) { $databasesTools.AddToolVersion("MongoDB", $(Get-MongoDbVersion)) @@ -214,15 +261,21 @@ if (Test-IsUbuntu20) { $databasesTools.AddToolVersion("sqlite3", $(Get-SqliteVersion)) $databasesTools.AddNode($(Build-PostgreSqlSection)) $databasesTools.AddNode($(Build-MySQLSection)) -$databasesTools.AddNode($(Build-MSSQLToolsSection)) +if (-not $(Test-IsUbuntu24)) { + $databasesTools.AddNode($(Build-MSSQLToolsSection)) +} -$cachedTools = $installedSoftware.AddHeader("Cached Tools") -$cachedTools.AddToolVersionsList("Go", $(Get-ToolcacheGoVersions), "^\d+\.\d+") -$cachedTools.AddToolVersionsList("Node.js", $(Get-ToolcacheNodeVersions), "^\d+") -$cachedTools.AddToolVersionsList("Python", $(Get-ToolcachePythonVersions), "^\d+\.\d+") -$cachedTools.AddToolVersionsList("PyPy", $(Get-ToolcachePyPyVersions), "^\d+\.\d+") -$cachedTools.AddToolVersionsList("Ruby", $(Get-ToolcacheRubyVersions), "^\d+\.\d+") +# Cached Tools +if (-not $(Test-IsUbuntu24)) { + $cachedTools = $installedSoftware.AddHeader("Cached Tools") + $cachedTools.AddToolVersionsList("Go", $(Get-ToolcacheGoVersions), "^\d+\.\d+") + $cachedTools.AddToolVersionsList("Node.js", $(Get-ToolcacheNodeVersions), "^\d+") + $cachedTools.AddToolVersionsList("Python", $(Get-ToolcachePythonVersions), "^\d+\.\d+") + $cachedTools.AddToolVersionsList("PyPy", $(Get-ToolcachePyPyVersions), "^\d+\.\d+") + $cachedTools.AddToolVersionsList("Ruby", $(Get-ToolcacheRubyVersions), "^\d+\.\d+") +} +# PowerShell Tools $powerShellTools = $installedSoftware.AddHeader("PowerShell Tools") $powerShellTools.AddToolVersion("PowerShell", $(Get-PowershellVersion)) $powerShellTools.AddHeader("PowerShell Modules").AddNodes($(Get-PowerShellModules)) @@ -231,9 +284,12 @@ $installedSoftware.AddHeader("Web Servers").AddTable($(Build-WebServersTable)) $androidTools = $installedSoftware.AddHeader("Android") $androidTools.AddTable($(Build-AndroidTable)) + $androidTools.AddHeader("Environment variables").AddTable($(Build-AndroidEnvironmentTable)) -$installedSoftware.AddHeader("Cached Docker images").AddTable($(Get-CachedDockerImagesTableData)) +if (-not $(Test-IsUbuntu24)) { + $installedSoftware.AddHeader("Cached Docker images").AddTable($(Get-CachedDockerImagesTableData)) +} $installedSoftware.AddHeader("Installed apt packages").AddTable($(Get-AptPackages)) $softwareReport.ToJson() | Out-File -FilePath "${OutputDirectory}/software-report.json" -Encoding UTF8NoBOM diff --git a/images/ubuntu/scripts/docs-gen/SoftwareReport.Common.psm1 b/images/ubuntu/scripts/docs-gen/SoftwareReport.Common.psm1 index e1a78a962158..62e39cae747d 100644 --- a/images/ubuntu/scripts/docs-gen/SoftwareReport.Common.psm1 +++ b/images/ubuntu/scripts/docs-gen/SoftwareReport.Common.psm1 @@ -10,7 +10,7 @@ function Get-DashVersion { function Get-CPPVersions { $result = Get-CommandResult "apt list --installed" -Multiline - $cppVersions = $result.Output | Where-Object { $_ -match "g\+\+-\d+" } | ForEach-Object { + $cppVersions = $result.Output | Where-Object { $_ -match "g\+\+-\d\d\/" } | ForEach-Object { & $_.Split("/")[0] --version | Select-Object -First 1 | Get-StringPart -Part 3 } | Sort-Object {[Version] $_} return $cppVersions @@ -18,9 +18,8 @@ function Get-CPPVersions { function Get-FortranVersions { $result = Get-CommandResult "apt list --installed" -Multiline - $fortranVersions = $result.Output | Where-Object { $_ -match "^gfortran-\d+" } | ForEach-Object { - $_ -match "now (?<version>\d+\.\d+\.\d+)-" | Out-Null - $Matches.version + $fortranVersions = $result.Output | Where-Object { $_ -match "^gfortran-\d\d\/" } | ForEach-Object { + & $_.Split("/")[0] --version | Select-Object -First 1 | Get-StringPart -Part 4 } | Sort-Object {[Version] $_} return $fortranVersions } @@ -175,15 +174,13 @@ function Get-ParcelVersion { } function Get-PipVersion { - $result = Get-CommandResult "pip --version" - $result.Output -match "pip (?<version>\d+\.\d+\.\d+)" | Out-Null - return $Matches.version + $pipVersion = pip --version | Get-StringPart -Part 1 + return $pipVersion } function Get-Pip3Version { - $result = Get-CommandResult "pip3 --version" - $result.Output -match "pip (?<version>\d+\.\d+\.\d+)" | Out-Null - return $Matches.version + $pip3Version = pip3 --version | Get-StringPart -Part 1 + return $pip3Version } function Get-VcpkgVersion { diff --git a/images/ubuntu/scripts/helpers/os.sh b/images/ubuntu/scripts/helpers/os.sh index 1de83691b309..6838535df0f7 100644 --- a/images/ubuntu/scripts/helpers/os.sh +++ b/images/ubuntu/scripts/helpers/os.sh @@ -5,13 +5,13 @@ ################################################################################ is_ubuntu20() { - lsb_release -d | grep -q 'Ubuntu 20' + lsb_release -rs | grep -q '20.04' } is_ubuntu22() { - lsb_release -d | grep -q 'Ubuntu 22' + lsb_release -rs | grep -q '22.04' } is_ubuntu24() { - lsb_release -d | grep -q 'Ubuntu 24' -} \ No newline at end of file + lsb_release -rs | grep -q '24.04' +} diff --git a/images/ubuntu/scripts/tests/Browsers.Tests.ps1 b/images/ubuntu/scripts/tests/Browsers.Tests.ps1 index 1ea5230f39f2..7848c676cf1d 100644 --- a/images/ubuntu/scripts/tests/Browsers.Tests.ps1 +++ b/images/ubuntu/scripts/tests/Browsers.Tests.ps1 @@ -1,4 +1,4 @@ -Describe "Firefox" { +Describe "Firefox" -Skip:((-not (Test-IsUbuntu20)) -and (-not (Test-IsUbuntu22))) { It "Firefox" { "firefox --version" | Should -ReturnZeroExitCode } @@ -24,7 +24,7 @@ Describe "Chrome" { } } -Describe "Edge" { +Describe "Edge" -Skip:((-not (Test-IsUbuntu20)) -and (-not (Test-IsUbuntu22))) { It "Edge" { "microsoft-edge --version" | Should -ReturnZeroExitCode } diff --git a/images/ubuntu/scripts/tests/CLI.Tools.Tests.ps1 b/images/ubuntu/scripts/tests/CLI.Tools.Tests.ps1 index 0951afdfc8d2..abbf5857dd62 100644 --- a/images/ubuntu/scripts/tests/CLI.Tools.Tests.ps1 +++ b/images/ubuntu/scripts/tests/CLI.Tools.Tests.ps1 @@ -10,7 +10,7 @@ Describe "Azure DevOps CLI" { } } -Describe "Aliyun CLI" { +Describe "Aliyun CLI" -Skip:((-not (Test-IsUbuntu20)) -and (-not (Test-IsUbuntu22))) { It "Aliyun CLI" { "aliyun version" | Should -ReturnZeroExitCode } @@ -36,19 +36,19 @@ Describe "GitHub CLI" { } } -Describe "Google Cloud CLI" { +Describe "Google Cloud CLI" -Skip:((-not (Test-IsUbuntu20)) -and (-not (Test-IsUbuntu22))) { It "Google Cloud CLI" { "gcloud --version" | Should -ReturnZeroExitCode } } -Describe "OC CLI" { +Describe "OC CLI" -Skip:((-not (Test-IsUbuntu20)) -and (-not (Test-IsUbuntu22))) { It "OC CLI" { "oc version" | Should -ReturnZeroExitCode } } -Describe "Oras CLI" { +Describe "Oras CLI" -Skip:((-not (Test-IsUbuntu20)) -and (-not (Test-IsUbuntu22))) { It "Oras CLI" { "oras version" | Should -ReturnZeroExitCode } diff --git a/images/ubuntu/scripts/tests/Common.Tests.ps1 b/images/ubuntu/scripts/tests/Common.Tests.ps1 index 38eaeb2b98a8..73a8ab2eee8c 100644 --- a/images/ubuntu/scripts/tests/Common.Tests.ps1 +++ b/images/ubuntu/scripts/tests/Common.Tests.ps1 @@ -24,7 +24,7 @@ Describe "PHP" { } } -Describe "Swift" { +Describe "Swift" -Skip:((-not (Test-IsUbuntu20)) -and (-not (Test-IsUbuntu22))) { It "swift" { "swift --version" | Should -ReturnZeroExitCode } diff --git a/images/ubuntu/scripts/tests/Databases.Tests.ps1 b/images/ubuntu/scripts/tests/Databases.Tests.ps1 index 6eec8d1bde32..6038824d3216 100644 --- a/images/ubuntu/scripts/tests/Databases.Tests.ps1 +++ b/images/ubuntu/scripts/tests/Databases.Tests.ps1 @@ -1,4 +1,4 @@ -Describe "MongoDB" -Skip:(Test-IsUbuntu22) { +Describe "MongoDB" -Skip:(-not (Test-IsUbuntu20)) { It "<ToolName>" -TestCases @( @{ ToolName = "mongo" } @{ ToolName = "mongod" } diff --git a/images/ubuntu/scripts/tests/Java.Tests.ps1 b/images/ubuntu/scripts/tests/Java.Tests.ps1 index dff9cf399a8d..c0a98d3873ef 100644 --- a/images/ubuntu/scripts/tests/Java.Tests.ps1 +++ b/images/ubuntu/scripts/tests/Java.Tests.ps1 @@ -1,6 +1,6 @@ Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" -DisableNameChecking -Describe "Java" { +Describe "Java" -Skip:(Test-IsUbuntu24) { $toolsetJava = (Get-ToolsetContent).java $defaultVersion = $toolsetJava.default $jdkVersions = $toolsetJava.versions @@ -17,22 +17,10 @@ Describe "Java" { It "<ToolName>" -TestCases @( @{ ToolName = "java" } @{ ToolName = "javac" } - @{ ToolName = "mvn" } - @{ ToolName = "ant" } ) { "$ToolName -version" | Should -ReturnZeroExitCode } - It "Gradle" { - "gradle -version" | Should -ReturnZeroExitCode - - $gradleVariableValue = [System.Environment]::GetEnvironmentVariable("GRADLE_HOME") - $gradleVariableValue | Should -BeLike "/usr/share/gradle-*" - - $gradlePath = Join-Path $env:GRADLE_HOME "bin/gradle" - "`"$GradlePath`" -version" | Should -ReturnZeroExitCode - } - $testCases = $jdkVersions | ForEach-Object { @{Version = $_ } } It "Java <Version>" -TestCases $testCases { @@ -48,3 +36,21 @@ Describe "Java" { "`"$javaPath`" -version" | Should -OutputTextMatchingRegex "openjdk\ version\ `"${Version}(\.[0-9_\.]+)?`"" } } + +Describe "Java-Tools" { + It "Gradle" { + "gradle -version" | Should -ReturnZeroExitCode + + $gradleVariableValue = [System.Environment]::GetEnvironmentVariable("GRADLE_HOME") + $gradleVariableValue | Should -BeLike "/usr/share/gradle-*" + + $gradlePath = Join-Path $env:GRADLE_HOME "bin/gradle" + "`"$GradlePath`" -version" | Should -ReturnZeroExitCode + } + It "<ToolName>" -TestCases @( + @{ ToolName = "mvn" } + @{ ToolName = "ant" } + ) { + "$ToolName -version" | Should -ReturnZeroExitCode + } +} diff --git a/images/ubuntu/scripts/tests/Tools.Tests.ps1 b/images/ubuntu/scripts/tests/Tools.Tests.ps1 index a58f052e9dfe..0060b08de311 100644 --- a/images/ubuntu/scripts/tests/Tools.Tests.ps1 +++ b/images/ubuntu/scripts/tests/Tools.Tests.ps1 @@ -1,3 +1,4 @@ +Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" Describe "azcopy" { It "azcopy" { "azcopy --version" | Should -ReturnZeroExitCode @@ -36,8 +37,12 @@ Describe "Rust" { It "Rustfmt is installed" { "rustfmt --version" | Should -ReturnZeroExitCode } + + It "cargo" { + "cargo --version" | Should -ReturnZeroExitCode + } - Context "Cargo dependencies" { + Context "Cargo dependencies" -Skip:((-not (Test-IsUbuntu20)) -and (-not (Test-IsUbuntu22))) { It "bindgen" { "bindgen --version" | Should -ReturnZeroExitCode } @@ -46,10 +51,6 @@ Describe "Rust" { "cbindgen --version" | Should -ReturnZeroExitCode } - It "cargo" { - "cargo --version" | Should -ReturnZeroExitCode - } - It "cargo-clippy" { "cargo-clippy --version" | Should -ReturnZeroExitCode } @@ -105,7 +106,7 @@ Describe "Docker images" { } } -Describe "Docker-compose v1" { +Describe "Docker-compose v1" -Skip:((-not (Test-IsUbuntu20)) -and (-not (Test-IsUbuntu20))) { It "docker-compose" { "docker-compose --version"| Should -ReturnZeroExitCode } @@ -117,7 +118,7 @@ Describe "Ansible" { } } -Describe "Bazel" { +Describe "Bazel" -Skip:((-not (Test-IsUbuntu20)) -and (-not (Test-IsUbuntu20))) { It "<ToolName>" -TestCases @( @{ ToolName = "bazel" } @{ ToolName = "bazelisk" } @@ -144,7 +145,7 @@ Describe "Cmake" { } } -Describe "erlang" -Skip:(Test-IsUbuntu22) { +Describe "erlang" -Skip:(-not (Test-IsUbuntu20)) { $testCases = @("erl -version", "erlc -v", "rebar3 -v") | ForEach-Object { @{ErlangCommand = $_} } It "erlang <ErlangCommand>" -TestCases $testCases { @@ -168,7 +169,7 @@ Describe "gfortran" { } } -Describe "Mono" { +Describe "Mono" -Skip:(Test-IsUbuntu24) { It "mono" { "mono --version" | Should -ReturnZeroExitCode } @@ -182,25 +183,25 @@ Describe "Mono" { } } -Describe "MSSQLCommandLineTools" { +Describe "MSSQLCommandLineTools" -Skip:((-not (Test-IsUbuntu20)) -and (-not (Test-IsUbuntu20))) { It "sqlcmd" { "sqlcmd -?" | Should -ReturnZeroExitCode } } -Describe "SqlPackage" { +Describe "SqlPackage" -Skip:((-not (Test-IsUbuntu20)) -and (-not (Test-IsUbuntu20))) { It "sqlpackage" { "sqlpackage /version" | Should -ReturnZeroExitCode } } -Describe "R" { +Describe "R" -Skip:((-not (Test-IsUbuntu20)) -and (-not (Test-IsUbuntu20))) { It "r" { "R --version" | Should -ReturnZeroExitCode } } -Describe "Sbt" { +Describe "Sbt" -Skip:((-not (Test-IsUbuntu20)) -and (-not (Test-IsUbuntu20))) { It "sbt" { "sbt --version" | Should -ReturnZeroExitCode } @@ -213,7 +214,7 @@ Describe "Selenium" { } } -Describe "Terraform" { +Describe "Terraform" -Skip:((-not (Test-IsUbuntu20)) -and (-not (Test-IsUbuntu20))) { It "terraform" { "terraform --version" | Should -ReturnZeroExitCode } @@ -251,13 +252,13 @@ Describe "Git-lfs" { } } -Describe "Heroku" { +Describe "Heroku" -Skip:((-not (Test-IsUbuntu20)) -and (-not (Test-IsUbuntu20))) { It "heroku" { "heroku --version" | Should -ReturnZeroExitCode } } -Describe "HHVM" -Skip:(Test-IsUbuntu22) { +Describe "HHVM" -Skip:(-not (Test-IsUbuntu20)) { It "hhvm" { "hhvm --version" | Should -ReturnZeroExitCode } @@ -297,7 +298,7 @@ Describe "Kubernetes tools" { } } -Describe "Leiningen" { +Describe "Leiningen" -Skip:((-not (Test-IsUbuntu20)) -and (-not (Test-IsUbuntu20))) { It "leiningen" { "lein --version" | Should -ReturnZeroExitCode } @@ -309,7 +310,7 @@ Describe "Conda" { } } -Describe "Packer" { +Describe "Packer" -Skip:((-not (Test-IsUbuntu20)) -and (-not (Test-IsUbuntu20))) { It "packer" { "packer --version" | Should -ReturnZeroExitCode } @@ -321,14 +322,14 @@ Describe "Pulumi" { } } -Describe "Phantomjs" -Skip:(Test-IsUbuntu22) { +Describe "Phantomjs" -Skip:(-not (Test-IsUbuntu20)) { It "phantomjs" { $env:OPENSSL_CONF="/etc/ssl" "phantomjs --version" | Should -ReturnZeroExitCode } } -Describe "Containers" { +Describe "Containers" -Skip:((-not (Test-IsUbuntu20)) -and (-not (Test-IsUbuntu20))) { $testCases = @("podman", "buildah", "skopeo") | ForEach-Object { @{ContainerCommand = $_} } It "<ContainerCommand>" -TestCases $testCases { @@ -344,7 +345,7 @@ Describe "Containers" { } -Describe "nvm" { +Describe "nvm" -Skip:((-not (Test-IsUbuntu20)) -and (-not (Test-IsUbuntu20))) { It "nvm" { "source /etc/skel/.nvm/nvm.sh && nvm --version" | Should -ReturnZeroExitCode } @@ -380,7 +381,7 @@ Describe "yq" { } } -Describe "Kotlin" { +Describe "Kotlin" -Skip:((-not (Test-IsUbuntu20)) -and (-not (Test-IsUbuntu20))) { It "kapt" { "kapt -version" | Should -ReturnZeroExitCode } diff --git a/images/ubuntu/scripts/tests/Toolset.Tests.ps1 b/images/ubuntu/scripts/tests/Toolset.Tests.ps1 index 488bb42aeb95..fef615c708e4 100644 --- a/images/ubuntu/scripts/tests/Toolset.Tests.ps1 +++ b/images/ubuntu/scripts/tests/Toolset.Tests.ps1 @@ -1,4 +1,4 @@ -Describe "Toolset" { +Describe "Toolset" -Skip:((-not (Test-IsUbuntu20)) -and (-not (Test-IsUbuntu22))) { $tools = (Get-ToolsetContent).toolcache $toolsExecutables = @{ diff --git a/images/ubuntu/templates/ubuntu-24.04.pkr.hcl b/images/ubuntu/templates/ubuntu-24.04.pkr.hcl new file mode 100644 index 000000000000..c47452d63553 --- /dev/null +++ b/images/ubuntu/templates/ubuntu-24.04.pkr.hcl @@ -0,0 +1,385 @@ +packer { + required_plugins { + azure = { + source = "github.com/hashicorp/azure" + version = "1.4.5" + } + } +} + +locals { + managed_image_name = var.managed_image_name != "" ? var.managed_image_name : "packer-${var.image_os}-${var.image_version}" +} + +variable "allowed_inbound_ip_addresses" { + type = list(string) + default = [] +} + +variable "azure_tags" { + type = map(string) + default = {} +} + +variable "build_resource_group_name" { + type = string + default = "${env("BUILD_RESOURCE_GROUP_NAME")}" +} + +variable "client_cert_path" { + type = string + default = "${env("ARM_CLIENT_CERT_PATH")}" +} + +variable "client_id" { + type = string + default = "${env("ARM_CLIENT_ID")}" +} + +variable "client_secret" { + type = string + default = "${env("ARM_CLIENT_SECRET")}" + sensitive = true +} + +variable "dockerhub_login" { + type = string + default = "${env("DOCKERHUB_LOGIN")}" +} + +variable "dockerhub_password" { + type = string + default = "${env("DOCKERHUB_PASSWORD")}" +} + +variable "helper_script_folder" { + type = string + default = "/imagegeneration/helpers" +} + +variable "image_folder" { + type = string + default = "/imagegeneration" +} + +variable "image_os" { + type = string + default = "ubuntu24" +} + +variable "image_version" { + type = string + default = "dev" +} + +variable "imagedata_file" { + type = string + default = "/imagegeneration/imagedata.json" +} + +variable "installer_script_folder" { + type = string + default = "/imagegeneration/installers" +} + +variable "install_password" { + type = string + default = "" + sensitive = true +} + +variable "location" { + type = string + default = "${env("ARM_RESOURCE_LOCATION")}" +} + +variable "managed_image_name" { + type = string + default = "" +} + +variable "managed_image_resource_group_name" { + type = string + default = "${env("ARM_RESOURCE_GROUP")}" +} + +variable "private_virtual_network_with_public_ip" { + type = bool + default = false +} + +variable "subscription_id" { + type = string + default = "${env("ARM_SUBSCRIPTION_ID")}" +} + +variable "temp_resource_group_name" { + type = string + default = "${env("TEMP_RESOURCE_GROUP_NAME")}" +} + +variable "tenant_id" { + type = string + default = "${env("ARM_TENANT_ID")}" +} + +variable "virtual_network_name" { + type = string + default = "${env("VNET_NAME")}" +} + +variable "virtual_network_resource_group_name" { + type = string + default = "${env("VNET_RESOURCE_GROUP")}" +} + +variable "virtual_network_subnet_name" { + type = string + default = "${env("VNET_SUBNET")}" +} + +variable "vm_size" { + type = string + default = "Standard_D4s_v4" +} + +source "azure-arm" "build_image" { + allowed_inbound_ip_addresses = "${var.allowed_inbound_ip_addresses}" + build_resource_group_name = "${var.build_resource_group_name}" + client_cert_path = "${var.client_cert_path}" + client_id = "${var.client_id}" + client_secret = "${var.client_secret}" + image_offer = "ubuntu-24_04-lts" + image_publisher = "canonical" + image_sku = "server-gen1" + location = "${var.location}" + managed_image_name = "${local.managed_image_name}" + managed_image_resource_group_name = "${var.managed_image_resource_group_name}" + os_disk_size_gb = "75" + os_type = "Linux" + private_virtual_network_with_public_ip = "${var.private_virtual_network_with_public_ip}" + subscription_id = "${var.subscription_id}" + temp_resource_group_name = "${var.temp_resource_group_name}" + tenant_id = "${var.tenant_id}" + virtual_network_name = "${var.virtual_network_name}" + virtual_network_resource_group_name = "${var.virtual_network_resource_group_name}" + virtual_network_subnet_name = "${var.virtual_network_subnet_name}" + vm_size = "${var.vm_size}" + + dynamic "azure_tag" { + for_each = var.azure_tags + content { + name = azure_tag.key + value = azure_tag.value + } + } +} + +build { + sources = ["source.azure-arm.build_image"] + + provisioner "shell" { + execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" + inline = ["mkdir ${var.image_folder}", "chmod 777 ${var.image_folder}"] + } + + provisioner "shell" { + execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" + script = "${path.root}/../scripts/build/configure-apt-mock.sh" + } + + provisioner "shell" { + environment_vars = ["DEBIAN_FRONTEND=noninteractive"] + execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" + scripts = [ + "${path.root}/../scripts/build/install-ms-repos.sh", + "${path.root}/../scripts/build/configure-apt-sources.sh", + "${path.root}/../scripts/build/configure-apt.sh" + ] + } + + provisioner "shell" { + execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" + script = "${path.root}/../scripts/build/configure-limits.sh" + } + + provisioner "file" { + destination = "${var.helper_script_folder}" + source = "${path.root}/../scripts/helpers" + } + + provisioner "file" { + destination = "${var.installer_script_folder}" + source = "${path.root}/../scripts/build" + } + + provisioner "file" { + destination = "${var.image_folder}" + sources = [ + "${path.root}/../assets/post-gen", + "${path.root}/../scripts/tests", + "${path.root}/../scripts/docs-gen" + ] + } + + provisioner "file" { + destination = "${var.image_folder}/docs-gen/" + source = "${path.root}/../../../helpers/software-report-base" + } + + provisioner "file" { + destination = "${var.installer_script_folder}/toolset.json" + source = "${path.root}/../toolsets/toolset-2404.json" + } + + provisioner "shell" { + execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" + inline = [ + "mv ${var.image_folder}/docs-gen ${var.image_folder}/SoftwareReport", + "mv ${var.image_folder}/post-gen ${var.image_folder}/post-generation" + ] + } + + provisioner "shell" { + environment_vars = ["IMAGE_VERSION=${var.image_version}", "IMAGEDATA_FILE=${var.imagedata_file}"] + execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" + scripts = ["${path.root}/../scripts/build/configure-image-data.sh"] + } + + provisioner "shell" { + environment_vars = ["IMAGE_VERSION=${var.image_version}", "IMAGE_OS=${var.image_os}", "HELPER_SCRIPTS=${var.helper_script_folder}"] + execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" + scripts = ["${path.root}/../scripts/build/configure-environment.sh"] + } + + provisioner "shell" { + environment_vars = ["DEBIAN_FRONTEND=noninteractive", "HELPER_SCRIPTS=${var.helper_script_folder}", "INSTALLER_SCRIPT_FOLDER=${var.installer_script_folder}"] + execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" + scripts = ["${path.root}/../scripts/build/install-apt-vital.sh"] + } + +provisioner "shell" { + environment_vars = ["HELPER_SCRIPTS=${var.helper_script_folder}", "INSTALLER_SCRIPT_FOLDER=${var.installer_script_folder}"] + execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" + scripts = ["${path.root}/../scripts/build/install-powershell.sh"] + } + + provisioner "shell" { + environment_vars = ["HELPER_SCRIPTS=${var.helper_script_folder}", "INSTALLER_SCRIPT_FOLDER=${var.installer_script_folder}"] + execute_command = "sudo sh -c '{{ .Vars }} pwsh -f {{ .Path }}'" + scripts = ["${path.root}/../scripts/build/Install-PowerShellModules.ps1", "${path.root}/../scripts/build/Install-PowerShellAzModules.ps1"] + } + + provisioner "shell" { + environment_vars = ["HELPER_SCRIPTS=${var.helper_script_folder}", "INSTALLER_SCRIPT_FOLDER=${var.installer_script_folder}", "DEBIAN_FRONTEND=noninteractive"] + execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" + scripts = [ + "${path.root}/../scripts/build/install-actions-cache.sh", + "${path.root}/../scripts/build/install-runner-package.sh", + "${path.root}/../scripts/build/install-apt-common.sh", + "${path.root}/../scripts/build/install-azcopy.sh", + "${path.root}/../scripts/build/install-azure-cli.sh", + "${path.root}/../scripts/build/install-azure-devops-cli.sh", + "${path.root}/../scripts/build/install-bicep.sh", + "${path.root}/../scripts/build/install-apache.sh", + "${path.root}/../scripts/build/install-aws-tools.sh", + "${path.root}/../scripts/build/install-clang.sh", + "${path.root}/../scripts/build/install-cmake.sh", + "${path.root}/../scripts/build/install-codeql-bundle.sh", + "${path.root}/../scripts/build/install-dotnetcore-sdk.sh", + "${path.root}/../scripts/build/install-gcc-compilers.sh", + "${path.root}/../scripts/build/install-gfortran.sh", + "${path.root}/../scripts/build/install-git.sh", + "${path.root}/../scripts/build/install-git-lfs.sh", + "${path.root}/../scripts/build/install-github-cli.sh", + "${path.root}/../scripts/build/install-google-chrome.sh", + "${path.root}/../scripts/build/install-haskell.sh", + "${path.root}/../scripts/build/install-java-tools.sh", + "${path.root}/../scripts/build/install-kubernetes-tools.sh", + "${path.root}/../scripts/build/install-miniconda.sh", + "${path.root}/../scripts/build/install-mysql.sh", + "${path.root}/../scripts/build/install-nginx.sh", + "${path.root}/../scripts/build/install-nodejs.sh", + "${path.root}/../scripts/build/install-php.sh", + "${path.root}/../scripts/build/install-postgresql.sh", + "${path.root}/../scripts/build/install-pulumi.sh", + "${path.root}/../scripts/build/install-ruby.sh", + "${path.root}/../scripts/build/install-rust.sh", + "${path.root}/../scripts/build/install-julia.sh", + "${path.root}/../scripts/build/install-selenium.sh", + "${path.root}/../scripts/build/install-vcpkg.sh", + "${path.root}/../scripts/build/configure-dpkg.sh", + "${path.root}/../scripts/build/install-yq.sh", + "${path.root}/../scripts/build/install-android-sdk.sh", + "${path.root}/../scripts/build/install-pypy.sh", + "${path.root}/../scripts/build/install-python.sh", + "${path.root}/../scripts/build/install-zstd.sh" + ] + } + + provisioner "shell" { + environment_vars = ["HELPER_SCRIPTS=${var.helper_script_folder}", "INSTALLER_SCRIPT_FOLDER=${var.installer_script_folder}", "DOCKERHUB_PULL_IMAGES=NO"] + execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" + scripts = ["${path.root}/../scripts/build/install-docker.sh"] + } + + provisioner "shell" { + environment_vars = ["HELPER_SCRIPTS=${var.helper_script_folder}", "INSTALLER_SCRIPT_FOLDER=${var.installer_script_folder}"] + execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" + scripts = ["${path.root}/../scripts/build/install-pipx-packages.sh"] + } + + provisioner "shell" { + environment_vars = ["HELPER_SCRIPTS=${var.helper_script_folder}", "DEBIAN_FRONTEND=noninteractive", "INSTALLER_SCRIPT_FOLDER=${var.installer_script_folder}"] + execute_command = "/bin/sh -c '{{ .Vars }} {{ .Path }}'" + scripts = ["${path.root}/../scripts/build/install-homebrew.sh"] + } + + provisioner "shell" { + environment_vars = ["HELPER_SCRIPTS=${var.helper_script_folder}"] + execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" + scripts = ["${path.root}/../scripts/build/configure-snap.sh"] + } + + provisioner "shell" { + execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" + expect_disconnect = true + inline = ["echo 'Reboot VM'", "sudo reboot"] + } + + provisioner "shell" { + execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" + pause_before = "1m0s" + scripts = ["${path.root}/../scripts/build/cleanup.sh"] + start_retry_timeout = "10m" + } + + provisioner "shell" { + environment_vars = ["IMAGE_VERSION=${var.image_version}", "INSTALLER_SCRIPT_FOLDER=${var.installer_script_folder}"] + inline = ["pwsh -File ${var.image_folder}/SoftwareReport/Generate-SoftwareReport.ps1 -OutputDirectory ${var.image_folder}", "pwsh -File ${var.image_folder}/tests/RunAll-Tests.ps1 -OutputDirectory ${var.image_folder}"] + } + + provisioner "file" { + destination = "${path.root}/../Ubuntu2404-Readme.md" + direction = "download" + source = "${var.image_folder}/software-report.md" + } + + provisioner "file" { + destination = "${path.root}/../software-report.json" + direction = "download" + source = "${var.image_folder}/software-report.json" + } + + provisioner "shell" { + environment_vars = ["HELPER_SCRIPT_FOLDER=${var.helper_script_folder}", "INSTALLER_SCRIPT_FOLDER=${var.installer_script_folder}", "IMAGE_FOLDER=${var.image_folder}"] + execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" + scripts = ["${path.root}/../scripts/build/configure-system.sh"] + } + + provisioner "shell" { + execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" + inline = ["sleep 30", "/usr/sbin/waagent -force -deprovision+user && export HISTSIZE=0 && sync"] + } + +} diff --git a/images/ubuntu/toolsets/toolset-2404.json b/images/ubuntu/toolsets/toolset-2404.json new file mode 100644 index 000000000000..43f00ea6f5e0 --- /dev/null +++ b/images/ubuntu/toolsets/toolset-2404.json @@ -0,0 +1,305 @@ +{ + "toolcache": [ + { + "name": "Python", + "url" : "https://raw.githubusercontent.com/actions/python-versions/main/versions-manifest.json", + "platform" : "linux", + "platform_version": "24.04", + "arch": "x64", + "versions": [] + }, + { + "name": "PyPy", + "arch": "x64", + "platform" : "linux", + "versions": [ + "3.9", + "3.10" + ] + }, + { + "name": "node", + "url" : "https://raw.githubusercontent.com/actions/node-versions/main/versions-manifest.json", + "platform" : "linux", + "arch": "x64", + "versions": [] + }, + { + "name": "go", + "url" : "https://raw.githubusercontent.com/actions/go-versions/main/versions-manifest.json", + "arch": "x64", + "platform" : "linux", + "versions": [], + "default": "*" + }, + { + "name": "Ruby", + "platform_version": "24.04", + "arch": "x64", + "versions": [] + }, + { + "name": "CodeQL", + "platform" : "linux", + "arch": "x64", + "versions": [ + "*" + ] + } + ], + "java": { + "maven": "3.8.8" + }, + "android": { + "cmdline-tools": "commandlinetools-linux-11076708_latest.zip", + "platform_min_version": "34", + "build_tools_min_version": "34.0.0", + "extra_list": [ + "android;m2repository", + "google;m2repository", + "google;google_play_services" + ], + "addon_list": [ + ], + "additional_tools": [ + ], + "ndk": { + "default": "26", + "versions": [ + "24", "25", "26" + ] + } + }, + "powershellModules": [ + {"name": "Microsoft.Graph"}, + {"name": "Pester"}, + {"name": "PSScriptAnalyzer"} + ], + "azureModules": [ + { + "name": "az", + "url" : "https://raw.githubusercontent.com/Azure/az-ps-module-versions/main/versions-manifest.json", + "versions": [ + "11.5.0" + ], + "zip_versions": [ + ] + } + ], + "apt": { + "vital_packages": [ + "bzip2", + "curl", + "g++", + "gcc", + "make", + "jq", + "tar", + "unzip", + "wget" + ], + "common_packages": [ + "autoconf", + "automake", + "dbus", + "dnsutils", + "dpkg", + "dpkg-dev", + "fakeroot", + "fonts-noto-color-emoji", + "gnupg2", + "iproute2", + "iputils-ping", + "libtool", + "libssl-dev", + "locales", + "mercurial", + "openssh-client", + "p7zip-rar", + "pkg-config", + "python-is-python3", + "rpm", + "texinfo", + "tk", + "tzdata", + "upx", + "xvfb", + "xz-utils", + "zsync" + ], + "cmd_packages": [ + "acl", + "aria2", + "binutils", + "bison", + "brotli", + "coreutils", + "file", + "findutils", + "flex", + "ftp", + "haveged", + "lz4", + "m4", + "mediainfo", + "netcat", + "net-tools", + "p7zip-full", + "parallel", + "patchelf", + "pigz", + "pollinate", + "rsync", + "shellcheck", + "sphinxsearch", + "sqlite3", + "ssh", + "sshpass", + "sudo", + "swig", + "telnet", + "time", + "zip" + ] + }, + "brew": [ + ], + "docker": { + "images": [ + ], + "components": [ + { + "package": "containerd.io", + "version": "latest" + }, + { + "package": "docker-ce-cli", + "version": "26.1.0" + }, + { + "package": "docker-ce", + "version": "26.1.0" + } + ], + "plugins": [ + { + "plugin": "buildx", + "version": "latest", + "asset": "linux-amd64" + }, + { + "plugin": "compose", + "version": "latest", + "asset": "linux-x86_64" + } + ] + }, + "pipx": [ + { + "package": "yamllint", + "cmd": "yamllint" + }, + { + "package": "ansible-core", + "cmd": "ansible" + } + ], + "dotnet": { + "aptPackages": [ + "dotnet-sdk-8.0" + ], + "versions": [ + "8.0" + ], + "tools": [ + { "name": "nbgv", "test": "nbgv --version", "getversion" : "nbgv --version" } + ] + }, + "clang": { + "versions": [ + "16", + "17", + "18" + ], + "default_version": "17" + }, + "gcc": { + "versions": [ + "g++-12", + "g++-13", + "g++-14" + ] + }, + "gfortran": { + "versions": [ + "gfortran-12", + "gfortran-13", + "gfortran-14" + ] + }, + "php": { + "versions": [ + "8.3" + ] + }, + "rubygems": [ + {"name": "fastlane"} + ], + "selenium": { + "version": "4" + }, + "node": { + "default": "20" + }, + "node_modules": [ + { + "name": "grunt", + "command": "grunt" + }, + { + "name": "gulp", + "command": "gulp" + }, + { + "name": "n", + "command": "n" + }, + { + "name": "parcel", + "command": "parcel" + }, + { + "name": "typescript", + "command": "tsc" + }, + { + "name": "newman", + "command": "newman" + }, + { + "name": "webpack", + "command": "webpack" + }, + { + "name": "webpack-cli", + "command": "webpack-cli" + }, + { + "name": "lerna", + "command": "lerna" + }, + { + "name": "yarn", + "command": "yarn" + } + ], + "mongodb": { + "version": "7.0" + }, + "postgresql": { + "version": "16" + }, + "pwsh": { + "version": "7.4" + } +} From 18e4b97a5fb5d1ce73e42777fe062d5eb20f27d3 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Mon, 29 Apr 2024 13:37:31 +0200 Subject: [PATCH 2806/3485] [Ubuntu] include Erlang only in ubuntu2004 (#9762) --- images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 b/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 index 0d759ed95ce7..5816d773fc3f 100644 --- a/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 +++ b/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 @@ -41,7 +41,7 @@ $languageAndRuntime.AddToolVersionsListInline("Clang", $(Get-ClangToolVersions - $languageAndRuntime.AddToolVersionsListInline("Clang-format", $(Get-ClangToolVersions -ToolName "clang-format"), "^\d+") $languageAndRuntime.AddToolVersionsListInline("Clang-tidy", $(Get-ClangTidyVersions), "^\d+") $languageAndRuntime.AddToolVersion("Dash", $(Get-DashVersion)) -if ((Test-IsUbuntu20) -or (Test-IsUbuntu22)) { +if (Test-IsUbuntu20) { $languageAndRuntime.AddToolVersion("Erlang", $(Get-ErlangVersion)) $languageAndRuntime.AddToolVersion("Erlang rebar3", $(Get-ErlangRebar3Version)) } From c109ec4c0f8f7c72c01c8d4a2a436fa1f362ea71 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Mon, 29 Apr 2024 15:51:16 +0200 Subject: [PATCH 2807/3485] Update README.md (#9764) --- README.md | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/README.md b/README.md index 323e2d506568..74f3db23032d 100644 --- a/README.md +++ b/README.md @@ -81,11 +81,6 @@ GitHub Actions and Azure DevOps use the `-latest` YAML label (ex: `ubuntu-latest The `-latest` migration process is gradual and happens over 1-2 months in order to allow customers to adapt their workflows to the newest OS version. During this process, any workflow using the `-latest` label, may see changes in the OS version in their workflows or pipelines. To avoid unwanted migration, users can specify a specific OS version in the yaml file (ex: macos-12, windows-2022, ubuntu-22.04). -#### Planned & ongoing migration(s) - -We are currently in the process of `macos-14` to `macos-latest` migration, details can be found [here](https://github.blog/changelog/2024-04-01-macos-14-sonoma-is-generally-available-and-the-latest-macos-runner-image). - - ## Image Releases *How to best follow along with changes* @@ -132,7 +127,7 @@ We use third-party package managers to install software during the image generat | Operating system | Package manager | Third-party repos and packages | | :--- | :---: | ---: | -| Ubuntu | [APT](https://wiki.debian.org/Apt) | [containers](https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) (Ubuntu 20 only) <br/> [docker](https://download.docker.com/linux/ubuntu) <br/> [Eclipse-Temurin (Adoptium)](https://packages.adoptium.net/artifactory/deb/) <br/> [Erlang](https://packages.erlang-solutions.com/ubuntu) <br/> [Firefox](http://ppa.launchpad.net/mozillateam/ppa/ubuntu) <br/> [gcc, gfortran](https://launchpad.net/~ubuntu-toolchain-r/+archive/ubuntu/test) <br/> [git-lfs](https://packagecloud.io/install/repositories/github/git-lfs) <br/> [git](https://launchpad.net/~git-core/+archive/ubuntu/ppa) <br/> [Google Cloud CLI](https://packages.cloud.google.com/apt) <br/> [Heroku](https://cli-assets.heroku.com/channels/stable/apt) <br/> [HHvm](https://dl.hhvm.com/ubuntu) <br/> [MongoDB](https://repo.mongodb.org/apt/ubuntu) <br/> [Mono](https://download.mono-project.com/repo/ubuntu) <br/> [MS Edge](https://packages.microsoft.com/repos/edge) <br/> [PostgreSQL](https://apt.postgresql.org/pub/repos/apt/) <br/> [R](https://cloud.r-project.org/bin/linux/ubuntu) | +| Ubuntu | [APT](https://wiki.debian.org/Apt) | [containers](https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable) (Ubuntu 20 only) <br/> [docker](https://download.docker.com/linux/ubuntu) (Ubuntu20 0nly) <br/> [Eclipse-Temurin (Adoptium)](https://packages.adoptium.net/artifactory/deb/) <br/> [Erlang](https://packages.erlang-solutions.com/ubuntu) <br/> [Firefox](http://ppa.launchpad.net/mozillateam/ppa/ubuntu) <br/> [git-lfs](https://packagecloud.io/install/repositories/github/git-lfs) <br/> [git](https://launchpad.net/~git-core/+archive/ubuntu/ppa) <br/> [Google Cloud CLI](https://packages.cloud.google.com/apt) <br/> [Heroku](https://cli-assets.heroku.com/channels/stable/apt) <br/> [HHvm](https://dl.hhvm.com/ubuntu) <br/> [MongoDB](https://repo.mongodb.org/apt/ubuntu) <br/> [Mono](https://download.mono-project.com/repo/ubuntu) <br/> [MS Edge](https://packages.microsoft.com/repos/edge) <br/> [PostgreSQL](https://apt.postgresql.org/pub/repos/apt/) <br/> [R](https://cloud.r-project.org/bin/linux/ubuntu) | | | [pipx](https://pypa.github.io/pipx) | ansible-core <br/>yamllint | | Windows | [Chocolatey](https://chocolatey.org) | No third-party repos installed | | macOS | [Homebrew](https://brew.sh) | [aws-cli v2](https://github.com/aws/homebrew-tap) </br> [azure/bicep](https://github.com/Azure/homebrew-bicep) </br> [mongodb/brew](https://github.com/mongodb/homebrew-brew) | From 877807370206567253a2fbc0b76f95b5e69d85cc Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Mon, 29 Apr 2024 16:10:45 +0200 Subject: [PATCH 2808/3485] [Ubuntu] remove toolchain test repo (#9763) --- images/ubuntu/scripts/build/install-gcc-compilers.sh | 7 ------- images/ubuntu/scripts/build/install-gfortran.sh | 7 ------- images/ubuntu/toolsets/toolset-2204.json | 6 ++---- 3 files changed, 2 insertions(+), 18 deletions(-) diff --git a/images/ubuntu/scripts/build/install-gcc-compilers.sh b/images/ubuntu/scripts/build/install-gcc-compilers.sh index ac0b91909c19..642b80dfd442 100644 --- a/images/ubuntu/scripts/build/install-gcc-compilers.sh +++ b/images/ubuntu/scripts/build/install-gcc-compilers.sh @@ -5,15 +5,8 @@ ################################################################################ # Source the helpers for use with the script -source $HELPER_SCRIPTS/os.sh source $HELPER_SCRIPTS/install.sh -# Install GNU C++ compiler -if ! is_ubuntu24 ; then - add-apt-repository ppa:ubuntu-toolchain-r/test -y - apt-get update -y -fi - versions=$(get_toolset_value '.gcc.versions[]') for version in ${versions[*]}; do diff --git a/images/ubuntu/scripts/build/install-gfortran.sh b/images/ubuntu/scripts/build/install-gfortran.sh index fe2e16c15157..78d3d23a7ced 100644 --- a/images/ubuntu/scripts/build/install-gfortran.sh +++ b/images/ubuntu/scripts/build/install-gfortran.sh @@ -6,13 +6,6 @@ # Source the helpers for use with the script source $HELPER_SCRIPTS/install.sh -source $HELPER_SCRIPTS/os.sh - -# Install GNU Fortran compiler -if ! is_ubuntu24 ; then - add-apt-repository ppa:ubuntu-toolchain-r/test -y - apt-get update -y -fi versions=$(get_toolset_value '.gfortran.versions[]') diff --git a/images/ubuntu/toolsets/toolset-2204.json b/images/ubuntu/toolsets/toolset-2204.json index b36e575a2fd7..60c7997a9974 100644 --- a/images/ubuntu/toolsets/toolset-2204.json +++ b/images/ubuntu/toolsets/toolset-2204.json @@ -292,16 +292,14 @@ "versions": [ "g++-9", "g++-10", - "g++-12", - "g++-13" + "g++-12" ] }, "gfortran": { "versions": [ "gfortran-9", "gfortran-10", - "gfortran-12", - "gfortran-13" + "gfortran-12" ] }, "php": { From 6467c6dfc24084b01e38a45bc627775d0749cd76 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Wed, 1 May 2024 22:11:11 +0200 Subject: [PATCH 2809/3485] [Ubuntu] fix pester tests to include ubuntu22 back (#9775) --- images/ubuntu/scripts/tests/Tools.Tests.ps1 | 26 ++++++++++----------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/images/ubuntu/scripts/tests/Tools.Tests.ps1 b/images/ubuntu/scripts/tests/Tools.Tests.ps1 index 0060b08de311..5db3e74d3890 100644 --- a/images/ubuntu/scripts/tests/Tools.Tests.ps1 +++ b/images/ubuntu/scripts/tests/Tools.Tests.ps1 @@ -106,7 +106,7 @@ Describe "Docker images" { } } -Describe "Docker-compose v1" -Skip:((-not (Test-IsUbuntu20)) -and (-not (Test-IsUbuntu20))) { +Describe "Docker-compose v1" -Skip:((-not (Test-IsUbuntu20)) -and (-not (Test-IsUbuntu22))) { It "docker-compose" { "docker-compose --version"| Should -ReturnZeroExitCode } @@ -118,7 +118,7 @@ Describe "Ansible" { } } -Describe "Bazel" -Skip:((-not (Test-IsUbuntu20)) -and (-not (Test-IsUbuntu20))) { +Describe "Bazel" -Skip:((-not (Test-IsUbuntu20)) -and (-not (Test-IsUbuntu22))) { It "<ToolName>" -TestCases @( @{ ToolName = "bazel" } @{ ToolName = "bazelisk" } @@ -183,25 +183,25 @@ Describe "Mono" -Skip:(Test-IsUbuntu24) { } } -Describe "MSSQLCommandLineTools" -Skip:((-not (Test-IsUbuntu20)) -and (-not (Test-IsUbuntu20))) { +Describe "MSSQLCommandLineTools" -Skip:((-not (Test-IsUbuntu20)) -and (-not (Test-IsUbuntu22))) { It "sqlcmd" { "sqlcmd -?" | Should -ReturnZeroExitCode } } -Describe "SqlPackage" -Skip:((-not (Test-IsUbuntu20)) -and (-not (Test-IsUbuntu20))) { +Describe "SqlPackage" -Skip:((-not (Test-IsUbuntu20)) -and (-not (Test-IsUbuntu22))) { It "sqlpackage" { "sqlpackage /version" | Should -ReturnZeroExitCode } } -Describe "R" -Skip:((-not (Test-IsUbuntu20)) -and (-not (Test-IsUbuntu20))) { +Describe "R" -Skip:((-not (Test-IsUbuntu20)) -and (-not (Test-IsUbuntu22))) { It "r" { "R --version" | Should -ReturnZeroExitCode } } -Describe "Sbt" -Skip:((-not (Test-IsUbuntu20)) -and (-not (Test-IsUbuntu20))) { +Describe "Sbt" -Skip:((-not (Test-IsUbuntu20)) -and (-not (Test-IsUbuntu22))) { It "sbt" { "sbt --version" | Should -ReturnZeroExitCode } @@ -214,7 +214,7 @@ Describe "Selenium" { } } -Describe "Terraform" -Skip:((-not (Test-IsUbuntu20)) -and (-not (Test-IsUbuntu20))) { +Describe "Terraform" -Skip:((-not (Test-IsUbuntu20)) -and (-not (Test-IsUbuntu22))) { It "terraform" { "terraform --version" | Should -ReturnZeroExitCode } @@ -252,7 +252,7 @@ Describe "Git-lfs" { } } -Describe "Heroku" -Skip:((-not (Test-IsUbuntu20)) -and (-not (Test-IsUbuntu20))) { +Describe "Heroku" -Skip:((-not (Test-IsUbuntu20)) -and (-not (Test-IsUbuntu22))) { It "heroku" { "heroku --version" | Should -ReturnZeroExitCode } @@ -298,7 +298,7 @@ Describe "Kubernetes tools" { } } -Describe "Leiningen" -Skip:((-not (Test-IsUbuntu20)) -and (-not (Test-IsUbuntu20))) { +Describe "Leiningen" -Skip:((-not (Test-IsUbuntu20)) -and (-not (Test-IsUbuntu22))) { It "leiningen" { "lein --version" | Should -ReturnZeroExitCode } @@ -310,7 +310,7 @@ Describe "Conda" { } } -Describe "Packer" -Skip:((-not (Test-IsUbuntu20)) -and (-not (Test-IsUbuntu20))) { +Describe "Packer" -Skip:((-not (Test-IsUbuntu20)) -and (-not (Test-IsUbuntu22))) { It "packer" { "packer --version" | Should -ReturnZeroExitCode } @@ -329,7 +329,7 @@ Describe "Phantomjs" -Skip:(-not (Test-IsUbuntu20)) { } } -Describe "Containers" -Skip:((-not (Test-IsUbuntu20)) -and (-not (Test-IsUbuntu20))) { +Describe "Containers" -Skip:((-not (Test-IsUbuntu20)) -and (-not (Test-IsUbuntu22))) { $testCases = @("podman", "buildah", "skopeo") | ForEach-Object { @{ContainerCommand = $_} } It "<ContainerCommand>" -TestCases $testCases { @@ -345,7 +345,7 @@ Describe "Containers" -Skip:((-not (Test-IsUbuntu20)) -and (-not (Test-IsUbuntu2 } -Describe "nvm" -Skip:((-not (Test-IsUbuntu20)) -and (-not (Test-IsUbuntu20))) { +Describe "nvm" -Skip:((-not (Test-IsUbuntu20)) -and (-not (Test-IsUbuntu22))) { It "nvm" { "source /etc/skel/.nvm/nvm.sh && nvm --version" | Should -ReturnZeroExitCode } @@ -381,7 +381,7 @@ Describe "yq" { } } -Describe "Kotlin" -Skip:((-not (Test-IsUbuntu20)) -and (-not (Test-IsUbuntu20))) { +Describe "Kotlin" -Skip:((-not (Test-IsUbuntu20)) -and (-not (Test-IsUbuntu22))) { It "kapt" { "kapt -version" | Should -ReturnZeroExitCode } From 9e048184f96ae40344bbb302949ca0c725238ec5 Mon Sep 17 00:00:00 2001 From: AM <mundewal@gmail.com> Date: Thu, 2 May 2024 11:49:32 +0200 Subject: [PATCH 2810/3485] Azurecli Expected signature updated (#9772) Co-authored-by: AMundewal <abhishek.mundewal@forcam.com> --- images/windows/scripts/build/Install-AzureCli.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/windows/scripts/build/Install-AzureCli.ps1 b/images/windows/scripts/build/Install-AzureCli.ps1 index 35fdc478229a..47a24319bf4d 100644 --- a/images/windows/scripts/build/Install-AzureCli.ps1 +++ b/images/windows/scripts/build/Install-AzureCli.ps1 @@ -15,7 +15,7 @@ New-Item -ItemType 'Directory' -Path $azureCliExtensionPath | Out-Null Install-Binary -Type MSI ` -Url 'https://aka.ms/installazurecliwindowsx64' ` - -ExpectedSignature 'F9A7CF9FBE13BAC767F4781061332DA6E8B4E0EE' + -ExpectedSignature 'C2048FB509F1C37A8C3E9EC6648118458AA01780' Update-Environment From 7bb1d84f7071bfa9c350d7552d9631d9a69bfdb0 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Thu, 2 May 2024 11:50:55 +0200 Subject: [PATCH 2811/3485] Add Ubuntu24 initial readme (#9776) --- images/ubuntu/Ubuntu2404-Readme.md | 264 +++++++++++++++++++++++++++++ 1 file changed, 264 insertions(+) create mode 100644 images/ubuntu/Ubuntu2404-Readme.md diff --git a/images/ubuntu/Ubuntu2404-Readme.md b/images/ubuntu/Ubuntu2404-Readme.md new file mode 100644 index 000000000000..5f23e95d47f3 --- /dev/null +++ b/images/ubuntu/Ubuntu2404-Readme.md @@ -0,0 +1,264 @@ +# Ubuntu 24.04 LTS +- OS Version: 24.04 LTS +- Kernel Version: 6.8.0-1007-azure +- Image Version: 20240430.1.0 +- Systemd version: 255.4-1ubuntu8 + +## Installed Software + +### Language and Runtime +- Bash 5.2.21(1)-release +- Clang: 16.0.6, 17.0.6, 18.1.3 +- Clang-format: 16.0.6, 17.0.6, 18.1.3 +- Clang-tidy: 16.0.6, 17.0.6, 18.1.3 +- Dash 0.5.12-6ubuntu5 +- GNU C++: 12.3.0, 13.2.0, 14.0.1 +- GNU Fortran: 12.3.0, 13.2.0, 14.0.1 +- Julia 1.10.3 +- Node.js 20.12.2 +- Perl 5.38.2 +- Python 3.12.3 +- Ruby 3.2.3 + +### Package Management +- cpan 1.64 +- Helm 3.14.4 +- Homebrew 4.2.20 +- Miniconda 24.3.0 +- Npm 10.5.0 +- Pip 24.0 +- Pip3 24.0 +- Pipx 1.4.3 +- RubyGems 3.4.20 +- Vcpkg (build from commit c591ac646) +- Yarn 1.22.22 + +#### Environment variables +| Name | Value | +| ----------------------- | ---------------------- | +| CONDA | /usr/share/miniconda | +| VCPKG_INSTALLATION_ROOT | /usr/local/share/vcpkg | + +#### Homebrew note +``` +Location: /home/linuxbrew +Note: Homebrew is pre-installed on image but not added to PATH. +run the eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)" command +to accomplish this. +``` + +### Project Management +- Ant 1.10.14 +- Gradle 8.7 +- Lerna 8.1.2 +- Maven 3.8.8 + +### Tools +- Ansible 2.16.6 +- apt-fast 1.10.0 +- AzCopy 10.24.0 - available by `azcopy` and `azcopy10` aliases +- Bicep 0.26.170 +- CMake 3.29.2 +- CodeQL Action Bundle 2.17.1 +- Docker Amazon ECR Credential Helper 0.7.1 +- Docker Compose v2 2.27.0 +- Docker-Buildx 0.14.0 +- Docker Client 26.1.0 +- Docker Server 26.1.0 +- Git 2.43.2 +- Git LFS 3.5.1 +- Git-ftp 1.6.0 +- Haveged 1.9.14 +- jq 1.7 +- Kind 0.22.0 +- Kubectl 1.30.0 +- Kustomize 5.4.1 +- MediaInfo 24.01 +- Mercurial 6.7.2 +- Minikube 1.33.0 +- n 9.2.3 +- Newman 6.1.2 +- OpenSSL 3.0.13-0ubuntu3 +- Parcel 2.12.0 +- Pulumi 3.114.0 +- Sphinx Open Source Search Server 2.2.11 +- yamllint 1.35.1 +- yq 4.43.1 +- zstd 1.5.6 + +### CLI Tools +- AWS CLI 2.15.42 +- AWS CLI Session Manager Plugin 1.2.553.0 +- AWS SAM CLI 1.116.0 +- Azure CLI 2.60.0 +- Azure CLI (azure-devops) 1.0.0 +- GitHub CLI 2.49.0 + +### PHP Tools +- PHP: 8.3.6 +- Composer 2.7.4 +- PHPUnit 8.5.38 +``` +Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. +``` + +### Haskell Tools +- Cabal 3.10.3.0 +- GHC 9.8.2 +- GHCup 0.1.22.0 +- Stack 2.15.5 + +### Rust Tools +- Cargo 1.77.2 +- Rust 1.77.2 +- Rustdoc 1.77.2 +- Rustup 1.27.0 + +#### Packages +- Rustfmt 1.7.0 + +### Browsers and Drivers +- Google Chrome 124.0.6367.118 +- ChromeDriver 124.0.6367.91 +- Chromium 124.0.6367.0 +- Selenium server 4.20.0 + +#### Environment variables +| Name | Value | +| ----------------- | ------------------------------------- | +| CHROMEWEBDRIVER | /usr/local/share/chromedriver-linux64 | +| EDGEWEBDRIVER | | +| GECKOWEBDRIVER | | +| SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | + +### .NET Tools +- .NET Core SDK: 8.0.104 +- nbgv 3.6.133+2d32d93cb1 + +### Databases +- sqlite3 3.45.1 + +#### PostgreSQL +- PostgreSQL 16.2 +``` +User: postgres +PostgreSQL service is disabled by default. +Use the following command as a part of your job to start the service: 'sudo systemctl start postgresql.service' +``` + +#### MySQL +- MySQL 8.0.36-2ubuntu3 +``` +User: root +Password: root +MySQL service is disabled by default. +Use the following command as a part of your job to start the service: 'sudo systemctl start mysql.service' +``` + +### PowerShell Tools +- PowerShell 7.4.2 + +#### PowerShell Modules +- Az: 11.5.0 +- Microsoft.Graph: 2.18.0 +- Pester: 5.5.0 +- PSScriptAnalyzer: 1.22.0 + +### Web Servers +| Name | Version | ConfigFile | ServiceStatus | ListenPort | +| ------- | ------- | ------------------------- | ------------- | ---------- | +| apache2 | 2.4.58 | /etc/apache2/apache2.conf | inactive | 80 | +| nginx | 1.24.0 | /etc/nginx/nginx.conf | inactive | 80 | + +### Android +| Package Name | Version | +| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 12.0 | +| Android SDK Build-tools | 34.0.0 | +| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1) | +| Android Support Repository | 47.0.0 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 24.0.8215888<br>25.2.9519653<br>26.3.11579264 (default) | + +#### Environment variables +| Name | Value | +| ----------------------- | -------------------------------------------- | +| ANDROID_HOME | /usr/local/lib/android/sdk | +| ANDROID_NDK | /usr/local/lib/android/sdk/ndk/26.3.11579264 | +| ANDROID_NDK_HOME | /usr/local/lib/android/sdk/ndk/26.3.11579264 | +| ANDROID_NDK_LATEST_HOME | /usr/local/lib/android/sdk/ndk/26.3.11579264 | +| ANDROID_NDK_ROOT | /usr/local/lib/android/sdk/ndk/26.3.11579264 | +| ANDROID_SDK_ROOT | /usr/local/lib/android/sdk | + +### Installed apt packages +| Name | Version | +| ---------------------- | --------------------- | +| acl | 2.3.2-1build1 | +| aria2 | 1.37.0+debian-1build3 | +| autoconf | 2.71-3 | +| automake | 1:1.16.5-1.3ubuntu1 | +| binutils | 2.42-4ubuntu2 | +| bison | 2:3.8.2+dfsg-1build2 | +| brotli | 1.1.0-2build2 | +| bzip2 | 1.0.8-5.1 | +| coreutils | 9.4-3ubuntu6 | +| curl | 8.5.0-2ubuntu10.1 | +| dbus | 1.14.10-4ubuntu4 | +| dnsutils | 1:9.18.24-0ubuntu5 | +| dpkg | 1.22.6ubuntu6 | +| dpkg-dev | 1.22.6ubuntu6 | +| fakeroot | 1.33-1 | +| file | 1:5.45-3build1 | +| findutils | 4.9.0-5build1 | +| flex | 2.6.4-8.2build1 | +| fonts-noto-color-emoji | 2.042-1 | +| ftp | 20230507-2build3 | +| g++ | 4:13.2.0-7ubuntu1 | +| gcc | 4:13.2.0-7ubuntu1 | +| gnupg2 | 2.4.4-2ubuntu17 | +| haveged | 1.9.14-1ubuntu2 | +| iproute2 | 6.1.0-1ubuntu6 | +| iputils-ping | 3:20240117-1build1 | +| jq | 1.7.1-3build1 | +| libssl-dev | 3.0.13-0ubuntu3 | +| libtool | 2.4.7-7build1 | +| locales | 2.39-0ubuntu8.1 | +| lz4 | 1.9.4-1build1 | +| m4 | 1.4.19-4build1 | +| make | 4.3-4.1build2 | +| mediainfo | 24.01.1-1build2 | +| mercurial | 6.7.2-1ubuntu2 | +| net-tools | 2.10-0.1ubuntu4 | +| netcat | 1.226-1ubuntu2 | +| openssh-client | 1:9.6p1-3ubuntu13 | +| p7zip-full | 16.02+transitional.1 | +| p7zip-rar | 16.02+transitional.1 | +| parallel | 20231122+ds-1 | +| patchelf | 0.18.0-1.1build1 | +| pigz | 2.8-1 | +| pkg-config | 1.8.1-2build1 | +| pollinate | 4.33-3.1ubuntu1 | +| python-is-python3 | 3.11.4-1 | +| rpm | 4.18.2+dfsg-2.1build2 | +| rsync | 3.2.7-1ubuntu1 | +| shellcheck | 0.9.0-1 | +| sphinxsearch | 2.2.11-8build1 | +| sqlite3 | 3.45.1-1ubuntu2 | +| ssh | 1:9.6p1-3ubuntu13 | +| sshpass | 1.09-1 | +| sudo | 1.9.15p5-3ubuntu5 | +| swig | 4.2.0-2ubuntu1 | +| tar | 1.35+dfsg-3build1 | +| telnet | 0.17+2.5-3ubuntu4 | +| texinfo | 7.1-3build2 | +| time | 1.9-0.2build1 | +| tk | 8.6.14build1 | +| tzdata | 2024a-2ubuntu1 | +| unzip | 6.0-28ubuntu4 | +| upx | 4.2.2-3 | +| wget | 1.21.4-1ubuntu4 | +| xvfb | 2:21.1.12-1ubuntu1 | +| xz-utils | 5.6.1+really5.4.5-1 | +| zip | 3.0-13build1 | +| zsync | 0.6.2-5build1 | From 79f002fc2a5084cacf362e1995f5241cb488d09b Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Mon, 6 May 2024 16:33:10 +0200 Subject: [PATCH 2812/3485] Update README.md (add 24.04 badge) (#9793) --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 74f3db23032d..e5c51259f8fc 100644 --- a/README.md +++ b/README.md @@ -21,6 +21,7 @@ To build a VM machine from this repo's source, see the [instructions](docs/creat | Image | YAML Label | Included Software | Rollout Status of Latest Image Release | | --------------------|---------------------|--------------------|--------------------| +| Ubuntu 24.04 | `ubuntu-24.04` | [ubuntu-24.04] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fmikhailkoliada%2F35b243dd6e217d041fe3dfa5b4e2e2ed%2Fraw%2Fubuntu24.json) | | Ubuntu 22.04 | `ubuntu-latest` or `ubuntu-22.04` | [ubuntu-22.04] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fmikhailkoliada%2F35b243dd6e217d041fe3dfa5b4e2e2ed%2Fraw%2Fubuntu22.json) | | Ubuntu 20.04 | `ubuntu-20.04` | [ubuntu-20.04] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fmikhailkoliada%2F35b243dd6e217d041fe3dfa5b4e2e2ed%2Fraw%2Fubuntu20.json) | | macOS 14 | `macos-latest-large` or `macos-14-large`| [macOS-14] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fmikhailkoliada%2F35b243dd6e217d041fe3dfa5b4e2e2ed%2Fraw%2Fmacos-14.json) | @@ -37,6 +38,7 @@ To build a VM machine from this repo's source, see the [instructions](docs/creat - In general the `-latest` label is used for the latest OS image version that is GA - Before moving the`-latest` label to a new OS version we will announce the change and give sufficient lead time for users to update their workflows +[ubuntu-24.04]: https://github.com/actions/runner-images/blob/main/images/ubuntu/Ubuntu2404-Readme.md [ubuntu-22.04]: https://github.com/actions/runner-images/blob/main/images/ubuntu/Ubuntu2204-Readme.md [ubuntu-20.04]: https://github.com/actions/runner-images/blob/main/images/ubuntu/Ubuntu2004-Readme.md [windows-2022]: https://github.com/actions/runner-images/blob/main/images/windows/Windows2022-Readme.md From fba89949a39aaf2e721432031fb02c2b34509055 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Tue, 7 May 2024 10:41:49 +0200 Subject: [PATCH 2813/3485] [Ubuntu] do not wrap apt-fast in mock script (#9794) --- images/ubuntu/scripts/build/cleanup.sh | 2 +- images/ubuntu/scripts/build/configure-apt-mock.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/images/ubuntu/scripts/build/cleanup.sh b/images/ubuntu/scripts/build/cleanup.sh index d0fa9a0e6e01..17c7ccc3f6fa 100644 --- a/images/ubuntu/scripts/build/cleanup.sh +++ b/images/ubuntu/scripts/build/cleanup.sh @@ -31,7 +31,7 @@ rm -f /usr/local/bin/invoke_tests # remove apt mock prefix=/usr/local/bin -for tool in apt apt-get apt-fast apt-key;do +for tool in apt apt-get apt-key;do sudo rm -f $prefix/$tool done diff --git a/images/ubuntu/scripts/build/configure-apt-mock.sh b/images/ubuntu/scripts/build/configure-apt-mock.sh index e12b0f56d13b..ece6b890d3be 100644 --- a/images/ubuntu/scripts/build/configure-apt-mock.sh +++ b/images/ubuntu/scripts/build/configure-apt-mock.sh @@ -2,12 +2,12 @@ ################################################################################ ## File: configure-apt-mock.sh ## Desc: A temporary workaround for https://github.com/Azure/azure-linux-extensions/issues/1238. -## Cleaned up during configure-cleanup.sh. +## Cleaned up during cleanup.sh. ################################################################################ prefix=/usr/local/bin -for real_tool in /usr/bin/apt /usr/bin/apt-get /usr/bin/apt-fast /usr/bin/apt-key; do +for real_tool in /usr/bin/apt /usr/bin/apt-get /usr/bin/apt-key; do tool=$(basename $real_tool) cat >$prefix/$tool <<EOT #!/bin/sh From 71da12569d6608f584c073f83ff58533c79ca4cd Mon Sep 17 00:00:00 2001 From: sergei-pyshnoi <121864472+sergei-pyshnoi@users.noreply.github.com> Date: Tue, 7 May 2024 12:11:46 +0200 Subject: [PATCH 2814/3485] change PIPX_HOME for arm64 (#9711) --- images/macos/scripts/build/install-python.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/macos/scripts/build/install-python.sh b/images/macos/scripts/build/install-python.sh index edc6f11ca366..061c8ccd7a50 100644 --- a/images/macos/scripts/build/install-python.sh +++ b/images/macos/scripts/build/install-python.sh @@ -44,7 +44,7 @@ echo "Installing pipx" if is_Arm64; then export PIPX_BIN_DIR="$HOME/.local/bin" - export PIPX_HOME="$HOME/Library/Application\ Support/pipx" + export PIPX_HOME="$HOME/.local/pipx" else export PIPX_BIN_DIR=/usr/local/opt/pipx_bin export PIPX_HOME=/usr/local/opt/pipx From 584c7c0fef943495221b46033addefb6419ecb0f Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Tue, 7 May 2024 18:55:40 +0200 Subject: [PATCH 2815/3485] [macos] Add python 3.9, 3.10 to toolcache (#9803) --- images/macos/toolsets/toolset-13.json | 2 ++ images/macos/toolsets/toolset-14.json | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/images/macos/toolsets/toolset-13.json b/images/macos/toolsets/toolset-13.json index ff00f9ad7894..70e6c198a4f3 100644 --- a/images/macos/toolsets/toolset-13.json +++ b/images/macos/toolsets/toolset-13.json @@ -134,6 +134,8 @@ }, "arm64": { "versions": [ + "3.9.*", + "3.10.*", "3.11.*", "3.12.*" ] diff --git a/images/macos/toolsets/toolset-14.json b/images/macos/toolsets/toolset-14.json index d7d602831625..d26481465cce 100644 --- a/images/macos/toolsets/toolset-14.json +++ b/images/macos/toolsets/toolset-14.json @@ -125,12 +125,16 @@ "arch": { "x64": { "versions": [ + "3.9.*", + "3.10.*", "3.11.*", "3.12.*" ] }, "arm64": { "versions": [ + "3.9.*", + "3.10.*", "3.11.*", "3.12.*" ] From 7781af869bec02d4d491cba6d01de412e96d865d Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Wed, 8 May 2024 11:33:11 +0200 Subject: [PATCH 2816/3485] [Ubuntu] Add Go and Node to the toolcache on 24.04 (#9806) --- .../scripts/docs-gen/Generate-SoftwareReport.ps1 | 14 +++++++------- images/ubuntu/scripts/tests/Toolset.Tests.ps1 | 2 +- images/ubuntu/templates/ubuntu-24.04.pkr.hcl | 6 ++++++ images/ubuntu/toolsets/toolset-2404.json | 14 +++++++++++--- 4 files changed, 25 insertions(+), 11 deletions(-) diff --git a/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 b/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 index 5816d773fc3f..bb3569940e08 100644 --- a/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 +++ b/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 @@ -120,9 +120,7 @@ $tools.AddToolVersion("Docker Compose v2", $(Get-DockerComposeV2Version)) $tools.AddToolVersion("Docker-Buildx", $(Get-DockerBuildxVersion)) $tools.AddToolVersion("Docker Client", $(Get-DockerClientVersion)) $tools.AddToolVersion("Docker Server", $(Get-DockerServerVersion)) -if ((Test-IsUbuntu20) -or (Test-IsUbuntu22)) { - $tools.AddToolVersion("Fastlane", $(Get-FastlaneVersion)) -} +$tools.AddToolVersion("Fastlane", $(Get-FastlaneVersion)) $tools.AddToolVersion("Git", $(Get-GitVersion)) $tools.AddToolVersion("Git LFS", $(Get-GitLFSVersion)) $tools.AddToolVersion("Git-ftp", $(Get-GitFTPVersion)) @@ -266,12 +264,14 @@ if (-not $(Test-IsUbuntu24)) { } # Cached Tools +$cachedTools = $installedSoftware.AddHeader("Cached Tools") +$cachedTools.AddToolVersionsList("Go", $(Get-ToolcacheGoVersions), "^\d+\.\d+") +$cachedTools.AddToolVersionsList("Node.js", $(Get-ToolcacheNodeVersions), "^\d+") if (-not $(Test-IsUbuntu24)) { - $cachedTools = $installedSoftware.AddHeader("Cached Tools") - $cachedTools.AddToolVersionsList("Go", $(Get-ToolcacheGoVersions), "^\d+\.\d+") - $cachedTools.AddToolVersionsList("Node.js", $(Get-ToolcacheNodeVersions), "^\d+") $cachedTools.AddToolVersionsList("Python", $(Get-ToolcachePythonVersions), "^\d+\.\d+") - $cachedTools.AddToolVersionsList("PyPy", $(Get-ToolcachePyPyVersions), "^\d+\.\d+") +} +$cachedTools.AddToolVersionsList("PyPy", $(Get-ToolcachePyPyVersions), "^\d+\.\d+") +if (-not $(Test-IsUbuntu24)) { $cachedTools.AddToolVersionsList("Ruby", $(Get-ToolcacheRubyVersions), "^\d+\.\d+") } diff --git a/images/ubuntu/scripts/tests/Toolset.Tests.ps1 b/images/ubuntu/scripts/tests/Toolset.Tests.ps1 index fef615c708e4..488bb42aeb95 100644 --- a/images/ubuntu/scripts/tests/Toolset.Tests.ps1 +++ b/images/ubuntu/scripts/tests/Toolset.Tests.ps1 @@ -1,4 +1,4 @@ -Describe "Toolset" -Skip:((-not (Test-IsUbuntu20)) -and (-not (Test-IsUbuntu22))) { +Describe "Toolset" { $tools = (Get-ToolsetContent).toolcache $toolsExecutables = @{ diff --git a/images/ubuntu/templates/ubuntu-24.04.pkr.hcl b/images/ubuntu/templates/ubuntu-24.04.pkr.hcl index c47452d63553..abea0141d0ab 100644 --- a/images/ubuntu/templates/ubuntu-24.04.pkr.hcl +++ b/images/ubuntu/templates/ubuntu-24.04.pkr.hcl @@ -323,6 +323,12 @@ provisioner "shell" { scripts = ["${path.root}/../scripts/build/install-docker.sh"] } + provisioner "shell" { + environment_vars = ["HELPER_SCRIPTS=${var.helper_script_folder}", "INSTALLER_SCRIPT_FOLDER=${var.installer_script_folder}"] + execute_command = "sudo sh -c '{{ .Vars }} pwsh -f {{ .Path }}'" + scripts = ["${path.root}/../scripts/build/Install-Toolset.ps1", "${path.root}/../scripts/build/Configure-Toolset.ps1"] + } + provisioner "shell" { environment_vars = ["HELPER_SCRIPTS=${var.helper_script_folder}", "INSTALLER_SCRIPT_FOLDER=${var.installer_script_folder}"] execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" diff --git a/images/ubuntu/toolsets/toolset-2404.json b/images/ubuntu/toolsets/toolset-2404.json index 43f00ea6f5e0..33faa204eeab 100644 --- a/images/ubuntu/toolsets/toolset-2404.json +++ b/images/ubuntu/toolsets/toolset-2404.json @@ -22,15 +22,23 @@ "url" : "https://raw.githubusercontent.com/actions/node-versions/main/versions-manifest.json", "platform" : "linux", "arch": "x64", - "versions": [] + "versions": [ + "16.*", + "18.*", + "20.*" + ] }, { "name": "go", "url" : "https://raw.githubusercontent.com/actions/go-versions/main/versions-manifest.json", "arch": "x64", "platform" : "linux", - "versions": [], - "default": "*" + "versions": [ + "1.20.*", + "1.21.*", + "1.22.*" + ], + "default": "1.22.*" }, { "name": "Ruby", From 24a830de3cc053ce96b8bbce43aa4453db5a50b0 Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Thu, 9 May 2024 13:16:00 +0200 Subject: [PATCH 2817/3485] [Ubuntu] Add missing Java SDKs to Ubuntu 24.04 (#9808) --- .../scripts/build/install-java-tools.sh | 28 +++++++++---------- .../docs-gen/Generate-SoftwareReport.ps1 | 4 +-- images/ubuntu/scripts/tests/Java.Tests.ps1 | 2 +- images/ubuntu/toolsets/toolset-2404.json | 2 ++ 4 files changed, 17 insertions(+), 19 deletions(-) diff --git a/images/ubuntu/scripts/build/install-java-tools.sh b/images/ubuntu/scripts/build/install-java-tools.sh index 6f09c4c2b607..aecc19e63da6 100644 --- a/images/ubuntu/scripts/build/install-java-tools.sh +++ b/images/ubuntu/scripts/build/install-java-tools.sh @@ -70,21 +70,19 @@ echo "deb [signed-by=/usr/share/keyrings/adoptium.gpg] https://packages.adoptium apt-get update # While Ubuntu 24.04 binaries are not released in the Adoptium repo, we will not install Java -if ! is_ubuntu24; then - defaultVersion=$(get_toolset_value '.java.default') - jdkVersionsToInstall=($(get_toolset_value ".java.versions[]")) - - for jdkVersionToInstall in ${jdkVersionsToInstall[@]}; do - install_open_jdk ${jdkVersionToInstall} - - if [[ ${jdkVersionToInstall} == ${defaultVersion} ]] - then - create_java_environment_variable ${jdkVersionToInstall} True - else - create_java_environment_variable ${jdkVersionToInstall} False - fi - done -fi +defaultVersion=$(get_toolset_value '.java.default') +jdkVersionsToInstall=($(get_toolset_value ".java.versions[]")) + +for jdkVersionToInstall in ${jdkVersionsToInstall[@]}; do + install_open_jdk ${jdkVersionToInstall} + + if [[ ${jdkVersionToInstall} == ${defaultVersion} ]] + then + create_java_environment_variable ${jdkVersionToInstall} True + else + create_java_environment_variable ${jdkVersionToInstall} False + fi +done # Install Ant apt-get install -y --no-install-recommends ant ant-optional diff --git a/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 b/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 index bb3569940e08..6531c1d29e0a 100644 --- a/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 +++ b/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 @@ -191,9 +191,7 @@ if ((Test-IsUbuntu20) -or (Test-IsUbuntu22)) { } # Java -if (-not $(Test-IsUbuntu24)) { - $installedSoftware.AddHeader("Java").AddTable($(Get-JavaVersionsTable)) -} +$installedSoftware.AddHeader("Java").AddTable($(Get-JavaVersionsTable)) # PHP Tools $phpTools = $installedSoftware.AddHeader("PHP Tools") diff --git a/images/ubuntu/scripts/tests/Java.Tests.ps1 b/images/ubuntu/scripts/tests/Java.Tests.ps1 index c0a98d3873ef..548031309a6a 100644 --- a/images/ubuntu/scripts/tests/Java.Tests.ps1 +++ b/images/ubuntu/scripts/tests/Java.Tests.ps1 @@ -1,6 +1,6 @@ Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" -DisableNameChecking -Describe "Java" -Skip:(Test-IsUbuntu24) { +Describe "Java" { $toolsetJava = (Get-ToolsetContent).java $defaultVersion = $toolsetJava.default $jdkVersions = $toolsetJava.versions diff --git a/images/ubuntu/toolsets/toolset-2404.json b/images/ubuntu/toolsets/toolset-2404.json index 33faa204eeab..5891fff51333 100644 --- a/images/ubuntu/toolsets/toolset-2404.json +++ b/images/ubuntu/toolsets/toolset-2404.json @@ -56,6 +56,8 @@ } ], "java": { + "default": "17", + "versions": [ "8", "11", "17", "21"], "maven": "3.8.8" }, "android": { From 35be26d2a9d69789ba33647aab647301f918856c Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Thu, 9 May 2024 13:16:22 +0200 Subject: [PATCH 2818/3485] [Ubuntu] Install Bazel and Bazelisk on Ubuntu 24.04 (#9810) --- images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 | 6 ++---- images/ubuntu/scripts/tests/Tools.Tests.ps1 | 2 +- images/ubuntu/templates/ubuntu-24.04.pkr.hcl | 1 + 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 b/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 index 6531c1d29e0a..46fb0d95eb54 100644 --- a/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 +++ b/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 @@ -102,10 +102,8 @@ $tools = $installedSoftware.AddHeader("Tools") $tools.AddToolVersion("Ansible", $(Get-AnsibleVersion)) $tools.AddToolVersion("apt-fast", $(Get-AptFastVersion)) $tools.AddToolVersion("AzCopy", $(Get-AzCopyVersion)) -if ((Test-IsUbuntu20) -or (Test-IsUbuntu22)) { - $tools.AddToolVersion("Bazel", $(Get-BazelVersion)) - $tools.AddToolVersion("Bazelisk", $(Get-BazeliskVersion)) -} +$tools.AddToolVersion("Bazel", $(Get-BazelVersion)) +$tools.AddToolVersion("Bazelisk", $(Get-BazeliskVersion)) $tools.AddToolVersion("Bicep", $(Get-BicepVersion)) if ((Test-IsUbuntu20) -or (Test-IsUbuntu22)) { $tools.AddToolVersion("Buildah", $(Get-BuildahVersion)) diff --git a/images/ubuntu/scripts/tests/Tools.Tests.ps1 b/images/ubuntu/scripts/tests/Tools.Tests.ps1 index 5db3e74d3890..529010ceee75 100644 --- a/images/ubuntu/scripts/tests/Tools.Tests.ps1 +++ b/images/ubuntu/scripts/tests/Tools.Tests.ps1 @@ -118,7 +118,7 @@ Describe "Ansible" { } } -Describe "Bazel" -Skip:((-not (Test-IsUbuntu20)) -and (-not (Test-IsUbuntu22))) { +Describe "Bazel" { It "<ToolName>" -TestCases @( @{ ToolName = "bazel" } @{ ToolName = "bazelisk" } diff --git a/images/ubuntu/templates/ubuntu-24.04.pkr.hcl b/images/ubuntu/templates/ubuntu-24.04.pkr.hcl index abea0141d0ab..89bc29a26a41 100644 --- a/images/ubuntu/templates/ubuntu-24.04.pkr.hcl +++ b/images/ubuntu/templates/ubuntu-24.04.pkr.hcl @@ -300,6 +300,7 @@ provisioner "shell" { "${path.root}/../scripts/build/install-mysql.sh", "${path.root}/../scripts/build/install-nginx.sh", "${path.root}/../scripts/build/install-nodejs.sh", + "${path.root}/../scripts/build/install-bazel.sh", "${path.root}/../scripts/build/install-php.sh", "${path.root}/../scripts/build/install-postgresql.sh", "${path.root}/../scripts/build/install-pulumi.sh", From 7772fec117811d5ad86ef07a61ca51b6d4030059 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 9 May 2024 11:40:27 +0000 Subject: [PATCH 2819/3485] Updating readme file for macos-14 version 20240507.2 (#9813) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-14-Readme.md | 72 +++++++++++++++++---------------- 1 file changed, 37 insertions(+), 35 deletions(-) diff --git a/images/macos/macos-14-Readme.md b/images/macos/macos-14-Readme.md index 07581bbfc877..7174ba6df07c 100644 --- a/images/macos/macos-14-Readme.md +++ b/images/macos/macos-14-Readme.md @@ -1,7 +1,7 @@ # macOS 14 - OS Version: macOS 14.4.1 (23E224) - Kernel Version: Darwin 23.4.0 -- Image Version: 20240422.1 +- Image Version: 20240507.2 ## Installed Software @@ -16,25 +16,25 @@ - GNU Fortran 11 (Homebrew GCC 11.4.0) - available by `gfortran-11` alias - GNU Fortran 12 (Homebrew GCC 12.3.0) - available by `gfortran-12` alias - GNU Fortran 13 (Homebrew GCC 13.2.0) - available by `gfortran-13` alias -- Kotlin 1.9.23-release-779 +- Kotlin 1.9.24-release-822 - Mono 6.12.0.188 - Node.js 20.12.2 - Perl 5.38.2 - PHP 8.3.6 - Python3 3.12.3 -- Ruby 3.0.6p216 +- Ruby 3.0.7p220 ### Package Management -- Bundler 2.5.9 +- Bundler 2.5.10 - Carthage 0.39.1 - CocoaPods 1.15.2 -- Composer 2.7.3 -- Homebrew 4.2.19 +- Composer 2.7.6 +- Homebrew 4.2.21 - NPM 10.5.0 - NuGet 6.3.1.1 - Pip3 24.0 (python 3.12) - Pipx 1.5.0 -- RubyGems 3.5.9 +- RubyGems 3.5.10 - Yarn 1.22.19 ### Project Management @@ -47,12 +47,12 @@ - aria2 1.37.0 - azcopy 10.24.0 - bazel 7.1.1 -- bazelisk 1.19.0 +- bazelisk 1.19.0_1 - bsdtar 3.5.3 - available by 'tar' alias - Curl 8.7.1 -- Git 2.44.0 +- Git 2.45.0 - Git LFS 3.5.1 -- GitHub CLI 2.48.0 +- GitHub CLI 2.49.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.24.5 - gpg (GnuPG) 2.4.5 @@ -64,17 +64,17 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.15.40 -- AWS SAM CLI 1.115.0 +- AWS CLI 2.15.45 +- AWS SAM CLI 1.116.0 - AWS Session Manager CLI 1.2.553.0 -- Azure CLI 2.59.0 +- Azure CLI 2.60.0 - Azure CLI (azure-devops) 1.0.0 -- Bicep CLI 0.26.170 +- Bicep CLI 0.27.1 - Cmake 3.29.2 -- CodeQL Action Bundle 2.17.0 +- CodeQL Action Bundle 2.17.1 - Fastlane 2.220.0 -- SwiftFormat 0.53.7 -- Xcbeautify 2.1.0 +- SwiftFormat 0.53.8 +- Xcbeautify 2.3.0 - Xcode Command Line Tools 15.3.0.0.1.1708646388 - Xcodes 1.4.1 @@ -84,14 +84,14 @@ ### Browsers - Safari 17.4.1 (19618.1.15.11.14) - SafariDriver 17.4.1 (19618.1.15.11.14) -- Google Chrome 124.0.6367.62 -- Google Chrome for Testing 124.0.6367.60 -- ChromeDriver 124.0.6367.60 -- Microsoft Edge 124.0.2478.51 -- Microsoft Edge WebDriver 124.0.2478.51 -- Mozilla Firefox 125.0.2 +- Google Chrome 124.0.6367.156 +- Google Chrome for Testing 124.0.6367.155 +- ChromeDriver 124.0.6367.155 +- Microsoft Edge 124.0.2478.80 +- Microsoft Edge WebDriver 124.0.2478.80 +- Mozilla Firefox 125.0.3 - geckodriver 0.34.0 -- Selenium server 4.19.1 +- Selenium server 4.20.0 #### Environment variables | Name | Value | @@ -111,10 +111,12 @@ ### Cached Tools #### Ruby -- 3.0.6 -- 3.1.4 +- 3.0.7 +- 3.1.5 #### Python +- 3.9.19 +- 3.10.14 - 3.11.9 - 3.12.3 @@ -128,20 +130,20 @@ - 1.22.2 ### Rust Tools -- Cargo 1.77.2 -- Rust 1.77.2 -- Rustdoc 1.77.2 -- Rustup 1.27.0 +- Cargo 1.78.0 +- Rust 1.78.0 +- Rustdoc 1.78.0 +- Rustup 1.27.1 #### Packages -- Clippy 0.1.77 +- Clippy 0.1.78 - Rustfmt 1.7.0-stable ### PowerShell Tools - PowerShell 7.4.2 #### PowerShell Modules -- Az: 11.5.0 +- Az: 11.6.0 - Pester: 5.5.0 - PSScriptAnalyzer: 1.22.0 @@ -193,15 +195,15 @@ | Simulator - watchOS 10.2 | watchsimulator10.2 | 15.1, 15.2 | | Simulator - watchOS 10.4 | watchsimulator10.4 | 15.3 | | Simulator - watchOS 10.5 | watchsimulator10.5 | 15.4 | -| Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | | visionOS 1.0 | xros1.0 | 15.2 | +| Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | | Simulator - visionOS 1.1 | xrsimulator1.1 | 15.3 | | visionOS 1.1 | xros1.1 | 15.3 | | visionOS 1.2 | xros1.2 | 15.4 | | Simulator - visionOS 1.2 | xrsimulator1.2 | 15.4 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | -| Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | +| Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | DriverKit 22.4 | driverkit22.4 | 14.3.1 | | DriverKit 23.0 | driverkit23.0 | 15.0.1 | | DriverKit 23.2 | driverkit23.2 | 15.1, 15.2 | @@ -231,7 +233,7 @@ | Package Name | Version | | -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 11.0 | -| Android Emulator | 34.1.20 | +| Android Emulator | 34.2.13 | | Android SDK Build-tools | 34.0.0<br>33.0.2 33.0.3 | | Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | | Android SDK Platform-Tools | 35.0.1 | From 78ef24110a6a8f7b93592f0d1697f59a026d7c1d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 9 May 2024 13:32:34 +0000 Subject: [PATCH 2820/3485] Updating readme file for macos-13-arm64 version 20240506.2 (#9801) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-13-arm64-Readme.md | 52 +++++++++++++-------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/images/macos/macos-13-arm64-Readme.md b/images/macos/macos-13-arm64-Readme.md index e32e588004ff..1ade784eb60e 100644 --- a/images/macos/macos-13-arm64-Readme.md +++ b/images/macos/macos-13-arm64-Readme.md @@ -1,7 +1,7 @@ # macOS 13 - OS Version: macOS 13.6.6 (22G630) - Kernel Version: Darwin 22.6.0 -- Image Version: 20240422.1 +- Image Version: 20240506.2 ## Installed Software @@ -21,18 +21,18 @@ - Node.js 20.12.2 - Perl 5.38.2 - Python3 3.12.3 -- Ruby 3.0.6p216 +- Ruby 3.0.7p220 ### Package Management -- Bundler 2.5.9 +- Bundler 2.5.10 - Carthage 0.39.1 - CocoaPods 1.15.2 -- Homebrew 4.2.19 +- Homebrew 4.2.21 - NPM 10.5.0 - NuGet 6.3.1.1 - Pip3 24.0 (python 3.12) - Pipx 1.5.0 -- RubyGems 3.5.9 +- RubyGems 3.5.10 - Yarn 1.22.19 ### Project Management @@ -45,12 +45,12 @@ - aria2 1.37.0 - azcopy 10.24.0 - bazel 7.1.1 -- bazelisk 1.19.0 +- bazelisk 1.19.0_1 - bsdtar 3.5.3 - available by 'tar' alias - Curl 8.4.0 -- Git 2.44.0 +- Git 2.45.0 - Git LFS 3.5.1 -- GitHub CLI 2.48.0 +- GitHub CLI 2.49.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.24.5 - gpg (GnuPG) 2.4.5 @@ -62,17 +62,17 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.15.40 -- AWS SAM CLI 1.115.0 +- AWS CLI 2.15.45 +- AWS SAM CLI 1.116.0 - AWS Session Manager CLI 1.2.553.0 -- Azure CLI 2.59.0 +- Azure CLI 2.60.0 - Azure CLI (azure-devops) 1.0.0 - Bicep CLI 0.26.170 - Cmake 3.29.2 -- CodeQL Action Bundle 2.17.0 +- CodeQL Action Bundle 2.17.1 - Fastlane 2.220.0 -- SwiftFormat 0.53.7 -- Xcbeautify 2.1.0 +- SwiftFormat 0.53.8 +- Xcbeautify 2.3.0 - Xcode Command Line Tools 14.3.1.0.1.1683849156 - Xcodes 1.4.1 @@ -81,10 +81,10 @@ ### Browsers - Safari 17.4.1 (18618.1.15.111.8) - SafariDriver 17.4.1 (18618.1.15.111.8) -- Google Chrome 124.0.6367.62 -- Google Chrome for Testing 124.0.6367.60 -- ChromeDriver 124.0.6367.60 -- Selenium server 4.19.1 +- Google Chrome 124.0.6367.119 +- Google Chrome for Testing 124.0.6367.91 +- ChromeDriver 124.0.6367.91 +- Selenium server 4.20.0 #### Environment variables | Name | Value | @@ -117,20 +117,20 @@ - 1.22.2 ### Rust Tools -- Cargo 1.77.2 -- Rust 1.77.2 -- Rustdoc 1.77.2 -- Rustup 1.27.0 +- Cargo 1.78.0 +- Rust 1.78.0 +- Rustdoc 1.78.0 +- Rustup 1.27.1 #### Packages -- Clippy 0.1.77 +- Clippy 0.1.78 - Rustfmt 1.7.0-stable ### PowerShell Tools - PowerShell 7.4.2 #### PowerShell Modules -- Az: 11.5.0 +- Az: 11.6.0 - Pester: 5.5.0 - PSScriptAnalyzer: 1.22.0 @@ -178,8 +178,8 @@ | Simulator - watchOS 9.4 | watchsimulator9.4 | 14.3.1 | | Simulator - watchOS 10.0 | watchsimulator10.0 | 15.0.1 | | Simulator - watchOS 10.2 | watchsimulator10.2 | 15.1, 15.2 | -| visionOS 1.0 | xros1.0 | 15.2 | | Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | +| visionOS 1.0 | xros1.0 | 15.2 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | @@ -211,7 +211,7 @@ | Package Name | Version | | -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 11.0 | -| Android Emulator | 34.1.20 | +| Android Emulator | 34.2.13 | | Android SDK Build-tools | 34.0.0<br>33.0.2 33.0.3 | | Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | | Android SDK Platform-Tools | 35.0.1 | From eb6f6cc7345df416701327e67eaa8408602b3cac Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Thu, 9 May 2024 15:53:33 +0200 Subject: [PATCH 2821/3485] [Ubuntu] Switch Clang to the 18 for the Ubuntu 24.04 (#9818) --- images/ubuntu/toolsets/toolset-2404.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/ubuntu/toolsets/toolset-2404.json b/images/ubuntu/toolsets/toolset-2404.json index 5891fff51333..d8aff86296d6 100644 --- a/images/ubuntu/toolsets/toolset-2404.json +++ b/images/ubuntu/toolsets/toolset-2404.json @@ -231,7 +231,7 @@ "17", "18" ], - "default_version": "17" + "default_version": "18" }, "gcc": { "versions": [ From 5a54cdbbf1c1b48cfe1f538fe5550efffbda6226 Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Thu, 9 May 2024 20:59:58 +0200 Subject: [PATCH 2822/3485] [Ubuntu] Add Python to the Ubuntu 24.04 toolcache (#9820) --- images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 | 4 +--- images/ubuntu/toolsets/toolset-2404.json | 7 ++++++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 b/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 index 46fb0d95eb54..3f323df48c3a 100644 --- a/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 +++ b/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 @@ -263,9 +263,7 @@ if (-not $(Test-IsUbuntu24)) { $cachedTools = $installedSoftware.AddHeader("Cached Tools") $cachedTools.AddToolVersionsList("Go", $(Get-ToolcacheGoVersions), "^\d+\.\d+") $cachedTools.AddToolVersionsList("Node.js", $(Get-ToolcacheNodeVersions), "^\d+") -if (-not $(Test-IsUbuntu24)) { - $cachedTools.AddToolVersionsList("Python", $(Get-ToolcachePythonVersions), "^\d+\.\d+") -} +$cachedTools.AddToolVersionsList("Python", $(Get-ToolcachePythonVersions), "^\d+\.\d+") $cachedTools.AddToolVersionsList("PyPy", $(Get-ToolcachePyPyVersions), "^\d+\.\d+") if (-not $(Test-IsUbuntu24)) { $cachedTools.AddToolVersionsList("Ruby", $(Get-ToolcacheRubyVersions), "^\d+\.\d+") diff --git a/images/ubuntu/toolsets/toolset-2404.json b/images/ubuntu/toolsets/toolset-2404.json index d8aff86296d6..2ca767397c37 100644 --- a/images/ubuntu/toolsets/toolset-2404.json +++ b/images/ubuntu/toolsets/toolset-2404.json @@ -6,7 +6,12 @@ "platform" : "linux", "platform_version": "24.04", "arch": "x64", - "versions": [] + "versions": [ + "3.9.*", + "3.10.*", + "3.11.*", + "3.12.*" + ] }, { "name": "PyPy", From 441122013e49b8a909c8007712da07504a2b4937 Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Thu, 9 May 2024 21:02:07 +0200 Subject: [PATCH 2823/3485] Remove all non-latest VS VC components (#9819) --- images/windows/toolsets/toolset-2022.json | 82 ++++------------------- 1 file changed, 13 insertions(+), 69 deletions(-) diff --git a/images/windows/toolsets/toolset-2022.json b/images/windows/toolsets/toolset-2022.json index 8e3d157af780..79ecef7fa26e 100644 --- a/images/windows/toolsets/toolset-2022.json +++ b/images/windows/toolsets/toolset-2022.json @@ -207,85 +207,29 @@ "Microsoft.VisualStudio.Component.VC.DiagnosticTools", "Microsoft.VisualStudio.Component.VC.Llvm.Clang", "Microsoft.VisualStudio.Component.VC.Llvm.ClangToolset", + "Microsoft.VisualStudio.Component.VC.TestAdapterForBoostTest", + "Microsoft.VisualStudio.Component.VC.TestAdapterForGoogleTest", + "Microsoft.VisualStudio.Component.VC.Tools.ARM", + "Microsoft.VisualStudio.Component.VC.Tools.ARM64", + "Microsoft.VisualStudio.Component.VC.Tools.ARM64EC", + "Microsoft.VisualStudio.Component.VC.Modules.x86.x64", + "Microsoft.VisualStudio.Component.VC.Redist.MSM", "Microsoft.VisualStudio.Component.VC.Runtimes.ARM.Spectre", "Microsoft.VisualStudio.Component.VC.Runtimes.ARM64.Spectre", "Microsoft.VisualStudio.Component.VC.Runtimes.ARM64EC.Spectre", "Microsoft.VisualStudio.Component.VC.Runtimes.x86.x64.Spectre", - "Microsoft.VisualStudio.Component.VC.TestAdapterForBoostTest", - "Microsoft.VisualStudio.Component.VC.TestAdapterForGoogleTest", - "Microsoft.VisualStudio.Component.VC.Tools.ARM", "Microsoft.VisualStudio.Component.VC.MFC.ARM", "Microsoft.VisualStudio.Component.VC.MFC.ARM.Spectre", - "Microsoft.VisualStudio.Component.VC.ATL.ARM64", - "Microsoft.VisualStudio.Component.VC.ATL.ARM64.Spectre", "Microsoft.VisualStudio.Component.VC.MFC.ARM64", "Microsoft.VisualStudio.Component.VC.MFC.ARM64.Spectre", - "Microsoft.VisualStudio.Component.VC.Modules.x86.x64", - "Microsoft.VisualStudio.Component.VC.Tools.ARM64", - "Microsoft.VisualStudio.Component.VC.Tools.ARM64EC", - "Microsoft.VisualStudio.Component.VC.Redist.MSM", - "Microsoft.VisualStudio.Component.VC.v141.x86.x64", - "Microsoft.VisualStudio.Component.VC.v141.x86.x64.Spectre", - "Microsoft.VisualStudio.Component.VC.v141.ARM.Spectre", - "Microsoft.VisualStudio.Component.VC.v141.ARM64.Spectre", - "Microsoft.VisualStudio.Component.VC.v141.MFC", - "Microsoft.VisualStudio.Component.VC.v141.MFC.Spectre", - "Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM", - "Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM.Spectre", - "Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM64", - "Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM64.Spectre", - "Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64", - "Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64.Spectre", - "Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL", - "Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.Spectre", - "Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM", - "Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM.Spectre", - "Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM64", - "Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM64.Spectre", - "Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC", - "Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.Spectre", - "Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.ARM", - "Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.ARM.Spectre", - "Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.ARM64", - "Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.ARM64.Spectre", - "Microsoft.VisualStudio.Component.VC.14.38.17.8.ARM", - "Microsoft.VisualStudio.Component.VC.14.38.17.8.ARM.Spectre", - "Microsoft.VisualStudio.Component.VC.14.38.17.8.ARM64", - "Microsoft.VisualStudio.Component.VC.14.38.17.8.ARM64.Spectre", - "Microsoft.VisualStudio.Component.VC.14.38.17.8.ATL", - "Microsoft.VisualStudio.Component.VC.14.38.17.8.ATL.ARM", - "Microsoft.VisualStudio.Component.VC.14.38.17.8.ATL.ARM.Spectre", - "Microsoft.VisualStudio.Component.VC.14.38.17.8.ATL.ARM64", - "Microsoft.VisualStudio.Component.VC.14.38.17.8.ATL.ARM64.Spectre", - "Microsoft.VisualStudio.Component.VC.14.38.17.8.ATL.Spectre", - "Microsoft.VisualStudio.Component.VC.14.38.17.8.MFC", - "Microsoft.VisualStudio.Component.VC.14.38.17.8.MFC.ARM", - "Microsoft.VisualStudio.Component.VC.14.38.17.8.MFC.ARM.Spectre", - "Microsoft.VisualStudio.Component.VC.14.38.17.8.MFC.ARM64", - "Microsoft.VisualStudio.Component.VC.14.38.17.8.MFC.ARM64.Spectre", - "Microsoft.VisualStudio.Component.VC.14.38.17.8.MFC.Spectre", - "Microsoft.VisualStudio.Component.VC.14.38.17.8.x86.x64", - "Microsoft.VisualStudio.Component.VC.14.38.17.8.x86.x64.Spectre", - "Microsoft.VisualStudio.Component.VC.14.39.17.9.ARM", - "Microsoft.VisualStudio.Component.VC.14.39.17.9.ARM.Spectre", - "Microsoft.VisualStudio.Component.VC.14.39.17.9.ARM64", - "Microsoft.VisualStudio.Component.VC.14.39.17.9.ARM64.Spectre", - "Microsoft.VisualStudio.Component.VC.14.39.17.9.ATL", - "Microsoft.VisualStudio.Component.VC.14.39.17.9.ATL.ARM", - "Microsoft.VisualStudio.Component.VC.14.39.17.9.ATL.ARM.Spectre", - "Microsoft.VisualStudio.Component.VC.14.39.17.9.ATL.ARM64", - "Microsoft.VisualStudio.Component.VC.14.39.17.9.ATL.ARM64.Spectre", - "Microsoft.VisualStudio.Component.VC.14.39.17.9.ATL.Spectre", - "Microsoft.VisualStudio.Component.VC.14.39.17.9.MFC", - "Microsoft.VisualStudio.Component.VC.14.39.17.9.MFC.ARM", - "Microsoft.VisualStudio.Component.VC.14.39.17.9.MFC.ARM.Spectre", - "Microsoft.VisualStudio.Component.VC.14.39.17.9.MFC.ARM64", - "Microsoft.VisualStudio.Component.VC.14.39.17.9.MFC.ARM64.Spectre", - "Microsoft.VisualStudio.Component.VC.14.39.17.9.MFC.Spectre", - "Microsoft.VisualStudio.Component.VC.14.39.17.9.x86.x64", - "Microsoft.VisualStudio.Component.VC.14.39.17.9.x86.x64.Spectre", "Microsoft.VisualStudio.Component.VC.ATLMFC", "Microsoft.VisualStudio.Component.VC.ATLMFC.Spectre", + "Microsoft.VisualStudio.Component.VC.ATL.Spectre", + "Microsoft.VisualStudio.Component.VC.ATL.ARM", + "Microsoft.VisualStudio.Component.VC.ATL.ARM.Spectre", + "Microsoft.VisualStudio.Component.VC.ATL.ARM64", + "Microsoft.VisualStudio.Component.VC.ATL.ARM64.Spectre", + "Microsoft.VisualStudio.Component.VC.ASAN", "Microsoft.VisualStudio.Component.Windows10SDK.19041", "Microsoft.VisualStudio.Component.Windows10SDK.20348", "Microsoft.VisualStudio.Component.Windows11SDK.22000", From 6625f8ac5f961717620426d6b04b4488715d9a1c Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Fri, 10 May 2024 13:31:07 +0200 Subject: [PATCH 2824/3485] [Ubuntu] Revert Podman, buildah and skopeo for Ubuntu-24.04 (#9825) --- .../scripts/docs-gen/Generate-SoftwareReport.ps1 | 10 +++------- images/ubuntu/scripts/tests/Tools.Tests.ps1 | 2 +- images/ubuntu/templates/ubuntu-24.04.pkr.hcl | 1 + 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 b/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 index 3f323df48c3a..5e4a3997d68d 100644 --- a/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 +++ b/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 @@ -105,9 +105,7 @@ $tools.AddToolVersion("AzCopy", $(Get-AzCopyVersion)) $tools.AddToolVersion("Bazel", $(Get-BazelVersion)) $tools.AddToolVersion("Bazelisk", $(Get-BazeliskVersion)) $tools.AddToolVersion("Bicep", $(Get-BicepVersion)) -if ((Test-IsUbuntu20) -or (Test-IsUbuntu22)) { - $tools.AddToolVersion("Buildah", $(Get-BuildahVersion)) -} +$tools.AddToolVersion("Buildah", $(Get-BuildahVersion)) $tools.AddToolVersion("CMake", $(Get-CMakeVersion)) $tools.AddToolVersion("CodeQL Action Bundle", $(Get-CodeQLBundleVersion)) $tools.AddToolVersion("Docker Amazon ECR Credential Helper", $(Get-DockerAmazonECRCredHelperVersion)) @@ -152,14 +150,12 @@ $tools.AddToolVersion("Parcel", $(Get-ParcelVersion)) if (Test-IsUbuntu20) { $tools.AddToolVersion("PhantomJS", $(Get-PhantomJSVersion)) } -if ((Test-IsUbuntu20) -or (Test-IsUbuntu22)) { - $tools.AddToolVersion("Podman", $(Get-PodManVersion)) -} +$tools.AddToolVersion("Podman", $(Get-PodManVersion)) $tools.AddToolVersion("Pulumi", $(Get-PulumiVersion)) if ((Test-IsUbuntu20) -or (Test-IsUbuntu22)) { $tools.AddToolVersion("R", $(Get-RVersion)) - $tools.AddToolVersion("Skopeo", $(Get-SkopeoVersion)) } +$tools.AddToolVersion("Skopeo", $(Get-SkopeoVersion)) $tools.AddToolVersion("Sphinx Open Source Search Server", $(Get-SphinxVersion)) if ((Test-IsUbuntu20) -or (Test-IsUbuntu22)) { $tools.AddToolVersion("SVN", $(Get-SVNVersion)) diff --git a/images/ubuntu/scripts/tests/Tools.Tests.ps1 b/images/ubuntu/scripts/tests/Tools.Tests.ps1 index 529010ceee75..2aa7c1c3dd43 100644 --- a/images/ubuntu/scripts/tests/Tools.Tests.ps1 +++ b/images/ubuntu/scripts/tests/Tools.Tests.ps1 @@ -329,7 +329,7 @@ Describe "Phantomjs" -Skip:(-not (Test-IsUbuntu20)) { } } -Describe "Containers" -Skip:((-not (Test-IsUbuntu20)) -and (-not (Test-IsUbuntu22))) { +Describe "Containers" { $testCases = @("podman", "buildah", "skopeo") | ForEach-Object { @{ContainerCommand = $_} } It "<ContainerCommand>" -TestCases $testCases { diff --git a/images/ubuntu/templates/ubuntu-24.04.pkr.hcl b/images/ubuntu/templates/ubuntu-24.04.pkr.hcl index 89bc29a26a41..e4964a908bdc 100644 --- a/images/ubuntu/templates/ubuntu-24.04.pkr.hcl +++ b/images/ubuntu/templates/ubuntu-24.04.pkr.hcl @@ -286,6 +286,7 @@ provisioner "shell" { "${path.root}/../scripts/build/install-clang.sh", "${path.root}/../scripts/build/install-cmake.sh", "${path.root}/../scripts/build/install-codeql-bundle.sh", + "${path.root}/../scripts/build/install-container-tools.sh", "${path.root}/../scripts/build/install-dotnetcore-sdk.sh", "${path.root}/../scripts/build/install-gcc-compilers.sh", "${path.root}/../scripts/build/install-gfortran.sh", From 1a952817bed9a3d317964a9879da9b694e9fc0e1 Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Fri, 10 May 2024 18:40:40 +0200 Subject: [PATCH 2825/3485] [macOS] Add Xcode 15.4 Release Candidate (#9822) --- images/macos/toolsets/toolset-14.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/macos/toolsets/toolset-14.json b/images/macos/toolsets/toolset-14.json index d26481465cce..5fa413a34be0 100644 --- a/images/macos/toolsets/toolset-14.json +++ b/images/macos/toolsets/toolset-14.json @@ -3,7 +3,7 @@ "default": "15.0.1", "x64": { "versions": [ - { "link": "15.4", "version": "15.4.0-Beta+15F5021i", "install_runtimes": "true", "sha256": "e20a2af230e3dbac105496f194530e9c865a756b136ff8ed7c7f215774a91a9e"}, + { "link": "15.4", "version": "15.4.0-Release.Candidate+15F31c", "install_runtimes": "true", "sha256": "33b853f2a9cf5e83c7a6f443c5d575f2bec85e903096ed232b0e1e43f400a596"}, { "link": "15.3", "version": "15.3.0+15E204a", "install_runtimes": "true", "sha256": "f13f6a2e2df432c3008e394640b8549a18c285acd7fd148d6c4bac8c3a5af234"}, { "link": "15.2", "version": "15.2.0+15C500b", "install_runtimes": "true", "sha256": "04E93680C6DDBEC84666531BE412DE778AFC8EAC6AB2037F4C2BE7290818B59B"}, { "link": "15.1", "version": "15.1.0+15C65", "install_runtimes": "true", "sha256": "857D8DB537BAC82BF99DE0E1D3895D214D4D02101C1340CEF3DAF6E821BA1D05"}, @@ -13,7 +13,7 @@ }, "arm64":{ "versions": [ - { "link": "15.4", "version": "15.4.0-Beta+15F5021i", "install_runtimes": "true", "sha256": "e20a2af230e3dbac105496f194530e9c865a756b136ff8ed7c7f215774a91a9e"}, + { "link": "15.4", "version": "15.4.0-Release.Candidate+15F31c", "install_runtimes": "true", "sha256": "33b853f2a9cf5e83c7a6f443c5d575f2bec85e903096ed232b0e1e43f400a596"}, { "link": "15.3", "version": "15.3.0+15E204a", "install_runtimes": "true", "sha256": "f13f6a2e2df432c3008e394640b8549a18c285acd7fd148d6c4bac8c3a5af234"}, { "link": "15.2", "version": "15.2.0+15C500b", "install_runtimes": "true", "sha256": "04E93680C6DDBEC84666531BE412DE778AFC8EAC6AB2037F4C2BE7290818B59B"}, { "link": "15.1", "version": "15.1.0+15C65", "install_runtimes": "true", "sha256": "857D8DB537BAC82BF99DE0E1D3895D214D4D02101C1340CEF3DAF6E821BA1D05"}, From 530454b772ce8c2aeb52a25d0b445d2d1c0ce80f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 10 May 2024 20:27:50 +0000 Subject: [PATCH 2826/3485] Updating readme file for macos-13 version 20240506.1 (#9800) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-13-Readme.md | 72 ++++++++++++++++----------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/images/macos/macos-13-Readme.md b/images/macos/macos-13-Readme.md index b888394d2978..d1cc43336a29 100644 --- a/images/macos/macos-13-Readme.md +++ b/images/macos/macos-13-Readme.md @@ -1,7 +1,7 @@ # macOS 13 - OS Version: macOS 13.6.6 (22G630) - Kernel Version: Darwin 22.6.0 -- Image Version: 20240421.1 +- Image Version: 20240506.1 ## Installed Software @@ -22,20 +22,20 @@ - Perl 5.38.2 - PHP 8.3.6 - Python3 3.12.3 -- Ruby 3.0.6p216 +- Ruby 3.0.7p220 ### Package Management -- Bundler 2.5.9 +- Bundler 2.5.10 - Carthage 0.39.1 - CocoaPods 1.15.2 -- Composer 2.7.3 -- Homebrew 4.2.18 +- Composer 2.7.6 +- Homebrew 4.2.21 - NPM 10.5.0 - NuGet 6.3.1.1 - Pip3 24.0 (python 3.12) - Pipx 1.5.0 -- RubyGems 3.5.9 -- Vcpkg 2024 (build from commit 9224b3bbd) +- RubyGems 3.5.10 +- Vcpkg 2024 (build from commit 28b1cf627) - Yarn 1.22.19 ### Project Management @@ -48,12 +48,12 @@ - aria2 1.37.0 - azcopy 10.24.0 - bazel 7.1.1 -- bazelisk 1.19.0 +- bazelisk 1.19.0_1 - bsdtar 3.5.3 - available by 'tar' alias - Curl 8.7.1 -- Git 2.44.0 +- Git 2.45.0 - Git LFS 3.5.1 -- GitHub CLI 2.48.0 +- GitHub CLI 2.49.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.24.5 - gpg (GnuPG) 2.4.5 @@ -65,17 +65,17 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.15.40 -- AWS SAM CLI 1.115.0 +- AWS CLI 2.15.45 +- AWS SAM CLI 1.116.0 - AWS Session Manager CLI 1.2.553.0 -- Azure CLI 2.59.0 +- Azure CLI 2.60.0 - Azure CLI (azure-devops) 1.0.0 - Bicep CLI 0.26.170 - Cmake 3.29.2 -- CodeQL Action Bundle 2.17.0 +- CodeQL Action Bundle 2.17.1 - Fastlane 2.220.0 -- SwiftFormat 0.53.7 -- Xcbeautify 2.1.0 +- SwiftFormat 0.53.8 +- Xcbeautify 2.3.0 - Xcode Command Line Tools 14.3.1.0.1.1683849156 - Xcodes 1.4.1 @@ -85,14 +85,14 @@ ### Browsers - Safari 17.4.1 (18618.1.15.111.8) - SafariDriver 17.4.1 (18618.1.15.111.8) -- Google Chrome 124.0.6367.62 -- Google Chrome for Testing 124.0.6367.60 -- ChromeDriver 124.0.6367.60 -- Microsoft Edge 124.0.2478.51 -- Microsoft Edge WebDriver 124.0.2478.51 -- Mozilla Firefox 125.0.1 +- Google Chrome 124.0.6367.119 +- Google Chrome for Testing 124.0.6367.91 +- ChromeDriver 124.0.6367.91 +- Microsoft Edge 124.0.2478.80 +- Microsoft Edge WebDriver 124.0.2478.80 +- Mozilla Firefox 125.0.3 - geckodriver 0.34.0 -- Selenium server 4.19.1 +- Selenium server 4.20.0 #### Environment variables | Name | Value | @@ -112,15 +112,15 @@ ### Cached Tools #### PyPy -- 2.7.18 [PyPy 7.3.15] +- 2.7.18 [PyPy 7.3.16] - 3.7.13 [PyPy 7.3.9] - 3.8.16 [PyPy 7.3.11] -- 3.9.18 [PyPy 7.3.15] -- 3.10.13 [PyPy 7.3.15] +- 3.9.19 [PyPy 7.3.16] +- 3.10.14 [PyPy 7.3.16] #### Ruby -- 3.0.6 -- 3.1.4 +- 3.0.7 +- 3.1.5 #### Python - 3.8.18 @@ -140,20 +140,20 @@ - 1.22.2 ### Rust Tools -- Cargo 1.77.2 -- Rust 1.77.2 -- Rustdoc 1.77.2 -- Rustup 1.27.0 +- Cargo 1.78.0 +- Rust 1.78.0 +- Rustdoc 1.78.0 +- Rustup 1.27.1 #### Packages -- Clippy 0.1.77 +- Clippy 0.1.78 - Rustfmt 1.7.0-stable ### PowerShell Tools - PowerShell 7.4.2 #### PowerShell Modules -- Az: 11.5.0 +- Az: 11.6.0 - Pester: 5.5.0 - PSScriptAnalyzer: 1.22.0 @@ -201,8 +201,8 @@ | Simulator - watchOS 9.4 | watchsimulator9.4 | 14.3.1 | | Simulator - watchOS 10.0 | watchsimulator10.0 | 15.0.1 | | Simulator - watchOS 10.2 | watchsimulator10.2 | 15.1, 15.2 | -| Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | | visionOS 1.0 | xros1.0 | 15.2 | +| Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | @@ -233,7 +233,7 @@ | Package Name | Version | | -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 11.0 | -| Android Emulator | 34.1.20 | +| Android Emulator | 34.2.13 | | Android SDK Build-tools | 34.0.0<br>33.0.2 33.0.3 | | Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | | Android SDK Platform-Tools | 35.0.1 | From dca8e74e477ece24d916fe1dd6d14e010f67a8f7 Mon Sep 17 00:00:00 2001 From: sssharif <sssharif@github.com> Date: Mon, 13 May 2024 08:08:17 -0400 Subject: [PATCH 2827/3485] [Ubuntu] Remove zip versions from Azuremodules (#9774) --- .../build/Install-PowerShellAzModules.ps1 | 16 ---------------- images/ubuntu/toolsets/toolset-2004.json | 3 --- images/ubuntu/toolsets/toolset-2204.json | 3 --- images/ubuntu/toolsets/toolset-2404.json | 3 --- 4 files changed, 25 deletions(-) diff --git a/images/ubuntu/scripts/build/Install-PowerShellAzModules.ps1 b/images/ubuntu/scripts/build/Install-PowerShellAzModules.ps1 index 6dd5fef883e1..626dc2f70625 100644 --- a/images/ubuntu/scripts/build/Install-PowerShellAzModules.ps1 +++ b/images/ubuntu/scripts/build/Install-PowerShellAzModules.ps1 @@ -22,22 +22,6 @@ foreach ($module in $modules) { Save-Module -Path $modulePath -Name $moduleName -RequiredVersion $version -Force } - $assets = Invoke-RestMethod $module.url - - # Get github release asset for each version - foreach ($toolVersion in $module.zip_versions) { - $asset = $assets | Where-Object version -eq $toolVersion ` - | Select-Object -ExpandProperty files ` - | Select-Object -First 1 - - if (-not $asset) { - Write-Host "Asset for ${moduleName} ${toolVersion} was not found in versions manifest" - exit 1 - } - - Write-Host "Downloading asset for ${moduleName} ${toolVersion}: $($asset.filename)" - Invoke-DownloadWithRetry $asset.download_url -Destination "$installPSModulePath/$($asset.filename)" - } } Invoke-PesterTests -TestFile "PowerShellModules" -TestName "AzureModules" diff --git a/images/ubuntu/toolsets/toolset-2004.json b/images/ubuntu/toolsets/toolset-2004.json index 5b5e4338aad4..033ff8bc6f7f 100644 --- a/images/ubuntu/toolsets/toolset-2004.json +++ b/images/ubuntu/toolsets/toolset-2004.json @@ -106,11 +106,8 @@ "azureModules": [ { "name": "az", - "url" : "https://raw.githubusercontent.com/Azure/az-ps-module-versions/main/versions-manifest.json", "versions": [ "11.3.1" - ], - "zip_versions": [ ] } ], diff --git a/images/ubuntu/toolsets/toolset-2204.json b/images/ubuntu/toolsets/toolset-2204.json index 60c7997a9974..0862612b01ab 100644 --- a/images/ubuntu/toolsets/toolset-2204.json +++ b/images/ubuntu/toolsets/toolset-2204.json @@ -103,11 +103,8 @@ "azureModules": [ { "name": "az", - "url" : "https://raw.githubusercontent.com/Azure/az-ps-module-versions/main/versions-manifest.json", "versions": [ "11.3.1" - ], - "zip_versions": [ ] } ], diff --git a/images/ubuntu/toolsets/toolset-2404.json b/images/ubuntu/toolsets/toolset-2404.json index 2ca767397c37..6d88e441a039 100644 --- a/images/ubuntu/toolsets/toolset-2404.json +++ b/images/ubuntu/toolsets/toolset-2404.json @@ -93,11 +93,8 @@ "azureModules": [ { "name": "az", - "url" : "https://raw.githubusercontent.com/Azure/az-ps-module-versions/main/versions-manifest.json", "versions": [ "11.5.0" - ], - "zip_versions": [ ] } ], From d279ef32ca6b8e6076b6b237dee6b32c65854f50 Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Tue, 14 May 2024 09:40:03 +0200 Subject: [PATCH 2828/3485] [Windows] Add .NET SDK 8.0 to Windows-2019 (#9838) --- images/windows/toolsets/toolset-2019.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/images/windows/toolsets/toolset-2019.json b/images/windows/toolsets/toolset-2019.json index 2def478add80..77447cca0d8b 100644 --- a/images/windows/toolsets/toolset-2019.json +++ b/images/windows/toolsets/toolset-2019.json @@ -410,7 +410,8 @@ "dotnet": { "versions": [ "6.0", - "7.0" + "7.0", + "8.0" ], "tools": [ { "name": "nbgv", "test": "nbgv --version", "getversion": "nbgv --version" } From ab722408677c83a5e47a63f7812756676e63db57 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 14 May 2024 16:48:08 +0200 Subject: [PATCH 2829/3485] Updating readme file for ubuntu24 version 20240510.1.1 (#9828) Co-authored-by: Image generation service account <no-reply@microsoft.com> --- images/ubuntu/Ubuntu2404-Readme.md | 82 ++++++++++++++++++++++-------- 1 file changed, 62 insertions(+), 20 deletions(-) diff --git a/images/ubuntu/Ubuntu2404-Readme.md b/images/ubuntu/Ubuntu2404-Readme.md index 5f23e95d47f3..1a6649320e56 100644 --- a/images/ubuntu/Ubuntu2404-Readme.md +++ b/images/ubuntu/Ubuntu2404-Readme.md @@ -1,7 +1,12 @@ +| Announcements | +|-| +| [[Ubuntu, Windows] Docker Compose v1 will be removed from images on July, 9](https://github.com/actions/runner-images/issues/9692) | +| [[Ubuntu] ubuntu-toolchain-r/test repository will be removed from images on May 13](https://github.com/actions/runner-images/issues/9679) | +*** # Ubuntu 24.04 LTS - OS Version: 24.04 LTS - Kernel Version: 6.8.0-1007-azure -- Image Version: 20240430.1.0 +- Image Version: 20240510.1.0 - Systemd version: 255.4-1ubuntu8 ## Installed Software @@ -15,7 +20,7 @@ - GNU C++: 12.3.0, 13.2.0, 14.0.1 - GNU Fortran: 12.3.0, 13.2.0, 14.0.1 - Julia 1.10.3 -- Node.js 20.12.2 +- Node.js 20.13.1 - Perl 5.38.2 - Python 3.12.3 - Ruby 3.2.3 @@ -23,14 +28,14 @@ ### Package Management - cpan 1.64 - Helm 3.14.4 -- Homebrew 4.2.20 +- Homebrew 4.2.21 - Miniconda 24.3.0 -- Npm 10.5.0 +- Npm 10.5.2 - Pip 24.0 - Pip3 24.0 - Pipx 1.4.3 - RubyGems 3.4.20 -- Vcpkg (build from commit c591ac646) +- Vcpkg (build from commit cbf4a6641) - Yarn 1.22.22 #### Environment variables @@ -57,14 +62,18 @@ to accomplish this. - Ansible 2.16.6 - apt-fast 1.10.0 - AzCopy 10.24.0 - available by `azcopy` and `azcopy10` aliases -- Bicep 0.26.170 -- CMake 3.29.2 -- CodeQL Action Bundle 2.17.1 +- Bazel 7.1.2 +- Bazelisk 1.19.0 +- Bicep 0.27.1 +- Buildah 1.33.7 +- CMake 3.29.3 +- CodeQL Action Bundle 2.17.2 - Docker Amazon ECR Credential Helper 0.7.1 - Docker Compose v2 2.27.0 - Docker-Buildx 0.14.0 - Docker Client 26.1.0 - Docker Server 26.1.0 +- Fastlane 2.220.0 - Git 2.43.2 - Git LFS 3.5.1 - Git-ftp 1.6.0 @@ -80,23 +89,33 @@ to accomplish this. - Newman 6.1.2 - OpenSSL 3.0.13-0ubuntu3 - Parcel 2.12.0 -- Pulumi 3.114.0 +- Podman 4.9.3 +- Pulumi 3.115.2 +- Skopeo 1.13.3 - Sphinx Open Source Search Server 2.2.11 - yamllint 1.35.1 - yq 4.43.1 - zstd 1.5.6 ### CLI Tools -- AWS CLI 2.15.42 +- AWS CLI 2.15.47 - AWS CLI Session Manager Plugin 1.2.553.0 - AWS SAM CLI 1.116.0 - Azure CLI 2.60.0 - Azure CLI (azure-devops) 1.0.0 -- GitHub CLI 2.49.0 +- GitHub CLI 2.49.1 + +### Java +| Version | Environment Variable | +| ------------------- | -------------------- | +| 8.0.412+8 | JAVA_HOME_8_X64 | +| 11.0.23+9 | JAVA_HOME_11_X64 | +| 17.0.11+9 (default) | JAVA_HOME_17_X64 | +| 21.0.3+9 | JAVA_HOME_21_X64 | ### PHP Tools - PHP: 8.3.6 -- Composer 2.7.4 +- Composer 2.7.6 - PHPUnit 8.5.38 ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. @@ -109,17 +128,17 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Stack 2.15.5 ### Rust Tools -- Cargo 1.77.2 -- Rust 1.77.2 -- Rustdoc 1.77.2 -- Rustup 1.27.0 +- Cargo 1.78.0 +- Rust 1.78.0 +- Rustdoc 1.78.0 +- Rustup 1.27.1 #### Packages - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 124.0.6367.118 -- ChromeDriver 124.0.6367.91 +- Google Chrome 124.0.6367.201 +- ChromeDriver 124.0.6367.201 - Chromium 124.0.6367.0 - Selenium server 4.20.0 @@ -139,7 +158,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - sqlite3 3.45.1 #### PostgreSQL -- PostgreSQL 16.2 +- PostgreSQL 16.3 ``` User: postgres PostgreSQL service is disabled by default. @@ -155,12 +174,34 @@ MySQL service is disabled by default. Use the following command as a part of your job to start the service: 'sudo systemctl start mysql.service' ``` +### Cached Tools + +#### Go +- 1.20.14 +- 1.21.10 +- 1.22.3 + +#### Node.js +- 16.20.2 +- 18.20.2 +- 20.13.1 + +#### Python +- 3.9.19 +- 3.10.14 +- 3.11.9 +- 3.12.3 + +#### PyPy +- 3.9.19 [PyPy 7.3.16] +- 3.10.14 [PyPy 7.3.16] + ### PowerShell Tools - PowerShell 7.4.2 #### PowerShell Modules - Az: 11.5.0 -- Microsoft.Graph: 2.18.0 +- Microsoft.Graph: 2.19.0 - Pester: 5.5.0 - PSScriptAnalyzer: 1.22.0 @@ -262,3 +303,4 @@ Use the following command as a part of your job to start the service: 'sudo syst | xz-utils | 5.6.1+really5.4.5-1 | | zip | 3.0-13build1 | | zsync | 0.6.2-5build1 | + From bca20e69215cc6c4e896f3a53dc15561ea381917 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Tue, 14 May 2024 17:57:38 +0200 Subject: [PATCH 2830/3485] [Ubuntu] Add 24.04 to templates (#9847) --- .github/ISSUE_TEMPLATE/announcement.yml | 1 + .github/ISSUE_TEMPLATE/bug-report.yml | 1 + .github/ISSUE_TEMPLATE/tool-request.yml | 1 + 3 files changed, 3 insertions(+) diff --git a/.github/ISSUE_TEMPLATE/announcement.yml b/.github/ISSUE_TEMPLATE/announcement.yml index 2dc3395932c2..769d7e62ba9d 100644 --- a/.github/ISSUE_TEMPLATE/announcement.yml +++ b/.github/ISSUE_TEMPLATE/announcement.yml @@ -38,6 +38,7 @@ body: options: - label: Ubuntu 20.04 - label: Ubuntu 22.04 + - label: Ubuntu 24.04 - label: macOS 11 - label: macOS 12 - label: macOS 13 diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml index f3502d0345c2..10498ee25153 100644 --- a/.github/ISSUE_TEMPLATE/bug-report.yml +++ b/.github/ISSUE_TEMPLATE/bug-report.yml @@ -21,6 +21,7 @@ body: options: - label: Ubuntu 20.04 - label: Ubuntu 22.04 + - label: Ubuntu 24.04 - label: macOS 11 - label: macOS 12 - label: macOS 13 diff --git a/.github/ISSUE_TEMPLATE/tool-request.yml b/.github/ISSUE_TEMPLATE/tool-request.yml index 07c443707be8..93d3de083512 100644 --- a/.github/ISSUE_TEMPLATE/tool-request.yml +++ b/.github/ISSUE_TEMPLATE/tool-request.yml @@ -59,6 +59,7 @@ body: options: - label: Ubuntu 20.04 - label: Ubuntu 22.04 + - label: Ubuntu 24.04 - label: macOS 11 - label: macOS 12 - label: macOS 13 From 2a7b21b9ba118d8e468e55e427823b8176dabe4c Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Tue, 14 May 2024 21:26:06 +0200 Subject: [PATCH 2831/3485] [Windows] Update VS2022 code signature (#9850) --- images/windows/toolsets/toolset-2022.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/windows/toolsets/toolset-2022.json b/images/windows/toolsets/toolset-2022.json index 79ecef7fa26e..34f5bfc5846c 100644 --- a/images/windows/toolsets/toolset-2022.json +++ b/images/windows/toolsets/toolset-2022.json @@ -176,7 +176,7 @@ "subversion" : "17", "edition" : "Enterprise", "channel": "release", - "signature": "F9A7CF9FBE13BAC767F4781061332DA6E8B4E0EE", + "signature": "C2048FB509F1C37A8C3E9EC6648118458AA01780", "workloads": [ "Component.Dotfuscator", "Component.Linux.CMake", From e5b505aba09dba328acbaf3c74cb5864e53b3e17 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Tue, 14 May 2024 21:32:51 +0200 Subject: [PATCH 2832/3485] README: mark ubuntu24 as beta (#9849) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e5c51259f8fc..9292b79cf7f6 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ To build a VM machine from this repo's source, see the [instructions](docs/creat | Image | YAML Label | Included Software | Rollout Status of Latest Image Release | | --------------------|---------------------|--------------------|--------------------| -| Ubuntu 24.04 | `ubuntu-24.04` | [ubuntu-24.04] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fmikhailkoliada%2F35b243dd6e217d041fe3dfa5b4e2e2ed%2Fraw%2Fubuntu24.json) | +| Ubuntu 24.04 <sup>beta</sup> | `ubuntu-24.04` | [ubuntu-24.04] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fmikhailkoliada%2F35b243dd6e217d041fe3dfa5b4e2e2ed%2Fraw%2Fubuntu24.json) | | Ubuntu 22.04 | `ubuntu-latest` or `ubuntu-22.04` | [ubuntu-22.04] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fmikhailkoliada%2F35b243dd6e217d041fe3dfa5b4e2e2ed%2Fraw%2Fubuntu22.json) | | Ubuntu 20.04 | `ubuntu-20.04` | [ubuntu-20.04] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fmikhailkoliada%2F35b243dd6e217d041fe3dfa5b4e2e2ed%2Fraw%2Fubuntu20.json) | | macOS 14 | `macos-latest-large` or `macos-14-large`| [macOS-14] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fmikhailkoliada%2F35b243dd6e217d041fe3dfa5b4e2e2ed%2Fraw%2Fmacos-14.json) | From 4873b60b58910fd8165e6dc1ec0933e4596c343c Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Wed, 15 May 2024 09:58:15 +0200 Subject: [PATCH 2833/3485] README: use the same tag for deprecated as for beta (#9852) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9292b79cf7f6..1b8844c81135 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ To build a VM machine from this repo's source, see the [instructions](docs/creat | macOS 13 | `macos-13` or `macos-13-large` | [macOS-13] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fmikhailkoliada%2F35b243dd6e217d041fe3dfa5b4e2e2ed%2Fraw%2Fmacos-13.json) | | macOS 13 Arm64 | `macos-13-xlarge` | [macOS-13-arm64] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fmikhailkoliada%2F35b243dd6e217d041fe3dfa5b4e2e2ed%2Fraw%2Fmacos-13-arm64.json) | | macOS 12 | `macos-12` or `macos-12-large`| [macOS-12] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fmikhailkoliada%2F35b243dd6e217d041fe3dfa5b4e2e2ed%2Fraw%2FmacOS-12.json) | -| macOS 11 [deprecated] | `macos-11`| [macOS-11] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fmikhailkoliada%2F35b243dd6e217d041fe3dfa5b4e2e2ed%2Fraw%2FmacOS-11.json) | +| macOS 11 <sup>deprecated</sup> | `macos-11`| [macOS-11] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fmikhailkoliada%2F35b243dd6e217d041fe3dfa5b4e2e2ed%2Fraw%2FmacOS-11.json) | | Windows Server 2022 | `windows-latest` or `windows-2022` | [windows-2022] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fmikhailkoliada%2F35b243dd6e217d041fe3dfa5b4e2e2ed%2Fraw%2Fwin22.json) | | Windows Server 2019 | `windows-2019` | [windows-2019] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fmikhailkoliada%2F35b243dd6e217d041fe3dfa5b4e2e2ed%2Fraw%2Fwin19.json) | From 7172a7f1c5de4759700b81294f7ce874fff789db Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Wed, 15 May 2024 11:43:03 +0200 Subject: [PATCH 2834/3485] [macOS] Add Xcode 15.4 Release (#9842) --- images/macos/toolsets/toolset-14.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/macos/toolsets/toolset-14.json b/images/macos/toolsets/toolset-14.json index 5fa413a34be0..4663731e0030 100644 --- a/images/macos/toolsets/toolset-14.json +++ b/images/macos/toolsets/toolset-14.json @@ -3,7 +3,7 @@ "default": "15.0.1", "x64": { "versions": [ - { "link": "15.4", "version": "15.4.0-Release.Candidate+15F31c", "install_runtimes": "true", "sha256": "33b853f2a9cf5e83c7a6f443c5d575f2bec85e903096ed232b0e1e43f400a596"}, + { "link": "15.4", "version": "15.4.0+15F31d", "install_runtimes": "true", "sha256": "82d3d61804ff3f4c7c82085e91dc701037ddaa770e542848b2477e22f4e8aa7a"}, { "link": "15.3", "version": "15.3.0+15E204a", "install_runtimes": "true", "sha256": "f13f6a2e2df432c3008e394640b8549a18c285acd7fd148d6c4bac8c3a5af234"}, { "link": "15.2", "version": "15.2.0+15C500b", "install_runtimes": "true", "sha256": "04E93680C6DDBEC84666531BE412DE778AFC8EAC6AB2037F4C2BE7290818B59B"}, { "link": "15.1", "version": "15.1.0+15C65", "install_runtimes": "true", "sha256": "857D8DB537BAC82BF99DE0E1D3895D214D4D02101C1340CEF3DAF6E821BA1D05"}, @@ -13,7 +13,7 @@ }, "arm64":{ "versions": [ - { "link": "15.4", "version": "15.4.0-Release.Candidate+15F31c", "install_runtimes": "true", "sha256": "33b853f2a9cf5e83c7a6f443c5d575f2bec85e903096ed232b0e1e43f400a596"}, + { "link": "15.4", "version": "15.4.0+15F31d", "install_runtimes": "true", "sha256": "82d3d61804ff3f4c7c82085e91dc701037ddaa770e542848b2477e22f4e8aa7a"}, { "link": "15.3", "version": "15.3.0+15E204a", "install_runtimes": "true", "sha256": "f13f6a2e2df432c3008e394640b8549a18c285acd7fd148d6c4bac8c3a5af234"}, { "link": "15.2", "version": "15.2.0+15C500b", "install_runtimes": "true", "sha256": "04E93680C6DDBEC84666531BE412DE778AFC8EAC6AB2037F4C2BE7290818B59B"}, { "link": "15.1", "version": "15.1.0+15C65", "install_runtimes": "true", "sha256": "857D8DB537BAC82BF99DE0E1D3895D214D4D02101C1340CEF3DAF6E821BA1D05"}, From 7d377ee02b461aa60ac4f24a856131c1b9d939e3 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 15 May 2024 13:48:27 +0000 Subject: [PATCH 2835/3485] Updating readme file for macos-14 version 20240514.3 (#9857) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-14-Readme.md | 74 ++++++++++++++++----------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/images/macos/macos-14-Readme.md b/images/macos/macos-14-Readme.md index 7174ba6df07c..0ba32a11ff10 100644 --- a/images/macos/macos-14-Readme.md +++ b/images/macos/macos-14-Readme.md @@ -1,12 +1,12 @@ # macOS 14 - OS Version: macOS 14.4.1 (23E224) - Kernel Version: Darwin 23.4.0 -- Image Version: 20240507.2 +- Image Version: 20240514.3 ## Installed Software ### Language and Runtime -- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.408, 8.0.101, 8.0.204 +- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.409, 8.0.101, 8.0.204, 8.0.300 - Bash 3.2.57(1)-release - Clang/LLVM 14.0.3 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` @@ -18,9 +18,9 @@ - GNU Fortran 13 (Homebrew GCC 13.2.0) - available by `gfortran-13` alias - Kotlin 1.9.24-release-822 - Mono 6.12.0.188 -- Node.js 20.12.2 +- Node.js 20.13.1 - Perl 5.38.2 -- PHP 8.3.6 +- PHP 8.3.7 - Python3 3.12.3 - Ruby 3.0.7p220 @@ -29,8 +29,8 @@ - Carthage 0.39.1 - CocoaPods 1.15.2 - Composer 2.7.6 -- Homebrew 4.2.21 -- NPM 10.5.0 +- Homebrew 4.3.0 +- NPM 10.5.2 - NuGet 6.3.1.1 - Pip3 24.0 (python 3.12) - Pipx 1.5.0 @@ -46,13 +46,13 @@ - 7-Zip 17.05 - aria2 1.37.0 - azcopy 10.24.0 -- bazel 7.1.1 -- bazelisk 1.19.0_1 +- bazel 7.1.2 +- bazelisk 1.20.0 - bsdtar 3.5.3 - available by 'tar' alias - Curl 8.7.1 -- Git 2.45.0 +- Git 2.45.1 - Git LFS 3.5.1 -- GitHub CLI 2.49.0 +- GitHub CLI 2.49.2 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.24.5 - gpg (GnuPG) 2.4.5 @@ -60,21 +60,21 @@ - OpenSSL 1.1.1w 11 Sep 2023 - Packer 1.9.4 - pkg-config 0.29.2 -- yq 4.43.1 +- yq 4.44.1 - zstd 1.5.6 ### Tools -- AWS CLI 2.15.45 +- AWS CLI 2.15.50 - AWS SAM CLI 1.116.0 - AWS Session Manager CLI 1.2.553.0 - Azure CLI 2.60.0 - Azure CLI (azure-devops) 1.0.0 - Bicep CLI 0.27.1 -- Cmake 3.29.2 -- CodeQL Action Bundle 2.17.1 +- Cmake 3.29.3 +- CodeQL Action Bundle 2.17.2 - Fastlane 2.220.0 -- SwiftFormat 0.53.8 -- Xcbeautify 2.3.0 +- SwiftFormat 0.53.9 +- Xcbeautify 2.3.1 - Xcode Command Line Tools 15.3.0.0.1.1708646388 - Xcodes 1.4.1 @@ -84,12 +84,12 @@ ### Browsers - Safari 17.4.1 (19618.1.15.11.14) - SafariDriver 17.4.1 (19618.1.15.11.14) -- Google Chrome 124.0.6367.156 -- Google Chrome for Testing 124.0.6367.155 -- ChromeDriver 124.0.6367.155 -- Microsoft Edge 124.0.2478.80 -- Microsoft Edge WebDriver 124.0.2478.80 -- Mozilla Firefox 125.0.3 +- Google Chrome 124.0.6367.208 +- Google Chrome for Testing 124.0.6367.207 +- ChromeDriver 124.0.6367.207 +- Microsoft Edge 124.0.2478.105 +- Microsoft Edge WebDriver 124.0.2478.97 +- Mozilla Firefox 126.0 - geckodriver 0.34.0 - Selenium server 4.20.0 @@ -122,12 +122,12 @@ #### Node.js - 18.20.2 -- 20.12.2 +- 20.13.1 #### Go - 1.20.14 -- 1.21.9 -- 1.22.2 +- 1.21.10 +- 1.22.3 ### Rust Tools - Cargo 1.78.0 @@ -148,14 +148,14 @@ - PSScriptAnalyzer: 1.22.0 ### Xcode -| Version | Build | Path | -| ---------------- | -------- | ------------------------------ | -| 15.4 (beta) | 15F5021i | /Applications/Xcode_15.4.app | -| 15.3 | 15E204a | /Applications/Xcode_15.3.app | -| 15.2 | 15C500b | /Applications/Xcode_15.2.app | -| 15.1 | 15C65 | /Applications/Xcode_15.1.app | -| 15.0.1 (default) | 15A507 | /Applications/Xcode_15.0.1.app | -| 14.3.1 | 14E300c | /Applications/Xcode_14.3.1.app | +| Version | Build | Path | +| ---------------- | ------- | ------------------------------ | +| 15.4 | 15F31c | /Applications/Xcode_15.4.app | +| 15.3 | 15E204a | /Applications/Xcode_15.3.app | +| 15.2 | 15C500b | /Applications/Xcode_15.2.app | +| 15.1 | 15C65 | /Applications/Xcode_15.1.app | +| 15.0.1 (default) | 15A507 | /Applications/Xcode_15.0.1.app | +| 14.3.1 | 14E300c | /Applications/Xcode_14.3.1.app | #### Installed SDKs | SDK | SDK Name | Xcode Version | @@ -199,11 +199,11 @@ | Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | | Simulator - visionOS 1.1 | xrsimulator1.1 | 15.3 | | visionOS 1.1 | xros1.1 | 15.3 | -| visionOS 1.2 | xros1.2 | 15.4 | | Simulator - visionOS 1.2 | xrsimulator1.2 | 15.4 | +| visionOS 1.2 | xros1.2 | 15.4 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | -| Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | +| Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | | DriverKit 22.4 | driverkit22.4 | 14.3.1 | | DriverKit 23.0 | driverkit23.0 | 15.0.1 | | DriverKit 23.2 | driverkit23.2 | 15.1, 15.2 | @@ -216,8 +216,8 @@ | iOS 16.4 | 14.3.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | | iOS 17.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | | iOS 17.2 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 17.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 17.5 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 17.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | +| iOS 17.5 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | | tvOS 16.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | | tvOS 17.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | | tvOS 17.2 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | From 384f5acb6226332005bb9e80f9f5eb07c11abdf0 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 15 May 2024 15:44:01 +0000 Subject: [PATCH 2836/3485] Updating readme file for macos-13 version 20240514.3 (#9860) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-13-Readme.md | 58 ++++++++++++++++----------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/images/macos/macos-13-Readme.md b/images/macos/macos-13-Readme.md index d1cc43336a29..42ed4562ad57 100644 --- a/images/macos/macos-13-Readme.md +++ b/images/macos/macos-13-Readme.md @@ -1,12 +1,12 @@ # macOS 13 - OS Version: macOS 13.6.6 (22G630) - Kernel Version: Darwin 22.6.0 -- Image Version: 20240506.1 +- Image Version: 20240514.3 ## Installed Software ### Language and Runtime -- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.408, 8.0.101, 8.0.204 +- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.409, 8.0.101, 8.0.204, 8.0.300 - Bash 3.2.57(1)-release - Clang/LLVM 14.0.0 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` @@ -16,11 +16,11 @@ - GNU Fortran 11 (Homebrew GCC 11.4.0) - available by `gfortran-11` alias - GNU Fortran 12 (Homebrew GCC 12.3.0) - available by `gfortran-12` alias - GNU Fortran 13 (Homebrew GCC 13.2.0) - available by `gfortran-13` alias -- Kotlin 1.9.23-release-779 +- Kotlin 1.9.24-release-822 - Mono 6.12.0.188 -- Node.js 20.12.2 +- Node.js 20.13.1 - Perl 5.38.2 -- PHP 8.3.6 +- PHP 8.3.7 - Python3 3.12.3 - Ruby 3.0.7p220 @@ -29,13 +29,13 @@ - Carthage 0.39.1 - CocoaPods 1.15.2 - Composer 2.7.6 -- Homebrew 4.2.21 -- NPM 10.5.0 +- Homebrew 4.3.0 +- NPM 10.5.2 - NuGet 6.3.1.1 - Pip3 24.0 (python 3.12) - Pipx 1.5.0 - RubyGems 3.5.10 -- Vcpkg 2024 (build from commit 28b1cf627) +- Vcpkg 2024 (build from commit bd2b54836) - Yarn 1.22.19 ### Project Management @@ -47,13 +47,13 @@ - 7-Zip 17.05 - aria2 1.37.0 - azcopy 10.24.0 -- bazel 7.1.1 -- bazelisk 1.19.0_1 +- bazel 7.1.2 +- bazelisk 1.20.0 - bsdtar 3.5.3 - available by 'tar' alias - Curl 8.7.1 -- Git 2.45.0 +- Git 2.45.1 - Git LFS 3.5.1 -- GitHub CLI 2.49.0 +- GitHub CLI 2.49.2 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.24.5 - gpg (GnuPG) 2.4.5 @@ -61,21 +61,21 @@ - OpenSSL 1.1.1w 11 Sep 2023 - Packer 1.9.4 - pkg-config 0.29.2 -- yq 4.43.1 +- yq 4.44.1 - zstd 1.5.6 ### Tools -- AWS CLI 2.15.45 +- AWS CLI 2.15.50 - AWS SAM CLI 1.116.0 - AWS Session Manager CLI 1.2.553.0 - Azure CLI 2.60.0 - Azure CLI (azure-devops) 1.0.0 -- Bicep CLI 0.26.170 -- Cmake 3.29.2 -- CodeQL Action Bundle 2.17.1 +- Bicep CLI 0.27.1 +- Cmake 3.29.3 +- CodeQL Action Bundle 2.17.2 - Fastlane 2.220.0 -- SwiftFormat 0.53.8 -- Xcbeautify 2.3.0 +- SwiftFormat 0.53.9 +- Xcbeautify 2.3.1 - Xcode Command Line Tools 14.3.1.0.1.1683849156 - Xcodes 1.4.1 @@ -85,12 +85,12 @@ ### Browsers - Safari 17.4.1 (18618.1.15.111.8) - SafariDriver 17.4.1 (18618.1.15.111.8) -- Google Chrome 124.0.6367.119 -- Google Chrome for Testing 124.0.6367.91 -- ChromeDriver 124.0.6367.91 -- Microsoft Edge 124.0.2478.80 -- Microsoft Edge WebDriver 124.0.2478.80 -- Mozilla Firefox 125.0.3 +- Google Chrome 124.0.6367.208 +- Google Chrome for Testing 124.0.6367.207 +- ChromeDriver 124.0.6367.207 +- Microsoft Edge 124.0.2478.105 +- Microsoft Edge WebDriver 124.0.2478.105 +- Mozilla Firefox 126.0 - geckodriver 0.34.0 - Selenium server 4.20.0 @@ -132,12 +132,12 @@ #### Node.js - 16.20.2 - 18.20.2 -- 20.12.2 +- 20.13.1 #### Go - 1.20.14 -- 1.21.9 -- 1.22.2 +- 1.21.10 +- 1.22.3 ### Rust Tools - Cargo 1.78.0 @@ -201,8 +201,8 @@ | Simulator - watchOS 9.4 | watchsimulator9.4 | 14.3.1 | | Simulator - watchOS 10.0 | watchsimulator10.0 | 15.0.1 | | Simulator - watchOS 10.2 | watchsimulator10.2 | 15.1, 15.2 | -| visionOS 1.0 | xros1.0 | 15.2 | | Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | +| visionOS 1.0 | xros1.0 | 15.2 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | From 98150396188d19c21a7d7c596cf4a4d7609bb12a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 15 May 2024 17:07:55 +0000 Subject: [PATCH 2837/3485] Updating readme file for ubuntu20 version 20240514.2.1 (#9855) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2004-Readme.md | 141 +++++++++++++++-------------- 1 file changed, 71 insertions(+), 70 deletions(-) diff --git a/images/ubuntu/Ubuntu2004-Readme.md b/images/ubuntu/Ubuntu2004-Readme.md index c682422895b7..283a2648e5a7 100644 --- a/images/ubuntu/Ubuntu2004-Readme.md +++ b/images/ubuntu/Ubuntu2004-Readme.md @@ -1,12 +1,13 @@ | Announcements | |-| +| [Ubuntu 24.04 is now available](https://github.com/actions/runner-images/issues/9848) | | [[Ubuntu, Windows] Docker Compose v1 will be removed from images on July, 9](https://github.com/actions/runner-images/issues/9692) | -| [[Ubuntu] ubuntu-toolchain-r/test repository will be removed from images on May 6](https://github.com/actions/runner-images/issues/9679) | +| [[Ubuntu] ubuntu-toolchain-r/test repository will be removed from images on May 13](https://github.com/actions/runner-images/issues/9679) | *** # Ubuntu 20.04 - OS Version: 20.04.6 LTS -- Kernel Version: 5.15.0-1061-azure -- Image Version: 20240422.1.0 +- Kernel Version: 5.15.0-1064-azure +- Image Version: 20240514.2.0 - Systemd version: 245.4-4ubuntu3.23 ## Installed Software @@ -19,10 +20,10 @@ - Dash 0.5.10.2-6 - Erlang 25.3 (Eshell 13.2) - Erlang rebar3 3.23.0 -- GNU C++: 9.4.0, 10.5.0 -- GNU Fortran: 9.4.0, 10.5.0 -- Julia 1.10.2 -- Kotlin 1.9.23-release-779 +- GNU C++: 10.5.0 +- GNU Fortran: 10.5.0 +- Julia 1.10.3 +- Kotlin 1.9.24-release-822 - Mono 6.12.0.200 - MSBuild 16.10.1.31701 (Mono 6.12.0.200) - Node.js 18.20.2 @@ -34,7 +35,7 @@ ### Package Management - cpan 1.64 - Helm 3.14.4 -- Homebrew 4.2.19 +- Homebrew 4.3.0 - Miniconda 24.3.0 - Npm 10.5.0 - NuGet 6.6.1.2 @@ -42,7 +43,7 @@ - Pip3 20.0.2 - Pipx 1.5.0 - RubyGems 3.1.2 -- Vcpkg (build from commit 9224b3bbd) +- Vcpkg (build from commit bd2b54836) - Yarn 1.22.22 #### Environment variables @@ -62,21 +63,21 @@ to accomplish this. ### Project Management - Ant 1.10.7 - Gradle 8.7 -- Lerna 8.1.2 +- Lerna 8.1.3 - Maven 3.8.8 -- Sbt 1.9.9 +- Sbt 1.10.0 ### Tools - Ansible 2.13.13 - apt-fast 1.10.0 - AzCopy 10.24.0 - available by `azcopy` and `azcopy10` aliases -- Bazel 7.1.1 +- Bazel 7.1.2 - Bazelisk 1.19.0 -- Bicep 0.26.170 +- Bicep 0.27.1 - Buildah 1.22.3 -- CMake 3.29.2 -- CodeQL Action Bundle 2.17.0 -- Docker Amazon ECR Credential Helper 0.7.1 +- CMake 3.29.3 +- CodeQL Action Bundle 2.17.2 +- Docker Amazon ECR Credential Helper 0.8.0 - Docker Compose v1 1.29.2 - Docker Compose v2 2.23.3 - Docker-Buildx 0.14.0 @@ -87,59 +88,59 @@ to accomplish this. - Git LFS 3.5.1 - Git-ftp 1.6.0 - Haveged 1.9.1 -- Heroku 8.11.4 +- Heroku 8.11.5 - HHVM (HipHop VM) 4.172.1 - jq 1.6 -- Kind 0.22.0 +- Kind 0.23.0 - Kubectl 1.30.0 - Kustomize 5.4.1 - Leiningen 2.11.2 - MediaInfo 19.09 - Mercurial 5.3.1 -- Minikube 1.33.0 +- Minikube 1.33.1 - n 9.2.3 - Newman 6.1.2 - nvm 0.39.7 - OpenSSL 1.1.1f-1ubuntu2.22 -- Packer 1.10.2 +- Packer 1.10.3 - Parcel 2.12.0 - PhantomJS 2.1.1 2.1.1 - Podman 3.4.2 -- Pulumi 3.113.3 -- R 4.3.3 +- Pulumi 3.116.0 +- R 4.4.0 - Skopeo 1.5.0 - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 -- Terraform 1.8.1 +- Terraform 1.8.3 - yamllint 1.35.1 -- yq 4.43.1 +- yq 4.44.1 - zstd 1.5.6 ### CLI Tools - Alibaba Cloud CLI 3.0.174 -- AWS CLI 2.15.40 +- AWS CLI 2.15.50 - AWS CLI Session Manager Plugin 1.2.553.0 -- AWS SAM CLI 1.115.0 -- Azure CLI 2.59.0 +- AWS SAM CLI 1.116.0 +- Azure CLI 2.60.0 - Azure CLI (azure-devops) 1.0.0 -- GitHub CLI 2.48.0 -- Google Cloud CLI 472.0.0 -- Netlify CLI 17.22.1 -- OpenShift CLI 4.15.9 +- GitHub CLI 2.49.2 +- Google Cloud CLI 476.0.0 +- Netlify CLI 17.23.5 +- OpenShift CLI 4.15.12 - ORAS CLI 1.1.0 -- Vercel CLI 34.1.1 +- Vercel CLI 34.1.14 ### Java | Version | Environment Variable | | ------------------- | -------------------- | -| 8.0.402+6 | JAVA_HOME_8_X64 | -| 11.0.22+7 (default) | JAVA_HOME_11_X64 | -| 17.0.10+7 | JAVA_HOME_17_X64 | -| 21.0.2+13 | JAVA_HOME_21_X64 | +| 8.0.412+8 | JAVA_HOME_8_X64 | +| 11.0.23+9 (default) | JAVA_HOME_11_X64 | +| 17.0.11+9 | JAVA_HOME_17_X64 | +| 21.0.3+9 | JAVA_HOME_21_X64 | ### PHP Tools -- PHP: 7.4.33, 8.0.30, 8.1.27, 8.2.18, 8.3.6 -- Composer 2.7.3 +- PHP: 7.4.33, 8.0.30, 8.1.28, 8.2.19, 8.3.7 +- Composer 2.7.6 - PHPUnit 8.5.38 ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. @@ -147,32 +148,32 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ### Haskell Tools - Cabal 3.10.3.0 -- GHC 9.8.2 +- GHC 9.10.1 - GHCup 0.1.22.0 -- Stack 2.15.5 +- Stack 2.15.7 ### Rust Tools -- Cargo 1.77.2 -- Rust 1.77.2 -- Rustdoc 1.77.2 -- Rustup 1.27.0 +- Cargo 1.78.0 +- Rust 1.78.0 +- Rustdoc 1.78.0 +- Rustup 1.27.1 #### Packages - Bindgen 0.69.4 - Cargo audit 0.20.0 -- Cargo clippy 0.1.77 +- Cargo clippy 0.1.78 - Cargo outdated 0.15.0 - Cbindgen 0.26.0 - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 124.0.6367.60 -- ChromeDriver 124.0.6367.60 +- Google Chrome 124.0.6367.207 +- ChromeDriver 124.0.6367.207 - Chromium 124.0.6367.0 -- Microsoft Edge 124.0.2478.51 -- Microsoft Edge WebDriver 124.0.2478.51 -- Selenium server 4.19.1 -- Mozilla Firefox 125.0.1 +- Microsoft Edge 124.0.2478.105 +- Microsoft Edge WebDriver 124.0.2478.105 +- Selenium server 4.20.0 +- Mozilla Firefox 126.0 - Geckodriver 0.34.0 #### Environment variables @@ -184,7 +185,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | ### .NET Tools -- .NET Core SDK: 6.0.421, 7.0.408, 8.0.204 +- .NET Core SDK: 6.0.422, 7.0.409, 8.0.300 - nbgv 3.6.133+2d32d93cb1 ### Databases @@ -192,7 +193,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - sqlite3 3.31.1 #### PostgreSQL -- PostgreSQL 14.11 +- PostgreSQL 14.12 ``` User: postgres PostgreSQL service is disabled by default. @@ -216,13 +217,13 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Go - 1.20.14 -- 1.21.9 -- 1.22.2 +- 1.21.10 +- 1.22.3 #### Node.js - 16.20.2 - 18.20.2 -- 20.12.2 +- 20.13.1 #### Python - 3.7.17 @@ -233,16 +234,16 @@ Use the following command as a part of your job to start the service: 'sudo syst - 3.12.3 #### PyPy -- 2.7.18 [PyPy 7.3.15] +- 2.7.18 [PyPy 7.3.16] - 3.6.12 [PyPy 7.3.3] - 3.7.13 [PyPy 7.3.9] - 3.8.16 [PyPy 7.3.11] -- 3.9.18 [PyPy 7.3.15] -- 3.10.13 [PyPy 7.3.15] +- 3.9.19 [PyPy 7.3.16] +- 3.10.14 [PyPy 7.3.16] #### Ruby -- 3.0.6 -- 3.1.4 +- 3.0.7 +- 3.1.5 ### PowerShell Tools - PowerShell 7.4.1 @@ -250,7 +251,7 @@ Use the following command as a part of your job to start the service: 'sudo syst #### PowerShell Modules - Az: 11.3.1 - MarkdownPS: 1.9 -- Microsoft.Graph: 2.17.0 +- Microsoft.Graph: 2.19.0 - Pester: 5.5.0 - PSScriptAnalyzer: 1.22.0 @@ -289,17 +290,17 @@ Use the following command as a part of your job to start the service: 'sudo syst | alpine:3.16 | sha256:452e7292acee0ee16c332324d7de05fa2c99f9994ecc9f0779c602916a672ae4 | 2024-01-27 | | alpine:3.17 | sha256:53cf9478b76f4c8fae126acbdfb79bed6e69e628faff572ebe4a029d3d247d98 | 2024-01-27 | | alpine:3.18 | sha256:11e21d7b981a59554b3f822c49f6e9f57b6068bb74f49c4cd5cc4c663c7e5160 | 2024-01-27 | -| debian:10 | sha256:873743c4eec09ddea0dcac0cda31fce2ff348ed41cd1d5c33ecee7d42f03052f | 2024-04-10 | -| debian:11 | sha256:26d72b71f88865377988af6f54da9aaa5bed201f39bcee13eb55737016660df2 | 2024-04-10 | +| debian:10 | sha256:6e7bd55a5705914837aad8db01b349f4617510c11e47ccae8e87f6f14e489626 | 2024-05-14 | +| debian:11 | sha256:2c7a92a41cb814c00e7d455b2bc0c90ccdb9a4ced2ffdc10e562c7a84a186032 | 2024-05-14 | | debian:9 | sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be | 2022-06-23 | -| moby/buildkit:latest | sha256:00d2c6b8f39ae515e0eadd74f39e71a5efdc94321c9b919692a2aa32deef2bb1 | 2024-03-18 | +| moby/buildkit:latest | sha256:9194b5ec1be368f41c516df7f93f7f540630ea06136056b2ffebb62226ed4ad6 | 2024-04-25 | | node:16 | sha256:f77a1aef2da8d83e45ec990f45df50f1a286c5fe8bbfb8c6e4246c6389705c0b | 2023-09-07 | | node:16-alpine | sha256:a1f9d027912b58a7c75be7716c97cfbc6d3099f3a97ed84aa490be9dee20e787 | 2023-08-10 | -| node:18 | sha256:bdbe1cff7e74208531a90ffcfa32b1cb909d4720d9aa60b649b26b9e7ba439a5 | 2024-04-11 | -| node:18-alpine | sha256:80338ff3fc4e989c1d5264a23223cec1c6014e812e584e825e78d1a98d893381 | 2024-04-11 | -| node:20 | sha256:844b41cf784f66d7920fd673f7af54ca7b81e289985edc6cd864e7d05e0d133c | 2024-04-11 | -| node:20-alpine | sha256:ec0c413b1d84f3f7f67ec986ba885930c57b5318d2eb3abc6960ee05d4f2eb28 | 2024-04-11 | -| ubuntu:20.04 | sha256:71b82b8e734f5cd0b3533a16f40ca1271f28d87343972bb4cd6bd6c38f1bd38e | 2024-04-10 | +| node:18 | sha256:5bac3a1edff13e76586b8eaef1d411fcd80e4f18cce5bc40ea6993245e0721ec | 2024-05-14 | +| node:18-alpine | sha256:4837c2ac8998cf172f5892fb45f229c328e4824c43c8506f8ba9c7996d702430 | 2024-04-23 | +| node:20 | sha256:d6925dc84f8c0d1c1f8df4ea6a9a54e57d430241cb734b1b0c45ed6d26e8e9c0 | 2024-05-14 | +| node:20-alpine | sha256:291e84d956f1aff38454bbd3da38941461ad569a185c20aa289f71f37ea08e23 | 2024-05-09 | +| ubuntu:20.04 | sha256:874aca52f79ae5f8258faff03e10ce99ae836f6e7d2df6ecd3da5c1cad3a912b | 2024-04-27 | ### Installed apt packages | Name | Version | From b98d6e44fadab18a106a1ccd4a5948e7c47d31b1 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 15 May 2024 18:39:54 +0000 Subject: [PATCH 2838/3485] Updating readme file for win19 version 20240514.1.1 (#9856) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/windows/Windows2019-Readme.md | 126 +++++++++++++-------------- 1 file changed, 63 insertions(+), 63 deletions(-) diff --git a/images/windows/Windows2019-Readme.md b/images/windows/Windows2019-Readme.md index 9371d261e627..941d8e8f2916 100644 --- a/images/windows/Windows2019-Readme.md +++ b/images/windows/Windows2019-Readme.md @@ -4,8 +4,8 @@ | [[Ubuntu, Windows] Docker Compose v1 will be removed from images on July, 9](https://github.com/actions/runner-images/issues/9692) | *** # Windows Server 2019 -- OS Version: 10.0.17763 Build 5696 -- Image Version: 20240422.1.0 +- OS Version: 10.0.17763 Build 5820 +- Image Version: 20240514.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -14,27 +14,27 @@ ### Language and Runtime - Bash 5.2.26(1)-release -- Go 1.21.9 -- Julia 1.10.2 -- Kotlin 1.9.23 +- Go 1.21.10 +- Julia 1.10.3 +- Kotlin 1.9.24 - LLVM 16.0.6 -- Node 18.18.2 +- Node 18.20.2 - Perl 5.32.1 -- PHP 8.3.6 +- PHP 8.3.7 - Python 3.7.9 -- Ruby 3.0.6p216 +- Ruby 3.0.7p220 ### Package Management - Chocolatey 2.2.2 -- Composer 2.7.3 -- Helm 3.14.3 +- Composer 2.7.6 +- Helm 3.14.4 - Miniconda 24.3.0 (pre-installed on the image but not added to PATH) -- NPM 9.8.1 +- NPM 10.5.0 - NuGet 6.9.1.3 - pip 24.0 (python 3.7) - Pipx 1.2.1 - RubyGems 3.2.33 -- Vcpkg (build from commit 9224b3bbd) +- Vcpkg (build from commit bd2b54836) - Yarn 1.22.22 #### Environment variables @@ -47,30 +47,30 @@ - Ant 1.10.14 - Gradle 8.7 - Maven 3.8.7 -- sbt 1.9.9 +- sbt 1.10.0 ### Tools - 7zip 23.01 - aria2 1.37.0 - azcopy 10.24.0 -- Bazel 7.1.1 +- Bazel 7.1.2 - Bazelisk 1.19.0 -- Bicep 0.26.170 +- Bicep 0.27.1 - Cabal 3.10.3.0 -- CMake 3.29.2 -- CodeQL Action Bundle 2.17.0 +- CMake 3.29.3 +- CodeQL Action Bundle 2.17.2 - Docker 24.0.7 - Docker Compose v1 1.29.2 - Docker Compose v2 2.23.3 - Docker-wincred 0.8.1 -- ghc 9.8.2 -- Git 2.44.0.windows.1 -- Git LFS 3.4.1 -- Google Cloud CLI 472.0.0 +- ghc 9.10.1 +- Git 2.45.1.windows.1 +- Git LFS 3.5.1 +- Google Cloud CLI 476.0.0 - ImageMagick 7.1.1-29 - InnoSetup 6.2.2 - jq 1.7.1 -- Kind 0.22.0 +- Kind 0.23.0 - Kubectl 1.30.0 - Mercurial 5.0 - gcc 8.1.0 @@ -81,10 +81,10 @@ - OpenSSL 1.1.1w - Packer 1.10.2 - Parcel 2.12.0 -- Pulumi 3.113.3 -- R 4.3.3 +- Pulumi 3.116.0 +- R 4.4.0 - Service Fabric SDK 9.1.1436.9590 -- Stack 2.15.5 +- Stack 2.15.7 - Subversion (SVN) 1.14.2 - Swig 4.1.1 - VSWhere 3.1.7 @@ -94,38 +94,38 @@ - zstd 1.5.6 ### CLI Tools -- Alibaba Cloud CLI 3.0.202 -- AWS CLI 2.15.40 -- AWS SAM CLI 1.115.0 +- Alibaba Cloud CLI 3.0.205 +- AWS CLI 2.15.48 +- AWS SAM CLI 1.116.0 - AWS Session Manager CLI 1.2.553.0 -- Azure CLI 2.59.0 +- Azure CLI 2.60.0 - Azure DevOps CLI extension 1.0.0 - Cloud Foundry CLI 6.53.0 -- GitHub CLI 2.48.0 +- GitHub CLI 2.49.2 ### Rust Tools -- Cargo 1.77.2 -- Rust 1.77.2 -- Rustdoc 1.77.2 -- Rustup 1.27.0 +- Cargo 1.78.0 +- Rust 1.78.0 +- Rustdoc 1.78.0 +- Rustup 1.27.1 #### Packages - bindgen 0.69.4 - cargo-audit 0.20.0 - cargo-outdated 0.15.0 - cbindgen 0.26.0 -- Clippy 0.1.77 +- Clippy 0.1.78 - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 124.0.6367.61 -- Chrome Driver 124.0.6367.60 -- Microsoft Edge 124.0.2478.51 -- Microsoft Edge Driver 124.0.2478.51 -- Mozilla Firefox 125.0.1 +- Google Chrome 124.0.6367.208 +- Chrome Driver 124.0.6367.207 +- Microsoft Edge 124.0.2478.97 +- Microsoft Edge Driver 124.0.2478.97 +- Mozilla Firefox 126.0 - Gecko Driver 0.34.0 - IE Driver 4.14.0.0 -- Selenium server 4.19.0 +- Selenium server 4.20.0 #### Environment variables | Name | Value | @@ -151,7 +151,7 @@ | wslbash.exe | C:\Windows\System32\bash.exe | ### MSYS2 -- Pacman 6.0.2 +- Pacman 6.1.0 #### Notes ``` @@ -167,13 +167,13 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Go - 1.20.14 -- 1.21.9 -- 1.22.2 +- 1.21.10 +- 1.22.3 #### Node.js - 16.20.2 - 18.20.2 -- 20.12.2 +- 20.13.1 #### Python - 3.7.9 @@ -184,16 +184,16 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 3.12.3 #### PyPy -- 2.7.18 [PyPy 7.3.15] +- 2.7.18 [PyPy 7.3.16] - 3.6.12 [PyPy 7.3.3] - 3.7.13 [PyPy 7.3.9] - 3.8.16 [PyPy 7.3.11] -- 3.9.18 [PyPy 7.3.15] -- 3.10.13 [PyPy 7.3.15] +- 3.9.19 [PyPy 7.3.16] +- 3.10.14 [PyPy 7.3.16] #### Ruby -- 3.0.6 -- 3.1.4 +- 3.0.7 +- 3.1.5 ### Databases @@ -201,7 +201,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Property | Value | | -------------------- | ------------------------------------------------------------------------------------------------------------------------------------ | | ServiceName | postgresql-x64-14 | -| Version | 14.11 | +| Version | 14.12 | | ServiceStatus | Stopped | | ServiceStartType | Disabled | | EnvironmentVariables | PGBIN=C:\Program Files\PostgreSQL\14\bin <br> PGDATA=C:\Program Files\PostgreSQL\14\data <br> PGROOT=C:\Program Files\PostgreSQL\14 | @@ -230,12 +230,12 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Visual Studio Enterprise 2019 | Name | Version | Path | | ----------------------------- | -------------- | -------------------------------------------------------------- | -| Visual Studio Enterprise 2019 | 16.11.34729.46 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | +| Visual Studio Enterprise 2019 | 16.11.34902.97 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | #### Workloads, components and extensions | Package | Version | | ------------------------------------------------------------------------- | --------------- | -| Component.Android.NDK.R16B | 16.11.34728.71 | +| Component.Android.NDK.R16B | 16.11.34827.16 | | Component.Android.SDK25.Private | 16.0.28625.61 | | Component.Android.SDK30 | 16.10.31205.252 | | Component.Ant | 1.9.3.8 | @@ -293,7 +293,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Component.AppInsights.Tools | 16.5.29515.121 | | Microsoft.VisualStudio.Component.AspNet45 | 16.10.31205.252 | | Microsoft.VisualStudio.Component.Azure.AuthoringTools | 16.11.31827.77 | -| Microsoft.VisualStudio.Component.Azure.ClientLibs | 16.0.28315.86 | +| Microsoft.VisualStudio.Component.Azure.ClientLibs | 16.11.34829.67 | | Microsoft.VisualStudio.Component.Azure.Compute.Emulator | 16.11.31827.77 | | Microsoft.VisualStudio.Component.Azure.Kubernetes.Tools | 16.10.31205.252 | | Microsoft.VisualStudio.Component.Azure.Powershell | 16.5.29515.121 | @@ -422,7 +422,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.ComponentGroup.Azure.Prerequisites | 16.10.31303.231 | | Microsoft.VisualStudio.ComponentGroup.Azure.ResourceManager.Tools | 16.0.28528.71 | | Microsoft.VisualStudio.ComponentGroup.AzureFunctions | 16.10.31205.180 | -| Microsoft.VisualStudio.ComponentGroup.MSIX.Packaging | 16.10.31205.180 | +| Microsoft.VisualStudio.ComponentGroup.MSIX.Packaging | 16.11.34827.16 | | Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core | 16.2.29012.281 | | Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Llvm.Clang | 16.11.31603.221 | | Microsoft.VisualStudio.ComponentGroup.UWP.NetCoreAndStandard | 16.11.33214.272 | @@ -493,11 +493,11 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 10.0.22621.0 ### .NET Core Tools -- .NET Core SDK: 6.0.129, 6.0.203, 6.0.321, 6.0.421, 7.0.118, 7.0.203, 7.0.315, 7.0.408 +- .NET Core SDK: 6.0.130, 6.0.203, 6.0.321, 6.0.422, 7.0.119, 7.0.203, 7.0.316, 7.0.409, 8.0.105, 8.0.205, 8.0.300 - .NET Framework: 4.7.2, 4.8 -- Microsoft.AspNetCore.App: 6.0.5, 6.0.26, 6.0.29, 7.0.5, 7.0.18 -- Microsoft.NETCore.App: 6.0.5, 6.0.26, 6.0.29, 7.0.5, 7.0.18 -- Microsoft.WindowsDesktop.App: 6.0.5, 6.0.26, 6.0.29, 7.0.5, 7.0.18 +- Microsoft.AspNetCore.App: 6.0.5, 6.0.26, 6.0.30, 7.0.5, 7.0.19, 8.0.5 +- Microsoft.NETCore.App: 6.0.5, 6.0.26, 6.0.30, 7.0.5, 7.0.19, 8.0.5 +- Microsoft.WindowsDesktop.App: 6.0.5, 6.0.26, 6.0.30, 7.0.5, 7.0.19, 8.0.5 - nbgv 3.6.133+2d32d93cb1 ### PowerShell Tools @@ -509,10 +509,10 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - AzureRM: 2.1.0 (Default), 6.13.1 - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.562 +- AWSPowershell: 4.1.579 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 -- Microsoft.Graph: 2.17.0 +- Microsoft.Graph: 2.19.0 - Pester: 3.4.0, 5.5.0 - PowerShellGet: 1.0.0.1, 2.2.5 - PSScriptAnalyzer: 1.22.0 @@ -555,6 +555,6 @@ All other versions are saved but not installed. | mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:21e238b7a784c14fb02717859a9ac0cb39109c15e1a340400d3e3c2cccbc081d | 2024-04-09 | | mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:504e7de522e227c46da6408894c19a4454b9979ab06b8577dae1fa5885795450 | 2024-04-09 | | mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:46e393cbb7c915c504a810639e35f40cb516f8e886e4cbcf8a3b49f86705a070 | 2024-04-09 | -| mcr.microsoft.com/windows/nanoserver:1809 | sha256:9118c25a81609f13b441411f006b7cb6dd50958303e228f53914bebd8056d2e1 | 2024-04-06 | -| mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:6fdf140282a2f809dae9b13fe441635867f0a27c33a438771673b8da8f3348a4 | 2024-04-06 | +| mcr.microsoft.com/windows/nanoserver:1809 | sha256:6f62243adf70b086613cb4b4596c276fe73bab1e5152037eb5b156c915886be8 | 2024-05-10 | +| mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:3c97a5c1c32ddb346c190f00a588da6e682a9a8160869f4969edfd7c6e4d1c03 | 2024-05-10 | From cfcc1c6a1b0eff62779c36d5449a8874b3114122 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 15 May 2024 20:28:30 +0000 Subject: [PATCH 2839/3485] Updating readme file for ubuntu22 version 20240514.2.1 (#9854) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2204-Readme.md | 142 +++++++++++++++-------------- 1 file changed, 73 insertions(+), 69 deletions(-) diff --git a/images/ubuntu/Ubuntu2204-Readme.md b/images/ubuntu/Ubuntu2204-Readme.md index 1e5c3de7f7d6..27e43a491c04 100644 --- a/images/ubuntu/Ubuntu2204-Readme.md +++ b/images/ubuntu/Ubuntu2204-Readme.md @@ -1,12 +1,13 @@ | Announcements | |-| +| [Ubuntu 24.04 is now available](https://github.com/actions/runner-images/issues/9848) | | [[Ubuntu, Windows] Docker Compose v1 will be removed from images on July, 9](https://github.com/actions/runner-images/issues/9692) | -| [[Ubuntu] ubuntu-toolchain-r/test repository will be removed from images on May 6](https://github.com/actions/runner-images/issues/9679) | +| [[Ubuntu] ubuntu-toolchain-r/test repository will be removed from images on May 13](https://github.com/actions/runner-images/issues/9679) | *** # Ubuntu 22.04 - OS Version: 22.04.4 LTS -- Kernel Version: 6.5.0-1018-azure -- Image Version: 20240422.1.0 +- Kernel Version: 6.5.0-1021-azure +- Image Version: 20240514.2.0 - Systemd version: 249.11-0ubuntu3.12 ## Installed Software @@ -17,10 +18,10 @@ - Clang-format: 13.0.1, 14.0.0, 15.0.7 - Clang-tidy: 13.0.1, 14.0.0, 15.0.7 - Dash 0.5.11+git20210903+057cd650a4ed-3build1 -- GNU C++: 9.5.0, 10.5.0, 11.4.0, 12.3.0, 13.1.0 -- GNU Fortran: 9.5.0, 10.5.0, 11.4.0, 12.3.0, 13.1.0 -- Julia 1.10.2 -- Kotlin 1.9.23-release-779 +- GNU C++: 10.5.0, 11.4.0, 12.3.0 +- GNU Fortran: 10.5.0, 11.4.0, 12.3.0 +- Julia 1.10.3 +- Kotlin 1.9.24-release-822 - Mono 6.12.0.200 - MSBuild 16.10.1.31701 (Mono 6.12.0.200) - Node.js 18.20.2 @@ -32,7 +33,7 @@ ### Package Management - cpan 1.64 - Helm 3.14.4 -- Homebrew 4.2.19 +- Homebrew 4.3.0 - Miniconda 24.3.0 - Npm 10.5.0 - NuGet 6.6.1.2 @@ -40,7 +41,7 @@ - Pip3 22.0.2 - Pipx 1.5.0 - RubyGems 3.3.5 -- Vcpkg (build from commit 9224b3bbd) +- Vcpkg (build from commit bd2b54836) - Yarn 1.22.22 #### Environment variables @@ -58,20 +59,23 @@ to accomplish this. ``` ### Project Management -- Lerna 8.1.2 +- Ant 1.10.12 +- Gradle 8.7 +- Lerna 8.1.3 - Maven 3.8.8 +- Sbt 1.10.0 ### Tools - Ansible 2.16.6 - apt-fast 1.10.0 - AzCopy 10.24.0 - available by `azcopy` and `azcopy10` aliases -- Bazel 7.1.1 +- Bazel 7.1.2 - Bazelisk 1.19.0 -- Bicep 0.26.170 +- Bicep 0.27.1 - Buildah 1.23.1 -- CMake 3.29.2 -- CodeQL Action Bundle 2.17.0 -- Docker Amazon ECR Credential Helper 0.7.1 +- CMake 3.29.3 +- CodeQL Action Bundle 2.17.2 +- Docker Amazon ECR Credential Helper 0.8.0 - Docker Compose v1 1.29.2 - Docker Compose v2 2.23.3 - Docker-Buildx 0.14.0 @@ -82,57 +86,57 @@ to accomplish this. - Git LFS 3.5.1 - Git-ftp 1.6.0 - Haveged 1.9.14 -- Heroku 8.11.4 +- Heroku 8.11.5 - jq 1.6 -- Kind 0.22.0 +- Kind 0.23.0 - Kubectl 1.30.0 - Kustomize 5.4.1 - Leiningen 2.11.2 - MediaInfo 21.09 - Mercurial 6.1.1 -- Minikube 1.33.0 +- Minikube 1.33.1 - n 9.2.3 - Newman 6.1.2 - nvm 0.39.7 - OpenSSL 3.0.2-0ubuntu1.15 -- Packer 1.10.2 +- Packer 1.10.3 - Parcel 2.12.0 - Podman 3.4.4 -- Pulumi 3.113.3 -- R 4.3.3 +- Pulumi 3.116.0 +- R 4.4.0 - Skopeo 1.4.1 - Sphinx Open Source Search Server 2.2.11 - SVN 1.14.1 -- Terraform 1.8.1 +- Terraform 1.8.3 - yamllint 1.35.1 -- yq 4.43.1 +- yq 4.44.1 - zstd 1.5.6 ### CLI Tools -- Alibaba Cloud CLI 3.0.202 -- AWS CLI 2.15.40 +- Alibaba Cloud CLI 3.0.205 +- AWS CLI 2.15.50 - AWS CLI Session Manager Plugin 1.2.553.0 -- AWS SAM CLI 1.115.0 -- Azure CLI 2.59.0 +- AWS SAM CLI 1.116.0 +- Azure CLI 2.60.0 - Azure CLI (azure-devops) 1.0.0 -- GitHub CLI 2.48.0 -- Google Cloud CLI 472.0.0 -- Netlify CLI 17.22.1 -- OpenShift CLI 4.15.9 +- GitHub CLI 2.49.2 +- Google Cloud CLI 476.0.0 +- Netlify CLI 17.23.5 +- OpenShift CLI 4.15.12 - ORAS CLI 1.1.0 -- Vercel CLI 34.1.1 +- Vercel CLI 34.1.14 ### Java | Version | Environment Variable | | ------------------- | -------------------- | -| 8.0.402+6 | JAVA_HOME_8_X64 | -| 11.0.22+7 (default) | JAVA_HOME_11_X64 | -| 17.0.10+7 | JAVA_HOME_17_X64 | -| 21.0.2+13 | JAVA_HOME_21_X64 | +| 8.0.412+8 | JAVA_HOME_8_X64 | +| 11.0.23+9 (default) | JAVA_HOME_11_X64 | +| 17.0.11+9 | JAVA_HOME_17_X64 | +| 21.0.3+9 | JAVA_HOME_21_X64 | ### PHP Tools - PHP: 8.1.2 -- Composer 2.7.3 +- Composer 2.7.6 - PHPUnit 8.5.38 ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. @@ -140,32 +144,32 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ### Haskell Tools - Cabal 3.10.3.0 -- GHC 9.8.2 +- GHC 9.10.1 - GHCup 0.1.22.0 -- Stack 2.15.5 +- Stack 2.15.7 ### Rust Tools -- Cargo 1.77.2 -- Rust 1.77.2 -- Rustdoc 1.77.2 -- Rustup 1.27.0 +- Cargo 1.78.0 +- Rust 1.78.0 +- Rustdoc 1.78.0 +- Rustup 1.27.1 #### Packages - Bindgen 0.69.4 - Cargo audit 0.20.0 -- Cargo clippy 0.1.77 +- Cargo clippy 0.1.78 - Cargo outdated 0.15.0 - Cbindgen 0.26.0 - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 124.0.6367.60 -- ChromeDriver 124.0.6367.60 +- Google Chrome 124.0.6367.207 +- ChromeDriver 124.0.6367.207 - Chromium 124.0.6367.0 -- Microsoft Edge 124.0.2478.51 -- Microsoft Edge WebDriver 124.0.2478.51 -- Selenium server 4.19.1 -- Mozilla Firefox 125.0.2 +- Microsoft Edge 124.0.2478.105 +- Microsoft Edge WebDriver 124.0.2478.97 +- Selenium server 4.20.0 +- Mozilla Firefox 126.0 - Geckodriver 0.34.0 #### Environment variables @@ -177,14 +181,14 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | ### .NET Tools -- .NET Core SDK: 6.0.421, 7.0.408, 8.0.204 +- .NET Core SDK: 6.0.422, 7.0.409, 8.0.300 - nbgv 3.6.133+2d32d93cb1 ### Databases - sqlite3 3.37.2 #### PostgreSQL -- PostgreSQL 14.11 +- PostgreSQL 14.12 ``` User: postgres PostgreSQL service is disabled by default. @@ -208,13 +212,13 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Go - 1.20.14 -- 1.21.9 -- 1.22.2 +- 1.21.10 +- 1.22.3 #### Node.js - 16.20.2 - 18.20.2 -- 20.12.2 +- 20.13.1 #### Python - 3.7.17 @@ -227,11 +231,11 @@ Use the following command as a part of your job to start the service: 'sudo syst #### PyPy - 3.7.13 [PyPy 7.3.9] - 3.8.16 [PyPy 7.3.11] -- 3.9.18 [PyPy 7.3.15] -- 3.10.13 [PyPy 7.3.15] +- 3.9.19 [PyPy 7.3.16] +- 3.10.14 [PyPy 7.3.16] #### Ruby -- 3.1.4 +- 3.1.5 ### PowerShell Tools - PowerShell 7.4.1 @@ -239,7 +243,7 @@ Use the following command as a part of your job to start the service: 'sudo syst #### PowerShell Modules - Az: 11.3.1 - MarkdownPS: 1.9 -- Microsoft.Graph: 2.17.0 +- Microsoft.Graph: 2.19.0 - Pester: 5.5.0 - PSScriptAnalyzer: 1.22.0 @@ -277,17 +281,17 @@ Use the following command as a part of your job to start the service: 'sudo syst | alpine:3.16 | sha256:452e7292acee0ee16c332324d7de05fa2c99f9994ecc9f0779c602916a672ae4 | 2024-01-27 | | alpine:3.17 | sha256:53cf9478b76f4c8fae126acbdfb79bed6e69e628faff572ebe4a029d3d247d98 | 2024-01-27 | | alpine:3.18 | sha256:11e21d7b981a59554b3f822c49f6e9f57b6068bb74f49c4cd5cc4c663c7e5160 | 2024-01-27 | -| debian:10 | sha256:873743c4eec09ddea0dcac0cda31fce2ff348ed41cd1d5c33ecee7d42f03052f | 2024-04-10 | -| debian:11 | sha256:26d72b71f88865377988af6f54da9aaa5bed201f39bcee13eb55737016660df2 | 2024-04-10 | -| moby/buildkit:latest | sha256:00d2c6b8f39ae515e0eadd74f39e71a5efdc94321c9b919692a2aa32deef2bb1 | 2024-03-18 | +| debian:10 | sha256:6e7bd55a5705914837aad8db01b349f4617510c11e47ccae8e87f6f14e489626 | 2024-05-14 | +| debian:11 | sha256:2c7a92a41cb814c00e7d455b2bc0c90ccdb9a4ced2ffdc10e562c7a84a186032 | 2024-05-14 | +| moby/buildkit:latest | sha256:9194b5ec1be368f41c516df7f93f7f540630ea06136056b2ffebb62226ed4ad6 | 2024-04-25 | | node:16 | sha256:f77a1aef2da8d83e45ec990f45df50f1a286c5fe8bbfb8c6e4246c6389705c0b | 2023-09-07 | | node:16-alpine | sha256:a1f9d027912b58a7c75be7716c97cfbc6d3099f3a97ed84aa490be9dee20e787 | 2023-08-10 | -| node:18 | sha256:bdbe1cff7e74208531a90ffcfa32b1cb909d4720d9aa60b649b26b9e7ba439a5 | 2024-04-11 | -| node:18-alpine | sha256:80338ff3fc4e989c1d5264a23223cec1c6014e812e584e825e78d1a98d893381 | 2024-04-11 | -| node:20 | sha256:844b41cf784f66d7920fd673f7af54ca7b81e289985edc6cd864e7d05e0d133c | 2024-04-11 | -| node:20-alpine | sha256:ec0c413b1d84f3f7f67ec986ba885930c57b5318d2eb3abc6960ee05d4f2eb28 | 2024-04-11 | -| ubuntu:20.04 | sha256:71b82b8e734f5cd0b3533a16f40ca1271f28d87343972bb4cd6bd6c38f1bd38e | 2024-04-10 | -| ubuntu:22.04 | sha256:1b8d8ff4777f36f19bfe73ee4df61e3a0b789caeff29caa019539ec7c9a57f95 | 2024-04-10 | +| node:18 | sha256:5bac3a1edff13e76586b8eaef1d411fcd80e4f18cce5bc40ea6993245e0721ec | 2024-05-14 | +| node:18-alpine | sha256:4837c2ac8998cf172f5892fb45f229c328e4824c43c8506f8ba9c7996d702430 | 2024-04-23 | +| node:20 | sha256:d6925dc84f8c0d1c1f8df4ea6a9a54e57d430241cb734b1b0c45ed6d26e8e9c0 | 2024-05-14 | +| node:20-alpine | sha256:291e84d956f1aff38454bbd3da38941461ad569a185c20aa289f71f37ea08e23 | 2024-05-09 | +| ubuntu:20.04 | sha256:874aca52f79ae5f8258faff03e10ce99ae836f6e7d2df6ecd3da5c1cad3a912b | 2024-04-27 | +| ubuntu:22.04 | sha256:a6d2b38300ce017add71440577d5b0a90460d0e57fd7aec21dd0d1b0761bbfb2 | 2024-04-27 | ### Installed apt packages | Name | Version | @@ -328,7 +332,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | libgbm-dev | 23.2.1-1ubuntu3.1\~22.04.2 | | libgconf-2-4 | 3.2.6-7ubuntu2 | | libgsl-dev | 2.7.1+dfsg-3 | -| libgtk-3-0 | 3.24.33-1ubuntu2 | +| libgtk-3-0 | 3.24.33-1ubuntu2.1 | | libmagic-dev | 1:5.41-3ubuntu0.1 | | libmagickcore-dev | 8:6.9.11.60+dfsg-1.3ubuntu0.22.04.3 | | libmagickwand-dev | 8:6.9.11.60+dfsg-1.3ubuntu0.22.04.3 | From 80ea4b55c056a86a968ef7a02307a478fd105a46 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 15 May 2024 21:18:01 +0000 Subject: [PATCH 2840/3485] Updating readme file for macos-13-arm64 version 20240514.3 (#9859) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-13-arm64-Readme.md | 50 ++++++++++++++------------- 1 file changed, 26 insertions(+), 24 deletions(-) diff --git a/images/macos/macos-13-arm64-Readme.md b/images/macos/macos-13-arm64-Readme.md index 1ade784eb60e..3edf6078fb09 100644 --- a/images/macos/macos-13-arm64-Readme.md +++ b/images/macos/macos-13-arm64-Readme.md @@ -1,12 +1,12 @@ # macOS 13 - OS Version: macOS 13.6.6 (22G630) - Kernel Version: Darwin 22.6.0 -- Image Version: 20240506.2 +- Image Version: 20240514.3 ## Installed Software ### Language and Runtime -- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.408, 8.0.101, 8.0.204 +- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.409, 8.0.101, 8.0.204, 8.0.300 - Bash 3.2.57(1)-release - Clang/LLVM 14.0.0 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` @@ -16,9 +16,9 @@ - GNU Fortran 11 (Homebrew GCC 11.4.0) - available by `gfortran-11` alias - GNU Fortran 12 (Homebrew GCC 12.3.0) - available by `gfortran-12` alias - GNU Fortran 13 (Homebrew GCC 13.2.0) - available by `gfortran-13` alias -- Kotlin 1.9.23-release-779 +- Kotlin 1.9.24-release-822 - Mono 6.12.0.188 -- Node.js 20.12.2 +- Node.js 20.13.1 - Perl 5.38.2 - Python3 3.12.3 - Ruby 3.0.7p220 @@ -27,8 +27,8 @@ - Bundler 2.5.10 - Carthage 0.39.1 - CocoaPods 1.15.2 -- Homebrew 4.2.21 -- NPM 10.5.0 +- Homebrew 4.3.0 +- NPM 10.5.2 - NuGet 6.3.1.1 - Pip3 24.0 (python 3.12) - Pipx 1.5.0 @@ -44,13 +44,13 @@ - 7-Zip 17.05 - aria2 1.37.0 - azcopy 10.24.0 -- bazel 7.1.1 -- bazelisk 1.19.0_1 +- bazel 7.1.2 +- bazelisk 1.20.0 - bsdtar 3.5.3 - available by 'tar' alias - Curl 8.4.0 -- Git 2.45.0 +- Git 2.45.1 - Git LFS 3.5.1 -- GitHub CLI 2.49.0 +- GitHub CLI 2.49.2 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.24.5 - gpg (GnuPG) 2.4.5 @@ -58,21 +58,21 @@ - OpenSSL 1.1.1w 11 Sep 2023 - Packer 1.9.4 - pkg-config 0.29.2 -- yq 4.43.1 +- yq 4.44.1 - zstd 1.5.6 ### Tools -- AWS CLI 2.15.45 +- AWS CLI 2.15.50 - AWS SAM CLI 1.116.0 - AWS Session Manager CLI 1.2.553.0 - Azure CLI 2.60.0 - Azure CLI (azure-devops) 1.0.0 -- Bicep CLI 0.26.170 -- Cmake 3.29.2 -- CodeQL Action Bundle 2.17.1 +- Bicep CLI 0.27.1 +- Cmake 3.29.3 +- CodeQL Action Bundle 2.17.2 - Fastlane 2.220.0 -- SwiftFormat 0.53.8 -- Xcbeautify 2.3.0 +- SwiftFormat 0.53.9 +- Xcbeautify 2.3.1 - Xcode Command Line Tools 14.3.1.0.1.1683849156 - Xcodes 1.4.1 @@ -81,9 +81,9 @@ ### Browsers - Safari 17.4.1 (18618.1.15.111.8) - SafariDriver 17.4.1 (18618.1.15.111.8) -- Google Chrome 124.0.6367.119 -- Google Chrome for Testing 124.0.6367.91 -- ChromeDriver 124.0.6367.91 +- Google Chrome 124.0.6367.208 +- Google Chrome for Testing 124.0.6367.207 +- ChromeDriver 124.0.6367.207 - Selenium server 4.20.0 #### Environment variables @@ -103,18 +103,20 @@ ### Cached Tools #### Python +- 3.9.13 +- 3.10.11 - 3.11.9 - 3.12.3 #### Node.js - 16.20.1 - 18.20.2 -- 20.12.2 +- 20.13.1 #### Go - 1.20.14 -- 1.21.9 -- 1.22.2 +- 1.21.10 +- 1.22.3 ### Rust Tools - Cargo 1.78.0 @@ -181,8 +183,8 @@ | Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | | visionOS 1.0 | xros1.0 | 15.2 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | -| Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | +| Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | DriverKit 22.1 | driverkit22.1 | 14.1 | | DriverKit 22.2 | driverkit22.2 | 14.2 | | DriverKit 22.4 | driverkit22.4 | 14.3.1 | From 3edaf8a499d65c1860b111ae5e5c212884dff95c Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Thu, 16 May 2024 12:23:51 +0200 Subject: [PATCH 2841/3485] [Ubuntu] Patch azure-cli installer for Ubuntu 24.04 (#9863) --- .../ubuntu/scripts/build/install-azure-cli.sh | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/images/ubuntu/scripts/build/install-azure-cli.sh b/images/ubuntu/scripts/build/install-azure-cli.sh index a2665b592850..4d98bac9a744 100644 --- a/images/ubuntu/scripts/build/install-azure-cli.sh +++ b/images/ubuntu/scripts/build/install-azure-cli.sh @@ -4,8 +4,24 @@ ## Desc: Install Azure CLI (az) ################################################################################ +# Source the helpers for use with the script +source $HELPER_SCRIPTS/os.sh + # Install Azure CLI (instructions taken from https://docs.microsoft.com/en-us/cli/azure/install-azure-cli) -curl -fsSL https://aka.ms/InstallAzureCLIDeb | sudo bash +if is_ubuntu24; then + apt-get install apt-transport-https + curl -sL https://packages.microsoft.com/keys/microsoft.asc | \ + gpg --dearmor | \ + sudo tee /etc/apt/trusted.gpg.d/microsoft.asc.gpg > /dev/null + AZ_DIST="jammy" + echo "deb [arch=amd64] https://packages.microsoft.com/repos/azure-cli/ $AZ_DIST main" | \ + sudo tee /etc/apt/sources.list.d/azure-cli.list + sudo apt-get update + sudo apt-get install azure-cli +else + curl -fsSL https://aka.ms/InstallAzureCLIDeb | sudo bash +fi + echo "azure-cli https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt" >> $HELPER_SCRIPTS/apt-sources.txt rm -f /etc/apt/sources.list.d/azure-cli.list From c9c09169e4f6ecad8524d28c3ab23887c50790f9 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 16 May 2024 13:24:01 +0200 Subject: [PATCH 2842/3485] Updating readme file for macos-12 version 20240514.3 (#9861) Co-authored-by: Image generation service account <no-reply@microsoft.com> --- images/macos/macos-12-Readme.md | 119 ++++++++++++++++---------------- 1 file changed, 59 insertions(+), 60 deletions(-) diff --git a/images/macos/macos-12-Readme.md b/images/macos/macos-12-Readme.md index 7d7e05b100b6..f0421d3f4b30 100644 --- a/images/macos/macos-12-Readme.md +++ b/images/macos/macos-12-Readme.md @@ -1,12 +1,12 @@ # macOS 12 - OS Version: macOS 12.7.4 (21H1123) - Kernel Version: Darwin 21.6.0 -- Image Version: 20240418.1 +- Image Version: 20240514.3 ## Installed Software ### Language and Runtime -- .NET Core SDK: 6.0.421, 7.0.102, 7.0.202, 7.0.306, 7.0.408, 8.0.101, 8.0.204 +- .NET Core SDK: 6.0.422, 7.0.102, 7.0.202, 7.0.306, 7.0.409, 8.0.101, 8.0.204, 8.0.300 - Bash 3.2.57(1)-release - Clang/LLVM 14.0.0 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` @@ -16,35 +16,35 @@ - GNU Fortran 11 (Homebrew GCC 11.4.0) - available by `gfortran-11` alias - GNU Fortran 12 (Homebrew GCC 12.3.0) - available by `gfortran-12` alias - GNU Fortran 13 (Homebrew GCC 13.2.0) - available by `gfortran-13` alias -- Julia 1.10.2 -- Kotlin 1.9.23-release-779 -- Go 1.21.9 +- Julia 1.10.3 +- Kotlin 1.9.24-release-822 +- Go 1.21.10 - Mono 6.12.0.188 - Node.js 18.20.2 - MSBuild 16.10.1.51301 (Mono 6.12.0.188) - NVM 0.39.7 -- NVM - Cached node versions: 16.20.2, 18.20.2, 20.12.2 +- NVM - Cached node versions: 16.20.2, 18.20.2, 20.13.1 - Perl 5.38.2 -- PHP 8.3.6 +- PHP 8.3.7 - Python 2.7.18 - Python3 3.12.3 -- R 4.3.3 -- Ruby 3.0.6p216 +- R 4.4.0 +- Ruby 3.0.7p220 ### Package Management -- Bundler 2.5.9 +- Bundler 2.5.10 - Carthage 0.39.1 - CocoaPods 1.15.2 -- Composer 2.7.2 -- Homebrew 4.2.18 +- Composer 2.7.6 +- Homebrew 4.3.0 - Miniconda 24.3.0 - NPM 10.5.0 - NuGet 6.3.1.1 - Pip 20.3.4 (python 2.7) - Pip3 24.0 (python 3.12) - Pipx 1.5.0 -- RubyGems 3.5.9 -- Vcpkg 2024 (build from commit 6c87aab05) +- RubyGems 3.5.10 +- Vcpkg 2024 (build from commit bd2b54836) - Yarn 1.22.19 #### Environment variables @@ -57,57 +57,57 @@ - Apache Ant 1.10.14 - Apache Maven 3.9.6 - Gradle 8.7 -- Sbt 1.9.9 +- Sbt 1.10.0 ### Utilities - 7-Zip 17.05 - aria2 1.37.0 - azcopy 10.24.0 -- bazel 7.1.1 -- bazelisk 1.19.0 +- bazel 7.1.2 +- bazelisk 1.20.0 - bsdtar 3.5.1 - available by 'tar' alias - Curl 8.7.1 -- Git 2.44.0 +- Git 2.45.1 - Git LFS 3.5.1 -- GitHub CLI 2.48.0 +- GitHub CLI 2.49.2 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.24.5 - gpg (GnuPG) 2.4.5 -- ImageMagick 7.1.1-30 +- ImageMagick 7.1.1-32 - jq 1.7.1 - mongo 5.0.26 - mongod 5.0.26 - OpenSSL 1.1.1w 11 Sep 2023 - Packer 1.9.4 - pkg-config 0.29.2 -- PostgreSQL 14.11 (Homebrew) -- psql (PostgreSQL) 14.11 (Homebrew) +- PostgreSQL 14.12 (Homebrew) +- psql (PostgreSQL) 14.12 (Homebrew) - Sox 14.4.2 - Subversion (SVN) 1.14.3 - Switchaudio-osx 1.2.2 - Vagrant 2.4.1 - VirtualBox 6.1.38r153438 -- yq 4.43.1 +- yq 4.44.1 - zstd 1.5.6 ### Tools - App Center CLI 3.0.0 -- AWS CLI 2.15.39 -- AWS SAM CLI 1.115.0 +- AWS CLI 2.15.50 +- AWS SAM CLI 1.116.0 - AWS Session Manager CLI 1.2.553.0 -- Azure CLI 2.59.0 +- Azure CLI 2.60.0 - Azure CLI (azure-devops) 1.0.0 -- Bicep CLI 0.26.170 +- Bicep CLI 0.27.1 - Cabal 3.10.3.0 -- Cmake 3.29.2 -- CodeQL Action Bundle 2.17.0 +- Cmake 3.29.3 +- CodeQL Action Bundle 2.17.2 - Colima 0.6.8 - Fastlane 2.220.0 -- GHC 9.8.2 +- GHC 9.10.1 - GHCup 0.1.22.0 -- Jazzy 0.14.4 +- Jazzy 0.15.0 - Stack 2.15.5 -- SwiftFormat 0.53.7 +- SwiftFormat 0.53.9 - Swig 4.2.1 - Xcbeautify 1.6.0 - Xcode Command Line Tools 14.2.0.0.1.1668646533 @@ -120,14 +120,14 @@ ### Browsers - Safari 17.4.1 (17618.1.15.111.8) - SafariDriver 17.4.1 (17618.1.15.111.8) -- Google Chrome 124.0.6367.62 -- Google Chrome for Testing 124.0.6367.60 -- ChromeDriver 124.0.6367.60 -- Microsoft Edge 124.0.2478.51 -- Microsoft Edge WebDriver 124.0.2478.51 -- Mozilla Firefox 125.0.1 +- Google Chrome 124.0.6367.208 +- Google Chrome for Testing 124.0.6367.207 +- ChromeDriver 124.0.6367.207 +- Microsoft Edge 124.0.2478.105 +- Microsoft Edge WebDriver 124.0.2478.105 +- Mozilla Firefox 126.0 - geckodriver 0.34.0 -- Selenium server 4.19.1 +- Selenium server 4.20.0 #### Environment variables | Name | Value | @@ -139,23 +139,23 @@ ### Java | Version | Environment Variable | | ------------------- | -------------------- | -| 8.0.402+6 (default) | JAVA_HOME_8_X64 | -| 11.0.22+7 | JAVA_HOME_11_X64 | +| 8.0.412+8 (default) | JAVA_HOME_8_X64 | +| 11.0.23+9 | JAVA_HOME_11_X64 | | 17.0.11+9 | JAVA_HOME_17_X64 | -| 21.0.2+13.0 | JAVA_HOME_21_X64 | +| 21.0.3+9.0 | JAVA_HOME_21_X64 | ### Cached Tools #### PyPy -- 2.7.18 [PyPy 7.3.15] +- 2.7.18 [PyPy 7.3.16] - 3.7.13 [PyPy 7.3.9] - 3.8.16 [PyPy 7.3.11] -- 3.9.18 [PyPy 7.3.15] -- 3.10.13 [PyPy 7.3.15] +- 3.9.19 [PyPy 7.3.16] +- 3.10.14 [PyPy 7.3.16] #### Ruby -- 3.0.6 -- 3.1.4 +- 3.0.7 +- 3.1.5 #### Python - 3.7.17 @@ -168,32 +168,32 @@ #### Node.js - 16.20.2 - 18.20.2 -- 20.12.2 +- 20.13.1 #### Go - 1.20.14 -- 1.21.9 -- 1.22.2 +- 1.21.10 +- 1.22.3 ### Rust Tools -- Cargo 1.77.2 -- Rust 1.77.2 -- Rustdoc 1.77.2 -- Rustup 1.27.0 +- Cargo 1.78.0 +- Rust 1.78.0 +- Rustdoc 1.78.0 +- Rustup 1.27.1 #### Packages - Bindgen 0.69.4 - Cargo-audit 0.20.0 - Cargo-outdated 0.15.0 - Cbindgen 0.26.0 -- Clippy 0.1.77 +- Clippy 0.1.78 - Rustfmt 1.7.0-stable ### PowerShell Tools - PowerShell 7.4.2 #### PowerShell Modules -- Az: 11.5.0 +- Az: 11.6.0 - MarkdownPS: 1.9 - Pester: 5.5.0 - PSScriptAnalyzer: 1.22.0 @@ -210,7 +210,7 @@ | Version | Build | Path | | -------------- | ----------- | ------------------------------------ | | 2019 | 8.10.25.2 | /Applications/Visual Studio 2019.app | -| 2022 (default) | 17.6.11.400 | /Applications/Visual Studio.app | +| 2022 (default) | 17.6.12.410 | /Applications/Visual Studio.app | ##### Notes ``` @@ -330,7 +330,7 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" | Package Name | Version | | -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 8.0 | -| Android Emulator | 34.1.20 | +| Android Emulator | 34.2.13 | | Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2 33.0.3<br>32.0.0<br>31.0.0 | | Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1) | | Android SDK Platform-Tools | 35.0.1 | @@ -359,11 +359,10 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" #### Environment variables | Name | Value | | ----------------- | ----------------------------------------------------------------------------------------- | -| PARALLELS_DMG_URL | https://download.parallels.com/desktop/v19/19.3.0-54924/ParallelsDesktop-19.3.0-54924.dmg | +| PARALLELS_DMG_URL | https://download.parallels.com/desktop/v19/19.3.1-54941/ParallelsDesktop-19.3.1-54941.dmg | ##### Notes ``` If you want to use Parallels Desktop you should download a package from URL stored in PARALLELS_DMG_URL environment variable. A system extension is allowed for this version. ``` - From 6df3848fcdb890c8aaedd2cc6a3ec42088a92d34 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 16 May 2024 13:28:02 +0200 Subject: [PATCH 2843/3485] Updating readme file for win22 version 20240514.3.1 (#9853) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/windows/Windows2022-Readme.md | 226 ++++++++++----------------- 1 file changed, 82 insertions(+), 144 deletions(-) diff --git a/images/windows/Windows2022-Readme.md b/images/windows/Windows2022-Readme.md index 7da51f79f90e..e9bcd287821a 100644 --- a/images/windows/Windows2022-Readme.md +++ b/images/windows/Windows2022-Readme.md @@ -4,8 +4,8 @@ | [[Ubuntu, Windows] Docker Compose v1 will be removed from images on July, 9](https://github.com/actions/runner-images/issues/9692) | *** # Windows Server 2022 -- OS Version: 10.0.20348 Build 2402 -- Image Version: 20240421.1.0 +- OS Version: 10.0.20348 Build 2461 +- Image Version: 20240514.3.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -14,27 +14,27 @@ ### Language and Runtime - Bash 5.2.26(1)-release -- Go 1.21.9 -- Julia 1.10.2 -- Kotlin 1.9.23 +- Go 1.21.10 +- Julia 1.10.3 +- Kotlin 1.9.24 - LLVM 16.0.6 -- Node 18.18.2 +- Node 18.20.2 - Perl 5.32.1 -- PHP 8.3.6 +- PHP 8.3.7 - Python 3.9.13 -- Ruby 3.0.6p216 +- Ruby 3.0.7p220 ### Package Management - Chocolatey 2.2.2 -- Composer 2.7.3 -- Helm 3.14.3 +- Composer 2.7.6 +- Helm 3.14.4 - Miniconda 24.3.0 (pre-installed on the image but not added to PATH) -- NPM 9.8.1 +- NPM 10.5.0 - NuGet 6.9.1.3 - pip 24.0 (python 3.9) - Pipx 1.5.0 - RubyGems 3.2.33 -- Vcpkg (build from commit 9224b3bbd) +- Vcpkg (build from commit bd2b54836) - Yarn 1.22.22 #### Environment variables @@ -47,29 +47,29 @@ - Ant 1.10.14 - Gradle 8.7 - Maven 3.8.7 -- sbt 1.9.9 +- sbt 1.10.0 ### Tools - 7zip 23.01 - aria2 1.37.0 - azcopy 10.24.0 -- Bazel 7.1.1 +- Bazel 7.1.2 - Bazelisk 1.19.0 -- Bicep 0.26.170 +- Bicep 0.27.1 - Cabal 3.10.3.0 -- CMake 3.29.2 -- CodeQL Action Bundle 2.17.0 +- CMake 3.29.3 +- CodeQL Action Bundle 2.17.2 - Docker 24.0.7 - Docker Compose v1 1.29.2 - Docker Compose v2 2.23.3 - Docker-wincred 0.8.1 -- ghc 9.8.2 -- Git 2.44.0.windows.1 -- Git LFS 3.4.1 +- ghc 9.10.1 +- Git 2.45.1.windows.1 +- Git LFS 3.5.1 - ImageMagick 7.1.1-29 - InnoSetup 6.2.2 - jq 1.7.1 -- Kind 0.22.0 +- Kind 0.23.0 - Kubectl 1.30.0 - Mercurial 5.0 - gcc 12.2.0 @@ -79,10 +79,10 @@ - NSIS 3.10 - OpenSSL 1.1.1w - Packer 1.10.2 -- Pulumi 3.113.3 -- R 4.3.3 +- Pulumi 3.116.0 +- R 4.4.0 - Service Fabric SDK 9.1.1436.9590 -- Stack 2.15.5 +- Stack 2.15.7 - Subversion (SVN) 1.14.2 - Swig 4.1.1 - VSWhere 3.1.7 @@ -92,37 +92,37 @@ - zstd 1.5.6 ### CLI Tools -- Alibaba Cloud CLI 3.0.202 -- AWS CLI 2.15.40 -- AWS SAM CLI 1.115.0 +- Alibaba Cloud CLI 3.0.205 +- AWS CLI 2.15.48 +- AWS SAM CLI 1.116.0 - AWS Session Manager CLI 1.2.553.0 -- Azure CLI 2.59.0 +- Azure CLI 2.60.0 - Azure DevOps CLI extension 1.0.0 -- GitHub CLI 2.48.0 +- GitHub CLI 2.49.2 ### Rust Tools -- Cargo 1.77.2 -- Rust 1.77.2 -- Rustdoc 1.77.2 -- Rustup 1.27.0 +- Cargo 1.78.0 +- Rust 1.78.0 +- Rustdoc 1.78.0 +- Rustup 1.27.1 #### Packages - bindgen 0.69.4 - cargo-audit 0.20.0 - cargo-outdated 0.15.0 - cbindgen 0.26.0 -- Clippy 0.1.77 +- Clippy 0.1.78 - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 124.0.6367.61 -- Chrome Driver 124.0.6367.60 -- Microsoft Edge 124.0.2478.51 -- Microsoft Edge Driver 124.0.2478.51 -- Mozilla Firefox 125.0.1 +- Google Chrome 124.0.6367.208 +- Chrome Driver 124.0.6367.207 +- Microsoft Edge 124.0.2478.97 +- Microsoft Edge Driver 124.0.2478.97 +- Mozilla Firefox 126.0 - Gecko Driver 0.34.0 - IE Driver 4.14.0.0 -- Selenium server 4.19.0 +- Selenium server 4.20.0 #### Environment variables | Name | Value | @@ -148,7 +148,7 @@ | wslbash.exe | C:\Windows\System32\bash.exe | ### MSYS2 -- Pacman 6.0.2 +- Pacman 6.1.0 #### Notes ``` @@ -161,13 +161,13 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Go - 1.20.14 -- 1.21.9 -- 1.22.2 +- 1.21.10 +- 1.22.3 #### Node.js - 16.20.2 - 18.20.2 -- 20.12.2 +- 20.13.1 #### Python - 3.7.9 @@ -178,15 +178,15 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 3.12.3 #### PyPy -- 2.7.18 [PyPy 7.3.15] +- 2.7.18 [PyPy 7.3.16] - 3.7.13 [PyPy 7.3.9] - 3.8.16 [PyPy 7.3.11] -- 3.9.18 [PyPy 7.3.15] -- 3.10.13 [PyPy 7.3.15] +- 3.9.19 [PyPy 7.3.16] +- 3.10.14 [PyPy 7.3.16] #### Ruby -- 3.0.6 -- 3.1.4 +- 3.0.7 +- 3.1.5 ### Databases @@ -194,7 +194,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Property | Value | | -------------------- | ------------------------------------------------------------------------------------------------------------------------------------ | | ServiceName | postgresql-x64-14 | -| Version | 14.11 | +| Version | 14.12 | | ServiceStatus | Stopped | | ServiceStartType | Disabled | | EnvironmentVariables | PGBIN=C:\Program Files\PostgreSQL\14\bin <br> PGDATA=C:\Program Files\PostgreSQL\14\data <br> PGROOT=C:\Program Files\PostgreSQL\14 | @@ -210,7 +210,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Database tools - Azure CosmosDb Emulator 2.14.16.0 - DacFx 162.2.111.2 -- MySQL 8.0.36.0 +- MySQL 8.0.37.0 - SQL OLEDB Driver 18.6.7.0 - SQLPS 1.0 @@ -221,9 +221,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Nginx | 1.25.5 | C:\tools\nginx-1.25.5\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2022 -| Name | Version | Path | -| ----------------------------- | -------------- | -------------------------------------------------------- | -| Visual Studio Enterprise 2022 | 17.9.34728.123 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | +| Name | Version | Path | +| ----------------------------- | ------------- | -------------------------------------------------------- | +| Visual Studio Enterprise 2022 | 17.9.34902.65 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | #### Workloads, components and extensions | Package | Version | @@ -254,7 +254,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Component.VSInstallerProjects2022 | 2.0.1 | | Component.WixToolset.VisualStudioExtension.Dev17 | 1.0.0.22 | | Component.WixToolset.VisualStudioExtension.Schemas3 | 1.0.0.22 | -| Component.Xamarin | 17.9.34511.75 | +| Component.Xamarin | 17.9.34902.65 | | Component.Xamarin.RemotedSimulator | 17.9.34511.75 | | ios | 17.2.8004.0 | | maccatalyst | 17.2.8004.0 | @@ -284,20 +284,20 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.Net.ComponentGroup.4.8.DeveloperTools | 17.9.34511.75 | | Microsoft.Net.ComponentGroup.DevelopmentPrerequisites | 17.9.34511.75 | | Microsoft.Net.ComponentGroup.TargetingPacks.Common | 17.9.34511.75 | -| microsoft.net.runtime.android | 8.0.424.16909 | -| microsoft.net.runtime.android.aot | 8.0.424.16909 | -| microsoft.net.runtime.android.aot.net7 | 8.0.424.16909 | -| microsoft.net.runtime.android.net7 | 8.0.424.16909 | -| microsoft.net.runtime.ios | 8.0.424.16909 | -| microsoft.net.runtime.ios.net7 | 8.0.424.16909 | -| microsoft.net.runtime.maccatalyst | 8.0.424.16909 | -| microsoft.net.runtime.maccatalyst.net7 | 8.0.424.16909 | -| microsoft.net.runtime.mono.tooling | 8.0.424.16909 | -| microsoft.net.runtime.mono.tooling.net7 | 8.0.424.16909 | -| microsoft.net.sdk.emscripten | 8.0.10.16301 | +| microsoft.net.runtime.android | 8.0.524.21615 | +| microsoft.net.runtime.android.aot | 8.0.524.21615 | +| microsoft.net.runtime.android.aot.net7 | 8.0.524.21615 | +| microsoft.net.runtime.android.net7 | 8.0.524.21615 | +| microsoft.net.runtime.ios | 8.0.524.21615 | +| microsoft.net.runtime.ios.net7 | 8.0.524.21615 | +| microsoft.net.runtime.maccatalyst | 8.0.524.21615 | +| microsoft.net.runtime.maccatalyst.net7 | 8.0.524.21615 | +| microsoft.net.runtime.mono.tooling | 8.0.524.21615 | +| microsoft.net.runtime.mono.tooling.net7 | 8.0.524.21615 | +| microsoft.net.sdk.emscripten | 8.0.10.21103 | | Microsoft.NetCore.Component.DevelopmentTools | 17.9.34511.75 | -| Microsoft.NetCore.Component.Runtime.8.0 | 17.9.34728.123 | -| Microsoft.NetCore.Component.SDK | 17.9.34728.123 | +| Microsoft.NetCore.Component.Runtime.8.0 | 17.9.34902.65 | +| Microsoft.NetCore.Component.SDK | 17.9.34902.65 | | Microsoft.NetCore.Component.Web | 17.9.34511.75 | | Microsoft.VisualStudio.Component.AppInsights.Tools | 17.9.34511.75 | | Microsoft.VisualStudio.Component.AspNet | 17.9.34511.75 | @@ -364,59 +364,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Component.UWP.VC.ARM64 | 17.9.34511.75 | | Microsoft.VisualStudio.Component.UWP.VC.ARM64EC | 17.9.34511.75 | | Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM.Spectre | 17.9.34511.75 | | Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM64 | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM64.Spectre | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM.Spectre | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM64 | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.ARM64.Spectre | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL.Spectre | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.ARM | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.ARM.Spectre | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.ARM64 | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.ARM64.Spectre | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC.Spectre | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64 | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64.Spectre | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.14.38.17.8.ARM | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.14.38.17.8.ARM.Spectre | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.14.38.17.8.ARM64 | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.14.38.17.8.ARM64.Spectre | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.14.38.17.8.ATL | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.14.38.17.8.ATL.ARM | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.14.38.17.8.ATL.ARM.Spectre | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.14.38.17.8.ATL.ARM64 | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.14.38.17.8.ATL.ARM64.Spectre | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.14.38.17.8.ATL.Spectre | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.14.38.17.8.MFC | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.14.38.17.8.MFC.ARM | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.14.38.17.8.MFC.ARM.Spectre | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.14.38.17.8.MFC.ARM64 | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.14.38.17.8.MFC.ARM64.Spectre | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.14.38.17.8.MFC.Spectre | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.14.38.17.8.x86.x64 | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.14.38.17.8.x86.x64.Spectre | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.14.39.17.9.ARM | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.14.39.17.9.ARM.Spectre | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.14.39.17.9.ARM64 | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.14.39.17.9.ARM64.Spectre | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.14.39.17.9.ATL | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.14.39.17.9.ATL.ARM | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.14.39.17.9.ATL.ARM.Spectre | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.14.39.17.9.ATL.ARM64 | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.14.39.17.9.ATL.ARM64.Spectre | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.14.39.17.9.ATL.Spectre | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.14.39.17.9.MFC | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.14.39.17.9.MFC.ARM | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.14.39.17.9.MFC.ARM.Spectre | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.14.39.17.9.MFC.ARM64 | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.14.39.17.9.MFC.ARM64.Spectre | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.14.39.17.9.MFC.Spectre | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.14.39.17.9.x86.x64 | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.14.39.17.9.x86.x64.Spectre | 17.9.34511.75 | | Microsoft.VisualStudio.Component.VC.ASAN | 17.9.34511.75 | | Microsoft.VisualStudio.Component.VC.ATL | 17.9.34511.75 | | Microsoft.VisualStudio.Component.VC.ATL.ARM | 17.9.34511.75 | @@ -449,16 +397,6 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Component.VC.Tools.ARM64 | 17.9.34511.75 | | Microsoft.VisualStudio.Component.VC.Tools.ARM64EC | 17.9.34511.75 | | Microsoft.VisualStudio.Component.VC.Tools.x86.x64 | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.v141.ARM | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.v141.ARM.Spectre | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.v141.ARM64 | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.v141.ARM64.Spectre | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.v141.ATL | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.v141.ATL.Spectre | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.v141.MFC | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.v141.MFC.Spectre | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.v141.x86.x64 | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.v141.x86.x64.Spectre | 17.9.34511.75 | | Microsoft.VisualStudio.Component.Vcpkg | 17.9.34511.75 | | Microsoft.VisualStudio.Component.VSSDK | 17.9.34511.75 | | Microsoft.VisualStudio.Component.Wcf.Tooling | 17.9.34511.75 | @@ -515,14 +453,14 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Workload.Python | 17.9.34511.75 | | Microsoft.VisualStudio.Workload.Universal | 17.9.34511.75 | | Microsoft.VisualStudio.Workload.VisualStudioExtension | 17.9.34511.75 | -| runtimes.ios | 8.0.424.16909 | -| runtimes.ios.net7 | 8.0.424.16909 | -| runtimes.maccatalyst | 8.0.424.16909 | -| runtimes.maccatalyst.net7 | 8.0.424.16909 | -| wasm.tools | 8.0.424.16909 | +| runtimes.ios | 8.0.524.21615 | +| runtimes.ios.net7 | 8.0.524.21615 | +| runtimes.maccatalyst | 8.0.524.21615 | +| runtimes.maccatalyst.net7 | 8.0.524.21615 | +| wasm.tools | 8.0.524.21615 | | ProBITools.MicrosoftAnalysisServicesModelingProjects2022 | 3.0.4 | | ProBITools.MicrosoftReportProjectsforVisualStudio2022 | 3.0.1 | -| SSIS.MicrosoftDataToolsIntegrationServices | 1.3.2 | +| SSIS.MicrosoftDataToolsIntegrationServices | 1.4 | | VisualStudioClient.MicrosoftVisualStudio2022InstallerProjects | 2.0.1 | | Windows Driver Kit | 10.1.22621.2428 | | Windows Driver Kit Visual Studio Extension | 10.0.22621.0 | @@ -549,11 +487,11 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 10.0.22621.0 ### .NET Core Tools -- .NET Core SDK: 6.0.129, 6.0.203, 6.0.321, 6.0.421, 7.0.118, 7.0.203, 7.0.315, 7.0.408, 8.0.204 +- .NET Core SDK: 6.0.130, 6.0.203, 6.0.321, 6.0.422, 7.0.119, 7.0.203, 7.0.316, 7.0.409, 8.0.205 - .NET Framework: 4.8, 4.8.1 -- Microsoft.AspNetCore.App: 6.0.5, 6.0.26, 6.0.29, 7.0.5, 7.0.18, 8.0.4 -- Microsoft.NETCore.App: 6.0.5, 6.0.26, 6.0.29, 7.0.5, 7.0.18, 8.0.4 -- Microsoft.WindowsDesktop.App: 6.0.5, 6.0.26, 6.0.29, 7.0.5, 7.0.18, 8.0.4 +- Microsoft.AspNetCore.App: 6.0.5, 6.0.26, 6.0.29, 6.0.30, 7.0.5, 7.0.19, 8.0.5 +- Microsoft.NETCore.App: 6.0.5, 6.0.26, 6.0.29, 6.0.30, 7.0.5, 7.0.19, 8.0.5 +- Microsoft.WindowsDesktop.App: 6.0.5, 6.0.26, 6.0.30, 7.0.5, 7.0.19, 8.0.5 - nbgv 3.6.133+2d32d93cb1 ### PowerShell Tools @@ -565,10 +503,10 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - AzureRM: 2.1.0 (Default), 6.13.1 - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.562 +- AWSPowershell: 4.1.578 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 -- Microsoft.Graph: 2.17.0 +- Microsoft.Graph: 2.19.0 - Pester: 3.4.0, 5.5.0 - PowerShellGet: 1.0.0.1, 2.2.5 - PSScriptAnalyzer: 1.22.0 @@ -611,6 +549,6 @@ All other versions are saved but not installed. | mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2022 | sha256:9463c19c08f8855d5520f488e858f9c0ca832c04740ab1a3e204c9fbfab4581b | 2024-04-09 | | mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2022 | sha256:b732b5349aa99af46c02c2cc25e162d083cbe62f455875b35d5c3053c1cd75ce | 2024-04-09 | | mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:51c056c03b12aa8004e6d7909e5bdf7b699502d89fc8fc861edbbbcd78cf16bd | 2024-04-09 | -| mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:6223f3a17f2652064c56ca55aaef866177d58d6a1c526636ac2120685df5466d | 2024-04-05 | -| mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:5d09ffa90d91a46e2fe7652b0a37cbf5217f34a819c3d71cbe635dae8226061b | 2024-04-05 | +| mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:ac6a7571d5a404398e2f734d92f9b8f580a4fe1e6ae1820a61c5f138b1bdeff3 | 2024-05-10 | +| mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:45952938708fbde6ec0b5b94de68bcdec3f8c838be018536b1e9e5bd95e6b943 | 2024-05-10 | From 4db7ac61ac1dbc9edc504b2f111f79752a5daf46 Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Thu, 16 May 2024 13:51:04 +0200 Subject: [PATCH 2844/3485] [Ubuntu] Pin Helm 3.14.4 due to unusual release of 3.15.0 (#9867) --- images/ubuntu/scripts/build/install-kubernetes-tools.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/images/ubuntu/scripts/build/install-kubernetes-tools.sh b/images/ubuntu/scripts/build/install-kubernetes-tools.sh index bd7ae7c74174..eb287ead2ee4 100644 --- a/images/ubuntu/scripts/build/install-kubernetes-tools.sh +++ b/images/ubuntu/scripts/build/install-kubernetes-tools.sh @@ -27,7 +27,13 @@ sudo apt-get update -y && sudo apt-get install -y kubectl rm -f /etc/apt/sources.list.d/kubernetes.list # Install Helm -curl -fsSL https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3 | bash +# Temporary pin version v3.14.4 due to strange release of v3.15.0 +helm_version="v3.14.4" +download_with_retry "https://get.helm.sh/helm-$helm_version-linux-amd64.tar.gz" /tmp/helm.tar.gz +mkdir -p /tmp/helm +tar xzf /tmp/helm.tar.gz -C /tmp/helm +cp /tmp/helm/linux-amd64/helm /usr/local/bin/helm +chmod +x /usr/local/bin/helm # Download minikube curl -fsSL -O https://storage.googleapis.com/minikube/releases/latest/minikube-linux-amd64 From e11ab1f9c693bc2a08707aa01b8b338faffa372e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 16 May 2024 14:51:24 +0000 Subject: [PATCH 2845/3485] Updating readme file for macos-14-arm64 version 20240514.3 (#9858) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-14-arm64-Readme.md | 96 ++++++++++++++------------- 1 file changed, 49 insertions(+), 47 deletions(-) diff --git a/images/macos/macos-14-arm64-Readme.md b/images/macos/macos-14-arm64-Readme.md index 79b1bad6bd51..e7388321e9c9 100644 --- a/images/macos/macos-14-arm64-Readme.md +++ b/images/macos/macos-14-arm64-Readme.md @@ -1,12 +1,12 @@ # macOS 14 - OS Version: macOS 14.4.1 (23E224) - Kernel Version: Darwin 23.4.0 -- Image Version: 20240422.3 +- Image Version: 20240514.3 ## Installed Software ### Language and Runtime -- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.408, 8.0.101, 8.0.204 +- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.409, 8.0.101, 8.0.204, 8.0.300 - Bash 3.2.57(1)-release - Clang/LLVM 14.0.3 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` @@ -16,23 +16,23 @@ - GNU Fortran 11 (Homebrew GCC 11.4.0) - available by `gfortran-11` alias - GNU Fortran 12 (Homebrew GCC 12.3.0) - available by `gfortran-12` alias - GNU Fortran 13 (Homebrew GCC 13.2.0) - available by `gfortran-13` alias -- Kotlin 1.9.23-release-779 +- Kotlin 1.9.24-release-822 - Mono 6.12.0.188 -- Node.js 20.12.2 +- Node.js 20.13.1 - Perl 5.38.2 - Python3 3.12.3 -- Ruby 3.0.6p216 +- Ruby 3.0.7p220 ### Package Management -- Bundler 2.5.9 +- Bundler 2.5.10 - Carthage 0.39.1 - CocoaPods 1.15.2 -- Homebrew 4.2.19 -- NPM 10.5.0 +- Homebrew 4.3.0 +- NPM 10.5.2 - NuGet 6.3.1.1 - Pip3 24.0 (python 3.12) - Pipx 1.5.0 -- RubyGems 3.5.9 +- RubyGems 3.5.10 - Yarn 1.22.19 ### Project Management @@ -44,13 +44,13 @@ - 7-Zip 17.05 - aria2 1.37.0 - azcopy 10.24.0 -- bazel 7.1.1 -- bazelisk 1.19.0 +- bazel 7.1.2 +- bazelisk 1.20.0 - bsdtar 3.5.3 - available by 'tar' alias - Curl 8.4.0 -- Git 2.44.0 +- Git 2.45.1 - Git LFS 3.5.1 -- GitHub CLI 2.48.0 +- GitHub CLI 2.49.2 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.24.5 - gpg (GnuPG) 2.4.5 @@ -58,21 +58,21 @@ - OpenSSL 1.1.1w 11 Sep 2023 - Packer 1.9.4 - pkg-config 0.29.2 -- yq 4.43.1 +- yq 4.44.1 - zstd 1.5.6 ### Tools -- AWS CLI 2.15.40 -- AWS SAM CLI 1.115.0 +- AWS CLI 2.15.50 +- AWS SAM CLI 1.116.0 - AWS Session Manager CLI 1.2.553.0 -- Azure CLI 2.59.0 +- Azure CLI 2.60.0 - Azure CLI (azure-devops) 1.0.0 -- Bicep CLI 0.26.170 -- Cmake 3.29.2 -- CodeQL Action Bundle 2.17.0 +- Bicep CLI 0.27.1 +- Cmake 3.29.3 +- CodeQL Action Bundle 2.17.2 - Fastlane 2.220.0 -- SwiftFormat 0.53.7 -- Xcbeautify 2.1.0 +- SwiftFormat 0.53.9 +- Xcbeautify 2.3.1 - Xcode Command Line Tools 15.3.0.0.1.1708646388 - Xcodes 1.4.1 @@ -81,10 +81,10 @@ ### Browsers - Safari 17.4.1 (19618.1.15.11.14) - SafariDriver 17.4.1 (19618.1.15.11.14) -- Google Chrome 124.0.6367.62 -- Google Chrome for Testing 124.0.6367.60 -- ChromeDriver 124.0.6367.60 -- Selenium server 4.19.1 +- Google Chrome 124.0.6367.208 +- Google Chrome for Testing 124.0.6367.207 +- ChromeDriver 124.0.6367.207 +- Selenium server 4.20.0 #### Environment variables | Name | Value | @@ -103,45 +103,47 @@ ### Cached Tools #### Python +- 3.9.13 +- 3.10.11 - 3.11.9 - 3.12.3 #### Node.js - 18.20.2 -- 20.12.2 +- 20.13.1 #### Go - 1.20.14 -- 1.21.9 -- 1.22.2 +- 1.21.10 +- 1.22.3 ### Rust Tools -- Cargo 1.77.2 -- Rust 1.77.2 -- Rustdoc 1.77.2 -- Rustup 1.27.0 +- Cargo 1.78.0 +- Rust 1.78.0 +- Rustdoc 1.78.0 +- Rustup 1.27.1 #### Packages -- Clippy 0.1.77 +- Clippy 0.1.78 - Rustfmt 1.7.0-stable ### PowerShell Tools - PowerShell 7.4.2 #### PowerShell Modules -- Az: 11.5.0 +- Az: 11.6.0 - Pester: 5.5.0 - PSScriptAnalyzer: 1.22.0 ### Xcode -| Version | Build | Path | -| ---------------- | -------- | ------------------------------ | -| 15.4 (beta) | 15F5021i | /Applications/Xcode_15.4.app | -| 15.3 | 15E204a | /Applications/Xcode_15.3.app | -| 15.2 | 15C500b | /Applications/Xcode_15.2.app | -| 15.1 | 15C65 | /Applications/Xcode_15.1.app | -| 15.0.1 (default) | 15A507 | /Applications/Xcode_15.0.1.app | -| 14.3.1 | 14E300c | /Applications/Xcode_14.3.1.app | +| Version | Build | Path | +| ---------------- | ------- | ------------------------------ | +| 15.4 | 15F31c | /Applications/Xcode_15.4.app | +| 15.3 | 15E204a | /Applications/Xcode_15.3.app | +| 15.2 | 15C500b | /Applications/Xcode_15.2.app | +| 15.1 | 15C65 | /Applications/Xcode_15.1.app | +| 15.0.1 (default) | 15A507 | /Applications/Xcode_15.0.1.app | +| 14.3.1 | 14E300c | /Applications/Xcode_14.3.1.app | #### Installed SDKs | SDK | SDK Name | Xcode Version | @@ -188,8 +190,8 @@ | Simulator - visionOS 1.2 | xrsimulator1.2 | 15.4 | | visionOS 1.2 | xros1.2 | 15.4 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | -| Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | +| Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | DriverKit 22.4 | driverkit22.4 | 14.3.1 | | DriverKit 23.0 | driverkit23.0 | 15.0.1 | | DriverKit 23.2 | driverkit23.2 | 15.1, 15.2 | @@ -202,8 +204,8 @@ | iOS 16.4 | 14.3.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | | iOS 17.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | | iOS 17.2 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 17.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 17.5 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 17.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | +| iOS 17.5 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | | tvOS 16.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | | tvOS 17.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | | tvOS 17.2 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | @@ -222,7 +224,7 @@ | Package Name | Version | | -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 11.0 | -| Android Emulator | 34.1.20 | +| Android Emulator | 34.2.13 | | Android SDK Build-tools | 34.0.0<br>33.0.2 33.0.3 | | Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | | Android SDK Platform-Tools | 35.0.1 | From 5ecfd27e8fd0a1b4e8c88072772f9bbab9c82b83 Mon Sep 17 00:00:00 2001 From: Congyi Wu <congyiwu@github.com> Date: Thu, 16 May 2024 12:32:15 -0400 Subject: [PATCH 2846/3485] VisualStudioHelpers.ps1 stop enabling 8.3 filename creation (#9862) The bug that prompted enabling 8.3 filename creation was fixed 5 years ago, see https://github.com/xamarin/xamarin-android/issues/3407: > Fix included in Xamarin.Android 10.1.0.30. > > Fix included on Windows in Visual Studio 2019 version 16.4. We're on VS 2019 16.11: https://github.com/actions/runner-images/blob/98150396188d19c21a7d7c596cf4a4d7609bb12a/images/windows/Windows2019-Readme.md?plain=1#L233 8.3 filename creation is known to hurt file creation performance, especially when there are a large number of similarly named files in the same folder: * https://learn.microsoft.com/en-us/archive/blogs/josebda/windows-server-2012-file-server-tip-disable-8-3-naming-and-strip-those-short-names-too * https://www.linkedin.com/pulse/dont-forget-disable-short-filenames-83-servers-folders-wes-brown * https://deep.data.blog/2013/06/19/debugging-story-slowness-due-to-ntfs-short-file-8-3-name-generation/ I created a new VM with the base Azure Marketplace Windows 2019 image and confirmed that 8.3 name generation is disabled by default for both the OS and temp disk: ``` fsutil 8dot3name query C: The volume state is: 1 (8dot3 name creation is disabled). The registry state is: 2 (Per volume setting - the default). Based on the above settings, 8dot3 name creation is disabled on C: fsutil 8dot3name query D: The volume state is: 1 (8dot3 name creation is disabled). The registry state is: 2 (Per volume setting - the default). Based on the above settings, 8dot3 name creation is disabled on D: ``` This might help a bit with https://github.com/actions/cache/issues/752, although I haven't tested it, and AFAICT it's unlikely make an order of magnitude difference. --- images/windows/scripts/helpers/VisualStudioHelpers.ps1 | 9 --------- 1 file changed, 9 deletions(-) diff --git a/images/windows/scripts/helpers/VisualStudioHelpers.ps1 b/images/windows/scripts/helpers/VisualStudioHelpers.ps1 index 79f60041c250..eb45536316e1 100644 --- a/images/windows/scripts/helpers/VisualStudioHelpers.ps1 +++ b/images/windows/scripts/helpers/VisualStudioHelpers.ps1 @@ -44,15 +44,6 @@ Function Install-VisualStudio { Test-FileSignature -Path $bootstrapperFilePath -ExpectedThumbprint $SignatureThumbprint try { - Write-Host "Enable short name support on Windows needed for Xamarin Android AOT, defaults appear to have been changed in Azure VMs" - $shortNameEnableProcess = Start-Process -FilePath fsutil.exe -ArgumentList ('8dot3name', 'set', '0') -Wait -PassThru - - $shortNameEnableExitCode = $shortNameEnableProcess.ExitCode - if ($shortNameEnableExitCode -ne 0) { - Write-Host "Enabling short name support on Windows failed. This needs to be enabled prior to VS 2017 install for Xamarin Andriod AOT to work." - exit $shortNameEnableExitCode - } - $responseData = @{ "channelUri" = $channelUri "channelId" = $channelId From 4abf97ab13928c4731cb243a72225c55436832fc Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Thu, 16 May 2024 19:12:29 +0200 Subject: [PATCH 2847/3485] Add ubuntu 24.04 to custom image scripts generator (#9868) --- helpers/GenerateResourcesAndImage.ps1 | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/helpers/GenerateResourcesAndImage.ps1 b/helpers/GenerateResourcesAndImage.ps1 index f7e5d1216412..58e9698f8d26 100644 --- a/helpers/GenerateResourcesAndImage.ps1 +++ b/helpers/GenerateResourcesAndImage.ps1 @@ -5,7 +5,8 @@ enum ImageType { Windows2022 = 2 Ubuntu2004 = 3 Ubuntu2204 = 4 - UbuntuMinimal = 5 + Ubuntu2404 = 5 + UbuntuMinimal = 6 } Function Get-PackerTemplatePath { @@ -30,6 +31,9 @@ Function Get-PackerTemplatePath { ([ImageType]::Ubuntu2204) { $relativeTemplatePath = Join-Path (Join-Path "ubuntu" "templates") "ubuntu-22.04.pkr.hcl" } + ([ImageType]::Ubuntu2404) { + $relativeTemplatePath = Join-Path (Join-Path "ubuntu" "templates") "ubuntu-24.04.pkr.hcl" + } ([ImageType]::UbuntuMinimal) { $relativeTemplatePath = Join-Path (Join-Path "ubuntu" "templates") "ubuntu-minimal.pkr.hcl" } From cccb82874c40a13de2ce76760dc9a6718ec05845 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 17 May 2024 01:27:13 +0000 Subject: [PATCH 2848/3485] Updating readme file for ubuntu20 version 20240516.1.1 (#9869) Co-authored-by: Image generation service account <no-reply@microsoft.com> --- images/ubuntu/Ubuntu2004-Readme.md | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/images/ubuntu/Ubuntu2004-Readme.md b/images/ubuntu/Ubuntu2004-Readme.md index 283a2648e5a7..ff86a1b1b2f9 100644 --- a/images/ubuntu/Ubuntu2004-Readme.md +++ b/images/ubuntu/Ubuntu2004-Readme.md @@ -2,12 +2,11 @@ |-| | [Ubuntu 24.04 is now available](https://github.com/actions/runner-images/issues/9848) | | [[Ubuntu, Windows] Docker Compose v1 will be removed from images on July, 9](https://github.com/actions/runner-images/issues/9692) | -| [[Ubuntu] ubuntu-toolchain-r/test repository will be removed from images on May 13](https://github.com/actions/runner-images/issues/9679) | *** # Ubuntu 20.04 - OS Version: 20.04.6 LTS - Kernel Version: 5.15.0-1064-azure -- Image Version: 20240514.2.0 +- Image Version: 20240516.1.0 - Systemd version: 245.4-4ubuntu3.23 ## Installed Software @@ -43,7 +42,7 @@ - Pip3 20.0.2 - Pipx 1.5.0 - RubyGems 3.1.2 -- Vcpkg (build from commit bd2b54836) +- Vcpkg (build from commit 66a252f70) - Yarn 1.22.22 #### Environment variables @@ -84,7 +83,7 @@ to accomplish this. - Docker Client 24.0.9 - Docker Server 24.0.9 - Fastlane 2.220.0 -- Git 2.43.2 +- Git 2.45.1 - Git LFS 3.5.1 - Git-ftp 1.6.0 - Haveged 1.9.1 @@ -92,7 +91,7 @@ to accomplish this. - HHVM (HipHop VM) 4.172.1 - jq 1.6 - Kind 0.23.0 -- Kubectl 1.30.0 +- Kubectl 1.30.1 - Kustomize 5.4.1 - Leiningen 2.11.2 - MediaInfo 19.09 @@ -106,7 +105,7 @@ to accomplish this. - Parcel 2.12.0 - PhantomJS 2.1.1 2.1.1 - Podman 3.4.2 -- Pulumi 3.116.0 +- Pulumi 3.116.1 - R 4.4.0 - Skopeo 1.5.0 - Sphinx Open Source Search Server 2.2.11 @@ -118,17 +117,17 @@ to accomplish this. ### CLI Tools - Alibaba Cloud CLI 3.0.174 -- AWS CLI 2.15.50 +- AWS CLI 2.15.51 - AWS CLI Session Manager Plugin 1.2.553.0 - AWS SAM CLI 1.116.0 - Azure CLI 2.60.0 -- Azure CLI (azure-devops) 1.0.0 +- Azure CLI (azure-devops) 1.0.1 - GitHub CLI 2.49.2 - Google Cloud CLI 476.0.0 - Netlify CLI 17.23.5 -- OpenShift CLI 4.15.12 +- OpenShift CLI 4.15.13 - ORAS CLI 1.1.0 -- Vercel CLI 34.1.14 +- Vercel CLI 34.2.0 ### Java | Version | Environment Variable | @@ -167,12 +166,12 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 124.0.6367.207 -- ChromeDriver 124.0.6367.207 -- Chromium 124.0.6367.0 +- Google Chrome 125.0.6422.60 +- ChromeDriver 125.0.6422.60 +- Chromium 125.0.6422.0 - Microsoft Edge 124.0.2478.105 - Microsoft Edge WebDriver 124.0.2478.105 -- Selenium server 4.20.0 +- Selenium server 4.21.0 - Mozilla Firefox 126.0 - Geckodriver 0.34.0 From 532cfd5c07ad1213e5d1b607430c2d69a5fc2683 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 17 May 2024 02:41:39 +0000 Subject: [PATCH 2849/3485] Updating readme file for ubuntu22 version 20240516.1.1 (#9870) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2204-Readme.md | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/images/ubuntu/Ubuntu2204-Readme.md b/images/ubuntu/Ubuntu2204-Readme.md index 27e43a491c04..205f0b8a66fa 100644 --- a/images/ubuntu/Ubuntu2204-Readme.md +++ b/images/ubuntu/Ubuntu2204-Readme.md @@ -2,12 +2,11 @@ |-| | [Ubuntu 24.04 is now available](https://github.com/actions/runner-images/issues/9848) | | [[Ubuntu, Windows] Docker Compose v1 will be removed from images on July, 9](https://github.com/actions/runner-images/issues/9692) | -| [[Ubuntu] ubuntu-toolchain-r/test repository will be removed from images on May 13](https://github.com/actions/runner-images/issues/9679) | *** # Ubuntu 22.04 - OS Version: 22.04.4 LTS - Kernel Version: 6.5.0-1021-azure -- Image Version: 20240514.2.0 +- Image Version: 20240516.1.0 - Systemd version: 249.11-0ubuntu3.12 ## Installed Software @@ -41,7 +40,7 @@ - Pip3 22.0.2 - Pipx 1.5.0 - RubyGems 3.3.5 -- Vcpkg (build from commit bd2b54836) +- Vcpkg (build from commit 66a252f70) - Yarn 1.22.22 #### Environment variables @@ -82,14 +81,14 @@ to accomplish this. - Docker Client 24.0.9 - Docker Server 24.0.9 - Fastlane 2.220.0 -- Git 2.43.2 +- Git 2.45.1 - Git LFS 3.5.1 - Git-ftp 1.6.0 - Haveged 1.9.14 - Heroku 8.11.5 - jq 1.6 - Kind 0.23.0 -- Kubectl 1.30.0 +- Kubectl 1.30.1 - Kustomize 5.4.1 - Leiningen 2.11.2 - MediaInfo 21.09 @@ -102,7 +101,7 @@ to accomplish this. - Packer 1.10.3 - Parcel 2.12.0 - Podman 3.4.4 -- Pulumi 3.116.0 +- Pulumi 3.116.1 - R 4.4.0 - Skopeo 1.4.1 - Sphinx Open Source Search Server 2.2.11 @@ -114,17 +113,17 @@ to accomplish this. ### CLI Tools - Alibaba Cloud CLI 3.0.205 -- AWS CLI 2.15.50 +- AWS CLI 2.15.51 - AWS CLI Session Manager Plugin 1.2.553.0 - AWS SAM CLI 1.116.0 - Azure CLI 2.60.0 -- Azure CLI (azure-devops) 1.0.0 +- Azure CLI (azure-devops) 1.0.1 - GitHub CLI 2.49.2 - Google Cloud CLI 476.0.0 - Netlify CLI 17.23.5 -- OpenShift CLI 4.15.12 +- OpenShift CLI 4.15.13 - ORAS CLI 1.1.0 -- Vercel CLI 34.1.14 +- Vercel CLI 34.2.0 ### Java | Version | Environment Variable | @@ -163,12 +162,12 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 124.0.6367.207 -- ChromeDriver 124.0.6367.207 -- Chromium 124.0.6367.0 +- Google Chrome 125.0.6422.60 +- ChromeDriver 125.0.6422.60 +- Chromium 125.0.6422.0 - Microsoft Edge 124.0.2478.105 -- Microsoft Edge WebDriver 124.0.2478.97 -- Selenium server 4.20.0 +- Microsoft Edge WebDriver 124.0.2478.105 +- Selenium server 4.21.0 - Mozilla Firefox 126.0 - Geckodriver 0.34.0 From afb777d3f7fbe9012d91655eac443c3b9d7045d6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 17 May 2024 09:16:30 +0000 Subject: [PATCH 2850/3485] Updating readme file for ubuntu24 version 20240516.4.1 (#9871) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2404-Readme.md | 44 +++++++++++++++--------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/images/ubuntu/Ubuntu2404-Readme.md b/images/ubuntu/Ubuntu2404-Readme.md index 1a6649320e56..fddc408efd1e 100644 --- a/images/ubuntu/Ubuntu2404-Readme.md +++ b/images/ubuntu/Ubuntu2404-Readme.md @@ -1,12 +1,12 @@ | Announcements | |-| +| [Ubuntu 24.04 is now available](https://github.com/actions/runner-images/issues/9848) | | [[Ubuntu, Windows] Docker Compose v1 will be removed from images on July, 9](https://github.com/actions/runner-images/issues/9692) | -| [[Ubuntu] ubuntu-toolchain-r/test repository will be removed from images on May 13](https://github.com/actions/runner-images/issues/9679) | *** # Ubuntu 24.04 LTS - OS Version: 24.04 LTS - Kernel Version: 6.8.0-1007-azure -- Image Version: 20240510.1.0 +- Image Version: 20240516.4.0 - Systemd version: 255.4-1ubuntu8 ## Installed Software @@ -28,14 +28,14 @@ ### Package Management - cpan 1.64 - Helm 3.14.4 -- Homebrew 4.2.21 +- Homebrew 4.3.0 - Miniconda 24.3.0 - Npm 10.5.2 - Pip 24.0 - Pip3 24.0 - Pipx 1.4.3 - RubyGems 3.4.20 -- Vcpkg (build from commit cbf4a6641) +- Vcpkg (build from commit 66a252f70) - Yarn 1.22.22 #### Environment variables @@ -55,7 +55,7 @@ to accomplish this. ### Project Management - Ant 1.10.14 - Gradle 8.7 -- Lerna 8.1.2 +- Lerna 8.1.3 - Maven 3.8.8 ### Tools @@ -68,42 +68,42 @@ to accomplish this. - Buildah 1.33.7 - CMake 3.29.3 - CodeQL Action Bundle 2.17.2 -- Docker Amazon ECR Credential Helper 0.7.1 +- Docker Amazon ECR Credential Helper 0.8.0 - Docker Compose v2 2.27.0 - Docker-Buildx 0.14.0 - Docker Client 26.1.0 - Docker Server 26.1.0 - Fastlane 2.220.0 -- Git 2.43.2 +- Git 2.45.1 - Git LFS 3.5.1 - Git-ftp 1.6.0 - Haveged 1.9.14 - jq 1.7 -- Kind 0.22.0 -- Kubectl 1.30.0 +- Kind 0.23.0 +- Kubectl 1.30.1 - Kustomize 5.4.1 - MediaInfo 24.01 - Mercurial 6.7.2 -- Minikube 1.33.0 +- Minikube 1.33.1 - n 9.2.3 - Newman 6.1.2 - OpenSSL 3.0.13-0ubuntu3 - Parcel 2.12.0 - Podman 4.9.3 -- Pulumi 3.115.2 +- Pulumi 3.116.1 - Skopeo 1.13.3 - Sphinx Open Source Search Server 2.2.11 - yamllint 1.35.1 -- yq 4.43.1 +- yq 4.44.1 - zstd 1.5.6 ### CLI Tools -- AWS CLI 2.15.47 +- AWS CLI 2.15.51 - AWS CLI Session Manager Plugin 1.2.553.0 - AWS SAM CLI 1.116.0 - Azure CLI 2.60.0 -- Azure CLI (azure-devops) 1.0.0 -- GitHub CLI 2.49.1 +- Azure CLI (azure-devops) 1.0.1 +- GitHub CLI 2.49.2 ### Java | Version | Environment Variable | @@ -123,9 +123,9 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ### Haskell Tools - Cabal 3.10.3.0 -- GHC 9.8.2 +- GHC 9.10.1 - GHCup 0.1.22.0 -- Stack 2.15.5 +- Stack 2.15.7 ### Rust Tools - Cargo 1.78.0 @@ -137,10 +137,10 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 124.0.6367.201 -- ChromeDriver 124.0.6367.201 -- Chromium 124.0.6367.0 -- Selenium server 4.20.0 +- Google Chrome 125.0.6422.60 +- ChromeDriver 125.0.6422.60 +- Chromium 125.0.6422.0 +- Selenium server 4.21.0 #### Environment variables | Name | Value | @@ -151,7 +151,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | ### .NET Tools -- .NET Core SDK: 8.0.104 +- .NET Core SDK: 8.0.300 - nbgv 3.6.133+2d32d93cb1 ### Databases From ec4d691dad2dfcbed1547478731a994f2151030e Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Fri, 17 May 2024 14:39:38 +0200 Subject: [PATCH 2851/3485] [Ubuntu] Add .NET SDKs 6 and 7 on Ubuntu 24.04 (#9878) --- images/ubuntu/toolsets/toolset-2404.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/images/ubuntu/toolsets/toolset-2404.json b/images/ubuntu/toolsets/toolset-2404.json index 6d88e441a039..64000652492a 100644 --- a/images/ubuntu/toolsets/toolset-2404.json +++ b/images/ubuntu/toolsets/toolset-2404.json @@ -218,9 +218,13 @@ ], "dotnet": { "aptPackages": [ + "dotnet-sdk-6.0", + "dotnet-sdk-7.0", "dotnet-sdk-8.0" ], "versions": [ + "6.0", + "7.0", "8.0" ], "tools": [ From 7cec68c4a6abaacf7efd7ee4eeb29631e14f6489 Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Fri, 17 May 2024 14:58:40 +0200 Subject: [PATCH 2852/3485] [macos] Fix URLs in configure-preimagedata.sh (#9880) --- images/macos/scripts/build/configure-preimagedata.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/macos/scripts/build/configure-preimagedata.sh b/images/macos/scripts/build/configure-preimagedata.sh index d86ab3278a5e..e92b08b1d1bd 100644 --- a/images/macos/scripts/build/configure-preimagedata.sh +++ b/images/macos/scripts/build/configure-preimagedata.sh @@ -21,7 +21,7 @@ else fi release_label="macOS-${label_version}" -if is_Ventura || is_Sonoma; then +if is_Ventura || is_Sonoma || is_Monterey; then software_url="https://github.com/actions/runner-images/blob/${image_label}/${image_version}/images/macos/${image_label}-Readme.md" releaseUrl="https://github.com/actions/runner-images/releases/tag/${image_label}%2F${image_version}" else From 845c5ee866b1e70af19d7723e5818c7ac57915dc Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Fri, 17 May 2024 15:03:07 +0200 Subject: [PATCH 2853/3485] Fix macos-12 rollout badge (#9881) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1b8844c81135..52594f6bdc06 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ To build a VM machine from this repo's source, see the [instructions](docs/creat | macOS 14 Arm64 |`macos-latest`, `macos-14`, `macos-latest-xlarge` or `macos-14-xlarge`| [macOS-14-arm64] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fmikhailkoliada%2F35b243dd6e217d041fe3dfa5b4e2e2ed%2Fraw%2Fmacos-14-arm64.json) | | macOS 13 | `macos-13` or `macos-13-large` | [macOS-13] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fmikhailkoliada%2F35b243dd6e217d041fe3dfa5b4e2e2ed%2Fraw%2Fmacos-13.json) | | macOS 13 Arm64 | `macos-13-xlarge` | [macOS-13-arm64] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fmikhailkoliada%2F35b243dd6e217d041fe3dfa5b4e2e2ed%2Fraw%2Fmacos-13-arm64.json) | -| macOS 12 | `macos-12` or `macos-12-large`| [macOS-12] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fmikhailkoliada%2F35b243dd6e217d041fe3dfa5b4e2e2ed%2Fraw%2FmacOS-12.json) | +| macOS 12 | `macos-12` or `macos-12-large`| [macOS-12] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fmikhailkoliada%2F35b243dd6e217d041fe3dfa5b4e2e2ed%2Fraw%2Fmacos-12.json) | | macOS 11 <sup>deprecated</sup> | `macos-11`| [macOS-11] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fmikhailkoliada%2F35b243dd6e217d041fe3dfa5b4e2e2ed%2Fraw%2FmacOS-11.json) | | Windows Server 2022 | `windows-latest` or `windows-2022` | [windows-2022] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fmikhailkoliada%2F35b243dd6e217d041fe3dfa5b4e2e2ed%2Fraw%2Fwin22.json) | | Windows Server 2019 | `windows-2019` | [windows-2019] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fmikhailkoliada%2F35b243dd6e217d041fe3dfa5b4e2e2ed%2Fraw%2Fwin19.json) | From 8a1afc1fe18da3320cb091a5e3c94bc2fbdf3540 Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Fri, 17 May 2024 22:32:28 +0200 Subject: [PATCH 2854/3485] [macOS] Pin Swiftlint on macOS-12 due to Xcode 15.3 requirements (#9886) --- images/macos/scripts/build/install-swiftlint.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/images/macos/scripts/build/install-swiftlint.sh b/images/macos/scripts/build/install-swiftlint.sh index c04382987e04..90a985248bc8 100644 --- a/images/macos/scripts/build/install-swiftlint.sh +++ b/images/macos/scripts/build/install-swiftlint.sh @@ -12,6 +12,13 @@ if is_BigSur; then COMMIT=d1d5743344227fe6e3c37cfba19f0cfe15a9448a FORMULA_URL="https://raw.githubusercontent.com/Homebrew/homebrew-core/$COMMIT/Formula/swiftlint.rb" + curl -fsSL $FORMULA_URL > $(find $(brew --repository) -name swiftlint.rb) + HOMEBREW_NO_AUTO_UPDATE=1 HOMEBREW_NO_INSTALL_FROM_API=1 brew install swiftlint +elif is_Monterey; then + # SwiftLint now requires Xcode 15.3 or higher to build https://github.com/realm/SwiftLint/releases/tag/0.55.1 + COMMIT=d91dabd087cb0b906c92a825df9e5e5e1a4f59f8 + FORMULA_URL="https://raw.githubusercontent.com/Homebrew/homebrew-core/$COMMIT/Formula/s/swiftlint.rb" + curl -fsSL $FORMULA_URL > $(find $(brew --repository) -name swiftlint.rb) HOMEBREW_NO_AUTO_UPDATE=1 HOMEBREW_NO_INSTALL_FROM_API=1 brew install swiftlint else From e2a8bbc6e1ff3ea021f736e2a8589f27e681aa15 Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Fri, 17 May 2024 22:33:04 +0200 Subject: [PATCH 2855/3485] [Windows] Update signature for Azure CosmosDb Emulator (#9875) * [Windows] Update signature for Azure CosmosDb Emulator * Replace with SHA256 --- images/windows/scripts/build/Install-AzureCosmosDbEmulator.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/windows/scripts/build/Install-AzureCosmosDbEmulator.ps1 b/images/windows/scripts/build/Install-AzureCosmosDbEmulator.ps1 index 5a39869b9ff6..c4b35e23d646 100644 --- a/images/windows/scripts/build/Install-AzureCosmosDbEmulator.ps1 +++ b/images/windows/scripts/build/Install-AzureCosmosDbEmulator.ps1 @@ -5,6 +5,6 @@ Install-Binary -Type MSI ` -Url "https://aka.ms/cosmosdb-emulator" ` - -ExpectedSignature "C2048FB509F1C37A8C3E9EC6648118458AA01780" + -ExpectedSHA256Sum "e2915c766a02d0c0703ae12b28ef992c4f62fe33e65eb482abeeaaaf0ea85237" Invoke-PesterTests -TestFile "Tools" -TestName "Azure Cosmos DB Emulator" From a38a062eee8b3ee53d2962ea216b8afff2724b18 Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Mon, 20 May 2024 10:03:57 +0200 Subject: [PATCH 2856/3485] [Windows] Add more compatible VS2022 VC components (#9876) * [Windows] Add more compatible VS2022 VC components * Updated chocolatey installation to use new certificate thumbprint * Azure CosmosDb Emulator SHA256 updated --------- Co-authored-by: Jack Hennessey <jhennessey5225@gmail.com> --- images/windows/scripts/build/Install-AzureCosmosDbEmulator.ps1 | 2 +- images/windows/scripts/build/Install-Chocolatey.ps1 | 2 +- images/windows/toolsets/toolset-2022.json | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/images/windows/scripts/build/Install-AzureCosmosDbEmulator.ps1 b/images/windows/scripts/build/Install-AzureCosmosDbEmulator.ps1 index c4b35e23d646..b158899a0749 100644 --- a/images/windows/scripts/build/Install-AzureCosmosDbEmulator.ps1 +++ b/images/windows/scripts/build/Install-AzureCosmosDbEmulator.ps1 @@ -5,6 +5,6 @@ Install-Binary -Type MSI ` -Url "https://aka.ms/cosmosdb-emulator" ` - -ExpectedSHA256Sum "e2915c766a02d0c0703ae12b28ef992c4f62fe33e65eb482abeeaaaf0ea85237" + -ExpectedSHA256Sum "6312237EE3E06C730F8DCFB3D26F5202D9E713C0603039231A72DB56DD2605B4" Invoke-PesterTests -TestFile "Tools" -TestName "Azure Cosmos DB Emulator" diff --git a/images/windows/scripts/build/Install-Chocolatey.ps1 b/images/windows/scripts/build/Install-Chocolatey.ps1 index 6dc2c6c1569a..cb5f09fa8b13 100644 --- a/images/windows/scripts/build/Install-Chocolatey.ps1 +++ b/images/windows/scripts/build/Install-Chocolatey.ps1 @@ -13,7 +13,7 @@ Add-MachinePathItem 'C:\ProgramData\Chocolatey\bin' Update-Environment # Verify and run choco installer -$signatureThumbprint = "83AC7D88C66CB8680BCE802E0F0F5C179722764B" +$signatureThumbprint = "B009C875F4E10FFBC62B785BAF4FC4D6BC2D5711" $installScriptPath = Invoke-DownloadWithRetry 'https://chocolatey.org/install.ps1' Test-FileSignature -Path $installScriptPath -ExpectedThumbprint $signatureThumbprint Invoke-Expression $installScriptPath diff --git a/images/windows/toolsets/toolset-2022.json b/images/windows/toolsets/toolset-2022.json index 34f5bfc5846c..90c96cb362a0 100644 --- a/images/windows/toolsets/toolset-2022.json +++ b/images/windows/toolsets/toolset-2022.json @@ -212,6 +212,7 @@ "Microsoft.VisualStudio.Component.VC.Tools.ARM", "Microsoft.VisualStudio.Component.VC.Tools.ARM64", "Microsoft.VisualStudio.Component.VC.Tools.ARM64EC", + "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", "Microsoft.VisualStudio.Component.VC.Modules.x86.x64", "Microsoft.VisualStudio.Component.VC.Redist.MSM", "Microsoft.VisualStudio.Component.VC.Runtimes.ARM.Spectre", @@ -224,6 +225,7 @@ "Microsoft.VisualStudio.Component.VC.MFC.ARM64.Spectre", "Microsoft.VisualStudio.Component.VC.ATLMFC", "Microsoft.VisualStudio.Component.VC.ATLMFC.Spectre", + "Microsoft.VisualStudio.Component.VC.ATL", "Microsoft.VisualStudio.Component.VC.ATL.Spectre", "Microsoft.VisualStudio.Component.VC.ATL.ARM", "Microsoft.VisualStudio.Component.VC.ATL.ARM.Spectre", From a9fed55df6b9b1675a6c524e892ac1dcc25dd9f0 Mon Sep 17 00:00:00 2001 From: MaksimZhukov <46996400+MaksimZhukov@users.noreply.github.com> Date: Mon, 20 May 2024 14:18:02 +0200 Subject: [PATCH 2857/3485] [Ubuntu] Add libyaml-dev library (#9897) --- images/ubuntu/toolsets/toolset-2404.json | 1 + 1 file changed, 1 insertion(+) diff --git a/images/ubuntu/toolsets/toolset-2404.json b/images/ubuntu/toolsets/toolset-2404.json index 64000652492a..beb06507d619 100644 --- a/images/ubuntu/toolsets/toolset-2404.json +++ b/images/ubuntu/toolsets/toolset-2404.json @@ -122,6 +122,7 @@ "gnupg2", "iproute2", "iputils-ping", + "libyaml-dev", "libtool", "libssl-dev", "locales", From ee7edb4f80edb64ff69e225d135e24fc9988504d Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Mon, 20 May 2024 16:17:27 +0200 Subject: [PATCH 2858/3485] [Ubuntu] Add new git environment variable (#9899) --- images/ubuntu/scripts/build/install-git.sh | 5 +++++ images/ubuntu/scripts/tests/Tools.Tests.ps1 | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/images/ubuntu/scripts/build/install-git.sh b/images/ubuntu/scripts/build/install-git.sh index f38c586e2b74..36122e449752 100644 --- a/images/ubuntu/scripts/build/install-git.sh +++ b/images/ubuntu/scripts/build/install-git.sh @@ -6,6 +6,7 @@ # Source the helpers for use with the script source $HELPER_SCRIPTS/install.sh +source $HELPER_SCRIPTS/etc-environment.sh GIT_REPO="ppa:git-core/ppa" @@ -21,6 +22,10 @@ cat <<EOF >> /etc/gitconfig directory = * EOF +# Revert to the old behaviour and avoid the Git LFS problems (https://github.blog/2024-05-14-securing-git-addressing-5-new-vulnerabilities/) +set_etc_environment_variable "GIT_CLONE_PROTECTION_ACTIVE" 'false' +reload_etc_environment + # Install git-ftp apt-get install git-ftp -y diff --git a/images/ubuntu/scripts/tests/Tools.Tests.ps1 b/images/ubuntu/scripts/tests/Tools.Tests.ps1 index 2aa7c1c3dd43..b5ef22500563 100644 --- a/images/ubuntu/scripts/tests/Tools.Tests.ps1 +++ b/images/ubuntu/scripts/tests/Tools.Tests.ps1 @@ -244,6 +244,10 @@ Describe "Git" { It "git-ftp" { "git-ftp --version" | Should -ReturnZeroExitCode } + + It "GIT_CLONE_PROTECTION_ACTIVE environment variable should be equal false" { + $env:GIT_CLONE_PROTECTION_ACTIVE | Should -BeExactly false + } } Describe "Git-lfs" { From 5113d251a822f91becde6629627eeb293107b3b5 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Mon, 20 May 2024 16:44:16 +0200 Subject: [PATCH 2859/3485] [Windows] Add new git environment variable (#9898) --- images/windows/scripts/build/Install-Git.ps1 | 2 ++ images/windows/scripts/tests/Git.Tests.ps1 | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/images/windows/scripts/build/Install-Git.ps1 b/images/windows/scripts/build/Install-Git.ps1 index 21648cef4ba4..4c8cbb8c4b0d 100644 --- a/images/windows/scripts/build/Install-Git.ps1 +++ b/images/windows/scripts/build/Install-Git.ps1 @@ -41,6 +41,8 @@ if ($LASTEXITCODE -ne 0) { # Disable GCM machine-wide [Environment]::SetEnvironmentVariable("GCM_INTERACTIVE", "Never", "Machine") +# Revert to the old behaviour and avoid the Git LFS problems (https://github.blog/2024-05-14-securing-git-addressing-5-new-vulnerabilities/) +[Environment]::SetEnvironmentVariable("GIT_CLONE_PROTECTION_ACTIVE", "false", "Machine") # Add to PATH Add-MachinePathItem "C:\Program Files\Git\bin" diff --git a/images/windows/scripts/tests/Git.Tests.ps1 b/images/windows/scripts/tests/Git.Tests.ps1 index 00b3d23024b2..87ef9b55e9cf 100644 --- a/images/windows/scripts/tests/Git.Tests.ps1 +++ b/images/windows/scripts/tests/Git.Tests.ps1 @@ -22,4 +22,8 @@ Describe "Git" { It "GCM_INTERACTIVE environment variable should be equal Never" { $env:GCM_INTERACTIVE | Should -BeExactly Never } + + It "GIT_CLONE_PROTECTION_ACTIVE environment variable should be equal false" { + $env:GIT_CLONE_PROTECTION_ACTIVE | Should -BeExactly false + } } From 5c60b0c2afa1b3865f795aeea3c2c44fb03de4a6 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Mon, 20 May 2024 23:37:11 +0200 Subject: [PATCH 2860/3485] [macOS] Add new git environment variable (#9900) --- images/macos/scripts/build/configure-machine.sh | 3 +++ images/macos/scripts/tests/Git.Tests.ps1 | 3 +++ 2 files changed, 6 insertions(+) diff --git a/images/macos/scripts/build/configure-machine.sh b/images/macos/scripts/build/configure-machine.sh index 294935000dab..402aea10b12e 100644 --- a/images/macos/scripts/build/configure-machine.sh +++ b/images/macos/scripts/build/configure-machine.sh @@ -103,3 +103,6 @@ if [[ ! -d "/usr/local/bin" ]];then fi chmod +x $HOME/utils/invoke-tests.sh sudo ln -s $HOME/utils/invoke-tests.sh /usr/local/bin/invoke_tests + +# Revert to the old behaviour and avoid the Git LFS problems (https://github.blog/2024-05-14-securing-git-addressing-5-new-vulnerabilities/) +echo "export GIT_CLONE_PROTECTION_ACTIVE=false" >> $HOME/.bashrc diff --git a/images/macos/scripts/tests/Git.Tests.ps1 b/images/macos/scripts/tests/Git.Tests.ps1 index f216baa0bcd1..3efb6d82c526 100644 --- a/images/macos/scripts/tests/Git.Tests.ps1 +++ b/images/macos/scripts/tests/Git.Tests.ps1 @@ -9,4 +9,7 @@ Describe "Git" { It "git lfs is installed" -Skip:($os.IsBigSur) { "git lfs version" | Should -ReturnZeroExitCode } + It "GIT_CLONE_PROTECTION_ACTIVE environment variable should be equal false" { + $env:GIT_CLONE_PROTECTION_ACTIVE | Should -BeExactly false + } } From 3dcd2fa9b4ddbdee4ebb74130bf8ad53b7d6c213 Mon Sep 17 00:00:00 2001 From: Ketil <477141+mysteq@users.noreply.github.com> Date: Fri, 24 May 2024 09:53:23 +0200 Subject: [PATCH 2861/3485] fix: update thumbprint of AzureCosmosDbEmulator (#9910) --- images/windows/scripts/build/Install-AzureCosmosDbEmulator.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/windows/scripts/build/Install-AzureCosmosDbEmulator.ps1 b/images/windows/scripts/build/Install-AzureCosmosDbEmulator.ps1 index b158899a0749..0249831f48f8 100644 --- a/images/windows/scripts/build/Install-AzureCosmosDbEmulator.ps1 +++ b/images/windows/scripts/build/Install-AzureCosmosDbEmulator.ps1 @@ -5,6 +5,6 @@ Install-Binary -Type MSI ` -Url "https://aka.ms/cosmosdb-emulator" ` - -ExpectedSHA256Sum "6312237EE3E06C730F8DCFB3D26F5202D9E713C0603039231A72DB56DD2605B4" + -ExpectedSHA256Sum "34D8E1968A868CEBBC31D1484C473FC61D3174D6C3B9AB71D4CE94F6618D7670" Invoke-PesterTests -TestFile "Tools" -TestName "Azure Cosmos DB Emulator" From 562ad565fa38b8d00603234b4d51fbd28c8fd5b1 Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Fri, 24 May 2024 12:43:37 +0200 Subject: [PATCH 2862/3485] Revert "[Ubuntu] Pin Helm 3.14.4 due to unusual release of 3.15.0 (#9867)" (#9919) --- images/ubuntu/scripts/build/install-kubernetes-tools.sh | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/images/ubuntu/scripts/build/install-kubernetes-tools.sh b/images/ubuntu/scripts/build/install-kubernetes-tools.sh index eb287ead2ee4..bd7ae7c74174 100644 --- a/images/ubuntu/scripts/build/install-kubernetes-tools.sh +++ b/images/ubuntu/scripts/build/install-kubernetes-tools.sh @@ -27,13 +27,7 @@ sudo apt-get update -y && sudo apt-get install -y kubectl rm -f /etc/apt/sources.list.d/kubernetes.list # Install Helm -# Temporary pin version v3.14.4 due to strange release of v3.15.0 -helm_version="v3.14.4" -download_with_retry "https://get.helm.sh/helm-$helm_version-linux-amd64.tar.gz" /tmp/helm.tar.gz -mkdir -p /tmp/helm -tar xzf /tmp/helm.tar.gz -C /tmp/helm -cp /tmp/helm/linux-amd64/helm /usr/local/bin/helm -chmod +x /usr/local/bin/helm +curl -fsSL https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3 | bash # Download minikube curl -fsSL -O https://storage.googleapis.com/minikube/releases/latest/minikube-linux-amd64 From 36549632cea38ed6a673524db463e2a030ccf247 Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Fri, 24 May 2024 12:47:17 +0200 Subject: [PATCH 2863/3485] Update github/codeql-action and actions/checkout actions version (#9916) --- .github/workflows/codeql-analysis.yml | 8 ++++---- .github/workflows/linter.yml | 2 +- .github/workflows/powershell-tests.yml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 407f8f325351..2c28c6eec319 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -40,11 +40,11 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@v2 + uses: github/codeql-action/init@v3 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -55,7 +55,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@v2 + uses: github/codeql-action/autobuild@v3 # ℹ️ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -69,4 +69,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2 \ No newline at end of file + uses: github/codeql-action/analyze@v3 diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml index 4a82f16e8317..5f2c2cb04241 100644 --- a/.github/workflows/linter.yml +++ b/.github/workflows/linter.yml @@ -17,7 +17,7 @@ jobs: steps: - name: Checkout Code - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 diff --git a/.github/workflows/powershell-tests.yml b/.github/workflows/powershell-tests.yml index 3cf950d48254..28afce838e5e 100644 --- a/.github/workflows/powershell-tests.yml +++ b/.github/workflows/powershell-tests.yml @@ -15,7 +15,7 @@ jobs: steps: - name: Checkout Repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Run Software Report module tests shell: pwsh From ed92ac6e3ff66f090ff7527f5e9c104993653d09 Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Sat, 25 May 2024 15:14:03 +0200 Subject: [PATCH 2864/3485] [Ubuntu] Revert previously removed Docker tests (#9824) --- images/ubuntu/scripts/build/install-docker.sh | 10 ++++++++-- images/ubuntu/scripts/tests/Tools.Tests.ps1 | 19 +++++++++++++++++-- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/images/ubuntu/scripts/build/install-docker.sh b/images/ubuntu/scripts/build/install-docker.sh index 3b2853c05506..83738f5440e0 100644 --- a/images/ubuntu/scripts/build/install-docker.sh +++ b/images/ubuntu/scripts/build/install-docker.sh @@ -47,8 +47,14 @@ done # docker from official repo introduced different GID generation: https://github.com/actions/runner-images/issues/8157 gid=$(cut -d ":" -f 3 /etc/group | grep "^1..$" | sort -n | tail -n 1 | awk '{ print $1+1 }') groupmod -g "$gid" docker -chgrp -hR docker /run/docker.sock -chgrp -hR docker /var/run/docker.sock + +# Create systemd-tmpfiles configuration for Docker +cat <<EOF | sudo tee /etc/tmpfiles.d/docker.conf +L /run/docker.sock - - - - root docker 0770 +EOF + +# Reload systemd-tmpfiles to apply the new configuration +systemd-tmpfiles --create /etc/tmpfiles.d/docker.conf # Enable docker.service systemctl is-active --quiet docker.service || systemctl start docker.service diff --git a/images/ubuntu/scripts/tests/Tools.Tests.ps1 b/images/ubuntu/scripts/tests/Tools.Tests.ps1 index b5ef22500563..2bd0872f458b 100644 --- a/images/ubuntu/scripts/tests/Tools.Tests.ps1 +++ b/images/ubuntu/scripts/tests/Tools.Tests.ps1 @@ -69,12 +69,27 @@ Describe "Docker" { It "docker client" { $version=(Get-ToolsetContent).docker.components | Where-Object { $_.package -eq 'docker-ce-cli' } | Select-Object -ExpandProperty version If ($version -ne "latest") { - $(docker version --format '{{.Client.Version}}') | Should -BeLike "*$version*" + $(sudo docker version --format '{{.Client.Version}}') | Should -BeLike "*$version*" }else{ - "docker version --format '{{.Client.Version}}'" | Should -ReturnZeroExitCode + "sudo docker version --format '{{.Client.Version}}'" | Should -ReturnZeroExitCode } } + It "docker server" { + $version=(Get-ToolsetContent).docker.components | Where-Object { $_.package -eq 'docker-ce' } | Select-Object -ExpandProperty version + If ($version -ne "latest") { + $(sudo docker version --format '{{.Server.Version}}') | Should -BeLike "*$version*" + }else{ + "sudo docker version --format '{{.Server.Version}}'" | Should -ReturnZeroExitCode + } + } + + It "docker client/server versions match" { + $clientVersion = $(sudo docker version --format '{{.Client.Version}}') + $serverVersion = $(sudo docker version --format '{{.Server.Version}}') + $clientVersion | Should -Be $serverVersion + } + It "docker buildx" { $version=(Get-ToolsetContent).docker.plugins | Where-Object { $_.plugin -eq 'buildx' } | Select-Object -ExpandProperty version If ($version -ne "latest") { From 3c26757b41c32b54b4c18d7a03e2bc8f040e377f Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Tue, 28 May 2024 01:19:14 +0200 Subject: [PATCH 2865/3485] [Windows] Update script to install emulator separately (#9947) --- images/windows/scripts/build/Install-AndroidSDK.ps1 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/images/windows/scripts/build/Install-AndroidSDK.ps1 b/images/windows/scripts/build/Install-AndroidSDK.ps1 index e5da5c85d305..1d5668d65ccf 100644 --- a/images/windows/scripts/build/Install-AndroidSDK.ps1 +++ b/images/windows/scripts/build/Install-AndroidSDK.ps1 @@ -119,6 +119,9 @@ $buildToolsList = Get-AndroidBuildToolPackages ` -minVersion $androidToolset.build_tools_min_version Install-AndroidSDKPackages $buildToolsList +# Install Android Emulator +Install-AndroidSDKPackages "emulator" + # Install extras, add-ons and additional tools Write-Host "Installing Android SDK extras, add-ons and additional tools..." Install-AndroidSDKPackages ($androidToolset.extras | ForEach-Object { "extras;$_" }) From 04166140e1548cb8dee09929088cb6307b145f5e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 28 May 2024 10:19:05 +0000 Subject: [PATCH 2866/3485] Updating readme file for ubuntu20 version 20240526.1.1 (#9938) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2004-Readme.md | 58 +++++++++++++++--------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/images/ubuntu/Ubuntu2004-Readme.md b/images/ubuntu/Ubuntu2004-Readme.md index ff86a1b1b2f9..45175f1300c1 100644 --- a/images/ubuntu/Ubuntu2004-Readme.md +++ b/images/ubuntu/Ubuntu2004-Readme.md @@ -6,7 +6,7 @@ # Ubuntu 20.04 - OS Version: 20.04.6 LTS - Kernel Version: 5.15.0-1064-azure -- Image Version: 20240516.1.0 +- Image Version: 20240526.1.0 - Systemd version: 245.4-4ubuntu3.23 ## Installed Software @@ -22,10 +22,10 @@ - GNU C++: 10.5.0 - GNU Fortran: 10.5.0 - Julia 1.10.3 -- Kotlin 1.9.24-release-822 +- Kotlin 2.0.0-release-341 - Mono 6.12.0.200 - MSBuild 16.10.1.31701 (Mono 6.12.0.200) -- Node.js 18.20.2 +- Node.js 18.20.3 - Perl 5.30.0 - Python 3.8.10 - Ruby 2.7.0p0 @@ -33,16 +33,16 @@ ### Package Management - cpan 1.64 -- Helm 3.14.4 -- Homebrew 4.3.0 -- Miniconda 24.3.0 -- Npm 10.5.0 +- Helm 3.15.1 +- Homebrew 4.3.1 +- Miniconda 24.4.0 +- Npm 10.7.0 - NuGet 6.6.1.2 - Pip 20.0.2 - Pip3 20.0.2 - Pipx 1.5.0 - RubyGems 3.1.2 -- Vcpkg (build from commit 66a252f70) +- Vcpkg (build from commit 01f602195) - Yarn 1.22.22 #### Environment variables @@ -75,11 +75,11 @@ to accomplish this. - Bicep 0.27.1 - Buildah 1.22.3 - CMake 3.29.3 -- CodeQL Action Bundle 2.17.2 +- CodeQL Action Bundle 2.17.3 - Docker Amazon ECR Credential Helper 0.8.0 - Docker Compose v1 1.29.2 - Docker Compose v2 2.23.3 -- Docker-Buildx 0.14.0 +- Docker-Buildx 0.14.1 - Docker Client 24.0.9 - Docker Server 24.0.9 - Fastlane 2.220.0 @@ -92,7 +92,7 @@ to accomplish this. - jq 1.6 - Kind 0.23.0 - Kubectl 1.30.1 -- Kustomize 5.4.1 +- Kustomize 5.4.2 - Leiningen 2.11.2 - MediaInfo 19.09 - Mercurial 5.3.1 @@ -105,29 +105,29 @@ to accomplish this. - Parcel 2.12.0 - PhantomJS 2.1.1 2.1.1 - Podman 3.4.2 -- Pulumi 3.116.1 +- Pulumi 3.117.0 - R 4.4.0 - Skopeo 1.5.0 - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 -- Terraform 1.8.3 +- Terraform 1.8.4 - yamllint 1.35.1 - yq 4.44.1 - zstd 1.5.6 ### CLI Tools - Alibaba Cloud CLI 3.0.174 -- AWS CLI 2.15.51 +- AWS CLI 2.15.58 - AWS CLI Session Manager Plugin 1.2.553.0 -- AWS SAM CLI 1.116.0 -- Azure CLI 2.60.0 +- AWS SAM CLI 1.117.0 +- Azure CLI 2.61.0 - Azure CLI (azure-devops) 1.0.1 - GitHub CLI 2.49.2 -- Google Cloud CLI 476.0.0 -- Netlify CLI 17.23.5 -- OpenShift CLI 4.15.13 +- Google Cloud CLI 477.0.0 +- Netlify CLI 17.23.8 +- OpenShift CLI 4.15.14 - ORAS CLI 1.1.0 -- Vercel CLI 34.2.0 +- Vercel CLI 34.2.3 ### Java | Version | Environment Variable | @@ -166,11 +166,11 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 125.0.6422.60 -- ChromeDriver 125.0.6422.60 +- Google Chrome 125.0.6422.112 +- ChromeDriver 125.0.6422.78 - Chromium 125.0.6422.0 -- Microsoft Edge 124.0.2478.105 -- Microsoft Edge WebDriver 124.0.2478.105 +- Microsoft Edge 125.0.2535.67 +- Microsoft Edge WebDriver 125.0.2535.67 - Selenium server 4.21.0 - Mozilla Firefox 126.0 - Geckodriver 0.34.0 @@ -221,7 +221,7 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Node.js - 16.20.2 -- 18.20.2 +- 18.20.3 - 20.13.1 #### Python @@ -245,7 +245,7 @@ Use the following command as a part of your job to start the service: 'sudo syst - 3.1.5 ### PowerShell Tools -- PowerShell 7.4.1 +- PowerShell 7.4.2 #### PowerShell Modules - Az: 11.3.1 @@ -295,10 +295,10 @@ Use the following command as a part of your job to start the service: 'sudo syst | moby/buildkit:latest | sha256:9194b5ec1be368f41c516df7f93f7f540630ea06136056b2ffebb62226ed4ad6 | 2024-04-25 | | node:16 | sha256:f77a1aef2da8d83e45ec990f45df50f1a286c5fe8bbfb8c6e4246c6389705c0b | 2023-09-07 | | node:16-alpine | sha256:a1f9d027912b58a7c75be7716c97cfbc6d3099f3a97ed84aa490be9dee20e787 | 2023-08-10 | -| node:18 | sha256:5bac3a1edff13e76586b8eaef1d411fcd80e4f18cce5bc40ea6993245e0721ec | 2024-05-14 | -| node:18-alpine | sha256:4837c2ac8998cf172f5892fb45f229c328e4824c43c8506f8ba9c7996d702430 | 2024-04-23 | +| node:18 | sha256:b08b1356559e2e9945f47ded630c9eb9d4e3ca04f111ab20d55652442cf14aee | 2024-05-21 | +| node:18-alpine | sha256:5069da655539e2e986ce3fd1757f24a41b846958566c89ff4a48874434d73749 | 2024-05-22 | | node:20 | sha256:d6925dc84f8c0d1c1f8df4ea6a9a54e57d430241cb734b1b0c45ed6d26e8e9c0 | 2024-05-14 | -| node:20-alpine | sha256:291e84d956f1aff38454bbd3da38941461ad569a185c20aa289f71f37ea08e23 | 2024-05-09 | +| node:20-alpine | sha256:a7b980c958bfe4d84ee9263badd95a40c8bb50ad5afdb87902c187fefaef0e24 | 2024-05-22 | | ubuntu:20.04 | sha256:874aca52f79ae5f8258faff03e10ce99ae836f6e7d2df6ecd3da5c1cad3a912b | 2024-04-27 | ### Installed apt packages From 8476a082733e52eac2ad2fbad288c72ce8d14ad1 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 28 May 2024 12:07:57 +0000 Subject: [PATCH 2867/3485] Updating readme file for win19 version 20240526.1.1 (#9942) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/windows/Windows2019-Readme.md | 73 ++++++++++++++-------------- 1 file changed, 36 insertions(+), 37 deletions(-) diff --git a/images/windows/Windows2019-Readme.md b/images/windows/Windows2019-Readme.md index 941d8e8f2916..7ab993f68026 100644 --- a/images/windows/Windows2019-Readme.md +++ b/images/windows/Windows2019-Readme.md @@ -1,11 +1,10 @@ | Announcements | |-| -| [[Windows-2022] Multiple VC Build Tools will be removed on May, 13](https://github.com/actions/runner-images/issues/9701) | | [[Ubuntu, Windows] Docker Compose v1 will be removed from images on July, 9](https://github.com/actions/runner-images/issues/9692) | *** # Windows Server 2019 -- OS Version: 10.0.17763 Build 5820 -- Image Version: 20240514.1.0 +- OS Version: 10.0.17763 Build 5830 +- Image Version: 20240526.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -16,9 +15,9 @@ - Bash 5.2.26(1)-release - Go 1.21.10 - Julia 1.10.3 -- Kotlin 1.9.24 +- Kotlin 2.0.0 - LLVM 16.0.6 -- Node 18.20.2 +- Node 18.20.3 - Perl 5.32.1 - PHP 8.3.7 - Python 3.7.9 @@ -27,14 +26,14 @@ ### Package Management - Chocolatey 2.2.2 - Composer 2.7.6 -- Helm 3.14.4 -- Miniconda 24.3.0 (pre-installed on the image but not added to PATH) -- NPM 10.5.0 -- NuGet 6.9.1.3 +- Helm 3.15.0 +- Miniconda 24.4.0 (pre-installed on the image but not added to PATH) +- NPM 10.7.0 +- NuGet 6.10.0.107 - pip 24.0 (python 3.7) - Pipx 1.2.1 - RubyGems 3.2.33 -- Vcpkg (build from commit bd2b54836) +- Vcpkg (build from commit 01f602195) - Yarn 1.22.22 #### Environment variables @@ -50,7 +49,7 @@ - sbt 1.10.0 ### Tools -- 7zip 23.01 +- 7zip 24.05 - aria2 1.37.0 - azcopy 10.24.0 - Bazel 7.1.2 @@ -58,20 +57,20 @@ - Bicep 0.27.1 - Cabal 3.10.3.0 - CMake 3.29.3 -- CodeQL Action Bundle 2.17.2 +- CodeQL Action Bundle 2.17.3 - Docker 24.0.7 - Docker Compose v1 1.29.2 - Docker Compose v2 2.23.3 -- Docker-wincred 0.8.1 +- Docker-wincred 0.8.2 - ghc 9.10.1 - Git 2.45.1.windows.1 - Git LFS 3.5.1 -- Google Cloud CLI 476.0.0 +- Google Cloud CLI 477.0.0 - ImageMagick 7.1.1-29 - InnoSetup 6.2.2 - jq 1.7.1 - Kind 0.23.0 -- Kubectl 1.30.0 +- Kubectl 1.30.1 - Mercurial 5.0 - gcc 8.1.0 - gdb 8.1 @@ -79,9 +78,9 @@ - Newman 6.1.2 - NSIS 3.10 - OpenSSL 1.1.1w -- Packer 1.10.2 +- Packer 1.10.3 - Parcel 2.12.0 -- Pulumi 3.116.0 +- Pulumi 3.117.0 - R 4.4.0 - Service Fabric SDK 9.1.1436.9590 - Stack 2.15.7 @@ -94,12 +93,12 @@ - zstd 1.5.6 ### CLI Tools -- Alibaba Cloud CLI 3.0.205 -- AWS CLI 2.15.48 -- AWS SAM CLI 1.116.0 +- Alibaba Cloud CLI 3.0.207 +- AWS CLI 2.15.58 +- AWS SAM CLI 1.117.0 - AWS Session Manager CLI 1.2.553.0 -- Azure CLI 2.60.0 -- Azure DevOps CLI extension 1.0.0 +- Azure CLI 2.61.0 +- Azure DevOps CLI extension 1.0.1 - Cloud Foundry CLI 6.53.0 - GitHub CLI 2.49.2 @@ -118,14 +117,14 @@ - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 124.0.6367.208 -- Chrome Driver 124.0.6367.207 -- Microsoft Edge 124.0.2478.97 -- Microsoft Edge Driver 124.0.2478.97 +- Google Chrome 125.0.6422.113 +- Chrome Driver 125.0.6422.78 +- Microsoft Edge 125.0.2535.67 +- Microsoft Edge Driver 125.0.2535.67 - Mozilla Firefox 126.0 - Gecko Driver 0.34.0 - IE Driver 4.14.0.0 -- Selenium server 4.20.0 +- Selenium server 4.21.0 #### Environment variables | Name | Value | @@ -172,7 +171,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Node.js - 16.20.2 -- 18.20.2 +- 18.20.3 - 20.13.1 #### Python @@ -215,7 +214,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | 5.0.26.0 | MongoDB | Stopped | Disabled | ### Database tools -- Azure CosmosDb Emulator 2.14.16.0 +- Azure CosmosDb Emulator 2.14.18.0 - DacFx 162.2.111.2 - MySQL 5.7.44.0 - SQL OLEDB Driver 18.6.7.0 @@ -476,10 +475,10 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft Visual C++ 2013 Minimum Runtime | x86 | 12.0.21005 | | Microsoft Visual C++ 2019 Debug Runtime | x64 | 14.29.30153 | | Microsoft Visual C++ 2019 Debug Runtime | x86 | 14.29.30153 | -| Microsoft Visual C++ 2022 Additional Runtime | x64 | 14.38.33135 | -| Microsoft Visual C++ 2022 Minimum Runtime | x64 | 14.38.33135 | -| Microsoft Visual C++ 2022 Additional Runtime | x86 | 14.38.33135 | -| Microsoft Visual C++ 2022 Minimum Runtime | x86 | 14.38.33135 | +| Microsoft Visual C++ 2022 Additional Runtime | x64 | 14.40.33810 | +| Microsoft Visual C++ 2022 Minimum Runtime | x64 | 14.40.33810 | +| Microsoft Visual C++ 2022 Additional Runtime | x86 | 14.40.33810 | +| Microsoft Visual C++ 2022 Minimum Runtime | x86 | 14.40.33810 | #### Installed Windows SDKs - 10.0.14393.0 @@ -509,7 +508,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - AzureRM: 2.1.0 (Default), 6.13.1 - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.579 +- AWSPowershell: 4.1.587 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 - Microsoft.Graph: 2.19.0 @@ -552,9 +551,9 @@ All other versions are saved but not installed. ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:21e238b7a784c14fb02717859a9ac0cb39109c15e1a340400d3e3c2cccbc081d | 2024-04-09 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:504e7de522e227c46da6408894c19a4454b9979ab06b8577dae1fa5885795450 | 2024-04-09 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:46e393cbb7c915c504a810639e35f40cb516f8e886e4cbcf8a3b49f86705a070 | 2024-04-09 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:b7be163b2b65da14d4552cc03037134a89d9d739200e0ffeb84bd03e378e0d7a | 2024-05-14 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:a49ce9e1f3138559b80d570e1607df34306bb4c5e36b99e4e20a36c34d3a8c2e | 2024-05-14 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:0d1c957268d62a7c23e93d5502a858785dd15f36fbc09a534ca3135dd530e2fd | 2024-05-21 | | mcr.microsoft.com/windows/nanoserver:1809 | sha256:6f62243adf70b086613cb4b4596c276fe73bab1e5152037eb5b156c915886be8 | 2024-05-10 | | mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:3c97a5c1c32ddb346c190f00a588da6e682a9a8160869f4969edfd7c6e4d1c03 | 2024-05-10 | From 903d12713872ede6d9d2c1aba2babc8e8d5dffd6 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Tue, 28 May 2024 17:43:09 +0200 Subject: [PATCH 2868/3485] [Ubuntu] fix dotnet installation & scripts sorcing on 24.04 (#9950) --- images/ubuntu/scripts/build/configure-apt.sh | 2 ++ images/ubuntu/templates/ubuntu-24.04.pkr.hcl | 12 ++++++------ images/ubuntu/toolsets/toolset-2404.json | 4 ---- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/images/ubuntu/scripts/build/configure-apt.sh b/images/ubuntu/scripts/build/configure-apt.sh index 70660a313325..b36e4762b7b9 100644 --- a/images/ubuntu/scripts/build/configure-apt.sh +++ b/images/ubuntu/scripts/build/configure-apt.sh @@ -4,6 +4,8 @@ ## Desc: Configure apt, install jq and apt-fast packages. ################################################################################ +source $HELPER_SCRIPTS/os.sh + # Stop and disable apt-daily upgrade services; systemctl stop apt-daily.timer systemctl disable apt-daily.timer diff --git a/images/ubuntu/templates/ubuntu-24.04.pkr.hcl b/images/ubuntu/templates/ubuntu-24.04.pkr.hcl index e4964a908bdc..650202b3b627 100644 --- a/images/ubuntu/templates/ubuntu-24.04.pkr.hcl +++ b/images/ubuntu/templates/ubuntu-24.04.pkr.hcl @@ -183,13 +183,18 @@ build { inline = ["mkdir ${var.image_folder}", "chmod 777 ${var.image_folder}"] } + provisioner "file" { + destination = "${var.helper_script_folder}" + source = "${path.root}/../scripts/helpers" + } + provisioner "shell" { execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" script = "${path.root}/../scripts/build/configure-apt-mock.sh" } provisioner "shell" { - environment_vars = ["DEBIAN_FRONTEND=noninteractive"] + environment_vars = ["HELPER_SCRIPTS=${var.helper_script_folder}","DEBIAN_FRONTEND=noninteractive"] execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" scripts = [ "${path.root}/../scripts/build/install-ms-repos.sh", @@ -203,11 +208,6 @@ build { script = "${path.root}/../scripts/build/configure-limits.sh" } - provisioner "file" { - destination = "${var.helper_script_folder}" - source = "${path.root}/../scripts/helpers" - } - provisioner "file" { destination = "${var.installer_script_folder}" source = "${path.root}/../scripts/build" diff --git a/images/ubuntu/toolsets/toolset-2404.json b/images/ubuntu/toolsets/toolset-2404.json index beb06507d619..187860bf91b8 100644 --- a/images/ubuntu/toolsets/toolset-2404.json +++ b/images/ubuntu/toolsets/toolset-2404.json @@ -219,13 +219,9 @@ ], "dotnet": { "aptPackages": [ - "dotnet-sdk-6.0", - "dotnet-sdk-7.0", "dotnet-sdk-8.0" ], "versions": [ - "6.0", - "7.0", "8.0" ], "tools": [ From 24c7b7b9d8e13ff742d97fc4ff810360ab268b97 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Tue, 28 May 2024 19:43:30 +0200 Subject: [PATCH 2869/3485] [Ubuntu] move source scripts earlier (#9951) --- images/ubuntu/templates/ubuntu-20.04.pkr.hcl | 12 ++++++------ images/ubuntu/templates/ubuntu-22.04.pkr.hcl | 12 ++++++------ images/ubuntu/templates/ubuntu-minimal.pkr.hcl | 12 ++++++------ 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/images/ubuntu/templates/ubuntu-20.04.pkr.hcl b/images/ubuntu/templates/ubuntu-20.04.pkr.hcl index fd3a295b7920..101c5a3bf913 100644 --- a/images/ubuntu/templates/ubuntu-20.04.pkr.hcl +++ b/images/ubuntu/templates/ubuntu-20.04.pkr.hcl @@ -183,13 +183,18 @@ build { inline = ["mkdir ${var.image_folder}", "chmod 777 ${var.image_folder}"] } + provisioner "file" { + destination = "${var.helper_script_folder}" + source = "${path.root}/../scripts/helpers" + } + provisioner "shell" { execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" script = "${path.root}/../scripts/build/configure-apt-mock.sh" } provisioner "shell" { - environment_vars = ["DEBIAN_FRONTEND=noninteractive"] + environment_vars = ["HELPER_SCRIPTS=${var.helper_script_folder}","DEBIAN_FRONTEND=noninteractive"] execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" scripts = [ "${path.root}/../scripts/build/install-ms-repos.sh", @@ -203,11 +208,6 @@ build { script = "${path.root}/../scripts/build/configure-limits.sh" } - provisioner "file" { - destination = "${var.helper_script_folder}" - source = "${path.root}/../scripts/helpers" - } - provisioner "file" { destination = "${var.installer_script_folder}" source = "${path.root}/../scripts/build" diff --git a/images/ubuntu/templates/ubuntu-22.04.pkr.hcl b/images/ubuntu/templates/ubuntu-22.04.pkr.hcl index 473e597cd3a0..9b881a686653 100644 --- a/images/ubuntu/templates/ubuntu-22.04.pkr.hcl +++ b/images/ubuntu/templates/ubuntu-22.04.pkr.hcl @@ -183,13 +183,18 @@ build { inline = ["mkdir ${var.image_folder}", "chmod 777 ${var.image_folder}"] } + provisioner "file" { + destination = "${var.helper_script_folder}" + source = "${path.root}/../scripts/helpers" + } + provisioner "shell" { execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" script = "${path.root}/../scripts/build/configure-apt-mock.sh" } provisioner "shell" { - environment_vars = ["DEBIAN_FRONTEND=noninteractive"] + environment_vars = ["HELPER_SCRIPTS=${var.helper_script_folder}","DEBIAN_FRONTEND=noninteractive"] execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" scripts = [ "${path.root}/../scripts/build/install-ms-repos.sh", @@ -203,11 +208,6 @@ build { script = "${path.root}/../scripts/build/configure-limits.sh" } - provisioner "file" { - destination = "${var.helper_script_folder}" - source = "${path.root}/../scripts/helpers" - } - provisioner "file" { destination = "${var.installer_script_folder}" source = "${path.root}/../scripts/build" diff --git a/images/ubuntu/templates/ubuntu-minimal.pkr.hcl b/images/ubuntu/templates/ubuntu-minimal.pkr.hcl index f2cef0e0d64a..9a3c34299d41 100644 --- a/images/ubuntu/templates/ubuntu-minimal.pkr.hcl +++ b/images/ubuntu/templates/ubuntu-minimal.pkr.hcl @@ -170,6 +170,11 @@ build { inline = ["mkdir ${local.image_folder}", "chmod 777 ${local.image_folder}"] } + provisioner "file" { + destination = "${local.helper_script_folder}" + source = "${path.root}/../scripts/helpers" + } + // Add apt wrapper to implement retries provisioner "shell" { execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" @@ -178,7 +183,7 @@ build { // Install MS package repos, Configure apt provisioner "shell" { - environment_vars = ["DEBIAN_FRONTEND=noninteractive"] + environment_vars = ["HELPER_SCRIPTS=${var.helper_script_folder}","DEBIAN_FRONTEND=noninteractive"] execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" scripts = [ "${path.root}/../scripts/build/install-ms-repos.sh", @@ -192,11 +197,6 @@ build { script = "${path.root}/../scripts/build/configure-limits.sh" } - provisioner "file" { - destination = "${local.helper_script_folder}" - source = "${path.root}/../scripts/helpers" - } - provisioner "file" { destination = "${local.installer_script_folder}" source = "${path.root}/../scripts/build" From c99c444ee99aeea731d54e92fd4516359fb57ddf Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 28 May 2024 20:58:20 +0000 Subject: [PATCH 2870/3485] Updating readme file for ubuntu22 version 20240526.1.1 (#9941) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2204-Readme.md | 62 +++++++++++++++--------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/images/ubuntu/Ubuntu2204-Readme.md b/images/ubuntu/Ubuntu2204-Readme.md index 205f0b8a66fa..bdabeeeaf8bb 100644 --- a/images/ubuntu/Ubuntu2204-Readme.md +++ b/images/ubuntu/Ubuntu2204-Readme.md @@ -6,7 +6,7 @@ # Ubuntu 22.04 - OS Version: 22.04.4 LTS - Kernel Version: 6.5.0-1021-azure -- Image Version: 20240516.1.0 +- Image Version: 20240526.1.0 - Systemd version: 249.11-0ubuntu3.12 ## Installed Software @@ -20,10 +20,10 @@ - GNU C++: 10.5.0, 11.4.0, 12.3.0 - GNU Fortran: 10.5.0, 11.4.0, 12.3.0 - Julia 1.10.3 -- Kotlin 1.9.24-release-822 +- Kotlin 2.0.0-release-341 - Mono 6.12.0.200 - MSBuild 16.10.1.31701 (Mono 6.12.0.200) -- Node.js 18.20.2 +- Node.js 18.20.3 - Perl 5.34.0 - Python 3.10.12 - Ruby 3.0.2p107 @@ -31,16 +31,16 @@ ### Package Management - cpan 1.64 -- Helm 3.14.4 -- Homebrew 4.3.0 -- Miniconda 24.3.0 -- Npm 10.5.0 +- Helm 3.15.1 +- Homebrew 4.3.1 +- Miniconda 24.4.0 +- Npm 10.7.0 - NuGet 6.6.1.2 - Pip 22.0.2 - Pip3 22.0.2 - Pipx 1.5.0 - RubyGems 3.3.5 -- Vcpkg (build from commit 66a252f70) +- Vcpkg (build from commit 01f602195) - Yarn 1.22.22 #### Environment variables @@ -65,7 +65,7 @@ to accomplish this. - Sbt 1.10.0 ### Tools -- Ansible 2.16.6 +- Ansible 2.16.7 - apt-fast 1.10.0 - AzCopy 10.24.0 - available by `azcopy` and `azcopy10` aliases - Bazel 7.1.2 @@ -73,11 +73,11 @@ to accomplish this. - Bicep 0.27.1 - Buildah 1.23.1 - CMake 3.29.3 -- CodeQL Action Bundle 2.17.2 +- CodeQL Action Bundle 2.17.3 - Docker Amazon ECR Credential Helper 0.8.0 - Docker Compose v1 1.29.2 - Docker Compose v2 2.23.3 -- Docker-Buildx 0.14.0 +- Docker-Buildx 0.14.1 - Docker Client 24.0.9 - Docker Server 24.0.9 - Fastlane 2.220.0 @@ -89,7 +89,7 @@ to accomplish this. - jq 1.6 - Kind 0.23.0 - Kubectl 1.30.1 -- Kustomize 5.4.1 +- Kustomize 5.4.2 - Leiningen 2.11.2 - MediaInfo 21.09 - Mercurial 6.1.1 @@ -101,29 +101,29 @@ to accomplish this. - Packer 1.10.3 - Parcel 2.12.0 - Podman 3.4.4 -- Pulumi 3.116.1 +- Pulumi 3.117.0 - R 4.4.0 - Skopeo 1.4.1 - Sphinx Open Source Search Server 2.2.11 - SVN 1.14.1 -- Terraform 1.8.3 +- Terraform 1.8.4 - yamllint 1.35.1 - yq 4.44.1 - zstd 1.5.6 ### CLI Tools -- Alibaba Cloud CLI 3.0.205 -- AWS CLI 2.15.51 +- Alibaba Cloud CLI 3.0.207 +- AWS CLI 2.15.58 - AWS CLI Session Manager Plugin 1.2.553.0 -- AWS SAM CLI 1.116.0 -- Azure CLI 2.60.0 +- AWS SAM CLI 1.117.0 +- Azure CLI 2.61.0 - Azure CLI (azure-devops) 1.0.1 - GitHub CLI 2.49.2 -- Google Cloud CLI 476.0.0 -- Netlify CLI 17.23.5 -- OpenShift CLI 4.15.13 +- Google Cloud CLI 477.0.0 +- Netlify CLI 17.23.8 +- OpenShift CLI 4.15.14 - ORAS CLI 1.1.0 -- Vercel CLI 34.2.0 +- Vercel CLI 34.2.3 ### Java | Version | Environment Variable | @@ -162,11 +162,11 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 125.0.6422.60 -- ChromeDriver 125.0.6422.60 +- Google Chrome 125.0.6422.112 +- ChromeDriver 125.0.6422.78 - Chromium 125.0.6422.0 -- Microsoft Edge 124.0.2478.105 -- Microsoft Edge WebDriver 124.0.2478.105 +- Microsoft Edge 125.0.2535.67 +- Microsoft Edge WebDriver 125.0.2535.67 - Selenium server 4.21.0 - Mozilla Firefox 126.0 - Geckodriver 0.34.0 @@ -216,7 +216,7 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Node.js - 16.20.2 -- 18.20.2 +- 18.20.3 - 20.13.1 #### Python @@ -237,7 +237,7 @@ Use the following command as a part of your job to start the service: 'sudo syst - 3.1.5 ### PowerShell Tools -- PowerShell 7.4.1 +- PowerShell 7.4.2 #### PowerShell Modules - Az: 11.3.1 @@ -285,10 +285,10 @@ Use the following command as a part of your job to start the service: 'sudo syst | moby/buildkit:latest | sha256:9194b5ec1be368f41c516df7f93f7f540630ea06136056b2ffebb62226ed4ad6 | 2024-04-25 | | node:16 | sha256:f77a1aef2da8d83e45ec990f45df50f1a286c5fe8bbfb8c6e4246c6389705c0b | 2023-09-07 | | node:16-alpine | sha256:a1f9d027912b58a7c75be7716c97cfbc6d3099f3a97ed84aa490be9dee20e787 | 2023-08-10 | -| node:18 | sha256:5bac3a1edff13e76586b8eaef1d411fcd80e4f18cce5bc40ea6993245e0721ec | 2024-05-14 | -| node:18-alpine | sha256:4837c2ac8998cf172f5892fb45f229c328e4824c43c8506f8ba9c7996d702430 | 2024-04-23 | +| node:18 | sha256:b08b1356559e2e9945f47ded630c9eb9d4e3ca04f111ab20d55652442cf14aee | 2024-05-21 | +| node:18-alpine | sha256:5069da655539e2e986ce3fd1757f24a41b846958566c89ff4a48874434d73749 | 2024-05-22 | | node:20 | sha256:d6925dc84f8c0d1c1f8df4ea6a9a54e57d430241cb734b1b0c45ed6d26e8e9c0 | 2024-05-14 | -| node:20-alpine | sha256:291e84d956f1aff38454bbd3da38941461ad569a185c20aa289f71f37ea08e23 | 2024-05-09 | +| node:20-alpine | sha256:a7b980c958bfe4d84ee9263badd95a40c8bb50ad5afdb87902c187fefaef0e24 | 2024-05-22 | | ubuntu:20.04 | sha256:874aca52f79ae5f8258faff03e10ce99ae836f6e7d2df6ecd3da5c1cad3a912b | 2024-04-27 | | ubuntu:22.04 | sha256:a6d2b38300ce017add71440577d5b0a90460d0e57fd7aec21dd0d1b0761bbfb2 | 2024-04-27 | From 4b948549021369c05e29ff616a8b7d7a5d45ff3c Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Tue, 28 May 2024 23:02:51 +0200 Subject: [PATCH 2871/3485] [Ubuntu] exclude apt-fast from sw report on 24 (#9952) --- images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 b/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 index 5e4a3997d68d..3d335752d3f2 100644 --- a/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 +++ b/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 @@ -100,7 +100,9 @@ if ((Test-IsUbuntu20) -or (Test-IsUbuntu22)) { # Tools $tools = $installedSoftware.AddHeader("Tools") $tools.AddToolVersion("Ansible", $(Get-AnsibleVersion)) -$tools.AddToolVersion("apt-fast", $(Get-AptFastVersion)) +if ((Test-IsUbuntu20) -or (Test-IsUbuntu22)) { + $tools.AddToolVersion("apt-fast", $(Get-AptFastVersion)) +} $tools.AddToolVersion("AzCopy", $(Get-AzCopyVersion)) $tools.AddToolVersion("Bazel", $(Get-BazelVersion)) $tools.AddToolVersion("Bazelisk", $(Get-BazeliskVersion)) From 0f916a843b6f5a66e8d5f76c35a3709a740a7782 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 29 May 2024 11:03:44 +0000 Subject: [PATCH 2872/3485] Updating readme file for macos-14 version 20240526.1 (#9944) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-14-Readme.md | 62 ++++++++++++++++----------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/images/macos/macos-14-Readme.md b/images/macos/macos-14-Readme.md index 0ba32a11ff10..b061f55f8fb1 100644 --- a/images/macos/macos-14-Readme.md +++ b/images/macos/macos-14-Readme.md @@ -1,7 +1,7 @@ # macOS 14 -- OS Version: macOS 14.4.1 (23E224) -- Kernel Version: Darwin 23.4.0 -- Image Version: 20240514.3 +- OS Version: macOS 14.5 (23F79) +- Kernel Version: Darwin 23.5.0 +- Image Version: 20240526.1 ## Installed Software @@ -12,11 +12,11 @@ - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` - GCC 11 (Homebrew GCC 11.4.0) - available by `gcc-11` alias - GCC 12 (Homebrew GCC 12.3.0) - available by `gcc-12` alias -- GCC 13 (Homebrew GCC 13.2.0) - available by `gcc-13` alias +- GCC 13 (Homebrew GCC 13.3.0) - available by `gcc-13` alias - GNU Fortran 11 (Homebrew GCC 11.4.0) - available by `gfortran-11` alias - GNU Fortran 12 (Homebrew GCC 12.3.0) - available by `gfortran-12` alias -- GNU Fortran 13 (Homebrew GCC 13.2.0) - available by `gfortran-13` alias -- Kotlin 1.9.24-release-822 +- GNU Fortran 13 (Homebrew GCC 13.3.0) - available by `gfortran-13` alias +- Kotlin 2.0.0-release-341 - Mono 6.12.0.188 - Node.js 20.13.1 - Perl 5.38.2 @@ -29,17 +29,17 @@ - Carthage 0.39.1 - CocoaPods 1.15.2 - Composer 2.7.6 -- Homebrew 4.3.0 +- Homebrew 4.3.1 - NPM 10.5.2 - NuGet 6.3.1.1 - Pip3 24.0 (python 3.12) - Pipx 1.5.0 - RubyGems 3.5.10 -- Yarn 1.22.19 +- Yarn 1.22.22 ### Project Management - Apache Ant 1.10.14 -- Apache Maven 3.9.6 +- Apache Maven 3.9.7 - Gradle 8.7 ### Utilities @@ -49,7 +49,7 @@ - bazel 7.1.2 - bazelisk 1.20.0 - bsdtar 3.5.3 - available by 'tar' alias -- Curl 8.7.1 +- Curl 8.8.0 - Git 2.45.1 - Git LFS 3.5.1 - GitHub CLI 2.49.2 @@ -64,34 +64,34 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.15.50 -- AWS SAM CLI 1.116.0 +- AWS CLI 2.15.58 +- AWS SAM CLI 1.117.0 - AWS Session Manager CLI 1.2.553.0 -- Azure CLI 2.60.0 -- Azure CLI (azure-devops) 1.0.0 +- Azure CLI 2.61.0 +- Azure CLI (azure-devops) 1.0.1 - Bicep CLI 0.27.1 - Cmake 3.29.3 -- CodeQL Action Bundle 2.17.2 +- CodeQL Action Bundle 2.17.3 - Fastlane 2.220.0 -- SwiftFormat 0.53.9 +- SwiftFormat 0.53.10 - Xcbeautify 2.3.1 - Xcode Command Line Tools 15.3.0.0.1.1708646388 - Xcodes 1.4.1 ### Linters -- SwiftLint 0.53.0 +- SwiftLint 0.55.1 ### Browsers -- Safari 17.4.1 (19618.1.15.11.14) -- SafariDriver 17.4.1 (19618.1.15.11.14) -- Google Chrome 124.0.6367.208 -- Google Chrome for Testing 124.0.6367.207 -- ChromeDriver 124.0.6367.207 -- Microsoft Edge 124.0.2478.105 -- Microsoft Edge WebDriver 124.0.2478.97 +- Safari 17.5 (19618.2.12.11.6) +- SafariDriver 17.5 (19618.2.12.11.6) +- Google Chrome 125.0.6422.113 +- Google Chrome for Testing 125.0.6422.78 +- ChromeDriver 125.0.6422.78 +- Microsoft Edge 125.0.2535.67 +- Microsoft Edge WebDriver 125.0.2535.67 - Mozilla Firefox 126.0 - geckodriver 0.34.0 -- Selenium server 4.20.0 +- Selenium server 4.21.0 #### Environment variables | Name | Value | @@ -121,7 +121,7 @@ - 3.12.3 #### Node.js -- 18.20.2 +- 18.20.3 - 20.13.1 #### Go @@ -143,14 +143,14 @@ - PowerShell 7.4.2 #### PowerShell Modules -- Az: 11.6.0 +- Az: 12.0.0 - Pester: 5.5.0 - PSScriptAnalyzer: 1.22.0 ### Xcode | Version | Build | Path | | ---------------- | ------- | ------------------------------ | -| 15.4 | 15F31c | /Applications/Xcode_15.4.app | +| 15.4 | 15F31d | /Applications/Xcode_15.4.app | | 15.3 | 15E204a | /Applications/Xcode_15.3.app | | 15.2 | 15C500b | /Applications/Xcode_15.2.app | | 15.1 | 15C65 | /Applications/Xcode_15.1.app | @@ -199,11 +199,11 @@ | Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | | Simulator - visionOS 1.1 | xrsimulator1.1 | 15.3 | | visionOS 1.1 | xros1.1 | 15.3 | -| Simulator - visionOS 1.2 | xrsimulator1.2 | 15.4 | | visionOS 1.2 | xros1.2 | 15.4 | +| Simulator - visionOS 1.2 | xrsimulator1.2 | 15.4 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | -| Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | +| Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | DriverKit 22.4 | driverkit22.4 | 14.3.1 | | DriverKit 23.0 | driverkit23.0 | 15.0.1 | | DriverKit 23.2 | driverkit23.2 | 15.1, 15.2 | @@ -233,7 +233,7 @@ | Package Name | Version | | -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 11.0 | -| Android Emulator | 34.2.13 | +| Android Emulator | 34.2.14 | | Android SDK Build-tools | 34.0.0<br>33.0.2 33.0.3 | | Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | | Android SDK Platform-Tools | 35.0.1 | From 448c99819118beb2db3906137da749dd8d23fe76 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 29 May 2024 11:29:00 +0000 Subject: [PATCH 2873/3485] Updating readme file for macos-13 version 20240526.1 (#9943) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-13-Readme.md | 58 ++++++++++++++++----------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/images/macos/macos-13-Readme.md b/images/macos/macos-13-Readme.md index 42ed4562ad57..b9a7ad4acb22 100644 --- a/images/macos/macos-13-Readme.md +++ b/images/macos/macos-13-Readme.md @@ -1,7 +1,7 @@ # macOS 13 -- OS Version: macOS 13.6.6 (22G630) +- OS Version: macOS 13.6.7 (22G720) - Kernel Version: Darwin 22.6.0 -- Image Version: 20240514.3 +- Image Version: 20240526.1 ## Installed Software @@ -12,11 +12,11 @@ - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` - GCC 11 (Homebrew GCC 11.4.0) - available by `gcc-11` alias - GCC 12 (Homebrew GCC 12.3.0) - available by `gcc-12` alias -- GCC 13 (Homebrew GCC 13.2.0) - available by `gcc-13` alias +- GCC 13 (Homebrew GCC 13.3.0) - available by `gcc-13` alias - GNU Fortran 11 (Homebrew GCC 11.4.0) - available by `gfortran-11` alias - GNU Fortran 12 (Homebrew GCC 12.3.0) - available by `gfortran-12` alias -- GNU Fortran 13 (Homebrew GCC 13.2.0) - available by `gfortran-13` alias -- Kotlin 1.9.24-release-822 +- GNU Fortran 13 (Homebrew GCC 13.3.0) - available by `gfortran-13` alias +- Kotlin 2.0.0-release-341 - Mono 6.12.0.188 - Node.js 20.13.1 - Perl 5.38.2 @@ -29,18 +29,18 @@ - Carthage 0.39.1 - CocoaPods 1.15.2 - Composer 2.7.6 -- Homebrew 4.3.0 +- Homebrew 4.3.1 - NPM 10.5.2 - NuGet 6.3.1.1 - Pip3 24.0 (python 3.12) - Pipx 1.5.0 - RubyGems 3.5.10 -- Vcpkg 2024 (build from commit bd2b54836) -- Yarn 1.22.19 +- Vcpkg 2024 (build from commit 01f602195) +- Yarn 1.22.22 ### Project Management - Apache Ant 1.10.14 -- Apache Maven 3.9.6 +- Apache Maven 3.9.7 - Gradle 8.7 ### Utilities @@ -50,7 +50,7 @@ - bazel 7.1.2 - bazelisk 1.20.0 - bsdtar 3.5.3 - available by 'tar' alias -- Curl 8.7.1 +- Curl 8.8.0 - Git 2.45.1 - Git LFS 3.5.1 - GitHub CLI 2.49.2 @@ -65,34 +65,34 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.15.50 -- AWS SAM CLI 1.116.0 +- AWS CLI 2.15.58 +- AWS SAM CLI 1.117.0 - AWS Session Manager CLI 1.2.553.0 -- Azure CLI 2.60.0 -- Azure CLI (azure-devops) 1.0.0 +- Azure CLI 2.61.0 +- Azure CLI (azure-devops) 1.0.1 - Bicep CLI 0.27.1 - Cmake 3.29.3 -- CodeQL Action Bundle 2.17.2 +- CodeQL Action Bundle 2.17.3 - Fastlane 2.220.0 -- SwiftFormat 0.53.9 +- SwiftFormat 0.53.10 - Xcbeautify 2.3.1 - Xcode Command Line Tools 14.3.1.0.1.1683849156 - Xcodes 1.4.1 ### Linters -- SwiftLint 0.53.0 +- SwiftLint 0.55.1 ### Browsers -- Safari 17.4.1 (18618.1.15.111.8) -- SafariDriver 17.4.1 (18618.1.15.111.8) -- Google Chrome 124.0.6367.208 -- Google Chrome for Testing 124.0.6367.207 -- ChromeDriver 124.0.6367.207 -- Microsoft Edge 124.0.2478.105 -- Microsoft Edge WebDriver 124.0.2478.105 +- Safari 17.5 (18618.2.12.111.5) +- SafariDriver 17.5 (18618.2.12.111.5) +- Google Chrome 125.0.6422.113 +- Google Chrome for Testing 125.0.6422.78 +- ChromeDriver 125.0.6422.78 +- Microsoft Edge 125.0.2535.67 +- Microsoft Edge WebDriver 125.0.2535.67 - Mozilla Firefox 126.0 - geckodriver 0.34.0 -- Selenium server 4.20.0 +- Selenium server 4.21.0 #### Environment variables | Name | Value | @@ -131,7 +131,7 @@ #### Node.js - 16.20.2 -- 18.20.2 +- 18.20.3 - 20.13.1 #### Go @@ -153,7 +153,7 @@ - PowerShell 7.4.2 #### PowerShell Modules -- Az: 11.6.0 +- Az: 12.0.0 - Pester: 5.5.0 - PSScriptAnalyzer: 1.22.0 @@ -201,8 +201,8 @@ | Simulator - watchOS 9.4 | watchsimulator9.4 | 14.3.1 | | Simulator - watchOS 10.0 | watchsimulator10.0 | 15.0.1 | | Simulator - watchOS 10.2 | watchsimulator10.2 | 15.1, 15.2 | -| Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | | visionOS 1.0 | xros1.0 | 15.2 | +| Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | @@ -233,7 +233,7 @@ | Package Name | Version | | -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 11.0 | -| Android Emulator | 34.2.13 | +| Android Emulator | 34.2.14 | | Android SDK Build-tools | 34.0.0<br>33.0.2 33.0.3 | | Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | | Android SDK Platform-Tools | 35.0.1 | From 899fcf9b160060d94b8825f971057159686ee50d Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Wed, 29 May 2024 13:43:07 +0200 Subject: [PATCH 2874/3485] [Ubuntu] unify apt install calls (#9953) --- images/ubuntu/scripts/build/install-apache.sh | 2 +- images/ubuntu/scripts/build/install-apt-common.sh | 2 +- images/ubuntu/scripts/build/install-apt-vital.sh | 2 +- images/ubuntu/scripts/build/install-aws-tools.sh | 2 +- images/ubuntu/scripts/build/install-clang.sh | 2 +- .../ubuntu/scripts/build/install-container-tools.sh | 2 +- images/ubuntu/scripts/build/install-docker.sh | 4 ++-- .../ubuntu/scripts/build/install-dotnetcore-sdk.sh | 2 +- images/ubuntu/scripts/build/install-firefox.sh | 2 +- images/ubuntu/scripts/build/install-gcc-compilers.sh | 2 +- images/ubuntu/scripts/build/install-gfortran.sh | 2 +- images/ubuntu/scripts/build/install-git-lfs.sh | 2 +- images/ubuntu/scripts/build/install-git.sh | 5 ++--- images/ubuntu/scripts/build/install-github-cli.sh | 2 +- images/ubuntu/scripts/build/install-google-chrome.sh | 2 +- .../ubuntu/scripts/build/install-google-cloud-cli.sh | 4 ++-- images/ubuntu/scripts/build/install-heroku.sh | 3 ++- images/ubuntu/scripts/build/install-hhvm.sh | 2 +- images/ubuntu/scripts/build/install-java-tools.sh | 2 +- .../ubuntu/scripts/build/install-kubernetes-tools.sh | 3 ++- images/ubuntu/scripts/build/install-mongodb.sh | 2 +- images/ubuntu/scripts/build/install-mono.sh | 2 +- images/ubuntu/scripts/build/install-ms-repos.sh | 6 +++--- images/ubuntu/scripts/build/install-mssql-tools.sh | 2 +- images/ubuntu/scripts/build/install-mysql.sh | 8 ++++---- images/ubuntu/scripts/build/install-nginx.sh | 2 +- images/ubuntu/scripts/build/install-phantomjs.sh | 2 +- images/ubuntu/scripts/build/install-php.sh | 12 ++++++------ images/ubuntu/scripts/build/install-postgresql.sh | 2 +- images/ubuntu/scripts/build/install-powershell.sh | 2 +- images/ubuntu/scripts/build/install-python.sh | 4 ++-- images/ubuntu/scripts/build/install-ruby.sh | 2 +- images/ubuntu/scripts/build/install-sqlpackage.sh | 2 +- images/ubuntu/scripts/build/install-zstd.sh | 2 +- 34 files changed, 50 insertions(+), 49 deletions(-) diff --git a/images/ubuntu/scripts/build/install-apache.sh b/images/ubuntu/scripts/build/install-apache.sh index 439fb40974dd..7e2cc93ed5e7 100644 --- a/images/ubuntu/scripts/build/install-apache.sh +++ b/images/ubuntu/scripts/build/install-apache.sh @@ -5,7 +5,7 @@ ################################################################################ # Install Apache -apt-get install apache2 -y +apt-get install apache2 # Disable apache2.service systemctl is-active --quiet apache2.service && systemctl stop apache2.service diff --git a/images/ubuntu/scripts/build/install-apt-common.sh b/images/ubuntu/scripts/build/install-apt-common.sh index 590c5e41d991..bb6aa554991b 100644 --- a/images/ubuntu/scripts/build/install-apt-common.sh +++ b/images/ubuntu/scripts/build/install-apt-common.sh @@ -12,7 +12,7 @@ cmd_packages=$(get_toolset_value .apt.cmd_packages[]) for package in $common_packages $cmd_packages; do echo "Install $package" - apt-get install -y --no-install-recommends $package + apt-get install --no-install-recommends $package done invoke_tests "Apt" diff --git a/images/ubuntu/scripts/build/install-apt-vital.sh b/images/ubuntu/scripts/build/install-apt-vital.sh index 26a3fa819be4..bb80b00e87a4 100644 --- a/images/ubuntu/scripts/build/install-apt-vital.sh +++ b/images/ubuntu/scripts/build/install-apt-vital.sh @@ -8,4 +8,4 @@ source $HELPER_SCRIPTS/install.sh vital_packages=$(get_toolset_value .apt.vital_packages[]) -apt-get install -y --no-install-recommends $vital_packages +apt-get install --no-install-recommends $vital_packages diff --git a/images/ubuntu/scripts/build/install-aws-tools.sh b/images/ubuntu/scripts/build/install-aws-tools.sh index 78b13d6b6928..0f62149a63f4 100644 --- a/images/ubuntu/scripts/build/install-aws-tools.sh +++ b/images/ubuntu/scripts/build/install-aws-tools.sh @@ -14,7 +14,7 @@ unzip -qq "$awscliv2_archive_path" -d /tmp /tmp/aws/install -i /usr/local/aws-cli -b /usr/local/bin smplugin_deb_path=$(download_with_retry "https://s3.amazonaws.com/session-manager-downloads/plugin/latest/ubuntu_64bit/session-manager-plugin.deb") -apt install "$smplugin_deb_path" +apt-get install "$smplugin_deb_path" # Download the latest aws sam cli release aws_sam_cli_archive_name="aws-sam-cli-linux-x86_64.zip" diff --git a/images/ubuntu/scripts/build/install-clang.sh b/images/ubuntu/scripts/build/install-clang.sh index 46732e341403..ee3fc2056882 100644 --- a/images/ubuntu/scripts/build/install-clang.sh +++ b/images/ubuntu/scripts/build/install-clang.sh @@ -11,7 +11,7 @@ install_clang() { local version=$1 echo "Installing clang-$version..." - apt-get install -y "clang-$version" "lldb-$version" "lld-$version" "clang-format-$version" "clang-tidy-$version" + apt-get install "clang-$version" "lldb-$version" "lld-$version" "clang-format-$version" "clang-tidy-$version" } set_default_clang() { diff --git a/images/ubuntu/scripts/build/install-container-tools.sh b/images/ubuntu/scripts/build/install-container-tools.sh index 7319f04f2248..f47720d538c4 100644 --- a/images/ubuntu/scripts/build/install-container-tools.sh +++ b/images/ubuntu/scripts/build/install-container-tools.sh @@ -29,7 +29,7 @@ fi # Install podman, buildah, skopeo container's tools apt-get update -apt-get -y install ${install_packages[@]} +apt-get install ${install_packages[@]} mkdir -p /etc/containers printf "[registries.search]\nregistries = ['docker.io', 'quay.io']\n" | tee /etc/containers/registries.conf diff --git a/images/ubuntu/scripts/build/install-docker.sh b/images/ubuntu/scripts/build/install-docker.sh index 83738f5440e0..35b55f28828f 100644 --- a/images/ubuntu/scripts/build/install-docker.sh +++ b/images/ubuntu/scripts/build/install-docker.sh @@ -24,10 +24,10 @@ components=$(get_toolset_value '.docker.components[] .package') for package in $components; do version=$(get_toolset_value ".docker.components[] | select(.package == \"$package\") | .version") if [[ $version == "latest" ]]; then - apt-get install -y --no-install-recommends "$package" + apt-get install --no-install-recommends "$package" else version_string=$(apt-cache madison "$package" | awk '{ print $3 }' | grep "$version" | grep "$os_codename" | head -1) - apt-get install -y --no-install-recommends "${package}=${version_string}" + apt-get install --no-install-recommends "${package}=${version_string}" fi done diff --git a/images/ubuntu/scripts/build/install-dotnetcore-sdk.sh b/images/ubuntu/scripts/build/install-dotnetcore-sdk.sh index 1e3cd2d6fbf3..f450f9636086 100644 --- a/images/ubuntu/scripts/build/install-dotnetcore-sdk.sh +++ b/images/ubuntu/scripts/build/install-dotnetcore-sdk.sh @@ -48,7 +48,7 @@ for latest_package in ${latest_dotnet_packages[@]}; do echo "Determining if .NET Core ($latest_package) is installed" if ! dpkg -S $latest_package &> /dev/null; then echo "Could not find .NET Core ($latest_package), installing..." - apt-get install $latest_package -y + apt-get install $latest_package else echo ".NET Core ($latest_package) is already installed" fi diff --git a/images/ubuntu/scripts/build/install-firefox.sh b/images/ubuntu/scripts/build/install-firefox.sh index 0b378238af8b..0d59ebdf68f6 100644 --- a/images/ubuntu/scripts/build/install-firefox.sh +++ b/images/ubuntu/scripts/build/install-firefox.sh @@ -21,7 +21,7 @@ curl -fsSL "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x${GPG_FINGER echo "deb $REPO_URL $(lsb_release -cs) main" > $REPO_PATH apt-get update -apt-get install --target-release 'o=LP-PPA-mozillateam' -y firefox +apt-get install --target-release 'o=LP-PPA-mozillateam' firefox rm $REPO_PATH # Document apt source repo's diff --git a/images/ubuntu/scripts/build/install-gcc-compilers.sh b/images/ubuntu/scripts/build/install-gcc-compilers.sh index 642b80dfd442..b0739aa3df57 100644 --- a/images/ubuntu/scripts/build/install-gcc-compilers.sh +++ b/images/ubuntu/scripts/build/install-gcc-compilers.sh @@ -11,7 +11,7 @@ versions=$(get_toolset_value '.gcc.versions[]') for version in ${versions[*]}; do echo "Installing $version..." - apt-get install $version -y + apt-get install $version done invoke_tests "Tools" "gcc" diff --git a/images/ubuntu/scripts/build/install-gfortran.sh b/images/ubuntu/scripts/build/install-gfortran.sh index 78d3d23a7ced..5b94e6ef6473 100644 --- a/images/ubuntu/scripts/build/install-gfortran.sh +++ b/images/ubuntu/scripts/build/install-gfortran.sh @@ -11,7 +11,7 @@ versions=$(get_toolset_value '.gfortran.versions[]') for version in ${versions[*]}; do echo "Installing $version..." - apt-get install $version -y + apt-get install $version done invoke_tests "Tools" "gfortran" diff --git a/images/ubuntu/scripts/build/install-git-lfs.sh b/images/ubuntu/scripts/build/install-git-lfs.sh index 26209746481b..3c15967e2349 100644 --- a/images/ubuntu/scripts/build/install-git-lfs.sh +++ b/images/ubuntu/scripts/build/install-git-lfs.sh @@ -11,7 +11,7 @@ GIT_LFS_REPO="https://packagecloud.io/install/repositories/github/git-lfs" # Install git-lfs curl -fsSL $GIT_LFS_REPO/script.deb.sh | bash -apt-get install -y git-lfs +apt-get install git-lfs # Remove source repo's rm /etc/apt/sources.list.d/github_git-lfs.list diff --git a/images/ubuntu/scripts/build/install-git.sh b/images/ubuntu/scripts/build/install-git.sh index 36122e449752..d9ac3b8e3375 100644 --- a/images/ubuntu/scripts/build/install-git.sh +++ b/images/ubuntu/scripts/build/install-git.sh @@ -13,8 +13,7 @@ GIT_REPO="ppa:git-core/ppa" ## Install git add-apt-repository $GIT_REPO -y apt-get update -apt-get install git -y -git --version +apt-get install git # Git version 2.35.2 introduces security fix that breaks action\checkout https://github.com/actions/checkout/issues/760 cat <<EOF >> /etc/gitconfig @@ -27,7 +26,7 @@ set_etc_environment_variable "GIT_CLONE_PROTECTION_ACTIVE" 'false' reload_etc_environment # Install git-ftp -apt-get install git-ftp -y +apt-get install git-ftp # Remove source repo's add-apt-repository --remove $GIT_REPO diff --git a/images/ubuntu/scripts/build/install-github-cli.sh b/images/ubuntu/scripts/build/install-github-cli.sh index bebdf9a349bd..0abb860bc3f9 100644 --- a/images/ubuntu/scripts/build/install-github-cli.sh +++ b/images/ubuntu/scripts/build/install-github-cli.sh @@ -19,6 +19,6 @@ external_hash=$(get_checksum_from_url "$hash_url" "linux_amd64.deb" "SHA256") use_checksum_comparison "$gh_cli_deb_path" "$external_hash" # Install GitHub CLI -apt install "$gh_cli_deb_path" +apt-get install "$gh_cli_deb_path" invoke_tests "CLI.Tools" "GitHub CLI" diff --git a/images/ubuntu/scripts/build/install-google-chrome.sh b/images/ubuntu/scripts/build/install-google-chrome.sh index b8f5016a0b21..f69090e0d6fd 100644 --- a/images/ubuntu/scripts/build/install-google-chrome.sh +++ b/images/ubuntu/scripts/build/install-google-chrome.sh @@ -37,7 +37,7 @@ get_chromium_revision() { # Download and install Google Chrome CHROME_DEB_URL="https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb" chrome_deb_path=$(download_with_retry "$CHROME_DEB_URL") -apt install "$chrome_deb_path" -f +apt-get install "$chrome_deb_path" -f set_etc_environment_variable "CHROME_BIN" "/usr/bin/google-chrome" # Remove Google Chrome repo diff --git a/images/ubuntu/scripts/build/install-google-cloud-cli.sh b/images/ubuntu/scripts/build/install-google-cloud-cli.sh index cd6fd2d886ff..2df071db8fcb 100644 --- a/images/ubuntu/scripts/build/install-google-cloud-cli.sh +++ b/images/ubuntu/scripts/build/install-google-cloud-cli.sh @@ -9,8 +9,8 @@ REPO_URL="https://packages.cloud.google.com/apt" # Install the Google Cloud CLI echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] $REPO_URL cloud-sdk main" > /etc/apt/sources.list.d/google-cloud-sdk.list wget -qO- https://packages.cloud.google.com/apt/doc/apt-key.gpg | gpg --dearmor > /usr/share/keyrings/cloud.google.gpg -apt-get update -y -apt-get install -y google-cloud-cli +apt-get update +apt-get install google-cloud-cli # remove apt rm /etc/apt/sources.list.d/google-cloud-sdk.list diff --git a/images/ubuntu/scripts/build/install-heroku.sh b/images/ubuntu/scripts/build/install-heroku.sh index 9d01f371da35..b1d42c6df163 100644 --- a/images/ubuntu/scripts/build/install-heroku.sh +++ b/images/ubuntu/scripts/build/install-heroku.sh @@ -13,7 +13,8 @@ curl -fsSL "${REPO_URL}/release.key" | gpg --dearmor -o $GPG_KEY echo "deb [trusted=yes] $REPO_URL ./" > $REPO_PATH # install heroku -apt-get update -y && apt-get install -y heroku +apt-get update +apt-get install heroku # remove heroku's apt repository rm $REPO_PATH diff --git a/images/ubuntu/scripts/build/install-hhvm.sh b/images/ubuntu/scripts/build/install-hhvm.sh index fb529ce6f9bb..40562659e74f 100644 --- a/images/ubuntu/scripts/build/install-hhvm.sh +++ b/images/ubuntu/scripts/build/install-hhvm.sh @@ -14,7 +14,7 @@ echo "deb [signed-by=$GPG_KEY] $REPO_URL $(lsb_release -cs) main" > $REPO_PATH # install HHVM apt-get update -apt-get -qq install -y hhvm +apt-get install hhvm # remove HHVM's apt repository rm $REPO_PATH diff --git a/images/ubuntu/scripts/build/install-java-tools.sh b/images/ubuntu/scripts/build/install-java-tools.sh index aecc19e63da6..0cc976dfe7cc 100644 --- a/images/ubuntu/scripts/build/install-java-tools.sh +++ b/images/ubuntu/scripts/build/install-java-tools.sh @@ -85,7 +85,7 @@ for jdkVersionToInstall in ${jdkVersionsToInstall[@]}; do done # Install Ant -apt-get install -y --no-install-recommends ant ant-optional +apt-get install --no-install-recommends ant ant-optional set_etc_environment_variable "ANT_HOME" "/usr/share/ant" # Install Maven diff --git a/images/ubuntu/scripts/build/install-kubernetes-tools.sh b/images/ubuntu/scripts/build/install-kubernetes-tools.sh index bd7ae7c74174..90f68fedc6c1 100644 --- a/images/ubuntu/scripts/build/install-kubernetes-tools.sh +++ b/images/ubuntu/scripts/build/install-kubernetes-tools.sh @@ -23,7 +23,8 @@ install "${kind_binary_path}" /usr/local/bin/kind kubectl_minor_version=$(curl -fsSL "https://dl.k8s.io/release/stable.txt" | cut -d'.' -f1,2 ) curl -fsSL https://pkgs.k8s.io/core:/stable:/$kubectl_minor_version/deb/Release.key | sudo gpg --dearmor -o /etc/apt/keyrings/kubernetes-apt-keyring.gpg echo 'deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring.gpg] https://pkgs.k8s.io/core:/stable:/'$kubectl_minor_version'/deb/ /' | sudo tee /etc/apt/sources.list.d/kubernetes.list -sudo apt-get update -y && sudo apt-get install -y kubectl +apt-get update +apt-get install kubectl rm -f /etc/apt/sources.list.d/kubernetes.list # Install Helm diff --git a/images/ubuntu/scripts/build/install-mongodb.sh b/images/ubuntu/scripts/build/install-mongodb.sh index a593ac583cbc..8fb682a43d04 100644 --- a/images/ubuntu/scripts/build/install-mongodb.sh +++ b/images/ubuntu/scripts/build/install-mongodb.sh @@ -18,7 +18,7 @@ echo "deb [ arch=amd64,arm64 signed-by=$GPG_KEY ] $REPO_URL $(lsb_release -cs)/m # Install Mongo DB sudo apt-get update -sudo apt-get install -y mongodb-org +sudo apt-get install mongodb-org # remove Mongo DB's apt repository rm $REPO_PATH diff --git a/images/ubuntu/scripts/build/install-mono.sh b/images/ubuntu/scripts/build/install-mono.sh index 78394cbcd670..0c3eea3a3f52 100644 --- a/images/ubuntu/scripts/build/install-mono.sh +++ b/images/ubuntu/scripts/build/install-mono.sh @@ -23,7 +23,7 @@ echo "deb [signed-by=$GPG_KEY] $REPO_URL stable-$os_label main" > $REPO_PATH # Install Mono apt-get update -apt-get install -y --no-install-recommends apt-transport-https mono-complete nuget +apt-get install --no-install-recommends apt-transport-https mono-complete nuget # Remove Mono's apt repo rm $REPO_PATH diff --git a/images/ubuntu/scripts/build/install-ms-repos.sh b/images/ubuntu/scripts/build/install-ms-repos.sh index 09f04d7b808b..b4a56e8bdfb6 100644 --- a/images/ubuntu/scripts/build/install-ms-repos.sh +++ b/images/ubuntu/scripts/build/install-ms-repos.sh @@ -11,6 +11,6 @@ wget https://packages.microsoft.com/config/ubuntu/$os_label/packages-microsoft-p dpkg -i packages-microsoft-prod.deb # update -apt-get install -y apt-transport-https ca-certificates curl software-properties-common -apt-get -yq update -apt-get -yq dist-upgrade +apt-get install apt-transport-https ca-certificates curl software-properties-common +apt-get update +apt-get dist-upgrade diff --git a/images/ubuntu/scripts/build/install-mssql-tools.sh b/images/ubuntu/scripts/build/install-mssql-tools.sh index 20d994738312..351757777b30 100644 --- a/images/ubuntu/scripts/build/install-mssql-tools.sh +++ b/images/ubuntu/scripts/build/install-mssql-tools.sh @@ -7,7 +7,7 @@ export ACCEPT_EULA=Y apt-get update -apt-get install -y mssql-tools unixodbc-dev +apt-get install mssql-tools unixodbc-dev apt-get -f install ln -s /opt/mssql-tools/bin/* /usr/local/bin/ diff --git a/images/ubuntu/scripts/build/install-mysql.sh b/images/ubuntu/scripts/build/install-mysql.sh index d01f83daad8d..82c7334464b6 100644 --- a/images/ubuntu/scripts/build/install-mysql.sh +++ b/images/ubuntu/scripts/build/install-mysql.sh @@ -15,13 +15,13 @@ echo "mysql-server mysql-server/root_password_again password $MYSQL_ROOT_PASSWOR export ACCEPT_EULA=Y # Install MySQL Client -apt-get install mysql-client -y +apt-get install mysql-client # Install MySQL Server -apt-get install -y mysql-server +apt-get install mysql-server -#Install MySQL Dev tools -apt install libmysqlclient-dev -y +# Install MySQL Dev tools +apt-get install libmysqlclient-dev # Disable mysql.service systemctl is-active --quiet mysql.service && systemctl stop mysql.service diff --git a/images/ubuntu/scripts/build/install-nginx.sh b/images/ubuntu/scripts/build/install-nginx.sh index 6bb6137af371..90708e836a22 100644 --- a/images/ubuntu/scripts/build/install-nginx.sh +++ b/images/ubuntu/scripts/build/install-nginx.sh @@ -5,7 +5,7 @@ ################################################################################ # Install Nginx -apt-get install nginx -y +apt-get install nginx # Disable nginx.service systemctl is-active --quiet nginx.service && systemctl stop nginx.service diff --git a/images/ubuntu/scripts/build/install-phantomjs.sh b/images/ubuntu/scripts/build/install-phantomjs.sh index 1eec7a1b1a75..0cce25d97410 100644 --- a/images/ubuntu/scripts/build/install-phantomjs.sh +++ b/images/ubuntu/scripts/build/install-phantomjs.sh @@ -8,7 +8,7 @@ source $HELPER_SCRIPTS/install.sh # Install required dependencies -apt-get install -y chrpath libssl-dev libxft-dev libfreetype6 libfreetype6-dev libfontconfig1 libfontconfig1-dev +apt-get install chrpath libssl-dev libxft-dev libfreetype6 libfreetype6-dev libfontconfig1 libfontconfig1-dev # Define the version and hash of PhantomJS to be installed DIR_NAME=phantomjs-2.1.1-linux-x86_64 diff --git a/images/ubuntu/scripts/build/install-php.sh b/images/ubuntu/scripts/build/install-php.sh index fa5cfe28f68f..46be1385e73e 100644 --- a/images/ubuntu/scripts/build/install-php.sh +++ b/images/ubuntu/scripts/build/install-php.sh @@ -21,7 +21,7 @@ php_versions=$(get_toolset_value '.php.versions[]') for version in $php_versions; do echo "Installing PHP $version" - apt-get install -y --no-install-recommends \ + apt-get install --no-install-recommends \ php$version \ php$version-amqp \ php$version-apcu \ @@ -67,24 +67,24 @@ for version in $php_versions; do php$version-zip \ php$version-zmq - apt-get install -y --no-install-recommends php$version-pcov + apt-get install --no-install-recommends php$version-pcov # Disable PCOV, as Xdebug is enabled by default # https://github.com/krakjoe/pcov#interoperability phpdismod -v $version pcov if [[ $version == "7.2" || $version == "7.3" || $version == "7.4" ]]; then - apt-get install -y --no-install-recommends php$version-recode + apt-get install --no-install-recommends php$version-recode fi if [[ $version != "8.0" && $version != "8.1" && $version != "8.2" && $version != "8.3" ]]; then - apt-get install -y --no-install-recommends php$version-xmlrpc php$version-json + apt-get install --no-install-recommends php$version-xmlrpc php$version-json fi done -apt-get install -y --no-install-recommends php-pear +apt-get install --no-install-recommends php-pear -apt-get install -y --no-install-recommends snmp +apt-get install --no-install-recommends snmp # Install composer php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" diff --git a/images/ubuntu/scripts/build/install-postgresql.sh b/images/ubuntu/scripts/build/install-postgresql.sh index 8285f610a133..05e2a7c8af87 100644 --- a/images/ubuntu/scripts/build/install-postgresql.sh +++ b/images/ubuntu/scripts/build/install-postgresql.sh @@ -20,7 +20,7 @@ toolset_version=$(get_toolset_value '.postgresql.version') # Install PostgreSQL echo "Install PostgreSQL" apt update -apt install postgresql-$toolset_version +apt-get install postgresql-$toolset_version echo "Install libpq-dev" apt-get install libpq-dev diff --git a/images/ubuntu/scripts/build/install-powershell.sh b/images/ubuntu/scripts/build/install-powershell.sh index 09dd90dcf659..a3802f3519fc 100644 --- a/images/ubuntu/scripts/build/install-powershell.sh +++ b/images/ubuntu/scripts/build/install-powershell.sh @@ -17,5 +17,5 @@ if is_ubuntu24; then package_path=$(download_with_retry "https://github.com/PowerShell/PowerShell/releases/download/v7.4.2/powershell-lts_7.4.2-1.deb_amd64.deb") sudo dpkg -i "$package_path" else - apt-get install -y powershell=$pwsh_version* + apt-get install powershell=$pwsh_version* fi diff --git a/images/ubuntu/scripts/build/install-python.sh b/images/ubuntu/scripts/build/install-python.sh index 06ac4790d122..c87dac52cde8 100644 --- a/images/ubuntu/scripts/build/install-python.sh +++ b/images/ubuntu/scripts/build/install-python.sh @@ -10,14 +10,14 @@ source $HELPER_SCRIPTS/etc-environment.sh source $HELPER_SCRIPTS/os.sh # Install Python, Python 3, pip, pip3 -apt-get install -y --no-install-recommends python3 python3-dev python3-pip python3-venv +apt-get install --no-install-recommends python3 python3-dev python3-pip python3-venv # Install pipx # Set pipx custom directory export PIPX_BIN_DIR=/opt/pipx_bin export PIPX_HOME=/opt/pipx if is_ubuntu24; then - apt-get install -y --no-install-recommends pipx + apt-get install --no-install-recommends pipx pipx ensurepath else python3 -m pip install pipx diff --git a/images/ubuntu/scripts/build/install-ruby.sh b/images/ubuntu/scripts/build/install-ruby.sh index d3cd3f4e4894..5b19db390d02 100644 --- a/images/ubuntu/scripts/build/install-ruby.sh +++ b/images/ubuntu/scripts/build/install-ruby.sh @@ -20,7 +20,7 @@ if [[ -n "$gems_to_install" ]]; then fi # Install Ruby requirements -apt-get install -y libz-dev openssl libssl-dev +apt-get install libz-dev openssl libssl-dev echo "Install Ruby from toolset..." package_tar_names=$(curl -fsSL "https://api.github.com/repos/ruby/ruby-builder/releases/latest" | jq -r '.assets[].name') diff --git a/images/ubuntu/scripts/build/install-sqlpackage.sh b/images/ubuntu/scripts/build/install-sqlpackage.sh index 311ea5beae7c..b9c979e851af 100644 --- a/images/ubuntu/scripts/build/install-sqlpackage.sh +++ b/images/ubuntu/scripts/build/install-sqlpackage.sh @@ -14,7 +14,7 @@ if is_ubuntu22; then echo "deb http://archive.ubuntu.com/ubuntu/ focal-security main" | tee "${focal_list}" apt-get update --quiet - apt-get install --no-install-recommends --yes libssl1.1 + apt-get install --no-install-recommends libssl1.1 rm "${focal_list}" apt-get update --quiet diff --git a/images/ubuntu/scripts/build/install-zstd.sh b/images/ubuntu/scripts/build/install-zstd.sh index a980ad8917e4..1f26c2435d18 100644 --- a/images/ubuntu/scripts/build/install-zstd.sh +++ b/images/ubuntu/scripts/build/install-zstd.sh @@ -19,7 +19,7 @@ external_hash=$(get_checksum_from_url "${download_url}.sha256" "${release_name}. use_checksum_comparison "$archive_path" "$external_hash" # Install zstd -apt-get install -y liblz4-dev +apt-get install liblz4-dev tar xzf "$archive_path" -C /tmp make -C "/tmp/${release_name}/contrib/pzstd" all From 785629d8d87e35f2a388f748bdf03f0fbbe3b175 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 29 May 2024 11:59:57 +0000 Subject: [PATCH 2875/3485] Updating readme file for macos-13-arm64 version 20240524.2 (#9939) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-13-arm64-Readme.md | 44 +++++++++++++-------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/images/macos/macos-13-arm64-Readme.md b/images/macos/macos-13-arm64-Readme.md index 3edf6078fb09..606b07554c4e 100644 --- a/images/macos/macos-13-arm64-Readme.md +++ b/images/macos/macos-13-arm64-Readme.md @@ -1,7 +1,7 @@ # macOS 13 -- OS Version: macOS 13.6.6 (22G630) +- OS Version: macOS 13.6.7 (22G720) - Kernel Version: Darwin 22.6.0 -- Image Version: 20240514.3 +- Image Version: 20240524.2 ## Installed Software @@ -12,11 +12,11 @@ - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` - GCC 11 (Homebrew GCC 11.4.0) - available by `gcc-11` alias - GCC 12 (Homebrew GCC 12.3.0) - available by `gcc-12` alias -- GCC 13 (Homebrew GCC 13.2.0) - available by `gcc-13` alias +- GCC 13 (Homebrew GCC 13.3.0) - available by `gcc-13` alias - GNU Fortran 11 (Homebrew GCC 11.4.0) - available by `gfortran-11` alias - GNU Fortran 12 (Homebrew GCC 12.3.0) - available by `gfortran-12` alias -- GNU Fortran 13 (Homebrew GCC 13.2.0) - available by `gfortran-13` alias -- Kotlin 1.9.24-release-822 +- GNU Fortran 13 (Homebrew GCC 13.3.0) - available by `gfortran-13` alias +- Kotlin 2.0.0-release-341 - Mono 6.12.0.188 - Node.js 20.13.1 - Perl 5.38.2 @@ -27,13 +27,13 @@ - Bundler 2.5.10 - Carthage 0.39.1 - CocoaPods 1.15.2 -- Homebrew 4.3.0 +- Homebrew 4.3.1 - NPM 10.5.2 - NuGet 6.3.1.1 - Pip3 24.0 (python 3.12) - Pipx 1.5.0 - RubyGems 3.5.10 -- Yarn 1.22.19 +- Yarn 1.22.22 ### Project Management - Apache Ant 1.10.14 @@ -62,16 +62,16 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.15.50 -- AWS SAM CLI 1.116.0 +- AWS CLI 2.15.58 +- AWS SAM CLI 1.117.0 - AWS Session Manager CLI 1.2.553.0 -- Azure CLI 2.60.0 -- Azure CLI (azure-devops) 1.0.0 +- Azure CLI 2.61.0 +- Azure CLI (azure-devops) 1.0.1 - Bicep CLI 0.27.1 - Cmake 3.29.3 -- CodeQL Action Bundle 2.17.2 +- CodeQL Action Bundle 2.17.3 - Fastlane 2.220.0 -- SwiftFormat 0.53.9 +- SwiftFormat 0.53.10 - Xcbeautify 2.3.1 - Xcode Command Line Tools 14.3.1.0.1.1683849156 - Xcodes 1.4.1 @@ -79,12 +79,12 @@ ### Linters ### Browsers -- Safari 17.4.1 (18618.1.15.111.8) -- SafariDriver 17.4.1 (18618.1.15.111.8) -- Google Chrome 124.0.6367.208 -- Google Chrome for Testing 124.0.6367.207 -- ChromeDriver 124.0.6367.207 -- Selenium server 4.20.0 +- Safari 17.5 (18618.2.12.111.5) +- SafariDriver 17.5 (18618.2.12.111.5) +- Google Chrome 125.0.6422.113 +- Google Chrome for Testing 125.0.6422.78 +- ChromeDriver 125.0.6422.78 +- Selenium server 4.21.0 #### Environment variables | Name | Value | @@ -110,7 +110,7 @@ #### Node.js - 16.20.1 -- 18.20.2 +- 18.20.3 - 20.13.1 #### Go @@ -132,7 +132,7 @@ - PowerShell 7.4.2 #### PowerShell Modules -- Az: 11.6.0 +- Az: 12.0.0 - Pester: 5.5.0 - PSScriptAnalyzer: 1.22.0 @@ -213,7 +213,7 @@ | Package Name | Version | | -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 11.0 | -| Android Emulator | 34.2.13 | +| Android Emulator | 34.2.14 | | Android SDK Build-tools | 34.0.0<br>33.0.2 33.0.3 | | Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | | Android SDK Platform-Tools | 35.0.1 | From 9d5d1be4828f3f7e54796a46d60afd0a2f9e05b0 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 29 May 2024 21:31:15 +0000 Subject: [PATCH 2876/3485] Updating readme file for macos-14-arm64 version 20240526.2 (#9940) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-14-arm64-Readme.md | 56 +++++++++++++-------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/images/macos/macos-14-arm64-Readme.md b/images/macos/macos-14-arm64-Readme.md index e7388321e9c9..f8fdaba70ed5 100644 --- a/images/macos/macos-14-arm64-Readme.md +++ b/images/macos/macos-14-arm64-Readme.md @@ -1,7 +1,7 @@ # macOS 14 -- OS Version: macOS 14.4.1 (23E224) -- Kernel Version: Darwin 23.4.0 -- Image Version: 20240514.3 +- OS Version: macOS 14.5 (23F79) +- Kernel Version: Darwin 23.5.0 +- Image Version: 20240526.2 ## Installed Software @@ -12,11 +12,11 @@ - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` - GCC 11 (Homebrew GCC 11.4.0) - available by `gcc-11` alias - GCC 12 (Homebrew GCC 12.3.0) - available by `gcc-12` alias -- GCC 13 (Homebrew GCC 13.2.0) - available by `gcc-13` alias +- GCC 13 (Homebrew GCC 13.3.0) - available by `gcc-13` alias - GNU Fortran 11 (Homebrew GCC 11.4.0) - available by `gfortran-11` alias - GNU Fortran 12 (Homebrew GCC 12.3.0) - available by `gfortran-12` alias -- GNU Fortran 13 (Homebrew GCC 13.2.0) - available by `gfortran-13` alias -- Kotlin 1.9.24-release-822 +- GNU Fortran 13 (Homebrew GCC 13.3.0) - available by `gfortran-13` alias +- Kotlin 2.0.0-release-341 - Mono 6.12.0.188 - Node.js 20.13.1 - Perl 5.38.2 @@ -27,17 +27,17 @@ - Bundler 2.5.10 - Carthage 0.39.1 - CocoaPods 1.15.2 -- Homebrew 4.3.0 +- Homebrew 4.3.1 - NPM 10.5.2 - NuGet 6.3.1.1 - Pip3 24.0 (python 3.12) - Pipx 1.5.0 - RubyGems 3.5.10 -- Yarn 1.22.19 +- Yarn 1.22.22 ### Project Management - Apache Ant 1.10.14 -- Apache Maven 3.9.6 +- Apache Maven 3.9.7 - Gradle 8.7 ### Utilities @@ -47,7 +47,7 @@ - bazel 7.1.2 - bazelisk 1.20.0 - bsdtar 3.5.3 - available by 'tar' alias -- Curl 8.4.0 +- Curl 8.6.0 - Git 2.45.1 - Git LFS 3.5.1 - GitHub CLI 2.49.2 @@ -62,16 +62,16 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.15.50 -- AWS SAM CLI 1.116.0 +- AWS CLI 2.15.58 +- AWS SAM CLI 1.117.0 - AWS Session Manager CLI 1.2.553.0 -- Azure CLI 2.60.0 -- Azure CLI (azure-devops) 1.0.0 +- Azure CLI 2.61.0 +- Azure CLI (azure-devops) 1.0.1 - Bicep CLI 0.27.1 - Cmake 3.29.3 -- CodeQL Action Bundle 2.17.2 +- CodeQL Action Bundle 2.17.3 - Fastlane 2.220.0 -- SwiftFormat 0.53.9 +- SwiftFormat 0.53.10 - Xcbeautify 2.3.1 - Xcode Command Line Tools 15.3.0.0.1.1708646388 - Xcodes 1.4.1 @@ -79,12 +79,12 @@ ### Linters ### Browsers -- Safari 17.4.1 (19618.1.15.11.14) -- SafariDriver 17.4.1 (19618.1.15.11.14) -- Google Chrome 124.0.6367.208 -- Google Chrome for Testing 124.0.6367.207 -- ChromeDriver 124.0.6367.207 -- Selenium server 4.20.0 +- Safari 17.5 (19618.2.12.11.6) +- SafariDriver 17.5 (19618.2.12.11.6) +- Google Chrome 125.0.6422.113 +- Google Chrome for Testing 125.0.6422.78 +- ChromeDriver 125.0.6422.78 +- Selenium server 4.21.0 #### Environment variables | Name | Value | @@ -109,7 +109,7 @@ - 3.12.3 #### Node.js -- 18.20.2 +- 18.20.3 - 20.13.1 #### Go @@ -131,14 +131,14 @@ - PowerShell 7.4.2 #### PowerShell Modules -- Az: 11.6.0 +- Az: 12.0.0 - Pester: 5.5.0 - PSScriptAnalyzer: 1.22.0 ### Xcode | Version | Build | Path | | ---------------- | ------- | ------------------------------ | -| 15.4 | 15F31c | /Applications/Xcode_15.4.app | +| 15.4 | 15F31d | /Applications/Xcode_15.4.app | | 15.3 | 15E204a | /Applications/Xcode_15.3.app | | 15.2 | 15C500b | /Applications/Xcode_15.2.app | | 15.1 | 15C65 | /Applications/Xcode_15.1.app | @@ -185,13 +185,13 @@ | Simulator - watchOS 10.5 | watchsimulator10.5 | 15.4 | | visionOS 1.0 | xros1.0 | 15.2 | | Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | -| visionOS 1.1 | xros1.1 | 15.3 | | Simulator - visionOS 1.1 | xrsimulator1.1 | 15.3 | +| visionOS 1.1 | xros1.1 | 15.3 | | Simulator - visionOS 1.2 | xrsimulator1.2 | 15.4 | | visionOS 1.2 | xros1.2 | 15.4 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | -| Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | +| Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | | DriverKit 22.4 | driverkit22.4 | 14.3.1 | | DriverKit 23.0 | driverkit23.0 | 15.0.1 | | DriverKit 23.2 | driverkit23.2 | 15.1, 15.2 | @@ -224,7 +224,7 @@ | Package Name | Version | | -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 11.0 | -| Android Emulator | 34.2.13 | +| Android Emulator | 34.2.14 | | Android SDK Build-tools | 34.0.0<br>33.0.2 33.0.3 | | Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | | Android SDK Platform-Tools | 35.0.1 | From 293e955e3f68230831eb8cac3faa697cef2e177f Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Fri, 31 May 2024 16:43:37 +0200 Subject: [PATCH 2877/3485] [Windows] Update signature for SessionManagerPluginSetup.exe (#9969) --- images/windows/scripts/build/Install-AWSTools.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/windows/scripts/build/Install-AWSTools.ps1 b/images/windows/scripts/build/Install-AWSTools.ps1 index e719532e56dc..22ad5b43274d 100644 --- a/images/windows/scripts/build/Install-AWSTools.ps1 +++ b/images/windows/scripts/build/Install-AWSTools.ps1 @@ -11,7 +11,7 @@ Install-ChocoPackage awscli Install-Binary ` -Url "https://s3.amazonaws.com/session-manager-downloads/plugin/latest/windows/SessionManagerPluginSetup.exe" ` -InstallArgs ("/silent", "/install") ` - -ExpectedSignature "FF457E5732E98A9F156E657F8CC7C4432507C3BB" + -ExpectedSignature "75A5FB4D02FCB2AB799718F315BAAA3103E9D60C" $env:Path = $env:Path + ";$env:ProgramFiles\Amazon\SessionManagerPlugin\bin" # Install AWS SAM CLI From 25c57a1bbfaa5fbffc2e221b4015754e3815f7c5 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 31 May 2024 15:22:30 +0000 Subject: [PATCH 2878/3485] Updating readme file for macos-12 version 20240527.4 (#9955) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-12-Readme.md | 70 ++++++++++++++++----------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/images/macos/macos-12-Readme.md b/images/macos/macos-12-Readme.md index f0421d3f4b30..f1c811f2bc08 100644 --- a/images/macos/macos-12-Readme.md +++ b/images/macos/macos-12-Readme.md @@ -1,7 +1,7 @@ # macOS 12 -- OS Version: macOS 12.7.4 (21H1123) +- OS Version: macOS 12.7.5 (21H1222) - Kernel Version: Darwin 21.6.0 -- Image Version: 20240514.3 +- Image Version: 20240527.4 ## Installed Software @@ -12,18 +12,18 @@ - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` - GCC 11 (Homebrew GCC 11.4.0) - available by `gcc-11` alias - GCC 12 (Homebrew GCC 12.3.0) - available by `gcc-12` alias -- GCC 13 (Homebrew GCC 13.2.0) - available by `gcc-13` alias +- GCC 13 (Homebrew GCC 13.3.0) - available by `gcc-13` alias - GNU Fortran 11 (Homebrew GCC 11.4.0) - available by `gfortran-11` alias - GNU Fortran 12 (Homebrew GCC 12.3.0) - available by `gfortran-12` alias -- GNU Fortran 13 (Homebrew GCC 13.2.0) - available by `gfortran-13` alias +- GNU Fortran 13 (Homebrew GCC 13.3.0) - available by `gfortran-13` alias - Julia 1.10.3 -- Kotlin 1.9.24-release-822 +- Kotlin 2.0.0-release-341 - Go 1.21.10 - Mono 6.12.0.188 -- Node.js 18.20.2 +- Node.js 18.20.3 - MSBuild 16.10.1.51301 (Mono 6.12.0.188) - NVM 0.39.7 -- NVM - Cached node versions: 16.20.2, 18.20.2, 20.13.1 +- NVM - Cached node versions: 16.20.2, 18.20.3, 20.13.1 - Perl 5.38.2 - PHP 8.3.7 - Python 2.7.18 @@ -36,16 +36,16 @@ - Carthage 0.39.1 - CocoaPods 1.15.2 - Composer 2.7.6 -- Homebrew 4.3.0 -- Miniconda 24.3.0 -- NPM 10.5.0 +- Homebrew 4.3.2 +- Miniconda 24.4.0 +- NPM 10.7.0 - NuGet 6.3.1.1 - Pip 20.3.4 (python 2.7) - Pip3 24.0 (python 3.12) - Pipx 1.5.0 - RubyGems 3.5.10 -- Vcpkg 2024 (build from commit bd2b54836) -- Yarn 1.22.19 +- Vcpkg 2024 (build from commit 007aaced1) +- Yarn 1.22.22 #### Environment variables | Name | Value | @@ -55,7 +55,7 @@ ### Project Management - Apache Ant 1.10.14 -- Apache Maven 3.9.6 +- Apache Maven 3.9.7 - Gradle 8.7 - Sbt 1.10.0 @@ -66,14 +66,14 @@ - bazel 7.1.2 - bazelisk 1.20.0 - bsdtar 3.5.1 - available by 'tar' alias -- Curl 8.7.1 +- Curl 8.8.0 - Git 2.45.1 - Git LFS 3.5.1 - GitHub CLI 2.49.2 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.24.5 - gpg (GnuPG) 2.4.5 -- ImageMagick 7.1.1-32 +- ImageMagick 7.1.1-33 - jq 1.7.1 - mongo 5.0.26 - mongod 5.0.26 @@ -92,22 +92,22 @@ ### Tools - App Center CLI 3.0.0 -- AWS CLI 2.15.50 -- AWS SAM CLI 1.116.0 +- AWS CLI 2.15.58 +- AWS SAM CLI 1.117.0 - AWS Session Manager CLI 1.2.553.0 -- Azure CLI 2.60.0 -- Azure CLI (azure-devops) 1.0.0 +- Azure CLI 2.61.0 +- Azure CLI (azure-devops) 1.0.1 - Bicep CLI 0.27.1 - Cabal 3.10.3.0 - Cmake 3.29.3 -- CodeQL Action Bundle 2.17.2 -- Colima 0.6.8 +- CodeQL Action Bundle 2.17.3 +- Colima 0.6.9 - Fastlane 2.220.0 - GHC 9.10.1 - GHCup 0.1.22.0 - Jazzy 0.15.0 -- Stack 2.15.5 -- SwiftFormat 0.53.9 +- Stack 2.15.7 +- SwiftFormat 0.53.10 - Swig 4.2.1 - Xcbeautify 1.6.0 - Xcode Command Line Tools 14.2.0.0.1.1668646533 @@ -118,16 +118,16 @@ - Yamllint 1.35.1 ### Browsers -- Safari 17.4.1 (17618.1.15.111.8) -- SafariDriver 17.4.1 (17618.1.15.111.8) -- Google Chrome 124.0.6367.208 -- Google Chrome for Testing 124.0.6367.207 -- ChromeDriver 124.0.6367.207 -- Microsoft Edge 124.0.2478.105 -- Microsoft Edge WebDriver 124.0.2478.105 +- Safari 17.5 (17618.2.12.111.5) +- SafariDriver 17.5 (17618.2.12.111.5) +- Google Chrome 125.0.6422.113 +- Google Chrome for Testing 125.0.6422.78 +- ChromeDriver 125.0.6422.78 +- Microsoft Edge 125.0.2535.67 +- Microsoft Edge WebDriver 125.0.2535.67 - Mozilla Firefox 126.0 - geckodriver 0.34.0 -- Selenium server 4.20.0 +- Selenium server 4.21.0 #### Environment variables | Name | Value | @@ -167,7 +167,7 @@ #### Node.js - 16.20.2 -- 18.20.2 +- 18.20.3 - 20.13.1 #### Go @@ -193,7 +193,7 @@ - PowerShell 7.4.2 #### PowerShell Modules -- Az: 11.6.0 +- Az: 12.0.0 - MarkdownPS: 1.9 - Pester: 5.5.0 - PSScriptAnalyzer: 1.22.0 @@ -330,7 +330,7 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" | Package Name | Version | | -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 8.0 | -| Android Emulator | 34.2.13 | +| Android Emulator | 34.2.14 | | Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2 33.0.3<br>32.0.0<br>31.0.0 | | Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1) | | Android SDK Platform-Tools | 35.0.1 | @@ -359,7 +359,7 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" #### Environment variables | Name | Value | | ----------------- | ----------------------------------------------------------------------------------------- | -| PARALLELS_DMG_URL | https://download.parallels.com/desktop/v19/19.3.1-54941/ParallelsDesktop-19.3.1-54941.dmg | +| PARALLELS_DMG_URL | https://download.parallels.com/desktop/v19/19.4.0-54962/ParallelsDesktop-19.4.0-54962.dmg | ##### Notes ``` From a9f4b4f4806dc772117182ce98096dfde2c5002f Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya <kachick1@gmail.com> Date: Mon, 3 Jun 2024 18:50:44 +0900 Subject: [PATCH 2879/3485] [Ubuntu] Add tree command (#9936) --- images/ubuntu/toolsets/toolset-2404.json | 1 + 1 file changed, 1 insertion(+) diff --git a/images/ubuntu/toolsets/toolset-2404.json b/images/ubuntu/toolsets/toolset-2404.json index 187860bf91b8..c8a023811b11 100644 --- a/images/ubuntu/toolsets/toolset-2404.json +++ b/images/ubuntu/toolsets/toolset-2404.json @@ -134,6 +134,7 @@ "rpm", "texinfo", "tk", + "tree", "tzdata", "upx", "xvfb", From c9f2293acc273f44f5ec67081be00413bbd1828a Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Tue, 4 Jun 2024 11:35:21 +0200 Subject: [PATCH 2880/3485] [Ubuntu] do not restart provisioner on 24.04 automatically (#9979) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [Ubuntu] does not restart provisioner on 24.04 automatically * Update images/ubuntu/scripts/build/configure-system.sh Co-authored-by: Kacper Michajłow <kasper93@gmail.com> --------- Co-authored-by: Kacper Michajłow <kasper93@gmail.com> --- images/ubuntu/scripts/build/configure-system.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/images/ubuntu/scripts/build/configure-system.sh b/images/ubuntu/scripts/build/configure-system.sh index 257e5ff42515..4c82e353842a 100644 --- a/images/ubuntu/scripts/build/configure-system.sh +++ b/images/ubuntu/scripts/build/configure-system.sh @@ -4,8 +4,8 @@ ## Desc: Post deployment system configuration actions ################################################################################ -# Source the helpers for use with the script source $HELPER_SCRIPT_FOLDER/etc-environment.sh +source $HELPER_SCRIPT_FOLDER/os.sh mv -f /imagegeneration/post-generation /opt @@ -31,3 +31,10 @@ fi if npm --version; then npm cache clean --force fi + +if is_ubuntu24; then +# Prevent needrestart from restarting the provisioner service. +# Currently only happens on Ubuntu 24.04, so make it conditional for the time being +# as configuration is too different between Ubuntu versions. + sed -i '/^\s*};/i \ qr(^runner-provisioner) => 0,' /etc/needrestart/needrestart.conf +fi From 5a99573420d444fcb68edd2cb9f5bb822d6cd886 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Tue, 4 Jun 2024 13:20:10 +0200 Subject: [PATCH 2881/3485] [ubuntu] Install native azure-cli on noble (#9983) --- .../ubuntu/scripts/build/install-azure-cli.sh | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/images/ubuntu/scripts/build/install-azure-cli.sh b/images/ubuntu/scripts/build/install-azure-cli.sh index 4d98bac9a744..0004f7bdef63 100644 --- a/images/ubuntu/scripts/build/install-azure-cli.sh +++ b/images/ubuntu/scripts/build/install-azure-cli.sh @@ -4,23 +4,8 @@ ## Desc: Install Azure CLI (az) ################################################################################ -# Source the helpers for use with the script -source $HELPER_SCRIPTS/os.sh - # Install Azure CLI (instructions taken from https://docs.microsoft.com/en-us/cli/azure/install-azure-cli) -if is_ubuntu24; then - apt-get install apt-transport-https - curl -sL https://packages.microsoft.com/keys/microsoft.asc | \ - gpg --dearmor | \ - sudo tee /etc/apt/trusted.gpg.d/microsoft.asc.gpg > /dev/null - AZ_DIST="jammy" - echo "deb [arch=amd64] https://packages.microsoft.com/repos/azure-cli/ $AZ_DIST main" | \ - sudo tee /etc/apt/sources.list.d/azure-cli.list - sudo apt-get update - sudo apt-get install azure-cli -else - curl -fsSL https://aka.ms/InstallAzureCLIDeb | sudo bash -fi +curl -fsSL https://aka.ms/InstallAzureCLIDeb | sudo bash echo "azure-cli https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt" >> $HELPER_SCRIPTS/apt-sources.txt From 52bcf848e59b75c3339f1a9a2fdf22fb12484984 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Tue, 4 Jun 2024 13:32:40 +0200 Subject: [PATCH 2882/3485] [All OSes] Revert gitlfs changes (#9984) * Revert "[Ubuntu] Add new git environment variable (#9899)" This reverts commit ee7edb4f80edb64ff69e225d135e24fc9988504d. * Revert "[Windows] Add new git environment variable (#9898)" This reverts commit 5113d251a822f91becde6629627eeb293107b3b5. * Revert "[macOS] Add new git environment variable (#9900)" This reverts commit 5c60b0c2afa1b3865f795aeea3c2c44fb03de4a6. --- images/macos/scripts/build/configure-machine.sh | 3 --- images/macos/scripts/tests/Git.Tests.ps1 | 3 --- images/ubuntu/scripts/build/install-git.sh | 5 ----- images/ubuntu/scripts/tests/Tools.Tests.ps1 | 4 ---- images/windows/scripts/build/Install-Git.ps1 | 2 -- images/windows/scripts/tests/Git.Tests.ps1 | 4 ---- 6 files changed, 21 deletions(-) diff --git a/images/macos/scripts/build/configure-machine.sh b/images/macos/scripts/build/configure-machine.sh index 402aea10b12e..294935000dab 100644 --- a/images/macos/scripts/build/configure-machine.sh +++ b/images/macos/scripts/build/configure-machine.sh @@ -103,6 +103,3 @@ if [[ ! -d "/usr/local/bin" ]];then fi chmod +x $HOME/utils/invoke-tests.sh sudo ln -s $HOME/utils/invoke-tests.sh /usr/local/bin/invoke_tests - -# Revert to the old behaviour and avoid the Git LFS problems (https://github.blog/2024-05-14-securing-git-addressing-5-new-vulnerabilities/) -echo "export GIT_CLONE_PROTECTION_ACTIVE=false" >> $HOME/.bashrc diff --git a/images/macos/scripts/tests/Git.Tests.ps1 b/images/macos/scripts/tests/Git.Tests.ps1 index 3efb6d82c526..f216baa0bcd1 100644 --- a/images/macos/scripts/tests/Git.Tests.ps1 +++ b/images/macos/scripts/tests/Git.Tests.ps1 @@ -9,7 +9,4 @@ Describe "Git" { It "git lfs is installed" -Skip:($os.IsBigSur) { "git lfs version" | Should -ReturnZeroExitCode } - It "GIT_CLONE_PROTECTION_ACTIVE environment variable should be equal false" { - $env:GIT_CLONE_PROTECTION_ACTIVE | Should -BeExactly false - } } diff --git a/images/ubuntu/scripts/build/install-git.sh b/images/ubuntu/scripts/build/install-git.sh index d9ac3b8e3375..25dc93bb235f 100644 --- a/images/ubuntu/scripts/build/install-git.sh +++ b/images/ubuntu/scripts/build/install-git.sh @@ -6,7 +6,6 @@ # Source the helpers for use with the script source $HELPER_SCRIPTS/install.sh -source $HELPER_SCRIPTS/etc-environment.sh GIT_REPO="ppa:git-core/ppa" @@ -21,10 +20,6 @@ cat <<EOF >> /etc/gitconfig directory = * EOF -# Revert to the old behaviour and avoid the Git LFS problems (https://github.blog/2024-05-14-securing-git-addressing-5-new-vulnerabilities/) -set_etc_environment_variable "GIT_CLONE_PROTECTION_ACTIVE" 'false' -reload_etc_environment - # Install git-ftp apt-get install git-ftp diff --git a/images/ubuntu/scripts/tests/Tools.Tests.ps1 b/images/ubuntu/scripts/tests/Tools.Tests.ps1 index 2bd0872f458b..6e6ec0af02eb 100644 --- a/images/ubuntu/scripts/tests/Tools.Tests.ps1 +++ b/images/ubuntu/scripts/tests/Tools.Tests.ps1 @@ -259,10 +259,6 @@ Describe "Git" { It "git-ftp" { "git-ftp --version" | Should -ReturnZeroExitCode } - - It "GIT_CLONE_PROTECTION_ACTIVE environment variable should be equal false" { - $env:GIT_CLONE_PROTECTION_ACTIVE | Should -BeExactly false - } } Describe "Git-lfs" { diff --git a/images/windows/scripts/build/Install-Git.ps1 b/images/windows/scripts/build/Install-Git.ps1 index 4c8cbb8c4b0d..21648cef4ba4 100644 --- a/images/windows/scripts/build/Install-Git.ps1 +++ b/images/windows/scripts/build/Install-Git.ps1 @@ -41,8 +41,6 @@ if ($LASTEXITCODE -ne 0) { # Disable GCM machine-wide [Environment]::SetEnvironmentVariable("GCM_INTERACTIVE", "Never", "Machine") -# Revert to the old behaviour and avoid the Git LFS problems (https://github.blog/2024-05-14-securing-git-addressing-5-new-vulnerabilities/) -[Environment]::SetEnvironmentVariable("GIT_CLONE_PROTECTION_ACTIVE", "false", "Machine") # Add to PATH Add-MachinePathItem "C:\Program Files\Git\bin" diff --git a/images/windows/scripts/tests/Git.Tests.ps1 b/images/windows/scripts/tests/Git.Tests.ps1 index 87ef9b55e9cf..00b3d23024b2 100644 --- a/images/windows/scripts/tests/Git.Tests.ps1 +++ b/images/windows/scripts/tests/Git.Tests.ps1 @@ -22,8 +22,4 @@ Describe "Git" { It "GCM_INTERACTIVE environment variable should be equal Never" { $env:GCM_INTERACTIVE | Should -BeExactly Never } - - It "GIT_CLONE_PROTECTION_ACTIVE environment variable should be equal false" { - $env:GIT_CLONE_PROTECTION_ACTIVE | Should -BeExactly false - } } From 3a10719283d7db778cda04e426f67381c4069d6f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 5 Jun 2024 07:20:12 +0000 Subject: [PATCH 2883/3485] Updating readme file for ubuntu24 version 20240604.1.1 (#9986) Co-authored-by: Image generation service account <no-reply@microsoft.com> --- images/ubuntu/Ubuntu2404-Readme.md | 65 +++++++++++++++--------------- 1 file changed, 33 insertions(+), 32 deletions(-) diff --git a/images/ubuntu/Ubuntu2404-Readme.md b/images/ubuntu/Ubuntu2404-Readme.md index fddc408efd1e..9555f457ecf3 100644 --- a/images/ubuntu/Ubuntu2404-Readme.md +++ b/images/ubuntu/Ubuntu2404-Readme.md @@ -6,7 +6,7 @@ # Ubuntu 24.04 LTS - OS Version: 24.04 LTS - Kernel Version: 6.8.0-1007-azure -- Image Version: 20240516.4.0 +- Image Version: 20240604.1.0 - Systemd version: 255.4-1ubuntu8 ## Installed Software @@ -20,22 +20,22 @@ - GNU C++: 12.3.0, 13.2.0, 14.0.1 - GNU Fortran: 12.3.0, 13.2.0, 14.0.1 - Julia 1.10.3 -- Node.js 20.13.1 +- Node.js 20.14.0 - Perl 5.38.2 - Python 3.12.3 - Ruby 3.2.3 ### Package Management - cpan 1.64 -- Helm 3.14.4 -- Homebrew 4.3.0 -- Miniconda 24.3.0 -- Npm 10.5.2 +- Helm 3.15.1 +- Homebrew 4.3.3 +- Miniconda 24.4.0 +- Npm 10.7.0 - Pip 24.0 - Pip3 24.0 - Pipx 1.4.3 - RubyGems 3.4.20 -- Vcpkg (build from commit 66a252f70) +- Vcpkg (build from commit 9760ce619) - Yarn 1.22.22 #### Environment variables @@ -54,43 +54,42 @@ to accomplish this. ### Project Management - Ant 1.10.14 -- Gradle 8.7 +- Gradle 8.8 - Lerna 8.1.3 - Maven 3.8.8 ### Tools -- Ansible 2.16.6 -- apt-fast 1.10.0 -- AzCopy 10.24.0 - available by `azcopy` and `azcopy10` aliases +- Ansible 2.16.7 +- AzCopy 10.25.0 - available by `azcopy` and `azcopy10` aliases - Bazel 7.1.2 - Bazelisk 1.19.0 - Bicep 0.27.1 - Buildah 1.33.7 -- CMake 3.29.3 -- CodeQL Action Bundle 2.17.2 +- CMake 3.29.4 +- CodeQL Action Bundle 2.17.3 - Docker Amazon ECR Credential Helper 0.8.0 -- Docker Compose v2 2.27.0 -- Docker-Buildx 0.14.0 +- Docker Compose v2 2.27.1 +- Docker-Buildx 0.14.1 - Docker Client 26.1.0 - Docker Server 26.1.0 - Fastlane 2.220.0 -- Git 2.45.1 +- Git 2.45.2 - Git LFS 3.5.1 - Git-ftp 1.6.0 - Haveged 1.9.14 - jq 1.7 - Kind 0.23.0 - Kubectl 1.30.1 -- Kustomize 5.4.1 +- Kustomize 5.4.2 - MediaInfo 24.01 - Mercurial 6.7.2 - Minikube 1.33.1 - n 9.2.3 - Newman 6.1.2 -- OpenSSL 3.0.13-0ubuntu3 +- OpenSSL 3.0.13-0ubuntu3.1 - Parcel 2.12.0 - Podman 4.9.3 -- Pulumi 3.116.1 +- Pulumi 3.118.0 - Skopeo 1.13.3 - Sphinx Open Source Search Server 2.2.11 - yamllint 1.35.1 @@ -98,12 +97,12 @@ to accomplish this. - zstd 1.5.6 ### CLI Tools -- AWS CLI 2.15.51 -- AWS CLI Session Manager Plugin 1.2.553.0 -- AWS SAM CLI 1.116.0 -- Azure CLI 2.60.0 +- AWS CLI 2.16.0 +- AWS CLI Session Manager Plugin 1.2.633.0 +- AWS SAM CLI 1.118.0 +- Azure CLI 2.61.0 - Azure CLI (azure-devops) 1.0.1 -- GitHub CLI 2.49.2 +- GitHub CLI 2.50.0 ### Java | Version | Environment Variable | @@ -137,8 +136,8 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 125.0.6422.60 -- ChromeDriver 125.0.6422.60 +- Google Chrome 125.0.6422.141 +- ChromeDriver 125.0.6422.141 - Chromium 125.0.6422.0 - Selenium server 4.21.0 @@ -151,8 +150,8 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | ### .NET Tools -- .NET Core SDK: 8.0.300 -- nbgv 3.6.133+2d32d93cb1 +- .NET Core SDK: 8.0.105 +- nbgv 3.6.139+a9e8765620 ### Databases - sqlite3 3.45.1 @@ -183,8 +182,8 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Node.js - 16.20.2 -- 18.20.2 -- 20.13.1 +- 18.20.3 +- 20.14.0 #### Python - 3.9.19 @@ -262,9 +261,10 @@ Use the following command as a part of your job to start the service: 'sudo syst | iproute2 | 6.1.0-1ubuntu6 | | iputils-ping | 3:20240117-1build1 | | jq | 1.7.1-3build1 | -| libssl-dev | 3.0.13-0ubuntu3 | +| libssl-dev | 3.0.13-0ubuntu3.1 | | libtool | 2.4.7-7build1 | -| locales | 2.39-0ubuntu8.1 | +| libyaml-dev | 0.2.5-1build1 | +| locales | 2.39-0ubuntu8.2 | | lz4 | 1.9.4-1build1 | | m4 | 1.4.19-4build1 | | make | 4.3-4.1build2 | @@ -295,6 +295,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | texinfo | 7.1-3build2 | | time | 1.9-0.2build1 | | tk | 8.6.14build1 | +| tree | 2.1.1-2ubuntu3 | | tzdata | 2024a-2ubuntu1 | | unzip | 6.0-28ubuntu4 | | upx | 4.2.2-3 | From 7992e7f1badb63f581dbf973a251abc76f0f963a Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Wed, 5 Jun 2024 12:27:31 +0200 Subject: [PATCH 2884/3485] [Ubuntu, Windows] Update Docker tools versions (#9982) Co-authored-by: Taleh Zaliyev <z.taleh007@ya.ru> --- images/ubuntu/toolsets/toolset-2004.json | 6 +++--- images/ubuntu/toolsets/toolset-2204.json | 8 ++++---- images/ubuntu/toolsets/toolset-2404.json | 6 +++--- images/windows/scripts/build/Install-DockerCompose.ps1 | 1 - images/windows/toolsets/toolset-2019.json | 6 +++--- images/windows/toolsets/toolset-2022.json | 6 +++--- 6 files changed, 16 insertions(+), 17 deletions(-) diff --git a/images/ubuntu/toolsets/toolset-2004.json b/images/ubuntu/toolsets/toolset-2004.json index 033ff8bc6f7f..947d673b8b60 100644 --- a/images/ubuntu/toolsets/toolset-2004.json +++ b/images/ubuntu/toolsets/toolset-2004.json @@ -233,11 +233,11 @@ }, { "package": "docker-ce-cli", - "version": "24.0.9" + "version": "26.1.3" }, { "package": "docker-ce", - "version": "24.0.9" + "version": "26.1.3" } ], "plugins": [ @@ -248,7 +248,7 @@ }, { "plugin": "compose", - "version": "2.23.3", + "version": "2.27.1", "asset": "linux-x86_64" } ] diff --git a/images/ubuntu/toolsets/toolset-2204.json b/images/ubuntu/toolsets/toolset-2204.json index 0862612b01ab..cea32ac5b4f5 100644 --- a/images/ubuntu/toolsets/toolset-2204.json +++ b/images/ubuntu/toolsets/toolset-2204.json @@ -232,11 +232,11 @@ }, { "package": "docker-ce-cli", - "version": "24.0.9" + "version": "26.1.3" }, { "package": "docker-ce", - "version": "24.0.9" + "version": "26.1.3" } ], "plugins": [ @@ -244,10 +244,10 @@ "plugin": "buildx", "version": "latest", "asset": "linux-amd64" - }, + }, { "plugin": "compose", - "version": "2.23.3", + "version": "2.27.1", "asset": "linux-x86_64" } ] diff --git a/images/ubuntu/toolsets/toolset-2404.json b/images/ubuntu/toolsets/toolset-2404.json index c8a023811b11..bd0cf3565caa 100644 --- a/images/ubuntu/toolsets/toolset-2404.json +++ b/images/ubuntu/toolsets/toolset-2404.json @@ -188,11 +188,11 @@ }, { "package": "docker-ce-cli", - "version": "26.1.0" + "version": "26.1.3" }, { "package": "docker-ce", - "version": "26.1.0" + "version": "26.1.3" } ], "plugins": [ @@ -203,7 +203,7 @@ }, { "plugin": "compose", - "version": "latest", + "version": "2.27.1", "asset": "linux-x86_64" } ] diff --git a/images/windows/scripts/build/Install-DockerCompose.ps1 b/images/windows/scripts/build/Install-DockerCompose.ps1 index dba8904a36b6..d53ed20047dc 100644 --- a/images/windows/scripts/build/Install-DockerCompose.ps1 +++ b/images/windows/scripts/build/Install-DockerCompose.ps1 @@ -17,7 +17,6 @@ Add-MachinePathItem $dockerComposev1Dir Update-Environment Write-Host "Install-Package Docker-Compose v2" -# Temporaty pinned to v2.23.3 due https://github.com/actions/runner-images/issues/9172 $toolsetVersion = (Get-ToolsetContent).docker.components.compose $composeVersion = (Get-GithubReleasesByVersion -Repo "docker/compose" -Version "${toolsetVersion}").version $dockerComposev2Url = "https://github.com/docker/compose/releases/download/v${composeVersion}/docker-compose-windows-x86_64.exe" diff --git a/images/windows/toolsets/toolset-2019.json b/images/windows/toolsets/toolset-2019.json index 77447cca0d8b..1c8bd715eaf6 100644 --- a/images/windows/toolsets/toolset-2019.json +++ b/images/windows/toolsets/toolset-2019.json @@ -369,9 +369,9 @@ "mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019" ], "components": { - "docker": "24.0.7", - "compose": "2.23.3" - } + "docker": "26.1.3", + "compose": "2.27.1" + } }, "pipx": [ { diff --git a/images/windows/toolsets/toolset-2022.json b/images/windows/toolsets/toolset-2022.json index 90c96cb362a0..6af096fe7536 100644 --- a/images/windows/toolsets/toolset-2022.json +++ b/images/windows/toolsets/toolset-2022.json @@ -121,7 +121,7 @@ "11.3.1" ], "zip_versions": [ - + ] } ], @@ -278,8 +278,8 @@ "mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022" ], "components": { - "docker": "24.0.7", - "compose": "2.23.3" + "docker": "26.1.3", + "compose": "2.27.1" } }, "pipx": [ From 28bc3aff6d1f3596a5f5ad5e9974bb8316297aa8 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 6 Jun 2024 10:44:46 +0000 Subject: [PATCH 2885/3485] Updating readme file for macos-13 version 20240603.1 (#9993) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-13-Readme.md | 52 ++++++++++++++++----------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/images/macos/macos-13-Readme.md b/images/macos/macos-13-Readme.md index b9a7ad4acb22..9eb4773a1ba8 100644 --- a/images/macos/macos-13-Readme.md +++ b/images/macos/macos-13-Readme.md @@ -1,12 +1,12 @@ # macOS 13 - OS Version: macOS 13.6.7 (22G720) - Kernel Version: Darwin 22.6.0 -- Image Version: 20240526.1 +- Image Version: 20240603.1 ## Installed Software ### Language and Runtime -- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.409, 8.0.101, 8.0.204, 8.0.300 +- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.410, 8.0.101, 8.0.204, 8.0.301 - Bash 3.2.57(1)-release - Clang/LLVM 14.0.0 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` @@ -18,42 +18,42 @@ - GNU Fortran 13 (Homebrew GCC 13.3.0) - available by `gfortran-13` alias - Kotlin 2.0.0-release-341 - Mono 6.12.0.188 -- Node.js 20.13.1 +- Node.js 20.14.0 - Perl 5.38.2 - PHP 8.3.7 - Python3 3.12.3 - Ruby 3.0.7p220 ### Package Management -- Bundler 2.5.10 +- Bundler 2.5.11 - Carthage 0.39.1 - CocoaPods 1.15.2 - Composer 2.7.6 -- Homebrew 4.3.1 -- NPM 10.5.2 +- Homebrew 4.3.3 +- NPM 10.7.0 - NuGet 6.3.1.1 - Pip3 24.0 (python 3.12) -- Pipx 1.5.0 -- RubyGems 3.5.10 -- Vcpkg 2024 (build from commit 01f602195) +- Pipx 1.6.0 +- RubyGems 3.5.11 +- Vcpkg 2024 (build from commit 67cc1677c) - Yarn 1.22.22 ### Project Management - Apache Ant 1.10.14 - Apache Maven 3.9.7 -- Gradle 8.7 +- Gradle 8.8 ### Utilities - 7-Zip 17.05 - aria2 1.37.0 -- azcopy 10.24.0 +- azcopy 10.25.0 - bazel 7.1.2 - bazelisk 1.20.0 - bsdtar 3.5.3 - available by 'tar' alias - Curl 8.8.0 -- Git 2.45.1 +- Git 2.45.2 - Git LFS 3.5.1 -- GitHub CLI 2.49.2 +- GitHub CLI 2.50.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.24.5 - gpg (GnuPG) 2.4.5 @@ -65,9 +65,9 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.15.58 -- AWS SAM CLI 1.117.0 -- AWS Session Manager CLI 1.2.553.0 +- AWS CLI 2.16.0 +- AWS SAM CLI 1.118.0 +- AWS Session Manager CLI 1.2.633.0 - Azure CLI 2.61.0 - Azure CLI (azure-devops) 1.0.1 - Bicep CLI 0.27.1 @@ -85,12 +85,12 @@ ### Browsers - Safari 17.5 (18618.2.12.111.5) - SafariDriver 17.5 (18618.2.12.111.5) -- Google Chrome 125.0.6422.113 -- Google Chrome for Testing 125.0.6422.78 -- ChromeDriver 125.0.6422.78 -- Microsoft Edge 125.0.2535.67 -- Microsoft Edge WebDriver 125.0.2535.67 -- Mozilla Firefox 126.0 +- Google Chrome 125.0.6422.142 +- Google Chrome for Testing 125.0.6422.141 +- ChromeDriver 125.0.6422.141 +- Microsoft Edge 125.0.2535.79 +- Microsoft Edge WebDriver 125.0.2535.79 +- Mozilla Firefox 126.0.1 - geckodriver 0.34.0 - Selenium server 4.21.0 @@ -120,7 +120,7 @@ #### Ruby - 3.0.7 -- 3.1.5 +- 3.1.6 #### Python - 3.8.18 @@ -132,7 +132,7 @@ #### Node.js - 16.20.2 - 18.20.3 -- 20.13.1 +- 20.14.0 #### Go - 1.20.14 @@ -201,8 +201,8 @@ | Simulator - watchOS 9.4 | watchsimulator9.4 | 14.3.1 | | Simulator - watchOS 10.0 | watchsimulator10.0 | 15.0.1 | | Simulator - watchOS 10.2 | watchsimulator10.2 | 15.1, 15.2 | -| visionOS 1.0 | xros1.0 | 15.2 | | Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | +| visionOS 1.0 | xros1.0 | 15.2 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | @@ -233,7 +233,7 @@ | Package Name | Version | | -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 11.0 | -| Android Emulator | 34.2.14 | +| Android Emulator | 34.2.15 | | Android SDK Build-tools | 34.0.0<br>33.0.2 33.0.3 | | Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | | Android SDK Platform-Tools | 35.0.1 | From 45651fd8663422ecb868abc0df3dbcf32b9cd229 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 6 Jun 2024 11:26:34 +0000 Subject: [PATCH 2886/3485] Updating readme file for macos-13-arm64 version 20240603.1 (#9992) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-13-arm64-Readme.md | 42 +++++++++++++-------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/images/macos/macos-13-arm64-Readme.md b/images/macos/macos-13-arm64-Readme.md index 606b07554c4e..82436dfcc89b 100644 --- a/images/macos/macos-13-arm64-Readme.md +++ b/images/macos/macos-13-arm64-Readme.md @@ -1,12 +1,12 @@ # macOS 13 - OS Version: macOS 13.6.7 (22G720) - Kernel Version: Darwin 22.6.0 -- Image Version: 20240524.2 +- Image Version: 20240603.1 ## Installed Software ### Language and Runtime -- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.409, 8.0.101, 8.0.204, 8.0.300 +- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.410, 8.0.101, 8.0.204, 8.0.301 - Bash 3.2.57(1)-release - Clang/LLVM 14.0.0 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` @@ -18,39 +18,39 @@ - GNU Fortran 13 (Homebrew GCC 13.3.0) - available by `gfortran-13` alias - Kotlin 2.0.0-release-341 - Mono 6.12.0.188 -- Node.js 20.13.1 +- Node.js 20.14.0 - Perl 5.38.2 - Python3 3.12.3 - Ruby 3.0.7p220 ### Package Management -- Bundler 2.5.10 +- Bundler 2.5.11 - Carthage 0.39.1 - CocoaPods 1.15.2 -- Homebrew 4.3.1 -- NPM 10.5.2 +- Homebrew 4.3.3 +- NPM 10.7.0 - NuGet 6.3.1.1 - Pip3 24.0 (python 3.12) -- Pipx 1.5.0 -- RubyGems 3.5.10 +- Pipx 1.6.0 +- RubyGems 3.5.11 - Yarn 1.22.22 ### Project Management - Apache Ant 1.10.14 -- Apache Maven 3.9.6 -- Gradle 8.7 +- Apache Maven 3.9.7 +- Gradle 8.8 ### Utilities - 7-Zip 17.05 - aria2 1.37.0 -- azcopy 10.24.0 +- azcopy 10.25.0 - bazel 7.1.2 - bazelisk 1.20.0 - bsdtar 3.5.3 - available by 'tar' alias - Curl 8.4.0 -- Git 2.45.1 +- Git 2.45.2 - Git LFS 3.5.1 -- GitHub CLI 2.49.2 +- GitHub CLI 2.50.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.24.5 - gpg (GnuPG) 2.4.5 @@ -62,9 +62,9 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.15.58 -- AWS SAM CLI 1.117.0 -- AWS Session Manager CLI 1.2.553.0 +- AWS CLI 2.16.0 +- AWS SAM CLI 1.118.0 +- AWS Session Manager CLI 1.2.633.0 - Azure CLI 2.61.0 - Azure CLI (azure-devops) 1.0.1 - Bicep CLI 0.27.1 @@ -81,9 +81,9 @@ ### Browsers - Safari 17.5 (18618.2.12.111.5) - SafariDriver 17.5 (18618.2.12.111.5) -- Google Chrome 125.0.6422.113 -- Google Chrome for Testing 125.0.6422.78 -- ChromeDriver 125.0.6422.78 +- Google Chrome 125.0.6422.142 +- Google Chrome for Testing 125.0.6422.141 +- ChromeDriver 125.0.6422.141 - Selenium server 4.21.0 #### Environment variables @@ -111,7 +111,7 @@ #### Node.js - 16.20.1 - 18.20.3 -- 20.13.1 +- 20.14.0 #### Go - 1.20.14 @@ -213,7 +213,7 @@ | Package Name | Version | | -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 11.0 | -| Android Emulator | 34.2.14 | +| Android Emulator | 34.2.15 | | Android SDK Build-tools | 34.0.0<br>33.0.2 33.0.3 | | Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | | Android SDK Platform-Tools | 35.0.1 | From c27adcfdbaa40e13a0378dc8a96391f5a67e390f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 6 Jun 2024 11:54:45 +0000 Subject: [PATCH 2887/3485] Updating readme file for win19 version 20240603.1.1 (#9989) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/windows/Windows2019-Readme.md | 49 ++++++++++++++-------------- 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/images/windows/Windows2019-Readme.md b/images/windows/Windows2019-Readme.md index 7ab993f68026..dda9e8d72165 100644 --- a/images/windows/Windows2019-Readme.md +++ b/images/windows/Windows2019-Readme.md @@ -4,7 +4,7 @@ *** # Windows Server 2019 - OS Version: 10.0.17763 Build 5830 -- Image Version: 20240526.1.0 +- Image Version: 20240603.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -33,7 +33,7 @@ - pip 24.0 (python 3.7) - Pipx 1.2.1 - RubyGems 3.2.33 -- Vcpkg (build from commit 01f602195) +- Vcpkg (build from commit 67cc1677c) - Yarn 1.22.22 #### Environment variables @@ -49,9 +49,9 @@ - sbt 1.10.0 ### Tools -- 7zip 24.05 +- 7zip 24.06 - aria2 1.37.0 -- azcopy 10.24.0 +- azcopy 10.25.0 - Bazel 7.1.2 - Bazelisk 1.19.0 - Bicep 0.27.1 @@ -63,9 +63,9 @@ - Docker Compose v2 2.23.3 - Docker-wincred 0.8.2 - ghc 9.10.1 -- Git 2.45.1.windows.1 +- Git 2.45.2.windows.1 - Git LFS 3.5.1 -- Google Cloud CLI 477.0.0 +- Google Cloud CLI 478.0.0 - ImageMagick 7.1.1-29 - InnoSetup 6.2.2 - jq 1.7.1 @@ -80,7 +80,7 @@ - OpenSSL 1.1.1w - Packer 1.10.3 - Parcel 2.12.0 -- Pulumi 3.117.0 +- Pulumi 3.118.0 - R 4.4.0 - Service Fabric SDK 9.1.1436.9590 - Stack 2.15.7 @@ -94,13 +94,13 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.207 -- AWS CLI 2.15.58 -- AWS SAM CLI 1.117.0 -- AWS Session Manager CLI 1.2.553.0 +- AWS CLI 2.15.62 +- AWS SAM CLI 1.118.0 +- AWS Session Manager CLI 1.2.633.0 - Azure CLI 2.61.0 - Azure DevOps CLI extension 1.0.1 - Cloud Foundry CLI 6.53.0 -- GitHub CLI 2.49.2 +- GitHub CLI 2.50.0 ### Rust Tools - Cargo 1.78.0 @@ -117,11 +117,11 @@ - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 125.0.6422.113 -- Chrome Driver 125.0.6422.78 -- Microsoft Edge 125.0.2535.67 -- Microsoft Edge Driver 125.0.2535.67 -- Mozilla Firefox 126.0 +- Google Chrome 125.0.6422.142 +- Chrome Driver 125.0.6422.141 +- Microsoft Edge 125.0.2535.79 +- Microsoft Edge Driver 125.0.2535.79 +- Mozilla Firefox 126.0.1 - Gecko Driver 0.34.0 - IE Driver 4.14.0.0 - Selenium server 4.21.0 @@ -172,7 +172,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Node.js - 16.20.2 - 18.20.3 -- 20.13.1 +- 20.14.0 #### Python - 3.7.9 @@ -192,7 +192,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Ruby - 3.0.7 -- 3.1.5 +- 3.1.6 ### Databases @@ -224,7 +224,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Name | Version | ConfigFile | ServiceName | ServiceStatus | ListenPort | | ------ | ------- | ------------------------------------- | ----------- | ------------- | ---------- | | Apache | 2.4.55 | C:\tools\Apache24\conf\httpd.conf | Apache | Stopped | 80 | -| Nginx | 1.25.5 | C:\tools\nginx-1.25.5\conf\nginx.conf | nginx | Stopped | 80 | +| Nginx | 1.27.0 | C:\tools\nginx-1.27.0\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2019 | Name | Version | Path | @@ -492,11 +492,11 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 10.0.22621.0 ### .NET Core Tools -- .NET Core SDK: 6.0.130, 6.0.203, 6.0.321, 6.0.422, 7.0.119, 7.0.203, 7.0.316, 7.0.409, 8.0.105, 8.0.205, 8.0.300 +- .NET Core SDK: 6.0.131, 6.0.203, 6.0.321, 6.0.423, 7.0.120, 7.0.203, 7.0.317, 7.0.410, 8.0.106, 8.0.206, 8.0.301 - .NET Framework: 4.7.2, 4.8 -- Microsoft.AspNetCore.App: 6.0.5, 6.0.26, 6.0.30, 7.0.5, 7.0.19, 8.0.5 -- Microsoft.NETCore.App: 6.0.5, 6.0.26, 6.0.30, 7.0.5, 7.0.19, 8.0.5 -- Microsoft.WindowsDesktop.App: 6.0.5, 6.0.26, 6.0.30, 7.0.5, 7.0.19, 8.0.5 +- Microsoft.AspNetCore.App: 6.0.5, 6.0.26, 6.0.31, 7.0.5, 7.0.20, 8.0.6 +- Microsoft.NETCore.App: 6.0.5, 6.0.26, 6.0.31, 7.0.5, 7.0.20, 8.0.6 +- Microsoft.WindowsDesktop.App: 6.0.5, 6.0.26, 6.0.31, 7.0.5, 7.0.20, 8.0.6 - nbgv 3.6.133+2d32d93cb1 ### PowerShell Tools @@ -508,7 +508,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - AzureRM: 2.1.0 (Default), 6.13.1 - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.587 +- AWSPowershell: 4.1.591 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 - Microsoft.Graph: 2.19.0 @@ -528,6 +528,7 @@ All other versions are saved but not installed. | Package Name | Version | | -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 8.0 | +| Android Emulator | 34.2.15 | | Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2 33.0.3<br>32.0.0<br>31.0.0<br>30.0.2 | | Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3) | | Android SDK Platform-Tools | 35.0.1 | From 8549372c4c63bdbc4ded88026adfa5bff0c93fcf Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 6 Jun 2024 12:48:23 +0000 Subject: [PATCH 2888/3485] Updating readme file for macos-14 version 20240603.1 (#9985) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-14-Readme.md | 54 ++++++++++++++++----------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/images/macos/macos-14-Readme.md b/images/macos/macos-14-Readme.md index b061f55f8fb1..3138c7713c14 100644 --- a/images/macos/macos-14-Readme.md +++ b/images/macos/macos-14-Readme.md @@ -1,12 +1,12 @@ # macOS 14 - OS Version: macOS 14.5 (23F79) - Kernel Version: Darwin 23.5.0 -- Image Version: 20240526.1 +- Image Version: 20240603.1 ## Installed Software ### Language and Runtime -- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.409, 8.0.101, 8.0.204, 8.0.300 +- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.410, 8.0.101, 8.0.204, 8.0.301 - Bash 3.2.57(1)-release - Clang/LLVM 14.0.3 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` @@ -18,41 +18,41 @@ - GNU Fortran 13 (Homebrew GCC 13.3.0) - available by `gfortran-13` alias - Kotlin 2.0.0-release-341 - Mono 6.12.0.188 -- Node.js 20.13.1 +- Node.js 20.14.0 - Perl 5.38.2 - PHP 8.3.7 - Python3 3.12.3 - Ruby 3.0.7p220 ### Package Management -- Bundler 2.5.10 +- Bundler 2.5.11 - Carthage 0.39.1 - CocoaPods 1.15.2 - Composer 2.7.6 -- Homebrew 4.3.1 -- NPM 10.5.2 +- Homebrew 4.3.3 +- NPM 10.7.0 - NuGet 6.3.1.1 - Pip3 24.0 (python 3.12) -- Pipx 1.5.0 -- RubyGems 3.5.10 +- Pipx 1.6.0 +- RubyGems 3.5.11 - Yarn 1.22.22 ### Project Management - Apache Ant 1.10.14 - Apache Maven 3.9.7 -- Gradle 8.7 +- Gradle 8.8 ### Utilities - 7-Zip 17.05 - aria2 1.37.0 -- azcopy 10.24.0 +- azcopy 10.25.0 - bazel 7.1.2 - bazelisk 1.20.0 - bsdtar 3.5.3 - available by 'tar' alias - Curl 8.8.0 -- Git 2.45.1 +- Git 2.45.2 - Git LFS 3.5.1 -- GitHub CLI 2.49.2 +- GitHub CLI 2.50.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.24.5 - gpg (GnuPG) 2.4.5 @@ -64,9 +64,9 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.15.58 -- AWS SAM CLI 1.117.0 -- AWS Session Manager CLI 1.2.553.0 +- AWS CLI 2.16.0 +- AWS SAM CLI 1.118.0 +- AWS Session Manager CLI 1.2.633.0 - Azure CLI 2.61.0 - Azure CLI (azure-devops) 1.0.1 - Bicep CLI 0.27.1 @@ -84,12 +84,12 @@ ### Browsers - Safari 17.5 (19618.2.12.11.6) - SafariDriver 17.5 (19618.2.12.11.6) -- Google Chrome 125.0.6422.113 -- Google Chrome for Testing 125.0.6422.78 -- ChromeDriver 125.0.6422.78 -- Microsoft Edge 125.0.2535.67 -- Microsoft Edge WebDriver 125.0.2535.67 -- Mozilla Firefox 126.0 +- Google Chrome 125.0.6422.142 +- Google Chrome for Testing 125.0.6422.141 +- ChromeDriver 125.0.6422.141 +- Microsoft Edge 125.0.2535.79 +- Microsoft Edge WebDriver 125.0.2535.79 +- Mozilla Firefox 126.0.1 - geckodriver 0.34.0 - Selenium server 4.21.0 @@ -112,7 +112,7 @@ #### Ruby - 3.0.7 -- 3.1.5 +- 3.1.6 #### Python - 3.9.19 @@ -122,7 +122,7 @@ #### Node.js - 18.20.3 -- 20.13.1 +- 20.14.0 #### Go - 1.20.14 @@ -195,15 +195,15 @@ | Simulator - watchOS 10.2 | watchsimulator10.2 | 15.1, 15.2 | | Simulator - watchOS 10.4 | watchsimulator10.4 | 15.3 | | Simulator - watchOS 10.5 | watchsimulator10.5 | 15.4 | -| visionOS 1.0 | xros1.0 | 15.2 | | Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | -| Simulator - visionOS 1.1 | xrsimulator1.1 | 15.3 | +| visionOS 1.0 | xros1.0 | 15.2 | | visionOS 1.1 | xros1.1 | 15.3 | +| Simulator - visionOS 1.1 | xrsimulator1.1 | 15.3 | | visionOS 1.2 | xros1.2 | 15.4 | | Simulator - visionOS 1.2 | xrsimulator1.2 | 15.4 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | -| Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | +| Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | | DriverKit 22.4 | driverkit22.4 | 14.3.1 | | DriverKit 23.0 | driverkit23.0 | 15.0.1 | | DriverKit 23.2 | driverkit23.2 | 15.1, 15.2 | @@ -233,7 +233,7 @@ | Package Name | Version | | -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 11.0 | -| Android Emulator | 34.2.14 | +| Android Emulator | 34.2.15 | | Android SDK Build-tools | 34.0.0<br>33.0.2 33.0.3 | | Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | | Android SDK Platform-Tools | 35.0.1 | From b3529d148e55a5d847e2a4242a196c5056e4746a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 6 Jun 2024 13:55:15 +0000 Subject: [PATCH 2889/3485] Updating readme file for ubuntu22 version 20240603.1.1 (#9988) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2204-Readme.md | 62 +++++++++++++++--------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/images/ubuntu/Ubuntu2204-Readme.md b/images/ubuntu/Ubuntu2204-Readme.md index bdabeeeaf8bb..0e55934d42a5 100644 --- a/images/ubuntu/Ubuntu2204-Readme.md +++ b/images/ubuntu/Ubuntu2204-Readme.md @@ -6,7 +6,7 @@ # Ubuntu 22.04 - OS Version: 22.04.4 LTS - Kernel Version: 6.5.0-1021-azure -- Image Version: 20240526.1.0 +- Image Version: 20240603.1.0 - Systemd version: 249.11-0ubuntu3.12 ## Installed Software @@ -32,15 +32,15 @@ ### Package Management - cpan 1.64 - Helm 3.15.1 -- Homebrew 4.3.1 +- Homebrew 4.3.3 - Miniconda 24.4.0 - Npm 10.7.0 - NuGet 6.6.1.2 - Pip 22.0.2 - Pip3 22.0.2 -- Pipx 1.5.0 +- Pipx 1.6.0 - RubyGems 3.3.5 -- Vcpkg (build from commit 01f602195) +- Vcpkg (build from commit 67cc1677c) - Yarn 1.22.22 #### Environment variables @@ -59,7 +59,7 @@ to accomplish this. ### Project Management - Ant 1.10.12 -- Gradle 8.7 +- Gradle 8.8 - Lerna 8.1.3 - Maven 3.8.8 - Sbt 1.10.0 @@ -67,12 +67,12 @@ to accomplish this. ### Tools - Ansible 2.16.7 - apt-fast 1.10.0 -- AzCopy 10.24.0 - available by `azcopy` and `azcopy10` aliases +- AzCopy 10.25.0 - available by `azcopy` and `azcopy10` aliases - Bazel 7.1.2 - Bazelisk 1.19.0 - Bicep 0.27.1 - Buildah 1.23.1 -- CMake 3.29.3 +- CMake 3.29.4 - CodeQL Action Bundle 2.17.3 - Docker Amazon ECR Credential Helper 0.8.0 - Docker Compose v1 1.29.2 @@ -81,7 +81,7 @@ to accomplish this. - Docker Client 24.0.9 - Docker Server 24.0.9 - Fastlane 2.220.0 -- Git 2.45.1 +- Git 2.45.2 - Git LFS 3.5.1 - Git-ftp 1.6.0 - Haveged 1.9.14 @@ -98,10 +98,10 @@ to accomplish this. - Newman 6.1.2 - nvm 0.39.7 - OpenSSL 3.0.2-0ubuntu1.15 -- Packer 1.10.3 +- Packer 1.11.0 - Parcel 2.12.0 - Podman 3.4.4 -- Pulumi 3.117.0 +- Pulumi 3.118.0 - R 4.4.0 - Skopeo 1.4.1 - Sphinx Open Source Search Server 2.2.11 @@ -113,17 +113,17 @@ to accomplish this. ### CLI Tools - Alibaba Cloud CLI 3.0.207 -- AWS CLI 2.15.58 -- AWS CLI Session Manager Plugin 1.2.553.0 -- AWS SAM CLI 1.117.0 +- AWS CLI 2.16.0 +- AWS CLI Session Manager Plugin 1.2.633.0 +- AWS SAM CLI 1.118.0 - Azure CLI 2.61.0 - Azure CLI (azure-devops) 1.0.1 -- GitHub CLI 2.49.2 -- Google Cloud CLI 477.0.0 -- Netlify CLI 17.23.8 -- OpenShift CLI 4.15.14 -- ORAS CLI 1.1.0 -- Vercel CLI 34.2.3 +- GitHub CLI 2.50.0 +- Google Cloud CLI 478.0.0 +- Netlify CLI 17.25.0 +- OpenShift CLI 4.15.15 +- ORAS CLI 1.2.0 +- Vercel CLI 34.2.4 ### Java | Version | Environment Variable | @@ -162,13 +162,13 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 125.0.6422.112 -- ChromeDriver 125.0.6422.78 +- Google Chrome 125.0.6422.141 +- ChromeDriver 125.0.6422.141 - Chromium 125.0.6422.0 -- Microsoft Edge 125.0.2535.67 -- Microsoft Edge WebDriver 125.0.2535.67 +- Microsoft Edge 125.0.2535.79 +- Microsoft Edge WebDriver 125.0.2535.79 - Selenium server 4.21.0 -- Mozilla Firefox 126.0 +- Mozilla Firefox 126.0.2 - Geckodriver 0.34.0 #### Environment variables @@ -180,7 +180,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | ### .NET Tools -- .NET Core SDK: 6.0.422, 7.0.409, 8.0.300 +- .NET Core SDK: 6.0.423, 7.0.410, 8.0.301 - nbgv 3.6.133+2d32d93cb1 ### Databases @@ -217,7 +217,7 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Node.js - 16.20.2 - 18.20.3 -- 20.13.1 +- 20.14.0 #### Python - 3.7.17 @@ -234,7 +234,7 @@ Use the following command as a part of your job to start the service: 'sudo syst - 3.10.14 [PyPy 7.3.16] #### Ruby -- 3.1.5 +- 3.1.6 ### PowerShell Tools - PowerShell 7.4.2 @@ -287,8 +287,8 @@ Use the following command as a part of your job to start the service: 'sudo syst | node:16-alpine | sha256:a1f9d027912b58a7c75be7716c97cfbc6d3099f3a97ed84aa490be9dee20e787 | 2023-08-10 | | node:18 | sha256:b08b1356559e2e9945f47ded630c9eb9d4e3ca04f111ab20d55652442cf14aee | 2024-05-21 | | node:18-alpine | sha256:5069da655539e2e986ce3fd1757f24a41b846958566c89ff4a48874434d73749 | 2024-05-22 | -| node:20 | sha256:d6925dc84f8c0d1c1f8df4ea6a9a54e57d430241cb734b1b0c45ed6d26e8e9c0 | 2024-05-14 | -| node:20-alpine | sha256:a7b980c958bfe4d84ee9263badd95a40c8bb50ad5afdb87902c187fefaef0e24 | 2024-05-22 | +| node:20 | sha256:ab71b9da5ba19445dc5bb76bf99c218941db2c4d70ff4de4e0d9ec90920bfe3f | 2024-05-28 | +| node:20-alpine | sha256:928b24aaadbd47c1a7722c563b471195ce54788bf8230ce807e1dd500aec0549 | 2024-05-28 | | ubuntu:20.04 | sha256:874aca52f79ae5f8258faff03e10ce99ae836f6e7d2df6ecd3da5c1cad3a912b | 2024-04-27 | | ubuntu:22.04 | sha256:a6d2b38300ce017add71440577d5b0a90460d0e57fd7aec21dd0d1b0761bbfb2 | 2024-04-27 | @@ -326,7 +326,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | lib32z1 | 1:1.2.11.dfsg-2ubuntu9.2 | | libc++-dev | 1:14.0-55\~exp2 | | libc++abi-dev | 1:14.0-55\~exp2 | -| libc6-dev | 2.35-0ubuntu3.7 | +| libc6-dev | 2.35-0ubuntu3.8 | | libcurl4 | 7.81.0-1ubuntu1.16 | | libgbm-dev | 23.2.1-1ubuntu3.1\~22.04.2 | | libgconf-2-4 | 3.2.6-7ubuntu2 | @@ -343,7 +343,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | libxkbfile-dev | 1:1.1.0-1build3 | | libxss1 | 1:1.2.3-1build2 | | libyaml-dev | 0.2.2-1build2 | -| locales | 2.35-0ubuntu3.7 | +| locales | 2.35-0ubuntu3.8 | | lz4 | 1.9.3-2build2 | | m4 | 1.4.18-5ubuntu2 | | make | 4.3-4.1build1 | From bbad0001302685ba4830368e05489252597617d1 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 6 Jun 2024 15:53:04 +0000 Subject: [PATCH 2890/3485] Updating readme file for ubuntu20 version 20240603.1.1 (#9987) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2004-Readme.md | 62 +++++++++++++++--------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/images/ubuntu/Ubuntu2004-Readme.md b/images/ubuntu/Ubuntu2004-Readme.md index 45175f1300c1..009cc1b52c17 100644 --- a/images/ubuntu/Ubuntu2004-Readme.md +++ b/images/ubuntu/Ubuntu2004-Readme.md @@ -6,7 +6,7 @@ # Ubuntu 20.04 - OS Version: 20.04.6 LTS - Kernel Version: 5.15.0-1064-azure -- Image Version: 20240526.1.0 +- Image Version: 20240603.1.0 - Systemd version: 245.4-4ubuntu3.23 ## Installed Software @@ -34,15 +34,15 @@ ### Package Management - cpan 1.64 - Helm 3.15.1 -- Homebrew 4.3.1 +- Homebrew 4.3.3 - Miniconda 24.4.0 - Npm 10.7.0 - NuGet 6.6.1.2 - Pip 20.0.2 - Pip3 20.0.2 -- Pipx 1.5.0 +- Pipx 1.6.0 - RubyGems 3.1.2 -- Vcpkg (build from commit 01f602195) +- Vcpkg (build from commit 67cc1677c) - Yarn 1.22.22 #### Environment variables @@ -61,7 +61,7 @@ to accomplish this. ### Project Management - Ant 1.10.7 -- Gradle 8.7 +- Gradle 8.8 - Lerna 8.1.3 - Maven 3.8.8 - Sbt 1.10.0 @@ -69,12 +69,12 @@ to accomplish this. ### Tools - Ansible 2.13.13 - apt-fast 1.10.0 -- AzCopy 10.24.0 - available by `azcopy` and `azcopy10` aliases +- AzCopy 10.25.0 - available by `azcopy` and `azcopy10` aliases - Bazel 7.1.2 - Bazelisk 1.19.0 - Bicep 0.27.1 - Buildah 1.22.3 -- CMake 3.29.3 +- CMake 3.29.4 - CodeQL Action Bundle 2.17.3 - Docker Amazon ECR Credential Helper 0.8.0 - Docker Compose v1 1.29.2 @@ -83,7 +83,7 @@ to accomplish this. - Docker Client 24.0.9 - Docker Server 24.0.9 - Fastlane 2.220.0 -- Git 2.45.1 +- Git 2.45.2 - Git LFS 3.5.1 - Git-ftp 1.6.0 - Haveged 1.9.1 @@ -101,11 +101,11 @@ to accomplish this. - Newman 6.1.2 - nvm 0.39.7 - OpenSSL 1.1.1f-1ubuntu2.22 -- Packer 1.10.3 +- Packer 1.11.0 - Parcel 2.12.0 - PhantomJS 2.1.1 2.1.1 - Podman 3.4.2 -- Pulumi 3.117.0 +- Pulumi 3.118.0 - R 4.4.0 - Skopeo 1.5.0 - Sphinx Open Source Search Server 2.2.11 @@ -117,17 +117,17 @@ to accomplish this. ### CLI Tools - Alibaba Cloud CLI 3.0.174 -- AWS CLI 2.15.58 -- AWS CLI Session Manager Plugin 1.2.553.0 -- AWS SAM CLI 1.117.0 +- AWS CLI 2.16.0 +- AWS CLI Session Manager Plugin 1.2.633.0 +- AWS SAM CLI 1.118.0 - Azure CLI 2.61.0 - Azure CLI (azure-devops) 1.0.1 -- GitHub CLI 2.49.2 -- Google Cloud CLI 477.0.0 -- Netlify CLI 17.23.8 -- OpenShift CLI 4.15.14 -- ORAS CLI 1.1.0 -- Vercel CLI 34.2.3 +- GitHub CLI 2.50.0 +- Google Cloud CLI 478.0.0 +- Netlify CLI 17.25.0 +- OpenShift CLI 4.15.15 +- ORAS CLI 1.2.0 +- Vercel CLI 34.2.4 ### Java | Version | Environment Variable | @@ -166,13 +166,13 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 125.0.6422.112 -- ChromeDriver 125.0.6422.78 +- Google Chrome 125.0.6422.141 +- ChromeDriver 125.0.6422.141 - Chromium 125.0.6422.0 -- Microsoft Edge 125.0.2535.67 -- Microsoft Edge WebDriver 125.0.2535.67 +- Microsoft Edge 125.0.2535.79 +- Microsoft Edge WebDriver 125.0.2535.79 - Selenium server 4.21.0 -- Mozilla Firefox 126.0 +- Mozilla Firefox 126.0.2 - Geckodriver 0.34.0 #### Environment variables @@ -184,7 +184,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | ### .NET Tools -- .NET Core SDK: 6.0.422, 7.0.409, 8.0.300 +- .NET Core SDK: 6.0.423, 7.0.410, 8.0.301 - nbgv 3.6.133+2d32d93cb1 ### Databases @@ -222,7 +222,7 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Node.js - 16.20.2 - 18.20.3 -- 20.13.1 +- 20.14.0 #### Python - 3.7.17 @@ -242,7 +242,7 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Ruby - 3.0.7 -- 3.1.5 +- 3.1.6 ### PowerShell Tools - PowerShell 7.4.2 @@ -297,8 +297,8 @@ Use the following command as a part of your job to start the service: 'sudo syst | node:16-alpine | sha256:a1f9d027912b58a7c75be7716c97cfbc6d3099f3a97ed84aa490be9dee20e787 | 2023-08-10 | | node:18 | sha256:b08b1356559e2e9945f47ded630c9eb9d4e3ca04f111ab20d55652442cf14aee | 2024-05-21 | | node:18-alpine | sha256:5069da655539e2e986ce3fd1757f24a41b846958566c89ff4a48874434d73749 | 2024-05-22 | -| node:20 | sha256:d6925dc84f8c0d1c1f8df4ea6a9a54e57d430241cb734b1b0c45ed6d26e8e9c0 | 2024-05-14 | -| node:20-alpine | sha256:a7b980c958bfe4d84ee9263badd95a40c8bb50ad5afdb87902c187fefaef0e24 | 2024-05-22 | +| node:20 | sha256:ab71b9da5ba19445dc5bb76bf99c218941db2c4d70ff4de4e0d9ec90920bfe3f | 2024-05-28 | +| node:20-alpine | sha256:928b24aaadbd47c1a7722c563b471195ce54788bf8230ce807e1dd500aec0549 | 2024-05-28 | | ubuntu:20.04 | sha256:874aca52f79ae5f8258faff03e10ce99ae836f6e7d2df6ecd3da5c1cad3a912b | 2024-04-27 | ### Installed apt packages @@ -335,7 +335,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | lib32z1 | 1:1.2.11.dfsg-2ubuntu1.5 | | libc++-dev | 1:10.0-50\~exp1 | | libc++abi-dev | 1:10.0-50\~exp1 | -| libc6-dev | 2.31-0ubuntu9.15 | +| libc6-dev | 2.31-0ubuntu9.16 | | libcurl4 | 7.68.0-1ubuntu2.22 | | libgbm-dev | 21.2.6-0ubuntu0.1\~20.04.2 | | libgconf-2-4 | 3.2.6-6ubuntu1 | @@ -351,7 +351,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | libxkbfile-dev | 1:1.1.0-1 | | libxss1 | 1:1.2.3-1 | | libyaml-dev | 0.2.2-1 | -| locales | 2.31-0ubuntu9.15 | +| locales | 2.31-0ubuntu9.16 | | m4 | 1.4.18-4 | | make | 4.2.1-1.2 | | mediainfo | 19.09-1build1 | From a615999e85d5b3f3853c691cd59fcfe89f0495ae Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 7 Jun 2024 05:54:53 +0000 Subject: [PATCH 2891/3485] Updating readme file for win22 version 20240603.1.1 (#9990) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/windows/Windows2022-Readme.md | 526 +++++++++++++-------------- 1 file changed, 263 insertions(+), 263 deletions(-) diff --git a/images/windows/Windows2022-Readme.md b/images/windows/Windows2022-Readme.md index e9bcd287821a..1979c7aa3179 100644 --- a/images/windows/Windows2022-Readme.md +++ b/images/windows/Windows2022-Readme.md @@ -1,11 +1,10 @@ | Announcements | |-| -| [[Windows-2022] Multiple VC Build Tools will be removed on May, 13](https://github.com/actions/runner-images/issues/9701) | | [[Ubuntu, Windows] Docker Compose v1 will be removed from images on July, 9](https://github.com/actions/runner-images/issues/9692) | *** # Windows Server 2022 - OS Version: 10.0.20348 Build 2461 -- Image Version: 20240514.3.0 +- Image Version: 20240603.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -16,9 +15,9 @@ - Bash 5.2.26(1)-release - Go 1.21.10 - Julia 1.10.3 -- Kotlin 1.9.24 +- Kotlin 2.0.0 - LLVM 16.0.6 -- Node 18.20.2 +- Node 18.20.3 - Perl 5.32.1 - PHP 8.3.7 - Python 3.9.13 @@ -27,14 +26,14 @@ ### Package Management - Chocolatey 2.2.2 - Composer 2.7.6 -- Helm 3.14.4 -- Miniconda 24.3.0 (pre-installed on the image but not added to PATH) -- NPM 10.5.0 -- NuGet 6.9.1.3 +- Helm 3.15.0 +- Miniconda 24.4.0 (pre-installed on the image but not added to PATH) +- NPM 10.7.0 +- NuGet 6.10.0.107 - pip 24.0 (python 3.9) -- Pipx 1.5.0 +- Pipx 1.6.0 - RubyGems 3.2.33 -- Vcpkg (build from commit bd2b54836) +- Vcpkg (build from commit 67cc1677c) - Yarn 1.22.22 #### Environment variables @@ -50,27 +49,27 @@ - sbt 1.10.0 ### Tools -- 7zip 23.01 +- 7zip 24.06 - aria2 1.37.0 -- azcopy 10.24.0 +- azcopy 10.25.0 - Bazel 7.1.2 - Bazelisk 1.19.0 - Bicep 0.27.1 - Cabal 3.10.3.0 - CMake 3.29.3 -- CodeQL Action Bundle 2.17.2 +- CodeQL Action Bundle 2.17.3 - Docker 24.0.7 - Docker Compose v1 1.29.2 - Docker Compose v2 2.23.3 -- Docker-wincred 0.8.1 +- Docker-wincred 0.8.2 - ghc 9.10.1 -- Git 2.45.1.windows.1 +- Git 2.45.2.windows.1 - Git LFS 3.5.1 - ImageMagick 7.1.1-29 - InnoSetup 6.2.2 - jq 1.7.1 - Kind 0.23.0 -- Kubectl 1.30.0 +- Kubectl 1.30.1 - Mercurial 5.0 - gcc 12.2.0 - gdb 11.2 @@ -78,8 +77,8 @@ - Newman 6.1.2 - NSIS 3.10 - OpenSSL 1.1.1w -- Packer 1.10.2 -- Pulumi 3.116.0 +- Packer 1.10.3 +- Pulumi 3.118.0 - R 4.4.0 - Service Fabric SDK 9.1.1436.9590 - Stack 2.15.7 @@ -92,13 +91,13 @@ - zstd 1.5.6 ### CLI Tools -- Alibaba Cloud CLI 3.0.205 -- AWS CLI 2.15.48 -- AWS SAM CLI 1.116.0 -- AWS Session Manager CLI 1.2.553.0 -- Azure CLI 2.60.0 -- Azure DevOps CLI extension 1.0.0 -- GitHub CLI 2.49.2 +- Alibaba Cloud CLI 3.0.207 +- AWS CLI 2.15.62 +- AWS SAM CLI 1.118.0 +- AWS Session Manager CLI 1.2.633.0 +- Azure CLI 2.61.0 +- Azure DevOps CLI extension 1.0.1 +- GitHub CLI 2.50.0 ### Rust Tools - Cargo 1.78.0 @@ -115,14 +114,14 @@ - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 124.0.6367.208 -- Chrome Driver 124.0.6367.207 -- Microsoft Edge 124.0.2478.97 -- Microsoft Edge Driver 124.0.2478.97 -- Mozilla Firefox 126.0 +- Google Chrome 125.0.6422.142 +- Chrome Driver 125.0.6422.141 +- Microsoft Edge 125.0.2535.79 +- Microsoft Edge Driver 125.0.2535.79 +- Mozilla Firefox 126.0.1 - Gecko Driver 0.34.0 - IE Driver 4.14.0.0 -- Selenium server 4.20.0 +- Selenium server 4.21.0 #### Environment variables | Name | Value | @@ -166,8 +165,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Node.js - 16.20.2 -- 18.20.2 -- 20.13.1 +- 18.20.3 +- 20.14.0 #### Python - 3.7.9 @@ -186,7 +185,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Ruby - 3.0.7 -- 3.1.5 +- 3.1.6 ### Databases @@ -208,7 +207,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | 5.0.26.0 | MongoDB | Stopped | Disabled | ### Database tools -- Azure CosmosDb Emulator 2.14.16.0 +- Azure CosmosDb Emulator 2.14.18.0 - DacFx 162.2.111.2 - MySQL 8.0.37.0 - SQL OLEDB Driver 18.6.7.0 @@ -218,72 +217,72 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Name | Version | ConfigFile | ServiceName | ServiceStatus | ListenPort | | ------ | ------- | ------------------------------------- | ----------- | ------------- | ---------- | | Apache | 2.4.55 | C:\tools\Apache24\conf\httpd.conf | Apache | Stopped | 80 | -| Nginx | 1.25.5 | C:\tools\nginx-1.25.5\conf\nginx.conf | nginx | Stopped | 80 | +| Nginx | 1.27.0 | C:\tools\nginx-1.27.0\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2022 -| Name | Version | Path | -| ----------------------------- | ------------- | -------------------------------------------------------- | -| Visual Studio Enterprise 2022 | 17.9.34902.65 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | +| Name | Version | Path | +| ----------------------------- | --------------- | -------------------------------------------------------- | +| Visual Studio Enterprise 2022 | 17.10.34928.147 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | #### Workloads, components and extensions | Package | Version | | ------------------------------------------------------------------------- | --------------- | -| android | 34.0.52.0 | -| Component.Android.Emulator.MDD | 17.9.34511.75 | -| Component.Android.NDK.R23C | 17.9.34511.75 | -| Component.Android.SDK.MAUI | 17.9.34511.75 | -| Component.Dotfuscator | 17.9.34511.75 | -| Component.HAXM.Private | 17.9.34511.75 | -| Component.Linux.CMake | 17.9.34511.75 | -| Component.Linux.RemoteFileExplorer | 17.9.34511.75 | -| Component.MDD.Android | 17.9.34511.75 | -| Component.MDD.Linux | 17.9.34511.75 | -| Component.MDD.Linux.GCC.arm | 17.9.34511.75 | -| Component.Microsoft.VisualStudio.LiveShare.2022 | 1.0.5898 | -| Component.Microsoft.VisualStudio.RazorExtension | 17.9.34511.75 | +| android | 34.0.95.0 | +| aspire | 8.0.24.25802 | +| Component.Android.NDK.R23C | 17.10.34803.213 | +| Component.Android.SDK.MAUI | 17.10.34803.213 | +| Component.Dotfuscator | 17.10.34803.213 | +| Component.Linux.CMake | 17.10.34803.213 | +| Component.Linux.RemoteFileExplorer | 17.10.34803.213 | +| Component.MDD.Android | 17.10.34803.213 | +| Component.MDD.Linux | 17.10.34803.213 | +| Component.MDD.Linux.GCC.arm | 17.10.34803.213 | +| Component.Microsoft.VisualStudio.LiveShare.2022 | 1.0.5919 | +| Component.Microsoft.VisualStudio.RazorExtension | 17.10.34803.213 | | Component.Microsoft.VisualStudio.Tools.Applications.amd64 | 17.0.33617.0 | -| Component.Microsoft.VisualStudio.Web.AzureFunctions | 17.9.34511.75 | -| Component.Microsoft.Web.LibraryManager | 17.9.34511.75 | -| Component.Microsoft.WebTools.BrowserLink.WebLivePreview | 17.9.2.55198 | +| Component.Microsoft.VisualStudio.Web.AzureFunctions | 17.10.34803.213 | +| Component.Microsoft.Web.LibraryManager | 17.10.34803.213 | +| Component.Microsoft.WebTools.BrowserLink.WebLivePreview | 17.10.8.65003 | | Component.Microsoft.Windows.DriverKit | 10.0.22621.0 | -| Component.OpenJDK | 17.9.34511.75 | -| Component.UnityEngine.x64 | 17.9.34511.75 | -| Component.Unreal | 17.9.34511.75 | -| Component.Unreal.Android | 17.9.34511.75 | -| Component.Unreal.Ide | 17.9.34511.75 | +| Component.OpenJDK | 17.10.34803.213 | +| Component.UnityEngine.x64 | 17.10.34803.213 | +| Component.Unreal | 17.10.34803.213 | +| Component.Unreal.Android | 17.10.34803.213 | +| Component.Unreal.Ide | 17.10.34803.213 | +| Component.VisualStudio.GitHub.Copilot | 0.2.889.30432 | | Component.VSInstallerProjects2022 | 2.0.1 | | Component.WixToolset.VisualStudioExtension.Dev17 | 1.0.0.22 | | Component.WixToolset.VisualStudioExtension.Schemas3 | 1.0.0.22 | -| Component.Xamarin | 17.9.34902.65 | -| Component.Xamarin.RemotedSimulator | 17.9.34511.75 | -| ios | 17.2.8004.0 | -| maccatalyst | 17.2.8004.0 | -| maui.blazor | 8.0.7.0 | -| maui.core | 8.0.7.0 | -| maui.windows | 8.0.7.0 | -| Microsoft.Component.Azure.DataLake.Tools | 17.9.34511.75 | -| Microsoft.Component.ClickOnce | 17.9.34511.75 | -| Microsoft.Component.CodeAnalysis.SDK | 17.9.34511.75 | -| Microsoft.Component.MSBuild | 17.9.34511.75 | -| Microsoft.Component.NetFX.Native | 17.9.34511.75 | -| Microsoft.Component.PythonTools | 17.9.34511.75 | -| Microsoft.Component.PythonTools.Web | 17.9.34511.75 | -| Microsoft.Component.VC.Runtime.UCRTSDK | 17.9.34511.75 | -| Microsoft.ComponentGroup.Blend | 17.9.34511.75 | -| Microsoft.ComponentGroup.ClickOnce.Publish | 17.9.34511.75 | -| Microsoft.Net.Component.4.5.2.TargetingPack | 17.9.34511.75 | -| Microsoft.Net.Component.4.6.2.TargetingPack | 17.9.34511.75 | -| Microsoft.Net.Component.4.6.TargetingPack | 17.9.34511.75 | -| Microsoft.Net.Component.4.7.1.TargetingPack | 17.9.34511.75 | -| Microsoft.Net.Component.4.7.2.TargetingPack | 17.9.34511.75 | -| Microsoft.Net.Component.4.7.TargetingPack | 17.9.34511.75 | -| Microsoft.Net.Component.4.8.1.SDK | 17.9.34511.75 | -| Microsoft.Net.Component.4.8.1.TargetingPack | 17.9.34511.75 | -| Microsoft.Net.Component.4.8.SDK | 17.9.34511.75 | -| Microsoft.Net.Component.4.8.TargetingPack | 17.9.34511.75 | -| Microsoft.Net.ComponentGroup.4.8.DeveloperTools | 17.9.34511.75 | -| Microsoft.Net.ComponentGroup.DevelopmentPrerequisites | 17.9.34511.75 | -| Microsoft.Net.ComponentGroup.TargetingPacks.Common | 17.9.34511.75 | +| Component.Xamarin | 17.10.34824.239 | +| Component.Xamarin.RemotedSimulator | 17.10.34803.213 | +| ios | 17.2.8053.0 | +| maccatalyst | 17.2.8053.0 | +| maui.blazor | 8.0.21.0 | +| maui.core | 8.0.21.0 | +| maui.windows | 8.0.21.0 | +| Microsoft.Component.Azure.DataLake.Tools | 17.10.34803.213 | +| Microsoft.Component.ClickOnce | 17.10.34803.213 | +| Microsoft.Component.CodeAnalysis.SDK | 17.10.34803.213 | +| Microsoft.Component.MSBuild | 17.10.34803.213 | +| Microsoft.Component.NetFX.Native | 17.10.34803.213 | +| Microsoft.Component.PythonTools | 17.10.34803.213 | +| Microsoft.Component.PythonTools.Web | 17.10.34803.213 | +| Microsoft.Component.VC.Runtime.UCRTSDK | 17.10.34803.213 | +| Microsoft.ComponentGroup.Blend | 17.10.34803.213 | +| Microsoft.ComponentGroup.ClickOnce.Publish | 17.10.34803.213 | +| Microsoft.Net.Component.4.5.2.TargetingPack | 17.10.34803.213 | +| Microsoft.Net.Component.4.6.2.TargetingPack | 17.10.34803.213 | +| Microsoft.Net.Component.4.6.TargetingPack | 17.10.34803.213 | +| Microsoft.Net.Component.4.7.1.TargetingPack | 17.10.34803.213 | +| Microsoft.Net.Component.4.7.2.TargetingPack | 17.10.34803.213 | +| Microsoft.Net.Component.4.7.TargetingPack | 17.10.34803.213 | +| Microsoft.Net.Component.4.8.1.SDK | 17.10.34803.213 | +| Microsoft.Net.Component.4.8.1.TargetingPack | 17.10.34803.213 | +| Microsoft.Net.Component.4.8.SDK | 17.10.34803.213 | +| Microsoft.Net.Component.4.8.TargetingPack | 17.10.34803.213 | +| Microsoft.Net.ComponentGroup.4.8.DeveloperTools | 17.10.34803.213 | +| Microsoft.Net.ComponentGroup.DevelopmentPrerequisites | 17.10.34803.213 | +| Microsoft.Net.ComponentGroup.TargetingPacks.Common | 17.10.34803.213 | | microsoft.net.runtime.android | 8.0.524.21615 | | microsoft.net.runtime.android.aot | 8.0.524.21615 | | microsoft.net.runtime.android.aot.net7 | 8.0.524.21615 | @@ -295,164 +294,165 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | microsoft.net.runtime.mono.tooling | 8.0.524.21615 | | microsoft.net.runtime.mono.tooling.net7 | 8.0.524.21615 | | microsoft.net.sdk.emscripten | 8.0.10.21103 | -| Microsoft.NetCore.Component.DevelopmentTools | 17.9.34511.75 | -| Microsoft.NetCore.Component.Runtime.8.0 | 17.9.34902.65 | -| Microsoft.NetCore.Component.SDK | 17.9.34902.65 | -| Microsoft.NetCore.Component.Web | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.AppInsights.Tools | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.AspNet | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.AspNet45 | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.Azure.AuthoringTools | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.Azure.ClientLibs | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.Azure.Compute.Emulator | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.Azure.Powershell | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.Azure.ResourceManager.Tools | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.Azure.ServiceFabric.Tools | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.Azure.Waverton | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.Azure.Waverton.BuildTools | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.ClassDesigner | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.CodeMap | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.Common.Azure.Tools | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.CoreEditor | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.CppBuildInsights | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.Debugger.JustInTime | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.Debugger.Snapshot | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.DiagnosticTools | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.DockerTools | 17.9.34518.88 | -| Microsoft.VisualStudio.Component.DotNetModelBuilder | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.DslTools | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.Embedded | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.EntityFramework | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.FSharp | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.FSharp.Desktop | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.FSharp.WebTemplates | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.GraphDocument | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.Graphics | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.Graphics.Tools | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.HLSL | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.IISExpress | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.IntelliCode | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.IntelliTrace.FrontEnd | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.JavaScript.Diagnostics | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.JavaScript.TypeScript | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.LinqToSql | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.LiveUnitTesting | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.ManagedDesktop.Core | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.ManagedDesktop.Prerequisites | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.Merq | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.MonoDebugger | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.MSODBC.SQL | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.MSSQL.CMDLnUtils | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.Node.Tools | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.NuGet | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.NuGet.BuildTools | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.PortableLibrary | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.Roslyn.Compiler | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.Roslyn.LanguageServices | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.SecurityIssueAnalysis | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.Sharepoint.Tools | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.SQL.CLR | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.SQL.DataSources | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.SQL.LocalDB.Runtime | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.SQL.SSDT | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.TeamOffice | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.TestTools.CodedUITest | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.TestTools.WebLoadTest | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.TextTemplating | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.TypeScript.TSServer | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.Unity | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.UWP.VC.ARM64 | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.UWP.VC.ARM64EC | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM64 | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.ASAN | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.ATL | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.ATL.ARM | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.ATL.ARM.Spectre | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.ATL.ARM64 | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.ATL.ARM64.Spectre | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.ATL.Spectre | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.ATLMFC | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.ATLMFC.Spectre | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.CLI.Support | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.CMake.Project | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.CoreIde | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.DiagnosticTools | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.Llvm.Clang | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.Llvm.ClangToolset | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.MFC.ARM | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.MFC.ARM.Spectre | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.MFC.ARM64 | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.MFC.ARM64.Spectre | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.Modules.x86.x64 | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.Redist.14.Latest | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.Redist.MSM | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.Runtimes.ARM.Spectre | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.Runtimes.ARM64.Spectre | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.Runtimes.ARM64EC.Spectre | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.Runtimes.x86.x64.Spectre | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.TestAdapterForBoostTest | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.TestAdapterForGoogleTest | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.Tools.ARM | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.Tools.ARM64 | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.Tools.ARM64EC | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VC.Tools.x86.x64 | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.Vcpkg | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.VSSDK | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.Wcf.Tooling | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.Web | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.WebDeploy | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.Windows10SDK | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.Windows10SDK.19041 | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.Windows10SDK.20348 | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.Windows11SDK.22000 | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.Windows11SDK.22621 | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.Windows11Sdk.WindowsPerformanceToolkit | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.Workflow | 17.9.34511.75 | -| Microsoft.VisualStudio.Component.WslDebugging | 17.9.34511.75 | -| Microsoft.VisualStudio.ComponentGroup.ArchitectureTools.Native | 17.9.34511.75 | -| Microsoft.VisualStudio.ComponentGroup.Azure.CloudServices | 17.9.34511.75 | -| Microsoft.VisualStudio.ComponentGroup.Azure.Prerequisites | 17.9.34511.75 | -| Microsoft.VisualStudio.ComponentGroup.Azure.ResourceManager.Tools | 17.9.34511.75 | -| Microsoft.VisualStudio.ComponentGroup.AzureFunctions | 17.9.34511.75 | -| Microsoft.VisualStudio.ComponentGroup.Maui.All | 17.9.34511.75 | -| Microsoft.VisualStudio.ComponentGroup.Maui.Android | 17.9.34511.75 | -| Microsoft.VisualStudio.ComponentGroup.Maui.Blazor | 17.9.34511.75 | -| Microsoft.VisualStudio.ComponentGroup.Maui.iOS | 17.9.34511.75 | -| Microsoft.VisualStudio.ComponentGroup.Maui.MacCatalyst | 17.9.34511.75 | -| Microsoft.VisualStudio.ComponentGroup.Maui.Shared | 17.9.34511.75 | -| Microsoft.VisualStudio.ComponentGroup.Maui.Windows | 17.9.34511.75 | -| Microsoft.VisualStudio.ComponentGroup.MSIX.Packaging | 17.9.34511.75 | -| Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core | 17.9.34511.75 | -| Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Llvm.Clang | 17.9.34511.75 | -| Microsoft.VisualStudio.ComponentGroup.UWP.NetCoreAndStandard | 17.9.34511.75 | -| Microsoft.VisualStudio.ComponentGroup.UWP.Support | 17.9.34511.75 | -| Microsoft.VisualStudio.ComponentGroup.UWP.VC.v142 | 17.9.34511.75 | -| Microsoft.VisualStudio.ComponentGroup.UWP.Xamarin | 17.9.34511.75 | -| Microsoft.VisualStudio.ComponentGroup.VC.Tools.142.x86.x64 | 17.9.34511.75 | -| Microsoft.VisualStudio.ComponentGroup.VisualStudioExtension.Prerequisites | 17.9.34511.75 | -| Microsoft.VisualStudio.ComponentGroup.Web | 17.9.34511.75 | -| Microsoft.VisualStudio.ComponentGroup.Web.CloudTools | 17.9.34511.75 | -| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions | 17.9.34511.75 | -| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.CMake | 17.9.34511.75 | -| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.TemplateEngine | 17.9.34511.75 | -| Microsoft.VisualStudio.Workload.Azure | 17.9.34511.75 | -| Microsoft.VisualStudio.Workload.CoreEditor | 17.9.34511.75 | -| Microsoft.VisualStudio.Workload.Data | 17.9.34511.75 | -| Microsoft.VisualStudio.Workload.DataScience | 17.9.34511.75 | -| Microsoft.VisualStudio.Workload.ManagedDesktop | 17.9.34511.75 | -| Microsoft.VisualStudio.Workload.ManagedGame | 17.9.34511.75 | -| Microsoft.VisualStudio.Workload.NativeCrossPlat | 17.9.34511.75 | -| Microsoft.VisualStudio.Workload.NativeDesktop | 17.9.34511.75 | -| Microsoft.VisualStudio.Workload.NativeGame | 17.9.34511.75 | -| Microsoft.VisualStudio.Workload.NativeMobile | 17.9.34511.75 | -| Microsoft.VisualStudio.Workload.NetCrossPlat | 17.9.34511.75 | -| Microsoft.VisualStudio.Workload.NetWeb | 17.9.34606.255 | -| Microsoft.VisualStudio.Workload.Node | 17.9.34511.75 | -| Microsoft.VisualStudio.Workload.Office | 17.9.34511.75 | -| Microsoft.VisualStudio.Workload.Python | 17.9.34511.75 | -| Microsoft.VisualStudio.Workload.Universal | 17.9.34511.75 | -| Microsoft.VisualStudio.Workload.VisualStudioExtension | 17.9.34511.75 | +| Microsoft.NetCore.Component.DevelopmentTools | 17.10.34803.213 | +| Microsoft.NetCore.Component.Runtime.6.0 | 17.10.34910.118 | +| Microsoft.NetCore.Component.Runtime.8.0 | 17.10.34910.118 | +| Microsoft.NetCore.Component.SDK | 17.10.34910.118 | +| Microsoft.NetCore.Component.Web | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.AppInsights.Tools | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.AspNet | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.AspNet45 | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.Azure.AuthoringTools | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.Azure.ClientLibs | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.Azure.Compute.Emulator | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.Azure.Powershell | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.Azure.ResourceManager.Tools | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.Azure.ServiceFabric.Tools | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.Azure.Waverton | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.Azure.Waverton.BuildTools | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.ClassDesigner | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.CodeMap | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.Common.Azure.Tools | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.CoreEditor | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.CppBuildInsights | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.Debugger.JustInTime | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.Debugger.Snapshot | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.DiagnosticTools | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.DockerTools | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.DotNetModelBuilder | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.DslTools | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.Embedded | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.EntityFramework | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.FSharp | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.FSharp.Desktop | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.FSharp.WebTemplates | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.GraphDocument | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.Graphics | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.Graphics.Tools | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.HLSL | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.IISExpress | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.IntelliCode | 17.10.34817.167 | +| Microsoft.VisualStudio.Component.IntelliTrace.FrontEnd | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.JavaScript.Diagnostics | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.JavaScript.TypeScript | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.LinqToSql | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.LiveUnitTesting | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.ManagedDesktop.Core | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.ManagedDesktop.Prerequisites | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.Merq | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.MonoDebugger | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.MSODBC.SQL | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.MSSQL.CMDLnUtils | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.Node.Tools | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.NuGet | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.NuGet.BuildTools | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.PortableLibrary | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.Roslyn.Compiler | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.Roslyn.LanguageServices | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.SecurityIssueAnalysis | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.Sharepoint.Tools | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.SQL.CLR | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.SQL.DataSources | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.SQL.LocalDB.Runtime | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.SQL.SSDT | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.TeamOffice | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.TestTools.CodedUITest | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.TestTools.WebLoadTest | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.TextTemplating | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.TypeScript.TSServer | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.Unity | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.UWP.VC.ARM64 | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.UWP.VC.ARM64EC | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM64 | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.VC.ASAN | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.VC.ATL | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.VC.ATL.ARM | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.VC.ATL.ARM.Spectre | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.VC.ATL.ARM64 | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.VC.ATL.ARM64.Spectre | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.VC.ATL.Spectre | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.VC.ATLMFC | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.VC.ATLMFC.Spectre | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.VC.CLI.Support | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.VC.CMake.Project | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.VC.CoreIde | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.VC.DiagnosticTools | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.VC.Llvm.Clang | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.VC.Llvm.ClangToolset | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.VC.MFC.ARM | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.VC.MFC.ARM.Spectre | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.VC.MFC.ARM64 | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.VC.MFC.ARM64.Spectre | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.VC.Modules.x86.x64 | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.VC.Redist.14.Latest | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.VC.Redist.MSM | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.VC.Runtimes.ARM.Spectre | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.VC.Runtimes.ARM64.Spectre | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.VC.Runtimes.ARM64EC.Spectre | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.VC.Runtimes.x86.x64.Spectre | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.VC.TestAdapterForBoostTest | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.VC.TestAdapterForGoogleTest | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.VC.Tools.ARM | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.VC.Tools.ARM64 | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.VC.Tools.ARM64EC | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.VC.Tools.x86.x64 | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.Vcpkg | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.VSSDK | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.Wcf.Tooling | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.Web | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.WebDeploy | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.Windows10SDK | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.Windows10SDK.19041 | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.Windows10SDK.20348 | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.Windows11SDK.22000 | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.Windows11SDK.22621 | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.Windows11Sdk.WindowsPerformanceToolkit | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.Workflow | 17.10.34803.213 | +| Microsoft.VisualStudio.Component.WslDebugging | 17.10.34803.213 | +| Microsoft.VisualStudio.ComponentGroup.ArchitectureTools.Native | 17.10.34803.213 | +| Microsoft.VisualStudio.ComponentGroup.Azure.CloudServices | 17.10.34803.213 | +| Microsoft.VisualStudio.ComponentGroup.Azure.Prerequisites | 17.10.34803.213 | +| Microsoft.VisualStudio.ComponentGroup.Azure.ResourceManager.Tools | 17.10.34803.213 | +| Microsoft.VisualStudio.ComponentGroup.AzureFunctions | 17.10.34803.213 | +| Microsoft.VisualStudio.ComponentGroup.Maui.All | 17.10.34803.213 | +| Microsoft.VisualStudio.ComponentGroup.Maui.Android | 17.10.34803.213 | +| Microsoft.VisualStudio.ComponentGroup.Maui.Blazor | 17.10.34803.213 | +| Microsoft.VisualStudio.ComponentGroup.Maui.iOS | 17.10.34803.213 | +| Microsoft.VisualStudio.ComponentGroup.Maui.MacCatalyst | 17.10.34803.213 | +| Microsoft.VisualStudio.ComponentGroup.Maui.Shared | 17.10.34803.213 | +| Microsoft.VisualStudio.ComponentGroup.Maui.Windows | 17.10.34803.213 | +| Microsoft.VisualStudio.ComponentGroup.MSIX.Packaging | 17.10.34803.213 | +| Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core | 17.10.34803.213 | +| Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Llvm.Clang | 17.10.34803.213 | +| Microsoft.VisualStudio.ComponentGroup.UWP.NetCoreAndStandard | 17.10.34803.213 | +| Microsoft.VisualStudio.ComponentGroup.UWP.VC.v142 | 17.10.34803.213 | +| Microsoft.VisualStudio.ComponentGroup.VC.Tools.142.x86.x64 | 17.10.34803.213 | +| Microsoft.VisualStudio.ComponentGroup.VisualStudioExtension.Prerequisites | 17.10.34803.213 | +| Microsoft.VisualStudio.ComponentGroup.Web | 17.10.34803.213 | +| Microsoft.VisualStudio.ComponentGroup.Web.CloudTools | 17.10.34803.213 | +| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions | 17.10.34803.213 | +| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.CMake | 17.10.34803.213 | +| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.TemplateEngine | 17.10.34803.213 | +| Microsoft.VisualStudio.ComponentGroup.WindowsAppDevelopment.Prerequisites | 17.10.34818.143 | +| Microsoft.VisualStudio.ComponentGroup.WindowsAppSDK.Cs | 17.10.34803.213 | +| Microsoft.VisualStudio.Workload.Azure | 17.10.34803.213 | +| Microsoft.VisualStudio.Workload.CoreEditor | 17.10.34803.213 | +| Microsoft.VisualStudio.Workload.Data | 17.10.34803.213 | +| Microsoft.VisualStudio.Workload.DataScience | 17.10.34803.213 | +| Microsoft.VisualStudio.Workload.ManagedDesktop | 17.10.34803.213 | +| Microsoft.VisualStudio.Workload.ManagedGame | 17.10.34803.213 | +| Microsoft.VisualStudio.Workload.NativeCrossPlat | 17.10.34803.213 | +| Microsoft.VisualStudio.Workload.NativeDesktop | 17.10.34803.213 | +| Microsoft.VisualStudio.Workload.NativeGame | 17.10.34803.213 | +| Microsoft.VisualStudio.Workload.NativeMobile | 17.10.34803.213 | +| Microsoft.VisualStudio.Workload.NetCrossPlat | 17.10.34803.213 | +| Microsoft.VisualStudio.Workload.NetWeb | 17.10.34803.213 | +| Microsoft.VisualStudio.Workload.Node | 17.10.34803.213 | +| Microsoft.VisualStudio.Workload.Office | 17.10.34803.213 | +| Microsoft.VisualStudio.Workload.Python | 17.10.34803.213 | +| Microsoft.VisualStudio.Workload.Universal | 17.10.34818.143 | +| Microsoft.VisualStudio.Workload.VisualStudioExtension | 17.10.34803.213 | | runtimes.ios | 8.0.524.21615 | | runtimes.ios.net7 | 8.0.524.21615 | | runtimes.maccatalyst | 8.0.524.21615 | @@ -472,12 +472,12 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | -------------------------------------------- | ------------ | ----------- | | Microsoft Visual C++ 2013 Additional Runtime | x64 | 12.0.40660 | | Microsoft Visual C++ 2013 Minimum Runtime | x64 | 12.0.40660 | -| Microsoft Visual C++ 2022 Additional Runtime | x64 | 14.38.33135 | -| Microsoft Visual C++ 2022 Debug Runtime | x64 | 14.38.33135 | -| Microsoft Visual C++ 2022 Minimum Runtime | x64 | 14.38.33135 | -| Microsoft Visual C++ 2022 Additional Runtime | x86 | 14.38.33135 | -| Microsoft Visual C++ 2022 Debug Runtime | x86 | 14.38.33135 | -| Microsoft Visual C++ 2022 Minimum Runtime | x86 | 14.38.33135 | +| Microsoft Visual C++ 2022 Additional Runtime | x64 | 14.40.33810 | +| Microsoft Visual C++ 2022 Debug Runtime | x64 | 14.40.33810 | +| Microsoft Visual C++ 2022 Minimum Runtime | x64 | 14.40.33810 | +| Microsoft Visual C++ 2022 Additional Runtime | x86 | 14.40.33810 | +| Microsoft Visual C++ 2022 Debug Runtime | x86 | 14.40.33810 | +| Microsoft Visual C++ 2022 Minimum Runtime | x86 | 14.40.33810 | #### Installed Windows SDKs - 10.0.17763.0 @@ -487,11 +487,11 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 10.0.22621.0 ### .NET Core Tools -- .NET Core SDK: 6.0.130, 6.0.203, 6.0.321, 6.0.422, 7.0.119, 7.0.203, 7.0.316, 7.0.409, 8.0.205 +- .NET Core SDK: 6.0.131, 6.0.203, 6.0.321, 6.0.423, 7.0.120, 7.0.203, 7.0.317, 7.0.410, 8.0.300 - .NET Framework: 4.8, 4.8.1 -- Microsoft.AspNetCore.App: 6.0.5, 6.0.26, 6.0.29, 6.0.30, 7.0.5, 7.0.19, 8.0.5 -- Microsoft.NETCore.App: 6.0.5, 6.0.26, 6.0.29, 6.0.30, 7.0.5, 7.0.19, 8.0.5 -- Microsoft.WindowsDesktop.App: 6.0.5, 6.0.26, 6.0.30, 7.0.5, 7.0.19, 8.0.5 +- Microsoft.AspNetCore.App: 6.0.5, 6.0.26, 6.0.29, 6.0.30, 6.0.31, 7.0.5, 7.0.20, 8.0.5 +- Microsoft.NETCore.App: 6.0.5, 6.0.26, 6.0.29, 6.0.30, 6.0.31, 7.0.5, 7.0.20, 8.0.5 +- Microsoft.WindowsDesktop.App: 6.0.5, 6.0.26, 6.0.30, 6.0.31, 7.0.5, 7.0.20, 8.0.5 - nbgv 3.6.133+2d32d93cb1 ### PowerShell Tools @@ -503,7 +503,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - AzureRM: 2.1.0 (Default), 6.13.1 - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.578 +- AWSPowershell: 4.1.591 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.9 - Microsoft.Graph: 2.19.0 @@ -523,7 +523,7 @@ All other versions are saved but not installed. | Package Name | Version | | -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 8.0 | -| Android Emulator | 31.2.9 | +| Android Emulator | 34.2.15 | | Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2 33.0.3<br>32.0.0<br>31.0.0 | | Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1) | | Android SDK Platform-Tools | 35.0.1 | @@ -546,9 +546,9 @@ All other versions are saved but not installed. ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2022 | sha256:9463c19c08f8855d5520f488e858f9c0ca832c04740ab1a3e204c9fbfab4581b | 2024-04-09 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2022 | sha256:b732b5349aa99af46c02c2cc25e162d083cbe62f455875b35d5c3053c1cd75ce | 2024-04-09 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:51c056c03b12aa8004e6d7909e5bdf7b699502d89fc8fc861edbbbcd78cf16bd | 2024-04-09 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2022 | sha256:e9aa4e7571b3914a5a0c07c934ad572ef055123df705586ab5803ea3bf83453a | 2024-05-14 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2022 | sha256:785e4d87bc1e179a968a293c0c0fadf7f3a4400d970ec01062431d80c7f7a97f | 2024-05-14 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:0ae307b6ad9ff16ecf2ea15da2ba0f60f6163281193241b9cc308fbc05f01e9d | 2024-05-21 | | mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:ac6a7571d5a404398e2f734d92f9b8f580a4fe1e6ae1820a61c5f138b1bdeff3 | 2024-05-10 | | mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:45952938708fbde6ec0b5b94de68bcdec3f8c838be018536b1e9e5bd95e6b943 | 2024-05-10 | From 2a8403091c994d6b63e292facecd23b7212c6ccb Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Fri, 7 Jun 2024 11:28:25 +0200 Subject: [PATCH 2892/3485] [Ubuntu] Display APT sources on 24 properly (#10006) --- images/ubuntu/scripts/build/configure-apt.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/images/ubuntu/scripts/build/configure-apt.sh b/images/ubuntu/scripts/build/configure-apt.sh index b36e4762b7b9..c75bcc3bdec4 100644 --- a/images/ubuntu/scripts/build/configure-apt.sh +++ b/images/ubuntu/scripts/build/configure-apt.sh @@ -38,7 +38,11 @@ EOF apt-get purge unattended-upgrades echo 'APT sources' -cat /etc/apt/sources.list +if ! is_ubuntu24; then + cat /etc/apt/sources.list +else + cat /etc/apt/sources.list.d/ubuntu.sources +fi apt-get update # Install jq From 71714d51d33f834dfcafc8dbed0bf886f8a3b3d2 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 7 Jun 2024 11:05:31 +0000 Subject: [PATCH 2893/3485] Updating readme file for macos-12 version 20240602.1 (#9994) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-12-Readme.md | 48 ++++++++++++++++----------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/images/macos/macos-12-Readme.md b/images/macos/macos-12-Readme.md index f1c811f2bc08..25e4df42be43 100644 --- a/images/macos/macos-12-Readme.md +++ b/images/macos/macos-12-Readme.md @@ -1,12 +1,12 @@ # macOS 12 - OS Version: macOS 12.7.5 (21H1222) - Kernel Version: Darwin 21.6.0 -- Image Version: 20240527.4 +- Image Version: 20240602.1 ## Installed Software ### Language and Runtime -- .NET Core SDK: 6.0.422, 7.0.102, 7.0.202, 7.0.306, 7.0.409, 8.0.101, 8.0.204, 8.0.300 +- .NET Core SDK: 6.0.423, 7.0.102, 7.0.202, 7.0.306, 7.0.410, 8.0.101, 8.0.204, 8.0.301 - Bash 3.2.57(1)-release - Clang/LLVM 14.0.0 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` @@ -23,7 +23,7 @@ - Node.js 18.20.3 - MSBuild 16.10.1.51301 (Mono 6.12.0.188) - NVM 0.39.7 -- NVM - Cached node versions: 16.20.2, 18.20.3, 20.13.1 +- NVM - Cached node versions: 16.20.2, 18.20.3, 20.14.0 - Perl 5.38.2 - PHP 8.3.7 - Python 2.7.18 @@ -32,7 +32,7 @@ - Ruby 3.0.7p220 ### Package Management -- Bundler 2.5.10 +- Bundler 2.5.11 - Carthage 0.39.1 - CocoaPods 1.15.2 - Composer 2.7.6 @@ -42,9 +42,9 @@ - NuGet 6.3.1.1 - Pip 20.3.4 (python 2.7) - Pip3 24.0 (python 3.12) -- Pipx 1.5.0 -- RubyGems 3.5.10 -- Vcpkg 2024 (build from commit 007aaced1) +- Pipx 1.6.0 +- RubyGems 3.5.11 +- Vcpkg 2024 (build from commit 67cc1677c) - Yarn 1.22.22 #### Environment variables @@ -56,20 +56,20 @@ ### Project Management - Apache Ant 1.10.14 - Apache Maven 3.9.7 -- Gradle 8.7 +- Gradle 8.8 - Sbt 1.10.0 ### Utilities - 7-Zip 17.05 - aria2 1.37.0 -- azcopy 10.24.0 +- azcopy 10.25.0 - bazel 7.1.2 - bazelisk 1.20.0 - bsdtar 3.5.1 - available by 'tar' alias - Curl 8.8.0 -- Git 2.45.1 +- Git 2.45.2 - Git LFS 3.5.1 -- GitHub CLI 2.49.2 +- GitHub CLI 2.50.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.24.5 - gpg (GnuPG) 2.4.5 @@ -92,9 +92,9 @@ ### Tools - App Center CLI 3.0.0 -- AWS CLI 2.15.58 -- AWS SAM CLI 1.117.0 -- AWS Session Manager CLI 1.2.553.0 +- AWS CLI 2.15.62 +- AWS SAM CLI 1.118.0 +- AWS Session Manager CLI 1.2.633.0 - Azure CLI 2.61.0 - Azure CLI (azure-devops) 1.0.1 - Bicep CLI 0.27.1 @@ -120,12 +120,12 @@ ### Browsers - Safari 17.5 (17618.2.12.111.5) - SafariDriver 17.5 (17618.2.12.111.5) -- Google Chrome 125.0.6422.113 -- Google Chrome for Testing 125.0.6422.78 -- ChromeDriver 125.0.6422.78 -- Microsoft Edge 125.0.2535.67 -- Microsoft Edge WebDriver 125.0.2535.67 -- Mozilla Firefox 126.0 +- Google Chrome 125.0.6422.142 +- Google Chrome for Testing 125.0.6422.141 +- ChromeDriver 125.0.6422.141 +- Microsoft Edge 125.0.2535.79 +- Microsoft Edge WebDriver 125.0.2535.79 +- Mozilla Firefox 126.0.1 - geckodriver 0.34.0 - Selenium server 4.21.0 @@ -155,7 +155,7 @@ #### Ruby - 3.0.7 -- 3.1.5 +- 3.1.6 #### Python - 3.7.17 @@ -168,7 +168,7 @@ #### Node.js - 16.20.2 - 18.20.3 -- 20.13.1 +- 20.14.0 #### Go - 1.20.14 @@ -202,7 +202,7 @@ | Name | Version | ConfigFile | ServiceStatus | ListenPort | | ----- | ------- | ------------------------------- | ------------- | ---------- | | httpd | 2.4.59 | /usr/local/etc/httpd/httpd.conf | none | 80 | -| nginx | 1.25.5 | /usr/local/etc/nginx/nginx.conf | none | 80 | +| nginx | 1.27.0 | /usr/local/etc/nginx/nginx.conf | none | 80 | ### Xamarin @@ -330,7 +330,7 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" | Package Name | Version | | -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 8.0 | -| Android Emulator | 34.2.14 | +| Android Emulator | 34.2.15 | | Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2 33.0.3<br>32.0.0<br>31.0.0 | | Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1) | | Android SDK Platform-Tools | 35.0.1 | From 7271f004d4597d8a8e72811e9dbff8525377d138 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 7 Jun 2024 11:46:14 +0000 Subject: [PATCH 2894/3485] Updating readme file for macos-14-arm64 version 20240603.1 (#9991) Co-authored-by: Image generation service account <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-14-arm64-Readme.md | 46 +++++++++++++-------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/images/macos/macos-14-arm64-Readme.md b/images/macos/macos-14-arm64-Readme.md index f8fdaba70ed5..ae91bae0d775 100644 --- a/images/macos/macos-14-arm64-Readme.md +++ b/images/macos/macos-14-arm64-Readme.md @@ -1,12 +1,12 @@ # macOS 14 - OS Version: macOS 14.5 (23F79) - Kernel Version: Darwin 23.5.0 -- Image Version: 20240526.2 +- Image Version: 20240603.1 ## Installed Software ### Language and Runtime -- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.409, 8.0.101, 8.0.204, 8.0.300 +- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.410, 8.0.101, 8.0.204, 8.0.301 - Bash 3.2.57(1)-release - Clang/LLVM 14.0.3 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` @@ -18,39 +18,39 @@ - GNU Fortran 13 (Homebrew GCC 13.3.0) - available by `gfortran-13` alias - Kotlin 2.0.0-release-341 - Mono 6.12.0.188 -- Node.js 20.13.1 +- Node.js 20.14.0 - Perl 5.38.2 - Python3 3.12.3 - Ruby 3.0.7p220 ### Package Management -- Bundler 2.5.10 +- Bundler 2.5.11 - Carthage 0.39.1 - CocoaPods 1.15.2 -- Homebrew 4.3.1 -- NPM 10.5.2 +- Homebrew 4.3.2 +- NPM 10.7.0 - NuGet 6.3.1.1 - Pip3 24.0 (python 3.12) -- Pipx 1.5.0 -- RubyGems 3.5.10 +- Pipx 1.6.0 +- RubyGems 3.5.11 - Yarn 1.22.22 ### Project Management - Apache Ant 1.10.14 - Apache Maven 3.9.7 -- Gradle 8.7 +- Gradle 8.8 ### Utilities - 7-Zip 17.05 - aria2 1.37.0 -- azcopy 10.24.0 +- azcopy 10.25.0 - bazel 7.1.2 - bazelisk 1.20.0 - bsdtar 3.5.3 - available by 'tar' alias - Curl 8.6.0 -- Git 2.45.1 +- Git 2.45.2 - Git LFS 3.5.1 -- GitHub CLI 2.49.2 +- GitHub CLI 2.50.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.24.5 - gpg (GnuPG) 2.4.5 @@ -62,9 +62,9 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.15.58 -- AWS SAM CLI 1.117.0 -- AWS Session Manager CLI 1.2.553.0 +- AWS CLI 2.15.62 +- AWS SAM CLI 1.118.0 +- AWS Session Manager CLI 1.2.633.0 - Azure CLI 2.61.0 - Azure CLI (azure-devops) 1.0.1 - Bicep CLI 0.27.1 @@ -81,9 +81,9 @@ ### Browsers - Safari 17.5 (19618.2.12.11.6) - SafariDriver 17.5 (19618.2.12.11.6) -- Google Chrome 125.0.6422.113 -- Google Chrome for Testing 125.0.6422.78 -- ChromeDriver 125.0.6422.78 +- Google Chrome 125.0.6422.142 +- Google Chrome for Testing 125.0.6422.141 +- ChromeDriver 125.0.6422.141 - Selenium server 4.21.0 #### Environment variables @@ -110,7 +110,7 @@ #### Node.js - 18.20.3 -- 20.13.1 +- 20.14.0 #### Go - 1.20.14 @@ -183,12 +183,12 @@ | Simulator - watchOS 10.2 | watchsimulator10.2 | 15.1, 15.2 | | Simulator - watchOS 10.4 | watchsimulator10.4 | 15.3 | | Simulator - watchOS 10.5 | watchsimulator10.5 | 15.4 | -| visionOS 1.0 | xros1.0 | 15.2 | | Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | -| Simulator - visionOS 1.1 | xrsimulator1.1 | 15.3 | +| visionOS 1.0 | xros1.0 | 15.2 | | visionOS 1.1 | xros1.1 | 15.3 | -| Simulator - visionOS 1.2 | xrsimulator1.2 | 15.4 | +| Simulator - visionOS 1.1 | xrsimulator1.1 | 15.3 | | visionOS 1.2 | xros1.2 | 15.4 | +| Simulator - visionOS 1.2 | xrsimulator1.2 | 15.4 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | @@ -224,7 +224,7 @@ | Package Name | Version | | -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 11.0 | -| Android Emulator | 34.2.14 | +| Android Emulator | 34.2.15 | | Android SDK Build-tools | 34.0.0<br>33.0.2 33.0.3 | | Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | | Android SDK Platform-Tools | 35.0.1 | From 870d08d9cbff9a9a2b0e805c7e41e5238c184bf0 Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Sat, 8 Jun 2024 11:02:11 +0200 Subject: [PATCH 2895/3485] [windows] Pin PostgreSQL and Update LLVM (#10014) * [windows] Pin PostgreSQL version * Fix if statement * Fix PostgreSQL pester test * Update LLVM to 18* --- .../scripts/build/Install-PostgreSQL.ps1 | 78 ++++++++++--------- .../windows/scripts/tests/Databases.Tests.ps1 | 4 +- images/windows/toolsets/toolset-2019.json | 4 +- images/windows/toolsets/toolset-2022.json | 4 +- 4 files changed, 49 insertions(+), 41 deletions(-) diff --git a/images/windows/scripts/build/Install-PostgreSQL.ps1 b/images/windows/scripts/build/Install-PostgreSQL.ps1 index 3b7af44d3383..2bad88580310 100644 --- a/images/windows/scripts/build/Install-PostgreSQL.ps1 +++ b/images/windows/scripts/build/Install-PostgreSQL.ps1 @@ -11,44 +11,52 @@ $pgPwd = "root" [Environment]::SetEnvironmentVariable("PGUSER", $pgUser, "Machine") [Environment]::SetEnvironmentVariable("PGPASSWORD", $pgPwd, "Machine") -# Define latest available version to install based on version specified in the toolset $toolsetVersion = (Get-ToolsetContent).postgresql.version -$getPostgreReleases = Invoke-WebRequest -Uri "https://git.postgresql.org/gitweb/?p=postgresql.git;a=tags" -UseBasicParsing -# Getting all links matched to the pattern (e.g.a=log;h=refs/tags/REL_14) -$targetReleases = $getPostgreReleases.Links.href | Where-Object { $_ -match "a=log;h=refs/tags/REL_$toolsetVersion" } -[Int32] $outNumber = $null -$minorVersions = @() -foreach ($release in $targetReleases) { - $version = $release.split('/')[-1] - # Checking if the latest symbol of the release version is actually a number. If yes, add to $minorVersions array - if ([Int32]::TryParse($($version.Split('_')[-1]), [ref] $outNumber)) { - $minorVersions += $outNumber +if ($null -ne ($toolsetVersion | Select-String -Pattern '\d+\.\d+\.\d+')) { + $majorVersion = ([version]$toolsetVersion).Major + $minorVersion = ([version]$toolsetVersion).Minor + $patchVersion = ([version]$toolsetVersion).Build + $installerUrl = "https://get.enterprisedb.com/postgresql/postgresql-$majorVersion.$minorVersion-$patchVersion-windows-x64.exe" +} else { + # Define latest available version to install based on version specified in the toolset + $getPostgreReleases = Invoke-WebRequest -Uri "https://git.postgresql.org/gitweb/?p=postgresql.git;a=tags" -UseBasicParsing + # Getting all links matched to the pattern (e.g.a=log;h=refs/tags/REL_14) + $targetReleases = $getPostgreReleases.Links.href | Where-Object { $_ -match "a=log;h=refs/tags/REL_$toolsetVersion" } + [Int32] $outNumber = $null + $minorVersions = @() + foreach ($release in $targetReleases) { + $version = $release.split('/')[-1] + # Checking if the latest symbol of the release version is actually a number. If yes, add to $minorVersions array + if ([Int32]::TryParse($($version.Split('_')[-1]), [ref] $outNumber)) { + $minorVersions += $outNumber + } } -} -# Sorting and getting the last one -$targetMinorVersions = ($minorVersions | Sort-Object)[-1] + # Sorting and getting the last one + $targetMinorVersions = ($minorVersions | Sort-Object)[-1] -# Install latest PostgreSQL -# In order to get rid of error messages (we know we will have them), force ErrorAction to SilentlyContinue -$errorActionOldValue = $ErrorActionPreference -$ErrorActionPreference = 'SilentlyContinue' -# Starting from number 9 and going down, check if the installer is available. If yes, break the loop. -# If an installer with $targetMinorVersions is not to be found, the $targetMinorVersions will be decreased by 1 -$increment = 9 -do { - $url = "https://get.enterprisedb.com/postgresql/postgresql-$toolsetVersion.$targetMinorVersions-$increment-windows-x64.exe" - $checkAccess = [System.Net.WebRequest]::Create($url) - $response = $null - $response = $checkAccess.GetResponse() - if ($response) { - $installerUrl = $response.ResponseUri.OriginalString - } elseif (!$response -and ($increment -eq 0)) { - $increment = 9 - $targetMinorVersions-- - } else { - $increment-- - } -} while (!$response) + # In order to get rid of error messages (we know we will have them), force ErrorAction to SilentlyContinue + $errorActionOldValue = $ErrorActionPreference + $ErrorActionPreference = 'SilentlyContinue' + + # Install latest PostgreSQL + # Starting from number 9 and going down, check if the installer is available. If yes, break the loop. + # If an installer with $targetMinorVersions is not to be found, the $targetMinorVersions will be decreased by 1 + $increment = 9 + do { + $url = "https://get.enterprisedb.com/postgresql/postgresql-$toolsetVersion.$targetMinorVersions-$increment-windows-x64.exe" + $checkAccess = [System.Net.WebRequest]::Create($url) + $response = $null + $response = $checkAccess.GetResponse() + if ($response) { + $installerUrl = $response.ResponseUri.OriginalString + } elseif (!$response -and ($increment -eq 0)) { + $increment = 9 + $targetMinorVersions-- + } else { + $increment-- + } + } while (!$response) +} # Return the previous value of ErrorAction and invoke Install-Binary function $ErrorActionPreference = $errorActionOldValue diff --git a/images/windows/scripts/tests/Databases.Tests.ps1 b/images/windows/scripts/tests/Databases.Tests.ps1 index 5c10726a9e3a..0a89129d392d 100644 --- a/images/windows/scripts/tests/Databases.Tests.ps1 +++ b/images/windows/scripts/tests/Databases.Tests.ps1 @@ -72,8 +72,8 @@ Describe "PostgreSQL" { } Context "PostgreSQL version" { - It "PostgreSQL version should correspond to the version in the toolset" { - $toolsetVersion = (Get-ToolsetContent).postgresql.version + It "PostgreSQL version should correspond to the Major version in the toolset" { + $toolsetVersion = (Get-ToolsetContent).postgresql.version.Split(".")[0] # Client version (& $env:PGBIN\psql --version).split()[-1] | Should -BeLike "$toolsetVersion*" # Server version diff --git a/images/windows/toolsets/toolset-2019.json b/images/windows/toolsets/toolset-2019.json index 1c8bd715eaf6..03397ba56c9a 100644 --- a/images/windows/toolsets/toolset-2019.json +++ b/images/windows/toolsets/toolset-2019.json @@ -469,10 +469,10 @@ "version": "8.3" }, "llvm": { - "version": "16" + "version": "18" }, "postgresql": { - "version": "14", + "version": "14.12.1", "signature": "698BA51AA27CC31282AACA5055E4B9190BC6C0E9" }, "kotlin": { diff --git a/images/windows/toolsets/toolset-2022.json b/images/windows/toolsets/toolset-2022.json index 6af096fe7536..cc2c2011f149 100644 --- a/images/windows/toolsets/toolset-2022.json +++ b/images/windows/toolsets/toolset-2022.json @@ -367,13 +367,13 @@ "version": "3.10" }, "llvm": { - "version": "16" + "version": "18" }, "php": { "version": "8.3" }, "postgresql": { - "version": "14", + "version": "14.12.1", "signature": "698BA51AA27CC31282AACA5055E4B9190BC6C0E9" }, "kotlin": { From 2e3a8e1ccfd026ace20f6281152ca0d81a6eafd8 Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Mon, 10 Jun 2024 08:45:22 +0200 Subject: [PATCH 2896/3485] [windows] Modify TortoiseSVN installation (#10010) --- images/windows/scripts/build/Install-TortoiseSvn.ps1 | 6 ++++++ images/windows/templates/windows-2019.pkr.hcl | 3 ++- images/windows/templates/windows-2022.pkr.hcl | 3 ++- images/windows/toolsets/toolset-2019.json | 1 - images/windows/toolsets/toolset-2022.json | 1 - 5 files changed, 10 insertions(+), 4 deletions(-) create mode 100644 images/windows/scripts/build/Install-TortoiseSvn.ps1 diff --git a/images/windows/scripts/build/Install-TortoiseSvn.ps1 b/images/windows/scripts/build/Install-TortoiseSvn.ps1 new file mode 100644 index 000000000000..48f04463cc5f --- /dev/null +++ b/images/windows/scripts/build/Install-TortoiseSvn.ps1 @@ -0,0 +1,6 @@ +################################################################################ +## File: Install-TortoiseSvn.ps1 +## Desc: Install TortoiseSvn +################################################################################ + +Install-ChocoPackage tortoisesvn diff --git a/images/windows/templates/windows-2019.pkr.hcl b/images/windows/templates/windows-2019.pkr.hcl index 9c734d633f8f..09acf8da3bcd 100644 --- a/images/windows/templates/windows-2019.pkr.hcl +++ b/images/windows/templates/windows-2019.pkr.hcl @@ -285,7 +285,8 @@ build { "${path.root}/../scripts/build/Install-DockerCompose.ps1", "${path.root}/../scripts/build/Install-PowershellCore.ps1", "${path.root}/../scripts/build/Install-WebPlatformInstaller.ps1", - "${path.root}/../scripts/build/Install-Runner.ps1" + "${path.root}/../scripts/build/Install-Runner.ps1", + "${path.root}/../scripts/build/Install-TortoiseSvn.ps1" ] } diff --git a/images/windows/templates/windows-2022.pkr.hcl b/images/windows/templates/windows-2022.pkr.hcl index 2fb94ea72874..c37a36243261 100644 --- a/images/windows/templates/windows-2022.pkr.hcl +++ b/images/windows/templates/windows-2022.pkr.hcl @@ -275,7 +275,8 @@ build { "${path.root}/../scripts/build/Install-DockerCompose.ps1", "${path.root}/../scripts/build/Install-PowershellCore.ps1", "${path.root}/../scripts/build/Install-WebPlatformInstaller.ps1", - "${path.root}/../scripts/build/Install-Runner.ps1" + "${path.root}/../scripts/build/Install-Runner.ps1", + "${path.root}/../scripts/build/Install-TortoiseSvn.ps1" ] } diff --git a/images/windows/toolsets/toolset-2019.json b/images/windows/toolsets/toolset-2019.json index 03397ba56c9a..ee8afa005798 100644 --- a/images/windows/toolsets/toolset-2019.json +++ b/images/windows/toolsets/toolset-2019.json @@ -434,7 +434,6 @@ "args": [ "--version", "5.32.1.1" ] }, { "name": "pulumi" }, - { "name": "tortoisesvn" }, { "name": "swig" }, { "name": "vswhere" }, { diff --git a/images/windows/toolsets/toolset-2022.json b/images/windows/toolsets/toolset-2022.json index cc2c2011f149..7a8e87b2b3cd 100644 --- a/images/windows/toolsets/toolset-2022.json +++ b/images/windows/toolsets/toolset-2022.json @@ -335,7 +335,6 @@ "args": [ "--version", "5.32.1.1" ] }, { "name": "pulumi" }, - { "name": "tortoisesvn" }, { "name": "swig" }, { "name": "vswhere" }, { From bb433ff0312d8fb81a8e2103b0a4aab5c2b5fc22 Mon Sep 17 00:00:00 2001 From: ijunaidm <160701894+ijunaidm@users.noreply.github.com> Date: Wed, 12 Jun 2024 14:22:41 +0530 Subject: [PATCH 2897/3485] [Ubuntu] Update ubuntu-minimal.pkr.hcl (#10044) --- images/ubuntu/templates/ubuntu-minimal.pkr.hcl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/ubuntu/templates/ubuntu-minimal.pkr.hcl b/images/ubuntu/templates/ubuntu-minimal.pkr.hcl index 9a3c34299d41..634e76d310ed 100644 --- a/images/ubuntu/templates/ubuntu-minimal.pkr.hcl +++ b/images/ubuntu/templates/ubuntu-minimal.pkr.hcl @@ -183,7 +183,7 @@ build { // Install MS package repos, Configure apt provisioner "shell" { - environment_vars = ["HELPER_SCRIPTS=${var.helper_script_folder}","DEBIAN_FRONTEND=noninteractive"] + environment_vars = ["HELPER_SCRIPTS=${local.helper_script_folder}","DEBIAN_FRONTEND=noninteractive"] execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" scripts = [ "${path.root}/../scripts/build/install-ms-repos.sh", From b5ee676e1dfbf7b37b9484960fc7f564725df644 Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Wed, 12 Jun 2024 11:11:50 +0200 Subject: [PATCH 2898/3485] [macOS-14] Add Xcode 16.0 Beta 1 (#10038) --- images/macos/toolsets/toolset-14.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/images/macos/toolsets/toolset-14.json b/images/macos/toolsets/toolset-14.json index 4663731e0030..635d10931901 100644 --- a/images/macos/toolsets/toolset-14.json +++ b/images/macos/toolsets/toolset-14.json @@ -3,6 +3,7 @@ "default": "15.0.1", "x64": { "versions": [ + { "link": "16.0", "version": "16.0.0-Beta+16A5171c", "install_runtimes": "true", "sha256": "e7baf4aa1b1715a49770b50e8a5b8686dfe39f4d513d0b248912f41ded6c6ae6"}, { "link": "15.4", "version": "15.4.0+15F31d", "install_runtimes": "true", "sha256": "82d3d61804ff3f4c7c82085e91dc701037ddaa770e542848b2477e22f4e8aa7a"}, { "link": "15.3", "version": "15.3.0+15E204a", "install_runtimes": "true", "sha256": "f13f6a2e2df432c3008e394640b8549a18c285acd7fd148d6c4bac8c3a5af234"}, { "link": "15.2", "version": "15.2.0+15C500b", "install_runtimes": "true", "sha256": "04E93680C6DDBEC84666531BE412DE778AFC8EAC6AB2037F4C2BE7290818B59B"}, @@ -13,6 +14,7 @@ }, "arm64":{ "versions": [ + { "link": "16.0", "version": "16.0.0-Beta+16A5171c", "install_runtimes": "true", "sha256": "e7baf4aa1b1715a49770b50e8a5b8686dfe39f4d513d0b248912f41ded6c6ae6"}, { "link": "15.4", "version": "15.4.0+15F31d", "install_runtimes": "true", "sha256": "82d3d61804ff3f4c7c82085e91dc701037ddaa770e542848b2477e22f4e8aa7a"}, { "link": "15.3", "version": "15.3.0+15E204a", "install_runtimes": "true", "sha256": "f13f6a2e2df432c3008e394640b8549a18c285acd7fd148d6c4bac8c3a5af234"}, { "link": "15.2", "version": "15.2.0+15C500b", "install_runtimes": "true", "sha256": "04E93680C6DDBEC84666531BE412DE778AFC8EAC6AB2037F4C2BE7290818B59B"}, From 1bf1aea86442ba16bd31ca208051350b6afa3df7 Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <shamil.mubarakshin@akvelon.com> Date: Wed, 12 Jun 2024 11:59:30 +0200 Subject: [PATCH 2899/3485] [ubuntu24] Add Actions build workflow --- .github/workflows/ubuntu2404.yml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 .github/workflows/ubuntu2404.yml diff --git a/.github/workflows/ubuntu2404.yml b/.github/workflows/ubuntu2404.yml new file mode 100644 index 000000000000..c065bc87700d --- /dev/null +++ b/.github/workflows/ubuntu2404.yml @@ -0,0 +1,20 @@ +name: Trigger Ubuntu24.04 CI +run-name: Ubuntu24.04 - ${{ github.event.pull_request.title }} + +on: + pull_request_target: + types: labeled + paths: + - 'images/ubuntu/**' + +defaults: + run: + shell: pwsh + +jobs: + Ubuntu_2404: + if: contains(github.event.pull_request.labels.*.name, 'CI ubuntu-all') || contains(github.event.pull_request.labels.*.name, 'CI ubuntu-2404') + uses: ./.github/workflows/trigger-ubuntu-win-build.yml + with: + image_type: 'ubuntu2404' + secrets: inherit From 65d62e168894875db7823097b75faa035bd28b01 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 12 Jun 2024 10:37:04 +0000 Subject: [PATCH 2900/3485] Updating readme file for macos-13 version 20240609.1 (#10033) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-13-Readme.md | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/images/macos/macos-13-Readme.md b/images/macos/macos-13-Readme.md index 9eb4773a1ba8..5646b5b8ad69 100644 --- a/images/macos/macos-13-Readme.md +++ b/images/macos/macos-13-Readme.md @@ -1,7 +1,7 @@ # macOS 13 - OS Version: macOS 13.6.7 (22G720) - Kernel Version: Darwin 22.6.0 -- Image Version: 20240603.1 +- Image Version: 20240609.1 ## Installed Software @@ -20,7 +20,7 @@ - Mono 6.12.0.188 - Node.js 20.14.0 - Perl 5.38.2 -- PHP 8.3.7 +- PHP 8.3.8 - Python3 3.12.3 - Ruby 3.0.7p220 @@ -35,7 +35,7 @@ - Pip3 24.0 (python 3.12) - Pipx 1.6.0 - RubyGems 3.5.11 -- Vcpkg 2024 (build from commit 67cc1677c) +- Vcpkg 2024 (build from commit ad25766ae) - Yarn 1.22.22 ### Project Management @@ -65,14 +65,14 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.16.0 +- AWS CLI 2.16.4 - AWS SAM CLI 1.118.0 - AWS Session Manager CLI 1.2.633.0 - Azure CLI 2.61.0 - Azure CLI (azure-devops) 1.0.1 -- Bicep CLI 0.27.1 -- Cmake 3.29.3 -- CodeQL Action Bundle 2.17.3 +- Bicep CLI 0.28.1 +- Cmake 3.29.5 +- CodeQL Action Bundle 2.17.4 - Fastlane 2.220.0 - SwiftFormat 0.53.10 - Xcbeautify 2.3.1 @@ -88,8 +88,8 @@ - Google Chrome 125.0.6422.142 - Google Chrome for Testing 125.0.6422.141 - ChromeDriver 125.0.6422.141 -- Microsoft Edge 125.0.2535.79 -- Microsoft Edge WebDriver 125.0.2535.79 +- Microsoft Edge 125.0.2535.92 +- Microsoft Edge WebDriver 125.0.2535.92 - Mozilla Firefox 126.0.1 - geckodriver 0.34.0 - Selenium server 4.21.0 @@ -136,8 +136,8 @@ #### Go - 1.20.14 -- 1.21.10 -- 1.22.3 +- 1.21.11 +- 1.22.4 ### Rust Tools - Cargo 1.78.0 @@ -154,7 +154,7 @@ #### PowerShell Modules - Az: 12.0.0 -- Pester: 5.5.0 +- Pester: 5.6.0 - PSScriptAnalyzer: 1.22.0 ### Xcode @@ -235,7 +235,7 @@ | Android Command Line Tools | 11.0 | | Android Emulator | 34.2.15 | | Android SDK Build-tools | 34.0.0<br>33.0.2 33.0.3 | -| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | +| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | | Android SDK Platform-Tools | 35.0.1 | | Android Support Repository | 47.0.0 | | CMake | 3.22.1 | From 42a61d742aa12bccd81d505f9e084ba53646f1ee Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 12 Jun 2024 11:20:30 +0000 Subject: [PATCH 2901/3485] Updating readme file for win19 version 20240610.1.1 (#10040) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/windows/Windows2019-Readme.md | 62 ++++++++++++++-------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/images/windows/Windows2019-Readme.md b/images/windows/Windows2019-Readme.md index dda9e8d72165..4d951ada1a43 100644 --- a/images/windows/Windows2019-Readme.md +++ b/images/windows/Windows2019-Readme.md @@ -4,7 +4,7 @@ *** # Windows Server 2019 - OS Version: 10.0.17763 Build 5830 -- Image Version: 20240603.1.0 +- Image Version: 20240610.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -13,19 +13,19 @@ ### Language and Runtime - Bash 5.2.26(1)-release -- Go 1.21.10 -- Julia 1.10.3 +- Go 1.21.11 +- Julia 1.10.4 - Kotlin 2.0.0 -- LLVM 16.0.6 +- LLVM 18.1.6 - Node 18.20.3 - Perl 5.32.1 -- PHP 8.3.7 +- PHP 8.3.8 - Python 3.7.9 - Ruby 3.0.7p220 ### Package Management -- Chocolatey 2.2.2 -- Composer 2.7.6 +- Chocolatey 2.3.0 +- Composer 2.7.7 - Helm 3.15.0 - Miniconda 24.4.0 (pre-installed on the image but not added to PATH) - NPM 10.7.0 @@ -33,7 +33,7 @@ - pip 24.0 (python 3.7) - Pipx 1.2.1 - RubyGems 3.2.33 -- Vcpkg (build from commit 67cc1677c) +- Vcpkg (build from commit b27651341) - Yarn 1.22.22 #### Environment variables @@ -52,22 +52,22 @@ - 7zip 24.06 - aria2 1.37.0 - azcopy 10.25.0 -- Bazel 7.1.2 +- Bazel 7.2.0 - Bazelisk 1.19.0 -- Bicep 0.27.1 +- Bicep 0.28.1 - Cabal 3.10.3.0 -- CMake 3.29.3 -- CodeQL Action Bundle 2.17.3 -- Docker 24.0.7 +- CMake 3.29.5 +- CodeQL Action Bundle 2.17.4 +- Docker 26.1.3 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.23.3 +- Docker Compose v2 2.27.1 - Docker-wincred 0.8.2 - ghc 9.10.1 - Git 2.45.2.windows.1 - Git LFS 3.5.1 -- Google Cloud CLI 478.0.0 +- Google Cloud CLI 479.0.0 - ImageMagick 7.1.1-29 -- InnoSetup 6.2.2 +- InnoSetup 6.3.0 - jq 1.7.1 - Kind 0.23.0 - Kubectl 1.30.1 @@ -75,12 +75,12 @@ - gcc 8.1.0 - gdb 8.1 - GNU Binutils 2.30 -- Newman 6.1.2 +- Newman 6.1.3 - NSIS 3.10 - OpenSSL 1.1.1w -- Packer 1.10.3 +- Packer 1.11.0 - Parcel 2.12.0 -- Pulumi 3.118.0 +- Pulumi 3.119.0 - R 4.4.0 - Service Fabric SDK 9.1.1436.9590 - Stack 2.15.7 @@ -94,7 +94,7 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.207 -- AWS CLI 2.15.62 +- AWS CLI 2.16.4 - AWS SAM CLI 1.118.0 - AWS Session Manager CLI 1.2.633.0 - Azure CLI 2.61.0 @@ -119,8 +119,8 @@ ### Browsers and Drivers - Google Chrome 125.0.6422.142 - Chrome Driver 125.0.6422.141 -- Microsoft Edge 125.0.2535.79 -- Microsoft Edge Driver 125.0.2535.79 +- Microsoft Edge 125.0.2535.92 +- Microsoft Edge Driver 125.0.2535.92 - Mozilla Firefox 126.0.1 - Gecko Driver 0.34.0 - IE Driver 4.14.0.0 @@ -166,8 +166,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Go - 1.20.14 -- 1.21.10 -- 1.22.3 +- 1.21.11 +- 1.22.4 #### Node.js - 16.20.2 @@ -211,11 +211,11 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### MongoDB | Version | ServiceName | ServiceStatus | ServiceStartType | | -------- | ----------- | ------------- | ---------------- | -| 5.0.26.0 | MongoDB | Stopped | Disabled | +| 5.0.27.0 | MongoDB | Stopped | Disabled | ### Database tools - Azure CosmosDb Emulator 2.14.18.0 -- DacFx 162.2.111.2 +- DacFx 162.3.563.1 - MySQL 5.7.44.0 - SQL OLEDB Driver 18.6.7.0 - SQLPS 1.0 @@ -497,7 +497,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Microsoft.AspNetCore.App: 6.0.5, 6.0.26, 6.0.31, 7.0.5, 7.0.20, 8.0.6 - Microsoft.NETCore.App: 6.0.5, 6.0.26, 6.0.31, 7.0.5, 7.0.20, 8.0.6 - Microsoft.WindowsDesktop.App: 6.0.5, 6.0.26, 6.0.31, 7.0.5, 7.0.20, 8.0.6 -- nbgv 3.6.133+2d32d93cb1 +- nbgv 3.6.139+a9e8765620 ### PowerShell Tools - PowerShell 7.4.2 @@ -508,11 +508,11 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - AzureRM: 2.1.0 (Default), 6.13.1 - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.591 +- AWSPowershell: 4.1.596 - DockerMsftProvider: 1.0.0.8 -- MarkdownPS: 1.9 +- MarkdownPS: 1.10 - Microsoft.Graph: 2.19.0 -- Pester: 3.4.0, 5.5.0 +- Pester: 3.4.0, 5.6.0 - PowerShellGet: 1.0.0.1, 2.2.5 - PSScriptAnalyzer: 1.22.0 - PSWindowsUpdate: 2.2.1.4 @@ -530,7 +530,7 @@ All other versions are saved but not installed. | Android Command Line Tools | 8.0 | | Android Emulator | 34.2.15 | | Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2 33.0.3<br>32.0.0<br>31.0.0<br>30.0.2 | -| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3) | +| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3) | | Android SDK Platform-Tools | 35.0.1 | | Android Support Repository | 47.0.0 | | CMake | 3.10.2<br>3.18.1<br>3.22.1 | From 619f9fd372f7aed204a8e2c46f2d7ce10d4b868c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 12 Jun 2024 11:20:56 +0000 Subject: [PATCH 2902/3485] Updating readme file for ubuntu22 version 20240609.1.1 (#10039) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2204-Readme.md | 62 +++++++++++++++--------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/images/ubuntu/Ubuntu2204-Readme.md b/images/ubuntu/Ubuntu2204-Readme.md index 0e55934d42a5..97c7c1fda98a 100644 --- a/images/ubuntu/Ubuntu2204-Readme.md +++ b/images/ubuntu/Ubuntu2204-Readme.md @@ -6,7 +6,7 @@ # Ubuntu 22.04 - OS Version: 22.04.4 LTS - Kernel Version: 6.5.0-1021-azure -- Image Version: 20240603.1.0 +- Image Version: 20240609.1.0 - Systemd version: 249.11-0ubuntu3.12 ## Installed Software @@ -19,7 +19,7 @@ - Dash 0.5.11+git20210903+057cd650a4ed-3build1 - GNU C++: 10.5.0, 11.4.0, 12.3.0 - GNU Fortran: 10.5.0, 11.4.0, 12.3.0 -- Julia 1.10.3 +- Julia 1.10.4 - Kotlin 2.0.0-release-341 - Mono 6.12.0.200 - MSBuild 16.10.1.31701 (Mono 6.12.0.200) @@ -27,7 +27,7 @@ - Perl 5.34.0 - Python 3.10.12 - Ruby 3.0.2p107 -- Swift 5.10 +- Swift 5.10.1 ### Package Management - cpan 1.64 @@ -40,7 +40,7 @@ - Pip3 22.0.2 - Pipx 1.6.0 - RubyGems 3.3.5 -- Vcpkg (build from commit 67cc1677c) +- Vcpkg (build from commit ad25766ae) - Yarn 1.22.22 #### Environment variables @@ -65,21 +65,21 @@ to accomplish this. - Sbt 1.10.0 ### Tools -- Ansible 2.16.7 +- Ansible 2.17.0 - apt-fast 1.10.0 - AzCopy 10.25.0 - available by `azcopy` and `azcopy10` aliases - Bazel 7.1.2 - Bazelisk 1.19.0 -- Bicep 0.27.1 +- Bicep 0.28.1 - Buildah 1.23.1 -- CMake 3.29.4 -- CodeQL Action Bundle 2.17.3 +- CMake 3.29.5 +- CodeQL Action Bundle 2.17.4 - Docker Amazon ECR Credential Helper 0.8.0 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.23.3 +- Docker Compose v2 2.27.1 - Docker-Buildx 0.14.1 -- Docker Client 24.0.9 -- Docker Server 24.0.9 +- Docker Client 26.1.3 +- Docker Server 26.1.3 - Fastlane 2.220.0 - Git 2.45.2 - Git LFS 3.5.1 @@ -101,29 +101,29 @@ to accomplish this. - Packer 1.11.0 - Parcel 2.12.0 - Podman 3.4.4 -- Pulumi 3.118.0 +- Pulumi 3.119.0 - R 4.4.0 - Skopeo 1.4.1 - Sphinx Open Source Search Server 2.2.11 - SVN 1.14.1 -- Terraform 1.8.4 +- Terraform 1.8.5 - yamllint 1.35.1 - yq 4.44.1 - zstd 1.5.6 ### CLI Tools - Alibaba Cloud CLI 3.0.207 -- AWS CLI 2.16.0 +- AWS CLI 2.16.4 - AWS CLI Session Manager Plugin 1.2.633.0 - AWS SAM CLI 1.118.0 - Azure CLI 2.61.0 - Azure CLI (azure-devops) 1.0.1 - GitHub CLI 2.50.0 -- Google Cloud CLI 478.0.0 -- Netlify CLI 17.25.0 -- OpenShift CLI 4.15.15 +- Google Cloud CLI 479.0.0 +- Netlify CLI 17.26.1 +- OpenShift CLI 4.15.16 - ORAS CLI 1.2.0 -- Vercel CLI 34.2.4 +- Vercel CLI 34.2.6 ### Java | Version | Environment Variable | @@ -165,8 +165,8 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Google Chrome 125.0.6422.141 - ChromeDriver 125.0.6422.141 - Chromium 125.0.6422.0 -- Microsoft Edge 125.0.2535.79 -- Microsoft Edge WebDriver 125.0.2535.79 +- Microsoft Edge 125.0.2535.92 +- Microsoft Edge WebDriver 125.0.2535.92 - Selenium server 4.21.0 - Mozilla Firefox 126.0.2 - Geckodriver 0.34.0 @@ -181,7 +181,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ### .NET Tools - .NET Core SDK: 6.0.423, 7.0.410, 8.0.301 -- nbgv 3.6.133+2d32d93cb1 +- nbgv 3.6.139+a9e8765620 ### Databases - sqlite3 3.37.2 @@ -205,14 +205,14 @@ Use the following command as a part of your job to start the service: 'sudo syst #### MS SQL - sqlcmd 17.10.0001.1 -- SqlPackage 162.2.111.2 +- SqlPackage 162.3.563.1 ### Cached Tools #### Go - 1.20.14 -- 1.21.10 -- 1.22.3 +- 1.21.11 +- 1.22.4 #### Node.js - 16.20.2 @@ -243,7 +243,7 @@ Use the following command as a part of your job to start the service: 'sudo syst - Az: 11.3.1 - MarkdownPS: 1.9 - Microsoft.Graph: 2.19.0 -- Pester: 5.5.0 +- Pester: 5.6.0 - PSScriptAnalyzer: 1.22.0 ### Web Servers @@ -257,7 +257,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 9.0 | | Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2 33.0.3<br>32.0.0<br>31.0.0 | -| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1) | +| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1) | | Android Support Repository | 47.0.0 | | CMake | 3.10.2<br>3.18.1<br>3.22.1 | | Google Play services | 49 | @@ -286,11 +286,11 @@ Use the following command as a part of your job to start the service: 'sudo syst | node:16 | sha256:f77a1aef2da8d83e45ec990f45df50f1a286c5fe8bbfb8c6e4246c6389705c0b | 2023-09-07 | | node:16-alpine | sha256:a1f9d027912b58a7c75be7716c97cfbc6d3099f3a97ed84aa490be9dee20e787 | 2023-08-10 | | node:18 | sha256:b08b1356559e2e9945f47ded630c9eb9d4e3ca04f111ab20d55652442cf14aee | 2024-05-21 | -| node:18-alpine | sha256:5069da655539e2e986ce3fd1757f24a41b846958566c89ff4a48874434d73749 | 2024-05-22 | +| node:18-alpine | sha256:6937be95129321422103452e2883021cc4a96b63c32d7947187fcb25df84fc3f | 2024-06-04 | | node:20 | sha256:ab71b9da5ba19445dc5bb76bf99c218941db2c4d70ff4de4e0d9ec90920bfe3f | 2024-05-28 | -| node:20-alpine | sha256:928b24aaadbd47c1a7722c563b471195ce54788bf8230ce807e1dd500aec0549 | 2024-05-28 | -| ubuntu:20.04 | sha256:874aca52f79ae5f8258faff03e10ce99ae836f6e7d2df6ecd3da5c1cad3a912b | 2024-04-27 | -| ubuntu:22.04 | sha256:a6d2b38300ce017add71440577d5b0a90460d0e57fd7aec21dd0d1b0761bbfb2 | 2024-04-27 | +| node:20-alpine | sha256:66c7d989b6dabba6b4305b88f40912679aebd9f387a5b16ffa76dfb9ae90b060 | 2024-06-04 | +| ubuntu:20.04 | sha256:0b897358ff6624825fb50d20ffb605ab0eaea77ced0adb8c6a4b756513dec6fc | 2024-06-03 | +| ubuntu:22.04 | sha256:19478ce7fc2ffbce89df29fea5725a8d12e57de52eb9ea570890dc5852aac1ac | 2024-06-03 | ### Installed apt packages | Name | Version | @@ -306,7 +306,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | coreutils | 8.32-4.1ubuntu1.2 | | curl | 7.81.0-1ubuntu1.16 | | dbus | 1.12.20-2ubuntu4.1 | -| dnsutils | 1:9.18.18-0ubuntu0.22.04.2 | +| dnsutils | 1:9.18.24-0ubuntu0.22.04.1 | | dpkg | 1.21.1ubuntu2.3 | | dpkg-dev | 1.21.1ubuntu2.3 | | fakeroot | 1.28-1ubuntu1 | From e21232684f949d04ff41ee9af22612282f6fbbac Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 12 Jun 2024 11:26:00 +0000 Subject: [PATCH 2903/3485] Updating readme file for ubuntu20 version 20240609.1.1 (#10042) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2004-Readme.md | 60 +++++++++++++++--------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/images/ubuntu/Ubuntu2004-Readme.md b/images/ubuntu/Ubuntu2004-Readme.md index 009cc1b52c17..cf97187d7125 100644 --- a/images/ubuntu/Ubuntu2004-Readme.md +++ b/images/ubuntu/Ubuntu2004-Readme.md @@ -6,7 +6,7 @@ # Ubuntu 20.04 - OS Version: 20.04.6 LTS - Kernel Version: 5.15.0-1064-azure -- Image Version: 20240603.1.0 +- Image Version: 20240609.1.0 - Systemd version: 245.4-4ubuntu3.23 ## Installed Software @@ -21,7 +21,7 @@ - Erlang rebar3 3.23.0 - GNU C++: 10.5.0 - GNU Fortran: 10.5.0 -- Julia 1.10.3 +- Julia 1.10.4 - Kotlin 2.0.0-release-341 - Mono 6.12.0.200 - MSBuild 16.10.1.31701 (Mono 6.12.0.200) @@ -29,7 +29,7 @@ - Perl 5.30.0 - Python 3.8.10 - Ruby 2.7.0p0 -- Swift 5.10 +- Swift 5.10.1 ### Package Management - cpan 1.64 @@ -42,7 +42,7 @@ - Pip3 20.0.2 - Pipx 1.6.0 - RubyGems 3.1.2 -- Vcpkg (build from commit 67cc1677c) +- Vcpkg (build from commit ad25766ae) - Yarn 1.22.22 #### Environment variables @@ -72,16 +72,16 @@ to accomplish this. - AzCopy 10.25.0 - available by `azcopy` and `azcopy10` aliases - Bazel 7.1.2 - Bazelisk 1.19.0 -- Bicep 0.27.1 +- Bicep 0.28.1 - Buildah 1.22.3 -- CMake 3.29.4 -- CodeQL Action Bundle 2.17.3 +- CMake 3.29.5 +- CodeQL Action Bundle 2.17.4 - Docker Amazon ECR Credential Helper 0.8.0 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.23.3 +- Docker Compose v2 2.27.1 - Docker-Buildx 0.14.1 -- Docker Client 24.0.9 -- Docker Server 24.0.9 +- Docker Client 26.1.3 +- Docker Server 26.1.3 - Fastlane 2.220.0 - Git 2.45.2 - Git LFS 3.5.1 @@ -105,29 +105,29 @@ to accomplish this. - Parcel 2.12.0 - PhantomJS 2.1.1 2.1.1 - Podman 3.4.2 -- Pulumi 3.118.0 +- Pulumi 3.119.0 - R 4.4.0 - Skopeo 1.5.0 - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 -- Terraform 1.8.4 +- Terraform 1.8.5 - yamllint 1.35.1 - yq 4.44.1 - zstd 1.5.6 ### CLI Tools - Alibaba Cloud CLI 3.0.174 -- AWS CLI 2.16.0 +- AWS CLI 2.16.4 - AWS CLI Session Manager Plugin 1.2.633.0 - AWS SAM CLI 1.118.0 - Azure CLI 2.61.0 - Azure CLI (azure-devops) 1.0.1 - GitHub CLI 2.50.0 -- Google Cloud CLI 478.0.0 -- Netlify CLI 17.25.0 -- OpenShift CLI 4.15.15 +- Google Cloud CLI 479.0.0 +- Netlify CLI 17.26.1 +- OpenShift CLI 4.15.16 - ORAS CLI 1.2.0 -- Vercel CLI 34.2.4 +- Vercel CLI 34.2.6 ### Java | Version | Environment Variable | @@ -138,7 +138,7 @@ to accomplish this. | 21.0.3+9 | JAVA_HOME_21_X64 | ### PHP Tools -- PHP: 7.4.33, 8.0.30, 8.1.28, 8.2.19, 8.3.7 +- PHP: 7.4.33, 8.0.30, 8.1.29, 8.2.20, 8.3.8 - Composer 2.7.6 - PHPUnit 8.5.38 ``` @@ -169,8 +169,8 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Google Chrome 125.0.6422.141 - ChromeDriver 125.0.6422.141 - Chromium 125.0.6422.0 -- Microsoft Edge 125.0.2535.79 -- Microsoft Edge WebDriver 125.0.2535.79 +- Microsoft Edge 125.0.2535.92 +- Microsoft Edge WebDriver 125.0.2535.92 - Selenium server 4.21.0 - Mozilla Firefox 126.0.2 - Geckodriver 0.34.0 @@ -185,10 +185,10 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ### .NET Tools - .NET Core SDK: 6.0.423, 7.0.410, 8.0.301 -- nbgv 3.6.133+2d32d93cb1 +- nbgv 3.6.139+a9e8765620 ### Databases -- MongoDB 5.0.26 +- MongoDB 5.0.27 - sqlite3 3.31.1 #### PostgreSQL @@ -210,14 +210,14 @@ Use the following command as a part of your job to start the service: 'sudo syst #### MS SQL - sqlcmd 17.10.0001.1 -- SqlPackage 162.2.111.2 +- SqlPackage 162.3.563.1 ### Cached Tools #### Go - 1.20.14 -- 1.21.10 -- 1.22.3 +- 1.21.11 +- 1.22.4 #### Node.js - 16.20.2 @@ -251,7 +251,7 @@ Use the following command as a part of your job to start the service: 'sudo syst - Az: 11.3.1 - MarkdownPS: 1.9 - Microsoft.Graph: 2.19.0 -- Pester: 5.5.0 +- Pester: 5.6.0 - PSScriptAnalyzer: 1.22.0 ### Web Servers @@ -266,7 +266,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 9.0 | | Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2 33.0.3<br>32.0.0<br>31.0.0 | -| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1) | +| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1) | | Android Support Repository | 47.0.0 | | CMake | 3.10.2<br>3.18.1<br>3.22.1 | | Google Play services | 49 | @@ -296,10 +296,10 @@ Use the following command as a part of your job to start the service: 'sudo syst | node:16 | sha256:f77a1aef2da8d83e45ec990f45df50f1a286c5fe8bbfb8c6e4246c6389705c0b | 2023-09-07 | | node:16-alpine | sha256:a1f9d027912b58a7c75be7716c97cfbc6d3099f3a97ed84aa490be9dee20e787 | 2023-08-10 | | node:18 | sha256:b08b1356559e2e9945f47ded630c9eb9d4e3ca04f111ab20d55652442cf14aee | 2024-05-21 | -| node:18-alpine | sha256:5069da655539e2e986ce3fd1757f24a41b846958566c89ff4a48874434d73749 | 2024-05-22 | +| node:18-alpine | sha256:6937be95129321422103452e2883021cc4a96b63c32d7947187fcb25df84fc3f | 2024-06-04 | | node:20 | sha256:ab71b9da5ba19445dc5bb76bf99c218941db2c4d70ff4de4e0d9ec90920bfe3f | 2024-05-28 | -| node:20-alpine | sha256:928b24aaadbd47c1a7722c563b471195ce54788bf8230ce807e1dd500aec0549 | 2024-05-28 | -| ubuntu:20.04 | sha256:874aca52f79ae5f8258faff03e10ce99ae836f6e7d2df6ecd3da5c1cad3a912b | 2024-04-27 | +| node:20-alpine | sha256:66c7d989b6dabba6b4305b88f40912679aebd9f387a5b16ffa76dfb9ae90b060 | 2024-06-04 | +| ubuntu:20.04 | sha256:0b897358ff6624825fb50d20ffb605ab0eaea77ced0adb8c6a4b756513dec6fc | 2024-06-03 | ### Installed apt packages | Name | Version | From f610e46b01d37211623135ba61aec27f8b634652 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 12 Jun 2024 11:58:55 +0000 Subject: [PATCH 2904/3485] Updating readme file for win22 version 20240610.1.1 (#10041) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/windows/Windows2022-Readme.md | 60 ++++++++++++++-------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/images/windows/Windows2022-Readme.md b/images/windows/Windows2022-Readme.md index 1979c7aa3179..e3e37a3ac9cc 100644 --- a/images/windows/Windows2022-Readme.md +++ b/images/windows/Windows2022-Readme.md @@ -4,7 +4,7 @@ *** # Windows Server 2022 - OS Version: 10.0.20348 Build 2461 -- Image Version: 20240603.1.0 +- Image Version: 20240610.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -13,19 +13,19 @@ ### Language and Runtime - Bash 5.2.26(1)-release -- Go 1.21.10 -- Julia 1.10.3 +- Go 1.21.11 +- Julia 1.10.4 - Kotlin 2.0.0 -- LLVM 16.0.6 +- LLVM 18.1.6 - Node 18.20.3 - Perl 5.32.1 -- PHP 8.3.7 +- PHP 8.3.8 - Python 3.9.13 - Ruby 3.0.7p220 ### Package Management -- Chocolatey 2.2.2 -- Composer 2.7.6 +- Chocolatey 2.3.0 +- Composer 2.7.7 - Helm 3.15.0 - Miniconda 24.4.0 (pre-installed on the image but not added to PATH) - NPM 10.7.0 @@ -33,7 +33,7 @@ - pip 24.0 (python 3.9) - Pipx 1.6.0 - RubyGems 3.2.33 -- Vcpkg (build from commit 67cc1677c) +- Vcpkg (build from commit 795f2f137) - Yarn 1.22.22 #### Environment variables @@ -52,21 +52,21 @@ - 7zip 24.06 - aria2 1.37.0 - azcopy 10.25.0 -- Bazel 7.1.2 +- Bazel 7.2.0 - Bazelisk 1.19.0 -- Bicep 0.27.1 +- Bicep 0.28.1 - Cabal 3.10.3.0 -- CMake 3.29.3 -- CodeQL Action Bundle 2.17.3 -- Docker 24.0.7 +- CMake 3.29.5 +- CodeQL Action Bundle 2.17.4 +- Docker 26.1.3 - Docker Compose v1 1.29.2 -- Docker Compose v2 2.23.3 +- Docker Compose v2 2.27.1 - Docker-wincred 0.8.2 - ghc 9.10.1 - Git 2.45.2.windows.1 - Git LFS 3.5.1 - ImageMagick 7.1.1-29 -- InnoSetup 6.2.2 +- InnoSetup 6.3.0 - jq 1.7.1 - Kind 0.23.0 - Kubectl 1.30.1 @@ -74,11 +74,11 @@ - gcc 12.2.0 - gdb 11.2 - GNU Binutils 2.39 -- Newman 6.1.2 +- Newman 6.1.3 - NSIS 3.10 - OpenSSL 1.1.1w -- Packer 1.10.3 -- Pulumi 3.118.0 +- Packer 1.11.0 +- Pulumi 3.119.0 - R 4.4.0 - Service Fabric SDK 9.1.1436.9590 - Stack 2.15.7 @@ -92,7 +92,7 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.207 -- AWS CLI 2.15.62 +- AWS CLI 2.16.4 - AWS SAM CLI 1.118.0 - AWS Session Manager CLI 1.2.633.0 - Azure CLI 2.61.0 @@ -116,8 +116,8 @@ ### Browsers and Drivers - Google Chrome 125.0.6422.142 - Chrome Driver 125.0.6422.141 -- Microsoft Edge 125.0.2535.79 -- Microsoft Edge Driver 125.0.2535.79 +- Microsoft Edge 125.0.2535.92 +- Microsoft Edge Driver 125.0.2535.92 - Mozilla Firefox 126.0.1 - Gecko Driver 0.34.0 - IE Driver 4.14.0.0 @@ -160,8 +160,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Go - 1.20.14 -- 1.21.10 -- 1.22.3 +- 1.21.11 +- 1.22.4 #### Node.js - 16.20.2 @@ -204,11 +204,11 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### MongoDB | Version | ServiceName | ServiceStatus | ServiceStartType | | -------- | ----------- | ------------- | ---------------- | -| 5.0.26.0 | MongoDB | Stopped | Disabled | +| 5.0.27.0 | MongoDB | Stopped | Disabled | ### Database tools - Azure CosmosDb Emulator 2.14.18.0 -- DacFx 162.2.111.2 +- DacFx 162.3.563.1 - MySQL 8.0.37.0 - SQL OLEDB Driver 18.6.7.0 - SQLPS 1.0 @@ -492,7 +492,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Microsoft.AspNetCore.App: 6.0.5, 6.0.26, 6.0.29, 6.0.30, 6.0.31, 7.0.5, 7.0.20, 8.0.5 - Microsoft.NETCore.App: 6.0.5, 6.0.26, 6.0.29, 6.0.30, 6.0.31, 7.0.5, 7.0.20, 8.0.5 - Microsoft.WindowsDesktop.App: 6.0.5, 6.0.26, 6.0.30, 6.0.31, 7.0.5, 7.0.20, 8.0.5 -- nbgv 3.6.133+2d32d93cb1 +- nbgv 3.6.139+a9e8765620 ### PowerShell Tools - PowerShell 7.4.2 @@ -503,11 +503,11 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - AzureRM: 2.1.0 (Default), 6.13.1 - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.591 +- AWSPowershell: 4.1.596 - DockerMsftProvider: 1.0.0.8 -- MarkdownPS: 1.9 +- MarkdownPS: 1.10 - Microsoft.Graph: 2.19.0 -- Pester: 3.4.0, 5.5.0 +- Pester: 3.4.0, 5.6.0 - PowerShellGet: 1.0.0.1, 2.2.5 - PSScriptAnalyzer: 1.22.0 - PSWindowsUpdate: 2.2.1.4 @@ -525,7 +525,7 @@ All other versions are saved but not installed. | Android Command Line Tools | 8.0 | | Android Emulator | 34.2.15 | | Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2 33.0.3<br>32.0.0<br>31.0.0 | -| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1) | +| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1) | | Android SDK Platform-Tools | 35.0.1 | | Android Support Repository | 47.0.0 | | CMake | 3.18.1<br>3.22.1 | From e0fd3fea70b1d650713ba51f0a6b98070bbdae7c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 12 Jun 2024 19:18:39 +0000 Subject: [PATCH 2905/3485] Updating readme file for macos-13-arm64 version 20240609.1 (#10034) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-13-arm64-Readme.md | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/images/macos/macos-13-arm64-Readme.md b/images/macos/macos-13-arm64-Readme.md index 82436dfcc89b..e3db2d39d70d 100644 --- a/images/macos/macos-13-arm64-Readme.md +++ b/images/macos/macos-13-arm64-Readme.md @@ -1,7 +1,7 @@ # macOS 13 - OS Version: macOS 13.6.7 (22G720) - Kernel Version: Darwin 22.6.0 -- Image Version: 20240603.1 +- Image Version: 20240609.1 ## Installed Software @@ -62,14 +62,14 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.16.0 +- AWS CLI 2.16.4 - AWS SAM CLI 1.118.0 - AWS Session Manager CLI 1.2.633.0 - Azure CLI 2.61.0 - Azure CLI (azure-devops) 1.0.1 -- Bicep CLI 0.27.1 -- Cmake 3.29.3 -- CodeQL Action Bundle 2.17.3 +- Bicep CLI 0.28.1 +- Cmake 3.29.5 +- CodeQL Action Bundle 2.17.4 - Fastlane 2.220.0 - SwiftFormat 0.53.10 - Xcbeautify 2.3.1 @@ -115,8 +115,8 @@ #### Go - 1.20.14 -- 1.21.10 -- 1.22.3 +- 1.21.11 +- 1.22.4 ### Rust Tools - Cargo 1.78.0 @@ -133,7 +133,7 @@ #### PowerShell Modules - Az: 12.0.0 -- Pester: 5.5.0 +- Pester: 5.6.0 - PSScriptAnalyzer: 1.22.0 ### Xcode @@ -180,8 +180,8 @@ | Simulator - watchOS 9.4 | watchsimulator9.4 | 14.3.1 | | Simulator - watchOS 10.0 | watchsimulator10.0 | 15.0.1 | | Simulator - watchOS 10.2 | watchsimulator10.2 | 15.1, 15.2 | -| Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | | visionOS 1.0 | xros1.0 | 15.2 | +| Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | @@ -215,7 +215,7 @@ | Android Command Line Tools | 11.0 | | Android Emulator | 34.2.15 | | Android SDK Build-tools | 34.0.0<br>33.0.2 33.0.3 | -| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | +| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | | Android SDK Platform-Tools | 35.0.1 | | Android Support Repository | 47.0.0 | | CMake | 3.22.1 | From 3e33d65ff906feb7bf03daf6a03b539b81a76cae Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 13 Jun 2024 01:57:57 +0000 Subject: [PATCH 2906/3485] Updating readme file for macos-14-arm64 version 20240611.1 (#10047) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-14-arm64-Readme.md | 97 ++++++++++++++++----------- 1 file changed, 56 insertions(+), 41 deletions(-) diff --git a/images/macos/macos-14-arm64-Readme.md b/images/macos/macos-14-arm64-Readme.md index ae91bae0d775..872f809bdd2b 100644 --- a/images/macos/macos-14-arm64-Readme.md +++ b/images/macos/macos-14-arm64-Readme.md @@ -1,7 +1,7 @@ # macOS 14 - OS Version: macOS 14.5 (23F79) - Kernel Version: Darwin 23.5.0 -- Image Version: 20240603.1 +- Image Version: 20240611.1 ## Installed Software @@ -27,7 +27,7 @@ - Bundler 2.5.11 - Carthage 0.39.1 - CocoaPods 1.15.2 -- Homebrew 4.3.2 +- Homebrew 4.3.5 - NPM 10.7.0 - NuGet 6.3.1.1 - Pip3 24.0 (python 3.12) @@ -44,7 +44,7 @@ - 7-Zip 17.05 - aria2 1.37.0 - azcopy 10.25.0 -- bazel 7.1.2 +- bazel 7.2.0 - bazelisk 1.20.0 - bsdtar 3.5.3 - available by 'tar' alias - Curl 8.6.0 @@ -62,14 +62,14 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.15.62 +- AWS CLI 2.16.5 - AWS SAM CLI 1.118.0 - AWS Session Manager CLI 1.2.633.0 - Azure CLI 2.61.0 - Azure CLI (azure-devops) 1.0.1 -- Bicep CLI 0.27.1 -- Cmake 3.29.3 -- CodeQL Action Bundle 2.17.3 +- Bicep CLI 0.28.1 +- Cmake 3.29.5 +- CodeQL Action Bundle 2.17.4 - Fastlane 2.220.0 - SwiftFormat 0.53.10 - Xcbeautify 2.3.1 @@ -114,8 +114,8 @@ #### Go - 1.20.14 -- 1.21.10 -- 1.22.3 +- 1.21.11 +- 1.22.4 ### Rust Tools - Cargo 1.78.0 @@ -132,18 +132,19 @@ #### PowerShell Modules - Az: 12.0.0 -- Pester: 5.5.0 +- Pester: 5.6.0 - PSScriptAnalyzer: 1.22.0 ### Xcode -| Version | Build | Path | -| ---------------- | ------- | ------------------------------ | -| 15.4 | 15F31d | /Applications/Xcode_15.4.app | -| 15.3 | 15E204a | /Applications/Xcode_15.3.app | -| 15.2 | 15C500b | /Applications/Xcode_15.2.app | -| 15.1 | 15C65 | /Applications/Xcode_15.1.app | -| 15.0.1 (default) | 15A507 | /Applications/Xcode_15.0.1.app | -| 14.3.1 | 14E300c | /Applications/Xcode_14.3.1.app | +| Version | Build | Path | +| ---------------- | -------- | ------------------------------ | +| 16.0 (beta) | 16A5171c | /Applications/Xcode_16.0.app | +| 15.4 | 15F31d | /Applications/Xcode_15.4.app | +| 15.3 | 15E204a | /Applications/Xcode_15.3.app | +| 15.2 | 15C500b | /Applications/Xcode_15.2.app | +| 15.1 | 15C65 | /Applications/Xcode_15.1.app | +| 15.0.1 (default) | 15A507 | /Applications/Xcode_15.0.1.app | +| 14.3.1 | 14E300c | /Applications/Xcode_14.3.1.app | #### Installed SDKs | SDK | SDK Name | Xcode Version | @@ -153,72 +154,86 @@ | macOS 14.2 | macosx14.2 | 15.1, 15.2 | | macOS 14.4 | macosx14.4 | 15.3 | | macOS 14.5 | macosx14.5 | 15.4 | +| macOS 15.0 | macosx15.0 | 16.0 | | iOS 16.4 | iphoneos16.4 | 14.3.1 | | iOS 17.0 | iphoneos17.0 | 15.0.1 | | iOS 17.2 | iphoneos17.2 | 15.1, 15.2 | | iOS 17.4 | iphoneos17.4 | 15.3 | | iOS 17.5 | iphoneos17.5 | 15.4 | +| iOS 18.0 | iphoneos18.0 | 16.0 | | Simulator - iOS 16.4 | iphonesimulator16.4 | 14.3.1 | | Simulator - iOS 17.0 | iphonesimulator17.0 | 15.0.1 | | Simulator - iOS 17.2 | iphonesimulator17.2 | 15.1, 15.2 | | Simulator - iOS 17.4 | iphonesimulator17.4 | 15.3 | | Simulator - iOS 17.5 | iphonesimulator17.5 | 15.4 | +| Simulator - iOS 18.0 | iphonesimulator18.0 | 16.0 | | tvOS 16.4 | appletvos16.4 | 14.3.1 | | tvOS 17.0 | appletvos17.0 | 15.0.1 | | tvOS 17.2 | appletvos17.2 | 15.1, 15.2 | | tvOS 17.4 | appletvos17.4 | 15.3 | | tvOS 17.5 | appletvos17.5 | 15.4 | +| tvOS 18.0 | appletvos18.0 | 16.0 | | Simulator - tvOS 16.4 | appletvsimulator16.4 | 14.3.1 | | Simulator - tvOS 17.0 | appletvsimulator17.0 | 15.0.1 | | Simulator - tvOS 17.2 | appletvsimulator17.2 | 15.1, 15.2 | | Simulator - tvOS 17.4 | appletvsimulator17.4 | 15.3 | | Simulator - tvOS 17.5 | appletvsimulator17.5 | 15.4 | +| Simulator - tvOS 18.0 | appletvsimulator18.0 | 16.0 | | watchOS 9.4 | watchos9.4 | 14.3.1 | | watchOS 10.0 | watchos10.0 | 15.0.1 | | watchOS 10.2 | watchos10.2 | 15.1, 15.2 | | watchOS 10.4 | watchos10.4 | 15.3 | | watchOS 10.5 | watchos10.5 | 15.4 | +| watchOS 11.0 | watchos11.0 | 16.0 | | Simulator - watchOS 9.4 | watchsimulator9.4 | 14.3.1 | | Simulator - watchOS 10.0 | watchsimulator10.0 | 15.0.1 | | Simulator - watchOS 10.2 | watchsimulator10.2 | 15.1, 15.2 | | Simulator - watchOS 10.4 | watchsimulator10.4 | 15.3 | | Simulator - watchOS 10.5 | watchsimulator10.5 | 15.4 | -| Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | +| Simulator - watchOS 11.0 | watchsimulator11.0 | 16.0 | | visionOS 1.0 | xros1.0 | 15.2 | +| Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | | visionOS 1.1 | xros1.1 | 15.3 | | Simulator - visionOS 1.1 | xrsimulator1.1 | 15.3 | | visionOS 1.2 | xros1.2 | 15.4 | | Simulator - visionOS 1.2 | xrsimulator1.2 | 15.4 | +| Simulator - visionOS 2.0 | xrsimulator2.0 | 16.0 | +| visionOS 2.0 | xros2.0 | 16.0 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | -| Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | +| Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | DriverKit 22.4 | driverkit22.4 | 14.3.1 | | DriverKit 23.0 | driverkit23.0 | 15.0.1 | | DriverKit 23.2 | driverkit23.2 | 15.1, 15.2 | | DriverKit 23.4 | driverkit23.4 | 15.3 | | DriverKit 23.5 | driverkit23.5 | 15.4 | +| DriverKit 24.0 | driverkit24.0 | 16.0 | #### Installed Simulators -| OS | Xcode Version | Simulators | -| ------------ | ------------------------------------------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| iOS 16.4 | 14.3.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 17.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 17.2 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 17.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | -| iOS 17.5 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | -| tvOS 16.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 17.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 17.2 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 17.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 17.5 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| watchOS 9.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | -| watchOS 10.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | -| watchOS 10.2 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | -| watchOS 10.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | -| watchOS 10.5 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | -| visionOS 1.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4 | Apple Vision Pro | -| visionOS 1.1 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4 | Apple Vision Pro | -| visionOS 1.2 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4 | Apple Vision Pro | +| OS | Xcode Version | Simulators | +| ------------ | -------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| iOS 16.4 | 14.3.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 17.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 17.2 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 17.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | +| iOS 17.5 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | +| iOS 18.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | +| tvOS 16.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 17.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 17.2 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 17.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 17.5 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 18.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| watchOS 9.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | +| watchOS 10.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 10.2 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 10.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 10.5 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 11.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | +| visionOS 1.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0 | Apple Vision Pro | +| visionOS 1.1 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0 | Apple Vision Pro | +| visionOS 1.2 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0 | Apple Vision Pro | +| visionOS 2.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0 | Apple Vision Pro | ### Android | Package Name | Version | @@ -226,7 +241,7 @@ | Android Command Line Tools | 11.0 | | Android Emulator | 34.2.15 | | Android SDK Build-tools | 34.0.0<br>33.0.2 33.0.3 | -| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | +| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | | Android SDK Platform-Tools | 35.0.1 | | Android Support Repository | 47.0.0 | | CMake | 3.22.1 | From ab07d6cc323d56ce7ebe78866265b85d90bf667c Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Thu, 13 Jun 2024 11:23:38 +0200 Subject: [PATCH 2907/3485] [macOS] Install Xcode 16 on macOS-14 Intel-based image without runtimes (#10057) --- images/macos/toolsets/toolset-14.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/macos/toolsets/toolset-14.json b/images/macos/toolsets/toolset-14.json index 635d10931901..f7a88540478a 100644 --- a/images/macos/toolsets/toolset-14.json +++ b/images/macos/toolsets/toolset-14.json @@ -3,7 +3,7 @@ "default": "15.0.1", "x64": { "versions": [ - { "link": "16.0", "version": "16.0.0-Beta+16A5171c", "install_runtimes": "true", "sha256": "e7baf4aa1b1715a49770b50e8a5b8686dfe39f4d513d0b248912f41ded6c6ae6"}, + { "link": "16.0", "version": "16.0.0-Beta+16A5171c", "install_runtimes": "false", "sha256": "e7baf4aa1b1715a49770b50e8a5b8686dfe39f4d513d0b248912f41ded6c6ae6"}, { "link": "15.4", "version": "15.4.0+15F31d", "install_runtimes": "true", "sha256": "82d3d61804ff3f4c7c82085e91dc701037ddaa770e542848b2477e22f4e8aa7a"}, { "link": "15.3", "version": "15.3.0+15E204a", "install_runtimes": "true", "sha256": "f13f6a2e2df432c3008e394640b8549a18c285acd7fd148d6c4bac8c3a5af234"}, { "link": "15.2", "version": "15.2.0+15C500b", "install_runtimes": "true", "sha256": "04E93680C6DDBEC84666531BE412DE778AFC8EAC6AB2037F4C2BE7290818B59B"}, From fb41178b75ab812510ce30c4621d52448944b316 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 13 Jun 2024 17:50:27 +0000 Subject: [PATCH 2908/3485] Updating readme file for macos-14 version 20240612.5 (#10058) Co-authored-by: Image generation service account. <no-reply@microsoft.com> --- images/macos/macos-14-Readme.md | 111 ++++++++++++++++++-------------- 1 file changed, 61 insertions(+), 50 deletions(-) diff --git a/images/macos/macos-14-Readme.md b/images/macos/macos-14-Readme.md index 3138c7713c14..00efdacbfa0f 100644 --- a/images/macos/macos-14-Readme.md +++ b/images/macos/macos-14-Readme.md @@ -1,12 +1,12 @@ # macOS 14 - OS Version: macOS 14.5 (23F79) - Kernel Version: Darwin 23.5.0 -- Image Version: 20240603.1 +- Image Version: 20240612.5 ## Installed Software ### Language and Runtime -- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.410, 8.0.101, 8.0.204, 8.0.301 +- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.410, 8.0.101, 8.0.204, 8.0.302 - Bash 3.2.57(1)-release - Clang/LLVM 14.0.3 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` @@ -20,16 +20,16 @@ - Mono 6.12.0.188 - Node.js 20.14.0 - Perl 5.38.2 -- PHP 8.3.7 -- Python3 3.12.3 +- PHP 8.3.8 +- Python3 3.12.4 - Ruby 3.0.7p220 ### Package Management - Bundler 2.5.11 - Carthage 0.39.1 - CocoaPods 1.15.2 -- Composer 2.7.6 -- Homebrew 4.3.3 +- Composer 2.7.7 +- Homebrew 4.3.5 - NPM 10.7.0 - NuGet 6.3.1.1 - Pip3 24.0 (python 3.12) @@ -46,7 +46,7 @@ - 7-Zip 17.05 - aria2 1.37.0 - azcopy 10.25.0 -- bazel 7.1.2 +- bazel 7.2.0 - bazelisk 1.20.0 - bsdtar 3.5.3 - available by 'tar' alias - Curl 8.8.0 @@ -64,16 +64,16 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.16.0 +- AWS CLI 2.16.7 - AWS SAM CLI 1.118.0 - AWS Session Manager CLI 1.2.633.0 - Azure CLI 2.61.0 - Azure CLI (azure-devops) 1.0.1 -- Bicep CLI 0.27.1 -- Cmake 3.29.3 -- CodeQL Action Bundle 2.17.3 +- Bicep CLI 0.28.1 +- Cmake 3.29.5 +- CodeQL Action Bundle 2.17.4 - Fastlane 2.220.0 -- SwiftFormat 0.53.10 +- SwiftFormat 0.54.0 - Xcbeautify 2.3.1 - Xcode Command Line Tools 15.3.0.0.1.1708646388 - Xcodes 1.4.1 @@ -84,12 +84,12 @@ ### Browsers - Safari 17.5 (19618.2.12.11.6) - SafariDriver 17.5 (19618.2.12.11.6) -- Google Chrome 125.0.6422.142 -- Google Chrome for Testing 125.0.6422.141 -- ChromeDriver 125.0.6422.141 -- Microsoft Edge 125.0.2535.79 -- Microsoft Edge WebDriver 125.0.2535.79 -- Mozilla Firefox 126.0.1 +- Google Chrome 126.0.6478.57 +- Google Chrome for Testing 126.0.6478.55 +- ChromeDriver 126.0.6478.55 +- Microsoft Edge 125.0.2535.92 +- Microsoft Edge WebDriver 125.0.2535.92 +- Mozilla Firefox 127.0 - geckodriver 0.34.0 - Selenium server 4.21.0 @@ -118,7 +118,7 @@ - 3.9.19 - 3.10.14 - 3.11.9 -- 3.12.3 +- 3.12.4 #### Node.js - 18.20.3 @@ -126,8 +126,8 @@ #### Go - 1.20.14 -- 1.21.10 -- 1.22.3 +- 1.21.11 +- 1.22.4 ### Rust Tools - Cargo 1.78.0 @@ -144,18 +144,19 @@ #### PowerShell Modules - Az: 12.0.0 -- Pester: 5.5.0 +- Pester: 5.6.0 - PSScriptAnalyzer: 1.22.0 ### Xcode -| Version | Build | Path | -| ---------------- | ------- | ------------------------------ | -| 15.4 | 15F31d | /Applications/Xcode_15.4.app | -| 15.3 | 15E204a | /Applications/Xcode_15.3.app | -| 15.2 | 15C500b | /Applications/Xcode_15.2.app | -| 15.1 | 15C65 | /Applications/Xcode_15.1.app | -| 15.0.1 (default) | 15A507 | /Applications/Xcode_15.0.1.app | -| 14.3.1 | 14E300c | /Applications/Xcode_14.3.1.app | +| Version | Build | Path | +| ---------------- | -------- | ------------------------------ | +| 16.0 (beta) | 16A5171c | /Applications/Xcode_16.0.app | +| 15.4 | 15F31d | /Applications/Xcode_15.4.app | +| 15.3 | 15E204a | /Applications/Xcode_15.3.app | +| 15.2 | 15C500b | /Applications/Xcode_15.2.app | +| 15.1 | 15C65 | /Applications/Xcode_15.1.app | +| 15.0.1 (default) | 15A507 | /Applications/Xcode_15.0.1.app | +| 14.3.1 | 14E300c | /Applications/Xcode_14.3.1.app | #### Installed SDKs | SDK | SDK Name | Xcode Version | @@ -165,69 +166,79 @@ | macOS 14.2 | macosx14.2 | 15.1, 15.2 | | macOS 14.4 | macosx14.4 | 15.3 | | macOS 14.5 | macosx14.5 | 15.4 | +| macOS 15.0 | macosx15.0 | 16.0 | | iOS 16.4 | iphoneos16.4 | 14.3.1 | | iOS 17.0 | iphoneos17.0 | 15.0.1 | | iOS 17.2 | iphoneos17.2 | 15.1, 15.2 | | iOS 17.4 | iphoneos17.4 | 15.3 | | iOS 17.5 | iphoneos17.5 | 15.4 | +| iOS 18.0 | iphoneos18.0 | 16.0 | | Simulator - iOS 16.4 | iphonesimulator16.4 | 14.3.1 | | Simulator - iOS 17.0 | iphonesimulator17.0 | 15.0.1 | | Simulator - iOS 17.2 | iphonesimulator17.2 | 15.1, 15.2 | | Simulator - iOS 17.4 | iphonesimulator17.4 | 15.3 | | Simulator - iOS 17.5 | iphonesimulator17.5 | 15.4 | +| Simulator - iOS 18.0 | iphonesimulator18.0 | 16.0 | | tvOS 16.4 | appletvos16.4 | 14.3.1 | | tvOS 17.0 | appletvos17.0 | 15.0.1 | | tvOS 17.2 | appletvos17.2 | 15.1, 15.2 | | tvOS 17.4 | appletvos17.4 | 15.3 | | tvOS 17.5 | appletvos17.5 | 15.4 | +| tvOS 18.0 | appletvos18.0 | 16.0 | | Simulator - tvOS 16.4 | appletvsimulator16.4 | 14.3.1 | | Simulator - tvOS 17.0 | appletvsimulator17.0 | 15.0.1 | | Simulator - tvOS 17.2 | appletvsimulator17.2 | 15.1, 15.2 | | Simulator - tvOS 17.4 | appletvsimulator17.4 | 15.3 | | Simulator - tvOS 17.5 | appletvsimulator17.5 | 15.4 | +| Simulator - tvOS 18.0 | appletvsimulator18.0 | 16.0 | | watchOS 9.4 | watchos9.4 | 14.3.1 | | watchOS 10.0 | watchos10.0 | 15.0.1 | | watchOS 10.2 | watchos10.2 | 15.1, 15.2 | | watchOS 10.4 | watchos10.4 | 15.3 | | watchOS 10.5 | watchos10.5 | 15.4 | +| watchOS 11.0 | watchos11.0 | 16.0 | | Simulator - watchOS 9.4 | watchsimulator9.4 | 14.3.1 | | Simulator - watchOS 10.0 | watchsimulator10.0 | 15.0.1 | | Simulator - watchOS 10.2 | watchsimulator10.2 | 15.1, 15.2 | | Simulator - watchOS 10.4 | watchsimulator10.4 | 15.3 | | Simulator - watchOS 10.5 | watchsimulator10.5 | 15.4 | +| Simulator - watchOS 11.0 | watchsimulator11.0 | 16.0 | | Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | | visionOS 1.0 | xros1.0 | 15.2 | -| visionOS 1.1 | xros1.1 | 15.3 | | Simulator - visionOS 1.1 | xrsimulator1.1 | 15.3 | +| visionOS 1.1 | xros1.1 | 15.3 | | visionOS 1.2 | xros1.2 | 15.4 | | Simulator - visionOS 1.2 | xrsimulator1.2 | 15.4 | +| Simulator - visionOS 2.0 | xrsimulator2.0 | 16.0 | +| visionOS 2.0 | xros2.0 | 16.0 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | -| Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | +| Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | DriverKit 22.4 | driverkit22.4 | 14.3.1 | | DriverKit 23.0 | driverkit23.0 | 15.0.1 | | DriverKit 23.2 | driverkit23.2 | 15.1, 15.2 | | DriverKit 23.4 | driverkit23.4 | 15.3 | | DriverKit 23.5 | driverkit23.5 | 15.4 | +| DriverKit 24.0 | driverkit24.0 | 16.0 | #### Installed Simulators -| OS | Xcode Version | Simulators | -| ------------ | ------------------------------------------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| iOS 16.4 | 14.3.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 17.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 17.2 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 17.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | -| iOS 17.5 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | -| tvOS 16.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 17.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 17.2 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 17.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 17.5 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| watchOS 9.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | -| watchOS 10.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | -| watchOS 10.2 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | -| watchOS 10.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | -| watchOS 10.5 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | +| OS | Xcode Version | Simulators | +| ------------ | -------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| iOS 16.4 | 14.3.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 17.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 17.2 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 17.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | +| iOS 17.5 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | +| tvOS 16.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 17.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 17.2 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 17.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 17.5 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| watchOS 9.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | +| watchOS 10.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 10.2 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 10.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 10.5 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | ### Android | Package Name | Version | @@ -235,7 +246,7 @@ | Android Command Line Tools | 11.0 | | Android Emulator | 34.2.15 | | Android SDK Build-tools | 34.0.0<br>33.0.2 33.0.3 | -| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | +| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | | Android SDK Platform-Tools | 35.0.1 | | Android Support Repository | 47.0.0 | | CMake | 3.22.1 | From 145c80df8dab28d9850f24361dd09ff05f854606 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Fri, 14 Jun 2024 08:57:12 +0200 Subject: [PATCH 2909/3485] [Ubuntu] disable apparmor (#10024) --- images/ubuntu/scripts/build/configure-environment.sh | 4 ++++ images/ubuntu/scripts/tests/System.Tests.ps1 | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/images/ubuntu/scripts/build/configure-environment.sh b/images/ubuntu/scripts/build/configure-environment.sh index 5e3781578523..cd7fa9f5c2e8 100644 --- a/images/ubuntu/scripts/build/configure-environment.sh +++ b/images/ubuntu/scripts/build/configure-environment.sh @@ -68,3 +68,7 @@ fi if is_ubuntu22; then sed -i 's/openssl_conf = openssl_init/#openssl_conf = openssl_init/g' /etc/ssl/openssl.cnf fi + +# Disable apparmor +systemctl is-active --quiet apparmor.service && systemctl stop apparmor.service +systemctl disable apparmor.service diff --git a/images/ubuntu/scripts/tests/System.Tests.ps1 b/images/ubuntu/scripts/tests/System.Tests.ps1 index 457eae078ea9..2a4bec3df2ec 100644 --- a/images/ubuntu/scripts/tests/System.Tests.ps1 +++ b/images/ubuntu/scripts/tests/System.Tests.ps1 @@ -6,3 +6,9 @@ Describe "Disk free space" -Skip:(-not [String]::IsNullOrEmpty($env:AGENT_NAME) $freeSpace | Should -BeGreaterOrEqual 17GB } } + +Describe "Apparmor is disabled" { + It "Apparmor is disabled" { + systemctl is-active apparmor | Should -Be "inactive" + } +} From e85f1e429d66fb9be791b3987c3a0c52b94e3b29 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Fri, 14 Jun 2024 15:38:24 +0200 Subject: [PATCH 2910/3485] Revert "[Ubuntu] disable apparmor (#10024)" (#10070) This reverts commit 145c80df8dab28d9850f24361dd09ff05f854606. --- images/ubuntu/scripts/build/configure-environment.sh | 4 ---- images/ubuntu/scripts/tests/System.Tests.ps1 | 6 ------ 2 files changed, 10 deletions(-) diff --git a/images/ubuntu/scripts/build/configure-environment.sh b/images/ubuntu/scripts/build/configure-environment.sh index cd7fa9f5c2e8..5e3781578523 100644 --- a/images/ubuntu/scripts/build/configure-environment.sh +++ b/images/ubuntu/scripts/build/configure-environment.sh @@ -68,7 +68,3 @@ fi if is_ubuntu22; then sed -i 's/openssl_conf = openssl_init/#openssl_conf = openssl_init/g' /etc/ssl/openssl.cnf fi - -# Disable apparmor -systemctl is-active --quiet apparmor.service && systemctl stop apparmor.service -systemctl disable apparmor.service diff --git a/images/ubuntu/scripts/tests/System.Tests.ps1 b/images/ubuntu/scripts/tests/System.Tests.ps1 index 2a4bec3df2ec..457eae078ea9 100644 --- a/images/ubuntu/scripts/tests/System.Tests.ps1 +++ b/images/ubuntu/scripts/tests/System.Tests.ps1 @@ -6,9 +6,3 @@ Describe "Disk free space" -Skip:(-not [String]::IsNullOrEmpty($env:AGENT_NAME) $freeSpace | Should -BeGreaterOrEqual 17GB } } - -Describe "Apparmor is disabled" { - It "Apparmor is disabled" { - systemctl is-active apparmor | Should -Be "inactive" - } -} From 3793317199f7f1eebff21ae96c77878546f06389 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com> Date: Sun, 16 Jun 2024 17:56:46 +0200 Subject: [PATCH 2911/3485] [Ubuntu] always install gfrotran (#10069) --- images/ubuntu/scripts/build/install-gfortran.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/images/ubuntu/scripts/build/install-gfortran.sh b/images/ubuntu/scripts/build/install-gfortran.sh index 5b94e6ef6473..701c96665acb 100644 --- a/images/ubuntu/scripts/build/install-gfortran.sh +++ b/images/ubuntu/scripts/build/install-gfortran.sh @@ -14,4 +14,7 @@ for version in ${versions[*]}; do apt-get install $version done +echo "Install versionless gfortran (latest)" +apt-get install gfortran + invoke_tests "Tools" "gfortran" From 89d72011e0cd8e10a4f178a194c04f873bf3757d Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Tue, 18 Jun 2024 11:51:57 +0200 Subject: [PATCH 2912/3485] [windows] Remove Visual Studio 2019 AzCopy component and fix signature (#10083) --- images/windows/toolsets/toolset-2019.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/images/windows/toolsets/toolset-2019.json b/images/windows/toolsets/toolset-2019.json index ee8afa005798..ce8dd0de7797 100644 --- a/images/windows/toolsets/toolset-2019.json +++ b/images/windows/toolsets/toolset-2019.json @@ -250,7 +250,7 @@ "subversion" : "16", "edition" : "Enterprise", "channel": "release", - "signature": "C2048FB509F1C37A8C3E9EC6648118458AA01780", + "signature": "F9A7CF9FBE13BAC767F4781061332DA6E8B4E0EE", "workloads": [ "Component.Dotfuscator", "Component.Linux.CMake", @@ -268,7 +268,6 @@ "Microsoft.VisualStudio.Component.AspNet45", "Microsoft.VisualStudio.Component.Azure.Kubernetes.Tools", "Microsoft.VisualStudio.Component.Azure.ServiceFabric.Tools", - "Microsoft.VisualStudio.Component.Azure.Storage.AzCopy", "Microsoft.VisualStudio.Component.Debugger.JustInTime", "Microsoft.VisualStudio.Component.DslTools", "Microsoft.VisualStudio.Component.EntityFramework", From d0b14aa29e5640d03131812dabbd7e06c1a0acf9 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 19 Jun 2024 11:32:20 +0000 Subject: [PATCH 2913/3485] Updating readme file for ubuntu20 version 20240617.1.1 (#10080) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2004-Readme.md | 74 +++++++++++++++--------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/images/ubuntu/Ubuntu2004-Readme.md b/images/ubuntu/Ubuntu2004-Readme.md index cf97187d7125..9561a6f10ac8 100644 --- a/images/ubuntu/Ubuntu2004-Readme.md +++ b/images/ubuntu/Ubuntu2004-Readme.md @@ -6,7 +6,7 @@ # Ubuntu 20.04 - OS Version: 20.04.6 LTS - Kernel Version: 5.15.0-1064-azure -- Image Version: 20240609.1.0 +- Image Version: 20240617.1.0 - Systemd version: 245.4-4ubuntu3.23 ## Installed Software @@ -33,8 +33,8 @@ ### Package Management - cpan 1.64 -- Helm 3.15.1 -- Homebrew 4.3.3 +- Helm 3.15.2 +- Homebrew 4.3.5 - Miniconda 24.4.0 - Npm 10.7.0 - NuGet 6.6.1.2 @@ -42,7 +42,7 @@ - Pip3 20.0.2 - Pipx 1.6.0 - RubyGems 3.1.2 -- Vcpkg (build from commit ad25766ae) +- Vcpkg (build from commit f7423ee18) - Yarn 1.22.22 #### Environment variables @@ -69,17 +69,17 @@ to accomplish this. ### Tools - Ansible 2.13.13 - apt-fast 1.10.0 -- AzCopy 10.25.0 - available by `azcopy` and `azcopy10` aliases -- Bazel 7.1.2 +- AzCopy 10.25.1 - available by `azcopy` and `azcopy10` aliases +- Bazel 7.2.0 - Bazelisk 1.19.0 - Bicep 0.28.1 - Buildah 1.22.3 - CMake 3.29.5 -- CodeQL Action Bundle 2.17.4 +- CodeQL Action Bundle 2.17.5 - Docker Amazon ECR Credential Helper 0.8.0 - Docker Compose v1 1.29.2 - Docker Compose v2 2.27.1 -- Docker-Buildx 0.14.1 +- Docker-Buildx 0.15.0 - Docker Client 26.1.3 - Docker Server 26.1.3 - Fastlane 2.220.0 @@ -91,43 +91,43 @@ to accomplish this. - HHVM (HipHop VM) 4.172.1 - jq 1.6 - Kind 0.23.0 -- Kubectl 1.30.1 +- Kubectl 1.30.2 - Kustomize 5.4.2 - Leiningen 2.11.2 - MediaInfo 19.09 - Mercurial 5.3.1 - Minikube 1.33.1 - n 9.2.3 -- Newman 6.1.2 +- Newman 6.1.3 - nvm 0.39.7 - OpenSSL 1.1.1f-1ubuntu2.22 - Packer 1.11.0 - Parcel 2.12.0 - PhantomJS 2.1.1 2.1.1 - Podman 3.4.2 -- Pulumi 3.119.0 +- Pulumi 3.120.0 - R 4.4.0 - Skopeo 1.5.0 - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 - Terraform 1.8.5 - yamllint 1.35.1 -- yq 4.44.1 +- yq 4.44.2 - zstd 1.5.6 ### CLI Tools - Alibaba Cloud CLI 3.0.174 -- AWS CLI 2.16.4 +- AWS CLI 2.16.9 - AWS CLI Session Manager Plugin 1.2.633.0 -- AWS SAM CLI 1.118.0 +- AWS SAM CLI 1.119.0 - Azure CLI 2.61.0 - Azure CLI (azure-devops) 1.0.1 -- GitHub CLI 2.50.0 -- Google Cloud CLI 479.0.0 -- Netlify CLI 17.26.1 -- OpenShift CLI 4.15.16 +- GitHub CLI 2.51.0 +- Google Cloud CLI 480.0.0 +- Netlify CLI 17.28.0 +- OpenShift CLI 4.15.17 - ORAS CLI 1.2.0 -- Vercel CLI 34.2.6 +- Vercel CLI 34.2.7 ### Java | Version | Environment Variable | @@ -139,7 +139,7 @@ to accomplish this. ### PHP Tools - PHP: 7.4.33, 8.0.30, 8.1.29, 8.2.20, 8.3.8 -- Composer 2.7.6 +- Composer 2.7.7 - PHPUnit 8.5.38 ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. @@ -152,25 +152,25 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Stack 2.15.7 ### Rust Tools -- Cargo 1.78.0 -- Rust 1.78.0 -- Rustdoc 1.78.0 +- Cargo 1.79.0 +- Rust 1.79.0 +- Rustdoc 1.79.0 - Rustup 1.27.1 #### Packages - Bindgen 0.69.4 - Cargo audit 0.20.0 -- Cargo clippy 0.1.78 +- Cargo clippy 0.1.79 - Cargo outdated 0.15.0 - Cbindgen 0.26.0 - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 125.0.6422.141 -- ChromeDriver 125.0.6422.141 -- Chromium 125.0.6422.0 -- Microsoft Edge 125.0.2535.92 -- Microsoft Edge WebDriver 125.0.2535.92 +- Google Chrome 126.0.6478.61 +- ChromeDriver 126.0.6478.61 +- Chromium 126.0.6478.0 +- Microsoft Edge 126.0.2592.56 +- Microsoft Edge WebDriver 126.0.2592.56 - Selenium server 4.21.0 - Mozilla Firefox 126.0.2 - Geckodriver 0.34.0 @@ -200,7 +200,7 @@ Use the following command as a part of your job to start the service: 'sudo syst ``` #### MySQL -- MySQL 8.0.36-0ubuntu0.20.04.1 +- MySQL 8.0.37-0ubuntu0.20.04.3 ``` User: root Password: root @@ -230,7 +230,7 @@ Use the following command as a part of your job to start the service: 'sudo syst - 3.9.19 - 3.10.14 - 3.11.9 -- 3.12.3 +- 3.12.4 #### PyPy - 2.7.18 [PyPy 7.3.16] @@ -249,7 +249,7 @@ Use the following command as a part of your job to start the service: 'sudo syst #### PowerShell Modules - Az: 11.3.1 -- MarkdownPS: 1.9 +- MarkdownPS: 1.10 - Microsoft.Graph: 2.19.0 - Pester: 5.6.0 - PSScriptAnalyzer: 1.22.0 @@ -289,15 +289,15 @@ Use the following command as a part of your job to start the service: 'sudo syst | alpine:3.16 | sha256:452e7292acee0ee16c332324d7de05fa2c99f9994ecc9f0779c602916a672ae4 | 2024-01-27 | | alpine:3.17 | sha256:53cf9478b76f4c8fae126acbdfb79bed6e69e628faff572ebe4a029d3d247d98 | 2024-01-27 | | alpine:3.18 | sha256:11e21d7b981a59554b3f822c49f6e9f57b6068bb74f49c4cd5cc4c663c7e5160 | 2024-01-27 | -| debian:10 | sha256:6e7bd55a5705914837aad8db01b349f4617510c11e47ccae8e87f6f14e489626 | 2024-05-14 | -| debian:11 | sha256:2c7a92a41cb814c00e7d455b2bc0c90ccdb9a4ced2ffdc10e562c7a84a186032 | 2024-05-14 | +| debian:10 | sha256:58ce6f1271ae1c8a2006ff7d3e54e9874d839f573d8009c20154ad0f2fb0a225 | 2024-06-13 | +| debian:11 | sha256:d584e02c85bc9b3bd8df01662e4f605a66e1b9a04f9dea0e288f56da474269a0 | 2024-06-13 | | debian:9 | sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be | 2022-06-23 | -| moby/buildkit:latest | sha256:9194b5ec1be368f41c516df7f93f7f540630ea06136056b2ffebb62226ed4ad6 | 2024-04-25 | +| moby/buildkit:latest | sha256:21ca05626f03ebe128d268d6d7512024217b0f3adf7881047bdc5e83968ada87 | 2024-06-11 | | node:16 | sha256:f77a1aef2da8d83e45ec990f45df50f1a286c5fe8bbfb8c6e4246c6389705c0b | 2023-09-07 | | node:16-alpine | sha256:a1f9d027912b58a7c75be7716c97cfbc6d3099f3a97ed84aa490be9dee20e787 | 2023-08-10 | -| node:18 | sha256:b08b1356559e2e9945f47ded630c9eb9d4e3ca04f111ab20d55652442cf14aee | 2024-05-21 | +| node:18 | sha256:4149a450f71699db7d695eeae3bc443e5aa97a7ff2f3a881a97e88f0d5568ee6 | 2024-06-13 | | node:18-alpine | sha256:6937be95129321422103452e2883021cc4a96b63c32d7947187fcb25df84fc3f | 2024-06-04 | -| node:20 | sha256:ab71b9da5ba19445dc5bb76bf99c218941db2c4d70ff4de4e0d9ec90920bfe3f | 2024-05-28 | +| node:20 | sha256:d0a9a2399581a9de1ff962a48a28b5cfe700678a6a5df8e31a63aaa47bebb923 | 2024-06-13 | | node:20-alpine | sha256:66c7d989b6dabba6b4305b88f40912679aebd9f387a5b16ffa76dfb9ae90b060 | 2024-06-04 | | ubuntu:20.04 | sha256:0b897358ff6624825fb50d20ffb605ab0eaea77ced0adb8c6a4b756513dec6fc | 2024-06-03 | From 4edcdf297d4511c09131c2f556eb6742f0f1b3fa Mon Sep 17 00:00:00 2001 From: kishorekumar-anchala <168699259+kishorekumar-anchala@users.noreply.github.com> Date: Wed, 19 Jun 2024 19:39:56 +0530 Subject: [PATCH 2914/3485] [windows] Fix Google Cloud CLI signature (#10092) --- images/windows/scripts/build/Install-GoogleCloudCLI.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/windows/scripts/build/Install-GoogleCloudCLI.ps1 b/images/windows/scripts/build/Install-GoogleCloudCLI.ps1 index a26481db425b..dbdb782cd54d 100644 --- a/images/windows/scripts/build/Install-GoogleCloudCLI.ps1 +++ b/images/windows/scripts/build/Install-GoogleCloudCLI.ps1 @@ -7,6 +7,6 @@ Install-Binary ` -Url 'https://dl.google.com/dl/cloudsdk/channels/rapid/GoogleCloudSDKInstaller.exe' ` -InstallArgs @("/S", "/allusers", "/noreporting") ` - -ExpectedSignature '2673EA6CC23BEFFDA49AC715B121544098A1284C' + -ExpectedSignature '607A3EDAA64933E94422FC8F0C80388E0590986C' Invoke-PesterTests -TestFile "Tools" -TestName "GoogleCloudCLI" From 3464b06c4c463acdb8930e305d67a1a0c8d4bcdf Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 19 Jun 2024 14:39:16 +0000 Subject: [PATCH 2915/3485] Updating readme file for ubuntu22 version 20240616.1.1 (#10082) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2204-Readme.md | 76 +++++++++++++++--------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/images/ubuntu/Ubuntu2204-Readme.md b/images/ubuntu/Ubuntu2204-Readme.md index 97c7c1fda98a..5565421e9a36 100644 --- a/images/ubuntu/Ubuntu2204-Readme.md +++ b/images/ubuntu/Ubuntu2204-Readme.md @@ -5,8 +5,8 @@ *** # Ubuntu 22.04 - OS Version: 22.04.4 LTS -- Kernel Version: 6.5.0-1021-azure -- Image Version: 20240609.1.0 +- Kernel Version: 6.5.0-1022-azure +- Image Version: 20240616.1.0 - Systemd version: 249.11-0ubuntu3.12 ## Installed Software @@ -31,8 +31,8 @@ ### Package Management - cpan 1.64 -- Helm 3.15.1 -- Homebrew 4.3.3 +- Helm 3.15.2 +- Homebrew 4.3.5 - Miniconda 24.4.0 - Npm 10.7.0 - NuGet 6.6.1.2 @@ -40,7 +40,7 @@ - Pip3 22.0.2 - Pipx 1.6.0 - RubyGems 3.3.5 -- Vcpkg (build from commit ad25766ae) +- Vcpkg (build from commit f7423ee18) - Yarn 1.22.22 #### Environment variables @@ -67,17 +67,17 @@ to accomplish this. ### Tools - Ansible 2.17.0 - apt-fast 1.10.0 -- AzCopy 10.25.0 - available by `azcopy` and `azcopy10` aliases -- Bazel 7.1.2 +- AzCopy 10.25.1 - available by `azcopy` and `azcopy10` aliases +- Bazel 7.2.0 - Bazelisk 1.19.0 - Bicep 0.28.1 - Buildah 1.23.1 - CMake 3.29.5 -- CodeQL Action Bundle 2.17.4 +- CodeQL Action Bundle 2.17.5 - Docker Amazon ECR Credential Helper 0.8.0 - Docker Compose v1 1.29.2 - Docker Compose v2 2.27.1 -- Docker-Buildx 0.14.1 +- Docker-Buildx 0.15.0 - Docker Client 26.1.3 - Docker Server 26.1.3 - Fastlane 2.220.0 @@ -88,42 +88,42 @@ to accomplish this. - Heroku 8.11.5 - jq 1.6 - Kind 0.23.0 -- Kubectl 1.30.1 +- Kubectl 1.30.2 - Kustomize 5.4.2 - Leiningen 2.11.2 - MediaInfo 21.09 - Mercurial 6.1.1 - Minikube 1.33.1 - n 9.2.3 -- Newman 6.1.2 +- Newman 6.1.3 - nvm 0.39.7 - OpenSSL 3.0.2-0ubuntu1.15 - Packer 1.11.0 - Parcel 2.12.0 - Podman 3.4.4 -- Pulumi 3.119.0 +- Pulumi 3.120.0 - R 4.4.0 - Skopeo 1.4.1 - Sphinx Open Source Search Server 2.2.11 - SVN 1.14.1 - Terraform 1.8.5 - yamllint 1.35.1 -- yq 4.44.1 +- yq 4.44.2 - zstd 1.5.6 ### CLI Tools - Alibaba Cloud CLI 3.0.207 -- AWS CLI 2.16.4 +- AWS CLI 2.16.9 - AWS CLI Session Manager Plugin 1.2.633.0 -- AWS SAM CLI 1.118.0 +- AWS SAM CLI 1.119.0 - Azure CLI 2.61.0 - Azure CLI (azure-devops) 1.0.1 -- GitHub CLI 2.50.0 -- Google Cloud CLI 479.0.0 -- Netlify CLI 17.26.1 -- OpenShift CLI 4.15.16 +- GitHub CLI 2.51.0 +- Google Cloud CLI 480.0.0 +- Netlify CLI 17.27.0 +- OpenShift CLI 4.15.17 - ORAS CLI 1.2.0 -- Vercel CLI 34.2.6 +- Vercel CLI 34.2.7 ### Java | Version | Environment Variable | @@ -135,7 +135,7 @@ to accomplish this. ### PHP Tools - PHP: 8.1.2 -- Composer 2.7.6 +- Composer 2.7.7 - PHPUnit 8.5.38 ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. @@ -148,25 +148,25 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Stack 2.15.7 ### Rust Tools -- Cargo 1.78.0 -- Rust 1.78.0 -- Rustdoc 1.78.0 +- Cargo 1.79.0 +- Rust 1.79.0 +- Rustdoc 1.79.0 - Rustup 1.27.1 #### Packages - Bindgen 0.69.4 - Cargo audit 0.20.0 -- Cargo clippy 0.1.78 +- Cargo clippy 0.1.79 - Cargo outdated 0.15.0 - Cbindgen 0.26.0 - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 125.0.6422.141 -- ChromeDriver 125.0.6422.141 -- Chromium 125.0.6422.0 -- Microsoft Edge 125.0.2535.92 -- Microsoft Edge WebDriver 125.0.2535.92 +- Google Chrome 126.0.6478.61 +- ChromeDriver 126.0.6478.61 +- Chromium 126.0.6478.0 +- Microsoft Edge 126.0.2592.56 +- Microsoft Edge WebDriver 126.0.2592.56 - Selenium server 4.21.0 - Mozilla Firefox 126.0.2 - Geckodriver 0.34.0 @@ -195,7 +195,7 @@ Use the following command as a part of your job to start the service: 'sudo syst ``` #### MySQL -- MySQL 8.0.36-0ubuntu0.22.04.1 +- MySQL 8.0.37-0ubuntu0.22.04.3 ``` User: root Password: root @@ -225,7 +225,7 @@ Use the following command as a part of your job to start the service: 'sudo syst - 3.9.19 - 3.10.14 - 3.11.9 -- 3.12.3 +- 3.12.4 #### PyPy - 3.7.13 [PyPy 7.3.9] @@ -241,7 +241,7 @@ Use the following command as a part of your job to start the service: 'sudo syst #### PowerShell Modules - Az: 11.3.1 -- MarkdownPS: 1.9 +- MarkdownPS: 1.10 - Microsoft.Graph: 2.19.0 - Pester: 5.6.0 - PSScriptAnalyzer: 1.22.0 @@ -280,14 +280,14 @@ Use the following command as a part of your job to start the service: 'sudo syst | alpine:3.16 | sha256:452e7292acee0ee16c332324d7de05fa2c99f9994ecc9f0779c602916a672ae4 | 2024-01-27 | | alpine:3.17 | sha256:53cf9478b76f4c8fae126acbdfb79bed6e69e628faff572ebe4a029d3d247d98 | 2024-01-27 | | alpine:3.18 | sha256:11e21d7b981a59554b3f822c49f6e9f57b6068bb74f49c4cd5cc4c663c7e5160 | 2024-01-27 | -| debian:10 | sha256:6e7bd55a5705914837aad8db01b349f4617510c11e47ccae8e87f6f14e489626 | 2024-05-14 | -| debian:11 | sha256:2c7a92a41cb814c00e7d455b2bc0c90ccdb9a4ced2ffdc10e562c7a84a186032 | 2024-05-14 | -| moby/buildkit:latest | sha256:9194b5ec1be368f41c516df7f93f7f540630ea06136056b2ffebb62226ed4ad6 | 2024-04-25 | +| debian:10 | sha256:58ce6f1271ae1c8a2006ff7d3e54e9874d839f573d8009c20154ad0f2fb0a225 | 2024-06-13 | +| debian:11 | sha256:d584e02c85bc9b3bd8df01662e4f605a66e1b9a04f9dea0e288f56da474269a0 | 2024-06-13 | +| moby/buildkit:latest | sha256:21ca05626f03ebe128d268d6d7512024217b0f3adf7881047bdc5e83968ada87 | 2024-06-11 | | node:16 | sha256:f77a1aef2da8d83e45ec990f45df50f1a286c5fe8bbfb8c6e4246c6389705c0b | 2023-09-07 | | node:16-alpine | sha256:a1f9d027912b58a7c75be7716c97cfbc6d3099f3a97ed84aa490be9dee20e787 | 2023-08-10 | -| node:18 | sha256:b08b1356559e2e9945f47ded630c9eb9d4e3ca04f111ab20d55652442cf14aee | 2024-05-21 | +| node:18 | sha256:4149a450f71699db7d695eeae3bc443e5aa97a7ff2f3a881a97e88f0d5568ee6 | 2024-06-13 | | node:18-alpine | sha256:6937be95129321422103452e2883021cc4a96b63c32d7947187fcb25df84fc3f | 2024-06-04 | -| node:20 | sha256:ab71b9da5ba19445dc5bb76bf99c218941db2c4d70ff4de4e0d9ec90920bfe3f | 2024-05-28 | +| node:20 | sha256:d0a9a2399581a9de1ff962a48a28b5cfe700678a6a5df8e31a63aaa47bebb923 | 2024-06-13 | | node:20-alpine | sha256:66c7d989b6dabba6b4305b88f40912679aebd9f387a5b16ffa76dfb9ae90b060 | 2024-06-04 | | ubuntu:20.04 | sha256:0b897358ff6624825fb50d20ffb605ab0eaea77ced0adb8c6a4b756513dec6fc | 2024-06-03 | | ubuntu:22.04 | sha256:19478ce7fc2ffbce89df29fea5725a8d12e57de52eb9ea570890dc5852aac1ac | 2024-06-03 | From b7a8e5ca52600ce7253a7915673de7390c046915 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 19 Jun 2024 14:59:11 +0000 Subject: [PATCH 2916/3485] Updating readme file for ubuntu24 version 20240617.1.1 (#10084) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2404-Readme.md | 70 +++++++++++++++--------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/images/ubuntu/Ubuntu2404-Readme.md b/images/ubuntu/Ubuntu2404-Readme.md index 9555f457ecf3..e2d8e83b4bdd 100644 --- a/images/ubuntu/Ubuntu2404-Readme.md +++ b/images/ubuntu/Ubuntu2404-Readme.md @@ -6,7 +6,7 @@ # Ubuntu 24.04 LTS - OS Version: 24.04 LTS - Kernel Version: 6.8.0-1007-azure -- Image Version: 20240604.1.0 +- Image Version: 20240617.1.0 - Systemd version: 255.4-1ubuntu8 ## Installed Software @@ -19,7 +19,7 @@ - Dash 0.5.12-6ubuntu5 - GNU C++: 12.3.0, 13.2.0, 14.0.1 - GNU Fortran: 12.3.0, 13.2.0, 14.0.1 -- Julia 1.10.3 +- Julia 1.10.4 - Node.js 20.14.0 - Perl 5.38.2 - Python 3.12.3 @@ -27,15 +27,15 @@ ### Package Management - cpan 1.64 -- Helm 3.15.1 -- Homebrew 4.3.3 +- Helm 3.15.2 +- Homebrew 4.3.6 - Miniconda 24.4.0 - Npm 10.7.0 - Pip 24.0 - Pip3 24.0 - Pipx 1.4.3 - RubyGems 3.4.20 -- Vcpkg (build from commit 9760ce619) +- Vcpkg (build from commit 40616a5e9) - Yarn 1.22.22 #### Environment variables @@ -59,19 +59,19 @@ to accomplish this. - Maven 3.8.8 ### Tools -- Ansible 2.16.7 -- AzCopy 10.25.0 - available by `azcopy` and `azcopy10` aliases -- Bazel 7.1.2 +- Ansible 2.17.1 +- AzCopy 10.25.1 - available by `azcopy` and `azcopy10` aliases +- Bazel 7.2.0 - Bazelisk 1.19.0 -- Bicep 0.27.1 +- Bicep 0.28.1 - Buildah 1.33.7 -- CMake 3.29.4 -- CodeQL Action Bundle 2.17.3 +- CMake 3.29.6 +- CodeQL Action Bundle 2.17.5 - Docker Amazon ECR Credential Helper 0.8.0 - Docker Compose v2 2.27.1 -- Docker-Buildx 0.14.1 -- Docker Client 26.1.0 -- Docker Server 26.1.0 +- Docker-Buildx 0.15.0 +- Docker Client 26.1.3 +- Docker Server 26.1.3 - Fastlane 2.220.0 - Git 2.45.2 - Git LFS 3.5.1 @@ -79,30 +79,30 @@ to accomplish this. - Haveged 1.9.14 - jq 1.7 - Kind 0.23.0 -- Kubectl 1.30.1 +- Kubectl 1.30.2 - Kustomize 5.4.2 - MediaInfo 24.01 - Mercurial 6.7.2 - Minikube 1.33.1 - n 9.2.3 -- Newman 6.1.2 +- Newman 6.1.3 - OpenSSL 3.0.13-0ubuntu3.1 - Parcel 2.12.0 - Podman 4.9.3 -- Pulumi 3.118.0 +- Pulumi 3.120.0 - Skopeo 1.13.3 - Sphinx Open Source Search Server 2.2.11 - yamllint 1.35.1 -- yq 4.44.1 +- yq 4.44.2 - zstd 1.5.6 ### CLI Tools -- AWS CLI 2.16.0 +- AWS CLI 2.16.10 - AWS CLI Session Manager Plugin 1.2.633.0 -- AWS SAM CLI 1.118.0 +- AWS SAM CLI 1.119.0 - Azure CLI 2.61.0 - Azure CLI (azure-devops) 1.0.1 -- GitHub CLI 2.50.0 +- GitHub CLI 2.51.0 ### Java | Version | Environment Variable | @@ -114,7 +114,7 @@ to accomplish this. ### PHP Tools - PHP: 8.3.6 -- Composer 2.7.6 +- Composer 2.7.7 - PHPUnit 8.5.38 ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. @@ -127,18 +127,18 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Stack 2.15.7 ### Rust Tools -- Cargo 1.78.0 -- Rust 1.78.0 -- Rustdoc 1.78.0 +- Cargo 1.79.0 +- Rust 1.79.0 +- Rustdoc 1.79.0 - Rustup 1.27.1 #### Packages - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 125.0.6422.141 -- ChromeDriver 125.0.6422.141 -- Chromium 125.0.6422.0 +- Google Chrome 126.0.6478.61 +- ChromeDriver 126.0.6478.61 +- Chromium 126.0.6478.0 - Selenium server 4.21.0 #### Environment variables @@ -165,7 +165,7 @@ Use the following command as a part of your job to start the service: 'sudo syst ``` #### MySQL -- MySQL 8.0.36-2ubuntu3 +- MySQL 8.0.37-0ubuntu0.24.04.1 ``` User: root Password: root @@ -177,8 +177,8 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Go - 1.20.14 -- 1.21.10 -- 1.22.3 +- 1.21.11 +- 1.22.4 #### Node.js - 16.20.2 @@ -189,7 +189,7 @@ Use the following command as a part of your job to start the service: 'sudo syst - 3.9.19 - 3.10.14 - 3.11.9 -- 3.12.3 +- 3.12.4 #### PyPy - 3.9.19 [PyPy 7.3.16] @@ -201,7 +201,7 @@ Use the following command as a part of your job to start the service: 'sudo syst #### PowerShell Modules - Az: 11.5.0 - Microsoft.Graph: 2.19.0 -- Pester: 5.5.0 +- Pester: 5.6.0 - PSScriptAnalyzer: 1.22.0 ### Web Servers @@ -215,7 +215,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | -------------------------- | ------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 12.0 | | Android SDK Build-tools | 34.0.0 | -| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1) | +| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1) | | Android Support Repository | 47.0.0 | | Google Play services | 49 | | Google Repository | 58 | @@ -296,7 +296,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | time | 1.9-0.2build1 | | tk | 8.6.14build1 | | tree | 2.1.1-2ubuntu3 | -| tzdata | 2024a-2ubuntu1 | +| tzdata | 2024a-3ubuntu1.1 | | unzip | 6.0-28ubuntu4 | | upx | 4.2.2-3 | | wget | 1.21.4-1ubuntu4 | From d6a35ea98b18fdd355d8e2873b86b75a36a0f753 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 19 Jun 2024 16:28:40 +0000 Subject: [PATCH 2917/3485] Updating readme file for macos-14 version 20240616.1 (#10077) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-14-Readme.md | 40 ++++++++++++++++----------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/images/macos/macos-14-Readme.md b/images/macos/macos-14-Readme.md index 00efdacbfa0f..cb9031fd26ca 100644 --- a/images/macos/macos-14-Readme.md +++ b/images/macos/macos-14-Readme.md @@ -1,7 +1,7 @@ # macOS 14 - OS Version: macOS 14.5 (23F79) - Kernel Version: Darwin 23.5.0 -- Image Version: 20240612.5 +- Image Version: 20240616.1 ## Installed Software @@ -25,7 +25,7 @@ - Ruby 3.0.7p220 ### Package Management -- Bundler 2.5.11 +- Bundler 2.5.13 - Carthage 0.39.1 - CocoaPods 1.15.2 - Composer 2.7.7 @@ -34,7 +34,7 @@ - NuGet 6.3.1.1 - Pip3 24.0 (python 3.12) - Pipx 1.6.0 -- RubyGems 3.5.11 +- RubyGems 3.5.13 - Yarn 1.22.22 ### Project Management @@ -45,14 +45,14 @@ ### Utilities - 7-Zip 17.05 - aria2 1.37.0 -- azcopy 10.25.0 +- azcopy 10.25.1 - bazel 7.2.0 - bazelisk 1.20.0 - bsdtar 3.5.3 - available by 'tar' alias - Curl 8.8.0 - Git 2.45.2 - Git LFS 3.5.1 -- GitHub CLI 2.50.0 +- GitHub CLI 2.51.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.24.5 - gpg (GnuPG) 2.4.5 @@ -60,18 +60,18 @@ - OpenSSL 1.1.1w 11 Sep 2023 - Packer 1.9.4 - pkg-config 0.29.2 -- yq 4.44.1 +- yq 4.44.2 - zstd 1.5.6 ### Tools -- AWS CLI 2.16.7 -- AWS SAM CLI 1.118.0 +- AWS CLI 2.16.9 +- AWS SAM CLI 1.119.0 - AWS Session Manager CLI 1.2.633.0 - Azure CLI 2.61.0 - Azure CLI (azure-devops) 1.0.1 - Bicep CLI 0.28.1 - Cmake 3.29.5 -- CodeQL Action Bundle 2.17.4 +- CodeQL Action Bundle 2.17.5 - Fastlane 2.220.0 - SwiftFormat 0.54.0 - Xcbeautify 2.3.1 @@ -84,11 +84,11 @@ ### Browsers - Safari 17.5 (19618.2.12.11.6) - SafariDriver 17.5 (19618.2.12.11.6) -- Google Chrome 126.0.6478.57 -- Google Chrome for Testing 126.0.6478.55 -- ChromeDriver 126.0.6478.55 -- Microsoft Edge 125.0.2535.92 -- Microsoft Edge WebDriver 125.0.2535.92 +- Google Chrome 126.0.6478.62 +- Google Chrome for Testing 126.0.6478.61 +- ChromeDriver 126.0.6478.61 +- Microsoft Edge 126.0.2592.56 +- Microsoft Edge WebDriver 126.0.2592.56 - Mozilla Firefox 127.0 - geckodriver 0.34.0 - Selenium server 4.21.0 @@ -130,13 +130,13 @@ - 1.22.4 ### Rust Tools -- Cargo 1.78.0 -- Rust 1.78.0 -- Rustdoc 1.78.0 +- Cargo 1.79.0 +- Rust 1.79.0 +- Rustdoc 1.79.0 - Rustup 1.27.1 #### Packages -- Clippy 0.1.78 +- Clippy 0.1.79 - Rustfmt 1.7.0-stable ### PowerShell Tools @@ -207,10 +207,10 @@ | visionOS 1.0 | xros1.0 | 15.2 | | Simulator - visionOS 1.1 | xrsimulator1.1 | 15.3 | | visionOS 1.1 | xros1.1 | 15.3 | -| visionOS 1.2 | xros1.2 | 15.4 | | Simulator - visionOS 1.2 | xrsimulator1.2 | 15.4 | -| Simulator - visionOS 2.0 | xrsimulator2.0 | 16.0 | +| visionOS 1.2 | xros1.2 | 15.4 | | visionOS 2.0 | xros2.0 | 16.0 | +| Simulator - visionOS 2.0 | xrsimulator2.0 | 16.0 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | From e7f54bfde85ecc199190032c48cc1ef8c5cac5c5 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 19 Jun 2024 17:20:15 +0000 Subject: [PATCH 2918/3485] Updating readme file for macos-13-arm64 version 20240617.2 (#10081) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-13-arm64-Readme.md | 46 +++++++++++++-------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/images/macos/macos-13-arm64-Readme.md b/images/macos/macos-13-arm64-Readme.md index e3db2d39d70d..ce61929faab0 100644 --- a/images/macos/macos-13-arm64-Readme.md +++ b/images/macos/macos-13-arm64-Readme.md @@ -1,12 +1,12 @@ # macOS 13 - OS Version: macOS 13.6.7 (22G720) - Kernel Version: Darwin 22.6.0 -- Image Version: 20240609.1 +- Image Version: 20240617.2 ## Installed Software ### Language and Runtime -- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.410, 8.0.101, 8.0.204, 8.0.301 +- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.410, 8.0.101, 8.0.204, 8.0.302 - Bash 3.2.57(1)-release - Clang/LLVM 14.0.0 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` @@ -20,19 +20,19 @@ - Mono 6.12.0.188 - Node.js 20.14.0 - Perl 5.38.2 -- Python3 3.12.3 +- Python3 3.12.4 - Ruby 3.0.7p220 ### Package Management -- Bundler 2.5.11 +- Bundler 2.5.13 - Carthage 0.39.1 - CocoaPods 1.15.2 -- Homebrew 4.3.3 +- Homebrew 4.3.5 - NPM 10.7.0 - NuGet 6.3.1.1 - Pip3 24.0 (python 3.12) - Pipx 1.6.0 -- RubyGems 3.5.11 +- RubyGems 3.5.13 - Yarn 1.22.22 ### Project Management @@ -43,14 +43,14 @@ ### Utilities - 7-Zip 17.05 - aria2 1.37.0 -- azcopy 10.25.0 -- bazel 7.1.2 +- azcopy 10.25.1 +- bazel 7.2.0 - bazelisk 1.20.0 - bsdtar 3.5.3 - available by 'tar' alias - Curl 8.4.0 - Git 2.45.2 - Git LFS 3.5.1 -- GitHub CLI 2.50.0 +- GitHub CLI 2.51.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.24.5 - gpg (GnuPG) 2.4.5 @@ -58,20 +58,20 @@ - OpenSSL 1.1.1w 11 Sep 2023 - Packer 1.9.4 - pkg-config 0.29.2 -- yq 4.44.1 +- yq 4.44.2 - zstd 1.5.6 ### Tools -- AWS CLI 2.16.4 -- AWS SAM CLI 1.118.0 +- AWS CLI 2.16.9 +- AWS SAM CLI 1.119.0 - AWS Session Manager CLI 1.2.633.0 - Azure CLI 2.61.0 - Azure CLI (azure-devops) 1.0.1 - Bicep CLI 0.28.1 - Cmake 3.29.5 -- CodeQL Action Bundle 2.17.4 +- CodeQL Action Bundle 2.17.5 - Fastlane 2.220.0 -- SwiftFormat 0.53.10 +- SwiftFormat 0.54.0 - Xcbeautify 2.3.1 - Xcode Command Line Tools 14.3.1.0.1.1683849156 - Xcodes 1.4.1 @@ -81,9 +81,9 @@ ### Browsers - Safari 17.5 (18618.2.12.111.5) - SafariDriver 17.5 (18618.2.12.111.5) -- Google Chrome 125.0.6422.142 -- Google Chrome for Testing 125.0.6422.141 -- ChromeDriver 125.0.6422.141 +- Google Chrome 126.0.6478.62 +- Google Chrome for Testing 126.0.6478.61 +- ChromeDriver 126.0.6478.61 - Selenium server 4.21.0 #### Environment variables @@ -106,7 +106,7 @@ - 3.9.13 - 3.10.11 - 3.11.9 -- 3.12.3 +- 3.12.4 #### Node.js - 16.20.1 @@ -119,13 +119,13 @@ - 1.22.4 ### Rust Tools -- Cargo 1.78.0 -- Rust 1.78.0 -- Rustdoc 1.78.0 +- Cargo 1.79.0 +- Rust 1.79.0 +- Rustdoc 1.79.0 - Rustup 1.27.1 #### Packages -- Clippy 0.1.78 +- Clippy 0.1.79 - Rustfmt 1.7.0-stable ### PowerShell Tools @@ -180,8 +180,8 @@ | Simulator - watchOS 9.4 | watchsimulator9.4 | 14.3.1 | | Simulator - watchOS 10.0 | watchsimulator10.0 | 15.0.1 | | Simulator - watchOS 10.2 | watchsimulator10.2 | 15.1, 15.2 | -| visionOS 1.0 | xros1.0 | 15.2 | | Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | +| visionOS 1.0 | xros1.0 | 15.2 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | From 8c3d5d9d09edc13a2fcc1173ccbc8c3c24e8f972 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 19 Jun 2024 18:51:18 +0000 Subject: [PATCH 2919/3485] Updating readme file for macos-12 version 20240617.1 (#10086) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-12-Readme.md | 84 ++++++++++++++++----------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/images/macos/macos-12-Readme.md b/images/macos/macos-12-Readme.md index 25e4df42be43..ef7761a444ed 100644 --- a/images/macos/macos-12-Readme.md +++ b/images/macos/macos-12-Readme.md @@ -1,12 +1,12 @@ # macOS 12 - OS Version: macOS 12.7.5 (21H1222) - Kernel Version: Darwin 21.6.0 -- Image Version: 20240602.1 +- Image Version: 20240617.1 ## Installed Software ### Language and Runtime -- .NET Core SDK: 6.0.423, 7.0.102, 7.0.202, 7.0.306, 7.0.410, 8.0.101, 8.0.204, 8.0.301 +- .NET Core SDK: 6.0.423, 7.0.102, 7.0.202, 7.0.306, 7.0.410, 8.0.101, 8.0.204, 8.0.302 - Bash 3.2.57(1)-release - Clang/LLVM 14.0.0 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` @@ -16,35 +16,35 @@ - GNU Fortran 11 (Homebrew GCC 11.4.0) - available by `gfortran-11` alias - GNU Fortran 12 (Homebrew GCC 12.3.0) - available by `gfortran-12` alias - GNU Fortran 13 (Homebrew GCC 13.3.0) - available by `gfortran-13` alias -- Julia 1.10.3 +- Julia 1.10.4 - Kotlin 2.0.0-release-341 -- Go 1.21.10 +- Go 1.21.11 - Mono 6.12.0.188 - Node.js 18.20.3 - MSBuild 16.10.1.51301 (Mono 6.12.0.188) - NVM 0.39.7 - NVM - Cached node versions: 16.20.2, 18.20.3, 20.14.0 - Perl 5.38.2 -- PHP 8.3.7 +- PHP 8.3.8 - Python 2.7.18 -- Python3 3.12.3 -- R 4.4.0 +- Python3 3.12.4 +- R 4.4.1 - Ruby 3.0.7p220 ### Package Management -- Bundler 2.5.11 +- Bundler 2.5.13 - Carthage 0.39.1 - CocoaPods 1.15.2 -- Composer 2.7.6 -- Homebrew 4.3.2 +- Composer 2.7.7 +- Homebrew 4.3.6 - Miniconda 24.4.0 - NPM 10.7.0 - NuGet 6.3.1.1 - Pip 20.3.4 (python 2.7) - Pip3 24.0 (python 3.12) - Pipx 1.6.0 -- RubyGems 3.5.11 -- Vcpkg 2024 (build from commit 67cc1677c) +- RubyGems 3.5.13 +- Vcpkg 2024 (build from commit 67a300519) - Yarn 1.22.22 #### Environment variables @@ -55,28 +55,28 @@ ### Project Management - Apache Ant 1.10.14 -- Apache Maven 3.9.7 +- Apache Maven 3.9.8 - Gradle 8.8 - Sbt 1.10.0 ### Utilities - 7-Zip 17.05 - aria2 1.37.0 -- azcopy 10.25.0 -- bazel 7.1.2 +- azcopy 10.25.1 +- bazel 7.2.0 - bazelisk 1.20.0 - bsdtar 3.5.1 - available by 'tar' alias - Curl 8.8.0 - Git 2.45.2 - Git LFS 3.5.1 -- GitHub CLI 2.50.0 +- GitHub CLI 2.51.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.24.5 - gpg (GnuPG) 2.4.5 - ImageMagick 7.1.1-33 - jq 1.7.1 -- mongo 5.0.26 -- mongod 5.0.26 +- mongo 5.0.27 +- mongod 5.0.27 - OpenSSL 1.1.1w 11 Sep 2023 - Packer 1.9.4 - pkg-config 0.29.2 @@ -87,27 +87,27 @@ - Switchaudio-osx 1.2.2 - Vagrant 2.4.1 - VirtualBox 6.1.38r153438 -- yq 4.44.1 +- yq 4.44.2 - zstd 1.5.6 ### Tools - App Center CLI 3.0.0 -- AWS CLI 2.15.62 -- AWS SAM CLI 1.118.0 +- AWS CLI 2.16.10 +- AWS SAM CLI 1.119.0 - AWS Session Manager CLI 1.2.633.0 - Azure CLI 2.61.0 - Azure CLI (azure-devops) 1.0.1 -- Bicep CLI 0.27.1 +- Bicep CLI 0.28.1 - Cabal 3.10.3.0 -- Cmake 3.29.3 -- CodeQL Action Bundle 2.17.3 +- Cmake 3.29.5 +- CodeQL Action Bundle 2.17.5 - Colima 0.6.9 - Fastlane 2.220.0 - GHC 9.10.1 - GHCup 0.1.22.0 -- Jazzy 0.15.0 +- Jazzy 0.15.1 - Stack 2.15.7 -- SwiftFormat 0.53.10 +- SwiftFormat 0.54.0 - Swig 4.2.1 - Xcbeautify 1.6.0 - Xcode Command Line Tools 14.2.0.0.1.1668646533 @@ -120,12 +120,12 @@ ### Browsers - Safari 17.5 (17618.2.12.111.5) - SafariDriver 17.5 (17618.2.12.111.5) -- Google Chrome 125.0.6422.142 -- Google Chrome for Testing 125.0.6422.141 -- ChromeDriver 125.0.6422.141 -- Microsoft Edge 125.0.2535.79 -- Microsoft Edge WebDriver 125.0.2535.79 -- Mozilla Firefox 126.0.1 +- Google Chrome 126.0.6478.62 +- Google Chrome for Testing 126.0.6478.61 +- ChromeDriver 126.0.6478.61 +- Microsoft Edge 126.0.2592.56 +- Microsoft Edge WebDriver 126.0.2592.61 +- Mozilla Firefox 127.0 - geckodriver 0.34.0 - Selenium server 4.21.0 @@ -163,7 +163,7 @@ - 3.9.19 - 3.10.14 - 3.11.9 -- 3.12.3 +- 3.12.4 #### Node.js - 16.20.2 @@ -172,13 +172,13 @@ #### Go - 1.20.14 -- 1.21.10 -- 1.22.3 +- 1.21.11 +- 1.22.4 ### Rust Tools -- Cargo 1.78.0 -- Rust 1.78.0 -- Rustdoc 1.78.0 +- Cargo 1.79.0 +- Rust 1.79.0 +- Rustdoc 1.79.0 - Rustup 1.27.1 #### Packages @@ -186,7 +186,7 @@ - Cargo-audit 0.20.0 - Cargo-outdated 0.15.0 - Cbindgen 0.26.0 -- Clippy 0.1.78 +- Clippy 0.1.79 - Rustfmt 1.7.0-stable ### PowerShell Tools @@ -194,8 +194,8 @@ #### PowerShell Modules - Az: 12.0.0 -- MarkdownPS: 1.9 -- Pester: 5.5.0 +- MarkdownPS: 1.10 +- Pester: 5.6.0 - PSScriptAnalyzer: 1.22.0 ### Web Servers @@ -332,7 +332,7 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" | Android Command Line Tools | 8.0 | | Android Emulator | 34.2.15 | | Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2 33.0.3<br>32.0.0<br>31.0.0 | -| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1) | +| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1) | | Android SDK Platform-Tools | 35.0.1 | | Android Support Repository | 47.0.0 | | CMake | 3.18.1<br>3.22.1 | From d31241d2c8c646cd0ba18579836636e62c38f1c9 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 19 Jun 2024 23:26:16 +0000 Subject: [PATCH 2920/3485] Updating readme file for macos-14-arm64 version 20240616.1 (#10078) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-14-arm64-Readme.md | 42 +++++++++++++-------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/images/macos/macos-14-arm64-Readme.md b/images/macos/macos-14-arm64-Readme.md index 872f809bdd2b..5cf57d821ec6 100644 --- a/images/macos/macos-14-arm64-Readme.md +++ b/images/macos/macos-14-arm64-Readme.md @@ -1,12 +1,12 @@ # macOS 14 - OS Version: macOS 14.5 (23F79) - Kernel Version: Darwin 23.5.0 -- Image Version: 20240611.1 +- Image Version: 20240616.1 ## Installed Software ### Language and Runtime -- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.410, 8.0.101, 8.0.204, 8.0.301 +- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.410, 8.0.101, 8.0.204, 8.0.302 - Bash 3.2.57(1)-release - Clang/LLVM 14.0.3 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` @@ -20,11 +20,11 @@ - Mono 6.12.0.188 - Node.js 20.14.0 - Perl 5.38.2 -- Python3 3.12.3 +- Python3 3.12.4 - Ruby 3.0.7p220 ### Package Management -- Bundler 2.5.11 +- Bundler 2.5.13 - Carthage 0.39.1 - CocoaPods 1.15.2 - Homebrew 4.3.5 @@ -32,7 +32,7 @@ - NuGet 6.3.1.1 - Pip3 24.0 (python 3.12) - Pipx 1.6.0 -- RubyGems 3.5.11 +- RubyGems 3.5.13 - Yarn 1.22.22 ### Project Management @@ -43,14 +43,14 @@ ### Utilities - 7-Zip 17.05 - aria2 1.37.0 -- azcopy 10.25.0 +- azcopy 10.25.1 - bazel 7.2.0 - bazelisk 1.20.0 - bsdtar 3.5.3 - available by 'tar' alias - Curl 8.6.0 - Git 2.45.2 - Git LFS 3.5.1 -- GitHub CLI 2.50.0 +- GitHub CLI 2.51.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.24.5 - gpg (GnuPG) 2.4.5 @@ -58,20 +58,20 @@ - OpenSSL 1.1.1w 11 Sep 2023 - Packer 1.9.4 - pkg-config 0.29.2 -- yq 4.44.1 +- yq 4.44.2 - zstd 1.5.6 ### Tools -- AWS CLI 2.16.5 -- AWS SAM CLI 1.118.0 +- AWS CLI 2.16.9 +- AWS SAM CLI 1.119.0 - AWS Session Manager CLI 1.2.633.0 - Azure CLI 2.61.0 - Azure CLI (azure-devops) 1.0.1 - Bicep CLI 0.28.1 - Cmake 3.29.5 -- CodeQL Action Bundle 2.17.4 +- CodeQL Action Bundle 2.17.5 - Fastlane 2.220.0 -- SwiftFormat 0.53.10 +- SwiftFormat 0.54.0 - Xcbeautify 2.3.1 - Xcode Command Line Tools 15.3.0.0.1.1708646388 - Xcodes 1.4.1 @@ -81,9 +81,9 @@ ### Browsers - Safari 17.5 (19618.2.12.11.6) - SafariDriver 17.5 (19618.2.12.11.6) -- Google Chrome 125.0.6422.142 -- Google Chrome for Testing 125.0.6422.141 -- ChromeDriver 125.0.6422.141 +- Google Chrome 126.0.6478.62 +- Google Chrome for Testing 126.0.6478.61 +- ChromeDriver 126.0.6478.61 - Selenium server 4.21.0 #### Environment variables @@ -106,7 +106,7 @@ - 3.9.13 - 3.10.11 - 3.11.9 -- 3.12.3 +- 3.12.4 #### Node.js - 18.20.3 @@ -118,13 +118,13 @@ - 1.22.4 ### Rust Tools -- Cargo 1.78.0 -- Rust 1.78.0 -- Rustdoc 1.78.0 +- Cargo 1.79.0 +- Rust 1.79.0 +- Rustdoc 1.79.0 - Rustup 1.27.1 #### Packages -- Clippy 0.1.78 +- Clippy 0.1.79 - Rustfmt 1.7.0-stable ### PowerShell Tools @@ -195,8 +195,8 @@ | Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | | visionOS 1.1 | xros1.1 | 15.3 | | Simulator - visionOS 1.1 | xrsimulator1.1 | 15.3 | -| visionOS 1.2 | xros1.2 | 15.4 | | Simulator - visionOS 1.2 | xrsimulator1.2 | 15.4 | +| visionOS 1.2 | xros1.2 | 15.4 | | Simulator - visionOS 2.0 | xrsimulator2.0 | 16.0 | | visionOS 2.0 | xros2.0 | 16.0 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | From 2813ee66cbe85b31a8322ff8967148548b1a5db9 Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Thu, 20 Jun 2024 17:52:59 +0200 Subject: [PATCH 2921/3485] Update Image Rollout Badges (#10100) --- README.md | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 52594f6bdc06..594d6d90eb62 100644 --- a/README.md +++ b/README.md @@ -21,17 +21,17 @@ To build a VM machine from this repo's source, see the [instructions](docs/creat | Image | YAML Label | Included Software | Rollout Status of Latest Image Release | | --------------------|---------------------|--------------------|--------------------| -| Ubuntu 24.04 <sup>beta</sup> | `ubuntu-24.04` | [ubuntu-24.04] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fmikhailkoliada%2F35b243dd6e217d041fe3dfa5b4e2e2ed%2Fraw%2Fubuntu24.json) | -| Ubuntu 22.04 | `ubuntu-latest` or `ubuntu-22.04` | [ubuntu-22.04] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fmikhailkoliada%2F35b243dd6e217d041fe3dfa5b4e2e2ed%2Fraw%2Fubuntu22.json) | -| Ubuntu 20.04 | `ubuntu-20.04` | [ubuntu-20.04] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fmikhailkoliada%2F35b243dd6e217d041fe3dfa5b4e2e2ed%2Fraw%2Fubuntu20.json) | -| macOS 14 | `macos-latest-large` or `macos-14-large`| [macOS-14] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fmikhailkoliada%2F35b243dd6e217d041fe3dfa5b4e2e2ed%2Fraw%2Fmacos-14.json) | -| macOS 14 Arm64 |`macos-latest`, `macos-14`, `macos-latest-xlarge` or `macos-14-xlarge`| [macOS-14-arm64] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fmikhailkoliada%2F35b243dd6e217d041fe3dfa5b4e2e2ed%2Fraw%2Fmacos-14-arm64.json) | -| macOS 13 | `macos-13` or `macos-13-large` | [macOS-13] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fmikhailkoliada%2F35b243dd6e217d041fe3dfa5b4e2e2ed%2Fraw%2Fmacos-13.json) | -| macOS 13 Arm64 | `macos-13-xlarge` | [macOS-13-arm64] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fmikhailkoliada%2F35b243dd6e217d041fe3dfa5b4e2e2ed%2Fraw%2Fmacos-13-arm64.json) | -| macOS 12 | `macos-12` or `macos-12-large`| [macOS-12] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fmikhailkoliada%2F35b243dd6e217d041fe3dfa5b4e2e2ed%2Fraw%2Fmacos-12.json) | -| macOS 11 <sup>deprecated</sup> | `macos-11`| [macOS-11] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fmikhailkoliada%2F35b243dd6e217d041fe3dfa5b4e2e2ed%2Fraw%2FmacOS-11.json) | -| Windows Server 2022 | `windows-latest` or `windows-2022` | [windows-2022] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fmikhailkoliada%2F35b243dd6e217d041fe3dfa5b4e2e2ed%2Fraw%2Fwin22.json) | -| Windows Server 2019 | `windows-2019` | [windows-2019] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fmikhailkoliada%2F35b243dd6e217d041fe3dfa5b4e2e2ed%2Fraw%2Fwin19.json) | +| Ubuntu 24.04 <sup>beta</sup> | `ubuntu-24.04` | [ubuntu-24.04] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fshamil-mubarakshin%2Ffeddf2f2b1120c2d682eeb00438c4977%2Fraw%2Fubuntu24.json) | +| Ubuntu 22.04 | `ubuntu-latest` or `ubuntu-22.04` | [ubuntu-22.04] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fshamil-mubarakshin%2Ffeddf2f2b1120c2d682eeb00438c4977%2Fraw%2Fubuntu22.json) | +| Ubuntu 20.04 | `ubuntu-20.04` | [ubuntu-20.04] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fshamil-mubarakshin%2Ffeddf2f2b1120c2d682eeb00438c4977%2Fraw%2Fubuntu20.json) | +| macOS 14 | `macos-latest-large` or `macos-14-large`| [macOS-14] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fshamil-mubarakshin%2Ffeddf2f2b1120c2d682eeb00438c4977%2Fraw%2Fmacos-14.json) | +| macOS 14 Arm64 |`macos-latest`, `macos-14`, `macos-latest-xlarge` or `macos-14-xlarge`| [macOS-14-arm64] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fshamil-mubarakshin%2Ffeddf2f2b1120c2d682eeb00438c4977%2Fraw%2Fmacos-14-arm64.json) | +| macOS 13 | `macos-13` or `macos-13-large` | [macOS-13] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fshamil-mubarakshin%2Ffeddf2f2b1120c2d682eeb00438c4977%2Fraw%2Fmacos-13.json) | +| macOS 13 Arm64 | `macos-13-xlarge` | [macOS-13-arm64] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fshamil-mubarakshin%2Ffeddf2f2b1120c2d682eeb00438c4977%2Fraw%2Fmacos-13-arm64.json) | +| macOS 12 | `macos-12` or `macos-12-large`| [macOS-12] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fshamil-mubarakshin%2Ffeddf2f2b1120c2d682eeb00438c4977%2Fraw%2Fmacos-12.json) | +| macOS 11 <sup>deprecated</sup> | `macos-11`| [macOS-11] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fshamil-mubarakshin%2Ffeddf2f2b1120c2d682eeb00438c4977%2Fraw%2FmacOS-11.json) | +| Windows Server 2022 | `windows-latest` or `windows-2022` | [windows-2022] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fshamil-mubarakshin%2Ffeddf2f2b1120c2d682eeb00438c4977%2Fraw%2Fwin22.json) | +| Windows Server 2019 | `windows-2019` | [windows-2019] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fshamil-mubarakshin%2Ffeddf2f2b1120c2d682eeb00438c4977%2Fraw%2Fwin19.json) | ### Label scheme From bcf346f13b158c542cf483d08cd23a6929cdce1a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 21 Jun 2024 12:14:19 +0000 Subject: [PATCH 2922/3485] Updating readme file for win22 version 20240618.1.1 (#10096) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/windows/Windows2022-Readme.md | 116 +++++++++++++-------------- 1 file changed, 58 insertions(+), 58 deletions(-) diff --git a/images/windows/Windows2022-Readme.md b/images/windows/Windows2022-Readme.md index e3e37a3ac9cc..3cef82b95276 100644 --- a/images/windows/Windows2022-Readme.md +++ b/images/windows/Windows2022-Readme.md @@ -3,8 +3,8 @@ | [[Ubuntu, Windows] Docker Compose v1 will be removed from images on July, 9](https://github.com/actions/runner-images/issues/9692) | *** # Windows Server 2022 -- OS Version: 10.0.20348 Build 2461 -- Image Version: 20240610.1.0 +- OS Version: 10.0.20348 Build 2527 +- Image Version: 20240618.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -26,14 +26,14 @@ ### Package Management - Chocolatey 2.3.0 - Composer 2.7.7 -- Helm 3.15.0 +- Helm 3.15.1 - Miniconda 24.4.0 (pre-installed on the image but not added to PATH) - NPM 10.7.0 - NuGet 6.10.0.107 - pip 24.0 (python 3.9) - Pipx 1.6.0 - RubyGems 3.2.33 -- Vcpkg (build from commit 795f2f137) +- Vcpkg (build from commit ded971709) - Yarn 1.22.22 #### Environment variables @@ -44,20 +44,20 @@ ### Project Management - Ant 1.10.14 -- Gradle 8.7 +- Gradle 8.8 - Maven 3.8.7 - sbt 1.10.0 ### Tools - 7zip 24.06 - aria2 1.37.0 -- azcopy 10.25.0 +- azcopy 10.25.1 - Bazel 7.2.0 - Bazelisk 1.19.0 - Bicep 0.28.1 - Cabal 3.10.3.0 -- CMake 3.29.5 -- CodeQL Action Bundle 2.17.4 +- CMake 3.29.6 +- CodeQL Action Bundle 2.17.5 - Docker 26.1.3 - Docker Compose v1 1.29.2 - Docker Compose v2 2.27.1 @@ -65,11 +65,11 @@ - ghc 9.10.1 - Git 2.45.2.windows.1 - Git LFS 3.5.1 -- ImageMagick 7.1.1-29 -- InnoSetup 6.3.0 +- ImageMagick 7.1.1-33 +- InnoSetup 6.3.1 - jq 1.7.1 - Kind 0.23.0 -- Kubectl 1.30.1 +- Kubectl 1.30.2 - Mercurial 5.0 - gcc 12.2.0 - gdb 11.2 @@ -78,8 +78,8 @@ - NSIS 3.10 - OpenSSL 1.1.1w - Packer 1.11.0 -- Pulumi 3.119.0 -- R 4.4.0 +- Pulumi 3.120.0 +- R 4.4.1 - Service Fabric SDK 9.1.1436.9590 - Stack 2.15.7 - Subversion (SVN) 1.14.2 @@ -92,17 +92,17 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.207 -- AWS CLI 2.16.4 -- AWS SAM CLI 1.118.0 +- AWS CLI 2.16.9 +- AWS SAM CLI 1.119.0 - AWS Session Manager CLI 1.2.633.0 - Azure CLI 2.61.0 - Azure DevOps CLI extension 1.0.1 -- GitHub CLI 2.50.0 +- GitHub CLI 2.51.0 ### Rust Tools -- Cargo 1.78.0 -- Rust 1.78.0 -- Rustdoc 1.78.0 +- Cargo 1.79.0 +- Rust 1.79.0 +- Rustdoc 1.79.0 - Rustup 1.27.1 #### Packages @@ -110,15 +110,15 @@ - cargo-audit 0.20.0 - cargo-outdated 0.15.0 - cbindgen 0.26.0 -- Clippy 0.1.78 +- Clippy 0.1.79 - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 125.0.6422.142 -- Chrome Driver 125.0.6422.141 -- Microsoft Edge 125.0.2535.92 -- Microsoft Edge Driver 125.0.2535.92 -- Mozilla Firefox 126.0.1 +- Google Chrome 126.0.6478.115 +- Chrome Driver 126.0.6478.62 +- Microsoft Edge 126.0.2592.56 +- Microsoft Edge Driver 126.0.2592.61 +- Mozilla Firefox 127.0 - Gecko Driver 0.34.0 - IE Driver 4.14.0.0 - Selenium server 4.21.0 @@ -174,7 +174,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 3.9.13 - 3.10.11 - 3.11.9 -- 3.12.3 +- 3.12.4 #### PyPy - 2.7.18 [PyPy 7.3.16] @@ -222,7 +222,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Visual Studio Enterprise 2022 | Name | Version | Path | | ----------------------------- | --------------- | -------------------------------------------------------- | -| Visual Studio Enterprise 2022 | 17.10.34928.147 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | +| Visual Studio Enterprise 2022 | 17.10.35013.160 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | #### Workloads, components and extensions | Package | Version | @@ -257,9 +257,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Component.Xamarin.RemotedSimulator | 17.10.34803.213 | | ios | 17.2.8053.0 | | maccatalyst | 17.2.8053.0 | -| maui.blazor | 8.0.21.0 | -| maui.core | 8.0.21.0 | -| maui.windows | 8.0.21.0 | +| maui.blazor | 8.0.40.0 | +| maui.core | 8.0.40.0 | +| maui.windows | 8.0.40.0 | | Microsoft.Component.Azure.DataLake.Tools | 17.10.34803.213 | | Microsoft.Component.ClickOnce | 17.10.34803.213 | | Microsoft.Component.CodeAnalysis.SDK | 17.10.34803.213 | @@ -295,9 +295,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | microsoft.net.runtime.mono.tooling.net7 | 8.0.524.21615 | | microsoft.net.sdk.emscripten | 8.0.10.21103 | | Microsoft.NetCore.Component.DevelopmentTools | 17.10.34803.213 | -| Microsoft.NetCore.Component.Runtime.6.0 | 17.10.34910.118 | -| Microsoft.NetCore.Component.Runtime.8.0 | 17.10.34910.118 | -| Microsoft.NetCore.Component.SDK | 17.10.34910.118 | +| Microsoft.NetCore.Component.Runtime.6.0 | 17.10.35013.160 | +| Microsoft.NetCore.Component.Runtime.8.0 | 17.10.35013.160 | +| Microsoft.NetCore.Component.SDK | 17.10.35013.160 | | Microsoft.NetCore.Component.Web | 17.10.34803.213 | | Microsoft.VisualStudio.Component.AppInsights.Tools | 17.10.34803.213 | | Microsoft.VisualStudio.Component.AspNet | 17.10.34803.213 | @@ -443,15 +443,15 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Workload.ManagedDesktop | 17.10.34803.213 | | Microsoft.VisualStudio.Workload.ManagedGame | 17.10.34803.213 | | Microsoft.VisualStudio.Workload.NativeCrossPlat | 17.10.34803.213 | -| Microsoft.VisualStudio.Workload.NativeDesktop | 17.10.34803.213 | -| Microsoft.VisualStudio.Workload.NativeGame | 17.10.34803.213 | +| Microsoft.VisualStudio.Workload.NativeDesktop | 17.10.35004.147 | +| Microsoft.VisualStudio.Workload.NativeGame | 17.10.35004.147 | | Microsoft.VisualStudio.Workload.NativeMobile | 17.10.34803.213 | | Microsoft.VisualStudio.Workload.NetCrossPlat | 17.10.34803.213 | | Microsoft.VisualStudio.Workload.NetWeb | 17.10.34803.213 | | Microsoft.VisualStudio.Workload.Node | 17.10.34803.213 | | Microsoft.VisualStudio.Workload.Office | 17.10.34803.213 | | Microsoft.VisualStudio.Workload.Python | 17.10.34803.213 | -| Microsoft.VisualStudio.Workload.Universal | 17.10.34818.143 | +| Microsoft.VisualStudio.Workload.Universal | 17.10.35004.147 | | Microsoft.VisualStudio.Workload.VisualStudioExtension | 17.10.34803.213 | | runtimes.ios | 8.0.524.21615 | | runtimes.ios.net7 | 8.0.524.21615 | @@ -487,11 +487,11 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 10.0.22621.0 ### .NET Core Tools -- .NET Core SDK: 6.0.131, 6.0.203, 6.0.321, 6.0.423, 7.0.120, 7.0.203, 7.0.317, 7.0.410, 8.0.300 +- .NET Core SDK: 6.0.131, 6.0.203, 6.0.321, 6.0.423, 7.0.120, 7.0.203, 7.0.317, 7.0.410, 8.0.302 - .NET Framework: 4.8, 4.8.1 -- Microsoft.AspNetCore.App: 6.0.5, 6.0.26, 6.0.29, 6.0.30, 6.0.31, 7.0.5, 7.0.20, 8.0.5 -- Microsoft.NETCore.App: 6.0.5, 6.0.26, 6.0.29, 6.0.30, 6.0.31, 7.0.5, 7.0.20, 8.0.5 -- Microsoft.WindowsDesktop.App: 6.0.5, 6.0.26, 6.0.30, 6.0.31, 7.0.5, 7.0.20, 8.0.5 +- Microsoft.AspNetCore.App: 6.0.5, 6.0.26, 6.0.29, 6.0.31, 7.0.5, 7.0.20, 8.0.6 +- Microsoft.NETCore.App: 6.0.5, 6.0.26, 6.0.29, 6.0.31, 7.0.5, 7.0.20, 8.0.6 +- Microsoft.WindowsDesktop.App: 6.0.5, 6.0.26, 6.0.31, 7.0.5, 7.0.20, 8.0.6 - nbgv 3.6.139+a9e8765620 ### PowerShell Tools @@ -503,7 +503,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - AzureRM: 2.1.0 (Default), 6.13.1 - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.596 +- AWSPowershell: 4.1.602 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.10 - Microsoft.Graph: 2.19.0 @@ -520,18 +520,18 @@ All other versions are saved but not installed. ``` ### Android -| Package Name | Version | -| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 8.0 | -| Android Emulator | 34.2.15 | -| Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2 33.0.3<br>32.0.0<br>31.0.0 | -| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1) | -| Android SDK Platform-Tools | 35.0.1 | -| Android Support Repository | 47.0.0 | -| CMake | 3.18.1<br>3.22.1 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 24.0.8215888<br>25.2.9519653<br>26.3.11579264 | +| Package Name | Version | +| -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 8.0 | +| Android Emulator | 34.2.15 | +| Android SDK Build-tools | 35.0.0<br>34.0.0<br>33.0.0 33.0.1 33.0.2 33.0.3<br>32.0.0<br>31.0.0 | +| Android SDK Platforms | android-35 (rev 1)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1) | +| Android SDK Platform-Tools | 35.0.1 | +| Android Support Repository | 47.0.0 | +| CMake | 3.18.1<br>3.22.1 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 24.0.8215888<br>25.2.9519653<br>26.3.11579264 | #### Environment variables | Name | Value | @@ -546,9 +546,9 @@ All other versions are saved but not installed. ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2022 | sha256:e9aa4e7571b3914a5a0c07c934ad572ef055123df705586ab5803ea3bf83453a | 2024-05-14 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2022 | sha256:785e4d87bc1e179a968a293c0c0fadf7f3a4400d970ec01062431d80c7f7a97f | 2024-05-14 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:0ae307b6ad9ff16ecf2ea15da2ba0f60f6163281193241b9cc308fbc05f01e9d | 2024-05-21 | -| mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:ac6a7571d5a404398e2f734d92f9b8f580a4fe1e6ae1820a61c5f138b1bdeff3 | 2024-05-10 | -| mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:45952938708fbde6ec0b5b94de68bcdec3f8c838be018536b1e9e5bd95e6b943 | 2024-05-10 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2022 | sha256:cb3c91c48940491d2feba172e85e2ea4f03344364ec2a7012fc8d1bac2fe9f2d | 2024-06-11 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2022 | sha256:94feada17ac5850a3f6e197d5afe5d17a57680fc47cd94c1e3a5c3726c58626f | 2024-06-11 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:911befeaae3153f396e5178b3c27f50d19ab985f58f99ecb86f7a05e41eb321c | 2024-06-11 | +| mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:c06c984319aecc48f4582824fe88ea2aa44933ff7793d8a81aab0ce41c1fedc3 | 2024-06-07 | +| mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:0a1c928d2334433a43f2384a933bb4b22f626228d9c48ffa388b16a5a232c9f9 | 2024-06-07 | From c5c9a7cd7b2cfd20d740f7667fdaca8a412f2b52 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 21 Jun 2024 14:14:30 +0000 Subject: [PATCH 2923/3485] Updating readme file for macos-13 version 20240616.1 (#10076) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-13-Readme.md | 56 ++++++++++++++++----------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/images/macos/macos-13-Readme.md b/images/macos/macos-13-Readme.md index 5646b5b8ad69..75c24d3a1d9d 100644 --- a/images/macos/macos-13-Readme.md +++ b/images/macos/macos-13-Readme.md @@ -1,12 +1,12 @@ # macOS 13 - OS Version: macOS 13.6.7 (22G720) - Kernel Version: Darwin 22.6.0 -- Image Version: 20240609.1 +- Image Version: 20240616.1 ## Installed Software ### Language and Runtime -- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.410, 8.0.101, 8.0.204, 8.0.301 +- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.410, 8.0.101, 8.0.204, 8.0.302 - Bash 3.2.57(1)-release - Clang/LLVM 14.0.0 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` @@ -21,21 +21,21 @@ - Node.js 20.14.0 - Perl 5.38.2 - PHP 8.3.8 -- Python3 3.12.3 +- Python3 3.12.4 - Ruby 3.0.7p220 ### Package Management -- Bundler 2.5.11 +- Bundler 2.5.13 - Carthage 0.39.1 - CocoaPods 1.15.2 -- Composer 2.7.6 -- Homebrew 4.3.3 +- Composer 2.7.7 +- Homebrew 4.3.5 - NPM 10.7.0 - NuGet 6.3.1.1 - Pip3 24.0 (python 3.12) - Pipx 1.6.0 -- RubyGems 3.5.11 -- Vcpkg 2024 (build from commit ad25766ae) +- RubyGems 3.5.13 +- Vcpkg 2024 (build from commit f7423ee18) - Yarn 1.22.22 ### Project Management @@ -46,14 +46,14 @@ ### Utilities - 7-Zip 17.05 - aria2 1.37.0 -- azcopy 10.25.0 -- bazel 7.1.2 +- azcopy 10.25.1 +- bazel 7.2.0 - bazelisk 1.20.0 - bsdtar 3.5.3 - available by 'tar' alias - Curl 8.8.0 - Git 2.45.2 - Git LFS 3.5.1 -- GitHub CLI 2.50.0 +- GitHub CLI 2.51.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.24.5 - gpg (GnuPG) 2.4.5 @@ -61,20 +61,20 @@ - OpenSSL 1.1.1w 11 Sep 2023 - Packer 1.9.4 - pkg-config 0.29.2 -- yq 4.44.1 +- yq 4.44.2 - zstd 1.5.6 ### Tools -- AWS CLI 2.16.4 -- AWS SAM CLI 1.118.0 +- AWS CLI 2.16.9 +- AWS SAM CLI 1.119.0 - AWS Session Manager CLI 1.2.633.0 - Azure CLI 2.61.0 - Azure CLI (azure-devops) 1.0.1 - Bicep CLI 0.28.1 - Cmake 3.29.5 -- CodeQL Action Bundle 2.17.4 +- CodeQL Action Bundle 2.17.5 - Fastlane 2.220.0 -- SwiftFormat 0.53.10 +- SwiftFormat 0.54.0 - Xcbeautify 2.3.1 - Xcode Command Line Tools 14.3.1.0.1.1683849156 - Xcodes 1.4.1 @@ -85,12 +85,12 @@ ### Browsers - Safari 17.5 (18618.2.12.111.5) - SafariDriver 17.5 (18618.2.12.111.5) -- Google Chrome 125.0.6422.142 -- Google Chrome for Testing 125.0.6422.141 -- ChromeDriver 125.0.6422.141 -- Microsoft Edge 125.0.2535.92 -- Microsoft Edge WebDriver 125.0.2535.92 -- Mozilla Firefox 126.0.1 +- Google Chrome 126.0.6478.62 +- Google Chrome for Testing 126.0.6478.61 +- ChromeDriver 126.0.6478.61 +- Microsoft Edge 126.0.2592.56 +- Microsoft Edge WebDriver 126.0.2592.56 +- Mozilla Firefox 127.0 - geckodriver 0.34.0 - Selenium server 4.21.0 @@ -127,7 +127,7 @@ - 3.9.19 - 3.10.14 - 3.11.9 -- 3.12.3 +- 3.12.4 #### Node.js - 16.20.2 @@ -140,13 +140,13 @@ - 1.22.4 ### Rust Tools -- Cargo 1.78.0 -- Rust 1.78.0 -- Rustdoc 1.78.0 +- Cargo 1.79.0 +- Rust 1.79.0 +- Rustdoc 1.79.0 - Rustup 1.27.1 #### Packages -- Clippy 0.1.78 +- Clippy 0.1.79 - Rustfmt 1.7.0-stable ### PowerShell Tools @@ -201,8 +201,8 @@ | Simulator - watchOS 9.4 | watchsimulator9.4 | 14.3.1 | | Simulator - watchOS 10.0 | watchsimulator10.0 | 15.0.1 | | Simulator - watchOS 10.2 | watchsimulator10.2 | 15.1, 15.2 | -| Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | | visionOS 1.0 | xros1.0 | 15.2 | +| Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | From 62c1943b638e323eef9a82165b9dac40dd43cb0a Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Mon, 24 Jun 2024 21:55:05 +0200 Subject: [PATCH 2924/3485] [Ubuntu20] Pin public_suffix gem to 5.1.1 (#10111) * [Ubuntu20] Pin public_suffix gem to 5.1.1 --- images/ubuntu/scripts/build/install-ruby.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/images/ubuntu/scripts/build/install-ruby.sh b/images/ubuntu/scripts/build/install-ruby.sh index 5b19db390d02..a2afcf0c35ce 100644 --- a/images/ubuntu/scripts/build/install-ruby.sh +++ b/images/ubuntu/scripts/build/install-ruby.sh @@ -10,6 +10,11 @@ source $HELPER_SCRIPTS/install.sh apt-get install ruby-full +# temporary fix for fastlane installation https://github.com/sporkmonger/addressable/issues/541 +if is_ubuntu20; then + gem install public_suffix -v 5.1.1 +fi + # Install ruby gems from toolset gems_to_install=$(get_toolset_value ".rubygems[] .name") if [[ -n "$gems_to_install" ]]; then From b268f563f63d89ad4502ff2773c3a6f630ac46ab Mon Sep 17 00:00:00 2001 From: sarathrajsrinivasan <159180023+sarathrajsrinivasan@users.noreply.github.com> Date: Tue, 25 Jun 2024 04:57:27 -0700 Subject: [PATCH 2925/3485] [macOS] Add gcc 14 (#10043) --- images/macos/toolsets/toolset-12.json | 3 ++- images/macos/toolsets/toolset-13.json | 3 ++- images/macos/toolsets/toolset-14.json | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index 05dc71b31025..621ba3500557 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -228,7 +228,8 @@ "versions": [ "11", "12", - "13" + "13", + "14" ] }, "toolcache": [ diff --git a/images/macos/toolsets/toolset-13.json b/images/macos/toolsets/toolset-13.json index 70e6c198a4f3..48878c3fca9b 100644 --- a/images/macos/toolsets/toolset-13.json +++ b/images/macos/toolsets/toolset-13.json @@ -90,7 +90,8 @@ "versions": [ "11", "12", - "13" + "13", + "14" ] }, "dotnet": { diff --git a/images/macos/toolsets/toolset-14.json b/images/macos/toolsets/toolset-14.json index f7a88540478a..330af2a46679 100644 --- a/images/macos/toolsets/toolset-14.json +++ b/images/macos/toolsets/toolset-14.json @@ -92,7 +92,8 @@ "versions": [ "11", "12", - "13" + "13", + "14" ] }, "dotnet": { From d31e0a18cbe4583142e746fc692570b706db0192 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 16:29:55 +0000 Subject: [PATCH 2926/3485] Updating readme file for macos-14 version 20240624.1 (#10116) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-14-Readme.md | 68 ++++++++++++++++----------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/images/macos/macos-14-Readme.md b/images/macos/macos-14-Readme.md index cb9031fd26ca..7bb17ac69a79 100644 --- a/images/macos/macos-14-Readme.md +++ b/images/macos/macos-14-Readme.md @@ -1,7 +1,7 @@ # macOS 14 - OS Version: macOS 14.5 (23F79) - Kernel Version: Darwin 23.5.0 -- Image Version: 20240616.1 +- Image Version: 20240624.1 ## Installed Software @@ -18,28 +18,28 @@ - GNU Fortran 13 (Homebrew GCC 13.3.0) - available by `gfortran-13` alias - Kotlin 2.0.0-release-341 - Mono 6.12.0.188 -- Node.js 20.14.0 +- Node.js 20.15.0 - Perl 5.38.2 - PHP 8.3.8 - Python3 3.12.4 - Ruby 3.0.7p220 ### Package Management -- Bundler 2.5.13 +- Bundler 2.5.14 - Carthage 0.39.1 - CocoaPods 1.15.2 - Composer 2.7.7 -- Homebrew 4.3.5 +- Homebrew 4.3.6 - NPM 10.7.0 - NuGet 6.3.1.1 -- Pip3 24.0 (python 3.12) +- Pip3 24.1 (python 3.12) - Pipx 1.6.0 -- RubyGems 3.5.13 +- RubyGems 3.5.14 - Yarn 1.22.22 ### Project Management - Apache Ant 1.10.14 -- Apache Maven 3.9.7 +- Apache Maven 3.9.8 - Gradle 8.8 ### Utilities @@ -64,17 +64,17 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.16.9 +- AWS CLI 2.17.0 - AWS SAM CLI 1.119.0 - AWS Session Manager CLI 1.2.633.0 - Azure CLI 2.61.0 - Azure CLI (azure-devops) 1.0.1 - Bicep CLI 0.28.1 -- Cmake 3.29.5 +- Cmake 3.29.6 - CodeQL Action Bundle 2.17.5 -- Fastlane 2.220.0 +- Fastlane 2.221.1 - SwiftFormat 0.54.0 -- Xcbeautify 2.3.1 +- Xcbeautify 2.4.0 - Xcode Command Line Tools 15.3.0.0.1.1708646388 - Xcodes 1.4.1 @@ -84,14 +84,14 @@ ### Browsers - Safari 17.5 (19618.2.12.11.6) - SafariDriver 17.5 (19618.2.12.11.6) -- Google Chrome 126.0.6478.62 -- Google Chrome for Testing 126.0.6478.61 -- ChromeDriver 126.0.6478.61 -- Microsoft Edge 126.0.2592.56 -- Microsoft Edge WebDriver 126.0.2592.56 -- Mozilla Firefox 127.0 +- Google Chrome 126.0.6478.115 +- Google Chrome for Testing 126.0.6478.63 +- ChromeDriver 126.0.6478.63 +- Microsoft Edge 126.0.2592.68 +- Microsoft Edge WebDriver 126.0.2592.68 +- Mozilla Firefox 127.0.1 - geckodriver 0.34.0 -- Selenium server 4.21.0 +- Selenium server 4.22.0 #### Environment variables | Name | Value | @@ -122,7 +122,7 @@ #### Node.js - 18.20.3 -- 20.14.0 +- 20.15.0 #### Go - 1.20.14 @@ -140,7 +140,7 @@ - Rustfmt 1.7.0-stable ### PowerShell Tools -- PowerShell 7.4.2 +- PowerShell 7.4.3 #### PowerShell Modules - Az: 12.0.0 @@ -209,11 +209,11 @@ | visionOS 1.1 | xros1.1 | 15.3 | | Simulator - visionOS 1.2 | xrsimulator1.2 | 15.4 | | visionOS 1.2 | xros1.2 | 15.4 | -| visionOS 2.0 | xros2.0 | 16.0 | | Simulator - visionOS 2.0 | xrsimulator2.0 | 16.0 | +| visionOS 2.0 | xros2.0 | 16.0 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | -| Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | +| Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | | DriverKit 22.4 | driverkit22.4 | 14.3.1 | | DriverKit 23.0 | driverkit23.0 | 15.0.1 | | DriverKit 23.2 | driverkit23.2 | 15.1, 15.2 | @@ -241,18 +241,18 @@ | watchOS 10.5 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | ### Android -| Package Name | Version | -| -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 11.0 | -| Android Emulator | 34.2.15 | -| Android SDK Build-tools | 34.0.0<br>33.0.2 33.0.3 | -| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | -| Android SDK Platform-Tools | 35.0.1 | -| Android Support Repository | 47.0.0 | -| CMake | 3.22.1 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 24.0.8215888<br>25.2.9519653<br>26.3.11579264 (default) | +| Package Name | Version | +| -------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 11.0 | +| Android Emulator | 34.2.15 | +| Android SDK Build-tools | 35.0.0<br>34.0.0<br>33.0.2 33.0.3 | +| Android SDK Platforms | android-35 (rev 1)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | +| Android SDK Platform-Tools | 35.0.1 | +| Android Support Repository | 47.0.0 | +| CMake | 3.22.1 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 24.0.8215888<br>25.2.9519653<br>26.3.11579264 (default) | #### Environment variables | Name | Value | From d728101acee04057916c1d9916401bb7cedaf158 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 23:18:51 +0000 Subject: [PATCH 2927/3485] Updating readme file for macos-13 version 20240623.1 (#10117) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-13-Readme.md | 64 ++++++++++++++++----------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/images/macos/macos-13-Readme.md b/images/macos/macos-13-Readme.md index 75c24d3a1d9d..6beba5ec1156 100644 --- a/images/macos/macos-13-Readme.md +++ b/images/macos/macos-13-Readme.md @@ -1,7 +1,7 @@ # macOS 13 - OS Version: macOS 13.6.7 (22G720) - Kernel Version: Darwin 22.6.0 -- Image Version: 20240616.1 +- Image Version: 20240623.1 ## Installed Software @@ -18,29 +18,29 @@ - GNU Fortran 13 (Homebrew GCC 13.3.0) - available by `gfortran-13` alias - Kotlin 2.0.0-release-341 - Mono 6.12.0.188 -- Node.js 20.14.0 +- Node.js 20.15.0 - Perl 5.38.2 - PHP 8.3.8 - Python3 3.12.4 - Ruby 3.0.7p220 ### Package Management -- Bundler 2.5.13 +- Bundler 2.5.14 - Carthage 0.39.1 - CocoaPods 1.15.2 - Composer 2.7.7 -- Homebrew 4.3.5 +- Homebrew 4.3.6 - NPM 10.7.0 - NuGet 6.3.1.1 -- Pip3 24.0 (python 3.12) +- Pip3 24.1 (python 3.12) - Pipx 1.6.0 -- RubyGems 3.5.13 -- Vcpkg 2024 (build from commit f7423ee18) +- RubyGems 3.5.14 +- Vcpkg 2024 (build from commit c4467cb68) - Yarn 1.22.22 ### Project Management - Apache Ant 1.10.14 -- Apache Maven 3.9.7 +- Apache Maven 3.9.8 - Gradle 8.8 ### Utilities @@ -65,17 +65,17 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.16.9 +- AWS CLI 2.17.0 - AWS SAM CLI 1.119.0 - AWS Session Manager CLI 1.2.633.0 - Azure CLI 2.61.0 - Azure CLI (azure-devops) 1.0.1 - Bicep CLI 0.28.1 -- Cmake 3.29.5 +- Cmake 3.29.6 - CodeQL Action Bundle 2.17.5 -- Fastlane 2.220.0 +- Fastlane 2.221.1 - SwiftFormat 0.54.0 -- Xcbeautify 2.3.1 +- Xcbeautify 2.4.0 - Xcode Command Line Tools 14.3.1.0.1.1683849156 - Xcodes 1.4.1 @@ -85,14 +85,14 @@ ### Browsers - Safari 17.5 (18618.2.12.111.5) - SafariDriver 17.5 (18618.2.12.111.5) -- Google Chrome 126.0.6478.62 -- Google Chrome for Testing 126.0.6478.61 -- ChromeDriver 126.0.6478.61 -- Microsoft Edge 126.0.2592.56 -- Microsoft Edge WebDriver 126.0.2592.56 -- Mozilla Firefox 127.0 +- Google Chrome 126.0.6478.115 +- Google Chrome for Testing 126.0.6478.63 +- ChromeDriver 126.0.6478.63 +- Microsoft Edge 126.0.2592.68 +- Microsoft Edge WebDriver 126.0.2592.68 +- Mozilla Firefox 127.0.1 - geckodriver 0.34.0 -- Selenium server 4.21.0 +- Selenium server 4.22.0 #### Environment variables | Name | Value | @@ -150,7 +150,7 @@ - Rustfmt 1.7.0-stable ### PowerShell Tools -- PowerShell 7.4.2 +- PowerShell 7.4.3 #### PowerShell Modules - Az: 12.0.0 @@ -230,18 +230,18 @@ | watchOS 10.2 | 14.1<br>14.2<br>14.3.1<br>15.0.1<br>15.1<br>15.2 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | ### Android -| Package Name | Version | -| -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 11.0 | -| Android Emulator | 34.2.15 | -| Android SDK Build-tools | 34.0.0<br>33.0.2 33.0.3 | -| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | -| Android SDK Platform-Tools | 35.0.1 | -| Android Support Repository | 47.0.0 | -| CMake | 3.22.1 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 24.0.8215888<br>25.2.9519653<br>26.3.11579264 (default) | +| Package Name | Version | +| -------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 11.0 | +| Android Emulator | 34.2.15 | +| Android SDK Build-tools | 35.0.0<br>34.0.0<br>33.0.2 33.0.3 | +| Android SDK Platforms | android-35 (rev 1)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | +| Android SDK Platform-Tools | 35.0.1 | +| Android Support Repository | 47.0.0 | +| CMake | 3.22.1 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 24.0.8215888<br>25.2.9519653<br>26.3.11579264 (default) | #### Environment variables | Name | Value | From d7a4be02672c679a49cbfa5f832d980fad22c0fa Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 27 Jun 2024 00:47:07 +0000 Subject: [PATCH 2928/3485] Updating readme file for macos-13-arm64 version 20240624.1 (#10115) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-13-arm64-Readme.md | 56 +++++++++++++-------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/images/macos/macos-13-arm64-Readme.md b/images/macos/macos-13-arm64-Readme.md index ce61929faab0..d7335523bfea 100644 --- a/images/macos/macos-13-arm64-Readme.md +++ b/images/macos/macos-13-arm64-Readme.md @@ -1,7 +1,7 @@ # macOS 13 - OS Version: macOS 13.6.7 (22G720) - Kernel Version: Darwin 22.6.0 -- Image Version: 20240617.2 +- Image Version: 20240624.1 ## Installed Software @@ -18,26 +18,26 @@ - GNU Fortran 13 (Homebrew GCC 13.3.0) - available by `gfortran-13` alias - Kotlin 2.0.0-release-341 - Mono 6.12.0.188 -- Node.js 20.14.0 +- Node.js 20.15.0 - Perl 5.38.2 - Python3 3.12.4 - Ruby 3.0.7p220 ### Package Management -- Bundler 2.5.13 +- Bundler 2.5.14 - Carthage 0.39.1 - CocoaPods 1.15.2 -- Homebrew 4.3.5 +- Homebrew 4.3.6 - NPM 10.7.0 - NuGet 6.3.1.1 - Pip3 24.0 (python 3.12) - Pipx 1.6.0 -- RubyGems 3.5.13 +- RubyGems 3.5.14 - Yarn 1.22.22 ### Project Management - Apache Ant 1.10.14 -- Apache Maven 3.9.7 +- Apache Maven 3.9.8 - Gradle 8.8 ### Utilities @@ -62,17 +62,17 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.16.9 +- AWS CLI 2.17.0 - AWS SAM CLI 1.119.0 - AWS Session Manager CLI 1.2.633.0 - Azure CLI 2.61.0 - Azure CLI (azure-devops) 1.0.1 - Bicep CLI 0.28.1 -- Cmake 3.29.5 +- Cmake 3.29.6 - CodeQL Action Bundle 2.17.5 -- Fastlane 2.220.0 +- Fastlane 2.221.1 - SwiftFormat 0.54.0 -- Xcbeautify 2.3.1 +- Xcbeautify 2.4.0 - Xcode Command Line Tools 14.3.1.0.1.1683849156 - Xcodes 1.4.1 @@ -81,10 +81,10 @@ ### Browsers - Safari 17.5 (18618.2.12.111.5) - SafariDriver 17.5 (18618.2.12.111.5) -- Google Chrome 126.0.6478.62 -- Google Chrome for Testing 126.0.6478.61 -- ChromeDriver 126.0.6478.61 -- Selenium server 4.21.0 +- Google Chrome 126.0.6478.115 +- Google Chrome for Testing 126.0.6478.63 +- ChromeDriver 126.0.6478.63 +- Selenium server 4.22.0 #### Environment variables | Name | Value | @@ -111,7 +111,7 @@ #### Node.js - 16.20.1 - 18.20.3 -- 20.14.0 +- 20.15.0 #### Go - 1.20.14 @@ -129,7 +129,7 @@ - Rustfmt 1.7.0-stable ### PowerShell Tools -- PowerShell 7.4.2 +- PowerShell 7.4.3 #### PowerShell Modules - Az: 12.0.0 @@ -210,18 +210,18 @@ | visionOS 1.0 | 14.1<br>14.2<br>14.3.1<br>15.0.1<br>15.1<br>15.2 | Apple Vision Pro | ### Android -| Package Name | Version | -| -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 11.0 | -| Android Emulator | 34.2.15 | -| Android SDK Build-tools | 34.0.0<br>33.0.2 33.0.3 | -| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | -| Android SDK Platform-Tools | 35.0.1 | -| Android Support Repository | 47.0.0 | -| CMake | 3.22.1 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 24.0.8215888<br>25.2.9519653<br>26.3.11579264 (default) | +| Package Name | Version | +| -------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 11.0 | +| Android Emulator | 34.2.15 | +| Android SDK Build-tools | 35.0.0<br>34.0.0<br>33.0.2 33.0.3 | +| Android SDK Platforms | android-35 (rev 1)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | +| Android SDK Platform-Tools | 35.0.1 | +| Android Support Repository | 47.0.0 | +| CMake | 3.22.1 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 24.0.8215888<br>25.2.9519653<br>26.3.11579264 (default) | #### Environment variables | Name | Value | From e63e9ad701973cae386cac23139023516ef5aa41 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 27 Jun 2024 19:54:14 +0000 Subject: [PATCH 2929/3485] Updating readme file for macos-12 version 20240623.1 (#10112) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-12-Readme.md | 60 ++++++++++++++++----------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/images/macos/macos-12-Readme.md b/images/macos/macos-12-Readme.md index ef7761a444ed..e9657a055d14 100644 --- a/images/macos/macos-12-Readme.md +++ b/images/macos/macos-12-Readme.md @@ -1,7 +1,7 @@ # macOS 12 - OS Version: macOS 12.7.5 (21H1222) - Kernel Version: Darwin 21.6.0 -- Image Version: 20240617.1 +- Image Version: 20240623.1 ## Installed Software @@ -23,7 +23,7 @@ - Node.js 18.20.3 - MSBuild 16.10.1.51301 (Mono 6.12.0.188) - NVM 0.39.7 -- NVM - Cached node versions: 16.20.2, 18.20.3, 20.14.0 +- NVM - Cached node versions: 16.20.2, 18.20.3, 20.15.0 - Perl 5.38.2 - PHP 8.3.8 - Python 2.7.18 @@ -32,7 +32,7 @@ - Ruby 3.0.7p220 ### Package Management -- Bundler 2.5.13 +- Bundler 2.5.14 - Carthage 0.39.1 - CocoaPods 1.15.2 - Composer 2.7.7 @@ -41,10 +41,10 @@ - NPM 10.7.0 - NuGet 6.3.1.1 - Pip 20.3.4 (python 2.7) -- Pip3 24.0 (python 3.12) +- Pip3 24.1 (python 3.12) - Pipx 1.6.0 -- RubyGems 3.5.13 -- Vcpkg 2024 (build from commit 67a300519) +- RubyGems 3.5.14 +- Vcpkg 2024 (build from commit c4467cb68) - Yarn 1.22.22 #### Environment variables @@ -91,18 +91,18 @@ - zstd 1.5.6 ### Tools -- App Center CLI 3.0.0 -- AWS CLI 2.16.10 +- App Center CLI 3.0.1 +- AWS CLI 2.17.0 - AWS SAM CLI 1.119.0 - AWS Session Manager CLI 1.2.633.0 - Azure CLI 2.61.0 - Azure CLI (azure-devops) 1.0.1 - Bicep CLI 0.28.1 - Cabal 3.10.3.0 -- Cmake 3.29.5 +- Cmake 3.29.6 - CodeQL Action Bundle 2.17.5 - Colima 0.6.9 -- Fastlane 2.220.0 +- Fastlane 2.221.1 - GHC 9.10.1 - GHCup 0.1.22.0 - Jazzy 0.15.1 @@ -120,14 +120,14 @@ ### Browsers - Safari 17.5 (17618.2.12.111.5) - SafariDriver 17.5 (17618.2.12.111.5) -- Google Chrome 126.0.6478.62 -- Google Chrome for Testing 126.0.6478.61 -- ChromeDriver 126.0.6478.61 -- Microsoft Edge 126.0.2592.56 -- Microsoft Edge WebDriver 126.0.2592.61 -- Mozilla Firefox 127.0 +- Google Chrome 126.0.6478.115 +- Google Chrome for Testing 126.0.6478.63 +- ChromeDriver 126.0.6478.63 +- Microsoft Edge 126.0.2592.68 +- Microsoft Edge WebDriver 126.0.2592.68 +- Mozilla Firefox 127.0.1 - geckodriver 0.34.0 -- Selenium server 4.21.0 +- Selenium server 4.22.0 #### Environment variables | Name | Value | @@ -190,7 +190,7 @@ - Rustfmt 1.7.0-stable ### PowerShell Tools -- PowerShell 7.4.2 +- PowerShell 7.4.3 #### PowerShell Modules - Az: 12.0.0 @@ -327,18 +327,18 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" | watchOS 9.1 | 13.1<br>13.2.1<br>13.3.1<br>13.4.1<br>14.0.1<br>14.1<br>14.2 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | ### Android -| Package Name | Version | -| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 8.0 | -| Android Emulator | 34.2.15 | -| Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2 33.0.3<br>32.0.0<br>31.0.0 | -| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1) | -| Android SDK Platform-Tools | 35.0.1 | -| Android Support Repository | 47.0.0 | -| CMake | 3.18.1<br>3.22.1 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 24.0.8215888<br>25.2.9519653 (default)<br>26.3.11579264 | +| Package Name | Version | +| -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 8.0 | +| Android Emulator | 34.2.15 | +| Android SDK Build-tools | 35.0.0<br>34.0.0<br>33.0.0 33.0.1 33.0.2 33.0.3<br>32.0.0<br>31.0.0 | +| Android SDK Platforms | android-35 (rev 1)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1) | +| Android SDK Platform-Tools | 35.0.1 | +| Android Support Repository | 47.0.0 | +| CMake | 3.18.1<br>3.22.1 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 24.0.8215888<br>25.2.9519653 (default)<br>26.3.11579264 | #### Environment variables | Name | Value | From 2927b0be95faac23f74d01ef6d047a7689565fe9 Mon Sep 17 00:00:00 2001 From: kishorekumar-anchala <168699259+kishorekumar-anchala@users.noreply.github.com> Date: Fri, 28 Jun 2024 14:44:37 +0530 Subject: [PATCH 2930/3485] [windows] Fix Cloud-Foundry signature (#10135) --- images/windows/scripts/build/Install-CloudFoundryCli.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/windows/scripts/build/Install-CloudFoundryCli.ps1 b/images/windows/scripts/build/Install-CloudFoundryCli.ps1 index 48b22b8f8c05..fe50246f2baa 100644 --- a/images/windows/scripts/build/Install-CloudFoundryCli.ps1 +++ b/images/windows/scripts/build/Install-CloudFoundryCli.ps1 @@ -20,7 +20,7 @@ Expand-7ZipArchive -Path $cloudFoundryArchPath -DestinationPath $cloudFoundryCli Add-MachinePathItem $cloudFoundryCliPath # Validate cf signature -$cloudFoundrySignatureThumbprint = "4C69EDD13930ED01B83DD1D17B09C434DC1F2177" +$cloudFoundrySignatureThumbprint = "2C6B2F1562698503A6E4A25F2DF058E12E23A190" Test-FileSignature -Path "$cloudFoundryCliPath\cf.exe" -ExpectedThumbprint $cloudFoundrySignatureThumbprint Invoke-PesterTests -TestFile "CLI.Tools" -TestName "CloudFoundry CLI" From 71142e705356717b3da904d9d31e06c1dee3963e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 28 Jun 2024 15:33:51 +0000 Subject: [PATCH 2931/3485] Updating readme file for ubuntu20 version 20240624.2.1 (#10123) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2004-Readme.md | 78 +++++++++++++++--------------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/images/ubuntu/Ubuntu2004-Readme.md b/images/ubuntu/Ubuntu2004-Readme.md index 9561a6f10ac8..d2ec88fe16a4 100644 --- a/images/ubuntu/Ubuntu2004-Readme.md +++ b/images/ubuntu/Ubuntu2004-Readme.md @@ -6,7 +6,7 @@ # Ubuntu 20.04 - OS Version: 20.04.6 LTS - Kernel Version: 5.15.0-1064-azure -- Image Version: 20240617.1.0 +- Image Version: 20240624.2.0 - Systemd version: 245.4-4ubuntu3.23 ## Installed Software @@ -34,7 +34,7 @@ ### Package Management - cpan 1.64 - Helm 3.15.2 -- Homebrew 4.3.5 +- Homebrew 4.3.7 - Miniconda 24.4.0 - Npm 10.7.0 - NuGet 6.6.1.2 @@ -42,7 +42,7 @@ - Pip3 20.0.2 - Pipx 1.6.0 - RubyGems 3.1.2 -- Vcpkg (build from commit f7423ee18) +- Vcpkg (build from commit c4467cb68) - Yarn 1.22.22 #### Environment variables @@ -62,7 +62,7 @@ to accomplish this. ### Project Management - Ant 1.10.7 - Gradle 8.8 -- Lerna 8.1.3 +- Lerna 8.1.5 - Maven 3.8.8 - Sbt 1.10.0 @@ -74,15 +74,15 @@ to accomplish this. - Bazelisk 1.19.0 - Bicep 0.28.1 - Buildah 1.22.3 -- CMake 3.29.5 +- CMake 3.29.6 - CodeQL Action Bundle 2.17.5 - Docker Amazon ECR Credential Helper 0.8.0 - Docker Compose v1 1.29.2 - Docker Compose v2 2.27.1 -- Docker-Buildx 0.15.0 +- Docker-Buildx 0.15.1 - Docker Client 26.1.3 - Docker Server 26.1.3 -- Fastlane 2.220.0 +- Fastlane 2.221.1 - Git 2.45.2 - Git LFS 3.5.1 - Git-ftp 1.6.0 @@ -105,8 +105,8 @@ to accomplish this. - Parcel 2.12.0 - PhantomJS 2.1.1 2.1.1 - Podman 3.4.2 -- Pulumi 3.120.0 -- R 4.4.0 +- Pulumi 3.121.0 +- R 4.4.1 - Skopeo 1.5.0 - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 @@ -117,15 +117,15 @@ to accomplish this. ### CLI Tools - Alibaba Cloud CLI 3.0.174 -- AWS CLI 2.16.9 +- AWS CLI 2.17.0 - AWS CLI Session Manager Plugin 1.2.633.0 - AWS SAM CLI 1.119.0 - Azure CLI 2.61.0 - Azure CLI (azure-devops) 1.0.1 -- GitHub CLI 2.51.0 -- Google Cloud CLI 480.0.0 -- Netlify CLI 17.28.0 -- OpenShift CLI 4.15.17 +- GitHub CLI 2.52.0 +- Google Cloud CLI 481.0.0 +- Netlify CLI 17.29.0 +- OpenShift CLI 4.15.18 - ORAS CLI 1.2.0 - Vercel CLI 34.2.7 @@ -166,12 +166,12 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 126.0.6478.61 -- ChromeDriver 126.0.6478.61 +- Google Chrome 126.0.6478.126 +- ChromeDriver 126.0.6478.126 - Chromium 126.0.6478.0 -- Microsoft Edge 126.0.2592.56 -- Microsoft Edge WebDriver 126.0.2592.56 -- Selenium server 4.21.0 +- Microsoft Edge 126.0.2592.68 +- Microsoft Edge WebDriver 126.0.2592.68 +- Selenium server 4.22.0 - Mozilla Firefox 126.0.2 - Geckodriver 0.34.0 @@ -210,7 +210,7 @@ Use the following command as a part of your job to start the service: 'sudo syst #### MS SQL - sqlcmd 17.10.0001.1 -- SqlPackage 162.3.563.1 +- SqlPackage 162.3.566.1 ### Cached Tools @@ -222,7 +222,7 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Node.js - 16.20.2 - 18.20.3 -- 20.14.0 +- 20.15.0 #### Python - 3.7.17 @@ -245,7 +245,7 @@ Use the following command as a part of your job to start the service: 'sudo syst - 3.1.6 ### PowerShell Tools -- PowerShell 7.4.2 +- PowerShell 7.4.3 #### PowerShell Modules - Az: 11.3.1 @@ -262,16 +262,16 @@ Use the following command as a part of your job to start the service: 'sudo syst | nginx | 1.18.0 | /etc/nginx/nginx.conf | inactive | 80 | ### Android -| Package Name | Version | -| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 9.0 | -| Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2 33.0.3<br>32.0.0<br>31.0.0 | -| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1) | -| Android Support Repository | 47.0.0 | -| CMake | 3.10.2<br>3.18.1<br>3.22.1 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 24.0.8215888<br>25.2.9519653 (default)<br>26.3.11579264 | +| Package Name | Version | +| -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 9.0 | +| Android SDK Build-tools | 35.0.0<br>34.0.0<br>33.0.0 33.0.1 33.0.2 33.0.3<br>32.0.0<br>31.0.0 | +| Android SDK Platforms | android-35 (rev 1)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1) | +| Android Support Repository | 47.0.0 | +| CMake | 3.10.2<br>3.18.1<br>3.22.1 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 24.0.8215888<br>25.2.9519653 (default)<br>26.3.11579264 | #### Environment variables | Name | Value | @@ -287,18 +287,18 @@ Use the following command as a part of your job to start the service: 'sudo syst | Repository:Tag | Digest | Created | | -------------------- | ------------------------------------------------------------------------ | ---------- | | alpine:3.16 | sha256:452e7292acee0ee16c332324d7de05fa2c99f9994ecc9f0779c602916a672ae4 | 2024-01-27 | -| alpine:3.17 | sha256:53cf9478b76f4c8fae126acbdfb79bed6e69e628faff572ebe4a029d3d247d98 | 2024-01-27 | -| alpine:3.18 | sha256:11e21d7b981a59554b3f822c49f6e9f57b6068bb74f49c4cd5cc4c663c7e5160 | 2024-01-27 | +| alpine:3.17 | sha256:a6063e988bcd597b4f1f7cfd4ec38402b02edd0c79250f00c9e14dc1e94bebbc | 2024-06-20 | +| alpine:3.18 | sha256:1875c923b73448b558132e7d4a44b815d078779ed7a73f76209c6372de95ea8d | 2024-06-20 | | debian:10 | sha256:58ce6f1271ae1c8a2006ff7d3e54e9874d839f573d8009c20154ad0f2fb0a225 | 2024-06-13 | | debian:11 | sha256:d584e02c85bc9b3bd8df01662e4f605a66e1b9a04f9dea0e288f56da474269a0 | 2024-06-13 | | debian:9 | sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be | 2022-06-23 | -| moby/buildkit:latest | sha256:21ca05626f03ebe128d268d6d7512024217b0f3adf7881047bdc5e83968ada87 | 2024-06-11 | +| moby/buildkit:latest | sha256:5d410bbb6d22b01fcaead1345936c5e0a0963eb6c3b190e38694e015467640fe | 2024-06-18 | | node:16 | sha256:f77a1aef2da8d83e45ec990f45df50f1a286c5fe8bbfb8c6e4246c6389705c0b | 2023-09-07 | | node:16-alpine | sha256:a1f9d027912b58a7c75be7716c97cfbc6d3099f3a97ed84aa490be9dee20e787 | 2023-08-10 | -| node:18 | sha256:4149a450f71699db7d695eeae3bc443e5aa97a7ff2f3a881a97e88f0d5568ee6 | 2024-06-13 | -| node:18-alpine | sha256:6937be95129321422103452e2883021cc4a96b63c32d7947187fcb25df84fc3f | 2024-06-04 | -| node:20 | sha256:d0a9a2399581a9de1ff962a48a28b5cfe700678a6a5df8e31a63aaa47bebb923 | 2024-06-13 | -| node:20-alpine | sha256:66c7d989b6dabba6b4305b88f40912679aebd9f387a5b16ffa76dfb9ae90b060 | 2024-06-04 | +| node:18 | sha256:d0bbfdbad0bff8253e6159dcbee42141db4fc309365d5b8bcfce46ed71569078 | 2024-05-21 | +| node:18-alpine | sha256:e37da457874383fa9217067867ec85fe8fe59f0bfa351ec9752a95438680056e | 2024-06-04 | +| node:20 | sha256:02cd2205818f121c13612721876f28c18bd50148bb8af532ea121c96ffcb59bf | 2024-05-28 | +| node:20-alpine | sha256:804aa6a6476a7e2a5df8db28804aa6c1c97904eefb01deed5d6af24bb51d0c81 | 2024-06-04 | | ubuntu:20.04 | sha256:0b897358ff6624825fb50d20ffb605ab0eaea77ced0adb8c6a4b756513dec6fc | 2024-06-03 | ### Installed apt packages From ed7da973ff4b43fc2fd8a29732e6fb7212fc48e4 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 28 Jun 2024 16:10:05 +0000 Subject: [PATCH 2932/3485] Updating readme file for ubuntu22 version 20240624.1.1 (#10125) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2204-Readme.md | 84 +++++++++++++++--------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/images/ubuntu/Ubuntu2204-Readme.md b/images/ubuntu/Ubuntu2204-Readme.md index 5565421e9a36..4a49027f7e9b 100644 --- a/images/ubuntu/Ubuntu2204-Readme.md +++ b/images/ubuntu/Ubuntu2204-Readme.md @@ -6,7 +6,7 @@ # Ubuntu 22.04 - OS Version: 22.04.4 LTS - Kernel Version: 6.5.0-1022-azure -- Image Version: 20240616.1.0 +- Image Version: 20240624.1.0 - Systemd version: 249.11-0ubuntu3.12 ## Installed Software @@ -32,7 +32,7 @@ ### Package Management - cpan 1.64 - Helm 3.15.2 -- Homebrew 4.3.5 +- Homebrew 4.3.7 - Miniconda 24.4.0 - Npm 10.7.0 - NuGet 6.6.1.2 @@ -40,7 +40,7 @@ - Pip3 22.0.2 - Pipx 1.6.0 - RubyGems 3.3.5 -- Vcpkg (build from commit f7423ee18) +- Vcpkg (build from commit c4467cb68) - Yarn 1.22.22 #### Environment variables @@ -60,27 +60,27 @@ to accomplish this. ### Project Management - Ant 1.10.12 - Gradle 8.8 -- Lerna 8.1.3 +- Lerna 8.1.5 - Maven 3.8.8 - Sbt 1.10.0 ### Tools -- Ansible 2.17.0 +- Ansible 2.17.1 - apt-fast 1.10.0 - AzCopy 10.25.1 - available by `azcopy` and `azcopy10` aliases - Bazel 7.2.0 - Bazelisk 1.19.0 - Bicep 0.28.1 - Buildah 1.23.1 -- CMake 3.29.5 +- CMake 3.29.6 - CodeQL Action Bundle 2.17.5 - Docker Amazon ECR Credential Helper 0.8.0 - Docker Compose v1 1.29.2 - Docker Compose v2 2.27.1 -- Docker-Buildx 0.15.0 +- Docker-Buildx 0.15.1 - Docker Client 26.1.3 - Docker Server 26.1.3 -- Fastlane 2.220.0 +- Fastlane 2.221.1 - Git 2.45.2 - Git LFS 3.5.1 - Git-ftp 1.6.0 @@ -101,8 +101,8 @@ to accomplish this. - Packer 1.11.0 - Parcel 2.12.0 - Podman 3.4.4 -- Pulumi 3.120.0 -- R 4.4.0 +- Pulumi 3.121.0 +- R 4.4.1 - Skopeo 1.4.1 - Sphinx Open Source Search Server 2.2.11 - SVN 1.14.1 @@ -112,16 +112,16 @@ to accomplish this. - zstd 1.5.6 ### CLI Tools -- Alibaba Cloud CLI 3.0.207 -- AWS CLI 2.16.9 +- Alibaba Cloud CLI 3.0.208 +- AWS CLI 2.17.0 - AWS CLI Session Manager Plugin 1.2.633.0 - AWS SAM CLI 1.119.0 - Azure CLI 2.61.0 - Azure CLI (azure-devops) 1.0.1 -- GitHub CLI 2.51.0 -- Google Cloud CLI 480.0.0 -- Netlify CLI 17.27.0 -- OpenShift CLI 4.15.17 +- GitHub CLI 2.52.0 +- Google Cloud CLI 481.0.0 +- Netlify CLI 17.29.0 +- OpenShift CLI 4.15.18 - ORAS CLI 1.2.0 - Vercel CLI 34.2.7 @@ -162,12 +162,12 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 126.0.6478.61 -- ChromeDriver 126.0.6478.61 +- Google Chrome 126.0.6478.126 +- ChromeDriver 126.0.6478.126 - Chromium 126.0.6478.0 -- Microsoft Edge 126.0.2592.56 -- Microsoft Edge WebDriver 126.0.2592.56 -- Selenium server 4.21.0 +- Microsoft Edge 126.0.2592.68 +- Microsoft Edge WebDriver 126.0.2592.68 +- Selenium server 4.22.0 - Mozilla Firefox 126.0.2 - Geckodriver 0.34.0 @@ -180,7 +180,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | ### .NET Tools -- .NET Core SDK: 6.0.423, 7.0.410, 8.0.301 +- .NET Core SDK: 6.0.423, 7.0.410, 8.0.302 - nbgv 3.6.139+a9e8765620 ### Databases @@ -205,7 +205,7 @@ Use the following command as a part of your job to start the service: 'sudo syst #### MS SQL - sqlcmd 17.10.0001.1 -- SqlPackage 162.3.563.1 +- SqlPackage 162.3.566.1 ### Cached Tools @@ -217,7 +217,7 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Node.js - 16.20.2 - 18.20.3 -- 20.14.0 +- 20.15.0 #### Python - 3.7.17 @@ -237,7 +237,7 @@ Use the following command as a part of your job to start the service: 'sudo syst - 3.1.6 ### PowerShell Tools -- PowerShell 7.4.2 +- PowerShell 7.4.3 #### PowerShell Modules - Az: 11.3.1 @@ -253,16 +253,16 @@ Use the following command as a part of your job to start the service: 'sudo syst | nginx | 1.18.0 | /etc/nginx/nginx.conf | inactive | 80 | ### Android -| Package Name | Version | -| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 9.0 | -| Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2 33.0.3<br>32.0.0<br>31.0.0 | -| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1) | -| Android Support Repository | 47.0.0 | -| CMake | 3.10.2<br>3.18.1<br>3.22.1 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 24.0.8215888<br>25.2.9519653 (default)<br>26.3.11579264 | +| Package Name | Version | +| -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 9.0 | +| Android SDK Build-tools | 35.0.0<br>34.0.0<br>33.0.0 33.0.1 33.0.2 33.0.3<br>32.0.0<br>31.0.0 | +| Android SDK Platforms | android-35 (rev 1)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1) | +| Android Support Repository | 47.0.0 | +| CMake | 3.10.2<br>3.18.1<br>3.22.1 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 24.0.8215888<br>25.2.9519653 (default)<br>26.3.11579264 | #### Environment variables | Name | Value | @@ -278,17 +278,17 @@ Use the following command as a part of your job to start the service: 'sudo syst | Repository:Tag | Digest | Created | | -------------------- | ------------------------------------------------------------------------ | ---------- | | alpine:3.16 | sha256:452e7292acee0ee16c332324d7de05fa2c99f9994ecc9f0779c602916a672ae4 | 2024-01-27 | -| alpine:3.17 | sha256:53cf9478b76f4c8fae126acbdfb79bed6e69e628faff572ebe4a029d3d247d98 | 2024-01-27 | -| alpine:3.18 | sha256:11e21d7b981a59554b3f822c49f6e9f57b6068bb74f49c4cd5cc4c663c7e5160 | 2024-01-27 | +| alpine:3.17 | sha256:a6063e988bcd597b4f1f7cfd4ec38402b02edd0c79250f00c9e14dc1e94bebbc | 2024-06-20 | +| alpine:3.18 | sha256:1875c923b73448b558132e7d4a44b815d078779ed7a73f76209c6372de95ea8d | 2024-06-20 | | debian:10 | sha256:58ce6f1271ae1c8a2006ff7d3e54e9874d839f573d8009c20154ad0f2fb0a225 | 2024-06-13 | | debian:11 | sha256:d584e02c85bc9b3bd8df01662e4f605a66e1b9a04f9dea0e288f56da474269a0 | 2024-06-13 | -| moby/buildkit:latest | sha256:21ca05626f03ebe128d268d6d7512024217b0f3adf7881047bdc5e83968ada87 | 2024-06-11 | +| moby/buildkit:latest | sha256:5d410bbb6d22b01fcaead1345936c5e0a0963eb6c3b190e38694e015467640fe | 2024-06-18 | | node:16 | sha256:f77a1aef2da8d83e45ec990f45df50f1a286c5fe8bbfb8c6e4246c6389705c0b | 2023-09-07 | | node:16-alpine | sha256:a1f9d027912b58a7c75be7716c97cfbc6d3099f3a97ed84aa490be9dee20e787 | 2023-08-10 | -| node:18 | sha256:4149a450f71699db7d695eeae3bc443e5aa97a7ff2f3a881a97e88f0d5568ee6 | 2024-06-13 | -| node:18-alpine | sha256:6937be95129321422103452e2883021cc4a96b63c32d7947187fcb25df84fc3f | 2024-06-04 | -| node:20 | sha256:d0a9a2399581a9de1ff962a48a28b5cfe700678a6a5df8e31a63aaa47bebb923 | 2024-06-13 | -| node:20-alpine | sha256:66c7d989b6dabba6b4305b88f40912679aebd9f387a5b16ffa76dfb9ae90b060 | 2024-06-04 | +| node:18 | sha256:d0bbfdbad0bff8253e6159dcbee42141db4fc309365d5b8bcfce46ed71569078 | 2024-05-21 | +| node:18-alpine | sha256:e37da457874383fa9217067867ec85fe8fe59f0bfa351ec9752a95438680056e | 2024-06-04 | +| node:20 | sha256:02cd2205818f121c13612721876f28c18bd50148bb8af532ea121c96ffcb59bf | 2024-05-28 | +| node:20-alpine | sha256:804aa6a6476a7e2a5df8db28804aa6c1c97904eefb01deed5d6af24bb51d0c81 | 2024-06-04 | | ubuntu:20.04 | sha256:0b897358ff6624825fb50d20ffb605ab0eaea77ced0adb8c6a4b756513dec6fc | 2024-06-03 | | ubuntu:22.04 | sha256:19478ce7fc2ffbce89df29fea5725a8d12e57de52eb9ea570890dc5852aac1ac | 2024-06-03 | From ce0b29d20c0bdbecf73aefe148bad4e5a36d8ee5 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 28 Jun 2024 16:32:38 +0000 Subject: [PATCH 2933/3485] Updating readme file for win19 version 20240624.1.1 (#10119) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/windows/Windows2019-Readme.md | 113 +++++++++++++-------------- 1 file changed, 56 insertions(+), 57 deletions(-) diff --git a/images/windows/Windows2019-Readme.md b/images/windows/Windows2019-Readme.md index 4d951ada1a43..9abb8620acb8 100644 --- a/images/windows/Windows2019-Readme.md +++ b/images/windows/Windows2019-Readme.md @@ -3,8 +3,8 @@ | [[Ubuntu, Windows] Docker Compose v1 will be removed from images on July, 9](https://github.com/actions/runner-images/issues/9692) | *** # Windows Server 2019 -- OS Version: 10.0.17763 Build 5830 -- Image Version: 20240610.1.0 +- OS Version: 10.0.17763 Build 5936 +- Image Version: 20240624.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -26,14 +26,14 @@ ### Package Management - Chocolatey 2.3.0 - Composer 2.7.7 -- Helm 3.15.0 +- Helm 3.15.1 - Miniconda 24.4.0 (pre-installed on the image but not added to PATH) - NPM 10.7.0 - NuGet 6.10.0.107 - pip 24.0 (python 3.7) - Pipx 1.2.1 - RubyGems 3.2.33 -- Vcpkg (build from commit b27651341) +- Vcpkg (build from commit c4467cb68) - Yarn 1.22.22 #### Environment variables @@ -44,20 +44,20 @@ ### Project Management - Ant 1.10.14 -- Gradle 8.7 +- Gradle 8.8 - Maven 3.8.7 - sbt 1.10.0 ### Tools -- 7zip 24.06 +- 7zip 24.07 - aria2 1.37.0 -- azcopy 10.25.0 +- azcopy 10.25.1 - Bazel 7.2.0 - Bazelisk 1.19.0 - Bicep 0.28.1 - Cabal 3.10.3.0 -- CMake 3.29.5 -- CodeQL Action Bundle 2.17.4 +- CMake 3.29.6 +- CodeQL Action Bundle 2.17.5 - Docker 26.1.3 - Docker Compose v1 1.29.2 - Docker Compose v2 2.27.1 @@ -65,12 +65,12 @@ - ghc 9.10.1 - Git 2.45.2.windows.1 - Git LFS 3.5.1 -- Google Cloud CLI 479.0.0 -- ImageMagick 7.1.1-29 -- InnoSetup 6.3.0 +- Google Cloud CLI 481.0.0 +- ImageMagick 7.1.1-33 +- InnoSetup 6.3.1 - jq 1.7.1 - Kind 0.23.0 -- Kubectl 1.30.1 +- Kubectl 1.30.2 - Mercurial 5.0 - gcc 8.1.0 - gdb 8.1 @@ -80,8 +80,8 @@ - OpenSSL 1.1.1w - Packer 1.11.0 - Parcel 2.12.0 -- Pulumi 3.119.0 -- R 4.4.0 +- Pulumi 3.121.0 +- R 4.4.1 - Service Fabric SDK 9.1.1436.9590 - Stack 2.15.7 - Subversion (SVN) 1.14.2 @@ -93,19 +93,19 @@ - zstd 1.5.6 ### CLI Tools -- Alibaba Cloud CLI 3.0.207 -- AWS CLI 2.16.4 -- AWS SAM CLI 1.118.0 +- Alibaba Cloud CLI 3.0.208 +- AWS CLI 2.17.0 +- AWS SAM CLI 1.119.0 - AWS Session Manager CLI 1.2.633.0 - Azure CLI 2.61.0 - Azure DevOps CLI extension 1.0.1 - Cloud Foundry CLI 6.53.0 -- GitHub CLI 2.50.0 +- GitHub CLI 2.52.0 ### Rust Tools -- Cargo 1.78.0 -- Rust 1.78.0 -- Rustdoc 1.78.0 +- Cargo 1.79.0 +- Rust 1.79.0 +- Rustdoc 1.79.0 - Rustup 1.27.1 #### Packages @@ -113,18 +113,18 @@ - cargo-audit 0.20.0 - cargo-outdated 0.15.0 - cbindgen 0.26.0 -- Clippy 0.1.78 +- Clippy 0.1.79 - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 125.0.6422.142 -- Chrome Driver 125.0.6422.141 -- Microsoft Edge 125.0.2535.92 -- Microsoft Edge Driver 125.0.2535.92 -- Mozilla Firefox 126.0.1 +- Google Chrome 126.0.6478.127 +- Chrome Driver 126.0.6478.126 +- Microsoft Edge 126.0.2592.68 +- Microsoft Edge Driver 126.0.2592.68 +- Mozilla Firefox 127.0.1 - Gecko Driver 0.34.0 - IE Driver 4.14.0.0 -- Selenium server 4.21.0 +- Selenium server 4.22.0 #### Environment variables | Name | Value | @@ -172,7 +172,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Node.js - 16.20.2 - 18.20.3 -- 20.14.0 +- 20.15.0 #### Python - 3.7.9 @@ -180,7 +180,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 3.9.13 - 3.10.11 - 3.11.9 -- 3.12.3 +- 3.12.4 #### PyPy - 2.7.18 [PyPy 7.3.16] @@ -215,9 +215,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Database tools - Azure CosmosDb Emulator 2.14.18.0 -- DacFx 162.3.563.1 +- DacFx 162.3.566.1 - MySQL 5.7.44.0 -- SQL OLEDB Driver 18.6.7.0 +- SQL OLEDB Driver 18.7.2.0 - SQLPS 1.0 ### Web Servers @@ -229,12 +229,12 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Visual Studio Enterprise 2019 | Name | Version | Path | | ----------------------------- | -------------- | -------------------------------------------------------------- | -| Visual Studio Enterprise 2019 | 16.11.34902.97 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | +| Visual Studio Enterprise 2019 | 16.11.34931.43 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | #### Workloads, components and extensions | Package | Version | | ------------------------------------------------------------------------- | --------------- | -| Component.Android.NDK.R16B | 16.11.34827.16 | +| Component.Android.NDK.R16B | 16.11.34930.47 | | Component.Android.SDK25.Private | 16.0.28625.61 | | Component.Android.SDK30 | 16.10.31205.252 | | Component.Ant | 1.9.3.8 | @@ -298,7 +298,6 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Component.Azure.Powershell | 16.5.29515.121 | | Microsoft.VisualStudio.Component.Azure.ResourceManager.Tools | 16.4.29409.204 | | Microsoft.VisualStudio.Component.Azure.ServiceFabric.Tools | 16.4.29313.120 | -| Microsoft.VisualStudio.Component.Azure.Storage.AzCopy | 16.0.28517.75 | | Microsoft.VisualStudio.Component.Azure.Storage.Emulator | 16.4.29313.120 | | Microsoft.VisualStudio.Component.Azure.Waverton | 16.10.31205.252 | | Microsoft.VisualStudio.Component.Azure.Waverton.BuildTools | 16.10.31205.252 | @@ -492,7 +491,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 10.0.22621.0 ### .NET Core Tools -- .NET Core SDK: 6.0.131, 6.0.203, 6.0.321, 6.0.423, 7.0.120, 7.0.203, 7.0.317, 7.0.410, 8.0.106, 8.0.206, 8.0.301 +- .NET Core SDK: 6.0.131, 6.0.203, 6.0.321, 6.0.423, 7.0.120, 7.0.203, 7.0.317, 7.0.410, 8.0.106, 8.0.206, 8.0.302 - .NET Framework: 4.7.2, 4.8 - Microsoft.AspNetCore.App: 6.0.5, 6.0.26, 6.0.31, 7.0.5, 7.0.20, 8.0.6 - Microsoft.NETCore.App: 6.0.5, 6.0.26, 6.0.31, 7.0.5, 7.0.20, 8.0.6 @@ -500,7 +499,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - nbgv 3.6.139+a9e8765620 ### PowerShell Tools -- PowerShell 7.4.2 +- PowerShell 7.4.3 #### Powershell Modules - Az: 11.3.1 @@ -508,7 +507,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - AzureRM: 2.1.0 (Default), 6.13.1 - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.596 +- AWSPowershell: 4.1.605 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.10 - Microsoft.Graph: 2.19.0 @@ -525,19 +524,19 @@ All other versions are saved but not installed. ``` ### Android -| Package Name | Version | -| -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 8.0 | -| Android Emulator | 34.2.15 | -| Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2 33.0.3<br>32.0.0<br>31.0.0<br>30.0.2 | -| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3) | -| Android SDK Platform-Tools | 35.0.1 | -| Android Support Repository | 47.0.0 | -| CMake | 3.10.2<br>3.18.1<br>3.22.1 | -| Google APIs | addon-google_apis-google-21<br>addon-google_apis-google-22<br>addon-google_apis-google-23<br>addon-google_apis-google-24 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 24.0.8215888<br>25.2.9519653<br>26.3.11579264 | +| Package Name | Version | +| -------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 8.0 | +| Android Emulator | 34.2.15 | +| Android SDK Build-tools | 35.0.0<br>34.0.0<br>33.0.0 33.0.1 33.0.2 33.0.3<br>32.0.0<br>31.0.0<br>30.0.2 | +| Android SDK Platforms | android-35 (rev 1)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3) | +| Android SDK Platform-Tools | 35.0.1 | +| Android Support Repository | 47.0.0 | +| CMake | 3.10.2<br>3.18.1<br>3.22.1 | +| Google APIs | addon-google_apis-google-21<br>addon-google_apis-google-22<br>addon-google_apis-google-23<br>addon-google_apis-google-24 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 24.0.8215888<br>25.2.9519653<br>26.3.11579264 | #### Environment variables | Name | Value | @@ -552,9 +551,9 @@ All other versions are saved but not installed. ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:b7be163b2b65da14d4552cc03037134a89d9d739200e0ffeb84bd03e378e0d7a | 2024-05-14 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:a49ce9e1f3138559b80d570e1607df34306bb4c5e36b99e4e20a36c34d3a8c2e | 2024-05-14 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:0d1c957268d62a7c23e93d5502a858785dd15f36fbc09a534ca3135dd530e2fd | 2024-05-21 | -| mcr.microsoft.com/windows/nanoserver:1809 | sha256:6f62243adf70b086613cb4b4596c276fe73bab1e5152037eb5b156c915886be8 | 2024-05-10 | -| mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:3c97a5c1c32ddb346c190f00a588da6e682a9a8160869f4969edfd7c6e4d1c03 | 2024-05-10 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:cf673b802c8ec71356022f4c1b6f68410594479a77fd3923e678969d58af71bc | 2024-06-11 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:b8640b49c21d7730dc75be6869cde9991171664c8dc469517cb2816b1c9632ee | 2024-06-11 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:c1b2be17aa0c1a5d9493a306395a6f07141aae8d7897f7ba319183f28719c990 | 2024-06-11 | +| mcr.microsoft.com/windows/nanoserver:1809 | sha256:f31fa317b1851ae16ffdb87450e5e51b61e186f898b949cea32d77e1c8b638a3 | 2024-06-07 | +| mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:0d52390e8497ea6238500afbf60054bd731b12818e6440d31fe6ff4e2eefc5ad | 2024-06-07 | From 734699ef615fffecfbad0da147fb9ef8934fe0b5 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 28 Jun 2024 18:19:37 +0000 Subject: [PATCH 2934/3485] Updating readme file for win22 version 20240624.1.1 (#10127) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/windows/Windows2022-Readme.md | 52 ++++++++++++++-------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/images/windows/Windows2022-Readme.md b/images/windows/Windows2022-Readme.md index 3cef82b95276..8791ea891e6c 100644 --- a/images/windows/Windows2022-Readme.md +++ b/images/windows/Windows2022-Readme.md @@ -3,8 +3,8 @@ | [[Ubuntu, Windows] Docker Compose v1 will be removed from images on July, 9](https://github.com/actions/runner-images/issues/9692) | *** # Windows Server 2022 -- OS Version: 10.0.20348 Build 2527 -- Image Version: 20240618.1.0 +- OS Version: 10.0.20348 Build 2529 +- Image Version: 20240624.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -30,10 +30,10 @@ - Miniconda 24.4.0 (pre-installed on the image but not added to PATH) - NPM 10.7.0 - NuGet 6.10.0.107 -- pip 24.0 (python 3.9) +- pip 24.1 (python 3.9) - Pipx 1.6.0 - RubyGems 3.2.33 -- Vcpkg (build from commit ded971709) +- Vcpkg (build from commit c4467cb68) - Yarn 1.22.22 #### Environment variables @@ -49,7 +49,7 @@ - sbt 1.10.0 ### Tools -- 7zip 24.06 +- 7zip 24.07 - aria2 1.37.0 - azcopy 10.25.1 - Bazel 7.2.0 @@ -65,7 +65,7 @@ - ghc 9.10.1 - Git 2.45.2.windows.1 - Git LFS 3.5.1 -- ImageMagick 7.1.1-33 +- ImageMagick 7.1.1-34 - InnoSetup 6.3.1 - jq 1.7.1 - Kind 0.23.0 @@ -78,7 +78,7 @@ - NSIS 3.10 - OpenSSL 1.1.1w - Packer 1.11.0 -- Pulumi 3.120.0 +- Pulumi 3.121.0 - R 4.4.1 - Service Fabric SDK 9.1.1436.9590 - Stack 2.15.7 @@ -91,13 +91,13 @@ - zstd 1.5.6 ### CLI Tools -- Alibaba Cloud CLI 3.0.207 -- AWS CLI 2.16.9 +- Alibaba Cloud CLI 3.0.208 +- AWS CLI 2.17.0 - AWS SAM CLI 1.119.0 - AWS Session Manager CLI 1.2.633.0 - Azure CLI 2.61.0 - Azure DevOps CLI extension 1.0.1 -- GitHub CLI 2.51.0 +- GitHub CLI 2.52.0 ### Rust Tools - Cargo 1.79.0 @@ -114,14 +114,14 @@ - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 126.0.6478.115 -- Chrome Driver 126.0.6478.62 -- Microsoft Edge 126.0.2592.56 -- Microsoft Edge Driver 126.0.2592.61 -- Mozilla Firefox 127.0 +- Google Chrome 126.0.6478.127 +- Chrome Driver 126.0.6478.126 +- Microsoft Edge 126.0.2592.68 +- Microsoft Edge Driver 126.0.2592.68 +- Mozilla Firefox 127.0.1 - Gecko Driver 0.34.0 - IE Driver 4.14.0.0 -- Selenium server 4.21.0 +- Selenium server 4.22.0 #### Environment variables | Name | Value | @@ -166,7 +166,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Node.js - 16.20.2 - 18.20.3 -- 20.14.0 +- 20.15.0 #### Python - 3.7.9 @@ -208,9 +208,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Database tools - Azure CosmosDb Emulator 2.14.18.0 -- DacFx 162.3.563.1 +- DacFx 162.3.566.1 - MySQL 8.0.37.0 -- SQL OLEDB Driver 18.6.7.0 +- SQL OLEDB Driver 18.7.2.0 - SQLPS 1.0 ### Web Servers @@ -495,7 +495,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - nbgv 3.6.139+a9e8765620 ### PowerShell Tools -- PowerShell 7.4.2 +- PowerShell 7.4.3 #### Powershell Modules - Az: 11.3.1 @@ -503,7 +503,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - AzureRM: 2.1.0 (Default), 6.13.1 - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.602 +- AWSPowershell: 4.1.605 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.10 - Microsoft.Graph: 2.19.0 @@ -546,9 +546,9 @@ All other versions are saved but not installed. ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2022 | sha256:cb3c91c48940491d2feba172e85e2ea4f03344364ec2a7012fc8d1bac2fe9f2d | 2024-06-11 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2022 | sha256:94feada17ac5850a3f6e197d5afe5d17a57680fc47cd94c1e3a5c3726c58626f | 2024-06-11 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:911befeaae3153f396e5178b3c27f50d19ab985f58f99ecb86f7a05e41eb321c | 2024-06-11 | -| mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:c06c984319aecc48f4582824fe88ea2aa44933ff7793d8a81aab0ce41c1fedc3 | 2024-06-07 | -| mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:0a1c928d2334433a43f2384a933bb4b22f626228d9c48ffa388b16a5a232c9f9 | 2024-06-07 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2022 | sha256:4facc7844cdbbdca6d7e7a1c5f4339e327007727629d849521792eb8daf6c196 | 2024-06-21 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2022 | sha256:50d36436c9de72c01919d26aa4ae23e7aab99fbb90aa428eac91f312367df341 | 2024-06-21 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:190a72ac933d75741d402f38ba3e8791235cd5fa8df851b80f87950e617da93c | 2024-06-21 | +| mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:31c8aa02d47af7d65c11da9c3a279c8407c32afd3fc6bec2e9a544db8e3715b3 | 2024-06-19 | +| mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:92c6ddbf87a6d6696a83f26e3df912983477844e22dd686c3e82bac4cf5b49c2 | 2024-06-19 | From 773246ccf73a394d41937f3142cee7166e50a1e2 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 29 Jun 2024 16:40:06 +0000 Subject: [PATCH 2935/3485] Updating readme file for ubuntu24 version 20240624.1.1 (#10124) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2404-Readme.md | 50 +++++++++++++++--------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/images/ubuntu/Ubuntu2404-Readme.md b/images/ubuntu/Ubuntu2404-Readme.md index e2d8e83b4bdd..7b54fdc4247c 100644 --- a/images/ubuntu/Ubuntu2404-Readme.md +++ b/images/ubuntu/Ubuntu2404-Readme.md @@ -5,9 +5,9 @@ *** # Ubuntu 24.04 LTS - OS Version: 24.04 LTS -- Kernel Version: 6.8.0-1007-azure -- Image Version: 20240617.1.0 -- Systemd version: 255.4-1ubuntu8 +- Kernel Version: 6.8.0-1008-azure +- Image Version: 20240624.1.0 +- Systemd version: 255.4-1ubuntu8.1 ## Installed Software @@ -20,7 +20,7 @@ - GNU C++: 12.3.0, 13.2.0, 14.0.1 - GNU Fortran: 12.3.0, 13.2.0, 14.0.1 - Julia 1.10.4 -- Node.js 20.14.0 +- Node.js 20.15.0 - Perl 5.38.2 - Python 3.12.3 - Ruby 3.2.3 @@ -28,14 +28,14 @@ ### Package Management - cpan 1.64 - Helm 3.15.2 -- Homebrew 4.3.6 +- Homebrew 4.3.7 - Miniconda 24.4.0 - Npm 10.7.0 - Pip 24.0 - Pip3 24.0 - Pipx 1.4.3 - RubyGems 3.4.20 -- Vcpkg (build from commit 40616a5e9) +- Vcpkg (build from commit c4467cb68) - Yarn 1.22.22 #### Environment variables @@ -55,7 +55,7 @@ to accomplish this. ### Project Management - Ant 1.10.14 - Gradle 8.8 -- Lerna 8.1.3 +- Lerna 8.1.5 - Maven 3.8.8 ### Tools @@ -69,10 +69,10 @@ to accomplish this. - CodeQL Action Bundle 2.17.5 - Docker Amazon ECR Credential Helper 0.8.0 - Docker Compose v2 2.27.1 -- Docker-Buildx 0.15.0 +- Docker-Buildx 0.15.1 - Docker Client 26.1.3 - Docker Server 26.1.3 -- Fastlane 2.220.0 +- Fastlane 2.221.1 - Git 2.45.2 - Git LFS 3.5.1 - Git-ftp 1.6.0 @@ -89,7 +89,7 @@ to accomplish this. - OpenSSL 3.0.13-0ubuntu3.1 - Parcel 2.12.0 - Podman 4.9.3 -- Pulumi 3.120.0 +- Pulumi 3.121.0 - Skopeo 1.13.3 - Sphinx Open Source Search Server 2.2.11 - yamllint 1.35.1 @@ -97,12 +97,12 @@ to accomplish this. - zstd 1.5.6 ### CLI Tools -- AWS CLI 2.16.10 +- AWS CLI 2.17.0 - AWS CLI Session Manager Plugin 1.2.633.0 - AWS SAM CLI 1.119.0 - Azure CLI 2.61.0 - Azure CLI (azure-devops) 1.0.1 -- GitHub CLI 2.51.0 +- GitHub CLI 2.52.0 ### Java | Version | Environment Variable | @@ -136,10 +136,10 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 126.0.6478.61 -- ChromeDriver 126.0.6478.61 +- Google Chrome 126.0.6478.126 +- ChromeDriver 126.0.6478.126 - Chromium 126.0.6478.0 -- Selenium server 4.21.0 +- Selenium server 4.22.0 #### Environment variables | Name | Value | @@ -183,7 +183,7 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Node.js - 16.20.2 - 18.20.3 -- 20.14.0 +- 20.15.0 #### Python - 3.9.19 @@ -211,15 +211,15 @@ Use the following command as a part of your job to start the service: 'sudo syst | nginx | 1.24.0 | /etc/nginx/nginx.conf | inactive | 80 | ### Android -| Package Name | Version | -| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 12.0 | -| Android SDK Build-tools | 34.0.0 | -| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1) | -| Android Support Repository | 47.0.0 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 24.0.8215888<br>25.2.9519653<br>26.3.11579264 (default) | +| Package Name | Version | +| -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 12.0 | +| Android SDK Build-tools | 35.0.0<br>34.0.0 | +| Android SDK Platforms | android-35 (rev 1)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1) | +| Android Support Repository | 47.0.0 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 24.0.8215888<br>25.2.9519653<br>26.3.11579264 (default) | #### Environment variables | Name | Value | From 5afe2ac2dc5d5e516b097841d26e61c7032aa8ed Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 30 Jun 2024 05:56:24 +0000 Subject: [PATCH 2936/3485] Updating readme file for macos-14-arm64 version 20240625.2 (#10131) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-14-arm64-Readme.md | 70 +++++++++++++++------------ 1 file changed, 39 insertions(+), 31 deletions(-) diff --git a/images/macos/macos-14-arm64-Readme.md b/images/macos/macos-14-arm64-Readme.md index 5cf57d821ec6..5808180c0bea 100644 --- a/images/macos/macos-14-arm64-Readme.md +++ b/images/macos/macos-14-arm64-Readme.md @@ -1,7 +1,12 @@ +| Announcements | +|-| +| [[macOS] Default Xcode on macOS 14 Sonoma will be set to Xcode 15.4 on July, 22](https://github.com/actions/runner-images/issues/10121) | +| [[macOS] Default Xcode on macOS 13 Ventura will be set to Xcode 15.2 on July, 15](https://github.com/actions/runner-images/issues/10120) | +*** # macOS 14 - OS Version: macOS 14.5 (23F79) - Kernel Version: Darwin 23.5.0 -- Image Version: 20240616.1 +- Image Version: 20240625.2 ## Installed Software @@ -13,31 +18,33 @@ - GCC 11 (Homebrew GCC 11.4.0) - available by `gcc-11` alias - GCC 12 (Homebrew GCC 12.3.0) - available by `gcc-12` alias - GCC 13 (Homebrew GCC 13.3.0) - available by `gcc-13` alias +- GCC 14 (Homebrew GCC 14.1.0_1) - available by `gcc-14` alias - GNU Fortran 11 (Homebrew GCC 11.4.0) - available by `gfortran-11` alias - GNU Fortran 12 (Homebrew GCC 12.3.0) - available by `gfortran-12` alias - GNU Fortran 13 (Homebrew GCC 13.3.0) - available by `gfortran-13` alias +- GNU Fortran 14 (Homebrew GCC 14.1.0_1) - available by `gfortran-14` alias - Kotlin 2.0.0-release-341 - Mono 6.12.0.188 -- Node.js 20.14.0 +- Node.js 20.15.0 - Perl 5.38.2 - Python3 3.12.4 - Ruby 3.0.7p220 ### Package Management -- Bundler 2.5.13 +- Bundler 2.5.14 - Carthage 0.39.1 - CocoaPods 1.15.2 -- Homebrew 4.3.5 +- Homebrew 4.3.7 - NPM 10.7.0 - NuGet 6.3.1.1 - Pip3 24.0 (python 3.12) - Pipx 1.6.0 -- RubyGems 3.5.13 +- RubyGems 3.5.14 - Yarn 1.22.22 ### Project Management - Apache Ant 1.10.14 -- Apache Maven 3.9.7 +- Apache Maven 3.9.8 - Gradle 8.8 ### Utilities @@ -50,7 +57,7 @@ - Curl 8.6.0 - Git 2.45.2 - Git LFS 3.5.1 -- GitHub CLI 2.51.0 +- GitHub CLI 2.52.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.24.5 - gpg (GnuPG) 2.4.5 @@ -62,17 +69,17 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.16.9 +- AWS CLI 2.17.1 - AWS SAM CLI 1.119.0 - AWS Session Manager CLI 1.2.633.0 - Azure CLI 2.61.0 - Azure CLI (azure-devops) 1.0.1 - Bicep CLI 0.28.1 -- Cmake 3.29.5 +- Cmake 3.29.6 - CodeQL Action Bundle 2.17.5 -- Fastlane 2.220.0 +- Fastlane 2.221.1 - SwiftFormat 0.54.0 -- Xcbeautify 2.3.1 +- Xcbeautify 2.4.0 - Xcode Command Line Tools 15.3.0.0.1.1708646388 - Xcodes 1.4.1 @@ -81,10 +88,10 @@ ### Browsers - Safari 17.5 (19618.2.12.11.6) - SafariDriver 17.5 (19618.2.12.11.6) -- Google Chrome 126.0.6478.62 -- Google Chrome for Testing 126.0.6478.61 -- ChromeDriver 126.0.6478.61 -- Selenium server 4.21.0 +- Google Chrome 126.0.6478.127 +- Google Chrome for Testing 126.0.6478.126 +- ChromeDriver 126.0.6478.126 +- Selenium server 4.22.0 #### Environment variables | Name | Value | @@ -110,7 +117,7 @@ #### Node.js - 18.20.3 -- 20.14.0 +- 20.15.0 #### Go - 1.20.14 @@ -128,7 +135,7 @@ - Rustfmt 1.7.0-stable ### PowerShell Tools -- PowerShell 7.4.2 +- PowerShell 7.4.3 #### PowerShell Modules - Az: 12.0.0 @@ -193,12 +200,12 @@ | Simulator - watchOS 11.0 | watchsimulator11.0 | 16.0 | | visionOS 1.0 | xros1.0 | 15.2 | | Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | -| visionOS 1.1 | xros1.1 | 15.3 | | Simulator - visionOS 1.1 | xrsimulator1.1 | 15.3 | +| visionOS 1.1 | xros1.1 | 15.3 | | Simulator - visionOS 1.2 | xrsimulator1.2 | 15.4 | | visionOS 1.2 | xros1.2 | 15.4 | -| Simulator - visionOS 2.0 | xrsimulator2.0 | 16.0 | | visionOS 2.0 | xros2.0 | 16.0 | +| Simulator - visionOS 2.0 | xrsimulator2.0 | 16.0 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | @@ -236,18 +243,18 @@ | visionOS 2.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0 | Apple Vision Pro | ### Android -| Package Name | Version | -| -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 11.0 | -| Android Emulator | 34.2.15 | -| Android SDK Build-tools | 34.0.0<br>33.0.2 33.0.3 | -| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | -| Android SDK Platform-Tools | 35.0.1 | -| Android Support Repository | 47.0.0 | -| CMake | 3.22.1 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 24.0.8215888<br>25.2.9519653<br>26.3.11579264 (default) | +| Package Name | Version | +| -------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 11.0 | +| Android Emulator | 34.2.15 | +| Android SDK Build-tools | 35.0.0<br>34.0.0<br>33.0.2 33.0.3 | +| Android SDK Platforms | android-35 (rev 1)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | +| Android SDK Platform-Tools | 35.0.1 | +| Android Support Repository | 47.0.0 | +| CMake | 3.22.1 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 24.0.8215888<br>25.2.9519653<br>26.3.11579264 (default) | #### Environment variables | Name | Value | @@ -258,3 +265,4 @@ | ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/26.3.11579264 | | ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk/26.3.11579264 | | ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | + From 5eda352fd47632a67c11421badcd50f6747a8b54 Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Mon, 1 Jul 2024 10:56:32 +0200 Subject: [PATCH 2937/3485] [macOS] Update Xcode 16.0 to Beta 2 for macOS-14 (#10141) --- images/macos/toolsets/toolset-14.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/macos/toolsets/toolset-14.json b/images/macos/toolsets/toolset-14.json index 330af2a46679..a66f116a5837 100644 --- a/images/macos/toolsets/toolset-14.json +++ b/images/macos/toolsets/toolset-14.json @@ -3,7 +3,7 @@ "default": "15.0.1", "x64": { "versions": [ - { "link": "16.0", "version": "16.0.0-Beta+16A5171c", "install_runtimes": "false", "sha256": "e7baf4aa1b1715a49770b50e8a5b8686dfe39f4d513d0b248912f41ded6c6ae6"}, + { "link": "16.0", "version": "16.0.0-Beta.2+16A5171r", "install_runtimes": "false", "sha256": "86b4fd563d80c997887d37a528f69161f82987932b5ebe6119ad5dd548352ad3"}, { "link": "15.4", "version": "15.4.0+15F31d", "install_runtimes": "true", "sha256": "82d3d61804ff3f4c7c82085e91dc701037ddaa770e542848b2477e22f4e8aa7a"}, { "link": "15.3", "version": "15.3.0+15E204a", "install_runtimes": "true", "sha256": "f13f6a2e2df432c3008e394640b8549a18c285acd7fd148d6c4bac8c3a5af234"}, { "link": "15.2", "version": "15.2.0+15C500b", "install_runtimes": "true", "sha256": "04E93680C6DDBEC84666531BE412DE778AFC8EAC6AB2037F4C2BE7290818B59B"}, @@ -14,7 +14,7 @@ }, "arm64":{ "versions": [ - { "link": "16.0", "version": "16.0.0-Beta+16A5171c", "install_runtimes": "true", "sha256": "e7baf4aa1b1715a49770b50e8a5b8686dfe39f4d513d0b248912f41ded6c6ae6"}, + { "link": "16.0", "version": "16.0.0-Beta.2+16A5171r", "install_runtimes": "true", "sha256": "86b4fd563d80c997887d37a528f69161f82987932b5ebe6119ad5dd548352ad3"}, { "link": "15.4", "version": "15.4.0+15F31d", "install_runtimes": "true", "sha256": "82d3d61804ff3f4c7c82085e91dc701037ddaa770e542848b2477e22f4e8aa7a"}, { "link": "15.3", "version": "15.3.0+15E204a", "install_runtimes": "true", "sha256": "f13f6a2e2df432c3008e394640b8549a18c285acd7fd148d6c4bac8c3a5af234"}, { "link": "15.2", "version": "15.2.0+15C500b", "install_runtimes": "true", "sha256": "04E93680C6DDBEC84666531BE412DE778AFC8EAC6AB2037F4C2BE7290818B59B"}, From 0176ca6d78e6bb771cab14b76f92277fdb030908 Mon Sep 17 00:00:00 2001 From: kishorekumar-anchala <168699259+kishorekumar-anchala@users.noreply.github.com> Date: Mon, 1 Jul 2024 22:26:57 +0530 Subject: [PATCH 2938/3485] fix openshift cli issue (#10153) --- images/ubuntu/scripts/build/install-oc-cli.sh | 14 ++++++++++++-- images/ubuntu/toolsets/toolset-2004.json | 6 +++++- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/images/ubuntu/scripts/build/install-oc-cli.sh b/images/ubuntu/scripts/build/install-oc-cli.sh index 8f8a06de49c6..a20f4275c887 100644 --- a/images/ubuntu/scripts/build/install-oc-cli.sh +++ b/images/ubuntu/scripts/build/install-oc-cli.sh @@ -5,10 +5,20 @@ ################################################################################ # Source the helpers for use with the script +source $HELPER_SCRIPTS/os.sh source $HELPER_SCRIPTS/install.sh -# Install the oc CLI -archive_path=$(download_with_retry "https://mirror.openshift.com/pub/openshift-v4/clients/ocp/latest/openshift-client-linux.tar.gz") +if is_ubuntu20; then + toolset_version=$(get_toolset_value '.ocCli.version') + download_url="https://mirror.openshift.com/pub/openshift-v4/clients/ocp/$toolset_version/openshift-client-linux-$toolset_version.tar.gz" +else + + # Install the oc CLI + download_url="https://mirror.openshift.com/pub/openshift-v4/clients/ocp/latest/openshift-client-linux.tar.gz" +fi + +archive_path=$(download_with_retry "$download_url") + tar xzf "$archive_path" -C "/usr/local/bin" oc invoke_tests "CLI.Tools" "OC CLI" diff --git a/images/ubuntu/toolsets/toolset-2004.json b/images/ubuntu/toolsets/toolset-2004.json index 947d673b8b60..221de2935e40 100644 --- a/images/ubuntu/toolsets/toolset-2004.json +++ b/images/ubuntu/toolsets/toolset-2004.json @@ -378,5 +378,9 @@ "aliyunCli": { "version": "3.0.174", "sha256": "0c51028a7a32fc02c8de855f73e273556f957115eb5624565738f9b9f83a50ba" - } + }, + "ocCli": { + "version": "4.15.19" + } + } From af2f67d1ad3050c4727c0e432e1548d59399f58a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 3 Jul 2024 16:56:02 +0000 Subject: [PATCH 2939/3485] Updating readme file for macos-12 version 20240630.1 (#10156) Co-authored-by: Image generation service account. <no-reply@microsoft.com> --- images/macos/macos-12-Readme.md | 52 +++++++++++++++++++-------------- 1 file changed, 30 insertions(+), 22 deletions(-) diff --git a/images/macos/macos-12-Readme.md b/images/macos/macos-12-Readme.md index e9657a055d14..eb8501443b29 100644 --- a/images/macos/macos-12-Readme.md +++ b/images/macos/macos-12-Readme.md @@ -1,7 +1,12 @@ +| Announcements | +|-| +| [[macOS] Default Xcode on macOS 14 Sonoma will be set to Xcode 15.4 on July, 22](https://github.com/actions/runner-images/issues/10121) | +| [[macOS] Default Xcode on macOS 13 Ventura will be set to Xcode 15.2 on July, 15](https://github.com/actions/runner-images/issues/10120) | +*** # macOS 12 - OS Version: macOS 12.7.5 (21H1222) - Kernel Version: Darwin 21.6.0 -- Image Version: 20240623.1 +- Image Version: 20240630.1 ## Installed Software @@ -11,11 +16,13 @@ - Clang/LLVM 14.0.0 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` - GCC 11 (Homebrew GCC 11.4.0) - available by `gcc-11` alias -- GCC 12 (Homebrew GCC 12.3.0) - available by `gcc-12` alias +- GCC 12 (Homebrew GCC 12.4.0) - available by `gcc-12` alias - GCC 13 (Homebrew GCC 13.3.0) - available by `gcc-13` alias +- GCC 14 (Homebrew GCC 14.1.0_1) - available by `gcc-14` alias - GNU Fortran 11 (Homebrew GCC 11.4.0) - available by `gfortran-11` alias -- GNU Fortran 12 (Homebrew GCC 12.3.0) - available by `gfortran-12` alias +- GNU Fortran 12 (Homebrew GCC 12.4.0) - available by `gfortran-12` alias - GNU Fortran 13 (Homebrew GCC 13.3.0) - available by `gfortran-13` alias +- GNU Fortran 14 (Homebrew GCC 14.1.0_1) - available by `gfortran-14` alias - Julia 1.10.4 - Kotlin 2.0.0-release-341 - Go 1.21.11 @@ -36,15 +43,15 @@ - Carthage 0.39.1 - CocoaPods 1.15.2 - Composer 2.7.7 -- Homebrew 4.3.6 -- Miniconda 24.4.0 +- Homebrew 4.3.7 +- Miniconda 24.5.0 - NPM 10.7.0 - NuGet 6.3.1.1 - Pip 20.3.4 (python 2.7) -- Pip3 24.1 (python 3.12) +- Pip3 24.1.1 (python 3.12) - Pipx 1.6.0 - RubyGems 3.5.14 -- Vcpkg 2024 (build from commit c4467cb68) +- Vcpkg 2024 (build from commit afa12e729) - Yarn 1.22.22 #### Environment variables @@ -63,17 +70,17 @@ - 7-Zip 17.05 - aria2 1.37.0 - azcopy 10.25.1 -- bazel 7.2.0 +- bazel 7.2.1 - bazelisk 1.20.0 - bsdtar 3.5.1 - available by 'tar' alias - Curl 8.8.0 - Git 2.45.2 - Git LFS 3.5.1 -- GitHub CLI 2.51.0 +- GitHub CLI 2.52.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.24.5 - gpg (GnuPG) 2.4.5 -- ImageMagick 7.1.1-33 +- ImageMagick 7.1.1-34 - jq 1.7.1 - mongo 5.0.27 - mongod 5.0.27 @@ -92,15 +99,15 @@ ### Tools - App Center CLI 3.0.1 -- AWS CLI 2.17.0 -- AWS SAM CLI 1.119.0 +- AWS CLI 2.17.5 +- AWS SAM CLI 1.120.0 - AWS Session Manager CLI 1.2.633.0 - Azure CLI 2.61.0 - Azure CLI (azure-devops) 1.0.1 - Bicep CLI 0.28.1 - Cabal 3.10.3.0 - Cmake 3.29.6 -- CodeQL Action Bundle 2.17.5 +- CodeQL Action Bundle 2.17.6 - Colima 0.6.9 - Fastlane 2.221.1 - GHC 9.10.1 @@ -111,7 +118,7 @@ - Swig 4.2.1 - Xcbeautify 1.6.0 - Xcode Command Line Tools 14.2.0.0.1.1668646533 -- Xcodes 1.4.1 +- Xcodes 1.5.0 ### Linters - SwiftLint 0.53.0 @@ -120,12 +127,12 @@ ### Browsers - Safari 17.5 (17618.2.12.111.5) - SafariDriver 17.5 (17618.2.12.111.5) -- Google Chrome 126.0.6478.115 -- Google Chrome for Testing 126.0.6478.63 -- ChromeDriver 126.0.6478.63 -- Microsoft Edge 126.0.2592.68 -- Microsoft Edge WebDriver 126.0.2592.68 -- Mozilla Firefox 127.0.1 +- Google Chrome 126.0.6478.127 +- Google Chrome for Testing 126.0.6478.126 +- ChromeDriver 126.0.6478.126 +- Microsoft Edge 126.0.2592.81 +- Microsoft Edge WebDriver 126.0.2592.81 +- Mozilla Firefox 127.0.2 - geckodriver 0.34.0 - Selenium server 4.22.0 @@ -168,7 +175,7 @@ #### Node.js - 16.20.2 - 18.20.3 -- 20.14.0 +- 20.15.0 #### Go - 1.20.14 @@ -359,10 +366,11 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" #### Environment variables | Name | Value | | ----------------- | ----------------------------------------------------------------------------------------- | -| PARALLELS_DMG_URL | https://download.parallels.com/desktop/v19/19.4.0-54962/ParallelsDesktop-19.4.0-54962.dmg | +| PARALLELS_DMG_URL | https://download.parallels.com/desktop/v19/19.4.1-54985/ParallelsDesktop-19.4.1-54985.dmg | ##### Notes ``` If you want to use Parallels Desktop you should download a package from URL stored in PARALLELS_DMG_URL environment variable. A system extension is allowed for this version. ``` + From 0ad636b8243987e85a0148adcfd379b1661a0728 Mon Sep 17 00:00:00 2001 From: ijunaidm <160701894+ijunaidm@users.noreply.github.com> Date: Thu, 4 Jul 2024 00:22:00 +0530 Subject: [PATCH 2940/3485] Update Image Rollout Badges (#10170) --- README.md | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 594d6d90eb62..bac865ede5b7 100644 --- a/README.md +++ b/README.md @@ -21,17 +21,17 @@ To build a VM machine from this repo's source, see the [instructions](docs/creat | Image | YAML Label | Included Software | Rollout Status of Latest Image Release | | --------------------|---------------------|--------------------|--------------------| -| Ubuntu 24.04 <sup>beta</sup> | `ubuntu-24.04` | [ubuntu-24.04] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fshamil-mubarakshin%2Ffeddf2f2b1120c2d682eeb00438c4977%2Fraw%2Fubuntu24.json) | -| Ubuntu 22.04 | `ubuntu-latest` or `ubuntu-22.04` | [ubuntu-22.04] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fshamil-mubarakshin%2Ffeddf2f2b1120c2d682eeb00438c4977%2Fraw%2Fubuntu22.json) | -| Ubuntu 20.04 | `ubuntu-20.04` | [ubuntu-20.04] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fshamil-mubarakshin%2Ffeddf2f2b1120c2d682eeb00438c4977%2Fraw%2Fubuntu20.json) | -| macOS 14 | `macos-latest-large` or `macos-14-large`| [macOS-14] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fshamil-mubarakshin%2Ffeddf2f2b1120c2d682eeb00438c4977%2Fraw%2Fmacos-14.json) | -| macOS 14 Arm64 |`macos-latest`, `macos-14`, `macos-latest-xlarge` or `macos-14-xlarge`| [macOS-14-arm64] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fshamil-mubarakshin%2Ffeddf2f2b1120c2d682eeb00438c4977%2Fraw%2Fmacos-14-arm64.json) | -| macOS 13 | `macos-13` or `macos-13-large` | [macOS-13] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fshamil-mubarakshin%2Ffeddf2f2b1120c2d682eeb00438c4977%2Fraw%2Fmacos-13.json) | -| macOS 13 Arm64 | `macos-13-xlarge` | [macOS-13-arm64] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fshamil-mubarakshin%2Ffeddf2f2b1120c2d682eeb00438c4977%2Fraw%2Fmacos-13-arm64.json) | -| macOS 12 | `macos-12` or `macos-12-large`| [macOS-12] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fshamil-mubarakshin%2Ffeddf2f2b1120c2d682eeb00438c4977%2Fraw%2Fmacos-12.json) | +| Ubuntu 24.04 <sup>beta</sup> | `ubuntu-24.04` | [ubuntu-24.04] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fijunaidm%2F0b5459bbe18604a639e1d2f7accd204f%2Fraw%2Fubuntu24.json) | +| Ubuntu 22.04 | `ubuntu-latest` or `ubuntu-22.04` | [ubuntu-22.04] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fijunaidm%2F0b5459bbe18604a639e1d2f7accd204f%2Fraw%2Fubuntu22.json) | +| Ubuntu 20.04 | `ubuntu-20.04` | [ubuntu-20.04] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fijunaidm%2F0b5459bbe18604a639e1d2f7accd204f%2Fraw%2Fubuntu20.json) | +| macOS 14 | `macos-latest-large` or `macos-14-large`| [macOS-14] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fijunaidm%2F0b5459bbe18604a639e1d2f7accd204f%2Fraw%2Fmacos-14.json) | +| macOS 14 Arm64 |`macos-latest`, `macos-14`, `macos-latest-xlarge` or `macos-14-xlarge`| [macOS-14-arm64] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fijunaidm%2F0b5459bbe18604a639e1d2f7accd204f%2Fraw%2Fmacos-14-arm64.json) | +| macOS 13 | `macos-13` or `macos-13-large` | [macOS-13] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fijunaidm%2F0b5459bbe18604a639e1d2f7accd204f%2Fraw%2Fmacos-13.json) | +| macOS 13 Arm64 | `macos-13-xlarge` | [macOS-13-arm64] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fijunaidm%2F0b5459bbe18604a639e1d2f7accd204f%2Fraw%2Fmacos-13-arm64.json) | +| macOS 12 | `macos-12` or `macos-12-large`| [macOS-12] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fijunaidm%2F0b5459bbe18604a639e1d2f7accd204f%2Fraw%2Fmacos-12.json) | | macOS 11 <sup>deprecated</sup> | `macos-11`| [macOS-11] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fshamil-mubarakshin%2Ffeddf2f2b1120c2d682eeb00438c4977%2Fraw%2FmacOS-11.json) | -| Windows Server 2022 | `windows-latest` or `windows-2022` | [windows-2022] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fshamil-mubarakshin%2Ffeddf2f2b1120c2d682eeb00438c4977%2Fraw%2Fwin22.json) | -| Windows Server 2019 | `windows-2019` | [windows-2019] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fshamil-mubarakshin%2Ffeddf2f2b1120c2d682eeb00438c4977%2Fraw%2Fwin19.json) | +| Windows Server 2022 | `windows-latest` or `windows-2022` | [windows-2022] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fijunaidm%2F0b5459bbe18604a639e1d2f7accd204f%2Fraw%2Fwin22.json) | +| Windows Server 2019 | `windows-2019` | [windows-2019] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fijunaidm%2F0b5459bbe18604a639e1d2f7accd204f%2Fraw%2Fwin19.json) | ### Label scheme From a4c4b159f057c366402034b85f0aed38ca68d351 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 4 Jul 2024 11:09:32 +0000 Subject: [PATCH 2941/3485] Updating readme file for macos-14 version 20240701.1 (#10162) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-14-Readme.md | 46 +++++++++++++++++++-------------- 1 file changed, 27 insertions(+), 19 deletions(-) diff --git a/images/macos/macos-14-Readme.md b/images/macos/macos-14-Readme.md index 7bb17ac69a79..8593506a4354 100644 --- a/images/macos/macos-14-Readme.md +++ b/images/macos/macos-14-Readme.md @@ -1,7 +1,12 @@ +| Announcements | +|-| +| [[macOS] Default Xcode on macOS 14 Sonoma will be set to Xcode 15.4 on July, 22](https://github.com/actions/runner-images/issues/10121) | +| [[macOS] Default Xcode on macOS 13 Ventura will be set to Xcode 15.2 on July, 15](https://github.com/actions/runner-images/issues/10120) | +*** # macOS 14 - OS Version: macOS 14.5 (23F79) - Kernel Version: Darwin 23.5.0 -- Image Version: 20240624.1 +- Image Version: 20240701.1 ## Installed Software @@ -11,11 +16,13 @@ - Clang/LLVM 14.0.3 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` - GCC 11 (Homebrew GCC 11.4.0) - available by `gcc-11` alias -- GCC 12 (Homebrew GCC 12.3.0) - available by `gcc-12` alias +- GCC 12 (Homebrew GCC 12.4.0) - available by `gcc-12` alias - GCC 13 (Homebrew GCC 13.3.0) - available by `gcc-13` alias +- GCC 14 (Homebrew GCC 14.1.0_1) - available by `gcc-14` alias - GNU Fortran 11 (Homebrew GCC 11.4.0) - available by `gfortran-11` alias -- GNU Fortran 12 (Homebrew GCC 12.3.0) - available by `gfortran-12` alias +- GNU Fortran 12 (Homebrew GCC 12.4.0) - available by `gfortran-12` alias - GNU Fortran 13 (Homebrew GCC 13.3.0) - available by `gfortran-13` alias +- GNU Fortran 14 (Homebrew GCC 14.1.0_1) - available by `gfortran-14` alias - Kotlin 2.0.0-release-341 - Mono 6.12.0.188 - Node.js 20.15.0 @@ -29,10 +36,10 @@ - Carthage 0.39.1 - CocoaPods 1.15.2 - Composer 2.7.7 -- Homebrew 4.3.6 +- Homebrew 4.3.8 - NPM 10.7.0 - NuGet 6.3.1.1 -- Pip3 24.1 (python 3.12) +- Pip3 24.1.1 (python 3.12) - Pipx 1.6.0 - RubyGems 3.5.14 - Yarn 1.22.22 @@ -46,13 +53,13 @@ - 7-Zip 17.05 - aria2 1.37.0 - azcopy 10.25.1 -- bazel 7.2.0 +- bazel 7.2.1 - bazelisk 1.20.0 - bsdtar 3.5.3 - available by 'tar' alias - Curl 8.8.0 - Git 2.45.2 - Git LFS 3.5.1 -- GitHub CLI 2.51.0 +- GitHub CLI 2.52.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.24.5 - gpg (GnuPG) 2.4.5 @@ -64,19 +71,19 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.17.0 -- AWS SAM CLI 1.119.0 +- AWS CLI 2.17.5 +- AWS SAM CLI 1.120.0 - AWS Session Manager CLI 1.2.633.0 - Azure CLI 2.61.0 - Azure CLI (azure-devops) 1.0.1 - Bicep CLI 0.28.1 - Cmake 3.29.6 -- CodeQL Action Bundle 2.17.5 +- CodeQL Action Bundle 2.17.6 - Fastlane 2.221.1 - SwiftFormat 0.54.0 - Xcbeautify 2.4.0 - Xcode Command Line Tools 15.3.0.0.1.1708646388 -- Xcodes 1.4.1 +- Xcodes 1.5.0 ### Linters - SwiftLint 0.55.1 @@ -84,12 +91,12 @@ ### Browsers - Safari 17.5 (19618.2.12.11.6) - SafariDriver 17.5 (19618.2.12.11.6) -- Google Chrome 126.0.6478.115 -- Google Chrome for Testing 126.0.6478.63 -- ChromeDriver 126.0.6478.63 -- Microsoft Edge 126.0.2592.68 -- Microsoft Edge WebDriver 126.0.2592.68 -- Mozilla Firefox 127.0.1 +- Google Chrome 126.0.6478.127 +- Google Chrome for Testing 126.0.6478.126 +- ChromeDriver 126.0.6478.126 +- Microsoft Edge 126.0.2592.81 +- Microsoft Edge WebDriver 126.0.2592.81 +- Mozilla Firefox 127.0.2 - geckodriver 0.34.0 - Selenium server 4.22.0 @@ -150,7 +157,7 @@ ### Xcode | Version | Build | Path | | ---------------- | -------- | ------------------------------ | -| 16.0 (beta) | 16A5171c | /Applications/Xcode_16.0.app | +| 16.0 (beta) | 16A5171r | /Applications/Xcode_16.0.app | | 15.4 | 15F31d | /Applications/Xcode_15.4.app | | 15.3 | 15E204a | /Applications/Xcode_15.3.app | | 15.2 | 15C500b | /Applications/Xcode_15.2.app | @@ -207,8 +214,8 @@ | visionOS 1.0 | xros1.0 | 15.2 | | Simulator - visionOS 1.1 | xrsimulator1.1 | 15.3 | | visionOS 1.1 | xros1.1 | 15.3 | -| Simulator - visionOS 1.2 | xrsimulator1.2 | 15.4 | | visionOS 1.2 | xros1.2 | 15.4 | +| Simulator - visionOS 1.2 | xrsimulator1.2 | 15.4 | | Simulator - visionOS 2.0 | xrsimulator2.0 | 16.0 | | visionOS 2.0 | xros2.0 | 16.0 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | @@ -263,3 +270,4 @@ | ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/26.3.11579264 | | ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk/26.3.11579264 | | ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | + From ebeb608ce1c0e19f0f2e735f8a4095f03401adc5 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 4 Jul 2024 11:27:52 +0000 Subject: [PATCH 2942/3485] Updating readme file for win19 version 20240630.1.1 (#10151) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/windows/Windows2019-Readme.md | 36 ++++++++++++++-------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/images/windows/Windows2019-Readme.md b/images/windows/Windows2019-Readme.md index 9abb8620acb8..0f23e1a22ab4 100644 --- a/images/windows/Windows2019-Readme.md +++ b/images/windows/Windows2019-Readme.md @@ -1,10 +1,10 @@ | Announcements | |-| -| [[Ubuntu, Windows] Docker Compose v1 will be removed from images on July, 9](https://github.com/actions/runner-images/issues/9692) | +| [[Ubuntu, Windows] Docker Compose v1 will be removed from images on July, 29](https://github.com/actions/runner-images/issues/9692) | *** # Windows Server 2019 - OS Version: 10.0.17763 Build 5936 -- Image Version: 20240624.1.0 +- Image Version: 20240630.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -27,13 +27,13 @@ - Chocolatey 2.3.0 - Composer 2.7.7 - Helm 3.15.1 -- Miniconda 24.4.0 (pre-installed on the image but not added to PATH) +- Miniconda 24.5.0 (pre-installed on the image but not added to PATH) - NPM 10.7.0 - NuGet 6.10.0.107 - pip 24.0 (python 3.7) - Pipx 1.2.1 - RubyGems 3.2.33 -- Vcpkg (build from commit c4467cb68) +- Vcpkg (build from commit afa12e729) - Yarn 1.22.22 #### Environment variables @@ -52,12 +52,12 @@ - 7zip 24.07 - aria2 1.37.0 - azcopy 10.25.1 -- Bazel 7.2.0 +- Bazel 7.2.1 - Bazelisk 1.19.0 - Bicep 0.28.1 -- Cabal 3.10.3.0 +- Cabal 3.12.1.0 - CMake 3.29.6 -- CodeQL Action Bundle 2.17.5 +- CodeQL Action Bundle 2.17.6 - Docker 26.1.3 - Docker Compose v1 1.29.2 - Docker Compose v2 2.27.1 @@ -65,9 +65,9 @@ - ghc 9.10.1 - Git 2.45.2.windows.1 - Git LFS 3.5.1 -- Google Cloud CLI 481.0.0 -- ImageMagick 7.1.1-33 -- InnoSetup 6.3.1 +- Google Cloud CLI 482.0.0 +- ImageMagick 7.1.1-34 +- InnoSetup 6.3.2 - jq 1.7.1 - Kind 0.23.0 - Kubectl 1.30.2 @@ -93,13 +93,13 @@ - zstd 1.5.6 ### CLI Tools -- Alibaba Cloud CLI 3.0.208 -- AWS CLI 2.17.0 -- AWS SAM CLI 1.119.0 +- Alibaba Cloud CLI 3.0.210 +- AWS CLI 2.17.5 +- AWS SAM CLI 1.120.0 - AWS Session Manager CLI 1.2.633.0 - Azure CLI 2.61.0 - Azure DevOps CLI extension 1.0.1 -- Cloud Foundry CLI 6.53.0 +- Cloud Foundry CLI 8.7.10 - GitHub CLI 2.52.0 ### Rust Tools @@ -119,9 +119,9 @@ ### Browsers and Drivers - Google Chrome 126.0.6478.127 - Chrome Driver 126.0.6478.126 -- Microsoft Edge 126.0.2592.68 -- Microsoft Edge Driver 126.0.2592.68 -- Mozilla Firefox 127.0.1 +- Microsoft Edge 126.0.2592.81 +- Microsoft Edge Driver 126.0.2592.81 +- Mozilla Firefox 127.0.2 - Gecko Driver 0.34.0 - IE Driver 4.14.0.0 - Selenium server 4.22.0 @@ -507,7 +507,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - AzureRM: 2.1.0 (Default), 6.13.1 - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.605 +- AWSPowershell: 4.1.610 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.10 - Microsoft.Graph: 2.19.0 From 4ac3f5b27733819230841938123d47d9a586f03f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 4 Jul 2024 11:48:08 +0000 Subject: [PATCH 2943/3485] Updating readme file for ubuntu24 version 20240630.1.1 (#10152) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2404-Readme.md | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/images/ubuntu/Ubuntu2404-Readme.md b/images/ubuntu/Ubuntu2404-Readme.md index 7b54fdc4247c..5d65f28e927b 100644 --- a/images/ubuntu/Ubuntu2404-Readme.md +++ b/images/ubuntu/Ubuntu2404-Readme.md @@ -1,12 +1,12 @@ | Announcements | |-| | [Ubuntu 24.04 is now available](https://github.com/actions/runner-images/issues/9848) | -| [[Ubuntu, Windows] Docker Compose v1 will be removed from images on July, 9](https://github.com/actions/runner-images/issues/9692) | +| [[Ubuntu, Windows] Docker Compose v1 will be removed from images on July, 29](https://github.com/actions/runner-images/issues/9692) | *** # Ubuntu 24.04 LTS - OS Version: 24.04 LTS - Kernel Version: 6.8.0-1008-azure -- Image Version: 20240624.1.0 +- Image Version: 20240630.1.0 - Systemd version: 255.4-1ubuntu8.1 ## Installed Software @@ -29,13 +29,13 @@ - cpan 1.64 - Helm 3.15.2 - Homebrew 4.3.7 -- Miniconda 24.4.0 +- Miniconda 24.5.0 - Npm 10.7.0 - Pip 24.0 - Pip3 24.0 - Pipx 1.4.3 - RubyGems 3.4.20 -- Vcpkg (build from commit c4467cb68) +- Vcpkg (build from commit afa12e729) - Yarn 1.22.22 #### Environment variables @@ -61,12 +61,12 @@ to accomplish this. ### Tools - Ansible 2.17.1 - AzCopy 10.25.1 - available by `azcopy` and `azcopy10` aliases -- Bazel 7.2.0 +- Bazel 7.2.1 - Bazelisk 1.19.0 - Bicep 0.28.1 - Buildah 1.33.7 - CMake 3.29.6 -- CodeQL Action Bundle 2.17.5 +- CodeQL Action Bundle 2.17.6 - Docker Amazon ECR Credential Helper 0.8.0 - Docker Compose v2 2.27.1 - Docker-Buildx 0.15.1 @@ -97,9 +97,9 @@ to accomplish this. - zstd 1.5.6 ### CLI Tools -- AWS CLI 2.17.0 +- AWS CLI 2.17.5 - AWS CLI Session Manager Plugin 1.2.633.0 -- AWS SAM CLI 1.119.0 +- AWS SAM CLI 1.120.0 - Azure CLI 2.61.0 - Azure CLI (azure-devops) 1.0.1 - GitHub CLI 2.52.0 @@ -121,7 +121,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ``` ### Haskell Tools -- Cabal 3.10.3.0 +- Cabal 3.12.1.0 - GHC 9.10.1 - GHCup 0.1.22.0 - Stack 2.15.7 @@ -299,7 +299,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | tzdata | 2024a-3ubuntu1.1 | | unzip | 6.0-28ubuntu4 | | upx | 4.2.2-3 | -| wget | 1.21.4-1ubuntu4 | +| wget | 1.21.4-1ubuntu4.1 | | xvfb | 2:21.1.12-1ubuntu1 | | xz-utils | 5.6.1+really5.4.5-1 | | zip | 3.0-13build1 | From 7863994db86a8163ca12950be0e1fda4b6f85491 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 4 Jul 2024 11:49:37 +0000 Subject: [PATCH 2944/3485] Updating readme file for ubuntu22 version 20240630.1.1 (#10149) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2204-Readme.md | 46 +++++++++++++++--------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/images/ubuntu/Ubuntu2204-Readme.md b/images/ubuntu/Ubuntu2204-Readme.md index 4a49027f7e9b..08cd0d0114f0 100644 --- a/images/ubuntu/Ubuntu2204-Readme.md +++ b/images/ubuntu/Ubuntu2204-Readme.md @@ -1,12 +1,12 @@ | Announcements | |-| | [Ubuntu 24.04 is now available](https://github.com/actions/runner-images/issues/9848) | -| [[Ubuntu, Windows] Docker Compose v1 will be removed from images on July, 9](https://github.com/actions/runner-images/issues/9692) | +| [[Ubuntu, Windows] Docker Compose v1 will be removed from images on July, 29](https://github.com/actions/runner-images/issues/9692) | *** # Ubuntu 22.04 - OS Version: 22.04.4 LTS - Kernel Version: 6.5.0-1022-azure -- Image Version: 20240624.1.0 +- Image Version: 20240630.1.0 - Systemd version: 249.11-0ubuntu3.12 ## Installed Software @@ -33,14 +33,14 @@ - cpan 1.64 - Helm 3.15.2 - Homebrew 4.3.7 -- Miniconda 24.4.0 +- Miniconda 24.5.0 - Npm 10.7.0 - NuGet 6.6.1.2 - Pip 22.0.2 - Pip3 22.0.2 - Pipx 1.6.0 - RubyGems 3.3.5 -- Vcpkg (build from commit c4467cb68) +- Vcpkg (build from commit afa12e729) - Yarn 1.22.22 #### Environment variables @@ -68,12 +68,12 @@ to accomplish this. - Ansible 2.17.1 - apt-fast 1.10.0 - AzCopy 10.25.1 - available by `azcopy` and `azcopy10` aliases -- Bazel 7.2.0 +- Bazel 7.2.1 - Bazelisk 1.19.0 - Bicep 0.28.1 - Buildah 1.23.1 - CMake 3.29.6 -- CodeQL Action Bundle 2.17.5 +- CodeQL Action Bundle 2.17.6 - Docker Amazon ECR Credential Helper 0.8.0 - Docker Compose v1 1.29.2 - Docker Compose v2 2.27.1 @@ -97,7 +97,7 @@ to accomplish this. - n 9.2.3 - Newman 6.1.3 - nvm 0.39.7 -- OpenSSL 3.0.2-0ubuntu1.15 +- OpenSSL 3.0.2-0ubuntu1.16 - Packer 1.11.0 - Parcel 2.12.0 - Podman 3.4.4 @@ -106,24 +106,24 @@ to accomplish this. - Skopeo 1.4.1 - Sphinx Open Source Search Server 2.2.11 - SVN 1.14.1 -- Terraform 1.8.5 +- Terraform 1.9.0 - yamllint 1.35.1 - yq 4.44.2 - zstd 1.5.6 ### CLI Tools -- Alibaba Cloud CLI 3.0.208 -- AWS CLI 2.17.0 +- Alibaba Cloud CLI 3.0.210 +- AWS CLI 2.17.5 - AWS CLI Session Manager Plugin 1.2.633.0 -- AWS SAM CLI 1.119.0 +- AWS SAM CLI 1.120.0 - Azure CLI 2.61.0 - Azure CLI (azure-devops) 1.0.1 - GitHub CLI 2.52.0 -- Google Cloud CLI 481.0.0 -- Netlify CLI 17.29.0 -- OpenShift CLI 4.15.18 +- Google Cloud CLI 482.0.0 +- Netlify CLI 17.30.0 +- OpenShift CLI 4.16.0 - ORAS CLI 1.2.0 -- Vercel CLI 34.2.7 +- Vercel CLI 34.2.8 ### Java | Version | Environment Variable | @@ -142,7 +142,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ``` ### Haskell Tools -- Cabal 3.10.3.0 +- Cabal 3.12.1.0 - GHC 9.10.1 - GHCup 0.1.22.0 - Stack 2.15.7 @@ -165,10 +165,10 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Google Chrome 126.0.6478.126 - ChromeDriver 126.0.6478.126 - Chromium 126.0.6478.0 -- Microsoft Edge 126.0.2592.68 -- Microsoft Edge WebDriver 126.0.2592.68 +- Microsoft Edge 126.0.2592.81 +- Microsoft Edge WebDriver 126.0.2592.81 - Selenium server 4.22.0 -- Mozilla Firefox 126.0.2 +- Mozilla Firefox 127.0.2 - Geckodriver 0.34.0 #### Environment variables @@ -287,8 +287,8 @@ Use the following command as a part of your job to start the service: 'sudo syst | node:16-alpine | sha256:a1f9d027912b58a7c75be7716c97cfbc6d3099f3a97ed84aa490be9dee20e787 | 2023-08-10 | | node:18 | sha256:d0bbfdbad0bff8253e6159dcbee42141db4fc309365d5b8bcfce46ed71569078 | 2024-05-21 | | node:18-alpine | sha256:e37da457874383fa9217067867ec85fe8fe59f0bfa351ec9752a95438680056e | 2024-06-04 | -| node:20 | sha256:02cd2205818f121c13612721876f28c18bd50148bb8af532ea121c96ffcb59bf | 2024-05-28 | -| node:20-alpine | sha256:804aa6a6476a7e2a5df8db28804aa6c1c97904eefb01deed5d6af24bb51d0c81 | 2024-06-04 | +| node:20 | sha256:b849bc4078c3e16a38d72749ab8faeacbcc6c3bdb742399b4a5974a89fc93261 | 2024-06-24 | +| node:20-alpine | sha256:df01469346db2bf1cfc1f7261aeab86b2960efa840fe2bd46d83ff339f463665 | 2024-06-24 | | ubuntu:20.04 | sha256:0b897358ff6624825fb50d20ffb605ab0eaea77ced0adb8c6a4b756513dec6fc | 2024-06-03 | | ubuntu:22.04 | sha256:19478ce7fc2ffbce89df29fea5725a8d12e57de52eb9ea570890dc5852aac1ac | 2024-06-03 | @@ -337,7 +337,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | libmagickwand-dev | 8:6.9.11.60+dfsg-1.3ubuntu0.22.04.3 | | libsecret-1-dev | 0.20.5-2 | | libsqlite3-dev | 3.37.2-2ubuntu0.3 | -| libssl-dev | 3.0.2-0ubuntu1.15 | +| libssl-dev | 3.0.2-0ubuntu1.16 | | libtool | 2.4.6-15build2 | | libunwind8 | 1.3.2-2build2.1 | | libxkbfile-dev | 1:1.1.0-1build3 | @@ -379,7 +379,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | tzdata | 2024a-0ubuntu0.22.04 | | unzip | 6.0-26ubuntu3.2 | | upx | 3.96-3 | -| wget | 1.21.2-2ubuntu1 | +| wget | 1.21.2-2ubuntu1.1 | | xorriso | 1.5.4-2 | | xvfb | 2:21.1.4-2ubuntu1.7\~22.04.10 | | xz-utils | 5.2.5-2ubuntu1 | From ada0348ea248fdad79e66d3a8e2b52d7fad97f9d Mon Sep 17 00:00:00 2001 From: vidyasagarnimmagaddi <160703874+vidyasagarnimmagaddi@users.noreply.github.com> Date: Thu, 4 Jul 2024 17:55:27 +0530 Subject: [PATCH 2945/3485] added ruby 3.2 version windows (#10172) --- images/windows/toolsets/toolset-2019.json | 3 ++- images/windows/toolsets/toolset-2022.json | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/images/windows/toolsets/toolset-2019.json b/images/windows/toolsets/toolset-2019.json index ce8dd0de7797..497f576c60f8 100644 --- a/images/windows/toolsets/toolset-2019.json +++ b/images/windows/toolsets/toolset-2019.json @@ -6,7 +6,8 @@ "platform" : "win32", "versions": [ "3.0", - "3.1" + "3.1", + "3.2" ], "default": "3.0" }, diff --git a/images/windows/toolsets/toolset-2022.json b/images/windows/toolsets/toolset-2022.json index 7a8e87b2b3cd..b599185c9f5a 100644 --- a/images/windows/toolsets/toolset-2022.json +++ b/images/windows/toolsets/toolset-2022.json @@ -6,7 +6,8 @@ "platform" : "win32", "versions": [ "3.0", - "3.1" + "3.1", + "3.2" ], "default": "3.0" }, From ce75d8dd91bf59a31df434d9ba4095773c82d815 Mon Sep 17 00:00:00 2001 From: vidyasagarnimmagaddi <160703874+vidyasagarnimmagaddi@users.noreply.github.com> Date: Thu, 4 Jul 2024 17:55:52 +0530 Subject: [PATCH 2946/3485] updated 3.2 version ruby version to ubuntu-20,22 (#10173) --- images/ubuntu/toolsets/toolset-2004.json | 3 ++- images/ubuntu/toolsets/toolset-2204.json | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/images/ubuntu/toolsets/toolset-2004.json b/images/ubuntu/toolsets/toolset-2004.json index 221de2935e40..b0b0542368b9 100644 --- a/images/ubuntu/toolsets/toolset-2004.json +++ b/images/ubuntu/toolsets/toolset-2004.json @@ -57,7 +57,8 @@ "arch": "x64", "versions": [ "3.0.*", - "3.1.*" + "3.1.*", + "3.2.*" ] }, { diff --git a/images/ubuntu/toolsets/toolset-2204.json b/images/ubuntu/toolsets/toolset-2204.json index cea32ac5b4f5..34dfdc2b340d 100644 --- a/images/ubuntu/toolsets/toolset-2204.json +++ b/images/ubuntu/toolsets/toolset-2204.json @@ -54,7 +54,8 @@ "platform_version": "22.04", "arch": "x64", "versions": [ - "3.1.*" + "3.1.*", + "3.2.*" ] }, { From bf3a13fe2af807c607a886c6c615d271d661c39c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 4 Jul 2024 13:42:15 +0000 Subject: [PATCH 2947/3485] Updating readme file for ubuntu20 version 20240701.1.1 (#10163) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2004-Readme.md | 46 +++++++++++++++--------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/images/ubuntu/Ubuntu2004-Readme.md b/images/ubuntu/Ubuntu2004-Readme.md index d2ec88fe16a4..41962efa73b0 100644 --- a/images/ubuntu/Ubuntu2004-Readme.md +++ b/images/ubuntu/Ubuntu2004-Readme.md @@ -1,12 +1,12 @@ | Announcements | |-| | [Ubuntu 24.04 is now available](https://github.com/actions/runner-images/issues/9848) | -| [[Ubuntu, Windows] Docker Compose v1 will be removed from images on July, 9](https://github.com/actions/runner-images/issues/9692) | +| [[Ubuntu, Windows] Docker Compose v1 will be removed from images on July, 29](https://github.com/actions/runner-images/issues/9692) | *** # Ubuntu 20.04 - OS Version: 20.04.6 LTS - Kernel Version: 5.15.0-1064-azure -- Image Version: 20240624.2.0 +- Image Version: 20240701.1.0 - Systemd version: 245.4-4ubuntu3.23 ## Installed Software @@ -34,15 +34,15 @@ ### Package Management - cpan 1.64 - Helm 3.15.2 -- Homebrew 4.3.7 -- Miniconda 24.4.0 +- Homebrew 4.3.8 +- Miniconda 24.5.0 - Npm 10.7.0 - NuGet 6.6.1.2 - Pip 20.0.2 - Pip3 20.0.2 - Pipx 1.6.0 - RubyGems 3.1.2 -- Vcpkg (build from commit c4467cb68) +- Vcpkg (build from commit dec6c5bf4) - Yarn 1.22.22 #### Environment variables @@ -70,12 +70,12 @@ to accomplish this. - Ansible 2.13.13 - apt-fast 1.10.0 - AzCopy 10.25.1 - available by `azcopy` and `azcopy10` aliases -- Bazel 7.2.0 +- Bazel 7.2.1 - Bazelisk 1.19.0 - Bicep 0.28.1 - Buildah 1.22.3 - CMake 3.29.6 -- CodeQL Action Bundle 2.17.5 +- CodeQL Action Bundle 2.17.6 - Docker Amazon ECR Credential Helper 0.8.0 - Docker Compose v1 1.29.2 - Docker Compose v2 2.27.1 @@ -101,7 +101,7 @@ to accomplish this. - Newman 6.1.3 - nvm 0.39.7 - OpenSSL 1.1.1f-1ubuntu2.22 -- Packer 1.11.0 +- Packer 1.11.1 - Parcel 2.12.0 - PhantomJS 2.1.1 2.1.1 - Podman 3.4.2 @@ -110,24 +110,24 @@ to accomplish this. - Skopeo 1.5.0 - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 -- Terraform 1.8.5 +- Terraform 1.9.0 - yamllint 1.35.1 - yq 4.44.2 - zstd 1.5.6 ### CLI Tools - Alibaba Cloud CLI 3.0.174 -- AWS CLI 2.17.0 +- AWS CLI 2.17.6 - AWS CLI Session Manager Plugin 1.2.633.0 -- AWS SAM CLI 1.119.0 +- AWS SAM CLI 1.120.0 - Azure CLI 2.61.0 - Azure CLI (azure-devops) 1.0.1 - GitHub CLI 2.52.0 -- Google Cloud CLI 481.0.0 -- Netlify CLI 17.29.0 -- OpenShift CLI 4.15.18 +- Google Cloud CLI 482.0.0 +- Netlify CLI 17.31.0 +- OpenShift CLI 4.15.19 - ORAS CLI 1.2.0 -- Vercel CLI 34.2.7 +- Vercel CLI 34.2.8 ### Java | Version | Environment Variable | @@ -146,7 +146,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ``` ### Haskell Tools -- Cabal 3.10.3.0 +- Cabal 3.12.1.0 - GHC 9.10.1 - GHCup 0.1.22.0 - Stack 2.15.7 @@ -169,10 +169,10 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Google Chrome 126.0.6478.126 - ChromeDriver 126.0.6478.126 - Chromium 126.0.6478.0 -- Microsoft Edge 126.0.2592.68 -- Microsoft Edge WebDriver 126.0.2592.68 +- Microsoft Edge 126.0.2592.81 +- Microsoft Edge WebDriver 126.0.2592.81 - Selenium server 4.22.0 -- Mozilla Firefox 126.0.2 +- Mozilla Firefox 127.0.2 - Geckodriver 0.34.0 #### Environment variables @@ -251,7 +251,7 @@ Use the following command as a part of your job to start the service: 'sudo syst - Az: 11.3.1 - MarkdownPS: 1.10 - Microsoft.Graph: 2.19.0 -- Pester: 5.6.0 +- Pester: 5.6.1 - PSScriptAnalyzer: 1.22.0 ### Web Servers @@ -297,8 +297,8 @@ Use the following command as a part of your job to start the service: 'sudo syst | node:16-alpine | sha256:a1f9d027912b58a7c75be7716c97cfbc6d3099f3a97ed84aa490be9dee20e787 | 2023-08-10 | | node:18 | sha256:d0bbfdbad0bff8253e6159dcbee42141db4fc309365d5b8bcfce46ed71569078 | 2024-05-21 | | node:18-alpine | sha256:e37da457874383fa9217067867ec85fe8fe59f0bfa351ec9752a95438680056e | 2024-06-04 | -| node:20 | sha256:02cd2205818f121c13612721876f28c18bd50148bb8af532ea121c96ffcb59bf | 2024-05-28 | -| node:20-alpine | sha256:804aa6a6476a7e2a5df8db28804aa6c1c97904eefb01deed5d6af24bb51d0c81 | 2024-06-04 | +| node:20 | sha256:b849bc4078c3e16a38d72749ab8faeacbcc6c3bdb742399b4a5974a89fc93261 | 2024-06-24 | +| node:20-alpine | sha256:df01469346db2bf1cfc1f7261aeab86b2960efa840fe2bd46d83ff339f463665 | 2024-06-24 | | ubuntu:20.04 | sha256:0b897358ff6624825fb50d20ffb605ab0eaea77ced0adb8c6a4b756513dec6fc | 2024-06-03 | ### Installed apt packages @@ -386,7 +386,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | tzdata | 2024a-0ubuntu0.20.04 | | unzip | 6.0-25ubuntu1.2 | | upx | 3.95-2build1 | -| wget | 1.20.3-1ubuntu2 | +| wget | 1.20.3-1ubuntu2.1 | | xorriso | 1.5.2-1 | | xvfb | 2:1.20.13-1ubuntu1\~20.04.17 | | xz-utils | 5.2.4-1ubuntu1.1 | From ef5708824609072bcc5a68c9a7307a1b13024f22 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 4 Jul 2024 14:22:17 +0000 Subject: [PATCH 2948/3485] Updating readme file for macos-13-arm64 version 20240701.1 (#10160) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-13-arm64-Readme.md | 36 ++++++++++++++++----------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/images/macos/macos-13-arm64-Readme.md b/images/macos/macos-13-arm64-Readme.md index d7335523bfea..fa8aa797b902 100644 --- a/images/macos/macos-13-arm64-Readme.md +++ b/images/macos/macos-13-arm64-Readme.md @@ -1,7 +1,12 @@ +| Announcements | +|-| +| [[macOS] Default Xcode on macOS 14 Sonoma will be set to Xcode 15.4 on July, 22](https://github.com/actions/runner-images/issues/10121) | +| [[macOS] Default Xcode on macOS 13 Ventura will be set to Xcode 15.2 on July, 15](https://github.com/actions/runner-images/issues/10120) | +*** # macOS 13 - OS Version: macOS 13.6.7 (22G720) - Kernel Version: Darwin 22.6.0 -- Image Version: 20240624.1 +- Image Version: 20240701.1 ## Installed Software @@ -11,11 +16,13 @@ - Clang/LLVM 14.0.0 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` - GCC 11 (Homebrew GCC 11.4.0) - available by `gcc-11` alias -- GCC 12 (Homebrew GCC 12.3.0) - available by `gcc-12` alias +- GCC 12 (Homebrew GCC 12.4.0) - available by `gcc-12` alias - GCC 13 (Homebrew GCC 13.3.0) - available by `gcc-13` alias +- GCC 14 (Homebrew GCC 14.1.0_1) - available by `gcc-14` alias - GNU Fortran 11 (Homebrew GCC 11.4.0) - available by `gfortran-11` alias -- GNU Fortran 12 (Homebrew GCC 12.3.0) - available by `gfortran-12` alias +- GNU Fortran 12 (Homebrew GCC 12.4.0) - available by `gfortran-12` alias - GNU Fortran 13 (Homebrew GCC 13.3.0) - available by `gfortran-13` alias +- GNU Fortran 14 (Homebrew GCC 14.1.0_1) - available by `gfortran-14` alias - Kotlin 2.0.0-release-341 - Mono 6.12.0.188 - Node.js 20.15.0 @@ -27,7 +34,7 @@ - Bundler 2.5.14 - Carthage 0.39.1 - CocoaPods 1.15.2 -- Homebrew 4.3.6 +- Homebrew 4.3.8 - NPM 10.7.0 - NuGet 6.3.1.1 - Pip3 24.0 (python 3.12) @@ -44,13 +51,13 @@ - 7-Zip 17.05 - aria2 1.37.0 - azcopy 10.25.1 -- bazel 7.2.0 +- bazel 7.2.1 - bazelisk 1.20.0 - bsdtar 3.5.3 - available by 'tar' alias - Curl 8.4.0 - Git 2.45.2 - Git LFS 3.5.1 -- GitHub CLI 2.51.0 +- GitHub CLI 2.52.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.24.5 - gpg (GnuPG) 2.4.5 @@ -62,28 +69,28 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.17.0 -- AWS SAM CLI 1.119.0 +- AWS CLI 2.17.5 +- AWS SAM CLI 1.120.0 - AWS Session Manager CLI 1.2.633.0 - Azure CLI 2.61.0 - Azure CLI (azure-devops) 1.0.1 - Bicep CLI 0.28.1 - Cmake 3.29.6 -- CodeQL Action Bundle 2.17.5 +- CodeQL Action Bundle 2.17.6 - Fastlane 2.221.1 - SwiftFormat 0.54.0 - Xcbeautify 2.4.0 - Xcode Command Line Tools 14.3.1.0.1.1683849156 -- Xcodes 1.4.1 +- Xcodes 1.5.0 ### Linters ### Browsers - Safari 17.5 (18618.2.12.111.5) - SafariDriver 17.5 (18618.2.12.111.5) -- Google Chrome 126.0.6478.115 -- Google Chrome for Testing 126.0.6478.63 -- ChromeDriver 126.0.6478.63 +- Google Chrome 126.0.6478.127 +- Google Chrome for Testing 126.0.6478.126 +- ChromeDriver 126.0.6478.126 - Selenium server 4.22.0 #### Environment variables @@ -183,8 +190,8 @@ | Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | | visionOS 1.0 | xros1.0 | 15.2 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | -| Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | +| Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | | DriverKit 22.1 | driverkit22.1 | 14.1 | | DriverKit 22.2 | driverkit22.2 | 14.2 | | DriverKit 22.4 | driverkit22.4 | 14.3.1 | @@ -232,3 +239,4 @@ | ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/26.3.11579264 | | ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk/26.3.11579264 | | ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | + From c5a9fa6ec5c58fed0a0b8a2b00a9db078c14350a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 4 Jul 2024 19:52:55 +0000 Subject: [PATCH 2949/3485] Updating readme file for win22 version 20240630.1.1 (#10150) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/windows/Windows2022-Readme.md | 32 ++++++++++++++-------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/images/windows/Windows2022-Readme.md b/images/windows/Windows2022-Readme.md index 8791ea891e6c..af63de20626d 100644 --- a/images/windows/Windows2022-Readme.md +++ b/images/windows/Windows2022-Readme.md @@ -1,10 +1,10 @@ | Announcements | |-| -| [[Ubuntu, Windows] Docker Compose v1 will be removed from images on July, 9](https://github.com/actions/runner-images/issues/9692) | +| [[Ubuntu, Windows] Docker Compose v1 will be removed from images on July, 29](https://github.com/actions/runner-images/issues/9692) | *** # Windows Server 2022 - OS Version: 10.0.20348 Build 2529 -- Image Version: 20240624.1.0 +- Image Version: 20240630.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -27,13 +27,13 @@ - Chocolatey 2.3.0 - Composer 2.7.7 - Helm 3.15.1 -- Miniconda 24.4.0 (pre-installed on the image but not added to PATH) +- Miniconda 24.5.0 (pre-installed on the image but not added to PATH) - NPM 10.7.0 - NuGet 6.10.0.107 -- pip 24.1 (python 3.9) +- pip 24.1.1 (python 3.9) - Pipx 1.6.0 - RubyGems 3.2.33 -- Vcpkg (build from commit c4467cb68) +- Vcpkg (build from commit afa12e729) - Yarn 1.22.22 #### Environment variables @@ -52,12 +52,12 @@ - 7zip 24.07 - aria2 1.37.0 - azcopy 10.25.1 -- Bazel 7.2.0 +- Bazel 7.2.1 - Bazelisk 1.19.0 - Bicep 0.28.1 -- Cabal 3.10.3.0 +- Cabal 3.12.1.0 - CMake 3.29.6 -- CodeQL Action Bundle 2.17.5 +- CodeQL Action Bundle 2.17.6 - Docker 26.1.3 - Docker Compose v1 1.29.2 - Docker Compose v2 2.27.1 @@ -66,7 +66,7 @@ - Git 2.45.2.windows.1 - Git LFS 3.5.1 - ImageMagick 7.1.1-34 -- InnoSetup 6.3.1 +- InnoSetup 6.3.2 - jq 1.7.1 - Kind 0.23.0 - Kubectl 1.30.2 @@ -91,9 +91,9 @@ - zstd 1.5.6 ### CLI Tools -- Alibaba Cloud CLI 3.0.208 -- AWS CLI 2.17.0 -- AWS SAM CLI 1.119.0 +- Alibaba Cloud CLI 3.0.210 +- AWS CLI 2.17.5 +- AWS SAM CLI 1.120.0 - AWS Session Manager CLI 1.2.633.0 - Azure CLI 2.61.0 - Azure DevOps CLI extension 1.0.1 @@ -116,9 +116,9 @@ ### Browsers and Drivers - Google Chrome 126.0.6478.127 - Chrome Driver 126.0.6478.126 -- Microsoft Edge 126.0.2592.68 -- Microsoft Edge Driver 126.0.2592.68 -- Mozilla Firefox 127.0.1 +- Microsoft Edge 126.0.2592.81 +- Microsoft Edge Driver 126.0.2592.81 +- Mozilla Firefox 127.0.2 - Gecko Driver 0.34.0 - IE Driver 4.14.0.0 - Selenium server 4.22.0 @@ -503,7 +503,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - AzureRM: 2.1.0 (Default), 6.13.1 - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.605 +- AWSPowershell: 4.1.610 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.10 - Microsoft.Graph: 2.19.0 From b6bcbdc786072dc41d4ecf30c1773f78b7630fff Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 5 Jul 2024 07:21:39 +0000 Subject: [PATCH 2950/3485] Updating readme file for macos-14-arm64 version 20240701.9 (#10161) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-14-arm64-Readme.md | 28 +++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/images/macos/macos-14-arm64-Readme.md b/images/macos/macos-14-arm64-Readme.md index 5808180c0bea..63c749321595 100644 --- a/images/macos/macos-14-arm64-Readme.md +++ b/images/macos/macos-14-arm64-Readme.md @@ -6,7 +6,7 @@ # macOS 14 - OS Version: macOS 14.5 (23F79) - Kernel Version: Darwin 23.5.0 -- Image Version: 20240625.2 +- Image Version: 20240701.9 ## Installed Software @@ -16,11 +16,11 @@ - Clang/LLVM 14.0.3 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` - GCC 11 (Homebrew GCC 11.4.0) - available by `gcc-11` alias -- GCC 12 (Homebrew GCC 12.3.0) - available by `gcc-12` alias +- GCC 12 (Homebrew GCC 12.4.0) - available by `gcc-12` alias - GCC 13 (Homebrew GCC 13.3.0) - available by `gcc-13` alias - GCC 14 (Homebrew GCC 14.1.0_1) - available by `gcc-14` alias - GNU Fortran 11 (Homebrew GCC 11.4.0) - available by `gfortran-11` alias -- GNU Fortran 12 (Homebrew GCC 12.3.0) - available by `gfortran-12` alias +- GNU Fortran 12 (Homebrew GCC 12.4.0) - available by `gfortran-12` alias - GNU Fortran 13 (Homebrew GCC 13.3.0) - available by `gfortran-13` alias - GNU Fortran 14 (Homebrew GCC 14.1.0_1) - available by `gfortran-14` alias - Kotlin 2.0.0-release-341 @@ -34,7 +34,7 @@ - Bundler 2.5.14 - Carthage 0.39.1 - CocoaPods 1.15.2 -- Homebrew 4.3.7 +- Homebrew 4.3.8 - NPM 10.7.0 - NuGet 6.3.1.1 - Pip3 24.0 (python 3.12) @@ -51,7 +51,7 @@ - 7-Zip 17.05 - aria2 1.37.0 - azcopy 10.25.1 -- bazel 7.2.0 +- bazel 7.2.1 - bazelisk 1.20.0 - bsdtar 3.5.3 - available by 'tar' alias - Curl 8.6.0 @@ -69,19 +69,19 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.17.1 -- AWS SAM CLI 1.119.0 +- AWS CLI 2.17.5 +- AWS SAM CLI 1.120.0 - AWS Session Manager CLI 1.2.633.0 - Azure CLI 2.61.0 - Azure CLI (azure-devops) 1.0.1 - Bicep CLI 0.28.1 - Cmake 3.29.6 -- CodeQL Action Bundle 2.17.5 +- CodeQL Action Bundle 2.17.6 - Fastlane 2.221.1 - SwiftFormat 0.54.0 - Xcbeautify 2.4.0 - Xcode Command Line Tools 15.3.0.0.1.1708646388 -- Xcodes 1.4.1 +- Xcodes 1.5.0 ### Linters @@ -139,13 +139,13 @@ #### PowerShell Modules - Az: 12.0.0 -- Pester: 5.6.0 +- Pester: 5.6.1 - PSScriptAnalyzer: 1.22.0 ### Xcode | Version | Build | Path | | ---------------- | -------- | ------------------------------ | -| 16.0 (beta) | 16A5171c | /Applications/Xcode_16.0.app | +| 16.0 (beta) | 16A5171r | /Applications/Xcode_16.0.app | | 15.4 | 15F31d | /Applications/Xcode_15.4.app | | 15.3 | 15E204a | /Applications/Xcode_15.3.app | | 15.2 | 15C500b | /Applications/Xcode_15.2.app | @@ -198,17 +198,17 @@ | Simulator - watchOS 10.4 | watchsimulator10.4 | 15.3 | | Simulator - watchOS 10.5 | watchsimulator10.5 | 15.4 | | Simulator - watchOS 11.0 | watchsimulator11.0 | 16.0 | -| visionOS 1.0 | xros1.0 | 15.2 | | Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | -| Simulator - visionOS 1.1 | xrsimulator1.1 | 15.3 | +| visionOS 1.0 | xros1.0 | 15.2 | | visionOS 1.1 | xros1.1 | 15.3 | +| Simulator - visionOS 1.1 | xrsimulator1.1 | 15.3 | | Simulator - visionOS 1.2 | xrsimulator1.2 | 15.4 | | visionOS 1.2 | xros1.2 | 15.4 | | visionOS 2.0 | xros2.0 | 16.0 | | Simulator - visionOS 2.0 | xrsimulator2.0 | 16.0 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | -| Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | +| Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | | DriverKit 22.4 | driverkit22.4 | 14.3.1 | | DriverKit 23.0 | driverkit23.0 | 15.0.1 | | DriverKit 23.2 | driverkit23.2 | 15.1, 15.2 | From e81c4806fe17299618a98e49a857bf989f6ac833 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 5 Jul 2024 18:18:51 +0000 Subject: [PATCH 2951/3485] Updating readme file for macos-13 version 20240630.1 (#10157) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-13-Readme.md | 54 +++++++++++++++++++-------------- 1 file changed, 31 insertions(+), 23 deletions(-) diff --git a/images/macos/macos-13-Readme.md b/images/macos/macos-13-Readme.md index 6beba5ec1156..8bc76108a74d 100644 --- a/images/macos/macos-13-Readme.md +++ b/images/macos/macos-13-Readme.md @@ -1,7 +1,12 @@ +| Announcements | +|-| +| [[macOS] Default Xcode on macOS 14 Sonoma will be set to Xcode 15.4 on July, 22](https://github.com/actions/runner-images/issues/10121) | +| [[macOS] Default Xcode on macOS 13 Ventura will be set to Xcode 15.2 on July, 15](https://github.com/actions/runner-images/issues/10120) | +*** # macOS 13 -- OS Version: macOS 13.6.7 (22G720) +- OS Version: macOS 13.6.7 (22G807) - Kernel Version: Darwin 22.6.0 -- Image Version: 20240623.1 +- Image Version: 20240630.1 ## Installed Software @@ -11,11 +16,13 @@ - Clang/LLVM 14.0.0 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` - GCC 11 (Homebrew GCC 11.4.0) - available by `gcc-11` alias -- GCC 12 (Homebrew GCC 12.3.0) - available by `gcc-12` alias +- GCC 12 (Homebrew GCC 12.4.0) - available by `gcc-12` alias - GCC 13 (Homebrew GCC 13.3.0) - available by `gcc-13` alias +- GCC 14 (Homebrew GCC 14.1.0_1) - available by `gcc-14` alias - GNU Fortran 11 (Homebrew GCC 11.4.0) - available by `gfortran-11` alias -- GNU Fortran 12 (Homebrew GCC 12.3.0) - available by `gfortran-12` alias +- GNU Fortran 12 (Homebrew GCC 12.4.0) - available by `gfortran-12` alias - GNU Fortran 13 (Homebrew GCC 13.3.0) - available by `gfortran-13` alias +- GNU Fortran 14 (Homebrew GCC 14.1.0_1) - available by `gfortran-14` alias - Kotlin 2.0.0-release-341 - Mono 6.12.0.188 - Node.js 20.15.0 @@ -29,13 +36,13 @@ - Carthage 0.39.1 - CocoaPods 1.15.2 - Composer 2.7.7 -- Homebrew 4.3.6 +- Homebrew 4.3.7 - NPM 10.7.0 - NuGet 6.3.1.1 -- Pip3 24.1 (python 3.12) +- Pip3 24.1.1 (python 3.12) - Pipx 1.6.0 - RubyGems 3.5.14 -- Vcpkg 2024 (build from commit c4467cb68) +- Vcpkg 2024 (build from commit afa12e729) - Yarn 1.22.22 ### Project Management @@ -47,13 +54,13 @@ - 7-Zip 17.05 - aria2 1.37.0 - azcopy 10.25.1 -- bazel 7.2.0 +- bazel 7.2.1 - bazelisk 1.20.0 - bsdtar 3.5.3 - available by 'tar' alias - Curl 8.8.0 - Git 2.45.2 - Git LFS 3.5.1 -- GitHub CLI 2.51.0 +- GitHub CLI 2.52.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.24.5 - gpg (GnuPG) 2.4.5 @@ -65,32 +72,32 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.17.0 -- AWS SAM CLI 1.119.0 +- AWS CLI 2.17.5 +- AWS SAM CLI 1.120.0 - AWS Session Manager CLI 1.2.633.0 - Azure CLI 2.61.0 - Azure CLI (azure-devops) 1.0.1 - Bicep CLI 0.28.1 - Cmake 3.29.6 -- CodeQL Action Bundle 2.17.5 +- CodeQL Action Bundle 2.17.6 - Fastlane 2.221.1 - SwiftFormat 0.54.0 - Xcbeautify 2.4.0 - Xcode Command Line Tools 14.3.1.0.1.1683849156 -- Xcodes 1.4.1 +- Xcodes 1.5.0 ### Linters - SwiftLint 0.55.1 ### Browsers -- Safari 17.5 (18618.2.12.111.5) -- SafariDriver 17.5 (18618.2.12.111.5) -- Google Chrome 126.0.6478.115 -- Google Chrome for Testing 126.0.6478.63 -- ChromeDriver 126.0.6478.63 -- Microsoft Edge 126.0.2592.68 -- Microsoft Edge WebDriver 126.0.2592.68 -- Mozilla Firefox 127.0.1 +- Safari 17.6 (18618.3.7.1) +- SafariDriver 17.6 (18618.3.7.1) +- Google Chrome 126.0.6478.127 +- Google Chrome for Testing 126.0.6478.126 +- ChromeDriver 126.0.6478.126 +- Microsoft Edge 126.0.2592.81 +- Microsoft Edge WebDriver 126.0.2592.81 +- Mozilla Firefox 127.0.2 - geckodriver 0.34.0 - Selenium server 4.22.0 @@ -132,7 +139,7 @@ #### Node.js - 16.20.2 - 18.20.3 -- 20.14.0 +- 20.15.0 #### Go - 1.20.14 @@ -201,8 +208,8 @@ | Simulator - watchOS 9.4 | watchsimulator9.4 | 14.3.1 | | Simulator - watchOS 10.0 | watchsimulator10.0 | 15.0.1 | | Simulator - watchOS 10.2 | watchsimulator10.2 | 15.1, 15.2 | -| visionOS 1.0 | xros1.0 | 15.2 | | Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | +| visionOS 1.0 | xros1.0 | 15.2 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | @@ -252,3 +259,4 @@ | ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/26.3.11579264 | | ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk/26.3.11579264 | | ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | + From 567d4a0ea4a16d7a6e3e03b0f5068b99a7af8111 Mon Sep 17 00:00:00 2001 From: RaviAkshintala <167848931+RaviAkshintala@users.noreply.github.com> Date: Mon, 8 Jul 2024 17:20:44 +0530 Subject: [PATCH 2952/3485] adding alpine latest version (#10180) Co-authored-by: Ravi Akshintala <raviakshintalagithub.com@Ravis-Laptop.local> --- images/ubuntu/toolsets/toolset-2004.json | 1 + images/ubuntu/toolsets/toolset-2204.json | 1 + 2 files changed, 2 insertions(+) diff --git a/images/ubuntu/toolsets/toolset-2004.json b/images/ubuntu/toolsets/toolset-2004.json index b0b0542368b9..b7f3f35e8b26 100644 --- a/images/ubuntu/toolsets/toolset-2004.json +++ b/images/ubuntu/toolsets/toolset-2004.json @@ -215,6 +215,7 @@ "alpine:3.16", "alpine:3.17", "alpine:3.18", + "alpine:3.19", "debian:9", "debian:10", "debian:11", diff --git a/images/ubuntu/toolsets/toolset-2204.json b/images/ubuntu/toolsets/toolset-2204.json index 34dfdc2b340d..1217b8f4d30d 100644 --- a/images/ubuntu/toolsets/toolset-2204.json +++ b/images/ubuntu/toolsets/toolset-2204.json @@ -214,6 +214,7 @@ "alpine:3.16", "alpine:3.17", "alpine:3.18", + "alpine:3.19", "debian:10", "debian:11", "moby/buildkit:latest", From 8e6b0c0d6d1e2f58a802585a91ddd8f6386fd675 Mon Sep 17 00:00:00 2001 From: vidyasagarnimmagaddi <160703874+vidyasagarnimmagaddi@users.noreply.github.com> Date: Tue, 9 Jul 2024 16:38:21 +0530 Subject: [PATCH 2953/3485] updated azcli signature (#10199) --- images/windows/scripts/build/Install-AzureCli.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/windows/scripts/build/Install-AzureCli.ps1 b/images/windows/scripts/build/Install-AzureCli.ps1 index 47a24319bf4d..35fdc478229a 100644 --- a/images/windows/scripts/build/Install-AzureCli.ps1 +++ b/images/windows/scripts/build/Install-AzureCli.ps1 @@ -15,7 +15,7 @@ New-Item -ItemType 'Directory' -Path $azureCliExtensionPath | Out-Null Install-Binary -Type MSI ` -Url 'https://aka.ms/installazurecliwindowsx64' ` - -ExpectedSignature 'C2048FB509F1C37A8C3E9EC6648118458AA01780' + -ExpectedSignature 'F9A7CF9FBE13BAC767F4781061332DA6E8B4E0EE' Update-Environment From 315fbf0fc88ffadee2f7b369af0984a665e70716 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Wed, 10 Jul 2024 11:22:59 +0200 Subject: [PATCH 2954/3485] [macOS] Update macOS 11 documentation (#10198) --- .github/ISSUE_TEMPLATE/announcement.yml | 2 - .github/ISSUE_TEMPLATE/bug-report.yml | 1 - .github/ISSUE_TEMPLATE/tool-request.yml | 3 +- README.md | 2 - images/macos/macos-11-Readme.md | 356 ------------------------ 5 files changed, 1 insertion(+), 363 deletions(-) delete mode 100644 images/macos/macos-11-Readme.md diff --git a/.github/ISSUE_TEMPLATE/announcement.yml b/.github/ISSUE_TEMPLATE/announcement.yml index 769d7e62ba9d..dfd7c35f4668 100644 --- a/.github/ISSUE_TEMPLATE/announcement.yml +++ b/.github/ISSUE_TEMPLATE/announcement.yml @@ -39,7 +39,6 @@ body: - label: Ubuntu 20.04 - label: Ubuntu 22.04 - label: Ubuntu 24.04 - - label: macOS 11 - label: macOS 12 - label: macOS 13 - label: macOS 13 Arm64 @@ -53,4 +52,3 @@ body: description: Steps or options for impact mitigation validations: required: true - diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml index 10498ee25153..1a7c0d45b7d1 100644 --- a/.github/ISSUE_TEMPLATE/bug-report.yml +++ b/.github/ISSUE_TEMPLATE/bug-report.yml @@ -22,7 +22,6 @@ body: - label: Ubuntu 20.04 - label: Ubuntu 22.04 - label: Ubuntu 24.04 - - label: macOS 11 - label: macOS 12 - label: macOS 13 - label: macOS 13 Arm64 diff --git a/.github/ISSUE_TEMPLATE/tool-request.yml b/.github/ISSUE_TEMPLATE/tool-request.yml index 93d3de083512..37b7d9524be0 100644 --- a/.github/ISSUE_TEMPLATE/tool-request.yml +++ b/.github/ISSUE_TEMPLATE/tool-request.yml @@ -60,7 +60,6 @@ body: - label: Ubuntu 20.04 - label: Ubuntu 22.04 - label: Ubuntu 24.04 - - label: macOS 11 - label: macOS 12 - label: macOS 13 - label: macOS 13 Arm64 @@ -80,4 +79,4 @@ body: - type: input attributes: label: Are you willing to submit a PR? - description: We accept contributions! \ No newline at end of file + description: We accept contributions! diff --git a/README.md b/README.md index bac865ede5b7..4fa4af9e9112 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,6 @@ To build a VM machine from this repo's source, see the [instructions](docs/creat | macOS 13 | `macos-13` or `macos-13-large` | [macOS-13] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fijunaidm%2F0b5459bbe18604a639e1d2f7accd204f%2Fraw%2Fmacos-13.json) | | macOS 13 Arm64 | `macos-13-xlarge` | [macOS-13-arm64] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fijunaidm%2F0b5459bbe18604a639e1d2f7accd204f%2Fraw%2Fmacos-13-arm64.json) | | macOS 12 | `macos-12` or `macos-12-large`| [macOS-12] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fijunaidm%2F0b5459bbe18604a639e1d2f7accd204f%2Fraw%2Fmacos-12.json) | -| macOS 11 <sup>deprecated</sup> | `macos-11`| [macOS-11] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fshamil-mubarakshin%2Ffeddf2f2b1120c2d682eeb00438c4977%2Fraw%2FmacOS-11.json) | | Windows Server 2022 | `windows-latest` or `windows-2022` | [windows-2022] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fijunaidm%2F0b5459bbe18604a639e1d2f7accd204f%2Fraw%2Fwin22.json) | | Windows Server 2019 | `windows-2019` | [windows-2019] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fijunaidm%2F0b5459bbe18604a639e1d2f7accd204f%2Fraw%2Fwin19.json) | @@ -43,7 +42,6 @@ To build a VM machine from this repo's source, see the [instructions](docs/creat [ubuntu-20.04]: https://github.com/actions/runner-images/blob/main/images/ubuntu/Ubuntu2004-Readme.md [windows-2022]: https://github.com/actions/runner-images/blob/main/images/windows/Windows2022-Readme.md [windows-2019]: https://github.com/actions/runner-images/blob/main/images/windows/Windows2019-Readme.md -[macOS-11]: https://github.com/actions/runner-images/blob/main/images/macos/macos-11-Readme.md [macOS-12]: https://github.com/actions/runner-images/blob/main/images/macos/macos-12-Readme.md [macOS-13]: https://github.com/actions/runner-images/blob/main/images/macos/macos-13-Readme.md [macOS-13-arm64]: https://github.com/actions/runner-images/blob/main/images/macos/macos-13-arm64-Readme.md diff --git a/images/macos/macos-11-Readme.md b/images/macos/macos-11-Readme.md deleted file mode 100644 index a0696ae0a609..000000000000 --- a/images/macos/macos-11-Readme.md +++ /dev/null @@ -1,356 +0,0 @@ -| Announcements | -|-| -| [[All OSes] Powershell Core will be updated to 7.4.x LTS on January, 28](https://github.com/actions/runner-images/issues/9115) | -*** -# macOS 11 -- OS Version: macOS 11.7.10 (20G1427) -- Kernel Version: Darwin 20.6.0 -- Image Version: 20240127.1 - -## Installed Software - -### Language and Runtime -- .NET Core SDK: 6.0.418, 7.0.102, 7.0.202, 7.0.306, 7.0.405, 8.0.101 -- Bash 3.2.57(1)-release -- Clang/LLVM 13.0.0 -- Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` -- GCC 10 (Homebrew GCC 10.5.0) - available by `gcc-10` alias -- GCC 11 (Homebrew GCC 11.4.0) - available by `gcc-11` alias -- GCC 12 (Homebrew GCC 12.3.0) - available by `gcc-12` alias -- GNU Fortran 10 (Homebrew GCC 10.5.0) - available by `gfortran-10` alias -- GNU Fortran 11 (Homebrew GCC 11.4.0) - available by `gfortran-11` alias -- GNU Fortran 12 (Homebrew GCC 12.3.0) - available by `gfortran-12` alias -- Julia 1.10.0 -- Kotlin 1.9.22-release-704 -- Go 1.20.13 -- Mono 6.12.0.188 -- Node.js 18.19.0 -- MSBuild 16.10.1.51301 (Mono 6.12.0.188) -- NVM 0.39.7 -- NVM - Cached node versions: 16.20.2, 18.19.0, 20.11.0 -- Perl 5.38.2 -- Python 2.7.18 -- Python3 3.12.1 -- R 4.3.2 -- Ruby 2.7.8p225 - -### Package Management -- Bundler 2.4.22 -- Carthage 0.39.1 -- CocoaPods 1.14.3 -- Homebrew 4.2.5 -- Miniconda 23.11.0 -- NPM 10.2.3 -- NuGet 6.3.1.1 -- Pip 20.3.4 (python 2.7) -- Pip3 23.3.2 (python 3.12) -- Pipx 1.4.3 -- RubyGems 3.4.10 -- Vcpkg 2024 (build from commit 7032c5759) -- Yarn 1.22.19 - -#### Environment variables -| Name | Value | -| ----------------------- | ---------------------- | -| CONDA | /usr/local/miniconda | -| VCPKG_INSTALLATION_ROOT | /usr/local/share/vcpkg | - -### Project Management -- Apache Ant 1.10.14 -- Apache Maven 3.9.6 -- Gradle 8.5 -- Sbt 1.9.8 - -### Utilities -- 7-Zip 17.05 -- aria2 1.37.0 -- azcopy 10.22.2 -- bazel 7.0.2 -- bazelisk 1.19.0 -- bsdtar 3.3.2 - available by 'tar' alias -- Curl 8.5.0 -- Git 2.43.0 -- Git LFS 3.4.1 -- GitHub CLI 2.42.1 -- GNU Tar 1.35 - available by 'gtar' alias -- GNU Wget 1.21.4 -- gpg (GnuPG) 2.4.4 -- helm v3.14.0+g3fc9f4b -- jq 1.7.1 -- mongo 5.0.21 -- mongod 5.0.21 -- Newman 6.1.0 -- OpenSSL 1.1.1w 11 Sep 2023 -- Packer 1.9.4 -- pkg-config 0.29.2 -- PostgreSQL 14.10 (Homebrew) -- psql (PostgreSQL) 14.10 (Homebrew) -- Sox 14.4.2 -- Subversion (SVN) 1.14.3 -- Switchaudio-osx 1.2.2 -- yq 4.40.5 -- zstd 1.5.5 - -### Tools -- Aliyun CLI 3.0.197 -- App Center CLI 2.14.0 -- AWS CLI 2.15.15 -- AWS SAM CLI 1.108.0 -- AWS Session Manager CLI 1.2.553.0 -- Azure CLI 2.56.0 -- Azure CLI (azure-devops) 0.26.0 -- Bicep CLI 0.24.24 -- Cabal 3.10.2.1 -- Cmake 3.28.1 -- CodeQL Action Bundle 2.16.1 -- Fastlane 2.219.0 -- GHC 9.8.1 -- GHCup 0.1.20.0 -- Jazzy 0.14.4 -- Stack 2.13.1 -- SwiftFormat 0.53.0 -- Swig 4.2.0 -- Xcode Command Line Tools 13.2.0.0.1.1638488800 - -### Linters -- SwiftLint 0.48.0 -- Yamllint 1.33.0 - -### Browsers -- Safari 16.6.1 (16615.3.12.11.5) -- SafariDriver 16.6.1 (16615.3.12.11.5) -- Google Chrome 121.0.6167.85 -- Google Chrome for Testing 121.0.6167.85 -- ChromeDriver 121.0.6167.85 -- Microsoft Edge 121.0.2277.83 -- Microsoft Edge WebDriver 121.0.2277.83 -- Mozilla Firefox 122.0 -- geckodriver 0.34.0 -- Selenium server 4.17.0 - -#### Environment variables -| Name | Value | -| --------------- | ------------------------------------- | -| CHROMEWEBDRIVER | /usr/local/share/chromedriver-mac-x64 | -| EDGEWEBDRIVER | /usr/local/share/edge_driver | -| GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | - -### Java -| Version | Environment Variable | -| ------------------- | -------------------- | -| 8.0.402+6 (default) | JAVA_HOME_8_X64 | -| 11.0.22+7 | JAVA_HOME_11_X64 | -| 17.0.10+7 | JAVA_HOME_17_X64 | -| 21.0.2+13.0 | JAVA_HOME_21_X64 | - -### Cached Tools - -#### Ruby -- 2.5.9 -- 2.6.10 -- 2.7.8 -- 3.0.6 -- 3.1.4 - -#### PyPy -- 2.7.18 [PyPy 7.3.15] -- 3.7.13 [PyPy 7.3.9] -- 3.8.16 [PyPy 7.3.11] -- 3.9.18 [PyPy 7.3.15] -- 3.10.13 [PyPy 7.3.15] - -#### Python -- 3.7.17 -- 3.8.18 -- 3.9.18 -- 3.10.13 -- 3.11.7 -- 3.12.1 - -#### Node.js -- 16.20.2 -- 18.19.0 -- 20.11.0 - -#### Go -- 1.19.13 -- 1.20.13 -- 1.21.6 - -### Rust Tools -- Cargo 1.75.0 -- Rust 1.75.0 -- Rustdoc 1.75.0 -- Rustup 1.26.0 - -#### Packages -- Bindgen 0.69.2 -- Cargo-audit 0.18.3 -- Cargo-outdated 0.14.0 -- Cbindgen 0.26.0 -- Clippy 0.1.75 -- Rustfmt 1.7.0-stable - -### PowerShell Tools -- PowerShell 7.4.1 - -#### PowerShell Modules -- Az: 11.2.0 -- MarkdownPS: 1.9 -- Pester: 5.5.0 -- PSScriptAnalyzer: 1.21.0 - -### Web Servers -| Name | Version | ConfigFile | ServiceStatus | ListenPort | -| ----- | ------- | ------------------------------- | ------------- | ---------- | -| httpd | 2.4.58 | /usr/local/etc/httpd/httpd.conf | none | 80 | -| nginx | 1.25.3 | /usr/local/etc/nginx/nginx.conf | none | 80 | - -### Xamarin - -#### Visual Studio for Mac -| Version | Build | Path | -| -------------- | ---------- | ------------------------------------ | -| 2019 | 8.10.25.2 | /Applications/Visual Studio 2019.app | -| 2022 (default) | 17.6.8.400 | /Applications/Visual Studio.app | - -##### Notes -``` -To use Visual Studio 2019 by default rename the app: -mv "/Applications/Visual Studio.app" "/Applications/Visual Studio 2022.app" -mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" -``` - -#### Xamarin bundles -| symlink | Xamarin.Mono | Xamarin.iOS | Xamarin.Mac | Xamarin.Android | -| ----------------- | ------------ | ----------- | ----------- | --------------- | -| 6_12_16 | 6.12 | 15.8 | 8.8 | 12.2 | -| 6_12_15 | 6.12 | 15.8 | 8.8 | 12.1 | -| 6_12_14 | 6.12 | 15.8 | 8.8 | 12.0 | -| 6_12_13 | 6.12 | 15.6 | 8.6 | 12.0 | -| 6_12_12 (default) | 6.12 | 15.4 | 8.4 | 12.0 | -| 6_12_11 | 6.12 | 15.2 | 8.2 | 12.0 | -| 6_12_10 | 6.12 | 15.0 | 7.14 | 11.3 | -| 6_12_9 | 6.12 | 14.20 | 7.14 | 11.3 | -| 6_12_8 | 6.12 | 14.16 | 7.10 | 11.2 | -| 6_12_7 | 6.12 | 14.14 | 7.8 | 11.2 | -| 6_12_6 | 6.12 | 14.10 | 7.4 | 11.1 | -| 6_12_5 | 6.12 | 14.8 | 7.2 | 11.1 | -| 6_12_4 | 6.12 | 14.6 | 7.0 | 11.1 | -| 6_12_3 | 6.12 | 14.4 | 6.22 | 11.1 | -| 6_12_2 | 6.12 | 14.2 | 6.20 | 11.0 | -| 6_12_1 | 6.12 | 14.0 | 6.20 | 11.0 | -| 6_12_0 | 6.12 | 13.20 | 6.20 | 11.0 | - -#### Unit Test Framework -- NUnit 3.6.1 - -### Xcode -| Version | Build | Path | -| ---------------- | -------- | ------------------------------ | -| 13.2.1 (default) | 13C100 | /Applications/Xcode_13.2.1.app | -| 13.1 | 13A1030d | /Applications/Xcode_13.1.app | -| 13.0 | 13A233 | /Applications/Xcode_13.0.app | -| 12.5.1 | 12E507 | /Applications/Xcode_12.5.1.app | -| 12.4 | 12D4e | /Applications/Xcode_12.4.app | -| 11.7 | 11E801a | /Applications/Xcode_11.7.app | - -#### Xcode Support Tools -- xcpretty 0.3.0 -- xcversion 2.8.1 -- Nomad CLI 0.0.2 -- Nomad shenzhen CLI 0.14.3 - -#### Installed SDKs -| SDK | SDK Name | Xcode Version | -| ----------------------- | -------------------- | ------------- | -| macOS 10.15 | macosx10.15 | 11.7 | -| macOS 11.1 | macosx11.1 | 12.4 | -| macOS 11.3 | macosx11.3 | 12.5.1, 13.0 | -| macOS 12.0 | macosx12.0 | 13.1 | -| macOS 12.1 | macosx12.1 | 13.2.1 | -| iOS 13.7 | iphoneos13.7 | 11.7 | -| iOS 14.4 | iphoneos14.4 | 12.4 | -| iOS 14.5 | iphoneos14.5 | 12.5.1 | -| iOS 15.0 | iphoneos15.0 | 13.0, 13.1 | -| iOS 15.2 | iphoneos15.2 | 13.2.1 | -| Simulator - iOS 13.7 | iphonesimulator13.7 | 11.7 | -| Simulator - iOS 14.4 | iphonesimulator14.4 | 12.4 | -| Simulator - iOS 14.5 | iphonesimulator14.5 | 12.5.1 | -| Simulator - iOS 15.0 | iphonesimulator15.0 | 13.0, 13.1 | -| Simulator - iOS 15.2 | iphonesimulator15.2 | 13.2.1 | -| tvOS 13.4 | appletvos13.4 | 11.7 | -| tvOS 14.3 | appletvos14.3 | 12.4 | -| tvOS 14.5 | appletvos14.5 | 12.5.1 | -| tvOS 15.0 | appletvos15.0 | 13.0, 13.1 | -| tvOS 15.2 | appletvos15.2 | 13.2.1 | -| Simulator - tvOS 13.4 | appletvsimulator13.4 | 11.7 | -| Simulator - tvOS 14.3 | appletvsimulator14.3 | 12.4 | -| Simulator - tvOS 14.5 | appletvsimulator14.5 | 12.5.1 | -| Simulator - tvOS 15.0 | appletvsimulator15.0 | 13.0, 13.1 | -| Simulator - tvOS 15.2 | appletvsimulator15.2 | 13.2.1 | -| watchOS 6.2 | watchos6.2 | 11.7 | -| watchOS 7.2 | watchos7.2 | 12.4 | -| watchOS 7.4 | watchos7.4 | 12.5.1 | -| watchOS 8.0 | watchos8.0 | 13.0, 13.1 | -| watchOS 8.3 | watchos8.3 | 13.2.1 | -| Simulator - watchOS 6.2 | watchsimulator6.2 | 11.7 | -| Simulator - watchOS 7.2 | watchsimulator7.2 | 12.4 | -| Simulator - watchOS 7.4 | watchsimulator7.4 | 12.5.1 | -| Simulator - watchOS 8.0 | watchsimulator8.0 | 13.0, 13.1 | -| Simulator - watchOS 8.3 | watchsimulator8.3 | 13.2.1 | -| DriverKit 19.0 | driverkit.macosx19.0 | 11.7 | -| DriverKit 20.2 | driverkit.macosx20.2 | 12.4 | -| DriverKit 20.4 | driverkit.macosx20.4 | 12.5.1, 13.0 | -| DriverKit 21.0.1 | driverkit21.0.1 | 13.1 | -| DriverKit 21.2 | driverkit21.2 | 13.2.1 | - -#### Installed Simulators -| OS | Xcode Version | Simulators | -| ----------- | ------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| iOS 13.7 | 11.7 | iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (7th generation)<br>iPad Air (3rd generation)<br>iPad Pro (11-inch) (2nd generation)<br>iPad Pro (12.9-inch) (4th generation)<br>iPad Pro (9.7-inch) | -| iOS 14.4 | 12.4 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (7th generation)<br>iPad (8th generation)<br>iPad Air (3rd generation)<br>iPad Air (4th generation)<br>iPad Pro (11-inch) (2nd generation)<br>iPad Pro (12.9-inch) (4th generation)<br>iPad Pro (9.7-inch) | -| iOS 14.5 | 12.5.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (7th generation)<br>iPad (8th generation)<br>iPad Air (3rd generation)<br>iPad Air (4th generation)<br>iPad Pro (11-inch) (2nd generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (4th generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | -| iOS 15.0 | 13.0<br>13.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (7th generation)<br>iPad (8th generation)<br>iPad (9th generation)<br>iPad Air (3rd generation)<br>iPad Air (4th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (2nd generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (4th generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | -| iOS 15.2 | 13.2.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (7th generation)<br>iPad (8th generation)<br>iPad (9th generation)<br>iPad Air (3rd generation)<br>iPad Air (4th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (2nd generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (4th generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | -| tvOS 13.4 | 11.7 | Apple TV<br>Apple TV 4K<br>Apple TV 4K (at 1080p) | -| tvOS 14.3 | 12.4 | Apple TV<br>Apple TV 4K<br>Apple TV 4K (at 1080p) | -| tvOS 14.5 | 12.5.1 | Apple TV<br>Apple TV 4K<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p)<br>Apple TV 4K (at 1080p) (2nd generation) | -| tvOS 15.0 | 13.0<br>13.1 | Apple TV<br>Apple TV 4K<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p)<br>Apple TV 4K (at 1080p) (2nd generation) | -| tvOS 15.2 | 13.2.1 | Apple TV<br>Apple TV 4K<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p)<br>Apple TV 4K (at 1080p) (2nd generation) | -| watchOS 6.2 | 11.7 | Apple Watch Series 4 - 40mm<br>Apple Watch Series 4 - 44mm<br>Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm | -| watchOS 7.2 | 12.4 | Apple Watch Series 4 - 40mm<br>Apple Watch Series 4 - 44mm<br>Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm | -| watchOS 7.4 | 12.5.1 | Apple Watch Series 4 - 40mm<br>Apple Watch Series 4 - 44mm<br>Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm | -| watchOS 8.0 | 13.0<br>13.1 | Apple Watch Series 4 - 40mm<br>Apple Watch Series 4 - 44mm<br>Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | -| watchOS 8.3 | 13.2.1 | Apple Watch Series 4 - 40mm<br>Apple Watch Series 4 - 44mm<br>Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | - -### Android -| Package Name | Version | -| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 8.0 | -| Android Emulator | 33.1.24 | -| Android SDK Build-tools | 34.0.0<br>33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0 | -| Android SDK Platforms | android-34-ext8 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 2)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1) | -| Android SDK Platform-Tools | 34.0.5 | -| Android Support Repository | 47.0.0 | -| CMake | 3.10.2<br>3.18.1<br>3.22.1 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 24.0.8215888<br>25.2.9519653 (default)<br>26.1.10909125 | - -#### Environment variables -| Name | Value | -| ----------------------- | --------------------------------------------------- | -| ANDROID_HOME | /Users/runner/Library/Android/sdk | -| ANDROID_NDK | /Users/runner/Library/Android/sdk/ndk/25.2.9519653 | -| ANDROID_NDK_HOME | /Users/runner/Library/Android/sdk/ndk/25.2.9519653 | -| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/26.1.10909125 | -| ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk/25.2.9519653 | -| ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | - -### Miscellaneous -- libXext 1.3.5 -- libXft 2.3.8 -- Tcl/Tk 8.6.13_5 -- Zlib 1.3.1 - From 221efcbdc3dfcb849812b82b8d8607db93ed1ad9 Mon Sep 17 00:00:00 2001 From: RaviAkshintala <167848931+RaviAkshintala@users.noreply.github.com> Date: Wed, 10 Jul 2024 15:52:50 +0530 Subject: [PATCH 2955/3485] fix visual studio signature (#10205) Co-authored-by: Ravi Akshintala <raviakshintalagithub.com@Ravis-Laptop.local> --- images/windows/toolsets/toolset-2022.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/windows/toolsets/toolset-2022.json b/images/windows/toolsets/toolset-2022.json index b599185c9f5a..8a028e4e4339 100644 --- a/images/windows/toolsets/toolset-2022.json +++ b/images/windows/toolsets/toolset-2022.json @@ -177,7 +177,7 @@ "subversion" : "17", "edition" : "Enterprise", "channel": "release", - "signature": "C2048FB509F1C37A8C3E9EC6648118458AA01780", + "signature": "F9A7CF9FBE13BAC767F4781061332DA6E8B4E0EE", "workloads": [ "Component.Dotfuscator", "Component.Linux.CMake", From 960e86ba13ee1035d67bd5ad69a0dae5e46aac74 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 10 Jul 2024 12:02:30 +0000 Subject: [PATCH 2956/3485] Updating readme file for ubuntu24 version 20240707.1.1 (#10188) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2404-Readme.md | 32 +++++++++++++++--------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/images/ubuntu/Ubuntu2404-Readme.md b/images/ubuntu/Ubuntu2404-Readme.md index 5d65f28e927b..30b26417c1c6 100644 --- a/images/ubuntu/Ubuntu2404-Readme.md +++ b/images/ubuntu/Ubuntu2404-Readme.md @@ -5,8 +5,8 @@ *** # Ubuntu 24.04 LTS - OS Version: 24.04 LTS -- Kernel Version: 6.8.0-1008-azure -- Image Version: 20240630.1.0 +- Kernel Version: 6.8.0-1009-azure +- Image Version: 20240707.1.0 - Systemd version: 255.4-1ubuntu8.1 ## Installed Software @@ -28,14 +28,14 @@ ### Package Management - cpan 1.64 - Helm 3.15.2 -- Homebrew 4.3.7 +- Homebrew 4.3.8 - Miniconda 24.5.0 - Npm 10.7.0 - Pip 24.0 - Pip3 24.0 - Pipx 1.4.3 - RubyGems 3.4.20 -- Vcpkg (build from commit afa12e729) +- Vcpkg (build from commit 576379156) - Yarn 1.22.22 #### Environment variables @@ -55,7 +55,7 @@ to accomplish this. ### Project Management - Ant 1.10.14 - Gradle 8.8 -- Lerna 8.1.5 +- Lerna 8.1.6 - Maven 3.8.8 ### Tools @@ -65,7 +65,7 @@ to accomplish this. - Bazelisk 1.19.0 - Bicep 0.28.1 - Buildah 1.33.7 -- CMake 3.29.6 +- CMake 3.30.0 - CodeQL Action Bundle 2.17.6 - Docker Amazon ECR Credential Helper 0.8.0 - Docker Compose v2 2.27.1 @@ -89,7 +89,7 @@ to accomplish this. - OpenSSL 3.0.13-0ubuntu3.1 - Parcel 2.12.0 - Podman 4.9.3 -- Pulumi 3.121.0 +- Pulumi 3.122.0 - Skopeo 1.13.3 - Sphinx Open Source Search Server 2.2.11 - yamllint 1.35.1 @@ -97,8 +97,8 @@ to accomplish this. - zstd 1.5.6 ### CLI Tools -- AWS CLI 2.17.5 -- AWS CLI Session Manager Plugin 1.2.633.0 +- AWS CLI 2.17.9 +- AWS CLI Session Manager Plugin 1.2.650.0 - AWS SAM CLI 1.120.0 - Azure CLI 2.61.0 - Azure CLI (azure-devops) 1.0.1 @@ -123,7 +123,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ### Haskell Tools - Cabal 3.12.1.0 - GHC 9.10.1 -- GHCup 0.1.22.0 +- GHCup 0.1.30.0 - Stack 2.15.7 ### Rust Tools @@ -177,8 +177,8 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Go - 1.20.14 -- 1.21.11 -- 1.22.4 +- 1.21.12 +- 1.22.5 #### Node.js - 16.20.2 @@ -200,8 +200,8 @@ Use the following command as a part of your job to start the service: 'sudo syst #### PowerShell Modules - Az: 11.5.0 -- Microsoft.Graph: 2.19.0 -- Pester: 5.6.0 +- Microsoft.Graph: 2.20.0 +- Pester: 5.6.1 - PSScriptAnalyzer: 1.22.0 ### Web Servers @@ -272,7 +272,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | mercurial | 6.7.2-1ubuntu2 | | net-tools | 2.10-0.1ubuntu4 | | netcat | 1.226-1ubuntu2 | -| openssh-client | 1:9.6p1-3ubuntu13 | +| openssh-client | 1:9.6p1-3ubuntu13.3 | | p7zip-full | 16.02+transitional.1 | | p7zip-rar | 16.02+transitional.1 | | parallel | 20231122+ds-1 | @@ -286,7 +286,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | shellcheck | 0.9.0-1 | | sphinxsearch | 2.2.11-8build1 | | sqlite3 | 3.45.1-1ubuntu2 | -| ssh | 1:9.6p1-3ubuntu13 | +| ssh | 1:9.6p1-3ubuntu13.3 | | sshpass | 1.09-1 | | sudo | 1.9.15p5-3ubuntu5 | | swig | 4.2.0-2ubuntu1 | From bd17a26b4238395c79da819f8ac63996a4604141 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 10 Jul 2024 13:01:18 +0000 Subject: [PATCH 2957/3485] Updating readme file for win19 version 20240707.1.1 (#10187) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/windows/Windows2019-Readme.md | 35 ++++++++++++++-------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/images/windows/Windows2019-Readme.md b/images/windows/Windows2019-Readme.md index 0f23e1a22ab4..cb0af6b75c7a 100644 --- a/images/windows/Windows2019-Readme.md +++ b/images/windows/Windows2019-Readme.md @@ -4,7 +4,7 @@ *** # Windows Server 2019 - OS Version: 10.0.17763 Build 5936 -- Image Version: 20240630.1.0 +- Image Version: 20240707.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -13,13 +13,13 @@ ### Language and Runtime - Bash 5.2.26(1)-release -- Go 1.21.11 +- Go 1.21.12 - Julia 1.10.4 - Kotlin 2.0.0 - LLVM 18.1.6 - Node 18.20.3 - Perl 5.32.1 -- PHP 8.3.8 +- PHP 8.3.9 - Python 3.7.9 - Ruby 3.0.7p220 @@ -33,7 +33,7 @@ - pip 24.0 (python 3.7) - Pipx 1.2.1 - RubyGems 3.2.33 -- Vcpkg (build from commit afa12e729) +- Vcpkg (build from commit 576379156) - Yarn 1.22.22 #### Environment variables @@ -56,7 +56,7 @@ - Bazelisk 1.19.0 - Bicep 0.28.1 - Cabal 3.12.1.0 -- CMake 3.29.6 +- CMake 3.30.0 - CodeQL Action Bundle 2.17.6 - Docker 26.1.3 - Docker Compose v1 1.29.2 @@ -65,7 +65,7 @@ - ghc 9.10.1 - Git 2.45.2.windows.1 - Git LFS 3.5.1 -- Google Cloud CLI 482.0.0 +- Google Cloud CLI 483.0.0 - ImageMagick 7.1.1-34 - InnoSetup 6.3.2 - jq 1.7.1 @@ -80,7 +80,7 @@ - OpenSSL 1.1.1w - Packer 1.11.0 - Parcel 2.12.0 -- Pulumi 3.121.0 +- Pulumi 3.122.0 - R 4.4.1 - Service Fabric SDK 9.1.1436.9590 - Stack 2.15.7 @@ -94,9 +94,9 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.210 -- AWS CLI 2.17.5 +- AWS CLI 2.17.9 - AWS SAM CLI 1.120.0 -- AWS Session Manager CLI 1.2.633.0 +- AWS Session Manager CLI 1.2.650.0 - Azure CLI 2.61.0 - Azure DevOps CLI extension 1.0.1 - Cloud Foundry CLI 8.7.10 @@ -119,8 +119,8 @@ ### Browsers and Drivers - Google Chrome 126.0.6478.127 - Chrome Driver 126.0.6478.126 -- Microsoft Edge 126.0.2592.81 -- Microsoft Edge Driver 126.0.2592.81 +- Microsoft Edge 126.0.2592.87 +- Microsoft Edge Driver 126.0.2592.87 - Mozilla Firefox 127.0.2 - Gecko Driver 0.34.0 - IE Driver 4.14.0.0 @@ -166,8 +166,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Go - 1.20.14 -- 1.21.11 -- 1.22.4 +- 1.21.12 +- 1.22.5 #### Node.js - 16.20.2 @@ -193,6 +193,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Ruby - 3.0.7 - 3.1.6 +- 3.2.4 ### Databases @@ -507,15 +508,15 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - AzureRM: 2.1.0 (Default), 6.13.1 - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.610 +- AWSPowershell: 4.1.614 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.10 -- Microsoft.Graph: 2.19.0 -- Pester: 3.4.0, 5.6.0 +- Microsoft.Graph: 2.20.0 +- Pester: 3.4.0, 5.6.1 - PowerShellGet: 1.0.0.1, 2.2.5 - PSScriptAnalyzer: 1.22.0 - PSWindowsUpdate: 2.2.1.4 -- SqlServer: 22.2.0 +- SqlServer: 22.3.0 - VSSetup: 2.2.16 ``` Azure PowerShell module 2.1.0 and AzureRM PowerShell module 2.1.0 are installed From e329995e52016360717ef4f808dd1d5333d898e2 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 10 Jul 2024 13:57:51 +0000 Subject: [PATCH 2958/3485] Updating readme file for ubuntu20 version 20240708.1.1 (#10191) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2004-Readme.md | 52 ++++++++++++++++-------------- 1 file changed, 27 insertions(+), 25 deletions(-) diff --git a/images/ubuntu/Ubuntu2004-Readme.md b/images/ubuntu/Ubuntu2004-Readme.md index 41962efa73b0..23cfffcf2a94 100644 --- a/images/ubuntu/Ubuntu2004-Readme.md +++ b/images/ubuntu/Ubuntu2004-Readme.md @@ -5,8 +5,8 @@ *** # Ubuntu 20.04 - OS Version: 20.04.6 LTS -- Kernel Version: 5.15.0-1064-azure -- Image Version: 20240701.1.0 +- Kernel Version: 5.15.0-1067-azure +- Image Version: 20240708.1.0 - Systemd version: 245.4-4ubuntu3.23 ## Installed Software @@ -34,7 +34,7 @@ ### Package Management - cpan 1.64 - Helm 3.15.2 -- Homebrew 4.3.8 +- Homebrew 4.3.9 - Miniconda 24.5.0 - Npm 10.7.0 - NuGet 6.6.1.2 @@ -42,7 +42,7 @@ - Pip3 20.0.2 - Pipx 1.6.0 - RubyGems 3.1.2 -- Vcpkg (build from commit dec6c5bf4) +- Vcpkg (build from commit 576379156) - Yarn 1.22.22 #### Environment variables @@ -62,9 +62,9 @@ to accomplish this. ### Project Management - Ant 1.10.7 - Gradle 8.8 -- Lerna 8.1.5 +- Lerna 8.1.6 - Maven 3.8.8 -- Sbt 1.10.0 +- Sbt 1.10.1 ### Tools - Ansible 2.13.13 @@ -74,7 +74,7 @@ to accomplish this. - Bazelisk 1.19.0 - Bicep 0.28.1 - Buildah 1.22.3 -- CMake 3.29.6 +- CMake 3.30.0 - CodeQL Action Bundle 2.17.6 - Docker Amazon ECR Credential Helper 0.8.0 - Docker Compose v1 1.29.2 @@ -105,29 +105,29 @@ to accomplish this. - Parcel 2.12.0 - PhantomJS 2.1.1 2.1.1 - Podman 3.4.2 -- Pulumi 3.121.0 +- Pulumi 3.122.0 - R 4.4.1 - Skopeo 1.5.0 - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 -- Terraform 1.9.0 +- Terraform 1.9.1 - yamllint 1.35.1 - yq 4.44.2 - zstd 1.5.6 ### CLI Tools - Alibaba Cloud CLI 3.0.174 -- AWS CLI 2.17.6 -- AWS CLI Session Manager Plugin 1.2.633.0 +- AWS CLI 2.17.9 +- AWS CLI Session Manager Plugin 1.2.650.0 - AWS SAM CLI 1.120.0 - Azure CLI 2.61.0 - Azure CLI (azure-devops) 1.0.1 - GitHub CLI 2.52.0 -- Google Cloud CLI 482.0.0 -- Netlify CLI 17.31.0 +- Google Cloud CLI 483.0.0 +- Netlify CLI 17.33.0 - OpenShift CLI 4.15.19 - ORAS CLI 1.2.0 -- Vercel CLI 34.2.8 +- Vercel CLI 34.3.0 ### Java | Version | Environment Variable | @@ -138,7 +138,7 @@ to accomplish this. | 21.0.3+9 | JAVA_HOME_21_X64 | ### PHP Tools -- PHP: 7.4.33, 8.0.30, 8.1.29, 8.2.20, 8.3.8 +- PHP: 7.4.33, 8.0.30, 8.1.29, 8.2.21, 8.3.9 - Composer 2.7.7 - PHPUnit 8.5.38 ``` @@ -148,7 +148,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ### Haskell Tools - Cabal 3.12.1.0 - GHC 9.10.1 -- GHCup 0.1.22.0 +- GHCup 0.1.30.0 - Stack 2.15.7 ### Rust Tools @@ -169,8 +169,8 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Google Chrome 126.0.6478.126 - ChromeDriver 126.0.6478.126 - Chromium 126.0.6478.0 -- Microsoft Edge 126.0.2592.81 -- Microsoft Edge WebDriver 126.0.2592.81 +- Microsoft Edge 126.0.2592.87 +- Microsoft Edge WebDriver 126.0.2592.87 - Selenium server 4.22.0 - Mozilla Firefox 127.0.2 - Geckodriver 0.34.0 @@ -216,8 +216,8 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Go - 1.20.14 -- 1.21.11 -- 1.22.4 +- 1.21.12 +- 1.22.5 #### Node.js - 16.20.2 @@ -243,6 +243,7 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Ruby - 3.0.7 - 3.1.6 +- 3.2.4 ### PowerShell Tools - PowerShell 7.4.3 @@ -250,7 +251,7 @@ Use the following command as a part of your job to start the service: 'sudo syst #### PowerShell Modules - Az: 11.3.1 - MarkdownPS: 1.10 -- Microsoft.Graph: 2.19.0 +- Microsoft.Graph: 2.20.0 - Pester: 5.6.1 - PSScriptAnalyzer: 1.22.0 @@ -289,15 +290,16 @@ Use the following command as a part of your job to start the service: 'sudo syst | alpine:3.16 | sha256:452e7292acee0ee16c332324d7de05fa2c99f9994ecc9f0779c602916a672ae4 | 2024-01-27 | | alpine:3.17 | sha256:a6063e988bcd597b4f1f7cfd4ec38402b02edd0c79250f00c9e14dc1e94bebbc | 2024-06-20 | | alpine:3.18 | sha256:1875c923b73448b558132e7d4a44b815d078779ed7a73f76209c6372de95ea8d | 2024-06-20 | +| alpine:3.19 | sha256:af4785ccdbcd5cde71bfd5b93eabd34250b98651f19fe218c91de6c8d10e21c5 | 2024-06-20 | | debian:10 | sha256:58ce6f1271ae1c8a2006ff7d3e54e9874d839f573d8009c20154ad0f2fb0a225 | 2024-06-13 | -| debian:11 | sha256:d584e02c85bc9b3bd8df01662e4f605a66e1b9a04f9dea0e288f56da474269a0 | 2024-06-13 | +| debian:11 | sha256:b6b4a479a3bc1b8dfda5544f00b72aafb230bb835a43974a147b220c38df882e | 2024-07-02 | | debian:9 | sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be | 2022-06-23 | | moby/buildkit:latest | sha256:5d410bbb6d22b01fcaead1345936c5e0a0963eb6c3b190e38694e015467640fe | 2024-06-18 | | node:16 | sha256:f77a1aef2da8d83e45ec990f45df50f1a286c5fe8bbfb8c6e4246c6389705c0b | 2023-09-07 | | node:16-alpine | sha256:a1f9d027912b58a7c75be7716c97cfbc6d3099f3a97ed84aa490be9dee20e787 | 2023-08-10 | -| node:18 | sha256:d0bbfdbad0bff8253e6159dcbee42141db4fc309365d5b8bcfce46ed71569078 | 2024-05-21 | +| node:18 | sha256:70ae166dcb03837ebe1abbb78919a1a4bdc79cc970344d56f33b6c753f4b46cc | 2024-05-21 | | node:18-alpine | sha256:e37da457874383fa9217067867ec85fe8fe59f0bfa351ec9752a95438680056e | 2024-06-04 | -| node:20 | sha256:b849bc4078c3e16a38d72749ab8faeacbcc6c3bdb742399b4a5974a89fc93261 | 2024-06-24 | +| node:20 | sha256:93d2e801dabc677ea0b30b47d3d729fab63ecb20be7ac0ab204cc3c65731297a | 2024-06-24 | | node:20-alpine | sha256:df01469346db2bf1cfc1f7261aeab86b2960efa840fe2bd46d83ff339f463665 | 2024-06-24 | | ubuntu:20.04 | sha256:0b897358ff6624825fb50d20ffb605ab0eaea77ced0adb8c6a4b756513dec6fc | 2024-06-03 | @@ -383,7 +385,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | texinfo | 6.7.0.dfsg.2-5 | | time | 1.7-25.1build1 | | tk | 8.6.9+1 | -| tzdata | 2024a-0ubuntu0.20.04 | +| tzdata | 2024a-0ubuntu0.20.04.1 | | unzip | 6.0-25ubuntu1.2 | | upx | 3.95-2build1 | | wget | 1.20.3-1ubuntu2.1 | From 06652839a7fe803ed792fb120a8c5e9489564569 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 10 Jul 2024 14:02:04 +0000 Subject: [PATCH 2959/3485] Updating readme file for win22 version 20240707.1.1 (#10189) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/windows/Windows2022-Readme.md | 37 ++++++++++++++-------------- 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/images/windows/Windows2022-Readme.md b/images/windows/Windows2022-Readme.md index af63de20626d..8a78c1428990 100644 --- a/images/windows/Windows2022-Readme.md +++ b/images/windows/Windows2022-Readme.md @@ -4,7 +4,7 @@ *** # Windows Server 2022 - OS Version: 10.0.20348 Build 2529 -- Image Version: 20240630.1.0 +- Image Version: 20240707.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -13,13 +13,13 @@ ### Language and Runtime - Bash 5.2.26(1)-release -- Go 1.21.11 +- Go 1.21.12 - Julia 1.10.4 - Kotlin 2.0.0 - LLVM 18.1.6 - Node 18.20.3 - Perl 5.32.1 -- PHP 8.3.8 +- PHP 8.3.9 - Python 3.9.13 - Ruby 3.0.7p220 @@ -30,10 +30,10 @@ - Miniconda 24.5.0 (pre-installed on the image but not added to PATH) - NPM 10.7.0 - NuGet 6.10.0.107 -- pip 24.1.1 (python 3.9) +- pip 24.1.2 (python 3.9) - Pipx 1.6.0 - RubyGems 3.2.33 -- Vcpkg (build from commit afa12e729) +- Vcpkg (build from commit 576379156) - Yarn 1.22.22 #### Environment variables @@ -56,7 +56,7 @@ - Bazelisk 1.19.0 - Bicep 0.28.1 - Cabal 3.12.1.0 -- CMake 3.29.6 +- CMake 3.30.0 - CodeQL Action Bundle 2.17.6 - Docker 26.1.3 - Docker Compose v1 1.29.2 @@ -78,7 +78,7 @@ - NSIS 3.10 - OpenSSL 1.1.1w - Packer 1.11.0 -- Pulumi 3.121.0 +- Pulumi 3.122.0 - R 4.4.1 - Service Fabric SDK 9.1.1436.9590 - Stack 2.15.7 @@ -92,9 +92,9 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.210 -- AWS CLI 2.17.5 +- AWS CLI 2.17.9 - AWS SAM CLI 1.120.0 -- AWS Session Manager CLI 1.2.633.0 +- AWS Session Manager CLI 1.2.650.0 - Azure CLI 2.61.0 - Azure DevOps CLI extension 1.0.1 - GitHub CLI 2.52.0 @@ -116,8 +116,8 @@ ### Browsers and Drivers - Google Chrome 126.0.6478.127 - Chrome Driver 126.0.6478.126 -- Microsoft Edge 126.0.2592.81 -- Microsoft Edge Driver 126.0.2592.81 +- Microsoft Edge 126.0.2592.87 +- Microsoft Edge Driver 126.0.2592.87 - Mozilla Firefox 127.0.2 - Gecko Driver 0.34.0 - IE Driver 4.14.0.0 @@ -160,8 +160,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Go - 1.20.14 -- 1.21.11 -- 1.22.4 +- 1.21.12 +- 1.22.5 #### Node.js - 16.20.2 @@ -186,6 +186,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Ruby - 3.0.7 - 3.1.6 +- 3.2.4 ### Databases @@ -209,7 +210,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Database tools - Azure CosmosDb Emulator 2.14.18.0 - DacFx 162.3.566.1 -- MySQL 8.0.37.0 +- MySQL 8.0.38.0 - SQL OLEDB Driver 18.7.2.0 - SQLPS 1.0 @@ -503,15 +504,15 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - AzureRM: 2.1.0 (Default), 6.13.1 - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.610 +- AWSPowershell: 4.1.614 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.10 -- Microsoft.Graph: 2.19.0 -- Pester: 3.4.0, 5.6.0 +- Microsoft.Graph: 2.20.0 +- Pester: 3.4.0, 5.6.1 - PowerShellGet: 1.0.0.1, 2.2.5 - PSScriptAnalyzer: 1.22.0 - PSWindowsUpdate: 2.2.1.4 -- SqlServer: 22.2.0 +- SqlServer: 22.3.0 - VSSetup: 2.2.16 ``` Azure PowerShell module 2.1.0 and AzureRM PowerShell module 2.1.0 are installed From 0b21a6a13a63564540fb60808a9543e0450d4011 Mon Sep 17 00:00:00 2001 From: sarathrajsrinivasan <159180023+sarathrajsrinivasan@users.noreply.github.com> Date: Wed, 10 Jul 2024 08:03:21 -0700 Subject: [PATCH 2960/3485] Update xcode default to 15.2 from 15.0.1 for macos13 (#10210) --- images/macos/toolsets/toolset-13.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/macos/toolsets/toolset-13.json b/images/macos/toolsets/toolset-13.json index 48878c3fca9b..b0fe5fa41213 100644 --- a/images/macos/toolsets/toolset-13.json +++ b/images/macos/toolsets/toolset-13.json @@ -1,6 +1,6 @@ { "xcode": { - "default": "15.0.1", + "default": "15.2", "x64": { "versions": [ { "link": "15.2", "version": "15.2.0+15C500b", "install_runtimes": "true", "sha256": "04E93680C6DDBEC84666531BE412DE778AFC8EAC6AB2037F4C2BE7290818B59B"}, From 1b535372a075188bfce11fbd27d72a254c736b3c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 10 Jul 2024 15:06:38 +0000 Subject: [PATCH 2961/3485] Updating readme file for ubuntu22 version 20240708.1.1 (#10190) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2204-Readme.md | 66 +++++++++++++++--------------- 1 file changed, 34 insertions(+), 32 deletions(-) diff --git a/images/ubuntu/Ubuntu2204-Readme.md b/images/ubuntu/Ubuntu2204-Readme.md index 08cd0d0114f0..ae865065b658 100644 --- a/images/ubuntu/Ubuntu2204-Readme.md +++ b/images/ubuntu/Ubuntu2204-Readme.md @@ -5,8 +5,8 @@ *** # Ubuntu 22.04 - OS Version: 22.04.4 LTS -- Kernel Version: 6.5.0-1022-azure -- Image Version: 20240630.1.0 +- Kernel Version: 6.5.0-1023-azure +- Image Version: 20240708.1.0 - Systemd version: 249.11-0ubuntu3.12 ## Installed Software @@ -32,7 +32,7 @@ ### Package Management - cpan 1.64 - Helm 3.15.2 -- Homebrew 4.3.7 +- Homebrew 4.3.9 - Miniconda 24.5.0 - Npm 10.7.0 - NuGet 6.6.1.2 @@ -40,7 +40,7 @@ - Pip3 22.0.2 - Pipx 1.6.0 - RubyGems 3.3.5 -- Vcpkg (build from commit afa12e729) +- Vcpkg (build from commit 576379156) - Yarn 1.22.22 #### Environment variables @@ -60,9 +60,9 @@ to accomplish this. ### Project Management - Ant 1.10.12 - Gradle 8.8 -- Lerna 8.1.5 +- Lerna 8.1.6 - Maven 3.8.8 -- Sbt 1.10.0 +- Sbt 1.10.1 ### Tools - Ansible 2.17.1 @@ -72,7 +72,7 @@ to accomplish this. - Bazelisk 1.19.0 - Bicep 0.28.1 - Buildah 1.23.1 -- CMake 3.29.6 +- CMake 3.30.0 - CodeQL Action Bundle 2.17.6 - Docker Amazon ECR Credential Helper 0.8.0 - Docker Compose v1 1.29.2 @@ -98,32 +98,32 @@ to accomplish this. - Newman 6.1.3 - nvm 0.39.7 - OpenSSL 3.0.2-0ubuntu1.16 -- Packer 1.11.0 +- Packer 1.11.1 - Parcel 2.12.0 - Podman 3.4.4 -- Pulumi 3.121.0 +- Pulumi 3.122.0 - R 4.4.1 - Skopeo 1.4.1 - Sphinx Open Source Search Server 2.2.11 - SVN 1.14.1 -- Terraform 1.9.0 +- Terraform 1.9.1 - yamllint 1.35.1 - yq 4.44.2 - zstd 1.5.6 ### CLI Tools -- Alibaba Cloud CLI 3.0.210 -- AWS CLI 2.17.5 -- AWS CLI Session Manager Plugin 1.2.633.0 +- Alibaba Cloud CLI 3.0.211 +- AWS CLI 2.17.9 +- AWS CLI Session Manager Plugin 1.2.650.0 - AWS SAM CLI 1.120.0 - Azure CLI 2.61.0 - Azure CLI (azure-devops) 1.0.1 - GitHub CLI 2.52.0 -- Google Cloud CLI 482.0.0 -- Netlify CLI 17.30.0 -- OpenShift CLI 4.16.0 +- Google Cloud CLI 483.0.0 +- Netlify CLI 17.33.0 +- OpenShift CLI 4.16.1 - ORAS CLI 1.2.0 -- Vercel CLI 34.2.8 +- Vercel CLI 34.3.0 ### Java | Version | Environment Variable | @@ -144,7 +144,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ### Haskell Tools - Cabal 3.12.1.0 - GHC 9.10.1 -- GHCup 0.1.22.0 +- GHCup 0.1.30.0 - Stack 2.15.7 ### Rust Tools @@ -165,8 +165,8 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Google Chrome 126.0.6478.126 - ChromeDriver 126.0.6478.126 - Chromium 126.0.6478.0 -- Microsoft Edge 126.0.2592.81 -- Microsoft Edge WebDriver 126.0.2592.81 +- Microsoft Edge 126.0.2592.87 +- Microsoft Edge WebDriver 126.0.2592.87 - Selenium server 4.22.0 - Mozilla Firefox 127.0.2 - Geckodriver 0.34.0 @@ -211,8 +211,8 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Go - 1.20.14 -- 1.21.11 -- 1.22.4 +- 1.21.12 +- 1.22.5 #### Node.js - 16.20.2 @@ -235,6 +235,7 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Ruby - 3.1.6 +- 3.2.4 ### PowerShell Tools - PowerShell 7.4.3 @@ -242,8 +243,8 @@ Use the following command as a part of your job to start the service: 'sudo syst #### PowerShell Modules - Az: 11.3.1 - MarkdownPS: 1.10 -- Microsoft.Graph: 2.19.0 -- Pester: 5.6.0 +- Microsoft.Graph: 2.20.0 +- Pester: 5.6.1 - PSScriptAnalyzer: 1.22.0 ### Web Servers @@ -280,17 +281,18 @@ Use the following command as a part of your job to start the service: 'sudo syst | alpine:3.16 | sha256:452e7292acee0ee16c332324d7de05fa2c99f9994ecc9f0779c602916a672ae4 | 2024-01-27 | | alpine:3.17 | sha256:a6063e988bcd597b4f1f7cfd4ec38402b02edd0c79250f00c9e14dc1e94bebbc | 2024-06-20 | | alpine:3.18 | sha256:1875c923b73448b558132e7d4a44b815d078779ed7a73f76209c6372de95ea8d | 2024-06-20 | +| alpine:3.19 | sha256:af4785ccdbcd5cde71bfd5b93eabd34250b98651f19fe218c91de6c8d10e21c5 | 2024-06-20 | | debian:10 | sha256:58ce6f1271ae1c8a2006ff7d3e54e9874d839f573d8009c20154ad0f2fb0a225 | 2024-06-13 | -| debian:11 | sha256:d584e02c85bc9b3bd8df01662e4f605a66e1b9a04f9dea0e288f56da474269a0 | 2024-06-13 | +| debian:11 | sha256:b6b4a479a3bc1b8dfda5544f00b72aafb230bb835a43974a147b220c38df882e | 2024-07-02 | | moby/buildkit:latest | sha256:5d410bbb6d22b01fcaead1345936c5e0a0963eb6c3b190e38694e015467640fe | 2024-06-18 | | node:16 | sha256:f77a1aef2da8d83e45ec990f45df50f1a286c5fe8bbfb8c6e4246c6389705c0b | 2023-09-07 | | node:16-alpine | sha256:a1f9d027912b58a7c75be7716c97cfbc6d3099f3a97ed84aa490be9dee20e787 | 2023-08-10 | -| node:18 | sha256:d0bbfdbad0bff8253e6159dcbee42141db4fc309365d5b8bcfce46ed71569078 | 2024-05-21 | +| node:18 | sha256:70ae166dcb03837ebe1abbb78919a1a4bdc79cc970344d56f33b6c753f4b46cc | 2024-05-21 | | node:18-alpine | sha256:e37da457874383fa9217067867ec85fe8fe59f0bfa351ec9752a95438680056e | 2024-06-04 | -| node:20 | sha256:b849bc4078c3e16a38d72749ab8faeacbcc6c3bdb742399b4a5974a89fc93261 | 2024-06-24 | +| node:20 | sha256:93d2e801dabc677ea0b30b47d3d729fab63ecb20be7ac0ab204cc3c65731297a | 2024-06-24 | | node:20-alpine | sha256:df01469346db2bf1cfc1f7261aeab86b2960efa840fe2bd46d83ff339f463665 | 2024-06-24 | | ubuntu:20.04 | sha256:0b897358ff6624825fb50d20ffb605ab0eaea77ced0adb8c6a4b756513dec6fc | 2024-06-03 | -| ubuntu:22.04 | sha256:19478ce7fc2ffbce89df29fea5725a8d12e57de52eb9ea570890dc5852aac1ac | 2024-06-03 | +| ubuntu:22.04 | sha256:340d9b015b194dc6e2a13938944e0d016e57b9679963fdeb9ce021daac430221 | 2024-06-27 | ### Installed apt packages | Name | Version | @@ -351,7 +353,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | mercurial | 6.1.1-1ubuntu1 | | net-tools | 1.60+git20181103.0eebece-1ubuntu5 | | netcat | 1.218-4ubuntu1 | -| openssh-client | 1:8.9p1-3ubuntu0.7 | +| openssh-client | 1:8.9p1-3ubuntu0.10 | | p7zip-full | 16.02+dfsg-8 | | p7zip-rar | 16.02-3build1 | | parallel | 20210822+ds-2 | @@ -366,7 +368,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | shellcheck | 0.8.0-2 | | sphinxsearch | 2.2.11-8 | | sqlite3 | 3.37.2-2ubuntu0.3 | -| ssh | 1:8.9p1-3ubuntu0.7 | +| ssh | 1:8.9p1-3ubuntu0.10 | | sshpass | 1.09-1 | | subversion | 1.14.1-3ubuntu0.22.04.1 | | sudo | 1.9.9-1ubuntu2.4 | @@ -376,12 +378,12 @@ Use the following command as a part of your job to start the service: 'sudo syst | texinfo | 6.8-4build1 | | time | 1.9-0.1build2 | | tk | 8.6.11+1build2 | -| tzdata | 2024a-0ubuntu0.22.04 | +| tzdata | 2024a-0ubuntu0.22.04.1 | | unzip | 6.0-26ubuntu3.2 | | upx | 3.96-3 | | wget | 1.21.2-2ubuntu1.1 | | xorriso | 1.5.4-2 | -| xvfb | 2:21.1.4-2ubuntu1.7\~22.04.10 | +| xvfb | 2:21.1.4-2ubuntu1.7\~22.04.11 | | xz-utils | 5.2.5-2ubuntu1 | | zip | 3.0-12build2 | | zsync | 0.6.2-3ubuntu1 | From 6f8e340c856fe23c502249824b4a22b6a20d50f4 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 11 Jul 2024 11:29:57 +0000 Subject: [PATCH 2962/3485] Updating readme file for macos-13 version 20240707.2 (#10193) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-13-Readme.md | 34 ++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/images/macos/macos-13-Readme.md b/images/macos/macos-13-Readme.md index 8bc76108a74d..2c997b989b77 100644 --- a/images/macos/macos-13-Readme.md +++ b/images/macos/macos-13-Readme.md @@ -4,9 +4,9 @@ | [[macOS] Default Xcode on macOS 13 Ventura will be set to Xcode 15.2 on July, 15](https://github.com/actions/runner-images/issues/10120) | *** # macOS 13 -- OS Version: macOS 13.6.7 (22G807) +- OS Version: macOS 13.6.7 (22G810) - Kernel Version: Darwin 22.6.0 -- Image Version: 20240630.1 +- Image Version: 20240707.2 ## Installed Software @@ -27,7 +27,7 @@ - Mono 6.12.0.188 - Node.js 20.15.0 - Perl 5.38.2 -- PHP 8.3.8 +- PHP 8.3.9 - Python3 3.12.4 - Ruby 3.0.7p220 @@ -36,13 +36,13 @@ - Carthage 0.39.1 - CocoaPods 1.15.2 - Composer 2.7.7 -- Homebrew 4.3.7 +- Homebrew 4.3.8 - NPM 10.7.0 - NuGet 6.3.1.1 -- Pip3 24.1.1 (python 3.12) +- Pip3 24.1.2 (python 3.12) - Pipx 1.6.0 - RubyGems 3.5.14 -- Vcpkg 2024 (build from commit afa12e729) +- Vcpkg 2024 (build from commit 576379156) - Yarn 1.22.22 ### Project Management @@ -72,13 +72,13 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.17.5 +- AWS CLI 2.17.9 - AWS SAM CLI 1.120.0 -- AWS Session Manager CLI 1.2.633.0 +- AWS Session Manager CLI 1.2.650.0 - Azure CLI 2.61.0 - Azure CLI (azure-devops) 1.0.1 - Bicep CLI 0.28.1 -- Cmake 3.29.6 +- Cmake 3.30.0 - CodeQL Action Bundle 2.17.6 - Fastlane 2.221.1 - SwiftFormat 0.54.0 @@ -90,13 +90,13 @@ - SwiftLint 0.55.1 ### Browsers -- Safari 17.6 (18618.3.7.1) -- SafariDriver 17.6 (18618.3.7.1) +- Safari 18.0 (18619.1.18.111.4) +- SafariDriver 18.0 (18619.1.18.111.4) - Google Chrome 126.0.6478.127 - Google Chrome for Testing 126.0.6478.126 - ChromeDriver 126.0.6478.126 -- Microsoft Edge 126.0.2592.81 -- Microsoft Edge WebDriver 126.0.2592.81 +- Microsoft Edge 126.0.2592.87 +- Microsoft Edge WebDriver 126.0.2592.87 - Mozilla Firefox 127.0.2 - geckodriver 0.34.0 - Selenium server 4.22.0 @@ -143,8 +143,8 @@ #### Go - 1.20.14 -- 1.21.11 -- 1.22.4 +- 1.21.12 +- 1.22.5 ### Rust Tools - Cargo 1.79.0 @@ -161,7 +161,7 @@ #### PowerShell Modules - Az: 12.0.0 -- Pester: 5.6.0 +- Pester: 5.6.1 - PSScriptAnalyzer: 1.22.0 ### Xcode @@ -208,8 +208,8 @@ | Simulator - watchOS 9.4 | watchsimulator9.4 | 14.3.1 | | Simulator - watchOS 10.0 | watchsimulator10.0 | 15.0.1 | | Simulator - watchOS 10.2 | watchsimulator10.2 | 15.1, 15.2 | -| Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | | visionOS 1.0 | xros1.0 | 15.2 | +| Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | From 3dcb189d30ad0be27260acf5b0f8315e636bfd28 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 11 Jul 2024 11:46:34 +0000 Subject: [PATCH 2963/3485] Updating readme file for macos-14 version 20240708.1 (#10195) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-14-Readme.md | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/images/macos/macos-14-Readme.md b/images/macos/macos-14-Readme.md index 8593506a4354..f2d4afa0be83 100644 --- a/images/macos/macos-14-Readme.md +++ b/images/macos/macos-14-Readme.md @@ -6,7 +6,7 @@ # macOS 14 - OS Version: macOS 14.5 (23F79) - Kernel Version: Darwin 23.5.0 -- Image Version: 20240701.1 +- Image Version: 20240708.1 ## Installed Software @@ -27,7 +27,7 @@ - Mono 6.12.0.188 - Node.js 20.15.0 - Perl 5.38.2 -- PHP 8.3.8 +- PHP 8.3.9 - Python3 3.12.4 - Ruby 3.0.7p220 @@ -36,10 +36,10 @@ - Carthage 0.39.1 - CocoaPods 1.15.2 - Composer 2.7.7 -- Homebrew 4.3.8 +- Homebrew 4.3.9 - NPM 10.7.0 - NuGet 6.3.1.1 -- Pip3 24.1.1 (python 3.12) +- Pip3 24.1.2 (python 3.12) - Pipx 1.6.0 - RubyGems 3.5.14 - Yarn 1.22.22 @@ -71,13 +71,13 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.17.5 +- AWS CLI 2.17.9 - AWS SAM CLI 1.120.0 -- AWS Session Manager CLI 1.2.633.0 +- AWS Session Manager CLI 1.2.650.0 - Azure CLI 2.61.0 - Azure CLI (azure-devops) 1.0.1 - Bicep CLI 0.28.1 -- Cmake 3.29.6 +- Cmake 3.30.0 - CodeQL Action Bundle 2.17.6 - Fastlane 2.221.1 - SwiftFormat 0.54.0 @@ -94,8 +94,8 @@ - Google Chrome 126.0.6478.127 - Google Chrome for Testing 126.0.6478.126 - ChromeDriver 126.0.6478.126 -- Microsoft Edge 126.0.2592.81 -- Microsoft Edge WebDriver 126.0.2592.81 +- Microsoft Edge 126.0.2592.87 +- Microsoft Edge WebDriver 126.0.2592.87 - Mozilla Firefox 127.0.2 - geckodriver 0.34.0 - Selenium server 4.22.0 @@ -133,8 +133,8 @@ #### Go - 1.20.14 -- 1.21.11 -- 1.22.4 +- 1.21.12 +- 1.22.5 ### Rust Tools - Cargo 1.79.0 @@ -151,7 +151,7 @@ #### PowerShell Modules - Az: 12.0.0 -- Pester: 5.6.0 +- Pester: 5.6.1 - PSScriptAnalyzer: 1.22.0 ### Xcode @@ -214,8 +214,8 @@ | visionOS 1.0 | xros1.0 | 15.2 | | Simulator - visionOS 1.1 | xrsimulator1.1 | 15.3 | | visionOS 1.1 | xros1.1 | 15.3 | -| visionOS 1.2 | xros1.2 | 15.4 | | Simulator - visionOS 1.2 | xrsimulator1.2 | 15.4 | +| visionOS 1.2 | xros1.2 | 15.4 | | Simulator - visionOS 2.0 | xrsimulator2.0 | 16.0 | | visionOS 2.0 | xros2.0 | 16.0 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | From 79ef2c9407f31be49784a265700824fa2efad73f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 11 Jul 2024 12:22:58 +0000 Subject: [PATCH 2964/3485] Updating readme file for macos-13-arm64 version 20240708.1 (#10197) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-13-arm64-Readme.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/images/macos/macos-13-arm64-Readme.md b/images/macos/macos-13-arm64-Readme.md index fa8aa797b902..9d9f99c900f1 100644 --- a/images/macos/macos-13-arm64-Readme.md +++ b/images/macos/macos-13-arm64-Readme.md @@ -6,7 +6,7 @@ # macOS 13 - OS Version: macOS 13.6.7 (22G720) - Kernel Version: Darwin 22.6.0 -- Image Version: 20240701.1 +- Image Version: 20240708.1 ## Installed Software @@ -34,7 +34,7 @@ - Bundler 2.5.14 - Carthage 0.39.1 - CocoaPods 1.15.2 -- Homebrew 4.3.8 +- Homebrew 4.3.9 - NPM 10.7.0 - NuGet 6.3.1.1 - Pip3 24.0 (python 3.12) @@ -69,13 +69,13 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.17.5 +- AWS CLI 2.17.9 - AWS SAM CLI 1.120.0 -- AWS Session Manager CLI 1.2.633.0 +- AWS Session Manager CLI 1.2.650.0 - Azure CLI 2.61.0 - Azure CLI (azure-devops) 1.0.1 - Bicep CLI 0.28.1 -- Cmake 3.29.6 +- Cmake 3.30.0 - CodeQL Action Bundle 2.17.6 - Fastlane 2.221.1 - SwiftFormat 0.54.0 @@ -122,8 +122,8 @@ #### Go - 1.20.14 -- 1.21.11 -- 1.22.4 +- 1.21.12 +- 1.22.5 ### Rust Tools - Cargo 1.79.0 @@ -140,7 +140,7 @@ #### PowerShell Modules - Az: 12.0.0 -- Pester: 5.6.0 +- Pester: 5.6.1 - PSScriptAnalyzer: 1.22.0 ### Xcode @@ -190,8 +190,8 @@ | Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | | visionOS 1.0 | xros1.0 | 15.2 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | -| Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | +| Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | DriverKit 22.1 | driverkit22.1 | 14.1 | | DriverKit 22.2 | driverkit22.2 | 14.2 | | DriverKit 22.4 | driverkit22.4 | 14.3.1 | From 32fcc6a5f4cabe4d5e183fa3dd4690f1fa581c4d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 11 Jul 2024 12:37:26 +0000 Subject: [PATCH 2965/3485] Updating readme file for macos-14-arm64 version 20240707.1 (#10194) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-14-arm64-Readme.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/images/macos/macos-14-arm64-Readme.md b/images/macos/macos-14-arm64-Readme.md index 63c749321595..ce22fa4de523 100644 --- a/images/macos/macos-14-arm64-Readme.md +++ b/images/macos/macos-14-arm64-Readme.md @@ -6,7 +6,7 @@ # macOS 14 - OS Version: macOS 14.5 (23F79) - Kernel Version: Darwin 23.5.0 -- Image Version: 20240701.9 +- Image Version: 20240707.1 ## Installed Software @@ -69,13 +69,13 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.17.5 +- AWS CLI 2.17.9 - AWS SAM CLI 1.120.0 -- AWS Session Manager CLI 1.2.633.0 +- AWS Session Manager CLI 1.2.650.0 - Azure CLI 2.61.0 - Azure CLI (azure-devops) 1.0.1 - Bicep CLI 0.28.1 -- Cmake 3.29.6 +- Cmake 3.30.0 - CodeQL Action Bundle 2.17.6 - Fastlane 2.221.1 - SwiftFormat 0.54.0 @@ -121,8 +121,8 @@ #### Go - 1.20.14 -- 1.21.11 -- 1.22.4 +- 1.21.12 +- 1.22.5 ### Rust Tools - Cargo 1.79.0 @@ -198,14 +198,14 @@ | Simulator - watchOS 10.4 | watchsimulator10.4 | 15.3 | | Simulator - watchOS 10.5 | watchsimulator10.5 | 15.4 | | Simulator - watchOS 11.0 | watchsimulator11.0 | 16.0 | -| Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | | visionOS 1.0 | xros1.0 | 15.2 | +| Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | | visionOS 1.1 | xros1.1 | 15.3 | | Simulator - visionOS 1.1 | xrsimulator1.1 | 15.3 | | Simulator - visionOS 1.2 | xrsimulator1.2 | 15.4 | | visionOS 1.2 | xros1.2 | 15.4 | -| visionOS 2.0 | xros2.0 | 16.0 | | Simulator - visionOS 2.0 | xrsimulator2.0 | 16.0 | +| visionOS 2.0 | xros2.0 | 16.0 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | From 475cf364157fd512138a797ddfc973ca441067e5 Mon Sep 17 00:00:00 2001 From: Pavel Iakovenko <paveliak@github.com> Date: Thu, 11 Jul 2024 21:52:47 -0400 Subject: [PATCH 2966/3485] Introducing vm_key_file variable for SSH --- images/macos/templates/macOS-12.anka.pkr.hcl | 7 ++++++- images/macos/templates/macOS-13.anka.pkr.hcl | 7 ++++++- images/macos/templates/macOS-13.arm64.anka.pkr.hcl | 7 ++++++- images/macos/templates/macOS-14.anka.pkr.hcl | 7 ++++++- images/macos/templates/macOS-14.arm64.anka.pkr.hcl | 7 ++++++- 5 files changed, 30 insertions(+), 5 deletions(-) diff --git a/images/macos/templates/macOS-12.anka.pkr.hcl b/images/macos/templates/macOS-12.anka.pkr.hcl index 200946859399..8c0b77bcefa4 100644 --- a/images/macos/templates/macOS-12.anka.pkr.hcl +++ b/images/macos/templates/macOS-12.anka.pkr.hcl @@ -53,6 +53,11 @@ variable "vm_password" { sensitive = true } +variable "vm_key_file" { + type = string + default = "" +} + variable "github_api_pat" { type = string default = "" @@ -96,7 +101,7 @@ source "null" "template" { ssh_host = "${var.source_vm_name}" ssh_port = "${var.source_vm_port}" ssh_username = "${var.vm_username}" - ssh_private_key_file = "${var.vm_password}" + ssh_private_key_file = "${var.vm_key_file}" ssh_proxy_host = "${var.socks_proxy}" } diff --git a/images/macos/templates/macOS-13.anka.pkr.hcl b/images/macos/templates/macOS-13.anka.pkr.hcl index 5a358df129dc..fc02bcddb1e9 100644 --- a/images/macos/templates/macOS-13.anka.pkr.hcl +++ b/images/macos/templates/macOS-13.anka.pkr.hcl @@ -53,6 +53,11 @@ variable "vm_password" { sensitive = true } +variable "vm_key_file" { + type = string + default = "" +} + variable "github_api_pat" { type = string default = "" @@ -96,7 +101,7 @@ source "null" "template" { ssh_host = "${var.source_vm_name}" ssh_port = "${var.source_vm_port}" ssh_username = "${var.vm_username}" - ssh_private_key_file = "${var.vm_password}" + ssh_private_key_file = "${var.vm_key_file}" ssh_proxy_host = "${var.socks_proxy}" } diff --git a/images/macos/templates/macOS-13.arm64.anka.pkr.hcl b/images/macos/templates/macOS-13.arm64.anka.pkr.hcl index 7f91b8c19f4b..c59aa823a403 100644 --- a/images/macos/templates/macOS-13.arm64.anka.pkr.hcl +++ b/images/macos/templates/macOS-13.arm64.anka.pkr.hcl @@ -53,6 +53,11 @@ variable "vm_password" { sensitive = true } +variable "vm_key_file" { + type = string + default = "" +} + variable "github_api_pat" { type = string default = "" @@ -97,7 +102,7 @@ source "null" "template" { ssh_host = "${var.source_vm_name}" ssh_port = "${var.source_vm_port}" ssh_username = "${var.vm_username}" - ssh_private_key_file = "${var.vm_password}" + ssh_private_key_file = "${var.vm_key_file}" ssh_proxy_host = "${var.socks_proxy}" } diff --git a/images/macos/templates/macOS-14.anka.pkr.hcl b/images/macos/templates/macOS-14.anka.pkr.hcl index a772f726940b..657ecd90b4fd 100644 --- a/images/macos/templates/macOS-14.anka.pkr.hcl +++ b/images/macos/templates/macOS-14.anka.pkr.hcl @@ -53,6 +53,11 @@ variable "vm_password" { sensitive = true } +variable "vm_key_file" { + type = string + default = "" +} + variable "github_api_pat" { type = string default = "" @@ -96,7 +101,7 @@ source "null" "template" { ssh_host = "${var.source_vm_name}" ssh_port = "${var.source_vm_port}" ssh_username = "${var.vm_username}" - ssh_private_key_file = "${var.vm_password}" + ssh_private_key_file = "${var.vm_key_file}" ssh_proxy_host = "${var.socks_proxy}" } diff --git a/images/macos/templates/macOS-14.arm64.anka.pkr.hcl b/images/macos/templates/macOS-14.arm64.anka.pkr.hcl index 65e4edbbc5e2..cd2a70e75a6f 100644 --- a/images/macos/templates/macOS-14.arm64.anka.pkr.hcl +++ b/images/macos/templates/macOS-14.arm64.anka.pkr.hcl @@ -53,6 +53,11 @@ variable "vm_password" { sensitive = true } +variable "vm_key_file" { + type = string + default = "" +} + variable "github_api_pat" { type = string default = "" @@ -97,7 +102,7 @@ source "null" "template" { ssh_host = "${var.source_vm_name}" ssh_port = "${var.source_vm_port}" ssh_username = "${var.vm_username}" - ssh_private_key_file = "${var.vm_password}" + ssh_private_key_file = "${var.vm_key_file}" ssh_proxy_host = "${var.socks_proxy}" } From d8dce39e5fa208d80fdfbd0171017fece66c0621 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 12 Jul 2024 17:13:06 +0000 Subject: [PATCH 2967/3485] Updating readme file for macos-12 version 20240707.1 (#10196) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-12-Readme.md | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/images/macos/macos-12-Readme.md b/images/macos/macos-12-Readme.md index eb8501443b29..081d7d4b0e50 100644 --- a/images/macos/macos-12-Readme.md +++ b/images/macos/macos-12-Readme.md @@ -6,7 +6,7 @@ # macOS 12 - OS Version: macOS 12.7.5 (21H1222) - Kernel Version: Darwin 21.6.0 -- Image Version: 20240630.1 +- Image Version: 20240707.1 ## Installed Software @@ -25,14 +25,14 @@ - GNU Fortran 14 (Homebrew GCC 14.1.0_1) - available by `gfortran-14` alias - Julia 1.10.4 - Kotlin 2.0.0-release-341 -- Go 1.21.11 +- Go 1.21.12 - Mono 6.12.0.188 - Node.js 18.20.3 - MSBuild 16.10.1.51301 (Mono 6.12.0.188) - NVM 0.39.7 - NVM - Cached node versions: 16.20.2, 18.20.3, 20.15.0 - Perl 5.38.2 -- PHP 8.3.8 +- PHP 8.3.9 - Python 2.7.18 - Python3 3.12.4 - R 4.4.1 @@ -43,15 +43,15 @@ - Carthage 0.39.1 - CocoaPods 1.15.2 - Composer 2.7.7 -- Homebrew 4.3.7 +- Homebrew 4.3.8 - Miniconda 24.5.0 - NPM 10.7.0 - NuGet 6.3.1.1 - Pip 20.3.4 (python 2.7) -- Pip3 24.1.1 (python 3.12) +- Pip3 24.1.2 (python 3.12) - Pipx 1.6.0 - RubyGems 3.5.14 -- Vcpkg 2024 (build from commit afa12e729) +- Vcpkg 2024 (build from commit 576379156) - Yarn 1.22.22 #### Environment variables @@ -99,19 +99,19 @@ ### Tools - App Center CLI 3.0.1 -- AWS CLI 2.17.5 +- AWS CLI 2.17.9 - AWS SAM CLI 1.120.0 -- AWS Session Manager CLI 1.2.633.0 +- AWS Session Manager CLI 1.2.650.0 - Azure CLI 2.61.0 - Azure CLI (azure-devops) 1.0.1 - Bicep CLI 0.28.1 - Cabal 3.10.3.0 -- Cmake 3.29.6 +- Cmake 3.30.0 - CodeQL Action Bundle 2.17.6 - Colima 0.6.9 - Fastlane 2.221.1 - GHC 9.10.1 -- GHCup 0.1.22.0 +- GHCup 0.1.30.0 - Jazzy 0.15.1 - Stack 2.15.7 - SwiftFormat 0.54.0 @@ -130,8 +130,8 @@ - Google Chrome 126.0.6478.127 - Google Chrome for Testing 126.0.6478.126 - ChromeDriver 126.0.6478.126 -- Microsoft Edge 126.0.2592.81 -- Microsoft Edge WebDriver 126.0.2592.81 +- Microsoft Edge 126.0.2592.87 +- Microsoft Edge WebDriver 126.0.2592.87 - Mozilla Firefox 127.0.2 - geckodriver 0.34.0 - Selenium server 4.22.0 @@ -179,8 +179,8 @@ #### Go - 1.20.14 -- 1.21.11 -- 1.22.4 +- 1.21.12 +- 1.22.5 ### Rust Tools - Cargo 1.79.0 @@ -202,13 +202,13 @@ #### PowerShell Modules - Az: 12.0.0 - MarkdownPS: 1.10 -- Pester: 5.6.0 +- Pester: 5.6.1 - PSScriptAnalyzer: 1.22.0 ### Web Servers | Name | Version | ConfigFile | ServiceStatus | ListenPort | | ----- | ------- | ------------------------------- | ------------- | ---------- | -| httpd | 2.4.59 | /usr/local/etc/httpd/httpd.conf | none | 80 | +| httpd | 2.4.61 | /usr/local/etc/httpd/httpd.conf | none | 80 | | nginx | 1.27.0 | /usr/local/etc/nginx/nginx.conf | none | 80 | ### Xamarin From 0dbf1cb8a7118b3b090ce8e35629ff3f132f1c0a Mon Sep 17 00:00:00 2001 From: Pavel Iakovenko <paveliak@github.com> Date: Fri, 12 Jul 2024 16:53:31 -0400 Subject: [PATCH 2968/3485] Switch to the password auth --- images/macos/templates/macOS-12.anka.pkr.hcl | 7 +------ images/macos/templates/macOS-13.anka.pkr.hcl | 7 +------ images/macos/templates/macOS-13.arm64.anka.pkr.hcl | 7 +------ images/macos/templates/macOS-14.anka.pkr.hcl | 7 +------ images/macos/templates/macOS-14.arm64.anka.pkr.hcl | 7 +------ 5 files changed, 5 insertions(+), 30 deletions(-) diff --git a/images/macos/templates/macOS-12.anka.pkr.hcl b/images/macos/templates/macOS-12.anka.pkr.hcl index 8c0b77bcefa4..eb1fff11bf3d 100644 --- a/images/macos/templates/macOS-12.anka.pkr.hcl +++ b/images/macos/templates/macOS-12.anka.pkr.hcl @@ -53,11 +53,6 @@ variable "vm_password" { sensitive = true } -variable "vm_key_file" { - type = string - default = "" -} - variable "github_api_pat" { type = string default = "" @@ -101,7 +96,7 @@ source "null" "template" { ssh_host = "${var.source_vm_name}" ssh_port = "${var.source_vm_port}" ssh_username = "${var.vm_username}" - ssh_private_key_file = "${var.vm_key_file}" + ssh_password = "${var.vm_password}" ssh_proxy_host = "${var.socks_proxy}" } diff --git a/images/macos/templates/macOS-13.anka.pkr.hcl b/images/macos/templates/macOS-13.anka.pkr.hcl index fc02bcddb1e9..7d003d3ec115 100644 --- a/images/macos/templates/macOS-13.anka.pkr.hcl +++ b/images/macos/templates/macOS-13.anka.pkr.hcl @@ -53,11 +53,6 @@ variable "vm_password" { sensitive = true } -variable "vm_key_file" { - type = string - default = "" -} - variable "github_api_pat" { type = string default = "" @@ -101,7 +96,7 @@ source "null" "template" { ssh_host = "${var.source_vm_name}" ssh_port = "${var.source_vm_port}" ssh_username = "${var.vm_username}" - ssh_private_key_file = "${var.vm_key_file}" + ssh_password = "${var.vm_password}" ssh_proxy_host = "${var.socks_proxy}" } diff --git a/images/macos/templates/macOS-13.arm64.anka.pkr.hcl b/images/macos/templates/macOS-13.arm64.anka.pkr.hcl index c59aa823a403..abfd0996f262 100644 --- a/images/macos/templates/macOS-13.arm64.anka.pkr.hcl +++ b/images/macos/templates/macOS-13.arm64.anka.pkr.hcl @@ -53,11 +53,6 @@ variable "vm_password" { sensitive = true } -variable "vm_key_file" { - type = string - default = "" -} - variable "github_api_pat" { type = string default = "" @@ -102,7 +97,7 @@ source "null" "template" { ssh_host = "${var.source_vm_name}" ssh_port = "${var.source_vm_port}" ssh_username = "${var.vm_username}" - ssh_private_key_file = "${var.vm_key_file}" + ssh_password = "${var.vm_password}" ssh_proxy_host = "${var.socks_proxy}" } diff --git a/images/macos/templates/macOS-14.anka.pkr.hcl b/images/macos/templates/macOS-14.anka.pkr.hcl index 657ecd90b4fd..1dc2660358d9 100644 --- a/images/macos/templates/macOS-14.anka.pkr.hcl +++ b/images/macos/templates/macOS-14.anka.pkr.hcl @@ -53,11 +53,6 @@ variable "vm_password" { sensitive = true } -variable "vm_key_file" { - type = string - default = "" -} - variable "github_api_pat" { type = string default = "" @@ -101,7 +96,7 @@ source "null" "template" { ssh_host = "${var.source_vm_name}" ssh_port = "${var.source_vm_port}" ssh_username = "${var.vm_username}" - ssh_private_key_file = "${var.vm_key_file}" + ssh_password = "${var.vm_password}" ssh_proxy_host = "${var.socks_proxy}" } diff --git a/images/macos/templates/macOS-14.arm64.anka.pkr.hcl b/images/macos/templates/macOS-14.arm64.anka.pkr.hcl index cd2a70e75a6f..54414268c6ca 100644 --- a/images/macos/templates/macOS-14.arm64.anka.pkr.hcl +++ b/images/macos/templates/macOS-14.arm64.anka.pkr.hcl @@ -48,11 +48,6 @@ variable "vm_username" { sensitive = true } -variable "vm_password" { - type = string - sensitive = true -} - variable "vm_key_file" { type = string default = "" @@ -102,7 +97,7 @@ source "null" "template" { ssh_host = "${var.source_vm_name}" ssh_port = "${var.source_vm_port}" ssh_username = "${var.vm_username}" - ssh_private_key_file = "${var.vm_key_file}" + ssh_password = "${var.vm_password}" ssh_proxy_host = "${var.socks_proxy}" } From 284ffaacd7b10350a2de0232a2ed75dfa287e54f Mon Sep 17 00:00:00 2001 From: Pavel Iakovenko <paveliak@github.com> Date: Fri, 12 Jul 2024 16:55:10 -0400 Subject: [PATCH 2969/3485] Deleted wrong code --- images/macos/templates/macOS-14.arm64.anka.pkr.hcl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/macos/templates/macOS-14.arm64.anka.pkr.hcl b/images/macos/templates/macOS-14.arm64.anka.pkr.hcl index 54414268c6ca..547c56706580 100644 --- a/images/macos/templates/macOS-14.arm64.anka.pkr.hcl +++ b/images/macos/templates/macOS-14.arm64.anka.pkr.hcl @@ -48,9 +48,9 @@ variable "vm_username" { sensitive = true } -variable "vm_key_file" { +variable "vm_password" { type = string - default = "" + sensitive = true } variable "github_api_pat" { From a58d7b932e216efc39c2e62774236e93fe6b301d Mon Sep 17 00:00:00 2001 From: Pavel Iakovenko <paveliak@github.com> Date: Mon, 15 Jul 2024 09:37:58 -0400 Subject: [PATCH 2970/3485] Add diagnostics to the install-powershell script --- images/macos/scripts/build/install-powershell.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/images/macos/scripts/build/install-powershell.sh b/images/macos/scripts/build/install-powershell.sh index d6c2a9fc8ae9..80b24c036549 100644 --- a/images/macos/scripts/build/install-powershell.sh +++ b/images/macos/scripts/build/install-powershell.sh @@ -10,6 +10,8 @@ echo Installing PowerShell... arch=$(get_arch) metadata_json_path=$(download_with_retry "https://raw.githubusercontent.com/PowerShell/PowerShell/master/tools/metadata.json") +echo $metadata_json_path +cat $metadata_json_path pwshVersionToolset=$(get_toolset_value '.pwsh.version') pwshVersions=$(jq -r '.LTSReleaseTag[]' $metadata_json_path) From adead29f3fa16b6fe7a84821d60c1ef3f9a545c1 Mon Sep 17 00:00:00 2001 From: sarathrajsrinivasan <159180023+sarathrajsrinivasan@users.noreply.github.com> Date: Tue, 16 Jul 2024 22:28:46 -0500 Subject: [PATCH 2971/3485] Update xcode default to 15.4 from 15.0.1 for macos14 --- images/macos/toolsets/toolset-14.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/macos/toolsets/toolset-14.json b/images/macos/toolsets/toolset-14.json index a66f116a5837..af512525740d 100644 --- a/images/macos/toolsets/toolset-14.json +++ b/images/macos/toolsets/toolset-14.json @@ -1,6 +1,6 @@ { "xcode": { - "default": "15.0.1", + "default": "15.4", "x64": { "versions": [ { "link": "16.0", "version": "16.0.0-Beta.2+16A5171r", "install_runtimes": "false", "sha256": "86b4fd563d80c997887d37a528f69161f82987932b5ebe6119ad5dd548352ad3"}, From 95c66e026c53730f4b157e45fb4784870f9c0db2 Mon Sep 17 00:00:00 2001 From: kishorekumar-anchala <168699259+kishorekumar-anchala@users.noreply.github.com> Date: Wed, 17 Jul 2024 15:44:43 +0530 Subject: [PATCH 2972/3485] update google chrome signature (#10243) --- images/windows/scripts/build/Install-Chrome.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/windows/scripts/build/Install-Chrome.ps1 b/images/windows/scripts/build/Install-Chrome.ps1 index 6fe140f3c113..dcc5d665d9ed 100644 --- a/images/windows/scripts/build/Install-Chrome.ps1 +++ b/images/windows/scripts/build/Install-Chrome.ps1 @@ -6,7 +6,7 @@ # Download and install latest Chrome browser Install-Binary ` -Url 'https://dl.google.com/tag/s/dl/chrome/install/googlechromestandaloneenterprise64.msi' ` - -ExpectedSignature '2673EA6CC23BEFFDA49AC715B121544098A1284C' + -ExpectedSignature '607A3EDAA64933E94422FC8F0C80388E0590986C' # Prepare firewall rules Write-Host "Adding the firewall rule for Google update blocking..." From eafe328b908552231d76df27f3b5afbde355d060 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 17 Jul 2024 12:14:43 +0000 Subject: [PATCH 2973/3485] Updating readme file for win22 version 20240714.1.1 (#10229) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/windows/Windows2022-Readme.md | 106 +++++++++++++-------------- 1 file changed, 53 insertions(+), 53 deletions(-) diff --git a/images/windows/Windows2022-Readme.md b/images/windows/Windows2022-Readme.md index 8a78c1428990..0f468c4085ea 100644 --- a/images/windows/Windows2022-Readme.md +++ b/images/windows/Windows2022-Readme.md @@ -3,8 +3,8 @@ | [[Ubuntu, Windows] Docker Compose v1 will be removed from images on July, 29](https://github.com/actions/runner-images/issues/9692) | *** # Windows Server 2022 -- OS Version: 10.0.20348 Build 2529 -- Image Version: 20240707.1.0 +- OS Version: 10.0.20348 Build 2582 +- Image Version: 20240714.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -26,14 +26,14 @@ ### Package Management - Chocolatey 2.3.0 - Composer 2.7.7 -- Helm 3.15.1 +- Helm 3.15.2 - Miniconda 24.5.0 (pre-installed on the image but not added to PATH) - NPM 10.7.0 -- NuGet 6.10.0.107 +- NuGet 6.10.1.5 - pip 24.1.2 (python 3.9) - Pipx 1.6.0 - RubyGems 3.2.33 -- Vcpkg (build from commit 576379156) +- Vcpkg (build from commit 7aeffc910) - Yarn 1.22.22 #### Environment variables @@ -46,7 +46,7 @@ - Ant 1.10.14 - Gradle 8.8 - Maven 3.8.7 -- sbt 1.10.0 +- sbt 1.10.1 ### Tools - 7zip 24.07 @@ -57,7 +57,7 @@ - Bicep 0.28.1 - Cabal 3.12.1.0 - CMake 3.30.0 -- CodeQL Action Bundle 2.17.6 +- CodeQL Action Bundle 2.18.0 - Docker 26.1.3 - Docker Compose v1 1.29.2 - Docker Compose v2 2.27.1 @@ -66,7 +66,7 @@ - Git 2.45.2.windows.1 - Git LFS 3.5.1 - ImageMagick 7.1.1-34 -- InnoSetup 6.3.2 +- InnoSetup 6.3.3 - jq 1.7.1 - Kind 0.23.0 - Kubectl 1.30.2 @@ -78,7 +78,7 @@ - NSIS 3.10 - OpenSSL 1.1.1w - Packer 1.11.0 -- Pulumi 3.122.0 +- Pulumi 3.124.0 - R 4.4.1 - Service Fabric SDK 9.1.1436.9590 - Stack 2.15.7 @@ -91,11 +91,11 @@ - zstd 1.5.6 ### CLI Tools -- Alibaba Cloud CLI 3.0.210 -- AWS CLI 2.17.9 +- Alibaba Cloud CLI 3.0.213 +- AWS CLI 2.17.13 - AWS SAM CLI 1.120.0 - AWS Session Manager CLI 1.2.650.0 -- Azure CLI 2.61.0 +- Azure CLI 2.62.0 - Azure DevOps CLI extension 1.0.1 - GitHub CLI 2.52.0 @@ -116,9 +116,9 @@ ### Browsers and Drivers - Google Chrome 126.0.6478.127 - Chrome Driver 126.0.6478.126 -- Microsoft Edge 126.0.2592.87 -- Microsoft Edge Driver 126.0.2592.87 -- Mozilla Firefox 127.0.2 +- Microsoft Edge 126.0.2592.102 +- Microsoft Edge Driver 126.0.2592.102 +- Mozilla Firefox 128.0 - Gecko Driver 0.34.0 - IE Driver 4.14.0.0 - Selenium server 4.22.0 @@ -165,8 +165,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Node.js - 16.20.2 -- 18.20.3 -- 20.15.0 +- 18.20.4 +- 20.15.1 #### Python - 3.7.9 @@ -205,13 +205,13 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### MongoDB | Version | ServiceName | ServiceStatus | ServiceStartType | | -------- | ----------- | ------------- | ---------------- | -| 5.0.27.0 | MongoDB | Stopped | Disabled | +| 5.0.28.0 | MongoDB | Stopped | Disabled | ### Database tools - Azure CosmosDb Emulator 2.14.18.0 - DacFx 162.3.566.1 - MySQL 8.0.38.0 -- SQL OLEDB Driver 18.7.2.0 +- SQL OLEDB Driver 18.7.4.0 - SQLPS 1.0 ### Web Servers @@ -223,7 +223,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Visual Studio Enterprise 2022 | Name | Version | Path | | ----------------------------- | --------------- | -------------------------------------------------------- | -| Visual Studio Enterprise 2022 | 17.10.35013.160 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | +| Visual Studio Enterprise 2022 | 17.10.35027.167 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | #### Workloads, components and extensions | Package | Version | @@ -258,9 +258,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Component.Xamarin.RemotedSimulator | 17.10.34803.213 | | ios | 17.2.8053.0 | | maccatalyst | 17.2.8053.0 | -| maui.blazor | 8.0.40.0 | -| maui.core | 8.0.40.0 | -| maui.windows | 8.0.40.0 | +| maui.blazor | 8.0.61.10917 | +| maui.core | 8.0.61.10917 | +| maui.windows | 8.0.61.10917 | | Microsoft.Component.Azure.DataLake.Tools | 17.10.34803.213 | | Microsoft.Component.ClickOnce | 17.10.34803.213 | | Microsoft.Component.CodeAnalysis.SDK | 17.10.34803.213 | @@ -284,21 +284,21 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.Net.ComponentGroup.4.8.DeveloperTools | 17.10.34803.213 | | Microsoft.Net.ComponentGroup.DevelopmentPrerequisites | 17.10.34803.213 | | Microsoft.Net.ComponentGroup.TargetingPacks.Common | 17.10.34803.213 | -| microsoft.net.runtime.android | 8.0.524.21615 | -| microsoft.net.runtime.android.aot | 8.0.524.21615 | -| microsoft.net.runtime.android.aot.net7 | 8.0.524.21615 | -| microsoft.net.runtime.android.net7 | 8.0.524.21615 | -| microsoft.net.runtime.ios | 8.0.524.21615 | -| microsoft.net.runtime.ios.net7 | 8.0.524.21615 | -| microsoft.net.runtime.maccatalyst | 8.0.524.21615 | -| microsoft.net.runtime.maccatalyst.net7 | 8.0.524.21615 | -| microsoft.net.runtime.mono.tooling | 8.0.524.21615 | -| microsoft.net.runtime.mono.tooling.net7 | 8.0.524.21615 | -| microsoft.net.sdk.emscripten | 8.0.10.21103 | +| microsoft.net.runtime.android | 8.0.724.31311 | +| microsoft.net.runtime.android.aot | 8.0.724.31311 | +| microsoft.net.runtime.android.aot.net7 | 8.0.724.31311 | +| microsoft.net.runtime.android.net7 | 8.0.724.31311 | +| microsoft.net.runtime.ios | 8.0.724.31311 | +| microsoft.net.runtime.ios.net7 | 8.0.724.31311 | +| microsoft.net.runtime.maccatalyst | 8.0.724.31311 | +| microsoft.net.runtime.maccatalyst.net7 | 8.0.724.31311 | +| microsoft.net.runtime.mono.tooling | 8.0.724.31311 | +| microsoft.net.runtime.mono.tooling.net7 | 8.0.724.31311 | +| microsoft.net.sdk.emscripten | 8.0.10.31301 | | Microsoft.NetCore.Component.DevelopmentTools | 17.10.34803.213 | -| Microsoft.NetCore.Component.Runtime.6.0 | 17.10.35013.160 | -| Microsoft.NetCore.Component.Runtime.8.0 | 17.10.35013.160 | -| Microsoft.NetCore.Component.SDK | 17.10.35013.160 | +| Microsoft.NetCore.Component.Runtime.6.0 | 17.10.35027.167 | +| Microsoft.NetCore.Component.Runtime.8.0 | 17.10.35027.167 | +| Microsoft.NetCore.Component.SDK | 17.10.35027.167 | | Microsoft.NetCore.Component.Web | 17.10.34803.213 | | Microsoft.VisualStudio.Component.AppInsights.Tools | 17.10.34803.213 | | Microsoft.VisualStudio.Component.AspNet | 17.10.34803.213 | @@ -454,11 +454,11 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Workload.Python | 17.10.34803.213 | | Microsoft.VisualStudio.Workload.Universal | 17.10.35004.147 | | Microsoft.VisualStudio.Workload.VisualStudioExtension | 17.10.34803.213 | -| runtimes.ios | 8.0.524.21615 | -| runtimes.ios.net7 | 8.0.524.21615 | -| runtimes.maccatalyst | 8.0.524.21615 | -| runtimes.maccatalyst.net7 | 8.0.524.21615 | -| wasm.tools | 8.0.524.21615 | +| runtimes.ios | 8.0.724.31311 | +| runtimes.ios.net7 | 8.0.724.31311 | +| runtimes.maccatalyst | 8.0.724.31311 | +| runtimes.maccatalyst.net7 | 8.0.724.31311 | +| wasm.tools | 8.0.724.31311 | | ProBITools.MicrosoftAnalysisServicesModelingProjects2022 | 3.0.4 | | ProBITools.MicrosoftReportProjectsforVisualStudio2022 | 3.0.1 | | SSIS.MicrosoftDataToolsIntegrationServices | 1.4 | @@ -488,11 +488,11 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 10.0.22621.0 ### .NET Core Tools -- .NET Core SDK: 6.0.131, 6.0.203, 6.0.321, 6.0.423, 7.0.120, 7.0.203, 7.0.317, 7.0.410, 8.0.302 +- .NET Core SDK: 6.0.132, 6.0.203, 6.0.321, 6.0.424, 7.0.120, 7.0.203, 7.0.317, 7.0.410, 8.0.303 - .NET Framework: 4.8, 4.8.1 -- Microsoft.AspNetCore.App: 6.0.5, 6.0.26, 6.0.29, 6.0.31, 7.0.5, 7.0.20, 8.0.6 -- Microsoft.NETCore.App: 6.0.5, 6.0.26, 6.0.29, 6.0.31, 7.0.5, 7.0.20, 8.0.6 -- Microsoft.WindowsDesktop.App: 6.0.5, 6.0.26, 6.0.31, 7.0.5, 7.0.20, 8.0.6 +- Microsoft.AspNetCore.App: 6.0.5, 6.0.26, 6.0.32, 7.0.5, 7.0.20, 8.0.7 +- Microsoft.NETCore.App: 6.0.5, 6.0.26, 6.0.32, 7.0.5, 7.0.20, 8.0.7 +- Microsoft.WindowsDesktop.App: 6.0.5, 6.0.26, 6.0.32, 7.0.5, 7.0.20, 8.0.7 - nbgv 3.6.139+a9e8765620 ### PowerShell Tools @@ -504,7 +504,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - AzureRM: 2.1.0 (Default), 6.13.1 - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.614 +- AWSPowershell: 4.1.618 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.10 - Microsoft.Graph: 2.20.0 @@ -524,7 +524,7 @@ All other versions are saved but not installed. | Package Name | Version | | -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 8.0 | -| Android Emulator | 34.2.15 | +| Android Emulator | 34.2.16 | | Android SDK Build-tools | 35.0.0<br>34.0.0<br>33.0.0 33.0.1 33.0.2 33.0.3<br>32.0.0<br>31.0.0 | | Android SDK Platforms | android-35 (rev 1)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1) | | Android SDK Platform-Tools | 35.0.1 | @@ -547,9 +547,9 @@ All other versions are saved but not installed. ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2022 | sha256:4facc7844cdbbdca6d7e7a1c5f4339e327007727629d849521792eb8daf6c196 | 2024-06-21 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2022 | sha256:50d36436c9de72c01919d26aa4ae23e7aab99fbb90aa428eac91f312367df341 | 2024-06-21 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:190a72ac933d75741d402f38ba3e8791235cd5fa8df851b80f87950e617da93c | 2024-06-21 | -| mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:31c8aa02d47af7d65c11da9c3a279c8407c32afd3fc6bec2e9a544db8e3715b3 | 2024-06-19 | -| mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:92c6ddbf87a6d6696a83f26e3df912983477844e22dd686c3e82bac4cf5b49c2 | 2024-06-19 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2022 | sha256:4ad6f775ab425cf19af5c344750e3e259adce5a83f667ab1c9c2106e3e543cb7 | 2024-07-09 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2022 | sha256:027fcd5a8a9be004399d3fbfab686d6610cae98783a06cad65c29cb934d4fe09 | 2024-07-09 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:b251ff756b66294a276d26e0ddf04a8bdef1f3c15f888884a8caa207885c60ba | 2024-07-09 | +| mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:cc9f6a1334190c1f18a905f56d285132e562a9a1ce18ff9476cfaf95194aa0b7 | 2024-07-03 | +| mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:581d6056a224ef0b898e3b87982275b1c63c7ff90108f058d81842254f8b914c | 2024-07-03 | From 4ac220f58470134ca1b1dee0a7cd94757e087cc9 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 17 Jul 2024 13:11:10 +0000 Subject: [PATCH 2974/3485] Updating readme file for ubuntu20 version 20240714.1.1 (#10235) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2004-Readme.md | 50 +++++++++++++++--------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/images/ubuntu/Ubuntu2004-Readme.md b/images/ubuntu/Ubuntu2004-Readme.md index 23cfffcf2a94..0f02680ab383 100644 --- a/images/ubuntu/Ubuntu2004-Readme.md +++ b/images/ubuntu/Ubuntu2004-Readme.md @@ -6,7 +6,7 @@ # Ubuntu 20.04 - OS Version: 20.04.6 LTS - Kernel Version: 5.15.0-1067-azure -- Image Version: 20240708.1.0 +- Image Version: 20240714.1.0 - Systemd version: 245.4-4ubuntu3.23 ## Installed Software @@ -25,7 +25,7 @@ - Kotlin 2.0.0-release-341 - Mono 6.12.0.200 - MSBuild 16.10.1.31701 (Mono 6.12.0.200) -- Node.js 18.20.3 +- Node.js 18.20.4 - Perl 5.30.0 - Python 3.8.10 - Ruby 2.7.0p0 @@ -33,7 +33,7 @@ ### Package Management - cpan 1.64 -- Helm 3.15.2 +- Helm 3.15.3 - Homebrew 4.3.9 - Miniconda 24.5.0 - Npm 10.7.0 @@ -42,7 +42,7 @@ - Pip3 20.0.2 - Pipx 1.6.0 - RubyGems 3.1.2 -- Vcpkg (build from commit 576379156) +- Vcpkg (build from commit 7aeffc910) - Yarn 1.22.22 #### Environment variables @@ -61,7 +61,7 @@ to accomplish this. ### Project Management - Ant 1.10.7 -- Gradle 8.8 +- Gradle 8.9 - Lerna 8.1.6 - Maven 3.8.8 - Sbt 1.10.1 @@ -75,11 +75,11 @@ to accomplish this. - Bicep 0.28.1 - Buildah 1.22.3 - CMake 3.30.0 -- CodeQL Action Bundle 2.17.6 +- CodeQL Action Bundle 2.18.0 - Docker Amazon ECR Credential Helper 0.8.0 - Docker Compose v1 1.29.2 - Docker Compose v2 2.27.1 -- Docker-Buildx 0.15.1 +- Docker-Buildx 0.16.0 - Docker Client 26.1.3 - Docker Server 26.1.3 - Fastlane 2.221.1 @@ -105,29 +105,29 @@ to accomplish this. - Parcel 2.12.0 - PhantomJS 2.1.1 2.1.1 - Podman 3.4.2 -- Pulumi 3.122.0 +- Pulumi 3.124.0 - R 4.4.1 - Skopeo 1.5.0 - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 -- Terraform 1.9.1 +- Terraform 1.9.2 - yamllint 1.35.1 - yq 4.44.2 - zstd 1.5.6 ### CLI Tools - Alibaba Cloud CLI 3.0.174 -- AWS CLI 2.17.9 +- AWS CLI 2.17.13 - AWS CLI Session Manager Plugin 1.2.650.0 - AWS SAM CLI 1.120.0 -- Azure CLI 2.61.0 +- Azure CLI 2.62.0 - Azure CLI (azure-devops) 1.0.1 - GitHub CLI 2.52.0 - Google Cloud CLI 483.0.0 -- Netlify CLI 17.33.0 +- Netlify CLI 17.33.3 - OpenShift CLI 4.15.19 - ORAS CLI 1.2.0 -- Vercel CLI 34.3.0 +- Vercel CLI 34.3.1 ### Java | Version | Environment Variable | @@ -140,7 +140,7 @@ to accomplish this. ### PHP Tools - PHP: 7.4.33, 8.0.30, 8.1.29, 8.2.21, 8.3.9 - Composer 2.7.7 -- PHPUnit 8.5.38 +- PHPUnit 8.5.39 ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ``` @@ -169,10 +169,10 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Google Chrome 126.0.6478.126 - ChromeDriver 126.0.6478.126 - Chromium 126.0.6478.0 -- Microsoft Edge 126.0.2592.87 -- Microsoft Edge WebDriver 126.0.2592.87 +- Microsoft Edge 126.0.2592.102 +- Microsoft Edge WebDriver 126.0.2592.102 - Selenium server 4.22.0 -- Mozilla Firefox 127.0.2 +- Mozilla Firefox 128.0 - Geckodriver 0.34.0 #### Environment variables @@ -184,7 +184,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | ### .NET Tools -- .NET Core SDK: 6.0.423, 7.0.410, 8.0.301 +- .NET Core SDK: 6.0.424, 7.0.410, 8.0.303 - nbgv 3.6.139+a9e8765620 ### Databases @@ -221,8 +221,8 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Node.js - 16.20.2 -- 18.20.3 -- 20.15.0 +- 18.20.4 +- 20.15.1 #### Python - 3.7.17 @@ -294,13 +294,13 @@ Use the following command as a part of your job to start the service: 'sudo syst | debian:10 | sha256:58ce6f1271ae1c8a2006ff7d3e54e9874d839f573d8009c20154ad0f2fb0a225 | 2024-06-13 | | debian:11 | sha256:b6b4a479a3bc1b8dfda5544f00b72aafb230bb835a43974a147b220c38df882e | 2024-07-02 | | debian:9 | sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be | 2022-06-23 | -| moby/buildkit:latest | sha256:5d410bbb6d22b01fcaead1345936c5e0a0963eb6c3b190e38694e015467640fe | 2024-06-18 | +| moby/buildkit:latest | sha256:33fe47b4c06972ac6720a7ee34d6fdea3b61972f81bcc9b1f73e46ed2a090fa1 | 2024-07-11 | | node:16 | sha256:f77a1aef2da8d83e45ec990f45df50f1a286c5fe8bbfb8c6e4246c6389705c0b | 2023-09-07 | | node:16-alpine | sha256:a1f9d027912b58a7c75be7716c97cfbc6d3099f3a97ed84aa490be9dee20e787 | 2023-08-10 | -| node:18 | sha256:70ae166dcb03837ebe1abbb78919a1a4bdc79cc970344d56f33b6c753f4b46cc | 2024-05-21 | -| node:18-alpine | sha256:e37da457874383fa9217067867ec85fe8fe59f0bfa351ec9752a95438680056e | 2024-06-04 | -| node:20 | sha256:93d2e801dabc677ea0b30b47d3d729fab63ecb20be7ac0ab204cc3c65731297a | 2024-06-24 | -| node:20-alpine | sha256:df01469346db2bf1cfc1f7261aeab86b2960efa840fe2bd46d83ff339f463665 | 2024-06-24 | +| node:18 | sha256:aabbaf118c7c0a6e9a3bda69bd2a94b0f6c4150bf80c501ef1c87ffcb5687365 | 2024-07-09 | +| node:18-alpine | sha256:1edb14175eeb14a14a3abe059339cbd97a0bbb76b6a210d2bb395d63fa4bc4ef | 2024-07-09 | +| node:20 | sha256:786005cf39792f7046bcd66491056c26d2dbcc669c072d1a1e4ef4fcdddd26eb | 2024-07-09 | +| node:20-alpine | sha256:34b7aa411056c85dbf71d240d26516949b3f72b318d796c26b57caaa1df5639a | 2024-07-09 | | ubuntu:20.04 | sha256:0b897358ff6624825fb50d20ffb605ab0eaea77ced0adb8c6a4b756513dec6fc | 2024-06-03 | ### Installed apt packages From 380b0afd7e430036cbcb77064aecb2d73b9d5fb6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 17 Jul 2024 13:31:05 +0000 Subject: [PATCH 2975/3485] Updating readme file for ubuntu24 version 20240714.1.1 (#10230) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2404-Readme.md | 34 +++++++++++++++--------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/images/ubuntu/Ubuntu2404-Readme.md b/images/ubuntu/Ubuntu2404-Readme.md index 30b26417c1c6..ce894a517668 100644 --- a/images/ubuntu/Ubuntu2404-Readme.md +++ b/images/ubuntu/Ubuntu2404-Readme.md @@ -6,7 +6,7 @@ # Ubuntu 24.04 LTS - OS Version: 24.04 LTS - Kernel Version: 6.8.0-1009-azure -- Image Version: 20240707.1.0 +- Image Version: 20240714.1.0 - Systemd version: 255.4-1ubuntu8.1 ## Installed Software @@ -20,22 +20,22 @@ - GNU C++: 12.3.0, 13.2.0, 14.0.1 - GNU Fortran: 12.3.0, 13.2.0, 14.0.1 - Julia 1.10.4 -- Node.js 20.15.0 +- Node.js 20.15.1 - Perl 5.38.2 - Python 3.12.3 - Ruby 3.2.3 ### Package Management - cpan 1.64 -- Helm 3.15.2 -- Homebrew 4.3.8 +- Helm 3.15.3 +- Homebrew 4.3.9 - Miniconda 24.5.0 - Npm 10.7.0 - Pip 24.0 - Pip3 24.0 - Pipx 1.4.3 - RubyGems 3.4.20 -- Vcpkg (build from commit 576379156) +- Vcpkg (build from commit 7aeffc910) - Yarn 1.22.22 #### Environment variables @@ -54,7 +54,7 @@ to accomplish this. ### Project Management - Ant 1.10.14 -- Gradle 8.8 +- Gradle 8.9 - Lerna 8.1.6 - Maven 3.8.8 @@ -66,10 +66,10 @@ to accomplish this. - Bicep 0.28.1 - Buildah 1.33.7 - CMake 3.30.0 -- CodeQL Action Bundle 2.17.6 +- CodeQL Action Bundle 2.18.0 - Docker Amazon ECR Credential Helper 0.8.0 - Docker Compose v2 2.27.1 -- Docker-Buildx 0.15.1 +- Docker-Buildx 0.16.0 - Docker Client 26.1.3 - Docker Server 26.1.3 - Fastlane 2.221.1 @@ -89,7 +89,7 @@ to accomplish this. - OpenSSL 3.0.13-0ubuntu3.1 - Parcel 2.12.0 - Podman 4.9.3 -- Pulumi 3.122.0 +- Pulumi 3.124.0 - Skopeo 1.13.3 - Sphinx Open Source Search Server 2.2.11 - yamllint 1.35.1 @@ -97,10 +97,10 @@ to accomplish this. - zstd 1.5.6 ### CLI Tools -- AWS CLI 2.17.9 +- AWS CLI 2.17.13 - AWS CLI Session Manager Plugin 1.2.650.0 - AWS SAM CLI 1.120.0 -- Azure CLI 2.61.0 +- Azure CLI 2.62.0 - Azure CLI (azure-devops) 1.0.1 - GitHub CLI 2.52.0 @@ -115,7 +115,7 @@ to accomplish this. ### PHP Tools - PHP: 8.3.6 - Composer 2.7.7 -- PHPUnit 8.5.38 +- PHPUnit 8.5.39 ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ``` @@ -150,7 +150,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | ### .NET Tools -- .NET Core SDK: 8.0.105 +- .NET Core SDK: 8.0.107 - nbgv 3.6.139+a9e8765620 ### Databases @@ -182,8 +182,8 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Node.js - 16.20.2 -- 18.20.3 -- 20.15.0 +- 18.20.4 +- 20.15.1 #### Python - 3.9.19 @@ -272,7 +272,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | mercurial | 6.7.2-1ubuntu2 | | net-tools | 2.10-0.1ubuntu4 | | netcat | 1.226-1ubuntu2 | -| openssh-client | 1:9.6p1-3ubuntu13.3 | +| openssh-client | 1:9.6p1-3ubuntu13.4 | | p7zip-full | 16.02+transitional.1 | | p7zip-rar | 16.02+transitional.1 | | parallel | 20231122+ds-1 | @@ -286,7 +286,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | shellcheck | 0.9.0-1 | | sphinxsearch | 2.2.11-8build1 | | sqlite3 | 3.45.1-1ubuntu2 | -| ssh | 1:9.6p1-3ubuntu13.3 | +| ssh | 1:9.6p1-3ubuntu13.4 | | sshpass | 1.09-1 | | sudo | 1.9.15p5-3ubuntu5 | | swig | 4.2.0-2ubuntu1 | From c2c7c501c828d25ead9fa708c055352ea47201c5 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 17 Jul 2024 15:09:53 +0000 Subject: [PATCH 2976/3485] Updating readme file for ubuntu22 version 20240714.1.1 (#10232) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2204-Readme.md | 54 +++++++++++++++--------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/images/ubuntu/Ubuntu2204-Readme.md b/images/ubuntu/Ubuntu2204-Readme.md index ae865065b658..272610111727 100644 --- a/images/ubuntu/Ubuntu2204-Readme.md +++ b/images/ubuntu/Ubuntu2204-Readme.md @@ -6,7 +6,7 @@ # Ubuntu 22.04 - OS Version: 22.04.4 LTS - Kernel Version: 6.5.0-1023-azure -- Image Version: 20240708.1.0 +- Image Version: 20240714.1.0 - Systemd version: 249.11-0ubuntu3.12 ## Installed Software @@ -23,7 +23,7 @@ - Kotlin 2.0.0-release-341 - Mono 6.12.0.200 - MSBuild 16.10.1.31701 (Mono 6.12.0.200) -- Node.js 18.20.3 +- Node.js 18.20.4 - Perl 5.34.0 - Python 3.10.12 - Ruby 3.0.2p107 @@ -31,7 +31,7 @@ ### Package Management - cpan 1.64 -- Helm 3.15.2 +- Helm 3.15.3 - Homebrew 4.3.9 - Miniconda 24.5.0 - Npm 10.7.0 @@ -40,7 +40,7 @@ - Pip3 22.0.2 - Pipx 1.6.0 - RubyGems 3.3.5 -- Vcpkg (build from commit 576379156) +- Vcpkg (build from commit 7aeffc910) - Yarn 1.22.22 #### Environment variables @@ -59,7 +59,7 @@ to accomplish this. ### Project Management - Ant 1.10.12 -- Gradle 8.8 +- Gradle 8.9 - Lerna 8.1.6 - Maven 3.8.8 - Sbt 1.10.1 @@ -73,11 +73,11 @@ to accomplish this. - Bicep 0.28.1 - Buildah 1.23.1 - CMake 3.30.0 -- CodeQL Action Bundle 2.17.6 +- CodeQL Action Bundle 2.18.0 - Docker Amazon ECR Credential Helper 0.8.0 - Docker Compose v1 1.29.2 - Docker Compose v2 2.27.1 -- Docker-Buildx 0.15.1 +- Docker-Buildx 0.16.0 - Docker Client 26.1.3 - Docker Server 26.1.3 - Fastlane 2.221.1 @@ -101,29 +101,29 @@ to accomplish this. - Packer 1.11.1 - Parcel 2.12.0 - Podman 3.4.4 -- Pulumi 3.122.0 +- Pulumi 3.124.0 - R 4.4.1 - Skopeo 1.4.1 - Sphinx Open Source Search Server 2.2.11 - SVN 1.14.1 -- Terraform 1.9.1 +- Terraform 1.9.2 - yamllint 1.35.1 - yq 4.44.2 - zstd 1.5.6 ### CLI Tools -- Alibaba Cloud CLI 3.0.211 -- AWS CLI 2.17.9 +- Alibaba Cloud CLI 3.0.213 +- AWS CLI 2.17.13 - AWS CLI Session Manager Plugin 1.2.650.0 - AWS SAM CLI 1.120.0 -- Azure CLI 2.61.0 +- Azure CLI 2.62.0 - Azure CLI (azure-devops) 1.0.1 - GitHub CLI 2.52.0 - Google Cloud CLI 483.0.0 -- Netlify CLI 17.33.0 -- OpenShift CLI 4.16.1 +- Netlify CLI 17.33.3 +- OpenShift CLI 4.16.2 - ORAS CLI 1.2.0 -- Vercel CLI 34.3.0 +- Vercel CLI 34.3.1 ### Java | Version | Environment Variable | @@ -136,7 +136,7 @@ to accomplish this. ### PHP Tools - PHP: 8.1.2 - Composer 2.7.7 -- PHPUnit 8.5.38 +- PHPUnit 8.5.39 ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ``` @@ -165,10 +165,10 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Google Chrome 126.0.6478.126 - ChromeDriver 126.0.6478.126 - Chromium 126.0.6478.0 -- Microsoft Edge 126.0.2592.87 -- Microsoft Edge WebDriver 126.0.2592.87 +- Microsoft Edge 126.0.2592.102 +- Microsoft Edge WebDriver 126.0.2592.102 - Selenium server 4.22.0 -- Mozilla Firefox 127.0.2 +- Mozilla Firefox 128.0 - Geckodriver 0.34.0 #### Environment variables @@ -180,7 +180,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | ### .NET Tools -- .NET Core SDK: 6.0.423, 7.0.410, 8.0.302 +- .NET Core SDK: 6.0.424, 7.0.410, 8.0.303 - nbgv 3.6.139+a9e8765620 ### Databases @@ -216,8 +216,8 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Node.js - 16.20.2 -- 18.20.3 -- 20.15.0 +- 18.20.4 +- 20.15.1 #### Python - 3.7.17 @@ -284,13 +284,13 @@ Use the following command as a part of your job to start the service: 'sudo syst | alpine:3.19 | sha256:af4785ccdbcd5cde71bfd5b93eabd34250b98651f19fe218c91de6c8d10e21c5 | 2024-06-20 | | debian:10 | sha256:58ce6f1271ae1c8a2006ff7d3e54e9874d839f573d8009c20154ad0f2fb0a225 | 2024-06-13 | | debian:11 | sha256:b6b4a479a3bc1b8dfda5544f00b72aafb230bb835a43974a147b220c38df882e | 2024-07-02 | -| moby/buildkit:latest | sha256:5d410bbb6d22b01fcaead1345936c5e0a0963eb6c3b190e38694e015467640fe | 2024-06-18 | +| moby/buildkit:latest | sha256:33fe47b4c06972ac6720a7ee34d6fdea3b61972f81bcc9b1f73e46ed2a090fa1 | 2024-07-11 | | node:16 | sha256:f77a1aef2da8d83e45ec990f45df50f1a286c5fe8bbfb8c6e4246c6389705c0b | 2023-09-07 | | node:16-alpine | sha256:a1f9d027912b58a7c75be7716c97cfbc6d3099f3a97ed84aa490be9dee20e787 | 2023-08-10 | -| node:18 | sha256:70ae166dcb03837ebe1abbb78919a1a4bdc79cc970344d56f33b6c753f4b46cc | 2024-05-21 | -| node:18-alpine | sha256:e37da457874383fa9217067867ec85fe8fe59f0bfa351ec9752a95438680056e | 2024-06-04 | -| node:20 | sha256:93d2e801dabc677ea0b30b47d3d729fab63ecb20be7ac0ab204cc3c65731297a | 2024-06-24 | -| node:20-alpine | sha256:df01469346db2bf1cfc1f7261aeab86b2960efa840fe2bd46d83ff339f463665 | 2024-06-24 | +| node:18 | sha256:aabbaf118c7c0a6e9a3bda69bd2a94b0f6c4150bf80c501ef1c87ffcb5687365 | 2024-07-09 | +| node:18-alpine | sha256:1edb14175eeb14a14a3abe059339cbd97a0bbb76b6a210d2bb395d63fa4bc4ef | 2024-07-09 | +| node:20 | sha256:786005cf39792f7046bcd66491056c26d2dbcc669c072d1a1e4ef4fcdddd26eb | 2024-07-09 | +| node:20-alpine | sha256:34b7aa411056c85dbf71d240d26516949b3f72b318d796c26b57caaa1df5639a | 2024-07-09 | | ubuntu:20.04 | sha256:0b897358ff6624825fb50d20ffb605ab0eaea77ced0adb8c6a4b756513dec6fc | 2024-06-03 | | ubuntu:22.04 | sha256:340d9b015b194dc6e2a13938944e0d016e57b9679963fdeb9ce021daac430221 | 2024-06-27 | From 23541a17f08d50ebcd70b45123027583c5fae808 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 17 Jul 2024 15:53:49 +0000 Subject: [PATCH 2977/3485] Updating readme file for macos-13 version 20240714.1 (#10227) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-13-Readme.md | 67 +++++++++++++++++---------------- 1 file changed, 34 insertions(+), 33 deletions(-) diff --git a/images/macos/macos-13-Readme.md b/images/macos/macos-13-Readme.md index 2c997b989b77..ed8b7c4e7dbe 100644 --- a/images/macos/macos-13-Readme.md +++ b/images/macos/macos-13-Readme.md @@ -1,54 +1,55 @@ | Announcements | |-| +| [[macOS] GCC 11 will be removed from all macOS images on August 12](https://github.com/actions/runner-images/issues/10213) | | [[macOS] Default Xcode on macOS 14 Sonoma will be set to Xcode 15.4 on July, 22](https://github.com/actions/runner-images/issues/10121) | | [[macOS] Default Xcode on macOS 13 Ventura will be set to Xcode 15.2 on July, 15](https://github.com/actions/runner-images/issues/10120) | *** # macOS 13 -- OS Version: macOS 13.6.7 (22G810) +- OS Version: macOS 13.6.7 (22G720) - Kernel Version: Darwin 22.6.0 -- Image Version: 20240707.2 +- Image Version: 20240714.1 ## Installed Software ### Language and Runtime -- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.410, 8.0.101, 8.0.204, 8.0.302 +- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.410, 8.0.101, 8.0.204, 8.0.303 - Bash 3.2.57(1)-release - Clang/LLVM 14.0.0 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` - GCC 11 (Homebrew GCC 11.4.0) - available by `gcc-11` alias - GCC 12 (Homebrew GCC 12.4.0) - available by `gcc-12` alias - GCC 13 (Homebrew GCC 13.3.0) - available by `gcc-13` alias -- GCC 14 (Homebrew GCC 14.1.0_1) - available by `gcc-14` alias +- GCC 14 (Homebrew GCC 14.1.0_2) - available by `gcc-14` alias - GNU Fortran 11 (Homebrew GCC 11.4.0) - available by `gfortran-11` alias - GNU Fortran 12 (Homebrew GCC 12.4.0) - available by `gfortran-12` alias - GNU Fortran 13 (Homebrew GCC 13.3.0) - available by `gfortran-13` alias -- GNU Fortran 14 (Homebrew GCC 14.1.0_1) - available by `gfortran-14` alias +- GNU Fortran 14 (Homebrew GCC 14.1.0_2) - available by `gfortran-14` alias - Kotlin 2.0.0-release-341 - Mono 6.12.0.188 -- Node.js 20.15.0 +- Node.js 20.15.1 - Perl 5.38.2 - PHP 8.3.9 - Python3 3.12.4 - Ruby 3.0.7p220 ### Package Management -- Bundler 2.5.14 +- Bundler 2.5.15 - Carthage 0.39.1 - CocoaPods 1.15.2 - Composer 2.7.7 -- Homebrew 4.3.8 +- Homebrew 4.3.9 - NPM 10.7.0 - NuGet 6.3.1.1 - Pip3 24.1.2 (python 3.12) - Pipx 1.6.0 -- RubyGems 3.5.14 -- Vcpkg 2024 (build from commit 576379156) +- RubyGems 3.5.15 +- Vcpkg 2024 (build from commit 7aeffc910) - Yarn 1.22.22 ### Project Management - Apache Ant 1.10.14 - Apache Maven 3.9.8 -- Gradle 8.8 +- Gradle 8.9 ### Utilities - 7-Zip 17.05 @@ -72,17 +73,17 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.17.9 +- AWS CLI 2.17.13 - AWS SAM CLI 1.120.0 - AWS Session Manager CLI 1.2.650.0 -- Azure CLI 2.61.0 +- Azure CLI 2.62.0 - Azure CLI (azure-devops) 1.0.1 - Bicep CLI 0.28.1 - Cmake 3.30.0 -- CodeQL Action Bundle 2.17.6 +- CodeQL Action Bundle 2.18.0 - Fastlane 2.221.1 -- SwiftFormat 0.54.0 -- Xcbeautify 2.4.0 +- SwiftFormat 0.54.1 +- Xcbeautify 2.4.1 - Xcode Command Line Tools 14.3.1.0.1.1683849156 - Xcodes 1.5.0 @@ -90,14 +91,14 @@ - SwiftLint 0.55.1 ### Browsers -- Safari 18.0 (18619.1.18.111.4) -- SafariDriver 18.0 (18619.1.18.111.4) +- Safari 17.5 (18618.2.12.111.5) +- SafariDriver 17.5 (18618.2.12.111.5) - Google Chrome 126.0.6478.127 - Google Chrome for Testing 126.0.6478.126 - ChromeDriver 126.0.6478.126 -- Microsoft Edge 126.0.2592.87 -- Microsoft Edge WebDriver 126.0.2592.87 -- Mozilla Firefox 127.0.2 +- Microsoft Edge 126.0.2592.102 +- Microsoft Edge WebDriver 126.0.2592.102 +- Mozilla Firefox 128.0 - geckodriver 0.34.0 - Selenium server 4.22.0 @@ -138,8 +139,8 @@ #### Node.js - 16.20.2 -- 18.20.3 -- 20.15.0 +- 18.20.4 +- 20.15.1 #### Go - 1.20.14 @@ -160,19 +161,19 @@ - PowerShell 7.4.3 #### PowerShell Modules -- Az: 12.0.0 +- Az: 12.1.0 - Pester: 5.6.1 - PSScriptAnalyzer: 1.22.0 ### Xcode -| Version | Build | Path | -| ---------------- | ------- | ------------------------------ | -| 15.2 | 15C500b | /Applications/Xcode_15.2.app | -| 15.1 | 15C65 | /Applications/Xcode_15.1.app | -| 15.0.1 (default) | 15A507 | /Applications/Xcode_15.0.1.app | -| 14.3.1 | 14E300c | /Applications/Xcode_14.3.1.app | -| 14.2 | 14C18 | /Applications/Xcode_14.2.app | -| 14.1 | 14B47b | /Applications/Xcode_14.1.app | +| Version | Build | Path | +| -------------- | ------- | ------------------------------ | +| 15.2 (default) | 15C500b | /Applications/Xcode_15.2.app | +| 15.1 | 15C65 | /Applications/Xcode_15.1.app | +| 15.0.1 | 15A507 | /Applications/Xcode_15.0.1.app | +| 14.3.1 | 14E300c | /Applications/Xcode_14.3.1.app | +| 14.2 | 14C18 | /Applications/Xcode_14.2.app | +| 14.1 | 14B47b | /Applications/Xcode_14.1.app | #### Installed SDKs | SDK | SDK Name | Xcode Version | @@ -240,7 +241,7 @@ | Package Name | Version | | -------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 11.0 | -| Android Emulator | 34.2.15 | +| Android Emulator | 34.2.16 | | Android SDK Build-tools | 35.0.0<br>34.0.0<br>33.0.2 33.0.3 | | Android SDK Platforms | android-35 (rev 1)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | | Android SDK Platform-Tools | 35.0.1 | From 9f23838ebe53ed6cbf269fe9c25bd0e4bc4162ce Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 17 Jul 2024 15:57:25 +0000 Subject: [PATCH 2978/3485] Updating readme file for macos-14 version 20240714.2 (#10233) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-14-Readme.md | 49 +++++++++++++++++---------------- 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/images/macos/macos-14-Readme.md b/images/macos/macos-14-Readme.md index f2d4afa0be83..d199f1fc3c86 100644 --- a/images/macos/macos-14-Readme.md +++ b/images/macos/macos-14-Readme.md @@ -1,38 +1,39 @@ | Announcements | |-| +| [[macOS] GCC 11 will be removed from all macOS images on August 12](https://github.com/actions/runner-images/issues/10213) | | [[macOS] Default Xcode on macOS 14 Sonoma will be set to Xcode 15.4 on July, 22](https://github.com/actions/runner-images/issues/10121) | | [[macOS] Default Xcode on macOS 13 Ventura will be set to Xcode 15.2 on July, 15](https://github.com/actions/runner-images/issues/10120) | *** # macOS 14 - OS Version: macOS 14.5 (23F79) - Kernel Version: Darwin 23.5.0 -- Image Version: 20240708.1 +- Image Version: 20240714.2 ## Installed Software ### Language and Runtime -- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.410, 8.0.101, 8.0.204, 8.0.302 +- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.410, 8.0.101, 8.0.204, 8.0.303 - Bash 3.2.57(1)-release - Clang/LLVM 14.0.3 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` - GCC 11 (Homebrew GCC 11.4.0) - available by `gcc-11` alias - GCC 12 (Homebrew GCC 12.4.0) - available by `gcc-12` alias - GCC 13 (Homebrew GCC 13.3.0) - available by `gcc-13` alias -- GCC 14 (Homebrew GCC 14.1.0_1) - available by `gcc-14` alias +- GCC 14 (Homebrew GCC 14.1.0_2) - available by `gcc-14` alias - GNU Fortran 11 (Homebrew GCC 11.4.0) - available by `gfortran-11` alias - GNU Fortran 12 (Homebrew GCC 12.4.0) - available by `gfortran-12` alias - GNU Fortran 13 (Homebrew GCC 13.3.0) - available by `gfortran-13` alias -- GNU Fortran 14 (Homebrew GCC 14.1.0_1) - available by `gfortran-14` alias +- GNU Fortran 14 (Homebrew GCC 14.1.0_2) - available by `gfortran-14` alias - Kotlin 2.0.0-release-341 - Mono 6.12.0.188 -- Node.js 20.15.0 +- Node.js 20.15.1 - Perl 5.38.2 - PHP 8.3.9 - Python3 3.12.4 - Ruby 3.0.7p220 ### Package Management -- Bundler 2.5.14 +- Bundler 2.5.15 - Carthage 0.39.1 - CocoaPods 1.15.2 - Composer 2.7.7 @@ -41,13 +42,13 @@ - NuGet 6.3.1.1 - Pip3 24.1.2 (python 3.12) - Pipx 1.6.0 -- RubyGems 3.5.14 +- RubyGems 3.5.15 - Yarn 1.22.22 ### Project Management - Apache Ant 1.10.14 - Apache Maven 3.9.8 -- Gradle 8.8 +- Gradle 8.9 ### Utilities - 7-Zip 17.05 @@ -71,17 +72,17 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.17.9 +- AWS CLI 2.17.13 - AWS SAM CLI 1.120.0 - AWS Session Manager CLI 1.2.650.0 -- Azure CLI 2.61.0 +- Azure CLI 2.62.0 - Azure CLI (azure-devops) 1.0.1 - Bicep CLI 0.28.1 - Cmake 3.30.0 -- CodeQL Action Bundle 2.17.6 +- CodeQL Action Bundle 2.18.0 - Fastlane 2.221.1 -- SwiftFormat 0.54.0 -- Xcbeautify 2.4.0 +- SwiftFormat 0.54.1 +- Xcbeautify 2.4.1 - Xcode Command Line Tools 15.3.0.0.1.1708646388 - Xcodes 1.5.0 @@ -94,9 +95,9 @@ - Google Chrome 126.0.6478.127 - Google Chrome for Testing 126.0.6478.126 - ChromeDriver 126.0.6478.126 -- Microsoft Edge 126.0.2592.87 -- Microsoft Edge WebDriver 126.0.2592.87 -- Mozilla Firefox 127.0.2 +- Microsoft Edge 126.0.2592.102 +- Microsoft Edge WebDriver 126.0.2592.102 +- Mozilla Firefox 128.0 - geckodriver 0.34.0 - Selenium server 4.22.0 @@ -128,8 +129,8 @@ - 3.12.4 #### Node.js -- 18.20.3 -- 20.15.0 +- 18.20.4 +- 20.15.1 #### Go - 1.20.14 @@ -150,7 +151,7 @@ - PowerShell 7.4.3 #### PowerShell Modules -- Az: 12.0.0 +- Az: 12.1.0 - Pester: 5.6.1 - PSScriptAnalyzer: 1.22.0 @@ -210,17 +211,17 @@ | Simulator - watchOS 10.4 | watchsimulator10.4 | 15.3 | | Simulator - watchOS 10.5 | watchsimulator10.5 | 15.4 | | Simulator - watchOS 11.0 | watchsimulator11.0 | 16.0 | -| Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | | visionOS 1.0 | xros1.0 | 15.2 | +| Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | | Simulator - visionOS 1.1 | xrsimulator1.1 | 15.3 | | visionOS 1.1 | xros1.1 | 15.3 | -| Simulator - visionOS 1.2 | xrsimulator1.2 | 15.4 | | visionOS 1.2 | xros1.2 | 15.4 | -| Simulator - visionOS 2.0 | xrsimulator2.0 | 16.0 | +| Simulator - visionOS 1.2 | xrsimulator1.2 | 15.4 | | visionOS 2.0 | xros2.0 | 16.0 | +| Simulator - visionOS 2.0 | xrsimulator2.0 | 16.0 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | -| Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | +| Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | DriverKit 22.4 | driverkit22.4 | 14.3.1 | | DriverKit 23.0 | driverkit23.0 | 15.0.1 | | DriverKit 23.2 | driverkit23.2 | 15.1, 15.2 | @@ -251,7 +252,7 @@ | Package Name | Version | | -------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 11.0 | -| Android Emulator | 34.2.15 | +| Android Emulator | 34.2.16 | | Android SDK Build-tools | 35.0.0<br>34.0.0<br>33.0.2 33.0.3 | | Android SDK Platforms | android-35 (rev 1)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | | Android SDK Platform-Tools | 35.0.1 | From 8506dfcb6d8608b0605ac0f26afee3fb8e62ae4d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 17 Jul 2024 16:29:42 +0000 Subject: [PATCH 2979/3485] Updating readme file for macos-13-arm64 version 20240714.1 (#10228) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-13-arm64-Readme.md | 53 ++++++++++++++------------- 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/images/macos/macos-13-arm64-Readme.md b/images/macos/macos-13-arm64-Readme.md index 9d9f99c900f1..b2e5eef4fdb8 100644 --- a/images/macos/macos-13-arm64-Readme.md +++ b/images/macos/macos-13-arm64-Readme.md @@ -1,37 +1,38 @@ | Announcements | |-| +| [[macOS] GCC 11 will be removed from all macOS images on August 12](https://github.com/actions/runner-images/issues/10213) | | [[macOS] Default Xcode on macOS 14 Sonoma will be set to Xcode 15.4 on July, 22](https://github.com/actions/runner-images/issues/10121) | | [[macOS] Default Xcode on macOS 13 Ventura will be set to Xcode 15.2 on July, 15](https://github.com/actions/runner-images/issues/10120) | *** # macOS 13 - OS Version: macOS 13.6.7 (22G720) - Kernel Version: Darwin 22.6.0 -- Image Version: 20240708.1 +- Image Version: 20240714.1 ## Installed Software ### Language and Runtime -- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.410, 8.0.101, 8.0.204, 8.0.302 +- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.410, 8.0.101, 8.0.204, 8.0.303 - Bash 3.2.57(1)-release - Clang/LLVM 14.0.0 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` - GCC 11 (Homebrew GCC 11.4.0) - available by `gcc-11` alias - GCC 12 (Homebrew GCC 12.4.0) - available by `gcc-12` alias - GCC 13 (Homebrew GCC 13.3.0) - available by `gcc-13` alias -- GCC 14 (Homebrew GCC 14.1.0_1) - available by `gcc-14` alias +- GCC 14 (Homebrew GCC 14.1.0_2) - available by `gcc-14` alias - GNU Fortran 11 (Homebrew GCC 11.4.0) - available by `gfortran-11` alias - GNU Fortran 12 (Homebrew GCC 12.4.0) - available by `gfortran-12` alias - GNU Fortran 13 (Homebrew GCC 13.3.0) - available by `gfortran-13` alias -- GNU Fortran 14 (Homebrew GCC 14.1.0_1) - available by `gfortran-14` alias +- GNU Fortran 14 (Homebrew GCC 14.1.0_2) - available by `gfortran-14` alias - Kotlin 2.0.0-release-341 - Mono 6.12.0.188 -- Node.js 20.15.0 +- Node.js 20.15.1 - Perl 5.38.2 - Python3 3.12.4 - Ruby 3.0.7p220 ### Package Management -- Bundler 2.5.14 +- Bundler 2.5.15 - Carthage 0.39.1 - CocoaPods 1.15.2 - Homebrew 4.3.9 @@ -39,13 +40,13 @@ - NuGet 6.3.1.1 - Pip3 24.0 (python 3.12) - Pipx 1.6.0 -- RubyGems 3.5.14 +- RubyGems 3.5.15 - Yarn 1.22.22 ### Project Management - Apache Ant 1.10.14 - Apache Maven 3.9.8 -- Gradle 8.8 +- Gradle 8.9 ### Utilities - 7-Zip 17.05 @@ -69,17 +70,17 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.17.9 +- AWS CLI 2.17.13 - AWS SAM CLI 1.120.0 - AWS Session Manager CLI 1.2.650.0 -- Azure CLI 2.61.0 +- Azure CLI 2.62.0 - Azure CLI (azure-devops) 1.0.1 - Bicep CLI 0.28.1 - Cmake 3.30.0 -- CodeQL Action Bundle 2.17.6 +- CodeQL Action Bundle 2.18.0 - Fastlane 2.221.1 -- SwiftFormat 0.54.0 -- Xcbeautify 2.4.0 +- SwiftFormat 0.54.1 +- Xcbeautify 2.4.1 - Xcode Command Line Tools 14.3.1.0.1.1683849156 - Xcodes 1.5.0 @@ -117,8 +118,8 @@ #### Node.js - 16.20.1 -- 18.20.3 -- 20.15.0 +- 18.20.4 +- 20.15.1 #### Go - 1.20.14 @@ -139,19 +140,19 @@ - PowerShell 7.4.3 #### PowerShell Modules -- Az: 12.0.0 +- Az: 12.1.0 - Pester: 5.6.1 - PSScriptAnalyzer: 1.22.0 ### Xcode -| Version | Build | Path | -| ---------------- | ------- | ------------------------------ | -| 15.2 | 15C500b | /Applications/Xcode_15.2.app | -| 15.1 | 15C65 | /Applications/Xcode_15.1.app | -| 15.0.1 (default) | 15A507 | /Applications/Xcode_15.0.1.app | -| 14.3.1 | 14E300c | /Applications/Xcode_14.3.1.app | -| 14.2 | 14C18 | /Applications/Xcode_14.2.app | -| 14.1 | 14B47b | /Applications/Xcode_14.1.app | +| Version | Build | Path | +| -------------- | ------- | ------------------------------ | +| 15.2 (default) | 15C500b | /Applications/Xcode_15.2.app | +| 15.1 | 15C65 | /Applications/Xcode_15.1.app | +| 15.0.1 | 15A507 | /Applications/Xcode_15.0.1.app | +| 14.3.1 | 14E300c | /Applications/Xcode_14.3.1.app | +| 14.2 | 14C18 | /Applications/Xcode_14.2.app | +| 14.1 | 14B47b | /Applications/Xcode_14.1.app | #### Installed SDKs | SDK | SDK Name | Xcode Version | @@ -190,8 +191,8 @@ | Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | | visionOS 1.0 | xros1.0 | 15.2 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | -| Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | +| Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | | DriverKit 22.1 | driverkit22.1 | 14.1 | | DriverKit 22.2 | driverkit22.2 | 14.2 | | DriverKit 22.4 | driverkit22.4 | 14.3.1 | @@ -220,7 +221,7 @@ | Package Name | Version | | -------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 11.0 | -| Android Emulator | 34.2.15 | +| Android Emulator | 34.2.16 | | Android SDK Build-tools | 35.0.0<br>34.0.0<br>33.0.2 33.0.3 | | Android SDK Platforms | android-35 (rev 1)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | | Android SDK Platform-Tools | 35.0.1 | From b4b64341d6431abe8851b4a060207de2d3b3669d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 17 Jul 2024 16:40:23 +0000 Subject: [PATCH 2980/3485] Updating readme file for macos-14-arm64 version 20240714.2 (#10234) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-14-arm64-Readme.md | 41 ++++++++++++++------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/images/macos/macos-14-arm64-Readme.md b/images/macos/macos-14-arm64-Readme.md index ce22fa4de523..a7da6ceed463 100644 --- a/images/macos/macos-14-arm64-Readme.md +++ b/images/macos/macos-14-arm64-Readme.md @@ -1,51 +1,52 @@ | Announcements | |-| +| [[macOS] GCC 11 will be removed from all macOS images on August 12](https://github.com/actions/runner-images/issues/10213) | | [[macOS] Default Xcode on macOS 14 Sonoma will be set to Xcode 15.4 on July, 22](https://github.com/actions/runner-images/issues/10121) | | [[macOS] Default Xcode on macOS 13 Ventura will be set to Xcode 15.2 on July, 15](https://github.com/actions/runner-images/issues/10120) | *** # macOS 14 - OS Version: macOS 14.5 (23F79) - Kernel Version: Darwin 23.5.0 -- Image Version: 20240707.1 +- Image Version: 20240714.2 ## Installed Software ### Language and Runtime -- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.410, 8.0.101, 8.0.204, 8.0.302 +- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.410, 8.0.101, 8.0.204, 8.0.303 - Bash 3.2.57(1)-release - Clang/LLVM 14.0.3 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` - GCC 11 (Homebrew GCC 11.4.0) - available by `gcc-11` alias - GCC 12 (Homebrew GCC 12.4.0) - available by `gcc-12` alias - GCC 13 (Homebrew GCC 13.3.0) - available by `gcc-13` alias -- GCC 14 (Homebrew GCC 14.1.0_1) - available by `gcc-14` alias +- GCC 14 (Homebrew GCC 14.1.0_2) - available by `gcc-14` alias - GNU Fortran 11 (Homebrew GCC 11.4.0) - available by `gfortran-11` alias - GNU Fortran 12 (Homebrew GCC 12.4.0) - available by `gfortran-12` alias - GNU Fortran 13 (Homebrew GCC 13.3.0) - available by `gfortran-13` alias -- GNU Fortran 14 (Homebrew GCC 14.1.0_1) - available by `gfortran-14` alias +- GNU Fortran 14 (Homebrew GCC 14.1.0_2) - available by `gfortran-14` alias - Kotlin 2.0.0-release-341 - Mono 6.12.0.188 -- Node.js 20.15.0 +- Node.js 20.15.1 - Perl 5.38.2 - Python3 3.12.4 - Ruby 3.0.7p220 ### Package Management -- Bundler 2.5.14 +- Bundler 2.5.15 - Carthage 0.39.1 - CocoaPods 1.15.2 -- Homebrew 4.3.8 +- Homebrew 4.3.9 - NPM 10.7.0 - NuGet 6.3.1.1 - Pip3 24.0 (python 3.12) - Pipx 1.6.0 -- RubyGems 3.5.14 +- RubyGems 3.5.15 - Yarn 1.22.22 ### Project Management - Apache Ant 1.10.14 - Apache Maven 3.9.8 -- Gradle 8.8 +- Gradle 8.9 ### Utilities - 7-Zip 17.05 @@ -69,17 +70,17 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.17.9 +- AWS CLI 2.17.13 - AWS SAM CLI 1.120.0 - AWS Session Manager CLI 1.2.650.0 -- Azure CLI 2.61.0 +- Azure CLI 2.62.0 - Azure CLI (azure-devops) 1.0.1 - Bicep CLI 0.28.1 - Cmake 3.30.0 -- CodeQL Action Bundle 2.17.6 +- CodeQL Action Bundle 2.18.0 - Fastlane 2.221.1 -- SwiftFormat 0.54.0 -- Xcbeautify 2.4.0 +- SwiftFormat 0.54.1 +- Xcbeautify 2.4.1 - Xcode Command Line Tools 15.3.0.0.1.1708646388 - Xcodes 1.5.0 @@ -116,8 +117,8 @@ - 3.12.4 #### Node.js -- 18.20.3 -- 20.15.0 +- 18.20.4 +- 20.15.1 #### Go - 1.20.14 @@ -138,7 +139,7 @@ - PowerShell 7.4.3 #### PowerShell Modules -- Az: 12.0.0 +- Az: 12.1.0 - Pester: 5.6.1 - PSScriptAnalyzer: 1.22.0 @@ -204,11 +205,11 @@ | Simulator - visionOS 1.1 | xrsimulator1.1 | 15.3 | | Simulator - visionOS 1.2 | xrsimulator1.2 | 15.4 | | visionOS 1.2 | xros1.2 | 15.4 | -| Simulator - visionOS 2.0 | xrsimulator2.0 | 16.0 | | visionOS 2.0 | xros2.0 | 16.0 | +| Simulator - visionOS 2.0 | xrsimulator2.0 | 16.0 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | -| Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | +| Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | DriverKit 22.4 | driverkit22.4 | 14.3.1 | | DriverKit 23.0 | driverkit23.0 | 15.0.1 | | DriverKit 23.2 | driverkit23.2 | 15.1, 15.2 | @@ -246,7 +247,7 @@ | Package Name | Version | | -------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 11.0 | -| Android Emulator | 34.2.15 | +| Android Emulator | 34.2.16 | | Android SDK Build-tools | 35.0.0<br>34.0.0<br>33.0.2 33.0.3 | | Android SDK Platforms | android-35 (rev 1)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | | Android SDK Platform-Tools | 35.0.1 | From b3cdd4527363fab43f8ac61de1484f46c3ff82e8 Mon Sep 17 00:00:00 2001 From: Pavel Iakovenko <paveliak@github.com> Date: Thu, 18 Jul 2024 08:10:55 -0400 Subject: [PATCH 2981/3485] Align Xcode-16 naming with Apple download links --- images/macos/toolsets/toolset-14.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/macos/toolsets/toolset-14.json b/images/macos/toolsets/toolset-14.json index a66f116a5837..b7acd9c0c868 100644 --- a/images/macos/toolsets/toolset-14.json +++ b/images/macos/toolsets/toolset-14.json @@ -3,7 +3,7 @@ "default": "15.0.1", "x64": { "versions": [ - { "link": "16.0", "version": "16.0.0-Beta.2+16A5171r", "install_runtimes": "false", "sha256": "86b4fd563d80c997887d37a528f69161f82987932b5ebe6119ad5dd548352ad3"}, + { "link": "16_beta_2", "version": "16.0.0-Beta.2+16A5171r", "symlinks": ["16.0"], "install_runtimes": "false", "sha256": "86b4fd563d80c997887d37a528f69161f82987932b5ebe6119ad5dd548352ad3"}, { "link": "15.4", "version": "15.4.0+15F31d", "install_runtimes": "true", "sha256": "82d3d61804ff3f4c7c82085e91dc701037ddaa770e542848b2477e22f4e8aa7a"}, { "link": "15.3", "version": "15.3.0+15E204a", "install_runtimes": "true", "sha256": "f13f6a2e2df432c3008e394640b8549a18c285acd7fd148d6c4bac8c3a5af234"}, { "link": "15.2", "version": "15.2.0+15C500b", "install_runtimes": "true", "sha256": "04E93680C6DDBEC84666531BE412DE778AFC8EAC6AB2037F4C2BE7290818B59B"}, @@ -14,7 +14,7 @@ }, "arm64":{ "versions": [ - { "link": "16.0", "version": "16.0.0-Beta.2+16A5171r", "install_runtimes": "true", "sha256": "86b4fd563d80c997887d37a528f69161f82987932b5ebe6119ad5dd548352ad3"}, + { "link": "16_beta_2", "version": "16.0.0-Beta.2+16A5171r", "symlinks": ["16.0"], "install_runtimes": "true", "sha256": "86b4fd563d80c997887d37a528f69161f82987932b5ebe6119ad5dd548352ad3"}, { "link": "15.4", "version": "15.4.0+15F31d", "install_runtimes": "true", "sha256": "82d3d61804ff3f4c7c82085e91dc701037ddaa770e542848b2477e22f4e8aa7a"}, { "link": "15.3", "version": "15.3.0+15E204a", "install_runtimes": "true", "sha256": "f13f6a2e2df432c3008e394640b8549a18c285acd7fd148d6c4bac8c3a5af234"}, { "link": "15.2", "version": "15.2.0+15C500b", "install_runtimes": "true", "sha256": "04E93680C6DDBEC84666531BE412DE778AFC8EAC6AB2037F4C2BE7290818B59B"}, From aa5ca17eacdc286f33ac00a417ce9899ef207e02 Mon Sep 17 00:00:00 2001 From: Pavel Iakovenko <paveliak@github.com> Date: Thu, 18 Jul 2024 08:12:10 -0400 Subject: [PATCH 2982/3485] Revert debug changes --- images/macos/scripts/build/install-powershell.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/images/macos/scripts/build/install-powershell.sh b/images/macos/scripts/build/install-powershell.sh index 80b24c036549..d6c2a9fc8ae9 100644 --- a/images/macos/scripts/build/install-powershell.sh +++ b/images/macos/scripts/build/install-powershell.sh @@ -10,8 +10,6 @@ echo Installing PowerShell... arch=$(get_arch) metadata_json_path=$(download_with_retry "https://raw.githubusercontent.com/PowerShell/PowerShell/master/tools/metadata.json") -echo $metadata_json_path -cat $metadata_json_path pwshVersionToolset=$(get_toolset_value '.pwsh.version') pwshVersions=$(jq -r '.LTSReleaseTag[]' $metadata_json_path) From 23da668261a3b37946cd594ef9f1d4e4bb9cd58e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 18 Jul 2024 14:25:20 +0000 Subject: [PATCH 2983/3485] Updating readme file for macos-12 version 20240714.2 (#10239) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-12-Readme.md | 53 +++++++++++++++++---------------- 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/images/macos/macos-12-Readme.md b/images/macos/macos-12-Readme.md index 081d7d4b0e50..8348e89a8333 100644 --- a/images/macos/macos-12-Readme.md +++ b/images/macos/macos-12-Readme.md @@ -1,36 +1,37 @@ | Announcements | |-| +| [[macOS] GCC 11 will be removed from all macOS images on August 12](https://github.com/actions/runner-images/issues/10213) | | [[macOS] Default Xcode on macOS 14 Sonoma will be set to Xcode 15.4 on July, 22](https://github.com/actions/runner-images/issues/10121) | | [[macOS] Default Xcode on macOS 13 Ventura will be set to Xcode 15.2 on July, 15](https://github.com/actions/runner-images/issues/10120) | *** # macOS 12 - OS Version: macOS 12.7.5 (21H1222) - Kernel Version: Darwin 21.6.0 -- Image Version: 20240707.1 +- Image Version: 20240714.2 ## Installed Software ### Language and Runtime -- .NET Core SDK: 6.0.423, 7.0.102, 7.0.202, 7.0.306, 7.0.410, 8.0.101, 8.0.204, 8.0.302 +- .NET Core SDK: 6.0.424, 7.0.102, 7.0.202, 7.0.306, 7.0.410, 8.0.101, 8.0.204, 8.0.303 - Bash 3.2.57(1)-release - Clang/LLVM 14.0.0 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` - GCC 11 (Homebrew GCC 11.4.0) - available by `gcc-11` alias - GCC 12 (Homebrew GCC 12.4.0) - available by `gcc-12` alias - GCC 13 (Homebrew GCC 13.3.0) - available by `gcc-13` alias -- GCC 14 (Homebrew GCC 14.1.0_1) - available by `gcc-14` alias +- GCC 14 (Homebrew GCC 14.1.0_2) - available by `gcc-14` alias - GNU Fortran 11 (Homebrew GCC 11.4.0) - available by `gfortran-11` alias - GNU Fortran 12 (Homebrew GCC 12.4.0) - available by `gfortran-12` alias - GNU Fortran 13 (Homebrew GCC 13.3.0) - available by `gfortran-13` alias -- GNU Fortran 14 (Homebrew GCC 14.1.0_1) - available by `gfortran-14` alias +- GNU Fortran 14 (Homebrew GCC 14.1.0_2) - available by `gfortran-14` alias - Julia 1.10.4 - Kotlin 2.0.0-release-341 - Go 1.21.12 - Mono 6.12.0.188 -- Node.js 18.20.3 +- Node.js 18.20.4 - MSBuild 16.10.1.51301 (Mono 6.12.0.188) - NVM 0.39.7 -- NVM - Cached node versions: 16.20.2, 18.20.3, 20.15.0 +- NVM - Cached node versions: 16.20.2, 18.20.4, 20.15.1 - Perl 5.38.2 - PHP 8.3.9 - Python 2.7.18 @@ -39,19 +40,19 @@ - Ruby 3.0.7p220 ### Package Management -- Bundler 2.5.14 +- Bundler 2.5.15 - Carthage 0.39.1 - CocoaPods 1.15.2 - Composer 2.7.7 -- Homebrew 4.3.8 +- Homebrew 4.3.9 - Miniconda 24.5.0 - NPM 10.7.0 - NuGet 6.3.1.1 - Pip 20.3.4 (python 2.7) - Pip3 24.1.2 (python 3.12) - Pipx 1.6.0 -- RubyGems 3.5.14 -- Vcpkg 2024 (build from commit 576379156) +- RubyGems 3.5.15 +- Vcpkg 2024 (build from commit 7aeffc910) - Yarn 1.22.22 #### Environment variables @@ -63,8 +64,8 @@ ### Project Management - Apache Ant 1.10.14 - Apache Maven 3.9.8 -- Gradle 8.8 -- Sbt 1.10.0 +- Gradle 8.9 +- Sbt 1.10.1 ### Utilities - 7-Zip 17.05 @@ -82,8 +83,8 @@ - gpg (GnuPG) 2.4.5 - ImageMagick 7.1.1-34 - jq 1.7.1 -- mongo 5.0.27 -- mongod 5.0.27 +- mongo 5.0.28 +- mongod 5.0.28 - OpenSSL 1.1.1w 11 Sep 2023 - Packer 1.9.4 - pkg-config 0.29.2 @@ -99,22 +100,22 @@ ### Tools - App Center CLI 3.0.1 -- AWS CLI 2.17.9 +- AWS CLI 2.17.13 - AWS SAM CLI 1.120.0 - AWS Session Manager CLI 1.2.650.0 -- Azure CLI 2.61.0 +- Azure CLI 2.62.0 - Azure CLI (azure-devops) 1.0.1 - Bicep CLI 0.28.1 - Cabal 3.10.3.0 - Cmake 3.30.0 -- CodeQL Action Bundle 2.17.6 +- CodeQL Action Bundle 2.18.0 - Colima 0.6.9 - Fastlane 2.221.1 - GHC 9.10.1 - GHCup 0.1.30.0 - Jazzy 0.15.1 - Stack 2.15.7 -- SwiftFormat 0.54.0 +- SwiftFormat 0.54.1 - Swig 4.2.1 - Xcbeautify 1.6.0 - Xcode Command Line Tools 14.2.0.0.1.1668646533 @@ -130,9 +131,9 @@ - Google Chrome 126.0.6478.127 - Google Chrome for Testing 126.0.6478.126 - ChromeDriver 126.0.6478.126 -- Microsoft Edge 126.0.2592.87 -- Microsoft Edge WebDriver 126.0.2592.87 -- Mozilla Firefox 127.0.2 +- Microsoft Edge 126.0.2592.102 +- Microsoft Edge WebDriver 126.0.2592.102 +- Mozilla Firefox 128.0 - geckodriver 0.34.0 - Selenium server 4.22.0 @@ -174,8 +175,8 @@ #### Node.js - 16.20.2 -- 18.20.3 -- 20.15.0 +- 18.20.4 +- 20.15.1 #### Go - 1.20.14 @@ -200,7 +201,7 @@ - PowerShell 7.4.3 #### PowerShell Modules -- Az: 12.0.0 +- Az: 12.1.0 - MarkdownPS: 1.10 - Pester: 5.6.1 - PSScriptAnalyzer: 1.22.0 @@ -217,7 +218,7 @@ | Version | Build | Path | | -------------- | ----------- | ------------------------------------ | | 2019 | 8.10.25.2 | /Applications/Visual Studio 2019.app | -| 2022 (default) | 17.6.12.410 | /Applications/Visual Studio.app | +| 2022 (default) | 17.6.13.424 | /Applications/Visual Studio.app | ##### Notes ``` @@ -337,7 +338,7 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" | Package Name | Version | | -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 8.0 | -| Android Emulator | 34.2.15 | +| Android Emulator | 34.2.16 | | Android SDK Build-tools | 35.0.0<br>34.0.0<br>33.0.0 33.0.1 33.0.2 33.0.3<br>32.0.0<br>31.0.0 | | Android SDK Platforms | android-35 (rev 1)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1) | | Android SDK Platform-Tools | 35.0.1 | From ab8dfc0eb39ec61c38a6d24b6a64f9af9a9df7e3 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 20 Jul 2024 05:31:06 +0000 Subject: [PATCH 2984/3485] Updating readme file for win19 version 20240717.1.1 (#10310) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/windows/Windows2019-Readme.md | 86 ++++++++++++++-------------- 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/images/windows/Windows2019-Readme.md b/images/windows/Windows2019-Readme.md index cb0af6b75c7a..27e414d21c68 100644 --- a/images/windows/Windows2019-Readme.md +++ b/images/windows/Windows2019-Readme.md @@ -3,8 +3,8 @@ | [[Ubuntu, Windows] Docker Compose v1 will be removed from images on July, 29](https://github.com/actions/runner-images/issues/9692) | *** # Windows Server 2019 -- OS Version: 10.0.17763 Build 5936 -- Image Version: 20240707.1.0 +- OS Version: 10.0.17763 Build 6054 +- Image Version: 20240717.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -16,7 +16,7 @@ - Go 1.21.12 - Julia 1.10.4 - Kotlin 2.0.0 -- LLVM 18.1.6 +- LLVM 18.1.8 - Node 18.20.3 - Perl 5.32.1 - PHP 8.3.9 @@ -26,14 +26,14 @@ ### Package Management - Chocolatey 2.3.0 - Composer 2.7.7 -- Helm 3.15.1 +- Helm 3.15.2 - Miniconda 24.5.0 (pre-installed on the image but not added to PATH) - NPM 10.7.0 -- NuGet 6.10.0.107 +- NuGet 6.10.1.5 - pip 24.0 (python 3.7) - Pipx 1.2.1 - RubyGems 3.2.33 -- Vcpkg (build from commit 576379156) +- Vcpkg (build from commit 1318ab14a) - Yarn 1.22.22 #### Environment variables @@ -46,7 +46,7 @@ - Ant 1.10.14 - Gradle 8.8 - Maven 3.8.7 -- sbt 1.10.0 +- sbt 1.10.1 ### Tools - 7zip 24.07 @@ -57,7 +57,7 @@ - Bicep 0.28.1 - Cabal 3.12.1.0 - CMake 3.30.0 -- CodeQL Action Bundle 2.17.6 +- CodeQL Action Bundle 2.18.0 - Docker 26.1.3 - Docker Compose v1 1.29.2 - Docker Compose v2 2.27.1 @@ -65,12 +65,12 @@ - ghc 9.10.1 - Git 2.45.2.windows.1 - Git LFS 3.5.1 -- Google Cloud CLI 483.0.0 -- ImageMagick 7.1.1-34 -- InnoSetup 6.3.2 +- Google Cloud CLI 484.0.0 +- ImageMagick 7.1.1-35 +- InnoSetup 6.3.3 - jq 1.7.1 - Kind 0.23.0 -- Kubectl 1.30.2 +- Kubectl 1.30.3 - Mercurial 5.0 - gcc 8.1.0 - gdb 8.1 @@ -80,7 +80,7 @@ - OpenSSL 1.1.1w - Packer 1.11.0 - Parcel 2.12.0 -- Pulumi 3.122.0 +- Pulumi 3.124.0 - R 4.4.1 - Service Fabric SDK 9.1.1436.9590 - Stack 2.15.7 @@ -93,14 +93,14 @@ - zstd 1.5.6 ### CLI Tools -- Alibaba Cloud CLI 3.0.210 -- AWS CLI 2.17.9 +- Alibaba Cloud CLI 3.0.213 +- AWS CLI 2.17.13 - AWS SAM CLI 1.120.0 - AWS Session Manager CLI 1.2.650.0 -- Azure CLI 2.61.0 +- Azure CLI 2.62.0 - Azure DevOps CLI extension 1.0.1 -- Cloud Foundry CLI 8.7.10 -- GitHub CLI 2.52.0 +- Cloud Foundry CLI 8.7.11 +- GitHub CLI 2.53.0 ### Rust Tools - Cargo 1.79.0 @@ -117,11 +117,11 @@ - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 126.0.6478.127 -- Chrome Driver 126.0.6478.126 -- Microsoft Edge 126.0.2592.87 -- Microsoft Edge Driver 126.0.2592.87 -- Mozilla Firefox 127.0.2 +- Google Chrome 126.0.6478.183 +- Chrome Driver 126.0.6478.182 +- Microsoft Edge 126.0.2592.102 +- Microsoft Edge Driver 126.0.2592.102 +- Mozilla Firefox 128.0 - Gecko Driver 0.34.0 - IE Driver 4.14.0.0 - Selenium server 4.22.0 @@ -171,8 +171,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Node.js - 16.20.2 -- 18.20.3 -- 20.15.0 +- 18.20.4 +- 20.15.1 #### Python - 3.7.9 @@ -212,13 +212,13 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### MongoDB | Version | ServiceName | ServiceStatus | ServiceStartType | | -------- | ----------- | ------------- | ---------------- | -| 5.0.27.0 | MongoDB | Stopped | Disabled | +| 5.0.28.0 | MongoDB | Stopped | Disabled | ### Database tools - Azure CosmosDb Emulator 2.14.18.0 - DacFx 162.3.566.1 - MySQL 5.7.44.0 -- SQL OLEDB Driver 18.7.2.0 +- SQL OLEDB Driver 18.7.4.0 - SQLPS 1.0 ### Web Servers @@ -228,14 +228,14 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Nginx | 1.27.0 | C:\tools\nginx-1.27.0\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2019 -| Name | Version | Path | -| ----------------------------- | -------------- | -------------------------------------------------------------- | -| Visual Studio Enterprise 2019 | 16.11.34931.43 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | +| Name | Version | Path | +| ----------------------------- | --------------- | -------------------------------------------------------------- | +| Visual Studio Enterprise 2019 | 16.11.35026.282 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | #### Workloads, components and extensions | Package | Version | | ------------------------------------------------------------------------- | --------------- | -| Component.Android.NDK.R16B | 16.11.34930.47 | +| Component.Android.NDK.R16B | 16.11.35026.282 | | Component.Android.SDK25.Private | 16.0.28625.61 | | Component.Android.SDK30 | 16.10.31205.252 | | Component.Ant | 1.9.3.8 | @@ -436,7 +436,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions | 16.11.32413.511 | | Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.CMake | 16.11.32413.511 | | Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.TemplateEngine | 16.11.32413.511 | -| Microsoft.VisualStudio.Workload.Azure | 16.11.33214.272 | +| Microsoft.VisualStudio.Workload.Azure | 16.11.35026.282 | | Microsoft.VisualStudio.Workload.CoreEditor | 16.10.31205.180 | | Microsoft.VisualStudio.Workload.Data | 16.0.28720.110 | | Microsoft.VisualStudio.Workload.DataScience | 16.10.31205.180 | @@ -492,11 +492,11 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 10.0.22621.0 ### .NET Core Tools -- .NET Core SDK: 6.0.131, 6.0.203, 6.0.321, 6.0.423, 7.0.120, 7.0.203, 7.0.317, 7.0.410, 8.0.106, 8.0.206, 8.0.302 +- .NET Core SDK: 6.0.132, 6.0.203, 6.0.321, 6.0.424, 7.0.120, 7.0.203, 7.0.317, 7.0.410, 8.0.107, 8.0.206, 8.0.303 - .NET Framework: 4.7.2, 4.8 -- Microsoft.AspNetCore.App: 6.0.5, 6.0.26, 6.0.31, 7.0.5, 7.0.20, 8.0.6 -- Microsoft.NETCore.App: 6.0.5, 6.0.26, 6.0.31, 7.0.5, 7.0.20, 8.0.6 -- Microsoft.WindowsDesktop.App: 6.0.5, 6.0.26, 6.0.31, 7.0.5, 7.0.20, 8.0.6 +- Microsoft.AspNetCore.App: 6.0.5, 6.0.26, 6.0.32, 7.0.5, 7.0.20, 8.0.6, 8.0.7 +- Microsoft.NETCore.App: 6.0.5, 6.0.26, 6.0.32, 7.0.5, 7.0.20, 8.0.6, 8.0.7 +- Microsoft.WindowsDesktop.App: 6.0.5, 6.0.26, 6.0.32, 7.0.5, 7.0.20, 8.0.6, 8.0.7 - nbgv 3.6.139+a9e8765620 ### PowerShell Tools @@ -508,7 +508,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - AzureRM: 2.1.0 (Default), 6.13.1 - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.614 +- AWSPowershell: 4.1.618 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.10 - Microsoft.Graph: 2.20.0 @@ -528,7 +528,7 @@ All other versions are saved but not installed. | Package Name | Version | | -------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 8.0 | -| Android Emulator | 34.2.15 | +| Android Emulator | 34.2.16 | | Android SDK Build-tools | 35.0.0<br>34.0.0<br>33.0.0 33.0.1 33.0.2 33.0.3<br>32.0.0<br>31.0.0<br>30.0.2 | | Android SDK Platforms | android-35 (rev 1)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3) | | Android SDK Platform-Tools | 35.0.1 | @@ -552,9 +552,9 @@ All other versions are saved but not installed. ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:cf673b802c8ec71356022f4c1b6f68410594479a77fd3923e678969d58af71bc | 2024-06-11 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:b8640b49c21d7730dc75be6869cde9991171664c8dc469517cb2816b1c9632ee | 2024-06-11 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:c1b2be17aa0c1a5d9493a306395a6f07141aae8d7897f7ba319183f28719c990 | 2024-06-11 | -| mcr.microsoft.com/windows/nanoserver:1809 | sha256:f31fa317b1851ae16ffdb87450e5e51b61e186f898b949cea32d77e1c8b638a3 | 2024-06-07 | -| mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:0d52390e8497ea6238500afbf60054bd731b12818e6440d31fe6ff4e2eefc5ad | 2024-06-07 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:4d87502a9422420948af8264a1cecad215f032e4c2d4b1fb92cfee779ecfb480 | 2024-07-09 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:8d7c40438ba7645768219770ab60b9b2cacc90a8a2cc2be0f880939cbc6091db | 2024-07-09 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:04e06ae8f595b48bdee73c3334e82f46ba61217e2fe29702350d7b90e9c4b787 | 2024-07-09 | +| mcr.microsoft.com/windows/nanoserver:1809 | sha256:736f8845da1c7bbc9510b419abddb870230485e74644a96e0001a21e1ca4c172 | 2024-07-03 | +| mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:41f42aa4ad39d85e4d30642b8111ca6454ca2275f188f012934b9afbaf63a647 | 2024-07-03 | From e9e763c49f0dc2aa38df4444708012b40d1f19e4 Mon Sep 17 00:00:00 2001 From: sarathrajsrinivasan <159180023+sarathrajsrinivasan@users.noreply.github.com> Date: Tue, 23 Jul 2024 02:29:45 -0700 Subject: [PATCH 2985/3485] [macOS] Add Xcode 16.0 Beta 3 for macOS14 (#10245) --- images/macos/toolsets/toolset-14.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/macos/toolsets/toolset-14.json b/images/macos/toolsets/toolset-14.json index 904f7a4621f0..96dede39e913 100644 --- a/images/macos/toolsets/toolset-14.json +++ b/images/macos/toolsets/toolset-14.json @@ -3,7 +3,7 @@ "default": "15.4", "x64": { "versions": [ - { "link": "16_beta_2", "version": "16.0.0-Beta.2+16A5171r", "symlinks": ["16.0"], "install_runtimes": "false", "sha256": "86b4fd563d80c997887d37a528f69161f82987932b5ebe6119ad5dd548352ad3"}, + { "link": "16_beta_3", "version": "16.0.0-Beta.3+16A5202i", "symlinks": ["16.0"], "install_runtimes": "false", "sha256": "371dae95b8c19fe7afbd0304b19c48380b61f22802debf2094bde06939df3fec"}, { "link": "15.4", "version": "15.4.0+15F31d", "install_runtimes": "true", "sha256": "82d3d61804ff3f4c7c82085e91dc701037ddaa770e542848b2477e22f4e8aa7a"}, { "link": "15.3", "version": "15.3.0+15E204a", "install_runtimes": "true", "sha256": "f13f6a2e2df432c3008e394640b8549a18c285acd7fd148d6c4bac8c3a5af234"}, { "link": "15.2", "version": "15.2.0+15C500b", "install_runtimes": "true", "sha256": "04E93680C6DDBEC84666531BE412DE778AFC8EAC6AB2037F4C2BE7290818B59B"}, @@ -14,7 +14,7 @@ }, "arm64":{ "versions": [ - { "link": "16_beta_2", "version": "16.0.0-Beta.2+16A5171r", "symlinks": ["16.0"], "install_runtimes": "true", "sha256": "86b4fd563d80c997887d37a528f69161f82987932b5ebe6119ad5dd548352ad3"}, + { "link": "16_beta_3", "version": "16.0.0-Beta.3+16A5202i", "symlinks": ["16.0"], "install_runtimes": "true", "sha256": "371dae95b8c19fe7afbd0304b19c48380b61f22802debf2094bde06939df3fec"}, { "link": "15.4", "version": "15.4.0+15F31d", "install_runtimes": "true", "sha256": "82d3d61804ff3f4c7c82085e91dc701037ddaa770e542848b2477e22f4e8aa7a"}, { "link": "15.3", "version": "15.3.0+15E204a", "install_runtimes": "true", "sha256": "f13f6a2e2df432c3008e394640b8549a18c285acd7fd148d6c4bac8c3a5af234"}, { "link": "15.2", "version": "15.2.0+15C500b", "install_runtimes": "true", "sha256": "04E93680C6DDBEC84666531BE412DE778AFC8EAC6AB2037F4C2BE7290818B59B"}, From 49f0b7160bafa1961e53b8f743ae7ee811442e85 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 24 Jul 2024 11:34:46 +0000 Subject: [PATCH 2986/3485] Updating readme file for win19 version 20240721.1.1 (#10326) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/windows/Windows2019-Readme.md | 32 ++++++++++++++-------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/images/windows/Windows2019-Readme.md b/images/windows/Windows2019-Readme.md index 27e414d21c68..32b57612661c 100644 --- a/images/windows/Windows2019-Readme.md +++ b/images/windows/Windows2019-Readme.md @@ -4,7 +4,7 @@ *** # Windows Server 2019 - OS Version: 10.0.17763 Build 6054 -- Image Version: 20240717.1.0 +- Image Version: 20240721.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -33,7 +33,7 @@ - pip 24.0 (python 3.7) - Pipx 1.2.1 - RubyGems 3.2.33 -- Vcpkg (build from commit 1318ab14a) +- Vcpkg (build from commit 821100d96) - Yarn 1.22.22 #### Environment variables @@ -54,9 +54,9 @@ - azcopy 10.25.1 - Bazel 7.2.1 - Bazelisk 1.19.0 -- Bicep 0.28.1 +- Bicep 0.29.45 - Cabal 3.12.1.0 -- CMake 3.30.0 +- CMake 3.30.1 - CodeQL Action Bundle 2.18.0 - Docker 26.1.3 - Docker Compose v1 1.29.2 @@ -80,7 +80,7 @@ - OpenSSL 1.1.1w - Packer 1.11.0 - Parcel 2.12.0 -- Pulumi 3.124.0 +- Pulumi 3.125.0 - R 4.4.1 - Service Fabric SDK 9.1.1436.9590 - Stack 2.15.7 @@ -93,8 +93,8 @@ - zstd 1.5.6 ### CLI Tools -- Alibaba Cloud CLI 3.0.213 -- AWS CLI 2.17.13 +- Alibaba Cloud CLI 3.0.214 +- AWS CLI 2.17.14 - AWS SAM CLI 1.120.0 - AWS Session Manager CLI 1.2.650.0 - Azure CLI 2.62.0 @@ -119,12 +119,12 @@ ### Browsers and Drivers - Google Chrome 126.0.6478.183 - Chrome Driver 126.0.6478.182 -- Microsoft Edge 126.0.2592.102 -- Microsoft Edge Driver 126.0.2592.102 +- Microsoft Edge 126.0.2592.113 +- Microsoft Edge Driver 126.0.2592.113 - Mozilla Firefox 128.0 - Gecko Driver 0.34.0 - IE Driver 4.14.0.0 -- Selenium server 4.22.0 +- Selenium server 4.23.0 #### Environment variables | Name | Value | @@ -137,10 +137,10 @@ ### Java | Version | Environment Variable | | ------------------- | -------------------- | -| 8.0.412+8 (default) | JAVA_HOME_8_X64 | -| 11.0.23+9 | JAVA_HOME_11_X64 | -| 17.0.11+9 | JAVA_HOME_17_X64 | -| 21.0.3+9.0 | JAVA_HOME_21_X64 | +| 8.0.422+5 (default) | JAVA_HOME_8_X64 | +| 11.0.24+8 | JAVA_HOME_11_X64 | +| 17.0.12+7 | JAVA_HOME_17_X64 | +| 21.0.4+7.0 | JAVA_HOME_21_X64 | ### Shells | Name | Target | @@ -508,14 +508,14 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - AzureRM: 2.1.0 (Default), 6.13.1 - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.618 +- AWSPowershell: 4.1.619 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.10 - Microsoft.Graph: 2.20.0 - Pester: 3.4.0, 5.6.1 - PowerShellGet: 1.0.0.1, 2.2.5 - PSScriptAnalyzer: 1.22.0 -- PSWindowsUpdate: 2.2.1.4 +- PSWindowsUpdate: 2.2.1.5 - SqlServer: 22.3.0 - VSSetup: 2.2.16 ``` From e088ddba06a9b0396bd89472197eb236a6bf20e7 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 24 Jul 2024 11:39:25 +0000 Subject: [PATCH 2987/3485] Updating readme file for ubuntu24 version 20240721.1.1 (#10317) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2404-Readme.md | 36 +++++++++++++++--------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/images/ubuntu/Ubuntu2404-Readme.md b/images/ubuntu/Ubuntu2404-Readme.md index ce894a517668..e397240aa8f9 100644 --- a/images/ubuntu/Ubuntu2404-Readme.md +++ b/images/ubuntu/Ubuntu2404-Readme.md @@ -5,9 +5,9 @@ *** # Ubuntu 24.04 LTS - OS Version: 24.04 LTS -- Kernel Version: 6.8.0-1009-azure -- Image Version: 20240714.1.0 -- Systemd version: 255.4-1ubuntu8.1 +- Kernel Version: 6.8.0-1010-azure +- Image Version: 20240721.1.0 +- Systemd version: 255.4-1ubuntu8.2 ## Installed Software @@ -28,14 +28,14 @@ ### Package Management - cpan 1.64 - Helm 3.15.3 -- Homebrew 4.3.9 +- Homebrew 4.3.10 - Miniconda 24.5.0 - Npm 10.7.0 - Pip 24.0 - Pip3 24.0 - Pipx 1.4.3 - RubyGems 3.4.20 -- Vcpkg (build from commit 7aeffc910) +- Vcpkg (build from commit 821100d96) - Yarn 1.22.22 #### Environment variables @@ -55,21 +55,21 @@ to accomplish this. ### Project Management - Ant 1.10.14 - Gradle 8.9 -- Lerna 8.1.6 +- Lerna 8.1.7 - Maven 3.8.8 ### Tools -- Ansible 2.17.1 +- Ansible 2.17.2 - AzCopy 10.25.1 - available by `azcopy` and `azcopy10` aliases - Bazel 7.2.1 - Bazelisk 1.19.0 -- Bicep 0.28.1 +- Bicep 0.29.45 - Buildah 1.33.7 -- CMake 3.30.0 +- CMake 3.30.1 - CodeQL Action Bundle 2.18.0 - Docker Amazon ECR Credential Helper 0.8.0 - Docker Compose v2 2.27.1 -- Docker-Buildx 0.16.0 +- Docker-Buildx 0.16.1 - Docker Client 26.1.3 - Docker Server 26.1.3 - Fastlane 2.221.1 @@ -79,8 +79,8 @@ to accomplish this. - Haveged 1.9.14 - jq 1.7 - Kind 0.23.0 -- Kubectl 1.30.2 -- Kustomize 5.4.2 +- Kubectl 1.30.3 +- Kustomize 5.4.3 - MediaInfo 24.01 - Mercurial 6.7.2 - Minikube 1.33.1 @@ -89,7 +89,7 @@ to accomplish this. - OpenSSL 3.0.13-0ubuntu3.1 - Parcel 2.12.0 - Podman 4.9.3 -- Pulumi 3.124.0 +- Pulumi 3.125.0 - Skopeo 1.13.3 - Sphinx Open Source Search Server 2.2.11 - yamllint 1.35.1 @@ -97,12 +97,12 @@ to accomplish this. - zstd 1.5.6 ### CLI Tools -- AWS CLI 2.17.13 +- AWS CLI 2.17.14 - AWS CLI Session Manager Plugin 1.2.650.0 - AWS SAM CLI 1.120.0 - Azure CLI 2.62.0 - Azure CLI (azure-devops) 1.0.1 -- GitHub CLI 2.52.0 +- GitHub CLI 2.53.0 ### Java | Version | Environment Variable | @@ -136,10 +136,10 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 126.0.6478.126 -- ChromeDriver 126.0.6478.126 +- Google Chrome 126.0.6478.182 +- ChromeDriver 126.0.6478.182 - Chromium 126.0.6478.0 -- Selenium server 4.22.0 +- Selenium server 4.23.0 #### Environment variables | Name | Value | From 36ab77853657f86a48276ecc052b7afdd45c3ba2 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 24 Jul 2024 11:52:58 +0000 Subject: [PATCH 2988/3485] Updating readme file for ubuntu20 version 20240721.1.1 (#10323) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2004-Readme.md | 46 +++++++++++++++--------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/images/ubuntu/Ubuntu2004-Readme.md b/images/ubuntu/Ubuntu2004-Readme.md index 0f02680ab383..9555d5a30f80 100644 --- a/images/ubuntu/Ubuntu2004-Readme.md +++ b/images/ubuntu/Ubuntu2004-Readme.md @@ -5,8 +5,8 @@ *** # Ubuntu 20.04 - OS Version: 20.04.6 LTS -- Kernel Version: 5.15.0-1067-azure -- Image Version: 20240714.1.0 +- Kernel Version: 5.15.0-1068-azure +- Image Version: 20240721.1.0 - Systemd version: 245.4-4ubuntu3.23 ## Installed Software @@ -34,7 +34,7 @@ ### Package Management - cpan 1.64 - Helm 3.15.3 -- Homebrew 4.3.9 +- Homebrew 4.3.10 - Miniconda 24.5.0 - Npm 10.7.0 - NuGet 6.6.1.2 @@ -42,7 +42,7 @@ - Pip3 20.0.2 - Pipx 1.6.0 - RubyGems 3.1.2 -- Vcpkg (build from commit 7aeffc910) +- Vcpkg (build from commit 821100d96) - Yarn 1.22.22 #### Environment variables @@ -62,7 +62,7 @@ to accomplish this. ### Project Management - Ant 1.10.7 - Gradle 8.9 -- Lerna 8.1.6 +- Lerna 8.1.7 - Maven 3.8.8 - Sbt 1.10.1 @@ -72,14 +72,14 @@ to accomplish this. - AzCopy 10.25.1 - available by `azcopy` and `azcopy10` aliases - Bazel 7.2.1 - Bazelisk 1.19.0 -- Bicep 0.28.1 +- Bicep 0.29.45 - Buildah 1.22.3 -- CMake 3.30.0 +- CMake 3.30.1 - CodeQL Action Bundle 2.18.0 - Docker Amazon ECR Credential Helper 0.8.0 - Docker Compose v1 1.29.2 - Docker Compose v2 2.27.1 -- Docker-Buildx 0.16.0 +- Docker-Buildx 0.16.1 - Docker Client 26.1.3 - Docker Server 26.1.3 - Fastlane 2.221.1 @@ -87,12 +87,12 @@ to accomplish this. - Git LFS 3.5.1 - Git-ftp 1.6.0 - Haveged 1.9.1 -- Heroku 8.11.5 +- Heroku 9.0.0 - HHVM (HipHop VM) 4.172.1 - jq 1.6 - Kind 0.23.0 -- Kubectl 1.30.2 -- Kustomize 5.4.2 +- Kubectl 1.30.3 +- Kustomize 5.4.3 - Leiningen 2.11.2 - MediaInfo 19.09 - Mercurial 5.3.1 @@ -105,7 +105,7 @@ to accomplish this. - Parcel 2.12.0 - PhantomJS 2.1.1 2.1.1 - Podman 3.4.2 -- Pulumi 3.124.0 +- Pulumi 3.125.0 - R 4.4.1 - Skopeo 1.5.0 - Sphinx Open Source Search Server 2.2.11 @@ -117,17 +117,17 @@ to accomplish this. ### CLI Tools - Alibaba Cloud CLI 3.0.174 -- AWS CLI 2.17.13 +- AWS CLI 2.17.14 - AWS CLI Session Manager Plugin 1.2.650.0 - AWS SAM CLI 1.120.0 - Azure CLI 2.62.0 - Azure CLI (azure-devops) 1.0.1 -- GitHub CLI 2.52.0 -- Google Cloud CLI 483.0.0 -- Netlify CLI 17.33.3 +- GitHub CLI 2.53.0 +- Google Cloud CLI 484.0.0 +- Netlify CLI 17.33.4 - OpenShift CLI 4.15.19 - ORAS CLI 1.2.0 -- Vercel CLI 34.3.1 +- Vercel CLI 35.1.0 ### Java | Version | Environment Variable | @@ -166,12 +166,12 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 126.0.6478.126 -- ChromeDriver 126.0.6478.126 +- Google Chrome 126.0.6478.182 +- ChromeDriver 126.0.6478.182 - Chromium 126.0.6478.0 -- Microsoft Edge 126.0.2592.102 +- Microsoft Edge 126.0.2592.113 - Microsoft Edge WebDriver 126.0.2592.102 -- Selenium server 4.22.0 +- Selenium server 4.23.0 - Mozilla Firefox 128.0 - Geckodriver 0.34.0 @@ -188,7 +188,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - nbgv 3.6.139+a9e8765620 ### Databases -- MongoDB 5.0.27 +- MongoDB 5.0.28 - sqlite3 3.31.1 #### PostgreSQL @@ -342,7 +342,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | libgbm-dev | 21.2.6-0ubuntu0.1\~20.04.2 | | libgconf-2-4 | 3.2.6-6ubuntu1 | | libgsl-dev | 2.5+dfsg-6+deb10u1build0.20.04.1 | -| libgtk-3-0 | 3.24.20-0ubuntu1.1 | +| libgtk-3-0 | 3.24.20-0ubuntu1.2 | | libmagic-dev | 1:5.38-4 | | libmagickcore-dev | 8:6.9.10.23+dfsg-2.1ubuntu11.9 | | libmagickwand-dev | 8:6.9.10.23+dfsg-2.1ubuntu11.9 | From 00959b266ef8739fe9cd054e96129ac87f6e3709 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 24 Jul 2024 13:44:28 +0000 Subject: [PATCH 2989/3485] Updating readme file for ubuntu22 version 20240721.1.1 (#10324) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2204-Readme.md | 50 +++++++++++++++--------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/images/ubuntu/Ubuntu2204-Readme.md b/images/ubuntu/Ubuntu2204-Readme.md index 272610111727..d84163f5b2b2 100644 --- a/images/ubuntu/Ubuntu2204-Readme.md +++ b/images/ubuntu/Ubuntu2204-Readme.md @@ -5,8 +5,8 @@ *** # Ubuntu 22.04 - OS Version: 22.04.4 LTS -- Kernel Version: 6.5.0-1023-azure -- Image Version: 20240714.1.0 +- Kernel Version: 6.5.0-1024-azure +- Image Version: 20240721.1.0 - Systemd version: 249.11-0ubuntu3.12 ## Installed Software @@ -32,7 +32,7 @@ ### Package Management - cpan 1.64 - Helm 3.15.3 -- Homebrew 4.3.9 +- Homebrew 4.3.10 - Miniconda 24.5.0 - Npm 10.7.0 - NuGet 6.6.1.2 @@ -40,7 +40,7 @@ - Pip3 22.0.2 - Pipx 1.6.0 - RubyGems 3.3.5 -- Vcpkg (build from commit 7aeffc910) +- Vcpkg (build from commit 821100d96) - Yarn 1.22.22 #### Environment variables @@ -60,24 +60,24 @@ to accomplish this. ### Project Management - Ant 1.10.12 - Gradle 8.9 -- Lerna 8.1.6 +- Lerna 8.1.7 - Maven 3.8.8 - Sbt 1.10.1 ### Tools -- Ansible 2.17.1 +- Ansible 2.17.2 - apt-fast 1.10.0 - AzCopy 10.25.1 - available by `azcopy` and `azcopy10` aliases - Bazel 7.2.1 - Bazelisk 1.19.0 -- Bicep 0.28.1 +- Bicep 0.29.45 - Buildah 1.23.1 -- CMake 3.30.0 +- CMake 3.30.1 - CodeQL Action Bundle 2.18.0 - Docker Amazon ECR Credential Helper 0.8.0 - Docker Compose v1 1.29.2 - Docker Compose v2 2.27.1 -- Docker-Buildx 0.16.0 +- Docker-Buildx 0.16.1 - Docker Client 26.1.3 - Docker Server 26.1.3 - Fastlane 2.221.1 @@ -85,11 +85,11 @@ to accomplish this. - Git LFS 3.5.1 - Git-ftp 1.6.0 - Haveged 1.9.14 -- Heroku 8.11.5 +- Heroku 9.0.0 - jq 1.6 - Kind 0.23.0 -- Kubectl 1.30.2 -- Kustomize 5.4.2 +- Kubectl 1.30.3 +- Kustomize 5.4.3 - Leiningen 2.11.2 - MediaInfo 21.09 - Mercurial 6.1.1 @@ -101,7 +101,7 @@ to accomplish this. - Packer 1.11.1 - Parcel 2.12.0 - Podman 3.4.4 -- Pulumi 3.124.0 +- Pulumi 3.125.0 - R 4.4.1 - Skopeo 1.4.1 - Sphinx Open Source Search Server 2.2.11 @@ -112,18 +112,18 @@ to accomplish this. - zstd 1.5.6 ### CLI Tools -- Alibaba Cloud CLI 3.0.213 -- AWS CLI 2.17.13 +- Alibaba Cloud CLI 3.0.214 +- AWS CLI 2.17.14 - AWS CLI Session Manager Plugin 1.2.650.0 - AWS SAM CLI 1.120.0 - Azure CLI 2.62.0 - Azure CLI (azure-devops) 1.0.1 -- GitHub CLI 2.52.0 -- Google Cloud CLI 483.0.0 -- Netlify CLI 17.33.3 -- OpenShift CLI 4.16.2 +- GitHub CLI 2.53.0 +- Google Cloud CLI 484.0.0 +- Netlify CLI 17.33.4 +- OpenShift CLI 4.16.3 - ORAS CLI 1.2.0 -- Vercel CLI 34.3.1 +- Vercel CLI 35.1.0 ### Java | Version | Environment Variable | @@ -162,12 +162,12 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 126.0.6478.126 -- ChromeDriver 126.0.6478.126 +- Google Chrome 126.0.6478.182 +- ChromeDriver 126.0.6478.182 - Chromium 126.0.6478.0 -- Microsoft Edge 126.0.2592.102 +- Microsoft Edge 126.0.2592.113 - Microsoft Edge WebDriver 126.0.2592.102 -- Selenium server 4.22.0 +- Selenium server 4.23.0 - Mozilla Firefox 128.0 - Geckodriver 0.34.0 @@ -333,7 +333,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | libgbm-dev | 23.2.1-1ubuntu3.1\~22.04.2 | | libgconf-2-4 | 3.2.6-7ubuntu2 | | libgsl-dev | 2.7.1+dfsg-3 | -| libgtk-3-0 | 3.24.33-1ubuntu2.1 | +| libgtk-3-0 | 3.24.33-1ubuntu2.2 | | libmagic-dev | 1:5.41-3ubuntu0.1 | | libmagickcore-dev | 8:6.9.11.60+dfsg-1.3ubuntu0.22.04.3 | | libmagickwand-dev | 8:6.9.11.60+dfsg-1.3ubuntu0.22.04.3 | From d7ed5cb7b0779442c67919637d26794d9ad28e92 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 24 Jul 2024 19:01:34 +0000 Subject: [PATCH 2990/3485] Updating readme file for macos-13 version 20240721.3 (#10328) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-13-Readme.md | 39 ++++++++++++++++----------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/images/macos/macos-13-Readme.md b/images/macos/macos-13-Readme.md index ed8b7c4e7dbe..2f5be0a0d21c 100644 --- a/images/macos/macos-13-Readme.md +++ b/images/macos/macos-13-Readme.md @@ -2,12 +2,11 @@ |-| | [[macOS] GCC 11 will be removed from all macOS images on August 12](https://github.com/actions/runner-images/issues/10213) | | [[macOS] Default Xcode on macOS 14 Sonoma will be set to Xcode 15.4 on July, 22](https://github.com/actions/runner-images/issues/10121) | -| [[macOS] Default Xcode on macOS 13 Ventura will be set to Xcode 15.2 on July, 15](https://github.com/actions/runner-images/issues/10120) | *** # macOS 13 - OS Version: macOS 13.6.7 (22G720) - Kernel Version: Darwin 22.6.0 -- Image Version: 20240714.1 +- Image Version: 20240721.3 ## Installed Software @@ -33,17 +32,17 @@ - Ruby 3.0.7p220 ### Package Management -- Bundler 2.5.15 +- Bundler 2.5.16 - Carthage 0.39.1 - CocoaPods 1.15.2 - Composer 2.7.7 -- Homebrew 4.3.9 +- Homebrew 4.3.10 - NPM 10.7.0 - NuGet 6.3.1.1 - Pip3 24.1.2 (python 3.12) - Pipx 1.6.0 -- RubyGems 3.5.15 -- Vcpkg 2024 (build from commit 7aeffc910) +- RubyGems 3.5.16 +- Vcpkg 2024 (build from commit 821100d96) - Yarn 1.22.22 ### Project Management @@ -61,7 +60,7 @@ - Curl 8.8.0 - Git 2.45.2 - Git LFS 3.5.1 -- GitHub CLI 2.52.0 +- GitHub CLI 2.53.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.24.5 - gpg (GnuPG) 2.4.5 @@ -73,13 +72,13 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.17.13 +- AWS CLI 2.17.14 - AWS SAM CLI 1.120.0 - AWS Session Manager CLI 1.2.650.0 - Azure CLI 2.62.0 - Azure CLI (azure-devops) 1.0.1 -- Bicep CLI 0.28.1 -- Cmake 3.30.0 +- Bicep CLI 0.29.45 +- Cmake 3.30.1 - CodeQL Action Bundle 2.18.0 - Fastlane 2.221.1 - SwiftFormat 0.54.1 @@ -93,14 +92,14 @@ ### Browsers - Safari 17.5 (18618.2.12.111.5) - SafariDriver 17.5 (18618.2.12.111.5) -- Google Chrome 126.0.6478.127 -- Google Chrome for Testing 126.0.6478.126 -- ChromeDriver 126.0.6478.126 -- Microsoft Edge 126.0.2592.102 +- Google Chrome 126.0.6478.183 +- Google Chrome for Testing 126.0.6478.182 +- ChromeDriver 126.0.6478.182 +- Microsoft Edge 126.0.2592.113 - Microsoft Edge WebDriver 126.0.2592.102 - Mozilla Firefox 128.0 - geckodriver 0.34.0 -- Selenium server 4.22.0 +- Selenium server 4.23.0 #### Environment variables | Name | Value | @@ -112,10 +111,10 @@ ### Java | Version | Environment Variable | | ------------------- | -------------------- | -| 8.0.412+8 | JAVA_HOME_8_X64 | -| 11.0.23+9 | JAVA_HOME_11_X64 | -| 17.0.11+9 (default) | JAVA_HOME_17_X64 | -| 21.0.3+9.0 | JAVA_HOME_21_X64 | +| 8.0.422+5 | JAVA_HOME_8_X64 | +| 11.0.24+8 | JAVA_HOME_11_X64 | +| 17.0.12+7 (default) | JAVA_HOME_17_X64 | +| 21.0.4+7.0 | JAVA_HOME_21_X64 | ### Cached Tools @@ -209,8 +208,8 @@ | Simulator - watchOS 9.4 | watchsimulator9.4 | 14.3.1 | | Simulator - watchOS 10.0 | watchsimulator10.0 | 15.0.1 | | Simulator - watchOS 10.2 | watchsimulator10.2 | 15.1, 15.2 | -| visionOS 1.0 | xros1.0 | 15.2 | | Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | +| visionOS 1.0 | xros1.0 | 15.2 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | From a74e63c6b16a040e79578dcb7756c781a78da654 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 24 Jul 2024 20:12:28 +0000 Subject: [PATCH 2991/3485] Updating readme file for macos-13-arm64 version 20240721.1 (#10316) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-13-arm64-Readme.md | 33 +++++++++++++-------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/images/macos/macos-13-arm64-Readme.md b/images/macos/macos-13-arm64-Readme.md index b2e5eef4fdb8..c8ad51252c5c 100644 --- a/images/macos/macos-13-arm64-Readme.md +++ b/images/macos/macos-13-arm64-Readme.md @@ -2,12 +2,11 @@ |-| | [[macOS] GCC 11 will be removed from all macOS images on August 12](https://github.com/actions/runner-images/issues/10213) | | [[macOS] Default Xcode on macOS 14 Sonoma will be set to Xcode 15.4 on July, 22](https://github.com/actions/runner-images/issues/10121) | -| [[macOS] Default Xcode on macOS 13 Ventura will be set to Xcode 15.2 on July, 15](https://github.com/actions/runner-images/issues/10120) | *** # macOS 13 - OS Version: macOS 13.6.7 (22G720) - Kernel Version: Darwin 22.6.0 -- Image Version: 20240714.1 +- Image Version: 20240721.1 ## Installed Software @@ -32,15 +31,15 @@ - Ruby 3.0.7p220 ### Package Management -- Bundler 2.5.15 +- Bundler 2.5.16 - Carthage 0.39.1 - CocoaPods 1.15.2 -- Homebrew 4.3.9 +- Homebrew 4.3.10 - NPM 10.7.0 - NuGet 6.3.1.1 - Pip3 24.0 (python 3.12) - Pipx 1.6.0 -- RubyGems 3.5.15 +- RubyGems 3.5.16 - Yarn 1.22.22 ### Project Management @@ -58,7 +57,7 @@ - Curl 8.4.0 - Git 2.45.2 - Git LFS 3.5.1 -- GitHub CLI 2.52.0 +- GitHub CLI 2.53.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.24.5 - gpg (GnuPG) 2.4.5 @@ -70,13 +69,13 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.17.13 +- AWS CLI 2.17.14 - AWS SAM CLI 1.120.0 - AWS Session Manager CLI 1.2.650.0 - Azure CLI 2.62.0 - Azure CLI (azure-devops) 1.0.1 -- Bicep CLI 0.28.1 -- Cmake 3.30.0 +- Bicep CLI 0.29.45 +- Cmake 3.30.1 - CodeQL Action Bundle 2.18.0 - Fastlane 2.221.1 - SwiftFormat 0.54.1 @@ -89,10 +88,10 @@ ### Browsers - Safari 17.5 (18618.2.12.111.5) - SafariDriver 17.5 (18618.2.12.111.5) -- Google Chrome 126.0.6478.127 -- Google Chrome for Testing 126.0.6478.126 -- ChromeDriver 126.0.6478.126 -- Selenium server 4.22.0 +- Google Chrome 126.0.6478.183 +- Google Chrome for Testing 126.0.6478.182 +- ChromeDriver 126.0.6478.182 +- Selenium server 4.23.0 #### Environment variables | Name | Value | @@ -104,9 +103,9 @@ ### Java | Version | Environment Variable | | ------------------- | -------------------- | -| 11.0.23+9 | JAVA_HOME_11_arm64 | -| 17.0.11+9 (default) | JAVA_HOME_17_arm64 | -| 21.0.3+9.0 | JAVA_HOME_21_arm64 | +| 11.0.24+8 | JAVA_HOME_11_arm64 | +| 17.0.12+7 (default) | JAVA_HOME_17_arm64 | +| 21.0.4+7.0 | JAVA_HOME_21_arm64 | ### Cached Tools @@ -191,8 +190,8 @@ | Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | | visionOS 1.0 | xros1.0 | 15.2 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | -| Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | +| Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | DriverKit 22.1 | driverkit22.1 | 14.1 | | DriverKit 22.2 | driverkit22.2 | 14.2 | | DriverKit 22.4 | driverkit22.4 | 14.3.1 | From abe90c161995c1485e54e0602d4833fb12889427 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 24 Jul 2024 23:31:20 +0000 Subject: [PATCH 2992/3485] Updating readme file for win22 version 20240721.1.1 (#10325) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/windows/Windows2022-Readme.md | 44 ++++++++++++++-------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/images/windows/Windows2022-Readme.md b/images/windows/Windows2022-Readme.md index 0f468c4085ea..f6a9a05b99be 100644 --- a/images/windows/Windows2022-Readme.md +++ b/images/windows/Windows2022-Readme.md @@ -4,7 +4,7 @@ *** # Windows Server 2022 - OS Version: 10.0.20348 Build 2582 -- Image Version: 20240714.1.0 +- Image Version: 20240721.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -16,7 +16,7 @@ - Go 1.21.12 - Julia 1.10.4 - Kotlin 2.0.0 -- LLVM 18.1.6 +- LLVM 18.1.8 - Node 18.20.3 - Perl 5.32.1 - PHP 8.3.9 @@ -33,7 +33,7 @@ - pip 24.1.2 (python 3.9) - Pipx 1.6.0 - RubyGems 3.2.33 -- Vcpkg (build from commit 7aeffc910) +- Vcpkg (build from commit 821100d96) - Yarn 1.22.22 #### Environment variables @@ -54,9 +54,9 @@ - azcopy 10.25.1 - Bazel 7.2.1 - Bazelisk 1.19.0 -- Bicep 0.28.1 +- Bicep 0.29.45 - Cabal 3.12.1.0 -- CMake 3.30.0 +- CMake 3.30.1 - CodeQL Action Bundle 2.18.0 - Docker 26.1.3 - Docker Compose v1 1.29.2 @@ -65,11 +65,11 @@ - ghc 9.10.1 - Git 2.45.2.windows.1 - Git LFS 3.5.1 -- ImageMagick 7.1.1-34 +- ImageMagick 7.1.1-35 - InnoSetup 6.3.3 - jq 1.7.1 - Kind 0.23.0 -- Kubectl 1.30.2 +- Kubectl 1.30.3 - Mercurial 5.0 - gcc 12.2.0 - gdb 11.2 @@ -78,7 +78,7 @@ - NSIS 3.10 - OpenSSL 1.1.1w - Packer 1.11.0 -- Pulumi 3.124.0 +- Pulumi 3.125.0 - R 4.4.1 - Service Fabric SDK 9.1.1436.9590 - Stack 2.15.7 @@ -91,13 +91,13 @@ - zstd 1.5.6 ### CLI Tools -- Alibaba Cloud CLI 3.0.213 -- AWS CLI 2.17.13 +- Alibaba Cloud CLI 3.0.214 +- AWS CLI 2.17.14 - AWS SAM CLI 1.120.0 - AWS Session Manager CLI 1.2.650.0 - Azure CLI 2.62.0 - Azure DevOps CLI extension 1.0.1 -- GitHub CLI 2.52.0 +- GitHub CLI 2.53.0 ### Rust Tools - Cargo 1.79.0 @@ -114,14 +114,14 @@ - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 126.0.6478.127 -- Chrome Driver 126.0.6478.126 -- Microsoft Edge 126.0.2592.102 -- Microsoft Edge Driver 126.0.2592.102 +- Google Chrome 126.0.6478.183 +- Chrome Driver 126.0.6478.182 +- Microsoft Edge 126.0.2592.113 +- Microsoft Edge Driver 126.0.2592.113 - Mozilla Firefox 128.0 - Gecko Driver 0.34.0 - IE Driver 4.14.0.0 -- Selenium server 4.22.0 +- Selenium server 4.23.0 #### Environment variables | Name | Value | @@ -134,10 +134,10 @@ ### Java | Version | Environment Variable | | ------------------- | -------------------- | -| 8.0.412+8 (default) | JAVA_HOME_8_X64 | -| 11.0.23+9 | JAVA_HOME_11_X64 | -| 17.0.11+9 | JAVA_HOME_17_X64 | -| 21.0.3+9.0 | JAVA_HOME_21_X64 | +| 8.0.422+5 (default) | JAVA_HOME_8_X64 | +| 11.0.24+8 | JAVA_HOME_11_X64 | +| 17.0.12+7 | JAVA_HOME_17_X64 | +| 21.0.4+7.0 | JAVA_HOME_21_X64 | ### Shells | Name | Target | @@ -504,14 +504,14 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - AzureRM: 2.1.0 (Default), 6.13.1 - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.618 +- AWSPowershell: 4.1.619 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.10 - Microsoft.Graph: 2.20.0 - Pester: 3.4.0, 5.6.1 - PowerShellGet: 1.0.0.1, 2.2.5 - PSScriptAnalyzer: 1.22.0 -- PSWindowsUpdate: 2.2.1.4 +- PSWindowsUpdate: 2.2.1.5 - SqlServer: 22.3.0 - VSSetup: 2.2.16 ``` From cea9d0e0d17b22a93a0986ac5b54845bc55f6730 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 25 Jul 2024 13:49:17 +0000 Subject: [PATCH 2993/3485] Updating readme file for macos-14 version 20240722.3 (#10330) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-14-Readme.md | 61 ++++++++++++++++----------------- 1 file changed, 30 insertions(+), 31 deletions(-) diff --git a/images/macos/macos-14-Readme.md b/images/macos/macos-14-Readme.md index d199f1fc3c86..4909b287ecf2 100644 --- a/images/macos/macos-14-Readme.md +++ b/images/macos/macos-14-Readme.md @@ -2,12 +2,11 @@ |-| | [[macOS] GCC 11 will be removed from all macOS images on August 12](https://github.com/actions/runner-images/issues/10213) | | [[macOS] Default Xcode on macOS 14 Sonoma will be set to Xcode 15.4 on July, 22](https://github.com/actions/runner-images/issues/10121) | -| [[macOS] Default Xcode on macOS 13 Ventura will be set to Xcode 15.2 on July, 15](https://github.com/actions/runner-images/issues/10120) | *** # macOS 14 - OS Version: macOS 14.5 (23F79) - Kernel Version: Darwin 23.5.0 -- Image Version: 20240714.2 +- Image Version: 20240722.3 ## Installed Software @@ -33,16 +32,16 @@ - Ruby 3.0.7p220 ### Package Management -- Bundler 2.5.15 +- Bundler 2.5.16 - Carthage 0.39.1 - CocoaPods 1.15.2 - Composer 2.7.7 -- Homebrew 4.3.9 +- Homebrew 4.3.10 - NPM 10.7.0 - NuGet 6.3.1.1 - Pip3 24.1.2 (python 3.12) - Pipx 1.6.0 -- RubyGems 3.5.15 +- RubyGems 3.5.16 - Yarn 1.22.22 ### Project Management @@ -60,7 +59,7 @@ - Curl 8.8.0 - Git 2.45.2 - Git LFS 3.5.1 -- GitHub CLI 2.52.0 +- GitHub CLI 2.53.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.24.5 - gpg (GnuPG) 2.4.5 @@ -72,16 +71,16 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.17.13 +- AWS CLI 2.17.14 - AWS SAM CLI 1.120.0 - AWS Session Manager CLI 1.2.650.0 - Azure CLI 2.62.0 - Azure CLI (azure-devops) 1.0.1 -- Bicep CLI 0.28.1 -- Cmake 3.30.0 +- Bicep CLI 0.29.45 +- Cmake 3.30.1 - CodeQL Action Bundle 2.18.0 - Fastlane 2.221.1 -- SwiftFormat 0.54.1 +- SwiftFormat 0.54.2 - Xcbeautify 2.4.1 - Xcode Command Line Tools 15.3.0.0.1.1708646388 - Xcodes 1.5.0 @@ -92,14 +91,14 @@ ### Browsers - Safari 17.5 (19618.2.12.11.6) - SafariDriver 17.5 (19618.2.12.11.6) -- Google Chrome 126.0.6478.127 -- Google Chrome for Testing 126.0.6478.126 -- ChromeDriver 126.0.6478.126 -- Microsoft Edge 126.0.2592.102 +- Google Chrome 126.0.6478.183 +- Google Chrome for Testing 126.0.6478.182 +- ChromeDriver 126.0.6478.182 +- Microsoft Edge 126.0.2592.113 - Microsoft Edge WebDriver 126.0.2592.102 - Mozilla Firefox 128.0 - geckodriver 0.34.0 -- Selenium server 4.22.0 +- Selenium server 4.23.0 #### Environment variables | Name | Value | @@ -111,10 +110,10 @@ ### Java | Version | Environment Variable | | -------------------- | -------------------- | -| 8.0.412+8 | JAVA_HOME_8_X64 | -| 11.0.23+9 | JAVA_HOME_11_X64 | -| 17.0.11+9 | JAVA_HOME_17_X64 | -| 21.0.3+9.0 (default) | JAVA_HOME_21_X64 | +| 8.0.422+5 | JAVA_HOME_8_X64 | +| 11.0.24+8 | JAVA_HOME_11_X64 | +| 17.0.12+7 | JAVA_HOME_17_X64 | +| 21.0.4+7.0 (default) | JAVA_HOME_21_X64 | ### Cached Tools @@ -156,15 +155,15 @@ - PSScriptAnalyzer: 1.22.0 ### Xcode -| Version | Build | Path | -| ---------------- | -------- | ------------------------------ | -| 16.0 (beta) | 16A5171r | /Applications/Xcode_16.0.app | -| 15.4 | 15F31d | /Applications/Xcode_15.4.app | -| 15.3 | 15E204a | /Applications/Xcode_15.3.app | -| 15.2 | 15C500b | /Applications/Xcode_15.2.app | -| 15.1 | 15C65 | /Applications/Xcode_15.1.app | -| 15.0.1 (default) | 15A507 | /Applications/Xcode_15.0.1.app | -| 14.3.1 | 14E300c | /Applications/Xcode_14.3.1.app | +| Version | Build | Path | +| -------------- | -------- | --------------------------------- | +| 16.0 (beta) | 16A5202i | /Applications/Xcode_16_beta_3.app | +| 15.4 (default) | 15F31d | /Applications/Xcode_15.4.app | +| 15.3 | 15E204a | /Applications/Xcode_15.3.app | +| 15.2 | 15C500b | /Applications/Xcode_15.2.app | +| 15.1 | 15C65 | /Applications/Xcode_15.1.app | +| 15.0.1 | 15A507 | /Applications/Xcode_15.0.1.app | +| 14.3.1 | 14E300c | /Applications/Xcode_14.3.1.app | #### Installed SDKs | SDK | SDK Name | Xcode Version | @@ -211,12 +210,12 @@ | Simulator - watchOS 10.4 | watchsimulator10.4 | 15.3 | | Simulator - watchOS 10.5 | watchsimulator10.5 | 15.4 | | Simulator - watchOS 11.0 | watchsimulator11.0 | 16.0 | -| visionOS 1.0 | xros1.0 | 15.2 | | Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | -| Simulator - visionOS 1.1 | xrsimulator1.1 | 15.3 | +| visionOS 1.0 | xros1.0 | 15.2 | | visionOS 1.1 | xros1.1 | 15.3 | -| visionOS 1.2 | xros1.2 | 15.4 | +| Simulator - visionOS 1.1 | xrsimulator1.1 | 15.3 | | Simulator - visionOS 1.2 | xrsimulator1.2 | 15.4 | +| visionOS 1.2 | xros1.2 | 15.4 | | visionOS 2.0 | xros2.0 | 16.0 | | Simulator - visionOS 2.0 | xrsimulator2.0 | 16.0 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | From a89507e2afb143975dd486991f0f60cb5f4a7283 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 25 Jul 2024 16:54:38 +0000 Subject: [PATCH 2994/3485] Updating readme file for macos-14-arm64 version 20240722.3 (#10334) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-14-arm64-Readme.md | 57 +++++++++++++-------------- 1 file changed, 28 insertions(+), 29 deletions(-) diff --git a/images/macos/macos-14-arm64-Readme.md b/images/macos/macos-14-arm64-Readme.md index a7da6ceed463..a7c406b78b5b 100644 --- a/images/macos/macos-14-arm64-Readme.md +++ b/images/macos/macos-14-arm64-Readme.md @@ -2,12 +2,11 @@ |-| | [[macOS] GCC 11 will be removed from all macOS images on August 12](https://github.com/actions/runner-images/issues/10213) | | [[macOS] Default Xcode on macOS 14 Sonoma will be set to Xcode 15.4 on July, 22](https://github.com/actions/runner-images/issues/10121) | -| [[macOS] Default Xcode on macOS 13 Ventura will be set to Xcode 15.2 on July, 15](https://github.com/actions/runner-images/issues/10120) | *** # macOS 14 - OS Version: macOS 14.5 (23F79) - Kernel Version: Darwin 23.5.0 -- Image Version: 20240714.2 +- Image Version: 20240722.3 ## Installed Software @@ -32,15 +31,15 @@ - Ruby 3.0.7p220 ### Package Management -- Bundler 2.5.15 +- Bundler 2.5.16 - Carthage 0.39.1 - CocoaPods 1.15.2 -- Homebrew 4.3.9 +- Homebrew 4.3.10 - NPM 10.7.0 - NuGet 6.3.1.1 - Pip3 24.0 (python 3.12) - Pipx 1.6.0 -- RubyGems 3.5.15 +- RubyGems 3.5.16 - Yarn 1.22.22 ### Project Management @@ -58,7 +57,7 @@ - Curl 8.6.0 - Git 2.45.2 - Git LFS 3.5.1 -- GitHub CLI 2.52.0 +- GitHub CLI 2.53.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.24.5 - gpg (GnuPG) 2.4.5 @@ -70,16 +69,16 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.17.13 +- AWS CLI 2.17.14 - AWS SAM CLI 1.120.0 - AWS Session Manager CLI 1.2.650.0 - Azure CLI 2.62.0 - Azure CLI (azure-devops) 1.0.1 -- Bicep CLI 0.28.1 -- Cmake 3.30.0 +- Bicep CLI 0.29.45 +- Cmake 3.30.1 - CodeQL Action Bundle 2.18.0 - Fastlane 2.221.1 -- SwiftFormat 0.54.1 +- SwiftFormat 0.54.2 - Xcbeautify 2.4.1 - Xcode Command Line Tools 15.3.0.0.1.1708646388 - Xcodes 1.5.0 @@ -89,10 +88,10 @@ ### Browsers - Safari 17.5 (19618.2.12.11.6) - SafariDriver 17.5 (19618.2.12.11.6) -- Google Chrome 126.0.6478.127 -- Google Chrome for Testing 126.0.6478.126 -- ChromeDriver 126.0.6478.126 -- Selenium server 4.22.0 +- Google Chrome 126.0.6478.183 +- Google Chrome for Testing 126.0.6478.182 +- ChromeDriver 126.0.6478.182 +- Selenium server 4.23.0 #### Environment variables | Name | Value | @@ -104,9 +103,9 @@ ### Java | Version | Environment Variable | | -------------------- | -------------------- | -| 11.0.23+9 | JAVA_HOME_11_arm64 | -| 17.0.11+9 | JAVA_HOME_17_arm64 | -| 21.0.3+9.0 (default) | JAVA_HOME_21_arm64 | +| 11.0.24+8 | JAVA_HOME_11_arm64 | +| 17.0.12+7 | JAVA_HOME_17_arm64 | +| 21.0.4+7.0 (default) | JAVA_HOME_21_arm64 | ### Cached Tools @@ -144,15 +143,15 @@ - PSScriptAnalyzer: 1.22.0 ### Xcode -| Version | Build | Path | -| ---------------- | -------- | ------------------------------ | -| 16.0 (beta) | 16A5171r | /Applications/Xcode_16.0.app | -| 15.4 | 15F31d | /Applications/Xcode_15.4.app | -| 15.3 | 15E204a | /Applications/Xcode_15.3.app | -| 15.2 | 15C500b | /Applications/Xcode_15.2.app | -| 15.1 | 15C65 | /Applications/Xcode_15.1.app | -| 15.0.1 (default) | 15A507 | /Applications/Xcode_15.0.1.app | -| 14.3.1 | 14E300c | /Applications/Xcode_14.3.1.app | +| Version | Build | Path | +| -------------- | -------- | --------------------------------- | +| 16.0 (beta) | 16A5202i | /Applications/Xcode_16_beta_3.app | +| 15.4 (default) | 15F31d | /Applications/Xcode_15.4.app | +| 15.3 | 15E204a | /Applications/Xcode_15.3.app | +| 15.2 | 15C500b | /Applications/Xcode_15.2.app | +| 15.1 | 15C65 | /Applications/Xcode_15.1.app | +| 15.0.1 | 15A507 | /Applications/Xcode_15.0.1.app | +| 14.3.1 | 14E300c | /Applications/Xcode_14.3.1.app | #### Installed SDKs | SDK | SDK Name | Xcode Version | @@ -201,15 +200,15 @@ | Simulator - watchOS 11.0 | watchsimulator11.0 | 16.0 | | visionOS 1.0 | xros1.0 | 15.2 | | Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | -| visionOS 1.1 | xros1.1 | 15.3 | | Simulator - visionOS 1.1 | xrsimulator1.1 | 15.3 | +| visionOS 1.1 | xros1.1 | 15.3 | | Simulator - visionOS 1.2 | xrsimulator1.2 | 15.4 | | visionOS 1.2 | xros1.2 | 15.4 | -| visionOS 2.0 | xros2.0 | 16.0 | | Simulator - visionOS 2.0 | xrsimulator2.0 | 16.0 | +| visionOS 2.0 | xros2.0 | 16.0 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | -| Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | +| Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | | DriverKit 22.4 | driverkit22.4 | 14.3.1 | | DriverKit 23.0 | driverkit23.0 | 15.0.1 | | DriverKit 23.2 | driverkit23.2 | 15.1, 15.2 | From fbd6c33be3f2fa95adc67f4ceae5de87cf5b3324 Mon Sep 17 00:00:00 2001 From: sarathrajsrinivasan <159180023+sarathrajsrinivasan@users.noreply.github.com> Date: Fri, 26 Jul 2024 01:45:45 -0700 Subject: [PATCH 2995/3485] [macOS] Add Xcode 16.0 Beta 4 for macOS14 (#10345) --- images/macos/toolsets/toolset-14.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/macos/toolsets/toolset-14.json b/images/macos/toolsets/toolset-14.json index 96dede39e913..82c748d13370 100644 --- a/images/macos/toolsets/toolset-14.json +++ b/images/macos/toolsets/toolset-14.json @@ -3,7 +3,7 @@ "default": "15.4", "x64": { "versions": [ - { "link": "16_beta_3", "version": "16.0.0-Beta.3+16A5202i", "symlinks": ["16.0"], "install_runtimes": "false", "sha256": "371dae95b8c19fe7afbd0304b19c48380b61f22802debf2094bde06939df3fec"}, + { "link": "16_beta_4", "version": "16.0.0-Beta.4+16A5211f", "symlinks": ["16.0"], "install_runtimes": "false", "sha256": "4270cd8021b2f7f512ce91bfc4423b25bccab36cdab21834709d798c8daade72"}, { "link": "15.4", "version": "15.4.0+15F31d", "install_runtimes": "true", "sha256": "82d3d61804ff3f4c7c82085e91dc701037ddaa770e542848b2477e22f4e8aa7a"}, { "link": "15.3", "version": "15.3.0+15E204a", "install_runtimes": "true", "sha256": "f13f6a2e2df432c3008e394640b8549a18c285acd7fd148d6c4bac8c3a5af234"}, { "link": "15.2", "version": "15.2.0+15C500b", "install_runtimes": "true", "sha256": "04E93680C6DDBEC84666531BE412DE778AFC8EAC6AB2037F4C2BE7290818B59B"}, @@ -14,7 +14,7 @@ }, "arm64":{ "versions": [ - { "link": "16_beta_3", "version": "16.0.0-Beta.3+16A5202i", "symlinks": ["16.0"], "install_runtimes": "true", "sha256": "371dae95b8c19fe7afbd0304b19c48380b61f22802debf2094bde06939df3fec"}, + { "link": "16_beta_4", "version": "16.0.0-Beta.4+16A5211f", "symlinks": ["16.0"], "install_runtimes": "true", "sha256": "4270cd8021b2f7f512ce91bfc4423b25bccab36cdab21834709d798c8daade72"}, { "link": "15.4", "version": "15.4.0+15F31d", "install_runtimes": "true", "sha256": "82d3d61804ff3f4c7c82085e91dc701037ddaa770e542848b2477e22f4e8aa7a"}, { "link": "15.3", "version": "15.3.0+15E204a", "install_runtimes": "true", "sha256": "f13f6a2e2df432c3008e394640b8549a18c285acd7fd148d6c4bac8c3a5af234"}, { "link": "15.2", "version": "15.2.0+15C500b", "install_runtimes": "true", "sha256": "04E93680C6DDBEC84666531BE412DE778AFC8EAC6AB2037F4C2BE7290818B59B"}, From e72f29bfc89e4fd23c0438021cc114a44530bafa Mon Sep 17 00:00:00 2001 From: kishorekumar-anchala <168699259+kishorekumar-anchala@users.noreply.github.com> Date: Fri, 26 Jul 2024 17:24:23 +0530 Subject: [PATCH 2996/3485] Fix vs22 signature issue (#10351) --- images/windows/toolsets/toolset-2022.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/windows/toolsets/toolset-2022.json b/images/windows/toolsets/toolset-2022.json index 8a028e4e4339..b599185c9f5a 100644 --- a/images/windows/toolsets/toolset-2022.json +++ b/images/windows/toolsets/toolset-2022.json @@ -177,7 +177,7 @@ "subversion" : "17", "edition" : "Enterprise", "channel": "release", - "signature": "F9A7CF9FBE13BAC767F4781061332DA6E8B4E0EE", + "signature": "C2048FB509F1C37A8C3E9EC6648118458AA01780", "workloads": [ "Component.Dotfuscator", "Component.Linux.CMake", From 24a5edcdc89b05779ec1fed530d32e32a4722b62 Mon Sep 17 00:00:00 2001 From: kishorekumar-anchala <168699259+kishorekumar-anchala@users.noreply.github.com> Date: Sat, 27 Jul 2024 01:04:26 +0530 Subject: [PATCH 2997/3485] fix rust issue (#10354) --- images/ubuntu/scripts/build/install-rust.sh | 2 +- images/windows/scripts/build/Install-Rust.ps1 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/images/ubuntu/scripts/build/install-rust.sh b/images/ubuntu/scripts/build/install-rust.sh index fdf5d9c705dc..f27a071ad595 100644 --- a/images/ubuntu/scripts/build/install-rust.sh +++ b/images/ubuntu/scripts/build/install-rust.sh @@ -24,7 +24,7 @@ if is_ubuntu22; then fi if is_ubuntu20; then - cargo install --locked bindgen-cli cbindgen cargo-audit cargo-outdated + cargo install bindgen-cli cbindgen cargo-audit cargo-outdated fi # Cleanup Cargo cache diff --git a/images/windows/scripts/build/Install-Rust.ps1 b/images/windows/scripts/build/Install-Rust.ps1 index f388ca09005f..89b8a0271e57 100644 --- a/images/windows/scripts/build/Install-Rust.ps1 +++ b/images/windows/scripts/build/Install-Rust.ps1 @@ -40,7 +40,7 @@ if ($LASTEXITCODE -ne 0) { throw "Rust component installation failed with exit code $LASTEXITCODE" } -cargo install --locked bindgen-cli cbindgen cargo-audit cargo-outdated +cargo install bindgen-cli cbindgen cargo-audit cargo-outdated if ($LASTEXITCODE -ne 0) { throw "Rust tools installation failed with exit code $LASTEXITCODE" } From c7276710b3d8fd81b1c2a39ba6a747f0dac1e3de Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 27 Jul 2024 00:25:51 +0000 Subject: [PATCH 2998/3485] Updating readme file for macos-12 version 20240721.1 (#10322) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-12-Readme.md | 43 ++++++++++++++++----------------- 1 file changed, 21 insertions(+), 22 deletions(-) diff --git a/images/macos/macos-12-Readme.md b/images/macos/macos-12-Readme.md index 8348e89a8333..b3bdada88dc4 100644 --- a/images/macos/macos-12-Readme.md +++ b/images/macos/macos-12-Readme.md @@ -2,12 +2,11 @@ |-| | [[macOS] GCC 11 will be removed from all macOS images on August 12](https://github.com/actions/runner-images/issues/10213) | | [[macOS] Default Xcode on macOS 14 Sonoma will be set to Xcode 15.4 on July, 22](https://github.com/actions/runner-images/issues/10121) | -| [[macOS] Default Xcode on macOS 13 Ventura will be set to Xcode 15.2 on July, 15](https://github.com/actions/runner-images/issues/10120) | *** # macOS 12 - OS Version: macOS 12.7.5 (21H1222) - Kernel Version: Darwin 21.6.0 -- Image Version: 20240714.2 +- Image Version: 20240721.1 ## Installed Software @@ -40,19 +39,19 @@ - Ruby 3.0.7p220 ### Package Management -- Bundler 2.5.15 +- Bundler 2.5.16 - Carthage 0.39.1 - CocoaPods 1.15.2 - Composer 2.7.7 -- Homebrew 4.3.9 +- Homebrew 4.3.10 - Miniconda 24.5.0 - NPM 10.7.0 - NuGet 6.3.1.1 - Pip 20.3.4 (python 2.7) - Pip3 24.1.2 (python 3.12) - Pipx 1.6.0 -- RubyGems 3.5.15 -- Vcpkg 2024 (build from commit 7aeffc910) +- RubyGems 3.5.16 +- Vcpkg 2024 (build from commit 821100d96) - Yarn 1.22.22 #### Environment variables @@ -77,11 +76,11 @@ - Curl 8.8.0 - Git 2.45.2 - Git LFS 3.5.1 -- GitHub CLI 2.52.0 +- GitHub CLI 2.53.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.24.5 - gpg (GnuPG) 2.4.5 -- ImageMagick 7.1.1-34 +- ImageMagick 7.1.1-35 - jq 1.7.1 - mongo 5.0.28 - mongod 5.0.28 @@ -100,16 +99,16 @@ ### Tools - App Center CLI 3.0.1 -- AWS CLI 2.17.13 +- AWS CLI 2.17.14 - AWS SAM CLI 1.120.0 - AWS Session Manager CLI 1.2.650.0 - Azure CLI 2.62.0 - Azure CLI (azure-devops) 1.0.1 -- Bicep CLI 0.28.1 +- Bicep CLI 0.29.45 - Cabal 3.10.3.0 -- Cmake 3.30.0 +- Cmake 3.30.1 - CodeQL Action Bundle 2.18.0 -- Colima 0.6.9 +- Colima 0.6.10 - Fastlane 2.221.1 - GHC 9.10.1 - GHCup 0.1.30.0 @@ -128,14 +127,14 @@ ### Browsers - Safari 17.5 (17618.2.12.111.5) - SafariDriver 17.5 (17618.2.12.111.5) -- Google Chrome 126.0.6478.127 -- Google Chrome for Testing 126.0.6478.126 -- ChromeDriver 126.0.6478.126 -- Microsoft Edge 126.0.2592.102 +- Google Chrome 126.0.6478.183 +- Google Chrome for Testing 126.0.6478.182 +- ChromeDriver 126.0.6478.182 +- Microsoft Edge 126.0.2592.113 - Microsoft Edge WebDriver 126.0.2592.102 - Mozilla Firefox 128.0 - geckodriver 0.34.0 -- Selenium server 4.22.0 +- Selenium server 4.23.0 #### Environment variables | Name | Value | @@ -147,10 +146,10 @@ ### Java | Version | Environment Variable | | ------------------- | -------------------- | -| 8.0.412+8 (default) | JAVA_HOME_8_X64 | -| 11.0.23+9 | JAVA_HOME_11_X64 | -| 17.0.11+9 | JAVA_HOME_17_X64 | -| 21.0.3+9.0 | JAVA_HOME_21_X64 | +| 8.0.422+5 (default) | JAVA_HOME_8_X64 | +| 11.0.24+8 | JAVA_HOME_11_X64 | +| 17.0.12+7 | JAVA_HOME_17_X64 | +| 21.0.4+7.0 | JAVA_HOME_21_X64 | ### Cached Tools @@ -209,7 +208,7 @@ ### Web Servers | Name | Version | ConfigFile | ServiceStatus | ListenPort | | ----- | ------- | ------------------------------- | ------------- | ---------- | -| httpd | 2.4.61 | /usr/local/etc/httpd/httpd.conf | none | 80 | +| httpd | 2.4.62 | /usr/local/etc/httpd/httpd.conf | none | 80 | | nginx | 1.27.0 | /usr/local/etc/nginx/nginx.conf | none | 80 | ### Xamarin From cbea23f931ac8f1e6aa9023cfcc6b199fa7f2e04 Mon Sep 17 00:00:00 2001 From: kishorekumar-anchala <168699259+kishorekumar-anchala@users.noreply.github.com> Date: Mon, 29 Jul 2024 14:28:29 +0530 Subject: [PATCH 2999/3485] [Ubuntu,Windows] add Android NDK 27 version to images (#10343) * add ndk 27 version to images * add ndk 27 version to images1 --- images/ubuntu/toolsets/toolset-2004.json | 4 ++-- images/ubuntu/toolsets/toolset-2204.json | 4 ++-- images/ubuntu/toolsets/toolset-2404.json | 4 ++-- images/windows/toolsets/toolset-2019.json | 4 ++-- images/windows/toolsets/toolset-2022.json | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/images/ubuntu/toolsets/toolset-2004.json b/images/ubuntu/toolsets/toolset-2004.json index b7f3f35e8b26..cfbaa56bd389 100644 --- a/images/ubuntu/toolsets/toolset-2004.json +++ b/images/ubuntu/toolsets/toolset-2004.json @@ -92,9 +92,9 @@ "cmake;3.22.1" ], "ndk": { - "default": "25", + "default": "27", "versions": [ - "24", "25", "26" + "24", "25", "26", "27" ] } }, diff --git a/images/ubuntu/toolsets/toolset-2204.json b/images/ubuntu/toolsets/toolset-2204.json index 1217b8f4d30d..24738e52ee7b 100644 --- a/images/ubuntu/toolsets/toolset-2204.json +++ b/images/ubuntu/toolsets/toolset-2204.json @@ -89,9 +89,9 @@ "cmake;3.22.1" ], "ndk": { - "default": "25", + "default": "27", "versions": [ - "24", "25", "26" + "24", "25", "26", "27" ] } }, diff --git a/images/ubuntu/toolsets/toolset-2404.json b/images/ubuntu/toolsets/toolset-2404.json index bd0cf3565caa..6c927965b30e 100644 --- a/images/ubuntu/toolsets/toolset-2404.json +++ b/images/ubuntu/toolsets/toolset-2404.json @@ -79,9 +79,9 @@ "additional_tools": [ ], "ndk": { - "default": "26", + "default": "27", "versions": [ - "24", "25", "26" + "24", "25", "26", "27" ] } }, diff --git a/images/windows/toolsets/toolset-2019.json b/images/windows/toolsets/toolset-2019.json index 497f576c60f8..71755ce89f86 100644 --- a/images/windows/toolsets/toolset-2019.json +++ b/images/windows/toolsets/toolset-2019.json @@ -156,9 +156,9 @@ "cmake;3.22.1" ], "ndk": { - "default": "25", + "default": "27", "versions": [ - "24", "25", "26" + "24", "25", "26" , "27" ] } }, diff --git a/images/windows/toolsets/toolset-2022.json b/images/windows/toolsets/toolset-2022.json index b599185c9f5a..b219e98b0c34 100644 --- a/images/windows/toolsets/toolset-2022.json +++ b/images/windows/toolsets/toolset-2022.json @@ -146,9 +146,9 @@ "cmake;3.22.1" ], "ndk": { - "default": "25", + "default": "27", "versions": [ - "24", "25", "26" + "24", "25", "26", "27" ] } }, From fcf7cd18d4f930bbe89bb8c2cc04709d008f9a11 Mon Sep 17 00:00:00 2001 From: kishorekumar-anchala <168699259+kishorekumar-anchala@users.noreply.github.com> Date: Mon, 29 Jul 2024 15:16:32 +0530 Subject: [PATCH 3000/3485] add warump script for az cli (#10126) --- images/ubuntu/scripts/build/install-azure-cli.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/images/ubuntu/scripts/build/install-azure-cli.sh b/images/ubuntu/scripts/build/install-azure-cli.sh index 0004f7bdef63..1791755c2688 100644 --- a/images/ubuntu/scripts/build/install-azure-cli.sh +++ b/images/ubuntu/scripts/build/install-azure-cli.sh @@ -12,4 +12,11 @@ echo "azure-cli https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-lin rm -f /etc/apt/sources.list.d/azure-cli.list rm -f /etc/apt/sources.list.d/azure-cli.list.save +echo "Warmup 'az'" +az --help > /dev/null +if [ $? -ne 0 ]; then + echo "Command 'az --help' failed" + exit 1 +fi + invoke_tests "CLI.Tools" "Azure CLI" From f4cc7331d92b3d730b291e4f9ab359e132b425a8 Mon Sep 17 00:00:00 2001 From: "Image generation service account." <no-reply@microsoft.com> Date: Mon, 29 Jul 2024 10:52:19 +0000 Subject: [PATCH 3001/3485] Updating readme file for macos-14 version 20240728.1 --- images/macos/macos-14-Readme.md | 49 ++++++++++++++++----------------- 1 file changed, 24 insertions(+), 25 deletions(-) diff --git a/images/macos/macos-14-Readme.md b/images/macos/macos-14-Readme.md index 4909b287ecf2..5d2d97cd63f8 100644 --- a/images/macos/macos-14-Readme.md +++ b/images/macos/macos-14-Readme.md @@ -1,12 +1,11 @@ | Announcements | |-| | [[macOS] GCC 11 will be removed from all macOS images on August 12](https://github.com/actions/runner-images/issues/10213) | -| [[macOS] Default Xcode on macOS 14 Sonoma will be set to Xcode 15.4 on July, 22](https://github.com/actions/runner-images/issues/10121) | *** # macOS 14 - OS Version: macOS 14.5 (23F79) - Kernel Version: Darwin 23.5.0 -- Image Version: 20240722.3 +- Image Version: 20240728.1 ## Installed Software @@ -39,7 +38,7 @@ - Homebrew 4.3.10 - NPM 10.7.0 - NuGet 6.3.1.1 -- Pip3 24.1.2 (python 3.12) +- Pip3 24.2 (python 3.12) - Pipx 1.6.0 - RubyGems 3.5.16 - Yarn 1.22.22 @@ -56,7 +55,7 @@ - bazel 7.2.1 - bazelisk 1.20.0 - bsdtar 3.5.3 - available by 'tar' alias -- Curl 8.8.0 +- Curl 8.9.0 - Git 2.45.2 - Git LFS 3.5.1 - GitHub CLI 2.53.0 @@ -71,17 +70,17 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.17.14 +- AWS CLI 2.17.18 - AWS SAM CLI 1.120.0 - AWS Session Manager CLI 1.2.650.0 - Azure CLI 2.62.0 - Azure CLI (azure-devops) 1.0.1 -- Bicep CLI 0.29.45 +- Bicep CLI 0.29.47 - Cmake 3.30.1 -- CodeQL Action Bundle 2.18.0 -- Fastlane 2.221.1 +- CodeQL Action Bundle 2.18.1 +- Fastlane 2.222.0 - SwiftFormat 0.54.2 -- Xcbeautify 2.4.1 +- Xcbeautify 2.5.0 - Xcode Command Line Tools 15.3.0.0.1.1708646388 - Xcodes 1.5.0 @@ -91,12 +90,12 @@ ### Browsers - Safari 17.5 (19618.2.12.11.6) - SafariDriver 17.5 (19618.2.12.11.6) -- Google Chrome 126.0.6478.183 -- Google Chrome for Testing 126.0.6478.182 -- ChromeDriver 126.0.6478.182 -- Microsoft Edge 126.0.2592.113 -- Microsoft Edge WebDriver 126.0.2592.102 -- Mozilla Firefox 128.0 +- Google Chrome 127.0.6533.73 +- Google Chrome for Testing 127.0.6533.72 +- ChromeDriver 127.0.6533.72 +- Microsoft Edge 127.0.2651.74 +- Microsoft Edge WebDriver 127.0.2651.78 +- Mozilla Firefox 128.0.3 - geckodriver 0.34.0 - Selenium server 4.23.0 @@ -110,7 +109,7 @@ ### Java | Version | Environment Variable | | -------------------- | -------------------- | -| 8.0.422+5 | JAVA_HOME_8_X64 | +| 8.0.422+5.1 | JAVA_HOME_8_X64 | | 11.0.24+8 | JAVA_HOME_11_X64 | | 17.0.12+7 | JAVA_HOME_17_X64 | | 21.0.4+7.0 (default) | JAVA_HOME_21_X64 | @@ -129,7 +128,7 @@ #### Node.js - 18.20.4 -- 20.15.1 +- 20.16.0 #### Go - 1.20.14 @@ -137,17 +136,17 @@ - 1.22.5 ### Rust Tools -- Cargo 1.79.0 -- Rust 1.79.0 -- Rustdoc 1.79.0 +- Cargo 1.80.0 +- Rust 1.80.0 +- Rustdoc 1.80.0 - Rustup 1.27.1 #### Packages -- Clippy 0.1.79 +- Clippy 0.1.80 - Rustfmt 1.7.0-stable ### PowerShell Tools -- PowerShell 7.4.3 +- PowerShell 7.4.4 #### PowerShell Modules - Az: 12.1.0 @@ -157,7 +156,7 @@ ### Xcode | Version | Build | Path | | -------------- | -------- | --------------------------------- | -| 16.0 (beta) | 16A5202i | /Applications/Xcode_16_beta_3.app | +| 16.0 (beta) | 16A5211f | /Applications/Xcode_16_beta_4.app | | 15.4 (default) | 15F31d | /Applications/Xcode_15.4.app | | 15.3 | 15E204a | /Applications/Xcode_15.3.app | | 15.2 | 15C500b | /Applications/Xcode_15.2.app | @@ -210,8 +209,8 @@ | Simulator - watchOS 10.4 | watchsimulator10.4 | 15.3 | | Simulator - watchOS 10.5 | watchsimulator10.5 | 15.4 | | Simulator - watchOS 11.0 | watchsimulator11.0 | 16.0 | -| Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | | visionOS 1.0 | xros1.0 | 15.2 | +| Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | | visionOS 1.1 | xros1.1 | 15.3 | | Simulator - visionOS 1.1 | xrsimulator1.1 | 15.3 | | Simulator - visionOS 1.2 | xrsimulator1.2 | 15.4 | @@ -219,8 +218,8 @@ | visionOS 2.0 | xros2.0 | 16.0 | | Simulator - visionOS 2.0 | xrsimulator2.0 | 16.0 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | -| Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | +| Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | | DriverKit 22.4 | driverkit22.4 | 14.3.1 | | DriverKit 23.0 | driverkit23.0 | 15.0.1 | | DriverKit 23.2 | driverkit23.2 | 15.1, 15.2 | From 325094ef864720041654de4c0af0ead2aba4209a Mon Sep 17 00:00:00 2001 From: kishorekumar-anchala <168699259+kishorekumar-anchala@users.noreply.github.com> Date: Mon, 29 Jul 2024 18:12:33 +0530 Subject: [PATCH 3002/3485] Revert "add warump script for az cli (#10126)" (#10361) This reverts commit fcf7cd18d4f930bbe89bb8c2cc04709d008f9a11. --- images/ubuntu/scripts/build/install-azure-cli.sh | 7 ------- 1 file changed, 7 deletions(-) diff --git a/images/ubuntu/scripts/build/install-azure-cli.sh b/images/ubuntu/scripts/build/install-azure-cli.sh index 1791755c2688..0004f7bdef63 100644 --- a/images/ubuntu/scripts/build/install-azure-cli.sh +++ b/images/ubuntu/scripts/build/install-azure-cli.sh @@ -12,11 +12,4 @@ echo "azure-cli https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-lin rm -f /etc/apt/sources.list.d/azure-cli.list rm -f /etc/apt/sources.list.d/azure-cli.list.save -echo "Warmup 'az'" -az --help > /dev/null -if [ $? -ne 0 ]; then - echo "Command 'az --help' failed" - exit 1 -fi - invoke_tests "CLI.Tools" "Azure CLI" From 3b1c7f3c1d896eae98103c0c569b8eb10172f5e0 Mon Sep 17 00:00:00 2001 From: "Image generation service account." <no-reply@microsoft.com> Date: Tue, 30 Jul 2024 08:08:02 +0000 Subject: [PATCH 3003/3485] Updating readme file for macos-13 version 20240728.2 --- images/macos/macos-13-Readme.md | 49 ++++++++++++++++----------------- 1 file changed, 24 insertions(+), 25 deletions(-) diff --git a/images/macos/macos-13-Readme.md b/images/macos/macos-13-Readme.md index 2f5be0a0d21c..75faf50b0874 100644 --- a/images/macos/macos-13-Readme.md +++ b/images/macos/macos-13-Readme.md @@ -1,12 +1,11 @@ | Announcements | |-| | [[macOS] GCC 11 will be removed from all macOS images on August 12](https://github.com/actions/runner-images/issues/10213) | -| [[macOS] Default Xcode on macOS 14 Sonoma will be set to Xcode 15.4 on July, 22](https://github.com/actions/runner-images/issues/10121) | *** # macOS 13 - OS Version: macOS 13.6.7 (22G720) - Kernel Version: Darwin 22.6.0 -- Image Version: 20240721.3 +- Image Version: 20240728.2 ## Installed Software @@ -39,10 +38,10 @@ - Homebrew 4.3.10 - NPM 10.7.0 - NuGet 6.3.1.1 -- Pip3 24.1.2 (python 3.12) +- Pip3 24.2 (python 3.12) - Pipx 1.6.0 - RubyGems 3.5.16 -- Vcpkg 2024 (build from commit 821100d96) +- Vcpkg 2024 (build from commit cacf59943) - Yarn 1.22.22 ### Project Management @@ -57,7 +56,7 @@ - bazel 7.2.1 - bazelisk 1.20.0 - bsdtar 3.5.3 - available by 'tar' alias -- Curl 8.8.0 +- Curl 8.9.0 - Git 2.45.2 - Git LFS 3.5.1 - GitHub CLI 2.53.0 @@ -72,17 +71,17 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.17.14 +- AWS CLI 2.17.18 - AWS SAM CLI 1.120.0 - AWS Session Manager CLI 1.2.650.0 - Azure CLI 2.62.0 - Azure CLI (azure-devops) 1.0.1 -- Bicep CLI 0.29.45 +- Bicep CLI 0.29.47 - Cmake 3.30.1 -- CodeQL Action Bundle 2.18.0 -- Fastlane 2.221.1 -- SwiftFormat 0.54.1 -- Xcbeautify 2.4.1 +- CodeQL Action Bundle 2.18.1 +- Fastlane 2.222.0 +- SwiftFormat 0.54.3 +- Xcbeautify 2.5.0 - Xcode Command Line Tools 14.3.1.0.1.1683849156 - Xcodes 1.5.0 @@ -92,12 +91,12 @@ ### Browsers - Safari 17.5 (18618.2.12.111.5) - SafariDriver 17.5 (18618.2.12.111.5) -- Google Chrome 126.0.6478.183 -- Google Chrome for Testing 126.0.6478.182 -- ChromeDriver 126.0.6478.182 -- Microsoft Edge 126.0.2592.113 -- Microsoft Edge WebDriver 126.0.2592.102 -- Mozilla Firefox 128.0 +- Google Chrome 127.0.6533.73 +- Google Chrome for Testing 127.0.6533.72 +- ChromeDriver 127.0.6533.72 +- Microsoft Edge 127.0.2651.74 +- Microsoft Edge WebDriver 127.0.2651.78 +- Mozilla Firefox 128.0.3 - geckodriver 0.34.0 - Selenium server 4.23.0 @@ -111,7 +110,7 @@ ### Java | Version | Environment Variable | | ------------------- | -------------------- | -| 8.0.422+5 | JAVA_HOME_8_X64 | +| 8.0.422+5.1 | JAVA_HOME_8_X64 | | 11.0.24+8 | JAVA_HOME_11_X64 | | 17.0.12+7 (default) | JAVA_HOME_17_X64 | | 21.0.4+7.0 | JAVA_HOME_21_X64 | @@ -139,7 +138,7 @@ #### Node.js - 16.20.2 - 18.20.4 -- 20.15.1 +- 20.16.0 #### Go - 1.20.14 @@ -147,17 +146,17 @@ - 1.22.5 ### Rust Tools -- Cargo 1.79.0 -- Rust 1.79.0 -- Rustdoc 1.79.0 +- Cargo 1.80.0 +- Rust 1.80.0 +- Rustdoc 1.80.0 - Rustup 1.27.1 #### Packages -- Clippy 0.1.79 +- Clippy 0.1.80 - Rustfmt 1.7.0-stable ### PowerShell Tools -- PowerShell 7.4.3 +- PowerShell 7.4.4 #### PowerShell Modules - Az: 12.1.0 @@ -211,8 +210,8 @@ | Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | | visionOS 1.0 | xros1.0 | 15.2 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | -| Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | +| Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | DriverKit 22.1 | driverkit22.1 | 14.1 | | DriverKit 22.2 | driverkit22.2 | 14.2 | | DriverKit 22.4 | driverkit22.4 | 14.3.1 | From 7a96efa87210ea7dd50e9e29c4686454ca2f03ca Mon Sep 17 00:00:00 2001 From: "Image generation service account." <no-reply@microsoft.com> Date: Tue, 30 Jul 2024 08:08:44 +0000 Subject: [PATCH 3004/3485] Updating readme file for macos-13-arm64 version 20240728.2 --- images/macos/macos-13-arm64-Readme.md | 37 +++++++++++++-------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/images/macos/macos-13-arm64-Readme.md b/images/macos/macos-13-arm64-Readme.md index c8ad51252c5c..b4343591e9e0 100644 --- a/images/macos/macos-13-arm64-Readme.md +++ b/images/macos/macos-13-arm64-Readme.md @@ -1,12 +1,11 @@ | Announcements | |-| | [[macOS] GCC 11 will be removed from all macOS images on August 12](https://github.com/actions/runner-images/issues/10213) | -| [[macOS] Default Xcode on macOS 14 Sonoma will be set to Xcode 15.4 on July, 22](https://github.com/actions/runner-images/issues/10121) | *** # macOS 13 - OS Version: macOS 13.6.7 (22G720) - Kernel Version: Darwin 22.6.0 -- Image Version: 20240721.1 +- Image Version: 20240728.2 ## Installed Software @@ -69,17 +68,17 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.17.14 +- AWS CLI 2.17.18 - AWS SAM CLI 1.120.0 - AWS Session Manager CLI 1.2.650.0 - Azure CLI 2.62.0 - Azure CLI (azure-devops) 1.0.1 -- Bicep CLI 0.29.45 +- Bicep CLI 0.29.47 - Cmake 3.30.1 -- CodeQL Action Bundle 2.18.0 -- Fastlane 2.221.1 -- SwiftFormat 0.54.1 -- Xcbeautify 2.4.1 +- CodeQL Action Bundle 2.18.1 +- Fastlane 2.222.0 +- SwiftFormat 0.54.3 +- Xcbeautify 2.5.0 - Xcode Command Line Tools 14.3.1.0.1.1683849156 - Xcodes 1.5.0 @@ -88,9 +87,9 @@ ### Browsers - Safari 17.5 (18618.2.12.111.5) - SafariDriver 17.5 (18618.2.12.111.5) -- Google Chrome 126.0.6478.183 -- Google Chrome for Testing 126.0.6478.182 -- ChromeDriver 126.0.6478.182 +- Google Chrome 127.0.6533.73 +- Google Chrome for Testing 127.0.6533.72 +- ChromeDriver 127.0.6533.72 - Selenium server 4.23.0 #### Environment variables @@ -118,7 +117,7 @@ #### Node.js - 16.20.1 - 18.20.4 -- 20.15.1 +- 20.16.0 #### Go - 1.20.14 @@ -126,17 +125,17 @@ - 1.22.5 ### Rust Tools -- Cargo 1.79.0 -- Rust 1.79.0 -- Rustdoc 1.79.0 +- Cargo 1.80.0 +- Rust 1.80.0 +- Rustdoc 1.80.0 - Rustup 1.27.1 #### Packages -- Clippy 0.1.79 +- Clippy 0.1.80 - Rustfmt 1.7.0-stable ### PowerShell Tools -- PowerShell 7.4.3 +- PowerShell 7.4.4 #### PowerShell Modules - Az: 12.1.0 @@ -187,11 +186,11 @@ | Simulator - watchOS 9.4 | watchsimulator9.4 | 14.3.1 | | Simulator - watchOS 10.0 | watchsimulator10.0 | 15.0.1 | | Simulator - watchOS 10.2 | watchsimulator10.2 | 15.1, 15.2 | -| Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | | visionOS 1.0 | xros1.0 | 15.2 | +| Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | -| Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | +| Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | | DriverKit 22.1 | driverkit22.1 | 14.1 | | DriverKit 22.2 | driverkit22.2 | 14.2 | | DriverKit 22.4 | driverkit22.4 | 14.3.1 | From c110803508288b27192223b8e853dcc6a16c379f Mon Sep 17 00:00:00 2001 From: kishorekumar-anchala <168699259+kishorekumar-anchala@users.noreply.github.com> Date: Tue, 30 Jul 2024 14:05:45 +0530 Subject: [PATCH 3005/3485] Pinned the version of gitversion (#10363) --- images/windows/toolsets/toolset-2019.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/windows/toolsets/toolset-2019.json b/images/windows/toolsets/toolset-2019.json index 71755ce89f86..cbf2bb4e72c8 100644 --- a/images/windows/toolsets/toolset-2019.json +++ b/images/windows/toolsets/toolset-2019.json @@ -424,7 +424,7 @@ { "name": "aria2" }, { "name": "azcopy10" }, { "name": "Bicep" }, - { "name": "gitversion.portable" }, + { "name": "gitversion.portable", "args": [ "--version", "5.12.0"] }, { "name": "innosetup" }, { "name": "jq" }, { "name": "NuGet.CommandLine" }, From 1850dfc713405fe2f2af87161ff4b095a38830eb Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Tue, 30 Jul 2024 11:19:59 +0200 Subject: [PATCH 3006/3485] Add AllowedInboundIpAddresses parameter to build-image.ps1 (#10362) --- images.CI/linux-and-win/build-image.ps1 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/images.CI/linux-and-win/build-image.ps1 b/images.CI/linux-and-win/build-image.ps1 index 7abfdfd92d25..f1c4ce6074b0 100644 --- a/images.CI/linux-and-win/build-image.ps1 +++ b/images.CI/linux-and-win/build-image.ps1 @@ -10,7 +10,8 @@ param( [String] [Parameter (Mandatory=$true)] $TenantId, [String] [Parameter (Mandatory=$false)] $VirtualNetworkName, [String] [Parameter (Mandatory=$false)] $VirtualNetworkRG, - [String] [Parameter (Mandatory=$false)] $VirtualNetworkSubnet + [String] [Parameter (Mandatory=$false)] $VirtualNetworkSubnet, + [String] [Parameter (Mandatory=$false)] $AllowedInboundIpAddresses = "[]" ) if (-not (Test-Path $TemplatePath)) @@ -54,6 +55,7 @@ packer build -var "client_id=$ClientId" ` -var "virtual_network_name=$VirtualNetworkName" ` -var "virtual_network_resource_group_name=$VirtualNetworkRG" ` -var "virtual_network_subnet_name=$VirtualNetworkSubnet" ` + -var "allowed_inbound_ip_addresses=$($AllowedInboundIpAddresses)" ` -color=false ` $TemplatePath ` | Where-Object { From 137d0ed83df01392245b4d940968fd44ae9b8ddd Mon Sep 17 00:00:00 2001 From: kishorekumar-anchala <168699259+kishorekumar-anchala@users.noreply.github.com> Date: Tue, 30 Jul 2024 16:03:15 +0530 Subject: [PATCH 3007/3485] Pin sql version for win-19 (#10366) --- images/windows/toolsets/toolset-2019.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/windows/toolsets/toolset-2019.json b/images/windows/toolsets/toolset-2019.json index cbf2bb4e72c8..06e41169e50b 100644 --- a/images/windows/toolsets/toolset-2019.json +++ b/images/windows/toolsets/toolset-2019.json @@ -84,7 +84,7 @@ {"name": "PowerShellGet"}, {"name": "PSScriptAnalyzer"}, {"name": "PSWindowsUpdate"}, - {"name": "SqlServer"}, + {"name": "SqlServer", "versions": ["22.2.0"]}, {"name": "VSSetup"}, {"name": "Microsoft.Graph"}, {"name": "AWSPowershell"} From 582bbb9c159ff592869037a139124e4bc5e29432 Mon Sep 17 00:00:00 2001 From: kishorekumar-anchala <168699259+kishorekumar-anchala@users.noreply.github.com> Date: Tue, 30 Jul 2024 21:38:05 +0530 Subject: [PATCH 3008/3485] [Ubuntu] Deprecating docker compose v1 from ubuntu images (#10368) * Deprecating docker compose v1 from un=buntu images * Pin sql version for win-19 --- .../scripts/build/install-docker-compose.sh | 21 ------------------- .../docs-gen/Generate-SoftwareReport.ps1 | 3 --- .../docs-gen/SoftwareReport.Tools.psm1 | 5 +---- images/ubuntu/scripts/tests/Tools.Tests.ps1 | 6 ------ images/ubuntu/templates/ubuntu-20.04.pkr.hcl | 2 +- images/ubuntu/templates/ubuntu-22.04.pkr.hcl | 2 +- 6 files changed, 3 insertions(+), 36 deletions(-) delete mode 100644 images/ubuntu/scripts/build/install-docker-compose.sh diff --git a/images/ubuntu/scripts/build/install-docker-compose.sh b/images/ubuntu/scripts/build/install-docker-compose.sh deleted file mode 100644 index 4d152c77c391..000000000000 --- a/images/ubuntu/scripts/build/install-docker-compose.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash -e -################################################################################ -## File: install-docker-compose.sh -## Desc: Install Docker Compose v1 -## Supply chain security: Docker Compose v1 - checksum validation -################################################################################ - -# Source the helpers for use with the script -source $HELPER_SCRIPTS/install.sh - -# Download docker-compose v1 from releases -binary_path=$(download_with_retry "https://github.com/docker/compose/releases/download/1.29.2/docker-compose-Linux-x86_64") - -# Supply chain security - Docker Compose v1 -external_hash="f3f10cf3dbb8107e9ba2ea5f23c1d2159ff7321d16f0a23051d68d8e2547b323" -use_checksum_comparison "${binary_path}" "${external_hash}" - -# Install docker-compose v1 -install "${binary_path}" "/usr/local/bin/docker-compose" - -invoke_tests "Tools" "Docker-compose v1" diff --git a/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 b/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 index 3d335752d3f2..0688c8055e45 100644 --- a/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 +++ b/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 @@ -111,9 +111,6 @@ $tools.AddToolVersion("Buildah", $(Get-BuildahVersion)) $tools.AddToolVersion("CMake", $(Get-CMakeVersion)) $tools.AddToolVersion("CodeQL Action Bundle", $(Get-CodeQLBundleVersion)) $tools.AddToolVersion("Docker Amazon ECR Credential Helper", $(Get-DockerAmazonECRCredHelperVersion)) -if ((Test-IsUbuntu20) -or (Test-IsUbuntu22)) { - $tools.AddToolVersion("Docker Compose v1", $(Get-DockerComposeV1Version)) -} $tools.AddToolVersion("Docker Compose v2", $(Get-DockerComposeV2Version)) $tools.AddToolVersion("Docker-Buildx", $(Get-DockerBuildxVersion)) $tools.AddToolVersion("Docker Client", $(Get-DockerClientVersion)) diff --git a/images/ubuntu/scripts/docs-gen/SoftwareReport.Tools.psm1 b/images/ubuntu/scripts/docs-gen/SoftwareReport.Tools.psm1 index a61b0a8d7aab..b4656b779e07 100644 --- a/images/ubuntu/scripts/docs-gen/SoftwareReport.Tools.psm1 +++ b/images/ubuntu/scripts/docs-gen/SoftwareReport.Tools.psm1 @@ -58,10 +58,7 @@ function Get-CMakeVersion { return $cmakeVersion } -function Get-DockerComposeV1Version { - $composeVersion = docker-compose -v | Get-StringPart -Part 2 | Get-StringPart -Part 0 -Delimiter "," - return $composeVersion -} + function Get-DockerComposeV2Version { $composeVersion = docker compose version | Get-StringPart -Part 3 | Get-StringPart -Part 0 -Delimiter "v" diff --git a/images/ubuntu/scripts/tests/Tools.Tests.ps1 b/images/ubuntu/scripts/tests/Tools.Tests.ps1 index 6e6ec0af02eb..cb9c07308e7c 100644 --- a/images/ubuntu/scripts/tests/Tools.Tests.ps1 +++ b/images/ubuntu/scripts/tests/Tools.Tests.ps1 @@ -121,12 +121,6 @@ Describe "Docker images" { } } -Describe "Docker-compose v1" -Skip:((-not (Test-IsUbuntu20)) -and (-not (Test-IsUbuntu22))) { - It "docker-compose" { - "docker-compose --version"| Should -ReturnZeroExitCode - } -} - Describe "Ansible" { It "Ansible" { "ansible --version" | Should -ReturnZeroExitCode diff --git a/images/ubuntu/templates/ubuntu-20.04.pkr.hcl b/images/ubuntu/templates/ubuntu-20.04.pkr.hcl index 101c5a3bf913..d8d821bcd562 100644 --- a/images/ubuntu/templates/ubuntu-20.04.pkr.hcl +++ b/images/ubuntu/templates/ubuntu-20.04.pkr.hcl @@ -344,7 +344,7 @@ build { provisioner "shell" { environment_vars = ["HELPER_SCRIPTS=${var.helper_script_folder}", "INSTALLER_SCRIPT_FOLDER=${var.installer_script_folder}", "DOCKERHUB_LOGIN=${var.dockerhub_login}", "DOCKERHUB_PASSWORD=${var.dockerhub_password}"] execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" - scripts = ["${path.root}/../scripts/build/install-docker-compose.sh", "${path.root}/../scripts/build/install-docker.sh"] + scripts = ["${path.root}/../scripts/build/install-docker.sh"] } provisioner "shell" { diff --git a/images/ubuntu/templates/ubuntu-22.04.pkr.hcl b/images/ubuntu/templates/ubuntu-22.04.pkr.hcl index 9b881a686653..6dd0abf17069 100644 --- a/images/ubuntu/templates/ubuntu-22.04.pkr.hcl +++ b/images/ubuntu/templates/ubuntu-22.04.pkr.hcl @@ -340,7 +340,7 @@ build { provisioner "shell" { environment_vars = ["HELPER_SCRIPTS=${var.helper_script_folder}", "INSTALLER_SCRIPT_FOLDER=${var.installer_script_folder}", "DOCKERHUB_LOGIN=${var.dockerhub_login}", "DOCKERHUB_PASSWORD=${var.dockerhub_password}"] execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" - scripts = ["${path.root}/../scripts/build/install-docker-compose.sh", "${path.root}/../scripts/build/install-docker.sh"] + scripts = ["${path.root}/../scripts/build/install-docker.sh"] } provisioner "shell" { From da684ca6d2b6de512a4dec746c7c134d2b010626 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enes=20=C3=87ak=C4=B1r?= <enes@cakir.web.tr> Date: Tue, 30 Jul 2024 20:11:12 +0300 Subject: [PATCH 3009/3485] [Ubuntu] Make brew version check consistent (#10369) `Tools.Tests.ps1` checks the version of `brew` with `--version` argument. ```powershell Describe "Homebrew" { It "homebrew" { "/home/linuxbrew/.linuxbrew/bin/brew --version" | Should -ReturnZeroExitCode } } ``` `SoftwareReport.Common.psm1` checks it with `-v` argument. ```powershell function Get-HomebrewVersion { $result = Get-CommandResult "/home/linuxbrew/.linuxbrew/bin/brew -v" $result.Output -match "Homebrew (?<version>\d+\.\d+\.\d+)" | Out-Null return $Matches.version } ``` Generally, `--version` and `-v` are equivalent. But a recent bug in `brew` makes `-v` returns the output of `brew help`. https://github.com/Homebrew/brew/pull/17903 It's best to maintain consistency in version checks and explicitly use `--version` in both places. --- images/ubuntu/scripts/docs-gen/SoftwareReport.Common.psm1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/ubuntu/scripts/docs-gen/SoftwareReport.Common.psm1 b/images/ubuntu/scripts/docs-gen/SoftwareReport.Common.psm1 index 62e39cae747d..73e3e1f3ebf6 100644 --- a/images/ubuntu/scripts/docs-gen/SoftwareReport.Common.psm1 +++ b/images/ubuntu/scripts/docs-gen/SoftwareReport.Common.psm1 @@ -131,7 +131,7 @@ function Get-LernaVersion { } function Get-HomebrewVersion { - $result = Get-CommandResult "/home/linuxbrew/.linuxbrew/bin/brew -v" + $result = Get-CommandResult "/home/linuxbrew/.linuxbrew/bin/brew --version" $result.Output -match "Homebrew (?<version>\d+\.\d+\.\d+)" | Out-Null return $Matches.version } From 9a08ad80ee60f1ab4ba32df5ccf6166db1a09102 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 1 Aug 2024 21:14:05 +0000 Subject: [PATCH 3010/3485] Updating readme file for ubuntu24 version 20240730.3.1 (#10371) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2404-Readme.md | 207 +++++++++++++++-------------- 1 file changed, 104 insertions(+), 103 deletions(-) diff --git a/images/ubuntu/Ubuntu2404-Readme.md b/images/ubuntu/Ubuntu2404-Readme.md index e397240aa8f9..f6fd5641ee9c 100644 --- a/images/ubuntu/Ubuntu2404-Readme.md +++ b/images/ubuntu/Ubuntu2404-Readme.md @@ -1,12 +1,13 @@ | Announcements | |-| +| [[All OSes] Android NDK versions <=25 will be removed from images on August 19](https://github.com/actions/runner-images/issues/10342) | | [Ubuntu 24.04 is now available](https://github.com/actions/runner-images/issues/9848) | | [[Ubuntu, Windows] Docker Compose v1 will be removed from images on July, 29](https://github.com/actions/runner-images/issues/9692) | *** # Ubuntu 24.04 LTS - OS Version: 24.04 LTS - Kernel Version: 6.8.0-1010-azure -- Image Version: 20240721.1.0 +- Image Version: 20240730.3.0 - Systemd version: 255.4-1ubuntu8.2 ## Installed Software @@ -20,7 +21,7 @@ - GNU C++: 12.3.0, 13.2.0, 14.0.1 - GNU Fortran: 12.3.0, 13.2.0, 14.0.1 - Julia 1.10.4 -- Node.js 20.15.1 +- Node.js 20.16.0 - Perl 5.38.2 - Python 3.12.3 - Ruby 3.2.3 @@ -28,14 +29,14 @@ ### Package Management - cpan 1.64 - Helm 3.15.3 -- Homebrew 4.3.10 +- Homebrew 4.3.12 - Miniconda 24.5.0 -- Npm 10.7.0 +- Npm 10.8.1 - Pip 24.0 - Pip3 24.0 - Pipx 1.4.3 - RubyGems 3.4.20 -- Vcpkg (build from commit 821100d96) +- Vcpkg (build from commit 136a0d8b8) - Yarn 1.22.22 #### Environment variables @@ -63,17 +64,17 @@ to accomplish this. - AzCopy 10.25.1 - available by `azcopy` and `azcopy10` aliases - Bazel 7.2.1 - Bazelisk 1.19.0 -- Bicep 0.29.45 +- Bicep 0.29.47 - Buildah 1.33.7 - CMake 3.30.1 -- CodeQL Action Bundle 2.18.0 +- CodeQL Action Bundle 2.18.1 - Docker Amazon ECR Credential Helper 0.8.0 - Docker Compose v2 2.27.1 -- Docker-Buildx 0.16.1 +- Docker-Buildx 0.16.2 - Docker Client 26.1.3 - Docker Server 26.1.3 -- Fastlane 2.221.1 -- Git 2.45.2 +- Fastlane 2.222.0 +- Git 2.46.0 - Git LFS 3.5.1 - Git-ftp 1.6.0 - Haveged 1.9.14 @@ -89,7 +90,7 @@ to accomplish this. - OpenSSL 3.0.13-0ubuntu3.1 - Parcel 2.12.0 - Podman 4.9.3 -- Pulumi 3.125.0 +- Pulumi 3.127.0 - Skopeo 1.13.3 - Sphinx Open Source Search Server 2.2.11 - yamllint 1.35.1 @@ -97,9 +98,9 @@ to accomplish this. - zstd 1.5.6 ### CLI Tools -- AWS CLI 2.17.14 +- AWS CLI 2.17.19 - AWS CLI Session Manager Plugin 1.2.650.0 -- AWS SAM CLI 1.120.0 +- AWS SAM CLI 1.121.0 - Azure CLI 2.62.0 - Azure CLI (azure-devops) 1.0.1 - GitHub CLI 2.53.0 @@ -107,10 +108,10 @@ to accomplish this. ### Java | Version | Environment Variable | | ------------------- | -------------------- | -| 8.0.412+8 | JAVA_HOME_8_X64 | -| 11.0.23+9 | JAVA_HOME_11_X64 | -| 17.0.11+9 (default) | JAVA_HOME_17_X64 | -| 21.0.3+9 | JAVA_HOME_21_X64 | +| 8.0.422+5 | JAVA_HOME_8_X64 | +| 11.0.24+8 | JAVA_HOME_11_X64 | +| 17.0.12+7 (default) | JAVA_HOME_17_X64 | +| 21.0.4+7 | JAVA_HOME_21_X64 | ### PHP Tools - PHP: 8.3.6 @@ -124,21 +125,21 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Cabal 3.12.1.0 - GHC 9.10.1 - GHCup 0.1.30.0 -- Stack 2.15.7 +- Stack 3.1.1 ### Rust Tools -- Cargo 1.79.0 -- Rust 1.79.0 -- Rustdoc 1.79.0 +- Cargo 1.80.0 +- Rust 1.80.0 +- Rustdoc 1.80.0 - Rustup 1.27.1 #### Packages - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 126.0.6478.182 -- ChromeDriver 126.0.6478.182 -- Chromium 126.0.6478.0 +- Google Chrome 127.0.6533.72 +- ChromeDriver 127.0.6533.72 +- Chromium 127.0.6533.0 - Selenium server 4.23.0 #### Environment variables @@ -183,7 +184,7 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Node.js - 16.20.2 - 18.20.4 -- 20.15.1 +- 20.16.0 #### Python - 3.9.19 @@ -200,7 +201,7 @@ Use the following command as a part of your job to start the service: 'sudo syst #### PowerShell Modules - Az: 11.5.0 -- Microsoft.Graph: 2.20.0 +- Microsoft.Graph: 2.21.0 - Pester: 5.6.1 - PSScriptAnalyzer: 1.22.0 @@ -219,89 +220,89 @@ Use the following command as a part of your job to start the service: 'sudo syst | Android Support Repository | 47.0.0 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 24.0.8215888<br>25.2.9519653<br>26.3.11579264 (default) | +| NDK | 24.0.8215888<br>25.2.9519653<br>26.3.11579264<br>27.0.12077973 (default) | #### Environment variables | Name | Value | | ----------------------- | -------------------------------------------- | | ANDROID_HOME | /usr/local/lib/android/sdk | -| ANDROID_NDK | /usr/local/lib/android/sdk/ndk/26.3.11579264 | -| ANDROID_NDK_HOME | /usr/local/lib/android/sdk/ndk/26.3.11579264 | -| ANDROID_NDK_LATEST_HOME | /usr/local/lib/android/sdk/ndk/26.3.11579264 | -| ANDROID_NDK_ROOT | /usr/local/lib/android/sdk/ndk/26.3.11579264 | +| ANDROID_NDK | /usr/local/lib/android/sdk/ndk/27.0.12077973 | +| ANDROID_NDK_HOME | /usr/local/lib/android/sdk/ndk/27.0.12077973 | +| ANDROID_NDK_LATEST_HOME | /usr/local/lib/android/sdk/ndk/27.0.12077973 | +| ANDROID_NDK_ROOT | /usr/local/lib/android/sdk/ndk/27.0.12077973 | | ANDROID_SDK_ROOT | /usr/local/lib/android/sdk | ### Installed apt packages -| Name | Version | -| ---------------------- | --------------------- | -| acl | 2.3.2-1build1 | -| aria2 | 1.37.0+debian-1build3 | -| autoconf | 2.71-3 | -| automake | 1:1.16.5-1.3ubuntu1 | -| binutils | 2.42-4ubuntu2 | -| bison | 2:3.8.2+dfsg-1build2 | -| brotli | 1.1.0-2build2 | -| bzip2 | 1.0.8-5.1 | -| coreutils | 9.4-3ubuntu6 | -| curl | 8.5.0-2ubuntu10.1 | -| dbus | 1.14.10-4ubuntu4 | -| dnsutils | 1:9.18.24-0ubuntu5 | -| dpkg | 1.22.6ubuntu6 | -| dpkg-dev | 1.22.6ubuntu6 | -| fakeroot | 1.33-1 | -| file | 1:5.45-3build1 | -| findutils | 4.9.0-5build1 | -| flex | 2.6.4-8.2build1 | -| fonts-noto-color-emoji | 2.042-1 | -| ftp | 20230507-2build3 | -| g++ | 4:13.2.0-7ubuntu1 | -| gcc | 4:13.2.0-7ubuntu1 | -| gnupg2 | 2.4.4-2ubuntu17 | -| haveged | 1.9.14-1ubuntu2 | -| iproute2 | 6.1.0-1ubuntu6 | -| iputils-ping | 3:20240117-1build1 | -| jq | 1.7.1-3build1 | -| libssl-dev | 3.0.13-0ubuntu3.1 | -| libtool | 2.4.7-7build1 | -| libyaml-dev | 0.2.5-1build1 | -| locales | 2.39-0ubuntu8.2 | -| lz4 | 1.9.4-1build1 | -| m4 | 1.4.19-4build1 | -| make | 4.3-4.1build2 | -| mediainfo | 24.01.1-1build2 | -| mercurial | 6.7.2-1ubuntu2 | -| net-tools | 2.10-0.1ubuntu4 | -| netcat | 1.226-1ubuntu2 | -| openssh-client | 1:9.6p1-3ubuntu13.4 | -| p7zip-full | 16.02+transitional.1 | -| p7zip-rar | 16.02+transitional.1 | -| parallel | 20231122+ds-1 | -| patchelf | 0.18.0-1.1build1 | -| pigz | 2.8-1 | -| pkg-config | 1.8.1-2build1 | -| pollinate | 4.33-3.1ubuntu1 | -| python-is-python3 | 3.11.4-1 | -| rpm | 4.18.2+dfsg-2.1build2 | -| rsync | 3.2.7-1ubuntu1 | -| shellcheck | 0.9.0-1 | -| sphinxsearch | 2.2.11-8build1 | -| sqlite3 | 3.45.1-1ubuntu2 | -| ssh | 1:9.6p1-3ubuntu13.4 | -| sshpass | 1.09-1 | -| sudo | 1.9.15p5-3ubuntu5 | -| swig | 4.2.0-2ubuntu1 | -| tar | 1.35+dfsg-3build1 | -| telnet | 0.17+2.5-3ubuntu4 | -| texinfo | 7.1-3build2 | -| time | 1.9-0.2build1 | -| tk | 8.6.14build1 | -| tree | 2.1.1-2ubuntu3 | -| tzdata | 2024a-3ubuntu1.1 | -| unzip | 6.0-28ubuntu4 | -| upx | 4.2.2-3 | -| wget | 1.21.4-1ubuntu4.1 | -| xvfb | 2:21.1.12-1ubuntu1 | -| xz-utils | 5.6.1+really5.4.5-1 | -| zip | 3.0-13build1 | -| zsync | 0.6.2-5build1 | +| Name | Version | +| ---------------------- | -------------------------- | +| acl | 2.3.2-1build1 | +| aria2 | 1.37.0+debian-1build3 | +| autoconf | 2.71-3 | +| automake | 1:1.16.5-1.3ubuntu1 | +| binutils | 2.42-4ubuntu2 | +| bison | 2:3.8.2+dfsg-1build2 | +| brotli | 1.1.0-2build2 | +| bzip2 | 1.0.8-5.1 | +| coreutils | 9.4-3ubuntu6 | +| curl | 8.5.0-2ubuntu10.1 | +| dbus | 1.14.10-4ubuntu4 | +| dnsutils | 1:9.18.28-0ubuntu0.24.04.1 | +| dpkg | 1.22.6ubuntu6 | +| dpkg-dev | 1.22.6ubuntu6 | +| fakeroot | 1.33-1 | +| file | 1:5.45-3build1 | +| findutils | 4.9.0-5build1 | +| flex | 2.6.4-8.2build1 | +| fonts-noto-color-emoji | 2.042-1 | +| ftp | 20230507-2build3 | +| g++ | 4:13.2.0-7ubuntu1 | +| gcc | 4:13.2.0-7ubuntu1 | +| gnupg2 | 2.4.4-2ubuntu17 | +| haveged | 1.9.14-1ubuntu2 | +| iproute2 | 6.1.0-1ubuntu6 | +| iputils-ping | 3:20240117-1build1 | +| jq | 1.7.1-3build1 | +| libssl-dev | 3.0.13-0ubuntu3.1 | +| libtool | 2.4.7-7build1 | +| libyaml-dev | 0.2.5-1build1 | +| locales | 2.39-0ubuntu8.2 | +| lz4 | 1.9.4-1build1 | +| m4 | 1.4.19-4build1 | +| make | 4.3-4.1build2 | +| mediainfo | 24.01.1-1build2 | +| mercurial | 6.7.2-1ubuntu2 | +| net-tools | 2.10-0.1ubuntu4 | +| netcat | 1.226-1ubuntu2 | +| openssh-client | 1:9.6p1-3ubuntu13.4 | +| p7zip-full | 16.02+transitional.1 | +| p7zip-rar | 16.02+transitional.1 | +| parallel | 20231122+ds-1 | +| patchelf | 0.18.0-1.1build1 | +| pigz | 2.8-1 | +| pkg-config | 1.8.1-2build1 | +| pollinate | 4.33-3.1ubuntu1 | +| python-is-python3 | 3.11.4-1 | +| rpm | 4.18.2+dfsg-2.1build2 | +| rsync | 3.2.7-1ubuntu1 | +| shellcheck | 0.9.0-1 | +| sphinxsearch | 2.2.11-8build1 | +| sqlite3 | 3.45.1-1ubuntu2 | +| ssh | 1:9.6p1-3ubuntu13.4 | +| sshpass | 1.09-1 | +| sudo | 1.9.15p5-3ubuntu5 | +| swig | 4.2.0-2ubuntu1 | +| tar | 1.35+dfsg-3build1 | +| telnet | 0.17+2.5-3ubuntu4 | +| texinfo | 7.1-3build2 | +| time | 1.9-0.2build1 | +| tk | 8.6.14build1 | +| tree | 2.1.1-2ubuntu3 | +| tzdata | 2024a-3ubuntu1.1 | +| unzip | 6.0-28ubuntu4 | +| upx | 4.2.2-3 | +| wget | 1.21.4-1ubuntu4.1 | +| xvfb | 2:21.1.12-1ubuntu1 | +| xz-utils | 5.6.1+really5.4.5-1 | +| zip | 3.0-13build1 | +| zsync | 0.6.2-5build1 | From d46f62f2735dcb006824fca4b057f49011681303 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 1 Aug 2024 21:23:00 +0000 Subject: [PATCH 3011/3485] Updating readme file for win22 version 20240729.2.1 (#10367) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/windows/Windows2022-Readme.md | 63 ++++++++++++++-------------- 1 file changed, 32 insertions(+), 31 deletions(-) diff --git a/images/windows/Windows2022-Readme.md b/images/windows/Windows2022-Readme.md index f6a9a05b99be..eaa3e12d65d3 100644 --- a/images/windows/Windows2022-Readme.md +++ b/images/windows/Windows2022-Readme.md @@ -1,10 +1,11 @@ | Announcements | |-| +| [[All OSes] Android NDK versions <=25 will be removed from images on August 19](https://github.com/actions/runner-images/issues/10342) | | [[Ubuntu, Windows] Docker Compose v1 will be removed from images on July, 29](https://github.com/actions/runner-images/issues/9692) | *** # Windows Server 2022 - OS Version: 10.0.20348 Build 2582 -- Image Version: 20240721.1.0 +- Image Version: 20240729.2.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -30,10 +31,10 @@ - Miniconda 24.5.0 (pre-installed on the image but not added to PATH) - NPM 10.7.0 - NuGet 6.10.1.5 -- pip 24.1.2 (python 3.9) +- pip 24.2 (python 3.9) - Pipx 1.6.0 - RubyGems 3.2.33 -- Vcpkg (build from commit 821100d96) +- Vcpkg (build from commit cacf59943) - Yarn 1.22.22 #### Environment variables @@ -54,10 +55,10 @@ - azcopy 10.25.1 - Bazel 7.2.1 - Bazelisk 1.19.0 -- Bicep 0.29.45 +- Bicep 0.29.47 - Cabal 3.12.1.0 - CMake 3.30.1 -- CodeQL Action Bundle 2.18.0 +- CodeQL Action Bundle 2.18.1 - Docker 26.1.3 - Docker Compose v1 1.29.2 - Docker Compose v2 2.27.1 @@ -65,7 +66,7 @@ - ghc 9.10.1 - Git 2.45.2.windows.1 - Git LFS 3.5.1 -- ImageMagick 7.1.1-35 +- ImageMagick 7.1.1-36 - InnoSetup 6.3.3 - jq 1.7.1 - Kind 0.23.0 @@ -78,10 +79,10 @@ - NSIS 3.10 - OpenSSL 1.1.1w - Packer 1.11.0 -- Pulumi 3.125.0 +- Pulumi 3.127.0 - R 4.4.1 - Service Fabric SDK 9.1.1436.9590 -- Stack 2.15.7 +- Stack 3.1.1 - Subversion (SVN) 1.14.2 - Swig 4.1.1 - VSWhere 3.1.7 @@ -91,8 +92,8 @@ - zstd 1.5.6 ### CLI Tools -- Alibaba Cloud CLI 3.0.214 -- AWS CLI 2.17.14 +- Alibaba Cloud CLI 3.0.216 +- AWS CLI 2.17.18 - AWS SAM CLI 1.120.0 - AWS Session Manager CLI 1.2.650.0 - Azure CLI 2.62.0 @@ -100,9 +101,9 @@ - GitHub CLI 2.53.0 ### Rust Tools -- Cargo 1.79.0 -- Rust 1.79.0 -- Rustdoc 1.79.0 +- Cargo 1.80.0 +- Rust 1.80.0 +- Rustdoc 1.80.0 - Rustup 1.27.1 #### Packages @@ -110,15 +111,15 @@ - cargo-audit 0.20.0 - cargo-outdated 0.15.0 - cbindgen 0.26.0 -- Clippy 0.1.79 +- Clippy 0.1.80 - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 126.0.6478.183 -- Chrome Driver 126.0.6478.182 -- Microsoft Edge 126.0.2592.113 -- Microsoft Edge Driver 126.0.2592.113 -- Mozilla Firefox 128.0 +- Google Chrome 127.0.6533.73 +- Chrome Driver 127.0.6533.72 +- Microsoft Edge 127.0.2651.74 +- Microsoft Edge Driver 127.0.2651.74 +- Mozilla Firefox 128.0.3 - Gecko Driver 0.34.0 - IE Driver 4.14.0.0 - Selenium server 4.23.0 @@ -166,7 +167,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Node.js - 16.20.2 - 18.20.4 -- 20.15.1 +- 20.16.0 #### Python - 3.7.9 @@ -186,7 +187,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Ruby - 3.0.7 - 3.1.6 -- 3.2.4 +- 3.2.5 ### Databases @@ -210,7 +211,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Database tools - Azure CosmosDb Emulator 2.14.18.0 - DacFx 162.3.566.1 -- MySQL 8.0.38.0 +- MySQL 8.0.39.0 - SQL OLEDB Driver 18.7.4.0 - SQLPS 1.0 @@ -223,7 +224,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Visual Studio Enterprise 2022 | Name | Version | Path | | ----------------------------- | --------------- | -------------------------------------------------------- | -| Visual Studio Enterprise 2022 | 17.10.35027.167 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | +| Visual Studio Enterprise 2022 | 17.10.35122.118 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | #### Workloads, components and extensions | Package | Version | @@ -250,7 +251,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Component.Unreal | 17.10.34803.213 | | Component.Unreal.Android | 17.10.34803.213 | | Component.Unreal.Ide | 17.10.34803.213 | -| Component.VisualStudio.GitHub.Copilot | 0.2.889.30432 | +| Component.VisualStudio.GitHub.Copilot | 0.2.894.62884 | | Component.VSInstallerProjects2022 | 2.0.1 | | Component.WixToolset.VisualStudioExtension.Dev17 | 1.0.0.22 | | Component.WixToolset.VisualStudioExtension.Schemas3 | 1.0.0.22 | @@ -496,7 +497,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - nbgv 3.6.139+a9e8765620 ### PowerShell Tools -- PowerShell 7.4.3 +- PowerShell 7.4.4 #### Powershell Modules - Az: 11.3.1 @@ -504,7 +505,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - AzureRM: 2.1.0 (Default), 6.13.1 - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.619 +- AWSPowershell: 4.1.623 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.10 - Microsoft.Graph: 2.20.0 @@ -532,16 +533,16 @@ All other versions are saved but not installed. | CMake | 3.18.1<br>3.22.1 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 24.0.8215888<br>25.2.9519653<br>26.3.11579264 | +| NDK | 24.0.8215888<br>25.2.9519653<br>26.3.11579264<br>27.0.12077973 | #### Environment variables | Name | Value | | ----------------------- | ---------------------------------------- | | ANDROID_HOME | C:\Android\android-sdk | -| ANDROID_NDK | C:\Android\android-sdk\ndk\25.2.9519653 | -| ANDROID_NDK_HOME | C:\Android\android-sdk\ndk\25.2.9519653 | -| ANDROID_NDK_LATEST_HOME | C:\Android\android-sdk\ndk\26.3.11579264 | -| ANDROID_NDK_ROOT | C:\Android\android-sdk\ndk\25.2.9519653 | +| ANDROID_NDK | C:\Android\android-sdk\ndk\27.0.12077973 | +| ANDROID_NDK_HOME | C:\Android\android-sdk\ndk\27.0.12077973 | +| ANDROID_NDK_LATEST_HOME | C:\Android\android-sdk\ndk\27.0.12077973 | +| ANDROID_NDK_ROOT | C:\Android\android-sdk\ndk\27.0.12077973 | | ANDROID_SDK_ROOT | C:\Android\android-sdk | ### Cached Docker images From d935940e996b0c450260a41159e7b42616256018 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 1 Aug 2024 23:55:48 +0000 Subject: [PATCH 3012/3485] Updating readme file for macos-14-arm64 version 20240728.1 (#10360) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-14-arm64-Readme.md | 39 +++++++++++++-------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/images/macos/macos-14-arm64-Readme.md b/images/macos/macos-14-arm64-Readme.md index a7c406b78b5b..fbe780785d68 100644 --- a/images/macos/macos-14-arm64-Readme.md +++ b/images/macos/macos-14-arm64-Readme.md @@ -1,12 +1,11 @@ | Announcements | |-| | [[macOS] GCC 11 will be removed from all macOS images on August 12](https://github.com/actions/runner-images/issues/10213) | -| [[macOS] Default Xcode on macOS 14 Sonoma will be set to Xcode 15.4 on July, 22](https://github.com/actions/runner-images/issues/10121) | *** # macOS 14 - OS Version: macOS 14.5 (23F79) - Kernel Version: Darwin 23.5.0 -- Image Version: 20240722.3 +- Image Version: 20240728.1 ## Installed Software @@ -69,17 +68,17 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.17.14 +- AWS CLI 2.17.18 - AWS SAM CLI 1.120.0 - AWS Session Manager CLI 1.2.650.0 - Azure CLI 2.62.0 - Azure CLI (azure-devops) 1.0.1 -- Bicep CLI 0.29.45 +- Bicep CLI 0.29.47 - Cmake 3.30.1 -- CodeQL Action Bundle 2.18.0 -- Fastlane 2.221.1 +- CodeQL Action Bundle 2.18.1 +- Fastlane 2.222.0 - SwiftFormat 0.54.2 -- Xcbeautify 2.4.1 +- Xcbeautify 2.5.0 - Xcode Command Line Tools 15.3.0.0.1.1708646388 - Xcodes 1.5.0 @@ -88,9 +87,9 @@ ### Browsers - Safari 17.5 (19618.2.12.11.6) - SafariDriver 17.5 (19618.2.12.11.6) -- Google Chrome 126.0.6478.183 -- Google Chrome for Testing 126.0.6478.182 -- ChromeDriver 126.0.6478.182 +- Google Chrome 127.0.6533.73 +- Google Chrome for Testing 127.0.6533.72 +- ChromeDriver 127.0.6533.72 - Selenium server 4.23.0 #### Environment variables @@ -117,7 +116,7 @@ #### Node.js - 18.20.4 -- 20.15.1 +- 20.16.0 #### Go - 1.20.14 @@ -125,17 +124,17 @@ - 1.22.5 ### Rust Tools -- Cargo 1.79.0 -- Rust 1.79.0 -- Rustdoc 1.79.0 +- Cargo 1.80.0 +- Rust 1.80.0 +- Rustdoc 1.80.0 - Rustup 1.27.1 #### Packages -- Clippy 0.1.79 +- Clippy 0.1.80 - Rustfmt 1.7.0-stable ### PowerShell Tools -- PowerShell 7.4.3 +- PowerShell 7.4.4 #### PowerShell Modules - Az: 12.1.0 @@ -145,7 +144,7 @@ ### Xcode | Version | Build | Path | | -------------- | -------- | --------------------------------- | -| 16.0 (beta) | 16A5202i | /Applications/Xcode_16_beta_3.app | +| 16.0 (beta) | 16A5211f | /Applications/Xcode_16_beta_4.app | | 15.4 (default) | 15F31d | /Applications/Xcode_15.4.app | | 15.3 | 15E204a | /Applications/Xcode_15.3.app | | 15.2 | 15C500b | /Applications/Xcode_15.2.app | @@ -198,12 +197,12 @@ | Simulator - watchOS 10.4 | watchsimulator10.4 | 15.3 | | Simulator - watchOS 10.5 | watchsimulator10.5 | 15.4 | | Simulator - watchOS 11.0 | watchsimulator11.0 | 16.0 | -| visionOS 1.0 | xros1.0 | 15.2 | | Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | -| Simulator - visionOS 1.1 | xrsimulator1.1 | 15.3 | +| visionOS 1.0 | xros1.0 | 15.2 | | visionOS 1.1 | xros1.1 | 15.3 | -| Simulator - visionOS 1.2 | xrsimulator1.2 | 15.4 | +| Simulator - visionOS 1.1 | xrsimulator1.1 | 15.3 | | visionOS 1.2 | xros1.2 | 15.4 | +| Simulator - visionOS 1.2 | xrsimulator1.2 | 15.4 | | Simulator - visionOS 2.0 | xrsimulator2.0 | 16.0 | | visionOS 2.0 | xros2.0 | 16.0 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | From a54473db52a986c5a1aaea59e1e2afd91b641b11 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 2 Aug 2024 13:37:35 +0000 Subject: [PATCH 3013/3485] Updating readme file for ubuntu20 version 20240730.2.1 (#10375) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2004-Readme.md | 104 ++++++++++++++--------------- 1 file changed, 52 insertions(+), 52 deletions(-) diff --git a/images/ubuntu/Ubuntu2004-Readme.md b/images/ubuntu/Ubuntu2004-Readme.md index 9555d5a30f80..e3bee3cdddd1 100644 --- a/images/ubuntu/Ubuntu2004-Readme.md +++ b/images/ubuntu/Ubuntu2004-Readme.md @@ -1,12 +1,13 @@ | Announcements | |-| +| [[All OSes] Android NDK versions <=25 will be removed from images on August 19](https://github.com/actions/runner-images/issues/10342) | | [Ubuntu 24.04 is now available](https://github.com/actions/runner-images/issues/9848) | | [[Ubuntu, Windows] Docker Compose v1 will be removed from images on July, 29](https://github.com/actions/runner-images/issues/9692) | *** # Ubuntu 20.04 - OS Version: 20.04.6 LTS - Kernel Version: 5.15.0-1068-azure -- Image Version: 20240721.1.0 +- Image Version: 20240730.2.0 - Systemd version: 245.4-4ubuntu3.23 ## Installed Software @@ -34,7 +35,7 @@ ### Package Management - cpan 1.64 - Helm 3.15.3 -- Homebrew 4.3.10 +- Homebrew 4.3.12 - Miniconda 24.5.0 - Npm 10.7.0 - NuGet 6.6.1.2 @@ -42,7 +43,7 @@ - Pip3 20.0.2 - Pipx 1.6.0 - RubyGems 3.1.2 -- Vcpkg (build from commit 821100d96) +- Vcpkg (build from commit 136a0d8b8) - Yarn 1.22.22 #### Environment variables @@ -72,18 +73,17 @@ to accomplish this. - AzCopy 10.25.1 - available by `azcopy` and `azcopy10` aliases - Bazel 7.2.1 - Bazelisk 1.19.0 -- Bicep 0.29.45 +- Bicep 0.29.47 - Buildah 1.22.3 - CMake 3.30.1 -- CodeQL Action Bundle 2.18.0 +- CodeQL Action Bundle 2.18.1 - Docker Amazon ECR Credential Helper 0.8.0 -- Docker Compose v1 1.29.2 - Docker Compose v2 2.27.1 -- Docker-Buildx 0.16.1 +- Docker-Buildx 0.16.2 - Docker Client 26.1.3 - Docker Server 26.1.3 -- Fastlane 2.221.1 -- Git 2.45.2 +- Fastlane 2.222.0 +- Git 2.46.0 - Git LFS 3.5.1 - Git-ftp 1.6.0 - Haveged 1.9.1 @@ -101,41 +101,41 @@ to accomplish this. - Newman 6.1.3 - nvm 0.39.7 - OpenSSL 1.1.1f-1ubuntu2.22 -- Packer 1.11.1 +- Packer 1.11.2 - Parcel 2.12.0 - PhantomJS 2.1.1 2.1.1 - Podman 3.4.2 -- Pulumi 3.125.0 +- Pulumi 3.127.0 - R 4.4.1 - Skopeo 1.5.0 - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 -- Terraform 1.9.2 +- Terraform 1.9.3 - yamllint 1.35.1 - yq 4.44.2 - zstd 1.5.6 ### CLI Tools - Alibaba Cloud CLI 3.0.174 -- AWS CLI 2.17.14 +- AWS CLI 2.17.19 - AWS CLI Session Manager Plugin 1.2.650.0 -- AWS SAM CLI 1.120.0 +- AWS SAM CLI 1.121.0 - Azure CLI 2.62.0 - Azure CLI (azure-devops) 1.0.1 - GitHub CLI 2.53.0 -- Google Cloud CLI 484.0.0 +- Google Cloud CLI 486.0.0 - Netlify CLI 17.33.4 - OpenShift CLI 4.15.19 - ORAS CLI 1.2.0 -- Vercel CLI 35.1.0 +- Vercel CLI 35.2.1 ### Java | Version | Environment Variable | | ------------------- | -------------------- | -| 8.0.412+8 | JAVA_HOME_8_X64 | -| 11.0.23+9 (default) | JAVA_HOME_11_X64 | -| 17.0.11+9 | JAVA_HOME_17_X64 | -| 21.0.3+9 | JAVA_HOME_21_X64 | +| 8.0.422+5 | JAVA_HOME_8_X64 | +| 11.0.24+8 (default) | JAVA_HOME_11_X64 | +| 17.0.12+7 | JAVA_HOME_17_X64 | +| 21.0.4+7 | JAVA_HOME_21_X64 | ### PHP Tools - PHP: 7.4.33, 8.0.30, 8.1.29, 8.2.21, 8.3.9 @@ -149,28 +149,28 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Cabal 3.12.1.0 - GHC 9.10.1 - GHCup 0.1.30.0 -- Stack 2.15.7 +- Stack 3.1.1 ### Rust Tools -- Cargo 1.79.0 -- Rust 1.79.0 -- Rustdoc 1.79.0 +- Cargo 1.80.0 +- Rust 1.80.0 +- Rustdoc 1.80.0 - Rustup 1.27.1 #### Packages - Bindgen 0.69.4 - Cargo audit 0.20.0 -- Cargo clippy 0.1.79 +- Cargo clippy 0.1.80 - Cargo outdated 0.15.0 - Cbindgen 0.26.0 - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 126.0.6478.182 -- ChromeDriver 126.0.6478.182 -- Chromium 126.0.6478.0 -- Microsoft Edge 126.0.2592.113 -- Microsoft Edge WebDriver 126.0.2592.102 +- Google Chrome 127.0.6533.72 +- ChromeDriver 127.0.6533.72 +- Chromium 127.0.6533.0 +- Microsoft Edge 127.0.2651.74 +- Microsoft Edge WebDriver 127.0.2651.72 - Selenium server 4.23.0 - Mozilla Firefox 128.0 - Geckodriver 0.34.0 @@ -222,7 +222,7 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Node.js - 16.20.2 - 18.20.4 -- 20.15.1 +- 20.16.0 #### Python - 3.7.17 @@ -243,15 +243,15 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Ruby - 3.0.7 - 3.1.6 -- 3.2.4 +- 3.2.5 ### PowerShell Tools -- PowerShell 7.4.3 +- PowerShell 7.4.4 #### PowerShell Modules - Az: 11.3.1 - MarkdownPS: 1.10 -- Microsoft.Graph: 2.20.0 +- Microsoft.Graph: 2.21.0 - Pester: 5.6.1 - PSScriptAnalyzer: 1.22.0 @@ -272,35 +272,35 @@ Use the following command as a part of your job to start the service: 'sudo syst | CMake | 3.10.2<br>3.18.1<br>3.22.1 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 24.0.8215888<br>25.2.9519653 (default)<br>26.3.11579264 | +| NDK | 24.0.8215888<br>25.2.9519653<br>26.3.11579264<br>27.0.12077973 (default) | #### Environment variables | Name | Value | | ----------------------- | -------------------------------------------- | | ANDROID_HOME | /usr/local/lib/android/sdk | -| ANDROID_NDK | /usr/local/lib/android/sdk/ndk/25.2.9519653 | -| ANDROID_NDK_HOME | /usr/local/lib/android/sdk/ndk/25.2.9519653 | -| ANDROID_NDK_LATEST_HOME | /usr/local/lib/android/sdk/ndk/26.3.11579264 | -| ANDROID_NDK_ROOT | /usr/local/lib/android/sdk/ndk/25.2.9519653 | +| ANDROID_NDK | /usr/local/lib/android/sdk/ndk/27.0.12077973 | +| ANDROID_NDK_HOME | /usr/local/lib/android/sdk/ndk/27.0.12077973 | +| ANDROID_NDK_LATEST_HOME | /usr/local/lib/android/sdk/ndk/27.0.12077973 | +| ANDROID_NDK_ROOT | /usr/local/lib/android/sdk/ndk/27.0.12077973 | | ANDROID_SDK_ROOT | /usr/local/lib/android/sdk | ### Cached Docker images | Repository:Tag | Digest | Created | | -------------------- | ------------------------------------------------------------------------ | ---------- | | alpine:3.16 | sha256:452e7292acee0ee16c332324d7de05fa2c99f9994ecc9f0779c602916a672ae4 | 2024-01-27 | -| alpine:3.17 | sha256:a6063e988bcd597b4f1f7cfd4ec38402b02edd0c79250f00c9e14dc1e94bebbc | 2024-06-20 | -| alpine:3.18 | sha256:1875c923b73448b558132e7d4a44b815d078779ed7a73f76209c6372de95ea8d | 2024-06-20 | -| alpine:3.19 | sha256:af4785ccdbcd5cde71bfd5b93eabd34250b98651f19fe218c91de6c8d10e21c5 | 2024-06-20 | +| alpine:3.17 | sha256:ef813b2faa3dd1a37f9ef6ca98347b72cd0f55e4ab29fb90946f1b853bf032d9 | 2024-07-22 | +| alpine:3.18 | sha256:5292533eb4efd4b5cf35e93b5a2b7d0e07ea193224c49446c7802c19ee4f2da5 | 2024-07-22 | +| alpine:3.19 | sha256:95c16745f100f44cf9a0939fd3f357905f845f8b6fa7d0cde0e88c9764060185 | 2024-07-22 | | debian:10 | sha256:58ce6f1271ae1c8a2006ff7d3e54e9874d839f573d8009c20154ad0f2fb0a225 | 2024-06-13 | -| debian:11 | sha256:b6b4a479a3bc1b8dfda5544f00b72aafb230bb835a43974a147b220c38df882e | 2024-07-02 | +| debian:11 | sha256:7aef2e7d061743fdb57973dac3ddbceb0b0912746ca7e0ee7535016c38286561 | 2024-07-23 | | debian:9 | sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be | 2022-06-23 | -| moby/buildkit:latest | sha256:33fe47b4c06972ac6720a7ee34d6fdea3b61972f81bcc9b1f73e46ed2a090fa1 | 2024-07-11 | +| moby/buildkit:latest | sha256:0a5641c72659aa246458914fedcf941892aa15b8a49a79a0e8f3a4cc8246d5f9 | 2024-07-25 | | node:16 | sha256:f77a1aef2da8d83e45ec990f45df50f1a286c5fe8bbfb8c6e4246c6389705c0b | 2023-09-07 | | node:16-alpine | sha256:a1f9d027912b58a7c75be7716c97cfbc6d3099f3a97ed84aa490be9dee20e787 | 2023-08-10 | -| node:18 | sha256:aabbaf118c7c0a6e9a3bda69bd2a94b0f6c4150bf80c501ef1c87ffcb5687365 | 2024-07-09 | -| node:18-alpine | sha256:1edb14175eeb14a14a3abe059339cbd97a0bbb76b6a210d2bb395d63fa4bc4ef | 2024-07-09 | -| node:20 | sha256:786005cf39792f7046bcd66491056c26d2dbcc669c072d1a1e4ef4fcdddd26eb | 2024-07-09 | -| node:20-alpine | sha256:34b7aa411056c85dbf71d240d26516949b3f72b318d796c26b57caaa1df5639a | 2024-07-09 | +| node:18 | sha256:11b742eda0142d9ea809fad8c506cbcadb2802c7d4b32e044e6b976691df36b1 | 2024-07-09 | +| node:18-alpine | sha256:17514b20acef0e79691285e7a59f3ae561f7a1702a9adc72a515aef23f326729 | 2024-07-09 | +| node:20 | sha256:1ae9ba874435551280e95c8a8e74adf8a48d72b564bf9dfe4718231f2144c88f | 2024-07-24 | +| node:20-alpine | sha256:eb8101caae9ac02229bd64c024919fe3d4504ff7f329da79ca60a04db08cef52 | 2024-07-24 | | ubuntu:20.04 | sha256:0b897358ff6624825fb50d20ffb605ab0eaea77ced0adb8c6a4b756513dec6fc | 2024-06-03 | ### Installed apt packages @@ -317,7 +317,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | coreutils | 8.30-3ubuntu2 | | curl | 7.68.0-1ubuntu2.22 | | dbus | 1.12.16-2ubuntu2.3 | -| dnsutils | 1:9.16.48-0ubuntu0.20.04.1 | +| dnsutils | 1:9.18.28-0ubuntu0.20.04.1 | | dpkg | 1.19.7ubuntu3.2 | | dpkg-dev | 1.19.7ubuntu3.2 | | fakeroot | 1.24-1 | @@ -330,7 +330,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | gcc | 4:9.3.0-1ubuntu2 | | gnupg2 | 2.2.19-3ubuntu2.2 | | haveged | 1.9.1-6ubuntu1 | -| imagemagick | 8:6.9.10.23+dfsg-2.1ubuntu11.9 | +| imagemagick | 8:6.9.10.23+dfsg-2.1ubuntu11.10 | | iproute2 | 5.5.0-1ubuntu1 | | iputils-ping | 3:20190709-3ubuntu1 | | jq | 1.6-1ubuntu0.20.04.1 | @@ -344,8 +344,8 @@ Use the following command as a part of your job to start the service: 'sudo syst | libgsl-dev | 2.5+dfsg-6+deb10u1build0.20.04.1 | | libgtk-3-0 | 3.24.20-0ubuntu1.2 | | libmagic-dev | 1:5.38-4 | -| libmagickcore-dev | 8:6.9.10.23+dfsg-2.1ubuntu11.9 | -| libmagickwand-dev | 8:6.9.10.23+dfsg-2.1ubuntu11.9 | +| libmagickcore-dev | 8:6.9.10.23+dfsg-2.1ubuntu11.10 | +| libmagickwand-dev | 8:6.9.10.23+dfsg-2.1ubuntu11.10 | | libsecret-1-dev | 0.20.4-0ubuntu1 | | libsqlite3-dev | 3.31.1-4ubuntu0.6 | | libtool | 2.4.6-14 | From 0f88c4231d163d2b8935edd8189ed40662406bcb Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 2 Aug 2024 13:42:15 +0000 Subject: [PATCH 3014/3485] Updating readme file for win19 version 20240730.1.1 (#10372) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/windows/Windows2019-Readme.md | 63 ++++++++++++++-------------- 1 file changed, 32 insertions(+), 31 deletions(-) diff --git a/images/windows/Windows2019-Readme.md b/images/windows/Windows2019-Readme.md index 32b57612661c..54d530795750 100644 --- a/images/windows/Windows2019-Readme.md +++ b/images/windows/Windows2019-Readme.md @@ -1,10 +1,11 @@ | Announcements | |-| +| [[All OSes] Android NDK versions <=25 will be removed from images on August 19](https://github.com/actions/runner-images/issues/10342) | | [[Ubuntu, Windows] Docker Compose v1 will be removed from images on July, 29](https://github.com/actions/runner-images/issues/9692) | *** # Windows Server 2019 - OS Version: 10.0.17763 Build 6054 -- Image Version: 20240721.1.0 +- Image Version: 20240730.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -33,7 +34,7 @@ - pip 24.0 (python 3.7) - Pipx 1.2.1 - RubyGems 3.2.33 -- Vcpkg (build from commit 821100d96) +- Vcpkg (build from commit 136a0d8b8) - Yarn 1.22.22 #### Environment variables @@ -54,19 +55,19 @@ - azcopy 10.25.1 - Bazel 7.2.1 - Bazelisk 1.19.0 -- Bicep 0.29.45 +- Bicep 0.29.47 - Cabal 3.12.1.0 - CMake 3.30.1 -- CodeQL Action Bundle 2.18.0 +- CodeQL Action Bundle 2.18.1 - Docker 26.1.3 - Docker Compose v1 1.29.2 - Docker Compose v2 2.27.1 - Docker-wincred 0.8.2 - ghc 9.10.1 -- Git 2.45.2.windows.1 +- Git 2.46.0.windows.1 - Git LFS 3.5.1 -- Google Cloud CLI 484.0.0 -- ImageMagick 7.1.1-35 +- Google Cloud CLI 485.0.0 +- ImageMagick 7.1.1-36 - InnoSetup 6.3.3 - jq 1.7.1 - Kind 0.23.0 @@ -80,10 +81,10 @@ - OpenSSL 1.1.1w - Packer 1.11.0 - Parcel 2.12.0 -- Pulumi 3.125.0 +- Pulumi 3.127.0 - R 4.4.1 - Service Fabric SDK 9.1.1436.9590 -- Stack 2.15.7 +- Stack 3.1.1 - Subversion (SVN) 1.14.2 - Swig 4.1.1 - VSWhere 3.1.7 @@ -93,8 +94,8 @@ - zstd 1.5.6 ### CLI Tools -- Alibaba Cloud CLI 3.0.214 -- AWS CLI 2.17.14 +- Alibaba Cloud CLI 3.0.216 +- AWS CLI 2.17.19 - AWS SAM CLI 1.120.0 - AWS Session Manager CLI 1.2.650.0 - Azure CLI 2.62.0 @@ -103,9 +104,9 @@ - GitHub CLI 2.53.0 ### Rust Tools -- Cargo 1.79.0 -- Rust 1.79.0 -- Rustdoc 1.79.0 +- Cargo 1.80.0 +- Rust 1.80.0 +- Rustdoc 1.80.0 - Rustup 1.27.1 #### Packages @@ -113,15 +114,15 @@ - cargo-audit 0.20.0 - cargo-outdated 0.15.0 - cbindgen 0.26.0 -- Clippy 0.1.79 +- Clippy 0.1.80 - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 126.0.6478.183 -- Chrome Driver 126.0.6478.182 -- Microsoft Edge 126.0.2592.113 -- Microsoft Edge Driver 126.0.2592.113 -- Mozilla Firefox 128.0 +- Google Chrome 127.0.6533.73 +- Chrome Driver 127.0.6533.72 +- Microsoft Edge 127.0.2651.74 +- Microsoft Edge Driver 127.0.2651.74 +- Mozilla Firefox 128.0.3 - Gecko Driver 0.34.0 - IE Driver 4.14.0.0 - Selenium server 4.23.0 @@ -172,7 +173,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Node.js - 16.20.2 - 18.20.4 -- 20.15.1 +- 20.16.0 #### Python - 3.7.9 @@ -193,7 +194,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Ruby - 3.0.7 - 3.1.6 -- 3.2.4 +- 3.2.5 ### Databases @@ -500,7 +501,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - nbgv 3.6.139+a9e8765620 ### PowerShell Tools -- PowerShell 7.4.3 +- PowerShell 7.4.4 #### Powershell Modules - Az: 11.3.1 @@ -508,15 +509,15 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - AzureRM: 2.1.0 (Default), 6.13.1 - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.619 +- AWSPowershell: 4.1.624 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.10 -- Microsoft.Graph: 2.20.0 +- Microsoft.Graph: 2.21.0 - Pester: 3.4.0, 5.6.1 - PowerShellGet: 1.0.0.1, 2.2.5 - PSScriptAnalyzer: 1.22.0 - PSWindowsUpdate: 2.2.1.5 -- SqlServer: 22.3.0 +- SqlServer: 22.2.0 - VSSetup: 2.2.16 ``` Azure PowerShell module 2.1.0 and AzureRM PowerShell module 2.1.0 are installed @@ -537,16 +538,16 @@ All other versions are saved but not installed. | Google APIs | addon-google_apis-google-21<br>addon-google_apis-google-22<br>addon-google_apis-google-23<br>addon-google_apis-google-24 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 24.0.8215888<br>25.2.9519653<br>26.3.11579264 | +| NDK | 24.0.8215888<br>25.2.9519653<br>26.3.11579264<br>27.0.12077973 | #### Environment variables | Name | Value | | ----------------------- | ---------------------------------------- | | ANDROID_HOME | C:\Android\android-sdk | -| ANDROID_NDK | C:\Android\android-sdk\ndk\25.2.9519653 | -| ANDROID_NDK_HOME | C:\Android\android-sdk\ndk\25.2.9519653 | -| ANDROID_NDK_LATEST_HOME | C:\Android\android-sdk\ndk\26.3.11579264 | -| ANDROID_NDK_ROOT | C:\Android\android-sdk\ndk\25.2.9519653 | +| ANDROID_NDK | C:\Android\android-sdk\ndk\27.0.12077973 | +| ANDROID_NDK_HOME | C:\Android\android-sdk\ndk\27.0.12077973 | +| ANDROID_NDK_LATEST_HOME | C:\Android\android-sdk\ndk\27.0.12077973 | +| ANDROID_NDK_ROOT | C:\Android\android-sdk\ndk\27.0.12077973 | | ANDROID_SDK_ROOT | C:\Android\android-sdk | ### Cached Docker images From 2a4bc14da46f1f8e358aa902a69edb9bef135472 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 2 Aug 2024 14:25:52 +0000 Subject: [PATCH 3015/3485] Updating readme file for ubuntu22 version 20240730.2.1 (#10376) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2204-Readme.md | 112 ++++++++++++++--------------- 1 file changed, 56 insertions(+), 56 deletions(-) diff --git a/images/ubuntu/Ubuntu2204-Readme.md b/images/ubuntu/Ubuntu2204-Readme.md index d84163f5b2b2..dabc04aeb2e2 100644 --- a/images/ubuntu/Ubuntu2204-Readme.md +++ b/images/ubuntu/Ubuntu2204-Readme.md @@ -1,12 +1,13 @@ | Announcements | |-| +| [[All OSes] Android NDK versions <=25 will be removed from images on August 19](https://github.com/actions/runner-images/issues/10342) | | [Ubuntu 24.04 is now available](https://github.com/actions/runner-images/issues/9848) | | [[Ubuntu, Windows] Docker Compose v1 will be removed from images on July, 29](https://github.com/actions/runner-images/issues/9692) | *** # Ubuntu 22.04 - OS Version: 22.04.4 LTS -- Kernel Version: 6.5.0-1024-azure -- Image Version: 20240721.1.0 +- Kernel Version: 6.5.0-1025-azure +- Image Version: 20240730.2.0 - Systemd version: 249.11-0ubuntu3.12 ## Installed Software @@ -32,7 +33,7 @@ ### Package Management - cpan 1.64 - Helm 3.15.3 -- Homebrew 4.3.10 +- Homebrew 4.3.12 - Miniconda 24.5.0 - Npm 10.7.0 - NuGet 6.6.1.2 @@ -40,7 +41,7 @@ - Pip3 22.0.2 - Pipx 1.6.0 - RubyGems 3.3.5 -- Vcpkg (build from commit 821100d96) +- Vcpkg (build from commit 136a0d8b8) - Yarn 1.22.22 #### Environment variables @@ -70,18 +71,17 @@ to accomplish this. - AzCopy 10.25.1 - available by `azcopy` and `azcopy10` aliases - Bazel 7.2.1 - Bazelisk 1.19.0 -- Bicep 0.29.45 +- Bicep 0.29.47 - Buildah 1.23.1 - CMake 3.30.1 -- CodeQL Action Bundle 2.18.0 +- CodeQL Action Bundle 2.18.1 - Docker Amazon ECR Credential Helper 0.8.0 -- Docker Compose v1 1.29.2 - Docker Compose v2 2.27.1 -- Docker-Buildx 0.16.1 +- Docker-Buildx 0.16.2 - Docker Client 26.1.3 - Docker Server 26.1.3 -- Fastlane 2.221.1 -- Git 2.45.2 +- Fastlane 2.222.0 +- Git 2.46.0 - Git LFS 3.5.1 - Git-ftp 1.6.0 - Haveged 1.9.14 @@ -98,40 +98,40 @@ to accomplish this. - Newman 6.1.3 - nvm 0.39.7 - OpenSSL 3.0.2-0ubuntu1.16 -- Packer 1.11.1 +- Packer 1.11.2 - Parcel 2.12.0 - Podman 3.4.4 -- Pulumi 3.125.0 +- Pulumi 3.127.0 - R 4.4.1 - Skopeo 1.4.1 - Sphinx Open Source Search Server 2.2.11 - SVN 1.14.1 -- Terraform 1.9.2 +- Terraform 1.9.3 - yamllint 1.35.1 - yq 4.44.2 - zstd 1.5.6 ### CLI Tools -- Alibaba Cloud CLI 3.0.214 -- AWS CLI 2.17.14 +- Alibaba Cloud CLI 3.0.216 +- AWS CLI 2.17.19 - AWS CLI Session Manager Plugin 1.2.650.0 -- AWS SAM CLI 1.120.0 +- AWS SAM CLI 1.121.0 - Azure CLI 2.62.0 - Azure CLI (azure-devops) 1.0.1 - GitHub CLI 2.53.0 -- Google Cloud CLI 484.0.0 +- Google Cloud CLI 486.0.0 - Netlify CLI 17.33.4 -- OpenShift CLI 4.16.3 +- OpenShift CLI 4.16.4 - ORAS CLI 1.2.0 -- Vercel CLI 35.1.0 +- Vercel CLI 35.2.1 ### Java | Version | Environment Variable | | ------------------- | -------------------- | -| 8.0.412+8 | JAVA_HOME_8_X64 | -| 11.0.23+9 (default) | JAVA_HOME_11_X64 | -| 17.0.11+9 | JAVA_HOME_17_X64 | -| 21.0.3+9 | JAVA_HOME_21_X64 | +| 8.0.422+5 | JAVA_HOME_8_X64 | +| 11.0.24+8 (default) | JAVA_HOME_11_X64 | +| 17.0.12+7 | JAVA_HOME_17_X64 | +| 21.0.4+7 | JAVA_HOME_21_X64 | ### PHP Tools - PHP: 8.1.2 @@ -145,30 +145,30 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Cabal 3.12.1.0 - GHC 9.10.1 - GHCup 0.1.30.0 -- Stack 2.15.7 +- Stack 3.1.1 ### Rust Tools -- Cargo 1.79.0 -- Rust 1.79.0 -- Rustdoc 1.79.0 +- Cargo 1.80.0 +- Rust 1.80.0 +- Rustdoc 1.80.0 - Rustup 1.27.1 #### Packages - Bindgen 0.69.4 - Cargo audit 0.20.0 -- Cargo clippy 0.1.79 +- Cargo clippy 0.1.80 - Cargo outdated 0.15.0 - Cbindgen 0.26.0 - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 126.0.6478.182 -- ChromeDriver 126.0.6478.182 -- Chromium 126.0.6478.0 -- Microsoft Edge 126.0.2592.113 -- Microsoft Edge WebDriver 126.0.2592.102 +- Google Chrome 127.0.6533.72 +- ChromeDriver 127.0.6533.72 +- Chromium 127.0.6533.0 +- Microsoft Edge 127.0.2651.74 +- Microsoft Edge WebDriver 127.0.2651.72 - Selenium server 4.23.0 -- Mozilla Firefox 128.0 +- Mozilla Firefox 128.0.3 - Geckodriver 0.34.0 #### Environment variables @@ -217,7 +217,7 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Node.js - 16.20.2 - 18.20.4 -- 20.15.1 +- 20.16.0 #### Python - 3.7.17 @@ -235,15 +235,15 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Ruby - 3.1.6 -- 3.2.4 +- 3.2.5 ### PowerShell Tools -- PowerShell 7.4.3 +- PowerShell 7.4.4 #### PowerShell Modules - Az: 11.3.1 - MarkdownPS: 1.10 -- Microsoft.Graph: 2.20.0 +- Microsoft.Graph: 2.21.0 - Pester: 5.6.1 - PSScriptAnalyzer: 1.22.0 @@ -263,34 +263,34 @@ Use the following command as a part of your job to start the service: 'sudo syst | CMake | 3.10.2<br>3.18.1<br>3.22.1 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 24.0.8215888<br>25.2.9519653 (default)<br>26.3.11579264 | +| NDK | 24.0.8215888<br>25.2.9519653<br>26.3.11579264<br>27.0.12077973 (default) | #### Environment variables | Name | Value | | ----------------------- | -------------------------------------------- | | ANDROID_HOME | /usr/local/lib/android/sdk | -| ANDROID_NDK | /usr/local/lib/android/sdk/ndk/25.2.9519653 | -| ANDROID_NDK_HOME | /usr/local/lib/android/sdk/ndk/25.2.9519653 | -| ANDROID_NDK_LATEST_HOME | /usr/local/lib/android/sdk/ndk/26.3.11579264 | -| ANDROID_NDK_ROOT | /usr/local/lib/android/sdk/ndk/25.2.9519653 | +| ANDROID_NDK | /usr/local/lib/android/sdk/ndk/27.0.12077973 | +| ANDROID_NDK_HOME | /usr/local/lib/android/sdk/ndk/27.0.12077973 | +| ANDROID_NDK_LATEST_HOME | /usr/local/lib/android/sdk/ndk/27.0.12077973 | +| ANDROID_NDK_ROOT | /usr/local/lib/android/sdk/ndk/27.0.12077973 | | ANDROID_SDK_ROOT | /usr/local/lib/android/sdk | ### Cached Docker images | Repository:Tag | Digest | Created | | -------------------- | ------------------------------------------------------------------------ | ---------- | | alpine:3.16 | sha256:452e7292acee0ee16c332324d7de05fa2c99f9994ecc9f0779c602916a672ae4 | 2024-01-27 | -| alpine:3.17 | sha256:a6063e988bcd597b4f1f7cfd4ec38402b02edd0c79250f00c9e14dc1e94bebbc | 2024-06-20 | -| alpine:3.18 | sha256:1875c923b73448b558132e7d4a44b815d078779ed7a73f76209c6372de95ea8d | 2024-06-20 | -| alpine:3.19 | sha256:af4785ccdbcd5cde71bfd5b93eabd34250b98651f19fe218c91de6c8d10e21c5 | 2024-06-20 | +| alpine:3.17 | sha256:ef813b2faa3dd1a37f9ef6ca98347b72cd0f55e4ab29fb90946f1b853bf032d9 | 2024-07-22 | +| alpine:3.18 | sha256:5292533eb4efd4b5cf35e93b5a2b7d0e07ea193224c49446c7802c19ee4f2da5 | 2024-07-22 | +| alpine:3.19 | sha256:95c16745f100f44cf9a0939fd3f357905f845f8b6fa7d0cde0e88c9764060185 | 2024-07-22 | | debian:10 | sha256:58ce6f1271ae1c8a2006ff7d3e54e9874d839f573d8009c20154ad0f2fb0a225 | 2024-06-13 | -| debian:11 | sha256:b6b4a479a3bc1b8dfda5544f00b72aafb230bb835a43974a147b220c38df882e | 2024-07-02 | -| moby/buildkit:latest | sha256:33fe47b4c06972ac6720a7ee34d6fdea3b61972f81bcc9b1f73e46ed2a090fa1 | 2024-07-11 | +| debian:11 | sha256:7aef2e7d061743fdb57973dac3ddbceb0b0912746ca7e0ee7535016c38286561 | 2024-07-23 | +| moby/buildkit:latest | sha256:0a5641c72659aa246458914fedcf941892aa15b8a49a79a0e8f3a4cc8246d5f9 | 2024-07-25 | | node:16 | sha256:f77a1aef2da8d83e45ec990f45df50f1a286c5fe8bbfb8c6e4246c6389705c0b | 2023-09-07 | | node:16-alpine | sha256:a1f9d027912b58a7c75be7716c97cfbc6d3099f3a97ed84aa490be9dee20e787 | 2023-08-10 | -| node:18 | sha256:aabbaf118c7c0a6e9a3bda69bd2a94b0f6c4150bf80c501ef1c87ffcb5687365 | 2024-07-09 | -| node:18-alpine | sha256:1edb14175eeb14a14a3abe059339cbd97a0bbb76b6a210d2bb395d63fa4bc4ef | 2024-07-09 | -| node:20 | sha256:786005cf39792f7046bcd66491056c26d2dbcc669c072d1a1e4ef4fcdddd26eb | 2024-07-09 | -| node:20-alpine | sha256:34b7aa411056c85dbf71d240d26516949b3f72b318d796c26b57caaa1df5639a | 2024-07-09 | +| node:18 | sha256:11b742eda0142d9ea809fad8c506cbcadb2802c7d4b32e044e6b976691df36b1 | 2024-07-09 | +| node:18-alpine | sha256:17514b20acef0e79691285e7a59f3ae561f7a1702a9adc72a515aef23f326729 | 2024-07-09 | +| node:20 | sha256:1ae9ba874435551280e95c8a8e74adf8a48d72b564bf9dfe4718231f2144c88f | 2024-07-24 | +| node:20-alpine | sha256:eb8101caae9ac02229bd64c024919fe3d4504ff7f329da79ca60a04db08cef52 | 2024-07-24 | | ubuntu:20.04 | sha256:0b897358ff6624825fb50d20ffb605ab0eaea77ced0adb8c6a4b756513dec6fc | 2024-06-03 | | ubuntu:22.04 | sha256:340d9b015b194dc6e2a13938944e0d016e57b9679963fdeb9ce021daac430221 | 2024-06-27 | @@ -308,7 +308,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | coreutils | 8.32-4.1ubuntu1.2 | | curl | 7.81.0-1ubuntu1.16 | | dbus | 1.12.20-2ubuntu4.1 | -| dnsutils | 1:9.18.24-0ubuntu0.22.04.1 | +| dnsutils | 1:9.18.28-0ubuntu0.22.04.1 | | dpkg | 1.21.1ubuntu2.3 | | dpkg-dev | 1.21.1ubuntu2.3 | | fakeroot | 1.28-1ubuntu1 | @@ -321,7 +321,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | gcc | 4:11.2.0-1ubuntu1 | | gnupg2 | 2.2.27-3ubuntu2.1 | | haveged | 1.9.14-1ubuntu1 | -| imagemagick | 8:6.9.11.60+dfsg-1.3ubuntu0.22.04.3 | +| imagemagick | 8:6.9.11.60+dfsg-1.3ubuntu0.22.04.5 | | iproute2 | 5.15.0-1ubuntu2 | | iputils-ping | 3:20211215-1 | | jq | 1.6-2.1ubuntu3 | @@ -335,8 +335,8 @@ Use the following command as a part of your job to start the service: 'sudo syst | libgsl-dev | 2.7.1+dfsg-3 | | libgtk-3-0 | 3.24.33-1ubuntu2.2 | | libmagic-dev | 1:5.41-3ubuntu0.1 | -| libmagickcore-dev | 8:6.9.11.60+dfsg-1.3ubuntu0.22.04.3 | -| libmagickwand-dev | 8:6.9.11.60+dfsg-1.3ubuntu0.22.04.3 | +| libmagickcore-dev | 8:6.9.11.60+dfsg-1.3ubuntu0.22.04.5 | +| libmagickwand-dev | 8:6.9.11.60+dfsg-1.3ubuntu0.22.04.5 | | libsecret-1-dev | 0.20.5-2 | | libsqlite3-dev | 3.37.2-2ubuntu0.3 | | libssl-dev | 3.0.2-0ubuntu1.16 | From 7636fd53b906caf3e159903afe68e45343348921 Mon Sep 17 00:00:00 2001 From: ijunaidm <160701894+ijunaidm@users.noreply.github.com> Date: Tue, 6 Aug 2024 17:41:19 +0530 Subject: [PATCH 3016/3485] Updated the AzPowershell module version (#10395) Co-authored-by: Mohammed Junaid <mohammedjunaid@Mohammeds-MacBook-Pro.local> --- images/windows/toolsets/toolset-2019.json | 2 +- images/windows/toolsets/toolset-2022.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/images/windows/toolsets/toolset-2019.json b/images/windows/toolsets/toolset-2019.json index 06e41169e50b..118a6b71a632 100644 --- a/images/windows/toolsets/toolset-2019.json +++ b/images/windows/toolsets/toolset-2019.json @@ -120,7 +120,7 @@ { "name": "az", "versions": [ - "11.3.1" + "12.1.0" ], "zip_versions": [ ] diff --git a/images/windows/toolsets/toolset-2022.json b/images/windows/toolsets/toolset-2022.json index b219e98b0c34..44908044dbda 100644 --- a/images/windows/toolsets/toolset-2022.json +++ b/images/windows/toolsets/toolset-2022.json @@ -119,7 +119,7 @@ { "name": "az", "versions": [ - "11.3.1" + "12.1.0" ], "zip_versions": [ From 330077042616766a00d0cb3138a67cbda1b4101f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 7 Aug 2024 12:01:30 +0000 Subject: [PATCH 3017/3485] Updating readme file for ubuntu24 version 20240804.1.1 (#10393) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2404-Readme.md | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/images/ubuntu/Ubuntu2404-Readme.md b/images/ubuntu/Ubuntu2404-Readme.md index f6fd5641ee9c..4db618ae116b 100644 --- a/images/ubuntu/Ubuntu2404-Readme.md +++ b/images/ubuntu/Ubuntu2404-Readme.md @@ -7,7 +7,7 @@ # Ubuntu 24.04 LTS - OS Version: 24.04 LTS - Kernel Version: 6.8.0-1010-azure -- Image Version: 20240730.3.0 +- Image Version: 20240804.1.0 - Systemd version: 255.4-1ubuntu8.2 ## Installed Software @@ -36,7 +36,7 @@ - Pip3 24.0 - Pipx 1.4.3 - RubyGems 3.4.20 -- Vcpkg (build from commit 136a0d8b8) +- Vcpkg (build from commit fe1cde61e) - Yarn 1.22.22 #### Environment variables @@ -61,12 +61,12 @@ to accomplish this. ### Tools - Ansible 2.17.2 -- AzCopy 10.25.1 - available by `azcopy` and `azcopy10` aliases +- AzCopy 10.26.0 - available by `azcopy` and `azcopy10` aliases - Bazel 7.2.1 - Bazelisk 1.19.0 - Bicep 0.29.47 - Buildah 1.33.7 -- CMake 3.30.1 +- CMake 3.30.2 - CodeQL Action Bundle 2.18.1 - Docker Amazon ECR Credential Helper 0.8.0 - Docker Compose v2 2.27.1 @@ -87,7 +87,7 @@ to accomplish this. - Minikube 1.33.1 - n 9.2.3 - Newman 6.1.3 -- OpenSSL 3.0.13-0ubuntu3.1 +- OpenSSL 3.0.13-0ubuntu3.2 - Parcel 2.12.0 - Podman 4.9.3 - Pulumi 3.127.0 @@ -98,12 +98,12 @@ to accomplish this. - zstd 1.5.6 ### CLI Tools -- AWS CLI 2.17.19 +- AWS CLI 2.17.22 - AWS CLI Session Manager Plugin 1.2.650.0 - AWS SAM CLI 1.121.0 - Azure CLI 2.62.0 - Azure CLI (azure-devops) 1.0.1 -- GitHub CLI 2.53.0 +- GitHub CLI 2.54.0 ### Java | Version | Environment Variable | @@ -137,8 +137,8 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 127.0.6533.72 -- ChromeDriver 127.0.6533.72 +- Google Chrome 127.0.6533.88 +- ChromeDriver 127.0.6533.88 - Chromium 127.0.6533.0 - Selenium server 4.23.0 @@ -166,7 +166,7 @@ Use the following command as a part of your job to start the service: 'sudo syst ``` #### MySQL -- MySQL 8.0.37-0ubuntu0.24.04.1 +- MySQL 8.0.39-0ubuntu0.24.04.1 ``` User: root Password: root @@ -201,7 +201,7 @@ Use the following command as a part of your job to start the service: 'sudo syst #### PowerShell Modules - Az: 11.5.0 -- Microsoft.Graph: 2.21.0 +- Microsoft.Graph: 2.21.1 - Pester: 5.6.1 - PSScriptAnalyzer: 1.22.0 @@ -262,7 +262,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | iproute2 | 6.1.0-1ubuntu6 | | iputils-ping | 3:20240117-1build1 | | jq | 1.7.1-3build1 | -| libssl-dev | 3.0.13-0ubuntu3.1 | +| libssl-dev | 3.0.13-0ubuntu3.2 | | libtool | 2.4.7-7build1 | | libyaml-dev | 0.2.5-1build1 | | locales | 2.39-0ubuntu8.2 | From 4b55f4683f75c5707989bf7cf86d964b0ee030e8 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 7 Aug 2024 12:29:32 +0000 Subject: [PATCH 3018/3485] Updating readme file for ubuntu20 version 20240804.1.1 (#10391) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2004-Readme.md | 36 +++++++++++++++--------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/images/ubuntu/Ubuntu2004-Readme.md b/images/ubuntu/Ubuntu2004-Readme.md index e3bee3cdddd1..f55a4eff3667 100644 --- a/images/ubuntu/Ubuntu2004-Readme.md +++ b/images/ubuntu/Ubuntu2004-Readme.md @@ -7,7 +7,7 @@ # Ubuntu 20.04 - OS Version: 20.04.6 LTS - Kernel Version: 5.15.0-1068-azure -- Image Version: 20240730.2.0 +- Image Version: 20240804.1.0 - Systemd version: 245.4-4ubuntu3.23 ## Installed Software @@ -43,7 +43,7 @@ - Pip3 20.0.2 - Pipx 1.6.0 - RubyGems 3.1.2 -- Vcpkg (build from commit 136a0d8b8) +- Vcpkg (build from commit fe1cde61e) - Yarn 1.22.22 #### Environment variables @@ -70,12 +70,12 @@ to accomplish this. ### Tools - Ansible 2.13.13 - apt-fast 1.10.0 -- AzCopy 10.25.1 - available by `azcopy` and `azcopy10` aliases +- AzCopy 10.26.0 - available by `azcopy` and `azcopy10` aliases - Bazel 7.2.1 - Bazelisk 1.19.0 - Bicep 0.29.47 - Buildah 1.22.3 -- CMake 3.30.1 +- CMake 3.30.2 - CodeQL Action Bundle 2.18.1 - Docker Amazon ECR Credential Helper 0.8.0 - Docker Compose v2 2.27.1 @@ -87,7 +87,7 @@ to accomplish this. - Git LFS 3.5.1 - Git-ftp 1.6.0 - Haveged 1.9.1 -- Heroku 9.0.0 +- Heroku 9.1.0 - HHVM (HipHop VM) 4.172.1 - jq 1.6 - Kind 0.23.0 @@ -99,8 +99,8 @@ to accomplish this. - Minikube 1.33.1 - n 9.2.3 - Newman 6.1.3 -- nvm 0.39.7 -- OpenSSL 1.1.1f-1ubuntu2.22 +- nvm 0.40.0 +- OpenSSL 1.1.1f-1ubuntu2.23 - Packer 1.11.2 - Parcel 2.12.0 - PhantomJS 2.1.1 2.1.1 @@ -117,17 +117,17 @@ to accomplish this. ### CLI Tools - Alibaba Cloud CLI 3.0.174 -- AWS CLI 2.17.19 +- AWS CLI 2.17.22 - AWS CLI Session Manager Plugin 1.2.650.0 - AWS SAM CLI 1.121.0 - Azure CLI 2.62.0 - Azure CLI (azure-devops) 1.0.1 -- GitHub CLI 2.53.0 +- GitHub CLI 2.54.0 - Google Cloud CLI 486.0.0 -- Netlify CLI 17.33.4 +- Netlify CLI 17.33.5 - OpenShift CLI 4.15.19 - ORAS CLI 1.2.0 -- Vercel CLI 35.2.1 +- Vercel CLI 35.2.3 ### Java | Version | Environment Variable | @@ -138,7 +138,7 @@ to accomplish this. | 21.0.4+7 | JAVA_HOME_21_X64 | ### PHP Tools -- PHP: 7.4.33, 8.0.30, 8.1.29, 8.2.21, 8.3.9 +- PHP: 7.4.33, 8.0.30, 8.1.29, 8.2.22, 8.3.10 - Composer 2.7.7 - PHPUnit 8.5.39 ``` @@ -166,11 +166,11 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 127.0.6533.72 -- ChromeDriver 127.0.6533.72 +- Google Chrome 127.0.6533.88 +- ChromeDriver 127.0.6533.88 - Chromium 127.0.6533.0 -- Microsoft Edge 127.0.2651.74 -- Microsoft Edge WebDriver 127.0.2651.72 +- Microsoft Edge 127.0.2651.86 +- Microsoft Edge WebDriver 127.0.2651.87 - Selenium server 4.23.0 - Mozilla Firefox 128.0 - Geckodriver 0.34.0 @@ -200,7 +200,7 @@ Use the following command as a part of your job to start the service: 'sudo syst ``` #### MySQL -- MySQL 8.0.37-0ubuntu0.20.04.3 +- MySQL 8.0.39-0ubuntu0.20.04.1 ``` User: root Password: root @@ -251,7 +251,7 @@ Use the following command as a part of your job to start the service: 'sudo syst #### PowerShell Modules - Az: 11.3.1 - MarkdownPS: 1.10 -- Microsoft.Graph: 2.21.0 +- Microsoft.Graph: 2.21.1 - Pester: 5.6.1 - PSScriptAnalyzer: 1.22.0 From f4044046439ca0628df310521591b12e67a7c189 Mon Sep 17 00:00:00 2001 From: hemanthmanga <166606741+hemanthmanga@users.noreply.github.com> Date: Wed, 7 Aug 2024 18:55:29 +0530 Subject: [PATCH 3019/3485] Updated Thumbprint for Az-cli and Geckodriver (#10405) --- images/windows/scripts/build/Install-AzureCli.ps1 | 2 +- images/windows/scripts/build/Install-Firefox.ps1 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/images/windows/scripts/build/Install-AzureCli.ps1 b/images/windows/scripts/build/Install-AzureCli.ps1 index 35fdc478229a..47a24319bf4d 100644 --- a/images/windows/scripts/build/Install-AzureCli.ps1 +++ b/images/windows/scripts/build/Install-AzureCli.ps1 @@ -15,7 +15,7 @@ New-Item -ItemType 'Directory' -Path $azureCliExtensionPath | Out-Null Install-Binary -Type MSI ` -Url 'https://aka.ms/installazurecliwindowsx64' ` - -ExpectedSignature 'F9A7CF9FBE13BAC767F4781061332DA6E8B4E0EE' + -ExpectedSignature 'C2048FB509F1C37A8C3E9EC6648118458AA01780' Update-Environment diff --git a/images/windows/scripts/build/Install-Firefox.ps1 b/images/windows/scripts/build/Install-Firefox.ps1 index 29f622869f7a..281975b45153 100644 --- a/images/windows/scripts/build/Install-Firefox.ps1 +++ b/images/windows/scripts/build/Install-Firefox.ps1 @@ -53,7 +53,7 @@ Write-Host "Expand Gecko WebDriver archive..." Expand-7ZipArchive -Path $geckoDriverArchPath -DestinationPath $geckoDriverPath # Validate Gecko WebDriver signature -$geckoDriverSignatureThumbprint = "1326B39C3D5D2CA012F66FB439026F7B59CB1974" +$geckoDriverSignatureThumbprint = "40890F2FE1ACAE18072FA7F3C0AE456AACC8570D" Test-FileSignature -Path "$geckoDriverPath/geckodriver.exe" -ExpectedThumbprint $geckoDriverSignatureThumbprint Write-Host "Setting the environment variables..." From 37e8b599ee1e6719e22eaac98f5ad6673cead481 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 7 Aug 2024 15:02:51 +0000 Subject: [PATCH 3020/3485] Updating readme file for macos-14 version 20240804.1 (#10388) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-14-Readme.md | 52 ++++++++++++++++----------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/images/macos/macos-14-Readme.md b/images/macos/macos-14-Readme.md index 5d2d97cd63f8..7c414dcd25f4 100644 --- a/images/macos/macos-14-Readme.md +++ b/images/macos/macos-14-Readme.md @@ -3,9 +3,9 @@ | [[macOS] GCC 11 will be removed from all macOS images on August 12](https://github.com/actions/runner-images/issues/10213) | *** # macOS 14 -- OS Version: macOS 14.5 (23F79) -- Kernel Version: Darwin 23.5.0 -- Image Version: 20240728.1 +- OS Version: macOS 14.6 (23G80) +- Kernel Version: Darwin 23.6.0 +- Image Version: 20240804.1 ## Installed Software @@ -24,23 +24,23 @@ - GNU Fortran 14 (Homebrew GCC 14.1.0_2) - available by `gfortran-14` alias - Kotlin 2.0.0-release-341 - Mono 6.12.0.188 -- Node.js 20.15.1 +- Node.js 20.16.0 - Perl 5.38.2 - PHP 8.3.9 - Python3 3.12.4 - Ruby 3.0.7p220 ### Package Management -- Bundler 2.5.16 +- Bundler 2.5.17 - Carthage 0.39.1 - CocoaPods 1.15.2 - Composer 2.7.7 -- Homebrew 4.3.10 -- NPM 10.7.0 +- Homebrew 4.3.12 +- NPM 10.8.1 - NuGet 6.3.1.1 - Pip3 24.2 (python 3.12) - Pipx 1.6.0 -- RubyGems 3.5.16 +- RubyGems 3.5.17 - Yarn 1.22.22 ### Project Management @@ -51,14 +51,14 @@ ### Utilities - 7-Zip 17.05 - aria2 1.37.0 -- azcopy 10.25.1 +- azcopy 10.26.0 - bazel 7.2.1 - bazelisk 1.20.0 - bsdtar 3.5.3 - available by 'tar' alias -- Curl 8.9.0 -- Git 2.45.2 +- Curl 8.9.1 +- Git 2.46.0 - Git LFS 3.5.1 -- GitHub CLI 2.53.0 +- GitHub CLI 2.54.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.24.5 - gpg (GnuPG) 2.4.5 @@ -70,17 +70,17 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.17.18 -- AWS SAM CLI 1.120.0 +- AWS CLI 2.17.22 +- AWS SAM CLI 1.121.0 - AWS Session Manager CLI 1.2.650.0 - Azure CLI 2.62.0 - Azure CLI (azure-devops) 1.0.1 - Bicep CLI 0.29.47 -- Cmake 3.30.1 +- Cmake 3.30.2 - CodeQL Action Bundle 2.18.1 - Fastlane 2.222.0 -- SwiftFormat 0.54.2 -- Xcbeautify 2.5.0 +- SwiftFormat 0.54.3 +- Xcbeautify 2.7.0 - Xcode Command Line Tools 15.3.0.0.1.1708646388 - Xcodes 1.5.0 @@ -88,13 +88,13 @@ - SwiftLint 0.55.1 ### Browsers -- Safari 17.5 (19618.2.12.11.6) -- SafariDriver 17.5 (19618.2.12.11.6) -- Google Chrome 127.0.6533.73 -- Google Chrome for Testing 127.0.6533.72 -- ChromeDriver 127.0.6533.72 -- Microsoft Edge 127.0.2651.74 -- Microsoft Edge WebDriver 127.0.2651.78 +- Safari 17.6 (19618.3.11.11.5) +- SafariDriver 17.6 (19618.3.11.11.5) +- Google Chrome 127.0.6533.89 +- Google Chrome for Testing 127.0.6533.88 +- ChromeDriver 127.0.6533.88 +- Microsoft Edge 127.0.2651.86 +- Microsoft Edge WebDriver 127.0.2651.87 - Mozilla Firefox 128.0.3 - geckodriver 0.34.0 - Selenium server 4.23.0 @@ -211,12 +211,12 @@ | Simulator - watchOS 11.0 | watchsimulator11.0 | 16.0 | | visionOS 1.0 | xros1.0 | 15.2 | | Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | -| visionOS 1.1 | xros1.1 | 15.3 | | Simulator - visionOS 1.1 | xrsimulator1.1 | 15.3 | +| visionOS 1.1 | xros1.1 | 15.3 | | Simulator - visionOS 1.2 | xrsimulator1.2 | 15.4 | | visionOS 1.2 | xros1.2 | 15.4 | -| visionOS 2.0 | xros2.0 | 16.0 | | Simulator - visionOS 2.0 | xrsimulator2.0 | 16.0 | +| visionOS 2.0 | xros2.0 | 16.0 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | From c31eef93ac8b1230b6b7a23ec9d78e30c8fce686 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 7 Aug 2024 15:32:11 +0000 Subject: [PATCH 3021/3485] Updating readme file for macos-13-arm64 version 20240804.1 (#10389) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-13-arm64-Readme.md | 42 +++++++++++++-------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/images/macos/macos-13-arm64-Readme.md b/images/macos/macos-13-arm64-Readme.md index b4343591e9e0..0265e212bd85 100644 --- a/images/macos/macos-13-arm64-Readme.md +++ b/images/macos/macos-13-arm64-Readme.md @@ -3,9 +3,9 @@ | [[macOS] GCC 11 will be removed from all macOS images on August 12](https://github.com/actions/runner-images/issues/10213) | *** # macOS 13 -- OS Version: macOS 13.6.7 (22G720) +- OS Version: macOS 13.6.8 (22G820) - Kernel Version: Darwin 22.6.0 -- Image Version: 20240728.2 +- Image Version: 20240804.1 ## Installed Software @@ -24,21 +24,21 @@ - GNU Fortran 14 (Homebrew GCC 14.1.0_2) - available by `gfortran-14` alias - Kotlin 2.0.0-release-341 - Mono 6.12.0.188 -- Node.js 20.15.1 +- Node.js 20.16.0 - Perl 5.38.2 - Python3 3.12.4 - Ruby 3.0.7p220 ### Package Management -- Bundler 2.5.16 +- Bundler 2.5.17 - Carthage 0.39.1 - CocoaPods 1.15.2 -- Homebrew 4.3.10 -- NPM 10.7.0 +- Homebrew 4.3.12 +- NPM 10.8.1 - NuGet 6.3.1.1 - Pip3 24.0 (python 3.12) - Pipx 1.6.0 -- RubyGems 3.5.16 +- RubyGems 3.5.17 - Yarn 1.22.22 ### Project Management @@ -49,14 +49,14 @@ ### Utilities - 7-Zip 17.05 - aria2 1.37.0 -- azcopy 10.25.1 +- azcopy 10.26.0 - bazel 7.2.1 - bazelisk 1.20.0 - bsdtar 3.5.3 - available by 'tar' alias -- Curl 8.4.0 -- Git 2.45.2 +- Curl 8.7.1 +- Git 2.46.0 - Git LFS 3.5.1 -- GitHub CLI 2.53.0 +- GitHub CLI 2.54.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.24.5 - gpg (GnuPG) 2.4.5 @@ -68,28 +68,28 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.17.18 -- AWS SAM CLI 1.120.0 +- AWS CLI 2.17.22 +- AWS SAM CLI 1.121.0 - AWS Session Manager CLI 1.2.650.0 - Azure CLI 2.62.0 - Azure CLI (azure-devops) 1.0.1 - Bicep CLI 0.29.47 -- Cmake 3.30.1 +- Cmake 3.30.2 - CodeQL Action Bundle 2.18.1 - Fastlane 2.222.0 - SwiftFormat 0.54.3 -- Xcbeautify 2.5.0 +- Xcbeautify 2.7.0 - Xcode Command Line Tools 14.3.1.0.1.1683849156 - Xcodes 1.5.0 ### Linters ### Browsers -- Safari 17.5 (18618.2.12.111.5) -- SafariDriver 17.5 (18618.2.12.111.5) -- Google Chrome 127.0.6533.73 -- Google Chrome for Testing 127.0.6533.72 -- ChromeDriver 127.0.6533.72 +- Safari 17.6 (18618.3.11.11.7) +- SafariDriver 17.6 (18618.3.11.11.7) +- Google Chrome 127.0.6533.89 +- Google Chrome for Testing 127.0.6533.88 +- ChromeDriver 127.0.6533.88 - Selenium server 4.23.0 #### Environment variables @@ -186,8 +186,8 @@ | Simulator - watchOS 9.4 | watchsimulator9.4 | 14.3.1 | | Simulator - watchOS 10.0 | watchsimulator10.0 | 15.0.1 | | Simulator - watchOS 10.2 | watchsimulator10.2 | 15.1, 15.2 | -| visionOS 1.0 | xros1.0 | 15.2 | | Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | +| visionOS 1.0 | xros1.0 | 15.2 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | From 7665ed4ef98fd2694532d99d587f72566aa7d41a Mon Sep 17 00:00:00 2001 From: RaviAkshintala <167848931+RaviAkshintala@users.noreply.github.com> Date: Thu, 8 Aug 2024 10:07:02 +0530 Subject: [PATCH 3022/3485] removing the docker composev1 (#10407) Co-authored-by: Ravi Akshintala <raviakshintalagithub.com@Ravis-Laptop.local> --- .../scripts/build/Install-DockerCompose.ps1 | 14 -------------- .../scripts/docs-gen/Generate-SoftwareReport.ps1 | 1 - .../scripts/docs-gen/SoftwareReport.Tools.psm1 | 5 ----- images/windows/scripts/tests/Docker.Tests.ps1 | 4 ---- 4 files changed, 24 deletions(-) diff --git a/images/windows/scripts/build/Install-DockerCompose.ps1 b/images/windows/scripts/build/Install-DockerCompose.ps1 index d53ed20047dc..40757770b1a1 100644 --- a/images/windows/scripts/build/Install-DockerCompose.ps1 +++ b/images/windows/scripts/build/Install-DockerCompose.ps1 @@ -2,20 +2,6 @@ ## File: Install-Docker-Compose.ps1 ## Desc: Install Docker Compose. ################################################################################ - -Write-Host "Install-Package Docker-Compose v1" -$dockerComposev1Url = "https://github.com/docker/compose/releases/download/1.29.2/docker-compose-Windows-x86_64.exe" -$checksumsUrl = "https://github.com/docker/compose/releases/download/1.29.2/docker-compose-Windows-x86_64.exe.sha256" -$dockerComposev1Dir = "C:\ProgramData\docker-compose" -New-Item -Path $dockerComposev1Dir -ItemType Directory -$externalHash = Get-ChecksumFromUrl -Type "SHA256" ` - -Url $checksumsUrl ` - -FileName (Split-Path $dockerComposev1Url -Leaf) -$dockerComposev1Path = Invoke-DownloadWithRetry -Url $dockerComposev1Url -Path "$dockerComposev1Dir\docker-compose.exe" -Test-FileChecksum $dockerComposev1Path -ExpectedSHA256Sum $externalHash -Add-MachinePathItem $dockerComposev1Dir -Update-Environment - Write-Host "Install-Package Docker-Compose v2" $toolsetVersion = (Get-ToolsetContent).docker.components.compose $composeVersion = (Get-GithubReleasesByVersion -Repo "docker/compose" -Version "${toolsetVersion}").version diff --git a/images/windows/scripts/docs-gen/Generate-SoftwareReport.ps1 b/images/windows/scripts/docs-gen/Generate-SoftwareReport.ps1 index 70c0021eb382..53f22b1ed1ad 100644 --- a/images/windows/scripts/docs-gen/Generate-SoftwareReport.ps1 +++ b/images/windows/scripts/docs-gen/Generate-SoftwareReport.ps1 @@ -71,7 +71,6 @@ $tools.AddToolVersion("Cabal", $(Get-CabalVersion)) $tools.AddToolVersion("CMake", $(Get-CMakeVersion)) $tools.AddToolVersion("CodeQL Action Bundle", $(Get-CodeQLBundleVersion)) $tools.AddToolVersion("Docker", $(Get-DockerVersion)) -$tools.AddToolVersion("Docker Compose v1", $(Get-DockerComposeVersion)) $tools.AddToolVersion("Docker Compose v2", $(Get-DockerComposeVersionV2)) $tools.AddToolVersion("Docker-wincred", $(Get-DockerWincredVersion)) $tools.AddToolVersion("ghc", $(Get-GHCVersion)) diff --git a/images/windows/scripts/docs-gen/SoftwareReport.Tools.psm1 b/images/windows/scripts/docs-gen/SoftwareReport.Tools.psm1 index 757316b6dfea..0aa224facf42 100644 --- a/images/windows/scripts/docs-gen/SoftwareReport.Tools.psm1 +++ b/images/windows/scripts/docs-gen/SoftwareReport.Tools.psm1 @@ -55,11 +55,6 @@ function Get-DockerVersion { return $dockerVersion } -function Get-DockerComposeVersion { - $dockerComposeVersion = docker-compose version --short - return $dockerComposeVersion -} - function Get-DockerComposeVersionV2 { $dockerComposeVersion = docker compose version --short return $dockerComposeVersion diff --git a/images/windows/scripts/tests/Docker.Tests.ps1 b/images/windows/scripts/tests/Docker.Tests.ps1 index dcd0dd70ab6c..d2565f15f908 100644 --- a/images/windows/scripts/tests/Docker.Tests.ps1 +++ b/images/windows/scripts/tests/Docker.Tests.ps1 @@ -13,10 +13,6 @@ Describe "Docker" { } Describe "DockerCompose" { - It "docker-compose is installed" { - "docker-compose --version" | Should -ReturnZeroExitCode - } - It "docker compose v2" { "docker compose version" | Should -ReturnZeroExitCode } From 551ccc0fb1e97314ec7e0179845b78bc5a6f5b5a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 8 Aug 2024 06:05:08 +0000 Subject: [PATCH 3023/3485] Updating readme file for macos-13 version 20240805.3 (#10400) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-13-Readme.md | 52 ++++++++++++++++----------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/images/macos/macos-13-Readme.md b/images/macos/macos-13-Readme.md index 75faf50b0874..905fb05557b2 100644 --- a/images/macos/macos-13-Readme.md +++ b/images/macos/macos-13-Readme.md @@ -3,9 +3,9 @@ | [[macOS] GCC 11 will be removed from all macOS images on August 12](https://github.com/actions/runner-images/issues/10213) | *** # macOS 13 -- OS Version: macOS 13.6.7 (22G720) +- OS Version: macOS 13.6.8 (22G820) - Kernel Version: Darwin 22.6.0 -- Image Version: 20240728.2 +- Image Version: 20240805.3 ## Installed Software @@ -24,24 +24,24 @@ - GNU Fortran 14 (Homebrew GCC 14.1.0_2) - available by `gfortran-14` alias - Kotlin 2.0.0-release-341 - Mono 6.12.0.188 -- Node.js 20.15.1 +- Node.js 20.16.0 - Perl 5.38.2 -- PHP 8.3.9 +- PHP 8.3.10 - Python3 3.12.4 - Ruby 3.0.7p220 ### Package Management -- Bundler 2.5.16 +- Bundler 2.5.17 - Carthage 0.39.1 - CocoaPods 1.15.2 - Composer 2.7.7 -- Homebrew 4.3.10 -- NPM 10.7.0 +- Homebrew 4.3.13 +- NPM 10.8.1 - NuGet 6.3.1.1 - Pip3 24.2 (python 3.12) - Pipx 1.6.0 -- RubyGems 3.5.16 -- Vcpkg 2024 (build from commit cacf59943) +- RubyGems 3.5.17 +- Vcpkg 2024 (build from commit fe1cde61e) - Yarn 1.22.22 ### Project Management @@ -52,14 +52,14 @@ ### Utilities - 7-Zip 17.05 - aria2 1.37.0 -- azcopy 10.25.1 +- azcopy 10.26.0 - bazel 7.2.1 - bazelisk 1.20.0 - bsdtar 3.5.3 - available by 'tar' alias -- Curl 8.9.0 -- Git 2.45.2 +- Curl 8.9.1 +- Git 2.46.0 - Git LFS 3.5.1 -- GitHub CLI 2.53.0 +- GitHub CLI 2.54.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.24.5 - gpg (GnuPG) 2.4.5 @@ -67,21 +67,21 @@ - OpenSSL 1.1.1w 11 Sep 2023 - Packer 1.9.4 - pkg-config 0.29.2 -- yq 4.44.2 +- yq 4.44.3 - zstd 1.5.6 ### Tools -- AWS CLI 2.17.18 -- AWS SAM CLI 1.120.0 +- AWS CLI 2.17.22 +- AWS SAM CLI 1.121.0 - AWS Session Manager CLI 1.2.650.0 - Azure CLI 2.62.0 - Azure CLI (azure-devops) 1.0.1 - Bicep CLI 0.29.47 -- Cmake 3.30.1 +- Cmake 3.30.2 - CodeQL Action Bundle 2.18.1 - Fastlane 2.222.0 - SwiftFormat 0.54.3 -- Xcbeautify 2.5.0 +- Xcbeautify 2.7.0 - Xcode Command Line Tools 14.3.1.0.1.1683849156 - Xcodes 1.5.0 @@ -89,13 +89,13 @@ - SwiftLint 0.55.1 ### Browsers -- Safari 17.5 (18618.2.12.111.5) -- SafariDriver 17.5 (18618.2.12.111.5) -- Google Chrome 127.0.6533.73 -- Google Chrome for Testing 127.0.6533.72 -- ChromeDriver 127.0.6533.72 -- Microsoft Edge 127.0.2651.74 -- Microsoft Edge WebDriver 127.0.2651.78 +- Safari 17.6 (18618.3.11.11.7) +- SafariDriver 17.6 (18618.3.11.11.7) +- Google Chrome 127.0.6533.89 +- Google Chrome for Testing 127.0.6533.88 +- ChromeDriver 127.0.6533.88 +- Microsoft Edge 127.0.2651.86 +- Microsoft Edge WebDriver 127.0.2651.87 - Mozilla Firefox 128.0.3 - geckodriver 0.34.0 - Selenium server 4.23.0 @@ -210,8 +210,8 @@ | Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | | visionOS 1.0 | xros1.0 | 15.2 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | -| Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | +| Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | | DriverKit 22.1 | driverkit22.1 | 14.1 | | DriverKit 22.2 | driverkit22.2 | 14.2 | | DriverKit 22.4 | driverkit22.4 | 14.3.1 | From 3a24d66b9e28cd87d24f1fed3c9d849e337982f6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 8 Aug 2024 06:56:56 +0000 Subject: [PATCH 3024/3485] Updating readme file for macos-14-arm64 version 20240805.3 (#10397) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-14-arm64-Readme.md | 44 +++++++++++++-------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/images/macos/macos-14-arm64-Readme.md b/images/macos/macos-14-arm64-Readme.md index fbe780785d68..44ecd8e224e1 100644 --- a/images/macos/macos-14-arm64-Readme.md +++ b/images/macos/macos-14-arm64-Readme.md @@ -3,9 +3,9 @@ | [[macOS] GCC 11 will be removed from all macOS images on August 12](https://github.com/actions/runner-images/issues/10213) | *** # macOS 14 -- OS Version: macOS 14.5 (23F79) -- Kernel Version: Darwin 23.5.0 -- Image Version: 20240728.1 +- OS Version: macOS 14.6 (23G80) +- Kernel Version: Darwin 23.6.0 +- Image Version: 20240805.3 ## Installed Software @@ -24,21 +24,21 @@ - GNU Fortran 14 (Homebrew GCC 14.1.0_2) - available by `gfortran-14` alias - Kotlin 2.0.0-release-341 - Mono 6.12.0.188 -- Node.js 20.15.1 +- Node.js 20.16.0 - Perl 5.38.2 - Python3 3.12.4 - Ruby 3.0.7p220 ### Package Management -- Bundler 2.5.16 +- Bundler 2.5.17 - Carthage 0.39.1 - CocoaPods 1.15.2 -- Homebrew 4.3.10 -- NPM 10.7.0 +- Homebrew 4.3.12 +- NPM 10.8.1 - NuGet 6.3.1.1 - Pip3 24.0 (python 3.12) - Pipx 1.6.0 -- RubyGems 3.5.16 +- RubyGems 3.5.17 - Yarn 1.22.22 ### Project Management @@ -49,14 +49,14 @@ ### Utilities - 7-Zip 17.05 - aria2 1.37.0 -- azcopy 10.25.1 +- azcopy 10.26.0 - bazel 7.2.1 - bazelisk 1.20.0 - bsdtar 3.5.3 - available by 'tar' alias -- Curl 8.6.0 -- Git 2.45.2 +- Curl 8.7.1 +- Git 2.46.0 - Git LFS 3.5.1 -- GitHub CLI 2.53.0 +- GitHub CLI 2.54.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.24.5 - gpg (GnuPG) 2.4.5 @@ -68,28 +68,28 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.17.18 -- AWS SAM CLI 1.120.0 +- AWS CLI 2.17.22 +- AWS SAM CLI 1.121.0 - AWS Session Manager CLI 1.2.650.0 - Azure CLI 2.62.0 - Azure CLI (azure-devops) 1.0.1 - Bicep CLI 0.29.47 -- Cmake 3.30.1 +- Cmake 3.30.2 - CodeQL Action Bundle 2.18.1 - Fastlane 2.222.0 -- SwiftFormat 0.54.2 -- Xcbeautify 2.5.0 +- SwiftFormat 0.54.3 +- Xcbeautify 2.7.0 - Xcode Command Line Tools 15.3.0.0.1.1708646388 - Xcodes 1.5.0 ### Linters ### Browsers -- Safari 17.5 (19618.2.12.11.6) -- SafariDriver 17.5 (19618.2.12.11.6) -- Google Chrome 127.0.6533.73 -- Google Chrome for Testing 127.0.6533.72 -- ChromeDriver 127.0.6533.72 +- Safari 17.6 (19618.3.11.11.5) +- SafariDriver 17.6 (19618.3.11.11.5) +- Google Chrome 127.0.6533.89 +- Google Chrome for Testing 127.0.6533.88 +- ChromeDriver 127.0.6533.88 - Selenium server 4.23.0 #### Environment variables From 8aec741c908541ed84fd82151b514466e67bdf98 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 8 Aug 2024 14:17:44 +0530 Subject: [PATCH 3025/3485] Updating readme file for ubuntu22 version 20240804.1.1 (#10392) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2204-Readme.md | 38 +++++++++++++++--------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/images/ubuntu/Ubuntu2204-Readme.md b/images/ubuntu/Ubuntu2204-Readme.md index dabc04aeb2e2..045a7239e306 100644 --- a/images/ubuntu/Ubuntu2204-Readme.md +++ b/images/ubuntu/Ubuntu2204-Readme.md @@ -7,7 +7,7 @@ # Ubuntu 22.04 - OS Version: 22.04.4 LTS - Kernel Version: 6.5.0-1025-azure -- Image Version: 20240730.2.0 +- Image Version: 20240804.1.0 - Systemd version: 249.11-0ubuntu3.12 ## Installed Software @@ -41,7 +41,7 @@ - Pip3 22.0.2 - Pipx 1.6.0 - RubyGems 3.3.5 -- Vcpkg (build from commit 136a0d8b8) +- Vcpkg (build from commit fe1cde61e) - Yarn 1.22.22 #### Environment variables @@ -68,12 +68,12 @@ to accomplish this. ### Tools - Ansible 2.17.2 - apt-fast 1.10.0 -- AzCopy 10.25.1 - available by `azcopy` and `azcopy10` aliases +- AzCopy 10.26.0 - available by `azcopy` and `azcopy10` aliases - Bazel 7.2.1 - Bazelisk 1.19.0 - Bicep 0.29.47 - Buildah 1.23.1 -- CMake 3.30.1 +- CMake 3.30.2 - CodeQL Action Bundle 2.18.1 - Docker Amazon ECR Credential Helper 0.8.0 - Docker Compose v2 2.27.1 @@ -85,7 +85,7 @@ to accomplish this. - Git LFS 3.5.1 - Git-ftp 1.6.0 - Haveged 1.9.14 -- Heroku 9.0.0 +- Heroku 9.1.0 - jq 1.6 - Kind 0.23.0 - Kubectl 1.30.3 @@ -96,8 +96,8 @@ to accomplish this. - Minikube 1.33.1 - n 9.2.3 - Newman 6.1.3 -- nvm 0.39.7 -- OpenSSL 3.0.2-0ubuntu1.16 +- nvm 0.40.0 +- OpenSSL 3.0.2-0ubuntu1.17 - Packer 1.11.2 - Parcel 2.12.0 - Podman 3.4.4 @@ -113,17 +113,17 @@ to accomplish this. ### CLI Tools - Alibaba Cloud CLI 3.0.216 -- AWS CLI 2.17.19 +- AWS CLI 2.17.22 - AWS CLI Session Manager Plugin 1.2.650.0 - AWS SAM CLI 1.121.0 - Azure CLI 2.62.0 - Azure CLI (azure-devops) 1.0.1 -- GitHub CLI 2.53.0 +- GitHub CLI 2.54.0 - Google Cloud CLI 486.0.0 -- Netlify CLI 17.33.4 -- OpenShift CLI 4.16.4 +- Netlify CLI 17.33.5 +- OpenShift CLI 4.16.5 - ORAS CLI 1.2.0 -- Vercel CLI 35.2.1 +- Vercel CLI 35.2.3 ### Java | Version | Environment Variable | @@ -162,11 +162,11 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 127.0.6533.72 -- ChromeDriver 127.0.6533.72 +- Google Chrome 127.0.6533.88 +- ChromeDriver 127.0.6533.88 - Chromium 127.0.6533.0 -- Microsoft Edge 127.0.2651.74 -- Microsoft Edge WebDriver 127.0.2651.72 +- Microsoft Edge 127.0.2651.86 +- Microsoft Edge WebDriver 127.0.2651.87 - Selenium server 4.23.0 - Mozilla Firefox 128.0.3 - Geckodriver 0.34.0 @@ -195,7 +195,7 @@ Use the following command as a part of your job to start the service: 'sudo syst ``` #### MySQL -- MySQL 8.0.37-0ubuntu0.22.04.3 +- MySQL 8.0.39-0ubuntu0.22.04.1 ``` User: root Password: root @@ -243,7 +243,7 @@ Use the following command as a part of your job to start the service: 'sudo syst #### PowerShell Modules - Az: 11.3.1 - MarkdownPS: 1.10 -- Microsoft.Graph: 2.21.0 +- Microsoft.Graph: 2.21.1 - Pester: 5.6.1 - PSScriptAnalyzer: 1.22.0 @@ -339,7 +339,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | libmagickwand-dev | 8:6.9.11.60+dfsg-1.3ubuntu0.22.04.5 | | libsecret-1-dev | 0.20.5-2 | | libsqlite3-dev | 3.37.2-2ubuntu0.3 | -| libssl-dev | 3.0.2-0ubuntu1.16 | +| libssl-dev | 3.0.2-0ubuntu1.17 | | libtool | 2.4.6-15build2 | | libunwind8 | 1.3.2-2build2.1 | | libxkbfile-dev | 1:1.1.0-1build3 | From 7992e24b696cca1fe5567f674401f5b74d7da000 Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Thu, 8 Aug 2024 11:24:37 +0200 Subject: [PATCH 3026/3485] [macOS] Unlock Cargo crate dependencies due to a bug (#10390) --- images/macos/scripts/build/install-nvm.sh | 11 ++++++++++- images/macos/scripts/build/install-rust.sh | 2 +- images/macos/toolsets/toolset-12.json | 1 + 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/images/macos/scripts/build/install-nvm.sh b/images/macos/scripts/build/install-nvm.sh index 4d475cd1ba5d..35731cf949d4 100644 --- a/images/macos/scripts/build/install-nvm.sh +++ b/images/macos/scripts/build/install-nvm.sh @@ -7,7 +7,16 @@ source ~/utils/utils.sh [[ -n $API_PAT ]] && authString=(-H "Authorization: token ${API_PAT}") -nvm_version=$(curl "${authString[@]}" -fsSL https://api.github.com/repos/nvm-sh/nvm/releases/latest | jq -r '.tag_name') + +nvm_version=$(get_toolset_value '.node.nvm_installer') +if [[ -z $nvm_version || "$nvm_version" == "latest" ]]; then + nvm_version=$(curl "${authString[@]}" -fsSL https://api.github.com/repos/nvm-sh/nvm/releases/latest | jq -r '.tag_name') +fi + +if [[ $nvm_version != "v*" ]]; then + nvm_version="v${nvm_version}" +fi + nvm_installer_path=$(download_with_retry "https://raw.githubusercontent.com/nvm-sh/nvm/$nvm_version/install.sh") if bash $nvm_installer_path; then diff --git a/images/macos/scripts/build/install-rust.sh b/images/macos/scripts/build/install-rust.sh index 9b6e9be25c12..37f94353500f 100644 --- a/images/macos/scripts/build/install-rust.sh +++ b/images/macos/scripts/build/install-rust.sh @@ -19,7 +19,7 @@ echo "Install common tools..." rustup component add rustfmt clippy if is_BigSur || is_Monterey; then - cargo install --locked bindgen-cli cbindgen cargo-audit cargo-outdated + cargo install bindgen-cli cbindgen cargo-audit cargo-outdated fi echo "Cleanup Cargo registry cached data..." diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index 621ba3500557..336e1a617155 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -339,6 +339,7 @@ }, "node": { "default": "18", + "nvm_installer": "0.39.7", "nvm_versions": [ "16", "18", From c49ee7347c80e8c2eee793fefdab32da2d0334da Mon Sep 17 00:00:00 2001 From: Prasanjit Sahoo <160633557+prasanjitsahoo@users.noreply.github.com> Date: Wed, 7 Aug 2024 12:00:35 +0530 Subject: [PATCH 3027/3485] Add Xcode 16.0 Beta 5 for macOS14 Update toolset-14.json xcode 16.0 beta 5 updated Update toolset-14.json Update toolset-14.json Update toolset-14.json --- images/macos/toolsets/toolset-14.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/macos/toolsets/toolset-14.json b/images/macos/toolsets/toolset-14.json index 82c748d13370..53dd36b60e23 100644 --- a/images/macos/toolsets/toolset-14.json +++ b/images/macos/toolsets/toolset-14.json @@ -3,7 +3,7 @@ "default": "15.4", "x64": { "versions": [ - { "link": "16_beta_4", "version": "16.0.0-Beta.4+16A5211f", "symlinks": ["16.0"], "install_runtimes": "false", "sha256": "4270cd8021b2f7f512ce91bfc4423b25bccab36cdab21834709d798c8daade72"}, + { "link": "16_beta_5", "version": "16.0.0-Beta.5+16A5221g", "symlinks": ["16.0"], "install_runtimes": "false", "sha256": "00b44d41fcfcacb613575871ceff5c1c07de99b7501f8c48170af002763cd517"}, { "link": "15.4", "version": "15.4.0+15F31d", "install_runtimes": "true", "sha256": "82d3d61804ff3f4c7c82085e91dc701037ddaa770e542848b2477e22f4e8aa7a"}, { "link": "15.3", "version": "15.3.0+15E204a", "install_runtimes": "true", "sha256": "f13f6a2e2df432c3008e394640b8549a18c285acd7fd148d6c4bac8c3a5af234"}, { "link": "15.2", "version": "15.2.0+15C500b", "install_runtimes": "true", "sha256": "04E93680C6DDBEC84666531BE412DE778AFC8EAC6AB2037F4C2BE7290818B59B"}, @@ -14,7 +14,7 @@ }, "arm64":{ "versions": [ - { "link": "16_beta_4", "version": "16.0.0-Beta.4+16A5211f", "symlinks": ["16.0"], "install_runtimes": "true", "sha256": "4270cd8021b2f7f512ce91bfc4423b25bccab36cdab21834709d798c8daade72"}, + { "link": "16_beta_5", "version": "16.0.0-Beta.5+16A5221g", "symlinks": ["16.0"], "install_runtimes": "true", "sha256": "00b44d41fcfcacb613575871ceff5c1c07de99b7501f8c48170af002763cd517"}, { "link": "15.4", "version": "15.4.0+15F31d", "install_runtimes": "true", "sha256": "82d3d61804ff3f4c7c82085e91dc701037ddaa770e542848b2477e22f4e8aa7a"}, { "link": "15.3", "version": "15.3.0+15E204a", "install_runtimes": "true", "sha256": "f13f6a2e2df432c3008e394640b8549a18c285acd7fd148d6c4bac8c3a5af234"}, { "link": "15.2", "version": "15.2.0+15C500b", "install_runtimes": "true", "sha256": "04E93680C6DDBEC84666531BE412DE778AFC8EAC6AB2037F4C2BE7290818B59B"}, From d485ae12fef66e0211c0f9c9f913c0d56dd2d8db Mon Sep 17 00:00:00 2001 From: Sarathraj Srinivasan <sarathrajsrinivasan@github.com> Date: Wed, 7 Aug 2024 00:14:47 -0500 Subject: [PATCH 3028/3485] [macOS] Remove gcc11 from all macOS images [macOS] Remove gcc11 from all macOS images Update toolset-13.json --- images/macos/toolsets/toolset-12.json | 1 - images/macos/toolsets/toolset-13.json | 2 -- images/macos/toolsets/toolset-14.json | 1 - 3 files changed, 4 deletions(-) diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index 336e1a617155..08e1158d2483 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -226,7 +226,6 @@ }, "gcc": { "versions": [ - "11", "12", "13", "14" diff --git a/images/macos/toolsets/toolset-13.json b/images/macos/toolsets/toolset-13.json index b0fe5fa41213..23a98ef1ed7c 100644 --- a/images/macos/toolsets/toolset-13.json +++ b/images/macos/toolsets/toolset-13.json @@ -9,7 +9,6 @@ { "link": "14.3.1", "version": "14.3.1+14E300c","symlinks": ["14.3"], "install_runtimes": "true", "sha256": "B5CC7BF37447C32A971B37D71C7DA1AF7ABB45CEE4B96FE126A1D3B0D2C260AF"}, { "link": "14.2", "version": "14.2.0+14C18", "install_runtimes": "true", "sha256": "686B9D53CA49E50D563BC0104B1E8B4F7CCFE80064A6D689965FB819BF8EFE72"}, { "link": "14.1", "version": "14.1.0+14B47b", "install_runtimes": "true", "sha256": "12F8A3AEF78BF354470AD8B351ADDD925C8EDAD888137D138CA50A8130EB9F2F"} - ] }, "arm64":{ @@ -88,7 +87,6 @@ }, "gcc": { "versions": [ - "11", "12", "13", "14" diff --git a/images/macos/toolsets/toolset-14.json b/images/macos/toolsets/toolset-14.json index 53dd36b60e23..364d19d0104f 100644 --- a/images/macos/toolsets/toolset-14.json +++ b/images/macos/toolsets/toolset-14.json @@ -90,7 +90,6 @@ }, "gcc": { "versions": [ - "11", "12", "13", "14" From 22143c7c6811f8936d42f49d964007df427788cb Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Fri, 9 Aug 2024 11:25:15 +0200 Subject: [PATCH 3029/3485] [macOS] Remove macOS-11 related code due to the deprecation (#10383) --- images.CI/macos/anka/Anka.Helpers.psm1 | 5 +- .../macos/scripts/build/configure-machine.sh | 29 +- .../scripts/build/configure-preimagedata.sh | 10 +- .../macos/scripts/build/install-aws-tools.sh | 8 +- .../scripts/build/install-common-utils.sh | 45 +-- images/macos/scripts/build/install-git.sh | 15 +- images/macos/scripts/build/install-node.sh | 2 +- images/macos/scripts/build/install-python.sh | 6 +- images/macos/scripts/build/install-rust.sh | 2 +- .../macos/scripts/build/install-swiftlint.sh | 9 +- .../docs-gen/Generate-SoftwareReport.ps1 | 43 +-- .../docs-gen/SoftwareReport.Common.psm1 | 15 - .../docs-gen/SoftwareReport.Xcode.psm1 | 7 +- .../macos/scripts/helpers/Common.Helpers.psm1 | 5 - images/macos/scripts/helpers/utils.sh | 8 - images/macos/scripts/tests/Android.Tests.ps1 | 2 +- .../macos/scripts/tests/BasicTools.Tests.ps1 | 24 +- images/macos/scripts/tests/Common.Tests.ps1 | 4 +- images/macos/scripts/tests/Git.Tests.ps1 | 2 +- images/macos/scripts/tests/PHP.Tests.ps1 | 4 +- images/macos/scripts/tests/Rust.Tests.ps1 | 2 +- images/macos/scripts/tests/System.Tests.ps1 | 17 +- images/macos/scripts/tests/Xamarin.Tests.ps1 | 2 +- images/macos/templates/macOS-11.pkr.hcl | 307 --------------- images/macos/templates/macOS-12.pkr.hcl | 313 --------------- images/macos/toolsets/Readme.md | 6 +- images/macos/toolsets/toolset-11.json | 358 ------------------ 27 files changed, 74 insertions(+), 1176 deletions(-) delete mode 100644 images/macos/templates/macOS-11.pkr.hcl delete mode 100644 images/macos/templates/macOS-12.pkr.hcl delete mode 100644 images/macos/toolsets/toolset-11.json diff --git a/images.CI/macos/anka/Anka.Helpers.psm1 b/images.CI/macos/anka/Anka.Helpers.psm1 index 97dabeebcf5d..f566e8c2d6e2 100644 --- a/images.CI/macos/anka/Anka.Helpers.psm1 +++ b/images.CI/macos/anka/Anka.Helpers.psm1 @@ -139,10 +139,7 @@ function Set-AnkaVMVideoController { ) $command = "anka modify $VMName set display -c $Controller" - # Apple Metal is available starting from Big Sur - if (-not $ShortMacOSVersion.StartsWith("10.")) { - $null = Invoke-AnkaCommand -Command $command - } + $null = Invoke-AnkaCommand -Command $command } function Set-AnkaVMDisplayResolution { diff --git a/images/macos/scripts/build/configure-machine.sh b/images/macos/scripts/build/configure-machine.sh index 294935000dab..438587fe9a57 100644 --- a/images/macos/scripts/build/configure-machine.sh +++ b/images/macos/scripts/build/configure-machine.sh @@ -17,14 +17,7 @@ sudo rm -f /var/vm/sleepimage defaults write NSGlobalDomain NSAppSleepDisabled -bool YES # Disable Keyboard Setup Assistant window -if is_Veertu; then - sudo defaults write /Library/Preferences/com.apple.keyboardtype "keyboardtype" -dict-add "3-7582-0" -int 40 -fi - -# Change screen resolution to the maximum supported for 4Mb video memory -if [[ -d "/Library/Application Support/VMware Tools" ]]; then - sudo "/Library/Application Support/VMware Tools/vmware-resolutionSet" 1176 885 -fi +sudo defaults write /Library/Preferences/com.apple.keyboardtype "keyboardtype" -dict-add "3-7582-0" -int 40 # Update VoiceOver Utility to allow VoiceOver to be controlled with AppleScript # by creating a special Accessibility DB file (SIP must be disabled) and @@ -39,7 +32,6 @@ defaults write com.apple.VoiceOver4/default SCREnableAppleScript -bool YES # Rotate the certificate before expiration to ensure your apps are installed and signed with an active certificate. # Confirm that the correct intermediate certificate is installed by verifying the expiration date is set to 2030. # sudo security delete-certificate -Z FF6797793A3CD798DC5B2ABEF56F73EDC9F83A64 /Library/Keychains/System.keychain -# Big Sur requires user interaction to add a cert https://developer.apple.com/forums/thread/671582, we need to use a workaround with SecItemAdd swift method swiftc -suppress-warnings "${HOME}/image-generation/add-certificate.swift" @@ -58,7 +50,7 @@ done rm -f ./add-certificate # enable-automationmode-without-authentication -if ! is_BigSur; then + retry=10 while [[ $retry -gt 0 ]]; do { @@ -84,16 +76,15 @@ EOF sleep 10 done - echo "Getting terminal windows" - term_service=$(launchctl list | grep -i terminal | cut -f3) - echo "Close terminal windows: gui/501/${term_service}" - launchctl bootout gui/501/${term_service} && sleep 5 +echo "Getting terminal windows" +term_service=$(launchctl list | grep -i terminal | cut -f3) +echo "Close terminal windows: gui/501/${term_service}" +launchctl bootout gui/501/${term_service} && sleep 5 - # test enable-automationmode-without-authentication - if [[ ! "$(automationmodetool)" =~ "DOES NOT REQUIRE" ]]; then - echo "Failed to enable enable-automationmode-without-authentication option" - exit 1 - fi +# test enable-automationmode-without-authentication +if [[ ! "$(automationmodetool)" =~ "DOES NOT REQUIRE" ]]; then + echo "Failed to enable enable-automationmode-without-authentication option" + exit 1 fi # Create symlink for tests running diff --git a/images/macos/scripts/build/configure-preimagedata.sh b/images/macos/scripts/build/configure-preimagedata.sh index e92b08b1d1bd..d7492d2c4cb0 100644 --- a/images/macos/scripts/build/configure-preimagedata.sh +++ b/images/macos/scripts/build/configure-preimagedata.sh @@ -19,15 +19,9 @@ if [[ $arch == "arm64" ]]; then else image_label="macos-${label_version}" fi -release_label="macOS-${label_version}" -if is_Ventura || is_Sonoma || is_Monterey; then - software_url="https://github.com/actions/runner-images/blob/${image_label}/${image_version}/images/macos/${image_label}-Readme.md" - releaseUrl="https://github.com/actions/runner-images/releases/tag/${image_label}%2F${image_version}" -else - software_url="https://github.com/actions/runner-images/blob/${release_label}/${image_version}/images/macos/${image_label}-Readme.md" - releaseUrl="https://github.com/actions/runner-images/releases/tag/${release_label}%2F${image_version}" -fi +software_url="https://github.com/actions/runner-images/blob/${image_label}/${image_version}/images/macos/${image_label}-Readme.md" +releaseUrl="https://github.com/actions/runner-images/releases/tag/${image_label}%2F${image_version}" cat <<EOF > $imagedata_file [ diff --git a/images/macos/scripts/build/install-aws-tools.sh b/images/macos/scripts/build/install-aws-tools.sh index 168483862136..db4565b73969 100644 --- a/images/macos/scripts/build/install-aws-tools.sh +++ b/images/macos/scripts/build/install-aws-tools.sh @@ -10,11 +10,9 @@ echo "Installing aws..." awscliv2_pkg_path=$(download_with_retry "https://awscli.amazonaws.com/AWSCLIV2.pkg") sudo installer -pkg "$awscliv2_pkg_path" -target / -if ! is_BigSur; then - echo "Installing aws sam cli..." - brew tap aws/tap - brew_smart_install aws-sam-cli -fi +echo "Installing aws sam cli..." +brew tap aws/tap +brew_smart_install aws-sam-cli echo "Install aws cli session manager" brew install --cask session-manager-plugin diff --git a/images/macos/scripts/build/install-common-utils.sh b/images/macos/scripts/build/install-common-utils.sh index 53a0af5804e6..cd0eab214ee2 100644 --- a/images/macos/scripts/build/install-common-utils.sh +++ b/images/macos/scripts/build/install-common-utils.sh @@ -6,12 +6,6 @@ source ~/utils/utils.sh -# Download and install YQ in cases when it is not available in the formulae as for macOS 11: https://formulae.brew.sh/formula/yq -if is_BigSur; then - binary_path=$(download_with_retry "https://github.com/mikefarah/yq/releases/latest/download/yq_darwin_amd64") - sudo install "$binary_path" /usr/local/bin/yq -fi - # Monterey needs future review: # aliyun-cli, gnupg, helm have issues with building from the source code. # Added gmp for now, because toolcache ruby needs its libs. Remove it when php starts to build from source code. @@ -48,27 +42,22 @@ fi # Execute AppleScript to change security preferences # System Preferences -> Security & Privacy -> General -> Unlock -> Allow -> Not now if is_Monterey; then - if is_Veertu; then - for retry in {4..0}; do - echo "Executing AppleScript to change security preferences. Retries left: $retry" - { - set -e - osascript -e 'tell application "System Events" to get application processes where visible is true' - osascript $HOME/utils/confirm-identified-developers.scpt $USER_PASSWORD - } && break + for retry in {4..0}; do + echo "Executing AppleScript to change security preferences. Retries left: $retry" + { + set -e + osascript -e 'tell application "System Events" to get application processes where visible is true' + osascript $HOME/utils/confirm-identified-developers.scpt $USER_PASSWORD + } && break - if [[ $retry -eq 0 ]]; then - echo "Executing AppleScript failed. No retries left" - exit 1 - fi + if [[ $retry -eq 0 ]]; then + echo "Executing AppleScript failed. No retries left" + exit 1 + fi - echo "Executing AppleScript failed. Sleeping for 10 seconds and retrying" - sleep 10 - done - else - echo "Executing AppleScript to change security preferences" - osascript $HOME/utils/confirm-identified-developers.scpt $USER_PASSWORD - fi + echo "Executing AppleScript failed. Sleeping for 10 seconds and retrying" + sleep 10 + done fi # Validate "Parallels International GmbH" kext @@ -95,10 +84,8 @@ if is_Monterey; then echo "export PARALLELS_DMG_URL=$url" >> ${HOME}/.bashrc fi -if ! is_BigSur; then - # Install Azure DevOps extension for Azure Command Line Interface - az extension add -n azure-devops -fi +# Install Azure DevOps extension for Azure Command Line Interface +az extension add -n azure-devops # Invoke tests for all basic tools invoke_tests "BasicTools" diff --git a/images/macos/scripts/build/install-git.sh b/images/macos/scripts/build/install-git.sh index 5a77ba3a49e3..adc3ecccfc40 100644 --- a/images/macos/scripts/build/install-git.sh +++ b/images/macos/scripts/build/install-git.sh @@ -11,16 +11,13 @@ brew_smart_install "git" git config --global --add safe.directory "*" +echo "Installing Git LFS" +brew_smart_install "git-lfs" -if ! is_BigSur; then - echo "Installing Git LFS" - brew_smart_install "git-lfs" - - # Update global git config - git lfs install - # Update system git config - sudo git lfs install --system -fi +# Update global git config +git lfs install +# Update system git config +sudo git lfs install --system echo "Disable all the Git help messages..." git config --global advice.pushUpdateRejected false diff --git a/images/macos/scripts/build/install-node.sh b/images/macos/scripts/build/install-node.sh index a4c4aaeba745..9e8a084b0bea 100644 --- a/images/macos/scripts/build/install-node.sh +++ b/images/macos/scripts/build/install-node.sh @@ -16,7 +16,7 @@ echo Installing yarn... yarn_installer_path=$(download_with_retry "https://yarnpkg.com/install.sh") bash $yarn_installer_path -if is_BigSur || is_Monterey; then +if is_Monterey; then npm_global_packages=$(get_toolset_value '.npm.global_packages[].name') for module in ${npm_global_packages[@]}; do echo "Install $module" diff --git a/images/macos/scripts/build/install-python.sh b/images/macos/scripts/build/install-python.sh index 061c8ccd7a50..426cc4351470 100644 --- a/images/macos/scripts/build/install-python.sh +++ b/images/macos/scripts/build/install-python.sh @@ -8,7 +8,7 @@ source ~/utils/utils.sh echo "Installing Python Tooling" -if is_Monterey || is_BigSur; then +if is_Monterey; then echo "Install latest Python 2" python2_pkg=$(download_with_retry "https://www.python.org/ftp/python/2.7.18/python-2.7.18-macosx10.9.pkg") python2_pkg_sha256="c570f38b05dd8b112ad21b418cdf51a9816d62f9f44746452739d421be24d50c" @@ -33,9 +33,7 @@ EOF fi # Close Finder window -if is_Veertu; then - close_finder_window -fi +close_finder_window echo "Brew Installing Python 3" brew_smart_install "python@3.12" diff --git a/images/macos/scripts/build/install-rust.sh b/images/macos/scripts/build/install-rust.sh index 37f94353500f..eb9f9f18d08e 100644 --- a/images/macos/scripts/build/install-rust.sh +++ b/images/macos/scripts/build/install-rust.sh @@ -18,7 +18,7 @@ CARGO_HOME=$HOME/.cargo echo "Install common tools..." rustup component add rustfmt clippy -if is_BigSur || is_Monterey; then +if is_Monterey; then cargo install bindgen-cli cbindgen cargo-audit cargo-outdated fi diff --git a/images/macos/scripts/build/install-swiftlint.sh b/images/macos/scripts/build/install-swiftlint.sh index 90a985248bc8..1e781ca26e6d 100644 --- a/images/macos/scripts/build/install-swiftlint.sh +++ b/images/macos/scripts/build/install-swiftlint.sh @@ -7,14 +7,7 @@ source ~/utils/utils.sh echo "Installing Swiftlint..." -if is_BigSur; then - # SwiftLint now requires Swift 5.6 or higher to build, and macOS 12 or higher to run https://github.com/realm/SwiftLint/releases/tag/0.49.0 - COMMIT=d1d5743344227fe6e3c37cfba19f0cfe15a9448a - FORMULA_URL="https://raw.githubusercontent.com/Homebrew/homebrew-core/$COMMIT/Formula/swiftlint.rb" - - curl -fsSL $FORMULA_URL > $(find $(brew --repository) -name swiftlint.rb) - HOMEBREW_NO_AUTO_UPDATE=1 HOMEBREW_NO_INSTALL_FROM_API=1 brew install swiftlint -elif is_Monterey; then +if is_Monterey; then # SwiftLint now requires Xcode 15.3 or higher to build https://github.com/realm/SwiftLint/releases/tag/0.55.1 COMMIT=d91dabd087cb0b906c92a825df9e5e5e1a4f59f8 FORMULA_URL="https://raw.githubusercontent.com/Homebrew/homebrew-core/$COMMIT/Formula/s/swiftlint.rb" diff --git a/images/macos/scripts/docs-gen/Generate-SoftwareReport.ps1 b/images/macos/scripts/docs-gen/Generate-SoftwareReport.ps1 index ce141bbe557a..0effe1e54379 100644 --- a/images/macos/scripts/docs-gen/Generate-SoftwareReport.ps1 +++ b/images/macos/scripts/docs-gen/Generate-SoftwareReport.ps1 @@ -53,7 +53,7 @@ if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) { $languageAndRuntime.AddToolVersionsListInline("NVM - Cached node versions", $(Get-NVMNodeVersionList), '^\d+') } $languageAndRuntime.AddToolVersion("Perl", $(Get-PerlVersion)) -if ((-not $os.IsBigSur) -and (-not $os.IsVenturaArm64) -and (-not $os.IsSonomaArm64)) { +if ((-not $os.IsVenturaArm64) -and (-not $os.IsSonomaArm64)) { $languageAndRuntime.AddToolVersion("PHP", $(Get-PHPVersion)) } @@ -63,7 +63,7 @@ if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) { $languageAndRuntime.AddToolVersion("Python3", $(Get-Python3Version)) -if ((-not $os.IsVentura) -and (-not $os.IsSonoma) -and (-not $os.IsBigSur)) { +if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) { $languageAndRuntime.AddToolVersion("R", $(Get-RVersion)) } @@ -74,7 +74,7 @@ $packageManagement = $installedSoftware.AddHeader("Package Management") $packageManagement.AddToolVersion("Bundler", $(Get-BundlerVersion)) $packageManagement.AddToolVersion("Carthage", $(Get-CarthageVersion)) $packageManagement.AddToolVersion("CocoaPods", $(Get-CocoaPodsVersion)) -if ((-not $os.IsBigSur) -and (-not $os.IsVenturaArm64) -and (-not $os.IsSonomaArm64)) { +if ((-not $os.IsVenturaArm64) -and (-not $os.IsSonomaArm64)) { $packageManagement.AddToolVersion("Composer", $(Get-ComposerVersion)) } $packageManagement.AddToolVersion("Homebrew", $(Get-HomebrewVersion)) @@ -118,17 +118,12 @@ $utilities.AddToolVersion("bazelisk", $(Get-BazeliskVersion)) $utilities.AddToolVersion("bsdtar", $(Get-BsdtarVersion)) $utilities.AddToolVersion("Curl", $(Get-CurlVersion)) $utilities.AddToolVersion("Git", $(Get-GitVersion)) -if (-not $os.IsBigSur) { - $utilities.AddToolVersion("Git LFS", $(Get-GitLFSVersion)) -} +$utilities.AddToolVersion("Git LFS", $(Get-GitLFSVersion)) $utilities.AddToolVersion("GitHub CLI", $(Get-GitHubCLIVersion)) $utilities.AddToolVersion("GNU Tar", $(Get-GnuTarVersion)) $utilities.AddToolVersion("GNU Wget", $(Get-WgetVersion)) $utilities.AddToolVersion("gpg (GnuPG)", $(Get-GPGVersion)) -if ($os.IsBigSur) { - $utilities.AddToolVersion("helm", $(Get-HelmVersion)) -} -if ((-not $os.IsBigSur) -and (-not $os.IsVentura) -and (-not $os.IsSonoma)) { +if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) { $utilities.AddToolVersion("ImageMagick", $(Get-ImageMagickVersion)) } $utilities.AddToolVersion("jq", $(Get-JqVersion)) @@ -136,9 +131,6 @@ if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) { $utilities.AddToolVersion("mongo", $(Get-MongoVersion)) $utilities.AddToolVersion("mongod", $(Get-MongodVersion)) } -if ($os.IsBigSur) { - $utilities.AddToolVersion("Newman", $(Get-NewmanVersion)) -} $utilities.AddToolVersion("OpenSSL", $(Get-OpenSSLVersion)) $utilities.AddToolVersion("Packer", $(Get-PackerVersion)) $utilities.AddToolVersion("pkg-config", $(Get-PKGConfigVersion)) @@ -158,21 +150,14 @@ $utilities.AddToolVersion("zstd", $(Get-ZstdVersion)) # Tools $tools = $installedSoftware.AddHeader("Tools") -if ($os.IsBigSur) { - $tools.AddToolVersion("Aliyun CLI", $(Get-AliyunCLIVersion)) -} if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) { $tools.AddToolVersion("App Center CLI", $(Get-AppCenterCLIVersion)) } $tools.AddToolVersion("AWS CLI", $(Get-AWSCLIVersion)) -if (-not $os.IsBigSur) { - $tools.AddToolVersion("AWS SAM CLI", $(Get-AWSSAMCLIVersion)) -} +$tools.AddToolVersion("AWS SAM CLI", $(Get-AWSSAMCLIVersion)) $tools.AddToolVersion("AWS Session Manager CLI", $(Get-AWSSessionManagerCLIVersion)) -if (-not $os.IsBigSur) { - $tools.AddToolVersion("Azure CLI", $(Get-AzureCLIVersion)) - $tools.AddToolVersion("Azure CLI (azure-devops)", $(Get-AzureDevopsVersion)) -} +$tools.AddToolVersion("Azure CLI", $(Get-AzureCLIVersion)) +$tools.AddToolVersion("Azure CLI (azure-devops)", $(Get-AzureDevopsVersion)) $tools.AddToolVersion("Bicep CLI", $(Get-BicepVersion)) if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) { $tools.AddToolVersion("Cabal", $(Get-CabalVersion)) @@ -193,13 +178,9 @@ $tools.AddToolVersion("SwiftFormat", $(Get-SwiftFormatVersion)) if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) { $tools.AddToolVersion("Swig", $(Get-SwigVersion)) } -if (-not $os.IsBigSur) { - $tools.AddToolVersion("Xcbeautify", $(Get-XcbeautifyVersion)) -} +$tools.AddToolVersion("Xcbeautify", $(Get-XcbeautifyVersion)) $tools.AddToolVersion("Xcode Command Line Tools", $(Get-XcodeCommandLineToolsVersion)) -if (-not $os.IsBigSur) { - $tools.AddToolVersion("Xcodes", $(Get-XcodesVersion)) -} +$tools.AddToolVersion("Xcodes", $(Get-XcodesVersion)) # Linters $linters = $installedSoftware.AddHeader("Linters") @@ -225,7 +206,6 @@ $toolcache = $installedSoftware.AddHeader("Cached Tools") $toolcache.AddNodes($(Build-ToolcacheSection)) # Rust -if (-not $os.IsBigSur) { $rust = $installedSoftware.AddHeader("Rust Tools") $rust.AddToolVersion("Cargo", $(Get-RustCargoVersion)) $rust.AddToolVersion("Rust", $(Get-RustVersion)) @@ -241,7 +221,6 @@ if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) { } $rustPackages.AddToolVersion("Clippy", $(Get-RustClippyVersion)) $rustPackages.AddToolVersion("Rustfmt", $(Get-RustfmtVersion)) -} # PowerShell $powerShell = $installedSoftware.AddHeader("PowerShell Tools") @@ -303,7 +282,7 @@ $android.AddTable($androidTable) $androidEnv = $android.AddHeader("Environment variables") $androidEnv.AddTable($(Build-AndroidEnvironmentTable)) -if ($os.IsBigSur -or $os.IsMonterey) { +if ($os.IsMonterey) { $miscellaneous = $installedSoftware.AddHeader("Miscellaneous") $miscellaneous.AddToolVersion("libXext", $(Get-LibXextVersion)) $miscellaneous.AddToolVersion("libXft", $(Get-LibXftVersion)) diff --git a/images/macos/scripts/docs-gen/SoftwareReport.Common.psm1 b/images/macos/scripts/docs-gen/SoftwareReport.Common.psm1 index d2996945a9e4..e58fd1a52760 100644 --- a/images/macos/scripts/docs-gen/SoftwareReport.Common.psm1 +++ b/images/macos/scripts/docs-gen/SoftwareReport.Common.psm1 @@ -367,11 +367,6 @@ function Get-BazeliskVersion { return ($bazeliskVersion -replace "^bazelisk").Trim() } -function Get-HelmVersion { - $helmVersion = Run-Command "helm version --short" - return $helmVersion -} - function Get-MongoVersion { $mongo = Run-Command "mongo --version" | Select-String "MongoDB shell version" | Take-Part -Part 3 return $mongo.TrimStart("v").Trim() @@ -397,11 +392,6 @@ function Get-BsdtarVersion { return "$bsdtar - available by 'tar' alias" } -function Get-NewmanVersion { - $newmanVersion = Run-Command "newman --version" - return $newmanVersion -} - function Get-VirtualBoxVersion { $virtualBox = Run-Command "vboxmanage -v" return $virtualBox @@ -457,11 +447,6 @@ function Get-AWSSessionManagerCLIVersion { return $awsSessionManagerVersion } -function Get-AliyunCLIVersion { - $aliyunVersion = Run-Command "aliyun --version" | Select-String "Alibaba Cloud Command Line Interface Version " | Take-Part -Part 6 - return $aliyunVersion -} - function Get-GHCupVersion { $ghcUpVersion = (Run-Command "ghcup --version" | Take-Part -Part 5).Replace('v','') return $ghcUpVersion diff --git a/images/macos/scripts/docs-gen/SoftwareReport.Xcode.psm1 b/images/macos/scripts/docs-gen/SoftwareReport.Xcode.psm1 index 33edda8c1551..cd03d81c41fd 100644 --- a/images/macos/scripts/docs-gen/SoftwareReport.Xcode.psm1 +++ b/images/macos/scripts/docs-gen/SoftwareReport.Xcode.psm1 @@ -236,7 +236,7 @@ function Build-XcodeSupportToolsSection { $xcversion = Run-Command "xcversion --version" | Select-String "^[0-9]" $toolNodes += [ToolVersionNode]::new("xcpretty", $xcpretty) - if ($os.IsBigSur -or $os.IsMonterey) { + if ($os.IsMonterey) { $toolNodes += [ToolVersionNode]::new("xcversion", $xcversion) } @@ -245,10 +245,5 @@ function Build-XcodeSupportToolsSection { $nomadShenzhenOutput = Run-Command "ipa -version" $nomadShenzhen = [regex]::matches($nomadShenzhenOutput, "(\d+.){2}\d+").Value - if ($os.IsBigSur) { - $toolNodes += [ToolVersionNode]::new("Nomad CLI", $nomadCLI) - $toolNodes += [ToolVersionNode]::new("Nomad shenzhen CLI", $nomadShenzhen) - } - return $toolNodes } diff --git a/images/macos/scripts/helpers/Common.Helpers.psm1 b/images/macos/scripts/helpers/Common.Helpers.psm1 index 83259984bda6..c476edc1c050 100644 --- a/images/macos/scripts/helpers/Common.Helpers.psm1 +++ b/images/macos/scripts/helpers/Common.Helpers.psm1 @@ -29,7 +29,6 @@ function Get-OSVersion { Version = $osVersion.Version Platform = $osVersion.Platform IsArm64 = $processorArchitecture -eq "arm64" - IsBigSur = $osVersion.Version.Major -eq "11" IsMonterey = $osVersion.Version.Major -eq "12" IsVentura = $($osVersion.Version.Major -eq "13") IsVenturaArm64 = $($osVersion.Version.Major -eq "13" -and $processorArchitecture -eq "arm64") @@ -104,10 +103,6 @@ function Invoke-DownloadWithRetry { return $Path } -function isVeertu { - return (Test-Path -Path "/Library/Application Support/Veertu") -} - function Get-Architecture { $arch = arch if ($arch -ne "arm64") { diff --git a/images/macos/scripts/helpers/utils.sh b/images/macos/scripts/helpers/utils.sh index 62315cfca8e6..b8e51ee20689 100644 --- a/images/macos/scripts/helpers/utils.sh +++ b/images/macos/scripts/helpers/utils.sh @@ -73,14 +73,6 @@ is_Monterey() { [ "$OSTYPE" = "darwin21" ] } -is_BigSur() { - [ "$OSTYPE" = "darwin20" ] -} - -is_Veertu() { - [[ -d "/Library/Application Support/Veertu" ]] -} - get_toolset_value() { local toolset_path=$(echo "$IMAGE_FOLDER/toolset.json") local query=$1 diff --git a/images/macos/scripts/tests/Android.Tests.ps1 b/images/macos/scripts/tests/Android.Tests.ps1 index 6f73c9a3ff83..654a05e37ad8 100644 --- a/images/macos/scripts/tests/Android.Tests.ps1 +++ b/images/macos/scripts/tests/Android.Tests.ps1 @@ -57,7 +57,7 @@ Describe "Android" { Sdkmanager = "$env:ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager" } ) - if ($os.IsBigSur -or $os.IsMonterey) { + if ($os.IsMonterey) { $testCases += @( @{ PackageName = "SDK tools" diff --git a/images/macos/scripts/tests/BasicTools.Tests.ps1 b/images/macos/scripts/tests/BasicTools.Tests.ps1 index 7daa7f6b66eb..5fc84bf7b753 100644 --- a/images/macos/scripts/tests/BasicTools.Tests.ps1 +++ b/images/macos/scripts/tests/BasicTools.Tests.ps1 @@ -2,13 +2,13 @@ Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" $os = Get-OSVersion -Describe "Azure CLI" -Skip:($os.IsBigSur) { +Describe "Azure CLI" { It "Azure CLI" { "az -v" | Should -ReturnZeroExitCode } } -Describe "Azure DevOps CLI" -Skip:($os.IsBigSur) { +Describe "Azure DevOps CLI" { It "az devops" { "az devops -h" | Should -ReturnZeroExitCode } @@ -62,12 +62,6 @@ Describe "Perl" { } } -Describe "Helm" -Skip:($os.IsMonterey -or $os.IsVentura -or $os.IsSonoma) { - It "Helm" { - "helm version --short" | Should -ReturnZeroExitCode - } -} - Describe "Tcl/Tk" { It "libtcl" { "file /usr/local/lib/libtcl8.6.dylib" | Should -ReturnZeroExitCode @@ -117,12 +111,6 @@ Describe "bazel" { } } -Describe "Aliyun CLI" -Skip:($os.IsMonterey -or $os.IsVentura -or $os.IsSonoma) { - It "Aliyun CLI" { - "aliyun --version" | Should -ReturnZeroExitCode - } -} - Describe "Julia" -Skip:($os.IsVentura -or $os.IsSonoma) { It "Julia" { "julia --version" | Should -ReturnZeroExitCode @@ -147,19 +135,19 @@ Describe "wget" { } } -Describe "vagrant" -Skip:($os.IsBigSur -or $os.IsVentura -or $os.IsSonoma) { +Describe "vagrant" -Skip:($os.IsVentura -or $os.IsSonoma) { It "vagrant" { "vagrant --version" | Should -ReturnZeroExitCode } } -Describe "virtualbox" -Skip:($os.IsBigSur -or $os.IsVentura -or $os.IsSonoma) { +Describe "virtualbox" -Skip:($os.IsVentura -or $os.IsSonoma) { It "virtualbox" { "vboxmanage -v" | Should -ReturnZeroExitCode } } -Describe "R" -Skip:($os.IsVentura -or $os.IsSonoma -or $os.IsBigSur) { +Describe "R" -Skip:($os.IsVentura -or $os.IsSonoma) { It "R" { "R --version" | Should -ReturnZeroExitCode } @@ -191,7 +179,7 @@ Describe "yq" { } } -Describe "imagemagick" -Skip:($os.IsBigSur -or $os.IsVentura -or $os.IsSonoma) { +Describe "imagemagick" -Skip:($os.IsVentura -or $os.IsSonoma) { It "imagemagick" { "magick -version" | Should -ReturnZeroExitCode } diff --git a/images/macos/scripts/tests/Common.Tests.ps1 b/images/macos/scripts/tests/Common.Tests.ps1 index 6ce3c53499bf..6ecf158a6677 100644 --- a/images/macos/scripts/tests/Common.Tests.ps1 +++ b/images/macos/scripts/tests/Common.Tests.ps1 @@ -43,7 +43,7 @@ Describe "AWS" { It "AWS CLI" { "aws --version" | Should -ReturnZeroExitCode } - It "AWS SAM CLI" -Skip:($os.IsBigSur) { + It "AWS SAM CLI" { "sam --version" | Should -ReturnZeroExitCode } @@ -123,7 +123,7 @@ Describe "Go" -Skip:($os.IsVentura -or $os.IsSonoma) { } } -Describe "VirtualBox" -Skip:($os.IsBigSur -or $os.IsVentura -or $os.IsSonoma) { +Describe "VirtualBox" -Skip:($os.IsVentura -or $os.IsSonoma) { It "Check kext kernel modules" { kextstat | Out-String | Should -Match "org.virtualbox.kext" } diff --git a/images/macos/scripts/tests/Git.Tests.ps1 b/images/macos/scripts/tests/Git.Tests.ps1 index f216baa0bcd1..c66719a7e708 100644 --- a/images/macos/scripts/tests/Git.Tests.ps1 +++ b/images/macos/scripts/tests/Git.Tests.ps1 @@ -6,7 +6,7 @@ Describe "Git" { It "git is installed" { "git --version" | Should -ReturnZeroExitCode } - It "git lfs is installed" -Skip:($os.IsBigSur) { + It "git lfs is installed" { "git lfs version" | Should -ReturnZeroExitCode } } diff --git a/images/macos/scripts/tests/PHP.Tests.ps1 b/images/macos/scripts/tests/PHP.Tests.ps1 index 9316a06dfb6e..c87b36bb420d 100644 --- a/images/macos/scripts/tests/PHP.Tests.ps1 +++ b/images/macos/scripts/tests/PHP.Tests.ps1 @@ -3,7 +3,7 @@ Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" $os = Get-OSVersion Describe "PHP" { - Context "PHP" -Skip:($os.IsBigSur -or $os.IsVenturaArm64 -or $os.IsSonomaArm64) { + Context "PHP" -Skip:($os.IsVenturaArm64 -or $os.IsSonomaArm64) { It "PHP Path" { Get-ToolPath "php" | Should -Not -BeLike "/usr/bin/php*" } @@ -14,7 +14,7 @@ Describe "PHP" { } } - Context "Composer" -Skip:($os.IsBigSur -or $os.IsVenturaArm64 -or $os.IsSonomaArm64) { + Context "Composer" -Skip:($os.IsVenturaArm64 -or $os.IsSonomaArm64) { It "Composer" { "composer --version" | Should -ReturnZeroExitCode } diff --git a/images/macos/scripts/tests/Rust.Tests.ps1 b/images/macos/scripts/tests/Rust.Tests.ps1 index fda5475fb44a..b5c1c53fc507 100644 --- a/images/macos/scripts/tests/Rust.Tests.ps1 +++ b/images/macos/scripts/tests/Rust.Tests.ps1 @@ -2,7 +2,7 @@ Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" $os = Get-OSVersion -Describe "Rust" -Skip:($os.IsBigSur) { +Describe "Rust" { Context "Rust" { It "Rustup is installed" { "rustup --version" | Should -ReturnZeroExitCode diff --git a/images/macos/scripts/tests/System.Tests.ps1 b/images/macos/scripts/tests/System.Tests.ps1 index 27fe198bba18..ae6fbd1d4249 100644 --- a/images/macos/scripts/tests/System.Tests.ps1 +++ b/images/macos/scripts/tests/System.Tests.ps1 @@ -35,23 +35,8 @@ Describe "Audio device" -Skip:($os.IsVentura -or $os.IsSonoma) { } } -Describe "Screen Resolution" -Skip:(isVeertu) { - It "Screen Resolution" { - system_profiler SPDisplaysDataType | Select-String "Resolution" | Should -Match "1176 x 885|1920 x 1080" - } -} - -Describe "Open windows" -Skip:(isVeertu) { - It "Opened windows not found" { - 'tell application id "com.apple.systemevents" to get every window of (every process whose class of windows contains window)' | Tee-Object /tmp/windows.osascript - $cmd = "osascript /tmp/windows.osascript" - $openWindows = bash -c $cmd - $openWindows.Split(",").Trim() | Where-Object { $_ -notmatch "NotificationCenter" } | Should -BeNullOrEmpty - } -} - Describe "AutomationModeTool" { - It "Does not require user authentication" -Skip:($os.IsBigSur) { + It "Does not require user authentication" { automationmodetool | Out-String | Should -Match "DOES NOT REQUIRE" } } diff --git a/images/macos/scripts/tests/Xamarin.Tests.ps1 b/images/macos/scripts/tests/Xamarin.Tests.ps1 index 7796b4c59ac6..93de1cd34043 100644 --- a/images/macos/scripts/tests/Xamarin.Tests.ps1 +++ b/images/macos/scripts/tests/Xamarin.Tests.ps1 @@ -8,7 +8,7 @@ if ($os.IsVentura -or $os.IsSonoma) { $XAMARIN_IOS_VERSIONS = @() $XAMARIN_MAC_VERSIONS = @() $XAMARIN_ANDROID_VERSIONS = @() -} elseif ($os.IsBigSur -or $os.IsMonterey) { +} elseif ($os.IsMonterey) { $MONO_VERSIONS = (Get-ToolsetContent).xamarin.mono_versions $XAMARIN_IOS_VERSIONS = (Get-ToolsetContent).xamarin.ios_versions $XAMARIN_MAC_VERSIONS = (Get-ToolsetContent).xamarin.mac_versions diff --git a/images/macos/templates/macOS-11.pkr.hcl b/images/macos/templates/macOS-11.pkr.hcl deleted file mode 100644 index c9dc4256a7ae..000000000000 --- a/images/macos/templates/macOS-11.pkr.hcl +++ /dev/null @@ -1,307 +0,0 @@ -packer { - required_plugins { - vsphere = { - source = "github.com/hashicorp/vsphere" - version = "~> 1" - } - } -} - -locals { - image_folder = "/Users/${var.vm_username}/image-generation" -} - -variable "baseimage_name" { - type = string -} - -variable "build_id" { - type = string -} - -variable "cluster_or_esxi_host" { - type = string -} - -variable "esxi_datastore" { - type = string -} - -variable "github_api_pat" { - type = string - default = "" - sensitive = true -} - -variable "image_os" { - type = string - default = "macos11" -} - -variable "output_folder" { - type = string -} - -variable "vcenter_datacenter" { - type = string -} - -variable "vcenter_password" { - type = string - sensitive = true -} - -variable "vcenter_server" { - type = string -} - -variable "vcenter_username" { - type = string - sensitive = true -} - -variable "vm_password" { - type = string - sensitive = true -} - -variable "vm_username" { - type = string - sensitive = true -} - -variable "xcode_install_sas" { - type = string - sensitive = true -} - -variable "xcode_install_storage_url" { - type = string - sensitive = true -} - -source "vsphere-clone" "template" { - CPUs = "5" - NestedHV = "true" - RAM = "24576" - cpu_cores = "5" - datacenter = "${var.vcenter_datacenter}" - datastore = "${var.esxi_datastore}" - folder = "${var.output_folder}" - host = "${var.cluster_or_esxi_host}" - insecure_connection = true - password = "${var.vcenter_password}" - shutdown_timeout = "15m" - ssh_password = "${var.vm_password}" - ssh_username = "${var.vm_username}" - template = "${var.baseimage_name}" - username = "${var.vcenter_username}" - vcenter_server = "${var.vcenter_server}" - vm_name = "${var.build_id}" -} - -build { - sources = ["source.vsphere-clone.template"] - - provisioner "shell" { - inline = ["mkdir ${local.image_folder}"] - } - - provisioner "file" { - destination = "${local.image_folder}/" - sources = [ - "${path.root}/../assets/xamarin-selector", - "${path.root}/../scripts/tests", - "${path.root}/../scripts/docs-gen", - "${path.root}/../scripts/helpers" - ] - } - - provisioner "file" { - destination = "${local.image_folder}/docs-gen/" - source = "${path.root}/../../../helpers/software-report-base" - } - - provisioner "file" { - destination = "${local.image_folder}/add-certificate.swift" - source = "${path.root}/../assets/add-certificate.swift" - } - - provisioner "file" { - destination = "~/.bashrc" - source = "${path.root}/../assets/bashrc" - } - - provisioner "file" { - destination = "~/.bash_profile" - source = "${path.root}/../assets/bashprofile" - } - - provisioner "shell" { - inline = [ "mkdir ~/bootstrap" ] - } - - provisioner "file" { - destination = "~/bootstrap" - source = "${path.root}/../assets/bootstrap-provisioner/" - } - - provisioner "file" { - destination = "${local.image_folder}/toolset.json" - source = "${path.root}/../toolsets/toolset-11.json" - } - - provisioner "shell" { - execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" - inline = [ - "mv ${local.image_folder}/docs-gen ${local.image_folder}/software-report", - "mv ${local.image_folder}/xamarin-selector ${local.image_folder}/assets", - "mkdir ~/utils", - "mv ${local.image_folder}/helpers/confirm-identified-developers.scpt ~/utils", - "mv ${local.image_folder}/helpers/invoke-tests.sh ~/utils", - "mv ${local.image_folder}/helpers/utils.sh ~/utils", - "mv ${local.image_folder}/helpers/xamarin-utils.sh ~/utils" - ] - } - - provisioner "shell" { - execute_command = "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}" - scripts = [ - "${path.root}/../scripts/build/install-xcode-clt.sh", - "${path.root}/../scripts/build/install-homebrew.sh" - ] - } - - provisioner "shell" { - environment_vars = ["PASSWORD=${var.vm_password}", "USERNAME=${var.vm_username}"] - execute_command = "chmod +x {{ .Path }}; sudo {{ .Vars }} {{ .Path }}" - scripts = [ - "${path.root}/../scripts/build/install-xcode-clt.sh", - "${path.root}/../scripts/build/configure-network-interface-detection.sh", - "${path.root}/../scripts/build/configure-autologin.sh", - "${path.root}/../scripts/build/configure-auto-updates.sh", - "${path.root}/../scripts/build/configure-screensaver.sh", - "${path.root}/../scripts/build/configure-ntpconf.sh", - "${path.root}/../scripts/build/configure-max-files-limitation.sh", - "${path.root}/../scripts/build/configure-shell.sh" - ] - } - - provisioner "shell" { - environment_vars = ["IMAGE_VERSION=${var.build_id}", "IMAGE_OS=${var.image_os}"] - execute_command = "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}" - scripts = [ - "${path.root}/../scripts/build/configure-preimagedata.sh", - "${path.root}/../scripts/build/configure-ssh.sh", - "${path.root}/../scripts/build/configure-machine.sh" - ] - } - - provisioner "shell" { - execute_command = "sudo {{ .Vars }} {{ .Path }}" - expect_disconnect = true - inline = ["echo 'Reboot VM'", "shutdown -r now"] - } - - provisioner "shell" { - environment_vars = ["API_PAT=${var.github_api_pat}", "IMAGE_FOLDER=${local.image_folder}"] - execute_command = "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}" - pause_before = "30s" - scripts = [ - "${path.root}/../scripts/build/configure-windows.sh", - "${path.root}/../scripts/build/install-powershell.sh", - "${path.root}/../scripts/build/install-dotnet.sh", - "${path.root}/../scripts/build/install-python.sh", - "${path.root}/../scripts/build/install-azcopy.sh", - "${path.root}/../scripts/build/install-openssl.sh", - "${path.root}/../scripts/build/install-ruby.sh", - "${path.root}/../scripts/build/install-rubygems.sh", - "${path.root}/../scripts/build/install-git.sh", - "${path.root}/../scripts/build/install-mongodb.sh", - "${path.root}/../scripts/build/install-node.sh" - ] - } - - provisioner "shell" { - environment_vars = ["XCODE_INSTALL_STORAGE_URL=${var.xcode_install_storage_url}", "XCODE_INSTALL_SAS=${var.xcode_install_sas}", "IMAGE_FOLDER=${local.image_folder}"] - execute_command = "chmod +x {{ .Path }}; {{ .Vars }} pwsh -f {{ .Path }}" - script = "${path.root}/../scripts/build/Install-Xcode.ps1" - } - - provisioner "shell" { - execute_command = "sudo {{ .Vars }} {{ .Path }}" - expect_disconnect = true - inline = ["echo 'Reboot VM'", "shutdown -r now"] - } - - provisioner "shell" { - environment_vars = ["API_PAT=${var.github_api_pat}", "IMAGE_FOLDER=${local.image_folder}"] - execute_command = "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}" - scripts = [ - "${path.root}/../scripts/build/install-actions-cache.sh", - "${path.root}/../scripts/build/install-common-utils.sh", - "${path.root}/../scripts/build/install-llvm.sh", - "${path.root}/../scripts/build/install-golang.sh", - "${path.root}/../scripts/build/install-swiftlint.sh", - "${path.root}/../scripts/build/install-openjdk.sh", - "${path.root}/../scripts/build/install-aws-tools.sh", - "${path.root}/../scripts/build/install-gcc.sh", - "${path.root}/../scripts/build/install-haskell.sh", - "${path.root}/../scripts/build/install-cocoapods.sh", - "${path.root}/../scripts/build/install-android-sdk.sh", - "${path.root}/../scripts/build/install-xamarin.sh", - "${path.root}/../scripts/build/install-visualstudio.sh", - "${path.root}/../scripts/build/install-nvm.sh", - "${path.root}/../scripts/build/install-apache.sh", - "${path.root}/../scripts/build/install-nginx.sh", - "${path.root}/../scripts/build/install-postgresql.sh", - "${path.root}/../scripts/build/install-audiodevice.sh", - "${path.root}/../scripts/build/install-vcpkg.sh", - "${path.root}/../scripts/build/install-miniconda.sh", - "${path.root}/../scripts/build/install-safari.sh", - "${path.root}/../scripts/build/install-chrome.sh", - "${path.root}/../scripts/build/install-edge.sh", - "${path.root}/../scripts/build/install-firefox.sh", - "${path.root}/../scripts/build/install-pypy.sh", - "${path.root}/../scripts/build/install-pipx-packages.sh", - "${path.root}/../scripts/build/install-bicep.sh", - "${path.root}/../scripts/build/install-codeql-bundle.sh" - ] - } - - provisioner "shell" { - environment_vars = ["IMAGE_FOLDER=${local.image_folder}"] - execute_command = "chmod +x {{ .Path }}; {{ .Vars }} pwsh -f {{ .Path }}" - scripts = [ - "${path.root}/../scripts/build/Install-Toolset.ps1", - "${path.root}/../scripts/build/Configure-Toolset.ps1" - ] - } - - provisioner "shell" { - execute_command = "ruby {{ .Path }}" - script = "${path.root}/../scripts/build/configure-xcode-simulators.rb" - } - - provisioner "shell" { - environment_vars = ["IMAGE_FOLDER=${local.image_folder}"] - inline = [ - "pwsh -File \"${local.image_folder}/software-report/Generate-SoftwareReport.ps1\" -OutputDirectory \"${local.image_folder}/output/software-report\" -ImageName ${var.build_id}", - "pwsh -File \"${local.image_folder}/tests/RunAll-Tests.ps1\"" - ] - } - - provisioner "file" { - destination = "${path.root}/../../image-output/" - direction = "download" - source = "${local.image_folder}/output/*" - } - - provisioner "shell" { - execute_command = "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}" - scripts = [ - "${path.root}/../scripts/build/configure-hostname.sh", - "${path.root}/../scripts/build/configure-system.sh" - ] - } -} diff --git a/images/macos/templates/macOS-12.pkr.hcl b/images/macos/templates/macOS-12.pkr.hcl deleted file mode 100644 index 1c6d2f9caeb9..000000000000 --- a/images/macos/templates/macOS-12.pkr.hcl +++ /dev/null @@ -1,313 +0,0 @@ -packer { - required_plugins { - vsphere = { - source = "github.com/hashicorp/vsphere" - version = "~> 1" - } - } -} - -locals { - image_folder = "/Users/${var.vm_username}/image-generation" -} - -variable "baseimage_name" { - type = string -} - -variable "build_id" { - type = string -} - -variable "cluster_or_esxi_host" { - type = string -} - -variable "esxi_datastore" { - type = string -} - -variable "github_api_pat" { - type = string - default = "" - sensitive = true -} - -variable "image_os" { - type = string - default = "macos12" -} - -variable "output_folder" { - type = string -} - -variable "vcenter_datacenter" { - type = string -} - -variable "vcenter_password" { - type = string - sensitive = true -} - -variable "vcenter_server" { - type = string -} - -variable "vcenter_username" { - type = string - sensitive = true -} - -variable "vm_password" { - type = string - sensitive = true -} - -variable "vm_username" { - type = string - sensitive = true -} - -variable "xcode_install_sas" { - type = string - sensitive = true -} - -variable "xcode_install_storage_url" { - type = string - sensitive = true -} - -source "vsphere-clone" "template" { - CPUs = "5" - NestedHV = "true" - RAM = "24576" - cpu_cores = "5" - datacenter = "${var.vcenter_datacenter}" - datastore = "${var.esxi_datastore}" - folder = "${var.output_folder}" - host = "${var.cluster_or_esxi_host}" - insecure_connection = true - password = "${var.vcenter_password}" - shutdown_timeout = "15m" - ssh_password = "${var.vm_password}" - ssh_username = "${var.vm_username}" - template = "${var.baseimage_name}" - username = "${var.vcenter_username}" - vcenter_server = "${var.vcenter_server}" - vm_name = "${var.build_id}" -} - -build { - sources = ["source.vsphere-clone.template"] - - provisioner "shell" { - inline = ["mkdir ${local.image_folder}"] - } - - provisioner "file" { - destination = "${local.image_folder}/" - sources = [ - "${path.root}/../assets/xamarin-selector", - "${path.root}/../scripts/tests", - "${path.root}/../scripts/docs-gen", - "${path.root}/../scripts/helpers" - ] - } - - provisioner "file" { - destination = "${local.image_folder}/docs-gen/" - source = "${path.root}/../../../helpers/software-report-base" - } - - provisioner "file" { - destination = "${local.image_folder}/add-certificate.swift" - source = "${path.root}/../assets/add-certificate.swift" - } - - provisioner "file" { - destination = "~/.bashrc" - source = "${path.root}/../assets/bashrc" - } - - provisioner "file" { - destination = "~/.bash_profile" - source = "${path.root}/../assets/bashprofile" - } - - provisioner "shell" { - inline = [ "mkdir ~/bootstrap" ] - } - - provisioner "file" { - destination = "~/bootstrap" - source = "${path.root}/../assets/bootstrap-provisioner/" - } - - provisioner "file" { - destination = "${local.image_folder}/toolset.json" - source = "${path.root}/../toolsets/toolset-12.json" - } - - provisioner "shell" { - execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" - inline = [ - "mv ${local.image_folder}/docs-gen ${local.image_folder}/software-report", - "mv ${local.image_folder}/xamarin-selector ${local.image_folder}/assets", - "mkdir ~/utils", - "mv ${local.image_folder}/helpers/confirm-identified-developers.scpt ~/utils", - "mv ${local.image_folder}/helpers/invoke-tests.sh ~/utils", - "mv ${local.image_folder}/helpers/utils.sh ~/utils", - "mv ${local.image_folder}/helpers/xamarin-utils.sh ~/utils" - ] - } - - provisioner "shell" { - execute_command = "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}" - scripts = [ - "${path.root}/../scripts/build/install-xcode-clt.sh", - "${path.root}/../scripts/build/install-homebrew.sh" - ] - } - - provisioner "shell" { - environment_vars = ["PASSWORD=${var.vm_password}", "USERNAME=${var.vm_username}"] - execute_command = "chmod +x {{ .Path }}; sudo {{ .Vars }} {{ .Path }}" - scripts = [ - "${path.root}/../scripts/build/configure-network-interface-detection.sh", - "${path.root}/../scripts/build/configure-autologin.sh", - "${path.root}/../scripts/build/configure-auto-updates.sh", - "${path.root}/../scripts/build/configure-screensaver.sh", - "${path.root}/../scripts/build/configure-ntpconf.sh", - "${path.root}/../scripts/build/configure-max-files-limitation.sh", - "${path.root}/../scripts/build/configure-shell.sh" - ] - } - - provisioner "shell" { - environment_vars = ["IMAGE_VERSION=${var.build_id}", "IMAGE_OS=${var.image_os}", "PASSWORD=${var.vm_password}"] - execute_command = "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}" - scripts = [ - "${path.root}/../scripts/build/configure-preimagedata.sh", - "${path.root}/../scripts/build/configure-ssh.sh", - "${path.root}/../scripts/build/configure-machine.sh" - ] - } - - provisioner "shell" { - execute_command = "sudo {{ .Vars }} {{ .Path }}" - expect_disconnect = true - inline = ["echo 'Reboot VM'", "shutdown -r now"] - } - - provisioner "shell" { - environment_vars = ["API_PAT=${var.github_api_pat}", "USER_PASSWORD=${var.vm_password}", "IMAGE_FOLDER=${local.image_folder}"] - execute_command = "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}" - pause_before = "30s" - scripts = [ - "${path.root}/../scripts/build/configure-windows.sh", - "${path.root}/../scripts/build/install-powershell.sh", - "${path.root}/../scripts/build/install-dotnet.sh", - "${path.root}/../scripts/build/install-python.sh", - "${path.root}/../scripts/build/install-azcopy.sh", - "${path.root}/../scripts/build/install-openssl.sh", - "${path.root}/../scripts/build/install-ruby.sh", - "${path.root}/../scripts/build/install-rubygems.sh", - "${path.root}/../scripts/build/install-git.sh", - "${path.root}/../scripts/build/install-mongodb.sh", - "${path.root}/../scripts/build/install-node.sh", - "${path.root}/../scripts/build/install-common-utils.sh" - ] - } - - provisioner "shell" { - environment_vars = ["XCODE_INSTALL_STORAGE_URL=${var.xcode_install_storage_url}", "XCODE_INSTALL_SAS=${var.xcode_install_sas}", "IMAGE_FOLDER=${local.image_folder}"] - execute_command = "chmod +x {{ .Path }}; {{ .Vars }} pwsh -f {{ .Path }}" - script = "${path.root}/../scripts/build/Install-Xcode.ps1" - } - - provisioner "shell" { - execute_command = "sudo {{ .Vars }} {{ .Path }}" - expect_disconnect = true - inline = ["echo 'Reboot VM'", "shutdown -r now"] - } - - provisioner "shell" { - environment_vars = ["API_PAT=${var.github_api_pat}", "IMAGE_FOLDER=${local.image_folder}"] - execute_command = "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}" - scripts = [ - "${path.root}/../scripts/build/install-actions-cache.sh", - "${path.root}/../scripts/build/install-llvm.sh", - "${path.root}/../scripts/build/install-golang.sh", - "${path.root}/../scripts/build/install-swiftlint.sh", - "${path.root}/../scripts/build/install-openjdk.sh", - "${path.root}/../scripts/build/install-php.sh", - "${path.root}/../scripts/build/install-aws-tools.sh", - "${path.root}/../scripts/build/install-rust.sh", - "${path.root}/../scripts/build/install-gcc.sh", - "${path.root}/../scripts/build/install-haskell.sh", - "${path.root}/../scripts/build/install-cocoapods.sh", - "${path.root}/../scripts/build/install-android-sdk.sh", - "${path.root}/../scripts/build/install-xamarin.sh", - "${path.root}/../scripts/build/install-visualstudio.sh", - "${path.root}/../scripts/build/install-nvm.sh", - "${path.root}/../scripts/build/install-apache.sh", - "${path.root}/../scripts/build/install-nginx.sh", - "${path.root}/../scripts/build/install-postgresql.sh", - "${path.root}/../scripts/build/install-audiodevice.sh", - "${path.root}/../scripts/build/install-vcpkg.sh", - "${path.root}/../scripts/build/install-miniconda.sh", - "${path.root}/../scripts/build/install-safari.sh", - "${path.root}/../scripts/build/install-chrome.sh", - "${path.root}/../scripts/build/install-edge.sh", - "${path.root}/../scripts/build/install-firefox.sh", - "${path.root}/../scripts/build/install-pypy.sh", - "${path.root}/../scripts/build/install-pipx-packages.sh", - "${path.root}/../scripts/build/install-bicep.sh", - "${path.root}/../scripts/build/install-codeql-bundle.sh" - ] - } - - provisioner "shell" { - environment_vars = ["IMAGE_FOLDER=${local.image_folder}"] - execute_command = "chmod +x {{ .Path }}; {{ .Vars }} pwsh -f {{ .Path }}" - scripts = [ - "${path.root}/../scripts/build/Install-Toolset.ps1", - "${path.root}/../scripts/build/Configure-Toolset.ps1" - ] - } - - provisioner "shell" { - execute_command = "ruby {{ .Path }}" - script = "${path.root}/../scripts/build/configure-xcode-simulators.rb" - } - - provisioner "shell" { - execute_command = "chmod +x {{ .Path }}; {{ .Vars }} pwsh -f {{ .Path }}" - script = "${path.root}/../scripts/build/Update-XcodeSimulators.ps1" - } - - provisioner "shell" { - environment_vars = ["IMAGE_FOLDER=${local.image_folder}"] - inline = [ - "pwsh -File \"${local.image_folder}/software-report/Generate-SoftwareReport.ps1\" -OutputDirectory \"${local.image_folder}/output/software-report\" -ImageName ${var.build_id}", - "pwsh -File \"${local.image_folder}/tests/RunAll-Tests.ps1\"" - ] - } - - provisioner "file" { - destination = "${path.root}/../../image-output/" - direction = "download" - source = "${local.image_folder}/output/*" - } - - provisioner "shell" { - execute_command = "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}" - scripts = [ - "${path.root}/../scripts/build/configure-hostname.sh", - "${path.root}/../scripts/build/configure-system.sh" - ] - } -} diff --git a/images/macos/toolsets/Readme.md b/images/macos/toolsets/Readme.md index 1ac8e98c1205..7eb63cabc05c 100644 --- a/images/macos/toolsets/Readme.md +++ b/images/macos/toolsets/Readme.md @@ -6,6 +6,8 @@ - `link` property points to the place where Xcode will be located on image. `/Applications/Xcode_<link>.app` - `version` points to Xcode version that will be downloaded and installed - `symlinks` describes the list of aliases where symlinks will be created to + - `install_runtimes` is boolean function to control over the related simulator runtimes + - `sha256` used to check integrity of the Xcode installer file - `default` - version of Xcode to set as default (should be metched with any `link` in `versions` property) **Example:** `"11.2"` @@ -22,8 +24,8 @@ ```json "versions": [ - { "link": "12.2", "version": "12.2.0" }, - { "link": "11.7", "version": "11.7.0", "symlinks": ["11.7_beta"] } + { "link": "16_beta_4", "version": "16.0.0-Beta.4+16A5211f", "symlinks": ["16.0"], "install_runtimes": "false", "sha256": "4270cd8021b2f7f512ce91bfc4423b25bccab36cdab21834709d798c8daade72"}, + { "link": "15.4", "version": "15.4.0+15F31d", "install_runtimes": "true", "sha256": "82d3d61804ff3f4c7c82085e91dc701037ddaa770e542848b2477e22f4e8aa7a"} ] ``` diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json deleted file mode 100644 index cf26c25ea907..000000000000 --- a/images/macos/toolsets/toolset-11.json +++ /dev/null @@ -1,358 +0,0 @@ -{ - "xcode": { - "default": "13.2.1", - "x64": { - "versions": [ - { "link": "13.2.1", "version": "13.2.1+13C100", "symlinks": ["13.2"], "sha256": "D3BFCC6225D531587490C0DFC0926C80B7D50D17671DC8F25868F965F5D65F9D" }, - { "link": "13.1", "version": "13.1.0+13A1030d", "sha256": "4EFDEEA0EEEDA1957BB394128CCCD1DAAC3CB0A3D074224E0FAB90855CCA09C4" }, - { "link": "13.0", "version": "13.0.0+13A233", "sha256": "1D8257750A4E0333A2B372B32381BE5EC9B29704C8A0D44CE2E6D26D1CF4301E" }, - { "link": "12.5.1", "version": "12.5.1+12E507", "symlinks": ["12.5"], "sha256": "2592BF58E654440B3DF7062219DBBD24BDF345FAE6BA000756D6D5B1166A7168" }, - { "link": "12.4", "version": "12.4.0+12D4e", "sha256": "CC8D10155258F9DDAA5E422AB8F50E6058758C95208E58E59B5DB1DB033CE2FF" }, - { "link": "11.7", "version": "11.7.0-GM+11E801a", "symlinks": ["11.7_beta"], "sha256": "A53FDEAB92326CD9BF93A1B5FAE01E3D658B04DA60DFF5DE74141CABA0808B03" } - ] - } - }, - "xamarin": { - "vsmac": { - "default": "2022", - "versions": [ "2019", "2022" ] - }, - "mono_versions": [ - "6.12.0.188" - ], - "ios_versions": [ - "15.8.0.3", "15.6.0.3", "15.4.0.0", "15.2.0.17", "15.0.0.6", "14.20.0.24", "14.16.0.5", "14.14.2.5", "14.10.0.4", "14.8.0.3", "14.6.0.15", "14.4.1.3", "14.2.0.12", "14.0.0.0", "13.20.2.2" - ], - "mac_versions": [ - "8.8.0.3", "8.6.0.3", "8.4.0.0", "8.2.0.17", "7.14.0.27", "7.10.0.5", "7.8.2.5", "7.4.0.10", "7.2.0.3", "7.0.0.15", "6.22.1.26", "6.20.2.2" - ], - "android_versions": [ - "12.2.8.3", "12.1.0.2", "12.0.0.3", "11.3.0.4", "11.2.2.1", "11.1.0.26", "11.0.2.0" - ], - "bundle_default": "6_12_12", - "bundles": [ - { - "symlink": "6_12_16", - "mono":"6.12", - "ios": "15.8", - "mac": "8.8", - "android": "12.2" - }, - { - "symlink": "6_12_15", - "mono":"6.12", - "ios": "15.8", - "mac": "8.8", - "android": "12.1" - }, - { - "symlink": "6_12_14", - "mono":"6.12", - "ios": "15.8", - "mac": "8.8", - "android": "12.0" - }, - { - "symlink": "6_12_13", - "mono":"6.12", - "ios": "15.6", - "mac": "8.6", - "android": "12.0" - }, - { - "symlink": "6_12_12", - "mono":"6.12", - "ios": "15.4", - "mac": "8.4", - "android": "12.0" - }, - { - "symlink": "6_12_11", - "mono":"6.12", - "ios": "15.2", - "mac": "8.2", - "android": "12.0" - }, - { - "symlink": "6_12_10", - "mono":"6.12", - "ios": "15.0", - "mac": "7.14", - "android": "11.3" - }, - { - "symlink": "6_12_9", - "mono":"6.12", - "ios": "14.20", - "mac": "7.14", - "android": "11.3" - }, - { - "symlink": "6_12_8", - "mono":"6.12", - "ios": "14.16", - "mac": "7.10", - "android": "11.2" - }, - { - "symlink": "6_12_7", - "mono":"6.12", - "ios": "14.14", - "mac": "7.8", - "android": "11.2" - }, - { - "symlink": "6_12_6", - "mono":"6.12", - "ios": "14.10", - "mac": "7.4", - "android": "11.1" - }, - { - "symlink": "6_12_5", - "mono":"6.12", - "ios": "14.8", - "mac": "7.2", - "android": "11.1" - }, - { - "symlink": "6_12_4", - "mono":"6.12", - "ios": "14.6", - "mac": "7.0", - "android": "11.1" - }, - { - "symlink": "6_12_3", - "mono":"6.12", - "ios": "14.4", - "mac": "6.22", - "android": "11.1" - }, - { - "symlink": "6_12_2", - "mono":"6.12", - "ios": "14.2", - "mac": "6.20", - "android": "11.0" - }, - { - "symlink": "6_12_1", - "mono":"6.12", - "ios": "14.0", - "mac": "6.20", - "android": "11.0" - }, - { - "symlink": "6_12_0", - "mono":"6.12", - "ios": "13.20", - "mac": "6.20", - "android": "11.0" - } - ] - }, - "java": { - "x64": { - "default": "8", - "versions": [ "8", "11", "17", "21"] - } - }, - "android": { - "cmdline-tools": "commandlinetools-mac-9123335_latest.zip", - "platform_min_version": "31", - "build_tools_min_version": "31.0.0", - "extras": [ - "android;m2repository", "google;m2repository", "google;google_play_services" - ], - "addons": [], - "additional_tools": [ - "cmake;3.10.2.4988404", - "cmake;3.18.1", - "cmake;3.22.1" - ], - "ndk": { - "default": "25", - "versions": [ - "24", "25", "26" - ] - } - }, - "powershellModules": [ - {"name": "Az"}, - {"name": "MarkdownPS"}, - {"name": "Pester"}, - {"name": "PSScriptAnalyzer"} - ], - "npm": { - "global_packages": [ - { "name": "appcenter-cli", "test": "appcenter --version" }, - { "name": "newman", "test": "newman --version" } - ] - }, - "brew": { - "common_packages": [ - "aliyun-cli", - "ant", - "aria2", - "bazelisk", - "carthage", - "cmake", - "colima", - "gh", - "gnupg", - "gnu-tar", - "helm", - "kotlin", - "libpq", - "p7zip", - "packer", - "perl", - "pkg-config", - "sbt", - "subversion", - "swiftformat", - "swig", - "zstd", - "zlib", - "libxext", - "libxft", - "tcl-tk" - ], - "cask_packages": [ - "julia" - ] - }, - "gcc": { - "versions": [ - "10", - "11", - "12" - ] - }, - "toolcache": [ - { - "name": "Python", - "url" : "https://raw.githubusercontent.com/actions/python-versions/main/versions-manifest.json", - "platform" : "darwin", - "arch": { - "x64": { - "versions": [ - "3.7.*", - "3.8.*", - "3.9.*", - "3.10.*", - "3.11.*", - "3.12.*" - ] - } - } - }, - { - "name": "PyPy", - "platform" : "darwin", - "arch": { - "x64": { - "versions": [ - "2.7", - "3.7", - "3.8", - "3.9", - "3.10" - ] - } - } - }, - { - "name": "Node", - "url" : "https://raw.githubusercontent.com/actions/node-versions/main/versions-manifest.json", - "platform" : "darwin", - "arch": { - "x64": { - "versions": [ - "16.*", - "18.*", - "20.*" - ] - } - } - }, - { - "name": "Go", - "url" : "https://raw.githubusercontent.com/actions/go-versions/main/versions-manifest.json", - "platform" : "darwin", - "arch": { - "x64": { - "variable_template" : "GOROOT_{0}_{1}_X64", - "versions": [ - "1.20.*", - "1.21.*" - ] - } - } - }, - { - "name": "Ruby", - "arch": { - "x64": { - "versions": [ - "3.0.*", - "3.1.*" - ] - } - } - } - ], - "pipx": [ - { - "package": "yamllint", - "cmd": "yamllint --version" - } - ], - "dotnet": { - "arch":{ - "x64": { - "versions": [ - "6.0", - "7.0", - "8.0" - ] - } - } - }, - "ruby": { - "default": "3.0", - "rubygems": [ - "xcode-install", - "cocoapods", - "nomad-cli", - "xcpretty", - "bundler", - "fastlane", - "jazzy" - ] - }, - "go": { - "default": "1.21" - }, - "node": { - "default": "18", - "nvm_versions": [ - "16", - "18", - "20" - ] - }, - "llvm": { - "version": "15" - }, - "mongodb": { - "version": "5.0" - }, - "postgresql": { - "version": "14" - }, - "pwsh": { - "version": "7.4" - } -} From 879561273028ddf75d66df9828271041849f03d6 Mon Sep 17 00:00:00 2001 From: hemanthmanga <166606741+hemanthmanga@users.noreply.github.com> Date: Fri, 9 Aug 2024 17:14:49 +0530 Subject: [PATCH 3030/3485] Updating AzurecosmoDB checksum and Removing m2repositry in AndriodSDK (#10415) --- .../windows/scripts/build/Install-AzureCosmosDbEmulator.ps1 | 2 +- images/windows/toolsets/toolset-2019.json | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/images/windows/scripts/build/Install-AzureCosmosDbEmulator.ps1 b/images/windows/scripts/build/Install-AzureCosmosDbEmulator.ps1 index 0249831f48f8..e194051ed1ed 100644 --- a/images/windows/scripts/build/Install-AzureCosmosDbEmulator.ps1 +++ b/images/windows/scripts/build/Install-AzureCosmosDbEmulator.ps1 @@ -5,6 +5,6 @@ Install-Binary -Type MSI ` -Url "https://aka.ms/cosmosdb-emulator" ` - -ExpectedSHA256Sum "34D8E1968A868CEBBC31D1484C473FC61D3174D6C3B9AB71D4CE94F6618D7670" + -ExpectedSHA256Sum "D21A0476B7F3439319BE6A1060935E7C865FEFA87C47943C9A6D595137703F49" Invoke-PesterTests -TestFile "Tools" -TestName "Azure Cosmos DB Emulator" diff --git a/images/windows/toolsets/toolset-2019.json b/images/windows/toolsets/toolset-2019.json index 118a6b71a632..7ab1534a0fd3 100644 --- a/images/windows/toolsets/toolset-2019.json +++ b/images/windows/toolsets/toolset-2019.json @@ -138,11 +138,7 @@ "extras": [ "android;m2repository", "google;m2repository", - "google;google_play_services", - "m2repository;com;android;support;constraint;constraint-layout-solver;1.0.2", - "m2repository;com;android;support;constraint;constraint-layout-solver;1.0.1", - "m2repository;com;android;support;constraint;constraint-layout;1.0.2", - "m2repository;com;android;support;constraint;constraint-layout;1.0.1" + "google;google_play_services" ], "addons": [ "addon-google_apis-google-24", From 07692c0033d6862d3bac64a02c63f7d71297afa4 Mon Sep 17 00:00:00 2001 From: ijunaidm <160701894+ijunaidm@users.noreply.github.com> Date: Sat, 10 Aug 2024 12:05:31 +0530 Subject: [PATCH 3031/3485] Updated the AzPowershell module version Ubuntu images (#10418) * Update toolset-2004.json * Update toolset-2204.json * Update toolset-2404.json --- images/ubuntu/toolsets/toolset-2004.json | 2 +- images/ubuntu/toolsets/toolset-2204.json | 2 +- images/ubuntu/toolsets/toolset-2404.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/images/ubuntu/toolsets/toolset-2004.json b/images/ubuntu/toolsets/toolset-2004.json index cfbaa56bd389..dcc45615b880 100644 --- a/images/ubuntu/toolsets/toolset-2004.json +++ b/images/ubuntu/toolsets/toolset-2004.json @@ -108,7 +108,7 @@ { "name": "az", "versions": [ - "11.3.1" + "12.1.0" ] } ], diff --git a/images/ubuntu/toolsets/toolset-2204.json b/images/ubuntu/toolsets/toolset-2204.json index 24738e52ee7b..23d46c139a51 100644 --- a/images/ubuntu/toolsets/toolset-2204.json +++ b/images/ubuntu/toolsets/toolset-2204.json @@ -105,7 +105,7 @@ { "name": "az", "versions": [ - "11.3.1" + "12.1.0" ] } ], diff --git a/images/ubuntu/toolsets/toolset-2404.json b/images/ubuntu/toolsets/toolset-2404.json index 6c927965b30e..fe44a35be423 100644 --- a/images/ubuntu/toolsets/toolset-2404.json +++ b/images/ubuntu/toolsets/toolset-2404.json @@ -94,7 +94,7 @@ { "name": "az", "versions": [ - "11.5.0" + "12.1.0" ] } ], From 5e6cc3155dc84b627d08c5ad606642b3a90ce713 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 10 Aug 2024 12:05:54 +0530 Subject: [PATCH 3032/3485] Updating readme file for win22 version 20240807.2.1 (#10412) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/windows/Windows2022-Readme.md | 51 ++++++++++++++-------------- 1 file changed, 25 insertions(+), 26 deletions(-) diff --git a/images/windows/Windows2022-Readme.md b/images/windows/Windows2022-Readme.md index eaa3e12d65d3..a3076149d50f 100644 --- a/images/windows/Windows2022-Readme.md +++ b/images/windows/Windows2022-Readme.md @@ -5,7 +5,7 @@ *** # Windows Server 2022 - OS Version: 10.0.20348 Build 2582 -- Image Version: 20240729.2.0 +- Image Version: 20240807.2.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -14,13 +14,13 @@ ### Language and Runtime - Bash 5.2.26(1)-release -- Go 1.21.12 +- Go 1.21.13 - Julia 1.10.4 -- Kotlin 2.0.0 +- Kotlin 2.0.10 - LLVM 18.1.8 - Node 18.20.3 - Perl 5.32.1 -- PHP 8.3.9 +- PHP 8.3.10 - Python 3.9.13 - Ruby 3.0.7p220 @@ -34,7 +34,7 @@ - pip 24.2 (python 3.9) - Pipx 1.6.0 - RubyGems 3.2.33 -- Vcpkg (build from commit cacf59943) +- Vcpkg (build from commit f5398d978) - Yarn 1.22.22 #### Environment variables @@ -52,19 +52,18 @@ ### Tools - 7zip 24.07 - aria2 1.37.0 -- azcopy 10.25.1 +- azcopy 10.26.0 - Bazel 7.2.1 - Bazelisk 1.19.0 - Bicep 0.29.47 - Cabal 3.12.1.0 -- CMake 3.30.1 +- CMake 3.30.2 - CodeQL Action Bundle 2.18.1 - Docker 26.1.3 -- Docker Compose v1 1.29.2 - Docker Compose v2 2.27.1 - Docker-wincred 0.8.2 - ghc 9.10.1 -- Git 2.45.2.windows.1 +- Git 2.46.0.windows.1 - Git LFS 3.5.1 - ImageMagick 7.1.1-36 - InnoSetup 6.3.3 @@ -79,7 +78,7 @@ - NSIS 3.10 - OpenSSL 1.1.1w - Packer 1.11.0 -- Pulumi 3.127.0 +- Pulumi 3.128.0 - R 4.4.1 - Service Fabric SDK 9.1.1436.9590 - Stack 3.1.1 @@ -93,12 +92,12 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.216 -- AWS CLI 2.17.18 -- AWS SAM CLI 1.120.0 +- AWS CLI 2.17.25 +- AWS SAM CLI 1.121.0 - AWS Session Manager CLI 1.2.650.0 -- Azure CLI 2.62.0 +- Azure CLI 2.63.0 - Azure DevOps CLI extension 1.0.1 -- GitHub CLI 2.53.0 +- GitHub CLI 2.54.0 ### Rust Tools - Cargo 1.80.0 @@ -115,12 +114,12 @@ - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 127.0.6533.73 -- Chrome Driver 127.0.6533.72 -- Microsoft Edge 127.0.2651.74 -- Microsoft Edge Driver 127.0.2651.74 -- Mozilla Firefox 128.0.3 -- Gecko Driver 0.34.0 +- Google Chrome 127.0.6533.100 +- Chrome Driver 127.0.6533.99 +- Microsoft Edge 127.0.2651.86 +- Microsoft Edge Driver 127.0.2651.86 +- Mozilla Firefox 129.0 +- Gecko Driver 0.35.0 - IE Driver 4.14.0.0 - Selenium server 4.23.0 @@ -161,8 +160,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Go - 1.20.14 -- 1.21.12 -- 1.22.5 +- 1.21.13 +- 1.22.6 #### Node.js - 16.20.2 @@ -500,15 +499,15 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - PowerShell 7.4.4 #### Powershell Modules -- Az: 11.3.1 +- Az: 12.1.0 - Azure: 2.1.0 (Default), 5.3.0 - AzureRM: 2.1.0 (Default), 6.13.1 - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.623 +- AWSPowershell: 4.1.630 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.10 -- Microsoft.Graph: 2.20.0 +- Microsoft.Graph: 2.21.1 - Pester: 3.4.0, 5.6.1 - PowerShellGet: 1.0.0.1, 2.2.5 - PSScriptAnalyzer: 1.22.0 @@ -528,7 +527,7 @@ All other versions are saved but not installed. | Android Emulator | 34.2.16 | | Android SDK Build-tools | 35.0.0<br>34.0.0<br>33.0.0 33.0.1 33.0.2 33.0.3<br>32.0.0<br>31.0.0 | | Android SDK Platforms | android-35 (rev 1)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1) | -| Android SDK Platform-Tools | 35.0.1 | +| Android SDK Platform-Tools | 35.0.2 | | Android Support Repository | 47.0.0 | | CMake | 3.18.1<br>3.22.1 | | Google Play services | 49 | From 30802498d677fa989c3496250268d36507fdb7c4 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 13 Aug 2024 14:11:21 +0000 Subject: [PATCH 3033/3485] Updating readme file for ubuntu24 version 20240811.1.1 (#10423) Co-authored-by: Image generation service account. <no-reply@microsoft.com> --- images/ubuntu/Ubuntu2404-Readme.md | 42 +++++++++++++++--------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/images/ubuntu/Ubuntu2404-Readme.md b/images/ubuntu/Ubuntu2404-Readme.md index 4db618ae116b..4f051d29cca6 100644 --- a/images/ubuntu/Ubuntu2404-Readme.md +++ b/images/ubuntu/Ubuntu2404-Readme.md @@ -6,8 +6,8 @@ *** # Ubuntu 24.04 LTS - OS Version: 24.04 LTS -- Kernel Version: 6.8.0-1010-azure -- Image Version: 20240804.1.0 +- Kernel Version: 6.8.0-1012-azure +- Image Version: 20240811.1.0 - Systemd version: 255.4-1ubuntu8.2 ## Installed Software @@ -29,14 +29,14 @@ ### Package Management - cpan 1.64 - Helm 3.15.3 -- Homebrew 4.3.12 +- Homebrew 4.3.14 - Miniconda 24.5.0 - Npm 10.8.1 - Pip 24.0 - Pip3 24.0 - Pipx 1.4.3 - RubyGems 3.4.20 -- Vcpkg (build from commit fe1cde61e) +- Vcpkg (build from commit e590c2b30) - Yarn 1.22.22 #### Environment variables @@ -56,7 +56,7 @@ to accomplish this. ### Project Management - Ant 1.10.14 - Gradle 8.9 -- Lerna 8.1.7 +- Lerna 8.1.8 - Maven 3.8.8 ### Tools @@ -90,18 +90,18 @@ to accomplish this. - OpenSSL 3.0.13-0ubuntu3.2 - Parcel 2.12.0 - Podman 4.9.3 -- Pulumi 3.127.0 +- Pulumi 3.128.0 - Skopeo 1.13.3 - Sphinx Open Source Search Server 2.2.11 - yamllint 1.35.1 -- yq 4.44.2 +- yq 4.44.3 - zstd 1.5.6 ### CLI Tools -- AWS CLI 2.17.22 +- AWS CLI 2.17.27 - AWS CLI Session Manager Plugin 1.2.650.0 - AWS SAM CLI 1.121.0 -- Azure CLI 2.62.0 +- Azure CLI 2.63.0 - Azure CLI (azure-devops) 1.0.1 - GitHub CLI 2.54.0 @@ -128,19 +128,19 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Stack 3.1.1 ### Rust Tools -- Cargo 1.80.0 -- Rust 1.80.0 -- Rustdoc 1.80.0 +- Cargo 1.80.1 +- Rust 1.80.1 +- Rustdoc 1.80.1 - Rustup 1.27.1 #### Packages - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 127.0.6533.88 -- ChromeDriver 127.0.6533.88 +- Google Chrome 127.0.6533.99 +- ChromeDriver 127.0.6533.99 - Chromium 127.0.6533.0 -- Selenium server 4.23.0 +- Selenium server 4.23.1 #### Environment variables | Name | Value | @@ -152,13 +152,13 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ### .NET Tools - .NET Core SDK: 8.0.107 -- nbgv 3.6.139+a9e8765620 +- nbgv 3.6.141+d2035fb7be ### Databases - sqlite3 3.45.1 #### PostgreSQL -- PostgreSQL 16.3 +- PostgreSQL 16.4 ``` User: postgres PostgreSQL service is disabled by default. @@ -178,8 +178,8 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Go - 1.20.14 -- 1.21.12 -- 1.22.5 +- 1.21.13 +- 1.22.6 #### Node.js - 16.20.2 @@ -200,7 +200,7 @@ Use the following command as a part of your job to start the service: 'sudo syst - PowerShell 7.4.2 #### PowerShell Modules -- Az: 11.5.0 +- Az: 12.1.0 - Microsoft.Graph: 2.21.1 - Pester: 5.6.1 - PSScriptAnalyzer: 1.22.0 @@ -244,7 +244,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | brotli | 1.1.0-2build2 | | bzip2 | 1.0.8-5.1 | | coreutils | 9.4-3ubuntu6 | -| curl | 8.5.0-2ubuntu10.1 | +| curl | 8.5.0-2ubuntu10.2 | | dbus | 1.14.10-4ubuntu4 | | dnsutils | 1:9.18.28-0ubuntu0.24.04.1 | | dpkg | 1.22.6ubuntu6 | From cc117fb31bc658a4ecb772a9c0bad88da7bc2241 Mon Sep 17 00:00:00 2001 From: kishorekumar-anchala <168699259+kishorekumar-anchala@users.noreply.github.com> Date: Tue, 13 Aug 2024 21:48:19 +0530 Subject: [PATCH 3034/3485] fix gitversion.portable version to latest (#10435) --- images/windows/toolsets/toolset-2019.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/windows/toolsets/toolset-2019.json b/images/windows/toolsets/toolset-2019.json index 7ab1534a0fd3..3042f592785b 100644 --- a/images/windows/toolsets/toolset-2019.json +++ b/images/windows/toolsets/toolset-2019.json @@ -420,7 +420,7 @@ { "name": "aria2" }, { "name": "azcopy10" }, { "name": "Bicep" }, - { "name": "gitversion.portable", "args": [ "--version", "5.12.0"] }, + { "name": "gitversion.portable"}, { "name": "innosetup" }, { "name": "jq" }, { "name": "NuGet.CommandLine" }, From 85fb533e0557f24e16d15fe75b72c519f1fba38d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 14 Aug 2024 08:11:35 +0000 Subject: [PATCH 3035/3485] Updating readme file for macos-13 version 20240811.1 (#10422) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-13-Readme.md | 44 ++++++++++++++++----------------- 1 file changed, 21 insertions(+), 23 deletions(-) diff --git a/images/macos/macos-13-Readme.md b/images/macos/macos-13-Readme.md index 905fb05557b2..708a2cdf98d0 100644 --- a/images/macos/macos-13-Readme.md +++ b/images/macos/macos-13-Readme.md @@ -3,9 +3,9 @@ | [[macOS] GCC 11 will be removed from all macOS images on August 12](https://github.com/actions/runner-images/issues/10213) | *** # macOS 13 -- OS Version: macOS 13.6.8 (22G820) +- OS Version: macOS 13.6.9 (22G830) - Kernel Version: Darwin 22.6.0 -- Image Version: 20240805.3 +- Image Version: 20240811.1 ## Installed Software @@ -14,15 +14,13 @@ - Bash 3.2.57(1)-release - Clang/LLVM 14.0.0 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` -- GCC 11 (Homebrew GCC 11.4.0) - available by `gcc-11` alias - GCC 12 (Homebrew GCC 12.4.0) - available by `gcc-12` alias - GCC 13 (Homebrew GCC 13.3.0) - available by `gcc-13` alias - GCC 14 (Homebrew GCC 14.1.0_2) - available by `gcc-14` alias -- GNU Fortran 11 (Homebrew GCC 11.4.0) - available by `gfortran-11` alias - GNU Fortran 12 (Homebrew GCC 12.4.0) - available by `gfortran-12` alias - GNU Fortran 13 (Homebrew GCC 13.3.0) - available by `gfortran-13` alias - GNU Fortran 14 (Homebrew GCC 14.1.0_2) - available by `gfortran-14` alias -- Kotlin 2.0.0-release-341 +- Kotlin 2.0.10-release-540 - Mono 6.12.0.188 - Node.js 20.16.0 - Perl 5.38.2 @@ -35,13 +33,13 @@ - Carthage 0.39.1 - CocoaPods 1.15.2 - Composer 2.7.7 -- Homebrew 4.3.13 +- Homebrew 4.3.14 - NPM 10.8.1 - NuGet 6.3.1.1 - Pip3 24.2 (python 3.12) - Pipx 1.6.0 - RubyGems 3.5.17 -- Vcpkg 2024 (build from commit fe1cde61e) +- Vcpkg 2024 (build from commit e590c2b30) - Yarn 1.22.22 ### Project Management @@ -71,17 +69,17 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.17.22 +- AWS CLI 2.17.27 - AWS SAM CLI 1.121.0 - AWS Session Manager CLI 1.2.650.0 -- Azure CLI 2.62.0 +- Azure CLI 2.63.0 - Azure CLI (azure-devops) 1.0.1 - Bicep CLI 0.29.47 - Cmake 3.30.2 - CodeQL Action Bundle 2.18.1 - Fastlane 2.222.0 - SwiftFormat 0.54.3 -- Xcbeautify 2.7.0 +- Xcbeautify 2.10.0 - Xcode Command Line Tools 14.3.1.0.1.1683849156 - Xcodes 1.5.0 @@ -91,12 +89,12 @@ ### Browsers - Safari 17.6 (18618.3.11.11.7) - SafariDriver 17.6 (18618.3.11.11.7) -- Google Chrome 127.0.6533.89 -- Google Chrome for Testing 127.0.6533.88 -- ChromeDriver 127.0.6533.88 -- Microsoft Edge 127.0.2651.86 -- Microsoft Edge WebDriver 127.0.2651.87 -- Mozilla Firefox 128.0.3 +- Google Chrome 127.0.6533.100 +- Google Chrome for Testing 127.0.6533.99 +- ChromeDriver 127.0.6533.99 +- Microsoft Edge 127.0.2651.98 +- Microsoft Edge WebDriver 127.0.2651.97 +- Mozilla Firefox 129.0 - geckodriver 0.34.0 - Selenium server 4.23.0 @@ -142,13 +140,13 @@ #### Go - 1.20.14 -- 1.21.12 -- 1.22.5 +- 1.21.13 +- 1.22.6 ### Rust Tools -- Cargo 1.80.0 -- Rust 1.80.0 -- Rustdoc 1.80.0 +- Cargo 1.80.1 +- Rust 1.80.1 +- Rustdoc 1.80.1 - Rustup 1.27.1 #### Packages @@ -159,7 +157,7 @@ - PowerShell 7.4.4 #### PowerShell Modules -- Az: 12.1.0 +- Az: 12.2.0 - Pester: 5.6.1 - PSScriptAnalyzer: 1.22.0 @@ -242,7 +240,7 @@ | Android Emulator | 34.2.16 | | Android SDK Build-tools | 35.0.0<br>34.0.0<br>33.0.2 33.0.3 | | Android SDK Platforms | android-35 (rev 1)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | -| Android SDK Platform-Tools | 35.0.1 | +| Android SDK Platform-Tools | 35.0.2 | | Android Support Repository | 47.0.0 | | CMake | 3.22.1 | | Google Play services | 49 | From 474b80c589d51f7f7fcda7a94de2c7ddb2a98a2f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 14 Aug 2024 09:00:20 +0000 Subject: [PATCH 3036/3485] Updating readme file for macos-13-arm64 version 20240811.1 (#10420) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-13-arm64-Readme.md | 38 +++++++++++++-------------- 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/images/macos/macos-13-arm64-Readme.md b/images/macos/macos-13-arm64-Readme.md index 0265e212bd85..2e9eaacff401 100644 --- a/images/macos/macos-13-arm64-Readme.md +++ b/images/macos/macos-13-arm64-Readme.md @@ -3,9 +3,9 @@ | [[macOS] GCC 11 will be removed from all macOS images on August 12](https://github.com/actions/runner-images/issues/10213) | *** # macOS 13 -- OS Version: macOS 13.6.8 (22G820) +- OS Version: macOS 13.6.9 (22G830) - Kernel Version: Darwin 22.6.0 -- Image Version: 20240804.1 +- Image Version: 20240811.1 ## Installed Software @@ -14,15 +14,13 @@ - Bash 3.2.57(1)-release - Clang/LLVM 14.0.0 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` -- GCC 11 (Homebrew GCC 11.4.0) - available by `gcc-11` alias - GCC 12 (Homebrew GCC 12.4.0) - available by `gcc-12` alias - GCC 13 (Homebrew GCC 13.3.0) - available by `gcc-13` alias - GCC 14 (Homebrew GCC 14.1.0_2) - available by `gcc-14` alias -- GNU Fortran 11 (Homebrew GCC 11.4.0) - available by `gfortran-11` alias - GNU Fortran 12 (Homebrew GCC 12.4.0) - available by `gfortran-12` alias - GNU Fortran 13 (Homebrew GCC 13.3.0) - available by `gfortran-13` alias - GNU Fortran 14 (Homebrew GCC 14.1.0_2) - available by `gfortran-14` alias -- Kotlin 2.0.0-release-341 +- Kotlin 2.0.10-release-540 - Mono 6.12.0.188 - Node.js 20.16.0 - Perl 5.38.2 @@ -33,7 +31,7 @@ - Bundler 2.5.17 - Carthage 0.39.1 - CocoaPods 1.15.2 -- Homebrew 4.3.12 +- Homebrew 4.3.14 - NPM 10.8.1 - NuGet 6.3.1.1 - Pip3 24.0 (python 3.12) @@ -64,21 +62,21 @@ - OpenSSL 1.1.1w 11 Sep 2023 - Packer 1.9.4 - pkg-config 0.29.2 -- yq 4.44.2 +- yq 4.44.3 - zstd 1.5.6 ### Tools -- AWS CLI 2.17.22 +- AWS CLI 2.17.27 - AWS SAM CLI 1.121.0 - AWS Session Manager CLI 1.2.650.0 -- Azure CLI 2.62.0 +- Azure CLI 2.63.0 - Azure CLI (azure-devops) 1.0.1 - Bicep CLI 0.29.47 - Cmake 3.30.2 - CodeQL Action Bundle 2.18.1 - Fastlane 2.222.0 - SwiftFormat 0.54.3 -- Xcbeautify 2.7.0 +- Xcbeautify 2.10.0 - Xcode Command Line Tools 14.3.1.0.1.1683849156 - Xcodes 1.5.0 @@ -87,9 +85,9 @@ ### Browsers - Safari 17.6 (18618.3.11.11.7) - SafariDriver 17.6 (18618.3.11.11.7) -- Google Chrome 127.0.6533.89 -- Google Chrome for Testing 127.0.6533.88 -- ChromeDriver 127.0.6533.88 +- Google Chrome 127.0.6533.100 +- Google Chrome for Testing 127.0.6533.99 +- ChromeDriver 127.0.6533.99 - Selenium server 4.23.0 #### Environment variables @@ -121,13 +119,13 @@ #### Go - 1.20.14 -- 1.21.12 -- 1.22.5 +- 1.21.13 +- 1.22.6 ### Rust Tools -- Cargo 1.80.0 -- Rust 1.80.0 -- Rustdoc 1.80.0 +- Cargo 1.80.1 +- Rust 1.80.1 +- Rustdoc 1.80.1 - Rustup 1.27.1 #### Packages @@ -138,7 +136,7 @@ - PowerShell 7.4.4 #### PowerShell Modules -- Az: 12.1.0 +- Az: 12.2.0 - Pester: 5.6.1 - PSScriptAnalyzer: 1.22.0 @@ -222,7 +220,7 @@ | Android Emulator | 34.2.16 | | Android SDK Build-tools | 35.0.0<br>34.0.0<br>33.0.2 33.0.3 | | Android SDK Platforms | android-35 (rev 1)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | -| Android SDK Platform-Tools | 35.0.1 | +| Android SDK Platform-Tools | 35.0.2 | | Android Support Repository | 47.0.0 | | CMake | 3.22.1 | | Google Play services | 49 | From cebb2a18840434f0efccb47a4e4126e1827748a5 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 14 Aug 2024 10:37:07 +0000 Subject: [PATCH 3037/3485] Updating readme file for macos-14-arm64 version 20240811.1 (#10421) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-14-arm64-Readme.md | 50 +++++++++++++-------------- 1 file changed, 24 insertions(+), 26 deletions(-) diff --git a/images/macos/macos-14-arm64-Readme.md b/images/macos/macos-14-arm64-Readme.md index 44ecd8e224e1..20cbf429c691 100644 --- a/images/macos/macos-14-arm64-Readme.md +++ b/images/macos/macos-14-arm64-Readme.md @@ -3,9 +3,9 @@ | [[macOS] GCC 11 will be removed from all macOS images on August 12](https://github.com/actions/runner-images/issues/10213) | *** # macOS 14 -- OS Version: macOS 14.6 (23G80) +- OS Version: macOS 14.6.1 (23G93) - Kernel Version: Darwin 23.6.0 -- Image Version: 20240805.3 +- Image Version: 20240811.1 ## Installed Software @@ -14,15 +14,13 @@ - Bash 3.2.57(1)-release - Clang/LLVM 14.0.3 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` -- GCC 11 (Homebrew GCC 11.4.0) - available by `gcc-11` alias - GCC 12 (Homebrew GCC 12.4.0) - available by `gcc-12` alias - GCC 13 (Homebrew GCC 13.3.0) - available by `gcc-13` alias - GCC 14 (Homebrew GCC 14.1.0_2) - available by `gcc-14` alias -- GNU Fortran 11 (Homebrew GCC 11.4.0) - available by `gfortran-11` alias - GNU Fortran 12 (Homebrew GCC 12.4.0) - available by `gfortran-12` alias - GNU Fortran 13 (Homebrew GCC 13.3.0) - available by `gfortran-13` alias - GNU Fortran 14 (Homebrew GCC 14.1.0_2) - available by `gfortran-14` alias -- Kotlin 2.0.0-release-341 +- Kotlin 2.0.10-release-540 - Mono 6.12.0.188 - Node.js 20.16.0 - Perl 5.38.2 @@ -33,7 +31,7 @@ - Bundler 2.5.17 - Carthage 0.39.1 - CocoaPods 1.15.2 -- Homebrew 4.3.12 +- Homebrew 4.3.14 - NPM 10.8.1 - NuGet 6.3.1.1 - Pip3 24.0 (python 3.12) @@ -64,21 +62,21 @@ - OpenSSL 1.1.1w 11 Sep 2023 - Packer 1.9.4 - pkg-config 0.29.2 -- yq 4.44.2 +- yq 4.44.3 - zstd 1.5.6 ### Tools -- AWS CLI 2.17.22 +- AWS CLI 2.17.27 - AWS SAM CLI 1.121.0 - AWS Session Manager CLI 1.2.650.0 -- Azure CLI 2.62.0 +- Azure CLI 2.63.0 - Azure CLI (azure-devops) 1.0.1 - Bicep CLI 0.29.47 - Cmake 3.30.2 - CodeQL Action Bundle 2.18.1 - Fastlane 2.222.0 - SwiftFormat 0.54.3 -- Xcbeautify 2.7.0 +- Xcbeautify 2.10.0 - Xcode Command Line Tools 15.3.0.0.1.1708646388 - Xcodes 1.5.0 @@ -87,9 +85,9 @@ ### Browsers - Safari 17.6 (19618.3.11.11.5) - SafariDriver 17.6 (19618.3.11.11.5) -- Google Chrome 127.0.6533.89 -- Google Chrome for Testing 127.0.6533.88 -- ChromeDriver 127.0.6533.88 +- Google Chrome 127.0.6533.100 +- Google Chrome for Testing 127.0.6533.99 +- ChromeDriver 127.0.6533.99 - Selenium server 4.23.0 #### Environment variables @@ -120,13 +118,13 @@ #### Go - 1.20.14 -- 1.21.12 -- 1.22.5 +- 1.21.13 +- 1.22.6 ### Rust Tools -- Cargo 1.80.0 -- Rust 1.80.0 -- Rustdoc 1.80.0 +- Cargo 1.80.1 +- Rust 1.80.1 +- Rustdoc 1.80.1 - Rustup 1.27.1 #### Packages @@ -137,14 +135,14 @@ - PowerShell 7.4.4 #### PowerShell Modules -- Az: 12.1.0 +- Az: 12.2.0 - Pester: 5.6.1 - PSScriptAnalyzer: 1.22.0 ### Xcode | Version | Build | Path | | -------------- | -------- | --------------------------------- | -| 16.0 (beta) | 16A5211f | /Applications/Xcode_16_beta_4.app | +| 16.0 (beta) | 16A5221g | /Applications/Xcode_16_beta_5.app | | 15.4 (default) | 15F31d | /Applications/Xcode_15.4.app | | 15.3 | 15E204a | /Applications/Xcode_15.3.app | | 15.2 | 15C500b | /Applications/Xcode_15.2.app | @@ -197,17 +195,17 @@ | Simulator - watchOS 10.4 | watchsimulator10.4 | 15.3 | | Simulator - watchOS 10.5 | watchsimulator10.5 | 15.4 | | Simulator - watchOS 11.0 | watchsimulator11.0 | 16.0 | -| Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | | visionOS 1.0 | xros1.0 | 15.2 | -| visionOS 1.1 | xros1.1 | 15.3 | +| Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | | Simulator - visionOS 1.1 | xrsimulator1.1 | 15.3 | -| visionOS 1.2 | xros1.2 | 15.4 | +| visionOS 1.1 | xros1.1 | 15.3 | | Simulator - visionOS 1.2 | xrsimulator1.2 | 15.4 | -| Simulator - visionOS 2.0 | xrsimulator2.0 | 16.0 | +| visionOS 1.2 | xros1.2 | 15.4 | | visionOS 2.0 | xros2.0 | 16.0 | +| Simulator - visionOS 2.0 | xrsimulator2.0 | 16.0 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | -| Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | +| Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | DriverKit 22.4 | driverkit22.4 | 14.3.1 | | DriverKit 23.0 | driverkit23.0 | 15.0.1 | | DriverKit 23.2 | driverkit23.2 | 15.1, 15.2 | @@ -248,7 +246,7 @@ | Android Emulator | 34.2.16 | | Android SDK Build-tools | 35.0.0<br>34.0.0<br>33.0.2 33.0.3 | | Android SDK Platforms | android-35 (rev 1)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | -| Android SDK Platform-Tools | 35.0.1 | +| Android SDK Platform-Tools | 35.0.2 | | Android Support Repository | 47.0.0 | | CMake | 3.22.1 | | Google Play services | 49 | From 1388aca8a3db0e31742043c64813c7556e60270c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 14 Aug 2024 10:58:14 +0000 Subject: [PATCH 3038/3485] Updating readme file for ubuntu20 version 20240811.1.1 (#10426) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2004-Readme.md | 60 +++++++++++++++--------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/images/ubuntu/Ubuntu2004-Readme.md b/images/ubuntu/Ubuntu2004-Readme.md index f55a4eff3667..51ee5ac9e3ce 100644 --- a/images/ubuntu/Ubuntu2004-Readme.md +++ b/images/ubuntu/Ubuntu2004-Readme.md @@ -6,8 +6,8 @@ *** # Ubuntu 20.04 - OS Version: 20.04.6 LTS -- Kernel Version: 5.15.0-1068-azure -- Image Version: 20240804.1.0 +- Kernel Version: 5.15.0-1070-azure +- Image Version: 20240811.1.0 - Systemd version: 245.4-4ubuntu3.23 ## Installed Software @@ -23,7 +23,7 @@ - GNU C++: 10.5.0 - GNU Fortran: 10.5.0 - Julia 1.10.4 -- Kotlin 2.0.0-release-341 +- Kotlin 2.0.10-release-540 - Mono 6.12.0.200 - MSBuild 16.10.1.31701 (Mono 6.12.0.200) - Node.js 18.20.4 @@ -35,7 +35,7 @@ ### Package Management - cpan 1.64 - Helm 3.15.3 -- Homebrew 4.3.12 +- Homebrew 4.3.14 - Miniconda 24.5.0 - Npm 10.7.0 - NuGet 6.6.1.2 @@ -43,7 +43,7 @@ - Pip3 20.0.2 - Pipx 1.6.0 - RubyGems 3.1.2 -- Vcpkg (build from commit fe1cde61e) +- Vcpkg (build from commit e590c2b30) - Yarn 1.22.22 #### Environment variables @@ -63,7 +63,7 @@ to accomplish this. ### Project Management - Ant 1.10.7 - Gradle 8.9 -- Lerna 8.1.7 +- Lerna 8.1.8 - Maven 3.8.8 - Sbt 1.10.1 @@ -105,29 +105,29 @@ to accomplish this. - Parcel 2.12.0 - PhantomJS 2.1.1 2.1.1 - Podman 3.4.2 -- Pulumi 3.127.0 +- Pulumi 3.128.0 - R 4.4.1 - Skopeo 1.5.0 - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 -- Terraform 1.9.3 +- Terraform 1.9.4 - yamllint 1.35.1 -- yq 4.44.2 +- yq 4.44.3 - zstd 1.5.6 ### CLI Tools - Alibaba Cloud CLI 3.0.174 -- AWS CLI 2.17.22 +- AWS CLI 2.17.27 - AWS CLI Session Manager Plugin 1.2.650.0 - AWS SAM CLI 1.121.0 -- Azure CLI 2.62.0 +- Azure CLI 2.63.0 - Azure CLI (azure-devops) 1.0.1 - GitHub CLI 2.54.0 -- Google Cloud CLI 486.0.0 -- Netlify CLI 17.33.5 +- Google Cloud CLI 487.0.0 +- Netlify CLI 17.34.0 - OpenShift CLI 4.15.19 - ORAS CLI 1.2.0 -- Vercel CLI 35.2.3 +- Vercel CLI 35.2.4 ### Java | Version | Environment Variable | @@ -152,9 +152,9 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Stack 3.1.1 ### Rust Tools -- Cargo 1.80.0 -- Rust 1.80.0 -- Rustdoc 1.80.0 +- Cargo 1.80.1 +- Rust 1.80.1 +- Rustdoc 1.80.1 - Rustup 1.27.1 #### Packages @@ -162,18 +162,18 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Cargo audit 0.20.0 - Cargo clippy 0.1.80 - Cargo outdated 0.15.0 -- Cbindgen 0.26.0 +- Cbindgen 0.27.0 - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 127.0.6533.88 -- ChromeDriver 127.0.6533.88 +- Google Chrome 127.0.6533.99 +- ChromeDriver 127.0.6533.99 - Chromium 127.0.6533.0 -- Microsoft Edge 127.0.2651.86 +- Microsoft Edge 127.0.2651.98 - Microsoft Edge WebDriver 127.0.2651.87 -- Selenium server 4.23.0 +- Selenium server 4.23.1 - Mozilla Firefox 128.0 -- Geckodriver 0.34.0 +- Geckodriver 0.35.0 #### Environment variables | Name | Value | @@ -185,14 +185,14 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ### .NET Tools - .NET Core SDK: 6.0.424, 7.0.410, 8.0.303 -- nbgv 3.6.139+a9e8765620 +- nbgv 3.6.141+d2035fb7be ### Databases - MongoDB 5.0.28 - sqlite3 3.31.1 #### PostgreSQL -- PostgreSQL 14.12 +- PostgreSQL 14.13 ``` User: postgres PostgreSQL service is disabled by default. @@ -216,8 +216,8 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Go - 1.20.14 -- 1.21.12 -- 1.22.5 +- 1.21.13 +- 1.22.6 #### Node.js - 16.20.2 @@ -249,7 +249,7 @@ Use the following command as a part of your job to start the service: 'sudo syst - PowerShell 7.4.4 #### PowerShell Modules -- Az: 11.3.1 +- Az: 12.1.0 - MarkdownPS: 1.10 - Microsoft.Graph: 2.21.1 - Pester: 5.6.1 @@ -315,7 +315,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | brotli | 1.0.7-6ubuntu0.1 | | bzip2 | 1.0.8-2 | | coreutils | 8.30-3ubuntu2 | -| curl | 7.68.0-1ubuntu2.22 | +| curl | 7.68.0-1ubuntu2.23 | | dbus | 1.12.16-2ubuntu2.3 | | dnsutils | 1:9.18.28-0ubuntu0.20.04.1 | | dpkg | 1.19.7ubuntu3.2 | @@ -338,7 +338,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | libc++-dev | 1:10.0-50\~exp1 | | libc++abi-dev | 1:10.0-50\~exp1 | | libc6-dev | 2.31-0ubuntu9.16 | -| libcurl4 | 7.68.0-1ubuntu2.22 | +| libcurl4 | 7.68.0-1ubuntu2.23 | | libgbm-dev | 21.2.6-0ubuntu0.1\~20.04.2 | | libgconf-2-4 | 3.2.6-6ubuntu1 | | libgsl-dev | 2.5+dfsg-6+deb10u1build0.20.04.1 | From eec55f72c9969c43ca5c5a75b5ad8973117c9e89 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 14 Aug 2024 10:59:08 +0000 Subject: [PATCH 3039/3485] Updating readme file for ubuntu22 version 20240811.1.1 (#10424) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2204-Readme.md | 62 +++++++++++++++--------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/images/ubuntu/Ubuntu2204-Readme.md b/images/ubuntu/Ubuntu2204-Readme.md index 045a7239e306..682f0f12c742 100644 --- a/images/ubuntu/Ubuntu2204-Readme.md +++ b/images/ubuntu/Ubuntu2204-Readme.md @@ -7,7 +7,7 @@ # Ubuntu 22.04 - OS Version: 22.04.4 LTS - Kernel Version: 6.5.0-1025-azure -- Image Version: 20240804.1.0 +- Image Version: 20240811.1.0 - Systemd version: 249.11-0ubuntu3.12 ## Installed Software @@ -21,7 +21,7 @@ - GNU C++: 10.5.0, 11.4.0, 12.3.0 - GNU Fortran: 10.5.0, 11.4.0, 12.3.0 - Julia 1.10.4 -- Kotlin 2.0.0-release-341 +- Kotlin 2.0.10-release-540 - Mono 6.12.0.200 - MSBuild 16.10.1.31701 (Mono 6.12.0.200) - Node.js 18.20.4 @@ -33,7 +33,7 @@ ### Package Management - cpan 1.64 - Helm 3.15.3 -- Homebrew 4.3.12 +- Homebrew 4.3.14 - Miniconda 24.5.0 - Npm 10.7.0 - NuGet 6.6.1.2 @@ -41,7 +41,7 @@ - Pip3 22.0.2 - Pipx 1.6.0 - RubyGems 3.3.5 -- Vcpkg (build from commit fe1cde61e) +- Vcpkg (build from commit e590c2b30) - Yarn 1.22.22 #### Environment variables @@ -61,7 +61,7 @@ to accomplish this. ### Project Management - Ant 1.10.12 - Gradle 8.9 -- Lerna 8.1.7 +- Lerna 8.1.8 - Maven 3.8.8 - Sbt 1.10.1 @@ -101,29 +101,29 @@ to accomplish this. - Packer 1.11.2 - Parcel 2.12.0 - Podman 3.4.4 -- Pulumi 3.127.0 +- Pulumi 3.128.0 - R 4.4.1 - Skopeo 1.4.1 - Sphinx Open Source Search Server 2.2.11 - SVN 1.14.1 -- Terraform 1.9.3 +- Terraform 1.9.4 - yamllint 1.35.1 -- yq 4.44.2 +- yq 4.44.3 - zstd 1.5.6 ### CLI Tools - Alibaba Cloud CLI 3.0.216 -- AWS CLI 2.17.22 +- AWS CLI 2.17.27 - AWS CLI Session Manager Plugin 1.2.650.0 - AWS SAM CLI 1.121.0 -- Azure CLI 2.62.0 +- Azure CLI 2.63.0 - Azure CLI (azure-devops) 1.0.1 - GitHub CLI 2.54.0 -- Google Cloud CLI 486.0.0 -- Netlify CLI 17.33.5 -- OpenShift CLI 4.16.5 +- Google Cloud CLI 487.0.0 +- Netlify CLI 17.34.0 +- OpenShift CLI 4.16.6 - ORAS CLI 1.2.0 -- Vercel CLI 35.2.3 +- Vercel CLI 35.2.4 ### Java | Version | Environment Variable | @@ -148,9 +148,9 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Stack 3.1.1 ### Rust Tools -- Cargo 1.80.0 -- Rust 1.80.0 -- Rustdoc 1.80.0 +- Cargo 1.80.1 +- Rust 1.80.1 +- Rustdoc 1.80.1 - Rustup 1.27.1 #### Packages @@ -158,18 +158,18 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Cargo audit 0.20.0 - Cargo clippy 0.1.80 - Cargo outdated 0.15.0 -- Cbindgen 0.26.0 +- Cbindgen 0.27.0 - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 127.0.6533.88 -- ChromeDriver 127.0.6533.88 +- Google Chrome 127.0.6533.99 +- ChromeDriver 127.0.6533.99 - Chromium 127.0.6533.0 -- Microsoft Edge 127.0.2651.86 +- Microsoft Edge 127.0.2651.98 - Microsoft Edge WebDriver 127.0.2651.87 -- Selenium server 4.23.0 -- Mozilla Firefox 128.0.3 -- Geckodriver 0.34.0 +- Selenium server 4.23.1 +- Mozilla Firefox 129.0 +- Geckodriver 0.35.0 #### Environment variables | Name | Value | @@ -181,13 +181,13 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ### .NET Tools - .NET Core SDK: 6.0.424, 7.0.410, 8.0.303 -- nbgv 3.6.139+a9e8765620 +- nbgv 3.6.141+d2035fb7be ### Databases - sqlite3 3.37.2 #### PostgreSQL -- PostgreSQL 14.12 +- PostgreSQL 14.13 ``` User: postgres PostgreSQL service is disabled by default. @@ -211,8 +211,8 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Go - 1.20.14 -- 1.21.12 -- 1.22.5 +- 1.21.13 +- 1.22.6 #### Node.js - 16.20.2 @@ -241,7 +241,7 @@ Use the following command as a part of your job to start the service: 'sudo syst - PowerShell 7.4.4 #### PowerShell Modules -- Az: 11.3.1 +- Az: 12.1.0 - MarkdownPS: 1.10 - Microsoft.Graph: 2.21.1 - Pester: 5.6.1 @@ -306,7 +306,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | brotli | 1.0.9-2build6 | | bzip2 | 1.0.8-5build1 | | coreutils | 8.32-4.1ubuntu1.2 | -| curl | 7.81.0-1ubuntu1.16 | +| curl | 7.81.0-1ubuntu1.17 | | dbus | 1.12.20-2ubuntu4.1 | | dnsutils | 1:9.18.28-0ubuntu0.22.04.1 | | dpkg | 1.21.1ubuntu2.3 | @@ -329,7 +329,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | libc++-dev | 1:14.0-55\~exp2 | | libc++abi-dev | 1:14.0-55\~exp2 | | libc6-dev | 2.35-0ubuntu3.8 | -| libcurl4 | 7.81.0-1ubuntu1.16 | +| libcurl4 | 7.81.0-1ubuntu1.17 | | libgbm-dev | 23.2.1-1ubuntu3.1\~22.04.2 | | libgconf-2-4 | 3.2.6-7ubuntu2 | | libgsl-dev | 2.7.1+dfsg-3 | From db2a58f0e3a2228e7da4fdab0799ff9255d250de Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 14 Aug 2024 11:05:02 +0000 Subject: [PATCH 3040/3485] Updating readme file for win22 version 20240811.1.1 (#10425) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/windows/Windows2022-Readme.md | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/images/windows/Windows2022-Readme.md b/images/windows/Windows2022-Readme.md index a3076149d50f..9a9453f952b9 100644 --- a/images/windows/Windows2022-Readme.md +++ b/images/windows/Windows2022-Readme.md @@ -5,7 +5,7 @@ *** # Windows Server 2022 - OS Version: 10.0.20348 Build 2582 -- Image Version: 20240807.2.0 +- Image Version: 20240811.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -30,11 +30,11 @@ - Helm 3.15.2 - Miniconda 24.5.0 (pre-installed on the image but not added to PATH) - NPM 10.7.0 -- NuGet 6.10.1.5 +- NuGet 6.10.2.8 - pip 24.2 (python 3.9) - Pipx 1.6.0 - RubyGems 3.2.33 -- Vcpkg (build from commit f5398d978) +- Vcpkg (build from commit e590c2b30) - Yarn 1.22.22 #### Environment variables @@ -92,7 +92,7 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.216 -- AWS CLI 2.17.25 +- AWS CLI 2.17.27 - AWS SAM CLI 1.121.0 - AWS Session Manager CLI 1.2.650.0 - Azure CLI 2.63.0 @@ -100,24 +100,24 @@ - GitHub CLI 2.54.0 ### Rust Tools -- Cargo 1.80.0 -- Rust 1.80.0 -- Rustdoc 1.80.0 +- Cargo 1.80.1 +- Rust 1.80.1 +- Rustdoc 1.80.1 - Rustup 1.27.1 #### Packages - bindgen 0.69.4 - cargo-audit 0.20.0 - cargo-outdated 0.15.0 -- cbindgen 0.26.0 +- cbindgen 0.27.0 - Clippy 0.1.80 - Rustfmt 1.7.0 ### Browsers and Drivers - Google Chrome 127.0.6533.100 - Chrome Driver 127.0.6533.99 -- Microsoft Edge 127.0.2651.86 -- Microsoft Edge Driver 127.0.2651.86 +- Microsoft Edge 127.0.2651.98 +- Microsoft Edge Driver 127.0.2651.98 - Mozilla Firefox 129.0 - Gecko Driver 0.35.0 - IE Driver 4.14.0.0 @@ -208,7 +208,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | 5.0.28.0 | MongoDB | Stopped | Disabled | ### Database tools -- Azure CosmosDb Emulator 2.14.18.0 +- Azure CosmosDb Emulator 2.14.19.0 - DacFx 162.3.566.1 - MySQL 8.0.39.0 - SQL OLEDB Driver 18.7.4.0 @@ -493,7 +493,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Microsoft.AspNetCore.App: 6.0.5, 6.0.26, 6.0.32, 7.0.5, 7.0.20, 8.0.7 - Microsoft.NETCore.App: 6.0.5, 6.0.26, 6.0.32, 7.0.5, 7.0.20, 8.0.7 - Microsoft.WindowsDesktop.App: 6.0.5, 6.0.26, 6.0.32, 7.0.5, 7.0.20, 8.0.7 -- nbgv 3.6.139+a9e8765620 +- nbgv 3.6.141+d2035fb7be ### PowerShell Tools - PowerShell 7.4.4 @@ -504,7 +504,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - AzureRM: 2.1.0 (Default), 6.13.1 - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.630 +- AWSPowershell: 4.1.632 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.10 - Microsoft.Graph: 2.21.1 From b8153b8d0136b9e905c6ae0a1cdfc85c14a5c947 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 14 Aug 2024 11:29:27 +0000 Subject: [PATCH 3041/3485] Updating readme file for win19 version 20240811.1.1 (#10427) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/windows/Windows2019-Readme.md | 65 ++++++++++++++-------------- 1 file changed, 32 insertions(+), 33 deletions(-) diff --git a/images/windows/Windows2019-Readme.md b/images/windows/Windows2019-Readme.md index 54d530795750..6c9136fcfd54 100644 --- a/images/windows/Windows2019-Readme.md +++ b/images/windows/Windows2019-Readme.md @@ -5,7 +5,7 @@ *** # Windows Server 2019 - OS Version: 10.0.17763 Build 6054 -- Image Version: 20240730.1.0 +- Image Version: 20240811.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -14,13 +14,13 @@ ### Language and Runtime - Bash 5.2.26(1)-release -- Go 1.21.12 +- Go 1.21.13 - Julia 1.10.4 -- Kotlin 2.0.0 +- Kotlin 2.0.10 - LLVM 18.1.8 - Node 18.20.3 - Perl 5.32.1 -- PHP 8.3.9 +- PHP 8.3.10 - Python 3.7.9 - Ruby 3.0.7p220 @@ -30,11 +30,11 @@ - Helm 3.15.2 - Miniconda 24.5.0 (pre-installed on the image but not added to PATH) - NPM 10.7.0 -- NuGet 6.10.1.5 +- NuGet 6.10.2.8 - pip 24.0 (python 3.7) - Pipx 1.2.1 - RubyGems 3.2.33 -- Vcpkg (build from commit 136a0d8b8) +- Vcpkg (build from commit e590c2b30) - Yarn 1.22.22 #### Environment variables @@ -52,21 +52,20 @@ ### Tools - 7zip 24.07 - aria2 1.37.0 -- azcopy 10.25.1 +- azcopy 10.26.0 - Bazel 7.2.1 - Bazelisk 1.19.0 - Bicep 0.29.47 - Cabal 3.12.1.0 -- CMake 3.30.1 +- CMake 3.30.2 - CodeQL Action Bundle 2.18.1 - Docker 26.1.3 -- Docker Compose v1 1.29.2 - Docker Compose v2 2.27.1 - Docker-wincred 0.8.2 - ghc 9.10.1 - Git 2.46.0.windows.1 - Git LFS 3.5.1 -- Google Cloud CLI 485.0.0 +- Google Cloud CLI 487.0.0 - ImageMagick 7.1.1-36 - InnoSetup 6.3.3 - jq 1.7.1 @@ -81,7 +80,7 @@ - OpenSSL 1.1.1w - Packer 1.11.0 - Parcel 2.12.0 -- Pulumi 3.127.0 +- Pulumi 3.128.0 - R 4.4.1 - Service Fabric SDK 9.1.1436.9590 - Stack 3.1.1 @@ -95,35 +94,35 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.216 -- AWS CLI 2.17.19 -- AWS SAM CLI 1.120.0 +- AWS CLI 2.17.27 +- AWS SAM CLI 1.121.0 - AWS Session Manager CLI 1.2.650.0 -- Azure CLI 2.62.0 +- Azure CLI 2.63.0 - Azure DevOps CLI extension 1.0.1 - Cloud Foundry CLI 8.7.11 -- GitHub CLI 2.53.0 +- GitHub CLI 2.54.0 ### Rust Tools -- Cargo 1.80.0 -- Rust 1.80.0 -- Rustdoc 1.80.0 +- Cargo 1.80.1 +- Rust 1.80.1 +- Rustdoc 1.80.1 - Rustup 1.27.1 #### Packages - bindgen 0.69.4 - cargo-audit 0.20.0 - cargo-outdated 0.15.0 -- cbindgen 0.26.0 +- cbindgen 0.27.0 - Clippy 0.1.80 - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 127.0.6533.73 -- Chrome Driver 127.0.6533.72 -- Microsoft Edge 127.0.2651.74 -- Microsoft Edge Driver 127.0.2651.74 -- Mozilla Firefox 128.0.3 -- Gecko Driver 0.34.0 +- Google Chrome 127.0.6533.100 +- Chrome Driver 127.0.6533.99 +- Microsoft Edge 127.0.2651.98 +- Microsoft Edge Driver 127.0.2651.98 +- Mozilla Firefox 129.0 +- Gecko Driver 0.35.0 - IE Driver 4.14.0.0 - Selenium server 4.23.0 @@ -167,8 +166,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Go - 1.20.14 -- 1.21.12 -- 1.22.5 +- 1.21.13 +- 1.22.6 #### Node.js - 16.20.2 @@ -216,7 +215,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | 5.0.28.0 | MongoDB | Stopped | Disabled | ### Database tools -- Azure CosmosDb Emulator 2.14.18.0 +- Azure CosmosDb Emulator 2.14.19.0 - DacFx 162.3.566.1 - MySQL 5.7.44.0 - SQL OLEDB Driver 18.7.4.0 @@ -498,21 +497,21 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Microsoft.AspNetCore.App: 6.0.5, 6.0.26, 6.0.32, 7.0.5, 7.0.20, 8.0.6, 8.0.7 - Microsoft.NETCore.App: 6.0.5, 6.0.26, 6.0.32, 7.0.5, 7.0.20, 8.0.6, 8.0.7 - Microsoft.WindowsDesktop.App: 6.0.5, 6.0.26, 6.0.32, 7.0.5, 7.0.20, 8.0.6, 8.0.7 -- nbgv 3.6.139+a9e8765620 +- nbgv 3.6.141+d2035fb7be ### PowerShell Tools - PowerShell 7.4.4 #### Powershell Modules -- Az: 11.3.1 +- Az: 12.1.0 - Azure: 2.1.0 (Default), 5.3.0 - AzureRM: 2.1.0 (Default), 6.13.1 - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.624 +- AWSPowershell: 4.1.632 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.10 -- Microsoft.Graph: 2.21.0 +- Microsoft.Graph: 2.21.1 - Pester: 3.4.0, 5.6.1 - PowerShellGet: 1.0.0.1, 2.2.5 - PSScriptAnalyzer: 1.22.0 @@ -532,7 +531,7 @@ All other versions are saved but not installed. | Android Emulator | 34.2.16 | | Android SDK Build-tools | 35.0.0<br>34.0.0<br>33.0.0 33.0.1 33.0.2 33.0.3<br>32.0.0<br>31.0.0<br>30.0.2 | | Android SDK Platforms | android-35 (rev 1)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3) | -| Android SDK Platform-Tools | 35.0.1 | +| Android SDK Platform-Tools | 35.0.2 | | Android Support Repository | 47.0.0 | | CMake | 3.10.2<br>3.18.1<br>3.22.1 | | Google APIs | addon-google_apis-google-21<br>addon-google_apis-google-22<br>addon-google_apis-google-23<br>addon-google_apis-google-24 | From 9bf0388ef22e477ae7a0de0aac9507696c01657c Mon Sep 17 00:00:00 2001 From: sarathrajsrinivasan <159180023+sarathrajsrinivasan@users.noreply.github.com> Date: Wed, 14 Aug 2024 12:03:24 -0700 Subject: [PATCH 3042/3485] [macOS] Add Xcode 16.1 Beta for macOS14 (#10439) --- images/macos/toolsets/toolset-14.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/macos/toolsets/toolset-14.json b/images/macos/toolsets/toolset-14.json index 364d19d0104f..dcc3833e4975 100644 --- a/images/macos/toolsets/toolset-14.json +++ b/images/macos/toolsets/toolset-14.json @@ -3,7 +3,7 @@ "default": "15.4", "x64": { "versions": [ - { "link": "16_beta_5", "version": "16.0.0-Beta.5+16A5221g", "symlinks": ["16.0"], "install_runtimes": "false", "sha256": "00b44d41fcfcacb613575871ceff5c1c07de99b7501f8c48170af002763cd517"}, + { "link": "16.1_beta", "version": "16.1.0-Beta+16B5001e", "symlinks": ["16.1"], "install_runtimes": "true", "sha256": "8848aacb32bdc0abbd7e14e4b712e07c98f4b6e5a23a8d77db03ab21dcb3c777"}, { "link": "15.4", "version": "15.4.0+15F31d", "install_runtimes": "true", "sha256": "82d3d61804ff3f4c7c82085e91dc701037ddaa770e542848b2477e22f4e8aa7a"}, { "link": "15.3", "version": "15.3.0+15E204a", "install_runtimes": "true", "sha256": "f13f6a2e2df432c3008e394640b8549a18c285acd7fd148d6c4bac8c3a5af234"}, { "link": "15.2", "version": "15.2.0+15C500b", "install_runtimes": "true", "sha256": "04E93680C6DDBEC84666531BE412DE778AFC8EAC6AB2037F4C2BE7290818B59B"}, @@ -14,7 +14,7 @@ }, "arm64":{ "versions": [ - { "link": "16_beta_5", "version": "16.0.0-Beta.5+16A5221g", "symlinks": ["16.0"], "install_runtimes": "true", "sha256": "00b44d41fcfcacb613575871ceff5c1c07de99b7501f8c48170af002763cd517"}, + { "link": "16.1_beta", "version": "16.1.0-Beta+16B5001e", "symlinks": ["16.1"], "install_runtimes": "true", "sha256": "8848aacb32bdc0abbd7e14e4b712e07c98f4b6e5a23a8d77db03ab21dcb3c777"}, { "link": "15.4", "version": "15.4.0+15F31d", "install_runtimes": "true", "sha256": "82d3d61804ff3f4c7c82085e91dc701037ddaa770e542848b2477e22f4e8aa7a"}, { "link": "15.3", "version": "15.3.0+15E204a", "install_runtimes": "true", "sha256": "f13f6a2e2df432c3008e394640b8549a18c285acd7fd148d6c4bac8c3a5af234"}, { "link": "15.2", "version": "15.2.0+15C500b", "install_runtimes": "true", "sha256": "04E93680C6DDBEC84666531BE412DE778AFC8EAC6AB2037F4C2BE7290818B59B"}, From 197b995b2d7d0f12ac134971b90a51c46c4d0120 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 15 Aug 2024 06:01:37 +0000 Subject: [PATCH 3043/3485] Updating readme file for macos-14 version 20240811.3 (#10431) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-14-Readme.md | 54 ++++++++++++++++----------------- 1 file changed, 26 insertions(+), 28 deletions(-) diff --git a/images/macos/macos-14-Readme.md b/images/macos/macos-14-Readme.md index 7c414dcd25f4..074b0aca01f2 100644 --- a/images/macos/macos-14-Readme.md +++ b/images/macos/macos-14-Readme.md @@ -3,9 +3,9 @@ | [[macOS] GCC 11 will be removed from all macOS images on August 12](https://github.com/actions/runner-images/issues/10213) | *** # macOS 14 -- OS Version: macOS 14.6 (23G80) +- OS Version: macOS 14.6.1 (23G93) - Kernel Version: Darwin 23.6.0 -- Image Version: 20240804.1 +- Image Version: 20240811.3 ## Installed Software @@ -14,19 +14,17 @@ - Bash 3.2.57(1)-release - Clang/LLVM 14.0.3 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` -- GCC 11 (Homebrew GCC 11.4.0) - available by `gcc-11` alias - GCC 12 (Homebrew GCC 12.4.0) - available by `gcc-12` alias - GCC 13 (Homebrew GCC 13.3.0) - available by `gcc-13` alias - GCC 14 (Homebrew GCC 14.1.0_2) - available by `gcc-14` alias -- GNU Fortran 11 (Homebrew GCC 11.4.0) - available by `gfortran-11` alias - GNU Fortran 12 (Homebrew GCC 12.4.0) - available by `gfortran-12` alias - GNU Fortran 13 (Homebrew GCC 13.3.0) - available by `gfortran-13` alias - GNU Fortran 14 (Homebrew GCC 14.1.0_2) - available by `gfortran-14` alias -- Kotlin 2.0.0-release-341 +- Kotlin 2.0.10-release-540 - Mono 6.12.0.188 - Node.js 20.16.0 - Perl 5.38.2 -- PHP 8.3.9 +- PHP 8.3.10 - Python3 3.12.4 - Ruby 3.0.7p220 @@ -35,7 +33,7 @@ - Carthage 0.39.1 - CocoaPods 1.15.2 - Composer 2.7.7 -- Homebrew 4.3.12 +- Homebrew 4.3.14 - NPM 10.8.1 - NuGet 6.3.1.1 - Pip3 24.2 (python 3.12) @@ -66,21 +64,21 @@ - OpenSSL 1.1.1w 11 Sep 2023 - Packer 1.9.4 - pkg-config 0.29.2 -- yq 4.44.2 +- yq 4.44.3 - zstd 1.5.6 ### Tools -- AWS CLI 2.17.22 +- AWS CLI 2.17.27 - AWS SAM CLI 1.121.0 - AWS Session Manager CLI 1.2.650.0 -- Azure CLI 2.62.0 +- Azure CLI 2.63.0 - Azure CLI (azure-devops) 1.0.1 - Bicep CLI 0.29.47 - Cmake 3.30.2 - CodeQL Action Bundle 2.18.1 - Fastlane 2.222.0 - SwiftFormat 0.54.3 -- Xcbeautify 2.7.0 +- Xcbeautify 2.10.0 - Xcode Command Line Tools 15.3.0.0.1.1708646388 - Xcodes 1.5.0 @@ -90,12 +88,12 @@ ### Browsers - Safari 17.6 (19618.3.11.11.5) - SafariDriver 17.6 (19618.3.11.11.5) -- Google Chrome 127.0.6533.89 -- Google Chrome for Testing 127.0.6533.88 -- ChromeDriver 127.0.6533.88 -- Microsoft Edge 127.0.2651.86 -- Microsoft Edge WebDriver 127.0.2651.87 -- Mozilla Firefox 128.0.3 +- Google Chrome 127.0.6533.100 +- Google Chrome for Testing 127.0.6533.99 +- ChromeDriver 127.0.6533.99 +- Microsoft Edge 127.0.2651.98 +- Microsoft Edge WebDriver 127.0.2651.97 +- Mozilla Firefox 129.0 - geckodriver 0.34.0 - Selenium server 4.23.0 @@ -132,13 +130,13 @@ #### Go - 1.20.14 -- 1.21.12 -- 1.22.5 +- 1.21.13 +- 1.22.6 ### Rust Tools -- Cargo 1.80.0 -- Rust 1.80.0 -- Rustdoc 1.80.0 +- Cargo 1.80.1 +- Rust 1.80.1 +- Rustdoc 1.80.1 - Rustup 1.27.1 #### Packages @@ -149,14 +147,14 @@ - PowerShell 7.4.4 #### PowerShell Modules -- Az: 12.1.0 +- Az: 12.2.0 - Pester: 5.6.1 - PSScriptAnalyzer: 1.22.0 ### Xcode | Version | Build | Path | | -------------- | -------- | --------------------------------- | -| 16.0 (beta) | 16A5211f | /Applications/Xcode_16_beta_4.app | +| 16.0 (beta) | 16A5221g | /Applications/Xcode_16_beta_5.app | | 15.4 (default) | 15F31d | /Applications/Xcode_15.4.app | | 15.3 | 15E204a | /Applications/Xcode_15.3.app | | 15.2 | 15C500b | /Applications/Xcode_15.2.app | @@ -209,12 +207,12 @@ | Simulator - watchOS 10.4 | watchsimulator10.4 | 15.3 | | Simulator - watchOS 10.5 | watchsimulator10.5 | 15.4 | | Simulator - watchOS 11.0 | watchsimulator11.0 | 16.0 | -| visionOS 1.0 | xros1.0 | 15.2 | | Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | -| Simulator - visionOS 1.1 | xrsimulator1.1 | 15.3 | +| visionOS 1.0 | xros1.0 | 15.2 | | visionOS 1.1 | xros1.1 | 15.3 | -| Simulator - visionOS 1.2 | xrsimulator1.2 | 15.4 | +| Simulator - visionOS 1.1 | xrsimulator1.1 | 15.3 | | visionOS 1.2 | xros1.2 | 15.4 | +| Simulator - visionOS 1.2 | xrsimulator1.2 | 15.4 | | Simulator - visionOS 2.0 | xrsimulator2.0 | 16.0 | | visionOS 2.0 | xros2.0 | 16.0 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | @@ -253,7 +251,7 @@ | Android Emulator | 34.2.16 | | Android SDK Build-tools | 35.0.0<br>34.0.0<br>33.0.2 33.0.3 | | Android SDK Platforms | android-35 (rev 1)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | -| Android SDK Platform-Tools | 35.0.1 | +| Android SDK Platform-Tools | 35.0.2 | | Android Support Repository | 47.0.0 | | CMake | 3.22.1 | | Google Play services | 49 | From 4e6e715037c7824b785bfb8eb09f1eb59bdbf936 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 15 Aug 2024 06:41:17 +0000 Subject: [PATCH 3044/3485] Updating readme file for macos-12 version 20240811.1 (#10429) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-12-Readme.md | 111 ++++++++++++++++---------------- 1 file changed, 54 insertions(+), 57 deletions(-) diff --git a/images/macos/macos-12-Readme.md b/images/macos/macos-12-Readme.md index b3bdada88dc4..68c07af2e941 100644 --- a/images/macos/macos-12-Readme.md +++ b/images/macos/macos-12-Readme.md @@ -1,12 +1,11 @@ | Announcements | |-| | [[macOS] GCC 11 will be removed from all macOS images on August 12](https://github.com/actions/runner-images/issues/10213) | -| [[macOS] Default Xcode on macOS 14 Sonoma will be set to Xcode 15.4 on July, 22](https://github.com/actions/runner-images/issues/10121) | *** # macOS 12 -- OS Version: macOS 12.7.5 (21H1222) +- OS Version: macOS 12.7.6 (21H1320) - Kernel Version: Darwin 21.6.0 -- Image Version: 20240721.1 +- Image Version: 20240811.1 ## Installed Software @@ -15,43 +14,41 @@ - Bash 3.2.57(1)-release - Clang/LLVM 14.0.0 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` -- GCC 11 (Homebrew GCC 11.4.0) - available by `gcc-11` alias - GCC 12 (Homebrew GCC 12.4.0) - available by `gcc-12` alias - GCC 13 (Homebrew GCC 13.3.0) - available by `gcc-13` alias - GCC 14 (Homebrew GCC 14.1.0_2) - available by `gcc-14` alias -- GNU Fortran 11 (Homebrew GCC 11.4.0) - available by `gfortran-11` alias - GNU Fortran 12 (Homebrew GCC 12.4.0) - available by `gfortran-12` alias - GNU Fortran 13 (Homebrew GCC 13.3.0) - available by `gfortran-13` alias - GNU Fortran 14 (Homebrew GCC 14.1.0_2) - available by `gfortran-14` alias - Julia 1.10.4 -- Kotlin 2.0.0-release-341 -- Go 1.21.12 +- Kotlin 2.0.10-release-540 +- Go 1.21.13 - Mono 6.12.0.188 - Node.js 18.20.4 - MSBuild 16.10.1.51301 (Mono 6.12.0.188) - NVM 0.39.7 -- NVM - Cached node versions: 16.20.2, 18.20.4, 20.15.1 +- NVM - Cached node versions: 16.20.2, 18.20.4, 20.16.0 - Perl 5.38.2 -- PHP 8.3.9 +- PHP 8.3.10 - Python 2.7.18 - Python3 3.12.4 - R 4.4.1 - Ruby 3.0.7p220 ### Package Management -- Bundler 2.5.16 +- Bundler 2.5.17 - Carthage 0.39.1 - CocoaPods 1.15.2 - Composer 2.7.7 -- Homebrew 4.3.10 +- Homebrew 4.3.14 - Miniconda 24.5.0 - NPM 10.7.0 - NuGet 6.3.1.1 - Pip 20.3.4 (python 2.7) -- Pip3 24.1.2 (python 3.12) +- Pip3 24.2 (python 3.12) - Pipx 1.6.0 -- RubyGems 3.5.16 -- Vcpkg 2024 (build from commit 821100d96) +- RubyGems 3.5.17 +- Vcpkg 2024 (build from commit e590c2b30) - Yarn 1.22.22 #### Environment variables @@ -69,52 +66,52 @@ ### Utilities - 7-Zip 17.05 - aria2 1.37.0 -- azcopy 10.25.1 +- azcopy 10.26.0 - bazel 7.2.1 - bazelisk 1.20.0 - bsdtar 3.5.1 - available by 'tar' alias -- Curl 8.8.0 -- Git 2.45.2 +- Curl 8.9.1 +- Git 2.46.0 - Git LFS 3.5.1 -- GitHub CLI 2.53.0 +- GitHub CLI 2.54.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.24.5 - gpg (GnuPG) 2.4.5 -- ImageMagick 7.1.1-35 +- ImageMagick 7.1.1-36 - jq 1.7.1 - mongo 5.0.28 - mongod 5.0.28 - OpenSSL 1.1.1w 11 Sep 2023 - Packer 1.9.4 - pkg-config 0.29.2 -- PostgreSQL 14.12 (Homebrew) -- psql (PostgreSQL) 14.12 (Homebrew) +- PostgreSQL 14.13 (Homebrew) +- psql (PostgreSQL) 14.13 (Homebrew) - Sox 14.4.2 - Subversion (SVN) 1.14.3 - Switchaudio-osx 1.2.2 - Vagrant 2.4.1 - VirtualBox 6.1.38r153438 -- yq 4.44.2 +- yq 4.44.3 - zstd 1.5.6 ### Tools - App Center CLI 3.0.1 -- AWS CLI 2.17.14 -- AWS SAM CLI 1.120.0 +- AWS CLI 2.17.27 +- AWS SAM CLI 1.121.0 - AWS Session Manager CLI 1.2.650.0 -- Azure CLI 2.62.0 +- Azure CLI 2.63.0 - Azure CLI (azure-devops) 1.0.1 -- Bicep CLI 0.29.45 +- Bicep CLI 0.29.47 - Cabal 3.10.3.0 -- Cmake 3.30.1 -- CodeQL Action Bundle 2.18.0 -- Colima 0.6.10 -- Fastlane 2.221.1 +- Cmake 3.30.2 +- CodeQL Action Bundle 2.18.1 +- Colima 0.7.1 +- Fastlane 2.222.0 - GHC 9.10.1 - GHCup 0.1.30.0 - Jazzy 0.15.1 -- Stack 2.15.7 -- SwiftFormat 0.54.1 +- Stack 3.1.1 +- SwiftFormat 0.54.3 - Swig 4.2.1 - Xcbeautify 1.6.0 - Xcode Command Line Tools 14.2.0.0.1.1668646533 @@ -125,14 +122,14 @@ - Yamllint 1.35.1 ### Browsers -- Safari 17.5 (17618.2.12.111.5) -- SafariDriver 17.5 (17618.2.12.111.5) -- Google Chrome 126.0.6478.183 -- Google Chrome for Testing 126.0.6478.182 -- ChromeDriver 126.0.6478.182 -- Microsoft Edge 126.0.2592.113 -- Microsoft Edge WebDriver 126.0.2592.102 -- Mozilla Firefox 128.0 +- Safari 17.6 (17618.3.11.11.7) +- SafariDriver 17.6 (17618.3.11.11.7) +- Google Chrome 127.0.6533.100 +- Google Chrome for Testing 127.0.6533.99 +- ChromeDriver 127.0.6533.99 +- Microsoft Edge 127.0.2651.98 +- Microsoft Edge WebDriver 127.0.2651.97 +- Mozilla Firefox 129.0 - geckodriver 0.34.0 - Selenium server 4.23.0 @@ -144,12 +141,12 @@ | GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | ### Java -| Version | Environment Variable | -| ------------------- | -------------------- | -| 8.0.422+5 (default) | JAVA_HOME_8_X64 | -| 11.0.24+8 | JAVA_HOME_11_X64 | -| 17.0.12+7 | JAVA_HOME_17_X64 | -| 21.0.4+7.0 | JAVA_HOME_21_X64 | +| Version | Environment Variable | +| --------------------- | -------------------- | +| 8.0.422+5.1 (default) | JAVA_HOME_8_X64 | +| 11.0.24+8 | JAVA_HOME_11_X64 | +| 17.0.12+7 | JAVA_HOME_17_X64 | +| 21.0.4+7.0 | JAVA_HOME_21_X64 | ### Cached Tools @@ -175,32 +172,32 @@ #### Node.js - 16.20.2 - 18.20.4 -- 20.15.1 +- 20.16.0 #### Go - 1.20.14 -- 1.21.12 -- 1.22.5 +- 1.21.13 +- 1.22.6 ### Rust Tools -- Cargo 1.79.0 -- Rust 1.79.0 -- Rustdoc 1.79.0 +- Cargo 1.80.1 +- Rust 1.80.1 +- Rustdoc 1.80.1 - Rustup 1.27.1 #### Packages - Bindgen 0.69.4 - Cargo-audit 0.20.0 - Cargo-outdated 0.15.0 -- Cbindgen 0.26.0 -- Clippy 0.1.79 +- Cbindgen 0.27.0 +- Clippy 0.1.80 - Rustfmt 1.7.0-stable ### PowerShell Tools -- PowerShell 7.4.3 +- PowerShell 7.4.4 #### PowerShell Modules -- Az: 12.1.0 +- Az: 12.2.0 - MarkdownPS: 1.10 - Pester: 5.6.1 - PSScriptAnalyzer: 1.22.0 @@ -340,7 +337,7 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" | Android Emulator | 34.2.16 | | Android SDK Build-tools | 35.0.0<br>34.0.0<br>33.0.0 33.0.1 33.0.2 33.0.3<br>32.0.0<br>31.0.0 | | Android SDK Platforms | android-35 (rev 1)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1) | -| Android SDK Platform-Tools | 35.0.1 | +| Android SDK Platform-Tools | 35.0.2 | | Android Support Repository | 47.0.0 | | CMake | 3.18.1<br>3.22.1 | | Google Play services | 49 | From 59a0b3727b675f4d29713127bca7726492d7a085 Mon Sep 17 00:00:00 2001 From: kishorekumar-anchala <168699259+kishorekumar-anchala@users.noreply.github.com> Date: Fri, 16 Aug 2024 16:06:47 +0530 Subject: [PATCH 3045/3485] Toolcache Android NDK versions <=25 will be removed from images (#10440) --- images/ubuntu/toolsets/toolset-2004.json | 2 +- images/ubuntu/toolsets/toolset-2204.json | 2 +- images/ubuntu/toolsets/toolset-2404.json | 2 +- images/windows/toolsets/toolset-2019.json | 2 +- images/windows/toolsets/toolset-2022.json | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/images/ubuntu/toolsets/toolset-2004.json b/images/ubuntu/toolsets/toolset-2004.json index dcc45615b880..c2896a2987f4 100644 --- a/images/ubuntu/toolsets/toolset-2004.json +++ b/images/ubuntu/toolsets/toolset-2004.json @@ -94,7 +94,7 @@ "ndk": { "default": "27", "versions": [ - "24", "25", "26", "27" + "26", "27" ] } }, diff --git a/images/ubuntu/toolsets/toolset-2204.json b/images/ubuntu/toolsets/toolset-2204.json index 23d46c139a51..1f9b04eb6aed 100644 --- a/images/ubuntu/toolsets/toolset-2204.json +++ b/images/ubuntu/toolsets/toolset-2204.json @@ -91,7 +91,7 @@ "ndk": { "default": "27", "versions": [ - "24", "25", "26", "27" + "26", "27" ] } }, diff --git a/images/ubuntu/toolsets/toolset-2404.json b/images/ubuntu/toolsets/toolset-2404.json index fe44a35be423..e3a11333e598 100644 --- a/images/ubuntu/toolsets/toolset-2404.json +++ b/images/ubuntu/toolsets/toolset-2404.json @@ -81,7 +81,7 @@ "ndk": { "default": "27", "versions": [ - "24", "25", "26", "27" + "26", "27" ] } }, diff --git a/images/windows/toolsets/toolset-2019.json b/images/windows/toolsets/toolset-2019.json index 3042f592785b..ff58fa005d97 100644 --- a/images/windows/toolsets/toolset-2019.json +++ b/images/windows/toolsets/toolset-2019.json @@ -154,7 +154,7 @@ "ndk": { "default": "27", "versions": [ - "24", "25", "26" , "27" + "26" , "27" ] } }, diff --git a/images/windows/toolsets/toolset-2022.json b/images/windows/toolsets/toolset-2022.json index 44908044dbda..0832fbbedff3 100644 --- a/images/windows/toolsets/toolset-2022.json +++ b/images/windows/toolsets/toolset-2022.json @@ -148,7 +148,7 @@ "ndk": { "default": "27", "versions": [ - "24", "25", "26", "27" + "26", "27" ] } }, From c634b8cd6734e7f5821ac33d2ebb4e16d4e55522 Mon Sep 17 00:00:00 2001 From: sarathrajsrinivasan <159180023+sarathrajsrinivasan@users.noreply.github.com> Date: Mon, 19 Aug 2024 06:57:44 -0700 Subject: [PATCH 3046/3485] [macOS] Add parallels kernel extension to macOS13 and macOS14 (#10238) [macOS] Add parallels kernel extension to macOS13 and macOS14 --- .../macos/scripts/build/configure-system.sh | 3 +- .../scripts/build/install-common-utils.sh | 38 +++++++++++++++---- .../docs-gen/Generate-SoftwareReport.ps1 | 8 +++- ...confirm-identified-developers-macos13.scpt | 34 +++++++++++++++++ ...confirm-identified-developers-macos14.scpt | 34 +++++++++++++++++ images/macos/templates/macOS-13.anka.pkr.hcl | 2 +- images/macos/templates/macOS-14.anka.pkr.hcl | 2 +- images/macos/toolsets/toolset-13.json | 2 +- images/macos/toolsets/toolset-14.json | 2 +- 9 files changed, 111 insertions(+), 14 deletions(-) create mode 100644 images/macos/scripts/helpers/confirm-identified-developers-macos13.scpt create mode 100644 images/macos/scripts/helpers/confirm-identified-developers-macos14.scpt diff --git a/images/macos/scripts/build/configure-system.sh b/images/macos/scripts/build/configure-system.sh index 32d64367b5d1..12545c7b4207 100644 --- a/images/macos/scripts/build/configure-system.sh +++ b/images/macos/scripts/build/configure-system.sh @@ -11,7 +11,8 @@ close_finder_window # Remove Parallels Desktop # https://github.com/actions/runner-images/issues/6105 -if is_Monterey; then +# https://github.com/actions/runner-images/issues/10143 +if is_Monterey || is_SonomaX64 || is_VenturaX64; then brew uninstall parallels fi diff --git a/images/macos/scripts/build/install-common-utils.sh b/images/macos/scripts/build/install-common-utils.sh index cd0eab214ee2..46e0fb01fdee 100644 --- a/images/macos/scripts/build/install-common-utils.sh +++ b/images/macos/scripts/build/install-common-utils.sh @@ -30,24 +30,38 @@ for package in $cask_packages; do virtualbox_cask_path=$(download_with_retry "https://raw.githubusercontent.com/Homebrew/homebrew-cask/aa3c55951fc9d687acce43e5c0338f42c1ddff7b/Casks/virtualbox.rb") brew install $virtualbox_cask_path else - brew install --cask $package + if is_Arm64 && [[ $package == "parallels" ]]; then + echo "Parallels installation is skipped for arm64 architecture" + else + brew install --cask $package + fi fi done # Load "Parallels International GmbH" -if is_Monterey; then +if is_Monterey || is_SonomaX64 || is_VenturaX64; then sudo kextload /Applications/Parallels\ Desktop.app/Contents/Library/Extensions/10.9/prl_hypervisor.kext || true fi -# Execute AppleScript to change security preferences +# Execute AppleScript to change security preferences for macOS12, macOS13 and macOS14 # System Preferences -> Security & Privacy -> General -> Unlock -> Allow -> Not now -if is_Monterey; then +if is_Monterey || is_SonomaX64 || is_VenturaX64; then for retry in {4..0}; do echo "Executing AppleScript to change security preferences. Retries left: $retry" { set -e osascript -e 'tell application "System Events" to get application processes where visible is true' - osascript $HOME/utils/confirm-identified-developers.scpt $USER_PASSWORD + if is_Monterey; then + osascript $HOME/utils/confirm-identified-developers.scpt $USER_PASSWORD + fi + + if is_VenturaX64; then + osascript $HOME/utils/confirm-identified-developers-macos13.scpt $USER_PASSWORD + fi + + if is_SonomaX64; then + osascript $HOME/utils/confirm-identified-developers-macos14.scpt $USER_PASSWORD + fi } && break if [[ $retry -eq 0 ]]; then @@ -61,9 +75,17 @@ if is_Monterey; then fi # Validate "Parallels International GmbH" kext -if is_Monterey; then - echo "Closing System Preferences window if it is still opened" - killall "System Preferences" || true +if is_Monterey || is_SonomaX64 || is_VenturaX64; then + + if is_Monterey; then + echo "Closing System Preferences window if it is still opened" + killall "System Preferences" || true + fi + + if is_SonomaX64 || is_VenturaX64; then + echo "Closing System Settings window if it is still opened" + killall "System Settings" || true + fi echo "Checking parallels kexts" dbName="/var/db/SystemPolicyConfiguration/KextPolicy" diff --git a/images/macos/scripts/docs-gen/Generate-SoftwareReport.ps1 b/images/macos/scripts/docs-gen/Generate-SoftwareReport.ps1 index 0effe1e54379..ff3bb0118969 100644 --- a/images/macos/scripts/docs-gen/Generate-SoftwareReport.ps1 +++ b/images/macos/scripts/docs-gen/Generate-SoftwareReport.ps1 @@ -290,7 +290,13 @@ if ($os.IsMonterey) { $miscellaneous.AddToolVersion("Zlib", $(Get-ZlibVersion)) } -if ($os.IsMonterey) { +if ($os.IsSonomaX64 -or $os.IsVenturaX64) { + $miscellaneous = $installedSoftware.AddHeader("Miscellaneous") +} +if ($os.IsMonterey -or $os.IsSonomaX64 -or $os.IsVenturaX64) { + + Write-Host "Adding environment variables for parallels" + $miscellaneousEnv = $miscellaneous.AddHeader("Environment variables") $miscellaneousEnv.AddTable($(Build-MiscellaneousEnvironmentTable)) diff --git a/images/macos/scripts/helpers/confirm-identified-developers-macos13.scpt b/images/macos/scripts/helpers/confirm-identified-developers-macos13.scpt new file mode 100644 index 000000000000..6ab83514103b --- /dev/null +++ b/images/macos/scripts/helpers/confirm-identified-developers-macos13.scpt @@ -0,0 +1,34 @@ +# This AppleScript clicks "Allow" for "System Software from developer "Parallels International GmbH" +# Steps: +# - Open System Settings -> Privacy & Security +# - Click 'Allow' for 'System Software from developer "Parallels International GmbH' +# - Enter password for runner + +on run argv + set userpassword to item 1 of argv + + tell application "System Settings" + activate + delay 5 + end tell + + tell application "System Events" + tell process "System Settings" + set frontmost to true + repeat until exists window 1 + delay 2 + end repeat + + tell splitter group 1 of group 1 of window 1 + select row 20 of outline 1 of scroll area 1 of group 1 + delay 5 + click UI Element 2 of group 4 of scroll area 1 of group 1 of group 2 + delay 5 + keystroke userpassword + delay 5 + keystroke return + delay 5 + end tell + end tell + end tell +end run diff --git a/images/macos/scripts/helpers/confirm-identified-developers-macos14.scpt b/images/macos/scripts/helpers/confirm-identified-developers-macos14.scpt new file mode 100644 index 000000000000..4c192335a30d --- /dev/null +++ b/images/macos/scripts/helpers/confirm-identified-developers-macos14.scpt @@ -0,0 +1,34 @@ +# This AppleScript clicks "Allow" for "System Software from developer "Parallels International GmbH" +# Steps: +# - Open System Settings -> Privacy & Security +# - Click 'Allow' for 'System Software from developer "Parallels International GmbH' +# - Enter password for runner + +on run argv + set userpassword to item 1 of argv + + tell application "System Settings" + activate + delay 5 + end tell + + tell application "System Events" + tell process "System Settings" + set frontmost to true + repeat until exists window 1 + delay 2 + end repeat + + tell splitter group 1 of group 1 of window 1 + select row 18 of outline 1 of scroll area 1 of group 1 + delay 5 + click UI Element 2 of group 5 of scroll area 1 of group 1 of group 2 + delay 5 + keystroke userpassword + delay 5 + keystroke return + delay 5 + end tell + end tell + end tell +end run diff --git a/images/macos/templates/macOS-13.anka.pkr.hcl b/images/macos/templates/macOS-13.anka.pkr.hcl index 7d003d3ec115..c3587434a4c2 100644 --- a/images/macos/templates/macOS-13.anka.pkr.hcl +++ b/images/macos/templates/macOS-13.anka.pkr.hcl @@ -157,7 +157,7 @@ build { "mv ${local.image_folder}/docs-gen ${local.image_folder}/software-report", "mv ${local.image_folder}/xamarin-selector ${local.image_folder}/assets", "mkdir ~/utils", - "mv ${local.image_folder}/helpers/confirm-identified-developers.scpt ~/utils", + "mv ${local.image_folder}/helpers/confirm-identified-developers-macos13.scpt ~/utils", "mv ${local.image_folder}/helpers/invoke-tests.sh ~/utils", "mv ${local.image_folder}/helpers/utils.sh ~/utils", "mv ${local.image_folder}/helpers/xamarin-utils.sh ~/utils" diff --git a/images/macos/templates/macOS-14.anka.pkr.hcl b/images/macos/templates/macOS-14.anka.pkr.hcl index 1dc2660358d9..638388f1019d 100644 --- a/images/macos/templates/macOS-14.anka.pkr.hcl +++ b/images/macos/templates/macOS-14.anka.pkr.hcl @@ -157,7 +157,7 @@ build { "mv ${local.image_folder}/docs-gen ${local.image_folder}/software-report", "mv ${local.image_folder}/xamarin-selector ${local.image_folder}/assets", "mkdir ~/utils", - "mv ${local.image_folder}/helpers/confirm-identified-developers.scpt ~/utils", + "mv ${local.image_folder}/helpers/confirm-identified-developers-macos14.scpt ~/utils", "mv ${local.image_folder}/helpers/invoke-tests.sh ~/utils", "mv ${local.image_folder}/helpers/utils.sh ~/utils", "mv ${local.image_folder}/helpers/xamarin-utils.sh ~/utils" diff --git a/images/macos/toolsets/toolset-13.json b/images/macos/toolsets/toolset-13.json index 23a98ef1ed7c..33b6ca65b515 100644 --- a/images/macos/toolsets/toolset-13.json +++ b/images/macos/toolsets/toolset-13.json @@ -82,7 +82,7 @@ "xcodes" ], "cask_packages": [ - "" + "parallels" ] }, "gcc": { diff --git a/images/macos/toolsets/toolset-14.json b/images/macos/toolsets/toolset-14.json index dcc3833e4975..d2c867492642 100644 --- a/images/macos/toolsets/toolset-14.json +++ b/images/macos/toolsets/toolset-14.json @@ -85,7 +85,7 @@ "xcodes" ], "cask_packages": [ - "" + "parallels" ] }, "gcc": { From 1eae5baec1487edd8e5d9377943922a098aeb68e Mon Sep 17 00:00:00 2001 From: Pavel Iakovenko <paveliak@users.noreply.github.com> Date: Mon, 19 Aug 2024 11:00:28 -0700 Subject: [PATCH 3047/3485] [macOS] Treat github-api-pat as sensitive variable (#10453) --- images/macos/templates/macOS-12.anka.pkr.hcl | 5 +++-- images/macos/templates/macOS-13.anka.pkr.hcl | 5 +++-- images/macos/templates/macOS-13.arm64.anka.pkr.hcl | 5 +++-- images/macos/templates/macOS-14.anka.pkr.hcl | 5 +++-- images/macos/templates/macOS-14.arm64.anka.pkr.hcl | 5 +++-- 5 files changed, 15 insertions(+), 10 deletions(-) diff --git a/images/macos/templates/macOS-12.anka.pkr.hcl b/images/macos/templates/macOS-12.anka.pkr.hcl index eb1fff11bf3d..dc366199734f 100644 --- a/images/macos/templates/macOS-12.anka.pkr.hcl +++ b/images/macos/templates/macOS-12.anka.pkr.hcl @@ -54,8 +54,9 @@ variable "vm_password" { } variable "github_api_pat" { - type = string - default = "" + type = string + sensitive = true + default = "" } variable "xcode_install_storage_url" { diff --git a/images/macos/templates/macOS-13.anka.pkr.hcl b/images/macos/templates/macOS-13.anka.pkr.hcl index c3587434a4c2..9725cf435631 100644 --- a/images/macos/templates/macOS-13.anka.pkr.hcl +++ b/images/macos/templates/macOS-13.anka.pkr.hcl @@ -54,8 +54,9 @@ variable "vm_password" { } variable "github_api_pat" { - type = string - default = "" + type = string + sensitive = true + default = "" } variable "xcode_install_storage_url" { diff --git a/images/macos/templates/macOS-13.arm64.anka.pkr.hcl b/images/macos/templates/macOS-13.arm64.anka.pkr.hcl index abfd0996f262..a5aa126e90c0 100644 --- a/images/macos/templates/macOS-13.arm64.anka.pkr.hcl +++ b/images/macos/templates/macOS-13.arm64.anka.pkr.hcl @@ -54,8 +54,9 @@ variable "vm_password" { } variable "github_api_pat" { - type = string - default = "" + type = string + sensitive = true + default = "" } variable "xcode_install_storage_url" { diff --git a/images/macos/templates/macOS-14.anka.pkr.hcl b/images/macos/templates/macOS-14.anka.pkr.hcl index 638388f1019d..d0ac071ed3d5 100644 --- a/images/macos/templates/macOS-14.anka.pkr.hcl +++ b/images/macos/templates/macOS-14.anka.pkr.hcl @@ -54,8 +54,9 @@ variable "vm_password" { } variable "github_api_pat" { - type = string - default = "" + type = string + sensitive = true + default = "" } variable "xcode_install_storage_url" { diff --git a/images/macos/templates/macOS-14.arm64.anka.pkr.hcl b/images/macos/templates/macOS-14.arm64.anka.pkr.hcl index 547c56706580..5a1a09274f51 100644 --- a/images/macos/templates/macOS-14.arm64.anka.pkr.hcl +++ b/images/macos/templates/macOS-14.arm64.anka.pkr.hcl @@ -54,8 +54,9 @@ variable "vm_password" { } variable "github_api_pat" { - type = string - default = "" + type = string + sensitive = true + default = "" } variable "xcode_install_storage_url" { From 0a285c20318cf411f3298f300e8bef274d200cee Mon Sep 17 00:00:00 2001 From: Pavel Iakovenko <paveliak@users.noreply.github.com> Date: Tue, 20 Aug 2024 06:44:22 -0700 Subject: [PATCH 3048/3485] [macOS] Use API PAT for downloading actions/cache (#10463) --- images/macos/scripts/build/install-actions-cache.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/macos/scripts/build/install-actions-cache.sh b/images/macos/scripts/build/install-actions-cache.sh index 4fbebe3d8e6a..fe5dfb48071b 100644 --- a/images/macos/scripts/build/install-actions-cache.sh +++ b/images/macos/scripts/build/install-actions-cache.sh @@ -12,7 +12,7 @@ if [[ ! -d $ACTIONS_RUNNER_ACTION_ARCHIVE_CACHE ]]; then mkdir -p $ACTIONS_RUNNER_ACTION_ARCHIVE_CACHE fi -download_url=$(resolve_github_release_asset_url "actions/action-versions" "contains(\"action-versions.tar.gz\")" "latest") +download_url=$(resolve_github_release_asset_url "actions/action-versions" "contains(\"action-versions.tar.gz\")" "latest" "$API_PAT") echo "Downloading action-versions $download_url" archive_path=$(download_with_retry $download_url) tar -xzf $archive_path -C $ACTIONS_RUNNER_ACTION_ARCHIVE_CACHE From 36cf63a7356a8193f2c791e7717612927cf758d0 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 21 Aug 2024 11:36:54 +0000 Subject: [PATCH 3049/3485] Updating readme file for ubuntu24 version 20240818.1.1 (#10454) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2404-Readme.md | 57 +++++++++++++++--------------- 1 file changed, 28 insertions(+), 29 deletions(-) diff --git a/images/ubuntu/Ubuntu2404-Readme.md b/images/ubuntu/Ubuntu2404-Readme.md index 4f051d29cca6..cd61c8ab8847 100644 --- a/images/ubuntu/Ubuntu2404-Readme.md +++ b/images/ubuntu/Ubuntu2404-Readme.md @@ -2,12 +2,11 @@ |-| | [[All OSes] Android NDK versions <=25 will be removed from images on August 19](https://github.com/actions/runner-images/issues/10342) | | [Ubuntu 24.04 is now available](https://github.com/actions/runner-images/issues/9848) | -| [[Ubuntu, Windows] Docker Compose v1 will be removed from images on July, 29](https://github.com/actions/runner-images/issues/9692) | *** # Ubuntu 24.04 LTS - OS Version: 24.04 LTS - Kernel Version: 6.8.0-1012-azure -- Image Version: 20240811.1.0 +- Image Version: 20240818.1.0 - Systemd version: 255.4-1ubuntu8.2 ## Installed Software @@ -28,15 +27,15 @@ ### Package Management - cpan 1.64 -- Helm 3.15.3 -- Homebrew 4.3.14 +- Helm 3.15.4 +- Homebrew 4.3.16 - Miniconda 24.5.0 - Npm 10.8.1 - Pip 24.0 - Pip3 24.0 - Pipx 1.4.3 - RubyGems 3.4.20 -- Vcpkg (build from commit e590c2b30) +- Vcpkg (build from commit 2f210a9c1) - Yarn 1.22.22 #### Environment variables @@ -55,19 +54,19 @@ to accomplish this. ### Project Management - Ant 1.10.14 -- Gradle 8.9 +- Gradle 8.10 - Lerna 8.1.8 - Maven 3.8.8 ### Tools -- Ansible 2.17.2 +- Ansible 2.17.3 - AzCopy 10.26.0 - available by `azcopy` and `azcopy10` aliases -- Bazel 7.2.1 +- Bazel 7.3.0 - Bazelisk 1.19.0 - Bicep 0.29.47 - Buildah 1.33.7 - CMake 3.30.2 -- CodeQL Action Bundle 2.18.1 +- CodeQL Action Bundle 2.18.2 - Docker Amazon ECR Credential Helper 0.8.0 - Docker Compose v2 2.27.1 - Docker-Buildx 0.16.2 @@ -79,18 +78,18 @@ to accomplish this. - Git-ftp 1.6.0 - Haveged 1.9.14 - jq 1.7 -- Kind 0.23.0 -- Kubectl 1.30.3 +- Kind 0.24.0 +- Kubectl 1.31.0 - Kustomize 5.4.3 - MediaInfo 24.01 - Mercurial 6.7.2 - Minikube 1.33.1 - n 9.2.3 -- Newman 6.1.3 +- Newman 6.2.0 - OpenSSL 3.0.13-0ubuntu3.2 - Parcel 2.12.0 - Podman 4.9.3 -- Pulumi 3.128.0 +- Pulumi 3.129.0 - Skopeo 1.13.3 - Sphinx Open Source Search Server 2.2.11 - yamllint 1.35.1 @@ -98,9 +97,9 @@ to accomplish this. - zstd 1.5.6 ### CLI Tools -- AWS CLI 2.17.27 +- AWS CLI 2.17.32 - AWS CLI Session Manager Plugin 1.2.650.0 -- AWS SAM CLI 1.121.0 +- AWS SAM CLI 1.122.0 - Azure CLI 2.63.0 - Azure CLI (azure-devops) 1.0.1 - GitHub CLI 2.54.0 @@ -137,8 +136,8 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 127.0.6533.99 -- ChromeDriver 127.0.6533.99 +- Google Chrome 127.0.6533.119 +- ChromeDriver 127.0.6533.119 - Chromium 127.0.6533.0 - Selenium server 4.23.1 @@ -151,7 +150,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | ### .NET Tools -- .NET Core SDK: 8.0.107 +- .NET Core SDK: 8.0.108 - nbgv 3.6.141+d2035fb7be ### Databases @@ -190,7 +189,7 @@ Use the following command as a part of your job to start the service: 'sudo syst - 3.9.19 - 3.10.14 - 3.11.9 -- 3.12.4 +- 3.12.5 #### PyPy - 3.9.19 [PyPy 7.3.16] @@ -201,7 +200,7 @@ Use the following command as a part of your job to start the service: 'sudo syst #### PowerShell Modules - Az: 12.1.0 -- Microsoft.Graph: 2.21.1 +- Microsoft.Graph: 2.22.0 - Pester: 5.6.1 - PSScriptAnalyzer: 1.22.0 @@ -212,15 +211,15 @@ Use the following command as a part of your job to start the service: 'sudo syst | nginx | 1.24.0 | /etc/nginx/nginx.conf | inactive | 80 | ### Android -| Package Name | Version | -| -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 12.0 | -| Android SDK Build-tools | 35.0.0<br>34.0.0 | -| Android SDK Platforms | android-35 (rev 1)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1) | -| Android Support Repository | 47.0.0 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 24.0.8215888<br>25.2.9519653<br>26.3.11579264<br>27.0.12077973 (default) | +| Package Name | Version | +| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 12.0 | +| Android SDK Build-tools | 35.0.0<br>34.0.0 | +| Android SDK Platforms | android-35 (rev 1)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1) | +| Android Support Repository | 47.0.0 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 26.3.11579264<br>27.0.12077973 (default) | #### Environment variables | Name | Value | From 17a8ea14acc561c82a8bb19c14c2b10c72d6ed71 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 21 Aug 2024 11:52:24 +0000 Subject: [PATCH 3050/3485] Updating readme file for ubuntu20 version 20240818.1.1 (#10455) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2004-Readme.md | 83 +++++++++++++++--------------- 1 file changed, 41 insertions(+), 42 deletions(-) diff --git a/images/ubuntu/Ubuntu2004-Readme.md b/images/ubuntu/Ubuntu2004-Readme.md index 51ee5ac9e3ce..20f337dd8d54 100644 --- a/images/ubuntu/Ubuntu2004-Readme.md +++ b/images/ubuntu/Ubuntu2004-Readme.md @@ -2,12 +2,11 @@ |-| | [[All OSes] Android NDK versions <=25 will be removed from images on August 19](https://github.com/actions/runner-images/issues/10342) | | [Ubuntu 24.04 is now available](https://github.com/actions/runner-images/issues/9848) | -| [[Ubuntu, Windows] Docker Compose v1 will be removed from images on July, 29](https://github.com/actions/runner-images/issues/9692) | *** # Ubuntu 20.04 - OS Version: 20.04.6 LTS - Kernel Version: 5.15.0-1070-azure -- Image Version: 20240811.1.0 +- Image Version: 20240818.1.0 - Systemd version: 245.4-4ubuntu3.23 ## Installed Software @@ -34,8 +33,8 @@ ### Package Management - cpan 1.64 -- Helm 3.15.3 -- Homebrew 4.3.14 +- Helm 3.15.4 +- Homebrew 4.3.16 - Miniconda 24.5.0 - Npm 10.7.0 - NuGet 6.6.1.2 @@ -43,7 +42,7 @@ - Pip3 20.0.2 - Pipx 1.6.0 - RubyGems 3.1.2 -- Vcpkg (build from commit e590c2b30) +- Vcpkg (build from commit 2f210a9c1) - Yarn 1.22.22 #### Environment variables @@ -62,7 +61,7 @@ to accomplish this. ### Project Management - Ant 1.10.7 -- Gradle 8.9 +- Gradle 8.10 - Lerna 8.1.8 - Maven 3.8.8 - Sbt 1.10.1 @@ -71,12 +70,12 @@ to accomplish this. - Ansible 2.13.13 - apt-fast 1.10.0 - AzCopy 10.26.0 - available by `azcopy` and `azcopy10` aliases -- Bazel 7.2.1 +- Bazel 7.3.0 - Bazelisk 1.19.0 - Bicep 0.29.47 - Buildah 1.22.3 - CMake 3.30.2 -- CodeQL Action Bundle 2.18.1 +- CodeQL Action Bundle 2.18.2 - Docker Amazon ECR Credential Helper 0.8.0 - Docker Compose v2 2.27.1 - Docker-Buildx 0.16.2 @@ -90,22 +89,22 @@ to accomplish this. - Heroku 9.1.0 - HHVM (HipHop VM) 4.172.1 - jq 1.6 -- Kind 0.23.0 -- Kubectl 1.30.3 +- Kind 0.24.0 +- Kubectl 1.31.0 - Kustomize 5.4.3 - Leiningen 2.11.2 - MediaInfo 19.09 - Mercurial 5.3.1 - Minikube 1.33.1 - n 9.2.3 -- Newman 6.1.3 +- Newman 6.2.0 - nvm 0.40.0 - OpenSSL 1.1.1f-1ubuntu2.23 - Packer 1.11.2 - Parcel 2.12.0 - PhantomJS 2.1.1 2.1.1 - Podman 3.4.2 -- Pulumi 3.128.0 +- Pulumi 3.129.0 - R 4.4.1 - Skopeo 1.5.0 - Sphinx Open Source Search Server 2.2.11 @@ -117,17 +116,17 @@ to accomplish this. ### CLI Tools - Alibaba Cloud CLI 3.0.174 -- AWS CLI 2.17.27 +- AWS CLI 2.17.32 - AWS CLI Session Manager Plugin 1.2.650.0 -- AWS SAM CLI 1.121.0 +- AWS SAM CLI 1.122.0 - Azure CLI 2.63.0 - Azure CLI (azure-devops) 1.0.1 - GitHub CLI 2.54.0 -- Google Cloud CLI 487.0.0 -- Netlify CLI 17.34.0 +- Google Cloud CLI 488.0.0 +- Netlify CLI 17.34.1 - OpenShift CLI 4.15.19 - ORAS CLI 1.2.0 -- Vercel CLI 35.2.4 +- Vercel CLI 36.0.0 ### Java | Version | Environment Variable | @@ -158,21 +157,21 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustup 1.27.1 #### Packages -- Bindgen 0.69.4 -- Cargo audit 0.20.0 +- Bindgen 0.70.0 +- Cargo audit 0.20.1 - Cargo clippy 0.1.80 - Cargo outdated 0.15.0 - Cbindgen 0.27.0 - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 127.0.6533.99 -- ChromeDriver 127.0.6533.99 +- Google Chrome 127.0.6533.119 +- ChromeDriver 127.0.6533.119 - Chromium 127.0.6533.0 -- Microsoft Edge 127.0.2651.98 -- Microsoft Edge WebDriver 127.0.2651.87 +- Microsoft Edge 127.0.2651.105 +- Microsoft Edge WebDriver 127.0.2651.107 - Selenium server 4.23.1 -- Mozilla Firefox 128.0 +- Mozilla Firefox 129.0.1 - Geckodriver 0.35.0 #### Environment variables @@ -184,7 +183,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | ### .NET Tools -- .NET Core SDK: 6.0.424, 7.0.410, 8.0.303 +- .NET Core SDK: 6.0.425, 7.0.410, 8.0.401 - nbgv 3.6.141+d2035fb7be ### Databases @@ -230,7 +229,7 @@ Use the following command as a part of your job to start the service: 'sudo syst - 3.9.19 - 3.10.14 - 3.11.9 -- 3.12.4 +- 3.12.5 #### PyPy - 2.7.18 [PyPy 7.3.16] @@ -251,7 +250,7 @@ Use the following command as a part of your job to start the service: 'sudo syst #### PowerShell Modules - Az: 12.1.0 - MarkdownPS: 1.10 -- Microsoft.Graph: 2.21.1 +- Microsoft.Graph: 2.22.0 - Pester: 5.6.1 - PSScriptAnalyzer: 1.22.0 @@ -263,16 +262,16 @@ Use the following command as a part of your job to start the service: 'sudo syst | nginx | 1.18.0 | /etc/nginx/nginx.conf | inactive | 80 | ### Android -| Package Name | Version | -| -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 9.0 | -| Android SDK Build-tools | 35.0.0<br>34.0.0<br>33.0.0 33.0.1 33.0.2 33.0.3<br>32.0.0<br>31.0.0 | -| Android SDK Platforms | android-35 (rev 1)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1) | -| Android Support Repository | 47.0.0 | -| CMake | 3.10.2<br>3.18.1<br>3.22.1 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 24.0.8215888<br>25.2.9519653<br>26.3.11579264<br>27.0.12077973 (default) | +| Package Name | Version | +| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 9.0 | +| Android SDK Build-tools | 35.0.0<br>34.0.0<br>33.0.0 33.0.1 33.0.2 33.0.3<br>32.0.0<br>31.0.0 | +| Android SDK Platforms | android-35 (rev 1)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1) | +| Android Support Repository | 47.0.0 | +| CMake | 3.10.2<br>3.18.1<br>3.22.1 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 26.3.11579264<br>27.0.12077973 (default) | #### Environment variables | Name | Value | @@ -292,16 +291,16 @@ Use the following command as a part of your job to start the service: 'sudo syst | alpine:3.18 | sha256:5292533eb4efd4b5cf35e93b5a2b7d0e07ea193224c49446c7802c19ee4f2da5 | 2024-07-22 | | alpine:3.19 | sha256:95c16745f100f44cf9a0939fd3f357905f845f8b6fa7d0cde0e88c9764060185 | 2024-07-22 | | debian:10 | sha256:58ce6f1271ae1c8a2006ff7d3e54e9874d839f573d8009c20154ad0f2fb0a225 | 2024-06-13 | -| debian:11 | sha256:7aef2e7d061743fdb57973dac3ddbceb0b0912746ca7e0ee7535016c38286561 | 2024-07-23 | +| debian:11 | sha256:0bb606aad3307370c8b4502eff11fde298e5b7721e59a0da3ce9b30cb92045ed | 2024-08-13 | | debian:9 | sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be | 2022-06-23 | -| moby/buildkit:latest | sha256:0a5641c72659aa246458914fedcf941892aa15b8a49a79a0e8f3a4cc8246d5f9 | 2024-07-25 | +| moby/buildkit:latest | sha256:e0b10610709509aded9b101a61a090e24a5161f46d5eb8a479297fe96aa5d8ac | 2024-08-15 | | node:16 | sha256:f77a1aef2da8d83e45ec990f45df50f1a286c5fe8bbfb8c6e4246c6389705c0b | 2023-09-07 | | node:16-alpine | sha256:a1f9d027912b58a7c75be7716c97cfbc6d3099f3a97ed84aa490be9dee20e787 | 2023-08-10 | -| node:18 | sha256:11b742eda0142d9ea809fad8c506cbcadb2802c7d4b32e044e6b976691df36b1 | 2024-07-09 | +| node:18 | sha256:a7ff16657263663c1e92ba3060cdbba0e77329a0a4cb3c27bbbbe90c6e20bd87 | 2024-07-09 | | node:18-alpine | sha256:17514b20acef0e79691285e7a59f3ae561f7a1702a9adc72a515aef23f326729 | 2024-07-09 | -| node:20 | sha256:1ae9ba874435551280e95c8a8e74adf8a48d72b564bf9dfe4718231f2144c88f | 2024-07-24 | +| node:20 | sha256:d3c8ababe9566f9f3495d0d365a5c4b393f607924647dd52e75bf4f8a54effd3 | 2024-07-24 | | node:20-alpine | sha256:eb8101caae9ac02229bd64c024919fe3d4504ff7f329da79ca60a04db08cef52 | 2024-07-24 | -| ubuntu:20.04 | sha256:0b897358ff6624825fb50d20ffb605ab0eaea77ced0adb8c6a4b756513dec6fc | 2024-06-03 | +| ubuntu:20.04 | sha256:fa17826afb526a9fc7250e0fbcbfd18d03fe7a54849472f86879d8bf562c629e | 2024-08-13 | ### Installed apt packages | Name | Version | From 69f706a1062a11c09911d22f8545a1cae5826bec Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 21 Aug 2024 12:16:47 +0000 Subject: [PATCH 3051/3485] Updating readme file for ubuntu22 version 20240818.1.1 (#10456) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2204-Readme.md | 91 +++++++++++++++--------------- 1 file changed, 45 insertions(+), 46 deletions(-) diff --git a/images/ubuntu/Ubuntu2204-Readme.md b/images/ubuntu/Ubuntu2204-Readme.md index 682f0f12c742..f93ee5c157fe 100644 --- a/images/ubuntu/Ubuntu2204-Readme.md +++ b/images/ubuntu/Ubuntu2204-Readme.md @@ -2,12 +2,11 @@ |-| | [[All OSes] Android NDK versions <=25 will be removed from images on August 19](https://github.com/actions/runner-images/issues/10342) | | [Ubuntu 24.04 is now available](https://github.com/actions/runner-images/issues/9848) | -| [[Ubuntu, Windows] Docker Compose v1 will be removed from images on July, 29](https://github.com/actions/runner-images/issues/9692) | *** # Ubuntu 22.04 - OS Version: 22.04.4 LTS - Kernel Version: 6.5.0-1025-azure -- Image Version: 20240811.1.0 +- Image Version: 20240818.1.0 - Systemd version: 249.11-0ubuntu3.12 ## Installed Software @@ -32,8 +31,8 @@ ### Package Management - cpan 1.64 -- Helm 3.15.3 -- Homebrew 4.3.14 +- Helm 3.15.4 +- Homebrew 4.3.16 - Miniconda 24.5.0 - Npm 10.7.0 - NuGet 6.6.1.2 @@ -41,7 +40,7 @@ - Pip3 22.0.2 - Pipx 1.6.0 - RubyGems 3.3.5 -- Vcpkg (build from commit e590c2b30) +- Vcpkg (build from commit 2f210a9c1) - Yarn 1.22.22 #### Environment variables @@ -60,21 +59,21 @@ to accomplish this. ### Project Management - Ant 1.10.12 -- Gradle 8.9 +- Gradle 8.10 - Lerna 8.1.8 - Maven 3.8.8 - Sbt 1.10.1 ### Tools -- Ansible 2.17.2 +- Ansible 2.17.3 - apt-fast 1.10.0 - AzCopy 10.26.0 - available by `azcopy` and `azcopy10` aliases -- Bazel 7.2.1 +- Bazel 7.3.0 - Bazelisk 1.19.0 - Bicep 0.29.47 - Buildah 1.23.1 - CMake 3.30.2 -- CodeQL Action Bundle 2.18.1 +- CodeQL Action Bundle 2.18.2 - Docker Amazon ECR Credential Helper 0.8.0 - Docker Compose v2 2.27.1 - Docker-Buildx 0.16.2 @@ -87,21 +86,21 @@ to accomplish this. - Haveged 1.9.14 - Heroku 9.1.0 - jq 1.6 -- Kind 0.23.0 -- Kubectl 1.30.3 +- Kind 0.24.0 +- Kubectl 1.31.0 - Kustomize 5.4.3 - Leiningen 2.11.2 - MediaInfo 21.09 - Mercurial 6.1.1 - Minikube 1.33.1 - n 9.2.3 -- Newman 6.1.3 +- Newman 6.2.0 - nvm 0.40.0 - OpenSSL 3.0.2-0ubuntu1.17 - Packer 1.11.2 - Parcel 2.12.0 - Podman 3.4.4 -- Pulumi 3.128.0 +- Pulumi 3.129.0 - R 4.4.1 - Skopeo 1.4.1 - Sphinx Open Source Search Server 2.2.11 @@ -112,18 +111,18 @@ to accomplish this. - zstd 1.5.6 ### CLI Tools -- Alibaba Cloud CLI 3.0.216 -- AWS CLI 2.17.27 +- Alibaba Cloud CLI 3.0.219 +- AWS CLI 2.17.32 - AWS CLI Session Manager Plugin 1.2.650.0 -- AWS SAM CLI 1.121.0 +- AWS SAM CLI 1.122.0 - Azure CLI 2.63.0 - Azure CLI (azure-devops) 1.0.1 - GitHub CLI 2.54.0 -- Google Cloud CLI 487.0.0 -- Netlify CLI 17.34.0 -- OpenShift CLI 4.16.6 +- Google Cloud CLI 488.0.0 +- Netlify CLI 17.34.1 +- OpenShift CLI 4.16.7 - ORAS CLI 1.2.0 -- Vercel CLI 35.2.4 +- Vercel CLI 36.0.0 ### Java | Version | Environment Variable | @@ -154,21 +153,21 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustup 1.27.1 #### Packages -- Bindgen 0.69.4 -- Cargo audit 0.20.0 +- Bindgen 0.70.0 +- Cargo audit 0.20.1 - Cargo clippy 0.1.80 - Cargo outdated 0.15.0 - Cbindgen 0.27.0 - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 127.0.6533.99 -- ChromeDriver 127.0.6533.99 +- Google Chrome 127.0.6533.119 +- ChromeDriver 127.0.6533.119 - Chromium 127.0.6533.0 -- Microsoft Edge 127.0.2651.98 -- Microsoft Edge WebDriver 127.0.2651.87 +- Microsoft Edge 127.0.2651.105 +- Microsoft Edge WebDriver 127.0.2651.107 - Selenium server 4.23.1 -- Mozilla Firefox 129.0 +- Mozilla Firefox 129.0.1 - Geckodriver 0.35.0 #### Environment variables @@ -180,7 +179,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | ### .NET Tools -- .NET Core SDK: 6.0.424, 7.0.410, 8.0.303 +- .NET Core SDK: 6.0.425, 7.0.410, 8.0.401 - nbgv 3.6.141+d2035fb7be ### Databases @@ -225,7 +224,7 @@ Use the following command as a part of your job to start the service: 'sudo syst - 3.9.19 - 3.10.14 - 3.11.9 -- 3.12.4 +- 3.12.5 #### PyPy - 3.7.13 [PyPy 7.3.9] @@ -243,7 +242,7 @@ Use the following command as a part of your job to start the service: 'sudo syst #### PowerShell Modules - Az: 12.1.0 - MarkdownPS: 1.10 -- Microsoft.Graph: 2.21.1 +- Microsoft.Graph: 2.22.0 - Pester: 5.6.1 - PSScriptAnalyzer: 1.22.0 @@ -254,16 +253,16 @@ Use the following command as a part of your job to start the service: 'sudo syst | nginx | 1.18.0 | /etc/nginx/nginx.conf | inactive | 80 | ### Android -| Package Name | Version | -| -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 9.0 | -| Android SDK Build-tools | 35.0.0<br>34.0.0<br>33.0.0 33.0.1 33.0.2 33.0.3<br>32.0.0<br>31.0.0 | -| Android SDK Platforms | android-35 (rev 1)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1) | -| Android Support Repository | 47.0.0 | -| CMake | 3.10.2<br>3.18.1<br>3.22.1 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 24.0.8215888<br>25.2.9519653<br>26.3.11579264<br>27.0.12077973 (default) | +| Package Name | Version | +| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 9.0 | +| Android SDK Build-tools | 35.0.0<br>34.0.0<br>33.0.0 33.0.1 33.0.2 33.0.3<br>32.0.0<br>31.0.0 | +| Android SDK Platforms | android-35 (rev 1)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1) | +| Android Support Repository | 47.0.0 | +| CMake | 3.10.2<br>3.18.1<br>3.22.1 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 26.3.11579264<br>27.0.12077973 (default) | #### Environment variables | Name | Value | @@ -283,16 +282,16 @@ Use the following command as a part of your job to start the service: 'sudo syst | alpine:3.18 | sha256:5292533eb4efd4b5cf35e93b5a2b7d0e07ea193224c49446c7802c19ee4f2da5 | 2024-07-22 | | alpine:3.19 | sha256:95c16745f100f44cf9a0939fd3f357905f845f8b6fa7d0cde0e88c9764060185 | 2024-07-22 | | debian:10 | sha256:58ce6f1271ae1c8a2006ff7d3e54e9874d839f573d8009c20154ad0f2fb0a225 | 2024-06-13 | -| debian:11 | sha256:7aef2e7d061743fdb57973dac3ddbceb0b0912746ca7e0ee7535016c38286561 | 2024-07-23 | -| moby/buildkit:latest | sha256:0a5641c72659aa246458914fedcf941892aa15b8a49a79a0e8f3a4cc8246d5f9 | 2024-07-25 | +| debian:11 | sha256:0bb606aad3307370c8b4502eff11fde298e5b7721e59a0da3ce9b30cb92045ed | 2024-08-13 | +| moby/buildkit:latest | sha256:e0b10610709509aded9b101a61a090e24a5161f46d5eb8a479297fe96aa5d8ac | 2024-08-15 | | node:16 | sha256:f77a1aef2da8d83e45ec990f45df50f1a286c5fe8bbfb8c6e4246c6389705c0b | 2023-09-07 | | node:16-alpine | sha256:a1f9d027912b58a7c75be7716c97cfbc6d3099f3a97ed84aa490be9dee20e787 | 2023-08-10 | -| node:18 | sha256:11b742eda0142d9ea809fad8c506cbcadb2802c7d4b32e044e6b976691df36b1 | 2024-07-09 | +| node:18 | sha256:a7ff16657263663c1e92ba3060cdbba0e77329a0a4cb3c27bbbbe90c6e20bd87 | 2024-07-09 | | node:18-alpine | sha256:17514b20acef0e79691285e7a59f3ae561f7a1702a9adc72a515aef23f326729 | 2024-07-09 | -| node:20 | sha256:1ae9ba874435551280e95c8a8e74adf8a48d72b564bf9dfe4718231f2144c88f | 2024-07-24 | +| node:20 | sha256:d3c8ababe9566f9f3495d0d365a5c4b393f607924647dd52e75bf4f8a54effd3 | 2024-07-24 | | node:20-alpine | sha256:eb8101caae9ac02229bd64c024919fe3d4504ff7f329da79ca60a04db08cef52 | 2024-07-24 | -| ubuntu:20.04 | sha256:0b897358ff6624825fb50d20ffb605ab0eaea77ced0adb8c6a4b756513dec6fc | 2024-06-03 | -| ubuntu:22.04 | sha256:340d9b015b194dc6e2a13938944e0d016e57b9679963fdeb9ce021daac430221 | 2024-06-27 | +| ubuntu:20.04 | sha256:fa17826afb526a9fc7250e0fbcbfd18d03fe7a54849472f86879d8bf562c629e | 2024-08-13 | +| ubuntu:22.04 | sha256:adbb90115a21969d2fe6fa7f9af4253e16d45f8d4c1e930182610c4731962658 | 2024-08-13 | ### Installed apt packages | Name | Version | From 192b5bd8ad7a177268586653c669aaed3b3ba9ee Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 21 Aug 2024 14:11:53 +0000 Subject: [PATCH 3052/3485] Updating readme file for win19 version 20240818.1.1 (#10458) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/windows/Windows2019-Readme.md | 105 +++++++++++++-------------- 1 file changed, 52 insertions(+), 53 deletions(-) diff --git a/images/windows/Windows2019-Readme.md b/images/windows/Windows2019-Readme.md index 6c9136fcfd54..bf73d415d1d2 100644 --- a/images/windows/Windows2019-Readme.md +++ b/images/windows/Windows2019-Readme.md @@ -1,11 +1,10 @@ | Announcements | |-| | [[All OSes] Android NDK versions <=25 will be removed from images on August 19](https://github.com/actions/runner-images/issues/10342) | -| [[Ubuntu, Windows] Docker Compose v1 will be removed from images on July, 29](https://github.com/actions/runner-images/issues/9692) | *** # Windows Server 2019 -- OS Version: 10.0.17763 Build 6054 -- Image Version: 20240811.1.0 +- OS Version: 10.0.17763 Build 6189 +- Image Version: 20240818.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -27,14 +26,14 @@ ### Package Management - Chocolatey 2.3.0 - Composer 2.7.7 -- Helm 3.15.2 +- Helm 3.15.3 - Miniconda 24.5.0 (pre-installed on the image but not added to PATH) - NPM 10.7.0 -- NuGet 6.10.2.8 +- NuGet 6.11.0.119 - pip 24.0 (python 3.7) - Pipx 1.2.1 - RubyGems 3.2.33 -- Vcpkg (build from commit e590c2b30) +- Vcpkg (build from commit 2f210a9c1) - Yarn 1.22.22 #### Environment variables @@ -50,37 +49,37 @@ - sbt 1.10.1 ### Tools -- 7zip 24.07 +- 7zip 24.08 - aria2 1.37.0 - azcopy 10.26.0 -- Bazel 7.2.1 +- Bazel 7.3.0 - Bazelisk 1.19.0 - Bicep 0.29.47 - Cabal 3.12.1.0 - CMake 3.30.2 -- CodeQL Action Bundle 2.18.1 +- CodeQL Action Bundle 2.18.2 - Docker 26.1.3 - Docker Compose v2 2.27.1 - Docker-wincred 0.8.2 - ghc 9.10.1 - Git 2.46.0.windows.1 - Git LFS 3.5.1 -- Google Cloud CLI 487.0.0 +- Google Cloud CLI 488.0.0 - ImageMagick 7.1.1-36 - InnoSetup 6.3.3 - jq 1.7.1 -- Kind 0.23.0 -- Kubectl 1.30.3 +- Kind 0.24.0 +- Kubectl 1.31.0 - Mercurial 5.0 - gcc 8.1.0 - gdb 8.1 - GNU Binutils 2.30 -- Newman 6.1.3 +- Newman 6.2.0 - NSIS 3.10 - OpenSSL 1.1.1w - Packer 1.11.0 - Parcel 2.12.0 -- Pulumi 3.128.0 +- Pulumi 3.129.0 - R 4.4.1 - Service Fabric SDK 9.1.1436.9590 - Stack 3.1.1 @@ -93,9 +92,9 @@ - zstd 1.5.6 ### CLI Tools -- Alibaba Cloud CLI 3.0.216 -- AWS CLI 2.17.27 -- AWS SAM CLI 1.121.0 +- Alibaba Cloud CLI 3.0.219 +- AWS CLI 2.17.32 +- AWS SAM CLI 1.122.0 - AWS Session Manager CLI 1.2.650.0 - Azure CLI 2.63.0 - Azure DevOps CLI extension 1.0.1 @@ -109,19 +108,19 @@ - Rustup 1.27.1 #### Packages -- bindgen 0.69.4 -- cargo-audit 0.20.0 +- bindgen 0.70.0 +- cargo-audit 0.20.1 - cargo-outdated 0.15.0 - cbindgen 0.27.0 - Clippy 0.1.80 - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 127.0.6533.100 -- Chrome Driver 127.0.6533.99 -- Microsoft Edge 127.0.2651.98 -- Microsoft Edge Driver 127.0.2651.98 -- Mozilla Firefox 129.0 +- Google Chrome 127.0.6533.120 +- Chrome Driver 127.0.6533.119 +- Microsoft Edge 127.0.2651.105 +- Microsoft Edge Driver 127.0.2651.105 +- Mozilla Firefox 129.0.1 - Gecko Driver 0.35.0 - IE Driver 4.14.0.0 - Selenium server 4.23.0 @@ -180,7 +179,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 3.9.13 - 3.10.11 - 3.11.9 -- 3.12.4 +- 3.12.5 #### PyPy - 2.7.18 [PyPy 7.3.16] @@ -225,17 +224,17 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Name | Version | ConfigFile | ServiceName | ServiceStatus | ListenPort | | ------ | ------- | ------------------------------------- | ----------- | ------------- | ---------- | | Apache | 2.4.55 | C:\tools\Apache24\conf\httpd.conf | Apache | Stopped | 80 | -| Nginx | 1.27.0 | C:\tools\nginx-1.27.0\conf\nginx.conf | nginx | Stopped | 80 | +| Nginx | 1.27.1 | C:\tools\nginx-1.27.1\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2019 | Name | Version | Path | | ----------------------------- | --------------- | -------------------------------------------------------------- | -| Visual Studio Enterprise 2019 | 16.11.35026.282 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | +| Visual Studio Enterprise 2019 | 16.11.35130.168 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | #### Workloads, components and extensions | Package | Version | | ------------------------------------------------------------------------- | --------------- | -| Component.Android.NDK.R16B | 16.11.35026.282 | +| Component.Android.NDK.R16B | 16.11.35112.186 | | Component.Android.SDK25.Private | 16.0.28625.61 | | Component.Android.SDK30 | 16.10.31205.252 | | Component.Ant | 1.9.3.8 | @@ -322,7 +321,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Component.Graphics | 16.10.31205.252 | | Microsoft.VisualStudio.Component.Graphics.Tools | 16.0.28625.61 | | Microsoft.VisualStudio.Component.IISExpress | 16.0.28315.86 | -| Microsoft.VisualStudio.Component.IntelliCode | 16.11.31603.221 | +| Microsoft.VisualStudio.Component.IntelliCode | 16.11.35122.84 | | Microsoft.VisualStudio.Component.IntelliTrace.FrontEnd | 16.5.29515.121 | | Microsoft.VisualStudio.Component.JavaScript.Diagnostics | 16.0.28517.75 | | Microsoft.VisualStudio.Component.JavaScript.TypeScript | 16.11.31404.150 | @@ -492,11 +491,11 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 10.0.22621.0 ### .NET Core Tools -- .NET Core SDK: 6.0.132, 6.0.203, 6.0.321, 6.0.424, 7.0.120, 7.0.203, 7.0.317, 7.0.410, 8.0.107, 8.0.206, 8.0.303 +- .NET Core SDK: 6.0.133, 6.0.203, 6.0.321, 6.0.425, 7.0.120, 7.0.203, 7.0.317, 7.0.410, 8.0.108, 8.0.206, 8.0.304, 8.0.401 - .NET Framework: 4.7.2, 4.8 -- Microsoft.AspNetCore.App: 6.0.5, 6.0.26, 6.0.32, 7.0.5, 7.0.20, 8.0.6, 8.0.7 -- Microsoft.NETCore.App: 6.0.5, 6.0.26, 6.0.32, 7.0.5, 7.0.20, 8.0.6, 8.0.7 -- Microsoft.WindowsDesktop.App: 6.0.5, 6.0.26, 6.0.32, 7.0.5, 7.0.20, 8.0.6, 8.0.7 +- Microsoft.AspNetCore.App: 6.0.5, 6.0.26, 6.0.33, 7.0.5, 7.0.20, 8.0.6, 8.0.8 +- Microsoft.NETCore.App: 6.0.5, 6.0.26, 6.0.33, 7.0.5, 7.0.20, 8.0.6, 8.0.8 +- Microsoft.WindowsDesktop.App: 6.0.5, 6.0.26, 6.0.33, 7.0.5, 7.0.20, 8.0.6, 8.0.8 - nbgv 3.6.141+d2035fb7be ### PowerShell Tools @@ -508,10 +507,10 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - AzureRM: 2.1.0 (Default), 6.13.1 - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.632 +- AWSPowershell: 4.1.637 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.10 -- Microsoft.Graph: 2.21.1 +- Microsoft.Graph: 2.22.0 - Pester: 3.4.0, 5.6.1 - PowerShellGet: 1.0.0.1, 2.2.5 - PSScriptAnalyzer: 1.22.0 @@ -525,19 +524,19 @@ All other versions are saved but not installed. ``` ### Android -| Package Name | Version | -| -------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 8.0 | -| Android Emulator | 34.2.16 | -| Android SDK Build-tools | 35.0.0<br>34.0.0<br>33.0.0 33.0.1 33.0.2 33.0.3<br>32.0.0<br>31.0.0<br>30.0.2 | -| Android SDK Platforms | android-35 (rev 1)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3) | -| Android SDK Platform-Tools | 35.0.2 | -| Android Support Repository | 47.0.0 | -| CMake | 3.10.2<br>3.18.1<br>3.22.1 | -| Google APIs | addon-google_apis-google-21<br>addon-google_apis-google-22<br>addon-google_apis-google-23<br>addon-google_apis-google-24 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 24.0.8215888<br>25.2.9519653<br>26.3.11579264<br>27.0.12077973 | +| Package Name | Version | +| -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 8.0 | +| Android Emulator | 34.2.16 | +| Android SDK Build-tools | 35.0.0<br>34.0.0<br>33.0.0 33.0.1 33.0.2 33.0.3<br>32.0.0<br>31.0.0<br>30.0.2 | +| Android SDK Platforms | android-35 (rev 1)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3) | +| Android SDK Platform-Tools | 35.0.2 | +| Android Support Repository | 47.0.0 | +| CMake | 3.10.2<br>3.18.1<br>3.22.1 | +| Google APIs | addon-google_apis-google-21<br>addon-google_apis-google-22<br>addon-google_apis-google-23<br>addon-google_apis-google-24 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 26.3.11579264<br>27.0.12077973 | #### Environment variables | Name | Value | @@ -552,9 +551,9 @@ All other versions are saved but not installed. ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:4d87502a9422420948af8264a1cecad215f032e4c2d4b1fb92cfee779ecfb480 | 2024-07-09 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:8d7c40438ba7645768219770ab60b9b2cacc90a8a2cc2be0f880939cbc6091db | 2024-07-09 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:04e06ae8f595b48bdee73c3334e82f46ba61217e2fe29702350d7b90e9c4b787 | 2024-07-09 | -| mcr.microsoft.com/windows/nanoserver:1809 | sha256:736f8845da1c7bbc9510b419abddb870230485e74644a96e0001a21e1ca4c172 | 2024-07-03 | -| mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:41f42aa4ad39d85e4d30642b8111ca6454ca2275f188f012934b9afbaf63a647 | 2024-07-03 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:da9b18ec1c7ea94841f3351a3494c9651d9e2557b1c84a75046dc915029df45e | 2024-08-13 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:572083af53735695423a97dc6648f210ac85491269432660b151ba3033f7cb03 | 2024-08-13 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:bfb078e34f8c28cf122fc693b265686a58aa46f7e6c9ee46aaae7371d0ed5772 | 2024-08-13 | +| mcr.microsoft.com/windows/nanoserver:1809 | sha256:7f6649348a11655e3576463fd6d55c29248f97405f8e643cab2409009339f520 | 2024-08-11 | +| mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:f67e2252b22f6f8c9916fdcb099548d01b920d49af2039349e1b883f79c9e0ef | 2024-08-11 | From 564751b5705dc091acc2b1ca924c54d04a2b5ef4 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 21 Aug 2024 18:00:07 +0000 Subject: [PATCH 3053/3485] Updating readme file for macos-14 version 20240818.2 (#10459) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-14-Readme.md | 122 ++++++++++++++++---------------- 1 file changed, 60 insertions(+), 62 deletions(-) diff --git a/images/macos/macos-14-Readme.md b/images/macos/macos-14-Readme.md index 074b0aca01f2..b48ee3c69b99 100644 --- a/images/macos/macos-14-Readme.md +++ b/images/macos/macos-14-Readme.md @@ -1,16 +1,12 @@ -| Announcements | -|-| -| [[macOS] GCC 11 will be removed from all macOS images on August 12](https://github.com/actions/runner-images/issues/10213) | -*** # macOS 14 - OS Version: macOS 14.6.1 (23G93) - Kernel Version: Darwin 23.6.0 -- Image Version: 20240811.3 +- Image Version: 20240818.2 ## Installed Software ### Language and Runtime -- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.410, 8.0.101, 8.0.204, 8.0.303 +- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.410, 8.0.101, 8.0.204, 8.0.303, 8.0.401 - Bash 3.2.57(1)-release - Clang/LLVM 14.0.3 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` @@ -25,7 +21,7 @@ - Node.js 20.16.0 - Perl 5.38.2 - PHP 8.3.10 -- Python3 3.12.4 +- Python3 3.12.5 - Ruby 3.0.7p220 ### Package Management @@ -33,7 +29,7 @@ - Carthage 0.39.1 - CocoaPods 1.15.2 - Composer 2.7.7 -- Homebrew 4.3.14 +- Homebrew 4.3.16 - NPM 10.8.1 - NuGet 6.3.1.1 - Pip3 24.2 (python 3.12) @@ -43,14 +39,14 @@ ### Project Management - Apache Ant 1.10.14 -- Apache Maven 3.9.8 -- Gradle 8.9 +- Apache Maven 3.9.9 +- Gradle 8.10 ### Utilities - 7-Zip 17.05 - aria2 1.37.0 - azcopy 10.26.0 -- bazel 7.2.1 +- bazel 7.3.0 - bazelisk 1.20.0 - bsdtar 3.5.3 - available by 'tar' alias - Curl 8.9.1 @@ -68,32 +64,32 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.17.27 -- AWS SAM CLI 1.121.0 +- AWS CLI 2.17.32 +- AWS SAM CLI 1.122.0 - AWS Session Manager CLI 1.2.650.0 - Azure CLI 2.63.0 - Azure CLI (azure-devops) 1.0.1 - Bicep CLI 0.29.47 - Cmake 3.30.2 -- CodeQL Action Bundle 2.18.1 +- CodeQL Action Bundle 2.18.2 - Fastlane 2.222.0 - SwiftFormat 0.54.3 -- Xcbeautify 2.10.0 +- Xcbeautify 2.11.0 - Xcode Command Line Tools 15.3.0.0.1.1708646388 - Xcodes 1.5.0 ### Linters -- SwiftLint 0.55.1 +- SwiftLint 0.56.1 ### Browsers - Safari 17.6 (19618.3.11.11.5) - SafariDriver 17.6 (19618.3.11.11.5) -- Google Chrome 127.0.6533.100 -- Google Chrome for Testing 127.0.6533.99 -- ChromeDriver 127.0.6533.99 -- Microsoft Edge 127.0.2651.98 -- Microsoft Edge WebDriver 127.0.2651.97 -- Mozilla Firefox 129.0 +- Google Chrome 127.0.6533.120 +- Google Chrome for Testing 127.0.6533.119 +- ChromeDriver 127.0.6533.119 +- Microsoft Edge 127.0.2651.105 +- Microsoft Edge WebDriver 127.0.2651.107 +- Mozilla Firefox 129.0.1 - geckodriver 0.34.0 - Selenium server 4.23.0 @@ -122,7 +118,7 @@ - 3.9.19 - 3.10.14 - 3.11.9 -- 3.12.4 +- 3.12.5 #### Node.js - 18.20.4 @@ -154,7 +150,7 @@ ### Xcode | Version | Build | Path | | -------------- | -------- | --------------------------------- | -| 16.0 (beta) | 16A5221g | /Applications/Xcode_16_beta_5.app | +| 16.1 (beta) | 16B5001e | /Applications/Xcode_16.1_beta.app | | 15.4 (default) | 15F31d | /Applications/Xcode_15.4.app | | 15.3 | 15E204a | /Applications/Xcode_15.3.app | | 15.2 | 15C500b | /Applications/Xcode_15.2.app | @@ -170,51 +166,51 @@ | macOS 14.2 | macosx14.2 | 15.1, 15.2 | | macOS 14.4 | macosx14.4 | 15.3 | | macOS 14.5 | macosx14.5 | 15.4 | -| macOS 15.0 | macosx15.0 | 16.0 | +| macOS 15.1 | macosx15.1 | 16.1 | | iOS 16.4 | iphoneos16.4 | 14.3.1 | | iOS 17.0 | iphoneos17.0 | 15.0.1 | | iOS 17.2 | iphoneos17.2 | 15.1, 15.2 | | iOS 17.4 | iphoneos17.4 | 15.3 | | iOS 17.5 | iphoneos17.5 | 15.4 | -| iOS 18.0 | iphoneos18.0 | 16.0 | +| iOS 18.1 | iphoneos18.1 | 16.1 | | Simulator - iOS 16.4 | iphonesimulator16.4 | 14.3.1 | | Simulator - iOS 17.0 | iphonesimulator17.0 | 15.0.1 | | Simulator - iOS 17.2 | iphonesimulator17.2 | 15.1, 15.2 | | Simulator - iOS 17.4 | iphonesimulator17.4 | 15.3 | | Simulator - iOS 17.5 | iphonesimulator17.5 | 15.4 | -| Simulator - iOS 18.0 | iphonesimulator18.0 | 16.0 | +| Simulator - iOS 18.1 | iphonesimulator18.1 | 16.1 | | tvOS 16.4 | appletvos16.4 | 14.3.1 | | tvOS 17.0 | appletvos17.0 | 15.0.1 | | tvOS 17.2 | appletvos17.2 | 15.1, 15.2 | | tvOS 17.4 | appletvos17.4 | 15.3 | | tvOS 17.5 | appletvos17.5 | 15.4 | -| tvOS 18.0 | appletvos18.0 | 16.0 | +| tvOS 18.0 | appletvos18.0 | 16.1 | | Simulator - tvOS 16.4 | appletvsimulator16.4 | 14.3.1 | | Simulator - tvOS 17.0 | appletvsimulator17.0 | 15.0.1 | | Simulator - tvOS 17.2 | appletvsimulator17.2 | 15.1, 15.2 | | Simulator - tvOS 17.4 | appletvsimulator17.4 | 15.3 | | Simulator - tvOS 17.5 | appletvsimulator17.5 | 15.4 | -| Simulator - tvOS 18.0 | appletvsimulator18.0 | 16.0 | +| Simulator - tvOS 18.0 | appletvsimulator18.0 | 16.1 | | watchOS 9.4 | watchos9.4 | 14.3.1 | | watchOS 10.0 | watchos10.0 | 15.0.1 | | watchOS 10.2 | watchos10.2 | 15.1, 15.2 | | watchOS 10.4 | watchos10.4 | 15.3 | | watchOS 10.5 | watchos10.5 | 15.4 | -| watchOS 11.0 | watchos11.0 | 16.0 | +| watchOS 11.0 | watchos11.0 | 16.1 | | Simulator - watchOS 9.4 | watchsimulator9.4 | 14.3.1 | | Simulator - watchOS 10.0 | watchsimulator10.0 | 15.0.1 | | Simulator - watchOS 10.2 | watchsimulator10.2 | 15.1, 15.2 | | Simulator - watchOS 10.4 | watchsimulator10.4 | 15.3 | | Simulator - watchOS 10.5 | watchsimulator10.5 | 15.4 | -| Simulator - watchOS 11.0 | watchsimulator11.0 | 16.0 | +| Simulator - watchOS 11.0 | watchsimulator11.0 | 16.1 | | Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | | visionOS 1.0 | xros1.0 | 15.2 | | visionOS 1.1 | xros1.1 | 15.3 | | Simulator - visionOS 1.1 | xrsimulator1.1 | 15.3 | -| visionOS 1.2 | xros1.2 | 15.4 | | Simulator - visionOS 1.2 | xrsimulator1.2 | 15.4 | -| Simulator - visionOS 2.0 | xrsimulator2.0 | 16.0 | -| visionOS 2.0 | xros2.0 | 16.0 | +| visionOS 1.2 | xros1.2 | 15.4 | +| Simulator - visionOS 2.0 | xrsimulator2.0 | 16.1 | +| visionOS 2.0 | xros2.0 | 16.1 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | @@ -223,40 +219,43 @@ | DriverKit 23.2 | driverkit23.2 | 15.1, 15.2 | | DriverKit 23.4 | driverkit23.4 | 15.3 | | DriverKit 23.5 | driverkit23.5 | 15.4 | -| DriverKit 24.0 | driverkit24.0 | 16.0 | +| DriverKit 24.1 | driverkit24.1 | 16.1 | #### Installed Simulators | OS | Xcode Version | Simulators | | ------------ | -------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | iOS 16.4 | 14.3.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 17.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 17.2 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 17.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | -| iOS 17.5 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | -| tvOS 16.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 17.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 17.2 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 17.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 17.5 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| watchOS 9.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | -| watchOS 10.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | -| watchOS 10.2 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | -| watchOS 10.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | -| watchOS 10.5 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | +| iOS 17.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 17.2 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 17.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | +| iOS 17.5 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | +| iOS 18.1 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | +| tvOS 16.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 17.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 17.2 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 17.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 17.5 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 18.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| watchOS 9.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | +| watchOS 10.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 10.2 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 10.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 10.5 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 11.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | ### Android -| Package Name | Version | -| -------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 11.0 | -| Android Emulator | 34.2.16 | -| Android SDK Build-tools | 35.0.0<br>34.0.0<br>33.0.2 33.0.3 | -| Android SDK Platforms | android-35 (rev 1)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | -| Android SDK Platform-Tools | 35.0.2 | -| Android Support Repository | 47.0.0 | -| CMake | 3.22.1 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 24.0.8215888<br>25.2.9519653<br>26.3.11579264 (default) | +| Package Name | Version | +| -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 11.0 | +| Android Emulator | 34.2.16 | +| Android SDK Build-tools | 35.0.0<br>34.0.0<br>33.0.2 33.0.3 | +| Android SDK Platforms | android-35 (rev 1)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | +| Android SDK Platform-Tools | 35.0.2 | +| Android Support Repository | 47.0.0 | +| CMake | 3.22.1 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 24.0.8215888<br>25.2.9519653<br>26.3.11579264 (default) | #### Environment variables | Name | Value | @@ -267,4 +266,3 @@ | ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/26.3.11579264 | | ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk/26.3.11579264 | | ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | - From cba7c41716a01fb4476ab83edeca7560f3ec66ac Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 21 Aug 2024 18:15:04 +0000 Subject: [PATCH 3054/3485] Updating readme file for macos-13-arm64 version 20240818.3 (#10457) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-13-arm64-Readme.md | 63 ++++++++++++--------------- 1 file changed, 29 insertions(+), 34 deletions(-) diff --git a/images/macos/macos-13-arm64-Readme.md b/images/macos/macos-13-arm64-Readme.md index 2e9eaacff401..91aaec757a21 100644 --- a/images/macos/macos-13-arm64-Readme.md +++ b/images/macos/macos-13-arm64-Readme.md @@ -1,16 +1,12 @@ -| Announcements | -|-| -| [[macOS] GCC 11 will be removed from all macOS images on August 12](https://github.com/actions/runner-images/issues/10213) | -*** # macOS 13 - OS Version: macOS 13.6.9 (22G830) - Kernel Version: Darwin 22.6.0 -- Image Version: 20240811.1 +- Image Version: 20240818.3 ## Installed Software ### Language and Runtime -- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.410, 8.0.101, 8.0.204, 8.0.303 +- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.410, 8.0.101, 8.0.204, 8.0.303, 8.0.401 - Bash 3.2.57(1)-release - Clang/LLVM 14.0.0 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` @@ -24,31 +20,31 @@ - Mono 6.12.0.188 - Node.js 20.16.0 - Perl 5.38.2 -- Python3 3.12.4 +- Python3 3.12.5 - Ruby 3.0.7p220 ### Package Management - Bundler 2.5.17 - Carthage 0.39.1 - CocoaPods 1.15.2 -- Homebrew 4.3.14 +- Homebrew 4.3.16 - NPM 10.8.1 - NuGet 6.3.1.1 -- Pip3 24.0 (python 3.12) +- Pip3 24.2 (python 3.12) - Pipx 1.6.0 - RubyGems 3.5.17 - Yarn 1.22.22 ### Project Management - Apache Ant 1.10.14 -- Apache Maven 3.9.8 -- Gradle 8.9 +- Apache Maven 3.9.9 +- Gradle 8.10 ### Utilities - 7-Zip 17.05 - aria2 1.37.0 - azcopy 10.26.0 -- bazel 7.2.1 +- bazel 7.3.0 - bazelisk 1.20.0 - bsdtar 3.5.3 - available by 'tar' alias - Curl 8.7.1 @@ -66,17 +62,17 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.17.27 -- AWS SAM CLI 1.121.0 +- AWS CLI 2.17.32 +- AWS SAM CLI 1.122.0 - AWS Session Manager CLI 1.2.650.0 - Azure CLI 2.63.0 - Azure CLI (azure-devops) 1.0.1 - Bicep CLI 0.29.47 - Cmake 3.30.2 -- CodeQL Action Bundle 2.18.1 +- CodeQL Action Bundle 2.18.2 - Fastlane 2.222.0 - SwiftFormat 0.54.3 -- Xcbeautify 2.10.0 +- Xcbeautify 2.11.0 - Xcode Command Line Tools 14.3.1.0.1.1683849156 - Xcodes 1.5.0 @@ -85,9 +81,9 @@ ### Browsers - Safari 17.6 (18618.3.11.11.7) - SafariDriver 17.6 (18618.3.11.11.7) -- Google Chrome 127.0.6533.100 -- Google Chrome for Testing 127.0.6533.99 -- ChromeDriver 127.0.6533.99 +- Google Chrome 127.0.6533.120 +- Google Chrome for Testing 127.0.6533.119 +- ChromeDriver 127.0.6533.119 - Selenium server 4.23.0 #### Environment variables @@ -110,7 +106,7 @@ - 3.9.13 - 3.10.11 - 3.11.9 -- 3.12.4 +- 3.12.5 #### Node.js - 16.20.1 @@ -187,8 +183,8 @@ | Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | | visionOS 1.0 | xros1.0 | 15.2 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | -| Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | +| Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | DriverKit 22.1 | driverkit22.1 | 14.1 | | DriverKit 22.2 | driverkit22.2 | 14.2 | | DriverKit 22.4 | driverkit22.4 | 14.3.1 | @@ -214,18 +210,18 @@ | visionOS 1.0 | 14.1<br>14.2<br>14.3.1<br>15.0.1<br>15.1<br>15.2 | Apple Vision Pro | ### Android -| Package Name | Version | -| -------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 11.0 | -| Android Emulator | 34.2.16 | -| Android SDK Build-tools | 35.0.0<br>34.0.0<br>33.0.2 33.0.3 | -| Android SDK Platforms | android-35 (rev 1)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | -| Android SDK Platform-Tools | 35.0.2 | -| Android Support Repository | 47.0.0 | -| CMake | 3.22.1 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 24.0.8215888<br>25.2.9519653<br>26.3.11579264 (default) | +| Package Name | Version | +| -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 11.0 | +| Android Emulator | 34.2.16 | +| Android SDK Build-tools | 35.0.0<br>34.0.0<br>33.0.2 33.0.3 | +| Android SDK Platforms | android-35 (rev 1)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | +| Android SDK Platform-Tools | 35.0.2 | +| Android Support Repository | 47.0.0 | +| CMake | 3.22.1 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 24.0.8215888<br>25.2.9519653<br>26.3.11579264 (default) | #### Environment variables | Name | Value | @@ -236,4 +232,3 @@ | ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/26.3.11579264 | | ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk/26.3.11579264 | | ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | - From 5ab121d55912da4c7a2a8b6caf52fb47339ae51a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 21 Aug 2024 18:21:19 +0000 Subject: [PATCH 3055/3485] Updating readme file for macos-14-arm64 version 20240818.4 (#10460) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-14-arm64-Readme.md | 127 +++++++++++++------------- 1 file changed, 61 insertions(+), 66 deletions(-) diff --git a/images/macos/macos-14-arm64-Readme.md b/images/macos/macos-14-arm64-Readme.md index 20cbf429c691..e85d7dd185c0 100644 --- a/images/macos/macos-14-arm64-Readme.md +++ b/images/macos/macos-14-arm64-Readme.md @@ -1,16 +1,12 @@ -| Announcements | -|-| -| [[macOS] GCC 11 will be removed from all macOS images on August 12](https://github.com/actions/runner-images/issues/10213) | -*** # macOS 14 - OS Version: macOS 14.6.1 (23G93) - Kernel Version: Darwin 23.6.0 -- Image Version: 20240811.1 +- Image Version: 20240818.4 ## Installed Software ### Language and Runtime -- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.410, 8.0.101, 8.0.204, 8.0.303 +- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.410, 8.0.101, 8.0.204, 8.0.303, 8.0.401 - Bash 3.2.57(1)-release - Clang/LLVM 14.0.3 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` @@ -24,31 +20,31 @@ - Mono 6.12.0.188 - Node.js 20.16.0 - Perl 5.38.2 -- Python3 3.12.4 +- Python3 3.12.5 - Ruby 3.0.7p220 ### Package Management - Bundler 2.5.17 - Carthage 0.39.1 - CocoaPods 1.15.2 -- Homebrew 4.3.14 +- Homebrew 4.3.16 - NPM 10.8.1 - NuGet 6.3.1.1 -- Pip3 24.0 (python 3.12) +- Pip3 24.2 (python 3.12) - Pipx 1.6.0 - RubyGems 3.5.17 - Yarn 1.22.22 ### Project Management - Apache Ant 1.10.14 -- Apache Maven 3.9.8 -- Gradle 8.9 +- Apache Maven 3.9.9 +- Gradle 8.10 ### Utilities - 7-Zip 17.05 - aria2 1.37.0 - azcopy 10.26.0 -- bazel 7.2.1 +- bazel 7.3.0 - bazelisk 1.20.0 - bsdtar 3.5.3 - available by 'tar' alias - Curl 8.7.1 @@ -66,17 +62,17 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.17.27 -- AWS SAM CLI 1.121.0 +- AWS CLI 2.17.32 +- AWS SAM CLI 1.122.0 - AWS Session Manager CLI 1.2.650.0 - Azure CLI 2.63.0 - Azure CLI (azure-devops) 1.0.1 - Bicep CLI 0.29.47 - Cmake 3.30.2 -- CodeQL Action Bundle 2.18.1 +- CodeQL Action Bundle 2.18.2 - Fastlane 2.222.0 - SwiftFormat 0.54.3 -- Xcbeautify 2.10.0 +- Xcbeautify 2.11.0 - Xcode Command Line Tools 15.3.0.0.1.1708646388 - Xcodes 1.5.0 @@ -85,9 +81,9 @@ ### Browsers - Safari 17.6 (19618.3.11.11.5) - SafariDriver 17.6 (19618.3.11.11.5) -- Google Chrome 127.0.6533.100 -- Google Chrome for Testing 127.0.6533.99 -- ChromeDriver 127.0.6533.99 +- Google Chrome 127.0.6533.120 +- Google Chrome for Testing 127.0.6533.119 +- ChromeDriver 127.0.6533.119 - Selenium server 4.23.0 #### Environment variables @@ -110,7 +106,7 @@ - 3.9.13 - 3.10.11 - 3.11.9 -- 3.12.4 +- 3.12.5 #### Node.js - 18.20.4 @@ -142,7 +138,7 @@ ### Xcode | Version | Build | Path | | -------------- | -------- | --------------------------------- | -| 16.0 (beta) | 16A5221g | /Applications/Xcode_16_beta_5.app | +| 16.1 (beta) | 16B5001e | /Applications/Xcode_16.1_beta.app | | 15.4 (default) | 15F31d | /Applications/Xcode_15.4.app | | 15.3 | 15E204a | /Applications/Xcode_15.3.app | | 15.2 | 15C500b | /Applications/Xcode_15.2.app | @@ -158,100 +154,100 @@ | macOS 14.2 | macosx14.2 | 15.1, 15.2 | | macOS 14.4 | macosx14.4 | 15.3 | | macOS 14.5 | macosx14.5 | 15.4 | -| macOS 15.0 | macosx15.0 | 16.0 | +| macOS 15.1 | macosx15.1 | 16.1 | | iOS 16.4 | iphoneos16.4 | 14.3.1 | | iOS 17.0 | iphoneos17.0 | 15.0.1 | | iOS 17.2 | iphoneos17.2 | 15.1, 15.2 | | iOS 17.4 | iphoneos17.4 | 15.3 | | iOS 17.5 | iphoneos17.5 | 15.4 | -| iOS 18.0 | iphoneos18.0 | 16.0 | +| iOS 18.1 | iphoneos18.1 | 16.1 | | Simulator - iOS 16.4 | iphonesimulator16.4 | 14.3.1 | | Simulator - iOS 17.0 | iphonesimulator17.0 | 15.0.1 | | Simulator - iOS 17.2 | iphonesimulator17.2 | 15.1, 15.2 | | Simulator - iOS 17.4 | iphonesimulator17.4 | 15.3 | | Simulator - iOS 17.5 | iphonesimulator17.5 | 15.4 | -| Simulator - iOS 18.0 | iphonesimulator18.0 | 16.0 | +| Simulator - iOS 18.1 | iphonesimulator18.1 | 16.1 | | tvOS 16.4 | appletvos16.4 | 14.3.1 | | tvOS 17.0 | appletvos17.0 | 15.0.1 | | tvOS 17.2 | appletvos17.2 | 15.1, 15.2 | | tvOS 17.4 | appletvos17.4 | 15.3 | | tvOS 17.5 | appletvos17.5 | 15.4 | -| tvOS 18.0 | appletvos18.0 | 16.0 | +| tvOS 18.0 | appletvos18.0 | 16.1 | | Simulator - tvOS 16.4 | appletvsimulator16.4 | 14.3.1 | | Simulator - tvOS 17.0 | appletvsimulator17.0 | 15.0.1 | | Simulator - tvOS 17.2 | appletvsimulator17.2 | 15.1, 15.2 | | Simulator - tvOS 17.4 | appletvsimulator17.4 | 15.3 | | Simulator - tvOS 17.5 | appletvsimulator17.5 | 15.4 | -| Simulator - tvOS 18.0 | appletvsimulator18.0 | 16.0 | +| Simulator - tvOS 18.0 | appletvsimulator18.0 | 16.1 | | watchOS 9.4 | watchos9.4 | 14.3.1 | | watchOS 10.0 | watchos10.0 | 15.0.1 | | watchOS 10.2 | watchos10.2 | 15.1, 15.2 | | watchOS 10.4 | watchos10.4 | 15.3 | | watchOS 10.5 | watchos10.5 | 15.4 | -| watchOS 11.0 | watchos11.0 | 16.0 | +| watchOS 11.0 | watchos11.0 | 16.1 | | Simulator - watchOS 9.4 | watchsimulator9.4 | 14.3.1 | | Simulator - watchOS 10.0 | watchsimulator10.0 | 15.0.1 | | Simulator - watchOS 10.2 | watchsimulator10.2 | 15.1, 15.2 | | Simulator - watchOS 10.4 | watchsimulator10.4 | 15.3 | | Simulator - watchOS 10.5 | watchsimulator10.5 | 15.4 | -| Simulator - watchOS 11.0 | watchsimulator11.0 | 16.0 | +| Simulator - watchOS 11.0 | watchsimulator11.0 | 16.1 | | visionOS 1.0 | xros1.0 | 15.2 | | Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | | Simulator - visionOS 1.1 | xrsimulator1.1 | 15.3 | | visionOS 1.1 | xros1.1 | 15.3 | | Simulator - visionOS 1.2 | xrsimulator1.2 | 15.4 | | visionOS 1.2 | xros1.2 | 15.4 | -| visionOS 2.0 | xros2.0 | 16.0 | -| Simulator - visionOS 2.0 | xrsimulator2.0 | 16.0 | +| Simulator - visionOS 2.0 | xrsimulator2.0 | 16.1 | +| visionOS 2.0 | xros2.0 | 16.1 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | -| Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | +| Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | | DriverKit 22.4 | driverkit22.4 | 14.3.1 | | DriverKit 23.0 | driverkit23.0 | 15.0.1 | | DriverKit 23.2 | driverkit23.2 | 15.1, 15.2 | | DriverKit 23.4 | driverkit23.4 | 15.3 | | DriverKit 23.5 | driverkit23.5 | 15.4 | -| DriverKit 24.0 | driverkit24.0 | 16.0 | +| DriverKit 24.1 | driverkit24.1 | 16.1 | #### Installed Simulators | OS | Xcode Version | Simulators | | ------------ | -------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | iOS 16.4 | 14.3.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 17.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 17.2 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 17.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | -| iOS 17.5 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | -| iOS 18.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | -| tvOS 16.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 17.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 17.2 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 17.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 17.5 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 18.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| watchOS 9.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | -| watchOS 10.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | -| watchOS 10.2 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | -| watchOS 10.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | -| watchOS 10.5 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | -| watchOS 11.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | -| visionOS 1.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0 | Apple Vision Pro | -| visionOS 1.1 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0 | Apple Vision Pro | -| visionOS 1.2 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0 | Apple Vision Pro | -| visionOS 2.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0 | Apple Vision Pro | +| iOS 17.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 17.2 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 17.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | +| iOS 17.5 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | +| iOS 18.1 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | +| tvOS 16.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 17.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 17.2 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 17.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 17.5 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 18.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| watchOS 9.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | +| watchOS 10.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 10.2 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 10.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 10.5 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 11.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | +| visionOS 1.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.1 | Apple Vision Pro | +| visionOS 1.1 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.1 | Apple Vision Pro | +| visionOS 1.2 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.1 | Apple Vision Pro | +| visionOS 2.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.1 | Apple Vision Pro | ### Android -| Package Name | Version | -| -------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 11.0 | -| Android Emulator | 34.2.16 | -| Android SDK Build-tools | 35.0.0<br>34.0.0<br>33.0.2 33.0.3 | -| Android SDK Platforms | android-35 (rev 1)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | -| Android SDK Platform-Tools | 35.0.2 | -| Android Support Repository | 47.0.0 | -| CMake | 3.22.1 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 24.0.8215888<br>25.2.9519653<br>26.3.11579264 (default) | +| Package Name | Version | +| -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 11.0 | +| Android Emulator | 34.2.16 | +| Android SDK Build-tools | 35.0.0<br>34.0.0<br>33.0.2 33.0.3 | +| Android SDK Platforms | android-35 (rev 1)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | +| Android SDK Platform-Tools | 35.0.2 | +| Android Support Repository | 47.0.0 | +| CMake | 3.22.1 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 24.0.8215888<br>25.2.9519653<br>26.3.11579264 (default) | #### Environment variables | Name | Value | @@ -262,4 +258,3 @@ | ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/26.3.11579264 | | ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk/26.3.11579264 | | ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | - From f8049e323bcaae26ce9a571195eeda162a99021c Mon Sep 17 00:00:00 2001 From: vidyasagarnimmagaddi <160703874+vidyasagarnimmagaddi@users.noreply.github.com> Date: Thu, 22 Aug 2024 00:27:56 +0530 Subject: [PATCH 3056/3485] adding_kotlin in ubuntu_24 (#10474) --- images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 | 4 +--- images/ubuntu/scripts/tests/Tools.Tests.ps1 | 2 +- images/ubuntu/templates/ubuntu-24.04.pkr.hcl | 1 + 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 b/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 index 0688c8055e45..d7c82e55c145 100644 --- a/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 +++ b/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 @@ -48,9 +48,7 @@ if (Test-IsUbuntu20) { $languageAndRuntime.AddToolVersionsListInline("GNU C++", $(Get-CPPVersions), "^\d+") $languageAndRuntime.AddToolVersionsListInline("GNU Fortran", $(Get-FortranVersions), "^\d+") $languageAndRuntime.AddToolVersion("Julia", $(Get-JuliaVersion)) -if ((Test-IsUbuntu20) -or (Test-IsUbuntu22)) { - $languageAndRuntime.AddToolVersion("Kotlin", $(Get-KotlinVersion)) -} +$languageAndRuntime.AddToolVersion("Kotlin", $(Get-KotlinVersion)) if (-not $(Test-IsUbuntu24)) { $languageAndRuntime.AddToolVersion("Mono", $(Get-MonoVersion)) $languageAndRuntime.AddToolVersion("MSBuild", $(Get-MsbuildVersion)) diff --git a/images/ubuntu/scripts/tests/Tools.Tests.ps1 b/images/ubuntu/scripts/tests/Tools.Tests.ps1 index cb9c07308e7c..2c891f1816ce 100644 --- a/images/ubuntu/scripts/tests/Tools.Tests.ps1 +++ b/images/ubuntu/scripts/tests/Tools.Tests.ps1 @@ -390,7 +390,7 @@ Describe "yq" { } } -Describe "Kotlin" -Skip:((-not (Test-IsUbuntu20)) -and (-not (Test-IsUbuntu22))) { +Describe "Kotlin" { It "kapt" { "kapt -version" | Should -ReturnZeroExitCode } diff --git a/images/ubuntu/templates/ubuntu-24.04.pkr.hcl b/images/ubuntu/templates/ubuntu-24.04.pkr.hcl index 650202b3b627..3324ffd76c47 100644 --- a/images/ubuntu/templates/ubuntu-24.04.pkr.hcl +++ b/images/ubuntu/templates/ubuntu-24.04.pkr.hcl @@ -298,6 +298,7 @@ provisioner "shell" { "${path.root}/../scripts/build/install-java-tools.sh", "${path.root}/../scripts/build/install-kubernetes-tools.sh", "${path.root}/../scripts/build/install-miniconda.sh", + "${path.root}/../scripts/build/install-kotlin.sh", "${path.root}/../scripts/build/install-mysql.sh", "${path.root}/../scripts/build/install-nginx.sh", "${path.root}/../scripts/build/install-nodejs.sh", From 12d52d247ee16ec9c5a297155886495776e1e33f Mon Sep 17 00:00:00 2001 From: kishorekumar-anchala <168699259+kishorekumar-anchala@users.noreply.github.com> Date: Thu, 22 Aug 2024 01:30:50 +0530 Subject: [PATCH 3057/3485] wdk issu fix (#10475) --- images/windows/toolsets/toolset-2022.json | 1 + 1 file changed, 1 insertion(+) diff --git a/images/windows/toolsets/toolset-2022.json b/images/windows/toolsets/toolset-2022.json index 0832fbbedff3..1a3f742bd4d8 100644 --- a/images/windows/toolsets/toolset-2022.json +++ b/images/windows/toolsets/toolset-2022.json @@ -260,6 +260,7 @@ "Microsoft.VisualStudio.Workload.VisualStudioExtension", "Component.MDD.Linux", "Component.MDD.Linux.GCC.arm", + "Component.Microsoft.Windows.DriverKit", "wasm.tools" ], "vsix": [ From 439ecfcfdb75c45c87e7cfc1ac5ede9ddc1bd46d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 22 Aug 2024 06:15:34 +0000 Subject: [PATCH 3058/3485] Updating readme file for macos-13 version 20240819.2 (#10462) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-13-Readme.md | 82 ++++++++++++++++++--------------- 1 file changed, 45 insertions(+), 37 deletions(-) diff --git a/images/macos/macos-13-Readme.md b/images/macos/macos-13-Readme.md index 708a2cdf98d0..5964070e0206 100644 --- a/images/macos/macos-13-Readme.md +++ b/images/macos/macos-13-Readme.md @@ -1,16 +1,12 @@ -| Announcements | -|-| -| [[macOS] GCC 11 will be removed from all macOS images on August 12](https://github.com/actions/runner-images/issues/10213) | -*** # macOS 13 - OS Version: macOS 13.6.9 (22G830) - Kernel Version: Darwin 22.6.0 -- Image Version: 20240811.1 +- Image Version: 20240819.2 ## Installed Software ### Language and Runtime -- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.410, 8.0.101, 8.0.204, 8.0.303 +- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.410, 8.0.101, 8.0.204, 8.0.303, 8.0.401 - Bash 3.2.57(1)-release - Clang/LLVM 14.0.0 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` @@ -25,7 +21,7 @@ - Node.js 20.16.0 - Perl 5.38.2 - PHP 8.3.10 -- Python3 3.12.4 +- Python3 3.12.5 - Ruby 3.0.7p220 ### Package Management @@ -33,25 +29,25 @@ - Carthage 0.39.1 - CocoaPods 1.15.2 - Composer 2.7.7 -- Homebrew 4.3.14 +- Homebrew 4.3.17 - NPM 10.8.1 - NuGet 6.3.1.1 - Pip3 24.2 (python 3.12) - Pipx 1.6.0 - RubyGems 3.5.17 -- Vcpkg 2024 (build from commit e590c2b30) +- Vcpkg 2024 (build from commit a993be073) - Yarn 1.22.22 ### Project Management - Apache Ant 1.10.14 -- Apache Maven 3.9.8 -- Gradle 8.9 +- Apache Maven 3.9.9 +- Gradle 8.10 ### Utilities - 7-Zip 17.05 - aria2 1.37.0 - azcopy 10.26.0 -- bazel 7.2.1 +- bazel 7.3.1 - bazelisk 1.20.0 - bsdtar 3.5.3 - available by 'tar' alias - Curl 8.9.1 @@ -69,32 +65,32 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.17.27 -- AWS SAM CLI 1.121.0 +- AWS CLI 2.17.32 +- AWS SAM CLI 1.122.0 - AWS Session Manager CLI 1.2.650.0 - Azure CLI 2.63.0 - Azure CLI (azure-devops) 1.0.1 - Bicep CLI 0.29.47 - Cmake 3.30.2 -- CodeQL Action Bundle 2.18.1 +- CodeQL Action Bundle 2.18.2 - Fastlane 2.222.0 - SwiftFormat 0.54.3 -- Xcbeautify 2.10.0 +- Xcbeautify 2.11.0 - Xcode Command Line Tools 14.3.1.0.1.1683849156 - Xcodes 1.5.0 ### Linters -- SwiftLint 0.55.1 +- SwiftLint 0.56.1 ### Browsers - Safari 17.6 (18618.3.11.11.7) - SafariDriver 17.6 (18618.3.11.11.7) -- Google Chrome 127.0.6533.100 -- Google Chrome for Testing 127.0.6533.99 -- ChromeDriver 127.0.6533.99 -- Microsoft Edge 127.0.2651.98 -- Microsoft Edge WebDriver 127.0.2651.97 -- Mozilla Firefox 129.0 +- Google Chrome 127.0.6533.120 +- Google Chrome for Testing 127.0.6533.119 +- ChromeDriver 127.0.6533.119 +- Microsoft Edge 127.0.2651.105 +- Microsoft Edge WebDriver 127.0.2651.107 +- Mozilla Firefox 129.0.1 - geckodriver 0.34.0 - Selenium server 4.23.0 @@ -131,7 +127,7 @@ - 3.9.19 - 3.10.14 - 3.11.9 -- 3.12.4 +- 3.12.5 #### Node.js - 16.20.2 @@ -205,8 +201,8 @@ | Simulator - watchOS 9.4 | watchsimulator9.4 | 14.3.1 | | Simulator - watchOS 10.0 | watchsimulator10.0 | 15.0.1 | | Simulator - watchOS 10.2 | watchsimulator10.2 | 15.1, 15.2 | -| Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | | visionOS 1.0 | xros1.0 | 15.2 | +| Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | @@ -234,18 +230,18 @@ | watchOS 10.2 | 14.1<br>14.2<br>14.3.1<br>15.0.1<br>15.1<br>15.2 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | ### Android -| Package Name | Version | -| -------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 11.0 | -| Android Emulator | 34.2.16 | -| Android SDK Build-tools | 35.0.0<br>34.0.0<br>33.0.2 33.0.3 | -| Android SDK Platforms | android-35 (rev 1)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | -| Android SDK Platform-Tools | 35.0.2 | -| Android Support Repository | 47.0.0 | -| CMake | 3.22.1 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 24.0.8215888<br>25.2.9519653<br>26.3.11579264 (default) | +| Package Name | Version | +| -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 11.0 | +| Android Emulator | 34.2.16 | +| Android SDK Build-tools | 35.0.0<br>34.0.0<br>33.0.2 33.0.3 | +| Android SDK Platforms | android-35 (rev 1)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | +| Android SDK Platform-Tools | 35.0.2 | +| Android Support Repository | 47.0.0 | +| CMake | 3.22.1 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 24.0.8215888<br>25.2.9519653<br>26.3.11579264 (default) | #### Environment variables | Name | Value | @@ -257,3 +253,15 @@ | ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk/26.3.11579264 | | ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | +### Miscellaneous + +#### Environment variables +| Name | Value | +| ----------------- | ----------------------------------------------------------------------------------------- | +| PARALLELS_DMG_URL | https://download.parallels.com/desktop/v19/19.4.1-54985/ParallelsDesktop-19.4.1-54985.dmg | + +##### Notes +``` +If you want to use Parallels Desktop you should download a package from URL stored in +PARALLELS_DMG_URL environment variable. A system extension is allowed for this version. +``` From d72a4523b15eb2e303c1ea5100a23c34d9475f4f Mon Sep 17 00:00:00 2001 From: Prasanjit Sahoo <160633557+prasanjitsahoo@users.noreply.github.com> Date: Thu, 22 Aug 2024 19:14:48 +0530 Subject: [PATCH 3059/3485] [macOS] Adding Xcode 16.0 Beta 5 for macOS-14 back to the repository (#10467) [macOS] Adding Xcode 16.0 Beta 5 back to macOS-14 --- images/macos/toolsets/toolset-14.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/images/macos/toolsets/toolset-14.json b/images/macos/toolsets/toolset-14.json index d2c867492642..93986c949b14 100644 --- a/images/macos/toolsets/toolset-14.json +++ b/images/macos/toolsets/toolset-14.json @@ -4,6 +4,7 @@ "x64": { "versions": [ { "link": "16.1_beta", "version": "16.1.0-Beta+16B5001e", "symlinks": ["16.1"], "install_runtimes": "true", "sha256": "8848aacb32bdc0abbd7e14e4b712e07c98f4b6e5a23a8d77db03ab21dcb3c777"}, + { "link": "16_beta_5", "version": "16.0.0-Beta.5+16A5221g", "symlinks": ["16.0"], "install_runtimes": "false", "sha256": "00b44d41fcfcacb613575871ceff5c1c07de99b7501f8c48170af002763cd517"}, { "link": "15.4", "version": "15.4.0+15F31d", "install_runtimes": "true", "sha256": "82d3d61804ff3f4c7c82085e91dc701037ddaa770e542848b2477e22f4e8aa7a"}, { "link": "15.3", "version": "15.3.0+15E204a", "install_runtimes": "true", "sha256": "f13f6a2e2df432c3008e394640b8549a18c285acd7fd148d6c4bac8c3a5af234"}, { "link": "15.2", "version": "15.2.0+15C500b", "install_runtimes": "true", "sha256": "04E93680C6DDBEC84666531BE412DE778AFC8EAC6AB2037F4C2BE7290818B59B"}, @@ -15,6 +16,7 @@ "arm64":{ "versions": [ { "link": "16.1_beta", "version": "16.1.0-Beta+16B5001e", "symlinks": ["16.1"], "install_runtimes": "true", "sha256": "8848aacb32bdc0abbd7e14e4b712e07c98f4b6e5a23a8d77db03ab21dcb3c777"}, + { "link": "16_beta_5", "version": "16.0.0-Beta.5+16A5221g", "symlinks": ["16.0"], "install_runtimes": "true", "sha256": "00b44d41fcfcacb613575871ceff5c1c07de99b7501f8c48170af002763cd517"}, { "link": "15.4", "version": "15.4.0+15F31d", "install_runtimes": "true", "sha256": "82d3d61804ff3f4c7c82085e91dc701037ddaa770e542848b2477e22f4e8aa7a"}, { "link": "15.3", "version": "15.3.0+15E204a", "install_runtimes": "true", "sha256": "f13f6a2e2df432c3008e394640b8549a18c285acd7fd148d6c4bac8c3a5af234"}, { "link": "15.2", "version": "15.2.0+15C500b", "install_runtimes": "true", "sha256": "04E93680C6DDBEC84666531BE412DE778AFC8EAC6AB2037F4C2BE7290818B59B"}, From e5de19ba15d010423132f6de793ced40bc8a21ad Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 25 Aug 2024 09:17:23 +0000 Subject: [PATCH 3060/3485] Updating readme file for macos-12 version 20240819.7 (#10473) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-12-Readme.md | 75 +++++++++++++++------------------ 1 file changed, 35 insertions(+), 40 deletions(-) diff --git a/images/macos/macos-12-Readme.md b/images/macos/macos-12-Readme.md index 68c07af2e941..6cb330cd47c9 100644 --- a/images/macos/macos-12-Readme.md +++ b/images/macos/macos-12-Readme.md @@ -1,16 +1,12 @@ -| Announcements | -|-| -| [[macOS] GCC 11 will be removed from all macOS images on August 12](https://github.com/actions/runner-images/issues/10213) | -*** # macOS 12 - OS Version: macOS 12.7.6 (21H1320) - Kernel Version: Darwin 21.6.0 -- Image Version: 20240811.1 +- Image Version: 20240819.7 ## Installed Software ### Language and Runtime -- .NET Core SDK: 6.0.424, 7.0.102, 7.0.202, 7.0.306, 7.0.410, 8.0.101, 8.0.204, 8.0.303 +- .NET Core SDK: 6.0.425, 7.0.102, 7.0.202, 7.0.306, 7.0.410, 8.0.101, 8.0.204, 8.0.303, 8.0.401 - Bash 3.2.57(1)-release - Clang/LLVM 14.0.0 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` @@ -31,7 +27,7 @@ - Perl 5.38.2 - PHP 8.3.10 - Python 2.7.18 -- Python3 3.12.4 +- Python3 3.12.5 - R 4.4.1 - Ruby 3.0.7p220 @@ -40,7 +36,7 @@ - Carthage 0.39.1 - CocoaPods 1.15.2 - Composer 2.7.7 -- Homebrew 4.3.14 +- Homebrew 4.3.17 - Miniconda 24.5.0 - NPM 10.7.0 - NuGet 6.3.1.1 @@ -48,7 +44,7 @@ - Pip3 24.2 (python 3.12) - Pipx 1.6.0 - RubyGems 3.5.17 -- Vcpkg 2024 (build from commit e590c2b30) +- Vcpkg 2024 (build from commit a993be073) - Yarn 1.22.22 #### Environment variables @@ -59,15 +55,15 @@ ### Project Management - Apache Ant 1.10.14 -- Apache Maven 3.9.8 -- Gradle 8.9 +- Apache Maven 3.9.9 +- Gradle 8.10 - Sbt 1.10.1 ### Utilities - 7-Zip 17.05 - aria2 1.37.0 - azcopy 10.26.0 -- bazel 7.2.1 +- bazel 7.3.1 - bazelisk 1.20.0 - bsdtar 3.5.1 - available by 'tar' alias - Curl 8.9.1 @@ -96,16 +92,16 @@ ### Tools - App Center CLI 3.0.1 -- AWS CLI 2.17.27 -- AWS SAM CLI 1.121.0 +- AWS CLI 2.17.33 +- AWS SAM CLI 1.123.0 - AWS Session Manager CLI 1.2.650.0 - Azure CLI 2.63.0 - Azure CLI (azure-devops) 1.0.1 - Bicep CLI 0.29.47 - Cabal 3.10.3.0 - Cmake 3.30.2 -- CodeQL Action Bundle 2.18.1 -- Colima 0.7.1 +- CodeQL Action Bundle 2.18.2 +- Colima 0.7.3 - Fastlane 2.222.0 - GHC 9.10.1 - GHCup 0.1.30.0 @@ -124,12 +120,12 @@ ### Browsers - Safari 17.6 (17618.3.11.11.7) - SafariDriver 17.6 (17618.3.11.11.7) -- Google Chrome 127.0.6533.100 -- Google Chrome for Testing 127.0.6533.99 -- ChromeDriver 127.0.6533.99 -- Microsoft Edge 127.0.2651.98 -- Microsoft Edge WebDriver 127.0.2651.97 -- Mozilla Firefox 129.0 +- Google Chrome 127.0.6533.120 +- Google Chrome for Testing 127.0.6533.119 +- ChromeDriver 127.0.6533.119 +- Microsoft Edge 127.0.2651.105 +- Microsoft Edge WebDriver 127.0.2651.107 +- Mozilla Firefox 129.0.1 - geckodriver 0.34.0 - Selenium server 4.23.0 @@ -167,7 +163,7 @@ - 3.9.19 - 3.10.14 - 3.11.9 -- 3.12.4 +- 3.12.5 #### Node.js - 16.20.2 @@ -186,8 +182,8 @@ - Rustup 1.27.1 #### Packages -- Bindgen 0.69.4 -- Cargo-audit 0.20.0 +- Bindgen 0.70.0 +- Cargo-audit 0.20.1 - Cargo-outdated 0.15.0 - Cbindgen 0.27.0 - Clippy 0.1.80 @@ -206,7 +202,7 @@ | Name | Version | ConfigFile | ServiceStatus | ListenPort | | ----- | ------- | ------------------------------- | ------------- | ---------- | | httpd | 2.4.62 | /usr/local/etc/httpd/httpd.conf | none | 80 | -| nginx | 1.27.0 | /usr/local/etc/nginx/nginx.conf | none | 80 | +| nginx | 1.27.1 | /usr/local/etc/nginx/nginx.conf | none | 80 | ### Xamarin @@ -214,7 +210,7 @@ | Version | Build | Path | | -------------- | ----------- | ------------------------------------ | | 2019 | 8.10.25.2 | /Applications/Visual Studio 2019.app | -| 2022 (default) | 17.6.13.424 | /Applications/Visual Studio.app | +| 2022 (default) | 17.6.14.413 | /Applications/Visual Studio.app | ##### Notes ``` @@ -331,18 +327,18 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" | watchOS 9.1 | 13.1<br>13.2.1<br>13.3.1<br>13.4.1<br>14.0.1<br>14.1<br>14.2 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | ### Android -| Package Name | Version | -| -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 8.0 | -| Android Emulator | 34.2.16 | -| Android SDK Build-tools | 35.0.0<br>34.0.0<br>33.0.0 33.0.1 33.0.2 33.0.3<br>32.0.0<br>31.0.0 | -| Android SDK Platforms | android-35 (rev 1)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1) | -| Android SDK Platform-Tools | 35.0.2 | -| Android Support Repository | 47.0.0 | -| CMake | 3.18.1<br>3.22.1 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 24.0.8215888<br>25.2.9519653 (default)<br>26.3.11579264 | +| Package Name | Version | +| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 8.0 | +| Android Emulator | 34.2.16 | +| Android SDK Build-tools | 35.0.0<br>34.0.0<br>33.0.0 33.0.1 33.0.2 33.0.3<br>32.0.0<br>31.0.0 | +| Android SDK Platforms | android-35 (rev 1)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1) | +| Android SDK Platform-Tools | 35.0.2 | +| Android Support Repository | 47.0.0 | +| CMake | 3.18.1<br>3.22.1 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 24.0.8215888<br>25.2.9519653 (default)<br>26.3.11579264 | #### Environment variables | Name | Value | @@ -370,4 +366,3 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" If you want to use Parallels Desktop you should download a package from URL stored in PARALLELS_DMG_URL environment variable. A system extension is allowed for this version. ``` - From 23c98d86f0d6d2e4cb338be81f3bf9fd1b119e32 Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Mon, 26 Aug 2024 13:54:01 +0200 Subject: [PATCH 3061/3485] [macOS] Remove stale code (#10430) --- .../azure-pipelines/image-generation.yml | 151 ------------------ images.CI/macos/azure-pipelines/macos11.yml | 28 ---- images.CI/macos/azure-pipelines/macos12.yml | 28 ---- .../azure-pipelines/secondary-macos11.yml | 23 --- .../azure-pipelines/secondary-macos12.yml | 23 --- images.CI/macos/destroy-vm.ps1 | 95 ----------- images.CI/macos/helpers.psm1 | 38 ----- images.CI/macos/move-vm.ps1 | 86 ---------- images.CI/macos/select-datastore.ps1 | 117 -------------- images.CI/macos/set-vm-size.ps1 | 73 --------- images.CI/macos/validate-contributor.ps1 | 63 -------- 11 files changed, 725 deletions(-) delete mode 100644 images.CI/macos/azure-pipelines/image-generation.yml delete mode 100644 images.CI/macos/azure-pipelines/macos11.yml delete mode 100644 images.CI/macos/azure-pipelines/macos12.yml delete mode 100644 images.CI/macos/azure-pipelines/secondary-macos11.yml delete mode 100644 images.CI/macos/azure-pipelines/secondary-macos12.yml delete mode 100644 images.CI/macos/destroy-vm.ps1 delete mode 100644 images.CI/macos/helpers.psm1 delete mode 100644 images.CI/macos/move-vm.ps1 delete mode 100644 images.CI/macos/select-datastore.ps1 delete mode 100644 images.CI/macos/set-vm-size.ps1 delete mode 100644 images.CI/macos/validate-contributor.ps1 diff --git a/images.CI/macos/azure-pipelines/image-generation.yml b/images.CI/macos/azure-pipelines/image-generation.yml deleted file mode 100644 index a8a917c64bc5..000000000000 --- a/images.CI/macos/azure-pipelines/image-generation.yml +++ /dev/null @@ -1,151 +0,0 @@ -jobs: -- job: Image_generation - displayName: Image Generation (${{ parameters.image_label }}) - timeoutInMinutes: 1200 - pool: - name: Mac-Cloud Image Generation - demands: - - PrimaryRackAgent -equals ${{ parameters.primary_agent }} - variables: - - group: ${{ parameters.variable_group_name }} - - steps: - - pwsh: | - $cleanBuildNumber = "$(Build.BuildNumber)" -replace "(.+_unstable)(\.\d+)", '$1' - $virtualMachineName = "${cleanBuildNumber}.$(System.JobAttempt)" - echo "##vso[task.setvariable variable=VirtualMachineName;]$virtualMachineName" - echo "##vso[build.updatebuildnumber]$virtualMachineName" - displayName: Update BuildNumber - - - checkout: self - clean: true - fetchDepth: 1 - - - task: PowerShell@2 - displayName: 'Validate contributor permissions' - condition: startsWith(variables['Build.SourceBranch'], 'refs/pull/') - inputs: - targetType: 'filePath' - filePath: ./images.CI/macos/validate-contributor.ps1 - pwsh: true - arguments: -RepositoryName "$(Build.Repository.Name)" ` - -AccessToken "$(github-feed-token)" ` - -SourceBranch "$(Build.SourceBranch)" ` - -ContributorAllowList "$(CONTRIBUTOR_ALLOWLIST)" - - - task: PowerShell@2 - displayName: 'Download custom repository' - condition: and(ne(variables['CUSTOM_REPOSITORY_URL'], ''), ne(variables['CUSTOM_REPOSITORY_BRANCH'], '')) - inputs: - targetType: 'filePath' - filePath: ./images.CI/download-repo.ps1 - arguments: -RepoUrl $(CUSTOM_REPOSITORY_URL) ` - -RepoBranch $(CUSTOM_REPOSITORY_BRANCH) - - - task: DeleteFiles@1 - displayName: Clean up self-hosted machine - inputs: - SourceFolder: 'images/macos/provision/log/' - RemoveSourceFolder: true - - - task: PowerShell@2 - displayName: 'Select datastore' - inputs: - targetType: 'filePath' - filePath: ./images.CI/macos/select-datastore.ps1 - arguments: -VMName "$(VirtualMachineName)" ` - -VIServer "$(vcenter-server-v2)" ` - -VIUserName "$(vcenter-username-v2)" ` - -VIPassword '$(vcenter-password-v2)' ` - -Cluster "$(esxi-cluster-v2)" - - - pwsh: | - $SensitiveData = @( - 'IP address:', - 'Using ssh communicator to connect:' - ) - - packer init ${{ parameters.template_path }} - packer build -on-error=abort ` - -var="vcenter_server=$(vcenter-server-v2)" ` - -var="vcenter_username=$(vcenter-username-v2)" ` - -var='vcenter_password=$(vcenter-password-v2)' ` - -var="vcenter_datacenter=$(vcenter-datacenter-v2)" ` - -var="cluster_or_esxi_host=$(esxi-cluster-v2)" ` - -var="esxi_datastore=$(buildDatastore)" ` - -var="output_folder=$(output-folder)" ` - -var="vm_username=$(vm-username)" ` - -var="vm_password=$(vm-password)" ` - -var="github_api_pat=$(github_api_pat)" ` - -var="build_id=$(VirtualMachineName)" ` - -var="baseimage_name=${{ parameters.base_image_name }}" ` - -var="xcode_install_storage_url=$(xcode_install_storage_url)" ` - -var="xcode_install_sas=$(xcode_install_sas)" ` - -color=false ` - ${{ parameters.template_path }} ` - | Where-Object { - #Filter sensitive data from Packer logs - $currentString = $_ - $sensitiveString = $SensitiveData | Where-Object { $currentString -match $_ } - $sensitiveString -eq $null - } - displayName: 'Build VM' - workingDirectory: 'images/macos' - env: - PACKER_LOG: 1 - PACKER_LOG_PATH: $(Agent.TempDirectory)/packer-log.txt - - - bash: | - echo "Copy software report files" - cp -vR "images/image-output/software-report/." "$(Build.ArtifactStagingDirectory)/" - - echo "Put VM name to 'VM_Done_Name' file" - echo "$(VirtualMachineName)" > "$(Build.ArtifactStagingDirectory)/VM_Done_Name" - displayName: Prepare artifact - - - bash: | - cat "$(Build.ArtifactStagingDirectory)/systeminfo.md" - displayName: Print markdown software report - - - bash: | - cat "$(Build.ArtifactStagingDirectory)/systeminfo.json" - displayName: Print json software report - - - task: PublishBuildArtifacts@1 - inputs: - ArtifactName: 'Built_VM_Artifacts' - displayName: Publish Artifacts - - - task: PowerShell@2 - displayName: 'Print provisioners duration' - inputs: - targetType: 'filePath' - filePath: ./images.CI/measure-provisioners-duration.ps1 - arguments: -PackerLogPath "$(Agent.TempDirectory)/packer-log.txt" ` - -PrintTopNLongest 25 - - - task: PowerShell@2 - displayName: 'Move vm to cold storage and clear datastore tag' - condition: always() - inputs: - targetType: 'filePath' - filePath: ./images.CI/macos/move-vm.ps1 - arguments: -VMName "$(VirtualMachineName)" ` - -TargetDataStore "${{ parameters.target_datastore }}" ` - -VIServer "$(vcenter-server-v2)" ` - -VIUserName "$(vcenter-username-v2)" ` - -VIPassword '$(vcenter-password-v2)' ` - -CpuCount "$(cpu-count)" ` - -CoresPerSocketCount "$(cores-per-socket-count)" ` - -Memory "$(memory)" - - - 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 "$(VirtualMachineName)" ` - -VIServer "$(vcenter-server-v2)" ` - -VIUserName "$(vcenter-username-v2)" ` - -VIPassword '$(vcenter-password-v2)' diff --git a/images.CI/macos/azure-pipelines/macos11.yml b/images.CI/macos/azure-pipelines/macos11.yml deleted file mode 100644 index 7f659c75f57c..000000000000 --- a/images.CI/macos/azure-pipelines/macos11.yml +++ /dev/null @@ -1,28 +0,0 @@ -name: macOS-11_$(date:yyyyMMdd)$(rev:.r)_unstable -schedules: -- cron: '45 0 * * *' - displayName: Daily - branches: - include: - - main - always: true - -trigger: none -pr: - autoCancel: true - branches: - include: - - main - -variables: -- group: Mac-Cloud Image Generation - -jobs: -- template: image-generation.yml - parameters: - image_label: 'macOS Big Sur' - base_image_name: 'clean-macOS-11-380Gb-runner' - template_path: 'templates/macOS-11.pkr.hcl' - target_datastore: 'ds-image' - variable_group_name: 'Mac-Cloud Image Generation' - primary_agent: 'true' diff --git a/images.CI/macos/azure-pipelines/macos12.yml b/images.CI/macos/azure-pipelines/macos12.yml deleted file mode 100644 index e3652d8d4b61..000000000000 --- a/images.CI/macos/azure-pipelines/macos12.yml +++ /dev/null @@ -1,28 +0,0 @@ -name: macOS-12_$(date:yyyyMMdd)$(rev:.r)_unstable -schedules: -- cron: "0 0 * * *" - displayName: Daily - branches: - include: - - main - always: true - -trigger: none -pr: - autoCancel: true - branches: - include: - - main - -variables: -- group: Mac-Cloud Image Generation - -jobs: -- template: image-generation.yml - parameters: - image_label: 'macOS Monterey' - base_image_name: 'clean-macOS-12-380Gb-runner' - template_path: 'templates/macOS-12.pkr.hcl' - target_datastore: 'ds-image' - variable_group_name: 'Mac-Cloud Image Generation' - primary_agent: 'true' diff --git a/images.CI/macos/azure-pipelines/secondary-macos11.yml b/images.CI/macos/azure-pipelines/secondary-macos11.yml deleted file mode 100644 index 5e86fa88a1f8..000000000000 --- a/images.CI/macos/azure-pipelines/secondary-macos11.yml +++ /dev/null @@ -1,23 +0,0 @@ -name: macOS-11_$(date:yyyyMMdd)$(rev:.r)_unstable -schedules: -- cron: '45 0 * * 1' - displayName: Weekly - branches: - include: - - main - always: true - -trigger: none - -variables: -- group: Mac-Cloud Image Generation - -jobs: -- template: image-generation.yml - parameters: - image_label: 'macOS Big Sur' - base_image_name: 'clean-macOS-11-380Gb-runner' - template_path: 'templates/macOS-11.pkr.hcl' - target_datastore: 'ds-image' - variable_group_name: 'Mac-Cloud Secondary Image Generation' - primary_agent: 'false' diff --git a/images.CI/macos/azure-pipelines/secondary-macos12.yml b/images.CI/macos/azure-pipelines/secondary-macos12.yml deleted file mode 100644 index a43c2c0ea267..000000000000 --- a/images.CI/macos/azure-pipelines/secondary-macos12.yml +++ /dev/null @@ -1,23 +0,0 @@ -name: macOS-12_$(date:yyyyMMdd)$(rev:.r)_unstable -schedules: -- cron: '45 1 * * 1' - displayName: Weekly - branches: - include: - - main - always: true - -trigger: none - -variables: -- group: Mac-Cloud Image Generation - -jobs: -- template: image-generation.yml - parameters: - image_label: 'macOS Monterey' - base_image_name: 'clean-macOS-12-380Gb-runner' - template_path: 'templates/macOS-12.pkr.hcl' - target_datastore: 'ds-image' - variable_group_name: 'Mac-Cloud Secondary Image Generation' - primary_agent: 'false' diff --git a/images.CI/macos/destroy-vm.ps1 b/images.CI/macos/destroy-vm.ps1 deleted file mode 100644 index 774fa111599a..000000000000 --- a/images.CI/macos/destroy-vm.ps1 +++ /dev/null @@ -1,95 +0,0 @@ -<# -.SYNOPSIS - -This script deletes vm from vCenter - -.PARAMETER VMName -VM name to delete (Example "macOS-10.15_20201012.4") - -.PARAMETER VIServer -vCenter address (Example "10.0.1.16") - -.PARAMETER VIUserName -vCenter username (Example "Administrator") - -.PARAMETER VIPassword -vCenter password (Example "12345678") -#> - -[CmdletBinding()] -param( - [Parameter(Mandatory)] - [ValidateNotNullOrEmpty()] - [string]$VMName, - - [Parameter(Mandatory)] - [ValidateNotNullOrEmpty()] - [string]$VIServer, - - [Parameter(Mandatory)] - [ValidateNotNullOrEmpty()] - [string]$VIUserName, - - [Parameter(Mandatory)] - [ValidateNotNullOrEmpty()] - [string]$VIPassword -) - -# Import helpers module -Import-Module $PSScriptRoot\helpers.psm1 -DisableNameChecking - -# Connection to a vCenter Server system -Connect-VCServer -VIServer $VIServer -VIUserName $VIUserName -VIPassword $VIPassword - -# 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 canceled" - } - 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 diff --git a/images.CI/macos/helpers.psm1 b/images.CI/macos/helpers.psm1 deleted file mode 100644 index ddb09cd621b4..000000000000 --- a/images.CI/macos/helpers.psm1 +++ /dev/null @@ -1,38 +0,0 @@ -<# -.SYNOPSIS - -Helper functions to use in images.CI scripts -#> - -Function Connect-VCServer -{ - [CmdletBinding()] - param( - [Parameter(Mandatory)] - [System.String]$VIUserName, - - [Parameter(Mandatory)] - [System.String]$VIPassword, - - [Parameter(Mandatory)] - [System.String]$VIServer - ) - - try - { - # Preference - $global:ProgressPreference = 'SilentlyContinue' - $global:WarningPreference = 'SilentlyContinue' - # Ignore SSL - $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 - } -} \ No newline at end of file diff --git a/images.CI/macos/move-vm.ps1 b/images.CI/macos/move-vm.ps1 deleted file mode 100644 index d3589299adc2..000000000000 --- a/images.CI/macos/move-vm.ps1 +++ /dev/null @@ -1,86 +0,0 @@ -<# -.SYNOPSIS - -This script migrates given VM to another datastore - -.PARAMETER VMName -VM name to migrate (Example "macOS-10.15_20201012.4") - -.PARAMETER TargetDataStore -Target datastore (Example "ds-image") - -.PARAMETER VIServer -vCenter address (Example "10.0.1.16") - -.PARAMETER VIUserName -vCenter username (Example "Administrator") - -.PARAMETER VIPassword -vCenter password (Example "12345678") -#> - -[CmdletBinding()] -param( - [Parameter(Mandatory)] - [ValidateNotNullOrEmpty()] - [string]$VMName, - - [Parameter(Mandatory)] - [ValidateNotNullOrEmpty()] - [string]$TargetDataStore, - - [Parameter(Mandatory)] - [ValidateNotNullOrEmpty()] - [string]$VIServer, - - [Parameter(Mandatory)] - [ValidateNotNullOrEmpty()] - [string]$VIUserName, - - [Parameter(Mandatory)] - [ValidateNotNullOrEmpty()] - [string]$VIPassword, - - [string]$JobStatus, - - [int32]$CpuCount, - - [int32]$CoresPerSocketCount, - - [int64]$Memory -) - -# Import helpers module -Import-Module $PSScriptRoot\helpers.psm1 -DisableNameChecking - -# Connection to a vCenter Server system -Connect-VCServer -VIServer $VIServer -VIUserName $VIUserName -VIPassword $VIPassword - -# Clear previously assigned tag with VM Name -try { - Remove-Tag $VMName -Confirm:$false -} catch { - Write-Host "Tag with $VMName doesn't exist" -} - -$vm = Get-VM $VMName -if (($env:AGENT_JOBSTATUS -and $env:AGENT_JOBSTATUS -eq 'Failed') -or ($JobStatus -and $JobStatus -eq 'failure')) { - try { - if ($vm.PowerState -ne "PoweredOff") { - Stop-VM -VM $vm -Confirm:$false -ErrorAction Stop | Out-Null - } - Set-VM -VM $vm -Name "${VMName}_failed" -Confirm:$false -ErrorAction Stop | Out-Null - Write-Host "VM has been successfully powered off and renamed to [${VMName}_failed]" - } catch { - Write-Host "##vso[task.LogIssue type=error;]Failed to power off and rename VM '$VMName'" - exit 1 - } -} - -try { - Move-VM -Vm $vm -Datastore $TargetDataStore -ErrorAction Stop | Out-Null - Write-Host "VM has been moved successfully to target datastore '$TargetDataStore'" -} catch { - Write-Host "##vso[task.LogIssue type=error;]Failed to move VM '$VMName' to target datastore '$TargetDataStore'" - exit 1 -} diff --git a/images.CI/macos/select-datastore.ps1 b/images.CI/macos/select-datastore.ps1 deleted file mode 100644 index feec67bc9b4d..000000000000 --- a/images.CI/macos/select-datastore.ps1 +++ /dev/null @@ -1,117 +0,0 @@ -<# -.SYNOPSIS - -This script selects local datastore based on the following rules: - -- Name starts with ds-local-Datastore -- Datastore FreespaceGB > 400 Gb -- VM count on the datastore < 2 - -.PARAMETER VIServer -vCenter address (Example "10.0.1.16") - -.PARAMETER VIUserName -vCenter username (Example "Administrator") - -.PARAMETER VIPassword -vCenter password (Example "12345678") -#> - - -[CmdletBinding()] -param( - [Parameter(Mandatory)] - [ValidateNotNullOrEmpty()] - [string]$VMName, - - [Parameter(Mandatory)] - [ValidateNotNullOrEmpty()] - [string]$VIServer, - - [Parameter(Mandatory)] - [ValidateNotNullOrEmpty()] - [string]$VIUserName, - - [Parameter(Mandatory)] - [ValidateNotNullOrEmpty()] - [string]$VIPassword, - - [Parameter(Mandatory)] - [ValidateNotNullOrEmpty()] - [string]$Cluster, - - [string]$TagCategory = "Busy" -) - -# Import helpers module -Import-Module $PSScriptRoot\helpers.psm1 -DisableNameChecking - -function Select-DataStore { - param ( - [string]$VMName, - [string]$TagCategory, - [string]$TemplateDatastore = "ds-local-Datastore-*", - [string]$Cluster, - [int]$ThresholdInGb = 400, - [int]$VMCount = 2, - [int]$Retries = 5 - ) - - # 1. Name starts with ds-local-Datastore - # 2. FreespaceGB > 400 Gb - # 3. Choose a datastore with the minimal VM count < 2 - - Write-Host "Start Datastore selection process..." - $clusterHosts = Get-Cluster -Name $Cluster | Get-VMHost - $availableClusterDatastores = $clusterHosts | Get-Datastore -Name $TemplateDatastore | Where-Object -Property State -eq "Available" - $availableDatastores = $availableClusterDatastores ` - | Where-Object { $_.FreeSpaceGB -ge $thresholdInGb } ` - | Where-Object { - $vmOnDatastore = @((Get-ChildItem -Path $_.DatastoreBrowserPath).Name -notmatch '(^\.|vmkdump)').Count - $vmOnDatastore -lt $vmCount } ` - | Group-Object -Property { $vmOnDatastore } - - $datastore = $availableDatastores | Select-Object @{n="VmCount";e={$_.Name}},@{n="DatastoreName";e={$_.Group | Get-Random}} -First 1 - $buildDatastore = $datastore.DatastoreName - - $tag = Get-Tag -Category $TagCategory -Name $VMName -ErrorAction Ignore - if (-not $tag) - { - $tag = New-Tag -Name $VMName -Category $TagCategory - } - - New-TagAssignment -Tag $tag -Entity $buildDatastore | Out-Null - - # Wait for 60 seconds to check if any other tags are assigned to the same datastore - Start-Sleep -Seconds 60 - # If there are no datastores with 0 VMs, take a datastore with 1 VM (index 1 if datastore has 0 VMs and 2 if 1 VM) - $index = 1 + [int]$datastore.VmCount - $tagAssignments = (Get-TagAssignment -Entity $buildDatastore).Tag.Name | Select-Object -First $index - $isAllow = $tagAssignments -contains $VMName - - if ($isAllow) - { - Write-Host "Datastore selected successfully" - Write-Host "##vso[task.setvariable variable=buildDatastore;issecret=true]$buildDatastore" - return - } - - # Remove the tag if datastore wasn't selected - Remove-Tag $tag -Confirm:$false - - $retries-- - if ($retries -le 0) - { - Write-Host "##vso[task.LogIssue type=error;]No datastores found for the condition" - exit 1 - } - - Write-Host "Datastore select failed, $retries left" - Select-DataStore -VMName $VMName -Cluster $Cluster -TagCategory $TagCategory -Retries $retries -} - -# Connection to a vCenter Server system -Connect-VCServer -VIServer $VIServer -VIUserName $VIUserName -VIPassword $VIPassword - -# Get a target datastore for current deployment -Select-DataStore -VMName $VMName -Cluster $Cluster -TagCategory $TagCategory diff --git a/images.CI/macos/set-vm-size.ps1 b/images.CI/macos/set-vm-size.ps1 deleted file mode 100644 index 68e63363ccda..000000000000 --- a/images.CI/macos/set-vm-size.ps1 +++ /dev/null @@ -1,73 +0,0 @@ -<# -.SYNOPSIS - -This script sets resources for VM - -.PARAMETER VMName -VM name to resize (Example "macOS-10.15_20201012.4") - -.PARAMETER VIServer -vCenter address (Example "10.0.1.16") - -.PARAMETER VIUserName -vCenter username (Example "Administrator") - -.PARAMETER VIPassword -vCenter password (Example "12345678") - -.PARAMETER CpuCount -Target number of CPUs (Example "3") - -.PARAMETER CoresPerSocketCount -Target number of cores per socket (Example "3") - -.PARAMETER Memory -Target amount of memory in MB (Example "14336") - -#> - -[CmdletBinding()] -param( - [Parameter(Mandatory)] - [ValidateNotNullOrEmpty()] - [string]$VMName, - - [Parameter(Mandatory)] - [ValidateNotNullOrEmpty()] - [string]$VIServer, - - [Parameter(Mandatory)] - [ValidateNotNullOrEmpty()] - [string]$VIUserName, - - [Parameter(Mandatory)] - [ValidateNotNullOrEmpty()] - [string]$VIPassword, - - [Parameter(Mandatory)] - [ValidateNotNullOrEmpty()] - [int32]$CpuCount, - - [Parameter(Mandatory)] - [ValidateNotNullOrEmpty()] - [int32]$CoresPerSocketCount, - - [Parameter(Mandatory)] - [ValidateNotNullOrEmpty()] - [int64]$Memory -) - -# Import helpers module -Import-Module $PSScriptRoot\helpers.psm1 -DisableNameChecking - -# Connection to a vCenter Server system -Connect-VCServer -VIServer $VIServer -VIUserName $VIUserName -VIPassword $VIPassword - -$vm = Get-VM $VMName -try { - Write-Host "Change CPU count to $CpuCount, cores count to $CoresPerSocketCount, amount of RAM to $Memory" - $vm | Set-VM -NumCPU $CpuCount -CoresPerSocket $CoresPerSocketCount -MemoryMB $Memory -Confirm:$false -ErrorAction Stop | Out-Null -} catch { - Write-Host "##vso[task.LogIssue type=error;]Failed to change specs for VM '$VMName'" - exit 1 -} diff --git a/images.CI/macos/validate-contributor.ps1 b/images.CI/macos/validate-contributor.ps1 deleted file mode 100644 index 312a9ef7e8fa..000000000000 --- a/images.CI/macos/validate-contributor.ps1 +++ /dev/null @@ -1,63 +0,0 @@ -param( - [Parameter(Mandatory)] [string] $RepositoryName, - [Parameter(Mandatory)] [string] $AccessToken, - [Parameter(Mandatory)] [string] $SourceBranch, - [Parameter(Mandatory)] [string] $ContributorAllowList -) - -function Build-AuthHeader { - param( - [Parameter(Mandatory)] [string] $AccessToken - ) - - $base64AuthInfo = [Convert]::ToBase64String([Text.Encoding]::ASCII.GetBytes("'':${AccessToken}")) - return "Basic ${base64AuthInfo}" -} - -function Get-PullRequest { - param( - [Parameter(Mandatory)] [string] $RepositoryName, - [Parameter(Mandatory)] [string] $AccessToken, - [Parameter(Mandatory)] [UInt32] $PullRequestNumber - ) - - $requestUrl = "https://api.github.com/repos/$RepositoryName/pulls/$PullRequestNumber" - $authHeader = Build-AuthHeader -AccessToken $AccessToken - - $params = @{ - Method = "GET" - ContentType = "application/json" - Uri = $requestUrl - Headers = @{ Authorization = $authHeader } - } - - return Invoke-RestMethod @params -} - -function Validate-ContributorPermissions { - param( - [Parameter(Mandatory)] [string] $ContributorAllowList, - [Parameter(Mandatory)] [string] $ContributorName - ) - - $allowedContributors = $ContributorAllowList.Split(",").Trim() - $validСontributor = $allowedContributors | Where-Object { $_ -eq $ContributorName } ` - | Select-Object -First 1 - - if (-not $validСontributor) { - Write-Host "Failed to start this build. '$ContributorName' is an unknown contributor" - Write-Host "Please add '$ContributorName' to the allowed list to run builds" - exit 1 - } -} - -$pullRequestNumber = $SourceBranch.Split("/")[2] - -$pullRequestInfo = Get-PullRequest -RepositoryName $RepositoryName ` - -AccessToken $AccessToken ` - -PullRequestNumber $pullRequestNumber - -$contributorName = $pullRequestInfo.user.login - -Validate-ContributorPermissions -ContributorAllowList $ContributorAllowList ` - -ContributorName $contributorName \ No newline at end of file From d33c9005ccc308dfce8ff1710cc1fcbc5c6b22ac Mon Sep 17 00:00:00 2001 From: Pavel Iakovenko <paveliak@users.noreply.github.com> Date: Mon, 26 Aug 2024 04:54:36 -0700 Subject: [PATCH 3062/3485] [macOS] Fix Chrome installer script which freezes VM (#10481) --- images/macos/scripts/build/install-chrome.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/images/macos/scripts/build/install-chrome.sh b/images/macos/scripts/build/install-chrome.sh index 709e1eaf3d61..c5c396b1a004 100644 --- a/images/macos/scripts/build/install-chrome.sh +++ b/images/macos/scripts/build/install-chrome.sh @@ -19,13 +19,13 @@ echo "Google Chrome version is $full_chrome_version" # Get Google Chrome versions information chrome_platform="mac-$arch" CHROME_VERSIONS_URL="https://googlechromelabs.github.io/chrome-for-testing/latest-patch-versions-per-build-with-downloads.json" -chrome_versions_json="$(cat $(download_with_retry "$CHROME_VERSIONS_URL"))" +chrome_versions_json=$(download_with_retry "$CHROME_VERSIONS_URL") # Download and unpack the latest release of Chrome Driver -chromedriver_version=$(echo $chrome_versions_json | jq -r '.builds["'"$chrome_version"'"].version') +chromedriver_version=$(cat $chrome_versions_json | jq -r '.builds["'"$chrome_version"'"].version') echo "Installing Chrome Driver version $chromedriver_version" -chromedriver_url=$(echo $chrome_versions_json | jq -r '.builds["'"$chrome_version"'"].downloads.chromedriver[] | select(.platform=="'"${chrome_platform}"'").url') +chromedriver_url=$(cat $chrome_versions_json | jq -r '.builds["'"$chrome_version"'"].downloads.chromedriver[] | select(.platform=="'"${chrome_platform}"'").url') chromedriver_dir="/usr/local/share/chromedriver-$chrome_platform" chromedriver_bin="$chromedriver_dir/chromedriver" @@ -36,10 +36,10 @@ ln -s $chromedriver_bin /usr/local/bin/chromedriver echo "export CHROMEWEBDRIVER=$chromedriver_dir" >> ${HOME}/.bashrc # Download and unpack the latest release of Google Chrome for Testing -chrome_for_testing_version=$(echo $chrome_versions_json | jq -r '.builds["'"$chrome_version"'"].version') +chrome_for_testing_version=$(cat $chrome_versions_json | jq -r '.builds["'"$chrome_version"'"].version') echo "Installing Google Chrome for Testing version $chrome_for_testing_version" -chrome_for_testing_url=$(echo $chrome_versions_json | jq -r '.builds["'"$chrome_version"'"].downloads.chrome[] | select(.platform=="'"${chrome_platform}"'").url') +chrome_for_testing_url=$(cat $chrome_versions_json | jq -r '.builds["'"$chrome_version"'"].downloads.chrome[] | select(.platform=="'"${chrome_platform}"'").url') chrome_for_testing_app="Google Chrome for Testing.app" chrome_for_testing_archive_path=$(download_with_retry $chrome_for_testing_url) From dd3eec73740f763c8465e9dcba5a5c197614a6a4 Mon Sep 17 00:00:00 2001 From: Prasanjit Sahoo <160633557+prasanjitsahoo@users.noreply.github.com> Date: Tue, 27 Aug 2024 13:05:09 +0530 Subject: [PATCH 3063/3485] [macOS] Update Xcode 16.0 to Beta 6 for macOS-14 (#10499) --- images/macos/toolsets/toolset-14.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/macos/toolsets/toolset-14.json b/images/macos/toolsets/toolset-14.json index 93986c949b14..a4ca9c5166e0 100644 --- a/images/macos/toolsets/toolset-14.json +++ b/images/macos/toolsets/toolset-14.json @@ -4,7 +4,7 @@ "x64": { "versions": [ { "link": "16.1_beta", "version": "16.1.0-Beta+16B5001e", "symlinks": ["16.1"], "install_runtimes": "true", "sha256": "8848aacb32bdc0abbd7e14e4b712e07c98f4b6e5a23a8d77db03ab21dcb3c777"}, - { "link": "16_beta_5", "version": "16.0.0-Beta.5+16A5221g", "symlinks": ["16.0"], "install_runtimes": "false", "sha256": "00b44d41fcfcacb613575871ceff5c1c07de99b7501f8c48170af002763cd517"}, + { "link": "16_beta_6", "version": "16.0.0-Beta.6+16A5230g", "symlinks": ["16.0"], "install_runtimes": "false", "sha256": "ab0b9a4f6d723420ee0e39ff1cf6a628665dfe832053f66b6b72e013a6bbb244"}, { "link": "15.4", "version": "15.4.0+15F31d", "install_runtimes": "true", "sha256": "82d3d61804ff3f4c7c82085e91dc701037ddaa770e542848b2477e22f4e8aa7a"}, { "link": "15.3", "version": "15.3.0+15E204a", "install_runtimes": "true", "sha256": "f13f6a2e2df432c3008e394640b8549a18c285acd7fd148d6c4bac8c3a5af234"}, { "link": "15.2", "version": "15.2.0+15C500b", "install_runtimes": "true", "sha256": "04E93680C6DDBEC84666531BE412DE778AFC8EAC6AB2037F4C2BE7290818B59B"}, @@ -16,7 +16,7 @@ "arm64":{ "versions": [ { "link": "16.1_beta", "version": "16.1.0-Beta+16B5001e", "symlinks": ["16.1"], "install_runtimes": "true", "sha256": "8848aacb32bdc0abbd7e14e4b712e07c98f4b6e5a23a8d77db03ab21dcb3c777"}, - { "link": "16_beta_5", "version": "16.0.0-Beta.5+16A5221g", "symlinks": ["16.0"], "install_runtimes": "true", "sha256": "00b44d41fcfcacb613575871ceff5c1c07de99b7501f8c48170af002763cd517"}, + { "link": "16_beta_6", "version": "16.0.0-Beta.6+16A5230g", "symlinks": ["16.0"], "install_runtimes": "true", "sha256": "ab0b9a4f6d723420ee0e39ff1cf6a628665dfe832053f66b6b72e013a6bbb244"}, { "link": "15.4", "version": "15.4.0+15F31d", "install_runtimes": "true", "sha256": "82d3d61804ff3f4c7c82085e91dc701037ddaa770e542848b2477e22f4e8aa7a"}, { "link": "15.3", "version": "15.3.0+15E204a", "install_runtimes": "true", "sha256": "f13f6a2e2df432c3008e394640b8549a18c285acd7fd148d6c4bac8c3a5af234"}, { "link": "15.2", "version": "15.2.0+15C500b", "install_runtimes": "true", "sha256": "04E93680C6DDBEC84666531BE412DE778AFC8EAC6AB2037F4C2BE7290818B59B"}, From 4e1b48a6c568a226485ce8c5de74be378ae5a9ee Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 28 Aug 2024 11:45:44 +0000 Subject: [PATCH 3064/3485] Updating readme file for macos-13 version 20240825.1 (#10488) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-13-Readme.md | 46 ++++++++++++++++----------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/images/macos/macos-13-Readme.md b/images/macos/macos-13-Readme.md index 5964070e0206..7328bc8ca592 100644 --- a/images/macos/macos-13-Readme.md +++ b/images/macos/macos-13-Readme.md @@ -1,7 +1,7 @@ # macOS 13 - OS Version: macOS 13.6.9 (22G830) - Kernel Version: Darwin 22.6.0 -- Image Version: 20240819.2 +- Image Version: 20240825.1 ## Installed Software @@ -16,9 +16,9 @@ - GNU Fortran 12 (Homebrew GCC 12.4.0) - available by `gfortran-12` alias - GNU Fortran 13 (Homebrew GCC 13.3.0) - available by `gfortran-13` alias - GNU Fortran 14 (Homebrew GCC 14.1.0_2) - available by `gfortran-14` alias -- Kotlin 2.0.10-release-540 +- Kotlin 2.0.20-release-360 - Mono 6.12.0.188 -- Node.js 20.16.0 +- Node.js 20.17.0 - Perl 5.38.2 - PHP 8.3.10 - Python3 3.12.5 @@ -28,14 +28,14 @@ - Bundler 2.5.17 - Carthage 0.39.1 - CocoaPods 1.15.2 -- Composer 2.7.7 +- Composer 2.7.8 - Homebrew 4.3.17 -- NPM 10.8.1 +- NPM 10.8.2 - NuGet 6.3.1.1 - Pip3 24.2 (python 3.12) -- Pipx 1.6.0 +- Pipx 1.7.1 - RubyGems 3.5.17 -- Vcpkg 2024 (build from commit a993be073) +- Vcpkg 2024 (build from commit 350898514) - Yarn 1.22.22 ### Project Management @@ -53,7 +53,7 @@ - Curl 8.9.1 - Git 2.46.0 - Git LFS 3.5.1 -- GitHub CLI 2.54.0 +- GitHub CLI 2.55.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.24.5 - gpg (GnuPG) 2.4.5 @@ -65,8 +65,8 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.17.32 -- AWS SAM CLI 1.122.0 +- AWS CLI 2.17.37 +- AWS SAM CLI 1.123.0 - AWS Session Manager CLI 1.2.650.0 - Azure CLI 2.63.0 - Azure CLI (azure-devops) 1.0.1 @@ -80,19 +80,19 @@ - Xcodes 1.5.0 ### Linters -- SwiftLint 0.56.1 +- SwiftLint 0.56.2 ### Browsers - Safari 17.6 (18618.3.11.11.7) - SafariDriver 17.6 (18618.3.11.11.7) -- Google Chrome 127.0.6533.120 -- Google Chrome for Testing 127.0.6533.119 -- ChromeDriver 127.0.6533.119 -- Microsoft Edge 127.0.2651.105 -- Microsoft Edge WebDriver 127.0.2651.107 -- Mozilla Firefox 129.0.1 -- geckodriver 0.34.0 -- Selenium server 4.23.0 +- Google Chrome 128.0.6613.85 +- Google Chrome for Testing 128.0.6613.84 +- ChromeDriver 128.0.6613.84 +- Microsoft Edge 128.0.2739.42 +- Microsoft Edge WebDriver 128.0.2739.41 +- Mozilla Firefox 129.0.2 +- geckodriver 0.35.0 +- Selenium server 4.23.1 #### Environment variables | Name | Value | @@ -132,7 +132,7 @@ #### Node.js - 16.20.2 - 18.20.4 -- 20.16.0 +- 20.17.0 #### Go - 1.20.14 @@ -150,7 +150,7 @@ - Rustfmt 1.7.0-stable ### PowerShell Tools -- PowerShell 7.4.4 +- PowerShell 7.4.5 #### PowerShell Modules - Az: 12.2.0 @@ -201,11 +201,11 @@ | Simulator - watchOS 9.4 | watchsimulator9.4 | 14.3.1 | | Simulator - watchOS 10.0 | watchsimulator10.0 | 15.0.1 | | Simulator - watchOS 10.2 | watchsimulator10.2 | 15.1, 15.2 | -| visionOS 1.0 | xros1.0 | 15.2 | | Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | +| visionOS 1.0 | xros1.0 | 15.2 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | -| Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | +| Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | DriverKit 22.1 | driverkit22.1 | 14.1 | | DriverKit 22.2 | driverkit22.2 | 14.2 | | DriverKit 22.4 | driverkit22.4 | 14.3.1 | From a27aca91e5a40794f27250231d8ac5f3e9072d18 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 28 Aug 2024 12:38:45 +0000 Subject: [PATCH 3065/3485] Updating readme file for ubuntu24 version 20240825.1.1 (#10493) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2404-Readme.md | 185 +++++++++++++++-------------- 1 file changed, 93 insertions(+), 92 deletions(-) diff --git a/images/ubuntu/Ubuntu2404-Readme.md b/images/ubuntu/Ubuntu2404-Readme.md index cd61c8ab8847..26c03df57cbf 100644 --- a/images/ubuntu/Ubuntu2404-Readme.md +++ b/images/ubuntu/Ubuntu2404-Readme.md @@ -5,8 +5,8 @@ *** # Ubuntu 24.04 LTS - OS Version: 24.04 LTS -- Kernel Version: 6.8.0-1012-azure -- Image Version: 20240818.1.0 +- Kernel Version: 6.8.0-1013-azure +- Image Version: 20240825.1.0 - Systemd version: 255.4-1ubuntu8.2 ## Installed Software @@ -20,7 +20,8 @@ - GNU C++: 12.3.0, 13.2.0, 14.0.1 - GNU Fortran: 12.3.0, 13.2.0, 14.0.1 - Julia 1.10.4 -- Node.js 20.16.0 +- Kotlin 2.0.20-release-360 +- Node.js 20.17.0 - Perl 5.38.2 - Python 3.12.3 - Ruby 3.2.3 @@ -28,14 +29,14 @@ ### Package Management - cpan 1.64 - Helm 3.15.4 -- Homebrew 4.3.16 -- Miniconda 24.5.0 -- Npm 10.8.1 +- Homebrew 4.3.17 +- Miniconda 24.7.1 +- Npm 10.8.2 - Pip 24.0 - Pip3 24.0 - Pipx 1.4.3 - RubyGems 3.4.20 -- Vcpkg (build from commit 2f210a9c1) +- Vcpkg (build from commit 350898514) - Yarn 1.22.22 #### Environment variables @@ -61,7 +62,7 @@ to accomplish this. ### Tools - Ansible 2.17.3 - AzCopy 10.26.0 - available by `azcopy` and `azcopy10` aliases -- Bazel 7.3.0 +- Bazel 7.3.1 - Bazelisk 1.19.0 - Bicep 0.29.47 - Buildah 1.33.7 @@ -85,11 +86,11 @@ to accomplish this. - Mercurial 6.7.2 - Minikube 1.33.1 - n 9.2.3 -- Newman 6.2.0 -- OpenSSL 3.0.13-0ubuntu3.2 +- Newman 6.2.1 +- OpenSSL 3.0.13-0ubuntu3.3 - Parcel 2.12.0 - Podman 4.9.3 -- Pulumi 3.129.0 +- Pulumi 3.130.0 - Skopeo 1.13.3 - Sphinx Open Source Search Server 2.2.11 - yamllint 1.35.1 @@ -97,12 +98,12 @@ to accomplish this. - zstd 1.5.6 ### CLI Tools -- AWS CLI 2.17.32 +- AWS CLI 2.17.37 - AWS CLI Session Manager Plugin 1.2.650.0 -- AWS SAM CLI 1.122.0 +- AWS SAM CLI 1.123.0 - Azure CLI 2.63.0 - Azure CLI (azure-devops) 1.0.1 -- GitHub CLI 2.54.0 +- GitHub CLI 2.55.0 ### Java | Version | Environment Variable | @@ -114,7 +115,7 @@ to accomplish this. ### PHP Tools - PHP: 8.3.6 -- Composer 2.7.7 +- Composer 2.7.8 - PHPUnit 8.5.39 ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. @@ -136,9 +137,9 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 127.0.6533.119 -- ChromeDriver 127.0.6533.119 -- Chromium 127.0.6533.0 +- Google Chrome 128.0.6613.84 +- ChromeDriver 128.0.6613.84 +- Chromium 128.0.6613.0 - Selenium server 4.23.1 #### Environment variables @@ -165,7 +166,7 @@ Use the following command as a part of your job to start the service: 'sudo syst ``` #### MySQL -- MySQL 8.0.39-0ubuntu0.24.04.1 +- MySQL 8.0.39-0ubuntu0.24.04.2 ``` User: root Password: root @@ -183,7 +184,7 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Node.js - 16.20.2 - 18.20.4 -- 20.16.0 +- 20.17.0 #### Python - 3.9.19 @@ -232,76 +233,76 @@ Use the following command as a part of your job to start the service: 'sudo syst | ANDROID_SDK_ROOT | /usr/local/lib/android/sdk | ### Installed apt packages -| Name | Version | -| ---------------------- | -------------------------- | -| acl | 2.3.2-1build1 | -| aria2 | 1.37.0+debian-1build3 | -| autoconf | 2.71-3 | -| automake | 1:1.16.5-1.3ubuntu1 | -| binutils | 2.42-4ubuntu2 | -| bison | 2:3.8.2+dfsg-1build2 | -| brotli | 1.1.0-2build2 | -| bzip2 | 1.0.8-5.1 | -| coreutils | 9.4-3ubuntu6 | -| curl | 8.5.0-2ubuntu10.2 | -| dbus | 1.14.10-4ubuntu4 | -| dnsutils | 1:9.18.28-0ubuntu0.24.04.1 | -| dpkg | 1.22.6ubuntu6 | -| dpkg-dev | 1.22.6ubuntu6 | -| fakeroot | 1.33-1 | -| file | 1:5.45-3build1 | -| findutils | 4.9.0-5build1 | -| flex | 2.6.4-8.2build1 | -| fonts-noto-color-emoji | 2.042-1 | -| ftp | 20230507-2build3 | -| g++ | 4:13.2.0-7ubuntu1 | -| gcc | 4:13.2.0-7ubuntu1 | -| gnupg2 | 2.4.4-2ubuntu17 | -| haveged | 1.9.14-1ubuntu2 | -| iproute2 | 6.1.0-1ubuntu6 | -| iputils-ping | 3:20240117-1build1 | -| jq | 1.7.1-3build1 | -| libssl-dev | 3.0.13-0ubuntu3.2 | -| libtool | 2.4.7-7build1 | -| libyaml-dev | 0.2.5-1build1 | -| locales | 2.39-0ubuntu8.2 | -| lz4 | 1.9.4-1build1 | -| m4 | 1.4.19-4build1 | -| make | 4.3-4.1build2 | -| mediainfo | 24.01.1-1build2 | -| mercurial | 6.7.2-1ubuntu2 | -| net-tools | 2.10-0.1ubuntu4 | -| netcat | 1.226-1ubuntu2 | -| openssh-client | 1:9.6p1-3ubuntu13.4 | -| p7zip-full | 16.02+transitional.1 | -| p7zip-rar | 16.02+transitional.1 | -| parallel | 20231122+ds-1 | -| patchelf | 0.18.0-1.1build1 | -| pigz | 2.8-1 | -| pkg-config | 1.8.1-2build1 | -| pollinate | 4.33-3.1ubuntu1 | -| python-is-python3 | 3.11.4-1 | -| rpm | 4.18.2+dfsg-2.1build2 | -| rsync | 3.2.7-1ubuntu1 | -| shellcheck | 0.9.0-1 | -| sphinxsearch | 2.2.11-8build1 | -| sqlite3 | 3.45.1-1ubuntu2 | -| ssh | 1:9.6p1-3ubuntu13.4 | -| sshpass | 1.09-1 | -| sudo | 1.9.15p5-3ubuntu5 | -| swig | 4.2.0-2ubuntu1 | -| tar | 1.35+dfsg-3build1 | -| telnet | 0.17+2.5-3ubuntu4 | -| texinfo | 7.1-3build2 | -| time | 1.9-0.2build1 | -| tk | 8.6.14build1 | -| tree | 2.1.1-2ubuntu3 | -| tzdata | 2024a-3ubuntu1.1 | -| unzip | 6.0-28ubuntu4 | -| upx | 4.2.2-3 | -| wget | 1.21.4-1ubuntu4.1 | -| xvfb | 2:21.1.12-1ubuntu1 | -| xz-utils | 5.6.1+really5.4.5-1 | -| zip | 3.0-13build1 | -| zsync | 0.6.2-5build1 | +| Name | Version | +| ---------------------- | --------------------------- | +| acl | 2.3.2-1build1 | +| aria2 | 1.37.0+debian-1build3 | +| autoconf | 2.71-3 | +| automake | 1:1.16.5-1.3ubuntu1 | +| binutils | 2.42-4ubuntu2 | +| bison | 2:3.8.2+dfsg-1build2 | +| brotli | 1.1.0-2build2 | +| bzip2 | 1.0.8-5.1build0.1 | +| coreutils | 9.4-3ubuntu6 | +| curl | 8.5.0-2ubuntu10.3 | +| dbus | 1.14.10-4ubuntu4.1 | +| dnsutils | 1:9.18.28-0ubuntu0.24.04.1 | +| dpkg | 1.22.6ubuntu6.1 | +| dpkg-dev | 1.22.6ubuntu6.1 | +| fakeroot | 1.33-1 | +| file | 1:5.45-3build1 | +| findutils | 4.9.0-5build1 | +| flex | 2.6.4-8.2build1 | +| fonts-noto-color-emoji | 2.042-1 | +| ftp | 20230507-2build3 | +| g++ | 4:13.2.0-7ubuntu1 | +| gcc | 4:13.2.0-7ubuntu1 | +| gnupg2 | 2.4.4-2ubuntu17 | +| haveged | 1.9.14-1ubuntu2 | +| iproute2 | 6.1.0-1ubuntu6 | +| iputils-ping | 3:20240117-1build1 | +| jq | 1.7.1-3build1 | +| libssl-dev | 3.0.13-0ubuntu3.3 | +| libtool | 2.4.7-7build1 | +| libyaml-dev | 0.2.5-1build1 | +| locales | 2.39-0ubuntu8.3 | +| lz4 | 1.9.4-1build1.1 | +| m4 | 1.4.19-4build1 | +| make | 4.3-4.1build2 | +| mediainfo | 24.01.1-1build2 | +| mercurial | 6.7.2-1ubuntu2 | +| net-tools | 2.10-0.1ubuntu4 | +| netcat | 1.226-1ubuntu2 | +| openssh-client | 1:9.6p1-3ubuntu13.5 | +| p7zip-full | 16.02+transitional.1 | +| p7zip-rar | 16.02+transitional.1 | +| parallel | 20231122+ds-1 | +| patchelf | 0.18.0-1.1build1 | +| pigz | 2.8-1 | +| pkg-config | 1.8.1-2build1 | +| pollinate | 4.33-3.1ubuntu1 | +| python-is-python3 | 3.11.4-1 | +| rpm | 4.18.2+dfsg-2.1build2 | +| rsync | 3.2.7-1ubuntu1 | +| shellcheck | 0.9.0-1 | +| sphinxsearch | 2.2.11-8build1 | +| sqlite3 | 3.45.1-1ubuntu2 | +| ssh | 1:9.6p1-3ubuntu13.5 | +| sshpass | 1.09-1 | +| sudo | 1.9.15p5-3ubuntu5 | +| swig | 4.2.0-2ubuntu1 | +| tar | 1.35+dfsg-3build1 | +| telnet | 0.17+2.5-3ubuntu4 | +| texinfo | 7.1-3build2 | +| time | 1.9-0.2build1 | +| tk | 8.6.14build1 | +| tree | 2.1.1-2ubuntu3 | +| tzdata | 2024a-3ubuntu1.1 | +| unzip | 6.0-28ubuntu4 | +| upx | 4.2.2-3 | +| wget | 1.21.4-1ubuntu4.1 | +| xvfb | 2:21.1.12-1ubuntu1 | +| xz-utils | 5.6.1+really5.4.5-1build0.1 | +| zip | 3.0-13build1 | +| zsync | 0.6.2-5build1 | From 90ada9b0c45d7cae2581bc6f2d07fd316598679a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 28 Aug 2024 14:51:40 +0000 Subject: [PATCH 3066/3485] Updating readme file for macos-12 version 20240825.1 (#10489) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-12-Readme.md | 44 ++++++++++++++++----------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/images/macos/macos-12-Readme.md b/images/macos/macos-12-Readme.md index 6cb330cd47c9..ad26fb44bfd3 100644 --- a/images/macos/macos-12-Readme.md +++ b/images/macos/macos-12-Readme.md @@ -1,7 +1,7 @@ # macOS 12 - OS Version: macOS 12.7.6 (21H1320) - Kernel Version: Darwin 21.6.0 -- Image Version: 20240819.7 +- Image Version: 20240825.1 ## Installed Software @@ -17,13 +17,13 @@ - GNU Fortran 13 (Homebrew GCC 13.3.0) - available by `gfortran-13` alias - GNU Fortran 14 (Homebrew GCC 14.1.0_2) - available by `gfortran-14` alias - Julia 1.10.4 -- Kotlin 2.0.10-release-540 +- Kotlin 2.0.20-release-360 - Go 1.21.13 - Mono 6.12.0.188 - Node.js 18.20.4 - MSBuild 16.10.1.51301 (Mono 6.12.0.188) - NVM 0.39.7 -- NVM - Cached node versions: 16.20.2, 18.20.4, 20.16.0 +- NVM - Cached node versions: 16.20.2, 18.20.4, 20.17.0 - Perl 5.38.2 - PHP 8.3.10 - Python 2.7.18 @@ -35,16 +35,16 @@ - Bundler 2.5.17 - Carthage 0.39.1 - CocoaPods 1.15.2 -- Composer 2.7.7 +- Composer 2.7.8 - Homebrew 4.3.17 -- Miniconda 24.5.0 +- Miniconda 24.7.1 - NPM 10.7.0 - NuGet 6.3.1.1 - Pip 20.3.4 (python 2.7) - Pip3 24.2 (python 3.12) -- Pipx 1.6.0 +- Pipx 1.7.1 - RubyGems 3.5.17 -- Vcpkg 2024 (build from commit a993be073) +- Vcpkg 2024 (build from commit 350898514) - Yarn 1.22.22 #### Environment variables @@ -69,11 +69,11 @@ - Curl 8.9.1 - Git 2.46.0 - Git LFS 3.5.1 -- GitHub CLI 2.54.0 +- GitHub CLI 2.55.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.24.5 - gpg (GnuPG) 2.4.5 -- ImageMagick 7.1.1-36 +- ImageMagick 7.1.1-37 - jq 1.7.1 - mongo 5.0.28 - mongod 5.0.28 @@ -92,7 +92,7 @@ ### Tools - App Center CLI 3.0.1 -- AWS CLI 2.17.33 +- AWS CLI 2.17.37 - AWS SAM CLI 1.123.0 - AWS Session Manager CLI 1.2.650.0 - Azure CLI 2.63.0 @@ -101,7 +101,7 @@ - Cabal 3.10.3.0 - Cmake 3.30.2 - CodeQL Action Bundle 2.18.2 -- Colima 0.7.3 +- Colima 0.7.4 - Fastlane 2.222.0 - GHC 9.10.1 - GHCup 0.1.30.0 @@ -120,14 +120,14 @@ ### Browsers - Safari 17.6 (17618.3.11.11.7) - SafariDriver 17.6 (17618.3.11.11.7) -- Google Chrome 127.0.6533.120 -- Google Chrome for Testing 127.0.6533.119 -- ChromeDriver 127.0.6533.119 -- Microsoft Edge 127.0.2651.105 -- Microsoft Edge WebDriver 127.0.2651.107 -- Mozilla Firefox 129.0.1 -- geckodriver 0.34.0 -- Selenium server 4.23.0 +- Google Chrome 128.0.6613.85 +- Google Chrome for Testing 128.0.6613.84 +- ChromeDriver 128.0.6613.84 +- Microsoft Edge 128.0.2739.42 +- Microsoft Edge WebDriver 128.0.2739.41 +- Mozilla Firefox 129.0.2 +- geckodriver 0.35.0 +- Selenium server 4.23.1 #### Environment variables | Name | Value | @@ -168,7 +168,7 @@ #### Node.js - 16.20.2 - 18.20.4 -- 20.16.0 +- 20.17.0 #### Go - 1.20.14 @@ -182,7 +182,7 @@ - Rustup 1.27.1 #### Packages -- Bindgen 0.70.0 +- Bindgen 0.70.1 - Cargo-audit 0.20.1 - Cargo-outdated 0.15.0 - Cbindgen 0.27.0 @@ -190,7 +190,7 @@ - Rustfmt 1.7.0-stable ### PowerShell Tools -- PowerShell 7.4.4 +- PowerShell 7.4.5 #### PowerShell Modules - Az: 12.2.0 From f778b762d5da2338b3141460dc6c6b30601a2970 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 28 Aug 2024 15:21:58 +0000 Subject: [PATCH 3067/3485] Updating readme file for win19 version 20240825.1.1 (#10491) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/windows/Windows2019-Readme.md | 46 ++++++++++++++-------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/images/windows/Windows2019-Readme.md b/images/windows/Windows2019-Readme.md index bf73d415d1d2..8811fb22b94f 100644 --- a/images/windows/Windows2019-Readme.md +++ b/images/windows/Windows2019-Readme.md @@ -4,7 +4,7 @@ *** # Windows Server 2019 - OS Version: 10.0.17763 Build 6189 -- Image Version: 20240818.1.0 +- Image Version: 20240825.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -15,7 +15,7 @@ - Bash 5.2.26(1)-release - Go 1.21.13 - Julia 1.10.4 -- Kotlin 2.0.10 +- Kotlin 2.0.20 - LLVM 18.1.8 - Node 18.20.3 - Perl 5.32.1 @@ -25,15 +25,15 @@ ### Package Management - Chocolatey 2.3.0 -- Composer 2.7.7 +- Composer 2.7.8 - Helm 3.15.3 -- Miniconda 24.5.0 (pre-installed on the image but not added to PATH) +- Miniconda 24.7.1 (pre-installed on the image but not added to PATH) - NPM 10.7.0 - NuGet 6.11.0.119 - pip 24.0 (python 3.7) - Pipx 1.2.1 - RubyGems 3.2.33 -- Vcpkg (build from commit 2f210a9c1) +- Vcpkg (build from commit 350898514) - Yarn 1.22.22 #### Environment variables @@ -44,7 +44,7 @@ ### Project Management - Ant 1.10.14 -- Gradle 8.8 +- Gradle 8.10 - Maven 3.8.7 - sbt 1.10.1 @@ -52,7 +52,7 @@ - 7zip 24.08 - aria2 1.37.0 - azcopy 10.26.0 -- Bazel 7.3.0 +- Bazel 7.3.1 - Bazelisk 1.19.0 - Bicep 0.29.47 - Cabal 3.12.1.0 @@ -64,7 +64,7 @@ - ghc 9.10.1 - Git 2.46.0.windows.1 - Git LFS 3.5.1 -- Google Cloud CLI 488.0.0 +- Google Cloud CLI 489.0.0 - ImageMagick 7.1.1-36 - InnoSetup 6.3.3 - jq 1.7.1 @@ -74,12 +74,12 @@ - gcc 8.1.0 - gdb 8.1 - GNU Binutils 2.30 -- Newman 6.2.0 +- Newman 6.2.1 - NSIS 3.10 - OpenSSL 1.1.1w - Packer 1.11.0 - Parcel 2.12.0 -- Pulumi 3.129.0 +- Pulumi 3.130.0 - R 4.4.1 - Service Fabric SDK 9.1.1436.9590 - Stack 3.1.1 @@ -93,13 +93,13 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.219 -- AWS CLI 2.17.32 -- AWS SAM CLI 1.122.0 +- AWS CLI 2.17.37 +- AWS SAM CLI 1.123.0 - AWS Session Manager CLI 1.2.650.0 - Azure CLI 2.63.0 - Azure DevOps CLI extension 1.0.1 -- Cloud Foundry CLI 8.7.11 -- GitHub CLI 2.54.0 +- Cloud Foundry CLI 8.8.0 +- GitHub CLI 2.55.0 ### Rust Tools - Cargo 1.80.1 @@ -108,7 +108,7 @@ - Rustup 1.27.1 #### Packages -- bindgen 0.70.0 +- bindgen 0.70.1 - cargo-audit 0.20.1 - cargo-outdated 0.15.0 - cbindgen 0.27.0 @@ -116,11 +116,11 @@ - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 127.0.6533.120 -- Chrome Driver 127.0.6533.119 -- Microsoft Edge 127.0.2651.105 -- Microsoft Edge Driver 127.0.2651.105 -- Mozilla Firefox 129.0.1 +- Google Chrome 128.0.6613.85 +- Chrome Driver 128.0.6613.84 +- Microsoft Edge 128.0.2739.42 +- Microsoft Edge Driver 128.0.2739.42 +- Mozilla Firefox 129.0.2 - Gecko Driver 0.35.0 - IE Driver 4.14.0.0 - Selenium server 4.23.0 @@ -171,7 +171,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Node.js - 16.20.2 - 18.20.4 -- 20.16.0 +- 20.17.0 #### Python - 3.7.9 @@ -499,7 +499,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - nbgv 3.6.141+d2035fb7be ### PowerShell Tools -- PowerShell 7.4.4 +- PowerShell 7.4.5 #### Powershell Modules - Az: 12.1.0 @@ -507,7 +507,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - AzureRM: 2.1.0 (Default), 6.13.1 - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.637 +- AWSPowershell: 4.1.642 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.10 - Microsoft.Graph: 2.22.0 From dda4a941d846114b3be4a0421e71effa92e43be4 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 29 Aug 2024 01:47:33 +0000 Subject: [PATCH 3068/3485] Updating readme file for macos-13-arm64 version 20240826.1 (#10496) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-13-arm64-Readme.md | 38 +++++++++++++-------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/images/macos/macos-13-arm64-Readme.md b/images/macos/macos-13-arm64-Readme.md index 91aaec757a21..580b52701784 100644 --- a/images/macos/macos-13-arm64-Readme.md +++ b/images/macos/macos-13-arm64-Readme.md @@ -1,7 +1,7 @@ # macOS 13 - OS Version: macOS 13.6.9 (22G830) - Kernel Version: Darwin 22.6.0 -- Image Version: 20240818.3 +- Image Version: 20240826.1 ## Installed Software @@ -12,13 +12,13 @@ - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` - GCC 12 (Homebrew GCC 12.4.0) - available by `gcc-12` alias - GCC 13 (Homebrew GCC 13.3.0) - available by `gcc-13` alias -- GCC 14 (Homebrew GCC 14.1.0_2) - available by `gcc-14` alias +- GCC 14 (Homebrew GCC 14.2.0) - available by `gcc-14` alias - GNU Fortran 12 (Homebrew GCC 12.4.0) - available by `gfortran-12` alias - GNU Fortran 13 (Homebrew GCC 13.3.0) - available by `gfortran-13` alias -- GNU Fortran 14 (Homebrew GCC 14.1.0_2) - available by `gfortran-14` alias -- Kotlin 2.0.10-release-540 +- GNU Fortran 14 (Homebrew GCC 14.2.0) - available by `gfortran-14` alias +- Kotlin 2.0.20-release-360 - Mono 6.12.0.188 -- Node.js 20.16.0 +- Node.js 20.17.0 - Perl 5.38.2 - Python3 3.12.5 - Ruby 3.0.7p220 @@ -27,11 +27,11 @@ - Bundler 2.5.17 - Carthage 0.39.1 - CocoaPods 1.15.2 -- Homebrew 4.3.16 -- NPM 10.8.1 +- Homebrew 4.3.17 +- NPM 10.8.2 - NuGet 6.3.1.1 - Pip3 24.2 (python 3.12) -- Pipx 1.6.0 +- Pipx 1.7.1 - RubyGems 3.5.17 - Yarn 1.22.22 @@ -44,13 +44,13 @@ - 7-Zip 17.05 - aria2 1.37.0 - azcopy 10.26.0 -- bazel 7.3.0 +- bazel 7.3.1 - bazelisk 1.20.0 - bsdtar 3.5.3 - available by 'tar' alias - Curl 8.7.1 - Git 2.46.0 - Git LFS 3.5.1 -- GitHub CLI 2.54.0 +- GitHub CLI 2.55.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.24.5 - gpg (GnuPG) 2.4.5 @@ -62,8 +62,8 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.17.32 -- AWS SAM CLI 1.122.0 +- AWS CLI 2.17.37 +- AWS SAM CLI 1.123.0 - AWS Session Manager CLI 1.2.650.0 - Azure CLI 2.63.0 - Azure CLI (azure-devops) 1.0.1 @@ -81,10 +81,10 @@ ### Browsers - Safari 17.6 (18618.3.11.11.7) - SafariDriver 17.6 (18618.3.11.11.7) -- Google Chrome 127.0.6533.120 -- Google Chrome for Testing 127.0.6533.119 -- ChromeDriver 127.0.6533.119 -- Selenium server 4.23.0 +- Google Chrome 128.0.6613.85 +- Google Chrome for Testing 128.0.6613.84 +- ChromeDriver 128.0.6613.84 +- Selenium server 4.23.1 #### Environment variables | Name | Value | @@ -111,7 +111,7 @@ #### Node.js - 16.20.1 - 18.20.4 -- 20.16.0 +- 20.17.0 #### Go - 1.20.14 @@ -129,7 +129,7 @@ - Rustfmt 1.7.0-stable ### PowerShell Tools -- PowerShell 7.4.4 +- PowerShell 7.4.5 #### PowerShell Modules - Az: 12.2.0 @@ -183,8 +183,8 @@ | Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | | visionOS 1.0 | xros1.0 | 15.2 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | -| Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | +| Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | | DriverKit 22.1 | driverkit22.1 | 14.1 | | DriverKit 22.2 | driverkit22.2 | 14.2 | | DriverKit 22.4 | driverkit22.4 | 14.3.1 | From 0d632219e5a750d8d1b9974d1e8713a2fa111ce9 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 29 Aug 2024 05:20:29 +0000 Subject: [PATCH 3069/3485] Updating readme file for ubuntu22 version 20240825.1.1 (#10492) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2204-Readme.md | 58 +++++++++++++++--------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/images/ubuntu/Ubuntu2204-Readme.md b/images/ubuntu/Ubuntu2204-Readme.md index f93ee5c157fe..8457a088ba84 100644 --- a/images/ubuntu/Ubuntu2204-Readme.md +++ b/images/ubuntu/Ubuntu2204-Readme.md @@ -6,7 +6,7 @@ # Ubuntu 22.04 - OS Version: 22.04.4 LTS - Kernel Version: 6.5.0-1025-azure -- Image Version: 20240818.1.0 +- Image Version: 20240825.1.0 - Systemd version: 249.11-0ubuntu3.12 ## Installed Software @@ -20,7 +20,7 @@ - GNU C++: 10.5.0, 11.4.0, 12.3.0 - GNU Fortran: 10.5.0, 11.4.0, 12.3.0 - Julia 1.10.4 -- Kotlin 2.0.10-release-540 +- Kotlin 2.0.20-release-360 - Mono 6.12.0.200 - MSBuild 16.10.1.31701 (Mono 6.12.0.200) - Node.js 18.20.4 @@ -32,15 +32,15 @@ ### Package Management - cpan 1.64 - Helm 3.15.4 -- Homebrew 4.3.16 -- Miniconda 24.5.0 +- Homebrew 4.3.17 +- Miniconda 24.7.1 - Npm 10.7.0 - NuGet 6.6.1.2 - Pip 22.0.2 - Pip3 22.0.2 -- Pipx 1.6.0 +- Pipx 1.7.1 - RubyGems 3.3.5 -- Vcpkg (build from commit 2f210a9c1) +- Vcpkg (build from commit 350898514) - Yarn 1.22.22 #### Environment variables @@ -68,7 +68,7 @@ to accomplish this. - Ansible 2.17.3 - apt-fast 1.10.0 - AzCopy 10.26.0 - available by `azcopy` and `azcopy10` aliases -- Bazel 7.3.0 +- Bazel 7.3.1 - Bazelisk 1.19.0 - Bicep 0.29.47 - Buildah 1.23.1 @@ -94,35 +94,35 @@ to accomplish this. - Mercurial 6.1.1 - Minikube 1.33.1 - n 9.2.3 -- Newman 6.2.0 +- Newman 6.2.1 - nvm 0.40.0 - OpenSSL 3.0.2-0ubuntu1.17 - Packer 1.11.2 - Parcel 2.12.0 - Podman 3.4.4 -- Pulumi 3.129.0 +- Pulumi 3.130.0 - R 4.4.1 - Skopeo 1.4.1 - Sphinx Open Source Search Server 2.2.11 - SVN 1.14.1 -- Terraform 1.9.4 +- Terraform 1.9.5 - yamllint 1.35.1 - yq 4.44.3 - zstd 1.5.6 ### CLI Tools - Alibaba Cloud CLI 3.0.219 -- AWS CLI 2.17.32 +- AWS CLI 2.17.37 - AWS CLI Session Manager Plugin 1.2.650.0 -- AWS SAM CLI 1.122.0 +- AWS SAM CLI 1.123.0 - Azure CLI 2.63.0 - Azure CLI (azure-devops) 1.0.1 -- GitHub CLI 2.54.0 -- Google Cloud CLI 488.0.0 -- Netlify CLI 17.34.1 -- OpenShift CLI 4.16.7 +- GitHub CLI 2.55.0 +- Google Cloud CLI 489.0.0 +- Netlify CLI 17.34.2 +- OpenShift CLI 4.16.8 - ORAS CLI 1.2.0 -- Vercel CLI 36.0.0 +- Vercel CLI 37.1.1 ### Java | Version | Environment Variable | @@ -134,7 +134,7 @@ to accomplish this. ### PHP Tools - PHP: 8.1.2 -- Composer 2.7.7 +- Composer 2.7.8 - PHPUnit 8.5.39 ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. @@ -153,7 +153,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustup 1.27.1 #### Packages -- Bindgen 0.70.0 +- Bindgen 0.70.1 - Cargo audit 0.20.1 - Cargo clippy 0.1.80 - Cargo outdated 0.15.0 @@ -161,13 +161,13 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 127.0.6533.119 -- ChromeDriver 127.0.6533.119 -- Chromium 127.0.6533.0 -- Microsoft Edge 127.0.2651.105 -- Microsoft Edge WebDriver 127.0.2651.107 +- Google Chrome 128.0.6613.84 +- ChromeDriver 128.0.6613.84 +- Chromium 128.0.6613.0 +- Microsoft Edge 128.0.2739.42 +- Microsoft Edge WebDriver 128.0.2739.38 - Selenium server 4.23.1 -- Mozilla Firefox 129.0.1 +- Mozilla Firefox 129.0.2 - Geckodriver 0.35.0 #### Environment variables @@ -216,7 +216,7 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Node.js - 16.20.2 - 18.20.4 -- 20.16.0 +- 20.17.0 #### Python - 3.7.17 @@ -237,7 +237,7 @@ Use the following command as a part of your job to start the service: 'sudo syst - 3.2.5 ### PowerShell Tools -- PowerShell 7.4.4 +- PowerShell 7.4.5 #### PowerShell Modules - Az: 12.1.0 @@ -288,8 +288,8 @@ Use the following command as a part of your job to start the service: 'sudo syst | node:16-alpine | sha256:a1f9d027912b58a7c75be7716c97cfbc6d3099f3a97ed84aa490be9dee20e787 | 2023-08-10 | | node:18 | sha256:a7ff16657263663c1e92ba3060cdbba0e77329a0a4cb3c27bbbbe90c6e20bd87 | 2024-07-09 | | node:18-alpine | sha256:17514b20acef0e79691285e7a59f3ae561f7a1702a9adc72a515aef23f326729 | 2024-07-09 | -| node:20 | sha256:d3c8ababe9566f9f3495d0d365a5c4b393f607924647dd52e75bf4f8a54effd3 | 2024-07-24 | -| node:20-alpine | sha256:eb8101caae9ac02229bd64c024919fe3d4504ff7f329da79ca60a04db08cef52 | 2024-07-24 | +| node:20 | sha256:a4d1de4c7339eabcf78a90137dfd551b798829e3ef3e399e0036ac454afa1291 | 2024-08-21 | +| node:20-alpine | sha256:1a526b97cace6b4006256570efa1a29cd1fe4b96a5301f8d48e87c5139438a45 | 2024-08-21 | | ubuntu:20.04 | sha256:fa17826afb526a9fc7250e0fbcbfd18d03fe7a54849472f86879d8bf562c629e | 2024-08-13 | | ubuntu:22.04 | sha256:adbb90115a21969d2fe6fa7f9af4253e16d45f8d4c1e930182610c4731962658 | 2024-08-13 | From c9fc7f734c837f4981b7e548cb6e596bf33575f2 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 29 Aug 2024 05:26:34 +0000 Subject: [PATCH 3070/3485] Updating readme file for ubuntu20 version 20240825.1.1 (#10494) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2004-Readme.md | 58 +++++++++++++++--------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/images/ubuntu/Ubuntu2004-Readme.md b/images/ubuntu/Ubuntu2004-Readme.md index 20f337dd8d54..a808d53a7fce 100644 --- a/images/ubuntu/Ubuntu2004-Readme.md +++ b/images/ubuntu/Ubuntu2004-Readme.md @@ -5,8 +5,8 @@ *** # Ubuntu 20.04 - OS Version: 20.04.6 LTS -- Kernel Version: 5.15.0-1070-azure -- Image Version: 20240818.1.0 +- Kernel Version: 5.15.0-1071-azure +- Image Version: 20240825.1.0 - Systemd version: 245.4-4ubuntu3.23 ## Installed Software @@ -22,7 +22,7 @@ - GNU C++: 10.5.0 - GNU Fortran: 10.5.0 - Julia 1.10.4 -- Kotlin 2.0.10-release-540 +- Kotlin 2.0.20-release-360 - Mono 6.12.0.200 - MSBuild 16.10.1.31701 (Mono 6.12.0.200) - Node.js 18.20.4 @@ -34,15 +34,15 @@ ### Package Management - cpan 1.64 - Helm 3.15.4 -- Homebrew 4.3.16 -- Miniconda 24.5.0 +- Homebrew 4.3.17 +- Miniconda 24.7.1 - Npm 10.7.0 - NuGet 6.6.1.2 - Pip 20.0.2 - Pip3 20.0.2 -- Pipx 1.6.0 +- Pipx 1.7.1 - RubyGems 3.1.2 -- Vcpkg (build from commit 2f210a9c1) +- Vcpkg (build from commit 350898514) - Yarn 1.22.22 #### Environment variables @@ -70,7 +70,7 @@ to accomplish this. - Ansible 2.13.13 - apt-fast 1.10.0 - AzCopy 10.26.0 - available by `azcopy` and `azcopy10` aliases -- Bazel 7.3.0 +- Bazel 7.3.1 - Bazelisk 1.19.0 - Bicep 0.29.47 - Buildah 1.22.3 @@ -97,36 +97,36 @@ to accomplish this. - Mercurial 5.3.1 - Minikube 1.33.1 - n 9.2.3 -- Newman 6.2.0 +- Newman 6.2.1 - nvm 0.40.0 - OpenSSL 1.1.1f-1ubuntu2.23 - Packer 1.11.2 - Parcel 2.12.0 - PhantomJS 2.1.1 2.1.1 - Podman 3.4.2 -- Pulumi 3.129.0 +- Pulumi 3.130.0 - R 4.4.1 - Skopeo 1.5.0 - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 -- Terraform 1.9.4 +- Terraform 1.9.5 - yamllint 1.35.1 - yq 4.44.3 - zstd 1.5.6 ### CLI Tools - Alibaba Cloud CLI 3.0.174 -- AWS CLI 2.17.32 +- AWS CLI 2.17.37 - AWS CLI Session Manager Plugin 1.2.650.0 -- AWS SAM CLI 1.122.0 +- AWS SAM CLI 1.123.0 - Azure CLI 2.63.0 - Azure CLI (azure-devops) 1.0.1 -- GitHub CLI 2.54.0 -- Google Cloud CLI 488.0.0 -- Netlify CLI 17.34.1 +- GitHub CLI 2.55.0 +- Google Cloud CLI 489.0.0 +- Netlify CLI 17.34.2 - OpenShift CLI 4.15.19 - ORAS CLI 1.2.0 -- Vercel CLI 36.0.0 +- Vercel CLI 37.1.1 ### Java | Version | Environment Variable | @@ -138,7 +138,7 @@ to accomplish this. ### PHP Tools - PHP: 7.4.33, 8.0.30, 8.1.29, 8.2.22, 8.3.10 -- Composer 2.7.7 +- Composer 2.7.8 - PHPUnit 8.5.39 ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. @@ -157,7 +157,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustup 1.27.1 #### Packages -- Bindgen 0.70.0 +- Bindgen 0.70.1 - Cargo audit 0.20.1 - Cargo clippy 0.1.80 - Cargo outdated 0.15.0 @@ -165,13 +165,13 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 127.0.6533.119 -- ChromeDriver 127.0.6533.119 -- Chromium 127.0.6533.0 -- Microsoft Edge 127.0.2651.105 -- Microsoft Edge WebDriver 127.0.2651.107 +- Google Chrome 128.0.6613.84 +- ChromeDriver 128.0.6613.84 +- Chromium 128.0.6613.0 +- Microsoft Edge 128.0.2739.42 +- Microsoft Edge WebDriver 128.0.2739.38 - Selenium server 4.23.1 -- Mozilla Firefox 129.0.1 +- Mozilla Firefox 129.0.2 - Geckodriver 0.35.0 #### Environment variables @@ -221,7 +221,7 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Node.js - 16.20.2 - 18.20.4 -- 20.16.0 +- 20.17.0 #### Python - 3.7.17 @@ -245,7 +245,7 @@ Use the following command as a part of your job to start the service: 'sudo syst - 3.2.5 ### PowerShell Tools -- PowerShell 7.4.4 +- PowerShell 7.4.5 #### PowerShell Modules - Az: 12.1.0 @@ -298,8 +298,8 @@ Use the following command as a part of your job to start the service: 'sudo syst | node:16-alpine | sha256:a1f9d027912b58a7c75be7716c97cfbc6d3099f3a97ed84aa490be9dee20e787 | 2023-08-10 | | node:18 | sha256:a7ff16657263663c1e92ba3060cdbba0e77329a0a4cb3c27bbbbe90c6e20bd87 | 2024-07-09 | | node:18-alpine | sha256:17514b20acef0e79691285e7a59f3ae561f7a1702a9adc72a515aef23f326729 | 2024-07-09 | -| node:20 | sha256:d3c8ababe9566f9f3495d0d365a5c4b393f607924647dd52e75bf4f8a54effd3 | 2024-07-24 | -| node:20-alpine | sha256:eb8101caae9ac02229bd64c024919fe3d4504ff7f329da79ca60a04db08cef52 | 2024-07-24 | +| node:20 | sha256:a4d1de4c7339eabcf78a90137dfd551b798829e3ef3e399e0036ac454afa1291 | 2024-08-21 | +| node:20-alpine | sha256:1a526b97cace6b4006256570efa1a29cd1fe4b96a5301f8d48e87c5139438a45 | 2024-08-21 | | ubuntu:20.04 | sha256:fa17826afb526a9fc7250e0fbcbfd18d03fe7a54849472f86879d8bf562c629e | 2024-08-13 | ### Installed apt packages From 16b7d80a46429e334a47c39127e8a72382c5b729 Mon Sep 17 00:00:00 2001 From: RaviAkshintala <167848931+RaviAkshintala@users.noreply.github.com> Date: Thu, 29 Aug 2024 20:44:03 +0530 Subject: [PATCH 3071/3485] signature updated for visual studio (#10507) Co-authored-by: Ravi Akshintala <raviakshintalagithub.com@Ravis-Laptop.local> --- images/windows/toolsets/toolset-2022.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/windows/toolsets/toolset-2022.json b/images/windows/toolsets/toolset-2022.json index 1a3f742bd4d8..ee58ffe97d5e 100644 --- a/images/windows/toolsets/toolset-2022.json +++ b/images/windows/toolsets/toolset-2022.json @@ -177,7 +177,7 @@ "subversion" : "17", "edition" : "Enterprise", "channel": "release", - "signature": "C2048FB509F1C37A8C3E9EC6648118458AA01780", + "signature": "F9A7CF9FBE13BAC767F4781061332DA6E8B4E0EE", "workloads": [ "Component.Dotfuscator", "Component.Linux.CMake", From 891c2ed95c5061cea040db765f6d673e34b0787a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 29 Aug 2024 16:35:52 +0000 Subject: [PATCH 3072/3485] Updating readme file for win22 version 20240825.1.1 (#10490) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/windows/Windows2022-Readme.md | 567 +++++++++++++-------------- 1 file changed, 283 insertions(+), 284 deletions(-) diff --git a/images/windows/Windows2022-Readme.md b/images/windows/Windows2022-Readme.md index 9a9453f952b9..e29b63f9fad0 100644 --- a/images/windows/Windows2022-Readme.md +++ b/images/windows/Windows2022-Readme.md @@ -1,11 +1,10 @@ | Announcements | |-| | [[All OSes] Android NDK versions <=25 will be removed from images on August 19](https://github.com/actions/runner-images/issues/10342) | -| [[Ubuntu, Windows] Docker Compose v1 will be removed from images on July, 29](https://github.com/actions/runner-images/issues/9692) | *** # Windows Server 2022 -- OS Version: 10.0.20348 Build 2582 -- Image Version: 20240811.1.0 +- OS Version: 10.0.20348 Build 2655 +- Image Version: 20240825.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -16,7 +15,7 @@ - Bash 5.2.26(1)-release - Go 1.21.13 - Julia 1.10.4 -- Kotlin 2.0.10 +- Kotlin 2.0.20 - LLVM 18.1.8 - Node 18.20.3 - Perl 5.32.1 @@ -26,15 +25,15 @@ ### Package Management - Chocolatey 2.3.0 -- Composer 2.7.7 -- Helm 3.15.2 -- Miniconda 24.5.0 (pre-installed on the image but not added to PATH) +- Composer 2.7.8 +- Helm 3.15.3 +- Miniconda 24.7.1 (pre-installed on the image but not added to PATH) - NPM 10.7.0 -- NuGet 6.10.2.8 +- NuGet 6.11.0.119 - pip 24.2 (python 3.9) -- Pipx 1.6.0 +- Pipx 1.7.1 - RubyGems 3.2.33 -- Vcpkg (build from commit e590c2b30) +- Vcpkg (build from commit 350898514) - Yarn 1.22.22 #### Environment variables @@ -45,20 +44,20 @@ ### Project Management - Ant 1.10.14 -- Gradle 8.8 +- Gradle 8.10 - Maven 3.8.7 - sbt 1.10.1 ### Tools -- 7zip 24.07 +- 7zip 24.08 - aria2 1.37.0 - azcopy 10.26.0 -- Bazel 7.2.1 +- Bazel 7.3.1 - Bazelisk 1.19.0 - Bicep 0.29.47 - Cabal 3.12.1.0 - CMake 3.30.2 -- CodeQL Action Bundle 2.18.1 +- CodeQL Action Bundle 2.18.2 - Docker 26.1.3 - Docker Compose v2 2.27.1 - Docker-wincred 0.8.2 @@ -68,17 +67,17 @@ - ImageMagick 7.1.1-36 - InnoSetup 6.3.3 - jq 1.7.1 -- Kind 0.23.0 -- Kubectl 1.30.3 +- Kind 0.24.0 +- Kubectl 1.31.0 - Mercurial 5.0 - gcc 12.2.0 - gdb 11.2 - GNU Binutils 2.39 -- Newman 6.1.3 +- Newman 6.2.1 - NSIS 3.10 - OpenSSL 1.1.1w - Packer 1.11.0 -- Pulumi 3.128.0 +- Pulumi 3.130.0 - R 4.4.1 - Service Fabric SDK 9.1.1436.9590 - Stack 3.1.1 @@ -91,13 +90,13 @@ - zstd 1.5.6 ### CLI Tools -- Alibaba Cloud CLI 3.0.216 -- AWS CLI 2.17.27 -- AWS SAM CLI 1.121.0 +- Alibaba Cloud CLI 3.0.219 +- AWS CLI 2.17.37 +- AWS SAM CLI 1.123.0 - AWS Session Manager CLI 1.2.650.0 - Azure CLI 2.63.0 - Azure DevOps CLI extension 1.0.1 -- GitHub CLI 2.54.0 +- GitHub CLI 2.55.0 ### Rust Tools - Cargo 1.80.1 @@ -106,19 +105,19 @@ - Rustup 1.27.1 #### Packages -- bindgen 0.69.4 -- cargo-audit 0.20.0 +- bindgen 0.70.1 +- cargo-audit 0.20.1 - cargo-outdated 0.15.0 - cbindgen 0.27.0 - Clippy 0.1.80 - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 127.0.6533.100 -- Chrome Driver 127.0.6533.99 -- Microsoft Edge 127.0.2651.98 -- Microsoft Edge Driver 127.0.2651.98 -- Mozilla Firefox 129.0 +- Google Chrome 128.0.6613.85 +- Chrome Driver 128.0.6613.84 +- Microsoft Edge 128.0.2739.42 +- Microsoft Edge Driver 128.0.2739.42 +- Mozilla Firefox 129.0.2 - Gecko Driver 0.35.0 - IE Driver 4.14.0.0 - Selenium server 4.23.0 @@ -166,7 +165,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Node.js - 16.20.2 - 18.20.4 -- 20.16.0 +- 20.17.0 #### Python - 3.7.9 @@ -174,7 +173,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 3.9.13 - 3.10.11 - 3.11.9 -- 3.12.4 +- 3.12.5 #### PyPy - 2.7.18 [PyPy 7.3.16] @@ -218,253 +217,253 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Name | Version | ConfigFile | ServiceName | ServiceStatus | ListenPort | | ------ | ------- | ------------------------------------- | ----------- | ------------- | ---------- | | Apache | 2.4.55 | C:\tools\Apache24\conf\httpd.conf | Apache | Stopped | 80 | -| Nginx | 1.27.0 | C:\tools\nginx-1.27.0\conf\nginx.conf | nginx | Stopped | 80 | +| Nginx | 1.27.1 | C:\tools\nginx-1.27.1\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2022 | Name | Version | Path | | ----------------------------- | --------------- | -------------------------------------------------------- | -| Visual Studio Enterprise 2022 | 17.10.35122.118 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | +| Visual Studio Enterprise 2022 | 17.11.35219.272 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | #### Workloads, components and extensions | Package | Version | | ------------------------------------------------------------------------- | --------------- | -| android | 34.0.95.0 | -| aspire | 8.0.24.25802 | -| Component.Android.NDK.R23C | 17.10.34803.213 | -| Component.Android.SDK.MAUI | 17.10.34803.213 | -| Component.Dotfuscator | 17.10.34803.213 | -| Component.Linux.CMake | 17.10.34803.213 | -| Component.Linux.RemoteFileExplorer | 17.10.34803.213 | -| Component.MDD.Android | 17.10.34803.213 | -| Component.MDD.Linux | 17.10.34803.213 | -| Component.MDD.Linux.GCC.arm | 17.10.34803.213 | +| android | 34.0.113.0 | +| aspire | 8.100.24.37302 | +| Component.Android.NDK.R23C | 17.11.35102.94 | +| Component.Android.SDK.MAUI | 17.11.35102.94 | +| Component.Dotfuscator | 17.11.35102.94 | +| Component.Linux.CMake | 17.11.35102.94 | +| Component.Linux.RemoteFileExplorer | 17.11.35102.94 | +| Component.MDD.Android | 17.11.35102.94 | +| Component.MDD.Linux | 17.11.35102.94 | +| Component.MDD.Linux.GCC.arm | 17.11.35102.94 | | Component.Microsoft.VisualStudio.LiveShare.2022 | 1.0.5919 | -| Component.Microsoft.VisualStudio.RazorExtension | 17.10.34803.213 | +| Component.Microsoft.VisualStudio.RazorExtension | 17.11.35102.94 | | Component.Microsoft.VisualStudio.Tools.Applications.amd64 | 17.0.33617.0 | -| Component.Microsoft.VisualStudio.Web.AzureFunctions | 17.10.34803.213 | -| Component.Microsoft.Web.LibraryManager | 17.10.34803.213 | -| Component.Microsoft.WebTools.BrowserLink.WebLivePreview | 17.10.8.65003 | -| Component.Microsoft.Windows.DriverKit | 10.0.22621.0 | -| Component.OpenJDK | 17.10.34803.213 | -| Component.UnityEngine.x64 | 17.10.34803.213 | -| Component.Unreal | 17.10.34803.213 | -| Component.Unreal.Android | 17.10.34803.213 | -| Component.Unreal.Ide | 17.10.34803.213 | -| Component.VisualStudio.GitHub.Copilot | 0.2.894.62884 | +| Component.Microsoft.VisualStudio.Web.AzureFunctions | 17.11.35102.94 | +| Component.Microsoft.Web.LibraryManager | 17.11.35102.94 | +| Component.Microsoft.WebTools.BrowserLink.WebLivePreview | 17.11.3.50567 | +| Component.Microsoft.Windows.DriverKit | 10.0.26100.10 | +| Component.OpenJDK | 17.11.35102.94 | +| Component.UnityEngine.x64 | 17.11.35102.94 | +| Component.Unreal | 17.11.35102.94 | +| Component.Unreal.Android | 17.11.35102.94 | +| Component.Unreal.Ide | 17.11.35102.94 | +| Component.VisualStudio.GitHub.Copilot | 17.11.35215.114 | | Component.VSInstallerProjects2022 | 2.0.1 | | Component.WixToolset.VisualStudioExtension.Dev17 | 1.0.0.22 | | Component.WixToolset.VisualStudioExtension.Schemas3 | 1.0.0.22 | -| Component.Xamarin | 17.10.34824.239 | -| Component.Xamarin.RemotedSimulator | 17.10.34803.213 | -| ios | 17.2.8053.0 | -| maccatalyst | 17.2.8053.0 | -| maui.blazor | 8.0.61.10917 | -| maui.core | 8.0.61.10917 | -| maui.windows | 8.0.61.10917 | -| Microsoft.Component.Azure.DataLake.Tools | 17.10.34803.213 | -| Microsoft.Component.ClickOnce | 17.10.34803.213 | -| Microsoft.Component.CodeAnalysis.SDK | 17.10.34803.213 | -| Microsoft.Component.MSBuild | 17.10.34803.213 | -| Microsoft.Component.NetFX.Native | 17.10.34803.213 | -| Microsoft.Component.PythonTools | 17.10.34803.213 | -| Microsoft.Component.PythonTools.Web | 17.10.34803.213 | -| Microsoft.Component.VC.Runtime.UCRTSDK | 17.10.34803.213 | -| Microsoft.ComponentGroup.Blend | 17.10.34803.213 | -| Microsoft.ComponentGroup.ClickOnce.Publish | 17.10.34803.213 | -| Microsoft.Net.Component.4.5.2.TargetingPack | 17.10.34803.213 | -| Microsoft.Net.Component.4.6.2.TargetingPack | 17.10.34803.213 | -| Microsoft.Net.Component.4.6.TargetingPack | 17.10.34803.213 | -| Microsoft.Net.Component.4.7.1.TargetingPack | 17.10.34803.213 | -| Microsoft.Net.Component.4.7.2.TargetingPack | 17.10.34803.213 | -| Microsoft.Net.Component.4.7.TargetingPack | 17.10.34803.213 | -| Microsoft.Net.Component.4.8.1.SDK | 17.10.34803.213 | -| Microsoft.Net.Component.4.8.1.TargetingPack | 17.10.34803.213 | -| Microsoft.Net.Component.4.8.SDK | 17.10.34803.213 | -| Microsoft.Net.Component.4.8.TargetingPack | 17.10.34803.213 | -| Microsoft.Net.ComponentGroup.4.8.DeveloperTools | 17.10.34803.213 | -| Microsoft.Net.ComponentGroup.DevelopmentPrerequisites | 17.10.34803.213 | -| Microsoft.Net.ComponentGroup.TargetingPacks.Common | 17.10.34803.213 | -| microsoft.net.runtime.android | 8.0.724.31311 | -| microsoft.net.runtime.android.aot | 8.0.724.31311 | -| microsoft.net.runtime.android.aot.net7 | 8.0.724.31311 | -| microsoft.net.runtime.android.net7 | 8.0.724.31311 | -| microsoft.net.runtime.ios | 8.0.724.31311 | -| microsoft.net.runtime.ios.net7 | 8.0.724.31311 | -| microsoft.net.runtime.maccatalyst | 8.0.724.31311 | -| microsoft.net.runtime.maccatalyst.net7 | 8.0.724.31311 | -| microsoft.net.runtime.mono.tooling | 8.0.724.31311 | -| microsoft.net.runtime.mono.tooling.net7 | 8.0.724.31311 | -| microsoft.net.sdk.emscripten | 8.0.10.31301 | -| Microsoft.NetCore.Component.DevelopmentTools | 17.10.34803.213 | -| Microsoft.NetCore.Component.Runtime.6.0 | 17.10.35027.167 | -| Microsoft.NetCore.Component.Runtime.8.0 | 17.10.35027.167 | -| Microsoft.NetCore.Component.SDK | 17.10.35027.167 | -| Microsoft.NetCore.Component.Web | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.AppInsights.Tools | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.AspNet | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.AspNet45 | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.Azure.AuthoringTools | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.Azure.ClientLibs | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.Azure.Compute.Emulator | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.Azure.Powershell | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.Azure.ResourceManager.Tools | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.Azure.ServiceFabric.Tools | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.Azure.Waverton | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.Azure.Waverton.BuildTools | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.ClassDesigner | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.CodeMap | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.Common.Azure.Tools | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.CoreEditor | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.CppBuildInsights | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.Debugger.JustInTime | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.Debugger.Snapshot | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.DiagnosticTools | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.DockerTools | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.DotNetModelBuilder | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.DslTools | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.Embedded | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.EntityFramework | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.FSharp | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.FSharp.Desktop | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.FSharp.WebTemplates | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.GraphDocument | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.Graphics | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.Graphics.Tools | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.HLSL | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.IISExpress | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.IntelliCode | 17.10.34817.167 | -| Microsoft.VisualStudio.Component.IntelliTrace.FrontEnd | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.JavaScript.Diagnostics | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.JavaScript.TypeScript | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.LinqToSql | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.LiveUnitTesting | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.ManagedDesktop.Core | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.ManagedDesktop.Prerequisites | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.Merq | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.MonoDebugger | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.MSODBC.SQL | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.MSSQL.CMDLnUtils | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.Node.Tools | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.NuGet | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.NuGet.BuildTools | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.PortableLibrary | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.Roslyn.Compiler | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.Roslyn.LanguageServices | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.SecurityIssueAnalysis | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.Sharepoint.Tools | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.SQL.CLR | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.SQL.DataSources | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.SQL.LocalDB.Runtime | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.SQL.SSDT | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.TeamOffice | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.TestTools.CodedUITest | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.TestTools.WebLoadTest | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.TextTemplating | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.TypeScript.TSServer | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.Unity | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.UWP.VC.ARM64 | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.UWP.VC.ARM64EC | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM64 | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.VC.ASAN | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.VC.ATL | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.VC.ATL.ARM | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.VC.ATL.ARM.Spectre | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.VC.ATL.ARM64 | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.VC.ATL.ARM64.Spectre | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.VC.ATL.Spectre | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.VC.ATLMFC | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.VC.ATLMFC.Spectre | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.VC.CLI.Support | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.VC.CMake.Project | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.VC.CoreIde | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.VC.DiagnosticTools | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.VC.Llvm.Clang | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.VC.Llvm.ClangToolset | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.VC.MFC.ARM | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.VC.MFC.ARM.Spectre | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.VC.MFC.ARM64 | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.VC.MFC.ARM64.Spectre | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.VC.Modules.x86.x64 | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.VC.Redist.14.Latest | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.VC.Redist.MSM | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.VC.Runtimes.ARM.Spectre | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.VC.Runtimes.ARM64.Spectre | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.VC.Runtimes.ARM64EC.Spectre | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.VC.Runtimes.x86.x64.Spectre | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.VC.TestAdapterForBoostTest | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.VC.TestAdapterForGoogleTest | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.VC.Tools.ARM | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.VC.Tools.ARM64 | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.VC.Tools.ARM64EC | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.VC.Tools.x86.x64 | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.Vcpkg | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.VSSDK | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.Wcf.Tooling | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.Web | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.WebDeploy | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.Windows10SDK | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.Windows10SDK.19041 | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.Windows10SDK.20348 | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.Windows11SDK.22000 | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.Windows11SDK.22621 | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.Windows11Sdk.WindowsPerformanceToolkit | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.Workflow | 17.10.34803.213 | -| Microsoft.VisualStudio.Component.WslDebugging | 17.10.34803.213 | -| Microsoft.VisualStudio.ComponentGroup.ArchitectureTools.Native | 17.10.34803.213 | -| Microsoft.VisualStudio.ComponentGroup.Azure.CloudServices | 17.10.34803.213 | -| Microsoft.VisualStudio.ComponentGroup.Azure.Prerequisites | 17.10.34803.213 | -| Microsoft.VisualStudio.ComponentGroup.Azure.ResourceManager.Tools | 17.10.34803.213 | -| Microsoft.VisualStudio.ComponentGroup.AzureFunctions | 17.10.34803.213 | -| Microsoft.VisualStudio.ComponentGroup.Maui.All | 17.10.34803.213 | -| Microsoft.VisualStudio.ComponentGroup.Maui.Android | 17.10.34803.213 | -| Microsoft.VisualStudio.ComponentGroup.Maui.Blazor | 17.10.34803.213 | -| Microsoft.VisualStudio.ComponentGroup.Maui.iOS | 17.10.34803.213 | -| Microsoft.VisualStudio.ComponentGroup.Maui.MacCatalyst | 17.10.34803.213 | -| Microsoft.VisualStudio.ComponentGroup.Maui.Shared | 17.10.34803.213 | -| Microsoft.VisualStudio.ComponentGroup.Maui.Windows | 17.10.34803.213 | -| Microsoft.VisualStudio.ComponentGroup.MSIX.Packaging | 17.10.34803.213 | -| Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core | 17.10.34803.213 | -| Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Llvm.Clang | 17.10.34803.213 | -| Microsoft.VisualStudio.ComponentGroup.UWP.NetCoreAndStandard | 17.10.34803.213 | -| Microsoft.VisualStudio.ComponentGroup.UWP.VC.v142 | 17.10.34803.213 | -| Microsoft.VisualStudio.ComponentGroup.VC.Tools.142.x86.x64 | 17.10.34803.213 | -| Microsoft.VisualStudio.ComponentGroup.VisualStudioExtension.Prerequisites | 17.10.34803.213 | -| Microsoft.VisualStudio.ComponentGroup.Web | 17.10.34803.213 | -| Microsoft.VisualStudio.ComponentGroup.Web.CloudTools | 17.10.34803.213 | -| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions | 17.10.34803.213 | -| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.CMake | 17.10.34803.213 | -| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.TemplateEngine | 17.10.34803.213 | -| Microsoft.VisualStudio.ComponentGroup.WindowsAppDevelopment.Prerequisites | 17.10.34818.143 | -| Microsoft.VisualStudio.ComponentGroup.WindowsAppSDK.Cs | 17.10.34803.213 | -| Microsoft.VisualStudio.Workload.Azure | 17.10.34803.213 | -| Microsoft.VisualStudio.Workload.CoreEditor | 17.10.34803.213 | -| Microsoft.VisualStudio.Workload.Data | 17.10.34803.213 | -| Microsoft.VisualStudio.Workload.DataScience | 17.10.34803.213 | -| Microsoft.VisualStudio.Workload.ManagedDesktop | 17.10.34803.213 | -| Microsoft.VisualStudio.Workload.ManagedGame | 17.10.34803.213 | -| Microsoft.VisualStudio.Workload.NativeCrossPlat | 17.10.34803.213 | -| Microsoft.VisualStudio.Workload.NativeDesktop | 17.10.35004.147 | -| Microsoft.VisualStudio.Workload.NativeGame | 17.10.35004.147 | -| Microsoft.VisualStudio.Workload.NativeMobile | 17.10.34803.213 | -| Microsoft.VisualStudio.Workload.NetCrossPlat | 17.10.34803.213 | -| Microsoft.VisualStudio.Workload.NetWeb | 17.10.34803.213 | -| Microsoft.VisualStudio.Workload.Node | 17.10.34803.213 | -| Microsoft.VisualStudio.Workload.Office | 17.10.34803.213 | -| Microsoft.VisualStudio.Workload.Python | 17.10.34803.213 | -| Microsoft.VisualStudio.Workload.Universal | 17.10.35004.147 | -| Microsoft.VisualStudio.Workload.VisualStudioExtension | 17.10.34803.213 | -| runtimes.ios | 8.0.724.31311 | -| runtimes.ios.net7 | 8.0.724.31311 | -| runtimes.maccatalyst | 8.0.724.31311 | -| runtimes.maccatalyst.net7 | 8.0.724.31311 | -| wasm.tools | 8.0.724.31311 | +| Component.Xamarin | 17.11.35102.94 | +| Component.Xamarin.RemotedSimulator | 17.11.35102.94 | +| ios | 17.5.8020.0 | +| maccatalyst | 17.5.8020.0 | +| maui.blazor | 8.0.72.11171 | +| maui.core | 8.0.72.11171 | +| maui.windows | 8.0.72.11171 | +| Microsoft.Component.Azure.DataLake.Tools | 17.11.35102.94 | +| Microsoft.Component.ClickOnce | 17.11.35102.94 | +| Microsoft.Component.CodeAnalysis.SDK | 17.11.35102.94 | +| Microsoft.Component.MSBuild | 17.11.35102.94 | +| Microsoft.Component.NetFX.Native | 17.11.35102.94 | +| Microsoft.Component.PythonTools | 17.11.35102.94 | +| Microsoft.Component.PythonTools.Web | 17.11.35102.94 | +| Microsoft.Component.VC.Runtime.UCRTSDK | 17.11.35102.94 | +| Microsoft.ComponentGroup.Blend | 17.11.35102.94 | +| Microsoft.ComponentGroup.ClickOnce.Publish | 17.11.35102.94 | +| Microsoft.Net.Component.4.5.2.TargetingPack | 17.11.35102.94 | +| Microsoft.Net.Component.4.6.2.TargetingPack | 17.11.35102.94 | +| Microsoft.Net.Component.4.6.TargetingPack | 17.11.35102.94 | +| Microsoft.Net.Component.4.7.1.TargetingPack | 17.11.35102.94 | +| Microsoft.Net.Component.4.7.2.TargetingPack | 17.11.35102.94 | +| Microsoft.Net.Component.4.7.TargetingPack | 17.11.35102.94 | +| Microsoft.Net.Component.4.8.1.SDK | 17.11.35102.94 | +| Microsoft.Net.Component.4.8.1.TargetingPack | 17.11.35102.94 | +| Microsoft.Net.Component.4.8.SDK | 17.11.35102.94 | +| Microsoft.Net.Component.4.8.TargetingPack | 17.11.35102.94 | +| Microsoft.Net.ComponentGroup.4.8.DeveloperTools | 17.11.35102.94 | +| Microsoft.Net.ComponentGroup.DevelopmentPrerequisites | 17.11.35102.94 | +| Microsoft.Net.ComponentGroup.TargetingPacks.Common | 17.11.35102.94 | +| microsoft.net.runtime.android | 8.0.824.36612 | +| microsoft.net.runtime.android.aot | 8.0.824.36612 | +| microsoft.net.runtime.android.aot.net7 | 8.0.824.36612 | +| microsoft.net.runtime.android.net7 | 8.0.824.36612 | +| microsoft.net.runtime.ios | 8.0.824.36612 | +| microsoft.net.runtime.ios.net7 | 8.0.824.36612 | +| microsoft.net.runtime.maccatalyst | 8.0.824.36612 | +| microsoft.net.runtime.maccatalyst.net7 | 8.0.824.36612 | +| microsoft.net.runtime.mono.tooling | 8.0.824.36612 | +| microsoft.net.runtime.mono.tooling.net7 | 8.0.824.36612 | +| microsoft.net.sdk.emscripten | 8.0.10.35802 | +| Microsoft.NetCore.Component.DevelopmentTools | 17.11.35102.94 | +| Microsoft.NetCore.Component.Runtime.6.0 | 17.11.35207.189 | +| Microsoft.NetCore.Component.Runtime.8.0 | 17.11.35207.189 | +| Microsoft.NetCore.Component.SDK | 17.11.35207.189 | +| Microsoft.NetCore.Component.Web | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.AppInsights.Tools | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.AspNet | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.AspNet45 | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.Azure.AuthoringTools | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.Azure.ClientLibs | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.Azure.Compute.Emulator | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.Azure.Powershell | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.Azure.ResourceManager.Tools | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.Azure.ServiceFabric.Tools | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.Azure.Waverton | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.Azure.Waverton.BuildTools | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.ClassDesigner | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.CodeMap | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.Common.Azure.Tools | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.CoreEditor | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.CppBuildInsights | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.Debugger.JustInTime | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.Debugger.Snapshot | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.DiagnosticTools | 17.11.35118.42 | +| Microsoft.VisualStudio.Component.DockerTools | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.DotNetModelBuilder | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.DslTools | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.Embedded | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.EntityFramework | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.FSharp | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.FSharp.Desktop | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.FSharp.WebTemplates | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.GraphDocument | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.Graphics | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.Graphics.Tools | 17.11.35118.42 | +| Microsoft.VisualStudio.Component.HLSL | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.IISExpress | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.IntelliCode | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.IntelliTrace.FrontEnd | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.JavaScript.Diagnostics | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.JavaScript.TypeScript | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.LinqToSql | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.LiveUnitTesting | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.ManagedDesktop.Core | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.ManagedDesktop.Prerequisites | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.Merq | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.MonoDebugger | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.MSODBC.SQL | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.MSSQL.CMDLnUtils | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.Node.Tools | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.NuGet | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.NuGet.BuildTools | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.PortableLibrary | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.Roslyn.Compiler | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.Roslyn.LanguageServices | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.SecurityIssueAnalysis | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.Sharepoint.Tools | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.SQL.CLR | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.SQL.DataSources | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.SQL.LocalDB.Runtime | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.SQL.SSDT | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.TeamOffice | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.TestTools.CodedUITest | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.TestTools.WebLoadTest | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.TextTemplating | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.TypeScript.TSServer | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.Unity | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.UWP.VC.ARM64 | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.UWP.VC.ARM64EC | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM64 | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.VC.ASAN | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.VC.ATL | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.VC.ATL.ARM | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.VC.ATL.ARM.Spectre | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.VC.ATL.ARM64 | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.VC.ATL.ARM64.Spectre | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.VC.ATL.Spectre | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.VC.ATLMFC | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.VC.ATLMFC.Spectre | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.VC.CLI.Support | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.VC.CMake.Project | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.VC.CoreIde | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.VC.DiagnosticTools | 17.11.35118.42 | +| Microsoft.VisualStudio.Component.VC.Llvm.Clang | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.VC.Llvm.ClangToolset | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.VC.MFC.ARM | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.VC.MFC.ARM.Spectre | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.VC.MFC.ARM64 | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.VC.MFC.ARM64.Spectre | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.VC.Modules.x86.x64 | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.VC.Redist.14.Latest | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.VC.Redist.MSM | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.VC.Runtimes.ARM.Spectre | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.VC.Runtimes.ARM64.Spectre | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.VC.Runtimes.ARM64EC.Spectre | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.VC.Runtimes.x86.x64.Spectre | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.VC.TestAdapterForBoostTest | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.VC.TestAdapterForGoogleTest | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.VC.Tools.ARM | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.VC.Tools.ARM64 | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.VC.Tools.ARM64EC | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.VC.Tools.x86.x64 | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.Vcpkg | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.VSSDK | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.Wcf.Tooling | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.Web | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.WebDeploy | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.Windows10SDK | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.Windows10SDK.19041 | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.Windows10SDK.20348 | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.Windows11SDK.22000 | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.Windows11SDK.22621 | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.Windows11Sdk.WindowsPerformanceToolkit | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.Workflow | 17.11.35102.94 | +| Microsoft.VisualStudio.Component.WslDebugging | 17.11.35102.94 | +| Microsoft.VisualStudio.ComponentGroup.ArchitectureTools.Native | 17.11.35102.94 | +| Microsoft.VisualStudio.ComponentGroup.Azure.CloudServices | 17.11.35102.94 | +| Microsoft.VisualStudio.ComponentGroup.Azure.Prerequisites | 17.11.35102.94 | +| Microsoft.VisualStudio.ComponentGroup.Azure.ResourceManager.Tools | 17.11.35102.94 | +| Microsoft.VisualStudio.ComponentGroup.AzureFunctions | 17.11.35102.94 | +| Microsoft.VisualStudio.ComponentGroup.Maui.All | 17.11.35102.94 | +| Microsoft.VisualStudio.ComponentGroup.Maui.Android | 17.11.35102.94 | +| Microsoft.VisualStudio.ComponentGroup.Maui.Blazor | 17.11.35102.94 | +| Microsoft.VisualStudio.ComponentGroup.Maui.iOS | 17.11.35102.94 | +| Microsoft.VisualStudio.ComponentGroup.Maui.MacCatalyst | 17.11.35102.94 | +| Microsoft.VisualStudio.ComponentGroup.Maui.Shared | 17.11.35102.94 | +| Microsoft.VisualStudio.ComponentGroup.Maui.Windows | 17.11.35102.94 | +| Microsoft.VisualStudio.ComponentGroup.MSIX.Packaging | 17.11.35102.94 | +| Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core | 17.11.35102.94 | +| Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Llvm.Clang | 17.11.35102.94 | +| Microsoft.VisualStudio.ComponentGroup.UWP.NetCoreAndStandard | 17.11.35102.94 | +| Microsoft.VisualStudio.ComponentGroup.UWP.VC.v142 | 17.11.35102.94 | +| Microsoft.VisualStudio.ComponentGroup.VC.Tools.142.x86.x64 | 17.11.35102.94 | +| Microsoft.VisualStudio.ComponentGroup.VisualStudioExtension.Prerequisites | 17.11.35102.94 | +| Microsoft.VisualStudio.ComponentGroup.Web | 17.11.35102.94 | +| Microsoft.VisualStudio.ComponentGroup.Web.CloudTools | 17.11.35102.94 | +| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions | 17.11.35102.94 | +| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.CMake | 17.11.35102.94 | +| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.TemplateEngine | 17.11.35102.94 | +| Microsoft.VisualStudio.ComponentGroup.WindowsAppDevelopment.Prerequisites | 17.11.35102.94 | +| Microsoft.VisualStudio.ComponentGroup.WindowsAppSDK.Cs | 17.11.35102.94 | +| Microsoft.VisualStudio.Workload.Azure | 17.11.35102.94 | +| Microsoft.VisualStudio.Workload.CoreEditor | 17.11.35102.94 | +| Microsoft.VisualStudio.Workload.Data | 17.11.35102.94 | +| Microsoft.VisualStudio.Workload.DataScience | 17.11.35102.94 | +| Microsoft.VisualStudio.Workload.ManagedDesktop | 17.11.35102.94 | +| Microsoft.VisualStudio.Workload.ManagedGame | 17.11.35102.94 | +| Microsoft.VisualStudio.Workload.NativeCrossPlat | 17.11.35102.94 | +| Microsoft.VisualStudio.Workload.NativeDesktop | 17.11.35102.94 | +| Microsoft.VisualStudio.Workload.NativeGame | 17.11.35102.94 | +| Microsoft.VisualStudio.Workload.NativeMobile | 17.11.35102.94 | +| Microsoft.VisualStudio.Workload.NetCrossPlat | 17.11.35102.94 | +| Microsoft.VisualStudio.Workload.NetWeb | 17.11.35102.94 | +| Microsoft.VisualStudio.Workload.Node | 17.11.35102.94 | +| Microsoft.VisualStudio.Workload.Office | 17.11.35102.94 | +| Microsoft.VisualStudio.Workload.Python | 17.11.35102.94 | +| Microsoft.VisualStudio.Workload.Universal | 17.11.35102.94 | +| Microsoft.VisualStudio.Workload.VisualStudioExtension | 17.11.35102.94 | +| runtimes.ios | 8.0.824.36612 | +| runtimes.ios.net7 | 8.0.824.36612 | +| runtimes.maccatalyst | 8.0.824.36612 | +| runtimes.maccatalyst.net7 | 8.0.824.36612 | +| wasm.tools | 8.0.824.36612 | | ProBITools.MicrosoftAnalysisServicesModelingProjects2022 | 3.0.4 | | ProBITools.MicrosoftReportProjectsforVisualStudio2022 | 3.0.1 | | SSIS.MicrosoftDataToolsIntegrationServices | 1.4 | | VisualStudioClient.MicrosoftVisualStudio2022InstallerProjects | 2.0.1 | | Windows Driver Kit | 10.1.22621.2428 | -| Windows Driver Kit Visual Studio Extension | 10.0.22621.0 | +| Windows Driver Kit Visual Studio Extension | 10.0.26100.10 | | Windows Software Development Kit | 10.1.22621.3233 | | WixToolset.WixToolsetVisualStudio2022Extension | 1.0.0.22 | @@ -488,15 +487,15 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 10.0.22621.0 ### .NET Core Tools -- .NET Core SDK: 6.0.132, 6.0.203, 6.0.321, 6.0.424, 7.0.120, 7.0.203, 7.0.317, 7.0.410, 8.0.303 +- .NET Core SDK: 6.0.133, 6.0.203, 6.0.321, 6.0.425, 7.0.120, 7.0.203, 7.0.317, 7.0.410, 8.0.400 - .NET Framework: 4.8, 4.8.1 -- Microsoft.AspNetCore.App: 6.0.5, 6.0.26, 6.0.32, 7.0.5, 7.0.20, 8.0.7 -- Microsoft.NETCore.App: 6.0.5, 6.0.26, 6.0.32, 7.0.5, 7.0.20, 8.0.7 -- Microsoft.WindowsDesktop.App: 6.0.5, 6.0.26, 6.0.32, 7.0.5, 7.0.20, 8.0.7 +- Microsoft.AspNetCore.App: 6.0.5, 6.0.26, 6.0.32, 6.0.33, 7.0.5, 7.0.20, 8.0.8 +- Microsoft.NETCore.App: 6.0.5, 6.0.26, 6.0.32, 6.0.33, 7.0.5, 7.0.20, 8.0.8 +- Microsoft.WindowsDesktop.App: 6.0.5, 6.0.26, 6.0.33, 7.0.5, 7.0.20, 8.0.8 - nbgv 3.6.141+d2035fb7be ### PowerShell Tools -- PowerShell 7.4.4 +- PowerShell 7.4.5 #### Powershell Modules - Az: 12.1.0 @@ -504,10 +503,10 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - AzureRM: 2.1.0 (Default), 6.13.1 - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.632 +- AWSPowershell: 4.1.642 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.10 -- Microsoft.Graph: 2.21.1 +- Microsoft.Graph: 2.22.0 - Pester: 3.4.0, 5.6.1 - PowerShellGet: 1.0.0.1, 2.2.5 - PSScriptAnalyzer: 1.22.0 @@ -521,18 +520,18 @@ All other versions are saved but not installed. ``` ### Android -| Package Name | Version | -| -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 8.0 | -| Android Emulator | 34.2.16 | -| Android SDK Build-tools | 35.0.0<br>34.0.0<br>33.0.0 33.0.1 33.0.2 33.0.3<br>32.0.0<br>31.0.0 | -| Android SDK Platforms | android-35 (rev 1)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1) | -| Android SDK Platform-Tools | 35.0.2 | -| Android Support Repository | 47.0.0 | -| CMake | 3.18.1<br>3.22.1 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 24.0.8215888<br>25.2.9519653<br>26.3.11579264<br>27.0.12077973 | +| Package Name | Version | +| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 8.0 | +| Android Emulator | 34.2.16 | +| Android SDK Build-tools | 35.0.0<br>34.0.0<br>33.0.0 33.0.1 33.0.2 33.0.3<br>32.0.0<br>31.0.0 | +| Android SDK Platforms | android-35 (rev 1)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1) | +| Android SDK Platform-Tools | 35.0.2 | +| Android Support Repository | 47.0.0 | +| CMake | 3.18.1<br>3.22.1 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 26.3.11579264<br>27.0.12077973 | #### Environment variables | Name | Value | @@ -547,9 +546,9 @@ All other versions are saved but not installed. ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2022 | sha256:4ad6f775ab425cf19af5c344750e3e259adce5a83f667ab1c9c2106e3e543cb7 | 2024-07-09 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2022 | sha256:027fcd5a8a9be004399d3fbfab686d6610cae98783a06cad65c29cb934d4fe09 | 2024-07-09 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:b251ff756b66294a276d26e0ddf04a8bdef1f3c15f888884a8caa207885c60ba | 2024-07-09 | -| mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:cc9f6a1334190c1f18a905f56d285132e562a9a1ce18ff9476cfaf95194aa0b7 | 2024-07-03 | -| mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:581d6056a224ef0b898e3b87982275b1c63c7ff90108f058d81842254f8b914c | 2024-07-03 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2022 | sha256:d15f31091ee3a26dec0a6be0eba16fd8670254ad7b38aa31534d7b9e6479730b | 2024-08-13 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2022 | sha256:760d668c39bd3a2cd18da83ed11d7bea9398b13745a4c6706b740a4f7d127ef4 | 2024-08-13 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:b3f427a83d221958f6b2f3a49421e42d2fbd26e0d6afaed41cba7ee6fd4a4805 | 2024-08-13 | +| mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:244113e50a678a25a63930780f9ccafd22e1a37aa9e3d93295e4cebf0f170a11 | 2024-08-10 | +| mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:a57f79008ec0110877d5907787095c413fae1c27cccf1473bc9646fd7325febe | 2024-08-10 | From d7c81d045c5a2f31edf188cf9d88521cc9be722a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 30 Aug 2024 02:36:34 +0000 Subject: [PATCH 3073/3485] Updating readme file for macos-14 version 20240827.1 (#10502) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-14-Readme.md | 122 ++++++++++++++++++-------------- 1 file changed, 70 insertions(+), 52 deletions(-) diff --git a/images/macos/macos-14-Readme.md b/images/macos/macos-14-Readme.md index b48ee3c69b99..4b25ba9cf136 100644 --- a/images/macos/macos-14-Readme.md +++ b/images/macos/macos-14-Readme.md @@ -1,7 +1,7 @@ # macOS 14 - OS Version: macOS 14.6.1 (23G93) - Kernel Version: Darwin 23.6.0 -- Image Version: 20240818.2 +- Image Version: 20240827.1 ## Installed Software @@ -12,29 +12,29 @@ - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` - GCC 12 (Homebrew GCC 12.4.0) - available by `gcc-12` alias - GCC 13 (Homebrew GCC 13.3.0) - available by `gcc-13` alias -- GCC 14 (Homebrew GCC 14.1.0_2) - available by `gcc-14` alias +- GCC 14 (Homebrew GCC 14.2.0) - available by `gcc-14` alias - GNU Fortran 12 (Homebrew GCC 12.4.0) - available by `gfortran-12` alias - GNU Fortran 13 (Homebrew GCC 13.3.0) - available by `gfortran-13` alias -- GNU Fortran 14 (Homebrew GCC 14.1.0_2) - available by `gfortran-14` alias -- Kotlin 2.0.10-release-540 +- GNU Fortran 14 (Homebrew GCC 14.2.0) - available by `gfortran-14` alias +- Kotlin 2.0.20-release-360 - Mono 6.12.0.188 -- Node.js 20.16.0 +- Node.js 20.17.0 - Perl 5.38.2 - PHP 8.3.10 - Python3 3.12.5 - Ruby 3.0.7p220 ### Package Management -- Bundler 2.5.17 +- Bundler 2.5.18 - Carthage 0.39.1 - CocoaPods 1.15.2 -- Composer 2.7.7 -- Homebrew 4.3.16 -- NPM 10.8.1 +- Composer 2.7.8 +- Homebrew 4.3.18 +- NPM 10.8.2 - NuGet 6.3.1.1 - Pip3 24.2 (python 3.12) -- Pipx 1.6.0 -- RubyGems 3.5.17 +- Pipx 1.7.1 +- RubyGems 3.5.18 - Yarn 1.22.22 ### Project Management @@ -46,13 +46,13 @@ - 7-Zip 17.05 - aria2 1.37.0 - azcopy 10.26.0 -- bazel 7.3.0 +- bazel 7.3.1 - bazelisk 1.20.0 - bsdtar 3.5.3 - available by 'tar' alias - Curl 8.9.1 - Git 2.46.0 - Git LFS 3.5.1 -- GitHub CLI 2.54.0 +- GitHub CLI 2.55.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.24.5 - gpg (GnuPG) 2.4.5 @@ -64,8 +64,8 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.17.32 -- AWS SAM CLI 1.122.0 +- AWS CLI 2.17.38 +- AWS SAM CLI 1.123.0 - AWS Session Manager CLI 1.2.650.0 - Azure CLI 2.63.0 - Azure CLI (azure-devops) 1.0.1 @@ -79,19 +79,19 @@ - Xcodes 1.5.0 ### Linters -- SwiftLint 0.56.1 +- SwiftLint 0.56.2 ### Browsers - Safari 17.6 (19618.3.11.11.5) - SafariDriver 17.6 (19618.3.11.11.5) -- Google Chrome 127.0.6533.120 -- Google Chrome for Testing 127.0.6533.119 -- ChromeDriver 127.0.6533.119 -- Microsoft Edge 127.0.2651.105 -- Microsoft Edge WebDriver 127.0.2651.107 -- Mozilla Firefox 129.0.1 -- geckodriver 0.34.0 -- Selenium server 4.23.0 +- Google Chrome 128.0.6613.85 +- Google Chrome for Testing 128.0.6613.84 +- ChromeDriver 128.0.6613.84 +- Microsoft Edge 128.0.2739.42 +- Microsoft Edge WebDriver 128.0.2739.41 +- Mozilla Firefox 129.0.2 +- geckodriver 0.35.0 +- Selenium server 4.23.1 #### Environment variables | Name | Value | @@ -122,7 +122,7 @@ #### Node.js - 18.20.4 -- 20.16.0 +- 20.17.0 #### Go - 1.20.14 @@ -140,7 +140,7 @@ - Rustfmt 1.7.0-stable ### PowerShell Tools -- PowerShell 7.4.4 +- PowerShell 7.4.5 #### PowerShell Modules - Az: 12.2.0 @@ -151,6 +151,7 @@ | Version | Build | Path | | -------------- | -------- | --------------------------------- | | 16.1 (beta) | 16B5001e | /Applications/Xcode_16.1_beta.app | +| 16.0 (beta) | 16A5230g | /Applications/Xcode_16_beta_6.app | | 15.4 (default) | 15F31d | /Applications/Xcode_15.4.app | | 15.3 | 15E204a | /Applications/Xcode_15.3.app | | 15.2 | 15C500b | /Applications/Xcode_15.2.app | @@ -166,51 +167,54 @@ | macOS 14.2 | macosx14.2 | 15.1, 15.2 | | macOS 14.4 | macosx14.4 | 15.3 | | macOS 14.5 | macosx14.5 | 15.4 | +| macOS 15.0 | macosx15.0 | 16.0 | | macOS 15.1 | macosx15.1 | 16.1 | | iOS 16.4 | iphoneos16.4 | 14.3.1 | | iOS 17.0 | iphoneos17.0 | 15.0.1 | | iOS 17.2 | iphoneos17.2 | 15.1, 15.2 | | iOS 17.4 | iphoneos17.4 | 15.3 | | iOS 17.5 | iphoneos17.5 | 15.4 | +| iOS 18.0 | iphoneos18.0 | 16.0 | | iOS 18.1 | iphoneos18.1 | 16.1 | | Simulator - iOS 16.4 | iphonesimulator16.4 | 14.3.1 | | Simulator - iOS 17.0 | iphonesimulator17.0 | 15.0.1 | | Simulator - iOS 17.2 | iphonesimulator17.2 | 15.1, 15.2 | | Simulator - iOS 17.4 | iphonesimulator17.4 | 15.3 | | Simulator - iOS 17.5 | iphonesimulator17.5 | 15.4 | +| Simulator - iOS 18.0 | iphonesimulator18.0 | 16.0 | | Simulator - iOS 18.1 | iphonesimulator18.1 | 16.1 | | tvOS 16.4 | appletvos16.4 | 14.3.1 | | tvOS 17.0 | appletvos17.0 | 15.0.1 | | tvOS 17.2 | appletvos17.2 | 15.1, 15.2 | | tvOS 17.4 | appletvos17.4 | 15.3 | | tvOS 17.5 | appletvos17.5 | 15.4 | -| tvOS 18.0 | appletvos18.0 | 16.1 | +| tvOS 18.0 | appletvos18.0 | 16.0, 16.1 | | Simulator - tvOS 16.4 | appletvsimulator16.4 | 14.3.1 | | Simulator - tvOS 17.0 | appletvsimulator17.0 | 15.0.1 | | Simulator - tvOS 17.2 | appletvsimulator17.2 | 15.1, 15.2 | | Simulator - tvOS 17.4 | appletvsimulator17.4 | 15.3 | | Simulator - tvOS 17.5 | appletvsimulator17.5 | 15.4 | -| Simulator - tvOS 18.0 | appletvsimulator18.0 | 16.1 | +| Simulator - tvOS 18.0 | appletvsimulator18.0 | 16.0, 16.1 | | watchOS 9.4 | watchos9.4 | 14.3.1 | | watchOS 10.0 | watchos10.0 | 15.0.1 | | watchOS 10.2 | watchos10.2 | 15.1, 15.2 | | watchOS 10.4 | watchos10.4 | 15.3 | | watchOS 10.5 | watchos10.5 | 15.4 | -| watchOS 11.0 | watchos11.0 | 16.1 | +| watchOS 11.0 | watchos11.0 | 16.0, 16.1 | | Simulator - watchOS 9.4 | watchsimulator9.4 | 14.3.1 | | Simulator - watchOS 10.0 | watchsimulator10.0 | 15.0.1 | | Simulator - watchOS 10.2 | watchsimulator10.2 | 15.1, 15.2 | | Simulator - watchOS 10.4 | watchsimulator10.4 | 15.3 | | Simulator - watchOS 10.5 | watchsimulator10.5 | 15.4 | -| Simulator - watchOS 11.0 | watchsimulator11.0 | 16.1 | +| Simulator - watchOS 11.0 | watchsimulator11.0 | 16.0, 16.1 | | Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | | visionOS 1.0 | xros1.0 | 15.2 | | visionOS 1.1 | xros1.1 | 15.3 | | Simulator - visionOS 1.1 | xrsimulator1.1 | 15.3 | | Simulator - visionOS 1.2 | xrsimulator1.2 | 15.4 | | visionOS 1.2 | xros1.2 | 15.4 | -| Simulator - visionOS 2.0 | xrsimulator2.0 | 16.1 | -| visionOS 2.0 | xros2.0 | 16.1 | +| Simulator - visionOS 2.0 | xrsimulator2.0 | 16.0, 16.1 | +| visionOS 2.0 | xros2.0 | 16.0, 16.1 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | @@ -219,29 +223,30 @@ | DriverKit 23.2 | driverkit23.2 | 15.1, 15.2 | | DriverKit 23.4 | driverkit23.4 | 15.3 | | DriverKit 23.5 | driverkit23.5 | 15.4 | +| DriverKit 24.0 | driverkit24.0 | 16.0 | | DriverKit 24.1 | driverkit24.1 | 16.1 | #### Installed Simulators -| OS | Xcode Version | Simulators | -| ------------ | -------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| iOS 16.4 | 14.3.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 17.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 17.2 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 17.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | -| iOS 17.5 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | -| iOS 18.1 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | -| tvOS 16.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 17.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 17.2 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 17.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 17.5 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 18.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| watchOS 9.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | -| watchOS 10.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | -| watchOS 10.2 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | -| watchOS 10.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | -| watchOS 10.5 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | -| watchOS 11.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | +| OS | Xcode Version | Simulators | +| ------------ | ---------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| iOS 16.4 | 14.3.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 17.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0<br>16.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 17.2 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0<br>16.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 17.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0<br>16.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | +| iOS 17.5 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0<br>16.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | +| iOS 18.1 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0<br>16.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | +| tvOS 16.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0<br>16.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 17.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0<br>16.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 17.2 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0<br>16.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 17.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0<br>16.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 17.5 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0<br>16.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 18.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0<br>16.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| watchOS 9.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0<br>16.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | +| watchOS 10.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0<br>16.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 10.2 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0<br>16.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 10.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0<br>16.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 10.5 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0<br>16.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 11.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0<br>16.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | ### Android | Package Name | Version | @@ -266,3 +271,16 @@ | ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/26.3.11579264 | | ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk/26.3.11579264 | | ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | + +### Miscellaneous + +#### Environment variables +| Name | Value | +| ----------------- | ----------------------------------------------------------------------------------------- | +| PARALLELS_DMG_URL | https://download.parallels.com/desktop/v19/19.4.1-54985/ParallelsDesktop-19.4.1-54985.dmg | + +##### Notes +``` +If you want to use Parallels Desktop you should download a package from URL stored in +PARALLELS_DMG_URL environment variable. A system extension is allowed for this version. +``` From 12335f2cc4243907c2238dbb6577892b3073a141 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 30 Aug 2024 03:07:37 +0000 Subject: [PATCH 3074/3485] Updating readme file for macos-14-arm64 version 20240827.4 (#10503) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-14-arm64-Readme.md | 112 ++++++++++++++------------ 1 file changed, 59 insertions(+), 53 deletions(-) diff --git a/images/macos/macos-14-arm64-Readme.md b/images/macos/macos-14-arm64-Readme.md index e85d7dd185c0..cf2713b7b666 100644 --- a/images/macos/macos-14-arm64-Readme.md +++ b/images/macos/macos-14-arm64-Readme.md @@ -1,7 +1,7 @@ # macOS 14 - OS Version: macOS 14.6.1 (23G93) - Kernel Version: Darwin 23.6.0 -- Image Version: 20240818.4 +- Image Version: 20240827.4 ## Installed Software @@ -12,27 +12,27 @@ - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` - GCC 12 (Homebrew GCC 12.4.0) - available by `gcc-12` alias - GCC 13 (Homebrew GCC 13.3.0) - available by `gcc-13` alias -- GCC 14 (Homebrew GCC 14.1.0_2) - available by `gcc-14` alias +- GCC 14 (Homebrew GCC 14.2.0) - available by `gcc-14` alias - GNU Fortran 12 (Homebrew GCC 12.4.0) - available by `gfortran-12` alias - GNU Fortran 13 (Homebrew GCC 13.3.0) - available by `gfortran-13` alias -- GNU Fortran 14 (Homebrew GCC 14.1.0_2) - available by `gfortran-14` alias -- Kotlin 2.0.10-release-540 +- GNU Fortran 14 (Homebrew GCC 14.2.0) - available by `gfortran-14` alias +- Kotlin 2.0.20-release-360 - Mono 6.12.0.188 -- Node.js 20.16.0 +- Node.js 20.17.0 - Perl 5.38.2 - Python3 3.12.5 - Ruby 3.0.7p220 ### Package Management -- Bundler 2.5.17 +- Bundler 2.5.18 - Carthage 0.39.1 - CocoaPods 1.15.2 -- Homebrew 4.3.16 -- NPM 10.8.1 +- Homebrew 4.3.18 +- NPM 10.8.2 - NuGet 6.3.1.1 - Pip3 24.2 (python 3.12) -- Pipx 1.6.0 -- RubyGems 3.5.17 +- Pipx 1.7.1 +- RubyGems 3.5.18 - Yarn 1.22.22 ### Project Management @@ -44,13 +44,13 @@ - 7-Zip 17.05 - aria2 1.37.0 - azcopy 10.26.0 -- bazel 7.3.0 +- bazel 7.3.1 - bazelisk 1.20.0 - bsdtar 3.5.3 - available by 'tar' alias - Curl 8.7.1 - Git 2.46.0 - Git LFS 3.5.1 -- GitHub CLI 2.54.0 +- GitHub CLI 2.55.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.24.5 - gpg (GnuPG) 2.4.5 @@ -62,8 +62,8 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.17.32 -- AWS SAM CLI 1.122.0 +- AWS CLI 2.17.38 +- AWS SAM CLI 1.123.0 - AWS Session Manager CLI 1.2.650.0 - Azure CLI 2.63.0 - Azure CLI (azure-devops) 1.0.1 @@ -81,10 +81,10 @@ ### Browsers - Safari 17.6 (19618.3.11.11.5) - SafariDriver 17.6 (19618.3.11.11.5) -- Google Chrome 127.0.6533.120 -- Google Chrome for Testing 127.0.6533.119 -- ChromeDriver 127.0.6533.119 -- Selenium server 4.23.0 +- Google Chrome 128.0.6613.85 +- Google Chrome for Testing 128.0.6613.84 +- ChromeDriver 128.0.6613.84 +- Selenium server 4.23.1 #### Environment variables | Name | Value | @@ -110,7 +110,7 @@ #### Node.js - 18.20.4 -- 20.16.0 +- 20.17.0 #### Go - 1.20.14 @@ -128,7 +128,7 @@ - Rustfmt 1.7.0-stable ### PowerShell Tools -- PowerShell 7.4.4 +- PowerShell 7.4.5 #### PowerShell Modules - Az: 12.2.0 @@ -139,6 +139,7 @@ | Version | Build | Path | | -------------- | -------- | --------------------------------- | | 16.1 (beta) | 16B5001e | /Applications/Xcode_16.1_beta.app | +| 16.0 (beta) | 16A5230g | /Applications/Xcode_16_beta_6.app | | 15.4 (default) | 15F31d | /Applications/Xcode_15.4.app | | 15.3 | 15E204a | /Applications/Xcode_15.3.app | | 15.2 | 15C500b | /Applications/Xcode_15.2.app | @@ -154,86 +155,91 @@ | macOS 14.2 | macosx14.2 | 15.1, 15.2 | | macOS 14.4 | macosx14.4 | 15.3 | | macOS 14.5 | macosx14.5 | 15.4 | +| macOS 15.0 | macosx15.0 | 16.0 | | macOS 15.1 | macosx15.1 | 16.1 | | iOS 16.4 | iphoneos16.4 | 14.3.1 | | iOS 17.0 | iphoneos17.0 | 15.0.1 | | iOS 17.2 | iphoneos17.2 | 15.1, 15.2 | | iOS 17.4 | iphoneos17.4 | 15.3 | | iOS 17.5 | iphoneos17.5 | 15.4 | +| iOS 18.0 | iphoneos18.0 | 16.0 | | iOS 18.1 | iphoneos18.1 | 16.1 | | Simulator - iOS 16.4 | iphonesimulator16.4 | 14.3.1 | | Simulator - iOS 17.0 | iphonesimulator17.0 | 15.0.1 | | Simulator - iOS 17.2 | iphonesimulator17.2 | 15.1, 15.2 | | Simulator - iOS 17.4 | iphonesimulator17.4 | 15.3 | | Simulator - iOS 17.5 | iphonesimulator17.5 | 15.4 | +| Simulator - iOS 18.0 | iphonesimulator18.0 | 16.0 | | Simulator - iOS 18.1 | iphonesimulator18.1 | 16.1 | | tvOS 16.4 | appletvos16.4 | 14.3.1 | | tvOS 17.0 | appletvos17.0 | 15.0.1 | | tvOS 17.2 | appletvos17.2 | 15.1, 15.2 | | tvOS 17.4 | appletvos17.4 | 15.3 | | tvOS 17.5 | appletvos17.5 | 15.4 | -| tvOS 18.0 | appletvos18.0 | 16.1 | +| tvOS 18.0 | appletvos18.0 | 16.0, 16.1 | | Simulator - tvOS 16.4 | appletvsimulator16.4 | 14.3.1 | | Simulator - tvOS 17.0 | appletvsimulator17.0 | 15.0.1 | | Simulator - tvOS 17.2 | appletvsimulator17.2 | 15.1, 15.2 | | Simulator - tvOS 17.4 | appletvsimulator17.4 | 15.3 | | Simulator - tvOS 17.5 | appletvsimulator17.5 | 15.4 | -| Simulator - tvOS 18.0 | appletvsimulator18.0 | 16.1 | +| Simulator - tvOS 18.0 | appletvsimulator18.0 | 16.0, 16.1 | | watchOS 9.4 | watchos9.4 | 14.3.1 | | watchOS 10.0 | watchos10.0 | 15.0.1 | | watchOS 10.2 | watchos10.2 | 15.1, 15.2 | | watchOS 10.4 | watchos10.4 | 15.3 | | watchOS 10.5 | watchos10.5 | 15.4 | -| watchOS 11.0 | watchos11.0 | 16.1 | +| watchOS 11.0 | watchos11.0 | 16.0, 16.1 | | Simulator - watchOS 9.4 | watchsimulator9.4 | 14.3.1 | | Simulator - watchOS 10.0 | watchsimulator10.0 | 15.0.1 | | Simulator - watchOS 10.2 | watchsimulator10.2 | 15.1, 15.2 | | Simulator - watchOS 10.4 | watchsimulator10.4 | 15.3 | | Simulator - watchOS 10.5 | watchsimulator10.5 | 15.4 | -| Simulator - watchOS 11.0 | watchsimulator11.0 | 16.1 | -| visionOS 1.0 | xros1.0 | 15.2 | +| Simulator - watchOS 11.0 | watchsimulator11.0 | 16.0, 16.1 | | Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | -| Simulator - visionOS 1.1 | xrsimulator1.1 | 15.3 | +| visionOS 1.0 | xros1.0 | 15.2 | | visionOS 1.1 | xros1.1 | 15.3 | +| Simulator - visionOS 1.1 | xrsimulator1.1 | 15.3 | | Simulator - visionOS 1.2 | xrsimulator1.2 | 15.4 | | visionOS 1.2 | xros1.2 | 15.4 | -| Simulator - visionOS 2.0 | xrsimulator2.0 | 16.1 | -| visionOS 2.0 | xros2.0 | 16.1 | +| visionOS 2.0 | xros2.0 | 16.0, 16.1 | +| Simulator - visionOS 2.0 | xrsimulator2.0 | 16.0, 16.1 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | -| Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | +| Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | DriverKit 22.4 | driverkit22.4 | 14.3.1 | | DriverKit 23.0 | driverkit23.0 | 15.0.1 | | DriverKit 23.2 | driverkit23.2 | 15.1, 15.2 | | DriverKit 23.4 | driverkit23.4 | 15.3 | | DriverKit 23.5 | driverkit23.5 | 15.4 | +| DriverKit 24.0 | driverkit24.0 | 16.0 | | DriverKit 24.1 | driverkit24.1 | 16.1 | #### Installed Simulators -| OS | Xcode Version | Simulators | -| ------------ | -------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| iOS 16.4 | 14.3.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 17.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 17.2 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 17.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | -| iOS 17.5 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | -| iOS 18.1 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | -| tvOS 16.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 17.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 17.2 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 17.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 17.5 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 18.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| watchOS 9.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | -| watchOS 10.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | -| watchOS 10.2 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | -| watchOS 10.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | -| watchOS 10.5 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | -| watchOS 11.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | -| visionOS 1.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.1 | Apple Vision Pro | -| visionOS 1.1 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.1 | Apple Vision Pro | -| visionOS 1.2 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.1 | Apple Vision Pro | -| visionOS 2.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.1 | Apple Vision Pro | +| OS | Xcode Version | Simulators | +| ------------ | ---------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| iOS 16.4 | 14.3.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 17.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0<br>16.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 17.2 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0<br>16.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 17.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0<br>16.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | +| iOS 17.5 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0<br>16.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | +| iOS 18.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0<br>16.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | +| iOS 18.1 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0<br>16.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | +| tvOS 16.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0<br>16.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 17.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0<br>16.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 17.2 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0<br>16.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 17.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0<br>16.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 17.5 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0<br>16.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 18.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0<br>16.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| watchOS 9.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0<br>16.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | +| watchOS 10.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0<br>16.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 10.2 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0<br>16.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 10.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0<br>16.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 10.5 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0<br>16.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 11.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0<br>16.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | +| visionOS 1.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0<br>16.1 | Apple Vision Pro | +| visionOS 1.1 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0<br>16.1 | Apple Vision Pro | +| visionOS 1.2 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0<br>16.1 | Apple Vision Pro | +| visionOS 2.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0<br>16.1 | Apple Vision Pro | ### Android | Package Name | Version | From ff516bd145fc321f0965b89bff64f2efa94a5ee9 Mon Sep 17 00:00:00 2001 From: RaviAkshintala <167848931+RaviAkshintala@users.noreply.github.com> Date: Mon, 2 Sep 2024 16:39:46 +0530 Subject: [PATCH 3075/3485] signature updated for the azurecosmosdbemulator (#10521) Co-authored-by: Ravi Akshintala <raviakshintalagithub.com@Ravis-Laptop.local> --- images/windows/scripts/build/Install-AzureCosmosDbEmulator.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/windows/scripts/build/Install-AzureCosmosDbEmulator.ps1 b/images/windows/scripts/build/Install-AzureCosmosDbEmulator.ps1 index e194051ed1ed..13772a42c3f9 100644 --- a/images/windows/scripts/build/Install-AzureCosmosDbEmulator.ps1 +++ b/images/windows/scripts/build/Install-AzureCosmosDbEmulator.ps1 @@ -5,6 +5,6 @@ Install-Binary -Type MSI ` -Url "https://aka.ms/cosmosdb-emulator" ` - -ExpectedSHA256Sum "D21A0476B7F3439319BE6A1060935E7C865FEFA87C47943C9A6D595137703F49" + -ExpectedSHA256Sum "DB9D5E496C5FDAE17C12C03385D2BAC973DA61C280023D9FDC9A6020220BEE41" Invoke-PesterTests -TestFile "Tools" -TestName "Azure Cosmos DB Emulator" From ab150879795b7e9b05c4dd1321a385800fc1965f Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Tue, 3 Sep 2024 18:45:06 +0200 Subject: [PATCH 3076/3485] [macOS] Introduce macOS-15 code (#10535) Co-authored-by: Alexey-Ayupov <alexey-ayupov@github.com> --- .../macos/scripts/build/configure-system.sh | 11 +- .../scripts/build/configure-tccdb-macos.sh | 4 +- images/macos/scripts/build/install-bicep.sh | 5 + .../docs-gen/Generate-SoftwareReport.ps1 | 61 ++-- .../docs-gen/SoftwareReport.Browsers.psm1 | 4 +- .../scripts/docs-gen/SoftwareReport.Java.psm1 | 2 +- .../docs-gen/SoftwareReport.Toolcache.psm1 | 4 +- .../macos/scripts/helpers/Common.Helpers.psm1 | 3 + images/macos/scripts/helpers/utils.sh | 12 + .../macos/scripts/tests/BasicTools.Tests.ps1 | 14 +- images/macos/scripts/tests/Browsers.Tests.ps1 | 4 +- images/macos/scripts/tests/Common.Tests.ps1 | 16 +- .../macos/scripts/tests/Databases.Tests.ps1 | 4 +- images/macos/scripts/tests/Haskell.Tests.ps1 | 2 +- images/macos/scripts/tests/Linters.Tests.ps1 | 2 +- images/macos/scripts/tests/Node.Tests.ps1 | 2 +- images/macos/scripts/tests/PHP.Tests.ps1 | 4 +- .../scripts/tests/PipxPackages.Tests.ps1 | 2 +- images/macos/scripts/tests/Python.Tests.ps1 | 4 +- images/macos/scripts/tests/RubyGem.Tests.ps1 | 10 +- images/macos/scripts/tests/Rust.Tests.ps1 | 2 +- images/macos/scripts/tests/System.Tests.ps1 | 2 +- .../macos/scripts/tests/Toolcache.Tests.ps1 | 4 +- .../macos/scripts/tests/WebServers.Tests.ps1 | 4 +- images/macos/scripts/tests/Xamarin.Tests.ps1 | 14 +- images/macos/scripts/tests/Xcode.Tests.ps1 | 7 + images/macos/templates/macOS-14.anka.pkr.hcl | 1 - images/macos/templates/macOS-15.anka.pkr.hcl | 293 ++++++++++++++++++ .../templates/macOS-15.arm64.anka.pkr.hcl | 285 +++++++++++++++++ images/macos/toolsets/toolset-15.json | 204 ++++++++++++ 30 files changed, 897 insertions(+), 89 deletions(-) create mode 100644 images/macos/templates/macOS-15.anka.pkr.hcl create mode 100644 images/macos/templates/macOS-15.arm64.anka.pkr.hcl create mode 100644 images/macos/toolsets/toolset-15.json diff --git a/images/macos/scripts/build/configure-system.sh b/images/macos/scripts/build/configure-system.sh index 12545c7b4207..6f945bfef244 100644 --- a/images/macos/scripts/build/configure-system.sh +++ b/images/macos/scripts/build/configure-system.sh @@ -19,11 +19,12 @@ fi # Put documentation to $HOME root cp $HOME/image-generation/output/software-report/systeminfo.* $HOME/ -# Put build vm assets scripts to proper directory -mkdir -p /usr/local/opt/$USER/scripts -mv $HOME/image-generation/assets/* /usr/local/opt/$USER/scripts - -find /usr/local/opt/$USER/scripts -type f -name "*\.sh" -exec chmod +x {} \; +# Put build vm assets (xamarin-selector) scripts to proper directory +if is_Monterey || is_Sonoma || is_Ventura; then + mkdir -p /usr/local/opt/$USER/scripts + mv $HOME/image-generation/assets/* /usr/local/opt/$USER/scripts + find /usr/local/opt/$USER/scripts -type f -name "*\.sh" -exec chmod +x {} \; +fi # Remove fastlane cached cookie rm -rf ~/.fastlane diff --git a/images/macos/scripts/build/configure-tccdb-macos.sh b/images/macos/scripts/build/configure-tccdb-macos.sh index 66f04608279d..b9063d038a80 100644 --- a/images/macos/scripts/build/configure-tccdb-macos.sh +++ b/images/macos/scripts/build/configure-tccdb-macos.sh @@ -32,7 +32,7 @@ systemValuesArray=( "'kTCCServiceSystemPolicyNetworkVolumes','com.apple.Terminal',0,2,4,1,X'fade0c000000003000000001000000060000000200000012636f6d2e6170706c652e5465726d696e616c000000000003',NULL,0,'UNUSED',NULL,0,1678990068" ) for values in "${systemValuesArray[@]}"; do - if is_Sonoma; then + if is_Sonoma || is_Sequoia; then # TCC access table in Sonoma has extra 4 columns: pid, pid_version, boot_uuid, last_reminded configure_system_tccdb "$values,NULL,NULL,'UNUSED',${values##*,}" else @@ -66,7 +66,7 @@ userValuesArray=( "'kTCCServiceAppleEvents','/usr/local/opt/runner/provisioner/provisioner',1,2,3,1,NULL,NULL,0,'com.apple.systemevents',X'fade0c000000003400000001000000060000000200000016636f6d2e6170706c652e73797374656d6576656e7473000000000003',NULL,1592919552" ) for values in "${userValuesArray[@]}"; do - if is_Sonoma; then + if is_Sonoma || is_Sequoia; then # TCC access table in Sonoma has extra 4 columns: pid, pid_version, boot_uuid, last_reminded configure_user_tccdb "$values,NULL,NULL,'UNUSED',${values##*,}" else diff --git a/images/macos/scripts/build/install-bicep.sh b/images/macos/scripts/build/install-bicep.sh index 6a5a3ddb22d4..0ab263ed60b8 100644 --- a/images/macos/scripts/build/install-bicep.sh +++ b/images/macos/scripts/build/install-bicep.sh @@ -6,6 +6,11 @@ source ~/utils/utils.sh +if is_Sequoia; then + sudo rm -rf /Library/Developer/CommandLineTools + sudo xcode-select --install +fi + echo "Installing bicep cli..." brew tap azure/bicep brew_smart_install bicep diff --git a/images/macos/scripts/docs-gen/Generate-SoftwareReport.ps1 b/images/macos/scripts/docs-gen/Generate-SoftwareReport.ps1 index ff3bb0118969..149793732747 100644 --- a/images/macos/scripts/docs-gen/Generate-SoftwareReport.ps1 +++ b/images/macos/scripts/docs-gen/Generate-SoftwareReport.ps1 @@ -38,32 +38,34 @@ $languageAndRuntime.AddToolVersion("Bash", $(Get-BashVersion)) $languageAndRuntime.AddNodes($(Get-ClangLLVMVersions)) $languageAndRuntime.AddNodes($(Get-GccVersions)) $languageAndRuntime.AddNodes($(Get-FortranVersions)) -if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) { +if ((-not $os.IsVentura) -and (-not $os.IsSonoma) -and (-not $os.IsSequoia)) { $languageAndRuntime.AddToolVersion("Julia", $(Get-JuliaVersion)) } $languageAndRuntime.AddToolVersion("Kotlin", $(Get-KotlinVersion)) -if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) { +if ((-not $os.IsVentura) -and (-not $os.IsSonoma) -and (-not $os.IsSequoia)) { $languageAndRuntime.AddToolVersion("Go", $(Get-GoVersion)) } -$languageAndRuntime.AddToolVersion("Mono", $(Get-MonoVersion)) +if ((-not $os.IsSequoia)) { + $languageAndRuntime.AddToolVersion("Mono", $(Get-MonoVersion)) +} $languageAndRuntime.AddToolVersion("Node.js", $(Get-NodeVersion)) -if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) { +if ((-not $os.IsVentura) -and (-not $os.IsSonoma) -and (-not $os.IsSequoia)) { $languageAndRuntime.AddToolVersion("MSBuild", $(Get-MSBuildVersion)) $languageAndRuntime.AddToolVersion("NVM", $(Get-NVMVersion)) $languageAndRuntime.AddToolVersionsListInline("NVM - Cached node versions", $(Get-NVMNodeVersionList), '^\d+') } $languageAndRuntime.AddToolVersion("Perl", $(Get-PerlVersion)) -if ((-not $os.IsVenturaArm64) -and (-not $os.IsSonomaArm64)) { +if ((-not $os.IsVenturaArm64) -and (-not $os.IsSonomaArm64) -and (-not $os.IsSequoiaArm64)) { $languageAndRuntime.AddToolVersion("PHP", $(Get-PHPVersion)) } -if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) { +if ((-not $os.IsVentura) -and (-not $os.IsSonoma) -and (-not $os.IsSequoia)) { $languageAndRuntime.AddToolVersion("Python", $(Get-PythonVersion)) } $languageAndRuntime.AddToolVersion("Python3", $(Get-Python3Version)) -if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) { +if ((-not $os.IsVentura) -and (-not $os.IsSonoma) -and (-not $os.IsSequoia)) { $languageAndRuntime.AddToolVersion("R", $(Get-RVersion)) } @@ -74,16 +76,18 @@ $packageManagement = $installedSoftware.AddHeader("Package Management") $packageManagement.AddToolVersion("Bundler", $(Get-BundlerVersion)) $packageManagement.AddToolVersion("Carthage", $(Get-CarthageVersion)) $packageManagement.AddToolVersion("CocoaPods", $(Get-CocoaPodsVersion)) -if ((-not $os.IsVenturaArm64) -and (-not $os.IsSonomaArm64)) { +if ((-not $os.IsVenturaArm64) -and (-not $os.IsSonomaArm64) -and (-not $os.IsSequoiaArm64)) { $packageManagement.AddToolVersion("Composer", $(Get-ComposerVersion)) } $packageManagement.AddToolVersion("Homebrew", $(Get-HomebrewVersion)) -if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) { +if ((-not $os.IsVentura) -and (-not $os.IsSonoma) -and (-not $os.IsSequoia)) { $packageManagement.AddToolVersion("Miniconda", $(Get-CondaVersion)) } $packageManagement.AddToolVersion("NPM", $(Get-NPMVersion)) -$packageManagement.AddToolVersion("NuGet", $(Get-NuGetVersion)) -if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) { +if ((-not $os.IsSequoia)) { + $packageManagement.AddToolVersion("NuGet", $(Get-NuGetVersion)) +} +if ((-not $os.IsVentura) -and (-not $os.IsSonoma) -and (-not $os.IsSequoia)) { $packageManagement.AddToolVersion("Pip", $(Get-PipVersion -Version 2)) } @@ -91,12 +95,12 @@ $packageManagement.AddToolVersion("Pip3", $(Get-PipVersion -Version 3)) $packageManagement.AddToolVersion("Pipx", $(Get-PipxVersion)) $packageManagement.AddToolVersion("RubyGems", $(Get-RubyGemsVersion)) -if ((-not $os.IsVenturaArm64) -and (-not $os.IsSonomaArm64) -and (-not $os.IsSonoma)) { +if ((-not $os.IsVenturaArm64) -and (-not $os.IsSonoma) -and (-not $os.IsSequoia)) { $packageManagement.AddToolVersion("Vcpkg", $(Get-VcpkgVersion)) } $packageManagement.AddToolVersion("Yarn", $(Get-YarnVersion)) -if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) { +if ((-not $os.IsVentura) -and (-not $os.IsSonoma) -and (-not $os.IsSequoia)) { $packageManagement.AddNode($(Build-PackageManagementEnvironmentTable)) } # Project Management @@ -104,7 +108,7 @@ $projectManagement = $installedSoftware.AddHeader("Project Management") $projectManagement.AddToolVersion("Apache Ant", $(Get-ApacheAntVersion)) $projectManagement.AddToolVersion("Apache Maven", $(Get-MavenVersion)) $projectManagement.AddToolVersion("Gradle", $(Get-GradleVersion)) -if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) { +if ((-not $os.IsVentura) -and (-not $os.IsSonoma) -and (-not $os.IsSequoia)) { $projectManagement.AddToolVersion("Sbt", $(Get-SbtVersion)) } @@ -123,18 +127,18 @@ $utilities.AddToolVersion("GitHub CLI", $(Get-GitHubCLIVersion)) $utilities.AddToolVersion("GNU Tar", $(Get-GnuTarVersion)) $utilities.AddToolVersion("GNU Wget", $(Get-WgetVersion)) $utilities.AddToolVersion("gpg (GnuPG)", $(Get-GPGVersion)) -if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) { +if ((-not $os.IsVentura) -and (-not $os.IsSonoma) -and (-not $os.IsSequoia)) { $utilities.AddToolVersion("ImageMagick", $(Get-ImageMagickVersion)) } $utilities.AddToolVersion("jq", $(Get-JqVersion)) -if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) { +if ((-not $os.IsVentura) -and (-not $os.IsSonoma) -and (-not $os.IsSequoia)) { $utilities.AddToolVersion("mongo", $(Get-MongoVersion)) $utilities.AddToolVersion("mongod", $(Get-MongodVersion)) } $utilities.AddToolVersion("OpenSSL", $(Get-OpenSSLVersion)) $utilities.AddToolVersion("Packer", $(Get-PackerVersion)) $utilities.AddToolVersion("pkg-config", $(Get-PKGConfigVersion)) -if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) { +if ((-not $os.IsVentura) -and (-not $os.IsSonoma) -and (-not $os.IsSequoia)) { $utilities.AddToolVersion("PostgreSQL", $(Get-PostgresServerVersion)) $utilities.AddToolVersion("psql (PostgreSQL)", $(Get-PostgresClientVersion)) $utilities.AddToolVersion("Sox", $(Get-SoxVersion)) @@ -150,7 +154,7 @@ $utilities.AddToolVersion("zstd", $(Get-ZstdVersion)) # Tools $tools = $installedSoftware.AddHeader("Tools") -if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) { +if ((-not $os.IsVentura) -and (-not $os.IsSonoma) -and (-not $os.IsSequoia)) { $tools.AddToolVersion("App Center CLI", $(Get-AppCenterCLIVersion)) } $tools.AddToolVersion("AWS CLI", $(Get-AWSCLIVersion)) @@ -159,7 +163,7 @@ $tools.AddToolVersion("AWS Session Manager CLI", $(Get-AWSSessionManagerCLIVersi $tools.AddToolVersion("Azure CLI", $(Get-AzureCLIVersion)) $tools.AddToolVersion("Azure CLI (azure-devops)", $(Get-AzureDevopsVersion)) $tools.AddToolVersion("Bicep CLI", $(Get-BicepVersion)) -if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) { +if ((-not $os.IsVentura) -and (-not $os.IsSonoma) -and (-not $os.IsSequoia)) { $tools.AddToolVersion("Cabal", $(Get-CabalVersion)) } $tools.AddToolVersion("Cmake", $(Get-CmakeVersion)) @@ -168,14 +172,14 @@ if ($os.IsMonterey) { $tools.AddToolVersion("Colima", $(Get-ColimaVersion)) } $tools.AddToolVersion("Fastlane", $(Get-FastlaneVersion)) -if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) { +if ((-not $os.IsVentura) -and (-not $os.IsSonoma) -and (-not $os.IsSequoia)) { $tools.AddToolVersion("GHC", $(Get-GHCVersion)) $tools.AddToolVersion("GHCup", $(Get-GHCupVersion)) $tools.AddToolVersion("Jazzy", $(Get-JazzyVersion)) $tools.AddToolVersion("Stack", $(Get-StackVersion)) } $tools.AddToolVersion("SwiftFormat", $(Get-SwiftFormatVersion)) -if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) { +if ((-not $os.IsVentura) -and (-not $os.IsSonoma) -and (-not $os.IsSequoia)) { $tools.AddToolVersion("Swig", $(Get-SwigVersion)) } $tools.AddToolVersion("Xcbeautify", $(Get-XcbeautifyVersion)) @@ -184,10 +188,10 @@ $tools.AddToolVersion("Xcodes", $(Get-XcodesVersion)) # Linters $linters = $installedSoftware.AddHeader("Linters") -if ((-not $os.IsVenturaArm64) -and (-not $os.IsSonomaArm64)) { +if ((-not $os.IsVenturaArm64) -and (-not $os.IsSonomaArm64) -and (-not $os.IsSequoiaArm64)) { $linters.AddToolVersion("SwiftLint", $(Get-SwiftLintVersion)) } -if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) { +if ((-not $os.IsVentura) -and (-not $os.IsSonoma) -and (-not $os.IsSequoia)) { $linters.AddToolVersion("Yamllint", $(Get-YamllintVersion)) } @@ -201,7 +205,6 @@ $java = $installedSoftware.AddHeader("Java") $java.AddTable($(Get-JavaVersions)) # Toolcache - $toolcache = $installedSoftware.AddHeader("Cached Tools") $toolcache.AddNodes($(Build-ToolcacheSection)) @@ -213,7 +216,7 @@ $rust.AddToolVersion("Rustdoc", $(Get-RustdocVersion)) $rust.AddToolVersion("Rustup", $(Get-RustupVersion)) $rustPackages = $rust.AddHeader("Packages") -if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) { +if ((-not $os.IsVentura) -and (-not $os.IsSonoma) -and (-not $os.IsSequoia)) { $rustPackages.AddToolVersion("Bindgen", $(Get-Bindgen)) $rustPackages.AddToolVersion("Cargo-audit", $(Get-Cargoaudit)) $rustPackages.AddToolVersion("Cargo-outdated", $(Get-Cargooutdated)) @@ -230,13 +233,13 @@ $powerShellModules = $powerShell.AddHeader("PowerShell Modules") $powerShellModules.AddNodes($(Get-PowerShellModules)) # Web Servers -if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) { +if ((-not $os.IsVentura) -and (-not $os.IsSonoma) -and (-not $os.IsSequoia)) { $webServers = $installedSoftware.AddHeader("Web Servers") $webServers.AddTable($(Build-WebServersSection)) } # Xamarin section -if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) { +if ((-not $os.IsVentura) -and (-not $os.IsSonoma) -and (-not $os.IsSequoia)) { $xamarin = $installedSoftware.AddHeader("Xamarin") $vsForMac = $xamarin.AddHeader("Visual Studio for Mac") $vsForMac.AddTable($(Build-VSMacTable)) @@ -263,7 +266,7 @@ Get-XcodeInfoList | Out-Null $xcodeInfo = Get-XcodeInfoList $xcode.AddTable($(Build-XcodeTable $xcodeInfo)) -if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) { +if ((-not $os.IsVentura) -and (-not $os.IsSonoma) -and (-not $os.IsSequoia)) { $xcodeTools = $xcode.AddHeader("Xcode Support Tools") $xcodeTools.AddNodes($(Build-XcodeSupportToolsSection)) } @@ -290,7 +293,7 @@ if ($os.IsMonterey) { $miscellaneous.AddToolVersion("Zlib", $(Get-ZlibVersion)) } -if ($os.IsSonomaX64 -or $os.IsVenturaX64) { +if ($os.IsSonomaX64 -or $os.IsVenturaX64 -or $os.IsSequoiaX64) { $miscellaneous = $installedSoftware.AddHeader("Miscellaneous") } if ($os.IsMonterey -or $os.IsSonomaX64 -or $os.IsVenturaX64) { diff --git a/images/macos/scripts/docs-gen/SoftwareReport.Browsers.psm1 b/images/macos/scripts/docs-gen/SoftwareReport.Browsers.psm1 index f99a90be4215..837c331df4bb 100644 --- a/images/macos/scripts/docs-gen/SoftwareReport.Browsers.psm1 +++ b/images/macos/scripts/docs-gen/SoftwareReport.Browsers.psm1 @@ -11,7 +11,7 @@ function Build-BrowserSection { [ToolVersionNode]::new("ChromeDriver", $(Get-ChromeDriverVersion)) ) - if ((-not $os.IsVenturaArm64) -and (-not $os.IsSonomaArm64)) { + if ((-not $os.IsVenturaArm64) -and (-not $os.IsSonomaArm64) -and (-not $os.IsSequoiaArm64)) { $nodes += @( [ToolVersionNode]::new("Microsoft Edge", $(Get-EdgeVersion)) [ToolVersionNode]::new("Microsoft Edge WebDriver", $(Get-EdgeDriverVersion)) @@ -79,7 +79,7 @@ function Get-GeckodriverVersion { function Get-SeleniumVersion { $os = Get-OSVersion - if ($os.IsVenturaArm64 -or $os.IsSonomaArm64) { + if ($os.IsVenturaArm64 -or $os.IsSonomaArm64 -or $os.IsSequoiaArm64) { $cellarPath = "/opt/homebrew/Cellar" } else { $cellarPath = "/usr/local/Cellar" diff --git a/images/macos/scripts/docs-gen/SoftwareReport.Java.psm1 b/images/macos/scripts/docs-gen/SoftwareReport.Java.psm1 index 41b591694e77..af762405b4e9 100644 --- a/images/macos/scripts/docs-gen/SoftwareReport.Java.psm1 +++ b/images/macos/scripts/docs-gen/SoftwareReport.Java.psm1 @@ -2,7 +2,7 @@ function Get-JavaVersions { $defaultJavaPath = (Get-Item env:JAVA_HOME).value $os = Get-OSVersion - if ($os.IsVenturaArm64 -or $os.IsSonomaArm64) { + if ($os.IsVenturaArm64 -or $os.IsSonomaArm64 -or $os.IsSequoiaArm64) { $javaVersions = Get-Item env:JAVA_HOME_*_arm64 } else { $javaVersions = Get-Item env:JAVA_HOME_*_X64 diff --git a/images/macos/scripts/docs-gen/SoftwareReport.Toolcache.psm1 b/images/macos/scripts/docs-gen/SoftwareReport.Toolcache.psm1 index 18fc1bdf3332..40c028c83a91 100644 --- a/images/macos/scripts/docs-gen/SoftwareReport.Toolcache.psm1 +++ b/images/macos/scripts/docs-gen/SoftwareReport.Toolcache.psm1 @@ -37,12 +37,12 @@ function Build-ToolcacheSection { $nodes = @() - if ((-not $os.IsVenturaArm64) -and (-not $os.IsSonoma)) { + if ((-not $os.IsVenturaArm64) -and (-not $os.IsSonoma) -and (-not $os.IsSequoia)) { $nodes += @( [ToolVersionsListNode]::new("PyPy", $(Get-ToolcachePyPyVersions), '^\d+\.\d+', "List") ) } - if ((-not $os.IsVenturaArm64) -and (-not $os.IsSonomaArm64)) { + if ((-not $os.IsVenturaArm64) -and (-not $os.IsSonomaArm64) -and (-not $os.IsSequoiaArm64)) { $nodes += @( [ToolVersionsListNode]::new("Ruby", $(Get-ToolcacheRubyVersions), '^\d+\.\d+', "List") ) diff --git a/images/macos/scripts/helpers/Common.Helpers.psm1 b/images/macos/scripts/helpers/Common.Helpers.psm1 index c476edc1c050..359f5974ee32 100644 --- a/images/macos/scripts/helpers/Common.Helpers.psm1 +++ b/images/macos/scripts/helpers/Common.Helpers.psm1 @@ -36,6 +36,9 @@ function Get-OSVersion { IsSonoma = $($osVersion.Version.Major -eq "14") IsSonomaArm64 = $($osVersion.Version.Major -eq "14" -and $processorArchitecture -eq "arm64") IsSonomaX64 = $($osVersion.Version.Major -eq "14" -and $processorArchitecture -ne "arm64") + IsSequoia = $($osVersion.Version.Major -eq "15") + IsSequoiaArm64 = $($osVersion.Version.Major -eq "15" -and $processorArchitecture -eq "arm64") + IsSequoiaX64 = $($osVersion.Version.Major -eq "15" -and $processorArchitecture -ne "arm64") } } diff --git a/images/macos/scripts/helpers/utils.sh b/images/macos/scripts/helpers/utils.sh index b8e51ee20689..6dbb231022ab 100644 --- a/images/macos/scripts/helpers/utils.sh +++ b/images/macos/scripts/helpers/utils.sh @@ -45,6 +45,18 @@ is_Arm64() { [ "$(arch)" = "arm64" ] } +is_Sequoia() { + [ "$OSTYPE" = "darwin24" ] +} + +is_SequoiaArm64() { + is_Sequoia && is_Arm64 +} + +is_SequoiaX64() { + is_Sequoia && ! is_Arm64 +} + is_Sonoma() { [ "$OSTYPE" = "darwin23" ] } diff --git a/images/macos/scripts/tests/BasicTools.Tests.ps1 b/images/macos/scripts/tests/BasicTools.Tests.ps1 index 5fc84bf7b753..add654733aaf 100644 --- a/images/macos/scripts/tests/BasicTools.Tests.ps1 +++ b/images/macos/scripts/tests/BasicTools.Tests.ps1 @@ -26,7 +26,7 @@ Describe "cmake" { } } -Describe "Subversion" -Skip:($os.IsVentura -or $os.IsSonoma) { +Describe "Subversion" -Skip:($os.IsVentura -or $os.IsSonoma -or $os.IsSequoia) { It "Subversion" { "svn --version" | Should -ReturnZeroExitCode } @@ -111,7 +111,7 @@ Describe "bazel" { } } -Describe "Julia" -Skip:($os.IsVentura -or $os.IsSonoma) { +Describe "Julia" -Skip:($os.IsVentura -or $os.IsSonoma -or $os.IsSequoia) { It "Julia" { "julia --version" | Should -ReturnZeroExitCode } @@ -135,19 +135,19 @@ Describe "wget" { } } -Describe "vagrant" -Skip:($os.IsVentura -or $os.IsSonoma) { +Describe "vagrant" -Skip:($os.IsVentura -or $os.IsSonoma -or $os.IsSequoia) { It "vagrant" { "vagrant --version" | Should -ReturnZeroExitCode } } -Describe "virtualbox" -Skip:($os.IsVentura -or $os.IsSonoma) { +Describe "virtualbox" -Skip:($os.IsVentura -or $os.IsSonoma -or $os.IsSequoia) { It "virtualbox" { "vboxmanage -v" | Should -ReturnZeroExitCode } } -Describe "R" -Skip:($os.IsVentura -or $os.IsSonoma) { +Describe "R" -Skip:($os.IsVentura -or $os.IsSonoma -or $os.IsSequoia) { It "R" { "R --version" | Should -ReturnZeroExitCode } @@ -167,7 +167,7 @@ Describe "Kotlin" { } } -Describe "sbt" -Skip:($os.IsVentura -or $os.IsSonoma) { +Describe "sbt" -Skip:($os.IsVentura -or $os.IsSonoma -or $os.IsSequoia) { It "sbt" { "sbt -version" | Should -ReturnZeroExitCode } @@ -179,7 +179,7 @@ Describe "yq" { } } -Describe "imagemagick" -Skip:($os.IsVentura -or $os.IsSonoma) { +Describe "imagemagick" -Skip:($os.IsVentura -or $os.IsSonoma -or $os.IsSequoia) { It "imagemagick" { "magick -version" | Should -ReturnZeroExitCode } diff --git a/images/macos/scripts/tests/Browsers.Tests.ps1 b/images/macos/scripts/tests/Browsers.Tests.ps1 index 95545a50f7c9..192339a5e70c 100644 --- a/images/macos/scripts/tests/Browsers.Tests.ps1 +++ b/images/macos/scripts/tests/Browsers.Tests.ps1 @@ -41,7 +41,7 @@ Describe "Selenium server" { } } -Describe "Edge" -Skip:($os.IsVenturaArm64 -or $os.IsSonomaArm64) { +Describe "Edge" -Skip:($os.IsVenturaArm64 -or $os.IsSonomaArm64 -or $os.IsSequoiaArm64) { It "Microsoft Edge" { $edgeLocation = "/Applications/Microsoft Edge.app/Contents/MacOS/Microsoft Edge" $edgeLocation | Should -Exist @@ -53,7 +53,7 @@ Describe "Edge" -Skip:($os.IsVenturaArm64 -or $os.IsSonomaArm64) { } } -Describe "Firefox" -Skip:($os.IsVenturaArm64 -or $os.IsSonomaArm64) { +Describe "Firefox" -Skip:($os.IsVenturaArm64 -or $os.IsSonomaArm64 -or $os.IsSequoiaArm64) { It "Firefox" { $firefoxLocation = "/Applications/Firefox.app/Contents/MacOS/firefox" $firefoxLocation | Should -Exist diff --git a/images/macos/scripts/tests/Common.Tests.ps1 b/images/macos/scripts/tests/Common.Tests.ps1 index 6ecf158a6677..92591437dc41 100644 --- a/images/macos/scripts/tests/Common.Tests.ps1 +++ b/images/macos/scripts/tests/Common.Tests.ps1 @@ -33,7 +33,7 @@ Describe "GCC" { } } -Describe "vcpkg" -Skip:($os.IsVenturaArm64 -or $os.IsSonomaArm64 -or $os.IsSonoma) { +Describe "vcpkg" -Skip:($os.IsVenturaArm64 -or $os.IsSonoma -or $os.IsSequoia) { It "vcpkg" { "vcpkg version" | Should -ReturnZeroExitCode } @@ -58,7 +58,7 @@ Describe "AzCopy" { } } -Describe "Miniconda" -Skip:($os.IsVentura -or $os.IsSonoma) { +Describe "Miniconda" -Skip:($os.IsVentura -or $os.IsSonoma -or $os.IsSequoia) { It "Conda" { [System.Environment]::GetEnvironmentVariable("CONDA") | Should -Not -BeNullOrEmpty $condaBinPath = Join-Path $env:CONDA "bin" "conda" @@ -66,7 +66,7 @@ Describe "Miniconda" -Skip:($os.IsVentura -or $os.IsSonoma) { } } -Describe "Stack" -Skip:($os.IsVentura -or $os.IsSonoma) { +Describe "Stack" -Skip:($os.IsVentura -or $os.IsSonoma -or $os.IsSequoia) { It "Stack" { "stack --version" | Should -ReturnZeroExitCode } @@ -78,7 +78,7 @@ Describe "CocoaPods" { } } -Describe "VSMac" -Skip:($os.IsVentura -or $os.IsSonoma) { +Describe "VSMac" -Skip:($os.IsVentura -or $os.IsSonoma -or $os.IsSequoia) { $vsMacVersions = (Get-ToolsetContent).xamarin.vsmac.versions $defaultVSMacVersion = (Get-ToolsetContent).xamarin.vsmac.default @@ -105,7 +105,7 @@ Describe "VSMac" -Skip:($os.IsVentura -or $os.IsSonoma) { } } -Describe "Swig" -Skip:($os.IsVentura -or $os.IsSonoma) { +Describe "Swig" -Skip:($os.IsVentura -or $os.IsSonoma -or $os.IsSequoia) { It "Swig" { "swig -version" | Should -ReturnZeroExitCode } @@ -117,13 +117,13 @@ Describe "Bicep" { } } -Describe "Go" -Skip:($os.IsVentura -or $os.IsSonoma) { +Describe "Go" -Skip:($os.IsVentura -or $os.IsSonoma -or $os.IsSequoia) { It "Go" { "go version" | Should -ReturnZeroExitCode } } -Describe "VirtualBox" -Skip:($os.IsVentura -or $os.IsSonoma) { +Describe "VirtualBox" -Skip:($os.IsVentura -or $os.IsSonoma -or $os.IsSequoia) { It "Check kext kernel modules" { kextstat | Out-String | Should -Match "org.virtualbox.kext" } @@ -141,7 +141,7 @@ Describe "CodeQL Bundle" { } } -Describe "Colima" -Skip:($os.IsVentura -or $os.IsSonoma) { +Describe "Colima" -Skip:($os.IsVentura -or $os.IsSonoma -or $os.IsSequoia) { It "Colima" { "colima version" | Should -ReturnZeroExitCode } diff --git a/images/macos/scripts/tests/Databases.Tests.ps1 b/images/macos/scripts/tests/Databases.Tests.ps1 index 0c8a7e7d7ccb..38539136b20a 100644 --- a/images/macos/scripts/tests/Databases.Tests.ps1 +++ b/images/macos/scripts/tests/Databases.Tests.ps1 @@ -2,7 +2,7 @@ Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" $os = Get-OSVersion -Describe "MongoDB" -Skip:($os.IsVentura -or $os.IsSonoma) { +Describe "MongoDB" -Skip:($os.IsVentura -or $os.IsSonoma -or $os.IsSequoia) { It "<ToolName>" -TestCases @( @{ ToolName = "mongo" } @{ ToolName = "mongod" } @@ -12,7 +12,7 @@ Describe "MongoDB" -Skip:($os.IsVentura -or $os.IsSonoma) { } } -Describe "PostgreSQL" -Skip:($os.IsVentura -or $os.IsSonoma) { +Describe "PostgreSQL" -Skip:($os.IsVentura -or $os.IsSonoma -or $os.IsSequoia) { It "PostgreSQL version should correspond to the version in the toolset" { $toolsetVersion = (Get-ToolsetContent).postgresql.version # Client version diff --git a/images/macos/scripts/tests/Haskell.Tests.ps1 b/images/macos/scripts/tests/Haskell.Tests.ps1 index bc2b6e507700..c4ff72992b3c 100644 --- a/images/macos/scripts/tests/Haskell.Tests.ps1 +++ b/images/macos/scripts/tests/Haskell.Tests.ps1 @@ -2,7 +2,7 @@ Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" $os = Get-OSVersion -Describe "Haskell" -Skip:($os.IsVentura -or $os.IsSonoma) { +Describe "Haskell" -Skip:($os.IsVentura -or $os.IsSonoma -or $os.IsSequoia) { Context "GHCup" { It "GHCup" { "ghcup --version" | Should -ReturnZeroExitCode diff --git a/images/macos/scripts/tests/Linters.Tests.ps1 b/images/macos/scripts/tests/Linters.Tests.ps1 index 987abc9882bd..93ac37e0e88a 100644 --- a/images/macos/scripts/tests/Linters.Tests.ps1 +++ b/images/macos/scripts/tests/Linters.Tests.ps1 @@ -2,7 +2,7 @@ Import-Module "$PSScriptRoot/Helpers.psm1" -DisableNameChecking $os = Get-OSVersion -Describe "SwiftLint" -Skip:($os.IsVenturaArm64 -or $os.IsSonomaArm64) { +Describe "SwiftLint" -Skip:($os.IsVenturaArm64 -or $os.IsSonomaArm64 -or $os.IsSequoiaArm64) { It "SwiftLint" { "swiftlint version" | Should -ReturnZeroExitCode } diff --git a/images/macos/scripts/tests/Node.Tests.ps1 b/images/macos/scripts/tests/Node.Tests.ps1 index aa68e83cb048..a48008ef3800 100644 --- a/images/macos/scripts/tests/Node.Tests.ps1 +++ b/images/macos/scripts/tests/Node.Tests.ps1 @@ -21,7 +21,7 @@ Describe "Node.js" { } } -Describe "nvm" -Skip:($os.IsVentura -or $os.IsSonoma) { +Describe "nvm" -Skip:($os.IsVentura -or $os.IsSonoma -or $os.IsSequoia) { BeforeAll { $nvmPath = Join-Path $env:HOME ".nvm" "nvm.sh" $nvmInitCommand = ". $nvmPath > /dev/null 2>&1 || true" diff --git a/images/macos/scripts/tests/PHP.Tests.ps1 b/images/macos/scripts/tests/PHP.Tests.ps1 index c87b36bb420d..2a4ff8774ca4 100644 --- a/images/macos/scripts/tests/PHP.Tests.ps1 +++ b/images/macos/scripts/tests/PHP.Tests.ps1 @@ -3,7 +3,7 @@ Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" $os = Get-OSVersion Describe "PHP" { - Context "PHP" -Skip:($os.IsVenturaArm64 -or $os.IsSonomaArm64) { + Context "PHP" -Skip:($os.IsVenturaArm64 -or $os.IsSonomaArm64 -or $os.IsSequoiaArm64) { It "PHP Path" { Get-ToolPath "php" | Should -Not -BeLike "/usr/bin/php*" } @@ -14,7 +14,7 @@ Describe "PHP" { } } - Context "Composer" -Skip:($os.IsVenturaArm64 -or $os.IsSonomaArm64) { + Context "Composer" -Skip:($os.IsVenturaArm64 -or $os.IsSonomaArm64 -or $os.IsSequoiaArm64) { It "Composer" { "composer --version" | Should -ReturnZeroExitCode } diff --git a/images/macos/scripts/tests/PipxPackages.Tests.ps1 b/images/macos/scripts/tests/PipxPackages.Tests.ps1 index bb7bdc10ec9b..8a7cb0dcbccf 100644 --- a/images/macos/scripts/tests/PipxPackages.Tests.ps1 +++ b/images/macos/scripts/tests/PipxPackages.Tests.ps1 @@ -3,7 +3,7 @@ Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" $os = Get-OSVersion -Describe "PipxPackages" -Skip:($os.IsVentura -or $os.IsSonoma) { +Describe "PipxPackages" -Skip:($os.IsVentura -or $os.IsSonoma -or $os.IsSequoia) { $pipxToolset = (Get-ToolsetContent).pipx $testCases = $pipxToolset | ForEach-Object { @{package = $_.package; cmd = $_.cmd} } It "<package>" -TestCases $testCases { diff --git a/images/macos/scripts/tests/Python.Tests.ps1 b/images/macos/scripts/tests/Python.Tests.ps1 index 4179d6233066..079f76ba378b 100644 --- a/images/macos/scripts/tests/Python.Tests.ps1 +++ b/images/macos/scripts/tests/Python.Tests.ps1 @@ -8,7 +8,7 @@ Describe "Python3" { "python3 --version" | Should -ReturnZeroExitCode } - if ($os.IsVenturaArm64 -or $os.IsSonomaArm64) { + if ($os.IsVenturaArm64 -or $os.IsSonomaArm64 -or $os.IsSequoiaArm64) { It "Python 3 is installed under /opt/homebrew/bin/" { Get-ToolPath "python3" | Should -BeLike "/opt/homebrew/bin/*" } @@ -34,7 +34,7 @@ Describe "Python3" { } -Describe "Python2" -Skip:($os.IsVentura -or $os.IsSonoma) { +Describe "Python2" -Skip:($os.IsVentura -or $os.IsSonoma -or $os.IsSequoia) { It "Python 2 is available" { "/Library/Frameworks/Python.framework/Versions/2.7/bin/python --version" | Should -ReturnZeroExitCode } diff --git a/images/macos/scripts/tests/RubyGem.Tests.ps1 b/images/macos/scripts/tests/RubyGem.Tests.ps1 index 2dc611e598b0..13a3a6f2c9bd 100644 --- a/images/macos/scripts/tests/RubyGem.Tests.ps1 +++ b/images/macos/scripts/tests/RubyGem.Tests.ps1 @@ -20,25 +20,19 @@ Describe "Bundler" { } } -Describe "Nomad shenzhen CLI" -Skip:($os.IsMonterey -or $os.IsVentura -or $os.IsSonoma) { - It "Nomad shenzhen CLI" { - "ipa --version" | Should -ReturnZeroExitCode - } -} - Describe "Fastlane" { It "Fastlane" { "fastlane --version" | Should -ReturnZeroExitCode } } -Describe "xcpretty" -Skip:($os.IsVentura -or $os.IsSonoma) { +Describe "xcpretty" -Skip:($os.IsVentura -or $os.IsSonoma -or $os.IsSequoia) { It "xcpretty" { "xcpretty --version" | Should -ReturnZeroExitCode } } -Describe "jazzy" -Skip:($os.IsVentura -or $os.IsSonoma) { +Describe "jazzy" -Skip:($os.IsVentura -or $os.IsSonoma -or $os.IsSequoia) { It "jazzy" { "jazzy --version" | Should -ReturnZeroExitCode } diff --git a/images/macos/scripts/tests/Rust.Tests.ps1 b/images/macos/scripts/tests/Rust.Tests.ps1 index b5c1c53fc507..34eab122069d 100644 --- a/images/macos/scripts/tests/Rust.Tests.ps1 +++ b/images/macos/scripts/tests/Rust.Tests.ps1 @@ -18,7 +18,7 @@ Describe "Rust" { "cargo --version" | Should -ReturnZeroExitCode } } - Context "Cargo dependencies" -Skip:($os.IsVentura -or $os.IsSonoma) { + Context "Cargo dependencies" -Skip:($os.IsVentura -or $os.IsSonoma -or $os.IsSequoia) { It "bindgen" { "bindgen --version" | Should -ReturnZeroExitCode } diff --git a/images/macos/scripts/tests/System.Tests.ps1 b/images/macos/scripts/tests/System.Tests.ps1 index ae6fbd1d4249..bc0fd72c995d 100644 --- a/images/macos/scripts/tests/System.Tests.ps1 +++ b/images/macos/scripts/tests/System.Tests.ps1 @@ -25,7 +25,7 @@ Describe "Certificate" { } } -Describe "Audio device" -Skip:($os.IsVentura -or $os.IsSonoma) { +Describe "Audio device" -Skip:($os.IsVentura -or $os.IsSonoma -or $os.IsSequoia) { It "Sox is installed" { "sox --version" | Should -ReturnZeroExitCode } diff --git a/images/macos/scripts/tests/Toolcache.Tests.ps1 b/images/macos/scripts/tests/Toolcache.Tests.ps1 index 623a41632a2d..6a07313b63f0 100644 --- a/images/macos/scripts/tests/Toolcache.Tests.ps1 +++ b/images/macos/scripts/tests/Toolcache.Tests.ps1 @@ -57,7 +57,7 @@ Describe "Toolcache" { } } - Context "Ruby" -Skip:($os.IsVenturaArm64 -or $os.IsSonomaArm64) { + Context "Ruby" -Skip:($os.IsVenturaArm64 -or $os.IsSonomaArm64 -or $os.IsSequoiaArm64) { $rubyDirectory = Join-Path $toolcacheDirectory "Ruby" $rubyPackage = $packages | Where-Object { $_.ToolName -eq "Ruby" } | Select-Object -First 1 $testCase = @{ RubyDirectory = $rubyDirectory } @@ -99,7 +99,7 @@ Describe "Toolcache" { } } } - Context "PyPy" -Skip:($os.IsVenturaArm64 -or $os.IsSonoma) { + Context "PyPy" -Skip:($os.IsVenturaArm64 -or $os.IsSonoma -or $os.IsSequoia) { $pypyDirectory = Join-Path $toolcacheDirectory "PyPy" $pypyPackage = $packages | Where-Object { $_.ToolName -eq "pypy" } | Select-Object -First 1 $testCase = @{ PypyDirectory = $pypyDirectory } diff --git a/images/macos/scripts/tests/WebServers.Tests.ps1 b/images/macos/scripts/tests/WebServers.Tests.ps1 index 18c6bbb26425..303fa3842b00 100644 --- a/images/macos/scripts/tests/WebServers.Tests.ps1 +++ b/images/macos/scripts/tests/WebServers.Tests.ps1 @@ -2,7 +2,7 @@ Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" $os = Get-OSVersion -Describe "Apache" -Skip:($os.IsVentura -or $os.IsSonoma) { +Describe "Apache" -Skip:($os.IsVentura -or $os.IsSonoma -or $os.IsSequoia) { It "Apache CLI" { "httpd -v" | Should -ReturnZeroExitCode } @@ -13,7 +13,7 @@ Describe "Apache" -Skip:($os.IsVentura -or $os.IsSonoma) { } } -Describe "Nginx" -Skip:($os.IsVentura -or $os.IsSonoma) { +Describe "Nginx" -Skip:($os.IsVentura -or $os.IsSonoma -or $os.IsSequoia) { It "Nginx CLI" { "nginx -v" | Should -ReturnZeroExitCode } diff --git a/images/macos/scripts/tests/Xamarin.Tests.ps1 b/images/macos/scripts/tests/Xamarin.Tests.ps1 index 93de1cd34043..3b808fd0328f 100644 --- a/images/macos/scripts/tests/Xamarin.Tests.ps1 +++ b/images/macos/scripts/tests/Xamarin.Tests.ps1 @@ -13,6 +13,8 @@ if ($os.IsVentura -or $os.IsSonoma) { $XAMARIN_IOS_VERSIONS = (Get-ToolsetContent).xamarin.ios_versions $XAMARIN_MAC_VERSIONS = (Get-ToolsetContent).xamarin.mac_versions $XAMARIN_ANDROID_VERSIONS = (Get-ToolsetContent).xamarin.android_versions +} elseif ($os.IsSequoia) { + Write-Host "Skipping all the Mono and Xamarin tests as deprecated" } BeforeAll { @@ -26,7 +28,7 @@ BeforeAll { } } -Describe "Mono" { +Describe "Mono" -Skip:($os.IsSequoia) { $MONO_VERSIONS | ForEach-Object { Context "$_" { $MONO_VERSIONS_PATH = "/Library/Frameworks/Mono.framework/Versions" @@ -90,7 +92,7 @@ Describe "Mono" { } } -Describe "Xamarin.iOS" -Skip:($os.IsVentura -or $os.IsSonoma) { +Describe "Xamarin.iOS" -Skip:($os.IsVentura -or $os.IsSonoma -or $os.IsSequoia) { $XAMARIN_IOS_VERSIONS | ForEach-Object { Context "$_" { $XAMARIN_IOS_VERSIONS_PATH = "/Library/Frameworks/Xamarin.iOS.framework/Versions" @@ -123,7 +125,7 @@ Describe "Xamarin.iOS" -Skip:($os.IsVentura -or $os.IsSonoma) { } } -Describe "Xamarin.Mac" -Skip:($os.IsVentura -or $os.IsSonoma) { +Describe "Xamarin.Mac" -Skip:($os.IsVentura -or $os.IsSonoma -or $os.IsSequoia) { $XAMARIN_MAC_VERSIONS | ForEach-Object { Context "$_" { $XAMARIN_MAC_VERSIONS_PATH = "/Library/Frameworks/Xamarin.Mac.framework/Versions" @@ -156,7 +158,7 @@ Describe "Xamarin.Mac" -Skip:($os.IsVentura -or $os.IsSonoma) { } } -Describe "Xamarin.Android" -Skip:($os.IsVentura -or $os.IsSonoma) { +Describe "Xamarin.Android" -Skip:($os.IsVentura -or $os.IsSonoma -or $os.IsSequoia) { $XAMARIN_ANDROID_VERSIONS | ForEach-Object { Context "$_" { $XAMARIN_ANDROID_VERSIONS_PATH = "/Library/Frameworks/Xamarin.Android.framework/Versions" @@ -196,7 +198,7 @@ Describe "Xamarin.Android" -Skip:($os.IsVentura -or $os.IsSonoma) { } } -Describe "Xamarin Bundles" -Skip:($os.IsVentura -or $os.IsSonoma) { +Describe "Xamarin Bundles" -Skip:($os.IsVentura -or $os.IsSonoma -or $os.IsSequoia) { BeforeAll { $MONO_VERSIONS_PATH = "/Library/Frameworks/Mono.framework/Versions" $XAMARIN_IOS_VERSIONS_PATH = "/Library/Frameworks/Xamarin.iOS.framework/Versions" @@ -303,7 +305,7 @@ Describe "Xamarin Bundles" -Skip:($os.IsVentura -or $os.IsSonoma) { } } -Describe "Nuget" -Skip:($os.IsVentura -or $os.IsSonoma) { +Describe "Nuget" -Skip:($os.IsVentura -or $os.IsSonoma -or $os.IsSequoia) { It "Nuget config contains nuget.org feed" { Get-Content $env:HOME/.config/NuGet/NuGet.Config | Out-String | Should -Match "nuget.org" } diff --git a/images/macos/scripts/tests/Xcode.Tests.ps1 b/images/macos/scripts/tests/Xcode.Tests.ps1 index 912fccb7f48b..4228f1a2bc51 100644 --- a/images/macos/scripts/tests/Xcode.Tests.ps1 +++ b/images/macos/scripts/tests/Xcode.Tests.ps1 @@ -28,6 +28,13 @@ Describe "Xcode" { $defaultXcodeTestCase = @{ DefaultXcode = $defaultXcode } It "Default Xcode is <DefaultXcode>" -TestCases $defaultXcodeTestCase { "xcodebuild -version" | Should -ReturnZeroExitCode + If ($DefaultXcode -ilike "*beta*") { + Write-Host "Beta version detected" + $DefaultXcode = $DefaultXcode.split("_")[0] + If ($DefaultXcode -notlike "*.*") { + $DefaultXcode = "${DefaultXcode}.0" + } + } (Get-CommandResult "xcodebuild -version").Output | Should -BeLike "Xcode ${DefaultXcode}*" } diff --git a/images/macos/templates/macOS-14.anka.pkr.hcl b/images/macos/templates/macOS-14.anka.pkr.hcl index d0ac071ed3d5..752583862ff1 100644 --- a/images/macos/templates/macOS-14.anka.pkr.hcl +++ b/images/macos/templates/macOS-14.anka.pkr.hcl @@ -250,7 +250,6 @@ build { "${path.root}/../scripts/build/install-chrome.sh", "${path.root}/../scripts/build/install-edge.sh", "${path.root}/../scripts/build/install-firefox.sh", - "${path.root}/../scripts/build/install-pypy.sh", "${path.root}/../scripts/build/install-bicep.sh", "${path.root}/../scripts/build/install-codeql-bundle.sh" ] diff --git a/images/macos/templates/macOS-15.anka.pkr.hcl b/images/macos/templates/macOS-15.anka.pkr.hcl new file mode 100644 index 000000000000..1bd3aefb3984 --- /dev/null +++ b/images/macos/templates/macOS-15.anka.pkr.hcl @@ -0,0 +1,293 @@ +packer { + required_plugins { + veertu-anka = { + version = ">= v3.2.0" + source = "github.com/veertuinc/veertu-anka" + } + } +} + +locals { + image_folder = "/Users/${var.vm_username}/image-generation" +} + +variable "builder_type" { + type = string + default = "veertu-anka-vm-clone" + validation { + condition = contains(["veertu-anka-vm-clone", "null"], var.builder_type) + error_message = "The builder_type value must be one of [veertu-anka-vm-clone, null]." + } +} + +variable "source_vm_name" { + type = string +} + +variable "source_vm_port" { + type = number + default = 22 +} + +variable "source_vm_tag" { + type = string + default = "" +} + +variable "socks_proxy" { + type = string + default = "" +} + +variable "build_id" { + type = string +} + +variable "vm_username" { + type = string + sensitive = true +} + +variable "vm_password" { + type = string + sensitive = true +} + +variable "github_api_pat" { + type = string + sensitive = true + default = "" +} + +variable "xcode_install_storage_url" { + type = string + sensitive = true +} + +variable "xcode_install_sas" { + type = string + sensitive = true +} + +variable "vcpu_count" { + type = string + default = "6" +} + +variable "ram_size" { + type = string + default = "8G" +} + +variable "image_os" { + type = string + default = "macos15" +} + +source "veertu-anka-vm-clone" "template" { + vm_name = "${var.build_id}" + source_vm_name = "${var.source_vm_name}" + source_vm_tag = "${var.source_vm_tag}" + vcpu_count = "${var.vcpu_count}" + ram_size = "${var.ram_size}" + stop_vm = "true" +} + +source "null" "template" { + ssh_host = "${var.source_vm_name}" + ssh_port = "${var.source_vm_port}" + ssh_username = "${var.vm_username}" + ssh_password = "${var.vm_password}" + ssh_proxy_host = "${var.socks_proxy}" +} + +build { + sources = ["source.${var.builder_type}.template"] + + provisioner "shell" { + inline = ["mkdir ${local.image_folder}"] + } + + provisioner "file" { + destination = "${local.image_folder}/" + sources = [ + "${path.root}/../scripts/tests", + "${path.root}/../scripts/docs-gen", + "${path.root}/../scripts/helpers" + ] + } + + provisioner "file" { + destination = "${local.image_folder}/docs-gen/" + source = "${path.root}/../../../helpers/software-report-base" + } + + provisioner "file" { + destination = "${local.image_folder}/add-certificate.swift" + source = "${path.root}/../assets/add-certificate.swift" + } + + provisioner "file" { + destination = ".bashrc" + source = "${path.root}/../assets/bashrc" + } + + provisioner "file" { + destination = ".bash_profile" + source = "${path.root}/../assets/bashprofile" + } + + provisioner "shell" { + inline = ["mkdir ~/bootstrap"] + } + + provisioner "file" { + destination = "bootstrap" + source = "${path.root}/../assets/bootstrap-provisioner/" + } + + provisioner "file" { + destination = "${local.image_folder}/toolset.json" + source = "${path.root}/../toolsets/toolset-15.json" + } + + provisioner "shell" { + execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" + inline = [ + "mv ${local.image_folder}/docs-gen ${local.image_folder}/software-report", + "mkdir ~/utils", + "mv ${local.image_folder}/helpers/invoke-tests.sh ~/utils", + "mv ${local.image_folder}/helpers/utils.sh ~/utils" + ] + } + + provisioner "shell" { + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" + scripts = [ + "${path.root}/../scripts/build/install-xcode-clt.sh", + "${path.root}/../scripts/build/install-homebrew.sh" + ] + } + + provisioner "shell" { + environment_vars = ["PASSWORD=${var.vm_password}", "USERNAME=${var.vm_username}"] + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}" + scripts = [ + "${path.root}/../scripts/build/configure-tccdb-macos.sh", + "${path.root}/../scripts/build/configure-auto-updates.sh", + "${path.root}/../scripts/build/configure-ntpconf.sh", + "${path.root}/../scripts/build/configure-shell.sh" + ] + } + + provisioner "shell" { + environment_vars = ["IMAGE_VERSION=${var.build_id}", "IMAGE_OS=${var.image_os}", "PASSWORD=${var.vm_password}"] + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" + scripts = [ + "${path.root}/../scripts/build/configure-preimagedata.sh", + "${path.root}/../scripts/build/configure-ssh.sh", + "${path.root}/../scripts/build/configure-machine.sh" + ] + } + + provisioner "shell" { + execute_command = "source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}" + expect_disconnect = true + inline = ["echo 'Reboot VM'", "shutdown -r now"] + } + + provisioner "shell" { + environment_vars = ["API_PAT=${var.github_api_pat}", "USER_PASSWORD=${var.vm_password}", "IMAGE_FOLDER=${local.image_folder}"] + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" + pause_before = "30s" + scripts = [ + "${path.root}/../scripts/build/install-powershell.sh", + "${path.root}/../scripts/build/install-dotnet.sh", + "${path.root}/../scripts/build/install-python.sh", + "${path.root}/../scripts/build/install-azcopy.sh", + "${path.root}/../scripts/build/install-openssl.sh", + "${path.root}/../scripts/build/install-ruby.sh", + "${path.root}/../scripts/build/install-rubygems.sh", + "${path.root}/../scripts/build/install-git.sh", + "${path.root}/../scripts/build/install-node.sh", + "${path.root}/../scripts/build/install-common-utils.sh" + ] + } + + provisioner "shell" { + environment_vars = ["XCODE_INSTALL_STORAGE_URL=${var.xcode_install_storage_url}", "XCODE_INSTALL_SAS=${var.xcode_install_sas}", "IMAGE_FOLDER=${local.image_folder}"] + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} pwsh -f {{ .Path }}" + script = "${path.root}/../scripts/build/Install-Xcode.ps1" + } + + provisioner "shell" { + execute_command = "source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}" + expect_disconnect = true + inline = ["echo 'Reboot VM'", "shutdown -r now"] + } + + provisioner "shell" { + environment_vars = ["API_PAT=${var.github_api_pat}", "IMAGE_FOLDER=${local.image_folder}"] + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" + scripts = [ + "${path.root}/../scripts/build/install-actions-cache.sh", + "${path.root}/../scripts/build/install-llvm.sh", + "${path.root}/../scripts/build/install-swiftlint.sh", + "${path.root}/../scripts/build/install-openjdk.sh", + "${path.root}/../scripts/build/install-php.sh", + "${path.root}/../scripts/build/install-aws-tools.sh", + "${path.root}/../scripts/build/install-rust.sh", + "${path.root}/../scripts/build/install-gcc.sh", + "${path.root}/../scripts/build/install-cocoapods.sh", + "${path.root}/../scripts/build/install-android-sdk.sh", + "${path.root}/../scripts/build/install-safari.sh", + "${path.root}/../scripts/build/install-chrome.sh", + "${path.root}/../scripts/build/install-edge.sh", + "${path.root}/../scripts/build/install-firefox.sh", + "${path.root}/../scripts/build/install-bicep.sh", + "${path.root}/../scripts/build/install-codeql-bundle.sh" + ] + } + + provisioner "shell" { + environment_vars = ["IMAGE_FOLDER=${local.image_folder}"] + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} pwsh -f {{ .Path }}" + scripts = [ + "${path.root}/../scripts/build/Install-Toolset.ps1", + "${path.root}/../scripts/build/Configure-Toolset.ps1" + ] + } + + provisioner "shell" { + environment_vars = ["IMAGE_FOLDER=${local.image_folder}"] + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} pwsh -f {{ .Path }}" + script = "${path.root}/../scripts/build/Configure-Xcode-Simulators.ps1" + } + + provisioner "shell" { + environment_vars = ["IMAGE_FOLDER=${local.image_folder}"] + execute_command = "source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" + inline = [ + "pwsh -File \"${local.image_folder}/software-report/Generate-SoftwareReport.ps1\" -OutputDirectory \"${local.image_folder}/output/software-report\" -ImageName ${var.build_id}", + "pwsh -File \"${local.image_folder}/tests/RunAll-Tests.ps1\"" + ] + } + + provisioner "file" { + destination = "${path.root}/../../image-output/" + direction = "download" + source = "${local.image_folder}/output/" + } + + provisioner "shell" { + inline = ["rm -rf \"$(brew --cache)\""] + } + + provisioner "shell" { + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" + scripts = [ + "${path.root}/../scripts/build/configure-hostname.sh", + "${path.root}/../scripts/build/configure-system.sh" + ] + } +} diff --git a/images/macos/templates/macOS-15.arm64.anka.pkr.hcl b/images/macos/templates/macOS-15.arm64.anka.pkr.hcl new file mode 100644 index 000000000000..50b34dccab5c --- /dev/null +++ b/images/macos/templates/macOS-15.arm64.anka.pkr.hcl @@ -0,0 +1,285 @@ +packer { + required_plugins { + veertu-anka = { + version = ">= v3.2.0" + source = "github.com/veertuinc/veertu-anka" + } + } +} + +locals { + image_folder = "/Users/${var.vm_username}/image-generation" +} + +variable "builder_type" { + type = string + default = "veertu-anka-vm-clone" + validation { + condition = contains(["veertu-anka-vm-clone", "null"], var.builder_type) + error_message = "The builder_type value must be one of [veertu-anka-vm-clone, null]." + } +} + +variable "source_vm_name" { + type = string +} + +variable "source_vm_port" { + type = number + default = 22 +} + +variable "source_vm_tag" { + type = string + default = "" +} + +variable "socks_proxy" { + type = string + default = "" +} + +variable "build_id" { + type = string +} + +variable "vm_username" { + type = string + sensitive = true +} + +variable "vm_password" { + type = string + sensitive = true +} + +variable "github_api_pat" { + type = string + sensitive = true + default = "" +} + +variable "xcode_install_storage_url" { + type = string + sensitive = true +} + +variable "xcode_install_sas" { + type = string + sensitive = true +} + +variable "vcpu_count" { + type = string + default = "6" +} + +variable "ram_size" { + type = string + default = "8G" +} + +variable "image_os" { + type = string + default = "macos15" +} + +source "veertu-anka-vm-clone" "template" { + vm_name = "${var.build_id}" + source_vm_name = "${var.source_vm_name}" + source_vm_tag = "${var.source_vm_tag}" + vcpu_count = "${var.vcpu_count}" + ram_size = "${var.ram_size}" + stop_vm = "true" + log_level = "debug" +} + +source "null" "template" { + ssh_host = "${var.source_vm_name}" + ssh_port = "${var.source_vm_port}" + ssh_username = "${var.vm_username}" + ssh_password = "${var.vm_password}" + ssh_proxy_host = "${var.socks_proxy}" +} + +build { + sources = ["source.${var.builder_type}.template"] + + provisioner "shell" { + inline = ["mkdir ${local.image_folder}"] + } + + provisioner "file" { + destination = "${local.image_folder}/" + sources = [ + "${path.root}/../scripts/tests", + "${path.root}/../scripts/docs-gen", + "${path.root}/../scripts/helpers" + ] + } + + provisioner "file" { + destination = "${local.image_folder}/docs-gen/" + source = "${path.root}/../../../helpers/software-report-base" + } + + provisioner "file" { + destination = "${local.image_folder}/add-certificate.swift" + source = "${path.root}/../assets/add-certificate.swift" + } + + provisioner "file" { + destination = ".bashrc" + source = "${path.root}/../assets/bashrc" + } + + provisioner "file" { + destination = ".bash_profile" + source = "${path.root}/../assets/bashprofile" + } + + provisioner "shell" { + inline = ["mkdir ~/bootstrap"] + } + + provisioner "file" { + destination = "bootstrap" + source = "${path.root}/../assets/bootstrap-provisioner/" + } + + provisioner "file" { + destination = "${local.image_folder}/toolset.json" + source = "${path.root}/../toolsets/toolset-15.json" + } + + provisioner "shell" { + execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" + inline = [ + "mv ${local.image_folder}/docs-gen ${local.image_folder}/software-report", + "mkdir ~/utils", + "mv ${local.image_folder}/helpers/invoke-tests.sh ~/utils", + "mv ${local.image_folder}/helpers/utils.sh ~/utils" + ] + } + + provisioner "shell" { + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" + scripts = [ + "${path.root}/../scripts/build/install-xcode-clt.sh", + "${path.root}/../scripts/build/install-homebrew.sh", + "${path.root}/../scripts/build/install-rosetta.sh" + ] + } + + provisioner "shell" { + environment_vars = ["PASSWORD=${var.vm_password}", "USERNAME=${var.vm_username}"] + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}" + scripts = [ + "${path.root}/../scripts/build/configure-tccdb-macos.sh", + "${path.root}/../scripts/build/configure-auto-updates.sh", + "${path.root}/../scripts/build/configure-ntpconf.sh", + "${path.root}/../scripts/build/configure-shell.sh" + ] + } + + provisioner "shell" { + environment_vars = ["IMAGE_VERSION=${var.build_id}", "IMAGE_OS=${var.image_os}", "PASSWORD=${var.vm_password}"] + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" + scripts = [ + "${path.root}/../scripts/build/configure-preimagedata.sh", + "${path.root}/../scripts/build/configure-ssh.sh", + "${path.root}/../scripts/build/configure-machine.sh" + ] + } + + provisioner "shell" { + execute_command = "source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}" + expect_disconnect = true + inline = ["echo 'Reboot VM'", "shutdown -r now"] + } + + provisioner "shell" { + environment_vars = ["API_PAT=${var.github_api_pat}", "USER_PASSWORD=${var.vm_password}", "IMAGE_FOLDER=${local.image_folder}"] + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" + pause_before = "30s" + scripts = [ + "${path.root}/../scripts/build/configure-windows.sh", + "${path.root}/../scripts/build/install-powershell.sh", + "${path.root}/../scripts/build/install-dotnet.sh", + "${path.root}/../scripts/build/install-python.sh", + "${path.root}/../scripts/build/install-azcopy.sh", + "${path.root}/../scripts/build/install-openssl.sh", + "${path.root}/../scripts/build/install-ruby.sh", + "${path.root}/../scripts/build/install-rubygems.sh", + "${path.root}/../scripts/build/install-git.sh", + "${path.root}/../scripts/build/install-node.sh", + "${path.root}/../scripts/build/install-common-utils.sh" + ] + } + + provisioner "shell" { + environment_vars = ["XCODE_INSTALL_STORAGE_URL=${var.xcode_install_storage_url}", "XCODE_INSTALL_SAS=${var.xcode_install_sas}", "IMAGE_FOLDER=${local.image_folder}"] + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} pwsh -f {{ .Path }}" + script = "${path.root}/../scripts/build/Install-Xcode.ps1" + } + + provisioner "shell" { + execute_command = "source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}" + expect_disconnect = true + inline = ["echo 'Reboot VM'", "shutdown -r now"] + } + + provisioner "shell" { + environment_vars = ["API_PAT=${var.github_api_pat}", "IMAGE_FOLDER=${local.image_folder}"] + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" + scripts = [ + "${path.root}/../scripts/build/install-actions-cache.sh", + "${path.root}/../scripts/build/install-llvm.sh", + "${path.root}/../scripts/build/install-openjdk.sh", + "${path.root}/../scripts/build/install-aws-tools.sh", + "${path.root}/../scripts/build/install-rust.sh", + "${path.root}/../scripts/build/install-gcc.sh", + "${path.root}/../scripts/build/install-cocoapods.sh", + "${path.root}/../scripts/build/install-android-sdk.sh", + "${path.root}/../scripts/build/install-safari.sh", + "${path.root}/../scripts/build/install-chrome.sh", + "${path.root}/../scripts/build/install-bicep.sh", + "${path.root}/../scripts/build/install-codeql-bundle.sh" + ] + } + + provisioner "shell" { + environment_vars = ["IMAGE_FOLDER=${local.image_folder}"] + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} pwsh -f {{ .Path }}" + scripts = [ + "${path.root}/../scripts/build/Install-Toolset.ps1", + "${path.root}/../scripts/build/Configure-Toolset.ps1" + ] + } + + provisioner "shell" { + environment_vars = ["IMAGE_FOLDER=${local.image_folder}"] + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} pwsh -f {{ .Path }}" + script = "${path.root}/../scripts/build/Configure-Xcode-Simulators.ps1" + } + + provisioner "shell" { + environment_vars = ["IMAGE_FOLDER=${local.image_folder}"] + execute_command = "source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" + inline = [ + "pwsh -File \"${local.image_folder}/software-report/Generate-SoftwareReport.ps1\" -OutputDirectory \"${local.image_folder}/output/software-report\" -ImageName ${var.build_id}", + "pwsh -File \"${local.image_folder}/tests/RunAll-Tests.ps1\"" + ] + } + + provisioner "file" { + destination = "${path.root}/../../image-output/" + direction = "download" + source = "${local.image_folder}/output/" + } + + provisioner "shell" { + execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" + scripts = ["${path.root}/../scripts/build/configure-hostname.sh"] + } +} diff --git a/images/macos/toolsets/toolset-15.json b/images/macos/toolsets/toolset-15.json new file mode 100644 index 000000000000..38a8ca082920 --- /dev/null +++ b/images/macos/toolsets/toolset-15.json @@ -0,0 +1,204 @@ +{ + "xcode": { + "default": "16.1_beta", + "x64": { + "versions": [ + { "link": "16.1_beta", "version": "16.1.0-Beta+16B5001e", "symlinks": ["16.1"], "install_runtimes": "true", "sha256": "8848aacb32bdc0abbd7e14e4b712e07c98f4b6e5a23a8d77db03ab21dcb3c777"}, + { "link": "16_beta_6", "version": "16.0.0-Beta.6+16A5230g", "symlinks": ["16.0"], "install_runtimes": "true", "sha256": "ab0b9a4f6d723420ee0e39ff1cf6a628665dfe832053f66b6b72e013a6bbb244"}, + { "link": "15.4", "version": "15.4.0+15F31d", "install_runtimes": "true", "sha256": "82d3d61804ff3f4c7c82085e91dc701037ddaa770e542848b2477e22f4e8aa7a"} + ] + }, + "arm64":{ + "versions": [ + { "link": "16.1_beta", "version": "16.1.0-Beta+16B5001e", "symlinks": ["16.1"], "install_runtimes": "true", "sha256": "8848aacb32bdc0abbd7e14e4b712e07c98f4b6e5a23a8d77db03ab21dcb3c777"}, + { "link": "16_beta_6", "version": "16.0.0-Beta.6+16A5230g", "symlinks": ["16.0"], "install_runtimes": "true", "sha256": "ab0b9a4f6d723420ee0e39ff1cf6a628665dfe832053f66b6b72e013a6bbb244"}, + { "link": "15.4", "version": "15.4.0+15F31d", "install_runtimes": "true", "sha256": "82d3d61804ff3f4c7c82085e91dc701037ddaa770e542848b2477e22f4e8aa7a"} + ] + } + }, + "java": { + "x64": { + "default": "21", + "versions": [ "11", "17", "21"] + }, + "arm64": { + "default": "21", + "versions": [ "11", "17", "21"] + } + }, + "android": { + "cmdline-tools": "commandlinetools-mac-12172612_latest.zip", + "sdk-tools": "sdk-tools-darwin-4333796.zip", + "platform_min_version": "35", + "build_tools_min_version": "35.0.2", + "extras": [ + "android;m2repository", "google;m2repository", "google;google_play_services" + ], + "addons": [], + "additional_tools": [ + "cmake;3.22.1" + ], + "ndk": { + "default": "27", + "versions": [ + "25", "26", "27" + ] + } + }, + "powershellModules": [ + { "name": "Az" }, + { "name": "Pester" }, + { "name": "PSScriptAnalyzer" } + ], + "brew": { + "common_packages": [ + "ant", + "aria2", + "azure-cli", + "bazelisk", + "carthage", + "cmake", + "gh", + "gnupg", + "gnu-tar", + "kotlin", + "libpq", + "libsodium", + "p7zip", + "packer", + "perl", + "pkg-config", + "swiftformat", + "zstd", + "gmp", + "yq", + "unxip", + "xcbeautify", + "xcodes" + ], + "cask_packages": [ + "" + ] + }, + "gcc": { + "versions": [ + "12", + "13", + "14" + ] + }, + "dotnet": { + "arch":{ + "x64": { + "versions": [ + "7.0", + "8.0" + ] + }, + "arm64": { + "versions": [ + "7.0", + "8.0" + ] + } + } + }, + "ruby": { + "default": "3.3", + "rubygems": [ + "cocoapods", + "bundler", + "fastlane" + ] + }, + "toolcache": [ + { + "name": "Python", + "url" : "https://raw.githubusercontent.com/actions/python-versions/main/versions-manifest.json", + "platform" : "darwin", + "arch": { + "x64": { + "versions": [ + "3.9.*", + "3.10.*", + "3.11.*", + "3.12.*" + ] + }, + "arm64": { + "versions": [ + "3.9.*", + "3.10.*", + "3.11.*", + "3.12.*" + ] + } + } + }, + { + "name": "Node", + "url" : "https://raw.githubusercontent.com/actions/node-versions/main/versions-manifest.json", + "platform" : "darwin", + "arch": { + "x64": { + "versions": [ + "18.*", + "20.*" + ] + }, + "arm64": { + "versions": [ + "18.*", + "20.*" + ] + } + } + }, + { + "name": "Go", + "url" : "https://raw.githubusercontent.com/actions/go-versions/main/versions-manifest.json", + "platform" : "darwin", + "arch": { + "x64": { + "variable_template" : "GOROOT_{0}_{1}_X64", + "versions": [ + "1.21.*", + "1.22.*", + "1.23.*" + ] + }, + "arm64": { + "variable_template" : "GOROOT_{0}_{1}_ARM64", + "versions": [ + "1.21.*", + "1.22.*", + "1.23.*" + ] + } + } + }, + { + "name": "Ruby", + "arch": { + "x64": { + "versions": [ + "3.1.*", + "3.2.*" + ] + } + } + } + ], + "node": { + "default": "22" + }, + "llvm": { + "version": "18" + }, + "php": { + "version": "8.3" + }, + "pwsh": { + "version": "7.4" + } +} From 89f5712cad8774c82104eb794581c5d3c94ebcf2 Mon Sep 17 00:00:00 2001 From: ijunaidm <160701894+ijunaidm@users.noreply.github.com> Date: Wed, 4 Sep 2024 01:10:52 +0530 Subject: [PATCH 3077/3485] Add Packer tool to Ubuntu24.04 image (#10545) Co-authored-by: Mohammed Junaid <mohammedjunaid@Mohammeds-MacBook-Pro.local> --- images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 | 4 +--- images/ubuntu/scripts/tests/Tools.Tests.ps1 | 2 +- images/ubuntu/templates/ubuntu-24.04.pkr.hcl | 1 + 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 b/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 index d7c82e55c145..df241051a6ec 100644 --- a/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 +++ b/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 @@ -140,9 +140,7 @@ if ((Test-IsUbuntu20) -or (Test-IsUbuntu22)) { $tools.AddToolVersion("nvm", $(Get-NvmVersion)) } $tools.AddToolVersion("OpenSSL", $(Get-OpensslVersion)) -if ((Test-IsUbuntu20) -or (Test-IsUbuntu22)) { - $tools.AddToolVersion("Packer", $(Get-PackerVersion)) -} +$tools.AddToolVersion("Packer", $(Get-PackerVersion)) $tools.AddToolVersion("Parcel", $(Get-ParcelVersion)) if (Test-IsUbuntu20) { $tools.AddToolVersion("PhantomJS", $(Get-PhantomJSVersion)) diff --git a/images/ubuntu/scripts/tests/Tools.Tests.ps1 b/images/ubuntu/scripts/tests/Tools.Tests.ps1 index 2c891f1816ce..749e65010901 100644 --- a/images/ubuntu/scripts/tests/Tools.Tests.ps1 +++ b/images/ubuntu/scripts/tests/Tools.Tests.ps1 @@ -319,7 +319,7 @@ Describe "Conda" { } } -Describe "Packer" -Skip:((-not (Test-IsUbuntu20)) -and (-not (Test-IsUbuntu22))) { +Describe "Packer" { It "packer" { "packer --version" | Should -ReturnZeroExitCode } diff --git a/images/ubuntu/templates/ubuntu-24.04.pkr.hcl b/images/ubuntu/templates/ubuntu-24.04.pkr.hcl index 3324ffd76c47..76971e3cf70d 100644 --- a/images/ubuntu/templates/ubuntu-24.04.pkr.hcl +++ b/images/ubuntu/templates/ubuntu-24.04.pkr.hcl @@ -310,6 +310,7 @@ provisioner "shell" { "${path.root}/../scripts/build/install-rust.sh", "${path.root}/../scripts/build/install-julia.sh", "${path.root}/../scripts/build/install-selenium.sh", + "${path.root}/../scripts/build/install-packer.sh", "${path.root}/../scripts/build/install-vcpkg.sh", "${path.root}/../scripts/build/configure-dpkg.sh", "${path.root}/../scripts/build/install-yq.sh", From 3926b864c36dbf6eecb879b096df5884abcf5b4a Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Tue, 3 Sep 2024 22:58:36 +0200 Subject: [PATCH 3078/3485] [macOS] Update free space test condition to 14 GB (#10546) --- images/macos/scripts/tests/System.Tests.ps1 | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/images/macos/scripts/tests/System.Tests.ps1 b/images/macos/scripts/tests/System.Tests.ps1 index bc0fd72c995d..206ac3be7600 100644 --- a/images/macos/scripts/tests/System.Tests.ps1 +++ b/images/macos/scripts/tests/System.Tests.ps1 @@ -3,11 +3,12 @@ Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" $os = Get-OSVersion Describe "Disk free space" { - It "Image has more than 10GB free space" { - # we should have at least 10 GB of free space on macOS images - # https://docs.microsoft.com/en-us/azure/devops/pipelines/agents/hosted?view=azure-devops#capabilities-and-limitations + It "Image has more than 14GB free space" { + # we should have at least 14 GB of free space on macOS images + # 10GB here: https://docs.microsoft.com/en-us/azure/devops/pipelines/agents/hosted?view=azure-devops#capabilities-and-limitations + # 14GB here: https://docs.github.com/en/actions/using-github-hosted-runners/using-github-hosted-runners/about-github-hosted-runners#standard-github-hosted-runners-for-public-repositories $freeSpace = (Get-PSDrive "/").Free - $freeSpace | Should -BeGreaterOrEqual 10GB + $freeSpace | Should -BeGreaterOrEqual 14GB } } From e85a3666bfc8cb7c7a28169f30868c19bb2d33b2 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 4 Sep 2024 11:43:29 +0000 Subject: [PATCH 3079/3485] Updating readme file for ubuntu24 version 20240901.1.1 (#10527) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2404-Readme.md | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/images/ubuntu/Ubuntu2404-Readme.md b/images/ubuntu/Ubuntu2404-Readme.md index 26c03df57cbf..a76d2da59357 100644 --- a/images/ubuntu/Ubuntu2404-Readme.md +++ b/images/ubuntu/Ubuntu2404-Readme.md @@ -1,12 +1,12 @@ | Announcements | |-| -| [[All OSes] Android NDK versions <=25 will be removed from images on August 19](https://github.com/actions/runner-images/issues/10342) | +| [[Ubuntu 20.04 and Ubuntu 22.04 Oses] Go 1.22.x will be set as default on September, 20](https://github.com/actions/runner-images/issues/10500) | | [Ubuntu 24.04 is now available](https://github.com/actions/runner-images/issues/9848) | *** # Ubuntu 24.04 LTS - OS Version: 24.04 LTS - Kernel Version: 6.8.0-1013-azure -- Image Version: 20240825.1.0 +- Image Version: 20240901.1.0 - Systemd version: 255.4-1ubuntu8.2 ## Installed Software @@ -19,7 +19,7 @@ - Dash 0.5.12-6ubuntu5 - GNU C++: 12.3.0, 13.2.0, 14.0.1 - GNU Fortran: 12.3.0, 13.2.0, 14.0.1 -- Julia 1.10.4 +- Julia 1.10.5 - Kotlin 2.0.20-release-360 - Node.js 20.17.0 - Perl 5.38.2 @@ -29,14 +29,14 @@ ### Package Management - cpan 1.64 - Helm 3.15.4 -- Homebrew 4.3.17 +- Homebrew 4.3.18 - Miniconda 24.7.1 - Npm 10.8.2 - Pip 24.0 - Pip3 24.0 - Pipx 1.4.3 - RubyGems 3.4.20 -- Vcpkg (build from commit 350898514) +- Vcpkg (build from commit 0f88ecb85) - Yarn 1.22.22 #### Environment variables @@ -66,8 +66,8 @@ to accomplish this. - Bazelisk 1.19.0 - Bicep 0.29.47 - Buildah 1.33.7 -- CMake 3.30.2 -- CodeQL Action Bundle 2.18.2 +- CMake 3.30.3 +- CodeQL Action Bundle 2.18.3 - Docker Amazon ECR Credential Helper 0.8.0 - Docker Compose v2 2.27.1 - Docker-Buildx 0.16.2 @@ -98,7 +98,7 @@ to accomplish this. - zstd 1.5.6 ### CLI Tools -- AWS CLI 2.17.37 +- AWS CLI 2.17.42 - AWS CLI Session Manager Plugin 1.2.650.0 - AWS SAM CLI 1.123.0 - Azure CLI 2.63.0 @@ -137,10 +137,10 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 128.0.6613.84 -- ChromeDriver 128.0.6613.84 +- Google Chrome 128.0.6613.113 +- ChromeDriver 128.0.6613.86 - Chromium 128.0.6613.0 -- Selenium server 4.23.1 +- Selenium server 4.24.0 #### Environment variables | Name | Value | @@ -152,7 +152,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ### .NET Tools - .NET Core SDK: 8.0.108 -- nbgv 3.6.141+d2035fb7be +- nbgv 3.6.143+57d4199a9c ### Databases - sqlite3 3.45.1 @@ -194,7 +194,7 @@ Use the following command as a part of your job to start the service: 'sudo syst #### PyPy - 3.9.19 [PyPy 7.3.16] -- 3.10.14 [PyPy 7.3.16] +- 3.10.14 [PyPy 7.3.17] ### PowerShell Tools - PowerShell 7.4.2 From 24a8fbaf587f74aef83544839f9def4825d606ed Mon Sep 17 00:00:00 2001 From: RaviAkshintala <167848931+RaviAkshintala@users.noreply.github.com> Date: Wed, 4 Sep 2024 21:12:01 +0530 Subject: [PATCH 3080/3485] signature updated for the azure-cli (#10549) Co-authored-by: Ravi Akshintala <raviakshintalagithub.com@Ravis-Laptop.local> --- images/windows/scripts/build/Install-AzureCli.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/windows/scripts/build/Install-AzureCli.ps1 b/images/windows/scripts/build/Install-AzureCli.ps1 index 47a24319bf4d..35fdc478229a 100644 --- a/images/windows/scripts/build/Install-AzureCli.ps1 +++ b/images/windows/scripts/build/Install-AzureCli.ps1 @@ -15,7 +15,7 @@ New-Item -ItemType 'Directory' -Path $azureCliExtensionPath | Out-Null Install-Binary -Type MSI ` -Url 'https://aka.ms/installazurecliwindowsx64' ` - -ExpectedSignature 'C2048FB509F1C37A8C3E9EC6648118458AA01780' + -ExpectedSignature 'F9A7CF9FBE13BAC767F4781061332DA6E8B4E0EE' Update-Environment From 07e13e5cc94f6c2563be3c7db3e14e09b1a72470 Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Thu, 5 Sep 2024 00:05:08 +0200 Subject: [PATCH 3081/3485] [macOS] Update initial macOS-15 Xcode setup (#10554) --- images/macos/toolsets/toolset-15.json | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/images/macos/toolsets/toolset-15.json b/images/macos/toolsets/toolset-15.json index 38a8ca082920..003c0f4fa36a 100644 --- a/images/macos/toolsets/toolset-15.json +++ b/images/macos/toolsets/toolset-15.json @@ -3,16 +3,14 @@ "default": "16.1_beta", "x64": { "versions": [ - { "link": "16.1_beta", "version": "16.1.0-Beta+16B5001e", "symlinks": ["16.1"], "install_runtimes": "true", "sha256": "8848aacb32bdc0abbd7e14e4b712e07c98f4b6e5a23a8d77db03ab21dcb3c777"}, - { "link": "16_beta_6", "version": "16.0.0-Beta.6+16A5230g", "symlinks": ["16.0"], "install_runtimes": "true", "sha256": "ab0b9a4f6d723420ee0e39ff1cf6a628665dfe832053f66b6b72e013a6bbb244"}, - { "link": "15.4", "version": "15.4.0+15F31d", "install_runtimes": "true", "sha256": "82d3d61804ff3f4c7c82085e91dc701037ddaa770e542848b2477e22f4e8aa7a"} + { "link": "16.1_beta", "version": "16.1.0-Beta+16B5001e", "symlinks": ["16.1"], "install_runtimes": "false", "sha256": "8848aacb32bdc0abbd7e14e4b712e07c98f4b6e5a23a8d77db03ab21dcb3c777"}, + { "link": "16_beta_6", "version": "16.0.0-Beta.6+16A5230g", "symlinks": ["16.0"], "install_runtimes": "true", "sha256": "ab0b9a4f6d723420ee0e39ff1cf6a628665dfe832053f66b6b72e013a6bbb244"} ] }, "arm64":{ "versions": [ { "link": "16.1_beta", "version": "16.1.0-Beta+16B5001e", "symlinks": ["16.1"], "install_runtimes": "true", "sha256": "8848aacb32bdc0abbd7e14e4b712e07c98f4b6e5a23a8d77db03ab21dcb3c777"}, - { "link": "16_beta_6", "version": "16.0.0-Beta.6+16A5230g", "symlinks": ["16.0"], "install_runtimes": "true", "sha256": "ab0b9a4f6d723420ee0e39ff1cf6a628665dfe832053f66b6b72e013a6bbb244"}, - { "link": "15.4", "version": "15.4.0+15F31d", "install_runtimes": "true", "sha256": "82d3d61804ff3f4c7c82085e91dc701037ddaa770e542848b2477e22f4e8aa7a"} + { "link": "16_beta_6", "version": "16.0.0-Beta.6+16A5230g", "symlinks": ["16.0"], "install_runtimes": "true", "sha256": "ab0b9a4f6d723420ee0e39ff1cf6a628665dfe832053f66b6b72e013a6bbb244"} ] } }, From b0c4ef1a6b4234b93d8e9d8180feac0141f19b72 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 5 Sep 2024 03:17:53 +0000 Subject: [PATCH 3082/3485] Updating readme file for win19 version 20240902.1.1 (#10536) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/windows/Windows2019-Readme.md | 47 +++++++++++++--------------- 1 file changed, 21 insertions(+), 26 deletions(-) diff --git a/images/windows/Windows2019-Readme.md b/images/windows/Windows2019-Readme.md index 8811fb22b94f..ea0990dab2e0 100644 --- a/images/windows/Windows2019-Readme.md +++ b/images/windows/Windows2019-Readme.md @@ -1,10 +1,6 @@ -| Announcements | -|-| -| [[All OSes] Android NDK versions <=25 will be removed from images on August 19](https://github.com/actions/runner-images/issues/10342) | -*** # Windows Server 2019 - OS Version: 10.0.17763 Build 6189 -- Image Version: 20240825.1.0 +- Image Version: 20240902.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -14,12 +10,12 @@ ### Language and Runtime - Bash 5.2.26(1)-release - Go 1.21.13 -- Julia 1.10.4 +- Julia 1.10.5 - Kotlin 2.0.20 - LLVM 18.1.8 - Node 18.20.3 - Perl 5.32.1 -- PHP 8.3.10 +- PHP 8.3.11 - Python 3.7.9 - Ruby 3.0.7p220 @@ -33,7 +29,7 @@ - pip 24.0 (python 3.7) - Pipx 1.2.1 - RubyGems 3.2.33 -- Vcpkg (build from commit 350898514) +- Vcpkg (build from commit 0f88ecb85) - Yarn 1.22.22 #### Environment variables @@ -56,16 +52,16 @@ - Bazelisk 1.19.0 - Bicep 0.29.47 - Cabal 3.12.1.0 -- CMake 3.30.2 -- CodeQL Action Bundle 2.18.2 +- CMake 3.30.3 +- CodeQL Action Bundle 2.18.3 - Docker 26.1.3 - Docker Compose v2 2.27.1 - Docker-wincred 0.8.2 - ghc 9.10.1 - Git 2.46.0.windows.1 - Git LFS 3.5.1 -- Google Cloud CLI 489.0.0 -- ImageMagick 7.1.1-36 +- Google Cloud CLI 490.0.0 +- ImageMagick 7.1.1-37 - InnoSetup 6.3.3 - jq 1.7.1 - Kind 0.24.0 @@ -92,8 +88,8 @@ - zstd 1.5.6 ### CLI Tools -- Alibaba Cloud CLI 3.0.219 -- AWS CLI 2.17.37 +- Alibaba Cloud CLI 3.0.221 +- AWS CLI 2.17.42 - AWS SAM CLI 1.123.0 - AWS Session Manager CLI 1.2.650.0 - Azure CLI 2.63.0 @@ -116,14 +112,14 @@ - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 128.0.6613.85 -- Chrome Driver 128.0.6613.84 -- Microsoft Edge 128.0.2739.42 -- Microsoft Edge Driver 128.0.2739.42 +- Google Chrome 128.0.6613.114 +- Chrome Driver 128.0.6613.86 +- Microsoft Edge 128.0.2739.54 +- Microsoft Edge Driver 128.0.2739.54 - Mozilla Firefox 129.0.2 - Gecko Driver 0.35.0 - IE Driver 4.14.0.0 -- Selenium server 4.23.0 +- Selenium server 4.24.0 #### Environment variables | Name | Value | @@ -182,12 +178,12 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 3.12.5 #### PyPy -- 2.7.18 [PyPy 7.3.16] +- 2.7.18 [PyPy 7.3.17] - 3.6.12 [PyPy 7.3.3] - 3.7.13 [PyPy 7.3.9] - 3.8.16 [PyPy 7.3.11] - 3.9.19 [PyPy 7.3.16] -- 3.10.14 [PyPy 7.3.16] +- 3.10.14 [PyPy 7.3.17] #### Ruby - 3.0.7 @@ -214,7 +210,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | 5.0.28.0 | MongoDB | Stopped | Disabled | ### Database tools -- Azure CosmosDb Emulator 2.14.19.0 +- Azure CosmosDb Emulator 2.14.20.0 - DacFx 162.3.566.1 - MySQL 5.7.44.0 - SQL OLEDB Driver 18.7.4.0 @@ -496,7 +492,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Microsoft.AspNetCore.App: 6.0.5, 6.0.26, 6.0.33, 7.0.5, 7.0.20, 8.0.6, 8.0.8 - Microsoft.NETCore.App: 6.0.5, 6.0.26, 6.0.33, 7.0.5, 7.0.20, 8.0.6, 8.0.8 - Microsoft.WindowsDesktop.App: 6.0.5, 6.0.26, 6.0.33, 7.0.5, 7.0.20, 8.0.6, 8.0.8 -- nbgv 3.6.141+d2035fb7be +- nbgv 3.6.143+57d4199a9c ### PowerShell Tools - PowerShell 7.4.5 @@ -507,7 +503,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - AzureRM: 2.1.0 (Default), 6.13.1 - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.642 +- AWSPowershell: 4.1.647 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.10 - Microsoft.Graph: 2.22.0 @@ -527,7 +523,7 @@ All other versions are saved but not installed. | Package Name | Version | | -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 8.0 | -| Android Emulator | 34.2.16 | +| Android Emulator | 35.1.20 | | Android SDK Build-tools | 35.0.0<br>34.0.0<br>33.0.0 33.0.1 33.0.2 33.0.3<br>32.0.0<br>31.0.0<br>30.0.2 | | Android SDK Platforms | android-35 (rev 1)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3) | | Android SDK Platform-Tools | 35.0.2 | @@ -556,4 +552,3 @@ All other versions are saved but not installed. | mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:bfb078e34f8c28cf122fc693b265686a58aa46f7e6c9ee46aaae7371d0ed5772 | 2024-08-13 | | mcr.microsoft.com/windows/nanoserver:1809 | sha256:7f6649348a11655e3576463fd6d55c29248f97405f8e643cab2409009339f520 | 2024-08-11 | | mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:f67e2252b22f6f8c9916fdcb099548d01b920d49af2039349e1b883f79c9e0ef | 2024-08-11 | - From 2bb8be665c5eb82b263519ca6a3fce0a15dafee0 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 5 Sep 2024 06:45:39 +0000 Subject: [PATCH 3083/3485] Updating readme file for ubuntu20 version 20240901.1.1 (#10532) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2004-Readme.md | 46 +++++++++++++++--------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/images/ubuntu/Ubuntu2004-Readme.md b/images/ubuntu/Ubuntu2004-Readme.md index a808d53a7fce..551e349487fa 100644 --- a/images/ubuntu/Ubuntu2004-Readme.md +++ b/images/ubuntu/Ubuntu2004-Readme.md @@ -1,12 +1,12 @@ | Announcements | |-| -| [[All OSes] Android NDK versions <=25 will be removed from images on August 19](https://github.com/actions/runner-images/issues/10342) | +| [[Ubuntu 20.04 and Ubuntu 22.04 Oses] Go 1.22.x will be set as default on September, 20](https://github.com/actions/runner-images/issues/10500) | | [Ubuntu 24.04 is now available](https://github.com/actions/runner-images/issues/9848) | *** # Ubuntu 20.04 - OS Version: 20.04.6 LTS - Kernel Version: 5.15.0-1071-azure -- Image Version: 20240825.1.0 +- Image Version: 20240901.1.0 - Systemd version: 245.4-4ubuntu3.23 ## Installed Software @@ -18,10 +18,10 @@ - Clang-tidy: 10.0.0, 11.0.0, 12.0.0 - Dash 0.5.10.2-6 - Erlang 25.3 (Eshell 13.2) -- Erlang rebar3 3.23.0 +- Erlang rebar3 3.24.0 - GNU C++: 10.5.0 - GNU Fortran: 10.5.0 -- Julia 1.10.4 +- Julia 1.10.5 - Kotlin 2.0.20-release-360 - Mono 6.12.0.200 - MSBuild 16.10.1.31701 (Mono 6.12.0.200) @@ -34,7 +34,7 @@ ### Package Management - cpan 1.64 - Helm 3.15.4 -- Homebrew 4.3.17 +- Homebrew 4.3.18 - Miniconda 24.7.1 - Npm 10.7.0 - NuGet 6.6.1.2 @@ -42,7 +42,7 @@ - Pip3 20.0.2 - Pipx 1.7.1 - RubyGems 3.1.2 -- Vcpkg (build from commit 350898514) +- Vcpkg (build from commit 0f88ecb85) - Yarn 1.22.22 #### Environment variables @@ -74,8 +74,8 @@ to accomplish this. - Bazelisk 1.19.0 - Bicep 0.29.47 - Buildah 1.22.3 -- CMake 3.30.2 -- CodeQL Action Bundle 2.18.2 +- CMake 3.30.3 +- CodeQL Action Bundle 2.18.3 - Docker Amazon ECR Credential Helper 0.8.0 - Docker Compose v2 2.27.1 - Docker-Buildx 0.16.2 @@ -86,7 +86,7 @@ to accomplish this. - Git LFS 3.5.1 - Git-ftp 1.6.0 - Haveged 1.9.1 -- Heroku 9.1.0 +- Heroku 9.2.0 - HHVM (HipHop VM) 4.172.1 - jq 1.6 - Kind 0.24.0 @@ -98,7 +98,7 @@ to accomplish this. - Minikube 1.33.1 - n 9.2.3 - Newman 6.2.1 -- nvm 0.40.0 +- nvm 0.40.1 - OpenSSL 1.1.1f-1ubuntu2.23 - Packer 1.11.2 - Parcel 2.12.0 @@ -116,17 +116,17 @@ to accomplish this. ### CLI Tools - Alibaba Cloud CLI 3.0.174 -- AWS CLI 2.17.37 +- AWS CLI 2.17.42 - AWS CLI Session Manager Plugin 1.2.650.0 - AWS SAM CLI 1.123.0 - Azure CLI 2.63.0 - Azure CLI (azure-devops) 1.0.1 - GitHub CLI 2.55.0 -- Google Cloud CLI 489.0.0 -- Netlify CLI 17.34.2 +- Google Cloud CLI 490.0.0 +- Netlify CLI 17.34.3 - OpenShift CLI 4.15.19 - ORAS CLI 1.2.0 -- Vercel CLI 37.1.1 +- Vercel CLI 37.2.1 ### Java | Version | Environment Variable | @@ -137,7 +137,7 @@ to accomplish this. | 21.0.4+7 | JAVA_HOME_21_X64 | ### PHP Tools -- PHP: 7.4.33, 8.0.30, 8.1.29, 8.2.22, 8.3.10 +- PHP: 7.4.33, 8.0.30, 8.1.29, 8.2.23, 8.3.11 - Composer 2.7.8 - PHPUnit 8.5.39 ``` @@ -165,12 +165,12 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 128.0.6613.84 -- ChromeDriver 128.0.6613.84 +- Google Chrome 128.0.6613.113 +- ChromeDriver 128.0.6613.86 - Chromium 128.0.6613.0 -- Microsoft Edge 128.0.2739.42 -- Microsoft Edge WebDriver 128.0.2739.38 -- Selenium server 4.23.1 +- Microsoft Edge 128.0.2739.54 +- Microsoft Edge WebDriver 128.0.2739.56 +- Selenium server 4.24.0 - Mozilla Firefox 129.0.2 - Geckodriver 0.35.0 @@ -184,7 +184,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ### .NET Tools - .NET Core SDK: 6.0.425, 7.0.410, 8.0.401 -- nbgv 3.6.141+d2035fb7be +- nbgv 3.6.143+57d4199a9c ### Databases - MongoDB 5.0.28 @@ -232,12 +232,12 @@ Use the following command as a part of your job to start the service: 'sudo syst - 3.12.5 #### PyPy -- 2.7.18 [PyPy 7.3.16] +- 2.7.18 [PyPy 7.3.17] - 3.6.12 [PyPy 7.3.3] - 3.7.13 [PyPy 7.3.9] - 3.8.16 [PyPy 7.3.11] - 3.9.19 [PyPy 7.3.16] -- 3.10.14 [PyPy 7.3.16] +- 3.10.14 [PyPy 7.3.17] #### Ruby - 3.0.7 From 2ff0f1047a65ca64abfe5cb6b6cc9a702f085f54 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 5 Sep 2024 07:26:54 +0000 Subject: [PATCH 3084/3485] Updating readme file for ubuntu22 version 20240901.1.1 (#10534) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2204-Readme.md | 44 +++++++++++++++--------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/images/ubuntu/Ubuntu2204-Readme.md b/images/ubuntu/Ubuntu2204-Readme.md index 8457a088ba84..7d8622fdb44e 100644 --- a/images/ubuntu/Ubuntu2204-Readme.md +++ b/images/ubuntu/Ubuntu2204-Readme.md @@ -1,12 +1,12 @@ | Announcements | |-| -| [[All OSes] Android NDK versions <=25 will be removed from images on August 19](https://github.com/actions/runner-images/issues/10342) | +| [[Ubuntu 20.04 and Ubuntu 22.04 Oses] Go 1.22.x will be set as default on September, 20](https://github.com/actions/runner-images/issues/10500) | | [Ubuntu 24.04 is now available](https://github.com/actions/runner-images/issues/9848) | *** # Ubuntu 22.04 - OS Version: 22.04.4 LTS - Kernel Version: 6.5.0-1025-azure -- Image Version: 20240825.1.0 +- Image Version: 20240901.1.0 - Systemd version: 249.11-0ubuntu3.12 ## Installed Software @@ -19,7 +19,7 @@ - Dash 0.5.11+git20210903+057cd650a4ed-3build1 - GNU C++: 10.5.0, 11.4.0, 12.3.0 - GNU Fortran: 10.5.0, 11.4.0, 12.3.0 -- Julia 1.10.4 +- Julia 1.10.5 - Kotlin 2.0.20-release-360 - Mono 6.12.0.200 - MSBuild 16.10.1.31701 (Mono 6.12.0.200) @@ -32,7 +32,7 @@ ### Package Management - cpan 1.64 - Helm 3.15.4 -- Homebrew 4.3.17 +- Homebrew 4.3.18 - Miniconda 24.7.1 - Npm 10.7.0 - NuGet 6.6.1.2 @@ -40,7 +40,7 @@ - Pip3 22.0.2 - Pipx 1.7.1 - RubyGems 3.3.5 -- Vcpkg (build from commit 350898514) +- Vcpkg (build from commit 0f88ecb85) - Yarn 1.22.22 #### Environment variables @@ -72,8 +72,8 @@ to accomplish this. - Bazelisk 1.19.0 - Bicep 0.29.47 - Buildah 1.23.1 -- CMake 3.30.2 -- CodeQL Action Bundle 2.18.2 +- CMake 3.30.3 +- CodeQL Action Bundle 2.18.3 - Docker Amazon ECR Credential Helper 0.8.0 - Docker Compose v2 2.27.1 - Docker-Buildx 0.16.2 @@ -84,7 +84,7 @@ to accomplish this. - Git LFS 3.5.1 - Git-ftp 1.6.0 - Haveged 1.9.14 -- Heroku 9.1.0 +- Heroku 9.2.0 - jq 1.6 - Kind 0.24.0 - Kubectl 1.31.0 @@ -95,7 +95,7 @@ to accomplish this. - Minikube 1.33.1 - n 9.2.3 - Newman 6.2.1 -- nvm 0.40.0 +- nvm 0.40.1 - OpenSSL 3.0.2-0ubuntu1.17 - Packer 1.11.2 - Parcel 2.12.0 @@ -111,18 +111,18 @@ to accomplish this. - zstd 1.5.6 ### CLI Tools -- Alibaba Cloud CLI 3.0.219 -- AWS CLI 2.17.37 +- Alibaba Cloud CLI 3.0.221 +- AWS CLI 2.17.42 - AWS CLI Session Manager Plugin 1.2.650.0 - AWS SAM CLI 1.123.0 - Azure CLI 2.63.0 - Azure CLI (azure-devops) 1.0.1 - GitHub CLI 2.55.0 -- Google Cloud CLI 489.0.0 -- Netlify CLI 17.34.2 -- OpenShift CLI 4.16.8 +- Google Cloud CLI 490.0.0 +- Netlify CLI 17.34.3 +- OpenShift CLI 4.16.9 - ORAS CLI 1.2.0 -- Vercel CLI 37.1.1 +- Vercel CLI 37.2.1 ### Java | Version | Environment Variable | @@ -161,12 +161,12 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 128.0.6613.84 -- ChromeDriver 128.0.6613.84 +- Google Chrome 128.0.6613.113 +- ChromeDriver 128.0.6613.86 - Chromium 128.0.6613.0 -- Microsoft Edge 128.0.2739.42 -- Microsoft Edge WebDriver 128.0.2739.38 -- Selenium server 4.23.1 +- Microsoft Edge 128.0.2739.54 +- Microsoft Edge WebDriver 128.0.2739.56 +- Selenium server 4.24.0 - Mozilla Firefox 129.0.2 - Geckodriver 0.35.0 @@ -180,7 +180,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ### .NET Tools - .NET Core SDK: 6.0.425, 7.0.410, 8.0.401 -- nbgv 3.6.141+d2035fb7be +- nbgv 3.6.143+57d4199a9c ### Databases - sqlite3 3.37.2 @@ -230,7 +230,7 @@ Use the following command as a part of your job to start the service: 'sudo syst - 3.7.13 [PyPy 7.3.9] - 3.8.16 [PyPy 7.3.11] - 3.9.19 [PyPy 7.3.16] -- 3.10.14 [PyPy 7.3.16] +- 3.10.14 [PyPy 7.3.17] #### Ruby - 3.1.6 From 2c7fe0021af6217532c6e11cdc35e9a5b2c8aacf Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 5 Sep 2024 08:32:52 +0000 Subject: [PATCH 3085/3485] Updating readme file for win22 version 20240902.1.1 (#10537) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/windows/Windows2022-Readme.md | 49 +++++++++++++--------------- 1 file changed, 22 insertions(+), 27 deletions(-) diff --git a/images/windows/Windows2022-Readme.md b/images/windows/Windows2022-Readme.md index e29b63f9fad0..97a34cd2421f 100644 --- a/images/windows/Windows2022-Readme.md +++ b/images/windows/Windows2022-Readme.md @@ -1,10 +1,6 @@ -| Announcements | -|-| -| [[All OSes] Android NDK versions <=25 will be removed from images on August 19](https://github.com/actions/runner-images/issues/10342) | -*** # Windows Server 2022 - OS Version: 10.0.20348 Build 2655 -- Image Version: 20240825.1.0 +- Image Version: 20240902.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -14,12 +10,12 @@ ### Language and Runtime - Bash 5.2.26(1)-release - Go 1.21.13 -- Julia 1.10.4 +- Julia 1.10.5 - Kotlin 2.0.20 - LLVM 18.1.8 - Node 18.20.3 - Perl 5.32.1 -- PHP 8.3.10 +- PHP 8.3.11 - Python 3.9.13 - Ruby 3.0.7p220 @@ -33,7 +29,7 @@ - pip 24.2 (python 3.9) - Pipx 1.7.1 - RubyGems 3.2.33 -- Vcpkg (build from commit 350898514) +- Vcpkg (build from commit 0f88ecb85) - Yarn 1.22.22 #### Environment variables @@ -56,15 +52,15 @@ - Bazelisk 1.19.0 - Bicep 0.29.47 - Cabal 3.12.1.0 -- CMake 3.30.2 -- CodeQL Action Bundle 2.18.2 +- CMake 3.30.3 +- CodeQL Action Bundle 2.18.3 - Docker 26.1.3 - Docker Compose v2 2.27.1 - Docker-wincred 0.8.2 - ghc 9.10.1 - Git 2.46.0.windows.1 - Git LFS 3.5.1 -- ImageMagick 7.1.1-36 +- ImageMagick 7.1.1-37 - InnoSetup 6.3.3 - jq 1.7.1 - Kind 0.24.0 @@ -90,8 +86,8 @@ - zstd 1.5.6 ### CLI Tools -- Alibaba Cloud CLI 3.0.219 -- AWS CLI 2.17.37 +- Alibaba Cloud CLI 3.0.221 +- AWS CLI 2.17.42 - AWS SAM CLI 1.123.0 - AWS Session Manager CLI 1.2.650.0 - Azure CLI 2.63.0 @@ -113,14 +109,14 @@ - Rustfmt 1.7.0 ### Browsers and Drivers -- Google Chrome 128.0.6613.85 -- Chrome Driver 128.0.6613.84 -- Microsoft Edge 128.0.2739.42 -- Microsoft Edge Driver 128.0.2739.42 +- Google Chrome 128.0.6613.114 +- Chrome Driver 128.0.6613.86 +- Microsoft Edge 128.0.2739.54 +- Microsoft Edge Driver 128.0.2739.54 - Mozilla Firefox 129.0.2 - Gecko Driver 0.35.0 - IE Driver 4.14.0.0 -- Selenium server 4.23.0 +- Selenium server 4.24.0 #### Environment variables | Name | Value | @@ -176,11 +172,11 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 3.12.5 #### PyPy -- 2.7.18 [PyPy 7.3.16] +- 2.7.18 [PyPy 7.3.17] - 3.7.13 [PyPy 7.3.9] - 3.8.16 [PyPy 7.3.11] - 3.9.19 [PyPy 7.3.16] -- 3.10.14 [PyPy 7.3.16] +- 3.10.14 [PyPy 7.3.17] #### Ruby - 3.0.7 @@ -207,7 +203,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | 5.0.28.0 | MongoDB | Stopped | Disabled | ### Database tools -- Azure CosmosDb Emulator 2.14.19.0 +- Azure CosmosDb Emulator 2.14.20.0 - DacFx 162.3.566.1 - MySQL 8.0.39.0 - SQL OLEDB Driver 18.7.4.0 @@ -222,7 +218,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Visual Studio Enterprise 2022 | Name | Version | Path | | ----------------------------- | --------------- | -------------------------------------------------------- | -| Visual Studio Enterprise 2022 | 17.11.35219.272 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | +| Visual Studio Enterprise 2022 | 17.11.35222.181 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | #### Workloads, components and extensions | Package | Version | @@ -249,7 +245,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Component.Unreal | 17.11.35102.94 | | Component.Unreal.Android | 17.11.35102.94 | | Component.Unreal.Ide | 17.11.35102.94 | -| Component.VisualStudio.GitHub.Copilot | 17.11.35215.114 | +| Component.VisualStudio.GitHub.Copilot | 17.11.35221.97 | | Component.VSInstallerProjects2022 | 2.0.1 | | Component.WixToolset.VisualStudioExtension.Dev17 | 1.0.0.22 | | Component.WixToolset.VisualStudioExtension.Schemas3 | 1.0.0.22 | @@ -492,7 +488,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Microsoft.AspNetCore.App: 6.0.5, 6.0.26, 6.0.32, 6.0.33, 7.0.5, 7.0.20, 8.0.8 - Microsoft.NETCore.App: 6.0.5, 6.0.26, 6.0.32, 6.0.33, 7.0.5, 7.0.20, 8.0.8 - Microsoft.WindowsDesktop.App: 6.0.5, 6.0.26, 6.0.33, 7.0.5, 7.0.20, 8.0.8 -- nbgv 3.6.141+d2035fb7be +- nbgv 3.6.143+57d4199a9c ### PowerShell Tools - PowerShell 7.4.5 @@ -503,7 +499,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - AzureRM: 2.1.0 (Default), 6.13.1 - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.642 +- AWSPowershell: 4.1.647 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.10 - Microsoft.Graph: 2.22.0 @@ -523,7 +519,7 @@ All other versions are saved but not installed. | Package Name | Version | | -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 8.0 | -| Android Emulator | 34.2.16 | +| Android Emulator | 35.1.20 | | Android SDK Build-tools | 35.0.0<br>34.0.0<br>33.0.0 33.0.1 33.0.2 33.0.3<br>32.0.0<br>31.0.0 | | Android SDK Platforms | android-35 (rev 1)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1) | | Android SDK Platform-Tools | 35.0.2 | @@ -551,4 +547,3 @@ All other versions are saved but not installed. | mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:b3f427a83d221958f6b2f3a49421e42d2fbd26e0d6afaed41cba7ee6fd4a4805 | 2024-08-13 | | mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:244113e50a678a25a63930780f9ccafd22e1a37aa9e3d93295e4cebf0f170a11 | 2024-08-10 | | mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:a57f79008ec0110877d5907787095c413fae1c27cccf1473bc9646fd7325febe | 2024-08-10 | - From a1f7f1a10a4c36abf43293085d57c06176c10e62 Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Thu, 5 Sep 2024 12:19:58 +0200 Subject: [PATCH 3086/3485] [macOS] Software report - Remove redundant info, fix bug with empty runtimes for Xcode (#10513) --- .../SoftwareReport.Nodes.psm1 | 2 +- .../docs-gen/SoftwareReport.Xcode.psm1 | 23 ++++++++----------- images/macos/toolsets/toolset-14.json | 2 +- 3 files changed, 11 insertions(+), 16 deletions(-) diff --git a/helpers/software-report-base/SoftwareReport.Nodes.psm1 b/helpers/software-report-base/SoftwareReport.Nodes.psm1 index 418909271474..b77e1c174b59 100644 --- a/helpers/software-report-base/SoftwareReport.Nodes.psm1 +++ b/helpers/software-report-base/SoftwareReport.Nodes.psm1 @@ -89,7 +89,7 @@ class HeaderNode: BaseNode { } [void] AddTable([PSCustomObject[]] $Table) { - $this.AddNode([TableNode]::FromObjectsArray($Table)) + $this.AddNode([TableNode]::FromObjectsArray($Table)) } [void] AddNote([String] $Content) { diff --git a/images/macos/scripts/docs-gen/SoftwareReport.Xcode.psm1 b/images/macos/scripts/docs-gen/SoftwareReport.Xcode.psm1 index cd03d81c41fd..3384acb8f12a 100644 --- a/images/macos/scripts/docs-gen/SoftwareReport.Xcode.psm1 +++ b/images/macos/scripts/docs-gen/SoftwareReport.Xcode.psm1 @@ -186,35 +186,30 @@ function Build-XcodeSimulatorsTable { $runtimes += $_ } } - $runtimes = $runtimes | Sort-Object @{ Expression = { $_.identifier } } -Unique - return $runtimes | ForEach-Object { $runtime = $_ $runtimeDevices = @() - $xcodeList = @() - $xcodeInfo.Values | ForEach-Object { $runtimeFound = $_.SimulatorsInfo.runtimes | Where-Object { $_.identifier -eq $runtime.identifier } | Select-Object -First 1 if ($runtimeFound) { $devicesToAdd = Build-XcodeDevicesList -XcodeInfo $_ -Runtime $runtimeFound $runtimeDevices += $devicesToAdd | Select-Object -ExpandProperty name - $xcodeList += $_.VersionInfo.Version } } - - $xcodeList = $xcodeList | Sort-Object $runtimeDevices = $runtimeDevices | ForEach-Object { Format-XcodeSimulatorName $_ } | Select-Object -Unique - $sortedRuntimeDevices = $runtimeDevices | Sort-Object @{ - Expression = { $_.Split(" ")[0] }; - Descending = $true; - }, { - $_.Split(" ") | Select-Object -Skip 1 | Join-String -Separator " " + If (($runtimeDevices | Where-Object { -not ([string]::IsNullOrWhitespace($_)) }).Count -eq 0) { + $sortedRuntimeDevices = @("N/A") + } else { + $sortedRuntimeDevices = $runtimeDevices | Sort-Object @{ + Expression = { $_.Split(" ")[0] }; + Descending = $true; + }, { + $_.Split(" ") | Select-Object -Skip 1 | Join-String -Separator " " + } } - return [PSCustomObject] @{ "OS" = $runtime.name - "Xcode Version" = [String]::Join("<br>", $xcodeList) "Simulators" = [String]::Join("<br>", $sortedRuntimeDevices) } } | Sort-Object { diff --git a/images/macos/toolsets/toolset-14.json b/images/macos/toolsets/toolset-14.json index a4ca9c5166e0..fdd3dda48330 100644 --- a/images/macos/toolsets/toolset-14.json +++ b/images/macos/toolsets/toolset-14.json @@ -4,7 +4,7 @@ "x64": { "versions": [ { "link": "16.1_beta", "version": "16.1.0-Beta+16B5001e", "symlinks": ["16.1"], "install_runtimes": "true", "sha256": "8848aacb32bdc0abbd7e14e4b712e07c98f4b6e5a23a8d77db03ab21dcb3c777"}, - { "link": "16_beta_6", "version": "16.0.0-Beta.6+16A5230g", "symlinks": ["16.0"], "install_runtimes": "false", "sha256": "ab0b9a4f6d723420ee0e39ff1cf6a628665dfe832053f66b6b72e013a6bbb244"}, + { "link": "16_beta_6", "version": "16.0.0-Beta.6+16A5230g", "symlinks": ["16.0"], "install_runtimes": "true", "sha256": "ab0b9a4f6d723420ee0e39ff1cf6a628665dfe832053f66b6b72e013a6bbb244"}, { "link": "15.4", "version": "15.4.0+15F31d", "install_runtimes": "true", "sha256": "82d3d61804ff3f4c7c82085e91dc701037ddaa770e542848b2477e22f4e8aa7a"}, { "link": "15.3", "version": "15.3.0+15E204a", "install_runtimes": "true", "sha256": "f13f6a2e2df432c3008e394640b8549a18c285acd7fd148d6c4bac8c3a5af234"}, { "link": "15.2", "version": "15.2.0+15C500b", "install_runtimes": "true", "sha256": "04E93680C6DDBEC84666531BE412DE778AFC8EAC6AB2037F4C2BE7290818B59B"}, From 14915191c7a6454ff641fb1093004216188a2533 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 5 Sep 2024 20:16:55 +0000 Subject: [PATCH 3087/3485] Updating readme file for macos-13 version 20240901.3 (#10541) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-13-Readme.md | 51 +++++++++++++++++++-------------- 1 file changed, 29 insertions(+), 22 deletions(-) diff --git a/images/macos/macos-13-Readme.md b/images/macos/macos-13-Readme.md index 7328bc8ca592..3358e2680bf9 100644 --- a/images/macos/macos-13-Readme.md +++ b/images/macos/macos-13-Readme.md @@ -1,7 +1,13 @@ +| Announcements | +|-| +| [[Macos] go version 1.20.0 will be removed on September 16,2024.](https://github.com/actions/runner-images/issues/10531) | +| [[Macos] Android NDK 24 will be removed on September 16,2024](https://github.com/actions/runner-images/issues/10530) | +| [[Macos-12] Python version 3.7 will be removed from the macos-12 image on September 16,2024](https://github.com/actions/runner-images/issues/10529) | +*** # macOS 13 - OS Version: macOS 13.6.9 (22G830) - Kernel Version: Darwin 22.6.0 -- Image Version: 20240825.1 +- Image Version: 20240901.3 ## Installed Software @@ -12,34 +18,34 @@ - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` - GCC 12 (Homebrew GCC 12.4.0) - available by `gcc-12` alias - GCC 13 (Homebrew GCC 13.3.0) - available by `gcc-13` alias -- GCC 14 (Homebrew GCC 14.1.0_2) - available by `gcc-14` alias +- GCC 14 (Homebrew GCC 14.2.0) - available by `gcc-14` alias - GNU Fortran 12 (Homebrew GCC 12.4.0) - available by `gfortran-12` alias - GNU Fortran 13 (Homebrew GCC 13.3.0) - available by `gfortran-13` alias -- GNU Fortran 14 (Homebrew GCC 14.1.0_2) - available by `gfortran-14` alias +- GNU Fortran 14 (Homebrew GCC 14.2.0) - available by `gfortran-14` alias - Kotlin 2.0.20-release-360 - Mono 6.12.0.188 - Node.js 20.17.0 - Perl 5.38.2 -- PHP 8.3.10 +- PHP 8.3.11 - Python3 3.12.5 - Ruby 3.0.7p220 ### Package Management -- Bundler 2.5.17 +- Bundler 2.5.18 - Carthage 0.39.1 - CocoaPods 1.15.2 - Composer 2.7.8 -- Homebrew 4.3.17 +- Homebrew 4.3.18 - NPM 10.8.2 - NuGet 6.3.1.1 - Pip3 24.2 (python 3.12) - Pipx 1.7.1 -- RubyGems 3.5.17 -- Vcpkg 2024 (build from commit 350898514) +- RubyGems 3.5.18 +- Vcpkg 2024 (build from commit 0f88ecb85) - Yarn 1.22.22 ### Project Management -- Apache Ant 1.10.14 +- Apache Ant 1.10.15 - Apache Maven 3.9.9 - Gradle 8.10 @@ -65,14 +71,14 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.17.37 +- AWS CLI 2.17.42 - AWS SAM CLI 1.123.0 - AWS Session Manager CLI 1.2.650.0 - Azure CLI 2.63.0 - Azure CLI (azure-devops) 1.0.1 - Bicep CLI 0.29.47 -- Cmake 3.30.2 -- CodeQL Action Bundle 2.18.2 +- Cmake 3.30.3 +- CodeQL Action Bundle 2.18.3 - Fastlane 2.222.0 - SwiftFormat 0.54.3 - Xcbeautify 2.11.0 @@ -85,14 +91,14 @@ ### Browsers - Safari 17.6 (18618.3.11.11.7) - SafariDriver 17.6 (18618.3.11.11.7) -- Google Chrome 128.0.6613.85 -- Google Chrome for Testing 128.0.6613.84 -- ChromeDriver 128.0.6613.84 -- Microsoft Edge 128.0.2739.42 -- Microsoft Edge WebDriver 128.0.2739.41 +- Google Chrome 128.0.6613.114 +- Google Chrome for Testing 128.0.6613.86 +- ChromeDriver 128.0.6613.86 +- Microsoft Edge 128.0.2739.54 +- Microsoft Edge WebDriver 128.0.2739.59 - Mozilla Firefox 129.0.2 - geckodriver 0.35.0 -- Selenium server 4.23.1 +- Selenium server 4.24.0 #### Environment variables | Name | Value | @@ -112,11 +118,11 @@ ### Cached Tools #### PyPy -- 2.7.18 [PyPy 7.3.16] +- 2.7.18 [PyPy 7.3.17] - 3.7.13 [PyPy 7.3.9] - 3.8.16 [PyPy 7.3.11] - 3.9.19 [PyPy 7.3.16] -- 3.10.14 [PyPy 7.3.16] +- 3.10.14 [PyPy 7.3.17] #### Ruby - 3.0.7 @@ -204,8 +210,8 @@ | Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | | visionOS 1.0 | xros1.0 | 15.2 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | -| Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | +| Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | | DriverKit 22.1 | driverkit22.1 | 14.1 | | DriverKit 22.2 | driverkit22.2 | 14.2 | | DriverKit 22.4 | driverkit22.4 | 14.3.1 | @@ -233,7 +239,7 @@ | Package Name | Version | | -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 11.0 | -| Android Emulator | 34.2.16 | +| Android Emulator | 35.1.20 | | Android SDK Build-tools | 35.0.0<br>34.0.0<br>33.0.2 33.0.3 | | Android SDK Platforms | android-35 (rev 1)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | | Android SDK Platform-Tools | 35.0.2 | @@ -265,3 +271,4 @@ If you want to use Parallels Desktop you should download a package from URL stored in PARALLELS_DMG_URL environment variable. A system extension is allowed for this version. ``` + From 31e868eebed20c685d6fa38393d42b80ea10328b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 5 Sep 2024 20:53:24 +0000 Subject: [PATCH 3088/3485] Updating readme file for macos-14 version 20240902.6 (#10543) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-14-Readme.md | 37 ++++++++++++++++++++------------- 1 file changed, 22 insertions(+), 15 deletions(-) diff --git a/images/macos/macos-14-Readme.md b/images/macos/macos-14-Readme.md index 4b25ba9cf136..a62610089513 100644 --- a/images/macos/macos-14-Readme.md +++ b/images/macos/macos-14-Readme.md @@ -1,7 +1,13 @@ +| Announcements | +|-| +| [[Macos] go version 1.20.0 will be removed on September 16,2024.](https://github.com/actions/runner-images/issues/10531) | +| [[Macos] Android NDK 24 will be removed on September 16,2024](https://github.com/actions/runner-images/issues/10530) | +| [[Macos-12] Python version 3.7 will be removed from the macos-12 image on September 16,2024](https://github.com/actions/runner-images/issues/10529) | +*** # macOS 14 - OS Version: macOS 14.6.1 (23G93) - Kernel Version: Darwin 23.6.0 -- Image Version: 20240827.1 +- Image Version: 20240902.6 ## Installed Software @@ -20,7 +26,7 @@ - Mono 6.12.0.188 - Node.js 20.17.0 - Perl 5.38.2 -- PHP 8.3.10 +- PHP 8.3.11 - Python3 3.12.5 - Ruby 3.0.7p220 @@ -29,7 +35,7 @@ - Carthage 0.39.1 - CocoaPods 1.15.2 - Composer 2.7.8 -- Homebrew 4.3.18 +- Homebrew 4.3.19 - NPM 10.8.2 - NuGet 6.3.1.1 - Pip3 24.2 (python 3.12) @@ -38,7 +44,7 @@ - Yarn 1.22.22 ### Project Management -- Apache Ant 1.10.14 +- Apache Ant 1.10.15 - Apache Maven 3.9.9 - Gradle 8.10 @@ -64,14 +70,14 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.17.38 +- AWS CLI 2.17.42 - AWS SAM CLI 1.123.0 - AWS Session Manager CLI 1.2.650.0 - Azure CLI 2.63.0 - Azure CLI (azure-devops) 1.0.1 - Bicep CLI 0.29.47 -- Cmake 3.30.2 -- CodeQL Action Bundle 2.18.2 +- Cmake 3.30.3 +- CodeQL Action Bundle 2.18.3 - Fastlane 2.222.0 - SwiftFormat 0.54.3 - Xcbeautify 2.11.0 @@ -84,14 +90,14 @@ ### Browsers - Safari 17.6 (19618.3.11.11.5) - SafariDriver 17.6 (19618.3.11.11.5) -- Google Chrome 128.0.6613.85 -- Google Chrome for Testing 128.0.6613.84 -- ChromeDriver 128.0.6613.84 -- Microsoft Edge 128.0.2739.42 -- Microsoft Edge WebDriver 128.0.2739.41 +- Google Chrome 128.0.6613.120 +- Google Chrome for Testing 128.0.6613.119 +- ChromeDriver 128.0.6613.119 +- Microsoft Edge 128.0.2739.54 +- Microsoft Edge WebDriver 128.0.2739.59 - Mozilla Firefox 129.0.2 - geckodriver 0.35.0 -- Selenium server 4.23.1 +- Selenium server 4.24.0 #### Environment variables | Name | Value | @@ -213,8 +219,8 @@ | Simulator - visionOS 1.1 | xrsimulator1.1 | 15.3 | | Simulator - visionOS 1.2 | xrsimulator1.2 | 15.4 | | visionOS 1.2 | xros1.2 | 15.4 | -| Simulator - visionOS 2.0 | xrsimulator2.0 | 16.0, 16.1 | | visionOS 2.0 | xros2.0 | 16.0, 16.1 | +| Simulator - visionOS 2.0 | xrsimulator2.0 | 16.0, 16.1 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | @@ -252,7 +258,7 @@ | Package Name | Version | | -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 11.0 | -| Android Emulator | 34.2.16 | +| Android Emulator | 35.1.20 | | Android SDK Build-tools | 35.0.0<br>34.0.0<br>33.0.2 33.0.3 | | Android SDK Platforms | android-35 (rev 1)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | | Android SDK Platform-Tools | 35.0.2 | @@ -284,3 +290,4 @@ If you want to use Parallels Desktop you should download a package from URL stored in PARALLELS_DMG_URL environment variable. A system extension is allowed for this version. ``` + From 49d5ab642207da5842606cc874e24660dfeed9e3 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 5 Sep 2024 21:04:18 +0000 Subject: [PATCH 3089/3485] Updating readme file for macos-13-arm64 version 20240901.2 (#10542) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-13-arm64-Readme.md | 33 ++++++++++++++++----------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/images/macos/macos-13-arm64-Readme.md b/images/macos/macos-13-arm64-Readme.md index 580b52701784..532d4e659e4c 100644 --- a/images/macos/macos-13-arm64-Readme.md +++ b/images/macos/macos-13-arm64-Readme.md @@ -1,7 +1,13 @@ +| Announcements | +|-| +| [[Macos] go version 1.20.0 will be removed on September 16,2024.](https://github.com/actions/runner-images/issues/10531) | +| [[Macos] Android NDK 24 will be removed on September 16,2024](https://github.com/actions/runner-images/issues/10530) | +| [[Macos-12] Python version 3.7 will be removed from the macos-12 image on September 16,2024](https://github.com/actions/runner-images/issues/10529) | +*** # macOS 13 - OS Version: macOS 13.6.9 (22G830) - Kernel Version: Darwin 22.6.0 -- Image Version: 20240826.1 +- Image Version: 20240901.2 ## Installed Software @@ -24,19 +30,19 @@ - Ruby 3.0.7p220 ### Package Management -- Bundler 2.5.17 +- Bundler 2.5.18 - Carthage 0.39.1 - CocoaPods 1.15.2 -- Homebrew 4.3.17 +- Homebrew 4.3.18 - NPM 10.8.2 - NuGet 6.3.1.1 - Pip3 24.2 (python 3.12) - Pipx 1.7.1 -- RubyGems 3.5.17 +- RubyGems 3.5.18 - Yarn 1.22.22 ### Project Management -- Apache Ant 1.10.14 +- Apache Ant 1.10.15 - Apache Maven 3.9.9 - Gradle 8.10 @@ -62,14 +68,14 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.17.37 +- AWS CLI 2.17.42 - AWS SAM CLI 1.123.0 - AWS Session Manager CLI 1.2.650.0 - Azure CLI 2.63.0 - Azure CLI (azure-devops) 1.0.1 - Bicep CLI 0.29.47 -- Cmake 3.30.2 -- CodeQL Action Bundle 2.18.2 +- Cmake 3.30.3 +- CodeQL Action Bundle 2.18.3 - Fastlane 2.222.0 - SwiftFormat 0.54.3 - Xcbeautify 2.11.0 @@ -81,10 +87,10 @@ ### Browsers - Safari 17.6 (18618.3.11.11.7) - SafariDriver 17.6 (18618.3.11.11.7) -- Google Chrome 128.0.6613.85 -- Google Chrome for Testing 128.0.6613.84 -- ChromeDriver 128.0.6613.84 -- Selenium server 4.23.1 +- Google Chrome 128.0.6613.114 +- Google Chrome for Testing 128.0.6613.86 +- ChromeDriver 128.0.6613.86 +- Selenium server 4.24.0 #### Environment variables | Name | Value | @@ -213,7 +219,7 @@ | Package Name | Version | | -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 11.0 | -| Android Emulator | 34.2.16 | +| Android Emulator | 35.1.20 | | Android SDK Build-tools | 35.0.0<br>34.0.0<br>33.0.2 33.0.3 | | Android SDK Platforms | android-35 (rev 1)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | | Android SDK Platform-Tools | 35.0.2 | @@ -232,3 +238,4 @@ | ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/26.3.11579264 | | ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk/26.3.11579264 | | ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | + From 74ebd601015b0125def73c78be4616a902bef681 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 6 Sep 2024 07:07:41 +0000 Subject: [PATCH 3090/3485] Updating readme file for macos-12 version 20240901.2 (#10548) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-12-Readme.md | 57 ++++++++++++++++++--------------- 1 file changed, 32 insertions(+), 25 deletions(-) diff --git a/images/macos/macos-12-Readme.md b/images/macos/macos-12-Readme.md index ad26fb44bfd3..42c7df9ff8cf 100644 --- a/images/macos/macos-12-Readme.md +++ b/images/macos/macos-12-Readme.md @@ -1,7 +1,13 @@ +| Announcements | +|-| +| [[Macos] go version 1.20.0 will be removed on September 16,2024.](https://github.com/actions/runner-images/issues/10531) | +| [[Macos] Android NDK 24 will be removed on September 16,2024](https://github.com/actions/runner-images/issues/10530) | +| [[Macos-12] Python version 3.7 will be removed from the macos-12 image on September 16,2024](https://github.com/actions/runner-images/issues/10529) | +*** # macOS 12 - OS Version: macOS 12.7.6 (21H1320) - Kernel Version: Darwin 21.6.0 -- Image Version: 20240825.1 +- Image Version: 20240901.2 ## Installed Software @@ -12,11 +18,11 @@ - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` - GCC 12 (Homebrew GCC 12.4.0) - available by `gcc-12` alias - GCC 13 (Homebrew GCC 13.3.0) - available by `gcc-13` alias -- GCC 14 (Homebrew GCC 14.1.0_2) - available by `gcc-14` alias +- GCC 14 (Homebrew GCC 14.2.0) - available by `gcc-14` alias - GNU Fortran 12 (Homebrew GCC 12.4.0) - available by `gfortran-12` alias - GNU Fortran 13 (Homebrew GCC 13.3.0) - available by `gfortran-13` alias -- GNU Fortran 14 (Homebrew GCC 14.1.0_2) - available by `gfortran-14` alias -- Julia 1.10.4 +- GNU Fortran 14 (Homebrew GCC 14.2.0) - available by `gfortran-14` alias +- Julia 1.10.5 - Kotlin 2.0.20-release-360 - Go 1.21.13 - Mono 6.12.0.188 @@ -25,26 +31,26 @@ - NVM 0.39.7 - NVM - Cached node versions: 16.20.2, 18.20.4, 20.17.0 - Perl 5.38.2 -- PHP 8.3.10 +- PHP 8.3.11 - Python 2.7.18 - Python3 3.12.5 - R 4.4.1 - Ruby 3.0.7p220 ### Package Management -- Bundler 2.5.17 +- Bundler 2.5.18 - Carthage 0.39.1 - CocoaPods 1.15.2 - Composer 2.7.8 -- Homebrew 4.3.17 +- Homebrew 4.3.18 - Miniconda 24.7.1 - NPM 10.7.0 - NuGet 6.3.1.1 - Pip 20.3.4 (python 2.7) - Pip3 24.2 (python 3.12) - Pipx 1.7.1 -- RubyGems 3.5.17 -- Vcpkg 2024 (build from commit 350898514) +- RubyGems 3.5.18 +- Vcpkg 2024 (build from commit 0f88ecb85) - Yarn 1.22.22 #### Environment variables @@ -54,7 +60,7 @@ | VCPKG_INSTALLATION_ROOT | /usr/local/share/vcpkg | ### Project Management -- Apache Ant 1.10.14 +- Apache Ant 1.10.15 - Apache Maven 3.9.9 - Gradle 8.10 - Sbt 1.10.1 @@ -75,8 +81,8 @@ - gpg (GnuPG) 2.4.5 - ImageMagick 7.1.1-37 - jq 1.7.1 -- mongo 5.0.28 -- mongod 5.0.28 +- mongo 5.0.29 +- mongod 5.0.29 - OpenSSL 1.1.1w 11 Sep 2023 - Packer 1.9.4 - pkg-config 0.29.2 @@ -92,16 +98,16 @@ ### Tools - App Center CLI 3.0.1 -- AWS CLI 2.17.37 +- AWS CLI 2.17.42 - AWS SAM CLI 1.123.0 - AWS Session Manager CLI 1.2.650.0 - Azure CLI 2.63.0 - Azure CLI (azure-devops) 1.0.1 - Bicep CLI 0.29.47 - Cabal 3.10.3.0 -- Cmake 3.30.2 -- CodeQL Action Bundle 2.18.2 -- Colima 0.7.4 +- Cmake 3.30.3 +- CodeQL Action Bundle 2.18.3 +- Colima 0.7.5 - Fastlane 2.222.0 - GHC 9.10.1 - GHCup 0.1.30.0 @@ -120,14 +126,14 @@ ### Browsers - Safari 17.6 (17618.3.11.11.7) - SafariDriver 17.6 (17618.3.11.11.7) -- Google Chrome 128.0.6613.85 -- Google Chrome for Testing 128.0.6613.84 -- ChromeDriver 128.0.6613.84 -- Microsoft Edge 128.0.2739.42 -- Microsoft Edge WebDriver 128.0.2739.41 +- Google Chrome 128.0.6613.114 +- Google Chrome for Testing 128.0.6613.86 +- ChromeDriver 128.0.6613.86 +- Microsoft Edge 128.0.2739.54 +- Microsoft Edge WebDriver 128.0.2739.59 - Mozilla Firefox 129.0.2 - geckodriver 0.35.0 -- Selenium server 4.23.1 +- Selenium server 4.24.0 #### Environment variables | Name | Value | @@ -147,11 +153,11 @@ ### Cached Tools #### PyPy -- 2.7.18 [PyPy 7.3.16] +- 2.7.18 [PyPy 7.3.17] - 3.7.13 [PyPy 7.3.9] - 3.8.16 [PyPy 7.3.11] - 3.9.19 [PyPy 7.3.16] -- 3.10.14 [PyPy 7.3.16] +- 3.10.14 [PyPy 7.3.17] #### Ruby - 3.0.7 @@ -330,7 +336,7 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" | Package Name | Version | | -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 8.0 | -| Android Emulator | 34.2.16 | +| Android Emulator | 35.1.20 | | Android SDK Build-tools | 35.0.0<br>34.0.0<br>33.0.0 33.0.1 33.0.2 33.0.3<br>32.0.0<br>31.0.0 | | Android SDK Platforms | android-35 (rev 1)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1) | | Android SDK Platform-Tools | 35.0.2 | @@ -366,3 +372,4 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" If you want to use Parallels Desktop you should download a package from URL stored in PARALLELS_DMG_URL environment variable. A system extension is allowed for this version. ``` + From 8cdc506384655ceaaa62d3f800e15b844e06bea4 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 6 Sep 2024 15:25:58 +0000 Subject: [PATCH 3091/3485] Updating readme file for macos-14-arm64 version 20240903.5 (#10551) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-14-arm64-Readme.md | 37 ++++++++++++++++----------- 1 file changed, 22 insertions(+), 15 deletions(-) diff --git a/images/macos/macos-14-arm64-Readme.md b/images/macos/macos-14-arm64-Readme.md index cf2713b7b666..273b896f4cf2 100644 --- a/images/macos/macos-14-arm64-Readme.md +++ b/images/macos/macos-14-arm64-Readme.md @@ -1,7 +1,13 @@ +| Announcements | +|-| +| [[Macos] go version 1.20.0 will be removed on September 16,2024.](https://github.com/actions/runner-images/issues/10531) | +| [[Macos] Android NDK 24 will be removed on September 16,2024](https://github.com/actions/runner-images/issues/10530) | +| [[Macos-12] Python version 3.7 will be removed from the macos-12 image on September 16,2024](https://github.com/actions/runner-images/issues/10529) | +*** # macOS 14 - OS Version: macOS 14.6.1 (23G93) - Kernel Version: Darwin 23.6.0 -- Image Version: 20240827.4 +- Image Version: 20240903.5 ## Installed Software @@ -27,7 +33,7 @@ - Bundler 2.5.18 - Carthage 0.39.1 - CocoaPods 1.15.2 -- Homebrew 4.3.18 +- Homebrew 4.3.19 - NPM 10.8.2 - NuGet 6.3.1.1 - Pip3 24.2 (python 3.12) @@ -36,7 +42,7 @@ - Yarn 1.22.22 ### Project Management -- Apache Ant 1.10.14 +- Apache Ant 1.10.15 - Apache Maven 3.9.9 - Gradle 8.10 @@ -62,14 +68,14 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.17.38 +- AWS CLI 2.17.42 - AWS SAM CLI 1.123.0 - AWS Session Manager CLI 1.2.650.0 -- Azure CLI 2.63.0 +- Azure CLI 2.64.0 - Azure CLI (azure-devops) 1.0.1 - Bicep CLI 0.29.47 -- Cmake 3.30.2 -- CodeQL Action Bundle 2.18.2 +- Cmake 3.30.3 +- CodeQL Action Bundle 2.18.3 - Fastlane 2.222.0 - SwiftFormat 0.54.3 - Xcbeautify 2.11.0 @@ -81,10 +87,10 @@ ### Browsers - Safari 17.6 (19618.3.11.11.5) - SafariDriver 17.6 (19618.3.11.11.5) -- Google Chrome 128.0.6613.85 -- Google Chrome for Testing 128.0.6613.84 -- ChromeDriver 128.0.6613.84 -- Selenium server 4.23.1 +- Google Chrome 128.0.6613.120 +- Google Chrome for Testing 128.0.6613.119 +- ChromeDriver 128.0.6613.119 +- Selenium server 4.24.0 #### Environment variables | Name | Value | @@ -131,7 +137,7 @@ - PowerShell 7.4.5 #### PowerShell Modules -- Az: 12.2.0 +- Az: 12.3.0 - Pester: 5.6.1 - PSScriptAnalyzer: 1.22.0 @@ -201,11 +207,11 @@ | Simulator - visionOS 1.1 | xrsimulator1.1 | 15.3 | | Simulator - visionOS 1.2 | xrsimulator1.2 | 15.4 | | visionOS 1.2 | xros1.2 | 15.4 | -| visionOS 2.0 | xros2.0 | 16.0, 16.1 | | Simulator - visionOS 2.0 | xrsimulator2.0 | 16.0, 16.1 | +| visionOS 2.0 | xros2.0 | 16.0, 16.1 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | -| Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | +| Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | | DriverKit 22.4 | driverkit22.4 | 14.3.1 | | DriverKit 23.0 | driverkit23.0 | 15.0.1 | | DriverKit 23.2 | driverkit23.2 | 15.1, 15.2 | @@ -245,7 +251,7 @@ | Package Name | Version | | -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 11.0 | -| Android Emulator | 34.2.16 | +| Android Emulator | 35.1.20 | | Android SDK Build-tools | 35.0.0<br>34.0.0<br>33.0.2 33.0.3 | | Android SDK Platforms | android-35 (rev 1)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | | Android SDK Platform-Tools | 35.0.2 | @@ -264,3 +270,4 @@ | ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/26.3.11579264 | | ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk/26.3.11579264 | | ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | + From e01c839141664a19cd59e479a41b65be7cabe36b Mon Sep 17 00:00:00 2001 From: RaviAkshintala <167848931+RaviAkshintala@users.noreply.github.com> Date: Tue, 10 Sep 2024 16:45:51 +0530 Subject: [PATCH 3092/3485] go version 1.20 removed and 1.23 added (#10580) Co-authored-by: Ravi Akshintala <raviakshintalagithub.com@Ravis-Laptop.local> --- images/ubuntu/toolsets/toolset-2404.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/images/ubuntu/toolsets/toolset-2404.json b/images/ubuntu/toolsets/toolset-2404.json index e3a11333e598..683a243e218d 100644 --- a/images/ubuntu/toolsets/toolset-2404.json +++ b/images/ubuntu/toolsets/toolset-2404.json @@ -39,11 +39,11 @@ "arch": "x64", "platform" : "linux", "versions": [ - "1.20.*", "1.21.*", - "1.22.*" + "1.22.*", + "1.23.*" ], - "default": "1.22.*" + "default": "1.23.*" }, { "name": "Ruby", From 27738cad721069eb109976f6db41abdd9c4c7654 Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Tue, 10 Sep 2024 13:42:16 +0200 Subject: [PATCH 3093/3485] [macOS] Update Xcode 16.0 to RC1 on macOS-14 (#10584) --- images/macos/toolsets/toolset-14.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/macos/toolsets/toolset-14.json b/images/macos/toolsets/toolset-14.json index fdd3dda48330..8b9b5842977c 100644 --- a/images/macos/toolsets/toolset-14.json +++ b/images/macos/toolsets/toolset-14.json @@ -4,7 +4,7 @@ "x64": { "versions": [ { "link": "16.1_beta", "version": "16.1.0-Beta+16B5001e", "symlinks": ["16.1"], "install_runtimes": "true", "sha256": "8848aacb32bdc0abbd7e14e4b712e07c98f4b6e5a23a8d77db03ab21dcb3c777"}, - { "link": "16_beta_6", "version": "16.0.0-Beta.6+16A5230g", "symlinks": ["16.0"], "install_runtimes": "true", "sha256": "ab0b9a4f6d723420ee0e39ff1cf6a628665dfe832053f66b6b72e013a6bbb244"}, + { "link": "16_Release_Candidate", "version": "16.0.0-Release.Candidate+16A242", "symlinks": ["16.0"], "install_runtimes": "true", "sha256": "84588e4d781307191892add603ea51504955de39e05c270a88833a38a929825d"}, { "link": "15.4", "version": "15.4.0+15F31d", "install_runtimes": "true", "sha256": "82d3d61804ff3f4c7c82085e91dc701037ddaa770e542848b2477e22f4e8aa7a"}, { "link": "15.3", "version": "15.3.0+15E204a", "install_runtimes": "true", "sha256": "f13f6a2e2df432c3008e394640b8549a18c285acd7fd148d6c4bac8c3a5af234"}, { "link": "15.2", "version": "15.2.0+15C500b", "install_runtimes": "true", "sha256": "04E93680C6DDBEC84666531BE412DE778AFC8EAC6AB2037F4C2BE7290818B59B"}, @@ -16,7 +16,7 @@ "arm64":{ "versions": [ { "link": "16.1_beta", "version": "16.1.0-Beta+16B5001e", "symlinks": ["16.1"], "install_runtimes": "true", "sha256": "8848aacb32bdc0abbd7e14e4b712e07c98f4b6e5a23a8d77db03ab21dcb3c777"}, - { "link": "16_beta_6", "version": "16.0.0-Beta.6+16A5230g", "symlinks": ["16.0"], "install_runtimes": "true", "sha256": "ab0b9a4f6d723420ee0e39ff1cf6a628665dfe832053f66b6b72e013a6bbb244"}, + { "link": "16_Release_Candidate", "version": "16.0.0-Release.Candidate+16A242", "symlinks": ["16.0"], "install_runtimes": "true", "sha256": "84588e4d781307191892add603ea51504955de39e05c270a88833a38a929825d"}, { "link": "15.4", "version": "15.4.0+15F31d", "install_runtimes": "true", "sha256": "82d3d61804ff3f4c7c82085e91dc701037ddaa770e542848b2477e22f4e8aa7a"}, { "link": "15.3", "version": "15.3.0+15E204a", "install_runtimes": "true", "sha256": "f13f6a2e2df432c3008e394640b8549a18c285acd7fd148d6c4bac8c3a5af234"}, { "link": "15.2", "version": "15.2.0+15C500b", "install_runtimes": "true", "sha256": "04E93680C6DDBEC84666531BE412DE778AFC8EAC6AB2037F4C2BE7290818B59B"}, From c7adf5d533a9ee2cbe4ec1e954b5b73abff6e9a3 Mon Sep 17 00:00:00 2001 From: kishorekumar-anchala <168699259+kishorekumar-anchala@users.noreply.github.com> Date: Tue, 10 Sep 2024 21:23:10 +0530 Subject: [PATCH 3094/3485] add swift version to ubuntu 24 (#10578) --- images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 | 5 ++--- images/ubuntu/scripts/tests/Common.Tests.ps1 | 2 +- images/ubuntu/templates/ubuntu-24.04.pkr.hcl | 1 + 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 b/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 index df241051a6ec..f4ca60b70e5a 100644 --- a/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 +++ b/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 @@ -57,9 +57,8 @@ $languageAndRuntime.AddToolVersion("Node.js", $(Get-NodeVersion)) $languageAndRuntime.AddToolVersion("Perl", $(Get-PerlVersion)) $languageAndRuntime.AddToolVersion("Python", $(Get-PythonVersion)) $languageAndRuntime.AddToolVersion("Ruby", $(Get-RubyVersion)) -if ((Test-IsUbuntu20) -or (Test-IsUbuntu22)) { - $languageAndRuntime.AddToolVersion("Swift", $(Get-SwiftVersion)) -} +$languageAndRuntime.AddToolVersion("Swift", $(Get-SwiftVersion)) + # Package Management $packageManagement = $installedSoftware.AddHeader("Package Management") diff --git a/images/ubuntu/scripts/tests/Common.Tests.ps1 b/images/ubuntu/scripts/tests/Common.Tests.ps1 index 73a8ab2eee8c..38eaeb2b98a8 100644 --- a/images/ubuntu/scripts/tests/Common.Tests.ps1 +++ b/images/ubuntu/scripts/tests/Common.Tests.ps1 @@ -24,7 +24,7 @@ Describe "PHP" { } } -Describe "Swift" -Skip:((-not (Test-IsUbuntu20)) -and (-not (Test-IsUbuntu22))) { +Describe "Swift" { It "swift" { "swift --version" | Should -ReturnZeroExitCode } diff --git a/images/ubuntu/templates/ubuntu-24.04.pkr.hcl b/images/ubuntu/templates/ubuntu-24.04.pkr.hcl index 76971e3cf70d..5fe65f4fbadc 100644 --- a/images/ubuntu/templates/ubuntu-24.04.pkr.hcl +++ b/images/ubuntu/templates/ubuntu-24.04.pkr.hcl @@ -284,6 +284,7 @@ provisioner "shell" { "${path.root}/../scripts/build/install-apache.sh", "${path.root}/../scripts/build/install-aws-tools.sh", "${path.root}/../scripts/build/install-clang.sh", + "${path.root}/../scripts/build/install-swift.sh", "${path.root}/../scripts/build/install-cmake.sh", "${path.root}/../scripts/build/install-codeql-bundle.sh", "${path.root}/../scripts/build/install-container-tools.sh", From 5e9605c7dcd535ac0448dff3128192fee9f3ba9f Mon Sep 17 00:00:00 2001 From: kishorekumar-anchala <168699259+kishorekumar-anchala@users.noreply.github.com> Date: Wed, 11 Sep 2024 17:50:40 +0530 Subject: [PATCH 3095/3485] Fix vs signature issue (#10593) --- images/windows/scripts/helpers/VisualStudioHelpers.ps1 | 2 +- images/windows/toolsets/toolset-2019.json | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/images/windows/scripts/helpers/VisualStudioHelpers.ps1 b/images/windows/scripts/helpers/VisualStudioHelpers.ps1 index eb45536316e1..da7b3da5566a 100644 --- a/images/windows/scripts/helpers/VisualStudioHelpers.ps1 +++ b/images/windows/scripts/helpers/VisualStudioHelpers.ps1 @@ -29,7 +29,7 @@ Function Install-VisualStudio { [Parameter(Mandatory)] [String] $Channel, [Parameter(Mandatory)] [String[]] $RequiredComponents, [String] $ExtraArgs = "", - [Parameter(Mandatory)] [String] $SignatureThumbprint + [Parameter(Mandatory)] [String[]] $SignatureThumbprint ) $bootstrapperUrl = "https://aka.ms/vs/${Version}/${Channel}/vs_${Edition}.exe" diff --git a/images/windows/toolsets/toolset-2019.json b/images/windows/toolsets/toolset-2019.json index ff58fa005d97..553d8a18d855 100644 --- a/images/windows/toolsets/toolset-2019.json +++ b/images/windows/toolsets/toolset-2019.json @@ -247,7 +247,9 @@ "subversion" : "16", "edition" : "Enterprise", "channel": "release", - "signature": "F9A7CF9FBE13BAC767F4781061332DA6E8B4E0EE", + "signature": ["F9A7CF9FBE13BAC767F4781061332DA6E8B4E0EE", + "C2048FB509F1C37A8C3E9EC6648118458AA01780" + ], "workloads": [ "Component.Dotfuscator", "Component.Linux.CMake", From 72f6dfe786ebc5caaa680aa6fe3fa17782545cfd Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Wed, 11 Sep 2024 16:17:52 +0200 Subject: [PATCH 3096/3485] [macOS] Increase base disk size by 25 GB (#10594) --- images.CI/macos/anka/CreateCleanAnkaTemplate.ps1 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/images.CI/macos/anka/CreateCleanAnkaTemplate.ps1 b/images.CI/macos/anka/CreateCleanAnkaTemplate.ps1 index bcf0246f49be..0c817fb6f572 100644 --- a/images.CI/macos/anka/CreateCleanAnkaTemplate.ps1 +++ b/images.CI/macos/anka/CreateCleanAnkaTemplate.ps1 @@ -25,7 +25,7 @@ param( [bool] $EnableAutoLogon = $true, [int] $CPUCount = 6, [int] $RamSizeGb = 7, - [int] $DiskSizeGb = 300, + [int] $DiskSizeGb = 325, [string] $DisplayResolution = "1920x1080", [string] $TagName = [DateTimeOffset]::Now.ToUnixTimeSeconds(), [string] $Uuid = "4203018E-580F-C1B5-9525-B745CECA79EB" @@ -175,10 +175,10 @@ if ([string]::IsNullOrEmpty($TemplateName)) { $osArch = $(arch) if ($osArch -eq "arm64") { $macOSInstaller = Get-MacOSIPSWInstaller -MacOSVersion $MacOSVersion -DownloadLatestVersion $DownloadLatestVersion -BetaSearch $BetaSearch - $TemplateName = "clean_macos_${shortMacOSVersion}_${osArch}_${DiskSizeGb}gb" + $TemplateName = "clean_macos_${shortMacOSVersion}_${osArch}" } else { $macOSInstaller = Get-MacOSInstaller -MacOSVersion $MacOSVersion -DownloadLatestVersion $DownloadLatestVersion -BetaSearch $BetaSearch - $TemplateName = "clean_macos_${shortMacOSVersion}_${DiskSizeGb}gb" + $TemplateName = "clean_macos_${shortMacOSVersion}" } } From ff9acc64011a3453c634ccfd271cae45a6c5a175 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2024 14:29:02 +0000 Subject: [PATCH 3097/3485] Updating readme file for macos-14 version 20240908.1 (#10576) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-14-Readme.md | 78 +++++++++++++++++---------------- 1 file changed, 40 insertions(+), 38 deletions(-) diff --git a/images/macos/macos-14-Readme.md b/images/macos/macos-14-Readme.md index a62610089513..391f84224bad 100644 --- a/images/macos/macos-14-Readme.md +++ b/images/macos/macos-14-Readme.md @@ -1,5 +1,6 @@ | Announcements | |-| +| [[macOS] Xcodes visionOS platform will be removed from macOS-14 images on September 23, 2024](https://github.com/actions/runner-images/issues/10559) | | [[Macos] go version 1.20.0 will be removed on September 16,2024.](https://github.com/actions/runner-images/issues/10531) | | [[Macos] Android NDK 24 will be removed on September 16,2024](https://github.com/actions/runner-images/issues/10530) | | [[Macos-12] Python version 3.7 will be removed from the macos-12 image on September 16,2024](https://github.com/actions/runner-images/issues/10529) | @@ -7,7 +8,7 @@ # macOS 14 - OS Version: macOS 14.6.1 (23G93) - Kernel Version: Darwin 23.6.0 -- Image Version: 20240902.6 +- Image Version: 20240908.1 ## Installed Software @@ -34,7 +35,7 @@ - Bundler 2.5.18 - Carthage 0.39.1 - CocoaPods 1.15.2 -- Composer 2.7.8 +- Composer 2.7.9 - Homebrew 4.3.19 - NPM 10.8.2 - NuGet 6.3.1.1 @@ -53,7 +54,7 @@ - aria2 1.37.0 - azcopy 10.26.0 - bazel 7.3.1 -- bazelisk 1.20.0 +- bazelisk 1.21.0 - bsdtar 3.5.3 - available by 'tar' alias - Curl 8.9.1 - Git 2.46.0 @@ -70,22 +71,22 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.17.42 +- AWS CLI 2.17.46 - AWS SAM CLI 1.123.0 - AWS Session Manager CLI 1.2.650.0 -- Azure CLI 2.63.0 +- Azure CLI 2.64.0 - Azure CLI (azure-devops) 1.0.1 - Bicep CLI 0.29.47 - Cmake 3.30.3 - CodeQL Action Bundle 2.18.3 - Fastlane 2.222.0 -- SwiftFormat 0.54.3 +- SwiftFormat 0.54.4 - Xcbeautify 2.11.0 - Xcode Command Line Tools 15.3.0.0.1.1708646388 - Xcodes 1.5.0 ### Linters -- SwiftLint 0.56.2 +- SwiftLint 0.57.0 ### Browsers - Safari 17.6 (19618.3.11.11.5) @@ -93,9 +94,9 @@ - Google Chrome 128.0.6613.120 - Google Chrome for Testing 128.0.6613.119 - ChromeDriver 128.0.6613.119 -- Microsoft Edge 128.0.2739.54 -- Microsoft Edge WebDriver 128.0.2739.59 -- Mozilla Firefox 129.0.2 +- Microsoft Edge 128.0.2739.67 +- Microsoft Edge WebDriver 128.0.2739.69 +- Mozilla Firefox 130.0 - geckodriver 0.35.0 - Selenium server 4.24.0 @@ -133,23 +134,23 @@ #### Go - 1.20.14 - 1.21.13 -- 1.22.6 +- 1.22.7 ### Rust Tools -- Cargo 1.80.1 -- Rust 1.80.1 -- Rustdoc 1.80.1 +- Cargo 1.81.0 +- Rust 1.81.0 +- Rustdoc 1.81.0 - Rustup 1.27.1 #### Packages -- Clippy 0.1.80 -- Rustfmt 1.7.0-stable +- Clippy 0.1.81 +- Rustfmt 1.7.1-stable ### PowerShell Tools - PowerShell 7.4.5 #### PowerShell Modules -- Az: 12.2.0 +- Az: 12.3.0 - Pester: 5.6.1 - PSScriptAnalyzer: 1.22.0 @@ -219,8 +220,8 @@ | Simulator - visionOS 1.1 | xrsimulator1.1 | 15.3 | | Simulator - visionOS 1.2 | xrsimulator1.2 | 15.4 | | visionOS 1.2 | xros1.2 | 15.4 | -| visionOS 2.0 | xros2.0 | 16.0, 16.1 | | Simulator - visionOS 2.0 | xrsimulator2.0 | 16.0, 16.1 | +| visionOS 2.0 | xros2.0 | 16.0, 16.1 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | @@ -233,26 +234,27 @@ | DriverKit 24.1 | driverkit24.1 | 16.1 | #### Installed Simulators -| OS | Xcode Version | Simulators | -| ------------ | ---------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| iOS 16.4 | 14.3.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 17.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0<br>16.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 17.2 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0<br>16.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 17.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0<br>16.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | -| iOS 17.5 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0<br>16.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | -| iOS 18.1 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0<br>16.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | -| tvOS 16.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0<br>16.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 17.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0<br>16.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 17.2 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0<br>16.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 17.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0<br>16.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 17.5 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0<br>16.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 18.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0<br>16.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| watchOS 9.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0<br>16.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | -| watchOS 10.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0<br>16.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | -| watchOS 10.2 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0<br>16.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | -| watchOS 10.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0<br>16.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | -| watchOS 10.5 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0<br>16.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | -| watchOS 11.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0<br>16.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | +| OS | Simulators | +| ------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| iOS 16.4 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 17.0 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 17.2 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 17.4 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | +| iOS 17.5 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | +| iOS 18.0 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | +| iOS 18.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | +| tvOS 16.4 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 17.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 17.2 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 17.4 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 17.5 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 18.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| watchOS 9.4 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | +| watchOS 10.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 10.2 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 10.4 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 10.5 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 11.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | ### Android | Package Name | Version | From b60b7ab30f16e8d7048a8f3d437ddefec573aae9 Mon Sep 17 00:00:00 2001 From: ijunaidm <160701894+ijunaidm@users.noreply.github.com> Date: Thu, 12 Sep 2024 01:43:36 +0530 Subject: [PATCH 3098/3485] Add firefox to Ubuntu24.04 image (#10589) Co-authored-by: Mohammed Junaid <mohammedjunaid@Mohammeds-MacBook-Pro.local> --- images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 | 7 +++---- images/ubuntu/scripts/tests/Browsers.Tests.ps1 | 2 +- images/ubuntu/templates/ubuntu-24.04.pkr.hcl | 1 + 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 b/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 index f4ca60b70e5a..65aac58a6975 100644 --- a/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 +++ b/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 @@ -224,10 +224,9 @@ if ((Test-IsUbuntu20) -or (Test-IsUbuntu22)) { $browsersTools.AddToolVersion("Microsoft Edge WebDriver", $(Get-EdgeDriverVersion)) } $browsersTools.AddToolVersion("Selenium server", $(Get-SeleniumVersion)) -if ((Test-IsUbuntu20) -or (Test-IsUbuntu22)) { - $browsersTools.AddToolVersion("Mozilla Firefox", $(Get-FirefoxVersion)) - $browsersTools.AddToolVersion("Geckodriver", $(Get-GeckodriverVersion)) -} +$browsersTools.AddToolVersion("Mozilla Firefox", $(Get-FirefoxVersion)) +$browsersTools.AddToolVersion("Geckodriver", $(Get-GeckodriverVersion)) + # Environment variables $browsersTools.AddHeader("Environment variables").AddTable($(Build-BrowserWebdriversEnvironmentTable)) diff --git a/images/ubuntu/scripts/tests/Browsers.Tests.ps1 b/images/ubuntu/scripts/tests/Browsers.Tests.ps1 index 7848c676cf1d..5d50f996be74 100644 --- a/images/ubuntu/scripts/tests/Browsers.Tests.ps1 +++ b/images/ubuntu/scripts/tests/Browsers.Tests.ps1 @@ -1,4 +1,4 @@ -Describe "Firefox" -Skip:((-not (Test-IsUbuntu20)) -and (-not (Test-IsUbuntu22))) { +Describe "Firefox" { It "Firefox" { "firefox --version" | Should -ReturnZeroExitCode } diff --git a/images/ubuntu/templates/ubuntu-24.04.pkr.hcl b/images/ubuntu/templates/ubuntu-24.04.pkr.hcl index 5fe65f4fbadc..39c2b23d6ef6 100644 --- a/images/ubuntu/templates/ubuntu-24.04.pkr.hcl +++ b/images/ubuntu/templates/ubuntu-24.04.pkr.hcl @@ -290,6 +290,7 @@ provisioner "shell" { "${path.root}/../scripts/build/install-container-tools.sh", "${path.root}/../scripts/build/install-dotnetcore-sdk.sh", "${path.root}/../scripts/build/install-gcc-compilers.sh", + "${path.root}/../scripts/build/install-firefox.sh", "${path.root}/../scripts/build/install-gfortran.sh", "${path.root}/../scripts/build/install-git.sh", "${path.root}/../scripts/build/install-git-lfs.sh", From 54e686be61d1e3b9462487a5769ed215eddd7194 Mon Sep 17 00:00:00 2001 From: susmitamane <susmitamane@github.com> Date: Thu, 12 Sep 2024 02:33:34 +0530 Subject: [PATCH 3099/3485] [macOS] Add Ruby versions 3.2, 3.3. (#10525) --- images/macos/toolsets/toolset-12.json | 4 +++- images/macos/toolsets/toolset-13.json | 4 +++- images/macos/toolsets/toolset-14.json | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index 08e1158d2483..0dfd31cbb9d9 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -299,7 +299,9 @@ "x64": { "versions": [ "3.0.*", - "3.1.*" + "3.1.*", + "3.2.*", + "3.3.*" ] } } diff --git a/images/macos/toolsets/toolset-13.json b/images/macos/toolsets/toolset-13.json index 33b6ca65b515..df9ed5efbb96 100644 --- a/images/macos/toolsets/toolset-13.json +++ b/images/macos/toolsets/toolset-13.json @@ -206,7 +206,9 @@ "x64": { "versions": [ "3.0.*", - "3.1.*" + "3.1.*", + "3.2.*", + "3.3.*" ] } } diff --git a/images/macos/toolsets/toolset-14.json b/images/macos/toolsets/toolset-14.json index 8b9b5842977c..77560c9284ef 100644 --- a/images/macos/toolsets/toolset-14.json +++ b/images/macos/toolsets/toolset-14.json @@ -193,7 +193,9 @@ "x64": { "versions": [ "3.0.*", - "3.1.*" + "3.1.*", + "3.2.*", + "3.3.*" ] } } From 46a8dee561f77934ce5868954bcd42d3a6e5ac01 Mon Sep 17 00:00:00 2001 From: susmitamane <susmitamane@github.com> Date: Thu, 12 Sep 2024 02:33:59 +0530 Subject: [PATCH 3100/3485] [macOS] Add Go 1.23 (#10526) --- images/macos/toolsets/toolset-12.json | 3 ++- images/macos/toolsets/toolset-13.json | 6 ++++-- images/macos/toolsets/toolset-14.json | 6 ++++-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index 0dfd31cbb9d9..ae77000a407c 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -288,7 +288,8 @@ "versions": [ "1.20.*", "1.21.*", - "1.22.*" + "1.22.*", + "1.23.*" ] } } diff --git a/images/macos/toolsets/toolset-13.json b/images/macos/toolsets/toolset-13.json index df9ed5efbb96..d6cfbd105a1f 100644 --- a/images/macos/toolsets/toolset-13.json +++ b/images/macos/toolsets/toolset-13.json @@ -187,7 +187,8 @@ "versions": [ "1.20.*", "1.21.*", - "1.22.*" + "1.22.*", + "1.23.*" ] }, "arm64": { @@ -195,7 +196,8 @@ "versions": [ "1.20.*", "1.21.*", - "1.22.*" + "1.22.*", + "1.23.*" ] } } diff --git a/images/macos/toolsets/toolset-14.json b/images/macos/toolsets/toolset-14.json index 77560c9284ef..8642818b75b1 100644 --- a/images/macos/toolsets/toolset-14.json +++ b/images/macos/toolsets/toolset-14.json @@ -174,7 +174,8 @@ "versions": [ "1.20.*", "1.21.*", - "1.22.*" + "1.22.*", + "1.23.*" ] }, "arm64": { @@ -182,7 +183,8 @@ "versions": [ "1.20.*", "1.21.*", - "1.22.*" + "1.22.*", + "1.23.*" ] } } From d2f9756b6ee5a9c016850344f2092c3c912b780c Mon Sep 17 00:00:00 2001 From: susmitamane <susmitamane@github.com> Date: Thu, 12 Sep 2024 02:42:54 +0530 Subject: [PATCH 3101/3485] Add NDK 27 (#10522) Co-authored-by: Susmita Mane <susmitamane@Susmitas-MacBook-Pro.local> --- images/macos/toolsets/toolset-12.json | 2 +- images/macos/toolsets/toolset-13.json | 2 +- images/macos/toolsets/toolset-14.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index ae77000a407c..9aca0bad9d6d 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -167,7 +167,7 @@ "ndk": { "default": "25", "versions": [ - "24", "25", "26" + "24", "25", "26", "27" ] } }, diff --git a/images/macos/toolsets/toolset-13.json b/images/macos/toolsets/toolset-13.json index d6cfbd105a1f..fbaa34ac7880 100644 --- a/images/macos/toolsets/toolset-13.json +++ b/images/macos/toolsets/toolset-13.json @@ -47,7 +47,7 @@ "ndk": { "default": "26", "versions": [ - "24", "25", "26" + "24", "25", "26", "27" ] } }, diff --git a/images/macos/toolsets/toolset-14.json b/images/macos/toolsets/toolset-14.json index 8642818b75b1..e1413f7fa676 100644 --- a/images/macos/toolsets/toolset-14.json +++ b/images/macos/toolsets/toolset-14.json @@ -51,7 +51,7 @@ "ndk": { "default": "26", "versions": [ - "24", "25", "26" + "24", "25", "26", "27" ] } }, From 255fffd021c30f9f4b12acef280fce9e38ebc36c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2024 21:58:25 +0000 Subject: [PATCH 3102/3485] Updating readme file for macos-13 version 20240908.1 (#10581) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-13-Readme.md | 77 +++++++++++++++++---------------- 1 file changed, 39 insertions(+), 38 deletions(-) diff --git a/images/macos/macos-13-Readme.md b/images/macos/macos-13-Readme.md index 3358e2680bf9..0a854e64384a 100644 --- a/images/macos/macos-13-Readme.md +++ b/images/macos/macos-13-Readme.md @@ -1,5 +1,6 @@ | Announcements | |-| +| [[macOS] Xcodes visionOS platform will be removed from macOS-14 images on September 23, 2024](https://github.com/actions/runner-images/issues/10559) | | [[Macos] go version 1.20.0 will be removed on September 16,2024.](https://github.com/actions/runner-images/issues/10531) | | [[Macos] Android NDK 24 will be removed on September 16,2024](https://github.com/actions/runner-images/issues/10530) | | [[Macos-12] Python version 3.7 will be removed from the macos-12 image on September 16,2024](https://github.com/actions/runner-images/issues/10529) | @@ -7,7 +8,7 @@ # macOS 13 - OS Version: macOS 13.6.9 (22G830) - Kernel Version: Darwin 22.6.0 -- Image Version: 20240901.3 +- Image Version: 20240908.1 ## Installed Software @@ -34,14 +35,14 @@ - Bundler 2.5.18 - Carthage 0.39.1 - CocoaPods 1.15.2 -- Composer 2.7.8 -- Homebrew 4.3.18 +- Composer 2.7.9 +- Homebrew 4.3.19 - NPM 10.8.2 - NuGet 6.3.1.1 - Pip3 24.2 (python 3.12) - Pipx 1.7.1 - RubyGems 3.5.18 -- Vcpkg 2024 (build from commit 0f88ecb85) +- Vcpkg 2024 (build from commit eba7c6a89) - Yarn 1.22.22 ### Project Management @@ -54,7 +55,7 @@ - aria2 1.37.0 - azcopy 10.26.0 - bazel 7.3.1 -- bazelisk 1.20.0 +- bazelisk 1.21.0 - bsdtar 3.5.3 - available by 'tar' alias - Curl 8.9.1 - Git 2.46.0 @@ -71,32 +72,32 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.17.42 +- AWS CLI 2.17.46 - AWS SAM CLI 1.123.0 - AWS Session Manager CLI 1.2.650.0 -- Azure CLI 2.63.0 +- Azure CLI 2.64.0 - Azure CLI (azure-devops) 1.0.1 - Bicep CLI 0.29.47 - Cmake 3.30.3 - CodeQL Action Bundle 2.18.3 - Fastlane 2.222.0 -- SwiftFormat 0.54.3 +- SwiftFormat 0.54.4 - Xcbeautify 2.11.0 - Xcode Command Line Tools 14.3.1.0.1.1683849156 - Xcodes 1.5.0 ### Linters -- SwiftLint 0.56.2 +- SwiftLint 0.57.0 ### Browsers - Safari 17.6 (18618.3.11.11.7) - SafariDriver 17.6 (18618.3.11.11.7) -- Google Chrome 128.0.6613.114 -- Google Chrome for Testing 128.0.6613.86 -- ChromeDriver 128.0.6613.86 -- Microsoft Edge 128.0.2739.54 -- Microsoft Edge WebDriver 128.0.2739.59 -- Mozilla Firefox 129.0.2 +- Google Chrome 128.0.6613.120 +- Google Chrome for Testing 128.0.6613.119 +- ChromeDriver 128.0.6613.119 +- Microsoft Edge 128.0.2739.67 +- Microsoft Edge WebDriver 128.0.2739.69 +- Mozilla Firefox 130.0 - geckodriver 0.35.0 - Selenium server 4.24.0 @@ -143,23 +144,23 @@ #### Go - 1.20.14 - 1.21.13 -- 1.22.6 +- 1.22.7 ### Rust Tools -- Cargo 1.80.1 -- Rust 1.80.1 -- Rustdoc 1.80.1 +- Cargo 1.81.0 +- Rust 1.81.0 +- Rustdoc 1.81.0 - Rustup 1.27.1 #### Packages -- Clippy 0.1.80 -- Rustfmt 1.7.0-stable +- Clippy 0.1.81 +- Rustfmt 1.7.1-stable ### PowerShell Tools - PowerShell 7.4.5 #### PowerShell Modules -- Az: 12.2.0 +- Az: 12.3.0 - Pester: 5.6.1 - PSScriptAnalyzer: 1.22.0 @@ -210,8 +211,8 @@ | Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | | visionOS 1.0 | xros1.0 | 15.2 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | -| Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | +| Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | DriverKit 22.1 | driverkit22.1 | 14.1 | | DriverKit 22.2 | driverkit22.2 | 14.2 | | DriverKit 22.4 | driverkit22.4 | 14.3.1 | @@ -219,21 +220,21 @@ | DriverKit 23.2 | driverkit23.2 | 15.1, 15.2 | #### Installed Simulators -| OS | Xcode Version | Simulators | -| ------------ | ------------------------------------------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| iOS 16.1 | 14.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 16.2 | 14.2 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 16.4 | 14.3.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 17.0 | 14.1<br>14.2<br>14.3.1<br>15.0.1<br>15.1<br>15.2 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 17.2 | 14.1<br>14.2<br>14.3.1<br>15.0.1<br>15.1<br>15.2 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| tvOS 16.1 | 14.1<br>14.2<br>14.3.1<br>15.0.1<br>15.1<br>15.2 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 16.4 | 14.1<br>14.2<br>14.3.1<br>15.0.1<br>15.1<br>15.2 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 17.0 | 14.1<br>14.2<br>14.3.1<br>15.0.1<br>15.1<br>15.2 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 17.2 | 14.1<br>14.2<br>14.3.1<br>15.0.1<br>15.1<br>15.2 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| watchOS 9.1 | 14.1<br>14.2<br>14.3.1<br>15.0.1<br>15.1<br>15.2 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | -| watchOS 9.4 | 14.1<br>14.2<br>14.3.1<br>15.0.1<br>15.1<br>15.2 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | -| watchOS 10.0 | 14.1<br>14.2<br>14.3.1<br>15.0.1<br>15.1<br>15.2 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | -| watchOS 10.2 | 14.1<br>14.2<br>14.3.1<br>15.0.1<br>15.1<br>15.2 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | +| OS | Simulators | +| ------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| iOS 16.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 16.2 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 16.4 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 17.0 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 17.2 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| tvOS 16.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 16.4 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 17.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 17.2 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| watchOS 9.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | +| watchOS 9.4 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | +| watchOS 10.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 10.2 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | ### Android | Package Name | Version | From 20fb902d6b3cd37fd29cb95a4cf6bf366e296c1c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 12 Sep 2024 12:04:18 +0000 Subject: [PATCH 3103/3485] Updating readme file for macos-13-arm64 version 20240909.59 (#10585) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-13-arm64-Readme.md | 71 ++++++++++++++------------- 1 file changed, 36 insertions(+), 35 deletions(-) diff --git a/images/macos/macos-13-arm64-Readme.md b/images/macos/macos-13-arm64-Readme.md index 532d4e659e4c..57a8904a549e 100644 --- a/images/macos/macos-13-arm64-Readme.md +++ b/images/macos/macos-13-arm64-Readme.md @@ -1,5 +1,6 @@ | Announcements | |-| +| [[macOS] Xcodes visionOS platform will be removed from macOS-14 images on September 23, 2024](https://github.com/actions/runner-images/issues/10559) | | [[Macos] go version 1.20.0 will be removed on September 16,2024.](https://github.com/actions/runner-images/issues/10531) | | [[Macos] Android NDK 24 will be removed on September 16,2024](https://github.com/actions/runner-images/issues/10530) | | [[Macos-12] Python version 3.7 will be removed from the macos-12 image on September 16,2024](https://github.com/actions/runner-images/issues/10529) | @@ -7,7 +8,7 @@ # macOS 13 - OS Version: macOS 13.6.9 (22G830) - Kernel Version: Darwin 22.6.0 -- Image Version: 20240901.2 +- Image Version: 20240909.59 ## Installed Software @@ -26,14 +27,14 @@ - Mono 6.12.0.188 - Node.js 20.17.0 - Perl 5.38.2 -- Python3 3.12.5 +- Python3 3.12.6 - Ruby 3.0.7p220 ### Package Management - Bundler 2.5.18 - Carthage 0.39.1 - CocoaPods 1.15.2 -- Homebrew 4.3.18 +- Homebrew 4.3.20 - NPM 10.8.2 - NuGet 6.3.1.1 - Pip3 24.2 (python 3.12) @@ -51,7 +52,7 @@ - aria2 1.37.0 - azcopy 10.26.0 - bazel 7.3.1 -- bazelisk 1.20.0 +- bazelisk 1.21.0 - bsdtar 3.5.3 - available by 'tar' alias - Curl 8.7.1 - Git 2.46.0 @@ -68,16 +69,16 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.17.42 +- AWS CLI 2.17.46 - AWS SAM CLI 1.123.0 - AWS Session Manager CLI 1.2.650.0 -- Azure CLI 2.63.0 +- Azure CLI 2.64.0 - Azure CLI (azure-devops) 1.0.1 - Bicep CLI 0.29.47 - Cmake 3.30.3 - CodeQL Action Bundle 2.18.3 - Fastlane 2.222.0 -- SwiftFormat 0.54.3 +- SwiftFormat 0.54.4 - Xcbeautify 2.11.0 - Xcode Command Line Tools 14.3.1.0.1.1683849156 - Xcodes 1.5.0 @@ -87,9 +88,9 @@ ### Browsers - Safari 17.6 (18618.3.11.11.7) - SafariDriver 17.6 (18618.3.11.11.7) -- Google Chrome 128.0.6613.114 -- Google Chrome for Testing 128.0.6613.86 -- ChromeDriver 128.0.6613.86 +- Google Chrome 128.0.6613.120 +- Google Chrome for Testing 128.0.6613.119 +- ChromeDriver 128.0.6613.119 - Selenium server 4.24.0 #### Environment variables @@ -122,23 +123,23 @@ #### Go - 1.20.14 - 1.21.13 -- 1.22.6 +- 1.22.7 ### Rust Tools -- Cargo 1.80.1 -- Rust 1.80.1 -- Rustdoc 1.80.1 +- Cargo 1.81.0 +- Rust 1.81.0 +- Rustdoc 1.81.0 - Rustup 1.27.1 #### Packages -- Clippy 0.1.80 -- Rustfmt 1.7.0-stable +- Clippy 0.1.81 +- Rustfmt 1.7.1-stable ### PowerShell Tools - PowerShell 7.4.5 #### PowerShell Modules -- Az: 12.2.0 +- Az: 12.3.0 - Pester: 5.6.1 - PSScriptAnalyzer: 1.22.0 @@ -186,11 +187,11 @@ | Simulator - watchOS 9.4 | watchsimulator9.4 | 14.3.1 | | Simulator - watchOS 10.0 | watchsimulator10.0 | 15.0.1 | | Simulator - watchOS 10.2 | watchsimulator10.2 | 15.1, 15.2 | -| Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | | visionOS 1.0 | xros1.0 | 15.2 | +| Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | -| Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | +| Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | DriverKit 22.1 | driverkit22.1 | 14.1 | | DriverKit 22.2 | driverkit22.2 | 14.2 | | DriverKit 22.4 | driverkit22.4 | 14.3.1 | @@ -198,22 +199,22 @@ | DriverKit 23.2 | driverkit23.2 | 15.1, 15.2 | #### Installed Simulators -| OS | Xcode Version | Simulators | -| ------------ | ------------------------------------------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| iOS 16.1 | 14.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 16.2 | 14.2 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 16.4 | 14.3.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 17.0 | 14.1<br>14.2<br>14.3.1<br>15.0.1<br>15.1<br>15.2 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 17.2 | 14.1<br>14.2<br>14.3.1<br>15.0.1<br>15.1<br>15.2 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| tvOS 16.1 | 14.1<br>14.2<br>14.3.1<br>15.0.1<br>15.1<br>15.2 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 16.4 | 14.1<br>14.2<br>14.3.1<br>15.0.1<br>15.1<br>15.2 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 17.0 | 14.1<br>14.2<br>14.3.1<br>15.0.1<br>15.1<br>15.2 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 17.2 | 14.1<br>14.2<br>14.3.1<br>15.0.1<br>15.1<br>15.2 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| watchOS 9.1 | 14.1<br>14.2<br>14.3.1<br>15.0.1<br>15.1<br>15.2 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | -| watchOS 9.4 | 14.1<br>14.2<br>14.3.1<br>15.0.1<br>15.1<br>15.2 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | -| watchOS 10.0 | 14.1<br>14.2<br>14.3.1<br>15.0.1<br>15.1<br>15.2 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | -| watchOS 10.2 | 14.1<br>14.2<br>14.3.1<br>15.0.1<br>15.1<br>15.2 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | -| visionOS 1.0 | 14.1<br>14.2<br>14.3.1<br>15.0.1<br>15.1<br>15.2 | Apple Vision Pro | +| OS | Simulators | +| ------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| iOS 16.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 16.2 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 16.4 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 17.0 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 17.2 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| tvOS 16.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 16.4 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 17.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 17.2 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| watchOS 9.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | +| watchOS 9.4 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | +| watchOS 10.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 10.2 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | +| visionOS 1.0 | Apple Vision Pro | ### Android | Package Name | Version | From ea8a7a8f0139b0482cfa6e9f7638758750d38c8c Mon Sep 17 00:00:00 2001 From: hemanthmanga <166606741+hemanthmanga@users.noreply.github.com> Date: Fri, 13 Sep 2024 01:14:17 +0530 Subject: [PATCH 3104/3485] Adding MsEdge in ubuntu-24 (#10597) --- images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 | 7 +++---- images/ubuntu/scripts/tests/Browsers.Tests.ps1 | 2 +- images/ubuntu/templates/ubuntu-24.04.pkr.hcl | 1 + 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 b/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 index 65aac58a6975..b06946acfadf 100644 --- a/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 +++ b/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 @@ -219,10 +219,9 @@ $browsersTools = $installedSoftware.AddHeader("Browsers and Drivers") $browsersTools.AddToolVersion("Google Chrome", $(Get-ChromeVersion)) $browsersTools.AddToolVersion("ChromeDriver", $(Get-ChromeDriverVersion)) $browsersTools.AddToolVersion("Chromium", $(Get-ChromiumVersion)) -if ((Test-IsUbuntu20) -or (Test-IsUbuntu22)) { - $browsersTools.AddToolVersion("Microsoft Edge", $(Get-EdgeVersion)) - $browsersTools.AddToolVersion("Microsoft Edge WebDriver", $(Get-EdgeDriverVersion)) -} +$browsersTools.AddToolVersion("Microsoft Edge", $(Get-EdgeVersion)) +$browsersTools.AddToolVersion("Microsoft Edge WebDriver", $(Get-EdgeDriverVersion)) + $browsersTools.AddToolVersion("Selenium server", $(Get-SeleniumVersion)) $browsersTools.AddToolVersion("Mozilla Firefox", $(Get-FirefoxVersion)) $browsersTools.AddToolVersion("Geckodriver", $(Get-GeckodriverVersion)) diff --git a/images/ubuntu/scripts/tests/Browsers.Tests.ps1 b/images/ubuntu/scripts/tests/Browsers.Tests.ps1 index 5d50f996be74..1ea5230f39f2 100644 --- a/images/ubuntu/scripts/tests/Browsers.Tests.ps1 +++ b/images/ubuntu/scripts/tests/Browsers.Tests.ps1 @@ -24,7 +24,7 @@ Describe "Chrome" { } } -Describe "Edge" -Skip:((-not (Test-IsUbuntu20)) -and (-not (Test-IsUbuntu22))) { +Describe "Edge" { It "Edge" { "microsoft-edge --version" | Should -ReturnZeroExitCode } diff --git a/images/ubuntu/templates/ubuntu-24.04.pkr.hcl b/images/ubuntu/templates/ubuntu-24.04.pkr.hcl index 39c2b23d6ef6..634721ebf80c 100644 --- a/images/ubuntu/templates/ubuntu-24.04.pkr.hcl +++ b/images/ubuntu/templates/ubuntu-24.04.pkr.hcl @@ -289,6 +289,7 @@ provisioner "shell" { "${path.root}/../scripts/build/install-codeql-bundle.sh", "${path.root}/../scripts/build/install-container-tools.sh", "${path.root}/../scripts/build/install-dotnetcore-sdk.sh", + "${path.root}/../scripts/build/install-microsoft-edge.sh", "${path.root}/../scripts/build/install-gcc-compilers.sh", "${path.root}/../scripts/build/install-firefox.sh", "${path.root}/../scripts/build/install-gfortran.sh", From 5954f76a9b1da890feef9a1d36d33961bed9fc7b Mon Sep 17 00:00:00 2001 From: sarathrajsrinivasan <159180023+sarathrajsrinivasan@users.noreply.github.com> Date: Thu, 12 Sep 2024 13:43:15 -0700 Subject: [PATCH 3105/3485] [macOS] Clean up Homebrew downloads folder (#10600) --- images/macos/scripts/build/configure-system.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/images/macos/scripts/build/configure-system.sh b/images/macos/scripts/build/configure-system.sh index 6f945bfef244..344ae300dc8a 100644 --- a/images/macos/scripts/build/configure-system.sh +++ b/images/macos/scripts/build/configure-system.sh @@ -47,3 +47,6 @@ echo "Indexing completed" # delete symlink for tests running sudo rm -f /usr/local/bin/invoke_tests + +# Clean Homebrew downloads +sudo rm -rf /Users/$USER/Library/Caches/Homebrew/downloads/* From bfff5e5a703a1f30df7f3b7f677b5ea5f08a0f8a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 12 Sep 2024 21:55:47 +0000 Subject: [PATCH 3106/3485] Updating readme file for ubuntu20 version 20240908.1.1 (#10569) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2004-Readme.md | 74 +++++++++++++++--------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/images/ubuntu/Ubuntu2004-Readme.md b/images/ubuntu/Ubuntu2004-Readme.md index 551e349487fa..285301058e6e 100644 --- a/images/ubuntu/Ubuntu2004-Readme.md +++ b/images/ubuntu/Ubuntu2004-Readme.md @@ -6,7 +6,7 @@ # Ubuntu 20.04 - OS Version: 20.04.6 LTS - Kernel Version: 5.15.0-1071-azure -- Image Version: 20240901.1.0 +- Image Version: 20240908.1.0 - Systemd version: 245.4-4ubuntu3.23 ## Installed Software @@ -34,7 +34,7 @@ ### Package Management - cpan 1.64 - Helm 3.15.4 -- Homebrew 4.3.18 +- Homebrew 4.3.19 - Miniconda 24.7.1 - Npm 10.7.0 - NuGet 6.6.1.2 @@ -42,7 +42,7 @@ - Pip3 20.0.2 - Pipx 1.7.1 - RubyGems 3.1.2 -- Vcpkg (build from commit 0f88ecb85) +- Vcpkg (build from commit eba7c6a89) - Yarn 1.22.22 #### Environment variables @@ -71,7 +71,7 @@ to accomplish this. - apt-fast 1.10.0 - AzCopy 10.26.0 - available by `azcopy` and `azcopy10` aliases - Bazel 7.3.1 -- Bazelisk 1.19.0 +- Bazelisk 1.21.0 - Bicep 0.29.47 - Buildah 1.22.3 - CMake 3.30.3 @@ -86,7 +86,7 @@ to accomplish this. - Git LFS 3.5.1 - Git-ftp 1.6.0 - Haveged 1.9.1 -- Heroku 9.2.0 +- Heroku 9.2.1 - HHVM (HipHop VM) 4.172.1 - jq 1.6 - Kind 0.24.0 @@ -96,7 +96,7 @@ to accomplish this. - MediaInfo 19.09 - Mercurial 5.3.1 - Minikube 1.33.1 -- n 9.2.3 +- n 10.0.0 - Newman 6.2.1 - nvm 0.40.1 - OpenSSL 1.1.1f-1ubuntu2.23 @@ -104,7 +104,7 @@ to accomplish this. - Parcel 2.12.0 - PhantomJS 2.1.1 2.1.1 - Podman 3.4.2 -- Pulumi 3.130.0 +- Pulumi 3.131.0 - R 4.4.1 - Skopeo 1.5.0 - Sphinx Open Source Search Server 2.2.11 @@ -116,17 +116,17 @@ to accomplish this. ### CLI Tools - Alibaba Cloud CLI 3.0.174 -- AWS CLI 2.17.42 +- AWS CLI 2.17.46 - AWS CLI Session Manager Plugin 1.2.650.0 - AWS SAM CLI 1.123.0 -- Azure CLI 2.63.0 +- Azure CLI 2.64.0 - Azure CLI (azure-devops) 1.0.1 - GitHub CLI 2.55.0 -- Google Cloud CLI 490.0.0 -- Netlify CLI 17.34.3 +- Google Cloud CLI 491.0.0 +- Netlify CLI 17.35.0 - OpenShift CLI 4.15.19 - ORAS CLI 1.2.0 -- Vercel CLI 37.2.1 +- Vercel CLI 37.4.0 ### Java | Version | Environment Variable | @@ -138,7 +138,7 @@ to accomplish this. ### PHP Tools - PHP: 7.4.33, 8.0.30, 8.1.29, 8.2.23, 8.3.11 -- Composer 2.7.8 +- Composer 2.7.9 - PHPUnit 8.5.39 ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. @@ -151,25 +151,25 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Stack 3.1.1 ### Rust Tools -- Cargo 1.80.1 -- Rust 1.80.1 -- Rustdoc 1.80.1 +- Cargo 1.81.0 +- Rust 1.81.0 +- Rustdoc 1.81.0 - Rustup 1.27.1 #### Packages - Bindgen 0.70.1 - Cargo audit 0.20.1 -- Cargo clippy 0.1.80 +- Cargo clippy 0.1.81 - Cargo outdated 0.15.0 - Cbindgen 0.27.0 -- Rustfmt 1.7.0 +- Rustfmt 1.7.1 ### Browsers and Drivers -- Google Chrome 128.0.6613.113 -- ChromeDriver 128.0.6613.86 +- Google Chrome 128.0.6613.119 +- ChromeDriver 128.0.6613.119 - Chromium 128.0.6613.0 -- Microsoft Edge 128.0.2739.54 -- Microsoft Edge WebDriver 128.0.2739.56 +- Microsoft Edge 128.0.2739.67 +- Microsoft Edge WebDriver 128.0.2739.68 - Selenium server 4.24.0 - Mozilla Firefox 129.0.2 - Geckodriver 0.35.0 @@ -216,7 +216,7 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Go - 1.20.14 - 1.21.13 -- 1.22.6 +- 1.22.7 #### Node.js - 16.20.2 @@ -250,7 +250,7 @@ Use the following command as a part of your job to start the service: 'sudo syst #### PowerShell Modules - Az: 12.1.0 - MarkdownPS: 1.10 -- Microsoft.Graph: 2.22.0 +- Microsoft.Graph: 2.23.0 - Pester: 5.6.1 - PSScriptAnalyzer: 1.22.0 @@ -271,35 +271,35 @@ Use the following command as a part of your job to start the service: 'sudo syst | CMake | 3.10.2<br>3.18.1<br>3.22.1 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 26.3.11579264<br>27.0.12077973 (default) | +| NDK | 26.3.11579264<br>27.1.12297006 (default) | #### Environment variables | Name | Value | | ----------------------- | -------------------------------------------- | | ANDROID_HOME | /usr/local/lib/android/sdk | -| ANDROID_NDK | /usr/local/lib/android/sdk/ndk/27.0.12077973 | -| ANDROID_NDK_HOME | /usr/local/lib/android/sdk/ndk/27.0.12077973 | -| ANDROID_NDK_LATEST_HOME | /usr/local/lib/android/sdk/ndk/27.0.12077973 | -| ANDROID_NDK_ROOT | /usr/local/lib/android/sdk/ndk/27.0.12077973 | +| ANDROID_NDK | /usr/local/lib/android/sdk/ndk/27.1.12297006 | +| ANDROID_NDK_HOME | /usr/local/lib/android/sdk/ndk/27.1.12297006 | +| ANDROID_NDK_LATEST_HOME | /usr/local/lib/android/sdk/ndk/27.1.12297006 | +| ANDROID_NDK_ROOT | /usr/local/lib/android/sdk/ndk/27.1.12297006 | | ANDROID_SDK_ROOT | /usr/local/lib/android/sdk | ### Cached Docker images | Repository:Tag | Digest | Created | | -------------------- | ------------------------------------------------------------------------ | ---------- | | alpine:3.16 | sha256:452e7292acee0ee16c332324d7de05fa2c99f9994ecc9f0779c602916a672ae4 | 2024-01-27 | -| alpine:3.17 | sha256:ef813b2faa3dd1a37f9ef6ca98347b72cd0f55e4ab29fb90946f1b853bf032d9 | 2024-07-22 | -| alpine:3.18 | sha256:5292533eb4efd4b5cf35e93b5a2b7d0e07ea193224c49446c7802c19ee4f2da5 | 2024-07-22 | -| alpine:3.19 | sha256:95c16745f100f44cf9a0939fd3f357905f845f8b6fa7d0cde0e88c9764060185 | 2024-07-22 | +| alpine:3.17 | sha256:3451da08fc6ef554a100da3e2df5ac6d598c82f2a774d5f6ed465c3d80cd163a | 2024-09-06 | +| alpine:3.18 | sha256:3ddf7bf1d408188f9849efbf4f902720ae08f5131bb39013518b918aa056d0de | 2024-09-06 | +| alpine:3.19 | sha256:ae65dbf8749a7d4527648ccee1fa3deb6bfcae34cbc30fc67aa45c44dcaa90ee | 2024-09-06 | | debian:10 | sha256:58ce6f1271ae1c8a2006ff7d3e54e9874d839f573d8009c20154ad0f2fb0a225 | 2024-06-13 | -| debian:11 | sha256:0bb606aad3307370c8b4502eff11fde298e5b7721e59a0da3ce9b30cb92045ed | 2024-08-13 | +| debian:11 | sha256:8ccc486c29a3ad02ad5af7f1156e2152dff3ba5634eec9be375269ef123457d8 | 2024-09-04 | | debian:9 | sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be | 2022-06-23 | | moby/buildkit:latest | sha256:e0b10610709509aded9b101a61a090e24a5161f46d5eb8a479297fe96aa5d8ac | 2024-08-15 | | node:16 | sha256:f77a1aef2da8d83e45ec990f45df50f1a286c5fe8bbfb8c6e4246c6389705c0b | 2023-09-07 | | node:16-alpine | sha256:a1f9d027912b58a7c75be7716c97cfbc6d3099f3a97ed84aa490be9dee20e787 | 2023-08-10 | -| node:18 | sha256:a7ff16657263663c1e92ba3060cdbba0e77329a0a4cb3c27bbbbe90c6e20bd87 | 2024-07-09 | -| node:18-alpine | sha256:17514b20acef0e79691285e7a59f3ae561f7a1702a9adc72a515aef23f326729 | 2024-07-09 | -| node:20 | sha256:a4d1de4c7339eabcf78a90137dfd551b798829e3ef3e399e0036ac454afa1291 | 2024-08-21 | -| node:20-alpine | sha256:1a526b97cace6b4006256570efa1a29cd1fe4b96a5301f8d48e87c5139438a45 | 2024-08-21 | +| node:18 | sha256:ca07c02d13baf021ff5aadb3b48bcd1fcdd454826266ac313ce858676e8c1548 | 2024-07-09 | +| node:18-alpine | sha256:02376a266c84acbf45bd19440e08e48b1c8b98037417334046029ab585de03e2 | 2024-07-09 | +| node:20 | sha256:48db4f6ea21d134be744207225753a1730c4bc1b4cdf836d44511c36bf0e34d7 | 2024-08-21 | +| node:20-alpine | sha256:2d07db07a2df6830718ae2a47db6fedce6745f5bcd174c398f2acdda90a11c03 | 2024-08-21 | | ubuntu:20.04 | sha256:fa17826afb526a9fc7250e0fbcbfd18d03fe7a54849472f86879d8bf562c629e | 2024-08-13 | ### Installed apt packages From a68ad81fbe00523da525ce6847ad4497f99976de Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 12 Sep 2024 22:16:52 +0000 Subject: [PATCH 3107/3485] Updating readme file for ubuntu24 version 20240908.1.1 (#10570) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2404-Readme.md | 55 +++++++++++++++--------------- 1 file changed, 28 insertions(+), 27 deletions(-) diff --git a/images/ubuntu/Ubuntu2404-Readme.md b/images/ubuntu/Ubuntu2404-Readme.md index a76d2da59357..da1b95df9533 100644 --- a/images/ubuntu/Ubuntu2404-Readme.md +++ b/images/ubuntu/Ubuntu2404-Readme.md @@ -3,11 +3,11 @@ | [[Ubuntu 20.04 and Ubuntu 22.04 Oses] Go 1.22.x will be set as default on September, 20](https://github.com/actions/runner-images/issues/10500) | | [Ubuntu 24.04 is now available](https://github.com/actions/runner-images/issues/9848) | *** -# Ubuntu 24.04 LTS -- OS Version: 24.04 LTS +# Ubuntu 24.04 +- OS Version: 24.04.1 LTS - Kernel Version: 6.8.0-1013-azure -- Image Version: 20240901.1.0 -- Systemd version: 255.4-1ubuntu8.2 +- Image Version: 20240908.1.0 +- Systemd version: 255.4-1ubuntu8.4 ## Installed Software @@ -29,14 +29,14 @@ ### Package Management - cpan 1.64 - Helm 3.15.4 -- Homebrew 4.3.18 +- Homebrew 4.3.19 - Miniconda 24.7.1 - Npm 10.8.2 - Pip 24.0 - Pip3 24.0 - Pipx 1.4.3 - RubyGems 3.4.20 -- Vcpkg (build from commit 0f88ecb85) +- Vcpkg (build from commit eba7c6a89) - Yarn 1.22.22 #### Environment variables @@ -63,7 +63,7 @@ to accomplish this. - Ansible 2.17.3 - AzCopy 10.26.0 - available by `azcopy` and `azcopy10` aliases - Bazel 7.3.1 -- Bazelisk 1.19.0 +- Bazelisk 1.21.0 - Bicep 0.29.47 - Buildah 1.33.7 - CMake 3.30.3 @@ -85,12 +85,13 @@ to accomplish this. - MediaInfo 24.01 - Mercurial 6.7.2 - Minikube 1.33.1 -- n 9.2.3 +- n 10.0.0 - Newman 6.2.1 -- OpenSSL 3.0.13-0ubuntu3.3 +- OpenSSL 3.0.13-0ubuntu3.4 +- Packer 1.11.2 - Parcel 2.12.0 - Podman 4.9.3 -- Pulumi 3.130.0 +- Pulumi 3.131.0 - Skopeo 1.13.3 - Sphinx Open Source Search Server 2.2.11 - yamllint 1.35.1 @@ -98,10 +99,10 @@ to accomplish this. - zstd 1.5.6 ### CLI Tools -- AWS CLI 2.17.42 +- AWS CLI 2.17.46 - AWS CLI Session Manager Plugin 1.2.650.0 - AWS SAM CLI 1.123.0 -- Azure CLI 2.63.0 +- Azure CLI 2.64.0 - Azure CLI (azure-devops) 1.0.1 - GitHub CLI 2.55.0 @@ -115,7 +116,7 @@ to accomplish this. ### PHP Tools - PHP: 8.3.6 -- Composer 2.7.8 +- Composer 2.7.9 - PHPUnit 8.5.39 ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. @@ -128,17 +129,17 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Stack 3.1.1 ### Rust Tools -- Cargo 1.80.1 -- Rust 1.80.1 -- Rustdoc 1.80.1 +- Cargo 1.81.0 +- Rust 1.81.0 +- Rustdoc 1.81.0 - Rustup 1.27.1 #### Packages -- Rustfmt 1.7.0 +- Rustfmt 1.7.1 ### Browsers and Drivers -- Google Chrome 128.0.6613.113 -- ChromeDriver 128.0.6613.86 +- Google Chrome 128.0.6613.119 +- ChromeDriver 128.0.6613.119 - Chromium 128.0.6613.0 - Selenium server 4.24.0 @@ -179,7 +180,7 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Go - 1.20.14 - 1.21.13 -- 1.22.6 +- 1.22.7 #### Node.js - 16.20.2 @@ -201,7 +202,7 @@ Use the following command as a part of your job to start the service: 'sudo syst #### PowerShell Modules - Az: 12.1.0 -- Microsoft.Graph: 2.22.0 +- Microsoft.Graph: 2.23.0 - Pester: 5.6.1 - PSScriptAnalyzer: 1.22.0 @@ -220,16 +221,16 @@ Use the following command as a part of your job to start the service: 'sudo syst | Android Support Repository | 47.0.0 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 26.3.11579264<br>27.0.12077973 (default) | +| NDK | 26.3.11579264<br>27.1.12297006 (default) | #### Environment variables | Name | Value | | ----------------------- | -------------------------------------------- | | ANDROID_HOME | /usr/local/lib/android/sdk | -| ANDROID_NDK | /usr/local/lib/android/sdk/ndk/27.0.12077973 | -| ANDROID_NDK_HOME | /usr/local/lib/android/sdk/ndk/27.0.12077973 | -| ANDROID_NDK_LATEST_HOME | /usr/local/lib/android/sdk/ndk/27.0.12077973 | -| ANDROID_NDK_ROOT | /usr/local/lib/android/sdk/ndk/27.0.12077973 | +| ANDROID_NDK | /usr/local/lib/android/sdk/ndk/27.1.12297006 | +| ANDROID_NDK_HOME | /usr/local/lib/android/sdk/ndk/27.1.12297006 | +| ANDROID_NDK_LATEST_HOME | /usr/local/lib/android/sdk/ndk/27.1.12297006 | +| ANDROID_NDK_ROOT | /usr/local/lib/android/sdk/ndk/27.1.12297006 | | ANDROID_SDK_ROOT | /usr/local/lib/android/sdk | ### Installed apt packages @@ -262,7 +263,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | iproute2 | 6.1.0-1ubuntu6 | | iputils-ping | 3:20240117-1build1 | | jq | 1.7.1-3build1 | -| libssl-dev | 3.0.13-0ubuntu3.3 | +| libssl-dev | 3.0.13-0ubuntu3.4 | | libtool | 2.4.7-7build1 | | libyaml-dev | 0.2.5-1build1 | | locales | 2.39-0ubuntu8.3 | From a142edbae6deab8f101263e8b96ed36a37176bb8 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 12 Sep 2024 22:27:54 +0000 Subject: [PATCH 3108/3485] Updating readme file for win22 version 20240908.1.1 (#10572) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/windows/Windows2022-Readme.md | 54 ++++++++++++++-------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/images/windows/Windows2022-Readme.md b/images/windows/Windows2022-Readme.md index 97a34cd2421f..2f33e8b8884b 100644 --- a/images/windows/Windows2022-Readme.md +++ b/images/windows/Windows2022-Readme.md @@ -1,6 +1,6 @@ # Windows Server 2022 - OS Version: 10.0.20348 Build 2655 -- Image Version: 20240902.1.0 +- Image Version: 20240908.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -21,15 +21,15 @@ ### Package Management - Chocolatey 2.3.0 -- Composer 2.7.8 -- Helm 3.15.3 +- Composer 2.7.9 +- Helm 3.15.4 - Miniconda 24.7.1 (pre-installed on the image but not added to PATH) - NPM 10.7.0 - NuGet 6.11.0.119 - pip 24.2 (python 3.9) - Pipx 1.7.1 - RubyGems 3.2.33 -- Vcpkg (build from commit 0f88ecb85) +- Vcpkg (build from commit eba7c6a89) - Yarn 1.22.22 #### Environment variables @@ -49,7 +49,7 @@ - aria2 1.37.0 - azcopy 10.26.0 - Bazel 7.3.1 -- Bazelisk 1.19.0 +- Bazelisk 1.21.0 - Bicep 0.29.47 - Cabal 3.12.1.0 - CMake 3.30.3 @@ -60,7 +60,7 @@ - ghc 9.10.1 - Git 2.46.0.windows.1 - Git LFS 3.5.1 -- ImageMagick 7.1.1-37 +- ImageMagick 7.1.1-38 - InnoSetup 6.3.3 - jq 1.7.1 - Kind 0.24.0 @@ -73,7 +73,7 @@ - NSIS 3.10 - OpenSSL 1.1.1w - Packer 1.11.0 -- Pulumi 3.130.0 +- Pulumi 3.131.0 - R 4.4.1 - Service Fabric SDK 9.1.1436.9590 - Stack 3.1.1 @@ -87,17 +87,17 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.221 -- AWS CLI 2.17.42 +- AWS CLI 2.17.44 - AWS SAM CLI 1.123.0 - AWS Session Manager CLI 1.2.650.0 -- Azure CLI 2.63.0 +- Azure CLI 2.64.0 - Azure DevOps CLI extension 1.0.1 - GitHub CLI 2.55.0 ### Rust Tools -- Cargo 1.80.1 -- Rust 1.80.1 -- Rustdoc 1.80.1 +- Cargo 1.81.0 +- Rust 1.81.0 +- Rustdoc 1.81.0 - Rustup 1.27.1 #### Packages @@ -105,15 +105,15 @@ - cargo-audit 0.20.1 - cargo-outdated 0.15.0 - cbindgen 0.27.0 -- Clippy 0.1.80 -- Rustfmt 1.7.0 +- Clippy 0.1.81 +- Rustfmt 1.7.1 ### Browsers and Drivers -- Google Chrome 128.0.6613.114 -- Chrome Driver 128.0.6613.86 -- Microsoft Edge 128.0.2739.54 -- Microsoft Edge Driver 128.0.2739.54 -- Mozilla Firefox 129.0.2 +- Google Chrome 128.0.6613.120 +- Chrome Driver 128.0.6613.119 +- Microsoft Edge 128.0.2739.67 +- Microsoft Edge Driver 128.0.2739.67 +- Mozilla Firefox 130.0 - Gecko Driver 0.35.0 - IE Driver 4.14.0.0 - Selenium server 4.24.0 @@ -156,7 +156,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Go - 1.20.14 - 1.21.13 -- 1.22.6 +- 1.22.7 #### Node.js - 16.20.2 @@ -499,10 +499,10 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - AzureRM: 2.1.0 (Default), 6.13.1 - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.647 +- AWSPowershell: 4.1.651 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.10 -- Microsoft.Graph: 2.22.0 +- Microsoft.Graph: 2.23.0 - Pester: 3.4.0, 5.6.1 - PowerShellGet: 1.0.0.1, 2.2.5 - PSScriptAnalyzer: 1.22.0 @@ -527,16 +527,16 @@ All other versions are saved but not installed. | CMake | 3.18.1<br>3.22.1 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 26.3.11579264<br>27.0.12077973 | +| NDK | 26.3.11579264<br>27.1.12297006 | #### Environment variables | Name | Value | | ----------------------- | ---------------------------------------- | | ANDROID_HOME | C:\Android\android-sdk | -| ANDROID_NDK | C:\Android\android-sdk\ndk\27.0.12077973 | -| ANDROID_NDK_HOME | C:\Android\android-sdk\ndk\27.0.12077973 | -| ANDROID_NDK_LATEST_HOME | C:\Android\android-sdk\ndk\27.0.12077973 | -| ANDROID_NDK_ROOT | C:\Android\android-sdk\ndk\27.0.12077973 | +| ANDROID_NDK | C:\Android\android-sdk\ndk\27.1.12297006 | +| ANDROID_NDK_HOME | C:\Android\android-sdk\ndk\27.1.12297006 | +| ANDROID_NDK_LATEST_HOME | C:\Android\android-sdk\ndk\27.1.12297006 | +| ANDROID_NDK_ROOT | C:\Android\android-sdk\ndk\27.1.12297006 | | ANDROID_SDK_ROOT | C:\Android\android-sdk | ### Cached Docker images From d805d2e921e99b1cb85cd8d1e35a8b7d37e769b9 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 12 Sep 2024 23:07:40 +0000 Subject: [PATCH 3109/3485] Updating readme file for win19 version 20240908.1.1 (#10579) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/windows/Windows2019-Readme.md | 56 ++++++++++++++-------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/images/windows/Windows2019-Readme.md b/images/windows/Windows2019-Readme.md index ea0990dab2e0..8d393a0edcc7 100644 --- a/images/windows/Windows2019-Readme.md +++ b/images/windows/Windows2019-Readme.md @@ -1,6 +1,6 @@ # Windows Server 2019 - OS Version: 10.0.17763 Build 6189 -- Image Version: 20240902.1.0 +- Image Version: 20240908.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -21,15 +21,15 @@ ### Package Management - Chocolatey 2.3.0 -- Composer 2.7.8 -- Helm 3.15.3 +- Composer 2.7.9 +- Helm 3.15.4 - Miniconda 24.7.1 (pre-installed on the image but not added to PATH) - NPM 10.7.0 - NuGet 6.11.0.119 - pip 24.0 (python 3.7) - Pipx 1.2.1 - RubyGems 3.2.33 -- Vcpkg (build from commit 0f88ecb85) +- Vcpkg (build from commit eba7c6a89) - Yarn 1.22.22 #### Environment variables @@ -49,7 +49,7 @@ - aria2 1.37.0 - azcopy 10.26.0 - Bazel 7.3.1 -- Bazelisk 1.19.0 +- Bazelisk 1.21.0 - Bicep 0.29.47 - Cabal 3.12.1.0 - CMake 3.30.3 @@ -60,8 +60,8 @@ - ghc 9.10.1 - Git 2.46.0.windows.1 - Git LFS 3.5.1 -- Google Cloud CLI 490.0.0 -- ImageMagick 7.1.1-37 +- Google Cloud CLI 491.0.0 +- ImageMagick 7.1.1-38 - InnoSetup 6.3.3 - jq 1.7.1 - Kind 0.24.0 @@ -75,7 +75,7 @@ - OpenSSL 1.1.1w - Packer 1.11.0 - Parcel 2.12.0 -- Pulumi 3.130.0 +- Pulumi 3.131.0 - R 4.4.1 - Service Fabric SDK 9.1.1436.9590 - Stack 3.1.1 @@ -89,18 +89,18 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.221 -- AWS CLI 2.17.42 +- AWS CLI 2.17.44 - AWS SAM CLI 1.123.0 - AWS Session Manager CLI 1.2.650.0 -- Azure CLI 2.63.0 +- Azure CLI 2.64.0 - Azure DevOps CLI extension 1.0.1 - Cloud Foundry CLI 8.8.0 - GitHub CLI 2.55.0 ### Rust Tools -- Cargo 1.80.1 -- Rust 1.80.1 -- Rustdoc 1.80.1 +- Cargo 1.81.0 +- Rust 1.81.0 +- Rustdoc 1.81.0 - Rustup 1.27.1 #### Packages @@ -108,15 +108,15 @@ - cargo-audit 0.20.1 - cargo-outdated 0.15.0 - cbindgen 0.27.0 -- Clippy 0.1.80 -- Rustfmt 1.7.0 +- Clippy 0.1.81 +- Rustfmt 1.7.1 ### Browsers and Drivers -- Google Chrome 128.0.6613.114 -- Chrome Driver 128.0.6613.86 -- Microsoft Edge 128.0.2739.54 -- Microsoft Edge Driver 128.0.2739.54 -- Mozilla Firefox 129.0.2 +- Google Chrome 128.0.6613.120 +- Chrome Driver 128.0.6613.119 +- Microsoft Edge 128.0.2739.67 +- Microsoft Edge Driver 128.0.2739.67 +- Mozilla Firefox 130.0 - Gecko Driver 0.35.0 - IE Driver 4.14.0.0 - Selenium server 4.24.0 @@ -162,7 +162,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Go - 1.20.14 - 1.21.13 -- 1.22.6 +- 1.22.7 #### Node.js - 16.20.2 @@ -503,10 +503,10 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - AzureRM: 2.1.0 (Default), 6.13.1 - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.647 +- AWSPowershell: 4.1.651 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.10 -- Microsoft.Graph: 2.22.0 +- Microsoft.Graph: 2.23.0 - Pester: 3.4.0, 5.6.1 - PowerShellGet: 1.0.0.1, 2.2.5 - PSScriptAnalyzer: 1.22.0 @@ -532,16 +532,16 @@ All other versions are saved but not installed. | Google APIs | addon-google_apis-google-21<br>addon-google_apis-google-22<br>addon-google_apis-google-23<br>addon-google_apis-google-24 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 26.3.11579264<br>27.0.12077973 | +| NDK | 26.3.11579264<br>27.1.12297006 | #### Environment variables | Name | Value | | ----------------------- | ---------------------------------------- | | ANDROID_HOME | C:\Android\android-sdk | -| ANDROID_NDK | C:\Android\android-sdk\ndk\27.0.12077973 | -| ANDROID_NDK_HOME | C:\Android\android-sdk\ndk\27.0.12077973 | -| ANDROID_NDK_LATEST_HOME | C:\Android\android-sdk\ndk\27.0.12077973 | -| ANDROID_NDK_ROOT | C:\Android\android-sdk\ndk\27.0.12077973 | +| ANDROID_NDK | C:\Android\android-sdk\ndk\27.1.12297006 | +| ANDROID_NDK_HOME | C:\Android\android-sdk\ndk\27.1.12297006 | +| ANDROID_NDK_LATEST_HOME | C:\Android\android-sdk\ndk\27.1.12297006 | +| ANDROID_NDK_ROOT | C:\Android\android-sdk\ndk\27.1.12297006 | | ANDROID_SDK_ROOT | C:\Android\android-sdk | ### Cached Docker images From 0d40609330b0ea122f34c1a59c528a0e7519bc72 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 13 Sep 2024 01:21:23 +0000 Subject: [PATCH 3110/3485] Updating readme file for macos-12 version 20240908.1 (#10588) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-12-Readme.md | 83 +++++++++++++++++---------------- 1 file changed, 42 insertions(+), 41 deletions(-) diff --git a/images/macos/macos-12-Readme.md b/images/macos/macos-12-Readme.md index 42c7df9ff8cf..bbee79e400cc 100644 --- a/images/macos/macos-12-Readme.md +++ b/images/macos/macos-12-Readme.md @@ -1,5 +1,6 @@ | Announcements | |-| +| [[macOS] Xcodes visionOS platform will be removed from macOS-14 images on September 23, 2024](https://github.com/actions/runner-images/issues/10559) | | [[Macos] go version 1.20.0 will be removed on September 16,2024.](https://github.com/actions/runner-images/issues/10531) | | [[Macos] Android NDK 24 will be removed on September 16,2024](https://github.com/actions/runner-images/issues/10530) | | [[Macos-12] Python version 3.7 will be removed from the macos-12 image on September 16,2024](https://github.com/actions/runner-images/issues/10529) | @@ -7,7 +8,7 @@ # macOS 12 - OS Version: macOS 12.7.6 (21H1320) - Kernel Version: Darwin 21.6.0 -- Image Version: 20240901.2 +- Image Version: 20240908.1 ## Installed Software @@ -41,8 +42,8 @@ - Bundler 2.5.18 - Carthage 0.39.1 - CocoaPods 1.15.2 -- Composer 2.7.8 -- Homebrew 4.3.18 +- Composer 2.7.9 +- Homebrew 4.3.19 - Miniconda 24.7.1 - NPM 10.7.0 - NuGet 6.3.1.1 @@ -50,7 +51,7 @@ - Pip3 24.2 (python 3.12) - Pipx 1.7.1 - RubyGems 3.5.18 -- Vcpkg 2024 (build from commit 0f88ecb85) +- Vcpkg 2024 (build from commit eba7c6a89) - Yarn 1.22.22 #### Environment variables @@ -70,7 +71,7 @@ - aria2 1.37.0 - azcopy 10.26.0 - bazel 7.3.1 -- bazelisk 1.20.0 +- bazelisk 1.21.0 - bsdtar 3.5.1 - available by 'tar' alias - Curl 8.9.1 - Git 2.46.0 @@ -79,7 +80,7 @@ - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.24.5 - gpg (GnuPG) 2.4.5 -- ImageMagick 7.1.1-37 +- ImageMagick 7.1.1-38 - jq 1.7.1 - mongo 5.0.29 - mongod 5.0.29 @@ -98,10 +99,10 @@ ### Tools - App Center CLI 3.0.1 -- AWS CLI 2.17.42 +- AWS CLI 2.17.46 - AWS SAM CLI 1.123.0 - AWS Session Manager CLI 1.2.650.0 -- Azure CLI 2.63.0 +- Azure CLI 2.64.0 - Azure CLI (azure-devops) 1.0.1 - Bicep CLI 0.29.47 - Cabal 3.10.3.0 @@ -113,7 +114,7 @@ - GHCup 0.1.30.0 - Jazzy 0.15.1 - Stack 3.1.1 -- SwiftFormat 0.54.3 +- SwiftFormat 0.54.4 - Swig 4.2.1 - Xcbeautify 1.6.0 - Xcode Command Line Tools 14.2.0.0.1.1668646533 @@ -126,12 +127,12 @@ ### Browsers - Safari 17.6 (17618.3.11.11.7) - SafariDriver 17.6 (17618.3.11.11.7) -- Google Chrome 128.0.6613.114 -- Google Chrome for Testing 128.0.6613.86 -- ChromeDriver 128.0.6613.86 -- Microsoft Edge 128.0.2739.54 -- Microsoft Edge WebDriver 128.0.2739.59 -- Mozilla Firefox 129.0.2 +- Google Chrome 128.0.6613.120 +- Google Chrome for Testing 128.0.6613.119 +- ChromeDriver 128.0.6613.119 +- Microsoft Edge 128.0.2739.67 +- Microsoft Edge WebDriver 128.0.2739.69 +- Mozilla Firefox 130.0 - geckodriver 0.35.0 - Selenium server 4.24.0 @@ -179,12 +180,12 @@ #### Go - 1.20.14 - 1.21.13 -- 1.22.6 +- 1.22.7 ### Rust Tools -- Cargo 1.80.1 -- Rust 1.80.1 -- Rustdoc 1.80.1 +- Cargo 1.81.0 +- Rust 1.81.0 +- Rustdoc 1.81.0 - Rustup 1.27.1 #### Packages @@ -192,14 +193,14 @@ - Cargo-audit 0.20.1 - Cargo-outdated 0.15.0 - Cbindgen 0.27.0 -- Clippy 0.1.80 -- Rustfmt 1.7.0-stable +- Clippy 0.1.81 +- Rustfmt 1.7.1-stable ### PowerShell Tools - PowerShell 7.4.5 #### PowerShell Modules -- Az: 12.2.0 +- Az: 12.3.0 - MarkdownPS: 1.10 - Pester: 5.6.1 - PSScriptAnalyzer: 1.22.0 @@ -312,25 +313,25 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" | DriverKit 22.2 | driverkit22.2 | 14.2 | #### Installed Simulators -| OS | Xcode Version | Simulators | -| ----------- | ------------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | -| iOS 15.0 | 13.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | -| iOS 15.2 | 13.2.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | -| iOS 15.4 | 13.3.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPhone SE (3rd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | -| iOS 15.5 | 13.4.1 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPhone SE (3rd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | -| iOS 16.0 | 14.0.1 | iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPhone SE (3rd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | -| iOS 16.1 | 14.1 | iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro (9.7-inch) | -| iOS 16.2 | 14.2 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro (9.7-inch) | -| tvOS 15.0 | 13.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | -| tvOS 15.2 | 13.2.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | -| tvOS 15.4 | 13.3.1<br>13.4.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | -| tvOS 16.0 | 13.1<br>13.2.1<br>13.3.1<br>13.4.1<br>14.0.1<br>14.1<br>14.2 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | -| tvOS 16.1 | 13.1<br>13.2.1<br>13.3.1<br>13.4.1<br>14.0.1<br>14.1<br>14.2 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p)<br>Apple TV 4K (at 1080p) (2nd generation) | -| watchOS 8.0 | 13.1 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | -| watchOS 8.3 | 13.2.1 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | -| watchOS 8.5 | 13.3.1<br>13.4.1 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | -| watchOS 9.0 | 13.1<br>13.2.1<br>13.3.1<br>13.4.1<br>14.0.1<br>14.1<br>14.2 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | -| watchOS 9.1 | 13.1<br>13.2.1<br>13.3.1<br>13.4.1<br>14.0.1<br>14.1<br>14.2 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | +| OS | Simulators | +| ----------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | +| iOS 15.0 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | +| iOS 15.2 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | +| iOS 15.4 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPhone SE (3rd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | +| iOS 15.5 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPhone SE (3rd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | +| iOS 16.0 | iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPhone SE (3rd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | +| iOS 16.1 | iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro (9.7-inch) | +| iOS 16.2 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro (9.7-inch) | +| tvOS 15.0 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | +| tvOS 15.2 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | +| tvOS 15.4 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | +| tvOS 16.0 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | +| tvOS 16.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p)<br>Apple TV 4K (at 1080p) (2nd generation) | +| watchOS 8.0 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | +| watchOS 8.3 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | +| watchOS 8.5 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | +| watchOS 9.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | +| watchOS 9.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | ### Android | Package Name | Version | From 6774220762674ea0fcc5639c386397bed4018457 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 13 Sep 2024 03:53:40 +0000 Subject: [PATCH 3111/3485] Updating readme file for ubuntu22 version 20240908.1.1 (#10574) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2204-Readme.md | 82 +++++++++++++++--------------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/images/ubuntu/Ubuntu2204-Readme.md b/images/ubuntu/Ubuntu2204-Readme.md index 7d8622fdb44e..94007b8bbc32 100644 --- a/images/ubuntu/Ubuntu2204-Readme.md +++ b/images/ubuntu/Ubuntu2204-Readme.md @@ -6,7 +6,7 @@ # Ubuntu 22.04 - OS Version: 22.04.4 LTS - Kernel Version: 6.5.0-1025-azure -- Image Version: 20240901.1.0 +- Image Version: 20240908.1.0 - Systemd version: 249.11-0ubuntu3.12 ## Installed Software @@ -32,7 +32,7 @@ ### Package Management - cpan 1.64 - Helm 3.15.4 -- Homebrew 4.3.18 +- Homebrew 4.3.19 - Miniconda 24.7.1 - Npm 10.7.0 - NuGet 6.6.1.2 @@ -40,7 +40,7 @@ - Pip3 22.0.2 - Pipx 1.7.1 - RubyGems 3.3.5 -- Vcpkg (build from commit 0f88ecb85) +- Vcpkg (build from commit eba7c6a89) - Yarn 1.22.22 #### Environment variables @@ -69,7 +69,7 @@ to accomplish this. - apt-fast 1.10.0 - AzCopy 10.26.0 - available by `azcopy` and `azcopy10` aliases - Bazel 7.3.1 -- Bazelisk 1.19.0 +- Bazelisk 1.21.0 - Bicep 0.29.47 - Buildah 1.23.1 - CMake 3.30.3 @@ -84,7 +84,7 @@ to accomplish this. - Git LFS 3.5.1 - Git-ftp 1.6.0 - Haveged 1.9.14 -- Heroku 9.2.0 +- Heroku 9.2.1 - jq 1.6 - Kind 0.24.0 - Kubectl 1.31.0 @@ -93,14 +93,14 @@ to accomplish this. - MediaInfo 21.09 - Mercurial 6.1.1 - Minikube 1.33.1 -- n 9.2.3 +- n 10.0.0 - Newman 6.2.1 - nvm 0.40.1 -- OpenSSL 3.0.2-0ubuntu1.17 +- OpenSSL 3.0.2-0ubuntu1.18 - Packer 1.11.2 - Parcel 2.12.0 - Podman 3.4.4 -- Pulumi 3.130.0 +- Pulumi 3.131.0 - R 4.4.1 - Skopeo 1.4.1 - Sphinx Open Source Search Server 2.2.11 @@ -112,17 +112,17 @@ to accomplish this. ### CLI Tools - Alibaba Cloud CLI 3.0.221 -- AWS CLI 2.17.42 +- AWS CLI 2.17.46 - AWS CLI Session Manager Plugin 1.2.650.0 - AWS SAM CLI 1.123.0 -- Azure CLI 2.63.0 +- Azure CLI 2.64.0 - Azure CLI (azure-devops) 1.0.1 - GitHub CLI 2.55.0 -- Google Cloud CLI 490.0.0 -- Netlify CLI 17.34.3 -- OpenShift CLI 4.16.9 +- Google Cloud CLI 491.0.0 +- Netlify CLI 17.35.0 +- OpenShift CLI 4.16.10 - ORAS CLI 1.2.0 -- Vercel CLI 37.2.1 +- Vercel CLI 37.4.0 ### Java | Version | Environment Variable | @@ -134,7 +134,7 @@ to accomplish this. ### PHP Tools - PHP: 8.1.2 -- Composer 2.7.8 +- Composer 2.7.9 - PHPUnit 8.5.39 ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. @@ -147,27 +147,27 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Stack 3.1.1 ### Rust Tools -- Cargo 1.80.1 -- Rust 1.80.1 -- Rustdoc 1.80.1 +- Cargo 1.81.0 +- Rust 1.81.0 +- Rustdoc 1.81.0 - Rustup 1.27.1 #### Packages - Bindgen 0.70.1 - Cargo audit 0.20.1 -- Cargo clippy 0.1.80 +- Cargo clippy 0.1.81 - Cargo outdated 0.15.0 - Cbindgen 0.27.0 -- Rustfmt 1.7.0 +- Rustfmt 1.7.1 ### Browsers and Drivers -- Google Chrome 128.0.6613.113 -- ChromeDriver 128.0.6613.86 +- Google Chrome 128.0.6613.119 +- ChromeDriver 128.0.6613.119 - Chromium 128.0.6613.0 -- Microsoft Edge 128.0.2739.54 -- Microsoft Edge WebDriver 128.0.2739.56 +- Microsoft Edge 128.0.2739.67 +- Microsoft Edge WebDriver 128.0.2739.68 - Selenium server 4.24.0 -- Mozilla Firefox 129.0.2 +- Mozilla Firefox 130.0 - Geckodriver 0.35.0 #### Environment variables @@ -211,7 +211,7 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Go - 1.20.14 - 1.21.13 -- 1.22.6 +- 1.22.7 #### Node.js - 16.20.2 @@ -242,7 +242,7 @@ Use the following command as a part of your job to start the service: 'sudo syst #### PowerShell Modules - Az: 12.1.0 - MarkdownPS: 1.10 -- Microsoft.Graph: 2.22.0 +- Microsoft.Graph: 2.23.0 - Pester: 5.6.1 - PSScriptAnalyzer: 1.22.0 @@ -262,34 +262,34 @@ Use the following command as a part of your job to start the service: 'sudo syst | CMake | 3.10.2<br>3.18.1<br>3.22.1 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 26.3.11579264<br>27.0.12077973 (default) | +| NDK | 26.3.11579264<br>27.1.12297006 (default) | #### Environment variables | Name | Value | | ----------------------- | -------------------------------------------- | | ANDROID_HOME | /usr/local/lib/android/sdk | -| ANDROID_NDK | /usr/local/lib/android/sdk/ndk/27.0.12077973 | -| ANDROID_NDK_HOME | /usr/local/lib/android/sdk/ndk/27.0.12077973 | -| ANDROID_NDK_LATEST_HOME | /usr/local/lib/android/sdk/ndk/27.0.12077973 | -| ANDROID_NDK_ROOT | /usr/local/lib/android/sdk/ndk/27.0.12077973 | +| ANDROID_NDK | /usr/local/lib/android/sdk/ndk/27.1.12297006 | +| ANDROID_NDK_HOME | /usr/local/lib/android/sdk/ndk/27.1.12297006 | +| ANDROID_NDK_LATEST_HOME | /usr/local/lib/android/sdk/ndk/27.1.12297006 | +| ANDROID_NDK_ROOT | /usr/local/lib/android/sdk/ndk/27.1.12297006 | | ANDROID_SDK_ROOT | /usr/local/lib/android/sdk | ### Cached Docker images | Repository:Tag | Digest | Created | | -------------------- | ------------------------------------------------------------------------ | ---------- | | alpine:3.16 | sha256:452e7292acee0ee16c332324d7de05fa2c99f9994ecc9f0779c602916a672ae4 | 2024-01-27 | -| alpine:3.17 | sha256:ef813b2faa3dd1a37f9ef6ca98347b72cd0f55e4ab29fb90946f1b853bf032d9 | 2024-07-22 | -| alpine:3.18 | sha256:5292533eb4efd4b5cf35e93b5a2b7d0e07ea193224c49446c7802c19ee4f2da5 | 2024-07-22 | -| alpine:3.19 | sha256:95c16745f100f44cf9a0939fd3f357905f845f8b6fa7d0cde0e88c9764060185 | 2024-07-22 | +| alpine:3.17 | sha256:3451da08fc6ef554a100da3e2df5ac6d598c82f2a774d5f6ed465c3d80cd163a | 2024-09-06 | +| alpine:3.18 | sha256:3ddf7bf1d408188f9849efbf4f902720ae08f5131bb39013518b918aa056d0de | 2024-09-06 | +| alpine:3.19 | sha256:ae65dbf8749a7d4527648ccee1fa3deb6bfcae34cbc30fc67aa45c44dcaa90ee | 2024-09-06 | | debian:10 | sha256:58ce6f1271ae1c8a2006ff7d3e54e9874d839f573d8009c20154ad0f2fb0a225 | 2024-06-13 | -| debian:11 | sha256:0bb606aad3307370c8b4502eff11fde298e5b7721e59a0da3ce9b30cb92045ed | 2024-08-13 | +| debian:11 | sha256:8ccc486c29a3ad02ad5af7f1156e2152dff3ba5634eec9be375269ef123457d8 | 2024-09-04 | | moby/buildkit:latest | sha256:e0b10610709509aded9b101a61a090e24a5161f46d5eb8a479297fe96aa5d8ac | 2024-08-15 | | node:16 | sha256:f77a1aef2da8d83e45ec990f45df50f1a286c5fe8bbfb8c6e4246c6389705c0b | 2023-09-07 | | node:16-alpine | sha256:a1f9d027912b58a7c75be7716c97cfbc6d3099f3a97ed84aa490be9dee20e787 | 2023-08-10 | -| node:18 | sha256:a7ff16657263663c1e92ba3060cdbba0e77329a0a4cb3c27bbbbe90c6e20bd87 | 2024-07-09 | -| node:18-alpine | sha256:17514b20acef0e79691285e7a59f3ae561f7a1702a9adc72a515aef23f326729 | 2024-07-09 | -| node:20 | sha256:a4d1de4c7339eabcf78a90137dfd551b798829e3ef3e399e0036ac454afa1291 | 2024-08-21 | -| node:20-alpine | sha256:1a526b97cace6b4006256570efa1a29cd1fe4b96a5301f8d48e87c5139438a45 | 2024-08-21 | +| node:18 | sha256:ca07c02d13baf021ff5aadb3b48bcd1fcdd454826266ac313ce858676e8c1548 | 2024-07-09 | +| node:18-alpine | sha256:02376a266c84acbf45bd19440e08e48b1c8b98037417334046029ab585de03e2 | 2024-07-09 | +| node:20 | sha256:48db4f6ea21d134be744207225753a1730c4bc1b4cdf836d44511c36bf0e34d7 | 2024-08-21 | +| node:20-alpine | sha256:2d07db07a2df6830718ae2a47db6fedce6745f5bcd174c398f2acdda90a11c03 | 2024-08-21 | | ubuntu:20.04 | sha256:fa17826afb526a9fc7250e0fbcbfd18d03fe7a54849472f86879d8bf562c629e | 2024-08-13 | | ubuntu:22.04 | sha256:adbb90115a21969d2fe6fa7f9af4253e16d45f8d4c1e930182610c4731962658 | 2024-08-13 | @@ -338,7 +338,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | libmagickwand-dev | 8:6.9.11.60+dfsg-1.3ubuntu0.22.04.5 | | libsecret-1-dev | 0.20.5-2 | | libsqlite3-dev | 3.37.2-2ubuntu0.3 | -| libssl-dev | 3.0.2-0ubuntu1.17 | +| libssl-dev | 3.0.2-0ubuntu1.18 | | libtool | 2.4.6-15build2 | | libunwind8 | 1.3.2-2build2.1 | | libxkbfile-dev | 1:1.1.0-1build3 | From ba7e034f051590796d55082c7f75a2e2d23d3157 Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Fri, 13 Sep 2024 14:24:42 +0200 Subject: [PATCH 3112/3485] [macOS] Update Xcode 16.0 to RC1 on macOS-15 (#10586) --- images/macos/scripts/tests/Xcode.Tests.ps1 | 4 ++-- images/macos/toolsets/toolset-15.json | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/images/macos/scripts/tests/Xcode.Tests.ps1 b/images/macos/scripts/tests/Xcode.Tests.ps1 index 4228f1a2bc51..4489b9ab3d5b 100644 --- a/images/macos/scripts/tests/Xcode.Tests.ps1 +++ b/images/macos/scripts/tests/Xcode.Tests.ps1 @@ -28,8 +28,8 @@ Describe "Xcode" { $defaultXcodeTestCase = @{ DefaultXcode = $defaultXcode } It "Default Xcode is <DefaultXcode>" -TestCases $defaultXcodeTestCase { "xcodebuild -version" | Should -ReturnZeroExitCode - If ($DefaultXcode -ilike "*beta*") { - Write-Host "Beta version detected" + If ($DefaultXcode -ilike "*_*") { + Write-Host "Composite version detected (beta/RC/preview)" $DefaultXcode = $DefaultXcode.split("_")[0] If ($DefaultXcode -notlike "*.*") { $DefaultXcode = "${DefaultXcode}.0" diff --git a/images/macos/toolsets/toolset-15.json b/images/macos/toolsets/toolset-15.json index 003c0f4fa36a..646f4edffcb6 100644 --- a/images/macos/toolsets/toolset-15.json +++ b/images/macos/toolsets/toolset-15.json @@ -1,16 +1,16 @@ { "xcode": { - "default": "16.1_beta", + "default": "16_Release_Candidate", "x64": { "versions": [ { "link": "16.1_beta", "version": "16.1.0-Beta+16B5001e", "symlinks": ["16.1"], "install_runtimes": "false", "sha256": "8848aacb32bdc0abbd7e14e4b712e07c98f4b6e5a23a8d77db03ab21dcb3c777"}, - { "link": "16_beta_6", "version": "16.0.0-Beta.6+16A5230g", "symlinks": ["16.0"], "install_runtimes": "true", "sha256": "ab0b9a4f6d723420ee0e39ff1cf6a628665dfe832053f66b6b72e013a6bbb244"} + { "link": "16_Release_Candidate", "version": "16.0.0-Release.Candidate+16A242", "symlinks": ["16.0"], "install_runtimes": "true", "sha256": "84588e4d781307191892add603ea51504955de39e05c270a88833a38a929825d"} ] }, "arm64":{ "versions": [ { "link": "16.1_beta", "version": "16.1.0-Beta+16B5001e", "symlinks": ["16.1"], "install_runtimes": "true", "sha256": "8848aacb32bdc0abbd7e14e4b712e07c98f4b6e5a23a8d77db03ab21dcb3c777"}, - { "link": "16_beta_6", "version": "16.0.0-Beta.6+16A5230g", "symlinks": ["16.0"], "install_runtimes": "true", "sha256": "ab0b9a4f6d723420ee0e39ff1cf6a628665dfe832053f66b6b72e013a6bbb244"} + { "link": "16_Release_Candidate", "version": "16.0.0-Release.Candidate+16A242", "symlinks": ["16.0"], "install_runtimes": "true", "sha256": "84588e4d781307191892add603ea51504955de39e05c270a88833a38a929825d"} ] } }, From 71f35314bce8300974a9a9219d4d28f7036f730d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 14 Sep 2024 09:29:24 +0000 Subject: [PATCH 3113/3485] Updating readme file for win22 version 20240912.1.1 (#10608) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/windows/Windows2022-Readme.md | 48 ++++++++++++++-------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/images/windows/Windows2022-Readme.md b/images/windows/Windows2022-Readme.md index 2f33e8b8884b..ce5bf09819cb 100644 --- a/images/windows/Windows2022-Readme.md +++ b/images/windows/Windows2022-Readme.md @@ -1,6 +1,6 @@ # Windows Server 2022 -- OS Version: 10.0.20348 Build 2655 -- Image Version: 20240908.1.0 +- OS Version: 10.0.20348 Build 2700 +- Image Version: 20240912.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -29,7 +29,7 @@ - pip 24.2 (python 3.9) - Pipx 1.7.1 - RubyGems 3.2.33 -- Vcpkg (build from commit eba7c6a89) +- Vcpkg (build from commit 9f11f2df3) - Yarn 1.22.22 #### Environment variables @@ -86,13 +86,13 @@ - zstd 1.5.6 ### CLI Tools -- Alibaba Cloud CLI 3.0.221 -- AWS CLI 2.17.44 -- AWS SAM CLI 1.123.0 +- Alibaba Cloud CLI 3.0.222 +- AWS CLI 2.17.48 +- AWS SAM CLI 1.124.0 - AWS Session Manager CLI 1.2.650.0 - Azure CLI 2.64.0 - Azure DevOps CLI extension 1.0.1 -- GitHub CLI 2.55.0 +- GitHub CLI 2.56.0 ### Rust Tools - Cargo 1.81.0 @@ -109,9 +109,9 @@ - Rustfmt 1.7.1 ### Browsers and Drivers -- Google Chrome 128.0.6613.120 -- Chrome Driver 128.0.6613.119 -- Microsoft Edge 128.0.2739.67 +- Google Chrome 128.0.6613.138 +- Chrome Driver 128.0.6613.137 +- Microsoft Edge 128.0.2739.79 - Microsoft Edge Driver 128.0.2739.67 - Mozilla Firefox 130.0 - Gecko Driver 0.35.0 @@ -169,7 +169,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 3.9.13 - 3.10.11 - 3.11.9 -- 3.12.5 +- 3.12.6 #### PyPy - 2.7.18 [PyPy 7.3.17] @@ -218,7 +218,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Visual Studio Enterprise 2022 | Name | Version | Path | | ----------------------------- | --------------- | -------------------------------------------------------- | -| Visual Studio Enterprise 2022 | 17.11.35222.181 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | +| Visual Studio Enterprise 2022 | 17.11.35303.130 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | #### Workloads, components and extensions | Package | Version | @@ -245,14 +245,14 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Component.Unreal | 17.11.35102.94 | | Component.Unreal.Android | 17.11.35102.94 | | Component.Unreal.Ide | 17.11.35102.94 | -| Component.VisualStudio.GitHub.Copilot | 17.11.35221.97 | +| Component.VisualStudio.GitHub.Copilot | 17.11.35303.118 | | Component.VSInstallerProjects2022 | 2.0.1 | | Component.WixToolset.VisualStudioExtension.Dev17 | 1.0.0.22 | | Component.WixToolset.VisualStudioExtension.Schemas3 | 1.0.0.22 | | Component.Xamarin | 17.11.35102.94 | | Component.Xamarin.RemotedSimulator | 17.11.35102.94 | -| ios | 17.5.8020.0 | -| maccatalyst | 17.5.8020.0 | +| ios | 17.5.8030.0 | +| maccatalyst | 17.5.8030.0 | | maui.blazor | 8.0.72.11171 | | maui.core | 8.0.72.11171 | | maui.windows | 8.0.72.11171 | @@ -291,9 +291,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | microsoft.net.runtime.mono.tooling.net7 | 8.0.824.36612 | | microsoft.net.sdk.emscripten | 8.0.10.35802 | | Microsoft.NetCore.Component.DevelopmentTools | 17.11.35102.94 | -| Microsoft.NetCore.Component.Runtime.6.0 | 17.11.35207.189 | -| Microsoft.NetCore.Component.Runtime.8.0 | 17.11.35207.189 | -| Microsoft.NetCore.Component.SDK | 17.11.35207.189 | +| Microsoft.NetCore.Component.Runtime.6.0 | 17.11.35303.118 | +| Microsoft.NetCore.Component.Runtime.8.0 | 17.11.35303.118 | +| Microsoft.NetCore.Component.SDK | 17.11.35303.118 | | Microsoft.NetCore.Component.Web | 17.11.35102.94 | | Microsoft.VisualStudio.Component.AppInsights.Tools | 17.11.35102.94 | | Microsoft.VisualStudio.Component.AspNet | 17.11.35102.94 | @@ -499,7 +499,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - AzureRM: 2.1.0 (Default), 6.13.1 - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.651 +- AWSPowershell: 4.1.654 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.10 - Microsoft.Graph: 2.23.0 @@ -542,8 +542,8 @@ All other versions are saved but not installed. ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2022 | sha256:d15f31091ee3a26dec0a6be0eba16fd8670254ad7b38aa31534d7b9e6479730b | 2024-08-13 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2022 | sha256:760d668c39bd3a2cd18da83ed11d7bea9398b13745a4c6706b740a4f7d127ef4 | 2024-08-13 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:b3f427a83d221958f6b2f3a49421e42d2fbd26e0d6afaed41cba7ee6fd4a4805 | 2024-08-13 | -| mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:244113e50a678a25a63930780f9ccafd22e1a37aa9e3d93295e4cebf0f170a11 | 2024-08-10 | -| mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:a57f79008ec0110877d5907787095c413fae1c27cccf1473bc9646fd7325febe | 2024-08-10 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2022 | sha256:694e99af0ec996e63e6204e40e51869daf87c42d9bc628255804e32e2858b39c | 2024-09-10 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2022 | sha256:c9ff4d54c2a82dd154d3624fc8db44a9abe7913ab70f3aca5cb95213ed9621c5 | 2024-09-10 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:b6d6f01a449977c597a196a95f7f10e2c2b6438f7f9920744ceb11febeb61f27 | 2024-09-10 | +| mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:be3440ee2f36ed823a21df34e8e65026743d801dbc71e9311d03603775fc69c1 | 2024-09-05 | +| mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:b7b2e5b4c2414400c4eef13db747376e0f10ef8e15b8d0587ef5b953ad4e6d43 | 2024-09-06 | From ce2a3e8e67858dc8c3dd77aca6b29e2956d934ed Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 14 Sep 2024 18:22:53 +0000 Subject: [PATCH 3114/3485] Updating readme file for macos-14-arm64 version 20240911.3 (#10603) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-14-arm64-Readme.md | 118 +++++++++++++------------- 1 file changed, 58 insertions(+), 60 deletions(-) diff --git a/images/macos/macos-14-arm64-Readme.md b/images/macos/macos-14-arm64-Readme.md index 273b896f4cf2..ebe8400f8f9f 100644 --- a/images/macos/macos-14-arm64-Readme.md +++ b/images/macos/macos-14-arm64-Readme.md @@ -1,13 +1,11 @@ | Announcements | |-| -| [[Macos] go version 1.20.0 will be removed on September 16,2024.](https://github.com/actions/runner-images/issues/10531) | -| [[Macos] Android NDK 24 will be removed on September 16,2024](https://github.com/actions/runner-images/issues/10530) | -| [[Macos-12] Python version 3.7 will be removed from the macos-12 image on September 16,2024](https://github.com/actions/runner-images/issues/10529) | +| [[macOS] Xcodes visionOS platform will be removed from macOS-14 images on September 23, 2024](https://github.com/actions/runner-images/issues/10559) | *** # macOS 14 - OS Version: macOS 14.6.1 (23G93) - Kernel Version: Darwin 23.6.0 -- Image Version: 20240903.5 +- Image Version: 20240911.3 ## Installed Software @@ -26,14 +24,14 @@ - Mono 6.12.0.188 - Node.js 20.17.0 - Perl 5.38.2 -- Python3 3.12.5 +- Python3 3.12.6 - Ruby 3.0.7p220 ### Package Management - Bundler 2.5.18 -- Carthage 0.39.1 +- Carthage 0.40.0 - CocoaPods 1.15.2 -- Homebrew 4.3.19 +- Homebrew 4.3.20 - NPM 10.8.2 - NuGet 6.3.1.1 - Pip3 24.2 (python 3.12) @@ -44,19 +42,19 @@ ### Project Management - Apache Ant 1.10.15 - Apache Maven 3.9.9 -- Gradle 8.10 +- Gradle 8.10.1 ### Utilities - 7-Zip 17.05 - aria2 1.37.0 - azcopy 10.26.0 - bazel 7.3.1 -- bazelisk 1.20.0 +- bazelisk 1.21.0 - bsdtar 3.5.3 - available by 'tar' alias - Curl 8.7.1 - Git 2.46.0 - Git LFS 3.5.1 -- GitHub CLI 2.55.0 +- GitHub CLI 2.56.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.24.5 - gpg (GnuPG) 2.4.5 @@ -68,7 +66,7 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.17.42 +- AWS CLI 2.17.49 - AWS SAM CLI 1.123.0 - AWS Session Manager CLI 1.2.650.0 - Azure CLI 2.64.0 @@ -77,7 +75,7 @@ - Cmake 3.30.3 - CodeQL Action Bundle 2.18.3 - Fastlane 2.222.0 -- SwiftFormat 0.54.3 +- SwiftFormat 0.54.4 - Xcbeautify 2.11.0 - Xcode Command Line Tools 15.3.0.0.1.1708646388 - Xcodes 1.5.0 @@ -87,9 +85,9 @@ ### Browsers - Safari 17.6 (19618.3.11.11.5) - SafariDriver 17.6 (19618.3.11.11.5) -- Google Chrome 128.0.6613.120 -- Google Chrome for Testing 128.0.6613.119 -- ChromeDriver 128.0.6613.119 +- Google Chrome 128.0.6613.138 +- Google Chrome for Testing 128.0.6613.137 +- ChromeDriver 128.0.6613.137 - Selenium server 4.24.0 #### Environment variables @@ -112,7 +110,7 @@ - 3.9.13 - 3.10.11 - 3.11.9 -- 3.12.5 +- 3.12.6 #### Node.js - 18.20.4 @@ -121,17 +119,17 @@ #### Go - 1.20.14 - 1.21.13 -- 1.22.6 +- 1.22.7 ### Rust Tools -- Cargo 1.80.1 -- Rust 1.80.1 -- Rustdoc 1.80.1 +- Cargo 1.81.0 +- Rust 1.81.0 +- Rustdoc 1.81.0 - Rustup 1.27.1 #### Packages -- Clippy 0.1.80 -- Rustfmt 1.7.0-stable +- Clippy 0.1.81 +- Rustfmt 1.7.1-stable ### PowerShell Tools - PowerShell 7.4.5 @@ -142,16 +140,16 @@ - PSScriptAnalyzer: 1.22.0 ### Xcode -| Version | Build | Path | -| -------------- | -------- | --------------------------------- | -| 16.1 (beta) | 16B5001e | /Applications/Xcode_16.1_beta.app | -| 16.0 (beta) | 16A5230g | /Applications/Xcode_16_beta_6.app | -| 15.4 (default) | 15F31d | /Applications/Xcode_15.4.app | -| 15.3 | 15E204a | /Applications/Xcode_15.3.app | -| 15.2 | 15C500b | /Applications/Xcode_15.2.app | -| 15.1 | 15C65 | /Applications/Xcode_15.1.app | -| 15.0.1 | 15A507 | /Applications/Xcode_15.0.1.app | -| 14.3.1 | 14E300c | /Applications/Xcode_14.3.1.app | +| Version | Build | Path | +| -------------- | -------- | -------------------------------------------- | +| 16.1 (beta) | 16B5001e | /Applications/Xcode_16.1_beta.app | +| 16.0 | 16A242 | /Applications/Xcode_16_Release_Candidate.app | +| 15.4 (default) | 15F31d | /Applications/Xcode_15.4.app | +| 15.3 | 15E204a | /Applications/Xcode_15.3.app | +| 15.2 | 15C500b | /Applications/Xcode_15.2.app | +| 15.1 | 15C65 | /Applications/Xcode_15.1.app | +| 15.0.1 | 15A507 | /Applications/Xcode_15.0.1.app | +| 14.3.1 | 14E300c | /Applications/Xcode_14.3.1.app | #### Installed SDKs | SDK | SDK Name | Xcode Version | @@ -201,12 +199,12 @@ | Simulator - watchOS 10.4 | watchsimulator10.4 | 15.3 | | Simulator - watchOS 10.5 | watchsimulator10.5 | 15.4 | | Simulator - watchOS 11.0 | watchsimulator11.0 | 16.0, 16.1 | -| Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | | visionOS 1.0 | xros1.0 | 15.2 | -| visionOS 1.1 | xros1.1 | 15.3 | +| Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | | Simulator - visionOS 1.1 | xrsimulator1.1 | 15.3 | -| Simulator - visionOS 1.2 | xrsimulator1.2 | 15.4 | +| visionOS 1.1 | xros1.1 | 15.3 | | visionOS 1.2 | xros1.2 | 15.4 | +| Simulator - visionOS 1.2 | xrsimulator1.2 | 15.4 | | Simulator - visionOS 2.0 | xrsimulator2.0 | 16.0, 16.1 | | visionOS 2.0 | xros2.0 | 16.0, 16.1 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | @@ -221,31 +219,31 @@ | DriverKit 24.1 | driverkit24.1 | 16.1 | #### Installed Simulators -| OS | Xcode Version | Simulators | -| ------------ | ---------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| iOS 16.4 | 14.3.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 17.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0<br>16.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 17.2 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0<br>16.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 17.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0<br>16.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | -| iOS 17.5 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0<br>16.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | -| iOS 18.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0<br>16.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | -| iOS 18.1 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0<br>16.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | -| tvOS 16.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0<br>16.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 17.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0<br>16.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 17.2 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0<br>16.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 17.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0<br>16.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 17.5 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0<br>16.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 18.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0<br>16.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| watchOS 9.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0<br>16.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | -| watchOS 10.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0<br>16.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | -| watchOS 10.2 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0<br>16.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | -| watchOS 10.4 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0<br>16.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | -| watchOS 10.5 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0<br>16.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | -| watchOS 11.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0<br>16.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | -| visionOS 1.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0<br>16.1 | Apple Vision Pro | -| visionOS 1.1 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0<br>16.1 | Apple Vision Pro | -| visionOS 1.2 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0<br>16.1 | Apple Vision Pro | -| visionOS 2.0 | 14.3.1<br>15.0.1<br>15.1<br>15.2<br>15.3<br>15.4<br>16.0<br>16.1 | Apple Vision Pro | +| OS | Simulators | +| ------------ | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| iOS 16.4 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 17.0 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 17.2 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 17.4 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | +| iOS 17.5 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | +| iOS 18.0 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone 16<br>iPhone 16 Plus<br>iPhone 16 Pro<br>iPhone 16 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | +| iOS 18.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone 16<br>iPhone 16 Plus<br>iPhone 16 Pro<br>iPhone 16 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | +| tvOS 16.4 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 17.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 17.2 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 17.4 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 17.5 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 18.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| watchOS 9.4 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | +| watchOS 10.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 10.2 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 10.4 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 10.5 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 11.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 10 (42mm)<br>Apple Watch Series 10 (46mm)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | +| visionOS 1.0 | Apple Vision Pro | +| visionOS 1.1 | Apple Vision Pro | +| visionOS 1.2 | Apple Vision Pro | +| visionOS 2.0 | Apple Vision Pro | ### Android | Package Name | Version | From 370d12f1b66fe7235a8d2a16b094e1639cb54b9e Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Tue, 17 Sep 2024 17:55:00 +0200 Subject: [PATCH 3115/3485] [macOS] Workaround issue with Xamarin Pester tests discovery (#10633) --- images/macos/scripts/tests/Xamarin.Tests.ps1 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/images/macos/scripts/tests/Xamarin.Tests.ps1 b/images/macos/scripts/tests/Xamarin.Tests.ps1 index 3b808fd0328f..a09f87f138d2 100644 --- a/images/macos/scripts/tests/Xamarin.Tests.ps1 +++ b/images/macos/scripts/tests/Xamarin.Tests.ps1 @@ -15,6 +15,11 @@ if ($os.IsVentura -or $os.IsSonoma) { $XAMARIN_ANDROID_VERSIONS = (Get-ToolsetContent).xamarin.android_versions } elseif ($os.IsSequoia) { Write-Host "Skipping all the Mono and Xamarin tests as deprecated" + # Dummy workaround for the issue with the tests discovery + $MONO_VERSIONS = @() + $XAMARIN_IOS_VERSIONS = @() + $XAMARIN_MAC_VERSIONS = @() + $XAMARIN_ANDROID_VERSIONS = @() } BeforeAll { From cd07f9077f59f637af89d92c16094e417a8b141a Mon Sep 17 00:00:00 2001 From: sarathrajsrinivasan <159180023+sarathrajsrinivasan@users.noreply.github.com> Date: Tue, 17 Sep 2024 12:40:51 -0700 Subject: [PATCH 3116/3485] [macOS] Replace Xcode 16 RC with Xcode 16.0 on macOS-14 and macOS-15 (#10635) --- images/macos/toolsets/toolset-14.json | 4 ++-- images/macos/toolsets/toolset-15.json | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/images/macos/toolsets/toolset-14.json b/images/macos/toolsets/toolset-14.json index e1413f7fa676..b39aa6d3faaa 100644 --- a/images/macos/toolsets/toolset-14.json +++ b/images/macos/toolsets/toolset-14.json @@ -4,7 +4,7 @@ "x64": { "versions": [ { "link": "16.1_beta", "version": "16.1.0-Beta+16B5001e", "symlinks": ["16.1"], "install_runtimes": "true", "sha256": "8848aacb32bdc0abbd7e14e4b712e07c98f4b6e5a23a8d77db03ab21dcb3c777"}, - { "link": "16_Release_Candidate", "version": "16.0.0-Release.Candidate+16A242", "symlinks": ["16.0"], "install_runtimes": "true", "sha256": "84588e4d781307191892add603ea51504955de39e05c270a88833a38a929825d"}, + { "link": "16", "version": "16.0.0+16A242d", "symlinks": ["16.0"], "install_runtimes": "true", "sha256": "4a26c3d102a55c7222fb145e0ee1503249c9c26c6e02dc64d783c8810b37b1e3"}, { "link": "15.4", "version": "15.4.0+15F31d", "install_runtimes": "true", "sha256": "82d3d61804ff3f4c7c82085e91dc701037ddaa770e542848b2477e22f4e8aa7a"}, { "link": "15.3", "version": "15.3.0+15E204a", "install_runtimes": "true", "sha256": "f13f6a2e2df432c3008e394640b8549a18c285acd7fd148d6c4bac8c3a5af234"}, { "link": "15.2", "version": "15.2.0+15C500b", "install_runtimes": "true", "sha256": "04E93680C6DDBEC84666531BE412DE778AFC8EAC6AB2037F4C2BE7290818B59B"}, @@ -16,7 +16,7 @@ "arm64":{ "versions": [ { "link": "16.1_beta", "version": "16.1.0-Beta+16B5001e", "symlinks": ["16.1"], "install_runtimes": "true", "sha256": "8848aacb32bdc0abbd7e14e4b712e07c98f4b6e5a23a8d77db03ab21dcb3c777"}, - { "link": "16_Release_Candidate", "version": "16.0.0-Release.Candidate+16A242", "symlinks": ["16.0"], "install_runtimes": "true", "sha256": "84588e4d781307191892add603ea51504955de39e05c270a88833a38a929825d"}, + { "link": "16", "version": "16.0.0+16A242d", "symlinks": ["16.0"], "install_runtimes": "true", "sha256": "4a26c3d102a55c7222fb145e0ee1503249c9c26c6e02dc64d783c8810b37b1e3"}, { "link": "15.4", "version": "15.4.0+15F31d", "install_runtimes": "true", "sha256": "82d3d61804ff3f4c7c82085e91dc701037ddaa770e542848b2477e22f4e8aa7a"}, { "link": "15.3", "version": "15.3.0+15E204a", "install_runtimes": "true", "sha256": "f13f6a2e2df432c3008e394640b8549a18c285acd7fd148d6c4bac8c3a5af234"}, { "link": "15.2", "version": "15.2.0+15C500b", "install_runtimes": "true", "sha256": "04E93680C6DDBEC84666531BE412DE778AFC8EAC6AB2037F4C2BE7290818B59B"}, diff --git a/images/macos/toolsets/toolset-15.json b/images/macos/toolsets/toolset-15.json index 646f4edffcb6..ae3d64eaeb0f 100644 --- a/images/macos/toolsets/toolset-15.json +++ b/images/macos/toolsets/toolset-15.json @@ -1,16 +1,16 @@ { "xcode": { - "default": "16_Release_Candidate", + "default": "16", "x64": { "versions": [ { "link": "16.1_beta", "version": "16.1.0-Beta+16B5001e", "symlinks": ["16.1"], "install_runtimes": "false", "sha256": "8848aacb32bdc0abbd7e14e4b712e07c98f4b6e5a23a8d77db03ab21dcb3c777"}, - { "link": "16_Release_Candidate", "version": "16.0.0-Release.Candidate+16A242", "symlinks": ["16.0"], "install_runtimes": "true", "sha256": "84588e4d781307191892add603ea51504955de39e05c270a88833a38a929825d"} + { "link": "16", "version": "16.0.0+16A242d", "symlinks": ["16.0"], "install_runtimes": "true", "sha256": "4a26c3d102a55c7222fb145e0ee1503249c9c26c6e02dc64d783c8810b37b1e3"} ] }, "arm64":{ "versions": [ { "link": "16.1_beta", "version": "16.1.0-Beta+16B5001e", "symlinks": ["16.1"], "install_runtimes": "true", "sha256": "8848aacb32bdc0abbd7e14e4b712e07c98f4b6e5a23a8d77db03ab21dcb3c777"}, - { "link": "16_Release_Candidate", "version": "16.0.0-Release.Candidate+16A242", "symlinks": ["16.0"], "install_runtimes": "true", "sha256": "84588e4d781307191892add603ea51504955de39e05c270a88833a38a929825d"} + { "link": "16", "version": "16.0.0+16A242d", "symlinks": ["16.0"], "install_runtimes": "true", "sha256": "4a26c3d102a55c7222fb145e0ee1503249c9c26c6e02dc64d783c8810b37b1e3"} ] } }, From 75ba3f22d0d428232231f88c12e26e91b4b34c43 Mon Sep 17 00:00:00 2001 From: kishorekumar-anchala <168699259+kishorekumar-anchala@users.noreply.github.com> Date: Wed, 18 Sep 2024 03:11:29 +0530 Subject: [PATCH 3117/3485] ubuntu20 swift failire (#10634) --- images/ubuntu/scripts/build/install-swift.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/images/ubuntu/scripts/build/install-swift.sh b/images/ubuntu/scripts/build/install-swift.sh index fe8ffc782f1c..8627106c3cf4 100644 --- a/images/ubuntu/scripts/build/install-swift.sh +++ b/images/ubuntu/scripts/build/install-swift.sh @@ -27,7 +27,8 @@ gpg --keyserver hkp://keyserver.ubuntu.com \ '8513 444E 2DA3 6B7C 1659 AF4D 7638 F1FB 2B2B 08C4' \ 'A62A E125 BBBF BB96 A6E0 42EC 925C C1CC ED3D 1561' \ '8A74 9566 2C3C D4AE 18D9 5637 FAF6 989E 1BC1 6FEA' \ - 'E813 C892 820A 6FA1 3755 B268 F167 DF1A CF9C E069' + 'E813 C892 820A 6FA1 3755 B268 F167 DF1A CF9C E069' \ + '52BB 7E3D E28A 71BE 22EC 05FF EF80 A866 B47A 981F' gpg --keyserver hkp://keyserver.ubuntu.com --refresh-keys Swift # Download and verify signature From 5d31cfb3b98bbe515ba50ae07ba8254009ddb357 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 18 Sep 2024 14:37:41 +0000 Subject: [PATCH 3118/3485] Updating readme file for win19 version 20240915.1.1 (#10618) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/windows/Windows2019-Readme.md | 56 ++++++++++++++-------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/images/windows/Windows2019-Readme.md b/images/windows/Windows2019-Readme.md index 8d393a0edcc7..a464968520a6 100644 --- a/images/windows/Windows2019-Readme.md +++ b/images/windows/Windows2019-Readme.md @@ -1,6 +1,6 @@ # Windows Server 2019 -- OS Version: 10.0.17763 Build 6189 -- Image Version: 20240908.1.0 +- OS Version: 10.0.17763 Build 6293 +- Image Version: 20240915.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -22,14 +22,14 @@ ### Package Management - Chocolatey 2.3.0 - Composer 2.7.9 -- Helm 3.15.4 +- Helm 3.16.0 - Miniconda 24.7.1 (pre-installed on the image but not added to PATH) - NPM 10.7.0 - NuGet 6.11.0.119 - pip 24.0 (python 3.7) - Pipx 1.2.1 - RubyGems 3.2.33 -- Vcpkg (build from commit eba7c6a89) +- Vcpkg (build from commit 86fba1306) - Yarn 1.22.22 #### Environment variables @@ -53,19 +53,19 @@ - Bicep 0.29.47 - Cabal 3.12.1.0 - CMake 3.30.3 -- CodeQL Action Bundle 2.18.3 +- CodeQL Action Bundle 2.18.4 - Docker 26.1.3 - Docker Compose v2 2.27.1 - Docker-wincred 0.8.2 - ghc 9.10.1 - Git 2.46.0.windows.1 - Git LFS 3.5.1 -- Google Cloud CLI 491.0.0 +- Google Cloud CLI 492.0.0 - ImageMagick 7.1.1-38 - InnoSetup 6.3.3 - jq 1.7.1 - Kind 0.24.0 -- Kubectl 1.31.0 +- Kubectl 1.31.1 - Mercurial 5.0 - gcc 8.1.0 - gdb 8.1 @@ -75,7 +75,7 @@ - OpenSSL 1.1.1w - Packer 1.11.0 - Parcel 2.12.0 -- Pulumi 3.131.0 +- Pulumi 3.132.0 - R 4.4.1 - Service Fabric SDK 9.1.1436.9590 - Stack 3.1.1 @@ -88,14 +88,14 @@ - zstd 1.5.6 ### CLI Tools -- Alibaba Cloud CLI 3.0.221 -- AWS CLI 2.17.44 -- AWS SAM CLI 1.123.0 +- Alibaba Cloud CLI 3.0.222 +- AWS CLI 2.17.51 +- AWS SAM CLI 1.124.0 - AWS Session Manager CLI 1.2.650.0 - Azure CLI 2.64.0 - Azure DevOps CLI extension 1.0.1 -- Cloud Foundry CLI 8.8.0 -- GitHub CLI 2.55.0 +- Cloud Foundry CLI 8.8.1 +- GitHub CLI 2.56.0 ### Rust Tools - Cargo 1.81.0 @@ -112,10 +112,10 @@ - Rustfmt 1.7.1 ### Browsers and Drivers -- Google Chrome 128.0.6613.120 -- Chrome Driver 128.0.6613.119 -- Microsoft Edge 128.0.2739.67 -- Microsoft Edge Driver 128.0.2739.67 +- Google Chrome 128.0.6613.138 +- Chrome Driver 128.0.6613.137 +- Microsoft Edge 128.0.2739.79 +- Microsoft Edge Driver 128.0.2739.79 - Mozilla Firefox 130.0 - Gecko Driver 0.35.0 - IE Driver 4.14.0.0 @@ -175,7 +175,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 3.9.13 - 3.10.11 - 3.11.9 -- 3.12.5 +- 3.12.6 #### PyPy - 2.7.18 [PyPy 7.3.17] @@ -223,14 +223,14 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Nginx | 1.27.1 | C:\tools\nginx-1.27.1\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2019 -| Name | Version | Path | -| ----------------------------- | --------------- | -------------------------------------------------------------- | -| Visual Studio Enterprise 2019 | 16.11.35130.168 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | +| Name | Version | Path | +| ----------------------------- | -------------- | -------------------------------------------------------------- | +| Visual Studio Enterprise 2019 | 16.11.35229.62 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | #### Workloads, components and extensions | Package | Version | | ------------------------------------------------------------------------- | --------------- | -| Component.Android.NDK.R16B | 16.11.35112.186 | +| Component.Android.NDK.R16B | 16.11.35213.202 | | Component.Android.SDK25.Private | 16.0.28625.61 | | Component.Android.SDK30 | 16.10.31205.252 | | Component.Ant | 1.9.3.8 | @@ -503,7 +503,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - AzureRM: 2.1.0 (Default), 6.13.1 - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.651 +- AWSPowershell: 4.1.656 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.10 - Microsoft.Graph: 2.23.0 @@ -547,8 +547,8 @@ All other versions are saved but not installed. ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:da9b18ec1c7ea94841f3351a3494c9651d9e2557b1c84a75046dc915029df45e | 2024-08-13 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:572083af53735695423a97dc6648f210ac85491269432660b151ba3033f7cb03 | 2024-08-13 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:bfb078e34f8c28cf122fc693b265686a58aa46f7e6c9ee46aaae7371d0ed5772 | 2024-08-13 | -| mcr.microsoft.com/windows/nanoserver:1809 | sha256:7f6649348a11655e3576463fd6d55c29248f97405f8e643cab2409009339f520 | 2024-08-11 | -| mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:f67e2252b22f6f8c9916fdcb099548d01b920d49af2039349e1b883f79c9e0ef | 2024-08-11 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:c643acadeb3c8f13a65817fbe7dfbb478f30e7293d99439918c9907f936b7b44 | 2024-09-10 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:0e30e7c4226044ff72eea68884894c397202eaacd73c4cb340a28896e617fee5 | 2024-09-10 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:563e2e986c7c3fce79ebb0757c475980e3d3dde05d1d2e53d4323b0e99580840 | 2024-09-10 | +| mcr.microsoft.com/windows/nanoserver:1809 | sha256:b1c10aada142b0729d6cdbddd4d4119499c2cdbc32e75573c36cfe1a6149b3ee | 2024-09-06 | +| mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:9fd56cf2f100d69f66f0de4af2c4fdd154e9e7be65eec3bf789a8088a881475a | 2024-09-06 | From fd6c45b8e86c3be5bdc2ad65e62f0556e7404e73 Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Wed, 18 Sep 2024 16:42:09 +0200 Subject: [PATCH 3119/3485] [CI] Update job conditions for GitHub CI workflows (#10641) --- .github/workflows/ubuntu2004.yml | 2 +- .github/workflows/ubuntu2204.yml | 2 +- .github/workflows/ubuntu2404.yml | 2 +- .github/workflows/windows2019.yml | 2 +- .github/workflows/windows2022.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ubuntu2004.yml b/.github/workflows/ubuntu2004.yml index c8368f3de639..a1773f124f12 100644 --- a/.github/workflows/ubuntu2004.yml +++ b/.github/workflows/ubuntu2004.yml @@ -13,7 +13,7 @@ defaults: jobs: Ubuntu_2004: - if: contains(github.event.pull_request.labels.*.name, 'CI ubuntu-all') || contains(github.event.pull_request.labels.*.name, 'CI ubuntu-2004') + if: github.event.label.name == 'CI ubuntu-all' || github.event.label.name == 'CI ubuntu-2004' uses: ./.github/workflows/trigger-ubuntu-win-build.yml with: image_type: 'ubuntu2004' diff --git a/.github/workflows/ubuntu2204.yml b/.github/workflows/ubuntu2204.yml index d116129d862f..c1f60c17d9de 100644 --- a/.github/workflows/ubuntu2204.yml +++ b/.github/workflows/ubuntu2204.yml @@ -13,7 +13,7 @@ defaults: jobs: Ubuntu_2204: - if: contains(github.event.pull_request.labels.*.name, 'CI ubuntu-all') || contains(github.event.pull_request.labels.*.name, 'CI ubuntu-2204') + if: github.event.label.name == 'CI ubuntu-all' || github.event.label.name == 'CI ubuntu-2204' uses: ./.github/workflows/trigger-ubuntu-win-build.yml with: image_type: 'ubuntu2204' diff --git a/.github/workflows/ubuntu2404.yml b/.github/workflows/ubuntu2404.yml index c065bc87700d..5f8db2bbc1fa 100644 --- a/.github/workflows/ubuntu2404.yml +++ b/.github/workflows/ubuntu2404.yml @@ -13,7 +13,7 @@ defaults: jobs: Ubuntu_2404: - if: contains(github.event.pull_request.labels.*.name, 'CI ubuntu-all') || contains(github.event.pull_request.labels.*.name, 'CI ubuntu-2404') + if: github.event.label.name == 'CI ubuntu-all' || github.event.label.name == 'CI ubuntu-2404' uses: ./.github/workflows/trigger-ubuntu-win-build.yml with: image_type: 'ubuntu2404' diff --git a/.github/workflows/windows2019.yml b/.github/workflows/windows2019.yml index 0604f35726cb..3205a548bca9 100644 --- a/.github/workflows/windows2019.yml +++ b/.github/workflows/windows2019.yml @@ -13,7 +13,7 @@ defaults: jobs: Windows_2019: - if: contains(github.event.pull_request.labels.*.name, 'CI windows-all') || contains(github.event.pull_request.labels.*.name, 'CI windows-2019') + if: github.event.label.name == 'CI windows-all' || github.event.label.name == 'CI windows-2019' uses: ./.github/workflows/trigger-ubuntu-win-build.yml with: image_type: 'windows2019' diff --git a/.github/workflows/windows2022.yml b/.github/workflows/windows2022.yml index ae3a069bda32..74be2a68c7b7 100644 --- a/.github/workflows/windows2022.yml +++ b/.github/workflows/windows2022.yml @@ -13,7 +13,7 @@ defaults: jobs: Windows_2022: - if: contains(github.event.pull_request.labels.*.name, 'CI windows-all') || contains(github.event.pull_request.labels.*.name, 'CI windows-2022') + if: github.event.label.name == 'CI windows-all' || github.event.label.name == 'CI windows-2022' uses: ./.github/workflows/trigger-ubuntu-win-build.yml with: image_type: 'windows2022' From 8bbd828014a458b883b8a5c85eb6a5114cf9b5ec Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Wed, 18 Sep 2024 17:30:07 +0200 Subject: [PATCH 3120/3485] [macOS] Update Xcode 16.1 to Beta 2 on macOS-14 and macOS-15 (#10638) --- images/macos/toolsets/toolset-14.json | 4 ++-- images/macos/toolsets/toolset-15.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/images/macos/toolsets/toolset-14.json b/images/macos/toolsets/toolset-14.json index b39aa6d3faaa..235c3dd18383 100644 --- a/images/macos/toolsets/toolset-14.json +++ b/images/macos/toolsets/toolset-14.json @@ -3,7 +3,7 @@ "default": "15.4", "x64": { "versions": [ - { "link": "16.1_beta", "version": "16.1.0-Beta+16B5001e", "symlinks": ["16.1"], "install_runtimes": "true", "sha256": "8848aacb32bdc0abbd7e14e4b712e07c98f4b6e5a23a8d77db03ab21dcb3c777"}, + { "link": "16.1_beta_2", "version": "16.1.0-Beta.2+16B5014f", "symlinks": ["16.1"], "install_runtimes": "true", "sha256": "a07a709b4b196be118ff5bab7ea19a16a4ca273cad876d73dec5926c8a6da34a"}, { "link": "16", "version": "16.0.0+16A242d", "symlinks": ["16.0"], "install_runtimes": "true", "sha256": "4a26c3d102a55c7222fb145e0ee1503249c9c26c6e02dc64d783c8810b37b1e3"}, { "link": "15.4", "version": "15.4.0+15F31d", "install_runtimes": "true", "sha256": "82d3d61804ff3f4c7c82085e91dc701037ddaa770e542848b2477e22f4e8aa7a"}, { "link": "15.3", "version": "15.3.0+15E204a", "install_runtimes": "true", "sha256": "f13f6a2e2df432c3008e394640b8549a18c285acd7fd148d6c4bac8c3a5af234"}, @@ -15,7 +15,7 @@ }, "arm64":{ "versions": [ - { "link": "16.1_beta", "version": "16.1.0-Beta+16B5001e", "symlinks": ["16.1"], "install_runtimes": "true", "sha256": "8848aacb32bdc0abbd7e14e4b712e07c98f4b6e5a23a8d77db03ab21dcb3c777"}, + { "link": "16.1_beta_2", "version": "16.1.0-Beta.2+16B5014f", "symlinks": ["16.1"], "install_runtimes": "true", "sha256": "a07a709b4b196be118ff5bab7ea19a16a4ca273cad876d73dec5926c8a6da34a"}, { "link": "16", "version": "16.0.0+16A242d", "symlinks": ["16.0"], "install_runtimes": "true", "sha256": "4a26c3d102a55c7222fb145e0ee1503249c9c26c6e02dc64d783c8810b37b1e3"}, { "link": "15.4", "version": "15.4.0+15F31d", "install_runtimes": "true", "sha256": "82d3d61804ff3f4c7c82085e91dc701037ddaa770e542848b2477e22f4e8aa7a"}, { "link": "15.3", "version": "15.3.0+15E204a", "install_runtimes": "true", "sha256": "f13f6a2e2df432c3008e394640b8549a18c285acd7fd148d6c4bac8c3a5af234"}, diff --git a/images/macos/toolsets/toolset-15.json b/images/macos/toolsets/toolset-15.json index ae3d64eaeb0f..6ff954696978 100644 --- a/images/macos/toolsets/toolset-15.json +++ b/images/macos/toolsets/toolset-15.json @@ -3,13 +3,13 @@ "default": "16", "x64": { "versions": [ - { "link": "16.1_beta", "version": "16.1.0-Beta+16B5001e", "symlinks": ["16.1"], "install_runtimes": "false", "sha256": "8848aacb32bdc0abbd7e14e4b712e07c98f4b6e5a23a8d77db03ab21dcb3c777"}, + { "link": "16.1_beta_2", "version": "16.1.0-Beta.2+16B5014f", "symlinks": ["16.1"], "install_runtimes": "true", "sha256": "a07a709b4b196be118ff5bab7ea19a16a4ca273cad876d73dec5926c8a6da34a"}, { "link": "16", "version": "16.0.0+16A242d", "symlinks": ["16.0"], "install_runtimes": "true", "sha256": "4a26c3d102a55c7222fb145e0ee1503249c9c26c6e02dc64d783c8810b37b1e3"} ] }, "arm64":{ "versions": [ - { "link": "16.1_beta", "version": "16.1.0-Beta+16B5001e", "symlinks": ["16.1"], "install_runtimes": "true", "sha256": "8848aacb32bdc0abbd7e14e4b712e07c98f4b6e5a23a8d77db03ab21dcb3c777"}, + { "link": "16.1_beta_2", "version": "16.1.0-Beta.2+16B5014f", "symlinks": ["16.1"], "install_runtimes": "true", "sha256": "a07a709b4b196be118ff5bab7ea19a16a4ca273cad876d73dec5926c8a6da34a"}, { "link": "16", "version": "16.0.0+16A242d", "symlinks": ["16.0"], "install_runtimes": "true", "sha256": "4a26c3d102a55c7222fb145e0ee1503249c9c26c6e02dc64d783c8810b37b1e3"} ] } From 29e053ac38da44ebb7bc8e12adc6d0502489fb39 Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Wed, 18 Sep 2024 17:30:42 +0200 Subject: [PATCH 3121/3485] [macOS] Rm Python 3.9/3.10 from macOS-15-arm64 due to dependencies mismatch (#10639) --- images/macos/toolsets/toolset-15.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/images/macos/toolsets/toolset-15.json b/images/macos/toolsets/toolset-15.json index 6ff954696978..998fef9055b7 100644 --- a/images/macos/toolsets/toolset-15.json +++ b/images/macos/toolsets/toolset-15.json @@ -125,8 +125,6 @@ }, "arm64": { "versions": [ - "3.9.*", - "3.10.*", "3.11.*", "3.12.*" ] From 8e0eb613ac23e1a09f37b19937240ec194bbb856 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 18 Sep 2024 17:53:43 +0000 Subject: [PATCH 3122/3485] Updating readme file for macos-13 version 20240916.98 (#10623) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-13-Readme.md | 58 +++++++++++++++++---------------- 1 file changed, 30 insertions(+), 28 deletions(-) diff --git a/images/macos/macos-13-Readme.md b/images/macos/macos-13-Readme.md index 0a854e64384a..5a13d8d57345 100644 --- a/images/macos/macos-13-Readme.md +++ b/images/macos/macos-13-Readme.md @@ -1,14 +1,13 @@ | Announcements | |-| +| [[Macos 13 and 14] Android NDK versions <=25 will be removed from images on October 07,2024](https://github.com/actions/runner-images/issues/10614) | +| [[Macos 13 and 14] Go version 1.20.0 will be removed on October 07,2024.](https://github.com/actions/runner-images/issues/10612) | | [[macOS] Xcodes visionOS platform will be removed from macOS-14 images on September 23, 2024](https://github.com/actions/runner-images/issues/10559) | -| [[Macos] go version 1.20.0 will be removed on September 16,2024.](https://github.com/actions/runner-images/issues/10531) | -| [[Macos] Android NDK 24 will be removed on September 16,2024](https://github.com/actions/runner-images/issues/10530) | -| [[Macos-12] Python version 3.7 will be removed from the macos-12 image on September 16,2024](https://github.com/actions/runner-images/issues/10529) | *** # macOS 13 - OS Version: macOS 13.6.9 (22G830) - Kernel Version: Darwin 22.6.0 -- Image Version: 20240908.1 +- Image Version: 20240916.98 ## Installed Software @@ -28,27 +27,27 @@ - Node.js 20.17.0 - Perl 5.38.2 - PHP 8.3.11 -- Python3 3.12.5 +- Python3 3.12.6 - Ruby 3.0.7p220 ### Package Management - Bundler 2.5.18 -- Carthage 0.39.1 +- Carthage 0.40.0 - CocoaPods 1.15.2 - Composer 2.7.9 -- Homebrew 4.3.19 +- Homebrew 4.3.21 - NPM 10.8.2 - NuGet 6.3.1.1 - Pip3 24.2 (python 3.12) - Pipx 1.7.1 - RubyGems 3.5.18 -- Vcpkg 2024 (build from commit eba7c6a89) +- Vcpkg 2024 (build from commit 86fba1306) - Yarn 1.22.22 ### Project Management - Apache Ant 1.10.15 - Apache Maven 3.9.9 -- Gradle 8.10 +- Gradle 8.10.1 ### Utilities - 7-Zip 17.05 @@ -57,10 +56,10 @@ - bazel 7.3.1 - bazelisk 1.21.0 - bsdtar 3.5.3 - available by 'tar' alias -- Curl 8.9.1 -- Git 2.46.0 +- Curl 8.10.0 +- Git 2.46.1 - Git LFS 3.5.1 -- GitHub CLI 2.55.0 +- GitHub CLI 2.56.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.24.5 - gpg (GnuPG) 2.4.5 @@ -72,16 +71,16 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.17.46 -- AWS SAM CLI 1.123.0 +- AWS CLI 2.17.51 +- AWS SAM CLI 1.124.0 - AWS Session Manager CLI 1.2.650.0 - Azure CLI 2.64.0 - Azure CLI (azure-devops) 1.0.1 - Bicep CLI 0.29.47 - Cmake 3.30.3 -- CodeQL Action Bundle 2.18.3 +- CodeQL Action Bundle 2.18.4 - Fastlane 2.222.0 -- SwiftFormat 0.54.4 +- SwiftFormat 0.54.5 - Xcbeautify 2.11.0 - Xcode Command Line Tools 14.3.1.0.1.1683849156 - Xcodes 1.5.0 @@ -92,11 +91,11 @@ ### Browsers - Safari 17.6 (18618.3.11.11.7) - SafariDriver 17.6 (18618.3.11.11.7) -- Google Chrome 128.0.6613.120 -- Google Chrome for Testing 128.0.6613.119 -- ChromeDriver 128.0.6613.119 -- Microsoft Edge 128.0.2739.67 -- Microsoft Edge WebDriver 128.0.2739.69 +- Google Chrome 128.0.6613.138 +- Google Chrome for Testing 128.0.6613.137 +- ChromeDriver 128.0.6613.137 +- Microsoft Edge 128.0.2739.79 +- Microsoft Edge WebDriver 128.0.2739.81 - Mozilla Firefox 130.0 - geckodriver 0.35.0 - Selenium server 4.24.0 @@ -128,13 +127,15 @@ #### Ruby - 3.0.7 - 3.1.6 +- 3.2.5 +- 3.3.5 #### Python - 3.8.18 -- 3.9.19 -- 3.10.14 +- 3.9.20 +- 3.10.15 - 3.11.9 -- 3.12.5 +- 3.12.6 #### Node.js - 16.20.2 @@ -145,6 +146,7 @@ - 1.20.14 - 1.21.13 - 1.22.7 +- 1.23.1 ### Rust Tools - Cargo 1.81.0 @@ -211,8 +213,8 @@ | Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | | visionOS 1.0 | xros1.0 | 15.2 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | -| Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | +| Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | | DriverKit 22.1 | driverkit22.1 | 14.1 | | DriverKit 22.2 | driverkit22.2 | 14.2 | | DriverKit 22.4 | driverkit22.4 | 14.3.1 | @@ -248,7 +250,7 @@ | CMake | 3.22.1 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 24.0.8215888<br>25.2.9519653<br>26.3.11579264 (default) | +| NDK | 24.0.8215888<br>25.2.9519653<br>26.3.11579264 (default)<br>27.1.12297006 | #### Environment variables | Name | Value | @@ -256,7 +258,7 @@ | ANDROID_HOME | /Users/runner/Library/Android/sdk | | ANDROID_NDK | /Users/runner/Library/Android/sdk/ndk/26.3.11579264 | | ANDROID_NDK_HOME | /Users/runner/Library/Android/sdk/ndk/26.3.11579264 | -| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/26.3.11579264 | +| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/27.1.12297006 | | ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk/26.3.11579264 | | ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | @@ -265,7 +267,7 @@ #### Environment variables | Name | Value | | ----------------- | ----------------------------------------------------------------------------------------- | -| PARALLELS_DMG_URL | https://download.parallels.com/desktop/v19/19.4.1-54985/ParallelsDesktop-19.4.1-54985.dmg | +| PARALLELS_DMG_URL | https://download.parallels.com/desktop/v20/20.0.0-55653/ParallelsDesktop-20.0.0-55653.dmg | ##### Notes ``` From feebb05e1115a7c2067805b1de98d91f4955ba3b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 18 Sep 2024 18:28:04 +0000 Subject: [PATCH 3123/3485] Updating readme file for ubuntu24 version 20240915.1.1 (#10626) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2404-Readme.md | 55 ++++++++++++++++-------------- 1 file changed, 30 insertions(+), 25 deletions(-) diff --git a/images/ubuntu/Ubuntu2404-Readme.md b/images/ubuntu/Ubuntu2404-Readme.md index da1b95df9533..ba2296909d66 100644 --- a/images/ubuntu/Ubuntu2404-Readme.md +++ b/images/ubuntu/Ubuntu2404-Readme.md @@ -1,12 +1,12 @@ | Announcements | |-| -| [[Ubuntu 20.04 and Ubuntu 22.04 Oses] Go 1.22.x will be set as default on September, 20](https://github.com/actions/runner-images/issues/10500) | +| [[Ubuntu 20 and 22] Go version 1.20.0 will be removed on October 14,2024.](https://github.com/actions/runner-images/issues/10607) | | [Ubuntu 24.04 is now available](https://github.com/actions/runner-images/issues/9848) | *** # Ubuntu 24.04 - OS Version: 24.04.1 LTS -- Kernel Version: 6.8.0-1013-azure -- Image Version: 20240908.1.0 +- Kernel Version: 6.8.0-1014-azure +- Image Version: 20240915.1.0 - Systemd version: 255.4-1ubuntu8.4 ## Installed Software @@ -25,18 +25,19 @@ - Perl 5.38.2 - Python 3.12.3 - Ruby 3.2.3 +- Swift 5.10.1 ### Package Management - cpan 1.64 -- Helm 3.15.4 -- Homebrew 4.3.19 +- Helm 3.16.1 +- Homebrew 4.3.21 - Miniconda 24.7.1 - Npm 10.8.2 - Pip 24.0 - Pip3 24.0 - Pipx 1.4.3 - RubyGems 3.4.20 -- Vcpkg (build from commit eba7c6a89) +- Vcpkg (build from commit 86fba1306) - Yarn 1.22.22 #### Environment variables @@ -55,22 +56,22 @@ to accomplish this. ### Project Management - Ant 1.10.14 -- Gradle 8.10 +- Gradle 8.10.1 - Lerna 8.1.8 - Maven 3.8.8 ### Tools -- Ansible 2.17.3 +- Ansible 2.17.4 - AzCopy 10.26.0 - available by `azcopy` and `azcopy10` aliases - Bazel 7.3.1 - Bazelisk 1.21.0 - Bicep 0.29.47 - Buildah 1.33.7 - CMake 3.30.3 -- CodeQL Action Bundle 2.18.3 +- CodeQL Action Bundle 2.18.4 - Docker Amazon ECR Credential Helper 0.8.0 - Docker Compose v2 2.27.1 -- Docker-Buildx 0.16.2 +- Docker-Buildx 0.17.1 - Docker Client 26.1.3 - Docker Server 26.1.3 - Fastlane 2.222.0 @@ -80,18 +81,18 @@ to accomplish this. - Haveged 1.9.14 - jq 1.7 - Kind 0.24.0 -- Kubectl 1.31.0 +- Kubectl 1.31.1 - Kustomize 5.4.3 - MediaInfo 24.01 - Mercurial 6.7.2 -- Minikube 1.33.1 +- Minikube 1.34.0 - n 10.0.0 - Newman 6.2.1 - OpenSSL 3.0.13-0ubuntu3.4 - Packer 1.11.2 - Parcel 2.12.0 - Podman 4.9.3 -- Pulumi 3.131.0 +- Pulumi 3.132.0 - Skopeo 1.13.3 - Sphinx Open Source Search Server 2.2.11 - yamllint 1.35.1 @@ -99,12 +100,12 @@ to accomplish this. - zstd 1.5.6 ### CLI Tools -- AWS CLI 2.17.46 +- AWS CLI 2.17.51 - AWS CLI Session Manager Plugin 1.2.650.0 -- AWS SAM CLI 1.123.0 +- AWS SAM CLI 1.124.0 - Azure CLI 2.64.0 - Azure CLI (azure-devops) 1.0.1 -- GitHub CLI 2.55.0 +- GitHub CLI 2.56.0 ### Java | Version | Environment Variable | @@ -138,17 +139,21 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.7.1 ### Browsers and Drivers -- Google Chrome 128.0.6613.119 -- ChromeDriver 128.0.6613.119 +- Google Chrome 128.0.6613.137 +- ChromeDriver 128.0.6613.137 - Chromium 128.0.6613.0 +- Microsoft Edge 128.0.2739.79 +- Microsoft Edge WebDriver 128.0.2739.81 - Selenium server 4.24.0 +- Mozilla Firefox 130.0 +- Geckodriver 0.35.0 #### Environment variables | Name | Value | | ----------------- | ------------------------------------- | | CHROMEWEBDRIVER | /usr/local/share/chromedriver-linux64 | -| EDGEWEBDRIVER | | -| GECKOWEBDRIVER | | +| EDGEWEBDRIVER | /usr/local/share/edge_driver | +| GECKOWEBDRIVER | /usr/local/share/gecko_driver | | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | ### .NET Tools @@ -178,9 +183,9 @@ Use the following command as a part of your job to start the service: 'sudo syst ### Cached Tools #### Go -- 1.20.14 - 1.21.13 - 1.22.7 +- 1.23.1 #### Node.js - 16.20.2 @@ -188,10 +193,10 @@ Use the following command as a part of your job to start the service: 'sudo syst - 20.17.0 #### Python -- 3.9.19 -- 3.10.14 -- 3.11.9 -- 3.12.5 +- 3.9.20 +- 3.10.15 +- 3.11.10 +- 3.12.6 #### PyPy - 3.9.19 [PyPy 7.3.16] From f4ba5c5cbc34b9864576bd36b41f93896d43bfae Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 18 Sep 2024 18:32:01 +0000 Subject: [PATCH 3124/3485] Updating readme file for win22 version 20240915.1.1 (#10619) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/windows/Windows2022-Readme.md | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/images/windows/Windows2022-Readme.md b/images/windows/Windows2022-Readme.md index ce5bf09819cb..c9d4b4ec0fcd 100644 --- a/images/windows/Windows2022-Readme.md +++ b/images/windows/Windows2022-Readme.md @@ -1,6 +1,6 @@ # Windows Server 2022 - OS Version: 10.0.20348 Build 2700 -- Image Version: 20240912.1.0 +- Image Version: 20240915.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -22,14 +22,14 @@ ### Package Management - Chocolatey 2.3.0 - Composer 2.7.9 -- Helm 3.15.4 +- Helm 3.16.0 - Miniconda 24.7.1 (pre-installed on the image but not added to PATH) - NPM 10.7.0 - NuGet 6.11.0.119 - pip 24.2 (python 3.9) - Pipx 1.7.1 - RubyGems 3.2.33 -- Vcpkg (build from commit 9f11f2df3) +- Vcpkg (build from commit 86fba1306) - Yarn 1.22.22 #### Environment variables @@ -53,7 +53,7 @@ - Bicep 0.29.47 - Cabal 3.12.1.0 - CMake 3.30.3 -- CodeQL Action Bundle 2.18.3 +- CodeQL Action Bundle 2.18.4 - Docker 26.1.3 - Docker Compose v2 2.27.1 - Docker-wincred 0.8.2 @@ -64,7 +64,7 @@ - InnoSetup 6.3.3 - jq 1.7.1 - Kind 0.24.0 -- Kubectl 1.31.0 +- Kubectl 1.31.1 - Mercurial 5.0 - gcc 12.2.0 - gdb 11.2 @@ -73,7 +73,7 @@ - NSIS 3.10 - OpenSSL 1.1.1w - Packer 1.11.0 -- Pulumi 3.131.0 +- Pulumi 3.132.0 - R 4.4.1 - Service Fabric SDK 9.1.1436.9590 - Stack 3.1.1 @@ -87,7 +87,7 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.222 -- AWS CLI 2.17.48 +- AWS CLI 2.17.51 - AWS SAM CLI 1.124.0 - AWS Session Manager CLI 1.2.650.0 - Azure CLI 2.64.0 @@ -112,7 +112,7 @@ - Google Chrome 128.0.6613.138 - Chrome Driver 128.0.6613.137 - Microsoft Edge 128.0.2739.79 -- Microsoft Edge Driver 128.0.2739.67 +- Microsoft Edge Driver 128.0.2739.79 - Mozilla Firefox 130.0 - Gecko Driver 0.35.0 - IE Driver 4.14.0.0 @@ -456,7 +456,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | wasm.tools | 8.0.824.36612 | | ProBITools.MicrosoftAnalysisServicesModelingProjects2022 | 3.0.4 | | ProBITools.MicrosoftReportProjectsforVisualStudio2022 | 3.0.1 | -| SSIS.MicrosoftDataToolsIntegrationServices | 1.4 | +| SSIS.MicrosoftDataToolsIntegrationServices | 1.5 | | VisualStudioClient.MicrosoftVisualStudio2022InstallerProjects | 2.0.1 | | Windows Driver Kit | 10.1.22621.2428 | | Windows Driver Kit Visual Studio Extension | 10.0.26100.10 | @@ -499,7 +499,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - AzureRM: 2.1.0 (Default), 6.13.1 - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.654 +- AWSPowershell: 4.1.656 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.10 - Microsoft.Graph: 2.23.0 From 495fd519517d2af1e99ed5b23d2a28f805192087 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 18 Sep 2024 18:35:58 +0000 Subject: [PATCH 3125/3485] Updating readme file for macos-14 version 20240915.2 (#10615) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-14-Readme.md | 117 ++++++++++++++++---------------- 1 file changed, 59 insertions(+), 58 deletions(-) diff --git a/images/macos/macos-14-Readme.md b/images/macos/macos-14-Readme.md index 391f84224bad..d0314a7bd09f 100644 --- a/images/macos/macos-14-Readme.md +++ b/images/macos/macos-14-Readme.md @@ -1,14 +1,12 @@ | Announcements | |-| +| [[Macos 13 and 14] Go version 1.20.0 will be removed on October 07,2024.](https://github.com/actions/runner-images/issues/10612) | | [[macOS] Xcodes visionOS platform will be removed from macOS-14 images on September 23, 2024](https://github.com/actions/runner-images/issues/10559) | -| [[Macos] go version 1.20.0 will be removed on September 16,2024.](https://github.com/actions/runner-images/issues/10531) | -| [[Macos] Android NDK 24 will be removed on September 16,2024](https://github.com/actions/runner-images/issues/10530) | -| [[Macos-12] Python version 3.7 will be removed from the macos-12 image on September 16,2024](https://github.com/actions/runner-images/issues/10529) | *** # macOS 14 - OS Version: macOS 14.6.1 (23G93) - Kernel Version: Darwin 23.6.0 -- Image Version: 20240908.1 +- Image Version: 20240915.2 ## Installed Software @@ -28,15 +26,15 @@ - Node.js 20.17.0 - Perl 5.38.2 - PHP 8.3.11 -- Python3 3.12.5 +- Python3 3.12.6 - Ruby 3.0.7p220 ### Package Management - Bundler 2.5.18 -- Carthage 0.39.1 +- Carthage 0.40.0 - CocoaPods 1.15.2 - Composer 2.7.9 -- Homebrew 4.3.19 +- Homebrew 4.3.21 - NPM 10.8.2 - NuGet 6.3.1.1 - Pip3 24.2 (python 3.12) @@ -47,7 +45,7 @@ ### Project Management - Apache Ant 1.10.15 - Apache Maven 3.9.9 -- Gradle 8.10 +- Gradle 8.10.1 ### Utilities - 7-Zip 17.05 @@ -56,10 +54,10 @@ - bazel 7.3.1 - bazelisk 1.21.0 - bsdtar 3.5.3 - available by 'tar' alias -- Curl 8.9.1 -- Git 2.46.0 +- Curl 8.10.0 +- Git 2.46.1 - Git LFS 3.5.1 -- GitHub CLI 2.55.0 +- GitHub CLI 2.56.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.24.5 - gpg (GnuPG) 2.4.5 @@ -71,16 +69,16 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.17.46 -- AWS SAM CLI 1.123.0 +- AWS CLI 2.17.51 +- AWS SAM CLI 1.124.0 - AWS Session Manager CLI 1.2.650.0 - Azure CLI 2.64.0 - Azure CLI (azure-devops) 1.0.1 - Bicep CLI 0.29.47 - Cmake 3.30.3 -- CodeQL Action Bundle 2.18.3 +- CodeQL Action Bundle 2.18.4 - Fastlane 2.222.0 -- SwiftFormat 0.54.4 +- SwiftFormat 0.54.5 - Xcbeautify 2.11.0 - Xcode Command Line Tools 15.3.0.0.1.1708646388 - Xcodes 1.5.0 @@ -91,11 +89,11 @@ ### Browsers - Safari 17.6 (19618.3.11.11.5) - SafariDriver 17.6 (19618.3.11.11.5) -- Google Chrome 128.0.6613.120 -- Google Chrome for Testing 128.0.6613.119 -- ChromeDriver 128.0.6613.119 -- Microsoft Edge 128.0.2739.67 -- Microsoft Edge WebDriver 128.0.2739.69 +- Google Chrome 128.0.6613.138 +- Google Chrome for Testing 128.0.6613.137 +- ChromeDriver 128.0.6613.137 +- Microsoft Edge 128.0.2739.79 +- Microsoft Edge WebDriver 128.0.2739.81 - Mozilla Firefox 130.0 - geckodriver 0.35.0 - Selenium server 4.24.0 @@ -120,12 +118,14 @@ #### Ruby - 3.0.7 - 3.1.6 +- 3.2.5 +- 3.3.5 #### Python -- 3.9.19 -- 3.10.14 +- 3.9.20 +- 3.10.15 - 3.11.9 -- 3.12.5 +- 3.12.6 #### Node.js - 18.20.4 @@ -135,6 +135,7 @@ - 1.20.14 - 1.21.13 - 1.22.7 +- 1.23.1 ### Rust Tools - Cargo 1.81.0 @@ -155,16 +156,16 @@ - PSScriptAnalyzer: 1.22.0 ### Xcode -| Version | Build | Path | -| -------------- | -------- | --------------------------------- | -| 16.1 (beta) | 16B5001e | /Applications/Xcode_16.1_beta.app | -| 16.0 (beta) | 16A5230g | /Applications/Xcode_16_beta_6.app | -| 15.4 (default) | 15F31d | /Applications/Xcode_15.4.app | -| 15.3 | 15E204a | /Applications/Xcode_15.3.app | -| 15.2 | 15C500b | /Applications/Xcode_15.2.app | -| 15.1 | 15C65 | /Applications/Xcode_15.1.app | -| 15.0.1 | 15A507 | /Applications/Xcode_15.0.1.app | -| 14.3.1 | 14E300c | /Applications/Xcode_14.3.1.app | +| Version | Build | Path | +| -------------- | -------- | -------------------------------------------- | +| 16.1 (beta) | 16B5001e | /Applications/Xcode_16.1_beta.app | +| 16.0 | 16A242 | /Applications/Xcode_16_Release_Candidate.app | +| 15.4 (default) | 15F31d | /Applications/Xcode_15.4.app | +| 15.3 | 15E204a | /Applications/Xcode_15.3.app | +| 15.2 | 15C500b | /Applications/Xcode_15.2.app | +| 15.1 | 15C65 | /Applications/Xcode_15.1.app | +| 15.0.1 | 15A507 | /Applications/Xcode_15.0.1.app | +| 14.3.1 | 14E300c | /Applications/Xcode_14.3.1.app | #### Installed SDKs | SDK | SDK Name | Xcode Version | @@ -223,8 +224,8 @@ | Simulator - visionOS 2.0 | xrsimulator2.0 | 16.0, 16.1 | | visionOS 2.0 | xros2.0 | 16.0, 16.1 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | -| Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | +| Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | DriverKit 22.4 | driverkit22.4 | 14.3.1 | | DriverKit 23.0 | driverkit23.0 | 15.0.1 | | DriverKit 23.2 | driverkit23.2 | 15.1, 15.2 | @@ -234,27 +235,27 @@ | DriverKit 24.1 | driverkit24.1 | 16.1 | #### Installed Simulators -| OS | Simulators | -| ------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| iOS 16.4 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 17.0 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 17.2 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 17.4 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | -| iOS 17.5 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | -| iOS 18.0 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | -| iOS 18.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | -| tvOS 16.4 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 17.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 17.2 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 17.4 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 17.5 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 18.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| watchOS 9.4 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | -| watchOS 10.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | -| watchOS 10.2 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | -| watchOS 10.4 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | -| watchOS 10.5 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | -| watchOS 11.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | +| OS | Simulators | +| ------------ | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| iOS 16.4 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 17.0 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 17.2 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 17.4 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | +| iOS 17.5 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | +| iOS 18.0 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone 16<br>iPhone 16 Plus<br>iPhone 16 Pro<br>iPhone 16 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | +| iOS 18.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone 16<br>iPhone 16 Plus<br>iPhone 16 Pro<br>iPhone 16 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | +| tvOS 16.4 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 17.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 17.2 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 17.4 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 17.5 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 18.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| watchOS 9.4 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | +| watchOS 10.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 10.2 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 10.4 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 10.5 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 11.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 10 (42mm)<br>Apple Watch Series 10 (46mm)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | ### Android | Package Name | Version | @@ -268,7 +269,7 @@ | CMake | 3.22.1 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 24.0.8215888<br>25.2.9519653<br>26.3.11579264 (default) | +| NDK | 24.0.8215888<br>25.2.9519653<br>26.3.11579264 (default)<br>27.1.12297006 | #### Environment variables | Name | Value | @@ -276,7 +277,7 @@ | ANDROID_HOME | /Users/runner/Library/Android/sdk | | ANDROID_NDK | /Users/runner/Library/Android/sdk/ndk/26.3.11579264 | | ANDROID_NDK_HOME | /Users/runner/Library/Android/sdk/ndk/26.3.11579264 | -| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/26.3.11579264 | +| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/27.1.12297006 | | ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk/26.3.11579264 | | ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | @@ -285,7 +286,7 @@ #### Environment variables | Name | Value | | ----------------- | ----------------------------------------------------------------------------------------- | -| PARALLELS_DMG_URL | https://download.parallels.com/desktop/v19/19.4.1-54985/ParallelsDesktop-19.4.1-54985.dmg | +| PARALLELS_DMG_URL | https://download.parallels.com/desktop/v20/20.0.0-55653/ParallelsDesktop-20.0.0-55653.dmg | ##### Notes ``` From 85fbeaef9b8c4e0ee25680efca6ec58c87226947 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 18 Sep 2024 19:01:11 +0000 Subject: [PATCH 3126/3485] Updating readme file for macos-13-arm64 version 20240916.74 (#10620) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-13-arm64-Readme.md | 42 +++++++++++++-------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/images/macos/macos-13-arm64-Readme.md b/images/macos/macos-13-arm64-Readme.md index 57a8904a549e..34dfaff9d972 100644 --- a/images/macos/macos-13-arm64-Readme.md +++ b/images/macos/macos-13-arm64-Readme.md @@ -1,14 +1,13 @@ | Announcements | |-| +| [[Macos 13 and 14] Android NDK versions <=25 will be removed from images on October 07,2024](https://github.com/actions/runner-images/issues/10614) | +| [[Macos 13 and 14] Go version 1.20.0 will be removed on October 07,2024.](https://github.com/actions/runner-images/issues/10612) | | [[macOS] Xcodes visionOS platform will be removed from macOS-14 images on September 23, 2024](https://github.com/actions/runner-images/issues/10559) | -| [[Macos] go version 1.20.0 will be removed on September 16,2024.](https://github.com/actions/runner-images/issues/10531) | -| [[Macos] Android NDK 24 will be removed on September 16,2024](https://github.com/actions/runner-images/issues/10530) | -| [[Macos-12] Python version 3.7 will be removed from the macos-12 image on September 16,2024](https://github.com/actions/runner-images/issues/10529) | *** # macOS 13 - OS Version: macOS 13.6.9 (22G830) - Kernel Version: Darwin 22.6.0 -- Image Version: 20240909.59 +- Image Version: 20240916.74 ## Installed Software @@ -32,9 +31,9 @@ ### Package Management - Bundler 2.5.18 -- Carthage 0.39.1 +- Carthage 0.40.0 - CocoaPods 1.15.2 -- Homebrew 4.3.20 +- Homebrew 4.3.21 - NPM 10.8.2 - NuGet 6.3.1.1 - Pip3 24.2 (python 3.12) @@ -45,7 +44,7 @@ ### Project Management - Apache Ant 1.10.15 - Apache Maven 3.9.9 -- Gradle 8.10 +- Gradle 8.10.1 ### Utilities - 7-Zip 17.05 @@ -55,9 +54,9 @@ - bazelisk 1.21.0 - bsdtar 3.5.3 - available by 'tar' alias - Curl 8.7.1 -- Git 2.46.0 +- Git 2.46.1 - Git LFS 3.5.1 -- GitHub CLI 2.55.0 +- GitHub CLI 2.56.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.24.5 - gpg (GnuPG) 2.4.5 @@ -69,16 +68,16 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.17.46 -- AWS SAM CLI 1.123.0 +- AWS CLI 2.17.51 +- AWS SAM CLI 1.124.0 - AWS Session Manager CLI 1.2.650.0 - Azure CLI 2.64.0 - Azure CLI (azure-devops) 1.0.1 - Bicep CLI 0.29.47 - Cmake 3.30.3 -- CodeQL Action Bundle 2.18.3 +- CodeQL Action Bundle 2.18.4 - Fastlane 2.222.0 -- SwiftFormat 0.54.4 +- SwiftFormat 0.54.5 - Xcbeautify 2.11.0 - Xcode Command Line Tools 14.3.1.0.1.1683849156 - Xcodes 1.5.0 @@ -88,9 +87,9 @@ ### Browsers - Safari 17.6 (18618.3.11.11.7) - SafariDriver 17.6 (18618.3.11.11.7) -- Google Chrome 128.0.6613.120 -- Google Chrome for Testing 128.0.6613.119 -- ChromeDriver 128.0.6613.119 +- Google Chrome 128.0.6613.138 +- Google Chrome for Testing 128.0.6613.137 +- ChromeDriver 128.0.6613.137 - Selenium server 4.24.0 #### Environment variables @@ -113,7 +112,7 @@ - 3.9.13 - 3.10.11 - 3.11.9 -- 3.12.5 +- 3.12.6 #### Node.js - 16.20.1 @@ -124,6 +123,7 @@ - 1.20.14 - 1.21.13 - 1.22.7 +- 1.23.1 ### Rust Tools - Cargo 1.81.0 @@ -187,11 +187,11 @@ | Simulator - watchOS 9.4 | watchsimulator9.4 | 14.3.1 | | Simulator - watchOS 10.0 | watchsimulator10.0 | 15.0.1 | | Simulator - watchOS 10.2 | watchsimulator10.2 | 15.1, 15.2 | -| visionOS 1.0 | xros1.0 | 15.2 | | Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | +| visionOS 1.0 | xros1.0 | 15.2 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | -| Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | +| Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | | DriverKit 22.1 | driverkit22.1 | 14.1 | | DriverKit 22.2 | driverkit22.2 | 14.2 | | DriverKit 22.4 | driverkit22.4 | 14.3.1 | @@ -228,7 +228,7 @@ | CMake | 3.22.1 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 24.0.8215888<br>25.2.9519653<br>26.3.11579264 (default) | +| NDK | 24.0.8215888<br>25.2.9519653<br>26.3.11579264 (default)<br>27.1.12297006 | #### Environment variables | Name | Value | @@ -236,7 +236,7 @@ | ANDROID_HOME | /Users/runner/Library/Android/sdk | | ANDROID_NDK | /Users/runner/Library/Android/sdk/ndk/26.3.11579264 | | ANDROID_NDK_HOME | /Users/runner/Library/Android/sdk/ndk/26.3.11579264 | -| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/26.3.11579264 | +| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/27.1.12297006 | | ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk/26.3.11579264 | | ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | From 39297c56586b30c1ada412b9f73705e48c5195f8 Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Wed, 18 Sep 2024 22:49:04 +0200 Subject: [PATCH 3127/3485] [macOS] Fix for Homebrew shellenv bug to unlock PATH (#10642) * [macOS] Fix for Homebrew shellenv bug to unlock PATH * Add Homebrew default PATH back to bashrc --- images/macos/scripts/build/configure-shell.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/images/macos/scripts/build/configure-shell.sh b/images/macos/scripts/build/configure-shell.sh index ec12cbeb74c5..92b23409e669 100644 --- a/images/macos/scripts/build/configure-shell.sh +++ b/images/macos/scripts/build/configure-shell.sh @@ -15,4 +15,7 @@ sudo chsh -s /bin/bash root if [[ $arch == "arm64" ]]; then echo "Adding Homebrew environment to bash" /opt/homebrew/bin/brew shellenv >> ~/.bashrc + # Workaround for the issue (#10624) with the Homebrew PATH in the bashrc + sed -i '' '/; export PATH;/d' ~/.bashrc + echo 'export PATH="/opt/homebrew/bin:/opt/homebrew/sbin:$PATH"' >> ~/.bashrc fi From 96520bb1920a0c254c186d026d7f9f7cef9f19f7 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 18 Sep 2024 22:49:52 +0000 Subject: [PATCH 3128/3485] Updating readme file for macos-14-arm64 version 20240915.3 (#10622) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-14-arm64-Readme.md | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/images/macos/macos-14-arm64-Readme.md b/images/macos/macos-14-arm64-Readme.md index ebe8400f8f9f..b0e44bef63f6 100644 --- a/images/macos/macos-14-arm64-Readme.md +++ b/images/macos/macos-14-arm64-Readme.md @@ -1,11 +1,13 @@ | Announcements | |-| +| [[Macos 13 and 14] Android NDK versions <=25 will be removed from images on October 07,2024](https://github.com/actions/runner-images/issues/10614) | +| [[Macos 13 and 14] Go version 1.20.0 will be removed on October 07,2024.](https://github.com/actions/runner-images/issues/10612) | | [[macOS] Xcodes visionOS platform will be removed from macOS-14 images on September 23, 2024](https://github.com/actions/runner-images/issues/10559) | *** # macOS 14 - OS Version: macOS 14.6.1 (23G93) - Kernel Version: Darwin 23.6.0 -- Image Version: 20240911.3 +- Image Version: 20240915.3 ## Installed Software @@ -31,7 +33,7 @@ - Bundler 2.5.18 - Carthage 0.40.0 - CocoaPods 1.15.2 -- Homebrew 4.3.20 +- Homebrew 4.3.21 - NPM 10.8.2 - NuGet 6.3.1.1 - Pip3 24.2 (python 3.12) @@ -52,7 +54,7 @@ - bazelisk 1.21.0 - bsdtar 3.5.3 - available by 'tar' alias - Curl 8.7.1 -- Git 2.46.0 +- Git 2.46.1 - Git LFS 3.5.1 - GitHub CLI 2.56.0 - GNU Tar 1.35 - available by 'gtar' alias @@ -66,16 +68,16 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.17.49 -- AWS SAM CLI 1.123.0 +- AWS CLI 2.17.51 +- AWS SAM CLI 1.124.0 - AWS Session Manager CLI 1.2.650.0 - Azure CLI 2.64.0 - Azure CLI (azure-devops) 1.0.1 - Bicep CLI 0.29.47 - Cmake 3.30.3 -- CodeQL Action Bundle 2.18.3 +- CodeQL Action Bundle 2.18.4 - Fastlane 2.222.0 -- SwiftFormat 0.54.4 +- SwiftFormat 0.54.5 - Xcbeautify 2.11.0 - Xcode Command Line Tools 15.3.0.0.1.1708646388 - Xcodes 1.5.0 @@ -120,6 +122,7 @@ - 1.20.14 - 1.21.13 - 1.22.7 +- 1.23.1 ### Rust Tools - Cargo 1.81.0 @@ -201,10 +204,10 @@ | Simulator - watchOS 11.0 | watchsimulator11.0 | 16.0, 16.1 | | visionOS 1.0 | xros1.0 | 15.2 | | Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | -| Simulator - visionOS 1.1 | xrsimulator1.1 | 15.3 | | visionOS 1.1 | xros1.1 | 15.3 | -| visionOS 1.2 | xros1.2 | 15.4 | +| Simulator - visionOS 1.1 | xrsimulator1.1 | 15.3 | | Simulator - visionOS 1.2 | xrsimulator1.2 | 15.4 | +| visionOS 1.2 | xros1.2 | 15.4 | | Simulator - visionOS 2.0 | xrsimulator2.0 | 16.0, 16.1 | | visionOS 2.0 | xros2.0 | 16.0, 16.1 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | @@ -257,7 +260,7 @@ | CMake | 3.22.1 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 24.0.8215888<br>25.2.9519653<br>26.3.11579264 (default) | +| NDK | 24.0.8215888<br>25.2.9519653<br>26.3.11579264 (default)<br>27.1.12297006 | #### Environment variables | Name | Value | @@ -265,7 +268,7 @@ | ANDROID_HOME | /Users/runner/Library/Android/sdk | | ANDROID_NDK | /Users/runner/Library/Android/sdk/ndk/26.3.11579264 | | ANDROID_NDK_HOME | /Users/runner/Library/Android/sdk/ndk/26.3.11579264 | -| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/26.3.11579264 | +| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/27.1.12297006 | | ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk/26.3.11579264 | | ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | From 5809cd0f4d89f51d11223da4d4bea221a0acec69 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 19 Sep 2024 02:55:18 +0000 Subject: [PATCH 3129/3485] Updating readme file for ubuntu22 version 20240915.1.1 (#10627) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2204-Readme.md | 62 +++++++++++++++--------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/images/ubuntu/Ubuntu2204-Readme.md b/images/ubuntu/Ubuntu2204-Readme.md index 94007b8bbc32..5f4aef773a93 100644 --- a/images/ubuntu/Ubuntu2204-Readme.md +++ b/images/ubuntu/Ubuntu2204-Readme.md @@ -1,12 +1,12 @@ | Announcements | |-| -| [[Ubuntu 20.04 and Ubuntu 22.04 Oses] Go 1.22.x will be set as default on September, 20](https://github.com/actions/runner-images/issues/10500) | +| [[Ubuntu 20 and 22] Go version 1.20.0 will be removed on October 14,2024.](https://github.com/actions/runner-images/issues/10607) | | [Ubuntu 24.04 is now available](https://github.com/actions/runner-images/issues/9848) | *** # Ubuntu 22.04 -- OS Version: 22.04.4 LTS -- Kernel Version: 6.5.0-1025-azure -- Image Version: 20240908.1.0 +- OS Version: 22.04.5 LTS +- Kernel Version: 6.8.0-1014-azure +- Image Version: 20240915.1.0 - Systemd version: 249.11-0ubuntu3.12 ## Installed Software @@ -31,8 +31,8 @@ ### Package Management - cpan 1.64 -- Helm 3.15.4 -- Homebrew 4.3.19 +- Helm 3.16.1 +- Homebrew 4.3.21 - Miniconda 24.7.1 - Npm 10.7.0 - NuGet 6.6.1.2 @@ -40,7 +40,7 @@ - Pip3 22.0.2 - Pipx 1.7.1 - RubyGems 3.3.5 -- Vcpkg (build from commit eba7c6a89) +- Vcpkg (build from commit 86fba1306) - Yarn 1.22.22 #### Environment variables @@ -59,13 +59,13 @@ to accomplish this. ### Project Management - Ant 1.10.12 -- Gradle 8.10 +- Gradle 8.10.1 - Lerna 8.1.8 - Maven 3.8.8 - Sbt 1.10.1 ### Tools -- Ansible 2.17.3 +- Ansible 2.17.4 - apt-fast 1.10.0 - AzCopy 10.26.0 - available by `azcopy` and `azcopy10` aliases - Bazel 7.3.1 @@ -73,10 +73,10 @@ to accomplish this. - Bicep 0.29.47 - Buildah 1.23.1 - CMake 3.30.3 -- CodeQL Action Bundle 2.18.3 +- CodeQL Action Bundle 2.18.4 - Docker Amazon ECR Credential Helper 0.8.0 - Docker Compose v2 2.27.1 -- Docker-Buildx 0.16.2 +- Docker-Buildx 0.17.1 - Docker Client 26.1.3 - Docker Server 26.1.3 - Fastlane 2.222.0 @@ -87,12 +87,12 @@ to accomplish this. - Heroku 9.2.1 - jq 1.6 - Kind 0.24.0 -- Kubectl 1.31.0 +- Kubectl 1.31.1 - Kustomize 5.4.3 - Leiningen 2.11.2 - MediaInfo 21.09 - Mercurial 6.1.1 -- Minikube 1.33.1 +- Minikube 1.34.0 - n 10.0.0 - Newman 6.2.1 - nvm 0.40.1 @@ -100,7 +100,7 @@ to accomplish this. - Packer 1.11.2 - Parcel 2.12.0 - Podman 3.4.4 -- Pulumi 3.131.0 +- Pulumi 3.132.0 - R 4.4.1 - Skopeo 1.4.1 - Sphinx Open Source Search Server 2.2.11 @@ -111,18 +111,18 @@ to accomplish this. - zstd 1.5.6 ### CLI Tools -- Alibaba Cloud CLI 3.0.221 -- AWS CLI 2.17.46 +- Alibaba Cloud CLI 3.0.222 +- AWS CLI 2.17.51 - AWS CLI Session Manager Plugin 1.2.650.0 -- AWS SAM CLI 1.123.0 +- AWS SAM CLI 1.124.0 - Azure CLI 2.64.0 - Azure CLI (azure-devops) 1.0.1 -- GitHub CLI 2.55.0 -- Google Cloud CLI 491.0.0 -- Netlify CLI 17.35.0 -- OpenShift CLI 4.16.10 +- GitHub CLI 2.56.0 +- Google Cloud CLI 492.0.0 +- Netlify CLI 17.36.0 +- OpenShift CLI 4.16.11 - ORAS CLI 1.2.0 -- Vercel CLI 37.4.0 +- Vercel CLI 37.4.2 ### Java | Version | Environment Variable | @@ -161,11 +161,11 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.7.1 ### Browsers and Drivers -- Google Chrome 128.0.6613.119 -- ChromeDriver 128.0.6613.119 +- Google Chrome 128.0.6613.137 +- ChromeDriver 128.0.6613.137 - Chromium 128.0.6613.0 -- Microsoft Edge 128.0.2739.67 -- Microsoft Edge WebDriver 128.0.2739.68 +- Microsoft Edge 128.0.2739.79 +- Microsoft Edge WebDriver 128.0.2739.81 - Selenium server 4.24.0 - Mozilla Firefox 130.0 - Geckodriver 0.35.0 @@ -221,10 +221,10 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Python - 3.7.17 - 3.8.18 -- 3.9.19 -- 3.10.14 -- 3.11.9 -- 3.12.5 +- 3.9.20 +- 3.10.15 +- 3.11.10 +- 3.12.6 #### PyPy - 3.7.13 [PyPy 7.3.9] @@ -283,7 +283,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | alpine:3.19 | sha256:ae65dbf8749a7d4527648ccee1fa3deb6bfcae34cbc30fc67aa45c44dcaa90ee | 2024-09-06 | | debian:10 | sha256:58ce6f1271ae1c8a2006ff7d3e54e9874d839f573d8009c20154ad0f2fb0a225 | 2024-06-13 | | debian:11 | sha256:8ccc486c29a3ad02ad5af7f1156e2152dff3ba5634eec9be375269ef123457d8 | 2024-09-04 | -| moby/buildkit:latest | sha256:e0b10610709509aded9b101a61a090e24a5161f46d5eb8a479297fe96aa5d8ac | 2024-08-15 | +| moby/buildkit:latest | sha256:bc1fe18224dbcb92599139db0c745696c48ba9fd4ac24038d1fa81fdd7dcac27 | 2024-09-10 | | node:16 | sha256:f77a1aef2da8d83e45ec990f45df50f1a286c5fe8bbfb8c6e4246c6389705c0b | 2023-09-07 | | node:16-alpine | sha256:a1f9d027912b58a7c75be7716c97cfbc6d3099f3a97ed84aa490be9dee20e787 | 2023-08-10 | | node:18 | sha256:ca07c02d13baf021ff5aadb3b48bcd1fcdd454826266ac313ce858676e8c1548 | 2024-07-09 | From 255206eaeb2bf14734ca321c445e54a84a108598 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 19 Sep 2024 02:55:51 +0000 Subject: [PATCH 3130/3485] Updating readme file for ubuntu20 version 20240915.1.1 (#10628) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2004-Readme.md | 52 +++++++++++++++--------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/images/ubuntu/Ubuntu2004-Readme.md b/images/ubuntu/Ubuntu2004-Readme.md index 285301058e6e..41f76786d979 100644 --- a/images/ubuntu/Ubuntu2004-Readme.md +++ b/images/ubuntu/Ubuntu2004-Readme.md @@ -1,12 +1,12 @@ | Announcements | |-| -| [[Ubuntu 20.04 and Ubuntu 22.04 Oses] Go 1.22.x will be set as default on September, 20](https://github.com/actions/runner-images/issues/10500) | +| [[Ubuntu 20 and 22] Go version 1.20.0 will be removed on October 14,2024.](https://github.com/actions/runner-images/issues/10607) | | [Ubuntu 24.04 is now available](https://github.com/actions/runner-images/issues/9848) | *** # Ubuntu 20.04 - OS Version: 20.04.6 LTS - Kernel Version: 5.15.0-1071-azure -- Image Version: 20240908.1.0 +- Image Version: 20240915.1.0 - Systemd version: 245.4-4ubuntu3.23 ## Installed Software @@ -33,8 +33,8 @@ ### Package Management - cpan 1.64 -- Helm 3.15.4 -- Homebrew 4.3.19 +- Helm 3.16.1 +- Homebrew 4.3.21 - Miniconda 24.7.1 - Npm 10.7.0 - NuGet 6.6.1.2 @@ -42,7 +42,7 @@ - Pip3 20.0.2 - Pipx 1.7.1 - RubyGems 3.1.2 -- Vcpkg (build from commit eba7c6a89) +- Vcpkg (build from commit 86fba1306) - Yarn 1.22.22 #### Environment variables @@ -61,7 +61,7 @@ to accomplish this. ### Project Management - Ant 1.10.7 -- Gradle 8.10 +- Gradle 8.10.1 - Lerna 8.1.8 - Maven 3.8.8 - Sbt 1.10.1 @@ -75,10 +75,10 @@ to accomplish this. - Bicep 0.29.47 - Buildah 1.22.3 - CMake 3.30.3 -- CodeQL Action Bundle 2.18.3 +- CodeQL Action Bundle 2.18.4 - Docker Amazon ECR Credential Helper 0.8.0 - Docker Compose v2 2.27.1 -- Docker-Buildx 0.16.2 +- Docker-Buildx 0.17.1 - Docker Client 26.1.3 - Docker Server 26.1.3 - Fastlane 2.222.0 @@ -90,12 +90,12 @@ to accomplish this. - HHVM (HipHop VM) 4.172.1 - jq 1.6 - Kind 0.24.0 -- Kubectl 1.31.0 +- Kubectl 1.31.1 - Kustomize 5.4.3 - Leiningen 2.11.2 - MediaInfo 19.09 - Mercurial 5.3.1 -- Minikube 1.33.1 +- Minikube 1.34.0 - n 10.0.0 - Newman 6.2.1 - nvm 0.40.1 @@ -104,7 +104,7 @@ to accomplish this. - Parcel 2.12.0 - PhantomJS 2.1.1 2.1.1 - Podman 3.4.2 -- Pulumi 3.131.0 +- Pulumi 3.132.0 - R 4.4.1 - Skopeo 1.5.0 - Sphinx Open Source Search Server 2.2.11 @@ -116,17 +116,17 @@ to accomplish this. ### CLI Tools - Alibaba Cloud CLI 3.0.174 -- AWS CLI 2.17.46 +- AWS CLI 2.17.51 - AWS CLI Session Manager Plugin 1.2.650.0 -- AWS SAM CLI 1.123.0 +- AWS SAM CLI 1.124.0 - Azure CLI 2.64.0 - Azure CLI (azure-devops) 1.0.1 -- GitHub CLI 2.55.0 -- Google Cloud CLI 491.0.0 -- Netlify CLI 17.35.0 +- GitHub CLI 2.56.0 +- Google Cloud CLI 492.0.0 +- Netlify CLI 17.36.0 - OpenShift CLI 4.15.19 - ORAS CLI 1.2.0 -- Vercel CLI 37.4.0 +- Vercel CLI 37.4.2 ### Java | Version | Environment Variable | @@ -165,11 +165,11 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.7.1 ### Browsers and Drivers -- Google Chrome 128.0.6613.119 -- ChromeDriver 128.0.6613.119 +- Google Chrome 128.0.6613.137 +- ChromeDriver 128.0.6613.137 - Chromium 128.0.6613.0 -- Microsoft Edge 128.0.2739.67 -- Microsoft Edge WebDriver 128.0.2739.68 +- Microsoft Edge 128.0.2739.79 +- Microsoft Edge WebDriver 128.0.2739.81 - Selenium server 4.24.0 - Mozilla Firefox 129.0.2 - Geckodriver 0.35.0 @@ -226,10 +226,10 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Python - 3.7.17 - 3.8.18 -- 3.9.19 -- 3.10.14 -- 3.11.9 -- 3.12.5 +- 3.9.20 +- 3.10.15 +- 3.11.10 +- 3.12.6 #### PyPy - 2.7.18 [PyPy 7.3.17] @@ -293,7 +293,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | debian:10 | sha256:58ce6f1271ae1c8a2006ff7d3e54e9874d839f573d8009c20154ad0f2fb0a225 | 2024-06-13 | | debian:11 | sha256:8ccc486c29a3ad02ad5af7f1156e2152dff3ba5634eec9be375269ef123457d8 | 2024-09-04 | | debian:9 | sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be | 2022-06-23 | -| moby/buildkit:latest | sha256:e0b10610709509aded9b101a61a090e24a5161f46d5eb8a479297fe96aa5d8ac | 2024-08-15 | +| moby/buildkit:latest | sha256:bc1fe18224dbcb92599139db0c745696c48ba9fd4ac24038d1fa81fdd7dcac27 | 2024-09-10 | | node:16 | sha256:f77a1aef2da8d83e45ec990f45df50f1a286c5fe8bbfb8c6e4246c6389705c0b | 2023-09-07 | | node:16-alpine | sha256:a1f9d027912b58a7c75be7716c97cfbc6d3099f3a97ed84aa490be9dee20e787 | 2023-08-10 | | node:18 | sha256:ca07c02d13baf021ff5aadb3b48bcd1fcdd454826266ac313ce858676e8c1548 | 2024-07-09 | From 8813e2b6e976b9658892d4150b61fba2e25feed9 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 19 Sep 2024 06:50:34 +0000 Subject: [PATCH 3131/3485] Updating readme file for macos-12 version 20240916.115 (#10630) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-12-Readme.md | 56 +++++++++++++++++---------------- 1 file changed, 29 insertions(+), 27 deletions(-) diff --git a/images/macos/macos-12-Readme.md b/images/macos/macos-12-Readme.md index bbee79e400cc..a4f4aa95a365 100644 --- a/images/macos/macos-12-Readme.md +++ b/images/macos/macos-12-Readme.md @@ -1,14 +1,13 @@ | Announcements | |-| +| [[Macos 13 and 14] Android NDK versions <=25 will be removed from images on October 07,2024](https://github.com/actions/runner-images/issues/10614) | +| [[Macos 13 and 14] Go version 1.20.0 will be removed on October 07,2024.](https://github.com/actions/runner-images/issues/10612) | | [[macOS] Xcodes visionOS platform will be removed from macOS-14 images on September 23, 2024](https://github.com/actions/runner-images/issues/10559) | -| [[Macos] go version 1.20.0 will be removed on September 16,2024.](https://github.com/actions/runner-images/issues/10531) | -| [[Macos] Android NDK 24 will be removed on September 16,2024](https://github.com/actions/runner-images/issues/10530) | -| [[Macos-12] Python version 3.7 will be removed from the macos-12 image on September 16,2024](https://github.com/actions/runner-images/issues/10529) | *** # macOS 12 - OS Version: macOS 12.7.6 (21H1320) - Kernel Version: Darwin 21.6.0 -- Image Version: 20240908.1 +- Image Version: 20240916.115 ## Installed Software @@ -34,16 +33,16 @@ - Perl 5.38.2 - PHP 8.3.11 - Python 2.7.18 -- Python3 3.12.5 +- Python3 3.12.6 - R 4.4.1 - Ruby 3.0.7p220 ### Package Management - Bundler 2.5.18 -- Carthage 0.39.1 +- Carthage 0.40.0 - CocoaPods 1.15.2 - Composer 2.7.9 -- Homebrew 4.3.19 +- Homebrew 4.3.21 - Miniconda 24.7.1 - NPM 10.7.0 - NuGet 6.3.1.1 @@ -51,7 +50,7 @@ - Pip3 24.2 (python 3.12) - Pipx 1.7.1 - RubyGems 3.5.18 -- Vcpkg 2024 (build from commit eba7c6a89) +- Vcpkg 2024 (build from commit 86fba1306) - Yarn 1.22.22 #### Environment variables @@ -63,7 +62,7 @@ ### Project Management - Apache Ant 1.10.15 - Apache Maven 3.9.9 -- Gradle 8.10 +- Gradle 8.10.1 - Sbt 1.10.1 ### Utilities @@ -73,10 +72,10 @@ - bazel 7.3.1 - bazelisk 1.21.0 - bsdtar 3.5.1 - available by 'tar' alias -- Curl 8.9.1 -- Git 2.46.0 +- Curl 8.10.0 +- Git 2.46.1 - Git LFS 3.5.1 -- GitHub CLI 2.55.0 +- GitHub CLI 2.56.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.24.5 - gpg (GnuPG) 2.4.5 @@ -99,22 +98,22 @@ ### Tools - App Center CLI 3.0.1 -- AWS CLI 2.17.46 -- AWS SAM CLI 1.123.0 +- AWS CLI 2.17.51 +- AWS SAM CLI 1.124.0 - AWS Session Manager CLI 1.2.650.0 - Azure CLI 2.64.0 - Azure CLI (azure-devops) 1.0.1 - Bicep CLI 0.29.47 - Cabal 3.10.3.0 - Cmake 3.30.3 -- CodeQL Action Bundle 2.18.3 +- CodeQL Action Bundle 2.18.4 - Colima 0.7.5 - Fastlane 2.222.0 - GHC 9.10.1 - GHCup 0.1.30.0 - Jazzy 0.15.1 - Stack 3.1.1 -- SwiftFormat 0.54.4 +- SwiftFormat 0.54.5 - Swig 4.2.1 - Xcbeautify 1.6.0 - Xcode Command Line Tools 14.2.0.0.1.1668646533 @@ -127,11 +126,11 @@ ### Browsers - Safari 17.6 (17618.3.11.11.7) - SafariDriver 17.6 (17618.3.11.11.7) -- Google Chrome 128.0.6613.120 -- Google Chrome for Testing 128.0.6613.119 -- ChromeDriver 128.0.6613.119 -- Microsoft Edge 128.0.2739.67 -- Microsoft Edge WebDriver 128.0.2739.69 +- Google Chrome 128.0.6613.138 +- Google Chrome for Testing 128.0.6613.137 +- ChromeDriver 128.0.6613.137 +- Microsoft Edge 128.0.2739.79 +- Microsoft Edge WebDriver 128.0.2739.81 - Mozilla Firefox 130.0 - geckodriver 0.35.0 - Selenium server 4.24.0 @@ -163,14 +162,16 @@ #### Ruby - 3.0.7 - 3.1.6 +- 3.2.5 +- 3.3.5 #### Python - 3.7.17 - 3.8.18 -- 3.9.19 -- 3.10.14 +- 3.9.20 +- 3.10.15 - 3.11.9 -- 3.12.5 +- 3.12.6 #### Node.js - 16.20.2 @@ -181,6 +182,7 @@ - 1.20.14 - 1.21.13 - 1.22.7 +- 1.23.1 ### Rust Tools - Cargo 1.81.0 @@ -345,7 +347,7 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" | CMake | 3.18.1<br>3.22.1 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 24.0.8215888<br>25.2.9519653 (default)<br>26.3.11579264 | +| NDK | 24.0.8215888<br>25.2.9519653 (default)<br>26.3.11579264<br>27.1.12297006 | #### Environment variables | Name | Value | @@ -353,7 +355,7 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" | ANDROID_HOME | /Users/runner/Library/Android/sdk | | ANDROID_NDK | /Users/runner/Library/Android/sdk/ndk/25.2.9519653 | | ANDROID_NDK_HOME | /Users/runner/Library/Android/sdk/ndk/25.2.9519653 | -| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/26.3.11579264 | +| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/27.1.12297006 | | ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk/25.2.9519653 | | ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | @@ -366,7 +368,7 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" #### Environment variables | Name | Value | | ----------------- | ----------------------------------------------------------------------------------------- | -| PARALLELS_DMG_URL | https://download.parallels.com/desktop/v19/19.4.1-54985/ParallelsDesktop-19.4.1-54985.dmg | +| PARALLELS_DMG_URL | https://download.parallels.com/desktop/v20/20.0.0-55653/ParallelsDesktop-20.0.0-55653.dmg | ##### Notes ``` From 79c735b9fc65247a732a94d56ad71331ffe63591 Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Thu, 19 Sep 2024 22:19:14 +0200 Subject: [PATCH 3132/3485] [doc] Change Ubuntu-24.04 status: beta -> GA (#10653) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4fa4af9e9112..63c84e9abcbd 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ To build a VM machine from this repo's source, see the [instructions](docs/creat | Image | YAML Label | Included Software | Rollout Status of Latest Image Release | | --------------------|---------------------|--------------------|--------------------| -| Ubuntu 24.04 <sup>beta</sup> | `ubuntu-24.04` | [ubuntu-24.04] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fijunaidm%2F0b5459bbe18604a639e1d2f7accd204f%2Fraw%2Fubuntu24.json) | +| Ubuntu 24.04 | `ubuntu-24.04` | [ubuntu-24.04] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fijunaidm%2F0b5459bbe18604a639e1d2f7accd204f%2Fraw%2Fubuntu24.json) | | Ubuntu 22.04 | `ubuntu-latest` or `ubuntu-22.04` | [ubuntu-22.04] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fijunaidm%2F0b5459bbe18604a639e1d2f7accd204f%2Fraw%2Fubuntu22.json) | | Ubuntu 20.04 | `ubuntu-20.04` | [ubuntu-20.04] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fijunaidm%2F0b5459bbe18604a639e1d2f7accd204f%2Fraw%2Fubuntu20.json) | | macOS 14 | `macos-latest-large` or `macos-14-large`| [macOS-14] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fijunaidm%2F0b5459bbe18604a639e1d2f7accd204f%2Fraw%2Fmacos-14.json) | From 3fbc2970717eed7d520947bfff8c699c35af371d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 20 Sep 2024 03:25:15 +0000 Subject: [PATCH 3133/3485] Updating readme file for macos-14 version 20240918.7 (#10645) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-14-Readme.md | 77 ++++++++++++++++++--------------- 1 file changed, 43 insertions(+), 34 deletions(-) diff --git a/images/macos/macos-14-Readme.md b/images/macos/macos-14-Readme.md index d0314a7bd09f..ee40a6ee7776 100644 --- a/images/macos/macos-14-Readme.md +++ b/images/macos/macos-14-Readme.md @@ -1,12 +1,13 @@ | Announcements | |-| +| [[Macos 13 and 14] Android NDK versions <=25 will be removed from images on October 07,2024](https://github.com/actions/runner-images/issues/10614) | | [[Macos 13 and 14] Go version 1.20.0 will be removed on October 07,2024.](https://github.com/actions/runner-images/issues/10612) | | [[macOS] Xcodes visionOS platform will be removed from macOS-14 images on September 23, 2024](https://github.com/actions/runner-images/issues/10559) | *** # macOS 14 - OS Version: macOS 14.6.1 (23G93) - Kernel Version: Darwin 23.6.0 -- Image Version: 20240915.2 +- Image Version: 20240918.7 ## Installed Software @@ -30,16 +31,16 @@ - Ruby 3.0.7p220 ### Package Management -- Bundler 2.5.18 +- Bundler 2.5.19 - Carthage 0.40.0 - CocoaPods 1.15.2 - Composer 2.7.9 -- Homebrew 4.3.21 +- Homebrew 4.3.23 - NPM 10.8.2 - NuGet 6.3.1.1 - Pip3 24.2 (python 3.12) - Pipx 1.7.1 -- RubyGems 3.5.18 +- RubyGems 3.5.19 - Yarn 1.22.22 ### Project Management @@ -54,10 +55,10 @@ - bazel 7.3.1 - bazelisk 1.21.0 - bsdtar 3.5.3 - available by 'tar' alias -- Curl 8.10.0 +- Curl 8.10.1 - Git 2.46.1 - Git LFS 3.5.1 -- GitHub CLI 2.56.0 +- GitHub CLI 2.57.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.24.5 - gpg (GnuPG) 2.4.5 @@ -69,18 +70,18 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.17.51 +- AWS CLI 2.17.54 - AWS SAM CLI 1.124.0 - AWS Session Manager CLI 1.2.650.0 - Azure CLI 2.64.0 - Azure CLI (azure-devops) 1.0.1 -- Bicep CLI 0.29.47 +- Bicep CLI 0.30.3 - Cmake 3.30.3 - CodeQL Action Bundle 2.18.4 - Fastlane 2.222.0 - SwiftFormat 0.54.5 - Xcbeautify 2.11.0 -- Xcode Command Line Tools 15.3.0.0.1.1708646388 +- Xcode Command Line Tools 16.0.0.0.1.1724870825 - Xcodes 1.5.0 ### Linters @@ -89,12 +90,12 @@ ### Browsers - Safari 17.6 (19618.3.11.11.5) - SafariDriver 17.6 (19618.3.11.11.5) -- Google Chrome 128.0.6613.138 -- Google Chrome for Testing 128.0.6613.137 -- ChromeDriver 128.0.6613.137 +- Google Chrome 129.0.6668.59 +- Google Chrome for Testing 129.0.6668.58 +- ChromeDriver 129.0.6668.58 - Microsoft Edge 128.0.2739.79 -- Microsoft Edge WebDriver 128.0.2739.81 -- Mozilla Firefox 130.0 +- Microsoft Edge WebDriver 128.0.2739.86 +- Mozilla Firefox 130.0.1 - geckodriver 0.35.0 - Selenium server 4.24.0 @@ -156,16 +157,16 @@ - PSScriptAnalyzer: 1.22.0 ### Xcode -| Version | Build | Path | -| -------------- | -------- | -------------------------------------------- | -| 16.1 (beta) | 16B5001e | /Applications/Xcode_16.1_beta.app | -| 16.0 | 16A242 | /Applications/Xcode_16_Release_Candidate.app | -| 15.4 (default) | 15F31d | /Applications/Xcode_15.4.app | -| 15.3 | 15E204a | /Applications/Xcode_15.3.app | -| 15.2 | 15C500b | /Applications/Xcode_15.2.app | -| 15.1 | 15C65 | /Applications/Xcode_15.1.app | -| 15.0.1 | 15A507 | /Applications/Xcode_15.0.1.app | -| 14.3.1 | 14E300c | /Applications/Xcode_14.3.1.app | +| Version | Build | Path | +| -------------- | -------- | ----------------------------------- | +| 16.1 (beta) | 16B5014f | /Applications/Xcode_16.1_beta_2.app | +| 16.0 | 16A242d | /Applications/Xcode_16.app | +| 15.4 (default) | 15F31d | /Applications/Xcode_15.4.app | +| 15.3 | 15E204a | /Applications/Xcode_15.3.app | +| 15.2 | 15C500b | /Applications/Xcode_15.2.app | +| 15.1 | 15C65 | /Applications/Xcode_15.1.app | +| 15.0.1 | 15A507 | /Applications/Xcode_15.0.1.app | +| 14.3.1 | 14E300c | /Applications/Xcode_14.3.1.app | #### Installed SDKs | SDK | SDK Name | Xcode Version | @@ -196,36 +197,42 @@ | tvOS 17.2 | appletvos17.2 | 15.1, 15.2 | | tvOS 17.4 | appletvos17.4 | 15.3 | | tvOS 17.5 | appletvos17.5 | 15.4 | -| tvOS 18.0 | appletvos18.0 | 16.0, 16.1 | +| tvOS 18.0 | appletvos18.0 | 16.0 | +| tvOS 18.1 | appletvos18.1 | 16.1 | | Simulator - tvOS 16.4 | appletvsimulator16.4 | 14.3.1 | | Simulator - tvOS 17.0 | appletvsimulator17.0 | 15.0.1 | | Simulator - tvOS 17.2 | appletvsimulator17.2 | 15.1, 15.2 | | Simulator - tvOS 17.4 | appletvsimulator17.4 | 15.3 | | Simulator - tvOS 17.5 | appletvsimulator17.5 | 15.4 | -| Simulator - tvOS 18.0 | appletvsimulator18.0 | 16.0, 16.1 | +| Simulator - tvOS 18.0 | appletvsimulator18.0 | 16.0 | +| Simulator - tvOS 18.1 | appletvsimulator18.1 | 16.1 | | watchOS 9.4 | watchos9.4 | 14.3.1 | | watchOS 10.0 | watchos10.0 | 15.0.1 | | watchOS 10.2 | watchos10.2 | 15.1, 15.2 | | watchOS 10.4 | watchos10.4 | 15.3 | | watchOS 10.5 | watchos10.5 | 15.4 | -| watchOS 11.0 | watchos11.0 | 16.0, 16.1 | +| watchOS 11.0 | watchos11.0 | 16.0 | +| watchOS 11.1 | watchos11.1 | 16.1 | | Simulator - watchOS 9.4 | watchsimulator9.4 | 14.3.1 | | Simulator - watchOS 10.0 | watchsimulator10.0 | 15.0.1 | | Simulator - watchOS 10.2 | watchsimulator10.2 | 15.1, 15.2 | | Simulator - watchOS 10.4 | watchsimulator10.4 | 15.3 | | Simulator - watchOS 10.5 | watchsimulator10.5 | 15.4 | -| Simulator - watchOS 11.0 | watchsimulator11.0 | 16.0, 16.1 | +| Simulator - watchOS 11.0 | watchsimulator11.0 | 16.0 | +| Simulator - watchOS 11.1 | watchsimulator11.1 | 16.1 | | Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | | visionOS 1.0 | xros1.0 | 15.2 | -| visionOS 1.1 | xros1.1 | 15.3 | | Simulator - visionOS 1.1 | xrsimulator1.1 | 15.3 | +| visionOS 1.1 | xros1.1 | 15.3 | | Simulator - visionOS 1.2 | xrsimulator1.2 | 15.4 | | visionOS 1.2 | xros1.2 | 15.4 | -| Simulator - visionOS 2.0 | xrsimulator2.0 | 16.0, 16.1 | -| visionOS 2.0 | xros2.0 | 16.0, 16.1 | +| visionOS 2.0 | xros2.0 | 16.0 | +| Simulator - visionOS 2.0 | xrsimulator2.0 | 16.0 | +| visionOS 2.1 | xros2.1 | 16.1 | +| Simulator - visionOS 2.1 | xrsimulator2.1 | 16.1 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | -| Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | +| Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | | DriverKit 22.4 | driverkit22.4 | 14.3.1 | | DriverKit 23.0 | driverkit23.0 | 15.0.1 | | DriverKit 23.2 | driverkit23.2 | 15.1, 15.2 | @@ -250,18 +257,20 @@ | tvOS 17.4 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | | tvOS 17.5 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | | tvOS 18.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 18.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | | watchOS 9.4 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | | watchOS 10.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | | watchOS 10.2 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | | watchOS 10.4 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | | watchOS 10.5 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | | watchOS 11.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 10 (42mm)<br>Apple Watch Series 10 (46mm)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 11.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 10 (42mm)<br>Apple Watch Series 10 (46mm)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | ### Android | Package Name | Version | | -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 11.0 | -| Android Emulator | 35.1.20 | +| Android Emulator | 35.1.21 | | Android SDK Build-tools | 35.0.0<br>34.0.0<br>33.0.2 33.0.3 | | Android SDK Platforms | android-35 (rev 1)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | | Android SDK Platform-Tools | 35.0.2 | @@ -286,7 +295,7 @@ #### Environment variables | Name | Value | | ----------------- | ----------------------------------------------------------------------------------------- | -| PARALLELS_DMG_URL | https://download.parallels.com/desktop/v20/20.0.0-55653/ParallelsDesktop-20.0.0-55653.dmg | +| PARALLELS_DMG_URL | https://download.parallels.com/desktop/v20/20.0.1-55659/ParallelsDesktop-20.0.1-55659.dmg | ##### Notes ``` From 8ffffdb49d9ca992f12a1cd4350e64e7914cfc9a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 20 Sep 2024 08:57:21 +0000 Subject: [PATCH 3134/3485] Updating readme file for macos-14-arm64 version 20240918.8 (#10647) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-14-arm64-Readme.md | 65 +++++++++++++++------------ 1 file changed, 37 insertions(+), 28 deletions(-) diff --git a/images/macos/macos-14-arm64-Readme.md b/images/macos/macos-14-arm64-Readme.md index b0e44bef63f6..e11fe65ccde2 100644 --- a/images/macos/macos-14-arm64-Readme.md +++ b/images/macos/macos-14-arm64-Readme.md @@ -7,7 +7,7 @@ # macOS 14 - OS Version: macOS 14.6.1 (23G93) - Kernel Version: Darwin 23.6.0 -- Image Version: 20240915.3 +- Image Version: 20240918.8 ## Installed Software @@ -30,15 +30,15 @@ - Ruby 3.0.7p220 ### Package Management -- Bundler 2.5.18 +- Bundler 2.5.19 - Carthage 0.40.0 - CocoaPods 1.15.2 -- Homebrew 4.3.21 +- Homebrew 4.3.23 - NPM 10.8.2 - NuGet 6.3.1.1 - Pip3 24.2 (python 3.12) - Pipx 1.7.1 -- RubyGems 3.5.18 +- RubyGems 3.5.19 - Yarn 1.22.22 ### Project Management @@ -56,7 +56,7 @@ - Curl 8.7.1 - Git 2.46.1 - Git LFS 3.5.1 -- GitHub CLI 2.56.0 +- GitHub CLI 2.57.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.24.5 - gpg (GnuPG) 2.4.5 @@ -68,18 +68,18 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.17.51 +- AWS CLI 2.17.54 - AWS SAM CLI 1.124.0 - AWS Session Manager CLI 1.2.650.0 - Azure CLI 2.64.0 - Azure CLI (azure-devops) 1.0.1 -- Bicep CLI 0.29.47 +- Bicep CLI 0.30.3 - Cmake 3.30.3 - CodeQL Action Bundle 2.18.4 - Fastlane 2.222.0 - SwiftFormat 0.54.5 - Xcbeautify 2.11.0 -- Xcode Command Line Tools 15.3.0.0.1.1708646388 +- Xcode Command Line Tools 16.0.0.0.1.1724870825 - Xcodes 1.5.0 ### Linters @@ -87,9 +87,9 @@ ### Browsers - Safari 17.6 (19618.3.11.11.5) - SafariDriver 17.6 (19618.3.11.11.5) -- Google Chrome 128.0.6613.138 -- Google Chrome for Testing 128.0.6613.137 -- ChromeDriver 128.0.6613.137 +- Google Chrome 129.0.6668.59 +- Google Chrome for Testing 129.0.6668.58 +- ChromeDriver 129.0.6668.58 - Selenium server 4.24.0 #### Environment variables @@ -143,16 +143,16 @@ - PSScriptAnalyzer: 1.22.0 ### Xcode -| Version | Build | Path | -| -------------- | -------- | -------------------------------------------- | -| 16.1 (beta) | 16B5001e | /Applications/Xcode_16.1_beta.app | -| 16.0 | 16A242 | /Applications/Xcode_16_Release_Candidate.app | -| 15.4 (default) | 15F31d | /Applications/Xcode_15.4.app | -| 15.3 | 15E204a | /Applications/Xcode_15.3.app | -| 15.2 | 15C500b | /Applications/Xcode_15.2.app | -| 15.1 | 15C65 | /Applications/Xcode_15.1.app | -| 15.0.1 | 15A507 | /Applications/Xcode_15.0.1.app | -| 14.3.1 | 14E300c | /Applications/Xcode_14.3.1.app | +| Version | Build | Path | +| -------------- | -------- | ----------------------------------- | +| 16.1 (beta) | 16B5014f | /Applications/Xcode_16.1_beta_2.app | +| 16.0 | 16A242d | /Applications/Xcode_16.app | +| 15.4 (default) | 15F31d | /Applications/Xcode_15.4.app | +| 15.3 | 15E204a | /Applications/Xcode_15.3.app | +| 15.2 | 15C500b | /Applications/Xcode_15.2.app | +| 15.1 | 15C65 | /Applications/Xcode_15.1.app | +| 15.0.1 | 15A507 | /Applications/Xcode_15.0.1.app | +| 14.3.1 | 14E300c | /Applications/Xcode_14.3.1.app | #### Installed SDKs | SDK | SDK Name | Xcode Version | @@ -183,33 +183,39 @@ | tvOS 17.2 | appletvos17.2 | 15.1, 15.2 | | tvOS 17.4 | appletvos17.4 | 15.3 | | tvOS 17.5 | appletvos17.5 | 15.4 | -| tvOS 18.0 | appletvos18.0 | 16.0, 16.1 | +| tvOS 18.0 | appletvos18.0 | 16.0 | +| tvOS 18.1 | appletvos18.1 | 16.1 | | Simulator - tvOS 16.4 | appletvsimulator16.4 | 14.3.1 | | Simulator - tvOS 17.0 | appletvsimulator17.0 | 15.0.1 | | Simulator - tvOS 17.2 | appletvsimulator17.2 | 15.1, 15.2 | | Simulator - tvOS 17.4 | appletvsimulator17.4 | 15.3 | | Simulator - tvOS 17.5 | appletvsimulator17.5 | 15.4 | -| Simulator - tvOS 18.0 | appletvsimulator18.0 | 16.0, 16.1 | +| Simulator - tvOS 18.0 | appletvsimulator18.0 | 16.0 | +| Simulator - tvOS 18.1 | appletvsimulator18.1 | 16.1 | | watchOS 9.4 | watchos9.4 | 14.3.1 | | watchOS 10.0 | watchos10.0 | 15.0.1 | | watchOS 10.2 | watchos10.2 | 15.1, 15.2 | | watchOS 10.4 | watchos10.4 | 15.3 | | watchOS 10.5 | watchos10.5 | 15.4 | -| watchOS 11.0 | watchos11.0 | 16.0, 16.1 | +| watchOS 11.0 | watchos11.0 | 16.0 | +| watchOS 11.1 | watchos11.1 | 16.1 | | Simulator - watchOS 9.4 | watchsimulator9.4 | 14.3.1 | | Simulator - watchOS 10.0 | watchsimulator10.0 | 15.0.1 | | Simulator - watchOS 10.2 | watchsimulator10.2 | 15.1, 15.2 | | Simulator - watchOS 10.4 | watchsimulator10.4 | 15.3 | | Simulator - watchOS 10.5 | watchsimulator10.5 | 15.4 | -| Simulator - watchOS 11.0 | watchsimulator11.0 | 16.0, 16.1 | +| Simulator - watchOS 11.0 | watchsimulator11.0 | 16.0 | +| Simulator - watchOS 11.1 | watchsimulator11.1 | 16.1 | | visionOS 1.0 | xros1.0 | 15.2 | | Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | | visionOS 1.1 | xros1.1 | 15.3 | | Simulator - visionOS 1.1 | xrsimulator1.1 | 15.3 | | Simulator - visionOS 1.2 | xrsimulator1.2 | 15.4 | | visionOS 1.2 | xros1.2 | 15.4 | -| Simulator - visionOS 2.0 | xrsimulator2.0 | 16.0, 16.1 | -| visionOS 2.0 | xros2.0 | 16.0, 16.1 | +| visionOS 2.0 | xros2.0 | 16.0 | +| Simulator - visionOS 2.0 | xrsimulator2.0 | 16.0 | +| Simulator - visionOS 2.1 | xrsimulator2.1 | 16.1 | +| visionOS 2.1 | xros2.1 | 16.1 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | @@ -237,22 +243,25 @@ | tvOS 17.4 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | | tvOS 17.5 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | | tvOS 18.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 18.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | | watchOS 9.4 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | | watchOS 10.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | | watchOS 10.2 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | | watchOS 10.4 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | | watchOS 10.5 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | | watchOS 11.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 10 (42mm)<br>Apple Watch Series 10 (46mm)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 11.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 10 (42mm)<br>Apple Watch Series 10 (46mm)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | | visionOS 1.0 | Apple Vision Pro | | visionOS 1.1 | Apple Vision Pro | | visionOS 1.2 | Apple Vision Pro | | visionOS 2.0 | Apple Vision Pro | +| visionOS 2.1 | Apple Vision Pro | ### Android | Package Name | Version | | -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 11.0 | -| Android Emulator | 35.1.20 | +| Android Emulator | 35.1.21 | | Android SDK Build-tools | 35.0.0<br>34.0.0<br>33.0.2 33.0.3 | | Android SDK Platforms | android-35 (rev 1)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | | Android SDK Platform-Tools | 35.0.2 | From 6e8c37cf5285aa6350b821858f735e17202eac54 Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Fri, 20 Sep 2024 16:06:10 +0200 Subject: [PATCH 3135/3485] [macOS] Update base image generation to work with Sequoia updates (#10651) Co-authored-by: sarathrajsrinivasan <159180023+sarathrajsrinivasan@users.noreply.github.com> --- images.CI/macos/anka/CreateCleanAnkaTemplate.ps1 | 5 +++-- images.CI/macos/anka/Service.Helpers.psm1 | 9 +++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/images.CI/macos/anka/CreateCleanAnkaTemplate.ps1 b/images.CI/macos/anka/CreateCleanAnkaTemplate.ps1 index 0c817fb6f572..4d7e545e0199 100644 --- a/images.CI/macos/anka/CreateCleanAnkaTemplate.ps1 +++ b/images.CI/macos/anka/CreateCleanAnkaTemplate.ps1 @@ -93,8 +93,9 @@ function Invoke-SoftwareUpdate { $command = "sw_vers" $guestMacosVersion = Invoke-SSHPassCommand -HostName $ipAddress -Command $command switch -regex ($guestMacosVersion[1]) { - '12.\d' { $nextOSVersion = 'macOS Ventura|macOS Sonoma' } - '13.\d' { $nextOSVersion = 'macOS Sonoma' } + '12.\d' { $nextOSVersion = 'macOS Ventura|macOS Sonoma|macOS Sequoia' } + '13.\d' { $nextOSVersion = 'macOS Sonoma|macOS Sequoia' } + '14.\d' { $nextOSVersion = 'macOS Sequoia' } } Write-Host "`t[*] Fetching Software Updates ready to install on '$TemplateName' VM:" diff --git a/images.CI/macos/anka/Service.Helpers.psm1 b/images.CI/macos/anka/Service.Helpers.psm1 index 188ea01266c2..f8368b26fcc2 100644 --- a/images.CI/macos/anka/Service.Helpers.psm1 +++ b/images.CI/macos/anka/Service.Helpers.psm1 @@ -39,14 +39,15 @@ function Invoke-SoftwareUpdateArm64 { $command = "sw_vers" $guestMacosVersion = Invoke-SSHPassCommand -HostName $HostName -Command $command switch -regex ($guestMacosVersion[1]) { - '13.\d' { $nextOSVersion = 'Sonoma' } - '14.\d' { $nextOSVersion = 'NotYetDefined' } + '12.\d' { $nextOSVersion = 'macOS Ventura|macOS Sonoma|macOS Sequoia' } + '13.\d' { $nextOSVersion = 'macOS Sonoma|macOS Sequoia' } + '14.\d' { $nextOSVersion = 'macOS Sequoia' } } $url = "https://raw.githubusercontent.com/actions/runner-images/main/images/macos/assets/auto-software-update-arm64.exp" $script = Invoke-RestMethod -Uri $url - foreach ($update in $listOfUpdates) { - if ($update -notmatch "$nextOSVersion") { + foreach ($update in $ListOfUpdates) { + if ($update -notmatch $nextOSVersion) { $updatedScript = $script.Replace("MACOSUPDATE", $($($update.trim()).Replace(" ","\ "))) $base64 = [Convert]::ToBase64String($updatedScript.ToCharArray()) $command = "echo $base64 | base64 --decode > ./auto-software-update-arm64.exp;chmod +x ./auto-software-update-arm64.exp; ./auto-software-update-arm64.exp ${Password};rm ./auto-software-update-arm64.exp" From d1db39831d5ff8fe7737d54e947bc54a1b125c31 Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Fri, 20 Sep 2024 16:06:42 +0200 Subject: [PATCH 3136/3485] [macOS] visionOS platform tools temporary removed from macOS-14 (#10652) --- images/macos/toolsets/toolset-14.json | 32 +++++++++++++-------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/images/macos/toolsets/toolset-14.json b/images/macos/toolsets/toolset-14.json index 235c3dd18383..a6c8139c36e9 100644 --- a/images/macos/toolsets/toolset-14.json +++ b/images/macos/toolsets/toolset-14.json @@ -3,26 +3,26 @@ "default": "15.4", "x64": { "versions": [ - { "link": "16.1_beta_2", "version": "16.1.0-Beta.2+16B5014f", "symlinks": ["16.1"], "install_runtimes": "true", "sha256": "a07a709b4b196be118ff5bab7ea19a16a4ca273cad876d73dec5926c8a6da34a"}, - { "link": "16", "version": "16.0.0+16A242d", "symlinks": ["16.0"], "install_runtimes": "true", "sha256": "4a26c3d102a55c7222fb145e0ee1503249c9c26c6e02dc64d783c8810b37b1e3"}, - { "link": "15.4", "version": "15.4.0+15F31d", "install_runtimes": "true", "sha256": "82d3d61804ff3f4c7c82085e91dc701037ddaa770e542848b2477e22f4e8aa7a"}, - { "link": "15.3", "version": "15.3.0+15E204a", "install_runtimes": "true", "sha256": "f13f6a2e2df432c3008e394640b8549a18c285acd7fd148d6c4bac8c3a5af234"}, - { "link": "15.2", "version": "15.2.0+15C500b", "install_runtimes": "true", "sha256": "04E93680C6DDBEC84666531BE412DE778AFC8EAC6AB2037F4C2BE7290818B59B"}, - { "link": "15.1", "version": "15.1.0+15C65", "install_runtimes": "true", "sha256": "857D8DB537BAC82BF99DE0E1D3895D214D4D02101C1340CEF3DAF6E821BA1D05"}, - { "link": "15.0.1", "version": "15.0.1+15A507", "symlinks": ["15.0"], "install_runtimes": "true", "sha256": "5AC17AE6060CAFC3C7112C6DA0B153450BE21F1DE6632777FBA9FBC9D999C9E8"}, - { "link": "14.3.1", "version": "14.3.1+14E300c","symlinks": ["14.3"], "install_runtimes": "true", "sha256": "B5CC7BF37447C32A971B37D71C7DA1AF7ABB45CEE4B96FE126A1D3B0D2C260AF"} + { "link": "16.1_beta_2", "version": "16.1.0-Beta.2+16B5014f", "symlinks": ["16.1"], "runtimes": ["iOS", "watchOS", "tvOS"], "sha256": "a07a709b4b196be118ff5bab7ea19a16a4ca273cad876d73dec5926c8a6da34a"}, + { "link": "16", "version": "16.0.0+16A242d", "symlinks": ["16.0"], "runtimes": ["iOS", "watchOS", "tvOS"], "sha256": "4a26c3d102a55c7222fb145e0ee1503249c9c26c6e02dc64d783c8810b37b1e3"}, + { "link": "15.4", "version": "15.4.0+15F31d", "runtimes": ["iOS", "watchOS", "tvOS"], "sha256": "82d3d61804ff3f4c7c82085e91dc701037ddaa770e542848b2477e22f4e8aa7a"}, + { "link": "15.3", "version": "15.3.0+15E204a", "runtimes": ["iOS", "watchOS", "tvOS"], "sha256": "f13f6a2e2df432c3008e394640b8549a18c285acd7fd148d6c4bac8c3a5af234"}, + { "link": "15.2", "version": "15.2.0+15C500b", "runtimes": ["iOS", "watchOS", "tvOS"], "sha256": "04E93680C6DDBEC84666531BE412DE778AFC8EAC6AB2037F4C2BE7290818B59B"}, + { "link": "15.1", "version": "15.1.0+15C65", "runtimes": ["iOS", "watchOS", "tvOS"], "sha256": "857D8DB537BAC82BF99DE0E1D3895D214D4D02101C1340CEF3DAF6E821BA1D05"}, + { "link": "15.0.1", "version": "15.0.1+15A507", "symlinks": ["15.0"], "runtimes": ["iOS", "watchOS", "tvOS"], "sha256": "5AC17AE6060CAFC3C7112C6DA0B153450BE21F1DE6632777FBA9FBC9D999C9E8"}, + { "link": "14.3.1", "version": "14.3.1+14E300c","symlinks": ["14.3"], "runtimes": ["iOS", "watchOS", "tvOS"], "sha256": "B5CC7BF37447C32A971B37D71C7DA1AF7ABB45CEE4B96FE126A1D3B0D2C260AF"} ] }, "arm64":{ "versions": [ - { "link": "16.1_beta_2", "version": "16.1.0-Beta.2+16B5014f", "symlinks": ["16.1"], "install_runtimes": "true", "sha256": "a07a709b4b196be118ff5bab7ea19a16a4ca273cad876d73dec5926c8a6da34a"}, - { "link": "16", "version": "16.0.0+16A242d", "symlinks": ["16.0"], "install_runtimes": "true", "sha256": "4a26c3d102a55c7222fb145e0ee1503249c9c26c6e02dc64d783c8810b37b1e3"}, - { "link": "15.4", "version": "15.4.0+15F31d", "install_runtimes": "true", "sha256": "82d3d61804ff3f4c7c82085e91dc701037ddaa770e542848b2477e22f4e8aa7a"}, - { "link": "15.3", "version": "15.3.0+15E204a", "install_runtimes": "true", "sha256": "f13f6a2e2df432c3008e394640b8549a18c285acd7fd148d6c4bac8c3a5af234"}, - { "link": "15.2", "version": "15.2.0+15C500b", "install_runtimes": "true", "sha256": "04E93680C6DDBEC84666531BE412DE778AFC8EAC6AB2037F4C2BE7290818B59B"}, - { "link": "15.1", "version": "15.1.0+15C65", "install_runtimes": "true", "sha256": "857D8DB537BAC82BF99DE0E1D3895D214D4D02101C1340CEF3DAF6E821BA1D05"}, - { "link": "15.0.1", "version": "15.0.1+15A507", "symlinks": ["15.0"], "install_runtimes": "true", "sha256": "5AC17AE6060CAFC3C7112C6DA0B153450BE21F1DE6632777FBA9FBC9D999C9E8"}, - { "link": "14.3.1", "version": "14.3.1+14E300c","symlinks": ["14.3"], "install_runtimes": "true", "sha256": "B5CC7BF37447C32A971B37D71C7DA1AF7ABB45CEE4B96FE126A1D3B0D2C260AF"} + { "link": "16.1_beta_2", "version": "16.1.0-Beta.2+16B5014f", "symlinks": ["16.1"], "runtimes": ["iOS", "watchOS", "tvOS"], "sha256": "a07a709b4b196be118ff5bab7ea19a16a4ca273cad876d73dec5926c8a6da34a"}, + { "link": "16", "version": "16.0.0+16A242d", "symlinks": ["16.0"], "runtimes": ["iOS", "watchOS", "tvOS"], "sha256": "4a26c3d102a55c7222fb145e0ee1503249c9c26c6e02dc64d783c8810b37b1e3"}, + { "link": "15.4", "version": "15.4.0+15F31d", "runtimes": ["iOS", "watchOS", "tvOS"], "sha256": "82d3d61804ff3f4c7c82085e91dc701037ddaa770e542848b2477e22f4e8aa7a"}, + { "link": "15.3", "version": "15.3.0+15E204a", "runtimes": ["iOS", "watchOS", "tvOS"], "sha256": "f13f6a2e2df432c3008e394640b8549a18c285acd7fd148d6c4bac8c3a5af234"}, + { "link": "15.2", "version": "15.2.0+15C500b", "runtimes": ["iOS", "watchOS", "tvOS"], "sha256": "04E93680C6DDBEC84666531BE412DE778AFC8EAC6AB2037F4C2BE7290818B59B"}, + { "link": "15.1", "version": "15.1.0+15C65", "runtimes": ["iOS", "watchOS", "tvOS"], "sha256": "857D8DB537BAC82BF99DE0E1D3895D214D4D02101C1340CEF3DAF6E821BA1D05"}, + { "link": "15.0.1", "version": "15.0.1+15A507", "symlinks": ["15.0"], "runtimes": ["iOS", "watchOS", "tvOS"], "sha256": "5AC17AE6060CAFC3C7112C6DA0B153450BE21F1DE6632777FBA9FBC9D999C9E8"}, + { "link": "14.3.1", "version": "14.3.1+14E300c","symlinks": ["14.3"], "runtimes": ["iOS", "watchOS", "tvOS"], "sha256": "B5CC7BF37447C32A971B37D71C7DA1AF7ABB45CEE4B96FE126A1D3B0D2C260AF"} ] } }, From 8a1eeaf6ac70c66f675a04078d1a7222edd42008 Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Sat, 21 Sep 2024 14:01:48 +0200 Subject: [PATCH 3137/3485] [macOS] Remove deprecated versions of .NET 7 and Android NDK 25 (#10659) --- images/macos/toolsets/toolset-15.json | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/images/macos/toolsets/toolset-15.json b/images/macos/toolsets/toolset-15.json index 998fef9055b7..cabc7d64c782 100644 --- a/images/macos/toolsets/toolset-15.json +++ b/images/macos/toolsets/toolset-15.json @@ -39,7 +39,7 @@ "ndk": { "default": "27", "versions": [ - "25", "26", "27" + "26", "27" ] } }, @@ -89,13 +89,11 @@ "arch":{ "x64": { "versions": [ - "7.0", "8.0" ] }, "arm64": { "versions": [ - "7.0", "8.0" ] } From 87d136e3087630f83fccef5eb646a9302c4845cf Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 25 Sep 2024 11:16:49 +0000 Subject: [PATCH 3138/3485] Updating readme file for ubuntu24 version 20240922.1.1 (#10672) Co-authored-by: Image generation service account. <no-reply@microsoft.com> --- images/ubuntu/Ubuntu2404-Readme.md | 42 +++++++++++++++--------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/images/ubuntu/Ubuntu2404-Readme.md b/images/ubuntu/Ubuntu2404-Readme.md index ba2296909d66..ed7dba8c9940 100644 --- a/images/ubuntu/Ubuntu2404-Readme.md +++ b/images/ubuntu/Ubuntu2404-Readme.md @@ -1,12 +1,12 @@ | Announcements | |-| +| [Ubuntu-latest workflows will use Ubuntu-24.04 image](https://github.com/actions/runner-images/issues/10636) | | [[Ubuntu 20 and 22] Go version 1.20.0 will be removed on October 14,2024.](https://github.com/actions/runner-images/issues/10607) | -| [Ubuntu 24.04 is now available](https://github.com/actions/runner-images/issues/9848) | *** # Ubuntu 24.04 - OS Version: 24.04.1 LTS - Kernel Version: 6.8.0-1014-azure -- Image Version: 20240915.1.0 +- Image Version: 20240922.1.0 - Systemd version: 255.4-1ubuntu8.4 ## Installed Software @@ -25,19 +25,19 @@ - Perl 5.38.2 - Python 3.12.3 - Ruby 3.2.3 -- Swift 5.10.1 +- Swift 6.0 ### Package Management - cpan 1.64 - Helm 3.16.1 -- Homebrew 4.3.21 +- Homebrew 4.3.23 - Miniconda 24.7.1 - Npm 10.8.2 - Pip 24.0 - Pip3 24.0 - Pipx 1.4.3 - RubyGems 3.4.20 -- Vcpkg (build from commit 86fba1306) +- Vcpkg (build from commit 98aa63962) - Yarn 1.22.22 #### Environment variables @@ -65,17 +65,17 @@ to accomplish this. - AzCopy 10.26.0 - available by `azcopy` and `azcopy10` aliases - Bazel 7.3.1 - Bazelisk 1.21.0 -- Bicep 0.29.47 +- Bicep 0.30.3 - Buildah 1.33.7 - CMake 3.30.3 -- CodeQL Action Bundle 2.18.4 -- Docker Amazon ECR Credential Helper 0.8.0 +- CodeQL Action Bundle 2.19.0 +- Docker Amazon ECR Credential Helper 0.9.0 - Docker Compose v2 2.27.1 - Docker-Buildx 0.17.1 - Docker Client 26.1.3 - Docker Server 26.1.3 - Fastlane 2.222.0 -- Git 2.46.0 +- Git 2.46.1 - Git LFS 3.5.1 - Git-ftp 1.6.0 - Haveged 1.9.14 @@ -92,7 +92,7 @@ to accomplish this. - Packer 1.11.2 - Parcel 2.12.0 - Podman 4.9.3 -- Pulumi 3.132.0 +- Pulumi 3.133.0 - Skopeo 1.13.3 - Sphinx Open Source Search Server 2.2.11 - yamllint 1.35.1 @@ -100,12 +100,12 @@ to accomplish this. - zstd 1.5.6 ### CLI Tools -- AWS CLI 2.17.51 +- AWS CLI 2.17.56 - AWS CLI Session Manager Plugin 1.2.650.0 - AWS SAM CLI 1.124.0 - Azure CLI 2.64.0 - Azure CLI (azure-devops) 1.0.1 -- GitHub CLI 2.56.0 +- GitHub CLI 2.57.0 ### Java | Version | Environment Variable | @@ -118,7 +118,7 @@ to accomplish this. ### PHP Tools - PHP: 8.3.6 - Composer 2.7.9 -- PHPUnit 8.5.39 +- PHPUnit 8.5.40 ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ``` @@ -139,13 +139,13 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.7.1 ### Browsers and Drivers -- Google Chrome 128.0.6613.137 -- ChromeDriver 128.0.6613.137 -- Chromium 128.0.6613.0 -- Microsoft Edge 128.0.2739.79 -- Microsoft Edge WebDriver 128.0.2739.81 -- Selenium server 4.24.0 -- Mozilla Firefox 130.0 +- Google Chrome 129.0.6668.58 +- ChromeDriver 129.0.6668.58 +- Chromium 129.0.6668.0 +- Microsoft Edge 129.0.2792.52 +- Microsoft Edge WebDriver 129.0.2792.53 +- Selenium server 4.25.0 +- Mozilla Firefox 130.0.1 - Geckodriver 0.35.0 #### Environment variables @@ -250,7 +250,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | brotli | 1.1.0-2build2 | | bzip2 | 1.0.8-5.1build0.1 | | coreutils | 9.4-3ubuntu6 | -| curl | 8.5.0-2ubuntu10.3 | +| curl | 8.5.0-2ubuntu10.4 | | dbus | 1.14.10-4ubuntu4.1 | | dnsutils | 1:9.18.28-0ubuntu0.24.04.1 | | dpkg | 1.22.6ubuntu6.1 | From 541dd995c8acd98cd260ff29e0f31086ab851ef6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 25 Sep 2024 12:49:40 +0000 Subject: [PATCH 3139/3485] Updating readme file for win19 version 20240922.1.1 (#10676) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/windows/Windows2019-Readme.md | 44 ++++++++++++++-------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/images/windows/Windows2019-Readme.md b/images/windows/Windows2019-Readme.md index a464968520a6..0f69f3156142 100644 --- a/images/windows/Windows2019-Readme.md +++ b/images/windows/Windows2019-Readme.md @@ -1,6 +1,6 @@ # Windows Server 2019 - OS Version: 10.0.17763 Build 6293 -- Image Version: 20240915.1.0 +- Image Version: 20240922.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -8,7 +8,7 @@ ## Installed Software ### Language and Runtime -- Bash 5.2.26(1)-release +- Bash 5.2.32(1)-release - Go 1.21.13 - Julia 1.10.5 - Kotlin 2.0.20 @@ -29,7 +29,7 @@ - pip 24.0 (python 3.7) - Pipx 1.2.1 - RubyGems 3.2.33 -- Vcpkg (build from commit 86fba1306) +- Vcpkg (build from commit 98aa63962) - Yarn 1.22.22 #### Environment variables @@ -42,7 +42,7 @@ - Ant 1.10.14 - Gradle 8.10 - Maven 3.8.7 -- sbt 1.10.1 +- sbt 1.10.2 ### Tools - 7zip 24.08 @@ -50,17 +50,17 @@ - azcopy 10.26.0 - Bazel 7.3.1 - Bazelisk 1.21.0 -- Bicep 0.29.47 +- Bicep 0.30.3 - Cabal 3.12.1.0 - CMake 3.30.3 -- CodeQL Action Bundle 2.18.4 +- CodeQL Action Bundle 2.19.0 - Docker 26.1.3 - Docker Compose v2 2.27.1 - Docker-wincred 0.8.2 - ghc 9.10.1 -- Git 2.46.0.windows.1 +- Git 2.46.1.windows.1 - Git LFS 3.5.1 -- Google Cloud CLI 492.0.0 +- Google Cloud CLI 493.0.0 - ImageMagick 7.1.1-38 - InnoSetup 6.3.3 - jq 1.7.1 @@ -75,7 +75,7 @@ - OpenSSL 1.1.1w - Packer 1.11.0 - Parcel 2.12.0 -- Pulumi 3.132.0 +- Pulumi 3.133.0 - R 4.4.1 - Service Fabric SDK 9.1.1436.9590 - Stack 3.1.1 @@ -88,14 +88,14 @@ - zstd 1.5.6 ### CLI Tools -- Alibaba Cloud CLI 3.0.222 -- AWS CLI 2.17.51 +- Alibaba Cloud CLI 3.0.223 +- AWS CLI 2.17.56 - AWS SAM CLI 1.124.0 - AWS Session Manager CLI 1.2.650.0 - Azure CLI 2.64.0 - Azure DevOps CLI extension 1.0.1 -- Cloud Foundry CLI 8.8.1 -- GitHub CLI 2.56.0 +- Cloud Foundry CLI 8.8.2 +- GitHub CLI 2.57.0 ### Rust Tools - Cargo 1.81.0 @@ -112,14 +112,14 @@ - Rustfmt 1.7.1 ### Browsers and Drivers -- Google Chrome 128.0.6613.138 -- Chrome Driver 128.0.6613.137 -- Microsoft Edge 128.0.2739.79 -- Microsoft Edge Driver 128.0.2739.79 -- Mozilla Firefox 130.0 +- Google Chrome 129.0.6668.59 +- Chrome Driver 129.0.6668.58 +- Microsoft Edge 129.0.2792.52 +- Microsoft Edge Driver 129.0.2792.52 +- Mozilla Firefox 130.0.1 - Gecko Driver 0.35.0 - IE Driver 4.14.0.0 -- Selenium server 4.24.0 +- Selenium server 4.25.0 #### Environment variables | Name | Value | @@ -211,7 +211,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Database tools - Azure CosmosDb Emulator 2.14.20.0 -- DacFx 162.3.566.1 +- DacFx 162.4.92.3 - MySQL 5.7.44.0 - SQL OLEDB Driver 18.7.4.0 - SQLPS 1.0 @@ -503,7 +503,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - AzureRM: 2.1.0 (Default), 6.13.1 - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.656 +- AWSPowershell: 4.1.661 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.10 - Microsoft.Graph: 2.23.0 @@ -523,7 +523,7 @@ All other versions are saved but not installed. | Package Name | Version | | -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 8.0 | -| Android Emulator | 35.1.20 | +| Android Emulator | 35.1.21 | | Android SDK Build-tools | 35.0.0<br>34.0.0<br>33.0.0 33.0.1 33.0.2 33.0.3<br>32.0.0<br>31.0.0<br>30.0.2 | | Android SDK Platforms | android-35 (rev 1)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3) | | Android SDK Platform-Tools | 35.0.2 | From 6ba53090b03678d105ac4b375d1c454772432173 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 25 Sep 2024 13:06:24 +0000 Subject: [PATCH 3140/3485] Updating readme file for ubuntu22 version 20240922.1.1 (#10667) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2204-Readme.md | 62 +++++++++++++++--------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/images/ubuntu/Ubuntu2204-Readme.md b/images/ubuntu/Ubuntu2204-Readme.md index 5f4aef773a93..5f64d856249d 100644 --- a/images/ubuntu/Ubuntu2204-Readme.md +++ b/images/ubuntu/Ubuntu2204-Readme.md @@ -1,12 +1,12 @@ | Announcements | |-| +| [Ubuntu-latest workflows will use Ubuntu-24.04 image](https://github.com/actions/runner-images/issues/10636) | | [[Ubuntu 20 and 22] Go version 1.20.0 will be removed on October 14,2024.](https://github.com/actions/runner-images/issues/10607) | -| [Ubuntu 24.04 is now available](https://github.com/actions/runner-images/issues/9848) | *** # Ubuntu 22.04 - OS Version: 22.04.5 LTS - Kernel Version: 6.8.0-1014-azure -- Image Version: 20240915.1.0 +- Image Version: 20240922.1.0 - Systemd version: 249.11-0ubuntu3.12 ## Installed Software @@ -27,12 +27,12 @@ - Perl 5.34.0 - Python 3.10.12 - Ruby 3.0.2p107 -- Swift 5.10.1 +- Swift 6.0 ### Package Management - cpan 1.64 - Helm 3.16.1 -- Homebrew 4.3.21 +- Homebrew 4.3.23 - Miniconda 24.7.1 - Npm 10.7.0 - NuGet 6.6.1.2 @@ -40,7 +40,7 @@ - Pip3 22.0.2 - Pipx 1.7.1 - RubyGems 3.3.5 -- Vcpkg (build from commit 86fba1306) +- Vcpkg (build from commit 98aa63962) - Yarn 1.22.22 #### Environment variables @@ -62,7 +62,7 @@ to accomplish this. - Gradle 8.10.1 - Lerna 8.1.8 - Maven 3.8.8 -- Sbt 1.10.1 +- Sbt 1.10.2 ### Tools - Ansible 2.17.4 @@ -70,17 +70,17 @@ to accomplish this. - AzCopy 10.26.0 - available by `azcopy` and `azcopy10` aliases - Bazel 7.3.1 - Bazelisk 1.21.0 -- Bicep 0.29.47 +- Bicep 0.30.3 - Buildah 1.23.1 - CMake 3.30.3 -- CodeQL Action Bundle 2.18.4 -- Docker Amazon ECR Credential Helper 0.8.0 +- CodeQL Action Bundle 2.19.0 +- Docker Amazon ECR Credential Helper 0.9.0 - Docker Compose v2 2.27.1 - Docker-Buildx 0.17.1 - Docker Client 26.1.3 - Docker Server 26.1.3 - Fastlane 2.222.0 -- Git 2.46.0 +- Git 2.46.1 - Git LFS 3.5.1 - Git-ftp 1.6.0 - Haveged 1.9.14 @@ -100,29 +100,29 @@ to accomplish this. - Packer 1.11.2 - Parcel 2.12.0 - Podman 3.4.4 -- Pulumi 3.132.0 +- Pulumi 3.133.0 - R 4.4.1 - Skopeo 1.4.1 - Sphinx Open Source Search Server 2.2.11 - SVN 1.14.1 -- Terraform 1.9.5 +- Terraform 1.9.6 - yamllint 1.35.1 - yq 4.44.3 - zstd 1.5.6 ### CLI Tools -- Alibaba Cloud CLI 3.0.222 -- AWS CLI 2.17.51 +- Alibaba Cloud CLI 3.0.223 +- AWS CLI 2.17.56 - AWS CLI Session Manager Plugin 1.2.650.0 - AWS SAM CLI 1.124.0 - Azure CLI 2.64.0 - Azure CLI (azure-devops) 1.0.1 -- GitHub CLI 2.56.0 -- Google Cloud CLI 492.0.0 -- Netlify CLI 17.36.0 -- OpenShift CLI 4.16.11 +- GitHub CLI 2.57.0 +- Google Cloud CLI 493.0.0 +- Netlify CLI 17.36.2 +- OpenShift CLI 4.16.13 - ORAS CLI 1.2.0 -- Vercel CLI 37.4.2 +- Vercel CLI 37.5.3 ### Java | Version | Environment Variable | @@ -135,7 +135,7 @@ to accomplish this. ### PHP Tools - PHP: 8.1.2 - Composer 2.7.9 -- PHPUnit 8.5.39 +- PHPUnit 8.5.40 ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ``` @@ -161,13 +161,13 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.7.1 ### Browsers and Drivers -- Google Chrome 128.0.6613.137 -- ChromeDriver 128.0.6613.137 -- Chromium 128.0.6613.0 -- Microsoft Edge 128.0.2739.79 -- Microsoft Edge WebDriver 128.0.2739.81 -- Selenium server 4.24.0 -- Mozilla Firefox 130.0 +- Google Chrome 129.0.6668.58 +- ChromeDriver 129.0.6668.58 +- Chromium 129.0.6668.0 +- Microsoft Edge 129.0.2792.52 +- Microsoft Edge WebDriver 129.0.2792.53 +- Selenium server 4.25.0 +- Mozilla Firefox 130.0.1 - Geckodriver 0.35.0 #### Environment variables @@ -204,7 +204,7 @@ Use the following command as a part of your job to start the service: 'sudo syst #### MS SQL - sqlcmd 17.10.0001.1 -- SqlPackage 162.3.566.1 +- SqlPackage 162.4.92.3 ### Cached Tools @@ -291,7 +291,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | node:20 | sha256:48db4f6ea21d134be744207225753a1730c4bc1b4cdf836d44511c36bf0e34d7 | 2024-08-21 | | node:20-alpine | sha256:2d07db07a2df6830718ae2a47db6fedce6745f5bcd174c398f2acdda90a11c03 | 2024-08-21 | | ubuntu:20.04 | sha256:fa17826afb526a9fc7250e0fbcbfd18d03fe7a54849472f86879d8bf562c629e | 2024-08-13 | -| ubuntu:22.04 | sha256:adbb90115a21969d2fe6fa7f9af4253e16d45f8d4c1e930182610c4731962658 | 2024-08-13 | +| ubuntu:22.04 | sha256:58b87898e82351c6cf9cf5b9f3c20257bb9e2dcf33af051e12ce532d7f94e3fe | 2024-09-11 | ### Installed apt packages | Name | Version | @@ -305,7 +305,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | brotli | 1.0.9-2build6 | | bzip2 | 1.0.8-5build1 | | coreutils | 8.32-4.1ubuntu1.2 | -| curl | 7.81.0-1ubuntu1.17 | +| curl | 7.81.0-1ubuntu1.18 | | dbus | 1.12.20-2ubuntu4.1 | | dnsutils | 1:9.18.28-0ubuntu0.22.04.1 | | dpkg | 1.21.1ubuntu2.3 | @@ -328,7 +328,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | libc++-dev | 1:14.0-55\~exp2 | | libc++abi-dev | 1:14.0-55\~exp2 | | libc6-dev | 2.35-0ubuntu3.8 | -| libcurl4 | 7.81.0-1ubuntu1.17 | +| libcurl4 | 7.81.0-1ubuntu1.18 | | libgbm-dev | 23.2.1-1ubuntu3.1\~22.04.2 | | libgconf-2-4 | 3.2.6-7ubuntu2 | | libgsl-dev | 2.7.1+dfsg-3 | From a52bed1b1a62a04508f997733c002690d8b9a39b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 25 Sep 2024 13:31:27 +0000 Subject: [PATCH 3141/3485] Updating readme file for ubuntu20 version 20240922.1.1 (#10674) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2004-Readme.md | 60 +++++++++++++++--------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/images/ubuntu/Ubuntu2004-Readme.md b/images/ubuntu/Ubuntu2004-Readme.md index 41f76786d979..45506cbe74a9 100644 --- a/images/ubuntu/Ubuntu2004-Readme.md +++ b/images/ubuntu/Ubuntu2004-Readme.md @@ -1,13 +1,13 @@ | Announcements | |-| +| [Ubuntu-latest workflows will use Ubuntu-24.04 image](https://github.com/actions/runner-images/issues/10636) | | [[Ubuntu 20 and 22] Go version 1.20.0 will be removed on October 14,2024.](https://github.com/actions/runner-images/issues/10607) | -| [Ubuntu 24.04 is now available](https://github.com/actions/runner-images/issues/9848) | *** # Ubuntu 20.04 - OS Version: 20.04.6 LTS -- Kernel Version: 5.15.0-1071-azure -- Image Version: 20240915.1.0 -- Systemd version: 245.4-4ubuntu3.23 +- Kernel Version: 5.15.0-1073-azure +- Image Version: 20240922.1.0 +- Systemd version: 245.4-4ubuntu3.24 ## Installed Software @@ -29,12 +29,12 @@ - Perl 5.30.0 - Python 3.8.10 - Ruby 2.7.0p0 -- Swift 5.10.1 +- Swift 6.0 ### Package Management - cpan 1.64 - Helm 3.16.1 -- Homebrew 4.3.21 +- Homebrew 4.3.23 - Miniconda 24.7.1 - Npm 10.7.0 - NuGet 6.6.1.2 @@ -42,7 +42,7 @@ - Pip3 20.0.2 - Pipx 1.7.1 - RubyGems 3.1.2 -- Vcpkg (build from commit 86fba1306) +- Vcpkg (build from commit 98aa63962) - Yarn 1.22.22 #### Environment variables @@ -64,7 +64,7 @@ to accomplish this. - Gradle 8.10.1 - Lerna 8.1.8 - Maven 3.8.8 -- Sbt 1.10.1 +- Sbt 1.10.2 ### Tools - Ansible 2.13.13 @@ -72,17 +72,17 @@ to accomplish this. - AzCopy 10.26.0 - available by `azcopy` and `azcopy10` aliases - Bazel 7.3.1 - Bazelisk 1.21.0 -- Bicep 0.29.47 +- Bicep 0.30.3 - Buildah 1.22.3 - CMake 3.30.3 -- CodeQL Action Bundle 2.18.4 -- Docker Amazon ECR Credential Helper 0.8.0 +- CodeQL Action Bundle 2.19.0 +- Docker Amazon ECR Credential Helper 0.9.0 - Docker Compose v2 2.27.1 - Docker-Buildx 0.17.1 - Docker Client 26.1.3 - Docker Server 26.1.3 - Fastlane 2.222.0 -- Git 2.46.0 +- Git 2.46.1 - Git LFS 3.5.1 - Git-ftp 1.6.0 - Haveged 1.9.1 @@ -104,29 +104,29 @@ to accomplish this. - Parcel 2.12.0 - PhantomJS 2.1.1 2.1.1 - Podman 3.4.2 -- Pulumi 3.132.0 +- Pulumi 3.133.0 - R 4.4.1 - Skopeo 1.5.0 - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 -- Terraform 1.9.5 +- Terraform 1.9.6 - yamllint 1.35.1 - yq 4.44.3 - zstd 1.5.6 ### CLI Tools - Alibaba Cloud CLI 3.0.174 -- AWS CLI 2.17.51 +- AWS CLI 2.17.56 - AWS CLI Session Manager Plugin 1.2.650.0 - AWS SAM CLI 1.124.0 - Azure CLI 2.64.0 - Azure CLI (azure-devops) 1.0.1 -- GitHub CLI 2.56.0 -- Google Cloud CLI 492.0.0 -- Netlify CLI 17.36.0 +- GitHub CLI 2.57.0 +- Google Cloud CLI 493.0.0 +- Netlify CLI 17.36.2 - OpenShift CLI 4.15.19 - ORAS CLI 1.2.0 -- Vercel CLI 37.4.2 +- Vercel CLI 37.5.3 ### Java | Version | Environment Variable | @@ -139,7 +139,7 @@ to accomplish this. ### PHP Tools - PHP: 7.4.33, 8.0.30, 8.1.29, 8.2.23, 8.3.11 - Composer 2.7.9 -- PHPUnit 8.5.39 +- PHPUnit 8.5.40 ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ``` @@ -165,13 +165,13 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.7.1 ### Browsers and Drivers -- Google Chrome 128.0.6613.137 -- ChromeDriver 128.0.6613.137 -- Chromium 128.0.6613.0 -- Microsoft Edge 128.0.2739.79 -- Microsoft Edge WebDriver 128.0.2739.81 -- Selenium server 4.24.0 -- Mozilla Firefox 129.0.2 +- Google Chrome 129.0.6668.58 +- ChromeDriver 129.0.6668.58 +- Chromium 129.0.6668.0 +- Microsoft Edge 129.0.2792.52 +- Microsoft Edge WebDriver 129.0.2792.53 +- Selenium server 4.25.0 +- Mozilla Firefox 130.0.1 - Geckodriver 0.35.0 #### Environment variables @@ -209,7 +209,7 @@ Use the following command as a part of your job to start the service: 'sudo syst #### MS SQL - sqlcmd 17.10.0001.1 -- SqlPackage 162.3.566.1 +- SqlPackage 162.4.92.3 ### Cached Tools @@ -314,7 +314,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | brotli | 1.0.7-6ubuntu0.1 | | bzip2 | 1.0.8-2 | | coreutils | 8.30-3ubuntu2 | -| curl | 7.68.0-1ubuntu2.23 | +| curl | 7.68.0-1ubuntu2.24 | | dbus | 1.12.16-2ubuntu2.3 | | dnsutils | 1:9.18.28-0ubuntu0.20.04.1 | | dpkg | 1.19.7ubuntu3.2 | @@ -337,7 +337,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | libc++-dev | 1:10.0-50\~exp1 | | libc++abi-dev | 1:10.0-50\~exp1 | | libc6-dev | 2.31-0ubuntu9.16 | -| libcurl4 | 7.68.0-1ubuntu2.23 | +| libcurl4 | 7.68.0-1ubuntu2.24 | | libgbm-dev | 21.2.6-0ubuntu0.1\~20.04.2 | | libgconf-2-4 | 3.2.6-6ubuntu1 | | libgsl-dev | 2.5+dfsg-6+deb10u1build0.20.04.1 | From 907fcf388b81ca88053456dd580e4ceb4f0ee15d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 25 Sep 2024 15:07:03 +0000 Subject: [PATCH 3142/3485] Updating readme file for macos-14 version 20240923.101 (#10673) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-14-Readme.md | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/images/macos/macos-14-Readme.md b/images/macos/macos-14-Readme.md index ee40a6ee7776..1103809358fa 100644 --- a/images/macos/macos-14-Readme.md +++ b/images/macos/macos-14-Readme.md @@ -5,9 +5,9 @@ | [[macOS] Xcodes visionOS platform will be removed from macOS-14 images on September 23, 2024](https://github.com/actions/runner-images/issues/10559) | *** # macOS 14 -- OS Version: macOS 14.6.1 (23G93) +- OS Version: macOS 14.7 (23H124) - Kernel Version: Darwin 23.6.0 -- Image Version: 20240918.7 +- Image Version: 20240923.101 ## Installed Software @@ -70,14 +70,14 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.17.54 +- AWS CLI 2.17.56 - AWS SAM CLI 1.124.0 - AWS Session Manager CLI 1.2.650.0 - Azure CLI 2.64.0 - Azure CLI (azure-devops) 1.0.1 - Bicep CLI 0.30.3 - Cmake 3.30.3 -- CodeQL Action Bundle 2.18.4 +- CodeQL Action Bundle 2.19.0 - Fastlane 2.222.0 - SwiftFormat 0.54.5 - Xcbeautify 2.11.0 @@ -88,16 +88,16 @@ - SwiftLint 0.57.0 ### Browsers -- Safari 17.6 (19618.3.11.11.5) -- SafariDriver 17.6 (19618.3.11.11.5) +- Safari 18.0 (19619.1.26.111.10) +- SafariDriver 18.0 (19619.1.26.111.10) - Google Chrome 129.0.6668.59 - Google Chrome for Testing 129.0.6668.58 - ChromeDriver 129.0.6668.58 -- Microsoft Edge 128.0.2739.79 -- Microsoft Edge WebDriver 128.0.2739.86 +- Microsoft Edge 129.0.2792.52 +- Microsoft Edge WebDriver 129.0.2792.46 - Mozilla Firefox 130.0.1 - geckodriver 0.35.0 -- Selenium server 4.24.0 +- Selenium server 4.25.0 #### Environment variables | Name | Value | @@ -220,19 +220,19 @@ | Simulator - watchOS 10.5 | watchsimulator10.5 | 15.4 | | Simulator - watchOS 11.0 | watchsimulator11.0 | 16.0 | | Simulator - watchOS 11.1 | watchsimulator11.1 | 16.1 | -| Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | | visionOS 1.0 | xros1.0 | 15.2 | -| Simulator - visionOS 1.1 | xrsimulator1.1 | 15.3 | +| Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | | visionOS 1.1 | xros1.1 | 15.3 | +| Simulator - visionOS 1.1 | xrsimulator1.1 | 15.3 | | Simulator - visionOS 1.2 | xrsimulator1.2 | 15.4 | | visionOS 1.2 | xros1.2 | 15.4 | -| visionOS 2.0 | xros2.0 | 16.0 | | Simulator - visionOS 2.0 | xrsimulator2.0 | 16.0 | +| visionOS 2.0 | xros2.0 | 16.0 | | visionOS 2.1 | xros2.1 | 16.1 | | Simulator - visionOS 2.1 | xrsimulator2.1 | 16.1 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | -| Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | +| Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | DriverKit 22.4 | driverkit22.4 | 14.3.1 | | DriverKit 23.0 | driverkit23.0 | 15.0.1 | | DriverKit 23.2 | driverkit23.2 | 15.1, 15.2 | From 4d4477e04e1031a7aa2b22e70891fd2deceb8c62 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 25 Sep 2024 15:45:44 +0000 Subject: [PATCH 3143/3485] Updating readme file for macos-13-arm64 version 20240923.116 (#10669) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-13-arm64-Readme.md | 32 +++++++++++++-------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/images/macos/macos-13-arm64-Readme.md b/images/macos/macos-13-arm64-Readme.md index 34dfaff9d972..84cf7b3645e8 100644 --- a/images/macos/macos-13-arm64-Readme.md +++ b/images/macos/macos-13-arm64-Readme.md @@ -5,9 +5,9 @@ | [[macOS] Xcodes visionOS platform will be removed from macOS-14 images on September 23, 2024](https://github.com/actions/runner-images/issues/10559) | *** # macOS 13 -- OS Version: macOS 13.6.9 (22G830) +- OS Version: macOS 13.7 (22H123) - Kernel Version: Darwin 22.6.0 -- Image Version: 20240916.74 +- Image Version: 20240923.116 ## Installed Software @@ -30,15 +30,15 @@ - Ruby 3.0.7p220 ### Package Management -- Bundler 2.5.18 +- Bundler 2.5.19 - Carthage 0.40.0 - CocoaPods 1.15.2 -- Homebrew 4.3.21 +- Homebrew 4.3.23 - NPM 10.8.2 - NuGet 6.3.1.1 - Pip3 24.2 (python 3.12) - Pipx 1.7.1 -- RubyGems 3.5.18 +- RubyGems 3.5.19 - Yarn 1.22.22 ### Project Management @@ -56,7 +56,7 @@ - Curl 8.7.1 - Git 2.46.1 - Git LFS 3.5.1 -- GitHub CLI 2.56.0 +- GitHub CLI 2.57.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.24.5 - gpg (GnuPG) 2.4.5 @@ -68,14 +68,14 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.17.51 +- AWS CLI 2.17.56 - AWS SAM CLI 1.124.0 - AWS Session Manager CLI 1.2.650.0 - Azure CLI 2.64.0 - Azure CLI (azure-devops) 1.0.1 -- Bicep CLI 0.29.47 +- Bicep CLI 0.30.3 - Cmake 3.30.3 -- CodeQL Action Bundle 2.18.4 +- CodeQL Action Bundle 2.19.0 - Fastlane 2.222.0 - SwiftFormat 0.54.5 - Xcbeautify 2.11.0 @@ -85,12 +85,12 @@ ### Linters ### Browsers -- Safari 17.6 (18618.3.11.11.7) -- SafariDriver 17.6 (18618.3.11.11.7) -- Google Chrome 128.0.6613.138 -- Google Chrome for Testing 128.0.6613.137 -- ChromeDriver 128.0.6613.137 -- Selenium server 4.24.0 +- Safari 18.0 (18619.1.26.111.10) +- SafariDriver 18.0 (18619.1.26.111.10) +- Google Chrome 129.0.6668.59 +- Google Chrome for Testing 129.0.6668.58 +- ChromeDriver 129.0.6668.58 +- Selenium server 4.25.0 #### Environment variables | Name | Value | @@ -220,7 +220,7 @@ | Package Name | Version | | -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 11.0 | -| Android Emulator | 35.1.20 | +| Android Emulator | 35.1.21 | | Android SDK Build-tools | 35.0.0<br>34.0.0<br>33.0.2 33.0.3 | | Android SDK Platforms | android-35 (rev 1)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | | Android SDK Platform-Tools | 35.0.2 | From 78796bc1092ed4592d010471348ce74450c8bf41 Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Wed, 25 Sep 2024 17:50:29 +0200 Subject: [PATCH 3144/3485] [macOS] [doc] Introduce macOS-15 images (#10685) --- .github/ISSUE_TEMPLATE/announcement.yml | 2 + .github/ISSUE_TEMPLATE/bug-report.yml | 2 + .github/ISSUE_TEMPLATE/tool-request.yml | 2 + README.md | 4 + images/macos/macos-15-Readme.md | 209 ++++++++++++++++++++++++ images/macos/macos-15-arm64-Readme.md | 196 ++++++++++++++++++++++ 6 files changed, 415 insertions(+) create mode 100644 images/macos/macos-15-Readme.md create mode 100644 images/macos/macos-15-arm64-Readme.md diff --git a/.github/ISSUE_TEMPLATE/announcement.yml b/.github/ISSUE_TEMPLATE/announcement.yml index dfd7c35f4668..59e683bf6ffa 100644 --- a/.github/ISSUE_TEMPLATE/announcement.yml +++ b/.github/ISSUE_TEMPLATE/announcement.yml @@ -44,6 +44,8 @@ body: - label: macOS 13 Arm64 - label: macOS 14 - label: macOS 14 Arm64 + - label: macOS 15 + - label: macOS 15 Arm64 - label: Windows Server 2019 - label: Windows Server 2022 - type: textarea diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml index 1a7c0d45b7d1..695f5c887924 100644 --- a/.github/ISSUE_TEMPLATE/bug-report.yml +++ b/.github/ISSUE_TEMPLATE/bug-report.yml @@ -27,6 +27,8 @@ body: - label: macOS 13 Arm64 - label: macOS 14 - label: macOS 14 Arm64 + - label: macOS 15 + - label: macOS 15 Arm64 - label: Windows Server 2019 - label: Windows Server 2022 - type: textarea diff --git a/.github/ISSUE_TEMPLATE/tool-request.yml b/.github/ISSUE_TEMPLATE/tool-request.yml index 37b7d9524be0..b0fb98a16bcb 100644 --- a/.github/ISSUE_TEMPLATE/tool-request.yml +++ b/.github/ISSUE_TEMPLATE/tool-request.yml @@ -65,6 +65,8 @@ body: - label: macOS 13 Arm64 - label: macOS 14 - label: macOS 14 Arm64 + - label: macOS 15 + - label: macOS 15 Arm64 - label: Windows Server 2019 - label: Windows Server 2022 - type: textarea diff --git a/README.md b/README.md index 63c84e9abcbd..3ce17a13810e 100644 --- a/README.md +++ b/README.md @@ -24,6 +24,8 @@ To build a VM machine from this repo's source, see the [instructions](docs/creat | Ubuntu 24.04 | `ubuntu-24.04` | [ubuntu-24.04] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fijunaidm%2F0b5459bbe18604a639e1d2f7accd204f%2Fraw%2Fubuntu24.json) | | Ubuntu 22.04 | `ubuntu-latest` or `ubuntu-22.04` | [ubuntu-22.04] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fijunaidm%2F0b5459bbe18604a639e1d2f7accd204f%2Fraw%2Fubuntu22.json) | | Ubuntu 20.04 | `ubuntu-20.04` | [ubuntu-20.04] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fijunaidm%2F0b5459bbe18604a639e1d2f7accd204f%2Fraw%2Fubuntu20.json) | +| macOS 15 <sup>beta</sup> | `macos-15-large`| [macOS-15] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fijunaidm%2F0b5459bbe18604a639e1d2f7accd204f%2Fraw%2Fmacos-15.json) | +| macOS 15 Arm64 <sup>beta</sup> | `macos-15`, `macos-15-xlarge` | [macOS-15-arm64] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fijunaidm%2F0b5459bbe18604a639e1d2f7accd204f%2Fraw%2Fmacos-15-arm64.json) | | macOS 14 | `macos-latest-large` or `macos-14-large`| [macOS-14] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fijunaidm%2F0b5459bbe18604a639e1d2f7accd204f%2Fraw%2Fmacos-14.json) | | macOS 14 Arm64 |`macos-latest`, `macos-14`, `macos-latest-xlarge` or `macos-14-xlarge`| [macOS-14-arm64] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fijunaidm%2F0b5459bbe18604a639e1d2f7accd204f%2Fraw%2Fmacos-14-arm64.json) | | macOS 13 | `macos-13` or `macos-13-large` | [macOS-13] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fijunaidm%2F0b5459bbe18604a639e1d2f7accd204f%2Fraw%2Fmacos-13.json) | @@ -47,6 +49,8 @@ To build a VM machine from this repo's source, see the [instructions](docs/creat [macOS-13-arm64]: https://github.com/actions/runner-images/blob/main/images/macos/macos-13-arm64-Readme.md [macOS-14]: https://github.com/actions/runner-images/blob/main/images/macos/macos-14-Readme.md [macOS-14-arm64]: https://github.com/actions/runner-images/blob/main/images/macos/macos-14-arm64-Readme.md +[macOS-15]: https://github.com/actions/runner-images/blob/main/images/macos/macos-15-Readme.md +[macOS-15-arm64]: https://github.com/actions/runner-images/blob/main/images/macos/macos-15-arm64-Readme.md [self-hosted runners]: https://help.github.com/en/actions/hosting-your-own-runners ## Announcements diff --git a/images/macos/macos-15-Readme.md b/images/macos/macos-15-Readme.md new file mode 100644 index 000000000000..fbf82341bcbf --- /dev/null +++ b/images/macos/macos-15-Readme.md @@ -0,0 +1,209 @@ +# macOS 15 +- OS Version: macOS 15.0 (24A335) +- Kernel Version: Darwin 24.0.0 +- Image Version: 20240923.103 + +## Installed Software + +### Language and Runtime +- .NET Core SDK: 8.0.101, 8.0.204, 8.0.303, 8.0.401 +- Bash 3.2.57(1)-release +- Clang/LLVM 16.0.0 +- Clang/LLVM (Homebrew) 18.1.8 - available on `$(brew --prefix llvm@18)/bin/clang` +- GCC 12 (Homebrew GCC 12.4.0) - available by `gcc-12` alias +- GCC 13 (Homebrew GCC 13.3.0) - available by `gcc-13` alias +- GCC 14 (Homebrew GCC 14.2.0) - available by `gcc-14` alias +- GNU Fortran 12 (Homebrew GCC 12.4.0) - available by `gfortran-12` alias +- GNU Fortran 13 (Homebrew GCC 13.3.0) - available by `gfortran-13` alias +- GNU Fortran 14 (Homebrew GCC 14.2.0) - available by `gfortran-14` alias +- Kotlin 2.0.20-release-360 +- Node.js 22.9.0 +- Perl 5.38.2 +- PHP 8.3.11 +- Python3 3.12.6 +- Ruby 3.3.5 + +### Package Management +- Bundler 2.5.19 +- Carthage 0.40.0 +- CocoaPods 1.15.2 +- Composer 2.7.9 +- Homebrew 4.3.24 +- NPM 10.8.3 +- Pip3 24.2 (python 3.12) +- Pipx 1.7.1 +- RubyGems 3.5.19 +- Yarn 1.22.22 + +### Project Management +- Apache Ant 1.10.15 +- Apache Maven 3.9.9 +- Gradle 8.10.1 + +### Utilities +- 7-Zip 17.05 +- aria2 1.37.0 +- azcopy 10.26.0 +- bazel 7.3.1 +- bazelisk 1.21.0 +- bsdtar 3.5.3 - available by 'tar' alias +- Curl 8.10.1 +- Git 2.46.1 +- Git LFS 3.5.1 +- GitHub CLI 2.57.0 +- GNU Tar 1.35 - available by 'gtar' alias +- GNU Wget 1.24.5 +- gpg (GnuPG) 2.4.5 +- jq 1.7.1 +- OpenSSL 1.1.1w 11 Sep 2023 +- Packer 1.9.4 +- pkg-config 0.29.2 +- yq 4.44.3 +- zstd 1.5.6 + +### Tools +- AWS CLI 2.17.57 +- AWS SAM CLI 1.124.0 +- AWS Session Manager CLI 1.2.650.0 +- Azure CLI 2.64.0 +- Azure CLI (azure-devops) 1.0.1 +- Bicep CLI 0.30.3 +- Cmake 3.30.3 +- CodeQL Action Bundle 2.19.0 +- Fastlane 2.222.0 +- SwiftFormat 0.54.5 +- Xcbeautify 2.11.0 +- Xcode Command Line Tools 16.0.0.0.1.1724870825 +- Xcodes 1.5.0 + +### Linters +- SwiftLint 0.57.0 + +### Browsers +- Safari 18.0 (20619.1.26.31.6) +- SafariDriver 18.0 (20619.1.26.31.6) +- Google Chrome 129.0.6668.59 +- Google Chrome for Testing 129.0.6668.58 +- ChromeDriver 129.0.6668.58 +- Microsoft Edge 129.0.2792.52 +- Microsoft Edge WebDriver 129.0.2792.46 +- Mozilla Firefox 130.0.1 +- geckodriver 0.35.0 +- Selenium server 4.25.0 + +#### Environment variables +| Name | Value | +| --------------- | ------------------------------------- | +| CHROMEWEBDRIVER | /usr/local/share/chromedriver-mac-x64 | +| EDGEWEBDRIVER | /usr/local/share/edge_driver | +| GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | + +### Java +| Version | Environment Variable | +| -------------------- | -------------------- | +| 11.0.24+8 | JAVA_HOME_11_X64 | +| 17.0.12+7 | JAVA_HOME_17_X64 | +| 21.0.4+7.0 (default) | JAVA_HOME_21_X64 | + +### Cached Tools + +#### Ruby +- 3.1.6 +- 3.2.5 + +#### Python +- 3.9.20 +- 3.10.15 +- 3.11.9 +- 3.12.6 + +#### Node.js +- 18.20.4 +- 20.17.0 + +#### Go +- 1.21.13 +- 1.22.7 +- 1.23.1 + +### Rust Tools +- Cargo 1.81.0 +- Rust 1.81.0 +- Rustdoc 1.81.0 +- Rustup 1.27.1 + +#### Packages +- Clippy 0.1.81 +- Rustfmt 1.7.1-stable + +### PowerShell Tools +- PowerShell 7.4.5 + +#### PowerShell Modules +- Az: 12.3.0 +- Pester: 5.6.1 +- PSScriptAnalyzer: 1.22.0 + +### Xcode +| Version | Build | Path | +| -------------- | -------- | ----------------------------------- | +| 16.1 (beta) | 16B5014f | /Applications/Xcode_16.1_beta_2.app | +| 16.0 (default) | 16A242d | /Applications/Xcode_16.app | + +#### Installed SDKs +| SDK | SDK Name | Xcode Version | +| ------------------------ | -------------------- | ------------- | +| macOS 15.0 | macosx15.0 | 16.0 | +| macOS 15.1 | macosx15.1 | 16.1 | +| iOS 18.0 | iphoneos18.0 | 16.0 | +| iOS 18.1 | iphoneos18.1 | 16.1 | +| Simulator - iOS 18.0 | iphonesimulator18.0 | 16.0 | +| Simulator - iOS 18.1 | iphonesimulator18.1 | 16.1 | +| tvOS 18.0 | appletvos18.0 | 16.0 | +| tvOS 18.1 | appletvos18.1 | 16.1 | +| Simulator - tvOS 18.0 | appletvsimulator18.0 | 16.0 | +| Simulator - tvOS 18.1 | appletvsimulator18.1 | 16.1 | +| watchOS 11.0 | watchos11.0 | 16.0 | +| watchOS 11.1 | watchos11.1 | 16.1 | +| Simulator - watchOS 11.0 | watchsimulator11.0 | 16.0 | +| Simulator - watchOS 11.1 | watchsimulator11.1 | 16.1 | +| visionOS 2.0 | xros2.0 | 16.0 | +| Simulator - visionOS 2.0 | xrsimulator2.0 | 16.0 | +| Simulator - visionOS 2.1 | xrsimulator2.1 | 16.1 | +| visionOS 2.1 | xros2.1 | 16.1 | +| DriverKit 24.0 | driverkit24.0 | 16.0 | +| DriverKit 24.1 | driverkit24.1 | 16.1 | + +#### Installed Simulators +| OS | Simulators | +| ------------ | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| iOS 18.0 | iPhone 16<br>iPhone 16 Plus<br>iPhone 16 Pro<br>iPhone 16 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | +| iOS 18.1 | iPhone 16<br>iPhone 16 Plus<br>iPhone 16 Pro<br>iPhone 16 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | +| tvOS 18.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 18.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| watchOS 11.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 10 (42mm)<br>Apple Watch Series 10 (46mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 11.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 10 (42mm)<br>Apple Watch Series 10 (46mm)<br>Apple Watch Ultra 2 (49mm) | + +### Android +| Package Name | Version | +| -------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Android Emulator | 35.1.21 | +| Android SDK Platforms | android-35 (rev 1)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1) | +| Android SDK Platform-Tools | 35.0.2 | +| Android Support Repository | 47.0.0 | +| CMake | 3.22.1 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 26.3.11579264<br>27.1.12297006 (default) | + +#### Environment variables +| Name | Value | +| ----------------------- | --------------------------------------------------- | +| ANDROID_HOME | /Users/runner/Library/Android/sdk | +| ANDROID_NDK | /Users/runner/Library/Android/sdk/ndk/27.1.12297006 | +| ANDROID_NDK_HOME | /Users/runner/Library/Android/sdk/ndk/27.1.12297006 | +| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/27.1.12297006 | +| ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk/27.1.12297006 | +| ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | + +### Miscellaneous diff --git a/images/macos/macos-15-arm64-Readme.md b/images/macos/macos-15-arm64-Readme.md new file mode 100644 index 000000000000..42718d10c8d0 --- /dev/null +++ b/images/macos/macos-15-arm64-Readme.md @@ -0,0 +1,196 @@ +# macOS 15 +- OS Version: macOS 15.0 (24A335) +- Kernel Version: Darwin 24.0.0 +- Image Version: 20240919.100 + +## Installed Software + +### Language and Runtime +- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.410, 8.0.101, 8.0.204, 8.0.303, 8.0.401 +- Bash 3.2.57(1)-release +- Clang/LLVM 16.0.0 +- Clang/LLVM (Homebrew) 18.1.8 - available on `$(brew --prefix llvm@18)/bin/clang` +- GCC 12 (Homebrew GCC 12.4.0) - available by `gcc-12` alias +- GCC 13 (Homebrew GCC 13.3.0) - available by `gcc-13` alias +- GCC 14 (Homebrew GCC 14.2.0) - available by `gcc-14` alias +- GNU Fortran 12 (Homebrew GCC 12.4.0) - available by `gfortran-12` alias +- GNU Fortran 13 (Homebrew GCC 13.3.0) - available by `gfortran-13` alias +- GNU Fortran 14 (Homebrew GCC 14.2.0) - available by `gfortran-14` alias +- Kotlin 2.0.20-release-360 +- Node.js 22.9.0 +- Perl 5.38.2 +- Python3 3.12.6 +- Ruby 3.3.5 + +### Package Management +- Bundler 2.5.19 +- Carthage 0.40.0 +- CocoaPods 1.15.2 +- Homebrew 4.3.23 +- NPM 10.8.3 +- Pip3 24.2 (python 3.12) +- Pipx 1.7.1 +- RubyGems 3.5.19 +- Yarn 1.22.22 + +### Project Management +- Apache Ant 1.10.15 +- Apache Maven 3.9.9 +- Gradle 8.10.1 + +### Utilities +- 7-Zip 17.05 +- aria2 1.37.0 +- azcopy 10.26.0 +- bazel 7.3.1 +- bazelisk 1.21.0 +- bsdtar 3.5.3 - available by 'tar' alias +- Curl 8.7.1 +- Git 2.46.1 +- Git LFS 3.5.1 +- GitHub CLI 2.57.0 +- GNU Tar 1.35 - available by 'gtar' alias +- GNU Wget 1.24.5 +- gpg (GnuPG) 2.4.5 +- jq 1.7.1 +- OpenSSL 1.1.1w 11 Sep 2023 +- Packer 1.9.4 +- pkg-config 0.29.2 +- yq 4.44.3 +- zstd 1.5.6 + +### Tools +- AWS CLI 2.17.54 +- AWS SAM CLI 1.124.0 +- AWS Session Manager CLI 1.2.650.0 +- Azure CLI 2.64.0 +- Azure CLI (azure-devops) 1.0.1 +- Bicep CLI 0.30.3 +- Cmake 3.30.3 +- CodeQL Action Bundle 2.19.0 +- Fastlane 2.222.0 +- SwiftFormat 0.54.5 +- Xcbeautify 2.11.0 +- Xcode Command Line Tools 16.0.0.0.1.1724870825 +- Xcodes 1.5.0 + +### Linters + +### Browsers +- Safari 18.0 (20619.1.26.31.6) +- SafariDriver 18.0 (20619.1.26.31.6) +- Google Chrome 129.0.6668.59 +- Google Chrome for Testing 129.0.6668.58 +- ChromeDriver 129.0.6668.58 +- Selenium server 4.24.0 + +#### Environment variables +| Name | Value | +| --------------- | --------------------------------------- | +| CHROMEWEBDRIVER | /usr/local/share/chromedriver-mac-arm64 | +| EDGEWEBDRIVER | | +| GECKOWEBDRIVER | | + +### Java +| Version | Environment Variable | +| -------------------- | -------------------- | +| 11.0.24+8 | JAVA_HOME_11_arm64 | +| 17.0.12+7 | JAVA_HOME_17_arm64 | +| 21.0.4+7.0 (default) | JAVA_HOME_21_arm64 | + +### Cached Tools + +#### Python +- 3.11.9 +- 3.12.6 + +#### Node.js +- 18.20.4 +- 20.17.0 + +#### Go +- 1.21.13 +- 1.22.7 +- 1.23.1 + +### Rust Tools +- Cargo 1.81.0 +- Rust 1.81.0 +- Rustdoc 1.81.0 +- Rustup 1.27.1 + +#### Packages +- Clippy 0.1.81 +- Rustfmt 1.7.1-stable + +### PowerShell Tools +- PowerShell 7.4.5 + +#### PowerShell Modules +- Az: 12.3.0 +- Pester: 5.6.1 +- PSScriptAnalyzer: 1.22.0 + +### Xcode +| Version | Build | Path | +| -------------- | -------- | ----------------------------------- | +| 16.1 (beta) | 16B5014f | /Applications/Xcode_16.1_beta_2.app | +| 16.0 (default) | 16A242d | /Applications/Xcode_16.app | + +#### Installed SDKs +| SDK | SDK Name | Xcode Version | +| ------------------------ | -------------------- | ------------- | +| macOS 15.0 | macosx15.0 | 16.0 | +| macOS 15.1 | macosx15.1 | 16.1 | +| iOS 18.0 | iphoneos18.0 | 16.0 | +| iOS 18.1 | iphoneos18.1 | 16.1 | +| Simulator - iOS 18.0 | iphonesimulator18.0 | 16.0 | +| Simulator - iOS 18.1 | iphonesimulator18.1 | 16.1 | +| tvOS 18.0 | appletvos18.0 | 16.0 | +| tvOS 18.1 | appletvos18.1 | 16.1 | +| Simulator - tvOS 18.0 | appletvsimulator18.0 | 16.0 | +| Simulator - tvOS 18.1 | appletvsimulator18.1 | 16.1 | +| watchOS 11.0 | watchos11.0 | 16.0 | +| watchOS 11.1 | watchos11.1 | 16.1 | +| Simulator - watchOS 11.0 | watchsimulator11.0 | 16.0 | +| Simulator - watchOS 11.1 | watchsimulator11.1 | 16.1 | +| visionOS 2.0 | xros2.0 | 16.0 | +| Simulator - visionOS 2.0 | xrsimulator2.0 | 16.0 | +| Simulator - visionOS 2.1 | xrsimulator2.1 | 16.1 | +| visionOS 2.1 | xros2.1 | 16.1 | +| DriverKit 24.0 | driverkit24.0 | 16.0 | +| DriverKit 24.1 | driverkit24.1 | 16.1 | + +#### Installed Simulators +| OS | Simulators | +| ------------ | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| iOS 18.0 | iPhone 16<br>iPhone 16 Plus<br>iPhone 16 Pro<br>iPhone 16 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | +| iOS 18.1 | iPhone 16<br>iPhone 16 Plus<br>iPhone 16 Pro<br>iPhone 16 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | +| tvOS 18.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 18.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| watchOS 11.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 10 (42mm)<br>Apple Watch Series 10 (46mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 11.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 10 (42mm)<br>Apple Watch Series 10 (46mm)<br>Apple Watch Ultra 2 (49mm) | +| visionOS 2.0 | Apple Vision Pro | +| visionOS 2.1 | Apple Vision Pro | + +### Android +| Package Name | Version | +| -------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Android Emulator | 35.1.21 | +| Android SDK Platforms | android-35 (rev 1)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1) | +| Android SDK Platform-Tools | 35.0.2 | +| Android Support Repository | 47.0.0 | +| CMake | 3.22.1 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 25.2.9519653<br>26.3.11579264<br>27.1.12297006 (default) | + +#### Environment variables +| Name | Value | +| ----------------------- | --------------------------------------------------- | +| ANDROID_HOME | /Users/runner/Library/Android/sdk | +| ANDROID_NDK | /Users/runner/Library/Android/sdk/ndk/27.1.12297006 | +| ANDROID_NDK_HOME | /Users/runner/Library/Android/sdk/ndk/27.1.12297006 | +| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/27.1.12297006 | +| ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk/27.1.12297006 | +| ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | From ae99c16b0cf27c0cca7ef0b08e7bcf13c33f6cfa Mon Sep 17 00:00:00 2001 From: ijunaidm <160701894+ijunaidm@users.noreply.github.com> Date: Wed, 25 Sep 2024 21:53:59 +0530 Subject: [PATCH 3145/3485] Updating ubuntu24.04 image as ubuntu-latest (#10687) Co-authored-by: Mohammed Junaid <mohammedjunaid@Mohammeds-MacBook-Pro.local> --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 3ce17a13810e..0b4832bf9d59 100644 --- a/README.md +++ b/README.md @@ -21,8 +21,8 @@ To build a VM machine from this repo's source, see the [instructions](docs/creat | Image | YAML Label | Included Software | Rollout Status of Latest Image Release | | --------------------|---------------------|--------------------|--------------------| -| Ubuntu 24.04 | `ubuntu-24.04` | [ubuntu-24.04] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fijunaidm%2F0b5459bbe18604a639e1d2f7accd204f%2Fraw%2Fubuntu24.json) | -| Ubuntu 22.04 | `ubuntu-latest` or `ubuntu-22.04` | [ubuntu-22.04] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fijunaidm%2F0b5459bbe18604a639e1d2f7accd204f%2Fraw%2Fubuntu22.json) | +| Ubuntu 24.04 | `ubuntu-latest` or `ubuntu-24.04` | [ubuntu-24.04] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fijunaidm%2F0b5459bbe18604a639e1d2f7accd204f%2Fraw%2Fubuntu24.json) | +| Ubuntu 22.04 | `ubuntu-22.04` | [ubuntu-22.04] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fijunaidm%2F0b5459bbe18604a639e1d2f7accd204f%2Fraw%2Fubuntu22.json) | | Ubuntu 20.04 | `ubuntu-20.04` | [ubuntu-20.04] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fijunaidm%2F0b5459bbe18604a639e1d2f7accd204f%2Fraw%2Fubuntu20.json) | | macOS 15 <sup>beta</sup> | `macos-15-large`| [macOS-15] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fijunaidm%2F0b5459bbe18604a639e1d2f7accd204f%2Fraw%2Fmacos-15.json) | | macOS 15 Arm64 <sup>beta</sup> | `macos-15`, `macos-15-xlarge` | [macOS-15-arm64] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fijunaidm%2F0b5459bbe18604a639e1d2f7accd204f%2Fraw%2Fmacos-15-arm64.json) | From ce5aa1950d31fd67c0014160a0164005a3e7f43c Mon Sep 17 00:00:00 2001 From: sarathrajsrinivasan <159180023+sarathrajsrinivasan@users.noreply.github.com> Date: Wed, 25 Sep 2024 14:45:18 -0700 Subject: [PATCH 3146/3485] [macOS] Add compilable brew packages for macOS12 (#10681) --- .../build/install-compilable-brew-packages.sh | 15 +++++++++++++++ images/macos/scripts/tests/BasicTools.Tests.ps1 | 10 ++-------- images/macos/scripts/tests/Common.Tests.ps1 | 16 ++++++++++++++++ images/macos/templates/macOS-12.anka.pkr.hcl | 3 ++- images/macos/toolsets/toolset-12.json | 8 +++++--- 5 files changed, 40 insertions(+), 12 deletions(-) create mode 100644 images/macos/scripts/build/install-compilable-brew-packages.sh diff --git a/images/macos/scripts/build/install-compilable-brew-packages.sh b/images/macos/scripts/build/install-compilable-brew-packages.sh new file mode 100644 index 000000000000..b0f22c5dfb65 --- /dev/null +++ b/images/macos/scripts/build/install-compilable-brew-packages.sh @@ -0,0 +1,15 @@ +#!/bin/bash -e -o pipefail +################################################################################ +## File: install-compilable-brew-packages.sh +## Desc: Install compilable brew packages +################################################################################ + +source ~/utils/utils.sh + +compilable_packages=$(get_toolset_value '.brew.compilable_packages[]') +for package in $compilable_packages; do + echo "Installing $package..." + brew_smart_install "$package" +done + +invoke_tests "Common" "Compiled" diff --git a/images/macos/scripts/tests/BasicTools.Tests.ps1 b/images/macos/scripts/tests/BasicTools.Tests.ps1 index add654733aaf..e6cfeac595a1 100644 --- a/images/macos/scripts/tests/BasicTools.Tests.ps1 +++ b/images/macos/scripts/tests/BasicTools.Tests.ps1 @@ -87,7 +87,7 @@ Describe "7-Zip" { } } -Describe "Apache Ant" { +Describe "Apache Ant" -Skip:($os.IsMonterey) { It "Apache Ant" { "ant -version" | Should -ReturnZeroExitCode } @@ -159,7 +159,7 @@ Describe "Homebrew" { } } -Describe "Kotlin" { +Describe "Kotlin" -Skip:($os.IsMonterey) { $kotlinPackages = @("kapt", "kotlin", "kotlinc", "kotlinc-jvm", "kotlin-dce-js") It "<toolName> is available" -TestCases ($kotlinPackages | ForEach-Object { @{ toolName = $_ } }) { @@ -167,12 +167,6 @@ Describe "Kotlin" { } } -Describe "sbt" -Skip:($os.IsVentura -or $os.IsSonoma -or $os.IsSequoia) { - It "sbt" { - "sbt -version" | Should -ReturnZeroExitCode - } -} - Describe "yq" { It "yq" { "yq --version" | Should -ReturnZeroExitCode diff --git a/images/macos/scripts/tests/Common.Tests.ps1 b/images/macos/scripts/tests/Common.Tests.ps1 index 92591437dc41..497ed60e2082 100644 --- a/images/macos/scripts/tests/Common.Tests.ps1 +++ b/images/macos/scripts/tests/Common.Tests.ps1 @@ -146,3 +146,19 @@ Describe "Colima" -Skip:($os.IsVentura -or $os.IsSonoma -or $os.IsSequoia) { "colima version" | Should -ReturnZeroExitCode } } + +Describe "Compiled" -Skip:(-not $os.IsMonterey) { + It "Apache Ant" { + "ant -version" | Should -ReturnZeroExitCode + } + + $kotlinPackages = @("kapt", "kotlin", "kotlinc", "kotlinc-jvm", "kotlin-dce-js") + + It "<toolName> is available" -TestCases ($kotlinPackages | ForEach-Object { @{ toolName = $_ } }) { + "$toolName -version" | Should -ReturnZeroExitCode + } + + It "sbt" { + "sbt -version" | Should -ReturnZeroExitCode + } +} diff --git a/images/macos/templates/macOS-12.anka.pkr.hcl b/images/macos/templates/macOS-12.anka.pkr.hcl index dc366199734f..398623bbda82 100644 --- a/images/macos/templates/macOS-12.anka.pkr.hcl +++ b/images/macos/templates/macOS-12.anka.pkr.hcl @@ -266,7 +266,8 @@ build { "${path.root}/../scripts/build/install-pypy.sh", "${path.root}/../scripts/build/install-pipx-packages.sh", "${path.root}/../scripts/build/install-bicep.sh", - "${path.root}/../scripts/build/install-codeql-bundle.sh" + "${path.root}/../scripts/build/install-codeql-bundle.sh", + "${path.root}/../scripts/build/install-compilable-brew-packages.sh" ] } diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index 9aca0bad9d6d..e63383d7af01 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -184,7 +184,6 @@ }, "brew": { "common_packages": [ - "ant", "aria2", "azure-cli", "bazelisk", @@ -194,13 +193,11 @@ "gh", "gnupg", "gnu-tar", - "kotlin", "libpq", "p7zip", "packer", "perl", "pkg-config", - "sbt", "subversion", "swiftformat", "swig", @@ -222,6 +219,11 @@ "vagrant", "virtualbox", "parallels" + ], + "compilable_packages": [ + "ant", + "kotlin", + "sbt" ] }, "gcc": { From e3b97844e5589424d845da8eabba9d2f73852577 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 26 Sep 2024 05:29:17 +0000 Subject: [PATCH 3147/3485] Updating readme file for macos-14-arm64 version 20240922.1 (#10666) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-14-arm64-Readme.md | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/images/macos/macos-14-arm64-Readme.md b/images/macos/macos-14-arm64-Readme.md index e11fe65ccde2..a16b6f1aab60 100644 --- a/images/macos/macos-14-arm64-Readme.md +++ b/images/macos/macos-14-arm64-Readme.md @@ -7,7 +7,7 @@ # macOS 14 - OS Version: macOS 14.6.1 (23G93) - Kernel Version: Darwin 23.6.0 -- Image Version: 20240918.8 +- Image Version: 20240922.1 ## Installed Software @@ -68,14 +68,14 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.17.54 +- AWS CLI 2.17.56 - AWS SAM CLI 1.124.0 - AWS Session Manager CLI 1.2.650.0 - Azure CLI 2.64.0 - Azure CLI (azure-devops) 1.0.1 - Bicep CLI 0.30.3 - Cmake 3.30.3 -- CodeQL Action Bundle 2.18.4 +- CodeQL Action Bundle 2.19.0 - Fastlane 2.222.0 - SwiftFormat 0.54.5 - Xcbeautify 2.11.0 @@ -90,7 +90,7 @@ - Google Chrome 129.0.6668.59 - Google Chrome for Testing 129.0.6668.58 - ChromeDriver 129.0.6668.58 -- Selenium server 4.24.0 +- Selenium server 4.25.0 #### Environment variables | Name | Value | @@ -208,8 +208,8 @@ | Simulator - watchOS 11.1 | watchsimulator11.1 | 16.1 | | visionOS 1.0 | xros1.0 | 15.2 | | Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | -| visionOS 1.1 | xros1.1 | 15.3 | | Simulator - visionOS 1.1 | xrsimulator1.1 | 15.3 | +| visionOS 1.1 | xros1.1 | 15.3 | | Simulator - visionOS 1.2 | xrsimulator1.2 | 15.4 | | visionOS 1.2 | xros1.2 | 15.4 | | visionOS 2.0 | xros2.0 | 16.0 | @@ -217,8 +217,8 @@ | Simulator - visionOS 2.1 | xrsimulator2.1 | 16.1 | | visionOS 2.1 | xros2.1 | 16.1 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | -| Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | +| Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | DriverKit 22.4 | driverkit22.4 | 14.3.1 | | DriverKit 23.0 | driverkit23.0 | 15.0.1 | | DriverKit 23.2 | driverkit23.2 | 15.1, 15.2 | @@ -251,11 +251,6 @@ | watchOS 10.5 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | | watchOS 11.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 10 (42mm)<br>Apple Watch Series 10 (46mm)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | | watchOS 11.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 10 (42mm)<br>Apple Watch Series 10 (46mm)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | -| visionOS 1.0 | Apple Vision Pro | -| visionOS 1.1 | Apple Vision Pro | -| visionOS 1.2 | Apple Vision Pro | -| visionOS 2.0 | Apple Vision Pro | -| visionOS 2.1 | Apple Vision Pro | ### Android | Package Name | Version | From 2661cfaa934270c6dfb1d52f0f805b9d790d724d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 26 Sep 2024 15:15:00 +0000 Subject: [PATCH 3148/3485] Updating readme file for win22 version 20240922.1.1 (#10668) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/windows/Windows2022-Readme.md | 50 ++++++++++++++-------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/images/windows/Windows2022-Readme.md b/images/windows/Windows2022-Readme.md index c9d4b4ec0fcd..3e80ef8c4905 100644 --- a/images/windows/Windows2022-Readme.md +++ b/images/windows/Windows2022-Readme.md @@ -1,6 +1,6 @@ # Windows Server 2022 - OS Version: 10.0.20348 Build 2700 -- Image Version: 20240915.1.0 +- Image Version: 20240922.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -8,7 +8,7 @@ ## Installed Software ### Language and Runtime -- Bash 5.2.26(1)-release +- Bash 5.2.32(1)-release - Go 1.21.13 - Julia 1.10.5 - Kotlin 2.0.20 @@ -29,7 +29,7 @@ - pip 24.2 (python 3.9) - Pipx 1.7.1 - RubyGems 3.2.33 -- Vcpkg (build from commit 86fba1306) +- Vcpkg (build from commit 98aa63962) - Yarn 1.22.22 #### Environment variables @@ -42,7 +42,7 @@ - Ant 1.10.14 - Gradle 8.10 - Maven 3.8.7 -- sbt 1.10.1 +- sbt 1.10.2 ### Tools - 7zip 24.08 @@ -50,15 +50,15 @@ - azcopy 10.26.0 - Bazel 7.3.1 - Bazelisk 1.21.0 -- Bicep 0.29.47 +- Bicep 0.30.3 - Cabal 3.12.1.0 - CMake 3.30.3 -- CodeQL Action Bundle 2.18.4 +- CodeQL Action Bundle 2.19.0 - Docker 26.1.3 - Docker Compose v2 2.27.1 - Docker-wincred 0.8.2 - ghc 9.10.1 -- Git 2.46.0.windows.1 +- Git 2.46.1.windows.1 - Git LFS 3.5.1 - ImageMagick 7.1.1-38 - InnoSetup 6.3.3 @@ -73,7 +73,7 @@ - NSIS 3.10 - OpenSSL 1.1.1w - Packer 1.11.0 -- Pulumi 3.132.0 +- Pulumi 3.133.0 - R 4.4.1 - Service Fabric SDK 9.1.1436.9590 - Stack 3.1.1 @@ -86,13 +86,13 @@ - zstd 1.5.6 ### CLI Tools -- Alibaba Cloud CLI 3.0.222 -- AWS CLI 2.17.51 +- Alibaba Cloud CLI 3.0.223 +- AWS CLI 2.17.56 - AWS SAM CLI 1.124.0 - AWS Session Manager CLI 1.2.650.0 - Azure CLI 2.64.0 - Azure DevOps CLI extension 1.0.1 -- GitHub CLI 2.56.0 +- GitHub CLI 2.57.0 ### Rust Tools - Cargo 1.81.0 @@ -109,14 +109,14 @@ - Rustfmt 1.7.1 ### Browsers and Drivers -- Google Chrome 128.0.6613.138 -- Chrome Driver 128.0.6613.137 -- Microsoft Edge 128.0.2739.79 -- Microsoft Edge Driver 128.0.2739.79 -- Mozilla Firefox 130.0 +- Google Chrome 129.0.6668.59 +- Chrome Driver 129.0.6668.58 +- Microsoft Edge 129.0.2792.52 +- Microsoft Edge Driver 129.0.2792.52 +- Mozilla Firefox 130.0.1 - Gecko Driver 0.35.0 - IE Driver 4.14.0.0 -- Selenium server 4.24.0 +- Selenium server 4.25.0 #### Environment variables | Name | Value | @@ -204,7 +204,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Database tools - Azure CosmosDb Emulator 2.14.20.0 -- DacFx 162.3.566.1 +- DacFx 162.4.92.3 - MySQL 8.0.39.0 - SQL OLEDB Driver 18.7.4.0 - SQLPS 1.0 @@ -218,7 +218,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Visual Studio Enterprise 2022 | Name | Version | Path | | ----------------------------- | --------------- | -------------------------------------------------------- | -| Visual Studio Enterprise 2022 | 17.11.35303.130 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | +| Visual Studio Enterprise 2022 | 17.11.35312.102 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | #### Workloads, components and extensions | Package | Version | @@ -245,7 +245,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Component.Unreal | 17.11.35102.94 | | Component.Unreal.Android | 17.11.35102.94 | | Component.Unreal.Ide | 17.11.35102.94 | -| Component.VisualStudio.GitHub.Copilot | 17.11.35303.118 | +| Component.VisualStudio.GitHub.Copilot | 17.11.35312.31 | | Component.VSInstallerProjects2022 | 2.0.1 | | Component.WixToolset.VisualStudioExtension.Dev17 | 1.0.0.22 | | Component.WixToolset.VisualStudioExtension.Schemas3 | 1.0.0.22 | @@ -253,9 +253,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Component.Xamarin.RemotedSimulator | 17.11.35102.94 | | ios | 17.5.8030.0 | | maccatalyst | 17.5.8030.0 | -| maui.blazor | 8.0.72.11171 | -| maui.core | 8.0.72.11171 | -| maui.windows | 8.0.72.11171 | +| maui.blazor | 8.0.82.11329 | +| maui.core | 8.0.82.11329 | +| maui.windows | 8.0.82.11329 | | Microsoft.Component.Azure.DataLake.Tools | 17.11.35102.94 | | Microsoft.Component.ClickOnce | 17.11.35102.94 | | Microsoft.Component.CodeAnalysis.SDK | 17.11.35102.94 | @@ -499,7 +499,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - AzureRM: 2.1.0 (Default), 6.13.1 - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.656 +- AWSPowershell: 4.1.661 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.10 - Microsoft.Graph: 2.23.0 @@ -519,7 +519,7 @@ All other versions are saved but not installed. | Package Name | Version | | -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 8.0 | -| Android Emulator | 35.1.20 | +| Android Emulator | 35.1.21 | | Android SDK Build-tools | 35.0.0<br>34.0.0<br>33.0.0 33.0.1 33.0.2 33.0.3<br>32.0.0<br>31.0.0 | | Android SDK Platforms | android-35 (rev 1)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1) | | Android SDK Platform-Tools | 35.0.2 | From 2fea25d02d184a8cba00c9feb0a02424a21be833 Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Fri, 27 Sep 2024 01:02:50 +0200 Subject: [PATCH 3149/3485] [macOS] Recommended version of `brew shellenv` usage (#10660) Co-authored-by: Carlo Cabrera <30379873+carlocab@users.noreply.github.com> --- images/macos/scripts/build/configure-shell.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/images/macos/scripts/build/configure-shell.sh b/images/macos/scripts/build/configure-shell.sh index 92b23409e669..0f7643a5c0d7 100644 --- a/images/macos/scripts/build/configure-shell.sh +++ b/images/macos/scripts/build/configure-shell.sh @@ -14,8 +14,6 @@ sudo chsh -s /bin/bash root # Check MacOS architecture and add HOMEBREW PATH to bashrc if [[ $arch == "arm64" ]]; then echo "Adding Homebrew environment to bash" - /opt/homebrew/bin/brew shellenv >> ~/.bashrc - # Workaround for the issue (#10624) with the Homebrew PATH in the bashrc - sed -i '' '/; export PATH;/d' ~/.bashrc - echo 'export PATH="/opt/homebrew/bin:/opt/homebrew/sbin:$PATH"' >> ~/.bashrc + # Discussed here: https://github.com/Homebrew/brew/pull/18366 + echo 'eval "$(/opt/homebrew/bin/brew shellenv)"' >> ~/.bashrc fi From 8726158fca5622d4bf6cbff3cc58e244c4fda687 Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Fri, 27 Sep 2024 01:04:25 +0200 Subject: [PATCH 3150/3485] [macOS] Disable removing default Xcode CLT for macOS-15 (#10691) --- images/macos/scripts/build/install-bicep.sh | 5 ----- 1 file changed, 5 deletions(-) diff --git a/images/macos/scripts/build/install-bicep.sh b/images/macos/scripts/build/install-bicep.sh index 0ab263ed60b8..6a5a3ddb22d4 100644 --- a/images/macos/scripts/build/install-bicep.sh +++ b/images/macos/scripts/build/install-bicep.sh @@ -6,11 +6,6 @@ source ~/utils/utils.sh -if is_Sequoia; then - sudo rm -rf /Library/Developer/CommandLineTools - sudo xcode-select --install -fi - echo "Installing bicep cli..." brew tap azure/bicep brew_smart_install bicep From e7648fd6a7ca5dc796f218a01ce92d0b8d068203 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 28 Sep 2024 20:35:33 +0000 Subject: [PATCH 3151/3485] Updating readme file for macos-13 version 20240923.120 (#10670) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-13-Readme.md | 46 ++++++++++++++++----------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/images/macos/macos-13-Readme.md b/images/macos/macos-13-Readme.md index 5a13d8d57345..e1784167f109 100644 --- a/images/macos/macos-13-Readme.md +++ b/images/macos/macos-13-Readme.md @@ -5,9 +5,9 @@ | [[macOS] Xcodes visionOS platform will be removed from macOS-14 images on September 23, 2024](https://github.com/actions/runner-images/issues/10559) | *** # macOS 13 -- OS Version: macOS 13.6.9 (22G830) +- OS Version: macOS 13.7 (22H123) - Kernel Version: Darwin 22.6.0 -- Image Version: 20240916.98 +- Image Version: 20240923.120 ## Installed Software @@ -31,17 +31,17 @@ - Ruby 3.0.7p220 ### Package Management -- Bundler 2.5.18 +- Bundler 2.5.19 - Carthage 0.40.0 - CocoaPods 1.15.2 - Composer 2.7.9 -- Homebrew 4.3.21 +- Homebrew 4.3.23 - NPM 10.8.2 - NuGet 6.3.1.1 - Pip3 24.2 (python 3.12) - Pipx 1.7.1 -- RubyGems 3.5.18 -- Vcpkg 2024 (build from commit 86fba1306) +- RubyGems 3.5.19 +- Vcpkg 2024 (build from commit 98aa63962) - Yarn 1.22.22 ### Project Management @@ -56,10 +56,10 @@ - bazel 7.3.1 - bazelisk 1.21.0 - bsdtar 3.5.3 - available by 'tar' alias -- Curl 8.10.0 +- Curl 8.10.1 - Git 2.46.1 - Git LFS 3.5.1 -- GitHub CLI 2.56.0 +- GitHub CLI 2.57.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.24.5 - gpg (GnuPG) 2.4.5 @@ -71,14 +71,14 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.17.51 +- AWS CLI 2.17.56 - AWS SAM CLI 1.124.0 - AWS Session Manager CLI 1.2.650.0 - Azure CLI 2.64.0 - Azure CLI (azure-devops) 1.0.1 -- Bicep CLI 0.29.47 +- Bicep CLI 0.30.3 - Cmake 3.30.3 -- CodeQL Action Bundle 2.18.4 +- CodeQL Action Bundle 2.19.0 - Fastlane 2.222.0 - SwiftFormat 0.54.5 - Xcbeautify 2.11.0 @@ -89,16 +89,16 @@ - SwiftLint 0.57.0 ### Browsers -- Safari 17.6 (18618.3.11.11.7) -- SafariDriver 17.6 (18618.3.11.11.7) -- Google Chrome 128.0.6613.138 -- Google Chrome for Testing 128.0.6613.137 -- ChromeDriver 128.0.6613.137 -- Microsoft Edge 128.0.2739.79 -- Microsoft Edge WebDriver 128.0.2739.81 -- Mozilla Firefox 130.0 +- Safari 18.0 (18619.1.26.111.10) +- SafariDriver 18.0 (18619.1.26.111.10) +- Google Chrome 129.0.6668.59 +- Google Chrome for Testing 129.0.6668.58 +- ChromeDriver 129.0.6668.58 +- Microsoft Edge 129.0.2792.52 +- Microsoft Edge WebDriver 129.0.2792.46 +- Mozilla Firefox 130.0.1 - geckodriver 0.35.0 -- Selenium server 4.24.0 +- Selenium server 4.25.0 #### Environment variables | Name | Value | @@ -213,8 +213,8 @@ | Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | | visionOS 1.0 | xros1.0 | 15.2 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | -| Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | +| Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | DriverKit 22.1 | driverkit22.1 | 14.1 | | DriverKit 22.2 | driverkit22.2 | 14.2 | | DriverKit 22.4 | driverkit22.4 | 14.3.1 | @@ -242,7 +242,7 @@ | Package Name | Version | | -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 11.0 | -| Android Emulator | 35.1.20 | +| Android Emulator | 35.1.21 | | Android SDK Build-tools | 35.0.0<br>34.0.0<br>33.0.2 33.0.3 | | Android SDK Platforms | android-35 (rev 1)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | | Android SDK Platform-Tools | 35.0.2 | @@ -267,7 +267,7 @@ #### Environment variables | Name | Value | | ----------------- | ----------------------------------------------------------------------------------------- | -| PARALLELS_DMG_URL | https://download.parallels.com/desktop/v20/20.0.0-55653/ParallelsDesktop-20.0.0-55653.dmg | +| PARALLELS_DMG_URL | https://download.parallels.com/desktop/v20/20.0.1-55659/ParallelsDesktop-20.0.1-55659.dmg | ##### Notes ``` From bd90e1a113d6ff9984c00e6db6405d03baead9e8 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 30 Sep 2024 07:02:15 +0000 Subject: [PATCH 3152/3485] Updating readme file for macos-12 version 20240926.174 (#10695) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-12-Readme.md | 52 ++++++++++++++++----------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/images/macos/macos-12-Readme.md b/images/macos/macos-12-Readme.md index a4f4aa95a365..86e0b715aa57 100644 --- a/images/macos/macos-12-Readme.md +++ b/images/macos/macos-12-Readme.md @@ -1,18 +1,18 @@ | Announcements | |-| +| [macOS 15 (Sequoia) is now available as a public beta in GitHub Actions](https://github.com/actions/runner-images/issues/10686) | | [[Macos 13 and 14] Android NDK versions <=25 will be removed from images on October 07,2024](https://github.com/actions/runner-images/issues/10614) | | [[Macos 13 and 14] Go version 1.20.0 will be removed on October 07,2024.](https://github.com/actions/runner-images/issues/10612) | -| [[macOS] Xcodes visionOS platform will be removed from macOS-14 images on September 23, 2024](https://github.com/actions/runner-images/issues/10559) | *** # macOS 12 - OS Version: macOS 12.7.6 (21H1320) - Kernel Version: Darwin 21.6.0 -- Image Version: 20240916.115 +- Image Version: 20240926.174 ## Installed Software ### Language and Runtime -- .NET Core SDK: 6.0.425, 7.0.102, 7.0.202, 7.0.306, 7.0.410, 8.0.101, 8.0.204, 8.0.303, 8.0.401 +- .NET Core SDK: 6.0.425, 7.0.102, 7.0.202, 7.0.306, 7.0.410, 8.0.101, 8.0.204, 8.0.303, 8.0.402 - Bash 3.2.57(1)-release - Clang/LLVM 14.0.0 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` @@ -38,19 +38,19 @@ - Ruby 3.0.7p220 ### Package Management -- Bundler 2.5.18 +- Bundler 2.5.20 - Carthage 0.40.0 - CocoaPods 1.15.2 - Composer 2.7.9 -- Homebrew 4.3.21 +- Homebrew 4.3.24 - Miniconda 24.7.1 - NPM 10.7.0 - NuGet 6.3.1.1 - Pip 20.3.4 (python 2.7) - Pip3 24.2 (python 3.12) - Pipx 1.7.1 -- RubyGems 3.5.18 -- Vcpkg 2024 (build from commit 86fba1306) +- RubyGems 3.5.20 +- Vcpkg 2024 (build from commit 3d8959985) - Yarn 1.22.22 #### Environment variables @@ -62,8 +62,8 @@ ### Project Management - Apache Ant 1.10.15 - Apache Maven 3.9.9 -- Gradle 8.10.1 -- Sbt 1.10.1 +- Gradle 8.10.2 +- Sbt 1.10.2 ### Utilities - 7-Zip 17.05 @@ -72,10 +72,10 @@ - bazel 7.3.1 - bazelisk 1.21.0 - bsdtar 3.5.1 - available by 'tar' alias -- Curl 8.10.0 -- Git 2.46.1 +- Curl 8.10.1 +- Git 2.46.2 - Git LFS 3.5.1 -- GitHub CLI 2.56.0 +- GitHub CLI 2.57.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.24.5 - gpg (GnuPG) 2.4.5 @@ -98,20 +98,20 @@ ### Tools - App Center CLI 3.0.1 -- AWS CLI 2.17.51 +- AWS CLI 2.17.59 - AWS SAM CLI 1.124.0 - AWS Session Manager CLI 1.2.650.0 - Azure CLI 2.64.0 - Azure CLI (azure-devops) 1.0.1 -- Bicep CLI 0.29.47 +- Bicep CLI 0.30.23 - Cabal 3.10.3.0 - Cmake 3.30.3 -- CodeQL Action Bundle 2.18.4 +- CodeQL Action Bundle 2.19.0 - Colima 0.7.5 - Fastlane 2.222.0 - GHC 9.10.1 - GHCup 0.1.30.0 -- Jazzy 0.15.1 +- Jazzy 0.15.2 - Stack 3.1.1 - SwiftFormat 0.54.5 - Swig 4.2.1 @@ -126,14 +126,14 @@ ### Browsers - Safari 17.6 (17618.3.11.11.7) - SafariDriver 17.6 (17618.3.11.11.7) -- Google Chrome 128.0.6613.138 -- Google Chrome for Testing 128.0.6613.137 -- ChromeDriver 128.0.6613.137 -- Microsoft Edge 128.0.2739.79 -- Microsoft Edge WebDriver 128.0.2739.81 -- Mozilla Firefox 130.0 +- Google Chrome 129.0.6668.71 +- Google Chrome for Testing 129.0.6668.70 +- ChromeDriver 129.0.6668.70 +- Microsoft Edge 129.0.2792.52 +- Microsoft Edge WebDriver 129.0.2792.46 +- Mozilla Firefox 130.0.1 - geckodriver 0.35.0 -- Selenium server 4.24.0 +- Selenium server 4.25.0 #### Environment variables | Name | Value | @@ -339,7 +339,7 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" | Package Name | Version | | -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 8.0 | -| Android Emulator | 35.1.20 | +| Android Emulator | 35.1.21 | | Android SDK Build-tools | 35.0.0<br>34.0.0<br>33.0.0 33.0.1 33.0.2 33.0.3<br>32.0.0<br>31.0.0 | | Android SDK Platforms | android-35 (rev 1)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1) | | Android SDK Platform-Tools | 35.0.2 | @@ -362,13 +362,13 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" ### Miscellaneous - libXext 1.3.6 - libXft 2.3.8 -- Tcl/Tk 8.6.14 +- Tcl/Tk 8.6.15 - Zlib 1.3.1 #### Environment variables | Name | Value | | ----------------- | ----------------------------------------------------------------------------------------- | -| PARALLELS_DMG_URL | https://download.parallels.com/desktop/v20/20.0.0-55653/ParallelsDesktop-20.0.0-55653.dmg | +| PARALLELS_DMG_URL | https://download.parallels.com/desktop/v20/20.0.1-55659/ParallelsDesktop-20.0.1-55659.dmg | ##### Notes ``` From 01d5873a786323766269ea857ccf01718434b0f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EB=A3=A8=EB=B0=80LuMir?= <rpfos@naver.com> Date: Mon, 30 Sep 2024 17:30:36 +0900 Subject: [PATCH 3153/3485] [doc] Fix typo in README.md (#10689) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0b4832bf9d59..70acff251e85 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ To build a VM machine from this repo's source, see the [instructions](docs/creat | Ubuntu 22.04 | `ubuntu-22.04` | [ubuntu-22.04] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fijunaidm%2F0b5459bbe18604a639e1d2f7accd204f%2Fraw%2Fubuntu22.json) | | Ubuntu 20.04 | `ubuntu-20.04` | [ubuntu-20.04] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fijunaidm%2F0b5459bbe18604a639e1d2f7accd204f%2Fraw%2Fubuntu20.json) | | macOS 15 <sup>beta</sup> | `macos-15-large`| [macOS-15] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fijunaidm%2F0b5459bbe18604a639e1d2f7accd204f%2Fraw%2Fmacos-15.json) | -| macOS 15 Arm64 <sup>beta</sup> | `macos-15`, `macos-15-xlarge` | [macOS-15-arm64] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fijunaidm%2F0b5459bbe18604a639e1d2f7accd204f%2Fraw%2Fmacos-15-arm64.json) | +| macOS 15 Arm64 <sup>beta</sup> | `macos-15` or `macos-15-xlarge` | [macOS-15-arm64] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fijunaidm%2F0b5459bbe18604a639e1d2f7accd204f%2Fraw%2Fmacos-15-arm64.json) | | macOS 14 | `macos-latest-large` or `macos-14-large`| [macOS-14] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fijunaidm%2F0b5459bbe18604a639e1d2f7accd204f%2Fraw%2Fmacos-14.json) | | macOS 14 Arm64 |`macos-latest`, `macos-14`, `macos-latest-xlarge` or `macos-14-xlarge`| [macOS-14-arm64] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fijunaidm%2F0b5459bbe18604a639e1d2f7accd204f%2Fraw%2Fmacos-14-arm64.json) | | macOS 13 | `macos-13` or `macos-13-large` | [macOS-13] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fijunaidm%2F0b5459bbe18604a639e1d2f7accd204f%2Fraw%2Fmacos-13.json) | From 740ab068bcf1d072e2b1db63af8b77f1539dbd39 Mon Sep 17 00:00:00 2001 From: sarathrajsrinivasan <159180023+sarathrajsrinivasan@users.noreply.github.com> Date: Mon, 30 Sep 2024 03:36:39 -0700 Subject: [PATCH 3154/3485] [macOS] Install packer using tap (#10696) --- images/macos/scripts/build/install-common-utils.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/images/macos/scripts/build/install-common-utils.sh b/images/macos/scripts/build/install-common-utils.sh index 46e0fb01fdee..96a46826b459 100644 --- a/images/macos/scripts/build/install-common-utils.sh +++ b/images/macos/scripts/build/install-common-utils.sh @@ -17,7 +17,12 @@ for package in $common_packages; do xcbeautify_path=$(download_with_retry "https://raw.githubusercontent.com/Homebrew/homebrew-core/d3653e83f9c029a3fddb828ac804b07ac32f7b3b/Formula/x/xcbeautify.rb") brew install "$xcbeautify_path" else - brew_smart_install "$package" + if [[ $package == "packer" ]]; then + # Packer has been deprecated in Homebrew. Use tap to install Packer. + brew install hashicorp/tap/packer + else + brew_smart_install "$package" + fi fi done From 6fc0ca1a91ca108df7b15c8462ccd5a5e03c3d7f Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Tue, 1 Oct 2024 13:58:47 +0200 Subject: [PATCH 3155/3485] [macOS] [doc] Update macos-15-arm64 readme to the current version (#10710) --- images/macos/macos-15-arm64-Readme.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/images/macos/macos-15-arm64-Readme.md b/images/macos/macos-15-arm64-Readme.md index 42718d10c8d0..1d0e5f6b4209 100644 --- a/images/macos/macos-15-arm64-Readme.md +++ b/images/macos/macos-15-arm64-Readme.md @@ -1,12 +1,12 @@ # macOS 15 - OS Version: macOS 15.0 (24A335) - Kernel Version: Darwin 24.0.0 -- Image Version: 20240919.100 +- Image Version: 20240921.108 ## Installed Software ### Language and Runtime -- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.410, 8.0.101, 8.0.204, 8.0.303, 8.0.401 +- .NET Core SDK: 8.0.101, 8.0.204, 8.0.303, 8.0.401 - Bash 3.2.57(1)-release - Clang/LLVM 16.0.0 - Clang/LLVM (Homebrew) 18.1.8 - available on `$(brew --prefix llvm@18)/bin/clang` @@ -60,7 +60,7 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.17.54 +- AWS CLI 2.17.56 - AWS SAM CLI 1.124.0 - AWS Session Manager CLI 1.2.650.0 - Azure CLI 2.64.0 @@ -82,7 +82,7 @@ - Google Chrome 129.0.6668.59 - Google Chrome for Testing 129.0.6668.58 - ChromeDriver 129.0.6668.58 -- Selenium server 4.24.0 +- Selenium server 4.25.0 #### Environment variables | Name | Value | @@ -154,10 +154,10 @@ | watchOS 11.1 | watchos11.1 | 16.1 | | Simulator - watchOS 11.0 | watchsimulator11.0 | 16.0 | | Simulator - watchOS 11.1 | watchsimulator11.1 | 16.1 | -| visionOS 2.0 | xros2.0 | 16.0 | | Simulator - visionOS 2.0 | xrsimulator2.0 | 16.0 | -| Simulator - visionOS 2.1 | xrsimulator2.1 | 16.1 | +| visionOS 2.0 | xros2.0 | 16.0 | | visionOS 2.1 | xros2.1 | 16.1 | +| Simulator - visionOS 2.1 | xrsimulator2.1 | 16.1 | | DriverKit 24.0 | driverkit24.0 | 16.0 | | DriverKit 24.1 | driverkit24.1 | 16.1 | @@ -183,7 +183,7 @@ | CMake | 3.22.1 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 25.2.9519653<br>26.3.11579264<br>27.1.12297006 (default) | +| NDK | 26.3.11579264<br>27.1.12297006 (default) | #### Environment variables | Name | Value | From 22a8b4c4acd38579dd6bd5c2fcb5b7c492161ea7 Mon Sep 17 00:00:00 2001 From: vidyasagarnimmagaddi <160703874+vidyasagarnimmagaddi@users.noreply.github.com> Date: Tue, 1 Oct 2024 21:26:59 +0530 Subject: [PATCH 3156/3485] updated baseurl to get the mingw32 and mingw64 releases (#10713) --- images/windows/scripts/build/Install-Mingw64.ps1 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/images/windows/scripts/build/Install-Mingw64.ps1 b/images/windows/scripts/build/Install-Mingw64.ps1 index 2d5279b098cc..deb0831ff84c 100644 --- a/images/windows/scripts/build/Install-Mingw64.ps1 +++ b/images/windows/scripts/build/Install-Mingw64.ps1 @@ -5,14 +5,14 @@ if (Test-IsWin19) { # If Windows 2019, install version 8.1.0 form sourceforge - $baseUrl = "https://sourceforge.net/projects/mingw-w64/files" + $baseUrl = "https://download.qt.io/development_releases/prebuilt" $("mingw32", "mingw64") | ForEach-Object { if ($_ -eq "mingw32") { - $url = "$baseUrl/Toolchains%20targetting%20Win32/Personal%20Builds/mingw-builds/8.1.0/threads-posix/dwarf/i686-8.1.0-release-posix-dwarf-rt_v6-rev0.7z/download" + $url = "$baseUrl/mingw_32/i686-8.1.0-release-posix-dwarf-rt_v6-rev0.7z" $sha256sum = 'adb84b70094c0225dd30187ff995e311d19424b1eb8f60934c60e4903297f946' } elseif ($_ -eq "mingw64") { - $url = "$baseUrl/Toolchains%20targetting%20Win64/Personal%20Builds/mingw-builds/8.1.0/threads-posix/seh/x86_64-8.1.0-release-posix-seh-rt_v6-rev0.7z/download" + $url = "$baseUrl/mingw_64/x86_64-8.1.0-release-posix-seh-rt_v6-rev0.7z" $sha256sum = '853970527b5de4a55ec8ca4d3fd732c00ae1c69974cc930c82604396d43e79f8' } else { throw "Unknown architecture $_" From f251d50781c5bdb51b2c2042829c5bb87e108d02 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 2 Oct 2024 09:57:08 +0000 Subject: [PATCH 3157/3485] Updating readme file for macos-15 version 20240930.153 (#10709) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-15-Readme.md | 46 +++++++++++++++++++-------------- 1 file changed, 27 insertions(+), 19 deletions(-) diff --git a/images/macos/macos-15-Readme.md b/images/macos/macos-15-Readme.md index fbf82341bcbf..4a7d290e26f4 100644 --- a/images/macos/macos-15-Readme.md +++ b/images/macos/macos-15-Readme.md @@ -1,12 +1,19 @@ +| Announcements | +|-| +| [[macOS] Support policy changes; Xcode 14 and 16 will be removed from macOS 14 on October 28](https://github.com/actions/runner-images/issues/10703) | +| [macOS 15 (Sequoia) is now available as a public beta in GitHub Actions](https://github.com/actions/runner-images/issues/10686) | +| [[Macos 13 and 14] Android NDK versions <=25 will be removed from images on October 07,2024](https://github.com/actions/runner-images/issues/10614) | +| [[Macos 13 and 14] Go version 1.20.0 will be removed on October 07,2024.](https://github.com/actions/runner-images/issues/10612) | +*** # macOS 15 - OS Version: macOS 15.0 (24A335) - Kernel Version: Darwin 24.0.0 -- Image Version: 20240923.103 +- Image Version: 20240930.153 ## Installed Software ### Language and Runtime -- .NET Core SDK: 8.0.101, 8.0.204, 8.0.303, 8.0.401 +- .NET Core SDK: 8.0.101, 8.0.204, 8.0.303, 8.0.402 - Bash 3.2.57(1)-release - Clang/LLVM 16.0.0 - Clang/LLVM (Homebrew) 18.1.8 - available on `$(brew --prefix llvm@18)/bin/clang` @@ -19,12 +26,12 @@ - Kotlin 2.0.20-release-360 - Node.js 22.9.0 - Perl 5.38.2 -- PHP 8.3.11 +- PHP 8.3.12 - Python3 3.12.6 - Ruby 3.3.5 ### Package Management -- Bundler 2.5.19 +- Bundler 2.5.20 - Carthage 0.40.0 - CocoaPods 1.15.2 - Composer 2.7.9 @@ -32,23 +39,23 @@ - NPM 10.8.3 - Pip3 24.2 (python 3.12) - Pipx 1.7.1 -- RubyGems 3.5.19 +- RubyGems 3.5.20 - Yarn 1.22.22 ### Project Management - Apache Ant 1.10.15 - Apache Maven 3.9.9 -- Gradle 8.10.1 +- Gradle 8.10.2 ### Utilities - 7-Zip 17.05 - aria2 1.37.0 - azcopy 10.26.0 - bazel 7.3.1 -- bazelisk 1.21.0 +- bazelisk 1.22.0 - bsdtar 3.5.3 - available by 'tar' alias - Curl 8.10.1 -- Git 2.46.1 +- Git 2.46.2 - Git LFS 3.5.1 - GitHub CLI 2.57.0 - GNU Tar 1.35 - available by 'gtar' alias @@ -56,21 +63,21 @@ - gpg (GnuPG) 2.4.5 - jq 1.7.1 - OpenSSL 1.1.1w 11 Sep 2023 -- Packer 1.9.4 +- Packer 1.11.2 - pkg-config 0.29.2 - yq 4.44.3 - zstd 1.5.6 ### Tools -- AWS CLI 2.17.57 -- AWS SAM CLI 1.124.0 +- AWS CLI 2.17.61 +- AWS SAM CLI 1.125.0 - AWS Session Manager CLI 1.2.650.0 - Azure CLI 2.64.0 - Azure CLI (azure-devops) 1.0.1 -- Bicep CLI 0.30.3 -- Cmake 3.30.3 +- Bicep CLI 0.30.23 +- Cmake 3.30.4 - CodeQL Action Bundle 2.19.0 -- Fastlane 2.222.0 +- Fastlane 2.223.1 - SwiftFormat 0.54.5 - Xcbeautify 2.11.0 - Xcode Command Line Tools 16.0.0.0.1.1724870825 @@ -82,11 +89,11 @@ ### Browsers - Safari 18.0 (20619.1.26.31.6) - SafariDriver 18.0 (20619.1.26.31.6) -- Google Chrome 129.0.6668.59 -- Google Chrome for Testing 129.0.6668.58 -- ChromeDriver 129.0.6668.58 -- Microsoft Edge 129.0.2792.52 -- Microsoft Edge WebDriver 129.0.2792.46 +- Google Chrome 129.0.6668.71 +- Google Chrome for Testing 129.0.6668.70 +- ChromeDriver 129.0.6668.70 +- Microsoft Edge 129.0.2792.65 +- Microsoft Edge WebDriver 129.0.2792.65 - Mozilla Firefox 130.0.1 - geckodriver 0.35.0 - Selenium server 4.25.0 @@ -207,3 +214,4 @@ | ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | ### Miscellaneous + From 0a7abf330f32364c026ee19f74c2a1517c761727 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 2 Oct 2024 11:32:27 +0000 Subject: [PATCH 3158/3485] Updating readme file for macos-15-arm64 version 20240930.135 (#10711) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-15-arm64-Readme.md | 42 ++++++++++++++++----------- 1 file changed, 25 insertions(+), 17 deletions(-) diff --git a/images/macos/macos-15-arm64-Readme.md b/images/macos/macos-15-arm64-Readme.md index 1d0e5f6b4209..91a6b0607762 100644 --- a/images/macos/macos-15-arm64-Readme.md +++ b/images/macos/macos-15-arm64-Readme.md @@ -1,12 +1,19 @@ +| Announcements | +|-| +| [[macOS] Support policy changes; Xcode 14 and 16 will be removed from macOS 14 on October 28](https://github.com/actions/runner-images/issues/10703) | +| [macOS 15 (Sequoia) is now available as a public beta in GitHub Actions](https://github.com/actions/runner-images/issues/10686) | +| [[Macos 13 and 14] Android NDK versions <=25 will be removed from images on October 07,2024](https://github.com/actions/runner-images/issues/10614) | +| [[Macos 13 and 14] Go version 1.20.0 will be removed on October 07,2024.](https://github.com/actions/runner-images/issues/10612) | +*** # macOS 15 - OS Version: macOS 15.0 (24A335) - Kernel Version: Darwin 24.0.0 -- Image Version: 20240921.108 +- Image Version: 20240930.135 ## Installed Software ### Language and Runtime -- .NET Core SDK: 8.0.101, 8.0.204, 8.0.303, 8.0.401 +- .NET Core SDK: 8.0.101, 8.0.204, 8.0.303, 8.0.402 - Bash 3.2.57(1)-release - Clang/LLVM 16.0.0 - Clang/LLVM (Homebrew) 18.1.8 - available on `$(brew --prefix llvm@18)/bin/clang` @@ -23,30 +30,30 @@ - Ruby 3.3.5 ### Package Management -- Bundler 2.5.19 +- Bundler 2.5.20 - Carthage 0.40.0 - CocoaPods 1.15.2 -- Homebrew 4.3.23 +- Homebrew 4.3.24 - NPM 10.8.3 - Pip3 24.2 (python 3.12) - Pipx 1.7.1 -- RubyGems 3.5.19 +- RubyGems 3.5.20 - Yarn 1.22.22 ### Project Management - Apache Ant 1.10.15 - Apache Maven 3.9.9 -- Gradle 8.10.1 +- Gradle 8.10.2 ### Utilities - 7-Zip 17.05 - aria2 1.37.0 - azcopy 10.26.0 - bazel 7.3.1 -- bazelisk 1.21.0 +- bazelisk 1.22.0 - bsdtar 3.5.3 - available by 'tar' alias - Curl 8.7.1 -- Git 2.46.1 +- Git 2.46.2 - Git LFS 3.5.1 - GitHub CLI 2.57.0 - GNU Tar 1.35 - available by 'gtar' alias @@ -54,21 +61,21 @@ - gpg (GnuPG) 2.4.5 - jq 1.7.1 - OpenSSL 1.1.1w 11 Sep 2023 -- Packer 1.9.4 +- Packer 1.11.2 - pkg-config 0.29.2 - yq 4.44.3 - zstd 1.5.6 ### Tools -- AWS CLI 2.17.56 -- AWS SAM CLI 1.124.0 +- AWS CLI 2.17.61 +- AWS SAM CLI 1.125.0 - AWS Session Manager CLI 1.2.650.0 - Azure CLI 2.64.0 - Azure CLI (azure-devops) 1.0.1 -- Bicep CLI 0.30.3 -- Cmake 3.30.3 +- Bicep CLI 0.30.23 +- Cmake 3.30.4 - CodeQL Action Bundle 2.19.0 -- Fastlane 2.222.0 +- Fastlane 2.223.1 - SwiftFormat 0.54.5 - Xcbeautify 2.11.0 - Xcode Command Line Tools 16.0.0.0.1.1724870825 @@ -79,9 +86,9 @@ ### Browsers - Safari 18.0 (20619.1.26.31.6) - SafariDriver 18.0 (20619.1.26.31.6) -- Google Chrome 129.0.6668.59 -- Google Chrome for Testing 129.0.6668.58 -- ChromeDriver 129.0.6668.58 +- Google Chrome 129.0.6668.71 +- Google Chrome for Testing 129.0.6668.70 +- ChromeDriver 129.0.6668.70 - Selenium server 4.25.0 #### Environment variables @@ -194,3 +201,4 @@ | ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/27.1.12297006 | | ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk/27.1.12297006 | | ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | + From fdbe51d78cb3ebcc1a1fcdaadfdbfdb84dedf0cb Mon Sep 17 00:00:00 2001 From: sarathrajsrinivasan <159180023+sarathrajsrinivasan@users.noreply.github.com> Date: Wed, 2 Oct 2024 07:38:03 -0700 Subject: [PATCH 3159/3485] [macOS] Fix automationmodetool and loginwindow issue for macOS14.7 (#10684) --- .../scripts/build/configure-autologin.sh | 1 + .../macos/scripts/build/configure-machine.sh | 33 ++++++++++--------- .../macos/scripts/build/configure-system.sh | 3 ++ images/macos/templates/macOS-13.anka.pkr.hcl | 1 + .../templates/macOS-13.arm64.anka.pkr.hcl | 1 + images/macos/templates/macOS-14.anka.pkr.hcl | 1 + .../templates/macOS-14.arm64.anka.pkr.hcl | 1 + images/macos/templates/macOS-15.anka.pkr.hcl | 2 ++ .../templates/macOS-15.arm64.anka.pkr.hcl | 1 + 9 files changed, 29 insertions(+), 15 deletions(-) diff --git a/images/macos/scripts/build/configure-autologin.sh b/images/macos/scripts/build/configure-autologin.sh index 16bdc9242c50..00471749070f 100644 --- a/images/macos/scripts/build/configure-autologin.sh +++ b/images/macos/scripts/build/configure-autologin.sh @@ -9,6 +9,7 @@ echo "Enabling automatic GUI login for the '$USERNAME' user.." python3 $HOME/bootstrap/kcpassword.py "$PASSWORD" /usr/bin/defaults write /Library/Preferences/com.apple.loginwindow autoLoginUser "$USERNAME" +/usr/bin/defaults write /Library/Preferences/com.apple.loginwindow autoLoginUserScreenLocked -bool false : ' The MIT License (MIT) diff --git a/images/macos/scripts/build/configure-machine.sh b/images/macos/scripts/build/configure-machine.sh index 438587fe9a57..abd1f9872fe0 100644 --- a/images/macos/scripts/build/configure-machine.sh +++ b/images/macos/scripts/build/configure-machine.sh @@ -50,21 +50,18 @@ done rm -f ./add-certificate # enable-automationmode-without-authentication - +brew install expect retry=10 while [[ $retry -gt 0 ]]; do { -osascript <<EOF - tell application "Terminal" - activate - do script "automationmodetool enable-automationmode-without-authentication" - delay 2 - tell application "System Events" - keystroke "${PASSWORD}" - keystroke return - end tell - end tell - delay 5 + /usr/bin/expect <<EOF + spawn automationmodetool enable-automationmode-without-authentication + expect "password" + send "${PASSWORD}\r" + expect { + "succeeded." { puts "Automation mode enabled successfully"; exit 0 } + eof + } EOF } && break @@ -77,9 +74,15 @@ EOF done echo "Getting terminal windows" -term_service=$(launchctl list | grep -i terminal | cut -f3) -echo "Close terminal windows: gui/501/${term_service}" -launchctl bootout gui/501/${term_service} && sleep 5 +launchctl_output=$(launchctl list | grep -i terminal || true) + +if [ -n "$launchctl_output" ]; then + term_service=$(echo "$launchctl_output" | cut -f3) + echo "Close terminal windows: gui/501/${term_service}" + launchctl bootout gui/501/${term_service} && sleep 5 +else + echo "No open terminal windows found." +fi # test enable-automationmode-without-authentication if [[ ! "$(automationmodetool)" =~ "DOES NOT REQUIRE" ]]; then diff --git a/images/macos/scripts/build/configure-system.sh b/images/macos/scripts/build/configure-system.sh index 344ae300dc8a..23fd09f9e1ad 100644 --- a/images/macos/scripts/build/configure-system.sh +++ b/images/macos/scripts/build/configure-system.sh @@ -50,3 +50,6 @@ sudo rm -f /usr/local/bin/invoke_tests # Clean Homebrew downloads sudo rm -rf /Users/$USER/Library/Caches/Homebrew/downloads/* + +# Uninstall expect used in configure-machine.sh +brew uninstall expect diff --git a/images/macos/templates/macOS-13.anka.pkr.hcl b/images/macos/templates/macOS-13.anka.pkr.hcl index 9725cf435631..352b1d896437 100644 --- a/images/macos/templates/macOS-13.anka.pkr.hcl +++ b/images/macos/templates/macOS-13.anka.pkr.hcl @@ -178,6 +178,7 @@ build { execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}" scripts = [ "${path.root}/../scripts/build/configure-tccdb-macos.sh", + "${path.root}/../scripts/build/configure-autologin.sh", "${path.root}/../scripts/build/configure-auto-updates.sh", "${path.root}/../scripts/build/configure-ntpconf.sh", "${path.root}/../scripts/build/configure-shell.sh" diff --git a/images/macos/templates/macOS-13.arm64.anka.pkr.hcl b/images/macos/templates/macOS-13.arm64.anka.pkr.hcl index a5aa126e90c0..238ab132ee94 100644 --- a/images/macos/templates/macOS-13.arm64.anka.pkr.hcl +++ b/images/macos/templates/macOS-13.arm64.anka.pkr.hcl @@ -179,6 +179,7 @@ build { execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}" scripts = [ "${path.root}/../scripts/build/configure-tccdb-macos.sh", + "${path.root}/../scripts/build/configure-autologin.sh", "${path.root}/../scripts/build/configure-auto-updates.sh", "${path.root}/../scripts/build/configure-ntpconf.sh", "${path.root}/../scripts/build/configure-shell.sh" diff --git a/images/macos/templates/macOS-14.anka.pkr.hcl b/images/macos/templates/macOS-14.anka.pkr.hcl index 752583862ff1..a29cd926baff 100644 --- a/images/macos/templates/macOS-14.anka.pkr.hcl +++ b/images/macos/templates/macOS-14.anka.pkr.hcl @@ -178,6 +178,7 @@ build { execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}" scripts = [ "${path.root}/../scripts/build/configure-tccdb-macos.sh", + "${path.root}/../scripts/build/configure-autologin.sh", "${path.root}/../scripts/build/configure-auto-updates.sh", "${path.root}/../scripts/build/configure-ntpconf.sh", "${path.root}/../scripts/build/configure-shell.sh" diff --git a/images/macos/templates/macOS-14.arm64.anka.pkr.hcl b/images/macos/templates/macOS-14.arm64.anka.pkr.hcl index 5a1a09274f51..be90e1015288 100644 --- a/images/macos/templates/macOS-14.arm64.anka.pkr.hcl +++ b/images/macos/templates/macOS-14.arm64.anka.pkr.hcl @@ -180,6 +180,7 @@ build { execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}" scripts = [ "${path.root}/../scripts/build/configure-tccdb-macos.sh", + "${path.root}/../scripts/build/configure-autologin.sh", "${path.root}/../scripts/build/configure-auto-updates.sh", "${path.root}/../scripts/build/configure-ntpconf.sh", "${path.root}/../scripts/build/configure-shell.sh" diff --git a/images/macos/templates/macOS-15.anka.pkr.hcl b/images/macos/templates/macOS-15.anka.pkr.hcl index 1bd3aefb3984..6e93eccf210f 100644 --- a/images/macos/templates/macOS-15.anka.pkr.hcl +++ b/images/macos/templates/macOS-15.anka.pkr.hcl @@ -174,6 +174,7 @@ build { execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}" scripts = [ "${path.root}/../scripts/build/configure-tccdb-macos.sh", + "${path.root}/../scripts/build/configure-autologin.sh", "${path.root}/../scripts/build/configure-auto-updates.sh", "${path.root}/../scripts/build/configure-ntpconf.sh", "${path.root}/../scripts/build/configure-shell.sh" @@ -201,6 +202,7 @@ build { execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" pause_before = "30s" scripts = [ + "${path.root}/../scripts/build/configure-windows.sh", "${path.root}/../scripts/build/install-powershell.sh", "${path.root}/../scripts/build/install-dotnet.sh", "${path.root}/../scripts/build/install-python.sh", diff --git a/images/macos/templates/macOS-15.arm64.anka.pkr.hcl b/images/macos/templates/macOS-15.arm64.anka.pkr.hcl index 50b34dccab5c..8e72eace0760 100644 --- a/images/macos/templates/macOS-15.arm64.anka.pkr.hcl +++ b/images/macos/templates/macOS-15.arm64.anka.pkr.hcl @@ -176,6 +176,7 @@ build { execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}" scripts = [ "${path.root}/../scripts/build/configure-tccdb-macos.sh", + "${path.root}/../scripts/build/configure-autologin.sh", "${path.root}/../scripts/build/configure-auto-updates.sh", "${path.root}/../scripts/build/configure-ntpconf.sh", "${path.root}/../scripts/build/configure-shell.sh" From 2e94c1de506c7cabfeadd09752b1ea5ca723e6b4 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 2 Oct 2024 17:20:51 +0000 Subject: [PATCH 3160/3485] Updating readme file for win22 version 20240929.1.1 (#10704) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/windows/Windows2022-Readme.md | 34 ++++++++++++++-------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/images/windows/Windows2022-Readme.md b/images/windows/Windows2022-Readme.md index 3e80ef8c4905..1e2a46001d13 100644 --- a/images/windows/Windows2022-Readme.md +++ b/images/windows/Windows2022-Readme.md @@ -1,6 +1,6 @@ # Windows Server 2022 - OS Version: 10.0.20348 Build 2700 -- Image Version: 20240922.1.0 +- Image Version: 20240929.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -8,14 +8,14 @@ ## Installed Software ### Language and Runtime -- Bash 5.2.32(1)-release +- Bash 5.2.37(1)-release - Go 1.21.13 - Julia 1.10.5 - Kotlin 2.0.20 - LLVM 18.1.8 - Node 18.20.3 - Perl 5.32.1 -- PHP 8.3.11 +- PHP 8.3.12 - Python 3.9.13 - Ruby 3.0.7p220 @@ -29,7 +29,7 @@ - pip 24.2 (python 3.9) - Pipx 1.7.1 - RubyGems 3.2.33 -- Vcpkg (build from commit 98aa63962) +- Vcpkg (build from commit 76d153790) - Yarn 1.22.22 #### Environment variables @@ -50,15 +50,15 @@ - azcopy 10.26.0 - Bazel 7.3.1 - Bazelisk 1.21.0 -- Bicep 0.30.3 +- Bicep 0.30.23 - Cabal 3.12.1.0 -- CMake 3.30.3 +- CMake 3.30.4 - CodeQL Action Bundle 2.19.0 - Docker 26.1.3 - Docker Compose v2 2.27.1 - Docker-wincred 0.8.2 - ghc 9.10.1 -- Git 2.46.1.windows.1 +- Git 2.46.2.windows.1 - Git LFS 3.5.1 - ImageMagick 7.1.1-38 - InnoSetup 6.3.3 @@ -72,8 +72,8 @@ - Newman 6.2.1 - NSIS 3.10 - OpenSSL 1.1.1w -- Packer 1.11.0 -- Pulumi 3.133.0 +- Packer 1.11.2 +- Pulumi 3.134.1 - R 4.4.1 - Service Fabric SDK 9.1.1436.9590 - Stack 3.1.1 @@ -86,9 +86,9 @@ - zstd 1.5.6 ### CLI Tools -- Alibaba Cloud CLI 3.0.223 -- AWS CLI 2.17.56 -- AWS SAM CLI 1.124.0 +- Alibaba Cloud CLI 3.0.224 +- AWS CLI 2.17.61 +- AWS SAM CLI 1.125.0 - AWS Session Manager CLI 1.2.650.0 - Azure CLI 2.64.0 - Azure DevOps CLI extension 1.0.1 @@ -109,10 +109,10 @@ - Rustfmt 1.7.1 ### Browsers and Drivers -- Google Chrome 129.0.6668.59 -- Chrome Driver 129.0.6668.58 -- Microsoft Edge 129.0.2792.52 -- Microsoft Edge Driver 129.0.2792.52 +- Google Chrome 129.0.6668.71 +- Chrome Driver 129.0.6668.70 +- Microsoft Edge 129.0.2792.65 +- Microsoft Edge Driver 129.0.2792.65 - Mozilla Firefox 130.0.1 - Gecko Driver 0.35.0 - IE Driver 4.14.0.0 @@ -499,7 +499,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - AzureRM: 2.1.0 (Default), 6.13.1 - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.661 +- AWSPowershell: 4.1.666 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.10 - Microsoft.Graph: 2.23.0 From 7256777a6b5de3e1ddaecf82acedc749b78169b2 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2024 05:34:28 +0000 Subject: [PATCH 3161/3485] Updating readme file for macos-13 version 20240930.147 (#10707) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-13-Readme.md | 45 +++++++++++++++++---------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/images/macos/macos-13-Readme.md b/images/macos/macos-13-Readme.md index e1784167f109..689302cf4a51 100644 --- a/images/macos/macos-13-Readme.md +++ b/images/macos/macos-13-Readme.md @@ -1,18 +1,19 @@ | Announcements | |-| +| [[macOS] Support policy changes; Xcode 14 and 16 will be removed from macOS 14 on October 28](https://github.com/actions/runner-images/issues/10703) | +| [macOS 15 (Sequoia) is now available as a public beta in GitHub Actions](https://github.com/actions/runner-images/issues/10686) | | [[Macos 13 and 14] Android NDK versions <=25 will be removed from images on October 07,2024](https://github.com/actions/runner-images/issues/10614) | | [[Macos 13 and 14] Go version 1.20.0 will be removed on October 07,2024.](https://github.com/actions/runner-images/issues/10612) | -| [[macOS] Xcodes visionOS platform will be removed from macOS-14 images on September 23, 2024](https://github.com/actions/runner-images/issues/10559) | *** # macOS 13 - OS Version: macOS 13.7 (22H123) - Kernel Version: Darwin 22.6.0 -- Image Version: 20240923.120 +- Image Version: 20240930.147 ## Installed Software ### Language and Runtime -- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.410, 8.0.101, 8.0.204, 8.0.303, 8.0.401 +- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.410, 8.0.101, 8.0.204, 8.0.303, 8.0.402 - Bash 3.2.57(1)-release - Clang/LLVM 14.0.0 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` @@ -26,28 +27,28 @@ - Mono 6.12.0.188 - Node.js 20.17.0 - Perl 5.38.2 -- PHP 8.3.11 +- PHP 8.3.12 - Python3 3.12.6 - Ruby 3.0.7p220 ### Package Management -- Bundler 2.5.19 +- Bundler 2.5.20 - Carthage 0.40.0 - CocoaPods 1.15.2 - Composer 2.7.9 -- Homebrew 4.3.23 +- Homebrew 4.3.24 - NPM 10.8.2 - NuGet 6.3.1.1 - Pip3 24.2 (python 3.12) - Pipx 1.7.1 -- RubyGems 3.5.19 -- Vcpkg 2024 (build from commit 98aa63962) +- RubyGems 3.5.20 +- Vcpkg 2024 (build from commit 76d153790) - Yarn 1.22.22 ### Project Management - Apache Ant 1.10.15 - Apache Maven 3.9.9 -- Gradle 8.10.1 +- Gradle 8.10.2 ### Utilities - 7-Zip 17.05 @@ -57,7 +58,7 @@ - bazelisk 1.21.0 - bsdtar 3.5.3 - available by 'tar' alias - Curl 8.10.1 -- Git 2.46.1 +- Git 2.46.2 - Git LFS 3.5.1 - GitHub CLI 2.57.0 - GNU Tar 1.35 - available by 'gtar' alias @@ -65,21 +66,21 @@ - gpg (GnuPG) 2.4.5 - jq 1.7.1 - OpenSSL 1.1.1w 11 Sep 2023 -- Packer 1.9.4 +- Packer 1.11.2 - pkg-config 0.29.2 - yq 4.44.3 - zstd 1.5.6 ### Tools -- AWS CLI 2.17.56 -- AWS SAM CLI 1.124.0 +- AWS CLI 2.17.61 +- AWS SAM CLI 1.125.0 - AWS Session Manager CLI 1.2.650.0 - Azure CLI 2.64.0 - Azure CLI (azure-devops) 1.0.1 -- Bicep CLI 0.30.3 -- Cmake 3.30.3 +- Bicep CLI 0.30.23 +- Cmake 3.30.4 - CodeQL Action Bundle 2.19.0 -- Fastlane 2.222.0 +- Fastlane 2.223.1 - SwiftFormat 0.54.5 - Xcbeautify 2.11.0 - Xcode Command Line Tools 14.3.1.0.1.1683849156 @@ -91,11 +92,11 @@ ### Browsers - Safari 18.0 (18619.1.26.111.10) - SafariDriver 18.0 (18619.1.26.111.10) -- Google Chrome 129.0.6668.59 -- Google Chrome for Testing 129.0.6668.58 -- ChromeDriver 129.0.6668.58 -- Microsoft Edge 129.0.2792.52 -- Microsoft Edge WebDriver 129.0.2792.46 +- Google Chrome 129.0.6668.71 +- Google Chrome for Testing 129.0.6668.70 +- ChromeDriver 129.0.6668.70 +- Microsoft Edge 129.0.2792.65 +- Microsoft Edge WebDriver 129.0.2792.65 - Mozilla Firefox 130.0.1 - geckodriver 0.35.0 - Selenium server 4.25.0 @@ -210,8 +211,8 @@ | Simulator - watchOS 9.4 | watchsimulator9.4 | 14.3.1 | | Simulator - watchOS 10.0 | watchsimulator10.0 | 15.0.1 | | Simulator - watchOS 10.2 | watchsimulator10.2 | 15.1, 15.2 | -| Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | | visionOS 1.0 | xros1.0 | 15.2 | +| Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | From 768c45609155f3d115ea5c2c23ce129af4d17a9e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2024 05:55:59 +0000 Subject: [PATCH 3162/3485] Updating readme file for macos-14 version 20240930.130 (#10708) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-14-Readme.md | 47 +++++++++++++++++---------------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/images/macos/macos-14-Readme.md b/images/macos/macos-14-Readme.md index 1103809358fa..8d8c3fc30433 100644 --- a/images/macos/macos-14-Readme.md +++ b/images/macos/macos-14-Readme.md @@ -1,18 +1,19 @@ | Announcements | |-| +| [[macOS] Support policy changes; Xcode 14 and 16 will be removed from macOS 14 on October 28](https://github.com/actions/runner-images/issues/10703) | +| [macOS 15 (Sequoia) is now available as a public beta in GitHub Actions](https://github.com/actions/runner-images/issues/10686) | | [[Macos 13 and 14] Android NDK versions <=25 will be removed from images on October 07,2024](https://github.com/actions/runner-images/issues/10614) | | [[Macos 13 and 14] Go version 1.20.0 will be removed on October 07,2024.](https://github.com/actions/runner-images/issues/10612) | -| [[macOS] Xcodes visionOS platform will be removed from macOS-14 images on September 23, 2024](https://github.com/actions/runner-images/issues/10559) | *** # macOS 14 - OS Version: macOS 14.7 (23H124) - Kernel Version: Darwin 23.6.0 -- Image Version: 20240923.101 +- Image Version: 20240930.130 ## Installed Software ### Language and Runtime -- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.410, 8.0.101, 8.0.204, 8.0.303, 8.0.401 +- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.410, 8.0.101, 8.0.204, 8.0.303, 8.0.402 - Bash 3.2.57(1)-release - Clang/LLVM 14.0.3 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` @@ -26,27 +27,27 @@ - Mono 6.12.0.188 - Node.js 20.17.0 - Perl 5.38.2 -- PHP 8.3.11 +- PHP 8.3.12 - Python3 3.12.6 - Ruby 3.0.7p220 ### Package Management -- Bundler 2.5.19 +- Bundler 2.5.20 - Carthage 0.40.0 - CocoaPods 1.15.2 - Composer 2.7.9 -- Homebrew 4.3.23 +- Homebrew 4.3.24 - NPM 10.8.2 - NuGet 6.3.1.1 - Pip3 24.2 (python 3.12) - Pipx 1.7.1 -- RubyGems 3.5.19 +- RubyGems 3.5.20 - Yarn 1.22.22 ### Project Management - Apache Ant 1.10.15 - Apache Maven 3.9.9 -- Gradle 8.10.1 +- Gradle 8.10.2 ### Utilities - 7-Zip 17.05 @@ -56,7 +57,7 @@ - bazelisk 1.21.0 - bsdtar 3.5.3 - available by 'tar' alias - Curl 8.10.1 -- Git 2.46.1 +- Git 2.46.2 - Git LFS 3.5.1 - GitHub CLI 2.57.0 - GNU Tar 1.35 - available by 'gtar' alias @@ -64,21 +65,21 @@ - gpg (GnuPG) 2.4.5 - jq 1.7.1 - OpenSSL 1.1.1w 11 Sep 2023 -- Packer 1.9.4 +- Packer 1.11.2 - pkg-config 0.29.2 - yq 4.44.3 - zstd 1.5.6 ### Tools -- AWS CLI 2.17.56 -- AWS SAM CLI 1.124.0 +- AWS CLI 2.17.61 +- AWS SAM CLI 1.125.0 - AWS Session Manager CLI 1.2.650.0 - Azure CLI 2.64.0 - Azure CLI (azure-devops) 1.0.1 -- Bicep CLI 0.30.3 -- Cmake 3.30.3 +- Bicep CLI 0.30.23 +- Cmake 3.30.4 - CodeQL Action Bundle 2.19.0 -- Fastlane 2.222.0 +- Fastlane 2.223.1 - SwiftFormat 0.54.5 - Xcbeautify 2.11.0 - Xcode Command Line Tools 16.0.0.0.1.1724870825 @@ -90,11 +91,11 @@ ### Browsers - Safari 18.0 (19619.1.26.111.10) - SafariDriver 18.0 (19619.1.26.111.10) -- Google Chrome 129.0.6668.59 -- Google Chrome for Testing 129.0.6668.58 -- ChromeDriver 129.0.6668.58 -- Microsoft Edge 129.0.2792.52 -- Microsoft Edge WebDriver 129.0.2792.46 +- Google Chrome 129.0.6668.71 +- Google Chrome for Testing 129.0.6668.70 +- ChromeDriver 129.0.6668.70 +- Microsoft Edge 129.0.2792.65 +- Microsoft Edge WebDriver 129.0.2792.65 - Mozilla Firefox 130.0.1 - geckodriver 0.35.0 - Selenium server 4.25.0 @@ -222,14 +223,14 @@ | Simulator - watchOS 11.1 | watchsimulator11.1 | 16.1 | | visionOS 1.0 | xros1.0 | 15.2 | | Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | -| visionOS 1.1 | xros1.1 | 15.3 | | Simulator - visionOS 1.1 | xrsimulator1.1 | 15.3 | -| Simulator - visionOS 1.2 | xrsimulator1.2 | 15.4 | +| visionOS 1.1 | xros1.1 | 15.3 | | visionOS 1.2 | xros1.2 | 15.4 | +| Simulator - visionOS 1.2 | xrsimulator1.2 | 15.4 | | Simulator - visionOS 2.0 | xrsimulator2.0 | 16.0 | | visionOS 2.0 | xros2.0 | 16.0 | -| visionOS 2.1 | xros2.1 | 16.1 | | Simulator - visionOS 2.1 | xrsimulator2.1 | 16.1 | +| visionOS 2.1 | xros2.1 | 16.1 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | From 7bf4ada29d08793066edab9bd6a16dc3c5ffff27 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2024 06:42:12 +0000 Subject: [PATCH 3163/3485] Updating readme file for macos-13-arm64 version 20240930.145 (#10706) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-13-arm64-Readme.md | 35 ++++++++++++++------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/images/macos/macos-13-arm64-Readme.md b/images/macos/macos-13-arm64-Readme.md index 84cf7b3645e8..0dd3730d7236 100644 --- a/images/macos/macos-13-arm64-Readme.md +++ b/images/macos/macos-13-arm64-Readme.md @@ -1,18 +1,19 @@ | Announcements | |-| +| [[macOS] Support policy changes; Xcode 14 and 16 will be removed from macOS 14 on October 28](https://github.com/actions/runner-images/issues/10703) | +| [macOS 15 (Sequoia) is now available as a public beta in GitHub Actions](https://github.com/actions/runner-images/issues/10686) | | [[Macos 13 and 14] Android NDK versions <=25 will be removed from images on October 07,2024](https://github.com/actions/runner-images/issues/10614) | | [[Macos 13 and 14] Go version 1.20.0 will be removed on October 07,2024.](https://github.com/actions/runner-images/issues/10612) | -| [[macOS] Xcodes visionOS platform will be removed from macOS-14 images on September 23, 2024](https://github.com/actions/runner-images/issues/10559) | *** # macOS 13 - OS Version: macOS 13.7 (22H123) - Kernel Version: Darwin 22.6.0 -- Image Version: 20240923.116 +- Image Version: 20240930.145 ## Installed Software ### Language and Runtime -- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.410, 8.0.101, 8.0.204, 8.0.303, 8.0.401 +- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.410, 8.0.101, 8.0.204, 8.0.303, 8.0.402 - Bash 3.2.57(1)-release - Clang/LLVM 14.0.0 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` @@ -30,21 +31,21 @@ - Ruby 3.0.7p220 ### Package Management -- Bundler 2.5.19 +- Bundler 2.5.20 - Carthage 0.40.0 - CocoaPods 1.15.2 -- Homebrew 4.3.23 +- Homebrew 4.3.24 - NPM 10.8.2 - NuGet 6.3.1.1 - Pip3 24.2 (python 3.12) - Pipx 1.7.1 -- RubyGems 3.5.19 +- RubyGems 3.5.20 - Yarn 1.22.22 ### Project Management - Apache Ant 1.10.15 - Apache Maven 3.9.9 -- Gradle 8.10.1 +- Gradle 8.10.2 ### Utilities - 7-Zip 17.05 @@ -54,7 +55,7 @@ - bazelisk 1.21.0 - bsdtar 3.5.3 - available by 'tar' alias - Curl 8.7.1 -- Git 2.46.1 +- Git 2.46.2 - Git LFS 3.5.1 - GitHub CLI 2.57.0 - GNU Tar 1.35 - available by 'gtar' alias @@ -62,21 +63,21 @@ - gpg (GnuPG) 2.4.5 - jq 1.7.1 - OpenSSL 1.1.1w 11 Sep 2023 -- Packer 1.9.4 +- Packer 1.11.2 - pkg-config 0.29.2 - yq 4.44.3 - zstd 1.5.6 ### Tools -- AWS CLI 2.17.56 -- AWS SAM CLI 1.124.0 +- AWS CLI 2.17.61 +- AWS SAM CLI 1.125.0 - AWS Session Manager CLI 1.2.650.0 - Azure CLI 2.64.0 - Azure CLI (azure-devops) 1.0.1 -- Bicep CLI 0.30.3 -- Cmake 3.30.3 +- Bicep CLI 0.30.23 +- Cmake 3.30.4 - CodeQL Action Bundle 2.19.0 -- Fastlane 2.222.0 +- Fastlane 2.223.1 - SwiftFormat 0.54.5 - Xcbeautify 2.11.0 - Xcode Command Line Tools 14.3.1.0.1.1683849156 @@ -87,9 +88,9 @@ ### Browsers - Safari 18.0 (18619.1.26.111.10) - SafariDriver 18.0 (18619.1.26.111.10) -- Google Chrome 129.0.6668.59 -- Google Chrome for Testing 129.0.6668.58 -- ChromeDriver 129.0.6668.58 +- Google Chrome 129.0.6668.71 +- Google Chrome for Testing 129.0.6668.70 +- ChromeDriver 129.0.6668.70 - Selenium server 4.25.0 #### Environment variables From 6d85c4873ea9bac5fe979fe19d59d0b8c36ad06b Mon Sep 17 00:00:00 2001 From: susmitamane <susmitamane@github.com> Date: Thu, 3 Oct 2024 19:13:47 +0530 Subject: [PATCH 3164/3485] [macOS] Deprecating go 1.20 & NDK 24,25 from macos 13,14 images. (#10719) Co-authored-by: Susmita Mane <susmitamane@Susmitas-MacBook-Pro.local> --- images/macos/toolsets/toolset-13.json | 4 +--- images/macos/toolsets/toolset-14.json | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/images/macos/toolsets/toolset-13.json b/images/macos/toolsets/toolset-13.json index fbaa34ac7880..ea8e8ab37917 100644 --- a/images/macos/toolsets/toolset-13.json +++ b/images/macos/toolsets/toolset-13.json @@ -47,7 +47,7 @@ "ndk": { "default": "26", "versions": [ - "24", "25", "26", "27" + "26", "27" ] } }, @@ -185,7 +185,6 @@ "x64": { "variable_template" : "GOROOT_{0}_{1}_X64", "versions": [ - "1.20.*", "1.21.*", "1.22.*", "1.23.*" @@ -194,7 +193,6 @@ "arm64": { "variable_template" : "GOROOT_{0}_{1}_ARM64", "versions": [ - "1.20.*", "1.21.*", "1.22.*", "1.23.*" diff --git a/images/macos/toolsets/toolset-14.json b/images/macos/toolsets/toolset-14.json index a6c8139c36e9..0f66b0837cdd 100644 --- a/images/macos/toolsets/toolset-14.json +++ b/images/macos/toolsets/toolset-14.json @@ -51,7 +51,7 @@ "ndk": { "default": "26", "versions": [ - "24", "25", "26", "27" + "26", "27" ] } }, @@ -172,7 +172,6 @@ "x64": { "variable_template" : "GOROOT_{0}_{1}_X64", "versions": [ - "1.20.*", "1.21.*", "1.22.*", "1.23.*" @@ -181,7 +180,6 @@ "arm64": { "variable_template" : "GOROOT_{0}_{1}_ARM64", "versions": [ - "1.20.*", "1.21.*", "1.22.*", "1.23.*" From 59b3801509ac2de1d1afb7b2f3e8c2bb13553cc7 Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Mon, 7 Oct 2024 16:56:32 +0200 Subject: [PATCH 3165/3485] [doc] Mark macOS-12 as deprecated (#10732) --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 70acff251e85..cdc3c3f41887 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ To build a VM machine from this repo's source, see the [instructions](docs/creat | macOS 14 Arm64 |`macos-latest`, `macos-14`, `macos-latest-xlarge` or `macos-14-xlarge`| [macOS-14-arm64] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fijunaidm%2F0b5459bbe18604a639e1d2f7accd204f%2Fraw%2Fmacos-14-arm64.json) | | macOS 13 | `macos-13` or `macos-13-large` | [macOS-13] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fijunaidm%2F0b5459bbe18604a639e1d2f7accd204f%2Fraw%2Fmacos-13.json) | | macOS 13 Arm64 | `macos-13-xlarge` | [macOS-13-arm64] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fijunaidm%2F0b5459bbe18604a639e1d2f7accd204f%2Fraw%2Fmacos-13-arm64.json) | -| macOS 12 | `macos-12` or `macos-12-large`| [macOS-12] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fijunaidm%2F0b5459bbe18604a639e1d2f7accd204f%2Fraw%2Fmacos-12.json) | +| macOS 12 <sup>deprecated</sup> | `macos-12` or `macos-12-large`| [macOS-12] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fijunaidm%2F0b5459bbe18604a639e1d2f7accd204f%2Fraw%2Fmacos-12.json) | | Windows Server 2022 | `windows-latest` or `windows-2022` | [windows-2022] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fijunaidm%2F0b5459bbe18604a639e1d2f7accd204f%2Fraw%2Fwin22.json) | | Windows Server 2019 | `windows-2019` | [windows-2019] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fijunaidm%2F0b5459bbe18604a639e1d2f7accd204f%2Fraw%2Fwin19.json) | @@ -83,7 +83,7 @@ latest 2 versions of an OS. GitHub Actions and Azure DevOps use the `-latest` YAML label (ex: `ubuntu-latest`, `windows-latest`, and `macos-latest`). These labels point towards the newest stable OS version available. -The `-latest` migration process is gradual and happens over 1-2 months in order to allow customers to adapt their workflows to the newest OS version. During this process, any workflow using the `-latest` label, may see changes in the OS version in their workflows or pipelines. To avoid unwanted migration, users can specify a specific OS version in the yaml file (ex: macos-12, windows-2022, ubuntu-22.04). +The `-latest` migration process is gradual and happens over 1-2 months in order to allow customers to adapt their workflows to the newest OS version. During this process, any workflow using the `-latest` label, may see changes in the OS version in their workflows or pipelines. To avoid unwanted migration, users can specify a specific OS version in the yaml file (ex: macos-14, windows-2022, ubuntu-22.04). ## Image Releases From 2889cfe878d0bdbd38055c2055e23ce2c9934fc0 Mon Sep 17 00:00:00 2001 From: sarathrajsrinivasan <159180023+sarathrajsrinivasan@users.noreply.github.com> Date: Tue, 8 Oct 2024 01:25:07 -0700 Subject: [PATCH 3166/3485] [macOS] Add tcl-tk to macOS13 and macOS14 (#10735) --- images/macos/scripts/docs-gen/Generate-SoftwareReport.ps1 | 4 +++- images/macos/toolsets/toolset-13.json | 1 + images/macos/toolsets/toolset-14.json | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/images/macos/scripts/docs-gen/Generate-SoftwareReport.ps1 b/images/macos/scripts/docs-gen/Generate-SoftwareReport.ps1 index 149793732747..a7a8d6bd0766 100644 --- a/images/macos/scripts/docs-gen/Generate-SoftwareReport.ps1 +++ b/images/macos/scripts/docs-gen/Generate-SoftwareReport.ps1 @@ -293,9 +293,11 @@ if ($os.IsMonterey) { $miscellaneous.AddToolVersion("Zlib", $(Get-ZlibVersion)) } -if ($os.IsSonomaX64 -or $os.IsVenturaX64 -or $os.IsSequoiaX64) { +if ($os.IsSonoma -or $os.IsVentura) { $miscellaneous = $installedSoftware.AddHeader("Miscellaneous") + $miscellaneous.AddToolVersion("Tcl/Tk", $(Get-TclTkVersion)) } + if ($os.IsMonterey -or $os.IsSonomaX64 -or $os.IsVenturaX64) { Write-Host "Adding environment variables for parallels" diff --git a/images/macos/toolsets/toolset-13.json b/images/macos/toolsets/toolset-13.json index ea8e8ab37917..d5e13ee944f5 100644 --- a/images/macos/toolsets/toolset-13.json +++ b/images/macos/toolsets/toolset-13.json @@ -74,6 +74,7 @@ "perl", "pkg-config", "swiftformat", + "tcl-tk", "zstd", "gmp", "yq", diff --git a/images/macos/toolsets/toolset-14.json b/images/macos/toolsets/toolset-14.json index 0f66b0837cdd..3ed229dce394 100644 --- a/images/macos/toolsets/toolset-14.json +++ b/images/macos/toolsets/toolset-14.json @@ -79,6 +79,7 @@ "perl", "pkg-config", "swiftformat", + "tcl-tk", "zstd", "gmp", "yq", From 1229dfcf19083b07d59ef1ea661c0e4720a3b90a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 9 Oct 2024 09:59:05 +0000 Subject: [PATCH 3167/3485] Updating readme file for macos-15 version 20241007.173 (#10739) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-15-Readme.md | 41 +++++++++++++++++---------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/images/macos/macos-15-Readme.md b/images/macos/macos-15-Readme.md index 4a7d290e26f4..a342aae0469b 100644 --- a/images/macos/macos-15-Readme.md +++ b/images/macos/macos-15-Readme.md @@ -1,5 +1,6 @@ | Announcements | |-| +| [[macOS] The macOS 12 Actions runner image will begin deprecation on 10/7/24 and will be fully unsupported by 12/3/24 for GitHub and ADO](https://github.com/actions/runner-images/issues/10721) | | [[macOS] Support policy changes; Xcode 14 and 16 will be removed from macOS 14 on October 28](https://github.com/actions/runner-images/issues/10703) | | [macOS 15 (Sequoia) is now available as a public beta in GitHub Actions](https://github.com/actions/runner-images/issues/10686) | | [[Macos 13 and 14] Android NDK versions <=25 will be removed from images on October 07,2024](https://github.com/actions/runner-images/issues/10614) | @@ -8,7 +9,7 @@ # macOS 15 - OS Version: macOS 15.0 (24A335) - Kernel Version: Darwin 24.0.0 -- Image Version: 20240930.153 +- Image Version: 20241007.173 ## Installed Software @@ -27,19 +28,19 @@ - Node.js 22.9.0 - Perl 5.38.2 - PHP 8.3.12 -- Python3 3.12.6 +- Python3 3.12.7 - Ruby 3.3.5 ### Package Management -- Bundler 2.5.20 +- Bundler 2.5.21 - Carthage 0.40.0 - CocoaPods 1.15.2 -- Composer 2.7.9 -- Homebrew 4.3.24 +- Composer 2.8.1 +- Homebrew 4.4.0 - NPM 10.8.3 - Pip3 24.2 (python 3.12) - Pipx 1.7.1 -- RubyGems 3.5.20 +- RubyGems 3.5.21 - Yarn 1.22.22 ### Project Management @@ -51,13 +52,13 @@ - 7-Zip 17.05 - aria2 1.37.0 - azcopy 10.26.0 -- bazel 7.3.1 +- bazel 7.3.2 - bazelisk 1.22.0 - bsdtar 3.5.3 - available by 'tar' alias - Curl 8.10.1 - Git 2.46.2 - Git LFS 3.5.1 -- GitHub CLI 2.57.0 +- GitHub CLI 2.58.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.24.5 - gpg (GnuPG) 2.4.5 @@ -69,7 +70,7 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.17.61 +- AWS CLI 2.18.0 - AWS SAM CLI 1.125.0 - AWS Session Manager CLI 1.2.650.0 - Azure CLI 2.64.0 @@ -77,7 +78,7 @@ - Bicep CLI 0.30.23 - Cmake 3.30.4 - CodeQL Action Bundle 2.19.0 -- Fastlane 2.223.1 +- Fastlane 2.224.0 - SwiftFormat 0.54.5 - Xcbeautify 2.11.0 - Xcode Command Line Tools 16.0.0.0.1.1724870825 @@ -89,12 +90,12 @@ ### Browsers - Safari 18.0 (20619.1.26.31.6) - SafariDriver 18.0 (20619.1.26.31.6) -- Google Chrome 129.0.6668.71 -- Google Chrome for Testing 129.0.6668.70 -- ChromeDriver 129.0.6668.70 -- Microsoft Edge 129.0.2792.65 -- Microsoft Edge WebDriver 129.0.2792.65 -- Mozilla Firefox 130.0.1 +- Google Chrome 129.0.6668.90 +- Google Chrome for Testing 129.0.6668.89 +- ChromeDriver 129.0.6668.89 +- Microsoft Edge 129.0.2792.79 +- Microsoft Edge WebDriver 129.0.2792.82 +- Mozilla Firefox 131.0 - geckodriver 0.35.0 - Selenium server 4.25.0 @@ -122,7 +123,7 @@ - 3.9.20 - 3.10.15 - 3.11.9 -- 3.12.6 +- 3.12.7 #### Node.js - 18.20.4 @@ -130,8 +131,8 @@ #### Go - 1.21.13 -- 1.22.7 -- 1.23.1 +- 1.22.8 +- 1.23.2 ### Rust Tools - Cargo 1.81.0 @@ -194,7 +195,7 @@ ### Android | Package Name | Version | | -------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Emulator | 35.1.21 | +| Android Emulator | 35.2.10 | | Android SDK Platforms | android-35 (rev 1)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1) | | Android SDK Platform-Tools | 35.0.2 | | Android Support Repository | 47.0.0 | From 20de906028ac0650d58d23b899ad03266820f29b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 9 Oct 2024 10:46:52 +0000 Subject: [PATCH 3168/3485] Updating readme file for win19 version 20241006.1.1 (#10745) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/windows/Windows2019-Readme.md | 62 ++++++++++++++-------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/images/windows/Windows2019-Readme.md b/images/windows/Windows2019-Readme.md index 0f69f3156142..102cc032e79d 100644 --- a/images/windows/Windows2019-Readme.md +++ b/images/windows/Windows2019-Readme.md @@ -1,6 +1,6 @@ # Windows Server 2019 - OS Version: 10.0.17763 Build 6293 -- Image Version: 20240922.1.0 +- Image Version: 20241006.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -8,28 +8,28 @@ ## Installed Software ### Language and Runtime -- Bash 5.2.32(1)-release +- Bash 5.2.37(1)-release - Go 1.21.13 - Julia 1.10.5 - Kotlin 2.0.20 - LLVM 18.1.8 - Node 18.20.3 - Perl 5.32.1 -- PHP 8.3.11 +- PHP 8.3.12 - Python 3.7.9 - Ruby 3.0.7p220 ### Package Management - Chocolatey 2.3.0 -- Composer 2.7.9 +- Composer 2.8.1 - Helm 3.16.0 - Miniconda 24.7.1 (pre-installed on the image but not added to PATH) - NPM 10.7.0 -- NuGet 6.11.0.119 +- NuGet 6.11.1.2 - pip 24.0 (python 3.7) - Pipx 1.2.1 - RubyGems 3.2.33 -- Vcpkg (build from commit 98aa63962) +- Vcpkg (build from commit 7adc2e4d4) - Yarn 1.22.22 #### Environment variables @@ -48,19 +48,19 @@ - 7zip 24.08 - aria2 1.37.0 - azcopy 10.26.0 -- Bazel 7.3.1 -- Bazelisk 1.21.0 -- Bicep 0.30.3 +- Bazel 7.3.2 +- Bazelisk 1.22.0 +- Bicep 0.30.23 - Cabal 3.12.1.0 -- CMake 3.30.3 +- CMake 3.30.4 - CodeQL Action Bundle 2.19.0 - Docker 26.1.3 - Docker Compose v2 2.27.1 - Docker-wincred 0.8.2 - ghc 9.10.1 -- Git 2.46.1.windows.1 +- Git 2.46.2.windows.1 - Git LFS 3.5.1 -- Google Cloud CLI 493.0.0 +- Google Cloud CLI 495.0.0 - ImageMagick 7.1.1-38 - InnoSetup 6.3.3 - jq 1.7.1 @@ -73,9 +73,9 @@ - Newman 6.2.1 - NSIS 3.10 - OpenSSL 1.1.1w -- Packer 1.11.0 +- Packer 1.11.2 - Parcel 2.12.0 -- Pulumi 3.133.0 +- Pulumi 3.135.1 - R 4.4.1 - Service Fabric SDK 9.1.1436.9590 - Stack 3.1.1 @@ -88,14 +88,14 @@ - zstd 1.5.6 ### CLI Tools -- Alibaba Cloud CLI 3.0.223 -- AWS CLI 2.17.56 -- AWS SAM CLI 1.124.0 +- Alibaba Cloud CLI 3.0.224 +- AWS CLI 2.18.0 +- AWS SAM CLI 1.125.0 - AWS Session Manager CLI 1.2.650.0 - Azure CLI 2.64.0 - Azure DevOps CLI extension 1.0.1 - Cloud Foundry CLI 8.8.2 -- GitHub CLI 2.57.0 +- GitHub CLI 2.58.0 ### Rust Tools - Cargo 1.81.0 @@ -112,11 +112,11 @@ - Rustfmt 1.7.1 ### Browsers and Drivers -- Google Chrome 129.0.6668.59 -- Chrome Driver 129.0.6668.58 -- Microsoft Edge 129.0.2792.52 -- Microsoft Edge Driver 129.0.2792.52 -- Mozilla Firefox 130.0.1 +- Google Chrome 129.0.6668.90 +- Chrome Driver 129.0.6668.89 +- Microsoft Edge 129.0.2792.79 +- Microsoft Edge Driver 129.0.2792.79 +- Mozilla Firefox 131.0 - Gecko Driver 0.35.0 - IE Driver 4.14.0.0 - Selenium server 4.25.0 @@ -162,7 +162,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Go - 1.20.14 - 1.21.13 -- 1.22.7 +- 1.22.8 #### Node.js - 16.20.2 @@ -175,7 +175,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 3.9.13 - 3.10.11 - 3.11.9 -- 3.12.6 +- 3.12.7 #### PyPy - 2.7.18 [PyPy 7.3.17] @@ -207,7 +207,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### MongoDB | Version | ServiceName | ServiceStatus | ServiceStartType | | -------- | ----------- | ------------- | ---------------- | -| 5.0.28.0 | MongoDB | Stopped | Disabled | +| 5.0.29.0 | MongoDB | Stopped | Disabled | ### Database tools - Azure CosmosDb Emulator 2.14.20.0 @@ -220,7 +220,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Name | Version | ConfigFile | ServiceName | ServiceStatus | ListenPort | | ------ | ------- | ------------------------------------- | ----------- | ------------- | ---------- | | Apache | 2.4.55 | C:\tools\Apache24\conf\httpd.conf | Apache | Stopped | 80 | -| Nginx | 1.27.1 | C:\tools\nginx-1.27.1\conf\nginx.conf | nginx | Stopped | 80 | +| Nginx | 1.27.2 | C:\tools\nginx-1.27.2\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2019 | Name | Version | Path | @@ -487,7 +487,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 10.0.22621.0 ### .NET Core Tools -- .NET Core SDK: 6.0.133, 6.0.203, 6.0.321, 6.0.425, 7.0.120, 7.0.203, 7.0.317, 7.0.410, 8.0.108, 8.0.206, 8.0.304, 8.0.401 +- .NET Core SDK: 6.0.133, 6.0.203, 6.0.321, 6.0.425, 7.0.120, 7.0.203, 7.0.317, 7.0.410, 8.0.108, 8.0.206, 8.0.304, 8.0.402 - .NET Framework: 4.7.2, 4.8 - Microsoft.AspNetCore.App: 6.0.5, 6.0.26, 6.0.33, 7.0.5, 7.0.20, 8.0.6, 8.0.8 - Microsoft.NETCore.App: 6.0.5, 6.0.26, 6.0.33, 7.0.5, 7.0.20, 8.0.6, 8.0.8 @@ -503,10 +503,10 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - AzureRM: 2.1.0 (Default), 6.13.1 - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.661 +- AWSPowershell: 4.1.671 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.10 -- Microsoft.Graph: 2.23.0 +- Microsoft.Graph: 2.24.0 - Pester: 3.4.0, 5.6.1 - PowerShellGet: 1.0.0.1, 2.2.5 - PSScriptAnalyzer: 1.22.0 @@ -523,7 +523,7 @@ All other versions are saved but not installed. | Package Name | Version | | -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 8.0 | -| Android Emulator | 35.1.21 | +| Android Emulator | 35.2.10 | | Android SDK Build-tools | 35.0.0<br>34.0.0<br>33.0.0 33.0.1 33.0.2 33.0.3<br>32.0.0<br>31.0.0<br>30.0.2 | | Android SDK Platforms | android-35 (rev 1)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3) | | Android SDK Platform-Tools | 35.0.2 | From 52279a9048d6acd2e233155173be0b51893f0442 Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Wed, 9 Oct 2024 12:54:34 +0200 Subject: [PATCH 3169/3485] [macOS] Add Xcode symlinks to the Software Report (#10736) --- .../scripts/docs-gen/SoftwareReport.Xcode.psm1 | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/images/macos/scripts/docs-gen/SoftwareReport.Xcode.psm1 b/images/macos/scripts/docs-gen/SoftwareReport.Xcode.psm1 index 3384acb8f12a..b3f918676f41 100644 --- a/images/macos/scripts/docs-gen/SoftwareReport.Xcode.psm1 +++ b/images/macos/scripts/docs-gen/SoftwareReport.Xcode.psm1 @@ -94,12 +94,26 @@ function Build-XcodeTable { $xcodeList = $xcodeInfo.Values | ForEach-Object { $_.VersionInfo } | Sort-Object $sortRules return $xcodeList | ForEach-Object { - $defaultPostfix = If ($_.IsDefault) { " (default)" } else { "" } - $betaPostfix = If ($_.IsStable) { "" } else { " (beta)" } + $defaultPostfix = if ($_.IsDefault) { " (default)" } else { "" } + $betaPostfix = if ($_.IsStable) { "" } else { " (beta)" } + $targetPath = $_.Path + $symlinks = @() + Get-ChildItem -Path "/Applications" | ForEach-Object { + if ($_.LinkType -eq 'SymbolicLink') { + $linkTarget = & readlink $_.FullName + if ($linkTarget -eq $targetPath) { + $symlinks += $_.FullName + } + } + } + if ($null -eq $symlinks) { + $symlinks = @("N/A") + } return [PSCustomObject] @{ "Version" = $_.Version.ToString() + $betaPostfix + $defaultPostfix "Build" = $_.Build "Path" = $_.Path + "Symlinks" = [String]::Join("<br>", $symlinks) } } } From 2cb9b917c52c03083790b2bbef57d35d0b4028e4 Mon Sep 17 00:00:00 2001 From: vidyasagarnimmagaddi <160703874+vidyasagarnimmagaddi@users.noreply.github.com> Date: Wed, 9 Oct 2024 16:43:15 +0530 Subject: [PATCH 3170/3485] [Windows] Fix Visual Studio signature issue for windows 2022 (#10754) --- images/windows/toolsets/toolset-2022.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/windows/toolsets/toolset-2022.json b/images/windows/toolsets/toolset-2022.json index ee58ffe97d5e..1a3f742bd4d8 100644 --- a/images/windows/toolsets/toolset-2022.json +++ b/images/windows/toolsets/toolset-2022.json @@ -177,7 +177,7 @@ "subversion" : "17", "edition" : "Enterprise", "channel": "release", - "signature": "F9A7CF9FBE13BAC767F4781061332DA6E8B4E0EE", + "signature": "C2048FB509F1C37A8C3E9EC6648118458AA01780", "workloads": [ "Component.Dotfuscator", "Component.Linux.CMake", From 3e37de50efd6083c8d51309145fe32902ce4fa02 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 9 Oct 2024 11:36:23 +0000 Subject: [PATCH 3171/3485] Updating readme file for ubuntu20 version 20241006.1.1 (#10738) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2004-Readme.md | 75 +++++++++++++++--------------- 1 file changed, 38 insertions(+), 37 deletions(-) diff --git a/images/ubuntu/Ubuntu2004-Readme.md b/images/ubuntu/Ubuntu2004-Readme.md index 45506cbe74a9..599124e12507 100644 --- a/images/ubuntu/Ubuntu2004-Readme.md +++ b/images/ubuntu/Ubuntu2004-Readme.md @@ -1,12 +1,13 @@ | Announcements | |-| +| [[Ubuntu 24 ] Node.js version 16 will be removed on October 21,2024.](https://github.com/actions/runner-images/issues/10677) | | [Ubuntu-latest workflows will use Ubuntu-24.04 image](https://github.com/actions/runner-images/issues/10636) | | [[Ubuntu 20 and 22] Go version 1.20.0 will be removed on October 14,2024.](https://github.com/actions/runner-images/issues/10607) | *** # Ubuntu 20.04 - OS Version: 20.04.6 LTS - Kernel Version: 5.15.0-1073-azure -- Image Version: 20240922.1.0 +- Image Version: 20241006.1.0 - Systemd version: 245.4-4ubuntu3.24 ## Installed Software @@ -29,12 +30,12 @@ - Perl 5.30.0 - Python 3.8.10 - Ruby 2.7.0p0 -- Swift 6.0 +- Swift 6.0.1 ### Package Management - cpan 1.64 - Helm 3.16.1 -- Homebrew 4.3.23 +- Homebrew 4.4.0 - Miniconda 24.7.1 - Npm 10.7.0 - NuGet 6.6.1.2 @@ -42,7 +43,7 @@ - Pip3 20.0.2 - Pipx 1.7.1 - RubyGems 3.1.2 -- Vcpkg (build from commit 98aa63962) +- Vcpkg (build from commit 7adc2e4d4) - Yarn 1.22.22 #### Environment variables @@ -61,7 +62,7 @@ to accomplish this. ### Project Management - Ant 1.10.7 -- Gradle 8.10.1 +- Gradle 8.10.2 - Lerna 8.1.8 - Maven 3.8.8 - Sbt 1.10.2 @@ -70,23 +71,23 @@ to accomplish this. - Ansible 2.13.13 - apt-fast 1.10.0 - AzCopy 10.26.0 - available by `azcopy` and `azcopy10` aliases -- Bazel 7.3.1 -- Bazelisk 1.21.0 -- Bicep 0.30.3 +- Bazel 7.3.2 +- Bazelisk 1.22.0 +- Bicep 0.30.23 - Buildah 1.22.3 -- CMake 3.30.3 +- CMake 3.30.4 - CodeQL Action Bundle 2.19.0 - Docker Amazon ECR Credential Helper 0.9.0 - Docker Compose v2 2.27.1 - Docker-Buildx 0.17.1 - Docker Client 26.1.3 - Docker Server 26.1.3 -- Fastlane 2.222.0 -- Git 2.46.1 +- Fastlane 2.224.0 +- Git 2.46.2 - Git LFS 3.5.1 - Git-ftp 1.6.0 - Haveged 1.9.1 -- Heroku 9.2.1 +- Heroku 9.3.0 - HHVM (HipHop VM) 4.172.1 - jq 1.6 - Kind 0.24.0 @@ -104,29 +105,29 @@ to accomplish this. - Parcel 2.12.0 - PhantomJS 2.1.1 2.1.1 - Podman 3.4.2 -- Pulumi 3.133.0 +- Pulumi 3.135.1 - R 4.4.1 - Skopeo 1.5.0 - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 -- Terraform 1.9.6 +- Terraform 1.9.7 - yamllint 1.35.1 - yq 4.44.3 - zstd 1.5.6 ### CLI Tools - Alibaba Cloud CLI 3.0.174 -- AWS CLI 2.17.56 +- AWS CLI 2.18.0 - AWS CLI Session Manager Plugin 1.2.650.0 -- AWS SAM CLI 1.124.0 +- AWS SAM CLI 1.125.0 - Azure CLI 2.64.0 - Azure CLI (azure-devops) 1.0.1 -- GitHub CLI 2.57.0 -- Google Cloud CLI 493.0.0 -- Netlify CLI 17.36.2 +- GitHub CLI 2.58.0 +- Google Cloud CLI 495.0.0 +- Netlify CLI 17.36.4 - OpenShift CLI 4.15.19 - ORAS CLI 1.2.0 -- Vercel CLI 37.5.3 +- Vercel CLI 37.6.1 ### Java | Version | Environment Variable | @@ -137,8 +138,8 @@ to accomplish this. | 21.0.4+7 | JAVA_HOME_21_X64 | ### PHP Tools -- PHP: 7.4.33, 8.0.30, 8.1.29, 8.2.23, 8.3.11 -- Composer 2.7.9 +- PHP: 7.4.33, 8.0.30, 8.1.30, 8.2.24, 8.3.12 +- Composer 2.8.1 - PHPUnit 8.5.40 ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. @@ -165,13 +166,13 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.7.1 ### Browsers and Drivers -- Google Chrome 129.0.6668.58 -- ChromeDriver 129.0.6668.58 +- Google Chrome 129.0.6668.89 +- ChromeDriver 129.0.6668.89 - Chromium 129.0.6668.0 -- Microsoft Edge 129.0.2792.52 -- Microsoft Edge WebDriver 129.0.2792.53 +- Microsoft Edge 129.0.2792.79 +- Microsoft Edge WebDriver 129.0.2792.73 - Selenium server 4.25.0 -- Mozilla Firefox 130.0.1 +- Mozilla Firefox 131.0 - Geckodriver 0.35.0 #### Environment variables @@ -183,11 +184,11 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | ### .NET Tools -- .NET Core SDK: 6.0.425, 7.0.410, 8.0.401 +- .NET Core SDK: 6.0.425, 7.0.410, 8.0.402 - nbgv 3.6.143+57d4199a9c ### Databases -- MongoDB 5.0.28 +- MongoDB 5.0.29 - sqlite3 3.31.1 #### PostgreSQL @@ -216,7 +217,7 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Go - 1.20.14 - 1.21.13 -- 1.22.7 +- 1.22.8 #### Node.js - 16.20.2 @@ -229,7 +230,7 @@ Use the following command as a part of your job to start the service: 'sudo syst - 3.9.20 - 3.10.15 - 3.11.10 -- 3.12.6 +- 3.12.7 #### PyPy - 2.7.18 [PyPy 7.3.17] @@ -250,7 +251,7 @@ Use the following command as a part of your job to start the service: 'sudo syst #### PowerShell Modules - Az: 12.1.0 - MarkdownPS: 1.10 -- Microsoft.Graph: 2.23.0 +- Microsoft.Graph: 2.24.0 - Pester: 5.6.1 - PSScriptAnalyzer: 1.22.0 @@ -291,16 +292,16 @@ Use the following command as a part of your job to start the service: 'sudo syst | alpine:3.18 | sha256:3ddf7bf1d408188f9849efbf4f902720ae08f5131bb39013518b918aa056d0de | 2024-09-06 | | alpine:3.19 | sha256:ae65dbf8749a7d4527648ccee1fa3deb6bfcae34cbc30fc67aa45c44dcaa90ee | 2024-09-06 | | debian:10 | sha256:58ce6f1271ae1c8a2006ff7d3e54e9874d839f573d8009c20154ad0f2fb0a225 | 2024-06-13 | -| debian:11 | sha256:8ccc486c29a3ad02ad5af7f1156e2152dff3ba5634eec9be375269ef123457d8 | 2024-09-04 | +| debian:11 | sha256:152b9a5dc2a03f18ddfd88fbe7b1df41bd2b16be9f2df573a373caf46ce78c08 | 2024-09-27 | | debian:9 | sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be | 2022-06-23 | | moby/buildkit:latest | sha256:bc1fe18224dbcb92599139db0c745696c48ba9fd4ac24038d1fa81fdd7dcac27 | 2024-09-10 | | node:16 | sha256:f77a1aef2da8d83e45ec990f45df50f1a286c5fe8bbfb8c6e4246c6389705c0b | 2023-09-07 | | node:16-alpine | sha256:a1f9d027912b58a7c75be7716c97cfbc6d3099f3a97ed84aa490be9dee20e787 | 2023-08-10 | -| node:18 | sha256:ca07c02d13baf021ff5aadb3b48bcd1fcdd454826266ac313ce858676e8c1548 | 2024-07-09 | +| node:18 | sha256:f910225c96b0f77b0149f350a3184568a9ba6cddba2a7c7805cc125a50591605 | 2024-07-09 | | node:18-alpine | sha256:02376a266c84acbf45bd19440e08e48b1c8b98037417334046029ab585de03e2 | 2024-07-09 | -| node:20 | sha256:48db4f6ea21d134be744207225753a1730c4bc1b4cdf836d44511c36bf0e34d7 | 2024-08-21 | -| node:20-alpine | sha256:2d07db07a2df6830718ae2a47db6fedce6745f5bcd174c398f2acdda90a11c03 | 2024-08-21 | -| ubuntu:20.04 | sha256:fa17826afb526a9fc7250e0fbcbfd18d03fe7a54849472f86879d8bf562c629e | 2024-08-13 | +| node:20 | sha256:fffa89e023a3351904c04284029105d9e2ac7020886d683775a298569591e5bb | 2024-10-04 | +| node:20-alpine | sha256:c13b26e7e602ef2f1074aef304ce6e9b7dd284c419b35d89fcf3cc8e44a8def9 | 2024-10-04 | +| ubuntu:20.04 | sha256:6d8d9799fe6ab3221965efac00b4c34a2bcc102c086a58dff9e19a08b913c7ef | 2024-09-18 | ### Installed apt packages | Name | Version | From 948c9e2df6ac33470c1c095febd1df8aa034f57a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 9 Oct 2024 13:51:03 +0000 Subject: [PATCH 3172/3485] Updating readme file for macos-15-arm64 version 20241007.159 (#10737) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-15-arm64-Readme.md | 37 ++++++++++++++------------- 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/images/macos/macos-15-arm64-Readme.md b/images/macos/macos-15-arm64-Readme.md index 91a6b0607762..fc52ccd922ad 100644 --- a/images/macos/macos-15-arm64-Readme.md +++ b/images/macos/macos-15-arm64-Readme.md @@ -1,5 +1,6 @@ | Announcements | |-| +| [[macOS] The macOS 12 Actions runner image will begin deprecation on 10/7/24 and will be fully unsupported by 12/3/24 for GitHub and ADO](https://github.com/actions/runner-images/issues/10721) | | [[macOS] Support policy changes; Xcode 14 and 16 will be removed from macOS 14 on October 28](https://github.com/actions/runner-images/issues/10703) | | [macOS 15 (Sequoia) is now available as a public beta in GitHub Actions](https://github.com/actions/runner-images/issues/10686) | | [[Macos 13 and 14] Android NDK versions <=25 will be removed from images on October 07,2024](https://github.com/actions/runner-images/issues/10614) | @@ -8,7 +9,7 @@ # macOS 15 - OS Version: macOS 15.0 (24A335) - Kernel Version: Darwin 24.0.0 -- Image Version: 20240930.135 +- Image Version: 20241007.159 ## Installed Software @@ -26,18 +27,18 @@ - Kotlin 2.0.20-release-360 - Node.js 22.9.0 - Perl 5.38.2 -- Python3 3.12.6 +- Python3 3.12.7 - Ruby 3.3.5 ### Package Management -- Bundler 2.5.20 +- Bundler 2.5.21 - Carthage 0.40.0 - CocoaPods 1.15.2 -- Homebrew 4.3.24 +- Homebrew 4.4.0 - NPM 10.8.3 - Pip3 24.2 (python 3.12) - Pipx 1.7.1 -- RubyGems 3.5.20 +- RubyGems 3.5.21 - Yarn 1.22.22 ### Project Management @@ -49,13 +50,13 @@ - 7-Zip 17.05 - aria2 1.37.0 - azcopy 10.26.0 -- bazel 7.3.1 +- bazel 7.3.2 - bazelisk 1.22.0 - bsdtar 3.5.3 - available by 'tar' alias - Curl 8.7.1 - Git 2.46.2 - Git LFS 3.5.1 -- GitHub CLI 2.57.0 +- GitHub CLI 2.58.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.24.5 - gpg (GnuPG) 2.4.5 @@ -67,7 +68,7 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.17.61 +- AWS CLI 2.18.0 - AWS SAM CLI 1.125.0 - AWS Session Manager CLI 1.2.650.0 - Azure CLI 2.64.0 @@ -75,7 +76,7 @@ - Bicep CLI 0.30.23 - Cmake 3.30.4 - CodeQL Action Bundle 2.19.0 -- Fastlane 2.223.1 +- Fastlane 2.224.0 - SwiftFormat 0.54.5 - Xcbeautify 2.11.0 - Xcode Command Line Tools 16.0.0.0.1.1724870825 @@ -86,9 +87,9 @@ ### Browsers - Safari 18.0 (20619.1.26.31.6) - SafariDriver 18.0 (20619.1.26.31.6) -- Google Chrome 129.0.6668.71 -- Google Chrome for Testing 129.0.6668.70 -- ChromeDriver 129.0.6668.70 +- Google Chrome 129.0.6668.90 +- Google Chrome for Testing 129.0.6668.89 +- ChromeDriver 129.0.6668.89 - Selenium server 4.25.0 #### Environment variables @@ -109,7 +110,7 @@ #### Python - 3.11.9 -- 3.12.6 +- 3.12.7 #### Node.js - 18.20.4 @@ -117,8 +118,8 @@ #### Go - 1.21.13 -- 1.22.7 -- 1.23.1 +- 1.22.8 +- 1.23.2 ### Rust Tools - Cargo 1.81.0 @@ -161,10 +162,10 @@ | watchOS 11.1 | watchos11.1 | 16.1 | | Simulator - watchOS 11.0 | watchsimulator11.0 | 16.0 | | Simulator - watchOS 11.1 | watchsimulator11.1 | 16.1 | -| Simulator - visionOS 2.0 | xrsimulator2.0 | 16.0 | | visionOS 2.0 | xros2.0 | 16.0 | -| visionOS 2.1 | xros2.1 | 16.1 | +| Simulator - visionOS 2.0 | xrsimulator2.0 | 16.0 | | Simulator - visionOS 2.1 | xrsimulator2.1 | 16.1 | +| visionOS 2.1 | xros2.1 | 16.1 | | DriverKit 24.0 | driverkit24.0 | 16.0 | | DriverKit 24.1 | driverkit24.1 | 16.1 | @@ -183,7 +184,7 @@ ### Android | Package Name | Version | | -------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Emulator | 35.1.21 | +| Android Emulator | 35.2.10 | | Android SDK Platforms | android-35 (rev 1)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1) | | Android SDK Platform-Tools | 35.0.2 | | Android Support Repository | 47.0.0 | From dfca60f766e8d6cb42dc42a88c2f8afa3b1a5ca8 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 9 Oct 2024 15:07:22 +0000 Subject: [PATCH 3173/3485] Updating readme file for ubuntu22 version 20241006.1.1 (#10742) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2204-Readme.md | 77 +++++++++++++++--------------- 1 file changed, 39 insertions(+), 38 deletions(-) diff --git a/images/ubuntu/Ubuntu2204-Readme.md b/images/ubuntu/Ubuntu2204-Readme.md index 5f64d856249d..a071911edd4b 100644 --- a/images/ubuntu/Ubuntu2204-Readme.md +++ b/images/ubuntu/Ubuntu2204-Readme.md @@ -1,12 +1,13 @@ | Announcements | |-| +| [[Ubuntu 24 ] Node.js version 16 will be removed on October 21,2024.](https://github.com/actions/runner-images/issues/10677) | | [Ubuntu-latest workflows will use Ubuntu-24.04 image](https://github.com/actions/runner-images/issues/10636) | | [[Ubuntu 20 and 22] Go version 1.20.0 will be removed on October 14,2024.](https://github.com/actions/runner-images/issues/10607) | *** # Ubuntu 22.04 - OS Version: 22.04.5 LTS -- Kernel Version: 6.8.0-1014-azure -- Image Version: 20240922.1.0 +- Kernel Version: 6.5.0-1025-azure +- Image Version: 20241006.1.0 - Systemd version: 249.11-0ubuntu3.12 ## Installed Software @@ -27,12 +28,12 @@ - Perl 5.34.0 - Python 3.10.12 - Ruby 3.0.2p107 -- Swift 6.0 +- Swift 6.0.1 ### Package Management - cpan 1.64 - Helm 3.16.1 -- Homebrew 4.3.23 +- Homebrew 4.4.0 - Miniconda 24.7.1 - Npm 10.7.0 - NuGet 6.6.1.2 @@ -40,7 +41,7 @@ - Pip3 22.0.2 - Pipx 1.7.1 - RubyGems 3.3.5 -- Vcpkg (build from commit 98aa63962) +- Vcpkg (build from commit 7adc2e4d4) - Yarn 1.22.22 #### Environment variables @@ -59,7 +60,7 @@ to accomplish this. ### Project Management - Ant 1.10.12 -- Gradle 8.10.1 +- Gradle 8.10.2 - Lerna 8.1.8 - Maven 3.8.8 - Sbt 1.10.2 @@ -68,23 +69,23 @@ to accomplish this. - Ansible 2.17.4 - apt-fast 1.10.0 - AzCopy 10.26.0 - available by `azcopy` and `azcopy10` aliases -- Bazel 7.3.1 -- Bazelisk 1.21.0 -- Bicep 0.30.3 +- Bazel 7.3.2 +- Bazelisk 1.22.0 +- Bicep 0.30.23 - Buildah 1.23.1 -- CMake 3.30.3 +- CMake 3.30.4 - CodeQL Action Bundle 2.19.0 - Docker Amazon ECR Credential Helper 0.9.0 - Docker Compose v2 2.27.1 - Docker-Buildx 0.17.1 - Docker Client 26.1.3 - Docker Server 26.1.3 -- Fastlane 2.222.0 -- Git 2.46.1 +- Fastlane 2.224.0 +- Git 2.46.2 - Git LFS 3.5.1 - Git-ftp 1.6.0 - Haveged 1.9.14 -- Heroku 9.2.1 +- Heroku 9.3.0 - jq 1.6 - Kind 0.24.0 - Kubectl 1.31.1 @@ -100,29 +101,29 @@ to accomplish this. - Packer 1.11.2 - Parcel 2.12.0 - Podman 3.4.4 -- Pulumi 3.133.0 +- Pulumi 3.135.1 - R 4.4.1 - Skopeo 1.4.1 - Sphinx Open Source Search Server 2.2.11 - SVN 1.14.1 -- Terraform 1.9.6 +- Terraform 1.9.7 - yamllint 1.35.1 - yq 4.44.3 - zstd 1.5.6 ### CLI Tools -- Alibaba Cloud CLI 3.0.223 -- AWS CLI 2.17.56 +- Alibaba Cloud CLI 3.0.224 +- AWS CLI 2.18.0 - AWS CLI Session Manager Plugin 1.2.650.0 -- AWS SAM CLI 1.124.0 +- AWS SAM CLI 1.125.0 - Azure CLI 2.64.0 - Azure CLI (azure-devops) 1.0.1 -- GitHub CLI 2.57.0 -- Google Cloud CLI 493.0.0 -- Netlify CLI 17.36.2 -- OpenShift CLI 4.16.13 +- GitHub CLI 2.58.0 +- Google Cloud CLI 495.0.0 +- Netlify CLI 17.36.4 +- OpenShift CLI 4.17.0 - ORAS CLI 1.2.0 -- Vercel CLI 37.5.3 +- Vercel CLI 37.6.1 ### Java | Version | Environment Variable | @@ -134,7 +135,7 @@ to accomplish this. ### PHP Tools - PHP: 8.1.2 -- Composer 2.7.9 +- Composer 2.8.1 - PHPUnit 8.5.40 ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. @@ -161,13 +162,13 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.7.1 ### Browsers and Drivers -- Google Chrome 129.0.6668.58 -- ChromeDriver 129.0.6668.58 +- Google Chrome 129.0.6668.89 +- ChromeDriver 129.0.6668.89 - Chromium 129.0.6668.0 -- Microsoft Edge 129.0.2792.52 -- Microsoft Edge WebDriver 129.0.2792.53 +- Microsoft Edge 129.0.2792.79 +- Microsoft Edge WebDriver 129.0.2792.73 - Selenium server 4.25.0 -- Mozilla Firefox 130.0.1 +- Mozilla Firefox 131.0 - Geckodriver 0.35.0 #### Environment variables @@ -179,7 +180,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | ### .NET Tools -- .NET Core SDK: 6.0.425, 7.0.410, 8.0.401 +- .NET Core SDK: 6.0.425, 7.0.410, 8.0.402 - nbgv 3.6.143+57d4199a9c ### Databases @@ -211,7 +212,7 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Go - 1.20.14 - 1.21.13 -- 1.22.7 +- 1.22.8 #### Node.js - 16.20.2 @@ -224,7 +225,7 @@ Use the following command as a part of your job to start the service: 'sudo syst - 3.9.20 - 3.10.15 - 3.11.10 -- 3.12.6 +- 3.12.7 #### PyPy - 3.7.13 [PyPy 7.3.9] @@ -242,7 +243,7 @@ Use the following command as a part of your job to start the service: 'sudo syst #### PowerShell Modules - Az: 12.1.0 - MarkdownPS: 1.10 -- Microsoft.Graph: 2.23.0 +- Microsoft.Graph: 2.24.0 - Pester: 5.6.1 - PSScriptAnalyzer: 1.22.0 @@ -282,15 +283,15 @@ Use the following command as a part of your job to start the service: 'sudo syst | alpine:3.18 | sha256:3ddf7bf1d408188f9849efbf4f902720ae08f5131bb39013518b918aa056d0de | 2024-09-06 | | alpine:3.19 | sha256:ae65dbf8749a7d4527648ccee1fa3deb6bfcae34cbc30fc67aa45c44dcaa90ee | 2024-09-06 | | debian:10 | sha256:58ce6f1271ae1c8a2006ff7d3e54e9874d839f573d8009c20154ad0f2fb0a225 | 2024-06-13 | -| debian:11 | sha256:8ccc486c29a3ad02ad5af7f1156e2152dff3ba5634eec9be375269ef123457d8 | 2024-09-04 | +| debian:11 | sha256:152b9a5dc2a03f18ddfd88fbe7b1df41bd2b16be9f2df573a373caf46ce78c08 | 2024-09-27 | | moby/buildkit:latest | sha256:bc1fe18224dbcb92599139db0c745696c48ba9fd4ac24038d1fa81fdd7dcac27 | 2024-09-10 | | node:16 | sha256:f77a1aef2da8d83e45ec990f45df50f1a286c5fe8bbfb8c6e4246c6389705c0b | 2023-09-07 | | node:16-alpine | sha256:a1f9d027912b58a7c75be7716c97cfbc6d3099f3a97ed84aa490be9dee20e787 | 2023-08-10 | -| node:18 | sha256:ca07c02d13baf021ff5aadb3b48bcd1fcdd454826266ac313ce858676e8c1548 | 2024-07-09 | +| node:18 | sha256:f910225c96b0f77b0149f350a3184568a9ba6cddba2a7c7805cc125a50591605 | 2024-07-09 | | node:18-alpine | sha256:02376a266c84acbf45bd19440e08e48b1c8b98037417334046029ab585de03e2 | 2024-07-09 | -| node:20 | sha256:48db4f6ea21d134be744207225753a1730c4bc1b4cdf836d44511c36bf0e34d7 | 2024-08-21 | -| node:20-alpine | sha256:2d07db07a2df6830718ae2a47db6fedce6745f5bcd174c398f2acdda90a11c03 | 2024-08-21 | -| ubuntu:20.04 | sha256:fa17826afb526a9fc7250e0fbcbfd18d03fe7a54849472f86879d8bf562c629e | 2024-08-13 | +| node:20 | sha256:fffa89e023a3351904c04284029105d9e2ac7020886d683775a298569591e5bb | 2024-10-04 | +| node:20-alpine | sha256:c13b26e7e602ef2f1074aef304ce6e9b7dd284c419b35d89fcf3cc8e44a8def9 | 2024-10-04 | +| ubuntu:20.04 | sha256:6d8d9799fe6ab3221965efac00b4c34a2bcc102c086a58dff9e19a08b913c7ef | 2024-09-18 | | ubuntu:22.04 | sha256:58b87898e82351c6cf9cf5b9f3c20257bb9e2dcf33af051e12ce532d7f94e3fe | 2024-09-11 | ### Installed apt packages From bd333c62364fadd47ab7ad046b2044776bc07874 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 9 Oct 2024 15:39:06 +0000 Subject: [PATCH 3174/3485] Updating readme file for ubuntu24 version 20241006.1.1 (#10743) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2404-Readme.md | 57 +++++++++++++++--------------- 1 file changed, 29 insertions(+), 28 deletions(-) diff --git a/images/ubuntu/Ubuntu2404-Readme.md b/images/ubuntu/Ubuntu2404-Readme.md index ed7dba8c9940..65792a91befe 100644 --- a/images/ubuntu/Ubuntu2404-Readme.md +++ b/images/ubuntu/Ubuntu2404-Readme.md @@ -1,12 +1,13 @@ | Announcements | |-| +| [[Ubuntu 24 ] Node.js version 16 will be removed on October 21,2024.](https://github.com/actions/runner-images/issues/10677) | | [Ubuntu-latest workflows will use Ubuntu-24.04 image](https://github.com/actions/runner-images/issues/10636) | | [[Ubuntu 20 and 22] Go version 1.20.0 will be removed on October 14,2024.](https://github.com/actions/runner-images/issues/10607) | *** # Ubuntu 24.04 - OS Version: 24.04.1 LTS -- Kernel Version: 6.8.0-1014-azure -- Image Version: 20240922.1.0 +- Kernel Version: 6.8.0-1015-azure +- Image Version: 20241006.1.0 - Systemd version: 255.4-1ubuntu8.4 ## Installed Software @@ -21,23 +22,23 @@ - GNU Fortran: 12.3.0, 13.2.0, 14.0.1 - Julia 1.10.5 - Kotlin 2.0.20-release-360 -- Node.js 20.17.0 +- Node.js 20.18.0 - Perl 5.38.2 - Python 3.12.3 - Ruby 3.2.3 -- Swift 6.0 +- Swift 6.0.1 ### Package Management - cpan 1.64 - Helm 3.16.1 -- Homebrew 4.3.23 +- Homebrew 4.4.0 - Miniconda 24.7.1 - Npm 10.8.2 - Pip 24.0 - Pip3 24.0 - Pipx 1.4.3 - RubyGems 3.4.20 -- Vcpkg (build from commit 98aa63962) +- Vcpkg (build from commit 7adc2e4d4) - Yarn 1.22.22 #### Environment variables @@ -56,26 +57,26 @@ to accomplish this. ### Project Management - Ant 1.10.14 -- Gradle 8.10.1 +- Gradle 8.10.2 - Lerna 8.1.8 - Maven 3.8.8 ### Tools - Ansible 2.17.4 - AzCopy 10.26.0 - available by `azcopy` and `azcopy10` aliases -- Bazel 7.3.1 -- Bazelisk 1.21.0 -- Bicep 0.30.3 +- Bazel 7.3.2 +- Bazelisk 1.22.0 +- Bicep 0.30.23 - Buildah 1.33.7 -- CMake 3.30.3 +- CMake 3.30.4 - CodeQL Action Bundle 2.19.0 - Docker Amazon ECR Credential Helper 0.9.0 - Docker Compose v2 2.27.1 - Docker-Buildx 0.17.1 - Docker Client 26.1.3 - Docker Server 26.1.3 -- Fastlane 2.222.0 -- Git 2.46.1 +- Fastlane 2.224.0 +- Git 2.46.2 - Git LFS 3.5.1 - Git-ftp 1.6.0 - Haveged 1.9.14 @@ -92,7 +93,7 @@ to accomplish this. - Packer 1.11.2 - Parcel 2.12.0 - Podman 4.9.3 -- Pulumi 3.133.0 +- Pulumi 3.135.1 - Skopeo 1.13.3 - Sphinx Open Source Search Server 2.2.11 - yamllint 1.35.1 @@ -100,12 +101,12 @@ to accomplish this. - zstd 1.5.6 ### CLI Tools -- AWS CLI 2.17.56 +- AWS CLI 2.18.0 - AWS CLI Session Manager Plugin 1.2.650.0 -- AWS SAM CLI 1.124.0 +- AWS SAM CLI 1.125.0 - Azure CLI 2.64.0 - Azure CLI (azure-devops) 1.0.1 -- GitHub CLI 2.57.0 +- GitHub CLI 2.58.0 ### Java | Version | Environment Variable | @@ -117,7 +118,7 @@ to accomplish this. ### PHP Tools - PHP: 8.3.6 -- Composer 2.7.9 +- Composer 2.8.1 - PHPUnit 8.5.40 ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. @@ -139,13 +140,13 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.7.1 ### Browsers and Drivers -- Google Chrome 129.0.6668.58 -- ChromeDriver 129.0.6668.58 +- Google Chrome 129.0.6668.89 +- ChromeDriver 129.0.6668.89 - Chromium 129.0.6668.0 -- Microsoft Edge 129.0.2792.52 -- Microsoft Edge WebDriver 129.0.2792.53 +- Microsoft Edge 129.0.2792.79 +- Microsoft Edge WebDriver 129.0.2792.73 - Selenium server 4.25.0 -- Mozilla Firefox 130.0.1 +- Mozilla Firefox 131.0 - Geckodriver 0.35.0 #### Environment variables @@ -184,8 +185,8 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Go - 1.21.13 -- 1.22.7 -- 1.23.1 +- 1.22.8 +- 1.23.2 #### Node.js - 16.20.2 @@ -196,7 +197,7 @@ Use the following command as a part of your job to start the service: 'sudo syst - 3.9.20 - 3.10.15 - 3.11.10 -- 3.12.6 +- 3.12.7 #### PyPy - 3.9.19 [PyPy 7.3.16] @@ -207,7 +208,7 @@ Use the following command as a part of your job to start the service: 'sudo syst #### PowerShell Modules - Az: 12.1.0 -- Microsoft.Graph: 2.23.0 +- Microsoft.Graph: 2.24.0 - Pester: 5.6.1 - PSScriptAnalyzer: 1.22.0 @@ -304,7 +305,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | tk | 8.6.14build1 | | tree | 2.1.1-2ubuntu3 | | tzdata | 2024a-3ubuntu1.1 | -| unzip | 6.0-28ubuntu4 | +| unzip | 6.0-28ubuntu4.1 | | upx | 4.2.2-3 | | wget | 1.21.4-1ubuntu4.1 | | xvfb | 2:21.1.12-1ubuntu1 | From 7ca41de8b8387d77ffd915081adebd5e2d80798e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 9 Oct 2024 19:51:29 +0000 Subject: [PATCH 3175/3485] Updating readme file for macos-14 version 20241007.165 (#10741) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-14-Readme.md | 58 ++++++++++++++++----------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/images/macos/macos-14-Readme.md b/images/macos/macos-14-Readme.md index 8d8c3fc30433..ebb3028586f3 100644 --- a/images/macos/macos-14-Readme.md +++ b/images/macos/macos-14-Readme.md @@ -1,5 +1,6 @@ | Announcements | |-| +| [[macOS] The macOS 12 Actions runner image will begin deprecation on 10/7/24 and will be fully unsupported by 12/3/24 for GitHub and ADO](https://github.com/actions/runner-images/issues/10721) | | [[macOS] Support policy changes; Xcode 14 and 16 will be removed from macOS 14 on October 28](https://github.com/actions/runner-images/issues/10703) | | [macOS 15 (Sequoia) is now available as a public beta in GitHub Actions](https://github.com/actions/runner-images/issues/10686) | | [[Macos 13 and 14] Android NDK versions <=25 will be removed from images on October 07,2024](https://github.com/actions/runner-images/issues/10614) | @@ -8,7 +9,7 @@ # macOS 14 - OS Version: macOS 14.7 (23H124) - Kernel Version: Darwin 23.6.0 -- Image Version: 20240930.130 +- Image Version: 20241007.165 ## Installed Software @@ -25,23 +26,23 @@ - GNU Fortran 14 (Homebrew GCC 14.2.0) - available by `gfortran-14` alias - Kotlin 2.0.20-release-360 - Mono 6.12.0.188 -- Node.js 20.17.0 +- Node.js 20.18.0 - Perl 5.38.2 - PHP 8.3.12 -- Python3 3.12.6 +- Python3 3.12.7 - Ruby 3.0.7p220 ### Package Management -- Bundler 2.5.20 +- Bundler 2.5.21 - Carthage 0.40.0 - CocoaPods 1.15.2 -- Composer 2.7.9 -- Homebrew 4.3.24 +- Composer 2.8.1 +- Homebrew 4.4.0 - NPM 10.8.2 - NuGet 6.3.1.1 - Pip3 24.2 (python 3.12) - Pipx 1.7.1 -- RubyGems 3.5.20 +- RubyGems 3.5.21 - Yarn 1.22.22 ### Project Management @@ -53,13 +54,13 @@ - 7-Zip 17.05 - aria2 1.37.0 - azcopy 10.26.0 -- bazel 7.3.1 -- bazelisk 1.21.0 +- bazel 7.3.2 +- bazelisk 1.22.0 - bsdtar 3.5.3 - available by 'tar' alias - Curl 8.10.1 - Git 2.46.2 - Git LFS 3.5.1 -- GitHub CLI 2.57.0 +- GitHub CLI 2.58.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.24.5 - gpg (GnuPG) 2.4.5 @@ -71,7 +72,7 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.17.61 +- AWS CLI 2.18.0 - AWS SAM CLI 1.125.0 - AWS Session Manager CLI 1.2.650.0 - Azure CLI 2.64.0 @@ -79,7 +80,7 @@ - Bicep CLI 0.30.23 - Cmake 3.30.4 - CodeQL Action Bundle 2.19.0 -- Fastlane 2.223.1 +- Fastlane 2.224.0 - SwiftFormat 0.54.5 - Xcbeautify 2.11.0 - Xcode Command Line Tools 16.0.0.0.1.1724870825 @@ -89,14 +90,14 @@ - SwiftLint 0.57.0 ### Browsers -- Safari 18.0 (19619.1.26.111.10) -- SafariDriver 18.0 (19619.1.26.111.10) -- Google Chrome 129.0.6668.71 -- Google Chrome for Testing 129.0.6668.70 -- ChromeDriver 129.0.6668.70 -- Microsoft Edge 129.0.2792.65 -- Microsoft Edge WebDriver 129.0.2792.65 -- Mozilla Firefox 130.0.1 +- Safari 18.0.1 (19619.1.26.111.11) +- SafariDriver 18.0.1 (19619.1.26.111.11) +- Google Chrome 129.0.6668.90 +- Google Chrome for Testing 129.0.6668.89 +- ChromeDriver 129.0.6668.89 +- Microsoft Edge 129.0.2792.79 +- Microsoft Edge WebDriver 129.0.2792.82 +- Mozilla Firefox 131.0 - geckodriver 0.35.0 - Selenium server 4.25.0 @@ -127,17 +128,16 @@ - 3.9.20 - 3.10.15 - 3.11.9 -- 3.12.6 +- 3.12.7 #### Node.js - 18.20.4 - 20.17.0 #### Go -- 1.20.14 - 1.21.13 -- 1.22.7 -- 1.23.1 +- 1.22.8 +- 1.23.2 ### Rust Tools - Cargo 1.81.0 @@ -221,10 +221,10 @@ | Simulator - watchOS 10.5 | watchsimulator10.5 | 15.4 | | Simulator - watchOS 11.0 | watchsimulator11.0 | 16.0 | | Simulator - watchOS 11.1 | watchsimulator11.1 | 16.1 | -| visionOS 1.0 | xros1.0 | 15.2 | | Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | -| Simulator - visionOS 1.1 | xrsimulator1.1 | 15.3 | +| visionOS 1.0 | xros1.0 | 15.2 | | visionOS 1.1 | xros1.1 | 15.3 | +| Simulator - visionOS 1.1 | xrsimulator1.1 | 15.3 | | visionOS 1.2 | xros1.2 | 15.4 | | Simulator - visionOS 1.2 | xrsimulator1.2 | 15.4 | | Simulator - visionOS 2.0 | xrsimulator2.0 | 16.0 | @@ -232,8 +232,8 @@ | Simulator - visionOS 2.1 | xrsimulator2.1 | 16.1 | | visionOS 2.1 | xros2.1 | 16.1 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | -| Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | +| Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | | DriverKit 22.4 | driverkit22.4 | 14.3.1 | | DriverKit 23.0 | driverkit23.0 | 15.0.1 | | DriverKit 23.2 | driverkit23.2 | 15.1, 15.2 | @@ -271,7 +271,7 @@ | Package Name | Version | | -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 11.0 | -| Android Emulator | 35.1.21 | +| Android Emulator | 35.2.10 | | Android SDK Build-tools | 35.0.0<br>34.0.0<br>33.0.2 33.0.3 | | Android SDK Platforms | android-35 (rev 1)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | | Android SDK Platform-Tools | 35.0.2 | @@ -279,7 +279,7 @@ | CMake | 3.22.1 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 24.0.8215888<br>25.2.9519653<br>26.3.11579264 (default)<br>27.1.12297006 | +| NDK | 26.3.11579264 (default)<br>27.1.12297006 | #### Environment variables | Name | Value | From 09ff567de6908096a96ace47eb3f41079993366d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 9 Oct 2024 19:59:02 +0000 Subject: [PATCH 3176/3485] Updating readme file for win22 version 20241006.1.1 (#10744) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/windows/Windows2022-Readme.md | 42 ++++++++++++++-------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/images/windows/Windows2022-Readme.md b/images/windows/Windows2022-Readme.md index 1e2a46001d13..8ce61890a0b4 100644 --- a/images/windows/Windows2022-Readme.md +++ b/images/windows/Windows2022-Readme.md @@ -1,6 +1,6 @@ # Windows Server 2022 - OS Version: 10.0.20348 Build 2700 -- Image Version: 20240929.1.0 +- Image Version: 20241006.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -21,15 +21,15 @@ ### Package Management - Chocolatey 2.3.0 -- Composer 2.7.9 +- Composer 2.8.1 - Helm 3.16.0 - Miniconda 24.7.1 (pre-installed on the image but not added to PATH) - NPM 10.7.0 -- NuGet 6.11.0.119 +- NuGet 6.11.1.2 - pip 24.2 (python 3.9) - Pipx 1.7.1 - RubyGems 3.2.33 -- Vcpkg (build from commit 76d153790) +- Vcpkg (build from commit 7adc2e4d4) - Yarn 1.22.22 #### Environment variables @@ -48,8 +48,8 @@ - 7zip 24.08 - aria2 1.37.0 - azcopy 10.26.0 -- Bazel 7.3.1 -- Bazelisk 1.21.0 +- Bazel 7.3.2 +- Bazelisk 1.22.0 - Bicep 0.30.23 - Cabal 3.12.1.0 - CMake 3.30.4 @@ -73,7 +73,7 @@ - NSIS 3.10 - OpenSSL 1.1.1w - Packer 1.11.2 -- Pulumi 3.134.1 +- Pulumi 3.135.1 - R 4.4.1 - Service Fabric SDK 9.1.1436.9590 - Stack 3.1.1 @@ -87,12 +87,12 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.224 -- AWS CLI 2.17.61 +- AWS CLI 2.18.0 - AWS SAM CLI 1.125.0 - AWS Session Manager CLI 1.2.650.0 - Azure CLI 2.64.0 - Azure DevOps CLI extension 1.0.1 -- GitHub CLI 2.57.0 +- GitHub CLI 2.58.0 ### Rust Tools - Cargo 1.81.0 @@ -109,11 +109,11 @@ - Rustfmt 1.7.1 ### Browsers and Drivers -- Google Chrome 129.0.6668.71 -- Chrome Driver 129.0.6668.70 -- Microsoft Edge 129.0.2792.65 -- Microsoft Edge Driver 129.0.2792.65 -- Mozilla Firefox 130.0.1 +- Google Chrome 129.0.6668.90 +- Chrome Driver 129.0.6668.89 +- Microsoft Edge 129.0.2792.79 +- Microsoft Edge Driver 129.0.2792.79 +- Mozilla Firefox 131.0 - Gecko Driver 0.35.0 - IE Driver 4.14.0.0 - Selenium server 4.25.0 @@ -156,7 +156,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Go - 1.20.14 - 1.21.13 -- 1.22.7 +- 1.22.8 #### Node.js - 16.20.2 @@ -169,7 +169,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 3.9.13 - 3.10.11 - 3.11.9 -- 3.12.6 +- 3.12.7 #### PyPy - 2.7.18 [PyPy 7.3.17] @@ -200,7 +200,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### MongoDB | Version | ServiceName | ServiceStatus | ServiceStartType | | -------- | ----------- | ------------- | ---------------- | -| 5.0.28.0 | MongoDB | Stopped | Disabled | +| 5.0.29.0 | MongoDB | Stopped | Disabled | ### Database tools - Azure CosmosDb Emulator 2.14.20.0 @@ -213,7 +213,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Name | Version | ConfigFile | ServiceName | ServiceStatus | ListenPort | | ------ | ------- | ------------------------------------- | ----------- | ------------- | ---------- | | Apache | 2.4.55 | C:\tools\Apache24\conf\httpd.conf | Apache | Stopped | 80 | -| Nginx | 1.27.1 | C:\tools\nginx-1.27.1\conf\nginx.conf | nginx | Stopped | 80 | +| Nginx | 1.27.2 | C:\tools\nginx-1.27.2\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2022 | Name | Version | Path | @@ -499,10 +499,10 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - AzureRM: 2.1.0 (Default), 6.13.1 - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.666 +- AWSPowershell: 4.1.671 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.10 -- Microsoft.Graph: 2.23.0 +- Microsoft.Graph: 2.24.0 - Pester: 3.4.0, 5.6.1 - PowerShellGet: 1.0.0.1, 2.2.5 - PSScriptAnalyzer: 1.22.0 @@ -519,7 +519,7 @@ All other versions are saved but not installed. | Package Name | Version | | -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 8.0 | -| Android Emulator | 35.1.21 | +| Android Emulator | 35.2.10 | | Android SDK Build-tools | 35.0.0<br>34.0.0<br>33.0.0 33.0.1 33.0.2 33.0.3<br>32.0.0<br>31.0.0 | | Android SDK Platforms | android-35 (rev 1)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1) | | Android SDK Platform-Tools | 35.0.2 | From 75f145b1047b0ff68c14a3d89e83f3ce737d62fd Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 9 Oct 2024 20:49:32 +0000 Subject: [PATCH 3177/3485] Updating readme file for macos-14-arm64 version 20241007.259 (#10740) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-14-arm64-Readme.md | 71 ++++++++++++++------------- 1 file changed, 36 insertions(+), 35 deletions(-) diff --git a/images/macos/macos-14-arm64-Readme.md b/images/macos/macos-14-arm64-Readme.md index a16b6f1aab60..4bede3855ca3 100644 --- a/images/macos/macos-14-arm64-Readme.md +++ b/images/macos/macos-14-arm64-Readme.md @@ -1,18 +1,20 @@ | Announcements | |-| +| [[macOS] The macOS 12 Actions runner image will begin deprecation on 10/7/24 and will be fully unsupported by 12/3/24 for GitHub and ADO](https://github.com/actions/runner-images/issues/10721) | +| [[macOS] Support policy changes; Xcode 14 and 16 will be removed from macOS 14 on October 28](https://github.com/actions/runner-images/issues/10703) | +| [macOS 15 (Sequoia) is now available as a public beta in GitHub Actions](https://github.com/actions/runner-images/issues/10686) | | [[Macos 13 and 14] Android NDK versions <=25 will be removed from images on October 07,2024](https://github.com/actions/runner-images/issues/10614) | | [[Macos 13 and 14] Go version 1.20.0 will be removed on October 07,2024.](https://github.com/actions/runner-images/issues/10612) | -| [[macOS] Xcodes visionOS platform will be removed from macOS-14 images on September 23, 2024](https://github.com/actions/runner-images/issues/10559) | *** # macOS 14 -- OS Version: macOS 14.6.1 (23G93) +- OS Version: macOS 14.7 (23H124) - Kernel Version: Darwin 23.6.0 -- Image Version: 20240922.1 +- Image Version: 20241007.259 ## Installed Software ### Language and Runtime -- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.410, 8.0.101, 8.0.204, 8.0.303, 8.0.401 +- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.410, 8.0.101, 8.0.204, 8.0.303, 8.0.402 - Bash 3.2.57(1)-release - Clang/LLVM 14.0.3 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` @@ -24,59 +26,59 @@ - GNU Fortran 14 (Homebrew GCC 14.2.0) - available by `gfortran-14` alias - Kotlin 2.0.20-release-360 - Mono 6.12.0.188 -- Node.js 20.17.0 +- Node.js 20.18.0 - Perl 5.38.2 -- Python3 3.12.6 +- Python3 3.12.7 - Ruby 3.0.7p220 ### Package Management -- Bundler 2.5.19 +- Bundler 2.5.21 - Carthage 0.40.0 - CocoaPods 1.15.2 -- Homebrew 4.3.23 +- Homebrew 4.4.0 - NPM 10.8.2 - NuGet 6.3.1.1 - Pip3 24.2 (python 3.12) - Pipx 1.7.1 -- RubyGems 3.5.19 +- RubyGems 3.5.21 - Yarn 1.22.22 ### Project Management - Apache Ant 1.10.15 - Apache Maven 3.9.9 -- Gradle 8.10.1 +- Gradle 8.10.2 ### Utilities - 7-Zip 17.05 - aria2 1.37.0 - azcopy 10.26.0 -- bazel 7.3.1 -- bazelisk 1.21.0 +- bazel 7.3.2 +- bazelisk 1.22.0 - bsdtar 3.5.3 - available by 'tar' alias - Curl 8.7.1 -- Git 2.46.1 +- Git 2.46.2 - Git LFS 3.5.1 -- GitHub CLI 2.57.0 +- GitHub CLI 2.58.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.24.5 - gpg (GnuPG) 2.4.5 - jq 1.7.1 - OpenSSL 1.1.1w 11 Sep 2023 -- Packer 1.9.4 +- Packer 1.11.2 - pkg-config 0.29.2 - yq 4.44.3 - zstd 1.5.6 ### Tools -- AWS CLI 2.17.56 -- AWS SAM CLI 1.124.0 +- AWS CLI 2.18.0 +- AWS SAM CLI 1.125.0 - AWS Session Manager CLI 1.2.650.0 - Azure CLI 2.64.0 - Azure CLI (azure-devops) 1.0.1 -- Bicep CLI 0.30.3 -- Cmake 3.30.3 +- Bicep CLI 0.30.23 +- Cmake 3.30.4 - CodeQL Action Bundle 2.19.0 -- Fastlane 2.222.0 +- Fastlane 2.224.0 - SwiftFormat 0.54.5 - Xcbeautify 2.11.0 - Xcode Command Line Tools 16.0.0.0.1.1724870825 @@ -85,11 +87,11 @@ ### Linters ### Browsers -- Safari 17.6 (19618.3.11.11.5) -- SafariDriver 17.6 (19618.3.11.11.5) -- Google Chrome 129.0.6668.59 -- Google Chrome for Testing 129.0.6668.58 -- ChromeDriver 129.0.6668.58 +- Safari 18.0.1 (19619.1.26.111.11) +- SafariDriver 18.0.1 (19619.1.26.111.11) +- Google Chrome 129.0.6668.90 +- Google Chrome for Testing 129.0.6668.89 +- ChromeDriver 129.0.6668.89 - Selenium server 4.25.0 #### Environment variables @@ -112,17 +114,16 @@ - 3.9.13 - 3.10.11 - 3.11.9 -- 3.12.6 +- 3.12.7 #### Node.js - 18.20.4 - 20.17.0 #### Go -- 1.20.14 - 1.21.13 -- 1.22.7 -- 1.23.1 +- 1.22.8 +- 1.23.2 ### Rust Tools - Cargo 1.81.0 @@ -208,17 +209,17 @@ | Simulator - watchOS 11.1 | watchsimulator11.1 | 16.1 | | visionOS 1.0 | xros1.0 | 15.2 | | Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | -| Simulator - visionOS 1.1 | xrsimulator1.1 | 15.3 | | visionOS 1.1 | xros1.1 | 15.3 | +| Simulator - visionOS 1.1 | xrsimulator1.1 | 15.3 | | Simulator - visionOS 1.2 | xrsimulator1.2 | 15.4 | | visionOS 1.2 | xros1.2 | 15.4 | -| visionOS 2.0 | xros2.0 | 16.0 | | Simulator - visionOS 2.0 | xrsimulator2.0 | 16.0 | -| Simulator - visionOS 2.1 | xrsimulator2.1 | 16.1 | +| visionOS 2.0 | xros2.0 | 16.0 | | visionOS 2.1 | xros2.1 | 16.1 | +| Simulator - visionOS 2.1 | xrsimulator2.1 | 16.1 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | -| Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | +| Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | | DriverKit 22.4 | driverkit22.4 | 14.3.1 | | DriverKit 23.0 | driverkit23.0 | 15.0.1 | | DriverKit 23.2 | driverkit23.2 | 15.1, 15.2 | @@ -256,7 +257,7 @@ | Package Name | Version | | -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 11.0 | -| Android Emulator | 35.1.21 | +| Android Emulator | 35.2.10 | | Android SDK Build-tools | 35.0.0<br>34.0.0<br>33.0.2 33.0.3 | | Android SDK Platforms | android-35 (rev 1)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | | Android SDK Platform-Tools | 35.0.2 | @@ -264,7 +265,7 @@ | CMake | 3.22.1 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 24.0.8215888<br>25.2.9519653<br>26.3.11579264 (default)<br>27.1.12297006 | +| NDK | 26.3.11579264 (default)<br>27.1.12297006 | #### Environment variables | Name | Value | From 1838f0f3dc969cfff8aa88819f983a6cfad30799 Mon Sep 17 00:00:00 2001 From: sureshe456 <160699174+sureshe456@users.noreply.github.com> Date: Thu, 10 Oct 2024 21:09:25 +0530 Subject: [PATCH 3178/3485] [macOS] Add Xcode 16.1 Beta 3 to macOS14 and macOS15 (#10762) --- images/macos/toolsets/toolset-14.json | 4 ++-- images/macos/toolsets/toolset-15.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/images/macos/toolsets/toolset-14.json b/images/macos/toolsets/toolset-14.json index 3ed229dce394..9850ecf2167b 100644 --- a/images/macos/toolsets/toolset-14.json +++ b/images/macos/toolsets/toolset-14.json @@ -3,7 +3,7 @@ "default": "15.4", "x64": { "versions": [ - { "link": "16.1_beta_2", "version": "16.1.0-Beta.2+16B5014f", "symlinks": ["16.1"], "runtimes": ["iOS", "watchOS", "tvOS"], "sha256": "a07a709b4b196be118ff5bab7ea19a16a4ca273cad876d73dec5926c8a6da34a"}, + { "link": "16.1_beta_3", "version": "16.1.0-Beta.3+16B5029d", "symlinks": ["16.1"], "runtimes": ["iOS", "watchOS", "tvOS"], "sha256": "e92ffd3cf7bb3ecb830ba94e8b2cbeb62743a80c6d73a5ae52ae792e4a897e5f"}, { "link": "16", "version": "16.0.0+16A242d", "symlinks": ["16.0"], "runtimes": ["iOS", "watchOS", "tvOS"], "sha256": "4a26c3d102a55c7222fb145e0ee1503249c9c26c6e02dc64d783c8810b37b1e3"}, { "link": "15.4", "version": "15.4.0+15F31d", "runtimes": ["iOS", "watchOS", "tvOS"], "sha256": "82d3d61804ff3f4c7c82085e91dc701037ddaa770e542848b2477e22f4e8aa7a"}, { "link": "15.3", "version": "15.3.0+15E204a", "runtimes": ["iOS", "watchOS", "tvOS"], "sha256": "f13f6a2e2df432c3008e394640b8549a18c285acd7fd148d6c4bac8c3a5af234"}, @@ -15,7 +15,7 @@ }, "arm64":{ "versions": [ - { "link": "16.1_beta_2", "version": "16.1.0-Beta.2+16B5014f", "symlinks": ["16.1"], "runtimes": ["iOS", "watchOS", "tvOS"], "sha256": "a07a709b4b196be118ff5bab7ea19a16a4ca273cad876d73dec5926c8a6da34a"}, + { "link": "16.1_beta_3", "version": "16.1.0-Beta.3+16B5029d", "symlinks": ["16.1"], "runtimes": ["iOS", "watchOS", "tvOS"], "sha256": "e92ffd3cf7bb3ecb830ba94e8b2cbeb62743a80c6d73a5ae52ae792e4a897e5f"}, { "link": "16", "version": "16.0.0+16A242d", "symlinks": ["16.0"], "runtimes": ["iOS", "watchOS", "tvOS"], "sha256": "4a26c3d102a55c7222fb145e0ee1503249c9c26c6e02dc64d783c8810b37b1e3"}, { "link": "15.4", "version": "15.4.0+15F31d", "runtimes": ["iOS", "watchOS", "tvOS"], "sha256": "82d3d61804ff3f4c7c82085e91dc701037ddaa770e542848b2477e22f4e8aa7a"}, { "link": "15.3", "version": "15.3.0+15E204a", "runtimes": ["iOS", "watchOS", "tvOS"], "sha256": "f13f6a2e2df432c3008e394640b8549a18c285acd7fd148d6c4bac8c3a5af234"}, diff --git a/images/macos/toolsets/toolset-15.json b/images/macos/toolsets/toolset-15.json index cabc7d64c782..2ee9eb05ec08 100644 --- a/images/macos/toolsets/toolset-15.json +++ b/images/macos/toolsets/toolset-15.json @@ -3,13 +3,13 @@ "default": "16", "x64": { "versions": [ - { "link": "16.1_beta_2", "version": "16.1.0-Beta.2+16B5014f", "symlinks": ["16.1"], "install_runtimes": "true", "sha256": "a07a709b4b196be118ff5bab7ea19a16a4ca273cad876d73dec5926c8a6da34a"}, + { "link": "16.1_beta_3", "version": "16.1.0-Beta.3+16B5029d", "symlinks": ["16.1"], "install_runtimes": "true", "sha256": "e92ffd3cf7bb3ecb830ba94e8b2cbeb62743a80c6d73a5ae52ae792e4a897e5f"}, { "link": "16", "version": "16.0.0+16A242d", "symlinks": ["16.0"], "install_runtimes": "true", "sha256": "4a26c3d102a55c7222fb145e0ee1503249c9c26c6e02dc64d783c8810b37b1e3"} ] }, "arm64":{ "versions": [ - { "link": "16.1_beta_2", "version": "16.1.0-Beta.2+16B5014f", "symlinks": ["16.1"], "install_runtimes": "true", "sha256": "a07a709b4b196be118ff5bab7ea19a16a4ca273cad876d73dec5926c8a6da34a"}, + { "link": "16.1_beta_3", "version": "16.1.0-Beta.3+16B5029d", "symlinks": ["16.1"], "install_runtimes": "true", "sha256": "e92ffd3cf7bb3ecb830ba94e8b2cbeb62743a80c6d73a5ae52ae792e4a897e5f"}, { "link": "16", "version": "16.0.0+16A242d", "symlinks": ["16.0"], "install_runtimes": "true", "sha256": "4a26c3d102a55c7222fb145e0ee1503249c9c26c6e02dc64d783c8810b37b1e3"} ] } From dae0f7797151bea4f62f17b72bb7cd9afc01c715 Mon Sep 17 00:00:00 2001 From: RaviAkshintala <167848931+RaviAkshintala@users.noreply.github.com> Date: Thu, 10 Oct 2024 22:39:22 +0530 Subject: [PATCH 3179/3485] Removing Go version 1.20 (#10761) Co-authored-by: Ravi Akshintala <raviakshintalagithub.com@Ravis-Laptop.local> --- images/ubuntu/toolsets/toolset-2004.json | 1 - images/ubuntu/toolsets/toolset-2204.json | 1 - 2 files changed, 2 deletions(-) diff --git a/images/ubuntu/toolsets/toolset-2004.json b/images/ubuntu/toolsets/toolset-2004.json index c2896a2987f4..6ac26c19e8d5 100644 --- a/images/ubuntu/toolsets/toolset-2004.json +++ b/images/ubuntu/toolsets/toolset-2004.json @@ -45,7 +45,6 @@ "arch": "x64", "platform" : "linux", "versions": [ - "1.20.*", "1.21.*", "1.22.*" ], diff --git a/images/ubuntu/toolsets/toolset-2204.json b/images/ubuntu/toolsets/toolset-2204.json index 1f9b04eb6aed..8cf804fc9f86 100644 --- a/images/ubuntu/toolsets/toolset-2204.json +++ b/images/ubuntu/toolsets/toolset-2204.json @@ -43,7 +43,6 @@ "arch": "x64", "platform" : "linux", "versions": [ - "1.20.*", "1.21.*", "1.22.*" ], From 58e54334b096410db2dded798bdc338220b0de76 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 11 Oct 2024 04:40:57 +0000 Subject: [PATCH 3180/3485] Updating readme file for macos-13 version 20241008.186 (#10751) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-13-Readme.md | 71 +++++++++++++++++---------------- 1 file changed, 36 insertions(+), 35 deletions(-) diff --git a/images/macos/macos-13-Readme.md b/images/macos/macos-13-Readme.md index 689302cf4a51..056f5fd96160 100644 --- a/images/macos/macos-13-Readme.md +++ b/images/macos/macos-13-Readme.md @@ -1,5 +1,6 @@ | Announcements | |-| +| [[macOS] The macOS 12 Actions runner image will begin deprecation on 10/7/24 and will be fully unsupported by 12/3/24 for GitHub and ADO](https://github.com/actions/runner-images/issues/10721) | | [[macOS] Support policy changes; Xcode 14 and 16 will be removed from macOS 14 on October 28](https://github.com/actions/runner-images/issues/10703) | | [macOS 15 (Sequoia) is now available as a public beta in GitHub Actions](https://github.com/actions/runner-images/issues/10686) | | [[Macos 13 and 14] Android NDK versions <=25 will be removed from images on October 07,2024](https://github.com/actions/runner-images/issues/10614) | @@ -8,12 +9,12 @@ # macOS 13 - OS Version: macOS 13.7 (22H123) - Kernel Version: Darwin 22.6.0 -- Image Version: 20240930.147 +- Image Version: 20241008.186 ## Installed Software ### Language and Runtime -- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.410, 8.0.101, 8.0.204, 8.0.303, 8.0.402 +- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.410, 8.0.101, 8.0.204, 8.0.303, 8.0.403 - Bash 3.2.57(1)-release - Clang/LLVM 14.0.0 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` @@ -25,24 +26,24 @@ - GNU Fortran 14 (Homebrew GCC 14.2.0) - available by `gfortran-14` alias - Kotlin 2.0.20-release-360 - Mono 6.12.0.188 -- Node.js 20.17.0 +- Node.js 20.18.0 - Perl 5.38.2 - PHP 8.3.12 -- Python3 3.12.6 +- Python3 3.12.7 - Ruby 3.0.7p220 ### Package Management -- Bundler 2.5.20 +- Bundler 2.5.21 - Carthage 0.40.0 - CocoaPods 1.15.2 -- Composer 2.7.9 -- Homebrew 4.3.24 +- Composer 2.8.1 +- Homebrew 4.4.0 - NPM 10.8.2 - NuGet 6.3.1.1 - Pip3 24.2 (python 3.12) - Pipx 1.7.1 -- RubyGems 3.5.20 -- Vcpkg 2024 (build from commit 76d153790) +- RubyGems 3.5.21 +- Vcpkg 2024 (build from commit 2ddc10c8a) - Yarn 1.22.22 ### Project Management @@ -54,13 +55,13 @@ - 7-Zip 17.05 - aria2 1.37.0 - azcopy 10.26.0 -- bazel 7.3.1 -- bazelisk 1.21.0 +- bazel 7.3.2 +- bazelisk 1.22.0 - bsdtar 3.5.3 - available by 'tar' alias - Curl 8.10.1 -- Git 2.46.2 +- Git 2.47.0 - Git LFS 3.5.1 -- GitHub CLI 2.57.0 +- GitHub CLI 2.58.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.24.5 - gpg (GnuPG) 2.4.5 @@ -72,15 +73,15 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.17.61 +- AWS CLI 2.18.1 - AWS SAM CLI 1.125.0 - AWS Session Manager CLI 1.2.650.0 -- Azure CLI 2.64.0 +- Azure CLI 2.65.0 - Azure CLI (azure-devops) 1.0.1 - Bicep CLI 0.30.23 - Cmake 3.30.4 -- CodeQL Action Bundle 2.19.0 -- Fastlane 2.223.1 +- CodeQL Action Bundle 2.19.1 +- Fastlane 2.224.0 - SwiftFormat 0.54.5 - Xcbeautify 2.11.0 - Xcode Command Line Tools 14.3.1.0.1.1683849156 @@ -90,14 +91,14 @@ - SwiftLint 0.57.0 ### Browsers -- Safari 18.0 (18619.1.26.111.10) -- SafariDriver 18.0 (18619.1.26.111.10) -- Google Chrome 129.0.6668.71 -- Google Chrome for Testing 129.0.6668.70 -- ChromeDriver 129.0.6668.70 -- Microsoft Edge 129.0.2792.65 -- Microsoft Edge WebDriver 129.0.2792.65 -- Mozilla Firefox 130.0.1 +- Safari 18.0.1 (18619.1.26.111.11) +- SafariDriver 18.0.1 (18619.1.26.111.11) +- Google Chrome 129.0.6668.90 +- Google Chrome for Testing 129.0.6668.89 +- ChromeDriver 129.0.6668.89 +- Microsoft Edge 129.0.2792.79 +- Microsoft Edge WebDriver 129.0.2792.82 +- Mozilla Firefox 131.0 - geckodriver 0.35.0 - Selenium server 4.25.0 @@ -136,18 +137,17 @@ - 3.9.20 - 3.10.15 - 3.11.9 -- 3.12.6 +- 3.12.7 #### Node.js - 16.20.2 - 18.20.4 -- 20.17.0 +- 20.18.0 #### Go -- 1.20.14 - 1.21.13 -- 1.22.7 -- 1.23.1 +- 1.22.8 +- 1.23.2 ### Rust Tools - Cargo 1.81.0 @@ -163,7 +163,7 @@ - PowerShell 7.4.5 #### PowerShell Modules -- Az: 12.3.0 +- Az: 12.4.0 - Pester: 5.6.1 - PSScriptAnalyzer: 1.22.0 @@ -214,8 +214,8 @@ | visionOS 1.0 | xros1.0 | 15.2 | | Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | -| Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | +| Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | | DriverKit 22.1 | driverkit22.1 | 14.1 | | DriverKit 22.2 | driverkit22.2 | 14.2 | | DriverKit 22.4 | driverkit22.4 | 14.3.1 | @@ -243,7 +243,7 @@ | Package Name | Version | | -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 11.0 | -| Android Emulator | 35.1.21 | +| Android Emulator | 35.2.10 | | Android SDK Build-tools | 35.0.0<br>34.0.0<br>33.0.2 33.0.3 | | Android SDK Platforms | android-35 (rev 1)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | | Android SDK Platform-Tools | 35.0.2 | @@ -251,7 +251,7 @@ | CMake | 3.22.1 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 24.0.8215888<br>25.2.9519653<br>26.3.11579264 (default)<br>27.1.12297006 | +| NDK | 26.3.11579264 (default)<br>27.1.12297006 | #### Environment variables | Name | Value | @@ -264,11 +264,12 @@ | ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | ### Miscellaneous +- Tcl/Tk 8.6.15 #### Environment variables | Name | Value | | ----------------- | ----------------------------------------------------------------------------------------- | -| PARALLELS_DMG_URL | https://download.parallels.com/desktop/v20/20.0.1-55659/ParallelsDesktop-20.0.1-55659.dmg | +| PARALLELS_DMG_URL | https://download.parallels.com/desktop/v20/20.1.0-55732/ParallelsDesktop-20.1.0-55732.dmg | ##### Notes ``` From 6becb4037c7466a0c3b5c00c6d4804be1d669801 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 11 Oct 2024 05:54:14 +0000 Subject: [PATCH 3181/3485] Updating readme file for macos-13-arm64 version 20241008.189 (#10750) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-13-arm64-Readme.md | 59 ++++++++++++++------------- 1 file changed, 31 insertions(+), 28 deletions(-) diff --git a/images/macos/macos-13-arm64-Readme.md b/images/macos/macos-13-arm64-Readme.md index 0dd3730d7236..0868d049b2f9 100644 --- a/images/macos/macos-13-arm64-Readme.md +++ b/images/macos/macos-13-arm64-Readme.md @@ -1,5 +1,6 @@ | Announcements | |-| +| [[macOS] The macOS 12 Actions runner image will begin deprecation on 10/7/24 and will be fully unsupported by 12/3/24 for GitHub and ADO](https://github.com/actions/runner-images/issues/10721) | | [[macOS] Support policy changes; Xcode 14 and 16 will be removed from macOS 14 on October 28](https://github.com/actions/runner-images/issues/10703) | | [macOS 15 (Sequoia) is now available as a public beta in GitHub Actions](https://github.com/actions/runner-images/issues/10686) | | [[Macos 13 and 14] Android NDK versions <=25 will be removed from images on October 07,2024](https://github.com/actions/runner-images/issues/10614) | @@ -8,12 +9,12 @@ # macOS 13 - OS Version: macOS 13.7 (22H123) - Kernel Version: Darwin 22.6.0 -- Image Version: 20240930.145 +- Image Version: 20241008.189 ## Installed Software ### Language and Runtime -- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.410, 8.0.101, 8.0.204, 8.0.303, 8.0.402 +- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.410, 8.0.101, 8.0.204, 8.0.303, 8.0.403 - Bash 3.2.57(1)-release - Clang/LLVM 14.0.0 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` @@ -25,21 +26,21 @@ - GNU Fortran 14 (Homebrew GCC 14.2.0) - available by `gfortran-14` alias - Kotlin 2.0.20-release-360 - Mono 6.12.0.188 -- Node.js 20.17.0 +- Node.js 20.18.0 - Perl 5.38.2 -- Python3 3.12.6 +- Python3 3.12.7 - Ruby 3.0.7p220 ### Package Management -- Bundler 2.5.20 +- Bundler 2.5.21 - Carthage 0.40.0 - CocoaPods 1.15.2 -- Homebrew 4.3.24 +- Homebrew 4.4.0 - NPM 10.8.2 - NuGet 6.3.1.1 - Pip3 24.2 (python 3.12) - Pipx 1.7.1 -- RubyGems 3.5.20 +- RubyGems 3.5.21 - Yarn 1.22.22 ### Project Management @@ -51,13 +52,13 @@ - 7-Zip 17.05 - aria2 1.37.0 - azcopy 10.26.0 -- bazel 7.3.1 -- bazelisk 1.21.0 +- bazel 7.3.2 +- bazelisk 1.22.0 - bsdtar 3.5.3 - available by 'tar' alias - Curl 8.7.1 -- Git 2.46.2 +- Git 2.47.0 - Git LFS 3.5.1 -- GitHub CLI 2.57.0 +- GitHub CLI 2.58.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.24.5 - gpg (GnuPG) 2.4.5 @@ -69,15 +70,15 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.17.61 +- AWS CLI 2.18.1 - AWS SAM CLI 1.125.0 - AWS Session Manager CLI 1.2.650.0 -- Azure CLI 2.64.0 +- Azure CLI 2.65.0 - Azure CLI (azure-devops) 1.0.1 - Bicep CLI 0.30.23 - Cmake 3.30.4 -- CodeQL Action Bundle 2.19.0 -- Fastlane 2.223.1 +- CodeQL Action Bundle 2.19.1 +- Fastlane 2.224.0 - SwiftFormat 0.54.5 - Xcbeautify 2.11.0 - Xcode Command Line Tools 14.3.1.0.1.1683849156 @@ -86,11 +87,11 @@ ### Linters ### Browsers -- Safari 18.0 (18619.1.26.111.10) -- SafariDriver 18.0 (18619.1.26.111.10) -- Google Chrome 129.0.6668.71 -- Google Chrome for Testing 129.0.6668.70 -- ChromeDriver 129.0.6668.70 +- Safari 18.0.1 (18619.1.26.111.11) +- SafariDriver 18.0.1 (18619.1.26.111.11) +- Google Chrome 129.0.6668.90 +- Google Chrome for Testing 129.0.6668.89 +- ChromeDriver 129.0.6668.89 - Selenium server 4.25.0 #### Environment variables @@ -113,18 +114,17 @@ - 3.9.13 - 3.10.11 - 3.11.9 -- 3.12.6 +- 3.12.7 #### Node.js - 16.20.1 - 18.20.4 -- 20.17.0 +- 20.18.0 #### Go -- 1.20.14 - 1.21.13 -- 1.22.7 -- 1.23.1 +- 1.22.8 +- 1.23.2 ### Rust Tools - Cargo 1.81.0 @@ -140,7 +140,7 @@ - PowerShell 7.4.5 #### PowerShell Modules -- Az: 12.3.0 +- Az: 12.4.0 - Pester: 5.6.1 - PSScriptAnalyzer: 1.22.0 @@ -221,7 +221,7 @@ | Package Name | Version | | -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 11.0 | -| Android Emulator | 35.1.21 | +| Android Emulator | 35.2.10 | | Android SDK Build-tools | 35.0.0<br>34.0.0<br>33.0.2 33.0.3 | | Android SDK Platforms | android-35 (rev 1)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | | Android SDK Platform-Tools | 35.0.2 | @@ -229,7 +229,7 @@ | CMake | 3.22.1 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 24.0.8215888<br>25.2.9519653<br>26.3.11579264 (default)<br>27.1.12297006 | +| NDK | 26.3.11579264 (default)<br>27.1.12297006 | #### Environment variables | Name | Value | @@ -241,3 +241,6 @@ | ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk/26.3.11579264 | | ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | +### Miscellaneous +- Tcl/Tk 8.6.15 + From 9b4274cda9926632bedc8dde604f9b631a200c79 Mon Sep 17 00:00:00 2001 From: RaviAkshintala <167848931+RaviAkshintala@users.noreply.github.com> Date: Fri, 11 Oct 2024 18:14:17 +0530 Subject: [PATCH 3182/3485] Go version 1.23 Added and set as default version (#10763) Co-authored-by: Ravi Akshintala <raviakshintalagithub.com@Ravis-Laptop.local> --- images/ubuntu/toolsets/toolset-2004.json | 5 +++-- images/ubuntu/toolsets/toolset-2204.json | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/images/ubuntu/toolsets/toolset-2004.json b/images/ubuntu/toolsets/toolset-2004.json index 6ac26c19e8d5..4f25ed1a23d5 100644 --- a/images/ubuntu/toolsets/toolset-2004.json +++ b/images/ubuntu/toolsets/toolset-2004.json @@ -46,9 +46,10 @@ "platform" : "linux", "versions": [ "1.21.*", - "1.22.*" + "1.22.*", + "1.23.*" ], - "default": "1.21.*" + "default": "1.23.*" }, { "name": "Ruby", diff --git a/images/ubuntu/toolsets/toolset-2204.json b/images/ubuntu/toolsets/toolset-2204.json index 8cf804fc9f86..2b074666c506 100644 --- a/images/ubuntu/toolsets/toolset-2204.json +++ b/images/ubuntu/toolsets/toolset-2204.json @@ -44,9 +44,10 @@ "platform" : "linux", "versions": [ "1.21.*", - "1.22.*" + "1.22.*", + "1.23.*" ], - "default": "1.21.*" + "default": "1.23.*" }, { "name": "Ruby", From c6ea5e3564fdce7577716dac4e6e2a69d63aaa16 Mon Sep 17 00:00:00 2001 From: susmitamane <susmitamane@github.com> Date: Fri, 11 Oct 2024 22:34:45 +0530 Subject: [PATCH 3183/3485] [macOS] Add-python-3.13 (#10766) Co-authored-by: Susmita Mane <susmitamane@Susmitas-MacBook-Pro.local> --- images/macos/toolsets/toolset-13.json | 6 ++++-- images/macos/toolsets/toolset-14.json | 6 ++++-- images/macos/toolsets/toolset-15.json | 6 ++++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/images/macos/toolsets/toolset-13.json b/images/macos/toolsets/toolset-13.json index d5e13ee944f5..9beae5698b12 100644 --- a/images/macos/toolsets/toolset-13.json +++ b/images/macos/toolsets/toolset-13.json @@ -129,7 +129,8 @@ "3.9.*", "3.10.*", "3.11.*", - "3.12.*" + "3.12.*", + "3.13.*" ] }, "arm64": { @@ -137,7 +138,8 @@ "3.9.*", "3.10.*", "3.11.*", - "3.12.*" + "3.12.*", + "3.13.*" ] } } diff --git a/images/macos/toolsets/toolset-14.json b/images/macos/toolsets/toolset-14.json index 9850ecf2167b..f067e855e15e 100644 --- a/images/macos/toolsets/toolset-14.json +++ b/images/macos/toolsets/toolset-14.json @@ -133,7 +133,8 @@ "3.9.*", "3.10.*", "3.11.*", - "3.12.*" + "3.12.*", + "3.13.*" ] }, "arm64": { @@ -141,7 +142,8 @@ "3.9.*", "3.10.*", "3.11.*", - "3.12.*" + "3.12.*", + "3.13.*" ] } } diff --git a/images/macos/toolsets/toolset-15.json b/images/macos/toolsets/toolset-15.json index 2ee9eb05ec08..99f6eab799f5 100644 --- a/images/macos/toolsets/toolset-15.json +++ b/images/macos/toolsets/toolset-15.json @@ -118,13 +118,15 @@ "3.9.*", "3.10.*", "3.11.*", - "3.12.*" + "3.12.*", + "3.13.*" ] }, "arm64": { "versions": [ "3.11.*", - "3.12.*" + "3.12.*", + "3.13.*" ] } } From 499aa8a8211604a0dc2aa200b0fbc56b781a1e6f Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Tue, 15 Oct 2024 12:18:57 +0200 Subject: [PATCH 3184/3485] [Ubuntu, Windows] Add RUNNER_TOOL_CACHE environment variable (#10780) --- images/ubuntu/scripts/build/configure-environment.sh | 1 + images/windows/scripts/build/Configure-SystemEnvironment.ps1 | 1 + 2 files changed, 2 insertions(+) diff --git a/images/ubuntu/scripts/build/configure-environment.sh b/images/ubuntu/scripts/build/configure-environment.sh index 5e3781578523..3c149295e512 100644 --- a/images/ubuntu/scripts/build/configure-environment.sh +++ b/images/ubuntu/scripts/build/configure-environment.sh @@ -31,6 +31,7 @@ sed -i 's/::1 ip6-localhost ip6-loopback/::1 localhost ip6-localhost ip6-loo AGENT_TOOLSDIRECTORY=/opt/hostedtoolcache mkdir $AGENT_TOOLSDIRECTORY set_etc_environment_variable "AGENT_TOOLSDIRECTORY" "${AGENT_TOOLSDIRECTORY}" +set_etc_environment_variable "RUNNER_TOOL_CACHE" "${AGENT_TOOLSDIRECTORY}" chmod -R 777 $AGENT_TOOLSDIRECTORY # https://www.elastic.co/guide/en/elasticsearch/reference/current/vm-max-map-count.html diff --git a/images/windows/scripts/build/Configure-SystemEnvironment.ps1 b/images/windows/scripts/build/Configure-SystemEnvironment.ps1 index f43a9f08a9ed..f0859593b948 100644 --- a/images/windows/scripts/build/Configure-SystemEnvironment.ps1 +++ b/images/windows/scripts/build/Configure-SystemEnvironment.ps1 @@ -7,6 +7,7 @@ $variables = @{ "ImageVersion" = $env:IMAGE_VERSION "ImageOS" = $env:IMAGE_OS "AGENT_TOOLSDIRECTORY" = $env:AGENT_TOOLSDIRECTORY + "RUNNER_TOOL_CACHE" = $env:AGENT_TOOLSDIRECTORY } $variables.GetEnumerator() | ForEach-Object { From f3ad9cadef4f7c3609820a2396df4f9d662876f5 Mon Sep 17 00:00:00 2001 From: Subir Ghosh <subir0071@users.noreply.github.com> Date: Wed, 16 Oct 2024 03:37:29 -0600 Subject: [PATCH 3185/3485] fix:Allow pip to install packages in default env (#10794) --- images/ubuntu/scripts/build/install-python.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/images/ubuntu/scripts/build/install-python.sh b/images/ubuntu/scripts/build/install-python.sh index c87dac52cde8..d88945e3046f 100644 --- a/images/ubuntu/scripts/build/install-python.sh +++ b/images/ubuntu/scripts/build/install-python.sh @@ -19,6 +19,13 @@ export PIPX_HOME=/opt/pipx if is_ubuntu24; then apt-get install --no-install-recommends pipx pipx ensurepath + +# Create temporary workaround to allow user to continue using pip + sudo cat <<EOF > /etc/pip.conf +[global] +break-system-packages = true +EOF + else python3 -m pip install pipx python3 -m pipx ensurepath From b3b23d5faa92f32b20b7360e9ca8e30944d81ad9 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 16 Oct 2024 15:29:21 +0000 Subject: [PATCH 3186/3485] Updating readme file for macos-15 version 20241014.202 (#10777) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-15-Readme.md | 57 ++++++++++++++++----------------- 1 file changed, 28 insertions(+), 29 deletions(-) diff --git a/images/macos/macos-15-Readme.md b/images/macos/macos-15-Readme.md index a342aae0469b..3ef77a3a3f4f 100644 --- a/images/macos/macos-15-Readme.md +++ b/images/macos/macos-15-Readme.md @@ -9,12 +9,12 @@ # macOS 15 - OS Version: macOS 15.0 (24A335) - Kernel Version: Darwin 24.0.0 -- Image Version: 20241007.173 +- Image Version: 20241014.202 ## Installed Software ### Language and Runtime -- .NET Core SDK: 8.0.101, 8.0.204, 8.0.303, 8.0.402 +- .NET Core SDK: 8.0.101, 8.0.204, 8.0.303, 8.0.403 - Bash 3.2.57(1)-release - Clang/LLVM 16.0.0 - Clang/LLVM (Homebrew) 18.1.8 - available on `$(brew --prefix llvm@18)/bin/clang` @@ -24,11 +24,11 @@ - GNU Fortran 12 (Homebrew GCC 12.4.0) - available by `gfortran-12` alias - GNU Fortran 13 (Homebrew GCC 13.3.0) - available by `gfortran-13` alias - GNU Fortran 14 (Homebrew GCC 14.2.0) - available by `gfortran-14` alias -- Kotlin 2.0.20-release-360 +- Kotlin 2.0.21-release-482 - Node.js 22.9.0 - Perl 5.38.2 - PHP 8.3.12 -- Python3 3.12.7 +- Python3 3.13.0 - Ruby 3.3.5 ### Package Management @@ -38,7 +38,7 @@ - Composer 2.8.1 - Homebrew 4.4.0 - NPM 10.8.3 -- Pip3 24.2 (python 3.12) +- Pip3 24.2 (python 3.13) - Pipx 1.7.1 - RubyGems 3.5.21 - Yarn 1.22.22 @@ -56,7 +56,7 @@ - bazelisk 1.22.0 - bsdtar 3.5.3 - available by 'tar' alias - Curl 8.10.1 -- Git 2.46.2 +- Git 2.47.0 - Git LFS 3.5.1 - GitHub CLI 2.58.0 - GNU Tar 1.35 - available by 'gtar' alias @@ -70,16 +70,16 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.18.0 +- AWS CLI 2.18.5 - AWS SAM CLI 1.125.0 -- AWS Session Manager CLI 1.2.650.0 -- Azure CLI 2.64.0 +- AWS Session Manager CLI 1.2.677.0 +- Azure CLI 2.65.0 - Azure CLI (azure-devops) 1.0.1 - Bicep CLI 0.30.23 -- Cmake 3.30.4 -- CodeQL Action Bundle 2.19.0 +- Cmake 3.30.5 +- CodeQL Action Bundle 2.19.1 - Fastlane 2.224.0 -- SwiftFormat 0.54.5 +- SwiftFormat 0.54.6 - Xcbeautify 2.11.0 - Xcode Command Line Tools 16.0.0.0.1.1724870825 - Xcodes 1.5.0 @@ -90,12 +90,12 @@ ### Browsers - Safari 18.0 (20619.1.26.31.6) - SafariDriver 18.0 (20619.1.26.31.6) -- Google Chrome 129.0.6668.90 -- Google Chrome for Testing 129.0.6668.89 -- ChromeDriver 129.0.6668.89 -- Microsoft Edge 129.0.2792.79 -- Microsoft Edge WebDriver 129.0.2792.82 -- Mozilla Firefox 131.0 +- Google Chrome 129.0.6668.101 +- Google Chrome for Testing 129.0.6668.100 +- ChromeDriver 129.0.6668.100 +- Microsoft Edge 129.0.2792.89 +- Microsoft Edge WebDriver 129.0.2792.91 +- Mozilla Firefox 131.0.2 - geckodriver 0.35.0 - Selenium server 4.25.0 @@ -124,10 +124,11 @@ - 3.10.15 - 3.11.9 - 3.12.7 +- 3.13.0 #### Node.js - 18.20.4 -- 20.17.0 +- 20.18.0 #### Go - 1.21.13 @@ -148,15 +149,15 @@ - PowerShell 7.4.5 #### PowerShell Modules -- Az: 12.3.0 +- Az: 12.4.0 - Pester: 5.6.1 -- PSScriptAnalyzer: 1.22.0 +- PSScriptAnalyzer: 1.23.0 ### Xcode -| Version | Build | Path | -| -------------- | -------- | ----------------------------------- | -| 16.1 (beta) | 16B5014f | /Applications/Xcode_16.1_beta_2.app | -| 16.0 (default) | 16A242d | /Applications/Xcode_16.app | +| Version | Build | Path | Symlinks | +| -------------- | -------- | ----------------------------------- | ----------------------------------------------------------------------------------------- | +| 16.1 (beta) | 16B5029d | /Applications/Xcode_16.1_beta_3.app | /Applications/Xcode_16.1.0.app<br>/Applications/Xcode_16.1.app | +| 16.0 (default) | 16A242d | /Applications/Xcode_16.app | /Applications/Xcode_16.0.0.app<br>/Applications/Xcode_16.0.app<br>/Applications/Xcode.app | #### Installed SDKs | SDK | SDK Name | Xcode Version | @@ -175,10 +176,10 @@ | watchOS 11.1 | watchos11.1 | 16.1 | | Simulator - watchOS 11.0 | watchsimulator11.0 | 16.0 | | Simulator - watchOS 11.1 | watchsimulator11.1 | 16.1 | -| visionOS 2.0 | xros2.0 | 16.0 | | Simulator - visionOS 2.0 | xrsimulator2.0 | 16.0 | -| Simulator - visionOS 2.1 | xrsimulator2.1 | 16.1 | +| visionOS 2.0 | xros2.0 | 16.0 | | visionOS 2.1 | xros2.1 | 16.1 | +| Simulator - visionOS 2.1 | xrsimulator2.1 | 16.1 | | DriverKit 24.0 | driverkit24.0 | 16.0 | | DriverKit 24.1 | driverkit24.1 | 16.1 | @@ -214,5 +215,3 @@ | ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk/27.1.12297006 | | ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | -### Miscellaneous - From f08266d9d05e1e321ec211243245414d97b519ac Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 16 Oct 2024 17:01:50 +0000 Subject: [PATCH 3187/3485] Updating readme file for macos-13-arm64 version 20241014.218 (#10775) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-13-arm64-Readme.md | 43 ++++++++++++++------------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/images/macos/macos-13-arm64-Readme.md b/images/macos/macos-13-arm64-Readme.md index 0868d049b2f9..09afe7bf91f2 100644 --- a/images/macos/macos-13-arm64-Readme.md +++ b/images/macos/macos-13-arm64-Readme.md @@ -9,7 +9,7 @@ # macOS 13 - OS Version: macOS 13.7 (22H123) - Kernel Version: Darwin 22.6.0 -- Image Version: 20241008.189 +- Image Version: 20241014.218 ## Installed Software @@ -24,11 +24,11 @@ - GNU Fortran 12 (Homebrew GCC 12.4.0) - available by `gfortran-12` alias - GNU Fortran 13 (Homebrew GCC 13.3.0) - available by `gfortran-13` alias - GNU Fortran 14 (Homebrew GCC 14.2.0) - available by `gfortran-14` alias -- Kotlin 2.0.20-release-360 +- Kotlin 2.0.21-release-482 - Mono 6.12.0.188 - Node.js 20.18.0 - Perl 5.38.2 -- Python3 3.12.7 +- Python3 3.13.0 - Ruby 3.0.7p220 ### Package Management @@ -38,7 +38,7 @@ - Homebrew 4.4.0 - NPM 10.8.2 - NuGet 6.3.1.1 -- Pip3 24.2 (python 3.12) +- Pip3 24.2 (python 3.13) - Pipx 1.7.1 - RubyGems 3.5.21 - Yarn 1.22.22 @@ -70,16 +70,16 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.18.1 +- AWS CLI 2.18.5 - AWS SAM CLI 1.125.0 -- AWS Session Manager CLI 1.2.650.0 +- AWS Session Manager CLI 1.2.677.0 - Azure CLI 2.65.0 - Azure CLI (azure-devops) 1.0.1 - Bicep CLI 0.30.23 -- Cmake 3.30.4 +- Cmake 3.30.5 - CodeQL Action Bundle 2.19.1 - Fastlane 2.224.0 -- SwiftFormat 0.54.5 +- SwiftFormat 0.54.6 - Xcbeautify 2.11.0 - Xcode Command Line Tools 14.3.1.0.1.1683849156 - Xcodes 1.5.0 @@ -89,9 +89,9 @@ ### Browsers - Safari 18.0.1 (18619.1.26.111.11) - SafariDriver 18.0.1 (18619.1.26.111.11) -- Google Chrome 129.0.6668.90 -- Google Chrome for Testing 129.0.6668.89 -- ChromeDriver 129.0.6668.89 +- Google Chrome 129.0.6668.101 +- Google Chrome for Testing 129.0.6668.100 +- ChromeDriver 129.0.6668.100 - Selenium server 4.25.0 #### Environment variables @@ -115,6 +115,7 @@ - 3.10.11 - 3.11.9 - 3.12.7 +- 3.13.0 #### Node.js - 16.20.1 @@ -142,17 +143,17 @@ #### PowerShell Modules - Az: 12.4.0 - Pester: 5.6.1 -- PSScriptAnalyzer: 1.22.0 +- PSScriptAnalyzer: 1.23.0 ### Xcode -| Version | Build | Path | -| -------------- | ------- | ------------------------------ | -| 15.2 (default) | 15C500b | /Applications/Xcode_15.2.app | -| 15.1 | 15C65 | /Applications/Xcode_15.1.app | -| 15.0.1 | 15A507 | /Applications/Xcode_15.0.1.app | -| 14.3.1 | 14E300c | /Applications/Xcode_14.3.1.app | -| 14.2 | 14C18 | /Applications/Xcode_14.2.app | -| 14.1 | 14B47b | /Applications/Xcode_14.1.app | +| Version | Build | Path | Symlinks | +| -------------- | ------- | ------------------------------ | --------------------------------------------------------- | +| 15.2 (default) | 15C500b | /Applications/Xcode_15.2.app | /Applications/Xcode_15.2.0.app<br>/Applications/Xcode.app | +| 15.1 | 15C65 | /Applications/Xcode_15.1.app | /Applications/Xcode_15.1.0.app | +| 15.0.1 | 15A507 | /Applications/Xcode_15.0.1.app | /Applications/Xcode_15.0.app | +| 14.3.1 | 14E300c | /Applications/Xcode_14.3.1.app | /Applications/Xcode_14.3.app | +| 14.2 | 14C18 | /Applications/Xcode_14.2.app | /Applications/Xcode_14.2.0.app | +| 14.1 | 14B47b | /Applications/Xcode_14.1.app | /Applications/Xcode_14.1.0.app | #### Installed SDKs | SDK | SDK Name | Xcode Version | @@ -191,8 +192,8 @@ | Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | | visionOS 1.0 | xros1.0 | 15.2 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | -| Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | +| Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | DriverKit 22.1 | driverkit22.1 | 14.1 | | DriverKit 22.2 | driverkit22.2 | 14.2 | | DriverKit 22.4 | driverkit22.4 | 14.3.1 | From 011a640c94bccb97dd04d05ec78918e65d6d119a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 16 Oct 2024 17:07:50 +0000 Subject: [PATCH 3188/3485] Updating readme file for macos-15-arm64 version 20241014.193 (#10776) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-15-arm64-Readme.md | 49 ++++++++++++++------------- 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/images/macos/macos-15-arm64-Readme.md b/images/macos/macos-15-arm64-Readme.md index fc52ccd922ad..216d5b3451ba 100644 --- a/images/macos/macos-15-arm64-Readme.md +++ b/images/macos/macos-15-arm64-Readme.md @@ -9,12 +9,12 @@ # macOS 15 - OS Version: macOS 15.0 (24A335) - Kernel Version: Darwin 24.0.0 -- Image Version: 20241007.159 +- Image Version: 20241014.193 ## Installed Software ### Language and Runtime -- .NET Core SDK: 8.0.101, 8.0.204, 8.0.303, 8.0.402 +- .NET Core SDK: 8.0.101, 8.0.204, 8.0.303, 8.0.403 - Bash 3.2.57(1)-release - Clang/LLVM 16.0.0 - Clang/LLVM (Homebrew) 18.1.8 - available on `$(brew --prefix llvm@18)/bin/clang` @@ -24,10 +24,10 @@ - GNU Fortran 12 (Homebrew GCC 12.4.0) - available by `gfortran-12` alias - GNU Fortran 13 (Homebrew GCC 13.3.0) - available by `gfortran-13` alias - GNU Fortran 14 (Homebrew GCC 14.2.0) - available by `gfortran-14` alias -- Kotlin 2.0.20-release-360 +- Kotlin 2.0.21-release-482 - Node.js 22.9.0 - Perl 5.38.2 -- Python3 3.12.7 +- Python3 3.13.0 - Ruby 3.3.5 ### Package Management @@ -36,7 +36,7 @@ - CocoaPods 1.15.2 - Homebrew 4.4.0 - NPM 10.8.3 -- Pip3 24.2 (python 3.12) +- Pip3 24.2 (python 3.13) - Pipx 1.7.1 - RubyGems 3.5.21 - Yarn 1.22.22 @@ -54,7 +54,7 @@ - bazelisk 1.22.0 - bsdtar 3.5.3 - available by 'tar' alias - Curl 8.7.1 -- Git 2.46.2 +- Git 2.47.0 - Git LFS 3.5.1 - GitHub CLI 2.58.0 - GNU Tar 1.35 - available by 'gtar' alias @@ -68,16 +68,16 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.18.0 +- AWS CLI 2.18.5 - AWS SAM CLI 1.125.0 -- AWS Session Manager CLI 1.2.650.0 -- Azure CLI 2.64.0 +- AWS Session Manager CLI 1.2.677.0 +- Azure CLI 2.65.0 - Azure CLI (azure-devops) 1.0.1 - Bicep CLI 0.30.23 -- Cmake 3.30.4 -- CodeQL Action Bundle 2.19.0 +- Cmake 3.30.5 +- CodeQL Action Bundle 2.19.1 - Fastlane 2.224.0 -- SwiftFormat 0.54.5 +- SwiftFormat 0.54.6 - Xcbeautify 2.11.0 - Xcode Command Line Tools 16.0.0.0.1.1724870825 - Xcodes 1.5.0 @@ -87,9 +87,9 @@ ### Browsers - Safari 18.0 (20619.1.26.31.6) - SafariDriver 18.0 (20619.1.26.31.6) -- Google Chrome 129.0.6668.90 -- Google Chrome for Testing 129.0.6668.89 -- ChromeDriver 129.0.6668.89 +- Google Chrome 129.0.6668.101 +- Google Chrome for Testing 129.0.6668.100 +- ChromeDriver 129.0.6668.100 - Selenium server 4.25.0 #### Environment variables @@ -111,10 +111,11 @@ #### Python - 3.11.9 - 3.12.7 +- 3.13.0 #### Node.js - 18.20.4 -- 20.17.0 +- 20.18.0 #### Go - 1.21.13 @@ -135,15 +136,15 @@ - PowerShell 7.4.5 #### PowerShell Modules -- Az: 12.3.0 +- Az: 12.4.0 - Pester: 5.6.1 -- PSScriptAnalyzer: 1.22.0 +- PSScriptAnalyzer: 1.23.0 ### Xcode -| Version | Build | Path | -| -------------- | -------- | ----------------------------------- | -| 16.1 (beta) | 16B5014f | /Applications/Xcode_16.1_beta_2.app | -| 16.0 (default) | 16A242d | /Applications/Xcode_16.app | +| Version | Build | Path | Symlinks | +| -------------- | -------- | ----------------------------------- | ----------------------------------------------------------------------------------------- | +| 16.1 (beta) | 16B5029d | /Applications/Xcode_16.1_beta_3.app | /Applications/Xcode_16.1.0.app<br>/Applications/Xcode_16.1.app | +| 16.0 (default) | 16A242d | /Applications/Xcode_16.app | /Applications/Xcode_16.0.0.app<br>/Applications/Xcode_16.0.app<br>/Applications/Xcode.app | #### Installed SDKs | SDK | SDK Name | Xcode Version | @@ -162,10 +163,10 @@ | watchOS 11.1 | watchos11.1 | 16.1 | | Simulator - watchOS 11.0 | watchsimulator11.0 | 16.0 | | Simulator - watchOS 11.1 | watchsimulator11.1 | 16.1 | -| visionOS 2.0 | xros2.0 | 16.0 | | Simulator - visionOS 2.0 | xrsimulator2.0 | 16.0 | -| Simulator - visionOS 2.1 | xrsimulator2.1 | 16.1 | +| visionOS 2.0 | xros2.0 | 16.0 | | visionOS 2.1 | xros2.1 | 16.1 | +| Simulator - visionOS 2.1 | xrsimulator2.1 | 16.1 | | DriverKit 24.0 | driverkit24.0 | 16.0 | | DriverKit 24.1 | driverkit24.1 | 16.1 | From e065c9ac282b89ce756801c56922614b998f0cbe Mon Sep 17 00:00:00 2001 From: Larissa Fortuna <56982181+lkfortuna@users.noreply.github.com> Date: Thu, 17 Oct 2024 08:38:14 -0700 Subject: [PATCH 3189/3485] [doc] Rollback ubuntu-latest label to ubuntu-22 (#10807) --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index cdc3c3f41887..5d779c213df6 100644 --- a/README.md +++ b/README.md @@ -21,8 +21,8 @@ To build a VM machine from this repo's source, see the [instructions](docs/creat | Image | YAML Label | Included Software | Rollout Status of Latest Image Release | | --------------------|---------------------|--------------------|--------------------| -| Ubuntu 24.04 | `ubuntu-latest` or `ubuntu-24.04` | [ubuntu-24.04] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fijunaidm%2F0b5459bbe18604a639e1d2f7accd204f%2Fraw%2Fubuntu24.json) | -| Ubuntu 22.04 | `ubuntu-22.04` | [ubuntu-22.04] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fijunaidm%2F0b5459bbe18604a639e1d2f7accd204f%2Fraw%2Fubuntu22.json) | +| Ubuntu 24.04 | `ubuntu-24.04` | [ubuntu-24.04] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fijunaidm%2F0b5459bbe18604a639e1d2f7accd204f%2Fraw%2Fubuntu24.json) | +| Ubuntu 22.04 | `ubuntu-latest` or `ubuntu-22.04` | [ubuntu-22.04] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fijunaidm%2F0b5459bbe18604a639e1d2f7accd204f%2Fraw%2Fubuntu22.json) | | Ubuntu 20.04 | `ubuntu-20.04` | [ubuntu-20.04] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fijunaidm%2F0b5459bbe18604a639e1d2f7accd204f%2Fraw%2Fubuntu20.json) | | macOS 15 <sup>beta</sup> | `macos-15-large`| [macOS-15] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fijunaidm%2F0b5459bbe18604a639e1d2f7accd204f%2Fraw%2Fmacos-15.json) | | macOS 15 Arm64 <sup>beta</sup> | `macos-15` or `macos-15-xlarge` | [macOS-15-arm64] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fijunaidm%2F0b5459bbe18604a639e1d2f7accd204f%2Fraw%2Fmacos-15-arm64.json) | From c152328e5a97d88b1686b60c72c0ac5a66fc8f25 Mon Sep 17 00:00:00 2001 From: hemanthmanga <166606741+hemanthmanga@users.noreply.github.com> Date: Fri, 18 Oct 2024 01:38:42 +0530 Subject: [PATCH 3190/3485] Removing Node version 16 (#10808) Co-authored-by: Hemanth Manga <hemanthmanga@Hemanths-MacBook-Pro.local> --- images/ubuntu/toolsets/toolset-2404.json | 1 - 1 file changed, 1 deletion(-) diff --git a/images/ubuntu/toolsets/toolset-2404.json b/images/ubuntu/toolsets/toolset-2404.json index 683a243e218d..765dcf70f194 100644 --- a/images/ubuntu/toolsets/toolset-2404.json +++ b/images/ubuntu/toolsets/toolset-2404.json @@ -28,7 +28,6 @@ "platform" : "linux", "arch": "x64", "versions": [ - "16.*", "18.*", "20.*" ] From 3fbcce7888450069b9843941654e55ab7b691eb6 Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Fri, 18 Oct 2024 17:15:01 +0200 Subject: [PATCH 3191/3485] [macOS] Add Node 22 to the toolcache (#10809) --- images/macos/toolsets/toolset-13.json | 6 ++++-- images/macos/toolsets/toolset-14.json | 6 ++++-- images/macos/toolsets/toolset-15.json | 6 ++++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/images/macos/toolsets/toolset-13.json b/images/macos/toolsets/toolset-13.json index 9beae5698b12..6fa79c72a036 100644 --- a/images/macos/toolsets/toolset-13.json +++ b/images/macos/toolsets/toolset-13.json @@ -168,14 +168,16 @@ "versions": [ "16.*", "18.*", - "20.*" + "20.*", + "22.*" ] }, "arm64": { "versions": [ "16.*", "18.*", - "20.*" + "20.*", + "22.*" ] } } diff --git a/images/macos/toolsets/toolset-14.json b/images/macos/toolsets/toolset-14.json index f067e855e15e..6554c1897542 100644 --- a/images/macos/toolsets/toolset-14.json +++ b/images/macos/toolsets/toolset-14.json @@ -156,13 +156,15 @@ "x64": { "versions": [ "18.*", - "20.*" + "20.*", + "22.*" ] }, "arm64": { "versions": [ "18.*", - "20.*" + "20.*", + "22.*" ] } } diff --git a/images/macos/toolsets/toolset-15.json b/images/macos/toolsets/toolset-15.json index 99f6eab799f5..d4eff54172f3 100644 --- a/images/macos/toolsets/toolset-15.json +++ b/images/macos/toolsets/toolset-15.json @@ -139,13 +139,15 @@ "x64": { "versions": [ "18.*", - "20.*" + "20.*", + "22.*" ] }, "arm64": { "versions": [ "18.*", - "20.*" + "20.*", + "22.*" ] } } From a177c076992f1a098e0357f7fc3c65ba48ef0e50 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 20 Oct 2024 03:33:22 +0000 Subject: [PATCH 3192/3485] Updating readme file for ubuntu22 version 20241015.1.1 (#10801) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2204-Readme.md | 62 +++++++++++++++--------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/images/ubuntu/Ubuntu2204-Readme.md b/images/ubuntu/Ubuntu2204-Readme.md index a071911edd4b..c21057425465 100644 --- a/images/ubuntu/Ubuntu2204-Readme.md +++ b/images/ubuntu/Ubuntu2204-Readme.md @@ -7,7 +7,7 @@ # Ubuntu 22.04 - OS Version: 22.04.5 LTS - Kernel Version: 6.5.0-1025-azure -- Image Version: 20241006.1.0 +- Image Version: 20241015.1.0 - Systemd version: 249.11-0ubuntu3.12 ## Installed Software @@ -20,8 +20,8 @@ - Dash 0.5.11+git20210903+057cd650a4ed-3build1 - GNU C++: 10.5.0, 11.4.0, 12.3.0 - GNU Fortran: 10.5.0, 11.4.0, 12.3.0 -- Julia 1.10.5 -- Kotlin 2.0.20-release-360 +- Julia 1.11.0 +- Kotlin 2.0.21-release-482 - Mono 6.12.0.200 - MSBuild 16.10.1.31701 (Mono 6.12.0.200) - Node.js 18.20.4 @@ -32,8 +32,8 @@ ### Package Management - cpan 1.64 -- Helm 3.16.1 -- Homebrew 4.4.0 +- Helm 3.16.2 +- Homebrew 4.4.1 - Miniconda 24.7.1 - Npm 10.7.0 - NuGet 6.6.1.2 @@ -41,7 +41,7 @@ - Pip3 22.0.2 - Pipx 1.7.1 - RubyGems 3.3.5 -- Vcpkg (build from commit 7adc2e4d4) +- Vcpkg (build from commit e63bd09dc) - Yarn 1.22.22 #### Environment variables @@ -66,30 +66,30 @@ to accomplish this. - Sbt 1.10.2 ### Tools -- Ansible 2.17.4 +- Ansible 2.17.5 - apt-fast 1.10.0 - AzCopy 10.26.0 - available by `azcopy` and `azcopy10` aliases - Bazel 7.3.2 - Bazelisk 1.22.0 - Bicep 0.30.23 - Buildah 1.23.1 -- CMake 3.30.4 -- CodeQL Action Bundle 2.19.0 +- CMake 3.30.5 +- CodeQL Action Bundle 2.19.1 - Docker Amazon ECR Credential Helper 0.9.0 - Docker Compose v2 2.27.1 - Docker-Buildx 0.17.1 - Docker Client 26.1.3 - Docker Server 26.1.3 - Fastlane 2.224.0 -- Git 2.46.2 +- Git 2.47.0 - Git LFS 3.5.1 - Git-ftp 1.6.0 - Haveged 1.9.14 -- Heroku 9.3.0 +- Heroku 9.3.1 - jq 1.6 - Kind 0.24.0 - Kubectl 1.31.1 -- Kustomize 5.4.3 +- Kustomize 5.5.0 - Leiningen 2.11.2 - MediaInfo 21.09 - Mercurial 6.1.1 @@ -101,7 +101,7 @@ to accomplish this. - Packer 1.11.2 - Parcel 2.12.0 - Podman 3.4.4 -- Pulumi 3.135.1 +- Pulumi 3.136.1 - R 4.4.1 - Skopeo 1.4.1 - Sphinx Open Source Search Server 2.2.11 @@ -112,18 +112,18 @@ to accomplish this. - zstd 1.5.6 ### CLI Tools -- Alibaba Cloud CLI 3.0.224 -- AWS CLI 2.18.0 -- AWS CLI Session Manager Plugin 1.2.650.0 +- Alibaba Cloud CLI 3.0.227 +- AWS CLI 2.18.7 +- AWS CLI Session Manager Plugin 1.2.677.0 - AWS SAM CLI 1.125.0 -- Azure CLI 2.64.0 +- Azure CLI 2.65.0 - Azure CLI (azure-devops) 1.0.1 - GitHub CLI 2.58.0 -- Google Cloud CLI 495.0.0 -- Netlify CLI 17.36.4 +- Google Cloud CLI 497.0.0 +- Netlify CLI 17.37.0 - OpenShift CLI 4.17.0 - ORAS CLI 1.2.0 -- Vercel CLI 37.6.1 +- Vercel CLI 37.8.0 ### Java | Version | Environment Variable | @@ -162,13 +162,13 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.7.1 ### Browsers and Drivers -- Google Chrome 129.0.6668.89 -- ChromeDriver 129.0.6668.89 -- Chromium 129.0.6668.0 -- Microsoft Edge 129.0.2792.79 -- Microsoft Edge WebDriver 129.0.2792.73 +- Google Chrome 130.0.6723.58 +- ChromeDriver 130.0.6723.58 +- Chromium 130.0.6723.0 +- Microsoft Edge 129.0.2792.89 +- Microsoft Edge WebDriver 129.0.2792.93 - Selenium server 4.25.0 -- Mozilla Firefox 131.0 +- Mozilla Firefox 131.0.2 - Geckodriver 0.35.0 #### Environment variables @@ -180,7 +180,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | ### .NET Tools -- .NET Core SDK: 6.0.425, 7.0.410, 8.0.402 +- .NET Core SDK: 6.0.427, 7.0.410, 8.0.403 - nbgv 3.6.143+57d4199a9c ### Databases @@ -210,14 +210,14 @@ Use the following command as a part of your job to start the service: 'sudo syst ### Cached Tools #### Go -- 1.20.14 - 1.21.13 - 1.22.8 +- 1.23.2 #### Node.js - 16.20.2 - 18.20.4 -- 20.17.0 +- 20.18.0 #### Python - 3.7.17 @@ -245,7 +245,7 @@ Use the following command as a part of your job to start the service: 'sudo syst - MarkdownPS: 1.10 - Microsoft.Graph: 2.24.0 - Pester: 5.6.1 -- PSScriptAnalyzer: 1.22.0 +- PSScriptAnalyzer: 1.23.0 ### Web Servers | Name | Version | ConfigFile | ServiceStatus | ListenPort | @@ -291,7 +291,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | node:18-alpine | sha256:02376a266c84acbf45bd19440e08e48b1c8b98037417334046029ab585de03e2 | 2024-07-09 | | node:20 | sha256:fffa89e023a3351904c04284029105d9e2ac7020886d683775a298569591e5bb | 2024-10-04 | | node:20-alpine | sha256:c13b26e7e602ef2f1074aef304ce6e9b7dd284c419b35d89fcf3cc8e44a8def9 | 2024-10-04 | -| ubuntu:20.04 | sha256:6d8d9799fe6ab3221965efac00b4c34a2bcc102c086a58dff9e19a08b913c7ef | 2024-09-18 | +| ubuntu:20.04 | sha256:e341aa0d58bb9480bd092a137658bd1a7a5e8ae4fca31769df0eb7d6c4b8266e | 2024-10-11 | | ubuntu:22.04 | sha256:58b87898e82351c6cf9cf5b9f3c20257bb9e2dcf33af051e12ce532d7f94e3fe | 2024-09-11 | ### Installed apt packages From 2997ec866bdc3e0e67104f7623395ee2cf73ec01 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 20 Oct 2024 03:34:02 +0000 Subject: [PATCH 3193/3485] Updating readme file for ubuntu24 version 20241016.1.1 (#10800) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2404-Readme.md | 54 +++++++++++++++--------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/images/ubuntu/Ubuntu2404-Readme.md b/images/ubuntu/Ubuntu2404-Readme.md index 65792a91befe..9c38fa28f638 100644 --- a/images/ubuntu/Ubuntu2404-Readme.md +++ b/images/ubuntu/Ubuntu2404-Readme.md @@ -7,7 +7,7 @@ # Ubuntu 24.04 - OS Version: 24.04.1 LTS - Kernel Version: 6.8.0-1015-azure -- Image Version: 20241006.1.0 +- Image Version: 20241016.1.0 - Systemd version: 255.4-1ubuntu8.4 ## Installed Software @@ -18,10 +18,10 @@ - Clang-format: 16.0.6, 17.0.6, 18.1.3 - Clang-tidy: 16.0.6, 17.0.6, 18.1.3 - Dash 0.5.12-6ubuntu5 -- GNU C++: 12.3.0, 13.2.0, 14.0.1 -- GNU Fortran: 12.3.0, 13.2.0, 14.0.1 -- Julia 1.10.5 -- Kotlin 2.0.20-release-360 +- GNU C++: 12.3.0, 13.2.0, 14.2.0 +- GNU Fortran: 12.3.0, 13.2.0, 14.2.0 +- Julia 1.11.0 +- Kotlin 2.0.21-release-482 - Node.js 20.18.0 - Perl 5.38.2 - Python 3.12.3 @@ -30,15 +30,15 @@ ### Package Management - cpan 1.64 -- Helm 3.16.1 -- Homebrew 4.4.0 +- Helm 3.16.2 +- Homebrew 4.4.1 - Miniconda 24.7.1 - Npm 10.8.2 - Pip 24.0 - Pip3 24.0 - Pipx 1.4.3 - RubyGems 3.4.20 -- Vcpkg (build from commit 7adc2e4d4) +- Vcpkg (build from commit e63bd09dc) - Yarn 1.22.22 #### Environment variables @@ -62,28 +62,28 @@ to accomplish this. - Maven 3.8.8 ### Tools -- Ansible 2.17.4 +- Ansible 2.17.5 - AzCopy 10.26.0 - available by `azcopy` and `azcopy10` aliases - Bazel 7.3.2 - Bazelisk 1.22.0 - Bicep 0.30.23 - Buildah 1.33.7 -- CMake 3.30.4 -- CodeQL Action Bundle 2.19.0 +- CMake 3.30.5 +- CodeQL Action Bundle 2.19.1 - Docker Amazon ECR Credential Helper 0.9.0 - Docker Compose v2 2.27.1 - Docker-Buildx 0.17.1 - Docker Client 26.1.3 - Docker Server 26.1.3 - Fastlane 2.224.0 -- Git 2.46.2 +- Git 2.47.0 - Git LFS 3.5.1 - Git-ftp 1.6.0 - Haveged 1.9.14 - jq 1.7 - Kind 0.24.0 - Kubectl 1.31.1 -- Kustomize 5.4.3 +- Kustomize 5.5.0 - MediaInfo 24.01 - Mercurial 6.7.2 - Minikube 1.34.0 @@ -93,7 +93,7 @@ to accomplish this. - Packer 1.11.2 - Parcel 2.12.0 - Podman 4.9.3 -- Pulumi 3.135.1 +- Pulumi 3.136.1 - Skopeo 1.13.3 - Sphinx Open Source Search Server 2.2.11 - yamllint 1.35.1 @@ -101,10 +101,10 @@ to accomplish this. - zstd 1.5.6 ### CLI Tools -- AWS CLI 2.18.0 -- AWS CLI Session Manager Plugin 1.2.650.0 +- AWS CLI 2.18.7 +- AWS CLI Session Manager Plugin 1.2.677.0 - AWS SAM CLI 1.125.0 -- Azure CLI 2.64.0 +- Azure CLI 2.65.0 - Azure CLI (azure-devops) 1.0.1 - GitHub CLI 2.58.0 @@ -140,13 +140,13 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.7.1 ### Browsers and Drivers -- Google Chrome 129.0.6668.89 -- ChromeDriver 129.0.6668.89 -- Chromium 129.0.6668.0 -- Microsoft Edge 129.0.2792.79 -- Microsoft Edge WebDriver 129.0.2792.73 +- Google Chrome 130.0.6723.58 +- ChromeDriver 130.0.6723.58 +- Chromium 130.0.6723.0 +- Microsoft Edge 129.0.2792.89 +- Microsoft Edge WebDriver 129.0.2792.93 - Selenium server 4.25.0 -- Mozilla Firefox 131.0 +- Mozilla Firefox 131.0.2 - Geckodriver 0.35.0 #### Environment variables @@ -158,7 +158,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | ### .NET Tools -- .NET Core SDK: 8.0.108 +- .NET Core SDK: 8.0.110 - nbgv 3.6.143+57d4199a9c ### Databases @@ -191,7 +191,7 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Node.js - 16.20.2 - 18.20.4 -- 20.17.0 +- 20.18.0 #### Python - 3.9.20 @@ -210,7 +210,7 @@ Use the following command as a part of your job to start the service: 'sudo syst - Az: 12.1.0 - Microsoft.Graph: 2.24.0 - Pester: 5.6.1 -- PSScriptAnalyzer: 1.22.0 +- PSScriptAnalyzer: 1.23.0 ### Web Servers | Name | Version | ConfigFile | ServiceStatus | ListenPort | @@ -246,7 +246,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | aria2 | 1.37.0+debian-1build3 | | autoconf | 2.71-3 | | automake | 1:1.16.5-1.3ubuntu1 | -| binutils | 2.42-4ubuntu2 | +| binutils | 2.42-4ubuntu2.3 | | bison | 2:3.8.2+dfsg-1build2 | | brotli | 1.1.0-2build2 | | bzip2 | 1.0.8-5.1build0.1 | From fcc4cdb1d095af1317859c4809364538953b3497 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 20 Oct 2024 12:05:53 +0000 Subject: [PATCH 3194/3485] Updating readme file for win22 version 20241015.1.1 (#10803) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/windows/Windows2022-Readme.md | 126 +++++++++++++-------------- 1 file changed, 63 insertions(+), 63 deletions(-) diff --git a/images/windows/Windows2022-Readme.md b/images/windows/Windows2022-Readme.md index 8ce61890a0b4..7c21f5171504 100644 --- a/images/windows/Windows2022-Readme.md +++ b/images/windows/Windows2022-Readme.md @@ -1,6 +1,6 @@ # Windows Server 2022 -- OS Version: 10.0.20348 Build 2700 -- Image Version: 20241006.1.0 +- OS Version: 10.0.20348 Build 2762 +- Image Version: 20241015.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -11,7 +11,7 @@ - Bash 5.2.37(1)-release - Go 1.21.13 - Julia 1.10.5 -- Kotlin 2.0.20 +- Kotlin 2.0.21 - LLVM 18.1.8 - Node 18.20.3 - Perl 5.32.1 @@ -22,14 +22,14 @@ ### Package Management - Chocolatey 2.3.0 - Composer 2.8.1 -- Helm 3.16.0 +- Helm 3.16.1 - Miniconda 24.7.1 (pre-installed on the image but not added to PATH) - NPM 10.7.0 - NuGet 6.11.1.2 - pip 24.2 (python 3.9) - Pipx 1.7.1 - RubyGems 3.2.33 -- Vcpkg (build from commit 7adc2e4d4) +- Vcpkg (build from commit e63bd09dc) - Yarn 1.22.22 #### Environment variables @@ -52,15 +52,15 @@ - Bazelisk 1.22.0 - Bicep 0.30.23 - Cabal 3.12.1.0 -- CMake 3.30.4 -- CodeQL Action Bundle 2.19.0 +- CMake 3.30.5 +- CodeQL Action Bundle 2.19.1 - Docker 26.1.3 - Docker Compose v2 2.27.1 - Docker-wincred 0.8.2 - ghc 9.10.1 -- Git 2.46.2.windows.1 +- Git 2.47.0.windows.1 - Git LFS 3.5.1 -- ImageMagick 7.1.1-38 +- ImageMagick 7.1.1-39 - InnoSetup 6.3.3 - jq 1.7.1 - Kind 0.24.0 @@ -73,7 +73,7 @@ - NSIS 3.10 - OpenSSL 1.1.1w - Packer 1.11.2 -- Pulumi 3.135.1 +- Pulumi 3.136.1 - R 4.4.1 - Service Fabric SDK 9.1.1436.9590 - Stack 3.1.1 @@ -86,11 +86,11 @@ - zstd 1.5.6 ### CLI Tools -- Alibaba Cloud CLI 3.0.224 -- AWS CLI 2.18.0 +- Alibaba Cloud CLI 3.0.227 +- AWS CLI 2.18.6 - AWS SAM CLI 1.125.0 -- AWS Session Manager CLI 1.2.650.0 -- Azure CLI 2.64.0 +- AWS Session Manager CLI 1.2.677.0 +- Azure CLI 2.65.0 - Azure DevOps CLI extension 1.0.1 - GitHub CLI 2.58.0 @@ -109,11 +109,11 @@ - Rustfmt 1.7.1 ### Browsers and Drivers -- Google Chrome 129.0.6668.90 -- Chrome Driver 129.0.6668.89 -- Microsoft Edge 129.0.2792.79 -- Microsoft Edge Driver 129.0.2792.79 -- Mozilla Firefox 131.0 +- Google Chrome 130.0.6723.59 +- Chrome Driver 130.0.6723.58 +- Microsoft Edge 129.0.2792.89 +- Microsoft Edge Driver 129.0.2792.89 +- Mozilla Firefox 131.0.3 - Gecko Driver 0.35.0 - IE Driver 4.14.0.0 - Selenium server 4.25.0 @@ -161,7 +161,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Node.js - 16.20.2 - 18.20.4 -- 20.17.0 +- 20.18.0 #### Python - 3.7.9 @@ -205,7 +205,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Database tools - Azure CosmosDb Emulator 2.14.20.0 - DacFx 162.4.92.3 -- MySQL 8.0.39.0 +- MySQL 8.0.40.0 - SQL OLEDB Driver 18.7.4.0 - SQLPS 1.0 @@ -216,9 +216,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Nginx | 1.27.2 | C:\tools\nginx-1.27.2\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2022 -| Name | Version | Path | -| ----------------------------- | --------------- | -------------------------------------------------------- | -| Visual Studio Enterprise 2022 | 17.11.35312.102 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | +| Name | Version | Path | +| ----------------------------- | ------------- | -------------------------------------------------------- | +| Visual Studio Enterprise 2022 | 17.11.35327.3 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | #### Workloads, components and extensions | Package | Version | @@ -245,14 +245,14 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Component.Unreal | 17.11.35102.94 | | Component.Unreal.Android | 17.11.35102.94 | | Component.Unreal.Ide | 17.11.35102.94 | -| Component.VisualStudio.GitHub.Copilot | 17.11.35312.31 | +| Component.VisualStudio.GitHub.Copilot | 17.11.35324.167 | | Component.VSInstallerProjects2022 | 2.0.1 | | Component.WixToolset.VisualStudioExtension.Dev17 | 1.0.0.22 | | Component.WixToolset.VisualStudioExtension.Schemas3 | 1.0.0.22 | | Component.Xamarin | 17.11.35102.94 | | Component.Xamarin.RemotedSimulator | 17.11.35102.94 | -| ios | 17.5.8030.0 | -| maccatalyst | 17.5.8030.0 | +| ios | 18.0.8303.0 | +| maccatalyst | 18.0.8303.0 | | maui.blazor | 8.0.82.11329 | | maui.core | 8.0.82.11329 | | maui.windows | 8.0.82.11329 | @@ -279,21 +279,21 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.Net.ComponentGroup.4.8.DeveloperTools | 17.11.35102.94 | | Microsoft.Net.ComponentGroup.DevelopmentPrerequisites | 17.11.35102.94 | | Microsoft.Net.ComponentGroup.TargetingPacks.Common | 17.11.35102.94 | -| microsoft.net.runtime.android | 8.0.824.36612 | -| microsoft.net.runtime.android.aot | 8.0.824.36612 | -| microsoft.net.runtime.android.aot.net7 | 8.0.824.36612 | -| microsoft.net.runtime.android.net7 | 8.0.824.36612 | -| microsoft.net.runtime.ios | 8.0.824.36612 | -| microsoft.net.runtime.ios.net7 | 8.0.824.36612 | -| microsoft.net.runtime.maccatalyst | 8.0.824.36612 | -| microsoft.net.runtime.maccatalyst.net7 | 8.0.824.36612 | -| microsoft.net.runtime.mono.tooling | 8.0.824.36612 | -| microsoft.net.runtime.mono.tooling.net7 | 8.0.824.36612 | -| microsoft.net.sdk.emscripten | 8.0.10.35802 | +| microsoft.net.runtime.android | 8.0.1024.46610 | +| microsoft.net.runtime.android.aot | 8.0.1024.46610 | +| microsoft.net.runtime.android.aot.net7 | 8.0.1024.46610 | +| microsoft.net.runtime.android.net7 | 8.0.1024.46610 | +| microsoft.net.runtime.ios | 8.0.1024.46610 | +| microsoft.net.runtime.ios.net7 | 8.0.1024.46610 | +| microsoft.net.runtime.maccatalyst | 8.0.1024.46610 | +| microsoft.net.runtime.maccatalyst.net7 | 8.0.1024.46610 | +| microsoft.net.runtime.mono.tooling | 8.0.1024.46610 | +| microsoft.net.runtime.mono.tooling.net7 | 8.0.1024.46610 | +| microsoft.net.sdk.emscripten | 8.0.10.45201 | | Microsoft.NetCore.Component.DevelopmentTools | 17.11.35102.94 | -| Microsoft.NetCore.Component.Runtime.6.0 | 17.11.35303.118 | -| Microsoft.NetCore.Component.Runtime.8.0 | 17.11.35303.118 | -| Microsoft.NetCore.Component.SDK | 17.11.35303.118 | +| Microsoft.NetCore.Component.Runtime.6.0 | 17.11.35326.176 | +| Microsoft.NetCore.Component.Runtime.8.0 | 17.11.35326.176 | +| Microsoft.NetCore.Component.SDK | 17.11.35326.176 | | Microsoft.NetCore.Component.Web | 17.11.35102.94 | | Microsoft.VisualStudio.Component.AppInsights.Tools | 17.11.35102.94 | | Microsoft.VisualStudio.Component.AspNet | 17.11.35102.94 | @@ -449,11 +449,11 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Workload.Python | 17.11.35102.94 | | Microsoft.VisualStudio.Workload.Universal | 17.11.35102.94 | | Microsoft.VisualStudio.Workload.VisualStudioExtension | 17.11.35102.94 | -| runtimes.ios | 8.0.824.36612 | -| runtimes.ios.net7 | 8.0.824.36612 | -| runtimes.maccatalyst | 8.0.824.36612 | -| runtimes.maccatalyst.net7 | 8.0.824.36612 | -| wasm.tools | 8.0.824.36612 | +| runtimes.ios | 8.0.1024.46610 | +| runtimes.ios.net7 | 8.0.1024.46610 | +| runtimes.maccatalyst | 8.0.1024.46610 | +| runtimes.maccatalyst.net7 | 8.0.1024.46610 | +| wasm.tools | 8.0.1024.46610 | | ProBITools.MicrosoftAnalysisServicesModelingProjects2022 | 3.0.4 | | ProBITools.MicrosoftReportProjectsforVisualStudio2022 | 3.0.1 | | SSIS.MicrosoftDataToolsIntegrationServices | 1.5 | @@ -468,12 +468,12 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | -------------------------------------------- | ------------ | ----------- | | Microsoft Visual C++ 2013 Additional Runtime | x64 | 12.0.40660 | | Microsoft Visual C++ 2013 Minimum Runtime | x64 | 12.0.40660 | -| Microsoft Visual C++ 2022 Additional Runtime | x64 | 14.40.33810 | -| Microsoft Visual C++ 2022 Debug Runtime | x64 | 14.40.33810 | -| Microsoft Visual C++ 2022 Minimum Runtime | x64 | 14.40.33810 | -| Microsoft Visual C++ 2022 Additional Runtime | x86 | 14.40.33810 | -| Microsoft Visual C++ 2022 Debug Runtime | x86 | 14.40.33810 | -| Microsoft Visual C++ 2022 Minimum Runtime | x86 | 14.40.33810 | +| Microsoft Visual C++ 2022 Additional Runtime | x64 | 14.40.33816 | +| Microsoft Visual C++ 2022 Debug Runtime | x64 | 14.40.33816 | +| Microsoft Visual C++ 2022 Minimum Runtime | x64 | 14.40.33816 | +| Microsoft Visual C++ 2022 Additional Runtime | x86 | 14.40.33816 | +| Microsoft Visual C++ 2022 Debug Runtime | x86 | 14.40.33816 | +| Microsoft Visual C++ 2022 Minimum Runtime | x86 | 14.40.33816 | #### Installed Windows SDKs - 10.0.17763.0 @@ -483,11 +483,11 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 10.0.22621.0 ### .NET Core Tools -- .NET Core SDK: 6.0.133, 6.0.203, 6.0.321, 6.0.425, 7.0.120, 7.0.203, 7.0.317, 7.0.410, 8.0.400 +- .NET Core SDK: 6.0.135, 6.0.203, 6.0.321, 6.0.427, 7.0.120, 7.0.203, 7.0.317, 7.0.410, 8.0.403 - .NET Framework: 4.8, 4.8.1 -- Microsoft.AspNetCore.App: 6.0.5, 6.0.26, 6.0.32, 6.0.33, 7.0.5, 7.0.20, 8.0.8 -- Microsoft.NETCore.App: 6.0.5, 6.0.26, 6.0.32, 6.0.33, 7.0.5, 7.0.20, 8.0.8 -- Microsoft.WindowsDesktop.App: 6.0.5, 6.0.26, 6.0.33, 7.0.5, 7.0.20, 8.0.8 +- Microsoft.AspNetCore.App: 6.0.5, 6.0.26, 6.0.35, 7.0.5, 7.0.20, 8.0.10 +- Microsoft.NETCore.App: 6.0.5, 6.0.26, 6.0.35, 7.0.5, 7.0.20, 8.0.10 +- Microsoft.WindowsDesktop.App: 6.0.5, 6.0.26, 6.0.35, 7.0.5, 7.0.20, 8.0.10 - nbgv 3.6.143+57d4199a9c ### PowerShell Tools @@ -499,13 +499,13 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - AzureRM: 2.1.0 (Default), 6.13.1 - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.671 +- AWSPowershell: 4.1.678 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.10 - Microsoft.Graph: 2.24.0 - Pester: 3.4.0, 5.6.1 - PowerShellGet: 1.0.0.1, 2.2.5 -- PSScriptAnalyzer: 1.22.0 +- PSScriptAnalyzer: 1.23.0 - PSWindowsUpdate: 2.2.1.5 - SqlServer: 22.3.0 - VSSetup: 2.2.16 @@ -542,8 +542,8 @@ All other versions are saved but not installed. ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2022 | sha256:694e99af0ec996e63e6204e40e51869daf87c42d9bc628255804e32e2858b39c | 2024-09-10 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2022 | sha256:c9ff4d54c2a82dd154d3624fc8db44a9abe7913ab70f3aca5cb95213ed9621c5 | 2024-09-10 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:b6d6f01a449977c597a196a95f7f10e2c2b6438f7f9920744ceb11febeb61f27 | 2024-09-10 | -| mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:be3440ee2f36ed823a21df34e8e65026743d801dbc71e9311d03603775fc69c1 | 2024-09-05 | -| mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:b7b2e5b4c2414400c4eef13db747376e0f10ef8e15b8d0587ef5b953ad4e6d43 | 2024-09-06 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2022 | sha256:38ceb8f584148d16a638a7f978619f2589bd2e2d911a68798b38f4d2d0b09d36 | 2024-10-08 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2022 | sha256:95359c2a92f98eef3f3952afd7bc3dcf3025d07b10fe18b6eff9c6773bb2b79b | 2024-10-08 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:155aa2394cae80b97825b3b66b2e93e723eb91507cc211ea011db1d362dfe935 | 2024-10-08 | +| mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:f59e2f21720e4d1192e0dde47e32c7dbf27144d52d79be14b2538fa07145c869 | 2024-10-06 | +| mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:134a4de6ea1c905b526e24819ca3756c7897853c1c7fa2cfb48867f173f9f8e9 | 2024-10-06 | From 954995809e97d1da8d54399e1063323afb7795fe Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 21 Oct 2024 06:25:18 +0000 Subject: [PATCH 3195/3485] Updating readme file for macos-14-arm64 version 20241014.301 (#10805) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-14-arm64-Readme.md | 68 ++++++++++++++------------- 1 file changed, 35 insertions(+), 33 deletions(-) diff --git a/images/macos/macos-14-arm64-Readme.md b/images/macos/macos-14-arm64-Readme.md index 4bede3855ca3..a988c494e10f 100644 --- a/images/macos/macos-14-arm64-Readme.md +++ b/images/macos/macos-14-arm64-Readme.md @@ -3,18 +3,16 @@ | [[macOS] The macOS 12 Actions runner image will begin deprecation on 10/7/24 and will be fully unsupported by 12/3/24 for GitHub and ADO](https://github.com/actions/runner-images/issues/10721) | | [[macOS] Support policy changes; Xcode 14 and 16 will be removed from macOS 14 on October 28](https://github.com/actions/runner-images/issues/10703) | | [macOS 15 (Sequoia) is now available as a public beta in GitHub Actions](https://github.com/actions/runner-images/issues/10686) | -| [[Macos 13 and 14] Android NDK versions <=25 will be removed from images on October 07,2024](https://github.com/actions/runner-images/issues/10614) | -| [[Macos 13 and 14] Go version 1.20.0 will be removed on October 07,2024.](https://github.com/actions/runner-images/issues/10612) | *** # macOS 14 - OS Version: macOS 14.7 (23H124) - Kernel Version: Darwin 23.6.0 -- Image Version: 20241007.259 +- Image Version: 20241014.301 ## Installed Software ### Language and Runtime -- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.410, 8.0.101, 8.0.204, 8.0.303, 8.0.402 +- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.410, 8.0.101, 8.0.204, 8.0.303, 8.0.403 - Bash 3.2.57(1)-release - Clang/LLVM 14.0.3 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` @@ -24,11 +22,11 @@ - GNU Fortran 12 (Homebrew GCC 12.4.0) - available by `gfortran-12` alias - GNU Fortran 13 (Homebrew GCC 13.3.0) - available by `gfortran-13` alias - GNU Fortran 14 (Homebrew GCC 14.2.0) - available by `gfortran-14` alias -- Kotlin 2.0.20-release-360 +- Kotlin 2.0.21-release-482 - Mono 6.12.0.188 - Node.js 20.18.0 - Perl 5.38.2 -- Python3 3.12.7 +- Python3 3.13.0 - Ruby 3.0.7p220 ### Package Management @@ -38,7 +36,7 @@ - Homebrew 4.4.0 - NPM 10.8.2 - NuGet 6.3.1.1 -- Pip3 24.2 (python 3.12) +- Pip3 24.2 (python 3.13) - Pipx 1.7.1 - RubyGems 3.5.21 - Yarn 1.22.22 @@ -56,7 +54,7 @@ - bazelisk 1.22.0 - bsdtar 3.5.3 - available by 'tar' alias - Curl 8.7.1 -- Git 2.46.2 +- Git 2.47.0 - Git LFS 3.5.1 - GitHub CLI 2.58.0 - GNU Tar 1.35 - available by 'gtar' alias @@ -70,16 +68,16 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.18.0 +- AWS CLI 2.18.5 - AWS SAM CLI 1.125.0 -- AWS Session Manager CLI 1.2.650.0 -- Azure CLI 2.64.0 +- AWS Session Manager CLI 1.2.677.0 +- Azure CLI 2.65.0 - Azure CLI (azure-devops) 1.0.1 - Bicep CLI 0.30.23 -- Cmake 3.30.4 -- CodeQL Action Bundle 2.19.0 +- Cmake 3.30.5 +- CodeQL Action Bundle 2.19.1 - Fastlane 2.224.0 -- SwiftFormat 0.54.5 +- SwiftFormat 0.54.6 - Xcbeautify 2.11.0 - Xcode Command Line Tools 16.0.0.0.1.1724870825 - Xcodes 1.5.0 @@ -89,9 +87,9 @@ ### Browsers - Safari 18.0.1 (19619.1.26.111.11) - SafariDriver 18.0.1 (19619.1.26.111.11) -- Google Chrome 129.0.6668.90 -- Google Chrome for Testing 129.0.6668.89 -- ChromeDriver 129.0.6668.89 +- Google Chrome 129.0.6668.101 +- Google Chrome for Testing 129.0.6668.100 +- ChromeDriver 129.0.6668.100 - Selenium server 4.25.0 #### Environment variables @@ -115,10 +113,11 @@ - 3.10.11 - 3.11.9 - 3.12.7 +- 3.13.0 #### Node.js - 18.20.4 -- 20.17.0 +- 20.18.0 #### Go - 1.21.13 @@ -139,21 +138,21 @@ - PowerShell 7.4.5 #### PowerShell Modules -- Az: 12.3.0 +- Az: 12.4.0 - Pester: 5.6.1 -- PSScriptAnalyzer: 1.22.0 +- PSScriptAnalyzer: 1.23.0 ### Xcode -| Version | Build | Path | -| -------------- | -------- | ----------------------------------- | -| 16.1 (beta) | 16B5014f | /Applications/Xcode_16.1_beta_2.app | -| 16.0 | 16A242d | /Applications/Xcode_16.app | -| 15.4 (default) | 15F31d | /Applications/Xcode_15.4.app | -| 15.3 | 15E204a | /Applications/Xcode_15.3.app | -| 15.2 | 15C500b | /Applications/Xcode_15.2.app | -| 15.1 | 15C65 | /Applications/Xcode_15.1.app | -| 15.0.1 | 15A507 | /Applications/Xcode_15.0.1.app | -| 14.3.1 | 14E300c | /Applications/Xcode_14.3.1.app | +| Version | Build | Path | Symlinks | +| -------------- | -------- | ----------------------------------- | -------------------------------------------------------------- | +| 16.1 (beta) | 16B5029d | /Applications/Xcode_16.1_beta_3.app | /Applications/Xcode_16.1.0.app<br>/Applications/Xcode_16.1.app | +| 16.0 | 16A242d | /Applications/Xcode_16.app | /Applications/Xcode_16.0.0.app<br>/Applications/Xcode_16.0.app | +| 15.4 (default) | 15F31d | /Applications/Xcode_15.4.app | /Applications/Xcode_15.4.0.app<br>/Applications/Xcode.app | +| 15.3 | 15E204a | /Applications/Xcode_15.3.app | /Applications/Xcode_15.3.0.app | +| 15.2 | 15C500b | /Applications/Xcode_15.2.app | /Applications/Xcode_15.2.0.app | +| 15.1 | 15C65 | /Applications/Xcode_15.1.app | /Applications/Xcode_15.1.0.app | +| 15.0.1 | 15A507 | /Applications/Xcode_15.0.1.app | /Applications/Xcode_15.0.app | +| 14.3.1 | 14E300c | /Applications/Xcode_14.3.1.app | /Applications/Xcode_14.3.app | #### Installed SDKs | SDK | SDK Name | Xcode Version | @@ -213,13 +212,13 @@ | Simulator - visionOS 1.1 | xrsimulator1.1 | 15.3 | | Simulator - visionOS 1.2 | xrsimulator1.2 | 15.4 | | visionOS 1.2 | xros1.2 | 15.4 | -| Simulator - visionOS 2.0 | xrsimulator2.0 | 16.0 | | visionOS 2.0 | xros2.0 | 16.0 | -| visionOS 2.1 | xros2.1 | 16.1 | +| Simulator - visionOS 2.0 | xrsimulator2.0 | 16.0 | | Simulator - visionOS 2.1 | xrsimulator2.1 | 16.1 | +| visionOS 2.1 | xros2.1 | 16.1 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | -| Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | +| Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | DriverKit 22.4 | driverkit22.4 | 14.3.1 | | DriverKit 23.0 | driverkit23.0 | 15.0.1 | | DriverKit 23.2 | driverkit23.2 | 15.1, 15.2 | @@ -277,3 +276,6 @@ | ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk/26.3.11579264 | | ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | +### Miscellaneous +- Tcl/Tk 8.6.15 + From 0136427b07ea34fc6c301da81c5845790c8dbd5a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 21 Oct 2024 14:01:05 +0000 Subject: [PATCH 3196/3485] Updating readme file for win19 version 20241015.1.1 (#10799) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/windows/Windows2019-Readme.md | 84 ++++++++++++++-------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/images/windows/Windows2019-Readme.md b/images/windows/Windows2019-Readme.md index 102cc032e79d..d7687b93e421 100644 --- a/images/windows/Windows2019-Readme.md +++ b/images/windows/Windows2019-Readme.md @@ -1,6 +1,6 @@ # Windows Server 2019 -- OS Version: 10.0.17763 Build 6293 -- Image Version: 20241006.1.0 +- OS Version: 10.0.17763 Build 6414 +- Image Version: 20241015.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -11,7 +11,7 @@ - Bash 5.2.37(1)-release - Go 1.21.13 - Julia 1.10.5 -- Kotlin 2.0.20 +- Kotlin 2.0.21 - LLVM 18.1.8 - Node 18.20.3 - Perl 5.32.1 @@ -22,14 +22,14 @@ ### Package Management - Chocolatey 2.3.0 - Composer 2.8.1 -- Helm 3.16.0 +- Helm 3.16.1 - Miniconda 24.7.1 (pre-installed on the image but not added to PATH) - NPM 10.7.0 - NuGet 6.11.1.2 - pip 24.0 (python 3.7) - Pipx 1.2.1 - RubyGems 3.2.33 -- Vcpkg (build from commit 7adc2e4d4) +- Vcpkg (build from commit 9b44f143b) - Yarn 1.22.22 #### Environment variables @@ -52,16 +52,16 @@ - Bazelisk 1.22.0 - Bicep 0.30.23 - Cabal 3.12.1.0 -- CMake 3.30.4 -- CodeQL Action Bundle 2.19.0 +- CMake 3.30.5 +- CodeQL Action Bundle 2.19.1 - Docker 26.1.3 - Docker Compose v2 2.27.1 - Docker-wincred 0.8.2 - ghc 9.10.1 -- Git 2.46.2.windows.1 +- Git 2.47.0.windows.1 - Git LFS 3.5.1 -- Google Cloud CLI 495.0.0 -- ImageMagick 7.1.1-38 +- Google Cloud CLI 497.0.0 +- ImageMagick 7.1.1-39 - InnoSetup 6.3.3 - jq 1.7.1 - Kind 0.24.0 @@ -75,7 +75,7 @@ - OpenSSL 1.1.1w - Packer 1.11.2 - Parcel 2.12.0 -- Pulumi 3.135.1 +- Pulumi 3.136.1 - R 4.4.1 - Service Fabric SDK 9.1.1436.9590 - Stack 3.1.1 @@ -88,11 +88,11 @@ - zstd 1.5.6 ### CLI Tools -- Alibaba Cloud CLI 3.0.224 -- AWS CLI 2.18.0 +- Alibaba Cloud CLI 3.0.226 +- AWS CLI 2.18.4 - AWS SAM CLI 1.125.0 -- AWS Session Manager CLI 1.2.650.0 -- Azure CLI 2.64.0 +- AWS Session Manager CLI 1.2.677.0 +- Azure CLI 2.65.0 - Azure DevOps CLI extension 1.0.1 - Cloud Foundry CLI 8.8.2 - GitHub CLI 2.58.0 @@ -112,11 +112,11 @@ - Rustfmt 1.7.1 ### Browsers and Drivers -- Google Chrome 129.0.6668.90 -- Chrome Driver 129.0.6668.89 -- Microsoft Edge 129.0.2792.79 -- Microsoft Edge Driver 129.0.2792.79 -- Mozilla Firefox 131.0 +- Google Chrome 130.0.6723.59 +- Chrome Driver 130.0.6723.58 +- Microsoft Edge 129.0.2792.89 +- Microsoft Edge Driver 129.0.2792.89 +- Mozilla Firefox 131.0.3 - Gecko Driver 0.35.0 - IE Driver 4.14.0.0 - Selenium server 4.25.0 @@ -167,7 +167,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Node.js - 16.20.2 - 18.20.4 -- 20.17.0 +- 20.18.0 #### Python - 3.7.9 @@ -223,14 +223,14 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Nginx | 1.27.2 | C:\tools\nginx-1.27.2\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2019 -| Name | Version | Path | -| ----------------------------- | -------------- | -------------------------------------------------------------- | -| Visual Studio Enterprise 2019 | 16.11.35229.62 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | +| Name | Version | Path | +| ----------------------------- | --------------- | -------------------------------------------------------------- | +| Visual Studio Enterprise 2019 | 16.11.35325.158 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | #### Workloads, components and extensions | Package | Version | | ------------------------------------------------------------------------- | --------------- | -| Component.Android.NDK.R16B | 16.11.35213.202 | +| Component.Android.NDK.R16B | 16.11.35323.27 | | Component.Android.SDK25.Private | 16.0.28625.61 | | Component.Android.SDK30 | 16.10.31205.252 | | Component.Ant | 1.9.3.8 | @@ -468,12 +468,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 Debug Runtime | x64 | 14.29.30153 | -| Microsoft Visual C++ 2019 Debug Runtime | x86 | 14.29.30153 | -| Microsoft Visual C++ 2022 Additional Runtime | x64 | 14.40.33810 | -| Microsoft Visual C++ 2022 Minimum Runtime | x64 | 14.40.33810 | -| Microsoft Visual C++ 2022 Additional Runtime | x86 | 14.40.33810 | -| Microsoft Visual C++ 2022 Minimum Runtime | x86 | 14.40.33810 | +| Microsoft Visual C++ 2019 Debug Runtime | x64 | 14.29.30156 | +| Microsoft Visual C++ 2019 Debug Runtime | x86 | 14.29.30156 | +| Microsoft Visual C++ 2022 Additional Runtime | x64 | 14.40.33816 | +| Microsoft Visual C++ 2022 Minimum Runtime | x64 | 14.40.33816 | +| Microsoft Visual C++ 2022 Additional Runtime | x86 | 14.40.33816 | +| Microsoft Visual C++ 2022 Minimum Runtime | x86 | 14.40.33816 | #### Installed Windows SDKs - 10.0.14393.0 @@ -487,11 +487,11 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 10.0.22621.0 ### .NET Core Tools -- .NET Core SDK: 6.0.133, 6.0.203, 6.0.321, 6.0.425, 7.0.120, 7.0.203, 7.0.317, 7.0.410, 8.0.108, 8.0.206, 8.0.304, 8.0.402 +- .NET Core SDK: 6.0.135, 6.0.203, 6.0.321, 6.0.427, 7.0.120, 7.0.203, 7.0.317, 7.0.410, 8.0.110, 8.0.206, 8.0.306, 8.0.403 - .NET Framework: 4.7.2, 4.8 -- Microsoft.AspNetCore.App: 6.0.5, 6.0.26, 6.0.33, 7.0.5, 7.0.20, 8.0.6, 8.0.8 -- Microsoft.NETCore.App: 6.0.5, 6.0.26, 6.0.33, 7.0.5, 7.0.20, 8.0.6, 8.0.8 -- Microsoft.WindowsDesktop.App: 6.0.5, 6.0.26, 6.0.33, 7.0.5, 7.0.20, 8.0.6, 8.0.8 +- Microsoft.AspNetCore.App: 6.0.5, 6.0.26, 6.0.35, 7.0.5, 7.0.20, 8.0.6, 8.0.10 +- Microsoft.NETCore.App: 6.0.5, 6.0.26, 6.0.35, 7.0.5, 7.0.20, 8.0.6, 8.0.10 +- Microsoft.WindowsDesktop.App: 6.0.5, 6.0.26, 6.0.35, 7.0.5, 7.0.20, 8.0.6, 8.0.10 - nbgv 3.6.143+57d4199a9c ### PowerShell Tools @@ -503,13 +503,13 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - AzureRM: 2.1.0 (Default), 6.13.1 - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.671 +- AWSPowershell: 4.1.677 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.10 - Microsoft.Graph: 2.24.0 - Pester: 3.4.0, 5.6.1 - PowerShellGet: 1.0.0.1, 2.2.5 -- PSScriptAnalyzer: 1.22.0 +- PSScriptAnalyzer: 1.23.0 - PSWindowsUpdate: 2.2.1.5 - SqlServer: 22.2.0 - VSSetup: 2.2.16 @@ -547,8 +547,8 @@ All other versions are saved but not installed. ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:c643acadeb3c8f13a65817fbe7dfbb478f30e7293d99439918c9907f936b7b44 | 2024-09-10 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:0e30e7c4226044ff72eea68884894c397202eaacd73c4cb340a28896e617fee5 | 2024-09-10 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:563e2e986c7c3fce79ebb0757c475980e3d3dde05d1d2e53d4323b0e99580840 | 2024-09-10 | -| mcr.microsoft.com/windows/nanoserver:1809 | sha256:b1c10aada142b0729d6cdbddd4d4119499c2cdbc32e75573c36cfe1a6149b3ee | 2024-09-06 | -| mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:9fd56cf2f100d69f66f0de4af2c4fdd154e9e7be65eec3bf789a8088a881475a | 2024-09-06 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:500751531cd48c3cc759008eb60c1a6d1216cf8e0bd7328adcb33d349fb60984 | 2024-10-08 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:1659c21eedf074962b96dd69ee8e95a7db6fcb497f2248c3077c8f6fdb0a9231 | 2024-10-08 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:8a885e75361b04540285efde17f2fc00b7ac8953bb8d1e9442adf3f41f170b5e | 2024-10-08 | +| mcr.microsoft.com/windows/nanoserver:1809 | sha256:cdd5a33c8dd429071a00de8c7532bf40855174763d88ba575ec55c8060e964fc | 2024-10-04 | +| mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:b36581f8c38aa45a8eb1849372603fcbfe97befb3c0ad510e9cfc2ccef8fd3ca | 2024-10-04 | From 0077a0756a57fe54b0dbb767124e1256e6407630 Mon Sep 17 00:00:00 2001 From: RaviAkshintala <167848931+RaviAkshintala@users.noreply.github.com> Date: Tue, 22 Oct 2024 02:18:56 +0530 Subject: [PATCH 3197/3485] [Windows] Signature thumbprint updated for the edgedriver (#10829) Co-authored-by: Ravi Akshintala <raviakshintalagithub.com@Ravis-Laptop.local> --- images/windows/scripts/build/Install-EdgeDriver.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/windows/scripts/build/Install-EdgeDriver.ps1 b/images/windows/scripts/build/Install-EdgeDriver.ps1 index 91547ba0eb13..6d10d6e5d025 100644 --- a/images/windows/scripts/build/Install-EdgeDriver.ps1 +++ b/images/windows/scripts/build/Install-EdgeDriver.ps1 @@ -27,7 +27,7 @@ Write-Host "Expand Microsoft Edge WebDriver archive..." Expand-7ZipArchive -Path $archivePath -DestinationPath $edgeDriverPath #Validate the EdgeDriver signature -$signatureThumbprint = "CB9C4FBEA1D87D2D468AC5A9CAAB0163F6AD8401","573EF451A68C33FB904346D44551BEF3BB5BBF68" +$signatureThumbprint = "0BD8C56733FDCC06F8CB919FF5A200E39B1ACF71" Test-FileSignature -Path "$edgeDriverPath\msedgedriver.exe" -ExpectedThumbprint $signatureThumbprint Write-Host "Setting the environment variables..." From b03e99b0d20775b96cb083d615933f663516abf4 Mon Sep 17 00:00:00 2001 From: "Image generation service account." <no-reply@microsoft.com> Date: Tue, 22 Oct 2024 00:47:23 +0000 Subject: [PATCH 3198/3485] Updating readme file for macos-13-arm64 version 20241021.263 --- images/macos/macos-13-arm64-Readme.md | 53 ++++++++++++++------------- 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/images/macos/macos-13-arm64-Readme.md b/images/macos/macos-13-arm64-Readme.md index 09afe7bf91f2..2089d5ee3b04 100644 --- a/images/macos/macos-13-arm64-Readme.md +++ b/images/macos/macos-13-arm64-Readme.md @@ -1,15 +1,15 @@ | Announcements | |-| +| [[macOS] OpenSSL 1.1 will be removed and OpenSSL 3 will be the default for all macOS images from November 4](https://github.com/actions/runner-images/issues/10817) | +| [[macOS] Python 3.9 and 3.10 will be removed from macOS13 arm64 and macOS14 arm64 on November 18.](https://github.com/actions/runner-images/issues/10812) | | [[macOS] The macOS 12 Actions runner image will begin deprecation on 10/7/24 and will be fully unsupported by 12/3/24 for GitHub and ADO](https://github.com/actions/runner-images/issues/10721) | | [[macOS] Support policy changes; Xcode 14 and 16 will be removed from macOS 14 on October 28](https://github.com/actions/runner-images/issues/10703) | | [macOS 15 (Sequoia) is now available as a public beta in GitHub Actions](https://github.com/actions/runner-images/issues/10686) | -| [[Macos 13 and 14] Android NDK versions <=25 will be removed from images on October 07,2024](https://github.com/actions/runner-images/issues/10614) | -| [[Macos 13 and 14] Go version 1.20.0 will be removed on October 07,2024.](https://github.com/actions/runner-images/issues/10612) | *** # macOS 13 - OS Version: macOS 13.7 (22H123) - Kernel Version: Darwin 22.6.0 -- Image Version: 20241014.218 +- Image Version: 20241021.263 ## Installed Software @@ -32,15 +32,15 @@ - Ruby 3.0.7p220 ### Package Management -- Bundler 2.5.21 +- Bundler 2.5.22 - Carthage 0.40.0 - CocoaPods 1.15.2 -- Homebrew 4.4.0 +- Homebrew 4.4.2 - NPM 10.8.2 - NuGet 6.3.1.1 - Pip3 24.2 (python 3.13) - Pipx 1.7.1 -- RubyGems 3.5.21 +- RubyGems 3.5.22 - Yarn 1.22.22 ### Project Management @@ -58,7 +58,7 @@ - Curl 8.7.1 - Git 2.47.0 - Git LFS 3.5.1 -- GitHub CLI 2.58.0 +- GitHub CLI 2.59.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.24.5 - gpg (GnuPG) 2.4.5 @@ -70,17 +70,17 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.18.5 -- AWS SAM CLI 1.125.0 +- AWS CLI 2.18.11 +- AWS SAM CLI 1.126.0 - AWS Session Manager CLI 1.2.677.0 - Azure CLI 2.65.0 - Azure CLI (azure-devops) 1.0.1 - Bicep CLI 0.30.23 - Cmake 3.30.5 - CodeQL Action Bundle 2.19.1 -- Fastlane 2.224.0 +- Fastlane 2.225.0 - SwiftFormat 0.54.6 -- Xcbeautify 2.11.0 +- Xcbeautify 2.14.0 - Xcode Command Line Tools 14.3.1.0.1.1683849156 - Xcodes 1.5.0 @@ -89,9 +89,9 @@ ### Browsers - Safari 18.0.1 (18619.1.26.111.11) - SafariDriver 18.0.1 (18619.1.26.111.11) -- Google Chrome 129.0.6668.101 -- Google Chrome for Testing 129.0.6668.100 -- ChromeDriver 129.0.6668.100 +- Google Chrome 130.0.6723.59 +- Google Chrome for Testing 130.0.6723.58 +- ChromeDriver 130.0.6723.58 - Selenium server 4.25.0 #### Environment variables @@ -102,11 +102,11 @@ | GECKOWEBDRIVER | | ### Java -| Version | Environment Variable | -| ------------------- | -------------------- | -| 11.0.24+8 | JAVA_HOME_11_arm64 | -| 17.0.12+7 (default) | JAVA_HOME_17_arm64 | -| 21.0.4+7.0 | JAVA_HOME_21_arm64 | +| Version | Environment Variable | +| -------------------- | -------------------- | +| 11.0.24+8 | JAVA_HOME_11_arm64 | +| 17.0.13+11 (default) | JAVA_HOME_17_arm64 | +| 21.0.5+11.0 | JAVA_HOME_21_arm64 | ### Cached Tools @@ -121,6 +121,7 @@ - 16.20.1 - 18.20.4 - 20.18.0 +- 22.10.0 #### Go - 1.21.13 @@ -128,13 +129,13 @@ - 1.23.2 ### Rust Tools -- Cargo 1.81.0 -- Rust 1.81.0 -- Rustdoc 1.81.0 +- Cargo 1.82.0 +- Rust 1.82.0 +- Rustdoc 1.82.0 - Rustup 1.27.1 #### Packages -- Clippy 0.1.81 +- Clippy 0.1.82 - Rustfmt 1.7.1-stable ### PowerShell Tools @@ -192,8 +193,8 @@ | Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | | visionOS 1.0 | xros1.0 | 15.2 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | -| Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | +| Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | | DriverKit 22.1 | driverkit22.1 | 14.1 | | DriverKit 22.2 | driverkit22.2 | 14.2 | | DriverKit 22.4 | driverkit22.4 | 14.3.1 | @@ -230,7 +231,7 @@ | CMake | 3.22.1 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 26.3.11579264 (default)<br>27.1.12297006 | +| NDK | 26.3.11579264 (default)<br>27.2.12479018 | #### Environment variables | Name | Value | @@ -238,7 +239,7 @@ | ANDROID_HOME | /Users/runner/Library/Android/sdk | | ANDROID_NDK | /Users/runner/Library/Android/sdk/ndk/26.3.11579264 | | ANDROID_NDK_HOME | /Users/runner/Library/Android/sdk/ndk/26.3.11579264 | -| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/27.1.12297006 | +| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/27.2.12479018 | | ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk/26.3.11579264 | | ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | From e2b01435e89b4247a20f1473593118af48cf72b5 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 22 Oct 2024 11:19:30 +0000 Subject: [PATCH 3199/3485] Updating readme file for macos-14 version 20241014.202 (#10779) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-14-Readme.md | 68 +++++++++++++++++---------------- 1 file changed, 35 insertions(+), 33 deletions(-) diff --git a/images/macos/macos-14-Readme.md b/images/macos/macos-14-Readme.md index ebb3028586f3..dd9f5e007da4 100644 --- a/images/macos/macos-14-Readme.md +++ b/images/macos/macos-14-Readme.md @@ -9,12 +9,12 @@ # macOS 14 - OS Version: macOS 14.7 (23H124) - Kernel Version: Darwin 23.6.0 -- Image Version: 20241007.165 +- Image Version: 20241014.202 ## Installed Software ### Language and Runtime -- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.410, 8.0.101, 8.0.204, 8.0.303, 8.0.402 +- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.410, 8.0.101, 8.0.204, 8.0.303, 8.0.403 - Bash 3.2.57(1)-release - Clang/LLVM 14.0.3 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` @@ -24,12 +24,12 @@ - GNU Fortran 12 (Homebrew GCC 12.4.0) - available by `gfortran-12` alias - GNU Fortran 13 (Homebrew GCC 13.3.0) - available by `gfortran-13` alias - GNU Fortran 14 (Homebrew GCC 14.2.0) - available by `gfortran-14` alias -- Kotlin 2.0.20-release-360 +- Kotlin 2.0.21-release-482 - Mono 6.12.0.188 - Node.js 20.18.0 - Perl 5.38.2 - PHP 8.3.12 -- Python3 3.12.7 +- Python3 3.13.0 - Ruby 3.0.7p220 ### Package Management @@ -40,7 +40,7 @@ - Homebrew 4.4.0 - NPM 10.8.2 - NuGet 6.3.1.1 -- Pip3 24.2 (python 3.12) +- Pip3 24.2 (python 3.13) - Pipx 1.7.1 - RubyGems 3.5.21 - Yarn 1.22.22 @@ -58,7 +58,7 @@ - bazelisk 1.22.0 - bsdtar 3.5.3 - available by 'tar' alias - Curl 8.10.1 -- Git 2.46.2 +- Git 2.47.0 - Git LFS 3.5.1 - GitHub CLI 2.58.0 - GNU Tar 1.35 - available by 'gtar' alias @@ -72,16 +72,16 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.18.0 +- AWS CLI 2.18.5 - AWS SAM CLI 1.125.0 -- AWS Session Manager CLI 1.2.650.0 -- Azure CLI 2.64.0 +- AWS Session Manager CLI 1.2.677.0 +- Azure CLI 2.65.0 - Azure CLI (azure-devops) 1.0.1 - Bicep CLI 0.30.23 -- Cmake 3.30.4 -- CodeQL Action Bundle 2.19.0 +- Cmake 3.30.5 +- CodeQL Action Bundle 2.19.1 - Fastlane 2.224.0 -- SwiftFormat 0.54.5 +- SwiftFormat 0.54.6 - Xcbeautify 2.11.0 - Xcode Command Line Tools 16.0.0.0.1.1724870825 - Xcodes 1.5.0 @@ -92,12 +92,12 @@ ### Browsers - Safari 18.0.1 (19619.1.26.111.11) - SafariDriver 18.0.1 (19619.1.26.111.11) -- Google Chrome 129.0.6668.90 -- Google Chrome for Testing 129.0.6668.89 -- ChromeDriver 129.0.6668.89 -- Microsoft Edge 129.0.2792.79 -- Microsoft Edge WebDriver 129.0.2792.82 -- Mozilla Firefox 131.0 +- Google Chrome 129.0.6668.101 +- Google Chrome for Testing 129.0.6668.100 +- ChromeDriver 129.0.6668.100 +- Microsoft Edge 129.0.2792.89 +- Microsoft Edge WebDriver 129.0.2792.91 +- Mozilla Firefox 131.0.2 - geckodriver 0.35.0 - Selenium server 4.25.0 @@ -129,10 +129,11 @@ - 3.10.15 - 3.11.9 - 3.12.7 +- 3.13.0 #### Node.js - 18.20.4 -- 20.17.0 +- 20.18.0 #### Go - 1.21.13 @@ -153,21 +154,21 @@ - PowerShell 7.4.5 #### PowerShell Modules -- Az: 12.3.0 +- Az: 12.4.0 - Pester: 5.6.1 -- PSScriptAnalyzer: 1.22.0 +- PSScriptAnalyzer: 1.23.0 ### Xcode -| Version | Build | Path | -| -------------- | -------- | ----------------------------------- | -| 16.1 (beta) | 16B5014f | /Applications/Xcode_16.1_beta_2.app | -| 16.0 | 16A242d | /Applications/Xcode_16.app | -| 15.4 (default) | 15F31d | /Applications/Xcode_15.4.app | -| 15.3 | 15E204a | /Applications/Xcode_15.3.app | -| 15.2 | 15C500b | /Applications/Xcode_15.2.app | -| 15.1 | 15C65 | /Applications/Xcode_15.1.app | -| 15.0.1 | 15A507 | /Applications/Xcode_15.0.1.app | -| 14.3.1 | 14E300c | /Applications/Xcode_14.3.1.app | +| Version | Build | Path | Symlinks | +| -------------- | -------- | ----------------------------------- | -------------------------------------------------------------- | +| 16.1 (beta) | 16B5029d | /Applications/Xcode_16.1_beta_3.app | /Applications/Xcode_16.1.0.app<br>/Applications/Xcode_16.1.app | +| 16.0 | 16A242d | /Applications/Xcode_16.app | /Applications/Xcode_16.0.0.app<br>/Applications/Xcode_16.0.app | +| 15.4 (default) | 15F31d | /Applications/Xcode_15.4.app | /Applications/Xcode_15.4.0.app<br>/Applications/Xcode.app | +| 15.3 | 15E204a | /Applications/Xcode_15.3.app | /Applications/Xcode_15.3.0.app | +| 15.2 | 15C500b | /Applications/Xcode_15.2.app | /Applications/Xcode_15.2.0.app | +| 15.1 | 15C65 | /Applications/Xcode_15.1.app | /Applications/Xcode_15.1.0.app | +| 15.0.1 | 15A507 | /Applications/Xcode_15.0.1.app | /Applications/Xcode_15.0.app | +| 14.3.1 | 14E300c | /Applications/Xcode_14.3.1.app | /Applications/Xcode_14.3.app | #### Installed SDKs | SDK | SDK Name | Xcode Version | @@ -232,8 +233,8 @@ | Simulator - visionOS 2.1 | xrsimulator2.1 | 16.1 | | visionOS 2.1 | xros2.1 | 16.1 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | -| Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | +| Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | DriverKit 22.4 | driverkit22.4 | 14.3.1 | | DriverKit 23.0 | driverkit23.0 | 15.0.1 | | DriverKit 23.2 | driverkit23.2 | 15.1, 15.2 | @@ -292,11 +293,12 @@ | ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | ### Miscellaneous +- Tcl/Tk 8.6.15 #### Environment variables | Name | Value | | ----------------- | ----------------------------------------------------------------------------------------- | -| PARALLELS_DMG_URL | https://download.parallels.com/desktop/v20/20.0.1-55659/ParallelsDesktop-20.0.1-55659.dmg | +| PARALLELS_DMG_URL | https://download.parallels.com/desktop/v20/20.1.0-55732/ParallelsDesktop-20.1.0-55732.dmg | ##### Notes ``` From 4a0b4ab1fb88e3c87565bc645a2837593612d56f Mon Sep 17 00:00:00 2001 From: sureshe456 <160699174+sureshe456@users.noreply.github.com> Date: Tue, 22 Oct 2024 19:44:47 +0530 Subject: [PATCH 3200/3485] [macOS] Replace Xcode 16.1_beta_3 with Xcode 16.1 RC on macOS-14 and macOS-15 (#10836) --- images/macos/toolsets/toolset-14.json | 4 ++-- images/macos/toolsets/toolset-15.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/images/macos/toolsets/toolset-14.json b/images/macos/toolsets/toolset-14.json index 6554c1897542..b22baabe7265 100644 --- a/images/macos/toolsets/toolset-14.json +++ b/images/macos/toolsets/toolset-14.json @@ -3,7 +3,7 @@ "default": "15.4", "x64": { "versions": [ - { "link": "16.1_beta_3", "version": "16.1.0-Beta.3+16B5029d", "symlinks": ["16.1"], "runtimes": ["iOS", "watchOS", "tvOS"], "sha256": "e92ffd3cf7bb3ecb830ba94e8b2cbeb62743a80c6d73a5ae52ae792e4a897e5f"}, + { "link": "16.1_Release_Candidate", "version": "16.1_Release_Candidate+16B40", "symlinks": ["16.1"], "runtimes": ["iOS", "watchOS", "tvOS"], "sha256": "8ca961d55981f983d21b99a95a6b0ac04905b837f6e11346ee86d28f12afe720"}, { "link": "16", "version": "16.0.0+16A242d", "symlinks": ["16.0"], "runtimes": ["iOS", "watchOS", "tvOS"], "sha256": "4a26c3d102a55c7222fb145e0ee1503249c9c26c6e02dc64d783c8810b37b1e3"}, { "link": "15.4", "version": "15.4.0+15F31d", "runtimes": ["iOS", "watchOS", "tvOS"], "sha256": "82d3d61804ff3f4c7c82085e91dc701037ddaa770e542848b2477e22f4e8aa7a"}, { "link": "15.3", "version": "15.3.0+15E204a", "runtimes": ["iOS", "watchOS", "tvOS"], "sha256": "f13f6a2e2df432c3008e394640b8549a18c285acd7fd148d6c4bac8c3a5af234"}, @@ -15,7 +15,7 @@ }, "arm64":{ "versions": [ - { "link": "16.1_beta_3", "version": "16.1.0-Beta.3+16B5029d", "symlinks": ["16.1"], "runtimes": ["iOS", "watchOS", "tvOS"], "sha256": "e92ffd3cf7bb3ecb830ba94e8b2cbeb62743a80c6d73a5ae52ae792e4a897e5f"}, + { "link": "16.1_Release_Candidate", "version": "16.1_Release_Candidate+16B40", "symlinks": ["16.1"], "runtimes": ["iOS", "watchOS", "tvOS"], "sha256": "8ca961d55981f983d21b99a95a6b0ac04905b837f6e11346ee86d28f12afe720"}, { "link": "16", "version": "16.0.0+16A242d", "symlinks": ["16.0"], "runtimes": ["iOS", "watchOS", "tvOS"], "sha256": "4a26c3d102a55c7222fb145e0ee1503249c9c26c6e02dc64d783c8810b37b1e3"}, { "link": "15.4", "version": "15.4.0+15F31d", "runtimes": ["iOS", "watchOS", "tvOS"], "sha256": "82d3d61804ff3f4c7c82085e91dc701037ddaa770e542848b2477e22f4e8aa7a"}, { "link": "15.3", "version": "15.3.0+15E204a", "runtimes": ["iOS", "watchOS", "tvOS"], "sha256": "f13f6a2e2df432c3008e394640b8549a18c285acd7fd148d6c4bac8c3a5af234"}, diff --git a/images/macos/toolsets/toolset-15.json b/images/macos/toolsets/toolset-15.json index d4eff54172f3..246bd1b4c4a3 100644 --- a/images/macos/toolsets/toolset-15.json +++ b/images/macos/toolsets/toolset-15.json @@ -3,13 +3,13 @@ "default": "16", "x64": { "versions": [ - { "link": "16.1_beta_3", "version": "16.1.0-Beta.3+16B5029d", "symlinks": ["16.1"], "install_runtimes": "true", "sha256": "e92ffd3cf7bb3ecb830ba94e8b2cbeb62743a80c6d73a5ae52ae792e4a897e5f"}, + { "link": "16.1_Release_Candidate", "version": "16.1_Release_Candidate+16B40", "symlinks": ["16.1"], "install_runtimes": "true", "sha256": "8ca961d55981f983d21b99a95a6b0ac04905b837f6e11346ee86d28f12afe720"}, { "link": "16", "version": "16.0.0+16A242d", "symlinks": ["16.0"], "install_runtimes": "true", "sha256": "4a26c3d102a55c7222fb145e0ee1503249c9c26c6e02dc64d783c8810b37b1e3"} ] }, "arm64":{ "versions": [ - { "link": "16.1_beta_3", "version": "16.1.0-Beta.3+16B5029d", "symlinks": ["16.1"], "install_runtimes": "true", "sha256": "e92ffd3cf7bb3ecb830ba94e8b2cbeb62743a80c6d73a5ae52ae792e4a897e5f"}, + { "link": "16.1_Release_Candidate", "version": "16.1_Release_Candidate+16B40", "symlinks": ["16.1"], "install_runtimes": "true", "sha256": "8ca961d55981f983d21b99a95a6b0ac04905b837f6e11346ee86d28f12afe720"}, { "link": "16", "version": "16.0.0+16A242d", "symlinks": ["16.0"], "install_runtimes": "true", "sha256": "4a26c3d102a55c7222fb145e0ee1503249c9c26c6e02dc64d783c8810b37b1e3"} ] } From 949eeedc327478fdc922e41cfbffe8b348c21fe3 Mon Sep 17 00:00:00 2001 From: "Image generation service account." <no-reply@microsoft.com> Date: Tue, 22 Oct 2024 22:19:30 +0000 Subject: [PATCH 3201/3485] Updating readme file for macos-15-arm64 version 20241022.250 --- images/macos/macos-15-arm64-Readme.md | 101 +++++++++++++------------- 1 file changed, 51 insertions(+), 50 deletions(-) diff --git a/images/macos/macos-15-arm64-Readme.md b/images/macos/macos-15-arm64-Readme.md index 216d5b3451ba..3254251e5f14 100644 --- a/images/macos/macos-15-arm64-Readme.md +++ b/images/macos/macos-15-arm64-Readme.md @@ -1,15 +1,15 @@ | Announcements | |-| +| [[macOS] OpenSSL 1.1 will be removed and OpenSSL 3 will be the default for all macOS images from November 4](https://github.com/actions/runner-images/issues/10817) | +| [[macOS] Python 3.9 and 3.10 will be removed from macOS13 arm64 and macOS14 arm64 on November 18.](https://github.com/actions/runner-images/issues/10812) | | [[macOS] The macOS 12 Actions runner image will begin deprecation on 10/7/24 and will be fully unsupported by 12/3/24 for GitHub and ADO](https://github.com/actions/runner-images/issues/10721) | -| [[macOS] Support policy changes; Xcode 14 and 16 will be removed from macOS 14 on October 28](https://github.com/actions/runner-images/issues/10703) | +| [[macOS] Support policy changes; Xcode 14 and 16 will be removed from macOS 14 on November 4](https://github.com/actions/runner-images/issues/10703) | | [macOS 15 (Sequoia) is now available as a public beta in GitHub Actions](https://github.com/actions/runner-images/issues/10686) | -| [[Macos 13 and 14] Android NDK versions <=25 will be removed from images on October 07,2024](https://github.com/actions/runner-images/issues/10614) | -| [[Macos 13 and 14] Go version 1.20.0 will be removed on October 07,2024.](https://github.com/actions/runner-images/issues/10612) | *** # macOS 15 -- OS Version: macOS 15.0 (24A335) +- OS Version: macOS 15.0.1 (24A348) - Kernel Version: Darwin 24.0.0 -- Image Version: 20241014.193 +- Image Version: 20241022.250 ## Installed Software @@ -25,20 +25,20 @@ - GNU Fortran 13 (Homebrew GCC 13.3.0) - available by `gfortran-13` alias - GNU Fortran 14 (Homebrew GCC 14.2.0) - available by `gfortran-14` alias - Kotlin 2.0.21-release-482 -- Node.js 22.9.0 -- Perl 5.38.2 +- Node.js 22.10.0 +- Perl 5.40.0 - Python3 3.13.0 - Ruby 3.3.5 ### Package Management -- Bundler 2.5.21 +- Bundler 2.5.22 - Carthage 0.40.0 - CocoaPods 1.15.2 -- Homebrew 4.4.0 -- NPM 10.8.3 +- Homebrew 4.4.2 +- NPM 10.9.0 - Pip3 24.2 (python 3.13) - Pipx 1.7.1 -- RubyGems 3.5.21 +- RubyGems 3.5.22 - Yarn 1.22.22 ### Project Management @@ -51,12 +51,12 @@ - aria2 1.37.0 - azcopy 10.26.0 - bazel 7.3.2 -- bazelisk 1.22.0 +- bazelisk 1.22.1 - bsdtar 3.5.3 - available by 'tar' alias - Curl 8.7.1 - Git 2.47.0 - Git LFS 3.5.1 -- GitHub CLI 2.58.0 +- GitHub CLI 2.59.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.24.5 - gpg (GnuPG) 2.4.5 @@ -68,28 +68,28 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.18.5 -- AWS SAM CLI 1.125.0 +- AWS CLI 2.18.11 +- AWS SAM CLI 1.126.0 - AWS Session Manager CLI 1.2.677.0 - Azure CLI 2.65.0 - Azure CLI (azure-devops) 1.0.1 - Bicep CLI 0.30.23 - Cmake 3.30.5 - CodeQL Action Bundle 2.19.1 -- Fastlane 2.224.0 +- Fastlane 2.225.0 - SwiftFormat 0.54.6 -- Xcbeautify 2.11.0 +- Xcbeautify 2.14.1 - Xcode Command Line Tools 16.0.0.0.1.1724870825 - Xcodes 1.5.0 ### Linters ### Browsers -- Safari 18.0 (20619.1.26.31.6) -- SafariDriver 18.0 (20619.1.26.31.6) -- Google Chrome 129.0.6668.101 -- Google Chrome for Testing 129.0.6668.100 -- ChromeDriver 129.0.6668.100 +- Safari 18.0.1 (20619.1.26.31.7) +- SafariDriver 18.0.1 (20619.1.26.31.7) +- Google Chrome 130.0.6723.59 +- Google Chrome for Testing 130.0.6723.58 +- ChromeDriver 130.0.6723.58 - Selenium server 4.25.0 #### Environment variables @@ -100,11 +100,11 @@ | GECKOWEBDRIVER | | ### Java -| Version | Environment Variable | -| -------------------- | -------------------- | -| 11.0.24+8 | JAVA_HOME_11_arm64 | -| 17.0.12+7 | JAVA_HOME_17_arm64 | -| 21.0.4+7.0 (default) | JAVA_HOME_21_arm64 | +| Version | Environment Variable | +| --------------------- | -------------------- | +| 11.0.24+8 | JAVA_HOME_11_arm64 | +| 17.0.13+11 | JAVA_HOME_17_arm64 | +| 21.0.5+11.0 (default) | JAVA_HOME_21_arm64 | ### Cached Tools @@ -116,6 +116,7 @@ #### Node.js - 18.20.4 - 20.18.0 +- 22.10.0 #### Go - 1.21.13 @@ -123,13 +124,13 @@ - 1.23.2 ### Rust Tools -- Cargo 1.81.0 -- Rust 1.81.0 -- Rustdoc 1.81.0 +- Cargo 1.82.0 +- Rust 1.82.0 +- Rustdoc 1.82.0 - Rustup 1.27.1 #### Packages -- Clippy 0.1.81 +- Clippy 0.1.82 - Rustfmt 1.7.1-stable ### PowerShell Tools @@ -141,10 +142,10 @@ - PSScriptAnalyzer: 1.23.0 ### Xcode -| Version | Build | Path | Symlinks | -| -------------- | -------- | ----------------------------------- | ----------------------------------------------------------------------------------------- | -| 16.1 (beta) | 16B5029d | /Applications/Xcode_16.1_beta_3.app | /Applications/Xcode_16.1.0.app<br>/Applications/Xcode_16.1.app | -| 16.0 (default) | 16A242d | /Applications/Xcode_16.app | /Applications/Xcode_16.0.0.app<br>/Applications/Xcode_16.0.app<br>/Applications/Xcode.app | +| Version | Build | Path | Symlinks | +| -------------- | ------- | ---------------------------------------------- | ----------------------------------------------------------------------------------------- | +| 16.1 | 16B40 | /Applications/Xcode_16.1_Release_Candidate.app | /Applications/Xcode_16.1.0.app<br>/Applications/Xcode_16.1.app | +| 16.0 (default) | 16A242d | /Applications/Xcode_16.app | /Applications/Xcode_16.0.0.app<br>/Applications/Xcode_16.0.app<br>/Applications/Xcode.app | #### Installed SDKs | SDK | SDK Name | Xcode Version | @@ -171,16 +172,16 @@ | DriverKit 24.1 | driverkit24.1 | 16.1 | #### Installed Simulators -| OS | Simulators | -| ------------ | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| iOS 18.0 | iPhone 16<br>iPhone 16 Plus<br>iPhone 16 Pro<br>iPhone 16 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | -| iOS 18.1 | iPhone 16<br>iPhone 16 Plus<br>iPhone 16 Pro<br>iPhone 16 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | -| tvOS 18.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 18.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| watchOS 11.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 10 (42mm)<br>Apple Watch Series 10 (46mm)<br>Apple Watch Ultra 2 (49mm) | -| watchOS 11.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 10 (42mm)<br>Apple Watch Series 10 (46mm)<br>Apple Watch Ultra 2 (49mm) | -| visionOS 2.0 | Apple Vision Pro | -| visionOS 2.1 | Apple Vision Pro | +| OS | Simulators | +| ------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| iOS 18.0 | iPhone 16<br>iPhone 16 Plus<br>iPhone 16 Pro<br>iPhone 16 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | +| iOS 18.1 | iPhone 16<br>iPhone 16 Plus<br>iPhone 16 Pro<br>iPhone 16 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad mini (A17 Pro)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | +| tvOS 18.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 18.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| watchOS 11.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 10 (42mm)<br>Apple Watch Series 10 (46mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 11.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 10 (42mm)<br>Apple Watch Series 10 (46mm)<br>Apple Watch Ultra 2 (49mm) | +| visionOS 2.0 | Apple Vision Pro | +| visionOS 2.1 | Apple Vision Pro | ### Android | Package Name | Version | @@ -192,15 +193,15 @@ | CMake | 3.22.1 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 26.3.11579264<br>27.1.12297006 (default) | +| NDK | 26.3.11579264<br>27.2.12479018 (default) | #### Environment variables | Name | Value | | ----------------------- | --------------------------------------------------- | | ANDROID_HOME | /Users/runner/Library/Android/sdk | -| ANDROID_NDK | /Users/runner/Library/Android/sdk/ndk/27.1.12297006 | -| ANDROID_NDK_HOME | /Users/runner/Library/Android/sdk/ndk/27.1.12297006 | -| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/27.1.12297006 | -| ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk/27.1.12297006 | +| ANDROID_NDK | /Users/runner/Library/Android/sdk/ndk/27.2.12479018 | +| ANDROID_NDK_HOME | /Users/runner/Library/Android/sdk/ndk/27.2.12479018 | +| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/27.2.12479018 | +| ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk/27.2.12479018 | | ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | From fc001c04935dd1ef6bc4777316b7134a9fb0b2b7 Mon Sep 17 00:00:00 2001 From: "Image generation service account." <no-reply@microsoft.com> Date: Tue, 22 Oct 2024 22:21:07 +0000 Subject: [PATCH 3202/3485] Updating readme file for macos-15 version 20241022.244 --- images/macos/macos-15-Readme.md | 105 ++++++++++++++++---------------- 1 file changed, 53 insertions(+), 52 deletions(-) diff --git a/images/macos/macos-15-Readme.md b/images/macos/macos-15-Readme.md index 3ef77a3a3f4f..674babca6e2f 100644 --- a/images/macos/macos-15-Readme.md +++ b/images/macos/macos-15-Readme.md @@ -1,15 +1,15 @@ | Announcements | |-| +| [[macOS] OpenSSL 1.1 will be removed and OpenSSL 3 will be the default for all macOS images from November 4](https://github.com/actions/runner-images/issues/10817) | +| [[macOS] Python 3.9 and 3.10 will be removed from macOS13 arm64 and macOS14 arm64 on November 18.](https://github.com/actions/runner-images/issues/10812) | | [[macOS] The macOS 12 Actions runner image will begin deprecation on 10/7/24 and will be fully unsupported by 12/3/24 for GitHub and ADO](https://github.com/actions/runner-images/issues/10721) | -| [[macOS] Support policy changes; Xcode 14 and 16 will be removed from macOS 14 on October 28](https://github.com/actions/runner-images/issues/10703) | +| [[macOS] Support policy changes; Xcode 14 and 16 will be removed from macOS 14 on November 4](https://github.com/actions/runner-images/issues/10703) | | [macOS 15 (Sequoia) is now available as a public beta in GitHub Actions](https://github.com/actions/runner-images/issues/10686) | -| [[Macos 13 and 14] Android NDK versions <=25 will be removed from images on October 07,2024](https://github.com/actions/runner-images/issues/10614) | -| [[Macos 13 and 14] Go version 1.20.0 will be removed on October 07,2024.](https://github.com/actions/runner-images/issues/10612) | *** # macOS 15 -- OS Version: macOS 15.0 (24A335) +- OS Version: macOS 15.0.1 (24A348) - Kernel Version: Darwin 24.0.0 -- Image Version: 20241014.202 +- Image Version: 20241022.244 ## Installed Software @@ -25,22 +25,22 @@ - GNU Fortran 13 (Homebrew GCC 13.3.0) - available by `gfortran-13` alias - GNU Fortran 14 (Homebrew GCC 14.2.0) - available by `gfortran-14` alias - Kotlin 2.0.21-release-482 -- Node.js 22.9.0 -- Perl 5.38.2 +- Node.js 22.10.0 +- Perl 5.40.0 - PHP 8.3.12 - Python3 3.13.0 - Ruby 3.3.5 ### Package Management -- Bundler 2.5.21 +- Bundler 2.5.22 - Carthage 0.40.0 - CocoaPods 1.15.2 - Composer 2.8.1 -- Homebrew 4.4.0 -- NPM 10.8.3 +- Homebrew 4.4.2 +- NPM 10.9.0 - Pip3 24.2 (python 3.13) - Pipx 1.7.1 -- RubyGems 3.5.21 +- RubyGems 3.5.22 - Yarn 1.22.22 ### Project Management @@ -53,12 +53,12 @@ - aria2 1.37.0 - azcopy 10.26.0 - bazel 7.3.2 -- bazelisk 1.22.0 +- bazelisk 1.22.1 - bsdtar 3.5.3 - available by 'tar' alias - Curl 8.10.1 - Git 2.47.0 - Git LFS 3.5.1 -- GitHub CLI 2.58.0 +- GitHub CLI 2.59.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.24.5 - gpg (GnuPG) 2.4.5 @@ -70,17 +70,17 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.18.5 -- AWS SAM CLI 1.125.0 +- AWS CLI 2.18.11 +- AWS SAM CLI 1.126.0 - AWS Session Manager CLI 1.2.677.0 - Azure CLI 2.65.0 - Azure CLI (azure-devops) 1.0.1 - Bicep CLI 0.30.23 - Cmake 3.30.5 -- CodeQL Action Bundle 2.19.1 -- Fastlane 2.224.0 +- CodeQL Action Bundle 2.19.2 +- Fastlane 2.225.0 - SwiftFormat 0.54.6 -- Xcbeautify 2.11.0 +- Xcbeautify 2.14.1 - Xcode Command Line Tools 16.0.0.0.1.1724870825 - Xcodes 1.5.0 @@ -88,14 +88,14 @@ - SwiftLint 0.57.0 ### Browsers -- Safari 18.0 (20619.1.26.31.6) -- SafariDriver 18.0 (20619.1.26.31.6) -- Google Chrome 129.0.6668.101 -- Google Chrome for Testing 129.0.6668.100 -- ChromeDriver 129.0.6668.100 -- Microsoft Edge 129.0.2792.89 -- Microsoft Edge WebDriver 129.0.2792.91 -- Mozilla Firefox 131.0.2 +- Safari 18.0.1 (20619.1.26.31.7) +- SafariDriver 18.0.1 (20619.1.26.31.7) +- Google Chrome 130.0.6723.59 +- Google Chrome for Testing 130.0.6723.58 +- ChromeDriver 130.0.6723.58 +- Microsoft Edge 130.0.2849.46 +- Microsoft Edge WebDriver 130.0.2849.50 +- Mozilla Firefox 131.0.3 - geckodriver 0.35.0 - Selenium server 4.25.0 @@ -107,11 +107,11 @@ | GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | ### Java -| Version | Environment Variable | -| -------------------- | -------------------- | -| 11.0.24+8 | JAVA_HOME_11_X64 | -| 17.0.12+7 | JAVA_HOME_17_X64 | -| 21.0.4+7.0 (default) | JAVA_HOME_21_X64 | +| Version | Environment Variable | +| --------------------- | -------------------- | +| 11.0.25+9 | JAVA_HOME_11_X64 | +| 17.0.13+11 | JAVA_HOME_17_X64 | +| 21.0.5+11.0 (default) | JAVA_HOME_21_X64 | ### Cached Tools @@ -129,6 +129,7 @@ #### Node.js - 18.20.4 - 20.18.0 +- 22.10.0 #### Go - 1.21.13 @@ -136,13 +137,13 @@ - 1.23.2 ### Rust Tools -- Cargo 1.81.0 -- Rust 1.81.0 -- Rustdoc 1.81.0 +- Cargo 1.82.0 +- Rust 1.82.0 +- Rustdoc 1.82.0 - Rustup 1.27.1 #### Packages -- Clippy 0.1.81 +- Clippy 0.1.82 - Rustfmt 1.7.1-stable ### PowerShell Tools @@ -154,10 +155,10 @@ - PSScriptAnalyzer: 1.23.0 ### Xcode -| Version | Build | Path | Symlinks | -| -------------- | -------- | ----------------------------------- | ----------------------------------------------------------------------------------------- | -| 16.1 (beta) | 16B5029d | /Applications/Xcode_16.1_beta_3.app | /Applications/Xcode_16.1.0.app<br>/Applications/Xcode_16.1.app | -| 16.0 (default) | 16A242d | /Applications/Xcode_16.app | /Applications/Xcode_16.0.0.app<br>/Applications/Xcode_16.0.app<br>/Applications/Xcode.app | +| Version | Build | Path | Symlinks | +| -------------- | ------- | ---------------------------------------------- | ----------------------------------------------------------------------------------------- | +| 16.1 | 16B40 | /Applications/Xcode_16.1_Release_Candidate.app | /Applications/Xcode_16.1.0.app<br>/Applications/Xcode_16.1.app | +| 16.0 (default) | 16A242d | /Applications/Xcode_16.app | /Applications/Xcode_16.0.0.app<br>/Applications/Xcode_16.0.app<br>/Applications/Xcode.app | #### Installed SDKs | SDK | SDK Name | Xcode Version | @@ -184,14 +185,14 @@ | DriverKit 24.1 | driverkit24.1 | 16.1 | #### Installed Simulators -| OS | Simulators | -| ------------ | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| iOS 18.0 | iPhone 16<br>iPhone 16 Plus<br>iPhone 16 Pro<br>iPhone 16 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | -| iOS 18.1 | iPhone 16<br>iPhone 16 Plus<br>iPhone 16 Pro<br>iPhone 16 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | -| tvOS 18.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 18.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| watchOS 11.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 10 (42mm)<br>Apple Watch Series 10 (46mm)<br>Apple Watch Ultra 2 (49mm) | -| watchOS 11.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 10 (42mm)<br>Apple Watch Series 10 (46mm)<br>Apple Watch Ultra 2 (49mm) | +| OS | Simulators | +| ------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| iOS 18.0 | iPhone 16<br>iPhone 16 Plus<br>iPhone 16 Pro<br>iPhone 16 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | +| iOS 18.1 | iPhone 16<br>iPhone 16 Plus<br>iPhone 16 Pro<br>iPhone 16 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad mini (A17 Pro)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | +| tvOS 18.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 18.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| watchOS 11.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 10 (42mm)<br>Apple Watch Series 10 (46mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 11.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 10 (42mm)<br>Apple Watch Series 10 (46mm)<br>Apple Watch Ultra 2 (49mm) | ### Android | Package Name | Version | @@ -203,15 +204,15 @@ | CMake | 3.22.1 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 26.3.11579264<br>27.1.12297006 (default) | +| NDK | 26.3.11579264<br>27.2.12479018 (default) | #### Environment variables | Name | Value | | ----------------------- | --------------------------------------------------- | | ANDROID_HOME | /Users/runner/Library/Android/sdk | -| ANDROID_NDK | /Users/runner/Library/Android/sdk/ndk/27.1.12297006 | -| ANDROID_NDK_HOME | /Users/runner/Library/Android/sdk/ndk/27.1.12297006 | -| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/27.1.12297006 | -| ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk/27.1.12297006 | +| ANDROID_NDK | /Users/runner/Library/Android/sdk/ndk/27.2.12479018 | +| ANDROID_NDK_HOME | /Users/runner/Library/Android/sdk/ndk/27.2.12479018 | +| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/27.2.12479018 | +| ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk/27.2.12479018 | | ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | From c6a4b16561af937409951ee155fa89e0c14bd635 Mon Sep 17 00:00:00 2001 From: "Image generation service account." <no-reply@microsoft.com> Date: Tue, 22 Oct 2024 23:00:41 +0000 Subject: [PATCH 3203/3485] Updating readme file for macos-14 version 20241022.254 --- images/macos/macos-14-Readme.md | 139 ++++++++++++++++---------------- 1 file changed, 70 insertions(+), 69 deletions(-) diff --git a/images/macos/macos-14-Readme.md b/images/macos/macos-14-Readme.md index dd9f5e007da4..e805b362bb38 100644 --- a/images/macos/macos-14-Readme.md +++ b/images/macos/macos-14-Readme.md @@ -1,15 +1,15 @@ | Announcements | |-| +| [[macOS] OpenSSL 1.1 will be removed and OpenSSL 3 will be the default for all macOS images from November 4](https://github.com/actions/runner-images/issues/10817) | +| [[macOS] Python 3.9 and 3.10 will be removed from macOS13 arm64 and macOS14 arm64 on November 18.](https://github.com/actions/runner-images/issues/10812) | | [[macOS] The macOS 12 Actions runner image will begin deprecation on 10/7/24 and will be fully unsupported by 12/3/24 for GitHub and ADO](https://github.com/actions/runner-images/issues/10721) | -| [[macOS] Support policy changes; Xcode 14 and 16 will be removed from macOS 14 on October 28](https://github.com/actions/runner-images/issues/10703) | +| [[macOS] Support policy changes; Xcode 14 and 16 will be removed from macOS 14 on November 4](https://github.com/actions/runner-images/issues/10703) | | [macOS 15 (Sequoia) is now available as a public beta in GitHub Actions](https://github.com/actions/runner-images/issues/10686) | -| [[Macos 13 and 14] Android NDK versions <=25 will be removed from images on October 07,2024](https://github.com/actions/runner-images/issues/10614) | -| [[Macos 13 and 14] Go version 1.20.0 will be removed on October 07,2024.](https://github.com/actions/runner-images/issues/10612) | *** # macOS 14 - OS Version: macOS 14.7 (23H124) - Kernel Version: Darwin 23.6.0 -- Image Version: 20241014.202 +- Image Version: 20241022.254 ## Installed Software @@ -27,22 +27,22 @@ - Kotlin 2.0.21-release-482 - Mono 6.12.0.188 - Node.js 20.18.0 -- Perl 5.38.2 +- Perl 5.40.0 - PHP 8.3.12 - Python3 3.13.0 - Ruby 3.0.7p220 ### Package Management -- Bundler 2.5.21 +- Bundler 2.5.22 - Carthage 0.40.0 - CocoaPods 1.15.2 - Composer 2.8.1 -- Homebrew 4.4.0 +- Homebrew 4.4.2 - NPM 10.8.2 - NuGet 6.3.1.1 - Pip3 24.2 (python 3.13) - Pipx 1.7.1 -- RubyGems 3.5.21 +- RubyGems 3.5.22 - Yarn 1.22.22 ### Project Management @@ -55,12 +55,12 @@ - aria2 1.37.0 - azcopy 10.26.0 - bazel 7.3.2 -- bazelisk 1.22.0 +- bazelisk 1.22.1 - bsdtar 3.5.3 - available by 'tar' alias - Curl 8.10.1 - Git 2.47.0 - Git LFS 3.5.1 -- GitHub CLI 2.58.0 +- GitHub CLI 2.59.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.24.5 - gpg (GnuPG) 2.4.5 @@ -72,17 +72,17 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.18.5 -- AWS SAM CLI 1.125.0 +- AWS CLI 2.18.11 +- AWS SAM CLI 1.126.0 - AWS Session Manager CLI 1.2.677.0 - Azure CLI 2.65.0 - Azure CLI (azure-devops) 1.0.1 - Bicep CLI 0.30.23 - Cmake 3.30.5 -- CodeQL Action Bundle 2.19.1 -- Fastlane 2.224.0 +- CodeQL Action Bundle 2.19.2 +- Fastlane 2.225.0 - SwiftFormat 0.54.6 -- Xcbeautify 2.11.0 +- Xcbeautify 2.14.1 - Xcode Command Line Tools 16.0.0.0.1.1724870825 - Xcodes 1.5.0 @@ -92,12 +92,12 @@ ### Browsers - Safari 18.0.1 (19619.1.26.111.11) - SafariDriver 18.0.1 (19619.1.26.111.11) -- Google Chrome 129.0.6668.101 -- Google Chrome for Testing 129.0.6668.100 -- ChromeDriver 129.0.6668.100 -- Microsoft Edge 129.0.2792.89 -- Microsoft Edge WebDriver 129.0.2792.91 -- Mozilla Firefox 131.0.2 +- Google Chrome 130.0.6723.59 +- Google Chrome for Testing 130.0.6723.58 +- ChromeDriver 130.0.6723.58 +- Microsoft Edge 130.0.2849.46 +- Microsoft Edge WebDriver 130.0.2849.50 +- Mozilla Firefox 131.0.3 - geckodriver 0.35.0 - Selenium server 4.25.0 @@ -109,12 +109,12 @@ | GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | ### Java -| Version | Environment Variable | -| -------------------- | -------------------- | -| 8.0.422+5.1 | JAVA_HOME_8_X64 | -| 11.0.24+8 | JAVA_HOME_11_X64 | -| 17.0.12+7 | JAVA_HOME_17_X64 | -| 21.0.4+7.0 (default) | JAVA_HOME_21_X64 | +| Version | Environment Variable | +| --------------------- | -------------------- | +| 8.0.432+6 | JAVA_HOME_8_X64 | +| 11.0.25+9 | JAVA_HOME_11_X64 | +| 17.0.13+11 | JAVA_HOME_17_X64 | +| 21.0.5+11.0 (default) | JAVA_HOME_21_X64 | ### Cached Tools @@ -134,6 +134,7 @@ #### Node.js - 18.20.4 - 20.18.0 +- 22.10.0 #### Go - 1.21.13 @@ -141,13 +142,13 @@ - 1.23.2 ### Rust Tools -- Cargo 1.81.0 -- Rust 1.81.0 -- Rustdoc 1.81.0 +- Cargo 1.82.0 +- Rust 1.82.0 +- Rustdoc 1.82.0 - Rustup 1.27.1 #### Packages -- Clippy 0.1.81 +- Clippy 0.1.82 - Rustfmt 1.7.1-stable ### PowerShell Tools @@ -159,16 +160,16 @@ - PSScriptAnalyzer: 1.23.0 ### Xcode -| Version | Build | Path | Symlinks | -| -------------- | -------- | ----------------------------------- | -------------------------------------------------------------- | -| 16.1 (beta) | 16B5029d | /Applications/Xcode_16.1_beta_3.app | /Applications/Xcode_16.1.0.app<br>/Applications/Xcode_16.1.app | -| 16.0 | 16A242d | /Applications/Xcode_16.app | /Applications/Xcode_16.0.0.app<br>/Applications/Xcode_16.0.app | -| 15.4 (default) | 15F31d | /Applications/Xcode_15.4.app | /Applications/Xcode_15.4.0.app<br>/Applications/Xcode.app | -| 15.3 | 15E204a | /Applications/Xcode_15.3.app | /Applications/Xcode_15.3.0.app | -| 15.2 | 15C500b | /Applications/Xcode_15.2.app | /Applications/Xcode_15.2.0.app | -| 15.1 | 15C65 | /Applications/Xcode_15.1.app | /Applications/Xcode_15.1.0.app | -| 15.0.1 | 15A507 | /Applications/Xcode_15.0.1.app | /Applications/Xcode_15.0.app | -| 14.3.1 | 14E300c | /Applications/Xcode_14.3.1.app | /Applications/Xcode_14.3.app | +| Version | Build | Path | Symlinks | +| -------------- | ------- | ---------------------------------------------- | -------------------------------------------------------------- | +| 16.1 | 16B40 | /Applications/Xcode_16.1_Release_Candidate.app | /Applications/Xcode_16.1.0.app<br>/Applications/Xcode_16.1.app | +| 16.0 | 16A242d | /Applications/Xcode_16.app | /Applications/Xcode_16.0.0.app<br>/Applications/Xcode_16.0.app | +| 15.4 (default) | 15F31d | /Applications/Xcode_15.4.app | /Applications/Xcode_15.4.0.app<br>/Applications/Xcode.app | +| 15.3 | 15E204a | /Applications/Xcode_15.3.app | /Applications/Xcode_15.3.0.app | +| 15.2 | 15C500b | /Applications/Xcode_15.2.app | /Applications/Xcode_15.2.0.app | +| 15.1 | 15C65 | /Applications/Xcode_15.1.app | /Applications/Xcode_15.1.0.app | +| 15.0.1 | 15A507 | /Applications/Xcode_15.0.1.app | /Applications/Xcode_15.0.app | +| 14.3.1 | 14E300c | /Applications/Xcode_14.3.1.app | /Applications/Xcode_14.3.app | #### Installed SDKs | SDK | SDK Name | Xcode Version | @@ -224,17 +225,17 @@ | Simulator - watchOS 11.1 | watchsimulator11.1 | 16.1 | | Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | | visionOS 1.0 | xros1.0 | 15.2 | -| visionOS 1.1 | xros1.1 | 15.3 | | Simulator - visionOS 1.1 | xrsimulator1.1 | 15.3 | +| visionOS 1.1 | xros1.1 | 15.3 | | visionOS 1.2 | xros1.2 | 15.4 | | Simulator - visionOS 1.2 | xrsimulator1.2 | 15.4 | | Simulator - visionOS 2.0 | xrsimulator2.0 | 16.0 | | visionOS 2.0 | xros2.0 | 16.0 | -| Simulator - visionOS 2.1 | xrsimulator2.1 | 16.1 | | visionOS 2.1 | xros2.1 | 16.1 | +| Simulator - visionOS 2.1 | xrsimulator2.1 | 16.1 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | -| Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | +| Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | | DriverKit 22.4 | driverkit22.4 | 14.3.1 | | DriverKit 23.0 | driverkit23.0 | 15.0.1 | | DriverKit 23.2 | driverkit23.2 | 15.1, 15.2 | @@ -244,29 +245,29 @@ | DriverKit 24.1 | driverkit24.1 | 16.1 | #### Installed Simulators -| OS | Simulators | -| ------------ | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| iOS 16.4 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 17.0 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 17.2 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 17.4 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | -| iOS 17.5 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | -| iOS 18.0 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone 16<br>iPhone 16 Plus<br>iPhone 16 Pro<br>iPhone 16 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | -| iOS 18.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone 16<br>iPhone 16 Plus<br>iPhone 16 Pro<br>iPhone 16 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | -| tvOS 16.4 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 17.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 17.2 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 17.4 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 17.5 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 18.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 18.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| watchOS 9.4 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | -| watchOS 10.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | -| watchOS 10.2 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | -| watchOS 10.4 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | -| watchOS 10.5 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | -| watchOS 11.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 10 (42mm)<br>Apple Watch Series 10 (46mm)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | -| watchOS 11.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 10 (42mm)<br>Apple Watch Series 10 (46mm)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | +| OS | Simulators | +| ------------ | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| iOS 16.4 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 17.0 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 17.2 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 17.4 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | +| iOS 17.5 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | +| iOS 18.0 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone 16<br>iPhone 16 Plus<br>iPhone 16 Pro<br>iPhone 16 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | +| iOS 18.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone 16<br>iPhone 16 Plus<br>iPhone 16 Pro<br>iPhone 16 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad mini (A17 Pro)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | +| tvOS 16.4 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 17.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 17.2 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 17.4 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 17.5 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 18.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 18.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| watchOS 9.4 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | +| watchOS 10.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 10.2 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 10.4 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 10.5 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 11.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 10 (42mm)<br>Apple Watch Series 10 (46mm)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 11.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 10 (42mm)<br>Apple Watch Series 10 (46mm)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | ### Android | Package Name | Version | @@ -280,7 +281,7 @@ | CMake | 3.22.1 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 26.3.11579264 (default)<br>27.1.12297006 | +| NDK | 26.3.11579264 (default)<br>27.2.12479018 | #### Environment variables | Name | Value | @@ -288,7 +289,7 @@ | ANDROID_HOME | /Users/runner/Library/Android/sdk | | ANDROID_NDK | /Users/runner/Library/Android/sdk/ndk/26.3.11579264 | | ANDROID_NDK_HOME | /Users/runner/Library/Android/sdk/ndk/26.3.11579264 | -| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/27.1.12297006 | +| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/27.2.12479018 | | ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk/26.3.11579264 | | ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | From 7b927d98985c292077086c0bd1490416861a72f8 Mon Sep 17 00:00:00 2001 From: "Image generation service account." <no-reply@microsoft.com> Date: Wed, 23 Oct 2024 01:03:26 +0000 Subject: [PATCH 3204/3485] Updating readme file for macos-14-arm64 version 20241022.361 --- images/macos/macos-14-arm64-Readme.md | 129 +++++++++++++------------- 1 file changed, 66 insertions(+), 63 deletions(-) diff --git a/images/macos/macos-14-arm64-Readme.md b/images/macos/macos-14-arm64-Readme.md index a988c494e10f..923873c50b85 100644 --- a/images/macos/macos-14-arm64-Readme.md +++ b/images/macos/macos-14-arm64-Readme.md @@ -1,13 +1,15 @@ | Announcements | |-| +| [[macOS] OpenSSL 1.1 will be removed and OpenSSL 3 will be the default for all macOS images from November 4](https://github.com/actions/runner-images/issues/10817) | +| [[macOS] Python 3.9 and 3.10 will be removed from macOS13 arm64 and macOS14 arm64 on November 18.](https://github.com/actions/runner-images/issues/10812) | | [[macOS] The macOS 12 Actions runner image will begin deprecation on 10/7/24 and will be fully unsupported by 12/3/24 for GitHub and ADO](https://github.com/actions/runner-images/issues/10721) | -| [[macOS] Support policy changes; Xcode 14 and 16 will be removed from macOS 14 on October 28](https://github.com/actions/runner-images/issues/10703) | +| [[macOS] Support policy changes; Xcode 14 and 16 will be removed from macOS 14 on November 4](https://github.com/actions/runner-images/issues/10703) | | [macOS 15 (Sequoia) is now available as a public beta in GitHub Actions](https://github.com/actions/runner-images/issues/10686) | *** # macOS 14 - OS Version: macOS 14.7 (23H124) - Kernel Version: Darwin 23.6.0 -- Image Version: 20241014.301 +- Image Version: 20241022.361 ## Installed Software @@ -25,20 +27,20 @@ - Kotlin 2.0.21-release-482 - Mono 6.12.0.188 - Node.js 20.18.0 -- Perl 5.38.2 +- Perl 5.40.0 - Python3 3.13.0 - Ruby 3.0.7p220 ### Package Management -- Bundler 2.5.21 +- Bundler 2.5.22 - Carthage 0.40.0 - CocoaPods 1.15.2 -- Homebrew 4.4.0 +- Homebrew 4.4.2 - NPM 10.8.2 - NuGet 6.3.1.1 - Pip3 24.2 (python 3.13) - Pipx 1.7.1 -- RubyGems 3.5.21 +- RubyGems 3.5.22 - Yarn 1.22.22 ### Project Management @@ -51,12 +53,12 @@ - aria2 1.37.0 - azcopy 10.26.0 - bazel 7.3.2 -- bazelisk 1.22.0 +- bazelisk 1.22.1 - bsdtar 3.5.3 - available by 'tar' alias - Curl 8.7.1 - Git 2.47.0 - Git LFS 3.5.1 -- GitHub CLI 2.58.0 +- GitHub CLI 2.59.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.24.5 - gpg (GnuPG) 2.4.5 @@ -68,17 +70,17 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.18.5 -- AWS SAM CLI 1.125.0 +- AWS CLI 2.18.11 +- AWS SAM CLI 1.126.0 - AWS Session Manager CLI 1.2.677.0 - Azure CLI 2.65.0 - Azure CLI (azure-devops) 1.0.1 - Bicep CLI 0.30.23 - Cmake 3.30.5 - CodeQL Action Bundle 2.19.1 -- Fastlane 2.224.0 +- Fastlane 2.225.0 - SwiftFormat 0.54.6 -- Xcbeautify 2.11.0 +- Xcbeautify 2.14.1 - Xcode Command Line Tools 16.0.0.0.1.1724870825 - Xcodes 1.5.0 @@ -87,9 +89,9 @@ ### Browsers - Safari 18.0.1 (19619.1.26.111.11) - SafariDriver 18.0.1 (19619.1.26.111.11) -- Google Chrome 129.0.6668.101 -- Google Chrome for Testing 129.0.6668.100 -- ChromeDriver 129.0.6668.100 +- Google Chrome 130.0.6723.59 +- Google Chrome for Testing 130.0.6723.58 +- ChromeDriver 130.0.6723.58 - Selenium server 4.25.0 #### Environment variables @@ -100,11 +102,11 @@ | GECKOWEBDRIVER | | ### Java -| Version | Environment Variable | -| -------------------- | -------------------- | -| 11.0.24+8 | JAVA_HOME_11_arm64 | -| 17.0.12+7 | JAVA_HOME_17_arm64 | -| 21.0.4+7.0 (default) | JAVA_HOME_21_arm64 | +| Version | Environment Variable | +| --------------------- | -------------------- | +| 11.0.24+8 | JAVA_HOME_11_arm64 | +| 17.0.13+11 | JAVA_HOME_17_arm64 | +| 21.0.5+11.0 (default) | JAVA_HOME_21_arm64 | ### Cached Tools @@ -118,6 +120,7 @@ #### Node.js - 18.20.4 - 20.18.0 +- 22.10.0 #### Go - 1.21.13 @@ -125,13 +128,13 @@ - 1.23.2 ### Rust Tools -- Cargo 1.81.0 -- Rust 1.81.0 -- Rustdoc 1.81.0 +- Cargo 1.82.0 +- Rust 1.82.0 +- Rustdoc 1.82.0 - Rustup 1.27.1 #### Packages -- Clippy 0.1.81 +- Clippy 0.1.82 - Rustfmt 1.7.1-stable ### PowerShell Tools @@ -143,16 +146,16 @@ - PSScriptAnalyzer: 1.23.0 ### Xcode -| Version | Build | Path | Symlinks | -| -------------- | -------- | ----------------------------------- | -------------------------------------------------------------- | -| 16.1 (beta) | 16B5029d | /Applications/Xcode_16.1_beta_3.app | /Applications/Xcode_16.1.0.app<br>/Applications/Xcode_16.1.app | -| 16.0 | 16A242d | /Applications/Xcode_16.app | /Applications/Xcode_16.0.0.app<br>/Applications/Xcode_16.0.app | -| 15.4 (default) | 15F31d | /Applications/Xcode_15.4.app | /Applications/Xcode_15.4.0.app<br>/Applications/Xcode.app | -| 15.3 | 15E204a | /Applications/Xcode_15.3.app | /Applications/Xcode_15.3.0.app | -| 15.2 | 15C500b | /Applications/Xcode_15.2.app | /Applications/Xcode_15.2.0.app | -| 15.1 | 15C65 | /Applications/Xcode_15.1.app | /Applications/Xcode_15.1.0.app | -| 15.0.1 | 15A507 | /Applications/Xcode_15.0.1.app | /Applications/Xcode_15.0.app | -| 14.3.1 | 14E300c | /Applications/Xcode_14.3.1.app | /Applications/Xcode_14.3.app | +| Version | Build | Path | Symlinks | +| -------------- | ------- | ---------------------------------------------- | -------------------------------------------------------------- | +| 16.1 | 16B40 | /Applications/Xcode_16.1_Release_Candidate.app | /Applications/Xcode_16.1.0.app<br>/Applications/Xcode_16.1.app | +| 16.0 | 16A242d | /Applications/Xcode_16.app | /Applications/Xcode_16.0.0.app<br>/Applications/Xcode_16.0.app | +| 15.4 (default) | 15F31d | /Applications/Xcode_15.4.app | /Applications/Xcode_15.4.0.app<br>/Applications/Xcode.app | +| 15.3 | 15E204a | /Applications/Xcode_15.3.app | /Applications/Xcode_15.3.0.app | +| 15.2 | 15C500b | /Applications/Xcode_15.2.app | /Applications/Xcode_15.2.0.app | +| 15.1 | 15C65 | /Applications/Xcode_15.1.app | /Applications/Xcode_15.1.0.app | +| 15.0.1 | 15A507 | /Applications/Xcode_15.0.1.app | /Applications/Xcode_15.0.app | +| 14.3.1 | 14E300c | /Applications/Xcode_14.3.1.app | /Applications/Xcode_14.3.app | #### Installed SDKs | SDK | SDK Name | Xcode Version | @@ -206,19 +209,19 @@ | Simulator - watchOS 10.5 | watchsimulator10.5 | 15.4 | | Simulator - watchOS 11.0 | watchsimulator11.0 | 16.0 | | Simulator - watchOS 11.1 | watchsimulator11.1 | 16.1 | -| visionOS 1.0 | xros1.0 | 15.2 | | Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | -| visionOS 1.1 | xros1.1 | 15.3 | +| visionOS 1.0 | xros1.0 | 15.2 | | Simulator - visionOS 1.1 | xrsimulator1.1 | 15.3 | +| visionOS 1.1 | xros1.1 | 15.3 | | Simulator - visionOS 1.2 | xrsimulator1.2 | 15.4 | | visionOS 1.2 | xros1.2 | 15.4 | | visionOS 2.0 | xros2.0 | 16.0 | | Simulator - visionOS 2.0 | xrsimulator2.0 | 16.0 | -| Simulator - visionOS 2.1 | xrsimulator2.1 | 16.1 | | visionOS 2.1 | xros2.1 | 16.1 | +| Simulator - visionOS 2.1 | xrsimulator2.1 | 16.1 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | -| Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | +| Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | | DriverKit 22.4 | driverkit22.4 | 14.3.1 | | DriverKit 23.0 | driverkit23.0 | 15.0.1 | | DriverKit 23.2 | driverkit23.2 | 15.1, 15.2 | @@ -228,29 +231,29 @@ | DriverKit 24.1 | driverkit24.1 | 16.1 | #### Installed Simulators -| OS | Simulators | -| ------------ | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| iOS 16.4 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 17.0 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 17.2 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 17.4 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | -| iOS 17.5 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | -| iOS 18.0 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone 16<br>iPhone 16 Plus<br>iPhone 16 Pro<br>iPhone 16 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | -| iOS 18.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone 16<br>iPhone 16 Plus<br>iPhone 16 Pro<br>iPhone 16 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | -| tvOS 16.4 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 17.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 17.2 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 17.4 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 17.5 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 18.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 18.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| watchOS 9.4 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | -| watchOS 10.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | -| watchOS 10.2 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | -| watchOS 10.4 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | -| watchOS 10.5 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | -| watchOS 11.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 10 (42mm)<br>Apple Watch Series 10 (46mm)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | -| watchOS 11.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 10 (42mm)<br>Apple Watch Series 10 (46mm)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | +| OS | Simulators | +| ------------ | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| iOS 16.4 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 17.0 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 17.2 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 17.4 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | +| iOS 17.5 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | +| iOS 18.0 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone 16<br>iPhone 16 Plus<br>iPhone 16 Pro<br>iPhone 16 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | +| iOS 18.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone 16<br>iPhone 16 Plus<br>iPhone 16 Pro<br>iPhone 16 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad mini (A17 Pro)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | +| tvOS 16.4 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 17.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 17.2 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 17.4 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 17.5 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 18.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 18.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| watchOS 9.4 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | +| watchOS 10.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 10.2 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 10.4 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 10.5 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 11.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 10 (42mm)<br>Apple Watch Series 10 (46mm)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 11.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 10 (42mm)<br>Apple Watch Series 10 (46mm)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | ### Android | Package Name | Version | @@ -264,7 +267,7 @@ | CMake | 3.22.1 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 26.3.11579264 (default)<br>27.1.12297006 | +| NDK | 26.3.11579264 (default)<br>27.2.12479018 | #### Environment variables | Name | Value | @@ -272,7 +275,7 @@ | ANDROID_HOME | /Users/runner/Library/Android/sdk | | ANDROID_NDK | /Users/runner/Library/Android/sdk/ndk/26.3.11579264 | | ANDROID_NDK_HOME | /Users/runner/Library/Android/sdk/ndk/26.3.11579264 | -| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/27.1.12297006 | +| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/27.2.12479018 | | ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk/26.3.11579264 | | ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | From f1bf50f5078f4d78748d65690979b4342da8e1b4 Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Wed, 23 Oct 2024 12:01:43 +0200 Subject: [PATCH 3205/3485] [actions] Use latest SYFT on macOS/Ubuntu; provide useful run-name (#10833) --- .github/workflows/create_sbom_report.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/create_sbom_report.yml b/.github/workflows/create_sbom_report.yml index a44c0b2bb88f..f17b9275f4f3 100644 --- a/.github/workflows/create_sbom_report.yml +++ b/.github/workflows/create_sbom_report.yml @@ -7,6 +7,7 @@ name: Create SBOM for the release # # Current SYFT tool issues: # macOS (major): prompt privilegies that blocking process indefinetely (https://github.com/anchore/syft/issues/1367) +run-name: Collecting SBOM for ${{ github.event.client_payload.ReleaseBranchName || 'unknown release' }} on: repository_dispatch: types: [generate-sbom] @@ -58,7 +59,7 @@ jobs: run: curl -sSfL https://raw.githubusercontent.com/anchore/syft/main/install.sh | sh -s -- -b D:/syft - name: Install SYFT tool on Ubuntu or macOS if: ${{ runner.os != 'Windows' }} - run: curl -sSfL https://raw.githubusercontent.com/anchore/syft/main/install.sh | sh -s -- -b /usr/local/bin v0.100.0 + run: curl -sSfL https://raw.githubusercontent.com/anchore/syft/main/install.sh | sh -s -- -b /usr/local/bin #Running section. - name: Run SYFT on Windows if: ${{ runner.os == 'Windows' }} From 4c67970f910bb604e8de7b26e481c7402e46613a Mon Sep 17 00:00:00 2001 From: hemanthmanga <166606741+hemanthmanga@users.noreply.github.com> Date: Wed, 23 Oct 2024 21:13:46 +0530 Subject: [PATCH 3206/3485] [Ubuntu] Adding latest Node.js version 22* . (#10811) --- images/ubuntu/toolsets/toolset-2004.json | 5 ++++- images/ubuntu/toolsets/toolset-2204.json | 5 ++++- images/ubuntu/toolsets/toolset-2404.json | 3 ++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/images/ubuntu/toolsets/toolset-2004.json b/images/ubuntu/toolsets/toolset-2004.json index 4f25ed1a23d5..3213634c5f7a 100644 --- a/images/ubuntu/toolsets/toolset-2004.json +++ b/images/ubuntu/toolsets/toolset-2004.json @@ -36,7 +36,8 @@ "versions": [ "16.*", "18.*", - "20.*" + "20.*", + "22.*" ] }, { @@ -223,9 +224,11 @@ "node:16", "node:18", "node:20", + "node:22", "node:16-alpine", "node:18-alpine", "node:20-alpine", + "node:22-alpine", "ubuntu:20.04" ], "components": [ diff --git a/images/ubuntu/toolsets/toolset-2204.json b/images/ubuntu/toolsets/toolset-2204.json index 2b074666c506..67fe14fa68cf 100644 --- a/images/ubuntu/toolsets/toolset-2204.json +++ b/images/ubuntu/toolsets/toolset-2204.json @@ -34,7 +34,8 @@ "versions": [ "16.*", "18.*", - "20.*" + "20.*", + "22.*" ] }, { @@ -221,9 +222,11 @@ "node:16", "node:18", "node:20", + "node:22", "node:16-alpine", "node:18-alpine", "node:20-alpine", + "node:22-alpine", "ubuntu:20.04", "ubuntu:22.04" ], diff --git a/images/ubuntu/toolsets/toolset-2404.json b/images/ubuntu/toolsets/toolset-2404.json index 765dcf70f194..a4f7b857e6f7 100644 --- a/images/ubuntu/toolsets/toolset-2404.json +++ b/images/ubuntu/toolsets/toolset-2404.json @@ -29,7 +29,8 @@ "arch": "x64", "versions": [ "18.*", - "20.*" + "20.*", + "22.*" ] }, { From d4872d4c2e578ffacb458f2cc7aab3e1ca6ce2a2 Mon Sep 17 00:00:00 2001 From: sarathrajsrinivasan <159180023+sarathrajsrinivasan@users.noreply.github.com> Date: Thu, 24 Oct 2024 02:44:06 -0700 Subject: [PATCH 3207/3485] [macOS] Update openssl from 1.1 to 3 (#10851) --- images/macos/scripts/build/install-openssl.sh | 12 ++++++------ images/macos/scripts/tests/OpenSSL.Tests.ps1 | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/images/macos/scripts/build/install-openssl.sh b/images/macos/scripts/build/install-openssl.sh index 16f11fe761f6..d883c7bd0957 100644 --- a/images/macos/scripts/build/install-openssl.sh +++ b/images/macos/scripts/build/install-openssl.sh @@ -6,20 +6,20 @@ source ~/utils/utils.sh -echo "Install openssl@1.1" -brew_smart_install "openssl@1.1" +echo "Install openssl@3" +brew_smart_install "openssl@3" if ! is_Arm64; then - # Symlink brew openssl@1.1 to `/usr/local/bin` as Homebrew refuses - ln -sf $(brew --prefix openssl@1.1)/bin/openssl /usr/local/bin/openssl + # Symlink brew openssl@3 to `/usr/local/bin` as Homebrew refuses + ln -sf $(brew --prefix openssl@3)/bin/openssl /usr/local/bin/openssl else # arm64 has a different installation prefix for brew - ln -sf $(brew --prefix openssl@1.1)/bin/openssl /opt/homebrew/bin/openssl + ln -sf $(brew --prefix openssl@3)/bin/openssl /opt/homebrew/bin/openssl fi if ! is_Arm64; then # Most of build systems and scripts look up ssl here - ln -sf $(brew --cellar openssl@1.1)/1.1* /usr/local/opt/openssl + ln -sf $(brew --cellar openssl@3)/3* /usr/local/opt/openssl fi invoke_tests "OpenSSL" diff --git a/images/macos/scripts/tests/OpenSSL.Tests.ps1 b/images/macos/scripts/tests/OpenSSL.Tests.ps1 index 1fb8886a8a1a..8f5e6956b6b5 100644 --- a/images/macos/scripts/tests/OpenSSL.Tests.ps1 +++ b/images/macos/scripts/tests/OpenSSL.Tests.ps1 @@ -7,17 +7,17 @@ Describe "OpenSSL" { } } - Context "OpenSSL 1.1 Path Check" { - It "OpenSSL 1.1 path exists" { - $openSSLpath = brew --prefix openssl@1.1 + Context "OpenSSL 3 Path Check" { + It "OpenSSL 3 path exists" { + $openSSLpath = brew --prefix openssl@3 $openSSLpath | Should -Exist } } - Context "OpenSSL 1.1 is default" { - It "Default OpenSSL version is 1.1" { + Context "OpenSSL 3 is default" { + It "Default OpenSSL version is 3" { $commandResult = Get-CommandResult "openssl version" - $commandResult.Output | Should -Match "OpenSSL 1.1" + $commandResult.Output | Should -Match "OpenSSL 3" } } } From 1136c0f644a686eb955360789768d6c732c5183b Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Thu, 24 Oct 2024 11:55:22 +0200 Subject: [PATCH 3208/3485] [macOS] Update disk space Pester test: current target - 30 GB (#10854) --- images/macos/scripts/tests/System.Tests.ps1 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/images/macos/scripts/tests/System.Tests.ps1 b/images/macos/scripts/tests/System.Tests.ps1 index 206ac3be7600..8f55de538883 100644 --- a/images/macos/scripts/tests/System.Tests.ps1 +++ b/images/macos/scripts/tests/System.Tests.ps1 @@ -3,12 +3,13 @@ Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" $os = Get-OSVersion Describe "Disk free space" { - It "Image has more than 14GB free space" { - # we should have at least 14 GB of free space on macOS images + It "Image has more than 30GB free space" { + # we should have at least 30 GB of free space on macOS images # 10GB here: https://docs.microsoft.com/en-us/azure/devops/pipelines/agents/hosted?view=azure-devops#capabilities-and-limitations # 14GB here: https://docs.github.com/en/actions/using-github-hosted-runners/using-github-hosted-runners/about-github-hosted-runners#standard-github-hosted-runners-for-public-repositories + # 30GB due to: https://github.com/actions/runner-images/issues/10511 $freeSpace = (Get-PSDrive "/").Free - $freeSpace | Should -BeGreaterOrEqual 14GB + $freeSpace | Should -BeGreaterOrEqual 30GB } } From fbbb9d73031a43c0ed40fe980413c316233f5e57 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 25 Oct 2024 07:06:50 -0600 Subject: [PATCH 3209/3485] Updating readme file for win19 version 20241021.1.1 (#10839) Co-authored-by: Image generation service account. <no-reply@microsoft.com> --- images/windows/Windows2019-Readme.md | 54 ++++++++++++++-------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/images/windows/Windows2019-Readme.md b/images/windows/Windows2019-Readme.md index d7687b93e421..2971f021d80a 100644 --- a/images/windows/Windows2019-Readme.md +++ b/images/windows/Windows2019-Readme.md @@ -1,6 +1,6 @@ # Windows Server 2019 - OS Version: 10.0.17763 Build 6414 -- Image Version: 20241015.1.0 +- Image Version: 20241021.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -29,7 +29,7 @@ - pip 24.0 (python 3.7) - Pipx 1.2.1 - RubyGems 3.2.33 -- Vcpkg (build from commit 9b44f143b) +- Vcpkg (build from commit 3a747a4fc) - Yarn 1.22.22 #### Environment variables @@ -42,14 +42,14 @@ - Ant 1.10.14 - Gradle 8.10 - Maven 3.8.7 -- sbt 1.10.2 +- sbt 1.10.3 ### Tools - 7zip 24.08 - aria2 1.37.0 - azcopy 10.26.0 - Bazel 7.3.2 -- Bazelisk 1.22.0 +- Bazelisk 1.22.1 - Bicep 0.30.23 - Cabal 3.12.1.0 - CMake 3.30.5 @@ -75,11 +75,11 @@ - OpenSSL 1.1.1w - Packer 1.11.2 - Parcel 2.12.0 -- Pulumi 3.136.1 +- Pulumi 3.137.0 - R 4.4.1 - Service Fabric SDK 9.1.1436.9590 - Stack 3.1.1 -- Subversion (SVN) 1.14.2 +- Subversion (SVN) 1.14.4 - Swig 4.1.1 - VSWhere 3.1.7 - WinAppDriver 1.2.2009.02003 @@ -88,19 +88,19 @@ - zstd 1.5.6 ### CLI Tools -- Alibaba Cloud CLI 3.0.226 -- AWS CLI 2.18.4 -- AWS SAM CLI 1.125.0 +- Alibaba Cloud CLI 3.0.227 +- AWS CLI 2.18.10 +- AWS SAM CLI 1.126.0 - AWS Session Manager CLI 1.2.677.0 - Azure CLI 2.65.0 - Azure DevOps CLI extension 1.0.1 - Cloud Foundry CLI 8.8.2 -- GitHub CLI 2.58.0 +- GitHub CLI 2.59.0 ### Rust Tools -- Cargo 1.81.0 -- Rust 1.81.0 -- Rustdoc 1.81.0 +- Cargo 1.82.0 +- Rust 1.82.0 +- Rustdoc 1.82.0 - Rustup 1.27.1 #### Packages @@ -108,14 +108,14 @@ - cargo-audit 0.20.1 - cargo-outdated 0.15.0 - cbindgen 0.27.0 -- Clippy 0.1.81 +- Clippy 0.1.82 - Rustfmt 1.7.1 ### Browsers and Drivers - Google Chrome 130.0.6723.59 - Chrome Driver 130.0.6723.58 -- Microsoft Edge 129.0.2792.89 -- Microsoft Edge Driver 129.0.2792.89 +- Microsoft Edge 130.0.2849.46 +- Microsoft Edge Driver 130.0.2849.46 - Mozilla Firefox 131.0.3 - Gecko Driver 0.35.0 - IE Driver 4.14.0.0 @@ -132,10 +132,10 @@ ### Java | Version | Environment Variable | | ------------------- | -------------------- | -| 8.0.422+5 (default) | JAVA_HOME_8_X64 | -| 11.0.24+8 | JAVA_HOME_11_X64 | -| 17.0.12+7 | JAVA_HOME_17_X64 | -| 21.0.4+7.0 | JAVA_HOME_21_X64 | +| 8.0.432+6 (default) | JAVA_HOME_8_X64 | +| 11.0.25+9 | JAVA_HOME_11_X64 | +| 17.0.13+11 | JAVA_HOME_17_X64 | +| 21.0.5+11.0 | JAVA_HOME_21_X64 | ### Shells | Name | Target | @@ -492,7 +492,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Microsoft.AspNetCore.App: 6.0.5, 6.0.26, 6.0.35, 7.0.5, 7.0.20, 8.0.6, 8.0.10 - Microsoft.NETCore.App: 6.0.5, 6.0.26, 6.0.35, 7.0.5, 7.0.20, 8.0.6, 8.0.10 - Microsoft.WindowsDesktop.App: 6.0.5, 6.0.26, 6.0.35, 7.0.5, 7.0.20, 8.0.6, 8.0.10 -- nbgv 3.6.143+57d4199a9c +- nbgv 3.6.146+392592327a ### PowerShell Tools - PowerShell 7.4.5 @@ -503,7 +503,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - AzureRM: 2.1.0 (Default), 6.13.1 - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.677 +- AWSPowershell: 4.1.681 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.10 - Microsoft.Graph: 2.24.0 @@ -532,16 +532,16 @@ All other versions are saved but not installed. | Google APIs | addon-google_apis-google-21<br>addon-google_apis-google-22<br>addon-google_apis-google-23<br>addon-google_apis-google-24 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 26.3.11579264<br>27.1.12297006 | +| NDK | 26.3.11579264<br>27.2.12479018 | #### Environment variables | Name | Value | | ----------------------- | ---------------------------------------- | | ANDROID_HOME | C:\Android\android-sdk | -| ANDROID_NDK | C:\Android\android-sdk\ndk\27.1.12297006 | -| ANDROID_NDK_HOME | C:\Android\android-sdk\ndk\27.1.12297006 | -| ANDROID_NDK_LATEST_HOME | C:\Android\android-sdk\ndk\27.1.12297006 | -| ANDROID_NDK_ROOT | C:\Android\android-sdk\ndk\27.1.12297006 | +| ANDROID_NDK | C:\Android\android-sdk\ndk\27.2.12479018 | +| ANDROID_NDK_HOME | C:\Android\android-sdk\ndk\27.2.12479018 | +| ANDROID_NDK_LATEST_HOME | C:\Android\android-sdk\ndk\27.2.12479018 | +| ANDROID_NDK_ROOT | C:\Android\android-sdk\ndk\27.2.12479018 | | ANDROID_SDK_ROOT | C:\Android\android-sdk | ### Cached Docker images From 02babd3573278dab6fddba36819593fbd556e742 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 26 Oct 2024 08:01:04 +0000 Subject: [PATCH 3210/3485] Updating readme file for win22 version 20241021.1.1 (#10838) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/windows/Windows2022-Readme.md | 52 ++++++++++++++-------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/images/windows/Windows2022-Readme.md b/images/windows/Windows2022-Readme.md index 7c21f5171504..9c0603671153 100644 --- a/images/windows/Windows2022-Readme.md +++ b/images/windows/Windows2022-Readme.md @@ -1,6 +1,6 @@ # Windows Server 2022 - OS Version: 10.0.20348 Build 2762 -- Image Version: 20241015.1.0 +- Image Version: 20241021.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -29,7 +29,7 @@ - pip 24.2 (python 3.9) - Pipx 1.7.1 - RubyGems 3.2.33 -- Vcpkg (build from commit e63bd09dc) +- Vcpkg (build from commit 3a747a4fc) - Yarn 1.22.22 #### Environment variables @@ -42,14 +42,14 @@ - Ant 1.10.14 - Gradle 8.10 - Maven 3.8.7 -- sbt 1.10.2 +- sbt 1.10.3 ### Tools - 7zip 24.08 - aria2 1.37.0 - azcopy 10.26.0 - Bazel 7.3.2 -- Bazelisk 1.22.0 +- Bazelisk 1.22.1 - Bicep 0.30.23 - Cabal 3.12.1.0 - CMake 3.30.5 @@ -73,11 +73,11 @@ - NSIS 3.10 - OpenSSL 1.1.1w - Packer 1.11.2 -- Pulumi 3.136.1 +- Pulumi 3.137.0 - R 4.4.1 - Service Fabric SDK 9.1.1436.9590 - Stack 3.1.1 -- Subversion (SVN) 1.14.2 +- Subversion (SVN) 1.14.4 - Swig 4.1.1 - VSWhere 3.1.7 - WinAppDriver 1.2.2009.02003 @@ -87,17 +87,17 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.227 -- AWS CLI 2.18.6 -- AWS SAM CLI 1.125.0 +- AWS CLI 2.18.10 +- AWS SAM CLI 1.126.0 - AWS Session Manager CLI 1.2.677.0 - Azure CLI 2.65.0 - Azure DevOps CLI extension 1.0.1 -- GitHub CLI 2.58.0 +- GitHub CLI 2.59.0 ### Rust Tools -- Cargo 1.81.0 -- Rust 1.81.0 -- Rustdoc 1.81.0 +- Cargo 1.82.0 +- Rust 1.82.0 +- Rustdoc 1.82.0 - Rustup 1.27.1 #### Packages @@ -105,14 +105,14 @@ - cargo-audit 0.20.1 - cargo-outdated 0.15.0 - cbindgen 0.27.0 -- Clippy 0.1.81 +- Clippy 0.1.82 - Rustfmt 1.7.1 ### Browsers and Drivers - Google Chrome 130.0.6723.59 - Chrome Driver 130.0.6723.58 -- Microsoft Edge 129.0.2792.89 -- Microsoft Edge Driver 129.0.2792.89 +- Microsoft Edge 130.0.2849.46 +- Microsoft Edge Driver 130.0.2849.46 - Mozilla Firefox 131.0.3 - Gecko Driver 0.35.0 - IE Driver 4.14.0.0 @@ -129,10 +129,10 @@ ### Java | Version | Environment Variable | | ------------------- | -------------------- | -| 8.0.422+5 (default) | JAVA_HOME_8_X64 | -| 11.0.24+8 | JAVA_HOME_11_X64 | -| 17.0.12+7 | JAVA_HOME_17_X64 | -| 21.0.4+7.0 | JAVA_HOME_21_X64 | +| 8.0.432+6 (default) | JAVA_HOME_8_X64 | +| 11.0.25+9 | JAVA_HOME_11_X64 | +| 17.0.13+11 | JAVA_HOME_17_X64 | +| 21.0.5+11.0 | JAVA_HOME_21_X64 | ### Shells | Name | Target | @@ -488,7 +488,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Microsoft.AspNetCore.App: 6.0.5, 6.0.26, 6.0.35, 7.0.5, 7.0.20, 8.0.10 - Microsoft.NETCore.App: 6.0.5, 6.0.26, 6.0.35, 7.0.5, 7.0.20, 8.0.10 - Microsoft.WindowsDesktop.App: 6.0.5, 6.0.26, 6.0.35, 7.0.5, 7.0.20, 8.0.10 -- nbgv 3.6.143+57d4199a9c +- nbgv 3.6.146+392592327a ### PowerShell Tools - PowerShell 7.4.5 @@ -499,7 +499,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - AzureRM: 2.1.0 (Default), 6.13.1 - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.678 +- AWSPowershell: 4.1.681 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.10 - Microsoft.Graph: 2.24.0 @@ -527,16 +527,16 @@ All other versions are saved but not installed. | CMake | 3.18.1<br>3.22.1 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 26.3.11579264<br>27.1.12297006 | +| NDK | 26.3.11579264<br>27.2.12479018 | #### Environment variables | Name | Value | | ----------------------- | ---------------------------------------- | | ANDROID_HOME | C:\Android\android-sdk | -| ANDROID_NDK | C:\Android\android-sdk\ndk\27.1.12297006 | -| ANDROID_NDK_HOME | C:\Android\android-sdk\ndk\27.1.12297006 | -| ANDROID_NDK_LATEST_HOME | C:\Android\android-sdk\ndk\27.1.12297006 | -| ANDROID_NDK_ROOT | C:\Android\android-sdk\ndk\27.1.12297006 | +| ANDROID_NDK | C:\Android\android-sdk\ndk\27.2.12479018 | +| ANDROID_NDK_HOME | C:\Android\android-sdk\ndk\27.2.12479018 | +| ANDROID_NDK_LATEST_HOME | C:\Android\android-sdk\ndk\27.2.12479018 | +| ANDROID_NDK_ROOT | C:\Android\android-sdk\ndk\27.2.12479018 | | ANDROID_SDK_ROOT | C:\Android\android-sdk | ### Cached Docker images From a1633b01936bfd1fcd4ec9a88d087b0e07e907aa Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 26 Oct 2024 14:12:41 +0000 Subject: [PATCH 3211/3485] Updating readme file for macos-13 version 20241023.237 (#10850) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-13-Readme.md | 106 ++++++++++++++++---------------- 1 file changed, 54 insertions(+), 52 deletions(-) diff --git a/images/macos/macos-13-Readme.md b/images/macos/macos-13-Readme.md index 056f5fd96160..714f26a0d2b0 100644 --- a/images/macos/macos-13-Readme.md +++ b/images/macos/macos-13-Readme.md @@ -1,15 +1,15 @@ | Announcements | |-| +| [[macOS] OpenSSL 1.1 will be removed and OpenSSL 3 will be the default for all macOS images from November 4](https://github.com/actions/runner-images/issues/10817) | +| [[macOS] Python 3.9 and 3.10 will be removed from macOS13 arm64 and macOS14 arm64 on November 18.](https://github.com/actions/runner-images/issues/10812) | | [[macOS] The macOS 12 Actions runner image will begin deprecation on 10/7/24 and will be fully unsupported by 12/3/24 for GitHub and ADO](https://github.com/actions/runner-images/issues/10721) | -| [[macOS] Support policy changes; Xcode 14 and 16 will be removed from macOS 14 on October 28](https://github.com/actions/runner-images/issues/10703) | +| [[macOS] Support policy changes; Xcode 14 and 16 will be removed from macOS 14 on November 4](https://github.com/actions/runner-images/issues/10703) | | [macOS 15 (Sequoia) is now available as a public beta in GitHub Actions](https://github.com/actions/runner-images/issues/10686) | -| [[Macos 13 and 14] Android NDK versions <=25 will be removed from images on October 07,2024](https://github.com/actions/runner-images/issues/10614) | -| [[Macos 13 and 14] Go version 1.20.0 will be removed on October 07,2024.](https://github.com/actions/runner-images/issues/10612) | *** # macOS 13 - OS Version: macOS 13.7 (22H123) - Kernel Version: Darwin 22.6.0 -- Image Version: 20241008.186 +- Image Version: 20241023.237 ## Installed Software @@ -24,26 +24,26 @@ - GNU Fortran 12 (Homebrew GCC 12.4.0) - available by `gfortran-12` alias - GNU Fortran 13 (Homebrew GCC 13.3.0) - available by `gfortran-13` alias - GNU Fortran 14 (Homebrew GCC 14.2.0) - available by `gfortran-14` alias -- Kotlin 2.0.20-release-360 +- Kotlin 2.0.21-release-482 - Mono 6.12.0.188 - Node.js 20.18.0 -- Perl 5.38.2 +- Perl 5.40.0 - PHP 8.3.12 -- Python3 3.12.7 +- Python3 3.13.0 - Ruby 3.0.7p220 ### Package Management -- Bundler 2.5.21 +- Bundler 2.5.22 - Carthage 0.40.0 - CocoaPods 1.15.2 - Composer 2.8.1 -- Homebrew 4.4.0 +- Homebrew 4.4.2 - NPM 10.8.2 - NuGet 6.3.1.1 -- Pip3 24.2 (python 3.12) +- Pip3 24.2 (python 3.13) - Pipx 1.7.1 -- RubyGems 3.5.21 -- Vcpkg 2024 (build from commit 2ddc10c8a) +- RubyGems 3.5.22 +- Vcpkg 2024 (build from commit edc84ff66) - Yarn 1.22.22 ### Project Management @@ -55,13 +55,13 @@ - 7-Zip 17.05 - aria2 1.37.0 - azcopy 10.26.0 -- bazel 7.3.2 -- bazelisk 1.22.0 +- bazel 7.4.0 +- bazelisk 1.22.1 - bsdtar 3.5.3 - available by 'tar' alias - Curl 8.10.1 - Git 2.47.0 - Git LFS 3.5.1 -- GitHub CLI 2.58.0 +- GitHub CLI 2.59.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.24.5 - gpg (GnuPG) 2.4.5 @@ -73,17 +73,17 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.18.1 -- AWS SAM CLI 1.125.0 -- AWS Session Manager CLI 1.2.650.0 +- AWS CLI 2.18.12 +- AWS SAM CLI 1.126.0 +- AWS Session Manager CLI 1.2.677.0 - Azure CLI 2.65.0 - Azure CLI (azure-devops) 1.0.1 - Bicep CLI 0.30.23 -- Cmake 3.30.4 -- CodeQL Action Bundle 2.19.1 -- Fastlane 2.224.0 -- SwiftFormat 0.54.5 -- Xcbeautify 2.11.0 +- Cmake 3.30.5 +- CodeQL Action Bundle 2.19.2 +- Fastlane 2.225.0 +- SwiftFormat 0.54.6 +- Xcbeautify 2.14.1 - Xcode Command Line Tools 14.3.1.0.1.1683849156 - Xcodes 1.5.0 @@ -93,12 +93,12 @@ ### Browsers - Safari 18.0.1 (18619.1.26.111.11) - SafariDriver 18.0.1 (18619.1.26.111.11) -- Google Chrome 129.0.6668.90 -- Google Chrome for Testing 129.0.6668.89 -- ChromeDriver 129.0.6668.89 -- Microsoft Edge 129.0.2792.79 -- Microsoft Edge WebDriver 129.0.2792.82 -- Mozilla Firefox 131.0 +- Google Chrome 130.0.6723.70 +- Google Chrome for Testing 130.0.6723.69 +- ChromeDriver 130.0.6723.69 +- Microsoft Edge 130.0.2849.52 +- Microsoft Edge WebDriver 130.0.2849.50 +- Mozilla Firefox 131.0.3 - geckodriver 0.35.0 - Selenium server 4.25.0 @@ -110,12 +110,12 @@ | GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | ### Java -| Version | Environment Variable | -| ------------------- | -------------------- | -| 8.0.422+5.1 | JAVA_HOME_8_X64 | -| 11.0.24+8 | JAVA_HOME_11_X64 | -| 17.0.12+7 (default) | JAVA_HOME_17_X64 | -| 21.0.4+7.0 | JAVA_HOME_21_X64 | +| Version | Environment Variable | +| -------------------- | -------------------- | +| 8.0.432+6 | JAVA_HOME_8_X64 | +| 11.0.25+9 | JAVA_HOME_11_X64 | +| 17.0.13+11 (default) | JAVA_HOME_17_X64 | +| 21.0.5+11.0 | JAVA_HOME_21_X64 | ### Cached Tools @@ -138,11 +138,13 @@ - 3.10.15 - 3.11.9 - 3.12.7 +- 3.13.0 #### Node.js - 16.20.2 - 18.20.4 - 20.18.0 +- 22.10.0 #### Go - 1.21.13 @@ -150,13 +152,13 @@ - 1.23.2 ### Rust Tools -- Cargo 1.81.0 -- Rust 1.81.0 -- Rustdoc 1.81.0 +- Cargo 1.82.0 +- Rust 1.82.0 +- Rustdoc 1.82.0 - Rustup 1.27.1 #### Packages -- Clippy 0.1.81 +- Clippy 0.1.82 - Rustfmt 1.7.1-stable ### PowerShell Tools @@ -165,17 +167,17 @@ #### PowerShell Modules - Az: 12.4.0 - Pester: 5.6.1 -- PSScriptAnalyzer: 1.22.0 +- PSScriptAnalyzer: 1.23.0 ### Xcode -| Version | Build | Path | -| -------------- | ------- | ------------------------------ | -| 15.2 (default) | 15C500b | /Applications/Xcode_15.2.app | -| 15.1 | 15C65 | /Applications/Xcode_15.1.app | -| 15.0.1 | 15A507 | /Applications/Xcode_15.0.1.app | -| 14.3.1 | 14E300c | /Applications/Xcode_14.3.1.app | -| 14.2 | 14C18 | /Applications/Xcode_14.2.app | -| 14.1 | 14B47b | /Applications/Xcode_14.1.app | +| Version | Build | Path | Symlinks | +| -------------- | ------- | ------------------------------ | --------------------------------------------------------- | +| 15.2 (default) | 15C500b | /Applications/Xcode_15.2.app | /Applications/Xcode_15.2.0.app<br>/Applications/Xcode.app | +| 15.1 | 15C65 | /Applications/Xcode_15.1.app | /Applications/Xcode_15.1.0.app | +| 15.0.1 | 15A507 | /Applications/Xcode_15.0.1.app | /Applications/Xcode_15.0.app | +| 14.3.1 | 14E300c | /Applications/Xcode_14.3.1.app | /Applications/Xcode_14.3.app | +| 14.2 | 14C18 | /Applications/Xcode_14.2.app | /Applications/Xcode_14.2.0.app | +| 14.1 | 14B47b | /Applications/Xcode_14.1.app | /Applications/Xcode_14.1.0.app | #### Installed SDKs | SDK | SDK Name | Xcode Version | @@ -211,11 +213,11 @@ | Simulator - watchOS 9.4 | watchsimulator9.4 | 14.3.1 | | Simulator - watchOS 10.0 | watchsimulator10.0 | 15.0.1 | | Simulator - watchOS 10.2 | watchsimulator10.2 | 15.1, 15.2 | -| visionOS 1.0 | xros1.0 | 15.2 | | Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | +| visionOS 1.0 | xros1.0 | 15.2 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | -| Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | +| Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | DriverKit 22.1 | driverkit22.1 | 14.1 | | DriverKit 22.2 | driverkit22.2 | 14.2 | | DriverKit 22.4 | driverkit22.4 | 14.3.1 | @@ -251,7 +253,7 @@ | CMake | 3.22.1 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 26.3.11579264 (default)<br>27.1.12297006 | +| NDK | 26.3.11579264 (default)<br>27.2.12479018 | #### Environment variables | Name | Value | @@ -259,7 +261,7 @@ | ANDROID_HOME | /Users/runner/Library/Android/sdk | | ANDROID_NDK | /Users/runner/Library/Android/sdk/ndk/26.3.11579264 | | ANDROID_NDK_HOME | /Users/runner/Library/Android/sdk/ndk/26.3.11579264 | -| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/27.1.12297006 | +| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/27.2.12479018 | | ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk/26.3.11579264 | | ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | From 24b91c995e96c48dcf53349013670c0ab31285ff Mon Sep 17 00:00:00 2001 From: RaviAkshintala <167848931+RaviAkshintala@users.noreply.github.com> Date: Mon, 28 Oct 2024 21:42:30 +0530 Subject: [PATCH 3212/3485] Adding Windows sdk ltest version 26100 (#10862) Co-authored-by: Ravi Akshintala <raviakshintalagithub.com@Ravis-Laptop.local> --- images/windows/toolsets/toolset-2022.json | 1 + 1 file changed, 1 insertion(+) diff --git a/images/windows/toolsets/toolset-2022.json b/images/windows/toolsets/toolset-2022.json index 1a3f742bd4d8..485ed4f370d7 100644 --- a/images/windows/toolsets/toolset-2022.json +++ b/images/windows/toolsets/toolset-2022.json @@ -237,6 +237,7 @@ "Microsoft.VisualStudio.Component.Windows10SDK.20348", "Microsoft.VisualStudio.Component.Windows11SDK.22000", "Microsoft.VisualStudio.Component.Windows11SDK.22621", + "Microsoft.VisualStudio.Component.Windows11SDK.26100", "Microsoft.VisualStudio.Component.Workflow", "Microsoft.VisualStudio.ComponentGroup.Azure.CloudServices", "Microsoft.VisualStudio.ComponentGroup.Azure.ResourceManager.Tools", From ec00dd1a313c246b928b99748df694a9a5190ecf Mon Sep 17 00:00:00 2001 From: aartis17 <aartis17@github.com> Date: Tue, 29 Oct 2024 06:49:52 +0530 Subject: [PATCH 3213/3485] [macOS] toolset-14-updated support policy changes (#10834) --- images/macos/toolsets/toolset-14.json | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/images/macos/toolsets/toolset-14.json b/images/macos/toolsets/toolset-14.json index b22baabe7265..5e7796edfea5 100644 --- a/images/macos/toolsets/toolset-14.json +++ b/images/macos/toolsets/toolset-14.json @@ -3,26 +3,20 @@ "default": "15.4", "x64": { "versions": [ - { "link": "16.1_Release_Candidate", "version": "16.1_Release_Candidate+16B40", "symlinks": ["16.1"], "runtimes": ["iOS", "watchOS", "tvOS"], "sha256": "8ca961d55981f983d21b99a95a6b0ac04905b837f6e11346ee86d28f12afe720"}, - { "link": "16", "version": "16.0.0+16A242d", "symlinks": ["16.0"], "runtimes": ["iOS", "watchOS", "tvOS"], "sha256": "4a26c3d102a55c7222fb145e0ee1503249c9c26c6e02dc64d783c8810b37b1e3"}, - { "link": "15.4", "version": "15.4.0+15F31d", "runtimes": ["iOS", "watchOS", "tvOS"], "sha256": "82d3d61804ff3f4c7c82085e91dc701037ddaa770e542848b2477e22f4e8aa7a"}, - { "link": "15.3", "version": "15.3.0+15E204a", "runtimes": ["iOS", "watchOS", "tvOS"], "sha256": "f13f6a2e2df432c3008e394640b8549a18c285acd7fd148d6c4bac8c3a5af234"}, - { "link": "15.2", "version": "15.2.0+15C500b", "runtimes": ["iOS", "watchOS", "tvOS"], "sha256": "04E93680C6DDBEC84666531BE412DE778AFC8EAC6AB2037F4C2BE7290818B59B"}, - { "link": "15.1", "version": "15.1.0+15C65", "runtimes": ["iOS", "watchOS", "tvOS"], "sha256": "857D8DB537BAC82BF99DE0E1D3895D214D4D02101C1340CEF3DAF6E821BA1D05"}, - { "link": "15.0.1", "version": "15.0.1+15A507", "symlinks": ["15.0"], "runtimes": ["iOS", "watchOS", "tvOS"], "sha256": "5AC17AE6060CAFC3C7112C6DA0B153450BE21F1DE6632777FBA9FBC9D999C9E8"}, - { "link": "14.3.1", "version": "14.3.1+14E300c","symlinks": ["14.3"], "runtimes": ["iOS", "watchOS", "tvOS"], "sha256": "B5CC7BF37447C32A971B37D71C7DA1AF7ABB45CEE4B96FE126A1D3B0D2C260AF"} + { "link": "15.4", "version": "15.4.0+15F31d", "install_runtimes": "true", "sha256": "82d3d61804ff3f4c7c82085e91dc701037ddaa770e542848b2477e22f4e8aa7a"}, + { "link": "15.3", "version": "15.3.0+15E204a", "install_runtimes": "true", "sha256": "f13f6a2e2df432c3008e394640b8549a18c285acd7fd148d6c4bac8c3a5af234"}, + { "link": "15.2", "version": "15.2.0+15C500b", "install_runtimes": "true", "sha256": "04E93680C6DDBEC84666531BE412DE778AFC8EAC6AB2037F4C2BE7290818B59B"}, + { "link": "15.1", "version": "15.1.0+15C65", "install_runtimes": "true", "sha256": "857D8DB537BAC82BF99DE0E1D3895D214D4D02101C1340CEF3DAF6E821BA1D05"}, + { "link": "15.0.1", "version": "15.0.1+15A507", "symlinks": ["15.0"], "install_runtimes": "true", "sha256": "5AC17AE6060CAFC3C7112C6DA0B153450BE21F1DE6632777FBA9FBC9D999C9E8"} ] }, "arm64":{ "versions": [ - { "link": "16.1_Release_Candidate", "version": "16.1_Release_Candidate+16B40", "symlinks": ["16.1"], "runtimes": ["iOS", "watchOS", "tvOS"], "sha256": "8ca961d55981f983d21b99a95a6b0ac04905b837f6e11346ee86d28f12afe720"}, - { "link": "16", "version": "16.0.0+16A242d", "symlinks": ["16.0"], "runtimes": ["iOS", "watchOS", "tvOS"], "sha256": "4a26c3d102a55c7222fb145e0ee1503249c9c26c6e02dc64d783c8810b37b1e3"}, - { "link": "15.4", "version": "15.4.0+15F31d", "runtimes": ["iOS", "watchOS", "tvOS"], "sha256": "82d3d61804ff3f4c7c82085e91dc701037ddaa770e542848b2477e22f4e8aa7a"}, - { "link": "15.3", "version": "15.3.0+15E204a", "runtimes": ["iOS", "watchOS", "tvOS"], "sha256": "f13f6a2e2df432c3008e394640b8549a18c285acd7fd148d6c4bac8c3a5af234"}, - { "link": "15.2", "version": "15.2.0+15C500b", "runtimes": ["iOS", "watchOS", "tvOS"], "sha256": "04E93680C6DDBEC84666531BE412DE778AFC8EAC6AB2037F4C2BE7290818B59B"}, - { "link": "15.1", "version": "15.1.0+15C65", "runtimes": ["iOS", "watchOS", "tvOS"], "sha256": "857D8DB537BAC82BF99DE0E1D3895D214D4D02101C1340CEF3DAF6E821BA1D05"}, - { "link": "15.0.1", "version": "15.0.1+15A507", "symlinks": ["15.0"], "runtimes": ["iOS", "watchOS", "tvOS"], "sha256": "5AC17AE6060CAFC3C7112C6DA0B153450BE21F1DE6632777FBA9FBC9D999C9E8"}, - { "link": "14.3.1", "version": "14.3.1+14E300c","symlinks": ["14.3"], "runtimes": ["iOS", "watchOS", "tvOS"], "sha256": "B5CC7BF37447C32A971B37D71C7DA1AF7ABB45CEE4B96FE126A1D3B0D2C260AF"} + { "link": "15.4", "version": "15.4.0+15F31d", "install_runtimes": "true", "sha256": "82d3d61804ff3f4c7c82085e91dc701037ddaa770e542848b2477e22f4e8aa7a"}, + { "link": "15.3", "version": "15.3.0+15E204a", "install_runtimes": "true", "sha256": "f13f6a2e2df432c3008e394640b8549a18c285acd7fd148d6c4bac8c3a5af234"}, + { "link": "15.2", "version": "15.2.0+15C500b", "install_runtimes": "true", "sha256": "04E93680C6DDBEC84666531BE412DE778AFC8EAC6AB2037F4C2BE7290818B59B"}, + { "link": "15.1", "version": "15.1.0+15C65", "install_runtimes": "true", "sha256": "857D8DB537BAC82BF99DE0E1D3895D214D4D02101C1340CEF3DAF6E821BA1D05"}, + { "link": "15.0.1", "version": "15.0.1+15A507", "symlinks": ["15.0"], "install_runtimes": "true", "sha256": "5AC17AE6060CAFC3C7112C6DA0B153450BE21F1DE6632777FBA9FBC9D999C9E8"} ] } }, From a531b96b21431fbabdd4ea0cd9461ebe683b7e35 Mon Sep 17 00:00:00 2001 From: kishorekumar-anchala <168699259+kishorekumar-anchala@users.noreply.github.com> Date: Tue, 29 Oct 2024 10:26:27 +0530 Subject: [PATCH 3214/3485] modified edge sign (#10867) --- images/windows/scripts/build/Install-EdgeDriver.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/windows/scripts/build/Install-EdgeDriver.ps1 b/images/windows/scripts/build/Install-EdgeDriver.ps1 index 6d10d6e5d025..e8f07b7de161 100644 --- a/images/windows/scripts/build/Install-EdgeDriver.ps1 +++ b/images/windows/scripts/build/Install-EdgeDriver.ps1 @@ -27,7 +27,7 @@ Write-Host "Expand Microsoft Edge WebDriver archive..." Expand-7ZipArchive -Path $archivePath -DestinationPath $edgeDriverPath #Validate the EdgeDriver signature -$signatureThumbprint = "0BD8C56733FDCC06F8CB919FF5A200E39B1ACF71" +$signatureThumbprint = "7920AC8FB05E0FFFE21E8FF4B4F03093BA6AC16E" Test-FileSignature -Path "$edgeDriverPath\msedgedriver.exe" -ExpectedThumbprint $signatureThumbprint Write-Host "Setting the environment variables..." From a8d59b244026b8eaddca56d794ceba97dbac4262 Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Wed, 30 Oct 2024 14:57:53 +0100 Subject: [PATCH 3215/3485] [Ubuntu24] Update pipx installation method (#10872) --- images/ubuntu/scripts/build/install-python.sh | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/images/ubuntu/scripts/build/install-python.sh b/images/ubuntu/scripts/build/install-python.sh index d88945e3046f..83ae51875402 100644 --- a/images/ubuntu/scripts/build/install-python.sh +++ b/images/ubuntu/scripts/build/install-python.sh @@ -12,24 +12,22 @@ source $HELPER_SCRIPTS/os.sh # Install Python, Python 3, pip, pip3 apt-get install --no-install-recommends python3 python3-dev python3-pip python3-venv -# Install pipx -# Set pipx custom directory -export PIPX_BIN_DIR=/opt/pipx_bin -export PIPX_HOME=/opt/pipx if is_ubuntu24; then - apt-get install --no-install-recommends pipx - pipx ensurepath - # Create temporary workaround to allow user to continue using pip sudo cat <<EOF > /etc/pip.conf [global] break-system-packages = true EOF - -else - python3 -m pip install pipx - python3 -m pipx ensurepath fi + +# Install pipx +# Set pipx custom directory +export PIPX_BIN_DIR=/opt/pipx_bin +export PIPX_HOME=/opt/pipx + +python3 -m pip install pipx +python3 -m pipx ensurepath + # Update /etc/environment set_etc_environment_variable "PIPX_BIN_DIR" $PIPX_BIN_DIR set_etc_environment_variable "PIPX_HOME" $PIPX_HOME From 4d7c677f1c52587beedebb28b4e9eebad8e60b70 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Wed, 30 Oct 2024 17:25:20 +0100 Subject: [PATCH 3216/3485] [macOS] Update android commandlinetools for macOS 15 (#10875) --- images/macos/toolsets/toolset-15.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/macos/toolsets/toolset-15.json b/images/macos/toolsets/toolset-15.json index 246bd1b4c4a3..add427d72379 100644 --- a/images/macos/toolsets/toolset-15.json +++ b/images/macos/toolsets/toolset-15.json @@ -25,10 +25,10 @@ } }, "android": { - "cmdline-tools": "commandlinetools-mac-12172612_latest.zip", + "cmdline-tools": "commandlinetools-mac-12266719_latest.zip", "sdk-tools": "sdk-tools-darwin-4333796.zip", "platform_min_version": "35", - "build_tools_min_version": "35.0.2", + "build_tools_min_version": "35.0.0", "extras": [ "android;m2repository", "google;m2repository", "google;google_play_services" ], From 640581936d7b33e24d6eab44592be12ca5d11dfc Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Wed, 30 Oct 2024 17:32:23 +0100 Subject: [PATCH 3217/3485] [doc] Update Xcode support policy (#10876) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5d779c213df6..7b6064486888 100644 --- a/README.md +++ b/README.md @@ -122,7 +122,7 @@ The `-latest` migration process is gradual and happens over 1-2 months in order | .NET Core | 2 latest LTS versions and 1 latest version. For each feature version only latest patch is installed | | GCC <br/> GNU Fortran <br/> Clang <br/> GNU C++ | 3 latest major versions | | Android NDK | 1 latest non-LTS, 2 latest LTS versions | -| Xcode | - all OS compatible versions side-by-side <br/> - for beta, GM versions - latest beta only <br/> - old patch versions are deprecated in 3 months | +| Xcode | - only one major version of Xcode will be supported per macOS version <br/> - all minor versions of the supported major version will be available <br/> - beta and RC versions will be provided "as-is" in the latest available macOS image only no matter of beta/GA status of the image <br/> - when a new patch version is released, the previous patch version will be replaced | ### Package managers usage From 2111b3e225aebc3bfbd2d0642579d011fa4e256e Mon Sep 17 00:00:00 2001 From: sarathrajsrinivasan <159180023+sarathrajsrinivasan@users.noreply.github.com> Date: Thu, 31 Oct 2024 09:05:54 -0700 Subject: [PATCH 3218/3485] [macOS] Add Xcode 16.1 and 16.2 Beta 1 to macOS15 (#10880) --- images/macos/toolsets/toolset-15.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/images/macos/toolsets/toolset-15.json b/images/macos/toolsets/toolset-15.json index add427d72379..39b4eb1d6e0e 100644 --- a/images/macos/toolsets/toolset-15.json +++ b/images/macos/toolsets/toolset-15.json @@ -3,13 +3,15 @@ "default": "16", "x64": { "versions": [ - { "link": "16.1_Release_Candidate", "version": "16.1_Release_Candidate+16B40", "symlinks": ["16.1"], "install_runtimes": "true", "sha256": "8ca961d55981f983d21b99a95a6b0ac04905b837f6e11346ee86d28f12afe720"}, + { "link": "16.2_beta_1", "version": "16.2_beta_1+16B5100e", "symlinks": ["16.2"], "install_runtimes": "true", "sha256": "73a04c223b046e3b3891c126c3e1d154f433fc422136115b3f65bacd2f17f2d8"}, + { "link": "16.1", "version": "16.1+16B40", "install_runtimes": "true", "sha256": "8ca961d55981f983d21b99a95a6b0ac04905b837f6e11346ee86d28f12afe720"}, { "link": "16", "version": "16.0.0+16A242d", "symlinks": ["16.0"], "install_runtimes": "true", "sha256": "4a26c3d102a55c7222fb145e0ee1503249c9c26c6e02dc64d783c8810b37b1e3"} ] }, "arm64":{ "versions": [ - { "link": "16.1_Release_Candidate", "version": "16.1_Release_Candidate+16B40", "symlinks": ["16.1"], "install_runtimes": "true", "sha256": "8ca961d55981f983d21b99a95a6b0ac04905b837f6e11346ee86d28f12afe720"}, + { "link": "16.2_beta_1", "version": "16.2_beta_1+16B5100e", "symlinks": ["16.2"], "install_runtimes": "true", "sha256": "73a04c223b046e3b3891c126c3e1d154f433fc422136115b3f65bacd2f17f2d8"}, + { "link": "16.1", "version": "16.1+16B40", "install_runtimes": "true", "sha256": "8ca961d55981f983d21b99a95a6b0ac04905b837f6e11346ee86d28f12afe720"}, { "link": "16", "version": "16.0.0+16A242d", "symlinks": ["16.0"], "install_runtimes": "true", "sha256": "4a26c3d102a55c7222fb145e0ee1503249c9c26c6e02dc64d783c8810b37b1e3"} ] } From a29761eb602738fa26f650a9859eff599ed64f85 Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Fri, 1 Nov 2024 11:16:08 +0100 Subject: [PATCH 3219/3485] [ubuntu-24] Add nvm and gcloud cli (#10881) --- images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 | 6 ++---- images/ubuntu/scripts/tests/CLI.Tools.Tests.ps1 | 2 +- images/ubuntu/scripts/tests/Tools.Tests.ps1 | 2 +- images/ubuntu/templates/ubuntu-24.04.pkr.hcl | 2 ++ 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 b/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 index b06946acfadf..1174e7b621e8 100644 --- a/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 +++ b/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 @@ -135,9 +135,7 @@ $tools.AddToolVersion("Mercurial", $(Get-HGVersion)) $tools.AddToolVersion("Minikube", $(Get-MinikubeVersion)) $tools.AddToolVersion("n", $(Get-NVersion)) $tools.AddToolVersion("Newman", $(Get-NewmanVersion)) -if ((Test-IsUbuntu20) -or (Test-IsUbuntu22)) { - $tools.AddToolVersion("nvm", $(Get-NvmVersion)) -} +$tools.AddToolVersion("nvm", $(Get-NvmVersion)) $tools.AddToolVersion("OpenSSL", $(Get-OpensslVersion)) $tools.AddToolVersion("Packer", $(Get-PackerVersion)) $tools.AddToolVersion("Parcel", $(Get-ParcelVersion)) @@ -170,8 +168,8 @@ $cliTools.AddToolVersion("AWS SAM CLI", $(Get-AWSSAMVersion)) $cliTools.AddToolVersion("Azure CLI", $(Get-AzureCliVersion)) $cliTools.AddToolVersion("Azure CLI (azure-devops)", $(Get-AzureDevopsVersion)) $cliTools.AddToolVersion("GitHub CLI", $(Get-GitHubCliVersion)) +$cliTools.AddToolVersion("Google Cloud CLI", $(Get-GoogleCloudCLIVersion)) if ((Test-IsUbuntu20) -or (Test-IsUbuntu22)) { - $cliTools.AddToolVersion("Google Cloud CLI", $(Get-GoogleCloudCLIVersion)) $cliTools.AddToolVersion("Netlify CLI", $(Get-NetlifyCliVersion)) $cliTools.AddToolVersion("OpenShift CLI", $(Get-OCCliVersion)) $cliTools.AddToolVersion("ORAS CLI", $(Get-ORASCliVersion)) diff --git a/images/ubuntu/scripts/tests/CLI.Tools.Tests.ps1 b/images/ubuntu/scripts/tests/CLI.Tools.Tests.ps1 index abbf5857dd62..25c5cb1e4fd8 100644 --- a/images/ubuntu/scripts/tests/CLI.Tools.Tests.ps1 +++ b/images/ubuntu/scripts/tests/CLI.Tools.Tests.ps1 @@ -36,7 +36,7 @@ Describe "GitHub CLI" { } } -Describe "Google Cloud CLI" -Skip:((-not (Test-IsUbuntu20)) -and (-not (Test-IsUbuntu22))) { +Describe "Google Cloud CLI" { It "Google Cloud CLI" { "gcloud --version" | Should -ReturnZeroExitCode } diff --git a/images/ubuntu/scripts/tests/Tools.Tests.ps1 b/images/ubuntu/scripts/tests/Tools.Tests.ps1 index 749e65010901..8acb23a359e5 100644 --- a/images/ubuntu/scripts/tests/Tools.Tests.ps1 +++ b/images/ubuntu/scripts/tests/Tools.Tests.ps1 @@ -354,7 +354,7 @@ Describe "Containers" { } -Describe "nvm" -Skip:((-not (Test-IsUbuntu20)) -and (-not (Test-IsUbuntu22))) { +Describe "nvm" { It "nvm" { "source /etc/skel/.nvm/nvm.sh && nvm --version" | Should -ReturnZeroExitCode } diff --git a/images/ubuntu/templates/ubuntu-24.04.pkr.hcl b/images/ubuntu/templates/ubuntu-24.04.pkr.hcl index 634721ebf80c..7f02ff162321 100644 --- a/images/ubuntu/templates/ubuntu-24.04.pkr.hcl +++ b/images/ubuntu/templates/ubuntu-24.04.pkr.hcl @@ -297,6 +297,7 @@ provisioner "shell" { "${path.root}/../scripts/build/install-git-lfs.sh", "${path.root}/../scripts/build/install-github-cli.sh", "${path.root}/../scripts/build/install-google-chrome.sh", + "${path.root}/../scripts/build/install-google-cloud-cli.sh", "${path.root}/../scripts/build/install-haskell.sh", "${path.root}/../scripts/build/install-java-tools.sh", "${path.root}/../scripts/build/install-kubernetes-tools.sh", @@ -304,6 +305,7 @@ provisioner "shell" { "${path.root}/../scripts/build/install-kotlin.sh", "${path.root}/../scripts/build/install-mysql.sh", "${path.root}/../scripts/build/install-nginx.sh", + "${path.root}/../scripts/build/install-nvm.sh", "${path.root}/../scripts/build/install-nodejs.sh", "${path.root}/../scripts/build/install-bazel.sh", "${path.root}/../scripts/build/install-php.sh", From 2d275789110208cd547c539918d824b58e6612d5 Mon Sep 17 00:00:00 2001 From: kishorekumar-anchala <168699259+kishorekumar-anchala@users.noreply.github.com> Date: Mon, 4 Nov 2024 18:55:16 +0530 Subject: [PATCH 3220/3485] Update new edge signature for ubuntu (#10890) --- images/windows/scripts/build/Install-EdgeDriver.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/windows/scripts/build/Install-EdgeDriver.ps1 b/images/windows/scripts/build/Install-EdgeDriver.ps1 index e8f07b7de161..6d10d6e5d025 100644 --- a/images/windows/scripts/build/Install-EdgeDriver.ps1 +++ b/images/windows/scripts/build/Install-EdgeDriver.ps1 @@ -27,7 +27,7 @@ Write-Host "Expand Microsoft Edge WebDriver archive..." Expand-7ZipArchive -Path $archivePath -DestinationPath $edgeDriverPath #Validate the EdgeDriver signature -$signatureThumbprint = "7920AC8FB05E0FFFE21E8FF4B4F03093BA6AC16E" +$signatureThumbprint = "0BD8C56733FDCC06F8CB919FF5A200E39B1ACF71" Test-FileSignature -Path "$edgeDriverPath\msedgedriver.exe" -ExpectedThumbprint $signatureThumbprint Write-Host "Setting the environment variables..." From bf6ac0db939ae88ee1b48cdde887372aeab75b3f Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Mon, 4 Nov 2024 15:28:58 +0100 Subject: [PATCH 3221/3485] [Ubuntu24] Update apt sources (#10804) --- .../ubuntu/scripts/build/configure-apt-sources.sh | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/images/ubuntu/scripts/build/configure-apt-sources.sh b/images/ubuntu/scripts/build/configure-apt-sources.sh index b5afda474a67..1e6c9822032c 100644 --- a/images/ubuntu/scripts/build/configure-apt-sources.sh +++ b/images/ubuntu/scripts/build/configure-apt-sources.sh @@ -4,13 +4,22 @@ ## Desc: Configure apt sources with failover from Azure to Ubuntu archives. ################################################################################ +source $HELPER_SCRIPTS/os.sh + touch /etc/apt/apt-mirrors.txt printf "http://azure.archive.ubuntu.com/ubuntu/\tpriority:1\n" | tee -a /etc/apt/apt-mirrors.txt printf "http://archive.ubuntu.com/ubuntu/\tpriority:2\n" | tee -a /etc/apt/apt-mirrors.txt printf "http://security.ubuntu.com/ubuntu/\tpriority:3\n" | tee -a /etc/apt/apt-mirrors.txt -sed -i 's/http:\/\/azure.archive.ubuntu.com\/ubuntu\//mirror+file:\/etc\/apt\/apt-mirrors.txt/' /etc/apt/sources.list +if is_ubuntu24; then + sed -i 's/http:\/\/azure.archive.ubuntu.com\/ubuntu\//mirror+file:\/etc\/apt\/apt-mirrors.txt/' /etc/apt/sources.list.d/ubuntu.sources + + # Apt changes to survive Cloud Init + cp -f /etc/apt/sources.list.d/ubuntu.sources /etc/cloud/templates/sources.list.ubuntu.deb822.tmpl +else + sed -i 's/http:\/\/azure.archive.ubuntu.com\/ubuntu\//mirror+file:\/etc\/apt\/apt-mirrors.txt/' /etc/apt/sources.list -# Apt changes to survive Cloud Init -cp -f /etc/apt/sources.list /etc/cloud/templates/sources.list.ubuntu.tmpl + # Apt changes to survive Cloud Init + cp -f /etc/apt/sources.list /etc/cloud/templates/sources.list.ubuntu.tmpl +fi From 32f3b67f86e1d15f6906a895b17368919f9d866b Mon Sep 17 00:00:00 2001 From: aartis17 <aartis17@github.com> Date: Wed, 6 Nov 2024 01:24:47 +0530 Subject: [PATCH 3222/3485] [macOS]Add Xcode 16.2_beta_2 to macos15 (#10906) --- images/macos/toolsets/toolset-15.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/macos/toolsets/toolset-15.json b/images/macos/toolsets/toolset-15.json index 39b4eb1d6e0e..26f4f849c542 100644 --- a/images/macos/toolsets/toolset-15.json +++ b/images/macos/toolsets/toolset-15.json @@ -3,14 +3,14 @@ "default": "16", "x64": { "versions": [ - { "link": "16.2_beta_1", "version": "16.2_beta_1+16B5100e", "symlinks": ["16.2"], "install_runtimes": "true", "sha256": "73a04c223b046e3b3891c126c3e1d154f433fc422136115b3f65bacd2f17f2d8"}, + { "link": "16.2_beta_2", "version": "16.2_beta_2+16C5013f", "symlinks": ["16.2"], "install_runtimes": "true", "sha256": "b04956fca1b4fe468d5de8833b23c651ed787e41fc5a9c0e29f5eadd5b54d923"}, { "link": "16.1", "version": "16.1+16B40", "install_runtimes": "true", "sha256": "8ca961d55981f983d21b99a95a6b0ac04905b837f6e11346ee86d28f12afe720"}, { "link": "16", "version": "16.0.0+16A242d", "symlinks": ["16.0"], "install_runtimes": "true", "sha256": "4a26c3d102a55c7222fb145e0ee1503249c9c26c6e02dc64d783c8810b37b1e3"} ] }, "arm64":{ "versions": [ - { "link": "16.2_beta_1", "version": "16.2_beta_1+16B5100e", "symlinks": ["16.2"], "install_runtimes": "true", "sha256": "73a04c223b046e3b3891c126c3e1d154f433fc422136115b3f65bacd2f17f2d8"}, + { "link": "16.2_beta_2", "version": "16.2_beta_2+16C5013f", "symlinks": ["16.2"], "install_runtimes": "true", "sha256": "b04956fca1b4fe468d5de8833b23c651ed787e41fc5a9c0e29f5eadd5b54d923"}, { "link": "16.1", "version": "16.1+16B40", "install_runtimes": "true", "sha256": "8ca961d55981f983d21b99a95a6b0ac04905b837f6e11346ee86d28f12afe720"}, { "link": "16", "version": "16.0.0+16A242d", "symlinks": ["16.0"], "install_runtimes": "true", "sha256": "4a26c3d102a55c7222fb145e0ee1503249c9c26c6e02dc64d783c8810b37b1e3"} ] From 10abbce9e61d6e3ebab9a412a47f74b0a0664910 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 6 Nov 2024 11:33:46 +0000 Subject: [PATCH 3223/3485] Updating readme file for ubuntu20 version 20241103.1.1 (#10898) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2004-Readme.md | 142 +++++++++++++++-------------- 1 file changed, 73 insertions(+), 69 deletions(-) diff --git a/images/ubuntu/Ubuntu2004-Readme.md b/images/ubuntu/Ubuntu2004-Readme.md index 599124e12507..3a439d73b825 100644 --- a/images/ubuntu/Ubuntu2004-Readme.md +++ b/images/ubuntu/Ubuntu2004-Readme.md @@ -1,13 +1,14 @@ | Announcements | |-| +| [[Ubuntu 20 and 22] Node.js version 16 will be removed on November 18,2024.](https://github.com/actions/runner-images/issues/10896) | | [[Ubuntu 24 ] Node.js version 16 will be removed on October 21,2024.](https://github.com/actions/runner-images/issues/10677) | | [Ubuntu-latest workflows will use Ubuntu-24.04 image](https://github.com/actions/runner-images/issues/10636) | | [[Ubuntu 20 and 22] Go version 1.20.0 will be removed on October 14,2024.](https://github.com/actions/runner-images/issues/10607) | *** # Ubuntu 20.04 - OS Version: 20.04.6 LTS -- Kernel Version: 5.15.0-1073-azure -- Image Version: 20241006.1.0 +- Kernel Version: 5.15.0-1074-azure +- Image Version: 20241103.1.0 - Systemd version: 245.4-4ubuntu3.24 ## Installed Software @@ -22,28 +23,28 @@ - Erlang rebar3 3.24.0 - GNU C++: 10.5.0 - GNU Fortran: 10.5.0 -- Julia 1.10.5 -- Kotlin 2.0.20-release-360 +- Julia 1.11.1 +- Kotlin 2.0.21-release-482 - Mono 6.12.0.200 - MSBuild 16.10.1.31701 (Mono 6.12.0.200) - Node.js 18.20.4 - Perl 5.30.0 - Python 3.8.10 - Ruby 2.7.0p0 -- Swift 6.0.1 +- Swift 6.0.2 ### Package Management - cpan 1.64 -- Helm 3.16.1 -- Homebrew 4.4.0 -- Miniconda 24.7.1 +- Helm 3.16.2 +- Homebrew 4.4.3 +- Miniconda 24.9.2 - Npm 10.7.0 - NuGet 6.6.1.2 - Pip 20.0.2 - Pip3 20.0.2 - Pipx 1.7.1 - RubyGems 3.1.2 -- Vcpkg (build from commit 7adc2e4d4) +- Vcpkg (build from commit 4f746bc66) - Yarn 1.22.22 #### Environment variables @@ -63,36 +64,36 @@ to accomplish this. ### Project Management - Ant 1.10.7 - Gradle 8.10.2 -- Lerna 8.1.8 +- Lerna 8.1.9 - Maven 3.8.8 -- Sbt 1.10.2 +- Sbt 1.10.4 ### Tools - Ansible 2.13.13 - apt-fast 1.10.0 -- AzCopy 10.26.0 - available by `azcopy` and `azcopy10` aliases -- Bazel 7.3.2 -- Bazelisk 1.22.0 +- AzCopy 10.27.0 - available by `azcopy` and `azcopy10` aliases +- Bazel 7.4.0 +- Bazelisk 1.22.1 - Bicep 0.30.23 - Buildah 1.22.3 -- CMake 3.30.4 -- CodeQL Action Bundle 2.19.0 +- CMake 3.30.5 +- CodeQL Action Bundle 2.19.2 - Docker Amazon ECR Credential Helper 0.9.0 - Docker Compose v2 2.27.1 -- Docker-Buildx 0.17.1 +- Docker-Buildx 0.18.0 - Docker Client 26.1.3 - Docker Server 26.1.3 -- Fastlane 2.224.0 -- Git 2.46.2 +- Fastlane 2.225.0 +- Git 2.47.0 - Git LFS 3.5.1 - Git-ftp 1.6.0 - Haveged 1.9.1 -- Heroku 9.3.0 +- Heroku 9.3.2 - HHVM (HipHop VM) 4.172.1 - jq 1.6 - Kind 0.24.0 -- Kubectl 1.31.1 -- Kustomize 5.4.3 +- Kubectl 1.31.2 +- Kustomize 5.5.0 - Leiningen 2.11.2 - MediaInfo 19.09 - Mercurial 5.3.1 @@ -105,41 +106,41 @@ to accomplish this. - Parcel 2.12.0 - PhantomJS 2.1.1 2.1.1 - Podman 3.4.2 -- Pulumi 3.135.1 +- Pulumi 3.137.0 - R 4.4.1 - Skopeo 1.5.0 - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 -- Terraform 1.9.7 +- Terraform 1.9.8 - yamllint 1.35.1 - yq 4.44.3 - zstd 1.5.6 ### CLI Tools - Alibaba Cloud CLI 3.0.174 -- AWS CLI 2.18.0 -- AWS CLI Session Manager Plugin 1.2.650.0 -- AWS SAM CLI 1.125.0 -- Azure CLI 2.64.0 +- AWS CLI 2.19.1 +- AWS CLI Session Manager Plugin 1.2.677.0 +- AWS SAM CLI 1.127.0 +- Azure CLI 2.65.0 - Azure CLI (azure-devops) 1.0.1 -- GitHub CLI 2.58.0 -- Google Cloud CLI 495.0.0 -- Netlify CLI 17.36.4 +- GitHub CLI 2.60.1 +- Google Cloud CLI 499.0.0 +- Netlify CLI 17.37.2 - OpenShift CLI 4.15.19 - ORAS CLI 1.2.0 -- Vercel CLI 37.6.1 +- Vercel CLI 37.14.0 ### Java | Version | Environment Variable | | ------------------- | -------------------- | -| 8.0.422+5 | JAVA_HOME_8_X64 | -| 11.0.24+8 (default) | JAVA_HOME_11_X64 | -| 17.0.12+7 | JAVA_HOME_17_X64 | -| 21.0.4+7 | JAVA_HOME_21_X64 | +| 8.0.432+6 | JAVA_HOME_8_X64 | +| 11.0.25+9 (default) | JAVA_HOME_11_X64 | +| 17.0.13+11 | JAVA_HOME_17_X64 | +| 21.0.5+11 | JAVA_HOME_21_X64 | ### PHP Tools -- PHP: 7.4.33, 8.0.30, 8.1.30, 8.2.24, 8.3.12 -- Composer 2.8.1 +- PHP: 7.4.33, 8.0.30, 8.1.30, 8.2.25, 8.3.13 +- Composer 2.8.2 - PHPUnit 8.5.40 ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. @@ -152,27 +153,27 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Stack 3.1.1 ### Rust Tools -- Cargo 1.81.0 -- Rust 1.81.0 -- Rustdoc 1.81.0 +- Cargo 1.82.0 +- Rust 1.82.0 +- Rustdoc 1.82.0 - Rustup 1.27.1 #### Packages - Bindgen 0.70.1 -- Cargo audit 0.20.1 -- Cargo clippy 0.1.81 +- Cargo audit 0.21.0 +- Cargo clippy 0.1.82 - Cargo outdated 0.15.0 - Cbindgen 0.27.0 - Rustfmt 1.7.1 ### Browsers and Drivers -- Google Chrome 129.0.6668.89 -- ChromeDriver 129.0.6668.89 -- Chromium 129.0.6668.0 -- Microsoft Edge 129.0.2792.79 -- Microsoft Edge WebDriver 129.0.2792.73 -- Selenium server 4.25.0 -- Mozilla Firefox 131.0 +- Google Chrome 130.0.6723.91 +- ChromeDriver 130.0.6723.91 +- Chromium 130.0.6723.0 +- Microsoft Edge 130.0.2849.56 +- Microsoft Edge WebDriver 130.0.2849.68 +- Selenium server 4.26.0 +- Mozilla Firefox 132.0 - Geckodriver 0.35.0 #### Environment variables @@ -184,11 +185,11 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | ### .NET Tools -- .NET Core SDK: 6.0.425, 7.0.410, 8.0.402 -- nbgv 3.6.143+57d4199a9c +- .NET Core SDK: 6.0.427, 7.0.410, 8.0.403 +- nbgv 3.6.146+392592327a ### Databases -- MongoDB 5.0.29 +- MongoDB 5.0.30 - sqlite3 3.31.1 #### PostgreSQL @@ -215,14 +216,15 @@ Use the following command as a part of your job to start the service: 'sudo syst ### Cached Tools #### Go -- 1.20.14 - 1.21.13 - 1.22.8 +- 1.23.2 #### Node.js - 16.20.2 - 18.20.4 -- 20.17.0 +- 20.18.0 +- 22.10.0 #### Python - 3.7.17 @@ -243,17 +245,17 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Ruby - 3.0.7 - 3.1.6 -- 3.2.5 +- 3.2.6 ### PowerShell Tools -- PowerShell 7.4.5 +- PowerShell 7.4.6 #### PowerShell Modules - Az: 12.1.0 - MarkdownPS: 1.10 - Microsoft.Graph: 2.24.0 - Pester: 5.6.1 -- PSScriptAnalyzer: 1.22.0 +- PSScriptAnalyzer: 1.23.0 ### Web Servers | Name | Version | ConfigFile | ServiceStatus | ListenPort | @@ -272,16 +274,16 @@ Use the following command as a part of your job to start the service: 'sudo syst | CMake | 3.10.2<br>3.18.1<br>3.22.1 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 26.3.11579264<br>27.1.12297006 (default) | +| NDK | 26.3.11579264<br>27.2.12479018 (default) | #### Environment variables | Name | Value | | ----------------------- | -------------------------------------------- | | ANDROID_HOME | /usr/local/lib/android/sdk | -| ANDROID_NDK | /usr/local/lib/android/sdk/ndk/27.1.12297006 | -| ANDROID_NDK_HOME | /usr/local/lib/android/sdk/ndk/27.1.12297006 | -| ANDROID_NDK_LATEST_HOME | /usr/local/lib/android/sdk/ndk/27.1.12297006 | -| ANDROID_NDK_ROOT | /usr/local/lib/android/sdk/ndk/27.1.12297006 | +| ANDROID_NDK | /usr/local/lib/android/sdk/ndk/27.2.12479018 | +| ANDROID_NDK_HOME | /usr/local/lib/android/sdk/ndk/27.2.12479018 | +| ANDROID_NDK_LATEST_HOME | /usr/local/lib/android/sdk/ndk/27.2.12479018 | +| ANDROID_NDK_ROOT | /usr/local/lib/android/sdk/ndk/27.2.12479018 | | ANDROID_SDK_ROOT | /usr/local/lib/android/sdk | ### Cached Docker images @@ -292,16 +294,18 @@ Use the following command as a part of your job to start the service: 'sudo syst | alpine:3.18 | sha256:3ddf7bf1d408188f9849efbf4f902720ae08f5131bb39013518b918aa056d0de | 2024-09-06 | | alpine:3.19 | sha256:ae65dbf8749a7d4527648ccee1fa3deb6bfcae34cbc30fc67aa45c44dcaa90ee | 2024-09-06 | | debian:10 | sha256:58ce6f1271ae1c8a2006ff7d3e54e9874d839f573d8009c20154ad0f2fb0a225 | 2024-06-13 | -| debian:11 | sha256:152b9a5dc2a03f18ddfd88fbe7b1df41bd2b16be9f2df573a373caf46ce78c08 | 2024-09-27 | +| debian:11 | sha256:d0036be35fe0a4d2649bf074ca467a37dab8c5b26bbbdfca0375b4dc682f011d | 2024-10-17 | | debian:9 | sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be | 2022-06-23 | -| moby/buildkit:latest | sha256:bc1fe18224dbcb92599139db0c745696c48ba9fd4ac24038d1fa81fdd7dcac27 | 2024-09-10 | +| moby/buildkit:latest | sha256:8e8898b54dbaccc8e0b56e02e5d5b3d6b947a26c24b37899c5c652bba7c60b47 | 2024-10-30 | | node:16 | sha256:f77a1aef2da8d83e45ec990f45df50f1a286c5fe8bbfb8c6e4246c6389705c0b | 2023-09-07 | | node:16-alpine | sha256:a1f9d027912b58a7c75be7716c97cfbc6d3099f3a97ed84aa490be9dee20e787 | 2023-08-10 | -| node:18 | sha256:f910225c96b0f77b0149f350a3184568a9ba6cddba2a7c7805cc125a50591605 | 2024-07-09 | +| node:18 | sha256:ddd173cd94537e155b378342056e0968e8299eb3da9dd5d412d3b7f796ac38c0 | 2024-07-09 | | node:18-alpine | sha256:02376a266c84acbf45bd19440e08e48b1c8b98037417334046029ab585de03e2 | 2024-07-09 | -| node:20 | sha256:fffa89e023a3351904c04284029105d9e2ac7020886d683775a298569591e5bb | 2024-10-04 | +| node:20 | sha256:a5e0ed56f2c20b9689e0f7dd498cac7e08d2a3a283e92d9304e7b9b83e3c6ff3 | 2024-10-04 | | node:20-alpine | sha256:c13b26e7e602ef2f1074aef304ce6e9b7dd284c419b35d89fcf3cc8e44a8def9 | 2024-10-04 | -| ubuntu:20.04 | sha256:6d8d9799fe6ab3221965efac00b4c34a2bcc102c086a58dff9e19a08b913c7ef | 2024-09-18 | +| node:22 | sha256:de4c8be8232b7081d8846360d73ce6dbff33c6636f2259cd14d82c0de1ac3ff2 | 2024-10-29 | +| node:22-alpine | sha256:f265794478aa0b1a23d85a492c8311ed795bc527c3fe7e43453b3c872dcd71a3 | 2024-10-29 | +| ubuntu:20.04 | sha256:8e5c4f0285ecbb4ead070431d29b576a530d3166df73ec44affc1cd27555141b | 2024-10-11 | ### Installed apt packages | Name | Version | @@ -390,7 +394,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | upx | 3.95-2build1 | | wget | 1.20.3-1ubuntu2.1 | | xorriso | 1.5.2-1 | -| xvfb | 2:1.20.13-1ubuntu1\~20.04.17 | +| xvfb | 2:1.20.13-1ubuntu1\~20.04.18 | | xz-utils | 5.2.4-1ubuntu1.1 | | zip | 3.0-11build1 | | zsync | 0.6.2-3ubuntu1 | From c53958b30e369e3fa1b3d926dc4c210f9fa9cc88 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 6 Nov 2024 11:34:06 +0000 Subject: [PATCH 3224/3485] Updating readme file for ubuntu22 version 20241103.1.1 (#10899) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2204-Readme.md | 116 +++++++++++++++-------------- 1 file changed, 60 insertions(+), 56 deletions(-) diff --git a/images/ubuntu/Ubuntu2204-Readme.md b/images/ubuntu/Ubuntu2204-Readme.md index c21057425465..6728b50d7f5a 100644 --- a/images/ubuntu/Ubuntu2204-Readme.md +++ b/images/ubuntu/Ubuntu2204-Readme.md @@ -1,5 +1,6 @@ | Announcements | |-| +| [[Ubuntu 20 and 22] Node.js version 16 will be removed on November 18,2024.](https://github.com/actions/runner-images/issues/10896) | | [[Ubuntu 24 ] Node.js version 16 will be removed on October 21,2024.](https://github.com/actions/runner-images/issues/10677) | | [Ubuntu-latest workflows will use Ubuntu-24.04 image](https://github.com/actions/runner-images/issues/10636) | | [[Ubuntu 20 and 22] Go version 1.20.0 will be removed on October 14,2024.](https://github.com/actions/runner-images/issues/10607) | @@ -7,7 +8,7 @@ # Ubuntu 22.04 - OS Version: 22.04.5 LTS - Kernel Version: 6.5.0-1025-azure -- Image Version: 20241015.1.0 +- Image Version: 20241103.1.0 - Systemd version: 249.11-0ubuntu3.12 ## Installed Software @@ -20,7 +21,7 @@ - Dash 0.5.11+git20210903+057cd650a4ed-3build1 - GNU C++: 10.5.0, 11.4.0, 12.3.0 - GNU Fortran: 10.5.0, 11.4.0, 12.3.0 -- Julia 1.11.0 +- Julia 1.11.1 - Kotlin 2.0.21-release-482 - Mono 6.12.0.200 - MSBuild 16.10.1.31701 (Mono 6.12.0.200) @@ -28,20 +29,20 @@ - Perl 5.34.0 - Python 3.10.12 - Ruby 3.0.2p107 -- Swift 6.0.1 +- Swift 6.0.2 ### Package Management - cpan 1.64 - Helm 3.16.2 -- Homebrew 4.4.1 -- Miniconda 24.7.1 +- Homebrew 4.4.3 +- Miniconda 24.9.2 - Npm 10.7.0 - NuGet 6.6.1.2 - Pip 22.0.2 - Pip3 22.0.2 - Pipx 1.7.1 - RubyGems 3.3.5 -- Vcpkg (build from commit e63bd09dc) +- Vcpkg (build from commit 4f746bc66) - Yarn 1.22.22 #### Environment variables @@ -61,34 +62,34 @@ to accomplish this. ### Project Management - Ant 1.10.12 - Gradle 8.10.2 -- Lerna 8.1.8 +- Lerna 8.1.9 - Maven 3.8.8 -- Sbt 1.10.2 +- Sbt 1.10.4 ### Tools - Ansible 2.17.5 - apt-fast 1.10.0 -- AzCopy 10.26.0 - available by `azcopy` and `azcopy10` aliases -- Bazel 7.3.2 -- Bazelisk 1.22.0 +- AzCopy 10.27.0 - available by `azcopy` and `azcopy10` aliases +- Bazel 7.4.0 +- Bazelisk 1.22.1 - Bicep 0.30.23 - Buildah 1.23.1 - CMake 3.30.5 -- CodeQL Action Bundle 2.19.1 +- CodeQL Action Bundle 2.19.2 - Docker Amazon ECR Credential Helper 0.9.0 - Docker Compose v2 2.27.1 -- Docker-Buildx 0.17.1 +- Docker-Buildx 0.18.0 - Docker Client 26.1.3 - Docker Server 26.1.3 -- Fastlane 2.224.0 +- Fastlane 2.225.0 - Git 2.47.0 - Git LFS 3.5.1 - Git-ftp 1.6.0 - Haveged 1.9.14 -- Heroku 9.3.1 +- Heroku 9.3.2 - jq 1.6 - Kind 0.24.0 -- Kubectl 1.31.1 +- Kubectl 1.31.2 - Kustomize 5.5.0 - Leiningen 2.11.2 - MediaInfo 21.09 @@ -101,41 +102,41 @@ to accomplish this. - Packer 1.11.2 - Parcel 2.12.0 - Podman 3.4.4 -- Pulumi 3.136.1 +- Pulumi 3.137.0 - R 4.4.1 - Skopeo 1.4.1 - Sphinx Open Source Search Server 2.2.11 - SVN 1.14.1 -- Terraform 1.9.7 +- Terraform 1.9.8 - yamllint 1.35.1 - yq 4.44.3 - zstd 1.5.6 ### CLI Tools - Alibaba Cloud CLI 3.0.227 -- AWS CLI 2.18.7 +- AWS CLI 2.19.1 - AWS CLI Session Manager Plugin 1.2.677.0 -- AWS SAM CLI 1.125.0 +- AWS SAM CLI 1.127.0 - Azure CLI 2.65.0 - Azure CLI (azure-devops) 1.0.1 -- GitHub CLI 2.58.0 -- Google Cloud CLI 497.0.0 -- Netlify CLI 17.37.0 -- OpenShift CLI 4.17.0 +- GitHub CLI 2.60.1 +- Google Cloud CLI 499.0.0 +- Netlify CLI 17.37.2 +- OpenShift CLI 4.17.3 - ORAS CLI 1.2.0 -- Vercel CLI 37.8.0 +- Vercel CLI 37.14.0 ### Java | Version | Environment Variable | | ------------------- | -------------------- | -| 8.0.422+5 | JAVA_HOME_8_X64 | -| 11.0.24+8 (default) | JAVA_HOME_11_X64 | -| 17.0.12+7 | JAVA_HOME_17_X64 | -| 21.0.4+7 | JAVA_HOME_21_X64 | +| 8.0.432+6 | JAVA_HOME_8_X64 | +| 11.0.25+9 (default) | JAVA_HOME_11_X64 | +| 17.0.13+11 | JAVA_HOME_17_X64 | +| 21.0.5+11 | JAVA_HOME_21_X64 | ### PHP Tools - PHP: 8.1.2 -- Composer 2.8.1 +- Composer 2.8.2 - PHPUnit 8.5.40 ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. @@ -148,27 +149,27 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Stack 3.1.1 ### Rust Tools -- Cargo 1.81.0 -- Rust 1.81.0 -- Rustdoc 1.81.0 +- Cargo 1.82.0 +- Rust 1.82.0 +- Rustdoc 1.82.0 - Rustup 1.27.1 #### Packages - Bindgen 0.70.1 -- Cargo audit 0.20.1 -- Cargo clippy 0.1.81 +- Cargo audit 0.21.0 +- Cargo clippy 0.1.82 - Cargo outdated 0.15.0 - Cbindgen 0.27.0 - Rustfmt 1.7.1 ### Browsers and Drivers -- Google Chrome 130.0.6723.58 -- ChromeDriver 130.0.6723.58 +- Google Chrome 130.0.6723.91 +- ChromeDriver 130.0.6723.91 - Chromium 130.0.6723.0 -- Microsoft Edge 129.0.2792.89 -- Microsoft Edge WebDriver 129.0.2792.93 -- Selenium server 4.25.0 -- Mozilla Firefox 131.0.2 +- Microsoft Edge 130.0.2849.56 +- Microsoft Edge WebDriver 130.0.2849.68 +- Selenium server 4.26.0 +- Mozilla Firefox 132.0 - Geckodriver 0.35.0 #### Environment variables @@ -181,7 +182,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ### .NET Tools - .NET Core SDK: 6.0.427, 7.0.410, 8.0.403 -- nbgv 3.6.143+57d4199a9c +- nbgv 3.6.146+392592327a ### Databases - sqlite3 3.37.2 @@ -218,6 +219,7 @@ Use the following command as a part of your job to start the service: 'sudo syst - 16.20.2 - 18.20.4 - 20.18.0 +- 22.10.0 #### Python - 3.7.17 @@ -235,10 +237,10 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Ruby - 3.1.6 -- 3.2.5 +- 3.2.6 ### PowerShell Tools -- PowerShell 7.4.5 +- PowerShell 7.4.6 #### PowerShell Modules - Az: 12.1.0 @@ -263,16 +265,16 @@ Use the following command as a part of your job to start the service: 'sudo syst | CMake | 3.10.2<br>3.18.1<br>3.22.1 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 26.3.11579264<br>27.1.12297006 (default) | +| NDK | 26.3.11579264<br>27.2.12479018 (default) | #### Environment variables | Name | Value | | ----------------------- | -------------------------------------------- | | ANDROID_HOME | /usr/local/lib/android/sdk | -| ANDROID_NDK | /usr/local/lib/android/sdk/ndk/27.1.12297006 | -| ANDROID_NDK_HOME | /usr/local/lib/android/sdk/ndk/27.1.12297006 | -| ANDROID_NDK_LATEST_HOME | /usr/local/lib/android/sdk/ndk/27.1.12297006 | -| ANDROID_NDK_ROOT | /usr/local/lib/android/sdk/ndk/27.1.12297006 | +| ANDROID_NDK | /usr/local/lib/android/sdk/ndk/27.2.12479018 | +| ANDROID_NDK_HOME | /usr/local/lib/android/sdk/ndk/27.2.12479018 | +| ANDROID_NDK_LATEST_HOME | /usr/local/lib/android/sdk/ndk/27.2.12479018 | +| ANDROID_NDK_ROOT | /usr/local/lib/android/sdk/ndk/27.2.12479018 | | ANDROID_SDK_ROOT | /usr/local/lib/android/sdk | ### Cached Docker images @@ -283,16 +285,18 @@ Use the following command as a part of your job to start the service: 'sudo syst | alpine:3.18 | sha256:3ddf7bf1d408188f9849efbf4f902720ae08f5131bb39013518b918aa056d0de | 2024-09-06 | | alpine:3.19 | sha256:ae65dbf8749a7d4527648ccee1fa3deb6bfcae34cbc30fc67aa45c44dcaa90ee | 2024-09-06 | | debian:10 | sha256:58ce6f1271ae1c8a2006ff7d3e54e9874d839f573d8009c20154ad0f2fb0a225 | 2024-06-13 | -| debian:11 | sha256:152b9a5dc2a03f18ddfd88fbe7b1df41bd2b16be9f2df573a373caf46ce78c08 | 2024-09-27 | -| moby/buildkit:latest | sha256:bc1fe18224dbcb92599139db0c745696c48ba9fd4ac24038d1fa81fdd7dcac27 | 2024-09-10 | +| debian:11 | sha256:d0036be35fe0a4d2649bf074ca467a37dab8c5b26bbbdfca0375b4dc682f011d | 2024-10-17 | +| moby/buildkit:latest | sha256:8e8898b54dbaccc8e0b56e02e5d5b3d6b947a26c24b37899c5c652bba7c60b47 | 2024-10-30 | | node:16 | sha256:f77a1aef2da8d83e45ec990f45df50f1a286c5fe8bbfb8c6e4246c6389705c0b | 2023-09-07 | | node:16-alpine | sha256:a1f9d027912b58a7c75be7716c97cfbc6d3099f3a97ed84aa490be9dee20e787 | 2023-08-10 | -| node:18 | sha256:f910225c96b0f77b0149f350a3184568a9ba6cddba2a7c7805cc125a50591605 | 2024-07-09 | +| node:18 | sha256:ddd173cd94537e155b378342056e0968e8299eb3da9dd5d412d3b7f796ac38c0 | 2024-07-09 | | node:18-alpine | sha256:02376a266c84acbf45bd19440e08e48b1c8b98037417334046029ab585de03e2 | 2024-07-09 | -| node:20 | sha256:fffa89e023a3351904c04284029105d9e2ac7020886d683775a298569591e5bb | 2024-10-04 | +| node:20 | sha256:a5e0ed56f2c20b9689e0f7dd498cac7e08d2a3a283e92d9304e7b9b83e3c6ff3 | 2024-10-04 | | node:20-alpine | sha256:c13b26e7e602ef2f1074aef304ce6e9b7dd284c419b35d89fcf3cc8e44a8def9 | 2024-10-04 | -| ubuntu:20.04 | sha256:e341aa0d58bb9480bd092a137658bd1a7a5e8ae4fca31769df0eb7d6c4b8266e | 2024-10-11 | -| ubuntu:22.04 | sha256:58b87898e82351c6cf9cf5b9f3c20257bb9e2dcf33af051e12ce532d7f94e3fe | 2024-09-11 | +| node:22 | sha256:de4c8be8232b7081d8846360d73ce6dbff33c6636f2259cd14d82c0de1ac3ff2 | 2024-10-29 | +| node:22-alpine | sha256:f265794478aa0b1a23d85a492c8311ed795bc527c3fe7e43453b3c872dcd71a3 | 2024-10-29 | +| ubuntu:20.04 | sha256:8e5c4f0285ecbb4ead070431d29b576a530d3166df73ec44affc1cd27555141b | 2024-10-11 | +| ubuntu:22.04 | sha256:0e5e4a57c2499249aafc3b40fcd541e9a456aab7296681a3994d631587203f97 | 2024-09-11 | ### Installed apt packages | Name | Version | @@ -383,7 +387,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | upx | 3.96-3 | | wget | 1.21.2-2ubuntu1.1 | | xorriso | 1.5.4-2 | -| xvfb | 2:21.1.4-2ubuntu1.7\~22.04.11 | +| xvfb | 2:21.1.4-2ubuntu1.7\~22.04.12 | | xz-utils | 5.2.5-2ubuntu1 | | zip | 3.0-12build2 | | zsync | 0.6.2-3ubuntu1 | From e74605cd6d5407469cf224802f25057bafc23d70 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 6 Nov 2024 12:06:03 +0000 Subject: [PATCH 3225/3485] Updating readme file for ubuntu24 version 20241103.1.1 (#10900) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2404-Readme.md | 91 +++++++++++++++--------------- 1 file changed, 47 insertions(+), 44 deletions(-) diff --git a/images/ubuntu/Ubuntu2404-Readme.md b/images/ubuntu/Ubuntu2404-Readme.md index 9c38fa28f638..9aee7ccf55c5 100644 --- a/images/ubuntu/Ubuntu2404-Readme.md +++ b/images/ubuntu/Ubuntu2404-Readme.md @@ -1,13 +1,14 @@ | Announcements | |-| +| [[Ubuntu 20 and 22] Node.js version 16 will be removed on November 18,2024.](https://github.com/actions/runner-images/issues/10896) | | [[Ubuntu 24 ] Node.js version 16 will be removed on October 21,2024.](https://github.com/actions/runner-images/issues/10677) | | [Ubuntu-latest workflows will use Ubuntu-24.04 image](https://github.com/actions/runner-images/issues/10636) | | [[Ubuntu 20 and 22] Go version 1.20.0 will be removed on October 14,2024.](https://github.com/actions/runner-images/issues/10607) | *** # Ubuntu 24.04 - OS Version: 24.04.1 LTS -- Kernel Version: 6.8.0-1015-azure -- Image Version: 20241016.1.0 +- Kernel Version: 6.8.0-1016-azure +- Image Version: 20241103.1.0 - Systemd version: 255.4-1ubuntu8.4 ## Installed Software @@ -20,25 +21,25 @@ - Dash 0.5.12-6ubuntu5 - GNU C++: 12.3.0, 13.2.0, 14.2.0 - GNU Fortran: 12.3.0, 13.2.0, 14.2.0 -- Julia 1.11.0 +- Julia 1.11.1 - Kotlin 2.0.21-release-482 - Node.js 20.18.0 - Perl 5.38.2 - Python 3.12.3 - Ruby 3.2.3 -- Swift 6.0.1 +- Swift 6.0.2 ### Package Management - cpan 1.64 - Helm 3.16.2 -- Homebrew 4.4.1 -- Miniconda 24.7.1 +- Homebrew 4.4.3 +- Miniconda 24.9.2 - Npm 10.8.2 - Pip 24.0 - Pip3 24.0 -- Pipx 1.4.3 +- Pipx 1.7.1 - RubyGems 3.4.20 -- Vcpkg (build from commit e63bd09dc) +- Vcpkg (build from commit 4f746bc66) - Yarn 1.22.22 #### Environment variables @@ -58,42 +59,43 @@ to accomplish this. ### Project Management - Ant 1.10.14 - Gradle 8.10.2 -- Lerna 8.1.8 +- Lerna 8.1.9 - Maven 3.8.8 ### Tools - Ansible 2.17.5 -- AzCopy 10.26.0 - available by `azcopy` and `azcopy10` aliases -- Bazel 7.3.2 -- Bazelisk 1.22.0 +- AzCopy 10.27.0 - available by `azcopy` and `azcopy10` aliases +- Bazel 7.4.0 +- Bazelisk 1.22.1 - Bicep 0.30.23 - Buildah 1.33.7 - CMake 3.30.5 -- CodeQL Action Bundle 2.19.1 +- CodeQL Action Bundle 2.19.2 - Docker Amazon ECR Credential Helper 0.9.0 - Docker Compose v2 2.27.1 -- Docker-Buildx 0.17.1 +- Docker-Buildx 0.18.0 - Docker Client 26.1.3 - Docker Server 26.1.3 -- Fastlane 2.224.0 +- Fastlane 2.225.0 - Git 2.47.0 - Git LFS 3.5.1 - Git-ftp 1.6.0 - Haveged 1.9.14 - jq 1.7 - Kind 0.24.0 -- Kubectl 1.31.1 +- Kubectl 1.31.2 - Kustomize 5.5.0 - MediaInfo 24.01 - Mercurial 6.7.2 - Minikube 1.34.0 - n 10.0.0 - Newman 6.2.1 +- nvm 0.40.1 - OpenSSL 3.0.13-0ubuntu3.4 - Packer 1.11.2 - Parcel 2.12.0 - Podman 4.9.3 -- Pulumi 3.136.1 +- Pulumi 3.137.0 - Skopeo 1.13.3 - Sphinx Open Source Search Server 2.2.11 - yamllint 1.35.1 @@ -101,24 +103,25 @@ to accomplish this. - zstd 1.5.6 ### CLI Tools -- AWS CLI 2.18.7 +- AWS CLI 2.19.1 - AWS CLI Session Manager Plugin 1.2.677.0 -- AWS SAM CLI 1.125.0 +- AWS SAM CLI 1.127.0 - Azure CLI 2.65.0 - Azure CLI (azure-devops) 1.0.1 -- GitHub CLI 2.58.0 +- GitHub CLI 2.60.1 +- Google Cloud CLI 499.0.0 ### Java -| Version | Environment Variable | -| ------------------- | -------------------- | -| 8.0.422+5 | JAVA_HOME_8_X64 | -| 11.0.24+8 | JAVA_HOME_11_X64 | -| 17.0.12+7 (default) | JAVA_HOME_17_X64 | -| 21.0.4+7 | JAVA_HOME_21_X64 | +| Version | Environment Variable | +| -------------------- | -------------------- | +| 8.0.432+6 | JAVA_HOME_8_X64 | +| 11.0.25+9 | JAVA_HOME_11_X64 | +| 17.0.13+11 (default) | JAVA_HOME_17_X64 | +| 21.0.5+11 | JAVA_HOME_21_X64 | ### PHP Tools - PHP: 8.3.6 -- Composer 2.8.1 +- Composer 2.8.2 - PHPUnit 8.5.40 ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. @@ -131,22 +134,22 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Stack 3.1.1 ### Rust Tools -- Cargo 1.81.0 -- Rust 1.81.0 -- Rustdoc 1.81.0 +- Cargo 1.82.0 +- Rust 1.82.0 +- Rustdoc 1.82.0 - Rustup 1.27.1 #### Packages - Rustfmt 1.7.1 ### Browsers and Drivers -- Google Chrome 130.0.6723.58 -- ChromeDriver 130.0.6723.58 +- Google Chrome 130.0.6723.91 +- ChromeDriver 130.0.6723.91 - Chromium 130.0.6723.0 -- Microsoft Edge 129.0.2792.89 -- Microsoft Edge WebDriver 129.0.2792.93 -- Selenium server 4.25.0 -- Mozilla Firefox 131.0.2 +- Microsoft Edge 130.0.2849.56 +- Microsoft Edge WebDriver 130.0.2849.68 +- Selenium server 4.26.0 +- Mozilla Firefox 132.0 - Geckodriver 0.35.0 #### Environment variables @@ -159,7 +162,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ### .NET Tools - .NET Core SDK: 8.0.110 -- nbgv 3.6.143+57d4199a9c +- nbgv 3.6.146+392592327a ### Databases - sqlite3 3.45.1 @@ -189,9 +192,9 @@ Use the following command as a part of your job to start the service: 'sudo syst - 1.23.2 #### Node.js -- 16.20.2 - 18.20.4 - 20.18.0 +- 22.10.0 #### Python - 3.9.20 @@ -227,16 +230,16 @@ Use the following command as a part of your job to start the service: 'sudo syst | Android Support Repository | 47.0.0 | | Google Play services | 49 | | Google Repository | 58 | -| NDK | 26.3.11579264<br>27.1.12297006 (default) | +| NDK | 26.3.11579264<br>27.2.12479018 (default) | #### Environment variables | Name | Value | | ----------------------- | -------------------------------------------- | | ANDROID_HOME | /usr/local/lib/android/sdk | -| ANDROID_NDK | /usr/local/lib/android/sdk/ndk/27.1.12297006 | -| ANDROID_NDK_HOME | /usr/local/lib/android/sdk/ndk/27.1.12297006 | -| ANDROID_NDK_LATEST_HOME | /usr/local/lib/android/sdk/ndk/27.1.12297006 | -| ANDROID_NDK_ROOT | /usr/local/lib/android/sdk/ndk/27.1.12297006 | +| ANDROID_NDK | /usr/local/lib/android/sdk/ndk/27.2.12479018 | +| ANDROID_NDK_HOME | /usr/local/lib/android/sdk/ndk/27.2.12479018 | +| ANDROID_NDK_LATEST_HOME | /usr/local/lib/android/sdk/ndk/27.2.12479018 | +| ANDROID_NDK_ROOT | /usr/local/lib/android/sdk/ndk/27.2.12479018 | | ANDROID_SDK_ROOT | /usr/local/lib/android/sdk | ### Installed apt packages @@ -308,7 +311,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | unzip | 6.0-28ubuntu4.1 | | upx | 4.2.2-3 | | wget | 1.21.4-1ubuntu4.1 | -| xvfb | 2:21.1.12-1ubuntu1 | +| xvfb | 2:21.1.12-1ubuntu1.1 | | xz-utils | 5.6.1+really5.4.5-1build0.1 | | zip | 3.0-13build1 | | zsync | 0.6.2-5build1 | From adf6d83ab9e2e06b3f2895c07fc420a75a7a04f9 Mon Sep 17 00:00:00 2001 From: sarathrajsrinivasan <159180023+sarathrajsrinivasan@users.noreply.github.com> Date: Tue, 5 Nov 2024 08:41:59 -0600 Subject: [PATCH 3226/3485] [macOS] Add unxip for macOS13 --- images/macos/scripts/build/install-unxip.sh | 15 +++++++++++++++ .../scripts/docs-gen/Generate-SoftwareReport.ps1 | 1 + .../scripts/docs-gen/SoftwareReport.Common.psm1 | 5 +++++ images/macos/scripts/tests/Common.Tests.ps1 | 6 ++++++ images/macos/templates/macOS-13.anka.pkr.hcl | 3 ++- .../macos/templates/macOS-13.arm64.anka.pkr.hcl | 3 ++- images/macos/toolsets/toolset-13.json | 1 - 7 files changed, 31 insertions(+), 3 deletions(-) create mode 100644 images/macos/scripts/build/install-unxip.sh diff --git a/images/macos/scripts/build/install-unxip.sh b/images/macos/scripts/build/install-unxip.sh new file mode 100644 index 000000000000..fe7e3e1dd78f --- /dev/null +++ b/images/macos/scripts/build/install-unxip.sh @@ -0,0 +1,15 @@ +#!/bin/bash -e -o pipefail +################################################################################ +## File: install-unxip.sh +## Desc: Install unxip +################################################################################ + +source ~/utils/utils.sh + +echo "Installing unxip..." +unxip_pkg=$(download_with_retry "https://github.com/saagarjha/unxip/releases/download/v3.1/unxip") +unxip_pkg_sha256="926ecd7bffa201c7b2b8a729fc70fbf228cf624a0e6856c13f935a97fa4fc71a" +use_checksum_comparison $unxip_pkg $unxip_pkg_sha256 +install "$unxip_pkg" /usr/local/bin/unxip + +invoke_tests "Common" "Unxip" diff --git a/images/macos/scripts/docs-gen/Generate-SoftwareReport.ps1 b/images/macos/scripts/docs-gen/Generate-SoftwareReport.ps1 index a7a8d6bd0766..7e90c4d5c7cf 100644 --- a/images/macos/scripts/docs-gen/Generate-SoftwareReport.ps1 +++ b/images/macos/scripts/docs-gen/Generate-SoftwareReport.ps1 @@ -149,6 +149,7 @@ if ($os.IsMonterey) { $utilities.AddToolVersion("Vagrant", $(Get-VagrantVersion)) $utilities.AddToolVersion("VirtualBox", $(Get-VirtualBoxVersion)) } +$utilities.AddToolVersion("Unxip", $(Get-UnxipVersion)) $utilities.AddToolVersion("yq", $(Get-YqVersion)) $utilities.AddToolVersion("zstd", $(Get-ZstdVersion)) diff --git a/images/macos/scripts/docs-gen/SoftwareReport.Common.psm1 b/images/macos/scripts/docs-gen/SoftwareReport.Common.psm1 index e58fd1a52760..158c38b99206 100644 --- a/images/macos/scripts/docs-gen/SoftwareReport.Common.psm1 +++ b/images/macos/scripts/docs-gen/SoftwareReport.Common.psm1 @@ -619,3 +619,8 @@ function Get-XcodesVersion { $XcodesVersion = Run-Command "xcodes version" return $XcodesVersion } + +function Get-UnxipVersion { + $unxipVersion = Run-Command "unxip --version" | Take-Part -Part 1 + return $unxipVersion +} diff --git a/images/macos/scripts/tests/Common.Tests.ps1 b/images/macos/scripts/tests/Common.Tests.ps1 index 497ed60e2082..4d6ebf8e289c 100644 --- a/images/macos/scripts/tests/Common.Tests.ps1 +++ b/images/macos/scripts/tests/Common.Tests.ps1 @@ -162,3 +162,9 @@ Describe "Compiled" -Skip:(-not $os.IsMonterey) { "sbt -version" | Should -ReturnZeroExitCode } } + +Describe "Unxip" { + It "Unxip" { + "unxip --version" | Should -ReturnZeroExitCode + } +} diff --git a/images/macos/templates/macOS-13.anka.pkr.hcl b/images/macos/templates/macOS-13.anka.pkr.hcl index 352b1d896437..25789a533f79 100644 --- a/images/macos/templates/macOS-13.anka.pkr.hcl +++ b/images/macos/templates/macOS-13.anka.pkr.hcl @@ -217,7 +217,8 @@ build { "${path.root}/../scripts/build/install-rubygems.sh", "${path.root}/../scripts/build/install-git.sh", "${path.root}/../scripts/build/install-node.sh", - "${path.root}/../scripts/build/install-common-utils.sh" + "${path.root}/../scripts/build/install-common-utils.sh", + "${path.root}/../scripts/build/install-unxip.sh" ] } diff --git a/images/macos/templates/macOS-13.arm64.anka.pkr.hcl b/images/macos/templates/macOS-13.arm64.anka.pkr.hcl index 238ab132ee94..7e03aa8fe7ee 100644 --- a/images/macos/templates/macOS-13.arm64.anka.pkr.hcl +++ b/images/macos/templates/macOS-13.arm64.anka.pkr.hcl @@ -219,7 +219,8 @@ build { "${path.root}/../scripts/build/install-rubygems.sh", "${path.root}/../scripts/build/install-git.sh", "${path.root}/../scripts/build/install-node.sh", - "${path.root}/../scripts/build/install-common-utils.sh" + "${path.root}/../scripts/build/install-common-utils.sh", + "${path.root}/../scripts/build/install-unxip.sh" ] } diff --git a/images/macos/toolsets/toolset-13.json b/images/macos/toolsets/toolset-13.json index 6fa79c72a036..1518b52f0f04 100644 --- a/images/macos/toolsets/toolset-13.json +++ b/images/macos/toolsets/toolset-13.json @@ -78,7 +78,6 @@ "zstd", "gmp", "yq", - "unxip", "xcbeautify", "xcodes" ], From d3f705c42924017b7583188c2ea8593e2a085e88 Mon Sep 17 00:00:00 2001 From: vidyasagarnimmagaddi <160703874+vidyasagarnimmagaddi@users.noreply.github.com> Date: Thu, 7 Nov 2024 03:26:01 +0530 Subject: [PATCH 3227/3485] [Windows] adding .Net Version 8 to Windows-2022 (#10913) --- images/windows/toolsets/toolset-2022.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/images/windows/toolsets/toolset-2022.json b/images/windows/toolsets/toolset-2022.json index 485ed4f370d7..83febd6d37e2 100644 --- a/images/windows/toolsets/toolset-2022.json +++ b/images/windows/toolsets/toolset-2022.json @@ -316,7 +316,8 @@ "dotnet": { "versions": [ "6.0", - "7.0" + "7.0", + "8.0" ], "tools": [ { "name": "nbgv", "test": "nbgv --version", "getversion": "nbgv --version" } From b4c921107cb265643b6517731f5cfe515e18a716 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 7 Nov 2024 13:39:30 +0000 Subject: [PATCH 3228/3485] Updating readme file for win19 version 20241104.2.1 (#10903) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/windows/Windows2019-Readme.md | 58 +++++++++++++++------------- 1 file changed, 32 insertions(+), 26 deletions(-) diff --git a/images/windows/Windows2019-Readme.md b/images/windows/Windows2019-Readme.md index 2971f021d80a..1635338137e6 100644 --- a/images/windows/Windows2019-Readme.md +++ b/images/windows/Windows2019-Readme.md @@ -1,6 +1,11 @@ +| Announcements | +|-| +| [[Windows] .NET 7.x will be removed from the images on December 6, 2024](https://github.com/actions/runner-images/issues/10894) | +| [[Windows] Python 3.7.x will be removed from December 6 ,2024](https://github.com/actions/runner-images/issues/10893) | +*** # Windows Server 2019 - OS Version: 10.0.17763 Build 6414 -- Image Version: 20241021.1.0 +- Image Version: 20241104.2.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -15,21 +20,21 @@ - LLVM 18.1.8 - Node 18.20.3 - Perl 5.32.1 -- PHP 8.3.12 +- PHP 8.3.13 - Python 3.7.9 - Ruby 3.0.7p220 ### Package Management - Chocolatey 2.3.0 -- Composer 2.8.1 +- Composer 2.8.2 - Helm 3.16.1 -- Miniconda 24.7.1 (pre-installed on the image but not added to PATH) +- Miniconda 24.9.2 (pre-installed on the image but not added to PATH) - NPM 10.7.0 - NuGet 6.11.1.2 - pip 24.0 (python 3.7) - Pipx 1.2.1 - RubyGems 3.2.33 -- Vcpkg (build from commit 3a747a4fc) +- Vcpkg (build from commit 2a3138723) - Yarn 1.22.22 #### Environment variables @@ -42,30 +47,30 @@ - Ant 1.10.14 - Gradle 8.10 - Maven 3.8.7 -- sbt 1.10.3 +- sbt 1.10.4 ### Tools - 7zip 24.08 - aria2 1.37.0 -- azcopy 10.26.0 -- Bazel 7.3.2 +- azcopy 10.27.0 +- Bazel 7.4.0 - Bazelisk 1.22.1 - Bicep 0.30.23 - Cabal 3.12.1.0 - CMake 3.30.5 -- CodeQL Action Bundle 2.19.1 +- CodeQL Action Bundle 2.19.2 - Docker 26.1.3 - Docker Compose v2 2.27.1 - Docker-wincred 0.8.2 - ghc 9.10.1 - Git 2.47.0.windows.1 - Git LFS 3.5.1 -- Google Cloud CLI 497.0.0 +- Google Cloud CLI 499.0.0 - ImageMagick 7.1.1-39 - InnoSetup 6.3.3 - jq 1.7.1 - Kind 0.24.0 -- Kubectl 1.31.1 +- Kubectl 1.31.2 - Mercurial 5.0 - gcc 8.1.0 - gdb 8.1 @@ -76,7 +81,7 @@ - Packer 1.11.2 - Parcel 2.12.0 - Pulumi 3.137.0 -- R 4.4.1 +- R 4.4.2 - Service Fabric SDK 9.1.1436.9590 - Stack 3.1.1 - Subversion (SVN) 1.14.4 @@ -89,13 +94,13 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.227 -- AWS CLI 2.18.10 -- AWS SAM CLI 1.126.0 +- AWS CLI 2.19.1 +- AWS SAM CLI 1.127.0 - AWS Session Manager CLI 1.2.677.0 - Azure CLI 2.65.0 - Azure DevOps CLI extension 1.0.1 -- Cloud Foundry CLI 8.8.2 -- GitHub CLI 2.59.0 +- Cloud Foundry CLI 8.8.3 +- GitHub CLI 2.60.1 ### Rust Tools - Cargo 1.82.0 @@ -105,21 +110,21 @@ #### Packages - bindgen 0.70.1 -- cargo-audit 0.20.1 +- cargo-audit 0.21.0 - cargo-outdated 0.15.0 - cbindgen 0.27.0 - Clippy 0.1.82 - Rustfmt 1.7.1 ### Browsers and Drivers -- Google Chrome 130.0.6723.59 -- Chrome Driver 130.0.6723.58 -- Microsoft Edge 130.0.2849.46 -- Microsoft Edge Driver 130.0.2849.46 -- Mozilla Firefox 131.0.3 +- Google Chrome 130.0.6723.92 +- Chrome Driver 130.0.6723.91 +- Microsoft Edge 130.0.2849.68 +- Microsoft Edge Driver 130.0.2849.68 +- Mozilla Firefox 132.0.1 - Gecko Driver 0.35.0 - IE Driver 4.14.0.0 -- Selenium server 4.25.0 +- Selenium server 4.26.0 #### Environment variables | Name | Value | @@ -188,7 +193,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Ruby - 3.0.7 - 3.1.6 -- 3.2.5 +- 3.2.6 ### Databases @@ -495,7 +500,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - nbgv 3.6.146+392592327a ### PowerShell Tools -- PowerShell 7.4.5 +- PowerShell 7.4.6 #### Powershell Modules - Az: 12.1.0 @@ -503,7 +508,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - AzureRM: 2.1.0 (Default), 6.13.1 - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.681 +- AWSPowershell: 4.1.691 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.10 - Microsoft.Graph: 2.24.0 @@ -552,3 +557,4 @@ All other versions are saved but not installed. | mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:8a885e75361b04540285efde17f2fc00b7ac8953bb8d1e9442adf3f41f170b5e | 2024-10-08 | | mcr.microsoft.com/windows/nanoserver:1809 | sha256:cdd5a33c8dd429071a00de8c7532bf40855174763d88ba575ec55c8060e964fc | 2024-10-04 | | mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:b36581f8c38aa45a8eb1849372603fcbfe97befb3c0ad510e9cfc2ccef8fd3ca | 2024-10-04 | + From 84c4b32b94fceb62a57609a34527a3016ec43079 Mon Sep 17 00:00:00 2001 From: sarathrajsrinivasan <sarathrajsrinivasan@github.com> Date: Thu, 7 Nov 2024 19:02:19 -0600 Subject: [PATCH 3229/3485] [macOS] Add openssl 1.1 back --- images/macos/scripts/build/install-openssl.sh | 22 ++++++++++--------- images/macos/scripts/tests/OpenSSL.Tests.ps1 | 13 +++-------- 2 files changed, 15 insertions(+), 20 deletions(-) diff --git a/images/macos/scripts/build/install-openssl.sh b/images/macos/scripts/build/install-openssl.sh index d883c7bd0957..b5a10e0939c5 100644 --- a/images/macos/scripts/build/install-openssl.sh +++ b/images/macos/scripts/build/install-openssl.sh @@ -6,20 +6,22 @@ source ~/utils/utils.sh -echo "Install openssl@3" -brew_smart_install "openssl@3" +echo "Install openssl@1.1" -if ! is_Arm64; then - # Symlink brew openssl@3 to `/usr/local/bin` as Homebrew refuses - ln -sf $(brew --prefix openssl@3)/bin/openssl /usr/local/bin/openssl -else - # arm64 has a different installation prefix for brew - ln -sf $(brew --prefix openssl@3)/bin/openssl /opt/homebrew/bin/openssl -fi +wget https://www.openssl.org/source/openssl-1.1.1w.tar.gz +tar -xvf openssl-1.1.1w.tar.gz +cd openssl-1.1.1w +./config --prefix=/usr/local/openssl +make +sudo make install +export OPENSSL="/usr/local/openssl/bin" +echo "export OPENSSL=${OPENSSL}" >> ${HOME}/.bashrc + +ln -sf /usr/local/openssl/bin/openssl /usr/local/bin/openssl if ! is_Arm64; then # Most of build systems and scripts look up ssl here - ln -sf $(brew --cellar openssl@3)/3* /usr/local/opt/openssl + ln -sf $(brew --cellar openssl@1.1)/1.1* /usr/local/opt/openssl fi invoke_tests "OpenSSL" diff --git a/images/macos/scripts/tests/OpenSSL.Tests.ps1 b/images/macos/scripts/tests/OpenSSL.Tests.ps1 index 8f5e6956b6b5..bbd23474f5dc 100644 --- a/images/macos/scripts/tests/OpenSSL.Tests.ps1 +++ b/images/macos/scripts/tests/OpenSSL.Tests.ps1 @@ -7,17 +7,10 @@ Describe "OpenSSL" { } } - Context "OpenSSL 3 Path Check" { - It "OpenSSL 3 path exists" { - $openSSLpath = brew --prefix openssl@3 - $openSSLpath | Should -Exist - } - } - - Context "OpenSSL 3 is default" { - It "Default OpenSSL version is 3" { + Context "OpenSSL 1.1 is default" { + It "Default OpenSSL version is 1.1" { $commandResult = Get-CommandResult "openssl version" - $commandResult.Output | Should -Match "OpenSSL 3" + $commandResult.Output | Should -Match "OpenSSL 1.1" } } } From 5a82897b985ad12e9c9fdaec23efed550da6b82b Mon Sep 17 00:00:00 2001 From: sarathrajsrinivasan <sarathrajsrinivasan@github.com> Date: Thu, 7 Nov 2024 19:05:15 -0600 Subject: [PATCH 3230/3485] [macOS] Add openssl 1.1 back --- images/macos/scripts/build/install-openssl.sh | 5 ----- 1 file changed, 5 deletions(-) diff --git a/images/macos/scripts/build/install-openssl.sh b/images/macos/scripts/build/install-openssl.sh index b5a10e0939c5..e2c0a221dd7f 100644 --- a/images/macos/scripts/build/install-openssl.sh +++ b/images/macos/scripts/build/install-openssl.sh @@ -19,9 +19,4 @@ echo "export OPENSSL=${OPENSSL}" >> ${HOME}/.bashrc ln -sf /usr/local/openssl/bin/openssl /usr/local/bin/openssl -if ! is_Arm64; then - # Most of build systems and scripts look up ssl here - ln -sf $(brew --cellar openssl@1.1)/1.1* /usr/local/opt/openssl -fi - invoke_tests "OpenSSL" From 08198442380d4f43da31c30297980945d77772db Mon Sep 17 00:00:00 2001 From: sarathrajsrinivasan <sarathrajsrinivasan@github.com> Date: Thu, 7 Nov 2024 23:12:29 -0600 Subject: [PATCH 3231/3485] [macOS] Add openssl 1.1 back --- images/macos/scripts/build/install-openssl.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/images/macos/scripts/build/install-openssl.sh b/images/macos/scripts/build/install-openssl.sh index e2c0a221dd7f..3733ff3b0787 100644 --- a/images/macos/scripts/build/install-openssl.sh +++ b/images/macos/scripts/build/install-openssl.sh @@ -17,6 +17,11 @@ sudo make install export OPENSSL="/usr/local/openssl/bin" echo "export OPENSSL=${OPENSSL}" >> ${HOME}/.bashrc -ln -sf /usr/local/openssl/bin/openssl /usr/local/bin/openssl +if ! is_Arm64; then + ln -sf ${OPENSSL}/openssl /usr/local/bin/openssl + ln -sf ${OPENSSL}/openssl /usr/local/opt/openssl +else + ln -sf ${OPENSSL}/openssl /opt/homebrew/bin/openssl +fi invoke_tests "OpenSSL" From 07f291cacf87d07fa5a54728f5988e3d9444754b Mon Sep 17 00:00:00 2001 From: susmitamane <susmitamane@github.com> Date: Fri, 8 Nov 2024 17:51:52 +0530 Subject: [PATCH 3232/3485] [MacOS] Add openssl@1.1 back. --- images/macos/scripts/build/install-openssl.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/macos/scripts/build/install-openssl.sh b/images/macos/scripts/build/install-openssl.sh index 3733ff3b0787..b463879de05c 100644 --- a/images/macos/scripts/build/install-openssl.sh +++ b/images/macos/scripts/build/install-openssl.sh @@ -8,8 +8,8 @@ source ~/utils/utils.sh echo "Install openssl@1.1" -wget https://www.openssl.org/source/openssl-1.1.1w.tar.gz -tar -xvf openssl-1.1.1w.tar.gz +openssl_pkg=$(download_with_retry "https://www.openssl.org/source/openssl-1.1.1w.tar.gz") +tar -xvf $openssl_pkg cd openssl-1.1.1w ./config --prefix=/usr/local/openssl make From 06e844f2994d8e225a59e20ff401d072c25b8c15 Mon Sep 17 00:00:00 2001 From: hemanthmanga <166606741+hemanthmanga@users.noreply.github.com> Date: Fri, 8 Nov 2024 21:34:42 +0530 Subject: [PATCH 3233/3485] Adding Node.js latest version 22 (#10922) Co-authored-by: Hemanth Manga <hemanthmanga@Hemanths-MacBook-Pro.local> --- images/windows/toolsets/toolset-2019.json | 3 ++- images/windows/toolsets/toolset-2022.json | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/images/windows/toolsets/toolset-2019.json b/images/windows/toolsets/toolset-2019.json index 553d8a18d855..c562027b839b 100644 --- a/images/windows/toolsets/toolset-2019.json +++ b/images/windows/toolsets/toolset-2019.json @@ -61,7 +61,8 @@ "versions": [ "16.*", "18.*", - "20.*" + "20.*", + "22.*" ] }, { diff --git a/images/windows/toolsets/toolset-2022.json b/images/windows/toolsets/toolset-2022.json index 83febd6d37e2..990ed6033b3e 100644 --- a/images/windows/toolsets/toolset-2022.json +++ b/images/windows/toolsets/toolset-2022.json @@ -60,7 +60,8 @@ "versions": [ "16.*", "18.*", - "20.*" + "20.*", + "22.*" ] }, { From a070c8516f6e857f1eeb7488d3ab021417d8de7d Mon Sep 17 00:00:00 2001 From: RaviAkshintala <167848931+RaviAkshintala@users.noreply.github.com> Date: Fri, 8 Nov 2024 21:35:54 +0530 Subject: [PATCH 3234/3485] [Windows-Go]Updated the latest Go version 1.23 (#10919) Co-authored-by: Ravi Akshintala <raviakshintalagithub.com@Ravis-Laptop.local> --- images/windows/toolsets/toolset-2019.json | 3 ++- images/windows/toolsets/toolset-2022.json | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/images/windows/toolsets/toolset-2019.json b/images/windows/toolsets/toolset-2019.json index c562027b839b..5f5667f772b5 100644 --- a/images/windows/toolsets/toolset-2019.json +++ b/images/windows/toolsets/toolset-2019.json @@ -73,7 +73,8 @@ "versions": [ "1.20.*", "1.21.*", - "1.22.*" + "1.22.*", + "1.23.*" ], "default": "1.21.*" } diff --git a/images/windows/toolsets/toolset-2022.json b/images/windows/toolsets/toolset-2022.json index 990ed6033b3e..70c180556760 100644 --- a/images/windows/toolsets/toolset-2022.json +++ b/images/windows/toolsets/toolset-2022.json @@ -72,7 +72,8 @@ "versions": [ "1.20.*", "1.21.*", - "1.22.*" + "1.22.*", + "1.23.*" ], "default": "1.21.*" } From 6b5924aa06aa6918031245c4bcd6ecfc15a6db34 Mon Sep 17 00:00:00 2001 From: sarathrajsrinivasan <159180023+sarathrajsrinivasan@users.noreply.github.com> Date: Fri, 8 Nov 2024 11:13:31 -0800 Subject: [PATCH 3235/3485] [macOS] Add openssl@1.1 using old homebrew commit (#10935) --- images/macos/scripts/build/install-openssl.sh | 26 +++++++++++-------- images/macos/scripts/tests/OpenSSL.Tests.ps1 | 7 +++++ 2 files changed, 22 insertions(+), 11 deletions(-) diff --git a/images/macos/scripts/build/install-openssl.sh b/images/macos/scripts/build/install-openssl.sh index b463879de05c..7f66940995b3 100644 --- a/images/macos/scripts/build/install-openssl.sh +++ b/images/macos/scripts/build/install-openssl.sh @@ -8,20 +8,24 @@ source ~/utils/utils.sh echo "Install openssl@1.1" -openssl_pkg=$(download_with_retry "https://www.openssl.org/source/openssl-1.1.1w.tar.gz") -tar -xvf $openssl_pkg -cd openssl-1.1.1w -./config --prefix=/usr/local/openssl -make -sudo make install -export OPENSSL="/usr/local/openssl/bin" -echo "export OPENSSL=${OPENSSL}" >> ${HOME}/.bashrc +COMMIT=d91dabd087cb0b906c92a825df9e5e5e1a4f59f8 +FORMULA_URL="https://raw.githubusercontent.com/Homebrew/homebrew-core/$COMMIT/Formula/o/openssl@1.1.rb" +FORMULA_PATH="$(brew --repository)/Library/Taps/homebrew/homebrew-core/Formula/o/openssl@1.1.rb" +mkdir -p "$(dirname $FORMULA_PATH)" +curl -fsSL $FORMULA_URL -o $FORMULA_PATH +HOMEBREW_NO_AUTO_UPDATE=1 HOMEBREW_NO_INSTALL_FROM_API=1 brew install openssl@1.1 if ! is_Arm64; then - ln -sf ${OPENSSL}/openssl /usr/local/bin/openssl - ln -sf ${OPENSSL}/openssl /usr/local/opt/openssl + # Symlink brew openssl@1.1 to `/usr/local/bin` as Homebrew refuses + ln -sf $(brew --prefix openssl@1.1)/bin/openssl /usr/local/bin/openssl else - ln -sf ${OPENSSL}/openssl /opt/homebrew/bin/openssl + # arm64 has a different installation prefix for brew + ln -sf $(brew --prefix openssl@1.1)/bin/openssl /opt/homebrew/bin/openssl +fi + +if ! is_Arm64; then + # Most of build systems and scripts look up ssl here + ln -sf $(brew --cellar openssl@1.1)/1.1* /usr/local/opt/openssl fi invoke_tests "OpenSSL" diff --git a/images/macos/scripts/tests/OpenSSL.Tests.ps1 b/images/macos/scripts/tests/OpenSSL.Tests.ps1 index bbd23474f5dc..1fb8886a8a1a 100644 --- a/images/macos/scripts/tests/OpenSSL.Tests.ps1 +++ b/images/macos/scripts/tests/OpenSSL.Tests.ps1 @@ -7,6 +7,13 @@ Describe "OpenSSL" { } } + Context "OpenSSL 1.1 Path Check" { + It "OpenSSL 1.1 path exists" { + $openSSLpath = brew --prefix openssl@1.1 + $openSSLpath | Should -Exist + } + } + Context "OpenSSL 1.1 is default" { It "Default OpenSSL version is 1.1" { $commandResult = Get-CommandResult "openssl version" From 445bbb0d61fd2ef115e417e9926a7f95e18fd6a8 Mon Sep 17 00:00:00 2001 From: kishorekumar-anchala <168699259+kishorekumar-anchala@users.noreply.github.com> Date: Sun, 10 Nov 2024 19:36:23 +0000 Subject: [PATCH 3236/3485] Edhedriver signature update (#10944) --- images/windows/scripts/build/Install-EdgeDriver.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/windows/scripts/build/Install-EdgeDriver.ps1 b/images/windows/scripts/build/Install-EdgeDriver.ps1 index 6d10d6e5d025..e8f07b7de161 100644 --- a/images/windows/scripts/build/Install-EdgeDriver.ps1 +++ b/images/windows/scripts/build/Install-EdgeDriver.ps1 @@ -27,7 +27,7 @@ Write-Host "Expand Microsoft Edge WebDriver archive..." Expand-7ZipArchive -Path $archivePath -DestinationPath $edgeDriverPath #Validate the EdgeDriver signature -$signatureThumbprint = "0BD8C56733FDCC06F8CB919FF5A200E39B1ACF71" +$signatureThumbprint = "7920AC8FB05E0FFFE21E8FF4B4F03093BA6AC16E" Test-FileSignature -Path "$edgeDriverPath\msedgedriver.exe" -ExpectedThumbprint $signatureThumbprint Write-Host "Setting the environment variables..." From 23478d3106e1ce292473313bc885a6e861caaaa0 Mon Sep 17 00:00:00 2001 From: kishorekumar-anchala <168699259+kishorekumar-anchala@users.noreply.github.com> Date: Mon, 11 Nov 2024 13:59:26 +0000 Subject: [PATCH 3237/3485] Update Az-cli signature thumbprint (#10946) --- images/windows/scripts/build/Install-AzureCli.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/windows/scripts/build/Install-AzureCli.ps1 b/images/windows/scripts/build/Install-AzureCli.ps1 index 35fdc478229a..afe623608dea 100644 --- a/images/windows/scripts/build/Install-AzureCli.ps1 +++ b/images/windows/scripts/build/Install-AzureCli.ps1 @@ -15,7 +15,7 @@ New-Item -ItemType 'Directory' -Path $azureCliExtensionPath | Out-Null Install-Binary -Type MSI ` -Url 'https://aka.ms/installazurecliwindowsx64' ` - -ExpectedSignature 'F9A7CF9FBE13BAC767F4781061332DA6E8B4E0EE' + -ExpectedSignature '245D262748012A4FE6CE8BA6C951A4C4AFBC3E5D' Update-Environment From 126e7250703627d19ded83c5ad5d0628975bf39b Mon Sep 17 00:00:00 2001 From: vidyasagarnimmagaddi <160703874+vidyasagarnimmagaddi@users.noreply.github.com> Date: Wed, 13 Nov 2024 19:35:10 +0530 Subject: [PATCH 3238/3485] [Windows] -VS-Signature update in Windows2019 and 2022 (#10957) --- images/windows/toolsets/toolset-2019.json | 2 +- images/windows/toolsets/toolset-2022.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/images/windows/toolsets/toolset-2019.json b/images/windows/toolsets/toolset-2019.json index 5f5667f772b5..91c478bbe2e0 100644 --- a/images/windows/toolsets/toolset-2019.json +++ b/images/windows/toolsets/toolset-2019.json @@ -250,7 +250,7 @@ "edition" : "Enterprise", "channel": "release", "signature": ["F9A7CF9FBE13BAC767F4781061332DA6E8B4E0EE", - "C2048FB509F1C37A8C3E9EC6648118458AA01780" + "245D262748012A4FE6CE8BA6C951A4C4AFBC3E5D" ], "workloads": [ "Component.Dotfuscator", diff --git a/images/windows/toolsets/toolset-2022.json b/images/windows/toolsets/toolset-2022.json index 70c180556760..47d9fe86a4cf 100644 --- a/images/windows/toolsets/toolset-2022.json +++ b/images/windows/toolsets/toolset-2022.json @@ -179,7 +179,7 @@ "subversion" : "17", "edition" : "Enterprise", "channel": "release", - "signature": "C2048FB509F1C37A8C3E9EC6648118458AA01780", + "signature": "8F985BE8FD256085C90A95D3C74580511A1DB975", "workloads": [ "Component.Dotfuscator", "Component.Linux.CMake", From 5d604b9dc5730ae8f3c17afce5d014add98dcc9c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 13 Nov 2024 14:48:42 +0000 Subject: [PATCH 3239/3485] Updating readme file for ubuntu20 version 20241110.1.1 (#10948) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2004-Readme.md | 55 +++++++++++++++--------------- 1 file changed, 27 insertions(+), 28 deletions(-) diff --git a/images/ubuntu/Ubuntu2004-Readme.md b/images/ubuntu/Ubuntu2004-Readme.md index 3a439d73b825..6222be003e98 100644 --- a/images/ubuntu/Ubuntu2004-Readme.md +++ b/images/ubuntu/Ubuntu2004-Readme.md @@ -1,14 +1,13 @@ | Announcements | |-| +| [[Ubuntu] Breaking Change: runner user will have UID 1001 instead of 1000 for larger runners](https://github.com/actions/runner-images/issues/10936) | | [[Ubuntu 20 and 22] Node.js version 16 will be removed on November 18,2024.](https://github.com/actions/runner-images/issues/10896) | -| [[Ubuntu 24 ] Node.js version 16 will be removed on October 21,2024.](https://github.com/actions/runner-images/issues/10677) | | [Ubuntu-latest workflows will use Ubuntu-24.04 image](https://github.com/actions/runner-images/issues/10636) | -| [[Ubuntu 20 and 22] Go version 1.20.0 will be removed on October 14,2024.](https://github.com/actions/runner-images/issues/10607) | *** # Ubuntu 20.04 - OS Version: 20.04.6 LTS - Kernel Version: 5.15.0-1074-azure -- Image Version: 20241103.1.0 +- Image Version: 20241110.1.0 - Systemd version: 245.4-4ubuntu3.24 ## Installed Software @@ -36,7 +35,7 @@ ### Package Management - cpan 1.64 - Helm 3.16.2 -- Homebrew 4.4.3 +- Homebrew 4.4.4 - Miniconda 24.9.2 - Npm 10.7.0 - NuGet 6.6.1.2 @@ -44,7 +43,7 @@ - Pip3 20.0.2 - Pipx 1.7.1 - RubyGems 3.1.2 -- Vcpkg (build from commit 4f746bc66) +- Vcpkg (build from commit 813a241fb) - Yarn 1.22.22 #### Environment variables @@ -66,18 +65,18 @@ to accomplish this. - Gradle 8.10.2 - Lerna 8.1.9 - Maven 3.8.8 -- Sbt 1.10.4 +- Sbt 1.10.5 ### Tools - Ansible 2.13.13 - apt-fast 1.10.0 -- AzCopy 10.27.0 - available by `azcopy` and `azcopy10` aliases +- AzCopy 10.26.0 - available by `azcopy` and `azcopy10` aliases - Bazel 7.4.0 -- Bazelisk 1.22.1 -- Bicep 0.30.23 +- Bazelisk 1.23.0 +- Bicep 0.31.34 - Buildah 1.22.3 -- CMake 3.30.5 -- CodeQL Action Bundle 2.19.2 +- CMake 3.31.0 +- CodeQL Action Bundle 2.19.3 - Docker Amazon ECR Credential Helper 0.9.0 - Docker Compose v2 2.27.1 - Docker-Buildx 0.18.0 @@ -91,14 +90,14 @@ to accomplish this. - Heroku 9.3.2 - HHVM (HipHop VM) 4.172.1 - jq 1.6 -- Kind 0.24.0 +- Kind 0.25.0 - Kubectl 1.31.2 - Kustomize 5.5.0 - Leiningen 2.11.2 - MediaInfo 19.09 - Mercurial 5.3.1 - Minikube 1.34.0 -- n 10.0.0 +- n 10.1.0 - Newman 6.2.1 - nvm 0.40.1 - OpenSSL 1.1.1f-1ubuntu2.23 @@ -106,8 +105,8 @@ to accomplish this. - Parcel 2.12.0 - PhantomJS 2.1.1 2.1.1 - Podman 3.4.2 -- Pulumi 3.137.0 -- R 4.4.1 +- Pulumi 3.138.0 +- R 4.4.2 - Skopeo 1.5.0 - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 @@ -118,13 +117,13 @@ to accomplish this. ### CLI Tools - Alibaba Cloud CLI 3.0.174 -- AWS CLI 2.19.1 -- AWS CLI Session Manager Plugin 1.2.677.0 +- AWS CLI 2.19.4 +- AWS CLI Session Manager Plugin 1.2.688.0 - AWS SAM CLI 1.127.0 - Azure CLI 2.65.0 - Azure CLI (azure-devops) 1.0.1 -- GitHub CLI 2.60.1 -- Google Cloud CLI 499.0.0 +- GitHub CLI 2.61.0 +- Google Cloud CLI 500.0.0 - Netlify CLI 17.37.2 - OpenShift CLI 4.15.19 - ORAS CLI 1.2.0 @@ -167,13 +166,13 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.7.1 ### Browsers and Drivers -- Google Chrome 130.0.6723.91 -- ChromeDriver 130.0.6723.91 +- Google Chrome 130.0.6723.116 +- ChromeDriver 130.0.6723.116 - Chromium 130.0.6723.0 -- Microsoft Edge 130.0.2849.56 -- Microsoft Edge WebDriver 130.0.2849.68 +- Microsoft Edge 130.0.2849.80 +- Microsoft Edge WebDriver 130.0.2849.78 - Selenium server 4.26.0 -- Mozilla Firefox 132.0 +- Mozilla Firefox 132.0.1 - Geckodriver 0.35.0 #### Environment variables @@ -217,14 +216,14 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Go - 1.21.13 -- 1.22.8 -- 1.23.2 +- 1.22.9 +- 1.23.3 #### Node.js - 16.20.2 - 18.20.4 - 20.18.0 -- 22.10.0 +- 22.11.0 #### Python - 3.7.17 @@ -296,7 +295,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | debian:10 | sha256:58ce6f1271ae1c8a2006ff7d3e54e9874d839f573d8009c20154ad0f2fb0a225 | 2024-06-13 | | debian:11 | sha256:d0036be35fe0a4d2649bf074ca467a37dab8c5b26bbbdfca0375b4dc682f011d | 2024-10-17 | | debian:9 | sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be | 2022-06-23 | -| moby/buildkit:latest | sha256:8e8898b54dbaccc8e0b56e02e5d5b3d6b947a26c24b37899c5c652bba7c60b47 | 2024-10-30 | +| moby/buildkit:latest | sha256:918e92e639651fdfd0bd97f31bab0dd91756edd14e6f73f43a896715617c59a0 | 2024-11-07 | | node:16 | sha256:f77a1aef2da8d83e45ec990f45df50f1a286c5fe8bbfb8c6e4246c6389705c0b | 2023-09-07 | | node:16-alpine | sha256:a1f9d027912b58a7c75be7716c97cfbc6d3099f3a97ed84aa490be9dee20e787 | 2023-08-10 | | node:18 | sha256:ddd173cd94537e155b378342056e0968e8299eb3da9dd5d412d3b7f796ac38c0 | 2024-07-09 | From d43ea5c42a151c970bb2b5550596e94508bc83c9 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 13 Nov 2024 16:18:42 +0000 Subject: [PATCH 3240/3485] Updating readme file for macos-14 version 20241108.322 (#10938) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-14-Readme.md | 249 +++++++++++++------------------- 1 file changed, 104 insertions(+), 145 deletions(-) diff --git a/images/macos/macos-14-Readme.md b/images/macos/macos-14-Readme.md index e805b362bb38..83b1aed0198b 100644 --- a/images/macos/macos-14-Readme.md +++ b/images/macos/macos-14-Readme.md @@ -1,5 +1,6 @@ | Announcements | |-| +| [[ macOS ] Node.js version 16 will be removed from macOS13 and macOS13 arm64 images on November, 18.](https://github.com/actions/runner-images/issues/10873) | | [[macOS] OpenSSL 1.1 will be removed and OpenSSL 3 will be the default for all macOS images from November 4](https://github.com/actions/runner-images/issues/10817) | | [[macOS] Python 3.9 and 3.10 will be removed from macOS13 arm64 and macOS14 arm64 on November 18.](https://github.com/actions/runner-images/issues/10812) | | [[macOS] The macOS 12 Actions runner image will begin deprecation on 10/7/24 and will be fully unsupported by 12/3/24 for GitHub and ADO](https://github.com/actions/runner-images/issues/10721) | @@ -7,42 +8,42 @@ | [macOS 15 (Sequoia) is now available as a public beta in GitHub Actions](https://github.com/actions/runner-images/issues/10686) | *** # macOS 14 -- OS Version: macOS 14.7 (23H124) +- OS Version: macOS 14.7.1 (23H222) - Kernel Version: Darwin 23.6.0 -- Image Version: 20241022.254 +- Image Version: 20241108.322 ## Installed Software ### Language and Runtime - .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.410, 8.0.101, 8.0.204, 8.0.303, 8.0.403 - Bash 3.2.57(1)-release -- Clang/LLVM 14.0.3 +- Clang/LLVM 15.0.0 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` - GCC 12 (Homebrew GCC 12.4.0) - available by `gcc-12` alias - GCC 13 (Homebrew GCC 13.3.0) - available by `gcc-13` alias -- GCC 14 (Homebrew GCC 14.2.0) - available by `gcc-14` alias +- GCC 14 (Homebrew GCC 14.2.0_1) - available by `gcc-14` alias - GNU Fortran 12 (Homebrew GCC 12.4.0) - available by `gfortran-12` alias - GNU Fortran 13 (Homebrew GCC 13.3.0) - available by `gfortran-13` alias -- GNU Fortran 14 (Homebrew GCC 14.2.0) - available by `gfortran-14` alias +- GNU Fortran 14 (Homebrew GCC 14.2.0_1) - available by `gfortran-14` alias - Kotlin 2.0.21-release-482 - Mono 6.12.0.188 - Node.js 20.18.0 - Perl 5.40.0 -- PHP 8.3.12 +- PHP 8.3.13 - Python3 3.13.0 - Ruby 3.0.7p220 ### Package Management -- Bundler 2.5.22 +- Bundler 2.5.23 - Carthage 0.40.0 -- CocoaPods 1.15.2 -- Composer 2.8.1 -- Homebrew 4.4.2 +- CocoaPods 1.16.2 +- Composer 2.8.2 +- Homebrew 4.4.4 - NPM 10.8.2 - NuGet 6.3.1.1 -- Pip3 24.2 (python 3.13) +- Pip3 24.3.1 (python 3.13) - Pipx 1.7.1 -- RubyGems 3.5.22 +- RubyGems 3.5.23 - Yarn 1.22.22 ### Project Management @@ -54,52 +55,53 @@ - 7-Zip 17.05 - aria2 1.37.0 - azcopy 10.26.0 -- bazel 7.3.2 -- bazelisk 1.22.1 +- bazel 7.4.0 +- bazelisk 1.23.0 - bsdtar 3.5.3 - available by 'tar' alias -- Curl 8.10.1 +- Curl 8.11.0 - Git 2.47.0 - Git LFS 3.5.1 -- GitHub CLI 2.59.0 +- GitHub CLI 2.61.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.24.5 -- gpg (GnuPG) 2.4.5 +- gpg (GnuPG) 2.4.6 - jq 1.7.1 - OpenSSL 1.1.1w 11 Sep 2023 - Packer 1.11.2 - pkg-config 0.29.2 +- Unxip 3.1 - yq 4.44.3 - zstd 1.5.6 ### Tools -- AWS CLI 2.18.11 -- AWS SAM CLI 1.126.0 -- AWS Session Manager CLI 1.2.677.0 +- AWS CLI 2.19.3 +- AWS SAM CLI 1.127.0 +- AWS Session Manager CLI 1.2.688.0 - Azure CLI 2.65.0 - Azure CLI (azure-devops) 1.0.1 -- Bicep CLI 0.30.23 -- Cmake 3.30.5 -- CodeQL Action Bundle 2.19.2 +- Bicep CLI 0.31.34 +- Cmake 3.31.0 +- CodeQL Action Bundle 2.19.3 - Fastlane 2.225.0 - SwiftFormat 0.54.6 - Xcbeautify 2.14.1 -- Xcode Command Line Tools 16.0.0.0.1.1724870825 -- Xcodes 1.5.0 +- Xcode Command Line Tools 16.1.0.0.1.1729049160 +- Xcodes 1.6.0 ### Linters - SwiftLint 0.57.0 ### Browsers -- Safari 18.0.1 (19619.1.26.111.11) -- SafariDriver 18.0.1 (19619.1.26.111.11) -- Google Chrome 130.0.6723.59 -- Google Chrome for Testing 130.0.6723.58 -- ChromeDriver 130.0.6723.58 -- Microsoft Edge 130.0.2849.46 -- Microsoft Edge WebDriver 130.0.2849.50 -- Mozilla Firefox 131.0.3 +- Safari 18.1 (19619.2.8.111.5) +- SafariDriver 18.1 (19619.2.8.111.5) +- Google Chrome 130.0.6723.117 +- Google Chrome for Testing 130.0.6723.116 +- ChromeDriver 130.0.6723.116 +- Microsoft Edge 130.0.2849.80 +- Microsoft Edge WebDriver 130.0.2849.81 +- Mozilla Firefox 132.0.1 - geckodriver 0.35.0 -- Selenium server 4.25.0 +- Selenium server 4.26.0 #### Environment variables | Name | Value | @@ -121,8 +123,8 @@ #### Ruby - 3.0.7 - 3.1.6 -- 3.2.5 -- 3.3.5 +- 3.2.6 +- 3.3.6 #### Python - 3.9.20 @@ -134,12 +136,12 @@ #### Node.js - 18.20.4 - 20.18.0 -- 22.10.0 +- 22.11.0 #### Go - 1.21.13 -- 1.22.8 -- 1.23.2 +- 1.22.9 +- 1.23.3 ### Rust Tools - Cargo 1.82.0 @@ -152,7 +154,7 @@ - Rustfmt 1.7.1-stable ### PowerShell Tools -- PowerShell 7.4.5 +- PowerShell 7.4.6 #### PowerShell Modules - Az: 12.4.0 @@ -160,114 +162,71 @@ - PSScriptAnalyzer: 1.23.0 ### Xcode -| Version | Build | Path | Symlinks | -| -------------- | ------- | ---------------------------------------------- | -------------------------------------------------------------- | -| 16.1 | 16B40 | /Applications/Xcode_16.1_Release_Candidate.app | /Applications/Xcode_16.1.0.app<br>/Applications/Xcode_16.1.app | -| 16.0 | 16A242d | /Applications/Xcode_16.app | /Applications/Xcode_16.0.0.app<br>/Applications/Xcode_16.0.app | -| 15.4 (default) | 15F31d | /Applications/Xcode_15.4.app | /Applications/Xcode_15.4.0.app<br>/Applications/Xcode.app | -| 15.3 | 15E204a | /Applications/Xcode_15.3.app | /Applications/Xcode_15.3.0.app | -| 15.2 | 15C500b | /Applications/Xcode_15.2.app | /Applications/Xcode_15.2.0.app | -| 15.1 | 15C65 | /Applications/Xcode_15.1.app | /Applications/Xcode_15.1.0.app | -| 15.0.1 | 15A507 | /Applications/Xcode_15.0.1.app | /Applications/Xcode_15.0.app | -| 14.3.1 | 14E300c | /Applications/Xcode_14.3.1.app | /Applications/Xcode_14.3.app | +| Version | Build | Path | Symlinks | +| -------------- | ------- | ------------------------------ | --------------------------------------------------------- | +| 15.4 (default) | 15F31d | /Applications/Xcode_15.4.app | /Applications/Xcode_15.4.0.app<br>/Applications/Xcode.app | +| 15.3 | 15E204a | /Applications/Xcode_15.3.app | /Applications/Xcode_15.3.0.app | +| 15.2 | 15C500b | /Applications/Xcode_15.2.app | /Applications/Xcode_15.2.0.app | +| 15.1 | 15C65 | /Applications/Xcode_15.1.app | /Applications/Xcode_15.1.0.app | +| 15.0.1 | 15A507 | /Applications/Xcode_15.0.1.app | /Applications/Xcode_15.0.app | #### Installed SDKs -| SDK | SDK Name | Xcode Version | -| ------------------------------------------------------- | --------------------------------------------- | ------------- | -| macOS 13.3 | macosx13.3 | 14.3.1 | -| macOS 14.0 | macosx14.0 | 15.0.1 | -| macOS 14.2 | macosx14.2 | 15.1, 15.2 | -| macOS 14.4 | macosx14.4 | 15.3 | -| macOS 14.5 | macosx14.5 | 15.4 | -| macOS 15.0 | macosx15.0 | 16.0 | -| macOS 15.1 | macosx15.1 | 16.1 | -| iOS 16.4 | iphoneos16.4 | 14.3.1 | -| iOS 17.0 | iphoneos17.0 | 15.0.1 | -| iOS 17.2 | iphoneos17.2 | 15.1, 15.2 | -| iOS 17.4 | iphoneos17.4 | 15.3 | -| iOS 17.5 | iphoneos17.5 | 15.4 | -| iOS 18.0 | iphoneos18.0 | 16.0 | -| iOS 18.1 | iphoneos18.1 | 16.1 | -| Simulator - iOS 16.4 | iphonesimulator16.4 | 14.3.1 | -| Simulator - iOS 17.0 | iphonesimulator17.0 | 15.0.1 | -| Simulator - iOS 17.2 | iphonesimulator17.2 | 15.1, 15.2 | -| Simulator - iOS 17.4 | iphonesimulator17.4 | 15.3 | -| Simulator - iOS 17.5 | iphonesimulator17.5 | 15.4 | -| Simulator - iOS 18.0 | iphonesimulator18.0 | 16.0 | -| Simulator - iOS 18.1 | iphonesimulator18.1 | 16.1 | -| tvOS 16.4 | appletvos16.4 | 14.3.1 | -| tvOS 17.0 | appletvos17.0 | 15.0.1 | -| tvOS 17.2 | appletvos17.2 | 15.1, 15.2 | -| tvOS 17.4 | appletvos17.4 | 15.3 | -| tvOS 17.5 | appletvos17.5 | 15.4 | -| tvOS 18.0 | appletvos18.0 | 16.0 | -| tvOS 18.1 | appletvos18.1 | 16.1 | -| Simulator - tvOS 16.4 | appletvsimulator16.4 | 14.3.1 | -| Simulator - tvOS 17.0 | appletvsimulator17.0 | 15.0.1 | -| Simulator - tvOS 17.2 | appletvsimulator17.2 | 15.1, 15.2 | -| Simulator - tvOS 17.4 | appletvsimulator17.4 | 15.3 | -| Simulator - tvOS 17.5 | appletvsimulator17.5 | 15.4 | -| Simulator - tvOS 18.0 | appletvsimulator18.0 | 16.0 | -| Simulator - tvOS 18.1 | appletvsimulator18.1 | 16.1 | -| watchOS 9.4 | watchos9.4 | 14.3.1 | -| watchOS 10.0 | watchos10.0 | 15.0.1 | -| watchOS 10.2 | watchos10.2 | 15.1, 15.2 | -| watchOS 10.4 | watchos10.4 | 15.3 | -| watchOS 10.5 | watchos10.5 | 15.4 | -| watchOS 11.0 | watchos11.0 | 16.0 | -| watchOS 11.1 | watchos11.1 | 16.1 | -| Simulator - watchOS 9.4 | watchsimulator9.4 | 14.3.1 | -| Simulator - watchOS 10.0 | watchsimulator10.0 | 15.0.1 | -| Simulator - watchOS 10.2 | watchsimulator10.2 | 15.1, 15.2 | -| Simulator - watchOS 10.4 | watchsimulator10.4 | 15.3 | -| Simulator - watchOS 10.5 | watchsimulator10.5 | 15.4 | -| Simulator - watchOS 11.0 | watchsimulator11.0 | 16.0 | -| Simulator - watchOS 11.1 | watchsimulator11.1 | 16.1 | -| Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | -| visionOS 1.0 | xros1.0 | 15.2 | -| Simulator - visionOS 1.1 | xrsimulator1.1 | 15.3 | -| visionOS 1.1 | xros1.1 | 15.3 | -| visionOS 1.2 | xros1.2 | 15.4 | -| Simulator - visionOS 1.2 | xrsimulator1.2 | 15.4 | -| Simulator - visionOS 2.0 | xrsimulator2.0 | 16.0 | -| visionOS 2.0 | xros2.0 | 16.0 | -| visionOS 2.1 | xros2.1 | 16.1 | -| Simulator - visionOS 2.1 | xrsimulator2.1 | 16.1 | -| Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | -| Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | -| Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | -| DriverKit 22.4 | driverkit22.4 | 14.3.1 | -| DriverKit 23.0 | driverkit23.0 | 15.0.1 | -| DriverKit 23.2 | driverkit23.2 | 15.1, 15.2 | -| DriverKit 23.4 | driverkit23.4 | 15.3 | -| DriverKit 23.5 | driverkit23.5 | 15.4 | -| DriverKit 24.0 | driverkit24.0 | 16.0 | -| DriverKit 24.1 | driverkit24.1 | 16.1 | +| SDK | SDK Name | Xcode Version | +| ------------------------ | -------------------- | ------------- | +| macOS 14.0 | macosx14.0 | 15.0.1 | +| macOS 14.2 | macosx14.2 | 15.1, 15.2 | +| macOS 14.4 | macosx14.4 | 15.3 | +| macOS 14.5 | macosx14.5 | 15.4 | +| iOS 17.0 | iphoneos17.0 | 15.0.1 | +| iOS 17.2 | iphoneos17.2 | 15.1, 15.2 | +| iOS 17.4 | iphoneos17.4 | 15.3 | +| iOS 17.5 | iphoneos17.5 | 15.4 | +| Simulator - iOS 17.0 | iphonesimulator17.0 | 15.0.1 | +| Simulator - iOS 17.2 | iphonesimulator17.2 | 15.1, 15.2 | +| Simulator - iOS 17.4 | iphonesimulator17.4 | 15.3 | +| Simulator - iOS 17.5 | iphonesimulator17.5 | 15.4 | +| tvOS 17.0 | appletvos17.0 | 15.0.1 | +| tvOS 17.2 | appletvos17.2 | 15.1, 15.2 | +| tvOS 17.4 | appletvos17.4 | 15.3 | +| tvOS 17.5 | appletvos17.5 | 15.4 | +| Simulator - tvOS 17.0 | appletvsimulator17.0 | 15.0.1 | +| Simulator - tvOS 17.2 | appletvsimulator17.2 | 15.1, 15.2 | +| Simulator - tvOS 17.4 | appletvsimulator17.4 | 15.3 | +| Simulator - tvOS 17.5 | appletvsimulator17.5 | 15.4 | +| watchOS 10.0 | watchos10.0 | 15.0.1 | +| watchOS 10.2 | watchos10.2 | 15.1, 15.2 | +| watchOS 10.4 | watchos10.4 | 15.3 | +| watchOS 10.5 | watchos10.5 | 15.4 | +| Simulator - watchOS 10.0 | watchsimulator10.0 | 15.0.1 | +| Simulator - watchOS 10.2 | watchsimulator10.2 | 15.1, 15.2 | +| Simulator - watchOS 10.4 | watchsimulator10.4 | 15.3 | +| Simulator - watchOS 10.5 | watchsimulator10.5 | 15.4 | +| Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | +| visionOS 1.0 | xros1.0 | 15.2 | +| Simulator - visionOS 1.1 | xrsimulator1.1 | 15.3 | +| visionOS 1.1 | xros1.1 | 15.3 | +| Simulator - visionOS 1.2 | xrsimulator1.2 | 15.4 | +| visionOS 1.2 | xros1.2 | 15.4 | +| DriverKit 23.0 | driverkit23.0 | 15.0.1 | +| DriverKit 23.2 | driverkit23.2 | 15.1, 15.2 | +| DriverKit 23.4 | driverkit23.4 | 15.3 | +| DriverKit 23.5 | driverkit23.5 | 15.4 | #### Installed Simulators -| OS | Simulators | -| ------------ | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| iOS 16.4 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 17.0 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 17.2 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 17.4 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | -| iOS 17.5 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | -| iOS 18.0 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone 16<br>iPhone 16 Plus<br>iPhone 16 Pro<br>iPhone 16 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | -| iOS 18.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone 16<br>iPhone 16 Plus<br>iPhone 16 Pro<br>iPhone 16 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad mini (A17 Pro)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | -| tvOS 16.4 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 17.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 17.2 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 17.4 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 17.5 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 18.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 18.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| watchOS 9.4 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | -| watchOS 10.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | -| watchOS 10.2 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | -| watchOS 10.4 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | -| watchOS 10.5 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | -| watchOS 11.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 10 (42mm)<br>Apple Watch Series 10 (46mm)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | -| watchOS 11.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 10 (42mm)<br>Apple Watch Series 10 (46mm)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | +| OS | Simulators | +| ------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | +| iOS 17.0 | iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 17.2 | iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 17.4 | iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | +| iOS 17.5 | iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | +| tvOS 17.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 17.2 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 17.4 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 17.5 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| watchOS 10.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 10.2 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 10.4 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 10.5 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra 2 (49mm) | ### Android | Package Name | Version | @@ -299,7 +258,7 @@ #### Environment variables | Name | Value | | ----------------- | ----------------------------------------------------------------------------------------- | -| PARALLELS_DMG_URL | https://download.parallels.com/desktop/v20/20.1.0-55732/ParallelsDesktop-20.1.0-55732.dmg | +| PARALLELS_DMG_URL | https://download.parallels.com/desktop/v20/20.1.1-55740/ParallelsDesktop-20.1.1-55740.dmg | ##### Notes ``` From ccbc0f9b26d1a43c098c96e0a597be22714a69c2 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 13 Nov 2024 17:29:06 +0000 Subject: [PATCH 3241/3485] Updating readme file for macos-13-arm64 version 20241108.368 (#10937) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-13-arm64-Readme.md | 68 ++++++++++++++------------- 1 file changed, 35 insertions(+), 33 deletions(-) diff --git a/images/macos/macos-13-arm64-Readme.md b/images/macos/macos-13-arm64-Readme.md index 2089d5ee3b04..c51a58176d11 100644 --- a/images/macos/macos-13-arm64-Readme.md +++ b/images/macos/macos-13-arm64-Readme.md @@ -1,15 +1,16 @@ | Announcements | |-| +| [[ macOS ] Node.js version 16 will be removed from macOS13 and macOS13 arm64 images on November, 18.](https://github.com/actions/runner-images/issues/10873) | | [[macOS] OpenSSL 1.1 will be removed and OpenSSL 3 will be the default for all macOS images from November 4](https://github.com/actions/runner-images/issues/10817) | | [[macOS] Python 3.9 and 3.10 will be removed from macOS13 arm64 and macOS14 arm64 on November 18.](https://github.com/actions/runner-images/issues/10812) | | [[macOS] The macOS 12 Actions runner image will begin deprecation on 10/7/24 and will be fully unsupported by 12/3/24 for GitHub and ADO](https://github.com/actions/runner-images/issues/10721) | -| [[macOS] Support policy changes; Xcode 14 and 16 will be removed from macOS 14 on October 28](https://github.com/actions/runner-images/issues/10703) | +| [[macOS] Support policy changes; Xcode 14 and 16 will be removed from macOS 14 on November 4](https://github.com/actions/runner-images/issues/10703) | | [macOS 15 (Sequoia) is now available as a public beta in GitHub Actions](https://github.com/actions/runner-images/issues/10686) | *** # macOS 13 -- OS Version: macOS 13.7 (22H123) +- OS Version: macOS 13.7.1 (22H221) - Kernel Version: Darwin 22.6.0 -- Image Version: 20241021.263 +- Image Version: 20241108.368 ## Installed Software @@ -20,27 +21,27 @@ - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` - GCC 12 (Homebrew GCC 12.4.0) - available by `gcc-12` alias - GCC 13 (Homebrew GCC 13.3.0) - available by `gcc-13` alias -- GCC 14 (Homebrew GCC 14.2.0) - available by `gcc-14` alias +- GCC 14 (Homebrew GCC 14.2.0_1) - available by `gcc-14` alias - GNU Fortran 12 (Homebrew GCC 12.4.0) - available by `gfortran-12` alias - GNU Fortran 13 (Homebrew GCC 13.3.0) - available by `gfortran-13` alias -- GNU Fortran 14 (Homebrew GCC 14.2.0) - available by `gfortran-14` alias +- GNU Fortran 14 (Homebrew GCC 14.2.0_1) - available by `gfortran-14` alias - Kotlin 2.0.21-release-482 - Mono 6.12.0.188 - Node.js 20.18.0 -- Perl 5.38.2 +- Perl 5.40.0 - Python3 3.13.0 - Ruby 3.0.7p220 ### Package Management -- Bundler 2.5.22 +- Bundler 2.5.23 - Carthage 0.40.0 -- CocoaPods 1.15.2 -- Homebrew 4.4.2 +- CocoaPods 1.16.2 +- Homebrew 4.4.4 - NPM 10.8.2 - NuGet 6.3.1.1 - Pip3 24.2 (python 3.13) - Pipx 1.7.1 -- RubyGems 3.5.22 +- RubyGems 3.5.23 - Yarn 1.22.22 ### Project Management @@ -52,47 +53,48 @@ - 7-Zip 17.05 - aria2 1.37.0 - azcopy 10.26.0 -- bazel 7.3.2 -- bazelisk 1.22.0 +- bazel 7.4.0 +- bazelisk 1.23.0 - bsdtar 3.5.3 - available by 'tar' alias - Curl 8.7.1 - Git 2.47.0 - Git LFS 3.5.1 -- GitHub CLI 2.59.0 +- GitHub CLI 2.61.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.24.5 -- gpg (GnuPG) 2.4.5 +- gpg (GnuPG) 2.4.6 - jq 1.7.1 - OpenSSL 1.1.1w 11 Sep 2023 - Packer 1.11.2 - pkg-config 0.29.2 +- Unxip 3.1 - yq 4.44.3 - zstd 1.5.6 ### Tools -- AWS CLI 2.18.11 -- AWS SAM CLI 1.126.0 -- AWS Session Manager CLI 1.2.677.0 +- AWS CLI 2.19.3 +- AWS SAM CLI 1.127.0 +- AWS Session Manager CLI 1.2.688.0 - Azure CLI 2.65.0 - Azure CLI (azure-devops) 1.0.1 -- Bicep CLI 0.30.23 -- Cmake 3.30.5 -- CodeQL Action Bundle 2.19.1 +- Bicep CLI 0.31.34 +- Cmake 3.31.0 +- CodeQL Action Bundle 2.19.3 - Fastlane 2.225.0 - SwiftFormat 0.54.6 -- Xcbeautify 2.14.0 +- Xcbeautify 2.14.1 - Xcode Command Line Tools 14.3.1.0.1.1683849156 -- Xcodes 1.5.0 +- Xcodes 1.6.0 ### Linters ### Browsers -- Safari 18.0.1 (18619.1.26.111.11) -- SafariDriver 18.0.1 (18619.1.26.111.11) -- Google Chrome 130.0.6723.59 -- Google Chrome for Testing 130.0.6723.58 -- ChromeDriver 130.0.6723.58 -- Selenium server 4.25.0 +- Safari 18.1 (18619.2.8.111.5) +- SafariDriver 18.1 (18619.2.8.111.5) +- Google Chrome 130.0.6723.117 +- Google Chrome for Testing 130.0.6723.116 +- ChromeDriver 130.0.6723.116 +- Selenium server 4.26.0 #### Environment variables | Name | Value | @@ -104,7 +106,7 @@ ### Java | Version | Environment Variable | | -------------------- | -------------------- | -| 11.0.24+8 | JAVA_HOME_11_arm64 | +| 11.0.25+9 | JAVA_HOME_11_arm64 | | 17.0.13+11 (default) | JAVA_HOME_17_arm64 | | 21.0.5+11.0 | JAVA_HOME_21_arm64 | @@ -121,12 +123,12 @@ - 16.20.1 - 18.20.4 - 20.18.0 -- 22.10.0 +- 22.11.0 #### Go - 1.21.13 -- 1.22.8 -- 1.23.2 +- 1.22.9 +- 1.23.3 ### Rust Tools - Cargo 1.82.0 @@ -139,7 +141,7 @@ - Rustfmt 1.7.1-stable ### PowerShell Tools -- PowerShell 7.4.5 +- PowerShell 7.4.6 #### PowerShell Modules - Az: 12.4.0 From e96b8f37d55687c3f4c6132d2398f10f545953a2 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 13 Nov 2024 17:43:32 +0000 Subject: [PATCH 3242/3485] Updating readme file for macos-14-arm64 version 20241108.442 (#10940) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-14-arm64-Readme.md | 234 +++++++++++--------------- 1 file changed, 98 insertions(+), 136 deletions(-) diff --git a/images/macos/macos-14-arm64-Readme.md b/images/macos/macos-14-arm64-Readme.md index 923873c50b85..b0b48dcc0424 100644 --- a/images/macos/macos-14-arm64-Readme.md +++ b/images/macos/macos-14-arm64-Readme.md @@ -1,5 +1,6 @@ | Announcements | |-| +| [[ macOS ] Node.js version 16 will be removed from macOS13 and macOS13 arm64 images on November, 18.](https://github.com/actions/runner-images/issues/10873) | | [[macOS] OpenSSL 1.1 will be removed and OpenSSL 3 will be the default for all macOS images from November 4](https://github.com/actions/runner-images/issues/10817) | | [[macOS] Python 3.9 and 3.10 will be removed from macOS13 arm64 and macOS14 arm64 on November 18.](https://github.com/actions/runner-images/issues/10812) | | [[macOS] The macOS 12 Actions runner image will begin deprecation on 10/7/24 and will be fully unsupported by 12/3/24 for GitHub and ADO](https://github.com/actions/runner-images/issues/10721) | @@ -7,23 +8,23 @@ | [macOS 15 (Sequoia) is now available as a public beta in GitHub Actions](https://github.com/actions/runner-images/issues/10686) | *** # macOS 14 -- OS Version: macOS 14.7 (23H124) +- OS Version: macOS 14.7.1 (23H222) - Kernel Version: Darwin 23.6.0 -- Image Version: 20241022.361 +- Image Version: 20241108.442 ## Installed Software ### Language and Runtime - .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.410, 8.0.101, 8.0.204, 8.0.303, 8.0.403 - Bash 3.2.57(1)-release -- Clang/LLVM 14.0.3 +- Clang/LLVM 15.0.0 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` - GCC 12 (Homebrew GCC 12.4.0) - available by `gcc-12` alias - GCC 13 (Homebrew GCC 13.3.0) - available by `gcc-13` alias -- GCC 14 (Homebrew GCC 14.2.0) - available by `gcc-14` alias +- GCC 14 (Homebrew GCC 14.2.0_1) - available by `gcc-14` alias - GNU Fortran 12 (Homebrew GCC 12.4.0) - available by `gfortran-12` alias - GNU Fortran 13 (Homebrew GCC 13.3.0) - available by `gfortran-13` alias -- GNU Fortran 14 (Homebrew GCC 14.2.0) - available by `gfortran-14` alias +- GNU Fortran 14 (Homebrew GCC 14.2.0_1) - available by `gfortran-14` alias - Kotlin 2.0.21-release-482 - Mono 6.12.0.188 - Node.js 20.18.0 @@ -32,15 +33,15 @@ - Ruby 3.0.7p220 ### Package Management -- Bundler 2.5.22 +- Bundler 2.5.23 - Carthage 0.40.0 -- CocoaPods 1.15.2 -- Homebrew 4.4.2 +- CocoaPods 1.16.2 +- Homebrew 4.4.4 - NPM 10.8.2 - NuGet 6.3.1.1 - Pip3 24.2 (python 3.13) - Pipx 1.7.1 -- RubyGems 3.5.22 +- RubyGems 3.5.23 - Yarn 1.22.22 ### Project Management @@ -52,47 +53,48 @@ - 7-Zip 17.05 - aria2 1.37.0 - azcopy 10.26.0 -- bazel 7.3.2 -- bazelisk 1.22.1 +- bazel 7.4.0 +- bazelisk 1.23.0 - bsdtar 3.5.3 - available by 'tar' alias - Curl 8.7.1 - Git 2.47.0 - Git LFS 3.5.1 -- GitHub CLI 2.59.0 +- GitHub CLI 2.61.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.24.5 -- gpg (GnuPG) 2.4.5 +- gpg (GnuPG) 2.4.6 - jq 1.7.1 - OpenSSL 1.1.1w 11 Sep 2023 - Packer 1.11.2 - pkg-config 0.29.2 +- Unxip 3.1 - yq 4.44.3 - zstd 1.5.6 ### Tools -- AWS CLI 2.18.11 -- AWS SAM CLI 1.126.0 -- AWS Session Manager CLI 1.2.677.0 +- AWS CLI 2.19.4 +- AWS SAM CLI 1.127.0 +- AWS Session Manager CLI 1.2.688.0 - Azure CLI 2.65.0 - Azure CLI (azure-devops) 1.0.1 -- Bicep CLI 0.30.23 -- Cmake 3.30.5 -- CodeQL Action Bundle 2.19.1 +- Bicep CLI 0.31.34 +- Cmake 3.31.0 +- CodeQL Action Bundle 2.19.3 - Fastlane 2.225.0 - SwiftFormat 0.54.6 - Xcbeautify 2.14.1 -- Xcode Command Line Tools 16.0.0.0.1.1724870825 -- Xcodes 1.5.0 +- Xcode Command Line Tools 16.1.0.0.1.1729049160 +- Xcodes 1.6.0 ### Linters ### Browsers -- Safari 18.0.1 (19619.1.26.111.11) -- SafariDriver 18.0.1 (19619.1.26.111.11) -- Google Chrome 130.0.6723.59 -- Google Chrome for Testing 130.0.6723.58 -- ChromeDriver 130.0.6723.58 -- Selenium server 4.25.0 +- Safari 18.1 (19619.2.8.111.5) +- SafariDriver 18.1 (19619.2.8.111.5) +- Google Chrome 130.0.6723.117 +- Google Chrome for Testing 130.0.6723.116 +- ChromeDriver 130.0.6723.116 +- Selenium server 4.26.0 #### Environment variables | Name | Value | @@ -104,7 +106,7 @@ ### Java | Version | Environment Variable | | --------------------- | -------------------- | -| 11.0.24+8 | JAVA_HOME_11_arm64 | +| 11.0.25+9 | JAVA_HOME_11_arm64 | | 17.0.13+11 | JAVA_HOME_17_arm64 | | 21.0.5+11.0 (default) | JAVA_HOME_21_arm64 | @@ -120,12 +122,12 @@ #### Node.js - 18.20.4 - 20.18.0 -- 22.10.0 +- 22.11.0 #### Go - 1.21.13 -- 1.22.8 -- 1.23.2 +- 1.22.9 +- 1.23.3 ### Rust Tools - Cargo 1.82.0 @@ -138,7 +140,7 @@ - Rustfmt 1.7.1-stable ### PowerShell Tools -- PowerShell 7.4.5 +- PowerShell 7.4.6 #### PowerShell Modules - Az: 12.4.0 @@ -146,114 +148,74 @@ - PSScriptAnalyzer: 1.23.0 ### Xcode -| Version | Build | Path | Symlinks | -| -------------- | ------- | ---------------------------------------------- | -------------------------------------------------------------- | -| 16.1 | 16B40 | /Applications/Xcode_16.1_Release_Candidate.app | /Applications/Xcode_16.1.0.app<br>/Applications/Xcode_16.1.app | -| 16.0 | 16A242d | /Applications/Xcode_16.app | /Applications/Xcode_16.0.0.app<br>/Applications/Xcode_16.0.app | -| 15.4 (default) | 15F31d | /Applications/Xcode_15.4.app | /Applications/Xcode_15.4.0.app<br>/Applications/Xcode.app | -| 15.3 | 15E204a | /Applications/Xcode_15.3.app | /Applications/Xcode_15.3.0.app | -| 15.2 | 15C500b | /Applications/Xcode_15.2.app | /Applications/Xcode_15.2.0.app | -| 15.1 | 15C65 | /Applications/Xcode_15.1.app | /Applications/Xcode_15.1.0.app | -| 15.0.1 | 15A507 | /Applications/Xcode_15.0.1.app | /Applications/Xcode_15.0.app | -| 14.3.1 | 14E300c | /Applications/Xcode_14.3.1.app | /Applications/Xcode_14.3.app | +| Version | Build | Path | Symlinks | +| -------------- | ------- | ------------------------------ | --------------------------------------------------------- | +| 15.4 (default) | 15F31d | /Applications/Xcode_15.4.app | /Applications/Xcode_15.4.0.app<br>/Applications/Xcode.app | +| 15.3 | 15E204a | /Applications/Xcode_15.3.app | /Applications/Xcode_15.3.0.app | +| 15.2 | 15C500b | /Applications/Xcode_15.2.app | /Applications/Xcode_15.2.0.app | +| 15.1 | 15C65 | /Applications/Xcode_15.1.app | /Applications/Xcode_15.1.0.app | +| 15.0.1 | 15A507 | /Applications/Xcode_15.0.1.app | /Applications/Xcode_15.0.app | #### Installed SDKs -| SDK | SDK Name | Xcode Version | -| ------------------------------------------------------- | --------------------------------------------- | ------------- | -| macOS 13.3 | macosx13.3 | 14.3.1 | -| macOS 14.0 | macosx14.0 | 15.0.1 | -| macOS 14.2 | macosx14.2 | 15.1, 15.2 | -| macOS 14.4 | macosx14.4 | 15.3 | -| macOS 14.5 | macosx14.5 | 15.4 | -| macOS 15.0 | macosx15.0 | 16.0 | -| macOS 15.1 | macosx15.1 | 16.1 | -| iOS 16.4 | iphoneos16.4 | 14.3.1 | -| iOS 17.0 | iphoneos17.0 | 15.0.1 | -| iOS 17.2 | iphoneos17.2 | 15.1, 15.2 | -| iOS 17.4 | iphoneos17.4 | 15.3 | -| iOS 17.5 | iphoneos17.5 | 15.4 | -| iOS 18.0 | iphoneos18.0 | 16.0 | -| iOS 18.1 | iphoneos18.1 | 16.1 | -| Simulator - iOS 16.4 | iphonesimulator16.4 | 14.3.1 | -| Simulator - iOS 17.0 | iphonesimulator17.0 | 15.0.1 | -| Simulator - iOS 17.2 | iphonesimulator17.2 | 15.1, 15.2 | -| Simulator - iOS 17.4 | iphonesimulator17.4 | 15.3 | -| Simulator - iOS 17.5 | iphonesimulator17.5 | 15.4 | -| Simulator - iOS 18.0 | iphonesimulator18.0 | 16.0 | -| Simulator - iOS 18.1 | iphonesimulator18.1 | 16.1 | -| tvOS 16.4 | appletvos16.4 | 14.3.1 | -| tvOS 17.0 | appletvos17.0 | 15.0.1 | -| tvOS 17.2 | appletvos17.2 | 15.1, 15.2 | -| tvOS 17.4 | appletvos17.4 | 15.3 | -| tvOS 17.5 | appletvos17.5 | 15.4 | -| tvOS 18.0 | appletvos18.0 | 16.0 | -| tvOS 18.1 | appletvos18.1 | 16.1 | -| Simulator - tvOS 16.4 | appletvsimulator16.4 | 14.3.1 | -| Simulator - tvOS 17.0 | appletvsimulator17.0 | 15.0.1 | -| Simulator - tvOS 17.2 | appletvsimulator17.2 | 15.1, 15.2 | -| Simulator - tvOS 17.4 | appletvsimulator17.4 | 15.3 | -| Simulator - tvOS 17.5 | appletvsimulator17.5 | 15.4 | -| Simulator - tvOS 18.0 | appletvsimulator18.0 | 16.0 | -| Simulator - tvOS 18.1 | appletvsimulator18.1 | 16.1 | -| watchOS 9.4 | watchos9.4 | 14.3.1 | -| watchOS 10.0 | watchos10.0 | 15.0.1 | -| watchOS 10.2 | watchos10.2 | 15.1, 15.2 | -| watchOS 10.4 | watchos10.4 | 15.3 | -| watchOS 10.5 | watchos10.5 | 15.4 | -| watchOS 11.0 | watchos11.0 | 16.0 | -| watchOS 11.1 | watchos11.1 | 16.1 | -| Simulator - watchOS 9.4 | watchsimulator9.4 | 14.3.1 | -| Simulator - watchOS 10.0 | watchsimulator10.0 | 15.0.1 | -| Simulator - watchOS 10.2 | watchsimulator10.2 | 15.1, 15.2 | -| Simulator - watchOS 10.4 | watchsimulator10.4 | 15.3 | -| Simulator - watchOS 10.5 | watchsimulator10.5 | 15.4 | -| Simulator - watchOS 11.0 | watchsimulator11.0 | 16.0 | -| Simulator - watchOS 11.1 | watchsimulator11.1 | 16.1 | -| Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | -| visionOS 1.0 | xros1.0 | 15.2 | -| Simulator - visionOS 1.1 | xrsimulator1.1 | 15.3 | -| visionOS 1.1 | xros1.1 | 15.3 | -| Simulator - visionOS 1.2 | xrsimulator1.2 | 15.4 | -| visionOS 1.2 | xros1.2 | 15.4 | -| visionOS 2.0 | xros2.0 | 16.0 | -| Simulator - visionOS 2.0 | xrsimulator2.0 | 16.0 | -| visionOS 2.1 | xros2.1 | 16.1 | -| Simulator - visionOS 2.1 | xrsimulator2.1 | 16.1 | -| Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | -| Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | -| Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | -| DriverKit 22.4 | driverkit22.4 | 14.3.1 | -| DriverKit 23.0 | driverkit23.0 | 15.0.1 | -| DriverKit 23.2 | driverkit23.2 | 15.1, 15.2 | -| DriverKit 23.4 | driverkit23.4 | 15.3 | -| DriverKit 23.5 | driverkit23.5 | 15.4 | -| DriverKit 24.0 | driverkit24.0 | 16.0 | -| DriverKit 24.1 | driverkit24.1 | 16.1 | +| SDK | SDK Name | Xcode Version | +| ------------------------ | -------------------- | ------------- | +| macOS 14.0 | macosx14.0 | 15.0.1 | +| macOS 14.2 | macosx14.2 | 15.1, 15.2 | +| macOS 14.4 | macosx14.4 | 15.3 | +| macOS 14.5 | macosx14.5 | 15.4 | +| iOS 17.0 | iphoneos17.0 | 15.0.1 | +| iOS 17.2 | iphoneos17.2 | 15.1, 15.2 | +| iOS 17.4 | iphoneos17.4 | 15.3 | +| iOS 17.5 | iphoneos17.5 | 15.4 | +| Simulator - iOS 17.0 | iphonesimulator17.0 | 15.0.1 | +| Simulator - iOS 17.2 | iphonesimulator17.2 | 15.1, 15.2 | +| Simulator - iOS 17.4 | iphonesimulator17.4 | 15.3 | +| Simulator - iOS 17.5 | iphonesimulator17.5 | 15.4 | +| tvOS 17.0 | appletvos17.0 | 15.0.1 | +| tvOS 17.2 | appletvos17.2 | 15.1, 15.2 | +| tvOS 17.4 | appletvos17.4 | 15.3 | +| tvOS 17.5 | appletvos17.5 | 15.4 | +| Simulator - tvOS 17.0 | appletvsimulator17.0 | 15.0.1 | +| Simulator - tvOS 17.2 | appletvsimulator17.2 | 15.1, 15.2 | +| Simulator - tvOS 17.4 | appletvsimulator17.4 | 15.3 | +| Simulator - tvOS 17.5 | appletvsimulator17.5 | 15.4 | +| watchOS 10.0 | watchos10.0 | 15.0.1 | +| watchOS 10.2 | watchos10.2 | 15.1, 15.2 | +| watchOS 10.4 | watchos10.4 | 15.3 | +| watchOS 10.5 | watchos10.5 | 15.4 | +| Simulator - watchOS 10.0 | watchsimulator10.0 | 15.0.1 | +| Simulator - watchOS 10.2 | watchsimulator10.2 | 15.1, 15.2 | +| Simulator - watchOS 10.4 | watchsimulator10.4 | 15.3 | +| Simulator - watchOS 10.5 | watchsimulator10.5 | 15.4 | +| Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | +| visionOS 1.0 | xros1.0 | 15.2 | +| visionOS 1.1 | xros1.1 | 15.3 | +| Simulator - visionOS 1.1 | xrsimulator1.1 | 15.3 | +| visionOS 1.2 | xros1.2 | 15.4 | +| Simulator - visionOS 1.2 | xrsimulator1.2 | 15.4 | +| DriverKit 23.0 | driverkit23.0 | 15.0.1 | +| DriverKit 23.2 | driverkit23.2 | 15.1, 15.2 | +| DriverKit 23.4 | driverkit23.4 | 15.3 | +| DriverKit 23.5 | driverkit23.5 | 15.4 | #### Installed Simulators -| OS | Simulators | -| ------------ | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| iOS 16.4 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 17.0 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 17.2 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 17.4 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | -| iOS 17.5 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | -| iOS 18.0 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone 16<br>iPhone 16 Plus<br>iPhone 16 Pro<br>iPhone 16 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | -| iOS 18.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone 16<br>iPhone 16 Plus<br>iPhone 16 Pro<br>iPhone 16 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad mini (A17 Pro)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | -| tvOS 16.4 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 17.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 17.2 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 17.4 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 17.5 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 18.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 18.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| watchOS 9.4 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | -| watchOS 10.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | -| watchOS 10.2 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | -| watchOS 10.4 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | -| watchOS 10.5 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | -| watchOS 11.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 10 (42mm)<br>Apple Watch Series 10 (46mm)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | -| watchOS 11.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 10 (42mm)<br>Apple Watch Series 10 (46mm)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | +| OS | Simulators | +| ------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | +| iOS 17.0 | iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 17.2 | iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 17.4 | iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | +| iOS 17.5 | iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | +| tvOS 17.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 17.2 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 17.4 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 17.5 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| watchOS 10.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 10.2 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 10.4 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 10.5 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra 2 (49mm) | +| visionOS 1.0 | Apple Vision Pro | +| visionOS 1.1 | Apple Vision Pro | +| visionOS 1.2 | Apple Vision Pro | ### Android | Package Name | Version | From 918263378c472623f0e156cd610c5f2c22b00312 Mon Sep 17 00:00:00 2001 From: kishorekumar-anchala <168699259+kishorekumar-anchala@users.noreply.github.com> Date: Wed, 13 Nov 2024 20:09:50 +0000 Subject: [PATCH 3243/3485] [Windows] Update WDK,SDK to latest version on windows 22 image and AzCli signature. (#10945) * Update WDK and SDK to latest version * update comment on bisual studio script * Fix Azcli signature mismatch * Removed VS Components --- .../windows/scripts/build/Install-VisualStudio.ps1 | 5 +++++ images/windows/scripts/build/Install-WDK.ps1 | 12 ++++++------ images/windows/scripts/tests/VisualStudio.Tests.ps1 | 6 ++++++ images/windows/toolsets/toolset-2022.json | 4 +++- 4 files changed, 20 insertions(+), 7 deletions(-) diff --git a/images/windows/scripts/build/Install-VisualStudio.ps1 b/images/windows/scripts/build/Install-VisualStudio.ps1 index 73b97ddf7172..559b6c705034 100644 --- a/images/windows/scripts/build/Install-VisualStudio.ps1 +++ b/images/windows/scripts/build/Install-VisualStudio.ps1 @@ -48,6 +48,11 @@ if (Test-IsWin22) { -Url 'https://go.microsoft.com/fwlink/p/?LinkID=2033908' ` -InstallArgs @("/q", "/norestart", "/ceip off", "/features OptionId.UWPManaged OptionId.UWPCPP OptionId.UWPLocalized OptionId.DesktopCPPx86 OptionId.DesktopCPPx64 OptionId.DesktopCPParm64") ` -ExpectedSignature '7535269B94C1FEA4A5EF6D808E371DA242F27936' + # Install Windows 11 SDK version 10.0.26100 + Install-Binary -Type EXE ` + -Url 'https://go.microsoft.com/fwlink/?linkid=2286561' ` + -InstallArgs @("/q", "/norestart", "/ceip off", "/features OptionId.UWPManaged OptionId.UWPCPP OptionId.UWPLocalized OptionId.DesktopCPPx86 OptionId.DesktopCPPx64 OptionId.DesktopCPParm64") ` + -ExpectedSignature '573EF451A68C33FB904346D44551BEF3BB5BBF68' } Invoke-PesterTests -TestFile "VisualStudio" diff --git a/images/windows/scripts/build/Install-WDK.ps1 b/images/windows/scripts/build/Install-WDK.ps1 index a8cc89b730fc..51660a07cd80 100644 --- a/images/windows/scripts/build/Install-WDK.ps1 +++ b/images/windows/scripts/build/Install-WDK.ps1 @@ -16,9 +16,8 @@ if (Test-IsWin19) { $wdkExtensionPath = "C:\Program Files (x86)\Windows Kits\10\Vsix\VS2019\WDK.vsix" } elseif (Test-IsWin22) { # SDK is available through Visual Studio - $wdkUrl = "https://go.microsoft.com/fwlink/?linkid=2249371" - $wdkSignatureThumbprint = "7C94971221A799907BB45665663BBFD587BAC9F8" - $wdkExtensionPath = "C:\Program Files (x86)\Windows Kits\10\Vsix\VS2022\*\WDK.vsix" + $wdkUrl = "https://go.microsoft.com/fwlink/?linkid=2294834" + $wdkSignatureThumbprint = "7920AC8FB05E0FFFE21E8FF4B4F03093BA6AC16E" } else { throw "Invalid version of Visual Studio is found. Either 2019 or 2022 are required" } @@ -29,7 +28,8 @@ Install-Binary -Type EXE ` -InstallArgs @("/features", "+", "/quiet") ` -ExpectedSignature $wdkSignatureThumbprint -# Need to install the VSIX to get the build targets when running VSBuild -Install-VSIXFromFile (Resolve-Path -Path $wdkExtensionPath) - +if (Test-IsWin19){ + # Need to install the VSIX to get the build targets when running VSBuild + Install-VSIXFromFile (Resolve-Path -Path $wdkExtensionPath) +} Invoke-PesterTests -TestFile "WDK" diff --git a/images/windows/scripts/tests/VisualStudio.Tests.ps1 b/images/windows/scripts/tests/VisualStudio.Tests.ps1 index 47b34b17a355..b8972931126e 100644 --- a/images/windows/scripts/tests/VisualStudio.Tests.ps1 +++ b/images/windows/scripts/tests/VisualStudio.Tests.ps1 @@ -36,3 +36,9 @@ Describe "Windows 11 SDK" { "${env:ProgramFiles(x86)}\Windows Kits\10\DesignTime\CommonConfiguration\Neutral\UAP\10.0.22621.0\UAP.props" | Should -Exist } } + +Describe "Windows 11 SDK" { + It "Verifies 26100 SDK is installed" -Skip:(Test-IsWin19) { + "${env:ProgramFiles(x86)}\Windows Kits\10\DesignTime\CommonConfiguration\Neutral\UAP\10.0.26100.0\UAP.props" | Should -Exist + } +} diff --git a/images/windows/toolsets/toolset-2022.json b/images/windows/toolsets/toolset-2022.json index 47d9fe86a4cf..f8cd856f203b 100644 --- a/images/windows/toolsets/toolset-2022.json +++ b/images/windows/toolsets/toolset-2022.json @@ -264,7 +264,9 @@ "Component.MDD.Linux", "Component.MDD.Linux.GCC.arm", "Component.Microsoft.Windows.DriverKit", - "wasm.tools" + "wasm.tools", + "Microsoft.Component.MSBuild" + ], "vsix": [ "SSIS.MicrosoftDataToolsIntegrationServices", From d29e71f0c5a25e7f31f75ed76511b089decb45f0 Mon Sep 17 00:00:00 2001 From: sarathrajsrinivasan <159180023+sarathrajsrinivasan@users.noreply.github.com> Date: Wed, 13 Nov 2024 14:22:42 -0800 Subject: [PATCH 3244/3485] [macOS] Add Xcode16 back to macOS14 images (#10962) --- images/macos/toolsets/toolset-14.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/images/macos/toolsets/toolset-14.json b/images/macos/toolsets/toolset-14.json index 5e7796edfea5..00d11a727f11 100644 --- a/images/macos/toolsets/toolset-14.json +++ b/images/macos/toolsets/toolset-14.json @@ -3,6 +3,8 @@ "default": "15.4", "x64": { "versions": [ + { "link": "16.1", "version": "16.1+16B40", "runtimes": ["iOS", "watchOS", "tvOS"], "sha256": "8ca961d55981f983d21b99a95a6b0ac04905b837f6e11346ee86d28f12afe720"}, + { "link": "16", "version": "16.0.0+16A242d", "symlinks": ["16.0"], "runtimes": ["iOS", "watchOS", "tvOS"], "sha256": "4a26c3d102a55c7222fb145e0ee1503249c9c26c6e02dc64d783c8810b37b1e3"}, { "link": "15.4", "version": "15.4.0+15F31d", "install_runtimes": "true", "sha256": "82d3d61804ff3f4c7c82085e91dc701037ddaa770e542848b2477e22f4e8aa7a"}, { "link": "15.3", "version": "15.3.0+15E204a", "install_runtimes": "true", "sha256": "f13f6a2e2df432c3008e394640b8549a18c285acd7fd148d6c4bac8c3a5af234"}, { "link": "15.2", "version": "15.2.0+15C500b", "install_runtimes": "true", "sha256": "04E93680C6DDBEC84666531BE412DE778AFC8EAC6AB2037F4C2BE7290818B59B"}, @@ -12,6 +14,8 @@ }, "arm64":{ "versions": [ + { "link": "16.1", "version": "16.1+16B40", "runtimes": ["iOS", "watchOS", "tvOS"], "sha256": "8ca961d55981f983d21b99a95a6b0ac04905b837f6e11346ee86d28f12afe720"}, + { "link": "16", "version": "16.0.0+16A242d", "symlinks": ["16.0"], "runtimes": ["iOS", "watchOS", "tvOS"], "sha256": "4a26c3d102a55c7222fb145e0ee1503249c9c26c6e02dc64d783c8810b37b1e3"}, { "link": "15.4", "version": "15.4.0+15F31d", "install_runtimes": "true", "sha256": "82d3d61804ff3f4c7c82085e91dc701037ddaa770e542848b2477e22f4e8aa7a"}, { "link": "15.3", "version": "15.3.0+15E204a", "install_runtimes": "true", "sha256": "f13f6a2e2df432c3008e394640b8549a18c285acd7fd148d6c4bac8c3a5af234"}, { "link": "15.2", "version": "15.2.0+15C500b", "install_runtimes": "true", "sha256": "04E93680C6DDBEC84666531BE412DE778AFC8EAC6AB2037F4C2BE7290818B59B"}, From 9b55b80556e7275cc4e5495de1d63e2a4901aad3 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 15 Nov 2024 04:07:20 +0000 Subject: [PATCH 3245/3485] Updating readme file for ubuntu24 version 20241112.1.1 (#10956) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2404-Readme.md | 67 +++++++++++++++--------------- 1 file changed, 33 insertions(+), 34 deletions(-) diff --git a/images/ubuntu/Ubuntu2404-Readme.md b/images/ubuntu/Ubuntu2404-Readme.md index 9aee7ccf55c5..8e3a624ce9a3 100644 --- a/images/ubuntu/Ubuntu2404-Readme.md +++ b/images/ubuntu/Ubuntu2404-Readme.md @@ -1,14 +1,13 @@ | Announcements | |-| +| [[Ubuntu] Breaking Change: runner user will have UID 1001 instead of 1000 for larger runners](https://github.com/actions/runner-images/issues/10936) | | [[Ubuntu 20 and 22] Node.js version 16 will be removed on November 18,2024.](https://github.com/actions/runner-images/issues/10896) | -| [[Ubuntu 24 ] Node.js version 16 will be removed on October 21,2024.](https://github.com/actions/runner-images/issues/10677) | | [Ubuntu-latest workflows will use Ubuntu-24.04 image](https://github.com/actions/runner-images/issues/10636) | -| [[Ubuntu 20 and 22] Go version 1.20.0 will be removed on October 14,2024.](https://github.com/actions/runner-images/issues/10607) | *** # Ubuntu 24.04 - OS Version: 24.04.1 LTS -- Kernel Version: 6.8.0-1016-azure -- Image Version: 20241103.1.0 +- Kernel Version: 6.8.0-1017-azure +- Image Version: 20241112.1.0 - Systemd version: 255.4-1ubuntu8.4 ## Installed Software @@ -32,14 +31,14 @@ ### Package Management - cpan 1.64 - Helm 3.16.2 -- Homebrew 4.4.3 +- Homebrew 4.4.5 - Miniconda 24.9.2 - Npm 10.8.2 - Pip 24.0 - Pip3 24.0 - Pipx 1.7.1 - RubyGems 3.4.20 -- Vcpkg (build from commit 4f746bc66) +- Vcpkg (build from commit 89f00b3b8) - Yarn 1.22.22 #### Environment variables @@ -58,19 +57,19 @@ to accomplish this. ### Project Management - Ant 1.10.14 -- Gradle 8.10.2 +- Gradle 8.11 - Lerna 8.1.9 - Maven 3.8.8 ### Tools -- Ansible 2.17.5 -- AzCopy 10.27.0 - available by `azcopy` and `azcopy10` aliases -- Bazel 7.4.0 -- Bazelisk 1.22.1 -- Bicep 0.30.23 +- Ansible 2.17.6 +- AzCopy 10.26.0 - available by `azcopy` and `azcopy10` aliases +- Bazel 7.4.1 +- Bazelisk 1.23.0 +- Bicep 0.31.34 - Buildah 1.33.7 -- CMake 3.30.5 -- CodeQL Action Bundle 2.19.2 +- CMake 3.31.0 +- CodeQL Action Bundle 2.19.3 - Docker Amazon ECR Credential Helper 0.9.0 - Docker Compose v2 2.27.1 - Docker-Buildx 0.18.0 @@ -82,20 +81,20 @@ to accomplish this. - Git-ftp 1.6.0 - Haveged 1.9.14 - jq 1.7 -- Kind 0.24.0 +- Kind 0.25.0 - Kubectl 1.31.2 - Kustomize 5.5.0 - MediaInfo 24.01 - Mercurial 6.7.2 - Minikube 1.34.0 -- n 10.0.0 +- n 10.1.0 - Newman 6.2.1 - nvm 0.40.1 - OpenSSL 3.0.13-0ubuntu3.4 - Packer 1.11.2 -- Parcel 2.12.0 +- Parcel 2.13.0 - Podman 4.9.3 -- Pulumi 3.137.0 +- Pulumi 3.138.0 - Skopeo 1.13.3 - Sphinx Open Source Search Server 2.2.11 - yamllint 1.35.1 @@ -103,13 +102,13 @@ to accomplish this. - zstd 1.5.6 ### CLI Tools -- AWS CLI 2.19.1 -- AWS CLI Session Manager Plugin 1.2.677.0 -- AWS SAM CLI 1.127.0 -- Azure CLI 2.65.0 +- AWS CLI 2.20.0 +- AWS CLI Session Manager Plugin 1.2.688.0 +- AWS SAM CLI 1.128.0 +- Azure CLI 2.66.0 - Azure CLI (azure-devops) 1.0.1 -- GitHub CLI 2.60.1 -- Google Cloud CLI 499.0.0 +- GitHub CLI 2.61.0 +- Google Cloud CLI 501.0.0 ### Java | Version | Environment Variable | @@ -143,13 +142,13 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.7.1 ### Browsers and Drivers -- Google Chrome 130.0.6723.91 -- ChromeDriver 130.0.6723.91 -- Chromium 130.0.6723.0 -- Microsoft Edge 130.0.2849.56 -- Microsoft Edge WebDriver 130.0.2849.68 +- Google Chrome 131.0.6778.69 +- ChromeDriver 131.0.6778.69 +- Chromium 131.0.6778.0 +- Microsoft Edge 130.0.2849.80 +- Microsoft Edge WebDriver 130.0.2849.78 - Selenium server 4.26.0 -- Mozilla Firefox 132.0 +- Mozilla Firefox 132.0.1 - Geckodriver 0.35.0 #### Environment variables @@ -176,7 +175,7 @@ Use the following command as a part of your job to start the service: 'sudo syst ``` #### MySQL -- MySQL 8.0.39-0ubuntu0.24.04.2 +- MySQL 8.0.40-0ubuntu0.24.04.1 ``` User: root Password: root @@ -188,13 +187,13 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Go - 1.21.13 -- 1.22.8 -- 1.23.2 +- 1.22.9 +- 1.23.3 #### Node.js - 18.20.4 - 20.18.0 -- 22.10.0 +- 22.11.0 #### Python - 3.9.20 From 5cd2ef1b0a06be39d45b143290cd397a364bfa2d Mon Sep 17 00:00:00 2001 From: sarathrajsrinivasan <159180023+sarathrajsrinivasan@users.noreply.github.com> Date: Fri, 15 Nov 2024 03:45:48 -0800 Subject: [PATCH 3246/3485] [macOS] Pin version for tcl/tk and pkg-config (#10971) --- images/macos/scripts/build/install-pkg-config.sh | 15 +++++++++++++++ .../scripts/docs-gen/SoftwareReport.Common.psm1 | 2 +- images/macos/scripts/tests/Common.Tests.ps1 | 6 ++++++ images/macos/templates/macOS-13.anka.pkr.hcl | 3 ++- .../macos/templates/macOS-13.arm64.anka.pkr.hcl | 3 ++- images/macos/templates/macOS-14.anka.pkr.hcl | 3 ++- .../macos/templates/macOS-14.arm64.anka.pkr.hcl | 3 ++- images/macos/templates/macOS-15.anka.pkr.hcl | 3 ++- .../macos/templates/macOS-15.arm64.anka.pkr.hcl | 3 ++- images/macos/toolsets/toolset-13.json | 3 +-- images/macos/toolsets/toolset-14.json | 3 +-- images/macos/toolsets/toolset-15.json | 1 - 12 files changed, 36 insertions(+), 12 deletions(-) create mode 100644 images/macos/scripts/build/install-pkg-config.sh diff --git a/images/macos/scripts/build/install-pkg-config.sh b/images/macos/scripts/build/install-pkg-config.sh new file mode 100644 index 000000000000..77969096b7b5 --- /dev/null +++ b/images/macos/scripts/build/install-pkg-config.sh @@ -0,0 +1,15 @@ +#!/bin/bash -e -o pipefail +################################################################################ +## File: install-pkg-config.sh +## Desc: Install pkg-config +################################################################################ + +source ~/utils/utils.sh + +echo "Installing pkg-config..." + +brew tap-new my-org/old-formulas +brew extract pkg-config my-org/old-formulas --version=0.29.2 +brew install my-org/old-formulas/pkg-config@0.29.2 + +invoke_tests "Common" "pkg-config" diff --git a/images/macos/scripts/docs-gen/SoftwareReport.Common.psm1 b/images/macos/scripts/docs-gen/SoftwareReport.Common.psm1 index 158c38b99206..a6a6e2ff299a 100644 --- a/images/macos/scripts/docs-gen/SoftwareReport.Common.psm1 +++ b/images/macos/scripts/docs-gen/SoftwareReport.Common.psm1 @@ -538,7 +538,7 @@ function Get-LibXextVersion { } function Get-TclTkVersion { - $tcltkVersion = (Run-Command "brew info --json tcl-tk" | ConvertFrom-Json).installed.version + $tcltkVersion = (Run-Command "brew info --json tcl-tk@8" | ConvertFrom-Json).installed.version return $tcltkVersion } diff --git a/images/macos/scripts/tests/Common.Tests.ps1 b/images/macos/scripts/tests/Common.Tests.ps1 index 4d6ebf8e289c..a42722e39898 100644 --- a/images/macos/scripts/tests/Common.Tests.ps1 +++ b/images/macos/scripts/tests/Common.Tests.ps1 @@ -168,3 +168,9 @@ Describe "Unxip" { "unxip --version" | Should -ReturnZeroExitCode } } + +Describe "pkg-config" { + It "pkg-config" { + "pkg-config --version" | Should -ReturnZeroExitCode + } +} diff --git a/images/macos/templates/macOS-13.anka.pkr.hcl b/images/macos/templates/macOS-13.anka.pkr.hcl index 25789a533f79..e48cfe3c44ad 100644 --- a/images/macos/templates/macOS-13.anka.pkr.hcl +++ b/images/macos/templates/macOS-13.anka.pkr.hcl @@ -218,7 +218,8 @@ build { "${path.root}/../scripts/build/install-git.sh", "${path.root}/../scripts/build/install-node.sh", "${path.root}/../scripts/build/install-common-utils.sh", - "${path.root}/../scripts/build/install-unxip.sh" + "${path.root}/../scripts/build/install-unxip.sh", + "${path.root}/../scripts/build/install-pkg-config.sh" ] } diff --git a/images/macos/templates/macOS-13.arm64.anka.pkr.hcl b/images/macos/templates/macOS-13.arm64.anka.pkr.hcl index 7e03aa8fe7ee..ef0156071fbf 100644 --- a/images/macos/templates/macOS-13.arm64.anka.pkr.hcl +++ b/images/macos/templates/macOS-13.arm64.anka.pkr.hcl @@ -220,7 +220,8 @@ build { "${path.root}/../scripts/build/install-git.sh", "${path.root}/../scripts/build/install-node.sh", "${path.root}/../scripts/build/install-common-utils.sh", - "${path.root}/../scripts/build/install-unxip.sh" + "${path.root}/../scripts/build/install-unxip.sh", + "${path.root}/../scripts/build/install-pkg-config.sh" ] } diff --git a/images/macos/templates/macOS-14.anka.pkr.hcl b/images/macos/templates/macOS-14.anka.pkr.hcl index a29cd926baff..a0ce3632f784 100644 --- a/images/macos/templates/macOS-14.anka.pkr.hcl +++ b/images/macos/templates/macOS-14.anka.pkr.hcl @@ -217,7 +217,8 @@ build { "${path.root}/../scripts/build/install-rubygems.sh", "${path.root}/../scripts/build/install-git.sh", "${path.root}/../scripts/build/install-node.sh", - "${path.root}/../scripts/build/install-common-utils.sh" + "${path.root}/../scripts/build/install-common-utils.sh", + "${path.root}/../scripts/build/install-pkg-config.sh" ] } diff --git a/images/macos/templates/macOS-14.arm64.anka.pkr.hcl b/images/macos/templates/macOS-14.arm64.anka.pkr.hcl index be90e1015288..319395dadb37 100644 --- a/images/macos/templates/macOS-14.arm64.anka.pkr.hcl +++ b/images/macos/templates/macOS-14.arm64.anka.pkr.hcl @@ -219,7 +219,8 @@ build { "${path.root}/../scripts/build/install-rubygems.sh", "${path.root}/../scripts/build/install-git.sh", "${path.root}/../scripts/build/install-node.sh", - "${path.root}/../scripts/build/install-common-utils.sh" + "${path.root}/../scripts/build/install-common-utils.sh", + "${path.root}/../scripts/build/install-pkg-config.sh" ] } diff --git a/images/macos/templates/macOS-15.anka.pkr.hcl b/images/macos/templates/macOS-15.anka.pkr.hcl index 6e93eccf210f..7bb9068bad27 100644 --- a/images/macos/templates/macOS-15.anka.pkr.hcl +++ b/images/macos/templates/macOS-15.anka.pkr.hcl @@ -212,7 +212,8 @@ build { "${path.root}/../scripts/build/install-rubygems.sh", "${path.root}/../scripts/build/install-git.sh", "${path.root}/../scripts/build/install-node.sh", - "${path.root}/../scripts/build/install-common-utils.sh" + "${path.root}/../scripts/build/install-common-utils.sh", + "${path.root}/../scripts/build/install-pkg-config.sh" ] } diff --git a/images/macos/templates/macOS-15.arm64.anka.pkr.hcl b/images/macos/templates/macOS-15.arm64.anka.pkr.hcl index 8e72eace0760..4a4a0661fa38 100644 --- a/images/macos/templates/macOS-15.arm64.anka.pkr.hcl +++ b/images/macos/templates/macOS-15.arm64.anka.pkr.hcl @@ -214,7 +214,8 @@ build { "${path.root}/../scripts/build/install-rubygems.sh", "${path.root}/../scripts/build/install-git.sh", "${path.root}/../scripts/build/install-node.sh", - "${path.root}/../scripts/build/install-common-utils.sh" + "${path.root}/../scripts/build/install-common-utils.sh", + "${path.root}/../scripts/build/install-pkg-config.sh" ] } diff --git a/images/macos/toolsets/toolset-13.json b/images/macos/toolsets/toolset-13.json index 1518b52f0f04..e423ffdb5c14 100644 --- a/images/macos/toolsets/toolset-13.json +++ b/images/macos/toolsets/toolset-13.json @@ -72,9 +72,8 @@ "p7zip", "packer", "perl", - "pkg-config", "swiftformat", - "tcl-tk", + "tcl-tk@8", "zstd", "gmp", "yq", diff --git a/images/macos/toolsets/toolset-14.json b/images/macos/toolsets/toolset-14.json index 00d11a727f11..f8fc9eef3a1b 100644 --- a/images/macos/toolsets/toolset-14.json +++ b/images/macos/toolsets/toolset-14.json @@ -75,9 +75,8 @@ "p7zip", "packer", "perl", - "pkg-config", "swiftformat", - "tcl-tk", + "tcl-tk@8", "zstd", "gmp", "yq", diff --git a/images/macos/toolsets/toolset-15.json b/images/macos/toolsets/toolset-15.json index 26f4f849c542..6386bdc3e2aa 100644 --- a/images/macos/toolsets/toolset-15.json +++ b/images/macos/toolsets/toolset-15.json @@ -67,7 +67,6 @@ "p7zip", "packer", "perl", - "pkg-config", "swiftformat", "zstd", "gmp", From a56a1d3dc737a7c8f73edcd3b3291270663e9601 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 15 Nov 2024 07:47:32 -0700 Subject: [PATCH 3247/3485] Updating readme file for ubuntu22 version 20241112.1.1 (#10961) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2204-Readme.md | 103 ++++++++++++++--------------- 1 file changed, 51 insertions(+), 52 deletions(-) diff --git a/images/ubuntu/Ubuntu2204-Readme.md b/images/ubuntu/Ubuntu2204-Readme.md index 6728b50d7f5a..3e7c0c786ec8 100644 --- a/images/ubuntu/Ubuntu2204-Readme.md +++ b/images/ubuntu/Ubuntu2204-Readme.md @@ -1,14 +1,13 @@ | Announcements | |-| +| [[Ubuntu] Breaking Change: runner user will have UID 1001 instead of 1000 for larger runners](https://github.com/actions/runner-images/issues/10936) | | [[Ubuntu 20 and 22] Node.js version 16 will be removed on November 18,2024.](https://github.com/actions/runner-images/issues/10896) | -| [[Ubuntu 24 ] Node.js version 16 will be removed on October 21,2024.](https://github.com/actions/runner-images/issues/10677) | | [Ubuntu-latest workflows will use Ubuntu-24.04 image](https://github.com/actions/runner-images/issues/10636) | -| [[Ubuntu 20 and 22] Go version 1.20.0 will be removed on October 14,2024.](https://github.com/actions/runner-images/issues/10607) | *** # Ubuntu 22.04 - OS Version: 22.04.5 LTS - Kernel Version: 6.5.0-1025-azure -- Image Version: 20241103.1.0 +- Image Version: 20241112.1.0 - Systemd version: 249.11-0ubuntu3.12 ## Installed Software @@ -25,7 +24,7 @@ - Kotlin 2.0.21-release-482 - Mono 6.12.0.200 - MSBuild 16.10.1.31701 (Mono 6.12.0.200) -- Node.js 18.20.4 +- Node.js 18.20.5 - Perl 5.34.0 - Python 3.10.12 - Ruby 3.0.2p107 @@ -34,15 +33,15 @@ ### Package Management - cpan 1.64 - Helm 3.16.2 -- Homebrew 4.4.3 +- Homebrew 4.4.5 - Miniconda 24.9.2 -- Npm 10.7.0 +- Npm 10.8.2 - NuGet 6.6.1.2 - Pip 22.0.2 - Pip3 22.0.2 - Pipx 1.7.1 - RubyGems 3.3.5 -- Vcpkg (build from commit 4f746bc66) +- Vcpkg (build from commit 89f00b3b8) - Yarn 1.22.22 #### Environment variables @@ -61,21 +60,21 @@ to accomplish this. ### Project Management - Ant 1.10.12 -- Gradle 8.10.2 +- Gradle 8.11 - Lerna 8.1.9 - Maven 3.8.8 -- Sbt 1.10.4 +- Sbt 1.10.5 ### Tools -- Ansible 2.17.5 +- Ansible 2.17.6 - apt-fast 1.10.0 -- AzCopy 10.27.0 - available by `azcopy` and `azcopy10` aliases -- Bazel 7.4.0 -- Bazelisk 1.22.1 -- Bicep 0.30.23 +- AzCopy 10.26.0 - available by `azcopy` and `azcopy10` aliases +- Bazel 7.4.1 +- Bazelisk 1.23.0 +- Bicep 0.31.34 - Buildah 1.23.1 -- CMake 3.30.5 -- CodeQL Action Bundle 2.19.2 +- CMake 3.31.0 +- CodeQL Action Bundle 2.19.3 - Docker Amazon ECR Credential Helper 0.9.0 - Docker Compose v2 2.27.1 - Docker-Buildx 0.18.0 @@ -86,24 +85,24 @@ to accomplish this. - Git LFS 3.5.1 - Git-ftp 1.6.0 - Haveged 1.9.14 -- Heroku 9.3.2 +- Heroku 9.4.0 - jq 1.6 -- Kind 0.24.0 +- Kind 0.25.0 - Kubectl 1.31.2 - Kustomize 5.5.0 - Leiningen 2.11.2 - MediaInfo 21.09 - Mercurial 6.1.1 - Minikube 1.34.0 -- n 10.0.0 +- n 10.1.0 - Newman 6.2.1 - nvm 0.40.1 - OpenSSL 3.0.2-0ubuntu1.18 - Packer 1.11.2 -- Parcel 2.12.0 +- Parcel 2.13.0 - Podman 3.4.4 -- Pulumi 3.137.0 -- R 4.4.1 +- Pulumi 3.138.0 +- R 4.4.2 - Skopeo 1.4.1 - Sphinx Open Source Search Server 2.2.11 - SVN 1.14.1 @@ -113,18 +112,18 @@ to accomplish this. - zstd 1.5.6 ### CLI Tools -- Alibaba Cloud CLI 3.0.227 -- AWS CLI 2.19.1 -- AWS CLI Session Manager Plugin 1.2.677.0 -- AWS SAM CLI 1.127.0 -- Azure CLI 2.65.0 +- Alibaba Cloud CLI 3.0.231 +- AWS CLI 2.20.0 +- AWS CLI Session Manager Plugin 1.2.688.0 +- AWS SAM CLI 1.128.0 +- Azure CLI 2.66.0 - Azure CLI (azure-devops) 1.0.1 -- GitHub CLI 2.60.1 -- Google Cloud CLI 499.0.0 +- GitHub CLI 2.61.0 +- Google Cloud CLI 501.0.0 - Netlify CLI 17.37.2 - OpenShift CLI 4.17.3 - ORAS CLI 1.2.0 -- Vercel CLI 37.14.0 +- Vercel CLI 38.0.0 ### Java | Version | Environment Variable | @@ -163,13 +162,13 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.7.1 ### Browsers and Drivers -- Google Chrome 130.0.6723.91 -- ChromeDriver 130.0.6723.91 -- Chromium 130.0.6723.0 -- Microsoft Edge 130.0.2849.56 -- Microsoft Edge WebDriver 130.0.2849.68 +- Google Chrome 131.0.6778.69 +- ChromeDriver 131.0.6778.69 +- Chromium 131.0.6778.0 +- Microsoft Edge 130.0.2849.80 +- Microsoft Edge WebDriver 130.0.2849.78 - Selenium server 4.26.0 -- Mozilla Firefox 132.0 +- Mozilla Firefox 132.0.1 - Geckodriver 0.35.0 #### Environment variables @@ -181,7 +180,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | ### .NET Tools -- .NET Core SDK: 6.0.427, 7.0.410, 8.0.403 +- .NET Core SDK: 6.0.428, 7.0.410, 8.0.404 - nbgv 3.6.146+392592327a ### Databases @@ -196,7 +195,7 @@ Use the following command as a part of your job to start the service: 'sudo syst ``` #### MySQL -- MySQL 8.0.39-0ubuntu0.22.04.1 +- MySQL 8.0.40-0ubuntu0.22.04.1 ``` User: root Password: root @@ -212,14 +211,14 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Go - 1.21.13 -- 1.22.8 -- 1.23.2 +- 1.22.9 +- 1.23.3 #### Node.js - 16.20.2 - 18.20.4 - 20.18.0 -- 22.10.0 +- 22.11.0 #### Python - 3.7.17 @@ -281,20 +280,20 @@ Use the following command as a part of your job to start the service: 'sudo syst | Repository:Tag | Digest | Created | | -------------------- | ------------------------------------------------------------------------ | ---------- | | alpine:3.16 | sha256:452e7292acee0ee16c332324d7de05fa2c99f9994ecc9f0779c602916a672ae4 | 2024-01-27 | -| alpine:3.17 | sha256:3451da08fc6ef554a100da3e2df5ac6d598c82f2a774d5f6ed465c3d80cd163a | 2024-09-06 | -| alpine:3.18 | sha256:3ddf7bf1d408188f9849efbf4f902720ae08f5131bb39013518b918aa056d0de | 2024-09-06 | -| alpine:3.19 | sha256:ae65dbf8749a7d4527648ccee1fa3deb6bfcae34cbc30fc67aa45c44dcaa90ee | 2024-09-06 | +| alpine:3.17 | sha256:8fc3dacfb6d69da8d44e42390de777e48577085db99aa4e4af35f483eb08b989 | 2024-09-06 | +| alpine:3.18 | sha256:2995c82e8e723d9a5c8585cb8e901d1c50e3c2759031027d3bff577449435157 | 2024-09-06 | +| alpine:3.19 | sha256:7a85bf5dc56c949be827f84f9185161265c58f589bb8b2a6b6bb6d3076c1be21 | 2024-09-06 | | debian:10 | sha256:58ce6f1271ae1c8a2006ff7d3e54e9874d839f573d8009c20154ad0f2fb0a225 | 2024-06-13 | -| debian:11 | sha256:d0036be35fe0a4d2649bf074ca467a37dab8c5b26bbbdfca0375b4dc682f011d | 2024-10-17 | -| moby/buildkit:latest | sha256:8e8898b54dbaccc8e0b56e02e5d5b3d6b947a26c24b37899c5c652bba7c60b47 | 2024-10-30 | +| debian:11 | sha256:01559430c84e6bc864bed554345d1bfbfa94ac108ab68f39915cae34604b15c3 | 2024-11-11 | +| moby/buildkit:latest | sha256:918e92e639651fdfd0bd97f31bab0dd91756edd14e6f73f43a896715617c59a0 | 2024-11-07 | | node:16 | sha256:f77a1aef2da8d83e45ec990f45df50f1a286c5fe8bbfb8c6e4246c6389705c0b | 2023-09-07 | | node:16-alpine | sha256:a1f9d027912b58a7c75be7716c97cfbc6d3099f3a97ed84aa490be9dee20e787 | 2023-08-10 | -| node:18 | sha256:ddd173cd94537e155b378342056e0968e8299eb3da9dd5d412d3b7f796ac38c0 | 2024-07-09 | -| node:18-alpine | sha256:02376a266c84acbf45bd19440e08e48b1c8b98037417334046029ab585de03e2 | 2024-07-09 | -| node:20 | sha256:a5e0ed56f2c20b9689e0f7dd498cac7e08d2a3a283e92d9304e7b9b83e3c6ff3 | 2024-10-04 | -| node:20-alpine | sha256:c13b26e7e602ef2f1074aef304ce6e9b7dd284c419b35d89fcf3cc8e44a8def9 | 2024-10-04 | -| node:22 | sha256:de4c8be8232b7081d8846360d73ce6dbff33c6636f2259cd14d82c0de1ac3ff2 | 2024-10-29 | -| node:22-alpine | sha256:f265794478aa0b1a23d85a492c8311ed795bc527c3fe7e43453b3c872dcd71a3 | 2024-10-29 | +| node:18 | sha256:d8bdb5bedbfdb7c941c117b94db88a2250a56fe33c2883f7a3ad62825bf31128 | 2024-07-09 | +| node:18-alpine | sha256:a25c1e4ecc284985f4cbc449021e9259560c644dd9611e5a72d9c4750f24f6c7 | 2024-07-09 | +| node:20 | sha256:0c73476fa7c1435f0caee56a429fa506e36ec0e0666149eec5ea8e5f60fb5efa | 2024-10-04 | +| node:20-alpine | sha256:b1e0880c3af955867bc2f1944b49d20187beb7afa3f30173e15a97149ab7f5f1 | 2024-10-04 | +| node:22 | sha256:db556c2974040f7812c7f39c15afb1e8b1901d6e23f1975ff71b5236a1244e52 | 2024-10-29 | +| node:22-alpine | sha256:b64ced2e7cd0a4816699fe308ce6e8a08ccba463c757c00c14cd372e3d2c763e | 2024-10-29 | | ubuntu:20.04 | sha256:8e5c4f0285ecbb4ead070431d29b576a530d3166df73ec44affc1cd27555141b | 2024-10-11 | | ubuntu:22.04 | sha256:0e5e4a57c2499249aafc3b40fcd541e9a456aab7296681a3994d631587203f97 | 2024-09-11 | From 56187189cfef76d50b56f36e692c239ce617ee71 Mon Sep 17 00:00:00 2001 From: hemanthmanga <166606741+hemanthmanga@users.noreply.github.com> Date: Fri, 15 Nov 2024 20:18:25 +0530 Subject: [PATCH 3248/3485] [Ubuntu 20 and 22] Removing Node.js version 16* (#10975) --- images/ubuntu/toolsets/toolset-2004.json | 3 --- images/ubuntu/toolsets/toolset-2204.json | 3 --- 2 files changed, 6 deletions(-) diff --git a/images/ubuntu/toolsets/toolset-2004.json b/images/ubuntu/toolsets/toolset-2004.json index 3213634c5f7a..9ce39fca297f 100644 --- a/images/ubuntu/toolsets/toolset-2004.json +++ b/images/ubuntu/toolsets/toolset-2004.json @@ -34,7 +34,6 @@ "platform" : "linux", "arch": "x64", "versions": [ - "16.*", "18.*", "20.*", "22.*" @@ -221,11 +220,9 @@ "debian:10", "debian:11", "moby/buildkit:latest", - "node:16", "node:18", "node:20", "node:22", - "node:16-alpine", "node:18-alpine", "node:20-alpine", "node:22-alpine", diff --git a/images/ubuntu/toolsets/toolset-2204.json b/images/ubuntu/toolsets/toolset-2204.json index 67fe14fa68cf..0a45df9fc55c 100644 --- a/images/ubuntu/toolsets/toolset-2204.json +++ b/images/ubuntu/toolsets/toolset-2204.json @@ -32,7 +32,6 @@ "platform" : "linux", "arch": "x64", "versions": [ - "16.*", "18.*", "20.*", "22.*" @@ -219,11 +218,9 @@ "debian:10", "debian:11", "moby/buildkit:latest", - "node:16", "node:18", "node:20", "node:22", - "node:16-alpine", "node:18-alpine", "node:20-alpine", "node:22-alpine", From c27b1a395f347175316898749e19325206369054 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 15 Nov 2024 15:41:47 +0000 Subject: [PATCH 3249/3485] Updating readme file for win19 version 20241113.3.1 (#10972) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/windows/Windows2019-Readme.md | 106 ++++++++++++++------------- 1 file changed, 54 insertions(+), 52 deletions(-) diff --git a/images/windows/Windows2019-Readme.md b/images/windows/Windows2019-Readme.md index 1635338137e6..a8680c43dbb3 100644 --- a/images/windows/Windows2019-Readme.md +++ b/images/windows/Windows2019-Readme.md @@ -1,11 +1,11 @@ | Announcements | |-| -| [[Windows] .NET 7.x will be removed from the images on December 6, 2024](https://github.com/actions/runner-images/issues/10894) | -| [[Windows] Python 3.7.x will be removed from December 6 ,2024](https://github.com/actions/runner-images/issues/10893) | +| [[Windows & Ubuntu] .NET 7.x will be removed from the images on December 6, 2024](https://github.com/actions/runner-images/issues/10894) | +| [[Windows & Ubuntu] Python 3.7.x will be removed from December 6 ,2024](https://github.com/actions/runner-images/issues/10893) | *** # Windows Server 2019 -- OS Version: 10.0.17763 Build 6414 -- Image Version: 20241104.2.0 +- OS Version: 10.0.17763 Build 6532 +- Image Version: 20241113.3.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -18,23 +18,23 @@ - Julia 1.10.5 - Kotlin 2.0.21 - LLVM 18.1.8 -- Node 18.20.3 +- Node 18.20.5 - Perl 5.32.1 - PHP 8.3.13 - Python 3.7.9 - Ruby 3.0.7p220 ### Package Management -- Chocolatey 2.3.0 +- Chocolatey 2.4.0 - Composer 2.8.2 - Helm 3.16.1 - Miniconda 24.9.2 (pre-installed on the image but not added to PATH) -- NPM 10.7.0 +- NPM 10.8.2 - NuGet 6.11.1.2 - pip 24.0 (python 3.7) - Pipx 1.2.1 - RubyGems 3.2.33 -- Vcpkg (build from commit 2a3138723) +- Vcpkg (build from commit 772f784ba) - Yarn 1.22.22 #### Environment variables @@ -45,31 +45,31 @@ ### Project Management - Ant 1.10.14 -- Gradle 8.10 +- Gradle 8.11 - Maven 3.8.7 -- sbt 1.10.4 +- sbt 1.10.5 ### Tools - 7zip 24.08 - aria2 1.37.0 -- azcopy 10.27.0 -- Bazel 7.4.0 -- Bazelisk 1.22.1 -- Bicep 0.30.23 +- azcopy 10.27.0 INFO: azcopy.exe 10.27.0: A newer version 10.27.1 is available to download +- Bazel 7.4.1 +- Bazelisk 1.23.0 +- Bicep 0.31.34 - Cabal 3.12.1.0 -- CMake 3.30.5 -- CodeQL Action Bundle 2.19.2 +- CMake 3.31.0 +- CodeQL Action Bundle 2.19.3 - Docker 26.1.3 - Docker Compose v2 2.27.1 - Docker-wincred 0.8.2 - ghc 9.10.1 - Git 2.47.0.windows.1 - Git LFS 3.5.1 -- Google Cloud CLI 499.0.0 -- ImageMagick 7.1.1-39 +- Google Cloud CLI 501.0.0 +- ImageMagick 7.1.1-40 - InnoSetup 6.3.3 - jq 1.7.1 -- Kind 0.24.0 +- Kind 0.25.0 - Kubectl 1.31.2 - Mercurial 5.0 - gcc 8.1.0 @@ -79,8 +79,8 @@ - NSIS 3.10 - OpenSSL 1.1.1w - Packer 1.11.2 -- Parcel 2.12.0 -- Pulumi 3.137.0 +- Parcel 2.13.0 +- Pulumi 3.138.0 - R 4.4.2 - Service Fabric SDK 9.1.1436.9590 - Stack 3.1.1 @@ -93,14 +93,14 @@ - zstd 1.5.6 ### CLI Tools -- Alibaba Cloud CLI 3.0.227 -- AWS CLI 2.19.1 -- AWS SAM CLI 1.127.0 -- AWS Session Manager CLI 1.2.677.0 -- Azure CLI 2.65.0 +- Alibaba Cloud CLI 3.0.232 +- AWS CLI 2.19.5 +- AWS SAM CLI 1.128.0 +- AWS Session Manager CLI 1.2.688.0 +- Azure CLI 2.66.0 - Azure DevOps CLI extension 1.0.1 - Cloud Foundry CLI 8.8.3 -- GitHub CLI 2.60.1 +- GitHub CLI 2.61.0 ### Rust Tools - Cargo 1.82.0 @@ -117,11 +117,11 @@ - Rustfmt 1.7.1 ### Browsers and Drivers -- Google Chrome 130.0.6723.92 -- Chrome Driver 130.0.6723.91 -- Microsoft Edge 130.0.2849.68 -- Microsoft Edge Driver 130.0.2849.68 -- Mozilla Firefox 132.0.1 +- Google Chrome 131.0.6778.70 +- Chrome Driver 131.0.6778.69 +- Microsoft Edge 130.0.2849.80 +- Microsoft Edge Driver 130.0.2849.80 +- Mozilla Firefox 132.0.2 - Gecko Driver 0.35.0 - IE Driver 4.14.0.0 - Selenium server 4.26.0 @@ -167,12 +167,14 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Go - 1.20.14 - 1.21.13 -- 1.22.8 +- 1.22.9 +- 1.23.3 #### Node.js - 16.20.2 -- 18.20.4 +- 18.20.5 - 20.18.0 +- 22.11.0 #### Python - 3.7.9 @@ -230,12 +232,12 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Visual Studio Enterprise 2019 | Name | Version | Path | | ----------------------------- | --------------- | -------------------------------------------------------------- | -| Visual Studio Enterprise 2019 | 16.11.35325.158 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | +| Visual Studio Enterprise 2019 | 16.11.35425.106 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | #### Workloads, components and extensions | Package | Version | | ------------------------------------------------------------------------- | --------------- | -| Component.Android.NDK.R16B | 16.11.35323.27 | +| Component.Android.NDK.R16B | 16.11.35425.106 | | Component.Android.SDK25.Private | 16.0.28625.61 | | Component.Android.SDK30 | 16.10.31205.252 | | Component.Ant | 1.9.3.8 | @@ -473,12 +475,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 Debug Runtime | x64 | 14.29.30156 | -| Microsoft Visual C++ 2019 Debug Runtime | x86 | 14.29.30156 | -| Microsoft Visual C++ 2022 Additional Runtime | x64 | 14.40.33816 | -| Microsoft Visual C++ 2022 Minimum Runtime | x64 | 14.40.33816 | -| Microsoft Visual C++ 2022 Additional Runtime | x86 | 14.40.33816 | -| Microsoft Visual C++ 2022 Minimum Runtime | x86 | 14.40.33816 | +| Microsoft Visual C++ 2019 Debug Runtime | x64 | 14.29.30157 | +| Microsoft Visual C++ 2019 Debug Runtime | x86 | 14.29.30157 | +| Microsoft Visual C++ 2022 Additional Runtime | x64 | 14.42.34433 | +| Microsoft Visual C++ 2022 Minimum Runtime | x64 | 14.42.34433 | +| Microsoft Visual C++ 2022 Additional Runtime | x86 | 14.42.34433 | +| Microsoft Visual C++ 2022 Minimum Runtime | x86 | 14.42.34433 | #### Installed Windows SDKs - 10.0.14393.0 @@ -492,11 +494,11 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 10.0.22621.0 ### .NET Core Tools -- .NET Core SDK: 6.0.135, 6.0.203, 6.0.321, 6.0.427, 7.0.120, 7.0.203, 7.0.317, 7.0.410, 8.0.110, 8.0.206, 8.0.306, 8.0.403 +- .NET Core SDK: 6.0.136, 6.0.203, 6.0.321, 6.0.428, 7.0.120, 7.0.203, 7.0.317, 7.0.410, 8.0.111, 8.0.206, 8.0.307, 8.0.404 - .NET Framework: 4.7.2, 4.8 -- Microsoft.AspNetCore.App: 6.0.5, 6.0.26, 6.0.35, 7.0.5, 7.0.20, 8.0.6, 8.0.10 -- Microsoft.NETCore.App: 6.0.5, 6.0.26, 6.0.35, 7.0.5, 7.0.20, 8.0.6, 8.0.10 -- Microsoft.WindowsDesktop.App: 6.0.5, 6.0.26, 6.0.35, 7.0.5, 7.0.20, 8.0.6, 8.0.10 +- Microsoft.AspNetCore.App: 6.0.5, 6.0.26, 6.0.36, 7.0.5, 7.0.20, 8.0.6, 8.0.11 +- Microsoft.NETCore.App: 6.0.5, 6.0.26, 6.0.36, 7.0.5, 7.0.20, 8.0.6, 8.0.11 +- Microsoft.WindowsDesktop.App: 6.0.5, 6.0.26, 6.0.36, 7.0.5, 7.0.20, 8.0.6, 8.0.11 - nbgv 3.6.146+392592327a ### PowerShell Tools @@ -508,7 +510,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - AzureRM: 2.1.0 (Default), 6.13.1 - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.691 +- AWSPowershell: 4.1.696 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.10 - Microsoft.Graph: 2.24.0 @@ -552,9 +554,9 @@ All other versions are saved but not installed. ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:500751531cd48c3cc759008eb60c1a6d1216cf8e0bd7328adcb33d349fb60984 | 2024-10-08 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:1659c21eedf074962b96dd69ee8e95a7db6fcb497f2248c3077c8f6fdb0a9231 | 2024-10-08 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:8a885e75361b04540285efde17f2fc00b7ac8953bb8d1e9442adf3f41f170b5e | 2024-10-08 | -| mcr.microsoft.com/windows/nanoserver:1809 | sha256:cdd5a33c8dd429071a00de8c7532bf40855174763d88ba575ec55c8060e964fc | 2024-10-04 | -| mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:b36581f8c38aa45a8eb1849372603fcbfe97befb3c0ad510e9cfc2ccef8fd3ca | 2024-10-04 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:ef2bdc393a4e9b0b0d8b4356c96ba384e93905b91f9bc1457297bec10c7c9a5d | 2024-11-12 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:dd1c97343b6a7913b4ad9af8d7024527d86f31b611246b7b56be2df9efd6affe | 2024-11-12 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:5c61a6c5cd84002f31b40d365e505a2c2310acec806faa30b8e2cc209150dd54 | 2024-11-12 | +| mcr.microsoft.com/windows/nanoserver:1809 | sha256:d3bd9a71fc0c0e7f768c607fdbc60cba66ace7a2fc833bcb01992c247d7d78df | 2024-11-01 | +| mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:d14e163a476ddf6bfe08997551777cf1382288784825158263e002d1f4eeb29c | 2024-11-01 | From 67857a41a163b96452c4b5a16058935458d7679d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 16 Nov 2024 02:38:18 +0000 Subject: [PATCH 3250/3485] Updating readme file for win22 version 20241113.3.1 (#10974) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/windows/Windows2022-Readme.md | 584 ++++++++++++++------------- 1 file changed, 297 insertions(+), 287 deletions(-) diff --git a/images/windows/Windows2022-Readme.md b/images/windows/Windows2022-Readme.md index 9c0603671153..cbaedb55630b 100644 --- a/images/windows/Windows2022-Readme.md +++ b/images/windows/Windows2022-Readme.md @@ -1,6 +1,11 @@ +| Announcements | +|-| +| [[Windows & Ubuntu] .NET 7.x will be removed from the images on December 6, 2024](https://github.com/actions/runner-images/issues/10894) | +| [[Windows & Ubuntu] Python 3.7.x will be removed from December 6 ,2024](https://github.com/actions/runner-images/issues/10893) | +*** # Windows Server 2022 -- OS Version: 10.0.20348 Build 2762 -- Image Version: 20241021.1.0 +- OS Version: 10.0.20348 Build 2849 +- Image Version: 20241113.3.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -13,23 +18,23 @@ - Julia 1.10.5 - Kotlin 2.0.21 - LLVM 18.1.8 -- Node 18.20.3 +- Node 18.20.5 - Perl 5.32.1 -- PHP 8.3.12 +- PHP 8.3.13 - Python 3.9.13 - Ruby 3.0.7p220 ### Package Management -- Chocolatey 2.3.0 -- Composer 2.8.1 +- Chocolatey 2.4.0 +- Composer 2.8.2 - Helm 3.16.1 -- Miniconda 24.7.1 (pre-installed on the image but not added to PATH) -- NPM 10.7.0 +- Miniconda 24.9.2 (pre-installed on the image but not added to PATH) +- NPM 10.8.2 - NuGet 6.11.1.2 -- pip 24.2 (python 3.9) +- pip 24.3.1 (python 3.9) - Pipx 1.7.1 - RubyGems 3.2.33 -- Vcpkg (build from commit 3a747a4fc) +- Vcpkg (build from commit 772f784ba) - Yarn 1.22.22 #### Environment variables @@ -40,31 +45,31 @@ ### Project Management - Ant 1.10.14 -- Gradle 8.10 +- Gradle 8.11 - Maven 3.8.7 -- sbt 1.10.3 +- sbt 1.10.5 ### Tools - 7zip 24.08 - aria2 1.37.0 -- azcopy 10.26.0 -- Bazel 7.3.2 -- Bazelisk 1.22.1 -- Bicep 0.30.23 +- azcopy 10.27.0 INFO: azcopy.exe 10.27.0: A newer version 10.27.1 is available to download +- Bazel 7.4.1 +- Bazelisk 1.23.0 +- Bicep 0.31.34 - Cabal 3.12.1.0 -- CMake 3.30.5 -- CodeQL Action Bundle 2.19.1 +- CMake 3.31.0 +- CodeQL Action Bundle 2.19.3 - Docker 26.1.3 - Docker Compose v2 2.27.1 - Docker-wincred 0.8.2 - ghc 9.10.1 - Git 2.47.0.windows.1 - Git LFS 3.5.1 -- ImageMagick 7.1.1-39 +- ImageMagick 7.1.1-40 - InnoSetup 6.3.3 - jq 1.7.1 -- Kind 0.24.0 -- Kubectl 1.31.1 +- Kind 0.25.0 +- Kubectl 1.31.2 - Mercurial 5.0 - gcc 12.2.0 - gdb 11.2 @@ -73,8 +78,8 @@ - NSIS 3.10 - OpenSSL 1.1.1w - Packer 1.11.2 -- Pulumi 3.137.0 -- R 4.4.1 +- Pulumi 3.138.0 +- R 4.4.2 - Service Fabric SDK 9.1.1436.9590 - Stack 3.1.1 - Subversion (SVN) 1.14.4 @@ -86,13 +91,13 @@ - zstd 1.5.6 ### CLI Tools -- Alibaba Cloud CLI 3.0.227 -- AWS CLI 2.18.10 -- AWS SAM CLI 1.126.0 -- AWS Session Manager CLI 1.2.677.0 -- Azure CLI 2.65.0 +- Alibaba Cloud CLI 3.0.232 +- AWS CLI 2.19.5 +- AWS SAM CLI 1.128.0 +- AWS Session Manager CLI 1.2.688.0 +- Azure CLI 2.66.0 - Azure DevOps CLI extension 1.0.1 -- GitHub CLI 2.59.0 +- GitHub CLI 2.61.0 ### Rust Tools - Cargo 1.82.0 @@ -102,21 +107,21 @@ #### Packages - bindgen 0.70.1 -- cargo-audit 0.20.1 +- cargo-audit 0.21.0 - cargo-outdated 0.15.0 - cbindgen 0.27.0 - Clippy 0.1.82 - Rustfmt 1.7.1 ### Browsers and Drivers -- Google Chrome 130.0.6723.59 -- Chrome Driver 130.0.6723.58 -- Microsoft Edge 130.0.2849.46 -- Microsoft Edge Driver 130.0.2849.46 -- Mozilla Firefox 131.0.3 +- Google Chrome 131.0.6778.70 +- Chrome Driver 131.0.6778.69 +- Microsoft Edge 130.0.2849.80 +- Microsoft Edge Driver 130.0.2849.80 +- Mozilla Firefox 132.0.2 - Gecko Driver 0.35.0 - IE Driver 4.14.0.0 -- Selenium server 4.25.0 +- Selenium server 4.26.0 #### Environment variables | Name | Value | @@ -156,12 +161,14 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Go - 1.20.14 - 1.21.13 -- 1.22.8 +- 1.22.9 +- 1.23.3 #### Node.js - 16.20.2 -- 18.20.4 +- 18.20.5 - 20.18.0 +- 22.11.0 #### Python - 3.7.9 @@ -181,7 +188,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Ruby - 3.0.7 - 3.1.6 -- 3.2.5 +- 3.2.6 ### Databases @@ -216,251 +223,252 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Nginx | 1.27.2 | C:\tools\nginx-1.27.2\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2022 -| Name | Version | Path | -| ----------------------------- | ------------- | -------------------------------------------------------- | -| Visual Studio Enterprise 2022 | 17.11.35327.3 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | +| Name | Version | Path | +| ----------------------------- | --------------- | -------------------------------------------------------- | +| Visual Studio Enterprise 2022 | 17.12.35506.116 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | #### Workloads, components and extensions | Package | Version | | ------------------------------------------------------------------------- | --------------- | -| android | 34.0.113.0 | -| aspire | 8.100.24.37302 | -| Component.Android.NDK.R23C | 17.11.35102.94 | -| Component.Android.SDK.MAUI | 17.11.35102.94 | -| Component.Dotfuscator | 17.11.35102.94 | -| Component.Linux.CMake | 17.11.35102.94 | -| Component.Linux.RemoteFileExplorer | 17.11.35102.94 | -| Component.MDD.Android | 17.11.35102.94 | -| Component.MDD.Linux | 17.11.35102.94 | -| Component.MDD.Linux.GCC.arm | 17.11.35102.94 | -| Component.Microsoft.VisualStudio.LiveShare.2022 | 1.0.5919 | -| Component.Microsoft.VisualStudio.RazorExtension | 17.11.35102.94 | +| android | 35.0.7.0 | +| Component.Android.NDK.R23C | 17.12.35410.122 | +| Component.Android.SDK.MAUI | 17.12.35410.122 | +| Component.Dotfuscator | 17.12.35410.122 | +| Component.Linux.CMake | 17.12.35410.122 | +| Component.Linux.RemoteFileExplorer | 17.12.35410.122 | +| Component.MDD.Android | 17.12.35410.122 | +| Component.MDD.Linux | 17.12.35410.122 | +| Component.MDD.Linux.GCC.arm | 17.12.35410.122 | +| Component.Microsoft.VisualStudio.LiveShare.2022 | 1.0.5940 | +| Component.Microsoft.VisualStudio.RazorExtension | 17.12.35410.122 | | Component.Microsoft.VisualStudio.Tools.Applications.amd64 | 17.0.33617.0 | -| Component.Microsoft.VisualStudio.Web.AzureFunctions | 17.11.35102.94 | -| Component.Microsoft.Web.LibraryManager | 17.11.35102.94 | -| Component.Microsoft.WebTools.BrowserLink.WebLivePreview | 17.11.3.50567 | +| Component.Microsoft.VisualStudio.Web.AzureFunctions | 17.12.35410.122 | +| Component.Microsoft.Web.LibraryManager | 17.12.35410.122 | +| Component.Microsoft.WebTools.BrowserLink.WebLivePreview | 17.12.8.55161 | | Component.Microsoft.Windows.DriverKit | 10.0.26100.10 | -| Component.OpenJDK | 17.11.35102.94 | -| Component.UnityEngine.x64 | 17.11.35102.94 | -| Component.Unreal | 17.11.35102.94 | -| Component.Unreal.Android | 17.11.35102.94 | -| Component.Unreal.Ide | 17.11.35102.94 | -| Component.VisualStudio.GitHub.Copilot | 17.11.35324.167 | +| Component.OpenJDK | 17.12.35410.122 | +| Component.UnityEngine.x64 | 17.12.35410.122 | +| Component.Unreal | 17.12.35410.122 | +| Component.Unreal.Android | 17.12.35410.122 | +| Component.Unreal.Ide | 17.12.35410.122 | +| Component.VisualStudio.GitHub.Copilot | 17.12.35504.99 | | Component.VSInstallerProjects2022 | 2.0.1 | | Component.WixToolset.VisualStudioExtension.Dev17 | 1.0.0.22 | | Component.WixToolset.VisualStudioExtension.Schemas3 | 1.0.0.22 | -| Component.Xamarin | 17.11.35102.94 | -| Component.Xamarin.RemotedSimulator | 17.11.35102.94 | -| ios | 18.0.8303.0 | -| maccatalyst | 18.0.8303.0 | -| maui.blazor | 8.0.82.11329 | -| maui.core | 8.0.82.11329 | -| maui.windows | 8.0.82.11329 | -| Microsoft.Component.Azure.DataLake.Tools | 17.11.35102.94 | -| Microsoft.Component.ClickOnce | 17.11.35102.94 | -| Microsoft.Component.CodeAnalysis.SDK | 17.11.35102.94 | -| Microsoft.Component.MSBuild | 17.11.35102.94 | -| Microsoft.Component.NetFX.Native | 17.11.35102.94 | -| Microsoft.Component.PythonTools | 17.11.35102.94 | -| Microsoft.Component.PythonTools.Web | 17.11.35102.94 | -| Microsoft.Component.VC.Runtime.UCRTSDK | 17.11.35102.94 | -| Microsoft.ComponentGroup.Blend | 17.11.35102.94 | -| Microsoft.ComponentGroup.ClickOnce.Publish | 17.11.35102.94 | -| Microsoft.Net.Component.4.5.2.TargetingPack | 17.11.35102.94 | -| Microsoft.Net.Component.4.6.2.TargetingPack | 17.11.35102.94 | -| Microsoft.Net.Component.4.6.TargetingPack | 17.11.35102.94 | -| Microsoft.Net.Component.4.7.1.TargetingPack | 17.11.35102.94 | -| Microsoft.Net.Component.4.7.2.TargetingPack | 17.11.35102.94 | -| Microsoft.Net.Component.4.7.TargetingPack | 17.11.35102.94 | -| Microsoft.Net.Component.4.8.1.SDK | 17.11.35102.94 | -| Microsoft.Net.Component.4.8.1.TargetingPack | 17.11.35102.94 | -| Microsoft.Net.Component.4.8.SDK | 17.11.35102.94 | -| Microsoft.Net.Component.4.8.TargetingPack | 17.11.35102.94 | -| Microsoft.Net.ComponentGroup.4.8.DeveloperTools | 17.11.35102.94 | -| Microsoft.Net.ComponentGroup.DevelopmentPrerequisites | 17.11.35102.94 | -| Microsoft.Net.ComponentGroup.TargetingPacks.Common | 17.11.35102.94 | -| microsoft.net.runtime.android | 8.0.1024.46610 | -| microsoft.net.runtime.android.aot | 8.0.1024.46610 | -| microsoft.net.runtime.android.aot.net7 | 8.0.1024.46610 | -| microsoft.net.runtime.android.net7 | 8.0.1024.46610 | -| microsoft.net.runtime.ios | 8.0.1024.46610 | -| microsoft.net.runtime.ios.net7 | 8.0.1024.46610 | -| microsoft.net.runtime.maccatalyst | 8.0.1024.46610 | -| microsoft.net.runtime.maccatalyst.net7 | 8.0.1024.46610 | -| microsoft.net.runtime.mono.tooling | 8.0.1024.46610 | -| microsoft.net.runtime.mono.tooling.net7 | 8.0.1024.46610 | -| microsoft.net.sdk.emscripten | 8.0.10.45201 | -| Microsoft.NetCore.Component.DevelopmentTools | 17.11.35102.94 | -| Microsoft.NetCore.Component.Runtime.6.0 | 17.11.35326.176 | -| Microsoft.NetCore.Component.Runtime.8.0 | 17.11.35326.176 | -| Microsoft.NetCore.Component.SDK | 17.11.35326.176 | -| Microsoft.NetCore.Component.Web | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.AppInsights.Tools | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.AspNet | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.AspNet45 | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.Azure.AuthoringTools | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.Azure.ClientLibs | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.Azure.Compute.Emulator | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.Azure.Powershell | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.Azure.ResourceManager.Tools | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.Azure.ServiceFabric.Tools | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.Azure.Waverton | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.Azure.Waverton.BuildTools | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.ClassDesigner | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.CodeMap | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.Common.Azure.Tools | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.CoreEditor | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.CppBuildInsights | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.Debugger.JustInTime | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.Debugger.Snapshot | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.DiagnosticTools | 17.11.35118.42 | -| Microsoft.VisualStudio.Component.DockerTools | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.DotNetModelBuilder | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.DslTools | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.Embedded | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.EntityFramework | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.FSharp | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.FSharp.Desktop | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.FSharp.WebTemplates | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.GraphDocument | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.Graphics | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.Graphics.Tools | 17.11.35118.42 | -| Microsoft.VisualStudio.Component.HLSL | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.IISExpress | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.IntelliCode | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.IntelliTrace.FrontEnd | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.JavaScript.Diagnostics | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.JavaScript.TypeScript | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.LinqToSql | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.LiveUnitTesting | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.ManagedDesktop.Core | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.ManagedDesktop.Prerequisites | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.Merq | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.MonoDebugger | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.MSODBC.SQL | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.MSSQL.CMDLnUtils | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.Node.Tools | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.NuGet | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.NuGet.BuildTools | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.PortableLibrary | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.Roslyn.Compiler | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.Roslyn.LanguageServices | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.SecurityIssueAnalysis | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.Sharepoint.Tools | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.SQL.CLR | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.SQL.DataSources | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.SQL.LocalDB.Runtime | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.SQL.SSDT | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.TeamOffice | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.TestTools.CodedUITest | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.TestTools.WebLoadTest | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.TextTemplating | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.TypeScript.TSServer | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.Unity | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.UWP.VC.ARM64 | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.UWP.VC.ARM64EC | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM64 | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.VC.ASAN | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.VC.ATL | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.VC.ATL.ARM | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.VC.ATL.ARM.Spectre | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.VC.ATL.ARM64 | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.VC.ATL.ARM64.Spectre | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.VC.ATL.Spectre | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.VC.ATLMFC | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.VC.ATLMFC.Spectre | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.VC.CLI.Support | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.VC.CMake.Project | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.VC.CoreIde | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.VC.DiagnosticTools | 17.11.35118.42 | -| Microsoft.VisualStudio.Component.VC.Llvm.Clang | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.VC.Llvm.ClangToolset | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.VC.MFC.ARM | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.VC.MFC.ARM.Spectre | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.VC.MFC.ARM64 | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.VC.MFC.ARM64.Spectre | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.VC.Modules.x86.x64 | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.VC.Redist.14.Latest | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.VC.Redist.MSM | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.VC.Runtimes.ARM.Spectre | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.VC.Runtimes.ARM64.Spectre | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.VC.Runtimes.ARM64EC.Spectre | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.VC.Runtimes.x86.x64.Spectre | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.VC.TestAdapterForBoostTest | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.VC.TestAdapterForGoogleTest | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.VC.Tools.ARM | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.VC.Tools.ARM64 | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.VC.Tools.ARM64EC | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.VC.Tools.x86.x64 | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.Vcpkg | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.VSSDK | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.Wcf.Tooling | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.Web | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.WebDeploy | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.Windows10SDK | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.Windows10SDK.19041 | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.Windows10SDK.20348 | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.Windows11SDK.22000 | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.Windows11SDK.22621 | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.Windows11Sdk.WindowsPerformanceToolkit | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.Workflow | 17.11.35102.94 | -| Microsoft.VisualStudio.Component.WslDebugging | 17.11.35102.94 | -| Microsoft.VisualStudio.ComponentGroup.ArchitectureTools.Native | 17.11.35102.94 | -| Microsoft.VisualStudio.ComponentGroup.Azure.CloudServices | 17.11.35102.94 | -| Microsoft.VisualStudio.ComponentGroup.Azure.Prerequisites | 17.11.35102.94 | -| Microsoft.VisualStudio.ComponentGroup.Azure.ResourceManager.Tools | 17.11.35102.94 | -| Microsoft.VisualStudio.ComponentGroup.AzureFunctions | 17.11.35102.94 | -| Microsoft.VisualStudio.ComponentGroup.Maui.All | 17.11.35102.94 | -| Microsoft.VisualStudio.ComponentGroup.Maui.Android | 17.11.35102.94 | -| Microsoft.VisualStudio.ComponentGroup.Maui.Blazor | 17.11.35102.94 | -| Microsoft.VisualStudio.ComponentGroup.Maui.iOS | 17.11.35102.94 | -| Microsoft.VisualStudio.ComponentGroup.Maui.MacCatalyst | 17.11.35102.94 | -| Microsoft.VisualStudio.ComponentGroup.Maui.Shared | 17.11.35102.94 | -| Microsoft.VisualStudio.ComponentGroup.Maui.Windows | 17.11.35102.94 | -| Microsoft.VisualStudio.ComponentGroup.MSIX.Packaging | 17.11.35102.94 | -| Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core | 17.11.35102.94 | -| Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Llvm.Clang | 17.11.35102.94 | -| Microsoft.VisualStudio.ComponentGroup.UWP.NetCoreAndStandard | 17.11.35102.94 | -| Microsoft.VisualStudio.ComponentGroup.UWP.VC.v142 | 17.11.35102.94 | -| Microsoft.VisualStudio.ComponentGroup.VC.Tools.142.x86.x64 | 17.11.35102.94 | -| Microsoft.VisualStudio.ComponentGroup.VisualStudioExtension.Prerequisites | 17.11.35102.94 | -| Microsoft.VisualStudio.ComponentGroup.Web | 17.11.35102.94 | -| Microsoft.VisualStudio.ComponentGroup.Web.CloudTools | 17.11.35102.94 | -| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions | 17.11.35102.94 | -| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.CMake | 17.11.35102.94 | -| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.TemplateEngine | 17.11.35102.94 | -| Microsoft.VisualStudio.ComponentGroup.WindowsAppDevelopment.Prerequisites | 17.11.35102.94 | -| Microsoft.VisualStudio.ComponentGroup.WindowsAppSDK.Cs | 17.11.35102.94 | -| Microsoft.VisualStudio.Workload.Azure | 17.11.35102.94 | -| Microsoft.VisualStudio.Workload.CoreEditor | 17.11.35102.94 | -| Microsoft.VisualStudio.Workload.Data | 17.11.35102.94 | -| Microsoft.VisualStudio.Workload.DataScience | 17.11.35102.94 | -| Microsoft.VisualStudio.Workload.ManagedDesktop | 17.11.35102.94 | -| Microsoft.VisualStudio.Workload.ManagedGame | 17.11.35102.94 | -| Microsoft.VisualStudio.Workload.NativeCrossPlat | 17.11.35102.94 | -| Microsoft.VisualStudio.Workload.NativeDesktop | 17.11.35102.94 | -| Microsoft.VisualStudio.Workload.NativeGame | 17.11.35102.94 | -| Microsoft.VisualStudio.Workload.NativeMobile | 17.11.35102.94 | -| Microsoft.VisualStudio.Workload.NetCrossPlat | 17.11.35102.94 | -| Microsoft.VisualStudio.Workload.NetWeb | 17.11.35102.94 | -| Microsoft.VisualStudio.Workload.Node | 17.11.35102.94 | -| Microsoft.VisualStudio.Workload.Office | 17.11.35102.94 | -| Microsoft.VisualStudio.Workload.Python | 17.11.35102.94 | -| Microsoft.VisualStudio.Workload.Universal | 17.11.35102.94 | -| Microsoft.VisualStudio.Workload.VisualStudioExtension | 17.11.35102.94 | -| runtimes.ios | 8.0.1024.46610 | -| runtimes.ios.net7 | 8.0.1024.46610 | -| runtimes.maccatalyst | 8.0.1024.46610 | -| runtimes.maccatalyst.net7 | 8.0.1024.46610 | -| wasm.tools | 8.0.1024.46610 | +| Component.Xamarin | 17.12.35410.122 | +| Component.Xamarin.RemotedSimulator | 17.12.35410.122 | +| ios | 18.0.9617.0 | +| maccatalyst | 18.0.9617.0 | +| maui.blazor | 9.0.0.11787 | +| maui.core | 9.0.0.11787 | +| maui.windows | 9.0.0.11787 | +| Microsoft.Component.Azure.DataLake.Tools | 17.12.35410.122 | +| Microsoft.Component.ClickOnce | 17.12.35410.122 | +| Microsoft.Component.CodeAnalysis.SDK | 17.12.35410.122 | +| Microsoft.Component.MSBuild | 17.12.35410.122 | +| Microsoft.Component.NetFX.Native | 17.12.35410.122 | +| Microsoft.Component.PythonTools | 17.12.35410.122 | +| Microsoft.Component.PythonTools.Web | 17.12.35410.122 | +| Microsoft.Component.VC.Runtime.UCRTSDK | 17.12.35410.122 | +| Microsoft.ComponentGroup.Blend | 17.12.35410.122 | +| Microsoft.ComponentGroup.ClickOnce.Publish | 17.12.35410.122 | +| Microsoft.Net.Component.4.5.2.TargetingPack | 17.12.35410.122 | +| Microsoft.Net.Component.4.6.2.TargetingPack | 17.12.35410.122 | +| Microsoft.Net.Component.4.6.TargetingPack | 17.12.35410.122 | +| Microsoft.Net.Component.4.7.1.TargetingPack | 17.12.35410.122 | +| Microsoft.Net.Component.4.7.2.TargetingPack | 17.12.35410.122 | +| Microsoft.Net.Component.4.7.TargetingPack | 17.12.35410.122 | +| Microsoft.Net.Component.4.8.1.SDK | 17.12.35410.122 | +| Microsoft.Net.Component.4.8.1.TargetingPack | 17.12.35410.122 | +| Microsoft.Net.Component.4.8.SDK | 17.12.35410.122 | +| Microsoft.Net.Component.4.8.TargetingPack | 17.12.35410.122 | +| Microsoft.Net.ComponentGroup.4.8.DeveloperTools | 17.12.35410.122 | +| Microsoft.Net.ComponentGroup.DevelopmentPrerequisites | 17.12.35410.122 | +| Microsoft.Net.ComponentGroup.TargetingPacks.Common | 17.12.35410.122 | +| microsoft.net.runtime.android | 9.0.24.52809 | +| microsoft.net.runtime.android.aot | 9.0.24.52809 | +| microsoft.net.runtime.android.aot.net8 | 9.0.24.52809 | +| microsoft.net.runtime.android.net8 | 9.0.24.52809 | +| microsoft.net.runtime.ios | 9.0.24.52809 | +| microsoft.net.runtime.ios.net8 | 9.0.24.52809 | +| microsoft.net.runtime.maccatalyst | 9.0.24.52809 | +| microsoft.net.runtime.maccatalyst.net8 | 9.0.24.52809 | +| microsoft.net.runtime.mono.tooling | 9.0.24.52809 | +| microsoft.net.runtime.mono.tooling.net8 | 9.0.24.52809 | +| microsoft.net.sdk.emscripten | 9.0.11.2802 | +| Microsoft.NetCore.Component.DevelopmentTools | 17.12.35410.122 | +| Microsoft.NetCore.Component.Runtime.6.0 | 17.12.35504.99 | +| Microsoft.NetCore.Component.Runtime.8.0 | 17.12.35504.99 | +| Microsoft.NetCore.Component.Runtime.9.0 | 17.12.35504.99 | +| Microsoft.NetCore.Component.SDK | 17.12.35504.99 | +| Microsoft.NetCore.Component.Web | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.AppInsights.Tools | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.AspNet | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.AspNet45 | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.Azure.AuthoringTools | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.Azure.ClientLibs | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.Azure.Compute.Emulator | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.Azure.Powershell | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.Azure.ResourceManager.Tools | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.Azure.ServiceFabric.Tools | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.Azure.Waverton | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.Azure.Waverton.BuildTools | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.ClassDesigner | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.CodeMap | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.Common.Azure.Tools | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.CoreEditor | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.CppBuildInsights | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.Debugger.JustInTime | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.Debugger.Snapshot | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.DiagnosticTools | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.DockerTools | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.DotNetModelBuilder | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.DslTools | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.Embedded | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.EntityFramework | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.FSharp | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.FSharp.Desktop | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.FSharp.WebTemplates | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.GraphDocument | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.Graphics | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.Graphics.Tools | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.HLSL | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.IISExpress | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.IntelliCode | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.IntelliTrace.FrontEnd | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.JavaScript.Diagnostics | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.JavaScript.TypeScript | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.LinqToSql | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.LiveUnitTesting | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.ManagedDesktop.Core | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.ManagedDesktop.Prerequisites | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.Merq | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.MonoDebugger | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.MSODBC.SQL | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.MSSQL.CMDLnUtils | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.Node.Tools | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.NuGet | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.NuGet.BuildTools | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.PortableLibrary | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.Roslyn.Compiler | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.Roslyn.LanguageServices | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.Sharepoint.Tools | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.SQL.CLR | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.SQL.DataSources | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.SQL.LocalDB.Runtime | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.SQL.SSDT | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.TeamOffice | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.TestTools.CodedUITest | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.TestTools.WebLoadTest | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.TextTemplating | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.TypeScript.TSServer | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.Unity | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.UWP.VC.ARM64 | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.UWP.VC.ARM64EC | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM64 | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.VC.ASAN | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.VC.ATL | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.VC.ATL.ARM | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.VC.ATL.ARM.Spectre | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.VC.ATL.ARM64 | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.VC.ATL.ARM64.Spectre | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.VC.ATL.Spectre | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.VC.ATLMFC | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.VC.ATLMFC.Spectre | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.VC.CLI.Support | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.VC.CMake.Project | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.VC.CoreIde | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.VC.DiagnosticTools | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.VC.Llvm.Clang | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.VC.Llvm.ClangToolset | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.VC.MFC.ARM | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.VC.MFC.ARM.Spectre | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.VC.MFC.ARM64 | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.VC.MFC.ARM64.Spectre | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.VC.Modules.x86.x64 | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.VC.Redist.14.Latest | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.VC.Redist.MSM | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.VC.Runtimes.ARM.Spectre | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.VC.Runtimes.ARM64.Spectre | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.VC.Runtimes.ARM64EC.Spectre | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.VC.Runtimes.x86.x64.Spectre | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.VC.TestAdapterForBoostTest | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.VC.TestAdapterForGoogleTest | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.VC.Tools.ARM | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.VC.Tools.ARM64 | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.VC.Tools.ARM64EC | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.VC.Tools.x86.x64 | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.Vcpkg | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.VSSDK | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.Wcf.Tooling | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.Web | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.WebDeploy | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.Windows10SDK | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.Windows10SDK.19041 | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.Windows10SDK.20348 | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.Windows11SDK.22000 | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.Windows11SDK.22621 | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.Windows11SDK.26100 | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.Windows11Sdk.WindowsPerformanceToolkit | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.WindowsAppSdkSupport.CSharp | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.Workflow | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.WslDebugging | 17.12.35410.122 | +| Microsoft.VisualStudio.ComponentGroup.ArchitectureTools.Native | 17.12.35410.122 | +| Microsoft.VisualStudio.ComponentGroup.Azure.CloudServices | 17.12.35410.122 | +| Microsoft.VisualStudio.ComponentGroup.Azure.Prerequisites | 17.12.35410.122 | +| Microsoft.VisualStudio.ComponentGroup.Azure.ResourceManager.Tools | 17.12.35410.122 | +| Microsoft.VisualStudio.ComponentGroup.AzureFunctions | 17.12.35410.122 | +| Microsoft.VisualStudio.ComponentGroup.Maui.All | 17.12.35410.122 | +| Microsoft.VisualStudio.ComponentGroup.Maui.Android | 17.12.35410.122 | +| Microsoft.VisualStudio.ComponentGroup.Maui.Blazor | 17.12.35410.122 | +| Microsoft.VisualStudio.ComponentGroup.Maui.iOS | 17.12.35410.122 | +| Microsoft.VisualStudio.ComponentGroup.Maui.MacCatalyst | 17.12.35410.122 | +| Microsoft.VisualStudio.ComponentGroup.Maui.Shared | 17.12.35410.122 | +| Microsoft.VisualStudio.ComponentGroup.Maui.Windows | 17.12.35410.122 | +| Microsoft.VisualStudio.ComponentGroup.MSIX.Packaging | 17.12.35410.122 | +| Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core | 17.12.35410.122 | +| Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Llvm.Clang | 17.12.35410.122 | +| Microsoft.VisualStudio.ComponentGroup.UWP.NetCoreAndStandard | 17.12.35410.122 | +| Microsoft.VisualStudio.ComponentGroup.UWP.VC.v142 | 17.12.35410.122 | +| Microsoft.VisualStudio.ComponentGroup.VC.Tools.142.x86.x64 | 17.12.35410.122 | +| Microsoft.VisualStudio.ComponentGroup.VisualStudioExtension.Prerequisites | 17.12.35410.122 | +| Microsoft.VisualStudio.ComponentGroup.Web | 17.12.35410.122 | +| Microsoft.VisualStudio.ComponentGroup.Web.CloudTools | 17.12.35410.122 | +| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions | 17.12.35410.122 | +| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.CMake | 17.12.35410.122 | +| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.TemplateEngine | 17.12.35410.122 | +| Microsoft.VisualStudio.ComponentGroup.WindowsAppDevelopment.Prerequisites | 17.12.35410.122 | +| Microsoft.VisualStudio.ComponentGroup.WindowsAppSDK.Cs | 17.12.35410.122 | +| Microsoft.VisualStudio.Workload.Azure | 17.12.35410.122 | +| Microsoft.VisualStudio.Workload.CoreEditor | 17.12.35410.122 | +| Microsoft.VisualStudio.Workload.Data | 17.12.35410.122 | +| Microsoft.VisualStudio.Workload.DataScience | 17.12.35410.122 | +| Microsoft.VisualStudio.Workload.ManagedDesktop | 17.12.35410.122 | +| Microsoft.VisualStudio.Workload.ManagedGame | 17.12.35410.122 | +| Microsoft.VisualStudio.Workload.NativeCrossPlat | 17.12.35410.122 | +| Microsoft.VisualStudio.Workload.NativeDesktop | 17.12.35410.122 | +| Microsoft.VisualStudio.Workload.NativeGame | 17.12.35410.122 | +| Microsoft.VisualStudio.Workload.NativeMobile | 17.12.35410.122 | +| Microsoft.VisualStudio.Workload.NetCrossPlat | 17.12.35410.122 | +| Microsoft.VisualStudio.Workload.NetWeb | 17.12.35504.99 | +| Microsoft.VisualStudio.Workload.Node | 17.12.35410.122 | +| Microsoft.VisualStudio.Workload.Office | 17.12.35410.122 | +| Microsoft.VisualStudio.Workload.Python | 17.12.35410.122 | +| Microsoft.VisualStudio.Workload.Universal | 17.12.35410.122 | +| Microsoft.VisualStudio.Workload.VisualStudioExtension | 17.12.35410.122 | +| runtimes.ios | 9.0.24.52809 | +| runtimes.ios.net8 | 9.0.24.52809 | +| runtimes.maccatalyst | 9.0.24.52809 | +| runtimes.maccatalyst.net8 | 9.0.24.52809 | +| wasm.tools | 9.0.24.52809 | | ProBITools.MicrosoftAnalysisServicesModelingProjects2022 | 3.0.4 | | ProBITools.MicrosoftReportProjectsforVisualStudio2022 | 3.0.1 | | SSIS.MicrosoftDataToolsIntegrationServices | 1.5 | | VisualStudioClient.MicrosoftVisualStudio2022InstallerProjects | 2.0.1 | -| Windows Driver Kit | 10.1.22621.2428 | +| Windows Driver Kit | 10.1.26100.2161 | | Windows Driver Kit Visual Studio Extension | 10.0.26100.10 | -| Windows Software Development Kit | 10.1.22621.3233 | +| Windows Software Development Kit | 10.1.26100.1742 | | WixToolset.WixToolsetVisualStudio2022Extension | 1.0.0.22 | #### Microsoft Visual C++ @@ -468,12 +476,12 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | -------------------------------------------- | ------------ | ----------- | | Microsoft Visual C++ 2013 Additional Runtime | x64 | 12.0.40660 | | Microsoft Visual C++ 2013 Minimum Runtime | x64 | 12.0.40660 | -| Microsoft Visual C++ 2022 Additional Runtime | x64 | 14.40.33816 | -| Microsoft Visual C++ 2022 Debug Runtime | x64 | 14.40.33816 | -| Microsoft Visual C++ 2022 Minimum Runtime | x64 | 14.40.33816 | -| Microsoft Visual C++ 2022 Additional Runtime | x86 | 14.40.33816 | -| Microsoft Visual C++ 2022 Debug Runtime | x86 | 14.40.33816 | -| Microsoft Visual C++ 2022 Minimum Runtime | x86 | 14.40.33816 | +| Microsoft Visual C++ 2022 Additional Runtime | x64 | 14.42.34433 | +| Microsoft Visual C++ 2022 Debug Runtime | x64 | 14.42.34433 | +| Microsoft Visual C++ 2022 Minimum Runtime | x64 | 14.42.34433 | +| Microsoft Visual C++ 2022 Additional Runtime | x86 | 14.42.34433 | +| Microsoft Visual C++ 2022 Debug Runtime | x86 | 14.42.34433 | +| Microsoft Visual C++ 2022 Minimum Runtime | x86 | 14.42.34433 | #### Installed Windows SDKs - 10.0.17763.0 @@ -481,17 +489,18 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 10.0.20348.0 - 10.0.22000.0 - 10.0.22621.0 +- 10.0.26100.0 ### .NET Core Tools -- .NET Core SDK: 6.0.135, 6.0.203, 6.0.321, 6.0.427, 7.0.120, 7.0.203, 7.0.317, 7.0.410, 8.0.403 +- .NET Core SDK: 6.0.136, 6.0.203, 6.0.321, 6.0.428, 7.0.120, 7.0.203, 7.0.317, 7.0.410, 8.0.111, 8.0.206, 8.0.307, 8.0.404, 9.0.100 - .NET Framework: 4.8, 4.8.1 -- Microsoft.AspNetCore.App: 6.0.5, 6.0.26, 6.0.35, 7.0.5, 7.0.20, 8.0.10 -- Microsoft.NETCore.App: 6.0.5, 6.0.26, 6.0.35, 7.0.5, 7.0.20, 8.0.10 -- Microsoft.WindowsDesktop.App: 6.0.5, 6.0.26, 6.0.35, 7.0.5, 7.0.20, 8.0.10 +- Microsoft.AspNetCore.App: 6.0.5, 6.0.26, 6.0.35, 6.0.36, 7.0.5, 7.0.20, 8.0.6, 8.0.11, 9.0.0 +- Microsoft.NETCore.App: 6.0.5, 6.0.26, 6.0.35, 6.0.36, 7.0.5, 7.0.20, 8.0.6, 8.0.11, 9.0.0 +- Microsoft.WindowsDesktop.App: 6.0.5, 6.0.26, 6.0.36, 7.0.5, 7.0.20, 8.0.6, 8.0.11, 9.0.0 - nbgv 3.6.146+392592327a ### PowerShell Tools -- PowerShell 7.4.5 +- PowerShell 7.4.6 #### Powershell Modules - Az: 12.1.0 @@ -499,7 +508,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - AzureRM: 2.1.0 (Default), 6.13.1 - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.681 +- AWSPowershell: 4.1.696 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.10 - Microsoft.Graph: 2.24.0 @@ -542,8 +551,9 @@ All other versions are saved but not installed. ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2022 | sha256:38ceb8f584148d16a638a7f978619f2589bd2e2d911a68798b38f4d2d0b09d36 | 2024-10-08 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2022 | sha256:95359c2a92f98eef3f3952afd7bc3dcf3025d07b10fe18b6eff9c6773bb2b79b | 2024-10-08 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:155aa2394cae80b97825b3b66b2e93e723eb91507cc211ea011db1d362dfe935 | 2024-10-08 | -| mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:f59e2f21720e4d1192e0dde47e32c7dbf27144d52d79be14b2538fa07145c869 | 2024-10-06 | -| mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:134a4de6ea1c905b526e24819ca3756c7897853c1c7fa2cfb48867f173f9f8e9 | 2024-10-06 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2022 | sha256:47cb8e127d15d489c8f8344b59aa46091ac155da400a204a9094a63dc6177f9f | 2024-11-12 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2022 | sha256:6ce38ea0a094cefdd0ef89b54c1492490c64dac1e34698ce3c15f9ccd53d8498 | 2024-11-12 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:6825e3532d36741b62ea87bd7fd984cf4eea0be568b6669f52cc211126e67f52 | 2024-11-12 | +| mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:be37c9e8bf388c4e3ef27b4a2592b94adab551e231644ce3c9d4d3dc0a50af41 | 2024-11-02 | +| mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:87837eac4a78e1c67a6f6db1333a57a1a39207549c689905bd69cce40d063d5d | 2024-11-02 | + From d0d851b2c288fcdf53e5e8f6032a2f66a4a3349e Mon Sep 17 00:00:00 2001 From: susmitamane <susmitamane@github.com> Date: Sat, 16 Nov 2024 09:57:15 +0530 Subject: [PATCH 3251/3485] [MacOS] Remove python 3.9/3.10 from macos13-ARM64 and macos14-ARM64 due to dependencies issue. (#10951) Co-authored-by: Susmita Mane <susmitamane@Susmitas-MacBook-Pro.local> --- images/macos/toolsets/toolset-13.json | 2 -- images/macos/toolsets/toolset-14.json | 2 -- 2 files changed, 4 deletions(-) diff --git a/images/macos/toolsets/toolset-13.json b/images/macos/toolsets/toolset-13.json index e423ffdb5c14..706383f5e956 100644 --- a/images/macos/toolsets/toolset-13.json +++ b/images/macos/toolsets/toolset-13.json @@ -133,8 +133,6 @@ }, "arm64": { "versions": [ - "3.9.*", - "3.10.*", "3.11.*", "3.12.*", "3.13.*" diff --git a/images/macos/toolsets/toolset-14.json b/images/macos/toolsets/toolset-14.json index f8fc9eef3a1b..49c14521d0e5 100644 --- a/images/macos/toolsets/toolset-14.json +++ b/images/macos/toolsets/toolset-14.json @@ -136,8 +136,6 @@ }, "arm64": { "versions": [ - "3.9.*", - "3.10.*", "3.11.*", "3.12.*", "3.13.*" From 5934916ad9a6eaaad02cfa5f7371471991f12406 Mon Sep 17 00:00:00 2001 From: susmitamane <susmitamane@github.com> Date: Sat, 16 Nov 2024 09:57:47 +0530 Subject: [PATCH 3252/3485] [MacOS] Remove node 16 from macos13 as per support policy. (#10952) Co-authored-by: Susmita Mane <susmitamane@Susmitas-MacBook-Pro.local> --- images/macos/toolsets/toolset-13.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/images/macos/toolsets/toolset-13.json b/images/macos/toolsets/toolset-13.json index 706383f5e956..3d1908ed396b 100644 --- a/images/macos/toolsets/toolset-13.json +++ b/images/macos/toolsets/toolset-13.json @@ -162,7 +162,6 @@ "arch": { "x64": { "versions": [ - "16.*", "18.*", "20.*", "22.*" @@ -170,7 +169,6 @@ }, "arm64": { "versions": [ - "16.*", "18.*", "20.*", "22.*" From 277110d088bd3467abf2025fa9f10ce6838873ea Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 16 Nov 2024 11:51:19 +0000 Subject: [PATCH 3253/3485] Updating readme file for macos-13 version 20241108.324 (#10939) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-13-Readme.md | 82 +++++++++++++++++---------------- 1 file changed, 42 insertions(+), 40 deletions(-) diff --git a/images/macos/macos-13-Readme.md b/images/macos/macos-13-Readme.md index 714f26a0d2b0..47e1ebe07b15 100644 --- a/images/macos/macos-13-Readme.md +++ b/images/macos/macos-13-Readme.md @@ -1,5 +1,6 @@ | Announcements | |-| +| [[ macOS ] Node.js version 16 will be removed from macOS13 and macOS13 arm64 images on November, 18.](https://github.com/actions/runner-images/issues/10873) | | [[macOS] OpenSSL 1.1 will be removed and OpenSSL 3 will be the default for all macOS images from November 4](https://github.com/actions/runner-images/issues/10817) | | [[macOS] Python 3.9 and 3.10 will be removed from macOS13 arm64 and macOS14 arm64 on November 18.](https://github.com/actions/runner-images/issues/10812) | | [[macOS] The macOS 12 Actions runner image will begin deprecation on 10/7/24 and will be fully unsupported by 12/3/24 for GitHub and ADO](https://github.com/actions/runner-images/issues/10721) | @@ -7,9 +8,9 @@ | [macOS 15 (Sequoia) is now available as a public beta in GitHub Actions](https://github.com/actions/runner-images/issues/10686) | *** # macOS 13 -- OS Version: macOS 13.7 (22H123) +- OS Version: macOS 13.7.1 (22H221) - Kernel Version: Darwin 22.6.0 -- Image Version: 20241023.237 +- Image Version: 20241108.324 ## Installed Software @@ -20,30 +21,30 @@ - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` - GCC 12 (Homebrew GCC 12.4.0) - available by `gcc-12` alias - GCC 13 (Homebrew GCC 13.3.0) - available by `gcc-13` alias -- GCC 14 (Homebrew GCC 14.2.0) - available by `gcc-14` alias +- GCC 14 (Homebrew GCC 14.2.0_1) - available by `gcc-14` alias - GNU Fortran 12 (Homebrew GCC 12.4.0) - available by `gfortran-12` alias - GNU Fortran 13 (Homebrew GCC 13.3.0) - available by `gfortran-13` alias -- GNU Fortran 14 (Homebrew GCC 14.2.0) - available by `gfortran-14` alias +- GNU Fortran 14 (Homebrew GCC 14.2.0_1) - available by `gfortran-14` alias - Kotlin 2.0.21-release-482 - Mono 6.12.0.188 - Node.js 20.18.0 - Perl 5.40.0 -- PHP 8.3.12 +- PHP 8.3.13 - Python3 3.13.0 - Ruby 3.0.7p220 ### Package Management -- Bundler 2.5.22 +- Bundler 2.5.23 - Carthage 0.40.0 -- CocoaPods 1.15.2 -- Composer 2.8.1 -- Homebrew 4.4.2 +- CocoaPods 1.16.2 +- Composer 2.8.2 +- Homebrew 4.4.4 - NPM 10.8.2 - NuGet 6.3.1.1 -- Pip3 24.2 (python 3.13) +- Pip3 24.3.1 (python 3.13) - Pipx 1.7.1 -- RubyGems 3.5.22 -- Vcpkg 2024 (build from commit edc84ff66) +- RubyGems 3.5.23 +- Vcpkg 2024 (build from commit 6046e4816) - Yarn 1.22.22 ### Project Management @@ -56,51 +57,52 @@ - aria2 1.37.0 - azcopy 10.26.0 - bazel 7.4.0 -- bazelisk 1.22.1 +- bazelisk 1.23.0 - bsdtar 3.5.3 - available by 'tar' alias -- Curl 8.10.1 +- Curl 8.11.0 - Git 2.47.0 - Git LFS 3.5.1 -- GitHub CLI 2.59.0 +- GitHub CLI 2.61.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.24.5 -- gpg (GnuPG) 2.4.5 +- gpg (GnuPG) 2.4.6 - jq 1.7.1 - OpenSSL 1.1.1w 11 Sep 2023 - Packer 1.11.2 - pkg-config 0.29.2 +- Unxip 3.1 - yq 4.44.3 - zstd 1.5.6 ### Tools -- AWS CLI 2.18.12 -- AWS SAM CLI 1.126.0 -- AWS Session Manager CLI 1.2.677.0 +- AWS CLI 2.19.3 +- AWS SAM CLI 1.127.0 +- AWS Session Manager CLI 1.2.688.0 - Azure CLI 2.65.0 - Azure CLI (azure-devops) 1.0.1 -- Bicep CLI 0.30.23 -- Cmake 3.30.5 -- CodeQL Action Bundle 2.19.2 +- Bicep CLI 0.31.34 +- Cmake 3.31.0 +- CodeQL Action Bundle 2.19.3 - Fastlane 2.225.0 - SwiftFormat 0.54.6 - Xcbeautify 2.14.1 - Xcode Command Line Tools 14.3.1.0.1.1683849156 -- Xcodes 1.5.0 +- Xcodes 1.6.0 ### Linters - SwiftLint 0.57.0 ### Browsers -- Safari 18.0.1 (18619.1.26.111.11) -- SafariDriver 18.0.1 (18619.1.26.111.11) -- Google Chrome 130.0.6723.70 -- Google Chrome for Testing 130.0.6723.69 -- ChromeDriver 130.0.6723.69 -- Microsoft Edge 130.0.2849.52 -- Microsoft Edge WebDriver 130.0.2849.50 -- Mozilla Firefox 131.0.3 +- Safari 18.1 (18619.2.8.111.5) +- SafariDriver 18.1 (18619.2.8.111.5) +- Google Chrome 130.0.6723.117 +- Google Chrome for Testing 130.0.6723.116 +- ChromeDriver 130.0.6723.116 +- Microsoft Edge 130.0.2849.80 +- Microsoft Edge WebDriver 130.0.2849.81 +- Mozilla Firefox 132.0.1 - geckodriver 0.35.0 -- Selenium server 4.25.0 +- Selenium server 4.26.0 #### Environment variables | Name | Value | @@ -129,8 +131,8 @@ #### Ruby - 3.0.7 - 3.1.6 -- 3.2.5 -- 3.3.5 +- 3.2.6 +- 3.3.6 #### Python - 3.8.18 @@ -144,12 +146,12 @@ - 16.20.2 - 18.20.4 - 20.18.0 -- 22.10.0 +- 22.11.0 #### Go - 1.21.13 -- 1.22.8 -- 1.23.2 +- 1.22.9 +- 1.23.3 ### Rust Tools - Cargo 1.82.0 @@ -162,7 +164,7 @@ - Rustfmt 1.7.1-stable ### PowerShell Tools -- PowerShell 7.4.5 +- PowerShell 7.4.6 #### PowerShell Modules - Az: 12.4.0 @@ -213,8 +215,8 @@ | Simulator - watchOS 9.4 | watchsimulator9.4 | 14.3.1 | | Simulator - watchOS 10.0 | watchsimulator10.0 | 15.0.1 | | Simulator - watchOS 10.2 | watchsimulator10.2 | 15.1, 15.2 | -| Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | | visionOS 1.0 | xros1.0 | 15.2 | +| Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | @@ -271,7 +273,7 @@ #### Environment variables | Name | Value | | ----------------- | ----------------------------------------------------------------------------------------- | -| PARALLELS_DMG_URL | https://download.parallels.com/desktop/v20/20.1.0-55732/ParallelsDesktop-20.1.0-55732.dmg | +| PARALLELS_DMG_URL | https://download.parallels.com/desktop/v20/20.1.1-55740/ParallelsDesktop-20.1.1-55740.dmg | ##### Notes ``` From 187f9f5904f424e3630fb8bd85907f37786c7d8b Mon Sep 17 00:00:00 2001 From: hemanthmanga <166606741+hemanthmanga@users.noreply.github.com> Date: Mon, 18 Nov 2024 15:17:42 +0530 Subject: [PATCH 3254/3485] [Windows] Adding Dotnet latest version 9.0 (#10976) --- images/windows/toolsets/toolset-2019.json | 3 ++- images/windows/toolsets/toolset-2022.json | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/images/windows/toolsets/toolset-2019.json b/images/windows/toolsets/toolset-2019.json index 91c478bbe2e0..446e652c4b33 100644 --- a/images/windows/toolsets/toolset-2019.json +++ b/images/windows/toolsets/toolset-2019.json @@ -411,7 +411,8 @@ "versions": [ "6.0", "7.0", - "8.0" + "8.0", + "9.0" ], "tools": [ { "name": "nbgv", "test": "nbgv --version", "getversion": "nbgv --version" } diff --git a/images/windows/toolsets/toolset-2022.json b/images/windows/toolsets/toolset-2022.json index f8cd856f203b..e15af72cd5ac 100644 --- a/images/windows/toolsets/toolset-2022.json +++ b/images/windows/toolsets/toolset-2022.json @@ -321,7 +321,8 @@ "versions": [ "6.0", "7.0", - "8.0" + "8.0", + "9.0" ], "tools": [ { "name": "nbgv", "test": "nbgv --version", "getversion": "nbgv --version" } From c2ef078c787f9955229cdf4aaab11f864a80bf6c Mon Sep 17 00:00:00 2001 From: Prasanjit Sahoo <160633557+prasanjitsahoo@users.noreply.github.com> Date: Mon, 18 Nov 2024 16:07:17 +0530 Subject: [PATCH 3255/3485] [MacOS]Upgrade cmake to 3.31.0 (#10983) --- images/macos/toolsets/toolset-13.json | 2 +- images/macos/toolsets/toolset-14.json | 2 +- images/macos/toolsets/toolset-15.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/images/macos/toolsets/toolset-13.json b/images/macos/toolsets/toolset-13.json index 3d1908ed396b..101462e56944 100644 --- a/images/macos/toolsets/toolset-13.json +++ b/images/macos/toolsets/toolset-13.json @@ -42,7 +42,7 @@ ], "addons": [], "additional_tools": [ - "cmake;3.22.1" + "cmake;3.31.0" ], "ndk": { "default": "26", diff --git a/images/macos/toolsets/toolset-14.json b/images/macos/toolsets/toolset-14.json index 49c14521d0e5..7e48d56769ff 100644 --- a/images/macos/toolsets/toolset-14.json +++ b/images/macos/toolsets/toolset-14.json @@ -44,7 +44,7 @@ ], "addons": [], "additional_tools": [ - "cmake;3.22.1" + "cmake;3.31.0" ], "ndk": { "default": "26", diff --git a/images/macos/toolsets/toolset-15.json b/images/macos/toolsets/toolset-15.json index 6386bdc3e2aa..d1d7edd6b514 100644 --- a/images/macos/toolsets/toolset-15.json +++ b/images/macos/toolsets/toolset-15.json @@ -36,7 +36,7 @@ ], "addons": [], "additional_tools": [ - "cmake;3.22.1" + "cmake;3.31.0" ], "ndk": { "default": "27", From fd9befaf96024944543bda66054b384369bb35a7 Mon Sep 17 00:00:00 2001 From: sarathrajsrinivasan <159180023+sarathrajsrinivasan@users.noreply.github.com> Date: Mon, 18 Nov 2024 13:25:26 -0800 Subject: [PATCH 3256/3485] [macOS] Reverting changes to python 3.9 and 3.10 for macOS14 (#10996) --- images/macos/toolsets/toolset-14.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/images/macos/toolsets/toolset-14.json b/images/macos/toolsets/toolset-14.json index 7e48d56769ff..4367f851061b 100644 --- a/images/macos/toolsets/toolset-14.json +++ b/images/macos/toolsets/toolset-14.json @@ -136,6 +136,8 @@ }, "arm64": { "versions": [ + "3.9.*", + "3.10.*", "3.11.*", "3.12.*", "3.13.*" From c0b15886847bc55e8b5ca913ef6d4c2d6156ab32 Mon Sep 17 00:00:00 2001 From: Prabhatkumar59 <167855894+Prabhatkumar59@users.noreply.github.com> Date: Tue, 19 Nov 2024 20:33:49 +0530 Subject: [PATCH 3257/3485] adding latest 3.2 version (#10988) Co-authored-by: Prabhat kumar <prabhatkumar59@Prabhats-Laptop.local> --- images/ubuntu/toolsets/toolset-2404.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/images/ubuntu/toolsets/toolset-2404.json b/images/ubuntu/toolsets/toolset-2404.json index a4f7b857e6f7..fa71fd067422 100644 --- a/images/ubuntu/toolsets/toolset-2404.json +++ b/images/ubuntu/toolsets/toolset-2404.json @@ -49,7 +49,9 @@ "name": "Ruby", "platform_version": "24.04", "arch": "x64", - "versions": [] + "versions": [ + "3.2.*" + ] }, { "name": "CodeQL", From b20550951d8262feca23cde1cab46db257bc6ac0 Mon Sep 17 00:00:00 2001 From: sarathrajsrinivasan <159180023+sarathrajsrinivasan@users.noreply.github.com> Date: Tue, 19 Nov 2024 11:30:00 -0800 Subject: [PATCH 3258/3485] [macOS] Pin version for Az powershell module (#11006) --- images/macos/toolsets/toolset-13.json | 7 ++++++- images/macos/toolsets/toolset-14.json | 7 ++++++- images/macos/toolsets/toolset-15.json | 7 ++++++- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/images/macos/toolsets/toolset-13.json b/images/macos/toolsets/toolset-13.json index 101462e56944..2c38a66330ab 100644 --- a/images/macos/toolsets/toolset-13.json +++ b/images/macos/toolsets/toolset-13.json @@ -52,7 +52,12 @@ } }, "powershellModules": [ - { "name": "Az" }, + { + "name": "Az", + "versions": [ + "12.4.0" + ] + }, { "name": "Pester" }, { "name": "PSScriptAnalyzer" } ], diff --git a/images/macos/toolsets/toolset-14.json b/images/macos/toolsets/toolset-14.json index 4367f851061b..daf2e755fcd5 100644 --- a/images/macos/toolsets/toolset-14.json +++ b/images/macos/toolsets/toolset-14.json @@ -54,7 +54,12 @@ } }, "powershellModules": [ - { "name": "Az" }, + { + "name": "Az", + "versions": [ + "12.4.0" + ] + }, { "name": "Pester" }, { "name": "PSScriptAnalyzer" } ], diff --git a/images/macos/toolsets/toolset-15.json b/images/macos/toolsets/toolset-15.json index d1d7edd6b514..60f7d57a6a7b 100644 --- a/images/macos/toolsets/toolset-15.json +++ b/images/macos/toolsets/toolset-15.json @@ -46,7 +46,12 @@ } }, "powershellModules": [ - { "name": "Az" }, + { + "name": "Az", + "versions": [ + "12.4.0" + ] + }, { "name": "Pester" }, { "name": "PSScriptAnalyzer" } ], From cb9e36698dfd79acaeb5e5feca69afbf67a8815d Mon Sep 17 00:00:00 2001 From: kishorekumar-anchala <168699259+kishorekumar-anchala@users.noreply.github.com> Date: Wed, 20 Nov 2024 14:53:46 +0000 Subject: [PATCH 3259/3485] [Windows] Fix AzCli Signature and Install Azure CosmosDb Emulator thumbprint (#11004) * Fix azcli,cosmosdb and remove vscomponent * Update visual studio signature * revert toolset-2022.json changes --- images/windows/scripts/build/Install-AzureCli.ps1 | 2 +- images/windows/scripts/build/Install-AzureCosmosDbEmulator.ps1 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/images/windows/scripts/build/Install-AzureCli.ps1 b/images/windows/scripts/build/Install-AzureCli.ps1 index afe623608dea..22d22db0ff1a 100644 --- a/images/windows/scripts/build/Install-AzureCli.ps1 +++ b/images/windows/scripts/build/Install-AzureCli.ps1 @@ -15,7 +15,7 @@ New-Item -ItemType 'Directory' -Path $azureCliExtensionPath | Out-Null Install-Binary -Type MSI ` -Url 'https://aka.ms/installazurecliwindowsx64' ` - -ExpectedSignature '245D262748012A4FE6CE8BA6C951A4C4AFBC3E5D' + -ExpectedSignature '8F985BE8FD256085C90A95D3C74580511A1DB975' Update-Environment diff --git a/images/windows/scripts/build/Install-AzureCosmosDbEmulator.ps1 b/images/windows/scripts/build/Install-AzureCosmosDbEmulator.ps1 index 13772a42c3f9..dcd9015abe27 100644 --- a/images/windows/scripts/build/Install-AzureCosmosDbEmulator.ps1 +++ b/images/windows/scripts/build/Install-AzureCosmosDbEmulator.ps1 @@ -5,6 +5,6 @@ Install-Binary -Type MSI ` -Url "https://aka.ms/cosmosdb-emulator" ` - -ExpectedSHA256Sum "DB9D5E496C5FDAE17C12C03385D2BAC973DA61C280023D9FDC9A6020220BEE41" + -ExpectedSHA256Sum "1EF64CF9CD13C611AAC394113A703AF6F525C7C39BFB6B4C3F884D57F6F1D1CF" Invoke-PesterTests -TestFile "Tools" -TestName "Azure Cosmos DB Emulator" From 7a40bc62eb587f56c0a68dea83d45e4ea04861fe Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 20 Nov 2024 23:51:46 +0000 Subject: [PATCH 3260/3485] Updating readme file for macos-14 version 20241118.366 (#10993) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-14-Readme.md | 124 +++++++++++++++++++------------- 1 file changed, 76 insertions(+), 48 deletions(-) diff --git a/images/macos/macos-14-Readme.md b/images/macos/macos-14-Readme.md index 83b1aed0198b..9b315814d5b2 100644 --- a/images/macos/macos-14-Readme.md +++ b/images/macos/macos-14-Readme.md @@ -10,12 +10,12 @@ # macOS 14 - OS Version: macOS 14.7.1 (23H222) - Kernel Version: Darwin 23.6.0 -- Image Version: 20241108.322 +- Image Version: 20241118.366 ## Installed Software ### Language and Runtime -- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.410, 8.0.101, 8.0.204, 8.0.303, 8.0.403 +- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.410, 8.0.101, 8.0.204, 8.0.303, 8.0.404 - Bash 3.2.57(1)-release - Clang/LLVM 15.0.0 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` @@ -37,8 +37,8 @@ - Bundler 2.5.23 - Carthage 0.40.0 - CocoaPods 1.16.2 -- Composer 2.8.2 -- Homebrew 4.4.4 +- Composer 2.8.3 +- Homebrew 4.4.5 - NPM 10.8.2 - NuGet 6.3.1.1 - Pip3 24.3.1 (python 3.13) @@ -49,42 +49,42 @@ ### Project Management - Apache Ant 1.10.15 - Apache Maven 3.9.9 -- Gradle 8.10.2 +- Gradle 8.11 ### Utilities - 7-Zip 17.05 - aria2 1.37.0 -- azcopy 10.26.0 -- bazel 7.4.0 +- azcopy 10.27.1 +- bazel 7.4.1 - bazelisk 1.23.0 - bsdtar 3.5.3 - available by 'tar' alias - Curl 8.11.0 - Git 2.47.0 - Git LFS 3.5.1 -- GitHub CLI 2.61.0 +- GitHub CLI 2.62.0 - GNU Tar 1.35 - available by 'gtar' alias -- GNU Wget 1.24.5 +- GNU Wget 1.25.0 - gpg (GnuPG) 2.4.6 - jq 1.7.1 - OpenSSL 1.1.1w 11 Sep 2023 - Packer 1.11.2 - pkg-config 0.29.2 - Unxip 3.1 -- yq 4.44.3 +- yq 4.44.5 - zstd 1.5.6 ### Tools -- AWS CLI 2.19.3 -- AWS SAM CLI 1.127.0 +- AWS CLI 2.21.3 +- AWS SAM CLI 1.129.0 - AWS Session Manager CLI 1.2.688.0 -- Azure CLI 2.65.0 +- Azure CLI 2.66.0 - Azure CLI (azure-devops) 1.0.1 -- Bicep CLI 0.31.34 +- Bicep CLI 0.31.92 - Cmake 3.31.0 - CodeQL Action Bundle 2.19.3 - Fastlane 2.225.0 -- SwiftFormat 0.54.6 -- Xcbeautify 2.14.1 +- SwiftFormat 0.55.0 +- Xcbeautify 2.15.0 - Xcode Command Line Tools 16.1.0.0.1.1729049160 - Xcodes 1.6.0 @@ -94,12 +94,12 @@ ### Browsers - Safari 18.1 (19619.2.8.111.5) - SafariDriver 18.1 (19619.2.8.111.5) -- Google Chrome 130.0.6723.117 -- Google Chrome for Testing 130.0.6723.116 -- ChromeDriver 130.0.6723.116 -- Microsoft Edge 130.0.2849.80 -- Microsoft Edge WebDriver 130.0.2849.81 -- Mozilla Firefox 132.0.1 +- Google Chrome 131.0.6778.70 +- Google Chrome for Testing 131.0.6778.69 +- ChromeDriver 131.0.6778.69 +- Microsoft Edge 131.0.2903.51 +- Microsoft Edge WebDriver 131.0.2903.52 +- Mozilla Firefox 132.0.2 - geckodriver 0.35.0 - Selenium server 4.26.0 @@ -134,7 +134,7 @@ - 3.13.0 #### Node.js -- 18.20.4 +- 18.20.5 - 20.18.0 - 22.11.0 @@ -157,18 +157,20 @@ - PowerShell 7.4.6 #### PowerShell Modules -- Az: 12.4.0 +- Az: 12.5.0 - Pester: 5.6.1 - PSScriptAnalyzer: 1.23.0 ### Xcode -| Version | Build | Path | Symlinks | -| -------------- | ------- | ------------------------------ | --------------------------------------------------------- | -| 15.4 (default) | 15F31d | /Applications/Xcode_15.4.app | /Applications/Xcode_15.4.0.app<br>/Applications/Xcode.app | -| 15.3 | 15E204a | /Applications/Xcode_15.3.app | /Applications/Xcode_15.3.0.app | -| 15.2 | 15C500b | /Applications/Xcode_15.2.app | /Applications/Xcode_15.2.0.app | -| 15.1 | 15C65 | /Applications/Xcode_15.1.app | /Applications/Xcode_15.1.0.app | -| 15.0.1 | 15A507 | /Applications/Xcode_15.0.1.app | /Applications/Xcode_15.0.app | +| Version | Build | Path | Symlinks | +| -------------- | ------- | ------------------------------ | -------------------------------------------------------------- | +| 16.1 | 16B40 | /Applications/Xcode_16.1.app | /Applications/Xcode_16.1.0.app | +| 16.0 | 16A242d | /Applications/Xcode_16.app | /Applications/Xcode_16.0.0.app<br>/Applications/Xcode_16.0.app | +| 15.4 (default) | 15F31d | /Applications/Xcode_15.4.app | /Applications/Xcode_15.4.0.app<br>/Applications/Xcode.app | +| 15.3 | 15E204a | /Applications/Xcode_15.3.app | /Applications/Xcode_15.3.0.app | +| 15.2 | 15C500b | /Applications/Xcode_15.2.app | /Applications/Xcode_15.2.0.app | +| 15.1 | 15C65 | /Applications/Xcode_15.1.app | /Applications/Xcode_15.1.0.app | +| 15.0.1 | 15A507 | /Applications/Xcode_15.0.1.app | /Applications/Xcode_15.0.app | #### Installed SDKs | SDK | SDK Name | Xcode Version | @@ -177,56 +179,82 @@ | macOS 14.2 | macosx14.2 | 15.1, 15.2 | | macOS 14.4 | macosx14.4 | 15.3 | | macOS 14.5 | macosx14.5 | 15.4 | +| macOS 15.0 | macosx15.0 | 16.0 | +| macOS 15.1 | macosx15.1 | 16.1 | | iOS 17.0 | iphoneos17.0 | 15.0.1 | | iOS 17.2 | iphoneos17.2 | 15.1, 15.2 | | iOS 17.4 | iphoneos17.4 | 15.3 | | iOS 17.5 | iphoneos17.5 | 15.4 | +| iOS 18.0 | iphoneos18.0 | 16.0 | +| iOS 18.1 | iphoneos18.1 | 16.1 | | Simulator - iOS 17.0 | iphonesimulator17.0 | 15.0.1 | | Simulator - iOS 17.2 | iphonesimulator17.2 | 15.1, 15.2 | | Simulator - iOS 17.4 | iphonesimulator17.4 | 15.3 | | Simulator - iOS 17.5 | iphonesimulator17.5 | 15.4 | +| Simulator - iOS 18.0 | iphonesimulator18.0 | 16.0 | +| Simulator - iOS 18.1 | iphonesimulator18.1 | 16.1 | | tvOS 17.0 | appletvos17.0 | 15.0.1 | | tvOS 17.2 | appletvos17.2 | 15.1, 15.2 | | tvOS 17.4 | appletvos17.4 | 15.3 | | tvOS 17.5 | appletvos17.5 | 15.4 | +| tvOS 18.0 | appletvos18.0 | 16.0 | +| tvOS 18.1 | appletvos18.1 | 16.1 | | Simulator - tvOS 17.0 | appletvsimulator17.0 | 15.0.1 | | Simulator - tvOS 17.2 | appletvsimulator17.2 | 15.1, 15.2 | | Simulator - tvOS 17.4 | appletvsimulator17.4 | 15.3 | | Simulator - tvOS 17.5 | appletvsimulator17.5 | 15.4 | +| Simulator - tvOS 18.0 | appletvsimulator18.0 | 16.0 | +| Simulator - tvOS 18.1 | appletvsimulator18.1 | 16.1 | | watchOS 10.0 | watchos10.0 | 15.0.1 | | watchOS 10.2 | watchos10.2 | 15.1, 15.2 | | watchOS 10.4 | watchos10.4 | 15.3 | | watchOS 10.5 | watchos10.5 | 15.4 | +| watchOS 11.0 | watchos11.0 | 16.0 | +| watchOS 11.1 | watchos11.1 | 16.1 | | Simulator - watchOS 10.0 | watchsimulator10.0 | 15.0.1 | | Simulator - watchOS 10.2 | watchsimulator10.2 | 15.1, 15.2 | | Simulator - watchOS 10.4 | watchsimulator10.4 | 15.3 | | Simulator - watchOS 10.5 | watchsimulator10.5 | 15.4 | -| Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | +| Simulator - watchOS 11.0 | watchsimulator11.0 | 16.0 | +| Simulator - watchOS 11.1 | watchsimulator11.1 | 16.1 | | visionOS 1.0 | xros1.0 | 15.2 | -| Simulator - visionOS 1.1 | xrsimulator1.1 | 15.3 | +| Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | | visionOS 1.1 | xros1.1 | 15.3 | -| Simulator - visionOS 1.2 | xrsimulator1.2 | 15.4 | +| Simulator - visionOS 1.1 | xrsimulator1.1 | 15.3 | | visionOS 1.2 | xros1.2 | 15.4 | +| Simulator - visionOS 1.2 | xrsimulator1.2 | 15.4 | +| Simulator - visionOS 2.0 | xrsimulator2.0 | 16.0 | +| visionOS 2.0 | xros2.0 | 16.0 | +| Simulator - visionOS 2.1 | xrsimulator2.1 | 16.1 | +| visionOS 2.1 | xros2.1 | 16.1 | | DriverKit 23.0 | driverkit23.0 | 15.0.1 | | DriverKit 23.2 | driverkit23.2 | 15.1, 15.2 | | DriverKit 23.4 | driverkit23.4 | 15.3 | | DriverKit 23.5 | driverkit23.5 | 15.4 | +| DriverKit 24.0 | driverkit24.0 | 16.0 | +| DriverKit 24.1 | driverkit24.1 | 16.1 | #### Installed Simulators -| OS | Simulators | -| ------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | -| iOS 17.0 | iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 17.2 | iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 17.4 | iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | -| iOS 17.5 | iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | -| tvOS 17.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 17.2 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 17.4 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 17.5 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| watchOS 10.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra 2 (49mm) | -| watchOS 10.2 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra 2 (49mm) | -| watchOS 10.4 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra 2 (49mm) | -| watchOS 10.5 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra 2 (49mm) | +| OS | Simulators | +| ------------ | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| iOS 17.0 | iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 17.2 | iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 17.4 | iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | +| iOS 17.5 | iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | +| iOS 18.0 | iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone 16<br>iPhone 16 Plus<br>iPhone 16 Pro<br>iPhone 16 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | +| iOS 18.1 | iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone 16<br>iPhone 16 Plus<br>iPhone 16 Pro<br>iPhone 16 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad mini (A17 Pro)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | +| tvOS 17.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 17.2 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 17.4 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 17.5 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 18.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 18.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| watchOS 10.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 10.2 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 10.4 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 10.5 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 11.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 10 (42mm)<br>Apple Watch Series 10 (46mm)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 11.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 10 (42mm)<br>Apple Watch Series 10 (46mm)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra 2 (49mm) | ### Android | Package Name | Version | From 2c013247b1be5aaefb18a96fb0aed6e8d8fca8a2 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 21 Nov 2024 03:33:00 +0000 Subject: [PATCH 3261/3485] Updating readme file for macos-15-arm64 version 20241118.362 (#10991) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-15-arm64-Readme.md | 135 +++++++++++++++----------- 1 file changed, 77 insertions(+), 58 deletions(-) diff --git a/images/macos/macos-15-arm64-Readme.md b/images/macos/macos-15-arm64-Readme.md index 3254251e5f14..9a26bb8a4bde 100644 --- a/images/macos/macos-15-arm64-Readme.md +++ b/images/macos/macos-15-arm64-Readme.md @@ -1,5 +1,6 @@ | Announcements | |-| +| [[ macOS ] Node.js version 16 will be removed from macOS13 and macOS13 arm64 images on November, 18.](https://github.com/actions/runner-images/issues/10873) | | [[macOS] OpenSSL 1.1 will be removed and OpenSSL 3 will be the default for all macOS images from November 4](https://github.com/actions/runner-images/issues/10817) | | [[macOS] Python 3.9 and 3.10 will be removed from macOS13 arm64 and macOS14 arm64 on November 18.](https://github.com/actions/runner-images/issues/10812) | | [[macOS] The macOS 12 Actions runner image will begin deprecation on 10/7/24 and will be fully unsupported by 12/3/24 for GitHub and ADO](https://github.com/actions/runner-images/issues/10721) | @@ -7,90 +8,91 @@ | [macOS 15 (Sequoia) is now available as a public beta in GitHub Actions](https://github.com/actions/runner-images/issues/10686) | *** # macOS 15 -- OS Version: macOS 15.0.1 (24A348) -- Kernel Version: Darwin 24.0.0 -- Image Version: 20241022.250 +- OS Version: macOS 15.1 (24B2083) +- Kernel Version: Darwin 24.1.0 +- Image Version: 20241118.362 ## Installed Software ### Language and Runtime -- .NET Core SDK: 8.0.101, 8.0.204, 8.0.303, 8.0.403 +- .NET Core SDK: 8.0.101, 8.0.204, 8.0.303, 8.0.404 - Bash 3.2.57(1)-release - Clang/LLVM 16.0.0 - Clang/LLVM (Homebrew) 18.1.8 - available on `$(brew --prefix llvm@18)/bin/clang` - GCC 12 (Homebrew GCC 12.4.0) - available by `gcc-12` alias - GCC 13 (Homebrew GCC 13.3.0) - available by `gcc-13` alias -- GCC 14 (Homebrew GCC 14.2.0) - available by `gcc-14` alias +- GCC 14 (Homebrew GCC 14.2.0_1) - available by `gcc-14` alias - GNU Fortran 12 (Homebrew GCC 12.4.0) - available by `gfortran-12` alias - GNU Fortran 13 (Homebrew GCC 13.3.0) - available by `gfortran-13` alias -- GNU Fortran 14 (Homebrew GCC 14.2.0) - available by `gfortran-14` alias +- GNU Fortran 14 (Homebrew GCC 14.2.0_1) - available by `gfortran-14` alias - Kotlin 2.0.21-release-482 -- Node.js 22.10.0 +- Node.js 22.11.0 - Perl 5.40.0 - Python3 3.13.0 -- Ruby 3.3.5 +- Ruby 3.3.6 ### Package Management -- Bundler 2.5.22 +- Bundler 2.5.23 - Carthage 0.40.0 -- CocoaPods 1.15.2 -- Homebrew 4.4.2 +- CocoaPods 1.16.2 +- Homebrew 4.4.5 - NPM 10.9.0 - Pip3 24.2 (python 3.13) - Pipx 1.7.1 -- RubyGems 3.5.22 +- RubyGems 3.5.23 - Yarn 1.22.22 ### Project Management - Apache Ant 1.10.15 - Apache Maven 3.9.9 -- Gradle 8.10.2 +- Gradle 8.11 ### Utilities - 7-Zip 17.05 - aria2 1.37.0 -- azcopy 10.26.0 -- bazel 7.3.2 -- bazelisk 1.22.1 +- azcopy 10.27.1 +- bazel 7.4.1 +- bazelisk 1.23.0 - bsdtar 3.5.3 - available by 'tar' alias - Curl 8.7.1 - Git 2.47.0 - Git LFS 3.5.1 -- GitHub CLI 2.59.0 +- GitHub CLI 2.62.0 - GNU Tar 1.35 - available by 'gtar' alias -- GNU Wget 1.24.5 -- gpg (GnuPG) 2.4.5 +- GNU Wget 1.25.0 +- gpg (GnuPG) 2.4.6 - jq 1.7.1 - OpenSSL 1.1.1w 11 Sep 2023 - Packer 1.11.2 - pkg-config 0.29.2 -- yq 4.44.3 +- Unxip 3.1 +- yq 4.44.5 - zstd 1.5.6 ### Tools -- AWS CLI 2.18.11 -- AWS SAM CLI 1.126.0 -- AWS Session Manager CLI 1.2.677.0 -- Azure CLI 2.65.0 +- AWS CLI 2.21.3 +- AWS SAM CLI 1.129.0 +- AWS Session Manager CLI 1.2.688.0 +- Azure CLI 2.66.0 - Azure CLI (azure-devops) 1.0.1 -- Bicep CLI 0.30.23 -- Cmake 3.30.5 -- CodeQL Action Bundle 2.19.1 +- Bicep CLI 0.31.92 +- Cmake 3.31.0 +- CodeQL Action Bundle 2.19.3 - Fastlane 2.225.0 -- SwiftFormat 0.54.6 -- Xcbeautify 2.14.1 -- Xcode Command Line Tools 16.0.0.0.1.1724870825 -- Xcodes 1.5.0 +- SwiftFormat 0.55.0 +- Xcbeautify 2.15.0 +- Xcode Command Line Tools 16.1.0.0.1.1729049160 +- Xcodes 1.6.0 ### Linters ### Browsers -- Safari 18.0.1 (20619.1.26.31.7) -- SafariDriver 18.0.1 (20619.1.26.31.7) -- Google Chrome 130.0.6723.59 -- Google Chrome for Testing 130.0.6723.58 -- ChromeDriver 130.0.6723.58 -- Selenium server 4.25.0 +- Safari 18.1 (20619.2.8.11.10) +- SafariDriver 18.1 (20619.2.8.11.10) +- Google Chrome 131.0.6778.70 +- Google Chrome for Testing 131.0.6778.69 +- ChromeDriver 131.0.6778.69 +- Selenium server 4.26.0 #### Environment variables | Name | Value | @@ -102,7 +104,7 @@ ### Java | Version | Environment Variable | | --------------------- | -------------------- | -| 11.0.24+8 | JAVA_HOME_11_arm64 | +| 11.0.25+9 | JAVA_HOME_11_arm64 | | 17.0.13+11 | JAVA_HOME_17_arm64 | | 21.0.5+11.0 (default) | JAVA_HOME_21_arm64 | @@ -114,14 +116,14 @@ - 3.13.0 #### Node.js -- 18.20.4 +- 18.20.5 - 20.18.0 -- 22.10.0 +- 22.11.0 #### Go - 1.21.13 -- 1.22.8 -- 1.23.2 +- 1.22.9 +- 1.23.3 ### Rust Tools - Cargo 1.82.0 @@ -134,59 +136,76 @@ - Rustfmt 1.7.1-stable ### PowerShell Tools -- PowerShell 7.4.5 +- PowerShell 7.4.6 #### PowerShell Modules -- Az: 12.4.0 +- Az: 12.5.0 - Pester: 5.6.1 - PSScriptAnalyzer: 1.23.0 ### Xcode -| Version | Build | Path | Symlinks | -| -------------- | ------- | ---------------------------------------------- | ----------------------------------------------------------------------------------------- | -| 16.1 | 16B40 | /Applications/Xcode_16.1_Release_Candidate.app | /Applications/Xcode_16.1.0.app<br>/Applications/Xcode_16.1.app | -| 16.0 (default) | 16A242d | /Applications/Xcode_16.app | /Applications/Xcode_16.0.0.app<br>/Applications/Xcode_16.0.app<br>/Applications/Xcode.app | +| Version | Build | Path | Symlinks | +| -------------- | -------- | ----------------------------------- | ----------------------------------------------------------------------------------------- | +| 16.2 (beta) | 16C5013f | /Applications/Xcode_16.2_beta_2.app | /Applications/Xcode_16.2.0.app<br>/Applications/Xcode_16.2.app | +| 16.1 | 16B40 | /Applications/Xcode_16.1.app | /Applications/Xcode_16.1.0.app | +| 16.0 (default) | 16A242d | /Applications/Xcode_16.app | /Applications/Xcode_16.0.0.app<br>/Applications/Xcode_16.0.app<br>/Applications/Xcode.app | #### Installed SDKs | SDK | SDK Name | Xcode Version | | ------------------------ | -------------------- | ------------- | | macOS 15.0 | macosx15.0 | 16.0 | | macOS 15.1 | macosx15.1 | 16.1 | +| macOS 15.2 | macosx15.2 | 16.2 | | iOS 18.0 | iphoneos18.0 | 16.0 | | iOS 18.1 | iphoneos18.1 | 16.1 | +| iOS 18.2 | iphoneos18.2 | 16.2 | | Simulator - iOS 18.0 | iphonesimulator18.0 | 16.0 | | Simulator - iOS 18.1 | iphonesimulator18.1 | 16.1 | +| Simulator - iOS 18.2 | iphonesimulator18.2 | 16.2 | | tvOS 18.0 | appletvos18.0 | 16.0 | | tvOS 18.1 | appletvos18.1 | 16.1 | +| tvOS 18.2 | appletvos18.2 | 16.2 | | Simulator - tvOS 18.0 | appletvsimulator18.0 | 16.0 | | Simulator - tvOS 18.1 | appletvsimulator18.1 | 16.1 | +| Simulator - tvOS 18.2 | appletvsimulator18.2 | 16.2 | | watchOS 11.0 | watchos11.0 | 16.0 | | watchOS 11.1 | watchos11.1 | 16.1 | +| watchOS 11.2 | watchos11.2 | 16.2 | | Simulator - watchOS 11.0 | watchsimulator11.0 | 16.0 | | Simulator - watchOS 11.1 | watchsimulator11.1 | 16.1 | +| Simulator - watchOS 11.2 | watchsimulator11.2 | 16.2 | | Simulator - visionOS 2.0 | xrsimulator2.0 | 16.0 | | visionOS 2.0 | xros2.0 | 16.0 | | visionOS 2.1 | xros2.1 | 16.1 | | Simulator - visionOS 2.1 | xrsimulator2.1 | 16.1 | +| Simulator - visionOS 2.2 | xrsimulator2.2 | 16.2 | +| visionOS 2.2 | xros2.2 | 16.2 | | DriverKit 24.0 | driverkit24.0 | 16.0 | | DriverKit 24.1 | driverkit24.1 | 16.1 | +| DriverKit 24.2 | driverkit24.2 | 16.2 | #### Installed Simulators -| OS | Simulators | -| ------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| iOS 18.0 | iPhone 16<br>iPhone 16 Plus<br>iPhone 16 Pro<br>iPhone 16 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | -| iOS 18.1 | iPhone 16<br>iPhone 16 Plus<br>iPhone 16 Pro<br>iPhone 16 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad mini (A17 Pro)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | -| tvOS 18.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 18.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| watchOS 11.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 10 (42mm)<br>Apple Watch Series 10 (46mm)<br>Apple Watch Ultra 2 (49mm) | -| watchOS 11.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 10 (42mm)<br>Apple Watch Series 10 (46mm)<br>Apple Watch Ultra 2 (49mm) | -| visionOS 2.0 | Apple Vision Pro | -| visionOS 2.1 | Apple Vision Pro | +| OS | Simulators | +| ------------ | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| iOS 18.0 | iPhone 16<br>iPhone 16 Plus<br>iPhone 16 Pro<br>iPhone 16 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | +| iOS 18.1 | iPhone 16<br>iPhone 16 Plus<br>iPhone 16 Pro<br>iPhone 16 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (A17 Pro)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | +| iOS 18.2 | iPhone 16<br>iPhone 16 Plus<br>iPhone 16 Pro<br>iPhone 16 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (A17 Pro)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | +| tvOS 18.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 18.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 18.2 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| watchOS 11.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 10 (42mm)<br>Apple Watch Series 10 (46mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 11.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 10 (42mm)<br>Apple Watch Series 10 (46mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 11.2 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 10 (42mm)<br>Apple Watch Series 10 (46mm)<br>Apple Watch Ultra 2 (49mm) | +| visionOS 2.0 | Apple Vision Pro | +| visionOS 2.1 | Apple Vision Pro | +| visionOS 2.2 | Apple Vision Pro | ### Android | Package Name | Version | | -------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 16.0 | | Android Emulator | 35.2.10 | +| Android SDK Build-tools | 35.0.0 | | Android SDK Platforms | android-35 (rev 1)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1) | | Android SDK Platform-Tools | 35.0.2 | | Android Support Repository | 47.0.0 | From 6c6545011cd02dd4188d3ef8c8c8e59c6b8b7c09 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 21 Nov 2024 10:21:18 +0000 Subject: [PATCH 3262/3485] Updating readme file for ubuntu24 version 20241117.1.1 (#10998) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2404-Readme.md | 34 +++++++++++++++--------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/images/ubuntu/Ubuntu2404-Readme.md b/images/ubuntu/Ubuntu2404-Readme.md index 8e3a624ce9a3..9a3190372d23 100644 --- a/images/ubuntu/Ubuntu2404-Readme.md +++ b/images/ubuntu/Ubuntu2404-Readme.md @@ -7,7 +7,7 @@ # Ubuntu 24.04 - OS Version: 24.04.1 LTS - Kernel Version: 6.8.0-1017-azure -- Image Version: 20241112.1.0 +- Image Version: 20241117.1.0 - Systemd version: 255.4-1ubuntu8.4 ## Installed Software @@ -30,7 +30,7 @@ ### Package Management - cpan 1.64 -- Helm 3.16.2 +- Helm 3.16.3 - Homebrew 4.4.5 - Miniconda 24.9.2 - Npm 10.8.2 @@ -38,7 +38,7 @@ - Pip3 24.0 - Pipx 1.7.1 - RubyGems 3.4.20 -- Vcpkg (build from commit 89f00b3b8) +- Vcpkg (build from commit 435a9415c) - Yarn 1.22.22 #### Environment variables @@ -63,10 +63,10 @@ to accomplish this. ### Tools - Ansible 2.17.6 -- AzCopy 10.26.0 - available by `azcopy` and `azcopy10` aliases +- AzCopy 10.27.1 - available by `azcopy` and `azcopy10` aliases - Bazel 7.4.1 - Bazelisk 1.23.0 -- Bicep 0.31.34 +- Bicep 0.31.92 - Buildah 1.33.7 - CMake 3.31.0 - CodeQL Action Bundle 2.19.3 @@ -94,20 +94,20 @@ to accomplish this. - Packer 1.11.2 - Parcel 2.13.0 - Podman 4.9.3 -- Pulumi 3.138.0 +- Pulumi 3.139.0 - Skopeo 1.13.3 - Sphinx Open Source Search Server 2.2.11 - yamllint 1.35.1 -- yq 4.44.3 +- yq 4.44.5 - zstd 1.5.6 ### CLI Tools -- AWS CLI 2.20.0 +- AWS CLI 2.21.3 - AWS CLI Session Manager Plugin 1.2.688.0 -- AWS SAM CLI 1.128.0 +- AWS SAM CLI 1.129.0 - Azure CLI 2.66.0 - Azure CLI (azure-devops) 1.0.1 -- GitHub CLI 2.61.0 +- GitHub CLI 2.62.0 - Google Cloud CLI 501.0.0 ### Java @@ -120,7 +120,7 @@ to accomplish this. ### PHP Tools - PHP: 8.3.6 -- Composer 2.8.2 +- Composer 2.8.3 - PHPUnit 8.5.40 ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. @@ -145,10 +145,10 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Google Chrome 131.0.6778.69 - ChromeDriver 131.0.6778.69 - Chromium 131.0.6778.0 -- Microsoft Edge 130.0.2849.80 -- Microsoft Edge WebDriver 130.0.2849.78 +- Microsoft Edge 131.0.2903.51 +- Microsoft Edge WebDriver 131.0.2903.52 - Selenium server 4.26.0 -- Mozilla Firefox 132.0.1 +- Mozilla Firefox 132.0.2 - Geckodriver 0.35.0 #### Environment variables @@ -167,7 +167,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - sqlite3 3.45.1 #### PostgreSQL -- PostgreSQL 16.4 +- PostgreSQL 16.5 ``` User: postgres PostgreSQL service is disabled by default. @@ -191,7 +191,7 @@ Use the following command as a part of your job to start the service: 'sudo syst - 1.23.3 #### Node.js -- 18.20.4 +- 18.20.5 - 20.18.0 - 22.11.0 @@ -244,7 +244,7 @@ Use the following command as a part of your job to start the service: 'sudo syst ### Installed apt packages | Name | Version | | ---------------------- | --------------------------- | -| acl | 2.3.2-1build1 | +| acl | 2.3.2-1build1.1 | | aria2 | 1.37.0+debian-1build3 | | autoconf | 2.71-3 | | automake | 1:1.16.5-1.3ubuntu1 | From 53c3ba89fe5cfe866cab554824344a79a1f3b6f9 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 21 Nov 2024 10:48:28 +0000 Subject: [PATCH 3263/3485] Updating readme file for ubuntu22 version 20241117.1.1 (#10997) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2204-Readme.md | 49 ++++++++++++++---------------- 1 file changed, 23 insertions(+), 26 deletions(-) diff --git a/images/ubuntu/Ubuntu2204-Readme.md b/images/ubuntu/Ubuntu2204-Readme.md index 3e7c0c786ec8..ae3feb5bbe86 100644 --- a/images/ubuntu/Ubuntu2204-Readme.md +++ b/images/ubuntu/Ubuntu2204-Readme.md @@ -7,7 +7,7 @@ # Ubuntu 22.04 - OS Version: 22.04.5 LTS - Kernel Version: 6.5.0-1025-azure -- Image Version: 20241112.1.0 +- Image Version: 20241117.1.0 - Systemd version: 249.11-0ubuntu3.12 ## Installed Software @@ -32,7 +32,7 @@ ### Package Management - cpan 1.64 -- Helm 3.16.2 +- Helm 3.16.3 - Homebrew 4.4.5 - Miniconda 24.9.2 - Npm 10.8.2 @@ -41,7 +41,7 @@ - Pip3 22.0.2 - Pipx 1.7.1 - RubyGems 3.3.5 -- Vcpkg (build from commit 89f00b3b8) +- Vcpkg (build from commit 435a9415c) - Yarn 1.22.22 #### Environment variables @@ -68,10 +68,10 @@ to accomplish this. ### Tools - Ansible 2.17.6 - apt-fast 1.10.0 -- AzCopy 10.26.0 - available by `azcopy` and `azcopy10` aliases +- AzCopy 10.27.1 - available by `azcopy` and `azcopy10` aliases - Bazel 7.4.1 - Bazelisk 1.23.0 -- Bicep 0.31.34 +- Bicep 0.31.92 - Buildah 1.23.1 - CMake 3.31.0 - CodeQL Action Bundle 2.19.3 @@ -85,7 +85,7 @@ to accomplish this. - Git LFS 3.5.1 - Git-ftp 1.6.0 - Haveged 1.9.14 -- Heroku 9.4.0 +- Heroku 9.5.0 - jq 1.6 - Kind 0.25.0 - Kubectl 1.31.2 @@ -101,29 +101,29 @@ to accomplish this. - Packer 1.11.2 - Parcel 2.13.0 - Podman 3.4.4 -- Pulumi 3.138.0 +- Pulumi 3.139.0 - R 4.4.2 - Skopeo 1.4.1 - Sphinx Open Source Search Server 2.2.11 - SVN 1.14.1 - Terraform 1.9.8 - yamllint 1.35.1 -- yq 4.44.3 +- yq 4.44.5 - zstd 1.5.6 ### CLI Tools -- Alibaba Cloud CLI 3.0.231 -- AWS CLI 2.20.0 +- Alibaba Cloud CLI 3.0.233 +- AWS CLI 2.21.3 - AWS CLI Session Manager Plugin 1.2.688.0 -- AWS SAM CLI 1.128.0 +- AWS SAM CLI 1.129.0 - Azure CLI 2.66.0 - Azure CLI (azure-devops) 1.0.1 -- GitHub CLI 2.61.0 +- GitHub CLI 2.62.0 - Google Cloud CLI 501.0.0 - Netlify CLI 17.37.2 -- OpenShift CLI 4.17.3 +- OpenShift CLI 4.17.4 - ORAS CLI 1.2.0 -- Vercel CLI 38.0.0 +- Vercel CLI 39.0.2 ### Java | Version | Environment Variable | @@ -135,7 +135,7 @@ to accomplish this. ### PHP Tools - PHP: 8.1.2 -- Composer 2.8.2 +- Composer 2.8.3 - PHPUnit 8.5.40 ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. @@ -165,10 +165,10 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Google Chrome 131.0.6778.69 - ChromeDriver 131.0.6778.69 - Chromium 131.0.6778.0 -- Microsoft Edge 130.0.2849.80 -- Microsoft Edge WebDriver 130.0.2849.78 +- Microsoft Edge 131.0.2903.51 +- Microsoft Edge WebDriver 131.0.2903.52 - Selenium server 4.26.0 -- Mozilla Firefox 132.0.1 +- Mozilla Firefox 132.0.2 - Geckodriver 0.35.0 #### Environment variables @@ -187,7 +187,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - sqlite3 3.37.2 #### PostgreSQL -- PostgreSQL 14.13 +- PostgreSQL 14.14 ``` User: postgres PostgreSQL service is disabled by default. @@ -215,8 +215,7 @@ Use the following command as a part of your job to start the service: 'sudo syst - 1.23.3 #### Node.js -- 16.20.2 -- 18.20.4 +- 18.20.5 - 20.18.0 - 22.11.0 @@ -286,13 +285,11 @@ Use the following command as a part of your job to start the service: 'sudo syst | debian:10 | sha256:58ce6f1271ae1c8a2006ff7d3e54e9874d839f573d8009c20154ad0f2fb0a225 | 2024-06-13 | | debian:11 | sha256:01559430c84e6bc864bed554345d1bfbfa94ac108ab68f39915cae34604b15c3 | 2024-11-11 | | moby/buildkit:latest | sha256:918e92e639651fdfd0bd97f31bab0dd91756edd14e6f73f43a896715617c59a0 | 2024-11-07 | -| node:16 | sha256:f77a1aef2da8d83e45ec990f45df50f1a286c5fe8bbfb8c6e4246c6389705c0b | 2023-09-07 | -| node:16-alpine | sha256:a1f9d027912b58a7c75be7716c97cfbc6d3099f3a97ed84aa490be9dee20e787 | 2023-08-10 | -| node:18 | sha256:d8bdb5bedbfdb7c941c117b94db88a2250a56fe33c2883f7a3ad62825bf31128 | 2024-07-09 | +| node:18 | sha256:c5c88762e9097e7fa405e5713731ea924fa52da33a13929ed64d8a6b79b95c89 | 2024-07-09 | | node:18-alpine | sha256:a25c1e4ecc284985f4cbc449021e9259560c644dd9611e5a72d9c4750f24f6c7 | 2024-07-09 | -| node:20 | sha256:0c73476fa7c1435f0caee56a429fa506e36ec0e0666149eec5ea8e5f60fb5efa | 2024-10-04 | +| node:20 | sha256:a7a3b7ec6de4b11bb2d673b31de9d28c6da09c557ee65453672c8e4f754c23fc | 2024-10-04 | | node:20-alpine | sha256:b1e0880c3af955867bc2f1944b49d20187beb7afa3f30173e15a97149ab7f5f1 | 2024-10-04 | -| node:22 | sha256:db556c2974040f7812c7f39c15afb1e8b1901d6e23f1975ff71b5236a1244e52 | 2024-10-29 | +| node:22 | sha256:5c76d05034644fa8ecc9c2aa84e0a83cd981d0ef13af5455b87b9adf5b216561 | 2024-10-29 | | node:22-alpine | sha256:b64ced2e7cd0a4816699fe308ce6e8a08ccba463c757c00c14cd372e3d2c763e | 2024-10-29 | | ubuntu:20.04 | sha256:8e5c4f0285ecbb4ead070431d29b576a530d3166df73ec44affc1cd27555141b | 2024-10-11 | | ubuntu:22.04 | sha256:0e5e4a57c2499249aafc3b40fcd541e9a456aab7296681a3994d631587203f97 | 2024-09-11 | From 183bef9022a174f5f612ad61a8dabdb4c75e210f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 21 Nov 2024 11:41:37 +0000 Subject: [PATCH 3264/3485] Updating readme file for ubuntu20 version 20241117.1.1 (#10999) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2004-Readme.md | 85 ++++++++++++++---------------- 1 file changed, 41 insertions(+), 44 deletions(-) diff --git a/images/ubuntu/Ubuntu2004-Readme.md b/images/ubuntu/Ubuntu2004-Readme.md index 6222be003e98..e354c59c685f 100644 --- a/images/ubuntu/Ubuntu2004-Readme.md +++ b/images/ubuntu/Ubuntu2004-Readme.md @@ -7,7 +7,7 @@ # Ubuntu 20.04 - OS Version: 20.04.6 LTS - Kernel Version: 5.15.0-1074-azure -- Image Version: 20241110.1.0 +- Image Version: 20241117.1.0 - Systemd version: 245.4-4ubuntu3.24 ## Installed Software @@ -26,7 +26,7 @@ - Kotlin 2.0.21-release-482 - Mono 6.12.0.200 - MSBuild 16.10.1.31701 (Mono 6.12.0.200) -- Node.js 18.20.4 +- Node.js 18.20.5 - Perl 5.30.0 - Python 3.8.10 - Ruby 2.7.0p0 @@ -34,16 +34,16 @@ ### Package Management - cpan 1.64 -- Helm 3.16.2 -- Homebrew 4.4.4 +- Helm 3.16.3 +- Homebrew 4.4.5 - Miniconda 24.9.2 -- Npm 10.7.0 +- Npm 10.8.2 - NuGet 6.6.1.2 - Pip 20.0.2 - Pip3 20.0.2 - Pipx 1.7.1 - RubyGems 3.1.2 -- Vcpkg (build from commit 813a241fb) +- Vcpkg (build from commit 435a9415c) - Yarn 1.22.22 #### Environment variables @@ -62,7 +62,7 @@ to accomplish this. ### Project Management - Ant 1.10.7 -- Gradle 8.10.2 +- Gradle 8.11 - Lerna 8.1.9 - Maven 3.8.8 - Sbt 1.10.5 @@ -70,10 +70,10 @@ to accomplish this. ### Tools - Ansible 2.13.13 - apt-fast 1.10.0 -- AzCopy 10.26.0 - available by `azcopy` and `azcopy10` aliases -- Bazel 7.4.0 +- AzCopy 10.27.1 - available by `azcopy` and `azcopy10` aliases +- Bazel 7.4.1 - Bazelisk 1.23.0 -- Bicep 0.31.34 +- Bicep 0.31.92 - Buildah 1.22.3 - CMake 3.31.0 - CodeQL Action Bundle 2.19.3 @@ -87,7 +87,7 @@ to accomplish this. - Git LFS 3.5.1 - Git-ftp 1.6.0 - Haveged 1.9.1 -- Heroku 9.3.2 +- Heroku 9.5.0 - HHVM (HipHop VM) 4.172.1 - jq 1.6 - Kind 0.25.0 @@ -102,32 +102,32 @@ to accomplish this. - nvm 0.40.1 - OpenSSL 1.1.1f-1ubuntu2.23 - Packer 1.11.2 -- Parcel 2.12.0 +- Parcel 2.13.0 - PhantomJS 2.1.1 2.1.1 - Podman 3.4.2 -- Pulumi 3.138.0 +- Pulumi 3.139.0 - R 4.4.2 - Skopeo 1.5.0 - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 - Terraform 1.9.8 - yamllint 1.35.1 -- yq 4.44.3 +- yq 4.44.5 - zstd 1.5.6 ### CLI Tools - Alibaba Cloud CLI 3.0.174 -- AWS CLI 2.19.4 +- AWS CLI 2.21.3 - AWS CLI Session Manager Plugin 1.2.688.0 -- AWS SAM CLI 1.127.0 -- Azure CLI 2.65.0 +- AWS SAM CLI 1.129.0 +- Azure CLI 2.66.0 - Azure CLI (azure-devops) 1.0.1 -- GitHub CLI 2.61.0 -- Google Cloud CLI 500.0.0 +- GitHub CLI 2.62.0 +- Google Cloud CLI 501.0.0 - Netlify CLI 17.37.2 - OpenShift CLI 4.15.19 - ORAS CLI 1.2.0 -- Vercel CLI 37.14.0 +- Vercel CLI 39.0.2 ### Java | Version | Environment Variable | @@ -139,7 +139,7 @@ to accomplish this. ### PHP Tools - PHP: 7.4.33, 8.0.30, 8.1.30, 8.2.25, 8.3.13 -- Composer 2.8.2 +- Composer 2.8.3 - PHPUnit 8.5.40 ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. @@ -166,13 +166,13 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.7.1 ### Browsers and Drivers -- Google Chrome 130.0.6723.116 -- ChromeDriver 130.0.6723.116 -- Chromium 130.0.6723.0 -- Microsoft Edge 130.0.2849.80 -- Microsoft Edge WebDriver 130.0.2849.78 +- Google Chrome 131.0.6778.69 +- ChromeDriver 131.0.6778.69 +- Chromium 131.0.6778.0 +- Microsoft Edge 131.0.2903.51 +- Microsoft Edge WebDriver 131.0.2903.52 - Selenium server 4.26.0 -- Mozilla Firefox 132.0.1 +- Mozilla Firefox 132.0.2 - Geckodriver 0.35.0 #### Environment variables @@ -184,7 +184,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | ### .NET Tools -- .NET Core SDK: 6.0.427, 7.0.410, 8.0.403 +- .NET Core SDK: 6.0.428, 7.0.410, 8.0.404 - nbgv 3.6.146+392592327a ### Databases @@ -192,7 +192,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - sqlite3 3.31.1 #### PostgreSQL -- PostgreSQL 14.13 +- PostgreSQL 14.14 ``` User: postgres PostgreSQL service is disabled by default. @@ -200,7 +200,7 @@ Use the following command as a part of your job to start the service: 'sudo syst ``` #### MySQL -- MySQL 8.0.39-0ubuntu0.20.04.1 +- MySQL 8.0.40-0ubuntu0.20.04.1 ``` User: root Password: root @@ -220,8 +220,7 @@ Use the following command as a part of your job to start the service: 'sudo syst - 1.23.3 #### Node.js -- 16.20.2 -- 18.20.4 +- 18.20.5 - 20.18.0 - 22.11.0 @@ -289,21 +288,19 @@ Use the following command as a part of your job to start the service: 'sudo syst | Repository:Tag | Digest | Created | | -------------------- | ------------------------------------------------------------------------ | ---------- | | alpine:3.16 | sha256:452e7292acee0ee16c332324d7de05fa2c99f9994ecc9f0779c602916a672ae4 | 2024-01-27 | -| alpine:3.17 | sha256:3451da08fc6ef554a100da3e2df5ac6d598c82f2a774d5f6ed465c3d80cd163a | 2024-09-06 | -| alpine:3.18 | sha256:3ddf7bf1d408188f9849efbf4f902720ae08f5131bb39013518b918aa056d0de | 2024-09-06 | -| alpine:3.19 | sha256:ae65dbf8749a7d4527648ccee1fa3deb6bfcae34cbc30fc67aa45c44dcaa90ee | 2024-09-06 | +| alpine:3.17 | sha256:8fc3dacfb6d69da8d44e42390de777e48577085db99aa4e4af35f483eb08b989 | 2024-09-06 | +| alpine:3.18 | sha256:2995c82e8e723d9a5c8585cb8e901d1c50e3c2759031027d3bff577449435157 | 2024-09-06 | +| alpine:3.19 | sha256:7a85bf5dc56c949be827f84f9185161265c58f589bb8b2a6b6bb6d3076c1be21 | 2024-09-06 | | debian:10 | sha256:58ce6f1271ae1c8a2006ff7d3e54e9874d839f573d8009c20154ad0f2fb0a225 | 2024-06-13 | -| debian:11 | sha256:d0036be35fe0a4d2649bf074ca467a37dab8c5b26bbbdfca0375b4dc682f011d | 2024-10-17 | +| debian:11 | sha256:01559430c84e6bc864bed554345d1bfbfa94ac108ab68f39915cae34604b15c3 | 2024-11-11 | | debian:9 | sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be | 2022-06-23 | | moby/buildkit:latest | sha256:918e92e639651fdfd0bd97f31bab0dd91756edd14e6f73f43a896715617c59a0 | 2024-11-07 | -| node:16 | sha256:f77a1aef2da8d83e45ec990f45df50f1a286c5fe8bbfb8c6e4246c6389705c0b | 2023-09-07 | -| node:16-alpine | sha256:a1f9d027912b58a7c75be7716c97cfbc6d3099f3a97ed84aa490be9dee20e787 | 2023-08-10 | -| node:18 | sha256:ddd173cd94537e155b378342056e0968e8299eb3da9dd5d412d3b7f796ac38c0 | 2024-07-09 | -| node:18-alpine | sha256:02376a266c84acbf45bd19440e08e48b1c8b98037417334046029ab585de03e2 | 2024-07-09 | -| node:20 | sha256:a5e0ed56f2c20b9689e0f7dd498cac7e08d2a3a283e92d9304e7b9b83e3c6ff3 | 2024-10-04 | -| node:20-alpine | sha256:c13b26e7e602ef2f1074aef304ce6e9b7dd284c419b35d89fcf3cc8e44a8def9 | 2024-10-04 | -| node:22 | sha256:de4c8be8232b7081d8846360d73ce6dbff33c6636f2259cd14d82c0de1ac3ff2 | 2024-10-29 | -| node:22-alpine | sha256:f265794478aa0b1a23d85a492c8311ed795bc527c3fe7e43453b3c872dcd71a3 | 2024-10-29 | +| node:18 | sha256:c5c88762e9097e7fa405e5713731ea924fa52da33a13929ed64d8a6b79b95c89 | 2024-07-09 | +| node:18-alpine | sha256:a25c1e4ecc284985f4cbc449021e9259560c644dd9611e5a72d9c4750f24f6c7 | 2024-07-09 | +| node:20 | sha256:a7a3b7ec6de4b11bb2d673b31de9d28c6da09c557ee65453672c8e4f754c23fc | 2024-10-04 | +| node:20-alpine | sha256:b1e0880c3af955867bc2f1944b49d20187beb7afa3f30173e15a97149ab7f5f1 | 2024-10-04 | +| node:22 | sha256:5c76d05034644fa8ecc9c2aa84e0a83cd981d0ef13af5455b87b9adf5b216561 | 2024-10-29 | +| node:22-alpine | sha256:b64ced2e7cd0a4816699fe308ce6e8a08ccba463c757c00c14cd372e3d2c763e | 2024-10-29 | | ubuntu:20.04 | sha256:8e5c4f0285ecbb4ead070431d29b576a530d3166df73ec44affc1cd27555141b | 2024-10-11 | ### Installed apt packages From e6fd81684de44e19d1935cd3ebd2185f2b7e0ef8 Mon Sep 17 00:00:00 2001 From: Prasanjit Sahoo <160633557+prasanjitsahoo@users.noreply.github.com> Date: Thu, 21 Nov 2024 19:04:46 +0530 Subject: [PATCH 3265/3485] [macOS] Update Xcode 16.2 Beta on macOS15 (#11019) * [macOS] Add Xcode 16.2 Beta 3 to macOS14 and macOS15 * Remove Xcode 16 beta from macos-14 --------- Co-authored-by: Erik Bershel <erik-bershel@github.com> --- images/macos/toolsets/toolset-15.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/macos/toolsets/toolset-15.json b/images/macos/toolsets/toolset-15.json index 60f7d57a6a7b..71b4ef3886b2 100644 --- a/images/macos/toolsets/toolset-15.json +++ b/images/macos/toolsets/toolset-15.json @@ -3,14 +3,14 @@ "default": "16", "x64": { "versions": [ - { "link": "16.2_beta_2", "version": "16.2_beta_2+16C5013f", "symlinks": ["16.2"], "install_runtimes": "true", "sha256": "b04956fca1b4fe468d5de8833b23c651ed787e41fc5a9c0e29f5eadd5b54d923"}, + { "link": "16.2_beta_3", "version": "16.2.0-Beta.3+16C5023f", "symlinks": ["16.2"], "install_runtimes": "true", "sha256": "04f3a3e3daf5d07e5ecfdf3cd7fc34fcf0a654884388d56f9f69942a9e3b1e66"}, { "link": "16.1", "version": "16.1+16B40", "install_runtimes": "true", "sha256": "8ca961d55981f983d21b99a95a6b0ac04905b837f6e11346ee86d28f12afe720"}, { "link": "16", "version": "16.0.0+16A242d", "symlinks": ["16.0"], "install_runtimes": "true", "sha256": "4a26c3d102a55c7222fb145e0ee1503249c9c26c6e02dc64d783c8810b37b1e3"} ] }, "arm64":{ "versions": [ - { "link": "16.2_beta_2", "version": "16.2_beta_2+16C5013f", "symlinks": ["16.2"], "install_runtimes": "true", "sha256": "b04956fca1b4fe468d5de8833b23c651ed787e41fc5a9c0e29f5eadd5b54d923"}, + { "link": "16.2_beta_3", "version": "16.2.0-Beta.3+16C5023f", "symlinks": ["16.2"], "install_runtimes": "true", "sha256": "04f3a3e3daf5d07e5ecfdf3cd7fc34fcf0a654884388d56f9f69942a9e3b1e66"}, { "link": "16.1", "version": "16.1+16B40", "install_runtimes": "true", "sha256": "8ca961d55981f983d21b99a95a6b0ac04905b837f6e11346ee86d28f12afe720"}, { "link": "16", "version": "16.0.0+16A242d", "symlinks": ["16.0"], "install_runtimes": "true", "sha256": "4a26c3d102a55c7222fb145e0ee1503249c9c26c6e02dc64d783c8810b37b1e3"} ] From d22a5ec4c17b7417e8014e6911344df7ca68b86e Mon Sep 17 00:00:00 2001 From: aartis17 <aartis17@github.com> Date: Thu, 21 Nov 2024 19:35:54 +0530 Subject: [PATCH 3266/3485] [macos] Removing python 3.9 and 3.10 from macos-14-arm64 (#11018) --- images/macos/toolsets/toolset-14.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/images/macos/toolsets/toolset-14.json b/images/macos/toolsets/toolset-14.json index daf2e755fcd5..e92aeed20514 100644 --- a/images/macos/toolsets/toolset-14.json +++ b/images/macos/toolsets/toolset-14.json @@ -141,8 +141,6 @@ }, "arm64": { "versions": [ - "3.9.*", - "3.10.*", "3.11.*", "3.12.*", "3.13.*" From 26b592de2b6a56e3f730d342ca0f51ce3c79ab2f Mon Sep 17 00:00:00 2001 From: sarathrajsrinivasan <159180023+sarathrajsrinivasan@users.noreply.github.com> Date: Fri, 22 Nov 2024 06:23:29 -0800 Subject: [PATCH 3267/3485] [macOS] Replace pkg-config with pkgconf in all macOS images (#11015) --- images/macos/scripts/build/install-pkg-config.sh | 15 --------------- .../scripts/docs-gen/Generate-SoftwareReport.ps1 | 2 +- .../scripts/docs-gen/SoftwareReport.Common.psm1 | 6 +++--- images/macos/scripts/tests/BasicTools.Tests.ps1 | 6 ++++++ images/macos/scripts/tests/Common.Tests.ps1 | 6 ------ images/macos/templates/macOS-13.anka.pkr.hcl | 3 +-- .../macos/templates/macOS-13.arm64.anka.pkr.hcl | 3 +-- images/macos/templates/macOS-14.anka.pkr.hcl | 3 +-- .../macos/templates/macOS-14.arm64.anka.pkr.hcl | 3 +-- images/macos/templates/macOS-15.anka.pkr.hcl | 3 +-- .../macos/templates/macOS-15.arm64.anka.pkr.hcl | 3 +-- images/macos/toolsets/toolset-13.json | 1 + images/macos/toolsets/toolset-14.json | 1 + images/macos/toolsets/toolset-15.json | 1 + 14 files changed, 19 insertions(+), 37 deletions(-) delete mode 100644 images/macos/scripts/build/install-pkg-config.sh diff --git a/images/macos/scripts/build/install-pkg-config.sh b/images/macos/scripts/build/install-pkg-config.sh deleted file mode 100644 index 77969096b7b5..000000000000 --- a/images/macos/scripts/build/install-pkg-config.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -e -o pipefail -################################################################################ -## File: install-pkg-config.sh -## Desc: Install pkg-config -################################################################################ - -source ~/utils/utils.sh - -echo "Installing pkg-config..." - -brew tap-new my-org/old-formulas -brew extract pkg-config my-org/old-formulas --version=0.29.2 -brew install my-org/old-formulas/pkg-config@0.29.2 - -invoke_tests "Common" "pkg-config" diff --git a/images/macos/scripts/docs-gen/Generate-SoftwareReport.ps1 b/images/macos/scripts/docs-gen/Generate-SoftwareReport.ps1 index 7e90c4d5c7cf..c4330139d87f 100644 --- a/images/macos/scripts/docs-gen/Generate-SoftwareReport.ps1 +++ b/images/macos/scripts/docs-gen/Generate-SoftwareReport.ps1 @@ -137,7 +137,7 @@ if ((-not $os.IsVentura) -and (-not $os.IsSonoma) -and (-not $os.IsSequoia)) { } $utilities.AddToolVersion("OpenSSL", $(Get-OpenSSLVersion)) $utilities.AddToolVersion("Packer", $(Get-PackerVersion)) -$utilities.AddToolVersion("pkg-config", $(Get-PKGConfigVersion)) +$utilities.AddToolVersion("pkgconf", $(Get-PKGConfVersion)) if ((-not $os.IsVentura) -and (-not $os.IsSonoma) -and (-not $os.IsSequoia)) { $utilities.AddToolVersion("PostgreSQL", $(Get-PostgresServerVersion)) $utilities.AddToolVersion("psql (PostgreSQL)", $(Get-PostgresClientVersion)) diff --git a/images/macos/scripts/docs-gen/SoftwareReport.Common.psm1 b/images/macos/scripts/docs-gen/SoftwareReport.Common.psm1 index a6a6e2ff299a..5cdb4dbb05f4 100644 --- a/images/macos/scripts/docs-gen/SoftwareReport.Common.psm1 +++ b/images/macos/scripts/docs-gen/SoftwareReport.Common.psm1 @@ -605,9 +605,9 @@ function Get-ColimaVersion { return $colimaVersion } -function Get-PKGConfigVersion { - $pkgconfigVersion = Run-Command "pkg-config --version" - return $pkgconfigVersion +function Get-PKGConfVersion { + $pkgconfVersion = Run-Command "pkgconf --version" + return $pkgconfVersion } function Get-XcbeautifyVersion { diff --git a/images/macos/scripts/tests/BasicTools.Tests.ps1 b/images/macos/scripts/tests/BasicTools.Tests.ps1 index e6cfeac595a1..6acf6e65a87c 100644 --- a/images/macos/scripts/tests/BasicTools.Tests.ps1 +++ b/images/macos/scripts/tests/BasicTools.Tests.ps1 @@ -178,3 +178,9 @@ Describe "imagemagick" -Skip:($os.IsVentura -or $os.IsSonoma -or $os.IsSequoia) "magick -version" | Should -ReturnZeroExitCode } } + +Describe "pkgconf" { + It "pkgconf" { + "pkgconf --version" | Should -ReturnZeroExitCode + } +} diff --git a/images/macos/scripts/tests/Common.Tests.ps1 b/images/macos/scripts/tests/Common.Tests.ps1 index a42722e39898..4d6ebf8e289c 100644 --- a/images/macos/scripts/tests/Common.Tests.ps1 +++ b/images/macos/scripts/tests/Common.Tests.ps1 @@ -168,9 +168,3 @@ Describe "Unxip" { "unxip --version" | Should -ReturnZeroExitCode } } - -Describe "pkg-config" { - It "pkg-config" { - "pkg-config --version" | Should -ReturnZeroExitCode - } -} diff --git a/images/macos/templates/macOS-13.anka.pkr.hcl b/images/macos/templates/macOS-13.anka.pkr.hcl index e48cfe3c44ad..25789a533f79 100644 --- a/images/macos/templates/macOS-13.anka.pkr.hcl +++ b/images/macos/templates/macOS-13.anka.pkr.hcl @@ -218,8 +218,7 @@ build { "${path.root}/../scripts/build/install-git.sh", "${path.root}/../scripts/build/install-node.sh", "${path.root}/../scripts/build/install-common-utils.sh", - "${path.root}/../scripts/build/install-unxip.sh", - "${path.root}/../scripts/build/install-pkg-config.sh" + "${path.root}/../scripts/build/install-unxip.sh" ] } diff --git a/images/macos/templates/macOS-13.arm64.anka.pkr.hcl b/images/macos/templates/macOS-13.arm64.anka.pkr.hcl index ef0156071fbf..7e03aa8fe7ee 100644 --- a/images/macos/templates/macOS-13.arm64.anka.pkr.hcl +++ b/images/macos/templates/macOS-13.arm64.anka.pkr.hcl @@ -220,8 +220,7 @@ build { "${path.root}/../scripts/build/install-git.sh", "${path.root}/../scripts/build/install-node.sh", "${path.root}/../scripts/build/install-common-utils.sh", - "${path.root}/../scripts/build/install-unxip.sh", - "${path.root}/../scripts/build/install-pkg-config.sh" + "${path.root}/../scripts/build/install-unxip.sh" ] } diff --git a/images/macos/templates/macOS-14.anka.pkr.hcl b/images/macos/templates/macOS-14.anka.pkr.hcl index a0ce3632f784..a29cd926baff 100644 --- a/images/macos/templates/macOS-14.anka.pkr.hcl +++ b/images/macos/templates/macOS-14.anka.pkr.hcl @@ -217,8 +217,7 @@ build { "${path.root}/../scripts/build/install-rubygems.sh", "${path.root}/../scripts/build/install-git.sh", "${path.root}/../scripts/build/install-node.sh", - "${path.root}/../scripts/build/install-common-utils.sh", - "${path.root}/../scripts/build/install-pkg-config.sh" + "${path.root}/../scripts/build/install-common-utils.sh" ] } diff --git a/images/macos/templates/macOS-14.arm64.anka.pkr.hcl b/images/macos/templates/macOS-14.arm64.anka.pkr.hcl index 319395dadb37..be90e1015288 100644 --- a/images/macos/templates/macOS-14.arm64.anka.pkr.hcl +++ b/images/macos/templates/macOS-14.arm64.anka.pkr.hcl @@ -219,8 +219,7 @@ build { "${path.root}/../scripts/build/install-rubygems.sh", "${path.root}/../scripts/build/install-git.sh", "${path.root}/../scripts/build/install-node.sh", - "${path.root}/../scripts/build/install-common-utils.sh", - "${path.root}/../scripts/build/install-pkg-config.sh" + "${path.root}/../scripts/build/install-common-utils.sh" ] } diff --git a/images/macos/templates/macOS-15.anka.pkr.hcl b/images/macos/templates/macOS-15.anka.pkr.hcl index 7bb9068bad27..6e93eccf210f 100644 --- a/images/macos/templates/macOS-15.anka.pkr.hcl +++ b/images/macos/templates/macOS-15.anka.pkr.hcl @@ -212,8 +212,7 @@ build { "${path.root}/../scripts/build/install-rubygems.sh", "${path.root}/../scripts/build/install-git.sh", "${path.root}/../scripts/build/install-node.sh", - "${path.root}/../scripts/build/install-common-utils.sh", - "${path.root}/../scripts/build/install-pkg-config.sh" + "${path.root}/../scripts/build/install-common-utils.sh" ] } diff --git a/images/macos/templates/macOS-15.arm64.anka.pkr.hcl b/images/macos/templates/macOS-15.arm64.anka.pkr.hcl index 4a4a0661fa38..8e72eace0760 100644 --- a/images/macos/templates/macOS-15.arm64.anka.pkr.hcl +++ b/images/macos/templates/macOS-15.arm64.anka.pkr.hcl @@ -214,8 +214,7 @@ build { "${path.root}/../scripts/build/install-rubygems.sh", "${path.root}/../scripts/build/install-git.sh", "${path.root}/../scripts/build/install-node.sh", - "${path.root}/../scripts/build/install-common-utils.sh", - "${path.root}/../scripts/build/install-pkg-config.sh" + "${path.root}/../scripts/build/install-common-utils.sh" ] } diff --git a/images/macos/toolsets/toolset-13.json b/images/macos/toolsets/toolset-13.json index 2c38a66330ab..e859c1cc1346 100644 --- a/images/macos/toolsets/toolset-13.json +++ b/images/macos/toolsets/toolset-13.json @@ -77,6 +77,7 @@ "p7zip", "packer", "perl", + "pkgconf", "swiftformat", "tcl-tk@8", "zstd", diff --git a/images/macos/toolsets/toolset-14.json b/images/macos/toolsets/toolset-14.json index e92aeed20514..5f512dd85119 100644 --- a/images/macos/toolsets/toolset-14.json +++ b/images/macos/toolsets/toolset-14.json @@ -80,6 +80,7 @@ "p7zip", "packer", "perl", + "pkgconf", "swiftformat", "tcl-tk@8", "zstd", diff --git a/images/macos/toolsets/toolset-15.json b/images/macos/toolsets/toolset-15.json index 71b4ef3886b2..9f83e33fea56 100644 --- a/images/macos/toolsets/toolset-15.json +++ b/images/macos/toolsets/toolset-15.json @@ -72,6 +72,7 @@ "p7zip", "packer", "perl", + "pkgconf", "swiftformat", "zstd", "gmp", From 6e8ddff8ff688f7847eb83d5d65f35746355238b Mon Sep 17 00:00:00 2001 From: susmitamane <susmitamane@github.com> Date: Fri, 22 Nov 2024 20:05:31 +0530 Subject: [PATCH 3268/3485] [macOS] Add Ruby toolcache on arm64 images. (#10768) Co-authored-by: Erik Bershel <erik-bershel@github.com> --- images/macos/scripts/build/install-ruby.sh | 63 ++++++++++--------- .../docs-gen/SoftwareReport.Toolcache.psm1 | 6 +- .../{Ruby.arm64.Tests.ps1 => Ruby.Tests.ps1} | 13 ++-- images/macos/scripts/tests/Ruby.x64.Tests.ps1 | 26 -------- images/macos/toolsets/toolset-13.json | 8 +++ images/macos/toolsets/toolset-14.json | 8 +++ images/macos/toolsets/toolset-15.json | 10 ++- 7 files changed, 64 insertions(+), 70 deletions(-) rename images/macos/scripts/tests/{Ruby.arm64.Tests.ps1 => Ruby.Tests.ps1} (61%) delete mode 100644 images/macos/scripts/tests/Ruby.x64.Tests.ps1 diff --git a/images/macos/scripts/build/install-ruby.sh b/images/macos/scripts/build/install-ruby.sh index e93ca6ab2df1..413e89349eda 100644 --- a/images/macos/scripts/build/install-ruby.sh +++ b/images/macos/scripts/build/install-ruby.sh @@ -12,8 +12,10 @@ echo "Installing Ruby..." brew_smart_install "ruby@${DEFAULT_RUBY_VERSION}" if [[ $arch == "arm64" ]]; then export PATH=/opt/homebrew/opt/ruby@${DEFAULT_RUBY_VERSION}/bin:$PATH + ruby_suffix="macos-13-arm64" else export PATH=/usr/local/opt/ruby@${DEFAULT_RUBY_VERSION}/bin:$PATH + ruby_suffix="macos-latest" fi GEM_PATH=$(gem env|awk '/EXECUTABLE DIRECTORY/ {print $4}') @@ -24,37 +26,36 @@ else echo 'export PATH="$GEM_PATH:/usr/local/opt/ruby@'${DEFAULT_RUBY_VERSION}'/bin:$PATH"' >> $HOME/.bashrc fi -if ! is_Arm64; then - echo "Install Ruby from toolset..." - [ -n "$API_PAT" ] && authString=(-H "Authorization: token ${API_PAT}") - PACKAGE_TAR_NAMES=$(curl "${authString[@]}" -fsSL "https://api.github.com/repos/ruby/ruby-builder/releases/latest" | jq -r '.assets[].name') - TOOLSET_VERSIONS=$(get_toolset_value '.toolcache[] | select(.name | contains("Ruby")) | .arch.'$arch'.versions[]') - RUBY_PATH=$AGENT_TOOLSDIRECTORY/Ruby +echo "Install Ruby from toolset..." +[ -n "$API_PAT" ] && authString=(-H "Authorization: token ${API_PAT}") +PACKAGE_TAR_NAMES=$(curl "${authString[@]}" -fsSL "https://api.github.com/repos/ruby/ruby-builder/releases/latest" | jq -r '.assets[].name') +TOOLSET_VERSIONS=$(get_toolset_value '.toolcache[] | select(.name | contains("Ruby")) | .arch.'$arch'.versions[]') +RUBY_PATH=$AGENT_TOOLSDIRECTORY/Ruby - echo "Check if Ruby hostedtoolcache folder exists..." - if [[ ! -d $RUBY_PATH ]]; then - mkdir -p $RUBY_PATH - fi - echo "ruby path - $RUBY_PATH " - for TOOLSET_VERSION in ${TOOLSET_VERSIONS[@]}; do - PACKAGE_TAR_NAME=$(echo "$PACKAGE_TAR_NAMES" | grep "^ruby-${TOOLSET_VERSION}-macos-latest.tar.gz$" | egrep -v "rc|preview" | sort -V | tail -1) - RUBY_VERSION=$(echo "$PACKAGE_TAR_NAME" | cut -d'-' -f 2) - RUBY_VERSION_PATH="$RUBY_PATH/$RUBY_VERSION" - - echo "Create Ruby $RUBY_VERSION directory..." - mkdir -p $RUBY_VERSION_PATH - - echo "Downloading tar archive $PACKAGE_TAR_NAME" - ARCHIVE_PATH=$(download_with_retry "https://github.com/ruby/ruby-builder/releases/download/toolcache/${PACKAGE_TAR_NAME}") - - echo "Expand $PACKAGE_TAR_NAME to the $RUBY_VERSION_PATH folder" - tar xf $ARCHIVE_PATH -C $RUBY_VERSION_PATH - COMPLETE_FILE_PATH=$RUBY_VERSION_PATH/x64.complete - if [[ ! -f $COMPLETE_FILE_PATH ]]; then - echo "Create complete file" - touch $COMPLETE_FILE_PATH - fi - done +echo "Check if Ruby hostedtoolcache folder exists..." +if [[ ! -d $RUBY_PATH ]]; then + mkdir -p $RUBY_PATH fi +echo "ruby path - $RUBY_PATH" + +for toolset_version in ${TOOLSET_VERSIONS[@]}; do + package_tar_name=$(echo "$PACKAGE_TAR_NAMES" | grep "^ruby-${toolset_version}-${ruby_suffix}.tar.gz$" | egrep -v "rc|preview" | sort -V | tail -1) + ruby_version=$(echo "$package_tar_name" | cut -d'-' -f 2) + ruby_version_path="$RUBY_PATH/$ruby_version" + + echo "Create Ruby $ruby_version directory..." + mkdir -p $ruby_version_path + + echo "Downloading tar archive $package_tar_name" + archive_path=$(download_with_retry "https://github.com/ruby/ruby-builder/releases/download/toolcache/${package_tar_name}") + + echo "Expand $package_tar_name to the $ruby_version_path folder" + tar xf $archive_path -C $ruby_version_path + complete_file_path=$ruby_version_path/$arch.complete + if [[ ! -f $complete_file_path ]]; then + echo "Create complete file" + touch $complete_file_path + fi +done -invoke_tests "Ruby.$arch" +invoke_tests "Ruby" diff --git a/images/macos/scripts/docs-gen/SoftwareReport.Toolcache.psm1 b/images/macos/scripts/docs-gen/SoftwareReport.Toolcache.psm1 index 40c028c83a91..67576ec0d552 100644 --- a/images/macos/scripts/docs-gen/SoftwareReport.Toolcache.psm1 +++ b/images/macos/scripts/docs-gen/SoftwareReport.Toolcache.psm1 @@ -42,13 +42,9 @@ function Build-ToolcacheSection { [ToolVersionsListNode]::new("PyPy", $(Get-ToolcachePyPyVersions), '^\d+\.\d+', "List") ) } - if ((-not $os.IsVenturaArm64) -and (-not $os.IsSonomaArm64) -and (-not $os.IsSequoiaArm64)) { - $nodes += @( - [ToolVersionsListNode]::new("Ruby", $(Get-ToolcacheRubyVersions), '^\d+\.\d+', "List") - ) - } $nodes += @( + [ToolVersionsListNode]::new("Ruby", $(Get-ToolcacheRubyVersions), '^\d+\.\d+', "List") [ToolVersionsListNode]::new("Python", $(Get-ToolcachePythonVersions), '^\d+\.\d+', "List"), [ToolVersionsListNode]::new("Node.js", $(Get-ToolcacheNodeVersions), '^\d+', "List"), [ToolVersionsListNode]::new("Go", $(Get-ToolcacheGoVersions), '^\d+\.\d+', "List") diff --git a/images/macos/scripts/tests/Ruby.arm64.Tests.ps1 b/images/macos/scripts/tests/Ruby.Tests.ps1 similarity index 61% rename from images/macos/scripts/tests/Ruby.arm64.Tests.ps1 rename to images/macos/scripts/tests/Ruby.Tests.ps1 index 45cc879f1a99..12dd0fc79361 100644 --- a/images/macos/scripts/tests/Ruby.arm64.Tests.ps1 +++ b/images/macos/scripts/tests/Ruby.Tests.ps1 @@ -1,9 +1,7 @@ Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" Import-Module "$PSScriptRoot/Helpers.psm1" -DisableNameChecking -$os = Get-OSVersion - -Describe "Ruby" -Skip:(-not $os.IsArm64) { +Describe "Ruby" { It "Ruby is available" { "ruby --version" | Should -ReturnZeroExitCode } @@ -13,10 +11,11 @@ Describe "Ruby" -Skip:(-not $os.IsArm64) { } It "Ruby tools are consistent" { - $expectedPrefix = "/opt/homebrew" - Get-ToolPath "ruby" | Should -Match "$($expectedPrefix)*" - Get-ToolPath "gem" | Should -Match "$($expectedPrefix)*" - Get-ToolPath "bundler" | Should -Match "$($expectedPrefix)*" + $os = Get-OSVersion + $expectedPrefix = if ($os.IsArm64) { "/opt/homebrew" } else { "/usr/local" } + Get-ToolPath "ruby" | Should -Match "^$expectedPrefix.*" + Get-ToolPath "gem" | Should -Match "^$expectedPrefix.*" + Get-ToolPath "bundler" | Should -Match "^$expectedPrefix.*" } It "Ruby gems permissions are valid" { diff --git a/images/macos/scripts/tests/Ruby.x64.Tests.ps1 b/images/macos/scripts/tests/Ruby.x64.Tests.ps1 deleted file mode 100644 index b458278b3d25..000000000000 --- a/images/macos/scripts/tests/Ruby.x64.Tests.ps1 +++ /dev/null @@ -1,26 +0,0 @@ -Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" -Import-Module "$PSScriptRoot/Helpers.psm1" -DisableNameChecking - -$os = Get-OSVersion - -Describe "Ruby" -Skip:($os.IsArm64) { - It "Ruby is available" { - "ruby --version" | Should -ReturnZeroExitCode - } - - It "Ruby is installed via HomeBrew" { - Get-ToolPath "ruby" | Should -Not -BeLike "/usr/bin/ruby*" - } - - It "Ruby tools are consistent" { - $expectedPrefix = "/usr/local" - Get-ToolPath "ruby" | Should -Match "$($expectedPrefix)*" - Get-ToolPath "gem" | Should -Match "$($expectedPrefix)*" - Get-ToolPath "bundler" | Should -Match "$($expectedPrefix)*" - } - - It "Ruby gems permissions are valid" { - "gem install bundle" | Should -ReturnZeroExitCode - "gem uninstall bundle" | Should -ReturnZeroExitCode - } -} diff --git a/images/macos/toolsets/toolset-13.json b/images/macos/toolsets/toolset-13.json index e859c1cc1346..3a10f5658ece 100644 --- a/images/macos/toolsets/toolset-13.json +++ b/images/macos/toolsets/toolset-13.json @@ -215,6 +215,14 @@ "3.2.*", "3.3.*" ] + }, + "arm64": { + "versions": [ + "3.0.*", + "3.1.*", + "3.2.*", + "3.3.*" + ] } } } diff --git a/images/macos/toolsets/toolset-14.json b/images/macos/toolsets/toolset-14.json index 5f512dd85119..833a4506e088 100644 --- a/images/macos/toolsets/toolset-14.json +++ b/images/macos/toolsets/toolset-14.json @@ -203,6 +203,14 @@ "3.2.*", "3.3.*" ] + }, + "arm64": { + "versions": [ + "3.0.*", + "3.1.*", + "3.2.*", + "3.3.*" + ] } } } diff --git a/images/macos/toolsets/toolset-15.json b/images/macos/toolsets/toolset-15.json index 9f83e33fea56..1ad1b8490204 100644 --- a/images/macos/toolsets/toolset-15.json +++ b/images/macos/toolsets/toolset-15.json @@ -188,7 +188,15 @@ "x64": { "versions": [ "3.1.*", - "3.2.*" + "3.2.*", + "3.3.*" + ] + }, + "arm64": { + "versions": [ + "3.1.*", + "3.2.*", + "3.3.*" ] } } From 166ca4e9c287806638e00aeb3f672f2dd2446e6c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 22 Nov 2024 15:26:36 +0000 Subject: [PATCH 3269/3485] Updating readme file for macos-14-arm64 version 20241119.509 (#11011) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-14-arm64-Readme.md | 150 +++++++++++++++----------- 1 file changed, 89 insertions(+), 61 deletions(-) diff --git a/images/macos/macos-14-arm64-Readme.md b/images/macos/macos-14-arm64-Readme.md index b0b48dcc0424..963ee220fa35 100644 --- a/images/macos/macos-14-arm64-Readme.md +++ b/images/macos/macos-14-arm64-Readme.md @@ -1,8 +1,8 @@ | Announcements | |-| -| [[ macOS ] Node.js version 16 will be removed from macOS13 and macOS13 arm64 images on November, 18.](https://github.com/actions/runner-images/issues/10873) | +| [[ macOS ] Node.js version 16 will be removed from macOS13 and macOS13 arm64 images on November, 25.](https://github.com/actions/runner-images/issues/10873) | | [[macOS] OpenSSL 1.1 will be removed and OpenSSL 3 will be the default for all macOS images from November 4](https://github.com/actions/runner-images/issues/10817) | -| [[macOS] Python 3.9 and 3.10 will be removed from macOS13 arm64 and macOS14 arm64 on November 18.](https://github.com/actions/runner-images/issues/10812) | +| [[macOS] Python 3.9 and 3.10 will be removed from macOS13 arm64 and macOS14 arm64 on November 25.](https://github.com/actions/runner-images/issues/10812) | | [[macOS] The macOS 12 Actions runner image will begin deprecation on 10/7/24 and will be fully unsupported by 12/3/24 for GitHub and ADO](https://github.com/actions/runner-images/issues/10721) | | [[macOS] Support policy changes; Xcode 14 and 16 will be removed from macOS 14 on November 4](https://github.com/actions/runner-images/issues/10703) | | [macOS 15 (Sequoia) is now available as a public beta in GitHub Actions](https://github.com/actions/runner-images/issues/10686) | @@ -10,12 +10,12 @@ # macOS 14 - OS Version: macOS 14.7.1 (23H222) - Kernel Version: Darwin 23.6.0 -- Image Version: 20241108.442 +- Image Version: 20241119.509 ## Installed Software ### Language and Runtime -- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.410, 8.0.101, 8.0.204, 8.0.303, 8.0.403 +- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.410, 8.0.101, 8.0.204, 8.0.303, 8.0.404 - Bash 3.2.57(1)-release - Clang/LLVM 15.0.0 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` @@ -36,7 +36,7 @@ - Bundler 2.5.23 - Carthage 0.40.0 - CocoaPods 1.16.2 -- Homebrew 4.4.4 +- Homebrew 4.4.6 - NPM 10.8.2 - NuGet 6.3.1.1 - Pip3 24.2 (python 3.13) @@ -47,53 +47,53 @@ ### Project Management - Apache Ant 1.10.15 - Apache Maven 3.9.9 -- Gradle 8.10.2 +- Gradle 8.11 ### Utilities - 7-Zip 17.05 - aria2 1.37.0 -- azcopy 10.26.0 -- bazel 7.4.0 +- azcopy 10.27.1 +- bazel 7.4.1 - bazelisk 1.23.0 - bsdtar 3.5.3 - available by 'tar' alias - Curl 8.7.1 - Git 2.47.0 - Git LFS 3.5.1 -- GitHub CLI 2.61.0 +- GitHub CLI 2.62.0 - GNU Tar 1.35 - available by 'gtar' alias -- GNU Wget 1.24.5 +- GNU Wget 1.25.0 - gpg (GnuPG) 2.4.6 - jq 1.7.1 - OpenSSL 1.1.1w 11 Sep 2023 - Packer 1.11.2 - pkg-config 0.29.2 - Unxip 3.1 -- yq 4.44.3 +- yq 4.44.5 - zstd 1.5.6 ### Tools -- AWS CLI 2.19.4 -- AWS SAM CLI 1.127.0 +- AWS CLI 2.22.0 +- AWS SAM CLI 1.129.0 - AWS Session Manager CLI 1.2.688.0 -- Azure CLI 2.65.0 +- Azure CLI 2.67.0 - Azure CLI (azure-devops) 1.0.1 -- Bicep CLI 0.31.34 +- Bicep CLI 0.31.92 - Cmake 3.31.0 - CodeQL Action Bundle 2.19.3 - Fastlane 2.225.0 -- SwiftFormat 0.54.6 -- Xcbeautify 2.14.1 +- SwiftFormat 0.55.0 +- Xcbeautify 2.15.0 - Xcode Command Line Tools 16.1.0.0.1.1729049160 - Xcodes 1.6.0 ### Linters ### Browsers -- Safari 18.1 (19619.2.8.111.5) -- SafariDriver 18.1 (19619.2.8.111.5) -- Google Chrome 130.0.6723.117 -- Google Chrome for Testing 130.0.6723.116 -- ChromeDriver 130.0.6723.116 +- Safari 18.1.1 (19619.2.8.111.7) +- SafariDriver 18.1.1 (19619.2.8.111.7) +- Google Chrome 131.0.6778.86 +- Google Chrome for Testing 131.0.6778.85 +- ChromeDriver 131.0.6778.85 - Selenium server 4.26.0 #### Environment variables @@ -120,7 +120,7 @@ - 3.13.0 #### Node.js -- 18.20.4 +- 18.20.5 - 20.18.0 - 22.11.0 @@ -148,13 +148,15 @@ - PSScriptAnalyzer: 1.23.0 ### Xcode -| Version | Build | Path | Symlinks | -| -------------- | ------- | ------------------------------ | --------------------------------------------------------- | -| 15.4 (default) | 15F31d | /Applications/Xcode_15.4.app | /Applications/Xcode_15.4.0.app<br>/Applications/Xcode.app | -| 15.3 | 15E204a | /Applications/Xcode_15.3.app | /Applications/Xcode_15.3.0.app | -| 15.2 | 15C500b | /Applications/Xcode_15.2.app | /Applications/Xcode_15.2.0.app | -| 15.1 | 15C65 | /Applications/Xcode_15.1.app | /Applications/Xcode_15.1.0.app | -| 15.0.1 | 15A507 | /Applications/Xcode_15.0.1.app | /Applications/Xcode_15.0.app | +| Version | Build | Path | Symlinks | +| -------------- | ------- | ------------------------------ | -------------------------------------------------------------- | +| 16.1 | 16B40 | /Applications/Xcode_16.1.app | /Applications/Xcode_16.1.0.app | +| 16.0 | 16A242d | /Applications/Xcode_16.app | /Applications/Xcode_16.0.0.app<br>/Applications/Xcode_16.0.app | +| 15.4 (default) | 15F31d | /Applications/Xcode_15.4.app | /Applications/Xcode_15.4.0.app<br>/Applications/Xcode.app | +| 15.3 | 15E204a | /Applications/Xcode_15.3.app | /Applications/Xcode_15.3.0.app | +| 15.2 | 15C500b | /Applications/Xcode_15.2.app | /Applications/Xcode_15.2.0.app | +| 15.1 | 15C65 | /Applications/Xcode_15.1.app | /Applications/Xcode_15.1.0.app | +| 15.0.1 | 15A507 | /Applications/Xcode_15.0.1.app | /Applications/Xcode_15.0.app | #### Installed SDKs | SDK | SDK Name | Xcode Version | @@ -163,73 +165,99 @@ | macOS 14.2 | macosx14.2 | 15.1, 15.2 | | macOS 14.4 | macosx14.4 | 15.3 | | macOS 14.5 | macosx14.5 | 15.4 | +| macOS 15.0 | macosx15.0 | 16.0 | +| macOS 15.1 | macosx15.1 | 16.1 | | iOS 17.0 | iphoneos17.0 | 15.0.1 | | iOS 17.2 | iphoneos17.2 | 15.1, 15.2 | | iOS 17.4 | iphoneos17.4 | 15.3 | | iOS 17.5 | iphoneos17.5 | 15.4 | +| iOS 18.0 | iphoneos18.0 | 16.0 | +| iOS 18.1 | iphoneos18.1 | 16.1 | | Simulator - iOS 17.0 | iphonesimulator17.0 | 15.0.1 | | Simulator - iOS 17.2 | iphonesimulator17.2 | 15.1, 15.2 | | Simulator - iOS 17.4 | iphonesimulator17.4 | 15.3 | | Simulator - iOS 17.5 | iphonesimulator17.5 | 15.4 | +| Simulator - iOS 18.0 | iphonesimulator18.0 | 16.0 | +| Simulator - iOS 18.1 | iphonesimulator18.1 | 16.1 | | tvOS 17.0 | appletvos17.0 | 15.0.1 | | tvOS 17.2 | appletvos17.2 | 15.1, 15.2 | | tvOS 17.4 | appletvos17.4 | 15.3 | | tvOS 17.5 | appletvos17.5 | 15.4 | +| tvOS 18.0 | appletvos18.0 | 16.0 | +| tvOS 18.1 | appletvos18.1 | 16.1 | | Simulator - tvOS 17.0 | appletvsimulator17.0 | 15.0.1 | | Simulator - tvOS 17.2 | appletvsimulator17.2 | 15.1, 15.2 | | Simulator - tvOS 17.4 | appletvsimulator17.4 | 15.3 | | Simulator - tvOS 17.5 | appletvsimulator17.5 | 15.4 | +| Simulator - tvOS 18.0 | appletvsimulator18.0 | 16.0 | +| Simulator - tvOS 18.1 | appletvsimulator18.1 | 16.1 | | watchOS 10.0 | watchos10.0 | 15.0.1 | | watchOS 10.2 | watchos10.2 | 15.1, 15.2 | | watchOS 10.4 | watchos10.4 | 15.3 | | watchOS 10.5 | watchos10.5 | 15.4 | +| watchOS 11.0 | watchos11.0 | 16.0 | +| watchOS 11.1 | watchos11.1 | 16.1 | | Simulator - watchOS 10.0 | watchsimulator10.0 | 15.0.1 | | Simulator - watchOS 10.2 | watchsimulator10.2 | 15.1, 15.2 | | Simulator - watchOS 10.4 | watchsimulator10.4 | 15.3 | | Simulator - watchOS 10.5 | watchsimulator10.5 | 15.4 | -| Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | +| Simulator - watchOS 11.0 | watchsimulator11.0 | 16.0 | +| Simulator - watchOS 11.1 | watchsimulator11.1 | 16.1 | | visionOS 1.0 | xros1.0 | 15.2 | +| Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | | visionOS 1.1 | xros1.1 | 15.3 | | Simulator - visionOS 1.1 | xrsimulator1.1 | 15.3 | -| visionOS 1.2 | xros1.2 | 15.4 | | Simulator - visionOS 1.2 | xrsimulator1.2 | 15.4 | +| visionOS 1.2 | xros1.2 | 15.4 | +| Simulator - visionOS 2.0 | xrsimulator2.0 | 16.0 | +| visionOS 2.0 | xros2.0 | 16.0 | +| Simulator - visionOS 2.1 | xrsimulator2.1 | 16.1 | +| visionOS 2.1 | xros2.1 | 16.1 | | DriverKit 23.0 | driverkit23.0 | 15.0.1 | | DriverKit 23.2 | driverkit23.2 | 15.1, 15.2 | | DriverKit 23.4 | driverkit23.4 | 15.3 | | DriverKit 23.5 | driverkit23.5 | 15.4 | +| DriverKit 24.0 | driverkit24.0 | 16.0 | +| DriverKit 24.1 | driverkit24.1 | 16.1 | #### Installed Simulators -| OS | Simulators | -| ------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | -| iOS 17.0 | iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 17.2 | iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 17.4 | iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | -| iOS 17.5 | iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | -| tvOS 17.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 17.2 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 17.4 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 17.5 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| watchOS 10.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra 2 (49mm) | -| watchOS 10.2 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra 2 (49mm) | -| watchOS 10.4 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra 2 (49mm) | -| watchOS 10.5 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra 2 (49mm) | -| visionOS 1.0 | Apple Vision Pro | -| visionOS 1.1 | Apple Vision Pro | -| visionOS 1.2 | Apple Vision Pro | +| OS | Simulators | +| ------------ | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| iOS 17.0 | iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 17.2 | iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 17.4 | iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | +| iOS 17.5 | iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | +| iOS 18.0 | iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone 16<br>iPhone 16 Plus<br>iPhone 16 Pro<br>iPhone 16 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | +| iOS 18.1 | iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone 16<br>iPhone 16 Plus<br>iPhone 16 Pro<br>iPhone 16 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad mini (A17 Pro)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | +| tvOS 17.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 17.2 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 17.4 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 17.5 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 18.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 18.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| watchOS 10.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 10.2 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 10.4 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 10.5 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 11.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 10 (42mm)<br>Apple Watch Series 10 (46mm)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 11.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 10 (42mm)<br>Apple Watch Series 10 (46mm)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra 2 (49mm) | +| visionOS 1.0 | Apple Vision Pro | +| visionOS 1.1 | Apple Vision Pro | +| visionOS 1.2 | Apple Vision Pro | ### Android -| Package Name | Version | -| -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 11.0 | -| Android Emulator | 35.2.10 | -| Android SDK Build-tools | 35.0.0<br>34.0.0<br>33.0.2 33.0.3 | -| Android SDK Platforms | android-35 (rev 1)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | -| Android SDK Platform-Tools | 35.0.2 | -| Android Support Repository | 47.0.0 | -| CMake | 3.22.1 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 26.3.11579264 (default)<br>27.2.12479018 | +| Package Name | Version | +| -------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 11.0 | +| Android Emulator | 35.2.10 | +| Android SDK Build-tools | 35.0.0<br>34.0.0<br>33.0.2 33.0.3 | +| Android SDK Platforms | android-35-ext14 (rev 1)<br>android-35 (rev 1)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | +| Android SDK Platform-Tools | 35.0.2 | +| Android Support Repository | 47.0.0 | +| CMake | 3.31.0 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 26.3.11579264 (default)<br>27.2.12479018 | #### Environment variables | Name | Value | From ffd458e26366fb9f0e99222020cbaf8bce86a254 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Sat, 23 Nov 2024 14:15:56 +0100 Subject: [PATCH 3270/3485] [Windows] Update Visual Studio signature (#11026) --- images/windows/toolsets/toolset-2022.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/windows/toolsets/toolset-2022.json b/images/windows/toolsets/toolset-2022.json index e15af72cd5ac..7067b0c89871 100644 --- a/images/windows/toolsets/toolset-2022.json +++ b/images/windows/toolsets/toolset-2022.json @@ -179,7 +179,7 @@ "subversion" : "17", "edition" : "Enterprise", "channel": "release", - "signature": "8F985BE8FD256085C90A95D3C74580511A1DB975", + "signature": "245D262748012A4FE6CE8BA6C951A4C4AFBC3E5D", "workloads": [ "Component.Dotfuscator", "Component.Linux.CMake", From 75e2e796b8171ce457c860b0c0f8f441bad21468 Mon Sep 17 00:00:00 2001 From: RaviAkshintala <167848931+RaviAkshintala@users.noreply.github.com> Date: Mon, 25 Nov 2024 16:38:46 +0530 Subject: [PATCH 3271/3485] [Windows] Updated the DACF thumprint signature (#11030) --- images/windows/scripts/build/Install-DACFx.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/windows/scripts/build/Install-DACFx.ps1 b/images/windows/scripts/build/Install-DACFx.ps1 index 80a70fecb596..1d4a40dedebf 100644 --- a/images/windows/scripts/build/Install-DACFx.ps1 +++ b/images/windows/scripts/build/Install-DACFx.ps1 @@ -5,6 +5,6 @@ Install-Binary -Type MSI ` -Url 'https://aka.ms/dacfx-msi' ` - -ExpectedSignature 'C2048FB509F1C37A8C3E9EC6648118458AA01780' + -ExpectedSignature '8F985BE8FD256085C90A95D3C74580511A1DB975' Invoke-PesterTests -TestFile "Tools" -TestName "DACFx" From a9d89fa56310d366813335a46c4d9ab58a63fd85 Mon Sep 17 00:00:00 2001 From: Prasanjit Sahoo <160633557+prasanjitsahoo@users.noreply.github.com> Date: Mon, 25 Nov 2024 19:07:58 +0530 Subject: [PATCH 3272/3485] [MacOS]Update php-8.3 to php-8.4 (#11035) --- images/macos/toolsets/toolset-13.json | 2 +- images/macos/toolsets/toolset-14.json | 2 +- images/macos/toolsets/toolset-15.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/images/macos/toolsets/toolset-13.json b/images/macos/toolsets/toolset-13.json index 3a10f5658ece..76eeed4db0c6 100644 --- a/images/macos/toolsets/toolset-13.json +++ b/images/macos/toolsets/toolset-13.json @@ -234,7 +234,7 @@ "version": "15" }, "php": { - "version": "8.3" + "version": "8.4" }, "mono": { "framework":{ diff --git a/images/macos/toolsets/toolset-14.json b/images/macos/toolsets/toolset-14.json index 833a4506e088..1882dd0a9540 100644 --- a/images/macos/toolsets/toolset-14.json +++ b/images/macos/toolsets/toolset-14.json @@ -222,7 +222,7 @@ "version": "15" }, "php": { - "version": "8.3" + "version": "8.4" }, "pwsh": { "version": "7.4" diff --git a/images/macos/toolsets/toolset-15.json b/images/macos/toolsets/toolset-15.json index 1ad1b8490204..47b5302afa13 100644 --- a/images/macos/toolsets/toolset-15.json +++ b/images/macos/toolsets/toolset-15.json @@ -209,7 +209,7 @@ "version": "18" }, "php": { - "version": "8.3" + "version": "8.4" }, "pwsh": { "version": "7.4" From fc643c2fc8883bc1c078a381a15805f945bdffad Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Mon, 25 Nov 2024 14:59:18 +0100 Subject: [PATCH 3273/3485] [macOS] Add Xcode 15.4 to macOS-15; update disk space test (#11023) --- images/macos/scripts/tests/System.Tests.ps1 | 7 +++++-- images/macos/toolsets/toolset-15.json | 6 ++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/images/macos/scripts/tests/System.Tests.ps1 b/images/macos/scripts/tests/System.Tests.ps1 index 8f55de538883..a85bec6566e7 100644 --- a/images/macos/scripts/tests/System.Tests.ps1 +++ b/images/macos/scripts/tests/System.Tests.ps1 @@ -8,8 +8,11 @@ Describe "Disk free space" { # 10GB here: https://docs.microsoft.com/en-us/azure/devops/pipelines/agents/hosted?view=azure-devops#capabilities-and-limitations # 14GB here: https://docs.github.com/en/actions/using-github-hosted-runners/using-github-hosted-runners/about-github-hosted-runners#standard-github-hosted-runners-for-public-repositories # 30GB due to: https://github.com/actions/runner-images/issues/10511 - $freeSpace = (Get-PSDrive "/").Free - $freeSpace | Should -BeGreaterOrEqual 30GB + $diskInfo = Get-PSDrive "/" + $totalSpaceGB = [math]::Floor(($diskInfo.Used + $diskInfo.Free) / 1GB) + $freeSpaceGB = [math]::Floor($diskInfo.Free / 1GB) + Write-Host " [i] Disk size: ${totalSpaceGB} GB; Free space: ${freeSpaceGB} GB" + $freeSpaceGB | Should -BeGreaterOrEqual 30 } } diff --git a/images/macos/toolsets/toolset-15.json b/images/macos/toolsets/toolset-15.json index 47b5302afa13..c9558ca2aceb 100644 --- a/images/macos/toolsets/toolset-15.json +++ b/images/macos/toolsets/toolset-15.json @@ -5,14 +5,16 @@ "versions": [ { "link": "16.2_beta_3", "version": "16.2.0-Beta.3+16C5023f", "symlinks": ["16.2"], "install_runtimes": "true", "sha256": "04f3a3e3daf5d07e5ecfdf3cd7fc34fcf0a654884388d56f9f69942a9e3b1e66"}, { "link": "16.1", "version": "16.1+16B40", "install_runtimes": "true", "sha256": "8ca961d55981f983d21b99a95a6b0ac04905b837f6e11346ee86d28f12afe720"}, - { "link": "16", "version": "16.0.0+16A242d", "symlinks": ["16.0"], "install_runtimes": "true", "sha256": "4a26c3d102a55c7222fb145e0ee1503249c9c26c6e02dc64d783c8810b37b1e3"} + { "link": "16", "version": "16.0.0+16A242d", "symlinks": ["16.0"], "install_runtimes": "true", "sha256": "4a26c3d102a55c7222fb145e0ee1503249c9c26c6e02dc64d783c8810b37b1e3"}, + { "link": "15.4", "version": "15.4.0+15F31d", "install_runtimes": "true", "sha256": "82d3d61804ff3f4c7c82085e91dc701037ddaa770e542848b2477e22f4e8aa7a"} ] }, "arm64":{ "versions": [ { "link": "16.2_beta_3", "version": "16.2.0-Beta.3+16C5023f", "symlinks": ["16.2"], "install_runtimes": "true", "sha256": "04f3a3e3daf5d07e5ecfdf3cd7fc34fcf0a654884388d56f9f69942a9e3b1e66"}, { "link": "16.1", "version": "16.1+16B40", "install_runtimes": "true", "sha256": "8ca961d55981f983d21b99a95a6b0ac04905b837f6e11346ee86d28f12afe720"}, - { "link": "16", "version": "16.0.0+16A242d", "symlinks": ["16.0"], "install_runtimes": "true", "sha256": "4a26c3d102a55c7222fb145e0ee1503249c9c26c6e02dc64d783c8810b37b1e3"} + { "link": "16", "version": "16.0.0+16A242d", "symlinks": ["16.0"], "install_runtimes": "true", "sha256": "4a26c3d102a55c7222fb145e0ee1503249c9c26c6e02dc64d783c8810b37b1e3"}, + { "link": "15.4", "version": "15.4.0+15F31d", "install_runtimes": "true", "sha256": "82d3d61804ff3f4c7c82085e91dc701037ddaa770e542848b2477e22f4e8aa7a"} ] } }, From b3342fe129ce5149e43488e62344352f99755ea2 Mon Sep 17 00:00:00 2001 From: Subir Ghosh <subir0071@users.noreply.github.com> Date: Mon, 25 Nov 2024 12:34:53 -0700 Subject: [PATCH 3274/3485] -S (#10979) chore: Update gist url for release basdges --- README.md | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 7b6064486888..0f32f0cb1488 100644 --- a/README.md +++ b/README.md @@ -21,18 +21,18 @@ To build a VM machine from this repo's source, see the [instructions](docs/creat | Image | YAML Label | Included Software | Rollout Status of Latest Image Release | | --------------------|---------------------|--------------------|--------------------| -| Ubuntu 24.04 | `ubuntu-24.04` | [ubuntu-24.04] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fijunaidm%2F0b5459bbe18604a639e1d2f7accd204f%2Fraw%2Fubuntu24.json) | -| Ubuntu 22.04 | `ubuntu-latest` or `ubuntu-22.04` | [ubuntu-22.04] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fijunaidm%2F0b5459bbe18604a639e1d2f7accd204f%2Fraw%2Fubuntu22.json) | -| Ubuntu 20.04 | `ubuntu-20.04` | [ubuntu-20.04] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fijunaidm%2F0b5459bbe18604a639e1d2f7accd204f%2Fraw%2Fubuntu20.json) | -| macOS 15 <sup>beta</sup> | `macos-15-large`| [macOS-15] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fijunaidm%2F0b5459bbe18604a639e1d2f7accd204f%2Fraw%2Fmacos-15.json) | -| macOS 15 Arm64 <sup>beta</sup> | `macos-15` or `macos-15-xlarge` | [macOS-15-arm64] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fijunaidm%2F0b5459bbe18604a639e1d2f7accd204f%2Fraw%2Fmacos-15-arm64.json) | -| macOS 14 | `macos-latest-large` or `macos-14-large`| [macOS-14] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fijunaidm%2F0b5459bbe18604a639e1d2f7accd204f%2Fraw%2Fmacos-14.json) | -| macOS 14 Arm64 |`macos-latest`, `macos-14`, `macos-latest-xlarge` or `macos-14-xlarge`| [macOS-14-arm64] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fijunaidm%2F0b5459bbe18604a639e1d2f7accd204f%2Fraw%2Fmacos-14-arm64.json) | -| macOS 13 | `macos-13` or `macos-13-large` | [macOS-13] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fijunaidm%2F0b5459bbe18604a639e1d2f7accd204f%2Fraw%2Fmacos-13.json) | -| macOS 13 Arm64 | `macos-13-xlarge` | [macOS-13-arm64] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fijunaidm%2F0b5459bbe18604a639e1d2f7accd204f%2Fraw%2Fmacos-13-arm64.json) | -| macOS 12 <sup>deprecated</sup> | `macos-12` or `macos-12-large`| [macOS-12] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fijunaidm%2F0b5459bbe18604a639e1d2f7accd204f%2Fraw%2Fmacos-12.json) | -| Windows Server 2022 | `windows-latest` or `windows-2022` | [windows-2022] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fijunaidm%2F0b5459bbe18604a639e1d2f7accd204f%2Fraw%2Fwin22.json) | -| Windows Server 2019 | `windows-2019` | [windows-2019] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fijunaidm%2F0b5459bbe18604a639e1d2f7accd204f%2Fraw%2Fwin19.json) | +| Ubuntu 24.04 | `ubuntu-24.04` | [ubuntu-24.04] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fsubir0071%2F385e39188f4280878bada99250e99db7%2Fraw%2Fubuntu24.json) | +| Ubuntu 22.04 | `ubuntu-latest` or `ubuntu-22.04` | [ubuntu-22.04] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fsubir0071%2F385e39188f4280878bada99250e99db7%2Fraw%2Fubuntu22.json) | +| Ubuntu 20.04 | `ubuntu-20.04` | [ubuntu-20.04] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fsubir0071%2F385e39188f4280878bada99250e99db7%2Fraw%2Fubuntu20.json) | +| macOS 15 <sup>beta</sup> | `macos-15-large`| [macOS-15] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fsubir0071%2F385e39188f4280878bada99250e99db7%2Fraw%2Fmacos-15.json) | +| macOS 15 Arm64 <sup>beta</sup> | `macos-15` or `macos-15-xlarge` | [macOS-15-arm64] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fsubir0071%2F385e39188f4280878bada99250e99db7%2Fraw%2Fmacos-15-arm64.json) | +| macOS 14 | `macos-latest-large` or `macos-14-large`| [macOS-14] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fsubir0071%2F385e39188f4280878bada99250e99db7%2Fraw%2Fmacos-14.json) | +| macOS 14 Arm64 |`macos-latest`, `macos-14`, `macos-latest-xlarge` or `macos-14-xlarge`| [macOS-14-arm64] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fsubir0071%2F385e39188f4280878bada99250e99db7%2Fraw%2Fmacos-14-arm64.json) | +| macOS 13 | `macos-13` or `macos-13-large` | [macOS-13] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fsubir0071%2F385e39188f4280878bada99250e99db7%2Fraw%2Fmacos-13.json) | +| macOS 13 Arm64 | `macos-13-xlarge` | [macOS-13-arm64] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fsubir0071%2F385e39188f4280878bada99250e99db7%2Fraw%2Fmacos-13-arm64.json) | +| macOS 12 <sup>deprecated</sup> | `macos-12` or `macos-12-large`| [macOS-12] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fsubir0071%2F385e39188f4280878bada99250e99db7%2Fraw%2Fmacos-12.json) | +| Windows Server 2022 | `windows-latest` or `windows-2022` | [windows-2022] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fsubir0071%2F385e39188f4280878bada99250e99db7%2Fraw%2Fwin22.json) | +| Windows Server 2019 | `windows-2019` | [windows-2019] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fsubir0071%2F385e39188f4280878bada99250e99db7%2Fraw%2Fwin19.json) | ### Label scheme From aba30c31f0406e249b1e77f7edfeed574649a3fb Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 26 Nov 2024 04:01:34 +0000 Subject: [PATCH 3275/3485] Updating readme file for ubuntu22 version 20241124.1.1 (#11039) Co-authored-by: Image generation service account. <no-reply@microsoft.com> --- images/ubuntu/Ubuntu2204-Readme.md | 82 +++++++++++++++--------------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/images/ubuntu/Ubuntu2204-Readme.md b/images/ubuntu/Ubuntu2204-Readme.md index ae3feb5bbe86..81510add946d 100644 --- a/images/ubuntu/Ubuntu2204-Readme.md +++ b/images/ubuntu/Ubuntu2204-Readme.md @@ -7,7 +7,7 @@ # Ubuntu 22.04 - OS Version: 22.04.5 LTS - Kernel Version: 6.5.0-1025-azure -- Image Version: 20241117.1.0 +- Image Version: 20241124.1.0 - Systemd version: 249.11-0ubuntu3.12 ## Installed Software @@ -33,7 +33,7 @@ ### Package Management - cpan 1.64 - Helm 3.16.3 -- Homebrew 4.4.5 +- Homebrew 4.4.6 - Miniconda 24.9.2 - Npm 10.8.2 - NuGet 6.6.1.2 @@ -41,7 +41,7 @@ - Pip3 22.0.2 - Pipx 1.7.1 - RubyGems 3.3.5 -- Vcpkg (build from commit 435a9415c) +- Vcpkg (build from commit 5e5d0e1cd) - Yarn 1.22.22 #### Environment variables @@ -60,7 +60,7 @@ to accomplish this. ### Project Management - Ant 1.10.12 -- Gradle 8.11 +- Gradle 8.11.1 - Lerna 8.1.9 - Maven 3.8.8 - Sbt 1.10.5 @@ -70,10 +70,10 @@ to accomplish this. - apt-fast 1.10.0 - AzCopy 10.27.1 - available by `azcopy` and `azcopy10` aliases - Bazel 7.4.1 -- Bazelisk 1.23.0 +- Bazelisk 1.24.0 - Bicep 0.31.92 - Buildah 1.23.1 -- CMake 3.31.0 +- CMake 3.31.1 - CodeQL Action Bundle 2.19.3 - Docker Amazon ECR Credential Helper 0.9.0 - Docker Compose v2 2.27.1 @@ -82,13 +82,13 @@ to accomplish this. - Docker Server 26.1.3 - Fastlane 2.225.0 - Git 2.47.0 -- Git LFS 3.5.1 +- Git LFS 3.6.0 - Git-ftp 1.6.0 - Haveged 1.9.14 - Heroku 9.5.0 - jq 1.6 - Kind 0.25.0 -- Kubectl 1.31.2 +- Kubectl 1.31.3 - Kustomize 5.5.0 - Leiningen 2.11.2 - MediaInfo 21.09 @@ -101,7 +101,7 @@ to accomplish this. - Packer 1.11.2 - Parcel 2.13.0 - Podman 3.4.4 -- Pulumi 3.139.0 +- Pulumi 3.141.0 - R 4.4.2 - Skopeo 1.4.1 - Sphinx Open Source Search Server 2.2.11 @@ -112,18 +112,18 @@ to accomplish this. - zstd 1.5.6 ### CLI Tools -- Alibaba Cloud CLI 3.0.233 -- AWS CLI 2.21.3 -- AWS CLI Session Manager Plugin 1.2.688.0 -- AWS SAM CLI 1.129.0 -- Azure CLI 2.66.0 +- Alibaba Cloud CLI 3.0.234 +- AWS CLI 2.22.4 +- AWS CLI Session Manager Plugin 1.2.694.0 +- AWS SAM CLI 1.131.0 +- Azure CLI 2.67.0 - Azure CLI (azure-devops) 1.0.1 - GitHub CLI 2.62.0 -- Google Cloud CLI 501.0.0 +- Google Cloud CLI 502.0.0 - Netlify CLI 17.37.2 -- OpenShift CLI 4.17.4 +- OpenShift CLI 4.17.5 - ORAS CLI 1.2.0 -- Vercel CLI 39.0.2 +- Vercel CLI 39.1.1 ### Java | Version | Environment Variable | @@ -162,10 +162,10 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.7.1 ### Browsers and Drivers -- Google Chrome 131.0.6778.69 -- ChromeDriver 131.0.6778.69 +- Google Chrome 131.0.6778.85 +- ChromeDriver 131.0.6778.85 - Chromium 131.0.6778.0 -- Microsoft Edge 131.0.2903.51 +- Microsoft Edge 131.0.2903.63 - Microsoft Edge WebDriver 131.0.2903.52 - Selenium server 4.26.0 - Mozilla Firefox 132.0.2 @@ -187,7 +187,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - sqlite3 3.37.2 #### PostgreSQL -- PostgreSQL 14.14 +- PostgreSQL 14.15 ``` User: postgres PostgreSQL service is disabled by default. @@ -205,7 +205,7 @@ Use the following command as a part of your job to start the service: 'sudo syst #### MS SQL - sqlcmd 17.10.0001.1 -- SqlPackage 162.4.92.3 +- SqlPackage 162.5.57.1 ### Cached Tools @@ -216,7 +216,7 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Node.js - 18.20.5 -- 20.18.0 +- 20.18.1 - 22.11.0 #### Python @@ -243,7 +243,7 @@ Use the following command as a part of your job to start the service: 'sudo syst #### PowerShell Modules - Az: 12.1.0 - MarkdownPS: 1.10 -- Microsoft.Graph: 2.24.0 +- Microsoft.Graph: 2.25.0 - Pester: 5.6.1 - PSScriptAnalyzer: 1.23.0 @@ -254,16 +254,16 @@ Use the following command as a part of your job to start the service: 'sudo syst | nginx | 1.18.0 | /etc/nginx/nginx.conf | inactive | 80 | ### Android -| Package Name | Version | -| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 9.0 | -| Android SDK Build-tools | 35.0.0<br>34.0.0<br>33.0.0 33.0.1 33.0.2 33.0.3<br>32.0.0<br>31.0.0 | -| Android SDK Platforms | android-35 (rev 1)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1) | -| Android Support Repository | 47.0.0 | -| CMake | 3.10.2<br>3.18.1<br>3.22.1 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 26.3.11579264<br>27.2.12479018 (default) | +| Package Name | Version | +| -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 9.0 | +| Android SDK Build-tools | 35.0.0<br>34.0.0<br>33.0.0 33.0.1 33.0.2 33.0.3<br>32.0.0<br>31.0.0 | +| Android SDK Platforms | android-35-ext14 (rev 1)<br>android-35 (rev 1)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1) | +| Android Support Repository | 47.0.0 | +| CMake | 3.10.2<br>3.18.1<br>3.22.1 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 26.3.11579264<br>27.2.12479018 (default) | #### Environment variables | Name | Value | @@ -284,11 +284,11 @@ Use the following command as a part of your job to start the service: 'sudo syst | alpine:3.19 | sha256:7a85bf5dc56c949be827f84f9185161265c58f589bb8b2a6b6bb6d3076c1be21 | 2024-09-06 | | debian:10 | sha256:58ce6f1271ae1c8a2006ff7d3e54e9874d839f573d8009c20154ad0f2fb0a225 | 2024-06-13 | | debian:11 | sha256:01559430c84e6bc864bed554345d1bfbfa94ac108ab68f39915cae34604b15c3 | 2024-11-11 | -| moby/buildkit:latest | sha256:918e92e639651fdfd0bd97f31bab0dd91756edd14e6f73f43a896715617c59a0 | 2024-11-07 | -| node:18 | sha256:c5c88762e9097e7fa405e5713731ea924fa52da33a13929ed64d8a6b79b95c89 | 2024-07-09 | -| node:18-alpine | sha256:a25c1e4ecc284985f4cbc449021e9259560c644dd9611e5a72d9c4750f24f6c7 | 2024-07-09 | -| node:20 | sha256:a7a3b7ec6de4b11bb2d673b31de9d28c6da09c557ee65453672c8e4f754c23fc | 2024-10-04 | -| node:20-alpine | sha256:b1e0880c3af955867bc2f1944b49d20187beb7afa3f30173e15a97149ab7f5f1 | 2024-10-04 | +| moby/buildkit:latest | sha256:91b72a6d6963df39567b0b7266e51822e9cc09f963af8693a0ab2abbc75f8b6a | 2024-11-22 | +| node:18 | sha256:83eb05700940a88b14f21fb31cc92e9571a34b1db1a5d8781b466fc26cbb1472 | 2024-11-15 | +| node:18-alpine | sha256:7e43a2d633d91e8655a6c0f45d2ed987aa4930f0792f6d9dd3bffc7496e44882 | 2024-11-15 | +| node:20 | sha256:f99a6bd6fb137cfc683e1ff60e7d67aa8d5fcf45a6a64c01c37b4f433a6238b6 | 2024-11-20 | +| node:20-alpine | sha256:b5b9467fe7b33aad47f1ec3f6e0646a658f85f05c18d4243024212a91f3b7554 | 2024-11-20 | | node:22 | sha256:5c76d05034644fa8ecc9c2aa84e0a83cd981d0ef13af5455b87b9adf5b216561 | 2024-10-29 | | node:22-alpine | sha256:b64ced2e7cd0a4816699fe308ce6e8a08ccba463c757c00c14cd372e3d2c763e | 2024-10-29 | | ubuntu:20.04 | sha256:8e5c4f0285ecbb4ead070431d29b576a530d3166df73ec44affc1cd27555141b | 2024-10-11 | @@ -306,7 +306,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | brotli | 1.0.9-2build6 | | bzip2 | 1.0.8-5build1 | | coreutils | 8.32-4.1ubuntu1.2 | -| curl | 7.81.0-1ubuntu1.18 | +| curl | 7.81.0-1ubuntu1.19 | | dbus | 1.12.20-2ubuntu4.1 | | dnsutils | 1:9.18.28-0ubuntu0.22.04.1 | | dpkg | 1.21.1ubuntu2.3 | @@ -329,7 +329,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | libc++-dev | 1:14.0-55\~exp2 | | libc++abi-dev | 1:14.0-55\~exp2 | | libc6-dev | 2.35-0ubuntu3.8 | -| libcurl4 | 7.81.0-1ubuntu1.18 | +| libcurl4 | 7.81.0-1ubuntu1.19 | | libgbm-dev | 23.2.1-1ubuntu3.1\~22.04.2 | | libgconf-2-4 | 3.2.6-7ubuntu2 | | libgsl-dev | 2.7.1+dfsg-3 | From 1e3d72af6d0401a3b040dff58b44cc499453def0 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 26 Nov 2024 04:02:31 +0000 Subject: [PATCH 3276/3485] Updating readme file for ubuntu20 version 20241124.1.1 (#11040) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2004-Readme.md | 76 +++++++++++++++--------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/images/ubuntu/Ubuntu2004-Readme.md b/images/ubuntu/Ubuntu2004-Readme.md index e354c59c685f..c973914f3be4 100644 --- a/images/ubuntu/Ubuntu2004-Readme.md +++ b/images/ubuntu/Ubuntu2004-Readme.md @@ -7,7 +7,7 @@ # Ubuntu 20.04 - OS Version: 20.04.6 LTS - Kernel Version: 5.15.0-1074-azure -- Image Version: 20241117.1.0 +- Image Version: 20241124.1.0 - Systemd version: 245.4-4ubuntu3.24 ## Installed Software @@ -35,7 +35,7 @@ ### Package Management - cpan 1.64 - Helm 3.16.3 -- Homebrew 4.4.5 +- Homebrew 4.4.6 - Miniconda 24.9.2 - Npm 10.8.2 - NuGet 6.6.1.2 @@ -43,7 +43,7 @@ - Pip3 20.0.2 - Pipx 1.7.1 - RubyGems 3.1.2 -- Vcpkg (build from commit 435a9415c) +- Vcpkg (build from commit 5e5d0e1cd) - Yarn 1.22.22 #### Environment variables @@ -62,7 +62,7 @@ to accomplish this. ### Project Management - Ant 1.10.7 -- Gradle 8.11 +- Gradle 8.11.1 - Lerna 8.1.9 - Maven 3.8.8 - Sbt 1.10.5 @@ -72,10 +72,10 @@ to accomplish this. - apt-fast 1.10.0 - AzCopy 10.27.1 - available by `azcopy` and `azcopy10` aliases - Bazel 7.4.1 -- Bazelisk 1.23.0 +- Bazelisk 1.24.0 - Bicep 0.31.92 - Buildah 1.22.3 -- CMake 3.31.0 +- CMake 3.31.1 - CodeQL Action Bundle 2.19.3 - Docker Amazon ECR Credential Helper 0.9.0 - Docker Compose v2 2.27.1 @@ -84,14 +84,14 @@ to accomplish this. - Docker Server 26.1.3 - Fastlane 2.225.0 - Git 2.47.0 -- Git LFS 3.5.1 +- Git LFS 3.6.0 - Git-ftp 1.6.0 - Haveged 1.9.1 - Heroku 9.5.0 - HHVM (HipHop VM) 4.172.1 - jq 1.6 - Kind 0.25.0 -- Kubectl 1.31.2 +- Kubectl 1.31.3 - Kustomize 5.5.0 - Leiningen 2.11.2 - MediaInfo 19.09 @@ -105,7 +105,7 @@ to accomplish this. - Parcel 2.13.0 - PhantomJS 2.1.1 2.1.1 - Podman 3.4.2 -- Pulumi 3.139.0 +- Pulumi 3.141.0 - R 4.4.2 - Skopeo 1.5.0 - Sphinx Open Source Search Server 2.2.11 @@ -117,17 +117,17 @@ to accomplish this. ### CLI Tools - Alibaba Cloud CLI 3.0.174 -- AWS CLI 2.21.3 -- AWS CLI Session Manager Plugin 1.2.688.0 -- AWS SAM CLI 1.129.0 -- Azure CLI 2.66.0 +- AWS CLI 2.22.4 +- AWS CLI Session Manager Plugin 1.2.694.0 +- AWS SAM CLI 1.131.0 +- Azure CLI 2.67.0 - Azure CLI (azure-devops) 1.0.1 - GitHub CLI 2.62.0 -- Google Cloud CLI 501.0.0 +- Google Cloud CLI 502.0.0 - Netlify CLI 17.37.2 - OpenShift CLI 4.15.19 - ORAS CLI 1.2.0 -- Vercel CLI 39.0.2 +- Vercel CLI 39.1.1 ### Java | Version | Environment Variable | @@ -138,7 +138,7 @@ to accomplish this. | 21.0.5+11 | JAVA_HOME_21_X64 | ### PHP Tools -- PHP: 7.4.33, 8.0.30, 8.1.30, 8.2.25, 8.3.13 +- PHP: 7.4.33, 8.0.30, 8.1.31, 8.2.26, 8.3.14 - Composer 2.8.3 - PHPUnit 8.5.40 ``` @@ -166,10 +166,10 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.7.1 ### Browsers and Drivers -- Google Chrome 131.0.6778.69 -- ChromeDriver 131.0.6778.69 +- Google Chrome 131.0.6778.85 +- ChromeDriver 131.0.6778.85 - Chromium 131.0.6778.0 -- Microsoft Edge 131.0.2903.51 +- Microsoft Edge 131.0.2903.63 - Microsoft Edge WebDriver 131.0.2903.52 - Selenium server 4.26.0 - Mozilla Firefox 132.0.2 @@ -192,7 +192,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - sqlite3 3.31.1 #### PostgreSQL -- PostgreSQL 14.14 +- PostgreSQL 14.15 ``` User: postgres PostgreSQL service is disabled by default. @@ -210,7 +210,7 @@ Use the following command as a part of your job to start the service: 'sudo syst #### MS SQL - sqlcmd 17.10.0001.1 -- SqlPackage 162.4.92.3 +- SqlPackage 162.5.57.1 ### Cached Tools @@ -221,7 +221,7 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Node.js - 18.20.5 -- 20.18.0 +- 20.18.1 - 22.11.0 #### Python @@ -251,7 +251,7 @@ Use the following command as a part of your job to start the service: 'sudo syst #### PowerShell Modules - Az: 12.1.0 - MarkdownPS: 1.10 -- Microsoft.Graph: 2.24.0 +- Microsoft.Graph: 2.25.0 - Pester: 5.6.1 - PSScriptAnalyzer: 1.23.0 @@ -263,16 +263,16 @@ Use the following command as a part of your job to start the service: 'sudo syst | nginx | 1.18.0 | /etc/nginx/nginx.conf | inactive | 80 | ### Android -| Package Name | Version | -| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 9.0 | -| Android SDK Build-tools | 35.0.0<br>34.0.0<br>33.0.0 33.0.1 33.0.2 33.0.3<br>32.0.0<br>31.0.0 | -| Android SDK Platforms | android-35 (rev 1)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1) | -| Android Support Repository | 47.0.0 | -| CMake | 3.10.2<br>3.18.1<br>3.22.1 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 26.3.11579264<br>27.2.12479018 (default) | +| Package Name | Version | +| -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 9.0 | +| Android SDK Build-tools | 35.0.0<br>34.0.0<br>33.0.0 33.0.1 33.0.2 33.0.3<br>32.0.0<br>31.0.0 | +| Android SDK Platforms | android-35-ext14 (rev 1)<br>android-35 (rev 1)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1) | +| Android Support Repository | 47.0.0 | +| CMake | 3.10.2<br>3.18.1<br>3.22.1 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 26.3.11579264<br>27.2.12479018 (default) | #### Environment variables | Name | Value | @@ -294,11 +294,11 @@ Use the following command as a part of your job to start the service: 'sudo syst | debian:10 | sha256:58ce6f1271ae1c8a2006ff7d3e54e9874d839f573d8009c20154ad0f2fb0a225 | 2024-06-13 | | debian:11 | sha256:01559430c84e6bc864bed554345d1bfbfa94ac108ab68f39915cae34604b15c3 | 2024-11-11 | | debian:9 | sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be | 2022-06-23 | -| moby/buildkit:latest | sha256:918e92e639651fdfd0bd97f31bab0dd91756edd14e6f73f43a896715617c59a0 | 2024-11-07 | -| node:18 | sha256:c5c88762e9097e7fa405e5713731ea924fa52da33a13929ed64d8a6b79b95c89 | 2024-07-09 | -| node:18-alpine | sha256:a25c1e4ecc284985f4cbc449021e9259560c644dd9611e5a72d9c4750f24f6c7 | 2024-07-09 | -| node:20 | sha256:a7a3b7ec6de4b11bb2d673b31de9d28c6da09c557ee65453672c8e4f754c23fc | 2024-10-04 | -| node:20-alpine | sha256:b1e0880c3af955867bc2f1944b49d20187beb7afa3f30173e15a97149ab7f5f1 | 2024-10-04 | +| moby/buildkit:latest | sha256:91b72a6d6963df39567b0b7266e51822e9cc09f963af8693a0ab2abbc75f8b6a | 2024-11-22 | +| node:18 | sha256:83eb05700940a88b14f21fb31cc92e9571a34b1db1a5d8781b466fc26cbb1472 | 2024-11-15 | +| node:18-alpine | sha256:7e43a2d633d91e8655a6c0f45d2ed987aa4930f0792f6d9dd3bffc7496e44882 | 2024-11-15 | +| node:20 | sha256:f99a6bd6fb137cfc683e1ff60e7d67aa8d5fcf45a6a64c01c37b4f433a6238b6 | 2024-11-20 | +| node:20-alpine | sha256:b5b9467fe7b33aad47f1ec3f6e0646a658f85f05c18d4243024212a91f3b7554 | 2024-11-20 | | node:22 | sha256:5c76d05034644fa8ecc9c2aa84e0a83cd981d0ef13af5455b87b9adf5b216561 | 2024-10-29 | | node:22-alpine | sha256:b64ced2e7cd0a4816699fe308ce6e8a08ccba463c757c00c14cd372e3d2c763e | 2024-10-29 | | ubuntu:20.04 | sha256:8e5c4f0285ecbb4ead070431d29b576a530d3166df73ec44affc1cd27555141b | 2024-10-11 | From 00f102b4cccf5786459984d33ebb81d4af55a72e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 26 Nov 2024 04:03:16 +0000 Subject: [PATCH 3277/3485] Updating readme file for ubuntu24 version 20241124.1.1 (#11038) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2404-Readme.md | 64 +++++++++++++++--------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/images/ubuntu/Ubuntu2404-Readme.md b/images/ubuntu/Ubuntu2404-Readme.md index 9a3190372d23..369d73c78f76 100644 --- a/images/ubuntu/Ubuntu2404-Readme.md +++ b/images/ubuntu/Ubuntu2404-Readme.md @@ -7,7 +7,7 @@ # Ubuntu 24.04 - OS Version: 24.04.1 LTS - Kernel Version: 6.8.0-1017-azure -- Image Version: 20241117.1.0 +- Image Version: 20241124.1.0 - Systemd version: 255.4-1ubuntu8.4 ## Installed Software @@ -22,7 +22,7 @@ - GNU Fortran: 12.3.0, 13.2.0, 14.2.0 - Julia 1.11.1 - Kotlin 2.0.21-release-482 -- Node.js 20.18.0 +- Node.js 20.18.1 - Perl 5.38.2 - Python 3.12.3 - Ruby 3.2.3 @@ -31,14 +31,14 @@ ### Package Management - cpan 1.64 - Helm 3.16.3 -- Homebrew 4.4.5 +- Homebrew 4.4.6 - Miniconda 24.9.2 - Npm 10.8.2 - Pip 24.0 - Pip3 24.0 - Pipx 1.7.1 - RubyGems 3.4.20 -- Vcpkg (build from commit 435a9415c) +- Vcpkg (build from commit 5e5d0e1cd) - Yarn 1.22.22 #### Environment variables @@ -57,18 +57,18 @@ to accomplish this. ### Project Management - Ant 1.10.14 -- Gradle 8.11 +- Gradle 8.11.1 - Lerna 8.1.9 - Maven 3.8.8 ### Tools -- Ansible 2.17.6 +- Ansible 2.18.0 - AzCopy 10.27.1 - available by `azcopy` and `azcopy10` aliases - Bazel 7.4.1 -- Bazelisk 1.23.0 +- Bazelisk 1.24.0 - Bicep 0.31.92 - Buildah 1.33.7 -- CMake 3.31.0 +- CMake 3.31.1 - CodeQL Action Bundle 2.19.3 - Docker Amazon ECR Credential Helper 0.9.0 - Docker Compose v2 2.27.1 @@ -77,12 +77,12 @@ to accomplish this. - Docker Server 26.1.3 - Fastlane 2.225.0 - Git 2.47.0 -- Git LFS 3.5.1 +- Git LFS 3.6.0 - Git-ftp 1.6.0 - Haveged 1.9.14 - jq 1.7 - Kind 0.25.0 -- Kubectl 1.31.2 +- Kubectl 1.31.3 - Kustomize 5.5.0 - MediaInfo 24.01 - Mercurial 6.7.2 @@ -94,7 +94,7 @@ to accomplish this. - Packer 1.11.2 - Parcel 2.13.0 - Podman 4.9.3 -- Pulumi 3.139.0 +- Pulumi 3.141.0 - Skopeo 1.13.3 - Sphinx Open Source Search Server 2.2.11 - yamllint 1.35.1 @@ -102,13 +102,13 @@ to accomplish this. - zstd 1.5.6 ### CLI Tools -- AWS CLI 2.21.3 -- AWS CLI Session Manager Plugin 1.2.688.0 -- AWS SAM CLI 1.129.0 -- Azure CLI 2.66.0 +- AWS CLI 2.22.4 +- AWS CLI Session Manager Plugin 1.2.694.0 +- AWS SAM CLI 1.131.0 +- Azure CLI 2.67.0 - Azure CLI (azure-devops) 1.0.1 - GitHub CLI 2.62.0 -- Google Cloud CLI 501.0.0 +- Google Cloud CLI 502.0.0 ### Java | Version | Environment Variable | @@ -142,10 +142,10 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.7.1 ### Browsers and Drivers -- Google Chrome 131.0.6778.69 -- ChromeDriver 131.0.6778.69 +- Google Chrome 131.0.6778.85 +- ChromeDriver 131.0.6778.85 - Chromium 131.0.6778.0 -- Microsoft Edge 131.0.2903.51 +- Microsoft Edge 131.0.2903.63 - Microsoft Edge WebDriver 131.0.2903.52 - Selenium server 4.26.0 - Mozilla Firefox 132.0.2 @@ -167,7 +167,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - sqlite3 3.45.1 #### PostgreSQL -- PostgreSQL 16.5 +- PostgreSQL 16.6 ``` User: postgres PostgreSQL service is disabled by default. @@ -192,7 +192,7 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Node.js - 18.20.5 -- 20.18.0 +- 20.18.1 - 22.11.0 #### Python @@ -210,7 +210,7 @@ Use the following command as a part of your job to start the service: 'sudo syst #### PowerShell Modules - Az: 12.1.0 -- Microsoft.Graph: 2.24.0 +- Microsoft.Graph: 2.25.0 - Pester: 5.6.1 - PSScriptAnalyzer: 1.23.0 @@ -221,15 +221,15 @@ Use the following command as a part of your job to start the service: 'sudo syst | nginx | 1.24.0 | /etc/nginx/nginx.conf | inactive | 80 | ### Android -| Package Name | Version | -| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 12.0 | -| Android SDK Build-tools | 35.0.0<br>34.0.0 | -| Android SDK Platforms | android-35 (rev 1)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1) | -| Android Support Repository | 47.0.0 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 26.3.11579264<br>27.2.12479018 (default) | +| Package Name | Version | +| -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 12.0 | +| Android SDK Build-tools | 35.0.0<br>34.0.0 | +| Android SDK Platforms | android-35-ext14 (rev 1)<br>android-35 (rev 1)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1) | +| Android Support Repository | 47.0.0 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 26.3.11579264<br>27.2.12479018 (default) | #### Environment variables | Name | Value | @@ -253,7 +253,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | brotli | 1.1.0-2build2 | | bzip2 | 1.0.8-5.1build0.1 | | coreutils | 9.4-3ubuntu6 | -| curl | 8.5.0-2ubuntu10.4 | +| curl | 8.5.0-2ubuntu10.5 | | dbus | 1.14.10-4ubuntu4.1 | | dnsutils | 1:9.18.28-0ubuntu0.24.04.1 | | dpkg | 1.22.6ubuntu6.1 | From d195f34aa8bb2ff6003beaee490aad50bfb5f28e Mon Sep 17 00:00:00 2001 From: lawrencegripper <info@grippers.co.uk> Date: Tue, 26 Nov 2024 10:29:31 +0000 Subject: [PATCH 3278/3485] [WIP] Unpin Postgres on Windows images allowing latest v14 version. --- images/windows/toolsets/toolset-2019.json | 3 +-- images/windows/toolsets/toolset-2022.json | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/images/windows/toolsets/toolset-2019.json b/images/windows/toolsets/toolset-2019.json index 446e652c4b33..262f18aba2bf 100644 --- a/images/windows/toolsets/toolset-2019.json +++ b/images/windows/toolsets/toolset-2019.json @@ -472,8 +472,7 @@ "version": "18" }, "postgresql": { - "version": "14.12.1", - "signature": "698BA51AA27CC31282AACA5055E4B9190BC6C0E9" + "version": "14" }, "kotlin": { "version": "latest" diff --git a/images/windows/toolsets/toolset-2022.json b/images/windows/toolsets/toolset-2022.json index 7067b0c89871..5eceac839fdc 100644 --- a/images/windows/toolsets/toolset-2022.json +++ b/images/windows/toolsets/toolset-2022.json @@ -381,8 +381,7 @@ "version": "8.3" }, "postgresql": { - "version": "14.12.1", - "signature": "698BA51AA27CC31282AACA5055E4B9190BC6C0E9" + "version": "14" }, "kotlin": { "version": "latest" From f39132827952e11b2675de00435a192f12f9f99a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 26 Nov 2024 11:20:28 +0000 Subject: [PATCH 3279/3485] Updating readme file for win19 version 20241125.1.1 (#11046) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/windows/Windows2019-Readme.md | 96 ++++++++++++++-------------- 1 file changed, 48 insertions(+), 48 deletions(-) diff --git a/images/windows/Windows2019-Readme.md b/images/windows/Windows2019-Readme.md index a8680c43dbb3..c6aeff529f5d 100644 --- a/images/windows/Windows2019-Readme.md +++ b/images/windows/Windows2019-Readme.md @@ -5,7 +5,7 @@ *** # Windows Server 2019 - OS Version: 10.0.17763 Build 6532 -- Image Version: 20241113.3.0 +- Image Version: 20241125.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -20,21 +20,21 @@ - LLVM 18.1.8 - Node 18.20.5 - Perl 5.32.1 -- PHP 8.3.13 +- PHP 8.3.14 - Python 3.7.9 - Ruby 3.0.7p220 ### Package Management - Chocolatey 2.4.0 -- Composer 2.8.2 -- Helm 3.16.1 +- Composer 2.8.3 +- Helm 3.16.2 - Miniconda 24.9.2 (pre-installed on the image but not added to PATH) - NPM 10.8.2 -- NuGet 6.11.1.2 +- NuGet 6.12.1.1 - pip 24.0 (python 3.7) - Pipx 1.2.1 - RubyGems 3.2.33 -- Vcpkg (build from commit 772f784ba) +- Vcpkg (build from commit 5e5d0e1cd) - Yarn 1.22.22 #### Environment variables @@ -52,10 +52,10 @@ ### Tools - 7zip 24.08 - aria2 1.37.0 -- azcopy 10.27.0 INFO: azcopy.exe 10.27.0: A newer version 10.27.1 is available to download +- azcopy 10.27.1 - Bazel 7.4.1 -- Bazelisk 1.23.0 -- Bicep 0.31.34 +- Bazelisk 1.24.0 +- Bicep 0.31.92 - Cabal 3.12.1.0 - CMake 3.31.0 - CodeQL Action Bundle 2.19.3 @@ -65,12 +65,12 @@ - ghc 9.10.1 - Git 2.47.0.windows.1 - Git LFS 3.5.1 -- Google Cloud CLI 501.0.0 -- ImageMagick 7.1.1-40 +- Google Cloud CLI 502.0.0 +- ImageMagick 7.1.1-41 - InnoSetup 6.3.3 - jq 1.7.1 - Kind 0.25.0 -- Kubectl 1.31.2 +- Kubectl 1.31.3 - Mercurial 5.0 - gcc 8.1.0 - gdb 8.1 @@ -79,8 +79,8 @@ - NSIS 3.10 - OpenSSL 1.1.1w - Packer 1.11.2 -- Parcel 2.13.0 -- Pulumi 3.138.0 +- Parcel 2.13.1 +- Pulumi 3.141.0 - R 4.4.2 - Service Fabric SDK 9.1.1436.9590 - Stack 3.1.1 @@ -93,14 +93,14 @@ - zstd 1.5.6 ### CLI Tools -- Alibaba Cloud CLI 3.0.232 -- AWS CLI 2.19.5 -- AWS SAM CLI 1.128.0 -- AWS Session Manager CLI 1.2.688.0 -- Azure CLI 2.66.0 +- Alibaba Cloud CLI 3.0.234 +- AWS CLI 2.22.4 +- AWS SAM CLI 1.131.0 +- AWS Session Manager CLI 1.2.694.0 +- Azure CLI 2.67.0 - Azure DevOps CLI extension 1.0.1 - Cloud Foundry CLI 8.8.3 -- GitHub CLI 2.61.0 +- GitHub CLI 2.62.0 ### Rust Tools - Cargo 1.82.0 @@ -117,14 +117,14 @@ - Rustfmt 1.7.1 ### Browsers and Drivers -- Google Chrome 131.0.6778.70 -- Chrome Driver 131.0.6778.69 -- Microsoft Edge 130.0.2849.80 -- Microsoft Edge Driver 130.0.2849.80 +- Google Chrome 131.0.6778.86 +- Chrome Driver 131.0.6778.85 +- Microsoft Edge 131.0.2903.63 +- Microsoft Edge Driver 131.0.2903.63 - Mozilla Firefox 132.0.2 - Gecko Driver 0.35.0 - IE Driver 4.14.0.0 -- Selenium server 4.26.0 +- Selenium server 4.27.0 #### Environment variables | Name | Value | @@ -173,7 +173,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Node.js - 16.20.2 - 18.20.5 -- 20.18.0 +- 20.18.1 - 22.11.0 #### Python @@ -214,11 +214,11 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### MongoDB | Version | ServiceName | ServiceStatus | ServiceStartType | | -------- | ----------- | ------------- | ---------------- | -| 5.0.29.0 | MongoDB | Stopped | Disabled | +| 5.0.30.0 | MongoDB | Stopped | Disabled | ### Database tools -- Azure CosmosDb Emulator 2.14.20.0 -- DacFx 162.4.92.3 +- Azure CosmosDb Emulator 2.14.21.0 +- DacFx 162.5.57.1 - MySQL 5.7.44.0 - SQL OLEDB Driver 18.7.4.0 - SQLPS 1.0 @@ -494,11 +494,11 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 10.0.22621.0 ### .NET Core Tools -- .NET Core SDK: 6.0.136, 6.0.203, 6.0.321, 6.0.428, 7.0.120, 7.0.203, 7.0.317, 7.0.410, 8.0.111, 8.0.206, 8.0.307, 8.0.404 +- .NET Core SDK: 6.0.136, 6.0.203, 6.0.321, 6.0.428, 7.0.120, 7.0.203, 7.0.317, 7.0.410, 8.0.111, 8.0.206, 8.0.307, 8.0.404, 9.0.100 - .NET Framework: 4.7.2, 4.8 -- Microsoft.AspNetCore.App: 6.0.5, 6.0.26, 6.0.36, 7.0.5, 7.0.20, 8.0.6, 8.0.11 -- Microsoft.NETCore.App: 6.0.5, 6.0.26, 6.0.36, 7.0.5, 7.0.20, 8.0.6, 8.0.11 -- Microsoft.WindowsDesktop.App: 6.0.5, 6.0.26, 6.0.36, 7.0.5, 7.0.20, 8.0.6, 8.0.11 +- Microsoft.AspNetCore.App: 6.0.5, 6.0.26, 6.0.36, 7.0.5, 7.0.20, 8.0.6, 8.0.11, 9.0.0 +- Microsoft.NETCore.App: 6.0.5, 6.0.26, 6.0.36, 7.0.5, 7.0.20, 8.0.6, 8.0.11, 9.0.0 +- Microsoft.WindowsDesktop.App: 6.0.5, 6.0.26, 6.0.36, 7.0.5, 7.0.20, 8.0.6, 8.0.11, 9.0.0 - nbgv 3.6.146+392592327a ### PowerShell Tools @@ -510,10 +510,10 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - AzureRM: 2.1.0 (Default), 6.13.1 - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.696 +- AWSPowershell: 4.1.705 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.10 -- Microsoft.Graph: 2.24.0 +- Microsoft.Graph: 2.25.0 - Pester: 3.4.0, 5.6.1 - PowerShellGet: 1.0.0.1, 2.2.5 - PSScriptAnalyzer: 1.23.0 @@ -527,19 +527,19 @@ All other versions are saved but not installed. ``` ### Android -| Package Name | Version | -| -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 8.0 | -| Android Emulator | 35.2.10 | -| Android SDK Build-tools | 35.0.0<br>34.0.0<br>33.0.0 33.0.1 33.0.2 33.0.3<br>32.0.0<br>31.0.0<br>30.0.2 | -| Android SDK Platforms | android-35 (rev 1)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3) | -| Android SDK Platform-Tools | 35.0.2 | -| Android Support Repository | 47.0.0 | -| CMake | 3.10.2<br>3.18.1<br>3.22.1 | -| Google APIs | addon-google_apis-google-21<br>addon-google_apis-google-22<br>addon-google_apis-google-23<br>addon-google_apis-google-24 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 26.3.11579264<br>27.2.12479018 | +| Package Name | Version | +| -------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 8.0 | +| Android Emulator | 35.2.10 | +| Android SDK Build-tools | 35.0.0<br>34.0.0<br>33.0.0 33.0.1 33.0.2 33.0.3<br>32.0.0<br>31.0.0<br>30.0.2 | +| Android SDK Platforms | android-35-ext14 (rev 1)<br>android-35 (rev 1)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3) | +| Android SDK Platform-Tools | 35.0.2 | +| Android Support Repository | 47.0.0 | +| CMake | 3.10.2<br>3.18.1<br>3.22.1 | +| Google APIs | addon-google_apis-google-21<br>addon-google_apis-google-22<br>addon-google_apis-google-23<br>addon-google_apis-google-24 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 26.3.11579264<br>27.2.12479018 | #### Environment variables | Name | Value | From a03f6d0ec323000bcbc1bad92a15f9f069c07e93 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 26 Nov 2024 11:27:25 +0000 Subject: [PATCH 3280/3485] Updating readme file for win22 version 20241125.1.1 (#11045) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/windows/Windows2022-Readme.md | 86 ++++++++++++++-------------- 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/images/windows/Windows2022-Readme.md b/images/windows/Windows2022-Readme.md index cbaedb55630b..e554647462f7 100644 --- a/images/windows/Windows2022-Readme.md +++ b/images/windows/Windows2022-Readme.md @@ -5,7 +5,7 @@ *** # Windows Server 2022 - OS Version: 10.0.20348 Build 2849 -- Image Version: 20241113.3.0 +- Image Version: 20241125.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -20,21 +20,21 @@ - LLVM 18.1.8 - Node 18.20.5 - Perl 5.32.1 -- PHP 8.3.13 +- PHP 8.3.14 - Python 3.9.13 - Ruby 3.0.7p220 ### Package Management - Chocolatey 2.4.0 -- Composer 2.8.2 -- Helm 3.16.1 +- Composer 2.8.3 +- Helm 3.16.2 - Miniconda 24.9.2 (pre-installed on the image but not added to PATH) - NPM 10.8.2 -- NuGet 6.11.1.2 +- NuGet 6.12.1.1 - pip 24.3.1 (python 3.9) - Pipx 1.7.1 - RubyGems 3.2.33 -- Vcpkg (build from commit 772f784ba) +- Vcpkg (build from commit 5e5d0e1cd) - Yarn 1.22.22 #### Environment variables @@ -52,10 +52,10 @@ ### Tools - 7zip 24.08 - aria2 1.37.0 -- azcopy 10.27.0 INFO: azcopy.exe 10.27.0: A newer version 10.27.1 is available to download +- azcopy 10.27.1 - Bazel 7.4.1 -- Bazelisk 1.23.0 -- Bicep 0.31.34 +- Bazelisk 1.24.0 +- Bicep 0.31.92 - Cabal 3.12.1.0 - CMake 3.31.0 - CodeQL Action Bundle 2.19.3 @@ -65,11 +65,11 @@ - ghc 9.10.1 - Git 2.47.0.windows.1 - Git LFS 3.5.1 -- ImageMagick 7.1.1-40 +- ImageMagick 7.1.1-41 - InnoSetup 6.3.3 - jq 1.7.1 - Kind 0.25.0 -- Kubectl 1.31.2 +- Kubectl 1.31.3 - Mercurial 5.0 - gcc 12.2.0 - gdb 11.2 @@ -78,7 +78,7 @@ - NSIS 3.10 - OpenSSL 1.1.1w - Packer 1.11.2 -- Pulumi 3.138.0 +- Pulumi 3.141.0 - R 4.4.2 - Service Fabric SDK 9.1.1436.9590 - Stack 3.1.1 @@ -91,13 +91,13 @@ - zstd 1.5.6 ### CLI Tools -- Alibaba Cloud CLI 3.0.232 -- AWS CLI 2.19.5 -- AWS SAM CLI 1.128.0 -- AWS Session Manager CLI 1.2.688.0 -- Azure CLI 2.66.0 +- Alibaba Cloud CLI 3.0.234 +- AWS CLI 2.22.4 +- AWS SAM CLI 1.131.0 +- AWS Session Manager CLI 1.2.694.0 +- Azure CLI 2.67.0 - Azure DevOps CLI extension 1.0.1 -- GitHub CLI 2.61.0 +- GitHub CLI 2.62.0 ### Rust Tools - Cargo 1.82.0 @@ -114,14 +114,14 @@ - Rustfmt 1.7.1 ### Browsers and Drivers -- Google Chrome 131.0.6778.70 -- Chrome Driver 131.0.6778.69 -- Microsoft Edge 130.0.2849.80 -- Microsoft Edge Driver 130.0.2849.80 +- Google Chrome 131.0.6778.86 +- Chrome Driver 131.0.6778.85 +- Microsoft Edge 131.0.2903.63 +- Microsoft Edge Driver 131.0.2903.63 - Mozilla Firefox 132.0.2 - Gecko Driver 0.35.0 - IE Driver 4.14.0.0 -- Selenium server 4.26.0 +- Selenium server 4.27.0 #### Environment variables | Name | Value | @@ -167,7 +167,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Node.js - 16.20.2 - 18.20.5 -- 20.18.0 +- 20.18.1 - 22.11.0 #### Python @@ -207,11 +207,11 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### MongoDB | Version | ServiceName | ServiceStatus | ServiceStartType | | -------- | ----------- | ------------- | ---------------- | -| 5.0.29.0 | MongoDB | Stopped | Disabled | +| 5.0.30.0 | MongoDB | Stopped | Disabled | ### Database tools -- Azure CosmosDb Emulator 2.14.20.0 -- DacFx 162.4.92.3 +- Azure CosmosDb Emulator 2.14.21.0 +- DacFx 162.5.57.1 - MySQL 8.0.40.0 - SQL OLEDB Driver 18.7.4.0 - SQLPS 1.0 @@ -225,7 +225,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Visual Studio Enterprise 2022 | Name | Version | Path | | ----------------------------- | --------------- | -------------------------------------------------------- | -| Visual Studio Enterprise 2022 | 17.12.35506.116 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | +| Visual Studio Enterprise 2022 | 17.12.35514.174 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | #### Workloads, components and extensions | Package | Version | @@ -251,7 +251,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Component.Unreal | 17.12.35410.122 | | Component.Unreal.Android | 17.12.35410.122 | | Component.Unreal.Ide | 17.12.35410.122 | -| Component.VisualStudio.GitHub.Copilot | 17.12.35504.99 | +| Component.VisualStudio.GitHub.Copilot | 17.12.35514.138 | | Component.VSInstallerProjects2022 | 2.0.1 | | Component.WixToolset.VisualStudioExtension.Dev17 | 1.0.0.22 | | Component.WixToolset.VisualStudioExtension.Schemas3 | 1.0.0.22 | @@ -508,10 +508,10 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - AzureRM: 2.1.0 (Default), 6.13.1 - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.696 +- AWSPowershell: 4.1.705 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.10 -- Microsoft.Graph: 2.24.0 +- Microsoft.Graph: 2.25.0 - Pester: 3.4.0, 5.6.1 - PowerShellGet: 1.0.0.1, 2.2.5 - PSScriptAnalyzer: 1.23.0 @@ -525,18 +525,18 @@ All other versions are saved but not installed. ``` ### Android -| Package Name | Version | -| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 8.0 | -| Android Emulator | 35.2.10 | -| Android SDK Build-tools | 35.0.0<br>34.0.0<br>33.0.0 33.0.1 33.0.2 33.0.3<br>32.0.0<br>31.0.0 | -| Android SDK Platforms | android-35 (rev 1)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1) | -| Android SDK Platform-Tools | 35.0.2 | -| Android Support Repository | 47.0.0 | -| CMake | 3.18.1<br>3.22.1 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 26.3.11579264<br>27.2.12479018 | +| Package Name | Version | +| -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 8.0 | +| Android Emulator | 35.2.10 | +| Android SDK Build-tools | 35.0.0<br>34.0.0<br>33.0.0 33.0.1 33.0.2 33.0.3<br>32.0.0<br>31.0.0 | +| Android SDK Platforms | android-35-ext14 (rev 1)<br>android-35 (rev 1)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1) | +| Android SDK Platform-Tools | 35.0.2 | +| Android Support Repository | 47.0.0 | +| CMake | 3.18.1<br>3.22.1 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 26.3.11579264<br>27.2.12479018 | #### Environment variables | Name | Value | From 153e15c52e1f7aa8d692359a57516e2ffce6cbeb Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 26 Nov 2024 13:09:17 +0000 Subject: [PATCH 3281/3485] Updating readme file for macos-13 version 20241125.399 (#11044) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-13-Readme.md | 101 ++++++++++++++++---------------- 1 file changed, 50 insertions(+), 51 deletions(-) diff --git a/images/macos/macos-13-Readme.md b/images/macos/macos-13-Readme.md index 47e1ebe07b15..a4a91495ee71 100644 --- a/images/macos/macos-13-Readme.md +++ b/images/macos/macos-13-Readme.md @@ -1,8 +1,8 @@ | Announcements | |-| -| [[ macOS ] Node.js version 16 will be removed from macOS13 and macOS13 arm64 images on November, 18.](https://github.com/actions/runner-images/issues/10873) | +| [[ macOS ] Node.js version 16 will be removed from macOS13 and macOS13 arm64 images on November, 25.](https://github.com/actions/runner-images/issues/10873) | | [[macOS] OpenSSL 1.1 will be removed and OpenSSL 3 will be the default for all macOS images from November 4](https://github.com/actions/runner-images/issues/10817) | -| [[macOS] Python 3.9 and 3.10 will be removed from macOS13 arm64 and macOS14 arm64 on November 18.](https://github.com/actions/runner-images/issues/10812) | +| [[macOS] Python 3.9 and 3.10 will be removed from macOS13 arm64 and macOS14 arm64 on November 25.](https://github.com/actions/runner-images/issues/10812) | | [[macOS] The macOS 12 Actions runner image will begin deprecation on 10/7/24 and will be fully unsupported by 12/3/24 for GitHub and ADO](https://github.com/actions/runner-images/issues/10721) | | [[macOS] Support policy changes; Xcode 14 and 16 will be removed from macOS 14 on November 4](https://github.com/actions/runner-images/issues/10703) | | [macOS 15 (Sequoia) is now available as a public beta in GitHub Actions](https://github.com/actions/runner-images/issues/10686) | @@ -10,12 +10,12 @@ # macOS 13 - OS Version: macOS 13.7.1 (22H221) - Kernel Version: Darwin 22.6.0 -- Image Version: 20241108.324 +- Image Version: 20241125.399 ## Installed Software ### Language and Runtime -- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.410, 8.0.101, 8.0.204, 8.0.303, 8.0.403 +- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.410, 8.0.101, 8.0.204, 8.0.303, 8.0.404 - Bash 3.2.57(1)-release - Clang/LLVM 14.0.0 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` @@ -27,9 +27,9 @@ - GNU Fortran 14 (Homebrew GCC 14.2.0_1) - available by `gfortran-14` alias - Kotlin 2.0.21-release-482 - Mono 6.12.0.188 -- Node.js 20.18.0 +- Node.js 20.18.1 - Perl 5.40.0 -- PHP 8.3.13 +- PHP 8.4.1 - Python3 3.13.0 - Ruby 3.0.7p220 @@ -37,70 +37,70 @@ - Bundler 2.5.23 - Carthage 0.40.0 - CocoaPods 1.16.2 -- Composer 2.8.2 -- Homebrew 4.4.4 +- Composer 2.8.3 +- Homebrew 4.4.7 - NPM 10.8.2 - NuGet 6.3.1.1 - Pip3 24.3.1 (python 3.13) - Pipx 1.7.1 - RubyGems 3.5.23 -- Vcpkg 2024 (build from commit 6046e4816) +- Vcpkg 2024 (build from commit 5e5d0e1cd) - Yarn 1.22.22 ### Project Management - Apache Ant 1.10.15 - Apache Maven 3.9.9 -- Gradle 8.10.2 +- Gradle 8.11.1 ### Utilities - 7-Zip 17.05 - aria2 1.37.0 -- azcopy 10.26.0 -- bazel 7.4.0 -- bazelisk 1.23.0 +- azcopy 10.27.1 +- bazel 7.4.1 +- bazelisk 1.24.0 - bsdtar 3.5.3 - available by 'tar' alias - Curl 8.11.0 - Git 2.47.0 -- Git LFS 3.5.1 -- GitHub CLI 2.61.0 +- Git LFS 3.6.0 +- GitHub CLI 2.62.0 - GNU Tar 1.35 - available by 'gtar' alias -- GNU Wget 1.24.5 +- GNU Wget 1.25.0 - gpg (GnuPG) 2.4.6 - jq 1.7.1 - OpenSSL 1.1.1w 11 Sep 2023 - Packer 1.11.2 -- pkg-config 0.29.2 +- pkgconf 2.3.0 - Unxip 3.1 -- yq 4.44.3 +- yq 4.44.5 - zstd 1.5.6 ### Tools -- AWS CLI 2.19.3 -- AWS SAM CLI 1.127.0 -- AWS Session Manager CLI 1.2.688.0 -- Azure CLI 2.65.0 +- AWS CLI 2.22.4 +- AWS SAM CLI 1.131.0 +- AWS Session Manager CLI 1.2.694.0 +- Azure CLI 2.67.0 - Azure CLI (azure-devops) 1.0.1 -- Bicep CLI 0.31.34 -- Cmake 3.31.0 +- Bicep CLI 0.31.92 +- Cmake 3.31.1 - CodeQL Action Bundle 2.19.3 - Fastlane 2.225.0 -- SwiftFormat 0.54.6 -- Xcbeautify 2.14.1 +- SwiftFormat 0.55.2 +- Xcbeautify 2.15.0 - Xcode Command Line Tools 14.3.1.0.1.1683849156 - Xcodes 1.6.0 ### Linters -- SwiftLint 0.57.0 +- SwiftLint 0.57.1 ### Browsers -- Safari 18.1 (18619.2.8.111.5) -- SafariDriver 18.1 (18619.2.8.111.5) -- Google Chrome 130.0.6723.117 -- Google Chrome for Testing 130.0.6723.116 -- ChromeDriver 130.0.6723.116 -- Microsoft Edge 130.0.2849.80 -- Microsoft Edge WebDriver 130.0.2849.81 -- Mozilla Firefox 132.0.1 +- Safari 18.1.1 (18619.2.8.111.7) +- SafariDriver 18.1.1 (18619.2.8.111.7) +- Google Chrome 131.0.6778.86 +- Google Chrome for Testing 131.0.6778.85 +- ChromeDriver 131.0.6778.85 +- Microsoft Edge 131.0.2903.63 +- Microsoft Edge WebDriver 131.0.2903.63 +- Mozilla Firefox 132.0.2 - geckodriver 0.35.0 - Selenium server 4.26.0 @@ -143,9 +143,8 @@ - 3.13.0 #### Node.js -- 16.20.2 -- 18.20.4 -- 20.18.0 +- 18.20.5 +- 20.18.1 - 22.11.0 #### Go @@ -218,8 +217,8 @@ | visionOS 1.0 | xros1.0 | 15.2 | | Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | -| Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | +| Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | | DriverKit 22.1 | driverkit22.1 | 14.1 | | DriverKit 22.2 | driverkit22.2 | 14.2 | | DriverKit 22.4 | driverkit22.4 | 14.3.1 | @@ -244,18 +243,18 @@ | watchOS 10.2 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) | ### Android -| Package Name | Version | -| -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 11.0 | -| Android Emulator | 35.2.10 | -| Android SDK Build-tools | 35.0.0<br>34.0.0<br>33.0.2 33.0.3 | -| Android SDK Platforms | android-35 (rev 1)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | -| Android SDK Platform-Tools | 35.0.2 | -| Android Support Repository | 47.0.0 | -| CMake | 3.22.1 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 26.3.11579264 (default)<br>27.2.12479018 | +| Package Name | Version | +| -------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 11.0 | +| Android Emulator | 35.2.10 | +| Android SDK Build-tools | 35.0.0<br>34.0.0<br>33.0.2 33.0.3 | +| Android SDK Platforms | android-35-ext14 (rev 1)<br>android-35 (rev 1)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | +| Android SDK Platform-Tools | 35.0.2 | +| Android Support Repository | 47.0.0 | +| CMake | 3.31.0 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 26.3.11579264 (default)<br>27.2.12479018 | #### Environment variables | Name | Value | From ced65c7a3c03a3181148c507d1b140da6f9b9399 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 26 Nov 2024 13:12:54 +0000 Subject: [PATCH 3282/3485] Updating readme file for macos-15 version 20241125.404 (#11042) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-15-Readme.md | 193 +++++++++++++++++++------------- 1 file changed, 113 insertions(+), 80 deletions(-) diff --git a/images/macos/macos-15-Readme.md b/images/macos/macos-15-Readme.md index 674babca6e2f..7ab74acfcbf1 100644 --- a/images/macos/macos-15-Readme.md +++ b/images/macos/macos-15-Readme.md @@ -1,103 +1,105 @@ | Announcements | |-| +| [[ macOS ] Node.js version 16 will be removed from macOS13 and macOS13 arm64 images on November, 25.](https://github.com/actions/runner-images/issues/10873) | | [[macOS] OpenSSL 1.1 will be removed and OpenSSL 3 will be the default for all macOS images from November 4](https://github.com/actions/runner-images/issues/10817) | -| [[macOS] Python 3.9 and 3.10 will be removed from macOS13 arm64 and macOS14 arm64 on November 18.](https://github.com/actions/runner-images/issues/10812) | +| [[macOS] Python 3.9 and 3.10 will be removed from macOS13 arm64 and macOS14 arm64 on November 25.](https://github.com/actions/runner-images/issues/10812) | | [[macOS] The macOS 12 Actions runner image will begin deprecation on 10/7/24 and will be fully unsupported by 12/3/24 for GitHub and ADO](https://github.com/actions/runner-images/issues/10721) | | [[macOS] Support policy changes; Xcode 14 and 16 will be removed from macOS 14 on November 4](https://github.com/actions/runner-images/issues/10703) | | [macOS 15 (Sequoia) is now available as a public beta in GitHub Actions](https://github.com/actions/runner-images/issues/10686) | *** # macOS 15 -- OS Version: macOS 15.0.1 (24A348) -- Kernel Version: Darwin 24.0.0 -- Image Version: 20241022.244 +- OS Version: macOS 15.1.1 (24B91) +- Kernel Version: Darwin 24.1.0 +- Image Version: 20241125.404 ## Installed Software ### Language and Runtime -- .NET Core SDK: 8.0.101, 8.0.204, 8.0.303, 8.0.403 +- .NET Core SDK: 8.0.101, 8.0.204, 8.0.303, 8.0.404 - Bash 3.2.57(1)-release -- Clang/LLVM 16.0.0 +- Clang/LLVM 15.0.0 - Clang/LLVM (Homebrew) 18.1.8 - available on `$(brew --prefix llvm@18)/bin/clang` - GCC 12 (Homebrew GCC 12.4.0) - available by `gcc-12` alias - GCC 13 (Homebrew GCC 13.3.0) - available by `gcc-13` alias -- GCC 14 (Homebrew GCC 14.2.0) - available by `gcc-14` alias +- GCC 14 (Homebrew GCC 14.2.0_1) - available by `gcc-14` alias - GNU Fortran 12 (Homebrew GCC 12.4.0) - available by `gfortran-12` alias - GNU Fortran 13 (Homebrew GCC 13.3.0) - available by `gfortran-13` alias -- GNU Fortran 14 (Homebrew GCC 14.2.0) - available by `gfortran-14` alias +- GNU Fortran 14 (Homebrew GCC 14.2.0_1) - available by `gfortran-14` alias - Kotlin 2.0.21-release-482 -- Node.js 22.10.0 +- Node.js 22.11.0 - Perl 5.40.0 -- PHP 8.3.12 +- PHP 8.4.1 - Python3 3.13.0 -- Ruby 3.3.5 +- Ruby 3.3.6 ### Package Management -- Bundler 2.5.22 +- Bundler 2.5.23 - Carthage 0.40.0 -- CocoaPods 1.15.2 -- Composer 2.8.1 -- Homebrew 4.4.2 +- CocoaPods 1.16.2 +- Composer 2.8.3 +- Homebrew 4.4.7 - NPM 10.9.0 -- Pip3 24.2 (python 3.13) +- Pip3 24.3.1 (python 3.13) - Pipx 1.7.1 -- RubyGems 3.5.22 +- RubyGems 3.5.23 - Yarn 1.22.22 ### Project Management - Apache Ant 1.10.15 - Apache Maven 3.9.9 -- Gradle 8.10.2 +- Gradle 8.11.1 ### Utilities - 7-Zip 17.05 - aria2 1.37.0 -- azcopy 10.26.0 -- bazel 7.3.2 -- bazelisk 1.22.1 +- azcopy 10.27.1 +- bazel 7.4.1 +- bazelisk 1.24.0 - bsdtar 3.5.3 - available by 'tar' alias -- Curl 8.10.1 +- Curl 8.11.0 - Git 2.47.0 -- Git LFS 3.5.1 -- GitHub CLI 2.59.0 +- Git LFS 3.6.0 +- GitHub CLI 2.62.0 - GNU Tar 1.35 - available by 'gtar' alias -- GNU Wget 1.24.5 -- gpg (GnuPG) 2.4.5 +- GNU Wget 1.25.0 +- gpg (GnuPG) 2.4.6 - jq 1.7.1 - OpenSSL 1.1.1w 11 Sep 2023 - Packer 1.11.2 -- pkg-config 0.29.2 -- yq 4.44.3 +- pkgconf 2.3.0 +- Unxip 3.1 +- yq 4.44.5 - zstd 1.5.6 ### Tools -- AWS CLI 2.18.11 -- AWS SAM CLI 1.126.0 -- AWS Session Manager CLI 1.2.677.0 -- Azure CLI 2.65.0 +- AWS CLI 2.22.4 +- AWS SAM CLI 1.131.0 +- AWS Session Manager CLI 1.2.694.0 +- Azure CLI 2.67.0 - Azure CLI (azure-devops) 1.0.1 -- Bicep CLI 0.30.23 -- Cmake 3.30.5 -- CodeQL Action Bundle 2.19.2 +- Bicep CLI 0.31.92 +- Cmake 3.31.1 +- CodeQL Action Bundle 2.19.3 - Fastlane 2.225.0 -- SwiftFormat 0.54.6 -- Xcbeautify 2.14.1 -- Xcode Command Line Tools 16.0.0.0.1.1724870825 -- Xcodes 1.5.0 +- SwiftFormat 0.55.2 +- Xcbeautify 2.15.0 +- Xcode Command Line Tools 16.1.0.0.1.1729049160 +- Xcodes 1.6.0 ### Linters -- SwiftLint 0.57.0 +- SwiftLint 0.57.1 ### Browsers -- Safari 18.0.1 (20619.1.26.31.7) -- SafariDriver 18.0.1 (20619.1.26.31.7) -- Google Chrome 130.0.6723.59 -- Google Chrome for Testing 130.0.6723.58 -- ChromeDriver 130.0.6723.58 -- Microsoft Edge 130.0.2849.46 -- Microsoft Edge WebDriver 130.0.2849.50 -- Mozilla Firefox 131.0.3 +- Safari 18.1.1 (20619.2.8.11.12) +- SafariDriver 18.1.1 (20619.2.8.11.12) +- Google Chrome 131.0.6778.86 +- Google Chrome for Testing 131.0.6778.85 +- ChromeDriver 131.0.6778.85 +- Microsoft Edge 131.0.2903.63 +- Microsoft Edge WebDriver 131.0.2903.63 +- Mozilla Firefox 132.0.2 - geckodriver 0.35.0 -- Selenium server 4.25.0 +- Selenium server 4.26.0 #### Environment variables | Name | Value | @@ -117,7 +119,8 @@ #### Ruby - 3.1.6 -- 3.2.5 +- 3.2.6 +- 3.3.6 #### Python - 3.9.20 @@ -127,14 +130,14 @@ - 3.13.0 #### Node.js -- 18.20.4 -- 20.18.0 -- 22.10.0 +- 18.20.5 +- 20.18.1 +- 22.11.0 #### Go - 1.21.13 -- 1.22.8 -- 1.23.2 +- 1.22.9 +- 1.23.3 ### Rust Tools - Cargo 1.82.0 @@ -147,7 +150,7 @@ - Rustfmt 1.7.1-stable ### PowerShell Tools -- PowerShell 7.4.5 +- PowerShell 7.4.6 #### PowerShell Modules - Az: 12.4.0 @@ -155,56 +158,86 @@ - PSScriptAnalyzer: 1.23.0 ### Xcode -| Version | Build | Path | Symlinks | -| -------------- | ------- | ---------------------------------------------- | ----------------------------------------------------------------------------------------- | -| 16.1 | 16B40 | /Applications/Xcode_16.1_Release_Candidate.app | /Applications/Xcode_16.1.0.app<br>/Applications/Xcode_16.1.app | -| 16.0 (default) | 16A242d | /Applications/Xcode_16.app | /Applications/Xcode_16.0.0.app<br>/Applications/Xcode_16.0.app<br>/Applications/Xcode.app | +| Version | Build | Path | Symlinks | +| -------------- | -------- | ----------------------------------- | ----------------------------------------------------------------------------------------- | +| 16.2 (beta) | 16C5023f | /Applications/Xcode_16.2_beta_3.app | /Applications/Xcode_16.2.0.app<br>/Applications/Xcode_16.2.app | +| 16.1 | 16B40 | /Applications/Xcode_16.1.app | /Applications/Xcode_16.1.0.app | +| 16.0 (default) | 16A242d | /Applications/Xcode_16.app | /Applications/Xcode_16.0.0.app<br>/Applications/Xcode_16.0.app<br>/Applications/Xcode.app | +| 15.4 | 15F31d | /Applications/Xcode_15.4.app | /Applications/Xcode_15.4.0.app | #### Installed SDKs | SDK | SDK Name | Xcode Version | | ------------------------ | -------------------- | ------------- | +| macOS 14.5 | macosx14.5 | 15.4 | | macOS 15.0 | macosx15.0 | 16.0 | | macOS 15.1 | macosx15.1 | 16.1 | +| macOS 15.2 | macosx15.2 | 16.2 | +| iOS 17.5 | iphoneos17.5 | 15.4 | | iOS 18.0 | iphoneos18.0 | 16.0 | | iOS 18.1 | iphoneos18.1 | 16.1 | +| iOS 18.2 | iphoneos18.2 | 16.2 | +| Simulator - iOS 17.5 | iphonesimulator17.5 | 15.4 | | Simulator - iOS 18.0 | iphonesimulator18.0 | 16.0 | | Simulator - iOS 18.1 | iphonesimulator18.1 | 16.1 | +| Simulator - iOS 18.2 | iphonesimulator18.2 | 16.2 | +| tvOS 17.5 | appletvos17.5 | 15.4 | | tvOS 18.0 | appletvos18.0 | 16.0 | | tvOS 18.1 | appletvos18.1 | 16.1 | +| tvOS 18.2 | appletvos18.2 | 16.2 | +| Simulator - tvOS 17.5 | appletvsimulator17.5 | 15.4 | | Simulator - tvOS 18.0 | appletvsimulator18.0 | 16.0 | | Simulator - tvOS 18.1 | appletvsimulator18.1 | 16.1 | +| Simulator - tvOS 18.2 | appletvsimulator18.2 | 16.2 | +| watchOS 10.5 | watchos10.5 | 15.4 | | watchOS 11.0 | watchos11.0 | 16.0 | | watchOS 11.1 | watchos11.1 | 16.1 | +| watchOS 11.2 | watchos11.2 | 16.2 | +| Simulator - watchOS 10.5 | watchsimulator10.5 | 15.4 | | Simulator - watchOS 11.0 | watchsimulator11.0 | 16.0 | | Simulator - watchOS 11.1 | watchsimulator11.1 | 16.1 | -| Simulator - visionOS 2.0 | xrsimulator2.0 | 16.0 | +| Simulator - watchOS 11.2 | watchsimulator11.2 | 16.2 | +| Simulator - visionOS 1.2 | xrsimulator1.2 | 15.4 | +| visionOS 1.2 | xros1.2 | 15.4 | | visionOS 2.0 | xros2.0 | 16.0 | -| visionOS 2.1 | xros2.1 | 16.1 | +| Simulator - visionOS 2.0 | xrsimulator2.0 | 16.0 | | Simulator - visionOS 2.1 | xrsimulator2.1 | 16.1 | +| visionOS 2.1 | xros2.1 | 16.1 | +| Simulator - visionOS 2.2 | xrsimulator2.2 | 16.2 | +| visionOS 2.2 | xros2.2 | 16.2 | +| DriverKit 23.5 | driverkit23.5 | 15.4 | | DriverKit 24.0 | driverkit24.0 | 16.0 | | DriverKit 24.1 | driverkit24.1 | 16.1 | +| DriverKit 24.2 | driverkit24.2 | 16.2 | #### Installed Simulators -| OS | Simulators | -| ------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| iOS 18.0 | iPhone 16<br>iPhone 16 Plus<br>iPhone 16 Pro<br>iPhone 16 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | -| iOS 18.1 | iPhone 16<br>iPhone 16 Plus<br>iPhone 16 Pro<br>iPhone 16 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad mini (A17 Pro)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | -| tvOS 18.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 18.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| watchOS 11.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 10 (42mm)<br>Apple Watch Series 10 (46mm)<br>Apple Watch Ultra 2 (49mm) | -| watchOS 11.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 10 (42mm)<br>Apple Watch Series 10 (46mm)<br>Apple Watch Ultra 2 (49mm) | +| OS | Simulators | +| ------------ | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| iOS 17.5 | iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | +| iOS 18.0 | iPhone 16<br>iPhone 16 Plus<br>iPhone 16 Pro<br>iPhone 16 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | +| iOS 18.1 | iPhone 16<br>iPhone 16 Plus<br>iPhone 16 Pro<br>iPhone 16 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (A17 Pro)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | +| iOS 18.2 | iPhone 16<br>iPhone 16 Plus<br>iPhone 16 Pro<br>iPhone 16 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (A17 Pro)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | +| tvOS 17.5 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 18.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 18.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 18.2 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| watchOS 10.5 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 11.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 10 (42mm)<br>Apple Watch Series 10 (46mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 11.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 10 (42mm)<br>Apple Watch Series 10 (46mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 11.2 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 10 (42mm)<br>Apple Watch Series 10 (46mm)<br>Apple Watch Ultra 2 (49mm) | ### Android -| Package Name | Version | -| -------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Emulator | 35.2.10 | -| Android SDK Platforms | android-35 (rev 1)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1) | -| Android SDK Platform-Tools | 35.0.2 | -| Android Support Repository | 47.0.0 | -| CMake | 3.22.1 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 26.3.11579264<br>27.2.12479018 (default) | +| Package Name | Version | +| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 16.0 | +| Android Emulator | 35.2.10 | +| Android SDK Build-tools | 35.0.0 | +| Android SDK Platforms | android-35-ext14 (rev 1)<br>android-35 (rev 1)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1) | +| Android SDK Platform-Tools | 35.0.2 | +| Android Support Repository | 47.0.0 | +| CMake | 3.31.0 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 26.3.11579264<br>27.2.12479018 (default) | #### Environment variables | Name | Value | From a63a87f6a09e9eba15845cd397812010f130675e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 26 Nov 2024 13:30:50 +0000 Subject: [PATCH 3283/3485] Updating readme file for macos-14 version 20241125.421 (#11043) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-14-Readme.md | 82 ++++++++++++++++----------------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/images/macos/macos-14-Readme.md b/images/macos/macos-14-Readme.md index 9b315814d5b2..4514175d6e54 100644 --- a/images/macos/macos-14-Readme.md +++ b/images/macos/macos-14-Readme.md @@ -1,8 +1,8 @@ | Announcements | |-| -| [[ macOS ] Node.js version 16 will be removed from macOS13 and macOS13 arm64 images on November, 18.](https://github.com/actions/runner-images/issues/10873) | +| [[ macOS ] Node.js version 16 will be removed from macOS13 and macOS13 arm64 images on November, 25.](https://github.com/actions/runner-images/issues/10873) | | [[macOS] OpenSSL 1.1 will be removed and OpenSSL 3 will be the default for all macOS images from November 4](https://github.com/actions/runner-images/issues/10817) | -| [[macOS] Python 3.9 and 3.10 will be removed from macOS13 arm64 and macOS14 arm64 on November 18.](https://github.com/actions/runner-images/issues/10812) | +| [[macOS] Python 3.9 and 3.10 will be removed from macOS13 arm64 and macOS14 arm64 on November 25.](https://github.com/actions/runner-images/issues/10812) | | [[macOS] The macOS 12 Actions runner image will begin deprecation on 10/7/24 and will be fully unsupported by 12/3/24 for GitHub and ADO](https://github.com/actions/runner-images/issues/10721) | | [[macOS] Support policy changes; Xcode 14 and 16 will be removed from macOS 14 on November 4](https://github.com/actions/runner-images/issues/10703) | | [macOS 15 (Sequoia) is now available as a public beta in GitHub Actions](https://github.com/actions/runner-images/issues/10686) | @@ -10,7 +10,7 @@ # macOS 14 - OS Version: macOS 14.7.1 (23H222) - Kernel Version: Darwin 23.6.0 -- Image Version: 20241118.366 +- Image Version: 20241125.421 ## Installed Software @@ -27,9 +27,9 @@ - GNU Fortran 14 (Homebrew GCC 14.2.0_1) - available by `gfortran-14` alias - Kotlin 2.0.21-release-482 - Mono 6.12.0.188 -- Node.js 20.18.0 +- Node.js 20.18.1 - Perl 5.40.0 -- PHP 8.3.13 +- PHP 8.4.1 - Python3 3.13.0 - Ruby 3.0.7p220 @@ -38,7 +38,7 @@ - Carthage 0.40.0 - CocoaPods 1.16.2 - Composer 2.8.3 -- Homebrew 4.4.5 +- Homebrew 4.4.7 - NPM 10.8.2 - NuGet 6.3.1.1 - Pip3 24.3.1 (python 3.13) @@ -49,18 +49,18 @@ ### Project Management - Apache Ant 1.10.15 - Apache Maven 3.9.9 -- Gradle 8.11 +- Gradle 8.11.1 ### Utilities - 7-Zip 17.05 - aria2 1.37.0 - azcopy 10.27.1 - bazel 7.4.1 -- bazelisk 1.23.0 +- bazelisk 1.24.0 - bsdtar 3.5.3 - available by 'tar' alias - Curl 8.11.0 - Git 2.47.0 -- Git LFS 3.5.1 +- Git LFS 3.6.0 - GitHub CLI 2.62.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.25.0 @@ -68,37 +68,37 @@ - jq 1.7.1 - OpenSSL 1.1.1w 11 Sep 2023 - Packer 1.11.2 -- pkg-config 0.29.2 +- pkgconf 2.3.0 - Unxip 3.1 - yq 4.44.5 - zstd 1.5.6 ### Tools -- AWS CLI 2.21.3 -- AWS SAM CLI 1.129.0 -- AWS Session Manager CLI 1.2.688.0 -- Azure CLI 2.66.0 +- AWS CLI 2.22.4 +- AWS SAM CLI 1.131.0 +- AWS Session Manager CLI 1.2.694.0 +- Azure CLI 2.67.0 - Azure CLI (azure-devops) 1.0.1 - Bicep CLI 0.31.92 -- Cmake 3.31.0 +- Cmake 3.31.1 - CodeQL Action Bundle 2.19.3 - Fastlane 2.225.0 -- SwiftFormat 0.55.0 +- SwiftFormat 0.55.2 - Xcbeautify 2.15.0 - Xcode Command Line Tools 16.1.0.0.1.1729049160 - Xcodes 1.6.0 ### Linters -- SwiftLint 0.57.0 +- SwiftLint 0.57.1 ### Browsers -- Safari 18.1 (19619.2.8.111.5) -- SafariDriver 18.1 (19619.2.8.111.5) -- Google Chrome 131.0.6778.70 -- Google Chrome for Testing 131.0.6778.69 -- ChromeDriver 131.0.6778.69 -- Microsoft Edge 131.0.2903.51 -- Microsoft Edge WebDriver 131.0.2903.52 +- Safari 18.1.1 (19619.2.8.111.7) +- SafariDriver 18.1.1 (19619.2.8.111.7) +- Google Chrome 131.0.6778.86 +- Google Chrome for Testing 131.0.6778.85 +- ChromeDriver 131.0.6778.85 +- Microsoft Edge 131.0.2903.63 +- Microsoft Edge WebDriver 131.0.2903.63 - Mozilla Firefox 132.0.2 - geckodriver 0.35.0 - Selenium server 4.26.0 @@ -135,7 +135,7 @@ #### Node.js - 18.20.5 -- 20.18.0 +- 20.18.1 - 22.11.0 #### Go @@ -157,7 +157,7 @@ - PowerShell 7.4.6 #### PowerShell Modules -- Az: 12.5.0 +- Az: 12.4.0 - Pester: 5.6.1 - PSScriptAnalyzer: 1.23.0 @@ -219,12 +219,12 @@ | Simulator - watchOS 11.1 | watchsimulator11.1 | 16.1 | | visionOS 1.0 | xros1.0 | 15.2 | | Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | -| visionOS 1.1 | xros1.1 | 15.3 | | Simulator - visionOS 1.1 | xrsimulator1.1 | 15.3 | -| visionOS 1.2 | xros1.2 | 15.4 | +| visionOS 1.1 | xros1.1 | 15.3 | | Simulator - visionOS 1.2 | xrsimulator1.2 | 15.4 | -| Simulator - visionOS 2.0 | xrsimulator2.0 | 16.0 | +| visionOS 1.2 | xros1.2 | 15.4 | | visionOS 2.0 | xros2.0 | 16.0 | +| Simulator - visionOS 2.0 | xrsimulator2.0 | 16.0 | | Simulator - visionOS 2.1 | xrsimulator2.1 | 16.1 | | visionOS 2.1 | xros2.1 | 16.1 | | DriverKit 23.0 | driverkit23.0 | 15.0.1 | @@ -257,18 +257,18 @@ | watchOS 11.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 10 (42mm)<br>Apple Watch Series 10 (46mm)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra 2 (49mm) | ### Android -| Package Name | Version | -| -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 11.0 | -| Android Emulator | 35.2.10 | -| Android SDK Build-tools | 35.0.0<br>34.0.0<br>33.0.2 33.0.3 | -| Android SDK Platforms | android-35 (rev 1)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | -| Android SDK Platform-Tools | 35.0.2 | -| Android Support Repository | 47.0.0 | -| CMake | 3.22.1 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 26.3.11579264 (default)<br>27.2.12479018 | +| Package Name | Version | +| -------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 11.0 | +| Android Emulator | 35.2.10 | +| Android SDK Build-tools | 35.0.0<br>34.0.0<br>33.0.2 33.0.3 | +| Android SDK Platforms | android-35-ext14 (rev 1)<br>android-35 (rev 1)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | +| Android SDK Platform-Tools | 35.0.2 | +| Android Support Repository | 47.0.0 | +| CMake | 3.31.0 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 26.3.11579264 (default)<br>27.2.12479018 | #### Environment variables | Name | Value | From 95b0a5551b43e67b8d3f816223c235a8f6b1075e Mon Sep 17 00:00:00 2001 From: lawrencegripper <info@grippers.co.uk> Date: Tue, 26 Nov 2024 13:33:25 +0000 Subject: [PATCH 3284/3485] re-add signitures removed these by accident, postgres releases are signed with same key so keeping this allows us to validate it --- images/windows/toolsets/toolset-2019.json | 1 + images/windows/toolsets/toolset-2022.json | 1 + 2 files changed, 2 insertions(+) diff --git a/images/windows/toolsets/toolset-2019.json b/images/windows/toolsets/toolset-2019.json index 262f18aba2bf..960e5146d12a 100644 --- a/images/windows/toolsets/toolset-2019.json +++ b/images/windows/toolsets/toolset-2019.json @@ -472,6 +472,7 @@ "version": "18" }, "postgresql": { + "signature": "698BA51AA27CC31282AACA5055E4B9190BC6C0E9", "version": "14" }, "kotlin": { diff --git a/images/windows/toolsets/toolset-2022.json b/images/windows/toolsets/toolset-2022.json index 5eceac839fdc..1e5c7533351d 100644 --- a/images/windows/toolsets/toolset-2022.json +++ b/images/windows/toolsets/toolset-2022.json @@ -381,6 +381,7 @@ "version": "8.3" }, "postgresql": { + "signature": "698BA51AA27CC31282AACA5055E4B9190BC6C0E9", "version": "14" }, "kotlin": { From 50bb5e896729fc5a77bac7b8eecc94b61e8ed832 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 26 Nov 2024 14:28:39 +0000 Subject: [PATCH 3285/3485] Updating readme file for macos-13-arm64 version 20241125.445 (#11032) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-13-arm64-Readme.md | 97 ++++++++++++++------------- 1 file changed, 50 insertions(+), 47 deletions(-) diff --git a/images/macos/macos-13-arm64-Readme.md b/images/macos/macos-13-arm64-Readme.md index c51a58176d11..940b7cb26c39 100644 --- a/images/macos/macos-13-arm64-Readme.md +++ b/images/macos/macos-13-arm64-Readme.md @@ -1,8 +1,8 @@ | Announcements | |-| -| [[ macOS ] Node.js version 16 will be removed from macOS13 and macOS13 arm64 images on November, 18.](https://github.com/actions/runner-images/issues/10873) | +| [[ macOS ] Node.js version 16 will be removed from macOS13 and macOS13 arm64 images on November, 25.](https://github.com/actions/runner-images/issues/10873) | | [[macOS] OpenSSL 1.1 will be removed and OpenSSL 3 will be the default for all macOS images from November 4](https://github.com/actions/runner-images/issues/10817) | -| [[macOS] Python 3.9 and 3.10 will be removed from macOS13 arm64 and macOS14 arm64 on November 18.](https://github.com/actions/runner-images/issues/10812) | +| [[macOS] Python 3.9 and 3.10 will be removed from macOS13 arm64 and macOS14 arm64 on November 25.](https://github.com/actions/runner-images/issues/10812) | | [[macOS] The macOS 12 Actions runner image will begin deprecation on 10/7/24 and will be fully unsupported by 12/3/24 for GitHub and ADO](https://github.com/actions/runner-images/issues/10721) | | [[macOS] Support policy changes; Xcode 14 and 16 will be removed from macOS 14 on November 4](https://github.com/actions/runner-images/issues/10703) | | [macOS 15 (Sequoia) is now available as a public beta in GitHub Actions](https://github.com/actions/runner-images/issues/10686) | @@ -10,12 +10,12 @@ # macOS 13 - OS Version: macOS 13.7.1 (22H221) - Kernel Version: Darwin 22.6.0 -- Image Version: 20241108.368 +- Image Version: 20241125.445 ## Installed Software ### Language and Runtime -- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.410, 8.0.101, 8.0.204, 8.0.303, 8.0.403 +- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.410, 8.0.101, 8.0.204, 8.0.303, 8.0.404 - Bash 3.2.57(1)-release - Clang/LLVM 14.0.0 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` @@ -27,7 +27,7 @@ - GNU Fortran 14 (Homebrew GCC 14.2.0_1) - available by `gfortran-14` alias - Kotlin 2.0.21-release-482 - Mono 6.12.0.188 -- Node.js 20.18.0 +- Node.js 20.18.1 - Perl 5.40.0 - Python3 3.13.0 - Ruby 3.0.7p220 @@ -36,7 +36,7 @@ - Bundler 2.5.23 - Carthage 0.40.0 - CocoaPods 1.16.2 -- Homebrew 4.4.4 +- Homebrew 4.4.6 - NPM 10.8.2 - NuGet 6.3.1.1 - Pip3 24.2 (python 3.13) @@ -47,53 +47,53 @@ ### Project Management - Apache Ant 1.10.15 - Apache Maven 3.9.9 -- Gradle 8.10.2 +- Gradle 8.11.1 ### Utilities - 7-Zip 17.05 - aria2 1.37.0 -- azcopy 10.26.0 -- bazel 7.4.0 -- bazelisk 1.23.0 +- azcopy 10.27.1 +- bazel 7.4.1 +- bazelisk 1.24.0 - bsdtar 3.5.3 - available by 'tar' alias - Curl 8.7.1 - Git 2.47.0 -- Git LFS 3.5.1 -- GitHub CLI 2.61.0 +- Git LFS 3.6.0 +- GitHub CLI 2.62.0 - GNU Tar 1.35 - available by 'gtar' alias -- GNU Wget 1.24.5 +- GNU Wget 1.25.0 - gpg (GnuPG) 2.4.6 - jq 1.7.1 - OpenSSL 1.1.1w 11 Sep 2023 - Packer 1.11.2 -- pkg-config 0.29.2 +- pkgconf 2.3.0 - Unxip 3.1 -- yq 4.44.3 +- yq 4.44.5 - zstd 1.5.6 ### Tools -- AWS CLI 2.19.3 -- AWS SAM CLI 1.127.0 -- AWS Session Manager CLI 1.2.688.0 -- Azure CLI 2.65.0 +- AWS CLI 2.22.4 +- AWS SAM CLI 1.131.0 +- AWS Session Manager CLI 1.2.694.0 +- Azure CLI 2.67.0 - Azure CLI (azure-devops) 1.0.1 -- Bicep CLI 0.31.34 -- Cmake 3.31.0 +- Bicep CLI 0.31.92 +- Cmake 3.31.1 - CodeQL Action Bundle 2.19.3 - Fastlane 2.225.0 -- SwiftFormat 0.54.6 -- Xcbeautify 2.14.1 +- SwiftFormat 0.55.2 +- Xcbeautify 2.15.0 - Xcode Command Line Tools 14.3.1.0.1.1683849156 - Xcodes 1.6.0 ### Linters ### Browsers -- Safari 18.1 (18619.2.8.111.5) -- SafariDriver 18.1 (18619.2.8.111.5) -- Google Chrome 130.0.6723.117 -- Google Chrome for Testing 130.0.6723.116 -- ChromeDriver 130.0.6723.116 +- Safari 18.1.1 (18619.2.8.111.7) +- SafariDriver 18.1.1 (18619.2.8.111.7) +- Google Chrome 131.0.6778.86 +- Google Chrome for Testing 131.0.6778.85 +- ChromeDriver 131.0.6778.85 - Selenium server 4.26.0 #### Environment variables @@ -112,17 +112,20 @@ ### Cached Tools +#### Ruby +- 3.0.7 +- 3.1.6 +- 3.2.6 +- 3.3.6 + #### Python -- 3.9.13 -- 3.10.11 - 3.11.9 - 3.12.7 - 3.13.0 #### Node.js -- 16.20.1 -- 18.20.4 -- 20.18.0 +- 18.20.5 +- 20.18.1 - 22.11.0 #### Go @@ -192,11 +195,11 @@ | Simulator - watchOS 9.4 | watchsimulator9.4 | 14.3.1 | | Simulator - watchOS 10.0 | watchsimulator10.0 | 15.0.1 | | Simulator - watchOS 10.2 | watchsimulator10.2 | 15.1, 15.2 | -| Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | | visionOS 1.0 | xros1.0 | 15.2 | +| Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | -| Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | +| Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | DriverKit 22.1 | driverkit22.1 | 14.1 | | DriverKit 22.2 | driverkit22.2 | 14.2 | | DriverKit 22.4 | driverkit22.4 | 14.3.1 | @@ -222,18 +225,18 @@ | visionOS 1.0 | Apple Vision Pro | ### Android -| Package Name | Version | -| -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 11.0 | -| Android Emulator | 35.2.10 | -| Android SDK Build-tools | 35.0.0<br>34.0.0<br>33.0.2 33.0.3 | -| Android SDK Platforms | android-35 (rev 1)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | -| Android SDK Platform-Tools | 35.0.2 | -| Android Support Repository | 47.0.0 | -| CMake | 3.22.1 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 26.3.11579264 (default)<br>27.2.12479018 | +| Package Name | Version | +| -------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 11.0 | +| Android Emulator | 35.2.10 | +| Android SDK Build-tools | 35.0.0<br>34.0.0<br>33.0.2 33.0.3 | +| Android SDK Platforms | android-35-ext14 (rev 1)<br>android-35 (rev 1)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | +| Android SDK Platform-Tools | 35.0.2 | +| Android Support Repository | 47.0.0 | +| CMake | 3.31.0 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 26.3.11579264 (default)<br>27.2.12479018 | #### Environment variables | Name | Value | From 6d5e92cd224fab24ce9478092106f5a9f7eaf0cc Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 26 Nov 2024 14:29:13 +0000 Subject: [PATCH 3286/3485] Updating readme file for macos-15-arm64 version 20241125.405 (#11033) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-15-arm64-Readme.md | 75 ++++++++++++++------------- 1 file changed, 40 insertions(+), 35 deletions(-) diff --git a/images/macos/macos-15-arm64-Readme.md b/images/macos/macos-15-arm64-Readme.md index 9a26bb8a4bde..9b8b7e2f242b 100644 --- a/images/macos/macos-15-arm64-Readme.md +++ b/images/macos/macos-15-arm64-Readme.md @@ -1,16 +1,16 @@ | Announcements | |-| -| [[ macOS ] Node.js version 16 will be removed from macOS13 and macOS13 arm64 images on November, 18.](https://github.com/actions/runner-images/issues/10873) | +| [[ macOS ] Node.js version 16 will be removed from macOS13 and macOS13 arm64 images on November, 25.](https://github.com/actions/runner-images/issues/10873) | | [[macOS] OpenSSL 1.1 will be removed and OpenSSL 3 will be the default for all macOS images from November 4](https://github.com/actions/runner-images/issues/10817) | -| [[macOS] Python 3.9 and 3.10 will be removed from macOS13 arm64 and macOS14 arm64 on November 18.](https://github.com/actions/runner-images/issues/10812) | +| [[macOS] Python 3.9 and 3.10 will be removed from macOS13 arm64 and macOS14 arm64 on November 25.](https://github.com/actions/runner-images/issues/10812) | | [[macOS] The macOS 12 Actions runner image will begin deprecation on 10/7/24 and will be fully unsupported by 12/3/24 for GitHub and ADO](https://github.com/actions/runner-images/issues/10721) | | [[macOS] Support policy changes; Xcode 14 and 16 will be removed from macOS 14 on November 4](https://github.com/actions/runner-images/issues/10703) | | [macOS 15 (Sequoia) is now available as a public beta in GitHub Actions](https://github.com/actions/runner-images/issues/10686) | *** # macOS 15 -- OS Version: macOS 15.1 (24B2083) +- OS Version: macOS 15.1.1 (24B91) - Kernel Version: Darwin 24.1.0 -- Image Version: 20241118.362 +- Image Version: 20241125.405 ## Installed Software @@ -35,7 +35,7 @@ - Bundler 2.5.23 - Carthage 0.40.0 - CocoaPods 1.16.2 -- Homebrew 4.4.5 +- Homebrew 4.4.6 - NPM 10.9.0 - Pip3 24.2 (python 3.13) - Pipx 1.7.1 @@ -45,18 +45,18 @@ ### Project Management - Apache Ant 1.10.15 - Apache Maven 3.9.9 -- Gradle 8.11 +- Gradle 8.11.1 ### Utilities - 7-Zip 17.05 - aria2 1.37.0 - azcopy 10.27.1 - bazel 7.4.1 -- bazelisk 1.23.0 +- bazelisk 1.24.0 - bsdtar 3.5.3 - available by 'tar' alias - Curl 8.7.1 - Git 2.47.0 -- Git LFS 3.5.1 +- Git LFS 3.6.0 - GitHub CLI 2.62.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.25.0 @@ -64,22 +64,22 @@ - jq 1.7.1 - OpenSSL 1.1.1w 11 Sep 2023 - Packer 1.11.2 -- pkg-config 0.29.2 +- pkgconf 2.3.0 - Unxip 3.1 - yq 4.44.5 - zstd 1.5.6 ### Tools -- AWS CLI 2.21.3 -- AWS SAM CLI 1.129.0 -- AWS Session Manager CLI 1.2.688.0 -- Azure CLI 2.66.0 +- AWS CLI 2.22.4 +- AWS SAM CLI 1.131.0 +- AWS Session Manager CLI 1.2.694.0 +- Azure CLI 2.67.0 - Azure CLI (azure-devops) 1.0.1 - Bicep CLI 0.31.92 -- Cmake 3.31.0 +- Cmake 3.31.1 - CodeQL Action Bundle 2.19.3 - Fastlane 2.225.0 -- SwiftFormat 0.55.0 +- SwiftFormat 0.55.2 - Xcbeautify 2.15.0 - Xcode Command Line Tools 16.1.0.0.1.1729049160 - Xcodes 1.6.0 @@ -87,11 +87,11 @@ ### Linters ### Browsers -- Safari 18.1 (20619.2.8.11.10) -- SafariDriver 18.1 (20619.2.8.11.10) -- Google Chrome 131.0.6778.70 -- Google Chrome for Testing 131.0.6778.69 -- ChromeDriver 131.0.6778.69 +- Safari 18.1.1 (20619.2.8.11.12) +- SafariDriver 18.1.1 (20619.2.8.11.12) +- Google Chrome 131.0.6778.86 +- Google Chrome for Testing 131.0.6778.85 +- ChromeDriver 131.0.6778.85 - Selenium server 4.26.0 #### Environment variables @@ -110,6 +110,11 @@ ### Cached Tools +#### Ruby +- 3.1.6 +- 3.2.6 +- 3.3.6 + #### Python - 3.11.9 - 3.12.7 @@ -117,7 +122,7 @@ #### Node.js - 18.20.5 -- 20.18.0 +- 20.18.1 - 22.11.0 #### Go @@ -139,14 +144,14 @@ - PowerShell 7.4.6 #### PowerShell Modules -- Az: 12.5.0 +- Az: 12.4.0 - Pester: 5.6.1 - PSScriptAnalyzer: 1.23.0 ### Xcode | Version | Build | Path | Symlinks | | -------------- | -------- | ----------------------------------- | ----------------------------------------------------------------------------------------- | -| 16.2 (beta) | 16C5013f | /Applications/Xcode_16.2_beta_2.app | /Applications/Xcode_16.2.0.app<br>/Applications/Xcode_16.2.app | +| 16.2 (beta) | 16C5023f | /Applications/Xcode_16.2_beta_3.app | /Applications/Xcode_16.2.0.app<br>/Applications/Xcode_16.2.app | | 16.1 | 16B40 | /Applications/Xcode_16.1.app | /Applications/Xcode_16.1.0.app | | 16.0 (default) | 16A242d | /Applications/Xcode_16.app | /Applications/Xcode_16.0.0.app<br>/Applications/Xcode_16.0.app<br>/Applications/Xcode.app | @@ -201,18 +206,18 @@ | visionOS 2.2 | Apple Vision Pro | ### Android -| Package Name | Version | -| -------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 16.0 | -| Android Emulator | 35.2.10 | -| Android SDK Build-tools | 35.0.0 | -| Android SDK Platforms | android-35 (rev 1)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1) | -| Android SDK Platform-Tools | 35.0.2 | -| Android Support Repository | 47.0.0 | -| CMake | 3.22.1 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 26.3.11579264<br>27.2.12479018 (default) | +| Package Name | Version | +| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 16.0 | +| Android Emulator | 35.2.10 | +| Android SDK Build-tools | 35.0.0 | +| Android SDK Platforms | android-35-ext14 (rev 1)<br>android-35 (rev 1)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1) | +| Android SDK Platform-Tools | 35.0.2 | +| Android Support Repository | 47.0.0 | +| CMake | 3.31.0 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 26.3.11579264<br>27.2.12479018 (default) | #### Environment variables | Name | Value | From 6eccdcc56f1b3601f6a54393659b290ece561d24 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 26 Nov 2024 14:43:12 +0000 Subject: [PATCH 3287/3485] Updating readme file for macos-14-arm64 version 20241125.556 (#11031) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-14-arm64-Readme.md | 38 +++++++++++++++------------ 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/images/macos/macos-14-arm64-Readme.md b/images/macos/macos-14-arm64-Readme.md index 963ee220fa35..fc35d88ef7f8 100644 --- a/images/macos/macos-14-arm64-Readme.md +++ b/images/macos/macos-14-arm64-Readme.md @@ -10,7 +10,7 @@ # macOS 14 - OS Version: macOS 14.7.1 (23H222) - Kernel Version: Darwin 23.6.0 -- Image Version: 20241119.509 +- Image Version: 20241125.556 ## Installed Software @@ -27,7 +27,7 @@ - GNU Fortran 14 (Homebrew GCC 14.2.0_1) - available by `gfortran-14` alias - Kotlin 2.0.21-release-482 - Mono 6.12.0.188 -- Node.js 20.18.0 +- Node.js 20.18.1 - Perl 5.40.0 - Python3 3.13.0 - Ruby 3.0.7p220 @@ -47,18 +47,18 @@ ### Project Management - Apache Ant 1.10.15 - Apache Maven 3.9.9 -- Gradle 8.11 +- Gradle 8.11.1 ### Utilities - 7-Zip 17.05 - aria2 1.37.0 - azcopy 10.27.1 - bazel 7.4.1 -- bazelisk 1.23.0 +- bazelisk 1.24.0 - bsdtar 3.5.3 - available by 'tar' alias - Curl 8.7.1 - Git 2.47.0 -- Git LFS 3.5.1 +- Git LFS 3.6.0 - GitHub CLI 2.62.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.25.0 @@ -66,22 +66,22 @@ - jq 1.7.1 - OpenSSL 1.1.1w 11 Sep 2023 - Packer 1.11.2 -- pkg-config 0.29.2 +- pkgconf 2.3.0 - Unxip 3.1 - yq 4.44.5 - zstd 1.5.6 ### Tools -- AWS CLI 2.22.0 -- AWS SAM CLI 1.129.0 -- AWS Session Manager CLI 1.2.688.0 +- AWS CLI 2.22.4 +- AWS SAM CLI 1.131.0 +- AWS Session Manager CLI 1.2.694.0 - Azure CLI 2.67.0 - Azure CLI (azure-devops) 1.0.1 - Bicep CLI 0.31.92 -- Cmake 3.31.0 +- Cmake 3.31.1 - CodeQL Action Bundle 2.19.3 - Fastlane 2.225.0 -- SwiftFormat 0.55.0 +- SwiftFormat 0.55.2 - Xcbeautify 2.15.0 - Xcode Command Line Tools 16.1.0.0.1.1729049160 - Xcodes 1.6.0 @@ -112,16 +112,20 @@ ### Cached Tools +#### Ruby +- 3.0.7 +- 3.1.6 +- 3.2.6 +- 3.3.6 + #### Python -- 3.9.13 -- 3.10.11 - 3.11.9 - 3.12.7 - 3.13.0 #### Node.js - 18.20.5 -- 20.18.0 +- 20.18.1 - 22.11.0 #### Go @@ -203,12 +207,12 @@ | Simulator - watchOS 10.5 | watchsimulator10.5 | 15.4 | | Simulator - watchOS 11.0 | watchsimulator11.0 | 16.0 | | Simulator - watchOS 11.1 | watchsimulator11.1 | 16.1 | -| visionOS 1.0 | xros1.0 | 15.2 | | Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | -| visionOS 1.1 | xros1.1 | 15.3 | +| visionOS 1.0 | xros1.0 | 15.2 | | Simulator - visionOS 1.1 | xrsimulator1.1 | 15.3 | -| Simulator - visionOS 1.2 | xrsimulator1.2 | 15.4 | +| visionOS 1.1 | xros1.1 | 15.3 | | visionOS 1.2 | xros1.2 | 15.4 | +| Simulator - visionOS 1.2 | xrsimulator1.2 | 15.4 | | Simulator - visionOS 2.0 | xrsimulator2.0 | 16.0 | | visionOS 2.0 | xros2.0 | 16.0 | | Simulator - visionOS 2.1 | xrsimulator2.1 | 16.1 | From 181b98660dd23f8de32e6cb068d261e98b6bdad0 Mon Sep 17 00:00:00 2001 From: lawrencegripper <info@grippers.co.uk> Date: Wed, 27 Nov 2024 10:57:26 +0000 Subject: [PATCH 3288/3485] hack: get stdout and stderr for failing install --- images/windows/scripts/helpers/InstallHelpers.ps1 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/images/windows/scripts/helpers/InstallHelpers.ps1 b/images/windows/scripts/helpers/InstallHelpers.ps1 index 139d51b385d9..b27831386f85 100644 --- a/images/windows/scripts/helpers/InstallHelpers.ps1 +++ b/images/windows/scripts/helpers/InstallHelpers.ps1 @@ -121,6 +121,10 @@ function Install-Binary { Write-Host "Installation successful in $installCompleteTime seconds. Reboot is required." } else { Write-Host "Installation process returned unexpected exit code: $exitCode" + Write-Host "Standard Output:" + Write-Host $process.StandardOutput.ReadToEnd() + Write-Host "Standard Error:" + Write-Host $process.StandardError.ReadToEnd() Write-Host "Time elapsed: $installCompleteTime seconds" exit $exitCode } From 20d0451bdd96d99951cbaff4be26f9e56ddbcbae Mon Sep 17 00:00:00 2001 From: kishorekumar-anchala <168699259+kishorekumar-anchala@users.noreply.github.com> Date: Wed, 27 Nov 2024 18:01:30 +0530 Subject: [PATCH 3289/3485] Update visualstduio signature for windows 2022 (#11052) --- images/windows/toolsets/toolset-2022.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/windows/toolsets/toolset-2022.json b/images/windows/toolsets/toolset-2022.json index 7067b0c89871..e15af72cd5ac 100644 --- a/images/windows/toolsets/toolset-2022.json +++ b/images/windows/toolsets/toolset-2022.json @@ -179,7 +179,7 @@ "subversion" : "17", "edition" : "Enterprise", "channel": "release", - "signature": "245D262748012A4FE6CE8BA6C951A4C4AFBC3E5D", + "signature": "8F985BE8FD256085C90A95D3C74580511A1DB975", "workloads": [ "Component.Dotfuscator", "Component.Linux.CMake", From 157d0dd46ba3ca0b4a28e80c7aabdbdcc715317b Mon Sep 17 00:00:00 2001 From: lawrencegripper <info@grippers.co.uk> Date: Wed, 27 Nov 2024 16:03:13 +0000 Subject: [PATCH 3290/3485] Allow postgres to install necessary MSVC redistributables Newer postgres installes require MSVC 17 which isn't on the box by default. Previously this worked as they required MSVC 16 which was installed by Visual Studio https://github.com/actions/runner-images/pull/11047#issuecomment-2504219995 --- images/windows/scripts/build/Install-PostgreSQL.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/windows/scripts/build/Install-PostgreSQL.ps1 b/images/windows/scripts/build/Install-PostgreSQL.ps1 index 2bad88580310..a43b5da55216 100644 --- a/images/windows/scripts/build/Install-PostgreSQL.ps1 +++ b/images/windows/scripts/build/Install-PostgreSQL.ps1 @@ -60,7 +60,7 @@ if ($null -ne ($toolsetVersion | Select-String -Pattern '\d+\.\d+\.\d+')) { # Return the previous value of ErrorAction and invoke Install-Binary function $ErrorActionPreference = $errorActionOldValue -$installerArgs = @("--install_runtimes 0", "--superpassword root", "--enable_acledit 1", "--unattendedmodeui none", "--mode unattended") +$installerArgs = @("--superpassword root", "--enable_acledit 1", "--unattendedmodeui none", "--mode unattended") Install-Binary ` -Url $installerUrl ` -InstallArgs $installerArgs ` From 9b0a6c08c91f2bb7dacb0fd69771f18c06aa43ea Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Thu, 28 Nov 2024 11:04:06 +0100 Subject: [PATCH 3291/3485] [Windows] Update Kotlin Pester test (#11056) --- images/windows/scripts/tests/Tools.Tests.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/windows/scripts/tests/Tools.Tests.ps1 b/images/windows/scripts/tests/Tools.Tests.ps1 index a71ff24fd66b..c20c95b8da3a 100644 --- a/images/windows/scripts/tests/Tools.Tests.ps1 +++ b/images/windows/scripts/tests/Tools.Tests.ps1 @@ -201,7 +201,7 @@ Describe "Pipx" { } Describe "Kotlin" { - $kotlinPackages = @("kapt", "kotlin", "kotlinc", "kotlin-dce-js", "kotlinc-jvm") + $kotlinPackages = @("kapt", "kotlin", "kotlinc", "kotlinc-js", "kotlinc-jvm") It "<toolName> is available" -TestCases ($kotlinPackages | ForEach-Object { @{ toolName = $_ } }) { "$toolName -version" | Should -ReturnZeroExitCode From 5a263020f559343719f2dbacfd1065e94a691c11 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Thu, 28 Nov 2024 13:30:26 +0100 Subject: [PATCH 3292/3485] [Windows] Reorganize temporary file storage and separate cleanup activities (#11054) --- .../scripts/build/Configure-System.ps1 | 51 +------------------ .../build/Install-BizTalkBuildComponent.ps1 | 2 +- .../windows/scripts/build/Install-Docker.ps1 | 6 +-- .../windows/scripts/build/Install-Toolset.ps1 | 2 +- .../windows/scripts/build/Invoke-Cleanup.ps1 | 51 +++++++++++++++++++ .../scripts/helpers/InstallHelpers.ps1 | 46 ++++++++--------- .../scripts/helpers/VisualStudioHelpers.ps1 | 8 +-- images/windows/templates/windows-2019.pkr.hcl | 25 ++++++--- images/windows/templates/windows-2022.pkr.hcl | 27 ++++++---- 9 files changed, 119 insertions(+), 99 deletions(-) create mode 100644 images/windows/scripts/build/Invoke-Cleanup.ps1 diff --git a/images/windows/scripts/build/Configure-System.ps1 b/images/windows/scripts/build/Configure-System.ps1 index d02dde2ac3b5..1291b7b47b38 100644 --- a/images/windows/scripts/build/Configure-System.ps1 +++ b/images/windows/scripts/build/Configure-System.ps1 @@ -3,12 +3,6 @@ ## Desc: Applies various configuration settings to the final image ################################################################################ -Write-Host "Cleanup WinSxS" -dism.exe /online /Cleanup-Image /StartComponentCleanup /ResetBase -if ($LASTEXITCODE -ne 0) { - throw "Failed to cleanup WinSxS" -} - # Set default version to 1 for WSL (aka LXSS - Linux Subsystem) # The value should be set in the default user registry hive # https://github.com/actions/runner-images/issues/5760 @@ -31,51 +25,8 @@ if (Test-IsWin22) { $key.SetValue("DefaultVersion", "1", "DWord") $key.Handle.Close() [System.GC]::Collect() - - Dismount-RegistryHive "HKLM\DEFAULT" -} - -Write-Host "Clean up various directories" -@( - "$env:SystemDrive\Recovery", - "$env:SystemRoot\logs", - "$env:SystemRoot\winsxs\manifestcache", - "$env:SystemRoot\Temp", - "$env:SystemDrive\Users\$env:INSTALL_USER\AppData\Local\Temp", - "$env:TEMP", - "$env:AZURE_CONFIG_DIR\logs", - "$env:AZURE_CONFIG_DIR\commands", - "$env:AZURE_CONFIG_DIR\telemetry" -) | ForEach-Object { - if (Test-Path $_) { - Write-Host "Removing $_" - cmd /c "takeown /d Y /R /f $_ 2>&1" | Out-Null - if ($LASTEXITCODE -ne 0) { - throw "Failed to take ownership of $_" - } - cmd /c "icacls $_ /grant:r administrators:f /t /c /q 2>&1" | Out-Null - if ($LASTEXITCODE -ne 0) { - throw "Failed to grant administrators full control of $_" - } - Remove-Item $_ -Recurse -Force -ErrorAction SilentlyContinue | Out-Null - } -} -$winInstallDir = "$env:SystemRoot\Installer" -New-Item -Path $winInstallDir -ItemType Directory -Force | Out-Null - -# Remove AllUsersAllHosts profile -Remove-Item $profile.AllUsersAllHosts -Force -ErrorAction SilentlyContinue | Out-Null - -# Clean yarn and npm cache -cmd /c "yarn cache clean 2>&1" | Out-Null -if ($LASTEXITCODE -ne 0) { - throw "Failed to clean yarn cache" -} - -cmd /c "npm cache clean --force 2>&1" | Out-Null -if ($LASTEXITCODE -ne 0) { - throw "Failed to clean npm cache" + Dismount-RegistryHive "HKLM\DEFAULT" } # allow msi to write to temp folder diff --git a/images/windows/scripts/build/Install-BizTalkBuildComponent.ps1 b/images/windows/scripts/build/Install-BizTalkBuildComponent.ps1 index a56a663e573e..cf2a11ce7338 100644 --- a/images/windows/scripts/build/Install-BizTalkBuildComponent.ps1 +++ b/images/windows/scripts/build/Install-BizTalkBuildComponent.ps1 @@ -9,7 +9,7 @@ $signatureThumbprint = "8740DF4ACB749640AD318E4BE842F72EC651AD80" Write-Host "Downloading BizTalk Project Build Component archive..." $zipFile = Invoke-DownloadWithRetry $downloadUrl -$setupPath = Join-Path $env:TEMP "BizTalkBuildComponent" +$setupPath = Join-Path $env:TEMP_DIR "BizTalkBuildComponent" if (-not (Test-Path -Path $setupPath)) { New-Item -Path $setupPath -ItemType Directory -Force | Out-Null } diff --git a/images/windows/scripts/build/Install-Docker.ps1 b/images/windows/scripts/build/Install-Docker.ps1 index 5eabf994079a..142a3f8006b0 100644 --- a/images/windows/scripts/build/Install-Docker.ps1 +++ b/images/windows/scripts/build/Install-Docker.ps1 @@ -23,9 +23,9 @@ $mobyReleaseUrl = $dockerceUrl + $mobyRelease Write-Host "Install Moby $mobyRelease..." $mobyArchivePath = Invoke-DownloadWithRetry $mobyReleaseUrl -Expand-Archive -Path $mobyArchivePath -DestinationPath $env:TEMP -$dockerPath = "$env:TEMP\docker\docker.exe" -$dockerdPath = "$env:TEMP\docker\dockerd.exe" +Expand-Archive -Path $mobyArchivePath -DestinationPath $env:TEMP_DIR +$dockerPath = "$env:TEMP_DIR\docker\docker.exe" +$dockerdPath = "$env:TEMP_DIR\docker\dockerd.exe" Write-Host "Install Docker CE" $instScriptUrl = "https://raw.githubusercontent.com/microsoft/Windows-Containers/Main/helpful_tools/Install-DockerCE/install-docker-ce.ps1" diff --git a/images/windows/scripts/build/Install-Toolset.ps1 b/images/windows/scripts/build/Install-Toolset.ps1 index aab98f936b0b..c9373b24cad3 100644 --- a/images/windows/scripts/build/Install-Toolset.ps1 +++ b/images/windows/scripts/build/Install-Toolset.ps1 @@ -13,7 +13,7 @@ Function Install-Asset { ) $releaseAssetName = [System.IO.Path]::GetFileNameWithoutExtension($ReleaseAsset.filename) - $assetFolderPath = Join-Path $env:TEMP $releaseAssetName + $assetFolderPath = Join-Path $env:TEMP_DIR $releaseAssetName $assetArchivePath = Invoke-DownloadWithRetry $ReleaseAsset.download_url Write-Host "Extract $($ReleaseAsset.filename) content..." diff --git a/images/windows/scripts/build/Invoke-Cleanup.ps1 b/images/windows/scripts/build/Invoke-Cleanup.ps1 new file mode 100644 index 000000000000..1e5091e253af --- /dev/null +++ b/images/windows/scripts/build/Invoke-Cleanup.ps1 @@ -0,0 +1,51 @@ +################################################################################ +## File: Invoke-Cleanup.ps1 +## Desc: Cleanup WinSxS, temp, cache and compress some directories +################################################################################ + +Write-Host "Cleanup WinSxS" +dism.exe /online /Cleanup-Image /StartComponentCleanup /ResetBase +if ($LASTEXITCODE -ne 0) { + throw "Failed to cleanup WinSxS" +} + +Write-Host "Clean up various directories" +@( + "$env:SystemDrive\Recovery", + "$env:SystemRoot\logs", + "$env:SystemRoot\winsxs\manifestcache", + "$env:SystemRoot\Temp", + "$env:SystemRoot\Installer", + "$env:SystemDrive\Users\$env:INSTALL_USER\AppData\Local\Temp", + "$env:TEMP", + "$env:AZURE_CONFIG_DIR\logs", + "$env:AZURE_CONFIG_DIR\commands", + "$env:AZURE_CONFIG_DIR\telemetry" +) | ForEach-Object { + if (Test-Path $_) { + Write-Host "Removing $_" + cmd /c "takeown /d Y /R /f $_ 2>&1" | Out-Null + if ($LASTEXITCODE -ne 0) { + throw "Failed to take ownership of $_" + } + cmd /c "icacls $_ /grant:r administrators:f /t /c /q 2>&1" | Out-Null + if ($LASTEXITCODE -ne 0) { + throw "Failed to grant administrators full control of $_" + } + Remove-Item $_ -Recurse -Force -ErrorAction SilentlyContinue | Out-Null + } +} + +# Remove AllUsersAllHosts profile +Remove-Item $profile.AllUsersAllHosts -Force -ErrorAction SilentlyContinue | Out-Null + +# Clean yarn and npm cache +cmd /c "yarn cache clean 2>&1" | Out-Null +if ($LASTEXITCODE -ne 0) { + throw "Failed to clean yarn cache" +} + +cmd /c "npm cache clean --force 2>&1" | Out-Null +if ($LASTEXITCODE -ne 0) { + throw "Failed to clean npm cache" +} diff --git a/images/windows/scripts/helpers/InstallHelpers.ps1 b/images/windows/scripts/helpers/InstallHelpers.ps1 index 139d51b385d9..b491533e444f 100644 --- a/images/windows/scripts/helpers/InstallHelpers.ps1 +++ b/images/windows/scripts/helpers/InstallHelpers.ps1 @@ -70,7 +70,7 @@ function Install-Binary { } else { $fileName = [System.IO.Path]::GetFileNameWithoutExtension([System.IO.Path]::GetRandomFileName()) + ".$Type".ToLower() } - $filePath = Invoke-DownloadWithRetry -Url $Url -Path "${env:Temp}\$fileName" + $filePath = Invoke-DownloadWithRetry -Url $Url -Path "${env:TEMP_DIR}\$fileName" } if ($PSBoundParameters.ContainsKey('ExpectedSignature')) { @@ -92,7 +92,7 @@ function Install-Binary { if ($ExtraInstallArgs -and $InstallArgs) { throw "InstallArgs and ExtraInstallArgs parameters cannot be used together." } - + if ($Type -eq "MSI") { # MSI binaries should be installed via msiexec.exe if ($ExtraInstallArgs) { @@ -153,7 +153,7 @@ function Invoke-DownloadWithRetry { .EXAMPLE Invoke-DownloadWithRetry -Url "https://example.com/file.zip" Downloads the file from the specified URL and saves it to a temporary path. - + .OUTPUTS The path where the downloaded file is saved. #> @@ -174,7 +174,7 @@ function Invoke-DownloadWithRetry { if ([String]::IsNullOrEmpty($fileName)) { $fileName = [System.IO.Path]::GetRandomFileName() } - $Path = Join-Path -Path "${env:Temp}" -ChildPath $fileName + $Path = Join-Path -Path "${env:TEMP_DIR}" -ChildPath $fileName } Write-Host "Downloading package from $Url to $Path..." @@ -198,7 +198,7 @@ function Invoke-DownloadWithRetry { $retries = 0 } } - + if ($retries -eq 0) { $totalSeconds = [math]::Round(($(Get-Date) - $downloadStartTime).TotalSeconds, 2) throw "Package download failed after $totalSeconds seconds" @@ -519,7 +519,7 @@ function Get-GithubReleasesByVersion { .PARAMETER AllowPrerelease Specifies whether to include prerelease versions in the results. By default, prerelease versions are excluded. - + .PARAMETER WithAssetsOnly Specifies whether to exclude releases without assets. By default, releases without assets are included. @@ -549,7 +549,7 @@ function Get-GithubReleasesByVersion { [switch] $WithAssetsOnly ) - $localCacheFile = Join-Path ${env:TEMP} "github-releases_$($Repository -replace "/", "_").json" + $localCacheFile = Join-Path ${env:TEMP_DIR} "github-releases_$($Repository -replace "/", "_").json" if (Test-Path $localCacheFile) { $releases = Get-Content $localCacheFile | ConvertFrom-Json @@ -783,7 +783,7 @@ function Get-ChecksumFromGithubRelease { } $hash = $matchedLine | Select-String -Pattern $pattern | ForEach-Object { $_.Matches.Value } - + if ([string]::IsNullOrEmpty($hash)) { throw "Found '${FileName}' in body of release ${matchedVersion}, but failed to get hash from it.`nLine: ${matchedLine}" } @@ -827,7 +827,7 @@ function Get-ChecksumFromUrl { [string] $HashType ) - $tempFile = Join-Path -Path $env:TEMP -ChildPath ([System.IO.Path]::GetRandomFileName()) + $tempFile = Join-Path -Path $env:TEMP_DIR -ChildPath ([System.IO.Path]::GetRandomFileName()) $checksums = (Invoke-DownloadWithRetry -Url $Url -Path $tempFile | Get-Item | Get-Content) -as [string[]] Remove-Item -Path $tempFile @@ -860,30 +860,30 @@ function Test-FileChecksum { <# .SYNOPSIS Verifies the checksum of a file. - + .DESCRIPTION The Test-FileChecksum function verifies the SHA256 or SHA512 checksum of a file against an expected value. If the checksum does not match the expected value, the function throws an error. - + .PARAMETER Path The path to the file for which to verify the checksum. - + .PARAMETER ExpectedSHA256Sum The expected SHA256 checksum. If this parameter is provided, the function will calculate the SHA256 checksum of the file and compare it to this value. - + .PARAMETER ExpectedSHA512Sum The expected SHA512 checksum. If this parameter is provided, the function will calculate the SHA512 checksum of the file and compare it to this value. - + .EXAMPLE Test-FileChecksum -Path "C:\temp\file.txt" -ExpectedSHA256Sum "ABC123" - + Verifies that the SHA256 checksum of the file at C:\temp\file.txt is ABC123. - + .EXAMPLE Test-FileChecksum -Path "C:\temp\file.txt" -ExpectedSHA512Sum "DEF456" - + Verifies that the SHA512 checksum of the file at C:\temp\file.txt is DEF456. - + #> param ( @@ -944,7 +944,7 @@ function Test-FileSignature { This example tests the signature of the file "C:\Path\To\File.exe" against the expected thumbprint "A1B2C3D4E5F6G7H8I9J0K1L2M3N4O5P6Q7R8S9T0". #> - + param( [Parameter(Mandatory = $true, Position = 0)] [string] $Path, @@ -957,7 +957,7 @@ function Test-FileSignature { if ($signature.Status -ne "Valid") { throw "Signature status is not valid. Status: $($signature.Status)" } - + foreach ($thumbprint in $ExpectedThumbprint) { if ($signature.SignerCertificate.Thumbprint.Contains($thumbprint)) { Write-Output "Signature for $Path is valid" @@ -992,8 +992,8 @@ function Update-Environment { ) # Update PATH variable - $pathItems = $locations | ForEach-Object { - (Get-Item $_).GetValue('PATH').Split(';') + $pathItems = $locations | ForEach-Object { + (Get-Item $_).GetValue('PATH').Split(';') } | Select-Object -Unique $env:PATH = $pathItems -join ';' @@ -1004,7 +1004,7 @@ function Update-Environment { $value = $key.GetValue($name) if (-not ($name -ieq 'PATH')) { Set-Item -Path Env:$name -Value $value - } + } } } } diff --git a/images/windows/scripts/helpers/VisualStudioHelpers.ps1 b/images/windows/scripts/helpers/VisualStudioHelpers.ps1 index da7b3da5566a..44f8bb32c13a 100644 --- a/images/windows/scripts/helpers/VisualStudioHelpers.ps1 +++ b/images/windows/scripts/helpers/VisualStudioHelpers.ps1 @@ -17,7 +17,7 @@ Function Install-VisualStudio { .PARAMETER RequiredComponents The list of required components. Required parameter. - + .PARAMETER ExtraArgs The extra arguments to pass to the bootstrapper. Optional parameter. #> @@ -85,10 +85,10 @@ Function Install-VisualStudio { } # Expand the zip file - Expand-Archive -Path "$env:TEMP\vslogs.zip" -DestinationPath "$env:TEMP\vslogs" + Expand-Archive -Path "$env:TEMP_DIR\vslogs.zip" -DestinationPath "$env:TEMP_DIR\vslogs" # Print logs - $vsLogsPath = "$env:TEMP\vslogs" + $vsLogsPath = "$env:TEMP_DIR\vslogs" $vsLogs = Get-ChildItem -Path $vsLogsPath -Recurse | Where-Object { -not $_.PSIsContainer } | Select-Object -ExpandProperty FullName foreach ($log in $vsLogs) { Write-Host "============================" @@ -96,7 +96,7 @@ Function Install-VisualStudio { Write-Host "============================" Get-Content -Path $log -ErrorAction Continue } - + exit $exitCode } } diff --git a/images/windows/templates/windows-2019.pkr.hcl b/images/windows/templates/windows-2019.pkr.hcl index 09acf8da3bcd..1ec030585c4a 100644 --- a/images/windows/templates/windows-2019.pkr.hcl +++ b/images/windows/templates/windows-2019.pkr.hcl @@ -72,6 +72,11 @@ variable "imagedata_file" { default = "C:\\imagedata.json" } +variable "temp_dir" { + type = string + default = "D:\\temp" +} + variable "install_password" { type = string default = "" @@ -190,7 +195,10 @@ build { sources = ["source.azure-arm.image"] provisioner "powershell" { - inline = ["New-Item -Path ${var.image_folder} -ItemType Directory -Force"] + inline = [ + "New-Item -Path ${var.image_folder} -ItemType Directory -Force", + "New-Item -Path ${var.temp_dir} -ItemType Directory -Force" + ] } provisioner "file" { @@ -253,7 +261,7 @@ build { } provisioner "powershell" { - environment_vars = ["IMAGE_VERSION=${var.image_version}", "IMAGE_OS=${var.image_os}", "AGENT_TOOLSDIRECTORY=${var.agent_tools_directory}", "IMAGEDATA_FILE=${var.imagedata_file}", "IMAGE_FOLDER=${var.image_folder}"] + environment_vars = ["IMAGE_VERSION=${var.image_version}", "IMAGE_OS=${var.image_os}", "AGENT_TOOLSDIRECTORY=${var.agent_tools_directory}", "IMAGEDATA_FILE=${var.imagedata_file}", "IMAGE_FOLDER=${var.image_folder}", "TEMP_DIR=${var.temp_dir}"] execution_policy = "unrestricted" scripts = [ "${path.root}/../scripts/build/Configure-WindowsDefender.ps1", @@ -277,7 +285,7 @@ build { } provisioner "powershell" { - environment_vars = ["IMAGE_FOLDER=${var.image_folder}"] + environment_vars = ["IMAGE_FOLDER=${var.image_folder}", "TEMP_DIR=${var.temp_dir}"] scripts = [ "${path.root}/../scripts/build/Install-VCRedist.ps1", "${path.root}/../scripts/build/Install-Docker.ps1", @@ -297,7 +305,7 @@ build { provisioner "powershell" { elevated_password = "${var.install_password}" elevated_user = "${var.install_user}" - environment_vars = ["IMAGE_FOLDER=${var.image_folder}"] + environment_vars = ["IMAGE_FOLDER=${var.image_folder}", "TEMP_DIR=${var.temp_dir}"] scripts = [ "${path.root}/../scripts/build/Install-VisualStudio.ps1", "${path.root}/../scripts/build/Install-KubernetesTools.ps1", @@ -307,7 +315,7 @@ build { } provisioner "powershell" { - environment_vars = ["IMAGE_FOLDER=${var.image_folder}"] + environment_vars = ["IMAGE_FOLDER=${var.image_folder}", "TEMP_DIR=${var.temp_dir}"] scripts = [ "${path.root}/../scripts/build/Install-Wix.ps1", "${path.root}/../scripts/build/Install-WDK.ps1", @@ -323,7 +331,7 @@ build { provisioner "powershell" { execution_policy = "remotesigned" - environment_vars = ["IMAGE_FOLDER=${var.image_folder}"] + environment_vars = ["IMAGE_FOLDER=${var.image_folder}", "TEMP_DIR=${var.temp_dir}"] scripts = ["${path.root}/../scripts/build/Install-ServiceFabricSDK.ps1"] } @@ -336,7 +344,7 @@ build { } provisioner "powershell" { - environment_vars = ["IMAGE_FOLDER=${var.image_folder}"] + environment_vars = ["IMAGE_FOLDER=${var.image_folder}", "TEMP_DIR=${var.temp_dir}"] scripts = [ "${path.root}/../scripts/build/Install-ActionsCache.ps1", "${path.root}/../scripts/build/Install-Ruby.ps1", @@ -409,9 +417,10 @@ build { provisioner "powershell" { pause_before = "2m0s" - environment_vars = ["IMAGE_FOLDER=${var.image_folder}"] + environment_vars = ["IMAGE_FOLDER=${var.image_folder}", "TEMP_DIR=${var.temp_dir}"] scripts = [ "${path.root}/../scripts/build/Install-WindowsUpdatesAfterReboot.ps1", + "${path.root}/../scripts/build/Invoke-Cleanup.ps1", "${path.root}/../scripts/tests/RunAll-Tests.ps1" ] } diff --git a/images/windows/templates/windows-2022.pkr.hcl b/images/windows/templates/windows-2022.pkr.hcl index c37a36243261..0c66a7dbfa1f 100644 --- a/images/windows/templates/windows-2022.pkr.hcl +++ b/images/windows/templates/windows-2022.pkr.hcl @@ -72,6 +72,11 @@ variable "imagedata_file" { default = "C:\\imagedata.json" } +variable "temp_dir" { + type = string + default = "D:\\temp" +} + variable "install_password" { type = string default = "" @@ -190,7 +195,10 @@ build { sources = ["source.azure-arm.image"] provisioner "powershell" { - inline = ["New-Item -Path ${var.image_folder} -ItemType Directory -Force"] + inline = [ + "New-Item -Path ${var.image_folder} -ItemType Directory -Force", + "New-Item -Path ${var.temp_dir} -ItemType Directory -Force" + ] } provisioner "file" { @@ -242,7 +250,7 @@ build { } provisioner "powershell" { - environment_vars = ["IMAGE_VERSION=${var.image_version}", "IMAGE_OS=${var.image_os}", "AGENT_TOOLSDIRECTORY=${var.agent_tools_directory}", "IMAGEDATA_FILE=${var.imagedata_file}", "IMAGE_FOLDER=${var.image_folder}"] + environment_vars = ["IMAGE_VERSION=${var.image_version}", "IMAGE_OS=${var.image_os}", "AGENT_TOOLSDIRECTORY=${var.agent_tools_directory}", "IMAGEDATA_FILE=${var.imagedata_file}", "IMAGE_FOLDER=${var.image_folder}", "TEMP_DIR=${var.temp_dir}"] execution_policy = "unrestricted" scripts = [ "${path.root}/../scripts/build/Configure-WindowsDefender.ps1", @@ -268,7 +276,7 @@ build { } provisioner "powershell" { - environment_vars = ["IMAGE_FOLDER=${var.image_folder}"] + environment_vars = ["IMAGE_FOLDER=${var.image_folder}", "TEMP_DIR=${var.temp_dir}"] scripts = [ "${path.root}/../scripts/build/Install-Docker.ps1", "${path.root}/../scripts/build/Install-DockerWinCred.ps1", @@ -287,7 +295,7 @@ build { provisioner "powershell" { elevated_password = "${var.install_password}" elevated_user = "${var.install_user}" - environment_vars = ["IMAGE_FOLDER=${var.image_folder}"] + environment_vars = ["IMAGE_FOLDER=${var.image_folder}", "TEMP_DIR=${var.temp_dir}"] scripts = [ "${path.root}/../scripts/build/Install-VisualStudio.ps1", "${path.root}/../scripts/build/Install-KubernetesTools.ps1" @@ -302,7 +310,7 @@ build { provisioner "powershell" { pause_before = "2m0s" - environment_vars = ["IMAGE_FOLDER=${var.image_folder}"] + environment_vars = ["IMAGE_FOLDER=${var.image_folder}", "TEMP_DIR=${var.temp_dir}"] scripts = [ "${path.root}/../scripts/build/Install-Wix.ps1", "${path.root}/../scripts/build/Install-WDK.ps1", @@ -318,7 +326,7 @@ build { provisioner "powershell" { execution_policy = "remotesigned" - environment_vars = ["IMAGE_FOLDER=${var.image_folder}"] + environment_vars = ["IMAGE_FOLDER=${var.image_folder}", "TEMP_DIR=${var.temp_dir}"] scripts = ["${path.root}/../scripts/build/Install-ServiceFabricSDK.ps1"] } @@ -331,7 +339,7 @@ build { } provisioner "powershell" { - environment_vars = ["IMAGE_FOLDER=${var.image_folder}"] + environment_vars = ["IMAGE_FOLDER=${var.image_folder}", "TEMP_DIR=${var.temp_dir}"] scripts = [ "${path.root}/../scripts/build/Install-ActionsCache.ps1", "${path.root}/../scripts/build/Install-Ruby.ps1", @@ -385,7 +393,7 @@ build { provisioner "powershell" { elevated_password = "${var.install_password}" elevated_user = "${var.install_user}" - environment_vars = ["IMAGE_FOLDER=${var.image_folder}"] + environment_vars = ["IMAGE_FOLDER=${var.image_folder}", "TEMP_DIR=${var.temp_dir}"] scripts = [ "${path.root}/../scripts/build/Install-WindowsUpdates.ps1", "${path.root}/../scripts/build/Configure-DynamicPort.ps1", @@ -404,9 +412,10 @@ build { provisioner "powershell" { pause_before = "2m0s" - environment_vars = ["IMAGE_FOLDER=${var.image_folder}"] + environment_vars = ["IMAGE_FOLDER=${var.image_folder}", "TEMP_DIR=${var.temp_dir}"] scripts = [ "${path.root}/../scripts/build/Install-WindowsUpdatesAfterReboot.ps1", + "${path.root}/../scripts/build/Invoke-Cleanup.ps1", "${path.root}/../scripts/tests/RunAll-Tests.ps1" ] } From 004bb48b9e2748205d91182a2ff8a2e0b04e65ad Mon Sep 17 00:00:00 2001 From: RaviAkshintala <167848931+RaviAkshintala@users.noreply.github.com> Date: Thu, 28 Nov 2024 20:41:49 +0530 Subject: [PATCH 3293/3485] [Ubuntu] Updated the Kotlin pester test and Power shell version for Ubuntu24.04. (#11062) * [Ubuntu] Uodated the script to install the powershell * [Ubuntu] Fixing the powershell and kotlin --------- Co-authored-by: Ravi Akshintala <raviakshintalagithub.com@Ravis-Laptop.local> --- images/ubuntu/scripts/build/install-powershell.sh | 8 +------- images/ubuntu/scripts/tests/Tools.Tests.ps1 | 4 ++-- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/images/ubuntu/scripts/build/install-powershell.sh b/images/ubuntu/scripts/build/install-powershell.sh index a3802f3519fc..e1d56e4017c9 100644 --- a/images/ubuntu/scripts/build/install-powershell.sh +++ b/images/ubuntu/scripts/build/install-powershell.sh @@ -11,11 +11,5 @@ source $HELPER_SCRIPTS/os.sh pwsh_version=$(get_toolset_value .pwsh.version) # Install Powershell -if is_ubuntu24; then - dependency_path=$(download_with_retry "http://mirrors.kernel.org/ubuntu/pool/main/i/icu/libicu72_72.1-3ubuntu2_amd64.deb") - sudo dpkg -i "$dependency_path" - package_path=$(download_with_retry "https://github.com/PowerShell/PowerShell/releases/download/v7.4.2/powershell-lts_7.4.2-1.deb_amd64.deb") - sudo dpkg -i "$package_path" -else + apt-get install powershell=$pwsh_version* -fi diff --git a/images/ubuntu/scripts/tests/Tools.Tests.ps1 b/images/ubuntu/scripts/tests/Tools.Tests.ps1 index 8acb23a359e5..54f02e72d0ad 100644 --- a/images/ubuntu/scripts/tests/Tools.Tests.ps1 +++ b/images/ubuntu/scripts/tests/Tools.Tests.ps1 @@ -407,7 +407,7 @@ Describe "Kotlin" { "kotlinc-jvm -version" | Should -ReturnZeroExitCode } - It "kotlin-dce-js" { - "kotlin-dce-js -version" | Should -ReturnZeroExitCode + It "kotlinc-js" { + "kotlinc-js -version" | Should -ReturnZeroExitCode } } From ba0b2425036cb6d67b7e8fdd0dc91dd60a643398 Mon Sep 17 00:00:00 2001 From: Lawrence Gripper <lawrencegripper@github.com> Date: Thu, 28 Nov 2024 15:42:57 +0000 Subject: [PATCH 3294/3485] Update images/windows/scripts/helpers/InstallHelpers.ps1 --- images/windows/scripts/helpers/InstallHelpers.ps1 | 4 ---- 1 file changed, 4 deletions(-) diff --git a/images/windows/scripts/helpers/InstallHelpers.ps1 b/images/windows/scripts/helpers/InstallHelpers.ps1 index 94db7b841068..b491533e444f 100644 --- a/images/windows/scripts/helpers/InstallHelpers.ps1 +++ b/images/windows/scripts/helpers/InstallHelpers.ps1 @@ -121,10 +121,6 @@ function Install-Binary { Write-Host "Installation successful in $installCompleteTime seconds. Reboot is required." } else { Write-Host "Installation process returned unexpected exit code: $exitCode" - Write-Host "Standard Output:" - Write-Host $process.StandardOutput.ReadToEnd() - Write-Host "Standard Error:" - Write-Host $process.StandardError.ReadToEnd() Write-Host "Time elapsed: $installCompleteTime seconds" exit $exitCode } From 6c768837be3a5e5d44fb57645a93a07553c0c724 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Thu, 28 Nov 2024 20:09:12 +0100 Subject: [PATCH 3295/3485] Add trigger to run Windows 2025 CI (#11063) --- .github/workflows/windows2025.yml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 .github/workflows/windows2025.yml diff --git a/.github/workflows/windows2025.yml b/.github/workflows/windows2025.yml new file mode 100644 index 000000000000..c5948f83c6f9 --- /dev/null +++ b/.github/workflows/windows2025.yml @@ -0,0 +1,20 @@ +name: Trigger Windows25 CI +run-name: Windows2025 - ${{ github.event.pull_request.title }} + +on: + pull_request_target: + types: labeled + paths: + - 'images/windows/**' + +defaults: + run: + shell: pwsh + +jobs: + Windows_2022: + if: github.event.label.name == 'CI windows-all' || github.event.label.name == 'CI windows-2025' + uses: ./.github/workflows/trigger-ubuntu-win-build.yml + with: + image_type: 'windows2025' + secrets: inherit From e3ba729b37f7e863b402f2573fd8689baf2166e8 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Fri, 29 Nov 2024 11:08:29 +0100 Subject: [PATCH 3296/3485] [Windows] Add Windows 2025 code (#11037) --- .../scripts/build/Configure-ImageDataFile.ps1 | 6 +- .../windows/scripts/build/Configure-User.ps1 | 28 +- .../windows/scripts/build/Install-Docker.ps1 | 20 +- .../windows/scripts/build/Install-Haskell.ps1 | 9 +- .../windows/scripts/build/Install-Mingw64.ps1 | 6 +- .../windows/scripts/build/Install-MongoDB.ps1 | 14 + images/windows/scripts/build/Install-Rust.ps1 | 14 +- .../scripts/build/Install-VisualStudio.ps1 | 13 +- .../windows/scripts/build/Invoke-Cleanup.ps1 | 21 + .../docs-gen/Generate-SoftwareReport.ps1 | 41 +- .../docs-gen/SoftwareReport.Databases.psm1 | 7 +- .../docs-gen/SoftwareReport.Tools.psm1 | 4 + .../windows/scripts/helpers/ImageHelpers.psm1 | 1 + .../scripts/helpers/InstallHelpers.ps1 | 16 + .../windows/scripts/tests/CLI.Tools.Tests.ps1 | 4 +- .../scripts/tests/ChocoPackages.Tests.ps1 | 8 +- .../windows/scripts/tests/Databases.Tests.ps1 | 10 +- images/windows/scripts/tests/Docker.Tests.ps1 | 2 +- .../windows/scripts/tests/Haskell.Tests.ps1 | 10 +- images/windows/scripts/tests/Rust.Tests.ps1 | 26 +- images/windows/scripts/tests/Tools.Tests.ps1 | 12 +- .../scripts/tests/VisualStudio.Tests.ps1 | 12 +- images/windows/scripts/tests/WDK.Tests.ps1 | 2 +- images/windows/templates/windows-2025.pkr.hcl | 461 ++++++++++++++++++ images/windows/toolsets/toolset-2025.json | 328 +++++++++++++ 25 files changed, 994 insertions(+), 81 deletions(-) create mode 100644 images/windows/templates/windows-2025.pkr.hcl create mode 100644 images/windows/toolsets/toolset-2025.json diff --git a/images/windows/scripts/build/Configure-ImageDataFile.ps1 b/images/windows/scripts/build/Configure-ImageDataFile.ps1 index 901ea2a0b30d..82bfa00b3b72 100644 --- a/images/windows/scripts/build/Configure-ImageDataFile.ps1 +++ b/images/windows/scripts/build/Configure-ImageDataFile.ps1 @@ -15,7 +15,11 @@ $imageMinorVersion = $imageVersionComponents[1] $imageDataFile = $env:IMAGEDATA_FILE $githubUrl = "https://github.com/actions/runner-images/blob" -if (Test-IsWin22) { +if (Test-IsWin25) { + $imageLabel = "windows-2025" + $softwareUrl = "${githubUrl}/win25/$imageMajorVersion.$imageMinorVersion/images/windows/Windows2025-Readme.md" + $releaseUrl = "https://github.com/actions/runner-images/releases/tag/win25%2F$imageMajorVersion.$imageMinorVersion" +} elseif (Test-IsWin22) { $imageLabel = "windows-2022" $softwareUrl = "${githubUrl}/win22/$imageMajorVersion.$imageMinorVersion/images/windows/Windows2022-Readme.md" $releaseUrl = "https://github.com/actions/runner-images/releases/tag/win22%2F$imageMajorVersion.$imageMinorVersion" diff --git a/images/windows/scripts/build/Configure-User.ps1 b/images/windows/scripts/build/Configure-User.ps1 index dd1437ff692a..2bb5c0e76c87 100644 --- a/images/windows/scripts/build/Configure-User.ps1 +++ b/images/windows/scripts/build/Configure-User.ps1 @@ -27,18 +27,26 @@ if ($LASTEXITCODE -ne 0) { throw "Failed to copy HKCU\Software\Microsoft\VisualStudio to HKLM\DEFAULT\Software\Microsoft\VisualStudio" } -# disable TSVNCache.exe -$registryKeyPath = 'HKCU:\Software\TortoiseSVN' -if (-not(Test-Path -Path $registryKeyPath)) { - New-Item -Path $registryKeyPath -ItemType Directory -Force +# TortoiseSVN not installed on Windows 2025 image due to Sysprep issues +if (-not (Test-IsWin25)) { + # disable TSVNCache.exe + $registryKeyPath = 'HKCU:\Software\TortoiseSVN' + if (-not(Test-Path -Path $registryKeyPath)) { + New-Item -Path $registryKeyPath -ItemType Directory -Force + } + + New-ItemProperty -Path $registryKeyPath -Name CacheType -PropertyType DWORD -Value 0 + reg.exe copy HKCU\Software\TortoiseSVN HKLM\DEFAULT\Software\TortoiseSVN /s + if ($LASTEXITCODE -ne 0) { + throw "Failed to copy HKCU\Software\TortoiseSVN to HKLM\DEFAULT\Software\TortoiseSVN" + } } +Dismount-RegistryHive "HKLM\DEFAULT" -New-ItemProperty -Path $registryKeyPath -Name CacheType -PropertyType DWORD -Value 0 -reg.exe copy HKCU\Software\TortoiseSVN HKLM\DEFAULT\Software\TortoiseSVN /s -if ($LASTEXITCODE -ne 0) { - throw "Failed to copy HKCU\Software\TortoiseSVN to HKLM\DEFAULT\Software\TortoiseSVN" +# Remove the "installer" (var.install_user) user profile for Windows 2025 image +if (Test-IsWin25) { + Get-CimInstance -ClassName Win32_UserProfile | where-object {$_.LocalPath -match $env:INSTALL_USER} | Remove-CimInstance -Confirm:$false + & net user $env:INSTALL_USER /DELETE } -Dismount-RegistryHive "HKLM\DEFAULT" - Write-Host "Configure-User.ps1 - completed" diff --git a/images/windows/scripts/build/Install-Docker.ps1 b/images/windows/scripts/build/Install-Docker.ps1 index 142a3f8006b0..f87e6069de0d 100644 --- a/images/windows/scripts/build/Install-Docker.ps1 +++ b/images/windows/scripts/build/Install-Docker.ps1 @@ -41,16 +41,18 @@ if ($LastExitCode -ne 0) { # https://github.com/Azure/azure-cli/issues/18766 New-Item -ItemType SymbolicLink -Path "C:\Windows\SysWOW64\docker.exe" -Target "C:\Windows\System32\docker.exe" -Write-Host "Download docker images" -$dockerImages = (Get-ToolsetContent).docker.images -foreach ($dockerImage in $dockerImages) { - Write-Host "Pulling docker image $dockerImage ..." - docker pull $dockerImage - - if (!$?) { - throw "Docker pull failed with a non-zero exit code ($LastExitCode)" +if (-not (Test-IsWin25)) { + Write-Host "Download docker images" + $dockerImages = (Get-ToolsetContent).docker.images + foreach ($dockerImage in $dockerImages) { + Write-Host "Pulling docker image $dockerImage ..." + docker pull $dockerImage + + if (!$?) { + throw "Docker pull failed with a non-zero exit code ($LastExitCode)" + } } + Invoke-PesterTests -TestFile "Docker" -TestName "DockerImages" } Invoke-PesterTests -TestFile "Docker" -TestName "Docker" -Invoke-PesterTests -TestFile "Docker" -TestName "DockerImages" diff --git a/images/windows/scripts/build/Install-Haskell.ps1 b/images/windows/scripts/build/Install-Haskell.ps1 index c354b40ba2ea..33a958d7b943 100644 --- a/images/windows/scripts/build/Install-Haskell.ps1 +++ b/images/windows/scripts/build/Install-Haskell.ps1 @@ -29,10 +29,15 @@ Add-MachinePathItem "$ghcupPrefix\ghcup\bin" Add-MachinePathItem "$cabalDir\bin" Update-Environment -# Get 3 latest versions of GHC +# Get 1 or 3 latest versions of GHC depending on the OS version +If (Test-IsWin25) { + $numberOfVersions = 1 +} else { + $numberOfVersions = 3 +} $versions = ghcup list -t ghc -r | Where-Object { $_ -notlike "prerelease" } $versionsOutput = [version[]]($versions | ForEach-Object { $_.Split(' ')[1]; }) -$latestMajorMinor = $versionsOutput | Group-Object { $_.ToString(2) } | Sort-Object { [Version] $_.Name } | Select-Object -last 3 +$latestMajorMinor = $versionsOutput | Group-Object { $_.ToString(2) } | Sort-Object { [Version] $_.Name } | Select-Object -last $numberOfVersions $versionsList = $latestMajorMinor | ForEach-Object { $_.Group | Select-Object -Last 1 } | Sort-Object # The latest version will be installed as a default diff --git a/images/windows/scripts/build/Install-Mingw64.ps1 b/images/windows/scripts/build/Install-Mingw64.ps1 index deb0831ff84c..0fc4430db2ea 100644 --- a/images/windows/scripts/build/Install-Mingw64.ps1 +++ b/images/windows/scripts/build/Install-Mingw64.ps1 @@ -27,13 +27,13 @@ if (Test-IsWin19) { $path = "C:\$_\bin\mingw32-make.exe" | Get-Item Copy-Item -Path $path -Destination (Join-Path $path.Directory 'make.exe') } - + Add-MachinePathItem "C:\mingw64\bin" } -if (Test-IsWin22) { - # If Windows 2022, install version specified in the toolset +if (-not (Test-IsWin19)) { + # If Windows 2022 0r 2025 install version specified in the toolset $version = (Get-ToolsetContent).mingw.version $runtime = (Get-ToolsetContent).mingw.runtime diff --git a/images/windows/scripts/build/Install-MongoDB.ps1 b/images/windows/scripts/build/Install-MongoDB.ps1 index d38b87df82cb..c3eeb235414e 100644 --- a/images/windows/scripts/build/Install-MongoDB.ps1 +++ b/images/windows/scripts/build/Install-MongoDB.ps1 @@ -39,4 +39,18 @@ $mongodbService.WaitForStatus('Running', '00:01:00') Stop-Service $mongodbService $mongodbService | Set-Service -StartupType Disabled +# Install mongodb shell for mongodb > 5 version +if (Test-IsWin25) { + $mongoshVersion = (Get-GithubReleasesByVersion -Repo "mongodb-js/mongosh" -Version "latest").version + + $mongoshDownloadUrl = Resolve-GithubReleaseAssetUrl ` + -Repo "mongodb-js/mongosh" ` + -Version $mongoshVersion ` + -UrlMatchPattern "mongosh-*-x64.msi" + + Install-Binary -Type MSI ` + -Url $mongoshDownloadUrl ` + -ExpectedSignature 'F2D7C28591847BB2CB2B1C2A0C59459FDC728A38' +} + Invoke-PesterTests -TestFile "Databases" -TestName "MongoDB" diff --git a/images/windows/scripts/build/Install-Rust.ps1 b/images/windows/scripts/build/Install-Rust.ps1 index 89b8a0271e57..7b16842bbe03 100644 --- a/images/windows/scripts/build/Install-Rust.ps1 +++ b/images/windows/scripts/build/Install-Rust.ps1 @@ -39,13 +39,13 @@ rustup component add rustfmt clippy if ($LASTEXITCODE -ne 0) { throw "Rust component installation failed with exit code $LASTEXITCODE" } - -cargo install bindgen-cli cbindgen cargo-audit cargo-outdated -if ($LASTEXITCODE -ne 0) { - throw "Rust tools installation failed with exit code $LASTEXITCODE" +if (-not (Test-IsWin25)) { + cargo install bindgen-cli cbindgen cargo-audit cargo-outdated + if ($LASTEXITCODE -ne 0) { + throw "Rust tools installation failed with exit code $LASTEXITCODE" + } + # Cleanup Cargo crates cache + Remove-Item "${env:CARGO_HOME}\registry\*" -Recurse -Force } -# Cleanup Cargo crates cache -Remove-Item "${env:CARGO_HOME}\registry\*" -Recurse -Force - Invoke-PesterTests -TestFile "Rust" diff --git a/images/windows/scripts/build/Install-VisualStudio.ps1 b/images/windows/scripts/build/Install-VisualStudio.ps1 index 559b6c705034..a4b66e7caa15 100644 --- a/images/windows/scripts/build/Install-VisualStudio.ps1 +++ b/images/windows/scripts/build/Install-VisualStudio.ps1 @@ -39,15 +39,18 @@ if (Test-IsWin19) { Install-Binary -Type EXE ` -Url 'https://go.microsoft.com/fwlink/p/?linkid=2196241' ` -InstallArgs @("/q", "/norestart", "/ceip off", "/features OptionId.UWPManaged OptionId.UWPCPP OptionId.UWPLocalized OptionId.DesktopCPPx86 OptionId.DesktopCPPx64 OptionId.DesktopCPParm64") ` - -ExpectedSignature 'E4C5C5FCDB68B930EE4E19BC25D431EF6D864C51' + -ExpectedSignature 'E4C5C5FCDB68B930EE4E19BC25D431EF6D864C51' } -if (Test-IsWin22) { +if (Test-IsWin22) { # Install Windows 10 SDK version 10.0.17763 Install-Binary -Type EXE ` - -Url 'https://go.microsoft.com/fwlink/p/?LinkID=2033908' ` - -InstallArgs @("/q", "/norestart", "/ceip off", "/features OptionId.UWPManaged OptionId.UWPCPP OptionId.UWPLocalized OptionId.DesktopCPPx86 OptionId.DesktopCPPx64 OptionId.DesktopCPParm64") ` - -ExpectedSignature '7535269B94C1FEA4A5EF6D808E371DA242F27936' + -Url 'https://go.microsoft.com/fwlink/p/?LinkID=2033908' ` + -InstallArgs @("/q", "/norestart", "/ceip off", "/features OptionId.UWPManaged OptionId.UWPCPP OptionId.UWPLocalized OptionId.DesktopCPPx86 OptionId.DesktopCPPx64 OptionId.DesktopCPParm64") ` + -ExpectedSignature '7535269B94C1FEA4A5EF6D808E371DA242F27936' +} + +if (-not (Test-IsWin19)) { # Install Windows 11 SDK version 10.0.26100 Install-Binary -Type EXE ` -Url 'https://go.microsoft.com/fwlink/?linkid=2286561' ` diff --git a/images/windows/scripts/build/Invoke-Cleanup.ps1 b/images/windows/scripts/build/Invoke-Cleanup.ps1 index 1e5091e253af..a0351fcca61a 100644 --- a/images/windows/scripts/build/Invoke-Cleanup.ps1 +++ b/images/windows/scripts/build/Invoke-Cleanup.ps1 @@ -49,3 +49,24 @@ cmd /c "npm cache clean --force 2>&1" | Out-Null if ($LASTEXITCODE -ne 0) { throw "Failed to clean npm cache" } + +if (Test-IsWin25) { + $directoriesToCompact = @( + 'C:\Windows\assembly', + 'C:\Windows\WinSxS' + ) + Write-Host "Starting Image slimming process" + $start = get-date + $ErrorActionPreviousValue = $ErrorActionPreference + $ErrorActionPreference = 'SilentlyContinue' + Write-Host "Removing 'C:\Windows\Installer' directory" + Remove-Item "$env:windir\Installer" -Recurse -Force | Out-Null + foreach ($directory in $directoriesToCompact) { + Write-Host "Compressing '$directory' directory" + & compact /s:"$directory" /c /a /i /EXE:LZX * | Out-Null + } + $ErrorActionPreference = $ErrorActionPreviousValue + $finish = get-date + $time = "$(($finish - $start).Minutes):$(($finish - $start).Seconds)" + Write-Host "The process took a total of $time (in minutes:seconds)" +} diff --git a/images/windows/scripts/docs-gen/Generate-SoftwareReport.ps1 b/images/windows/scripts/docs-gen/Generate-SoftwareReport.ps1 index 53f22b1ed1ad..7077a39f3af6 100644 --- a/images/windows/scripts/docs-gen/Generate-SoftwareReport.ps1 +++ b/images/windows/scripts/docs-gen/Generate-SoftwareReport.ps1 @@ -80,16 +80,22 @@ if (Test-IsWin19) { $tools.AddToolVersion("Google Cloud CLI", $(Get-GoogleCloudCLIVersion)) } $tools.AddToolVersion("ImageMagick", $(Get-ImageMagickVersion)) -$tools.AddToolVersion("InnoSetup", $(Get-InnoSetupVersion)) +if (-not (Test-IsWin25)) { + $tools.AddToolVersion("InnoSetup", $(Get-InnoSetupVersion)) +} $tools.AddToolVersion("jq", $(Get-JQVersion)) $tools.AddToolVersion("Kind", $(Get-KindVersion)) $tools.AddToolVersion("Kubectl", $(Get-KubectlVersion)) -$tools.AddToolVersion("Mercurial", $(Get-MercurialVersion)) +if (-not (Test-IsWin25)) { + $tools.AddToolVersion("Mercurial", $(Get-MercurialVersion)) +} $tools.AddToolVersion("gcc", $(Get-GCCVersion)) $tools.AddToolVersion("gdb", $(Get-GDBVersion)) $tools.AddToolVersion("GNU Binutils", $(Get-GNUBinutilsVersion)) $tools.AddToolVersion("Newman", $(Get-NewmanVersion)) -$tools.AddToolVersion("NSIS", $(Get-NSISVersion)) +if (-not (Test-IsWin25)) { + $tools.AddToolVersion("NSIS", $(Get-NSISVersion)) +} $tools.AddToolVersion("OpenSSL", $(Get-OpenSSLVersion)) $tools.AddToolVersion("Packer", $(Get-PackerVersion)) if (Test-IsWin19) { @@ -99,7 +105,9 @@ $tools.AddToolVersion("Pulumi", $(Get-PulumiVersion)) $tools.AddToolVersion("R", $(Get-RVersion)) $tools.AddToolVersion("Service Fabric SDK", $(Get-ServiceFabricSDKVersion)) $tools.AddToolVersion("Stack", $(Get-StackVersion)) -$tools.AddToolVersion("Subversion (SVN)", $(Get-SVNVersion)) +if (-not (Test-IsWin25)) { + $tools.AddToolVersion("Subversion (SVN)", $(Get-SVNVersion)) +} $tools.AddToolVersion("Swig", $(Get-SwigVersion)) $tools.AddToolVersion("VSWhere", $(Get-VSWhereVersion)) $tools.AddToolVersion("WinAppDriver", $(Get-WinAppDriver)) @@ -109,7 +117,9 @@ $tools.AddToolVersion("zstd", $(Get-ZstdVersion)) # CLI Tools $cliTools = $installedSoftware.AddHeader("CLI Tools") -$cliTools.AddToolVersion("Alibaba Cloud CLI", $(Get-AlibabaCLIVersion)) +if (-not (Test-IsWin25)) { + $cliTools.AddToolVersion("Alibaba Cloud CLI", $(Get-AlibabaCLIVersion)) +} $cliTools.AddToolVersion("AWS CLI", $(Get-AWSCLIVersion)) $cliTools.AddToolVersion("AWS SAM CLI", $(Get-AWSSAMVersion)) $cliTools.AddToolVersion("AWS Session Manager CLI", $(Get-AWSSessionManagerVersion)) @@ -129,10 +139,12 @@ $rustTools.AddToolVersion("Rustdoc", $(Get-RustdocVersion)) $rustTools.AddToolVersion("Rustup", $(Get-RustupVersion)) $rustToolsPackages = $rustTools.AddHeader("Packages") -$rustToolsPackages.AddToolVersion("bindgen", $(Get-BindgenVersion)) -$rustToolsPackages.AddToolVersion("cargo-audit", $(Get-CargoAuditVersion)) -$rustToolsPackages.AddToolVersion("cargo-outdated", $(Get-CargoOutdatedVersion)) -$rustToolsPackages.AddToolVersion("cbindgen", $(Get-CbindgenVersion)) +if (-not (Test-IsWin25)) { + $rustToolsPackages.AddToolVersion("bindgen", $(Get-BindgenVersion)) + $rustToolsPackages.AddToolVersion("cargo-audit", $(Get-CargoAuditVersion)) + $rustToolsPackages.AddToolVersion("cargo-outdated", $(Get-CargoOutdatedVersion)) + $rustToolsPackages.AddToolVersion("cbindgen", $(Get-CbindgenVersion)) +} $rustToolsPackages.AddToolVersion("Clippy", $(Get-RustClippyVersion)) $rustToolsPackages.AddToolVersion("Rustfmt", $(Get-RustfmtVersion)) @@ -179,6 +191,9 @@ $databaseTools.AddToolVersion("DacFx", $(Get-DacFxVersion)) $databaseTools.AddToolVersion("MySQL", $(Get-MySQLVersion)) $databaseTools.AddToolVersion("SQL OLEDB Driver", $(Get-SQLOLEDBDriverVersion)) $databaseTools.AddToolVersion("SQLPS", $(Get-SQLPSVersion)) +if (Test-IsWin25) { + $databaseTools.AddToolVersion("MongoDB Shell (mongosh)", $(Get-MongoshVersion)) +} # Web Servers $installedSoftware.AddHeader("Web Servers").AddTable($(Build-WebServersSection)) @@ -222,7 +237,9 @@ 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. '@ -$psModules.AddNote($azPsNotes) +if (-not (Test-IsWin25)) { + $psModules.AddNote($azPsNotes) +} # Android $android = $installedSoftware.AddHeader("Android") @@ -231,7 +248,9 @@ $android.AddTable($(Build-AndroidTable)) $android.AddHeader("Environment variables").AddTable($(Build-AndroidEnvironmentTable)) # Cached Docker images -$installedSoftware.AddHeader("Cached Docker images").AddTable($(Get-CachedDockerImagesTableData)) +if (-not (Test-IsWin25)) { + $installedSoftware.AddHeader("Cached Docker images").AddTable($(Get-CachedDockerImagesTableData)) +} # Generate reports $softwareReport.ToJson() | Out-File -FilePath "C:\software-report.json" -Encoding UTF8NoBOM diff --git a/images/windows/scripts/docs-gen/SoftwareReport.Databases.psm1 b/images/windows/scripts/docs-gen/SoftwareReport.Databases.psm1 index 9cb6114bef6b..a831c92be44e 100644 --- a/images/windows/scripts/docs-gen/SoftwareReport.Databases.psm1 +++ b/images/windows/scripts/docs-gen/SoftwareReport.Databases.psm1 @@ -21,8 +21,13 @@ function Get-PostgreSQLTable function Get-MongoDBTable { $name = "MongoDB" + if (Test-IsWin25) { + $command = "mongod" + } else { + $command = "mongo" + } $mongoService = Get-Service -Name $name - $mongoVersion = (Get-Command -Name 'mongo').Version.ToString() + $mongoVersion = (Get-Command -Name $command).Version.ToString() return [PSCustomObject]@{ Version = $mongoVersion ServiceName = $name diff --git a/images/windows/scripts/docs-gen/SoftwareReport.Tools.psm1 b/images/windows/scripts/docs-gen/SoftwareReport.Tools.psm1 index 0aa224facf42..bd83432c0c89 100644 --- a/images/windows/scripts/docs-gen/SoftwareReport.Tools.psm1 +++ b/images/windows/scripts/docs-gen/SoftwareReport.Tools.psm1 @@ -314,3 +314,7 @@ function Get-ImageMagickVersion { $magickVersion = $Matches.Version return $magickVersion } + +function Get-MongoshVersion { + return $(mongosh --version) +} diff --git a/images/windows/scripts/helpers/ImageHelpers.psm1 b/images/windows/scripts/helpers/ImageHelpers.psm1 index 5af1843e8951..f7af288b25a0 100644 --- a/images/windows/scripts/helpers/ImageHelpers.psm1 +++ b/images/windows/scripts/helpers/ImageHelpers.psm1 @@ -22,6 +22,7 @@ Export-ModuleMember -Function @( 'Get-ToolsetContent' 'Get-TCToolPath' 'Get-TCToolVersionPath' + 'Test-IsWin25' 'Test-IsWin22' 'Test-IsWin19' 'Expand-7ZipArchive' diff --git a/images/windows/scripts/helpers/InstallHelpers.ps1 b/images/windows/scripts/helpers/InstallHelpers.ps1 index b491533e444f..7da7bec0f6dc 100644 --- a/images/windows/scripts/helpers/InstallHelpers.ps1 +++ b/images/windows/scripts/helpers/InstallHelpers.ps1 @@ -307,6 +307,22 @@ function Get-TCToolVersionPath { return Join-Path $foundVersion $Arch } +function Test-IsWin25 { + <# + .SYNOPSIS + Checks if the current Windows operating system is Windows Server 2025. + .DESCRIPTION + This function uses the Get-CimInstance cmdlet to retrieve information + about the current Windows operating system. It then checks if the Caption + property of the Win32_OperatingSystem class contains the string "2025", + indicating that the operating system is Windows Server 2025. + .OUTPUTS + Returns $true if the current Windows operating system is Windows Server 2025. + Otherwise, returns $false. + #> + (Get-CimInstance -ClassName Win32_OperatingSystem).Caption -match "2025" +} + function Test-IsWin22 { <# .SYNOPSIS diff --git a/images/windows/scripts/tests/CLI.Tools.Tests.ps1 b/images/windows/scripts/tests/CLI.Tools.Tests.ps1 index 51e45b429c9e..1122c010713e 100644 --- a/images/windows/scripts/tests/CLI.Tools.Tests.ps1 +++ b/images/windows/scripts/tests/CLI.Tools.Tests.ps1 @@ -11,7 +11,7 @@ Describe "Azure DevOps CLI" { } } -Describe "Aliyun CLI" { +Describe "Aliyun CLI" -Skip:(Test-IsWin25) { It "Aliyun CLI" { "aliyun version" | Should -ReturnZeroExitCode } @@ -39,7 +39,7 @@ Describe "GitHub CLI" { } } -Describe "CloudFoundry CLI" -Skip:(Test-IsWin22) { +Describe "CloudFoundry CLI" -Skip:(-not (Test-IsWin19)) { It "cf is located in C:\cf-cli" { "C:\cf-cli\cf.exe" | Should -Exist } diff --git a/images/windows/scripts/tests/ChocoPackages.Tests.ps1 b/images/windows/scripts/tests/ChocoPackages.Tests.ps1 index d0edb67bce40..fa086c37ad6c 100644 --- a/images/windows/scripts/tests/ChocoPackages.Tests.ps1 +++ b/images/windows/scripts/tests/ChocoPackages.Tests.ps1 @@ -22,13 +22,13 @@ Describe "Bicep" { } } -Describe "GitVersion" -Skip:(Test-IsWin22) { +Describe "GitVersion" -Skip:(-not (Test-IsWin19)) { It "gitversion is installed" { "gitversion /version" | Should -ReturnZeroExitCode } } -Describe "InnoSetup" { +Describe "InnoSetup" -Skip:(Test-IsWin25) { It "InnoSetup" { (Get-Command -Name iscc).CommandType | Should -BeExactly "Application" } @@ -64,7 +64,7 @@ Describe "Pulumi" { } } -Describe "Svn" { +Describe "Svn" -Skip:(Test-IsWin25) { It "svn" { "svn --version --quiet" | Should -ReturnZeroExitCode } @@ -102,4 +102,4 @@ Describe "ImageMagick" { It "ImageMagick" { "magick -version" | Should -ReturnZeroExitCode } -} \ No newline at end of file +} diff --git a/images/windows/scripts/tests/Databases.Tests.ps1 b/images/windows/scripts/tests/Databases.Tests.ps1 index 0a89129d392d..08e73befd4a1 100644 --- a/images/windows/scripts/tests/Databases.Tests.ps1 +++ b/images/windows/scripts/tests/Databases.Tests.ps1 @@ -1,7 +1,11 @@ Describe "MongoDB" { Context "Version" { It "<ToolName>" -TestCases @( - @{ ToolName = "mongo" } + if (Test-IsWin25) { + @{ ToolName = "mongos" } + } else { + @{ ToolName = "mongo" } + } @{ ToolName = "mongod" } ) { $toolsetVersion = (Get-ToolsetContent).mongodb.version @@ -25,6 +29,10 @@ Describe "MongoDB" { $StartType | Should -Be "Disabled" } } + + Context "Shell" -Skip:(-not (Test-IsWin19) -or -not (Test-IsWin22)) { + "mongosh --version" | Should -Not -BeNullOrEmpty + } } Describe "PostgreSQL" { diff --git a/images/windows/scripts/tests/Docker.Tests.ps1 b/images/windows/scripts/tests/Docker.Tests.ps1 index d2565f15f908..b994430e3f5b 100644 --- a/images/windows/scripts/tests/Docker.Tests.ps1 +++ b/images/windows/scripts/tests/Docker.Tests.ps1 @@ -25,7 +25,7 @@ Describe "DockerWinCred" { } } -Describe "DockerImages" { +Describe "DockerImages" -Skip:(Test-IsWin25) { Context "docker images" { $testCases = (Get-ToolsetContent).docker.images | ForEach-Object { @{ ImageName = $_ } } diff --git a/images/windows/scripts/tests/Haskell.Tests.ps1 b/images/windows/scripts/tests/Haskell.Tests.ps1 index 513b71ee53d8..866ef5dca62b 100644 --- a/images/windows/scripts/tests/Haskell.Tests.ps1 +++ b/images/windows/scripts/tests/Haskell.Tests.ps1 @@ -24,12 +24,18 @@ Describe "Haskell" { @{envVar = "GHCUP_MSYS2"} ) + If (Test-IsWin25) { + $numberOfVersions = 1 + } else { + $numberOfVersions = 3 + } + It "<envVar> environment variable exists" -TestCases $ghcupEnvExists { Test-Path env:\$envVar } - It "Accurate 3 versions of GHC are installed" -TestCases @{ghcCount = $ghcCount} { - $ghcCount | Should -BeExactly 3 + It "Accurate $numberOfVersions versions of GHC are installed" -TestCases @{ghcCount = $ghcCount; numberOfVersions = $numberOfVersions} { + $ghcCount | Should -BeExactly $numberOfVersions } It "GHC <ghcVersion> is installed" -TestCases $ghcTestCases { diff --git a/images/windows/scripts/tests/Rust.Tests.ps1 b/images/windows/scripts/tests/Rust.Tests.ps1 index 1814396fd85a..717e80e428c7 100644 --- a/images/windows/scripts/tests/Rust.Tests.ps1 +++ b/images/windows/scripts/tests/Rust.Tests.ps1 @@ -5,15 +5,23 @@ Describe "Rust" { $env:Path += ";$env:CARGO_HOME\bin" } - $rustTools = @( - @{ToolName = "rustup"; binPath = "C:\Users\Default\.cargo\bin\rustup.exe"} - @{ToolName = "rustc"; binPath = "C:\Users\Default\.cargo\bin\rustc.exe"} - @{ToolName = "bindgen.exe"; binPath = "C:\Users\Default\.cargo\bin\bindgen.exe"} - @{ToolName = "cbindgen.exe"; binPath = "C:\Users\Default\.cargo\bin\cbindgen.exe"} - @{ToolName = "cargo"; binPath = "C:\Users\Default\.cargo\bin\cargo.exe"} - @{ToolName = "cargo audit"; binPath = "C:\Users\Default\.cargo\bin\cargo-audit.exe"} - @{ToolName = "cargo outdated"; binPath = "C:\Users\Default\.cargo\bin\cargo-outdated.exe"} - ) + if (Test-IsWin25) { + $rustTools = @( + @{ToolName = "rustup"; binPath = "C:\Users\Default\.cargo\bin\rustup.exe"} + @{ToolName = "rustc"; binPath = "C:\Users\Default\.cargo\bin\rustc.exe"} + @{ToolName = "cargo"; binPath = "C:\Users\Default\.cargo\bin\cargo.exe"} + ) + } else { + $rustTools = @( + @{ToolName = "rustup"; binPath = "C:\Users\Default\.cargo\bin\rustup.exe"} + @{ToolName = "rustc"; binPath = "C:\Users\Default\.cargo\bin\rustc.exe"} + @{ToolName = "bindgen.exe"; binPath = "C:\Users\Default\.cargo\bin\bindgen.exe"} + @{ToolName = "cbindgen.exe"; binPath = "C:\Users\Default\.cargo\bin\cbindgen.exe"} + @{ToolName = "cargo"; binPath = "C:\Users\Default\.cargo\bin\cargo.exe"} + @{ToolName = "cargo audit"; binPath = "C:\Users\Default\.cargo\bin\cargo-audit.exe"} + @{ToolName = "cargo outdated"; binPath = "C:\Users\Default\.cargo\bin\cargo-outdated.exe"} + ) + } $rustEnvNotExists = @( @{envVar = "RUSTUP_HOME"} diff --git a/images/windows/scripts/tests/Tools.Tests.ps1 b/images/windows/scripts/tests/Tools.Tests.ps1 index c20c95b8da3a..2a0ef69bee71 100644 --- a/images/windows/scripts/tests/Tools.Tests.ps1 +++ b/images/windows/scripts/tests/Tools.Tests.ps1 @@ -55,19 +55,19 @@ Describe "DACFx" { "${sqlPackagePath}" | Should -Exist } - It "SqlLocalDB" -Skip:(Test-IsWin22) { + It "SqlLocalDB" -Skip:(-not (Test-IsWin19)) { $sqlLocalDBPath = 'C:\Program Files\Microsoft SQL Server\130\Tools\Binn\SqlLocalDB.exe' "${sqlLocalDBPath}" | Should -Exist } } -Describe "DotnetTLS" -Skip:(Test-IsWin22) { +Describe "DotnetTLS" -Skip:(-not (Test-IsWin19)) { It "Tls 1.2 is enabled" { [Net.ServicePointManager]::SecurityProtocol -band "Tls12" | Should -Be Tls12 } } -Describe "Mercurial" { +Describe "Mercurial" -Skip:(Test-IsWin25) { It "Mercurial" { "hg --version" | Should -ReturnZeroExitCode } @@ -101,7 +101,7 @@ Describe "Mingw64" { } } -Describe "GoogleCloudCLI" -Skip:(Test-IsWin22) { +Describe "GoogleCloudCLI" -Skip:(-not (Test-IsWin19)) { It "<ToolName>" -TestCases @( @{ ToolName = "bq" } @{ ToolName = "gcloud" } @@ -117,7 +117,7 @@ Describe "NET48" { } } -Describe "NSIS" { +Describe "NSIS" -Skip:(Test-IsWin25) { It "NSIS" { "makensis /VERSION" | Should -ReturnZeroExitCode } @@ -175,7 +175,7 @@ Describe "Vcpkg" { } } -Describe "VCRedist" -Skip:(Test-IsWin22) { +Describe "VCRedist" -Skip:(-not (Test-IsWin19)) { It "vcredist_2010_x64" { "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{1D8E6291-B0D5-35EC-8441-6616F567A0F7}" | Should -Exist "C:\Windows\System32\msvcr100.dll" | Should -Exist diff --git a/images/windows/scripts/tests/VisualStudio.Tests.ps1 b/images/windows/scripts/tests/VisualStudio.Tests.ps1 index b8972931126e..13a44f87b9f0 100644 --- a/images/windows/scripts/tests/VisualStudio.Tests.ps1 +++ b/images/windows/scripts/tests/VisualStudio.Tests.ps1 @@ -25,20 +25,20 @@ Describe "Visual Studio" { } } -Describe "Windows 10 SDK" { - It "Verifies 17763 SDK is installed" -Skip:(Test-IsWin19) { +Describe "Windows 10 SDK" -Skip:((Test-IsWin19) -or (Test-IsWin25)) { + It "Verifies 17763 SDK is installed" { "${env:ProgramFiles(x86)}\Windows Kits\10\DesignTime\CommonConfiguration\Neutral\UAP\10.0.17763.0\UAP.props" | Should -Exist } } -Describe "Windows 11 SDK" { - It "Verifies 22621 SDK is installed" -Skip:(Test-IsWin22) { +Describe "Windows 11 SDK" -Skip:(-not (Test-IsWin19)) { + It "Verifies 22621 SDK is installed" { "${env:ProgramFiles(x86)}\Windows Kits\10\DesignTime\CommonConfiguration\Neutral\UAP\10.0.22621.0\UAP.props" | Should -Exist } } -Describe "Windows 11 SDK" { - It "Verifies 26100 SDK is installed" -Skip:(Test-IsWin19) { +Describe "Windows 11 SDK" -Skip:(Test-IsWin19) { + It "Verifies 26100 SDK is installed" { "${env:ProgramFiles(x86)}\Windows Kits\10\DesignTime\CommonConfiguration\Neutral\UAP\10.0.26100.0\UAP.props" | Should -Exist } } diff --git a/images/windows/scripts/tests/WDK.Tests.ps1 b/images/windows/scripts/tests/WDK.Tests.ps1 index 6a5e61ddc666..139670dace6d 100644 --- a/images/windows/scripts/tests/WDK.Tests.ps1 +++ b/images/windows/scripts/tests/WDK.Tests.ps1 @@ -1,4 +1,4 @@ -Describe "WDK" { +Describe "WDK" -Skip:(Test-IsWin25) { It "WDK exists" { $regKey = "HKLM:\Software\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall\*" $installedApplications = Get-ItemProperty -Path $regKey diff --git a/images/windows/templates/windows-2025.pkr.hcl b/images/windows/templates/windows-2025.pkr.hcl new file mode 100644 index 000000000000..8c9d73554d34 --- /dev/null +++ b/images/windows/templates/windows-2025.pkr.hcl @@ -0,0 +1,461 @@ +packer { + required_plugins { + azure = { + source = "github.com/hashicorp/azure" + version = "1.4.5" + } + } +} + +locals { + managed_image_name = var.managed_image_name != "" ? var.managed_image_name : "packer-${var.image_os}-${var.image_version}" +} + +variable "agent_tools_directory" { + type = string + default = "C:\\hostedtoolcache\\windows" +} + +variable "allowed_inbound_ip_addresses" { + type = list(string) + default = [] +} + +variable "azure_tags" { + type = map(string) + default = {} +} + +variable "build_resource_group_name" { + type = string + default = "${env("BUILD_RESOURCE_GROUP_NAME")}" +} + +variable "client_cert_path" { + type = string + default = "${env("ARM_CLIENT_CERT_PATH")}" +} + +variable "client_id" { + type = string + default = "${env("ARM_CLIENT_ID")}" +} + +variable "client_secret" { + type = string + default = "${env("ARM_CLIENT_SECRET")}" + sensitive = true +} + +variable "helper_script_folder" { + type = string + default = "C:\\Program Files\\WindowsPowerShell\\Modules\\" +} + +variable "image_folder" { + type = string + default = "C:\\image" +} + +variable "image_os" { + type = string + default = "win22" +} + +variable "image_version" { + type = string + default = "dev" +} + +variable "imagedata_file" { + type = string + default = "C:\\imagedata.json" +} + +variable "temp_dir" { + type = string + default = "D:\\temp" +} + +variable "install_password" { + type = string + default = "" + sensitive = true +} + +variable "install_user" { + type = string + default = "installer" +} + +variable "location" { + type = string + default = "${env("ARM_RESOURCE_LOCATION")}" +} + +variable "managed_image_name" { + type = string + default = "" +} + +variable "managed_image_resource_group_name" { + type = string + default = "${env("ARM_RESOURCE_GROUP")}" +} + +variable "managed_image_storage_account_type" { + type = string + default = "Premium_LRS" +} + +variable "object_id" { + type = string + default = "${env("ARM_OBJECT_ID")}" +} + +variable "private_virtual_network_with_public_ip" { + type = bool + default = false +} + +variable "subscription_id" { + type = string + default = "${env("ARM_SUBSCRIPTION_ID")}" +} + +variable "temp_resource_group_name" { + type = string + default = "${env("TEMP_RESOURCE_GROUP_NAME")}" +} + +variable "tenant_id" { + type = string + default = "${env("ARM_TENANT_ID")}" +} + +variable "virtual_network_name" { + type = string + default = "${env("VNET_NAME")}" +} + +variable "virtual_network_resource_group_name" { + type = string + default = "${env("VNET_RESOURCE_GROUP")}" +} + +variable "virtual_network_subnet_name" { + type = string + default = "${env("VNET_SUBNET")}" +} + +variable "vm_size" { + type = string + default = "Standard_F8s_v2" +} + +source "azure-arm" "image" { + allowed_inbound_ip_addresses = "${var.allowed_inbound_ip_addresses}" + build_resource_group_name = "${var.build_resource_group_name}" + client_cert_path = "${var.client_cert_path}" + client_id = "${var.client_id}" + client_secret = "${var.client_secret}" + communicator = "winrm" + image_offer = "WindowsServer" + image_publisher = "MicrosoftWindowsServer" + image_sku = "2025-Datacenter" + location = "${var.location}" + managed_image_name = "${local.managed_image_name}" + managed_image_resource_group_name = "${var.managed_image_resource_group_name}" + managed_image_storage_account_type = "${var.managed_image_storage_account_type}" + object_id = "${var.object_id}" + os_disk_size_gb = "150" + os_type = "Windows" + private_virtual_network_with_public_ip = "${var.private_virtual_network_with_public_ip}" + subscription_id = "${var.subscription_id}" + temp_resource_group_name = "${var.temp_resource_group_name}" + tenant_id = "${var.tenant_id}" + virtual_network_name = "${var.virtual_network_name}" + virtual_network_resource_group_name = "${var.virtual_network_resource_group_name}" + virtual_network_subnet_name = "${var.virtual_network_subnet_name}" + vm_size = "${var.vm_size}" + winrm_insecure = "true" + winrm_use_ssl = "true" + winrm_username = "packer" + + dynamic "azure_tag" { + for_each = var.azure_tags + content { + name = azure_tag.key + value = azure_tag.value + } + } +} + +build { + sources = ["source.azure-arm.image"] + + provisioner "powershell" { + inline = [ + "New-Item -Path ${var.image_folder} -ItemType Directory -Force", + "New-Item -Path ${var.temp_dir} -ItemType Directory -Force" + ] + } + + provisioner "file" { + destination = "${var.image_folder}\\" + sources = [ + "${path.root}/../assets", + "${path.root}/../scripts", + "${path.root}/../toolsets" + ] + } + + provisioner "file" { + destination = "${var.image_folder}\\scripts\\docs-gen\\" + source = "${path.root}/../../../helpers/software-report-base" + } + + provisioner "powershell" { + inline = [ + "Move-Item '${var.image_folder}\\assets\\post-gen' 'C:\\post-generation'", + "Remove-Item -Recurse '${var.image_folder}\\assets'", + "Move-Item '${var.image_folder}\\scripts\\docs-gen' '${var.image_folder}\\SoftwareReport'", + "Move-Item '${var.image_folder}\\scripts\\helpers' '${var.helper_script_folder}\\ImageHelpers'", + "New-Item -Type Directory -Path '${var.helper_script_folder}\\TestsHelpers\\'", + "Move-Item '${var.image_folder}\\scripts\\tests\\Helpers.psm1' '${var.helper_script_folder}\\TestsHelpers\\TestsHelpers.psm1'", + "Move-Item '${var.image_folder}\\scripts\\tests' '${var.image_folder}\\tests'", + "Remove-Item -Recurse '${var.image_folder}\\scripts'", + "Move-Item '${var.image_folder}\\toolsets\\toolset-2025.json' '${var.image_folder}\\toolset.json'", + "Remove-Item -Recurse '${var.image_folder}\\toolsets'" + ] + } + + provisioner "windows-shell" { + inline = [ + "net user ${var.install_user} ${var.install_password} /add /passwordchg:no /passwordreq:yes /active:yes /Y", + "net localgroup Administrators ${var.install_user} /add", + "winrm set winrm/config/service/auth @{Basic=\"true\"}", + "winrm get winrm/config/service/auth" + ] + } + + provisioner "powershell" { + inline = ["if (-not ((net localgroup Administrators) -contains '${var.install_user}')) { exit 1 }"] + } + + provisioner "powershell" { + elevated_password = "${var.install_password}" + elevated_user = "${var.install_user}" + inline = ["bcdedit.exe /set TESTSIGNING ON"] + } + + provisioner "powershell" { + environment_vars = ["IMAGE_VERSION=${var.image_version}", "IMAGE_OS=${var.image_os}", "AGENT_TOOLSDIRECTORY=${var.agent_tools_directory}", "IMAGEDATA_FILE=${var.imagedata_file}", "IMAGE_FOLDER=${var.image_folder}", "TEMP_DIR=${var.temp_dir}"] + execution_policy = "unrestricted" + scripts = [ + "${path.root}/../scripts/build/Configure-WindowsDefender.ps1", + "${path.root}/../scripts/build/Configure-PowerShell.ps1", + "${path.root}/../scripts/build/Install-PowerShellModules.ps1", + "${path.root}/../scripts/build/Install-WindowsFeatures.ps1", + "${path.root}/../scripts/build/Install-Chocolatey.ps1", + "${path.root}/../scripts/build/Configure-BaseImage.ps1", + "${path.root}/../scripts/build/Configure-ImageDataFile.ps1", + "${path.root}/../scripts/build/Configure-SystemEnvironment.ps1", + "${path.root}/../scripts/build/Configure-DotnetSecureChannel.ps1" + ] + } + + provisioner "windows-restart" { + check_registry = true + restart_check_command = "powershell -command \"& {while ( (Get-WindowsOptionalFeature -Online -FeatureName Containers -ErrorAction SilentlyContinue).State -ne 'Enabled' ) { Start-Sleep 30; Write-Output 'InProgress' }}\"" + restart_timeout = "10m" + } + + provisioner "powershell" { + inline = ["Set-Service -Name wlansvc -StartupType Manual", "if ($(Get-Service -Name wlansvc).Status -eq 'Running') { Stop-Service -Name wlansvc}"] + } + + provisioner "powershell" { + environment_vars = ["IMAGE_FOLDER=${var.image_folder}", "TEMP_DIR=${var.temp_dir}"] + scripts = [ + "${path.root}/../scripts/build/Install-Docker.ps1", + "${path.root}/../scripts/build/Install-DockerWinCred.ps1", + "${path.root}/../scripts/build/Install-DockerCompose.ps1", + "${path.root}/../scripts/build/Install-PowershellCore.ps1", + "${path.root}/../scripts/build/Install-WebPlatformInstaller.ps1", + "${path.root}/../scripts/build/Install-Runner.ps1" + ] + } + + provisioner "windows-restart" { + restart_timeout = "30m" + } + + provisioner "powershell" { + elevated_password = "${var.install_password}" + elevated_user = "${var.install_user}" + environment_vars = ["IMAGE_FOLDER=${var.image_folder}", "TEMP_DIR=${var.temp_dir}"] + scripts = [ + "${path.root}/../scripts/build/Install-VisualStudio.ps1", + "${path.root}/../scripts/build/Install-KubernetesTools.ps1" + ] + valid_exit_codes = [0, 3010] + } + + provisioner "windows-restart" { + check_registry = true + restart_timeout = "10m" + } + + provisioner "powershell" { + pause_before = "2m0s" + environment_vars = ["IMAGE_FOLDER=${var.image_folder}", "TEMP_DIR=${var.temp_dir}"] + scripts = [ + "${path.root}/../scripts/build/Install-Wix.ps1", + "${path.root}/../scripts/build/Install-VSExtensions.ps1", + "${path.root}/../scripts/build/Install-AzureCli.ps1", + "${path.root}/../scripts/build/Install-AzureDevOpsCli.ps1", + "${path.root}/../scripts/build/Install-ChocolateyPackages.ps1", + "${path.root}/../scripts/build/Install-JavaTools.ps1", + "${path.root}/../scripts/build/Install-Kotlin.ps1", + "${path.root}/../scripts/build/Install-OpenSSL.ps1" + ] + } + + provisioner "powershell" { + execution_policy = "remotesigned" + environment_vars = ["IMAGE_FOLDER=${var.image_folder}", "TEMP_DIR=${var.temp_dir}"] + scripts = ["${path.root}/../scripts/build/Install-ServiceFabricSDK.ps1"] + } + + provisioner "windows-restart" { + restart_timeout = "10m" + } + + provisioner "powershell" { + environment_vars = ["IMAGE_FOLDER=${var.image_folder}", "TEMP_DIR=${var.temp_dir}"] + scripts = [ + "${path.root}/../scripts/build/Install-ActionsCache.ps1", + "${path.root}/../scripts/build/Install-Ruby.ps1", + "${path.root}/../scripts/build/Install-PyPy.ps1", + "${path.root}/../scripts/build/Install-Toolset.ps1", + "${path.root}/../scripts/build/Configure-Toolset.ps1", + "${path.root}/../scripts/build/Install-NodeJS.ps1", + "${path.root}/../scripts/build/Install-AndroidSDK.ps1", + "${path.root}/../scripts/build/Install-PowershellAzModules.ps1", + "${path.root}/../scripts/build/Install-Pipx.ps1", + "${path.root}/../scripts/build/Install-Git.ps1", + "${path.root}/../scripts/build/Install-GitHub-CLI.ps1", + "${path.root}/../scripts/build/Install-PHP.ps1", + "${path.root}/../scripts/build/Install-Rust.ps1", + "${path.root}/../scripts/build/Install-Sbt.ps1", + "${path.root}/../scripts/build/Install-Chrome.ps1", + "${path.root}/../scripts/build/Install-EdgeDriver.ps1", + "${path.root}/../scripts/build/Install-Firefox.ps1", + "${path.root}/../scripts/build/Install-Selenium.ps1", + "${path.root}/../scripts/build/Install-IEWebDriver.ps1", + "${path.root}/../scripts/build/Install-Apache.ps1", + "${path.root}/../scripts/build/Install-Nginx.ps1", + "${path.root}/../scripts/build/Install-Msys2.ps1", + "${path.root}/../scripts/build/Install-WinAppDriver.ps1", + "${path.root}/../scripts/build/Install-R.ps1", + "${path.root}/../scripts/build/Install-AWSTools.ps1", + "${path.root}/../scripts/build/Install-DACFx.ps1", + "${path.root}/../scripts/build/Install-MysqlCli.ps1", + "${path.root}/../scripts/build/Install-SQLPowerShellTools.ps1", + "${path.root}/../scripts/build/Install-SQLOLEDBDriver.ps1", + "${path.root}/../scripts/build/Install-DotnetSDK.ps1", + "${path.root}/../scripts/build/Install-Mingw64.ps1", + "${path.root}/../scripts/build/Install-Haskell.ps1", + "${path.root}/../scripts/build/Install-Stack.ps1", + "${path.root}/../scripts/build/Install-Miniconda.ps1", + "${path.root}/../scripts/build/Install-AzureCosmosDbEmulator.ps1", + "${path.root}/../scripts/build/Install-Zstd.ps1", + "${path.root}/../scripts/build/Install-Vcpkg.ps1", + "${path.root}/../scripts/build/Install-Bazel.ps1", + "${path.root}/../scripts/build/Install-RootCA.ps1", + "${path.root}/../scripts/build/Install-MongoDB.ps1", + "${path.root}/../scripts/build/Install-CodeQLBundle.ps1", + "${path.root}/../scripts/build/Configure-Diagnostics.ps1" + ] + } + + provisioner "powershell" { + elevated_password = "${var.install_password}" + elevated_user = "${var.install_user}" + environment_vars = ["IMAGE_FOLDER=${var.image_folder}", "TEMP_DIR=${var.temp_dir}"] + scripts = [ + "${path.root}/../scripts/build/Install-PostgreSQL.ps1", + "${path.root}/../scripts/build/Install-WindowsUpdates.ps1", + "${path.root}/../scripts/build/Configure-DynamicPort.ps1", + "${path.root}/../scripts/build/Configure-GDIProcessHandleQuota.ps1", + "${path.root}/../scripts/build/Configure-Shell.ps1", + "${path.root}/../scripts/build/Configure-DeveloperMode.ps1", + "${path.root}/../scripts/build/Install-LLVM.ps1" + ] + } + + provisioner "windows-restart" { + check_registry = true + restart_check_command = "powershell -command \"& {if ((-not (Get-Process TiWorker.exe -ErrorAction SilentlyContinue)) -and (-not [System.Environment]::HasShutdownStarted) ) { Write-Output 'Restart complete' }}\"" + restart_timeout = "30m" + } + + provisioner "powershell" { + pause_before = "2m0s" + environment_vars = ["IMAGE_FOLDER=${var.image_folder}", "TEMP_DIR=${var.temp_dir}"] + scripts = [ + "${path.root}/../scripts/build/Install-WindowsUpdatesAfterReboot.ps1", + "${path.root}/../scripts/build/Invoke-Cleanup.ps1", + "${path.root}/../scripts/tests/RunAll-Tests.ps1" + ] + } + + provisioner "powershell" { + inline = ["if (-not (Test-Path ${var.image_folder}\\tests\\testResults.xml)) { throw '${var.image_folder}\\tests\\testResults.xml not found' }"] + } + + provisioner "powershell" { + environment_vars = ["IMAGE_VERSION=${var.image_version}", "IMAGE_FOLDER=${var.image_folder}"] + inline = ["pwsh -File '${var.image_folder}\\SoftwareReport\\Generate-SoftwareReport.ps1'"] + } + + provisioner "powershell" { + inline = ["if (-not (Test-Path C:\\software-report.md)) { throw 'C:\\software-report.md not found' }", "if (-not (Test-Path C:\\software-report.json)) { throw 'C:\\software-report.json not found' }"] + } + + provisioner "file" { + destination = "${path.root}/../Windows2025-Readme.md" + direction = "download" + source = "C:\\software-report.md" + } + + provisioner "file" { + destination = "${path.root}/../software-report.json" + direction = "download" + source = "C:\\software-report.json" + } + + provisioner "powershell" { + environment_vars = ["INSTALL_USER=${var.install_user}"] + scripts = [ + "${path.root}/../scripts/build/Install-NativeImages.ps1", + "${path.root}/../scripts/build/Configure-System.ps1", + "${path.root}/../scripts/build/Configure-User.ps1" + ] + skip_clean = true + } + + provisioner "windows-restart" { + restart_timeout = "10m" + } + + provisioner "powershell" { + inline = [ + "if( Test-Path $env:SystemRoot\\System32\\Sysprep\\unattend.xml ){ rm $env:SystemRoot\\System32\\Sysprep\\unattend.xml -Force}", + "& $env:SystemRoot\\System32\\Sysprep\\Sysprep.exe /oobe /generalize /mode:vm /quiet /quit", + "while($true) { $imageState = Get-ItemProperty HKLM:\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Setup\\State | Select ImageState; if($imageState.ImageState -ne 'IMAGE_STATE_GENERALIZE_RESEAL_TO_OOBE') { Write-Output $imageState.ImageState; Start-Sleep -s 10 } else { break } }" + ] + } + +} diff --git a/images/windows/toolsets/toolset-2025.json b/images/windows/toolsets/toolset-2025.json new file mode 100644 index 000000000000..4248f8a55d90 --- /dev/null +++ b/images/windows/toolsets/toolset-2025.json @@ -0,0 +1,328 @@ +{ + "toolcache": [ + { + "name": "Ruby", + "arch": "x64", + "platform" : "win32", + "versions": [ + "3.1", + "3.2", + "3.3" + ], + "default": "3.3" + }, + { + "name": "Python", + "url" : "https://raw.githubusercontent.com/actions/python-versions/main/versions-manifest.json", + "arch": "x64", + "platform" : "win32", + "versions": [ + "3.9.*", + "3.10.*", + "3.11.*", + "3.12.*", + "3.13.*" + ], + "default": "3.9.*" + }, + { + "name": "PyPy", + "arch": "x86", + "platform" : "win64", + "versions": [ + "3.9", + "3.10" + ] + }, + { + "name": "node", + "url" : "https://raw.githubusercontent.com/actions/node-versions/main/versions-manifest.json", + "arch": "x64", + "platform" : "win32", + "versions": [ + "18.*", + "20.*", + "22.*" + ] + }, + { + "name": "go", + "url" : "https://raw.githubusercontent.com/actions/go-versions/main/versions-manifest.json", + "arch": "x64", + "platform" : "win32", + "versions": [ + "1.21.*", + "1.22.*", + "1.23.*" + ], + "default": "1.23.*" + } + ], + "powershellModules": [ + { "name": "DockerMsftProvider" }, + { "name": "MarkdownPS" }, + { "name": "Pester" }, + { "name": "PowerShellGet" }, + { "name": "PSScriptAnalyzer" }, + { "name": "PSWindowsUpdate" }, + { "name": "SqlServer" }, + { "name": "VSSetup" }, + { "name": "Microsoft.Graph" }, + {"name": "AWSPowershell"} + ], + "azureModules": [ + { + "name": "az", + "versions": [ + "12.4.0" + ], + "zip_versions": [] + } + ], + "java": { + "default": "17", + "versions": [ "8", "11", "17", "21"] + }, + "android": { + "commandline_tools_url": "https://dl.google.com/android/repository/commandlinetools-win-12266719_latest.zip", + "hash": "F9088C04A44F1F37A8A3A228A7663E11AE9445FA07529C96CEF38ACB985A88F3", + "platform_min_version": "35", + "build_tools_min_version": "35.0.0", + "extras": [ + "android;m2repository", + "google;m2repository", + "google;google_play_services" + ], + "addons": [], + "additional_tools": [ + "cmake;3.22.1", + "cmake;3.30.5" + ], + "ndk": { + "default": "27", + "versions": [ + "26", "27" + ] + } + }, + "mingw": { + "version": "14.2.0", + "runtime": "ucrt" + }, + "MsysPackages": { + "msys2": [], + "mingw": [] + }, + "windowsFeatures": [ + { "name": "Containers" }, + { "name": "Microsoft-Windows-Subsystem-Linux", "optionalFeature": true }, + { "name": "VirtualMachinePlatform", "optionalFeature": true }, + { "name": "NET-Framework-45-Features", "includeAllSubFeatures": true }, + { "name": "Client-ProjFS", "optionalFeature": true }, + { "name": "NET-Framework-Features", "includeAllSubFeatures": true }, + { "name": "Hyper-V", "includeAllSubFeatures": true }, + { "name": "HypervisorPlatform", "optionalFeature": true }, + { "name": "Hyper-V-PowerShell" }, + { "name": "Wireless-Networking" } + ], + "visualStudio": { + "version" : "2022", + "subversion" : "17", + "edition" : "Enterprise", + "channel": "release", + "signature": "8F985BE8FD256085C90A95D3C74580511A1DB975", + "workloads": [ + "Component.Dotfuscator", + "Component.Linux.CMake", + "Component.UnityEngine.x64", + "Microsoft.Component.VC.Runtime.UCRTSDK", + "Microsoft.Net.Component.4.7.TargetingPack", + "Microsoft.Net.Component.4.7.2.TargetingPack", + "Microsoft.Net.Component.4.8.1.SDK", + "Microsoft.Net.Component.4.8.1.TargetingPack", + "Microsoft.VisualStudio.Component.AspNet45", + "Microsoft.VisualStudio.Component.Azure.ServiceFabric.Tools", + "Microsoft.VisualStudio.Component.Debugger.JustInTime", + "Microsoft.VisualStudio.Component.EntityFramework", + "Microsoft.VisualStudio.Component.DslTools", + "Microsoft.VisualStudio.Component.LinqToSql", + "Microsoft.VisualStudio.Component.SQL.SSDT", + "Microsoft.VisualStudio.Component.Sharepoint.Tools", + "Microsoft.VisualStudio.Component.PortableLibrary", + "Microsoft.VisualStudio.Component.TeamOffice", + "Microsoft.VisualStudio.Component.TestTools.CodedUITest", + "Microsoft.VisualStudio.Component.TestTools.WebLoadTest", + "Microsoft.VisualStudio.Component.UWP.VC.ARM64", + "Microsoft.VisualStudio.Component.UWP.VC.ARM64EC", + "Microsoft.VisualStudio.Component.VC.CLI.Support", + "Microsoft.VisualStudio.Component.VC.CMake.Project", + "Microsoft.VisualStudio.Component.VC.DiagnosticTools", + "Microsoft.VisualStudio.Component.VC.Llvm.Clang", + "Microsoft.VisualStudio.Component.VC.Llvm.ClangToolset", + "Microsoft.VisualStudio.Component.VC.TestAdapterForBoostTest", + "Microsoft.VisualStudio.Component.VC.TestAdapterForGoogleTest", + "Microsoft.VisualStudio.Component.VC.Tools.ARM", + "Microsoft.VisualStudio.Component.VC.Tools.ARM64", + "Microsoft.VisualStudio.Component.VC.Tools.ARM64EC", + "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", + "Microsoft.VisualStudio.Component.VC.Modules.x86.x64", + "Microsoft.VisualStudio.Component.VC.Redist.MSM", + "Microsoft.VisualStudio.Component.VC.Runtimes.ARM.Spectre", + "Microsoft.VisualStudio.Component.VC.Runtimes.ARM64.Spectre", + "Microsoft.VisualStudio.Component.VC.Runtimes.ARM64EC.Spectre", + "Microsoft.VisualStudio.Component.VC.Runtimes.x86.x64.Spectre", + "Microsoft.VisualStudio.Component.VC.MFC.ARM", + "Microsoft.VisualStudio.Component.VC.MFC.ARM.Spectre", + "Microsoft.VisualStudio.Component.VC.MFC.ARM64", + "Microsoft.VisualStudio.Component.VC.MFC.ARM64.Spectre", + "Microsoft.VisualStudio.Component.VC.ATLMFC", + "Microsoft.VisualStudio.Component.VC.ATLMFC.Spectre", + "Microsoft.VisualStudio.Component.VC.ATL", + "Microsoft.VisualStudio.Component.VC.ATL.Spectre", + "Microsoft.VisualStudio.Component.VC.ATL.ARM", + "Microsoft.VisualStudio.Component.VC.ATL.ARM.Spectre", + "Microsoft.VisualStudio.Component.VC.ATL.ARM64", + "Microsoft.VisualStudio.Component.VC.ATL.ARM64.Spectre", + "Microsoft.VisualStudio.Component.VC.ASAN", + "Microsoft.VisualStudio.Component.Windows11SDK.26100", + "Microsoft.VisualStudio.Component.Workflow", + "Microsoft.VisualStudio.ComponentGroup.Azure.CloudServices", + "Microsoft.VisualStudio.ComponentGroup.Azure.ResourceManager.Tools", + "Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Llvm.Clang", + "Microsoft.VisualStudio.ComponentGroup.UWP.VC.v142", + "Microsoft.VisualStudio.ComponentGroup.Web.CloudTools", + "Microsoft.VisualStudio.Workload.Azure", + "Microsoft.VisualStudio.Workload.Data", + "Microsoft.VisualStudio.Workload.ManagedDesktop", + "Microsoft.VisualStudio.Workload.ManagedGame", + "Microsoft.VisualStudio.Workload.NativeCrossPlat", + "Microsoft.VisualStudio.Workload.NativeDesktop", + "Microsoft.VisualStudio.Workload.NativeGame", + "Microsoft.VisualStudio.Workload.NativeMobile", + "Microsoft.VisualStudio.Workload.NetCrossPlat", + "Microsoft.VisualStudio.Workload.NetWeb", + "Microsoft.VisualStudio.Workload.Node", + "Microsoft.VisualStudio.Workload.Office", + "Microsoft.VisualStudio.Workload.Python", + "Microsoft.VisualStudio.Workload.Universal", + "Microsoft.VisualStudio.Workload.VisualStudioExtension", + "Component.MDD.Linux", + "Component.MDD.Linux.GCC.arm", + "Component.Microsoft.Windows.DriverKit", + "wasm.tools", + "Microsoft.Component.MSBuild" + ], + "vsix": [ + "SSIS.MicrosoftDataToolsIntegrationServices", + "VisualStudioClient.MicrosoftVisualStudio2022InstallerProjects", + "WixToolset.WixToolsetVisualStudio2022Extension", + "ProBITools.MicrosoftReportProjectsforVisualStudio2022", + "ProBITools.MicrosoftAnalysisServicesModelingProjects2022" + ] + }, + "docker": { + "images": [], + "components": { + "docker": "26.1.3", + "compose": "2.27.1" + } + }, + "pipx": [ + { + "package": "yamllint", + "cmd": "yamllint --version" + } + ], + "selenium": { + "version": "4" + }, + "npm": { + "global_packages": [ + { "name": "yarn", "test": "yarn --version" }, + { "name": "newman", "test": "newman --version" }, + { "name": "lerna", "test": "lerna --version" }, + { "name": "gulp-cli", "test": "gulp --version" }, + { "name": "grunt-cli", "test": "grunt --version" } + ] + }, + "serviceFabric": { + "runtime": { + "version": "10.1.2493.9590", + "checksum": "09C63A971BACDE338282C73B3C9174BED9AAD53E1D3A1B73D44515852C9C00CF" + }, + "sdk": { + "version": "7.0.2712", + "checksum": "69F54790B63488875513964A88AF38C104D3C0D073FC2A63D590F0ADD2773754" + } + }, + "dotnet": { + "versions": [ + "8.0", + "9.0" + ], + "tools": [ + { "name": "nbgv", "test": "nbgv --version", "getversion": "nbgv --version" } + ], + "warmup": false + }, + "choco": { + "common_packages": [ + { "name": "7zip.install" }, + { "name": "aria2" }, + { "name": "azcopy10" }, + { "name": "Bicep" }, + { "name": "jq" }, + { "name": "NuGet.CommandLine" }, + { "name": "packer" }, + { + "name": "strawberryperl" , + "args": [ "--version", "5.40.0.1" ] + }, + { "name": "pulumi" }, + { "name": "swig" }, + { "name": "vswhere" }, + { + "name": "julia", + "args": [ "--ia", "/DIR=C:\\Julia" ] + }, + { + "name": "cmake.install", + "args": [ "--installargs", "ADD_CMAKE_TO_PATH=\"System\"" ] + }, + { "name": "imagemagick" } + ] + }, + "node": { + "default": "22" + }, + "maven": { + "version": "3.9" + }, + "mysql": { + "version": "8.0", + "signature": "DD34D7C71F160972DE0CE25B695A0D6A9C95BD91" + }, + "mongodb": { + "version": "7.0", + "signature": "F2D7C28591847BB2CB2B1C2A0C59459FDC728A38" + }, + "llvm": { + "version": "19" + }, + "php": { + "version": "8.3" + }, + "postgresql": { + "version": "17", + "signature": "698BA51AA27CC31282AACA5055E4B9190BC6C0E9" + }, + "kotlin": { + "version": "latest" + }, + "openssl": { + "version": "3.4.0" + }, + "pwsh": { + "version": "7.4" + } +} From a0b19fa01bdf7b7d32d16af30edf82efbf1a8095 Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Fri, 29 Nov 2024 11:09:38 +0100 Subject: [PATCH 3297/3485] [Windows] Update Get-GithubReleasesByVersion function sorting (#11064) --- images/windows/scripts/helpers/InstallHelpers.ps1 | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/images/windows/scripts/helpers/InstallHelpers.ps1 b/images/windows/scripts/helpers/InstallHelpers.ps1 index 7da7bec0f6dc..67faade1d2a5 100644 --- a/images/windows/scripts/helpers/InstallHelpers.ps1 +++ b/images/windows/scripts/helpers/InstallHelpers.ps1 @@ -605,8 +605,17 @@ function Get-GithubReleasesByVersion { ) } - # Sort releases by version - $releases = $releases | Sort-Object -Descending { [version] $_.version } + # Sort releases by version, then by tag name parts if version is the same + $releases = $releases | Sort-Object -Descending { + [version] $_.version + }, { + $cleanTagName = $_.tag_name -replace '^v', '' + $parts = $cleanTagName -split '[.\-]' + $parsedParts = $parts | ForEach-Object { + if ($_ -match '^\d+$') { [int]$_ } else { $_ } + } + $parsedParts + } # Select releases matching version if ($Version -eq "latest") { From 1acb48ed45cda5f2e12af1cf1f79eed7e33f287e Mon Sep 17 00:00:00 2001 From: lawrencegripper <info@grippers.co.uk> Date: Fri, 29 Nov 2024 10:23:46 +0000 Subject: [PATCH 3298/3485] Directly install vs redist before installing postgres --- images/windows/scripts/build/Install-PostgreSQL.ps1 | 9 ++++++++- images/windows/toolsets/toolset-2019.json | 3 ++- images/windows/toolsets/toolset-2022.json | 3 ++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/images/windows/scripts/build/Install-PostgreSQL.ps1 b/images/windows/scripts/build/Install-PostgreSQL.ps1 index a43b5da55216..561325d5e107 100644 --- a/images/windows/scripts/build/Install-PostgreSQL.ps1 +++ b/images/windows/scripts/build/Install-PostgreSQL.ps1 @@ -58,9 +58,16 @@ if ($null -ne ($toolsetVersion | Select-String -Pattern '\d+\.\d+\.\d+')) { } while (!$response) } +# Postgres 14 requires the vs 17 redistributable +$vs17RedistUrl = "https://aka.ms/vs/17/release/vc_redist.x64.exe" +Install-Binary ` + -Url $vs17RedistUrl ` + -InstallArgs @("/install", "/quiet", "/norestart") ` + -ExpectedSignature (Get-ToolsetContent).postgresql.vcRedistSignature + # Return the previous value of ErrorAction and invoke Install-Binary function $ErrorActionPreference = $errorActionOldValue -$installerArgs = @("--superpassword root", "--enable_acledit 1", "--unattendedmodeui none", "--mode unattended") +$installerArgs = @("--install_runtimes 0", "--superpassword root", "--enable_acledit 1", "--unattendedmodeui none", "--mode unattended") Install-Binary ` -Url $installerUrl ` -InstallArgs $installerArgs ` diff --git a/images/windows/toolsets/toolset-2019.json b/images/windows/toolsets/toolset-2019.json index 960e5146d12a..e192ede5e14a 100644 --- a/images/windows/toolsets/toolset-2019.json +++ b/images/windows/toolsets/toolset-2019.json @@ -473,7 +473,8 @@ }, "postgresql": { "signature": "698BA51AA27CC31282AACA5055E4B9190BC6C0E9", - "version": "14" + "version": "14", + "vcRedistSignature": "245D262748012A4FE6CE8BA6C951A4C4AFBC3E5D" }, "kotlin": { "version": "latest" diff --git a/images/windows/toolsets/toolset-2022.json b/images/windows/toolsets/toolset-2022.json index 23afa8b711b1..ff60ff32ee6e 100644 --- a/images/windows/toolsets/toolset-2022.json +++ b/images/windows/toolsets/toolset-2022.json @@ -382,7 +382,8 @@ }, "postgresql": { "signature": "698BA51AA27CC31282AACA5055E4B9190BC6C0E9", - "version": "14" + "version": "14", + "vcRedistSignature": "245D262748012A4FE6CE8BA6C951A4C4AFBC3E5D" }, "kotlin": { "version": "latest" From 3f89591af505f0d8a2d193a547fe0b632e0e0817 Mon Sep 17 00:00:00 2001 From: lawrencegripper <info@grippers.co.uk> Date: Fri, 29 Nov 2024 11:01:49 +0000 Subject: [PATCH 3299/3485] Make install optional as probably not needed for next windows 2025 build --- .../windows/scripts/build/Install-PostgreSQL.ps1 | 14 ++++++++------ images/windows/toolsets/toolset-2019.json | 3 ++- images/windows/toolsets/toolset-2022.json | 3 ++- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/images/windows/scripts/build/Install-PostgreSQL.ps1 b/images/windows/scripts/build/Install-PostgreSQL.ps1 index 561325d5e107..50fdcf70834c 100644 --- a/images/windows/scripts/build/Install-PostgreSQL.ps1 +++ b/images/windows/scripts/build/Install-PostgreSQL.ps1 @@ -58,12 +58,14 @@ if ($null -ne ($toolsetVersion | Select-String -Pattern '\d+\.\d+\.\d+')) { } while (!$response) } -# Postgres 14 requires the vs 17 redistributable -$vs17RedistUrl = "https://aka.ms/vs/17/release/vc_redist.x64.exe" -Install-Binary ` - -Url $vs17RedistUrl ` - -InstallArgs @("/install", "/quiet", "/norestart") ` - -ExpectedSignature (Get-ToolsetContent).postgresql.vcRedistSignature +if ((Get-ToolsetContent).postgresql.installVcRedist) { + # Postgres 14 requires the vs 17 redistributable + $vs17RedistUrl = "https://aka.ms/vs/17/release/vc_redist.x64.exe" + Install-Binary ` + -Url $vs17RedistUrl ` + -InstallArgs @("/install", "/quiet", "/norestart") ` + -ExpectedSignature (Get-ToolsetContent).postgresql.vcRedistSignature +} # Return the previous value of ErrorAction and invoke Install-Binary function $ErrorActionPreference = $errorActionOldValue diff --git a/images/windows/toolsets/toolset-2019.json b/images/windows/toolsets/toolset-2019.json index e192ede5e14a..9f139a4b1366 100644 --- a/images/windows/toolsets/toolset-2019.json +++ b/images/windows/toolsets/toolset-2019.json @@ -474,7 +474,8 @@ "postgresql": { "signature": "698BA51AA27CC31282AACA5055E4B9190BC6C0E9", "version": "14", - "vcRedistSignature": "245D262748012A4FE6CE8BA6C951A4C4AFBC3E5D" + "vcRedistSignature": "245D262748012A4FE6CE8BA6C951A4C4AFBC3E5D", + "installVcRedist": true }, "kotlin": { "version": "latest" diff --git a/images/windows/toolsets/toolset-2022.json b/images/windows/toolsets/toolset-2022.json index ff60ff32ee6e..44d851983387 100644 --- a/images/windows/toolsets/toolset-2022.json +++ b/images/windows/toolsets/toolset-2022.json @@ -383,7 +383,8 @@ "postgresql": { "signature": "698BA51AA27CC31282AACA5055E4B9190BC6C0E9", "version": "14", - "vcRedistSignature": "245D262748012A4FE6CE8BA6C951A4C4AFBC3E5D" + "vcRedistSignature": "245D262748012A4FE6CE8BA6C951A4C4AFBC3E5D", + "installVcRedist": true }, "kotlin": { "version": "latest" From 49a87ab9a38b886cc14b7655c27b89b70544d8a3 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Sun, 1 Dec 2024 22:22:13 +0100 Subject: [PATCH 3300/3485] [Windows] Exclude "installer" directory from deletion (#11068) --- images/windows/scripts/build/Invoke-Cleanup.ps1 | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/images/windows/scripts/build/Invoke-Cleanup.ps1 b/images/windows/scripts/build/Invoke-Cleanup.ps1 index a0351fcca61a..56a9ce433fc2 100644 --- a/images/windows/scripts/build/Invoke-Cleanup.ps1 +++ b/images/windows/scripts/build/Invoke-Cleanup.ps1 @@ -15,7 +15,7 @@ Write-Host "Clean up various directories" "$env:SystemRoot\logs", "$env:SystemRoot\winsxs\manifestcache", "$env:SystemRoot\Temp", - "$env:SystemRoot\Installer", + "$env:SystemRoot\Installer\*", "$env:SystemDrive\Users\$env:INSTALL_USER\AppData\Local\Temp", "$env:TEMP", "$env:AZURE_CONFIG_DIR\logs", @@ -52,18 +52,17 @@ if ($LASTEXITCODE -ne 0) { if (Test-IsWin25) { $directoriesToCompact = @( - 'C:\Windows\assembly', - 'C:\Windows\WinSxS' + "$env:SystemRoot\assembly", + "$env:SystemRoot\WinSxS" ) Write-Host "Starting Image slimming process" $start = get-date $ErrorActionPreviousValue = $ErrorActionPreference $ErrorActionPreference = 'SilentlyContinue' - Write-Host "Removing 'C:\Windows\Installer' directory" - Remove-Item "$env:windir\Installer" -Recurse -Force | Out-Null foreach ($directory in $directoriesToCompact) { Write-Host "Compressing '$directory' directory" - & compact /s:"$directory" /c /a /i /EXE:LZX * | Out-Null + $compressionResult = & compact /s:"$directory" /c /a /i /EXE:LZX * + $compressionResult | Select-Object -Last 3 } $ErrorActionPreference = $ErrorActionPreviousValue $finish = get-date From c8985638bc94e5640aaecb14acdb80ad5ff2516d Mon Sep 17 00:00:00 2001 From: sureshe456 <160699174+sureshe456@users.noreply.github.com> Date: Mon, 2 Dec 2024 15:23:40 +0530 Subject: [PATCH 3301/3485] fix to kotlinc-js instead of fix-kotlin-dce-js as deprecated (#11075) --- images/macos/scripts/tests/BasicTools.Tests.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/macos/scripts/tests/BasicTools.Tests.ps1 b/images/macos/scripts/tests/BasicTools.Tests.ps1 index 6acf6e65a87c..2db65a1a910f 100644 --- a/images/macos/scripts/tests/BasicTools.Tests.ps1 +++ b/images/macos/scripts/tests/BasicTools.Tests.ps1 @@ -160,7 +160,7 @@ Describe "Homebrew" { } Describe "Kotlin" -Skip:($os.IsMonterey) { - $kotlinPackages = @("kapt", "kotlin", "kotlinc", "kotlinc-jvm", "kotlin-dce-js") + $kotlinPackages = @("kapt", "kotlin", "kotlinc", "kotlinc-jvm", "kotlinc-js") It "<toolName> is available" -TestCases ($kotlinPackages | ForEach-Object { @{ toolName = $_ } }) { "$toolName -version" | Should -ReturnZeroExitCode From a0fc3d11c57b350472e24c267c497f451349bad8 Mon Sep 17 00:00:00 2001 From: lawrencegripper <info@grippers.co.uk> Date: Mon, 2 Dec 2024 10:14:52 +0000 Subject: [PATCH 3302/3485] debugging --- .../scripts/build/Install-PostgreSQL.ps1 | 44 +++++++++++++++++-- 1 file changed, 40 insertions(+), 4 deletions(-) diff --git a/images/windows/scripts/build/Install-PostgreSQL.ps1 b/images/windows/scripts/build/Install-PostgreSQL.ps1 index 50fdcf70834c..920600f36b10 100644 --- a/images/windows/scripts/build/Install-PostgreSQL.ps1 +++ b/images/windows/scripts/build/Install-PostgreSQL.ps1 @@ -70,10 +70,46 @@ if ((Get-ToolsetContent).postgresql.installVcRedist) { # Return the previous value of ErrorAction and invoke Install-Binary function $ErrorActionPreference = $errorActionOldValue $installerArgs = @("--install_runtimes 0", "--superpassword root", "--enable_acledit 1", "--unattendedmodeui none", "--mode unattended") -Install-Binary ` - -Url $installerUrl ` - -InstallArgs $installerArgs ` - -ExpectedSignature (Get-ToolsetContent).postgresql.signature +try { + Install-Binary ` + -Url $installerUrl ` + -InstallArgs $installerArgs ` + -ExpectedSignature (Get-ToolsetContent).postgresql.signature +} catch { + # Recursively search for install-postgres.log + $installPostgresLog = Get-ChildItem -Path $env:TEMP -Recurse -Filter "install-postgresql.log" -ErrorAction SilentlyContinue | Select-Object -First 1 + + if ($installPostgresLog) { + Write-Output "install-postgres.log found at: $($installPostgresLog.FullName)" + Write-Output "Content of install-postgres.log:" + Get-Content -Path $installPostgresLog.FullName | ForEach-Object { Write-Output $_ } + } else { + Write-Output "install-postgres.log not found." + + # Recursively search for bitrock_installer.log or bitrock_installer_*.log + $bitrockInstallerLogs = @( + Get-ChildItem -Path $tempPath -Recurse -Filter "bitrock_installer.log" -ErrorAction SilentlyContinue, + Get-ChildItem -Path $tempPath -Recurse -Filter "bitrock_installer_*.log" -ErrorAction SilentlyContinue + ) + + # Flatten the array to remove nested arrays + $bitrockInstallerLogs = $bitrockInstallerLogs | Where-Object { $_ } + + foreach ($log in $bitrockInstallerLogs) { + if ($log) { + Write-Output "Found log file: $($log.FullName)" + Write-Output "Content of bitrock_install*.log:" + Get-Content -Path $log.FullName | ForEach-Object { Write-Output $_ } + break + } + } + + # If no log files were found + if (-not $log) { + Write-Warning "No relevant log files found in the temporary directory." + } + } +} # Get Path to pg_ctl.exe $pgPath = (Get-CimInstance Win32_Service -Filter "Name LIKE 'postgresql-%'").PathName From 0d3756a2ec0bba0839dfc9bb25791cdc56c20387 Mon Sep 17 00:00:00 2001 From: lawrencegripper <info@grippers.co.uk> Date: Mon, 2 Dec 2024 14:36:15 +0000 Subject: [PATCH 3303/3485] Handle looking for installer log before exit --- .../scripts/build/Install-PostgreSQL.ps1 | 44 +++---------------- .../scripts/helpers/InstallHelpers.ps1 | 15 ++++++- 2 files changed, 19 insertions(+), 40 deletions(-) diff --git a/images/windows/scripts/build/Install-PostgreSQL.ps1 b/images/windows/scripts/build/Install-PostgreSQL.ps1 index 920600f36b10..94d3a1f0754e 100644 --- a/images/windows/scripts/build/Install-PostgreSQL.ps1 +++ b/images/windows/scripts/build/Install-PostgreSQL.ps1 @@ -70,46 +70,12 @@ if ((Get-ToolsetContent).postgresql.installVcRedist) { # Return the previous value of ErrorAction and invoke Install-Binary function $ErrorActionPreference = $errorActionOldValue $installerArgs = @("--install_runtimes 0", "--superpassword root", "--enable_acledit 1", "--unattendedmodeui none", "--mode unattended") -try { - Install-Binary ` - -Url $installerUrl ` - -InstallArgs $installerArgs ` - -ExpectedSignature (Get-ToolsetContent).postgresql.signature -} catch { - # Recursively search for install-postgres.log - $installPostgresLog = Get-ChildItem -Path $env:TEMP -Recurse -Filter "install-postgresql.log" -ErrorAction SilentlyContinue | Select-Object -First 1 - - if ($installPostgresLog) { - Write-Output "install-postgres.log found at: $($installPostgresLog.FullName)" - Write-Output "Content of install-postgres.log:" - Get-Content -Path $installPostgresLog.FullName | ForEach-Object { Write-Output $_ } - } else { - Write-Output "install-postgres.log not found." - - # Recursively search for bitrock_installer.log or bitrock_installer_*.log - $bitrockInstallerLogs = @( - Get-ChildItem -Path $tempPath -Recurse -Filter "bitrock_installer.log" -ErrorAction SilentlyContinue, - Get-ChildItem -Path $tempPath -Recurse -Filter "bitrock_installer_*.log" -ErrorAction SilentlyContinue - ) - # Flatten the array to remove nested arrays - $bitrockInstallerLogs = $bitrockInstallerLogs | Where-Object { $_ } - - foreach ($log in $bitrockInstallerLogs) { - if ($log) { - Write-Output "Found log file: $($log.FullName)" - Write-Output "Content of bitrock_install*.log:" - Get-Content -Path $log.FullName | ForEach-Object { Write-Output $_ } - break - } - } - - # If no log files were found - if (-not $log) { - Write-Warning "No relevant log files found in the temporary directory." - } - } -} +Install-Binary ` + -Url $installerUrl ` + -InstallArgs $installerArgs ` + -ExpectedSignature (Get-ToolsetContent).postgresql.signature + -InstallerLogPath "$env:TEMP/**/postgresql-install.log" # Get Path to pg_ctl.exe $pgPath = (Get-CimInstance Win32_Service -Filter "Name LIKE 'postgresql-%'").PathName diff --git a/images/windows/scripts/helpers/InstallHelpers.ps1 b/images/windows/scripts/helpers/InstallHelpers.ps1 index b491533e444f..fa65a9dac15e 100644 --- a/images/windows/scripts/helpers/InstallHelpers.ps1 +++ b/images/windows/scripts/helpers/InstallHelpers.ps1 @@ -30,6 +30,10 @@ function Install-Binary { .PARAMETER ExpectedSHA512Sum The expected SHA512 sum of the binary. If specified, the binary's SHA512 sum is checked before installation. + .PARAMETER InstallerLogPath + The path to the log file which is produced when the installation fails. This can be used for debugging purposes. + This is only displayed when the installation fails. + .EXAMPLE Install-Binary -Url "https://go.microsoft.com/fwlink/p/?linkid=2083338" -Type EXE -InstallArgs ("/features", "+", "/quiet") -ExpectedSignature "A5C7D5B7C838D5F89DDBEDB85B2C566B4CDA881F" #> @@ -46,7 +50,8 @@ function Install-Binary { [String[]] $ExtraInstallArgs, [String[]] $ExpectedSignature, [String] $ExpectedSHA256Sum, - [String] $ExpectedSHA512Sum + [String] $ExpectedSHA512Sum, + [String] $InstallerLogPath ) if ($PSCmdlet.ParameterSetName -eq "LocalPath") { @@ -122,6 +127,14 @@ function Install-Binary { } else { Write-Host "Installation process returned unexpected exit code: $exitCode" Write-Host "Time elapsed: $installCompleteTime seconds" + + if ($InstallerLogPath -and (Test-Path -Path $InstallerLogPath)) { + Write-Host "Searching for logs maching $InstallerLogPath pattern" + Get-ChildItem -Path $InstallerLogPath | ForEach-Object { + Write-Output "Found Installer Log: $InstallerLogPath" + Get-Content -Path $InstallerLogPath + } + } exit $exitCode } } catch { From 4e756696cbf2cb95825a4178bab7700e1b36ae31 Mon Sep 17 00:00:00 2001 From: lawrencegripper <info@grippers.co.uk> Date: Mon, 2 Dec 2024 14:37:55 +0000 Subject: [PATCH 3304/3485] Hack: temp fix to improve debugging loop --- images/windows/templates/windows-2022.pkr.hcl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/windows/templates/windows-2022.pkr.hcl b/images/windows/templates/windows-2022.pkr.hcl index 0c66a7dbfa1f..d812d3a8e103 100644 --- a/images/windows/templates/windows-2022.pkr.hcl +++ b/images/windows/templates/windows-2022.pkr.hcl @@ -341,6 +341,7 @@ build { provisioner "powershell" { environment_vars = ["IMAGE_FOLDER=${var.image_folder}", "TEMP_DIR=${var.temp_dir}"] scripts = [ + "${path.root}/../scripts/build/Install-PostgreSQL.ps1", "${path.root}/../scripts/build/Install-ActionsCache.ps1", "${path.root}/../scripts/build/Install-Ruby.ps1", "${path.root}/../scripts/build/Install-PyPy.ps1", @@ -380,7 +381,6 @@ build { "${path.root}/../scripts/build/Install-Zstd.ps1", "${path.root}/../scripts/build/Install-NSIS.ps1", "${path.root}/../scripts/build/Install-Vcpkg.ps1", - "${path.root}/../scripts/build/Install-PostgreSQL.ps1", "${path.root}/../scripts/build/Install-Bazel.ps1", "${path.root}/../scripts/build/Install-AliyunCli.ps1", "${path.root}/../scripts/build/Install-RootCA.ps1", From 692b6af2e9d10c0cfb64725f16a919bf574446af Mon Sep 17 00:00:00 2001 From: Lawrence Gripper <lawrencegripper@github.com> Date: Tue, 3 Dec 2024 09:45:08 +0000 Subject: [PATCH 3305/3485] Update images/windows/scripts/helpers/InstallHelpers.ps1 --- images/windows/scripts/helpers/InstallHelpers.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/windows/scripts/helpers/InstallHelpers.ps1 b/images/windows/scripts/helpers/InstallHelpers.ps1 index fa65a9dac15e..da5c37fcec4d 100644 --- a/images/windows/scripts/helpers/InstallHelpers.ps1 +++ b/images/windows/scripts/helpers/InstallHelpers.ps1 @@ -128,7 +128,7 @@ function Install-Binary { Write-Host "Installation process returned unexpected exit code: $exitCode" Write-Host "Time elapsed: $installCompleteTime seconds" - if ($InstallerLogPath -and (Test-Path -Path $InstallerLogPath)) { + if ($InstallerLogPath) { Write-Host "Searching for logs maching $InstallerLogPath pattern" Get-ChildItem -Path $InstallerLogPath | ForEach-Object { Write-Output "Found Installer Log: $InstallerLogPath" From 47308949109bf16fc7871db45826fccc4a39d34c Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Tue, 3 Dec 2024 14:02:45 +0100 Subject: [PATCH 3306/3485] [Windows] Fix the value of the variable "image_os" for Windows 2025 (#11090) --- images/windows/scripts/build/Configure-ImageDataFile.ps1 | 2 +- images/windows/templates/windows-2025.pkr.hcl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/images/windows/scripts/build/Configure-ImageDataFile.ps1 b/images/windows/scripts/build/Configure-ImageDataFile.ps1 index 82bfa00b3b72..9c014ef95bf4 100644 --- a/images/windows/scripts/build/Configure-ImageDataFile.ps1 +++ b/images/windows/scripts/build/Configure-ImageDataFile.ps1 @@ -28,7 +28,7 @@ if (Test-IsWin25) { $softwareUrl = "${githubUrl}/win19/$imageMajorVersion.$imageMinorVersion/images/windows/Windows2019-Readme.md" $releaseUrl = "https://github.com/actions/runner-images/releases/tag/win19%2F$imageMajorVersion.$imageMinorVersion" } else { - throw "Invalid platform version is found. Either Windows Server 2019 or 2022 are required" + throw "Invalid platform version is found. Either Windows Server 2019, 2022 or 2025 are required" } $json = @" diff --git a/images/windows/templates/windows-2025.pkr.hcl b/images/windows/templates/windows-2025.pkr.hcl index 8c9d73554d34..a4ba4ed9ed0a 100644 --- a/images/windows/templates/windows-2025.pkr.hcl +++ b/images/windows/templates/windows-2025.pkr.hcl @@ -59,7 +59,7 @@ variable "image_folder" { variable "image_os" { type = string - default = "win22" + default = "win25" } variable "image_version" { From 9d551e43bc19a75b6b01ff0a46291b98862903d8 Mon Sep 17 00:00:00 2001 From: lawrencegripper <info@grippers.co.uk> Date: Tue, 3 Dec 2024 13:48:31 +0000 Subject: [PATCH 3307/3485] =?UTF-8?q?Missing=20backtick=20=F0=9F=A4=A6?= =?UTF-8?q?=E2=80=8D=E2=99=82=EF=B8=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- images/windows/scripts/build/Install-PostgreSQL.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/windows/scripts/build/Install-PostgreSQL.ps1 b/images/windows/scripts/build/Install-PostgreSQL.ps1 index 94d3a1f0754e..57c486a5e68b 100644 --- a/images/windows/scripts/build/Install-PostgreSQL.ps1 +++ b/images/windows/scripts/build/Install-PostgreSQL.ps1 @@ -74,7 +74,7 @@ $installerArgs = @("--install_runtimes 0", "--superpassword root", "--enable_acl Install-Binary ` -Url $installerUrl ` -InstallArgs $installerArgs ` - -ExpectedSignature (Get-ToolsetContent).postgresql.signature + -ExpectedSignature (Get-ToolsetContent).postgresql.signature ` -InstallerLogPath "$env:TEMP/**/postgresql-install.log" # Get Path to pg_ctl.exe From 1aad2d246dd32c066e683168237f7e757f147d6b Mon Sep 17 00:00:00 2001 From: Lawrence Gripper <lawrencegripper@github.com> Date: Tue, 3 Dec 2024 20:33:13 +0000 Subject: [PATCH 3308/3485] Update images/windows/scripts/build/Install-PostgreSQL.ps1 --- images/windows/scripts/build/Install-PostgreSQL.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/windows/scripts/build/Install-PostgreSQL.ps1 b/images/windows/scripts/build/Install-PostgreSQL.ps1 index 57c486a5e68b..bb5369a653d7 100644 --- a/images/windows/scripts/build/Install-PostgreSQL.ps1 +++ b/images/windows/scripts/build/Install-PostgreSQL.ps1 @@ -75,7 +75,7 @@ Install-Binary ` -Url $installerUrl ` -InstallArgs $installerArgs ` -ExpectedSignature (Get-ToolsetContent).postgresql.signature ` - -InstallerLogPath "$env:TEMP/**/postgresql-install.log" + -InstallerLogPath "$env:TEMP\**\install-postgresql.log" # Get Path to pg_ctl.exe $pgPath = (Get-CimInstance Win32_Service -Filter "Name LIKE 'postgresql-%'").PathName From 66ee99188480194054a36e36f8d89c178005a88d Mon Sep 17 00:00:00 2001 From: lawrencegripper <info@grippers.co.uk> Date: Wed, 4 Dec 2024 11:06:53 +0000 Subject: [PATCH 3309/3485] Missing recurse --- images/windows/scripts/helpers/InstallHelpers.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/windows/scripts/helpers/InstallHelpers.ps1 b/images/windows/scripts/helpers/InstallHelpers.ps1 index da5c37fcec4d..2d0c45bf460b 100644 --- a/images/windows/scripts/helpers/InstallHelpers.ps1 +++ b/images/windows/scripts/helpers/InstallHelpers.ps1 @@ -130,7 +130,7 @@ function Install-Binary { if ($InstallerLogPath) { Write-Host "Searching for logs maching $InstallerLogPath pattern" - Get-ChildItem -Path $InstallerLogPath | ForEach-Object { + Get-ChildItem -Recurse -Path $InstallerLogPath | ForEach-Object { Write-Output "Found Installer Log: $InstallerLogPath" Get-Content -Path $InstallerLogPath } From 18efc23fe3e39de13c9cc9d911430ce15810362a Mon Sep 17 00:00:00 2001 From: lawrencegripper <info@grippers.co.uk> Date: Wed, 4 Dec 2024 11:07:49 +0000 Subject: [PATCH 3310/3485] Quicker loop again --- images/windows/templates/windows-2022.pkr.hcl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/windows/templates/windows-2022.pkr.hcl b/images/windows/templates/windows-2022.pkr.hcl index d812d3a8e103..1aa2c8bd4e5b 100644 --- a/images/windows/templates/windows-2022.pkr.hcl +++ b/images/windows/templates/windows-2022.pkr.hcl @@ -278,6 +278,7 @@ build { provisioner "powershell" { environment_vars = ["IMAGE_FOLDER=${var.image_folder}", "TEMP_DIR=${var.temp_dir}"] scripts = [ + "${path.root}/../scripts/build/Install-PostgreSQL.ps1", "${path.root}/../scripts/build/Install-Docker.ps1", "${path.root}/../scripts/build/Install-DockerWinCred.ps1", "${path.root}/../scripts/build/Install-DockerCompose.ps1", @@ -341,7 +342,6 @@ build { provisioner "powershell" { environment_vars = ["IMAGE_FOLDER=${var.image_folder}", "TEMP_DIR=${var.temp_dir}"] scripts = [ - "${path.root}/../scripts/build/Install-PostgreSQL.ps1", "${path.root}/../scripts/build/Install-ActionsCache.ps1", "${path.root}/../scripts/build/Install-Ruby.ps1", "${path.root}/../scripts/build/Install-PyPy.ps1", From cc762854bdada7eb836f38bc42074361d7f29a3d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 4 Dec 2024 11:28:11 +0000 Subject: [PATCH 3311/3485] Updating readme file for ubuntu22 version 20241201.1.1 (#11076) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2204-Readme.md | 49 +++++++++++++++--------------- 1 file changed, 24 insertions(+), 25 deletions(-) diff --git a/images/ubuntu/Ubuntu2204-Readme.md b/images/ubuntu/Ubuntu2204-Readme.md index 81510add946d..5e86257b7e30 100644 --- a/images/ubuntu/Ubuntu2204-Readme.md +++ b/images/ubuntu/Ubuntu2204-Readme.md @@ -1,13 +1,12 @@ | Announcements | |-| | [[Ubuntu] Breaking Change: runner user will have UID 1001 instead of 1000 for larger runners](https://github.com/actions/runner-images/issues/10936) | -| [[Ubuntu 20 and 22] Node.js version 16 will be removed on November 18,2024.](https://github.com/actions/runner-images/issues/10896) | | [Ubuntu-latest workflows will use Ubuntu-24.04 image](https://github.com/actions/runner-images/issues/10636) | *** # Ubuntu 22.04 - OS Version: 22.04.5 LTS - Kernel Version: 6.5.0-1025-azure -- Image Version: 20241124.1.0 +- Image Version: 20241201.1.0 - Systemd version: 249.11-0ubuntu3.12 ## Installed Software @@ -21,7 +20,7 @@ - GNU C++: 10.5.0, 11.4.0, 12.3.0 - GNU Fortran: 10.5.0, 11.4.0, 12.3.0 - Julia 1.11.1 -- Kotlin 2.0.21-release-482 +- Kotlin 2.1.0-release-394 - Mono 6.12.0.200 - MSBuild 16.10.1.31701 (Mono 6.12.0.200) - Node.js 18.20.5 @@ -33,7 +32,7 @@ ### Package Management - cpan 1.64 - Helm 3.16.3 -- Homebrew 4.4.6 +- Homebrew 4.4.8 - Miniconda 24.9.2 - Npm 10.8.2 - NuGet 6.6.1.2 @@ -41,7 +40,7 @@ - Pip3 22.0.2 - Pipx 1.7.1 - RubyGems 3.3.5 -- Vcpkg (build from commit 5e5d0e1cd) +- Vcpkg (build from commit cd124b84f) - Yarn 1.22.22 #### Environment variables @@ -63,25 +62,25 @@ to accomplish this. - Gradle 8.11.1 - Lerna 8.1.9 - Maven 3.8.8 -- Sbt 1.10.5 +- Sbt 1.10.6 ### Tools - Ansible 2.17.6 - apt-fast 1.10.0 - AzCopy 10.27.1 - available by `azcopy` and `azcopy10` aliases - Bazel 7.4.1 -- Bazelisk 1.24.0 +- Bazelisk 1.24.1 - Bicep 0.31.92 - Buildah 1.23.1 - CMake 3.31.1 - CodeQL Action Bundle 2.19.3 - Docker Amazon ECR Credential Helper 0.9.0 - Docker Compose v2 2.27.1 -- Docker-Buildx 0.18.0 +- Docker-Buildx 0.19.1 - Docker Client 26.1.3 - Docker Server 26.1.3 - Fastlane 2.225.0 -- Git 2.47.0 +- Git 2.47.1 - Git LFS 3.6.0 - Git-ftp 1.6.0 - Haveged 1.9.14 @@ -99,31 +98,31 @@ to accomplish this. - nvm 0.40.1 - OpenSSL 3.0.2-0ubuntu1.18 - Packer 1.11.2 -- Parcel 2.13.0 +- Parcel 2.13.2 - Podman 3.4.4 -- Pulumi 3.141.0 +- Pulumi 3.142.0 - R 4.4.2 - Skopeo 1.4.1 - Sphinx Open Source Search Server 2.2.11 - SVN 1.14.1 -- Terraform 1.9.8 +- Terraform 1.10.0 - yamllint 1.35.1 - yq 4.44.5 - zstd 1.5.6 ### CLI Tools - Alibaba Cloud CLI 3.0.234 -- AWS CLI 2.22.4 +- AWS CLI 2.22.7 - AWS CLI Session Manager Plugin 1.2.694.0 - AWS SAM CLI 1.131.0 - Azure CLI 2.67.0 - Azure CLI (azure-devops) 1.0.1 -- GitHub CLI 2.62.0 +- GitHub CLI 2.63.0 - Google Cloud CLI 502.0.0 - Netlify CLI 17.37.2 -- OpenShift CLI 4.17.5 +- OpenShift CLI 4.17.6 - ORAS CLI 1.2.0 -- Vercel CLI 39.1.1 +- Vercel CLI 39.1.2 ### Java | Version | Environment Variable | @@ -148,27 +147,27 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Stack 3.1.1 ### Rust Tools -- Cargo 1.82.0 -- Rust 1.82.0 -- Rustdoc 1.82.0 +- Cargo 1.83.0 +- Rust 1.83.0 +- Rustdoc 1.83.0 - Rustup 1.27.1 #### Packages - Bindgen 0.70.1 - Cargo audit 0.21.0 -- Cargo clippy 0.1.82 +- Cargo clippy 0.1.83 - Cargo outdated 0.15.0 - Cbindgen 0.27.0 -- Rustfmt 1.7.1 +- Rustfmt 1.8.0 ### Browsers and Drivers - Google Chrome 131.0.6778.85 - ChromeDriver 131.0.6778.85 - Chromium 131.0.6778.0 -- Microsoft Edge 131.0.2903.63 +- Microsoft Edge 131.0.2903.70 - Microsoft Edge WebDriver 131.0.2903.52 -- Selenium server 4.26.0 -- Mozilla Firefox 132.0.2 +- Selenium server 4.27.0 +- Mozilla Firefox 133.0 - Geckodriver 0.35.0 #### Environment variables @@ -284,7 +283,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | alpine:3.19 | sha256:7a85bf5dc56c949be827f84f9185161265c58f589bb8b2a6b6bb6d3076c1be21 | 2024-09-06 | | debian:10 | sha256:58ce6f1271ae1c8a2006ff7d3e54e9874d839f573d8009c20154ad0f2fb0a225 | 2024-06-13 | | debian:11 | sha256:01559430c84e6bc864bed554345d1bfbfa94ac108ab68f39915cae34604b15c3 | 2024-11-11 | -| moby/buildkit:latest | sha256:91b72a6d6963df39567b0b7266e51822e9cc09f963af8693a0ab2abbc75f8b6a | 2024-11-22 | +| moby/buildkit:latest | sha256:36c65534fcd9e8b2c38f7e549aeae3ed5b5389fe6de2f44996f313112ebf0e18 | 2024-11-26 | | node:18 | sha256:83eb05700940a88b14f21fb31cc92e9571a34b1db1a5d8781b466fc26cbb1472 | 2024-11-15 | | node:18-alpine | sha256:7e43a2d633d91e8655a6c0f45d2ed987aa4930f0792f6d9dd3bffc7496e44882 | 2024-11-15 | | node:20 | sha256:f99a6bd6fb137cfc683e1ff60e7d67aa8d5fcf45a6a64c01c37b4f433a6238b6 | 2024-11-20 | From 2d0360379ca1c5b1500b0f61b7c535a75cef0f38 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 4 Dec 2024 11:46:11 +0000 Subject: [PATCH 3312/3485] Updating readme file for ubuntu24 version 20241201.1.1 (#11073) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2404-Readme.md | 39 +++++++++++++++--------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/images/ubuntu/Ubuntu2404-Readme.md b/images/ubuntu/Ubuntu2404-Readme.md index 369d73c78f76..77257c0f901a 100644 --- a/images/ubuntu/Ubuntu2404-Readme.md +++ b/images/ubuntu/Ubuntu2404-Readme.md @@ -1,13 +1,12 @@ | Announcements | |-| | [[Ubuntu] Breaking Change: runner user will have UID 1001 instead of 1000 for larger runners](https://github.com/actions/runner-images/issues/10936) | -| [[Ubuntu 20 and 22] Node.js version 16 will be removed on November 18,2024.](https://github.com/actions/runner-images/issues/10896) | | [Ubuntu-latest workflows will use Ubuntu-24.04 image](https://github.com/actions/runner-images/issues/10636) | *** # Ubuntu 24.04 - OS Version: 24.04.1 LTS - Kernel Version: 6.8.0-1017-azure -- Image Version: 20241124.1.0 +- Image Version: 20241201.1.0 - Systemd version: 255.4-1ubuntu8.4 ## Installed Software @@ -21,7 +20,7 @@ - GNU C++: 12.3.0, 13.2.0, 14.2.0 - GNU Fortran: 12.3.0, 13.2.0, 14.2.0 - Julia 1.11.1 -- Kotlin 2.0.21-release-482 +- Kotlin 2.1.0-release-394 - Node.js 20.18.1 - Perl 5.38.2 - Python 3.12.3 @@ -31,14 +30,14 @@ ### Package Management - cpan 1.64 - Helm 3.16.3 -- Homebrew 4.4.6 +- Homebrew 4.4.8 - Miniconda 24.9.2 - Npm 10.8.2 - Pip 24.0 - Pip3 24.0 - Pipx 1.7.1 - RubyGems 3.4.20 -- Vcpkg (build from commit 5e5d0e1cd) +- Vcpkg (build from commit cd124b84f) - Yarn 1.22.22 #### Environment variables @@ -65,18 +64,18 @@ to accomplish this. - Ansible 2.18.0 - AzCopy 10.27.1 - available by `azcopy` and `azcopy10` aliases - Bazel 7.4.1 -- Bazelisk 1.24.0 +- Bazelisk 1.24.1 - Bicep 0.31.92 - Buildah 1.33.7 - CMake 3.31.1 - CodeQL Action Bundle 2.19.3 - Docker Amazon ECR Credential Helper 0.9.0 - Docker Compose v2 2.27.1 -- Docker-Buildx 0.18.0 +- Docker-Buildx 0.19.1 - Docker Client 26.1.3 - Docker Server 26.1.3 - Fastlane 2.225.0 -- Git 2.47.0 +- Git 2.47.1 - Git LFS 3.6.0 - Git-ftp 1.6.0 - Haveged 1.9.14 @@ -92,9 +91,9 @@ to accomplish this. - nvm 0.40.1 - OpenSSL 3.0.13-0ubuntu3.4 - Packer 1.11.2 -- Parcel 2.13.0 +- Parcel 2.13.2 - Podman 4.9.3 -- Pulumi 3.141.0 +- Pulumi 3.142.0 - Skopeo 1.13.3 - Sphinx Open Source Search Server 2.2.11 - yamllint 1.35.1 @@ -102,12 +101,12 @@ to accomplish this. - zstd 1.5.6 ### CLI Tools -- AWS CLI 2.22.4 +- AWS CLI 2.22.7 - AWS CLI Session Manager Plugin 1.2.694.0 - AWS SAM CLI 1.131.0 - Azure CLI 2.67.0 - Azure CLI (azure-devops) 1.0.1 -- GitHub CLI 2.62.0 +- GitHub CLI 2.63.0 - Google Cloud CLI 502.0.0 ### Java @@ -133,22 +132,22 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Stack 3.1.1 ### Rust Tools -- Cargo 1.82.0 -- Rust 1.82.0 -- Rustdoc 1.82.0 +- Cargo 1.83.0 +- Rust 1.83.0 +- Rustdoc 1.83.0 - Rustup 1.27.1 #### Packages -- Rustfmt 1.7.1 +- Rustfmt 1.8.0 ### Browsers and Drivers - Google Chrome 131.0.6778.85 - ChromeDriver 131.0.6778.85 - Chromium 131.0.6778.0 -- Microsoft Edge 131.0.2903.63 +- Microsoft Edge 131.0.2903.70 - Microsoft Edge WebDriver 131.0.2903.52 -- Selenium server 4.26.0 -- Mozilla Firefox 132.0.2 +- Selenium server 4.27.0 +- Mozilla Firefox 133.0 - Geckodriver 0.35.0 #### Environment variables @@ -206,7 +205,7 @@ Use the following command as a part of your job to start the service: 'sudo syst - 3.10.14 [PyPy 7.3.17] ### PowerShell Tools -- PowerShell 7.4.2 +- PowerShell 7.4.6 #### PowerShell Modules - Az: 12.1.0 From 0fae0a3b0bef7ecf0d424efd575142e0b61e69f4 Mon Sep 17 00:00:00 2001 From: lawrencegripper <info@grippers.co.uk> Date: Wed, 4 Dec 2024 11:55:32 +0000 Subject: [PATCH 3313/3485] Fix getting output --- images/windows/scripts/helpers/InstallHelpers.ps1 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/images/windows/scripts/helpers/InstallHelpers.ps1 b/images/windows/scripts/helpers/InstallHelpers.ps1 index 2d0c45bf460b..a3fefb7de53e 100644 --- a/images/windows/scripts/helpers/InstallHelpers.ps1 +++ b/images/windows/scripts/helpers/InstallHelpers.ps1 @@ -132,7 +132,8 @@ function Install-Binary { Write-Host "Searching for logs maching $InstallerLogPath pattern" Get-ChildItem -Recurse -Path $InstallerLogPath | ForEach-Object { Write-Output "Found Installer Log: $InstallerLogPath" - Get-Content -Path $InstallerLogPath + Write-Output "File content:" + Get-Content -Path $_.FullName } } exit $exitCode From 07869434fef5faec5505c25ea90d17d3e1998bcb Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 4 Dec 2024 12:00:37 +0000 Subject: [PATCH 3314/3485] Updating readme file for ubuntu20 version 20241201.1.1 (#11072) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2004-Readme.md | 47 +++++++++++++++--------------- 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/images/ubuntu/Ubuntu2004-Readme.md b/images/ubuntu/Ubuntu2004-Readme.md index c973914f3be4..c5607fe1dc7b 100644 --- a/images/ubuntu/Ubuntu2004-Readme.md +++ b/images/ubuntu/Ubuntu2004-Readme.md @@ -1,13 +1,12 @@ | Announcements | |-| | [[Ubuntu] Breaking Change: runner user will have UID 1001 instead of 1000 for larger runners](https://github.com/actions/runner-images/issues/10936) | -| [[Ubuntu 20 and 22] Node.js version 16 will be removed on November 18,2024.](https://github.com/actions/runner-images/issues/10896) | | [Ubuntu-latest workflows will use Ubuntu-24.04 image](https://github.com/actions/runner-images/issues/10636) | *** # Ubuntu 20.04 - OS Version: 20.04.6 LTS - Kernel Version: 5.15.0-1074-azure -- Image Version: 20241124.1.0 +- Image Version: 20241201.1.0 - Systemd version: 245.4-4ubuntu3.24 ## Installed Software @@ -23,7 +22,7 @@ - GNU C++: 10.5.0 - GNU Fortran: 10.5.0 - Julia 1.11.1 -- Kotlin 2.0.21-release-482 +- Kotlin 2.1.0-release-394 - Mono 6.12.0.200 - MSBuild 16.10.1.31701 (Mono 6.12.0.200) - Node.js 18.20.5 @@ -35,7 +34,7 @@ ### Package Management - cpan 1.64 - Helm 3.16.3 -- Homebrew 4.4.6 +- Homebrew 4.4.8 - Miniconda 24.9.2 - Npm 10.8.2 - NuGet 6.6.1.2 @@ -43,7 +42,7 @@ - Pip3 20.0.2 - Pipx 1.7.1 - RubyGems 3.1.2 -- Vcpkg (build from commit 5e5d0e1cd) +- Vcpkg (build from commit cd124b84f) - Yarn 1.22.22 #### Environment variables @@ -65,25 +64,25 @@ to accomplish this. - Gradle 8.11.1 - Lerna 8.1.9 - Maven 3.8.8 -- Sbt 1.10.5 +- Sbt 1.10.6 ### Tools - Ansible 2.13.13 - apt-fast 1.10.0 - AzCopy 10.27.1 - available by `azcopy` and `azcopy10` aliases - Bazel 7.4.1 -- Bazelisk 1.24.0 +- Bazelisk 1.24.1 - Bicep 0.31.92 - Buildah 1.22.3 - CMake 3.31.1 - CodeQL Action Bundle 2.19.3 - Docker Amazon ECR Credential Helper 0.9.0 - Docker Compose v2 2.27.1 -- Docker-Buildx 0.18.0 +- Docker-Buildx 0.19.1 - Docker Client 26.1.3 - Docker Server 26.1.3 - Fastlane 2.225.0 -- Git 2.47.0 +- Git 2.47.1 - Git LFS 3.6.0 - Git-ftp 1.6.0 - Haveged 1.9.1 @@ -102,32 +101,32 @@ to accomplish this. - nvm 0.40.1 - OpenSSL 1.1.1f-1ubuntu2.23 - Packer 1.11.2 -- Parcel 2.13.0 +- Parcel 2.13.2 - PhantomJS 2.1.1 2.1.1 - Podman 3.4.2 -- Pulumi 3.141.0 +- Pulumi 3.142.0 - R 4.4.2 - Skopeo 1.5.0 - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 -- Terraform 1.9.8 +- Terraform 1.10.0 - yamllint 1.35.1 - yq 4.44.5 - zstd 1.5.6 ### CLI Tools - Alibaba Cloud CLI 3.0.174 -- AWS CLI 2.22.4 +- AWS CLI 2.22.7 - AWS CLI Session Manager Plugin 1.2.694.0 - AWS SAM CLI 1.131.0 - Azure CLI 2.67.0 - Azure CLI (azure-devops) 1.0.1 -- GitHub CLI 2.62.0 +- GitHub CLI 2.63.0 - Google Cloud CLI 502.0.0 - Netlify CLI 17.37.2 - OpenShift CLI 4.15.19 - ORAS CLI 1.2.0 -- Vercel CLI 39.1.1 +- Vercel CLI 39.1.2 ### Java | Version | Environment Variable | @@ -152,27 +151,27 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Stack 3.1.1 ### Rust Tools -- Cargo 1.82.0 -- Rust 1.82.0 -- Rustdoc 1.82.0 +- Cargo 1.83.0 +- Rust 1.83.0 +- Rustdoc 1.83.0 - Rustup 1.27.1 #### Packages - Bindgen 0.70.1 - Cargo audit 0.21.0 -- Cargo clippy 0.1.82 +- Cargo clippy 0.1.83 - Cargo outdated 0.15.0 - Cbindgen 0.27.0 -- Rustfmt 1.7.1 +- Rustfmt 1.8.0 ### Browsers and Drivers - Google Chrome 131.0.6778.85 - ChromeDriver 131.0.6778.85 - Chromium 131.0.6778.0 -- Microsoft Edge 131.0.2903.63 +- Microsoft Edge 131.0.2903.70 - Microsoft Edge WebDriver 131.0.2903.52 -- Selenium server 4.26.0 -- Mozilla Firefox 132.0.2 +- Selenium server 4.27.0 +- Mozilla Firefox 133.0 - Geckodriver 0.35.0 #### Environment variables @@ -294,7 +293,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | debian:10 | sha256:58ce6f1271ae1c8a2006ff7d3e54e9874d839f573d8009c20154ad0f2fb0a225 | 2024-06-13 | | debian:11 | sha256:01559430c84e6bc864bed554345d1bfbfa94ac108ab68f39915cae34604b15c3 | 2024-11-11 | | debian:9 | sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be | 2022-06-23 | -| moby/buildkit:latest | sha256:91b72a6d6963df39567b0b7266e51822e9cc09f963af8693a0ab2abbc75f8b6a | 2024-11-22 | +| moby/buildkit:latest | sha256:36c65534fcd9e8b2c38f7e549aeae3ed5b5389fe6de2f44996f313112ebf0e18 | 2024-11-26 | | node:18 | sha256:83eb05700940a88b14f21fb31cc92e9571a34b1db1a5d8781b466fc26cbb1472 | 2024-11-15 | | node:18-alpine | sha256:7e43a2d633d91e8655a6c0f45d2ed987aa4930f0792f6d9dd3bffc7496e44882 | 2024-11-15 | | node:20 | sha256:f99a6bd6fb137cfc683e1ff60e7d67aa8d5fcf45a6a64c01c37b4f433a6238b6 | 2024-11-20 | From e6d18766e6ad2c001b89c97b1f3a61f2a2bca3c3 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Wed, 4 Dec 2024 15:01:55 +0100 Subject: [PATCH 3315/3485] [Windows] Refactor Install-NodeJS script (#11088) --- images/windows/scripts/build/Install-NodeJS.ps1 | 15 ++++++++++++--- images/windows/toolsets/toolset-2019.json | 2 +- images/windows/toolsets/toolset-2022.json | 2 +- images/windows/toolsets/toolset-2025.json | 2 +- 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/images/windows/scripts/build/Install-NodeJS.ps1 b/images/windows/scripts/build/Install-NodeJS.ps1 index 05809a16fb9b..1063ba8e9db2 100644 --- a/images/windows/scripts/build/Install-NodeJS.ps1 +++ b/images/windows/scripts/build/Install-NodeJS.ps1 @@ -11,9 +11,18 @@ New-Item -Path $prefixPath -Force -ItemType Directory New-Item -Path $cachePath -Force -ItemType Directory $defaultVersion = (Get-ToolsetContent).node.default -$versionToInstall = Resolve-ChocoPackageVersion -PackageName "nodejs" -TargetVersion $defaultVersion - -Install-ChocoPackage "nodejs" -ArgumentList "--version=$versionToInstall" +$nodeVersion = (Get-GithubReleasesByVersion -Repo "nodejs/node" -Version "${defaultVersion}").version | Select-Object -First 1 +$downloadUrl = "https://nodejs.org/dist/v${nodeVersion}/node-v${nodeVersion}-x64.msi" + +$packageName = Split-Path $downloadUrl -Leaf +$externalHash = Get-ChecksumFromUrl -Type "SHA256" ` + -Url ($downloadUrl -replace $packageName, "SHASUMS256.txt") ` + -FileName $packageName + +Install-Binary -Type MSI ` + -Url $downloadUrl ` + -ExtraInstallArgs @('ADDLOCAL=ALL') ` + -ExpectedSHA256Sum $externalHash Add-MachinePathItem $prefixPath Update-Environment diff --git a/images/windows/toolsets/toolset-2019.json b/images/windows/toolsets/toolset-2019.json index 446e652c4b33..db9aa6099879 100644 --- a/images/windows/toolsets/toolset-2019.json +++ b/images/windows/toolsets/toolset-2019.json @@ -449,7 +449,7 @@ ] }, "node": { - "default": "18" + "default": "18.*" }, "maven": { "version": "3.8" diff --git a/images/windows/toolsets/toolset-2022.json b/images/windows/toolsets/toolset-2022.json index e15af72cd5ac..8052ea7066ae 100644 --- a/images/windows/toolsets/toolset-2022.json +++ b/images/windows/toolsets/toolset-2022.json @@ -358,7 +358,7 @@ ] }, "node": { - "default": "18" + "default": "18.*" }, "maven": { "version": "3.8" diff --git a/images/windows/toolsets/toolset-2025.json b/images/windows/toolsets/toolset-2025.json index 4248f8a55d90..1aefaa4ea56c 100644 --- a/images/windows/toolsets/toolset-2025.json +++ b/images/windows/toolsets/toolset-2025.json @@ -293,7 +293,7 @@ ] }, "node": { - "default": "22" + "default": "22.*" }, "maven": { "version": "3.9" From 9f195304f155db27d81d8e1ff1268f79c46ca97e Mon Sep 17 00:00:00 2001 From: lawrencegripper <info@grippers.co.uk> Date: Wed, 4 Dec 2024 16:35:34 +0000 Subject: [PATCH 3316/3485] Put the installer back to original order --- images/windows/templates/windows-2022.pkr.hcl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/windows/templates/windows-2022.pkr.hcl b/images/windows/templates/windows-2022.pkr.hcl index 1aa2c8bd4e5b..0c66a7dbfa1f 100644 --- a/images/windows/templates/windows-2022.pkr.hcl +++ b/images/windows/templates/windows-2022.pkr.hcl @@ -278,7 +278,6 @@ build { provisioner "powershell" { environment_vars = ["IMAGE_FOLDER=${var.image_folder}", "TEMP_DIR=${var.temp_dir}"] scripts = [ - "${path.root}/../scripts/build/Install-PostgreSQL.ps1", "${path.root}/../scripts/build/Install-Docker.ps1", "${path.root}/../scripts/build/Install-DockerWinCred.ps1", "${path.root}/../scripts/build/Install-DockerCompose.ps1", @@ -381,6 +380,7 @@ build { "${path.root}/../scripts/build/Install-Zstd.ps1", "${path.root}/../scripts/build/Install-NSIS.ps1", "${path.root}/../scripts/build/Install-Vcpkg.ps1", + "${path.root}/../scripts/build/Install-PostgreSQL.ps1", "${path.root}/../scripts/build/Install-Bazel.ps1", "${path.root}/../scripts/build/Install-AliyunCli.ps1", "${path.root}/../scripts/build/Install-RootCA.ps1", From 3362e8dadfacccfc987571fdc5fc3f64960a8546 Mon Sep 17 00:00:00 2001 From: lawrencegripper <info@grippers.co.uk> Date: Wed, 4 Dec 2024 17:12:48 +0000 Subject: [PATCH 3317/3485] [ubuntu] Add documentation on .NET core changes for 2404 This adds a short document detailing the changes .NET Core team have made related to Ubuntu. It provides a brief overview of the implications and how to resolve issues caused by this change. --- README.md | 2 +- docs/dotnet-ubuntu.md | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 docs/dotnet-ubuntu.md diff --git a/README.md b/README.md index 0f32f0cb1488..509a8a9a0eb9 100644 --- a/README.md +++ b/README.md @@ -119,7 +119,7 @@ The `-latest` migration process is gradual and happens over 1-2 months in order | Go | 3 latest minor versions | | Python <br/> Ruby | 5 most popular `major.minor` versions | | PyPy | 3 most popular `major.minor` versions | -| .NET Core | 2 latest LTS versions and 1 latest version. For each feature version only latest patch is installed | +| .NET Core | 2 latest LTS versions and 1 latest version. For each feature version only latest patch is installed. Note for [Ubuntu images see details.](./docs/dotnet-ubuntu.md) | | GCC <br/> GNU Fortran <br/> Clang <br/> GNU C++ | 3 latest major versions | | Android NDK | 1 latest non-LTS, 2 latest LTS versions | | Xcode | - only one major version of Xcode will be supported per macOS version <br/> - all minor versions of the supported major version will be available <br/> - beta and RC versions will be provided "as-is" in the latest available macOS image only no matter of beta/GA status of the image <br/> - when a new patch version is released, the previous patch version will be replaced | diff --git a/docs/dotnet-ubuntu.md b/docs/dotnet-ubuntu.md new file mode 100644 index 000000000000..c74c4c28b6ad --- /dev/null +++ b/docs/dotnet-ubuntu.md @@ -0,0 +1,34 @@ +# Ubuntu .NET Core Versions + +.NET has changed the recommended install methods for Ubuntu from 2404. + +This document gives an overview of these change and the impact this has on the `runner-images`. + +## .NET Core for Ubuntu 2004 and 2024 + +2004 and 2024 use the [Microsoft Package repository](https://learn.microsoft.com/en-us/dotnet/core/install/linux-ubuntu-install?tabs=dotnet8&pivots=os-linux-ubuntu-2004) to install .NET deb files built and published by the .NET team. + +## .NET Core Versions from Ubuntu 2404 + +The .NET Core team have worked with Canonical and Ubuntu now provides its own .NET packages. + +These are the recommended install path and, as-such what is installed on the image. + +> The release of Ubuntu 24.04 is just around the corner. Canonical-produced .NET 6, 7, and 8 packages will be available on day one, for "Noble Numbat". Microsoft will not be publishing .NET packages to the 24.04 feed at packages.microsoft.com. + +You can read the [full announcement from .NET team here](https://github.com/dotnet/core/discussions/9258). We'll briefly summarize how this change may impact users of the image. + +### [`Feature Bands`](https://learn.microsoft.com/dotnet/core/porting/versioning-sdk-msbuild-vs) + +Going forward only the `1xx` feature band will be present in the image as Ubuntu only build and publish this band. + +> Most distros, including Ubuntu, stick to the .1xx feature band for the lifetime of a major .NET version. They make this choice because .1xx is (effectively) the "compatibility band". Higher bands can have breaking changes. +> This means there will no longer be packages available for .2xx and later feature bands. Such packages have been exclusively available from Microsoft. If users see an incompatibility between .1xx and higher feature bands, we ask that you please report it in the dotnet/sdk repo. [link: dotnet/core discussion](https://github.com/dotnet/core/discussions/9258) + +If you need a higher feature band for your Actions the recommendation is to use the [`setup-dotnet`](https://github.com/actions/setup-dotnet) action to install the desired version. + +### .NET MAUI + +.NET MAUI is [not included](https://github.com/dotnet/core/discussions/9258#discussioncomment-9548857) in the Ubuntu .NET package. There is work [ongoing to fix.](https://github.com/dotnet/core/discussions/9258#discussioncomment-9548857) + +You should be able to resolve this by using the [`setup-dotnet`](https://github.com/actions/setup-dotnet) action to install the desired version. From d868709391f31a50e728ca29184e9c60a96db826 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 4 Dec 2024 21:00:26 +0000 Subject: [PATCH 3318/3485] Updating readme file for win22 version 20241201.2.1 (#11078) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/windows/Windows2022-Readme.md | 52 ++++++++++++++-------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/images/windows/Windows2022-Readme.md b/images/windows/Windows2022-Readme.md index e554647462f7..34157f263266 100644 --- a/images/windows/Windows2022-Readme.md +++ b/images/windows/Windows2022-Readme.md @@ -5,7 +5,7 @@ *** # Windows Server 2022 - OS Version: 10.0.20348 Build 2849 -- Image Version: 20241125.1.0 +- Image Version: 20241201.2.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -16,7 +16,7 @@ - Bash 5.2.37(1)-release - Go 1.21.13 - Julia 1.10.5 -- Kotlin 2.0.21 +- Kotlin 2.1.0 - LLVM 18.1.8 - Node 18.20.5 - Perl 5.32.1 @@ -34,7 +34,7 @@ - pip 24.3.1 (python 3.9) - Pipx 1.7.1 - RubyGems 3.2.33 -- Vcpkg (build from commit 5e5d0e1cd) +- Vcpkg (build from commit cd124b84f) - Yarn 1.22.22 #### Environment variables @@ -47,24 +47,24 @@ - Ant 1.10.14 - Gradle 8.11 - Maven 3.8.7 -- sbt 1.10.5 +- sbt 1.10.6 ### Tools -- 7zip 24.08 +- 7zip 24.09 - aria2 1.37.0 - azcopy 10.27.1 - Bazel 7.4.1 -- Bazelisk 1.24.0 +- Bazelisk 1.24.1 - Bicep 0.31.92 - Cabal 3.12.1.0 -- CMake 3.31.0 +- CMake 3.31.1 - CodeQL Action Bundle 2.19.3 - Docker 26.1.3 - Docker Compose v2 2.27.1 - Docker-wincred 0.8.2 - ghc 9.10.1 -- Git 2.47.0.windows.1 -- Git LFS 3.5.1 +- Git 2.47.1.windows.1 +- Git LFS 3.6.0 - ImageMagick 7.1.1-41 - InnoSetup 6.3.3 - jq 1.7.1 @@ -78,7 +78,7 @@ - NSIS 3.10 - OpenSSL 1.1.1w - Packer 1.11.2 -- Pulumi 3.141.0 +- Pulumi 3.142.0 - R 4.4.2 - Service Fabric SDK 9.1.1436.9590 - Stack 3.1.1 @@ -92,17 +92,17 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.234 -- AWS CLI 2.22.4 +- AWS CLI 2.22.7 - AWS SAM CLI 1.131.0 - AWS Session Manager CLI 1.2.694.0 - Azure CLI 2.67.0 - Azure DevOps CLI extension 1.0.1 -- GitHub CLI 2.62.0 +- GitHub CLI 2.63.0 ### Rust Tools -- Cargo 1.82.0 -- Rust 1.82.0 -- Rustdoc 1.82.0 +- Cargo 1.83.0 +- Rust 1.83.0 +- Rustdoc 1.83.0 - Rustup 1.27.1 #### Packages @@ -110,15 +110,15 @@ - cargo-audit 0.21.0 - cargo-outdated 0.15.0 - cbindgen 0.27.0 -- Clippy 0.1.82 -- Rustfmt 1.7.1 +- Clippy 0.1.83 +- Rustfmt 1.8.0 ### Browsers and Drivers - Google Chrome 131.0.6778.86 - Chrome Driver 131.0.6778.85 -- Microsoft Edge 131.0.2903.63 -- Microsoft Edge Driver 131.0.2903.63 -- Mozilla Firefox 132.0.2 +- Microsoft Edge 131.0.2903.70 +- Microsoft Edge Driver 131.0.2903.70 +- Mozilla Firefox 133.0 - Gecko Driver 0.35.0 - IE Driver 4.14.0.0 - Selenium server 4.27.0 @@ -220,12 +220,12 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Name | Version | ConfigFile | ServiceName | ServiceStatus | ListenPort | | ------ | ------- | ------------------------------------- | ----------- | ------------- | ---------- | | Apache | 2.4.55 | C:\tools\Apache24\conf\httpd.conf | Apache | Stopped | 80 | -| Nginx | 1.27.2 | C:\tools\nginx-1.27.2\conf\nginx.conf | nginx | Stopped | 80 | +| Nginx | 1.27.3 | C:\tools\nginx-1.27.3\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2022 | Name | Version | Path | | ----------------------------- | --------------- | -------------------------------------------------------- | -| Visual Studio Enterprise 2022 | 17.12.35514.174 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | +| Visual Studio Enterprise 2022 | 17.12.35521.163 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | #### Workloads, components and extensions | Package | Version | @@ -251,14 +251,14 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Component.Unreal | 17.12.35410.122 | | Component.Unreal.Android | 17.12.35410.122 | | Component.Unreal.Ide | 17.12.35410.122 | -| Component.VisualStudio.GitHub.Copilot | 17.12.35514.138 | +| Component.VisualStudio.GitHub.Copilot | 17.12.35519.222 | | Component.VSInstallerProjects2022 | 2.0.1 | | Component.WixToolset.VisualStudioExtension.Dev17 | 1.0.0.22 | | Component.WixToolset.VisualStudioExtension.Schemas3 | 1.0.0.22 | | Component.Xamarin | 17.12.35410.122 | | Component.Xamarin.RemotedSimulator | 17.12.35410.122 | -| ios | 18.0.9617.0 | -| maccatalyst | 18.0.9617.0 | +| ios | 18.1.9163.0 | +| maccatalyst | 18.1.9163.0 | | maui.blazor | 9.0.0.11787 | | maui.core | 9.0.0.11787 | | maui.windows | 9.0.0.11787 | @@ -508,7 +508,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - AzureRM: 2.1.0 (Default), 6.13.1 - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.705 +- AWSPowershell: 4.1.708 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.10 - Microsoft.Graph: 2.25.0 From d7901f6e9320897e1be976b76981177b33949626 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 4 Dec 2024 23:35:37 +0000 Subject: [PATCH 3319/3485] Updating readme file for win19 version 20241201.2.1 (#11080) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/windows/Windows2019-Readme.md | 46 ++++++++++++++-------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/images/windows/Windows2019-Readme.md b/images/windows/Windows2019-Readme.md index c6aeff529f5d..f7e5c97d9aee 100644 --- a/images/windows/Windows2019-Readme.md +++ b/images/windows/Windows2019-Readme.md @@ -5,7 +5,7 @@ *** # Windows Server 2019 - OS Version: 10.0.17763 Build 6532 -- Image Version: 20241125.1.0 +- Image Version: 20241201.2.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -16,7 +16,7 @@ - Bash 5.2.37(1)-release - Go 1.21.13 - Julia 1.10.5 -- Kotlin 2.0.21 +- Kotlin 2.1.0 - LLVM 18.1.8 - Node 18.20.5 - Perl 5.32.1 @@ -34,7 +34,7 @@ - pip 24.0 (python 3.7) - Pipx 1.2.1 - RubyGems 3.2.33 -- Vcpkg (build from commit 5e5d0e1cd) +- Vcpkg (build from commit cd124b84f) - Yarn 1.22.22 #### Environment variables @@ -47,24 +47,24 @@ - Ant 1.10.14 - Gradle 8.11 - Maven 3.8.7 -- sbt 1.10.5 +- sbt 1.10.6 ### Tools -- 7zip 24.08 +- 7zip 24.09 - aria2 1.37.0 - azcopy 10.27.1 - Bazel 7.4.1 -- Bazelisk 1.24.0 +- Bazelisk 1.24.1 - Bicep 0.31.92 - Cabal 3.12.1.0 -- CMake 3.31.0 +- CMake 3.31.1 - CodeQL Action Bundle 2.19.3 - Docker 26.1.3 - Docker Compose v2 2.27.1 - Docker-wincred 0.8.2 - ghc 9.10.1 -- Git 2.47.0.windows.1 -- Git LFS 3.5.1 +- Git 2.47.1.windows.1 +- Git LFS 3.6.0 - Google Cloud CLI 502.0.0 - ImageMagick 7.1.1-41 - InnoSetup 6.3.3 @@ -79,8 +79,8 @@ - NSIS 3.10 - OpenSSL 1.1.1w - Packer 1.11.2 -- Parcel 2.13.1 -- Pulumi 3.141.0 +- Parcel 2.13.2 +- Pulumi 3.142.0 - R 4.4.2 - Service Fabric SDK 9.1.1436.9590 - Stack 3.1.1 @@ -94,18 +94,18 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.234 -- AWS CLI 2.22.4 +- AWS CLI 2.22.7 - AWS SAM CLI 1.131.0 - AWS Session Manager CLI 1.2.694.0 - Azure CLI 2.67.0 - Azure DevOps CLI extension 1.0.1 - Cloud Foundry CLI 8.8.3 -- GitHub CLI 2.62.0 +- GitHub CLI 2.63.0 ### Rust Tools -- Cargo 1.82.0 -- Rust 1.82.0 -- Rustdoc 1.82.0 +- Cargo 1.83.0 +- Rust 1.83.0 +- Rustdoc 1.83.0 - Rustup 1.27.1 #### Packages @@ -113,15 +113,15 @@ - cargo-audit 0.21.0 - cargo-outdated 0.15.0 - cbindgen 0.27.0 -- Clippy 0.1.82 -- Rustfmt 1.7.1 +- Clippy 0.1.83 +- Rustfmt 1.8.0 ### Browsers and Drivers - Google Chrome 131.0.6778.86 - Chrome Driver 131.0.6778.85 -- Microsoft Edge 131.0.2903.63 -- Microsoft Edge Driver 131.0.2903.63 -- Mozilla Firefox 132.0.2 +- Microsoft Edge 131.0.2903.70 +- Microsoft Edge Driver 131.0.2903.70 +- Mozilla Firefox 133.0 - Gecko Driver 0.35.0 - IE Driver 4.14.0.0 - Selenium server 4.27.0 @@ -227,7 +227,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Name | Version | ConfigFile | ServiceName | ServiceStatus | ListenPort | | ------ | ------- | ------------------------------------- | ----------- | ------------- | ---------- | | Apache | 2.4.55 | C:\tools\Apache24\conf\httpd.conf | Apache | Stopped | 80 | -| Nginx | 1.27.2 | C:\tools\nginx-1.27.2\conf\nginx.conf | nginx | Stopped | 80 | +| Nginx | 1.27.3 | C:\tools\nginx-1.27.3\conf\nginx.conf | nginx | Stopped | 80 | ### Visual Studio Enterprise 2019 | Name | Version | Path | @@ -510,7 +510,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - AzureRM: 2.1.0 (Default), 6.13.1 - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.705 +- AWSPowershell: 4.1.708 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.10 - Microsoft.Graph: 2.25.0 From f8395299751d4afba13279d05ba4a43446ef1968 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 5 Dec 2024 10:28:59 +0000 Subject: [PATCH 3320/3485] Updating readme file for macos-15 version 20241202.430 (#11085) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-15-Readme.md | 41 +++++++++++++++------------------ 1 file changed, 19 insertions(+), 22 deletions(-) diff --git a/images/macos/macos-15-Readme.md b/images/macos/macos-15-Readme.md index 7ab74acfcbf1..fd2d3e2bdf50 100644 --- a/images/macos/macos-15-Readme.md +++ b/images/macos/macos-15-Readme.md @@ -1,16 +1,13 @@ | Announcements | |-| -| [[ macOS ] Node.js version 16 will be removed from macOS13 and macOS13 arm64 images on November, 25.](https://github.com/actions/runner-images/issues/10873) | -| [[macOS] OpenSSL 1.1 will be removed and OpenSSL 3 will be the default for all macOS images from November 4](https://github.com/actions/runner-images/issues/10817) | -| [[macOS] Python 3.9 and 3.10 will be removed from macOS13 arm64 and macOS14 arm64 on November 25.](https://github.com/actions/runner-images/issues/10812) | +| [[macOS] OpenSSL 1.1 will be removed and OpenSSL 3 will be the default for all macOS images once [date not determined]](https://github.com/actions/runner-images/issues/10817) | | [[macOS] The macOS 12 Actions runner image will begin deprecation on 10/7/24 and will be fully unsupported by 12/3/24 for GitHub and ADO](https://github.com/actions/runner-images/issues/10721) | -| [[macOS] Support policy changes; Xcode 14 and 16 will be removed from macOS 14 on November 4](https://github.com/actions/runner-images/issues/10703) | | [macOS 15 (Sequoia) is now available as a public beta in GitHub Actions](https://github.com/actions/runner-images/issues/10686) | *** # macOS 15 - OS Version: macOS 15.1.1 (24B91) - Kernel Version: Darwin 24.1.0 -- Image Version: 20241125.404 +- Image Version: 20241202.430 ## Installed Software @@ -25,7 +22,7 @@ - GNU Fortran 12 (Homebrew GCC 12.4.0) - available by `gfortran-12` alias - GNU Fortran 13 (Homebrew GCC 13.3.0) - available by `gfortran-13` alias - GNU Fortran 14 (Homebrew GCC 14.2.0_1) - available by `gfortran-14` alias -- Kotlin 2.0.21-release-482 +- Kotlin 2.1.0-release-394 - Node.js 22.11.0 - Perl 5.40.0 - PHP 8.4.1 @@ -37,7 +34,7 @@ - Carthage 0.40.0 - CocoaPods 1.16.2 - Composer 2.8.3 -- Homebrew 4.4.7 +- Homebrew 4.4.8 - NPM 10.9.0 - Pip3 24.3.1 (python 3.13) - Pipx 1.7.1 @@ -54,12 +51,12 @@ - aria2 1.37.0 - azcopy 10.27.1 - bazel 7.4.1 -- bazelisk 1.24.0 +- bazelisk 1.24.1 - bsdtar 3.5.3 - available by 'tar' alias - Curl 8.11.0 -- Git 2.47.0 +- Git 2.47.1 - Git LFS 3.6.0 -- GitHub CLI 2.62.0 +- GitHub CLI 2.63.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.25.0 - gpg (GnuPG) 2.4.6 @@ -72,7 +69,7 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.22.4 +- AWS CLI 2.22.8 - AWS SAM CLI 1.131.0 - AWS Session Manager CLI 1.2.694.0 - Azure CLI 2.67.0 @@ -81,7 +78,7 @@ - Cmake 3.31.1 - CodeQL Action Bundle 2.19.3 - Fastlane 2.225.0 -- SwiftFormat 0.55.2 +- SwiftFormat 0.55.3 - Xcbeautify 2.15.0 - Xcode Command Line Tools 16.1.0.0.1.1729049160 - Xcodes 1.6.0 @@ -95,11 +92,11 @@ - Google Chrome 131.0.6778.86 - Google Chrome for Testing 131.0.6778.85 - ChromeDriver 131.0.6778.85 -- Microsoft Edge 131.0.2903.63 -- Microsoft Edge WebDriver 131.0.2903.63 -- Mozilla Firefox 132.0.2 +- Microsoft Edge 131.0.2903.70 +- Microsoft Edge WebDriver 131.0.2903.72 +- Mozilla Firefox 133.0 - geckodriver 0.35.0 -- Selenium server 4.26.0 +- Selenium server 4.27.0 #### Environment variables | Name | Value | @@ -140,14 +137,14 @@ - 1.23.3 ### Rust Tools -- Cargo 1.82.0 -- Rust 1.82.0 -- Rustdoc 1.82.0 +- Cargo 1.83.0 +- Rust 1.83.0 +- Rustdoc 1.83.0 - Rustup 1.27.1 #### Packages -- Clippy 0.1.82 -- Rustfmt 1.7.1-stable +- Clippy 0.1.83 +- Rustfmt 1.8.0-stable ### PowerShell Tools - PowerShell 7.4.6 @@ -196,8 +193,8 @@ | Simulator - watchOS 11.0 | watchsimulator11.0 | 16.0 | | Simulator - watchOS 11.1 | watchsimulator11.1 | 16.1 | | Simulator - watchOS 11.2 | watchsimulator11.2 | 16.2 | -| Simulator - visionOS 1.2 | xrsimulator1.2 | 15.4 | | visionOS 1.2 | xros1.2 | 15.4 | +| Simulator - visionOS 1.2 | xrsimulator1.2 | 15.4 | | visionOS 2.0 | xros2.0 | 16.0 | | Simulator - visionOS 2.0 | xrsimulator2.0 | 16.0 | | Simulator - visionOS 2.1 | xrsimulator2.1 | 16.1 | From 5ae5d85800170b9755859bd919bc85d12f9c92dc Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 5 Dec 2024 10:32:22 +0000 Subject: [PATCH 3321/3485] Updating readme file for macos-13 version 20241202.423 (#11084) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-13-Readme.md | 45 +++++++++++++++------------------ 1 file changed, 21 insertions(+), 24 deletions(-) diff --git a/images/macos/macos-13-Readme.md b/images/macos/macos-13-Readme.md index a4a91495ee71..037244a2cd42 100644 --- a/images/macos/macos-13-Readme.md +++ b/images/macos/macos-13-Readme.md @@ -1,16 +1,13 @@ | Announcements | |-| -| [[ macOS ] Node.js version 16 will be removed from macOS13 and macOS13 arm64 images on November, 25.](https://github.com/actions/runner-images/issues/10873) | -| [[macOS] OpenSSL 1.1 will be removed and OpenSSL 3 will be the default for all macOS images from November 4](https://github.com/actions/runner-images/issues/10817) | -| [[macOS] Python 3.9 and 3.10 will be removed from macOS13 arm64 and macOS14 arm64 on November 25.](https://github.com/actions/runner-images/issues/10812) | +| [[macOS] OpenSSL 1.1 will be removed and OpenSSL 3 will be the default for all macOS images once [date not determined]](https://github.com/actions/runner-images/issues/10817) | | [[macOS] The macOS 12 Actions runner image will begin deprecation on 10/7/24 and will be fully unsupported by 12/3/24 for GitHub and ADO](https://github.com/actions/runner-images/issues/10721) | -| [[macOS] Support policy changes; Xcode 14 and 16 will be removed from macOS 14 on November 4](https://github.com/actions/runner-images/issues/10703) | | [macOS 15 (Sequoia) is now available as a public beta in GitHub Actions](https://github.com/actions/runner-images/issues/10686) | *** # macOS 13 - OS Version: macOS 13.7.1 (22H221) - Kernel Version: Darwin 22.6.0 -- Image Version: 20241125.399 +- Image Version: 20241202.423 ## Installed Software @@ -25,7 +22,7 @@ - GNU Fortran 12 (Homebrew GCC 12.4.0) - available by `gfortran-12` alias - GNU Fortran 13 (Homebrew GCC 13.3.0) - available by `gfortran-13` alias - GNU Fortran 14 (Homebrew GCC 14.2.0_1) - available by `gfortran-14` alias -- Kotlin 2.0.21-release-482 +- Kotlin 2.1.0-release-394 - Mono 6.12.0.188 - Node.js 20.18.1 - Perl 5.40.0 @@ -38,13 +35,13 @@ - Carthage 0.40.0 - CocoaPods 1.16.2 - Composer 2.8.3 -- Homebrew 4.4.7 +- Homebrew 4.4.8 - NPM 10.8.2 - NuGet 6.3.1.1 - Pip3 24.3.1 (python 3.13) - Pipx 1.7.1 - RubyGems 3.5.23 -- Vcpkg 2024 (build from commit 5e5d0e1cd) +- Vcpkg 2024 (build from commit d2b615967) - Yarn 1.22.22 ### Project Management @@ -57,12 +54,12 @@ - aria2 1.37.0 - azcopy 10.27.1 - bazel 7.4.1 -- bazelisk 1.24.0 +- bazelisk 1.24.1 - bsdtar 3.5.3 - available by 'tar' alias - Curl 8.11.0 -- Git 2.47.0 +- Git 2.47.1 - Git LFS 3.6.0 -- GitHub CLI 2.62.0 +- GitHub CLI 2.63.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.25.0 - gpg (GnuPG) 2.4.6 @@ -75,7 +72,7 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.22.4 +- AWS CLI 2.22.8 - AWS SAM CLI 1.131.0 - AWS Session Manager CLI 1.2.694.0 - Azure CLI 2.67.0 @@ -84,7 +81,7 @@ - Cmake 3.31.1 - CodeQL Action Bundle 2.19.3 - Fastlane 2.225.0 -- SwiftFormat 0.55.2 +- SwiftFormat 0.55.3 - Xcbeautify 2.15.0 - Xcode Command Line Tools 14.3.1.0.1.1683849156 - Xcodes 1.6.0 @@ -98,11 +95,11 @@ - Google Chrome 131.0.6778.86 - Google Chrome for Testing 131.0.6778.85 - ChromeDriver 131.0.6778.85 -- Microsoft Edge 131.0.2903.63 -- Microsoft Edge WebDriver 131.0.2903.63 -- Mozilla Firefox 132.0.2 +- Microsoft Edge 131.0.2903.70 +- Microsoft Edge WebDriver 131.0.2903.72 +- Mozilla Firefox 133.0 - geckodriver 0.35.0 -- Selenium server 4.26.0 +- Selenium server 4.27.0 #### Environment variables | Name | Value | @@ -153,14 +150,14 @@ - 1.23.3 ### Rust Tools -- Cargo 1.82.0 -- Rust 1.82.0 -- Rustdoc 1.82.0 +- Cargo 1.83.0 +- Rust 1.83.0 +- Rustdoc 1.83.0 - Rustup 1.27.1 #### Packages -- Clippy 0.1.82 -- Rustfmt 1.7.1-stable +- Clippy 0.1.83 +- Rustfmt 1.8.0-stable ### PowerShell Tools - PowerShell 7.4.6 @@ -214,8 +211,8 @@ | Simulator - watchOS 9.4 | watchsimulator9.4 | 14.3.1 | | Simulator - watchOS 10.0 | watchsimulator10.0 | 15.0.1 | | Simulator - watchOS 10.2 | watchsimulator10.2 | 15.1, 15.2 | -| visionOS 1.0 | xros1.0 | 15.2 | | Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | +| visionOS 1.0 | xros1.0 | 15.2 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | @@ -272,7 +269,7 @@ #### Environment variables | Name | Value | | ----------------- | ----------------------------------------------------------------------------------------- | -| PARALLELS_DMG_URL | https://download.parallels.com/desktop/v20/20.1.1-55740/ParallelsDesktop-20.1.1-55740.dmg | +| PARALLELS_DMG_URL | https://download.parallels.com/desktop/v20/20.1.2-55742/ParallelsDesktop-20.1.2-55742.dmg | ##### Notes ``` From d7a4f1a8646aab041becddf338d2f4f7bb04a828 Mon Sep 17 00:00:00 2001 From: Lawrence Gripper <lawrencegripper@github.com> Date: Thu, 5 Dec 2024 11:05:46 +0000 Subject: [PATCH 3322/3485] Update docs/dotnet-ubuntu.md --- docs/dotnet-ubuntu.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/dotnet-ubuntu.md b/docs/dotnet-ubuntu.md index c74c4c28b6ad..b5f2ccac6e66 100644 --- a/docs/dotnet-ubuntu.md +++ b/docs/dotnet-ubuntu.md @@ -4,7 +4,7 @@ This document gives an overview of these change and the impact this has on the `runner-images`. -## .NET Core for Ubuntu 2004 and 2024 +## .NET Core for Ubuntu 2004 and 2204 2004 and 2024 use the [Microsoft Package repository](https://learn.microsoft.com/en-us/dotnet/core/install/linux-ubuntu-install?tabs=dotnet8&pivots=os-linux-ubuntu-2004) to install .NET deb files built and published by the .NET team. From 26a47c5357854052259cb64970d9dd2fbec9b4db Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 5 Dec 2024 11:17:09 +0000 Subject: [PATCH 3323/3485] Updating readme file for macos-14 version 20241202.444 (#11082) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-14-Readme.md | 45 +++++++++++++++------------------ 1 file changed, 21 insertions(+), 24 deletions(-) diff --git a/images/macos/macos-14-Readme.md b/images/macos/macos-14-Readme.md index 4514175d6e54..2cc18f3fe934 100644 --- a/images/macos/macos-14-Readme.md +++ b/images/macos/macos-14-Readme.md @@ -1,16 +1,13 @@ | Announcements | |-| -| [[ macOS ] Node.js version 16 will be removed from macOS13 and macOS13 arm64 images on November, 25.](https://github.com/actions/runner-images/issues/10873) | -| [[macOS] OpenSSL 1.1 will be removed and OpenSSL 3 will be the default for all macOS images from November 4](https://github.com/actions/runner-images/issues/10817) | -| [[macOS] Python 3.9 and 3.10 will be removed from macOS13 arm64 and macOS14 arm64 on November 25.](https://github.com/actions/runner-images/issues/10812) | +| [[macOS] OpenSSL 1.1 will be removed and OpenSSL 3 will be the default for all macOS images once [date not determined]](https://github.com/actions/runner-images/issues/10817) | | [[macOS] The macOS 12 Actions runner image will begin deprecation on 10/7/24 and will be fully unsupported by 12/3/24 for GitHub and ADO](https://github.com/actions/runner-images/issues/10721) | -| [[macOS] Support policy changes; Xcode 14 and 16 will be removed from macOS 14 on November 4](https://github.com/actions/runner-images/issues/10703) | | [macOS 15 (Sequoia) is now available as a public beta in GitHub Actions](https://github.com/actions/runner-images/issues/10686) | *** # macOS 14 - OS Version: macOS 14.7.1 (23H222) - Kernel Version: Darwin 23.6.0 -- Image Version: 20241125.421 +- Image Version: 20241202.444 ## Installed Software @@ -25,7 +22,7 @@ - GNU Fortran 12 (Homebrew GCC 12.4.0) - available by `gfortran-12` alias - GNU Fortran 13 (Homebrew GCC 13.3.0) - available by `gfortran-13` alias - GNU Fortran 14 (Homebrew GCC 14.2.0_1) - available by `gfortran-14` alias -- Kotlin 2.0.21-release-482 +- Kotlin 2.1.0-release-394 - Mono 6.12.0.188 - Node.js 20.18.1 - Perl 5.40.0 @@ -38,7 +35,7 @@ - Carthage 0.40.0 - CocoaPods 1.16.2 - Composer 2.8.3 -- Homebrew 4.4.7 +- Homebrew 4.4.8 - NPM 10.8.2 - NuGet 6.3.1.1 - Pip3 24.3.1 (python 3.13) @@ -56,12 +53,12 @@ - aria2 1.37.0 - azcopy 10.27.1 - bazel 7.4.1 -- bazelisk 1.24.0 +- bazelisk 1.24.1 - bsdtar 3.5.3 - available by 'tar' alias - Curl 8.11.0 -- Git 2.47.0 +- Git 2.47.1 - Git LFS 3.6.0 -- GitHub CLI 2.62.0 +- GitHub CLI 2.63.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.25.0 - gpg (GnuPG) 2.4.6 @@ -74,7 +71,7 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.22.4 +- AWS CLI 2.22.8 - AWS SAM CLI 1.131.0 - AWS Session Manager CLI 1.2.694.0 - Azure CLI 2.67.0 @@ -83,7 +80,7 @@ - Cmake 3.31.1 - CodeQL Action Bundle 2.19.3 - Fastlane 2.225.0 -- SwiftFormat 0.55.2 +- SwiftFormat 0.55.3 - Xcbeautify 2.15.0 - Xcode Command Line Tools 16.1.0.0.1.1729049160 - Xcodes 1.6.0 @@ -97,11 +94,11 @@ - Google Chrome 131.0.6778.86 - Google Chrome for Testing 131.0.6778.85 - ChromeDriver 131.0.6778.85 -- Microsoft Edge 131.0.2903.63 -- Microsoft Edge WebDriver 131.0.2903.63 -- Mozilla Firefox 132.0.2 +- Microsoft Edge 131.0.2903.70 +- Microsoft Edge WebDriver 131.0.2903.72 +- Mozilla Firefox 133.0 - geckodriver 0.35.0 -- Selenium server 4.26.0 +- Selenium server 4.27.0 #### Environment variables | Name | Value | @@ -144,14 +141,14 @@ - 1.23.3 ### Rust Tools -- Cargo 1.82.0 -- Rust 1.82.0 -- Rustdoc 1.82.0 +- Cargo 1.83.0 +- Rust 1.83.0 +- Rustdoc 1.83.0 - Rustup 1.27.1 #### Packages -- Clippy 0.1.82 -- Rustfmt 1.7.1-stable +- Clippy 0.1.83 +- Rustfmt 1.8.0-stable ### PowerShell Tools - PowerShell 7.4.6 @@ -221,10 +218,10 @@ | Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | | Simulator - visionOS 1.1 | xrsimulator1.1 | 15.3 | | visionOS 1.1 | xros1.1 | 15.3 | -| Simulator - visionOS 1.2 | xrsimulator1.2 | 15.4 | | visionOS 1.2 | xros1.2 | 15.4 | -| visionOS 2.0 | xros2.0 | 16.0 | +| Simulator - visionOS 1.2 | xrsimulator1.2 | 15.4 | | Simulator - visionOS 2.0 | xrsimulator2.0 | 16.0 | +| visionOS 2.0 | xros2.0 | 16.0 | | Simulator - visionOS 2.1 | xrsimulator2.1 | 16.1 | | visionOS 2.1 | xros2.1 | 16.1 | | DriverKit 23.0 | driverkit23.0 | 15.0.1 | @@ -286,7 +283,7 @@ #### Environment variables | Name | Value | | ----------------- | ----------------------------------------------------------------------------------------- | -| PARALLELS_DMG_URL | https://download.parallels.com/desktop/v20/20.1.1-55740/ParallelsDesktop-20.1.1-55740.dmg | +| PARALLELS_DMG_URL | https://download.parallels.com/desktop/v20/20.1.2-55742/ParallelsDesktop-20.1.2-55742.dmg | ##### Notes ``` From 1346c98b0028f5445d7c0f5db7cd5632fb086577 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 5 Dec 2024 11:44:33 +0000 Subject: [PATCH 3324/3485] Updating readme file for macos-13-arm64 version 20241202.469 (#11081) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-13-arm64-Readme.md | 37 ++++++++++++--------------- 1 file changed, 17 insertions(+), 20 deletions(-) diff --git a/images/macos/macos-13-arm64-Readme.md b/images/macos/macos-13-arm64-Readme.md index 940b7cb26c39..cd02a498f3cc 100644 --- a/images/macos/macos-13-arm64-Readme.md +++ b/images/macos/macos-13-arm64-Readme.md @@ -1,16 +1,13 @@ | Announcements | |-| -| [[ macOS ] Node.js version 16 will be removed from macOS13 and macOS13 arm64 images on November, 25.](https://github.com/actions/runner-images/issues/10873) | -| [[macOS] OpenSSL 1.1 will be removed and OpenSSL 3 will be the default for all macOS images from November 4](https://github.com/actions/runner-images/issues/10817) | -| [[macOS] Python 3.9 and 3.10 will be removed from macOS13 arm64 and macOS14 arm64 on November 25.](https://github.com/actions/runner-images/issues/10812) | +| [[macOS] OpenSSL 1.1 will be removed and OpenSSL 3 will be the default for all macOS images once [date not determined]](https://github.com/actions/runner-images/issues/10817) | | [[macOS] The macOS 12 Actions runner image will begin deprecation on 10/7/24 and will be fully unsupported by 12/3/24 for GitHub and ADO](https://github.com/actions/runner-images/issues/10721) | -| [[macOS] Support policy changes; Xcode 14 and 16 will be removed from macOS 14 on November 4](https://github.com/actions/runner-images/issues/10703) | | [macOS 15 (Sequoia) is now available as a public beta in GitHub Actions](https://github.com/actions/runner-images/issues/10686) | *** # macOS 13 - OS Version: macOS 13.7.1 (22H221) - Kernel Version: Darwin 22.6.0 -- Image Version: 20241125.445 +- Image Version: 20241202.469 ## Installed Software @@ -25,7 +22,7 @@ - GNU Fortran 12 (Homebrew GCC 12.4.0) - available by `gfortran-12` alias - GNU Fortran 13 (Homebrew GCC 13.3.0) - available by `gfortran-13` alias - GNU Fortran 14 (Homebrew GCC 14.2.0_1) - available by `gfortran-14` alias -- Kotlin 2.0.21-release-482 +- Kotlin 2.1.0-release-394 - Mono 6.12.0.188 - Node.js 20.18.1 - Perl 5.40.0 @@ -36,7 +33,7 @@ - Bundler 2.5.23 - Carthage 0.40.0 - CocoaPods 1.16.2 -- Homebrew 4.4.6 +- Homebrew 4.4.8 - NPM 10.8.2 - NuGet 6.3.1.1 - Pip3 24.2 (python 3.13) @@ -54,12 +51,12 @@ - aria2 1.37.0 - azcopy 10.27.1 - bazel 7.4.1 -- bazelisk 1.24.0 +- bazelisk 1.24.1 - bsdtar 3.5.3 - available by 'tar' alias - Curl 8.7.1 -- Git 2.47.0 +- Git 2.47.1 - Git LFS 3.6.0 -- GitHub CLI 2.62.0 +- GitHub CLI 2.63.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.25.0 - gpg (GnuPG) 2.4.6 @@ -72,7 +69,7 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.22.4 +- AWS CLI 2.22.8 - AWS SAM CLI 1.131.0 - AWS Session Manager CLI 1.2.694.0 - Azure CLI 2.67.0 @@ -81,7 +78,7 @@ - Cmake 3.31.1 - CodeQL Action Bundle 2.19.3 - Fastlane 2.225.0 -- SwiftFormat 0.55.2 +- SwiftFormat 0.55.3 - Xcbeautify 2.15.0 - Xcode Command Line Tools 14.3.1.0.1.1683849156 - Xcodes 1.6.0 @@ -94,7 +91,7 @@ - Google Chrome 131.0.6778.86 - Google Chrome for Testing 131.0.6778.85 - ChromeDriver 131.0.6778.85 -- Selenium server 4.26.0 +- Selenium server 4.27.0 #### Environment variables | Name | Value | @@ -134,14 +131,14 @@ - 1.23.3 ### Rust Tools -- Cargo 1.82.0 -- Rust 1.82.0 -- Rustdoc 1.82.0 +- Cargo 1.83.0 +- Rust 1.83.0 +- Rustdoc 1.83.0 - Rustup 1.27.1 #### Packages -- Clippy 0.1.82 -- Rustfmt 1.7.1-stable +- Clippy 0.1.83 +- Rustfmt 1.8.0-stable ### PowerShell Tools - PowerShell 7.4.6 @@ -195,11 +192,11 @@ | Simulator - watchOS 9.4 | watchsimulator9.4 | 14.3.1 | | Simulator - watchOS 10.0 | watchsimulator10.0 | 15.0.1 | | Simulator - watchOS 10.2 | watchsimulator10.2 | 15.1, 15.2 | -| visionOS 1.0 | xros1.0 | 15.2 | | Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | +| visionOS 1.0 | xros1.0 | 15.2 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | -| Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | +| Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | | DriverKit 22.1 | driverkit22.1 | 14.1 | | DriverKit 22.2 | driverkit22.2 | 14.2 | | DriverKit 22.4 | driverkit22.4 | 14.3.1 | From de16eefce8361c24c716958843d8c87cb1c25990 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 5 Dec 2024 13:24:19 +0000 Subject: [PATCH 3325/3485] Updating readme file for macos-15-arm64 version 20241202.430 (#11086) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-15-arm64-Readme.md | 80 +++++++++++++++------------ 1 file changed, 46 insertions(+), 34 deletions(-) diff --git a/images/macos/macos-15-arm64-Readme.md b/images/macos/macos-15-arm64-Readme.md index 9b8b7e2f242b..a86974e72369 100644 --- a/images/macos/macos-15-arm64-Readme.md +++ b/images/macos/macos-15-arm64-Readme.md @@ -1,23 +1,20 @@ | Announcements | |-| -| [[ macOS ] Node.js version 16 will be removed from macOS13 and macOS13 arm64 images on November, 25.](https://github.com/actions/runner-images/issues/10873) | -| [[macOS] OpenSSL 1.1 will be removed and OpenSSL 3 will be the default for all macOS images from November 4](https://github.com/actions/runner-images/issues/10817) | -| [[macOS] Python 3.9 and 3.10 will be removed from macOS13 arm64 and macOS14 arm64 on November 25.](https://github.com/actions/runner-images/issues/10812) | +| [[macOS] OpenSSL 1.1 will be removed and OpenSSL 3 will be the default for all macOS images once [date not determined]](https://github.com/actions/runner-images/issues/10817) | | [[macOS] The macOS 12 Actions runner image will begin deprecation on 10/7/24 and will be fully unsupported by 12/3/24 for GitHub and ADO](https://github.com/actions/runner-images/issues/10721) | -| [[macOS] Support policy changes; Xcode 14 and 16 will be removed from macOS 14 on November 4](https://github.com/actions/runner-images/issues/10703) | | [macOS 15 (Sequoia) is now available as a public beta in GitHub Actions](https://github.com/actions/runner-images/issues/10686) | *** # macOS 15 - OS Version: macOS 15.1.1 (24B91) - Kernel Version: Darwin 24.1.0 -- Image Version: 20241125.405 +- Image Version: 20241202.430 ## Installed Software ### Language and Runtime - .NET Core SDK: 8.0.101, 8.0.204, 8.0.303, 8.0.404 - Bash 3.2.57(1)-release -- Clang/LLVM 16.0.0 +- Clang/LLVM 15.0.0 - Clang/LLVM (Homebrew) 18.1.8 - available on `$(brew --prefix llvm@18)/bin/clang` - GCC 12 (Homebrew GCC 12.4.0) - available by `gcc-12` alias - GCC 13 (Homebrew GCC 13.3.0) - available by `gcc-13` alias @@ -25,7 +22,7 @@ - GNU Fortran 12 (Homebrew GCC 12.4.0) - available by `gfortran-12` alias - GNU Fortran 13 (Homebrew GCC 13.3.0) - available by `gfortran-13` alias - GNU Fortran 14 (Homebrew GCC 14.2.0_1) - available by `gfortran-14` alias -- Kotlin 2.0.21-release-482 +- Kotlin 2.1.0-release-394 - Node.js 22.11.0 - Perl 5.40.0 - Python3 3.13.0 @@ -35,7 +32,7 @@ - Bundler 2.5.23 - Carthage 0.40.0 - CocoaPods 1.16.2 -- Homebrew 4.4.6 +- Homebrew 4.4.8 - NPM 10.9.0 - Pip3 24.2 (python 3.13) - Pipx 1.7.1 @@ -52,12 +49,12 @@ - aria2 1.37.0 - azcopy 10.27.1 - bazel 7.4.1 -- bazelisk 1.24.0 +- bazelisk 1.24.1 - bsdtar 3.5.3 - available by 'tar' alias - Curl 8.7.1 -- Git 2.47.0 +- Git 2.47.1 - Git LFS 3.6.0 -- GitHub CLI 2.62.0 +- GitHub CLI 2.63.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.25.0 - gpg (GnuPG) 2.4.6 @@ -70,7 +67,7 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.22.4 +- AWS CLI 2.22.8 - AWS SAM CLI 1.131.0 - AWS Session Manager CLI 1.2.694.0 - Azure CLI 2.67.0 @@ -79,7 +76,7 @@ - Cmake 3.31.1 - CodeQL Action Bundle 2.19.3 - Fastlane 2.225.0 -- SwiftFormat 0.55.2 +- SwiftFormat 0.55.3 - Xcbeautify 2.15.0 - Xcode Command Line Tools 16.1.0.0.1.1729049160 - Xcodes 1.6.0 @@ -92,7 +89,7 @@ - Google Chrome 131.0.6778.86 - Google Chrome for Testing 131.0.6778.85 - ChromeDriver 131.0.6778.85 -- Selenium server 4.26.0 +- Selenium server 4.27.0 #### Environment variables | Name | Value | @@ -131,14 +128,14 @@ - 1.23.3 ### Rust Tools -- Cargo 1.82.0 -- Rust 1.82.0 -- Rustdoc 1.82.0 +- Cargo 1.83.0 +- Rust 1.83.0 +- Rustdoc 1.83.0 - Rustup 1.27.1 #### Packages -- Clippy 0.1.82 -- Rustfmt 1.7.1-stable +- Clippy 0.1.83 +- Rustfmt 1.8.0-stable ### PowerShell Tools - PowerShell 7.4.6 @@ -154,56 +151,71 @@ | 16.2 (beta) | 16C5023f | /Applications/Xcode_16.2_beta_3.app | /Applications/Xcode_16.2.0.app<br>/Applications/Xcode_16.2.app | | 16.1 | 16B40 | /Applications/Xcode_16.1.app | /Applications/Xcode_16.1.0.app | | 16.0 (default) | 16A242d | /Applications/Xcode_16.app | /Applications/Xcode_16.0.0.app<br>/Applications/Xcode_16.0.app<br>/Applications/Xcode.app | +| 15.4 | 15F31d | /Applications/Xcode_15.4.app | /Applications/Xcode_15.4.0.app | #### Installed SDKs | SDK | SDK Name | Xcode Version | | ------------------------ | -------------------- | ------------- | +| macOS 14.5 | macosx14.5 | 15.4 | | macOS 15.0 | macosx15.0 | 16.0 | | macOS 15.1 | macosx15.1 | 16.1 | | macOS 15.2 | macosx15.2 | 16.2 | +| iOS 17.5 | iphoneos17.5 | 15.4 | | iOS 18.0 | iphoneos18.0 | 16.0 | | iOS 18.1 | iphoneos18.1 | 16.1 | | iOS 18.2 | iphoneos18.2 | 16.2 | +| Simulator - iOS 17.5 | iphonesimulator17.5 | 15.4 | | Simulator - iOS 18.0 | iphonesimulator18.0 | 16.0 | | Simulator - iOS 18.1 | iphonesimulator18.1 | 16.1 | | Simulator - iOS 18.2 | iphonesimulator18.2 | 16.2 | +| tvOS 17.5 | appletvos17.5 | 15.4 | | tvOS 18.0 | appletvos18.0 | 16.0 | | tvOS 18.1 | appletvos18.1 | 16.1 | | tvOS 18.2 | appletvos18.2 | 16.2 | +| Simulator - tvOS 17.5 | appletvsimulator17.5 | 15.4 | | Simulator - tvOS 18.0 | appletvsimulator18.0 | 16.0 | | Simulator - tvOS 18.1 | appletvsimulator18.1 | 16.1 | | Simulator - tvOS 18.2 | appletvsimulator18.2 | 16.2 | +| watchOS 10.5 | watchos10.5 | 15.4 | | watchOS 11.0 | watchos11.0 | 16.0 | | watchOS 11.1 | watchos11.1 | 16.1 | | watchOS 11.2 | watchos11.2 | 16.2 | +| Simulator - watchOS 10.5 | watchsimulator10.5 | 15.4 | | Simulator - watchOS 11.0 | watchsimulator11.0 | 16.0 | | Simulator - watchOS 11.1 | watchsimulator11.1 | 16.1 | | Simulator - watchOS 11.2 | watchsimulator11.2 | 16.2 | -| Simulator - visionOS 2.0 | xrsimulator2.0 | 16.0 | +| Simulator - visionOS 1.2 | xrsimulator1.2 | 15.4 | +| visionOS 1.2 | xros1.2 | 15.4 | | visionOS 2.0 | xros2.0 | 16.0 | +| Simulator - visionOS 2.0 | xrsimulator2.0 | 16.0 | | visionOS 2.1 | xros2.1 | 16.1 | | Simulator - visionOS 2.1 | xrsimulator2.1 | 16.1 | | Simulator - visionOS 2.2 | xrsimulator2.2 | 16.2 | | visionOS 2.2 | xros2.2 | 16.2 | +| DriverKit 23.5 | driverkit23.5 | 15.4 | | DriverKit 24.0 | driverkit24.0 | 16.0 | | DriverKit 24.1 | driverkit24.1 | 16.1 | | DriverKit 24.2 | driverkit24.2 | 16.2 | #### Installed Simulators -| OS | Simulators | -| ------------ | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| iOS 18.0 | iPhone 16<br>iPhone 16 Plus<br>iPhone 16 Pro<br>iPhone 16 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | -| iOS 18.1 | iPhone 16<br>iPhone 16 Plus<br>iPhone 16 Pro<br>iPhone 16 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (A17 Pro)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | -| iOS 18.2 | iPhone 16<br>iPhone 16 Plus<br>iPhone 16 Pro<br>iPhone 16 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (A17 Pro)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | -| tvOS 18.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 18.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 18.2 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| watchOS 11.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 10 (42mm)<br>Apple Watch Series 10 (46mm)<br>Apple Watch Ultra 2 (49mm) | -| watchOS 11.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 10 (42mm)<br>Apple Watch Series 10 (46mm)<br>Apple Watch Ultra 2 (49mm) | -| watchOS 11.2 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 10 (42mm)<br>Apple Watch Series 10 (46mm)<br>Apple Watch Ultra 2 (49mm) | -| visionOS 2.0 | Apple Vision Pro | -| visionOS 2.1 | Apple Vision Pro | -| visionOS 2.2 | Apple Vision Pro | +| OS | Simulators | +| ------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| iOS 17.5 | iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | +| iOS 18.0 | iPhone 16<br>iPhone 16 Plus<br>iPhone 16 Pro<br>iPhone 16 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | +| iOS 18.1 | iPhone 16<br>iPhone 16 Plus<br>iPhone 16 Pro<br>iPhone 16 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (A17 Pro)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | +| iOS 18.2 | iPhone 16<br>iPhone 16 Plus<br>iPhone 16 Pro<br>iPhone 16 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (A17 Pro)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | +| tvOS 17.5 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 18.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 18.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 18.2 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| watchOS 10.5 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 11.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 10 (42mm)<br>Apple Watch Series 10 (46mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 11.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 10 (42mm)<br>Apple Watch Series 10 (46mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 11.2 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 10 (42mm)<br>Apple Watch Series 10 (46mm)<br>Apple Watch Ultra 2 (49mm) | +| visionOS 1.2 | Apple Vision Pro | +| visionOS 2.0 | Apple Vision Pro | +| visionOS 2.1 | Apple Vision Pro | +| visionOS 2.2 | Apple Vision Pro | ### Android | Package Name | Version | From b74c33ad6ec359126e8e697732d5c190d4000c99 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 5 Dec 2024 16:35:55 +0000 Subject: [PATCH 3326/3485] Updating readme file for macos-14-arm64 version 20241202.580 (#11083) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-14-arm64-Readme.md | 41 +++++++++++++-------------- 1 file changed, 19 insertions(+), 22 deletions(-) diff --git a/images/macos/macos-14-arm64-Readme.md b/images/macos/macos-14-arm64-Readme.md index fc35d88ef7f8..aee85dd93e9f 100644 --- a/images/macos/macos-14-arm64-Readme.md +++ b/images/macos/macos-14-arm64-Readme.md @@ -1,16 +1,13 @@ | Announcements | |-| -| [[ macOS ] Node.js version 16 will be removed from macOS13 and macOS13 arm64 images on November, 25.](https://github.com/actions/runner-images/issues/10873) | -| [[macOS] OpenSSL 1.1 will be removed and OpenSSL 3 will be the default for all macOS images from November 4](https://github.com/actions/runner-images/issues/10817) | -| [[macOS] Python 3.9 and 3.10 will be removed from macOS13 arm64 and macOS14 arm64 on November 25.](https://github.com/actions/runner-images/issues/10812) | +| [[macOS] OpenSSL 1.1 will be removed and OpenSSL 3 will be the default for all macOS images once [date not determined]](https://github.com/actions/runner-images/issues/10817) | | [[macOS] The macOS 12 Actions runner image will begin deprecation on 10/7/24 and will be fully unsupported by 12/3/24 for GitHub and ADO](https://github.com/actions/runner-images/issues/10721) | -| [[macOS] Support policy changes; Xcode 14 and 16 will be removed from macOS 14 on November 4](https://github.com/actions/runner-images/issues/10703) | | [macOS 15 (Sequoia) is now available as a public beta in GitHub Actions](https://github.com/actions/runner-images/issues/10686) | *** # macOS 14 - OS Version: macOS 14.7.1 (23H222) - Kernel Version: Darwin 23.6.0 -- Image Version: 20241125.556 +- Image Version: 20241202.580 ## Installed Software @@ -25,7 +22,7 @@ - GNU Fortran 12 (Homebrew GCC 12.4.0) - available by `gfortran-12` alias - GNU Fortran 13 (Homebrew GCC 13.3.0) - available by `gfortran-13` alias - GNU Fortran 14 (Homebrew GCC 14.2.0_1) - available by `gfortran-14` alias -- Kotlin 2.0.21-release-482 +- Kotlin 2.1.0-release-394 - Mono 6.12.0.188 - Node.js 20.18.1 - Perl 5.40.0 @@ -36,7 +33,7 @@ - Bundler 2.5.23 - Carthage 0.40.0 - CocoaPods 1.16.2 -- Homebrew 4.4.6 +- Homebrew 4.4.8 - NPM 10.8.2 - NuGet 6.3.1.1 - Pip3 24.2 (python 3.13) @@ -54,12 +51,12 @@ - aria2 1.37.0 - azcopy 10.27.1 - bazel 7.4.1 -- bazelisk 1.24.0 +- bazelisk 1.24.1 - bsdtar 3.5.3 - available by 'tar' alias - Curl 8.7.1 -- Git 2.47.0 +- Git 2.47.1 - Git LFS 3.6.0 -- GitHub CLI 2.62.0 +- GitHub CLI 2.63.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.25.0 - gpg (GnuPG) 2.4.6 @@ -72,7 +69,7 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.22.4 +- AWS CLI 2.22.8 - AWS SAM CLI 1.131.0 - AWS Session Manager CLI 1.2.694.0 - Azure CLI 2.67.0 @@ -81,7 +78,7 @@ - Cmake 3.31.1 - CodeQL Action Bundle 2.19.3 - Fastlane 2.225.0 -- SwiftFormat 0.55.2 +- SwiftFormat 0.55.3 - Xcbeautify 2.15.0 - Xcode Command Line Tools 16.1.0.0.1.1729049160 - Xcodes 1.6.0 @@ -94,7 +91,7 @@ - Google Chrome 131.0.6778.86 - Google Chrome for Testing 131.0.6778.85 - ChromeDriver 131.0.6778.85 -- Selenium server 4.26.0 +- Selenium server 4.27.0 #### Environment variables | Name | Value | @@ -134,14 +131,14 @@ - 1.23.3 ### Rust Tools -- Cargo 1.82.0 -- Rust 1.82.0 -- Rustdoc 1.82.0 +- Cargo 1.83.0 +- Rust 1.83.0 +- Rustdoc 1.83.0 - Rustup 1.27.1 #### Packages -- Clippy 0.1.82 -- Rustfmt 1.7.1-stable +- Clippy 0.1.83 +- Rustfmt 1.8.0-stable ### PowerShell Tools - PowerShell 7.4.6 @@ -207,16 +204,16 @@ | Simulator - watchOS 10.5 | watchsimulator10.5 | 15.4 | | Simulator - watchOS 11.0 | watchsimulator11.0 | 16.0 | | Simulator - watchOS 11.1 | watchsimulator11.1 | 16.1 | -| Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | | visionOS 1.0 | xros1.0 | 15.2 | -| Simulator - visionOS 1.1 | xrsimulator1.1 | 15.3 | +| Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | | visionOS 1.1 | xros1.1 | 15.3 | -| visionOS 1.2 | xros1.2 | 15.4 | +| Simulator - visionOS 1.1 | xrsimulator1.1 | 15.3 | | Simulator - visionOS 1.2 | xrsimulator1.2 | 15.4 | +| visionOS 1.2 | xros1.2 | 15.4 | | Simulator - visionOS 2.0 | xrsimulator2.0 | 16.0 | | visionOS 2.0 | xros2.0 | 16.0 | -| Simulator - visionOS 2.1 | xrsimulator2.1 | 16.1 | | visionOS 2.1 | xros2.1 | 16.1 | +| Simulator - visionOS 2.1 | xrsimulator2.1 | 16.1 | | DriverKit 23.0 | driverkit23.0 | 15.0.1 | | DriverKit 23.2 | driverkit23.2 | 15.1, 15.2 | | DriverKit 23.4 | driverkit23.4 | 15.3 | From c2c0261ea4bb291fdd9669eb1660504b27748b17 Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Fri, 6 Dec 2024 11:25:23 +0100 Subject: [PATCH 3327/3485] [macOS] Add Android SDK 34 to macOS-15 images (#11103) --- images/macos/toolsets/toolset-15.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/macos/toolsets/toolset-15.json b/images/macos/toolsets/toolset-15.json index c9558ca2aceb..a120255b2a99 100644 --- a/images/macos/toolsets/toolset-15.json +++ b/images/macos/toolsets/toolset-15.json @@ -31,7 +31,7 @@ "android": { "cmdline-tools": "commandlinetools-mac-12266719_latest.zip", "sdk-tools": "sdk-tools-darwin-4333796.zip", - "platform_min_version": "35", + "platform_min_version": "34", "build_tools_min_version": "35.0.0", "extras": [ "android;m2repository", "google;m2repository", "google;google_play_services" From cb088fbe48b186a2e1b24432bc03b31b714fab38 Mon Sep 17 00:00:00 2001 From: susmitamane <susmitamane@github.com> Date: Mon, 9 Dec 2024 15:24:20 +0530 Subject: [PATCH 3328/3485] [macOS] Add Xcode 16.2 Release Candidate to macOS15 (#11134) --- images/macos/toolsets/toolset-15.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/macos/toolsets/toolset-15.json b/images/macos/toolsets/toolset-15.json index a120255b2a99..72738d84950d 100644 --- a/images/macos/toolsets/toolset-15.json +++ b/images/macos/toolsets/toolset-15.json @@ -3,7 +3,7 @@ "default": "16", "x64": { "versions": [ - { "link": "16.2_beta_3", "version": "16.2.0-Beta.3+16C5023f", "symlinks": ["16.2"], "install_runtimes": "true", "sha256": "04f3a3e3daf5d07e5ecfdf3cd7fc34fcf0a654884388d56f9f69942a9e3b1e66"}, + { "link": "16.2_Release_Candidate", "version": "16.2_Release_Candidate+16C5031c", "symlinks": ["16.2"], "install_runtimes": "true", "sha256": "2f6566cf6c2339030be05607827b0643c4957ed695f15e197d9a0623b76d21f0"}, { "link": "16.1", "version": "16.1+16B40", "install_runtimes": "true", "sha256": "8ca961d55981f983d21b99a95a6b0ac04905b837f6e11346ee86d28f12afe720"}, { "link": "16", "version": "16.0.0+16A242d", "symlinks": ["16.0"], "install_runtimes": "true", "sha256": "4a26c3d102a55c7222fb145e0ee1503249c9c26c6e02dc64d783c8810b37b1e3"}, { "link": "15.4", "version": "15.4.0+15F31d", "install_runtimes": "true", "sha256": "82d3d61804ff3f4c7c82085e91dc701037ddaa770e542848b2477e22f4e8aa7a"} @@ -11,7 +11,7 @@ }, "arm64":{ "versions": [ - { "link": "16.2_beta_3", "version": "16.2.0-Beta.3+16C5023f", "symlinks": ["16.2"], "install_runtimes": "true", "sha256": "04f3a3e3daf5d07e5ecfdf3cd7fc34fcf0a654884388d56f9f69942a9e3b1e66"}, + { "link": "16.2_Release_Candidate", "version": "16.2_Release_Candidate+16C5031c", "symlinks": ["16.2"], "install_runtimes": "true", "sha256": "2f6566cf6c2339030be05607827b0643c4957ed695f15e197d9a0623b76d21f0"}, { "link": "16.1", "version": "16.1+16B40", "install_runtimes": "true", "sha256": "8ca961d55981f983d21b99a95a6b0ac04905b837f6e11346ee86d28f12afe720"}, { "link": "16", "version": "16.0.0+16A242d", "symlinks": ["16.0"], "install_runtimes": "true", "sha256": "4a26c3d102a55c7222fb145e0ee1503249c9c26c6e02dc64d783c8810b37b1e3"}, { "link": "15.4", "version": "15.4.0+15F31d", "install_runtimes": "true", "sha256": "82d3d61804ff3f4c7c82085e91dc701037ddaa770e542848b2477e22f4e8aa7a"} From 3dca722ddb39e44f9788d7b82ec2c3f681de9857 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Mon, 9 Dec 2024 19:47:06 +0100 Subject: [PATCH 3329/3485] [Ubuntu] Add systemd-coredump (#11120) --- images/ubuntu/scripts/tests/Apt.Tests.ps1 | 21 +++++++++++---------- images/ubuntu/toolsets/toolset-2004.json | 1 + images/ubuntu/toolsets/toolset-2204.json | 1 + images/ubuntu/toolsets/toolset-2404.json | 1 + 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/images/ubuntu/scripts/tests/Apt.Tests.ps1 b/images/ubuntu/scripts/tests/Apt.Tests.ps1 index d0596137d05c..844f1ceae81c 100644 --- a/images/ubuntu/scripts/tests/Apt.Tests.ps1 +++ b/images/ubuntu/scripts/tests/Apt.Tests.ps1 @@ -6,16 +6,17 @@ Describe "Apt" { It "<toolName> is available" -TestCases $testCases { switch ($toolName) { - "acl" { $toolName = "getfacl"; break } - "aria2" { $toolName = "aria2c"; break } - "p7zip-full" { $toolName = "p7zip"; break } - "subversion" { $toolName = "svn"; break } - "sphinxsearch" { $toolName = "searchd"; break } - "binutils" { $toolName = "strings"; break } - "coreutils" { $toolName = "tr"; break } - "net-tools" { $toolName = "netstat"; break } - "mercurial" { $toolName = "hg"; break } - "findutils" { $toolName = "find"; break } + "acl" { $toolName = "getfacl"; break } + "aria2" { $toolName = "aria2c"; break } + "p7zip-full" { $toolName = "p7zip"; break } + "subversion" { $toolName = "svn"; break } + "sphinxsearch" { $toolName = "searchd"; break } + "binutils" { $toolName = "strings"; break } + "coreutils" { $toolName = "tr"; break } + "net-tools" { $toolName = "netstat"; break } + "mercurial" { $toolName = "hg"; break } + "findutils" { $toolName = "find"; break } + "systemd-coredump" { $toolName = "coredumpctl"; break } } (Get-Command -Name $toolName).CommandType | Should -BeExactly "Application" diff --git a/images/ubuntu/toolsets/toolset-2004.json b/images/ubuntu/toolsets/toolset-2004.json index 9ce39fca297f..13d83e5513c2 100644 --- a/images/ubuntu/toolsets/toolset-2004.json +++ b/images/ubuntu/toolsets/toolset-2004.json @@ -202,6 +202,7 @@ "sshpass", "subversion", "sudo", + "systemd-coredump", "swig", "telnet", "time", diff --git a/images/ubuntu/toolsets/toolset-2204.json b/images/ubuntu/toolsets/toolset-2204.json index 0a45df9fc55c..551526f793ee 100644 --- a/images/ubuntu/toolsets/toolset-2204.json +++ b/images/ubuntu/toolsets/toolset-2204.json @@ -201,6 +201,7 @@ "sshpass", "subversion", "sudo", + "systemd-coredump", "swig", "telnet", "time", diff --git a/images/ubuntu/toolsets/toolset-2404.json b/images/ubuntu/toolsets/toolset-2404.json index fa71fd067422..f9d8d04ff164 100644 --- a/images/ubuntu/toolsets/toolset-2404.json +++ b/images/ubuntu/toolsets/toolset-2404.json @@ -172,6 +172,7 @@ "ssh", "sshpass", "sudo", + "systemd-coredump", "swig", "telnet", "time", From ddfcef3f6a80a4563deeb43b73978a20a02768ec Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Mon, 9 Dec 2024 19:49:19 +0100 Subject: [PATCH 3330/3485] [Windows] Accept by default "Send Diagnostic data to Microsoft" consent (#11121) --- images/windows/scripts/build/Configure-User.ps1 | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/images/windows/scripts/build/Configure-User.ps1 b/images/windows/scripts/build/Configure-User.ps1 index 2bb5c0e76c87..6ede0d8cc6f8 100644 --- a/images/windows/scripts/build/Configure-User.ps1 +++ b/images/windows/scripts/build/Configure-User.ps1 @@ -41,6 +41,14 @@ if (-not (Test-IsWin25)) { throw "Failed to copy HKCU\Software\TortoiseSVN to HKLM\DEFAULT\Software\TortoiseSVN" } } +# Accept by default "Send Diagnostic data to Microsoft" consent. +if (Test-IsWin25) { + $registryKeyPath = 'HKLM:\DEFAULT\SOFTWARE\Microsoft\Windows\CurrentVersion\Privacy' + New-ItemProperty -Path $registryKeyPath -Name PrivacyConsentPresentationVersion -PropertyType DWORD -Value 3 | Out-Null + New-ItemProperty -Path $registryKeyPath -Name PrivacyConsentSettingsValidMask -PropertyType DWORD -Value 4 | Out-Null + New-ItemProperty -Path $registryKeyPath -Name PrivacyConsentSettingsVersion -PropertyType DWORD -Value 5 | Out-Null +} + Dismount-RegistryHive "HKLM\DEFAULT" # Remove the "installer" (var.install_user) user profile for Windows 2025 image From 6bbddd20d76d61606bea5a0133c950cc44c370d3 Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Tue, 10 Dec 2024 17:11:16 +0100 Subject: [PATCH 3331/3485] [windows] Remove Windows\Installer\* folder cleanup (#11144) --- images/windows/scripts/build/Invoke-Cleanup.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/windows/scripts/build/Invoke-Cleanup.ps1 b/images/windows/scripts/build/Invoke-Cleanup.ps1 index 56a9ce433fc2..f9bc431b17ba 100644 --- a/images/windows/scripts/build/Invoke-Cleanup.ps1 +++ b/images/windows/scripts/build/Invoke-Cleanup.ps1 @@ -15,7 +15,7 @@ Write-Host "Clean up various directories" "$env:SystemRoot\logs", "$env:SystemRoot\winsxs\manifestcache", "$env:SystemRoot\Temp", - "$env:SystemRoot\Installer\*", + $(if(Test-IsWin25){"$env:SystemRoot\Installer\*"}), "$env:SystemDrive\Users\$env:INSTALL_USER\AppData\Local\Temp", "$env:TEMP", "$env:AZURE_CONFIG_DIR\logs", From 87aba9f4123f13edd6bf4554806dbb3434ac26a4 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Thu, 12 Dec 2024 12:06:41 +0100 Subject: [PATCH 3332/3485] [Windows] Install "strawberryperl" right after "cmake" (#11158) --- images/windows/toolsets/toolset-2025.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/images/windows/toolsets/toolset-2025.json b/images/windows/toolsets/toolset-2025.json index 1aefaa4ea56c..64eb44c79d6d 100644 --- a/images/windows/toolsets/toolset-2025.json +++ b/images/windows/toolsets/toolset-2025.json @@ -274,10 +274,6 @@ { "name": "jq" }, { "name": "NuGet.CommandLine" }, { "name": "packer" }, - { - "name": "strawberryperl" , - "args": [ "--version", "5.40.0.1" ] - }, { "name": "pulumi" }, { "name": "swig" }, { "name": "vswhere" }, @@ -289,6 +285,10 @@ "name": "cmake.install", "args": [ "--installargs", "ADD_CMAKE_TO_PATH=\"System\"" ] }, + { + "name": "strawberryperl" , + "args": [ "--version", "5.40.0.1" ] + }, { "name": "imagemagick" } ] }, From 9a4df3f591877a8287c4252b0b926f3206a3f42d Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Fri, 13 Dec 2024 11:54:00 +0100 Subject: [PATCH 3333/3485] [windows] Update mongosh signature (#11181) --- images/windows/scripts/build/Install-MongoDB.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/windows/scripts/build/Install-MongoDB.ps1 b/images/windows/scripts/build/Install-MongoDB.ps1 index c3eeb235414e..2eaecc390a13 100644 --- a/images/windows/scripts/build/Install-MongoDB.ps1 +++ b/images/windows/scripts/build/Install-MongoDB.ps1 @@ -50,7 +50,7 @@ if (Test-IsWin25) { Install-Binary -Type MSI ` -Url $mongoshDownloadUrl ` - -ExpectedSignature 'F2D7C28591847BB2CB2B1C2A0C59459FDC728A38' + -ExpectedSignature 'A5BBE2A6DA1D2A6E057EF870267E6A91E4D56BAA' } Invoke-PesterTests -TestFile "Databases" -TestName "MongoDB" From 625a3cb7eb14901571fde9fdf2ffd13491c80efe Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Fri, 13 Dec 2024 11:54:30 +0100 Subject: [PATCH 3334/3485] [windows] Update Visual Studio Software Report (#11171) --- .../docs-gen/SoftwareReport.VisualStudio.psm1 | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/images/windows/scripts/docs-gen/SoftwareReport.VisualStudio.psm1 b/images/windows/scripts/docs-gen/SoftwareReport.VisualStudio.psm1 index 69bad2f022d6..082a840b11fa 100644 --- a/images/windows/scripts/docs-gen/SoftwareReport.VisualStudio.psm1 +++ b/images/windows/scripts/docs-gen/SoftwareReport.VisualStudio.psm1 @@ -43,18 +43,24 @@ function Get-VisualStudioExtensions { ) # WDK - $wdkVersion = Get-WDKVersion + if (-not (Test-IsWin25)) { + $wdkVersion = Get-WDKVersion + $wdkPackages = @( + @{Package = 'Windows Driver Kit'; Version = $wdkVersion } + ) + } + + # WDK extension $wdkExtensionVersion = Get-VSExtensionVersion -packageName 'Microsoft.Windows.DriverKit' - $wdkPackages = @( - @{Package = 'Windows Driver Kit'; Version = $wdkVersion } + $wdkExtensions = @( @{Package = 'Windows Driver Kit Visual Studio Extension'; Version = $wdkExtensionVersion } ) $extensions = @( $vsixs - $ssdtPackages $sdkPackages $wdkPackages + $wdkExtensions ) $extensions | Foreach-Object { From 9e06b648c0d99c6bbe0b4492f4611bc83db9a5ce Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 13 Dec 2024 14:32:17 +0000 Subject: [PATCH 3335/3485] Updating readme file for win19 version 20241211.1.1 (#11175) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/windows/Windows2019-Readme.md | 74 ++++++++++++++-------------- 1 file changed, 38 insertions(+), 36 deletions(-) diff --git a/images/windows/Windows2019-Readme.md b/images/windows/Windows2019-Readme.md index f7e5c97d9aee..61a68428e55c 100644 --- a/images/windows/Windows2019-Readme.md +++ b/images/windows/Windows2019-Readme.md @@ -1,11 +1,13 @@ | Announcements | |-| -| [[Windows & Ubuntu] .NET 7.x will be removed from the images on December 6, 2024](https://github.com/actions/runner-images/issues/10894) | -| [[Windows & Ubuntu] Python 3.7.x will be removed from December 6 ,2024](https://github.com/actions/runner-images/issues/10893) | +| [[Windows] Breaking change : Docker Engine Version 26.* will be updated to Docker Engine Version 27.* from January 10,2025](https://github.com/actions/runner-images/issues/11104) | +| [[Windows & Ubuntu] Breaking change : Maven 3.8.* version will be updated to Maven 3.9.* from January 10,2025](https://github.com/actions/runner-images/issues/11093) | +| [[Windows & Ubuntu] .NET 7.x will be removed from the images on January 10,2025](https://github.com/actions/runner-images/issues/10894) | +| [[Windows & Ubuntu] Python 3.7.x will be removed from January 10 ,2025](https://github.com/actions/runner-images/issues/10893) | *** # Windows Server 2019 -- OS Version: 10.0.17763 Build 6532 -- Image Version: 20241201.2.0 +- OS Version: 10.0.17763 Build 6659 +- Image Version: 20241211.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -25,8 +27,8 @@ - Ruby 3.0.7p220 ### Package Management -- Chocolatey 2.4.0 -- Composer 2.8.3 +- Chocolatey 2.4.1 +- Composer 2.8.4 - Helm 3.16.2 - Miniconda 24.9.2 (pre-installed on the image but not added to PATH) - NPM 10.8.2 @@ -34,7 +36,7 @@ - pip 24.0 (python 3.7) - Pipx 1.2.1 - RubyGems 3.2.33 -- Vcpkg (build from commit cd124b84f) +- Vcpkg (build from commit b7601ed37) - Yarn 1.22.22 #### Environment variables @@ -53,19 +55,19 @@ - 7zip 24.09 - aria2 1.37.0 - azcopy 10.27.1 -- Bazel 7.4.1 -- Bazelisk 1.24.1 -- Bicep 0.31.92 +- Bazel 8.0.0 +- Bazelisk 1.25.0 +- Bicep 0.32.4 - Cabal 3.12.1.0 -- CMake 3.31.1 -- CodeQL Action Bundle 2.19.3 +- CMake 3.31.2 +- CodeQL Action Bundle 2.20.0 - Docker 26.1.3 - Docker Compose v2 2.27.1 - Docker-wincred 0.8.2 - ghc 9.10.1 - Git 2.47.1.windows.1 - Git LFS 3.6.0 -- Google Cloud CLI 502.0.0 +- Google Cloud CLI 503.0.0 - ImageMagick 7.1.1-41 - InnoSetup 6.3.3 - jq 1.7.1 @@ -84,7 +86,7 @@ - R 4.4.2 - Service Fabric SDK 9.1.1436.9590 - Stack 3.1.1 -- Subversion (SVN) 1.14.4 +- Subversion (SVN) 1.14.5 - Swig 4.1.1 - VSWhere 3.1.7 - WinAppDriver 1.2.2009.02003 @@ -93,14 +95,14 @@ - zstd 1.5.6 ### CLI Tools -- Alibaba Cloud CLI 3.0.234 -- AWS CLI 2.22.7 +- Alibaba Cloud CLI 3.0.235 +- AWS CLI 2.22.13 - AWS SAM CLI 1.131.0 - AWS Session Manager CLI 1.2.694.0 - Azure CLI 2.67.0 - Azure DevOps CLI extension 1.0.1 -- Cloud Foundry CLI 8.8.3 -- GitHub CLI 2.63.0 +- Cloud Foundry CLI 8.9.0 +- GitHub CLI 2.63.2 ### Rust Tools - Cargo 1.83.0 @@ -109,19 +111,19 @@ - Rustup 1.27.1 #### Packages -- bindgen 0.70.1 +- bindgen 0.71.1 - cargo-audit 0.21.0 -- cargo-outdated 0.15.0 +- cargo-outdated 0.16.0 - cbindgen 0.27.0 - Clippy 0.1.83 - Rustfmt 1.8.0 ### Browsers and Drivers -- Google Chrome 131.0.6778.86 -- Chrome Driver 131.0.6778.85 -- Microsoft Edge 131.0.2903.70 -- Microsoft Edge Driver 131.0.2903.70 -- Mozilla Firefox 133.0 +- Google Chrome 131.0.6778.140 +- Chrome Driver 131.0.6778.108 +- Microsoft Edge 131.0.2903.86 +- Microsoft Edge Driver 131.0.2903.86 +- Mozilla Firefox 133.0.3 - Gecko Driver 0.35.0 - IE Driver 4.14.0.0 - Selenium server 4.27.0 @@ -167,14 +169,14 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Go - 1.20.14 - 1.21.13 -- 1.22.9 -- 1.23.3 +- 1.22.10 +- 1.23.4 #### Node.js - 16.20.2 - 18.20.5 - 20.18.1 -- 22.11.0 +- 22.12.0 #### Python - 3.7.9 @@ -182,7 +184,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 3.9.13 - 3.10.11 - 3.11.9 -- 3.12.7 +- 3.12.8 #### PyPy - 2.7.18 [PyPy 7.3.17] @@ -494,7 +496,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 10.0.22621.0 ### .NET Core Tools -- .NET Core SDK: 6.0.136, 6.0.203, 6.0.321, 6.0.428, 7.0.120, 7.0.203, 7.0.317, 7.0.410, 8.0.111, 8.0.206, 8.0.307, 8.0.404, 9.0.100 +- .NET Core SDK: 6.0.136, 6.0.203, 6.0.321, 6.0.428, 7.0.120, 7.0.203, 7.0.317, 7.0.410, 8.0.111, 8.0.206, 8.0.307, 8.0.404, 9.0.101 - .NET Framework: 4.7.2, 4.8 - Microsoft.AspNetCore.App: 6.0.5, 6.0.26, 6.0.36, 7.0.5, 7.0.20, 8.0.6, 8.0.11, 9.0.0 - Microsoft.NETCore.App: 6.0.5, 6.0.26, 6.0.36, 7.0.5, 7.0.20, 8.0.6, 8.0.11, 9.0.0 @@ -510,7 +512,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - AzureRM: 2.1.0 (Default), 6.13.1 - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.708 +- AWSPowershell: 4.1.715 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.10 - Microsoft.Graph: 2.25.0 @@ -554,9 +556,9 @@ All other versions are saved but not installed. ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:ef2bdc393a4e9b0b0d8b4356c96ba384e93905b91f9bc1457297bec10c7c9a5d | 2024-11-12 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:dd1c97343b6a7913b4ad9af8d7024527d86f31b611246b7b56be2df9efd6affe | 2024-11-12 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:5c61a6c5cd84002f31b40d365e505a2c2310acec806faa30b8e2cc209150dd54 | 2024-11-12 | -| mcr.microsoft.com/windows/nanoserver:1809 | sha256:d3bd9a71fc0c0e7f768c607fdbc60cba66ace7a2fc833bcb01992c247d7d78df | 2024-11-01 | -| mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:d14e163a476ddf6bfe08997551777cf1382288784825158263e002d1f4eeb29c | 2024-11-01 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:1fa02716b8fb36dc4d0f24d0afcfe29301b1e67b176a2fa0624c5463ee302296 | 2024-12-10 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:ee07f32af7ffae810146282e5bfa37fa319fb483e551e03b3a5b63c3f2130d3e | 2024-12-10 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:f1a2e331287782ecc403dfd56717fbd32fdae9486ffaacaab8cb1798ee214e6d | 2024-12-10 | +| mcr.microsoft.com/windows/nanoserver:1809 | sha256:579994616649b876dd2e4009dae4af92f6e53561045230b8cdd53b3baf2f99d0 | 2024-12-05 | +| mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:0cb5fd75c08e7246afc6cc16bfe769d91af54fdb72ca58df150ebf5e3a2972ad | 2024-12-05 | From cb92b7c5b27cd0d346613aed8af9c8b48b3de744 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 13 Dec 2024 09:16:02 -0700 Subject: [PATCH 3336/3485] Updating readme file for ubuntu20 version 20241209.1.1 (#11141) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2004-Readme.md | 70 +++++++++++++++--------------- 1 file changed, 36 insertions(+), 34 deletions(-) diff --git a/images/ubuntu/Ubuntu2004-Readme.md b/images/ubuntu/Ubuntu2004-Readme.md index c5607fe1dc7b..00d0b726c512 100644 --- a/images/ubuntu/Ubuntu2004-Readme.md +++ b/images/ubuntu/Ubuntu2004-Readme.md @@ -1,12 +1,13 @@ | Announcements | |-| +| [[Windows & Ubuntu] Breaking change : Maven 3.8.* version will be updated to Maven 3.9.* from January 10,2025](https://github.com/actions/runner-images/issues/11093) | | [[Ubuntu] Breaking Change: runner user will have UID 1001 instead of 1000 for larger runners](https://github.com/actions/runner-images/issues/10936) | | [Ubuntu-latest workflows will use Ubuntu-24.04 image](https://github.com/actions/runner-images/issues/10636) | *** # Ubuntu 20.04 - OS Version: 20.04.6 LTS - Kernel Version: 5.15.0-1074-azure -- Image Version: 20241201.1.0 +- Image Version: 20241209.1.0 - Systemd version: 245.4-4ubuntu3.24 ## Installed Software @@ -21,7 +22,7 @@ - Erlang rebar3 3.24.0 - GNU C++: 10.5.0 - GNU Fortran: 10.5.0 -- Julia 1.11.1 +- Julia 1.11.2 - Kotlin 2.1.0-release-394 - Mono 6.12.0.200 - MSBuild 16.10.1.31701 (Mono 6.12.0.200) @@ -34,7 +35,7 @@ ### Package Management - cpan 1.64 - Helm 3.16.3 -- Homebrew 4.4.8 +- Homebrew 4.4.11 - Miniconda 24.9.2 - Npm 10.8.2 - NuGet 6.6.1.2 @@ -42,7 +43,7 @@ - Pip3 20.0.2 - Pipx 1.7.1 - RubyGems 3.1.2 -- Vcpkg (build from commit cd124b84f) +- Vcpkg (build from commit 96b5ced82) - Yarn 1.22.22 #### Environment variables @@ -70,15 +71,15 @@ to accomplish this. - Ansible 2.13.13 - apt-fast 1.10.0 - AzCopy 10.27.1 - available by `azcopy` and `azcopy10` aliases -- Bazel 7.4.1 +- Bazel 8.0.0 - Bazelisk 1.24.1 - Bicep 0.31.92 - Buildah 1.22.3 -- CMake 3.31.1 -- CodeQL Action Bundle 2.19.3 +- CMake 3.31.2 +- CodeQL Action Bundle 2.19.4 - Docker Amazon ECR Credential Helper 0.9.0 - Docker Compose v2 2.27.1 -- Docker-Buildx 0.19.1 +- Docker-Buildx 0.19.2 - Docker Client 26.1.3 - Docker Server 26.1.3 - Fastlane 2.225.0 @@ -86,7 +87,7 @@ to accomplish this. - Git LFS 3.6.0 - Git-ftp 1.6.0 - Haveged 1.9.1 -- Heroku 9.5.0 +- Heroku 10.0.0 - HHVM (HipHop VM) 4.172.1 - jq 1.6 - Kind 0.25.0 @@ -109,24 +110,24 @@ to accomplish this. - Skopeo 1.5.0 - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 -- Terraform 1.10.0 +- Terraform 1.10.1 - yamllint 1.35.1 -- yq 4.44.5 +- yq 4.44.6 - zstd 1.5.6 ### CLI Tools - Alibaba Cloud CLI 3.0.174 -- AWS CLI 2.22.7 +- AWS CLI 2.22.13 - AWS CLI Session Manager Plugin 1.2.694.0 - AWS SAM CLI 1.131.0 - Azure CLI 2.67.0 - Azure CLI (azure-devops) 1.0.1 -- GitHub CLI 2.63.0 +- GitHub CLI 2.63.2 - Google Cloud CLI 502.0.0 -- Netlify CLI 17.37.2 +- Netlify CLI 17.38.0 - OpenShift CLI 4.15.19 -- ORAS CLI 1.2.0 -- Vercel CLI 39.1.2 +- ORAS CLI 1.2.1 +- Vercel CLI 39.2.0 ### Java | Version | Environment Variable | @@ -139,7 +140,7 @@ to accomplish this. ### PHP Tools - PHP: 7.4.33, 8.0.30, 8.1.31, 8.2.26, 8.3.14 - Composer 2.8.3 -- PHPUnit 8.5.40 +- PHPUnit 8.5.41 ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ``` @@ -157,19 +158,19 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustup 1.27.1 #### Packages -- Bindgen 0.70.1 +- Bindgen 0.71.1 - Cargo audit 0.21.0 - Cargo clippy 0.1.83 -- Cargo outdated 0.15.0 +- Cargo outdated 0.16.0 - Cbindgen 0.27.0 - Rustfmt 1.8.0 ### Browsers and Drivers -- Google Chrome 131.0.6778.85 -- ChromeDriver 131.0.6778.85 +- Google Chrome 131.0.6778.108 +- ChromeDriver 131.0.6778.87 - Chromium 131.0.6778.0 -- Microsoft Edge 131.0.2903.70 -- Microsoft Edge WebDriver 131.0.2903.52 +- Microsoft Edge 131.0.2903.86 +- Microsoft Edge WebDriver 131.0.2903.87 - Selenium server 4.27.0 - Mozilla Firefox 133.0 - Geckodriver 0.35.0 @@ -215,21 +216,21 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Go - 1.21.13 -- 1.22.9 -- 1.23.3 +- 1.22.10 +- 1.23.4 #### Node.js - 18.20.5 - 20.18.1 -- 22.11.0 +- 22.12.0 #### Python - 3.7.17 - 3.8.18 - 3.9.20 - 3.10.15 -- 3.11.10 -- 3.12.7 +- 3.11.11 +- 3.12.8 #### PyPy - 2.7.18 [PyPy 7.3.17] @@ -291,15 +292,15 @@ Use the following command as a part of your job to start the service: 'sudo syst | alpine:3.18 | sha256:2995c82e8e723d9a5c8585cb8e901d1c50e3c2759031027d3bff577449435157 | 2024-09-06 | | alpine:3.19 | sha256:7a85bf5dc56c949be827f84f9185161265c58f589bb8b2a6b6bb6d3076c1be21 | 2024-09-06 | | debian:10 | sha256:58ce6f1271ae1c8a2006ff7d3e54e9874d839f573d8009c20154ad0f2fb0a225 | 2024-06-13 | -| debian:11 | sha256:01559430c84e6bc864bed554345d1bfbfa94ac108ab68f39915cae34604b15c3 | 2024-11-11 | +| debian:11 | sha256:e91d1b0684e0f26a29c2353c52d4814f4d153e10b1faddf9fbde473ed71e2fcf | 2024-12-02 | | debian:9 | sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be | 2022-06-23 | -| moby/buildkit:latest | sha256:36c65534fcd9e8b2c38f7e549aeae3ed5b5389fe6de2f44996f313112ebf0e18 | 2024-11-26 | -| node:18 | sha256:83eb05700940a88b14f21fb31cc92e9571a34b1db1a5d8781b466fc26cbb1472 | 2024-11-15 | +| moby/buildkit:latest | sha256:58e6d150a3c5a4b92e99ea8df2cbe976ad6d2ae5beab39214e84fada05b059d5 | 2024-12-04 | +| node:18 | sha256:b57ae84fe7880a23b389f8260d726b784010ed470c2ee26d4e2cbdb955d25b12 | 2024-11-15 | | node:18-alpine | sha256:7e43a2d633d91e8655a6c0f45d2ed987aa4930f0792f6d9dd3bffc7496e44882 | 2024-11-15 | -| node:20 | sha256:f99a6bd6fb137cfc683e1ff60e7d67aa8d5fcf45a6a64c01c37b4f433a6238b6 | 2024-11-20 | +| node:20 | sha256:f4755c9039bdeec5c736b2e0dd5b47700d6393b65688b9e9f807ec12f54a8690 | 2024-11-20 | | node:20-alpine | sha256:b5b9467fe7b33aad47f1ec3f6e0646a658f85f05c18d4243024212a91f3b7554 | 2024-11-20 | -| node:22 | sha256:5c76d05034644fa8ecc9c2aa84e0a83cd981d0ef13af5455b87b9adf5b216561 | 2024-10-29 | -| node:22-alpine | sha256:b64ced2e7cd0a4816699fe308ce6e8a08ccba463c757c00c14cd372e3d2c763e | 2024-10-29 | +| node:22 | sha256:35a5dd72bcac4bce43266408b58a02be6ff0b6098ffa6f5435aeea980a8951d7 | 2024-12-03 | +| node:22-alpine | sha256:96cc8323e25c8cc6ddcb8b965e135cfd57846e8003ec0d7bcec16c5fd5f6d39f | 2024-12-03 | | ubuntu:20.04 | sha256:8e5c4f0285ecbb4ead070431d29b576a530d3166df73ec44affc1cd27555141b | 2024-10-11 | ### Installed apt packages @@ -379,6 +380,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | subversion | 1.13.0-3ubuntu0.2 | | sudo | 1.8.31-1ubuntu1.5 | | swig | 4.0.1-5build1 | +| systemd-coredump | 245.4-4ubuntu3.24 | | tar | 1.30+dfsg-7ubuntu0.20.04.4 | | telnet | 0.17-41.2build1 | | texinfo | 6.7.0.dfsg.2-5 | From 019a2c6edce5d8c65583a563b980e6f3c309fc30 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 13 Dec 2024 16:50:08 +0000 Subject: [PATCH 3337/3485] Updating readme file for win22 version 20241211.1.1 (#11165) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/windows/Windows2022-Readme.md | 82 ++++++++++++++-------------- 1 file changed, 42 insertions(+), 40 deletions(-) diff --git a/images/windows/Windows2022-Readme.md b/images/windows/Windows2022-Readme.md index 34157f263266..84010c0314ad 100644 --- a/images/windows/Windows2022-Readme.md +++ b/images/windows/Windows2022-Readme.md @@ -1,11 +1,13 @@ | Announcements | |-| -| [[Windows & Ubuntu] .NET 7.x will be removed from the images on December 6, 2024](https://github.com/actions/runner-images/issues/10894) | -| [[Windows & Ubuntu] Python 3.7.x will be removed from December 6 ,2024](https://github.com/actions/runner-images/issues/10893) | +| [[Windows] Breaking change : Docker Engine Version 26.* will be updated to Docker Engine Version 27.* from January 10,2025](https://github.com/actions/runner-images/issues/11104) | +| [[Windows & Ubuntu] Breaking change : Maven 3.8.* version will be updated to Maven 3.9.* from January 10,2025](https://github.com/actions/runner-images/issues/11093) | +| [[Windows & Ubuntu] .NET 7.x will be removed from the images on January 10,2025](https://github.com/actions/runner-images/issues/10894) | +| [[Windows & Ubuntu] Python 3.7.x will be removed from January 10 ,2025](https://github.com/actions/runner-images/issues/10893) | *** # Windows Server 2022 -- OS Version: 10.0.20348 Build 2849 -- Image Version: 20241201.2.0 +- OS Version: 10.0.20348 Build 2966 +- Image Version: 20241211.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -25,8 +27,8 @@ - Ruby 3.0.7p220 ### Package Management -- Chocolatey 2.4.0 -- Composer 2.8.3 +- Chocolatey 2.4.1 +- Composer 2.8.4 - Helm 3.16.2 - Miniconda 24.9.2 (pre-installed on the image but not added to PATH) - NPM 10.8.2 @@ -34,7 +36,7 @@ - pip 24.3.1 (python 3.9) - Pipx 1.7.1 - RubyGems 3.2.33 -- Vcpkg (build from commit cd124b84f) +- Vcpkg (build from commit b7601ed37) - Yarn 1.22.22 #### Environment variables @@ -53,12 +55,12 @@ - 7zip 24.09 - aria2 1.37.0 - azcopy 10.27.1 -- Bazel 7.4.1 -- Bazelisk 1.24.1 -- Bicep 0.31.92 +- Bazel 8.0.0 +- Bazelisk 1.25.0 +- Bicep 0.32.4 - Cabal 3.12.1.0 -- CMake 3.31.1 -- CodeQL Action Bundle 2.19.3 +- CMake 3.31.2 +- CodeQL Action Bundle 2.20.0 - Docker 26.1.3 - Docker Compose v2 2.27.1 - Docker-wincred 0.8.2 @@ -82,7 +84,7 @@ - R 4.4.2 - Service Fabric SDK 9.1.1436.9590 - Stack 3.1.1 -- Subversion (SVN) 1.14.4 +- Subversion (SVN) 1.14.5 - Swig 4.1.1 - VSWhere 3.1.7 - WinAppDriver 1.2.2009.02003 @@ -91,13 +93,13 @@ - zstd 1.5.6 ### CLI Tools -- Alibaba Cloud CLI 3.0.234 -- AWS CLI 2.22.7 +- Alibaba Cloud CLI 3.0.235 +- AWS CLI 2.22.13 - AWS SAM CLI 1.131.0 - AWS Session Manager CLI 1.2.694.0 - Azure CLI 2.67.0 - Azure DevOps CLI extension 1.0.1 -- GitHub CLI 2.63.0 +- GitHub CLI 2.63.2 ### Rust Tools - Cargo 1.83.0 @@ -106,19 +108,19 @@ - Rustup 1.27.1 #### Packages -- bindgen 0.70.1 +- bindgen 0.71.1 - cargo-audit 0.21.0 -- cargo-outdated 0.15.0 +- cargo-outdated 0.16.0 - cbindgen 0.27.0 - Clippy 0.1.83 - Rustfmt 1.8.0 ### Browsers and Drivers -- Google Chrome 131.0.6778.86 -- Chrome Driver 131.0.6778.85 -- Microsoft Edge 131.0.2903.70 -- Microsoft Edge Driver 131.0.2903.70 -- Mozilla Firefox 133.0 +- Google Chrome 131.0.6778.140 +- Chrome Driver 131.0.6778.108 +- Microsoft Edge 131.0.2903.86 +- Microsoft Edge Driver 131.0.2903.86 +- Mozilla Firefox 133.0.3 - Gecko Driver 0.35.0 - IE Driver 4.14.0.0 - Selenium server 4.27.0 @@ -161,14 +163,14 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Go - 1.20.14 - 1.21.13 -- 1.22.9 -- 1.23.3 +- 1.22.10 +- 1.23.4 #### Node.js - 16.20.2 - 18.20.5 - 20.18.1 -- 22.11.0 +- 22.12.0 #### Python - 3.7.9 @@ -176,7 +178,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 3.9.13 - 3.10.11 - 3.11.9 -- 3.12.7 +- 3.12.8 #### PyPy - 2.7.18 [PyPy 7.3.17] @@ -225,7 +227,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Visual Studio Enterprise 2022 | Name | Version | Path | | ----------------------------- | --------------- | -------------------------------------------------------- | -| Visual Studio Enterprise 2022 | 17.12.35521.163 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | +| Visual Studio Enterprise 2022 | 17.12.35527.113 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | #### Workloads, components and extensions | Package | Version | @@ -251,7 +253,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Component.Unreal | 17.12.35410.122 | | Component.Unreal.Android | 17.12.35410.122 | | Component.Unreal.Ide | 17.12.35410.122 | -| Component.VisualStudio.GitHub.Copilot | 17.12.35519.222 | +| Component.VisualStudio.GitHub.Copilot | 17.12.35527.66 | | Component.VSInstallerProjects2022 | 2.0.1 | | Component.WixToolset.VisualStudioExtension.Dev17 | 1.0.0.22 | | Component.WixToolset.VisualStudioExtension.Schemas3 | 1.0.0.22 | @@ -299,8 +301,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.NetCore.Component.DevelopmentTools | 17.12.35410.122 | | Microsoft.NetCore.Component.Runtime.6.0 | 17.12.35504.99 | | Microsoft.NetCore.Component.Runtime.8.0 | 17.12.35504.99 | -| Microsoft.NetCore.Component.Runtime.9.0 | 17.12.35504.99 | -| Microsoft.NetCore.Component.SDK | 17.12.35504.99 | +| Microsoft.NetCore.Component.Runtime.9.0 | 17.12.35527.66 | +| Microsoft.NetCore.Component.SDK | 17.12.35527.66 | | Microsoft.NetCore.Component.Web | 17.12.35410.122 | | Microsoft.VisualStudio.Component.AppInsights.Tools | 17.12.35410.122 | | Microsoft.VisualStudio.Component.AspNet | 17.12.35410.122 | @@ -334,7 +336,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Component.Graphics.Tools | 17.12.35410.122 | | Microsoft.VisualStudio.Component.HLSL | 17.12.35410.122 | | Microsoft.VisualStudio.Component.IISExpress | 17.12.35410.122 | -| Microsoft.VisualStudio.Component.IntelliCode | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.IntelliCode | 17.12.35527.102 | | Microsoft.VisualStudio.Component.IntelliTrace.FrontEnd | 17.12.35410.122 | | Microsoft.VisualStudio.Component.JavaScript.Diagnostics | 17.12.35410.122 | | Microsoft.VisualStudio.Component.JavaScript.TypeScript | 17.12.35410.122 | @@ -379,7 +381,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Component.VC.CLI.Support | 17.12.35410.122 | | Microsoft.VisualStudio.Component.VC.CMake.Project | 17.12.35410.122 | | Microsoft.VisualStudio.Component.VC.CoreIde | 17.12.35410.122 | -| Microsoft.VisualStudio.Component.VC.DiagnosticTools | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.VC.DiagnosticTools | 17.12.35527.67 | | Microsoft.VisualStudio.Component.VC.Llvm.Clang | 17.12.35410.122 | | Microsoft.VisualStudio.Component.VC.Llvm.ClangToolset | 17.12.35410.122 | | Microsoft.VisualStudio.Component.VC.MFC.ARM | 17.12.35410.122 | @@ -492,7 +494,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 10.0.26100.0 ### .NET Core Tools -- .NET Core SDK: 6.0.136, 6.0.203, 6.0.321, 6.0.428, 7.0.120, 7.0.203, 7.0.317, 7.0.410, 8.0.111, 8.0.206, 8.0.307, 8.0.404, 9.0.100 +- .NET Core SDK: 6.0.136, 6.0.203, 6.0.321, 6.0.428, 7.0.120, 7.0.203, 7.0.317, 7.0.410, 8.0.111, 8.0.206, 8.0.307, 8.0.404, 9.0.101 - .NET Framework: 4.8, 4.8.1 - Microsoft.AspNetCore.App: 6.0.5, 6.0.26, 6.0.35, 6.0.36, 7.0.5, 7.0.20, 8.0.6, 8.0.11, 9.0.0 - Microsoft.NETCore.App: 6.0.5, 6.0.26, 6.0.35, 6.0.36, 7.0.5, 7.0.20, 8.0.6, 8.0.11, 9.0.0 @@ -508,7 +510,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - AzureRM: 2.1.0 (Default), 6.13.1 - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.708 +- AWSPowershell: 4.1.715 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.10 - Microsoft.Graph: 2.25.0 @@ -551,9 +553,9 @@ All other versions are saved but not installed. ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2022 | sha256:47cb8e127d15d489c8f8344b59aa46091ac155da400a204a9094a63dc6177f9f | 2024-11-12 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2022 | sha256:6ce38ea0a094cefdd0ef89b54c1492490c64dac1e34698ce3c15f9ccd53d8498 | 2024-11-12 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:6825e3532d36741b62ea87bd7fd984cf4eea0be568b6669f52cc211126e67f52 | 2024-11-12 | -| mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:be37c9e8bf388c4e3ef27b4a2592b94adab551e231644ce3c9d4d3dc0a50af41 | 2024-11-02 | -| mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:87837eac4a78e1c67a6f6db1333a57a1a39207549c689905bd69cce40d063d5d | 2024-11-02 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2022 | sha256:c49042631c866daf7ce7337cff2e8c881c8b15e3be6abfed03e0b22b685d4b49 | 2024-12-10 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2022 | sha256:81845776459f460d3e50bc4e3fcb0db08f9f36722f5314c4281da3951cbb2fd4 | 2024-12-10 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:5dfdecd584d2f7c6852e4e807b6bb308da8f8350a0131ddef3cb0a0e6237523c | 2024-12-10 | +| mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:eb59dfa1056e41b65cb12b679280e29f10d64e2b569b877710e227a77fef223f | 2024-12-05 | +| mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:cd409960f9b87fcc02e1c236fea3852e1323ffb16d9522bf693330ebf878f5c0 | 2024-12-05 | From 7cd7c6a18af1ee77e597d6c3895d61f42a223e37 Mon Sep 17 00:00:00 2001 From: Joost Voskuil <joost@foxhole.nl> Date: Fri, 13 Dec 2024 20:19:19 +0100 Subject: [PATCH 3338/3485] Add Microsoft.Net.Component.4.7.2.SDK to Windows toolset 2022 (#11118) --- images/windows/toolsets/toolset-2022.json | 1 + 1 file changed, 1 insertion(+) diff --git a/images/windows/toolsets/toolset-2022.json b/images/windows/toolsets/toolset-2022.json index 8052ea7066ae..46c9261bc1e7 100644 --- a/images/windows/toolsets/toolset-2022.json +++ b/images/windows/toolsets/toolset-2022.json @@ -187,6 +187,7 @@ "Component.Unreal.Android", "Component.Xamarin", "Microsoft.Component.VC.Runtime.UCRTSDK", + "Microsoft.Net.Component.4.7.2.SDK", "Microsoft.Net.Component.4.7.TargetingPack", "Microsoft.Net.Component.4.7.2.TargetingPack", "Microsoft.Net.Component.4.8.1.SDK", From d0a65206e541446b89065eeaef38a777c3cb38c3 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 13 Dec 2024 22:46:09 +0000 Subject: [PATCH 3339/3485] Updating readme file for macos-13 version 20241211.456 (#11155) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-13-Readme.md | 53 ++++++++++++++++----------------- 1 file changed, 26 insertions(+), 27 deletions(-) diff --git a/images/macos/macos-13-Readme.md b/images/macos/macos-13-Readme.md index 037244a2cd42..7e77c40fcba6 100644 --- a/images/macos/macos-13-Readme.md +++ b/images/macos/macos-13-Readme.md @@ -1,13 +1,12 @@ | Announcements | |-| -| [[macOS] OpenSSL 1.1 will be removed and OpenSSL 3 will be the default for all macOS images once [date not determined]](https://github.com/actions/runner-images/issues/10817) | -| [[macOS] The macOS 12 Actions runner image will begin deprecation on 10/7/24 and will be fully unsupported by 12/3/24 for GitHub and ADO](https://github.com/actions/runner-images/issues/10721) | +| [[macOS] The macOS 12 Actions runner image will begin deprecation on 10/7/24 and will be fully unsupported by 12/3/24 for GitHub and by 01/13/25 for ADO](https://github.com/actions/runner-images/issues/10721) | | [macOS 15 (Sequoia) is now available as a public beta in GitHub Actions](https://github.com/actions/runner-images/issues/10686) | *** # macOS 13 - OS Version: macOS 13.7.1 (22H221) - Kernel Version: Darwin 22.6.0 -- Image Version: 20241202.423 +- Image Version: 20241211.456 ## Installed Software @@ -27,7 +26,7 @@ - Node.js 20.18.1 - Perl 5.40.0 - PHP 8.4.1 -- Python3 3.13.0 +- Python3 3.13.1 - Ruby 3.0.7p220 ### Package Management @@ -35,13 +34,13 @@ - Carthage 0.40.0 - CocoaPods 1.16.2 - Composer 2.8.3 -- Homebrew 4.4.8 +- Homebrew 4.4.11 - NPM 10.8.2 - NuGet 6.3.1.1 - Pip3 24.3.1 (python 3.13) - Pipx 1.7.1 - RubyGems 3.5.23 -- Vcpkg 2024 (build from commit d2b615967) +- Vcpkg 2024 (build from commit b7601ed37) - Yarn 1.22.22 ### Project Management @@ -53,13 +52,13 @@ - 7-Zip 17.05 - aria2 1.37.0 - azcopy 10.27.1 -- bazel 7.4.1 -- bazelisk 1.24.1 +- bazel 8.0.0 +- bazelisk 1.25.0 - bsdtar 3.5.3 - available by 'tar' alias - Curl 8.11.0 - Git 2.47.1 - Git LFS 3.6.0 -- GitHub CLI 2.63.0 +- GitHub CLI 2.63.2 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.25.0 - gpg (GnuPG) 2.4.6 @@ -68,21 +67,21 @@ - Packer 1.11.2 - pkgconf 2.3.0 - Unxip 3.1 -- yq 4.44.5 +- yq 4.44.6 - zstd 1.5.6 ### Tools -- AWS CLI 2.22.8 +- AWS CLI 2.22.14 - AWS SAM CLI 1.131.0 - AWS Session Manager CLI 1.2.694.0 - Azure CLI 2.67.0 - Azure CLI (azure-devops) 1.0.1 -- Bicep CLI 0.31.92 -- Cmake 3.31.1 -- CodeQL Action Bundle 2.19.3 -- Fastlane 2.225.0 +- Bicep CLI 0.32.4 +- Cmake 3.31.2 +- CodeQL Action Bundle 2.20.0 +- Fastlane 2.226.0 - SwiftFormat 0.55.3 -- Xcbeautify 2.15.0 +- Xcbeautify 2.16.0 - Xcode Command Line Tools 14.3.1.0.1.1683849156 - Xcodes 1.6.0 @@ -92,11 +91,11 @@ ### Browsers - Safari 18.1.1 (18619.2.8.111.7) - SafariDriver 18.1.1 (18619.2.8.111.7) -- Google Chrome 131.0.6778.86 -- Google Chrome for Testing 131.0.6778.85 -- ChromeDriver 131.0.6778.85 -- Microsoft Edge 131.0.2903.70 -- Microsoft Edge WebDriver 131.0.2903.72 +- Google Chrome 131.0.6778.140 +- Google Chrome for Testing 131.0.6778.108 +- ChromeDriver 131.0.6778.108 +- Microsoft Edge 131.0.2903.86 +- Microsoft Edge WebDriver 131.0.2903.87 - Mozilla Firefox 133.0 - geckodriver 0.35.0 - Selenium server 4.27.0 @@ -136,18 +135,18 @@ - 3.9.20 - 3.10.15 - 3.11.9 -- 3.12.7 -- 3.13.0 +- 3.12.8 +- 3.13.1 #### Node.js - 18.20.5 - 20.18.1 -- 22.11.0 +- 22.12.0 #### Go - 1.21.13 -- 1.22.9 -- 1.23.3 +- 1.22.10 +- 1.23.4 ### Rust Tools - Cargo 1.83.0 @@ -214,8 +213,8 @@ | Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | | visionOS 1.0 | xros1.0 | 15.2 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | -| Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | +| Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | DriverKit 22.1 | driverkit22.1 | 14.1 | | DriverKit 22.2 | driverkit22.2 | 14.2 | | DriverKit 22.4 | driverkit22.4 | 14.3.1 | From 6b5e85899d5479d8a55c59273108788898fb93b6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 13 Dec 2024 22:53:14 +0000 Subject: [PATCH 3340/3485] Updating readme file for macos-14 version 20241211.477 (#11154) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-14-Readme.md | 51 ++++++++++++++++----------------- 1 file changed, 25 insertions(+), 26 deletions(-) diff --git a/images/macos/macos-14-Readme.md b/images/macos/macos-14-Readme.md index 2cc18f3fe934..16a37aaba1c6 100644 --- a/images/macos/macos-14-Readme.md +++ b/images/macos/macos-14-Readme.md @@ -1,13 +1,12 @@ | Announcements | |-| -| [[macOS] OpenSSL 1.1 will be removed and OpenSSL 3 will be the default for all macOS images once [date not determined]](https://github.com/actions/runner-images/issues/10817) | -| [[macOS] The macOS 12 Actions runner image will begin deprecation on 10/7/24 and will be fully unsupported by 12/3/24 for GitHub and ADO](https://github.com/actions/runner-images/issues/10721) | +| [[macOS] The macOS 12 Actions runner image will begin deprecation on 10/7/24 and will be fully unsupported by 12/3/24 for GitHub and by 01/13/25 for ADO](https://github.com/actions/runner-images/issues/10721) | | [macOS 15 (Sequoia) is now available as a public beta in GitHub Actions](https://github.com/actions/runner-images/issues/10686) | *** # macOS 14 - OS Version: macOS 14.7.1 (23H222) - Kernel Version: Darwin 23.6.0 -- Image Version: 20241202.444 +- Image Version: 20241211.477 ## Installed Software @@ -27,7 +26,7 @@ - Node.js 20.18.1 - Perl 5.40.0 - PHP 8.4.1 -- Python3 3.13.0 +- Python3 3.13.1 - Ruby 3.0.7p220 ### Package Management @@ -35,7 +34,7 @@ - Carthage 0.40.0 - CocoaPods 1.16.2 - Composer 2.8.3 -- Homebrew 4.4.8 +- Homebrew 4.4.11 - NPM 10.8.2 - NuGet 6.3.1.1 - Pip3 24.3.1 (python 3.13) @@ -52,13 +51,13 @@ - 7-Zip 17.05 - aria2 1.37.0 - azcopy 10.27.1 -- bazel 7.4.1 -- bazelisk 1.24.1 +- bazel 8.0.0 +- bazelisk 1.25.0 - bsdtar 3.5.3 - available by 'tar' alias - Curl 8.11.0 - Git 2.47.1 - Git LFS 3.6.0 -- GitHub CLI 2.63.0 +- GitHub CLI 2.63.2 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.25.0 - gpg (GnuPG) 2.4.6 @@ -67,21 +66,21 @@ - Packer 1.11.2 - pkgconf 2.3.0 - Unxip 3.1 -- yq 4.44.5 +- yq 4.44.6 - zstd 1.5.6 ### Tools -- AWS CLI 2.22.8 +- AWS CLI 2.22.14 - AWS SAM CLI 1.131.0 - AWS Session Manager CLI 1.2.694.0 - Azure CLI 2.67.0 - Azure CLI (azure-devops) 1.0.1 -- Bicep CLI 0.31.92 -- Cmake 3.31.1 -- CodeQL Action Bundle 2.19.3 -- Fastlane 2.225.0 +- Bicep CLI 0.32.4 +- Cmake 3.31.2 +- CodeQL Action Bundle 2.20.0 +- Fastlane 2.226.0 - SwiftFormat 0.55.3 -- Xcbeautify 2.15.0 +- Xcbeautify 2.16.0 - Xcode Command Line Tools 16.1.0.0.1.1729049160 - Xcodes 1.6.0 @@ -91,11 +90,11 @@ ### Browsers - Safari 18.1.1 (19619.2.8.111.7) - SafariDriver 18.1.1 (19619.2.8.111.7) -- Google Chrome 131.0.6778.86 -- Google Chrome for Testing 131.0.6778.85 -- ChromeDriver 131.0.6778.85 -- Microsoft Edge 131.0.2903.70 -- Microsoft Edge WebDriver 131.0.2903.72 +- Google Chrome 131.0.6778.140 +- Google Chrome for Testing 131.0.6778.108 +- ChromeDriver 131.0.6778.108 +- Microsoft Edge 131.0.2903.86 +- Microsoft Edge WebDriver 131.0.2903.87 - Mozilla Firefox 133.0 - geckodriver 0.35.0 - Selenium server 4.27.0 @@ -127,18 +126,18 @@ - 3.9.20 - 3.10.15 - 3.11.9 -- 3.12.7 -- 3.13.0 +- 3.12.8 +- 3.13.1 #### Node.js - 18.20.5 - 20.18.1 -- 22.11.0 +- 22.12.0 #### Go - 1.21.13 -- 1.22.9 -- 1.23.3 +- 1.22.10 +- 1.23.4 ### Rust Tools - Cargo 1.83.0 @@ -222,8 +221,8 @@ | Simulator - visionOS 1.2 | xrsimulator1.2 | 15.4 | | Simulator - visionOS 2.0 | xrsimulator2.0 | 16.0 | | visionOS 2.0 | xros2.0 | 16.0 | -| Simulator - visionOS 2.1 | xrsimulator2.1 | 16.1 | | visionOS 2.1 | xros2.1 | 16.1 | +| Simulator - visionOS 2.1 | xrsimulator2.1 | 16.1 | | DriverKit 23.0 | driverkit23.0 | 15.0.1 | | DriverKit 23.2 | driverkit23.2 | 15.1, 15.2 | | DriverKit 23.4 | driverkit23.4 | 15.3 | From 4ef6e91929f8f6f10ef4a58b47e6edce0355f766 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 13 Dec 2024 23:46:11 +0000 Subject: [PATCH 3341/3485] Updating readme file for macos-14-arm64 version 20241211.616 (#11160) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-14-arm64-Readme.md | 49 +++++++++++++-------------- 1 file changed, 24 insertions(+), 25 deletions(-) diff --git a/images/macos/macos-14-arm64-Readme.md b/images/macos/macos-14-arm64-Readme.md index aee85dd93e9f..e08598270706 100644 --- a/images/macos/macos-14-arm64-Readme.md +++ b/images/macos/macos-14-arm64-Readme.md @@ -1,13 +1,12 @@ | Announcements | |-| -| [[macOS] OpenSSL 1.1 will be removed and OpenSSL 3 will be the default for all macOS images once [date not determined]](https://github.com/actions/runner-images/issues/10817) | -| [[macOS] The macOS 12 Actions runner image will begin deprecation on 10/7/24 and will be fully unsupported by 12/3/24 for GitHub and ADO](https://github.com/actions/runner-images/issues/10721) | +| [[macOS] The macOS 12 Actions runner image will begin deprecation on 10/7/24 and will be fully unsupported by 12/3/24 for GitHub and by 01/13/25 for ADO](https://github.com/actions/runner-images/issues/10721) | | [macOS 15 (Sequoia) is now available as a public beta in GitHub Actions](https://github.com/actions/runner-images/issues/10686) | *** # macOS 14 - OS Version: macOS 14.7.1 (23H222) - Kernel Version: Darwin 23.6.0 -- Image Version: 20241202.580 +- Image Version: 20241211.616 ## Installed Software @@ -26,17 +25,17 @@ - Mono 6.12.0.188 - Node.js 20.18.1 - Perl 5.40.0 -- Python3 3.13.0 +- Python3 3.13.1 - Ruby 3.0.7p220 ### Package Management - Bundler 2.5.23 - Carthage 0.40.0 - CocoaPods 1.16.2 -- Homebrew 4.4.8 +- Homebrew 4.4.11 - NPM 10.8.2 - NuGet 6.3.1.1 -- Pip3 24.2 (python 3.13) +- Pip3 24.3.1 (python 3.13) - Pipx 1.7.1 - RubyGems 3.5.23 - Yarn 1.22.22 @@ -50,13 +49,13 @@ - 7-Zip 17.05 - aria2 1.37.0 - azcopy 10.27.1 -- bazel 7.4.1 -- bazelisk 1.24.1 +- bazel 8.0.0 +- bazelisk 1.25.0 - bsdtar 3.5.3 - available by 'tar' alias - Curl 8.7.1 - Git 2.47.1 - Git LFS 3.6.0 -- GitHub CLI 2.63.0 +- GitHub CLI 2.63.2 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.25.0 - gpg (GnuPG) 2.4.6 @@ -65,21 +64,21 @@ - Packer 1.11.2 - pkgconf 2.3.0 - Unxip 3.1 -- yq 4.44.5 +- yq 4.44.6 - zstd 1.5.6 ### Tools -- AWS CLI 2.22.8 +- AWS CLI 2.22.14 - AWS SAM CLI 1.131.0 - AWS Session Manager CLI 1.2.694.0 - Azure CLI 2.67.0 - Azure CLI (azure-devops) 1.0.1 -- Bicep CLI 0.31.92 -- Cmake 3.31.1 -- CodeQL Action Bundle 2.19.3 -- Fastlane 2.225.0 +- Bicep CLI 0.32.4 +- Cmake 3.31.2 +- CodeQL Action Bundle 2.20.0 +- Fastlane 2.226.0 - SwiftFormat 0.55.3 -- Xcbeautify 2.15.0 +- Xcbeautify 2.16.0 - Xcode Command Line Tools 16.1.0.0.1.1729049160 - Xcodes 1.6.0 @@ -88,9 +87,9 @@ ### Browsers - Safari 18.1.1 (19619.2.8.111.7) - SafariDriver 18.1.1 (19619.2.8.111.7) -- Google Chrome 131.0.6778.86 -- Google Chrome for Testing 131.0.6778.85 -- ChromeDriver 131.0.6778.85 +- Google Chrome 131.0.6778.140 +- Google Chrome for Testing 131.0.6778.108 +- ChromeDriver 131.0.6778.108 - Selenium server 4.27.0 #### Environment variables @@ -117,18 +116,18 @@ #### Python - 3.11.9 -- 3.12.7 -- 3.13.0 +- 3.12.8 +- 3.13.1 #### Node.js - 18.20.5 - 20.18.1 -- 22.11.0 +- 22.12.0 #### Go - 1.21.13 -- 1.22.9 -- 1.23.3 +- 1.22.10 +- 1.23.4 ### Rust Tools - Cargo 1.83.0 @@ -206,8 +205,8 @@ | Simulator - watchOS 11.1 | watchsimulator11.1 | 16.1 | | visionOS 1.0 | xros1.0 | 15.2 | | Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | -| visionOS 1.1 | xros1.1 | 15.3 | | Simulator - visionOS 1.1 | xrsimulator1.1 | 15.3 | +| visionOS 1.1 | xros1.1 | 15.3 | | Simulator - visionOS 1.2 | xrsimulator1.2 | 15.4 | | visionOS 1.2 | xros1.2 | 15.4 | | Simulator - visionOS 2.0 | xrsimulator2.0 | 16.0 | From b14867a5eb2d3834e1413c60ed715abe293a91a0 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 13 Dec 2024 23:56:52 +0000 Subject: [PATCH 3342/3485] Updating readme file for macos-13-arm64 version 20241211.503 (#11153) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-13-arm64-Readme.md | 49 +++++++++++++-------------- 1 file changed, 24 insertions(+), 25 deletions(-) diff --git a/images/macos/macos-13-arm64-Readme.md b/images/macos/macos-13-arm64-Readme.md index cd02a498f3cc..a8409bda8f21 100644 --- a/images/macos/macos-13-arm64-Readme.md +++ b/images/macos/macos-13-arm64-Readme.md @@ -1,13 +1,12 @@ | Announcements | |-| -| [[macOS] OpenSSL 1.1 will be removed and OpenSSL 3 will be the default for all macOS images once [date not determined]](https://github.com/actions/runner-images/issues/10817) | -| [[macOS] The macOS 12 Actions runner image will begin deprecation on 10/7/24 and will be fully unsupported by 12/3/24 for GitHub and ADO](https://github.com/actions/runner-images/issues/10721) | +| [[macOS] The macOS 12 Actions runner image will begin deprecation on 10/7/24 and will be fully unsupported by 12/3/24 for GitHub and by 01/13/25 for ADO](https://github.com/actions/runner-images/issues/10721) | | [macOS 15 (Sequoia) is now available as a public beta in GitHub Actions](https://github.com/actions/runner-images/issues/10686) | *** # macOS 13 - OS Version: macOS 13.7.1 (22H221) - Kernel Version: Darwin 22.6.0 -- Image Version: 20241202.469 +- Image Version: 20241211.503 ## Installed Software @@ -26,17 +25,17 @@ - Mono 6.12.0.188 - Node.js 20.18.1 - Perl 5.40.0 -- Python3 3.13.0 +- Python3 3.13.1 - Ruby 3.0.7p220 ### Package Management - Bundler 2.5.23 - Carthage 0.40.0 - CocoaPods 1.16.2 -- Homebrew 4.4.8 +- Homebrew 4.4.11 - NPM 10.8.2 - NuGet 6.3.1.1 -- Pip3 24.2 (python 3.13) +- Pip3 24.3.1 (python 3.13) - Pipx 1.7.1 - RubyGems 3.5.23 - Yarn 1.22.22 @@ -50,13 +49,13 @@ - 7-Zip 17.05 - aria2 1.37.0 - azcopy 10.27.1 -- bazel 7.4.1 -- bazelisk 1.24.1 +- bazel 8.0.0 +- bazelisk 1.25.0 - bsdtar 3.5.3 - available by 'tar' alias - Curl 8.7.1 - Git 2.47.1 - Git LFS 3.6.0 -- GitHub CLI 2.63.0 +- GitHub CLI 2.63.2 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.25.0 - gpg (GnuPG) 2.4.6 @@ -65,21 +64,21 @@ - Packer 1.11.2 - pkgconf 2.3.0 - Unxip 3.1 -- yq 4.44.5 +- yq 4.44.6 - zstd 1.5.6 ### Tools -- AWS CLI 2.22.8 +- AWS CLI 2.22.14 - AWS SAM CLI 1.131.0 - AWS Session Manager CLI 1.2.694.0 - Azure CLI 2.67.0 - Azure CLI (azure-devops) 1.0.1 -- Bicep CLI 0.31.92 -- Cmake 3.31.1 -- CodeQL Action Bundle 2.19.3 -- Fastlane 2.225.0 +- Bicep CLI 0.32.4 +- Cmake 3.31.2 +- CodeQL Action Bundle 2.20.0 +- Fastlane 2.226.0 - SwiftFormat 0.55.3 -- Xcbeautify 2.15.0 +- Xcbeautify 2.16.0 - Xcode Command Line Tools 14.3.1.0.1.1683849156 - Xcodes 1.6.0 @@ -88,9 +87,9 @@ ### Browsers - Safari 18.1.1 (18619.2.8.111.7) - SafariDriver 18.1.1 (18619.2.8.111.7) -- Google Chrome 131.0.6778.86 -- Google Chrome for Testing 131.0.6778.85 -- ChromeDriver 131.0.6778.85 +- Google Chrome 131.0.6778.140 +- Google Chrome for Testing 131.0.6778.108 +- ChromeDriver 131.0.6778.108 - Selenium server 4.27.0 #### Environment variables @@ -117,18 +116,18 @@ #### Python - 3.11.9 -- 3.12.7 -- 3.13.0 +- 3.12.8 +- 3.13.1 #### Node.js - 18.20.5 - 20.18.1 -- 22.11.0 +- 22.12.0 #### Go - 1.21.13 -- 1.22.9 -- 1.23.3 +- 1.22.10 +- 1.23.4 ### Rust Tools - Cargo 1.83.0 @@ -192,8 +191,8 @@ | Simulator - watchOS 9.4 | watchsimulator9.4 | 14.3.1 | | Simulator - watchOS 10.0 | watchsimulator10.0 | 15.0.1 | | Simulator - watchOS 10.2 | watchsimulator10.2 | 15.1, 15.2 | -| Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | | visionOS 1.0 | xros1.0 | 15.2 | +| Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | From 225dce0cbd1bfd9643a714763f7198609a47c7ea Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 14 Dec 2024 19:35:45 -0600 Subject: [PATCH 3343/3485] Updating readme file for macos-15 version 20241211.462 (#11150) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-15-Readme.md | 117 ++++++++++++++++---------------- 1 file changed, 58 insertions(+), 59 deletions(-) diff --git a/images/macos/macos-15-Readme.md b/images/macos/macos-15-Readme.md index fd2d3e2bdf50..15c498d94fba 100644 --- a/images/macos/macos-15-Readme.md +++ b/images/macos/macos-15-Readme.md @@ -1,13 +1,12 @@ | Announcements | |-| -| [[macOS] OpenSSL 1.1 will be removed and OpenSSL 3 will be the default for all macOS images once [date not determined]](https://github.com/actions/runner-images/issues/10817) | -| [[macOS] The macOS 12 Actions runner image will begin deprecation on 10/7/24 and will be fully unsupported by 12/3/24 for GitHub and ADO](https://github.com/actions/runner-images/issues/10721) | +| [[macOS] The macOS 12 Actions runner image will begin deprecation on 10/7/24 and will be fully unsupported by 12/3/24 for GitHub and by 01/13/25 for ADO](https://github.com/actions/runner-images/issues/10721) | | [macOS 15 (Sequoia) is now available as a public beta in GitHub Actions](https://github.com/actions/runner-images/issues/10686) | *** # macOS 15 - OS Version: macOS 15.1.1 (24B91) - Kernel Version: Darwin 24.1.0 -- Image Version: 20241202.430 +- Image Version: 20241211.462 ## Installed Software @@ -23,10 +22,10 @@ - GNU Fortran 13 (Homebrew GCC 13.3.0) - available by `gfortran-13` alias - GNU Fortran 14 (Homebrew GCC 14.2.0_1) - available by `gfortran-14` alias - Kotlin 2.1.0-release-394 -- Node.js 22.11.0 +- Node.js 22.12.0 - Perl 5.40.0 - PHP 8.4.1 -- Python3 3.13.0 +- Python3 3.13.1 - Ruby 3.3.6 ### Package Management @@ -34,7 +33,7 @@ - Carthage 0.40.0 - CocoaPods 1.16.2 - Composer 2.8.3 -- Homebrew 4.4.8 +- Homebrew 4.4.11 - NPM 10.9.0 - Pip3 24.3.1 (python 3.13) - Pipx 1.7.1 @@ -50,13 +49,13 @@ - 7-Zip 17.05 - aria2 1.37.0 - azcopy 10.27.1 -- bazel 7.4.1 -- bazelisk 1.24.1 +- bazel 8.0.0 +- bazelisk 1.25.0 - bsdtar 3.5.3 - available by 'tar' alias - Curl 8.11.0 - Git 2.47.1 - Git LFS 3.6.0 -- GitHub CLI 2.63.0 +- GitHub CLI 2.63.2 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.25.0 - gpg (GnuPG) 2.4.6 @@ -65,21 +64,21 @@ - Packer 1.11.2 - pkgconf 2.3.0 - Unxip 3.1 -- yq 4.44.5 +- yq 4.44.6 - zstd 1.5.6 ### Tools -- AWS CLI 2.22.8 +- AWS CLI 2.22.14 - AWS SAM CLI 1.131.0 - AWS Session Manager CLI 1.2.694.0 - Azure CLI 2.67.0 - Azure CLI (azure-devops) 1.0.1 -- Bicep CLI 0.31.92 -- Cmake 3.31.1 -- CodeQL Action Bundle 2.19.3 -- Fastlane 2.225.0 +- Bicep CLI 0.32.4 +- Cmake 3.31.2 +- CodeQL Action Bundle 2.20.0 +- Fastlane 2.226.0 - SwiftFormat 0.55.3 -- Xcbeautify 2.15.0 +- Xcbeautify 2.16.0 - Xcode Command Line Tools 16.1.0.0.1.1729049160 - Xcodes 1.6.0 @@ -89,11 +88,11 @@ ### Browsers - Safari 18.1.1 (20619.2.8.11.12) - SafariDriver 18.1.1 (20619.2.8.11.12) -- Google Chrome 131.0.6778.86 -- Google Chrome for Testing 131.0.6778.85 -- ChromeDriver 131.0.6778.85 -- Microsoft Edge 131.0.2903.70 -- Microsoft Edge WebDriver 131.0.2903.72 +- Google Chrome 131.0.6778.140 +- Google Chrome for Testing 131.0.6778.108 +- ChromeDriver 131.0.6778.108 +- Microsoft Edge 131.0.2903.86 +- Microsoft Edge WebDriver 131.0.2903.87 - Mozilla Firefox 133.0 - geckodriver 0.35.0 - Selenium server 4.27.0 @@ -123,18 +122,18 @@ - 3.9.20 - 3.10.15 - 3.11.9 -- 3.12.7 -- 3.13.0 +- 3.12.8 +- 3.13.1 #### Node.js - 18.20.5 - 20.18.1 -- 22.11.0 +- 22.12.0 #### Go - 1.21.13 -- 1.22.9 -- 1.23.3 +- 1.22.10 +- 1.23.4 ### Rust Tools - Cargo 1.83.0 @@ -155,12 +154,12 @@ - PSScriptAnalyzer: 1.23.0 ### Xcode -| Version | Build | Path | Symlinks | -| -------------- | -------- | ----------------------------------- | ----------------------------------------------------------------------------------------- | -| 16.2 (beta) | 16C5023f | /Applications/Xcode_16.2_beta_3.app | /Applications/Xcode_16.2.0.app<br>/Applications/Xcode_16.2.app | -| 16.1 | 16B40 | /Applications/Xcode_16.1.app | /Applications/Xcode_16.1.0.app | -| 16.0 (default) | 16A242d | /Applications/Xcode_16.app | /Applications/Xcode_16.0.0.app<br>/Applications/Xcode_16.0.app<br>/Applications/Xcode.app | -| 15.4 | 15F31d | /Applications/Xcode_15.4.app | /Applications/Xcode_15.4.0.app | +| Version | Build | Path | Symlinks | +| -------------- | -------- | ---------------------------------------------- | ----------------------------------------------------------------------------------------- | +| 16.2 | 16C5031c | /Applications/Xcode_16.2_Release_Candidate.app | /Applications/Xcode_16.2.0.app<br>/Applications/Xcode_16.2.app | +| 16.1 | 16B40 | /Applications/Xcode_16.1.app | /Applications/Xcode_16.1.0.app | +| 16.0 (default) | 16A242d | /Applications/Xcode_16.app | /Applications/Xcode_16.0.0.app<br>/Applications/Xcode_16.0.app<br>/Applications/Xcode.app | +| 15.4 | 15F31d | /Applications/Xcode_15.4.app | /Applications/Xcode_15.4.0.app | #### Installed SDKs | SDK | SDK Name | Xcode Version | @@ -195,8 +194,8 @@ | Simulator - watchOS 11.2 | watchsimulator11.2 | 16.2 | | visionOS 1.2 | xros1.2 | 15.4 | | Simulator - visionOS 1.2 | xrsimulator1.2 | 15.4 | -| visionOS 2.0 | xros2.0 | 16.0 | | Simulator - visionOS 2.0 | xrsimulator2.0 | 16.0 | +| visionOS 2.0 | xros2.0 | 16.0 | | Simulator - visionOS 2.1 | xrsimulator2.1 | 16.1 | | visionOS 2.1 | xros2.1 | 16.1 | | Simulator - visionOS 2.2 | xrsimulator2.2 | 16.2 | @@ -207,34 +206,34 @@ | DriverKit 24.2 | driverkit24.2 | 16.2 | #### Installed Simulators -| OS | Simulators | -| ------------ | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| iOS 17.5 | iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | -| iOS 18.0 | iPhone 16<br>iPhone 16 Plus<br>iPhone 16 Pro<br>iPhone 16 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | -| iOS 18.1 | iPhone 16<br>iPhone 16 Plus<br>iPhone 16 Pro<br>iPhone 16 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (A17 Pro)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | -| iOS 18.2 | iPhone 16<br>iPhone 16 Plus<br>iPhone 16 Pro<br>iPhone 16 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (A17 Pro)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | -| tvOS 17.5 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 18.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 18.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 18.2 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| watchOS 10.5 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra 2 (49mm) | -| watchOS 11.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 10 (42mm)<br>Apple Watch Series 10 (46mm)<br>Apple Watch Ultra 2 (49mm) | -| watchOS 11.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 10 (42mm)<br>Apple Watch Series 10 (46mm)<br>Apple Watch Ultra 2 (49mm) | -| watchOS 11.2 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 10 (42mm)<br>Apple Watch Series 10 (46mm)<br>Apple Watch Ultra 2 (49mm) | +| OS | Simulators | +| ------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| iOS 17.5 | iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | +| iOS 18.0 | iPhone 16<br>iPhone 16 Plus<br>iPhone 16 Pro<br>iPhone 16 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | +| iOS 18.1 | iPhone 16<br>iPhone 16 Plus<br>iPhone 16 Pro<br>iPhone 16 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (A17 Pro)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | +| iOS 18.2 | iPhone 16<br>iPhone 16 Plus<br>iPhone 16 Pro<br>iPhone 16 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (A17 Pro)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | +| tvOS 17.5 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 18.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 18.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 18.2 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| watchOS 10.5 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 11.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 10 (42mm)<br>Apple Watch Series 10 (46mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 11.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 10 (42mm)<br>Apple Watch Series 10 (46mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 11.2 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 10 (42mm)<br>Apple Watch Series 10 (46mm)<br>Apple Watch Ultra 2 (49mm) | ### Android -| Package Name | Version | -| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 16.0 | -| Android Emulator | 35.2.10 | -| Android SDK Build-tools | 35.0.0 | -| Android SDK Platforms | android-35-ext14 (rev 1)<br>android-35 (rev 1)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1) | -| Android SDK Platform-Tools | 35.0.2 | -| Android Support Repository | 47.0.0 | -| CMake | 3.31.0 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 26.3.11579264<br>27.2.12479018 (default) | +| Package Name | Version | +| -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 16.0 | +| Android Emulator | 35.2.10 | +| Android SDK Build-tools | 35.0.0 | +| Android SDK Platforms | android-35-ext14 (rev 1)<br>android-35 (rev 1)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1) | +| Android SDK Platform-Tools | 35.0.2 | +| Android Support Repository | 47.0.0 | +| CMake | 3.31.0 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 26.3.11579264<br>27.2.12479018 (default) | #### Environment variables | Name | Value | From 591df9aa4472a9d624035bf5ef71132406f0552b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 14 Dec 2024 19:36:19 -0600 Subject: [PATCH 3344/3485] Updating readme file for macos-15-arm64 version 20241211.459 (#11151) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-15-arm64-Readme.md | 89 +++++++++++++-------------- 1 file changed, 44 insertions(+), 45 deletions(-) diff --git a/images/macos/macos-15-arm64-Readme.md b/images/macos/macos-15-arm64-Readme.md index a86974e72369..e2e4aae18363 100644 --- a/images/macos/macos-15-arm64-Readme.md +++ b/images/macos/macos-15-arm64-Readme.md @@ -1,13 +1,12 @@ | Announcements | |-| -| [[macOS] OpenSSL 1.1 will be removed and OpenSSL 3 will be the default for all macOS images once [date not determined]](https://github.com/actions/runner-images/issues/10817) | -| [[macOS] The macOS 12 Actions runner image will begin deprecation on 10/7/24 and will be fully unsupported by 12/3/24 for GitHub and ADO](https://github.com/actions/runner-images/issues/10721) | +| [[macOS] The macOS 12 Actions runner image will begin deprecation on 10/7/24 and will be fully unsupported by 12/3/24 for GitHub and by 01/13/25 for ADO](https://github.com/actions/runner-images/issues/10721) | | [macOS 15 (Sequoia) is now available as a public beta in GitHub Actions](https://github.com/actions/runner-images/issues/10686) | *** # macOS 15 - OS Version: macOS 15.1.1 (24B91) - Kernel Version: Darwin 24.1.0 -- Image Version: 20241202.430 +- Image Version: 20241211.459 ## Installed Software @@ -23,18 +22,18 @@ - GNU Fortran 13 (Homebrew GCC 13.3.0) - available by `gfortran-13` alias - GNU Fortran 14 (Homebrew GCC 14.2.0_1) - available by `gfortran-14` alias - Kotlin 2.1.0-release-394 -- Node.js 22.11.0 +- Node.js 22.12.0 - Perl 5.40.0 -- Python3 3.13.0 +- Python3 3.13.1 - Ruby 3.3.6 ### Package Management - Bundler 2.5.23 - Carthage 0.40.0 - CocoaPods 1.16.2 -- Homebrew 4.4.8 +- Homebrew 4.4.11 - NPM 10.9.0 -- Pip3 24.2 (python 3.13) +- Pip3 24.3.1 (python 3.13) - Pipx 1.7.1 - RubyGems 3.5.23 - Yarn 1.22.22 @@ -48,13 +47,13 @@ - 7-Zip 17.05 - aria2 1.37.0 - azcopy 10.27.1 -- bazel 7.4.1 -- bazelisk 1.24.1 +- bazel 8.0.0 +- bazelisk 1.25.0 - bsdtar 3.5.3 - available by 'tar' alias - Curl 8.7.1 - Git 2.47.1 - Git LFS 3.6.0 -- GitHub CLI 2.63.0 +- GitHub CLI 2.63.2 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.25.0 - gpg (GnuPG) 2.4.6 @@ -63,21 +62,21 @@ - Packer 1.11.2 - pkgconf 2.3.0 - Unxip 3.1 -- yq 4.44.5 +- yq 4.44.6 - zstd 1.5.6 ### Tools -- AWS CLI 2.22.8 +- AWS CLI 2.22.14 - AWS SAM CLI 1.131.0 - AWS Session Manager CLI 1.2.694.0 - Azure CLI 2.67.0 - Azure CLI (azure-devops) 1.0.1 -- Bicep CLI 0.31.92 -- Cmake 3.31.1 -- CodeQL Action Bundle 2.19.3 -- Fastlane 2.225.0 +- Bicep CLI 0.32.4 +- Cmake 3.31.2 +- CodeQL Action Bundle 2.20.0 +- Fastlane 2.226.0 - SwiftFormat 0.55.3 -- Xcbeautify 2.15.0 +- Xcbeautify 2.16.0 - Xcode Command Line Tools 16.1.0.0.1.1729049160 - Xcodes 1.6.0 @@ -86,9 +85,9 @@ ### Browsers - Safari 18.1.1 (20619.2.8.11.12) - SafariDriver 18.1.1 (20619.2.8.11.12) -- Google Chrome 131.0.6778.86 -- Google Chrome for Testing 131.0.6778.85 -- ChromeDriver 131.0.6778.85 +- Google Chrome 131.0.6778.140 +- Google Chrome for Testing 131.0.6778.108 +- ChromeDriver 131.0.6778.108 - Selenium server 4.27.0 #### Environment variables @@ -114,18 +113,18 @@ #### Python - 3.11.9 -- 3.12.7 -- 3.13.0 +- 3.12.8 +- 3.13.1 #### Node.js - 18.20.5 - 20.18.1 -- 22.11.0 +- 22.12.0 #### Go - 1.21.13 -- 1.22.9 -- 1.23.3 +- 1.22.10 +- 1.23.4 ### Rust Tools - Cargo 1.83.0 @@ -146,12 +145,12 @@ - PSScriptAnalyzer: 1.23.0 ### Xcode -| Version | Build | Path | Symlinks | -| -------------- | -------- | ----------------------------------- | ----------------------------------------------------------------------------------------- | -| 16.2 (beta) | 16C5023f | /Applications/Xcode_16.2_beta_3.app | /Applications/Xcode_16.2.0.app<br>/Applications/Xcode_16.2.app | -| 16.1 | 16B40 | /Applications/Xcode_16.1.app | /Applications/Xcode_16.1.0.app | -| 16.0 (default) | 16A242d | /Applications/Xcode_16.app | /Applications/Xcode_16.0.0.app<br>/Applications/Xcode_16.0.app<br>/Applications/Xcode.app | -| 15.4 | 15F31d | /Applications/Xcode_15.4.app | /Applications/Xcode_15.4.0.app | +| Version | Build | Path | Symlinks | +| -------------- | -------- | ---------------------------------------------- | ----------------------------------------------------------------------------------------- | +| 16.2 | 16C5031c | /Applications/Xcode_16.2_Release_Candidate.app | /Applications/Xcode_16.2.0.app<br>/Applications/Xcode_16.2.app | +| 16.1 | 16B40 | /Applications/Xcode_16.1.app | /Applications/Xcode_16.1.0.app | +| 16.0 (default) | 16A242d | /Applications/Xcode_16.app | /Applications/Xcode_16.0.0.app<br>/Applications/Xcode_16.0.app<br>/Applications/Xcode.app | +| 15.4 | 15F31d | /Applications/Xcode_15.4.app | /Applications/Xcode_15.4.0.app | #### Installed SDKs | SDK | SDK Name | Xcode Version | @@ -184,10 +183,10 @@ | Simulator - watchOS 11.0 | watchsimulator11.0 | 16.0 | | Simulator - watchOS 11.1 | watchsimulator11.1 | 16.1 | | Simulator - watchOS 11.2 | watchsimulator11.2 | 16.2 | -| Simulator - visionOS 1.2 | xrsimulator1.2 | 15.4 | | visionOS 1.2 | xros1.2 | 15.4 | -| visionOS 2.0 | xros2.0 | 16.0 | +| Simulator - visionOS 1.2 | xrsimulator1.2 | 15.4 | | Simulator - visionOS 2.0 | xrsimulator2.0 | 16.0 | +| visionOS 2.0 | xros2.0 | 16.0 | | visionOS 2.1 | xros2.1 | 16.1 | | Simulator - visionOS 2.1 | xrsimulator2.1 | 16.1 | | Simulator - visionOS 2.2 | xrsimulator2.2 | 16.2 | @@ -218,18 +217,18 @@ | visionOS 2.2 | Apple Vision Pro | ### Android -| Package Name | Version | -| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 16.0 | -| Android Emulator | 35.2.10 | -| Android SDK Build-tools | 35.0.0 | -| Android SDK Platforms | android-35-ext14 (rev 1)<br>android-35 (rev 1)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1) | -| Android SDK Platform-Tools | 35.0.2 | -| Android Support Repository | 47.0.0 | -| CMake | 3.31.0 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 26.3.11579264<br>27.2.12479018 (default) | +| Package Name | Version | +| -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 16.0 | +| Android Emulator | 35.2.10 | +| Android SDK Build-tools | 35.0.0 | +| Android SDK Platforms | android-35-ext14 (rev 1)<br>android-35 (rev 1)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1) | +| Android SDK Platform-Tools | 35.0.2 | +| Android Support Repository | 47.0.0 | +| CMake | 3.31.0 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 26.3.11579264<br>27.2.12479018 (default) | #### Environment variables | Name | Value | From cee689db9f4dae941f9552656c7415a5aa2111b0 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Sun, 15 Dec 2024 12:44:26 +0100 Subject: [PATCH 3345/3485] [Windows] Update EdgeDriver signature (#11192) --- images/windows/scripts/build/Install-EdgeDriver.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/windows/scripts/build/Install-EdgeDriver.ps1 b/images/windows/scripts/build/Install-EdgeDriver.ps1 index e8f07b7de161..6d10d6e5d025 100644 --- a/images/windows/scripts/build/Install-EdgeDriver.ps1 +++ b/images/windows/scripts/build/Install-EdgeDriver.ps1 @@ -27,7 +27,7 @@ Write-Host "Expand Microsoft Edge WebDriver archive..." Expand-7ZipArchive -Path $archivePath -DestinationPath $edgeDriverPath #Validate the EdgeDriver signature -$signatureThumbprint = "7920AC8FB05E0FFFE21E8FF4B4F03093BA6AC16E" +$signatureThumbprint = "0BD8C56733FDCC06F8CB919FF5A200E39B1ACF71" Test-FileSignature -Path "$edgeDriverPath\msedgedriver.exe" -ExpectedThumbprint $signatureThumbprint Write-Host "Setting the environment variables..." From 0e631a89e834526cb235638be59dc78789cd85a8 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Sun, 15 Dec 2024 12:44:49 +0100 Subject: [PATCH 3346/3485] [Windows] Remove Windows\Installer\* folder cleanup for windows 2025 image (#11193) --- images/windows/scripts/build/Invoke-Cleanup.ps1 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/images/windows/scripts/build/Invoke-Cleanup.ps1 b/images/windows/scripts/build/Invoke-Cleanup.ps1 index f9bc431b17ba..7616c218e296 100644 --- a/images/windows/scripts/build/Invoke-Cleanup.ps1 +++ b/images/windows/scripts/build/Invoke-Cleanup.ps1 @@ -15,7 +15,6 @@ Write-Host "Clean up various directories" "$env:SystemRoot\logs", "$env:SystemRoot\winsxs\manifestcache", "$env:SystemRoot\Temp", - $(if(Test-IsWin25){"$env:SystemRoot\Installer\*"}), "$env:SystemDrive\Users\$env:INSTALL_USER\AppData\Local\Temp", "$env:TEMP", "$env:AZURE_CONFIG_DIR\logs", @@ -52,6 +51,8 @@ if ($LASTEXITCODE -ne 0) { if (Test-IsWin25) { $directoriesToCompact = @( + "C:\Program Files (x86)\Android", + "C:\Program Files\dotnet", "$env:SystemRoot\assembly", "$env:SystemRoot\WinSxS" ) From 5c8a14c94ce4ce691feb225859daa030c5ff896f Mon Sep 17 00:00:00 2001 From: sarathrajsrinivasan <159180023+sarathrajsrinivasan@users.noreply.github.com> Date: Mon, 16 Dec 2024 02:22:29 -0800 Subject: [PATCH 3347/3485] [macOS] Add Symlink for tcl-tk8 (#11128) * [macOS] Add Symlink for tcl-tk8 * [macOS] Add condition for tcl tk only for macOS13 and macOS14 Intel machines * [macOS] Update test case for tcl/tk * [macOS] Update test cases for tcl/tk for macOS15 * [macOS] Update tcl/tk test cases --- images/macos/scripts/build/install-common-utils.sh | 9 ++++++++- images/macos/scripts/tests/BasicTools.Tests.ps1 | 6 +++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/images/macos/scripts/build/install-common-utils.sh b/images/macos/scripts/build/install-common-utils.sh index 96a46826b459..9f9013538b70 100644 --- a/images/macos/scripts/build/install-common-utils.sh +++ b/images/macos/scripts/build/install-common-utils.sh @@ -21,7 +21,14 @@ for package in $common_packages; do # Packer has been deprecated in Homebrew. Use tap to install Packer. brew install hashicorp/tap/packer else - brew_smart_install "$package" + if (is_VenturaX64 || is_SonomaX64) && [[ $package == "tcl-tk@8" ]]; then + brew_smart_install "$package" + # Fix for https://github.com/actions/runner-images/issues/11074 + ln -sf $(brew --prefix tcl-tk@8)/lib/libtcl8.6.dylib /usr/local/lib/libtcl8.6.dylib + ln -sf $(brew --prefix tcl-tk@8)/lib/libtk8.6.dylib /usr/local/lib/libtk8.6.dylib + else + brew_smart_install "$package" + fi fi fi done diff --git a/images/macos/scripts/tests/BasicTools.Tests.ps1 b/images/macos/scripts/tests/BasicTools.Tests.ps1 index 2db65a1a910f..53942da4de88 100644 --- a/images/macos/scripts/tests/BasicTools.Tests.ps1 +++ b/images/macos/scripts/tests/BasicTools.Tests.ps1 @@ -62,10 +62,10 @@ Describe "Perl" { } } -Describe "Tcl/Tk" { +Describe "Tcl/Tk" -Skip:($os.IsVenturaArm64 -or $os.IsSonomaArm64 -or $os.IsSequoia) { It "libtcl" { - "file /usr/local/lib/libtcl8.6.dylib" | Should -ReturnZeroExitCode - "file /usr/local/lib/libtk8.6.dylib" | Should -ReturnZeroExitCode + Test-Path "/usr/local/lib/libtcl8.6.dylib" | Should -BeTrue + Test-Path "/usr/local/lib/libtk8.6.dylib" | Should -BeTrue } } From 600fb502b3486ce5782c863664eb3406b47c6327 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 16 Dec 2024 07:38:38 -0700 Subject: [PATCH 3348/3485] Updating readme file for ubuntu22 version 20241211.1.1 (#11166) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2204-Readme.md | 94 +++++++++++++++--------------- 1 file changed, 48 insertions(+), 46 deletions(-) diff --git a/images/ubuntu/Ubuntu2204-Readme.md b/images/ubuntu/Ubuntu2204-Readme.md index 5e86257b7e30..fc7e5b2f2278 100644 --- a/images/ubuntu/Ubuntu2204-Readme.md +++ b/images/ubuntu/Ubuntu2204-Readme.md @@ -1,12 +1,13 @@ | Announcements | |-| +| [[Windows & Ubuntu] Breaking change : Maven 3.8.* version will be updated to Maven 3.9.* from January 10,2025](https://github.com/actions/runner-images/issues/11093) | | [[Ubuntu] Breaking Change: runner user will have UID 1001 instead of 1000 for larger runners](https://github.com/actions/runner-images/issues/10936) | | [Ubuntu-latest workflows will use Ubuntu-24.04 image](https://github.com/actions/runner-images/issues/10636) | *** # Ubuntu 22.04 - OS Version: 22.04.5 LTS - Kernel Version: 6.5.0-1025-azure -- Image Version: 20241201.1.0 +- Image Version: 20241211.1.0 - Systemd version: 249.11-0ubuntu3.12 ## Installed Software @@ -19,7 +20,7 @@ - Dash 0.5.11+git20210903+057cd650a4ed-3build1 - GNU C++: 10.5.0, 11.4.0, 12.3.0 - GNU Fortran: 10.5.0, 11.4.0, 12.3.0 -- Julia 1.11.1 +- Julia 1.11.2 - Kotlin 2.1.0-release-394 - Mono 6.12.0.200 - MSBuild 16.10.1.31701 (Mono 6.12.0.200) @@ -32,7 +33,7 @@ ### Package Management - cpan 1.64 - Helm 3.16.3 -- Homebrew 4.4.8 +- Homebrew 4.4.11 - Miniconda 24.9.2 - Npm 10.8.2 - NuGet 6.6.1.2 @@ -40,7 +41,7 @@ - Pip3 22.0.2 - Pipx 1.7.1 - RubyGems 3.3.5 -- Vcpkg (build from commit cd124b84f) +- Vcpkg (build from commit b7601ed37) - Yarn 1.22.22 #### Environment variables @@ -65,29 +66,29 @@ to accomplish this. - Sbt 1.10.6 ### Tools -- Ansible 2.17.6 +- Ansible 2.17.7 - apt-fast 1.10.0 - AzCopy 10.27.1 - available by `azcopy` and `azcopy10` aliases -- Bazel 7.4.1 -- Bazelisk 1.24.1 -- Bicep 0.31.92 +- Bazel 8.0.0 +- Bazelisk 1.25.0 +- Bicep 0.32.4 - Buildah 1.23.1 -- CMake 3.31.1 -- CodeQL Action Bundle 2.19.3 +- CMake 3.31.2 +- CodeQL Action Bundle 2.20.0 - Docker Amazon ECR Credential Helper 0.9.0 - Docker Compose v2 2.27.1 -- Docker-Buildx 0.19.1 +- Docker-Buildx 0.19.2 - Docker Client 26.1.3 - Docker Server 26.1.3 -- Fastlane 2.225.0 +- Fastlane 2.226.0 - Git 2.47.1 - Git LFS 3.6.0 - Git-ftp 1.6.0 - Haveged 1.9.14 -- Heroku 9.5.0 +- Heroku 10.0.0 - jq 1.6 - Kind 0.25.0 -- Kubectl 1.31.3 +- Kubectl 1.31.4 - Kustomize 5.5.0 - Leiningen 2.11.2 - MediaInfo 21.09 @@ -105,24 +106,24 @@ to accomplish this. - Skopeo 1.4.1 - Sphinx Open Source Search Server 2.2.11 - SVN 1.14.1 -- Terraform 1.10.0 +- Terraform 1.10.2 - yamllint 1.35.1 -- yq 4.44.5 +- yq 4.44.6 - zstd 1.5.6 ### CLI Tools -- Alibaba Cloud CLI 3.0.234 -- AWS CLI 2.22.7 +- Alibaba Cloud CLI 3.0.235 +- AWS CLI 2.22.14 - AWS CLI Session Manager Plugin 1.2.694.0 - AWS SAM CLI 1.131.0 - Azure CLI 2.67.0 - Azure CLI (azure-devops) 1.0.1 -- GitHub CLI 2.63.0 -- Google Cloud CLI 502.0.0 -- Netlify CLI 17.37.2 -- OpenShift CLI 4.17.6 -- ORAS CLI 1.2.0 -- Vercel CLI 39.1.2 +- GitHub CLI 2.63.2 +- Google Cloud CLI 503.0.0 +- Netlify CLI 17.38.0 +- OpenShift CLI 4.17.8 +- ORAS CLI 1.2.1 +- Vercel CLI 39.2.0 ### Java | Version | Environment Variable | @@ -134,8 +135,8 @@ to accomplish this. ### PHP Tools - PHP: 8.1.2 -- Composer 2.8.3 -- PHPUnit 8.5.40 +- Composer 2.8.4 +- PHPUnit 8.5.41 ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ``` @@ -153,19 +154,19 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustup 1.27.1 #### Packages -- Bindgen 0.70.1 +- Bindgen 0.71.1 - Cargo audit 0.21.0 - Cargo clippy 0.1.83 -- Cargo outdated 0.15.0 +- Cargo outdated 0.16.0 - Cbindgen 0.27.0 - Rustfmt 1.8.0 ### Browsers and Drivers -- Google Chrome 131.0.6778.85 -- ChromeDriver 131.0.6778.85 +- Google Chrome 131.0.6778.139 +- ChromeDriver 131.0.6778.108 - Chromium 131.0.6778.0 -- Microsoft Edge 131.0.2903.70 -- Microsoft Edge WebDriver 131.0.2903.52 +- Microsoft Edge 131.0.2903.86 +- Microsoft Edge WebDriver 131.0.2903.87 - Selenium server 4.27.0 - Mozilla Firefox 133.0 - Geckodriver 0.35.0 @@ -210,21 +211,21 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Go - 1.21.13 -- 1.22.9 -- 1.23.3 +- 1.22.10 +- 1.23.4 #### Node.js - 18.20.5 - 20.18.1 -- 22.11.0 +- 22.12.0 #### Python - 3.7.17 - 3.8.18 - 3.9.20 - 3.10.15 -- 3.11.10 -- 3.12.7 +- 3.11.11 +- 3.12.8 #### PyPy - 3.7.13 [PyPy 7.3.9] @@ -282,14 +283,14 @@ Use the following command as a part of your job to start the service: 'sudo syst | alpine:3.18 | sha256:2995c82e8e723d9a5c8585cb8e901d1c50e3c2759031027d3bff577449435157 | 2024-09-06 | | alpine:3.19 | sha256:7a85bf5dc56c949be827f84f9185161265c58f589bb8b2a6b6bb6d3076c1be21 | 2024-09-06 | | debian:10 | sha256:58ce6f1271ae1c8a2006ff7d3e54e9874d839f573d8009c20154ad0f2fb0a225 | 2024-06-13 | -| debian:11 | sha256:01559430c84e6bc864bed554345d1bfbfa94ac108ab68f39915cae34604b15c3 | 2024-11-11 | -| moby/buildkit:latest | sha256:36c65534fcd9e8b2c38f7e549aeae3ed5b5389fe6de2f44996f313112ebf0e18 | 2024-11-26 | -| node:18 | sha256:83eb05700940a88b14f21fb31cc92e9571a34b1db1a5d8781b466fc26cbb1472 | 2024-11-15 | -| node:18-alpine | sha256:7e43a2d633d91e8655a6c0f45d2ed987aa4930f0792f6d9dd3bffc7496e44882 | 2024-11-15 | -| node:20 | sha256:f99a6bd6fb137cfc683e1ff60e7d67aa8d5fcf45a6a64c01c37b4f433a6238b6 | 2024-11-20 | -| node:20-alpine | sha256:b5b9467fe7b33aad47f1ec3f6e0646a658f85f05c18d4243024212a91f3b7554 | 2024-11-20 | -| node:22 | sha256:5c76d05034644fa8ecc9c2aa84e0a83cd981d0ef13af5455b87b9adf5b216561 | 2024-10-29 | -| node:22-alpine | sha256:b64ced2e7cd0a4816699fe308ce6e8a08ccba463c757c00c14cd372e3d2c763e | 2024-10-29 | +| debian:11 | sha256:e91d1b0684e0f26a29c2353c52d4814f4d153e10b1faddf9fbde473ed71e2fcf | 2024-12-02 | +| moby/buildkit:latest | sha256:58e6d150a3c5a4b92e99ea8df2cbe976ad6d2ae5beab39214e84fada05b059d5 | 2024-12-04 | +| node:18 | sha256:b57ae84fe7880a23b389f8260d726b784010ed470c2ee26d4e2cbdb955d25b12 | 2024-11-15 | +| node:18-alpine | sha256:6eb9c3d9bd191bd2cc6ce7ec3d5ec4c2127616140c8586af96a6bec8f28689d1 | 2024-12-05 | +| node:20 | sha256:f4755c9039bdeec5c736b2e0dd5b47700d6393b65688b9e9f807ec12f54a8690 | 2024-11-20 | +| node:20-alpine | sha256:426f843809ae05f324883afceebaa2b9cab9cb697097dbb1a2a7a41c5701de72 | 2024-12-05 | +| node:22 | sha256:35a5dd72bcac4bce43266408b58a02be6ff0b6098ffa6f5435aeea980a8951d7 | 2024-12-03 | +| node:22-alpine | sha256:6e80991f69cc7722c561e5d14d5e72ab47c0d6b6cfb3ae50fb9cf9a7b30fdf97 | 2024-12-05 | | ubuntu:20.04 | sha256:8e5c4f0285ecbb4ead070431d29b576a530d3166df73ec44affc1cd27555141b | 2024-10-11 | | ubuntu:22.04 | sha256:0e5e4a57c2499249aafc3b40fcd541e9a456aab7296681a3994d631587203f97 | 2024-09-11 | @@ -329,7 +330,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | libc++abi-dev | 1:14.0-55\~exp2 | | libc6-dev | 2.35-0ubuntu3.8 | | libcurl4 | 7.81.0-1ubuntu1.19 | -| libgbm-dev | 23.2.1-1ubuntu3.1\~22.04.2 | +| libgbm-dev | 23.2.1-1ubuntu3.1\~22.04.3 | | libgconf-2-4 | 3.2.6-7ubuntu2 | | libgsl-dev | 2.7.1+dfsg-3 | | libgtk-3-0 | 3.24.33-1ubuntu2.2 | @@ -372,6 +373,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | subversion | 1.14.1-3ubuntu0.22.04.1 | | sudo | 1.9.9-1ubuntu2.4 | | swig | 4.0.2-1ubuntu1 | +| systemd-coredump | 249.11-0ubuntu3.12 | | tar | 1.34+dfsg-1ubuntu0.1.22.04.2 | | telnet | 0.17-44build1 | | texinfo | 6.8-4build1 | From ad23bf9f93a753fb20368bc579b182e6e7d80df0 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 16 Dec 2024 07:39:37 -0700 Subject: [PATCH 3349/3485] Updating readme file for ubuntu24 version 20241208.1.1 (#11139) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2404-Readme.md | 45 +++++++++++++++--------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/images/ubuntu/Ubuntu2404-Readme.md b/images/ubuntu/Ubuntu2404-Readme.md index 77257c0f901a..bb0fbb208525 100644 --- a/images/ubuntu/Ubuntu2404-Readme.md +++ b/images/ubuntu/Ubuntu2404-Readme.md @@ -1,12 +1,13 @@ | Announcements | |-| +| [[Windows & Ubuntu] Breaking change : Maven 3.8.* version will be updated to Maven 3.9.* from January 10,2025](https://github.com/actions/runner-images/issues/11093) | | [[Ubuntu] Breaking Change: runner user will have UID 1001 instead of 1000 for larger runners](https://github.com/actions/runner-images/issues/10936) | | [Ubuntu-latest workflows will use Ubuntu-24.04 image](https://github.com/actions/runner-images/issues/10636) | *** # Ubuntu 24.04 - OS Version: 24.04.1 LTS - Kernel Version: 6.8.0-1017-azure -- Image Version: 20241201.1.0 +- Image Version: 20241208.1.0 - Systemd version: 255.4-1ubuntu8.4 ## Installed Software @@ -19,7 +20,7 @@ - Dash 0.5.12-6ubuntu5 - GNU C++: 12.3.0, 13.2.0, 14.2.0 - GNU Fortran: 12.3.0, 13.2.0, 14.2.0 -- Julia 1.11.1 +- Julia 1.11.2 - Kotlin 2.1.0-release-394 - Node.js 20.18.1 - Perl 5.38.2 @@ -30,14 +31,14 @@ ### Package Management - cpan 1.64 - Helm 3.16.3 -- Homebrew 4.4.8 +- Homebrew 4.4.10 - Miniconda 24.9.2 - Npm 10.8.2 - Pip 24.0 - Pip3 24.0 - Pipx 1.7.1 - RubyGems 3.4.20 -- Vcpkg (build from commit cd124b84f) +- Vcpkg (build from commit 20a72ce99) - Yarn 1.22.22 #### Environment variables @@ -61,17 +62,17 @@ to accomplish this. - Maven 3.8.8 ### Tools -- Ansible 2.18.0 +- Ansible 2.18.1 - AzCopy 10.27.1 - available by `azcopy` and `azcopy10` aliases - Bazel 7.4.1 - Bazelisk 1.24.1 - Bicep 0.31.92 - Buildah 1.33.7 -- CMake 3.31.1 -- CodeQL Action Bundle 2.19.3 +- CMake 3.31.2 +- CodeQL Action Bundle 2.19.4 - Docker Amazon ECR Credential Helper 0.9.0 - Docker Compose v2 2.27.1 -- Docker-Buildx 0.19.1 +- Docker-Buildx 0.19.2 - Docker Client 26.1.3 - Docker Server 26.1.3 - Fastlane 2.225.0 @@ -97,16 +98,16 @@ to accomplish this. - Skopeo 1.13.3 - Sphinx Open Source Search Server 2.2.11 - yamllint 1.35.1 -- yq 4.44.5 +- yq 4.44.6 - zstd 1.5.6 ### CLI Tools -- AWS CLI 2.22.7 +- AWS CLI 2.22.12 - AWS CLI Session Manager Plugin 1.2.694.0 - AWS SAM CLI 1.131.0 - Azure CLI 2.67.0 - Azure CLI (azure-devops) 1.0.1 -- GitHub CLI 2.63.0 +- GitHub CLI 2.63.2 - Google Cloud CLI 502.0.0 ### Java @@ -120,7 +121,7 @@ to accomplish this. ### PHP Tools - PHP: 8.3.6 - Composer 2.8.3 -- PHPUnit 8.5.40 +- PHPUnit 8.5.41 ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ``` @@ -141,11 +142,11 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.8.0 ### Browsers and Drivers -- Google Chrome 131.0.6778.85 -- ChromeDriver 131.0.6778.85 +- Google Chrome 131.0.6778.108 +- ChromeDriver 131.0.6778.87 - Chromium 131.0.6778.0 -- Microsoft Edge 131.0.2903.70 -- Microsoft Edge WebDriver 131.0.2903.52 +- Microsoft Edge 131.0.2903.86 +- Microsoft Edge WebDriver 131.0.2903.87 - Selenium server 4.27.0 - Mozilla Firefox 133.0 - Geckodriver 0.35.0 @@ -186,19 +187,19 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Go - 1.21.13 -- 1.22.9 -- 1.23.3 +- 1.22.10 +- 1.23.4 #### Node.js - 18.20.5 - 20.18.1 -- 22.11.0 +- 22.12.0 #### Python - 3.9.20 - 3.10.15 -- 3.11.10 -- 3.12.7 +- 3.11.11 +- 3.12.8 #### PyPy - 3.9.19 [PyPy 7.3.16] @@ -311,6 +312,6 @@ Use the following command as a part of your job to start the service: 'sudo syst | wget | 1.21.4-1ubuntu4.1 | | xvfb | 2:21.1.12-1ubuntu1.1 | | xz-utils | 5.6.1+really5.4.5-1build0.1 | -| zip | 3.0-13build1 | +| zip | 3.0-13ubuntu0.1 | | zsync | 0.6.2-5build1 | From 2899593d7a98aa2c1af60bd6a2d2d2979394657f Mon Sep 17 00:00:00 2001 From: sureshe456 <160699174+sureshe456@users.noreply.github.com> Date: Mon, 16 Dec 2024 21:22:11 +0530 Subject: [PATCH 3350/3485] [macOS] Add Xcode 16.2 Release to macOS15 (#11179) --- images/macos/toolsets/toolset-15.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/images/macos/toolsets/toolset-15.json b/images/macos/toolsets/toolset-15.json index 72738d84950d..6aa9a0c06669 100644 --- a/images/macos/toolsets/toolset-15.json +++ b/images/macos/toolsets/toolset-15.json @@ -3,7 +3,7 @@ "default": "16", "x64": { "versions": [ - { "link": "16.2_Release_Candidate", "version": "16.2_Release_Candidate+16C5031c", "symlinks": ["16.2"], "install_runtimes": "true", "sha256": "2f6566cf6c2339030be05607827b0643c4957ed695f15e197d9a0623b76d21f0"}, + { "link": "16.2", "version": "16.2+16C5032a", "install_runtimes": "true", "sha256": "0e367d06eb7c334ea143bada5e4422f56688aabff571bedf0d2ad9434b7290de"}, { "link": "16.1", "version": "16.1+16B40", "install_runtimes": "true", "sha256": "8ca961d55981f983d21b99a95a6b0ac04905b837f6e11346ee86d28f12afe720"}, { "link": "16", "version": "16.0.0+16A242d", "symlinks": ["16.0"], "install_runtimes": "true", "sha256": "4a26c3d102a55c7222fb145e0ee1503249c9c26c6e02dc64d783c8810b37b1e3"}, { "link": "15.4", "version": "15.4.0+15F31d", "install_runtimes": "true", "sha256": "82d3d61804ff3f4c7c82085e91dc701037ddaa770e542848b2477e22f4e8aa7a"} @@ -11,13 +11,13 @@ }, "arm64":{ "versions": [ - { "link": "16.2_Release_Candidate", "version": "16.2_Release_Candidate+16C5031c", "symlinks": ["16.2"], "install_runtimes": "true", "sha256": "2f6566cf6c2339030be05607827b0643c4957ed695f15e197d9a0623b76d21f0"}, + { "link": "16.2", "version": "16.2+16C5032a", "install_runtimes": "true", "sha256": "0e367d06eb7c334ea143bada5e4422f56688aabff571bedf0d2ad9434b7290de"}, { "link": "16.1", "version": "16.1+16B40", "install_runtimes": "true", "sha256": "8ca961d55981f983d21b99a95a6b0ac04905b837f6e11346ee86d28f12afe720"}, { "link": "16", "version": "16.0.0+16A242d", "symlinks": ["16.0"], "install_runtimes": "true", "sha256": "4a26c3d102a55c7222fb145e0ee1503249c9c26c6e02dc64d783c8810b37b1e3"}, { "link": "15.4", "version": "15.4.0+15F31d", "install_runtimes": "true", "sha256": "82d3d61804ff3f4c7c82085e91dc701037ddaa770e542848b2477e22f4e8aa7a"} ] } - }, + }, "java": { "x64": { "default": "21", From ee59bae24508249625981fe8d4393b4a2754d370 Mon Sep 17 00:00:00 2001 From: Lawrence Gripper <lawrencegripper@github.com> Date: Tue, 17 Dec 2024 13:15:53 +0000 Subject: [PATCH 3351/3485] Update docs/dotnet-ubuntu.md --- docs/dotnet-ubuntu.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/dotnet-ubuntu.md b/docs/dotnet-ubuntu.md index b5f2ccac6e66..22d71a7d5175 100644 --- a/docs/dotnet-ubuntu.md +++ b/docs/dotnet-ubuntu.md @@ -6,7 +6,7 @@ This document gives an overview of these change and the impact this has on the ` ## .NET Core for Ubuntu 2004 and 2204 -2004 and 2024 use the [Microsoft Package repository](https://learn.microsoft.com/en-us/dotnet/core/install/linux-ubuntu-install?tabs=dotnet8&pivots=os-linux-ubuntu-2004) to install .NET deb files built and published by the .NET team. +2004 and 2204 use the [Microsoft Package repository](https://learn.microsoft.com/en-us/dotnet/core/install/linux-ubuntu-install?tabs=dotnet8&pivots=os-linux-ubuntu-2004) to install .NET deb files built and published by the .NET team. ## .NET Core Versions from Ubuntu 2404 From ee68afd89e91e869450a799ca9c9d9db3d558f96 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 18 Dec 2024 11:51:24 +0000 Subject: [PATCH 3352/3485] Updating readme file for ubuntu22 version 20241215.1.1 (#11198) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2204-Readme.md | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/images/ubuntu/Ubuntu2204-Readme.md b/images/ubuntu/Ubuntu2204-Readme.md index fc7e5b2f2278..469751c15fae 100644 --- a/images/ubuntu/Ubuntu2204-Readme.md +++ b/images/ubuntu/Ubuntu2204-Readme.md @@ -7,7 +7,7 @@ # Ubuntu 22.04 - OS Version: 22.04.5 LTS - Kernel Version: 6.5.0-1025-azure -- Image Version: 20241211.1.0 +- Image Version: 20241215.1.0 - Systemd version: 249.11-0ubuntu3.12 ## Installed Software @@ -28,7 +28,7 @@ - Perl 5.34.0 - Python 3.10.12 - Ruby 3.0.2p107 -- Swift 6.0.2 +- Swift 6.0.3 ### Package Management - cpan 1.64 @@ -41,7 +41,7 @@ - Pip3 22.0.2 - Pipx 1.7.1 - RubyGems 3.3.5 -- Vcpkg (build from commit b7601ed37) +- Vcpkg (build from commit b545373a9) - Yarn 1.22.22 #### Environment variables @@ -88,7 +88,7 @@ to accomplish this. - Heroku 10.0.0 - jq 1.6 - Kind 0.25.0 -- Kubectl 1.31.4 +- Kubectl 1.32.0 - Kustomize 5.5.0 - Leiningen 2.11.2 - MediaInfo 21.09 @@ -101,7 +101,7 @@ to accomplish this. - Packer 1.11.2 - Parcel 2.13.2 - Podman 3.4.4 -- Pulumi 3.142.0 +- Pulumi 3.143.0 - R 4.4.2 - Skopeo 1.4.1 - Sphinx Open Source Search Server 2.2.11 @@ -112,10 +112,10 @@ to accomplish this. - zstd 1.5.6 ### CLI Tools -- Alibaba Cloud CLI 3.0.235 -- AWS CLI 2.22.14 +- Alibaba Cloud CLI 3.0.237 +- AWS CLI 2.22.17 - AWS CLI Session Manager Plugin 1.2.694.0 -- AWS SAM CLI 1.131.0 +- AWS SAM CLI 1.132.0 - Azure CLI 2.67.0 - Azure CLI (azure-devops) 1.0.1 - GitHub CLI 2.63.2 @@ -123,7 +123,7 @@ to accomplish this. - Netlify CLI 17.38.0 - OpenShift CLI 4.17.8 - ORAS CLI 1.2.1 -- Vercel CLI 39.2.0 +- Vercel CLI 39.2.2 ### Java | Version | Environment Variable | @@ -165,7 +165,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Google Chrome 131.0.6778.139 - ChromeDriver 131.0.6778.108 - Chromium 131.0.6778.0 -- Microsoft Edge 131.0.2903.86 +- Microsoft Edge 131.0.2903.99 - Microsoft Edge WebDriver 131.0.2903.87 - Selenium server 4.27.0 - Mozilla Firefox 133.0 @@ -181,7 +181,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ### .NET Tools - .NET Core SDK: 6.0.428, 7.0.410, 8.0.404 -- nbgv 3.6.146+392592327a +- nbgv 3.7.112+63bbe780b0 ### Databases - sqlite3 3.37.2 From 7c2da160a2b6077f8a1f7ae8833f71b0fbffc34b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 18 Dec 2024 12:26:37 +0000 Subject: [PATCH 3353/3485] Updating readme file for ubuntu24 version 20241215.1.1 (#11197) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2404-Readme.md | 47 +++++++++++++++--------------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/images/ubuntu/Ubuntu2404-Readme.md b/images/ubuntu/Ubuntu2404-Readme.md index bb0fbb208525..8bf8f904e993 100644 --- a/images/ubuntu/Ubuntu2404-Readme.md +++ b/images/ubuntu/Ubuntu2404-Readme.md @@ -7,7 +7,7 @@ # Ubuntu 24.04 - OS Version: 24.04.1 LTS - Kernel Version: 6.8.0-1017-azure -- Image Version: 20241208.1.0 +- Image Version: 20241215.1.0 - Systemd version: 255.4-1ubuntu8.4 ## Installed Software @@ -18,27 +18,27 @@ - Clang-format: 16.0.6, 17.0.6, 18.1.3 - Clang-tidy: 16.0.6, 17.0.6, 18.1.3 - Dash 0.5.12-6ubuntu5 -- GNU C++: 12.3.0, 13.2.0, 14.2.0 -- GNU Fortran: 12.3.0, 13.2.0, 14.2.0 +- GNU C++: 12.3.0, 13.3.0, 14.2.0 +- GNU Fortran: 12.3.0, 13.3.0, 14.2.0 - Julia 1.11.2 - Kotlin 2.1.0-release-394 - Node.js 20.18.1 - Perl 5.38.2 - Python 3.12.3 - Ruby 3.2.3 -- Swift 6.0.2 +- Swift 6.0.3 ### Package Management - cpan 1.64 - Helm 3.16.3 -- Homebrew 4.4.10 +- Homebrew 4.4.11 - Miniconda 24.9.2 - Npm 10.8.2 - Pip 24.0 - Pip3 24.0 - Pipx 1.7.1 - RubyGems 3.4.20 -- Vcpkg (build from commit 20a72ce99) +- Vcpkg (build from commit b545373a9) - Yarn 1.22.22 #### Environment variables @@ -64,25 +64,25 @@ to accomplish this. ### Tools - Ansible 2.18.1 - AzCopy 10.27.1 - available by `azcopy` and `azcopy10` aliases -- Bazel 7.4.1 -- Bazelisk 1.24.1 -- Bicep 0.31.92 +- Bazel 8.0.0 +- Bazelisk 1.25.0 +- Bicep 0.32.4 - Buildah 1.33.7 - CMake 3.31.2 -- CodeQL Action Bundle 2.19.4 +- CodeQL Action Bundle 2.20.0 - Docker Amazon ECR Credential Helper 0.9.0 - Docker Compose v2 2.27.1 - Docker-Buildx 0.19.2 - Docker Client 26.1.3 - Docker Server 26.1.3 -- Fastlane 2.225.0 +- Fastlane 2.226.0 - Git 2.47.1 - Git LFS 3.6.0 - Git-ftp 1.6.0 - Haveged 1.9.14 - jq 1.7 - Kind 0.25.0 -- Kubectl 1.31.3 +- Kubectl 1.32.0 - Kustomize 5.5.0 - MediaInfo 24.01 - Mercurial 6.7.2 @@ -94,7 +94,7 @@ to accomplish this. - Packer 1.11.2 - Parcel 2.13.2 - Podman 4.9.3 -- Pulumi 3.142.0 +- Pulumi 3.143.0 - Skopeo 1.13.3 - Sphinx Open Source Search Server 2.2.11 - yamllint 1.35.1 @@ -102,13 +102,13 @@ to accomplish this. - zstd 1.5.6 ### CLI Tools -- AWS CLI 2.22.12 +- AWS CLI 2.22.17 - AWS CLI Session Manager Plugin 1.2.694.0 -- AWS SAM CLI 1.131.0 +- AWS SAM CLI 1.132.0 - Azure CLI 2.67.0 - Azure CLI (azure-devops) 1.0.1 - GitHub CLI 2.63.2 -- Google Cloud CLI 502.0.0 +- Google Cloud CLI 503.0.0 ### Java | Version | Environment Variable | @@ -120,7 +120,7 @@ to accomplish this. ### PHP Tools - PHP: 8.3.6 -- Composer 2.8.3 +- Composer 2.8.4 - PHPUnit 8.5.41 ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. @@ -142,10 +142,10 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.8.0 ### Browsers and Drivers -- Google Chrome 131.0.6778.108 -- ChromeDriver 131.0.6778.87 +- Google Chrome 131.0.6778.139 +- ChromeDriver 131.0.6778.108 - Chromium 131.0.6778.0 -- Microsoft Edge 131.0.2903.86 +- Microsoft Edge 131.0.2903.99 - Microsoft Edge WebDriver 131.0.2903.87 - Selenium server 4.27.0 - Mozilla Firefox 133.0 @@ -160,8 +160,8 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | ### .NET Tools -- .NET Core SDK: 8.0.110 -- nbgv 3.6.146+392592327a +- .NET Core SDK: 8.0.111 +- nbgv 3.7.112+63bbe780b0 ### Databases - sqlite3 3.45.1 @@ -279,7 +279,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | m4 | 1.4.19-4build1 | | make | 4.3-4.1build2 | | mediainfo | 24.01.1-1build2 | -| mercurial | 6.7.2-1ubuntu2 | +| mercurial | 6.7.2-1ubuntu2.2 | | net-tools | 2.10-0.1ubuntu4 | | netcat | 1.226-1ubuntu2 | | openssh-client | 1:9.6p1-3ubuntu13.5 | @@ -300,6 +300,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | sshpass | 1.09-1 | | sudo | 1.9.15p5-3ubuntu5 | | swig | 4.2.0-2ubuntu1 | +| systemd-coredump | 255.4-1ubuntu8.4 | | tar | 1.35+dfsg-3build1 | | telnet | 0.17+2.5-3ubuntu4 | | texinfo | 7.1-3build2 | From 39222c24c48e09beba42cd94c781b3a4d93dfd23 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 18 Dec 2024 17:10:33 +0000 Subject: [PATCH 3354/3485] Updating readme file for ubuntu20 version 20241215.1.1 (#11205) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2004-Readme.md | 44 +++++++++++++++--------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/images/ubuntu/Ubuntu2004-Readme.md b/images/ubuntu/Ubuntu2004-Readme.md index 00d0b726c512..12a0aded6a72 100644 --- a/images/ubuntu/Ubuntu2004-Readme.md +++ b/images/ubuntu/Ubuntu2004-Readme.md @@ -7,7 +7,7 @@ # Ubuntu 20.04 - OS Version: 20.04.6 LTS - Kernel Version: 5.15.0-1074-azure -- Image Version: 20241209.1.0 +- Image Version: 20241215.1.0 - Systemd version: 245.4-4ubuntu3.24 ## Installed Software @@ -30,7 +30,7 @@ - Perl 5.30.0 - Python 3.8.10 - Ruby 2.7.0p0 -- Swift 6.0.2 +- Swift 6.0.3 ### Package Management - cpan 1.64 @@ -43,7 +43,7 @@ - Pip3 20.0.2 - Pipx 1.7.1 - RubyGems 3.1.2 -- Vcpkg (build from commit 96b5ced82) +- Vcpkg (build from commit b545373a9) - Yarn 1.22.22 #### Environment variables @@ -72,17 +72,17 @@ to accomplish this. - apt-fast 1.10.0 - AzCopy 10.27.1 - available by `azcopy` and `azcopy10` aliases - Bazel 8.0.0 -- Bazelisk 1.24.1 -- Bicep 0.31.92 +- Bazelisk 1.25.0 +- Bicep 0.32.4 - Buildah 1.22.3 - CMake 3.31.2 -- CodeQL Action Bundle 2.19.4 +- CodeQL Action Bundle 2.20.0 - Docker Amazon ECR Credential Helper 0.9.0 - Docker Compose v2 2.27.1 - Docker-Buildx 0.19.2 - Docker Client 26.1.3 - Docker Server 26.1.3 -- Fastlane 2.225.0 +- Fastlane 2.226.0 - Git 2.47.1 - Git LFS 3.6.0 - Git-ftp 1.6.0 @@ -91,7 +91,7 @@ to accomplish this. - HHVM (HipHop VM) 4.172.1 - jq 1.6 - Kind 0.25.0 -- Kubectl 1.31.3 +- Kubectl 1.32.0 - Kustomize 5.5.0 - Leiningen 2.11.2 - MediaInfo 19.09 @@ -105,29 +105,29 @@ to accomplish this. - Parcel 2.13.2 - PhantomJS 2.1.1 2.1.1 - Podman 3.4.2 -- Pulumi 3.142.0 +- Pulumi 3.143.0 - R 4.4.2 - Skopeo 1.5.0 - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 -- Terraform 1.10.1 +- Terraform 1.10.2 - yamllint 1.35.1 - yq 4.44.6 - zstd 1.5.6 ### CLI Tools - Alibaba Cloud CLI 3.0.174 -- AWS CLI 2.22.13 +- AWS CLI 2.22.17 - AWS CLI Session Manager Plugin 1.2.694.0 -- AWS SAM CLI 1.131.0 +- AWS SAM CLI 1.132.0 - Azure CLI 2.67.0 - Azure CLI (azure-devops) 1.0.1 - GitHub CLI 2.63.2 -- Google Cloud CLI 502.0.0 +- Google Cloud CLI 503.0.0 - Netlify CLI 17.38.0 - OpenShift CLI 4.15.19 - ORAS CLI 1.2.1 -- Vercel CLI 39.2.0 +- Vercel CLI 39.2.2 ### Java | Version | Environment Variable | @@ -139,7 +139,7 @@ to accomplish this. ### PHP Tools - PHP: 7.4.33, 8.0.30, 8.1.31, 8.2.26, 8.3.14 -- Composer 2.8.3 +- Composer 2.8.4 - PHPUnit 8.5.41 ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. @@ -166,10 +166,10 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.8.0 ### Browsers and Drivers -- Google Chrome 131.0.6778.108 -- ChromeDriver 131.0.6778.87 +- Google Chrome 131.0.6778.139 +- ChromeDriver 131.0.6778.108 - Chromium 131.0.6778.0 -- Microsoft Edge 131.0.2903.86 +- Microsoft Edge 131.0.2903.99 - Microsoft Edge WebDriver 131.0.2903.87 - Selenium server 4.27.0 - Mozilla Firefox 133.0 @@ -185,7 +185,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ### .NET Tools - .NET Core SDK: 6.0.428, 7.0.410, 8.0.404 -- nbgv 3.6.146+392592327a +- nbgv 3.7.112+63bbe780b0 ### Databases - MongoDB 5.0.30 @@ -296,11 +296,11 @@ Use the following command as a part of your job to start the service: 'sudo syst | debian:9 | sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be | 2022-06-23 | | moby/buildkit:latest | sha256:58e6d150a3c5a4b92e99ea8df2cbe976ad6d2ae5beab39214e84fada05b059d5 | 2024-12-04 | | node:18 | sha256:b57ae84fe7880a23b389f8260d726b784010ed470c2ee26d4e2cbdb955d25b12 | 2024-11-15 | -| node:18-alpine | sha256:7e43a2d633d91e8655a6c0f45d2ed987aa4930f0792f6d9dd3bffc7496e44882 | 2024-11-15 | +| node:18-alpine | sha256:6eb9c3d9bd191bd2cc6ce7ec3d5ec4c2127616140c8586af96a6bec8f28689d1 | 2024-12-05 | | node:20 | sha256:f4755c9039bdeec5c736b2e0dd5b47700d6393b65688b9e9f807ec12f54a8690 | 2024-11-20 | -| node:20-alpine | sha256:b5b9467fe7b33aad47f1ec3f6e0646a658f85f05c18d4243024212a91f3b7554 | 2024-11-20 | +| node:20-alpine | sha256:426f843809ae05f324883afceebaa2b9cab9cb697097dbb1a2a7a41c5701de72 | 2024-12-05 | | node:22 | sha256:35a5dd72bcac4bce43266408b58a02be6ff0b6098ffa6f5435aeea980a8951d7 | 2024-12-03 | -| node:22-alpine | sha256:96cc8323e25c8cc6ddcb8b965e135cfd57846e8003ec0d7bcec16c5fd5f6d39f | 2024-12-03 | +| node:22-alpine | sha256:6e80991f69cc7722c561e5d14d5e72ab47c0d6b6cfb3ae50fb9cf9a7b30fdf97 | 2024-12-05 | | ubuntu:20.04 | sha256:8e5c4f0285ecbb4ead070431d29b576a530d3166df73ec44affc1cd27555141b | 2024-10-11 | ### Installed apt packages From 832c038b8198db5c911a8d92b4f3897a0078e5ef Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 18 Dec 2024 20:31:03 +0000 Subject: [PATCH 3355/3485] Updating readme file for macos-13 version 20241216.479 (#11207) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-13-Readme.md | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/images/macos/macos-13-Readme.md b/images/macos/macos-13-Readme.md index 7e77c40fcba6..ea616d59eba8 100644 --- a/images/macos/macos-13-Readme.md +++ b/images/macos/macos-13-Readme.md @@ -1,12 +1,13 @@ | Announcements | |-| +| [[macOS 14] Xcode 16.0 will be replaced by Xcode 16.2 in macOS-14 images on January 6, 2025](https://github.com/actions/runner-images/issues/11203) | | [[macOS] The macOS 12 Actions runner image will begin deprecation on 10/7/24 and will be fully unsupported by 12/3/24 for GitHub and by 01/13/25 for ADO](https://github.com/actions/runner-images/issues/10721) | | [macOS 15 (Sequoia) is now available as a public beta in GitHub Actions](https://github.com/actions/runner-images/issues/10686) | *** # macOS 13 -- OS Version: macOS 13.7.1 (22H221) +- OS Version: macOS 13.7.2 (22H313) - Kernel Version: Darwin 22.6.0 -- Image Version: 20241211.456 +- Image Version: 20241216.479 ## Installed Software @@ -33,14 +34,14 @@ - Bundler 2.5.23 - Carthage 0.40.0 - CocoaPods 1.16.2 -- Composer 2.8.3 +- Composer 2.8.4 - Homebrew 4.4.11 - NPM 10.8.2 - NuGet 6.3.1.1 - Pip3 24.3.1 (python 3.13) - Pipx 1.7.1 - RubyGems 3.5.23 -- Vcpkg 2024 (build from commit b7601ed37) +- Vcpkg 2024 (build from commit b545373a9) - Yarn 1.22.22 ### Project Management @@ -55,7 +56,7 @@ - bazel 8.0.0 - bazelisk 1.25.0 - bsdtar 3.5.3 - available by 'tar' alias -- Curl 8.11.0 +- Curl 8.11.1 - Git 2.47.1 - Git LFS 3.6.0 - GitHub CLI 2.63.2 @@ -71,8 +72,8 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.22.14 -- AWS SAM CLI 1.131.0 +- AWS CLI 2.22.17 +- AWS SAM CLI 1.132.0 - AWS Session Manager CLI 1.2.694.0 - Azure CLI 2.67.0 - Azure CLI (azure-devops) 1.0.1 @@ -89,14 +90,14 @@ - SwiftLint 0.57.1 ### Browsers -- Safari 18.1.1 (18619.2.8.111.7) -- SafariDriver 18.1.1 (18619.2.8.111.7) +- Safari 18.2 (18620.1.16.111.6) +- SafariDriver 18.2 (18620.1.16.111.6) - Google Chrome 131.0.6778.140 - Google Chrome for Testing 131.0.6778.108 - ChromeDriver 131.0.6778.108 -- Microsoft Edge 131.0.2903.86 +- Microsoft Edge 131.0.2903.99 - Microsoft Edge WebDriver 131.0.2903.87 -- Mozilla Firefox 133.0 +- Mozilla Firefox 133.0.3 - geckodriver 0.35.0 - Selenium server 4.27.0 @@ -263,7 +264,7 @@ | ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | ### Miscellaneous -- Tcl/Tk 8.6.15 +- Tcl/Tk 8.6.16 #### Environment variables | Name | Value | From f983f3da9589fc2d54cb5a67e58ed8aad38a0790 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 18 Dec 2024 21:39:31 +0000 Subject: [PATCH 3356/3485] Updating readme file for macos-13-arm64 version 20241216.537 (#11206) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-13-arm64-Readme.md | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/images/macos/macos-13-arm64-Readme.md b/images/macos/macos-13-arm64-Readme.md index a8409bda8f21..547dd14429f4 100644 --- a/images/macos/macos-13-arm64-Readme.md +++ b/images/macos/macos-13-arm64-Readme.md @@ -1,12 +1,13 @@ | Announcements | |-| +| [[macOS 14] Xcode 16.0 will be replaced by Xcode 16.2 in macOS-14 images on January 6, 2025](https://github.com/actions/runner-images/issues/11203) | | [[macOS] The macOS 12 Actions runner image will begin deprecation on 10/7/24 and will be fully unsupported by 12/3/24 for GitHub and by 01/13/25 for ADO](https://github.com/actions/runner-images/issues/10721) | | [macOS 15 (Sequoia) is now available as a public beta in GitHub Actions](https://github.com/actions/runner-images/issues/10686) | *** # macOS 13 -- OS Version: macOS 13.7.1 (22H221) +- OS Version: macOS 13.7.2 (22H313) - Kernel Version: Darwin 22.6.0 -- Image Version: 20241211.503 +- Image Version: 20241216.537 ## Installed Software @@ -68,8 +69,8 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.22.14 -- AWS SAM CLI 1.131.0 +- AWS CLI 2.22.17 +- AWS SAM CLI 1.132.0 - AWS Session Manager CLI 1.2.694.0 - Azure CLI 2.67.0 - Azure CLI (azure-devops) 1.0.1 @@ -85,8 +86,8 @@ ### Linters ### Browsers -- Safari 18.1.1 (18619.2.8.111.7) -- SafariDriver 18.1.1 (18619.2.8.111.7) +- Safari 18.2 (18620.1.16.111.6) +- SafariDriver 18.2 (18620.1.16.111.6) - Google Chrome 131.0.6778.140 - Google Chrome for Testing 131.0.6778.108 - ChromeDriver 131.0.6778.108 @@ -191,8 +192,8 @@ | Simulator - watchOS 9.4 | watchsimulator9.4 | 14.3.1 | | Simulator - watchOS 10.0 | watchsimulator10.0 | 15.0.1 | | Simulator - watchOS 10.2 | watchsimulator10.2 | 15.1, 15.2 | -| visionOS 1.0 | xros1.0 | 15.2 | | Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | +| visionOS 1.0 | xros1.0 | 15.2 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | @@ -245,5 +246,5 @@ | ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | ### Miscellaneous -- Tcl/Tk 8.6.15 +- Tcl/Tk 8.6.16 From f55af58f305d1ace1b6c37f934d6bdac07998414 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 18 Dec 2024 22:01:34 +0000 Subject: [PATCH 3357/3485] Updating readme file for win22 version 20241215.1.1 (#11202) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/windows/Windows2022-Readme.md | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/images/windows/Windows2022-Readme.md b/images/windows/Windows2022-Readme.md index 84010c0314ad..e4d281fe3d8d 100644 --- a/images/windows/Windows2022-Readme.md +++ b/images/windows/Windows2022-Readme.md @@ -7,7 +7,7 @@ *** # Windows Server 2022 - OS Version: 10.0.20348 Build 2966 -- Image Version: 20241211.1.0 +- Image Version: 20241215.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -36,7 +36,7 @@ - pip 24.3.1 (python 3.9) - Pipx 1.7.1 - RubyGems 3.2.33 -- Vcpkg (build from commit b7601ed37) +- Vcpkg (build from commit b545373a9) - Yarn 1.22.22 #### Environment variables @@ -71,7 +71,7 @@ - InnoSetup 6.3.3 - jq 1.7.1 - Kind 0.25.0 -- Kubectl 1.31.3 +- Kubectl 1.32.0 - Mercurial 5.0 - gcc 12.2.0 - gdb 11.2 @@ -80,7 +80,7 @@ - NSIS 3.10 - OpenSSL 1.1.1w - Packer 1.11.2 -- Pulumi 3.142.0 +- Pulumi 3.143.0 - R 4.4.2 - Service Fabric SDK 9.1.1436.9590 - Stack 3.1.1 @@ -93,9 +93,9 @@ - zstd 1.5.6 ### CLI Tools -- Alibaba Cloud CLI 3.0.235 -- AWS CLI 2.22.13 -- AWS SAM CLI 1.131.0 +- Alibaba Cloud CLI 3.0.237 +- AWS CLI 2.22.17 +- AWS SAM CLI 1.132.0 - AWS Session Manager CLI 1.2.694.0 - Azure CLI 2.67.0 - Azure DevOps CLI extension 1.0.1 @@ -118,8 +118,8 @@ ### Browsers and Drivers - Google Chrome 131.0.6778.140 - Chrome Driver 131.0.6778.108 -- Microsoft Edge 131.0.2903.86 -- Microsoft Edge Driver 131.0.2903.86 +- Microsoft Edge 131.0.2903.99 +- Microsoft Edge Driver 131.0.2903.99 - Mozilla Firefox 133.0.3 - Gecko Driver 0.35.0 - IE Driver 4.14.0.0 @@ -278,6 +278,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.Net.Component.4.6.2.TargetingPack | 17.12.35410.122 | | Microsoft.Net.Component.4.6.TargetingPack | 17.12.35410.122 | | Microsoft.Net.Component.4.7.1.TargetingPack | 17.12.35410.122 | +| Microsoft.Net.Component.4.7.2.SDK | 17.12.35410.122 | | Microsoft.Net.Component.4.7.2.TargetingPack | 17.12.35410.122 | | Microsoft.Net.Component.4.7.TargetingPack | 17.12.35410.122 | | Microsoft.Net.Component.4.8.1.SDK | 17.12.35410.122 | @@ -495,11 +496,11 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### .NET Core Tools - .NET Core SDK: 6.0.136, 6.0.203, 6.0.321, 6.0.428, 7.0.120, 7.0.203, 7.0.317, 7.0.410, 8.0.111, 8.0.206, 8.0.307, 8.0.404, 9.0.101 -- .NET Framework: 4.8, 4.8.1 +- .NET Framework: 4.7.2, 4.8, 4.8.1 - Microsoft.AspNetCore.App: 6.0.5, 6.0.26, 6.0.35, 6.0.36, 7.0.5, 7.0.20, 8.0.6, 8.0.11, 9.0.0 - Microsoft.NETCore.App: 6.0.5, 6.0.26, 6.0.35, 6.0.36, 7.0.5, 7.0.20, 8.0.6, 8.0.11, 9.0.0 - Microsoft.WindowsDesktop.App: 6.0.5, 6.0.26, 6.0.36, 7.0.5, 7.0.20, 8.0.6, 8.0.11, 9.0.0 -- nbgv 3.6.146+392592327a +- nbgv 3.7.112+63bbe780b0 ### PowerShell Tools - PowerShell 7.4.6 @@ -510,7 +511,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - AzureRM: 2.1.0 (Default), 6.13.1 - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.715 +- AWSPowershell: 4.1.718 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.10 - Microsoft.Graph: 2.25.0 From 70cee3d2bde9a0a9acd4bffe3838d99a3ad880d3 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 18 Dec 2024 22:15:37 +0000 Subject: [PATCH 3358/3485] Updating readme file for win19 version 20241215.1.1 (#11201) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/windows/Windows2019-Readme.md | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/images/windows/Windows2019-Readme.md b/images/windows/Windows2019-Readme.md index 61a68428e55c..af15efcc79a0 100644 --- a/images/windows/Windows2019-Readme.md +++ b/images/windows/Windows2019-Readme.md @@ -7,7 +7,7 @@ *** # Windows Server 2019 - OS Version: 10.0.17763 Build 6659 -- Image Version: 20241211.1.0 +- Image Version: 20241215.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -36,7 +36,7 @@ - pip 24.0 (python 3.7) - Pipx 1.2.1 - RubyGems 3.2.33 -- Vcpkg (build from commit b7601ed37) +- Vcpkg (build from commit b545373a9) - Yarn 1.22.22 #### Environment variables @@ -72,7 +72,7 @@ - InnoSetup 6.3.3 - jq 1.7.1 - Kind 0.25.0 -- Kubectl 1.31.3 +- Kubectl 1.32.0 - Mercurial 5.0 - gcc 8.1.0 - gdb 8.1 @@ -82,7 +82,7 @@ - OpenSSL 1.1.1w - Packer 1.11.2 - Parcel 2.13.2 -- Pulumi 3.142.0 +- Pulumi 3.143.0 - R 4.4.2 - Service Fabric SDK 9.1.1436.9590 - Stack 3.1.1 @@ -95,9 +95,9 @@ - zstd 1.5.6 ### CLI Tools -- Alibaba Cloud CLI 3.0.235 -- AWS CLI 2.22.13 -- AWS SAM CLI 1.131.0 +- Alibaba Cloud CLI 3.0.237 +- AWS CLI 2.22.17 +- AWS SAM CLI 1.132.0 - AWS Session Manager CLI 1.2.694.0 - Azure CLI 2.67.0 - Azure DevOps CLI extension 1.0.1 @@ -121,8 +121,8 @@ ### Browsers and Drivers - Google Chrome 131.0.6778.140 - Chrome Driver 131.0.6778.108 -- Microsoft Edge 131.0.2903.86 -- Microsoft Edge Driver 131.0.2903.86 +- Microsoft Edge 131.0.2903.99 +- Microsoft Edge Driver 131.0.2903.99 - Mozilla Firefox 133.0.3 - Gecko Driver 0.35.0 - IE Driver 4.14.0.0 @@ -501,7 +501,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Microsoft.AspNetCore.App: 6.0.5, 6.0.26, 6.0.36, 7.0.5, 7.0.20, 8.0.6, 8.0.11, 9.0.0 - Microsoft.NETCore.App: 6.0.5, 6.0.26, 6.0.36, 7.0.5, 7.0.20, 8.0.6, 8.0.11, 9.0.0 - Microsoft.WindowsDesktop.App: 6.0.5, 6.0.26, 6.0.36, 7.0.5, 7.0.20, 8.0.6, 8.0.11, 9.0.0 -- nbgv 3.6.146+392592327a +- nbgv 3.7.112+63bbe780b0 ### PowerShell Tools - PowerShell 7.4.6 @@ -512,7 +512,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - AzureRM: 2.1.0 (Default), 6.13.1 - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.715 +- AWSPowershell: 4.1.718 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.10 - Microsoft.Graph: 2.25.0 From 9dbed1b18ab62d799b56a4a63d06b6087d396084 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 18 Dec 2024 22:59:28 +0000 Subject: [PATCH 3359/3485] Updating readme file for macos-14 version 20241216.504 (#11209) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-14-Readme.md | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/images/macos/macos-14-Readme.md b/images/macos/macos-14-Readme.md index 16a37aaba1c6..6e7aa9055dc0 100644 --- a/images/macos/macos-14-Readme.md +++ b/images/macos/macos-14-Readme.md @@ -1,12 +1,13 @@ | Announcements | |-| +| [[macOS 14] Xcode 16.0 will be replaced by Xcode 16.2 in macOS-14 images on January 6, 2025](https://github.com/actions/runner-images/issues/11203) | | [[macOS] The macOS 12 Actions runner image will begin deprecation on 10/7/24 and will be fully unsupported by 12/3/24 for GitHub and by 01/13/25 for ADO](https://github.com/actions/runner-images/issues/10721) | | [macOS 15 (Sequoia) is now available as a public beta in GitHub Actions](https://github.com/actions/runner-images/issues/10686) | *** # macOS 14 -- OS Version: macOS 14.7.1 (23H222) +- OS Version: macOS 14.7.2 (23H311) - Kernel Version: Darwin 23.6.0 -- Image Version: 20241211.477 +- Image Version: 20241216.504 ## Installed Software @@ -33,7 +34,7 @@ - Bundler 2.5.23 - Carthage 0.40.0 - CocoaPods 1.16.2 -- Composer 2.8.3 +- Composer 2.8.4 - Homebrew 4.4.11 - NPM 10.8.2 - NuGet 6.3.1.1 @@ -54,7 +55,7 @@ - bazel 8.0.0 - bazelisk 1.25.0 - bsdtar 3.5.3 - available by 'tar' alias -- Curl 8.11.0 +- Curl 8.11.1 - Git 2.47.1 - Git LFS 3.6.0 - GitHub CLI 2.63.2 @@ -70,8 +71,8 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.22.14 -- AWS SAM CLI 1.131.0 +- AWS CLI 2.22.17 +- AWS SAM CLI 1.132.0 - AWS Session Manager CLI 1.2.694.0 - Azure CLI 2.67.0 - Azure CLI (azure-devops) 1.0.1 @@ -81,21 +82,21 @@ - Fastlane 2.226.0 - SwiftFormat 0.55.3 - Xcbeautify 2.16.0 -- Xcode Command Line Tools 16.1.0.0.1.1729049160 +- Xcode Command Line Tools 16.2.0.0.1.1733547573 - Xcodes 1.6.0 ### Linters - SwiftLint 0.57.1 ### Browsers -- Safari 18.1.1 (19619.2.8.111.7) -- SafariDriver 18.1.1 (19619.2.8.111.7) +- Safari 18.2 (19620.1.16.111.6) +- SafariDriver 18.2 (19620.1.16.111.6) - Google Chrome 131.0.6778.140 - Google Chrome for Testing 131.0.6778.108 - ChromeDriver 131.0.6778.108 -- Microsoft Edge 131.0.2903.86 +- Microsoft Edge 131.0.2903.99 - Microsoft Edge WebDriver 131.0.2903.87 -- Mozilla Firefox 133.0 +- Mozilla Firefox 133.0.3 - geckodriver 0.35.0 - Selenium server 4.27.0 @@ -217,8 +218,8 @@ | Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | | Simulator - visionOS 1.1 | xrsimulator1.1 | 15.3 | | visionOS 1.1 | xros1.1 | 15.3 | -| visionOS 1.2 | xros1.2 | 15.4 | | Simulator - visionOS 1.2 | xrsimulator1.2 | 15.4 | +| visionOS 1.2 | xros1.2 | 15.4 | | Simulator - visionOS 2.0 | xrsimulator2.0 | 16.0 | | visionOS 2.0 | xros2.0 | 16.0 | | visionOS 2.1 | xros2.1 | 16.1 | @@ -277,7 +278,7 @@ | ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | ### Miscellaneous -- Tcl/Tk 8.6.15 +- Tcl/Tk 8.6.16 #### Environment variables | Name | Value | From bcf2ea82ad93c11a2d592ea9a0150bc0a4eae025 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 19 Dec 2024 00:11:37 +0000 Subject: [PATCH 3360/3485] Updating readme file for macos-14-arm64 version 20241216.651 (#11210) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-14-arm64-Readme.md | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/images/macos/macos-14-arm64-Readme.md b/images/macos/macos-14-arm64-Readme.md index e08598270706..313833631e66 100644 --- a/images/macos/macos-14-arm64-Readme.md +++ b/images/macos/macos-14-arm64-Readme.md @@ -1,12 +1,13 @@ | Announcements | |-| +| [[macOS 14] Xcode 16.0 will be replaced by Xcode 16.2 in macOS-14 images on January 6, 2025](https://github.com/actions/runner-images/issues/11203) | | [[macOS] The macOS 12 Actions runner image will begin deprecation on 10/7/24 and will be fully unsupported by 12/3/24 for GitHub and by 01/13/25 for ADO](https://github.com/actions/runner-images/issues/10721) | | [macOS 15 (Sequoia) is now available as a public beta in GitHub Actions](https://github.com/actions/runner-images/issues/10686) | *** # macOS 14 -- OS Version: macOS 14.7.1 (23H222) +- OS Version: macOS 14.7.2 (23H311) - Kernel Version: Darwin 23.6.0 -- Image Version: 20241211.616 +- Image Version: 20241216.651 ## Installed Software @@ -68,8 +69,8 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.22.14 -- AWS SAM CLI 1.131.0 +- AWS CLI 2.22.17 +- AWS SAM CLI 1.132.0 - AWS Session Manager CLI 1.2.694.0 - Azure CLI 2.67.0 - Azure CLI (azure-devops) 1.0.1 @@ -79,14 +80,14 @@ - Fastlane 2.226.0 - SwiftFormat 0.55.3 - Xcbeautify 2.16.0 -- Xcode Command Line Tools 16.1.0.0.1.1729049160 +- Xcode Command Line Tools 16.2.0.0.1.1733547573 - Xcodes 1.6.0 ### Linters ### Browsers -- Safari 18.1.1 (19619.2.8.111.7) -- SafariDriver 18.1.1 (19619.2.8.111.7) +- Safari 18.2 (19620.1.16.111.6) +- SafariDriver 18.2 (19620.1.16.111.6) - Google Chrome 131.0.6778.140 - Google Chrome for Testing 131.0.6778.108 - ChromeDriver 131.0.6778.108 @@ -203,14 +204,14 @@ | Simulator - watchOS 10.5 | watchsimulator10.5 | 15.4 | | Simulator - watchOS 11.0 | watchsimulator11.0 | 16.0 | | Simulator - watchOS 11.1 | watchsimulator11.1 | 16.1 | -| visionOS 1.0 | xros1.0 | 15.2 | | Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | -| Simulator - visionOS 1.1 | xrsimulator1.1 | 15.3 | +| visionOS 1.0 | xros1.0 | 15.2 | | visionOS 1.1 | xros1.1 | 15.3 | +| Simulator - visionOS 1.1 | xrsimulator1.1 | 15.3 | | Simulator - visionOS 1.2 | xrsimulator1.2 | 15.4 | | visionOS 1.2 | xros1.2 | 15.4 | -| Simulator - visionOS 2.0 | xrsimulator2.0 | 16.0 | | visionOS 2.0 | xros2.0 | 16.0 | +| Simulator - visionOS 2.0 | xrsimulator2.0 | 16.0 | | visionOS 2.1 | xros2.1 | 16.1 | | Simulator - visionOS 2.1 | xrsimulator2.1 | 16.1 | | DriverKit 23.0 | driverkit23.0 | 15.0.1 | @@ -270,5 +271,5 @@ | ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | ### Miscellaneous -- Tcl/Tk 8.6.15 +- Tcl/Tk 8.6.16 From c9d728fd252f923878650803fa9a50903bd46a98 Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Thu, 19 Dec 2024 11:16:24 +0100 Subject: [PATCH 3361/3485] [windows-2025] Install mongosh for ALLUSERS and enable test (#11224) --- images/windows/scripts/build/Install-MongoDB.ps1 | 5 +++-- images/windows/scripts/tests/Databases.Tests.ps1 | 6 ++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/images/windows/scripts/build/Install-MongoDB.ps1 b/images/windows/scripts/build/Install-MongoDB.ps1 index 2eaecc390a13..ef187f9dae39 100644 --- a/images/windows/scripts/build/Install-MongoDB.ps1 +++ b/images/windows/scripts/build/Install-MongoDB.ps1 @@ -49,8 +49,9 @@ if (Test-IsWin25) { -UrlMatchPattern "mongosh-*-x64.msi" Install-Binary -Type MSI ` - -Url $mongoshDownloadUrl ` - -ExpectedSignature 'A5BBE2A6DA1D2A6E057EF870267E6A91E4D56BAA' + -Url $mongoshDownloadUrl ` + -ExtraInstallArgs @('ALLUSERS=1') ` + -ExpectedSignature 'A5BBE2A6DA1D2A6E057EF870267E6A91E4D56BAA' } Invoke-PesterTests -TestFile "Databases" -TestName "MongoDB" diff --git a/images/windows/scripts/tests/Databases.Tests.ps1 b/images/windows/scripts/tests/Databases.Tests.ps1 index 08e73befd4a1..de30a2616f09 100644 --- a/images/windows/scripts/tests/Databases.Tests.ps1 +++ b/images/windows/scripts/tests/Databases.Tests.ps1 @@ -30,8 +30,10 @@ Describe "MongoDB" { } } - Context "Shell" -Skip:(-not (Test-IsWin19) -or -not (Test-IsWin22)) { - "mongosh --version" | Should -Not -BeNullOrEmpty + Context "Shell" -Skip:(-not (Test-IsWin25)) { + It "mongosh" { + "mongosh --version" | Should -ReturnZeroExitCode + } } } From 3373b502f7cba153309e01552efc71cd7ad91fc2 Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Thu, 19 Dec 2024 15:04:27 +0100 Subject: [PATCH 3362/3485] [Windows] Introduce Windows Server 2025 beta image (#11227) --- .github/ISSUE_TEMPLATE/announcement.yml | 1 + .github/ISSUE_TEMPLATE/bug-report.yml | 1 + .github/ISSUE_TEMPLATE/tool-request.yml | 1 + README.md | 2 + images/windows/Windows2025-Readme.md | 509 ++++++++++++++++++++++++ 5 files changed, 514 insertions(+) create mode 100644 images/windows/Windows2025-Readme.md diff --git a/.github/ISSUE_TEMPLATE/announcement.yml b/.github/ISSUE_TEMPLATE/announcement.yml index 59e683bf6ffa..abfb4bf40e0b 100644 --- a/.github/ISSUE_TEMPLATE/announcement.yml +++ b/.github/ISSUE_TEMPLATE/announcement.yml @@ -48,6 +48,7 @@ body: - label: macOS 15 Arm64 - label: Windows Server 2019 - label: Windows Server 2022 + - label: Windows Server 2025 - type: textarea attributes: label: Mitigation ways diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml index 695f5c887924..6aa187756124 100644 --- a/.github/ISSUE_TEMPLATE/bug-report.yml +++ b/.github/ISSUE_TEMPLATE/bug-report.yml @@ -31,6 +31,7 @@ body: - label: macOS 15 Arm64 - label: Windows Server 2019 - label: Windows Server 2022 + - label: Windows Server 2025 - type: textarea attributes: label: Image version and build link diff --git a/.github/ISSUE_TEMPLATE/tool-request.yml b/.github/ISSUE_TEMPLATE/tool-request.yml index b0fb98a16bcb..89a76aee0fba 100644 --- a/.github/ISSUE_TEMPLATE/tool-request.yml +++ b/.github/ISSUE_TEMPLATE/tool-request.yml @@ -69,6 +69,7 @@ body: - label: macOS 15 Arm64 - label: Windows Server 2019 - label: Windows Server 2022 + - label: Windows Server 2025 - type: textarea attributes: label: Can this tool be installed during the build? diff --git a/README.md b/README.md index 0f32f0cb1488..f4074008601e 100644 --- a/README.md +++ b/README.md @@ -31,6 +31,7 @@ To build a VM machine from this repo's source, see the [instructions](docs/creat | macOS 13 | `macos-13` or `macos-13-large` | [macOS-13] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fsubir0071%2F385e39188f4280878bada99250e99db7%2Fraw%2Fmacos-13.json) | | macOS 13 Arm64 | `macos-13-xlarge` | [macOS-13-arm64] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fsubir0071%2F385e39188f4280878bada99250e99db7%2Fraw%2Fmacos-13-arm64.json) | | macOS 12 <sup>deprecated</sup> | `macos-12` or `macos-12-large`| [macOS-12] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fsubir0071%2F385e39188f4280878bada99250e99db7%2Fraw%2Fmacos-12.json) | +| Windows Server 2025 <sup>beta</sup> | `windows-2025` | [windows-2025] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fsubir0071%2F385e39188f4280878bada99250e99db7%2Fraw%2Fwin25.json) | | Windows Server 2022 | `windows-latest` or `windows-2022` | [windows-2022] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fsubir0071%2F385e39188f4280878bada99250e99db7%2Fraw%2Fwin22.json) | | Windows Server 2019 | `windows-2019` | [windows-2019] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fsubir0071%2F385e39188f4280878bada99250e99db7%2Fraw%2Fwin19.json) | @@ -42,6 +43,7 @@ To build a VM machine from this repo's source, see the [instructions](docs/creat [ubuntu-24.04]: https://github.com/actions/runner-images/blob/main/images/ubuntu/Ubuntu2404-Readme.md [ubuntu-22.04]: https://github.com/actions/runner-images/blob/main/images/ubuntu/Ubuntu2204-Readme.md [ubuntu-20.04]: https://github.com/actions/runner-images/blob/main/images/ubuntu/Ubuntu2004-Readme.md +[windows-2025]: https://github.com/actions/runner-images/blob/main/images/windows/Windows2025-Readme.md [windows-2022]: https://github.com/actions/runner-images/blob/main/images/windows/Windows2022-Readme.md [windows-2019]: https://github.com/actions/runner-images/blob/main/images/windows/Windows2019-Readme.md [macOS-12]: https://github.com/actions/runner-images/blob/main/images/macos/macos-12-Readme.md diff --git a/images/windows/Windows2025-Readme.md b/images/windows/Windows2025-Readme.md new file mode 100644 index 000000000000..5e044ee12d89 --- /dev/null +++ b/images/windows/Windows2025-Readme.md @@ -0,0 +1,509 @@ +# Windows Server 2025 +- OS Version: 10.0.26100 Build 2605 +- Image Version: 20241215.1.0 + +## Windows features +- Windows Subsystem for Linux (WSLv1): Enabled + +## Installed Software + +### Language and Runtime +- Bash 5.2.37(1)-release +- Go 1.23.4 +- Julia 1.10.5 +- Kotlin 2.1.0 +- LLVM 19.1.5 +- Node 22.12.0 +- Perl 5.40.0 +- PHP 8.3.14 +- Python 3.9.13 +- Ruby 3.3.6 + +### Package Management +- Chocolatey 2.4.1 +- Composer 2.8.4 +- Helm 3.16.2 +- Miniconda 24.9.2 (pre-installed on the image but not added to PATH) +- NPM 10.9.0 +- NuGet 6.12.1.1 +- pip 24.3.1 (python 3.9) +- Pipx 1.7.1 +- RubyGems 3.5.22 +- Vcpkg (build from commit c26eabb23) +- Yarn 1.22.22 + +#### Environment variables +| Name | Value | +| ----------------------- | ------------ | +| VCPKG_INSTALLATION_ROOT | C:\vcpkg | +| CONDA | C:\Miniconda | + +### Project Management +- Ant 1.10.14 +- Gradle 8.11 +- Maven 3.9.9 +- sbt 1.10.6 + +### Tools +- 7zip 24.09 +- aria2 1.37.0 +- azcopy 10.27.1 +- Bazel 8.0.0 +- Bazelisk 1.25.0 +- Bicep 0.32.4 +- Cabal 3.12.1.0 +- CMake 3.31.2 +- CodeQL Action Bundle 2.20.0 +- Docker 26.1.3 +- Docker Compose v2 2.27.1 +- Docker-wincred 0.8.2 +- ghc 9.10.1 +- Git 2.47.1.windows.1 +- Git LFS 3.6.0 +- ImageMagick 7.1.1-41 +- jq 1.7.1 +- Kind 0.25.0 +- Kubectl 1.32.0 +- gcc 14.2.0 +- gdb 14.2 +- GNU Binutils 2.42 +- Newman 6.2.1 +- OpenSSL 3.4.0 +- Packer 1.11.2 +- Pulumi 3.143.0 +- R 4.4.2 +- Service Fabric SDK 10.1.2493.9590 +- Stack 3.1.1 +- Swig 4.1.1 +- VSWhere 3.1.7 +- WinAppDriver 1.2.2009.02003 +- WiX Toolset 3.14.1.8722 +- yamllint 1.35.1 +- zstd 1.5.6 + +### CLI Tools +- AWS CLI 2.22.17 +- AWS SAM CLI 1.132.0 +- AWS Session Manager CLI 1.2.694.0 +- Azure CLI 2.67.0 +- Azure DevOps CLI extension 1.0.1 +- GitHub CLI 2.63.2 + +### Rust Tools +- Cargo 1.83.0 +- Rust 1.83.0 +- Rustdoc 1.83.0 +- Rustup 1.27.1 + +#### Packages +- Clippy 0.1.83 +- Rustfmt 1.8.0 + +### Browsers and Drivers +- Google Chrome 131.0.6778.140 +- Chrome Driver 131.0.6778.108 +- Microsoft Edge 131.0.2903.99 +- Microsoft Edge Driver 131.0.2903.99 +- Mozilla Firefox 133.0.3 +- Gecko Driver 0.35.0 +- IE Driver 4.14.0.0 +- Selenium server 4.27.0 + +#### Environment variables +| Name | Value | +| ----------------- | ---------------------------------- | +| CHROMEWEBDRIVER | C:\SeleniumWebDrivers\ChromeDriver | +| EDGEWEBDRIVER | C:\SeleniumWebDrivers\EdgeDriver | +| GECKOWEBDRIVER | C:\SeleniumWebDrivers\GeckoDriver | +| SELENIUM_JAR_PATH | C:\selenium\selenium-server.jar | + +### Java +| Version | Environment Variable | +| -------------------- | -------------------- | +| 8.0.432+6 | JAVA_HOME_8_X64 | +| 11.0.25+9 | JAVA_HOME_11_X64 | +| 17.0.13+11 (default) | JAVA_HOME_17_X64 | +| 21.0.5+11.0 | JAVA_HOME_21_X64 | + +### Shells +| Name | Target | +| ------------- | --------------------------------- | +| gitbash.exe | C:\Program Files\Git\bin\bash.exe | +| msys2bash.cmd | C:\msys64\usr\bin\bash.exe | +| wslbash.exe | C:\Windows\System32\bash.exe | + +### MSYS2 +- Pacman 6.1.0 + +#### Notes +``` +Location: C:\msys64 + +Note: MSYS2 is pre-installed on image but not added to PATH. +``` + +### Cached Tools + +#### Go +- 1.21.13 +- 1.22.10 +- 1.23.4 + +#### Node.js +- 18.20.5 +- 20.18.1 +- 22.12.0 + +#### Python +- 3.9.13 +- 3.10.11 +- 3.11.9 +- 3.12.8 +- 3.13.1 + +#### PyPy +- 3.9.19 [PyPy 7.3.16] +- 3.10.14 [PyPy 7.3.17] + +#### Ruby +- 3.1.6 +- 3.2.6 +- 3.3.6 + +### Databases + +#### PostgreSQL +| Property | Value | +| -------------------- | ------------------------------------------------------------------------------------------------------------------------------------ | +| ServiceName | postgresql-x64-17 | +| Version | 17.2 | +| ServiceStatus | Stopped | +| ServiceStartType | Disabled | +| EnvironmentVariables | PGBIN=C:\Program Files\PostgreSQL\17\bin <br> PGDATA=C:\Program Files\PostgreSQL\17\data <br> PGROOT=C:\Program Files\PostgreSQL\17 | +| Path | C:\Program Files\PostgreSQL\17 | +| UserName | postgres | +| Password | root | + +#### MongoDB +| Version | ServiceName | ServiceStatus | ServiceStartType | +| -------- | ----------- | ------------- | ---------------- | +| 7.0.15.0 | MongoDB | Stopped | Disabled | + +### Database tools +- Azure CosmosDb Emulator 2.14.21.0 +- DacFx 162.5.57.1 +- MySQL 8.0.40.0 +- SQL OLEDB Driver 18.7.4.0 +- SQLPS 1.0 + +### Web Servers +| Name | Version | ConfigFile | ServiceName | ServiceStatus | ListenPort | +| ------ | ------- | ------------------------------------- | ----------- | ------------- | ---------- | +| Apache | 2.4.55 | C:\tools\Apache24\conf\httpd.conf | Apache | Stopped | 80 | +| Nginx | 1.27.3 | C:\tools\nginx-1.27.3\conf\nginx.conf | nginx | Stopped | 80 | + +### Visual Studio Enterprise 2022 +| Name | Version | Path | +| ----------------------------- | --------------- | -------------------------------------------------------- | +| Visual Studio Enterprise 2022 | 17.12.35527.113 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | + +#### Workloads, components and extensions +| Package | Version | +| ------------------------------------------------------------------------- | --------------- | +| android | 35.0.7.0 | +| Component.Android.NDK.R23C | 17.12.35410.122 | +| Component.Android.SDK.MAUI | 17.12.35410.122 | +| Component.Dotfuscator | 17.12.35410.122 | +| Component.Linux.CMake | 17.12.35410.122 | +| Component.Linux.RemoteFileExplorer | 17.12.35410.122 | +| Component.MDD.Android | 17.12.35410.122 | +| Component.MDD.Linux | 17.12.35410.122 | +| Component.MDD.Linux.GCC.arm | 17.12.35410.122 | +| Component.Microsoft.VisualStudio.LiveShare.2022 | 1.0.5940 | +| Component.Microsoft.VisualStudio.RazorExtension | 17.12.35410.122 | +| Component.Microsoft.VisualStudio.Tools.Applications.amd64 | 17.0.33617.0 | +| Component.Microsoft.VisualStudio.Web.AzureFunctions | 17.12.35410.122 | +| Component.Microsoft.Web.LibraryManager | 17.12.35410.122 | +| Component.Microsoft.WebTools.BrowserLink.WebLivePreview | 17.12.8.55161 | +| Component.Microsoft.Windows.DriverKit | 10.0.26100.10 | +| Component.OpenJDK | 17.12.35410.122 | +| Component.UnityEngine.x64 | 17.12.35410.122 | +| Component.Unreal.Ide | 17.12.35410.122 | +| Component.VisualStudio.GitHub.Copilot | 17.12.35527.66 | +| Component.VSInstallerProjects2022 | 2.0.1 | +| Component.WixToolset.VisualStudioExtension.Dev17 | 1.0.0.22 | +| Component.WixToolset.VisualStudioExtension.Schemas3 | 1.0.0.22 | +| Component.Xamarin.RemotedSimulator | 17.12.35410.122 | +| ios | 18.1.9163.0 | +| maccatalyst | 18.1.9163.0 | +| maui.blazor | 9.0.0.11787 | +| maui.core | 9.0.0.11787 | +| maui.windows | 9.0.0.11787 | +| Microsoft.Component.Azure.DataLake.Tools | 17.12.35410.122 | +| Microsoft.Component.ClickOnce | 17.12.35410.122 | +| Microsoft.Component.CodeAnalysis.SDK | 17.12.35410.122 | +| Microsoft.Component.MSBuild | 17.12.35410.122 | +| Microsoft.Component.NetFX.Native | 17.12.35410.122 | +| Microsoft.Component.PythonTools | 17.12.35410.122 | +| Microsoft.Component.PythonTools.Web | 17.12.35410.122 | +| Microsoft.Component.VC.Runtime.UCRTSDK | 17.12.35410.122 | +| Microsoft.ComponentGroup.Blend | 17.12.35410.122 | +| Microsoft.ComponentGroup.ClickOnce.Publish | 17.12.35410.122 | +| Microsoft.Net.Component.4.5.2.TargetingPack | 17.12.35410.122 | +| Microsoft.Net.Component.4.6.2.TargetingPack | 17.12.35410.122 | +| Microsoft.Net.Component.4.6.TargetingPack | 17.12.35410.122 | +| Microsoft.Net.Component.4.7.1.TargetingPack | 17.12.35410.122 | +| Microsoft.Net.Component.4.7.2.TargetingPack | 17.12.35410.122 | +| Microsoft.Net.Component.4.7.TargetingPack | 17.12.35410.122 | +| Microsoft.Net.Component.4.8.1.SDK | 17.12.35410.122 | +| Microsoft.Net.Component.4.8.1.TargetingPack | 17.12.35410.122 | +| Microsoft.Net.Component.4.8.SDK | 17.12.35410.122 | +| Microsoft.Net.Component.4.8.TargetingPack | 17.12.35410.122 | +| Microsoft.Net.ComponentGroup.4.8.DeveloperTools | 17.12.35410.122 | +| Microsoft.Net.ComponentGroup.DevelopmentPrerequisites | 17.12.35410.122 | +| Microsoft.Net.ComponentGroup.TargetingPacks.Common | 17.12.35410.122 | +| microsoft.net.runtime.android | 9.0.24.52809 | +| microsoft.net.runtime.android.aot | 9.0.24.52809 | +| microsoft.net.runtime.android.aot.net8 | 9.0.24.52809 | +| microsoft.net.runtime.android.net8 | 9.0.24.52809 | +| microsoft.net.runtime.ios | 9.0.24.52809 | +| microsoft.net.runtime.ios.net8 | 9.0.24.52809 | +| microsoft.net.runtime.maccatalyst | 9.0.24.52809 | +| microsoft.net.runtime.maccatalyst.net8 | 9.0.24.52809 | +| microsoft.net.runtime.mono.tooling | 9.0.24.52809 | +| microsoft.net.runtime.mono.tooling.net8 | 9.0.24.52809 | +| microsoft.net.sdk.emscripten | 9.0.11.2802 | +| Microsoft.NetCore.Component.DevelopmentTools | 17.12.35410.122 | +| Microsoft.NetCore.Component.Runtime.6.0 | 17.12.35504.99 | +| Microsoft.NetCore.Component.Runtime.8.0 | 17.12.35504.99 | +| Microsoft.NetCore.Component.Runtime.9.0 | 17.12.35527.66 | +| Microsoft.NetCore.Component.SDK | 17.12.35527.66 | +| Microsoft.NetCore.Component.Web | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.AppInsights.Tools | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.AspNet | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.AspNet45 | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.Azure.AuthoringTools | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.Azure.ClientLibs | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.Azure.Compute.Emulator | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.Azure.Powershell | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.Azure.ResourceManager.Tools | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.Azure.ServiceFabric.Tools | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.Azure.Waverton | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.Azure.Waverton.BuildTools | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.ClassDesigner | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.CodeMap | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.Common.Azure.Tools | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.CoreEditor | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.CppBuildInsights | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.Debugger.JustInTime | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.Debugger.Snapshot | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.DiagnosticTools | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.DockerTools | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.DotNetModelBuilder | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.DslTools | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.Embedded | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.EntityFramework | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.FSharp | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.FSharp.Desktop | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.FSharp.WebTemplates | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.GraphDocument | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.Graphics | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.Graphics.Tools | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.HLSL | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.IISExpress | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.IntelliCode | 17.12.35527.102 | +| Microsoft.VisualStudio.Component.IntelliTrace.FrontEnd | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.JavaScript.Diagnostics | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.JavaScript.TypeScript | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.LinqToSql | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.LiveUnitTesting | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.ManagedDesktop.Core | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.ManagedDesktop.Prerequisites | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.Merq | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.MonoDebugger | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.MSODBC.SQL | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.MSSQL.CMDLnUtils | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.Node.Tools | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.NuGet | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.NuGet.BuildTools | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.PortableLibrary | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.Roslyn.Compiler | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.Roslyn.LanguageServices | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.Sharepoint.Tools | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.SQL.CLR | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.SQL.DataSources | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.SQL.LocalDB.Runtime | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.SQL.SSDT | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.TeamOffice | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.TestTools.CodedUITest | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.TestTools.WebLoadTest | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.TextTemplating | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.TypeScript.TSServer | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.Unity | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.UWP.VC.ARM64 | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.UWP.VC.ARM64EC | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM64 | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.VC.ASAN | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.VC.ATL | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.VC.ATL.ARM | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.VC.ATL.ARM.Spectre | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.VC.ATL.ARM64 | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.VC.ATL.ARM64.Spectre | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.VC.ATL.Spectre | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.VC.ATLMFC | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.VC.ATLMFC.Spectre | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.VC.CLI.Support | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.VC.CMake.Project | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.VC.CoreIde | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.VC.DiagnosticTools | 17.12.35527.67 | +| Microsoft.VisualStudio.Component.VC.Llvm.Clang | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.VC.Llvm.ClangToolset | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.VC.MFC.ARM | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.VC.MFC.ARM.Spectre | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.VC.MFC.ARM64 | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.VC.MFC.ARM64.Spectre | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.VC.Modules.x86.x64 | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.VC.Redist.14.Latest | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.VC.Redist.MSM | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.VC.Runtimes.ARM.Spectre | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.VC.Runtimes.ARM64.Spectre | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.VC.Runtimes.ARM64EC.Spectre | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.VC.Runtimes.x86.x64.Spectre | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.VC.TestAdapterForBoostTest | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.VC.TestAdapterForGoogleTest | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.VC.Tools.ARM | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.VC.Tools.ARM64 | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.VC.Tools.ARM64EC | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.VC.Tools.x86.x64 | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.Vcpkg | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.VSSDK | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.Wcf.Tooling | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.Web | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.WebDeploy | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.Windows10SDK | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.Windows11SDK.22621 | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.Windows11SDK.26100 | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.Windows11Sdk.WindowsPerformanceToolkit | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.WindowsAppSdkSupport.CSharp | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.Workflow | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.WslDebugging | 17.12.35410.122 | +| Microsoft.VisualStudio.ComponentGroup.ArchitectureTools.Native | 17.12.35410.122 | +| Microsoft.VisualStudio.ComponentGroup.Azure.CloudServices | 17.12.35410.122 | +| Microsoft.VisualStudio.ComponentGroup.Azure.Prerequisites | 17.12.35410.122 | +| Microsoft.VisualStudio.ComponentGroup.Azure.ResourceManager.Tools | 17.12.35410.122 | +| Microsoft.VisualStudio.ComponentGroup.AzureFunctions | 17.12.35410.122 | +| Microsoft.VisualStudio.ComponentGroup.Maui.All | 17.12.35410.122 | +| Microsoft.VisualStudio.ComponentGroup.Maui.Android | 17.12.35410.122 | +| Microsoft.VisualStudio.ComponentGroup.Maui.Blazor | 17.12.35410.122 | +| Microsoft.VisualStudio.ComponentGroup.Maui.iOS | 17.12.35410.122 | +| Microsoft.VisualStudio.ComponentGroup.Maui.MacCatalyst | 17.12.35410.122 | +| Microsoft.VisualStudio.ComponentGroup.Maui.Shared | 17.12.35410.122 | +| Microsoft.VisualStudio.ComponentGroup.Maui.Windows | 17.12.35410.122 | +| Microsoft.VisualStudio.ComponentGroup.MSIX.Packaging | 17.12.35410.122 | +| Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core | 17.12.35410.122 | +| Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Llvm.Clang | 17.12.35410.122 | +| Microsoft.VisualStudio.ComponentGroup.UWP.NetCoreAndStandard | 17.12.35410.122 | +| Microsoft.VisualStudio.ComponentGroup.UWP.VC.v142 | 17.12.35410.122 | +| Microsoft.VisualStudio.ComponentGroup.VC.Tools.142.x86.x64 | 17.12.35410.122 | +| Microsoft.VisualStudio.ComponentGroup.VisualStudioExtension.Prerequisites | 17.12.35410.122 | +| Microsoft.VisualStudio.ComponentGroup.Web | 17.12.35410.122 | +| Microsoft.VisualStudio.ComponentGroup.Web.CloudTools | 17.12.35410.122 | +| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions | 17.12.35410.122 | +| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.CMake | 17.12.35410.122 | +| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.TemplateEngine | 17.12.35410.122 | +| Microsoft.VisualStudio.ComponentGroup.WindowsAppDevelopment.Prerequisites | 17.12.35410.122 | +| Microsoft.VisualStudio.ComponentGroup.WindowsAppSDK.Cs | 17.12.35410.122 | +| Microsoft.VisualStudio.Workload.Azure | 17.12.35410.122 | +| Microsoft.VisualStudio.Workload.CoreEditor | 17.12.35410.122 | +| Microsoft.VisualStudio.Workload.Data | 17.12.35410.122 | +| Microsoft.VisualStudio.Workload.DataScience | 17.12.35410.122 | +| Microsoft.VisualStudio.Workload.ManagedDesktop | 17.12.35410.122 | +| Microsoft.VisualStudio.Workload.ManagedGame | 17.12.35410.122 | +| Microsoft.VisualStudio.Workload.NativeCrossPlat | 17.12.35410.122 | +| Microsoft.VisualStudio.Workload.NativeDesktop | 17.12.35410.122 | +| Microsoft.VisualStudio.Workload.NativeGame | 17.12.35410.122 | +| Microsoft.VisualStudio.Workload.NativeMobile | 17.12.35410.122 | +| Microsoft.VisualStudio.Workload.NetCrossPlat | 17.12.35410.122 | +| Microsoft.VisualStudio.Workload.NetWeb | 17.12.35504.99 | +| Microsoft.VisualStudio.Workload.Node | 17.12.35410.122 | +| Microsoft.VisualStudio.Workload.Office | 17.12.35410.122 | +| Microsoft.VisualStudio.Workload.Python | 17.12.35410.122 | +| Microsoft.VisualStudio.Workload.Universal | 17.12.35410.122 | +| Microsoft.VisualStudio.Workload.VisualStudioExtension | 17.12.35410.122 | +| runtimes.ios | 9.0.24.52809 | +| runtimes.ios.net8 | 9.0.24.52809 | +| runtimes.maccatalyst | 9.0.24.52809 | +| runtimes.maccatalyst.net8 | 9.0.24.52809 | +| wasm.tools | 9.0.24.52809 | +| ProBITools.MicrosoftAnalysisServicesModelingProjects2022 | 3.0.4 | +| ProBITools.MicrosoftReportProjectsforVisualStudio2022 | 3.0.1 | +| SSIS.MicrosoftDataToolsIntegrationServices | 1.5 | +| VisualStudioClient.MicrosoftVisualStudio2022InstallerProjects | 2.0.1 | +| Windows Driver Kit Visual Studio Extension | 10.0.26100.10 | +| Windows Software Development Kit | 10.1.26100.1742 | +| WixToolset.WixToolsetVisualStudio2022Extension | 1.0.0.22 | + +#### Microsoft Visual C++ +| Name | Architecture | Version | +| -------------------------------------------- | ------------ | ----------- | +| Microsoft Visual C++ 2013 Additional Runtime | x64 | 12.0.40660 | +| Microsoft Visual C++ 2013 Minimum Runtime | x64 | 12.0.40660 | +| Microsoft Visual C++ 2022 Additional Runtime | x64 | 14.42.34433 | +| Microsoft Visual C++ 2022 Debug Runtime | x64 | 14.42.34433 | +| Microsoft Visual C++ 2022 Minimum Runtime | x64 | 14.42.34433 | +| Microsoft Visual C++ 2022 Additional Runtime | x86 | 14.42.34433 | +| Microsoft Visual C++ 2022 Debug Runtime | x86 | 14.42.34433 | +| Microsoft Visual C++ 2022 Minimum Runtime | x86 | 14.42.34433 | + +#### Installed Windows SDKs +- 10.0.22621.0 +- 10.0.26100.0 + +### .NET Core Tools +- .NET Core SDK: 8.0.111, 8.0.206, 8.0.307, 8.0.404, 9.0.101 +- .NET Framework: 4.8, 4.8.1 +- Microsoft.AspNetCore.App: 6.0.36, 8.0.6, 8.0.11, 9.0.0 +- Microsoft.NETCore.App: 6.0.36, 8.0.6, 8.0.11, 9.0.0 +- Microsoft.WindowsDesktop.App: 6.0.36, 8.0.6, 8.0.11, 9.0.0 +- nbgv 3.7.112+63bbe780b0 + +### PowerShell Tools +- PowerShell 7.4.6 + +#### Powershell Modules +- Az: 12.4.0 +- AWSPowershell: 4.1.718 +- DockerMsftProvider: 1.0.0.8 +- MarkdownPS: 1.10 +- Microsoft.Graph: 2.25.0 +- Pester: 3.4.0, 5.6.1 +- PowerShellGet: 1.0.0.1, 2.2.5 +- PSScriptAnalyzer: 1.23.0 +- PSWindowsUpdate: 2.2.1.5 +- SqlServer: 22.3.0 +- VSSetup: 2.2.16 + +### Android +| Package Name | Version | +| -------------------------- | -------------------------------------------------------------------- | +| Android Command Line Tools | 16.0 | +| Android Emulator | 35.2.10 | +| Android SDK Build-tools | 35.0.0 | +| Android SDK Platforms | android-35-ext14 (rev 1)<br>android-35 (rev 1)<br>android-34 (rev 3) | +| Android SDK Platform-Tools | 35.0.2 | +| Android Support Repository | 47.0.0 | +| CMake | 3.22.1<br>3.30.5 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 26.3.11579264<br>27.2.12479018 | + +#### Environment variables +| Name | Value | +| ----------------------- | ---------------------------------------- | +| ANDROID_HOME | C:\Android\android-sdk | +| ANDROID_NDK | C:\Android\android-sdk\ndk\27.2.12479018 | +| ANDROID_NDK_HOME | C:\Android\android-sdk\ndk\27.2.12479018 | +| ANDROID_NDK_LATEST_HOME | C:\Android\android-sdk\ndk\27.2.12479018 | +| ANDROID_NDK_ROOT | C:\Android\android-sdk\ndk\27.2.12479018 | +| ANDROID_SDK_ROOT | C:\Android\android-sdk | From 2d6d4f77147efc34751138c96c0905936f4259d5 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 19 Dec 2024 14:32:24 +0000 Subject: [PATCH 3363/3485] Updating readme file for macos-15 version 20241217.493 (#11214) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-15-Readme.md | 79 +++++++++++++++++---------------- 1 file changed, 40 insertions(+), 39 deletions(-) diff --git a/images/macos/macos-15-Readme.md b/images/macos/macos-15-Readme.md index 15c498d94fba..71a579578e5e 100644 --- a/images/macos/macos-15-Readme.md +++ b/images/macos/macos-15-Readme.md @@ -1,12 +1,13 @@ | Announcements | |-| +| [[macOS 14] Xcode 16.0 will be replaced by Xcode 16.2 in macOS-14 images on January 6, 2025](https://github.com/actions/runner-images/issues/11203) | | [[macOS] The macOS 12 Actions runner image will begin deprecation on 10/7/24 and will be fully unsupported by 12/3/24 for GitHub and by 01/13/25 for ADO](https://github.com/actions/runner-images/issues/10721) | | [macOS 15 (Sequoia) is now available as a public beta in GitHub Actions](https://github.com/actions/runner-images/issues/10686) | *** # macOS 15 -- OS Version: macOS 15.1.1 (24B91) -- Kernel Version: Darwin 24.1.0 -- Image Version: 20241211.462 +- OS Version: macOS 15.2 (24C101) +- Kernel Version: Darwin 24.2.0 +- Image Version: 20241217.493 ## Installed Software @@ -29,15 +30,15 @@ - Ruby 3.3.6 ### Package Management -- Bundler 2.5.23 +- Bundler 2.6.0 - Carthage 0.40.0 - CocoaPods 1.16.2 -- Composer 2.8.3 -- Homebrew 4.4.11 +- Composer 2.8.4 +- Homebrew 4.4.12 - NPM 10.9.0 - Pip3 24.3.1 (python 3.13) - Pipx 1.7.1 -- RubyGems 3.5.23 +- RubyGems 3.6.0 - Yarn 1.22.22 ### Project Management @@ -52,7 +53,7 @@ - bazel 8.0.0 - bazelisk 1.25.0 - bsdtar 3.5.3 - available by 'tar' alias -- Curl 8.11.0 +- Curl 8.11.1 - Git 2.47.1 - Git LFS 3.6.0 - GitHub CLI 2.63.2 @@ -68,8 +69,8 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.22.14 -- AWS SAM CLI 1.131.0 +- AWS CLI 2.22.18 +- AWS SAM CLI 1.132.0 - AWS Session Manager CLI 1.2.694.0 - Azure CLI 2.67.0 - Azure CLI (azure-devops) 1.0.1 @@ -79,21 +80,21 @@ - Fastlane 2.226.0 - SwiftFormat 0.55.3 - Xcbeautify 2.16.0 -- Xcode Command Line Tools 16.1.0.0.1.1729049160 +- Xcode Command Line Tools 16.2.0.0.1.1733547573 - Xcodes 1.6.0 ### Linters - SwiftLint 0.57.1 ### Browsers -- Safari 18.1.1 (20619.2.8.11.12) -- SafariDriver 18.1.1 (20619.2.8.11.12) +- Safari 18.2 (20620.1.16.11.8) +- SafariDriver 18.2 (20620.1.16.11.8) - Google Chrome 131.0.6778.140 - Google Chrome for Testing 131.0.6778.108 - ChromeDriver 131.0.6778.108 -- Microsoft Edge 131.0.2903.86 +- Microsoft Edge 131.0.2903.99 - Microsoft Edge WebDriver 131.0.2903.87 -- Mozilla Firefox 133.0 +- Mozilla Firefox 133.0.3 - geckodriver 0.35.0 - Selenium server 4.27.0 @@ -119,8 +120,8 @@ - 3.3.6 #### Python -- 3.9.20 -- 3.10.15 +- 3.9.21 +- 3.10.16 - 3.11.9 - 3.12.8 - 3.13.1 @@ -154,12 +155,12 @@ - PSScriptAnalyzer: 1.23.0 ### Xcode -| Version | Build | Path | Symlinks | -| -------------- | -------- | ---------------------------------------------- | ----------------------------------------------------------------------------------------- | -| 16.2 | 16C5031c | /Applications/Xcode_16.2_Release_Candidate.app | /Applications/Xcode_16.2.0.app<br>/Applications/Xcode_16.2.app | -| 16.1 | 16B40 | /Applications/Xcode_16.1.app | /Applications/Xcode_16.1.0.app | -| 16.0 (default) | 16A242d | /Applications/Xcode_16.app | /Applications/Xcode_16.0.0.app<br>/Applications/Xcode_16.0.app<br>/Applications/Xcode.app | -| 15.4 | 15F31d | /Applications/Xcode_15.4.app | /Applications/Xcode_15.4.0.app | +| Version | Build | Path | Symlinks | +| -------------- | -------- | ---------------------------- | ----------------------------------------------------------------------------------------- | +| 16.2 | 16C5032a | /Applications/Xcode_16.2.app | /Applications/Xcode_16.2.0.app | +| 16.1 | 16B40 | /Applications/Xcode_16.1.app | /Applications/Xcode_16.1.0.app | +| 16.0 (default) | 16A242d | /Applications/Xcode_16.app | /Applications/Xcode_16.0.0.app<br>/Applications/Xcode_16.0.app<br>/Applications/Xcode.app | +| 15.4 | 15F31d | /Applications/Xcode_15.4.app | /Applications/Xcode_15.4.0.app | #### Installed SDKs | SDK | SDK Name | Xcode Version | @@ -192,12 +193,12 @@ | Simulator - watchOS 11.0 | watchsimulator11.0 | 16.0 | | Simulator - watchOS 11.1 | watchsimulator11.1 | 16.1 | | Simulator - watchOS 11.2 | watchsimulator11.2 | 16.2 | -| visionOS 1.2 | xros1.2 | 15.4 | | Simulator - visionOS 1.2 | xrsimulator1.2 | 15.4 | +| visionOS 1.2 | xros1.2 | 15.4 | | Simulator - visionOS 2.0 | xrsimulator2.0 | 16.0 | | visionOS 2.0 | xros2.0 | 16.0 | -| Simulator - visionOS 2.1 | xrsimulator2.1 | 16.1 | | visionOS 2.1 | xros2.1 | 16.1 | +| Simulator - visionOS 2.1 | xrsimulator2.1 | 16.1 | | Simulator - visionOS 2.2 | xrsimulator2.2 | 16.2 | | visionOS 2.2 | xros2.2 | 16.2 | | DriverKit 23.5 | driverkit23.5 | 15.4 | @@ -206,20 +207,20 @@ | DriverKit 24.2 | driverkit24.2 | 16.2 | #### Installed Simulators -| OS | Simulators | -| ------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| iOS 17.5 | iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | -| iOS 18.0 | iPhone 16<br>iPhone 16 Plus<br>iPhone 16 Pro<br>iPhone 16 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | -| iOS 18.1 | iPhone 16<br>iPhone 16 Plus<br>iPhone 16 Pro<br>iPhone 16 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (A17 Pro)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | -| iOS 18.2 | iPhone 16<br>iPhone 16 Plus<br>iPhone 16 Pro<br>iPhone 16 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (A17 Pro)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | -| tvOS 17.5 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 18.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 18.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 18.2 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| watchOS 10.5 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra 2 (49mm) | -| watchOS 11.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 10 (42mm)<br>Apple Watch Series 10 (46mm)<br>Apple Watch Ultra 2 (49mm) | -| watchOS 11.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 10 (42mm)<br>Apple Watch Series 10 (46mm)<br>Apple Watch Ultra 2 (49mm) | -| watchOS 11.2 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 10 (42mm)<br>Apple Watch Series 10 (46mm)<br>Apple Watch Ultra 2 (49mm) | +| OS | Simulators | +| ------------ | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| iOS 17.5 | iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | +| iOS 18.0 | iPhone 16<br>iPhone 16 Plus<br>iPhone 16 Pro<br>iPhone 16 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | +| iOS 18.1 | iPhone 16<br>iPhone 16 Plus<br>iPhone 16 Pro<br>iPhone 16 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (A17 Pro)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | +| iOS 18.2 | iPhone 16<br>iPhone 16 Plus<br>iPhone 16 Pro<br>iPhone 16 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (A17 Pro)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | +| tvOS 17.5 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 18.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 18.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 18.2 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| watchOS 10.5 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 11.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 10 (42mm)<br>Apple Watch Series 10 (46mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 11.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 10 (42mm)<br>Apple Watch Series 10 (46mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 11.2 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 10 (42mm)<br>Apple Watch Series 10 (46mm)<br>Apple Watch Ultra 2 (49mm) | ### Android | Package Name | Version | From 45226c1116cdb863fcc3804d00c9aaaedb270b52 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 19 Dec 2024 16:13:23 +0000 Subject: [PATCH 3364/3485] Updating readme file for macos-15-arm64 version 20241217.490 (#11213) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-15-arm64-Readme.md | 39 ++++++++++++++------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/images/macos/macos-15-arm64-Readme.md b/images/macos/macos-15-arm64-Readme.md index e2e4aae18363..2375e767bfb2 100644 --- a/images/macos/macos-15-arm64-Readme.md +++ b/images/macos/macos-15-arm64-Readme.md @@ -1,12 +1,13 @@ | Announcements | |-| +| [[macOS 14] Xcode 16.0 will be replaced by Xcode 16.2 in macOS-14 images on January 6, 2025](https://github.com/actions/runner-images/issues/11203) | | [[macOS] The macOS 12 Actions runner image will begin deprecation on 10/7/24 and will be fully unsupported by 12/3/24 for GitHub and by 01/13/25 for ADO](https://github.com/actions/runner-images/issues/10721) | | [macOS 15 (Sequoia) is now available as a public beta in GitHub Actions](https://github.com/actions/runner-images/issues/10686) | *** # macOS 15 -- OS Version: macOS 15.1.1 (24B91) -- Kernel Version: Darwin 24.1.0 -- Image Version: 20241211.459 +- OS Version: macOS 15.2 (24C101) +- Kernel Version: Darwin 24.2.0 +- Image Version: 20241217.490 ## Installed Software @@ -28,14 +29,14 @@ - Ruby 3.3.6 ### Package Management -- Bundler 2.5.23 +- Bundler 2.6.0 - Carthage 0.40.0 - CocoaPods 1.16.2 -- Homebrew 4.4.11 +- Homebrew 4.4.12 - NPM 10.9.0 - Pip3 24.3.1 (python 3.13) - Pipx 1.7.1 -- RubyGems 3.5.23 +- RubyGems 3.6.0 - Yarn 1.22.22 ### Project Management @@ -66,8 +67,8 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.22.14 -- AWS SAM CLI 1.131.0 +- AWS CLI 2.22.18 +- AWS SAM CLI 1.132.0 - AWS Session Manager CLI 1.2.694.0 - Azure CLI 2.67.0 - Azure CLI (azure-devops) 1.0.1 @@ -77,14 +78,14 @@ - Fastlane 2.226.0 - SwiftFormat 0.55.3 - Xcbeautify 2.16.0 -- Xcode Command Line Tools 16.1.0.0.1.1729049160 +- Xcode Command Line Tools 16.2.0.0.1.1733547573 - Xcodes 1.6.0 ### Linters ### Browsers -- Safari 18.1.1 (20619.2.8.11.12) -- SafariDriver 18.1.1 (20619.2.8.11.12) +- Safari 18.2 (20620.1.16.11.8) +- SafariDriver 18.2 (20620.1.16.11.8) - Google Chrome 131.0.6778.140 - Google Chrome for Testing 131.0.6778.108 - ChromeDriver 131.0.6778.108 @@ -145,12 +146,12 @@ - PSScriptAnalyzer: 1.23.0 ### Xcode -| Version | Build | Path | Symlinks | -| -------------- | -------- | ---------------------------------------------- | ----------------------------------------------------------------------------------------- | -| 16.2 | 16C5031c | /Applications/Xcode_16.2_Release_Candidate.app | /Applications/Xcode_16.2.0.app<br>/Applications/Xcode_16.2.app | -| 16.1 | 16B40 | /Applications/Xcode_16.1.app | /Applications/Xcode_16.1.0.app | -| 16.0 (default) | 16A242d | /Applications/Xcode_16.app | /Applications/Xcode_16.0.0.app<br>/Applications/Xcode_16.0.app<br>/Applications/Xcode.app | -| 15.4 | 15F31d | /Applications/Xcode_15.4.app | /Applications/Xcode_15.4.0.app | +| Version | Build | Path | Symlinks | +| -------------- | -------- | ---------------------------- | ----------------------------------------------------------------------------------------- | +| 16.2 | 16C5032a | /Applications/Xcode_16.2.app | /Applications/Xcode_16.2.0.app | +| 16.1 | 16B40 | /Applications/Xcode_16.1.app | /Applications/Xcode_16.1.0.app | +| 16.0 (default) | 16A242d | /Applications/Xcode_16.app | /Applications/Xcode_16.0.0.app<br>/Applications/Xcode_16.0.app<br>/Applications/Xcode.app | +| 15.4 | 15F31d | /Applications/Xcode_15.4.app | /Applications/Xcode_15.4.0.app | #### Installed SDKs | SDK | SDK Name | Xcode Version | @@ -185,10 +186,10 @@ | Simulator - watchOS 11.2 | watchsimulator11.2 | 16.2 | | visionOS 1.2 | xros1.2 | 15.4 | | Simulator - visionOS 1.2 | xrsimulator1.2 | 15.4 | -| Simulator - visionOS 2.0 | xrsimulator2.0 | 16.0 | | visionOS 2.0 | xros2.0 | 16.0 | -| visionOS 2.1 | xros2.1 | 16.1 | +| Simulator - visionOS 2.0 | xrsimulator2.0 | 16.0 | | Simulator - visionOS 2.1 | xrsimulator2.1 | 16.1 | +| visionOS 2.1 | xros2.1 | 16.1 | | Simulator - visionOS 2.2 | xrsimulator2.2 | 16.2 | | visionOS 2.2 | xros2.2 | 16.2 | | DriverKit 23.5 | driverkit23.5 | 15.4 | From 9bdf288d3e2d5f72928e8dbfd48115a1525f74d1 Mon Sep 17 00:00:00 2001 From: Tachibana waita <whywaita@whywrite.it> Date: Tue, 24 Dec 2024 00:59:05 +0900 Subject: [PATCH 3365/3485] Fix: erlang install failure on gpg key --- images/ubuntu/scripts/build/install-erlang.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/ubuntu/scripts/build/install-erlang.sh b/images/ubuntu/scripts/build/install-erlang.sh index d5308a5cc238..335070c7786c 100644 --- a/images/ubuntu/scripts/build/install-erlang.sh +++ b/images/ubuntu/scripts/build/install-erlang.sh @@ -11,8 +11,8 @@ source_list=/etc/apt/sources.list.d/eslerlang.list source_key=/usr/share/keyrings/eslerlang.gpg # Install Erlang -wget -q -O - https://packages.erlang-solutions.com/ubuntu/erlang_solutions.asc | gpg --dearmor > $source_key -echo "deb [signed-by=$source_key] https://packages.erlang-solutions.com/ubuntu $(lsb_release -cs) contrib" > $source_list +wget -q -O - https://binaries2.erlang-solutions.com/GPG-KEY-pmanager.asc | gpg --dearmor > $source_key +echo "deb [signed-by=$source_key] http://binaries2.erlang-solutions.com/ubuntu $(lsb_release -cs)-esl-erlang-25 contrib" > $source_list apt-get update apt-get install --no-install-recommends esl-erlang From 0a970d8e119aebd34846187d0f2c576b2f5f7683 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Tue, 24 Dec 2024 10:48:45 +0100 Subject: [PATCH 3366/3485] [Windows] Update EdgeDriver signature (#11237) --- images/windows/scripts/build/Install-EdgeDriver.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/windows/scripts/build/Install-EdgeDriver.ps1 b/images/windows/scripts/build/Install-EdgeDriver.ps1 index 6d10d6e5d025..e8f07b7de161 100644 --- a/images/windows/scripts/build/Install-EdgeDriver.ps1 +++ b/images/windows/scripts/build/Install-EdgeDriver.ps1 @@ -27,7 +27,7 @@ Write-Host "Expand Microsoft Edge WebDriver archive..." Expand-7ZipArchive -Path $archivePath -DestinationPath $edgeDriverPath #Validate the EdgeDriver signature -$signatureThumbprint = "0BD8C56733FDCC06F8CB919FF5A200E39B1ACF71" +$signatureThumbprint = "7920AC8FB05E0FFFE21E8FF4B4F03093BA6AC16E" Test-FileSignature -Path "$edgeDriverPath\msedgedriver.exe" -ExpectedThumbprint $signatureThumbprint Write-Host "Setting the environment variables..." From 5e69d9c205ed456125b67b18e4c5ac9f62a79b02 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Mon, 30 Dec 2024 11:11:22 +0100 Subject: [PATCH 3367/3485] [Windows] Add WSL2 to Windows-2025 image (#11242) --- .../windows/scripts/build/Configure-System.ps1 | 4 ++-- images/windows/scripts/build/Install-WSL2.ps1 | 16 ++++++++++++++++ .../scripts/docs-gen/Generate-SoftwareReport.ps1 | 3 +++ .../scripts/docs-gen/SoftwareReport.Tools.psm1 | 4 ++++ .../scripts/tests/WindowsFeatures.Tests.ps1 | 6 ++++++ images/windows/templates/windows-2025.pkr.hcl | 3 ++- 6 files changed, 33 insertions(+), 3 deletions(-) create mode 100644 images/windows/scripts/build/Install-WSL2.ps1 diff --git a/images/windows/scripts/build/Configure-System.ps1 b/images/windows/scripts/build/Configure-System.ps1 index 1291b7b47b38..5e144f2d58df 100644 --- a/images/windows/scripts/build/Configure-System.ps1 +++ b/images/windows/scripts/build/Configure-System.ps1 @@ -93,11 +93,11 @@ $servicesToDisable = @( 'wuauserv' 'DiagTrack' 'dmwappushservice' - 'PcaSvc' + $(if(-not (Test-IsWin25)){'PcaSvc'}) 'SysMain' 'gupdate' 'gupdatem' - 'StorSvc' + $(if(-not (Test-IsWin25)){'StorSvc'}) ) | Get-Service -ErrorAction SilentlyContinue Stop-Service $servicesToDisable $servicesToDisable.WaitForStatus('Stopped', "00:01:00") diff --git a/images/windows/scripts/build/Install-WSL2.ps1 b/images/windows/scripts/build/Install-WSL2.ps1 new file mode 100644 index 000000000000..4134b2afd134 --- /dev/null +++ b/images/windows/scripts/build/Install-WSL2.ps1 @@ -0,0 +1,16 @@ +Write-Host "Install WSL2" + +$version = (Get-GithubReleasesByVersion -Repo "microsoft/WSL" -Version "latest").version +$downloadUrl = Resolve-GithubReleaseAssetUrl ` + -Repo "microsoft/WSL" ` + -Version $version ` + -UrlMatchPattern "wsl.*.x64.msi" + +Install-Binary -Type MSI ` + -Url $downloadUrl ` + -ExpectedSHA256Sum "CD3F2A68A1A5836F6A1CC9965A7F5F54DB267CA221EAA87DF29345AB7957AEC4" + +Write-Host "Performing wsl --install --no-distribution" +wsl.exe --install --no-distribution + +Invoke-PesterTests -TestFile "WindowsFeatures" -TestName "WSL2" diff --git a/images/windows/scripts/docs-gen/Generate-SoftwareReport.ps1 b/images/windows/scripts/docs-gen/Generate-SoftwareReport.ps1 index 7077a39f3af6..3cc3ee4701a5 100644 --- a/images/windows/scripts/docs-gen/Generate-SoftwareReport.ps1 +++ b/images/windows/scripts/docs-gen/Generate-SoftwareReport.ps1 @@ -21,6 +21,9 @@ Import-Module (Join-Path $PSScriptRoot "SoftwareReport.VisualStudio.psm1") -Disa $softwareReport = [SoftwareReport]::new($(Build-OSInfoSection)) $optionalFeatures = $softwareReport.Root.AddHeader("Windows features") $optionalFeatures.AddToolVersion("Windows Subsystem for Linux (WSLv1):", "Enabled") +if (Test-IsWin25) { + $optionalFeatures.AddToolVersion("Windows Subsystem for Linux (Default, WSLv2):", $(Get-WSL2Version)) +} $installedSoftware = $softwareReport.Root.AddHeader("Installed Software") # Language and Runtime diff --git a/images/windows/scripts/docs-gen/SoftwareReport.Tools.psm1 b/images/windows/scripts/docs-gen/SoftwareReport.Tools.psm1 index bd83432c0c89..c4672f82d348 100644 --- a/images/windows/scripts/docs-gen/SoftwareReport.Tools.psm1 +++ b/images/windows/scripts/docs-gen/SoftwareReport.Tools.psm1 @@ -318,3 +318,7 @@ function Get-ImageMagickVersion { function Get-MongoshVersion { return $(mongosh --version) } + +function Get-WSL2Version { + return $((Get-AppxPackage -Name "MicrosoftCorporationII.WindowsSubsystemForLinux").version) +} diff --git a/images/windows/scripts/tests/WindowsFeatures.Tests.ps1 b/images/windows/scripts/tests/WindowsFeatures.Tests.ps1 index 03b56a2108d1..09e682498bdb 100644 --- a/images/windows/scripts/tests/WindowsFeatures.Tests.ps1 +++ b/images/windows/scripts/tests/WindowsFeatures.Tests.ps1 @@ -82,3 +82,9 @@ Describe "Windows Updates" { $State | Should -BeIn $expect } } + +Describe "WSL2" { + It "WSL status should return zero exit code" { + "wsl --status" | Should -ReturnZeroExitCode + } +} diff --git a/images/windows/templates/windows-2025.pkr.hcl b/images/windows/templates/windows-2025.pkr.hcl index a4ba4ed9ed0a..f1f3fdc55007 100644 --- a/images/windows/templates/windows-2025.pkr.hcl +++ b/images/windows/templates/windows-2025.pkr.hcl @@ -243,7 +243,7 @@ build { inline = ["if (-not ((net localgroup Administrators) -contains '${var.install_user}')) { exit 1 }"] } - provisioner "powershell" { +provisioner "powershell" { elevated_password = "${var.install_password}" elevated_user = "${var.install_user}" inline = ["bcdedit.exe /set TESTSIGNING ON"] @@ -256,6 +256,7 @@ build { "${path.root}/../scripts/build/Configure-WindowsDefender.ps1", "${path.root}/../scripts/build/Configure-PowerShell.ps1", "${path.root}/../scripts/build/Install-PowerShellModules.ps1", + "${path.root}/../scripts/build/Install-WSL2.ps1", "${path.root}/../scripts/build/Install-WindowsFeatures.ps1", "${path.root}/../scripts/build/Install-Chocolatey.ps1", "${path.root}/../scripts/build/Configure-BaseImage.ps1", From 5a7153bb5202eef32ea449dc8968059ae8eed692 Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Mon, 30 Dec 2024 19:11:22 +0100 Subject: [PATCH 3368/3485] [windows] Add Android SDK 34 to windows-2025 (#11249) --- images/windows/toolsets/toolset-2025.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/windows/toolsets/toolset-2025.json b/images/windows/toolsets/toolset-2025.json index 64eb44c79d6d..f5047cbe1da3 100644 --- a/images/windows/toolsets/toolset-2025.json +++ b/images/windows/toolsets/toolset-2025.json @@ -86,8 +86,8 @@ "android": { "commandline_tools_url": "https://dl.google.com/android/repository/commandlinetools-win-12266719_latest.zip", "hash": "F9088C04A44F1F37A8A3A228A7663E11AE9445FA07529C96CEF38ACB985A88F3", - "platform_min_version": "35", - "build_tools_min_version": "35.0.0", + "platform_min_version": "34", + "build_tools_min_version": "34.0.0", "extras": [ "android;m2repository", "google;m2repository", From 03a8b0fd82862e8e76aa77952c6155df14ad43e5 Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Thu, 2 Jan 2025 15:43:53 +0100 Subject: [PATCH 3369/3485] [windows] Fix WSL pester test (#11255) --- images/windows/scripts/tests/WindowsFeatures.Tests.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/windows/scripts/tests/WindowsFeatures.Tests.ps1 b/images/windows/scripts/tests/WindowsFeatures.Tests.ps1 index 09e682498bdb..528ae762b794 100644 --- a/images/windows/scripts/tests/WindowsFeatures.Tests.ps1 +++ b/images/windows/scripts/tests/WindowsFeatures.Tests.ps1 @@ -83,7 +83,7 @@ Describe "Windows Updates" { } } -Describe "WSL2" { +Describe "WSL2" -Skip:((Test-IsWin19) -or (Test-IsWin22)) { It "WSL status should return zero exit code" { "wsl --status" | Should -ReturnZeroExitCode } From b8e122b1b136d46c7f0ddc3da274dbbc467fee31 Mon Sep 17 00:00:00 2001 From: sureshe456 <160699174+sureshe456@users.noreply.github.com> Date: Fri, 3 Jan 2025 19:38:06 +0530 Subject: [PATCH 3370/3485] [macOS] Add Xcode 16.2 Release to macOS14 (#11272) Co-authored-by: Suresh kumar <v-erkumar@microsoft.com> --- images/macos/toolsets/toolset-14.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/macos/toolsets/toolset-14.json b/images/macos/toolsets/toolset-14.json index 1882dd0a9540..1110748759f4 100644 --- a/images/macos/toolsets/toolset-14.json +++ b/images/macos/toolsets/toolset-14.json @@ -3,8 +3,8 @@ "default": "15.4", "x64": { "versions": [ + { "link": "16.2", "version": "16.2+16C5032a", "install_runtimes": ["iOS", "watchOS", "tvOS"], "sha256": "0e367d06eb7c334ea143bada5e4422f56688aabff571bedf0d2ad9434b7290de"}, { "link": "16.1", "version": "16.1+16B40", "runtimes": ["iOS", "watchOS", "tvOS"], "sha256": "8ca961d55981f983d21b99a95a6b0ac04905b837f6e11346ee86d28f12afe720"}, - { "link": "16", "version": "16.0.0+16A242d", "symlinks": ["16.0"], "runtimes": ["iOS", "watchOS", "tvOS"], "sha256": "4a26c3d102a55c7222fb145e0ee1503249c9c26c6e02dc64d783c8810b37b1e3"}, { "link": "15.4", "version": "15.4.0+15F31d", "install_runtimes": "true", "sha256": "82d3d61804ff3f4c7c82085e91dc701037ddaa770e542848b2477e22f4e8aa7a"}, { "link": "15.3", "version": "15.3.0+15E204a", "install_runtimes": "true", "sha256": "f13f6a2e2df432c3008e394640b8549a18c285acd7fd148d6c4bac8c3a5af234"}, { "link": "15.2", "version": "15.2.0+15C500b", "install_runtimes": "true", "sha256": "04E93680C6DDBEC84666531BE412DE778AFC8EAC6AB2037F4C2BE7290818B59B"}, @@ -14,8 +14,8 @@ }, "arm64":{ "versions": [ + { "link": "16.2", "version": "16.2+16C5032a", "install_runtimes": ["iOS", "watchOS", "tvOS"], "sha256": "0e367d06eb7c334ea143bada5e4422f56688aabff571bedf0d2ad9434b7290de"}, { "link": "16.1", "version": "16.1+16B40", "runtimes": ["iOS", "watchOS", "tvOS"], "sha256": "8ca961d55981f983d21b99a95a6b0ac04905b837f6e11346ee86d28f12afe720"}, - { "link": "16", "version": "16.0.0+16A242d", "symlinks": ["16.0"], "runtimes": ["iOS", "watchOS", "tvOS"], "sha256": "4a26c3d102a55c7222fb145e0ee1503249c9c26c6e02dc64d783c8810b37b1e3"}, { "link": "15.4", "version": "15.4.0+15F31d", "install_runtimes": "true", "sha256": "82d3d61804ff3f4c7c82085e91dc701037ddaa770e542848b2477e22f4e8aa7a"}, { "link": "15.3", "version": "15.3.0+15E204a", "install_runtimes": "true", "sha256": "f13f6a2e2df432c3008e394640b8549a18c285acd7fd148d6c4bac8c3a5af234"}, { "link": "15.2", "version": "15.2.0+15C500b", "install_runtimes": "true", "sha256": "04E93680C6DDBEC84666531BE412DE778AFC8EAC6AB2037F4C2BE7290818B59B"}, From 92c3eccf8d63c6c38a1e92afb79cf301560ca871 Mon Sep 17 00:00:00 2001 From: vidyasagarnimmagaddi <160703874+vidyasagarnimmagaddi@users.noreply.github.com> Date: Fri, 3 Jan 2025 23:47:07 +0530 Subject: [PATCH 3371/3485] [Windows] removing Pthyon version:3.7.* (#11276) --- images/windows/toolsets/toolset-2019.json | 4 +--- images/windows/toolsets/toolset-2022.json | 2 -- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/images/windows/toolsets/toolset-2019.json b/images/windows/toolsets/toolset-2019.json index db9aa6099879..6ab99c23843d 100644 --- a/images/windows/toolsets/toolset-2019.json +++ b/images/windows/toolsets/toolset-2019.json @@ -17,14 +17,13 @@ "arch": "x64", "platform" : "win32", "versions": [ - "3.7.*", "3.8.*", "3.9.*", "3.10.*", "3.11.*", "3.12.*" ], - "default": "3.7.*" + "default": "3.9.*" }, { "name": "Python", @@ -32,7 +31,6 @@ "arch": "x86", "platform" : "win32", "versions": [ - "3.7.*", "3.8.*", "3.9.*", "3.10.*", diff --git a/images/windows/toolsets/toolset-2022.json b/images/windows/toolsets/toolset-2022.json index 46c9261bc1e7..52d21afb00b4 100644 --- a/images/windows/toolsets/toolset-2022.json +++ b/images/windows/toolsets/toolset-2022.json @@ -17,7 +17,6 @@ "arch": "x64", "platform" : "win32", "versions": [ - "3.7.*", "3.8.*", "3.9.*", "3.10.*", @@ -32,7 +31,6 @@ "arch": "x86", "platform" : "win32", "versions": [ - "3.7.*", "3.8.*", "3.9.*", "3.10.*", From 6cc2576b1b19c08317047523d5abe3c48a9eab98 Mon Sep 17 00:00:00 2001 From: vidyasagarnimmagaddi <160703874+vidyasagarnimmagaddi@users.noreply.github.com> Date: Fri, 3 Jan 2025 23:48:46 +0530 Subject: [PATCH 3372/3485] [Ubuntu] remvoving Python Version:3.7.* (#11275) --- images/ubuntu/toolsets/toolset-2004.json | 1 - images/ubuntu/toolsets/toolset-2204.json | 1 - 2 files changed, 2 deletions(-) diff --git a/images/ubuntu/toolsets/toolset-2004.json b/images/ubuntu/toolsets/toolset-2004.json index 13d83e5513c2..13c01be964b2 100644 --- a/images/ubuntu/toolsets/toolset-2004.json +++ b/images/ubuntu/toolsets/toolset-2004.json @@ -7,7 +7,6 @@ "platform_version": "20.04", "arch": "x64", "versions": [ - "3.7.*", "3.8.*", "3.9.*", "3.10.*", diff --git a/images/ubuntu/toolsets/toolset-2204.json b/images/ubuntu/toolsets/toolset-2204.json index 551526f793ee..b2976320eaed 100644 --- a/images/ubuntu/toolsets/toolset-2204.json +++ b/images/ubuntu/toolsets/toolset-2204.json @@ -7,7 +7,6 @@ "platform_version": "22.04", "arch": "x64", "versions": [ - "3.7.*", "3.8.*", "3.9.*", "3.10.*", From aff0eea2a12468b0435fda684cb1855d648128e9 Mon Sep 17 00:00:00 2001 From: hemanthmanga <166606741+hemanthmanga@users.noreply.github.com> Date: Mon, 6 Jan 2025 20:05:23 +0530 Subject: [PATCH 3373/3485] Removing Dotnet version 7.0 from windows (#11278) --- images/windows/toolsets/toolset-2019.json | 1 - images/windows/toolsets/toolset-2022.json | 1 - 2 files changed, 2 deletions(-) diff --git a/images/windows/toolsets/toolset-2019.json b/images/windows/toolsets/toolset-2019.json index 6ab99c23843d..212d286df4b8 100644 --- a/images/windows/toolsets/toolset-2019.json +++ b/images/windows/toolsets/toolset-2019.json @@ -408,7 +408,6 @@ "dotnet": { "versions": [ "6.0", - "7.0", "8.0", "9.0" ], diff --git a/images/windows/toolsets/toolset-2022.json b/images/windows/toolsets/toolset-2022.json index 52d21afb00b4..7f93108b7d93 100644 --- a/images/windows/toolsets/toolset-2022.json +++ b/images/windows/toolsets/toolset-2022.json @@ -319,7 +319,6 @@ "dotnet": { "versions": [ "6.0", - "7.0", "8.0", "9.0" ], From c4f58658b6f4a877f04e4a771944312bce43b97b Mon Sep 17 00:00:00 2001 From: hemanthmanga <166606741+hemanthmanga@users.noreply.github.com> Date: Mon, 6 Jan 2025 20:06:59 +0530 Subject: [PATCH 3374/3485] Removing Dotnet version 7.0 from Ubuntu (#11277) --- images/ubuntu/toolsets/toolset-2004.json | 2 -- images/ubuntu/toolsets/toolset-2204.json | 2 -- 2 files changed, 4 deletions(-) diff --git a/images/ubuntu/toolsets/toolset-2004.json b/images/ubuntu/toolsets/toolset-2004.json index 13c01be964b2..a67a5027e9fe 100644 --- a/images/ubuntu/toolsets/toolset-2004.json +++ b/images/ubuntu/toolsets/toolset-2004.json @@ -268,12 +268,10 @@ "dotnet": { "aptPackages": [ "dotnet-sdk-6.0", - "dotnet-sdk-7.0", "dotnet-sdk-8.0" ], "versions": [ "6.0", - "7.0", "8.0" ], "tools": [ diff --git a/images/ubuntu/toolsets/toolset-2204.json b/images/ubuntu/toolsets/toolset-2204.json index b2976320eaed..2ac3f5ff173a 100644 --- a/images/ubuntu/toolsets/toolset-2204.json +++ b/images/ubuntu/toolsets/toolset-2204.json @@ -267,12 +267,10 @@ "dotnet": { "aptPackages": [ "dotnet-sdk-6.0", - "dotnet-sdk-7.0", "dotnet-sdk-8.0" ], "versions": [ "6.0", - "7.0", "8.0" ], "tools": [ From c2becfafdded5c619c2da5ff8783b4a0b8a1a513 Mon Sep 17 00:00:00 2001 From: Fahrzin Hemmati <fahhem@users.noreply.github.com> Date: Mon, 6 Jan 2025 12:34:42 -0800 Subject: [PATCH 3375/3485] Use all processors when installing zstd (#11067) Speeds up my builds from 93s to 37s (four core) for the install-zstd.sh step --- images/ubuntu/scripts/build/install-zstd.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/ubuntu/scripts/build/install-zstd.sh b/images/ubuntu/scripts/build/install-zstd.sh index 1f26c2435d18..67ff4f6fddab 100644 --- a/images/ubuntu/scripts/build/install-zstd.sh +++ b/images/ubuntu/scripts/build/install-zstd.sh @@ -22,8 +22,8 @@ use_checksum_comparison "$archive_path" "$external_hash" apt-get install liblz4-dev tar xzf "$archive_path" -C /tmp -make -C "/tmp/${release_name}/contrib/pzstd" all -make -C "/tmp/${release_name}" zstd-release +make -C "/tmp/${release_name}/contrib/pzstd" -j $(nproc) all +make -C "/tmp/${release_name}" -j $(nproc) zstd-release for copyprocess in zstd zstdless zstdgrep; do cp "/tmp/${release_name}/programs/${copyprocess}" /usr/local/bin/ From 19e81a096c6eae9d4899d73c389f697d4cd69812 Mon Sep 17 00:00:00 2001 From: Lawrence Gripper <lawrencegripper@github.com> Date: Mon, 6 Jan 2025 20:38:36 +0000 Subject: [PATCH 3376/3485] [Windows] Update Service Fabric Versions (#11048) * [WIP] Update Service Fabric Versions on Windows runners * Accidental postgres change This was from another PR by mistake --- images/windows/toolsets/toolset-2019.json | 8 ++++---- images/windows/toolsets/toolset-2022.json | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/images/windows/toolsets/toolset-2019.json b/images/windows/toolsets/toolset-2019.json index 212d286df4b8..329914a7327b 100644 --- a/images/windows/toolsets/toolset-2019.json +++ b/images/windows/toolsets/toolset-2019.json @@ -397,12 +397,12 @@ }, "serviceFabric": { "runtime": { - "version": "9.1.1436.9590", - "checksum": "089F9BE6A63AF66C337E507B52082575C8ED330DF765259C6F2F13F900DA96D5" + "version": "9.1.2837.9590", + "checksum": "5CDFDC7497522147081C7FB0CEBE09E483F871285A8EB87C821F1AB64DD9FCDD" }, "sdk": { - "version": "6.1.1436", - "checksum": "D2A6B58315D08B6E46C2D25E91DFA1163136F70A5FA8CEF9DB147F07EE001AD1" + "version": "6.1.2837", + "checksum": "492F2FCE79C409ADAFC34F581956505C454484E909814E8FEF413DA10457D232" } }, "dotnet": { diff --git a/images/windows/toolsets/toolset-2022.json b/images/windows/toolsets/toolset-2022.json index 7f93108b7d93..a45a18bbbc40 100644 --- a/images/windows/toolsets/toolset-2022.json +++ b/images/windows/toolsets/toolset-2022.json @@ -308,12 +308,12 @@ }, "serviceFabric": { "runtime": { - "version": "9.1.1436.9590", - "checksum": "089F9BE6A63AF66C337E507B52082575C8ED330DF765259C6F2F13F900DA96D5" + "version": "9.1.2837.9590", + "checksum": "5CDFDC7497522147081C7FB0CEBE09E483F871285A8EB87C821F1AB64DD9FCDD" }, "sdk": { - "version": "6.1.1436", - "checksum": "D2A6B58315D08B6E46C2D25E91DFA1163136F70A5FA8CEF9DB147F07EE001AD1" + "version": "6.1.2837", + "checksum": "492F2FCE79C409ADAFC34F581956505C454484E909814E8FEF413DA10457D232" } }, "dotnet": { From ffe7e6a51497101e31b8bdde69a80d92b1e1125c Mon Sep 17 00:00:00 2001 From: Lars Nielsen <lanni@energinet.dk> Date: Mon, 6 Jan 2025 22:09:27 +0100 Subject: [PATCH 3377/3485] Implemented az-cli warmup (#11173) --- images/ubuntu/scripts/build/cleanup.sh | 7 ++++ .../ubuntu/scripts/build/install-azure-cli.sh | 32 +++++++++++++++++-- .../scripts/build/install-azure-devops-cli.sh | 8 ----- 3 files changed, 37 insertions(+), 10 deletions(-) diff --git a/images/ubuntu/scripts/build/cleanup.sh b/images/ubuntu/scripts/build/cleanup.sh index 17c7ccc3f6fa..100fdcbbf47e 100644 --- a/images/ubuntu/scripts/build/cleanup.sh +++ b/images/ubuntu/scripts/build/cleanup.sh @@ -19,6 +19,13 @@ if command -v journalctl; then journalctl --vacuum-time=1s fi +# remove redundant folders from azcli +if [[ -z "${AZURE_CONFIG_DIR}" ]]; then + rm -rf $AZURE_CONFIG_DIR/logs + rm -rf $AZURE_CONFIG_DIR/commands + rm -rf $AZURE_CONFIG_DIR/telemetry +fi + # delete all .gz and rotated file find /var/log -type f -regex ".*\.gz$" -delete find /var/log -type f -regex ".*\.[0-9]$" -delete diff --git a/images/ubuntu/scripts/build/install-azure-cli.sh b/images/ubuntu/scripts/build/install-azure-cli.sh index 0004f7bdef63..ff279492d58a 100644 --- a/images/ubuntu/scripts/build/install-azure-cli.sh +++ b/images/ubuntu/scripts/build/install-azure-cli.sh @@ -4,12 +4,40 @@ ## Desc: Install Azure CLI (az) ################################################################################ +# Source the helpers for use with the script +source $HELPER_SCRIPTS/etc-environment.sh + +# AZURE_CONFIG_DIR shell variable defines where the CLI configuration file for managing behavior are stored +# https://learn.microsoft.com/en-us/cli/azure/azure-cli-configuration#cli-configuration-file +# This path SHOULD be different from the installation directory /opt/az/ +export AZURE_CONFIG_DIR="/opt/az-config" +mkdir -p $AZURE_CONFIG_DIR +set_etc_environment_variable "AZURE_CONFIG_DIR" "${AZURE_CONFIG_DIR}" + +# AZURE_EXTENSION_DIR shell variable defines where modules are installed +# https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview +# This path SHOULD be different from the installation directory /opt/az/ +export AZURE_EXTENSION_DIR="/opt/az-extension" +mkdir -p $AZURE_EXTENSION_DIR +set_etc_environment_variable "AZURE_EXTENSION_DIR" "${AZURE_EXTENSION_DIR}" + # Install Azure CLI (instructions taken from https://docs.microsoft.com/en-us/cli/azure/install-azure-cli) curl -fsSL https://aka.ms/InstallAzureCLIDeb | sudo bash echo "azure-cli https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt" >> $HELPER_SCRIPTS/apt-sources.txt -rm -f /etc/apt/sources.list.d/azure-cli.list -rm -f /etc/apt/sources.list.d/azure-cli.list.save +# Remove Azure CLI repository (instructions taken from https://learn.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt#uninstall-azure-cli) +rm -f /etc/apt/sources.list.d/azure-cli.sources + +echo "Warmup 'az'" +az --help > /dev/null +if [ $? -ne 0 ]; then + echo "Command 'az --help' failed" + exit 1 +fi + +# Hand over the ownership of the directories and files to the non-root user +chown -R "$SUDO_USER:$SUDO_USER" $AZURE_CONFIG_DIR +chown -R "$SUDO_USER:$SUDO_USER" $AZURE_EXTENSION_DIR invoke_tests "CLI.Tools" "Azure CLI" diff --git a/images/ubuntu/scripts/build/install-azure-devops-cli.sh b/images/ubuntu/scripts/build/install-azure-devops-cli.sh index 81948ac95440..98e1318a9148 100644 --- a/images/ubuntu/scripts/build/install-azure-devops-cli.sh +++ b/images/ubuntu/scripts/build/install-azure-devops-cli.sh @@ -4,14 +4,6 @@ ## Desc: Install Azure DevOps CLI (az devops) ################################################################################ -# Source the helpers for use with the script -source $HELPER_SCRIPTS/etc-environment.sh - -# AZURE_EXTENSION_DIR shell variable defines where modules are installed -# https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview -export AZURE_EXTENSION_DIR=/opt/az/azcliextensions -set_etc_environment_variable "AZURE_EXTENSION_DIR" "${AZURE_EXTENSION_DIR}" - # install azure devops Cli extension az extension add -n azure-devops From 3d5f09a90fd475a3531b0ef57325aa7e27b24595 Mon Sep 17 00:00:00 2001 From: kishorekumar-anchala <168699259+kishorekumar-anchala@users.noreply.github.com> Date: Tue, 7 Jan 2025 02:51:15 +0530 Subject: [PATCH 3378/3485] Add libsql3 to ubuntu-24 (#11300) --- images/ubuntu/toolsets/toolset-2404.json | 1 + 1 file changed, 1 insertion(+) diff --git a/images/ubuntu/toolsets/toolset-2404.json b/images/ubuntu/toolsets/toolset-2404.json index f9d8d04ff164..127dffd3ecf0 100644 --- a/images/ubuntu/toolsets/toolset-2404.json +++ b/images/ubuntu/toolsets/toolset-2404.json @@ -127,6 +127,7 @@ "libyaml-dev", "libtool", "libssl-dev", + "libsqlite3-dev", "locales", "mercurial", "openssh-client", From e51332054cca1abd8fc06830f94c905f7f6b3626 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Tue, 7 Jan 2025 17:05:00 +0100 Subject: [PATCH 3379/3485] [Windows-2025] Remove VS components related to 4.7.SDK (#11248) --- images/windows/toolsets/toolset-2025.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/images/windows/toolsets/toolset-2025.json b/images/windows/toolsets/toolset-2025.json index f5047cbe1da3..e886e11150ce 100644 --- a/images/windows/toolsets/toolset-2025.json +++ b/images/windows/toolsets/toolset-2025.json @@ -136,8 +136,6 @@ "Component.Linux.CMake", "Component.UnityEngine.x64", "Microsoft.Component.VC.Runtime.UCRTSDK", - "Microsoft.Net.Component.4.7.TargetingPack", - "Microsoft.Net.Component.4.7.2.TargetingPack", "Microsoft.Net.Component.4.8.1.SDK", "Microsoft.Net.Component.4.8.1.TargetingPack", "Microsoft.VisualStudio.Component.AspNet45", From bc116668f07b4f9b92a85cd8f7b2863af3eddc7a Mon Sep 17 00:00:00 2001 From: Subir Ghosh <subir0071@users.noreply.github.com> Date: Tue, 7 Jan 2025 10:16:50 -0700 Subject: [PATCH 3380/3485] Revert "[Windows] Update Service Fabric Versions (#11048)" (#11318) This reverts commit 19e81a096c6eae9d4899d73c389f697d4cd69812. --- images/windows/toolsets/toolset-2019.json | 8 ++++---- images/windows/toolsets/toolset-2022.json | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/images/windows/toolsets/toolset-2019.json b/images/windows/toolsets/toolset-2019.json index 329914a7327b..212d286df4b8 100644 --- a/images/windows/toolsets/toolset-2019.json +++ b/images/windows/toolsets/toolset-2019.json @@ -397,12 +397,12 @@ }, "serviceFabric": { "runtime": { - "version": "9.1.2837.9590", - "checksum": "5CDFDC7497522147081C7FB0CEBE09E483F871285A8EB87C821F1AB64DD9FCDD" + "version": "9.1.1436.9590", + "checksum": "089F9BE6A63AF66C337E507B52082575C8ED330DF765259C6F2F13F900DA96D5" }, "sdk": { - "version": "6.1.2837", - "checksum": "492F2FCE79C409ADAFC34F581956505C454484E909814E8FEF413DA10457D232" + "version": "6.1.1436", + "checksum": "D2A6B58315D08B6E46C2D25E91DFA1163136F70A5FA8CEF9DB147F07EE001AD1" } }, "dotnet": { diff --git a/images/windows/toolsets/toolset-2022.json b/images/windows/toolsets/toolset-2022.json index a45a18bbbc40..7f93108b7d93 100644 --- a/images/windows/toolsets/toolset-2022.json +++ b/images/windows/toolsets/toolset-2022.json @@ -308,12 +308,12 @@ }, "serviceFabric": { "runtime": { - "version": "9.1.2837.9590", - "checksum": "5CDFDC7497522147081C7FB0CEBE09E483F871285A8EB87C821F1AB64DD9FCDD" + "version": "9.1.1436.9590", + "checksum": "089F9BE6A63AF66C337E507B52082575C8ED330DF765259C6F2F13F900DA96D5" }, "sdk": { - "version": "6.1.2837", - "checksum": "492F2FCE79C409ADAFC34F581956505C454484E909814E8FEF413DA10457D232" + "version": "6.1.1436", + "checksum": "D2A6B58315D08B6E46C2D25E91DFA1163136F70A5FA8CEF9DB147F07EE001AD1" } }, "dotnet": { From 4ac59091918e1e462afec72611075893b4bc4af1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E0=B4=95=E0=B5=81=E0=B4=9F=E0=B5=8D=E0=B4=9F=E0=B5=82?= =?UTF-8?q?=E0=B4=B8=E0=B5=8D?= <sudobangbang@duck.com> Date: Tue, 7 Jan 2025 20:41:49 +0100 Subject: [PATCH 3381/3485] Use GitHub markdown alert for note (#11288) --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index f4074008601e..cf65d8adf5fe 100644 --- a/README.md +++ b/README.md @@ -129,7 +129,8 @@ The `-latest` migration process is gradual and happens over 1-2 months in order ### Package managers usage We use third-party package managers to install software during the image generation process. The table below lists the package managers and the software installed. -> **Note**: third-party repositories are re-evaluated every year to identify if they are still useful and secure. +> [!NOTE] +> Third-party repositories are re-evaluated every year to identify if they are still useful and secure. | Operating system | Package manager | Third-party repos and packages | | :--- | :---: | ---: | From bb3043b2c5169c9d969cc4ffd02856b5bc5d3b9c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 8 Jan 2025 11:48:29 +0000 Subject: [PATCH 3382/3485] Updating readme file for ubuntu24 version 20250105.1.1 (#11298) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2404-Readme.md | 54 +++++++++++++++--------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/images/ubuntu/Ubuntu2404-Readme.md b/images/ubuntu/Ubuntu2404-Readme.md index 8bf8f904e993..62109824cd68 100644 --- a/images/ubuntu/Ubuntu2404-Readme.md +++ b/images/ubuntu/Ubuntu2404-Readme.md @@ -7,7 +7,7 @@ # Ubuntu 24.04 - OS Version: 24.04.1 LTS - Kernel Version: 6.8.0-1017-azure -- Image Version: 20241215.1.0 +- Image Version: 20250105.1.0 - Systemd version: 255.4-1ubuntu8.4 ## Installed Software @@ -30,15 +30,15 @@ ### Package Management - cpan 1.64 -- Helm 3.16.3 -- Homebrew 4.4.11 -- Miniconda 24.9.2 +- Helm 3.16.4 +- Homebrew 4.4.14 +- Miniconda 24.11.1 - Npm 10.8.2 - Pip 24.0 - Pip3 24.0 - Pipx 1.7.1 - RubyGems 3.4.20 -- Vcpkg (build from commit b545373a9) +- Vcpkg (build from commit 65be70199) - Yarn 1.22.22 #### Environment variables @@ -57,7 +57,7 @@ to accomplish this. ### Project Management - Ant 1.10.14 -- Gradle 8.11.1 +- Gradle 8.12 - Lerna 8.1.9 - Maven 3.8.8 @@ -68,11 +68,11 @@ to accomplish this. - Bazelisk 1.25.0 - Bicep 0.32.4 - Buildah 1.33.7 -- CMake 3.31.2 +- CMake 3.31.3 - CodeQL Action Bundle 2.20.0 - Docker Amazon ECR Credential Helper 0.9.0 - Docker Compose v2 2.27.1 -- Docker-Buildx 0.19.2 +- Docker-Buildx 0.19.3 - Docker Client 26.1.3 - Docker Server 26.1.3 - Fastlane 2.226.0 @@ -81,7 +81,7 @@ to accomplish this. - Git-ftp 1.6.0 - Haveged 1.9.14 - jq 1.7 -- Kind 0.25.0 +- Kind 0.26.0 - Kubectl 1.32.0 - Kustomize 5.5.0 - MediaInfo 24.01 @@ -92,9 +92,9 @@ to accomplish this. - nvm 0.40.1 - OpenSSL 3.0.13-0ubuntu3.4 - Packer 1.11.2 -- Parcel 2.13.2 +- Parcel 2.13.3 - Podman 4.9.3 -- Pulumi 3.143.0 +- Pulumi 3.144.1 - Skopeo 1.13.3 - Sphinx Open Source Search Server 2.2.11 - yamllint 1.35.1 @@ -102,13 +102,13 @@ to accomplish this. - zstd 1.5.6 ### CLI Tools -- AWS CLI 2.22.17 +- AWS CLI 2.22.28 - AWS CLI Session Manager Plugin 1.2.694.0 - AWS SAM CLI 1.132.0 - Azure CLI 2.67.0 - Azure CLI (azure-devops) 1.0.1 -- GitHub CLI 2.63.2 -- Google Cloud CLI 503.0.0 +- GitHub CLI 2.64.0 +- Google Cloud CLI 504.0.1 ### Java | Version | Environment Variable | @@ -127,10 +127,10 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ``` ### Haskell Tools -- Cabal 3.12.1.0 -- GHC 9.10.1 -- GHCup 0.1.30.0 -- Stack 3.1.1 +- Cabal 3.14.1.1 +- GHC 9.12.1 +- GHCup 0.1.40.0 +- Stack 3.3.1 ### Rust Tools - Cargo 1.83.0 @@ -142,13 +142,13 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.8.0 ### Browsers and Drivers -- Google Chrome 131.0.6778.139 -- ChromeDriver 131.0.6778.108 +- Google Chrome 131.0.6778.204 +- ChromeDriver 131.0.6778.204 - Chromium 131.0.6778.0 -- Microsoft Edge 131.0.2903.99 -- Microsoft Edge WebDriver 131.0.2903.87 +- Microsoft Edge 131.0.2903.112 +- Microsoft Edge WebDriver 131.0.2903.112 - Selenium server 4.27.0 -- Mozilla Firefox 133.0 +- Mozilla Firefox 133.0.3 - Geckodriver 0.35.0 #### Environment variables @@ -196,8 +196,8 @@ Use the following command as a part of your job to start the service: 'sudo syst - 22.12.0 #### Python -- 3.9.20 -- 3.10.15 +- 3.9.21 +- 3.10.16 - 3.11.11 - 3.12.8 @@ -225,7 +225,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 12.0 | | Android SDK Build-tools | 35.0.0<br>34.0.0 | -| Android SDK Platforms | android-35-ext14 (rev 1)<br>android-35 (rev 1)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1) | +| Android SDK Platforms | android-35-ext14 (rev 1)<br>android-35 (rev 2)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1) | | Android Support Repository | 47.0.0 | | Google Play services | 49 | | Google Repository | 58 | @@ -253,7 +253,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | brotli | 1.1.0-2build2 | | bzip2 | 1.0.8-5.1build0.1 | | coreutils | 9.4-3ubuntu6 | -| curl | 8.5.0-2ubuntu10.5 | +| curl | 8.5.0-2ubuntu10.6 | | dbus | 1.14.10-4ubuntu4.1 | | dnsutils | 1:9.18.28-0ubuntu0.24.04.1 | | dpkg | 1.22.6ubuntu6.1 | From 6d67eed16270dd488fdc1d819f19246993d7e0dd Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 8 Jan 2025 12:36:16 +0000 Subject: [PATCH 3383/3485] Updating readme file for ubuntu22 version 20250105.1.1 (#11299) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2204-Readme.md | 81 +++++++++++++++--------------- 1 file changed, 40 insertions(+), 41 deletions(-) diff --git a/images/ubuntu/Ubuntu2204-Readme.md b/images/ubuntu/Ubuntu2204-Readme.md index 469751c15fae..842a636e8219 100644 --- a/images/ubuntu/Ubuntu2204-Readme.md +++ b/images/ubuntu/Ubuntu2204-Readme.md @@ -7,7 +7,7 @@ # Ubuntu 22.04 - OS Version: 22.04.5 LTS - Kernel Version: 6.5.0-1025-azure -- Image Version: 20241215.1.0 +- Image Version: 20250105.1.0 - Systemd version: 249.11-0ubuntu3.12 ## Installed Software @@ -32,16 +32,16 @@ ### Package Management - cpan 1.64 -- Helm 3.16.3 -- Homebrew 4.4.11 -- Miniconda 24.9.2 +- Helm 3.16.4 +- Homebrew 4.4.14 +- Miniconda 24.11.1 - Npm 10.8.2 - NuGet 6.6.1.2 - Pip 22.0.2 - Pip3 22.0.2 - Pipx 1.7.1 - RubyGems 3.3.5 -- Vcpkg (build from commit b545373a9) +- Vcpkg (build from commit 65be70199) - Yarn 1.22.22 #### Environment variables @@ -60,10 +60,10 @@ to accomplish this. ### Project Management - Ant 1.10.12 -- Gradle 8.11.1 +- Gradle 8.12 - Lerna 8.1.9 - Maven 3.8.8 -- Sbt 1.10.6 +- Sbt 1.10.7 ### Tools - Ansible 2.17.7 @@ -73,11 +73,11 @@ to accomplish this. - Bazelisk 1.25.0 - Bicep 0.32.4 - Buildah 1.23.1 -- CMake 3.31.2 +- CMake 3.31.3 - CodeQL Action Bundle 2.20.0 - Docker Amazon ECR Credential Helper 0.9.0 - Docker Compose v2 2.27.1 -- Docker-Buildx 0.19.2 +- Docker-Buildx 0.19.3 - Docker Client 26.1.3 - Docker Server 26.1.3 - Fastlane 2.226.0 @@ -87,7 +87,7 @@ to accomplish this. - Haveged 1.9.14 - Heroku 10.0.0 - jq 1.6 -- Kind 0.25.0 +- Kind 0.26.0 - Kubectl 1.32.0 - Kustomize 5.5.0 - Leiningen 2.11.2 @@ -99,31 +99,31 @@ to accomplish this. - nvm 0.40.1 - OpenSSL 3.0.2-0ubuntu1.18 - Packer 1.11.2 -- Parcel 2.13.2 +- Parcel 2.13.3 - Podman 3.4.4 -- Pulumi 3.143.0 +- Pulumi 3.144.1 - R 4.4.2 - Skopeo 1.4.1 - Sphinx Open Source Search Server 2.2.11 - SVN 1.14.1 -- Terraform 1.10.2 +- Terraform 1.10.3 - yamllint 1.35.1 - yq 4.44.6 - zstd 1.5.6 ### CLI Tools -- Alibaba Cloud CLI 3.0.237 -- AWS CLI 2.22.17 +- Alibaba Cloud CLI 3.0.244 +- AWS CLI 2.22.28 - AWS CLI Session Manager Plugin 1.2.694.0 - AWS SAM CLI 1.132.0 - Azure CLI 2.67.0 - Azure CLI (azure-devops) 1.0.1 -- GitHub CLI 2.63.2 -- Google Cloud CLI 503.0.0 -- Netlify CLI 17.38.0 -- OpenShift CLI 4.17.8 -- ORAS CLI 1.2.1 -- Vercel CLI 39.2.2 +- GitHub CLI 2.64.0 +- Google Cloud CLI 504.0.1 +- Netlify CLI 17.38.1 +- OpenShift CLI 4.17.10 +- ORAS CLI 1.2.2 +- Vercel CLI 39.2.5 ### Java | Version | Environment Variable | @@ -142,10 +142,10 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ``` ### Haskell Tools -- Cabal 3.12.1.0 -- GHC 9.10.1 -- GHCup 0.1.30.0 -- Stack 3.1.1 +- Cabal 3.14.1.1 +- GHC 9.12.1 +- GHCup 0.1.40.0 +- Stack 3.3.1 ### Rust Tools - Cargo 1.83.0 @@ -162,13 +162,13 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.8.0 ### Browsers and Drivers -- Google Chrome 131.0.6778.139 -- ChromeDriver 131.0.6778.108 +- Google Chrome 131.0.6778.204 +- ChromeDriver 131.0.6778.204 - Chromium 131.0.6778.0 -- Microsoft Edge 131.0.2903.99 -- Microsoft Edge WebDriver 131.0.2903.87 +- Microsoft Edge 131.0.2903.112 +- Microsoft Edge WebDriver 131.0.2903.112 - Selenium server 4.27.0 -- Mozilla Firefox 133.0 +- Mozilla Firefox 133.0.3 - Geckodriver 0.35.0 #### Environment variables @@ -220,10 +220,9 @@ Use the following command as a part of your job to start the service: 'sudo syst - 22.12.0 #### Python -- 3.7.17 - 3.8.18 -- 3.9.20 -- 3.10.15 +- 3.9.21 +- 3.10.16 - 3.11.11 - 3.12.8 @@ -258,7 +257,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 9.0 | | Android SDK Build-tools | 35.0.0<br>34.0.0<br>33.0.0 33.0.1 33.0.2 33.0.3<br>32.0.0<br>31.0.0 | -| Android SDK Platforms | android-35-ext14 (rev 1)<br>android-35 (rev 1)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1) | +| Android SDK Platforms | android-35-ext14 (rev 1)<br>android-35 (rev 2)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1) | | Android Support Repository | 47.0.0 | | CMake | 3.10.2<br>3.18.1<br>3.22.1 | | Google Play services | 49 | @@ -283,13 +282,13 @@ Use the following command as a part of your job to start the service: 'sudo syst | alpine:3.18 | sha256:2995c82e8e723d9a5c8585cb8e901d1c50e3c2759031027d3bff577449435157 | 2024-09-06 | | alpine:3.19 | sha256:7a85bf5dc56c949be827f84f9185161265c58f589bb8b2a6b6bb6d3076c1be21 | 2024-09-06 | | debian:10 | sha256:58ce6f1271ae1c8a2006ff7d3e54e9874d839f573d8009c20154ad0f2fb0a225 | 2024-06-13 | -| debian:11 | sha256:e91d1b0684e0f26a29c2353c52d4814f4d153e10b1faddf9fbde473ed71e2fcf | 2024-12-02 | -| moby/buildkit:latest | sha256:58e6d150a3c5a4b92e99ea8df2cbe976ad6d2ae5beab39214e84fada05b059d5 | 2024-12-04 | -| node:18 | sha256:b57ae84fe7880a23b389f8260d726b784010ed470c2ee26d4e2cbdb955d25b12 | 2024-11-15 | +| debian:11 | sha256:21b74d95871e8676a0cf47df9caebb1021b2af60b9a6e4777ce92f92f98e3a90 | 2024-12-23 | +| moby/buildkit:latest | sha256:86c0ad9d1137c186e9d455912167df20e530bdf7f7c19de802e892bb8ca16552 | 2024-12-16 | +| node:18 | sha256:7f31a1eb14c61719b8bb0eaa029310cc33851f71d3578cc422b390f8096977c5 | 2024-11-15 | | node:18-alpine | sha256:6eb9c3d9bd191bd2cc6ce7ec3d5ec4c2127616140c8586af96a6bec8f28689d1 | 2024-12-05 | -| node:20 | sha256:f4755c9039bdeec5c736b2e0dd5b47700d6393b65688b9e9f807ec12f54a8690 | 2024-11-20 | +| node:20 | sha256:d17aaa2a2fd82e09bd6a6da7cc4a79741340d2a3e39d172d1b30f295b1a850ff | 2024-11-20 | | node:20-alpine | sha256:426f843809ae05f324883afceebaa2b9cab9cb697097dbb1a2a7a41c5701de72 | 2024-12-05 | -| node:22 | sha256:35a5dd72bcac4bce43266408b58a02be6ff0b6098ffa6f5435aeea980a8951d7 | 2024-12-03 | +| node:22 | sha256:0e910f435308c36ea60b4cfd7b80208044d77a074d16b768a81901ce938a62dc | 2024-12-03 | | node:22-alpine | sha256:6e80991f69cc7722c561e5d14d5e72ab47c0d6b6cfb3ae50fb9cf9a7b30fdf97 | 2024-12-05 | | ubuntu:20.04 | sha256:8e5c4f0285ecbb4ead070431d29b576a530d3166df73ec44affc1cd27555141b | 2024-10-11 | | ubuntu:22.04 | sha256:0e5e4a57c2499249aafc3b40fcd541e9a456aab7296681a3994d631587203f97 | 2024-09-11 | @@ -306,7 +305,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | brotli | 1.0.9-2build6 | | bzip2 | 1.0.8-5build1 | | coreutils | 8.32-4.1ubuntu1.2 | -| curl | 7.81.0-1ubuntu1.19 | +| curl | 7.81.0-1ubuntu1.20 | | dbus | 1.12.20-2ubuntu4.1 | | dnsutils | 1:9.18.28-0ubuntu0.22.04.1 | | dpkg | 1.21.1ubuntu2.3 | @@ -329,7 +328,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | libc++-dev | 1:14.0-55\~exp2 | | libc++abi-dev | 1:14.0-55\~exp2 | | libc6-dev | 2.35-0ubuntu3.8 | -| libcurl4 | 7.81.0-1ubuntu1.19 | +| libcurl4 | 7.81.0-1ubuntu1.20 | | libgbm-dev | 23.2.1-1ubuntu3.1\~22.04.3 | | libgconf-2-4 | 3.2.6-7ubuntu2 | | libgsl-dev | 2.7.1+dfsg-3 | From 989ed18117b9962d191784b0a93fc94aa07d6d9a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 8 Jan 2025 13:31:07 +0000 Subject: [PATCH 3384/3485] Updating readme file for macos-15 version 20250106.547 (#11307) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-15-Readme.md | 42 ++++++++++++++++----------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/images/macos/macos-15-Readme.md b/images/macos/macos-15-Readme.md index 71a579578e5e..7f54aff80ed3 100644 --- a/images/macos/macos-15-Readme.md +++ b/images/macos/macos-15-Readme.md @@ -7,7 +7,7 @@ # macOS 15 - OS Version: macOS 15.2 (24C101) - Kernel Version: Darwin 24.2.0 -- Image Version: 20241217.493 +- Image Version: 20250106.547 ## Installed Software @@ -25,26 +25,26 @@ - Kotlin 2.1.0-release-394 - Node.js 22.12.0 - Perl 5.40.0 -- PHP 8.4.1 +- PHP 8.4.2 - Python3 3.13.1 - Ruby 3.3.6 ### Package Management -- Bundler 2.6.0 +- Bundler 2.6.2 - Carthage 0.40.0 - CocoaPods 1.16.2 - Composer 2.8.4 -- Homebrew 4.4.12 +- Homebrew 4.4.14 - NPM 10.9.0 - Pip3 24.3.1 (python 3.13) - Pipx 1.7.1 -- RubyGems 3.6.0 +- RubyGems 3.6.2 - Yarn 1.22.22 ### Project Management - Apache Ant 1.10.15 - Apache Maven 3.9.9 -- Gradle 8.11.1 +- Gradle 8.12 ### Utilities - 7-Zip 17.05 @@ -56,10 +56,10 @@ - Curl 8.11.1 - Git 2.47.1 - Git LFS 3.6.0 -- GitHub CLI 2.63.2 +- GitHub CLI 2.64.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.25.0 -- gpg (GnuPG) 2.4.6 +- gpg (GnuPG) 2.4.7 - jq 1.7.1 - OpenSSL 1.1.1w 11 Sep 2023 - Packer 1.11.2 @@ -69,17 +69,17 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.22.18 +- AWS CLI 2.22.28 - AWS SAM CLI 1.132.0 - AWS Session Manager CLI 1.2.694.0 - Azure CLI 2.67.0 - Azure CLI (azure-devops) 1.0.1 - Bicep CLI 0.32.4 -- Cmake 3.31.2 +- Cmake 3.31.3 - CodeQL Action Bundle 2.20.0 - Fastlane 2.226.0 -- SwiftFormat 0.55.3 -- Xcbeautify 2.16.0 +- SwiftFormat 0.55.4 +- Xcbeautify 2.17.0 - Xcode Command Line Tools 16.2.0.0.1.1733547573 - Xcodes 1.6.0 @@ -89,11 +89,11 @@ ### Browsers - Safari 18.2 (20620.1.16.11.8) - SafariDriver 18.2 (20620.1.16.11.8) -- Google Chrome 131.0.6778.140 -- Google Chrome for Testing 131.0.6778.108 -- ChromeDriver 131.0.6778.108 -- Microsoft Edge 131.0.2903.99 -- Microsoft Edge WebDriver 131.0.2903.87 +- Google Chrome 131.0.6778.205 +- Google Chrome for Testing 131.0.6778.204 +- ChromeDriver 131.0.6778.204 +- Microsoft Edge 131.0.2903.112 +- Microsoft Edge WebDriver 131.0.2903.112 - Mozilla Firefox 133.0.3 - geckodriver 0.35.0 - Selenium server 4.27.0 @@ -195,12 +195,12 @@ | Simulator - watchOS 11.2 | watchsimulator11.2 | 16.2 | | Simulator - visionOS 1.2 | xrsimulator1.2 | 15.4 | | visionOS 1.2 | xros1.2 | 15.4 | -| Simulator - visionOS 2.0 | xrsimulator2.0 | 16.0 | | visionOS 2.0 | xros2.0 | 16.0 | -| visionOS 2.1 | xros2.1 | 16.1 | +| Simulator - visionOS 2.0 | xrsimulator2.0 | 16.0 | | Simulator - visionOS 2.1 | xrsimulator2.1 | 16.1 | -| Simulator - visionOS 2.2 | xrsimulator2.2 | 16.2 | +| visionOS 2.1 | xros2.1 | 16.1 | | visionOS 2.2 | xros2.2 | 16.2 | +| Simulator - visionOS 2.2 | xrsimulator2.2 | 16.2 | | DriverKit 23.5 | driverkit23.5 | 15.4 | | DriverKit 24.0 | driverkit24.0 | 16.0 | | DriverKit 24.1 | driverkit24.1 | 16.1 | @@ -228,7 +228,7 @@ | Android Command Line Tools | 16.0 | | Android Emulator | 35.2.10 | | Android SDK Build-tools | 35.0.0 | -| Android SDK Platforms | android-35-ext14 (rev 1)<br>android-35 (rev 1)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1) | +| Android SDK Platforms | android-35-ext14 (rev 1)<br>android-35 (rev 2)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1) | | Android SDK Platform-Tools | 35.0.2 | | Android Support Repository | 47.0.0 | | CMake | 3.31.0 | From f7416ed524d93bc348c9371fd2b1b54a3b10d16d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 8 Jan 2025 14:27:13 +0000 Subject: [PATCH 3385/3485] Updating readme file for win25 version 20250105.1.1 (#11313) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/windows/Windows2025-Readme.md | 80 ++++++++++++++++------------ 1 file changed, 46 insertions(+), 34 deletions(-) diff --git a/images/windows/Windows2025-Readme.md b/images/windows/Windows2025-Readme.md index 5e044ee12d89..e5d6456a6a6e 100644 --- a/images/windows/Windows2025-Readme.md +++ b/images/windows/Windows2025-Readme.md @@ -1,9 +1,19 @@ +| Announcements | +|-| +| [[Windows ] Breaking change : PHP 8.3.* version will be updated to PHP 8.4.* from January 31,2025](https://github.com/actions/runner-images/issues/11256) | +| [Windows Server 2025 is now available](https://github.com/actions/runner-images/issues/11228) | +| [[Windows] Breaking change : Docker Engine Version 26.* will be updated to Docker Engine Version 27.* from January 17,2025](https://github.com/actions/runner-images/issues/11104) | +| [[Windows & Ubuntu] Breaking change : Maven 3.8.* version will be updated to Maven 3.9.* from January 17,2025](https://github.com/actions/runner-images/issues/11093) | +| [[Windows & Ubuntu] .NET 7.x will be removed from the images on January 17,2025](https://github.com/actions/runner-images/issues/10894) | +| [[Windows & Ubuntu] Python 3.7.x will be removed from January 10 ,2025](https://github.com/actions/runner-images/issues/10893) | +*** # Windows Server 2025 - OS Version: 10.0.26100 Build 2605 -- Image Version: 20241215.1.0 +- Image Version: 20250105.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled +- Windows Subsystem for Linux (Default, WSLv2): 2.3.26.0 ## Installed Software @@ -15,21 +25,21 @@ - LLVM 19.1.5 - Node 22.12.0 - Perl 5.40.0 -- PHP 8.3.14 +- PHP 8.3.15 - Python 3.9.13 - Ruby 3.3.6 ### Package Management - Chocolatey 2.4.1 - Composer 2.8.4 -- Helm 3.16.2 -- Miniconda 24.9.2 (pre-installed on the image but not added to PATH) +- Helm 3.16.3 +- Miniconda 24.11.1 (pre-installed on the image but not added to PATH) - NPM 10.9.0 - NuGet 6.12.1.1 - pip 24.3.1 (python 3.9) - Pipx 1.7.1 - RubyGems 3.5.22 -- Vcpkg (build from commit c26eabb23) +- Vcpkg (build from commit 65be70199) - Yarn 1.22.22 #### Environment variables @@ -40,9 +50,9 @@ ### Project Management - Ant 1.10.14 -- Gradle 8.11 +- Gradle 8.12 - Maven 3.9.9 -- sbt 1.10.6 +- sbt 1.10.7 ### Tools - 7zip 24.09 @@ -51,18 +61,18 @@ - Bazel 8.0.0 - Bazelisk 1.25.0 - Bicep 0.32.4 -- Cabal 3.12.1.0 -- CMake 3.31.2 +- Cabal 3.14.1.1 +- CMake 3.31.3 - CodeQL Action Bundle 2.20.0 - Docker 26.1.3 - Docker Compose v2 2.27.1 - Docker-wincred 0.8.2 -- ghc 9.10.1 +- ghc 9.12.1 - Git 2.47.1.windows.1 - Git LFS 3.6.0 -- ImageMagick 7.1.1-41 +- ImageMagick 7.1.1-43 - jq 1.7.1 -- Kind 0.25.0 +- Kind 0.26.0 - Kubectl 1.32.0 - gcc 14.2.0 - gdb 14.2 @@ -70,10 +80,10 @@ - Newman 6.2.1 - OpenSSL 3.4.0 - Packer 1.11.2 -- Pulumi 3.143.0 +- Pulumi 3.144.1 - R 4.4.2 - Service Fabric SDK 10.1.2493.9590 -- Stack 3.1.1 +- Stack 3.3.1 - Swig 4.1.1 - VSWhere 3.1.7 - WinAppDriver 1.2.2009.02003 @@ -82,12 +92,12 @@ - zstd 1.5.6 ### CLI Tools -- AWS CLI 2.22.17 +- AWS CLI 2.22.28 - AWS SAM CLI 1.132.0 - AWS Session Manager CLI 1.2.694.0 - Azure CLI 2.67.0 - Azure DevOps CLI extension 1.0.1 -- GitHub CLI 2.63.2 +- GitHub CLI 2.64.0 ### Rust Tools - Cargo 1.83.0 @@ -100,10 +110,10 @@ - Rustfmt 1.8.0 ### Browsers and Drivers -- Google Chrome 131.0.6778.140 -- Chrome Driver 131.0.6778.108 -- Microsoft Edge 131.0.2903.99 -- Microsoft Edge Driver 131.0.2903.99 +- Google Chrome 131.0.6778.205 +- Chrome Driver 131.0.6778.204 +- Microsoft Edge 131.0.2903.112 +- Microsoft Edge Driver 131.0.2903.112 - Mozilla Firefox 133.0.3 - Gecko Driver 0.35.0 - IE Driver 4.14.0.0 @@ -187,7 +197,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### MongoDB | Version | ServiceName | ServiceStatus | ServiceStartType | | -------- | ----------- | ------------- | ---------------- | -| 7.0.15.0 | MongoDB | Stopped | Disabled | +| 7.0.16.0 | MongoDB | Stopped | Disabled | ### Database tools - Azure CosmosDb Emulator 2.14.21.0 @@ -195,6 +205,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - MySQL 8.0.40.0 - SQL OLEDB Driver 18.7.4.0 - SQLPS 1.0 +- MongoDB Shell (mongosh) 2.3.7 ### Web Servers | Name | Version | ConfigFile | ServiceName | ServiceStatus | ListenPort | @@ -473,7 +484,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Powershell Modules - Az: 12.4.0 -- AWSPowershell: 4.1.718 +- AWSPowershell: 4.1.729 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.10 - Microsoft.Graph: 2.25.0 @@ -485,18 +496,18 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - VSSetup: 2.2.16 ### Android -| Package Name | Version | -| -------------------------- | -------------------------------------------------------------------- | -| Android Command Line Tools | 16.0 | -| Android Emulator | 35.2.10 | -| Android SDK Build-tools | 35.0.0 | -| Android SDK Platforms | android-35-ext14 (rev 1)<br>android-35 (rev 1)<br>android-34 (rev 3) | -| Android SDK Platform-Tools | 35.0.2 | -| Android Support Repository | 47.0.0 | -| CMake | 3.22.1<br>3.30.5 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 26.3.11579264<br>27.2.12479018 | +| Package Name | Version | +| -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Android Command Line Tools | 16.0 | +| Android Emulator | 35.2.10 | +| Android SDK Build-tools | 35.0.0<br>34.0.0 | +| Android SDK Platforms | android-35-ext14 (rev 1)<br>android-35 (rev 2)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3) | +| Android SDK Platform-Tools | 35.0.2 | +| Android Support Repository | 47.0.0 | +| CMake | 3.22.1<br>3.30.5 | +| Google Play services | 49 | +| Google Repository | 58 | +| NDK | 26.3.11579264<br>27.2.12479018 | #### Environment variables | Name | Value | @@ -507,3 +518,4 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | ANDROID_NDK_LATEST_HOME | C:\Android\android-sdk\ndk\27.2.12479018 | | ANDROID_NDK_ROOT | C:\Android\android-sdk\ndk\27.2.12479018 | | ANDROID_SDK_ROOT | C:\Android\android-sdk | + From 402d029f440b1c2252357b8408db98be6e17b2da Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 8 Jan 2025 14:40:43 +0000 Subject: [PATCH 3386/3485] Updating readme file for ubuntu20 version 20250105.1.1 (#11302) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2004-Readme.md | 83 +++++++++++++++--------------- 1 file changed, 41 insertions(+), 42 deletions(-) diff --git a/images/ubuntu/Ubuntu2004-Readme.md b/images/ubuntu/Ubuntu2004-Readme.md index 12a0aded6a72..97caeb2d1e99 100644 --- a/images/ubuntu/Ubuntu2004-Readme.md +++ b/images/ubuntu/Ubuntu2004-Readme.md @@ -1,13 +1,13 @@ | Announcements | |-| -| [[Windows & Ubuntu] Breaking change : Maven 3.8.* version will be updated to Maven 3.9.* from January 10,2025](https://github.com/actions/runner-images/issues/11093) | +| [[Windows & Ubuntu] Breaking change : Maven 3.8.* version will be updated to Maven 3.9.* from January 17,2025](https://github.com/actions/runner-images/issues/11093) | | [[Ubuntu] Breaking Change: runner user will have UID 1001 instead of 1000 for larger runners](https://github.com/actions/runner-images/issues/10936) | | [Ubuntu-latest workflows will use Ubuntu-24.04 image](https://github.com/actions/runner-images/issues/10636) | *** # Ubuntu 20.04 - OS Version: 20.04.6 LTS - Kernel Version: 5.15.0-1074-azure -- Image Version: 20241215.1.0 +- Image Version: 20250105.1.0 - Systemd version: 245.4-4ubuntu3.24 ## Installed Software @@ -18,7 +18,7 @@ - Clang-format: 10.0.0, 11.0.0, 12.0.0 - Clang-tidy: 10.0.0, 11.0.0, 12.0.0 - Dash 0.5.10.2-6 -- Erlang 25.3 (Eshell 13.2) +- Erlang 25.3.2 (Eshell 13.2.2) - Erlang rebar3 3.24.0 - GNU C++: 10.5.0 - GNU Fortran: 10.5.0 @@ -34,16 +34,16 @@ ### Package Management - cpan 1.64 -- Helm 3.16.3 -- Homebrew 4.4.11 -- Miniconda 24.9.2 +- Helm 3.16.4 +- Homebrew 4.4.14 +- Miniconda 24.11.1 - Npm 10.8.2 - NuGet 6.6.1.2 - Pip 20.0.2 - Pip3 20.0.2 - Pipx 1.7.1 - RubyGems 3.1.2 -- Vcpkg (build from commit b545373a9) +- Vcpkg (build from commit 65be70199) - Yarn 1.22.22 #### Environment variables @@ -62,10 +62,10 @@ to accomplish this. ### Project Management - Ant 1.10.7 -- Gradle 8.11.1 +- Gradle 8.12 - Lerna 8.1.9 - Maven 3.8.8 -- Sbt 1.10.6 +- Sbt 1.10.7 ### Tools - Ansible 2.13.13 @@ -75,11 +75,11 @@ to accomplish this. - Bazelisk 1.25.0 - Bicep 0.32.4 - Buildah 1.22.3 -- CMake 3.31.2 +- CMake 3.31.3 - CodeQL Action Bundle 2.20.0 - Docker Amazon ECR Credential Helper 0.9.0 - Docker Compose v2 2.27.1 -- Docker-Buildx 0.19.2 +- Docker-Buildx 0.19.3 - Docker Client 26.1.3 - Docker Server 26.1.3 - Fastlane 2.226.0 @@ -90,7 +90,7 @@ to accomplish this. - Heroku 10.0.0 - HHVM (HipHop VM) 4.172.1 - jq 1.6 -- Kind 0.25.0 +- Kind 0.26.0 - Kubectl 1.32.0 - Kustomize 5.5.0 - Leiningen 2.11.2 @@ -102,32 +102,32 @@ to accomplish this. - nvm 0.40.1 - OpenSSL 1.1.1f-1ubuntu2.23 - Packer 1.11.2 -- Parcel 2.13.2 +- Parcel 2.13.3 - PhantomJS 2.1.1 2.1.1 - Podman 3.4.2 -- Pulumi 3.143.0 +- Pulumi 3.144.1 - R 4.4.2 - Skopeo 1.5.0 - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 -- Terraform 1.10.2 +- Terraform 1.10.3 - yamllint 1.35.1 - yq 4.44.6 - zstd 1.5.6 ### CLI Tools - Alibaba Cloud CLI 3.0.174 -- AWS CLI 2.22.17 +- AWS CLI 2.22.28 - AWS CLI Session Manager Plugin 1.2.694.0 - AWS SAM CLI 1.132.0 - Azure CLI 2.67.0 - Azure CLI (azure-devops) 1.0.1 -- GitHub CLI 2.63.2 -- Google Cloud CLI 503.0.0 -- Netlify CLI 17.38.0 +- GitHub CLI 2.64.0 +- Google Cloud CLI 504.0.1 +- Netlify CLI 17.38.1 - OpenShift CLI 4.15.19 -- ORAS CLI 1.2.1 -- Vercel CLI 39.2.2 +- ORAS CLI 1.2.2 +- Vercel CLI 39.2.5 ### Java | Version | Environment Variable | @@ -138,7 +138,7 @@ to accomplish this. | 21.0.5+11 | JAVA_HOME_21_X64 | ### PHP Tools -- PHP: 7.4.33, 8.0.30, 8.1.31, 8.2.26, 8.3.14 +- PHP: 7.4.33, 8.0.30, 8.1.31, 8.2.27, 8.3.15 - Composer 2.8.4 - PHPUnit 8.5.41 ``` @@ -146,10 +146,10 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. ``` ### Haskell Tools -- Cabal 3.12.1.0 -- GHC 9.10.1 -- GHCup 0.1.30.0 -- Stack 3.1.1 +- Cabal 3.14.1.1 +- GHC 9.12.1 +- GHCup 0.1.40.0 +- Stack 3.3.1 ### Rust Tools - Cargo 1.83.0 @@ -166,13 +166,13 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.8.0 ### Browsers and Drivers -- Google Chrome 131.0.6778.139 -- ChromeDriver 131.0.6778.108 +- Google Chrome 131.0.6778.204 +- ChromeDriver 131.0.6778.204 - Chromium 131.0.6778.0 -- Microsoft Edge 131.0.2903.99 -- Microsoft Edge WebDriver 131.0.2903.87 +- Microsoft Edge 131.0.2903.112 +- Microsoft Edge WebDriver 131.0.2903.112 - Selenium server 4.27.0 -- Mozilla Firefox 133.0 +- Mozilla Firefox 133.0.3 - Geckodriver 0.35.0 #### Environment variables @@ -225,10 +225,9 @@ Use the following command as a part of your job to start the service: 'sudo syst - 22.12.0 #### Python -- 3.7.17 - 3.8.18 -- 3.9.20 -- 3.10.15 +- 3.9.21 +- 3.10.16 - 3.11.11 - 3.12.8 @@ -267,7 +266,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 9.0 | | Android SDK Build-tools | 35.0.0<br>34.0.0<br>33.0.0 33.0.1 33.0.2 33.0.3<br>32.0.0<br>31.0.0 | -| Android SDK Platforms | android-35-ext14 (rev 1)<br>android-35 (rev 1)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1) | +| Android SDK Platforms | android-35-ext14 (rev 1)<br>android-35 (rev 2)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1) | | Android Support Repository | 47.0.0 | | CMake | 3.10.2<br>3.18.1<br>3.22.1 | | Google Play services | 49 | @@ -292,14 +291,14 @@ Use the following command as a part of your job to start the service: 'sudo syst | alpine:3.18 | sha256:2995c82e8e723d9a5c8585cb8e901d1c50e3c2759031027d3bff577449435157 | 2024-09-06 | | alpine:3.19 | sha256:7a85bf5dc56c949be827f84f9185161265c58f589bb8b2a6b6bb6d3076c1be21 | 2024-09-06 | | debian:10 | sha256:58ce6f1271ae1c8a2006ff7d3e54e9874d839f573d8009c20154ad0f2fb0a225 | 2024-06-13 | -| debian:11 | sha256:e91d1b0684e0f26a29c2353c52d4814f4d153e10b1faddf9fbde473ed71e2fcf | 2024-12-02 | +| debian:11 | sha256:21b74d95871e8676a0cf47df9caebb1021b2af60b9a6e4777ce92f92f98e3a90 | 2024-12-23 | | debian:9 | sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be | 2022-06-23 | -| moby/buildkit:latest | sha256:58e6d150a3c5a4b92e99ea8df2cbe976ad6d2ae5beab39214e84fada05b059d5 | 2024-12-04 | -| node:18 | sha256:b57ae84fe7880a23b389f8260d726b784010ed470c2ee26d4e2cbdb955d25b12 | 2024-11-15 | +| moby/buildkit:latest | sha256:86c0ad9d1137c186e9d455912167df20e530bdf7f7c19de802e892bb8ca16552 | 2024-12-16 | +| node:18 | sha256:7f31a1eb14c61719b8bb0eaa029310cc33851f71d3578cc422b390f8096977c5 | 2024-11-15 | | node:18-alpine | sha256:6eb9c3d9bd191bd2cc6ce7ec3d5ec4c2127616140c8586af96a6bec8f28689d1 | 2024-12-05 | -| node:20 | sha256:f4755c9039bdeec5c736b2e0dd5b47700d6393b65688b9e9f807ec12f54a8690 | 2024-11-20 | +| node:20 | sha256:d17aaa2a2fd82e09bd6a6da7cc4a79741340d2a3e39d172d1b30f295b1a850ff | 2024-11-20 | | node:20-alpine | sha256:426f843809ae05f324883afceebaa2b9cab9cb697097dbb1a2a7a41c5701de72 | 2024-12-05 | -| node:22 | sha256:35a5dd72bcac4bce43266408b58a02be6ff0b6098ffa6f5435aeea980a8951d7 | 2024-12-03 | +| node:22 | sha256:0e910f435308c36ea60b4cfd7b80208044d77a074d16b768a81901ce938a62dc | 2024-12-03 | | node:22-alpine | sha256:6e80991f69cc7722c561e5d14d5e72ab47c0d6b6cfb3ae50fb9cf9a7b30fdf97 | 2024-12-05 | | ubuntu:20.04 | sha256:8e5c4f0285ecbb4ead070431d29b576a530d3166df73ec44affc1cd27555141b | 2024-10-11 | @@ -315,7 +314,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | brotli | 1.0.7-6ubuntu0.1 | | bzip2 | 1.0.8-2 | | coreutils | 8.30-3ubuntu2 | -| curl | 7.68.0-1ubuntu2.24 | +| curl | 7.68.0-1ubuntu2.25 | | dbus | 1.12.16-2ubuntu2.3 | | dnsutils | 1:9.18.28-0ubuntu0.20.04.1 | | dpkg | 1.19.7ubuntu3.2 | @@ -338,7 +337,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | libc++-dev | 1:10.0-50\~exp1 | | libc++abi-dev | 1:10.0-50\~exp1 | | libc6-dev | 2.31-0ubuntu9.16 | -| libcurl4 | 7.68.0-1ubuntu2.24 | +| libcurl4 | 7.68.0-1ubuntu2.25 | | libgbm-dev | 21.2.6-0ubuntu0.1\~20.04.2 | | libgconf-2-4 | 3.2.6-6ubuntu1 | | libgsl-dev | 2.5+dfsg-6+deb10u1build0.20.04.1 | From 5d3ec3ef998df30dd11469e05c1dab79ea8dcf06 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 8 Jan 2025 17:06:18 +0000 Subject: [PATCH 3387/3485] Updating readme file for macos-15-arm64 version 20250106.544 (#11308) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-15-arm64-Readme.md | 32 +++++++++++++-------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/images/macos/macos-15-arm64-Readme.md b/images/macos/macos-15-arm64-Readme.md index 2375e767bfb2..bfdc17cd0aab 100644 --- a/images/macos/macos-15-arm64-Readme.md +++ b/images/macos/macos-15-arm64-Readme.md @@ -7,7 +7,7 @@ # macOS 15 - OS Version: macOS 15.2 (24C101) - Kernel Version: Darwin 24.2.0 -- Image Version: 20241217.490 +- Image Version: 20250106.544 ## Installed Software @@ -29,20 +29,20 @@ - Ruby 3.3.6 ### Package Management -- Bundler 2.6.0 +- Bundler 2.6.2 - Carthage 0.40.0 - CocoaPods 1.16.2 -- Homebrew 4.4.12 +- Homebrew 4.4.14 - NPM 10.9.0 - Pip3 24.3.1 (python 3.13) - Pipx 1.7.1 -- RubyGems 3.6.0 +- RubyGems 3.6.2 - Yarn 1.22.22 ### Project Management - Apache Ant 1.10.15 - Apache Maven 3.9.9 -- Gradle 8.11.1 +- Gradle 8.12 ### Utilities - 7-Zip 17.05 @@ -54,10 +54,10 @@ - Curl 8.7.1 - Git 2.47.1 - Git LFS 3.6.0 -- GitHub CLI 2.63.2 +- GitHub CLI 2.64.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.25.0 -- gpg (GnuPG) 2.4.6 +- gpg (GnuPG) 2.4.7 - jq 1.7.1 - OpenSSL 1.1.1w 11 Sep 2023 - Packer 1.11.2 @@ -67,17 +67,17 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.22.18 +- AWS CLI 2.22.28 - AWS SAM CLI 1.132.0 - AWS Session Manager CLI 1.2.694.0 - Azure CLI 2.67.0 - Azure CLI (azure-devops) 1.0.1 - Bicep CLI 0.32.4 -- Cmake 3.31.2 +- Cmake 3.31.3 - CodeQL Action Bundle 2.20.0 - Fastlane 2.226.0 -- SwiftFormat 0.55.3 -- Xcbeautify 2.16.0 +- SwiftFormat 0.55.4 +- Xcbeautify 2.17.0 - Xcode Command Line Tools 16.2.0.0.1.1733547573 - Xcodes 1.6.0 @@ -86,9 +86,9 @@ ### Browsers - Safari 18.2 (20620.1.16.11.8) - SafariDriver 18.2 (20620.1.16.11.8) -- Google Chrome 131.0.6778.140 -- Google Chrome for Testing 131.0.6778.108 -- ChromeDriver 131.0.6778.108 +- Google Chrome 131.0.6778.205 +- Google Chrome for Testing 131.0.6778.204 +- ChromeDriver 131.0.6778.204 - Selenium server 4.27.0 #### Environment variables @@ -186,8 +186,8 @@ | Simulator - watchOS 11.2 | watchsimulator11.2 | 16.2 | | visionOS 1.2 | xros1.2 | 15.4 | | Simulator - visionOS 1.2 | xrsimulator1.2 | 15.4 | -| visionOS 2.0 | xros2.0 | 16.0 | | Simulator - visionOS 2.0 | xrsimulator2.0 | 16.0 | +| visionOS 2.0 | xros2.0 | 16.0 | | Simulator - visionOS 2.1 | xrsimulator2.1 | 16.1 | | visionOS 2.1 | xros2.1 | 16.1 | | Simulator - visionOS 2.2 | xrsimulator2.2 | 16.2 | @@ -223,7 +223,7 @@ | Android Command Line Tools | 16.0 | | Android Emulator | 35.2.10 | | Android SDK Build-tools | 35.0.0 | -| Android SDK Platforms | android-35-ext14 (rev 1)<br>android-35 (rev 1)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1) | +| Android SDK Platforms | android-35-ext14 (rev 1)<br>android-35 (rev 2)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1) | | Android SDK Platform-Tools | 35.0.2 | | Android Support Repository | 47.0.0 | | CMake | 3.31.0 | From 186e26bc9794965218e231371625c05597c9d79b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 8 Jan 2025 17:17:07 +0000 Subject: [PATCH 3388/3485] Updating readme file for win22 version 20250105.1.1 (#11310) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/windows/Windows2022-Readme.md | 55 ++++++++++++++-------------- 1 file changed, 28 insertions(+), 27 deletions(-) diff --git a/images/windows/Windows2022-Readme.md b/images/windows/Windows2022-Readme.md index e4d281fe3d8d..fb43fb4ddd1a 100644 --- a/images/windows/Windows2022-Readme.md +++ b/images/windows/Windows2022-Readme.md @@ -1,13 +1,15 @@ | Announcements | |-| -| [[Windows] Breaking change : Docker Engine Version 26.* will be updated to Docker Engine Version 27.* from January 10,2025](https://github.com/actions/runner-images/issues/11104) | -| [[Windows & Ubuntu] Breaking change : Maven 3.8.* version will be updated to Maven 3.9.* from January 10,2025](https://github.com/actions/runner-images/issues/11093) | -| [[Windows & Ubuntu] .NET 7.x will be removed from the images on January 10,2025](https://github.com/actions/runner-images/issues/10894) | +| [[Windows ] Breaking change : PHP 8.3.* version will be updated to PHP 8.4.* from January 31,2025](https://github.com/actions/runner-images/issues/11256) | +| [Windows Server 2025 is now available](https://github.com/actions/runner-images/issues/11228) | +| [[Windows] Breaking change : Docker Engine Version 26.* will be updated to Docker Engine Version 27.* from January 17,2025](https://github.com/actions/runner-images/issues/11104) | +| [[Windows & Ubuntu] Breaking change : Maven 3.8.* version will be updated to Maven 3.9.* from January 17,2025](https://github.com/actions/runner-images/issues/11093) | +| [[Windows & Ubuntu] .NET 7.x will be removed from the images on January 17,2025](https://github.com/actions/runner-images/issues/10894) | | [[Windows & Ubuntu] Python 3.7.x will be removed from January 10 ,2025](https://github.com/actions/runner-images/issues/10893) | *** # Windows Server 2022 - OS Version: 10.0.20348 Build 2966 -- Image Version: 20241215.1.0 +- Image Version: 20250105.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -22,21 +24,21 @@ - LLVM 18.1.8 - Node 18.20.5 - Perl 5.32.1 -- PHP 8.3.14 +- PHP 8.3.15 - Python 3.9.13 - Ruby 3.0.7p220 ### Package Management - Chocolatey 2.4.1 - Composer 2.8.4 -- Helm 3.16.2 -- Miniconda 24.9.2 (pre-installed on the image but not added to PATH) +- Helm 3.16.3 +- Miniconda 24.11.1 (pre-installed on the image but not added to PATH) - NPM 10.8.2 - NuGet 6.12.1.1 - pip 24.3.1 (python 3.9) - Pipx 1.7.1 - RubyGems 3.2.33 -- Vcpkg (build from commit b545373a9) +- Vcpkg (build from commit 65be70199) - Yarn 1.22.22 #### Environment variables @@ -47,9 +49,9 @@ ### Project Management - Ant 1.10.14 -- Gradle 8.11 +- Gradle 8.12 - Maven 3.8.7 -- sbt 1.10.6 +- sbt 1.10.7 ### Tools - 7zip 24.09 @@ -58,19 +60,19 @@ - Bazel 8.0.0 - Bazelisk 1.25.0 - Bicep 0.32.4 -- Cabal 3.12.1.0 -- CMake 3.31.2 +- Cabal 3.14.1.1 +- CMake 3.31.3 - CodeQL Action Bundle 2.20.0 - Docker 26.1.3 - Docker Compose v2 2.27.1 - Docker-wincred 0.8.2 -- ghc 9.10.1 +- ghc 9.12.1 - Git 2.47.1.windows.1 - Git LFS 3.6.0 -- ImageMagick 7.1.1-41 +- ImageMagick 7.1.1-43 - InnoSetup 6.3.3 - jq 1.7.1 -- Kind 0.25.0 +- Kind 0.26.0 - Kubectl 1.32.0 - Mercurial 5.0 - gcc 12.2.0 @@ -80,10 +82,10 @@ - NSIS 3.10 - OpenSSL 1.1.1w - Packer 1.11.2 -- Pulumi 3.143.0 +- Pulumi 3.144.1 - R 4.4.2 - Service Fabric SDK 9.1.1436.9590 -- Stack 3.1.1 +- Stack 3.3.1 - Subversion (SVN) 1.14.5 - Swig 4.1.1 - VSWhere 3.1.7 @@ -93,13 +95,13 @@ - zstd 1.5.6 ### CLI Tools -- Alibaba Cloud CLI 3.0.237 -- AWS CLI 2.22.17 +- Alibaba Cloud CLI 3.0.244 +- AWS CLI 2.22.28 - AWS SAM CLI 1.132.0 - AWS Session Manager CLI 1.2.694.0 - Azure CLI 2.67.0 - Azure DevOps CLI extension 1.0.1 -- GitHub CLI 2.63.2 +- GitHub CLI 2.64.0 ### Rust Tools - Cargo 1.83.0 @@ -116,10 +118,10 @@ - Rustfmt 1.8.0 ### Browsers and Drivers -- Google Chrome 131.0.6778.140 -- Chrome Driver 131.0.6778.108 -- Microsoft Edge 131.0.2903.99 -- Microsoft Edge Driver 131.0.2903.99 +- Google Chrome 131.0.6778.205 +- Chrome Driver 131.0.6778.204 +- Microsoft Edge 131.0.2903.112 +- Microsoft Edge Driver 131.0.2903.112 - Mozilla Firefox 133.0.3 - Gecko Driver 0.35.0 - IE Driver 4.14.0.0 @@ -173,7 +175,6 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 22.12.0 #### Python -- 3.7.9 - 3.8.10 - 3.9.13 - 3.10.11 @@ -511,7 +512,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - AzureRM: 2.1.0 (Default), 6.13.1 - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.718 +- AWSPowershell: 4.1.729 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.10 - Microsoft.Graph: 2.25.0 @@ -533,7 +534,7 @@ All other versions are saved but not installed. | Android Command Line Tools | 8.0 | | Android Emulator | 35.2.10 | | Android SDK Build-tools | 35.0.0<br>34.0.0<br>33.0.0 33.0.1 33.0.2 33.0.3<br>32.0.0<br>31.0.0 | -| Android SDK Platforms | android-35-ext14 (rev 1)<br>android-35 (rev 1)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1) | +| Android SDK Platforms | android-35-ext14 (rev 1)<br>android-35 (rev 2)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1) | | Android SDK Platform-Tools | 35.0.2 | | Android Support Repository | 47.0.0 | | CMake | 3.18.1<br>3.22.1 | From 2d35c44cec2892ee7294a82946159aecc1482c07 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 8 Jan 2025 18:08:04 +0000 Subject: [PATCH 3389/3485] Updating readme file for win19 version 20250105.1.1 (#11312) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/windows/Windows2019-Readme.md | 67 ++++++++++++++-------------- 1 file changed, 34 insertions(+), 33 deletions(-) diff --git a/images/windows/Windows2019-Readme.md b/images/windows/Windows2019-Readme.md index af15efcc79a0..44fecb99ec26 100644 --- a/images/windows/Windows2019-Readme.md +++ b/images/windows/Windows2019-Readme.md @@ -1,13 +1,15 @@ | Announcements | |-| -| [[Windows] Breaking change : Docker Engine Version 26.* will be updated to Docker Engine Version 27.* from January 10,2025](https://github.com/actions/runner-images/issues/11104) | -| [[Windows & Ubuntu] Breaking change : Maven 3.8.* version will be updated to Maven 3.9.* from January 10,2025](https://github.com/actions/runner-images/issues/11093) | -| [[Windows & Ubuntu] .NET 7.x will be removed from the images on January 10,2025](https://github.com/actions/runner-images/issues/10894) | +| [[Windows ] Breaking change : PHP 8.3.* version will be updated to PHP 8.4.* from January 31,2025](https://github.com/actions/runner-images/issues/11256) | +| [Windows Server 2025 is now available](https://github.com/actions/runner-images/issues/11228) | +| [[Windows] Breaking change : Docker Engine Version 26.* will be updated to Docker Engine Version 27.* from January 17,2025](https://github.com/actions/runner-images/issues/11104) | +| [[Windows & Ubuntu] Breaking change : Maven 3.8.* version will be updated to Maven 3.9.* from January 17,2025](https://github.com/actions/runner-images/issues/11093) | +| [[Windows & Ubuntu] .NET 7.x will be removed from the images on January 17,2025](https://github.com/actions/runner-images/issues/10894) | | [[Windows & Ubuntu] Python 3.7.x will be removed from January 10 ,2025](https://github.com/actions/runner-images/issues/10893) | *** # Windows Server 2019 - OS Version: 10.0.17763 Build 6659 -- Image Version: 20241215.1.0 +- Image Version: 20250105.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -22,21 +24,21 @@ - LLVM 18.1.8 - Node 18.20.5 - Perl 5.32.1 -- PHP 8.3.14 -- Python 3.7.9 +- PHP 8.3.15 +- Python 3.9.13 - Ruby 3.0.7p220 ### Package Management - Chocolatey 2.4.1 - Composer 2.8.4 -- Helm 3.16.2 -- Miniconda 24.9.2 (pre-installed on the image but not added to PATH) +- Helm 3.16.3 +- Miniconda 24.11.1 (pre-installed on the image but not added to PATH) - NPM 10.8.2 - NuGet 6.12.1.1 -- pip 24.0 (python 3.7) -- Pipx 1.2.1 +- pip 24.3.1 (python 3.9) +- Pipx 1.7.1 - RubyGems 3.2.33 -- Vcpkg (build from commit b545373a9) +- Vcpkg (build from commit 65be70199) - Yarn 1.22.22 #### Environment variables @@ -47,9 +49,9 @@ ### Project Management - Ant 1.10.14 -- Gradle 8.11 +- Gradle 8.12 - Maven 3.8.7 -- sbt 1.10.6 +- sbt 1.10.7 ### Tools - 7zip 24.09 @@ -58,20 +60,20 @@ - Bazel 8.0.0 - Bazelisk 1.25.0 - Bicep 0.32.4 -- Cabal 3.12.1.0 -- CMake 3.31.2 +- Cabal 3.14.1.1 +- CMake 3.31.3 - CodeQL Action Bundle 2.20.0 - Docker 26.1.3 - Docker Compose v2 2.27.1 - Docker-wincred 0.8.2 -- ghc 9.10.1 +- ghc 9.12.1 - Git 2.47.1.windows.1 - Git LFS 3.6.0 -- Google Cloud CLI 503.0.0 -- ImageMagick 7.1.1-41 +- Google Cloud CLI 504.0.1 +- ImageMagick 7.1.1-43 - InnoSetup 6.3.3 - jq 1.7.1 -- Kind 0.25.0 +- Kind 0.26.0 - Kubectl 1.32.0 - Mercurial 5.0 - gcc 8.1.0 @@ -81,28 +83,28 @@ - NSIS 3.10 - OpenSSL 1.1.1w - Packer 1.11.2 -- Parcel 2.13.2 -- Pulumi 3.143.0 +- Parcel 2.13.3 +- Pulumi 3.144.1 - R 4.4.2 - Service Fabric SDK 9.1.1436.9590 -- Stack 3.1.1 +- Stack 3.3.1 - Subversion (SVN) 1.14.5 - Swig 4.1.1 - VSWhere 3.1.7 - WinAppDriver 1.2.2009.02003 - WiX Toolset 3.14.1.8722 -- yamllint 1.32.0 +- yamllint 1.35.1 - zstd 1.5.6 ### CLI Tools -- Alibaba Cloud CLI 3.0.237 -- AWS CLI 2.22.17 +- Alibaba Cloud CLI 3.0.244 +- AWS CLI 2.22.28 - AWS SAM CLI 1.132.0 - AWS Session Manager CLI 1.2.694.0 - Azure CLI 2.67.0 - Azure DevOps CLI extension 1.0.1 - Cloud Foundry CLI 8.9.0 -- GitHub CLI 2.63.2 +- GitHub CLI 2.64.0 ### Rust Tools - Cargo 1.83.0 @@ -119,10 +121,10 @@ - Rustfmt 1.8.0 ### Browsers and Drivers -- Google Chrome 131.0.6778.140 -- Chrome Driver 131.0.6778.108 -- Microsoft Edge 131.0.2903.99 -- Microsoft Edge Driver 131.0.2903.99 +- Google Chrome 131.0.6778.205 +- Chrome Driver 131.0.6778.204 +- Microsoft Edge 131.0.2903.112 +- Microsoft Edge Driver 131.0.2903.112 - Mozilla Firefox 133.0.3 - Gecko Driver 0.35.0 - IE Driver 4.14.0.0 @@ -179,7 +181,6 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 22.12.0 #### Python -- 3.7.9 - 3.8.10 - 3.9.13 - 3.10.11 @@ -512,7 +513,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - AzureRM: 2.1.0 (Default), 6.13.1 - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.718 +- AWSPowershell: 4.1.729 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.10 - Microsoft.Graph: 2.25.0 @@ -534,7 +535,7 @@ All other versions are saved but not installed. | Android Command Line Tools | 8.0 | | Android Emulator | 35.2.10 | | Android SDK Build-tools | 35.0.0<br>34.0.0<br>33.0.0 33.0.1 33.0.2 33.0.3<br>32.0.0<br>31.0.0<br>30.0.2 | -| Android SDK Platforms | android-35-ext14 (rev 1)<br>android-35 (rev 1)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3) | +| Android SDK Platforms | android-35-ext14 (rev 1)<br>android-35 (rev 2)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3) | | Android SDK Platform-Tools | 35.0.2 | | Android Support Repository | 47.0.0 | | CMake | 3.10.2<br>3.18.1<br>3.22.1 | From 05c04b5275fc49ec1d75d70e93c5132fbf4b9c8e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 8 Jan 2025 23:14:25 +0000 Subject: [PATCH 3390/3485] Updating readme file for macos-14-arm64 version 20250106.725 (#11306) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-14-arm64-Readme.md | 109 +++++++++++++------------- 1 file changed, 53 insertions(+), 56 deletions(-) diff --git a/images/macos/macos-14-arm64-Readme.md b/images/macos/macos-14-arm64-Readme.md index 313833631e66..924c4ab31339 100644 --- a/images/macos/macos-14-arm64-Readme.md +++ b/images/macos/macos-14-arm64-Readme.md @@ -7,7 +7,7 @@ # macOS 14 - OS Version: macOS 14.7.2 (23H311) - Kernel Version: Darwin 23.6.0 -- Image Version: 20241216.651 +- Image Version: 20250106.725 ## Installed Software @@ -33,7 +33,7 @@ - Bundler 2.5.23 - Carthage 0.40.0 - CocoaPods 1.16.2 -- Homebrew 4.4.11 +- Homebrew 4.4.14 - NPM 10.8.2 - NuGet 6.3.1.1 - Pip3 24.3.1 (python 3.13) @@ -44,7 +44,7 @@ ### Project Management - Apache Ant 1.10.15 - Apache Maven 3.9.9 -- Gradle 8.11.1 +- Gradle 8.12 ### Utilities - 7-Zip 17.05 @@ -56,10 +56,10 @@ - Curl 8.7.1 - Git 2.47.1 - Git LFS 3.6.0 -- GitHub CLI 2.63.2 +- GitHub CLI 2.64.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.25.0 -- gpg (GnuPG) 2.4.6 +- gpg (GnuPG) 2.4.7 - jq 1.7.1 - OpenSSL 1.1.1w 11 Sep 2023 - Packer 1.11.2 @@ -69,17 +69,17 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.22.17 +- AWS CLI 2.22.28 - AWS SAM CLI 1.132.0 - AWS Session Manager CLI 1.2.694.0 - Azure CLI 2.67.0 - Azure CLI (azure-devops) 1.0.1 - Bicep CLI 0.32.4 -- Cmake 3.31.2 +- Cmake 3.31.3 - CodeQL Action Bundle 2.20.0 - Fastlane 2.226.0 -- SwiftFormat 0.55.3 -- Xcbeautify 2.16.0 +- SwiftFormat 0.55.4 +- Xcbeautify 2.17.0 - Xcode Command Line Tools 16.2.0.0.1.1733547573 - Xcodes 1.6.0 @@ -88,9 +88,9 @@ ### Browsers - Safari 18.2 (19620.1.16.111.6) - SafariDriver 18.2 (19620.1.16.111.6) -- Google Chrome 131.0.6778.140 -- Google Chrome for Testing 131.0.6778.108 -- ChromeDriver 131.0.6778.108 +- Google Chrome 131.0.6778.205 +- Google Chrome for Testing 131.0.6778.204 +- ChromeDriver 131.0.6778.204 - Selenium server 4.27.0 #### Environment variables @@ -149,15 +149,15 @@ - PSScriptAnalyzer: 1.23.0 ### Xcode -| Version | Build | Path | Symlinks | -| -------------- | ------- | ------------------------------ | -------------------------------------------------------------- | -| 16.1 | 16B40 | /Applications/Xcode_16.1.app | /Applications/Xcode_16.1.0.app | -| 16.0 | 16A242d | /Applications/Xcode_16.app | /Applications/Xcode_16.0.0.app<br>/Applications/Xcode_16.0.app | -| 15.4 (default) | 15F31d | /Applications/Xcode_15.4.app | /Applications/Xcode_15.4.0.app<br>/Applications/Xcode.app | -| 15.3 | 15E204a | /Applications/Xcode_15.3.app | /Applications/Xcode_15.3.0.app | -| 15.2 | 15C500b | /Applications/Xcode_15.2.app | /Applications/Xcode_15.2.0.app | -| 15.1 | 15C65 | /Applications/Xcode_15.1.app | /Applications/Xcode_15.1.0.app | -| 15.0.1 | 15A507 | /Applications/Xcode_15.0.1.app | /Applications/Xcode_15.0.app | +| Version | Build | Path | Symlinks | +| -------------- | -------- | ------------------------------ | --------------------------------------------------------- | +| 16.2 | 16C5032a | /Applications/Xcode_16.2.app | /Applications/Xcode_16.2.0.app | +| 16.1 | 16B40 | /Applications/Xcode_16.1.app | /Applications/Xcode_16.1.0.app | +| 15.4 (default) | 15F31d | /Applications/Xcode_15.4.app | /Applications/Xcode_15.4.0.app<br>/Applications/Xcode.app | +| 15.3 | 15E204a | /Applications/Xcode_15.3.app | /Applications/Xcode_15.3.0.app | +| 15.2 | 15C500b | /Applications/Xcode_15.2.app | /Applications/Xcode_15.2.0.app | +| 15.1 | 15C65 | /Applications/Xcode_15.1.app | /Applications/Xcode_15.1.0.app | +| 15.0.1 | 15A507 | /Applications/Xcode_15.0.1.app | /Applications/Xcode_15.0.app | #### Installed SDKs | SDK | SDK Name | Xcode Version | @@ -166,85 +166,82 @@ | macOS 14.2 | macosx14.2 | 15.1, 15.2 | | macOS 14.4 | macosx14.4 | 15.3 | | macOS 14.5 | macosx14.5 | 15.4 | -| macOS 15.0 | macosx15.0 | 16.0 | | macOS 15.1 | macosx15.1 | 16.1 | +| macOS 15.2 | macosx15.2 | 16.2 | | iOS 17.0 | iphoneos17.0 | 15.0.1 | | iOS 17.2 | iphoneos17.2 | 15.1, 15.2 | | iOS 17.4 | iphoneos17.4 | 15.3 | | iOS 17.5 | iphoneos17.5 | 15.4 | -| iOS 18.0 | iphoneos18.0 | 16.0 | | iOS 18.1 | iphoneos18.1 | 16.1 | +| iOS 18.2 | iphoneos18.2 | 16.2 | | Simulator - iOS 17.0 | iphonesimulator17.0 | 15.0.1 | | Simulator - iOS 17.2 | iphonesimulator17.2 | 15.1, 15.2 | | Simulator - iOS 17.4 | iphonesimulator17.4 | 15.3 | | Simulator - iOS 17.5 | iphonesimulator17.5 | 15.4 | -| Simulator - iOS 18.0 | iphonesimulator18.0 | 16.0 | | Simulator - iOS 18.1 | iphonesimulator18.1 | 16.1 | +| Simulator - iOS 18.2 | iphonesimulator18.2 | 16.2 | | tvOS 17.0 | appletvos17.0 | 15.0.1 | | tvOS 17.2 | appletvos17.2 | 15.1, 15.2 | | tvOS 17.4 | appletvos17.4 | 15.3 | | tvOS 17.5 | appletvos17.5 | 15.4 | -| tvOS 18.0 | appletvos18.0 | 16.0 | | tvOS 18.1 | appletvos18.1 | 16.1 | +| tvOS 18.2 | appletvos18.2 | 16.2 | | Simulator - tvOS 17.0 | appletvsimulator17.0 | 15.0.1 | | Simulator - tvOS 17.2 | appletvsimulator17.2 | 15.1, 15.2 | | Simulator - tvOS 17.4 | appletvsimulator17.4 | 15.3 | | Simulator - tvOS 17.5 | appletvsimulator17.5 | 15.4 | -| Simulator - tvOS 18.0 | appletvsimulator18.0 | 16.0 | | Simulator - tvOS 18.1 | appletvsimulator18.1 | 16.1 | +| Simulator - tvOS 18.2 | appletvsimulator18.2 | 16.2 | | watchOS 10.0 | watchos10.0 | 15.0.1 | | watchOS 10.2 | watchos10.2 | 15.1, 15.2 | | watchOS 10.4 | watchos10.4 | 15.3 | | watchOS 10.5 | watchos10.5 | 15.4 | -| watchOS 11.0 | watchos11.0 | 16.0 | | watchOS 11.1 | watchos11.1 | 16.1 | +| watchOS 11.2 | watchos11.2 | 16.2 | | Simulator - watchOS 10.0 | watchsimulator10.0 | 15.0.1 | | Simulator - watchOS 10.2 | watchsimulator10.2 | 15.1, 15.2 | | Simulator - watchOS 10.4 | watchsimulator10.4 | 15.3 | | Simulator - watchOS 10.5 | watchsimulator10.5 | 15.4 | -| Simulator - watchOS 11.0 | watchsimulator11.0 | 16.0 | | Simulator - watchOS 11.1 | watchsimulator11.1 | 16.1 | +| Simulator - watchOS 11.2 | watchsimulator11.2 | 16.2 | | Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | | visionOS 1.0 | xros1.0 | 15.2 | -| visionOS 1.1 | xros1.1 | 15.3 | | Simulator - visionOS 1.1 | xrsimulator1.1 | 15.3 | +| visionOS 1.1 | xros1.1 | 15.3 | | Simulator - visionOS 1.2 | xrsimulator1.2 | 15.4 | | visionOS 1.2 | xros1.2 | 15.4 | -| visionOS 2.0 | xros2.0 | 16.0 | -| Simulator - visionOS 2.0 | xrsimulator2.0 | 16.0 | | visionOS 2.1 | xros2.1 | 16.1 | | Simulator - visionOS 2.1 | xrsimulator2.1 | 16.1 | +| Simulator - visionOS 2.2 | xrsimulator2.2 | 16.2 | +| visionOS 2.2 | xros2.2 | 16.2 | | DriverKit 23.0 | driverkit23.0 | 15.0.1 | | DriverKit 23.2 | driverkit23.2 | 15.1, 15.2 | | DriverKit 23.4 | driverkit23.4 | 15.3 | | DriverKit 23.5 | driverkit23.5 | 15.4 | -| DriverKit 24.0 | driverkit24.0 | 16.0 | | DriverKit 24.1 | driverkit24.1 | 16.1 | +| DriverKit 24.2 | driverkit24.2 | 16.2 | #### Installed Simulators -| OS | Simulators | -| ------------ | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| iOS 17.0 | iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 17.2 | iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 17.4 | iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | -| iOS 17.5 | iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | -| iOS 18.0 | iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone 16<br>iPhone 16 Plus<br>iPhone 16 Pro<br>iPhone 16 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | -| iOS 18.1 | iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone 16<br>iPhone 16 Plus<br>iPhone 16 Pro<br>iPhone 16 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad mini (A17 Pro)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | -| tvOS 17.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 17.2 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 17.4 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 17.5 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 18.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 18.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| watchOS 10.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra 2 (49mm) | -| watchOS 10.2 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra 2 (49mm) | -| watchOS 10.4 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra 2 (49mm) | -| watchOS 10.5 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra 2 (49mm) | -| watchOS 11.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 10 (42mm)<br>Apple Watch Series 10 (46mm)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra 2 (49mm) | -| watchOS 11.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 10 (42mm)<br>Apple Watch Series 10 (46mm)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra 2 (49mm) | -| visionOS 1.0 | Apple Vision Pro | -| visionOS 1.1 | Apple Vision Pro | -| visionOS 1.2 | Apple Vision Pro | +| OS | Simulators | +| ------------ | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| iOS 17.0 | iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 17.2 | iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 17.4 | iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | +| iOS 17.5 | iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | +| iOS 18.1 | iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone 16<br>iPhone 16 Plus<br>iPhone 16 Pro<br>iPhone 16 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad mini (A17 Pro)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | +| tvOS 17.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 17.2 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 17.4 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 17.5 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 18.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| watchOS 10.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 10.2 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 10.4 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 10.5 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 11.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 10 (42mm)<br>Apple Watch Series 10 (46mm)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra 2 (49mm) | +| visionOS 1.0 | Apple Vision Pro | +| visionOS 1.1 | Apple Vision Pro | +| visionOS 1.2 | Apple Vision Pro | ### Android | Package Name | Version | @@ -252,7 +249,7 @@ | Android Command Line Tools | 11.0 | | Android Emulator | 35.2.10 | | Android SDK Build-tools | 35.0.0<br>34.0.0<br>33.0.2 33.0.3 | -| Android SDK Platforms | android-35-ext14 (rev 1)<br>android-35 (rev 1)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | +| Android SDK Platforms | android-35-ext14 (rev 1)<br>android-35 (rev 2)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | | Android SDK Platform-Tools | 35.0.2 | | Android Support Repository | 47.0.0 | | CMake | 3.31.0 | From 981fb1eb13af0cd700c8c559abe9d6555063a7c6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 9 Jan 2025 06:05:24 +0000 Subject: [PATCH 3391/3485] Updating readme file for macos-13 version 20250106.546 (#11304) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-13-Readme.md | 42 ++++++++++++++++----------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/images/macos/macos-13-Readme.md b/images/macos/macos-13-Readme.md index ea616d59eba8..8e276f6ced09 100644 --- a/images/macos/macos-13-Readme.md +++ b/images/macos/macos-13-Readme.md @@ -7,7 +7,7 @@ # macOS 13 - OS Version: macOS 13.7.2 (22H313) - Kernel Version: Darwin 22.6.0 -- Image Version: 20241216.479 +- Image Version: 20250106.546 ## Installed Software @@ -26,7 +26,7 @@ - Mono 6.12.0.188 - Node.js 20.18.1 - Perl 5.40.0 -- PHP 8.4.1 +- PHP 8.4.2 - Python3 3.13.1 - Ruby 3.0.7p220 @@ -35,19 +35,19 @@ - Carthage 0.40.0 - CocoaPods 1.16.2 - Composer 2.8.4 -- Homebrew 4.4.11 +- Homebrew 4.4.14 - NPM 10.8.2 - NuGet 6.3.1.1 - Pip3 24.3.1 (python 3.13) - Pipx 1.7.1 - RubyGems 3.5.23 -- Vcpkg 2024 (build from commit b545373a9) +- Vcpkg 2024 (build from commit 65be70199) - Yarn 1.22.22 ### Project Management - Apache Ant 1.10.15 - Apache Maven 3.9.9 -- Gradle 8.11.1 +- Gradle 8.12 ### Utilities - 7-Zip 17.05 @@ -59,10 +59,10 @@ - Curl 8.11.1 - Git 2.47.1 - Git LFS 3.6.0 -- GitHub CLI 2.63.2 +- GitHub CLI 2.64.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.25.0 -- gpg (GnuPG) 2.4.6 +- gpg (GnuPG) 2.4.7 - jq 1.7.1 - OpenSSL 1.1.1w 11 Sep 2023 - Packer 1.11.2 @@ -72,17 +72,17 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.22.17 +- AWS CLI 2.22.28 - AWS SAM CLI 1.132.0 - AWS Session Manager CLI 1.2.694.0 - Azure CLI 2.67.0 - Azure CLI (azure-devops) 1.0.1 - Bicep CLI 0.32.4 -- Cmake 3.31.2 +- Cmake 3.31.3 - CodeQL Action Bundle 2.20.0 - Fastlane 2.226.0 -- SwiftFormat 0.55.3 -- Xcbeautify 2.16.0 +- SwiftFormat 0.55.4 +- Xcbeautify 2.17.0 - Xcode Command Line Tools 14.3.1.0.1.1683849156 - Xcodes 1.6.0 @@ -92,11 +92,11 @@ ### Browsers - Safari 18.2 (18620.1.16.111.6) - SafariDriver 18.2 (18620.1.16.111.6) -- Google Chrome 131.0.6778.140 -- Google Chrome for Testing 131.0.6778.108 -- ChromeDriver 131.0.6778.108 -- Microsoft Edge 131.0.2903.99 -- Microsoft Edge WebDriver 131.0.2903.87 +- Google Chrome 131.0.6778.205 +- Google Chrome for Testing 131.0.6778.204 +- ChromeDriver 131.0.6778.204 +- Microsoft Edge 131.0.2903.112 +- Microsoft Edge WebDriver 131.0.2903.112 - Mozilla Firefox 133.0.3 - geckodriver 0.35.0 - Selenium server 4.27.0 @@ -133,8 +133,8 @@ #### Python - 3.8.18 -- 3.9.20 -- 3.10.15 +- 3.9.21 +- 3.10.16 - 3.11.9 - 3.12.8 - 3.13.1 @@ -214,8 +214,8 @@ | Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | | visionOS 1.0 | xros1.0 | 15.2 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | -| Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | +| Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | | DriverKit 22.1 | driverkit22.1 | 14.1 | | DriverKit 22.2 | driverkit22.2 | 14.2 | | DriverKit 22.4 | driverkit22.4 | 14.3.1 | @@ -245,7 +245,7 @@ | Android Command Line Tools | 11.0 | | Android Emulator | 35.2.10 | | Android SDK Build-tools | 35.0.0<br>34.0.0<br>33.0.2 33.0.3 | -| Android SDK Platforms | android-35-ext14 (rev 1)<br>android-35 (rev 1)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | +| Android SDK Platforms | android-35-ext14 (rev 1)<br>android-35 (rev 2)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | | Android SDK Platform-Tools | 35.0.2 | | Android Support Repository | 47.0.0 | | CMake | 3.31.0 | @@ -269,7 +269,7 @@ #### Environment variables | Name | Value | | ----------------- | ----------------------------------------------------------------------------------------- | -| PARALLELS_DMG_URL | https://download.parallels.com/desktop/v20/20.1.2-55742/ParallelsDesktop-20.1.2-55742.dmg | +| PARALLELS_DMG_URL | https://download.parallels.com/desktop/v20/20.1.3-55743/ParallelsDesktop-20.1.3-55743.dmg | ##### Notes ``` From c2491bb469629d4a5b1c62d310842cae18471a08 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 9 Jan 2025 10:38:06 +0000 Subject: [PATCH 3392/3485] Updating readme file for macos-14 version 20250106.587 (#11315) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-14-Readme.md | 121 ++++++++++++++++---------------- 1 file changed, 59 insertions(+), 62 deletions(-) diff --git a/images/macos/macos-14-Readme.md b/images/macos/macos-14-Readme.md index 6e7aa9055dc0..ec87770dc548 100644 --- a/images/macos/macos-14-Readme.md +++ b/images/macos/macos-14-Readme.md @@ -7,7 +7,7 @@ # macOS 14 - OS Version: macOS 14.7.2 (23H311) - Kernel Version: Darwin 23.6.0 -- Image Version: 20241216.504 +- Image Version: 20250106.587 ## Installed Software @@ -26,7 +26,7 @@ - Mono 6.12.0.188 - Node.js 20.18.1 - Perl 5.40.0 -- PHP 8.4.1 +- PHP 8.4.2 - Python3 3.13.1 - Ruby 3.0.7p220 @@ -35,7 +35,7 @@ - Carthage 0.40.0 - CocoaPods 1.16.2 - Composer 2.8.4 -- Homebrew 4.4.11 +- Homebrew 4.4.15 - NPM 10.8.2 - NuGet 6.3.1.1 - Pip3 24.3.1 (python 3.13) @@ -46,7 +46,7 @@ ### Project Management - Apache Ant 1.10.15 - Apache Maven 3.9.9 -- Gradle 8.11.1 +- Gradle 8.12 ### Utilities - 7-Zip 17.05 @@ -58,10 +58,10 @@ - Curl 8.11.1 - Git 2.47.1 - Git LFS 3.6.0 -- GitHub CLI 2.63.2 +- GitHub CLI 2.64.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.25.0 -- gpg (GnuPG) 2.4.6 +- gpg (GnuPG) 2.4.7 - jq 1.7.1 - OpenSSL 1.1.1w 11 Sep 2023 - Packer 1.11.2 @@ -71,17 +71,17 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.22.17 +- AWS CLI 2.22.28 - AWS SAM CLI 1.132.0 - AWS Session Manager CLI 1.2.694.0 - Azure CLI 2.67.0 - Azure CLI (azure-devops) 1.0.1 - Bicep CLI 0.32.4 -- Cmake 3.31.2 +- Cmake 3.31.3 - CodeQL Action Bundle 2.20.0 - Fastlane 2.226.0 -- SwiftFormat 0.55.3 -- Xcbeautify 2.16.0 +- SwiftFormat 0.55.4 +- Xcbeautify 2.17.0 - Xcode Command Line Tools 16.2.0.0.1.1733547573 - Xcodes 1.6.0 @@ -91,11 +91,11 @@ ### Browsers - Safari 18.2 (19620.1.16.111.6) - SafariDriver 18.2 (19620.1.16.111.6) -- Google Chrome 131.0.6778.140 -- Google Chrome for Testing 131.0.6778.108 -- ChromeDriver 131.0.6778.108 -- Microsoft Edge 131.0.2903.99 -- Microsoft Edge WebDriver 131.0.2903.87 +- Google Chrome 131.0.6778.205 +- Google Chrome for Testing 131.0.6778.204 +- ChromeDriver 131.0.6778.204 +- Microsoft Edge 131.0.2903.112 +- Microsoft Edge WebDriver 131.0.2903.112 - Mozilla Firefox 133.0.3 - geckodriver 0.35.0 - Selenium server 4.27.0 @@ -124,8 +124,8 @@ - 3.3.6 #### Python -- 3.9.20 -- 3.10.15 +- 3.9.21 +- 3.10.16 - 3.11.9 - 3.12.8 - 3.13.1 @@ -159,15 +159,15 @@ - PSScriptAnalyzer: 1.23.0 ### Xcode -| Version | Build | Path | Symlinks | -| -------------- | ------- | ------------------------------ | -------------------------------------------------------------- | -| 16.1 | 16B40 | /Applications/Xcode_16.1.app | /Applications/Xcode_16.1.0.app | -| 16.0 | 16A242d | /Applications/Xcode_16.app | /Applications/Xcode_16.0.0.app<br>/Applications/Xcode_16.0.app | -| 15.4 (default) | 15F31d | /Applications/Xcode_15.4.app | /Applications/Xcode_15.4.0.app<br>/Applications/Xcode.app | -| 15.3 | 15E204a | /Applications/Xcode_15.3.app | /Applications/Xcode_15.3.0.app | -| 15.2 | 15C500b | /Applications/Xcode_15.2.app | /Applications/Xcode_15.2.0.app | -| 15.1 | 15C65 | /Applications/Xcode_15.1.app | /Applications/Xcode_15.1.0.app | -| 15.0.1 | 15A507 | /Applications/Xcode_15.0.1.app | /Applications/Xcode_15.0.app | +| Version | Build | Path | Symlinks | +| -------------- | -------- | ------------------------------ | --------------------------------------------------------- | +| 16.2 | 16C5032a | /Applications/Xcode_16.2.app | /Applications/Xcode_16.2.0.app | +| 16.1 | 16B40 | /Applications/Xcode_16.1.app | /Applications/Xcode_16.1.0.app | +| 15.4 (default) | 15F31d | /Applications/Xcode_15.4.app | /Applications/Xcode_15.4.0.app<br>/Applications/Xcode.app | +| 15.3 | 15E204a | /Applications/Xcode_15.3.app | /Applications/Xcode_15.3.0.app | +| 15.2 | 15C500b | /Applications/Xcode_15.2.app | /Applications/Xcode_15.2.0.app | +| 15.1 | 15C65 | /Applications/Xcode_15.1.app | /Applications/Xcode_15.1.0.app | +| 15.0.1 | 15A507 | /Applications/Xcode_15.0.1.app | /Applications/Xcode_15.0.app | #### Installed SDKs | SDK | SDK Name | Xcode Version | @@ -176,82 +176,79 @@ | macOS 14.2 | macosx14.2 | 15.1, 15.2 | | macOS 14.4 | macosx14.4 | 15.3 | | macOS 14.5 | macosx14.5 | 15.4 | -| macOS 15.0 | macosx15.0 | 16.0 | | macOS 15.1 | macosx15.1 | 16.1 | +| macOS 15.2 | macosx15.2 | 16.2 | | iOS 17.0 | iphoneos17.0 | 15.0.1 | | iOS 17.2 | iphoneos17.2 | 15.1, 15.2 | | iOS 17.4 | iphoneos17.4 | 15.3 | | iOS 17.5 | iphoneos17.5 | 15.4 | -| iOS 18.0 | iphoneos18.0 | 16.0 | | iOS 18.1 | iphoneos18.1 | 16.1 | +| iOS 18.2 | iphoneos18.2 | 16.2 | | Simulator - iOS 17.0 | iphonesimulator17.0 | 15.0.1 | | Simulator - iOS 17.2 | iphonesimulator17.2 | 15.1, 15.2 | | Simulator - iOS 17.4 | iphonesimulator17.4 | 15.3 | | Simulator - iOS 17.5 | iphonesimulator17.5 | 15.4 | -| Simulator - iOS 18.0 | iphonesimulator18.0 | 16.0 | | Simulator - iOS 18.1 | iphonesimulator18.1 | 16.1 | +| Simulator - iOS 18.2 | iphonesimulator18.2 | 16.2 | | tvOS 17.0 | appletvos17.0 | 15.0.1 | | tvOS 17.2 | appletvos17.2 | 15.1, 15.2 | | tvOS 17.4 | appletvos17.4 | 15.3 | | tvOS 17.5 | appletvos17.5 | 15.4 | -| tvOS 18.0 | appletvos18.0 | 16.0 | | tvOS 18.1 | appletvos18.1 | 16.1 | +| tvOS 18.2 | appletvos18.2 | 16.2 | | Simulator - tvOS 17.0 | appletvsimulator17.0 | 15.0.1 | | Simulator - tvOS 17.2 | appletvsimulator17.2 | 15.1, 15.2 | | Simulator - tvOS 17.4 | appletvsimulator17.4 | 15.3 | | Simulator - tvOS 17.5 | appletvsimulator17.5 | 15.4 | -| Simulator - tvOS 18.0 | appletvsimulator18.0 | 16.0 | | Simulator - tvOS 18.1 | appletvsimulator18.1 | 16.1 | +| Simulator - tvOS 18.2 | appletvsimulator18.2 | 16.2 | | watchOS 10.0 | watchos10.0 | 15.0.1 | | watchOS 10.2 | watchos10.2 | 15.1, 15.2 | | watchOS 10.4 | watchos10.4 | 15.3 | | watchOS 10.5 | watchos10.5 | 15.4 | -| watchOS 11.0 | watchos11.0 | 16.0 | | watchOS 11.1 | watchos11.1 | 16.1 | +| watchOS 11.2 | watchos11.2 | 16.2 | | Simulator - watchOS 10.0 | watchsimulator10.0 | 15.0.1 | | Simulator - watchOS 10.2 | watchsimulator10.2 | 15.1, 15.2 | | Simulator - watchOS 10.4 | watchsimulator10.4 | 15.3 | | Simulator - watchOS 10.5 | watchsimulator10.5 | 15.4 | -| Simulator - watchOS 11.0 | watchsimulator11.0 | 16.0 | | Simulator - watchOS 11.1 | watchsimulator11.1 | 16.1 | -| visionOS 1.0 | xros1.0 | 15.2 | +| Simulator - watchOS 11.2 | watchsimulator11.2 | 16.2 | | Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | -| Simulator - visionOS 1.1 | xrsimulator1.1 | 15.3 | +| visionOS 1.0 | xros1.0 | 15.2 | | visionOS 1.1 | xros1.1 | 15.3 | -| Simulator - visionOS 1.2 | xrsimulator1.2 | 15.4 | +| Simulator - visionOS 1.1 | xrsimulator1.1 | 15.3 | | visionOS 1.2 | xros1.2 | 15.4 | -| Simulator - visionOS 2.0 | xrsimulator2.0 | 16.0 | -| visionOS 2.0 | xros2.0 | 16.0 | -| visionOS 2.1 | xros2.1 | 16.1 | +| Simulator - visionOS 1.2 | xrsimulator1.2 | 15.4 | | Simulator - visionOS 2.1 | xrsimulator2.1 | 16.1 | +| visionOS 2.1 | xros2.1 | 16.1 | +| visionOS 2.2 | xros2.2 | 16.2 | +| Simulator - visionOS 2.2 | xrsimulator2.2 | 16.2 | | DriverKit 23.0 | driverkit23.0 | 15.0.1 | | DriverKit 23.2 | driverkit23.2 | 15.1, 15.2 | | DriverKit 23.4 | driverkit23.4 | 15.3 | | DriverKit 23.5 | driverkit23.5 | 15.4 | -| DriverKit 24.0 | driverkit24.0 | 16.0 | | DriverKit 24.1 | driverkit24.1 | 16.1 | +| DriverKit 24.2 | driverkit24.2 | 16.2 | #### Installed Simulators -| OS | Simulators | -| ------------ | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| iOS 17.0 | iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 17.2 | iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 17.4 | iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | -| iOS 17.5 | iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | -| iOS 18.0 | iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone 16<br>iPhone 16 Plus<br>iPhone 16 Pro<br>iPhone 16 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | -| iOS 18.1 | iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone 16<br>iPhone 16 Plus<br>iPhone 16 Pro<br>iPhone 16 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad mini (A17 Pro)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | -| tvOS 17.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 17.2 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 17.4 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 17.5 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 18.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 18.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| watchOS 10.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra 2 (49mm) | -| watchOS 10.2 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra 2 (49mm) | -| watchOS 10.4 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra 2 (49mm) | -| watchOS 10.5 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra 2 (49mm) | -| watchOS 11.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 10 (42mm)<br>Apple Watch Series 10 (46mm)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra 2 (49mm) | -| watchOS 11.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 10 (42mm)<br>Apple Watch Series 10 (46mm)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra 2 (49mm) | +| OS | Simulators | +| ------------ | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| iOS 17.0 | iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 17.2 | iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 17.4 | iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | +| iOS 17.5 | iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | +| iOS 18.1 | iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone 16<br>iPhone 16 Plus<br>iPhone 16 Pro<br>iPhone 16 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad mini (A17 Pro)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | +| tvOS 17.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 17.2 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 17.4 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 17.5 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 18.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| watchOS 10.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 10.2 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 10.4 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 10.5 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 11.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 10 (42mm)<br>Apple Watch Series 10 (46mm)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra 2 (49mm) | ### Android | Package Name | Version | @@ -259,7 +256,7 @@ | Android Command Line Tools | 11.0 | | Android Emulator | 35.2.10 | | Android SDK Build-tools | 35.0.0<br>34.0.0<br>33.0.2 33.0.3 | -| Android SDK Platforms | android-35-ext14 (rev 1)<br>android-35 (rev 1)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | +| Android SDK Platforms | android-35-ext14 (rev 1)<br>android-35 (rev 2)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | | Android SDK Platform-Tools | 35.0.2 | | Android Support Repository | 47.0.0 | | CMake | 3.31.0 | @@ -283,7 +280,7 @@ #### Environment variables | Name | Value | | ----------------- | ----------------------------------------------------------------------------------------- | -| PARALLELS_DMG_URL | https://download.parallels.com/desktop/v20/20.1.2-55742/ParallelsDesktop-20.1.2-55742.dmg | +| PARALLELS_DMG_URL | https://download.parallels.com/desktop/v20/20.1.3-55743/ParallelsDesktop-20.1.3-55743.dmg | ##### Notes ``` From 1d54963a0a5d4eb234db90f70f3067693b639786 Mon Sep 17 00:00:00 2001 From: Lawrence Gripper <lawrencegripper@github.com> Date: Thu, 9 Jan 2025 11:41:29 +0000 Subject: [PATCH 3393/3485] Temp DO NOT MERGE: remove azcopy to test postgres --- images/windows/toolsets/toolset-2019.json | 1 - 1 file changed, 1 deletion(-) diff --git a/images/windows/toolsets/toolset-2019.json b/images/windows/toolsets/toolset-2019.json index 2f45a1678d9c..2e83ff3878af 100644 --- a/images/windows/toolsets/toolset-2019.json +++ b/images/windows/toolsets/toolset-2019.json @@ -423,7 +423,6 @@ "common_packages": [ { "name": "7zip.install" }, { "name": "aria2" }, - { "name": "azcopy10" }, { "name": "Bicep" }, { "name": "gitversion.portable"}, { "name": "innosetup" }, From 237fc1c4e2c4a4278542d05be1d943158328e06e Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Thu, 9 Jan 2025 15:04:56 +0100 Subject: [PATCH 3394/3485] [macOS] Add .NET 9.0 environment to all images (#11325) --- images/macos/scripts/build/install-dotnet.sh | 18 ++++++------------ images/macos/toolsets/toolset-13.json | 10 ++++++---- images/macos/toolsets/toolset-14.json | 10 ++++++---- images/macos/toolsets/toolset-15.json | 8 +++++--- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/images/macos/scripts/build/install-dotnet.sh b/images/macos/scripts/build/install-dotnet.sh index 212c40419719..ebfcec6c978d 100644 --- a/images/macos/scripts/build/install-dotnet.sh +++ b/images/macos/scripts/build/install-dotnet.sh @@ -23,18 +23,12 @@ dotnet_versions=($(get_toolset_value ".dotnet.arch[\"$arch\"].versions | .[]")) for dotnet_version in ${dotnet_versions[@]}; do release_url="https://raw.githubusercontent.com/dotnet/core/main/release-notes/${dotnet_version}/releases.json" releases_json_file=$(download_with_retry "$release_url") - - if [[ $dotnet_version == "6.0" ]]; then - args_list+=( - $(cat $releases_json_file | jq -r 'first(.releases[].sdks[]?.version | select(contains("preview") or contains("rc") | not))') - ) - else - args_list+=( - $(cat $releases_json_file | \ - jq -r '.releases[].sdk."version"' | grep -v -E '\-(preview|rc)\d*' | \ - sort -r | rev | uniq -s 2 | rev) - ) - fi + args_list+=( + $(cat $releases_json_file | \ + jq -r '.releases[].sdk."version"' | \ + grep -v -E '\-(preview|rc)\d*' | \ + sort -r | rev | uniq -s 2 | rev) + ) done for ARGS in ${args_list[@]}; do diff --git a/images/macos/toolsets/toolset-13.json b/images/macos/toolsets/toolset-13.json index 76eeed4db0c6..5d230fc3fe35 100644 --- a/images/macos/toolsets/toolset-13.json +++ b/images/macos/toolsets/toolset-13.json @@ -100,15 +100,17 @@ "dotnet": { "arch":{ "x64": { - "versions": [ - "7.0", - "8.0" + "versions": [ + "7.0", + "8.0", + "9.0" ] }, "arm64": { "versions": [ "7.0", - "8.0" + "8.0", + "9.0" ] } } diff --git a/images/macos/toolsets/toolset-14.json b/images/macos/toolsets/toolset-14.json index 1110748759f4..51ce08a4df18 100644 --- a/images/macos/toolsets/toolset-14.json +++ b/images/macos/toolsets/toolset-14.json @@ -104,15 +104,17 @@ "dotnet": { "arch":{ "x64": { - "versions": [ - "7.0", - "8.0" + "versions": [ + "7.0", + "8.0", + "9.0" ] }, "arm64": { "versions": [ "7.0", - "8.0" + "8.0", + "9.0" ] } } diff --git a/images/macos/toolsets/toolset-15.json b/images/macos/toolsets/toolset-15.json index 6aa9a0c06669..dfb28877d316 100644 --- a/images/macos/toolsets/toolset-15.json +++ b/images/macos/toolsets/toolset-15.json @@ -97,13 +97,15 @@ "dotnet": { "arch":{ "x64": { - "versions": [ - "8.0" + "versions": [ + "8.0", + "9.0" ] }, "arm64": { "versions": [ - "8.0" + "8.0", + "9.0" ] } } From 976232da217887825e7541c2635bf39cbbf22654 Mon Sep 17 00:00:00 2001 From: Seth Landry <waymakerijn@outlook.com> Date: Thu, 9 Jan 2025 10:46:46 -0600 Subject: [PATCH 3395/3485] Update ubuntu-latest to Ubuntu 24.04 (#11332) Fixes #10636 Update the `README.md` to reflect the change in the `ubuntu-latest` label to Ubuntu 24.04. * Change the `ubuntu-latest` label to point to Ubuntu 24.04. * Remove the beta tag from the Ubuntu 24.04 image. * Update the rollout status of the Ubuntu 24.04 image to reflect the latest changes. --- For more details, open the [Copilot Workspace session](https://copilot-workspace.githubnext.com/actions/runner-images/issues/10636?shareId=XXXX-XXXX-XXXX-XXXX). --- README.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index cf65d8adf5fe..8fbf04981ded 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,3 @@ - # GitHub Actions Runner Images **Table of Contents** @@ -21,8 +20,8 @@ To build a VM machine from this repo's source, see the [instructions](docs/creat | Image | YAML Label | Included Software | Rollout Status of Latest Image Release | | --------------------|---------------------|--------------------|--------------------| -| Ubuntu 24.04 | `ubuntu-24.04` | [ubuntu-24.04] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fsubir0071%2F385e39188f4280878bada99250e99db7%2Fraw%2Fubuntu24.json) | -| Ubuntu 22.04 | `ubuntu-latest` or `ubuntu-22.04` | [ubuntu-22.04] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fsubir0071%2F385e39188f4280878bada99250e99db7%2Fraw%2Fubuntu22.json) | +| Ubuntu 24.04 | `ubuntu-latest` or `ubuntu-24.04` | [ubuntu-24.04] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fsubir0071%2F385e39188f4280878bada99250e99db7%2Fraw%2Fubuntu24.json) | +| Ubuntu 22.04 | `ubuntu-22.04` | [ubuntu-22.04] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fsubir0071%2F385e39188f4280878bada99250e99db7%2Fraw%2Fubuntu22.json) | | Ubuntu 20.04 | `ubuntu-20.04` | [ubuntu-20.04] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fsubir0071%2F385e39188f4280878bada99250e99db7%2Fraw%2Fubuntu20.json) | | macOS 15 <sup>beta</sup> | `macos-15-large`| [macOS-15] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fsubir0071%2F385e39188f4280878bada99250e99db7%2Fraw%2Fmacos-15.json) | | macOS 15 Arm64 <sup>beta</sup> | `macos-15` or `macos-15-xlarge` | [macOS-15-arm64] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fsubir0071%2F385e39188f4280878bada99250e99db7%2Fraw%2Fmacos-15-arm64.json) | From 8085da95cb9d8e1e2ce4e65a9dd0b1ccea1763bb Mon Sep 17 00:00:00 2001 From: susmitamane <susmitamane@github.com> Date: Fri, 10 Jan 2025 16:33:35 +0530 Subject: [PATCH 3396/3485] [macOS] Add ruby 3.4 to macos images. (#11346) Co-authored-by: Susmita Mane <susmitamane@Susmitas-MacBook-Pro.local> --- images/macos/toolsets/toolset-13.json | 6 ++++-- images/macos/toolsets/toolset-14.json | 6 ++++-- images/macos/toolsets/toolset-15.json | 6 ++++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/images/macos/toolsets/toolset-13.json b/images/macos/toolsets/toolset-13.json index 5d230fc3fe35..a2401406fbee 100644 --- a/images/macos/toolsets/toolset-13.json +++ b/images/macos/toolsets/toolset-13.json @@ -215,7 +215,8 @@ "3.0.*", "3.1.*", "3.2.*", - "3.3.*" + "3.3.*", + "3.4.*" ] }, "arm64": { @@ -223,7 +224,8 @@ "3.0.*", "3.1.*", "3.2.*", - "3.3.*" + "3.3.*", + "3.4.*" ] } } diff --git a/images/macos/toolsets/toolset-14.json b/images/macos/toolsets/toolset-14.json index 51ce08a4df18..262e33d8d312 100644 --- a/images/macos/toolsets/toolset-14.json +++ b/images/macos/toolsets/toolset-14.json @@ -203,7 +203,8 @@ "3.0.*", "3.1.*", "3.2.*", - "3.3.*" + "3.3.*", + "3.4.*" ] }, "arm64": { @@ -211,7 +212,8 @@ "3.0.*", "3.1.*", "3.2.*", - "3.3.*" + "3.3.*", + "3.4.*" ] } } diff --git a/images/macos/toolsets/toolset-15.json b/images/macos/toolsets/toolset-15.json index dfb28877d316..596aa44aed48 100644 --- a/images/macos/toolsets/toolset-15.json +++ b/images/macos/toolsets/toolset-15.json @@ -193,14 +193,16 @@ "versions": [ "3.1.*", "3.2.*", - "3.3.*" + "3.3.*", + "3.4.*" ] }, "arm64": { "versions": [ "3.1.*", "3.2.*", - "3.3.*" + "3.3.*", + "3.4.*" ] } } From 619f42518497dcd59d1bb7992b75cacc774f8800 Mon Sep 17 00:00:00 2001 From: Lawrence Gripper <lawrencegripper@github.com> Date: Mon, 13 Jan 2025 12:52:03 +0000 Subject: [PATCH 3397/3485] Update toolset-2019.json --- images/windows/toolsets/toolset-2019.json | 1 + 1 file changed, 1 insertion(+) diff --git a/images/windows/toolsets/toolset-2019.json b/images/windows/toolsets/toolset-2019.json index 2e83ff3878af..07e3265eeead 100644 --- a/images/windows/toolsets/toolset-2019.json +++ b/images/windows/toolsets/toolset-2019.json @@ -424,6 +424,7 @@ { "name": "7zip.install" }, { "name": "aria2" }, { "name": "Bicep" }, + { "name": "azcopy10" }, { "name": "gitversion.portable"}, { "name": "innosetup" }, { "name": "jq" }, From b127d3a9736ee725856377eebd4103bbe5e21bce Mon Sep 17 00:00:00 2001 From: vidyasagarnimmagaddi <160703874+vidyasagarnimmagaddi@users.noreply.github.com> Date: Mon, 13 Jan 2025 20:06:06 +0530 Subject: [PATCH 3398/3485] [Windows] Update EdgeDriver signature (#11361) --- images/windows/scripts/build/Install-EdgeDriver.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/windows/scripts/build/Install-EdgeDriver.ps1 b/images/windows/scripts/build/Install-EdgeDriver.ps1 index e8f07b7de161..6d10d6e5d025 100644 --- a/images/windows/scripts/build/Install-EdgeDriver.ps1 +++ b/images/windows/scripts/build/Install-EdgeDriver.ps1 @@ -27,7 +27,7 @@ Write-Host "Expand Microsoft Edge WebDriver archive..." Expand-7ZipArchive -Path $archivePath -DestinationPath $edgeDriverPath #Validate the EdgeDriver signature -$signatureThumbprint = "7920AC8FB05E0FFFE21E8FF4B4F03093BA6AC16E" +$signatureThumbprint = "0BD8C56733FDCC06F8CB919FF5A200E39B1ACF71" Test-FileSignature -Path "$edgeDriverPath\msedgedriver.exe" -ExpectedThumbprint $signatureThumbprint Write-Host "Setting the environment variables..." From 131105315ae33a43a1bbd07834288289b0171769 Mon Sep 17 00:00:00 2001 From: vidyasagarnimmagaddi <160703874+vidyasagarnimmagaddi@users.noreply.github.com> Date: Mon, 13 Jan 2025 20:10:42 +0530 Subject: [PATCH 3399/3485] [Windows] Update maven version to 3.9 (#11321) * [Windows] update maven version 3.9 Co-authored-by: Tim Jacomb <timja@users.noreply.github.com> * [Windows] Updated maven version 9.0 Co-authored-by: Tim Jacomb <timja@users.noreply.github.com> --------- Co-authored-by: Tim Jacomb <timja@users.noreply.github.com> --- images/windows/scripts/build/Install-JavaTools.ps1 | 1 - images/windows/toolsets/toolset-2019.json | 2 +- images/windows/toolsets/toolset-2022.json | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/images/windows/scripts/build/Install-JavaTools.ps1 b/images/windows/scripts/build/Install-JavaTools.ps1 index 655e6ad072ca..7bec25373c1e 100644 --- a/images/windows/scripts/build/Install-JavaTools.ps1 +++ b/images/windows/scripts/build/Install-JavaTools.ps1 @@ -110,7 +110,6 @@ foreach ($jdkVersionToInstall in $jdkVersionsToInstall) { # Install Java tools # Force chocolatey to ignore dependencies on Ant and Maven or else they will download the Oracle JDK Install-ChocoPackage ant -ArgumentList "--ignore-dependencies" -# Maven 3.9.x has multiple compatibilities problems $toolsetMavenVersion = (Get-ToolsetContent).maven.version $versionToInstall = Resolve-ChocoPackageVersion -PackageName "maven" -TargetVersion $toolsetMavenVersion diff --git a/images/windows/toolsets/toolset-2019.json b/images/windows/toolsets/toolset-2019.json index 212d286df4b8..d53afe00a9bd 100644 --- a/images/windows/toolsets/toolset-2019.json +++ b/images/windows/toolsets/toolset-2019.json @@ -449,7 +449,7 @@ "default": "18.*" }, "maven": { - "version": "3.8" + "version": "3.9" }, "mysql": { "version": "5.7", diff --git a/images/windows/toolsets/toolset-2022.json b/images/windows/toolsets/toolset-2022.json index 7f93108b7d93..280820b87dc9 100644 --- a/images/windows/toolsets/toolset-2022.json +++ b/images/windows/toolsets/toolset-2022.json @@ -359,7 +359,7 @@ "default": "18.*" }, "maven": { - "version": "3.8" + "version": "3.9" }, "mysql": { "version": "8.0", From d1852f561f102f8da927a859a5de5c68696e07b3 Mon Sep 17 00:00:00 2001 From: vidyasagarnimmagaddi <160703874+vidyasagarnimmagaddi@users.noreply.github.com> Date: Mon, 13 Jan 2025 20:11:39 +0530 Subject: [PATCH 3400/3485] [Ubuntu] Updated maven version 9.0 (#11337) Co-authored-by: Tim Jacomb <timja@users.noreply.github.com> --- images/ubuntu/toolsets/toolset-2004.json | 2 +- images/ubuntu/toolsets/toolset-2204.json | 2 +- images/ubuntu/toolsets/toolset-2404.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/images/ubuntu/toolsets/toolset-2004.json b/images/ubuntu/toolsets/toolset-2004.json index a67a5027e9fe..e96d97b2b846 100644 --- a/images/ubuntu/toolsets/toolset-2004.json +++ b/images/ubuntu/toolsets/toolset-2004.json @@ -72,7 +72,7 @@ "java": { "default": "11", "versions": [ "8", "11", "17", "21"], - "maven": "3.8.8" + "maven": "3.9.9" }, "android": { "cmdline-tools": "commandlinetools-linux-9477386_latest.zip", diff --git a/images/ubuntu/toolsets/toolset-2204.json b/images/ubuntu/toolsets/toolset-2204.json index 2ac3f5ff173a..8c5b9090a2d4 100644 --- a/images/ubuntu/toolsets/toolset-2204.json +++ b/images/ubuntu/toolsets/toolset-2204.json @@ -69,7 +69,7 @@ "java": { "default": "11", "versions": [ "8", "11", "17", "21"], - "maven": "3.8.8" + "maven": "3.9.9" }, "android": { "cmdline-tools": "commandlinetools-linux-9477386_latest.zip", diff --git a/images/ubuntu/toolsets/toolset-2404.json b/images/ubuntu/toolsets/toolset-2404.json index 127dffd3ecf0..cf732f67c1bd 100644 --- a/images/ubuntu/toolsets/toolset-2404.json +++ b/images/ubuntu/toolsets/toolset-2404.json @@ -65,7 +65,7 @@ "java": { "default": "17", "versions": [ "8", "11", "17", "21"], - "maven": "3.8.8" + "maven": "3.9.9" }, "android": { "cmdline-tools": "commandlinetools-linux-11076708_latest.zip", From 40f0a79050ee910ee49678ff5fa98b13ec25ccf5 Mon Sep 17 00:00:00 2001 From: lawrencegripper <info@grippers.co.uk> Date: Mon, 13 Jan 2025 16:44:41 +0000 Subject: [PATCH 3401/3485] PoC: Require details tracked when patch version pinned --- .github/workflows/validate-json-schema.yml | 16 +++++++++ .vscode/settings.json | 11 +++++- schemas/toolset-schema.json | 42 ++++++++++++++++++++++ 3 files changed, 68 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/validate-json-schema.yml create mode 100644 schemas/toolset-schema.json diff --git a/.github/workflows/validate-json-schema.yml b/.github/workflows/validate-json-schema.yml new file mode 100644 index 000000000000..d3f9a185f28c --- /dev/null +++ b/.github/workflows/validate-json-schema.yml @@ -0,0 +1,16 @@ +name: Validate JSON Schema + +on: [push, pull_request] + +jobs: + validate-json: + runs-on: ubuntu-latest + steps: + - name: Checkout repository + uses: actions/checkout@v3 + + - name: Validate Toolset JSON files against schema + uses: cardinalby/schema-validator-action@v3 + with: + file: '**/toolset-*.json' + schema: 'schemas/toolset-schema.json' diff --git a/.vscode/settings.json b/.vscode/settings.json index f0ce6b6ac015..98a58c65f2e4 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -21,5 +21,14 @@ ], "shellcheck.customArgs": [ "-x" - ] + ], + "json.schemas": [ + { + "fileMatch": [ + "**/toolset-*.json" + ], + "url": "./schemas/toolset-schema.json" + } +] + } diff --git a/schemas/toolset-schema.json b/schemas/toolset-schema.json new file mode 100644 index 000000000000..79b1bd988ae8 --- /dev/null +++ b/schemas/toolset-schema.json @@ -0,0 +1,42 @@ +{ + "$schema": "http://json-schema.org/draft-07/schema#", + "type": "object", + "patternProperties": { + "^.*$": { + "if": { + "type": "object", + "required": [ + "version" + ], + "properties": { + "version": { + "type": "string", + "pattern": "^[0-9]+\\.[0-9]+\\.[0-9]+.*$" + } + } + }, + "then": { + "required": [ + "pinnedReason" + ], + "properties": { + "pinnedDetails": { + "type": "object", + "properties": { + "reason": { + "type": "string" + }, + "link": { + "type": "string" + }, + "review-at": { + "type": "string", + "format": "date" + } + } + } + } + } + } + } +} From 9faa1553c1693813eb709ff6ab21d1cc5ff7df37 Mon Sep 17 00:00:00 2001 From: lawrencegripper <info@grippers.co.uk> Date: Mon, 13 Jan 2025 16:55:50 +0000 Subject: [PATCH 3402/3485] Do some validation --- .github/workflows/validate-json-schema.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/validate-json-schema.yml b/.github/workflows/validate-json-schema.yml index d3f9a185f28c..3e12c82b890a 100644 --- a/.github/workflows/validate-json-schema.yml +++ b/.github/workflows/validate-json-schema.yml @@ -9,8 +9,8 @@ jobs: - name: Checkout repository uses: actions/checkout@v3 - - name: Validate Toolset JSON files against schema - uses: cardinalby/schema-validator-action@v3 - with: - file: '**/toolset-*.json' - schema: 'schemas/toolset-schema.json' + - name: Run JSON Schema validation + run: | + wget https://github.com/neilpa/yajsv/releases/download/v1.4.1/yajsv.linux.amd64 + chmod +x yajsv.linux.amd64 + ./yajsv.linux.amd64 -s ./schemas/toolset-schema.json ./**/toolset-*.json From 62335a38307b9f10fb6e1991895b8ce7b7fa1506 Mon Sep 17 00:00:00 2001 From: lawrencegripper <info@grippers.co.uk> Date: Mon, 13 Jan 2025 17:15:29 +0000 Subject: [PATCH 3403/3485] Fix validation --- .github/workflows/validate-json-schema.yml | 2 +- .gitignore | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/validate-json-schema.yml b/.github/workflows/validate-json-schema.yml index 3e12c82b890a..1f3ce7894580 100644 --- a/.github/workflows/validate-json-schema.yml +++ b/.github/workflows/validate-json-schema.yml @@ -13,4 +13,4 @@ jobs: run: | wget https://github.com/neilpa/yajsv/releases/download/v1.4.1/yajsv.linux.amd64 chmod +x yajsv.linux.amd64 - ./yajsv.linux.amd64 -s ./schemas/toolset-schema.json ./**/toolset-*.json + ./yajsv.linux.amd64 -s ./schemas/toolset-schema.json $(find . -name 'toolset-*.json' | tr '\n' ' ') diff --git a/.gitignore b/.gitignore index 6018a375704f..1d20651d4042 100644 --- a/.gitignore +++ b/.gitignore @@ -397,3 +397,4 @@ launch.json # Ignore dynamic template images/*/*-temp.json +.github/workflows/validate-json-schema.yml From 7a88cb1d8b10d82be87cb0d6f1ce8470adf3e6d3 Mon Sep 17 00:00:00 2001 From: lawrencegripper <info@grippers.co.uk> Date: Mon, 13 Jan 2025 17:20:14 +0000 Subject: [PATCH 3404/3485] quiet output --- .github/workflows/validate-json-schema.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/validate-json-schema.yml b/.github/workflows/validate-json-schema.yml index 1f3ce7894580..4d35acea4deb 100644 --- a/.github/workflows/validate-json-schema.yml +++ b/.github/workflows/validate-json-schema.yml @@ -11,6 +11,6 @@ jobs: - name: Run JSON Schema validation run: | - wget https://github.com/neilpa/yajsv/releases/download/v1.4.1/yajsv.linux.amd64 + wget -q https://github.com/neilpa/yajsv/releases/download/v1.4.1/yajsv.linux.amd64 chmod +x yajsv.linux.amd64 ./yajsv.linux.amd64 -s ./schemas/toolset-schema.json $(find . -name 'toolset-*.json' | tr '\n' ' ') From 8184167b25da8b39c2abe26e415184a24464a0e7 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Mon, 13 Jan 2025 18:38:10 +0100 Subject: [PATCH 3405/3485] Add tags support to image generation script (#11367) --- images.CI/linux-and-win/build-image.ps1 | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/images.CI/linux-and-win/build-image.ps1 b/images.CI/linux-and-win/build-image.ps1 index f1c4ce6074b0..ca0ab32706d1 100644 --- a/images.CI/linux-and-win/build-image.ps1 +++ b/images.CI/linux-and-win/build-image.ps1 @@ -11,7 +11,8 @@ param( [String] [Parameter (Mandatory=$false)] $VirtualNetworkName, [String] [Parameter (Mandatory=$false)] $VirtualNetworkRG, [String] [Parameter (Mandatory=$false)] $VirtualNetworkSubnet, - [String] [Parameter (Mandatory=$false)] $AllowedInboundIpAddresses = "[]" + [String] [Parameter (Mandatory=$false)] $AllowedInboundIpAddresses = "[]", + [hashtable] [Parameter (Mandatory=$False)] $Tags = @{} ) if (-not (Test-Path $TemplatePath)) @@ -33,6 +34,8 @@ $SensitiveData = @( ': ->' ) +$azure_tags = $Tags.GetEnumerator() | ForEach-Object { "{0}={1}" -f $_.Key, $_.Value } | Join-String -Separator "," + Write-Host "Show Packer Version" packer --version @@ -56,6 +59,7 @@ packer build -var "client_id=$ClientId" ` -var "virtual_network_resource_group_name=$VirtualNetworkRG" ` -var "virtual_network_subnet_name=$VirtualNetworkSubnet" ` -var "allowed_inbound_ip_addresses=$($AllowedInboundIpAddresses)" ` + -var "azure_tags={$azure_tags}" ` -color=false ` $TemplatePath ` | Where-Object { From c15fb5f6b212ed2a2f3a77863db0c7cc99eb8975 Mon Sep 17 00:00:00 2001 From: lawrencegripper <info@grippers.co.uk> Date: Tue, 14 Jan 2025 12:13:15 +0000 Subject: [PATCH 3406/3485] Add example detection script --- helpers/pinned-details-chech.sh | 30 +++++++++++++++++++++++ images/windows/toolsets/toolset-2019.json | 14 +++++++++-- schemas/toolset-schema.json | 2 +- 3 files changed, 43 insertions(+), 3 deletions(-) create mode 100755 helpers/pinned-details-chech.sh diff --git a/helpers/pinned-details-chech.sh b/helpers/pinned-details-chech.sh new file mode 100755 index 000000000000..1874e3b8165d --- /dev/null +++ b/helpers/pinned-details-chech.sh @@ -0,0 +1,30 @@ +#!/bin/bash + +toolset_files=$(find . -name 'toolset-*.json') + +for toolset_file in $toolset_files; do + if [[ "$toolset_file" == *"toolset-schema.json" ]]; then + continue + fi + + readarray -t pinned_details < <(jq --compact-output '.. | objects | select(has("review-at"))' "$toolset_file") + + for pinned_detail in "${pinned_details[@]}"; do + review_date=$(jq -r '.["review-at"]' <<< "$pinned_detail") + reason=$(jq -r '.["reason"]' <<< "$pinned_detail") + + if [ -n "$review_date" ]; then + if [ "$(date -d "$review_date" +%s)" -gt "$(date +%s)" ]; then + echo "ERROR: Overdue review date: $review_date for tool in $toolset_file" + echo " Pinned for '$reason'" + echo "" + fi + + if [ "$(date -d "$review_date" +%s)" -le $(( $(date +%s) - 7*24*60*60 )) ]; then + echo "WARNING: Review date is coming up within the next 7 days: $review_date for tool in $toolset_file" + echo " Pinned for '$reason'" + echo "" + fi + fi + done +done diff --git a/images/windows/toolsets/toolset-2019.json b/images/windows/toolsets/toolset-2019.json index d53afe00a9bd..23f80a2dca53 100644 --- a/images/windows/toolsets/toolset-2019.json +++ b/images/windows/toolsets/toolset-2019.json @@ -470,13 +470,23 @@ }, "postgresql": { "version": "14.12.1", - "signature": "698BA51AA27CC31282AACA5055E4B9190BC6C0E9" + "signature": "698BA51AA27CC31282AACA5055E4B9190BC6C0E9", + "pinnedDetails": { + "link": "https://github.com/EnterpriseDB/edb-installers/issues/196#issuecomment-2489021239", + "reason": "this was pinned due to a downstream issue with the installer", + "review-at": "2023-12-31" + } }, "kotlin": { "version": "latest" }, "openssl": { - "version": "1.1.1" + "version": "1.1.1", + "pinnedDetails": { + "link": "https://github.com/somelink", + "reason": "this was pinned due to a downstream issue with the installer", + "review-at": "2025-01-30" + } }, "pwsh": { "version": "7.4" diff --git a/schemas/toolset-schema.json b/schemas/toolset-schema.json index 79b1bd988ae8..f9bf71b96ff2 100644 --- a/schemas/toolset-schema.json +++ b/schemas/toolset-schema.json @@ -17,7 +17,7 @@ }, "then": { "required": [ - "pinnedReason" + "pinnedDetails" ], "properties": { "pinnedDetails": { From 043bfb130ff29e29d601c1c041779cb515b022bd Mon Sep 17 00:00:00 2001 From: lawrencegripper <info@grippers.co.uk> Date: Tue, 14 Jan 2025 12:29:48 +0000 Subject: [PATCH 3407/3485] Put in right place --- images/windows/toolsets/toolset-2019.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/windows/toolsets/toolset-2019.json b/images/windows/toolsets/toolset-2019.json index bb79c9edb1a5..c58751bc786d 100644 --- a/images/windows/toolsets/toolset-2019.json +++ b/images/windows/toolsets/toolset-2019.json @@ -419,9 +419,9 @@ "choco": { "common_packages": [ { "name": "7zip.install" }, + { "name": "azcopy10" }, { "name": "aria2" }, { "name": "Bicep" }, - { "name": "azcopy10" }, { "name": "gitversion.portable"}, { "name": "innosetup" }, { "name": "jq" }, From 47ef77b32bdf3a0c84086d3ca359f90c41881da4 Mon Sep 17 00:00:00 2001 From: blu3 <blu3berry@disroot.org> Date: Tue, 14 Jan 2025 18:51:41 +0300 Subject: [PATCH 3408/3485] Update license to 2025 (#11326) --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index 163ff113900b..9a9cc50d37ea 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2024 GitHub +Copyright (c) 2025 GitHub Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal From 97c57828ed383cac4a66ab66e4b2c7b7ef6537a6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 15 Jan 2025 14:10:16 +0000 Subject: [PATCH 3409/3485] Updating readme file for win19 version 20250113.1.1 (#11380) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/windows/Windows2019-Readme.md | 65 ++++++++++++++-------------- 1 file changed, 32 insertions(+), 33 deletions(-) diff --git a/images/windows/Windows2019-Readme.md b/images/windows/Windows2019-Readme.md index 44fecb99ec26..f55b27af1d02 100644 --- a/images/windows/Windows2019-Readme.md +++ b/images/windows/Windows2019-Readme.md @@ -2,14 +2,13 @@ |-| | [[Windows ] Breaking change : PHP 8.3.* version will be updated to PHP 8.4.* from January 31,2025](https://github.com/actions/runner-images/issues/11256) | | [Windows Server 2025 is now available](https://github.com/actions/runner-images/issues/11228) | -| [[Windows] Breaking change : Docker Engine Version 26.* will be updated to Docker Engine Version 27.* from January 17,2025](https://github.com/actions/runner-images/issues/11104) | +| [[Windows] Breaking change : Docker Engine Version 26.* will be updated to Docker Engine Version 27.* from February 07,2025](https://github.com/actions/runner-images/issues/11104) | | [[Windows & Ubuntu] Breaking change : Maven 3.8.* version will be updated to Maven 3.9.* from January 17,2025](https://github.com/actions/runner-images/issues/11093) | | [[Windows & Ubuntu] .NET 7.x will be removed from the images on January 17,2025](https://github.com/actions/runner-images/issues/10894) | -| [[Windows & Ubuntu] Python 3.7.x will be removed from January 10 ,2025](https://github.com/actions/runner-images/issues/10893) | *** # Windows Server 2019 - OS Version: 10.0.17763 Build 6659 -- Image Version: 20250105.1.0 +- Image Version: 20250113.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -31,14 +30,14 @@ ### Package Management - Chocolatey 2.4.1 - Composer 2.8.4 -- Helm 3.16.3 +- Helm 3.16.4 - Miniconda 24.11.1 (pre-installed on the image but not added to PATH) - NPM 10.8.2 -- NuGet 6.12.1.1 +- NuGet 6.12.2.1 - pip 24.3.1 (python 3.9) - Pipx 1.7.1 - RubyGems 3.2.33 -- Vcpkg (build from commit 65be70199) +- Vcpkg (build from commit d7112d1a4) - Yarn 1.22.22 #### Environment variables @@ -50,7 +49,7 @@ ### Project Management - Ant 1.10.14 - Gradle 8.12 -- Maven 3.8.7 +- Maven 3.9.9 - sbt 1.10.7 ### Tools @@ -61,17 +60,17 @@ - Bazelisk 1.25.0 - Bicep 0.32.4 - Cabal 3.14.1.1 -- CMake 3.31.3 -- CodeQL Action Bundle 2.20.0 +- CMake 3.31.4 +- CodeQL Action Bundle 2.20.1 - Docker 26.1.3 - Docker Compose v2 2.27.1 - Docker-wincred 0.8.2 - ghc 9.12.1 - Git 2.47.1.windows.1 - Git LFS 3.6.0 -- Google Cloud CLI 504.0.1 +- Google Cloud CLI 505.0.0 - ImageMagick 7.1.1-43 -- InnoSetup 6.3.3 +- InnoSetup 6.4.0 - jq 1.7.1 - Kind 0.26.0 - Kubectl 1.32.0 @@ -84,7 +83,7 @@ - OpenSSL 1.1.1w - Packer 1.11.2 - Parcel 2.13.3 -- Pulumi 3.144.1 +- Pulumi 3.145.0 - R 4.4.2 - Service Fabric SDK 9.1.1436.9590 - Stack 3.3.1 @@ -97,19 +96,19 @@ - zstd 1.5.6 ### CLI Tools -- Alibaba Cloud CLI 3.0.244 -- AWS CLI 2.22.28 +- Alibaba Cloud CLI 3.0.247 +- AWS CLI 2.22.33 - AWS SAM CLI 1.132.0 - AWS Session Manager CLI 1.2.694.0 - Azure CLI 2.67.0 - Azure DevOps CLI extension 1.0.1 - Cloud Foundry CLI 8.9.0 -- GitHub CLI 2.64.0 +- GitHub CLI 2.65.0 ### Rust Tools -- Cargo 1.83.0 -- Rust 1.83.0 -- Rustdoc 1.83.0 +- Cargo 1.84.0 +- Rust 1.84.0 +- Rustdoc 1.84.0 - Rustup 1.27.1 #### Packages @@ -117,15 +116,15 @@ - cargo-audit 0.21.0 - cargo-outdated 0.16.0 - cbindgen 0.27.0 -- Clippy 0.1.83 +- Clippy 0.1.84 - Rustfmt 1.8.0 ### Browsers and Drivers -- Google Chrome 131.0.6778.205 -- Chrome Driver 131.0.6778.204 -- Microsoft Edge 131.0.2903.112 -- Microsoft Edge Driver 131.0.2903.112 -- Mozilla Firefox 133.0.3 +- Google Chrome 131.0.6778.265 +- Chrome Driver 131.0.6778.264 +- Microsoft Edge 131.0.2903.146 +- Microsoft Edge Driver 131.0.2903.146 +- Mozilla Firefox 134.0 - Gecko Driver 0.35.0 - IE Driver 4.14.0.0 - Selenium server 4.27.0 @@ -178,7 +177,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 16.20.2 - 18.20.5 - 20.18.1 -- 22.12.0 +- 22.13.0 #### Python - 3.8.10 @@ -497,12 +496,12 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 10.0.22621.0 ### .NET Core Tools -- .NET Core SDK: 6.0.136, 6.0.203, 6.0.321, 6.0.428, 7.0.120, 7.0.203, 7.0.317, 7.0.410, 8.0.111, 8.0.206, 8.0.307, 8.0.404, 9.0.101 +- .NET Core SDK: 6.0.136, 6.0.203, 6.0.321, 6.0.428, 8.0.111, 8.0.206, 8.0.307, 8.0.404, 9.0.101 - .NET Framework: 4.7.2, 4.8 -- Microsoft.AspNetCore.App: 6.0.5, 6.0.26, 6.0.36, 7.0.5, 7.0.20, 8.0.6, 8.0.11, 9.0.0 -- Microsoft.NETCore.App: 6.0.5, 6.0.26, 6.0.36, 7.0.5, 7.0.20, 8.0.6, 8.0.11, 9.0.0 -- Microsoft.WindowsDesktop.App: 6.0.5, 6.0.26, 6.0.36, 7.0.5, 7.0.20, 8.0.6, 8.0.11, 9.0.0 -- nbgv 3.7.112+63bbe780b0 +- Microsoft.AspNetCore.App: 6.0.5, 6.0.26, 6.0.36, 8.0.6, 8.0.11, 9.0.0 +- Microsoft.NETCore.App: 6.0.5, 6.0.26, 6.0.36, 8.0.6, 8.0.11, 9.0.0 +- Microsoft.WindowsDesktop.App: 6.0.5, 6.0.26, 6.0.36, 8.0.6, 8.0.11, 9.0.0 +- nbgv 3.7.115+d31f50f4d1 ### PowerShell Tools - PowerShell 7.4.6 @@ -513,11 +512,11 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - AzureRM: 2.1.0 (Default), 6.13.1 - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.729 +- AWSPowershell: 4.1.734 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.10 - Microsoft.Graph: 2.25.0 -- Pester: 3.4.0, 5.6.1 +- Pester: 3.4.0, 5.7.1 - PowerShellGet: 1.0.0.1, 2.2.5 - PSScriptAnalyzer: 1.23.0 - PSWindowsUpdate: 2.2.1.5 @@ -533,7 +532,7 @@ All other versions are saved but not installed. | Package Name | Version | | -------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 8.0 | -| Android Emulator | 35.2.10 | +| Android Emulator | 35.3.11 | | Android SDK Build-tools | 35.0.0<br>34.0.0<br>33.0.0 33.0.1 33.0.2 33.0.3<br>32.0.0<br>31.0.0<br>30.0.2 | | Android SDK Platforms | android-35-ext14 (rev 1)<br>android-35 (rev 2)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3) | | Android SDK Platform-Tools | 35.0.2 | From f92a9551a8618ff783508458bf6001a6968c2079 Mon Sep 17 00:00:00 2001 From: kishorekumar-anchala <168699259+kishorekumar-anchala@users.noreply.github.com> Date: Wed, 15 Jan 2025 21:05:47 +0530 Subject: [PATCH 3410/3485] [Windows] Update visual studio signature for windows 2019 (#11392) * vs sign update for win-19 * update VS Signature --- images/windows/toolsets/toolset-2019.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/windows/toolsets/toolset-2019.json b/images/windows/toolsets/toolset-2019.json index d53afe00a9bd..42b459946129 100644 --- a/images/windows/toolsets/toolset-2019.json +++ b/images/windows/toolsets/toolset-2019.json @@ -247,8 +247,8 @@ "subversion" : "16", "edition" : "Enterprise", "channel": "release", - "signature": ["F9A7CF9FBE13BAC767F4781061332DA6E8B4E0EE", - "245D262748012A4FE6CE8BA6C951A4C4AFBC3E5D" + "signature": [ + "8F985BE8FD256085C90A95D3C74580511A1DB975" ], "workloads": [ "Component.Dotfuscator", From 8b7d5f6fee560f5bd3fe5a16cecca027fa7d33df Mon Sep 17 00:00:00 2001 From: Subir Ghosh <subir0071@users.noreply.github.com> Date: Wed, 15 Jan 2025 11:30:27 -0700 Subject: [PATCH 3411/3485] Revert "Implemented az-cli warmup (#11173)" (#11400) This reverts commit ffe7e6a51497101e31b8bdde69a80d92b1e1125c. --- images/ubuntu/scripts/build/cleanup.sh | 7 ---- .../ubuntu/scripts/build/install-azure-cli.sh | 32 ++----------------- .../scripts/build/install-azure-devops-cli.sh | 8 +++++ 3 files changed, 10 insertions(+), 37 deletions(-) diff --git a/images/ubuntu/scripts/build/cleanup.sh b/images/ubuntu/scripts/build/cleanup.sh index 100fdcbbf47e..17c7ccc3f6fa 100644 --- a/images/ubuntu/scripts/build/cleanup.sh +++ b/images/ubuntu/scripts/build/cleanup.sh @@ -19,13 +19,6 @@ if command -v journalctl; then journalctl --vacuum-time=1s fi -# remove redundant folders from azcli -if [[ -z "${AZURE_CONFIG_DIR}" ]]; then - rm -rf $AZURE_CONFIG_DIR/logs - rm -rf $AZURE_CONFIG_DIR/commands - rm -rf $AZURE_CONFIG_DIR/telemetry -fi - # delete all .gz and rotated file find /var/log -type f -regex ".*\.gz$" -delete find /var/log -type f -regex ".*\.[0-9]$" -delete diff --git a/images/ubuntu/scripts/build/install-azure-cli.sh b/images/ubuntu/scripts/build/install-azure-cli.sh index ff279492d58a..0004f7bdef63 100644 --- a/images/ubuntu/scripts/build/install-azure-cli.sh +++ b/images/ubuntu/scripts/build/install-azure-cli.sh @@ -4,40 +4,12 @@ ## Desc: Install Azure CLI (az) ################################################################################ -# Source the helpers for use with the script -source $HELPER_SCRIPTS/etc-environment.sh - -# AZURE_CONFIG_DIR shell variable defines where the CLI configuration file for managing behavior are stored -# https://learn.microsoft.com/en-us/cli/azure/azure-cli-configuration#cli-configuration-file -# This path SHOULD be different from the installation directory /opt/az/ -export AZURE_CONFIG_DIR="/opt/az-config" -mkdir -p $AZURE_CONFIG_DIR -set_etc_environment_variable "AZURE_CONFIG_DIR" "${AZURE_CONFIG_DIR}" - -# AZURE_EXTENSION_DIR shell variable defines where modules are installed -# https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview -# This path SHOULD be different from the installation directory /opt/az/ -export AZURE_EXTENSION_DIR="/opt/az-extension" -mkdir -p $AZURE_EXTENSION_DIR -set_etc_environment_variable "AZURE_EXTENSION_DIR" "${AZURE_EXTENSION_DIR}" - # Install Azure CLI (instructions taken from https://docs.microsoft.com/en-us/cli/azure/install-azure-cli) curl -fsSL https://aka.ms/InstallAzureCLIDeb | sudo bash echo "azure-cli https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt" >> $HELPER_SCRIPTS/apt-sources.txt -# Remove Azure CLI repository (instructions taken from https://learn.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt#uninstall-azure-cli) -rm -f /etc/apt/sources.list.d/azure-cli.sources - -echo "Warmup 'az'" -az --help > /dev/null -if [ $? -ne 0 ]; then - echo "Command 'az --help' failed" - exit 1 -fi - -# Hand over the ownership of the directories and files to the non-root user -chown -R "$SUDO_USER:$SUDO_USER" $AZURE_CONFIG_DIR -chown -R "$SUDO_USER:$SUDO_USER" $AZURE_EXTENSION_DIR +rm -f /etc/apt/sources.list.d/azure-cli.list +rm -f /etc/apt/sources.list.d/azure-cli.list.save invoke_tests "CLI.Tools" "Azure CLI" diff --git a/images/ubuntu/scripts/build/install-azure-devops-cli.sh b/images/ubuntu/scripts/build/install-azure-devops-cli.sh index 98e1318a9148..81948ac95440 100644 --- a/images/ubuntu/scripts/build/install-azure-devops-cli.sh +++ b/images/ubuntu/scripts/build/install-azure-devops-cli.sh @@ -4,6 +4,14 @@ ## Desc: Install Azure DevOps CLI (az devops) ################################################################################ +# Source the helpers for use with the script +source $HELPER_SCRIPTS/etc-environment.sh + +# AZURE_EXTENSION_DIR shell variable defines where modules are installed +# https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview +export AZURE_EXTENSION_DIR=/opt/az/azcliextensions +set_etc_environment_variable "AZURE_EXTENSION_DIR" "${AZURE_EXTENSION_DIR}" + # install azure devops Cli extension az extension add -n azure-devops From 250b20985056ca7fd6643393a9c5940ab6b2c7ae Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 16 Jan 2025 00:18:51 +0000 Subject: [PATCH 3412/3485] Updating readme file for macos-13-arm64 version 20250106.592 (#11305) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-13-arm64-Readme.md | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/images/macos/macos-13-arm64-Readme.md b/images/macos/macos-13-arm64-Readme.md index 547dd14429f4..e3d8dfc59d64 100644 --- a/images/macos/macos-13-arm64-Readme.md +++ b/images/macos/macos-13-arm64-Readme.md @@ -7,7 +7,7 @@ # macOS 13 - OS Version: macOS 13.7.2 (22H313) - Kernel Version: Darwin 22.6.0 -- Image Version: 20241216.537 +- Image Version: 20250106.592 ## Installed Software @@ -33,7 +33,7 @@ - Bundler 2.5.23 - Carthage 0.40.0 - CocoaPods 1.16.2 -- Homebrew 4.4.11 +- Homebrew 4.4.14 - NPM 10.8.2 - NuGet 6.3.1.1 - Pip3 24.3.1 (python 3.13) @@ -44,7 +44,7 @@ ### Project Management - Apache Ant 1.10.15 - Apache Maven 3.9.9 -- Gradle 8.11.1 +- Gradle 8.12 ### Utilities - 7-Zip 17.05 @@ -56,10 +56,10 @@ - Curl 8.7.1 - Git 2.47.1 - Git LFS 3.6.0 -- GitHub CLI 2.63.2 +- GitHub CLI 2.64.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.25.0 -- gpg (GnuPG) 2.4.6 +- gpg (GnuPG) 2.4.7 - jq 1.7.1 - OpenSSL 1.1.1w 11 Sep 2023 - Packer 1.11.2 @@ -69,17 +69,17 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.22.17 +- AWS CLI 2.22.28 - AWS SAM CLI 1.132.0 - AWS Session Manager CLI 1.2.694.0 - Azure CLI 2.67.0 - Azure CLI (azure-devops) 1.0.1 - Bicep CLI 0.32.4 -- Cmake 3.31.2 +- Cmake 3.31.3 - CodeQL Action Bundle 2.20.0 - Fastlane 2.226.0 -- SwiftFormat 0.55.3 -- Xcbeautify 2.16.0 +- SwiftFormat 0.55.4 +- Xcbeautify 2.17.0 - Xcode Command Line Tools 14.3.1.0.1.1683849156 - Xcodes 1.6.0 @@ -88,9 +88,9 @@ ### Browsers - Safari 18.2 (18620.1.16.111.6) - SafariDriver 18.2 (18620.1.16.111.6) -- Google Chrome 131.0.6778.140 -- Google Chrome for Testing 131.0.6778.108 -- ChromeDriver 131.0.6778.108 +- Google Chrome 131.0.6778.205 +- Google Chrome for Testing 131.0.6778.204 +- ChromeDriver 131.0.6778.204 - Selenium server 4.27.0 #### Environment variables @@ -227,7 +227,7 @@ | Android Command Line Tools | 11.0 | | Android Emulator | 35.2.10 | | Android SDK Build-tools | 35.0.0<br>34.0.0<br>33.0.2 33.0.3 | -| Android SDK Platforms | android-35-ext14 (rev 1)<br>android-35 (rev 1)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | +| Android SDK Platforms | android-35-ext14 (rev 1)<br>android-35 (rev 2)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | | Android SDK Platform-Tools | 35.0.2 | | Android Support Repository | 47.0.0 | | CMake | 3.31.0 | From 4a67880dbe3768f89174fe6594c5527027d4fafb Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 16 Jan 2025 12:48:36 +0000 Subject: [PATCH 3413/3485] Updating readme file for macos-13 version 20250113.572 (#11372) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-13-Readme.md | 53 +++++++++++++++++---------------- 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/images/macos/macos-13-Readme.md b/images/macos/macos-13-Readme.md index 8e276f6ced09..00ec45156b4b 100644 --- a/images/macos/macos-13-Readme.md +++ b/images/macos/macos-13-Readme.md @@ -1,18 +1,18 @@ | Announcements | |-| -| [[macOS 14] Xcode 16.0 will be replaced by Xcode 16.2 in macOS-14 images on January 6, 2025](https://github.com/actions/runner-images/issues/11203) | +| [[macOS] Ruby version 3.0 will be removed from the images on Feb 10, 2025 and 3.3 will be set as default. ](https://github.com/actions/runner-images/issues/11345) | | [[macOS] The macOS 12 Actions runner image will begin deprecation on 10/7/24 and will be fully unsupported by 12/3/24 for GitHub and by 01/13/25 for ADO](https://github.com/actions/runner-images/issues/10721) | | [macOS 15 (Sequoia) is now available as a public beta in GitHub Actions](https://github.com/actions/runner-images/issues/10686) | *** # macOS 13 - OS Version: macOS 13.7.2 (22H313) - Kernel Version: Darwin 22.6.0 -- Image Version: 20250106.546 +- Image Version: 20250113.572 ## Installed Software ### Language and Runtime -- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.410, 8.0.101, 8.0.204, 8.0.303, 8.0.404 +- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.410, 8.0.101, 8.0.204, 8.0.303, 8.0.404, 9.0.101 - Bash 3.2.57(1)-release - Clang/LLVM 14.0.0 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` @@ -35,13 +35,13 @@ - Carthage 0.40.0 - CocoaPods 1.16.2 - Composer 2.8.4 -- Homebrew 4.4.14 +- Homebrew 4.4.15 - NPM 10.8.2 - NuGet 6.3.1.1 - Pip3 24.3.1 (python 3.13) - Pipx 1.7.1 - RubyGems 3.5.23 -- Vcpkg 2024 (build from commit 65be70199) +- Vcpkg 2024 (build from commit d7112d1a4) - Yarn 1.22.22 ### Project Management @@ -57,9 +57,9 @@ - bazelisk 1.25.0 - bsdtar 3.5.3 - available by 'tar' alias - Curl 8.11.1 -- Git 2.47.1 +- Git 2.48.0 - Git LFS 3.6.0 -- GitHub CLI 2.64.0 +- GitHub CLI 2.65.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.25.0 - gpg (GnuPG) 2.4.7 @@ -68,18 +68,18 @@ - Packer 1.11.2 - pkgconf 2.3.0 - Unxip 3.1 -- yq 4.44.6 +- yq 4.45.1 - zstd 1.5.6 ### Tools -- AWS CLI 2.22.28 +- AWS CLI 2.22.33 - AWS SAM CLI 1.132.0 - AWS Session Manager CLI 1.2.694.0 - Azure CLI 2.67.0 - Azure CLI (azure-devops) 1.0.1 - Bicep CLI 0.32.4 -- Cmake 3.31.3 -- CodeQL Action Bundle 2.20.0 +- Cmake 3.31.4 +- CodeQL Action Bundle 2.20.1 - Fastlane 2.226.0 - SwiftFormat 0.55.4 - Xcbeautify 2.17.0 @@ -87,17 +87,17 @@ - Xcodes 1.6.0 ### Linters -- SwiftLint 0.57.1 +- SwiftLint 0.58.0 ### Browsers - Safari 18.2 (18620.1.16.111.6) - SafariDriver 18.2 (18620.1.16.111.6) -- Google Chrome 131.0.6778.205 -- Google Chrome for Testing 131.0.6778.204 -- ChromeDriver 131.0.6778.204 -- Microsoft Edge 131.0.2903.112 +- Google Chrome 131.0.6778.265 +- Google Chrome for Testing 131.0.6778.264 +- ChromeDriver 131.0.6778.264 +- Microsoft Edge 131.0.2903.147 - Microsoft Edge WebDriver 131.0.2903.112 -- Mozilla Firefox 133.0.3 +- Mozilla Firefox 134.0 - geckodriver 0.35.0 - Selenium server 4.27.0 @@ -130,6 +130,7 @@ - 3.1.6 - 3.2.6 - 3.3.6 +- 3.4.1 #### Python - 3.8.18 @@ -142,7 +143,7 @@ #### Node.js - 18.20.5 - 20.18.1 -- 22.12.0 +- 22.13.0 #### Go - 1.21.13 @@ -150,13 +151,13 @@ - 1.23.4 ### Rust Tools -- Cargo 1.83.0 -- Rust 1.83.0 -- Rustdoc 1.83.0 +- Cargo 1.84.0 +- Rust 1.84.0 +- Rustdoc 1.84.0 - Rustup 1.27.1 #### Packages -- Clippy 0.1.83 +- Clippy 0.1.84 - Rustfmt 1.8.0-stable ### PowerShell Tools @@ -164,7 +165,7 @@ #### PowerShell Modules - Az: 12.4.0 -- Pester: 5.6.1 +- Pester: 5.7.1 - PSScriptAnalyzer: 1.23.0 ### Xcode @@ -211,8 +212,8 @@ | Simulator - watchOS 9.4 | watchsimulator9.4 | 14.3.1 | | Simulator - watchOS 10.0 | watchsimulator10.0 | 15.0.1 | | Simulator - watchOS 10.2 | watchsimulator10.2 | 15.1, 15.2 | -| Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | | visionOS 1.0 | xros1.0 | 15.2 | +| Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | @@ -243,7 +244,7 @@ | Package Name | Version | | -------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 11.0 | -| Android Emulator | 35.2.10 | +| Android Emulator | 35.3.11 | | Android SDK Build-tools | 35.0.0<br>34.0.0<br>33.0.2 33.0.3 | | Android SDK Platforms | android-35-ext14 (rev 1)<br>android-35 (rev 2)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | | Android SDK Platform-Tools | 35.0.2 | @@ -269,7 +270,7 @@ #### Environment variables | Name | Value | | ----------------- | ----------------------------------------------------------------------------------------- | -| PARALLELS_DMG_URL | https://download.parallels.com/desktop/v20/20.1.3-55743/ParallelsDesktop-20.1.3-55743.dmg | +| PARALLELS_DMG_URL | https://download.parallels.com/desktop/v20/20.2.0-55872/ParallelsDesktop-20.2.0-55872.dmg | ##### Notes ``` From 620d17380f4e23ed1a1d271506b8558335834650 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 16 Jan 2025 12:57:12 +0000 Subject: [PATCH 3414/3485] Updating readme file for macos-15 version 20250113.570 (#11374) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-15-Readme.md | 55 +++++++++++++++++---------------- 1 file changed, 28 insertions(+), 27 deletions(-) diff --git a/images/macos/macos-15-Readme.md b/images/macos/macos-15-Readme.md index 7f54aff80ed3..2fc86d14233d 100644 --- a/images/macos/macos-15-Readme.md +++ b/images/macos/macos-15-Readme.md @@ -1,18 +1,18 @@ | Announcements | |-| -| [[macOS 14] Xcode 16.0 will be replaced by Xcode 16.2 in macOS-14 images on January 6, 2025](https://github.com/actions/runner-images/issues/11203) | +| [[macOS] Ruby version 3.0 will be removed from the images on Feb 10, 2025 and 3.3 will be set as default. ](https://github.com/actions/runner-images/issues/11345) | | [[macOS] The macOS 12 Actions runner image will begin deprecation on 10/7/24 and will be fully unsupported by 12/3/24 for GitHub and by 01/13/25 for ADO](https://github.com/actions/runner-images/issues/10721) | | [macOS 15 (Sequoia) is now available as a public beta in GitHub Actions](https://github.com/actions/runner-images/issues/10686) | *** # macOS 15 - OS Version: macOS 15.2 (24C101) - Kernel Version: Darwin 24.2.0 -- Image Version: 20250106.547 +- Image Version: 20250113.570 ## Installed Software ### Language and Runtime -- .NET Core SDK: 8.0.101, 8.0.204, 8.0.303, 8.0.404 +- .NET Core SDK: 8.0.101, 8.0.204, 8.0.303, 8.0.404, 9.0.101 - Bash 3.2.57(1)-release - Clang/LLVM 15.0.0 - Clang/LLVM (Homebrew) 18.1.8 - available on `$(brew --prefix llvm@18)/bin/clang` @@ -23,7 +23,7 @@ - GNU Fortran 13 (Homebrew GCC 13.3.0) - available by `gfortran-13` alias - GNU Fortran 14 (Homebrew GCC 14.2.0_1) - available by `gfortran-14` alias - Kotlin 2.1.0-release-394 -- Node.js 22.12.0 +- Node.js 22.13.0 - Perl 5.40.0 - PHP 8.4.2 - Python3 3.13.1 @@ -34,8 +34,8 @@ - Carthage 0.40.0 - CocoaPods 1.16.2 - Composer 2.8.4 -- Homebrew 4.4.14 -- NPM 10.9.0 +- Homebrew 4.4.15 +- NPM 10.9.2 - Pip3 24.3.1 (python 3.13) - Pipx 1.7.1 - RubyGems 3.6.2 @@ -54,9 +54,9 @@ - bazelisk 1.25.0 - bsdtar 3.5.3 - available by 'tar' alias - Curl 8.11.1 -- Git 2.47.1 +- Git 2.48.0 - Git LFS 3.6.0 -- GitHub CLI 2.64.0 +- GitHub CLI 2.65.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.25.0 - gpg (GnuPG) 2.4.7 @@ -65,18 +65,18 @@ - Packer 1.11.2 - pkgconf 2.3.0 - Unxip 3.1 -- yq 4.44.6 +- yq 4.45.1 - zstd 1.5.6 ### Tools -- AWS CLI 2.22.28 +- AWS CLI 2.22.33 - AWS SAM CLI 1.132.0 - AWS Session Manager CLI 1.2.694.0 - Azure CLI 2.67.0 - Azure CLI (azure-devops) 1.0.1 - Bicep CLI 0.32.4 -- Cmake 3.31.3 -- CodeQL Action Bundle 2.20.0 +- Cmake 3.31.4 +- CodeQL Action Bundle 2.20.1 - Fastlane 2.226.0 - SwiftFormat 0.55.4 - Xcbeautify 2.17.0 @@ -84,17 +84,17 @@ - Xcodes 1.6.0 ### Linters -- SwiftLint 0.57.1 +- SwiftLint 0.58.0 ### Browsers - Safari 18.2 (20620.1.16.11.8) - SafariDriver 18.2 (20620.1.16.11.8) -- Google Chrome 131.0.6778.205 -- Google Chrome for Testing 131.0.6778.204 -- ChromeDriver 131.0.6778.204 -- Microsoft Edge 131.0.2903.112 +- Google Chrome 131.0.6778.265 +- Google Chrome for Testing 131.0.6778.264 +- ChromeDriver 131.0.6778.264 +- Microsoft Edge 131.0.2903.147 - Microsoft Edge WebDriver 131.0.2903.112 -- Mozilla Firefox 133.0.3 +- Mozilla Firefox 134.0 - geckodriver 0.35.0 - Selenium server 4.27.0 @@ -118,6 +118,7 @@ - 3.1.6 - 3.2.6 - 3.3.6 +- 3.4.1 #### Python - 3.9.21 @@ -129,7 +130,7 @@ #### Node.js - 18.20.5 - 20.18.1 -- 22.12.0 +- 22.13.0 #### Go - 1.21.13 @@ -137,13 +138,13 @@ - 1.23.4 ### Rust Tools -- Cargo 1.83.0 -- Rust 1.83.0 -- Rustdoc 1.83.0 +- Cargo 1.84.0 +- Rust 1.84.0 +- Rustdoc 1.84.0 - Rustup 1.27.1 #### Packages -- Clippy 0.1.83 +- Clippy 0.1.84 - Rustfmt 1.8.0-stable ### PowerShell Tools @@ -151,7 +152,7 @@ #### PowerShell Modules - Az: 12.4.0 -- Pester: 5.6.1 +- Pester: 5.7.1 - PSScriptAnalyzer: 1.23.0 ### Xcode @@ -193,14 +194,14 @@ | Simulator - watchOS 11.0 | watchsimulator11.0 | 16.0 | | Simulator - watchOS 11.1 | watchsimulator11.1 | 16.1 | | Simulator - watchOS 11.2 | watchsimulator11.2 | 16.2 | -| Simulator - visionOS 1.2 | xrsimulator1.2 | 15.4 | | visionOS 1.2 | xros1.2 | 15.4 | +| Simulator - visionOS 1.2 | xrsimulator1.2 | 15.4 | | visionOS 2.0 | xros2.0 | 16.0 | | Simulator - visionOS 2.0 | xrsimulator2.0 | 16.0 | | Simulator - visionOS 2.1 | xrsimulator2.1 | 16.1 | | visionOS 2.1 | xros2.1 | 16.1 | -| visionOS 2.2 | xros2.2 | 16.2 | | Simulator - visionOS 2.2 | xrsimulator2.2 | 16.2 | +| visionOS 2.2 | xros2.2 | 16.2 | | DriverKit 23.5 | driverkit23.5 | 15.4 | | DriverKit 24.0 | driverkit24.0 | 16.0 | | DriverKit 24.1 | driverkit24.1 | 16.1 | @@ -226,7 +227,7 @@ | Package Name | Version | | -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 16.0 | -| Android Emulator | 35.2.10 | +| Android Emulator | 35.3.11 | | Android SDK Build-tools | 35.0.0 | | Android SDK Platforms | android-35-ext14 (rev 1)<br>android-35 (rev 2)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1) | | Android SDK Platform-Tools | 35.0.2 | From 9f1c73e4736b84939221e209c83a39446376f708 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 16 Jan 2025 15:26:19 +0000 Subject: [PATCH 3415/3485] Updating readme file for win22 version 20250113.1.1 (#11379) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/windows/Windows2022-Readme.md | 63 ++++++++++++++-------------- 1 file changed, 31 insertions(+), 32 deletions(-) diff --git a/images/windows/Windows2022-Readme.md b/images/windows/Windows2022-Readme.md index fb43fb4ddd1a..ef3aa69b0bba 100644 --- a/images/windows/Windows2022-Readme.md +++ b/images/windows/Windows2022-Readme.md @@ -2,14 +2,13 @@ |-| | [[Windows ] Breaking change : PHP 8.3.* version will be updated to PHP 8.4.* from January 31,2025](https://github.com/actions/runner-images/issues/11256) | | [Windows Server 2025 is now available](https://github.com/actions/runner-images/issues/11228) | -| [[Windows] Breaking change : Docker Engine Version 26.* will be updated to Docker Engine Version 27.* from January 17,2025](https://github.com/actions/runner-images/issues/11104) | +| [[Windows] Breaking change : Docker Engine Version 26.* will be updated to Docker Engine Version 27.* from February 07,2025](https://github.com/actions/runner-images/issues/11104) | | [[Windows & Ubuntu] Breaking change : Maven 3.8.* version will be updated to Maven 3.9.* from January 17,2025](https://github.com/actions/runner-images/issues/11093) | | [[Windows & Ubuntu] .NET 7.x will be removed from the images on January 17,2025](https://github.com/actions/runner-images/issues/10894) | -| [[Windows & Ubuntu] Python 3.7.x will be removed from January 10 ,2025](https://github.com/actions/runner-images/issues/10893) | *** # Windows Server 2022 - OS Version: 10.0.20348 Build 2966 -- Image Version: 20250105.1.0 +- Image Version: 20250113.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -31,14 +30,14 @@ ### Package Management - Chocolatey 2.4.1 - Composer 2.8.4 -- Helm 3.16.3 +- Helm 3.16.4 - Miniconda 24.11.1 (pre-installed on the image but not added to PATH) - NPM 10.8.2 -- NuGet 6.12.1.1 +- NuGet 6.12.2.1 - pip 24.3.1 (python 3.9) - Pipx 1.7.1 - RubyGems 3.2.33 -- Vcpkg (build from commit 65be70199) +- Vcpkg (build from commit d7112d1a4) - Yarn 1.22.22 #### Environment variables @@ -50,7 +49,7 @@ ### Project Management - Ant 1.10.14 - Gradle 8.12 -- Maven 3.8.7 +- Maven 3.9.9 - sbt 1.10.7 ### Tools @@ -61,8 +60,8 @@ - Bazelisk 1.25.0 - Bicep 0.32.4 - Cabal 3.14.1.1 -- CMake 3.31.3 -- CodeQL Action Bundle 2.20.0 +- CMake 3.31.4 +- CodeQL Action Bundle 2.20.1 - Docker 26.1.3 - Docker Compose v2 2.27.1 - Docker-wincred 0.8.2 @@ -70,7 +69,7 @@ - Git 2.47.1.windows.1 - Git LFS 3.6.0 - ImageMagick 7.1.1-43 -- InnoSetup 6.3.3 +- InnoSetup 6.4.0 - jq 1.7.1 - Kind 0.26.0 - Kubectl 1.32.0 @@ -82,7 +81,7 @@ - NSIS 3.10 - OpenSSL 1.1.1w - Packer 1.11.2 -- Pulumi 3.144.1 +- Pulumi 3.145.0 - R 4.4.2 - Service Fabric SDK 9.1.1436.9590 - Stack 3.3.1 @@ -95,18 +94,18 @@ - zstd 1.5.6 ### CLI Tools -- Alibaba Cloud CLI 3.0.244 -- AWS CLI 2.22.28 +- Alibaba Cloud CLI 3.0.247 +- AWS CLI 2.22.33 - AWS SAM CLI 1.132.0 - AWS Session Manager CLI 1.2.694.0 - Azure CLI 2.67.0 - Azure DevOps CLI extension 1.0.1 -- GitHub CLI 2.64.0 +- GitHub CLI 2.65.0 ### Rust Tools -- Cargo 1.83.0 -- Rust 1.83.0 -- Rustdoc 1.83.0 +- Cargo 1.84.0 +- Rust 1.84.0 +- Rustdoc 1.84.0 - Rustup 1.27.1 #### Packages @@ -114,15 +113,15 @@ - cargo-audit 0.21.0 - cargo-outdated 0.16.0 - cbindgen 0.27.0 -- Clippy 0.1.83 +- Clippy 0.1.84 - Rustfmt 1.8.0 ### Browsers and Drivers -- Google Chrome 131.0.6778.205 -- Chrome Driver 131.0.6778.204 -- Microsoft Edge 131.0.2903.112 -- Microsoft Edge Driver 131.0.2903.112 -- Mozilla Firefox 133.0.3 +- Google Chrome 131.0.6778.265 +- Chrome Driver 131.0.6778.264 +- Microsoft Edge 131.0.2903.146 +- Microsoft Edge Driver 131.0.2903.146 +- Mozilla Firefox 134.0 - Gecko Driver 0.35.0 - IE Driver 4.14.0.0 - Selenium server 4.27.0 @@ -172,7 +171,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 16.20.2 - 18.20.5 - 20.18.1 -- 22.12.0 +- 22.13.0 #### Python - 3.8.10 @@ -496,12 +495,12 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 10.0.26100.0 ### .NET Core Tools -- .NET Core SDK: 6.0.136, 6.0.203, 6.0.321, 6.0.428, 7.0.120, 7.0.203, 7.0.317, 7.0.410, 8.0.111, 8.0.206, 8.0.307, 8.0.404, 9.0.101 +- .NET Core SDK: 6.0.136, 6.0.203, 6.0.321, 6.0.428, 8.0.111, 8.0.206, 8.0.307, 8.0.404, 9.0.101 - .NET Framework: 4.7.2, 4.8, 4.8.1 -- Microsoft.AspNetCore.App: 6.0.5, 6.0.26, 6.0.35, 6.0.36, 7.0.5, 7.0.20, 8.0.6, 8.0.11, 9.0.0 -- Microsoft.NETCore.App: 6.0.5, 6.0.26, 6.0.35, 6.0.36, 7.0.5, 7.0.20, 8.0.6, 8.0.11, 9.0.0 -- Microsoft.WindowsDesktop.App: 6.0.5, 6.0.26, 6.0.36, 7.0.5, 7.0.20, 8.0.6, 8.0.11, 9.0.0 -- nbgv 3.7.112+63bbe780b0 +- Microsoft.AspNetCore.App: 6.0.5, 6.0.26, 6.0.35, 6.0.36, 8.0.6, 8.0.11, 9.0.0 +- Microsoft.NETCore.App: 6.0.5, 6.0.26, 6.0.35, 6.0.36, 8.0.6, 8.0.11, 9.0.0 +- Microsoft.WindowsDesktop.App: 6.0.5, 6.0.26, 6.0.36, 8.0.6, 8.0.11, 9.0.0 +- nbgv 3.7.115+d31f50f4d1 ### PowerShell Tools - PowerShell 7.4.6 @@ -512,11 +511,11 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - AzureRM: 2.1.0 (Default), 6.13.1 - Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip - AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.729 +- AWSPowershell: 4.1.734 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.10 - Microsoft.Graph: 2.25.0 -- Pester: 3.4.0, 5.6.1 +- Pester: 3.4.0, 5.7.1 - PowerShellGet: 1.0.0.1, 2.2.5 - PSScriptAnalyzer: 1.23.0 - PSWindowsUpdate: 2.2.1.5 @@ -532,7 +531,7 @@ All other versions are saved but not installed. | Package Name | Version | | -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 8.0 | -| Android Emulator | 35.2.10 | +| Android Emulator | 35.3.11 | | Android SDK Build-tools | 35.0.0<br>34.0.0<br>33.0.0 33.0.1 33.0.2 33.0.3<br>32.0.0<br>31.0.0 | | Android SDK Platforms | android-35-ext14 (rev 1)<br>android-35 (rev 2)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1) | | Android SDK Platform-Tools | 35.0.2 | From 1bb89cd279166ce49c24c0675d4c3c3c3cb4e910 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 16 Jan 2025 16:21:36 +0000 Subject: [PATCH 3416/3485] Updating readme file for macos-14-arm64 version 20250113.751 (#11375) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-14-arm64-Readme.md | 47 ++++++++++++++------------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/images/macos/macos-14-arm64-Readme.md b/images/macos/macos-14-arm64-Readme.md index 924c4ab31339..26bdefb41079 100644 --- a/images/macos/macos-14-arm64-Readme.md +++ b/images/macos/macos-14-arm64-Readme.md @@ -1,18 +1,18 @@ | Announcements | |-| -| [[macOS 14] Xcode 16.0 will be replaced by Xcode 16.2 in macOS-14 images on January 6, 2025](https://github.com/actions/runner-images/issues/11203) | +| [[macOS] Ruby version 3.0 will be removed from the images on Feb 10, 2025 and 3.3 will be set as default. ](https://github.com/actions/runner-images/issues/11345) | | [[macOS] The macOS 12 Actions runner image will begin deprecation on 10/7/24 and will be fully unsupported by 12/3/24 for GitHub and by 01/13/25 for ADO](https://github.com/actions/runner-images/issues/10721) | | [macOS 15 (Sequoia) is now available as a public beta in GitHub Actions](https://github.com/actions/runner-images/issues/10686) | *** # macOS 14 - OS Version: macOS 14.7.2 (23H311) - Kernel Version: Darwin 23.6.0 -- Image Version: 20250106.725 +- Image Version: 20250113.751 ## Installed Software ### Language and Runtime -- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.410, 8.0.101, 8.0.204, 8.0.303, 8.0.404 +- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.410, 8.0.101, 8.0.204, 8.0.303, 8.0.404, 9.0.101 - Bash 3.2.57(1)-release - Clang/LLVM 15.0.0 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` @@ -33,7 +33,7 @@ - Bundler 2.5.23 - Carthage 0.40.0 - CocoaPods 1.16.2 -- Homebrew 4.4.14 +- Homebrew 4.4.15 - NPM 10.8.2 - NuGet 6.3.1.1 - Pip3 24.3.1 (python 3.13) @@ -54,9 +54,9 @@ - bazelisk 1.25.0 - bsdtar 3.5.3 - available by 'tar' alias - Curl 8.7.1 -- Git 2.47.1 +- Git 2.48.0 - Git LFS 3.6.0 -- GitHub CLI 2.64.0 +- GitHub CLI 2.65.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.25.0 - gpg (GnuPG) 2.4.7 @@ -65,18 +65,18 @@ - Packer 1.11.2 - pkgconf 2.3.0 - Unxip 3.1 -- yq 4.44.6 +- yq 4.45.1 - zstd 1.5.6 ### Tools -- AWS CLI 2.22.28 +- AWS CLI 2.22.33 - AWS SAM CLI 1.132.0 - AWS Session Manager CLI 1.2.694.0 - Azure CLI 2.67.0 - Azure CLI (azure-devops) 1.0.1 - Bicep CLI 0.32.4 -- Cmake 3.31.3 -- CodeQL Action Bundle 2.20.0 +- Cmake 3.31.4 +- CodeQL Action Bundle 2.20.1 - Fastlane 2.226.0 - SwiftFormat 0.55.4 - Xcbeautify 2.17.0 @@ -88,9 +88,9 @@ ### Browsers - Safari 18.2 (19620.1.16.111.6) - SafariDriver 18.2 (19620.1.16.111.6) -- Google Chrome 131.0.6778.205 -- Google Chrome for Testing 131.0.6778.204 -- ChromeDriver 131.0.6778.204 +- Google Chrome 131.0.6778.265 +- Google Chrome for Testing 131.0.6778.264 +- ChromeDriver 131.0.6778.264 - Selenium server 4.27.0 #### Environment variables @@ -114,6 +114,7 @@ - 3.1.6 - 3.2.6 - 3.3.6 +- 3.4.1 #### Python - 3.11.9 @@ -123,7 +124,7 @@ #### Node.js - 18.20.5 - 20.18.1 -- 22.12.0 +- 22.13.0 #### Go - 1.21.13 @@ -131,13 +132,13 @@ - 1.23.4 ### Rust Tools -- Cargo 1.83.0 -- Rust 1.83.0 -- Rustdoc 1.83.0 +- Cargo 1.84.0 +- Rust 1.84.0 +- Rustdoc 1.84.0 - Rustup 1.27.1 #### Packages -- Clippy 0.1.83 +- Clippy 0.1.84 - Rustfmt 1.8.0-stable ### PowerShell Tools @@ -145,7 +146,7 @@ #### PowerShell Modules - Az: 12.4.0 -- Pester: 5.6.1 +- Pester: 5.7.1 - PSScriptAnalyzer: 1.23.0 ### Xcode @@ -208,12 +209,12 @@ | visionOS 1.0 | xros1.0 | 15.2 | | Simulator - visionOS 1.1 | xrsimulator1.1 | 15.3 | | visionOS 1.1 | xros1.1 | 15.3 | -| Simulator - visionOS 1.2 | xrsimulator1.2 | 15.4 | | visionOS 1.2 | xros1.2 | 15.4 | -| visionOS 2.1 | xros2.1 | 16.1 | +| Simulator - visionOS 1.2 | xrsimulator1.2 | 15.4 | | Simulator - visionOS 2.1 | xrsimulator2.1 | 16.1 | -| Simulator - visionOS 2.2 | xrsimulator2.2 | 16.2 | +| visionOS 2.1 | xros2.1 | 16.1 | | visionOS 2.2 | xros2.2 | 16.2 | +| Simulator - visionOS 2.2 | xrsimulator2.2 | 16.2 | | DriverKit 23.0 | driverkit23.0 | 15.0.1 | | DriverKit 23.2 | driverkit23.2 | 15.1, 15.2 | | DriverKit 23.4 | driverkit23.4 | 15.3 | @@ -247,7 +248,7 @@ | Package Name | Version | | -------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 11.0 | -| Android Emulator | 35.2.10 | +| Android Emulator | 35.3.11 | | Android SDK Build-tools | 35.0.0<br>34.0.0<br>33.0.2 33.0.3 | | Android SDK Platforms | android-35-ext14 (rev 1)<br>android-35 (rev 2)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | | Android SDK Platform-Tools | 35.0.2 | From 7ac5d59cf507e9217251cc914d2c138ecddb7bc1 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 16 Jan 2025 16:43:41 +0000 Subject: [PATCH 3417/3485] Updating readme file for macos-13-arm64 version 20250113.628 (#11373) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-13-arm64-Readme.md | 43 ++++++++++++++------------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/images/macos/macos-13-arm64-Readme.md b/images/macos/macos-13-arm64-Readme.md index e3d8dfc59d64..058265b7ba89 100644 --- a/images/macos/macos-13-arm64-Readme.md +++ b/images/macos/macos-13-arm64-Readme.md @@ -1,18 +1,18 @@ | Announcements | |-| -| [[macOS 14] Xcode 16.0 will be replaced by Xcode 16.2 in macOS-14 images on January 6, 2025](https://github.com/actions/runner-images/issues/11203) | +| [[macOS] Ruby version 3.0 will be removed from the images on Feb 10, 2025 and 3.3 will be set as default. ](https://github.com/actions/runner-images/issues/11345) | | [[macOS] The macOS 12 Actions runner image will begin deprecation on 10/7/24 and will be fully unsupported by 12/3/24 for GitHub and by 01/13/25 for ADO](https://github.com/actions/runner-images/issues/10721) | | [macOS 15 (Sequoia) is now available as a public beta in GitHub Actions](https://github.com/actions/runner-images/issues/10686) | *** # macOS 13 - OS Version: macOS 13.7.2 (22H313) - Kernel Version: Darwin 22.6.0 -- Image Version: 20250106.592 +- Image Version: 20250113.628 ## Installed Software ### Language and Runtime -- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.410, 8.0.101, 8.0.204, 8.0.303, 8.0.404 +- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.410, 8.0.101, 8.0.204, 8.0.303, 8.0.404, 9.0.101 - Bash 3.2.57(1)-release - Clang/LLVM 14.0.0 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` @@ -33,7 +33,7 @@ - Bundler 2.5.23 - Carthage 0.40.0 - CocoaPods 1.16.2 -- Homebrew 4.4.14 +- Homebrew 4.4.15 - NPM 10.8.2 - NuGet 6.3.1.1 - Pip3 24.3.1 (python 3.13) @@ -54,9 +54,9 @@ - bazelisk 1.25.0 - bsdtar 3.5.3 - available by 'tar' alias - Curl 8.7.1 -- Git 2.47.1 +- Git 2.48.0 - Git LFS 3.6.0 -- GitHub CLI 2.64.0 +- GitHub CLI 2.65.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.25.0 - gpg (GnuPG) 2.4.7 @@ -65,18 +65,18 @@ - Packer 1.11.2 - pkgconf 2.3.0 - Unxip 3.1 -- yq 4.44.6 +- yq 4.45.1 - zstd 1.5.6 ### Tools -- AWS CLI 2.22.28 +- AWS CLI 2.22.33 - AWS SAM CLI 1.132.0 - AWS Session Manager CLI 1.2.694.0 - Azure CLI 2.67.0 - Azure CLI (azure-devops) 1.0.1 - Bicep CLI 0.32.4 -- Cmake 3.31.3 -- CodeQL Action Bundle 2.20.0 +- Cmake 3.31.4 +- CodeQL Action Bundle 2.20.1 - Fastlane 2.226.0 - SwiftFormat 0.55.4 - Xcbeautify 2.17.0 @@ -88,9 +88,9 @@ ### Browsers - Safari 18.2 (18620.1.16.111.6) - SafariDriver 18.2 (18620.1.16.111.6) -- Google Chrome 131.0.6778.205 -- Google Chrome for Testing 131.0.6778.204 -- ChromeDriver 131.0.6778.204 +- Google Chrome 131.0.6778.265 +- Google Chrome for Testing 131.0.6778.264 +- ChromeDriver 131.0.6778.264 - Selenium server 4.27.0 #### Environment variables @@ -114,6 +114,7 @@ - 3.1.6 - 3.2.6 - 3.3.6 +- 3.4.1 #### Python - 3.11.9 @@ -123,7 +124,7 @@ #### Node.js - 18.20.5 - 20.18.1 -- 22.12.0 +- 22.13.0 #### Go - 1.21.13 @@ -131,13 +132,13 @@ - 1.23.4 ### Rust Tools -- Cargo 1.83.0 -- Rust 1.83.0 -- Rustdoc 1.83.0 +- Cargo 1.84.0 +- Rust 1.84.0 +- Rustdoc 1.84.0 - Rustup 1.27.1 #### Packages -- Clippy 0.1.83 +- Clippy 0.1.84 - Rustfmt 1.8.0-stable ### PowerShell Tools @@ -145,7 +146,7 @@ #### PowerShell Modules - Az: 12.4.0 -- Pester: 5.6.1 +- Pester: 5.7.1 - PSScriptAnalyzer: 1.23.0 ### Xcode @@ -195,8 +196,8 @@ | Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | | visionOS 1.0 | xros1.0 | 15.2 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | -| Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | +| Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | DriverKit 22.1 | driverkit22.1 | 14.1 | | DriverKit 22.2 | driverkit22.2 | 14.2 | | DriverKit 22.4 | driverkit22.4 | 14.3.1 | @@ -225,7 +226,7 @@ | Package Name | Version | | -------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 11.0 | -| Android Emulator | 35.2.10 | +| Android Emulator | 35.3.11 | | Android SDK Build-tools | 35.0.0<br>34.0.0<br>33.0.2 33.0.3 | | Android SDK Platforms | android-35-ext14 (rev 1)<br>android-35 (rev 2)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | | Android SDK Platform-Tools | 35.0.2 | From ffc156c3811f70e48085450d4f05c7e70a3f36f0 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 16 Jan 2025 17:07:27 +0000 Subject: [PATCH 3418/3485] Updating readme file for win25 version 20250113.1.1 (#11385) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/windows/Windows2025-Readme.md | 55 ++++++++++++++-------------- 1 file changed, 27 insertions(+), 28 deletions(-) diff --git a/images/windows/Windows2025-Readme.md b/images/windows/Windows2025-Readme.md index e5d6456a6a6e..6369ac459ee4 100644 --- a/images/windows/Windows2025-Readme.md +++ b/images/windows/Windows2025-Readme.md @@ -2,14 +2,13 @@ |-| | [[Windows ] Breaking change : PHP 8.3.* version will be updated to PHP 8.4.* from January 31,2025](https://github.com/actions/runner-images/issues/11256) | | [Windows Server 2025 is now available](https://github.com/actions/runner-images/issues/11228) | -| [[Windows] Breaking change : Docker Engine Version 26.* will be updated to Docker Engine Version 27.* from January 17,2025](https://github.com/actions/runner-images/issues/11104) | +| [[Windows] Breaking change : Docker Engine Version 26.* will be updated to Docker Engine Version 27.* from February 07,2025](https://github.com/actions/runner-images/issues/11104) | | [[Windows & Ubuntu] Breaking change : Maven 3.8.* version will be updated to Maven 3.9.* from January 17,2025](https://github.com/actions/runner-images/issues/11093) | | [[Windows & Ubuntu] .NET 7.x will be removed from the images on January 17,2025](https://github.com/actions/runner-images/issues/10894) | -| [[Windows & Ubuntu] Python 3.7.x will be removed from January 10 ,2025](https://github.com/actions/runner-images/issues/10893) | *** # Windows Server 2025 - OS Version: 10.0.26100 Build 2605 -- Image Version: 20250105.1.0 +- Image Version: 20250113.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -23,7 +22,7 @@ - Julia 1.10.5 - Kotlin 2.1.0 - LLVM 19.1.5 -- Node 22.12.0 +- Node 22.13.0 - Perl 5.40.0 - PHP 8.3.15 - Python 3.9.13 @@ -32,14 +31,14 @@ ### Package Management - Chocolatey 2.4.1 - Composer 2.8.4 -- Helm 3.16.3 +- Helm 3.16.4 - Miniconda 24.11.1 (pre-installed on the image but not added to PATH) -- NPM 10.9.0 -- NuGet 6.12.1.1 +- NPM 10.9.2 +- NuGet 6.12.2.1 - pip 24.3.1 (python 3.9) - Pipx 1.7.1 - RubyGems 3.5.22 -- Vcpkg (build from commit 65be70199) +- Vcpkg (build from commit d7112d1a4) - Yarn 1.22.22 #### Environment variables @@ -62,8 +61,8 @@ - Bazelisk 1.25.0 - Bicep 0.32.4 - Cabal 3.14.1.1 -- CMake 3.31.3 -- CodeQL Action Bundle 2.20.0 +- CMake 3.31.4 +- CodeQL Action Bundle 2.20.1 - Docker 26.1.3 - Docker Compose v2 2.27.1 - Docker-wincred 0.8.2 @@ -80,7 +79,7 @@ - Newman 6.2.1 - OpenSSL 3.4.0 - Packer 1.11.2 -- Pulumi 3.144.1 +- Pulumi 3.145.0 - R 4.4.2 - Service Fabric SDK 10.1.2493.9590 - Stack 3.3.1 @@ -92,29 +91,29 @@ - zstd 1.5.6 ### CLI Tools -- AWS CLI 2.22.28 +- AWS CLI 2.22.33 - AWS SAM CLI 1.132.0 - AWS Session Manager CLI 1.2.694.0 - Azure CLI 2.67.0 - Azure DevOps CLI extension 1.0.1 -- GitHub CLI 2.64.0 +- GitHub CLI 2.65.0 ### Rust Tools -- Cargo 1.83.0 -- Rust 1.83.0 -- Rustdoc 1.83.0 +- Cargo 1.84.0 +- Rust 1.84.0 +- Rustdoc 1.84.0 - Rustup 1.27.1 #### Packages -- Clippy 0.1.83 +- Clippy 0.1.84 - Rustfmt 1.8.0 ### Browsers and Drivers -- Google Chrome 131.0.6778.205 -- Chrome Driver 131.0.6778.204 -- Microsoft Edge 131.0.2903.112 -- Microsoft Edge Driver 131.0.2903.112 -- Mozilla Firefox 133.0.3 +- Google Chrome 131.0.6778.265 +- Chrome Driver 131.0.6778.264 +- Microsoft Edge 131.0.2903.146 +- Microsoft Edge Driver 131.0.2903.146 +- Mozilla Firefox 134.0 - Gecko Driver 0.35.0 - IE Driver 4.14.0.0 - Selenium server 4.27.0 @@ -162,7 +161,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Node.js - 18.20.5 - 20.18.1 -- 22.12.0 +- 22.13.0 #### Python - 3.9.13 @@ -205,7 +204,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - MySQL 8.0.40.0 - SQL OLEDB Driver 18.7.4.0 - SQLPS 1.0 -- MongoDB Shell (mongosh) 2.3.7 +- MongoDB Shell (mongosh) 2.3.8 ### Web Servers | Name | Version | ConfigFile | ServiceName | ServiceStatus | ListenPort | @@ -477,18 +476,18 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - Microsoft.AspNetCore.App: 6.0.36, 8.0.6, 8.0.11, 9.0.0 - Microsoft.NETCore.App: 6.0.36, 8.0.6, 8.0.11, 9.0.0 - Microsoft.WindowsDesktop.App: 6.0.36, 8.0.6, 8.0.11, 9.0.0 -- nbgv 3.7.112+63bbe780b0 +- nbgv 3.7.115+d31f50f4d1 ### PowerShell Tools - PowerShell 7.4.6 #### Powershell Modules - Az: 12.4.0 -- AWSPowershell: 4.1.729 +- AWSPowershell: 4.1.734 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.10 - Microsoft.Graph: 2.25.0 -- Pester: 3.4.0, 5.6.1 +- Pester: 3.4.0, 5.7.1 - PowerShellGet: 1.0.0.1, 2.2.5 - PSScriptAnalyzer: 1.23.0 - PSWindowsUpdate: 2.2.1.5 @@ -499,7 +498,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Package Name | Version | | -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 16.0 | -| Android Emulator | 35.2.10 | +| Android Emulator | 35.3.11 | | Android SDK Build-tools | 35.0.0<br>34.0.0 | | Android SDK Platforms | android-35-ext14 (rev 1)<br>android-35 (rev 2)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3) | | Android SDK Platform-Tools | 35.0.2 | From d0ef4c965fc6a368f06e2e314fec80a5bae15a7e Mon Sep 17 00:00:00 2001 From: pravinade <166604853+pravinade@users.noreply.github.com> Date: Thu, 16 Jan 2025 22:42:17 +0530 Subject: [PATCH 3419/3485] [macOS] Update activesupport gem to 7.1.5.1 to unlock cocoapods (#11406) --- images/macos/scripts/build/install-rubygems.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/macos/scripts/build/install-rubygems.sh b/images/macos/scripts/build/install-rubygems.sh index 02caefe0b61f..9ffc348b2441 100644 --- a/images/macos/scripts/build/install-rubygems.sh +++ b/images/macos/scripts/build/install-rubygems.sh @@ -9,8 +9,8 @@ source ~/utils/utils.sh echo "Updating RubyGems..." gem update --system -# Temporarily install activesupport 7.0.8 due to compatibility issues with cocoapods https://github.com/CocoaPods/CocoaPods/issues/12081 -gem install activesupport -v 7.0.8 +# Temporarily install activesupport 7.1.5.1 due to compatibility issues with cocoapods https://github.com/CocoaPods/CocoaPods/issues/12081 +gem install activesupport -v 7.1.5.1 gemsToInstall=$(get_toolset_value '.ruby.rubygems | .[]') if [[ -n $gemsToInstall ]]; then From f27bce403058439317a95d41d8ab9e0fac63b864 Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Thu, 16 Jan 2025 18:43:53 +0100 Subject: [PATCH 3420/3485] Add Windows2025 to GenerateResourcesAndImage.ps1 (#11404) --- docs/create-image-and-azure-resources.md | 2 +- helpers/GenerateResourcesAndImage.ps1 | 14 +++++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/docs/create-image-and-azure-resources.md b/docs/create-image-and-azure-resources.md index 14336728ffec..291789d31a9b 100644 --- a/docs/create-image-and-azure-resources.md +++ b/docs/create-image-and-azure-resources.md @@ -98,7 +98,7 @@ Finally, run the `GenerateResourcesAndImage` function, setting the mandatory arg - `SubscriptionId` - your Azure Subscription ID; - `ResourceGroupName` - the name of the resource group that will be created within your subscription (e.g., "imagegen-test"); - `AzureLocation` - the location where resources will be created (e.g., "East US"); -- `ImageType` - the type of image to build (we suggest choosing "UbuntuMinimal" here; other valid options are "Windows2019", "Windows2022", "Ubuntu2004", "Ubuntu2204"). +- `ImageType` - the type of image to build (we suggest choosing "UbuntuMinimal" here; other valid options are "Windows2019", "Windows2022", "Windows2025", "Ubuntu2004", "Ubuntu2204", "Ubuntu2404"). This function automatically creates all required Azure resources and initiates the Packer image generation for the selected image type. diff --git a/helpers/GenerateResourcesAndImage.ps1 b/helpers/GenerateResourcesAndImage.ps1 index 58e9698f8d26..adda6effb53d 100644 --- a/helpers/GenerateResourcesAndImage.ps1 +++ b/helpers/GenerateResourcesAndImage.ps1 @@ -3,10 +3,11 @@ $ErrorActionPreference = 'Stop' enum ImageType { Windows2019 = 1 Windows2022 = 2 - Ubuntu2004 = 3 - Ubuntu2204 = 4 - Ubuntu2404 = 5 - UbuntuMinimal = 6 + Windows2025 = 3 + Ubuntu2004 = 4 + Ubuntu2204 = 5 + Ubuntu2404 = 6 + UbuntuMinimal = 7 } Function Get-PackerTemplatePath { @@ -25,6 +26,9 @@ Function Get-PackerTemplatePath { ([ImageType]::Windows2022) { $relativeTemplatePath = Join-Path (Join-Path "windows" "templates") "windows-2022.pkr.hcl" } + ([ImageType]::Windows2025) { + $relativeTemplatePath = Join-Path (Join-Path "windows" "templates") "windows-2025.pkr.hcl" + } ([ImageType]::Ubuntu2004) { $relativeTemplatePath = Join-Path (Join-Path "ubuntu" "templates") "ubuntu-20.04.pkr.hcl" } @@ -81,7 +85,7 @@ Function GenerateResourcesAndImage { .PARAMETER ResourceGroupName The name of the resource group to create the Azure resources in. .PARAMETER ImageType - The type of image to generate. Valid values are: Windows2019, Windows2022, Ubuntu2004, Ubuntu2204, UbuntuMinimal. + The type of image to generate. Valid values are: Windows2019, Windows2022, Windows2025, Ubuntu2004, Ubuntu2204, Ubuntu2404, UbuntuMinimal. .PARAMETER ManagedImageName The name of the managed image to create. The default is "Runner-Image-{{ImageType}}". .PARAMETER AzureLocation From 021b320d3b20dca86beecefad94be683d914573d Mon Sep 17 00:00:00 2001 From: kishorekumar-anchala <168699259+kishorekumar-anchala@users.noreply.github.com> Date: Fri, 17 Jan 2025 03:18:51 +0530 Subject: [PATCH 3421/3485] [Windows] Azurerm module version 2.1.0 deprecated (#11398) * remove 2.1.0 deprecated * remove 2.1.0 deprecated * Removed cache versions and EOL versions --- images/windows/toolsets/toolset-2019.json | 11 ++--------- images/windows/toolsets/toolset-2022.json | 11 ++--------- 2 files changed, 4 insertions(+), 18 deletions(-) diff --git a/images/windows/toolsets/toolset-2019.json b/images/windows/toolsets/toolset-2019.json index 42b459946129..a94be5cb06ff 100644 --- a/images/windows/toolsets/toolset-2019.json +++ b/images/windows/toolsets/toolset-2019.json @@ -93,29 +93,22 @@ { "name": "azurerm", "versions": [ - "2.1.0", "6.13.1" ], "zip_versions": [ - "3.8.0", - "4.2.1", - "5.1.1", "6.7.0" ], - "default": "2.1.0" + "default": "6.13.1" }, { "name": "azure", "versions": [ - "2.1.0", "5.3.0" ], "zip_versions": [ - "3.8.0", - "4.2.1", "5.1.1" ], - "default": "2.1.0" + "default": "5.3.0" }, { "name": "az", diff --git a/images/windows/toolsets/toolset-2022.json b/images/windows/toolsets/toolset-2022.json index 280820b87dc9..09c2d314361c 100644 --- a/images/windows/toolsets/toolset-2022.json +++ b/images/windows/toolsets/toolset-2022.json @@ -92,29 +92,22 @@ { "name": "azurerm", "versions": [ - "2.1.0", "6.13.1" ], "zip_versions": [ - "3.8.0", - "4.2.1", - "5.1.1", "6.7.0" ], - "default": "2.1.0" + "default": "6.13.1" }, { "name": "azure", "versions": [ - "2.1.0", "5.3.0" ], "zip_versions": [ - "3.8.0", - "4.2.1", "5.1.1" ], - "default": "2.1.0" + "default": "5.3.0" }, { "name": "az", From af0df299674bc781d6a4f891d9cea62b438e1332 Mon Sep 17 00:00:00 2001 From: aartis17 <aartis17@github.com> Date: Fri, 17 Jan 2025 19:27:32 +0530 Subject: [PATCH 3422/3485] [macOS] Updating TCC DB by adding microphone permissions for provisioner (#11412) --- images/macos/scripts/build/configure-tccdb-macos.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/images/macos/scripts/build/configure-tccdb-macos.sh b/images/macos/scripts/build/configure-tccdb-macos.sh index b9063d038a80..da05b6c658c4 100644 --- a/images/macos/scripts/build/configure-tccdb-macos.sh +++ b/images/macos/scripts/build/configure-tccdb-macos.sh @@ -19,6 +19,7 @@ systemValuesArray=( "'kTCCServiceAccessibility','com.apple.Terminal',0,2,0,1,X'fade0c000000003000000001000000060000000200000012636f6d2e6170706c652e5465726d696e616c000000000003',NULL,NULL,'UNUSED',NULL,0,1591180502" "'kTCCServiceAccessibility','/bin/bash',1,2,0,1,NULL,NULL,NULL,'UNUSED',NULL,0,1583997993" "'kTCCServiceMicrophone','/usr/local/opt/runner/runprovisioner.sh',1,2,0,1,NULL,NULL,NULL,'UNUSED',NULL,NULL,1576661342" + "'kTCCServiceMicrophone','/usr/local/opt/runner/provisioner/provisioner',1,2,4,1,NULL,NULL,NULL,'UNUSED',NULL,NULL,1736467200" "'kTCCServiceScreenCapture','/bin/bash',1,2,0,1,NULL,NULL,NULL,'UNUSED',NULL,0,1599831148" "'kTCCServiceScreenCapture','com.devexpress.testcafe-browser-tools',0,2,3,1,X'fade0c0000000068000000010000000700000007000000080000001443fa4ca5141baeda21aeca1f50894673b440d4690000000800000014f8afcf6e69791b283e55bd0b03e39e422745770e0000000800000014bf4fc1aed64c871a49fc6bc9dd3878ce5d4d17c6',NULL,0,'UNUSED',NULL,0,1687952810" "'kTCCServicePostEvent','/Library/Application Support/Veertu/Anka/addons/ankarund',1,2,4,1,NULL,NULL,0,'UNUSED',NULL,0,1644565949" @@ -54,6 +55,7 @@ userValuesArray=( "'kTCCServiceAppleEvents','/bin/bash',1,2,0,1,NULL,NULL,0,'com.apple.finder',NULL,NULL,1592919552" "'kTCCServiceMicrophone','com.apple.CoreSimulator.SimulatorTrampoline',0,2,0,1,NULL,NULL,NULL,'UNUSED',NULL,NULL,1576347152" "'kTCCServiceMicrophone','/usr/local/opt/runner/runprovisioner.sh',1,2,0,1,NULL,NULL,NULL,'UNUSED',NULL,NULL,1576661342" + "'kTCCServiceMicrophone','/usr/local/opt/runner/provisioner/provisioner',1,2,4,1,NULL,NULL,NULL,'UNUSED',NULL,NULL,1736467200" "'kTCCServiceUbiquity','/System/Library/PrivateFrameworks/PhotoLibraryServices.framework/Versions/A/Support/photolibraryd',1,2,5,1,NULL,NULL,NULL,'UNUSED',NULL,0,1619461750" "'kTCCServiceUbiquity','com.apple.PassKitCore',0,2,5,1,NULL,NULL,NULL,'UNUSED',NULL,0,1619516250" "'kTCCServiceAppleEvents','/Library/Application Support/Veertu/Anka/addons/ankarund',1,2,3,1,NULL,NULL,0,'com.apple.finder',X'fade0c000000002c00000001000000060000000200000010636f6d2e6170706c652e66696e64657200000003',NULL,1629294900" From ee530b00e3f8c55eb4cddb7183745cf77a15f5b7 Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Mon, 20 Jan 2025 11:12:30 +0100 Subject: [PATCH 3423/3485] [windows] Update Get-WindowsUpdateStates function (#11397) --- images/windows/scripts/helpers/InstallHelpers.ps1 | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/images/windows/scripts/helpers/InstallHelpers.ps1 b/images/windows/scripts/helpers/InstallHelpers.ps1 index 67faade1d2a5..6ccba1178337 100644 --- a/images/windows/scripts/helpers/InstallHelpers.ps1 +++ b/images/windows/scripts/helpers/InstallHelpers.ps1 @@ -438,13 +438,15 @@ function Get-WindowsUpdateStates { 19 { $state = "Installed" $title = $event.Properties[0].Value - $completedUpdates[$title] = "" + $completedUpdates[$title] = $state break } 20 { $state = "Failed" $title = $event.Properties[1].Value - $completedUpdates[$title] = "" + if (-not $completedUpdates.ContainsKey($title)) { + $completedUpdates[$title] = $state + } break } 43 { @@ -454,8 +456,13 @@ function Get-WindowsUpdateStates { } } - # Skip update started event if it was already completed - if ( $state -eq "Running" -and $completedUpdates.ContainsKey($title) ) { + # Skip Running update event if it was already completed + if ( ($state -eq "Running") -and $completedUpdates.ContainsKey($title) ) { + continue + } + + # Skip Failed update event if it was already successfully installed + if ( ($state -eq "Failed") -and $completedUpdates[$title] -eq "Installed" ) { continue } From c21e3961c52a5611ee44c3d33b1b11ac7a4636b7 Mon Sep 17 00:00:00 2001 From: kishorekumar-anchala <168699259+kishorekumar-anchala@users.noreply.github.com> Date: Mon, 20 Jan 2025 21:20:33 +0530 Subject: [PATCH 3424/3485] [Ubuntu] Fix minikube failure on ubuntu images (#11429) * Fix minqube installation * Fix minqube installation --- images/ubuntu/scripts/build/install-kubernetes-tools.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/images/ubuntu/scripts/build/install-kubernetes-tools.sh b/images/ubuntu/scripts/build/install-kubernetes-tools.sh index 90f68fedc6c1..42c484a0d686 100644 --- a/images/ubuntu/scripts/build/install-kubernetes-tools.sh +++ b/images/ubuntu/scripts/build/install-kubernetes-tools.sh @@ -30,11 +30,12 @@ rm -f /etc/apt/sources.list.d/kubernetes.list # Install Helm curl -fsSL https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3 | bash +# Temporarily pinning the version # Download minikube -curl -fsSL -O https://storage.googleapis.com/minikube/releases/latest/minikube-linux-amd64 +curl -fsSL -O https://storage.googleapis.com/minikube/releases/v1.34.0/minikube-linux-amd64 # Supply chain security - minikube -minikube_hash=$(get_checksum_from_github_release "kubernetes/minikube" "linux-amd64" "latest" "SHA256") +minikube_hash=$(get_checksum_from_github_release "kubernetes/minikube" "linux-amd64" "1.34.0" "SHA256") use_checksum_comparison "minikube-linux-amd64" "${minikube_hash}" # Install minikube From 085d14e7de0a7717dd3f259f4a710ff502e45858 Mon Sep 17 00:00:00 2001 From: sureshe456 <160699174+sureshe456@users.noreply.github.com> Date: Tue, 21 Jan 2025 21:08:03 +0530 Subject: [PATCH 3425/3485] [macOS] Fix iOS18.2 for Xcode 16.2 on macOS 14 (#11447) --- images/macos/toolsets/toolset-14.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/macos/toolsets/toolset-14.json b/images/macos/toolsets/toolset-14.json index 262e33d8d312..68b29e498c5a 100644 --- a/images/macos/toolsets/toolset-14.json +++ b/images/macos/toolsets/toolset-14.json @@ -3,7 +3,7 @@ "default": "15.4", "x64": { "versions": [ - { "link": "16.2", "version": "16.2+16C5032a", "install_runtimes": ["iOS", "watchOS", "tvOS"], "sha256": "0e367d06eb7c334ea143bada5e4422f56688aabff571bedf0d2ad9434b7290de"}, + { "link": "16.2", "version": "16.2+16C5032a", "runtimes": ["iOS", "watchOS", "tvOS"], "sha256": "0e367d06eb7c334ea143bada5e4422f56688aabff571bedf0d2ad9434b7290de"}, { "link": "16.1", "version": "16.1+16B40", "runtimes": ["iOS", "watchOS", "tvOS"], "sha256": "8ca961d55981f983d21b99a95a6b0ac04905b837f6e11346ee86d28f12afe720"}, { "link": "15.4", "version": "15.4.0+15F31d", "install_runtimes": "true", "sha256": "82d3d61804ff3f4c7c82085e91dc701037ddaa770e542848b2477e22f4e8aa7a"}, { "link": "15.3", "version": "15.3.0+15E204a", "install_runtimes": "true", "sha256": "f13f6a2e2df432c3008e394640b8549a18c285acd7fd148d6c4bac8c3a5af234"}, @@ -14,7 +14,7 @@ }, "arm64":{ "versions": [ - { "link": "16.2", "version": "16.2+16C5032a", "install_runtimes": ["iOS", "watchOS", "tvOS"], "sha256": "0e367d06eb7c334ea143bada5e4422f56688aabff571bedf0d2ad9434b7290de"}, + { "link": "16.2", "version": "16.2+16C5032a", "runtimes": ["iOS", "watchOS", "tvOS"], "sha256": "0e367d06eb7c334ea143bada5e4422f56688aabff571bedf0d2ad9434b7290de"}, { "link": "16.1", "version": "16.1+16B40", "runtimes": ["iOS", "watchOS", "tvOS"], "sha256": "8ca961d55981f983d21b99a95a6b0ac04905b837f6e11346ee86d28f12afe720"}, { "link": "15.4", "version": "15.4.0+15F31d", "install_runtimes": "true", "sha256": "82d3d61804ff3f4c7c82085e91dc701037ddaa770e542848b2477e22f4e8aa7a"}, { "link": "15.3", "version": "15.3.0+15E204a", "install_runtimes": "true", "sha256": "f13f6a2e2df432c3008e394640b8549a18c285acd7fd148d6c4bac8c3a5af234"}, From 727faa300ea53b3103469808354d355bbed99421 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 22 Jan 2025 12:26:19 +0000 Subject: [PATCH 3426/3485] Updating readme file for macos-15 version 20250120.591 (#11426) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-15-Readme.md | 74 ++++++++++++++++----------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/images/macos/macos-15-Readme.md b/images/macos/macos-15-Readme.md index 2fc86d14233d..f4985f3e2f66 100644 --- a/images/macos/macos-15-Readme.md +++ b/images/macos/macos-15-Readme.md @@ -7,12 +7,12 @@ # macOS 15 - OS Version: macOS 15.2 (24C101) - Kernel Version: Darwin 24.2.0 -- Image Version: 20250113.570 +- Image Version: 20250120.591 ## Installed Software ### Language and Runtime -- .NET Core SDK: 8.0.101, 8.0.204, 8.0.303, 8.0.404, 9.0.101 +- .NET Core SDK: 8.0.101, 8.0.204, 8.0.303, 8.0.405, 9.0.102 - Bash 3.2.57(1)-release - Clang/LLVM 15.0.0 - Clang/LLVM (Homebrew) 18.1.8 - available on `$(brew --prefix llvm@18)/bin/clang` @@ -24,21 +24,21 @@ - GNU Fortran 14 (Homebrew GCC 14.2.0_1) - available by `gfortran-14` alias - Kotlin 2.1.0-release-394 - Node.js 22.13.0 -- Perl 5.40.0 -- PHP 8.4.2 +- Perl 5.40.1 +- PHP 8.4.3 - Python3 3.13.1 -- Ruby 3.3.6 +- Ruby 3.3.7 ### Package Management -- Bundler 2.6.2 +- Bundler 2.6.3 - Carthage 0.40.0 - CocoaPods 1.16.2 - Composer 2.8.4 -- Homebrew 4.4.15 +- Homebrew 4.4.16 - NPM 10.9.2 - Pip3 24.3.1 (python 3.13) - Pipx 1.7.1 -- RubyGems 3.6.2 +- RubyGems 3.6.3 - Yarn 1.22.22 ### Project Management @@ -50,12 +50,12 @@ - 7-Zip 17.05 - aria2 1.37.0 - azcopy 10.27.1 -- bazel 8.0.0 +- bazel 8.0.1 - bazelisk 1.25.0 - bsdtar 3.5.3 - available by 'tar' alias - Curl 8.11.1 -- Git 2.48.0 -- Git LFS 3.6.0 +- Git 2.48.1 +- Git LFS 3.6.1 - GitHub CLI 2.65.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.25.0 @@ -69,10 +69,10 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.22.33 +- AWS CLI 2.23.2 - AWS SAM CLI 1.132.0 - AWS Session Manager CLI 1.2.694.0 -- Azure CLI 2.67.0 +- Azure CLI 2.68.0 - Azure CLI (azure-devops) 1.0.1 - Bicep CLI 0.32.4 - Cmake 3.31.4 @@ -84,17 +84,17 @@ - Xcodes 1.6.0 ### Linters -- SwiftLint 0.58.0 +- SwiftLint 0.58.2 ### Browsers - Safari 18.2 (20620.1.16.11.8) - SafariDriver 18.2 (20620.1.16.11.8) -- Google Chrome 131.0.6778.265 -- Google Chrome for Testing 131.0.6778.264 -- ChromeDriver 131.0.6778.264 -- Microsoft Edge 131.0.2903.147 -- Microsoft Edge WebDriver 131.0.2903.112 -- Mozilla Firefox 134.0 +- Google Chrome 132.0.6834.84 +- Google Chrome for Testing 132.0.6834.83 +- ChromeDriver 132.0.6834.83 +- Microsoft Edge 132.0.2957.115 +- Microsoft Edge WebDriver 132.0.2957.115 +- Mozilla Firefox 134.0.1 - geckodriver 0.35.0 - Selenium server 4.27.0 @@ -117,7 +117,7 @@ #### Ruby - 3.1.6 - 3.2.6 -- 3.3.6 +- 3.3.7 - 3.4.1 #### Python @@ -194,8 +194,8 @@ | Simulator - watchOS 11.0 | watchsimulator11.0 | 16.0 | | Simulator - watchOS 11.1 | watchsimulator11.1 | 16.1 | | Simulator - watchOS 11.2 | watchsimulator11.2 | 16.2 | -| visionOS 1.2 | xros1.2 | 15.4 | | Simulator - visionOS 1.2 | xrsimulator1.2 | 15.4 | +| visionOS 1.2 | xros1.2 | 15.4 | | visionOS 2.0 | xros2.0 | 16.0 | | Simulator - visionOS 2.0 | xrsimulator2.0 | 16.0 | | Simulator - visionOS 2.1 | xrsimulator2.1 | 16.1 | @@ -208,27 +208,27 @@ | DriverKit 24.2 | driverkit24.2 | 16.2 | #### Installed Simulators -| OS | Simulators | -| ------------ | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| iOS 17.5 | iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | -| iOS 18.0 | iPhone 16<br>iPhone 16 Plus<br>iPhone 16 Pro<br>iPhone 16 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | -| iOS 18.1 | iPhone 16<br>iPhone 16 Plus<br>iPhone 16 Pro<br>iPhone 16 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (A17 Pro)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | -| iOS 18.2 | iPhone 16<br>iPhone 16 Plus<br>iPhone 16 Pro<br>iPhone 16 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (A17 Pro)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | -| tvOS 17.5 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 18.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 18.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 18.2 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| watchOS 10.5 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra 2 (49mm) | -| watchOS 11.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 10 (42mm)<br>Apple Watch Series 10 (46mm)<br>Apple Watch Ultra 2 (49mm) | -| watchOS 11.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 10 (42mm)<br>Apple Watch Series 10 (46mm)<br>Apple Watch Ultra 2 (49mm) | -| watchOS 11.2 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 10 (42mm)<br>Apple Watch Series 10 (46mm)<br>Apple Watch Ultra 2 (49mm) | +| OS | Simulators | +| ------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| iOS 17.5 | iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | +| iOS 18.0 | iPhone 16<br>iPhone 16 Plus<br>iPhone 16 Pro<br>iPhone 16 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | +| iOS 18.1 | iPhone 16<br>iPhone 16 Plus<br>iPhone 16 Pro<br>iPhone 16 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (A17 Pro)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | +| iOS 18.2 | iPhone 16<br>iPhone 16 Plus<br>iPhone 16 Pro<br>iPhone 16 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (A17 Pro)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | +| tvOS 17.5 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 18.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 18.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 18.2 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| watchOS 10.5 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 11.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 10 (42mm)<br>Apple Watch Series 10 (46mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 11.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 10 (42mm)<br>Apple Watch Series 10 (46mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 11.2 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 10 (42mm)<br>Apple Watch Series 10 (46mm)<br>Apple Watch Ultra 2 (49mm) | ### Android | Package Name | Version | | -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 16.0 | | Android Emulator | 35.3.11 | -| Android SDK Build-tools | 35.0.0 | +| Android SDK Build-tools | 35.0.0 35.0.1 | | Android SDK Platforms | android-35-ext14 (rev 1)<br>android-35 (rev 2)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1) | | Android SDK Platform-Tools | 35.0.2 | | Android Support Repository | 47.0.0 | From ee9c567442ea6e0abef8e91736ee4c6401e50841 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 22 Jan 2025 13:27:05 +0000 Subject: [PATCH 3427/3485] Updating readme file for macos-13-arm64 version 20250120.653 (#11427) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-13-arm64-Readme.md | 28 +++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/images/macos/macos-13-arm64-Readme.md b/images/macos/macos-13-arm64-Readme.md index 058265b7ba89..c782f0ee2454 100644 --- a/images/macos/macos-13-arm64-Readme.md +++ b/images/macos/macos-13-arm64-Readme.md @@ -7,12 +7,12 @@ # macOS 13 - OS Version: macOS 13.7.2 (22H313) - Kernel Version: Darwin 22.6.0 -- Image Version: 20250113.628 +- Image Version: 20250120.653 ## Installed Software ### Language and Runtime -- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.410, 8.0.101, 8.0.204, 8.0.303, 8.0.404, 9.0.101 +- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.410, 8.0.101, 8.0.204, 8.0.303, 8.0.405, 9.0.102 - Bash 3.2.57(1)-release - Clang/LLVM 14.0.0 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` @@ -25,7 +25,7 @@ - Kotlin 2.1.0-release-394 - Mono 6.12.0.188 - Node.js 20.18.1 -- Perl 5.40.0 +- Perl 5.40.1 - Python3 3.13.1 - Ruby 3.0.7p220 @@ -33,7 +33,7 @@ - Bundler 2.5.23 - Carthage 0.40.0 - CocoaPods 1.16.2 -- Homebrew 4.4.15 +- Homebrew 4.4.16 - NPM 10.8.2 - NuGet 6.3.1.1 - Pip3 24.3.1 (python 3.13) @@ -50,12 +50,12 @@ - 7-Zip 17.05 - aria2 1.37.0 - azcopy 10.27.1 -- bazel 8.0.0 +- bazel 8.0.1 - bazelisk 1.25.0 - bsdtar 3.5.3 - available by 'tar' alias - Curl 8.7.1 -- Git 2.48.0 -- Git LFS 3.6.0 +- Git 2.48.1 +- Git LFS 3.6.1 - GitHub CLI 2.65.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.25.0 @@ -69,10 +69,10 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.22.33 +- AWS CLI 2.23.2 - AWS SAM CLI 1.132.0 - AWS Session Manager CLI 1.2.694.0 -- Azure CLI 2.67.0 +- Azure CLI 2.68.0 - Azure CLI (azure-devops) 1.0.1 - Bicep CLI 0.32.4 - Cmake 3.31.4 @@ -88,9 +88,9 @@ ### Browsers - Safari 18.2 (18620.1.16.111.6) - SafariDriver 18.2 (18620.1.16.111.6) -- Google Chrome 131.0.6778.265 -- Google Chrome for Testing 131.0.6778.264 -- ChromeDriver 131.0.6778.264 +- Google Chrome 132.0.6834.84 +- Google Chrome for Testing 132.0.6834.83 +- ChromeDriver 132.0.6834.83 - Selenium server 4.27.0 #### Environment variables @@ -113,7 +113,7 @@ - 3.0.7 - 3.1.6 - 3.2.6 -- 3.3.6 +- 3.3.7 - 3.4.1 #### Python @@ -227,7 +227,7 @@ | -------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 11.0 | | Android Emulator | 35.3.11 | -| Android SDK Build-tools | 35.0.0<br>34.0.0<br>33.0.2 33.0.3 | +| Android SDK Build-tools | 35.0.0 35.0.1<br>34.0.0<br>33.0.2 33.0.3 | | Android SDK Platforms | android-35-ext14 (rev 1)<br>android-35 (rev 2)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | | Android SDK Platform-Tools | 35.0.2 | | Android Support Repository | 47.0.0 | From cd2ebf2962a62a32f69047b53dd63eb1885feb7d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 22 Jan 2025 14:38:28 +0000 Subject: [PATCH 3428/3485] Updating readme file for macos-13 version 20250120.597 (#11428) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-13-Readme.md | 40 ++++++++++++++++----------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/images/macos/macos-13-Readme.md b/images/macos/macos-13-Readme.md index 00ec45156b4b..0a54e2711943 100644 --- a/images/macos/macos-13-Readme.md +++ b/images/macos/macos-13-Readme.md @@ -7,12 +7,12 @@ # macOS 13 - OS Version: macOS 13.7.2 (22H313) - Kernel Version: Darwin 22.6.0 -- Image Version: 20250113.572 +- Image Version: 20250120.597 ## Installed Software ### Language and Runtime -- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.410, 8.0.101, 8.0.204, 8.0.303, 8.0.404, 9.0.101 +- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.410, 8.0.101, 8.0.204, 8.0.303, 8.0.405, 9.0.102 - Bash 3.2.57(1)-release - Clang/LLVM 14.0.0 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` @@ -25,8 +25,8 @@ - Kotlin 2.1.0-release-394 - Mono 6.12.0.188 - Node.js 20.18.1 -- Perl 5.40.0 -- PHP 8.4.2 +- Perl 5.40.1 +- PHP 8.4.3 - Python3 3.13.1 - Ruby 3.0.7p220 @@ -35,13 +35,13 @@ - Carthage 0.40.0 - CocoaPods 1.16.2 - Composer 2.8.4 -- Homebrew 4.4.15 +- Homebrew 4.4.16 - NPM 10.8.2 - NuGet 6.3.1.1 - Pip3 24.3.1 (python 3.13) - Pipx 1.7.1 - RubyGems 3.5.23 -- Vcpkg 2024 (build from commit d7112d1a4) +- Vcpkg 2025 (build from commit cf035d991) - Yarn 1.22.22 ### Project Management @@ -53,12 +53,12 @@ - 7-Zip 17.05 - aria2 1.37.0 - azcopy 10.27.1 -- bazel 8.0.0 +- bazel 8.0.1 - bazelisk 1.25.0 - bsdtar 3.5.3 - available by 'tar' alias - Curl 8.11.1 -- Git 2.48.0 -- Git LFS 3.6.0 +- Git 2.48.1 +- Git LFS 3.6.1 - GitHub CLI 2.65.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.25.0 @@ -72,10 +72,10 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.22.33 +- AWS CLI 2.23.2 - AWS SAM CLI 1.132.0 - AWS Session Manager CLI 1.2.694.0 -- Azure CLI 2.67.0 +- Azure CLI 2.68.0 - Azure CLI (azure-devops) 1.0.1 - Bicep CLI 0.32.4 - Cmake 3.31.4 @@ -87,17 +87,17 @@ - Xcodes 1.6.0 ### Linters -- SwiftLint 0.58.0 +- SwiftLint 0.58.2 ### Browsers - Safari 18.2 (18620.1.16.111.6) - SafariDriver 18.2 (18620.1.16.111.6) -- Google Chrome 131.0.6778.265 -- Google Chrome for Testing 131.0.6778.264 -- ChromeDriver 131.0.6778.264 -- Microsoft Edge 131.0.2903.147 -- Microsoft Edge WebDriver 131.0.2903.112 -- Mozilla Firefox 134.0 +- Google Chrome 132.0.6834.84 +- Google Chrome for Testing 132.0.6834.83 +- ChromeDriver 132.0.6834.83 +- Microsoft Edge 132.0.2957.115 +- Microsoft Edge WebDriver 132.0.2957.115 +- Mozilla Firefox 134.0.1 - geckodriver 0.35.0 - Selenium server 4.27.0 @@ -129,7 +129,7 @@ - 3.0.7 - 3.1.6 - 3.2.6 -- 3.3.6 +- 3.3.7 - 3.4.1 #### Python @@ -245,7 +245,7 @@ | -------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 11.0 | | Android Emulator | 35.3.11 | -| Android SDK Build-tools | 35.0.0<br>34.0.0<br>33.0.2 33.0.3 | +| Android SDK Build-tools | 35.0.0 35.0.1<br>34.0.0<br>33.0.2 33.0.3 | | Android SDK Platforms | android-35-ext14 (rev 1)<br>android-35 (rev 2)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | | Android SDK Platform-Tools | 35.0.2 | | Android Support Repository | 47.0.0 | From 37aecb00285edbd726ecb46ca33b884a378da909 Mon Sep 17 00:00:00 2001 From: vidyasagarnimmagaddi <160703874+vidyasagarnimmagaddi@users.noreply.github.com> Date: Wed, 22 Jan 2025 21:27:31 +0530 Subject: [PATCH 3429/3485] [Ubuntu & Windows] Adding Python 3.13 version (#11438) Co-authored-by: James Knight <jdknight@users.noreply.github.com> --- images/ubuntu/toolsets/toolset-2004.json | 3 ++- images/ubuntu/toolsets/toolset-2204.json | 3 ++- images/ubuntu/toolsets/toolset-2404.json | 3 ++- images/windows/toolsets/toolset-2019.json | 6 ++++-- images/windows/toolsets/toolset-2022.json | 6 ++++-- 5 files changed, 14 insertions(+), 7 deletions(-) diff --git a/images/ubuntu/toolsets/toolset-2004.json b/images/ubuntu/toolsets/toolset-2004.json index e96d97b2b846..ec5480320032 100644 --- a/images/ubuntu/toolsets/toolset-2004.json +++ b/images/ubuntu/toolsets/toolset-2004.json @@ -11,7 +11,8 @@ "3.9.*", "3.10.*", "3.11.*", - "3.12.*" + "3.12.*", + "3.13.*" ] }, { diff --git a/images/ubuntu/toolsets/toolset-2204.json b/images/ubuntu/toolsets/toolset-2204.json index 8c5b9090a2d4..6a56244932c9 100644 --- a/images/ubuntu/toolsets/toolset-2204.json +++ b/images/ubuntu/toolsets/toolset-2204.json @@ -11,7 +11,8 @@ "3.9.*", "3.10.*", "3.11.*", - "3.12.*" + "3.12.*", + "3.13.*" ] }, { diff --git a/images/ubuntu/toolsets/toolset-2404.json b/images/ubuntu/toolsets/toolset-2404.json index cf732f67c1bd..41de91cfeb3e 100644 --- a/images/ubuntu/toolsets/toolset-2404.json +++ b/images/ubuntu/toolsets/toolset-2404.json @@ -10,7 +10,8 @@ "3.9.*", "3.10.*", "3.11.*", - "3.12.*" + "3.12.*", + "3.13.*" ] }, { diff --git a/images/windows/toolsets/toolset-2019.json b/images/windows/toolsets/toolset-2019.json index 367233c60084..f73ad65ae5d0 100644 --- a/images/windows/toolsets/toolset-2019.json +++ b/images/windows/toolsets/toolset-2019.json @@ -21,7 +21,8 @@ "3.9.*", "3.10.*", "3.11.*", - "3.12.*" + "3.12.*", + "3.13.*" ], "default": "3.9.*" }, @@ -35,7 +36,8 @@ "3.9.*", "3.10.*", "3.11.*", - "3.12.*" + "3.12.*", + "3.13.*" ] }, { diff --git a/images/windows/toolsets/toolset-2022.json b/images/windows/toolsets/toolset-2022.json index 547382a71c72..4b1ccda1550a 100644 --- a/images/windows/toolsets/toolset-2022.json +++ b/images/windows/toolsets/toolset-2022.json @@ -21,7 +21,8 @@ "3.9.*", "3.10.*", "3.11.*", - "3.12.*" + "3.12.*", + "3.13.*" ], "default": "3.9.*" }, @@ -35,7 +36,8 @@ "3.9.*", "3.10.*", "3.11.*", - "3.12.*" + "3.12.*", + "3.13.*" ] }, { From c9859b2db378224f4d7c5bb5b5cf5a0dae950e58 Mon Sep 17 00:00:00 2001 From: Ikko Eltociear Ashimine <eltociear@gmail.com> Date: Thu, 23 Jan 2025 02:20:34 +0900 Subject: [PATCH 3430/3485] [ubuntu] Update etc-environment.sh (#10344) containg -> containing --- images/ubuntu/scripts/helpers/etc-environment.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/ubuntu/scripts/helpers/etc-environment.sh b/images/ubuntu/scripts/helpers/etc-environment.sh index 6ffafd01c614..7a235b784cc0 100644 --- a/images/ubuntu/scripts/helpers/etc-environment.sh +++ b/images/ubuntu/scripts/helpers/etc-environment.sh @@ -5,7 +5,7 @@ ################################################################################ # NB: sed expression use '%' as a delimiter in order to simplify handling -# values containg slashes (i.e. directory path) +# values containing slashes (i.e. directory path) # The values containing '%' will break the functions get_etc_environment_variable() { From f12b993a3aac70db2c9f881e7e904c0a045e9175 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 22 Jan 2025 17:57:32 +0000 Subject: [PATCH 3431/3485] Updating readme file for macos-14-arm64 version 20250120.774 (#11430) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-14-arm64-Readme.md | 32 +++++++++++++-------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/images/macos/macos-14-arm64-Readme.md b/images/macos/macos-14-arm64-Readme.md index 26bdefb41079..9bebe8219176 100644 --- a/images/macos/macos-14-arm64-Readme.md +++ b/images/macos/macos-14-arm64-Readme.md @@ -7,12 +7,12 @@ # macOS 14 - OS Version: macOS 14.7.2 (23H311) - Kernel Version: Darwin 23.6.0 -- Image Version: 20250113.751 +- Image Version: 20250120.774 ## Installed Software ### Language and Runtime -- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.410, 8.0.101, 8.0.204, 8.0.303, 8.0.404, 9.0.101 +- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.410, 8.0.101, 8.0.204, 8.0.303, 8.0.405, 9.0.102 - Bash 3.2.57(1)-release - Clang/LLVM 15.0.0 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` @@ -25,7 +25,7 @@ - Kotlin 2.1.0-release-394 - Mono 6.12.0.188 - Node.js 20.18.1 -- Perl 5.40.0 +- Perl 5.40.1 - Python3 3.13.1 - Ruby 3.0.7p220 @@ -33,7 +33,7 @@ - Bundler 2.5.23 - Carthage 0.40.0 - CocoaPods 1.16.2 -- Homebrew 4.4.15 +- Homebrew 4.4.16 - NPM 10.8.2 - NuGet 6.3.1.1 - Pip3 24.3.1 (python 3.13) @@ -50,12 +50,12 @@ - 7-Zip 17.05 - aria2 1.37.0 - azcopy 10.27.1 -- bazel 8.0.0 +- bazel 8.0.1 - bazelisk 1.25.0 - bsdtar 3.5.3 - available by 'tar' alias - Curl 8.7.1 -- Git 2.48.0 -- Git LFS 3.6.0 +- Git 2.48.1 +- Git LFS 3.6.1 - GitHub CLI 2.65.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.25.0 @@ -69,10 +69,10 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.22.33 +- AWS CLI 2.23.2 - AWS SAM CLI 1.132.0 - AWS Session Manager CLI 1.2.694.0 -- Azure CLI 2.67.0 +- Azure CLI 2.68.0 - Azure CLI (azure-devops) 1.0.1 - Bicep CLI 0.32.4 - Cmake 3.31.4 @@ -88,9 +88,9 @@ ### Browsers - Safari 18.2 (19620.1.16.111.6) - SafariDriver 18.2 (19620.1.16.111.6) -- Google Chrome 131.0.6778.265 -- Google Chrome for Testing 131.0.6778.264 -- ChromeDriver 131.0.6778.264 +- Google Chrome 132.0.6834.84 +- Google Chrome for Testing 132.0.6834.83 +- ChromeDriver 132.0.6834.83 - Selenium server 4.27.0 #### Environment variables @@ -113,7 +113,7 @@ - 3.0.7 - 3.1.6 - 3.2.6 -- 3.3.6 +- 3.3.7 - 3.4.1 #### Python @@ -211,10 +211,10 @@ | visionOS 1.1 | xros1.1 | 15.3 | | visionOS 1.2 | xros1.2 | 15.4 | | Simulator - visionOS 1.2 | xrsimulator1.2 | 15.4 | -| Simulator - visionOS 2.1 | xrsimulator2.1 | 16.1 | | visionOS 2.1 | xros2.1 | 16.1 | -| visionOS 2.2 | xros2.2 | 16.2 | +| Simulator - visionOS 2.1 | xrsimulator2.1 | 16.1 | | Simulator - visionOS 2.2 | xrsimulator2.2 | 16.2 | +| visionOS 2.2 | xros2.2 | 16.2 | | DriverKit 23.0 | driverkit23.0 | 15.0.1 | | DriverKit 23.2 | driverkit23.2 | 15.1, 15.2 | | DriverKit 23.4 | driverkit23.4 | 15.3 | @@ -249,7 +249,7 @@ | -------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 11.0 | | Android Emulator | 35.3.11 | -| Android SDK Build-tools | 35.0.0<br>34.0.0<br>33.0.2 33.0.3 | +| Android SDK Build-tools | 35.0.0 35.0.1<br>34.0.0<br>33.0.2 33.0.3 | | Android SDK Platforms | android-35-ext14 (rev 1)<br>android-35 (rev 2)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | | Android SDK Platform-Tools | 35.0.2 | | Android Support Repository | 47.0.0 | From 9303ddeb0cd4899812a8fbfdf19e64dc0319bfe5 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 23 Jan 2025 11:43:45 +0000 Subject: [PATCH 3432/3485] Updating readme file for ubuntu22 version 20250120.2.1 (#11441) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2204-Readme.md | 114 ++++++++++++++--------------- 1 file changed, 56 insertions(+), 58 deletions(-) diff --git a/images/ubuntu/Ubuntu2204-Readme.md b/images/ubuntu/Ubuntu2204-Readme.md index 842a636e8219..54854e66c925 100644 --- a/images/ubuntu/Ubuntu2204-Readme.md +++ b/images/ubuntu/Ubuntu2204-Readme.md @@ -1,13 +1,11 @@ | Announcements | |-| -| [[Windows & Ubuntu] Breaking change : Maven 3.8.* version will be updated to Maven 3.9.* from January 10,2025](https://github.com/actions/runner-images/issues/11093) | -| [[Ubuntu] Breaking Change: runner user will have UID 1001 instead of 1000 for larger runners](https://github.com/actions/runner-images/issues/10936) | -| [Ubuntu-latest workflows will use Ubuntu-24.04 image](https://github.com/actions/runner-images/issues/10636) | +| [[Windows & Ubuntu] Breaking change : Maven 3.8.* version will be updated to Maven 3.9.* from January 17,2025](https://github.com/actions/runner-images/issues/11093) | *** # Ubuntu 22.04 - OS Version: 22.04.5 LTS - Kernel Version: 6.5.0-1025-azure -- Image Version: 20250105.1.0 +- Image Version: 20250120.2.0 - Systemd version: 249.11-0ubuntu3.12 ## Installed Software @@ -32,8 +30,8 @@ ### Package Management - cpan 1.64 -- Helm 3.16.4 -- Homebrew 4.4.14 +- Helm 3.17.0 +- Homebrew 4.4.17 - Miniconda 24.11.1 - Npm 10.8.2 - NuGet 6.6.1.2 @@ -41,7 +39,7 @@ - Pip3 22.0.2 - Pipx 1.7.1 - RubyGems 3.3.5 -- Vcpkg (build from commit 65be70199) +- Vcpkg (build from commit cf035d991) - Yarn 1.22.22 #### Environment variables @@ -62,34 +60,34 @@ to accomplish this. - Ant 1.10.12 - Gradle 8.12 - Lerna 8.1.9 -- Maven 3.8.8 +- Maven 3.9.9 - Sbt 1.10.7 ### Tools - Ansible 2.17.7 - apt-fast 1.10.0 - AzCopy 10.27.1 - available by `azcopy` and `azcopy10` aliases -- Bazel 8.0.0 +- Bazel 8.0.1 - Bazelisk 1.25.0 - Bicep 0.32.4 - Buildah 1.23.1 -- CMake 3.31.3 -- CodeQL Action Bundle 2.20.0 +- CMake 3.31.4 +- CodeQL Action Bundle 2.20.1 - Docker Amazon ECR Credential Helper 0.9.0 - Docker Compose v2 2.27.1 -- Docker-Buildx 0.19.3 +- Docker-Buildx 0.20.0 - Docker Client 26.1.3 - Docker Server 26.1.3 - Fastlane 2.226.0 -- Git 2.47.1 -- Git LFS 3.6.0 +- Git 2.48.1 +- Git LFS 3.6.1 - Git-ftp 1.6.0 - Haveged 1.9.14 -- Heroku 10.0.0 +- Heroku 10.0.2 - jq 1.6 - Kind 0.26.0 -- Kubectl 1.32.0 -- Kustomize 5.5.0 +- Kubectl 1.32.1 +- Kustomize 5.6.0 - Leiningen 2.11.2 - MediaInfo 21.09 - Mercurial 6.1.1 @@ -101,29 +99,29 @@ to accomplish this. - Packer 1.11.2 - Parcel 2.13.3 - Podman 3.4.4 -- Pulumi 3.144.1 +- Pulumi 3.146.0 - R 4.4.2 - Skopeo 1.4.1 - Sphinx Open Source Search Server 2.2.11 - SVN 1.14.1 -- Terraform 1.10.3 +- Terraform 1.10.4 - yamllint 1.35.1 -- yq 4.44.6 +- yq 4.45.1 - zstd 1.5.6 ### CLI Tools -- Alibaba Cloud CLI 3.0.244 -- AWS CLI 2.22.28 +- Alibaba Cloud CLI 3.0.248 +- AWS CLI 2.23.2 - AWS CLI Session Manager Plugin 1.2.694.0 - AWS SAM CLI 1.132.0 -- Azure CLI 2.67.0 +- Azure CLI 2.68.0 - Azure CLI (azure-devops) 1.0.1 -- GitHub CLI 2.64.0 -- Google Cloud CLI 504.0.1 -- Netlify CLI 17.38.1 -- OpenShift CLI 4.17.10 +- GitHub CLI 2.65.0 +- Google Cloud CLI 506.0.0 +- Netlify CLI 18.0.1 +- OpenShift CLI 4.17.12 - ORAS CLI 1.2.2 -- Vercel CLI 39.2.5 +- Vercel CLI 39.3.0 ### Java | Version | Environment Variable | @@ -148,27 +146,27 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Stack 3.3.1 ### Rust Tools -- Cargo 1.83.0 -- Rust 1.83.0 -- Rustdoc 1.83.0 +- Cargo 1.84.0 +- Rust 1.84.0 +- Rustdoc 1.84.0 - Rustup 1.27.1 #### Packages - Bindgen 0.71.1 -- Cargo audit 0.21.0 -- Cargo clippy 0.1.83 +- Cargo audit 0.21.1 +- Cargo clippy 0.1.84 - Cargo outdated 0.16.0 -- Cbindgen 0.27.0 +- Cbindgen 0.28.0 - Rustfmt 1.8.0 ### Browsers and Drivers -- Google Chrome 131.0.6778.204 -- ChromeDriver 131.0.6778.204 -- Chromium 131.0.6778.0 -- Microsoft Edge 131.0.2903.112 -- Microsoft Edge WebDriver 131.0.2903.112 -- Selenium server 4.27.0 -- Mozilla Firefox 133.0.3 +- Google Chrome 132.0.6834.83 +- ChromeDriver 132.0.6834.83 +- Chromium 132.0.6834.0 +- Microsoft Edge 132.0.2957.115 +- Microsoft Edge WebDriver 132.0.2957.115 +- Selenium server 4.28.0 +- Mozilla Firefox 134.0.1 - Geckodriver 0.35.0 #### Environment variables @@ -180,8 +178,8 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | ### .NET Tools -- .NET Core SDK: 6.0.428, 7.0.410, 8.0.404 -- nbgv 3.7.112+63bbe780b0 +- .NET Core SDK: 6.0.428, 8.0.405 +- nbgv 3.7.115+d31f50f4d1 ### Databases - sqlite3 3.37.2 @@ -217,7 +215,7 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Node.js - 18.20.5 - 20.18.1 -- 22.12.0 +- 22.13.0 #### Python - 3.8.18 @@ -243,7 +241,7 @@ Use the following command as a part of your job to start the service: 'sudo syst - Az: 12.1.0 - MarkdownPS: 1.10 - Microsoft.Graph: 2.25.0 -- Pester: 5.6.1 +- Pester: 5.7.1 - PSScriptAnalyzer: 1.23.0 ### Web Servers @@ -256,7 +254,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | Package Name | Version | | -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 9.0 | -| Android SDK Build-tools | 35.0.0<br>34.0.0<br>33.0.0 33.0.1 33.0.2 33.0.3<br>32.0.0<br>31.0.0 | +| Android SDK Build-tools | 35.0.0 35.0.1<br>34.0.0<br>33.0.0 33.0.1 33.0.2 33.0.3<br>32.0.0<br>31.0.0 | | Android SDK Platforms | android-35-ext14 (rev 1)<br>android-35 (rev 2)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1) | | Android Support Repository | 47.0.0 | | CMake | 3.10.2<br>3.18.1<br>3.22.1 | @@ -279,17 +277,17 @@ Use the following command as a part of your job to start the service: 'sudo syst | -------------------- | ------------------------------------------------------------------------ | ---------- | | alpine:3.16 | sha256:452e7292acee0ee16c332324d7de05fa2c99f9994ecc9f0779c602916a672ae4 | 2024-01-27 | | alpine:3.17 | sha256:8fc3dacfb6d69da8d44e42390de777e48577085db99aa4e4af35f483eb08b989 | 2024-09-06 | -| alpine:3.18 | sha256:2995c82e8e723d9a5c8585cb8e901d1c50e3c2759031027d3bff577449435157 | 2024-09-06 | -| alpine:3.19 | sha256:7a85bf5dc56c949be827f84f9185161265c58f589bb8b2a6b6bb6d3076c1be21 | 2024-09-06 | +| alpine:3.18 | sha256:dd60c75fba961ecc5e918961c713f3c42dd5665171c58f9b2ef5aafe081ad5a0 | 2025-01-08 | +| alpine:3.19 | sha256:6380aa6b04faa579332d4c9d1f65bd7093012ba6e01d9bbcd5e2d8a4f9fae38f | 2025-01-08 | | debian:10 | sha256:58ce6f1271ae1c8a2006ff7d3e54e9874d839f573d8009c20154ad0f2fb0a225 | 2024-06-13 | -| debian:11 | sha256:21b74d95871e8676a0cf47df9caebb1021b2af60b9a6e4777ce92f92f98e3a90 | 2024-12-23 | -| moby/buildkit:latest | sha256:86c0ad9d1137c186e9d455912167df20e530bdf7f7c19de802e892bb8ca16552 | 2024-12-16 | -| node:18 | sha256:7f31a1eb14c61719b8bb0eaa029310cc33851f71d3578cc422b390f8096977c5 | 2024-11-15 | -| node:18-alpine | sha256:6eb9c3d9bd191bd2cc6ce7ec3d5ec4c2127616140c8586af96a6bec8f28689d1 | 2024-12-05 | -| node:20 | sha256:d17aaa2a2fd82e09bd6a6da7cc4a79741340d2a3e39d172d1b30f295b1a850ff | 2024-11-20 | -| node:20-alpine | sha256:426f843809ae05f324883afceebaa2b9cab9cb697097dbb1a2a7a41c5701de72 | 2024-12-05 | -| node:22 | sha256:0e910f435308c36ea60b4cfd7b80208044d77a074d16b768a81901ce938a62dc | 2024-12-03 | -| node:22-alpine | sha256:6e80991f69cc7722c561e5d14d5e72ab47c0d6b6cfb3ae50fb9cf9a7b30fdf97 | 2024-12-05 | +| debian:11 | sha256:e5bfb7364038fd100c2faebdd674145bd1bc758a57f3c67023cced99d0eff0f7 | 2025-01-13 | +| moby/buildkit:latest | sha256:14aa1b4dd92ea0a4cd03a54d0c6079046ea98cd0c0ae6176bdd7036ba370cbbe | 2025-01-20 | +| node:18 | sha256:8b7f2b36c945174b27fe833689fcc47b78dd47de0eda2d6e868e6e4ec2c63ae0 | 2024-11-15 | +| node:18-alpine | sha256:a24108da7089c2d293ceaa61fb8969ec10821e8efe25572e5abb10b1841eb70b | 2024-12-05 | +| node:20 | sha256:968ca0550acc7589a8b1324401ec6e39ace53b2c82d2aed3a278e9ff491c2b1c | 2024-11-20 | +| node:20-alpine | sha256:24fb6aa7020d9a20b00d6da6d1714187c45ed00d1eb4adb01395843c338b9372 | 2024-12-05 | +| node:22 | sha256:fa54405993eaa6bab6b6e460f5f3e945a2e2f07942ba31c0e297a7d9c2041f62 | 2025-01-07 | +| node:22-alpine | sha256:f2dc6eea95f787e25f173ba9904c9d0647ab2506178c7b5b7c5a3d02bc4af145 | 2025-01-07 | | ubuntu:20.04 | sha256:8e5c4f0285ecbb4ead070431d29b576a530d3166df73ec44affc1cd27555141b | 2024-10-11 | | ubuntu:22.04 | sha256:0e5e4a57c2499249aafc3b40fcd541e9a456aab7296681a3994d631587203f97 | 2024-09-11 | @@ -307,7 +305,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | coreutils | 8.32-4.1ubuntu1.2 | | curl | 7.81.0-1ubuntu1.20 | | dbus | 1.12.20-2ubuntu4.1 | -| dnsutils | 1:9.18.28-0ubuntu0.22.04.1 | +| dnsutils | 1:9.18.30-0ubuntu0.22.04.1 | | dpkg | 1.21.1ubuntu2.3 | | dpkg-dev | 1.21.1ubuntu2.3 | | fakeroot | 1.28-1ubuntu1 | @@ -363,7 +361,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | pollinate | 4.33-3ubuntu2 | | python-is-python3 | 3.9.2-2 | | rpm | 4.17.0+dfsg1-4build1 | -| rsync | 3.2.7-0ubuntu0.22.04.2 | +| rsync | 3.2.7-0ubuntu0.22.04.4 | | shellcheck | 0.8.0-2 | | sphinxsearch | 2.2.11-8 | | sqlite3 | 3.37.2-2ubuntu0.3 | From abc3bfa23d1c1dca45a36f6690de3650e5d0092f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 23 Jan 2025 12:05:38 +0000 Subject: [PATCH 3433/3485] Updating readme file for ubuntu20 version 20250120.2.1 (#11439) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2004-Readme.md | 112 ++++++++++++++--------------- 1 file changed, 55 insertions(+), 57 deletions(-) diff --git a/images/ubuntu/Ubuntu2004-Readme.md b/images/ubuntu/Ubuntu2004-Readme.md index 97caeb2d1e99..1fc40c1c8a3d 100644 --- a/images/ubuntu/Ubuntu2004-Readme.md +++ b/images/ubuntu/Ubuntu2004-Readme.md @@ -1,13 +1,11 @@ | Announcements | |-| | [[Windows & Ubuntu] Breaking change : Maven 3.8.* version will be updated to Maven 3.9.* from January 17,2025](https://github.com/actions/runner-images/issues/11093) | -| [[Ubuntu] Breaking Change: runner user will have UID 1001 instead of 1000 for larger runners](https://github.com/actions/runner-images/issues/10936) | -| [Ubuntu-latest workflows will use Ubuntu-24.04 image](https://github.com/actions/runner-images/issues/10636) | *** # Ubuntu 20.04 - OS Version: 20.04.6 LTS -- Kernel Version: 5.15.0-1074-azure -- Image Version: 20250105.1.0 +- Kernel Version: 5.15.0-1078-azure +- Image Version: 20250120.2.0 - Systemd version: 245.4-4ubuntu3.24 ## Installed Software @@ -34,8 +32,8 @@ ### Package Management - cpan 1.64 -- Helm 3.16.4 -- Homebrew 4.4.14 +- Helm 3.17.0 +- Homebrew 4.4.17 - Miniconda 24.11.1 - Npm 10.8.2 - NuGet 6.6.1.2 @@ -43,7 +41,7 @@ - Pip3 20.0.2 - Pipx 1.7.1 - RubyGems 3.1.2 -- Vcpkg (build from commit 65be70199) +- Vcpkg (build from commit cf035d991) - Yarn 1.22.22 #### Environment variables @@ -64,35 +62,35 @@ to accomplish this. - Ant 1.10.7 - Gradle 8.12 - Lerna 8.1.9 -- Maven 3.8.8 +- Maven 3.9.9 - Sbt 1.10.7 ### Tools - Ansible 2.13.13 - apt-fast 1.10.0 - AzCopy 10.27.1 - available by `azcopy` and `azcopy10` aliases -- Bazel 8.0.0 +- Bazel 8.0.1 - Bazelisk 1.25.0 - Bicep 0.32.4 - Buildah 1.22.3 -- CMake 3.31.3 -- CodeQL Action Bundle 2.20.0 +- CMake 3.31.4 +- CodeQL Action Bundle 2.20.1 - Docker Amazon ECR Credential Helper 0.9.0 - Docker Compose v2 2.27.1 -- Docker-Buildx 0.19.3 +- Docker-Buildx 0.20.0 - Docker Client 26.1.3 - Docker Server 26.1.3 - Fastlane 2.226.0 -- Git 2.47.1 -- Git LFS 3.6.0 +- Git 2.48.1 +- Git LFS 3.6.1 - Git-ftp 1.6.0 - Haveged 1.9.1 -- Heroku 10.0.0 +- Heroku 10.0.2 - HHVM (HipHop VM) 4.172.1 - jq 1.6 - Kind 0.26.0 -- Kubectl 1.32.0 -- Kustomize 5.5.0 +- Kubectl 1.32.1 +- Kustomize 5.6.0 - Leiningen 2.11.2 - MediaInfo 19.09 - Mercurial 5.3.1 @@ -105,29 +103,29 @@ to accomplish this. - Parcel 2.13.3 - PhantomJS 2.1.1 2.1.1 - Podman 3.4.2 -- Pulumi 3.144.1 +- Pulumi 3.146.0 - R 4.4.2 - Skopeo 1.5.0 - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 -- Terraform 1.10.3 +- Terraform 1.10.4 - yamllint 1.35.1 -- yq 4.44.6 +- yq 4.45.1 - zstd 1.5.6 ### CLI Tools - Alibaba Cloud CLI 3.0.174 -- AWS CLI 2.22.28 +- AWS CLI 2.23.2 - AWS CLI Session Manager Plugin 1.2.694.0 - AWS SAM CLI 1.132.0 -- Azure CLI 2.67.0 +- Azure CLI 2.68.0 - Azure CLI (azure-devops) 1.0.1 -- GitHub CLI 2.64.0 -- Google Cloud CLI 504.0.1 -- Netlify CLI 17.38.1 +- GitHub CLI 2.65.0 +- Google Cloud CLI 506.0.0 +- Netlify CLI 18.0.1 - OpenShift CLI 4.15.19 - ORAS CLI 1.2.2 -- Vercel CLI 39.2.5 +- Vercel CLI 39.3.0 ### Java | Version | Environment Variable | @@ -138,7 +136,7 @@ to accomplish this. | 21.0.5+11 | JAVA_HOME_21_X64 | ### PHP Tools -- PHP: 7.4.33, 8.0.30, 8.1.31, 8.2.27, 8.3.15 +- PHP: 7.4.33, 8.0.30, 8.1.31, 8.2.27, 8.3.16 - Composer 2.8.4 - PHPUnit 8.5.41 ``` @@ -152,27 +150,27 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Stack 3.3.1 ### Rust Tools -- Cargo 1.83.0 -- Rust 1.83.0 -- Rustdoc 1.83.0 +- Cargo 1.84.0 +- Rust 1.84.0 +- Rustdoc 1.84.0 - Rustup 1.27.1 #### Packages - Bindgen 0.71.1 -- Cargo audit 0.21.0 -- Cargo clippy 0.1.83 +- Cargo audit 0.21.1 +- Cargo clippy 0.1.84 - Cargo outdated 0.16.0 -- Cbindgen 0.27.0 +- Cbindgen 0.28.0 - Rustfmt 1.8.0 ### Browsers and Drivers -- Google Chrome 131.0.6778.204 -- ChromeDriver 131.0.6778.204 -- Chromium 131.0.6778.0 -- Microsoft Edge 131.0.2903.112 -- Microsoft Edge WebDriver 131.0.2903.112 -- Selenium server 4.27.0 -- Mozilla Firefox 133.0.3 +- Google Chrome 132.0.6834.83 +- ChromeDriver 132.0.6834.83 +- Chromium 132.0.6834.0 +- Microsoft Edge 132.0.2957.115 +- Microsoft Edge WebDriver 132.0.2957.115 +- Selenium server 4.28.0 +- Mozilla Firefox 134.0.1 - Geckodriver 0.35.0 #### Environment variables @@ -184,8 +182,8 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | ### .NET Tools -- .NET Core SDK: 6.0.428, 7.0.410, 8.0.404 -- nbgv 3.7.112+63bbe780b0 +- .NET Core SDK: 6.0.428, 8.0.405 +- nbgv 3.7.115+d31f50f4d1 ### Databases - MongoDB 5.0.30 @@ -222,7 +220,7 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Node.js - 18.20.5 - 20.18.1 -- 22.12.0 +- 22.13.0 #### Python - 3.8.18 @@ -251,7 +249,7 @@ Use the following command as a part of your job to start the service: 'sudo syst - Az: 12.1.0 - MarkdownPS: 1.10 - Microsoft.Graph: 2.25.0 -- Pester: 5.6.1 +- Pester: 5.7.1 - PSScriptAnalyzer: 1.23.0 ### Web Servers @@ -265,7 +263,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | Package Name | Version | | -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 9.0 | -| Android SDK Build-tools | 35.0.0<br>34.0.0<br>33.0.0 33.0.1 33.0.2 33.0.3<br>32.0.0<br>31.0.0 | +| Android SDK Build-tools | 35.0.0 35.0.1<br>34.0.0<br>33.0.0 33.0.1 33.0.2 33.0.3<br>32.0.0<br>31.0.0 | | Android SDK Platforms | android-35-ext14 (rev 1)<br>android-35 (rev 2)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1) | | Android Support Repository | 47.0.0 | | CMake | 3.10.2<br>3.18.1<br>3.22.1 | @@ -288,18 +286,18 @@ Use the following command as a part of your job to start the service: 'sudo syst | -------------------- | ------------------------------------------------------------------------ | ---------- | | alpine:3.16 | sha256:452e7292acee0ee16c332324d7de05fa2c99f9994ecc9f0779c602916a672ae4 | 2024-01-27 | | alpine:3.17 | sha256:8fc3dacfb6d69da8d44e42390de777e48577085db99aa4e4af35f483eb08b989 | 2024-09-06 | -| alpine:3.18 | sha256:2995c82e8e723d9a5c8585cb8e901d1c50e3c2759031027d3bff577449435157 | 2024-09-06 | -| alpine:3.19 | sha256:7a85bf5dc56c949be827f84f9185161265c58f589bb8b2a6b6bb6d3076c1be21 | 2024-09-06 | +| alpine:3.18 | sha256:dd60c75fba961ecc5e918961c713f3c42dd5665171c58f9b2ef5aafe081ad5a0 | 2025-01-08 | +| alpine:3.19 | sha256:6380aa6b04faa579332d4c9d1f65bd7093012ba6e01d9bbcd5e2d8a4f9fae38f | 2025-01-08 | | debian:10 | sha256:58ce6f1271ae1c8a2006ff7d3e54e9874d839f573d8009c20154ad0f2fb0a225 | 2024-06-13 | -| debian:11 | sha256:21b74d95871e8676a0cf47df9caebb1021b2af60b9a6e4777ce92f92f98e3a90 | 2024-12-23 | +| debian:11 | sha256:e5bfb7364038fd100c2faebdd674145bd1bc758a57f3c67023cced99d0eff0f7 | 2025-01-13 | | debian:9 | sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be | 2022-06-23 | -| moby/buildkit:latest | sha256:86c0ad9d1137c186e9d455912167df20e530bdf7f7c19de802e892bb8ca16552 | 2024-12-16 | -| node:18 | sha256:7f31a1eb14c61719b8bb0eaa029310cc33851f71d3578cc422b390f8096977c5 | 2024-11-15 | -| node:18-alpine | sha256:6eb9c3d9bd191bd2cc6ce7ec3d5ec4c2127616140c8586af96a6bec8f28689d1 | 2024-12-05 | -| node:20 | sha256:d17aaa2a2fd82e09bd6a6da7cc4a79741340d2a3e39d172d1b30f295b1a850ff | 2024-11-20 | -| node:20-alpine | sha256:426f843809ae05f324883afceebaa2b9cab9cb697097dbb1a2a7a41c5701de72 | 2024-12-05 | -| node:22 | sha256:0e910f435308c36ea60b4cfd7b80208044d77a074d16b768a81901ce938a62dc | 2024-12-03 | -| node:22-alpine | sha256:6e80991f69cc7722c561e5d14d5e72ab47c0d6b6cfb3ae50fb9cf9a7b30fdf97 | 2024-12-05 | +| moby/buildkit:latest | sha256:14aa1b4dd92ea0a4cd03a54d0c6079046ea98cd0c0ae6176bdd7036ba370cbbe | 2025-01-20 | +| node:18 | sha256:8b7f2b36c945174b27fe833689fcc47b78dd47de0eda2d6e868e6e4ec2c63ae0 | 2024-11-15 | +| node:18-alpine | sha256:a24108da7089c2d293ceaa61fb8969ec10821e8efe25572e5abb10b1841eb70b | 2024-12-05 | +| node:20 | sha256:968ca0550acc7589a8b1324401ec6e39ace53b2c82d2aed3a278e9ff491c2b1c | 2024-11-20 | +| node:20-alpine | sha256:24fb6aa7020d9a20b00d6da6d1714187c45ed00d1eb4adb01395843c338b9372 | 2024-12-05 | +| node:22 | sha256:fa54405993eaa6bab6b6e460f5f3e945a2e2f07942ba31c0e297a7d9c2041f62 | 2025-01-07 | +| node:22-alpine | sha256:f2dc6eea95f787e25f173ba9904c9d0647ab2506178c7b5b7c5a3d02bc4af145 | 2025-01-07 | | ubuntu:20.04 | sha256:8e5c4f0285ecbb4ead070431d29b576a530d3166df73ec44affc1cd27555141b | 2024-10-11 | ### Installed apt packages @@ -316,7 +314,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | coreutils | 8.30-3ubuntu2 | | curl | 7.68.0-1ubuntu2.25 | | dbus | 1.12.16-2ubuntu2.3 | -| dnsutils | 1:9.18.28-0ubuntu0.20.04.1 | +| dnsutils | 1:9.18.30-0ubuntu0.20.04.1 | | dpkg | 1.19.7ubuntu3.2 | | dpkg-dev | 1.19.7ubuntu3.2 | | fakeroot | 1.24-1 | @@ -370,7 +368,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | pollinate | 4.33-3ubuntu1.20.04.1 | | python-is-python3 | 3.8.2-4 | | rpm | 4.14.2.1+dfsg1-1build2 | -| rsync | 3.1.3-8ubuntu0.7 | +| rsync | 3.1.3-8ubuntu0.9 | | shellcheck | 0.7.0-2build2 | | sphinxsearch | 2.2.11-2ubuntu2 | | sqlite3 | 3.31.1-4ubuntu0.6 | From 7f05bc5cf5aafcc5f639de7750fc76893ff0b278 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 23 Jan 2025 12:05:59 +0000 Subject: [PATCH 3434/3485] Updating readme file for ubuntu24 version 20250120.5.1 (#11442) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2404-Readme.md | 79 +++++++++++++++--------------- 1 file changed, 39 insertions(+), 40 deletions(-) diff --git a/images/ubuntu/Ubuntu2404-Readme.md b/images/ubuntu/Ubuntu2404-Readme.md index 62109824cd68..425983f0488a 100644 --- a/images/ubuntu/Ubuntu2404-Readme.md +++ b/images/ubuntu/Ubuntu2404-Readme.md @@ -1,13 +1,11 @@ | Announcements | |-| -| [[Windows & Ubuntu] Breaking change : Maven 3.8.* version will be updated to Maven 3.9.* from January 10,2025](https://github.com/actions/runner-images/issues/11093) | -| [[Ubuntu] Breaking Change: runner user will have UID 1001 instead of 1000 for larger runners](https://github.com/actions/runner-images/issues/10936) | -| [Ubuntu-latest workflows will use Ubuntu-24.04 image](https://github.com/actions/runner-images/issues/10636) | +| [[Windows & Ubuntu] Breaking change : Maven 3.8.* version will be updated to Maven 3.9.* from January 17,2025](https://github.com/actions/runner-images/issues/11093) | *** # Ubuntu 24.04 - OS Version: 24.04.1 LTS -- Kernel Version: 6.8.0-1017-azure -- Image Version: 20250105.1.0 +- Kernel Version: 6.8.0-1020-azure +- Image Version: 20250120.5.0 - Systemd version: 255.4-1ubuntu8.4 ## Installed Software @@ -30,15 +28,15 @@ ### Package Management - cpan 1.64 -- Helm 3.16.4 -- Homebrew 4.4.14 +- Helm 3.17.0 +- Homebrew 4.4.17 - Miniconda 24.11.1 - Npm 10.8.2 - Pip 24.0 - Pip3 24.0 - Pipx 1.7.1 - RubyGems 3.4.20 -- Vcpkg (build from commit 65be70199) +- Vcpkg (build from commit cf035d991) - Yarn 1.22.22 #### Environment variables @@ -59,31 +57,31 @@ to accomplish this. - Ant 1.10.14 - Gradle 8.12 - Lerna 8.1.9 -- Maven 3.8.8 +- Maven 3.9.9 ### Tools - Ansible 2.18.1 - AzCopy 10.27.1 - available by `azcopy` and `azcopy10` aliases -- Bazel 8.0.0 +- Bazel 8.0.1 - Bazelisk 1.25.0 - Bicep 0.32.4 - Buildah 1.33.7 -- CMake 3.31.3 -- CodeQL Action Bundle 2.20.0 +- CMake 3.31.4 +- CodeQL Action Bundle 2.20.1 - Docker Amazon ECR Credential Helper 0.9.0 - Docker Compose v2 2.27.1 -- Docker-Buildx 0.19.3 +- Docker-Buildx 0.20.0 - Docker Client 26.1.3 - Docker Server 26.1.3 - Fastlane 2.226.0 -- Git 2.47.1 -- Git LFS 3.6.0 +- Git 2.48.1 +- Git LFS 3.6.1 - Git-ftp 1.6.0 - Haveged 1.9.14 - jq 1.7 - Kind 0.26.0 -- Kubectl 1.32.0 -- Kustomize 5.5.0 +- Kubectl 1.32.1 +- Kustomize 5.6.0 - MediaInfo 24.01 - Mercurial 6.7.2 - Minikube 1.34.0 @@ -94,21 +92,21 @@ to accomplish this. - Packer 1.11.2 - Parcel 2.13.3 - Podman 4.9.3 -- Pulumi 3.144.1 +- Pulumi 3.146.0 - Skopeo 1.13.3 - Sphinx Open Source Search Server 2.2.11 - yamllint 1.35.1 -- yq 4.44.6 +- yq 4.45.1 - zstd 1.5.6 ### CLI Tools -- AWS CLI 2.22.28 +- AWS CLI 2.23.2 - AWS CLI Session Manager Plugin 1.2.694.0 - AWS SAM CLI 1.132.0 -- Azure CLI 2.67.0 +- Azure CLI 2.68.0 - Azure CLI (azure-devops) 1.0.1 -- GitHub CLI 2.64.0 -- Google Cloud CLI 504.0.1 +- GitHub CLI 2.65.0 +- Google Cloud CLI 506.0.0 ### Java | Version | Environment Variable | @@ -133,22 +131,22 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Stack 3.3.1 ### Rust Tools -- Cargo 1.83.0 -- Rust 1.83.0 -- Rustdoc 1.83.0 +- Cargo 1.84.0 +- Rust 1.84.0 +- Rustdoc 1.84.0 - Rustup 1.27.1 #### Packages - Rustfmt 1.8.0 ### Browsers and Drivers -- Google Chrome 131.0.6778.204 -- ChromeDriver 131.0.6778.204 -- Chromium 131.0.6778.0 -- Microsoft Edge 131.0.2903.112 -- Microsoft Edge WebDriver 131.0.2903.112 -- Selenium server 4.27.0 -- Mozilla Firefox 133.0.3 +- Google Chrome 132.0.6834.83 +- ChromeDriver 132.0.6834.83 +- Chromium 132.0.6834.0 +- Microsoft Edge 132.0.2957.115 +- Microsoft Edge WebDriver 132.0.2957.115 +- Selenium server 4.28.0 +- Mozilla Firefox 134.0.1 - Geckodriver 0.35.0 #### Environment variables @@ -160,8 +158,8 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | ### .NET Tools -- .NET Core SDK: 8.0.111 -- nbgv 3.7.112+63bbe780b0 +- .NET Core SDK: 8.0.112 +- nbgv 3.7.115+d31f50f4d1 ### Databases - sqlite3 3.45.1 @@ -193,7 +191,7 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Node.js - 18.20.5 - 20.18.1 -- 22.12.0 +- 22.13.0 #### Python - 3.9.21 @@ -211,7 +209,7 @@ Use the following command as a part of your job to start the service: 'sudo syst #### PowerShell Modules - Az: 12.1.0 - Microsoft.Graph: 2.25.0 -- Pester: 5.6.1 +- Pester: 5.7.1 - PSScriptAnalyzer: 1.23.0 ### Web Servers @@ -224,7 +222,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | Package Name | Version | | -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 12.0 | -| Android SDK Build-tools | 35.0.0<br>34.0.0 | +| Android SDK Build-tools | 35.0.0 35.0.1<br>34.0.0 | | Android SDK Platforms | android-35-ext14 (rev 1)<br>android-35 (rev 2)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1) | | Android Support Repository | 47.0.0 | | Google Play services | 49 | @@ -255,7 +253,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | coreutils | 9.4-3ubuntu6 | | curl | 8.5.0-2ubuntu10.6 | | dbus | 1.14.10-4ubuntu4.1 | -| dnsutils | 1:9.18.28-0ubuntu0.24.04.1 | +| dnsutils | 1:9.18.30-0ubuntu0.24.04.1 | | dpkg | 1.22.6ubuntu6.1 | | dpkg-dev | 1.22.6ubuntu6.1 | | fakeroot | 1.33-1 | @@ -271,6 +269,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | iproute2 | 6.1.0-1ubuntu6 | | iputils-ping | 3:20240117-1build1 | | jq | 1.7.1-3build1 | +| libsqlite3-dev | 3.45.1-1ubuntu2 | | libssl-dev | 3.0.13-0ubuntu3.4 | | libtool | 2.4.7-7build1 | | libyaml-dev | 0.2.5-1build1 | @@ -292,7 +291,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | pollinate | 4.33-3.1ubuntu1 | | python-is-python3 | 3.11.4-1 | | rpm | 4.18.2+dfsg-2.1build2 | -| rsync | 3.2.7-1ubuntu1 | +| rsync | 3.2.7-1ubuntu1.2 | | shellcheck | 0.9.0-1 | | sphinxsearch | 2.2.11-8build1 | | sqlite3 | 3.45.1-1ubuntu2 | From 4e7613245f224eb05c7764430f3b194f10f170d2 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 23 Jan 2025 12:26:39 +0000 Subject: [PATCH 3435/3485] Updating readme file for win25 version 20250120.2.1 (#11440) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/windows/Windows2025-Readme.md | 103 +++++++++++++-------------- 1 file changed, 51 insertions(+), 52 deletions(-) diff --git a/images/windows/Windows2025-Readme.md b/images/windows/Windows2025-Readme.md index 6369ac459ee4..9c1f6bfc92e5 100644 --- a/images/windows/Windows2025-Readme.md +++ b/images/windows/Windows2025-Readme.md @@ -7,8 +7,8 @@ | [[Windows & Ubuntu] .NET 7.x will be removed from the images on January 17,2025](https://github.com/actions/runner-images/issues/10894) | *** # Windows Server 2025 -- OS Version: 10.0.26100 Build 2605 -- Image Version: 20250113.1.0 +- OS Version: 10.0.26100 Build 2894 +- Image Version: 20250120.2.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -24,9 +24,9 @@ - LLVM 19.1.5 - Node 22.13.0 - Perl 5.40.0 -- PHP 8.3.15 +- PHP 8.3.16 - Python 3.9.13 -- Ruby 3.3.6 +- Ruby 3.3.7 ### Package Management - Chocolatey 2.4.1 @@ -38,7 +38,7 @@ - pip 24.3.1 (python 3.9) - Pipx 1.7.1 - RubyGems 3.5.22 -- Vcpkg (build from commit d7112d1a4) +- Vcpkg (build from commit cf035d991) - Yarn 1.22.22 #### Environment variables @@ -57,7 +57,7 @@ - 7zip 24.09 - aria2 1.37.0 - azcopy 10.27.1 -- Bazel 8.0.0 +- Bazel 8.0.1 - Bazelisk 1.25.0 - Bicep 0.32.4 - Cabal 3.14.1.1 @@ -67,19 +67,19 @@ - Docker Compose v2 2.27.1 - Docker-wincred 0.8.2 - ghc 9.12.1 -- Git 2.47.1.windows.1 -- Git LFS 3.6.0 +- Git 2.47.1.windows.2 +- Git LFS 3.6.1 - ImageMagick 7.1.1-43 - jq 1.7.1 - Kind 0.26.0 -- Kubectl 1.32.0 +- Kubectl 1.32.1 - gcc 14.2.0 - gdb 14.2 -- GNU Binutils 2.42 +- GNU Binutils 2.43 - Newman 6.2.1 - OpenSSL 3.4.0 - Packer 1.11.2 -- Pulumi 3.145.0 +- Pulumi 3.146.0 - R 4.4.2 - Service Fabric SDK 10.1.2493.9590 - Stack 3.3.1 @@ -91,10 +91,10 @@ - zstd 1.5.6 ### CLI Tools -- AWS CLI 2.22.33 +- AWS CLI 2.23.2 - AWS SAM CLI 1.132.0 - AWS Session Manager CLI 1.2.694.0 -- Azure CLI 2.67.0 +- Azure CLI 2.68.0 - Azure DevOps CLI extension 1.0.1 - GitHub CLI 2.65.0 @@ -109,14 +109,14 @@ - Rustfmt 1.8.0 ### Browsers and Drivers -- Google Chrome 131.0.6778.265 -- Chrome Driver 131.0.6778.264 -- Microsoft Edge 131.0.2903.146 -- Microsoft Edge Driver 131.0.2903.146 -- Mozilla Firefox 134.0 +- Google Chrome 132.0.6834.84 +- Chrome Driver 132.0.6834.83 +- Microsoft Edge 132.0.2957.115 +- Microsoft Edge Driver 132.0.2957.115 +- Mozilla Firefox 134.0.1 - Gecko Driver 0.35.0 - IE Driver 4.14.0.0 -- Selenium server 4.27.0 +- Selenium server 4.28.0 #### Environment variables | Name | Value | @@ -177,7 +177,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Ruby - 3.1.6 - 3.2.6 -- 3.3.6 +- 3.3.7 ### Databases @@ -215,7 +215,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Visual Studio Enterprise 2022 | Name | Version | Path | | ----------------------------- | --------------- | -------------------------------------------------------- | -| Visual Studio Enterprise 2022 | 17.12.35527.113 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | +| Visual Studio Enterprise 2022 | 17.12.35707.178 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | #### Workloads, components and extensions | Package | Version | @@ -239,16 +239,16 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Component.OpenJDK | 17.12.35410.122 | | Component.UnityEngine.x64 | 17.12.35410.122 | | Component.Unreal.Ide | 17.12.35410.122 | -| Component.VisualStudio.GitHub.Copilot | 17.12.35527.66 | +| Component.VisualStudio.GitHub.Copilot | 17.12.35707.178 | | Component.VSInstallerProjects2022 | 2.0.1 | | Component.WixToolset.VisualStudioExtension.Dev17 | 1.0.0.22 | | Component.WixToolset.VisualStudioExtension.Schemas3 | 1.0.0.22 | | Component.Xamarin.RemotedSimulator | 17.12.35410.122 | | ios | 18.1.9163.0 | | maccatalyst | 18.1.9163.0 | -| maui.blazor | 9.0.0.11787 | -| maui.core | 9.0.0.11787 | -| maui.windows | 9.0.0.11787 | +| maui.blazor | 9.0.14.12048 | +| maui.core | 9.0.14.12048 | +| maui.windows | 9.0.14.12048 | | Microsoft.Component.Azure.DataLake.Tools | 17.12.35410.122 | | Microsoft.Component.ClickOnce | 17.12.35410.122 | | Microsoft.Component.CodeAnalysis.SDK | 17.12.35410.122 | @@ -272,22 +272,21 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.Net.ComponentGroup.4.8.DeveloperTools | 17.12.35410.122 | | Microsoft.Net.ComponentGroup.DevelopmentPrerequisites | 17.12.35410.122 | | Microsoft.Net.ComponentGroup.TargetingPacks.Common | 17.12.35410.122 | -| microsoft.net.runtime.android | 9.0.24.52809 | -| microsoft.net.runtime.android.aot | 9.0.24.52809 | -| microsoft.net.runtime.android.aot.net8 | 9.0.24.52809 | -| microsoft.net.runtime.android.net8 | 9.0.24.52809 | -| microsoft.net.runtime.ios | 9.0.24.52809 | -| microsoft.net.runtime.ios.net8 | 9.0.24.52809 | -| microsoft.net.runtime.maccatalyst | 9.0.24.52809 | -| microsoft.net.runtime.maccatalyst.net8 | 9.0.24.52809 | -| microsoft.net.runtime.mono.tooling | 9.0.24.52809 | -| microsoft.net.runtime.mono.tooling.net8 | 9.0.24.52809 | -| microsoft.net.sdk.emscripten | 9.0.11.2802 | +| microsoft.net.runtime.android | 9.0.124.61010 | +| microsoft.net.runtime.android.aot | 9.0.124.61010 | +| microsoft.net.runtime.android.aot.net8 | 9.0.124.61010 | +| microsoft.net.runtime.android.net8 | 9.0.124.61010 | +| microsoft.net.runtime.ios | 9.0.124.61010 | +| microsoft.net.runtime.ios.net8 | 9.0.124.61010 | +| microsoft.net.runtime.maccatalyst | 9.0.124.61010 | +| microsoft.net.runtime.maccatalyst.net8 | 9.0.124.61010 | +| microsoft.net.runtime.mono.tooling | 9.0.124.61010 | +| microsoft.net.runtime.mono.tooling.net8 | 9.0.124.61010 | +| microsoft.net.sdk.emscripten | 9.0.11.10403 | | Microsoft.NetCore.Component.DevelopmentTools | 17.12.35410.122 | -| Microsoft.NetCore.Component.Runtime.6.0 | 17.12.35504.99 | -| Microsoft.NetCore.Component.Runtime.8.0 | 17.12.35504.99 | -| Microsoft.NetCore.Component.Runtime.9.0 | 17.12.35527.66 | -| Microsoft.NetCore.Component.SDK | 17.12.35527.66 | +| Microsoft.NetCore.Component.Runtime.8.0 | 17.12.35707.178 | +| Microsoft.NetCore.Component.Runtime.9.0 | 17.12.35707.178 | +| Microsoft.NetCore.Component.SDK | 17.12.35707.178 | | Microsoft.NetCore.Component.Web | 17.12.35410.122 | | Microsoft.VisualStudio.Component.AppInsights.Tools | 17.12.35410.122 | | Microsoft.VisualStudio.Component.AspNet | 17.12.35410.122 | @@ -395,7 +394,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Component.Windows11SDK.22621 | 17.12.35410.122 | | Microsoft.VisualStudio.Component.Windows11SDK.26100 | 17.12.35410.122 | | Microsoft.VisualStudio.Component.Windows11Sdk.WindowsPerformanceToolkit | 17.12.35410.122 | -| Microsoft.VisualStudio.Component.WindowsAppSdkSupport.CSharp | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.WindowsAppSdkSupport.CSharp | 17.12.35707.178 | | Microsoft.VisualStudio.Component.Workflow | 17.12.35410.122 | | Microsoft.VisualStudio.Component.WslDebugging | 17.12.35410.122 | | Microsoft.VisualStudio.ComponentGroup.ArchitectureTools.Native | 17.12.35410.122 | @@ -441,11 +440,11 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Workload.Python | 17.12.35410.122 | | Microsoft.VisualStudio.Workload.Universal | 17.12.35410.122 | | Microsoft.VisualStudio.Workload.VisualStudioExtension | 17.12.35410.122 | -| runtimes.ios | 9.0.24.52809 | -| runtimes.ios.net8 | 9.0.24.52809 | -| runtimes.maccatalyst | 9.0.24.52809 | -| runtimes.maccatalyst.net8 | 9.0.24.52809 | -| wasm.tools | 9.0.24.52809 | +| runtimes.ios | 9.0.124.61010 | +| runtimes.ios.net8 | 9.0.124.61010 | +| runtimes.maccatalyst | 9.0.124.61010 | +| runtimes.maccatalyst.net8 | 9.0.124.61010 | +| wasm.tools | 9.0.124.61010 | | ProBITools.MicrosoftAnalysisServicesModelingProjects2022 | 3.0.4 | | ProBITools.MicrosoftReportProjectsforVisualStudio2022 | 3.0.1 | | SSIS.MicrosoftDataToolsIntegrationServices | 1.5 | @@ -471,11 +470,11 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 10.0.26100.0 ### .NET Core Tools -- .NET Core SDK: 8.0.111, 8.0.206, 8.0.307, 8.0.404, 9.0.101 +- .NET Core SDK: 8.0.112, 8.0.206, 8.0.308, 8.0.405, 9.0.102 - .NET Framework: 4.8, 4.8.1 -- Microsoft.AspNetCore.App: 6.0.36, 8.0.6, 8.0.11, 9.0.0 -- Microsoft.NETCore.App: 6.0.36, 8.0.6, 8.0.11, 9.0.0 -- Microsoft.WindowsDesktop.App: 6.0.36, 8.0.6, 8.0.11, 9.0.0 +- Microsoft.AspNetCore.App: 8.0.6, 8.0.12, 9.0.1 +- Microsoft.NETCore.App: 8.0.6, 8.0.12, 9.0.1 +- Microsoft.WindowsDesktop.App: 8.0.6, 8.0.12, 9.0.1 - nbgv 3.7.115+d31f50f4d1 ### PowerShell Tools @@ -483,7 +482,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Powershell Modules - Az: 12.4.0 -- AWSPowershell: 4.1.734 +- AWSPowershell: 4.1.739 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.10 - Microsoft.Graph: 2.25.0 @@ -499,7 +498,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 16.0 | | Android Emulator | 35.3.11 | -| Android SDK Build-tools | 35.0.0<br>34.0.0 | +| Android SDK Build-tools | 35.0.0 35.0.1<br>34.0.0 | | Android SDK Platforms | android-35-ext14 (rev 1)<br>android-35 (rev 2)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3) | | Android SDK Platform-Tools | 35.0.2 | | Android Support Repository | 47.0.0 | From e149fc6a0e85c9785c97cff4e93f9a58f2df3a76 Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Thu, 23 Jan 2025 13:57:09 +0100 Subject: [PATCH 3436/3485] Update Tags handling in build-image.ps1 (#11458) --- images.CI/linux-and-win/build-image.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images.CI/linux-and-win/build-image.ps1 b/images.CI/linux-and-win/build-image.ps1 index ca0ab32706d1..08178303279e 100644 --- a/images.CI/linux-and-win/build-image.ps1 +++ b/images.CI/linux-and-win/build-image.ps1 @@ -34,7 +34,7 @@ $SensitiveData = @( ': ->' ) -$azure_tags = $Tags.GetEnumerator() | ForEach-Object { "{0}={1}" -f $_.Key, $_.Value } | Join-String -Separator "," +$azure_tags = ($Tags.GetEnumerator() | ForEach-Object { "{0}={1}" -f $_.Key, $_.Value }) -join "," Write-Host "Show Packer Version" packer --version From 6e729ed9ded3a2233430a702e8aded1d98a2d65f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 23 Jan 2025 13:02:22 +0000 Subject: [PATCH 3437/3485] Updating readme file for win22 version 20250120.2.1 (#11443) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/windows/Windows2022-Readme.md | 121 +++++++++++++-------------- 1 file changed, 60 insertions(+), 61 deletions(-) diff --git a/images/windows/Windows2022-Readme.md b/images/windows/Windows2022-Readme.md index ef3aa69b0bba..21553e0e6517 100644 --- a/images/windows/Windows2022-Readme.md +++ b/images/windows/Windows2022-Readme.md @@ -7,8 +7,8 @@ | [[Windows & Ubuntu] .NET 7.x will be removed from the images on January 17,2025](https://github.com/actions/runner-images/issues/10894) | *** # Windows Server 2022 -- OS Version: 10.0.20348 Build 2966 -- Image Version: 20250113.1.0 +- OS Version: 10.0.20348 Build 3091 +- Image Version: 20250120.2.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -23,7 +23,7 @@ - LLVM 18.1.8 - Node 18.20.5 - Perl 5.32.1 -- PHP 8.3.15 +- PHP 8.3.16 - Python 3.9.13 - Ruby 3.0.7p220 @@ -37,7 +37,7 @@ - pip 24.3.1 (python 3.9) - Pipx 1.7.1 - RubyGems 3.2.33 -- Vcpkg (build from commit d7112d1a4) +- Vcpkg (build from commit cf035d991) - Yarn 1.22.22 #### Environment variables @@ -56,7 +56,7 @@ - 7zip 24.09 - aria2 1.37.0 - azcopy 10.27.1 -- Bazel 8.0.0 +- Bazel 8.0.1 - Bazelisk 1.25.0 - Bicep 0.32.4 - Cabal 3.14.1.1 @@ -66,13 +66,13 @@ - Docker Compose v2 2.27.1 - Docker-wincred 0.8.2 - ghc 9.12.1 -- Git 2.47.1.windows.1 -- Git LFS 3.6.0 +- Git 2.47.1.windows.2 +- Git LFS 3.6.1 - ImageMagick 7.1.1-43 - InnoSetup 6.4.0 - jq 1.7.1 - Kind 0.26.0 -- Kubectl 1.32.0 +- Kubectl 1.32.1 - Mercurial 5.0 - gcc 12.2.0 - gdb 11.2 @@ -81,7 +81,7 @@ - NSIS 3.10 - OpenSSL 1.1.1w - Packer 1.11.2 -- Pulumi 3.145.0 +- Pulumi 3.146.0 - R 4.4.2 - Service Fabric SDK 9.1.1436.9590 - Stack 3.3.1 @@ -94,11 +94,11 @@ - zstd 1.5.6 ### CLI Tools -- Alibaba Cloud CLI 3.0.247 -- AWS CLI 2.22.33 +- Alibaba Cloud CLI 3.0.248 +- AWS CLI 2.23.2 - AWS SAM CLI 1.132.0 - AWS Session Manager CLI 1.2.694.0 -- Azure CLI 2.67.0 +- Azure CLI 2.68.0 - Azure DevOps CLI extension 1.0.1 - GitHub CLI 2.65.0 @@ -110,21 +110,21 @@ #### Packages - bindgen 0.71.1 -- cargo-audit 0.21.0 +- cargo-audit 0.21.1 - cargo-outdated 0.16.0 -- cbindgen 0.27.0 +- cbindgen 0.28.0 - Clippy 0.1.84 - Rustfmt 1.8.0 ### Browsers and Drivers -- Google Chrome 131.0.6778.265 -- Chrome Driver 131.0.6778.264 -- Microsoft Edge 131.0.2903.146 -- Microsoft Edge Driver 131.0.2903.146 -- Mozilla Firefox 134.0 +- Google Chrome 132.0.6834.84 +- Chrome Driver 132.0.6834.83 +- Microsoft Edge 132.0.2957.115 +- Microsoft Edge Driver 132.0.2957.115 +- Mozilla Firefox 134.0.1 - Gecko Driver 0.35.0 - IE Driver 4.14.0.0 -- Selenium server 4.27.0 +- Selenium server 4.28.0 #### Environment variables | Name | Value | @@ -227,7 +227,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Visual Studio Enterprise 2022 | Name | Version | Path | | ----------------------------- | --------------- | -------------------------------------------------------- | -| Visual Studio Enterprise 2022 | 17.12.35527.113 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | +| Visual Studio Enterprise 2022 | 17.12.35707.178 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise | #### Workloads, components and extensions | Package | Version | @@ -253,7 +253,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Component.Unreal | 17.12.35410.122 | | Component.Unreal.Android | 17.12.35410.122 | | Component.Unreal.Ide | 17.12.35410.122 | -| Component.VisualStudio.GitHub.Copilot | 17.12.35527.66 | +| Component.VisualStudio.GitHub.Copilot | 17.12.35707.178 | | Component.VSInstallerProjects2022 | 2.0.1 | | Component.WixToolset.VisualStudioExtension.Dev17 | 1.0.0.22 | | Component.WixToolset.VisualStudioExtension.Schemas3 | 1.0.0.22 | @@ -261,9 +261,9 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Component.Xamarin.RemotedSimulator | 17.12.35410.122 | | ios | 18.1.9163.0 | | maccatalyst | 18.1.9163.0 | -| maui.blazor | 9.0.0.11787 | -| maui.core | 9.0.0.11787 | -| maui.windows | 9.0.0.11787 | +| maui.blazor | 9.0.14.12048 | +| maui.core | 9.0.14.12048 | +| maui.windows | 9.0.14.12048 | | Microsoft.Component.Azure.DataLake.Tools | 17.12.35410.122 | | Microsoft.Component.ClickOnce | 17.12.35410.122 | | Microsoft.Component.CodeAnalysis.SDK | 17.12.35410.122 | @@ -288,22 +288,21 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.Net.ComponentGroup.4.8.DeveloperTools | 17.12.35410.122 | | Microsoft.Net.ComponentGroup.DevelopmentPrerequisites | 17.12.35410.122 | | Microsoft.Net.ComponentGroup.TargetingPacks.Common | 17.12.35410.122 | -| microsoft.net.runtime.android | 9.0.24.52809 | -| microsoft.net.runtime.android.aot | 9.0.24.52809 | -| microsoft.net.runtime.android.aot.net8 | 9.0.24.52809 | -| microsoft.net.runtime.android.net8 | 9.0.24.52809 | -| microsoft.net.runtime.ios | 9.0.24.52809 | -| microsoft.net.runtime.ios.net8 | 9.0.24.52809 | -| microsoft.net.runtime.maccatalyst | 9.0.24.52809 | -| microsoft.net.runtime.maccatalyst.net8 | 9.0.24.52809 | -| microsoft.net.runtime.mono.tooling | 9.0.24.52809 | -| microsoft.net.runtime.mono.tooling.net8 | 9.0.24.52809 | -| microsoft.net.sdk.emscripten | 9.0.11.2802 | +| microsoft.net.runtime.android | 9.0.124.61010 | +| microsoft.net.runtime.android.aot | 9.0.124.61010 | +| microsoft.net.runtime.android.aot.net8 | 9.0.124.61010 | +| microsoft.net.runtime.android.net8 | 9.0.124.61010 | +| microsoft.net.runtime.ios | 9.0.124.61010 | +| microsoft.net.runtime.ios.net8 | 9.0.124.61010 | +| microsoft.net.runtime.maccatalyst | 9.0.124.61010 | +| microsoft.net.runtime.maccatalyst.net8 | 9.0.124.61010 | +| microsoft.net.runtime.mono.tooling | 9.0.124.61010 | +| microsoft.net.runtime.mono.tooling.net8 | 9.0.124.61010 | +| microsoft.net.sdk.emscripten | 9.0.11.10403 | | Microsoft.NetCore.Component.DevelopmentTools | 17.12.35410.122 | -| Microsoft.NetCore.Component.Runtime.6.0 | 17.12.35504.99 | -| Microsoft.NetCore.Component.Runtime.8.0 | 17.12.35504.99 | -| Microsoft.NetCore.Component.Runtime.9.0 | 17.12.35527.66 | -| Microsoft.NetCore.Component.SDK | 17.12.35527.66 | +| Microsoft.NetCore.Component.Runtime.8.0 | 17.12.35707.178 | +| Microsoft.NetCore.Component.Runtime.9.0 | 17.12.35707.178 | +| Microsoft.NetCore.Component.SDK | 17.12.35707.178 | | Microsoft.NetCore.Component.Web | 17.12.35410.122 | | Microsoft.VisualStudio.Component.AppInsights.Tools | 17.12.35410.122 | | Microsoft.VisualStudio.Component.AspNet | 17.12.35410.122 | @@ -414,7 +413,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Component.Windows11SDK.22621 | 17.12.35410.122 | | Microsoft.VisualStudio.Component.Windows11SDK.26100 | 17.12.35410.122 | | Microsoft.VisualStudio.Component.Windows11Sdk.WindowsPerformanceToolkit | 17.12.35410.122 | -| Microsoft.VisualStudio.Component.WindowsAppSdkSupport.CSharp | 17.12.35410.122 | +| Microsoft.VisualStudio.Component.WindowsAppSdkSupport.CSharp | 17.12.35707.178 | | Microsoft.VisualStudio.Component.Workflow | 17.12.35410.122 | | Microsoft.VisualStudio.Component.WslDebugging | 17.12.35410.122 | | Microsoft.VisualStudio.ComponentGroup.ArchitectureTools.Native | 17.12.35410.122 | @@ -460,11 +459,11 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Workload.Python | 17.12.35410.122 | | Microsoft.VisualStudio.Workload.Universal | 17.12.35410.122 | | Microsoft.VisualStudio.Workload.VisualStudioExtension | 17.12.35410.122 | -| runtimes.ios | 9.0.24.52809 | -| runtimes.ios.net8 | 9.0.24.52809 | -| runtimes.maccatalyst | 9.0.24.52809 | -| runtimes.maccatalyst.net8 | 9.0.24.52809 | -| wasm.tools | 9.0.24.52809 | +| runtimes.ios | 9.0.124.61010 | +| runtimes.ios.net8 | 9.0.124.61010 | +| runtimes.maccatalyst | 9.0.124.61010 | +| runtimes.maccatalyst.net8 | 9.0.124.61010 | +| wasm.tools | 9.0.124.61010 | | ProBITools.MicrosoftAnalysisServicesModelingProjects2022 | 3.0.4 | | ProBITools.MicrosoftReportProjectsforVisualStudio2022 | 3.0.1 | | SSIS.MicrosoftDataToolsIntegrationServices | 1.5 | @@ -495,11 +494,11 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 10.0.26100.0 ### .NET Core Tools -- .NET Core SDK: 6.0.136, 6.0.203, 6.0.321, 6.0.428, 8.0.111, 8.0.206, 8.0.307, 8.0.404, 9.0.101 +- .NET Core SDK: 6.0.136, 6.0.203, 6.0.321, 6.0.428, 8.0.112, 8.0.206, 8.0.308, 8.0.405, 9.0.102 - .NET Framework: 4.7.2, 4.8, 4.8.1 -- Microsoft.AspNetCore.App: 6.0.5, 6.0.26, 6.0.35, 6.0.36, 8.0.6, 8.0.11, 9.0.0 -- Microsoft.NETCore.App: 6.0.5, 6.0.26, 6.0.35, 6.0.36, 8.0.6, 8.0.11, 9.0.0 -- Microsoft.WindowsDesktop.App: 6.0.5, 6.0.26, 6.0.36, 8.0.6, 8.0.11, 9.0.0 +- Microsoft.AspNetCore.App: 6.0.5, 6.0.26, 6.0.36, 6.0.37, 8.0.6, 8.0.12, 9.0.1 +- Microsoft.NETCore.App: 6.0.5, 6.0.26, 6.0.36, 6.0.37, 8.0.6, 8.0.12, 9.0.1 +- Microsoft.WindowsDesktop.App: 6.0.5, 6.0.26, 6.0.36, 8.0.6, 8.0.12, 9.0.1 - nbgv 3.7.115+d31f50f4d1 ### PowerShell Tools @@ -507,11 +506,11 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Powershell Modules - Az: 12.1.0 -- Azure: 2.1.0 (Default), 5.3.0 -- AzureRM: 2.1.0 (Default), 6.13.1 -- Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip -- AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.734 +- Azure: 5.3.0 +- AzureRM: 6.13.1 +- Azure (Cached): 5.1.1.zip +- AzureRM (Cached): 6.7.0.zip +- AWSPowershell: 4.1.739 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.10 - Microsoft.Graph: 2.25.0 @@ -532,7 +531,7 @@ All other versions are saved but not installed. | -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 8.0 | | Android Emulator | 35.3.11 | -| Android SDK Build-tools | 35.0.0<br>34.0.0<br>33.0.0 33.0.1 33.0.2 33.0.3<br>32.0.0<br>31.0.0 | +| Android SDK Build-tools | 35.0.0 35.0.1<br>34.0.0<br>33.0.0 33.0.1 33.0.2 33.0.3<br>32.0.0<br>31.0.0 | | Android SDK Platforms | android-35-ext14 (rev 1)<br>android-35 (rev 2)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1) | | Android SDK Platform-Tools | 35.0.2 | | Android Support Repository | 47.0.0 | @@ -554,9 +553,9 @@ All other versions are saved but not installed. ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2022 | sha256:c49042631c866daf7ce7337cff2e8c881c8b15e3be6abfed03e0b22b685d4b49 | 2024-12-10 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2022 | sha256:81845776459f460d3e50bc4e3fcb0db08f9f36722f5314c4281da3951cbb2fd4 | 2024-12-10 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:5dfdecd584d2f7c6852e4e807b6bb308da8f8350a0131ddef3cb0a0e6237523c | 2024-12-10 | -| mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:eb59dfa1056e41b65cb12b679280e29f10d64e2b569b877710e227a77fef223f | 2024-12-05 | -| mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:cd409960f9b87fcc02e1c236fea3852e1323ffb16d9522bf693330ebf878f5c0 | 2024-12-05 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2022 | sha256:84079c734ab5aec702409ef7967ec47af9468c56ff4046882239cabacda78097 | 2025-01-14 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2022 | sha256:a2ca87058709f998d60ab5a49bd05db18005363b3368d0061bb48f99ee1658d5 | 2025-01-14 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 | sha256:142e06b06dd9922d1e259c83cc057997a3ae71164ef7589bb3a2aa4f8690b9d8 | 2025-01-14 | +| mcr.microsoft.com/windows/nanoserver:ltsc2022 | sha256:55474b390b2d25e98450356b381d6dc422e15fb79808970f724c0f34df0b217e | 2025-01-12 | +| mcr.microsoft.com/windows/servercore:ltsc2022 | sha256:a7faef3c463f53996b00abff1cad6e979c75230bf9a55fdce77fe99c764971a5 | 2025-01-12 | From bdbe93c15ade49b40983993e1d6319af02ecf6e6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 23 Jan 2025 13:55:17 +0000 Subject: [PATCH 3438/3485] Updating readme file for win19 version 20250120.1.1 (#11449) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/windows/Windows2019-Readme.md | 76 ++++++++++++++-------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/images/windows/Windows2019-Readme.md b/images/windows/Windows2019-Readme.md index f55b27af1d02..58de2f3f7ed3 100644 --- a/images/windows/Windows2019-Readme.md +++ b/images/windows/Windows2019-Readme.md @@ -7,8 +7,8 @@ | [[Windows & Ubuntu] .NET 7.x will be removed from the images on January 17,2025](https://github.com/actions/runner-images/issues/10894) | *** # Windows Server 2019 -- OS Version: 10.0.17763 Build 6659 -- Image Version: 20250113.1.0 +- OS Version: 10.0.17763 Build 6775 +- Image Version: 20250120.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -23,7 +23,7 @@ - LLVM 18.1.8 - Node 18.20.5 - Perl 5.32.1 -- PHP 8.3.15 +- PHP 8.3.16 - Python 3.9.13 - Ruby 3.0.7p220 @@ -37,7 +37,7 @@ - pip 24.3.1 (python 3.9) - Pipx 1.7.1 - RubyGems 3.2.33 -- Vcpkg (build from commit d7112d1a4) +- Vcpkg (build from commit cf035d991) - Yarn 1.22.22 #### Environment variables @@ -56,7 +56,7 @@ - 7zip 24.09 - aria2 1.37.0 - azcopy 10.27.1 -- Bazel 8.0.0 +- Bazel 8.0.1 - Bazelisk 1.25.0 - Bicep 0.32.4 - Cabal 3.14.1.1 @@ -66,14 +66,14 @@ - Docker Compose v2 2.27.1 - Docker-wincred 0.8.2 - ghc 9.12.1 -- Git 2.47.1.windows.1 -- Git LFS 3.6.0 -- Google Cloud CLI 505.0.0 +- Git 2.47.1.windows.2 +- Git LFS 3.6.1 +- Google Cloud CLI 506.0.0 - ImageMagick 7.1.1-43 - InnoSetup 6.4.0 - jq 1.7.1 - Kind 0.26.0 -- Kubectl 1.32.0 +- Kubectl 1.32.1 - Mercurial 5.0 - gcc 8.1.0 - gdb 8.1 @@ -83,7 +83,7 @@ - OpenSSL 1.1.1w - Packer 1.11.2 - Parcel 2.13.3 -- Pulumi 3.145.0 +- Pulumi 3.146.0 - R 4.4.2 - Service Fabric SDK 9.1.1436.9590 - Stack 3.3.1 @@ -96,11 +96,11 @@ - zstd 1.5.6 ### CLI Tools -- Alibaba Cloud CLI 3.0.247 -- AWS CLI 2.22.33 +- Alibaba Cloud CLI 3.0.248 +- AWS CLI 2.23.2 - AWS SAM CLI 1.132.0 - AWS Session Manager CLI 1.2.694.0 -- Azure CLI 2.67.0 +- Azure CLI 2.68.0 - Azure DevOps CLI extension 1.0.1 - Cloud Foundry CLI 8.9.0 - GitHub CLI 2.65.0 @@ -113,21 +113,21 @@ #### Packages - bindgen 0.71.1 -- cargo-audit 0.21.0 +- cargo-audit 0.21.1 - cargo-outdated 0.16.0 -- cbindgen 0.27.0 +- cbindgen 0.28.0 - Clippy 0.1.84 - Rustfmt 1.8.0 ### Browsers and Drivers -- Google Chrome 131.0.6778.265 -- Chrome Driver 131.0.6778.264 -- Microsoft Edge 131.0.2903.146 -- Microsoft Edge Driver 131.0.2903.146 -- Mozilla Firefox 134.0 +- Google Chrome 132.0.6834.84 +- Chrome Driver 132.0.6834.83 +- Microsoft Edge 132.0.2957.115 +- Microsoft Edge Driver 132.0.2957.115 +- Mozilla Firefox 134.0.1 - Gecko Driver 0.35.0 - IE Driver 4.14.0.0 -- Selenium server 4.27.0 +- Selenium server 4.28.0 #### Environment variables | Name | Value | @@ -234,12 +234,12 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Visual Studio Enterprise 2019 | Name | Version | Path | | ----------------------------- | --------------- | -------------------------------------------------------------- | -| Visual Studio Enterprise 2019 | 16.11.35425.106 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | +| Visual Studio Enterprise 2019 | 16.11.35706.149 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | #### Workloads, components and extensions | Package | Version | | ------------------------------------------------------------------------- | --------------- | -| Component.Android.NDK.R16B | 16.11.35425.106 | +| Component.Android.NDK.R16B | 16.11.35704.18 | | Component.Android.SDK25.Private | 16.0.28625.61 | | Component.Android.SDK30 | 16.10.31205.252 | | Component.Ant | 1.9.3.8 | @@ -496,11 +496,11 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 10.0.22621.0 ### .NET Core Tools -- .NET Core SDK: 6.0.136, 6.0.203, 6.0.321, 6.0.428, 8.0.111, 8.0.206, 8.0.307, 8.0.404, 9.0.101 +- .NET Core SDK: 6.0.136, 6.0.203, 6.0.321, 6.0.428, 8.0.112, 8.0.206, 8.0.308, 8.0.405, 9.0.102 - .NET Framework: 4.7.2, 4.8 -- Microsoft.AspNetCore.App: 6.0.5, 6.0.26, 6.0.36, 8.0.6, 8.0.11, 9.0.0 -- Microsoft.NETCore.App: 6.0.5, 6.0.26, 6.0.36, 8.0.6, 8.0.11, 9.0.0 -- Microsoft.WindowsDesktop.App: 6.0.5, 6.0.26, 6.0.36, 8.0.6, 8.0.11, 9.0.0 +- Microsoft.AspNetCore.App: 6.0.5, 6.0.26, 6.0.36, 8.0.6, 8.0.12, 9.0.1 +- Microsoft.NETCore.App: 6.0.5, 6.0.26, 6.0.36, 8.0.6, 8.0.12, 9.0.1 +- Microsoft.WindowsDesktop.App: 6.0.5, 6.0.26, 6.0.36, 8.0.6, 8.0.12, 9.0.1 - nbgv 3.7.115+d31f50f4d1 ### PowerShell Tools @@ -508,11 +508,11 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Powershell Modules - Az: 12.1.0 -- Azure: 2.1.0 (Default), 5.3.0 -- AzureRM: 2.1.0 (Default), 6.13.1 -- Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip -- AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip -- AWSPowershell: 4.1.734 +- Azure: 5.3.0 +- AzureRM: 6.13.1 +- Azure (Cached): 5.1.1.zip +- AzureRM (Cached): 6.7.0.zip +- AWSPowershell: 4.1.739 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.10 - Microsoft.Graph: 2.25.0 @@ -533,7 +533,7 @@ All other versions are saved but not installed. | -------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 8.0 | | Android Emulator | 35.3.11 | -| Android SDK Build-tools | 35.0.0<br>34.0.0<br>33.0.0 33.0.1 33.0.2 33.0.3<br>32.0.0<br>31.0.0<br>30.0.2 | +| Android SDK Build-tools | 35.0.0 35.0.1<br>34.0.0<br>33.0.0 33.0.1 33.0.2 33.0.3<br>32.0.0<br>31.0.0<br>30.0.2 | | Android SDK Platforms | android-35-ext14 (rev 1)<br>android-35 (rev 2)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3) | | Android SDK Platform-Tools | 35.0.2 | | Android Support Repository | 47.0.0 | @@ -556,9 +556,9 @@ All other versions are saved but not installed. ### Cached Docker images | Repository:Tag | Digest | Created | | ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:1fa02716b8fb36dc4d0f24d0afcfe29301b1e67b176a2fa0624c5463ee302296 | 2024-12-10 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:ee07f32af7ffae810146282e5bfa37fa319fb483e551e03b3a5b63c3f2130d3e | 2024-12-10 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:f1a2e331287782ecc403dfd56717fbd32fdae9486ffaacaab8cb1798ee214e6d | 2024-12-10 | -| mcr.microsoft.com/windows/nanoserver:1809 | sha256:579994616649b876dd2e4009dae4af92f6e53561045230b8cdd53b3baf2f99d0 | 2024-12-05 | -| mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:0cb5fd75c08e7246afc6cc16bfe769d91af54fdb72ca58df150ebf5e3a2972ad | 2024-12-05 | +| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 | sha256:a2d8245de6d6992c05b615df01bfdf903ff6f9799ee797076ae3113a907350af | 2025-01-14 | +| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 | sha256:afbf97e3682b2e0460152a5e57502373acf2f2264bc80bba7c4959a72c25fd36 | 2025-01-14 | +| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 | sha256:ee59ff9393e277bc86a68cd47df9f81a6519c1c7c6afa025a18e2082a68ceccb | 2025-01-14 | +| mcr.microsoft.com/windows/nanoserver:1809 | sha256:d96a6c2108e1449c872cc2b224a9b3444fa1415b4d6947280aba2d2bb3bd0025 | 2025-01-09 | +| mcr.microsoft.com/windows/servercore:ltsc2019 | sha256:fb07dd14e84db4b84909be0a989597c31e28e199e7f47964fce763623d68e5d9 | 2025-01-09 | From 02b8cbc5ced8ab7f3e2adc244b1c564d05ad41a8 Mon Sep 17 00:00:00 2001 From: hemanthmanga <166606741+hemanthmanga@users.noreply.github.com> Date: Thu, 23 Jan 2025 20:31:43 +0530 Subject: [PATCH 3439/3485] Adding latest Dotnet version 9 (#11457) --- images/ubuntu/toolsets/toolset-2004.json | 6 ++++-- images/ubuntu/toolsets/toolset-2204.json | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/images/ubuntu/toolsets/toolset-2004.json b/images/ubuntu/toolsets/toolset-2004.json index ec5480320032..b3662e70ad7f 100644 --- a/images/ubuntu/toolsets/toolset-2004.json +++ b/images/ubuntu/toolsets/toolset-2004.json @@ -269,11 +269,13 @@ "dotnet": { "aptPackages": [ "dotnet-sdk-6.0", - "dotnet-sdk-8.0" + "dotnet-sdk-8.0", + "dotnet-sdk-9.0" ], "versions": [ "6.0", - "8.0" + "8.0", + "9.0" ], "tools": [ { "name": "nbgv", "test": "nbgv --version", "getversion" : "nbgv --version" } diff --git a/images/ubuntu/toolsets/toolset-2204.json b/images/ubuntu/toolsets/toolset-2204.json index 6a56244932c9..4e6e4deab712 100644 --- a/images/ubuntu/toolsets/toolset-2204.json +++ b/images/ubuntu/toolsets/toolset-2204.json @@ -268,11 +268,13 @@ "dotnet": { "aptPackages": [ "dotnet-sdk-6.0", - "dotnet-sdk-8.0" + "dotnet-sdk-8.0", + "dotnet-sdk-9.0" ], "versions": [ "6.0", - "8.0" + "8.0", + "9.0" ], "tools": [ { "name": "nbgv", "test": "nbgv --version", "getversion" : "nbgv --version" } From f7fee117e891075b62454b18f97da313f0b2e309 Mon Sep 17 00:00:00 2001 From: vidyasagarnimmagaddi <160703874+vidyasagarnimmagaddi@users.noreply.github.com> Date: Thu, 23 Jan 2025 20:33:27 +0530 Subject: [PATCH 3440/3485] [Windows] Adding Ruby version 3.3 (#11454) Co-authored-by: Pat Myron <PatMyron@users.noreply.github.com> --- images/windows/toolsets/toolset-2019.json | 3 ++- images/windows/toolsets/toolset-2022.json | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/images/windows/toolsets/toolset-2019.json b/images/windows/toolsets/toolset-2019.json index f73ad65ae5d0..0b19cc3f8ea6 100644 --- a/images/windows/toolsets/toolset-2019.json +++ b/images/windows/toolsets/toolset-2019.json @@ -7,7 +7,8 @@ "versions": [ "3.0", "3.1", - "3.2" + "3.2", + "3.3" ], "default": "3.0" }, diff --git a/images/windows/toolsets/toolset-2022.json b/images/windows/toolsets/toolset-2022.json index 4b1ccda1550a..3e1139d01622 100644 --- a/images/windows/toolsets/toolset-2022.json +++ b/images/windows/toolsets/toolset-2022.json @@ -7,7 +7,8 @@ "versions": [ "3.0", "3.1", - "3.2" + "3.2", + "3.3" ], "default": "3.0" }, From d12bc7894b36aba457583b94a658f42bd3d69a44 Mon Sep 17 00:00:00 2001 From: vidyasagarnimmagaddi <160703874+vidyasagarnimmagaddi@users.noreply.github.com> Date: Thu, 23 Jan 2025 20:38:29 +0530 Subject: [PATCH 3441/3485] [Ubuntu] adding ruby version 3.3.* (#11452) Co-authored-by: Pat Myron <PatMyron@users.noreply.github.com> --- images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 | 5 ++--- images/ubuntu/toolsets/toolset-2004.json | 3 ++- images/ubuntu/toolsets/toolset-2204.json | 3 ++- images/ubuntu/toolsets/toolset-2404.json | 3 ++- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 b/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 index 1174e7b621e8..9622623359aa 100644 --- a/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 +++ b/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 @@ -251,9 +251,8 @@ $cachedTools.AddToolVersionsList("Go", $(Get-ToolcacheGoVersions), "^\d+\.\d+") $cachedTools.AddToolVersionsList("Node.js", $(Get-ToolcacheNodeVersions), "^\d+") $cachedTools.AddToolVersionsList("Python", $(Get-ToolcachePythonVersions), "^\d+\.\d+") $cachedTools.AddToolVersionsList("PyPy", $(Get-ToolcachePyPyVersions), "^\d+\.\d+") -if (-not $(Test-IsUbuntu24)) { - $cachedTools.AddToolVersionsList("Ruby", $(Get-ToolcacheRubyVersions), "^\d+\.\d+") -} +$cachedTools.AddToolVersionsList("Ruby", $(Get-ToolcacheRubyVersions), "^\d+\.\d+") + # PowerShell Tools $powerShellTools = $installedSoftware.AddHeader("PowerShell Tools") diff --git a/images/ubuntu/toolsets/toolset-2004.json b/images/ubuntu/toolsets/toolset-2004.json index b3662e70ad7f..1f872bd897ad 100644 --- a/images/ubuntu/toolsets/toolset-2004.json +++ b/images/ubuntu/toolsets/toolset-2004.json @@ -58,7 +58,8 @@ "versions": [ "3.0.*", "3.1.*", - "3.2.*" + "3.2.*", + "3.3.*" ] }, { diff --git a/images/ubuntu/toolsets/toolset-2204.json b/images/ubuntu/toolsets/toolset-2204.json index 4e6e4deab712..ea12307a7a5b 100644 --- a/images/ubuntu/toolsets/toolset-2204.json +++ b/images/ubuntu/toolsets/toolset-2204.json @@ -55,7 +55,8 @@ "arch": "x64", "versions": [ "3.1.*", - "3.2.*" + "3.2.*", + "3.3.*" ] }, { diff --git a/images/ubuntu/toolsets/toolset-2404.json b/images/ubuntu/toolsets/toolset-2404.json index 41de91cfeb3e..856cb5eabe8a 100644 --- a/images/ubuntu/toolsets/toolset-2404.json +++ b/images/ubuntu/toolsets/toolset-2404.json @@ -51,7 +51,8 @@ "platform_version": "24.04", "arch": "x64", "versions": [ - "3.2.*" + "3.2.*", + "3.3.*" ] }, { From 65a1ae058fdee58893fdb6a420fb6ee5500c7d77 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 23 Jan 2025 19:56:16 +0000 Subject: [PATCH 3442/3485] Updating readme file for macos-15-arm64 version 20250113.563 (#11371) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-15-arm64-Readme.md | 47 ++++++++++++++------------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/images/macos/macos-15-arm64-Readme.md b/images/macos/macos-15-arm64-Readme.md index bfdc17cd0aab..524c54860698 100644 --- a/images/macos/macos-15-arm64-Readme.md +++ b/images/macos/macos-15-arm64-Readme.md @@ -1,18 +1,18 @@ | Announcements | |-| -| [[macOS 14] Xcode 16.0 will be replaced by Xcode 16.2 in macOS-14 images on January 6, 2025](https://github.com/actions/runner-images/issues/11203) | +| [[macOS] Ruby version 3.0 will be removed from the images on Feb 10, 2025 and 3.3 will be set as default. ](https://github.com/actions/runner-images/issues/11345) | | [[macOS] The macOS 12 Actions runner image will begin deprecation on 10/7/24 and will be fully unsupported by 12/3/24 for GitHub and by 01/13/25 for ADO](https://github.com/actions/runner-images/issues/10721) | | [macOS 15 (Sequoia) is now available as a public beta in GitHub Actions](https://github.com/actions/runner-images/issues/10686) | *** # macOS 15 - OS Version: macOS 15.2 (24C101) - Kernel Version: Darwin 24.2.0 -- Image Version: 20250106.544 +- Image Version: 20250113.563 ## Installed Software ### Language and Runtime -- .NET Core SDK: 8.0.101, 8.0.204, 8.0.303, 8.0.404 +- .NET Core SDK: 8.0.101, 8.0.204, 8.0.303, 8.0.404, 9.0.101 - Bash 3.2.57(1)-release - Clang/LLVM 15.0.0 - Clang/LLVM (Homebrew) 18.1.8 - available on `$(brew --prefix llvm@18)/bin/clang` @@ -23,7 +23,7 @@ - GNU Fortran 13 (Homebrew GCC 13.3.0) - available by `gfortran-13` alias - GNU Fortran 14 (Homebrew GCC 14.2.0_1) - available by `gfortran-14` alias - Kotlin 2.1.0-release-394 -- Node.js 22.12.0 +- Node.js 22.13.0 - Perl 5.40.0 - Python3 3.13.1 - Ruby 3.3.6 @@ -32,8 +32,8 @@ - Bundler 2.6.2 - Carthage 0.40.0 - CocoaPods 1.16.2 -- Homebrew 4.4.14 -- NPM 10.9.0 +- Homebrew 4.4.15 +- NPM 10.9.2 - Pip3 24.3.1 (python 3.13) - Pipx 1.7.1 - RubyGems 3.6.2 @@ -52,9 +52,9 @@ - bazelisk 1.25.0 - bsdtar 3.5.3 - available by 'tar' alias - Curl 8.7.1 -- Git 2.47.1 +- Git 2.48.0 - Git LFS 3.6.0 -- GitHub CLI 2.64.0 +- GitHub CLI 2.65.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.25.0 - gpg (GnuPG) 2.4.7 @@ -63,18 +63,18 @@ - Packer 1.11.2 - pkgconf 2.3.0 - Unxip 3.1 -- yq 4.44.6 +- yq 4.45.1 - zstd 1.5.6 ### Tools -- AWS CLI 2.22.28 +- AWS CLI 2.22.33 - AWS SAM CLI 1.132.0 - AWS Session Manager CLI 1.2.694.0 - Azure CLI 2.67.0 - Azure CLI (azure-devops) 1.0.1 - Bicep CLI 0.32.4 -- Cmake 3.31.3 -- CodeQL Action Bundle 2.20.0 +- Cmake 3.31.4 +- CodeQL Action Bundle 2.20.1 - Fastlane 2.226.0 - SwiftFormat 0.55.4 - Xcbeautify 2.17.0 @@ -86,9 +86,9 @@ ### Browsers - Safari 18.2 (20620.1.16.11.8) - SafariDriver 18.2 (20620.1.16.11.8) -- Google Chrome 131.0.6778.205 -- Google Chrome for Testing 131.0.6778.204 -- ChromeDriver 131.0.6778.204 +- Google Chrome 131.0.6778.265 +- Google Chrome for Testing 131.0.6778.264 +- ChromeDriver 131.0.6778.264 - Selenium server 4.27.0 #### Environment variables @@ -111,6 +111,7 @@ - 3.1.6 - 3.2.6 - 3.3.6 +- 3.4.1 #### Python - 3.11.9 @@ -120,7 +121,7 @@ #### Node.js - 18.20.5 - 20.18.1 -- 22.12.0 +- 22.13.0 #### Go - 1.21.13 @@ -128,13 +129,13 @@ - 1.23.4 ### Rust Tools -- Cargo 1.83.0 -- Rust 1.83.0 -- Rustdoc 1.83.0 +- Cargo 1.84.0 +- Rust 1.84.0 +- Rustdoc 1.84.0 - Rustup 1.27.1 #### Packages -- Clippy 0.1.83 +- Clippy 0.1.84 - Rustfmt 1.8.0-stable ### PowerShell Tools @@ -142,7 +143,7 @@ #### PowerShell Modules - Az: 12.4.0 -- Pester: 5.6.1 +- Pester: 5.7.1 - PSScriptAnalyzer: 1.23.0 ### Xcode @@ -190,8 +191,8 @@ | visionOS 2.0 | xros2.0 | 16.0 | | Simulator - visionOS 2.1 | xrsimulator2.1 | 16.1 | | visionOS 2.1 | xros2.1 | 16.1 | -| Simulator - visionOS 2.2 | xrsimulator2.2 | 16.2 | | visionOS 2.2 | xros2.2 | 16.2 | +| Simulator - visionOS 2.2 | xrsimulator2.2 | 16.2 | | DriverKit 23.5 | driverkit23.5 | 15.4 | | DriverKit 24.0 | driverkit24.0 | 16.0 | | DriverKit 24.1 | driverkit24.1 | 16.1 | @@ -221,7 +222,7 @@ | Package Name | Version | | -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 16.0 | -| Android Emulator | 35.2.10 | +| Android Emulator | 35.3.11 | | Android SDK Build-tools | 35.0.0 | | Android SDK Platforms | android-35-ext14 (rev 1)<br>android-35 (rev 2)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1) | | Android SDK Platform-Tools | 35.0.2 | From 9af4ac0a6863dddb57e93948e9a3948f03e0a64d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 24 Jan 2025 00:45:44 +0000 Subject: [PATCH 3443/3485] Updating readme file for macos-15-arm64 version 20250120.596 (#11425) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-15-arm64-Readme.md | 41 ++++++++++++++------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/images/macos/macos-15-arm64-Readme.md b/images/macos/macos-15-arm64-Readme.md index 524c54860698..638baeedeb88 100644 --- a/images/macos/macos-15-arm64-Readme.md +++ b/images/macos/macos-15-arm64-Readme.md @@ -7,12 +7,12 @@ # macOS 15 - OS Version: macOS 15.2 (24C101) - Kernel Version: Darwin 24.2.0 -- Image Version: 20250113.563 +- Image Version: 20250120.596 ## Installed Software ### Language and Runtime -- .NET Core SDK: 8.0.101, 8.0.204, 8.0.303, 8.0.404, 9.0.101 +- .NET Core SDK: 8.0.101, 8.0.204, 8.0.303, 8.0.405, 9.0.102 - Bash 3.2.57(1)-release - Clang/LLVM 15.0.0 - Clang/LLVM (Homebrew) 18.1.8 - available on `$(brew --prefix llvm@18)/bin/clang` @@ -24,19 +24,19 @@ - GNU Fortran 14 (Homebrew GCC 14.2.0_1) - available by `gfortran-14` alias - Kotlin 2.1.0-release-394 - Node.js 22.13.0 -- Perl 5.40.0 +- Perl 5.40.1 - Python3 3.13.1 -- Ruby 3.3.6 +- Ruby 3.3.7 ### Package Management -- Bundler 2.6.2 +- Bundler 2.6.3 - Carthage 0.40.0 - CocoaPods 1.16.2 -- Homebrew 4.4.15 +- Homebrew 4.4.16 - NPM 10.9.2 - Pip3 24.3.1 (python 3.13) - Pipx 1.7.1 -- RubyGems 3.6.2 +- RubyGems 3.6.3 - Yarn 1.22.22 ### Project Management @@ -48,12 +48,12 @@ - 7-Zip 17.05 - aria2 1.37.0 - azcopy 10.27.1 -- bazel 8.0.0 +- bazel 8.0.1 - bazelisk 1.25.0 - bsdtar 3.5.3 - available by 'tar' alias - Curl 8.7.1 -- Git 2.48.0 -- Git LFS 3.6.0 +- Git 2.48.1 +- Git LFS 3.6.1 - GitHub CLI 2.65.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.25.0 @@ -67,10 +67,10 @@ - zstd 1.5.6 ### Tools -- AWS CLI 2.22.33 +- AWS CLI 2.23.2 - AWS SAM CLI 1.132.0 - AWS Session Manager CLI 1.2.694.0 -- Azure CLI 2.67.0 +- Azure CLI 2.68.0 - Azure CLI (azure-devops) 1.0.1 - Bicep CLI 0.32.4 - Cmake 3.31.4 @@ -86,9 +86,9 @@ ### Browsers - Safari 18.2 (20620.1.16.11.8) - SafariDriver 18.2 (20620.1.16.11.8) -- Google Chrome 131.0.6778.265 -- Google Chrome for Testing 131.0.6778.264 -- ChromeDriver 131.0.6778.264 +- Google Chrome 132.0.6834.84 +- Google Chrome for Testing 132.0.6834.83 +- ChromeDriver 132.0.6834.83 - Selenium server 4.27.0 #### Environment variables @@ -110,7 +110,7 @@ #### Ruby - 3.1.6 - 3.2.6 -- 3.3.6 +- 3.3.7 - 3.4.1 #### Python @@ -185,12 +185,13 @@ | Simulator - watchOS 11.0 | watchsimulator11.0 | 16.0 | | Simulator - watchOS 11.1 | watchsimulator11.1 | 16.1 | | Simulator - watchOS 11.2 | watchsimulator11.2 | 16.2 | -| visionOS 1.2 | xros1.2 | 15.4 | | Simulator - visionOS 1.2 | xrsimulator1.2 | 15.4 | -| Simulator - visionOS 2.0 | xrsimulator2.0 | 16.0 | +| visionOS 1.2 | xros1.2 | 15.4 | | visionOS 2.0 | xros2.0 | 16.0 | -| Simulator - visionOS 2.1 | xrsimulator2.1 | 16.1 | +| Simulator - visionOS 2.0 | xrsimulator2.0 | 16.0 | | visionOS 2.1 | xros2.1 | 16.1 | +| Simulator - visionOS 2.1 | xrsimulator2.1 | 16.1 | +| Simulator - visionOS 2.2 | xrsimulator2.2 | 16.2 | | visionOS 2.2 | xros2.2 | 16.2 | | Simulator - visionOS 2.2 | xrsimulator2.2 | 16.2 | | DriverKit 23.5 | driverkit23.5 | 15.4 | @@ -223,7 +224,7 @@ | -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 16.0 | | Android Emulator | 35.3.11 | -| Android SDK Build-tools | 35.0.0 | +| Android SDK Build-tools | 35.0.0 35.0.1 | | Android SDK Platforms | android-35-ext14 (rev 1)<br>android-35 (rev 2)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1) | | Android SDK Platform-Tools | 35.0.2 | | Android Support Repository | 47.0.0 | From b7a804a460e24019b979ea55ce991bbb561df88f Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Fri, 24 Jan 2025 10:57:28 +0100 Subject: [PATCH 3444/3485] [macOS] Update Xcode installer script - type optimization (#11459) --- images/macos/scripts/build/Install-Xcode.ps1 | 12 +------ .../scripts/helpers/Xcode.Installer.psm1 | 34 +++++++++++++++---- images/macos/toolsets/Readme.md | 14 ++++---- images/macos/toolsets/toolset-14.json | 8 ++--- 4 files changed, 39 insertions(+), 29 deletions(-) diff --git a/images/macos/scripts/build/Install-Xcode.ps1 b/images/macos/scripts/build/Install-Xcode.ps1 index 3552741aed88..1ac23478862e 100644 --- a/images/macos/scripts/build/Install-Xcode.ps1 +++ b/images/macos/scripts/build/Install-Xcode.ps1 @@ -33,17 +33,7 @@ Write-Host "Configuring Xcode versions..." $xcodeVersions | ForEach-Object { Write-Host "Configuring Xcode $($_.link) ..." Invoke-XcodeRunFirstLaunch -Version $_.link - - if ($_.install_runtimes -eq 'true') { - # Additional simulator runtimes are included by default for Xcode < 14 - Install-AdditionalSimulatorRuntimes -Version $_.link - } - - ForEach($runtime in $_.runtimes) { - Write-Host "Installing Additional runtimes for Xcode '$runtime' ..." - $xcodebuildPath = Get-XcodeToolPath -Version $_.link -ToolName 'xcodebuild' - Invoke-ValidateCommand "sudo $xcodebuildPath -downloadPlatform $runtime" | Out-Null - } + Install-AdditionalSimulatorRuntimes -Version $_.link -Runtimes $_.install_runtimes } Invoke-XcodeRunFirstLaunch -Version $defaultXcode diff --git a/images/macos/scripts/helpers/Xcode.Installer.psm1 b/images/macos/scripts/helpers/Xcode.Installer.psm1 index bbca20b89dc4..39e012725687 100644 --- a/images/macos/scripts/helpers/Xcode.Installer.psm1 +++ b/images/macos/scripts/helpers/Xcode.Installer.psm1 @@ -165,10 +165,6 @@ function Invoke-XcodeRunFirstLaunch { [string] $Version ) - if ($Version.StartsWith("8") -or $Version.StartsWith("9")) { - return - } - Write-Host "Running 'runFirstLaunch' for Xcode $Version..." $xcodeRootPath = Get-XcodeToolPath -Version $Version -ToolName "xcodebuild" Invoke-ValidateCommand "sudo $xcodeRootPath -runFirstLaunch" @@ -177,12 +173,36 @@ function Invoke-XcodeRunFirstLaunch { function Install-AdditionalSimulatorRuntimes { param ( [Parameter(Mandatory)] - [string] $Version + [string] $Version, + [Parameter(Mandatory)] + [array] $Runtimes ) Write-Host "Installing Simulator Runtimes for Xcode $Version ..." - $xcodebuildPath = Get-XcodeToolPath -Version $Version -ToolName "xcodebuild" - Invoke-ValidateCommand "$xcodebuildPath -downloadAllPlatforms" | Out-Null + $xcodebuildPath = Get-XcodeToolPath -Version $Version -ToolName 'xcodebuild' + $validRuntimes = @("iOS", "watchOS", "tvOS", "visionOS") + # Install all runtimes / skip all runtimes installation + if ($Runtimes.Count -eq 1) { + if ($Runtimes[0] -eq "true") { + Write-Host "Installing all runtimes for Xcode $Version ..." + Invoke-ValidateCommand "sudo $xcodebuildPath -downloadAllPlatforms" | Out-Null + return + } elseif ($Runtimes[0] -eq "false") { + Write-Host "Skipping runtimes installation for Xcode $Version ..." + return + } + } + + # Validate and install specified runtimes + $invalidRuntimes = $Runtimes | Where-Object { $_ -notin $validRuntimes } + if ($invalidRuntimes) { + throw "Error: Invalid runtimes detected: $($invalidRuntimes -join ', '). Valid values are: $validRuntimes." + } + + foreach ($runtime in $Runtimes) { + Write-Host "Installing runtime $runtime ..." + Invoke-ValidateCommand "sudo $xcodebuildPath -downloadPlatform $runtime" | Out-Null + } } function Build-XcodeSymlinks { diff --git a/images/macos/toolsets/Readme.md b/images/macos/toolsets/Readme.md index 7eb63cabc05c..54b96c80cf22 100644 --- a/images/macos/toolsets/Readme.md +++ b/images/macos/toolsets/Readme.md @@ -6,19 +6,19 @@ - `link` property points to the place where Xcode will be located on image. `/Applications/Xcode_<link>.app` - `version` points to Xcode version that will be downloaded and installed - `symlinks` describes the list of aliases where symlinks will be created to - - `install_runtimes` is boolean function to control over the related simulator runtimes + - `install_runtimes` is an array or boolean function to control over the related simulator runtimes, set of possible values: [ `iOS`, `watchOS`, `visionOS`, `tvOS` ], use `true` if you want to install all runtimes, use `false` if you want to skip runtimes installation - `sha256` used to check integrity of the Xcode installer file - `default` - version of Xcode to set as default (should be metched with any `link` in `versions` property) **Example:** `"11.2"` **Note:** -- If `version` is specified with spaces, it is considered as exact Xcode name like `12.1.1 Release Candidate`. -- If `version` doesn't contain spaces, the latest version will be resolved with the following priority: - - stable version like `12.1` - - release candidate version like `12.1 Release Candidate N` (the latest N will be chosen) - - GM version like `12.1 GM Seed N` (the latest N will be chosen) - - beta version like `12.1 beta N` (the latest N will be chosen) +- `version` is specified with `+` or `-`, exact Xcode name should be like `16.2.0-Beta.3+16C5023f` or `16.2_Release_Candidate+16C5031c` and will be matching `.xip` file name. +- `link` is specified with `_` and doesn't contain spaces, example: `16.2_Release_Candidate` or `16.1`; pattern description: + - DOWNLOAD_URL="https://download.developer.apple.com/Developer_Tools/$SOURCE_FILE_LOCATION/$SOURCE_FILE_NAME.$FILE_EXTENSION" + - SOURCE_FILE_NAME: "Xcode_$link" + - SOURCE_FILE_LOCATION: "Xcode_$link" + - FILE_EXTENSION: xip **Example:** diff --git a/images/macos/toolsets/toolset-14.json b/images/macos/toolsets/toolset-14.json index 68b29e498c5a..ecda55bc7f2d 100644 --- a/images/macos/toolsets/toolset-14.json +++ b/images/macos/toolsets/toolset-14.json @@ -3,8 +3,8 @@ "default": "15.4", "x64": { "versions": [ - { "link": "16.2", "version": "16.2+16C5032a", "runtimes": ["iOS", "watchOS", "tvOS"], "sha256": "0e367d06eb7c334ea143bada5e4422f56688aabff571bedf0d2ad9434b7290de"}, - { "link": "16.1", "version": "16.1+16B40", "runtimes": ["iOS", "watchOS", "tvOS"], "sha256": "8ca961d55981f983d21b99a95a6b0ac04905b837f6e11346ee86d28f12afe720"}, + { "link": "16.2", "version": "16.2+16C5032a", "install_runtimes": ["iOS", "watchOS", "tvOS"], "sha256": "0e367d06eb7c334ea143bada5e4422f56688aabff571bedf0d2ad9434b7290de"}, + { "link": "16.1", "version": "16.1+16B40", "install_runtimes": ["iOS", "watchOS", "tvOS"], "sha256": "8ca961d55981f983d21b99a95a6b0ac04905b837f6e11346ee86d28f12afe720"}, { "link": "15.4", "version": "15.4.0+15F31d", "install_runtimes": "true", "sha256": "82d3d61804ff3f4c7c82085e91dc701037ddaa770e542848b2477e22f4e8aa7a"}, { "link": "15.3", "version": "15.3.0+15E204a", "install_runtimes": "true", "sha256": "f13f6a2e2df432c3008e394640b8549a18c285acd7fd148d6c4bac8c3a5af234"}, { "link": "15.2", "version": "15.2.0+15C500b", "install_runtimes": "true", "sha256": "04E93680C6DDBEC84666531BE412DE778AFC8EAC6AB2037F4C2BE7290818B59B"}, @@ -14,8 +14,8 @@ }, "arm64":{ "versions": [ - { "link": "16.2", "version": "16.2+16C5032a", "runtimes": ["iOS", "watchOS", "tvOS"], "sha256": "0e367d06eb7c334ea143bada5e4422f56688aabff571bedf0d2ad9434b7290de"}, - { "link": "16.1", "version": "16.1+16B40", "runtimes": ["iOS", "watchOS", "tvOS"], "sha256": "8ca961d55981f983d21b99a95a6b0ac04905b837f6e11346ee86d28f12afe720"}, + { "link": "16.2", "version": "16.2+16C5032a", "install_runtimes": ["iOS", "watchOS", "tvOS"], "sha256": "0e367d06eb7c334ea143bada5e4422f56688aabff571bedf0d2ad9434b7290de"}, + { "link": "16.1", "version": "16.1+16B40", "install_runtimes": ["iOS", "watchOS", "tvOS"], "sha256": "8ca961d55981f983d21b99a95a6b0ac04905b837f6e11346ee86d28f12afe720"}, { "link": "15.4", "version": "15.4.0+15F31d", "install_runtimes": "true", "sha256": "82d3d61804ff3f4c7c82085e91dc701037ddaa770e542848b2477e22f4e8aa7a"}, { "link": "15.3", "version": "15.3.0+15E204a", "install_runtimes": "true", "sha256": "f13f6a2e2df432c3008e394640b8549a18c285acd7fd148d6c4bac8c3a5af234"}, { "link": "15.2", "version": "15.2.0+15C500b", "install_runtimes": "true", "sha256": "04E93680C6DDBEC84666531BE412DE778AFC8EAC6AB2037F4C2BE7290818B59B"}, From 4aaad333a6a9e74a27a56dd77fca5375135b572d Mon Sep 17 00:00:00 2001 From: RaviAkshintala <167848931+RaviAkshintala@users.noreply.github.com> Date: Fri, 24 Jan 2025 21:48:44 +0530 Subject: [PATCH 3445/3485] [Windows]Updated the php 8.4 version (#11461) Co-authored-by: Shivam Mathur <shivammathur@users.noreply.github.com> Co-authored-by: Ravi Akshintala <raviakshintalagithub.com@Ravis-Laptop.local> --- images/windows/toolsets/toolset-2019.json | 2 +- images/windows/toolsets/toolset-2022.json | 2 +- images/windows/toolsets/toolset-2025.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/images/windows/toolsets/toolset-2019.json b/images/windows/toolsets/toolset-2019.json index 0b19cc3f8ea6..4ff1a44fc32c 100644 --- a/images/windows/toolsets/toolset-2019.json +++ b/images/windows/toolsets/toolset-2019.json @@ -459,7 +459,7 @@ "version": "3.10" }, "php": { - "version": "8.3" + "version": "8.4" }, "llvm": { "version": "18" diff --git a/images/windows/toolsets/toolset-2022.json b/images/windows/toolsets/toolset-2022.json index 3e1139d01622..4fbce97d2f2a 100644 --- a/images/windows/toolsets/toolset-2022.json +++ b/images/windows/toolsets/toolset-2022.json @@ -372,7 +372,7 @@ "version": "18" }, "php": { - "version": "8.3" + "version": "8.4" }, "postgresql": { "signature": "698BA51AA27CC31282AACA5055E4B9190BC6C0E9", diff --git a/images/windows/toolsets/toolset-2025.json b/images/windows/toolsets/toolset-2025.json index e886e11150ce..6cf6ffc93cdc 100644 --- a/images/windows/toolsets/toolset-2025.json +++ b/images/windows/toolsets/toolset-2025.json @@ -308,7 +308,7 @@ "version": "19" }, "php": { - "version": "8.3" + "version": "8.4" }, "postgresql": { "version": "17", From 7a1a792a74e84f39565da643ed0e2483375135fb Mon Sep 17 00:00:00 2001 From: RaviAkshintala <167848931+RaviAkshintala@users.noreply.github.com> Date: Mon, 27 Jan 2025 14:14:30 +0530 Subject: [PATCH 3446/3485] [Windows] Update the edge driver thumbprint (#11475) --- images/windows/scripts/build/Install-EdgeDriver.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/windows/scripts/build/Install-EdgeDriver.ps1 b/images/windows/scripts/build/Install-EdgeDriver.ps1 index 6d10d6e5d025..e8f07b7de161 100644 --- a/images/windows/scripts/build/Install-EdgeDriver.ps1 +++ b/images/windows/scripts/build/Install-EdgeDriver.ps1 @@ -27,7 +27,7 @@ Write-Host "Expand Microsoft Edge WebDriver archive..." Expand-7ZipArchive -Path $archivePath -DestinationPath $edgeDriverPath #Validate the EdgeDriver signature -$signatureThumbprint = "0BD8C56733FDCC06F8CB919FF5A200E39B1ACF71" +$signatureThumbprint = "7920AC8FB05E0FFFE21E8FF4B4F03093BA6AC16E" Test-FileSignature -Path "$edgeDriverPath\msedgedriver.exe" -ExpectedThumbprint $signatureThumbprint Write-Host "Setting the environment variables..." From 19c847488eefd80ed80762221ea941560b705b9b Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Mon, 27 Jan 2025 09:57:24 +0100 Subject: [PATCH 3447/3485] [Actions] Remove Ruby check for CodeQL test as not used (#11474) --- .github/workflows/codeql-analysis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 2c28c6eec319..22c10f958e53 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -34,7 +34,7 @@ jobs: strategy: fail-fast: false matrix: - language: [ 'python', 'ruby' ] + language: [ 'python' ] # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ] # Learn more about CodeQL language support at https://git.io/codeql-language-support From 620ebdf37b3fe2e4538d84483356a576bd524864 Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Mon, 27 Jan 2025 14:09:51 +0100 Subject: [PATCH 3448/3485] [macOS] Deprecate stale code, update structure accordingly (#11473) --- .github/ISSUE_TEMPLATE/announcement.yml | 1 - .github/ISSUE_TEMPLATE/bug-report.yml | 1 - .github/ISSUE_TEMPLATE/tool-request.yml | 1 - README.md | 2 - images.CI/macos/anka/Service.Helpers.psm1 | 4 +- .../xamarin-selector/select-xamarin-sdk-v2.sh | 53 --- .../xamarin-selector/select-xamarin-sdk.sh | 22 - images/macos/macos-12-Readme.md | 378 ------------------ .../build/configure-max-files-limitation.sh | 44 -- .../configure-network-interface-detection.sh | 39 -- .../scripts/build/configure-screensaver.sh | 30 -- .../macos/scripts/build/configure-system.sh | 9 +- .../build/configure-xcode-simulators.rb | 144 ------- images/macos/scripts/build/install-apache.sh | 12 - .../scripts/build/install-common-utils.sh | 61 +-- .../build/install-compilable-brew-packages.sh | 15 - images/macos/scripts/build/install-golang.sh | 16 - images/macos/scripts/build/install-haskell.sh | 31 -- .../macos/scripts/build/install-miniconda.sh | 24 -- images/macos/scripts/build/install-mongodb.sh | 23 -- images/macos/scripts/build/install-mono.sh | 4 +- images/macos/scripts/build/install-node.sh | 8 - .../scripts/build/install-pipx-packages.sh | 18 - images/macos/scripts/build/install-python.sh | 24 -- images/macos/scripts/build/install-rust.sh | 4 - .../macos/scripts/build/install-swiftlint.sh | 10 +- .../scripts/build/install-visualstudio.sh | 52 --- images/macos/scripts/build/install-xamarin.sh | 92 ----- .../docs-gen/Generate-SoftwareReport.ps1 | 125 +----- .../docs-gen/SoftwareReport.Common.psm1 | 219 +--------- .../docs-gen/SoftwareReport.WebServers.psm1 | 36 -- .../docs-gen/SoftwareReport.Xamarin.psm1 | 48 --- .../docs-gen/SoftwareReport.Xcode.psm1 | 21 +- .../macos/scripts/helpers/Common.Helpers.psm1 | 1 - .../confirm-identified-developers.scpt | 49 --- images/macos/scripts/helpers/utils.sh | 4 - images/macos/scripts/helpers/xamarin-utils.sh | 215 ---------- images/macos/scripts/tests/Android.Tests.ps1 | 8 - .../macos/scripts/tests/BasicTools.Tests.ps1 | 40 +- images/macos/scripts/tests/Common.Tests.ps1 | 81 ---- images/macos/scripts/tests/Haskell.Tests.ps1 | 30 -- images/macos/scripts/tests/Mono.Tests.ps1 | 74 ++++ .../scripts/tests/PipxPackages.Tests.ps1 | 12 - images/macos/scripts/tests/Toolset.Tests.ps1 | 109 ----- .../macos/scripts/tests/WebServers.Tests.ps1 | 25 -- images/macos/scripts/tests/Xamarin.Tests.ps1 | 317 --------------- images/macos/scripts/tests/Xcode.Tests.ps1 | 17 - images/macos/templates/macOS-12.anka.pkr.hcl | 315 --------------- images/macos/templates/macOS-13.anka.pkr.hcl | 3 - .../templates/macOS-13.arm64.anka.pkr.hcl | 4 - images/macos/templates/macOS-14.anka.pkr.hcl | 3 - .../templates/macOS-14.arm64.anka.pkr.hcl | 4 - images/macos/toolsets/Readme.md | 58 +-- images/macos/toolsets/toolset-12.json | 368 ----------------- 54 files changed, 105 insertions(+), 3203 deletions(-) delete mode 100644 images/macos/assets/xamarin-selector/select-xamarin-sdk-v2.sh delete mode 100644 images/macos/assets/xamarin-selector/select-xamarin-sdk.sh delete mode 100644 images/macos/macos-12-Readme.md delete mode 100644 images/macos/scripts/build/configure-max-files-limitation.sh delete mode 100644 images/macos/scripts/build/configure-network-interface-detection.sh delete mode 100644 images/macos/scripts/build/configure-screensaver.sh delete mode 100644 images/macos/scripts/build/configure-xcode-simulators.rb delete mode 100644 images/macos/scripts/build/install-apache.sh delete mode 100644 images/macos/scripts/build/install-compilable-brew-packages.sh delete mode 100644 images/macos/scripts/build/install-golang.sh delete mode 100644 images/macos/scripts/build/install-haskell.sh delete mode 100644 images/macos/scripts/build/install-miniconda.sh delete mode 100644 images/macos/scripts/build/install-mongodb.sh delete mode 100644 images/macos/scripts/build/install-pipx-packages.sh delete mode 100644 images/macos/scripts/build/install-visualstudio.sh delete mode 100644 images/macos/scripts/build/install-xamarin.sh delete mode 100644 images/macos/scripts/docs-gen/SoftwareReport.WebServers.psm1 delete mode 100644 images/macos/scripts/docs-gen/SoftwareReport.Xamarin.psm1 delete mode 100644 images/macos/scripts/helpers/confirm-identified-developers.scpt delete mode 100644 images/macos/scripts/helpers/xamarin-utils.sh delete mode 100644 images/macos/scripts/tests/Haskell.Tests.ps1 create mode 100644 images/macos/scripts/tests/Mono.Tests.ps1 delete mode 100644 images/macos/scripts/tests/PipxPackages.Tests.ps1 delete mode 100644 images/macos/scripts/tests/WebServers.Tests.ps1 delete mode 100644 images/macos/scripts/tests/Xamarin.Tests.ps1 delete mode 100644 images/macos/templates/macOS-12.anka.pkr.hcl delete mode 100644 images/macos/toolsets/toolset-12.json diff --git a/.github/ISSUE_TEMPLATE/announcement.yml b/.github/ISSUE_TEMPLATE/announcement.yml index abfb4bf40e0b..b165eae58d53 100644 --- a/.github/ISSUE_TEMPLATE/announcement.yml +++ b/.github/ISSUE_TEMPLATE/announcement.yml @@ -39,7 +39,6 @@ body: - label: Ubuntu 20.04 - label: Ubuntu 22.04 - label: Ubuntu 24.04 - - label: macOS 12 - label: macOS 13 - label: macOS 13 Arm64 - label: macOS 14 diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml index 6aa187756124..09990d9ce716 100644 --- a/.github/ISSUE_TEMPLATE/bug-report.yml +++ b/.github/ISSUE_TEMPLATE/bug-report.yml @@ -22,7 +22,6 @@ body: - label: Ubuntu 20.04 - label: Ubuntu 22.04 - label: Ubuntu 24.04 - - label: macOS 12 - label: macOS 13 - label: macOS 13 Arm64 - label: macOS 14 diff --git a/.github/ISSUE_TEMPLATE/tool-request.yml b/.github/ISSUE_TEMPLATE/tool-request.yml index 89a76aee0fba..f9bcb7553d27 100644 --- a/.github/ISSUE_TEMPLATE/tool-request.yml +++ b/.github/ISSUE_TEMPLATE/tool-request.yml @@ -60,7 +60,6 @@ body: - label: Ubuntu 20.04 - label: Ubuntu 22.04 - label: Ubuntu 24.04 - - label: macOS 12 - label: macOS 13 - label: macOS 13 Arm64 - label: macOS 14 diff --git a/README.md b/README.md index 1a6f2afb1983..ebcaeff1f65a 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,6 @@ To build a VM machine from this repo's source, see the [instructions](docs/creat | macOS 14 Arm64 |`macos-latest`, `macos-14`, `macos-latest-xlarge` or `macos-14-xlarge`| [macOS-14-arm64] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fsubir0071%2F385e39188f4280878bada99250e99db7%2Fraw%2Fmacos-14-arm64.json) | | macOS 13 | `macos-13` or `macos-13-large` | [macOS-13] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fsubir0071%2F385e39188f4280878bada99250e99db7%2Fraw%2Fmacos-13.json) | | macOS 13 Arm64 | `macos-13-xlarge` | [macOS-13-arm64] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fsubir0071%2F385e39188f4280878bada99250e99db7%2Fraw%2Fmacos-13-arm64.json) | -| macOS 12 <sup>deprecated</sup> | `macos-12` or `macos-12-large`| [macOS-12] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fsubir0071%2F385e39188f4280878bada99250e99db7%2Fraw%2Fmacos-12.json) | | Windows Server 2025 <sup>beta</sup> | `windows-2025` | [windows-2025] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fsubir0071%2F385e39188f4280878bada99250e99db7%2Fraw%2Fwin25.json) | | Windows Server 2022 | `windows-latest` or `windows-2022` | [windows-2022] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fsubir0071%2F385e39188f4280878bada99250e99db7%2Fraw%2Fwin22.json) | | Windows Server 2019 | `windows-2019` | [windows-2019] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fsubir0071%2F385e39188f4280878bada99250e99db7%2Fraw%2Fwin19.json) | @@ -45,7 +44,6 @@ To build a VM machine from this repo's source, see the [instructions](docs/creat [windows-2025]: https://github.com/actions/runner-images/blob/main/images/windows/Windows2025-Readme.md [windows-2022]: https://github.com/actions/runner-images/blob/main/images/windows/Windows2022-Readme.md [windows-2019]: https://github.com/actions/runner-images/blob/main/images/windows/Windows2019-Readme.md -[macOS-12]: https://github.com/actions/runner-images/blob/main/images/macos/macos-12-Readme.md [macOS-13]: https://github.com/actions/runner-images/blob/main/images/macos/macos-13-Readme.md [macOS-13-arm64]: https://github.com/actions/runner-images/blob/main/images/macos/macos-13-arm64-Readme.md [macOS-14]: https://github.com/actions/runner-images/blob/main/images/macos/macos-14-Readme.md diff --git a/images.CI/macos/anka/Service.Helpers.psm1 b/images.CI/macos/anka/Service.Helpers.psm1 index f8368b26fcc2..cabf0f9a213a 100644 --- a/images.CI/macos/anka/Service.Helpers.psm1 +++ b/images.CI/macos/anka/Service.Helpers.psm1 @@ -110,9 +110,7 @@ function Get-MacOSIPSWInstaller { [bool] $BetaSearch = $false ) - if ($MacOSVersion -eq [version] "12.0") { - $MacOSName = "macOS Monterey" - } elseif ($MacOSVersion -eq [version] "13.0") { + if ($MacOSVersion -eq [version] "13.0") { $MacOSName = "macOS Ventura" } elseif ($MacOSVersion -eq [version] "14.0") { $MacOSName = "macOS Sonoma" diff --git a/images/macos/assets/xamarin-selector/select-xamarin-sdk-v2.sh b/images/macos/assets/xamarin-selector/select-xamarin-sdk-v2.sh deleted file mode 100644 index 153b52e884b0..000000000000 --- a/images/macos/assets/xamarin-selector/select-xamarin-sdk-v2.sh +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/bash -e -o pipefail - -# Select any Xamarin SDK versions as the default ones independently by specifying only those versions that need to be changed. -# Examples: -# 1. Change all versions: $VM_ASSETS/select-xamarin-sdkv-v2.sh --mono=6.12 --ios=14.8 --android=10.2 --mac=7.8 -# 2. Change default Mono and iOS only: $VM_ASSETS/select-xamarin-sdkv-v2.sh --mono=6.12 --ios=14.8 -# 3. Change default Android only: $VM_ASSETS/select-xamarin-sdkv-v2.sh --android=11.1 - -get_framework_path() { - case $1 in - --mono) echo '/Library/Frameworks/Mono.framework/Versions' ;; - --ios) echo '/Library/Frameworks/Xamarin.iOS.framework/Versions' ;; - --android) echo '/Library/Frameworks/Xamarin.Android.framework/Versions' ;; - --mac) echo '/Library/Frameworks/Xamarin.Mac.framework/Versions' ;; - *) ;; - esac -} - -change_framework_version() { - local framework=$1 - local version=$2 - - echo "Select $framework $version" - - local countDigit=$(echo "${version}" | grep -o "\." | grep -c "\.") - - if [[ countDigit -gt 1 ]]; then - echo "[WARNING] It is not recommended to specify the exact framework version because your build can be broken with the next patch update. Consider using "major.minor" only format." - fi - - local framework_path=$(get_framework_path "$framework") - - if [ -d "${framework_path}/${version}" ]; then - sudo rm -f ${framework_path}/Current - sudo ln -s "${framework_path}/${version}" "${framework_path}/Current" - else - echo "Invalid framework version ${framework_path}/${version}" - exit 1 - fi -} - -for arg in "$@"; do - key=$(echo $arg | cut -f1 -d=) - value=$(echo $arg | cut -f2 -d=) - - case $key in - --mono | --ios | --android | --mac) change_framework_version $key $value ;; - *) - echo "Invalid parameter <${key}>" - exit 1 - ;; - esac -done diff --git a/images/macos/assets/xamarin-selector/select-xamarin-sdk.sh b/images/macos/assets/xamarin-selector/select-xamarin-sdk.sh deleted file mode 100644 index 014075ce0497..000000000000 --- a/images/macos/assets/xamarin-selector/select-xamarin-sdk.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash -e -o pipefail -if [ -z "$1" ]; then - echo "No Xamarin SDK specified." - exit 0 -fi - -XAMARIN_SDK=$1 - -echo "Set Xamarin SDK to ${XAMARIN_SDK}" -FOLDERS_LIST=( - '/Library/Frameworks/Mono.framework/Versions' - '/Library/Frameworks/Xamarin.iOS.framework/Versions' - '/Library/Frameworks/Xamarin.Android.framework/Versions' - '/Library/Frameworks/Xamarin.Mac.framework/Versions' - ) - -for FOLDER in "${FOLDERS_LIST[@]}" -do - echo "Set Current folder for ${FOLDER}" - sudo rm -f ${FOLDER}/Current - sudo ln -s ${FOLDER}/${XAMARIN_SDK} ${FOLDER}/Current -done diff --git a/images/macos/macos-12-Readme.md b/images/macos/macos-12-Readme.md deleted file mode 100644 index 86e0b715aa57..000000000000 --- a/images/macos/macos-12-Readme.md +++ /dev/null @@ -1,378 +0,0 @@ -| Announcements | -|-| -| [macOS 15 (Sequoia) is now available as a public beta in GitHub Actions](https://github.com/actions/runner-images/issues/10686) | -| [[Macos 13 and 14] Android NDK versions <=25 will be removed from images on October 07,2024](https://github.com/actions/runner-images/issues/10614) | -| [[Macos 13 and 14] Go version 1.20.0 will be removed on October 07,2024.](https://github.com/actions/runner-images/issues/10612) | -*** -# macOS 12 -- OS Version: macOS 12.7.6 (21H1320) -- Kernel Version: Darwin 21.6.0 -- Image Version: 20240926.174 - -## Installed Software - -### Language and Runtime -- .NET Core SDK: 6.0.425, 7.0.102, 7.0.202, 7.0.306, 7.0.410, 8.0.101, 8.0.204, 8.0.303, 8.0.402 -- Bash 3.2.57(1)-release -- Clang/LLVM 14.0.0 -- Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` -- GCC 12 (Homebrew GCC 12.4.0) - available by `gcc-12` alias -- GCC 13 (Homebrew GCC 13.3.0) - available by `gcc-13` alias -- GCC 14 (Homebrew GCC 14.2.0) - available by `gcc-14` alias -- GNU Fortran 12 (Homebrew GCC 12.4.0) - available by `gfortran-12` alias -- GNU Fortran 13 (Homebrew GCC 13.3.0) - available by `gfortran-13` alias -- GNU Fortran 14 (Homebrew GCC 14.2.0) - available by `gfortran-14` alias -- Julia 1.10.5 -- Kotlin 2.0.20-release-360 -- Go 1.21.13 -- Mono 6.12.0.188 -- Node.js 18.20.4 -- MSBuild 16.10.1.51301 (Mono 6.12.0.188) -- NVM 0.39.7 -- NVM - Cached node versions: 16.20.2, 18.20.4, 20.17.0 -- Perl 5.38.2 -- PHP 8.3.11 -- Python 2.7.18 -- Python3 3.12.6 -- R 4.4.1 -- Ruby 3.0.7p220 - -### Package Management -- Bundler 2.5.20 -- Carthage 0.40.0 -- CocoaPods 1.15.2 -- Composer 2.7.9 -- Homebrew 4.3.24 -- Miniconda 24.7.1 -- NPM 10.7.0 -- NuGet 6.3.1.1 -- Pip 20.3.4 (python 2.7) -- Pip3 24.2 (python 3.12) -- Pipx 1.7.1 -- RubyGems 3.5.20 -- Vcpkg 2024 (build from commit 3d8959985) -- Yarn 1.22.22 - -#### Environment variables -| Name | Value | -| ----------------------- | ---------------------- | -| CONDA | /usr/local/miniconda | -| VCPKG_INSTALLATION_ROOT | /usr/local/share/vcpkg | - -### Project Management -- Apache Ant 1.10.15 -- Apache Maven 3.9.9 -- Gradle 8.10.2 -- Sbt 1.10.2 - -### Utilities -- 7-Zip 17.05 -- aria2 1.37.0 -- azcopy 10.26.0 -- bazel 7.3.1 -- bazelisk 1.21.0 -- bsdtar 3.5.1 - available by 'tar' alias -- Curl 8.10.1 -- Git 2.46.2 -- Git LFS 3.5.1 -- GitHub CLI 2.57.0 -- GNU Tar 1.35 - available by 'gtar' alias -- GNU Wget 1.24.5 -- gpg (GnuPG) 2.4.5 -- ImageMagick 7.1.1-38 -- jq 1.7.1 -- mongo 5.0.29 -- mongod 5.0.29 -- OpenSSL 1.1.1w 11 Sep 2023 -- Packer 1.9.4 -- pkg-config 0.29.2 -- PostgreSQL 14.13 (Homebrew) -- psql (PostgreSQL) 14.13 (Homebrew) -- Sox 14.4.2 -- Subversion (SVN) 1.14.3 -- Switchaudio-osx 1.2.2 -- Vagrant 2.4.1 -- VirtualBox 6.1.38r153438 -- yq 4.44.3 -- zstd 1.5.6 - -### Tools -- App Center CLI 3.0.1 -- AWS CLI 2.17.59 -- AWS SAM CLI 1.124.0 -- AWS Session Manager CLI 1.2.650.0 -- Azure CLI 2.64.0 -- Azure CLI (azure-devops) 1.0.1 -- Bicep CLI 0.30.23 -- Cabal 3.10.3.0 -- Cmake 3.30.3 -- CodeQL Action Bundle 2.19.0 -- Colima 0.7.5 -- Fastlane 2.222.0 -- GHC 9.10.1 -- GHCup 0.1.30.0 -- Jazzy 0.15.2 -- Stack 3.1.1 -- SwiftFormat 0.54.5 -- Swig 4.2.1 -- Xcbeautify 1.6.0 -- Xcode Command Line Tools 14.2.0.0.1.1668646533 -- Xcodes 1.5.0 - -### Linters -- SwiftLint 0.53.0 -- Yamllint 1.35.1 - -### Browsers -- Safari 17.6 (17618.3.11.11.7) -- SafariDriver 17.6 (17618.3.11.11.7) -- Google Chrome 129.0.6668.71 -- Google Chrome for Testing 129.0.6668.70 -- ChromeDriver 129.0.6668.70 -- Microsoft Edge 129.0.2792.52 -- Microsoft Edge WebDriver 129.0.2792.46 -- Mozilla Firefox 130.0.1 -- geckodriver 0.35.0 -- Selenium server 4.25.0 - -#### Environment variables -| Name | Value | -| --------------- | ------------------------------------- | -| CHROMEWEBDRIVER | /usr/local/share/chromedriver-mac-x64 | -| EDGEWEBDRIVER | /usr/local/share/edge_driver | -| GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | - -### Java -| Version | Environment Variable | -| --------------------- | -------------------- | -| 8.0.422+5.1 (default) | JAVA_HOME_8_X64 | -| 11.0.24+8 | JAVA_HOME_11_X64 | -| 17.0.12+7 | JAVA_HOME_17_X64 | -| 21.0.4+7.0 | JAVA_HOME_21_X64 | - -### Cached Tools - -#### PyPy -- 2.7.18 [PyPy 7.3.17] -- 3.7.13 [PyPy 7.3.9] -- 3.8.16 [PyPy 7.3.11] -- 3.9.19 [PyPy 7.3.16] -- 3.10.14 [PyPy 7.3.17] - -#### Ruby -- 3.0.7 -- 3.1.6 -- 3.2.5 -- 3.3.5 - -#### Python -- 3.7.17 -- 3.8.18 -- 3.9.20 -- 3.10.15 -- 3.11.9 -- 3.12.6 - -#### Node.js -- 16.20.2 -- 18.20.4 -- 20.17.0 - -#### Go -- 1.20.14 -- 1.21.13 -- 1.22.7 -- 1.23.1 - -### Rust Tools -- Cargo 1.81.0 -- Rust 1.81.0 -- Rustdoc 1.81.0 -- Rustup 1.27.1 - -#### Packages -- Bindgen 0.70.1 -- Cargo-audit 0.20.1 -- Cargo-outdated 0.15.0 -- Cbindgen 0.27.0 -- Clippy 0.1.81 -- Rustfmt 1.7.1-stable - -### PowerShell Tools -- PowerShell 7.4.5 - -#### PowerShell Modules -- Az: 12.3.0 -- MarkdownPS: 1.10 -- Pester: 5.6.1 -- PSScriptAnalyzer: 1.22.0 - -### Web Servers -| Name | Version | ConfigFile | ServiceStatus | ListenPort | -| ----- | ------- | ------------------------------- | ------------- | ---------- | -| httpd | 2.4.62 | /usr/local/etc/httpd/httpd.conf | none | 80 | -| nginx | 1.27.1 | /usr/local/etc/nginx/nginx.conf | none | 80 | - -### Xamarin - -#### Visual Studio for Mac -| Version | Build | Path | -| -------------- | ----------- | ------------------------------------ | -| 2019 | 8.10.25.2 | /Applications/Visual Studio 2019.app | -| 2022 (default) | 17.6.14.413 | /Applications/Visual Studio.app | - -##### Notes -``` -To use Visual Studio 2019 by default rename the app: -mv "/Applications/Visual Studio.app" "/Applications/Visual Studio 2022.app" -mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" -``` - -#### Xamarin bundles -| symlink | Xamarin.Mono | Xamarin.iOS | Xamarin.Mac | Xamarin.Android | -| ----------------- | ------------ | ----------- | ----------- | --------------- | -| 6_12_25 | 6.12 | 16.4 | 9.3 | 13.2 | -| 6_12_24 | 6.12 | 16.2 | 9.1 | 13.2 | -| 6_12_23 | 6.12 | 16.2 | 9.1 | 13.1 | -| 6_12_22 | 6.12 | 16.1 | 9.0 | 13.1 | -| 6_12_21 (default) | 6.12 | 16.0 | 8.12 | 13.1 | -| 6_12_20 | 6.12 | 16.0 | 8.12 | 13.0 | -| 6_12_19 | 6.12 | 15.12 | 8.12 | 13.0 | -| 6_12_18 | 6.12 | 15.10 | 8.10 | 12.3 | -| 6_12_17 | 6.12 | 15.10 | 8.10 | 12.2 | -| 6_12_16 | 6.12 | 15.8 | 8.8 | 12.2 | -| 6_12_15 | 6.12 | 15.8 | 8.8 | 12.1 | -| 6_12_14 | 6.12 | 15.8 | 8.8 | 12.0 | -| 6_12_13 | 6.12 | 15.6 | 8.6 | 12.0 | -| 6_12_12 | 6.12 | 15.4 | 8.4 | 12.0 | -| 6_12_11 | 6.12 | 15.2 | 8.2 | 12.0 | -| 6_12_10 | 6.12 | 15.0 | 7.14 | 11.3 | - -#### Unit Test Framework -- NUnit 3.6.1 - -### Xcode -| Version | Build | Path | -| -------------- | -------- | ------------------------------ | -| 14.2 (default) | 14C18 | /Applications/Xcode_14.2.app | -| 14.1 | 14B47b | /Applications/Xcode_14.1.app | -| 14.0.1 | 14A400 | /Applications/Xcode_14.0.1.app | -| 13.4.1 | 13F100 | /Applications/Xcode_13.4.1.app | -| 13.3.1 | 13E500a | /Applications/Xcode_13.3.1.app | -| 13.2.1 | 13C100 | /Applications/Xcode_13.2.1.app | -| 13.1 | 13A1030d | /Applications/Xcode_13.1.app | - -#### Xcode Support Tools -- xcpretty 0.3.0 -- xcversion 2.8.1 - -#### Installed SDKs -| SDK | SDK Name | Xcode Version | -| ----------------------- | -------------------- | ---------------------- | -| macOS 12.0 | macosx12.0 | 13.1 | -| macOS 12.1 | macosx12.1 | 13.2.1 | -| macOS 12.3 | macosx12.3 | 13.3.1, 13.4.1, 14.0.1 | -| macOS 13.0 | macosx13.0 | 14.1 | -| macOS 13.1 | macosx13.1 | 14.2 | -| iOS 15.0 | iphoneos15.0 | 13.1 | -| iOS 15.2 | iphoneos15.2 | 13.2.1 | -| iOS 15.4 | iphoneos15.4 | 13.3.1 | -| iOS 15.5 | iphoneos15.5 | 13.4.1 | -| iOS 16.0 | iphoneos16.0 | 14.0.1 | -| iOS 16.1 | iphoneos16.1 | 14.1 | -| iOS 16.2 | iphoneos16.2 | 14.2 | -| Simulator - iOS 15.0 | iphonesimulator15.0 | 13.1 | -| Simulator - iOS 15.2 | iphonesimulator15.2 | 13.2.1 | -| Simulator - iOS 15.4 | iphonesimulator15.4 | 13.3.1 | -| Simulator - iOS 15.5 | iphonesimulator15.5 | 13.4.1 | -| Simulator - iOS 16.0 | iphonesimulator16.0 | 14.0.1 | -| Simulator - iOS 16.1 | iphonesimulator16.1 | 14.1 | -| Simulator - iOS 16.2 | iphonesimulator16.2 | 14.2 | -| tvOS 15.0 | appletvos15.0 | 13.1 | -| tvOS 15.2 | appletvos15.2 | 13.2.1 | -| tvOS 15.4 | appletvos15.4 | 13.3.1, 13.4.1 | -| tvOS 16.0 | appletvos16.0 | 14.0.1 | -| tvOS 16.1 | appletvos16.1 | 14.1, 14.2 | -| Simulator - tvOS 15.0 | appletvsimulator15.0 | 13.1 | -| Simulator - tvOS 15.2 | appletvsimulator15.2 | 13.2.1 | -| Simulator - tvOS 15.4 | appletvsimulator15.4 | 13.3.1, 13.4.1 | -| Simulator - tvOS 16.0 | appletvsimulator16.0 | 14.0.1 | -| Simulator - tvOS 16.1 | appletvsimulator16.1 | 14.1, 14.2 | -| watchOS 8.0 | watchos8.0 | 13.1 | -| watchOS 8.3 | watchos8.3 | 13.2.1 | -| watchOS 8.5 | watchos8.5 | 13.3.1, 13.4.1 | -| watchOS 9.0 | watchos9.0 | 14.0.1 | -| watchOS 9.1 | watchos9.1 | 14.1, 14.2 | -| Simulator - watchOS 8.0 | watchsimulator8.0 | 13.1 | -| Simulator - watchOS 8.3 | watchsimulator8.3 | 13.2.1 | -| Simulator - watchOS 8.5 | watchsimulator8.5 | 13.3.1, 13.4.1 | -| Simulator - watchOS 9.0 | watchsimulator9.0 | 14.0.1 | -| Simulator - watchOS 9.1 | watchsimulator9.1 | 14.1, 14.2 | -| DriverKit 21.0.1 | driverkit21.0.1 | 13.1 | -| DriverKit 21.2 | driverkit21.2 | 13.2.1 | -| DriverKit 21.4 | driverkit21.4 | 13.3.1, 13.4.1, 14.0.1 | -| DriverKit 22.1 | driverkit22.1 | 14.1 | -| DriverKit 22.2 | driverkit22.2 | 14.2 | - -#### Installed Simulators -| OS | Simulators | -| ----------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | -| iOS 15.0 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | -| iOS 15.2 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | -| iOS 15.4 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPhone SE (3rd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | -| iOS 15.5 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPhone SE (3rd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | -| iOS 16.0 | iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPhone SE (3rd generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (9.7-inch) | -| iOS 16.1 | iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro (9.7-inch) | -| iOS 16.2 | iPod touch (7th generation)<br>iPhone 11<br>iPhone 11 Pro<br>iPhone 11 Pro Max<br>iPhone 12<br>iPhone 12 mini<br>iPhone 12 Pro<br>iPhone 12 Pro Max<br>iPhone 13<br>iPhone 13 mini<br>iPhone 13 Pro<br>iPhone 13 Pro Max<br>iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 8<br>iPhone 8 Plus<br>iPhone SE (2nd generation)<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad (9th generation)<br>iPad Air (4th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (3rd generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (5th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro (9.7-inch) | -| tvOS 15.0 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | -| tvOS 15.2 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | -| tvOS 15.4 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | -| tvOS 16.0 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (at 1080p) (2nd generation) | -| tvOS 16.1 | Apple TV<br>Apple TV 4K (2nd generation)<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p)<br>Apple TV 4K (at 1080p) (2nd generation) | -| watchOS 8.0 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | -| watchOS 8.3 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | -| watchOS 8.5 | Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm | -| watchOS 9.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | -| watchOS 9.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm) | - -### Android -| Package Name | Version | -| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 8.0 | -| Android Emulator | 35.1.21 | -| Android SDK Build-tools | 35.0.0<br>34.0.0<br>33.0.0 33.0.1 33.0.2 33.0.3<br>32.0.0<br>31.0.0 | -| Android SDK Platforms | android-35 (rev 1)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1) | -| Android SDK Platform-Tools | 35.0.2 | -| Android Support Repository | 47.0.0 | -| CMake | 3.18.1<br>3.22.1 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 24.0.8215888<br>25.2.9519653 (default)<br>26.3.11579264<br>27.1.12297006 | - -#### Environment variables -| Name | Value | -| ----------------------- | --------------------------------------------------- | -| ANDROID_HOME | /Users/runner/Library/Android/sdk | -| ANDROID_NDK | /Users/runner/Library/Android/sdk/ndk/25.2.9519653 | -| ANDROID_NDK_HOME | /Users/runner/Library/Android/sdk/ndk/25.2.9519653 | -| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/27.1.12297006 | -| ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk/25.2.9519653 | -| ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk | - -### Miscellaneous -- libXext 1.3.6 -- libXft 2.3.8 -- Tcl/Tk 8.6.15 -- Zlib 1.3.1 - -#### Environment variables -| Name | Value | -| ----------------- | ----------------------------------------------------------------------------------------- | -| PARALLELS_DMG_URL | https://download.parallels.com/desktop/v20/20.0.1-55659/ParallelsDesktop-20.0.1-55659.dmg | - -##### Notes -``` -If you want to use Parallels Desktop you should download a package from URL stored in -PARALLELS_DMG_URL environment variable. A system extension is allowed for this version. -``` - diff --git a/images/macos/scripts/build/configure-max-files-limitation.sh b/images/macos/scripts/build/configure-max-files-limitation.sh deleted file mode 100644 index 49e5fc0c52ae..000000000000 --- a/images/macos/scripts/build/configure-max-files-limitation.sh +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/bash -e -o pipefail -################################################################################ -## File: configure-max-files-limitation.sh -## Desc: Configure max files limitation -################################################################################ - -Launch_Daemons="/Library/LaunchDaemons" - -# EOF in quotes to disable variable expansion -echo "Creating limit.maxfiles.plist" -cat > ${Launch_Daemons}/limit.maxfiles.plist << EOF -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" - "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> -<plist version="1.0"> - <dict> - <key>Label</key> - <string>limit.maxfiles</string> - <key>Program</key> - <string>/Users/runner/limit-maxfiles.sh</string> - <key>RunAtLoad</key> - <true/> - <key>ServiceIPC</key> - <false/> - </dict> -</plist> -EOF - -# Creating script for applying workaround https://developer.apple.com/forums/thread/735798 - -cat > /Users/runner/limit-maxfiles.sh << EOF -#!/bin/bash -sudo launchctl limit maxfiles 256 unlimited -sudo launchctl limit maxfiles 65536 524288 -EOF - -echo "limit.maxfiles.sh permissions changing" -chmod +x /Users/runner/limit-maxfiles.sh - -echo "limit.maxfiles.plist permissions changing" -chown root:wheel "${Launch_Daemons}/limit.maxfiles.plist" -chmod 0644 ${Launch_Daemons}/limit.maxfiles.plist - -echo "Done, limit.maxfiles has been updated" diff --git a/images/macos/scripts/build/configure-network-interface-detection.sh b/images/macos/scripts/build/configure-network-interface-detection.sh deleted file mode 100644 index 1a09bc2c62e5..000000000000 --- a/images/macos/scripts/build/configure-network-interface-detection.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash -e -o pipefail -################################################################################ -## File: configure-network-interface-detection.sh -## Desc: add a Daemon to re-detect the attached network interfaces after vm is booted. -## Maintainer: @timsutton -## script was taken from https://github.com/timsutton/osx-vm-templates/blob/master/scripts/add-network-interface-detection.sh -################################################################################ - -PLIST=/Library/LaunchDaemons/sonoma.detectnewhardware.plist -cat <<EOF > ${PLIST} -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> -<plist version="1.0"> -<dict> - <key>Label</key> - <string>sonoma.detectnewhardware</string> - <key>ProgramArguments</key> - <array> - <string>/usr/sbin/networksetup</string> - <string>-detectnewhardware</string> - </array> - <key>RunAtLoad</key> - <true/> -</dict> -</plist> -EOF - -# These should be already set as follows, but since they're required -# in order to load properly, we set them explicitly. -/bin/chmod 644 ${PLIST} -/usr/sbin/chown root:wheel ${PLIST} - -: ' -The MIT License (MIT) -Copyright (c) 2013-2017 Timothy Sutton -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -' diff --git a/images/macos/scripts/build/configure-screensaver.sh b/images/macos/scripts/build/configure-screensaver.sh deleted file mode 100644 index 687302880b97..000000000000 --- a/images/macos/scripts/build/configure-screensaver.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/bash -e -o pipefail -################################################################################ -## File: configure-screensaver.sh -## Desc: Configure screensaver -################################################################################ - -# set screensaver idleTime to 0, to prevent turning screensaver on -macUUID=$(ioreg -rd1 -c IOPlatformExpertDevice | grep -i "UUID" | cut -c27-62) - -rm -rf /Users/$USERNAME/Library/Preferences/com.apple.screensaver.$macUUID.plist -rm -rf /Users/$USERNAME/Library/Preferences/ByHost/com.apple.screensaver.$macUUID.plist -rm -rf /Users/$USERNAME/Library/Preferences/com.apple.screensaver.plist -rm -rf /Users/$USERNAME/Library/Preferences/ByHost/com.apple.screensaver.plist - -defaults write /Users/$USERNAME/Library/Preferences/com.apple.screensaver.$macUUID.plist idleTime -string 0 -defaults write /Users/$USERNAME/Library/Preferences/com.apple.screensaver.$macUUID.plist CleanExit "YES" -defaults write /Users/$USERNAME/Library/Preferences/ByHost/com.apple.screensaver.$macUUID.plist idleTime -string 0 -defaults write /Users/$USERNAME/Library/Preferences/ByHost/com.apple.screensaver.$macUUID.plist CleanExit "YES" -defaults write /Users/$USERNAME/Library/Preferences/com.apple.screensaver.plist idleTime -string 0 -defaults write /Users/$USERNAME/Library/Preferences/com.apple.screensaver.plist CleanExit "YES" -defaults write /Users/$USERNAME/Library/Preferences/ByHost/com.apple.screensaver.plist idleTime -string 0 -defaults write /Users/$USERNAME/Library/Preferences/ByHost/com.apple.screensaver.plist CleanExit "YES" - -chown -R $USERNAME:staff /Users/$USERNAME/Library/Preferences/ByHost/ -chown -R $USERNAME:staff /Users/$USERNAME/Library/Preferences/ - -killall cfprefsd - -# Set values to 0, to prevent sleep at all -pmset -a displaysleep 0 sleep 0 disksleep 0 diff --git a/images/macos/scripts/build/configure-system.sh b/images/macos/scripts/build/configure-system.sh index 23fd09f9e1ad..62fdb5bfc94d 100644 --- a/images/macos/scripts/build/configure-system.sh +++ b/images/macos/scripts/build/configure-system.sh @@ -12,20 +12,13 @@ close_finder_window # Remove Parallels Desktop # https://github.com/actions/runner-images/issues/6105 # https://github.com/actions/runner-images/issues/10143 -if is_Monterey || is_SonomaX64 || is_VenturaX64; then +if is_SonomaX64 || is_VenturaX64; then brew uninstall parallels fi # Put documentation to $HOME root cp $HOME/image-generation/output/software-report/systeminfo.* $HOME/ -# Put build vm assets (xamarin-selector) scripts to proper directory -if is_Monterey || is_Sonoma || is_Ventura; then - mkdir -p /usr/local/opt/$USER/scripts - mv $HOME/image-generation/assets/* /usr/local/opt/$USER/scripts - find /usr/local/opt/$USER/scripts -type f -name "*\.sh" -exec chmod +x {} \; -fi - # Remove fastlane cached cookie rm -rf ~/.fastlane diff --git a/images/macos/scripts/build/configure-xcode-simulators.rb b/images/macos/scripts/build/configure-xcode-simulators.rb deleted file mode 100644 index a585acc551b6..000000000000 --- a/images/macos/scripts/build/configure-xcode-simulators.rb +++ /dev/null @@ -1,144 +0,0 @@ -#!/usr/bin/env ruby -################################################################################ -## File: configure-xcode-simulators.rb -## Desc: List all simulators, find duplicate type and delete them. -## Maintainer: @vlas-voloshin -## script was taken from https://gist.github.com/vlas-voloshin/f9982128200345cd3fb7 -################################################################################ - -class SimDevice - - attr_accessor :runtime - attr_accessor :name - attr_accessor :identifier - attr_accessor :timestamp - - def initialize(runtime, name, identifier, timestamp) - @runtime = runtime - @name = name - @identifier = identifier - @timestamp = timestamp - end - - def to_s - return "#{@name} - #{@runtime} (#{@identifier}) [#{@timestamp}]" - end - - def equivalent_to_device(device) - return @runtime == device.runtime && @name == device.name - end - - end - - # Executes a shell command and returns the result from stdout - def execute_simctl_command(command) - return %x[xcrun simctl #{command}] - end - - # Retrieves the creation date/time of simulator with specified identifier - def simulator_creation_date(identifier) - directory = Dir.home() + "/Library/Developer/CoreSimulator/Devices/" + identifier - if (Dir.exists?(directory)) - if (File::Stat.method_defined?(:birthtime)) - return File.stat(directory).birthtime - else - return File.stat(directory).ctime - end - else - # Simulator directory is not yet created - treat it as if it was created right now (happens with new iOS 9 sims) - return Time.now - end - end - - # Deletes specified simulator - def delete_device(device) - execute_simctl_command("delete #{device.identifier}") - end - - puts("Searching for simulators...") - - # Retrieve the list of existing simulators - devices = [] - runtime = "" - execute_simctl_command("list devices").lines.each do |line| - case line[0] - when '=' - # First header, skip it - when '-' - # Runtime header - runtime = line.scan(/-- (.+?) --/).flatten[0] - else - name_and_identifier = line.scan(/\s+(.+?) \(([\w\d]+-[\w\d]+-[\w\d-]+)\)/)[0] - name = name_and_identifier[0] - identifier = name_and_identifier[1] - timestamp = simulator_creation_date(identifier) - device = SimDevice.new(runtime, name, identifier, timestamp) - devices.push(device) - end - end - - # Sort the simulators by their creation timestamp, ascending - devices = devices.sort { |a, b| a.timestamp <=> b.timestamp } - - duplicates = {} - # Enumerate all devices except for the last one - for i in 0..devices.count-2 - device = devices[i] - # Enumerate all devices *after* this one (created *later*) - for j in i+1..devices.count-1 - potential_duplicate = devices[j] - if potential_duplicate.equivalent_to_device(device) - duplicates[potential_duplicate] = device - # Break out of the inner loop if a duplicate is found - if another duplicate exists, - # it will be found when this one is reached in the outer loop - break - end - end - end - - if duplicates.count == 0 - puts("You don't have duplicate simulators!") - exit() - end - - puts("Looks like you have #{duplicates.count} duplicate simulator#{duplicates.count > 1 ? "s" : ""}:") - duplicates.each_pair do |duplicate, original| - puts - puts("#{duplicate}") - puts("--- duplicate of ---") - puts("#{original}") - end - puts - - puts("Each duplicate was determined as the one created later than the 'original'.") - - puts("Deleting...") - duplicates.each_key do |duplicate| - delete_device(duplicate) - end - - puts("Done!") - -=begin -MIT License - -Copyright (c) 2015-2019 Vlas Voloshin - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. -=end diff --git a/images/macos/scripts/build/install-apache.sh b/images/macos/scripts/build/install-apache.sh deleted file mode 100644 index b87345eea73c..000000000000 --- a/images/macos/scripts/build/install-apache.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash -e -o pipefail -################################################################################ -## File: install-apache.sh -## Desc: Install Apache HTTP Server -################################################################################ - -source ~/utils/utils.sh - -brew_smart_install httpd -sudo sed -Ei '' 's/Listen .*/Listen 80/' $(brew --prefix)/etc/httpd/httpd.conf - -invoke_tests "WebServers" "Apache" diff --git a/images/macos/scripts/build/install-common-utils.sh b/images/macos/scripts/build/install-common-utils.sh index 9f9013538b70..bdab996d1bbb 100644 --- a/images/macos/scripts/build/install-common-utils.sh +++ b/images/macos/scripts/build/install-common-utils.sh @@ -6,29 +6,20 @@ source ~/utils/utils.sh -# Monterey needs future review: -# aliyun-cli, gnupg, helm have issues with building from the source code. -# Added gmp for now, because toolcache ruby needs its libs. Remove it when php starts to build from source code. common_packages=$(get_toolset_value '.brew.common_packages[]') for package in $common_packages; do echo "Installing $package..." - if is_Monterey && [[ $package == "xcbeautify" ]]; then - # Pin the version on Monterey as 2.0.x requires Xcode >=15.0 which is not available on OS12 - xcbeautify_path=$(download_with_retry "https://raw.githubusercontent.com/Homebrew/homebrew-core/d3653e83f9c029a3fddb828ac804b07ac32f7b3b/Formula/x/xcbeautify.rb") - brew install "$xcbeautify_path" + if [[ $package == "packer" ]]; then + # Packer has been deprecated in Homebrew. Use tap to install Packer. + brew install hashicorp/tap/packer else - if [[ $package == "packer" ]]; then - # Packer has been deprecated in Homebrew. Use tap to install Packer. - brew install hashicorp/tap/packer + if (is_VenturaX64 || is_SonomaX64) && [[ $package == "tcl-tk@8" ]]; then + brew_smart_install "$package" + # Fix for https://github.com/actions/runner-images/issues/11074 + ln -sf $(brew --prefix tcl-tk@8)/lib/libtcl8.6.dylib /usr/local/lib/libtcl8.6.dylib + ln -sf $(brew --prefix tcl-tk@8)/lib/libtk8.6.dylib /usr/local/lib/libtk8.6.dylib else - if (is_VenturaX64 || is_SonomaX64) && [[ $package == "tcl-tk@8" ]]; then - brew_smart_install "$package" - # Fix for https://github.com/actions/runner-images/issues/11074 - ln -sf $(brew --prefix tcl-tk@8)/lib/libtcl8.6.dylib /usr/local/lib/libtcl8.6.dylib - ln -sf $(brew --prefix tcl-tk@8)/lib/libtk8.6.dylib /usr/local/lib/libtk8.6.dylib - else - brew_smart_install "$package" - fi + brew_smart_install "$package" fi fi done @@ -36,37 +27,26 @@ done cask_packages=$(get_toolset_value '.brew.cask_packages[]') for package in $cask_packages; do echo "Installing $package..." - if is_Monterey && [[ $package == "virtualbox" ]]; then - # Do not update VirtualBox on macOS 12 due to the issue with VMs in gurumediation state which blocks Vagrant on macOS: https://github.com/actions/runner-images/issues/8730 - # macOS host: Dropped all kernel extensions. VirtualBox relies fully on the hypervisor and vmnet frameworks provided by Apple now. - virtualbox_cask_path=$(download_with_retry "https://raw.githubusercontent.com/Homebrew/homebrew-cask/aa3c55951fc9d687acce43e5c0338f42c1ddff7b/Casks/virtualbox.rb") - brew install $virtualbox_cask_path + if is_Arm64 && [[ $package == "parallels" ]]; then + echo "Parallels installation is skipped for arm64 architecture" else - if is_Arm64 && [[ $package == "parallels" ]]; then - echo "Parallels installation is skipped for arm64 architecture" - else - brew install --cask $package - fi + brew install --cask $package fi done # Load "Parallels International GmbH" -if is_Monterey || is_SonomaX64 || is_VenturaX64; then +if is_SonomaX64 || is_VenturaX64; then sudo kextload /Applications/Parallels\ Desktop.app/Contents/Library/Extensions/10.9/prl_hypervisor.kext || true fi # Execute AppleScript to change security preferences for macOS12, macOS13 and macOS14 # System Preferences -> Security & Privacy -> General -> Unlock -> Allow -> Not now -if is_Monterey || is_SonomaX64 || is_VenturaX64; then +if is_SonomaX64 || is_VenturaX64; then for retry in {4..0}; do echo "Executing AppleScript to change security preferences. Retries left: $retry" { set -e osascript -e 'tell application "System Events" to get application processes where visible is true' - if is_Monterey; then - osascript $HOME/utils/confirm-identified-developers.scpt $USER_PASSWORD - fi - if is_VenturaX64; then osascript $HOME/utils/confirm-identified-developers-macos13.scpt $USER_PASSWORD fi @@ -87,17 +67,10 @@ if is_Monterey || is_SonomaX64 || is_VenturaX64; then fi # Validate "Parallels International GmbH" kext -if is_Monterey || is_SonomaX64 || is_VenturaX64; then - - if is_Monterey; then - echo "Closing System Preferences window if it is still opened" - killall "System Preferences" || true - fi +if is_SonomaX64 || is_VenturaX64; then - if is_SonomaX64 || is_VenturaX64; then - echo "Closing System Settings window if it is still opened" - killall "System Settings" || true - fi + echo "Closing System Settings window if it is still opened" + killall "System Settings" || true echo "Checking parallels kexts" dbName="/var/db/SystemPolicyConfiguration/KextPolicy" diff --git a/images/macos/scripts/build/install-compilable-brew-packages.sh b/images/macos/scripts/build/install-compilable-brew-packages.sh deleted file mode 100644 index b0f22c5dfb65..000000000000 --- a/images/macos/scripts/build/install-compilable-brew-packages.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -e -o pipefail -################################################################################ -## File: install-compilable-brew-packages.sh -## Desc: Install compilable brew packages -################################################################################ - -source ~/utils/utils.sh - -compilable_packages=$(get_toolset_value '.brew.compilable_packages[]') -for package in $compilable_packages; do - echo "Installing $package..." - brew_smart_install "$package" -done - -invoke_tests "Common" "Compiled" diff --git a/images/macos/scripts/build/install-golang.sh b/images/macos/scripts/build/install-golang.sh deleted file mode 100644 index 7a28868edf53..000000000000 --- a/images/macos/scripts/build/install-golang.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash -e -o pipefail -################################################################################ -## File: install-golang.sh -## Desc: Install Go -################################################################################ - -source ~/utils/utils.sh - -default_go_version=$(get_toolset_value '.go.default') -echo "Installing Go..." -brew_smart_install "go@${default_go_version}" - -# Create symlinks to preserve backward compatibility. Symlinks are not created when non-latest go is being installed -ln -sf $(brew --prefix go@${default_go_version})/bin/* /usr/local/bin/ - -invoke_tests "Common" "Go" diff --git a/images/macos/scripts/build/install-haskell.sh b/images/macos/scripts/build/install-haskell.sh deleted file mode 100644 index d88bf616e05f..000000000000 --- a/images/macos/scripts/build/install-haskell.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/bash -e -o pipefail -################################################################################ -## File: install-haskell.sh -## Desc: Install Haskell -################################################################################ - -source ~/utils/utils.sh - -curl --proto '=https' --tlsv1.2 -fsSL https://get-ghcup.haskell.org | bash -export PATH="$HOME/.ghcup/bin:$PATH" -echo 'export PATH="$PATH:$HOME/.ghcup/bin"' >> $HOME/.bashrc - -# ghcup output looks like this "ghc 8.6.4 base-4.12.0.0 hls-powered", need to take all the first versions only(8.6.4 in that case) and avoid pre-release ones -availableVersions=$(ghcup list -t ghc -r | grep -v "prerelease" | awk '{print $2}') - -# 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) - echo "install ghc version $fullVersion..." - ghcup install $fullVersion - ghcup set $fullVersion -done - -echo "install cabal..." -ghcup install-cabal - -echo "Updating stack..." -ghcup install stack latest - -invoke_tests "Haskell" diff --git a/images/macos/scripts/build/install-miniconda.sh b/images/macos/scripts/build/install-miniconda.sh deleted file mode 100644 index 7d9ea2fe1730..000000000000 --- a/images/macos/scripts/build/install-miniconda.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash -e -o pipefail -################################################################################ -## File: install-miniconda.sh -## Desc: Install Miniconda -################################################################################ - -source ~/utils/utils.sh - -miniconda_installer_path=$(download_with_retry "https://repo.anaconda.com/miniconda/Miniconda3-latest-MacOSX-x86_64.sh") -chmod +x $miniconda_installer_path -sudo $miniconda_installer_path -b -p /usr/local/miniconda - -# Chmod with full permissions recursively to avoid permissions restrictions -sudo chmod -R 777 /usr/local/miniconda - -sudo ln -s /usr/local/miniconda/bin/conda /usr/local/bin/conda - -if [[ -d $HOME/.conda ]]; then - sudo chown -R $USER $HOME/.conda -fi - -echo "export CONDA=/usr/local/miniconda" >> $HOME/.bashrc - -invoke_tests "Common" "Miniconda" diff --git a/images/macos/scripts/build/install-mongodb.sh b/images/macos/scripts/build/install-mongodb.sh deleted file mode 100644 index c603d3892c7d..000000000000 --- a/images/macos/scripts/build/install-mongodb.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash -e -o pipefail -################################################################################ -## File: install-mongodb.sh -## Desc: Install MongoDB -################################################################################ - -source ~/utils/utils.sh - -# MongoDB object-value database -# Install latest release version of MongoDB Community Edition -# https://docs.mongodb.com/manual/tutorial/install-mongodb-on-os-x -toolsetVersion=$(get_toolset_value '.mongodb.version') - -brew tap mongodb/brew -versionToInstall=$(brew search --formulae /mongodb-community@$toolsetVersion/ | awk -F'/' '{print $3}' | tail -1) -echo "Installing mongodb $versionToInstall" -brew_smart_install $versionToInstall - -if ! which mongo ; then - brew link $versionToInstall -fi - -invoke_tests "Databases" "MongoDB" diff --git a/images/macos/scripts/build/install-mono.sh b/images/macos/scripts/build/install-mono.sh index 3ac147f0a4aa..41bdd2d30465 100644 --- a/images/macos/scripts/build/install-mono.sh +++ b/images/macos/scripts/build/install-mono.sh @@ -47,5 +47,5 @@ sudo mv $nunit3_console_wrapper "${MONO_VERSIONS_PATH}/${mono_version}/Commands/ echo "Creating short symlink '${mono_version_short}'..." sudo ln -s ${MONO_VERSIONS_PATH}/${mono_version} ${MONO_VERSIONS_PATH}/${mono_version_short} -# Invoke tests for Xamarin and Mono -invoke_tests "Xamarin" "Mono" +# Invoke tests and Mono +invoke_tests "Mono" diff --git a/images/macos/scripts/build/install-node.sh b/images/macos/scripts/build/install-node.sh index 9e8a084b0bea..85b30368d38d 100644 --- a/images/macos/scripts/build/install-node.sh +++ b/images/macos/scripts/build/install-node.sh @@ -16,12 +16,4 @@ echo Installing yarn... yarn_installer_path=$(download_with_retry "https://yarnpkg.com/install.sh") bash $yarn_installer_path -if is_Monterey; then - npm_global_packages=$(get_toolset_value '.npm.global_packages[].name') - for module in ${npm_global_packages[@]}; do - echo "Install $module" - npm install -g $module -done -fi - invoke_tests "Node" "Node.js" diff --git a/images/macos/scripts/build/install-pipx-packages.sh b/images/macos/scripts/build/install-pipx-packages.sh deleted file mode 100644 index 0b4a8f90f804..000000000000 --- a/images/macos/scripts/build/install-pipx-packages.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash -e -o pipefail -################################################################################ -## File: install-pipx-packages.sh -## Desc: Install Pipx Packages -################################################################################ - -source ~/utils/utils.sh - -export PATH="$PATH:/opt/pipx_bin" - -pipx_packages=$(get_toolset_value '.pipx[].package') - -for package in $pipx_packages; do - echo "Install $package into default python" - pipx install $package -done - -invoke_tests "PipxPackages" diff --git a/images/macos/scripts/build/install-python.sh b/images/macos/scripts/build/install-python.sh index 426cc4351470..084f88b8940e 100644 --- a/images/macos/scripts/build/install-python.sh +++ b/images/macos/scripts/build/install-python.sh @@ -8,30 +8,6 @@ source ~/utils/utils.sh echo "Installing Python Tooling" -if is_Monterey; then - echo "Install latest Python 2" - python2_pkg=$(download_with_retry "https://www.python.org/ftp/python/2.7.18/python-2.7.18-macosx10.9.pkg") - python2_pkg_sha256="c570f38b05dd8b112ad21b418cdf51a9816d62f9f44746452739d421be24d50c" - use_checksum_comparison $python2_pkg $python2_pkg_sha256 - - choice_changes_xml=$(mktemp /tmp/python2_choice_changes.xml.XXXXXX) - sudo installer -showChoiceChangesXML -pkg $python2_pkg -target / | tee $choice_changes_xml > /dev/null - - # To avoid symlink conflicts, remove tools installation in /usr/local/bin using installer choices - xmllint --shell $choice_changes_xml <<EOF - cd //array/dict[string[text()='org.python.Python.PythonUnixTools-2.7']]/integer - set 0 - save -EOF - - sudo installer -applyChoiceChangesXML $choice_changes_xml -pkg $python2_pkg -target / - - pip install --upgrade pip - - echo "Install Python2 certificates" - bash -c "/Applications/Python\ 2.7/Install\ Certificates.command" -fi - # Close Finder window close_finder_window diff --git a/images/macos/scripts/build/install-rust.sh b/images/macos/scripts/build/install-rust.sh index eb9f9f18d08e..e0c511c5954c 100644 --- a/images/macos/scripts/build/install-rust.sh +++ b/images/macos/scripts/build/install-rust.sh @@ -18,10 +18,6 @@ CARGO_HOME=$HOME/.cargo echo "Install common tools..." rustup component add rustfmt clippy -if is_Monterey; then - cargo install bindgen-cli cbindgen cargo-audit cargo-outdated -fi - echo "Cleanup Cargo registry cached data..." rm -rf $CARGO_HOME/registry/* diff --git a/images/macos/scripts/build/install-swiftlint.sh b/images/macos/scripts/build/install-swiftlint.sh index 1e781ca26e6d..b15c42feae81 100644 --- a/images/macos/scripts/build/install-swiftlint.sh +++ b/images/macos/scripts/build/install-swiftlint.sh @@ -7,15 +7,7 @@ source ~/utils/utils.sh echo "Installing Swiftlint..." -if is_Monterey; then - # SwiftLint now requires Xcode 15.3 or higher to build https://github.com/realm/SwiftLint/releases/tag/0.55.1 - COMMIT=d91dabd087cb0b906c92a825df9e5e5e1a4f59f8 - FORMULA_URL="https://raw.githubusercontent.com/Homebrew/homebrew-core/$COMMIT/Formula/s/swiftlint.rb" - curl -fsSL $FORMULA_URL > $(find $(brew --repository) -name swiftlint.rb) - HOMEBREW_NO_AUTO_UPDATE=1 HOMEBREW_NO_INSTALL_FROM_API=1 brew install swiftlint -else - brew_smart_install "swiftlint" -fi +brew_smart_install "swiftlint" invoke_tests "Linters" "SwiftLint" diff --git a/images/macos/scripts/build/install-visualstudio.sh b/images/macos/scripts/build/install-visualstudio.sh deleted file mode 100644 index e4fa7a35a29c..000000000000 --- a/images/macos/scripts/build/install-visualstudio.sh +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/bash -e -o pipefail -################################################################################ -## File: install-visualstudio.sh -## Desc: Install Visual Studio -################################################################################ - -source ~/utils/utils.sh -source ~/utils/xamarin-utils.sh - -install_vsmac() { - local vsmac_version=$1 - local vsmac_default=$2 - if [[ $vsmac_version == "2019" ]]; then - vsmac_download_url=$(curl -fsSL "https://aka.ms/manifest/stable" | jq -r '.items[] | select(.genericName=="VisualStudioMac").url') - elif [[ $vsmac_version == "2022" ]]; then - vsmac_download_url=$(curl -fsSL "https://aka.ms/manifest/stable-2022" | jq -r '.items[] | select(.genericName=="VisualStudioMac").url') - elif [[ $vsmac_version == "preview" ]]; then - vsmac_download_url=$(curl -fsSL "https://aka.ms/manifest/preview" | jq -r '.items[] | select(.genericName=="VisualStudioMac").url') - else - vsmac_download_url=$(buildVSMacDownloadUrl $vsmac_version) - fi - - echo "Installing Visual Studio ${vsmac_version} for Mac" - TMPMOUNT=$(/usr/bin/mktemp -d /tmp/visualstudio.XXXX) - mkdir -p "$TMPMOUNT/downloads" - - vsmac_installer=$(download_with_retry $vsmac_download_url "$TMPMOUNT/downloads/${vsmac_download_url##*/}") - - echo "Mounting Visual Studio..." - hdiutil attach $vsmac_installer -mountpoint $TMPMOUNT - - echo "Moving Visual Studio to /Applications/..." - pushd $TMPMOUNT - tar cf - "./Visual Studio.app" | tar xf - -C /Applications/ - - if [[ $vsmac_version != $vsmac_default ]]; then - mv "/Applications/Visual Studio.app" "/Applications/Visual Studio ${vsmac_version}.app" - fi - - popd - sudo hdiutil detach $TMPMOUNT - sudo rm -rf $TMPMOUNT -} - -vsmac_versions=($(get_toolset_value '.xamarin.vsmac.versions[]')) -default_vsmac_version=$(get_toolset_value '.xamarin.vsmac.default') - -for version in ${vsmac_versions[@]}; do - install_vsmac $version $default_vsmac_version -done - -invoke_tests "Common" "VSMac" diff --git a/images/macos/scripts/build/install-xamarin.sh b/images/macos/scripts/build/install-xamarin.sh deleted file mode 100644 index faa0b70df516..000000000000 --- a/images/macos/scripts/build/install-xamarin.sh +++ /dev/null @@ -1,92 +0,0 @@ -#!/bin/bash -e -o pipefail -################################################################################ -## File: install-xamarin.sh -## Desc: Install Xamarin -################################################################################ - -source ~/utils/utils.sh -source ~/utils/xamarin-utils.sh - -mono_versions=($(get_toolset_value '.xamarin."mono_versions" | reverse | .[]')) -xamarin_ios_versions=($(get_toolset_value '.xamarin."ios_versions" | reverse | .[]')) -xamarin_mac_versions=($(get_toolset_value '.xamarin."mac_versions" | reverse | .[]')) -xamarin_android_versions=($(get_toolset_value '.xamarin."android_versions" | reverse | .[]')) -latest_sdk_symlink=$(get_toolset_value '.xamarin.bundles[0].symlink') -current_sdk_symlink=$(get_toolset_value '.xamarin."bundle_default"') -default_xcode_version=$(get_toolset_value '.xcode.default') - -if [[ $current_sdk_symlink == "latest" ]]; then - current_sdk_symlink=$latest_sdk_symlink -fi - -MONO_VERSIONS_PATH="/Library/Frameworks/Mono.framework/Versions" -IOS_VERSIONS_PATH="/Library/Frameworks/Xamarin.iOS.framework/Versions" -ANDROID_VERSIONS_PATH="/Library/Frameworks/Xamarin.Android.framework/Versions" -MAC_VERSIONS_PATH="/Library/Frameworks/Xamarin.Mac.framework/Versions" - -TMPMOUNT=$(/usr/bin/mktemp -d /tmp/visualstudio.XXXX) -TMPMOUNT_FRAMEWORKS=$TMPMOUNT/frameworks -createBackupFolders - -pushd $TMPMOUNT - -# Download NUnit console -downloadNUnitConsole - -# Install Mono sdks -for version in ${mono_versions[@]}; do installMono $version; done -sudo mv -v $TMPMOUNT_FRAMEWORKS/mono/* $MONO_VERSIONS_PATH/ - -# Install Xamarin.iOS sdks -for version in ${xamarin_ios_versions[@]}; do installXamarinIOS $version; done -sudo mv -v $TMPMOUNT_FRAMEWORKS/ios/* $IOS_VERSIONS_PATH/ - -# Install Xamarin.Mac sdks -for version in ${xamarin_mac_versions[@]}; do installXamarinMac $version; done -sudo mv -v $TMPMOUNT_FRAMEWORKS/mac/* $MAC_VERSIONS_PATH/ - -# Install Xamarin.Android sdks -for version in ${xamarin_android_versions[@]}; do installXamarinAndroid $version; done -sudo mv -v $TMPMOUNT_FRAMEWORKS/android/* $ANDROID_VERSIONS_PATH/ - - -# Create bundles -bundles_count=$(get_toolset_value '.xamarin.bundles | length') -for ((bundle_index=0; bundle_index<bundles_count; bundle_index++)); do - symlink=$(get_toolset_value ".xamarin.bundles[$bundle_index].symlink") - mono=$(get_toolset_value ".xamarin.bundles[$bundle_index].mono") - ios=$(get_toolset_value ".xamarin.bundles[$bundle_index].ios") - mac=$(get_toolset_value ".xamarin.bundles[$bundle_index].mac") - android=$(get_toolset_value ".xamarin.bundles[$bundle_index].android") - createBundle $symlink $mono $ios $mac $android -done - -# Symlinks for the latest Xamarin bundle -createBundleLink $latest_sdk_symlink "Latest" -createBundleLink $current_sdk_symlink "Current" - -# -# Fix nuget in some mono versions because of known bugs -# - -# Creating UWP Shim to hack UWP build failure -createUWPShim - -popd - -echo "Clean up packages..." -sudo rm -rf $TMPMOUNT - -# Fix Xamarin issue with Xcode symlink: https://github.com/xamarin/xamarin-macios/issues/9960 -PREFERENCES_XAMARIN_DIR="${HOME}/Library/Preferences/Xamarin" -mkdir -p $PREFERENCES_XAMARIN_DIR -/usr/libexec/PlistBuddy -c "add :AppleSdkRoot string /Applications/Xcode_${default_xcode_version}.app" $PREFERENCES_XAMARIN_DIR/Settings.plist - -# Temporary workaround to recreate nuget.config file with a correct feed https://github.com/actions/runner-images/issues/5768 -rm -rf $HOME/.config/NuGet/NuGet.Config -nuget config - -# Temporary workaround to point Mono to the proper NUnit console -sudo sed -Ei '' 's/3.6.0/3.6.1/' /Library/Frameworks/Mono.framework/Versions/Current/Commands/nunit3-console - -invoke_tests "Xamarin" diff --git a/images/macos/scripts/docs-gen/Generate-SoftwareReport.ps1 b/images/macos/scripts/docs-gen/Generate-SoftwareReport.ps1 index c4330139d87f..03768c2cbd00 100644 --- a/images/macos/scripts/docs-gen/Generate-SoftwareReport.ps1 +++ b/images/macos/scripts/docs-gen/Generate-SoftwareReport.ps1 @@ -13,10 +13,8 @@ Import-Module "$PSScriptRoot/SoftwareReport.Common.psm1" -DisableNameChecking Import-Module "$PSScriptRoot/SoftwareReport.Xcode.psm1" -DisableNameChecking Import-Module "$PSScriptRoot/SoftwareReport.Android.psm1" -DisableNameChecking Import-Module "$PSScriptRoot/SoftwareReport.Java.psm1" -DisableNameChecking -Import-Module "$PSScriptRoot/SoftwareReport.Xamarin.psm1" -DisableNameChecking Import-Module "$PSScriptRoot/SoftwareReport.Toolcache.psm1" -DisableNameChecking Import-Module "$PSScriptRoot/SoftwareReport.Browsers.psm1" -DisableNameChecking -Import-Module "$PSScriptRoot/SoftwareReport.WebServers.psm1" -DisableNameChecking Import-Module "$PSScriptRoot/SoftwareReport.Helpers.psm1" -DisableNameChecking Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" Import-Module "$PSScriptRoot/../helpers/Xcode.Helpers.psm1" @@ -38,37 +36,16 @@ $languageAndRuntime.AddToolVersion("Bash", $(Get-BashVersion)) $languageAndRuntime.AddNodes($(Get-ClangLLVMVersions)) $languageAndRuntime.AddNodes($(Get-GccVersions)) $languageAndRuntime.AddNodes($(Get-FortranVersions)) -if ((-not $os.IsVentura) -and (-not $os.IsSonoma) -and (-not $os.IsSequoia)) { - $languageAndRuntime.AddToolVersion("Julia", $(Get-JuliaVersion)) -} $languageAndRuntime.AddToolVersion("Kotlin", $(Get-KotlinVersion)) -if ((-not $os.IsVentura) -and (-not $os.IsSonoma) -and (-not $os.IsSequoia)) { - $languageAndRuntime.AddToolVersion("Go", $(Get-GoVersion)) -} if ((-not $os.IsSequoia)) { $languageAndRuntime.AddToolVersion("Mono", $(Get-MonoVersion)) } $languageAndRuntime.AddToolVersion("Node.js", $(Get-NodeVersion)) -if ((-not $os.IsVentura) -and (-not $os.IsSonoma) -and (-not $os.IsSequoia)) { - $languageAndRuntime.AddToolVersion("MSBuild", $(Get-MSBuildVersion)) - $languageAndRuntime.AddToolVersion("NVM", $(Get-NVMVersion)) - $languageAndRuntime.AddToolVersionsListInline("NVM - Cached node versions", $(Get-NVMNodeVersionList), '^\d+') -} $languageAndRuntime.AddToolVersion("Perl", $(Get-PerlVersion)) if ((-not $os.IsVenturaArm64) -and (-not $os.IsSonomaArm64) -and (-not $os.IsSequoiaArm64)) { $languageAndRuntime.AddToolVersion("PHP", $(Get-PHPVersion)) } - -if ((-not $os.IsVentura) -and (-not $os.IsSonoma) -and (-not $os.IsSequoia)) { - $languageAndRuntime.AddToolVersion("Python", $(Get-PythonVersion)) -} - $languageAndRuntime.AddToolVersion("Python3", $(Get-Python3Version)) - -if ((-not $os.IsVentura) -and (-not $os.IsSonoma) -and (-not $os.IsSequoia)) { - $languageAndRuntime.AddToolVersion("R", $(Get-RVersion)) -} - $languageAndRuntime.AddToolVersion("Ruby", $(Get-RubyVersion)) # Package Management @@ -80,37 +57,23 @@ if ((-not $os.IsVenturaArm64) -and (-not $os.IsSonomaArm64) -and (-not $os.IsSeq $packageManagement.AddToolVersion("Composer", $(Get-ComposerVersion)) } $packageManagement.AddToolVersion("Homebrew", $(Get-HomebrewVersion)) -if ((-not $os.IsVentura) -and (-not $os.IsSonoma) -and (-not $os.IsSequoia)) { - $packageManagement.AddToolVersion("Miniconda", $(Get-CondaVersion)) -} $packageManagement.AddToolVersion("NPM", $(Get-NPMVersion)) if ((-not $os.IsSequoia)) { $packageManagement.AddToolVersion("NuGet", $(Get-NuGetVersion)) } -if ((-not $os.IsVentura) -and (-not $os.IsSonoma) -and (-not $os.IsSequoia)) { - $packageManagement.AddToolVersion("Pip", $(Get-PipVersion -Version 2)) -} - -$packageManagement.AddToolVersion("Pip3", $(Get-PipVersion -Version 3)) +$packageManagement.AddToolVersion("Pip3", $(Get-Pip3Version)) $packageManagement.AddToolVersion("Pipx", $(Get-PipxVersion)) - $packageManagement.AddToolVersion("RubyGems", $(Get-RubyGemsVersion)) if ((-not $os.IsVenturaArm64) -and (-not $os.IsSonoma) -and (-not $os.IsSequoia)) { $packageManagement.AddToolVersion("Vcpkg", $(Get-VcpkgVersion)) } $packageManagement.AddToolVersion("Yarn", $(Get-YarnVersion)) -if ((-not $os.IsVentura) -and (-not $os.IsSonoma) -and (-not $os.IsSequoia)) { - $packageManagement.AddNode($(Build-PackageManagementEnvironmentTable)) -} # Project Management $projectManagement = $installedSoftware.AddHeader("Project Management") $projectManagement.AddToolVersion("Apache Ant", $(Get-ApacheAntVersion)) $projectManagement.AddToolVersion("Apache Maven", $(Get-MavenVersion)) $projectManagement.AddToolVersion("Gradle", $(Get-GradleVersion)) -if ((-not $os.IsVentura) -and (-not $os.IsSonoma) -and (-not $os.IsSequoia)) { - $projectManagement.AddToolVersion("Sbt", $(Get-SbtVersion)) -} # Utilities $utilities = $installedSoftware.AddHeader("Utilities") @@ -127,62 +90,26 @@ $utilities.AddToolVersion("GitHub CLI", $(Get-GitHubCLIVersion)) $utilities.AddToolVersion("GNU Tar", $(Get-GnuTarVersion)) $utilities.AddToolVersion("GNU Wget", $(Get-WgetVersion)) $utilities.AddToolVersion("gpg (GnuPG)", $(Get-GPGVersion)) -if ((-not $os.IsVentura) -and (-not $os.IsSonoma) -and (-not $os.IsSequoia)) { - $utilities.AddToolVersion("ImageMagick", $(Get-ImageMagickVersion)) -} $utilities.AddToolVersion("jq", $(Get-JqVersion)) -if ((-not $os.IsVentura) -and (-not $os.IsSonoma) -and (-not $os.IsSequoia)) { - $utilities.AddToolVersion("mongo", $(Get-MongoVersion)) - $utilities.AddToolVersion("mongod", $(Get-MongodVersion)) -} $utilities.AddToolVersion("OpenSSL", $(Get-OpenSSLVersion)) $utilities.AddToolVersion("Packer", $(Get-PackerVersion)) $utilities.AddToolVersion("pkgconf", $(Get-PKGConfVersion)) -if ((-not $os.IsVentura) -and (-not $os.IsSonoma) -and (-not $os.IsSequoia)) { - $utilities.AddToolVersion("PostgreSQL", $(Get-PostgresServerVersion)) - $utilities.AddToolVersion("psql (PostgreSQL)", $(Get-PostgresClientVersion)) - $utilities.AddToolVersion("Sox", $(Get-SoxVersion)) - $utilities.AddToolVersion("Subversion (SVN)", $(Get-SVNVersion)) - $utilities.AddToolVersion("Switchaudio-osx", $(Get-SwitchAudioOsxVersion)) -} -if ($os.IsMonterey) { - $utilities.AddToolVersion("Vagrant", $(Get-VagrantVersion)) - $utilities.AddToolVersion("VirtualBox", $(Get-VirtualBoxVersion)) -} $utilities.AddToolVersion("Unxip", $(Get-UnxipVersion)) $utilities.AddToolVersion("yq", $(Get-YqVersion)) $utilities.AddToolVersion("zstd", $(Get-ZstdVersion)) # Tools $tools = $installedSoftware.AddHeader("Tools") -if ((-not $os.IsVentura) -and (-not $os.IsSonoma) -and (-not $os.IsSequoia)) { - $tools.AddToolVersion("App Center CLI", $(Get-AppCenterCLIVersion)) -} $tools.AddToolVersion("AWS CLI", $(Get-AWSCLIVersion)) $tools.AddToolVersion("AWS SAM CLI", $(Get-AWSSAMCLIVersion)) $tools.AddToolVersion("AWS Session Manager CLI", $(Get-AWSSessionManagerCLIVersion)) $tools.AddToolVersion("Azure CLI", $(Get-AzureCLIVersion)) $tools.AddToolVersion("Azure CLI (azure-devops)", $(Get-AzureDevopsVersion)) $tools.AddToolVersion("Bicep CLI", $(Get-BicepVersion)) -if ((-not $os.IsVentura) -and (-not $os.IsSonoma) -and (-not $os.IsSequoia)) { - $tools.AddToolVersion("Cabal", $(Get-CabalVersion)) -} $tools.AddToolVersion("Cmake", $(Get-CmakeVersion)) $tools.AddToolVersion("CodeQL Action Bundle", $(Get-CodeQLBundleVersion)) -if ($os.IsMonterey) { - $tools.AddToolVersion("Colima", $(Get-ColimaVersion)) -} $tools.AddToolVersion("Fastlane", $(Get-FastlaneVersion)) -if ((-not $os.IsVentura) -and (-not $os.IsSonoma) -and (-not $os.IsSequoia)) { - $tools.AddToolVersion("GHC", $(Get-GHCVersion)) - $tools.AddToolVersion("GHCup", $(Get-GHCupVersion)) - $tools.AddToolVersion("Jazzy", $(Get-JazzyVersion)) - $tools.AddToolVersion("Stack", $(Get-StackVersion)) -} $tools.AddToolVersion("SwiftFormat", $(Get-SwiftFormatVersion)) -if ((-not $os.IsVentura) -and (-not $os.IsSonoma) -and (-not $os.IsSequoia)) { - $tools.AddToolVersion("Swig", $(Get-SwigVersion)) -} $tools.AddToolVersion("Xcbeautify", $(Get-XcbeautifyVersion)) $tools.AddToolVersion("Xcode Command Line Tools", $(Get-XcodeCommandLineToolsVersion)) $tools.AddToolVersion("Xcodes", $(Get-XcodesVersion)) @@ -192,9 +119,6 @@ $linters = $installedSoftware.AddHeader("Linters") if ((-not $os.IsVenturaArm64) -and (-not $os.IsSonomaArm64) -and (-not $os.IsSequoiaArm64)) { $linters.AddToolVersion("SwiftLint", $(Get-SwiftLintVersion)) } -if ((-not $os.IsVentura) -and (-not $os.IsSonoma) -and (-not $os.IsSequoia)) { - $linters.AddToolVersion("Yamllint", $(Get-YamllintVersion)) -} # Browsers $browsers = $installedSoftware.AddHeader("Browsers") @@ -217,12 +141,6 @@ $rust.AddToolVersion("Rustdoc", $(Get-RustdocVersion)) $rust.AddToolVersion("Rustup", $(Get-RustupVersion)) $rustPackages = $rust.AddHeader("Packages") -if ((-not $os.IsVentura) -and (-not $os.IsSonoma) -and (-not $os.IsSequoia)) { - $rustPackages.AddToolVersion("Bindgen", $(Get-Bindgen)) - $rustPackages.AddToolVersion("Cargo-audit", $(Get-Cargoaudit)) - $rustPackages.AddToolVersion("Cargo-outdated", $(Get-Cargooutdated)) - $rustPackages.AddToolVersion("Cbindgen", $(Get-Cbindgen)) -} $rustPackages.AddToolVersion("Clippy", $(Get-RustClippyVersion)) $rustPackages.AddToolVersion("Rustfmt", $(Get-RustfmtVersion)) @@ -233,33 +151,6 @@ $powerShell.AddToolVersion("PowerShell", $(Get-PowershellVersion)) $powerShellModules = $powerShell.AddHeader("PowerShell Modules") $powerShellModules.AddNodes($(Get-PowerShellModules)) -# Web Servers -if ((-not $os.IsVentura) -and (-not $os.IsSonoma) -and (-not $os.IsSequoia)) { - $webServers = $installedSoftware.AddHeader("Web Servers") - $webServers.AddTable($(Build-WebServersSection)) -} - -# Xamarin section -if ((-not $os.IsVentura) -and (-not $os.IsSonoma) -and (-not $os.IsSequoia)) { - $xamarin = $installedSoftware.AddHeader("Xamarin") - $vsForMac = $xamarin.AddHeader("Visual Studio for Mac") - $vsForMac.AddTable($(Build-VSMacTable)) - $note = - @' -To use Visual Studio 2019 by default rename the app: -mv "/Applications/Visual Studio.app" "/Applications/Visual Studio 2022.app" -mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app" -'@ - $vsForMacNotes = $vsForMac.AddHeader("Notes") - $vsForMacNotes.AddNote($note) - - $xamarinBundles = $xamarin.AddHeader("Xamarin bundles") - $xamarinBundles.AddTable($(Build-XamarinTable)) - - $unitTestFramework = $xamarin.AddHeader("Unit Test Framework") - $unitTestFramework.AddToolVersion("NUnit", $(Get-NUnitVersion)) -} - # Xcode section $xcode = $installedSoftware.AddHeader("Xcode") # First run doesn't provide full data about devices and runtimes @@ -267,10 +158,6 @@ Get-XcodeInfoList | Out-Null $xcodeInfo = Get-XcodeInfoList $xcode.AddTable($(Build-XcodeTable $xcodeInfo)) -if ((-not $os.IsVentura) -and (-not $os.IsSonoma) -and (-not $os.IsSequoia)) { - $xcodeTools = $xcode.AddHeader("Xcode Support Tools") - $xcodeTools.AddNodes($(Build-XcodeSupportToolsSection)) -} $installedSdks = $xcode.AddHeader("Installed SDKs") $installedSdks.AddTable($(Build-XcodeSDKTable $xcodeInfo)) @@ -286,20 +173,12 @@ $android.AddTable($androidTable) $androidEnv = $android.AddHeader("Environment variables") $androidEnv.AddTable($(Build-AndroidEnvironmentTable)) -if ($os.IsMonterey) { - $miscellaneous = $installedSoftware.AddHeader("Miscellaneous") - $miscellaneous.AddToolVersion("libXext", $(Get-LibXextVersion)) - $miscellaneous.AddToolVersion("libXft", $(Get-LibXftVersion)) - $miscellaneous.AddToolVersion("Tcl/Tk", $(Get-TclTkVersion)) - $miscellaneous.AddToolVersion("Zlib", $(Get-ZlibVersion)) -} - if ($os.IsSonoma -or $os.IsVentura) { $miscellaneous = $installedSoftware.AddHeader("Miscellaneous") $miscellaneous.AddToolVersion("Tcl/Tk", $(Get-TclTkVersion)) } -if ($os.IsMonterey -or $os.IsSonomaX64 -or $os.IsVenturaX64) { +if ($os.IsSonomaX64 -or $os.IsVenturaX64) { Write-Host "Adding environment variables for parallels" diff --git a/images/macos/scripts/docs-gen/SoftwareReport.Common.psm1 b/images/macos/scripts/docs-gen/SoftwareReport.Common.psm1 index 5cdb4dbb05f4..db25f7e1836c 100644 --- a/images/macos/scripts/docs-gen/SoftwareReport.Common.psm1 +++ b/images/macos/scripts/docs-gen/SoftwareReport.Common.psm1 @@ -10,20 +10,6 @@ function Get-DotnetVersionList { return $sdkRawList | ForEach-Object { Take-Part $_ -Part 0 } } -function Get-GoVersion { - $goOutput = Run-Command "go version" | Take-Part -Part 2 - if ($goOutput.StartsWith("go")) { - $goOutput = $goOutput.Substring(2) - } - - return $goOutput -} - -function Get-RVersion { - $rVersion = Run-Command "R --version | grep 'R version'" | Take-Part -Part 2 - return $rVersion -} - function Get-RustVersion { $rustVersion = Run-Command "rustc --version" | Take-Part -Part 1 return $rustVersion @@ -49,26 +35,6 @@ function Get-RustClippyVersion { return $version } -function Get-Bindgen { - $bindgenVersion = Run-Command "bindgen --version" | Take-Part -Part 1 - return $bindgenVersion -} - -function Get-Cbindgen { - $cbindgenVersion = Run-Command "cbindgen --version" | Take-Part -Part 1 - return $cbindgenVersion -} - -function Get-Cargooutdated { - $cargoOutdatedVersion = Run-Command "cargo outdated --version" | Take-Part -Part 1 - return $cargoOutdatedVersion -} - -function Get-Cargoaudit { - $cargoAuditVersion = Run-Command "cargo-audit --version" | Take-Part -Part 1 - return $cargoAuditVersion -} - function Get-RustupVersion { $rustupVersion = Run-Command "rustup --version" | Select-Object -First 1 | Take-Part -Part 1 return $rustupVersion @@ -114,20 +80,8 @@ function Get-ClangLLVMVersions { ) } -function Get-NVMVersion { - $nvmPath = Join-Path $env:HOME ".nvm" "nvm.sh" - $nvmInitCommand = ". ${nvmPath} > /dev/null 2>&1 || true" - $nodejsVersion = Run-Command "${nvmInitCommand} && nvm --version" - return $nodejsVersion -} - -function Get-PipVersion { - param ( - [Parameter(Mandatory)][ValidateRange(2, 3)] - [int] $Version - ) - - $command = If ($Version -eq 2) { "/Library/Frameworks/Python.framework/Versions/2.7/bin/pip --version" } Else { "pip3 --version" } +function Get-Pip3Version { + $command = "pip3 --version" $commandOutput = Run-Command $command $versionPart1 = $commandOutput | Take-Part -Part 1 $versionPart2 = $commandOutput | Take-Part -Part 4 @@ -140,14 +94,6 @@ function Get-PipxVersion { return $pipxVersion } -function Get-NVMNodeVersionList { - $nvmPath = Join-Path $env:HOME ".nvm" "nvm.sh" - $nvmInitCommand = ". ${nvmPath} > /dev/null 2>&1 || true" - $nodejsVersionsRaw = Run-Command "${nvmInitCommand} && nvm ls" - $nodeVersions = $nodejsVersionsRaw | ForEach-Object { $_.TrimStart(" ").TrimEnd(" *") } | Where-Object { $_.StartsWith("v") } - return $nodeVersions | ForEach-Object { $_.TrimStart("v") } -} - function Build-OSInfoSection { param ( [string] $ImageName @@ -173,12 +119,6 @@ function Get-MonoVersion { return $monoVersion } -function Get-MSBuildVersion { - $msbuildVersion = Run-Command "msbuild -version" | Select-Object -Last 1 - $monoVersion = Get-MonoVersion - return "$msbuildVersion (Mono $monoVersion)" -} - function Get-NodeVersion { $nodeVersion = Run-Command "node --version" return $nodeVersion.TrimStart("v") @@ -189,11 +129,6 @@ function Get-PerlVersion { return $version } -function Get-PythonVersion { - $pythonVersion = Run-Command "/Library/Frameworks/Python.framework/Versions/2.7/bin/python --version" - return ($pythonVersion -replace "^Python").Trim() -} - function Get-Python3Version { $python3Version = Run-Command "python3 --version" return ($python3Version -replace "^Python").Trim() @@ -209,11 +144,6 @@ function Get-PHPVersion { return ($PHPVersion -replace "^PHP").Trim() } -function Get-JuliaVersion { - $juliaVersion = Run-Command "julia --version" | Take-Part -Part 0,2 - return ($juliaVersion -replace "^Julia").Trim() -} - function Get-BundlerVersion { $bundlerVersion = Run-Command "bundle --version" return ($bundlerVersion -replace "^Bundler version").Trim() @@ -249,11 +179,6 @@ function Get-NuGetVersion { return $nugetVersion } -function Get-CondaVersion { - $condaVersion = Run-Command "conda --version" - return ($condaVersion -replace "^conda").Trim() -} - function Get-RubyGemsVersion { $rubyGemsVersion = Run-Command "gem --version" return $rubyGemsVersion @@ -305,11 +230,6 @@ function Get-WgetVersion { return $wgetVersion } -function Get-SVNVersion { - $svnVersion = Run-Command "svn --version --quiet" - return $svnVersion -} - function Get-PackerVersion { # Packer 1.7.1 has a bug and outputs version to stderr instead of stdout https://github.com/hashicorp/packer/issues/10855 $result = Run-Command "packer --version" @@ -332,16 +252,6 @@ function Get-GPGVersion { return ($gpgVersion.Line -replace "^gpg \(GnuPG\)").Trim() } -function Get-PostgresClientVersion { - $postgresClientVersion = Run-Command "psql --version" - return ($postgresClientVersion -replace "^psql \(PostgreSQL\)").Trim() -} - -function Get-PostgresServerVersion { - $postgresServerVersion = Run-Command "pg_config --version" - return ($postgresServerVersion -replace "^PostgreSQL").Trim() -} - function Get-Aria2Version { $aria2Version = Run-Command "aria2c --version" | Select-Object -First 1 | Take-Part -Part 2 return $aria2Version @@ -367,16 +277,6 @@ function Get-BazeliskVersion { return ($bazeliskVersion -replace "^bazelisk").Trim() } -function Get-MongoVersion { - $mongo = Run-Command "mongo --version" | Select-String "MongoDB shell version" | Take-Part -Part 3 - return $mongo.TrimStart("v").Trim() -} - -function Get-MongodVersion { - $mongod = Run-Command "mongod --version" | Select-String "db version " | Take-Part -Part 2 - return $mongod.TrimStart("v").Trim() -} - function Get-7zipVersion { $7zip = Run-Command "7z i" | Select-String "7-Zip" | Take-Part -Part 0,2 return ($7zip -replace "^7-Zip").Trim() @@ -392,16 +292,6 @@ function Get-BsdtarVersion { return "$bsdtar - available by 'tar' alias" } -function Get-VirtualBoxVersion { - $virtualBox = Run-Command "vboxmanage -v" - return $virtualBox -} - -function Get-VagrantVersion { - $vagrant = Run-Command "vagrant -v" - return ($vagrant -replace "^Vagrant").Trim() -} - function Get-ParallelVersion { $parallelVersion = Run-Command "parallel --version" | Select-String "GNU parallel" | Select-Object -First 1 return ($parallelVersion -replace "^GNU parallel").Trim() @@ -417,11 +307,6 @@ function Get-CmakeVersion { return $cmakeVersion } -function Get-AppCenterCLIVersion { - $appcenterCLIVersion = Run-Command "appcenter --version" | Take-Part -Part 2 - return $appcenterCLIVersion -} - function Get-AzureCLIVersion { $azureCLIVersion = (az version | ConvertFrom-Json).'azure-cli' return $azureCLIVersion @@ -447,46 +332,11 @@ function Get-AWSSessionManagerCLIVersion { return $awsSessionManagerVersion } -function Get-GHCupVersion { - $ghcUpVersion = (Run-Command "ghcup --version" | Take-Part -Part 5).Replace('v','') - return $ghcUpVersion -} - -function Get-GHCVersion { - $ghcVersion = Run-Command "ghc --version" | Take-Part -Part 7 - return $ghcVersion -} - -function Get-CabalVersion { - $cabalVersion = Run-Command "cabal --version" | Take-Part -Part 3 - return $cabalVersion -} - -function Get-SwitchAudioOsxVersion { - $switchAudioVersion = Get-BrewPackageVersion -CommandName "SwitchAudioSource" - return $switchAudioVersion -} - -function Get-SoxVersion { - $soxVersion = Get-BrewPackageVersion -CommandName "sox" - return $soxVersion -} - -function Get-StackVersion { - $stackVersion = Run-Command "stack --version" | Take-Part -Part 1 | ForEach-Object {$_.replace(",","")} - return $stackVersion -} - function Get-SwiftFormatVersion { $swiftFormatVersion = Run-Command "swiftformat --version" return $swiftFormatVersion } -function Get-YamllintVersion { - $yamllintVersion = Run-Command "yamllint --version" - return ($yamllintVersion -replace "^Yamllint").Trim() -} - function Get-SwiftLintVersion { $swiftlintVersion = Run-Command "swiftlint version" return $swiftlintVersion @@ -497,11 +347,6 @@ function Get-PowershellVersion { return ($powershellVersion -replace "^PowerShell").Trim() } -function Get-SwigVersion { - $swigVersion = Run-Command "swig -version" | Select-Object -First 2 | Take-Part -Part 2 - return $swigVersion -} - function Get-BicepVersion { $bicepVersion = Run-Command "bicep --version" | Take-Part -Part 3 return $bicepVersion @@ -512,31 +357,6 @@ function Get-KotlinVersion { return $kotlinVersion } -function Get-SbtVersion { - $sbtVersion = Run-Command "sbt -version" | Take-Part -Part 3 - return $sbtVersion -} - -function Get-JazzyVersion { - $jazzyVersion = Run-Command "jazzy --version" | Take-Part -Part 2 - return $jazzyVersion -} - -function Get-ZlibVersion { - $zlibVersion = (Run-Command "brew info --json zlib" | ConvertFrom-Json).installed.version - return $zlibVersion -} - -function Get-LibXftVersion { - $libXftVersion = (Run-Command "brew info --json libxft" | ConvertFrom-Json).installed.version - return $libXftVersion -} - -function Get-LibXextVersion { - $libXextVersion = (Run-Command "brew info --json libxext" | ConvertFrom-Json).installed.version - return $libXextVersion -} - function Get-TclTkVersion { $tcltkVersion = (Run-Command "brew info --json tcl-tk@8" | ConvertFrom-Json).installed.version return $tcltkVersion @@ -548,35 +368,6 @@ function Get-YqVersion { return ($Matches[0]) } -function Get-ImageMagickVersion { - $imagemagickVersion = Run-Command "magick --version" | Select-Object -First 1 | Take-Part -Part 1,2 - return ($imagemagickVersion -replace "^ImageMagick").Trim() -} - -function Build-PackageManagementEnvironmentTable { - $node = [HeaderNode]::new("Environment variables") - - $table = @( - @{ - "Name" = "CONDA" - "Value" = $env:CONDA - }, - @{ - "Name" = "VCPKG_INSTALLATION_ROOT" - "Value" = $env:VCPKG_INSTALLATION_ROOT - } - ) | ForEach-Object { - [PSCustomObject] @{ - "Name" = $_.Name - "Value" = $_.Value - } - } - - $node.AddTable($table) - - return $node -} - function Build-MiscellaneousEnvironmentTable { return @( @{ @@ -591,7 +382,6 @@ function Build-MiscellaneousEnvironmentTable { } } - function Get-CodeQLBundleVersion { $CodeQLVersionWildcard = Join-Path $Env:AGENT_TOOLSDIRECTORY -ChildPath "CodeQL" | Join-Path -ChildPath "*" $CodeQLVersionPath = Get-ChildItem $CodeQLVersionWildcard | Select-Object -First 1 -Expand FullName @@ -600,11 +390,6 @@ function Get-CodeQLBundleVersion { return $CodeQLVersion } -function Get-ColimaVersion { - $colimaVersion = Run-Command "colima version" | Select-String "colima version" | Take-Part -Part 2 - return $colimaVersion -} - function Get-PKGConfVersion { $pkgconfVersion = Run-Command "pkgconf --version" return $pkgconfVersion diff --git a/images/macos/scripts/docs-gen/SoftwareReport.WebServers.psm1 b/images/macos/scripts/docs-gen/SoftwareReport.WebServers.psm1 deleted file mode 100644 index 795882682444..000000000000 --- a/images/macos/scripts/docs-gen/SoftwareReport.WebServers.psm1 +++ /dev/null @@ -1,36 +0,0 @@ -function Get-ApacheVersion { - $name = "httpd" - $port = 80 - $version = brew list $name --versions | Take-Part -Part 1 - $serviceStatus = (brew services list) -match $name | Take-Part -Part 1 - $configFile = "$(brew --prefix)/etc/httpd/httpd.conf" - return [PsCustomObject]@{ - "Name" = $name - "Version" = $version - "ConfigFile" = $configFile - "ServiceStatus" = $serviceStatus - "ListenPort" = $port - } -} - -function Get-NginxVersion { - $name = "nginx" - $port = 80 - $version = brew list $name --versions | Take-Part -Part 1 - $serviceStatus = (brew services list) -match $name | Take-Part -Part 1 - $configFile = "$(brew --prefix)/etc/nginx/nginx.conf" - return [PsCustomObject]@{ - "Name" = $name - "Version" = $version - "ConfigFile" = $configFile - "ServiceStatus" = $serviceStatus - "ListenPort" = $port - } -} - -function Build-WebServersSection { - return @( - (Get-ApacheVersion), - (Get-NginxVersion) - ) -} diff --git a/images/macos/scripts/docs-gen/SoftwareReport.Xamarin.psm1 b/images/macos/scripts/docs-gen/SoftwareReport.Xamarin.psm1 deleted file mode 100644 index 5275c323a901..000000000000 --- a/images/macos/scripts/docs-gen/SoftwareReport.Xamarin.psm1 +++ /dev/null @@ -1,48 +0,0 @@ -Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" - -function Build-VSMacTable { - $vsMacVersions = (Get-ToolsetContent).xamarin.vsmac.versions - $defaultVSMacVersion = (Get-ToolsetContent).xamarin.vsmac.default - - return $vsMacVersions | ForEach-Object { - $isDefault = $_ -eq $defaultVSMacVersion - $vsPath = "/Applications/Visual Studio $_.app" - if ($isDefault) { - $vsPath = "/Applications/Visual Studio.app" - } - - $plistPath = "$vsPath/Contents/Info.plist" - $build = Run-Command "/usr/libexec/PlistBuddy -c 'Print CFBundleVersion' '$plistPath'" - $defaultPostfix = $isDefault ? " (default)" : "" - - [PSCustomObject] @{ - "Version" = $_ + $defaultPostfix - "Build" = $build - "Path" = $vsPath - } - } -} - -function Get-NUnitVersion { - $version = Run-Command "nunit3-console --version" | Select-Object -First 1 | Take-Part -Part 3 - return $version -} - -function Build-XamarinTable { - $xamarinBundles = (Get-ToolsetContent).xamarin.bundles - $defaultSymlink = (Get-ToolsetContent).xamarin.bundle_default - if ($defaultSymlink -eq "latest") { - $defaultSymlink = $xamarinBundles[0].symlink - } - - return $xamarinBundles | ForEach-Object { - $defaultPostfix = ($_.symlink -eq $defaultSymlink ) ? " (default)" : "" - [PSCustomObject] @{ - "symlink" = $_.symlink + $defaultPostfix - "Xamarin.Mono" = $_.mono - "Xamarin.iOS" = $_.ios - "Xamarin.Mac" = $_.mac - "Xamarin.Android" = $_.android - } - } -} diff --git a/images/macos/scripts/docs-gen/SoftwareReport.Xcode.psm1 b/images/macos/scripts/docs-gen/SoftwareReport.Xcode.psm1 index b3f918676f41..54035e8ce2b2 100644 --- a/images/macos/scripts/docs-gen/SoftwareReport.Xcode.psm1 +++ b/images/macos/scripts/docs-gen/SoftwareReport.Xcode.psm1 @@ -72,6 +72,8 @@ function Get-XcodePlatformOrder { "Simulator - tvOS" { 5 } "watchOS" { 6 } "Simulator - watchOS" { 7 } + "visionOS" { 8 } + "Simulator - visionOS" { 9 } Default { 100 } } } @@ -237,22 +239,3 @@ function Build-XcodeSimulatorsTable { return [System.Version]::Parse($sdkNameParts[-1]) } } - -function Build-XcodeSupportToolsSection { - $toolNodes = @() - - $xcpretty = Run-Command "xcpretty --version" - $xcversion = Run-Command "xcversion --version" | Select-String "^[0-9]" - - $toolNodes += [ToolVersionNode]::new("xcpretty", $xcpretty) - if ($os.IsMonterey) { - $toolNodes += [ToolVersionNode]::new("xcversion", $xcversion) - } - - $nomadOutput = Run-Command "gem list nomad-cli" - $nomadCLI = [regex]::matches($nomadOutput, "(\d+.){2}\d+").Value - $nomadShenzhenOutput = Run-Command "ipa -version" - $nomadShenzhen = [regex]::matches($nomadShenzhenOutput, "(\d+.){2}\d+").Value - - return $toolNodes -} diff --git a/images/macos/scripts/helpers/Common.Helpers.psm1 b/images/macos/scripts/helpers/Common.Helpers.psm1 index 359f5974ee32..ec65b7c98c2b 100644 --- a/images/macos/scripts/helpers/Common.Helpers.psm1 +++ b/images/macos/scripts/helpers/Common.Helpers.psm1 @@ -29,7 +29,6 @@ function Get-OSVersion { Version = $osVersion.Version Platform = $osVersion.Platform IsArm64 = $processorArchitecture -eq "arm64" - IsMonterey = $osVersion.Version.Major -eq "12" IsVentura = $($osVersion.Version.Major -eq "13") IsVenturaArm64 = $($osVersion.Version.Major -eq "13" -and $processorArchitecture -eq "arm64") IsVenturaX64 = $($osVersion.Version.Major -eq "13" -and $processorArchitecture -ne "arm64") diff --git a/images/macos/scripts/helpers/confirm-identified-developers.scpt b/images/macos/scripts/helpers/confirm-identified-developers.scpt deleted file mode 100644 index 31a650d761c6..000000000000 --- a/images/macos/scripts/helpers/confirm-identified-developers.scpt +++ /dev/null @@ -1,49 +0,0 @@ -# This AppleScript confirms developers in security preferences via macOS UI. -# It uses after VirtualBox installation to add 'Oracle Inc' as identified developer. -# Steps: -# - Close security preferences pop-up (it can be open after VirtualBox installation) -# - Open System Preferences -> Security & Privacy -> General -# - Unlock security preferences with user password (button 'Click the lock to make changes') -# - Click 'Allow' or 'Details…' button to confirm developers -# - Click 'Not now' button on restarting pop-up -# - Close System Preferences - -on run argv - set userpassword to item 1 of argv - set secpane to "Security & Privacy" - - activate application "System Preferences" - delay 5 - - tell application "System Events" - tell process "System Preferences" - set frontmost to true - delay 2 - click menu item secpane of menu "View" of menu bar 1 - delay 5 - click button 1 of window 1 - delay 5 - keystroke userpassword - delay 5 - keystroke return - delay 5 - click radio button "General" of tab group 1 of window 1 - delay 5 - if exists of UI element "Details…" of tab group 1 of window 1 then - click button "Details…" of tab group 1 of window 1 - delay 5 - keystroke return - delay 5 - keystroke return - delay 5 - end if - if exists of UI element "Allow" of tab group 1 of window 1 then - click button "Allow" of tab group 1 of window 1 - delay 5 - keystroke return - delay 5 - end if - click button 5 of window 1 - end tell - end tell -end run \ No newline at end of file diff --git a/images/macos/scripts/helpers/utils.sh b/images/macos/scripts/helpers/utils.sh index 6dbb231022ab..df45ad58fdae 100644 --- a/images/macos/scripts/helpers/utils.sh +++ b/images/macos/scripts/helpers/utils.sh @@ -81,10 +81,6 @@ is_VenturaX64() { is_Ventura && ! is_Arm64 } -is_Monterey() { - [ "$OSTYPE" = "darwin21" ] -} - get_toolset_value() { local toolset_path=$(echo "$IMAGE_FOLDER/toolset.json") local query=$1 diff --git a/images/macos/scripts/helpers/xamarin-utils.sh b/images/macos/scripts/helpers/xamarin-utils.sh deleted file mode 100644 index 20e3b9dc86f6..000000000000 --- a/images/macos/scripts/helpers/xamarin-utils.sh +++ /dev/null @@ -1,215 +0,0 @@ -#!/bin/bash -e -o pipefail - -source ~/utils/utils.sh - -# Xamarin can clean their SDKs while updating to newer versions, -# so we should be able to detect it during image generation - -buildVSMacDownloadUrl() { - echo "https://dl.xamarin.com/VsMac/VisualStudioForMac-${1}.dmg" -} - -buildMonoDownloadUrl() { - echo "https://dl.xamarin.com/MonoFrameworkMDK/Macx86/MonoFramework-MDK-${1}.macos10.xamarin.universal.pkg" -} - -buildXamariniIOSDownloadUrl() { - echo "https://dl.xamarin.com/MonoTouch/Mac/xamarin.ios-${1}.pkg" -} - -buildXamarinMacDownloadUrl() { - echo "https://dl.xamarin.com/XamarinforMac/Mac/xamarin.mac-${1}.pkg" -} - -buildXamarinAndroidDownloadUrl() { - echo "https://dl.xamarin.com/MonoforAndroid/Mac/xamarin.android-${1}.pkg" -} - -installMono() { - local VERSION=$1 - - echo "Installing Mono ${VERSION}..." - local MONO_FOLDER_NAME=$(echo $VERSION | cut -d. -f 1,2,3) - local SHORT_VERSION=$(echo $VERSION | cut -d. -f 1,2) - local PKG_URL=$(buildMonoDownloadUrl $VERSION) - - sudo installer -pkg "$(download_with_retry "$PKG_URL")" -target / - - echo "Installing nunit3-console for Mono "$VERSION - installNunitConsole $MONO_FOLDER_NAME - - echo "Creating short symlink '${SHORT_VERSION}'" - sudo ln -s ${MONO_VERSIONS_PATH}/${MONO_FOLDER_NAME} ${MONO_VERSIONS_PATH}/${SHORT_VERSION} - - echo "Move to backup folder" - sudo mv -v $MONO_VERSIONS_PATH/* $TMPMOUNT_FRAMEWORKS/mono/ -} - -installXamarinIOS() { - local VERSION=$1 - - echo "Installing Xamarin.iOS ${VERSION}..." - local SHORT_VERSION=$(echo $VERSION | cut -d. -f 1,2) - local PKG_URL=$(buildXamariniIOSDownloadUrl $VERSION) - - sudo installer -pkg "$(download_with_retry "$PKG_URL")" -target / - - echo "Creating short symlink '${SHORT_VERSION}'" - sudo ln -s ${IOS_VERSIONS_PATH}/${VERSION} ${IOS_VERSIONS_PATH}/${SHORT_VERSION} - - echo "Move to backup folder" - sudo mv -v $IOS_VERSIONS_PATH/* $TMPMOUNT_FRAMEWORKS/ios/ -} - -installXamarinMac() { - local VERSION=$1 - - echo "Installing Xamarin.Mac ${VERSION}..." - local SHORT_VERSION=$(echo $VERSION | cut -d. -f 1,2) - local PKG_URL=$(buildXamarinMacDownloadUrl $VERSION) - - sudo installer -pkg "$(download_with_retry "$PKG_URL")" -target / - - echo "Creating short symlink '${SHORT_VERSION}'" - sudo ln -s ${MAC_VERSIONS_PATH}/${VERSION} ${MAC_VERSIONS_PATH}/${SHORT_VERSION} - - echo "Move to backup folder" - sudo mv -v $MAC_VERSIONS_PATH/* $TMPMOUNT_FRAMEWORKS/mac/ -} - -installXamarinAndroid() { - local VERSION=$1 - - echo "Installing Xamarin.Android ${VERSION}..." - local SHORT_VERSION=$(echo $VERSION | cut -d. -f 1,2) - local PKG_URL=$(buildXamarinAndroidDownloadUrl $VERSION) - - sudo installer -pkg "$(download_with_retry "$PKG_URL")" -target / - - if [ "$VERSION" == "9.4.1.0" ]; then - # Fix symlinks for broken Xamarin.Android - fixXamarinAndroidSymlinksInLibDir $VERSION - fi - - echo "Creating short symlink '${SHORT_VERSION}'" - sudo ln -s ${ANDROID_VERSIONS_PATH}/${VERSION} ${ANDROID_VERSIONS_PATH}/${SHORT_VERSION} - - echo "Move to backup folder" - sudo mv -v $ANDROID_VERSIONS_PATH/* $TMPMOUNT_FRAMEWORKS/android/ -} - -createBundle() { - local SYMLINK=$1 - local MONO_SDK=$2 - local IOS_SDK=$3 - local MAC_SDK=$4 - local ANDROID_SDK=$5 - - echo "Creating bundle '$SYMLINK' (Mono $MONO_SDK; iOS $IOS_SDK; Mac $MAC_SDK; Android $ANDROID_SDK" - deleteSymlink ${SYMLINK} - sudo ln -s ${MONO_VERSIONS_PATH}/${MONO_SDK} ${MONO_VERSIONS_PATH}/${SYMLINK} - sudo ln -s ${IOS_VERSIONS_PATH}/${IOS_SDK} ${IOS_VERSIONS_PATH}/${SYMLINK} - sudo ln -s ${MAC_VERSIONS_PATH}/${MAC_SDK} ${MAC_VERSIONS_PATH}/${SYMLINK} - sudo ln -s ${ANDROID_VERSIONS_PATH}/${ANDROID_SDK} ${ANDROID_VERSIONS_PATH}/${SYMLINK} -} - -createBundleLink() { - local SOURCE=$1 - local TARGET=$2 - echo "Creating bundle symlink '$SOURCE' -> '$TARGET'" - deleteSymlink ${TARGET} - sudo ln -s ${MONO_VERSIONS_PATH}/$SOURCE ${MONO_VERSIONS_PATH}/$TARGET - sudo ln -s ${IOS_VERSIONS_PATH}/$SOURCE ${IOS_VERSIONS_PATH}/$TARGET - sudo ln -s ${MAC_VERSIONS_PATH}/$SOURCE ${MAC_VERSIONS_PATH}/$TARGET - sudo ln -s ${ANDROID_VERSIONS_PATH}/$SOURCE ${ANDROID_VERSIONS_PATH}/$TARGET -} - -# https://github.com/xamarin/xamarin-android/issues/3457 -# Recreate missing symlinks in lib for new Xamarin.Android package -# Symlink path /Library/Frameworks/Xamarin.Android.framework/Libraries -# xbuild -> xamarin.android/xbuild -# xbuild-frameworks -> xamarin.android/xbuild-frameworks -fixXamarinAndroidSymlinksInLibDir() { - local XAMARIN_ANDROID_VERSION=$1 - local XAMARIN_ANDROID_LIB_PATH="${ANDROID_VERSIONS_PATH}/${XAMARIN_ANDROID_VERSION}/lib" - - if [ -d "${XAMARIN_ANDROID_LIB_PATH}" ]; then - pushd "${XAMARIN_ANDROID_LIB_PATH}" > /dev/null - - local XAMARIN_ANDROID_XBUILD_DIR="${XAMARIN_ANDROID_LIB_PATH}/xbuild" - if [ ! -d "${XAMARIN_ANDROID_XBUILD_DIR}" ]; then - echo "${XAMARIN_ANDROID_XBUILD_DIR}" - sudo ln -sf xamarin.android/xbuild xbuild - fi - - local XAMARIN_ANDROID_XBUILD_FRAMEWORKS_DIR="${XAMARIN_ANDROID_LIB_PATH}/xbuild-frameworks" - if [ ! -d "${XAMARIN_ANDROID_XBUILD_FRAMEWORKS_DIR}" ]; then - echo "${XAMARIN_ANDROID_XBUILD_FRAMEWORKS_DIR}" - sudo ln -sf xamarin.android/xbuild-frameworks xbuild-frameworks - fi - - popd > /dev/null - fi -} - -installNunitConsole() { - local MONO_VERSION=$1 - local TMP_WRAPPER_PATH=$(mktemp) - - cat <<EOF > "$TMP_WRAPPER_PATH" -#!/bin/bash -e -o pipefail -exec /Library/Frameworks/Mono.framework/Versions/${MONO_VERSION}/bin/mono --debug \$MONO_OPTIONS $NUNIT3_PATH/nunit3-console.exe "\$@" -EOF - sudo chmod +x $TMP_WRAPPER_PATH - sudo mv "$TMP_WRAPPER_PATH" "${MONO_VERSIONS_PATH}/${MONO_VERSION}/Commands/nunit3-console" -} - -downloadNUnitConsole() { - echo "Downloading NUnit 3..." - local NUNIT3_VERSION='3.6.1' - local NUNIT3_LOCATION="https://github.com/nunit/nunit-console/releases/download/${NUNIT3_VERSION}/NUnit.Console-${NUNIT3_VERSION}.zip" - local NUNIT3_PATH="/Library/Developer/nunit/${NUNIT3_VERSION}" - - NUNIT3_ARCHIVE=$(download_with_retry $NUNIT3_LOCATION) - - echo "Installing NUnit 3..." - sudo mkdir -p $NUNIT3_PATH - sudo unzip "$NUNIT3_ARCHIVE" -d $NUNIT3_PATH -} - -createUWPShim() { - echo "Creating UWP Shim to hack UWP build failure..." - cat <<EOF > ${TMPMOUNT}/Microsoft.Windows.UI.Xaml.CSharp.Targets -<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> -<Target Name = "Build"/> -<Target Name = "Rebuild"/> -</Project> -EOF - - local UWPTARGET_PATH=/Library/Frameworks/Mono.framework/External/xbuild/Microsoft/WindowsXaml - - sudo mkdir -p $UWPTARGET_PATH/v11.0/ - sudo cp ${TMPMOUNT}/Microsoft.Windows.UI.Xaml.CSharp.Targets $UWPTARGET_PATH/v11.0/ - sudo mkdir -p $UWPTARGET_PATH/v12.0/ - sudo cp ${TMPMOUNT}/Microsoft.Windows.UI.Xaml.CSharp.Targets $UWPTARGET_PATH/v12.0/ - sudo mkdir -p $UWPTARGET_PATH/v14.0/ - sudo cp ${TMPMOUNT}/Microsoft.Windows.UI.Xaml.CSharp.Targets $UWPTARGET_PATH/v14.0/ - sudo mkdir -p $UWPTARGET_PATH/v15.0/ - sudo cp ${TMPMOUNT}/Microsoft.Windows.UI.Xaml.CSharp.Targets $UWPTARGET_PATH/v15.0/ - sudo mkdir -p $UWPTARGET_PATH/v16.0/ - sudo cp ${TMPMOUNT}/Microsoft.Windows.UI.Xaml.CSharp.Targets $UWPTARGET_PATH/v16.0/ -} - -createBackupFolders() { - mkdir -p $TMPMOUNT_FRAMEWORKS/mono - mkdir -p $TMPMOUNT_FRAMEWORKS/ios - mkdir -p $TMPMOUNT_FRAMEWORKS/mac - mkdir -p $TMPMOUNT_FRAMEWORKS/android -} - -deleteSymlink() { - sudo rm -f ${MONO_VERSIONS_PATH}/${1} - sudo rm -f ${IOS_VERSIONS_PATH}/${1} - sudo rm -f ${MAC_VERSIONS_PATH}/${1} - sudo rm -f ${ANDROID_VERSIONS_PATH}/${1} -} diff --git a/images/macos/scripts/tests/Android.Tests.ps1 b/images/macos/scripts/tests/Android.Tests.ps1 index 654a05e37ad8..766dfd8a711a 100644 --- a/images/macos/scripts/tests/Android.Tests.ps1 +++ b/images/macos/scripts/tests/Android.Tests.ps1 @@ -57,14 +57,6 @@ Describe "Android" { Sdkmanager = "$env:ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager" } ) - if ($os.IsMonterey) { - $testCases += @( - @{ - PackageName = "SDK tools" - Sdkmanager = "$env:ANDROID_HOME/tools/bin/sdkmanager" - } - ) - } It "Sdkmanager from <PackageName> is available" -TestCases $testCases { "$Sdkmanager --version" | Should -ReturnZeroExitCode diff --git a/images/macos/scripts/tests/BasicTools.Tests.ps1 b/images/macos/scripts/tests/BasicTools.Tests.ps1 index 53942da4de88..fd7613134c44 100644 --- a/images/macos/scripts/tests/BasicTools.Tests.ps1 +++ b/images/macos/scripts/tests/BasicTools.Tests.ps1 @@ -26,12 +26,6 @@ Describe "cmake" { } } -Describe "Subversion" -Skip:($os.IsVentura -or $os.IsSonoma -or $os.IsSequoia) { - It "Subversion" { - "svn --version" | Should -ReturnZeroExitCode - } -} - Describe "SwiftFormat" { It "SwiftFormat" { "swiftformat --version" | Should -ReturnZeroExitCode @@ -87,7 +81,7 @@ Describe "7-Zip" { } } -Describe "Apache Ant" -Skip:($os.IsMonterey) { +Describe "Apache Ant" { It "Apache Ant" { "ant -version" | Should -ReturnZeroExitCode } @@ -111,12 +105,6 @@ Describe "bazel" { } } -Describe "Julia" -Skip:($os.IsVentura -or $os.IsSonoma -or $os.IsSequoia) { - It "Julia" { - "julia --version" | Should -ReturnZeroExitCode - } -} - Describe "jq" { It "jq" { "jq --version" | Should -ReturnZeroExitCode @@ -135,31 +123,13 @@ Describe "wget" { } } -Describe "vagrant" -Skip:($os.IsVentura -or $os.IsSonoma -or $os.IsSequoia) { - It "vagrant" { - "vagrant --version" | Should -ReturnZeroExitCode - } -} - -Describe "virtualbox" -Skip:($os.IsVentura -or $os.IsSonoma -or $os.IsSequoia) { - It "virtualbox" { - "vboxmanage -v" | Should -ReturnZeroExitCode - } -} - -Describe "R" -Skip:($os.IsVentura -or $os.IsSonoma -or $os.IsSequoia) { - It "R" { - "R --version" | Should -ReturnZeroExitCode - } -} - Describe "Homebrew" { It "Homebrew" { "brew --version" | Should -ReturnZeroExitCode } } -Describe "Kotlin" -Skip:($os.IsMonterey) { +Describe "Kotlin" { $kotlinPackages = @("kapt", "kotlin", "kotlinc", "kotlinc-jvm", "kotlinc-js") It "<toolName> is available" -TestCases ($kotlinPackages | ForEach-Object { @{ toolName = $_ } }) { @@ -173,12 +143,6 @@ Describe "yq" { } } -Describe "imagemagick" -Skip:($os.IsVentura -or $os.IsSonoma -or $os.IsSequoia) { - It "imagemagick" { - "magick -version" | Should -ReturnZeroExitCode - } -} - Describe "pkgconf" { It "pkgconf" { "pkgconf --version" | Should -ReturnZeroExitCode diff --git a/images/macos/scripts/tests/Common.Tests.ps1 b/images/macos/scripts/tests/Common.Tests.ps1 index 4d6ebf8e289c..8e6be12f5c75 100644 --- a/images/macos/scripts/tests/Common.Tests.ps1 +++ b/images/macos/scripts/tests/Common.Tests.ps1 @@ -58,77 +58,18 @@ Describe "AzCopy" { } } -Describe "Miniconda" -Skip:($os.IsVentura -or $os.IsSonoma -or $os.IsSequoia) { - It "Conda" { - [System.Environment]::GetEnvironmentVariable("CONDA") | Should -Not -BeNullOrEmpty - $condaBinPath = Join-Path $env:CONDA "bin" "conda" - "$condaBinPath --version" | Should -ReturnZeroExitCode - } -} - -Describe "Stack" -Skip:($os.IsVentura -or $os.IsSonoma -or $os.IsSequoia) { - It "Stack" { - "stack --version" | Should -ReturnZeroExitCode - } -} - Describe "CocoaPods" { It "CocoaPods" { "pod --version" | Should -ReturnZeroExitCode } } -Describe "VSMac" -Skip:($os.IsVentura -or $os.IsSonoma -or $os.IsSequoia) { - $vsMacVersions = (Get-ToolsetContent).xamarin.vsmac.versions - $defaultVSMacVersion = (Get-ToolsetContent).xamarin.vsmac.default - - $testCases = $vsMacVersions | ForEach-Object { - $vsPath = "/Applications/Visual Studio $_.app" - if ($_ -eq $defaultVSMacVersion) { - $vsPath = "/Applications/Visual Studio.app" - } - - @{ vsversion = $_ ; vspath = $vsPath } - } - - It "Visual Studio <vsversion> for Mac is installed" -TestCases $testCases { - $vstoolPath = Join-Path $vsPath "Contents/MacOS/vstool" - $vsPath | Should -Exist - $vstoolPath | Should -Exist - } - - It "Visual Studio $defaultVSMacVersion for Mac is default" { - $vsPath = "/Applications/Visual Studio.app" - $vstoolPath = Join-Path $vsPath "Contents/MacOS/vstool" - $vsPath | Should -Exist - $vstoolPath | Should -Exist - } -} - -Describe "Swig" -Skip:($os.IsVentura -or $os.IsSonoma -or $os.IsSequoia) { - It "Swig" { - "swig -version" | Should -ReturnZeroExitCode - } -} - Describe "Bicep" { It "Bicep" { "bicep --version" | Should -ReturnZeroExitCode } } -Describe "Go" -Skip:($os.IsVentura -or $os.IsSonoma -or $os.IsSequoia) { - It "Go" { - "go version" | Should -ReturnZeroExitCode - } -} - -Describe "VirtualBox" -Skip:($os.IsVentura -or $os.IsSonoma -or $os.IsSequoia) { - It "Check kext kernel modules" { - kextstat | Out-String | Should -Match "org.virtualbox.kext" - } -} - Describe "CodeQL Bundle" { It "Is installed" { $CodeQLVersionWildcard = Join-Path $Env:AGENT_TOOLSDIRECTORY -ChildPath "CodeQL" | Join-Path -ChildPath "*" @@ -141,28 +82,6 @@ Describe "CodeQL Bundle" { } } -Describe "Colima" -Skip:($os.IsVentura -or $os.IsSonoma -or $os.IsSequoia) { - It "Colima" { - "colima version" | Should -ReturnZeroExitCode - } -} - -Describe "Compiled" -Skip:(-not $os.IsMonterey) { - It "Apache Ant" { - "ant -version" | Should -ReturnZeroExitCode - } - - $kotlinPackages = @("kapt", "kotlin", "kotlinc", "kotlinc-jvm", "kotlin-dce-js") - - It "<toolName> is available" -TestCases ($kotlinPackages | ForEach-Object { @{ toolName = $_ } }) { - "$toolName -version" | Should -ReturnZeroExitCode - } - - It "sbt" { - "sbt -version" | Should -ReturnZeroExitCode - } -} - Describe "Unxip" { It "Unxip" { "unxip --version" | Should -ReturnZeroExitCode diff --git a/images/macos/scripts/tests/Haskell.Tests.ps1 b/images/macos/scripts/tests/Haskell.Tests.ps1 deleted file mode 100644 index c4ff72992b3c..000000000000 --- a/images/macos/scripts/tests/Haskell.Tests.ps1 +++ /dev/null @@ -1,30 +0,0 @@ -Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" - -$os = Get-OSVersion - -Describe "Haskell" -Skip:($os.IsVentura -or $os.IsSonoma -or $os.IsSequoia) { - Context "GHCup" { - It "GHCup" { - "ghcup --version" | Should -ReturnZeroExitCode - } - } - Context "GHC" { - It "GHC" { - "ghc --version" | Should -ReturnZeroExitCode - } - } - Context "Cabal" { - It "Cabal" { - "cabal --version" | Should -ReturnZeroExitCode - } - } - Context "Stack" { - It "Stack" { - "stack --version" | Should -ReturnZeroExitCode - } - - It "Stack hook is not installed" { - "$HOME/.stack/hooks/ghc-install.sh" | Should -Not -Exist - } - } -} diff --git a/images/macos/scripts/tests/Mono.Tests.ps1 b/images/macos/scripts/tests/Mono.Tests.ps1 new file mode 100644 index 000000000000..5d282230687e --- /dev/null +++ b/images/macos/scripts/tests/Mono.Tests.ps1 @@ -0,0 +1,74 @@ +Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" +Import-Module "$PSScriptRoot/Helpers.psm1" -DisableNameChecking + +$os = Get-OSVersion + +BeforeAll { + function Get-ShortSymlink { + param ( + [string] $Version + ) + + $versionParts = $Version.Split(".") + return [String]::Join(".", $versionParts[0..1]) + } +} + +Describe "Mono" -Skip:($os.IsSequoia) { + $MONO_VERSIONS_PATH = "/Library/Frameworks/Mono.framework/Versions" + $monoToolsetVersion = @((Get-ToolsetContent).mono.framework.version) + $versionFolderPath = Join-Path $MONO_VERSIONS_PATH ([System.Version]::Parse($monoToolsetVersion).ToString(3)) + $testCase = @{ MonoVersion = $monoToolsetVersion; VersionFolderPath = $versionFolderPath; MonoVersionsPath = $MONO_VERSIONS_PATH } + + It "is installed" -TestCases $testCase { + param ( [string] $VersionFolderPath ) + + $monoBinPath = Join-Path $VersionFolderPath "bin" "mono" + $VersionFolderPath | Should -Exist + $monoBinPath | Should -Exist + } + + It "is available via short link" -TestCases $testCase { + param ( + [string] $MonoVersion, + [string] $MonoVersionsPath, + [string] $VersionFolderPath + ) + + $shortSymlink = Get-ShortSymlink $MonoVersion # only 'major.minor' + $shortSymlinkFolderPath = Join-Path $MonoVersionsPath $shortSymlink + if ($shortSymlink -eq "4.8") { return } # Skip this test for Mono 4.8 because it doesn't contain VERSION file + $shortVersionPath = Join-Path $shortSymlinkFolderPath "VERSION" + $fullVersionPath = Join-Path $VersionFolderPath "VERSION" + Confirm-IdenticalFileContent -File1 $shortVersionPath -File2 $fullVersionPath + } + + It "NUnit console is installed" -TestCases $testCase { + param ( [string] $VersionFolderPath ) + + $nunitPath = Join-Path $VersionFolderPath "Commands" "nunit3-console" + $nunitPath | Should -Exist + } + + It "Nuget is installed" -TestCases $testCase { + param ( [string] $VersionFolderPath ) + + $nugetBinaryPath = Join-Path $VersionFolderPath "lib" "mono" "nuget" "nuget.exe" + $nugetBinaryWrapperPath = Join-Path $VersionFolderPath "bin" "nuget" + $nugetCommandPath = Join-Path $VersionFolderPath "Commands" "nuget" + $nugetBinaryPath | Should -Exist + $nugetCommandPath | Should -Exist + $nugetBinaryWrapperPath | Should -Exist + } + + It "Nuget is valid" -TestCases $testCase { + param ( [string] $VersionFolderPath ) + + $nugetBinaryWrapperPath = Join-Path $VersionFolderPath "bin" "nuget" + "$nugetBinaryWrapperPath" | Should -ReturnZeroExitCode + } + + It "MSBuild is available" { + "msbuild -version" | Should -ReturnZeroExitCode + } +} diff --git a/images/macos/scripts/tests/PipxPackages.Tests.ps1 b/images/macos/scripts/tests/PipxPackages.Tests.ps1 deleted file mode 100644 index 8a7cb0dcbccf..000000000000 --- a/images/macos/scripts/tests/PipxPackages.Tests.ps1 +++ /dev/null @@ -1,12 +0,0 @@ - -Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" - -$os = Get-OSVersion - -Describe "PipxPackages" -Skip:($os.IsVentura -or $os.IsSonoma -or $os.IsSequoia) { - $pipxToolset = (Get-ToolsetContent).pipx - $testCases = $pipxToolset | ForEach-Object { @{package = $_.package; cmd = $_.cmd} } - It "<package>" -TestCases $testCases { - "$cmd" | Should -ReturnZeroExitCode - } -} diff --git a/images/macos/scripts/tests/Toolset.Tests.ps1 b/images/macos/scripts/tests/Toolset.Tests.ps1 index f2aa3cd7a6fd..b4afae7e0c83 100644 --- a/images/macos/scripts/tests/Toolset.Tests.ps1 +++ b/images/macos/scripts/tests/Toolset.Tests.ps1 @@ -6,11 +6,6 @@ function Get-ShortVersion([System.Version] $Version) { return [System.Version]::Parse($Version).ToString(2) } -function Invoke-BashUtilsFunction([string] $FunctionName, [string]$parameter) { - $xamarinUtilsPath = "$PSScriptRoot/../provision/utils/xamarin-utils.sh" - return Invoke-Expression "bash -c `"source $xamarinUtilsPath && $FunctionName $parameter`"" -} - Describe "Toolset JSON validation" { $toolsets | ForEach-Object { It "$($_.Name) is valid" { @@ -33,109 +28,5 @@ $toolsets | ForEach-Object { $toolset.xcode.versions | Should -Contain $toolset.xcode.default } } - - Context "VSMac" { - $vsmacVersion = $toolset.xamarin.vsmac - - It "Version '$vsmacVersion' is available and can be downloaded" { - $vsmacUrl = Invoke-BashUtilsFunction("buildVSMacDownloadUrl", $vsmacVersion) - Confirm-UrlAvailability $vsmacUrl - } - } - - Context "Mono" { - $sdkVersions = $toolset.xamarin.mono_versions - - $sdkVersions | ForEach-Object { - It "Version '$_' is available and can be downloaded" { - $sdkUrl = Invoke-BashUtilsFunction("buildMonoDownloadUrl", $_) - Confirm-UrlAvailability $sdkUrl - } - } - - It "Version list doesn't contain versions with the same major/minor version" { - $versions = $sdkVersions | ForEach-Object { Get-ShortVersion $_ } - Confirm-ArrayWithoutDuplicates $versions -Because "It doesn't allow to install more than one version with the same major/minor" - } - } - - Context "Xamarin.iOS" { - $sdkVersions = $toolset.xamarin.ios_versions - - $sdkVersions | ForEach-Object { - It "Version '$_' is available and can be downloaded" { - $sdkUrl = Invoke-BashUtilsFunction("buildXamariniIOSDownloadUrl", $_) - Confirm-UrlAvailability $sdkUrl - } - } - - It "Version list doesn't contain versions with the same major/minor version" { - $versions = $sdkVersions | ForEach-Object { Get-ShortVersion $_ } - Confirm-ArrayWithoutDuplicates $versions -Because "It doesn't allow to install more than one version with the same major/minor" - } - } - - Context "Xamarin.Mac" { - $sdkVersions = $toolset.xamarin.mac_versions - - $sdkVersions | ForEach-Object { - It "Version '$_' is available and can be downloaded" { - $sdkUrl = Invoke-BashUtilsFunction("buildXamarinMacDownloadUrl", $_) - Confirm-UrlAvailability $sdkUrl - } - } - - It "Version list doesn't contain versions with the same major/minor version" { - $versions = $sdkVersions | ForEach-Object { Get-ShortVersion $_ } - Confirm-ArrayWithoutDuplicates $versions -Because "It doesn't allow to install more than one version with the same major/minor" - } - } - - Context "Xamarin.Android" { - $sdkVersions = $toolset.xamarin.android_versions - - $sdkVersions | ForEach-Object { - It "Version '$_' is available and can be downloaded" { - $sdkUrl = Invoke-BashUtilsFunction("buildXamarinAndroidDownloadUrl", $_) - Confirm-UrlAvailability $sdkUrl - } - } - - It "Version list doesn't contain versions with the same major/minor version" { - $versions = $sdkVersions | ForEach-Object { $_.Replace("-", ".") } | ForEach-Object { Get-ShortVersion $_ } - Confirm-ArrayWithoutDuplicates $versions -Because "It doesn't allow to install more than one version with the same major/minor" - } - } - - Context "Xamarin bundles" { - $monoVersions = $toolset.xamarin.mono_versions | ForEach-Object { Get-ShortVersion $_ } - $iOSVersions = $toolset.xamarin.ios_versions | ForEach-Object { Get-ShortVersion $_ } - $macVersions = $toolset.xamarin.mac_versions | ForEach-Object { Get-ShortVersion $_ } - # Old Xamarin.Android version looks like "9.0.0-18" that doesn't support by System.Version - $androidVersions = $toolset.xamarin.android_versions | ForEach-Object { Get-ShortVersion $_.Replace("-", ".") } - $bundles = $toolset.xamarin.bundles - - $bundles | ForEach-Object { - It "'$($_.symlink)' is valid" { - $monoVersions | Should -Contain $_.mono - $iOSVersions | Should -Contain $_.ios - $macVersions | Should -Contain $_.mac - $androidVersions | Should -Contain $_.android - } - } - - It "Each bundle has unique symlink" { - $symlinks = $bundles | ForEach-Object { $_.symlink } - Confirm-ArrayWithoutDuplicates $symlinks -Because "Bundle symlinks should be unique" - } - - It "Current bundle is valid" { - $currentBundleSymlink = $toolset.xamarin.bundle_default - if ($currentBundleSymlink -ne "latest") { - $bundleSymlinks = $bundles | ForEach-Object { $_.symlink } - $bundleSymlinks | Should -Contain $currentBundleSymlink -Because "Current bundle should be installed" - } - } - } } } diff --git a/images/macos/scripts/tests/WebServers.Tests.ps1 b/images/macos/scripts/tests/WebServers.Tests.ps1 deleted file mode 100644 index 303fa3842b00..000000000000 --- a/images/macos/scripts/tests/WebServers.Tests.ps1 +++ /dev/null @@ -1,25 +0,0 @@ -Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" - -$os = Get-OSVersion - -Describe "Apache" -Skip:($os.IsVentura -or $os.IsSonoma -or $os.IsSequoia) { - It "Apache CLI" { - "httpd -v" | Should -ReturnZeroExitCode - } - - It "Apache Service" { - $service = brew services list --json | ConvertFrom-Json | Where-Object { $_.name -eq "httpd" } - $service.status | Should -Match "(stopped|none)" - } -} - -Describe "Nginx" -Skip:($os.IsVentura -or $os.IsSonoma -or $os.IsSequoia) { - It "Nginx CLI" { - "nginx -v" | Should -ReturnZeroExitCode - } - - It "Nginx Service" { - $service = brew services list --json | ConvertFrom-Json | Where-Object { $_.name -eq "nginx" } - $service.status | Should -Match "(stopped|none)" - } -} diff --git a/images/macos/scripts/tests/Xamarin.Tests.ps1 b/images/macos/scripts/tests/Xamarin.Tests.ps1 deleted file mode 100644 index a09f87f138d2..000000000000 --- a/images/macos/scripts/tests/Xamarin.Tests.ps1 +++ /dev/null @@ -1,317 +0,0 @@ -Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" -Import-Module "$PSScriptRoot/Helpers.psm1" -DisableNameChecking - -$os = Get-OSVersion - -if ($os.IsVentura -or $os.IsSonoma) { - $MONO_VERSIONS = @((Get-ToolsetContent).mono.framework.version) - $XAMARIN_IOS_VERSIONS = @() - $XAMARIN_MAC_VERSIONS = @() - $XAMARIN_ANDROID_VERSIONS = @() -} elseif ($os.IsMonterey) { - $MONO_VERSIONS = (Get-ToolsetContent).xamarin.mono_versions - $XAMARIN_IOS_VERSIONS = (Get-ToolsetContent).xamarin.ios_versions - $XAMARIN_MAC_VERSIONS = (Get-ToolsetContent).xamarin.mac_versions - $XAMARIN_ANDROID_VERSIONS = (Get-ToolsetContent).xamarin.android_versions -} elseif ($os.IsSequoia) { - Write-Host "Skipping all the Mono and Xamarin tests as deprecated" - # Dummy workaround for the issue with the tests discovery - $MONO_VERSIONS = @() - $XAMARIN_IOS_VERSIONS = @() - $XAMARIN_MAC_VERSIONS = @() - $XAMARIN_ANDROID_VERSIONS = @() -} - -BeforeAll { - function Get-ShortSymlink { - param ( - [string] $Version - ) - - $versionParts = $Version.Split(".") - return [String]::Join(".", $versionParts[0..1]) - } -} - -Describe "Mono" -Skip:($os.IsSequoia) { - $MONO_VERSIONS | ForEach-Object { - Context "$_" { - $MONO_VERSIONS_PATH = "/Library/Frameworks/Mono.framework/Versions" - $versionFolderPath = Join-Path $MONO_VERSIONS_PATH ([System.Version]::Parse($_).ToString(3)) - $testCase = @{ MonoVersion = $_; VersionFolderPath = $versionFolderPath; MonoVersionsPath = $MONO_VERSIONS_PATH } - - It "is installed" -TestCases $testCase { - param ( [string] $VersionFolderPath ) - - $monoBinPath = Join-Path $VersionFolderPath "bin" "mono" - $VersionFolderPath | Should -Exist - $monoBinPath | Should -Exist - } - - It "is available via short link" -TestCases $testCase { - param ( - [string] $MonoVersion, - [string] $MonoVersionsPath, - [string] $VersionFolderPath - ) - - $shortSymlink = Get-ShortSymlink $MonoVersion # only 'major.minor' - $shortSymlinkFolderPath = Join-Path $MonoVersionsPath $shortSymlink - if ($shortSymlink -eq "4.8") { return } # Skip this test for Mono 4.8 because it doesn't contain VERSION file - $shortVersionPath = Join-Path $shortSymlinkFolderPath "VERSION" - $fullVersionPath = Join-Path $VersionFolderPath "VERSION" - - Confirm-IdenticalFileContent -File1 $shortVersionPath -File2 $fullVersionPath - } - - It "NUnit console is installed" -TestCases $testCase { - param ( [string] $VersionFolderPath ) - - $nunitPath = Join-Path $VersionFolderPath "Commands" "nunit3-console" - $nunitPath | Should -Exist - } - - It "Nuget is installed" -TestCases $testCase { - param ( [string] $VersionFolderPath ) - - $nugetBinaryPath = Join-Path $VersionFolderPath "lib" "mono" "nuget" "nuget.exe" - $nugetBinaryWrapperPath = Join-Path $VersionFolderPath "bin" "nuget" - $nugetCommandPath = Join-Path $VersionFolderPath "Commands" "nuget" - - $nugetBinaryPath | Should -Exist - $nugetCommandPath | Should -Exist - $nugetBinaryWrapperPath | Should -Exist - } - - It "Nuget is valid" -TestCases $testCase { - param ( [string] $VersionFolderPath ) - - $nugetBinaryWrapperPath = Join-Path $VersionFolderPath "bin" "nuget" - "$nugetBinaryWrapperPath" | Should -ReturnZeroExitCode - } - } - } - - It "MSBuild is available" { - "msbuild -version" | Should -ReturnZeroExitCode - } -} - -Describe "Xamarin.iOS" -Skip:($os.IsVentura -or $os.IsSonoma -or $os.IsSequoia) { - $XAMARIN_IOS_VERSIONS | ForEach-Object { - Context "$_" { - $XAMARIN_IOS_VERSIONS_PATH = "/Library/Frameworks/Xamarin.iOS.framework/Versions" - $versionFolderPath = Join-Path $XAMARIN_IOS_VERSIONS_PATH $_ - $testCase = @{ XamarinIosVersion = $_; VersionFolderPath = $versionFolderPath; IosVersionsPath = $XAMARIN_IOS_VERSIONS_PATH } - - It "is installed" -TestCases $testCase { - param ( [string] $VersionFolderPath ) - - $xamarinBinPath = Join-Path $VersionFolderPath "bin" - $VersionFolderPath | Should -Exist - $xamarinBinPath | Should -Exist - } - - It "is available via short link" -TestCases $testCase { - param ( - [string] $XamarinIosVersion, - [string] $IosVersionsPath, - [string] $VersionFolderPath - ) - - $shortSymlink = Get-ShortSymlink $XamarinIosVersion # only 'major.minor' - $shortSymlinkFolderPath = Join-Path $IosVersionsPath $shortSymlink - $shortVersionPath = Join-Path $shortSymlinkFolderPath "VERSION" - $fullVersionPath = Join-Path $VersionFolderPath "VERSION" - - Confirm-IdenticalFileContent -File1 $shortVersionPath -File2 $fullVersionPath - } - } - } -} - -Describe "Xamarin.Mac" -Skip:($os.IsVentura -or $os.IsSonoma -or $os.IsSequoia) { - $XAMARIN_MAC_VERSIONS | ForEach-Object { - Context "$_" { - $XAMARIN_MAC_VERSIONS_PATH = "/Library/Frameworks/Xamarin.Mac.framework/Versions" - $versionFolderPath = Join-Path $XAMARIN_MAC_VERSIONS_PATH $_ - $testCase = @{ XamarinMacVersion = $_; VersionFolderPath = $versionFolderPath; MacVersionsPath = $XAMARIN_MAC_VERSIONS_PATH } - - It "is installed" -TestCases $testCase { - param ( [string] $VersionFolderPath ) - - $xamarinBinPath = Join-Path $VersionFolderPath "bin" - $VersionFolderPath | Should -Exist - $xamarinBinPath | Should -Exist - } - - It "is available via short link" -TestCases $testCase { - param ( - [string] $XamarinMacVersion, - [string] $MacVersionsPath, - [string] $VersionFolderPath - ) - - $shortSymlink = Get-ShortSymlink $XamarinMacVersion # only 'major.minor' - $shortSymlinkFolderPath = Join-Path $MacVersionsPath $shortSymlink - $shortVersionPath = Join-Path $shortSymlinkFolderPath "VERSION" - $fullVersionPath = Join-Path $VersionFolderPath "VERSION" - - Confirm-IdenticalFileContent -File1 $shortVersionPath -File2 $fullVersionPath - } - } - } -} - -Describe "Xamarin.Android" -Skip:($os.IsVentura -or $os.IsSonoma -or $os.IsSequoia) { - $XAMARIN_ANDROID_VERSIONS | ForEach-Object { - Context "$_" { - $XAMARIN_ANDROID_VERSIONS_PATH = "/Library/Frameworks/Xamarin.Android.framework/Versions" - $versionFolderPath = Join-Path $XAMARIN_ANDROID_VERSIONS_PATH $_ - $testCase = @{ XamarinAndroidVersion = $_; VersionFolderPath = $versionFolderPath; AndroidVersionsPath = $XAMARIN_ANDROID_VERSIONS_PATH } - - It "is installed" -TestCases $testCase { - param ( [string] $VersionFolderPath ) - - $xamarinLibPath = Join-Path $VersionFolderPath "lib" - $xamarinLibPath | Should -Exist - } - - It "is available via short link" -TestCases $testCase { - param ( - [string] $XamarinAndroidVersion, - [string] $AndroidVersionsPath, - [string] $VersionFolderPath - ) - - $shortSymlink = Get-ShortSymlink $XamarinAndroidVersion # only 'major.minor' - $shortSymlinkFolderPath = Join-Path $AndroidVersionsPath $shortSymlink - $shortVersionPath = Join-Path $shortSymlinkFolderPath "VERSION" - $fullVersionPath = Join-Path $VersionFolderPath "VERSION" - - Confirm-IdenticalFileContent -File1 $shortVersionPath -File2 $fullVersionPath - } - - It "has correct symlinks" -TestCases $testCase { - param ( [string] $VersionFolderPath ) - - $xamarinLibPath = Join-Path $VersionFolderPath "lib" - Join-Path $xamarinLibPath "xbuild" | Should -Exist - Join-Path $xamarinLibPath "xbuild-frameworks" | Should -Exist - } - } - } -} - -Describe "Xamarin Bundles" -Skip:($os.IsVentura -or $os.IsSonoma -or $os.IsSequoia) { - BeforeAll { - $MONO_VERSIONS_PATH = "/Library/Frameworks/Mono.framework/Versions" - $XAMARIN_IOS_VERSIONS_PATH = "/Library/Frameworks/Xamarin.iOS.framework/Versions" - $XAMARIN_MAC_VERSIONS_PATH = "/Library/Frameworks/Xamarin.Mac.framework/Versions" - $XAMARIN_ANDROID_VERSIONS_PATH = "/Library/Frameworks/Xamarin.Android.framework/Versions" - } - - If ($XAMARIN_BUNDLES.Count -eq 0) { return } # Skip this test if there are no bundles - - [array]$XAMARIN_BUNDLES = (Get-ToolsetContent).xamarin.bundles - $XAMARIN_DEFAULT_BUNDLE = (Get-ToolsetContent).xamarin.bundle_default - If ($XAMARIN_DEFAULT_BUNDLE -eq "latest") { $XAMARIN_DEFAULT_BUNDLE = $XAMARIN_BUNDLES[0].symlink } - - $currentBundle = [PSCustomObject] @{ - symlink = "Current" - mono = $XAMARIN_DEFAULT_BUNDLE - ios = $XAMARIN_DEFAULT_BUNDLE - mac = $XAMARIN_DEFAULT_BUNDLE - android = $XAMARIN_DEFAULT_BUNDLE - } - - $latestBundle = [PSCustomObject] @{ - symlink = "Latest" - mono = $XAMARIN_BUNDLES[0].mono - ios = $XAMARIN_BUNDLES[0].ios - mac = $XAMARIN_BUNDLES[0].mac - android = $XAMARIN_BUNDLES[0].android - } - - $bundles = $XAMARIN_BUNDLES + $currentBundle + $latestBundle - $allBundles = $bundles | ForEach-Object { @{BundleSymlink = $_.symlink; BundleMono = $_.mono; BundleIos = $_.ios; BundleMac = $_.mac; BundleAndroid = $_.android } } - - It "Mono symlink <BundleSymlink> exists" -TestCases $allBundles { - param ( [string] $BundleSymlink ) - - (Join-Path $MONO_VERSIONS_PATH $BundleSymlink) | Should -Exist - } - - It "Mono symlink <BundleSymlink> points to the correct version" -TestCases $allBundles { - param ( - [string] $BundleSymlink, - [string] $BundleMono - ) - - if ($BundleMono -eq "4.8") { return } # Skip this test for Mono 4.8 because it doesn't contain VERSION file - $sourceVersionPath = Join-Path $MONO_VERSIONS_PATH $BundleMono "VERSION" - $targetVersionPath = Join-Path $MONO_VERSIONS_PATH $BundleSymlink "VERSION" - - Confirm-IdenticalFileContent -File1 $targetVersionPath -File2 $sourceVersionPath - } - - It "iOS symlink <BundleSymlink> exists" -TestCases $allBundles { - param ( [string] $BundleSymlink ) - - (Join-Path $XAMARIN_IOS_VERSIONS_PATH $BundleSymlink) | Should -Exist - } - - It "iOS symlink <BundleSymlink> points to the correct version" -TestCases $allBundles { - param ( - [string] $BundleSymlink, - [string] $BundleIos - ) - - $sourceVersionPath = Join-Path $XAMARIN_IOS_VERSIONS_PATH $BundleIos "VERSION" - $targetVersionPath = Join-Path $XAMARIN_IOS_VERSIONS_PATH $BundleSymlink "VERSION" - - Confirm-IdenticalFileContent -File1 $targetVersionPath -File2 $sourceVersionPath - } - - It "Mac symlink <BundleSymlink> exists" -TestCases $allBundles { - param ( [string] $BundleSymlink ) - - (Join-Path $XAMARIN_MAC_VERSIONS_PATH $BundleSymlink) | Should -Exist - } - - It "Mac symlink <BundleSymlink> points to the correct version" -TestCases $allBundles { - param ( - [string] $BundleSymlink, - [string] $BundleMac - ) - - $sourceVersionPath = Join-Path $XAMARIN_MAC_VERSIONS_PATH $BundleMac "VERSION" - $targetVersionPath = Join-Path $XAMARIN_MAC_VERSIONS_PATH $BundleSymlink "VERSION" - - Confirm-IdenticalFileContent -File1 $targetVersionPath -File2 $sourceVersionPath - } - - It "Xamarin.Android symlink <BundleSymlink> exists" -TestCases $allBundles { - param ( [string] $BundleSymlink ) - - (Join-Path $XAMARIN_ANDROID_VERSIONS_PATH $BundleSymlink) | Should -Exist - } - - It "Android symlink <BundleSymlink> points to the correct version" -TestCases $allBundles { - param ( - [string] $BundleSymlink, - [string] $BundleAndroid - ) - - $sourceVersionPath = Join-Path $XAMARIN_ANDROID_VERSIONS_PATH $BundleAndroid "VERSION" - $targetVersionPath = Join-Path $XAMARIN_ANDROID_VERSIONS_PATH $BundleSymlink "VERSION" - - Confirm-IdenticalFileContent -File1 $targetVersionPath -File2 $sourceVersionPath - } -} - -Describe "Nuget" -Skip:($os.IsVentura -or $os.IsSonoma -or $os.IsSequoia) { - It "Nuget config contains nuget.org feed" { - Get-Content $env:HOME/.config/NuGet/NuGet.Config | Out-String | Should -Match "nuget.org" - } -} diff --git a/images/macos/scripts/tests/Xcode.Tests.ps1 b/images/macos/scripts/tests/Xcode.Tests.ps1 index 4489b9ab3d5b..f56fe806db98 100644 --- a/images/macos/scripts/tests/Xcode.Tests.ps1 +++ b/images/macos/scripts/tests/Xcode.Tests.ps1 @@ -122,20 +122,3 @@ Describe "Xcode simulators" { Switch-Xcode -Version $defaultXcode } } - -Describe "Xcode Simulators Naming" -Skip:(-not $os.IsMonterey) { - $testCases = Get-BrokenXcodeSimulatorsList - It "Simulator '<SimulatorName> [<RuntimeId>]'" -TestCases $testCases { - $simctlPath = Get-XcodeToolPath -Version $XcodeVersion -ToolName "simctl" - [string]$rawDevicesInfo = Invoke-Expression "$simctlPath list devices --json" - $jsonDevicesInfo = ($rawDevicesInfo | ConvertFrom-Json).devices - - $foundSimulators = $jsonDevicesInfo.$RuntimeId | Where-Object { $_.deviceTypeIdentifier -eq $DeviceId } - $foundSimulators | Should -HaveCount 1 - $foundSimulators[0].name | Should -Be $SimulatorName - - $foundSimulators = $jsonDevicesInfo.$RuntimeId | Where-Object { $_.name -eq $SimulatorName } - $foundSimulators | Should -HaveCount 1 - $foundSimulators[0].deviceTypeIdentifier | Should -Be $DeviceId - } -} diff --git a/images/macos/templates/macOS-12.anka.pkr.hcl b/images/macos/templates/macOS-12.anka.pkr.hcl deleted file mode 100644 index 398623bbda82..000000000000 --- a/images/macos/templates/macOS-12.anka.pkr.hcl +++ /dev/null @@ -1,315 +0,0 @@ -packer { - required_plugins { - veertu-anka = { - version = ">= v3.2.0" - source = "github.com/veertuinc/veertu-anka" - } - } -} - -locals { - image_folder = "/Users/${var.vm_username}/image-generation" -} - -variable "builder_type" { - type = string - default = "veertu-anka-vm-clone" - validation { - condition = contains(["veertu-anka-vm-clone", "null"], var.builder_type) - error_message = "The builder_type value must be one of [veertu-anka-vm-clone, null]." - } -} - -variable "source_vm_name" { - type = string -} - -variable "source_vm_port" { - type = number - default = 22 -} - -variable "source_vm_tag" { - type = string - default = "" -} - -variable "socks_proxy" { - type = string - default = "" -} - -variable "build_id" { - type = string -} - -variable "vm_username" { - type = string - sensitive = true -} - -variable "vm_password" { - type = string - sensitive = true -} - -variable "github_api_pat" { - type = string - sensitive = true - default = "" -} - -variable "xcode_install_storage_url" { - type = string - sensitive = true -} - -variable "xcode_install_sas" { - type = string - sensitive = true -} - -variable "vcpu_count" { - type = string - default = "6" -} - -variable "ram_size" { - type = string - default = "24G" -} - -variable "image_os" { - type = string - default = "macos12" -} - -source "veertu-anka-vm-clone" "template" { - vm_name = "${var.build_id}" - source_vm_name = "${var.source_vm_name}" - source_vm_tag = "${var.source_vm_tag}" - vcpu_count = "${var.vcpu_count}" - ram_size = "${var.ram_size}" - stop_vm = "true" -} - -source "null" "template" { - ssh_host = "${var.source_vm_name}" - ssh_port = "${var.source_vm_port}" - ssh_username = "${var.vm_username}" - ssh_password = "${var.vm_password}" - ssh_proxy_host = "${var.socks_proxy}" -} - -build { - sources = ["source.${var.builder_type}.template"] - - provisioner "shell" { - inline = ["mkdir ${local.image_folder}"] - } - - provisioner "file" { - destination = "${local.image_folder}/" - sources = [ - "${path.root}/../assets/xamarin-selector", - "${path.root}/../scripts/tests", - "${path.root}/../scripts/docs-gen", - "${path.root}/../scripts/helpers" - ] - } - - provisioner "file" { - destination = "${local.image_folder}/docs-gen/" - source = "${path.root}/../../../helpers/software-report-base" - } - - provisioner "file" { - destination = "${local.image_folder}/add-certificate.swift" - source = "${path.root}/../assets/add-certificate.swift" - } - - provisioner "file" { - destination = ".bashrc" - source = "${path.root}/../assets/bashrc" - } - - provisioner "file" { - destination = ".bash_profile" - source = "${path.root}/../assets/bashprofile" - } - - provisioner "shell" { - inline = [ "mkdir ~/bootstrap" ] - } - - provisioner "file" { - destination = "bootstrap" - source = "${path.root}/../assets/bootstrap-provisioner/" - } - - provisioner "file" { - destination = "${local.image_folder}/toolset.json" - source = "${path.root}/../toolsets/toolset-12.json" - } - provisioner "shell" { - execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" - inline = [ - "mv ${local.image_folder}/docs-gen ${local.image_folder}/software-report", - "mv ${local.image_folder}/xamarin-selector ${local.image_folder}/assets", - "mkdir ~/utils", - "mv ${local.image_folder}/helpers/confirm-identified-developers.scpt ~/utils", - "mv ${local.image_folder}/helpers/invoke-tests.sh ~/utils", - "mv ${local.image_folder}/helpers/utils.sh ~/utils", - "mv ${local.image_folder}/helpers/xamarin-utils.sh ~/utils" - ] - } - provisioner "shell" { - execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" - scripts = [ - "${path.root}/../scripts/build/install-xcode-clt.sh", - "${path.root}/../scripts/build/install-homebrew.sh" - ] - } - - provisioner "shell" { - environment_vars = ["PASSWORD=${var.vm_password}", "USERNAME=${var.vm_username}"] - execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}" - scripts = [ - "${path.root}/../scripts/build/configure-tccdb-macos.sh", - "${path.root}/../scripts/build/configure-network-interface-detection.sh", - "${path.root}/../scripts/build/configure-autologin.sh", - "${path.root}/../scripts/build/configure-auto-updates.sh", - "${path.root}/../scripts/build/configure-screensaver.sh", - "${path.root}/../scripts/build/configure-ntpconf.sh", - "${path.root}/../scripts/build/configure-max-files-limitation.sh", - "${path.root}/../scripts/build/configure-shell.sh" - ] - } - - provisioner "shell" { - environment_vars = ["IMAGE_VERSION=${var.build_id}", "IMAGE_OS=${var.image_os}", "PASSWORD=${var.vm_password}"] - execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" - scripts = [ - "${path.root}/../scripts/build/configure-preimagedata.sh", - "${path.root}/../scripts/build/configure-ssh.sh", - "${path.root}/../scripts/build/configure-machine.sh" - ] - } - - provisioner "shell" { - execute_command = "source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}" - expect_disconnect = true - inline = ["echo 'Reboot VM'", "shutdown -r now"] - } - - provisioner "shell" { - environment_vars = ["API_PAT=${var.github_api_pat}", "USER_PASSWORD=${var.vm_password}", "IMAGE_FOLDER=${local.image_folder}"] - execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" - pause_before = "30s" - scripts = [ - "${path.root}/../scripts/build/configure-windows.sh", - "${path.root}/../scripts/build/install-powershell.sh", - "${path.root}/../scripts/build/install-dotnet.sh", - "${path.root}/../scripts/build/install-python.sh", - "${path.root}/../scripts/build/install-azcopy.sh", - "${path.root}/../scripts/build/install-openssl.sh", - "${path.root}/../scripts/build/install-ruby.sh", - "${path.root}/../scripts/build/install-rubygems.sh", - "${path.root}/../scripts/build/install-git.sh", - "${path.root}/../scripts/build/install-mongodb.sh", - "${path.root}/../scripts/build/install-node.sh", - "${path.root}/../scripts/build/install-common-utils.sh" - ] - } - - provisioner "shell" { - environment_vars = ["XCODE_INSTALL_STORAGE_URL=${var.xcode_install_storage_url}", "XCODE_INSTALL_SAS=${var.xcode_install_sas}", "IMAGE_FOLDER=${local.image_folder}"] - execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} pwsh -f {{ .Path }}" - script = "${path.root}/../scripts/build/Install-Xcode.ps1" - } - - provisioner "shell" { - execute_command = "source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}" - expect_disconnect = true - inline = ["echo 'Reboot VM'", "shutdown -r now"] - } - - provisioner "shell" { - environment_vars = ["API_PAT=${var.github_api_pat}", "IMAGE_FOLDER=${local.image_folder}"] - execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" - scripts = [ - "${path.root}/../scripts/build/install-actions-cache.sh", - "${path.root}/../scripts/build/install-llvm.sh", - "${path.root}/../scripts/build/install-golang.sh", - "${path.root}/../scripts/build/install-swiftlint.sh", - "${path.root}/../scripts/build/install-openjdk.sh", - "${path.root}/../scripts/build/install-php.sh", - "${path.root}/../scripts/build/install-aws-tools.sh", - "${path.root}/../scripts/build/install-rust.sh", - "${path.root}/../scripts/build/install-gcc.sh", - "${path.root}/../scripts/build/install-haskell.sh", - "${path.root}/../scripts/build/install-cocoapods.sh", - "${path.root}/../scripts/build/install-android-sdk.sh", - "${path.root}/../scripts/build/install-xamarin.sh", - "${path.root}/../scripts/build/install-visualstudio.sh", - "${path.root}/../scripts/build/install-nvm.sh", - "${path.root}/../scripts/build/install-apache.sh", - "${path.root}/../scripts/build/install-nginx.sh", - "${path.root}/../scripts/build/install-postgresql.sh", - "${path.root}/../scripts/build/install-audiodevice.sh", - "${path.root}/../scripts/build/install-vcpkg.sh", - "${path.root}/../scripts/build/install-miniconda.sh", - "${path.root}/../scripts/build/install-safari.sh", - "${path.root}/../scripts/build/install-chrome.sh", - "${path.root}/../scripts/build/install-edge.sh", - "${path.root}/../scripts/build/install-firefox.sh", - "${path.root}/../scripts/build/install-pypy.sh", - "${path.root}/../scripts/build/install-pipx-packages.sh", - "${path.root}/../scripts/build/install-bicep.sh", - "${path.root}/../scripts/build/install-codeql-bundle.sh", - "${path.root}/../scripts/build/install-compilable-brew-packages.sh" - ] - } - - provisioner "shell" { - environment_vars = ["IMAGE_FOLDER=${local.image_folder}"] - execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} pwsh -f {{ .Path }}" - scripts = [ - "${path.root}/../scripts/build/Install-Toolset.ps1", - "${path.root}/../scripts/build/Configure-Toolset.ps1" - ] - } - - provisioner "shell" { - execute_command = "source $HOME/.bash_profile; ruby {{ .Path }}" - script = "${path.root}/../scripts/build/configure-xcode-simulators.rb" - } - - provisioner "shell" { - execute_command = "chmod +x {{ .Path }}; {{ .Vars }} pwsh -f {{ .Path }}" - script = "${path.root}/../scripts/build/Update-XcodeSimulators.ps1" - } - - provisioner "shell" { - environment_vars = ["IMAGE_FOLDER=${local.image_folder}"] - execute_command = "source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" - inline = [ - "pwsh -File \"${local.image_folder}/software-report/Generate-SoftwareReport.ps1\" -OutputDirectory \"${local.image_folder}/output/software-report\" -ImageName ${var.build_id}", - "pwsh -File \"${local.image_folder}/tests/RunAll-Tests.ps1\"" - ] - } - - provisioner "file" { - destination = "${path.root}/../../image-output/" - direction = "download" - source = "${local.image_folder}/output/" - } - - provisioner "shell" { - execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" - scripts = [ - "${path.root}/../scripts/build/configure-hostname.sh", - "${path.root}/../scripts/build/configure-system.sh" - ] - } -} diff --git a/images/macos/templates/macOS-13.anka.pkr.hcl b/images/macos/templates/macOS-13.anka.pkr.hcl index 25789a533f79..f764115fd6d2 100644 --- a/images/macos/templates/macOS-13.anka.pkr.hcl +++ b/images/macos/templates/macOS-13.anka.pkr.hcl @@ -111,7 +111,6 @@ build { provisioner "file" { destination = "${local.image_folder}/" sources = [ - "${path.root}/../assets/xamarin-selector", "${path.root}/../scripts/tests", "${path.root}/../scripts/docs-gen", "${path.root}/../scripts/helpers" @@ -156,12 +155,10 @@ build { execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" inline = [ "mv ${local.image_folder}/docs-gen ${local.image_folder}/software-report", - "mv ${local.image_folder}/xamarin-selector ${local.image_folder}/assets", "mkdir ~/utils", "mv ${local.image_folder}/helpers/confirm-identified-developers-macos13.scpt ~/utils", "mv ${local.image_folder}/helpers/invoke-tests.sh ~/utils", "mv ${local.image_folder}/helpers/utils.sh ~/utils", - "mv ${local.image_folder}/helpers/xamarin-utils.sh ~/utils" ] } diff --git a/images/macos/templates/macOS-13.arm64.anka.pkr.hcl b/images/macos/templates/macOS-13.arm64.anka.pkr.hcl index 7e03aa8fe7ee..e4f4e38cd451 100644 --- a/images/macos/templates/macOS-13.arm64.anka.pkr.hcl +++ b/images/macos/templates/macOS-13.arm64.anka.pkr.hcl @@ -112,7 +112,6 @@ build { provisioner "file" { destination = "${local.image_folder}/" sources = [ - "${path.root}/../assets/xamarin-selector", "${path.root}/../scripts/tests", "${path.root}/../scripts/docs-gen", "${path.root}/../scripts/helpers" @@ -157,12 +156,9 @@ build { execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" inline = [ "mv ${local.image_folder}/docs-gen ${local.image_folder}/software-report", - "mv ${local.image_folder}/xamarin-selector ${local.image_folder}/assets", "mkdir ~/utils", - "mv ${local.image_folder}/helpers/confirm-identified-developers.scpt ~/utils", "mv ${local.image_folder}/helpers/invoke-tests.sh ~/utils", "mv ${local.image_folder}/helpers/utils.sh ~/utils", - "mv ${local.image_folder}/helpers/xamarin-utils.sh ~/utils" ] } diff --git a/images/macos/templates/macOS-14.anka.pkr.hcl b/images/macos/templates/macOS-14.anka.pkr.hcl index a29cd926baff..04ad479d37d2 100644 --- a/images/macos/templates/macOS-14.anka.pkr.hcl +++ b/images/macos/templates/macOS-14.anka.pkr.hcl @@ -111,7 +111,6 @@ build { provisioner "file" { destination = "${local.image_folder}/" sources = [ - "${path.root}/../assets/xamarin-selector", "${path.root}/../scripts/tests", "${path.root}/../scripts/docs-gen", "${path.root}/../scripts/helpers" @@ -156,12 +155,10 @@ build { execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" inline = [ "mv ${local.image_folder}/docs-gen ${local.image_folder}/software-report", - "mv ${local.image_folder}/xamarin-selector ${local.image_folder}/assets", "mkdir ~/utils", "mv ${local.image_folder}/helpers/confirm-identified-developers-macos14.scpt ~/utils", "mv ${local.image_folder}/helpers/invoke-tests.sh ~/utils", "mv ${local.image_folder}/helpers/utils.sh ~/utils", - "mv ${local.image_folder}/helpers/xamarin-utils.sh ~/utils" ] } diff --git a/images/macos/templates/macOS-14.arm64.anka.pkr.hcl b/images/macos/templates/macOS-14.arm64.anka.pkr.hcl index be90e1015288..e61c239f02b8 100644 --- a/images/macos/templates/macOS-14.arm64.anka.pkr.hcl +++ b/images/macos/templates/macOS-14.arm64.anka.pkr.hcl @@ -112,7 +112,6 @@ build { provisioner "file" { destination = "${local.image_folder}/" sources = [ - "${path.root}/../assets/xamarin-selector", "${path.root}/../scripts/tests", "${path.root}/../scripts/docs-gen", "${path.root}/../scripts/helpers" @@ -157,12 +156,9 @@ build { execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" inline = [ "mv ${local.image_folder}/docs-gen ${local.image_folder}/software-report", - "mv ${local.image_folder}/xamarin-selector ${local.image_folder}/assets", "mkdir ~/utils", - "mv ${local.image_folder}/helpers/confirm-identified-developers.scpt ~/utils", "mv ${local.image_folder}/helpers/invoke-tests.sh ~/utils", "mv ${local.image_folder}/helpers/utils.sh ~/utils", - "mv ${local.image_folder}/helpers/xamarin-utils.sh ~/utils" ] } diff --git a/images/macos/toolsets/Readme.md b/images/macos/toolsets/Readme.md index 54b96c80cf22..3714d9178392 100644 --- a/images/macos/toolsets/Readme.md +++ b/images/macos/toolsets/Readme.md @@ -29,62 +29,6 @@ ] ``` -## Xamarin - -- `vsmac` - version of Visual Studio For Mac to install. - **Example:** `"8.3.11.1"` - -- `mono_versions` - the array of Mono versions to install. - **Example:** `[ "6.4.0.208", "6.0.0.334" ]` - -- `ios_versions` - the array of Xamarin iOS versions to install. - **Example:** `[ "13.6.0.12", "13.4.0.2", "13.2.0.47" ]` - -- `mac_versions` - the array of Xamarin iOS versions to install. - **Example:** `[ "6.6.0.12", "6.4.0.2", "6.2.0.47" ]` - -- `android_versions` - the array of Xamarin iOS versions to install. - **Example:** `[ "10.0.6.2", "9.4.1.0" ]` - -**Note:** More than one version of SDK with the same major.minor version should not be installed. It applies to `mono_versions`, `ios_versions`, `mac_versions`, `android_versions` fields. -For example, if Mono `6.4.0.100` is installed and Mono `6.4.1.2` was released recently, we should not install both, just update `6.4.0.100` -> `6.4.1.2`. Only major and minor version changes can break backward compatibility so it is safe. - -- `bundle_default` - the symlink of the bundle that will be set as default on the image. -This bundle will be set as `Current`. - **Example:** `"5_12_0"` (set bundle with symlink `5_12_0` as default) - **Example:** `"latest"` (set latest bundle as default) - -- `bundles` - the array of objects that describe bundles that will be created on image after sdk installation. -The first bundle in the list will be as `Latest`. - - Each object should contain the following fields: - - `symlink` - unique id of the bundle (usually looks like "<major_mono_version>_<minor_mono_version>_<index>") - - `mono` - version of Mono that will be set in this bundle. Only two numbers (`major.minor`) should be specified. - - `ios` - version of Xamarin.iOS that will be set in this bundle. Only two numbers (`major.minor`) should be specified. - - `mac` - version of Xamarin.Mac that will be set in this bundle. Only two numbers (`major.minor`) should be specified. - - `android` - version of Xamarin.Android that will be set in this bundle. Only two numbers (`major.minor`) should be specified. - -**Example:** - -```json - [ - { - "symlink": "6_4_2", - "mono": "6.4", - "ios": "13.6", - "mac": "6.6", - "android": "10.0" - }, - { - "symlink": "6_4_1", - "mono": "6.4", - "ios": "13.4", - "mac": "6.4", - "android": "10.0" - } - ] -``` - ## Android - `platform-list` - the array of android platforms to install. @@ -96,7 +40,7 @@ The first bundle in the list will be as `Latest`. - `extras` - the array of android extra items to install. **Example:** `[ "google;google_play_services", "intel;Hardware_Accelerated_Execution_Manager" ]` -- `addons` - the array of android addons to install. +- `addons` - the array of android add-ons to install. **Example:** `[ "addon-google_apis-google-24", "addon-google_apis-google-23" ]` ## Toolset JSON validation diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json deleted file mode 100644 index e63383d7af01..000000000000 --- a/images/macos/toolsets/toolset-12.json +++ /dev/null @@ -1,368 +0,0 @@ -{ - "xcode": { - "default": "14.2", - "x64": { - "versions": [ - { "link": "14.2", "version": "14.2.0+14C18", "install_runtimes": "true", "sha256": "686B9D53CA49E50D563BC0104B1E8B4F7CCFE80064A6D689965FB819BF8EFE72" }, - { "link": "14.1", "version": "14.1.0+14B47b", "install_runtimes": "true", "sha256": "12F8A3AEF78BF354470AD8B351ADDD925C8EDAD888137D138CA50A8130EB9F2F" }, - { "link": "14.0.1", "version": "14.0.1+14A400", "symlinks": ["14.0"], "install_runtimes": "true", "sha256": "EDB4DDCE02F92338E3D10B011FC86CD26520E3238585F06F3C182880DDD3B2AF" }, - { "link": "13.4.1", "version": "13.4.1+13F100", "symlinks": ["13.4"], "sha256": "A1E0DBD6D5A96C4A6D3D63600B58486759AA836C2D9F7E8FA6D7DA4C7399638B" }, - { "link": "13.3.1", "version": "13.3.1+13E500a", "symlinks": ["13.3"], "sha256": "D10B4644DB84BA43F7B18CE94FB3CA1ACD255D39781F4AF8FC88BD8581E08F97" }, - { "link": "13.2.1", "version": "13.2.1+13C100", "symlinks": ["13.2"], "sha256": "D3BFCC6225D531587490C0DFC0926C80B7D50D17671DC8F25868F965F5D65F9D" }, - { "link": "13.1", "version": "13.1.0+13A1030d", "sha256": "4EFDEEA0EEEDA1957BB394128CCCD1DAAC3CB0A3D074224E0FAB90855CCA09C4" } - ] - } - }, - "xamarin": { - "vsmac": { - "default": "2022", - "versions": [ "2019", "2022" ] - }, - "mono_versions": [ - "6.12.0.188" - ], - "ios_versions": [ - "16.4.0.23", "16.2.0.5", "16.1.1.27", "16.0.0.72", "15.12.0.2", "15.10.0.5", "15.8.0.3", "15.6.0.3", "15.4.0.0", "15.2.0.17", "15.0.0.6" - ], - "mac_versions": [ - "9.3.0.23", "9.1.0.5", "9.0.0.27", "8.12.0.2", "8.10.0.5", "8.8.0.3", "8.6.0.3", "8.4.0.0", "8.2.0.17", "7.14.0.27" - ], - "android_versions": [ - "13.2.2.0", "13.1.0.1", "13.0.0.0", "12.3.3.3", "12.2.8.3", "12.1.0.2", "12.0.0.3", "11.3.0.4" - ], - "bundle_default": "6_12_21", - "bundles": [ - { - "symlink": "6_12_25", - "mono":"6.12", - "ios": "16.4", - "mac": "9.3", - "android": "13.2" - }, - { - "symlink": "6_12_24", - "mono":"6.12", - "ios": "16.2", - "mac": "9.1", - "android": "13.2" - }, - { - "symlink": "6_12_23", - "mono":"6.12", - "ios": "16.2", - "mac": "9.1", - "android": "13.1" - }, - { - "symlink": "6_12_22", - "mono":"6.12", - "ios": "16.1", - "mac": "9.0", - "android": "13.1" - }, - { - "symlink": "6_12_21", - "mono":"6.12", - "ios": "16.0", - "mac": "8.12", - "android": "13.1" - }, - { - "symlink": "6_12_20", - "mono":"6.12", - "ios": "16.0", - "mac": "8.12", - "android": "13.0" - }, - { - "symlink": "6_12_19", - "mono":"6.12", - "ios": "15.12", - "mac": "8.12", - "android": "13.0" - }, - { - "symlink": "6_12_18", - "mono":"6.12", - "ios": "15.10", - "mac": "8.10", - "android": "12.3" - }, - { - "symlink": "6_12_17", - "mono":"6.12", - "ios": "15.10", - "mac": "8.10", - "android": "12.2" - }, - { - "symlink": "6_12_16", - "mono":"6.12", - "ios": "15.8", - "mac": "8.8", - "android": "12.2" - }, - { - "symlink": "6_12_15", - "mono":"6.12", - "ios": "15.8", - "mac": "8.8", - "android": "12.1" - }, - { - "symlink": "6_12_14", - "mono":"6.12", - "ios": "15.8", - "mac": "8.8", - "android": "12.0" - }, - { - "symlink": "6_12_13", - "mono":"6.12", - "ios": "15.6", - "mac": "8.6", - "android": "12.0" - }, - { - "symlink": "6_12_12", - "mono":"6.12", - "ios": "15.4", - "mac": "8.4", - "android": "12.0" - }, - { - "symlink": "6_12_11", - "mono":"6.12", - "ios": "15.2", - "mac": "8.2", - "android": "12.0" - }, - { - "symlink": "6_12_10", - "mono":"6.12", - "ios": "15.0", - "mac": "7.14", - "android": "11.3" - } - ] - }, - "java": { - "x64": { - "default": "8", - "versions": [ "8", "11", "17", "21"] - } - }, - "android": { - "cmdline-tools": "commandlinetools-mac-9123335_latest.zip", - "platform_min_version": "31", - "build_tools_min_version": "31.0.0", - "extras": [ - "android;m2repository", "google;m2repository", "google;google_play_services" - ], - "addons": [], - "additional_tools": [ - "cmake;3.18.1", - "cmake;3.22.1" - ], - "ndk": { - "default": "25", - "versions": [ - "24", "25", "26", "27" - ] - } - }, - "powershellModules": [ - { "name": "Az" }, - { "name": "MarkdownPS" }, - { "name": "Pester" }, - { "name": "PSScriptAnalyzer" } - ], - "npm": { - "global_packages": [ - { "name": "appcenter-cli", "test": "appcenter --version" } - ] - }, - "brew": { - "common_packages": [ - "aria2", - "azure-cli", - "bazelisk", - "carthage", - "cmake", - "colima", - "gh", - "gnupg", - "gnu-tar", - "libpq", - "p7zip", - "packer", - "perl", - "pkg-config", - "subversion", - "swiftformat", - "swig", - "zstd", - "gmp", - "zlib", - "libxext", - "libxft", - "tcl-tk", - "r", - "yq", - "imagemagick", - "unxip", - "xcbeautify", - "xcodes" - ], - "cask_packages": [ - "julia", - "vagrant", - "virtualbox", - "parallels" - ], - "compilable_packages": [ - "ant", - "kotlin", - "sbt" - ] - }, - "gcc": { - "versions": [ - "12", - "13", - "14" - ] - }, - "toolcache": [ - { - "name": "Python", - "url" : "https://raw.githubusercontent.com/actions/python-versions/main/versions-manifest.json", - "platform" : "darwin", - "arch": { - "x64": { - "versions": [ - "3.7.*", - "3.8.*", - "3.9.*", - "3.10.*", - "3.11.*", - "3.12.*" - ] - } - } - }, - { - "name": "PyPy", - "platform" : "darwin", - "arch": { - "x64": { - "versions": [ - "2.7", - "3.7", - "3.8", - "3.9", - "3.10" - ] - } - } - }, - { - "name": "Node", - "url" : "https://raw.githubusercontent.com/actions/node-versions/main/versions-manifest.json", - "platform" : "darwin", - "arch": { - "x64": { - "versions": [ - "16.*", - "18.*", - "20.*" - ] - } - } - }, - { - "name": "Go", - "url" : "https://raw.githubusercontent.com/actions/go-versions/main/versions-manifest.json", - "platform" : "darwin", - "arch": { - "x64": { - "variable_template" : "GOROOT_{0}_{1}_X64", - "versions": [ - "1.20.*", - "1.21.*", - "1.22.*", - "1.23.*" - ] - } - } - }, - { - "name": "Ruby", - "arch": { - "x64": { - "versions": [ - "3.0.*", - "3.1.*", - "3.2.*", - "3.3.*" - ] - } - } - } - ], - "pipx": [ - { - "package": "yamllint", - "cmd": "yamllint --version" - } - ], - "dotnet": { - "arch":{ - "x64": { - "versions": [ - "6.0", - "7.0", - "8.0" - ] - } - } - }, - "ruby": { - "default": "3.0", - "rubygems": [ - "xcode-install", - "cocoapods", - "xcpretty", - "bundler", - "fastlane", - "jazzy" - ] - }, - "go": { - "default": "1.21" - }, - "node": { - "default": "18", - "nvm_installer": "0.39.7", - "nvm_versions": [ - "16", - "18", - "20" - ] - }, - "llvm": { - "version": "15" - }, - "php": { - "version": "8.3" - }, - "mongodb": { - "version": "5.0" - }, - "postgresql": { - "version": "14" - }, - "pwsh": { - "version": "7.4" - } -} From 5a534e1f86b06f9bf88d3b193340061c001d37a9 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 29 Jan 2025 11:48:07 +0000 Subject: [PATCH 3449/3485] Updating readme file for ubuntu20 version 20250126.1.1 (#11477) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2004-Readme.md | 83 ++++++++++++++---------------- 1 file changed, 40 insertions(+), 43 deletions(-) diff --git a/images/ubuntu/Ubuntu2004-Readme.md b/images/ubuntu/Ubuntu2004-Readme.md index 1fc40c1c8a3d..4f13e934eace 100644 --- a/images/ubuntu/Ubuntu2004-Readme.md +++ b/images/ubuntu/Ubuntu2004-Readme.md @@ -1,11 +1,7 @@ -| Announcements | -|-| -| [[Windows & Ubuntu] Breaking change : Maven 3.8.* version will be updated to Maven 3.9.* from January 17,2025](https://github.com/actions/runner-images/issues/11093) | -*** # Ubuntu 20.04 - OS Version: 20.04.6 LTS - Kernel Version: 5.15.0-1078-azure -- Image Version: 20250120.2.0 +- Image Version: 20250126.1.0 - Systemd version: 245.4-4ubuntu3.24 ## Installed Software @@ -20,11 +16,11 @@ - Erlang rebar3 3.24.0 - GNU C++: 10.5.0 - GNU Fortran: 10.5.0 -- Julia 1.11.2 +- Julia 1.11.3 - Kotlin 2.1.0-release-394 - Mono 6.12.0.200 - MSBuild 16.10.1.31701 (Mono 6.12.0.200) -- Node.js 18.20.5 +- Node.js 18.20.6 - Perl 5.30.0 - Python 3.8.10 - Ruby 2.7.0p0 @@ -41,7 +37,7 @@ - Pip3 20.0.2 - Pipx 1.7.1 - RubyGems 3.1.2 -- Vcpkg (build from commit cf035d991) +- Vcpkg (build from commit 57c08a322) - Yarn 1.22.22 #### Environment variables @@ -60,7 +56,7 @@ to accomplish this. ### Project Management - Ant 1.10.7 -- Gradle 8.12 +- Gradle 8.12.1 - Lerna 8.1.9 - Maven 3.9.9 - Sbt 1.10.7 @@ -71,13 +67,13 @@ to accomplish this. - AzCopy 10.27.1 - available by `azcopy` and `azcopy10` aliases - Bazel 8.0.1 - Bazelisk 1.25.0 -- Bicep 0.32.4 +- Bicep 0.33.13 - Buildah 1.22.3 -- CMake 3.31.4 +- CMake 3.31.5 - CodeQL Action Bundle 2.20.1 - Docker Amazon ECR Credential Helper 0.9.0 - Docker Compose v2 2.27.1 -- Docker-Buildx 0.20.0 +- Docker-Buildx 0.20.1 - Docker Client 26.1.3 - Docker Server 26.1.3 - Fastlane 2.226.0 @@ -99,30 +95,30 @@ to accomplish this. - Newman 6.2.1 - nvm 0.40.1 - OpenSSL 1.1.1f-1ubuntu2.23 -- Packer 1.11.2 +- Packer 1.12.0 - Parcel 2.13.3 - PhantomJS 2.1.1 2.1.1 - Podman 3.4.2 -- Pulumi 3.146.0 +- Pulumi 3.147.0 - R 4.4.2 - Skopeo 1.5.0 - Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 -- Terraform 1.10.4 +- Terraform 1.10.5 - yamllint 1.35.1 - yq 4.45.1 - zstd 1.5.6 ### CLI Tools - Alibaba Cloud CLI 3.0.174 -- AWS CLI 2.23.2 +- AWS CLI 2.23.6 - AWS CLI Session Manager Plugin 1.2.694.0 - AWS SAM CLI 1.132.0 - Azure CLI 2.68.0 - Azure CLI (azure-devops) 1.0.1 - GitHub CLI 2.65.0 -- Google Cloud CLI 506.0.0 -- Netlify CLI 18.0.1 +- Google Cloud CLI 507.0.0 +- Netlify CLI 18.0.2 - OpenShift CLI 4.15.19 - ORAS CLI 1.2.2 - Vercel CLI 39.3.0 @@ -130,14 +126,14 @@ to accomplish this. ### Java | Version | Environment Variable | | ------------------- | -------------------- | -| 8.0.432+6 | JAVA_HOME_8_X64 | -| 11.0.25+9 (default) | JAVA_HOME_11_X64 | -| 17.0.13+11 | JAVA_HOME_17_X64 | -| 21.0.5+11 | JAVA_HOME_21_X64 | +| 8.0.442+6 | JAVA_HOME_8_X64 | +| 11.0.26+4 (default) | JAVA_HOME_11_X64 | +| 17.0.14+7 | JAVA_HOME_17_X64 | +| 21.0.6+7 | JAVA_HOME_21_X64 | ### PHP Tools - PHP: 7.4.33, 8.0.30, 8.1.31, 8.2.27, 8.3.16 -- Composer 2.8.4 +- Composer 2.8.5 - PHPUnit 8.5.41 ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. @@ -164,13 +160,13 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.8.0 ### Browsers and Drivers -- Google Chrome 132.0.6834.83 -- ChromeDriver 132.0.6834.83 +- Google Chrome 132.0.6834.110 +- ChromeDriver 132.0.6834.110 - Chromium 132.0.6834.0 -- Microsoft Edge 132.0.2957.115 -- Microsoft Edge WebDriver 132.0.2957.115 -- Selenium server 4.28.0 -- Mozilla Firefox 134.0.1 +- Microsoft Edge 132.0.2957.127 +- Microsoft Edge WebDriver 132.0.2957.127 +- Selenium server 4.28.1 +- Mozilla Firefox 134.0.2 - Geckodriver 0.35.0 #### Environment variables @@ -182,7 +178,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | ### .NET Tools -- .NET Core SDK: 6.0.428, 8.0.405 +- .NET Core SDK: 6.0.428, 8.0.405, 9.0.102 - nbgv 3.7.115+d31f50f4d1 ### Databases @@ -214,13 +210,13 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Go - 1.21.13 -- 1.22.10 -- 1.23.4 +- 1.22.11 +- 1.23.5 #### Node.js -- 18.20.5 -- 20.18.1 -- 22.13.0 +- 18.20.6 +- 20.18.2 +- 22.13.1 #### Python - 3.8.18 @@ -228,6 +224,7 @@ Use the following command as a part of your job to start the service: 'sudo syst - 3.10.16 - 3.11.11 - 3.12.8 +- 3.13.1 #### PyPy - 2.7.18 [PyPy 7.3.17] @@ -241,9 +238,10 @@ Use the following command as a part of your job to start the service: 'sudo syst - 3.0.7 - 3.1.6 - 3.2.6 +- 3.3.7 ### PowerShell Tools -- PowerShell 7.4.6 +- PowerShell 7.4.7 #### PowerShell Modules - Az: 12.1.0 @@ -292,12 +290,12 @@ Use the following command as a part of your job to start the service: 'sudo syst | debian:11 | sha256:e5bfb7364038fd100c2faebdd674145bd1bc758a57f3c67023cced99d0eff0f7 | 2025-01-13 | | debian:9 | sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be | 2022-06-23 | | moby/buildkit:latest | sha256:14aa1b4dd92ea0a4cd03a54d0c6079046ea98cd0c0ae6176bdd7036ba370cbbe | 2025-01-20 | -| node:18 | sha256:8b7f2b36c945174b27fe833689fcc47b78dd47de0eda2d6e868e6e4ec2c63ae0 | 2024-11-15 | -| node:18-alpine | sha256:a24108da7089c2d293ceaa61fb8969ec10821e8efe25572e5abb10b1841eb70b | 2024-12-05 | -| node:20 | sha256:968ca0550acc7589a8b1324401ec6e39ace53b2c82d2aed3a278e9ff491c2b1c | 2024-11-20 | -| node:20-alpine | sha256:24fb6aa7020d9a20b00d6da6d1714187c45ed00d1eb4adb01395843c338b9372 | 2024-12-05 | -| node:22 | sha256:fa54405993eaa6bab6b6e460f5f3e945a2e2f07942ba31c0e297a7d9c2041f62 | 2025-01-07 | -| node:22-alpine | sha256:f2dc6eea95f787e25f173ba9904c9d0647ab2506178c7b5b7c5a3d02bc4af145 | 2025-01-07 | +| node:18 | sha256:720eeea325b3da50e108ba34dde0fd69feeb3c59485199c5e22b0ea49a792aa5 | 2025-01-22 | +| node:18-alpine | sha256:974afb6cbc0314dc6502b14243b8a39fbb2d04d975e9059dd066be3e274fbb25 | 2025-01-22 | +| node:20 | sha256:bc3d86568d9a9e062cdf7036367f6e2ce201925e2912758bcd3b0e2657875a63 | 2025-01-22 | +| node:20-alpine | sha256:2cd2a6f4cb37cf8a007d5f1e9aef090ade6b62974c7a274098c390599e8c72b4 | 2025-01-22 | +| node:22 | sha256:ae2f3d4cc65d251352eca01ba668824f651a2ee4d2a37e2efb22649521a483fd | 2025-01-22 | +| node:22-alpine | sha256:e2b39f7b64281324929257d0f8004fb6cb4bf0fdfb9aa8cedb235a766aec31da | 2025-01-22 | | ubuntu:20.04 | sha256:8e5c4f0285ecbb4ead070431d29b576a530d3166df73ec44affc1cd27555141b | 2024-10-11 | ### Installed apt packages @@ -392,4 +390,3 @@ Use the following command as a part of your job to start the service: 'sudo syst | xz-utils | 5.2.4-1ubuntu1.1 | | zip | 3.0-11build1 | | zsync | 0.6.2-3ubuntu1 | - From 964d0b05f405b4006e6e098f6dcce5090f2a3c16 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 29 Jan 2025 11:51:32 +0000 Subject: [PATCH 3450/3485] Updating readme file for ubuntu22 version 20250126.1.1 (#11478) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2204-Readme.md | 85 ++++++++++++++---------------- 1 file changed, 41 insertions(+), 44 deletions(-) diff --git a/images/ubuntu/Ubuntu2204-Readme.md b/images/ubuntu/Ubuntu2204-Readme.md index 54854e66c925..38d46832127e 100644 --- a/images/ubuntu/Ubuntu2204-Readme.md +++ b/images/ubuntu/Ubuntu2204-Readme.md @@ -1,11 +1,7 @@ -| Announcements | -|-| -| [[Windows & Ubuntu] Breaking change : Maven 3.8.* version will be updated to Maven 3.9.* from January 17,2025](https://github.com/actions/runner-images/issues/11093) | -*** # Ubuntu 22.04 - OS Version: 22.04.5 LTS - Kernel Version: 6.5.0-1025-azure -- Image Version: 20250120.2.0 +- Image Version: 20250126.1.0 - Systemd version: 249.11-0ubuntu3.12 ## Installed Software @@ -18,11 +14,11 @@ - Dash 0.5.11+git20210903+057cd650a4ed-3build1 - GNU C++: 10.5.0, 11.4.0, 12.3.0 - GNU Fortran: 10.5.0, 11.4.0, 12.3.0 -- Julia 1.11.2 +- Julia 1.11.3 - Kotlin 2.1.0-release-394 - Mono 6.12.0.200 - MSBuild 16.10.1.31701 (Mono 6.12.0.200) -- Node.js 18.20.5 +- Node.js 18.20.6 - Perl 5.34.0 - Python 3.10.12 - Ruby 3.0.2p107 @@ -39,7 +35,7 @@ - Pip3 22.0.2 - Pipx 1.7.1 - RubyGems 3.3.5 -- Vcpkg (build from commit cf035d991) +- Vcpkg (build from commit 57c08a322) - Yarn 1.22.22 #### Environment variables @@ -58,7 +54,7 @@ to accomplish this. ### Project Management - Ant 1.10.12 -- Gradle 8.12 +- Gradle 8.12.1 - Lerna 8.1.9 - Maven 3.9.9 - Sbt 1.10.7 @@ -69,13 +65,13 @@ to accomplish this. - AzCopy 10.27.1 - available by `azcopy` and `azcopy10` aliases - Bazel 8.0.1 - Bazelisk 1.25.0 -- Bicep 0.32.4 +- Bicep 0.33.13 - Buildah 1.23.1 -- CMake 3.31.4 +- CMake 3.31.5 - CodeQL Action Bundle 2.20.1 - Docker Amazon ECR Credential Helper 0.9.0 - Docker Compose v2 2.27.1 -- Docker-Buildx 0.20.0 +- Docker-Buildx 0.20.1 - Docker Client 26.1.3 - Docker Server 26.1.3 - Fastlane 2.226.0 @@ -96,29 +92,29 @@ to accomplish this. - Newman 6.2.1 - nvm 0.40.1 - OpenSSL 3.0.2-0ubuntu1.18 -- Packer 1.11.2 +- Packer 1.12.0 - Parcel 2.13.3 - Podman 3.4.4 -- Pulumi 3.146.0 +- Pulumi 3.147.0 - R 4.4.2 - Skopeo 1.4.1 - Sphinx Open Source Search Server 2.2.11 - SVN 1.14.1 -- Terraform 1.10.4 +- Terraform 1.10.5 - yamllint 1.35.1 - yq 4.45.1 - zstd 1.5.6 ### CLI Tools -- Alibaba Cloud CLI 3.0.248 -- AWS CLI 2.23.2 +- Alibaba Cloud CLI 3.0.250 +- AWS CLI 2.23.6 - AWS CLI Session Manager Plugin 1.2.694.0 - AWS SAM CLI 1.132.0 - Azure CLI 2.68.0 - Azure CLI (azure-devops) 1.0.1 - GitHub CLI 2.65.0 -- Google Cloud CLI 506.0.0 -- Netlify CLI 18.0.1 +- Google Cloud CLI 507.0.0 +- Netlify CLI 18.0.2 - OpenShift CLI 4.17.12 - ORAS CLI 1.2.2 - Vercel CLI 39.3.0 @@ -126,14 +122,14 @@ to accomplish this. ### Java | Version | Environment Variable | | ------------------- | -------------------- | -| 8.0.432+6 | JAVA_HOME_8_X64 | -| 11.0.25+9 (default) | JAVA_HOME_11_X64 | -| 17.0.13+11 | JAVA_HOME_17_X64 | -| 21.0.5+11 | JAVA_HOME_21_X64 | +| 8.0.442+6 | JAVA_HOME_8_X64 | +| 11.0.26+4 (default) | JAVA_HOME_11_X64 | +| 17.0.14+7 | JAVA_HOME_17_X64 | +| 21.0.6+7 | JAVA_HOME_21_X64 | ### PHP Tools - PHP: 8.1.2 -- Composer 2.8.4 +- Composer 2.8.5 - PHPUnit 8.5.41 ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. @@ -160,13 +156,13 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.8.0 ### Browsers and Drivers -- Google Chrome 132.0.6834.83 -- ChromeDriver 132.0.6834.83 +- Google Chrome 132.0.6834.110 +- ChromeDriver 132.0.6834.110 - Chromium 132.0.6834.0 -- Microsoft Edge 132.0.2957.115 -- Microsoft Edge WebDriver 132.0.2957.115 -- Selenium server 4.28.0 -- Mozilla Firefox 134.0.1 +- Microsoft Edge 132.0.2957.127 +- Microsoft Edge WebDriver 132.0.2957.127 +- Selenium server 4.28.1 +- Mozilla Firefox 134.0.2 - Geckodriver 0.35.0 #### Environment variables @@ -178,7 +174,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. | SELENIUM_JAR_PATH | /usr/share/java/selenium-server.jar | ### .NET Tools -- .NET Core SDK: 6.0.428, 8.0.405 +- .NET Core SDK: 6.0.428, 8.0.405, 9.0.102 - nbgv 3.7.115+d31f50f4d1 ### Databases @@ -209,13 +205,13 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Go - 1.21.13 -- 1.22.10 -- 1.23.4 +- 1.22.11 +- 1.23.5 #### Node.js -- 18.20.5 -- 20.18.1 -- 22.13.0 +- 18.20.6 +- 20.18.2 +- 22.13.1 #### Python - 3.8.18 @@ -223,6 +219,7 @@ Use the following command as a part of your job to start the service: 'sudo syst - 3.10.16 - 3.11.11 - 3.12.8 +- 3.13.1 #### PyPy - 3.7.13 [PyPy 7.3.9] @@ -233,9 +230,10 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Ruby - 3.1.6 - 3.2.6 +- 3.3.7 ### PowerShell Tools -- PowerShell 7.4.6 +- PowerShell 7.4.7 #### PowerShell Modules - Az: 12.1.0 @@ -282,12 +280,12 @@ Use the following command as a part of your job to start the service: 'sudo syst | debian:10 | sha256:58ce6f1271ae1c8a2006ff7d3e54e9874d839f573d8009c20154ad0f2fb0a225 | 2024-06-13 | | debian:11 | sha256:e5bfb7364038fd100c2faebdd674145bd1bc758a57f3c67023cced99d0eff0f7 | 2025-01-13 | | moby/buildkit:latest | sha256:14aa1b4dd92ea0a4cd03a54d0c6079046ea98cd0c0ae6176bdd7036ba370cbbe | 2025-01-20 | -| node:18 | sha256:8b7f2b36c945174b27fe833689fcc47b78dd47de0eda2d6e868e6e4ec2c63ae0 | 2024-11-15 | -| node:18-alpine | sha256:a24108da7089c2d293ceaa61fb8969ec10821e8efe25572e5abb10b1841eb70b | 2024-12-05 | -| node:20 | sha256:968ca0550acc7589a8b1324401ec6e39ace53b2c82d2aed3a278e9ff491c2b1c | 2024-11-20 | -| node:20-alpine | sha256:24fb6aa7020d9a20b00d6da6d1714187c45ed00d1eb4adb01395843c338b9372 | 2024-12-05 | -| node:22 | sha256:fa54405993eaa6bab6b6e460f5f3e945a2e2f07942ba31c0e297a7d9c2041f62 | 2025-01-07 | -| node:22-alpine | sha256:f2dc6eea95f787e25f173ba9904c9d0647ab2506178c7b5b7c5a3d02bc4af145 | 2025-01-07 | +| node:18 | sha256:720eeea325b3da50e108ba34dde0fd69feeb3c59485199c5e22b0ea49a792aa5 | 2025-01-22 | +| node:18-alpine | sha256:974afb6cbc0314dc6502b14243b8a39fbb2d04d975e9059dd066be3e274fbb25 | 2025-01-22 | +| node:20 | sha256:bc3d86568d9a9e062cdf7036367f6e2ce201925e2912758bcd3b0e2657875a63 | 2025-01-22 | +| node:20-alpine | sha256:2cd2a6f4cb37cf8a007d5f1e9aef090ade6b62974c7a274098c390599e8c72b4 | 2025-01-22 | +| node:22 | sha256:ae2f3d4cc65d251352eca01ba668824f651a2ee4d2a37e2efb22649521a483fd | 2025-01-22 | +| node:22-alpine | sha256:e2b39f7b64281324929257d0f8004fb6cb4bf0fdfb9aa8cedb235a766aec31da | 2025-01-22 | | ubuntu:20.04 | sha256:8e5c4f0285ecbb4ead070431d29b576a530d3166df73ec44affc1cd27555141b | 2024-10-11 | | ubuntu:22.04 | sha256:0e5e4a57c2499249aafc3b40fcd541e9a456aab7296681a3994d631587203f97 | 2024-09-11 | @@ -385,4 +383,3 @@ Use the following command as a part of your job to start the service: 'sudo syst | xz-utils | 5.2.5-2ubuntu1 | | zip | 3.0-12build2 | | zsync | 0.6.2-3ubuntu1 | - From 3ea8ee216fa3eb4573a432663ddbd405cdb9d6a9 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 29 Jan 2025 13:21:28 +0000 Subject: [PATCH 3451/3485] Updating readme file for ubuntu24 version 20250126.1.1 (#11479) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2404-Readme.md | 72 +++++++++++++++--------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/images/ubuntu/Ubuntu2404-Readme.md b/images/ubuntu/Ubuntu2404-Readme.md index 425983f0488a..e88f5abe1a07 100644 --- a/images/ubuntu/Ubuntu2404-Readme.md +++ b/images/ubuntu/Ubuntu2404-Readme.md @@ -1,11 +1,7 @@ -| Announcements | -|-| -| [[Windows & Ubuntu] Breaking change : Maven 3.8.* version will be updated to Maven 3.9.* from January 17,2025](https://github.com/actions/runner-images/issues/11093) | -*** # Ubuntu 24.04 - OS Version: 24.04.1 LTS - Kernel Version: 6.8.0-1020-azure -- Image Version: 20250120.5.0 +- Image Version: 20250126.1.0 - Systemd version: 255.4-1ubuntu8.4 ## Installed Software @@ -18,9 +14,9 @@ - Dash 0.5.12-6ubuntu5 - GNU C++: 12.3.0, 13.3.0, 14.2.0 - GNU Fortran: 12.3.0, 13.3.0, 14.2.0 -- Julia 1.11.2 +- Julia 1.11.3 - Kotlin 2.1.0-release-394 -- Node.js 20.18.1 +- Node.js 20.18.2 - Perl 5.38.2 - Python 3.12.3 - Ruby 3.2.3 @@ -36,7 +32,7 @@ - Pip3 24.0 - Pipx 1.7.1 - RubyGems 3.4.20 -- Vcpkg (build from commit cf035d991) +- Vcpkg (build from commit 57c08a322) - Yarn 1.22.22 #### Environment variables @@ -55,7 +51,7 @@ to accomplish this. ### Project Management - Ant 1.10.14 -- Gradle 8.12 +- Gradle 8.12.1 - Lerna 8.1.9 - Maven 3.9.9 @@ -64,13 +60,13 @@ to accomplish this. - AzCopy 10.27.1 - available by `azcopy` and `azcopy10` aliases - Bazel 8.0.1 - Bazelisk 1.25.0 -- Bicep 0.32.4 +- Bicep 0.33.13 - Buildah 1.33.7 -- CMake 3.31.4 +- CMake 3.31.5 - CodeQL Action Bundle 2.20.1 - Docker Amazon ECR Credential Helper 0.9.0 - Docker Compose v2 2.27.1 -- Docker-Buildx 0.20.0 +- Docker-Buildx 0.20.1 - Docker Client 26.1.3 - Docker Server 26.1.3 - Fastlane 2.226.0 @@ -89,10 +85,10 @@ to accomplish this. - Newman 6.2.1 - nvm 0.40.1 - OpenSSL 3.0.13-0ubuntu3.4 -- Packer 1.11.2 +- Packer 1.12.0 - Parcel 2.13.3 - Podman 4.9.3 -- Pulumi 3.146.0 +- Pulumi 3.147.0 - Skopeo 1.13.3 - Sphinx Open Source Search Server 2.2.11 - yamllint 1.35.1 @@ -100,25 +96,25 @@ to accomplish this. - zstd 1.5.6 ### CLI Tools -- AWS CLI 2.23.2 +- AWS CLI 2.23.6 - AWS CLI Session Manager Plugin 1.2.694.0 - AWS SAM CLI 1.132.0 - Azure CLI 2.68.0 - Azure CLI (azure-devops) 1.0.1 - GitHub CLI 2.65.0 -- Google Cloud CLI 506.0.0 +- Google Cloud CLI 507.0.0 ### Java -| Version | Environment Variable | -| -------------------- | -------------------- | -| 8.0.432+6 | JAVA_HOME_8_X64 | -| 11.0.25+9 | JAVA_HOME_11_X64 | -| 17.0.13+11 (default) | JAVA_HOME_17_X64 | -| 21.0.5+11 | JAVA_HOME_21_X64 | +| Version | Environment Variable | +| ------------------- | -------------------- | +| 8.0.442+6 | JAVA_HOME_8_X64 | +| 11.0.26+4 | JAVA_HOME_11_X64 | +| 17.0.14+7 (default) | JAVA_HOME_17_X64 | +| 21.0.6+7 | JAVA_HOME_21_X64 | ### PHP Tools - PHP: 8.3.6 -- Composer 2.8.4 +- Composer 2.8.5 - PHPUnit 8.5.41 ``` Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. @@ -140,13 +136,13 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.8.0 ### Browsers and Drivers -- Google Chrome 132.0.6834.83 -- ChromeDriver 132.0.6834.83 +- Google Chrome 132.0.6834.110 +- ChromeDriver 132.0.6834.110 - Chromium 132.0.6834.0 -- Microsoft Edge 132.0.2957.115 -- Microsoft Edge WebDriver 132.0.2957.115 -- Selenium server 4.28.0 -- Mozilla Firefox 134.0.1 +- Microsoft Edge 132.0.2957.127 +- Microsoft Edge WebDriver 132.0.2957.127 +- Selenium server 4.28.1 +- Mozilla Firefox 134.0.2 - Geckodriver 0.35.0 #### Environment variables @@ -185,26 +181,31 @@ Use the following command as a part of your job to start the service: 'sudo syst #### Go - 1.21.13 -- 1.22.10 -- 1.23.4 +- 1.22.11 +- 1.23.5 #### Node.js -- 18.20.5 -- 20.18.1 -- 22.13.0 +- 18.20.6 +- 20.18.2 +- 22.13.1 #### Python - 3.9.21 - 3.10.16 - 3.11.11 - 3.12.8 +- 3.13.1 #### PyPy - 3.9.19 [PyPy 7.3.16] - 3.10.14 [PyPy 7.3.17] +#### Ruby +- 3.2.6 +- 3.3.7 + ### PowerShell Tools -- PowerShell 7.4.6 +- PowerShell 7.4.7 #### PowerShell Modules - Az: 12.1.0 @@ -314,4 +315,3 @@ Use the following command as a part of your job to start the service: 'sudo syst | xz-utils | 5.6.1+really5.4.5-1build0.1 | | zip | 3.0-13ubuntu0.1 | | zsync | 0.6.2-5build1 | - From d97acc5bf3b942f6a0e8e74bd958bd0da4251932 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 29 Jan 2025 13:47:04 +0000 Subject: [PATCH 3452/3485] Updating readme file for macos-14 version 20250127.727 (#11485) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-14-Readme.md | 151 ++++++++++++++++---------------- 1 file changed, 77 insertions(+), 74 deletions(-) diff --git a/images/macos/macos-14-Readme.md b/images/macos/macos-14-Readme.md index ec87770dc548..2f8262b885bb 100644 --- a/images/macos/macos-14-Readme.md +++ b/images/macos/macos-14-Readme.md @@ -1,18 +1,17 @@ | Announcements | |-| -| [[macOS 14] Xcode 16.0 will be replaced by Xcode 16.2 in macOS-14 images on January 6, 2025](https://github.com/actions/runner-images/issues/11203) | -| [[macOS] The macOS 12 Actions runner image will begin deprecation on 10/7/24 and will be fully unsupported by 12/3/24 for GitHub and by 01/13/25 for ADO](https://github.com/actions/runner-images/issues/10721) | +| [[macOS] Ruby version 3.0 will be removed from the images on Feb 10, 2025 and 3.3 will be set as default. ](https://github.com/actions/runner-images/issues/11345) | | [macOS 15 (Sequoia) is now available as a public beta in GitHub Actions](https://github.com/actions/runner-images/issues/10686) | *** # macOS 14 - OS Version: macOS 14.7.2 (23H311) - Kernel Version: Darwin 23.6.0 -- Image Version: 20250106.587 +- Image Version: 20250127.727 ## Installed Software ### Language and Runtime -- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.410, 8.0.101, 8.0.204, 8.0.303, 8.0.404 +- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.410, 8.0.101, 8.0.204, 8.0.303, 8.0.405, 9.0.102 - Bash 3.2.57(1)-release - Clang/LLVM 15.0.0 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang` @@ -24,9 +23,9 @@ - GNU Fortran 14 (Homebrew GCC 14.2.0_1) - available by `gfortran-14` alias - Kotlin 2.1.0-release-394 - Mono 6.12.0.188 -- Node.js 20.18.1 -- Perl 5.40.0 -- PHP 8.4.2 +- Node.js 20.18.2 +- Perl 5.40.1 +- PHP 8.4.3 - Python3 3.13.1 - Ruby 3.0.7p220 @@ -34,11 +33,11 @@ - Bundler 2.5.23 - Carthage 0.40.0 - CocoaPods 1.16.2 -- Composer 2.8.4 -- Homebrew 4.4.15 +- Composer 2.8.5 +- Homebrew 4.4.17 - NPM 10.8.2 - NuGet 6.3.1.1 -- Pip3 24.3.1 (python 3.13) +- Pip3 25.0 (python 3.13) - Pipx 1.7.1 - RubyGems 3.5.23 - Yarn 1.22.22 @@ -46,59 +45,59 @@ ### Project Management - Apache Ant 1.10.15 - Apache Maven 3.9.9 -- Gradle 8.12 +- Gradle 8.12.1 ### Utilities - 7-Zip 17.05 - aria2 1.37.0 - azcopy 10.27.1 -- bazel 8.0.0 +- bazel 8.0.1 - bazelisk 1.25.0 - bsdtar 3.5.3 - available by 'tar' alias - Curl 8.11.1 -- Git 2.47.1 -- Git LFS 3.6.0 -- GitHub CLI 2.64.0 +- Git 2.48.1 +- Git LFS 3.6.1 +- GitHub CLI 2.65.0 - GNU Tar 1.35 - available by 'gtar' alias - GNU Wget 1.25.0 - gpg (GnuPG) 2.4.7 - jq 1.7.1 - OpenSSL 1.1.1w 11 Sep 2023 -- Packer 1.11.2 +- Packer 1.12.0 - pkgconf 2.3.0 - Unxip 3.1 -- yq 4.44.6 +- yq 4.45.1 - zstd 1.5.6 ### Tools -- AWS CLI 2.22.28 +- AWS CLI 2.23.6 - AWS SAM CLI 1.132.0 - AWS Session Manager CLI 1.2.694.0 -- Azure CLI 2.67.0 +- Azure CLI 2.68.0 - Azure CLI (azure-devops) 1.0.1 -- Bicep CLI 0.32.4 -- Cmake 3.31.3 -- CodeQL Action Bundle 2.20.0 +- Bicep CLI 0.33.13 +- Cmake 3.31.5 +- CodeQL Action Bundle 2.20.1 - Fastlane 2.226.0 -- SwiftFormat 0.55.4 -- Xcbeautify 2.17.0 +- SwiftFormat 0.55.5 +- Xcbeautify 2.23.0 - Xcode Command Line Tools 16.2.0.0.1.1733547573 - Xcodes 1.6.0 ### Linters -- SwiftLint 0.57.1 +- SwiftLint 0.58.2 ### Browsers - Safari 18.2 (19620.1.16.111.6) - SafariDriver 18.2 (19620.1.16.111.6) -- Google Chrome 131.0.6778.205 -- Google Chrome for Testing 131.0.6778.204 -- ChromeDriver 131.0.6778.204 -- Microsoft Edge 131.0.2903.112 -- Microsoft Edge WebDriver 131.0.2903.112 -- Mozilla Firefox 133.0.3 +- Google Chrome 132.0.6834.111 +- Google Chrome for Testing 132.0.6834.110 +- ChromeDriver 132.0.6834.110 +- Microsoft Edge 132.0.2957.127 +- Microsoft Edge WebDriver 132.0.2957.127 +- Mozilla Firefox 134.0.2 - geckodriver 0.35.0 -- Selenium server 4.27.0 +- Selenium server 4.28.0 #### Environment variables | Name | Value | @@ -108,12 +107,12 @@ | GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | ### Java -| Version | Environment Variable | -| --------------------- | -------------------- | -| 8.0.432+6 | JAVA_HOME_8_X64 | -| 11.0.25+9 | JAVA_HOME_11_X64 | -| 17.0.13+11 | JAVA_HOME_17_X64 | -| 21.0.5+11.0 (default) | JAVA_HOME_21_X64 | +| Version | Environment Variable | +| -------------------- | -------------------- | +| 8.0.442+6 | JAVA_HOME_8_X64 | +| 11.0.26+4 | JAVA_HOME_11_X64 | +| 17.0.14+7 | JAVA_HOME_17_X64 | +| 21.0.6+7.0 (default) | JAVA_HOME_21_X64 | ### Cached Tools @@ -121,7 +120,8 @@ - 3.0.7 - 3.1.6 - 3.2.6 -- 3.3.6 +- 3.3.7 +- 3.4.1 #### Python - 3.9.21 @@ -131,31 +131,31 @@ - 3.13.1 #### Node.js -- 18.20.5 -- 20.18.1 -- 22.12.0 +- 18.20.6 +- 20.18.2 +- 22.13.1 #### Go - 1.21.13 -- 1.22.10 -- 1.23.4 +- 1.22.11 +- 1.23.5 ### Rust Tools -- Cargo 1.83.0 -- Rust 1.83.0 -- Rustdoc 1.83.0 +- Cargo 1.84.0 +- Rust 1.84.0 +- Rustdoc 1.84.0 - Rustup 1.27.1 #### Packages -- Clippy 0.1.83 +- Clippy 0.1.84 - Rustfmt 1.8.0-stable ### PowerShell Tools -- PowerShell 7.4.6 +- PowerShell 7.4.7 #### PowerShell Modules - Az: 12.4.0 -- Pester: 5.6.1 +- Pester: 5.7.1 - PSScriptAnalyzer: 1.23.0 ### Xcode @@ -216,14 +216,14 @@ | Simulator - watchOS 11.2 | watchsimulator11.2 | 16.2 | | Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | | visionOS 1.0 | xros1.0 | 15.2 | -| visionOS 1.1 | xros1.1 | 15.3 | | Simulator - visionOS 1.1 | xrsimulator1.1 | 15.3 | -| visionOS 1.2 | xros1.2 | 15.4 | +| visionOS 1.1 | xros1.1 | 15.3 | | Simulator - visionOS 1.2 | xrsimulator1.2 | 15.4 | -| Simulator - visionOS 2.1 | xrsimulator2.1 | 16.1 | +| visionOS 1.2 | xros1.2 | 15.4 | | visionOS 2.1 | xros2.1 | 16.1 | -| visionOS 2.2 | xros2.2 | 16.2 | +| Simulator - visionOS 2.1 | xrsimulator2.1 | 16.1 | | Simulator - visionOS 2.2 | xrsimulator2.2 | 16.2 | +| visionOS 2.2 | xros2.2 | 16.2 | | DriverKit 23.0 | driverkit23.0 | 15.0.1 | | DriverKit 23.2 | driverkit23.2 | 15.1, 15.2 | | DriverKit 23.4 | driverkit23.4 | 15.3 | @@ -232,30 +232,33 @@ | DriverKit 24.2 | driverkit24.2 | 16.2 | #### Installed Simulators -| OS | Simulators | -| ------------ | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| iOS 17.0 | iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 17.2 | iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | -| iOS 17.4 | iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | -| iOS 17.5 | iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | -| iOS 18.1 | iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone 16<br>iPhone 16 Plus<br>iPhone 16 Pro<br>iPhone 16 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad mini (A17 Pro)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | -| tvOS 17.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 17.2 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 17.4 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 17.5 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 18.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| watchOS 10.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra 2 (49mm) | -| watchOS 10.2 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra 2 (49mm) | -| watchOS 10.4 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra 2 (49mm) | -| watchOS 10.5 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra 2 (49mm) | -| watchOS 11.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 10 (42mm)<br>Apple Watch Series 10 (46mm)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra 2 (49mm) | +| OS | Simulators | +| ------------ | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| iOS 17.0 | iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 17.2 | iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation) | +| iOS 17.4 | iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | +| iOS 17.5 | iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | +| iOS 18.1 | iPhone 16<br>iPhone 16 Plus<br>iPhone 16 Pro<br>iPhone 16 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (A17 Pro)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | +| iOS 18.2 | iPhone 16<br>iPhone 16 Plus<br>iPhone 16 Pro<br>iPhone 16 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (A17 Pro)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | +| tvOS 17.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 17.2 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 17.4 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 17.5 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 18.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 18.2 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| watchOS 10.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 10.2 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 10.4 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 10.5 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 11.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 10 (42mm)<br>Apple Watch Series 10 (46mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 11.2 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 10 (42mm)<br>Apple Watch Series 10 (46mm)<br>Apple Watch Ultra 2 (49mm) | ### Android | Package Name | Version | | -------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Android Command Line Tools | 11.0 | -| Android Emulator | 35.2.10 | -| Android SDK Build-tools | 35.0.0<br>34.0.0<br>33.0.2 33.0.3 | +| Android Emulator | 35.3.11 | +| Android SDK Build-tools | 35.0.0 35.0.1<br>34.0.0<br>33.0.2 33.0.3 | | Android SDK Platforms | android-35-ext14 (rev 1)<br>android-35 (rev 2)<br>android-34-ext8 (rev 1)<br>android-34-ext12 (rev 1)<br>android-34-ext11 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 3)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) | | Android SDK Platform-Tools | 35.0.2 | | Android Support Repository | 47.0.0 | @@ -280,7 +283,7 @@ #### Environment variables | Name | Value | | ----------------- | ----------------------------------------------------------------------------------------- | -| PARALLELS_DMG_URL | https://download.parallels.com/desktop/v20/20.1.3-55743/ParallelsDesktop-20.1.3-55743.dmg | +| PARALLELS_DMG_URL | https://download.parallels.com/desktop/v20/20.2.0-55872/ParallelsDesktop-20.2.0-55872.dmg | ##### Notes ``` From 680aca18e389ce4be5be3508e22e12aa7b26b42c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 29 Jan 2025 15:06:03 +0000 Subject: [PATCH 3453/3485] Updating readme file for macos-13-arm64 version 20250127.672 (#11480) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-13-arm64-Readme.md | 54 +++++++++++++-------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/images/macos/macos-13-arm64-Readme.md b/images/macos/macos-13-arm64-Readme.md index c782f0ee2454..10563eb1a677 100644 --- a/images/macos/macos-13-arm64-Readme.md +++ b/images/macos/macos-13-arm64-Readme.md @@ -7,7 +7,7 @@ # macOS 13 - OS Version: macOS 13.7.2 (22H313) - Kernel Version: Darwin 22.6.0 -- Image Version: 20250120.653 +- Image Version: 20250127.672 ## Installed Software @@ -24,7 +24,7 @@ - GNU Fortran 14 (Homebrew GCC 14.2.0_1) - available by `gfortran-14` alias - Kotlin 2.1.0-release-394 - Mono 6.12.0.188 -- Node.js 20.18.1 +- Node.js 20.18.2 - Perl 5.40.1 - Python3 3.13.1 - Ruby 3.0.7p220 @@ -33,7 +33,7 @@ - Bundler 2.5.23 - Carthage 0.40.0 - CocoaPods 1.16.2 -- Homebrew 4.4.16 +- Homebrew 4.4.17 - NPM 10.8.2 - NuGet 6.3.1.1 - Pip3 24.3.1 (python 3.13) @@ -44,7 +44,7 @@ ### Project Management - Apache Ant 1.10.15 - Apache Maven 3.9.9 -- Gradle 8.12 +- Gradle 8.12.1 ### Utilities - 7-Zip 17.05 @@ -62,24 +62,24 @@ - gpg (GnuPG) 2.4.7 - jq 1.7.1 - OpenSSL 1.1.1w 11 Sep 2023 -- Packer 1.11.2 +- Packer 1.12.0 - pkgconf 2.3.0 - Unxip 3.1 - yq 4.45.1 - zstd 1.5.6 ### Tools -- AWS CLI 2.23.2 +- AWS CLI 2.23.6 - AWS SAM CLI 1.132.0 - AWS Session Manager CLI 1.2.694.0 - Azure CLI 2.68.0 - Azure CLI (azure-devops) 1.0.1 -- Bicep CLI 0.32.4 -- Cmake 3.31.4 +- Bicep CLI 0.33.13 +- Cmake 3.31.5 - CodeQL Action Bundle 2.20.1 - Fastlane 2.226.0 -- SwiftFormat 0.55.4 -- Xcbeautify 2.17.0 +- SwiftFormat 0.55.5 +- Xcbeautify 2.23.0 - Xcode Command Line Tools 14.3.1.0.1.1683849156 - Xcodes 1.6.0 @@ -88,10 +88,10 @@ ### Browsers - Safari 18.2 (18620.1.16.111.6) - SafariDriver 18.2 (18620.1.16.111.6) -- Google Chrome 132.0.6834.84 -- Google Chrome for Testing 132.0.6834.83 -- ChromeDriver 132.0.6834.83 -- Selenium server 4.27.0 +- Google Chrome 132.0.6834.111 +- Google Chrome for Testing 132.0.6834.110 +- ChromeDriver 132.0.6834.110 +- Selenium server 4.28.0 #### Environment variables | Name | Value | @@ -101,11 +101,11 @@ | GECKOWEBDRIVER | | ### Java -| Version | Environment Variable | -| -------------------- | -------------------- | -| 11.0.25+9 | JAVA_HOME_11_arm64 | -| 17.0.13+11 (default) | JAVA_HOME_17_arm64 | -| 21.0.5+11.0 | JAVA_HOME_21_arm64 | +| Version | Environment Variable | +| ------------------- | -------------------- | +| 11.0.26+4 | JAVA_HOME_11_arm64 | +| 17.0.14+7 (default) | JAVA_HOME_17_arm64 | +| 21.0.6+7.0 | JAVA_HOME_21_arm64 | ### Cached Tools @@ -122,14 +122,14 @@ - 3.13.1 #### Node.js -- 18.20.5 -- 20.18.1 -- 22.13.0 +- 18.20.6 +- 20.18.2 +- 22.13.1 #### Go - 1.21.13 -- 1.22.10 -- 1.23.4 +- 1.22.11 +- 1.23.5 ### Rust Tools - Cargo 1.84.0 @@ -142,7 +142,7 @@ - Rustfmt 1.8.0-stable ### PowerShell Tools -- PowerShell 7.4.6 +- PowerShell 7.4.7 #### PowerShell Modules - Az: 12.4.0 @@ -193,11 +193,11 @@ | Simulator - watchOS 9.4 | watchsimulator9.4 | 14.3.1 | | Simulator - watchOS 10.0 | watchsimulator10.0 | 15.0.1 | | Simulator - watchOS 10.2 | watchsimulator10.2 | 15.1, 15.2 | -| Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | | visionOS 1.0 | xros1.0 | 15.2 | +| Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | -| Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | +| Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | | DriverKit 22.1 | driverkit22.1 | 14.1 | | DriverKit 22.2 | driverkit22.2 | 14.2 | | DriverKit 22.4 | driverkit22.4 | 14.3.1 | From 0a2348df06c87050faf9b463e7ffeed331f646c1 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 30 Jan 2025 06:19:19 +0000 Subject: [PATCH 3454/3485] Updating readme file for macos-15-arm64 version 20250127.616 (#11481) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-15-arm64-Readme.md | 89 +++++++++++++-------------- 1 file changed, 44 insertions(+), 45 deletions(-) diff --git a/images/macos/macos-15-arm64-Readme.md b/images/macos/macos-15-arm64-Readme.md index 638baeedeb88..07fb9fe34467 100644 --- a/images/macos/macos-15-arm64-Readme.md +++ b/images/macos/macos-15-arm64-Readme.md @@ -7,7 +7,7 @@ # macOS 15 - OS Version: macOS 15.2 (24C101) - Kernel Version: Darwin 24.2.0 -- Image Version: 20250120.596 +- Image Version: 20250127.616 ## Installed Software @@ -23,7 +23,7 @@ - GNU Fortran 13 (Homebrew GCC 13.3.0) - available by `gfortran-13` alias - GNU Fortran 14 (Homebrew GCC 14.2.0_1) - available by `gfortran-14` alias - Kotlin 2.1.0-release-394 -- Node.js 22.13.0 +- Node.js 22.13.1 - Perl 5.40.1 - Python3 3.13.1 - Ruby 3.3.7 @@ -32,7 +32,7 @@ - Bundler 2.6.3 - Carthage 0.40.0 - CocoaPods 1.16.2 -- Homebrew 4.4.16 +- Homebrew 4.4.17 - NPM 10.9.2 - Pip3 24.3.1 (python 3.13) - Pipx 1.7.1 @@ -42,7 +42,7 @@ ### Project Management - Apache Ant 1.10.15 - Apache Maven 3.9.9 -- Gradle 8.12 +- Gradle 8.12.1 ### Utilities - 7-Zip 17.05 @@ -60,24 +60,24 @@ - gpg (GnuPG) 2.4.7 - jq 1.7.1 - OpenSSL 1.1.1w 11 Sep 2023 -- Packer 1.11.2 +- Packer 1.12.0 - pkgconf 2.3.0 - Unxip 3.1 - yq 4.45.1 - zstd 1.5.6 ### Tools -- AWS CLI 2.23.2 +- AWS CLI 2.23.6 - AWS SAM CLI 1.132.0 - AWS Session Manager CLI 1.2.694.0 - Azure CLI 2.68.0 - Azure CLI (azure-devops) 1.0.1 -- Bicep CLI 0.32.4 -- Cmake 3.31.4 +- Bicep CLI 0.33.13 +- Cmake 3.31.5 - CodeQL Action Bundle 2.20.1 - Fastlane 2.226.0 -- SwiftFormat 0.55.4 -- Xcbeautify 2.17.0 +- SwiftFormat 0.55.5 +- Xcbeautify 2.23.0 - Xcode Command Line Tools 16.2.0.0.1.1733547573 - Xcodes 1.6.0 @@ -86,10 +86,10 @@ ### Browsers - Safari 18.2 (20620.1.16.11.8) - SafariDriver 18.2 (20620.1.16.11.8) -- Google Chrome 132.0.6834.84 -- Google Chrome for Testing 132.0.6834.83 -- ChromeDriver 132.0.6834.83 -- Selenium server 4.27.0 +- Google Chrome 132.0.6834.111 +- Google Chrome for Testing 132.0.6834.110 +- ChromeDriver 132.0.6834.110 +- Selenium server 4.28.0 #### Environment variables | Name | Value | @@ -99,11 +99,11 @@ | GECKOWEBDRIVER | | ### Java -| Version | Environment Variable | -| --------------------- | -------------------- | -| 11.0.25+9 | JAVA_HOME_11_arm64 | -| 17.0.13+11 | JAVA_HOME_17_arm64 | -| 21.0.5+11.0 (default) | JAVA_HOME_21_arm64 | +| Version | Environment Variable | +| -------------------- | -------------------- | +| 11.0.26+4 | JAVA_HOME_11_arm64 | +| 17.0.14+7 | JAVA_HOME_17_arm64 | +| 21.0.6+7.0 (default) | JAVA_HOME_21_arm64 | ### Cached Tools @@ -119,14 +119,14 @@ - 3.13.1 #### Node.js -- 18.20.5 -- 20.18.1 -- 22.13.0 +- 18.20.6 +- 20.18.2 +- 22.13.1 #### Go - 1.21.13 -- 1.22.10 -- 1.23.4 +- 1.22.11 +- 1.23.5 ### Rust Tools - Cargo 1.84.0 @@ -139,7 +139,7 @@ - Rustfmt 1.8.0-stable ### PowerShell Tools -- PowerShell 7.4.6 +- PowerShell 7.4.7 #### PowerShell Modules - Az: 12.4.0 @@ -189,9 +189,8 @@ | visionOS 1.2 | xros1.2 | 15.4 | | visionOS 2.0 | xros2.0 | 16.0 | | Simulator - visionOS 2.0 | xrsimulator2.0 | 16.0 | -| visionOS 2.1 | xros2.1 | 16.1 | | Simulator - visionOS 2.1 | xrsimulator2.1 | 16.1 | -| Simulator - visionOS 2.2 | xrsimulator2.2 | 16.2 | +| visionOS 2.1 | xros2.1 | 16.1 | | visionOS 2.2 | xros2.2 | 16.2 | | Simulator - visionOS 2.2 | xrsimulator2.2 | 16.2 | | DriverKit 23.5 | driverkit23.5 | 15.4 | @@ -200,24 +199,24 @@ | DriverKit 24.2 | driverkit24.2 | 16.2 | #### Installed Simulators -| OS | Simulators | -| ------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| iOS 17.5 | iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | -| iOS 18.0 | iPhone 16<br>iPhone 16 Plus<br>iPhone 16 Pro<br>iPhone 16 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | -| iOS 18.1 | iPhone 16<br>iPhone 16 Plus<br>iPhone 16 Pro<br>iPhone 16 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (A17 Pro)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | -| iOS 18.2 | iPhone 16<br>iPhone 16 Plus<br>iPhone 16 Pro<br>iPhone 16 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (A17 Pro)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | -| tvOS 17.5 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 18.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 18.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 18.2 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| watchOS 10.5 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra 2 (49mm) | -| watchOS 11.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 10 (42mm)<br>Apple Watch Series 10 (46mm)<br>Apple Watch Ultra 2 (49mm) | -| watchOS 11.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 10 (42mm)<br>Apple Watch Series 10 (46mm)<br>Apple Watch Ultra 2 (49mm) | -| watchOS 11.2 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 10 (42mm)<br>Apple Watch Series 10 (46mm)<br>Apple Watch Ultra 2 (49mm) | -| visionOS 1.2 | Apple Vision Pro | -| visionOS 2.0 | Apple Vision Pro | -| visionOS 2.1 | Apple Vision Pro | -| visionOS 2.2 | Apple Vision Pro | +| OS | Simulators | +| ------------ | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| iOS 17.5 | iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | +| iOS 18.0 | iPhone 16<br>iPhone 16 Plus<br>iPhone 16 Pro<br>iPhone 16 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | +| iOS 18.1 | iPhone 16<br>iPhone 16 Plus<br>iPhone 16 Pro<br>iPhone 16 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (A17 Pro)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | +| iOS 18.2 | iPhone 16<br>iPhone 16 Plus<br>iPhone 16 Pro<br>iPhone 16 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (A17 Pro)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | +| tvOS 17.5 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 18.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 18.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 18.2 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| watchOS 10.5 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 11.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 10 (42mm)<br>Apple Watch Series 10 (46mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 11.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 10 (42mm)<br>Apple Watch Series 10 (46mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 11.2 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 10 (42mm)<br>Apple Watch Series 10 (46mm)<br>Apple Watch Ultra 2 (49mm) | +| visionOS 1.2 | Apple Vision Pro | +| visionOS 2.0 | Apple Vision Pro | +| visionOS 2.1 | Apple Vision Pro | +| visionOS 2.2 | Apple Vision Pro | ### Android | Package Name | Version | From a9c4aff756ed4ea989e1c7c7639d2d07e3be5f8a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 30 Jan 2025 10:17:47 +0000 Subject: [PATCH 3455/3485] Updating readme file for win19 version 20250127.1.1 (#11497) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/windows/Windows2019-Readme.md | 63 ++++++++++++++-------------- 1 file changed, 32 insertions(+), 31 deletions(-) diff --git a/images/windows/Windows2019-Readme.md b/images/windows/Windows2019-Readme.md index 58de2f3f7ed3..f59aafd6bb67 100644 --- a/images/windows/Windows2019-Readme.md +++ b/images/windows/Windows2019-Readme.md @@ -1,14 +1,13 @@ | Announcements | |-| +| [[Windows] Removal of Azure and Azure Powershell module from windows images from Febraury 14](https://github.com/actions/runner-images/issues/11483) | | [[Windows ] Breaking change : PHP 8.3.* version will be updated to PHP 8.4.* from January 31,2025](https://github.com/actions/runner-images/issues/11256) | | [Windows Server 2025 is now available](https://github.com/actions/runner-images/issues/11228) | | [[Windows] Breaking change : Docker Engine Version 26.* will be updated to Docker Engine Version 27.* from February 07,2025](https://github.com/actions/runner-images/issues/11104) | -| [[Windows & Ubuntu] Breaking change : Maven 3.8.* version will be updated to Maven 3.9.* from January 17,2025](https://github.com/actions/runner-images/issues/11093) | -| [[Windows & Ubuntu] .NET 7.x will be removed from the images on January 17,2025](https://github.com/actions/runner-images/issues/10894) | *** # Windows Server 2019 - OS Version: 10.0.17763 Build 6775 -- Image Version: 20250120.1.0 +- Image Version: 20250127.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -19,25 +18,25 @@ - Bash 5.2.37(1)-release - Go 1.21.13 - Julia 1.10.5 -- Kotlin 2.1.0 +- Kotlin 2.1.10 - LLVM 18.1.8 -- Node 18.20.5 +- Node 18.20.6 - Perl 5.32.1 -- PHP 8.3.16 +- PHP 8.4.3 - Python 3.9.13 - Ruby 3.0.7p220 ### Package Management - Chocolatey 2.4.1 -- Composer 2.8.4 +- Composer 2.8.5 - Helm 3.16.4 - Miniconda 24.11.1 (pre-installed on the image but not added to PATH) - NPM 10.8.2 - NuGet 6.12.2.1 -- pip 24.3.1 (python 3.9) +- pip 25.0 (python 3.9) - Pipx 1.7.1 - RubyGems 3.2.33 -- Vcpkg (build from commit cf035d991) +- Vcpkg (build from commit f3a67b0c4) - Yarn 1.22.22 #### Environment variables @@ -58,7 +57,7 @@ - azcopy 10.27.1 - Bazel 8.0.1 - Bazelisk 1.25.0 -- Bicep 0.32.4 +- Bicep 0.33.13 - Cabal 3.14.1.1 - CMake 3.31.4 - CodeQL Action Bundle 2.20.1 @@ -68,7 +67,7 @@ - ghc 9.12.1 - Git 2.47.1.windows.2 - Git LFS 3.6.1 -- Google Cloud CLI 506.0.0 +- Google Cloud CLI 507.0.0 - ImageMagick 7.1.1-43 - InnoSetup 6.4.0 - jq 1.7.1 @@ -83,7 +82,7 @@ - OpenSSL 1.1.1w - Packer 1.11.2 - Parcel 2.13.3 -- Pulumi 3.146.0 +- Pulumi 3.147.0 - R 4.4.2 - Service Fabric SDK 9.1.1436.9590 - Stack 3.3.1 @@ -96,8 +95,8 @@ - zstd 1.5.6 ### CLI Tools -- Alibaba Cloud CLI 3.0.248 -- AWS CLI 2.23.2 +- Alibaba Cloud CLI 3.0.250 +- AWS CLI 2.23.6 - AWS SAM CLI 1.132.0 - AWS Session Manager CLI 1.2.694.0 - Azure CLI 2.68.0 @@ -120,11 +119,11 @@ - Rustfmt 1.8.0 ### Browsers and Drivers -- Google Chrome 132.0.6834.84 -- Chrome Driver 132.0.6834.83 -- Microsoft Edge 132.0.2957.115 -- Microsoft Edge Driver 132.0.2957.115 -- Mozilla Firefox 134.0.1 +- Google Chrome 132.0.6834.111 +- Chrome Driver 132.0.6834.110 +- Microsoft Edge 132.0.2957.127 +- Microsoft Edge Driver 132.0.2957.127 +- Mozilla Firefox 134.0.2 - Gecko Driver 0.35.0 - IE Driver 4.14.0.0 - Selenium server 4.28.0 @@ -140,10 +139,10 @@ ### Java | Version | Environment Variable | | ------------------- | -------------------- | -| 8.0.432+6 (default) | JAVA_HOME_8_X64 | -| 11.0.25+9 | JAVA_HOME_11_X64 | -| 17.0.13+11 | JAVA_HOME_17_X64 | -| 21.0.5+11.0 | JAVA_HOME_21_X64 | +| 8.0.442+6 (default) | JAVA_HOME_8_X64 | +| 11.0.26+4 | JAVA_HOME_11_X64 | +| 17.0.14+7 | JAVA_HOME_17_X64 | +| 21.0.6+7.0 | JAVA_HOME_21_X64 | ### Shells | Name | Target | @@ -170,14 +169,14 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Go - 1.20.14 - 1.21.13 -- 1.22.10 -- 1.23.4 +- 1.22.11 +- 1.23.5 #### Node.js - 16.20.2 -- 18.20.5 -- 20.18.1 -- 22.13.0 +- 18.20.6 +- 20.18.2 +- 22.13.1 #### Python - 3.8.10 @@ -185,6 +184,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 3.10.11 - 3.11.9 - 3.12.8 +- 3.13.1 #### PyPy - 2.7.18 [PyPy 7.3.17] @@ -198,6 +198,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 3.0.7 - 3.1.6 - 3.2.6 +- 3.3.7 ### Databases @@ -205,7 +206,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Property | Value | | -------------------- | ------------------------------------------------------------------------------------------------------------------------------------ | | ServiceName | postgresql-x64-14 | -| Version | 14.12 | +| Version | 14.15 | | ServiceStatus | Stopped | | ServiceStartType | Disabled | | EnvironmentVariables | PGBIN=C:\Program Files\PostgreSQL\14\bin <br> PGDATA=C:\Program Files\PostgreSQL\14\data <br> PGROOT=C:\Program Files\PostgreSQL\14 | @@ -504,7 +505,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - nbgv 3.7.115+d31f50f4d1 ### PowerShell Tools -- PowerShell 7.4.6 +- PowerShell 7.4.7 #### Powershell Modules - Az: 12.1.0 @@ -512,7 +513,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - AzureRM: 6.13.1 - Azure (Cached): 5.1.1.zip - AzureRM (Cached): 6.7.0.zip -- AWSPowershell: 4.1.739 +- AWSPowershell: 4.1.743 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.10 - Microsoft.Graph: 2.25.0 From c8b6f67c08223abbce0b553ad4a2346ea03bdfd5 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 30 Jan 2025 11:30:32 +0000 Subject: [PATCH 3456/3485] Updating readme file for win22 version 20250127.1.1 (#11492) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/windows/Windows2022-Readme.md | 63 ++++++++++++++-------------- 1 file changed, 32 insertions(+), 31 deletions(-) diff --git a/images/windows/Windows2022-Readme.md b/images/windows/Windows2022-Readme.md index 21553e0e6517..069f2c8d6148 100644 --- a/images/windows/Windows2022-Readme.md +++ b/images/windows/Windows2022-Readme.md @@ -1,14 +1,13 @@ | Announcements | |-| +| [[Windows] Removal of Azure and Azure Powershell module from windows images from Febraury 14](https://github.com/actions/runner-images/issues/11483) | | [[Windows ] Breaking change : PHP 8.3.* version will be updated to PHP 8.4.* from January 31,2025](https://github.com/actions/runner-images/issues/11256) | | [Windows Server 2025 is now available](https://github.com/actions/runner-images/issues/11228) | | [[Windows] Breaking change : Docker Engine Version 26.* will be updated to Docker Engine Version 27.* from February 07,2025](https://github.com/actions/runner-images/issues/11104) | -| [[Windows & Ubuntu] Breaking change : Maven 3.8.* version will be updated to Maven 3.9.* from January 17,2025](https://github.com/actions/runner-images/issues/11093) | -| [[Windows & Ubuntu] .NET 7.x will be removed from the images on January 17,2025](https://github.com/actions/runner-images/issues/10894) | *** # Windows Server 2022 - OS Version: 10.0.20348 Build 3091 -- Image Version: 20250120.2.0 +- Image Version: 20250127.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -19,25 +18,25 @@ - Bash 5.2.37(1)-release - Go 1.21.13 - Julia 1.10.5 -- Kotlin 2.1.0 +- Kotlin 2.1.10 - LLVM 18.1.8 -- Node 18.20.5 +- Node 18.20.6 - Perl 5.32.1 -- PHP 8.3.16 +- PHP 8.4.3 - Python 3.9.13 - Ruby 3.0.7p220 ### Package Management - Chocolatey 2.4.1 -- Composer 2.8.4 +- Composer 2.8.5 - Helm 3.16.4 - Miniconda 24.11.1 (pre-installed on the image but not added to PATH) - NPM 10.8.2 - NuGet 6.12.2.1 -- pip 24.3.1 (python 3.9) +- pip 25.0 (python 3.9) - Pipx 1.7.1 - RubyGems 3.2.33 -- Vcpkg (build from commit cf035d991) +- Vcpkg (build from commit f3a67b0c4) - Yarn 1.22.22 #### Environment variables @@ -58,7 +57,7 @@ - azcopy 10.27.1 - Bazel 8.0.1 - Bazelisk 1.25.0 -- Bicep 0.32.4 +- Bicep 0.33.13 - Cabal 3.14.1.1 - CMake 3.31.4 - CodeQL Action Bundle 2.20.1 @@ -81,7 +80,7 @@ - NSIS 3.10 - OpenSSL 1.1.1w - Packer 1.11.2 -- Pulumi 3.146.0 +- Pulumi 3.147.0 - R 4.4.2 - Service Fabric SDK 9.1.1436.9590 - Stack 3.3.1 @@ -94,8 +93,8 @@ - zstd 1.5.6 ### CLI Tools -- Alibaba Cloud CLI 3.0.248 -- AWS CLI 2.23.2 +- Alibaba Cloud CLI 3.0.250 +- AWS CLI 2.23.6 - AWS SAM CLI 1.132.0 - AWS Session Manager CLI 1.2.694.0 - Azure CLI 2.68.0 @@ -117,11 +116,11 @@ - Rustfmt 1.8.0 ### Browsers and Drivers -- Google Chrome 132.0.6834.84 -- Chrome Driver 132.0.6834.83 -- Microsoft Edge 132.0.2957.115 -- Microsoft Edge Driver 132.0.2957.115 -- Mozilla Firefox 134.0.1 +- Google Chrome 132.0.6834.111 +- Chrome Driver 132.0.6834.110 +- Microsoft Edge 132.0.2957.127 +- Microsoft Edge Driver 132.0.2957.127 +- Mozilla Firefox 134.0.2 - Gecko Driver 0.35.0 - IE Driver 4.14.0.0 - Selenium server 4.28.0 @@ -137,10 +136,10 @@ ### Java | Version | Environment Variable | | ------------------- | -------------------- | -| 8.0.432+6 (default) | JAVA_HOME_8_X64 | -| 11.0.25+9 | JAVA_HOME_11_X64 | -| 17.0.13+11 | JAVA_HOME_17_X64 | -| 21.0.5+11.0 | JAVA_HOME_21_X64 | +| 8.0.442+6 (default) | JAVA_HOME_8_X64 | +| 11.0.26+4 | JAVA_HOME_11_X64 | +| 17.0.14+7 | JAVA_HOME_17_X64 | +| 21.0.6+7.0 | JAVA_HOME_21_X64 | ### Shells | Name | Target | @@ -164,14 +163,14 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Go - 1.20.14 - 1.21.13 -- 1.22.10 -- 1.23.4 +- 1.22.11 +- 1.23.5 #### Node.js - 16.20.2 -- 18.20.5 -- 20.18.1 -- 22.13.0 +- 18.20.6 +- 20.18.2 +- 22.13.1 #### Python - 3.8.10 @@ -179,6 +178,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 3.10.11 - 3.11.9 - 3.12.8 +- 3.13.1 #### PyPy - 2.7.18 [PyPy 7.3.17] @@ -191,6 +191,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - 3.0.7 - 3.1.6 - 3.2.6 +- 3.3.7 ### Databases @@ -198,7 +199,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Property | Value | | -------------------- | ------------------------------------------------------------------------------------------------------------------------------------ | | ServiceName | postgresql-x64-14 | -| Version | 14.12 | +| Version | 14.15 | | ServiceStatus | Stopped | | ServiceStartType | Disabled | | EnvironmentVariables | PGBIN=C:\Program Files\PostgreSQL\14\bin <br> PGDATA=C:\Program Files\PostgreSQL\14\data <br> PGROOT=C:\Program Files\PostgreSQL\14 | @@ -214,7 +215,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Database tools - Azure CosmosDb Emulator 2.14.21.0 - DacFx 162.5.57.1 -- MySQL 8.0.40.0 +- MySQL 8.0.41.0 - SQL OLEDB Driver 18.7.4.0 - SQLPS 1.0 @@ -502,7 +503,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - nbgv 3.7.115+d31f50f4d1 ### PowerShell Tools -- PowerShell 7.4.6 +- PowerShell 7.4.7 #### Powershell Modules - Az: 12.1.0 @@ -510,7 +511,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - AzureRM: 6.13.1 - Azure (Cached): 5.1.1.zip - AzureRM (Cached): 6.7.0.zip -- AWSPowershell: 4.1.739 +- AWSPowershell: 4.1.743 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.10 - Microsoft.Graph: 2.25.0 From 78d2d4978410bcc115dc746c66615aac37fb5127 Mon Sep 17 00:00:00 2001 From: lawrencegripper <info@grippers.co.uk> Date: Fri, 31 Jan 2025 09:53:36 +0000 Subject: [PATCH 3457/3485] Update checker --- .github/workflows/validate-json-schema.yml | 8 +-- helpers/CheckJsonSchema.ps1 | 29 +++++++++ helpers/CheckPinnedDetails.ps1 | 69 ++++++++++++++++++++++ helpers/pinned-details-chech.sh | 30 ---------- 4 files changed, 101 insertions(+), 35 deletions(-) create mode 100644 helpers/CheckJsonSchema.ps1 create mode 100755 helpers/CheckPinnedDetails.ps1 delete mode 100755 helpers/pinned-details-chech.sh diff --git a/.github/workflows/validate-json-schema.yml b/.github/workflows/validate-json-schema.yml index 4d35acea4deb..6ac19e202ce2 100644 --- a/.github/workflows/validate-json-schema.yml +++ b/.github/workflows/validate-json-schema.yml @@ -9,8 +9,6 @@ jobs: - name: Checkout repository uses: actions/checkout@v3 - - name: Run JSON Schema validation - run: | - wget -q https://github.com/neilpa/yajsv/releases/download/v1.4.1/yajsv.linux.amd64 - chmod +x yajsv.linux.amd64 - ./yajsv.linux.amd64 -s ./schemas/toolset-schema.json $(find . -name 'toolset-*.json' | tr '\n' ' ') + - name: Validate JSON Schema + shell: pwsh + run: ./helpers/CheckJsonSchema.ps1 diff --git a/helpers/CheckJsonSchema.ps1 b/helpers/CheckJsonSchema.ps1 new file mode 100644 index 000000000000..f38eafda2d77 --- /dev/null +++ b/helpers/CheckJsonSchema.ps1 @@ -0,0 +1,29 @@ +$ErrorActionPreference = 'Stop' + +# A JSON schema validator which supports outputting line numbers for errors +Install-Module -Name GripDevJsonSchemaValidator -Force -Scope CurrentUser + +# Find all toolset JSON files +$toolsetFiles = Get-ChildItem -Recurse -Filter "toolset-*.json" | Where-Object { $_.Name -notlike "*schema.json" } +$schemaFilePath = "./schemas/toolset-schema.json" + +foreach ($file in $toolsetFiles) { + Write-Host "🔍 Validating $($file.FullName)" -ForegroundColor Cyan + + $validationResult = Test-JsonSchema -SchemaPath $schemaFilePath -JsonPath $file.FullName + + if ($validationResult.Valid) { + Write-Host "✅ JSON is valid." -ForegroundColor Green + } else { + Write-Host "`n❌ JSON validation failed!" -ForegroundColor Red + Write-Host " Found the following errors:`n" -ForegroundColor Yellow + $validationResult.Errors | ForEach-Object { + Write-Host $_.UserMessage + if ($env:GITHUB_ACTIONS -eq 'true') { + Write-Host "::error file=$($file.Name),line=$($_.LineNumber)::$($_.UserMessage)" + } + } + } +} + +Write-Host "Schema validation completed successfully" diff --git a/helpers/CheckPinnedDetails.ps1 b/helpers/CheckPinnedDetails.ps1 new file mode 100755 index 000000000000..03b573e6a6c3 --- /dev/null +++ b/helpers/CheckPinnedDetails.ps1 @@ -0,0 +1,69 @@ +$ErrorActionPreference = 'Stop' + +function Get-PinnedDetailsRecursive($obj) { + $pinnedDetails = @() + + if ($obj -is [System.Management.Automation.PSCustomObject]) { + if ($obj.PSObject.Properties.Name -contains "review-at") { + $pinnedDetails += $obj + } + foreach ($prop in $obj.PSObject.Properties) { + Get-PinnedDetailsRecursive $prop.Value + } + } + elseif ($obj -is [Array]) { + foreach ($item in $obj) { + Get-PinnedDetailsRecursive $item + } + } + + return $pinnedDetails +} + +Write-Host "Checking pinned details for overdue review dates" + +# Find all toolset JSON files in the current directory and subdirectories +$toolsetFiles = Get-ChildItem -Recurse -Filter "toolset-*.json" + +foreach ($toolsetFile in $toolsetFiles) { + Write-Host "Checking $toolsetFile" + + # Skip schema file + if ($toolsetFile.Name -like "*toolset-schema.json") { + continue + } + + # Get all objects with 'review-at' property from the JSON file + $jsonContent = Get-Content $toolsetFile.FullName | ConvertFrom-Json + + $pinnedDetails = Get-PinnedDetailsRecursive $jsonContent | Where-Object { $_ -ne $null } + + foreach ($pinnedDetail in $pinnedDetails) { + $reviewDate = $pinnedDetail.'review-at' + $reason = $pinnedDetail.reason + + Write-Host "Info: Review date $reviewDate, reason $reason" + + if (![string]::IsNullOrEmpty($reviewDate)) { + $reviewDateTime = [DateTime]::Parse($reviewDate) + $currentTime = Get-Date + $sevenDaysAgo = $currentTime.AddDays(-7) + + Write-Host "Info: Review date $reviewDate, current time $currentTime" + + # Check if review date is in the past + if ($reviewDateTime -lt $currentTime) { + Write-Host "ERROR: Overdue review date: $reviewDate for tool in $($toolsetFile.Name)" + Write-Host " Pinned for '$reason'" + Write-Host "" + } + + # Check if review date is within the next 7 days + if ($reviewDateTime -gt $sevenDaysAgo -and $reviewDateTime -le $currentTime) { + Write-Host "WARNING: Review date is coming up within the next 7 days: $reviewDate for tool in $($toolsetFile.Name)" + Write-Host " Pinned for '$reason'" + Write-Host "" + } + } + } +} diff --git a/helpers/pinned-details-chech.sh b/helpers/pinned-details-chech.sh deleted file mode 100755 index 1874e3b8165d..000000000000 --- a/helpers/pinned-details-chech.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/bash - -toolset_files=$(find . -name 'toolset-*.json') - -for toolset_file in $toolset_files; do - if [[ "$toolset_file" == *"toolset-schema.json" ]]; then - continue - fi - - readarray -t pinned_details < <(jq --compact-output '.. | objects | select(has("review-at"))' "$toolset_file") - - for pinned_detail in "${pinned_details[@]}"; do - review_date=$(jq -r '.["review-at"]' <<< "$pinned_detail") - reason=$(jq -r '.["reason"]' <<< "$pinned_detail") - - if [ -n "$review_date" ]; then - if [ "$(date -d "$review_date" +%s)" -gt "$(date +%s)" ]; then - echo "ERROR: Overdue review date: $review_date for tool in $toolset_file" - echo " Pinned for '$reason'" - echo "" - fi - - if [ "$(date -d "$review_date" +%s)" -le $(( $(date +%s) - 7*24*60*60 )) ]; then - echo "WARNING: Review date is coming up within the next 7 days: $review_date for tool in $toolset_file" - echo " Pinned for '$reason'" - echo "" - fi - fi - done -done From 3bc475f72e4a2bf38ad1897ce92d74be952b0d4a Mon Sep 17 00:00:00 2001 From: lawrencegripper <info@grippers.co.uk> Date: Fri, 31 Jan 2025 10:04:51 +0000 Subject: [PATCH 3458/3485] try --- helpers/CheckJsonSchema.ps1 | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/helpers/CheckJsonSchema.ps1 b/helpers/CheckJsonSchema.ps1 index f38eafda2d77..e338530d478b 100644 --- a/helpers/CheckJsonSchema.ps1 +++ b/helpers/CheckJsonSchema.ps1 @@ -7,6 +7,7 @@ Install-Module -Name GripDevJsonSchemaValidator -Force -Scope CurrentUser $toolsetFiles = Get-ChildItem -Recurse -Filter "toolset-*.json" | Where-Object { $_.Name -notlike "*schema.json" } $schemaFilePath = "./schemas/toolset-schema.json" +$toolsetHasErrors = $false foreach ($file in $toolsetFiles) { Write-Host "🔍 Validating $($file.FullName)" -ForegroundColor Cyan @@ -15,15 +16,21 @@ foreach ($file in $toolsetFiles) { if ($validationResult.Valid) { Write-Host "✅ JSON is valid." -ForegroundColor Green } else { + $toolsetHasErrors = $true Write-Host "`n❌ JSON validation failed!" -ForegroundColor Red Write-Host " Found the following errors:`n" -ForegroundColor Yellow $validationResult.Errors | ForEach-Object { Write-Host $_.UserMessage if ($env:GITHUB_ACTIONS -eq 'true') { - Write-Host "::error file=$($file.Name),line=$($_.LineNumber)::$($_.UserMessage)" + Write-Host "Adding annotation" + Write-Host "::error file=$($file.Name),line=$($_.LineNumber)::$($_.UserMessage.Replace("`n", '%0A'))" } } } } -Write-Host "Schema validation completed successfully" +if ($toolsetHasErrors) { + Write-Error "One or more toolset JSON files failed schema validation. See the error output above for more details." +} else { + Write-Host "Schema validation completed successfully" +} From 901125ceec8de03fb0b7e680c86f306aec953346 Mon Sep 17 00:00:00 2001 From: lawrencegripper <info@grippers.co.uk> Date: Fri, 31 Jan 2025 10:39:03 +0000 Subject: [PATCH 3459/3485] Check outdated pins --- .github/workflows/check-pinned-versions.yml | 18 +++++ helpers/CheckJsonSchema.ps1 | 10 ++- helpers/CheckOutdatedVersionPinning.ps1 | 81 +++++++++++++++++++++ helpers/CheckPinnedDetails.ps1 | 69 ------------------ images/ubuntu/toolsets/toolset-2004.json | 19 ++++- images/windows/toolsets/toolset-2022.json | 16 +++- images/windows/toolsets/toolset-2025.json | 16 +++- 7 files changed, 150 insertions(+), 79 deletions(-) create mode 100644 .github/workflows/check-pinned-versions.yml create mode 100644 helpers/CheckOutdatedVersionPinning.ps1 delete mode 100755 helpers/CheckPinnedDetails.ps1 diff --git a/.github/workflows/check-pinned-versions.yml b/.github/workflows/check-pinned-versions.yml new file mode 100644 index 000000000000..da8adc314e7a --- /dev/null +++ b/.github/workflows/check-pinned-versions.yml @@ -0,0 +1,18 @@ +on: + push: + branches: + - main + pull_request: + schedule: + - cron: '0 0 * * *' # Run at midnight UTC every day + +jobs: + validate-json: + runs-on: ubuntu-latest + steps: + - name: Checkout repository + uses: actions/checkout@v3 + + - name: Validate JSON Schema + shell: pwsh + run: ./helpers/CheckOutdatedVersionPinning.ps1 diff --git a/helpers/CheckJsonSchema.ps1 b/helpers/CheckJsonSchema.ps1 index e338530d478b..4155fb899843 100644 --- a/helpers/CheckJsonSchema.ps1 +++ b/helpers/CheckJsonSchema.ps1 @@ -1,7 +1,10 @@ $ErrorActionPreference = 'Stop' # A JSON schema validator which supports outputting line numbers for errors -Install-Module -Name GripDevJsonSchemaValidator -Force -Scope CurrentUser +# this allows us to put annotations on builds for errors in the JSON files +# `Test-Json` built in cmdline doesn't. No existing cli tool supports this +# that I could find either. See: https://github.com/lawrencegripper/gripdev-json-schema-validator +Install-Module -Name GripDevJsonSchemaValidator -Force -Scope CurrentUser # Find all toolset JSON files $toolsetFiles = Get-ChildItem -Recurse -Filter "toolset-*.json" | Where-Object { $_.Name -notlike "*schema.json" } @@ -9,16 +12,19 @@ $schemaFilePath = "./schemas/toolset-schema.json" $toolsetHasErrors = $false foreach ($file in $toolsetFiles) { + Write-Host "" Write-Host "🔍 Validating $($file.FullName)" -ForegroundColor Cyan - $validationResult = Test-JsonSchema -SchemaPath $schemaFilePath -JsonPath $file.FullName + $validationResult = Test-JsonSchema -SchemaPath $schemaFilePath -JsonPath $file.FullName -PrettyPrint $false if ($validationResult.Valid) { Write-Host "✅ JSON is valid." -ForegroundColor Green } else { + # File has been modified since the commit, enforce validation $toolsetHasErrors = $true Write-Host "`n❌ JSON validation failed!" -ForegroundColor Red Write-Host " Found the following errors:`n" -ForegroundColor Yellow + $validationResult.Errors | ForEach-Object { Write-Host $_.UserMessage if ($env:GITHUB_ACTIONS -eq 'true') { diff --git a/helpers/CheckOutdatedVersionPinning.ps1 b/helpers/CheckOutdatedVersionPinning.ps1 new file mode 100644 index 000000000000..10a4e26de229 --- /dev/null +++ b/helpers/CheckOutdatedVersionPinning.ps1 @@ -0,0 +1,81 @@ +$ErrorActionPreference = 'Stop' + +# Find all toolset JSON files +$toolsetFiles = Get-ChildItem -Recurse -Filter "toolset-*.json" | Where-Object { $_.Name -notlike "*schema.json" } + +$expiringPins = @() +$now = Get-Date +$warningDays = 30 # Warn if expiring within 30 days + +foreach ($file in $toolsetFiles) { + Write-Host "Processing $($file.Name)" + $content = Get-Content $file.FullName | ConvertFrom-Json + + # Recursively search for pinnedDetails in the JSON + function Search-PinnedDetails { + param($obj, $path) + + $foundPins = @() + + if ($obj -is [System.Management.Automation.PSCustomObject]) { + foreach ($prop in $obj.PSObject.Properties) { + if ($prop.Name -eq "pinnedDetails") { + Write-Host "Found pinned version at $path" + $reviewAt = [DateTime]::Parse($prop.Value.'review-at') + $daysUntilExpiry = ($reviewAt - $now).Days + + if ($daysUntilExpiry -lt $warningDays) { + Write-Host "Adding to expiringPins array" + $foundPins += @{ + Path = $path + File = $file.Name + ReviewAt = $reviewAt + DaysUntilExpiry = $daysUntilExpiry + Reason = $prop.Value.reason + Link = $prop.Value.link + } + } + } else { + $foundPins += Search-PinnedDetails -obj $prop.Value -path "$path.$($prop.Name)" + } + } + } elseif ($obj -is [Array]) { + for ($i = 0; $i -lt $obj.Count; $i++) { + $foundPins += Search-PinnedDetails -obj $obj[$i] -path "$path[$i]" + } + } + + return $foundPins + } + + $expiringPins += Search-PinnedDetails -obj $content -path $file.Name +} + +if ($expiringPins) { + $issueBody = "# Version Pinning Review Required`n`n" + $issueBody += "The following pinned versions need review:`n`n" + + foreach ($pin in $expiringPins) { + $status = if ($pin.DaysUntilExpiry -lt 0) { "EXPIRED" } else { "Expiring Soon" } + $issueBody += "## $($status) - $($pin.Path)`n" + $issueBody += "- **File**: $($pin.File)`n" + $issueBody += "- **Review Date**: $($pin.ReviewAt.ToString('yyyy-MM-dd'))`n" + $issueBody += "- **Days until expiry**: $($pin.DaysUntilExpiry)`n" + $issueBody += "- **Reason**: $($pin.Reason)`n" + $issueBody += "- **Original PR**: $($pin.Link)`n`n" + } + + if ($env:GITHUB_ACTIONS -eq 'true') { + # In GitHub Actions, create an issue + $issueBody | gh issue create --title "Version Pinning Review Found Expired Pinned Versions" --body - + } + + Write-Host "`nIssue Content:`n" + Write-Host $issueBody +} +else { + Write-Host "No expiring pins found." + if ($env:GITHUB_ACTIONS -eq 'true') { + "expired_pins=0" >> $env:GITHUB_OUTPUT + } +} diff --git a/helpers/CheckPinnedDetails.ps1 b/helpers/CheckPinnedDetails.ps1 deleted file mode 100755 index 03b573e6a6c3..000000000000 --- a/helpers/CheckPinnedDetails.ps1 +++ /dev/null @@ -1,69 +0,0 @@ -$ErrorActionPreference = 'Stop' - -function Get-PinnedDetailsRecursive($obj) { - $pinnedDetails = @() - - if ($obj -is [System.Management.Automation.PSCustomObject]) { - if ($obj.PSObject.Properties.Name -contains "review-at") { - $pinnedDetails += $obj - } - foreach ($prop in $obj.PSObject.Properties) { - Get-PinnedDetailsRecursive $prop.Value - } - } - elseif ($obj -is [Array]) { - foreach ($item in $obj) { - Get-PinnedDetailsRecursive $item - } - } - - return $pinnedDetails -} - -Write-Host "Checking pinned details for overdue review dates" - -# Find all toolset JSON files in the current directory and subdirectories -$toolsetFiles = Get-ChildItem -Recurse -Filter "toolset-*.json" - -foreach ($toolsetFile in $toolsetFiles) { - Write-Host "Checking $toolsetFile" - - # Skip schema file - if ($toolsetFile.Name -like "*toolset-schema.json") { - continue - } - - # Get all objects with 'review-at' property from the JSON file - $jsonContent = Get-Content $toolsetFile.FullName | ConvertFrom-Json - - $pinnedDetails = Get-PinnedDetailsRecursive $jsonContent | Where-Object { $_ -ne $null } - - foreach ($pinnedDetail in $pinnedDetails) { - $reviewDate = $pinnedDetail.'review-at' - $reason = $pinnedDetail.reason - - Write-Host "Info: Review date $reviewDate, reason $reason" - - if (![string]::IsNullOrEmpty($reviewDate)) { - $reviewDateTime = [DateTime]::Parse($reviewDate) - $currentTime = Get-Date - $sevenDaysAgo = $currentTime.AddDays(-7) - - Write-Host "Info: Review date $reviewDate, current time $currentTime" - - # Check if review date is in the past - if ($reviewDateTime -lt $currentTime) { - Write-Host "ERROR: Overdue review date: $reviewDate for tool in $($toolsetFile.Name)" - Write-Host " Pinned for '$reason'" - Write-Host "" - } - - # Check if review date is within the next 7 days - if ($reviewDateTime -gt $sevenDaysAgo -and $reviewDateTime -le $currentTime) { - Write-Host "WARNING: Review date is coming up within the next 7 days: $reviewDate for tool in $($toolsetFile.Name)" - Write-Host " Pinned for '$reason'" - Write-Host "" - } - } - } -} diff --git a/images/ubuntu/toolsets/toolset-2004.json b/images/ubuntu/toolsets/toolset-2004.json index e96d97b2b846..07885f4aa1fa 100644 --- a/images/ubuntu/toolsets/toolset-2004.json +++ b/images/ubuntu/toolsets/toolset-2004.json @@ -377,10 +377,21 @@ }, "aliyunCli": { "version": "3.0.174", - "sha256": "0c51028a7a32fc02c8de855f73e273556f957115eb5624565738f9b9f83a50ba" + "sha256": "0c51028a7a32fc02c8de855f73e273556f957115eb5624565738f9b9f83a50ba", + "pinnedDetails": { + "link": "https://github.com/actions/runner-images-internal/pull/6702", + "reason": "Meaningful reason must be added at next update.", + "review-at": "2025-06-01", + "type": "preexisting-pinned-version-without-reason" + } }, "ocCli": { - "version": "4.15.19" - } - + "version": "4.15.19", + "pinnedDetails": { + "link": "https://github.com/actions/runner-images-internal/pull/6702", + "reason": "Meaningful reason must be added at next update.", + "review-at": "2025-06-01", + "type": "preexisting-pinned-version-without-reason" + } + } } diff --git a/images/windows/toolsets/toolset-2022.json b/images/windows/toolsets/toolset-2022.json index 280820b87dc9..8f2b34269c33 100644 --- a/images/windows/toolsets/toolset-2022.json +++ b/images/windows/toolsets/toolset-2022.json @@ -380,13 +380,25 @@ }, "postgresql": { "version": "14.12.1", - "signature": "698BA51AA27CC31282AACA5055E4B9190BC6C0E9" + "signature": "698BA51AA27CC31282AACA5055E4B9190BC6C0E9", + "pinnedDetails": { + "link": "https://github.com/actions/runner-images-internal/pull/6702", + "reason": "Meaningful reason must be added at next update.", + "review-at": "2025-06-01", + "type": "preexisting-pinned-version-without-reason" + } }, "kotlin": { "version": "latest" }, "openssl": { - "version": "1.1.1" + "version": "1.1.1", + "pinnedDetails": { + "link": "https://github.com/actions/runner-images-internal/pull/6702", + "reason": "Meaningful reason must be added at next update.", + "review-at": "2024-06-01", + "type": "preexisting-pinned-version-without-reason" + } }, "pwsh": { "version": "7.4" diff --git a/images/windows/toolsets/toolset-2025.json b/images/windows/toolsets/toolset-2025.json index e886e11150ce..2a413f891522 100644 --- a/images/windows/toolsets/toolset-2025.json +++ b/images/windows/toolsets/toolset-2025.json @@ -107,7 +107,13 @@ }, "mingw": { "version": "14.2.0", - "runtime": "ucrt" + "runtime": "ucrt", + "pinnedDetails": { + "link": "https://github.com/actions/runner-images-internal/pull/6702", + "reason": "Meaningful reason must be added at next update.", + "review-at": "2025-06-01", + "type": "preexisting-pinned-version-without-reason" + } }, "MsysPackages": { "msys2": [], @@ -318,7 +324,13 @@ "version": "latest" }, "openssl": { - "version": "3.4.0" + "version": "3.4.0", + "pinnedDetails": { + "link": "https://github.com/actions/runner-images-internal/pull/6702", + "reason": "Meaningful reason must be added at next update.", + "review-at": "2025-06-01", + "type": "preexisting-pinned-version-without-reason" + } }, "pwsh": { "version": "7.4" From 50e09973d0be461466a04ba742c0b642a2f3353f Mon Sep 17 00:00:00 2001 From: lawrencegripper <info@grippers.co.uk> Date: Fri, 31 Jan 2025 10:43:40 +0000 Subject: [PATCH 3460/3485] Fix gh cli piping --- helpers/CheckOutdatedVersionPinning.ps1 | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/helpers/CheckOutdatedVersionPinning.ps1 b/helpers/CheckOutdatedVersionPinning.ps1 index 10a4e26de229..2d98ad5874ad 100644 --- a/helpers/CheckOutdatedVersionPinning.ps1 +++ b/helpers/CheckOutdatedVersionPinning.ps1 @@ -67,7 +67,11 @@ if ($expiringPins) { if ($env:GITHUB_ACTIONS -eq 'true') { # In GitHub Actions, create an issue - $issueBody | gh issue create --title "Version Pinning Review Found Expired Pinned Versions" --body - + Write-Host "Creating issue" + $tempFile = [System.IO.Path]::GetTempFileName() + Set-Content -Path $tempFile -Value $issueBody + gh issue create --title "Version Pinning Review Found Expired Pinned Versions" --body-file $tempFile + Remove-Item -Path $tempFile } Write-Host "`nIssue Content:`n" From 613e24f3cdce077e1c36f1798470863f50fb48f7 Mon Sep 17 00:00:00 2001 From: lawrencegripper <info@grippers.co.uk> Date: Fri, 31 Jan 2025 10:46:52 +0000 Subject: [PATCH 3461/3485] update --- .github/workflows/check-pinned-versions.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/check-pinned-versions.yml b/.github/workflows/check-pinned-versions.yml index da8adc314e7a..71e3f41ceb35 100644 --- a/.github/workflows/check-pinned-versions.yml +++ b/.github/workflows/check-pinned-versions.yml @@ -6,6 +6,10 @@ on: schedule: - cron: '0 0 * * *' # Run at midnight UTC every day +permissions: + issues: write + contents: read + jobs: validate-json: runs-on: ubuntu-latest @@ -16,3 +20,5 @@ jobs: - name: Validate JSON Schema shell: pwsh run: ./helpers/CheckOutdatedVersionPinning.ps1 + env: + GH_TOKEN: ${{ github.token }} From 1ace44b407eea6614a8b7c71dae7af16b34ff7cf Mon Sep 17 00:00:00 2001 From: lawrencegripper <info@grippers.co.uk> Date: Fri, 31 Jan 2025 10:51:21 +0000 Subject: [PATCH 3462/3485] Update cron --- .github/workflows/check-pinned-versions.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/check-pinned-versions.yml b/.github/workflows/check-pinned-versions.yml index 71e3f41ceb35..54b6e03cf664 100644 --- a/.github/workflows/check-pinned-versions.yml +++ b/.github/workflows/check-pinned-versions.yml @@ -1,10 +1,8 @@ +name: Check Outdated Version Pinning + on: - push: - branches: - - main - pull_request: schedule: - - cron: '0 0 * * *' # Run at midnight UTC every day + - cron: '0 12 * * 1' # Run at 12:00 UTC every Monday permissions: issues: write From 645b62769bc3829e2064bb9d0d9ae5f06d106839 Mon Sep 17 00:00:00 2001 From: lawrencegripper <info@grippers.co.uk> Date: Fri, 31 Jan 2025 10:55:38 +0000 Subject: [PATCH 3463/3485] Add pinnedDetails to mingw --- images/windows/toolsets/toolset-2022.json | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/images/windows/toolsets/toolset-2022.json b/images/windows/toolsets/toolset-2022.json index 5ab5d6e85089..6660ef26a941 100644 --- a/images/windows/toolsets/toolset-2022.json +++ b/images/windows/toolsets/toolset-2022.json @@ -150,7 +150,13 @@ }, "mingw": { "version": "12.2.0", - "runtime": "ucrt" + "runtime": "ucrt", + "pinnedDetails": { + "link": "https://github.com/actions/runner-images-internal/pull/6702", + "reason": "Meaningful reason must be added at next update.", + "review-at": "2025-06-01", + "type": "preexisting-pinned-version-without-reason" + } }, "MsysPackages": { "msys2": [], From 5385f70026a8896b62e273e0695d386219871598 Mon Sep 17 00:00:00 2001 From: lawrencegripper <info@grippers.co.uk> Date: Fri, 31 Jan 2025 10:57:29 +0000 Subject: [PATCH 3464/3485] Fix double run --- .github/workflows/validate-json-schema.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/validate-json-schema.yml b/.github/workflows/validate-json-schema.yml index 6ac19e202ce2..5e4d71dfc251 100644 --- a/.github/workflows/validate-json-schema.yml +++ b/.github/workflows/validate-json-schema.yml @@ -1,6 +1,12 @@ name: Validate JSON Schema -on: [push, pull_request] +on: + push: + branches: + - main + pull_request: + branches: + - main jobs: validate-json: From 94f8e7af81e04d13c9fdb61061b571afa1bcf2ea Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Fri, 31 Jan 2025 12:03:27 +0100 Subject: [PATCH 3465/3485] Revert "Updating readme file for macos-15-arm64 version 20250127.616 (#11481)" (#11514) This reverts commit 0a2348df06c87050faf9b463e7ffeed331f646c1. --- images/macos/macos-15-arm64-Readme.md | 89 ++++++++++++++------------- 1 file changed, 45 insertions(+), 44 deletions(-) diff --git a/images/macos/macos-15-arm64-Readme.md b/images/macos/macos-15-arm64-Readme.md index 07fb9fe34467..638baeedeb88 100644 --- a/images/macos/macos-15-arm64-Readme.md +++ b/images/macos/macos-15-arm64-Readme.md @@ -7,7 +7,7 @@ # macOS 15 - OS Version: macOS 15.2 (24C101) - Kernel Version: Darwin 24.2.0 -- Image Version: 20250127.616 +- Image Version: 20250120.596 ## Installed Software @@ -23,7 +23,7 @@ - GNU Fortran 13 (Homebrew GCC 13.3.0) - available by `gfortran-13` alias - GNU Fortran 14 (Homebrew GCC 14.2.0_1) - available by `gfortran-14` alias - Kotlin 2.1.0-release-394 -- Node.js 22.13.1 +- Node.js 22.13.0 - Perl 5.40.1 - Python3 3.13.1 - Ruby 3.3.7 @@ -32,7 +32,7 @@ - Bundler 2.6.3 - Carthage 0.40.0 - CocoaPods 1.16.2 -- Homebrew 4.4.17 +- Homebrew 4.4.16 - NPM 10.9.2 - Pip3 24.3.1 (python 3.13) - Pipx 1.7.1 @@ -42,7 +42,7 @@ ### Project Management - Apache Ant 1.10.15 - Apache Maven 3.9.9 -- Gradle 8.12.1 +- Gradle 8.12 ### Utilities - 7-Zip 17.05 @@ -60,24 +60,24 @@ - gpg (GnuPG) 2.4.7 - jq 1.7.1 - OpenSSL 1.1.1w 11 Sep 2023 -- Packer 1.12.0 +- Packer 1.11.2 - pkgconf 2.3.0 - Unxip 3.1 - yq 4.45.1 - zstd 1.5.6 ### Tools -- AWS CLI 2.23.6 +- AWS CLI 2.23.2 - AWS SAM CLI 1.132.0 - AWS Session Manager CLI 1.2.694.0 - Azure CLI 2.68.0 - Azure CLI (azure-devops) 1.0.1 -- Bicep CLI 0.33.13 -- Cmake 3.31.5 +- Bicep CLI 0.32.4 +- Cmake 3.31.4 - CodeQL Action Bundle 2.20.1 - Fastlane 2.226.0 -- SwiftFormat 0.55.5 -- Xcbeautify 2.23.0 +- SwiftFormat 0.55.4 +- Xcbeautify 2.17.0 - Xcode Command Line Tools 16.2.0.0.1.1733547573 - Xcodes 1.6.0 @@ -86,10 +86,10 @@ ### Browsers - Safari 18.2 (20620.1.16.11.8) - SafariDriver 18.2 (20620.1.16.11.8) -- Google Chrome 132.0.6834.111 -- Google Chrome for Testing 132.0.6834.110 -- ChromeDriver 132.0.6834.110 -- Selenium server 4.28.0 +- Google Chrome 132.0.6834.84 +- Google Chrome for Testing 132.0.6834.83 +- ChromeDriver 132.0.6834.83 +- Selenium server 4.27.0 #### Environment variables | Name | Value | @@ -99,11 +99,11 @@ | GECKOWEBDRIVER | | ### Java -| Version | Environment Variable | -| -------------------- | -------------------- | -| 11.0.26+4 | JAVA_HOME_11_arm64 | -| 17.0.14+7 | JAVA_HOME_17_arm64 | -| 21.0.6+7.0 (default) | JAVA_HOME_21_arm64 | +| Version | Environment Variable | +| --------------------- | -------------------- | +| 11.0.25+9 | JAVA_HOME_11_arm64 | +| 17.0.13+11 | JAVA_HOME_17_arm64 | +| 21.0.5+11.0 (default) | JAVA_HOME_21_arm64 | ### Cached Tools @@ -119,14 +119,14 @@ - 3.13.1 #### Node.js -- 18.20.6 -- 20.18.2 -- 22.13.1 +- 18.20.5 +- 20.18.1 +- 22.13.0 #### Go - 1.21.13 -- 1.22.11 -- 1.23.5 +- 1.22.10 +- 1.23.4 ### Rust Tools - Cargo 1.84.0 @@ -139,7 +139,7 @@ - Rustfmt 1.8.0-stable ### PowerShell Tools -- PowerShell 7.4.7 +- PowerShell 7.4.6 #### PowerShell Modules - Az: 12.4.0 @@ -189,8 +189,9 @@ | visionOS 1.2 | xros1.2 | 15.4 | | visionOS 2.0 | xros2.0 | 16.0 | | Simulator - visionOS 2.0 | xrsimulator2.0 | 16.0 | -| Simulator - visionOS 2.1 | xrsimulator2.1 | 16.1 | | visionOS 2.1 | xros2.1 | 16.1 | +| Simulator - visionOS 2.1 | xrsimulator2.1 | 16.1 | +| Simulator - visionOS 2.2 | xrsimulator2.2 | 16.2 | | visionOS 2.2 | xros2.2 | 16.2 | | Simulator - visionOS 2.2 | xrsimulator2.2 | 16.2 | | DriverKit 23.5 | driverkit23.5 | 15.4 | @@ -199,24 +200,24 @@ | DriverKit 24.2 | driverkit24.2 | 16.2 | #### Installed Simulators -| OS | Simulators | -| ------------ | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| iOS 17.5 | iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | -| iOS 18.0 | iPhone 16<br>iPhone 16 Plus<br>iPhone 16 Pro<br>iPhone 16 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | -| iOS 18.1 | iPhone 16<br>iPhone 16 Plus<br>iPhone 16 Pro<br>iPhone 16 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (A17 Pro)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | -| iOS 18.2 | iPhone 16<br>iPhone 16 Plus<br>iPhone 16 Pro<br>iPhone 16 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (A17 Pro)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | -| tvOS 17.5 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 18.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 18.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| tvOS 18.2 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | -| watchOS 10.5 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra 2 (49mm) | -| watchOS 11.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 10 (42mm)<br>Apple Watch Series 10 (46mm)<br>Apple Watch Ultra 2 (49mm) | -| watchOS 11.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 10 (42mm)<br>Apple Watch Series 10 (46mm)<br>Apple Watch Ultra 2 (49mm) | -| watchOS 11.2 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 10 (42mm)<br>Apple Watch Series 10 (46mm)<br>Apple Watch Ultra 2 (49mm) | -| visionOS 1.2 | Apple Vision Pro | -| visionOS 2.0 | Apple Vision Pro | -| visionOS 2.1 | Apple Vision Pro | -| visionOS 2.2 | Apple Vision Pro | +| OS | Simulators | +| ------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| iOS 17.5 | iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | +| iOS 18.0 | iPhone 16<br>iPhone 16 Plus<br>iPhone 16 Pro<br>iPhone 16 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (6th generation)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | +| iOS 18.1 | iPhone 16<br>iPhone 16 Plus<br>iPhone 16 Pro<br>iPhone 16 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (A17 Pro)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | +| iOS 18.2 | iPhone 16<br>iPhone 16 Plus<br>iPhone 16 Pro<br>iPhone 16 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air 11-inch (M2)<br>iPad Air 13-inch (M2)<br>iPad mini (A17 Pro)<br>iPad Pro 11-inch (M4)<br>iPad Pro 13-inch (M4) | +| tvOS 17.5 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 18.0 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 18.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| tvOS 18.2 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p) | +| watchOS 10.5 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 11.0 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 10 (42mm)<br>Apple Watch Series 10 (46mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 11.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 10 (42mm)<br>Apple Watch Series 10 (46mm)<br>Apple Watch Ultra 2 (49mm) | +| watchOS 11.2 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 10 (42mm)<br>Apple Watch Series 10 (46mm)<br>Apple Watch Ultra 2 (49mm) | +| visionOS 1.2 | Apple Vision Pro | +| visionOS 2.0 | Apple Vision Pro | +| visionOS 2.1 | Apple Vision Pro | +| visionOS 2.2 | Apple Vision Pro | ### Android | Package Name | Version | From 06fe9293439bfab6348c260e73f4e04fedc26f34 Mon Sep 17 00:00:00 2001 From: Lawrence Gripper <lawrencegripper@github.com> Date: Fri, 31 Jan 2025 11:03:31 +0000 Subject: [PATCH 3466/3485] Update .gitignore --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index 1d20651d4042..6018a375704f 100644 --- a/.gitignore +++ b/.gitignore @@ -397,4 +397,3 @@ launch.json # Ignore dynamic template images/*/*-temp.json -.github/workflows/validate-json-schema.yml From b0de0a7049c04caed4a5e181fc29a1883ce37797 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 31 Jan 2025 11:50:11 +0000 Subject: [PATCH 3467/3485] Updating readme file for win25 version 20250127.1.1 (#11502) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/windows/Windows2025-Readme.md | 63 ++++++++++++++-------------- 1 file changed, 31 insertions(+), 32 deletions(-) diff --git a/images/windows/Windows2025-Readme.md b/images/windows/Windows2025-Readme.md index 9c1f6bfc92e5..9474081e3f75 100644 --- a/images/windows/Windows2025-Readme.md +++ b/images/windows/Windows2025-Readme.md @@ -1,14 +1,13 @@ | Announcements | |-| +| [[Windows] Removal of Azure and Azure Powershell module from windows images from Febraury 14](https://github.com/actions/runner-images/issues/11483) | | [[Windows ] Breaking change : PHP 8.3.* version will be updated to PHP 8.4.* from January 31,2025](https://github.com/actions/runner-images/issues/11256) | | [Windows Server 2025 is now available](https://github.com/actions/runner-images/issues/11228) | | [[Windows] Breaking change : Docker Engine Version 26.* will be updated to Docker Engine Version 27.* from February 07,2025](https://github.com/actions/runner-images/issues/11104) | -| [[Windows & Ubuntu] Breaking change : Maven 3.8.* version will be updated to Maven 3.9.* from January 17,2025](https://github.com/actions/runner-images/issues/11093) | -| [[Windows & Ubuntu] .NET 7.x will be removed from the images on January 17,2025](https://github.com/actions/runner-images/issues/10894) | *** # Windows Server 2025 - OS Version: 10.0.26100 Build 2894 -- Image Version: 20250120.2.0 +- Image Version: 20250127.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -18,27 +17,27 @@ ### Language and Runtime - Bash 5.2.37(1)-release -- Go 1.23.4 +- Go 1.23.5 - Julia 1.10.5 -- Kotlin 2.1.0 +- Kotlin 2.1.10 - LLVM 19.1.5 -- Node 22.13.0 +- Node 22.13.1 - Perl 5.40.0 -- PHP 8.3.16 +- PHP 8.4.3 - Python 3.9.13 - Ruby 3.3.7 ### Package Management - Chocolatey 2.4.1 -- Composer 2.8.4 +- Composer 2.8.5 - Helm 3.16.4 - Miniconda 24.11.1 (pre-installed on the image but not added to PATH) - NPM 10.9.2 - NuGet 6.12.2.1 -- pip 24.3.1 (python 3.9) +- pip 25.0 (python 3.9) - Pipx 1.7.1 - RubyGems 3.5.22 -- Vcpkg (build from commit cf035d991) +- Vcpkg (build from commit f3a67b0c4) - Yarn 1.22.22 #### Environment variables @@ -59,7 +58,7 @@ - azcopy 10.27.1 - Bazel 8.0.1 - Bazelisk 1.25.0 -- Bicep 0.32.4 +- Bicep 0.33.13 - Cabal 3.14.1.1 - CMake 3.31.4 - CodeQL Action Bundle 2.20.1 @@ -79,7 +78,7 @@ - Newman 6.2.1 - OpenSSL 3.4.0 - Packer 1.11.2 -- Pulumi 3.146.0 +- Pulumi 3.147.0 - R 4.4.2 - Service Fabric SDK 10.1.2493.9590 - Stack 3.3.1 @@ -91,7 +90,7 @@ - zstd 1.5.6 ### CLI Tools -- AWS CLI 2.23.2 +- AWS CLI 2.23.6 - AWS SAM CLI 1.132.0 - AWS Session Manager CLI 1.2.694.0 - Azure CLI 2.68.0 @@ -109,11 +108,11 @@ - Rustfmt 1.8.0 ### Browsers and Drivers -- Google Chrome 132.0.6834.84 -- Chrome Driver 132.0.6834.83 -- Microsoft Edge 132.0.2957.115 -- Microsoft Edge Driver 132.0.2957.115 -- Mozilla Firefox 134.0.1 +- Google Chrome 132.0.6834.111 +- Chrome Driver 132.0.6834.110 +- Microsoft Edge 132.0.2957.127 +- Microsoft Edge Driver 132.0.2957.127 +- Mozilla Firefox 134.0.2 - Gecko Driver 0.35.0 - IE Driver 4.14.0.0 - Selenium server 4.28.0 @@ -127,12 +126,12 @@ | SELENIUM_JAR_PATH | C:\selenium\selenium-server.jar | ### Java -| Version | Environment Variable | -| -------------------- | -------------------- | -| 8.0.432+6 | JAVA_HOME_8_X64 | -| 11.0.25+9 | JAVA_HOME_11_X64 | -| 17.0.13+11 (default) | JAVA_HOME_17_X64 | -| 21.0.5+11.0 | JAVA_HOME_21_X64 | +| Version | Environment Variable | +| ------------------- | -------------------- | +| 8.0.442+6 | JAVA_HOME_8_X64 | +| 11.0.26+4 | JAVA_HOME_11_X64 | +| 17.0.14+7 (default) | JAVA_HOME_17_X64 | +| 21.0.6+7.0 | JAVA_HOME_21_X64 | ### Shells | Name | Target | @@ -155,13 +154,13 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Go - 1.21.13 -- 1.22.10 -- 1.23.4 +- 1.22.11 +- 1.23.5 #### Node.js -- 18.20.5 -- 20.18.1 -- 22.13.0 +- 18.20.6 +- 20.18.2 +- 22.13.1 #### Python - 3.9.13 @@ -201,7 +200,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Database tools - Azure CosmosDb Emulator 2.14.21.0 - DacFx 162.5.57.1 -- MySQL 8.0.40.0 +- MySQL 8.0.41.0 - SQL OLEDB Driver 18.7.4.0 - SQLPS 1.0 - MongoDB Shell (mongosh) 2.3.8 @@ -478,11 +477,11 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - nbgv 3.7.115+d31f50f4d1 ### PowerShell Tools -- PowerShell 7.4.6 +- PowerShell 7.4.7 #### Powershell Modules - Az: 12.4.0 -- AWSPowershell: 4.1.739 +- AWSPowershell: 4.1.743 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.10 - Microsoft.Graph: 2.25.0 From ed70f8ac465af3ad1cfe9c474ee150998fb8215e Mon Sep 17 00:00:00 2001 From: Lawrence Gripper <lawrencegripper@github.com> Date: Fri, 31 Jan 2025 13:02:49 +0000 Subject: [PATCH 3468/3485] Update .github/workflows/check-pinned-versions.yml --- .github/workflows/check-pinned-versions.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check-pinned-versions.yml b/.github/workflows/check-pinned-versions.yml index 54b6e03cf664..bda0721588d5 100644 --- a/.github/workflows/check-pinned-versions.yml +++ b/.github/workflows/check-pinned-versions.yml @@ -9,7 +9,7 @@ permissions: contents: read jobs: - validate-json: + check-pinning-dates: runs-on: ubuntu-latest steps: - name: Checkout repository From 4c5acc8cdeb1b44576c9219ef929444c29869492 Mon Sep 17 00:00:00 2001 From: Lawrence Gripper <lawrencegripper@github.com> Date: Fri, 31 Jan 2025 13:03:06 +0000 Subject: [PATCH 3469/3485] Update .github/workflows/validate-json-schema.yml --- .github/workflows/validate-json-schema.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/validate-json-schema.yml b/.github/workflows/validate-json-schema.yml index 5e4d71dfc251..dbebc0f29569 100644 --- a/.github/workflows/validate-json-schema.yml +++ b/.github/workflows/validate-json-schema.yml @@ -9,7 +9,7 @@ on: - main jobs: - validate-json: + validate-json-schema: runs-on: ubuntu-latest steps: - name: Checkout repository From 002f86637ac063805833c1794f414a1fc5be903a Mon Sep 17 00:00:00 2001 From: sarathrajsrinivasan <159180023+sarathrajsrinivasan@users.noreply.github.com> Date: Fri, 31 Jan 2025 11:45:21 -0600 Subject: [PATCH 3470/3485] [macOS] Update condition for mono test case (#11515) --- images/macos/scripts/tests/Mono.Tests.ps1 | 92 ++++++++++++----------- 1 file changed, 47 insertions(+), 45 deletions(-) diff --git a/images/macos/scripts/tests/Mono.Tests.ps1 b/images/macos/scripts/tests/Mono.Tests.ps1 index 5d282230687e..9cfa326f4db9 100644 --- a/images/macos/scripts/tests/Mono.Tests.ps1 +++ b/images/macos/scripts/tests/Mono.Tests.ps1 @@ -14,61 +14,63 @@ BeforeAll { } } -Describe "Mono" -Skip:($os.IsSequoia) { - $MONO_VERSIONS_PATH = "/Library/Frameworks/Mono.framework/Versions" - $monoToolsetVersion = @((Get-ToolsetContent).mono.framework.version) - $versionFolderPath = Join-Path $MONO_VERSIONS_PATH ([System.Version]::Parse($monoToolsetVersion).ToString(3)) - $testCase = @{ MonoVersion = $monoToolsetVersion; VersionFolderPath = $versionFolderPath; MonoVersionsPath = $MONO_VERSIONS_PATH } +if ($os.IsVentura -or $os.IsSonoma) { + Describe "Mono" { + $MONO_VERSIONS_PATH = "/Library/Frameworks/Mono.framework/Versions" + $monoToolsetVersion = @((Get-ToolsetContent).mono.framework.version) + $versionFolderPath = Join-Path $MONO_VERSIONS_PATH ([System.Version]::Parse($monoToolsetVersion).ToString(3)) + $testCase = @{ MonoVersion = $monoToolsetVersion; VersionFolderPath = $versionFolderPath; MonoVersionsPath = $MONO_VERSIONS_PATH } - It "is installed" -TestCases $testCase { - param ( [string] $VersionFolderPath ) + It "is installed" -TestCases $testCase { + param ( [string] $VersionFolderPath ) - $monoBinPath = Join-Path $VersionFolderPath "bin" "mono" - $VersionFolderPath | Should -Exist - $monoBinPath | Should -Exist - } + $monoBinPath = Join-Path $VersionFolderPath "bin" "mono" + $VersionFolderPath | Should -Exist + $monoBinPath | Should -Exist + } - It "is available via short link" -TestCases $testCase { - param ( - [string] $MonoVersion, - [string] $MonoVersionsPath, - [string] $VersionFolderPath - ) + It "is available via short link" -TestCases $testCase { + param ( + [string] $MonoVersion, + [string] $MonoVersionsPath, + [string] $VersionFolderPath + ) - $shortSymlink = Get-ShortSymlink $MonoVersion # only 'major.minor' - $shortSymlinkFolderPath = Join-Path $MonoVersionsPath $shortSymlink - if ($shortSymlink -eq "4.8") { return } # Skip this test for Mono 4.8 because it doesn't contain VERSION file - $shortVersionPath = Join-Path $shortSymlinkFolderPath "VERSION" - $fullVersionPath = Join-Path $VersionFolderPath "VERSION" - Confirm-IdenticalFileContent -File1 $shortVersionPath -File2 $fullVersionPath - } + $shortSymlink = Get-ShortSymlink $MonoVersion # only 'major.minor' + $shortSymlinkFolderPath = Join-Path $MonoVersionsPath $shortSymlink + if ($shortSymlink -eq "4.8") { return } # Skip this test for Mono 4.8 because it doesn't contain VERSION file + $shortVersionPath = Join-Path $shortSymlinkFolderPath "VERSION" + $fullVersionPath = Join-Path $VersionFolderPath "VERSION" + Confirm-IdenticalFileContent -File1 $shortVersionPath -File2 $fullVersionPath + } - It "NUnit console is installed" -TestCases $testCase { - param ( [string] $VersionFolderPath ) + It "NUnit console is installed" -TestCases $testCase { + param ( [string] $VersionFolderPath ) - $nunitPath = Join-Path $VersionFolderPath "Commands" "nunit3-console" - $nunitPath | Should -Exist - } + $nunitPath = Join-Path $VersionFolderPath "Commands" "nunit3-console" + $nunitPath | Should -Exist + } - It "Nuget is installed" -TestCases $testCase { - param ( [string] $VersionFolderPath ) + It "Nuget is installed" -TestCases $testCase { + param ( [string] $VersionFolderPath ) - $nugetBinaryPath = Join-Path $VersionFolderPath "lib" "mono" "nuget" "nuget.exe" - $nugetBinaryWrapperPath = Join-Path $VersionFolderPath "bin" "nuget" - $nugetCommandPath = Join-Path $VersionFolderPath "Commands" "nuget" - $nugetBinaryPath | Should -Exist - $nugetCommandPath | Should -Exist - $nugetBinaryWrapperPath | Should -Exist - } + $nugetBinaryPath = Join-Path $VersionFolderPath "lib" "mono" "nuget" "nuget.exe" + $nugetBinaryWrapperPath = Join-Path $VersionFolderPath "bin" "nuget" + $nugetCommandPath = Join-Path $VersionFolderPath "Commands" "nuget" + $nugetBinaryPath | Should -Exist + $nugetCommandPath | Should -Exist + $nugetBinaryWrapperPath | Should -Exist + } - It "Nuget is valid" -TestCases $testCase { - param ( [string] $VersionFolderPath ) + It "Nuget is valid" -TestCases $testCase { + param ( [string] $VersionFolderPath ) - $nugetBinaryWrapperPath = Join-Path $VersionFolderPath "bin" "nuget" - "$nugetBinaryWrapperPath" | Should -ReturnZeroExitCode - } + $nugetBinaryWrapperPath = Join-Path $VersionFolderPath "bin" "nuget" + "$nugetBinaryWrapperPath" | Should -ReturnZeroExitCode + } - It "MSBuild is available" { - "msbuild -version" | Should -ReturnZeroExitCode + It "MSBuild is available" { + "msbuild -version" | Should -ReturnZeroExitCode + } } } From 27c8809a051e95adcbc021b87fc0a5c8cbc66dac Mon Sep 17 00:00:00 2001 From: RaviAkshintala <167848931+RaviAkshintala@users.noreply.github.com> Date: Mon, 3 Feb 2025 20:08:45 +0530 Subject: [PATCH 3471/3485] [Windows] Updated the mongodb signature thumbprint (#11507) Co-authored-by: Ravi Akshintala <raviakshintalagithub.com@Ravis-Laptop.local> --- images/windows/toolsets/toolset-2019.json | 2 +- images/windows/toolsets/toolset-2022.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/images/windows/toolsets/toolset-2019.json b/images/windows/toolsets/toolset-2019.json index d547586c2675..2994939c2fb4 100644 --- a/images/windows/toolsets/toolset-2019.json +++ b/images/windows/toolsets/toolset-2019.json @@ -453,7 +453,7 @@ }, "mongodb": { "version": "5.0", - "signature": "F2D7C28591847BB2CB2B1C2A0C59459FDC728A38" + "signature": "A5BBE2A6DA1D2A6E057EF870267E6A91E4D56BAA" }, "nsis": { "version": "3.10" diff --git a/images/windows/toolsets/toolset-2022.json b/images/windows/toolsets/toolset-2022.json index 6660ef26a941..cd68d0d977d1 100644 --- a/images/windows/toolsets/toolset-2022.json +++ b/images/windows/toolsets/toolset-2022.json @@ -369,7 +369,7 @@ }, "mongodb": { "version": "5.0", - "signature": "F2D7C28591847BB2CB2B1C2A0C59459FDC728A38" + "signature": "A5BBE2A6DA1D2A6E057EF870267E6A91E4D56BAA" }, "nsis": { "version": "3.10" From c4ed0a5c106889c4d3256840b1aa761e16a37da3 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 3 Feb 2025 14:39:41 +0000 Subject: [PATCH 3472/3485] Updating readme file for macos-13 version 20250129.634 (#11503) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/macos/macos-13-Readme.md | 78 ++++++++++++++++----------------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/images/macos/macos-13-Readme.md b/images/macos/macos-13-Readme.md index 0a54e2711943..29022b97c4ee 100644 --- a/images/macos/macos-13-Readme.md +++ b/images/macos/macos-13-Readme.md @@ -1,13 +1,13 @@ | Announcements | |-| +| [[ macOS ] .NET 7.x will be removed from macOS-13 and macOS-14 images on February 24,2025.](https://github.com/actions/runner-images/issues/11501) | +| [macOS 15 (Sequoia) will be generally available in GitHub Actions and Azure DevOps from February, 17](https://github.com/actions/runner-images/issues/11486) | | [[macOS] Ruby version 3.0 will be removed from the images on Feb 10, 2025 and 3.3 will be set as default. ](https://github.com/actions/runner-images/issues/11345) | -| [[macOS] The macOS 12 Actions runner image will begin deprecation on 10/7/24 and will be fully unsupported by 12/3/24 for GitHub and by 01/13/25 for ADO](https://github.com/actions/runner-images/issues/10721) | -| [macOS 15 (Sequoia) is now available as a public beta in GitHub Actions](https://github.com/actions/runner-images/issues/10686) | *** # macOS 13 - OS Version: macOS 13.7.2 (22H313) - Kernel Version: Darwin 22.6.0 -- Image Version: 20250120.597 +- Image Version: 20250129.634 ## Installed Software @@ -22,9 +22,9 @@ - GNU Fortran 12 (Homebrew GCC 12.4.0) - available by `gfortran-12` alias - GNU Fortran 13 (Homebrew GCC 13.3.0) - available by `gfortran-13` alias - GNU Fortran 14 (Homebrew GCC 14.2.0_1) - available by `gfortran-14` alias -- Kotlin 2.1.0-release-394 +- Kotlin 2.1.10-release-473 - Mono 6.12.0.188 -- Node.js 20.18.1 +- Node.js 20.18.2 - Perl 5.40.1 - PHP 8.4.3 - Python3 3.13.1 @@ -34,25 +34,25 @@ - Bundler 2.5.23 - Carthage 0.40.0 - CocoaPods 1.16.2 -- Composer 2.8.4 -- Homebrew 4.4.16 +- Composer 2.8.5 +- Homebrew 4.4.19 - NPM 10.8.2 - NuGet 6.3.1.1 -- Pip3 24.3.1 (python 3.13) +- Pip3 25.0 (python 3.13) - Pipx 1.7.1 - RubyGems 3.5.23 -- Vcpkg 2025 (build from commit cf035d991) +- Vcpkg 2025 (build from commit ab42fb303) - Yarn 1.22.22 ### Project Management - Apache Ant 1.10.15 - Apache Maven 3.9.9 -- Gradle 8.12 +- Gradle 8.12.1 ### Utilities - 7-Zip 17.05 - aria2 1.37.0 -- azcopy 10.27.1 +- azcopy 10.28.0 - bazel 8.0.1 - bazelisk 1.25.0 - bsdtar 3.5.3 - available by 'tar' alias @@ -65,24 +65,24 @@ - gpg (GnuPG) 2.4.7 - jq 1.7.1 - OpenSSL 1.1.1w 11 Sep 2023 -- Packer 1.11.2 +- Packer 1.12.0 - pkgconf 2.3.0 - Unxip 3.1 - yq 4.45.1 - zstd 1.5.6 ### Tools -- AWS CLI 2.23.2 +- AWS CLI 2.23.8 - AWS SAM CLI 1.132.0 - AWS Session Manager CLI 1.2.694.0 - Azure CLI 2.68.0 - Azure CLI (azure-devops) 1.0.1 -- Bicep CLI 0.32.4 -- Cmake 3.31.4 +- Bicep CLI 0.33.13 +- Cmake 3.31.5 - CodeQL Action Bundle 2.20.1 - Fastlane 2.226.0 -- SwiftFormat 0.55.4 -- Xcbeautify 2.17.0 +- SwiftFormat 0.55.5 +- Xcbeautify 2.23.0 - Xcode Command Line Tools 14.3.1.0.1.1683849156 - Xcodes 1.6.0 @@ -90,16 +90,16 @@ - SwiftLint 0.58.2 ### Browsers -- Safari 18.2 (18620.1.16.111.6) -- SafariDriver 18.2 (18620.1.16.111.6) -- Google Chrome 132.0.6834.84 -- Google Chrome for Testing 132.0.6834.83 -- ChromeDriver 132.0.6834.83 -- Microsoft Edge 132.0.2957.115 -- Microsoft Edge WebDriver 132.0.2957.115 -- Mozilla Firefox 134.0.1 +- Safari 18.3 (18620.2.4.111.8) +- SafariDriver 18.3 (18620.2.4.111.8) +- Google Chrome 132.0.6834.160 +- Google Chrome for Testing 132.0.6834.159 +- ChromeDriver 132.0.6834.159 +- Microsoft Edge 132.0.2957.127 +- Microsoft Edge WebDriver 132.0.2957.127 +- Mozilla Firefox 134.0.2 - geckodriver 0.35.0 -- Selenium server 4.27.0 +- Selenium server 4.28.0 #### Environment variables | Name | Value | @@ -109,12 +109,12 @@ | GECKOWEBDRIVER | /usr/local/opt/geckodriver/bin | ### Java -| Version | Environment Variable | -| -------------------- | -------------------- | -| 8.0.432+6 | JAVA_HOME_8_X64 | -| 11.0.25+9 | JAVA_HOME_11_X64 | -| 17.0.13+11 (default) | JAVA_HOME_17_X64 | -| 21.0.5+11.0 | JAVA_HOME_21_X64 | +| Version | Environment Variable | +| ------------------- | -------------------- | +| 8.0.442+6 | JAVA_HOME_8_X64 | +| 11.0.26+4 | JAVA_HOME_11_X64 | +| 17.0.14+7 (default) | JAVA_HOME_17_X64 | +| 21.0.6+7.0 | JAVA_HOME_21_X64 | ### Cached Tools @@ -141,14 +141,14 @@ - 3.13.1 #### Node.js -- 18.20.5 -- 20.18.1 -- 22.13.0 +- 18.20.6 +- 20.18.2 +- 22.13.1 #### Go - 1.21.13 -- 1.22.10 -- 1.23.4 +- 1.22.11 +- 1.23.5 ### Rust Tools - Cargo 1.84.0 @@ -161,7 +161,7 @@ - Rustfmt 1.8.0-stable ### PowerShell Tools -- PowerShell 7.4.6 +- PowerShell 7.4.7 #### PowerShell Modules - Az: 12.4.0 @@ -215,8 +215,8 @@ | visionOS 1.0 | xros1.0 | 15.2 | | Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | -| Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | +| Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | DriverKit 22.1 | driverkit22.1 | 14.1 | | DriverKit 22.2 | driverkit22.2 | 14.2 | | DriverKit 22.4 | driverkit22.4 | 14.3.1 | From d77157a97264b38ec4b862a15a45fdcfe02cdca8 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Wed, 5 Feb 2025 11:05:22 +0100 Subject: [PATCH 3473/3485] [Ubuntu] add Android SDK Platform-Tools (#11539) --- images/ubuntu/scripts/build/install-android-sdk.sh | 3 +++ images/ubuntu/scripts/tests/Android.Tests.ps1 | 1 + 2 files changed, 4 insertions(+) diff --git a/images/ubuntu/scripts/build/install-android-sdk.sh b/images/ubuntu/scripts/build/install-android-sdk.sh index 51c9d814b7d5..b6928f1e2bdc 100644 --- a/images/ubuntu/scripts/build/install-android-sdk.sh +++ b/images/ubuntu/scripts/build/install-android-sdk.sh @@ -110,6 +110,9 @@ available_build_tools=$(echo ${all_build_tools[@]//*rc[0-9]/}) add_filtered_installation_components $minimum_platform_version "${available_platforms[@]}" add_filtered_installation_components $minimum_build_tool_version "${available_build_tools[@]}" +# Add platform tools to the list of components to install +components+=("platform-tools") + # Install components echo "y" | $SDKMANAGER ${components[@]} diff --git a/images/ubuntu/scripts/tests/Android.Tests.ps1 b/images/ubuntu/scripts/tests/Android.Tests.ps1 index ab2ac2c4f196..b7c26e4e6dc0 100644 --- a/images/ubuntu/scripts/tests/Android.Tests.ps1 +++ b/images/ubuntu/scripts/tests/Android.Tests.ps1 @@ -72,6 +72,7 @@ Describe "Android" { $platformsInstalled, $buildTools, $ndkFullVersions, + "platform-tools", ((Get-ToolsetContent).android.extra_list | ForEach-Object { "extras/${_}" }), ((Get-ToolsetContent).android.addon_list | ForEach-Object { "add-ons/${_}" }), ((Get-ToolsetContent).android.additional_tools | ForEach-Object { "${_}" }) From 93cafaffc54571a7c4af8c7cd7c2ab51c062f290 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 5 Feb 2025 10:29:21 +0000 Subject: [PATCH 3474/3485] Updating readme file for ubuntu24 version 20250202.1.1 (#11526) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2404-Readme.md | 50 +++++++++++++++--------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/images/ubuntu/Ubuntu2404-Readme.md b/images/ubuntu/Ubuntu2404-Readme.md index e88f5abe1a07..e9354781ae6a 100644 --- a/images/ubuntu/Ubuntu2404-Readme.md +++ b/images/ubuntu/Ubuntu2404-Readme.md @@ -1,8 +1,8 @@ # Ubuntu 24.04 - OS Version: 24.04.1 LTS - Kernel Version: 6.8.0-1020-azure -- Image Version: 20250126.1.0 -- Systemd version: 255.4-1ubuntu8.4 +- Image Version: 20250202.1.0 +- Systemd version: 255.4-1ubuntu8.5 ## Installed Software @@ -15,7 +15,7 @@ - GNU C++: 12.3.0, 13.3.0, 14.2.0 - GNU Fortran: 12.3.0, 13.3.0, 14.2.0 - Julia 1.11.3 -- Kotlin 2.1.0-release-394 +- Kotlin 2.1.10-release-473 - Node.js 20.18.2 - Perl 5.38.2 - Python 3.12.3 @@ -25,14 +25,14 @@ ### Package Management - cpan 1.64 - Helm 3.17.0 -- Homebrew 4.4.17 +- Homebrew 4.4.19 - Miniconda 24.11.1 - Npm 10.8.2 - Pip 24.0 - Pip3 24.0 - Pipx 1.7.1 - RubyGems 3.4.20 -- Vcpkg (build from commit 57c08a322) +- Vcpkg (build from commit 0ca64b4e1) - Yarn 1.22.22 #### Environment variables @@ -56,11 +56,11 @@ to accomplish this. - Maven 3.9.9 ### Tools -- Ansible 2.18.1 -- AzCopy 10.27.1 - available by `azcopy` and `azcopy10` aliases +- Ansible 2.18.2 +- AzCopy 10.28.0 - available by `azcopy` and `azcopy10` aliases - Bazel 8.0.1 - Bazelisk 1.25.0 -- Bicep 0.33.13 +- Bicep 0.33.93 - Buildah 1.33.7 - CMake 3.31.5 - CodeQL Action Bundle 2.20.1 @@ -88,7 +88,7 @@ to accomplish this. - Packer 1.12.0 - Parcel 2.13.3 - Podman 4.9.3 -- Pulumi 3.147.0 +- Pulumi 3.148.0 - Skopeo 1.13.3 - Sphinx Open Source Search Server 2.2.11 - yamllint 1.35.1 @@ -96,13 +96,13 @@ to accomplish this. - zstd 1.5.6 ### CLI Tools -- AWS CLI 2.23.6 +- AWS CLI 2.23.11 - AWS CLI Session Manager Plugin 1.2.694.0 - AWS SAM CLI 1.132.0 - Azure CLI 2.68.0 - Azure CLI (azure-devops) 1.0.1 -- GitHub CLI 2.65.0 -- Google Cloud CLI 507.0.0 +- GitHub CLI 2.66.1 +- Google Cloud CLI 508.0.0 ### Java | Version | Environment Variable | @@ -127,20 +127,20 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Stack 3.3.1 ### Rust Tools -- Cargo 1.84.0 -- Rust 1.84.0 -- Rustdoc 1.84.0 +- Cargo 1.84.1 +- Rust 1.84.1 +- Rustdoc 1.84.1 - Rustup 1.27.1 #### Packages - Rustfmt 1.8.0 ### Browsers and Drivers -- Google Chrome 132.0.6834.110 -- ChromeDriver 132.0.6834.110 +- Google Chrome 132.0.6834.159 +- ChromeDriver 132.0.6834.159 - Chromium 132.0.6834.0 -- Microsoft Edge 132.0.2957.127 -- Microsoft Edge WebDriver 132.0.2957.127 +- Microsoft Edge 132.0.2957.140 +- Microsoft Edge WebDriver 132.0.2957.140 - Selenium server 4.28.1 - Mozilla Firefox 134.0.2 - Geckodriver 0.35.0 @@ -169,7 +169,7 @@ Use the following command as a part of your job to start the service: 'sudo syst ``` #### MySQL -- MySQL 8.0.40-0ubuntu0.24.04.1 +- MySQL 8.0.41-0ubuntu0.24.04.1 ``` User: root Password: root @@ -254,7 +254,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | coreutils | 9.4-3ubuntu6 | | curl | 8.5.0-2ubuntu10.6 | | dbus | 1.14.10-4ubuntu4.1 | -| dnsutils | 1:9.18.30-0ubuntu0.24.04.1 | +| dnsutils | 1:9.18.30-0ubuntu0.24.04.2 | | dpkg | 1.22.6ubuntu6.1 | | dpkg-dev | 1.22.6ubuntu6.1 | | fakeroot | 1.33-1 | @@ -270,7 +270,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | iproute2 | 6.1.0-1ubuntu6 | | iputils-ping | 3:20240117-1build1 | | jq | 1.7.1-3build1 | -| libsqlite3-dev | 3.45.1-1ubuntu2 | +| libsqlite3-dev | 3.45.1-1ubuntu2.1 | | libssl-dev | 3.0.13-0ubuntu3.4 | | libtool | 2.4.7-7build1 | | libyaml-dev | 0.2.5-1build1 | @@ -295,19 +295,19 @@ Use the following command as a part of your job to start the service: 'sudo syst | rsync | 3.2.7-1ubuntu1.2 | | shellcheck | 0.9.0-1 | | sphinxsearch | 2.2.11-8build1 | -| sqlite3 | 3.45.1-1ubuntu2 | +| sqlite3 | 3.45.1-1ubuntu2.1 | | ssh | 1:9.6p1-3ubuntu13.5 | | sshpass | 1.09-1 | | sudo | 1.9.15p5-3ubuntu5 | | swig | 4.2.0-2ubuntu1 | -| systemd-coredump | 255.4-1ubuntu8.4 | +| systemd-coredump | 255.4-1ubuntu8.5 | | tar | 1.35+dfsg-3build1 | | telnet | 0.17+2.5-3ubuntu4 | | texinfo | 7.1-3build2 | | time | 1.9-0.2build1 | | tk | 8.6.14build1 | | tree | 2.1.1-2ubuntu3 | -| tzdata | 2024a-3ubuntu1.1 | +| tzdata | 2024b-0ubuntu0.24.04 | | unzip | 6.0-28ubuntu4.1 | | upx | 4.2.2-3 | | wget | 1.21.4-1ubuntu4.1 | From bd86538e4e7f7928d94ba41a8f33a5d722e2eaed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20B=C3=BChler?= <59952941+lukasbbuehler@users.noreply.github.com> Date: Wed, 5 Feb 2025 16:37:37 +0100 Subject: [PATCH 3475/3485] hkps over port 443 instead of 11371 to resolve issue https://github.com/actions/runner-images/discussions/9963 (#10007) * Change to use port 80 instead of 11371 Change to use port 80 instead of 11371 * Update install-swift.sh Changed to hkps and port 443 for added security * Fix merge conflicts --- images/ubuntu/scripts/build/install-swift.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/images/ubuntu/scripts/build/install-swift.sh b/images/ubuntu/scripts/build/install-swift.sh index 8627106c3cf4..ffd53fc73e54 100644 --- a/images/ubuntu/scripts/build/install-swift.sh +++ b/images/ubuntu/scripts/build/install-swift.sh @@ -18,7 +18,7 @@ archive_path=$(download_with_retry "$archive_url") # Verifying PGP signature using official Swift PGP key. Referring to https://www.swift.org/install/linux/#Installation-via-Tarball # Download and import Swift PGP keys -gpg --keyserver hkp://keyserver.ubuntu.com \ +gpg --keyserver hkps://keyserver.ubuntu.com:443 \ --recv-keys \ '7463 A81A 4B2E EA1B 551F FBCF D441 C977 412B 37AD' \ '1BE1 E29A 084C B305 F397 D62A 9F59 7F4D 21A5 6D5F' \ @@ -29,7 +29,8 @@ gpg --keyserver hkp://keyserver.ubuntu.com \ '8A74 9566 2C3C D4AE 18D9 5637 FAF6 989E 1BC1 6FEA' \ 'E813 C892 820A 6FA1 3755 B268 F167 DF1A CF9C E069' \ '52BB 7E3D E28A 71BE 22EC 05FF EF80 A866 B47A 981F' -gpg --keyserver hkp://keyserver.ubuntu.com --refresh-keys Swift + +gpg --keyserver hkps://keyserver.ubuntu.com:443 --refresh-keys Swift # Download and verify signature signature_path=$(download_with_retry "${archive_url}.sig") From 36052802e5eb9743cc2080ab0c919c13019fcb50 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 6 Feb 2025 04:28:21 +0000 Subject: [PATCH 3476/3485] Updating readme file for ubuntu20 version 20250202.1.1 (#11532) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2004-Readme.md | 46 +++++++++++++++--------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/images/ubuntu/Ubuntu2004-Readme.md b/images/ubuntu/Ubuntu2004-Readme.md index 4f13e934eace..e11a09c50184 100644 --- a/images/ubuntu/Ubuntu2004-Readme.md +++ b/images/ubuntu/Ubuntu2004-Readme.md @@ -1,7 +1,7 @@ # Ubuntu 20.04 - OS Version: 20.04.6 LTS - Kernel Version: 5.15.0-1078-azure -- Image Version: 20250126.1.0 +- Image Version: 20250202.1.0 - Systemd version: 245.4-4ubuntu3.24 ## Installed Software @@ -17,7 +17,7 @@ - GNU C++: 10.5.0 - GNU Fortran: 10.5.0 - Julia 1.11.3 -- Kotlin 2.1.0-release-394 +- Kotlin 2.1.10-release-473 - Mono 6.12.0.200 - MSBuild 16.10.1.31701 (Mono 6.12.0.200) - Node.js 18.20.6 @@ -29,7 +29,7 @@ ### Package Management - cpan 1.64 - Helm 3.17.0 -- Homebrew 4.4.17 +- Homebrew 4.4.19 - Miniconda 24.11.1 - Npm 10.8.2 - NuGet 6.6.1.2 @@ -37,7 +37,7 @@ - Pip3 20.0.2 - Pipx 1.7.1 - RubyGems 3.1.2 -- Vcpkg (build from commit 57c08a322) +- Vcpkg (build from commit 0ca64b4e1) - Yarn 1.22.22 #### Environment variables @@ -64,10 +64,10 @@ to accomplish this. ### Tools - Ansible 2.13.13 - apt-fast 1.10.0 -- AzCopy 10.27.1 - available by `azcopy` and `azcopy10` aliases +- AzCopy 10.28.0 - available by `azcopy` and `azcopy10` aliases - Bazel 8.0.1 - Bazelisk 1.25.0 -- Bicep 0.33.13 +- Bicep 0.33.93 - Buildah 1.22.3 - CMake 3.31.5 - CodeQL Action Bundle 2.20.1 @@ -99,7 +99,7 @@ to accomplish this. - Parcel 2.13.3 - PhantomJS 2.1.1 2.1.1 - Podman 3.4.2 -- Pulumi 3.147.0 +- Pulumi 3.148.0 - R 4.4.2 - Skopeo 1.5.0 - Sphinx Open Source Search Server 2.2.11 @@ -111,17 +111,17 @@ to accomplish this. ### CLI Tools - Alibaba Cloud CLI 3.0.174 -- AWS CLI 2.23.6 +- AWS CLI 2.23.11 - AWS CLI Session Manager Plugin 1.2.694.0 - AWS SAM CLI 1.132.0 - Azure CLI 2.68.0 - Azure CLI (azure-devops) 1.0.1 -- GitHub CLI 2.65.0 -- Google Cloud CLI 507.0.0 -- Netlify CLI 18.0.2 +- GitHub CLI 2.66.1 +- Google Cloud CLI 508.0.0 +- Netlify CLI 18.0.3 - OpenShift CLI 4.15.19 - ORAS CLI 1.2.2 -- Vercel CLI 39.3.0 +- Vercel CLI 40.1.0 ### Java | Version | Environment Variable | @@ -146,9 +146,9 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Stack 3.3.1 ### Rust Tools -- Cargo 1.84.0 -- Rust 1.84.0 -- Rustdoc 1.84.0 +- Cargo 1.84.1 +- Rust 1.84.1 +- Rustdoc 1.84.1 - Rustup 1.27.1 #### Packages @@ -160,11 +160,11 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.8.0 ### Browsers and Drivers -- Google Chrome 132.0.6834.110 -- ChromeDriver 132.0.6834.110 +- Google Chrome 132.0.6834.159 +- ChromeDriver 132.0.6834.159 - Chromium 132.0.6834.0 -- Microsoft Edge 132.0.2957.127 -- Microsoft Edge WebDriver 132.0.2957.127 +- Microsoft Edge 132.0.2957.140 +- Microsoft Edge WebDriver 132.0.2957.140 - Selenium server 4.28.1 - Mozilla Firefox 134.0.2 - Geckodriver 0.35.0 @@ -182,7 +182,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - nbgv 3.7.115+d31f50f4d1 ### Databases -- MongoDB 5.0.30 +- MongoDB 5.0.31 - sqlite3 3.31.1 #### PostgreSQL @@ -194,7 +194,7 @@ Use the following command as a part of your job to start the service: 'sudo syst ``` #### MySQL -- MySQL 8.0.40-0ubuntu0.20.04.1 +- MySQL 8.0.41-0ubuntu0.20.04.1 ``` User: root Password: root @@ -312,7 +312,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | coreutils | 8.30-3ubuntu2 | | curl | 7.68.0-1ubuntu2.25 | | dbus | 1.12.16-2ubuntu2.3 | -| dnsutils | 1:9.18.30-0ubuntu0.20.04.1 | +| dnsutils | 1:9.18.30-0ubuntu0.20.04.2 | | dpkg | 1.19.7ubuntu3.2 | | dpkg-dev | 1.19.7ubuntu3.2 | | fakeroot | 1.24-1 | @@ -381,7 +381,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | texinfo | 6.7.0.dfsg.2-5 | | time | 1.7-25.1build1 | | tk | 8.6.9+1 | -| tzdata | 2024a-0ubuntu0.20.04.1 | +| tzdata | 2024b-0ubuntu0.20.04 | | unzip | 6.0-25ubuntu1.2 | | upx | 3.95-2build1 | | wget | 1.20.3-1ubuntu2.1 | From 43d2c65c7b36ae894610468b33c238c495c8aebe Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 6 Feb 2025 05:25:06 +0000 Subject: [PATCH 3477/3485] Updating readme file for ubuntu22 version 20250202.1.1 (#11527) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/ubuntu/Ubuntu2204-Readme.md | 48 +++++++++++++++--------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/images/ubuntu/Ubuntu2204-Readme.md b/images/ubuntu/Ubuntu2204-Readme.md index 38d46832127e..1dc48e7b9ac0 100644 --- a/images/ubuntu/Ubuntu2204-Readme.md +++ b/images/ubuntu/Ubuntu2204-Readme.md @@ -1,7 +1,7 @@ # Ubuntu 22.04 - OS Version: 22.04.5 LTS - Kernel Version: 6.5.0-1025-azure -- Image Version: 20250126.1.0 +- Image Version: 20250202.1.0 - Systemd version: 249.11-0ubuntu3.12 ## Installed Software @@ -15,7 +15,7 @@ - GNU C++: 10.5.0, 11.4.0, 12.3.0 - GNU Fortran: 10.5.0, 11.4.0, 12.3.0 - Julia 1.11.3 -- Kotlin 2.1.0-release-394 +- Kotlin 2.1.10-release-473 - Mono 6.12.0.200 - MSBuild 16.10.1.31701 (Mono 6.12.0.200) - Node.js 18.20.6 @@ -27,7 +27,7 @@ ### Package Management - cpan 1.64 - Helm 3.17.0 -- Homebrew 4.4.17 +- Homebrew 4.4.19 - Miniconda 24.11.1 - Npm 10.8.2 - NuGet 6.6.1.2 @@ -35,7 +35,7 @@ - Pip3 22.0.2 - Pipx 1.7.1 - RubyGems 3.3.5 -- Vcpkg (build from commit 57c08a322) +- Vcpkg (build from commit 0ca64b4e1) - Yarn 1.22.22 #### Environment variables @@ -60,12 +60,12 @@ to accomplish this. - Sbt 1.10.7 ### Tools -- Ansible 2.17.7 +- Ansible 2.17.8 - apt-fast 1.10.0 -- AzCopy 10.27.1 - available by `azcopy` and `azcopy10` aliases +- AzCopy 10.28.0 - available by `azcopy` and `azcopy10` aliases - Bazel 8.0.1 - Bazelisk 1.25.0 -- Bicep 0.33.13 +- Bicep 0.33.93 - Buildah 1.23.1 - CMake 3.31.5 - CodeQL Action Bundle 2.20.1 @@ -95,7 +95,7 @@ to accomplish this. - Packer 1.12.0 - Parcel 2.13.3 - Podman 3.4.4 -- Pulumi 3.147.0 +- Pulumi 3.148.0 - R 4.4.2 - Skopeo 1.4.1 - Sphinx Open Source Search Server 2.2.11 @@ -107,17 +107,17 @@ to accomplish this. ### CLI Tools - Alibaba Cloud CLI 3.0.250 -- AWS CLI 2.23.6 +- AWS CLI 2.23.11 - AWS CLI Session Manager Plugin 1.2.694.0 - AWS SAM CLI 1.132.0 - Azure CLI 2.68.0 - Azure CLI (azure-devops) 1.0.1 -- GitHub CLI 2.65.0 -- Google Cloud CLI 507.0.0 -- Netlify CLI 18.0.2 -- OpenShift CLI 4.17.12 +- GitHub CLI 2.66.1 +- Google Cloud CLI 508.0.0 +- Netlify CLI 18.0.3 +- OpenShift CLI 4.17.14 - ORAS CLI 1.2.2 -- Vercel CLI 39.3.0 +- Vercel CLI 40.1.0 ### Java | Version | Environment Variable | @@ -142,9 +142,9 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Stack 3.3.1 ### Rust Tools -- Cargo 1.84.0 -- Rust 1.84.0 -- Rustdoc 1.84.0 +- Cargo 1.84.1 +- Rust 1.84.1 +- Rustdoc 1.84.1 - Rustup 1.27.1 #### Packages @@ -156,11 +156,11 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled. - Rustfmt 1.8.0 ### Browsers and Drivers -- Google Chrome 132.0.6834.110 -- ChromeDriver 132.0.6834.110 +- Google Chrome 132.0.6834.159 +- ChromeDriver 132.0.6834.159 - Chromium 132.0.6834.0 -- Microsoft Edge 132.0.2957.127 -- Microsoft Edge WebDriver 132.0.2957.127 +- Microsoft Edge 132.0.2957.140 +- Microsoft Edge WebDriver 132.0.2957.140 - Selenium server 4.28.1 - Mozilla Firefox 134.0.2 - Geckodriver 0.35.0 @@ -189,7 +189,7 @@ Use the following command as a part of your job to start the service: 'sudo syst ``` #### MySQL -- MySQL 8.0.40-0ubuntu0.22.04.1 +- MySQL 8.0.41-0ubuntu0.22.04.1 ``` User: root Password: root @@ -303,7 +303,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | coreutils | 8.32-4.1ubuntu1.2 | | curl | 7.81.0-1ubuntu1.20 | | dbus | 1.12.20-2ubuntu4.1 | -| dnsutils | 1:9.18.30-0ubuntu0.22.04.1 | +| dnsutils | 1:9.18.30-0ubuntu0.22.04.2 | | dpkg | 1.21.1ubuntu2.3 | | dpkg-dev | 1.21.1ubuntu2.3 | | fakeroot | 1.28-1ubuntu1 | @@ -374,7 +374,7 @@ Use the following command as a part of your job to start the service: 'sudo syst | texinfo | 6.8-4build1 | | time | 1.9-0.1build2 | | tk | 8.6.11+1build2 | -| tzdata | 2024a-0ubuntu0.22.04.1 | +| tzdata | 2024b-0ubuntu0.22.04 | | unzip | 6.0-26ubuntu3.2 | | upx | 3.96-3 | | wget | 1.21.2-2ubuntu1.1 | From 8aef0e3a45a172db37ac3f51737bfa1403013a66 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 6 Feb 2025 10:40:34 +0000 Subject: [PATCH 3478/3485] Updating readme file for win19 version 20250203.1.1 (#11537) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/windows/Windows2019-Readme.md | 38 ++++++++++++++-------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/images/windows/Windows2019-Readme.md b/images/windows/Windows2019-Readme.md index f59aafd6bb67..ce59809472db 100644 --- a/images/windows/Windows2019-Readme.md +++ b/images/windows/Windows2019-Readme.md @@ -1,13 +1,13 @@ | Announcements | |-| -| [[Windows] Removal of Azure and Azure Powershell module from windows images from Febraury 14](https://github.com/actions/runner-images/issues/11483) | -| [[Windows ] Breaking change : PHP 8.3.* version will be updated to PHP 8.4.* from January 31,2025](https://github.com/actions/runner-images/issues/11256) | +| [[Windows] Removal of Azure and Azure Powershell module from windows images from 14-02-2025](https://github.com/actions/runner-images/issues/11483) | +| [[Windows ] Breaking change : PHP 8.3.* version will be updated to PHP 8.4.* from 2025-01-31](https://github.com/actions/runner-images/issues/11256) | | [Windows Server 2025 is now available](https://github.com/actions/runner-images/issues/11228) | | [[Windows] Breaking change : Docker Engine Version 26.* will be updated to Docker Engine Version 27.* from February 07,2025](https://github.com/actions/runner-images/issues/11104) | *** # Windows Server 2019 - OS Version: 10.0.17763 Build 6775 -- Image Version: 20250127.1.0 +- Image Version: 20250203.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -27,7 +27,7 @@ - Ruby 3.0.7p220 ### Package Management -- Chocolatey 2.4.1 +- Chocolatey 2.4.2 - Composer 2.8.5 - Helm 3.16.4 - Miniconda 24.11.1 (pre-installed on the image but not added to PATH) @@ -36,7 +36,7 @@ - pip 25.0 (python 3.9) - Pipx 1.7.1 - RubyGems 3.2.33 -- Vcpkg (build from commit f3a67b0c4) +- Vcpkg (build from commit 0ca64b4e1) - Yarn 1.22.22 #### Environment variables @@ -54,12 +54,12 @@ ### Tools - 7zip 24.09 - aria2 1.37.0 -- azcopy 10.27.1 +- azcopy 10.28.0 - Bazel 8.0.1 - Bazelisk 1.25.0 - Bicep 0.33.13 - Cabal 3.14.1.1 -- CMake 3.31.4 +- CMake 3.31.5 - CodeQL Action Bundle 2.20.1 - Docker 26.1.3 - Docker Compose v2 2.27.1 @@ -67,7 +67,7 @@ - ghc 9.12.1 - Git 2.47.1.windows.2 - Git LFS 3.6.1 -- Google Cloud CLI 507.0.0 +- Google Cloud CLI 508.0.0 - ImageMagick 7.1.1-43 - InnoSetup 6.4.0 - jq 1.7.1 @@ -82,7 +82,7 @@ - OpenSSL 1.1.1w - Packer 1.11.2 - Parcel 2.13.3 -- Pulumi 3.147.0 +- Pulumi 3.148.0 - R 4.4.2 - Service Fabric SDK 9.1.1436.9590 - Stack 3.3.1 @@ -96,18 +96,18 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.250 -- AWS CLI 2.23.6 +- AWS CLI 2.23.11 - AWS SAM CLI 1.132.0 - AWS Session Manager CLI 1.2.694.0 - Azure CLI 2.68.0 - Azure DevOps CLI extension 1.0.1 - Cloud Foundry CLI 8.9.0 -- GitHub CLI 2.65.0 +- GitHub CLI 2.66.1 ### Rust Tools -- Cargo 1.84.0 -- Rust 1.84.0 -- Rustdoc 1.84.0 +- Cargo 1.84.1 +- Rust 1.84.1 +- Rustdoc 1.84.1 - Rustup 1.27.1 #### Packages @@ -119,10 +119,10 @@ - Rustfmt 1.8.0 ### Browsers and Drivers -- Google Chrome 132.0.6834.111 -- Chrome Driver 132.0.6834.110 +- Google Chrome 132.0.6834.160 +- Chrome Driver 132.0.6834.159 - Microsoft Edge 132.0.2957.127 -- Microsoft Edge Driver 132.0.2957.127 +- Microsoft Edge Driver 132.0.2957.140 - Mozilla Firefox 134.0.2 - Gecko Driver 0.35.0 - IE Driver 4.14.0.0 @@ -217,7 +217,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### MongoDB | Version | ServiceName | ServiceStatus | ServiceStartType | | -------- | ----------- | ------------- | ---------------- | -| 5.0.30.0 | MongoDB | Stopped | Disabled | +| 5.0.31.0 | MongoDB | Stopped | Disabled | ### Database tools - Azure CosmosDb Emulator 2.14.21.0 @@ -513,7 +513,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - AzureRM: 6.13.1 - Azure (Cached): 5.1.1.zip - AzureRM (Cached): 6.7.0.zip -- AWSPowershell: 4.1.743 +- AWSPowershell: 4.1.748 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.10 - Microsoft.Graph: 2.25.0 From d632cabc1911ba5e46905953db1c27e18516f582 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 6 Feb 2025 10:50:58 +0000 Subject: [PATCH 3479/3485] Updating readme file for win25 version 20250203.1.1 (#11538) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/windows/Windows2025-Readme.md | 34 ++++++++++++++-------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/images/windows/Windows2025-Readme.md b/images/windows/Windows2025-Readme.md index 9474081e3f75..c2006abf2a8f 100644 --- a/images/windows/Windows2025-Readme.md +++ b/images/windows/Windows2025-Readme.md @@ -1,13 +1,13 @@ | Announcements | |-| -| [[Windows] Removal of Azure and Azure Powershell module from windows images from Febraury 14](https://github.com/actions/runner-images/issues/11483) | -| [[Windows ] Breaking change : PHP 8.3.* version will be updated to PHP 8.4.* from January 31,2025](https://github.com/actions/runner-images/issues/11256) | +| [[Windows] Removal of Azure and Azure Powershell module from windows images from 14-02-2025](https://github.com/actions/runner-images/issues/11483) | +| [[Windows ] Breaking change : PHP 8.3.* version will be updated to PHP 8.4.* from 2025-01-31](https://github.com/actions/runner-images/issues/11256) | | [Windows Server 2025 is now available](https://github.com/actions/runner-images/issues/11228) | | [[Windows] Breaking change : Docker Engine Version 26.* will be updated to Docker Engine Version 27.* from February 07,2025](https://github.com/actions/runner-images/issues/11104) | *** # Windows Server 2025 - OS Version: 10.0.26100 Build 2894 -- Image Version: 20250127.1.0 +- Image Version: 20250203.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -28,7 +28,7 @@ - Ruby 3.3.7 ### Package Management -- Chocolatey 2.4.1 +- Chocolatey 2.4.2 - Composer 2.8.5 - Helm 3.16.4 - Miniconda 24.11.1 (pre-installed on the image but not added to PATH) @@ -37,7 +37,7 @@ - pip 25.0 (python 3.9) - Pipx 1.7.1 - RubyGems 3.5.22 -- Vcpkg (build from commit f3a67b0c4) +- Vcpkg (build from commit 0ca64b4e1) - Yarn 1.22.22 #### Environment variables @@ -55,12 +55,12 @@ ### Tools - 7zip 24.09 - aria2 1.37.0 -- azcopy 10.27.1 +- azcopy 10.28.0 - Bazel 8.0.1 - Bazelisk 1.25.0 - Bicep 0.33.13 - Cabal 3.14.1.1 -- CMake 3.31.4 +- CMake 3.31.5 - CodeQL Action Bundle 2.20.1 - Docker 26.1.3 - Docker Compose v2 2.27.1 @@ -78,7 +78,7 @@ - Newman 6.2.1 - OpenSSL 3.4.0 - Packer 1.11.2 -- Pulumi 3.147.0 +- Pulumi 3.148.0 - R 4.4.2 - Service Fabric SDK 10.1.2493.9590 - Stack 3.3.1 @@ -90,17 +90,17 @@ - zstd 1.5.6 ### CLI Tools -- AWS CLI 2.23.6 +- AWS CLI 2.23.11 - AWS SAM CLI 1.132.0 - AWS Session Manager CLI 1.2.694.0 - Azure CLI 2.68.0 - Azure DevOps CLI extension 1.0.1 -- GitHub CLI 2.65.0 +- GitHub CLI 2.66.1 ### Rust Tools -- Cargo 1.84.0 -- Rust 1.84.0 -- Rustdoc 1.84.0 +- Cargo 1.84.1 +- Rust 1.84.1 +- Rustdoc 1.84.1 - Rustup 1.27.1 #### Packages @@ -108,10 +108,10 @@ - Rustfmt 1.8.0 ### Browsers and Drivers -- Google Chrome 132.0.6834.111 -- Chrome Driver 132.0.6834.110 +- Google Chrome 132.0.6834.160 +- Chrome Driver 132.0.6834.159 - Microsoft Edge 132.0.2957.127 -- Microsoft Edge Driver 132.0.2957.127 +- Microsoft Edge Driver 132.0.2957.140 - Mozilla Firefox 134.0.2 - Gecko Driver 0.35.0 - IE Driver 4.14.0.0 @@ -481,7 +481,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### Powershell Modules - Az: 12.4.0 -- AWSPowershell: 4.1.743 +- AWSPowershell: 4.1.748 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.10 - Microsoft.Graph: 2.25.0 From b55bfdd989b852bcf86cbc283459b89128c2fe3e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 6 Feb 2025 13:37:48 +0000 Subject: [PATCH 3480/3485] Updating readme file for win22 version 20250203.1.1 (#11536) Co-authored-by: Image generation service account. <no-reply@microsoft.com> Co-authored-by: Actions service account <no-reply@github.com> --- images/windows/Windows2022-Readme.md | 38 ++++++++++++++-------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/images/windows/Windows2022-Readme.md b/images/windows/Windows2022-Readme.md index 069f2c8d6148..c39c8050b7be 100644 --- a/images/windows/Windows2022-Readme.md +++ b/images/windows/Windows2022-Readme.md @@ -1,13 +1,13 @@ | Announcements | |-| -| [[Windows] Removal of Azure and Azure Powershell module from windows images from Febraury 14](https://github.com/actions/runner-images/issues/11483) | -| [[Windows ] Breaking change : PHP 8.3.* version will be updated to PHP 8.4.* from January 31,2025](https://github.com/actions/runner-images/issues/11256) | +| [[Windows] Removal of Azure and Azure Powershell module from windows images from 14-02-2025](https://github.com/actions/runner-images/issues/11483) | +| [[Windows ] Breaking change : PHP 8.3.* version will be updated to PHP 8.4.* from 2025-01-31](https://github.com/actions/runner-images/issues/11256) | | [Windows Server 2025 is now available](https://github.com/actions/runner-images/issues/11228) | | [[Windows] Breaking change : Docker Engine Version 26.* will be updated to Docker Engine Version 27.* from February 07,2025](https://github.com/actions/runner-images/issues/11104) | *** # Windows Server 2022 - OS Version: 10.0.20348 Build 3091 -- Image Version: 20250127.1.0 +- Image Version: 20250203.1.0 ## Windows features - Windows Subsystem for Linux (WSLv1): Enabled @@ -27,7 +27,7 @@ - Ruby 3.0.7p220 ### Package Management -- Chocolatey 2.4.1 +- Chocolatey 2.4.2 - Composer 2.8.5 - Helm 3.16.4 - Miniconda 24.11.1 (pre-installed on the image but not added to PATH) @@ -36,7 +36,7 @@ - pip 25.0 (python 3.9) - Pipx 1.7.1 - RubyGems 3.2.33 -- Vcpkg (build from commit f3a67b0c4) +- Vcpkg (build from commit 0ca64b4e1) - Yarn 1.22.22 #### Environment variables @@ -54,12 +54,12 @@ ### Tools - 7zip 24.09 - aria2 1.37.0 -- azcopy 10.27.1 +- azcopy 10.28.0 - Bazel 8.0.1 - Bazelisk 1.25.0 - Bicep 0.33.13 - Cabal 3.14.1.1 -- CMake 3.31.4 +- CMake 3.31.5 - CodeQL Action Bundle 2.20.1 - Docker 26.1.3 - Docker Compose v2 2.27.1 @@ -80,7 +80,7 @@ - NSIS 3.10 - OpenSSL 1.1.1w - Packer 1.11.2 -- Pulumi 3.147.0 +- Pulumi 3.148.0 - R 4.4.2 - Service Fabric SDK 9.1.1436.9590 - Stack 3.3.1 @@ -94,17 +94,17 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.250 -- AWS CLI 2.23.6 +- AWS CLI 2.23.11 - AWS SAM CLI 1.132.0 - AWS Session Manager CLI 1.2.694.0 - Azure CLI 2.68.0 - Azure DevOps CLI extension 1.0.1 -- GitHub CLI 2.65.0 +- GitHub CLI 2.66.1 ### Rust Tools -- Cargo 1.84.0 -- Rust 1.84.0 -- Rustdoc 1.84.0 +- Cargo 1.84.1 +- Rust 1.84.1 +- Rustdoc 1.84.1 - Rustup 1.27.1 #### Packages @@ -116,10 +116,10 @@ - Rustfmt 1.8.0 ### Browsers and Drivers -- Google Chrome 132.0.6834.111 -- Chrome Driver 132.0.6834.110 -- Microsoft Edge 132.0.2957.127 -- Microsoft Edge Driver 132.0.2957.127 +- Google Chrome 132.0.6834.160 +- Chrome Driver 132.0.6834.159 +- Microsoft Edge 132.0.2957.140 +- Microsoft Edge Driver 132.0.2957.140 - Mozilla Firefox 134.0.2 - Gecko Driver 0.35.0 - IE Driver 4.14.0.0 @@ -210,7 +210,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### MongoDB | Version | ServiceName | ServiceStatus | ServiceStartType | | -------- | ----------- | ------------- | ---------------- | -| 5.0.30.0 | MongoDB | Stopped | Disabled | +| 5.0.31.0 | MongoDB | Stopped | Disabled | ### Database tools - Azure CosmosDb Emulator 2.14.21.0 @@ -511,7 +511,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - AzureRM: 6.13.1 - Azure (Cached): 5.1.1.zip - AzureRM (Cached): 6.7.0.zip -- AWSPowershell: 4.1.743 +- AWSPowershell: 4.1.748 - DockerMsftProvider: 1.0.0.8 - MarkdownPS: 1.10 - Microsoft.Graph: 2.25.0 From 7454a5b88af742471d903284de902797707ac29c Mon Sep 17 00:00:00 2001 From: Prabhatkumar59 <167855894+Prabhatkumar59@users.noreply.github.com> Date: Thu, 6 Feb 2025 21:17:02 +0530 Subject: [PATCH 3481/3485] [Ubuntu24] adding libicu package version 70 (#11547) Co-authored-by: Prabhat kumar <prabhatkumar59@Prabhats-Laptop.local> --- images/ubuntu/scripts/build/configure-dpkg.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/images/ubuntu/scripts/build/configure-dpkg.sh b/images/ubuntu/scripts/build/configure-dpkg.sh index 2c523721187c..39eaf4647fed 100644 --- a/images/ubuntu/scripts/build/configure-dpkg.sh +++ b/images/ubuntu/scripts/build/configure-dpkg.sh @@ -6,7 +6,7 @@ # Source the helpers for use with the script source $HELPER_SCRIPTS/etc-environment.sh - +source $HELPER_SCRIPTS/os.sh # This is the anti-frontend. It never interacts with you at all, # and makes the default answers be used for all questions. It # might mail error messages to root, but that's it; otherwise it @@ -30,3 +30,9 @@ cat <<EOF >> /etc/apt/apt.conf.d/10apt-autoremove APT::Get::AutomaticRemove "0"; APT::Get::HideAutoRemove "1"; EOF + +# Install libicu70 package for Ubuntu 24 +if is_ubuntu24 ; then + wget http://archive.ubuntu.com/ubuntu/pool/main/i/icu/libicu70_70.1-2_amd64.deb + sudo apt-get install -y ./libicu70_70.1-2_amd64.deb +fi From 2578e48fe665d101042e90898e4bcee978e448ff Mon Sep 17 00:00:00 2001 From: Fahrzin Hemmati <fahhem@users.noreply.github.com> Date: Thu, 6 Feb 2025 08:21:43 -0800 Subject: [PATCH 3482/3485] [ubuntu] Don't install documentation for ruby gems (#11413) --- images/ubuntu/scripts/build/install-ruby.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/ubuntu/scripts/build/install-ruby.sh b/images/ubuntu/scripts/build/install-ruby.sh index a2afcf0c35ce..3bef0ec71861 100644 --- a/images/ubuntu/scripts/build/install-ruby.sh +++ b/images/ubuntu/scripts/build/install-ruby.sh @@ -20,7 +20,7 @@ gems_to_install=$(get_toolset_value ".rubygems[] .name") if [[ -n "$gems_to_install" ]]; then for gem in $gems_to_install; do echo "Installing gem $gem" - gem install $gem + gem install --no-document $gem done fi From 650fb260cb8ba21ccccaff47470d3f43c94fbb3e Mon Sep 17 00:00:00 2001 From: hemanthmanga <166606741+hemanthmanga@users.noreply.github.com> Date: Thu, 6 Feb 2025 16:24:52 +0000 Subject: [PATCH 3483/3485] Updating latest WSL2 checksum (#11550) --- images/windows/scripts/build/Install-WSL2.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/windows/scripts/build/Install-WSL2.ps1 b/images/windows/scripts/build/Install-WSL2.ps1 index 4134b2afd134..22f74ed763ef 100644 --- a/images/windows/scripts/build/Install-WSL2.ps1 +++ b/images/windows/scripts/build/Install-WSL2.ps1 @@ -8,7 +8,7 @@ $downloadUrl = Resolve-GithubReleaseAssetUrl ` Install-Binary -Type MSI ` -Url $downloadUrl ` - -ExpectedSHA256Sum "CD3F2A68A1A5836F6A1CC9965A7F5F54DB267CA221EAA87DF29345AB7957AEC4" + -ExpectedSHA256Sum "5A1EAD8E553ABBFB4DBB8291A329F3CA859DB2B8D887849F3F8CD19F7FABEF21" Write-Host "Performing wsl --install --no-distribution" wsl.exe --install --no-distribution From 7d57cd009f879836e38850faa0b50e3eb93fb940 Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Fri, 7 Feb 2025 11:09:06 +0100 Subject: [PATCH 3484/3485] [windows] Fix .Net 8 SDK installation (#11555) --- .../scripts/build/Install-DotnetSDK.ps1 | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/images/windows/scripts/build/Install-DotnetSDK.ps1 b/images/windows/scripts/build/Install-DotnetSDK.ps1 index 493720f319ed..68c2ff6c3fd2 100644 --- a/images/windows/scripts/build/Install-DotnetSDK.ps1 +++ b/images/windows/scripts/build/Install-DotnetSDK.ps1 @@ -95,6 +95,15 @@ $dotnetToolset = (Get-ToolsetContent).dotnet # Download installation script. $installScriptPath = Invoke-DownloadWithRetry -Url "https://dot.net/v1/dotnet-install.ps1" +# Visual Studio 2022 pre-creates sdk-manifests/8.0.100 folder, causing dotnet-install to skip manifests creation +# https://github.com/actions/runner-images/issues/11402 +if (Test-IsWin22 -or Test-IsWin25) { + $sdkManifestPath = "C:\Program Files\dotnet\sdk-manifests\8.0.100" + if (Test-Path $sdkManifestPath) { + Move-Item -Path $sdkManifestPath -Destination $env:TEMP_DIR -ErrorAction Stop + } +} + # Install and warm up dotnet foreach ($dotnetVersion in $dotnetToolset.versions) { $sdkVersionsToInstall = Get-SDKVersionsToInstall -DotnetVersion $dotnetVersion @@ -106,6 +115,17 @@ foreach ($dotnetVersion in $dotnetToolset.versions) { } } +# Replace manifests inside sdk-manifests/8.0.100 folder with ones from Visual Studio +# https://github.com/actions/runner-images/issues/11402 +if (Test-IsWin22 -or Test-IsWin25) { + if (Test-Path "${env:TEMP_DIR}\8.0.100") { + Get-ChildItem -Path "${env:TEMP_DIR}\8.0.100" | ForEach-Object { + Remove-Item -Path "$sdkManifestPath\$($_.BaseName)" -Recurse -Force | Out-Null + Move-Item -Path $_.FullName -Destination $sdkManifestPath -Force -ErrorAction Stop + } + } +} + # Add dotnet to PATH Add-MachinePathItem "C:\Program Files\dotnet" From 13666fe26513ca5e0e21f412b5d4c7fa0e8eb5a9 Mon Sep 17 00:00:00 2001 From: hemanthmanga <166606741+hemanthmanga@users.noreply.github.com> Date: Sun, 9 Feb 2025 00:40:39 +0530 Subject: [PATCH 3485/3485] [Windows]Update signature for AWScli SessionManagerPluginSetup.exe (#11559) --- images/windows/scripts/build/Install-AWSTools.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/windows/scripts/build/Install-AWSTools.ps1 b/images/windows/scripts/build/Install-AWSTools.ps1 index 22ad5b43274d..1ed76b5d7f6c 100644 --- a/images/windows/scripts/build/Install-AWSTools.ps1 +++ b/images/windows/scripts/build/Install-AWSTools.ps1 @@ -11,7 +11,7 @@ Install-ChocoPackage awscli Install-Binary ` -Url "https://s3.amazonaws.com/session-manager-downloads/plugin/latest/windows/SessionManagerPluginSetup.exe" ` -InstallArgs ("/silent", "/install") ` - -ExpectedSignature "75A5FB4D02FCB2AB799718F315BAAA3103E9D60C" + -ExpectedSignature "CFC0CE0547A698E5F3FA78F819654CE016D76464" $env:Path = $env:Path + ";$env:ProgramFiles\Amazon\SessionManagerPlugin\bin" # Install AWS SAM CLI